From 42f289d994020e3e8ce8b35ce78128625679b4a6 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 9 Oct 2011 16:01:48 +0100
Subject: [PATCH 001/546] Updated bug message

---
 apps/files_texteditor/js/editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index f7b924d494d..87810702f62 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -72,7 +72,7 @@ function bindControlEvents(){
 }
 
 function editorIsShown(){
-	// Not working as intended. Always returns true.
+	// Not working as intended.
 	if(window.aceEditor){
 		return true;
 	} else {
-- 
GitLab


From 9bde002c95e35c84c2c53ddbf5f3d196cff5812d Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Fri, 14 Oct 2011 22:56:14 +0100
Subject: [PATCH 002/546] Fixed issue with opening editor multiple times.

---
 apps/files_texteditor/js/editor.js | 97 ++++++++++++++++--------------
 1 file changed, 52 insertions(+), 45 deletions(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 87810702f62..a2581d4143f 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -4,6 +4,7 @@ function setEditorSize(){
 }
 
 function getFileExtension(file){
+	// Extracts the file extension from the full filename
 	var parts=file.split('.');
 	return parts[parts.length-1];
 }
@@ -11,7 +12,6 @@ function getFileExtension(file){
 function setSyntaxMode(ext){
 	// Loads the syntax mode files and tells the editor
 	var filetype = new Array();
-	// Todo finish these
     filetype["h"] = "c_cpp";
     filetype["c"] = "c_cpp";
     filetype["cpp"] = "c_cpp";
@@ -63,17 +63,21 @@ function showControls(filename){
  
 function bindControlEvents(){
 	$("#editor_save").live('click',function() {
-		doFileSave();
+		if(editorIsShown()){
+			doFileSave();
+		}
 	});	
 	
 	$('#editor_close').live('click',function() {
-		hideFileEditor();	
+		if(editorIsShown()){
+			hideFileEditor();
+		}	
 	});
 }
 
 function editorIsShown(){
 	// Not working as intended.
-	if(window.aceEditor){
+	if($('#editor').attr('editorshown')=='true'){
 		return true;
 	} else {
 		return false;	
@@ -91,55 +95,56 @@ function updateSessionFileHash(path){
 
 function doFileSave(){
 	if(editorIsShown()){
-	$('#editor_save').after('<img id="saving_icon" src="'+OC.filePath('core','img','loading.gif')+'"></img>');
-		var filecontents = window.aceEditor.getSession().getValue();
-		var dir =  $('#editor').attr('data-dir');
-		var file =  $('#editor').attr('data-filename');
-		$.post(OC.filePath('files_texteditor','ajax','savefile.php'), { filecontents: filecontents, file: file, dir: dir },function(jsondata){
-			
-			if(jsondata.status == 'failure'){
-				var answer = confirm(jsondata.data.message);
-				if(answer){
-					$.post(OC.filePath('files_texteditor','ajax','savefile.php'),{ filecontents: filecontents, file: file, dir: dir, force: 'true' },function(jsondata){
-						if(jsondata.status =='success'){
-							$('#saving_icon').remove();
-							$('#editor_save').after('<p id="save_result" style="float: left">Saved!</p>')
-							setTimeout(function() {
-  								$('#save_result').remove();
-							}, 2000);
-						} 
-						else {
-							// Save error
-							$('#saving_icon').remove();
-							$('#editor_save').after('<p id="save_result" style="float: left">Failed!</p>');
-							setTimeout(function() {
-								$('#save_result').fadeOut('slow',function(){ $(this).remove(); });
-							}, 2000);	
-						}
-					}, 'json');
+		$('#editor_save').after('<img id="saving_icon" src="'+OC.filePath('core','img','loading.gif')+'"></img>');
+			var filecontents = window.aceEditor.getSession().getValue();
+			var dir =  $('#editor').attr('data-dir');
+			var file =  $('#editor').attr('data-filename');
+			$.post(OC.filePath('files_texteditor','ajax','savefile.php'), { filecontents: filecontents, file: file, dir: dir },function(jsondata){
+				
+				if(jsondata.status == 'failure'){
+					var answer = confirm(jsondata.data.message);
+					if(answer){
+						$.post(OC.filePath('files_texteditor','ajax','savefile.php'),{ filecontents: filecontents, file: file, dir: dir, force: 'true' },function(jsondata){
+							if(jsondata.status =='success'){
+								$('#saving_icon').remove();
+								$('#editor_save').after('<p id="save_result" style="float: left">Saved!</p>')
+								setTimeout(function() {
+	  								$('#save_result').remove();
+								}, 2000);
+							} 
+							else {
+								// Save error
+								$('#saving_icon').remove();
+								$('#editor_save').after('<p id="save_result" style="float: left">Failed!</p>');
+								setTimeout(function() {
+									$('#save_result').fadeOut('slow',function(){ $(this).remove(); });
+								}, 2000);	
+							}
+						}, 'json');
+					} 
+			   		else {
+						// Don't save!
+						$('#saving_icon').remove();
+						// Temporary measure until we get a tick icon
+						$('#editor_save').after('<p id="save_result" style="float: left">Saved!</p>');
+						setTimeout(function() {
+									$('#save_result').fadeOut('slow',function(){ $(this).remove(); });
+						}, 2000);
+				   	}
 				} 
-		   		else {
-					// Don't save!
+				else if(jsondata.status == 'success'){
+					// Success
 					$('#saving_icon').remove();
 					// Temporary measure until we get a tick icon
 					$('#editor_save').after('<p id="save_result" style="float: left">Saved!</p>');
 					setTimeout(function() {
 								$('#save_result').fadeOut('slow',function(){ $(this).remove(); });
 					}, 2000);
-			   	}
-			} 
-			else if(jsondata.status == 'success'){
-				// Success
-				$('#saving_icon').remove();
-				// Temporary measure until we get a tick icon
-				$('#editor_save').after('<p id="save_result" style="float: left">Saved!</p>');
-				setTimeout(function() {
-							$('#save_result').fadeOut('slow',function(){ $(this).remove(); });
-				}, 2000);
-			}
-		}, 'json');
-	giveEditorFocus();
+				}
+			}, 'json');
+		giveEditorFocus();
 	} else {
+		$('#editor').data('editor','false');
 		return;	
 	}	
 };
@@ -155,6 +160,7 @@ function showFileEditor(dir,filename){
 				url: OC.filePath('files','ajax','download.php')+'?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent(dir),
 				complete: function(data){
 					// Initialise the editor
+					$('#editor').attr('editorshown','true');
 					updateSessionFileHash(dir+'/'+filename);
 					showControls(filename);
 					$('table').fadeOut('slow', function() {
@@ -178,6 +184,7 @@ function showFileEditor(dir,filename){
 }
 
 function hideFileEditor(){
+	$('#editor').attr('editorshown','false');	
 	// Fade out controls
 	$('#editor_close').fadeOut('slow');
 	// Fade out the save button
-- 
GitLab


From 55e8b02a0923ed33c2c3a17c21d2e6c5e1692192 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Tue, 18 Oct 2011 21:42:27 +0200
Subject: [PATCH 003/546] new way of showing gallery covers

---
 apps/gallery/lib/images_utils.php | 43 +++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 apps/gallery/lib/images_utils.php

diff --git a/apps/gallery/lib/images_utils.php b/apps/gallery/lib/images_utils.php
new file mode 100644
index 00000000000..cb46bf3f160
--- /dev/null
+++ b/apps/gallery/lib/images_utils.php
@@ -0,0 +1,43 @@
+<?php
+require_once('../../../lib/base.php');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('gallery');
+
+function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height, $tgtImg, $shift) { 
+    //getting the image dimensions
+    list($width_orig, $height_orig) = getimagesize($imgSrc); 
+    switch (strtolower(substr($imgSrc, strrpos($imgSrc, '.')+1))) {
+      case "jpeg":
+      case "jpg":
+      case "tiff":
+        $myImage = imagecreatefromjpeg($imgSrc);
+        break;
+      case "png":
+        $myImage = imagecreatefrompng($imgSrc);
+        break;
+      default:
+        exit();
+    }
+    $ratio_orig = $width_orig/$height_orig;
+    
+    if ($thumbnail_width/$thumbnail_height > $ratio_orig) {
+       $new_height = $thumbnail_width/$ratio_orig;
+       $new_width = $thumbnail_width;
+    } else {
+       $new_width = $thumbnail_height*$ratio_orig;
+       $new_height = $thumbnail_height;
+    }
+    
+    $x_mid = $new_width/2;  //horizontal middle
+    $y_mid = $new_height/2; //vertical middle
+    
+    $process = imagecreatetruecolor(round($new_width), round($new_height)); 
+
+    imagecopyresampled($process, $myImage, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
+    imagecopyresampled($tgtImg, $process, $shift, 0, ($x_mid-($thumbnail_width/2)), ($y_mid-($thumbnail_height/2)), $thumbnail_width, $thumbnail_height, $thumbnail_width, $thumbnail_height);
+
+    imagedestroy($process);
+    imagedestroy($myImage);
+}
+
+?>
-- 
GitLab


From c32cce4b35919c255089922abe64f5fe833ecb27 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Tue, 18 Oct 2011 21:43:33 +0200
Subject: [PATCH 004/546] new way of showing gallery covers, missing files

---
 apps/gallery/ajax/getAlbums.php     |  2 +-
 apps/gallery/ajax/scanForAlbums.php |  1 +
 apps/gallery/index.php              |  6 ++++++
 apps/gallery/js/album_cover.js      |  2 +-
 apps/gallery/js/albums.js           |  6 +++---
 apps/gallery/lib_scanner.php        | 22 +++++++++++++++++++++-
 6 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/apps/gallery/ajax/getAlbums.php b/apps/gallery/ajax/getAlbums.php
index 38bea74636f..60d3d42866d 100644
--- a/apps/gallery/ajax/getAlbums.php
+++ b/apps/gallery/ajax/getAlbums.php
@@ -11,7 +11,7 @@ while ($r = $result->fetchRow()) {
   $album_name = $r['album_name'];
   $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_photos WHERE `album_id` = ?');
   $tmp_res = $stmt->execute(array($r['album_id']));
-  $a[] = array('name' => $album_name, 'numOfItems' => min($tmp_res->numRows(), 10));
+  $a[] = array('name' => $album_name, 'numOfItems' => min($tmp_res->numRows(), 10), 'bgPath' => OC::$WEBROOT.'/data/'.OC_User::getUser().'/gallery/'.$album_name.'.png');
 }
 
 OC_JSON::success(array('albums'=>$a));
diff --git a/apps/gallery/ajax/scanForAlbums.php b/apps/gallery/ajax/scanForAlbums.php
index de0b141a367..bdd591d0422 100644
--- a/apps/gallery/ajax/scanForAlbums.php
+++ b/apps/gallery/ajax/scanForAlbums.php
@@ -5,6 +5,7 @@ OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
 require_once('../lib_scanner.php');
 
+OC_GALLERY_SCANNER::cleanUp();
 OC_JSON::success(array('albums' => OC_GALLERY_SCANNER::scan('')));
 //OC_JSON::success(array('albums' => array(array('name' => 'test', 'imagesCount' => 1, 'images' => array('dupa')))));
 
diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index 87fdafcf13c..cb567e3c8f6 100644
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -5,6 +5,12 @@ OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('gallery');
 OC_App::setActiveNavigationEntry( 'gallery_index' );
 
+if (!file_exists(OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/gallery')) {
+  mkdir(OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/gallery');
+  $f = fopen(OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/gallery/.htaccess', 'w');
+  fwrite($f, "allow from all");
+  fclose($f);
+}
 
 if (!isset($_GET['view'])) {
   $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner = ?');
diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index 776feae32cc..c475c60d5da 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -4,7 +4,7 @@ $(document).ready(function() {
     if (r.status == 'success') {
       for (var i in r.albums) {
         var a = r.albums[i];
-        Albums.add(a.name, a.numOfItems);
+        Albums.add(a.name, a.numOfItems, a.bgPath);
       }
       var targetDiv = document.getElementById('gallery_list');
       if (targetDiv) {
diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index 7ab243ededf..a8e317159d5 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -12,13 +12,13 @@ Albums={
   // album with the same name wont be insered,
   // and false will be returned
   // true on success
-  add: function(album_name, num) {
+  add: function(album_name, num, bgPath) {
     for (var a in Albums.albums) {
       if (a.name == album_name) {
         return false;
       }
     }
-    Albums.albums.push({name: album_name, numOfCovers: num});
+    Albums.albums.push({name: album_name, numOfCovers: num, backgroundPath: bgPath});
     return true;
   },
   // remove element with given name
@@ -63,7 +63,7 @@ Albums={
       var local = $(displayTemplate.replace(/\*NAME\*/g, a.name));
       local.css('background-repeat', 'no-repeat');
       local.css('background-position', '0 0');
-      local.css('background-image','url("ajax/getCovers.php?album_name='+a.name+'")');
+      local.css('background-image','url("'+a.backgroundPath+'")');
       local.mousemove(function(e) {
         var albumMetadata = Albums.find(this.title);
         if (albumMetadata == undefined) {
diff --git a/apps/gallery/lib_scanner.php b/apps/gallery/lib_scanner.php
index 5490c4a55ad..30a86b7405d 100644
--- a/apps/gallery/lib_scanner.php
+++ b/apps/gallery/lib_scanner.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once('base.php'); // base lib
+require_once('lib/images_utils.php');
 
 class OC_GALLERY_SCANNER {
 
@@ -10,6 +11,13 @@ class OC_GALLERY_SCANNER {
     return $albums;
   }
 
+  public static function cleanUp() {
+    $stmt = OC_DB::prepare('DELETE FROM *PREFIX*gallery_albums');
+    $stmt->execute(array());
+    $stmt = OC_DB::prepare('DELETE FROM *PREFIX*gallery_photos');
+    $stmt->execute(array());
+  }
+
   public static function scanDir($path, &$albums) {
     $current_album = array('name'=> $path, 'imagesCount' => 0, 'images' => array());
     $current_album['name'] = str_replace('/', '.', str_replace(OC::$CONFIG_DATADIRECTORY, '', $current_album['name']));
@@ -24,7 +32,7 @@ class OC_GALLERY_SCANNER {
         } elseif (self::isPhoto($path.'/'.$filename)) {
           $current_album['images'][] = $filepath;
         }
-      } 
+      }
     }
     $current_album['imagesCount'] = count($current_album['images']);
     $albums[] = $current_album;
@@ -46,6 +54,18 @@ class OC_GALLERY_SCANNER {
         $stmt->execute(array($albumId, $img));
       }
     }
+    if (count($current_album['images'])) {
+      self::createThumbnail($current_album['name'],$current_album['images']);
+    }
+  }
+
+  public static function createThumbnail($albumName, $files) {
+    $file_count = min(count($files), 10);
+    $thumbnail = imagecreatetruecolor($file_count*200, 200);
+    for ($i = 0; $i < $file_count; $i++) {
+      CroppedThumbnail(OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/files/'.$files[$i], 200, 200, $thumbnail, $i*200);
+    }
+    imagepng($thumbnail, OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/gallery/' . $albumName.'.png');
   }
 
   public static function isPhoto($filename) {
-- 
GitLab


From b40122832fdc3ebac05ca46e941f1c20698f1d06 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <georg.stefan.germany@googlemail.com>
Date: Fri, 21 Oct 2011 16:11:38 +0200
Subject: [PATCH 005/546] first implementation of fullcalendar plugin with old
 buttons working

---
 apps/calendar/templates/calendar.php | 84 +++++++++++++++++++++++++++-
 1 file changed, 82 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 1c948b948c2..eb50bc9541c 100644
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -6,6 +6,86 @@ var dayNamesShort = <?php echo json_encode($l->tA(array('Sun.', 'Mon.', 'Tue.',
 var monthNames = <?php echo json_encode($l->tA(array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'))) ?>;
 var monthNamesShort = <?php echo json_encode($l->tA(array('Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.'))) ?>;
 var allDayText = '<?php echo $l->t('All day') ?>';
+var neweventtitle = '<?php echo $l->t('Title') ?>';
+$(document).ready(function() {
+	var date = new Date();
+	var d = date.getDate();
+	var m = date.getMonth();
+	var y = date.getFullYear();
+		
+	var calendar = $('#calendar').fullCalendar({
+		selectable: true,
+		selectHelper: true,
+		select: function(start, end, allDay) {
+			var title = prompt(neweventtitle + ':');
+			if (title) {
+				calendar.fullCalendar('renderEvent',
+					{
+						title: title,
+						start: start,
+						end: end,
+						allDay: allDay
+					},
+					true // make the event "stick"
+				);
+			}
+			calendar.fullCalendar('unselect');
+		},
+		editable: true,
+		events: [
+			{
+				title: 'All Day Event',
+				start: new Date(y, m, 1)
+			},
+			{
+				title: 'Long Event',
+				start: new Date(y, m, d-5),
+				end: new Date(y, m, d-2)
+			},
+			{
+				id: 999,
+				title: 'Repeating Event',
+				start: new Date(y, m, d-3, 16, 0),
+				allDay: false
+			},
+			{
+				id: 999,
+				title: 'Repeating Event',
+				start: new Date(y, m, d+4, 16, 0),
+				allDay: false
+			},
+			{
+				title: 'Meeting',
+				start: new Date(y, m, d, 10, 30),
+				allDay: false
+			},
+			{
+				title: 'Lunch',
+				start: new Date(y, m, d, 12, 0),
+				end: new Date(y, m, d, 14, 0),
+				allDay: false
+			},
+			{
+				title: 'Birthday Party',
+				start: new Date(y, m, d+1, 19, 0),
+				end: new Date(y, m, d+1, 22, 30),
+				allDay: false
+			},
+			{
+				title: 'Click for Google',
+				start: new Date(y, m, 28),
+				end: new Date(y, m, 29),
+				url: 'http://google.com/'
+			}
+		]
+	});
+	var date = $('#calendar').fullCalendar('getDate');$('#datecontrol_date').html(date.getDate() + "." + date.getMonth() + "." + date.getFullYear());
+	$('#oneweekview_radio').click(function(){$('#calendar').fullCalendar( 'changeView', 'agendaWeek');});
+	$('#onemonthview_radio').click(function(){$('#calendar').fullCalendar( 'changeView', 'month');});
+	$('#today_input').click(function(){$('#calendar').fullCalendar( 'today' );var date = $('#calendar').fullCalendar('getDate');$('#datecontrol_date').html(date.getDate() + "." + date.getMonth() + "." + date.getFullYear());});
+	$('#datecontrol_left').click(function(){$('#calendar').fullCalendar( 'prev' );var date = $('#calendar').fullCalendar('getDate');$('#datecontrol_date').html(date.getDate() + "." + date.getMonth() + "." + date.getFullYear());});
+	$('#datecontrol_right').click(function(){$('#calendar').fullCalendar( 'next' );var date = $('#calendar').fullCalendar('getDate');$('#datecontrol_date').html(date.getDate() + "." + date.getMonth() + "." + date.getFullYear());});
+});
 </script>
 				<div id="controls">
 					<div>
@@ -13,7 +93,7 @@ var allDayText = '<?php echo $l->t('All day') ?>';
 							<div id="view">
 								<input type="button" value="<?php echo $l->t('Week');?>" id="oneweekview_radio"/>
 								<input type="button" value="<?php echo $l->t('Month');?>" id="onemonthview_radio"/>
-								<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>
+								<!--<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>-->
 							</div>
 						</form>
 						<form>
@@ -31,7 +111,7 @@ var allDayText = '<?php echo $l->t('All day') ?>';
 						</form>
 					</div>
 				</div>
-				<div id="calendar_holder">
+				<div id="calendar">
 				</div>
 				<!-- Dialogs -->
 				<div id="dialog_holder"></div>
-- 
GitLab


From d09b3ad2e74d34e8563322864aa0b452d0ad4e67 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <georg.stefan.germany@googlemail.com>
Date: Fri, 21 Oct 2011 17:50:10 +0200
Subject: [PATCH 006/546] Revert "first implementation of fullcalendar plugin
 with old buttons working"

This reverts commit b40122832fdc3ebac05ca46e941f1c20698f1d06.
---
 apps/calendar/templates/calendar.php | 84 +---------------------------
 1 file changed, 2 insertions(+), 82 deletions(-)

diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index eb50bc9541c..1c948b948c2 100644
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -6,86 +6,6 @@ var dayNamesShort = <?php echo json_encode($l->tA(array('Sun.', 'Mon.', 'Tue.',
 var monthNames = <?php echo json_encode($l->tA(array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'))) ?>;
 var monthNamesShort = <?php echo json_encode($l->tA(array('Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.'))) ?>;
 var allDayText = '<?php echo $l->t('All day') ?>';
-var neweventtitle = '<?php echo $l->t('Title') ?>';
-$(document).ready(function() {
-	var date = new Date();
-	var d = date.getDate();
-	var m = date.getMonth();
-	var y = date.getFullYear();
-		
-	var calendar = $('#calendar').fullCalendar({
-		selectable: true,
-		selectHelper: true,
-		select: function(start, end, allDay) {
-			var title = prompt(neweventtitle + ':');
-			if (title) {
-				calendar.fullCalendar('renderEvent',
-					{
-						title: title,
-						start: start,
-						end: end,
-						allDay: allDay
-					},
-					true // make the event "stick"
-				);
-			}
-			calendar.fullCalendar('unselect');
-		},
-		editable: true,
-		events: [
-			{
-				title: 'All Day Event',
-				start: new Date(y, m, 1)
-			},
-			{
-				title: 'Long Event',
-				start: new Date(y, m, d-5),
-				end: new Date(y, m, d-2)
-			},
-			{
-				id: 999,
-				title: 'Repeating Event',
-				start: new Date(y, m, d-3, 16, 0),
-				allDay: false
-			},
-			{
-				id: 999,
-				title: 'Repeating Event',
-				start: new Date(y, m, d+4, 16, 0),
-				allDay: false
-			},
-			{
-				title: 'Meeting',
-				start: new Date(y, m, d, 10, 30),
-				allDay: false
-			},
-			{
-				title: 'Lunch',
-				start: new Date(y, m, d, 12, 0),
-				end: new Date(y, m, d, 14, 0),
-				allDay: false
-			},
-			{
-				title: 'Birthday Party',
-				start: new Date(y, m, d+1, 19, 0),
-				end: new Date(y, m, d+1, 22, 30),
-				allDay: false
-			},
-			{
-				title: 'Click for Google',
-				start: new Date(y, m, 28),
-				end: new Date(y, m, 29),
-				url: 'http://google.com/'
-			}
-		]
-	});
-	var date = $('#calendar').fullCalendar('getDate');$('#datecontrol_date').html(date.getDate() + "." + date.getMonth() + "." + date.getFullYear());
-	$('#oneweekview_radio').click(function(){$('#calendar').fullCalendar( 'changeView', 'agendaWeek');});
-	$('#onemonthview_radio').click(function(){$('#calendar').fullCalendar( 'changeView', 'month');});
-	$('#today_input').click(function(){$('#calendar').fullCalendar( 'today' );var date = $('#calendar').fullCalendar('getDate');$('#datecontrol_date').html(date.getDate() + "." + date.getMonth() + "." + date.getFullYear());});
-	$('#datecontrol_left').click(function(){$('#calendar').fullCalendar( 'prev' );var date = $('#calendar').fullCalendar('getDate');$('#datecontrol_date').html(date.getDate() + "." + date.getMonth() + "." + date.getFullYear());});
-	$('#datecontrol_right').click(function(){$('#calendar').fullCalendar( 'next' );var date = $('#calendar').fullCalendar('getDate');$('#datecontrol_date').html(date.getDate() + "." + date.getMonth() + "." + date.getFullYear());});
-});
 </script>
 				<div id="controls">
 					<div>
@@ -93,7 +13,7 @@ $(document).ready(function() {
 							<div id="view">
 								<input type="button" value="<?php echo $l->t('Week');?>" id="oneweekview_radio"/>
 								<input type="button" value="<?php echo $l->t('Month');?>" id="onemonthview_radio"/>
-								<!--<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>-->
+								<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>
 							</div>
 						</form>
 						<form>
@@ -111,7 +31,7 @@ $(document).ready(function() {
 						</form>
 					</div>
 				</div>
-				<div id="calendar">
+				<div id="calendar_holder">
 				</div>
 				<!-- Dialogs -->
 				<div id="dialog_holder"></div>
-- 
GitLab


From e48377d85b49402e1ad441a44508af612b8dda2c Mon Sep 17 00:00:00 2001
From: Georg Ehrke <georg.stefan.germany@googlemail.com>
Date: Fri, 21 Oct 2011 18:19:44 +0200
Subject: [PATCH 007/546] added transition function from 'old' calendar to
 fullcalendar (fixed currentview bug)  and removed listview (it is not
 implemented in fullcalendar yet)

---
 apps/calendar/ajax/changeview.php    |  5 ++---
 apps/calendar/index.php              | 11 +++++++++++
 apps/calendar/js/calendar.js         |  4 ++--
 apps/calendar/templates/calendar.php |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/apps/calendar/ajax/changeview.php b/apps/calendar/ajax/changeview.php
index b396ff4945b..ef05c7cd496 100644
--- a/apps/calendar/ajax/changeview.php
+++ b/apps/calendar/ajax/changeview.php
@@ -7,10 +7,9 @@
  */
 
 require_once ("../../../lib/base.php");
-if(!OC_USER::isLoggedIn()) {
-	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 $currentview = $_GET["v"];
 OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", $currentview);
+OC_JSON::success();
 ?>
diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index 7150fb8490e..2764184dac5 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -19,6 +19,17 @@ $eventSources = array();
 foreach($calendars as $calendar){
 	$eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar);
 }
+//Fix currentview for fullcalendar
+if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') == "oneweekview"){
+	OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", "agendaWeek");
+}
+if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') == "onemonthview"){
+	OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", "month");
+}
+if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') == "listview"){
+	OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", "month");
+}
+
 OC_Util::addScript('3rdparty/fullcalendar', 'fullcalendar');
 OC_Util::addStyle('3rdparty/fullcalendar', 'fullcalendar');
 OC_Util::addScript('calendar', 'calendar');
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index bf9e2628ff9..fccc301a91d 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -531,10 +531,10 @@ $(document).ready(function(){
 	});
 	$('#onemonthview_radio').click(function(){
 		$('#calendar_holder').fullCalendar('changeView', 'month');
-	});
+	});/*
 	$('#listview_radio').click(function(){
 		$('#calendar_holder').fullCalendar('changeView', 'list');
-	});
+	});*/
 	$('#today_input').click(function(){
 		$('#calendar_holder').fullCalendar('today');
 	});
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 1c948b948c2..d9c6a506e0b 100644
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -13,7 +13,7 @@ var allDayText = '<?php echo $l->t('All day') ?>';
 							<div id="view">
 								<input type="button" value="<?php echo $l->t('Week');?>" id="oneweekview_radio"/>
 								<input type="button" value="<?php echo $l->t('Month');?>" id="onemonthview_radio"/>
-								<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>
+								<!--<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>-->
 							</div>
 						</form>
 						<form>
-- 
GitLab


From c40383b6102130ca1e94a9ce2afe48af4d0ffc81 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <georg.stefan.germany@googlemail.com>
Date: Fri, 21 Oct 2011 18:27:12 +0200
Subject: [PATCH 008/546] enable listview button

---
 apps/calendar/index.php              | 2 +-
 apps/calendar/js/calendar.js         | 4 ++--
 apps/calendar/templates/calendar.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index 2764184dac5..2442d27db49 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -27,7 +27,7 @@ if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'mont
 	OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", "month");
 }
 if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') == "listview"){
-	OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", "month");
+	OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", "list");
 }
 
 OC_Util::addScript('3rdparty/fullcalendar', 'fullcalendar');
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index fccc301a91d..bf9e2628ff9 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -531,10 +531,10 @@ $(document).ready(function(){
 	});
 	$('#onemonthview_radio').click(function(){
 		$('#calendar_holder').fullCalendar('changeView', 'month');
-	});/*
+	});
 	$('#listview_radio').click(function(){
 		$('#calendar_holder').fullCalendar('changeView', 'list');
-	});*/
+	});
 	$('#today_input').click(function(){
 		$('#calendar_holder').fullCalendar('today');
 	});
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index d9c6a506e0b..1c948b948c2 100644
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -13,7 +13,7 @@ var allDayText = '<?php echo $l->t('All day') ?>';
 							<div id="view">
 								<input type="button" value="<?php echo $l->t('Week');?>" id="oneweekview_radio"/>
 								<input type="button" value="<?php echo $l->t('Month');?>" id="onemonthview_radio"/>
-								<!--<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>-->
+								<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>
 							</div>
 						</form>
 						<form>
-- 
GitLab


From d7a7c40a0f0e6d2a527fd93b7c65d16ff096c783 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Thu, 27 Oct 2011 17:08:58 +0100
Subject: [PATCH 009/546] Moved breacrumb styling to core for use outside files
 app.

---
 core/css/styles.css | 8 ++++++++
 files/css/files.css | 9 +--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index 0f591859f3a..4730eee56d4 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -98,6 +98,14 @@ label.infield { cursor: text !important; }
 #expand+span { position:relative; bottom:.4em; left:.2em; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; }
 #logout { position:absolute; right:0; top:0; padding:1.2em 2em .55em 1.2em; }
 
+/* BREADCRUMB */
+
+div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
+div.crumb:first-child { padding-left:1em; }
+div.crumb.last { font-weight:bold; }
+/* add breadcrumb divider to the File item in navigation panel */
+#navigation>ul>li:first-child { background:url('../../core/img/breadcrumb-start.svg') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; position:fixed; }
+#navigation>ul>li:first-child+li { padding-top:2.9em; }
 
 /* VARIOUS REUSABLE SELECTORS */
 .hidden { display:none; }
diff --git a/files/css/files.css b/files/css/files.css
index ac1f523f862..12d14e843e3 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -32,9 +32,6 @@ tbody a { color:#000; }
 span.extention, td.date { color:#999; }
 span.extention { opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
 tr:hover span.extention { opacity:1; }
-div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
-div.crumb:first-child { padding-left:1em; }
-div.crumb.last { font-weight:bold; }
 table tr.mouseOver td { background-color:#eee; }
 table th { height:2em; padding:0 .5em; color:#999; }
 table th .name { float:left; margin-left:.5em; }
@@ -60,8 +57,4 @@ table thead.fixed { height:2em; }
 #select_all { float:left; margin:.3em 0.6em 0 .5em; }
 #uploadsize-message,#delete-confirm { display:none; }
 .selectedActions a,#fileList a.action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; }
-.selectedActions { display:none; }
-
-/* add breadcrumb divider to the File item in navigation panel */
-#navigation>ul>li:first-child { background:url('../../core/img/breadcrumb-start.svg') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; position:fixed; }
-#navigation>ul>li:first-child+li { padding-top:2.9em; }
\ No newline at end of file
+.selectedActions { display:none; }
\ No newline at end of file
-- 
GitLab


From 865be6064a1f2f896ca3657fa6eef590748a4e39 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Thu, 27 Oct 2011 21:16:04 +0200
Subject: [PATCH 010/546] adjusting to new db "api", merge with master

---
 .htaccess                       |  1 +
 apps/gallery/ajax/getAlbums.php |  4 ++--
 apps/gallery/lib_scanner.php    | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.htaccess b/.htaccess
index 34d4c719c8d..bd2f42d6658 100644
--- a/.htaccess
+++ b/.htaccess
@@ -2,6 +2,7 @@ ErrorDocument 404 /core/templates/404.php
 <IfModule mod_php5.c>
 php_value upload_max_filesize 512M
 php_value post_max_size 512M
+php_value memory_limit 512M
 SetEnv htaccessWorking true
 </IfModule>
 <IfModule !mod_php5.c>
diff --git a/apps/gallery/ajax/getAlbums.php b/apps/gallery/ajax/getAlbums.php
index 60d3d42866d..98d92c5f31a 100644
--- a/apps/gallery/ajax/getAlbums.php
+++ b/apps/gallery/ajax/getAlbums.php
@@ -4,12 +4,12 @@ OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
 
 $a = array();
-$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE `uid_owner` = ?');
+$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner LIKE ?');
 $result = $stmt->execute(array(OC_User::getUser()));
 
 while ($r = $result->fetchRow()) {
   $album_name = $r['album_name'];
-  $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_photos WHERE `album_id` = ?');
+  $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_photos WHERE album_id = ?');
   $tmp_res = $stmt->execute(array($r['album_id']));
   $a[] = array('name' => $album_name, 'numOfItems' => min($tmp_res->numRows(), 10), 'bgPath' => OC::$WEBROOT.'/data/'.OC_User::getUser().'/gallery/'.$album_name.'.png');
 }
diff --git a/apps/gallery/lib_scanner.php b/apps/gallery/lib_scanner.php
index 871c1c38c5f..f72d54777a7 100644
--- a/apps/gallery/lib_scanner.php
+++ b/apps/gallery/lib_scanner.php
@@ -36,21 +36,21 @@ class OC_GALLERY_SCANNER {
     }
     $current_album['imagesCount'] = count($current_album['images']);
     $albums[] = $current_album;
-    $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE `uid_owner` = ? AND `album_name` = ?');
+    $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner LIKE ? AND album_name LIKE ?');
     $result = $stmt->execute(array(OC_User::getUser(), $current_album['name']));
     if ($result->numRows() == 0 && count($current_album['images'])) {
-      $stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_albums (`uid_owner`, `album_name`) VALUES (?, ?)');
+      $stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_albums (uid_owner, album_name) VALUES (?, ?)');
       $stmt->execute(array(OC_User::getUser(), $current_album['name']));
     }
-    $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE `uid_owner` = ? AND `album_name` = ?');
+    $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner LIKE ? AND album_name LIKE ?');
     $result = $stmt->execute(array(OC_User::getUser(), $current_album['name']));
-    $albumId = $result->fetchRow();
-    $albumId = $albumId['album_id'];
+    $albumId = $result->fetchAll();
+    $albumId = $albumId[0]['album_id'];
     foreach ($current_album['images'] as $img) {
-      $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_photos WHERE `album_id` = ? AND `file_path` = ?');
+      $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_photos WHERE album_id = ? AND file_path LIKE ?');
       $result = $stmt->execute(array($albumId, $img));
       if ($result->numRows() == 0) {
-        $stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_photos (`album_id`, `file_path`) VALUES (?, ?)');
+        $stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_photos (album_id, file_path) VALUES (?, ?)');
         $stmt->execute(array($albumId, $img));
       }
     }
-- 
GitLab


From 059ab889bd1a7eaf399f69405e0151e34e2e760a Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 7 Nov 2011 22:27:49 +0000
Subject: [PATCH 011/546] Fixed error where saving message appears twice.

---
 apps/files_texteditor/js/editor.js | 51 +++++++++++++-----------------
 1 file changed, 22 insertions(+), 29 deletions(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index e3581a16a6d..c26139a4eb2 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -62,17 +62,8 @@ function showControls(filename){
 }
  
 function bindControlEvents(){
-	$("#editor_save").live('click',function() {
-		if(is_editor_shown){
-			doFileSave();
-		}
-	});	
-	
-	$('#editor_close').live('click',function() {
-		if(is_editor_shown){
-			hideFileEditor();
-		}	
-	});
+	$("#editor_save").die('click', doFileSave).live('click', doFileSave);	
+	$('#editor_close').live('click', hideFileEditor);
 }
 
 function updateSessionFileHash(path){
@@ -175,24 +166,26 @@ function showFileEditor(dir,filename){
 }
 
 function hideFileEditor(){
-	$('#editor').attr('editorshown','false');	
-	// Fade out controls
-	$('#editor_close').fadeOut('slow');
-	// Fade out the save button
-	$('#editor_save').fadeOut('slow');
-	// Fade out breadcrumb
-	$('#breadcrumb_file').fadeOut('slow', function(){ $(this).remove();});
-	// Fade out editor
-	$('#editor').fadeOut('slow', function(){
-		$('#editor_close').remove();
-		$('#editor_save').remove();
-		$('#editor').remove();
-		var editorhtml = '<div id="editor"></div>';
-		$('table').after(editorhtml);
-		$('.actions,#file_access_panel').fadeIn('slow');
-		$('table').fadeIn('slow');	
-	});
-	is_editor_shown = false;
+	if(!is_editor_shown){
+		$('#editor').attr('editorshown','false');	
+		// Fade out controls
+		$('#editor_close').fadeOut('slow');
+		// Fade out the save button
+		$('#editor_save').fadeOut('slow');
+		// Fade out breadcrumb
+		$('#breadcrumb_file').fadeOut('slow', function(){ $(this).remove();});
+		// Fade out editor
+		$('#editor').fadeOut('slow', function(){
+			$('#editor_close').remove();
+			$('#editor_save').remove();
+			$('#editor').remove();
+			var editorhtml = '<div id="editor"></div>';
+			$('table').after(editorhtml);
+			$('.actions,#file_access_panel').fadeIn('slow');
+			$('table').fadeIn('slow');	
+		});
+		is_editor_shown = false;
+	}
 }
 
 $(window).resize(function() {
-- 
GitLab


From c33884779d4e7fbfce33ee30fbe46f3df939a402 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 7 Nov 2011 22:45:26 +0000
Subject: [PATCH 012/546] Fixed problem closing the editor.

---
 apps/files_texteditor/js/editor.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index c26139a4eb2..fd93ac5a7a8 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -73,7 +73,9 @@ function updateSessionFileHash(path){
    			if(jsondata.status=='failure'){
    				alert('Failed to update session file hash.');	
    			}
-   	}, "json");}
+   		},
+   		"json");
+}
 
 function doFileSave(){
 	if(is_editor_shown){
@@ -166,7 +168,7 @@ function showFileEditor(dir,filename){
 }
 
 function hideFileEditor(){
-	if(!is_editor_shown){
+	if(is_editor_shown){
 		$('#editor').attr('editorshown','false');	
 		// Fade out controls
 		$('#editor_close').fadeOut('slow');
-- 
GitLab


From 878fc1d197e8f1474d2a739da2ddb4c0e7214931 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 8 Nov 2011 22:18:41 +0100
Subject: [PATCH 013/546] remove outdated remote storage prototype

---
 lib/filestorage/remote.php | 350 -------------------------------------
 1 file changed, 350 deletions(-)
 delete mode 100644 lib/filestorage/remote.php

diff --git a/lib/filestorage/remote.php b/lib/filestorage/remote.php
deleted file mode 100644
index 88bdbca481c..00000000000
--- a/lib/filestorage/remote.php
+++ /dev/null
@@ -1,350 +0,0 @@
-<?php
-
-/**
-* ownCloud
-*
-* @author Frank Karlitschek 
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org 
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Affero General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-class OC_Filestorage_Remote extends OC_Filestorage{
-	private $url;
-	private $username;
-	private $password;
-	private $remote=false;
-	private $statCache;
-	private $statCacheDir=false;
-	private $changed=array();
-	
-	private function cacheDir($dir){
-		if($this->statCacheDir!=$dir or $this->statCacheDir===false){
-			$this->statCache=$this->remote->getFiles($dir);
-			$keys=array_keys($this->statCache);
-			$this->statCacheDir=$dir;
-		}
-	}
-	
-	public function __construct($arguments){
-		$this->url=$arguments['url'];
-		$this->username=$arguments['username'];
-		$this->password=$arguments['password'];
-	}
-	private function connect(){
-		if($this->remote===false){
-			$this->remote=OC_Connect::connect($this->url,$this->username,$this->password);
-		}
-	}
-	public function mkdir($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$return=$this->remote->newFile($parent,$name,'dir');
-		if($return){
-			$this->notifyObservers($path,OC_FILEACTION_CREATE);
-		}
-		return $return;
-	}
-	public function rmdir($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$return=$this->remote->delete($parent,$name);
-		if($return){
-			$this->notifyObservers($path,OC_FILEACTION_DELETE);
-		}
-		return $return;
-	}
-	public function opendir($path){
-		$this->connect();
-		$this->cacheDir($path);
-		$dirs=array_keys($this->statCache);
-		$id=uniqid();
-		global $FAKEDIRS;
-		$FAKEDIRS[$id]=$dirs;
-		if($return=opendir("fakedir://$id")){
-			$this->notifyObservers($path,OC_FILEACTION_READ);
-		}
-		return $return;
-	}
-	public function is_dir($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$this->cacheDir($path);
-		if($path=='' or $path=='/'){
-			return true;
-		}
-		if(!isset($this->statCache[$name])){
-			return false;
-		}
-		return ($this->statCache[$name]['type'=='dir']);
-	}
-	public function is_file($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$this->cacheDir($parent);
-		if(!isset($this->statCache[$name])){
-			return false;
-		}
-		return ($this->statCache[$name]['type'!='dir']);
-	}
-	public function stat($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$this->cacheDir($parent);
-		if(!isset($this->statCache[$name])){
-			return $false;
-		}
-		return $this->statCache[$name];
-	}
-	public function filetype($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$this->cacheDir($parent);
-		if(!isset($this->statCache[$name])){
-			return false;
-		}
-		return $this->statCache[$name]['type'];
-	}
-	public function filesize($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$this->cacheDir($parent);
-		if(!isset($this->statCache[$name])){
-			return $false;
-		}
-		return $this->statCache[$name]['size'];
-	}
-	public function is_readable($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$this->cacheDir($parent);
-		if(!isset($this->statCache[$name])){
-			return false;
-		}
-		return $this->statCache[$name]['readable'];
-	}
-	public function is_writeable($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$this->cacheDir($parent);
-		if(!isset($this->statCache[$name])){
-			return false;
-		}
-		return $this->statCache[$name]['writeable'];
-	}
-	public function file_exists($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$this->cacheDir($parent);
-		return isset($this->statCache[$name]);
-	}
-	public function readfile($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$file=$this->remote->getFile($parent,$name);
-		readfile($file);
-		unlink($file);
-	}
-	public function filectime($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$this->cacheDir($parent);
-		if(!isset($this->statCache[$name])){
-			return false;
-		}
-		return $this->statCache[$name]['ctime'];
-	}
-	public function filemtime($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$this->cacheDir($parent);
-		if(!isset($this->statCache[$name])){
-			return false;
-		}
-		return $this->statCache[$name]['mtime'];
-	}
-	public function fileatime($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$this->cacheDir($parent);
-		if(!isset($this->statCache[$name])){
-			return false;
-		}
-		return $this->statCache[$name]['atime'];
-	}
-	public function file_get_contents($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$file=$this->remote->getFile($parent,$name);
-		file_get_contents($file);
-		unlink($file);
-	}
-	public function file_put_contents($path,$data){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$file=$this->remote->getFile($parent,$name);
-		$file=tempnam(get_temp_dir(),'oc_');
-		file_put_contents($file,$data);
-		if($return=$this->remote->sendTmpFile($file,$parent,$name)){
-			$this->notifyObservers($path,OC_FILEACTION_WRITE);
-		}
-	}
-	public function unlink($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		if($return=$this->remote->delete($paren,$name)){
-			$this->notifyObservers($path,OC_FILEACTION_DELETE);
-		}
-		return $return;
-	}
-	public function rename($path1,$path2){
-		$this->connect();
-		$parent1=dirname($path1);
-		$name1=substr($path1,strlen($parent1)+1);
-		$parent2=dirname($path2);
-		$name2=substr($path2,strlen($parent2)+1);
-		if($return=$this->remote->move($parent1,$name1,$parent2,$name2)){
-			$this->notifyObservers($path1.'->'.$path2,OC_FILEACTION_RENAME);
-		}
-		return $return;
-	}
-	public function copy($path1,$path2){
-		$this->connect();
-		$parent1=dirname($path1);
-		$name1=substr($path1,strlen($parent1)+1);
-		$parent2=dirname($path2);
-		$name2=substr($path2,strlen($parent2)+1);
-		if($return=$this->copy->rename($parent1,$name1,$parent2,$name2)){
-			$this->notifyObservers($path1.'->'.$path2,OC_FILEACTION_RENAME);
-		}
-		return $return;
-	}
-	public function fopen($path,$mode){
-		$this->connect();
-		$changed=false;
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		$file=$this->remote->getFile($parent,$name);
-		if($return=fopen($file,$mode)){
-			switch($mode){
-				case 'r':
-					$this->notifyObservers($path,OC_FILEACTION_READ);
-					break;
-				case 'r+':
-				case 'w+':
-				case 'x+':
-				case 'a+':
-					$this->notifyObservers($path,OC_FILEACTION_READ | OC_FILEACTION_WRITE);
-					$this->changed[]=array('dir'=>$parent,'file'=>$name,'tmp'=>$file);
-					break;
-				case 'w':
-				case 'x':
-				case 'a':
-					$this->notifyObservers($path,OC_FILEACTION_WRITE);
-					$this->changed[]=array('dir'=>$parent,'file'=>$name,'tmp'=>$file);
-					break;
-			}
-		}
-		return $return;
-	}
-	
-	public function getMimeType($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		if(substr($name,0,1)=='/'){
-			$name=substr($name,1);
-		}
-		$this->cacheDir($parent);
-		if(!isset($this->statCache[$name])){
-			return false;
-		}
-		return $this->statCache[$name]['mime'];
-	}
-	
-	public function toTmpFile($path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		if(substr($name,0,1)=='/'){
-			$name=substr($name,1);
-		}
-		$filename=$this->remote->getFile($parent,$name);
-		if($filename){
-			$this->notifyObservers($path,OC_FILEACTION_READ);
-			return $filename;
-		}else{
-			return false;
-		}
-	}
-	
-	public function fromTmpFile($tmpFile,$path){
-		$this->connect();
-		$parent=dirname($path);
-		$name=substr($path,strlen($parent)+1);
-		if($this->remote->sendTmpFile($tmpFile,$parent,$name)){
-			$this->notifyObservers($path,OC_FILEACTION_CREATE);
-			return true;
-		}else{
-			return false;
-		}
-	}
-	
-	public function delTree($dir) {
-		$this->connect();
-		$parent=dirname($dir);
-		$name=substr($dir,strlen($parent)+1);
-		$return=$this->remote->delete($parent,$name);
-		if($return=rmdir($dir)){
-			$this->notifyObservers($dir,OC_FILEACTION_DELETE);
-		}
-		return $return;
-	}
-	
-	public function find($path){
-		return $this->getTree($path);
-	}
-	
-	public function getTree($dir) {
-		$this->connect();
-		if($return=$this->remote->getTree($dir)){
-			$this->notifyObservers($dir,OC_FILEACTION_READ);
-		}
-		return $return;
-	}
-	
-	public function __destruct(){
-		foreach($this->changed as $changed){
-			$this->remote->sendTmpFile($changed['tmp'],$changed['dir'],$changed['file']);
-		}
-	}
-}
-- 
GitLab


From ec015a2e6806be90516e5cba009823050d98bcb0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 8 Nov 2011 22:21:25 +0100
Subject: [PATCH 014/546] remove the need to register storage providers, pass
 the classname during mounting instead

---
 apps/files_sharing/appinfo/app.php   |  1 -
 apps/files_sharing/sharedstorage.php |  2 +-
 lib/base.php                         |  3 --
 lib/filesystem.php                   | 47 +++++-----------------------
 lib/util.php                         |  2 +-
 5 files changed, 9 insertions(+), 46 deletions(-)

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index c175142319f..a675175a8be 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -5,7 +5,6 @@ require_once('apps/files_sharing/sharedstorage.php');
 OC::$CLASSPATH['OC_Share'] = "apps/files_sharing/lib_share.php";
 OC_Hook::connect("OC_Filesystem", "post_delete", "OC_Share", "deleteItem");
 OC_Hook::connect("OC_Filesystem", "post_rename", "OC_Share", "renameItem");
-OC_Filesystem::registerStorageType("shared", "OC_Filestorage_Shared", array("datadir" => "string"));
 OC_Util::addScript("files_sharing", "share");
 OC_Util::addScript("3rdparty", "chosen/chosen.jquery.min");
 OC_Util::addStyle( 'files_sharing', 'sharing' );
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index faf4e68d9b1..5ab976aaf4f 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -25,7 +25,7 @@ require_once( 'lib_share.php' );
 if (!OC_Filesystem::is_dir('/Shared')) {
 	OC_Filesystem::mkdir('/Shared');
 }
-OC_Filesystem::mount('shared',array('datadir'=>'/'.OC_User::getUser().'/files/Shared'),'/'.OC_User::getUser().'/files/Shared/');
+OC_Filesystem::mount('OC_Filestorage_Shared',array('datadir'=>'/'.OC_User::getUser().'/files/Shared'),'/'.OC_User::getUser().'/files/Shared/');
 
 /**
  * Convert target path to source path and pass the function call to the correct storage provider
diff --git a/lib/base.php b/lib/base.php
index c52b4493e01..2d0bb5fb250 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -157,9 +157,6 @@ class OC{
 		OC_User::useBackend( OC_Config::getValue( "userbackend", "database" ));
 		OC_Group::setBackend( OC_Config::getValue( "groupbackend", "database" ));
 
-		// Was in required file ... put it here
-		OC_Filesystem::registerStorageType('local','OC_Filestorage_Local',array('datadir'=>'string'));
-
 		// Set up file system unless forbidden
 		global $RUNTIME_NOSETUPFS;
 		if(!$RUNTIME_NOSETUPFS ){
diff --git a/lib/filesystem.php b/lib/filesystem.php
index cae8ead5b16..e28a3c5667e 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -46,35 +46,6 @@ class OC_Filesystem{
 	static private $storages=array();
 	static private $mounts=array();
 	static private $fakeRoot='';
-	static private $storageTypes=array();
-	
-	
-	/**
-	* register a storage type
-	* @param  string  type
-	* @param  string  classname
-	* @param  array  arguments     an associative array in the form of name=>type (eg array('datadir'=>'string'))
-	*/
-	static public function registerStorageType($type,$classname,$arguments){
-		self::$storageTypes[$type]=array('type'=>$type,'classname'=>$classname,'arguments'=>$arguments);
-	}
-	
-	/**
-	* check if the filesystem supports a specific storagetype
-	* @param  string  type
-	* @return bool
-	*/
-	static public function hasStorageType($type){
-		return isset(self::$storageTypes[$type]);
-	}
-	
-	/**
-	* get the list of names of storagetypes that the filesystem supports
-	* @return array
-	*/
-	static public function getStorageTypeNames(){
-		return array_keys(self::$storageTypes);
-	}
 	
 	/**
 	 * tear down the filesystem, removing all storage providers
@@ -92,13 +63,9 @@ class OC_Filesystem{
 	* @param  array  arguments
 	* @return OC_Filestorage
 	*/
-	static private function createStorage($type,$arguments){
-		if(!self::hasStorageType($type)){
-			return false;
-		}
-		$className=self::$storageTypes[$type]['classname'];
-		if(class_exists($className)){
-			return new $className($arguments);
+	static private function createStorage($class,$arguments){
+		if(class_exists($class)){
+			return new $class($arguments);
 		}else{
 			return false;
 		}
@@ -164,11 +131,11 @@ class OC_Filesystem{
 	* @param OC_Filestorage storage
 	* @param string mountpoint
 	*/
-	static public function mount($type,$arguments,$mountpoint){
+	static public function mount($class,$arguments,$mountpoint){
 		if(substr($mountpoint,0,1)!=='/'){
 			$mountpoint='/'.$mountpoint;
 		}
-		self::$mounts[$mountpoint]=array('type'=>$type,'arguments'=>$arguments);
+		self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments);
 	}
 	
 	/**
@@ -181,7 +148,7 @@ class OC_Filesystem{
 		if($mountpoint){
 			if(!isset(self::$storages[$mountpoint])){
 				$mount=self::$mounts[$mountpoint];
-				self::$storages[$mountpoint]=self::createStorage($mount['type'],$mount['arguments']);
+				self::$storages[$mountpoint]=self::createStorage($mount['class'],$mount['arguments']);
 			}
 			return self::$storages[$mountpoint];
 		}
@@ -285,7 +252,7 @@ class OC_Filesystem{
 		return self::basicOperation('filemtime',$path);
 	}
 	static public function fileatime($path){
-		return self::basicOperation('fileatime',$path);
+		return self::basicOperation('filemtime',$path);
 	}
 	static public function file_get_contents($path){
 		return self::basicOperation('file_get_contents',$path,array('read'));
diff --git a/lib/util.php b/lib/util.php
index 14313569a1d..e010a572e3a 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -37,7 +37,7 @@ class OC_Util {
 
 		if( $user != "" ){ //if we aren't logged in, there is no use to set up the filesystem
 			//first set up the local "root" storage
-			OC_Filesystem::mount('local',array('datadir'=>$CONFIG_DATADIRECTORY_ROOT),'/');
+			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$CONFIG_DATADIRECTORY_ROOT),'/');
 
 			OC::$CONFIG_DATADIRECTORY = $CONFIG_DATADIRECTORY_ROOT."/$user/$root";
 			if( !is_dir( OC::$CONFIG_DATADIRECTORY )){
-- 
GitLab


From ca6c500799ec13c433ca74b8caa80875084c4943 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 8 Nov 2011 22:26:03 +0100
Subject: [PATCH 015/546] remove OC_Filesystem::fileatime

---
 apps/files_sharing/sharedstorage.php | 22 ----------------------
 lib/fileproxy.php                    |  2 +-
 lib/filestorage.php                  |  1 -
 lib/filestorage/local.php            |  3 ---
 lib/filesystem.php                   |  3 ---
 5 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 5ab976aaf4f..431b6a1adb8 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -180,7 +180,6 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 			$stat["gid"] = "";
 			$stat["rdev"] = "";
 			$stat["size"] = $this->filesize($path);
-			$stat["atime"] = $this->fileatime($path);
 			$stat["mtime"] = $this->filemtime($path);
 			$stat["ctime"] = $this->filectime($path);
 			$stat["blksize"] = "";
@@ -354,27 +353,6 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		}
 	}
 	
-	public function fileatime($path) {
-		if ($path == "" || $path == "/") {
-			$atime = 0; 
-			if ($dh = $this->opendir($path)) {
-				while (($filename = readdir($dh)) !== false) {
-					$tempatime = $this->fileatime($filename);
-					if ($tempatime > $atime) {
-						$atime = $tempatime;
-					}
-				}
-				return $atime;
-			}
-		} else {
-			$source = $this->getSource($path);
-			if ($source) {
-				$storage = OC_Filesystem::getStorage($source);
-				return $storage->fileatime($this->getInternalPath($source));
-			}
-		}
-	}
-	
 	public function file_get_contents($path) {
 		$source = $this->getSource($path);
 		if ($source) {
diff --git a/lib/fileproxy.php b/lib/fileproxy.php
index 549b7015a6a..235fc8bf284 100644
--- a/lib/fileproxy.php
+++ b/lib/fileproxy.php
@@ -34,7 +34,7 @@
  * A post-proxy recieves 2 arguments, the filepath and the result of the operation.
  * The return calue of the post-proxy will be used as the new result of the operation
  * The operations that have a post-proxy are
- *      file_get_contents, is_file, is_dir, file_exists, stat, is_readable, is_writable, fileatime, filemtime, filectime, file_get_contents, getMimeType, hash, free_space and search
+ *      file_get_contents, is_file, is_dir, file_exists, stat, is_readable, is_writable, filemtime, filectime, file_get_contents, getMimeType, hash, free_space and search
  */
 
 class OC_FileProxy{
diff --git a/lib/filestorage.php b/lib/filestorage.php
index 34fa6457fd2..90071a86dbe 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -39,7 +39,6 @@ class OC_Filestorage{
 	public function readfile($path){}
 	public function filectime($path){}
 	public function filemtime($path){}
-	public function fileatime($path){}
 	public function file_get_contents($path){}
 	public function file_put_contents($path,$data){}
 	public function unlink($path){}
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 9e29f85071a..7711116db35 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -67,9 +67,6 @@ class OC_Filestorage_Local extends OC_Filestorage{
 	public function filemtime($path){
 		return filemtime($this->datadir.$path);
 	}
-	public function fileatime($path){
-		return fileatime($this->datadir.$path);
-	}
 	public function file_get_contents($path){
 		return file_get_contents($this->datadir.$path);
 	}
diff --git a/lib/filesystem.php b/lib/filesystem.php
index e28a3c5667e..a25e8697985 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -251,9 +251,6 @@ class OC_Filesystem{
 	static public function filemtime($path){
 		return self::basicOperation('filemtime',$path);
 	}
-	static public function fileatime($path){
-		return self::basicOperation('filemtime',$path);
-	}
 	static public function file_get_contents($path){
 		return self::basicOperation('file_get_contents',$path,array('read'));
 	}
-- 
GitLab


From 5cc6635eb81a8d76c04ee040a791f51ebbe389ef Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 8 Nov 2011 22:36:05 +0100
Subject: [PATCH 016/546] remove OC_Filesystem::fromUploadedFile

---
 apps/files_sharing/sharedstorage.php    | 16 --------------
 apps/files_texteditor/ajax/savefile.php |  2 +-
 files/ajax/upload.php                   |  2 +-
 lib/filestorage.php                     |  1 -
 lib/filestorage/local.php               | 11 ----------
 lib/filesystem.php                      | 28 ++++---------------------
 6 files changed, 6 insertions(+), 54 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 431b6a1adb8..b37806c75d9 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -481,22 +481,6 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		}
 	}
 	
-	public function fromUploadedFile($tmpFile, $path) {
-		if ($this->is_writeable($path)) {
-			$source = $this->getSource($path);
-			if ($source) {
-				$storage = OC_Filesystem::getStorage($source);
-				$result = $storage->fromUploadedFile($tmpFile, $this->getInternalPath($source));
-				if ($result) {
-					$this->clearFolderSizeCache($path);
-				}
-				return $result;
-			}
-		} else {
-			return false;
-		}
-	}
-	
 	public function getMimeType($path) {
 		$source = $this->getSource($path);
 		if ($source) {
diff --git a/apps/files_texteditor/ajax/savefile.php b/apps/files_texteditor/ajax/savefile.php
index f1a2bafc12b..a9777eb4133 100644
--- a/apps/files_texteditor/ajax/savefile.php
+++ b/apps/files_texteditor/ajax/savefile.php
@@ -37,7 +37,7 @@ $sessionname = sha1('oc_file_hash_'.$path);
 
 function do_save($path,$filecontents){
 	$sessionname = md5('oc_file_hash_'.$path);
-	OC_Filesystem::update_session_file_hash($sessionname,sha1(htmlspecialchars($filecontents)));
+	$_SESSION[$sessionname] = sha1(htmlspecialchars($filecontents));
 	OC_Filesystem::file_put_contents($path, $filecontents);
 }
 
diff --git a/files/ajax/upload.php b/files/ajax/upload.php
index 041ec0c92e3..d9dafde7779 100644
--- a/files/ajax/upload.php
+++ b/files/ajax/upload.php
@@ -46,7 +46,7 @@ if(strpos($dir,'..') === false){
 	$fileCount=count($files['name']);
 	for($i=0;$i<$fileCount;$i++){
 		$target=stripslashes($dir) . $files['name'][$i];
-		if(OC_Filesystem::fromUploadedFile($files['tmp_name'][$i],$target)){
+		if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i],$target)){
 			$result[]=array( "status" => "success", 'mime'=>OC_Filesystem::getMimeType($target),'size'=>OC_Filesystem::filesize($target),'name'=>$files['name'][$i]);
 		}
 	}
diff --git a/lib/filestorage.php b/lib/filestorage.php
index 90071a86dbe..70aaf985b8b 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -47,7 +47,6 @@ class OC_Filestorage{
 	public function fopen($path,$mode){}
 	public function toTmpFile($path){}//copy the file to a temporary file, used for cross-storage file actions
 	public function fromTmpFile($tmpPath,$path){}//copy a file from a temporary file, used for cross-storage file actions
-	public function fromUploadedFile($tmpPath,$path){}//copy a file from a temporary file, used for cross-storage file actions
 	public function getMimeType($path){}
 	public function hash($type,$path,$raw){}
 	public function free_space($path){}
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 7711116db35..b5d6023c494 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -189,17 +189,6 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		}
 	}
 
-	public function fromUploadedFile($tmpFile,$path){
-		$fileStats = stat($tmpFile);
-		if(move_uploaded_file($tmpFile,$this->datadir.$path)){
-			touch($this->datadir.$path, $fileStats['mtime'], $fileStats['atime']);
-			$this->clearFolderSizeCache($path);
-			return true;
-		}else{
-			return false;
-		}
-	}
-
 	private function delTree($dir) {
 		$dirRelative=$dir;
 		$dir=$this->datadir.$dir;
diff --git a/lib/filesystem.php b/lib/filesystem.php
index a25e8697985..268f7ddbd28 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -200,6 +200,10 @@ class OC_Filesystem{
 		}
 	}
 	
+	/**
+	 * following functions are equivilent to their php buildin equivilents for arguments/return values.
+	 */
+	
 	static public function mkdir($path){
 		return self::basicOperation('mkdir',$path,array('create','write'));
 	}
@@ -362,26 +366,6 @@ class OC_Filesystem{
 			}
 		}
 	}
-	static public function fromUploadedFile($tmpFile,$path){
-		if(OC_FileProxy::runPreProxies('fromUploadedFile',$tmpFile,$path) and self::canWrite($path) and $storage=self::getStorage($path)){
-			$run=true;
-			$exists=self::file_exists($path);
-			if(!$exists){
-				OC_Hook::emit( 'OC_Filesystem', 'create', array( 'path' => $path, 'run' => &$run));
-			}
-			if($run){
-				OC_Hook::emit( 'OC_Filesystem', 'write', array( 'path' => $path, 'run' => &$run));
-			}
-			if($run){
-				$result=$storage->fromUploadedFile($tmpFile,self::getInternalPath($path));
-				if(!$exists){
-					OC_Hook::emit( 'OC_Filesystem', 'post_create', array( 'path' => $path));
-				}
-				OC_Hook::emit( 'OC_Filesystem', 'post_write', array( 'path' => $path));
-				return $result;
-			}
-		}
-	}
 	static public function getMimeType($path){
 		return self::basicOperation('getMimeType',$path);
 	}
@@ -413,10 +397,6 @@ class OC_Filesystem{
 		
 	}
 	
-	static public function update_session_file_hash($sessionname,$sessionvalue){
-		$_SESSION[$sessionname] = $sessionvalue;
-	}
-
 	/**
 	 * abstraction for running most basic operations
 	 * @param string $operation
-- 
GitLab


From 5a6aba1e1114707942c613c2402eed3237b43a21 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Wed, 9 Nov 2011 18:41:57 +0100
Subject: [PATCH 017/546] provide caching for file metadata

---
 apps/files_sharing/lib_share.php     |   4 +-
 apps/files_sharing/sharedstorage.php |  12 +-
 db_structure.xml                     |  86 ++++++-
 files/templates/part.list.php        |   4 +-
 lib/filecache.php                    | 331 +++++++++++++++++++++++++++
 lib/files.php                        |  41 +---
 lib/filestorage/local.php            |  83 +------
 lib/filesystem.php                   |   9 +
 lib/util.php                         |   5 +
 9 files changed, 446 insertions(+), 129 deletions(-)
 create mode 100644 lib/filecache.php

diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index cde33fd1dc5..c1957d7b6c4 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -89,8 +89,8 @@ class OC_Share {
 				}
 				$query->execute(array($uid_owner, $uid, $source, $target, $permissions));
 				// Clear the folder size cache for the 'Shared' folder
-				$clearFolderSize = OC_DB::prepare("DELETE FROM *PREFIX*foldersize WHERE path = ?");
-				$clearFolderSize->execute(array($sharedFolder));
+// 				$clearFolderSize = OC_DB::prepare("DELETE FROM *PREFIX*foldersize WHERE path = ?");
+// 				$clearFolderSize->execute(array($sharedFolder));
 			}
 		}
 	}
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index b37806c75d9..5e5360e8991 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -225,8 +225,8 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		$path = ltrim($path, "/");
 		$path = preg_replace('{(/)\1+}', "/", $path);
 		$dbpath = rtrim($this->datadir.$path, "/");
-		$query = OC_DB::prepare("SELECT size FROM *PREFIX*foldersize WHERE path = ?");
-		$size = $query->execute(array($dbpath))->fetchAll();
+// 		$query = OC_DB::prepare("SELECT size FROM *PREFIX*foldersize WHERE path = ?");
+// 		$size = $query->execute(array($dbpath))->fetchAll();
 		if (count($size) > 0) {
 			return $size[0]['size'];
 		} else {
@@ -252,8 +252,8 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 			}
 			if ($size > 0) {
 				$dbpath = rtrim($this->datadir.$path, "/");
-				$query = OC_DB::prepare("INSERT INTO *PREFIX*foldersize VALUES(?,?)");
-				$result = $query->execute(array($dbpath, $size));
+// 				$query = OC_DB::prepare("INSERT INTO *PREFIX*foldersize VALUES(?,?)");
+// 				$result = $query->execute(array($dbpath, $size));
 			}
 		}
 		return $size;
@@ -266,8 +266,8 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 			$path = dirname($path);
 		}
 		$dbpath = rtrim($this->datadir.$path, "/");
-		$query = OC_DB::prepare("DELETE FROM *PREFIX*foldersize WHERE path = ?");
-		$result = $query->execute(array($dbpath));
+// 		$query = OC_DB::prepare("DELETE FROM *PREFIX*/*foldersize*/ WHERE path = ?");
+// 		$result = $query->execute(array($dbpath));
 		if ($path != "/" && $path != "") {
 			$parts = explode("/", $path);
 			$part = array_pop($parts);
diff --git a/db_structure.xml b/db_structure.xml
index ddb8c44d19d..c7fa423e14e 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -43,10 +43,19 @@
 
  <table>
 
-  <name>*dbprefix*foldersize</name>
+  <name>*dbprefix*fscache</name>
 
   <declaration>
 
+   <field>
+	   <name>id</name>
+	   <autoincrement>1</autoincrement>
+	   <type>integer</type>
+	   <default>0</default>
+	   <notnull>true</notnull>
+	   <length>4</length>
+   </field>
+   
    <field>
     <name>path</name>
     <type>text</type>
@@ -55,6 +64,24 @@
     <length>512</length>
    </field>
 
+   <field>
+	   <name>parent</name>
+	   <type>integer</type>
+	   <default>
+	   </default>
+	   <notnull>true</notnull>
+	   <length>4</length>
+   </field>
+
+   <field>
+	   <name>name</name>
+	   <type>text</type>
+	   <default>
+	   </default>
+	   <notnull>true</notnull>
+	   <length>512</length>
+   </field>
+   
    <field>
     <name>size</name>
     <type>integer</type>
@@ -63,14 +90,71 @@
     <length>4</length>
    </field>
 
+   <field>
+	   <name>ctime</name>
+	   <type>integer</type>
+	   <default>
+	   </default>
+	   <notnull>true</notnull>
+	   <length>4</length>
+   </field>
+
+   <field>
+	   <name>mtime</name>
+	   <type>integer</type>
+	   <default>
+	   </default>
+	   <notnull>true</notnull>
+	   <length>4</length>
+   </field>
+
+   <field>
+	   <name>mimetype</name>
+	   <type>text</type>
+	   <default>
+	   </default>
+	   <notnull>true</notnull>
+	   <length>32</length>
+   </field>
+
+   <field>
+	   <name>mimepart</name>
+	   <type>text</type>
+	   <default>
+	   </default>
+	   <notnull>true</notnull>
+	   <length>32</length>
+   </field>
+
    <index>
     <name>path_index</name>
+	<unique>true</unique>
     <field>
      <name>path</name>
      <sorting>ascending</sorting>
     </field>
    </index>
 
+   <index>
+	   <name>parent_index</name>
+	   <field>
+		   <name>parent</name>
+		   <sorting>ascending</sorting>
+	   </field>
+   </index>
+
+   <index>
+	   <name>parent_name_index</name>
+	   <field>
+		   <name>parent</name>
+		   <sorting>ascending</sorting>
+	   </field>
+	   <field>
+		   <name>name</name>
+		   <sorting>ascending</sorting>
+	   </field>
+   </index>
+
   </declaration>
 
  </table>
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index 46830ba3a37..7ae5756c22e 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -5,8 +5,8 @@
 			$relative_modified_date = relative_modified_date($file['mtime']);
 			$relative_date_color = round((time()-$file['mtime'])/60/60/24*14); // the older the file, the brighter the shade of grey; days*14
 			if($relative_date_color>200) $relative_date_color = 200; ?>
-			<tr data-file="<?php echo str_replace('+','%20',urlencode($file['name']));?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>'>
-				<td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo mimetype_icon('dir'); else echo mimetype_icon($file['mime']); ?>)">
+			<tr data-file="<?php echo str_replace('+','%20',urlencode($file['name']));?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mimetype']?>" data-size='<?php echo $file['size'];?>'>
+				<td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo mimetype_icon('dir'); else echo mimetype_icon($file['mimetype']); ?>)">
 					<?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" /><?php } ?>
 					<a class="name" href="<?php if($file['type'] == 'dir') echo $_['baseURL'].$file['directory'].'/'.$file['name']; else echo $_['downloadURL'].urlencode($file['directory']).'/'.urlencode($file['name']); ?>" title="">
 					<span class="nametext">
diff --git a/lib/filecache.php b/lib/filecache.php
new file mode 100644
index 00000000000..41e31b5de25
--- /dev/null
+++ b/lib/filecache.php
@@ -0,0 +1,331 @@
+<?php
+
+/**
+* @author Robin Appelman
+* @copyright 2011 Robin Appelman icewind1991@gmail.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/**
+ * provide caching for filesystem info in the database
+ *
+ * not used by OC_Filesystem for reading filesystem info,
+ * instread apps should use OC_FileCache::get where possible
+ *
+ * It will try to keep the data up to date but changes from outside ownCloud can invalidate the cache
+ */
+class OC_FileCache{
+	/**
+	 * get the filesystem info from the cache
+	 * @param string path
+	 * @return array
+	 *
+	 * returns an assiciative array with the following keys:
+	 * - size
+	 * - mtime
+	 * - ctime
+	 * - mimetype
+	 */
+	public static function get($path){
+		$path=OC_Filesystem::getRoot().$path;
+		$query=OC_DB::prepare('SELECT ctime,mtime,mimetype,size FROM *PREFIX*fscache WHERE path=?');
+		$result=$query->execute(array($path))->fetchRow();
+		if(is_array($result)){
+			return $result;
+		}else{
+			OC_Log::write('file not found in cache ('.$path.')','core',OC_Log::DEBUG);
+			return false;
+		}
+	}
+
+	/**
+	 * put filesystem info in the cache
+	 * @param string $path
+	 * @param array data
+	 *
+	 * $data is an assiciative array in the same format as returned by get
+	 */
+	public static function put($path,$data){
+		$path=OC_Filesystem::getRoot().$path;
+		if($id=self::getFileId($path)!=-1){
+			self::update($id,$data);
+		}
+		if($path=='/'){
+			$parent=-1;
+		}else{
+			$parent=self::getFileId(dirname($path));
+		}
+		$mimePart=dirname($data['mimetype']);
+		$query=OC_DB::prepare('INSERT INTO *PREFIX*fscache(parent, name, path, size, mtime, ctime, mimetype, mimepart) VALUES(?,?,?,?,?,?,?,?)');
+		$query->execute(array($parent,basename($path),$path,$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart));
+		
+	}
+
+	/**
+	 * update filesystem info of a file
+	 * @param int $id
+	 * @param array $data
+	 */
+	private static function update($id,$data){
+		$mimePart=dirname($data['mimetype']);
+		$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET size=? ,mtime=? ,ctime=? ,mimetype=? , mimepart=? WHERE id=?');
+		$query->execute(array($data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart,$id));
+	}
+
+	/**
+	 * register a file move in the cache
+	 * @param string oldPath
+	 * @param string newPath
+	 */
+	public static function move($oldPath,$newPath){
+		$oldPath=OC_Filesystem::getRoot().$oldPath;
+		$newPath=OC_Filesystem::getRoot().$newPath;
+		$newParent=self::getParentId($newPath);
+		$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET parent=? ,name=?, path=? WHERE path=?');
+		$query->execute(array($newParent,basename($newPath),$newPath,$oldPath));
+	}
+
+	/**
+	 * delete info from the cache
+	 * @param string $path
+	 */
+	public static function delete($path){
+		$path=OC_Filesystem::getRoot().$path;
+		$query=OC_DB::prepare('DELETE FROM *PREFIX*fscache WHERE path=?');
+		$query->execute(array($path));
+	}
+	
+	/**
+	 * return array of filenames matching the querty
+	 * @param string $query
+	 * @return array of filepaths
+	 */
+	public static function search($query){
+		$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE name LIKE ?');
+		$result=$query->execute(array("%$query%"));
+		$names=array();
+		while($row=$result->fetchRow()){
+			$names[]=$row['path'];
+		}
+		return $names;
+	}
+
+	/**
+	 * get all files and folders in a folder
+	 * @param string path
+	 * @return array
+	 *
+	 * returns an array of assiciative arrays with the following keys:
+	 * - name
+	 * - size
+	 * - mtime
+	 * - ctime
+	 * - mimetype
+	 */
+	public static function getFolderContent($path){
+		$path=OC_Filesystem::getRoot().$path;
+		$parent=self::getFileId($path);
+		$query=OC_DB::prepare('SELECT name,ctime,mtime,mimetype,size FROM *PREFIX*fscache WHERE parent=?');
+		$result=$query->execute(array($parent))->fetchAll();
+		if(is_array($result)){
+			return $result;
+		}else{
+			OC_Log::write('file not found in cache ('.$path.')','core',OC_Log::DEBUG);
+			return false;
+		}
+	}
+
+	/**
+	 * check if a file or folder is in the cache
+	 * @param string $path
+	 * @return bool
+	 */
+	public static function inCache($path){
+		$path=OC_Filesystem::getRoot().$path;
+		$inCache=self::getFileId($path)!=-1;
+		return $inCache;
+	}
+
+	/**
+	 * get the file id as used in the cache
+	 * @param string $path
+	 * @return int
+	 */
+	private static function getFileId($path){
+		$query=OC_DB::prepare('SELECT id FROM *PREFIX*fscache WHERE path=?');
+		$result=$query->execute(array($path))->fetchRow();
+		if(is_array($result)){
+			return $result['id'];
+		}else{
+			OC_Log::write('file not found in cache ('.$path.')','core',OC_Log::DEBUG);
+			return -1;
+		}
+	}
+
+	/**
+	 * get the file id of the parent folder, taking into account '/' has no parent
+	 * @param string $path
+	 * @return int
+	 */
+	private static function getParentId($path){
+		if($path=='/'){
+			return -1;
+		}else{
+			return self::getFileId(dirname($path));
+		}
+	}
+
+	/**
+	 * called when changes are made to files
+	 */
+	public static function fileSystemWatcherWrite($params){
+		$path=$params['path'];
+		$fullPath=OC_Filesystem::getRoot().$path;
+		$mimetype=OC_Filesystem::getMimeType($path);
+		if($mimetype=='httpd/unix-directory'){
+			$size=0;
+		}else{
+			if(($id=self::getFileId($fullPath))!=-1){
+				$oldInfo=self::get($fullPath);
+				$oldSize=$oldInfo['size'];
+			}else{
+				$oldSize=0;
+			}
+			$size=OC_Filesystem::filesize($path);
+			self::increaseSize(dirname($fullPath),$size-$oldSize);
+		}
+		$mtime=OC_Filesystem::filemtime($path);
+		$ctime=OC_Filesystem::filectime($path);
+		self::put($path,array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype));
+	}
+
+	/**
+	 * called when files are deleted
+	 */
+	public static function fileSystemWatcherDelete($params){
+		$path=$params['path'];
+		$fullPath=OC_Filesystem::getRoot().$path;
+		error_log("delete $path");
+		if(self::getFileId($fullPath)==-1){
+			return;
+		}
+		$size=OC_Filesystem::filesize($path);
+		self::increaseSize(dirname($fullPath),-$size);
+		self::delete($path);
+	}
+
+	/**
+	 * called when files are deleted
+	 */
+	public static function fileSystemWatcherRename($params){
+		$oldPath=$params['oldpath'];
+		$newPath=$params['newpath'];
+		$fullOldPath=OC_Filesystem::getRoot().$oldPath;
+		$fullNewPath=OC_Filesystem::getRoot().$newPath;
+		if(($id=self::getFileId($fullOldPath))!=-1){
+			$oldInfo=self::get($fullOldPath);
+			$oldSize=$oldInfo['size'];
+		}else{
+			return;
+		}
+		$size=OC_Filesystem::filesize($oldPath);
+		self::increaseSize(dirname($fullOldPath),-$oldSize);
+		self::increaseSize(dirname($fullNewPath),$oldSize);
+		self::move($oldPath,$newPath);
+	}
+
+	/**
+	 * adjust the size of the parent folders
+	 * @param string $path
+	 * @param int $sizeDiff
+	 */
+	private static function increaseSize($path,$sizeDiff){
+		while(($id=self::getFileId($path))!=-1){
+			$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET size=size+? WHERE id=?');
+			error_log('diff '.$path.' '.$sizeDiff);
+			$query->execute(array($sizeDiff,$id));
+			$path=dirname($path);
+		}
+	}
+
+	/**
+	 * recursively scan the filesystem and fill the cache
+	 * @param string $path
+	 * @param bool $onlyChilds
+	 */
+	public static function scan($path,$onlyChilds=false){//PROBLEM due to the order things are added, all parents are -1
+		$dh=OC_Filesystem::opendir($path);
+		$stat=OC_Filesystem::stat($path);
+		$mimetype=OC_Filesystem::getMimeType($path);
+		$stat['mimetype']=$mimetype;
+		if($path=='/'){
+			$path='';
+		}
+		self::put($path,$stat);
+		$fullPath=OC_Filesystem::getRoot().$path;
+		$totalSize=0;
+		if($dh){
+			while (($filename = readdir($dh)) !== false) {
+				if($filename != '.' and $filename != '..'){
+					$file=$path.'/'.$filename;
+					if(OC_Filesystem::is_dir($file)){
+						self::scan($file,true);
+					}else{
+						$stat=OC_Filesystem::stat($file);
+						$mimetype=OC_Filesystem::getMimeType($file);
+						$stat['mimetype']=$mimetype;
+						self::put($file,$stat);
+						$totalSize+=$stat['size'];
+					}
+				}
+			}
+		}
+		self::increaseSize($fullPath,$totalSize);
+	}
+
+	/**
+	 * fine files by mimetype
+	 * @param string $part1
+	 * @param string $part2 (optional)
+	 * @return array of file paths
+	 *
+	 * $part1 and $part2 together form the complete mimetype.
+	 * e.g. searchByMime('text','plain')
+	 *
+	 * seccond mimetype part can be ommited
+	 * e.g. searchByMime('audio')
+	 */
+	public static function searchByMime($part1,$part2=''){
+		if($part2){
+			$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE mimepart=?');
+			$result=$query->execute(array($part1));
+		}else{
+			$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE mimetype=?');
+			$result=$query->execute(array($part1.'/'.$part2));
+		}
+		$names=array();
+		while($row=$result->fetchRow()){
+			$names[]=$row['path'];
+		}
+		return $names;
+	}
+}
+
+//watch for changes and try to keep the cache up to date
+OC_Hook::connect('OC_Filesystem','post_write','OC_FileCache','fileSystemWatcherWrite');
+OC_Hook::connect('OC_Filesystem','delete','OC_FileCache','fileSystemWatcherDelete');
+OC_Hook::connect('OC_Filesystem','rename','OC_FileCache','fileSystemWatcherRename');
+
diff --git a/lib/files.php b/lib/files.php
index 88b559059f0..143aab5c72d 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -36,44 +36,13 @@ class OC_Files {
 		if(strpos($directory,OC::$CONFIG_DATADIRECTORY)===0){
 			$directory=substr($directory,strlen(OC::$CONFIG_DATADIRECTORY));
 		}
-		$filesfound=true;
-		$content=array();
-		$dirs=array();
-		$file=array();
-		$files=array();
-		if(OC_Filesystem::is_dir($directory)) {
-			if ($dh = OC_Filesystem::opendir($directory)) {
-			while (($filename = readdir($dh)) !== false) {
-				if($filename<>'.' and $filename<>'..' and substr($filename,0,1)!='.'){
-					$file=array();
-					$filesfound=true;
-					$file['name']=$filename;
-					$file['directory']=$directory;
-					$stat=OC_Filesystem::stat($directory.'/'.$filename);
-					$file=array_merge($file,$stat);
-					$file['size']=OC_Filesystem::filesize($directory.'/'.$filename);
-					$file['mime']=OC_Files::getMimeType($directory .'/'. $filename);
-					$file['readable']=OC_Filesystem::is_readable($directory .'/'. $filename);
-					$file['writeable']=OC_Filesystem::is_writeable($directory .'/'. $filename);
-					$file['type']=OC_Filesystem::filetype($directory .'/'. $filename);
-					if($file['type']=='dir'){
-						$dirs[$file['name']]=$file;
-					}else{
-						$files[$file['name']]=$file;
-					}
-				}
-			}
-			closedir($dh);
-			}
+		$files=OC_FileCache::getFolderContent($directory);
+		foreach($files as &$file){
+			$file['directory']=$directory;
+			$file['type']=($file['mimetype']=='httpd/unix-directory')?'dir':'file';
 		}
-		uksort($dirs, "strnatcasecmp");
 		uksort($files, "strnatcasecmp");
-		$content=array_merge($dirs,$files);
-		if($filesfound){
-			return $content;
-		}else{
-			return false;
-		}
+		return $files;
 	}
 
 
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index b5d6023c494..87efdb15ad2 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -13,13 +13,11 @@ class OC_Filestorage_Local extends OC_Filestorage{
 	}
 	public function mkdir($path){
 		if($return=mkdir($this->datadir.$path)){
-			$this->clearFolderSizeCache($path);
 		}
 		return $return;
 	}
 	public function rmdir($path){
 		if($return=rmdir($this->datadir.$path)){
-			$this->clearFolderSizeCache($path);
 		}
 		return $return;
 	}
@@ -72,12 +70,10 @@ class OC_Filestorage_Local extends OC_Filestorage{
 	}
 	public function file_put_contents($path,$data){
 		if($return=file_put_contents($this->datadir.$path,$data)){
-			$this->clearFolderSizeCache($path);
 		}
 	}
 	public function unlink($path){
 		$return=$this->delTree($path);
-		$this->clearFolderSizeCache($path);
 		return $return;
 	}
 	public function rename($path1,$path2){
@@ -87,8 +83,6 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		}
 
 		if($return=rename($this->datadir.$path1,$this->datadir.$path2)){
-			$this->clearFolderSizeCache($path1);
-			$this->clearFolderSizeCache($path2);
 		}
 		return $return;
 	}
@@ -101,7 +95,6 @@ class OC_Filestorage_Local extends OC_Filestorage{
 			$path2.=$source;
 		}
 		if($return=copy($this->datadir.$path1,$this->datadir.$path2)){
-			$this->clearFolderSizeCache($path2);
 		}
 		return $return;
 	}
@@ -114,12 +107,10 @@ class OC_Filestorage_Local extends OC_Filestorage{
 				case 'w+':
 				case 'x+':
 				case 'a+':
-					$this->clearFolderSizeCache($path);
 					break;
 				case 'w':
 				case 'x':
 				case 'a':
-					$this->clearFolderSizeCache($path);
 					break;
 			}
 		}
@@ -182,7 +173,6 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		$fileStats = stat($tmpFile);
 		if(rename($tmpFile,$this->datadir.$path)){
 			touch($this->datadir.$path, $fileStats['mtime'], $fileStats['atime']);
-			$this->clearFolderSizeCache($path);
 			return true;
 		}else{
 			return false;
@@ -198,7 +188,6 @@ class OC_Filestorage_Local extends OC_Filestorage{
 			if ($item == '.' || $item == '..') continue;
 			if(is_file($dir.'/'.$item)){
 				if(unlink($dir.'/'.$item)){
-					$this->clearFolderSizeCache($dir);
 				}
 			}elseif(is_dir($dir.'/'.$item)){
 				if (!$this->delTree($dirRelative. "/" . $item)){
@@ -207,7 +196,6 @@ class OC_Filestorage_Local extends OC_Filestorage{
 			}
 		}
 		if($return=rmdir($dir)){
-			$this->clearFolderSizeCache($dir);
 		}
 		return $return;
 	}
@@ -247,75 +235,6 @@ class OC_Filestorage_Local extends OC_Filestorage{
 	 * @return int size of folder and it's content
 	 */
 	public function getFolderSize($path){
-		$path=str_replace('//','/',$path);
-		if($this->is_dir($path) and substr($path,-1)!='/'){
-			$path.='/';
-		}
-		$query=OC_DB::prepare("SELECT size FROM *PREFIX*foldersize WHERE path=?");
-		$size=$query->execute(array($path))->fetchAll();
-		if(count($size)>0){// we already the size, just return it
-			return $size[0]['size'];
-		}else{//the size of the folder isn't know, calulate it
-			return $this->calculateFolderSize($path);
-		}
-	}
-
-	/**
-	 * @brief calulate the size of folder and it's content and cache it
-	 * @param string $path file path
-	 * @return int size of folder and it's content
-	 */
-	public function calculateFolderSize($path){
-		if($this->is_file($path)){
-			$path=dirname($path);
-		}
-		$path=str_replace('//','/',$path);
-		if($this->is_dir($path) and substr($path,-1)!='/'){
-			$path.='/';
-		}
-		$size=0;
-		if ($dh = $this->opendir($path)) {
-			while (($filename = readdir($dh)) !== false) {
-				if($filename!='.' and $filename!='..'){
-					$subFile=$path.'/'.$filename;
-					if($this->is_file($subFile)){
-						$size+=$this->filesize($subFile);
-					}else{
-						$size+=$this->getFolderSize($subFile);
-					}
-				}
-			}
-			if($size>0){
-				$query=OC_DB::prepare("INSERT INTO *PREFIX*foldersize VALUES(?,?)");
-				$result=$query->execute(array($path,$size));
-			}
-		}
-		return $size;
-	}
-
-	/**
-	 * @brief clear the folder size cache of folders containing a file
-	 * @param string $path
-	 */
-	public function clearFolderSizeCache($path){
-		if($this->is_file($path)){
-			$path=dirname($path);
-		}
-		$path=str_replace('//','/',$path);
-		if($this->is_dir($path) and substr($path,-1)!='/'){
-			$path.='/';
-		}
-		$query=OC_DB::prepare("DELETE FROM *PREFIX*foldersize WHERE path = ?");
-		$result=$query->execute(array($path));
-		if($path!='/' and $path!=''){
-			$parts=explode('/',$path);
-			//pop empty part
-			$part=array_pop($parts);
-			if(empty($part)){
-				array_pop($parts);
-			}
-			$parent=implode('/',$parts);
-			$this->clearFolderSizeCache($parent);
-		}
+		return 0;//depricated, use OC_FileCach instead
 	}
 }
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 268f7ddbd28..bd68831a711 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -42,6 +42,7 @@
  *
  *   the &run parameter can be set to false to prevent the operation from occuring
  */
+
 class OC_Filesystem{
 	static private $storages=array();
 	static private $mounts=array();
@@ -84,6 +85,14 @@ class OC_Filesystem{
 		}
 		self::$fakeRoot=$fakeRoot;
 	}
+
+	/**
+	 * get the fake root
+	 * @return string
+	 */
+	static public function getRoot(){
+		return self::$fakeRoot;
+	}
 	
 	/**
 	* get the part of the path relative to the mountpoint of the storage it's stored in
diff --git a/lib/util.php b/lib/util.php
index e010a572e3a..b20e8e69e73 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -49,6 +49,11 @@ class OC_Util {
 			$quotaProxy=new OC_FileProxy_Quota();
 			OC_FileProxy::register($quotaProxy);
 			self::$fsSetup=true;
+
+			//create the file cache if necesary
+			if(!OC_FileCache::inCache('')){
+				OC_FileCache::scan('');
+			}
 		}
 	}
 
-- 
GitLab


From 524e3686a0da79493a6048d8d92b7bbb0982ec08 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Thu, 10 Nov 2011 16:40:09 +0100
Subject: [PATCH 018/546] tell the user when the files are being scanned

---
 apps/files_sharing/sharedstorage.php |  29 ++++++---------------------
 files/ajax/scan.php                  |  16 +++++++++++++++
 files/css/files.css                  |   4 +++-
 files/js/files.js                    |  19 ++++++++++++++++++
 files/templates/index.php            |   5 +++++
 lib/filecache.php                    |   2 ++
 lib/util.php                         |   5 -----
 owncloud.db.filesystem               | Bin 0 -> 2348032 bytes
 8 files changed, 51 insertions(+), 29 deletions(-)
 create mode 100644 files/ajax/scan.php
 create mode 100644 owncloud.db.filesystem

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 5e5360e8991..f7849d499f0 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -172,18 +172,9 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 	// TODO fill in other components of array
 	public function stat($path) {
 		if ($path == "" || $path == "/") {
-			$stat["dev"] = "";
-			$stat["ino"] = "";
-			$stat["mode"] = "";
-			$stat["nlink"] = "";
-			$stat["uid"] = "";
-			$stat["gid"] = "";
-			$stat["rdev"] = "";
 			$stat["size"] = $this->filesize($path);
 			$stat["mtime"] = $this->filemtime($path);
 			$stat["ctime"] = $this->filectime($path);
-			$stat["blksize"] = "";
-			$stat["blocks"] = "";
 			return $stat;
 		} else {
 			$source = $this->getSource($path);
@@ -220,18 +211,7 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 	}
 
 	public function getFolderSize($path) {
-		// Shared folder sizes are cached separately from the source folder sizes because folders can have different names
-		$path = rtrim($path, "/");
-		$path = ltrim($path, "/");
-		$path = preg_replace('{(/)\1+}', "/", $path);
-		$dbpath = rtrim($this->datadir.$path, "/");
-// 		$query = OC_DB::prepare("SELECT size FROM *PREFIX*foldersize WHERE path = ?");
-// 		$size = $query->execute(array($dbpath))->fetchAll();
-		if (count($size) > 0) {
-			return $size[0]['size'];
-		} else {
-			return $this->calculateFolderSize($path);
-		}
+		return 0; //depricated
 	}
 	
 	private function calculateFolderSize($path) {
@@ -321,8 +301,8 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 						$ctime = $tempctime;
 					}
 				}
-				return $ctime;
 			}
+			return $ctime;
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {
@@ -342,8 +322,8 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 						$mtime = $tempmtime;
 					}
 				}
-				return $mtime;
 			}
+			return $mtime;
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {
@@ -482,6 +462,9 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 	}
 	
 	public function getMimeType($path) {
+		if ($path2 == "" || $path2 == "/") {
+			return 'httpd/unix-directory';
+		}
 		$source = $this->getSource($path);
 		if ($source) {
 			$storage = OC_Filesystem::getStorage($source);
diff --git a/files/ajax/scan.php b/files/ajax/scan.php
new file mode 100644
index 00000000000..dec949a819b
--- /dev/null
+++ b/files/ajax/scan.php
@@ -0,0 +1,16 @@
+<?php
+
+require_once '../../lib/base.php';
+
+$force=isset($_GET['force']) and $_GET['force']=='true';
+$checkOnly=isset($_GET['checkonly']) and $_GET['checkonly']=='true';
+
+//create the file cache if necesary
+if($force or !OC_FileCache::inCache('')){
+	if(!$checkOnly){
+		OC_FileCache::scan('');
+	}
+	OC_JSON::success(array("data" => array( "done" => true)));
+}else{
+	OC_JSON::success(array("data" => array( "done" => false)));
+}
\ No newline at end of file
diff --git a/files/css/files.css b/files/css/files.css
index 22f4810d0a6..39f0b9fe780 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -73,4 +73,6 @@ table thead.fixed { height:2em; }
 
 /* add breadcrumb divider to the File item in navigation panel */
 #navigation>ul>li:first-child { background:url('../../core/img/breadcrumb-start.svg') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; position:fixed; }
-#navigation>ul>li:first-child+li { padding-top:2.9em; }
\ No newline at end of file
+#navigation>ul>li:first-child+li { padding-top:2.9em; }
+
+#scanning-message{ top:40%; left:40%; position:absolute; display:none }
\ No newline at end of file
diff --git a/files/js/files.js b/files/js/files.js
index 4eaa098241b..4dca1a110ec 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -334,8 +334,27 @@ $(document).ready(function() {
 			$('#new>a').click();
 		});
 	});
+
+	//check if we need to scan the filesystem
+	$.get(OC.filePath('files','ajax','scan.php'),{checkonly:'true'}, function(response) {
+		if(response.data.done){
+			scanFiles();
+		}
+	}, "json");
 });
 
+function scanFiles(force){
+	force=!!force; //cast to bool
+	$('#scanning-message').show();
+	$.get(OC.filePath('files','ajax','scan.php'), function(response) {
+		if(response && response.data && response.data.done){
+			window.location.reload();
+		}else{
+			alert('error')
+		}
+	}, "json");
+}
+
 function boolOperationFinished(data, callback) {
 	result = jQuery.parseJSON(data.responseText);
 	if(result.status == 'success'){
diff --git a/files/templates/index.php b/files/templates/index.php
index 722c38e4776..21a4e2df010 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -63,3 +63,8 @@ if (isset($_['files'])) {
 		<?php echo $l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.');?>
 	</p>
 </div>
+<div id="scanning-message">
+	<p>
+		<?php echo $l->t('Files are being scanned, please wait.');?>
+	</p>
+</div>
diff --git a/lib/filecache.php b/lib/filecache.php
index 41e31b5de25..902a8052afc 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -70,6 +70,8 @@ class OC_FileCache{
 		}
 		$mimePart=dirname($data['mimetype']);
 		$query=OC_DB::prepare('INSERT INTO *PREFIX*fscache(parent, name, path, size, mtime, ctime, mimetype, mimepart) VALUES(?,?,?,?,?,?,?,?)');
+// 		echo $path;
+// 		print_r($data);
 		$query->execute(array($parent,basename($path),$path,$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart));
 		
 	}
diff --git a/lib/util.php b/lib/util.php
index b20e8e69e73..e010a572e3a 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -49,11 +49,6 @@ class OC_Util {
 			$quotaProxy=new OC_FileProxy_Quota();
 			OC_FileProxy::register($quotaProxy);
 			self::$fsSetup=true;
-
-			//create the file cache if necesary
-			if(!OC_FileCache::inCache('')){
-				OC_FileCache::scan('');
-			}
 		}
 	}
 
diff --git a/owncloud.db.filesystem b/owncloud.db.filesystem
new file mode 100644
index 0000000000000000000000000000000000000000..082977a37eff00bc5a0e6aeffa6a8fa9f57025fd
GIT binary patch
literal 2348032
zcmeEv31C#k{r}8+8$!YjLV%F)5D_ATO@MHCRC5smNr)tXh#FsZUy>zzggppB6c>+L
zt+raNw)Lph+QVwodemP}tw+_?YJc|dXFYnWwN?A8J^j`GKi`?R*V}!Y7pwiZb_2V!
zZ{Ey&XTEcN=X*`p$!)%<q4kBr0X?d%W-i7#J4w?RJNiz>CjNn?{+8k=Pd#S*PK!?e
zi888xwx|eECF+y(qDFl~{iFIj^*8DZ>d(|?)u&{1dY;1X0tN~g_{T7?;wa=_wg_K~
zEAgex$5;7Wd>wHFzNSsZS4k<pCKl1$<mwyvW~*gDKMQ{a3=}Z%?#IBY3b{8wil$Dy
zK>e%wy84RxB6j9y)E}x(s1#lJD`232fqx4O6km6@&e(*njh@I@(KDYpl`+>}KY0?q
z%Wf=TOkIC1Hh*RPRb|-m*I%|6-|ODHehOMvq`sf2zr~!tPrV603x5R+6fp4r0Ryv(
zR5uTKdIE;mr}spRNW>QkM)(4kdICjzLcyr+iAH*KuQ!aBy`j)xgwIpeb>gk=H-cV0
z+~YBSMEEpCU8EpmU&Nz(28@Nr&EV=%N;?$x1wFnY-5)7Z)CsJJ{}8P$+M<3}J%#^J
z*{=Ne|A)pGK)$UQaGi0$6^|)ypT`*X1-<S*pWleM+hY-*$Gu4pMzm9Xfq)TqcMbW%
zzNpp})%|{qHf?L4);(ZojlO^$4u^v7u23xKjfQp4pu1+ZR;@LJNA#dp@6`hlJnag_
zv_?I+G^%y$gND{_tPBjTp870f#Z&gX;(NyiPp~>^G#UiCxqoCRngMbxfTUGdI~vKt
zI-(Bfc+(OJd3#3;R4No5Fv0|U`u|}EEOV=RZrEG&s2&XkeY(5b(8K+DL{#{LK>ap>
z{&Q2EkoGebIo7XODuMFNy{@<?cQw+Q<lf>7_G|Uw=s+y&ZVUy6{08`O+YC=A?4>td
z<}%=JY|?7owRIMRRBK)OeykGIjw5QYzu#A_o}L?MOUN4uP)Bw}Y5AZWWgk^gVXnT8
z@8YXOkZM5TR{;YB47@8bP<&;vswh*6rj*e9pTdbDIPn$i|2L|;)ss|J`HHenDd+d{
zeY}NNi`VZ;JY+X&;=K7TrB<mpW}|;Z>oh`Gjy3$G#j@f@SR}h<yOgEM{KuO;9wQhH
z`#kh!KIo?j7arqMPFBk9KGg_^v}IiZJu*P+cV{dxH0Z;I+Zftsgsa4=`z<6_n~Riq
zk#fWvHES$O`q5g8zRwrbTEd1A)Q9yEyr+G#8yl7p)!Kca3sEqYbi|vW+pgb%l9np7
z9<go?E3^)uXHaVaVHoro)m;H!bO1Z(ChY7ZRC<3T6s+Fq!^SUn^ZLH1L1Lf*DtgxA
zD0-1Bdgf^D2C5{L1ITTmfuIo<B_#<7JmmmZt+nYf?AIGXf<%bO5PS5@dvPYc{3Mrh
zwlZUHt!TcnG@{jOoxZS+&2L%bK-d@2Hisg}GvFK2>IXt2T6fsjtNYRX{Q`+Iq9}wl
zqUl_jKD}mDHWI`7fF1yKVMGRvXcX^hr;QMu(Wr+*eqT_hc21vzqw%ThT}nWidQHvx
ztYX^r@SxVNgI*32$<eN(XV4n~N$OmW9d~q&OQ}*O-P<%`gwc%Ved5*RCTy%ft#>Jh
zl!@Qp1Y#pv-8G;O8D8{<9szN$E!#O@h_ZlKyw+M`J};uFt3e-lMJp$QoZ-`!xs-OL
z=x`@sN2voqr-9zlhC#Dw%j*5Tv4BWi^hqS1TJ2JHD#}M2K@>#8F;A4Jx=^3U&@KUY
z60}v+c;x|c{$~dmJHT6&zo=W(Te9cGI};Oc<Hco5mhi*7qk6C3z_COh8p0W;&)1*+
zTWQ?ZT;JWSb=NnvHETzvzdBM|b|munyhmy~>bEs+s^7M3Rb5?`*3`VQetTQDwiN$5
zwsvbB+uPb!Xh+Jj2aS>OB;Tj|V}^qaRp(VJ#bt{Y@e7wEnqwZjP-F9#n$;BZ1vP|P
z(c017+|s;F>)h7bUcYUZwxxNOR=>S_YikE`wl{ZlqZLD#pQ-xP)vmH_?~oqG5|t`7
zftH$dqy+UqTJtiCD=pEqOcX|Z2aq~Z&71{dz)^{L(*&HPK{3&hp|r}aPH$><-2%vf
zCZoZL!H_RQRi`?kZ25A&OY~M`uOCuy9J%+#44g$QkFJb<v%FkJ7+iszRl8ghXaF3-
zT4(I1Zt4-gQvF|Kmb1O1_2li%Kv7fkDOxI_wzWfy@6@26cUpZ{W7R1|6Uvq>;v;6!
z)UVdUCzypNN=>E7RW7|1C5!pb=Q2K*zgMYLKBPSK&dm0Iw^9QWip$)Kc)Tnf<<!+y
zycg%fdn#c*<gd^uo#=-65yi!2OPBI^e`59M4~JqyJ+TO=2~SVzp)_MG(sG!3N6Scm
z`f9j#jqT!qy(TqL?9x?5CKi`1T*%{f8MTTephhO;u1#bdHA!FVmZA1lRkbA(%9<B)
zCNOW#Ha!*%iRYdq?4H`>&&h|^l@^y(RPgib6BYG`JcCqE5l+dfridQTvP&J2j<QuX
zHC0%RL&KniQi!aTv9!E}Vrfh7_KvRBmX7A8<kpnflEMZEp0t%ev80;sqoF|~m{okl
z6QXsotG&Lh4ePA6P_HpWTZG-~SlD-@*0!~yrMvl*?kbx9Tz!?{f8noyfdU5J-58k0
z)v|Kk8}J29#;~0Ke`4yN-rWr^w61`G0tS*8DCSC;SO!Q7kgI=W_+R)dV4#43{|F3}
zsAXJCe@^>9_^5@y0tN~g_z%QDVgCOIc6y=71q_%Np!x4&?ToeagUZ?JnP&7`3l6WC
zR9rT19zTC|iVaJ`Jb$QvY7Q1`|9BX%flxq5vzj0b>~3vuPI5h$*5I#N{MTw~jurni
z<bLB25fYa-#cs_fOoSpP1gp-{`htC-6w5U!eXEL}Gr72|s*0btE`hG0u+e8gHUkk9
z(3bWzJqvwlFA0rV{OLS`&~YH-ot2r!&zw?RR$I#t52g@cYNiUQhD1U}%#0j}$Vf1r
zF_qMV?MauuW-;qC1f~Ha&})R9W~ho+Of4=up_a#YNkLLl^A=jZR8S--PfAusHhreq
z&`e>WP4<M8$x;Szk&Ho&Nz$}JOEw@W|5Mca7_5Hodux-vkgI@!0tVh$45%-%avKOs
zl%n#A>S-oBAM3TS5rBX&m~JLeJBJsQ&z?OanJjGh^<cjdEYSZpcr8R1Fz_FM0pkA`
z_<#Qa9bIT*0RuTOK>L4@TE*0#s&}ausk`vA@K?Y<0RvVHtSoXdoh6Uck)&m18kt=^
z6b|hlsUC(!rBUs2u^wmXp#<n%uDaOnT*(vWyy;~hqqx{E2Z^cR3hrXH<=OR4)Bl;k
zj%4_MAD^X6QEpeB&un^p!8ECwI-JF%$>7gKX4$i5ghFUKk0o8})2iVv6ciIW+{A-}
zo~73p8S?8Rq%WJvbF1o{KA~*ZQXUiR6=W5BGm|3}nVpM?f<#&T5~?7@ld^Suc!p^3
zdDW=~<2)6P`b@4|;$cpX1}EO-<jFxhG{v^e)U3zIArK>(>izjRkck}GI2j9uY15F<
z0Zn5_R?ZY^w1=l9T25?5>SYm@WwlpCi>9XQ#@eY93+shQWEhsMnVo1;;q*bW3<}Ft
zRqk06${H*3s0ND)3C&>fYwqF7BZQI3d501$f+q2RP^(3&lE3F=wJiCHT4zziU1Q&k
zV6AQs`%|r}UA5k}%c+K`lzEWmh0$`C)cH+Ji#(~R*m~(9VC>SXi2g59>zMkI>Q(F1
zud7#N&i=wv0RsgLSTL|s)p_=g>b9W-imKHfXUS>5b}d(T=SrQ64p5I#cR5H)#VT{u
z+8jv>`ahPgEj$)5@SlVMI{$O^I}HB|e+3K_Fz|1TfmK{BKixdnud31O)~&AX^Q`Kt
z>Dy4_UEQ~O-CEtKS-*P2nhl;>Z|z!d@0ty(`=tK=>#X4W=ij*F3so;*U>q2jq?U7Y
znJCcz<G@=XX#oT8HVhQx|L?XQEwrbA0p}Q?^S_JTz}O9Zsj~TBPWm4&nho{oCGbEa
z<a;{#2<r(Ofl$<lL_=Y{-$=N~NeXP{=aTu^WlRVHletL_2my*zl@@XzArm~T%@N+c
z&YzT!BSi*uC}Wd#gZXPgmJG>!VamsPEWTp$iEw;gQL5qX8HUfkvBfx$tVKexuqRD8
znosfsKYZ{cm?}13T1X`W<Z%%0<Z}3wNvXzH#ZN1P%Op2HoN{3V|8z!pq(>(YbtFaX
z&xokVLRjW|!kfsNp=_Tn6wHzw18>f;EX&RmpOOQgoYKguc=ue{yq$>=kf`m@KqwkY
zZ=Q^(v~8YzPt6m*95*i;83}hmscyhXAXm>lnQ~<NW)<{*ov)RJlm!gD+b~d=|L?XQ
zEwrbA0p}Pf%zx*&Dx@r6;N6CS!u)@?^=P3z1q?XH0L_1eUBcKUN{{ng??}q?PM%j>
zwt6+cur<M9N$5QGgnIWFxcLk$Bx}^dEG~;R1@T#&njR$brl-&E4no!}(@}jM{qP7_
zZ&B!TgHh+qkqP)YxYli)Il{&e{7Qp6neB()bSxc-1#rQa<t7BcN+5t#&QmT+@FK$~
z!*p|vdn}@Xkk{AevvXlxbzbHC;<9z?_yx&J9ug3eJ(<y~iMNqO_WhbnGoGF$rf#~8
zLO#0^vw69iOm1KHq4TWQ8`LI^C<uvBJq`2u$4{a$u!$gRfJC{@GI>J&P?`xrt#C<B
z&c_dgf~aJ|z=NuUi^UKZjDm@qupyvkn*P7<Wa^#o$eb<|TEIX718*}1HuFiWyt<lm
z&e%Frk*CS%(_{XqmRL``mS?2h(Y%AMklE3_wQ1{$9h<jq-_}vzR-pgi=FTY;SHQr(
z5e8`fyLd6<#mY6xuhhf;Mpb`1t9stla$zTWK~LiBLANV|L>8CGB!3^7MU|#rjpLXR
zOE(c+Q?p@hZkaRawx}=aPZ#RvIa&~fD@4f&`Yw-x!BDK%@AKr6=L06p*wX3wEK<}w
zLgc3Y?NWOHZ_tCwg!A2slM-WBwJn%XHe(6jE7U%GUYz`rm_EwvgbdGk@NQ>bpOs99
z;{jrun#rVlUWE|e$8oHYcg-bJp~G<xVp{PcVu^i6i}!T&NE9KE-q6~Teics*^&Oo8
z5}jdd$z64@5+l#e<F%rx$wHAkt5!$nYI%B&EF2^%n@p7O0*K;;VoO2)@9kVh3S|{A
z@b86z0{#E*)nA3$7BKL3VxX}9zn$1DlvTjMzZV8*|L5vs4F3y%1q>80@b8R)S}^j;
z%ggH$*1e_>zzh;10@FE|)&LHdu>V!rt&H8uf2_RmFWvaV)eB(@bOJvwkYM5@yq))?
zd0rCYWYY_JM*Pw&mQK#>|EN$or}YT9LAD+Y@h+F7*=s~RVc(FvWh7maE7(f5a^jRA
zy6SL+CYWC5`Lgik(Zk*hM2Uzhdkl&9<3UYYk2qJR=!^ONnf5rQn4ZA@11bqQnUYn9
zl|{v6%a`->j!WPtV0eA76ib*Zr9U2%g`4!ZgqdvXoP4HAxr~qKPI0^8Bhy29#1~29
zpyssyNhVF>KH8Nm<o^Z#-~ZC<UZHXY47_6)DDeN@G1L|cE@0qa9s`B>|1aM~g$foh
z@Qz`C=D*4xWBf7YY~_`A3{0Wme+CBP)khYWK{5336w8TL92@DtZys9Z^K!d0t$ZyG
zwc@994;3=G<qU6o_zW#BE?Zp9<K@!1ODeOqrqyOmGgN-$VYr8YCG=i0nuq$QC!wny
z4o^EuvP9Z55fm|`hm$1SM8rxP6eZphj?CYVkz~0|Adi~XcvQNCWl1iplG+XHa6N7<
z{^z(JSNQ)god5qBld}M$fPsHK4AB11)$1Al7yb$uC}7}U3Ik{I2`oOPe0AMgkEgHJ
zyS{e4QRm&@U9)!m+PXD0wRIk^v7yfBU01WNPp_?8>#beWyUs9b^z|Dyc-PhT)~wpF
zzOS!#eQnYycx`Pp{jbq#*Bo0@d+e&!h4cTvREHNTQ^3GK6$3Q?6~2V=@8hfRmm34|
z6-O7BRaNoBvoep3bUsU+s>M^S&4E$8q|;*lGhNNnbVG8Hc1V|3=8;FxRds7qLS4Iq
zW7YXpOGI@qvakUnp`b8zk*8$w<hH4<cqtCI$m95AOS!~(JXOhjGHsFEkw{ynB)NRb
zL_VkNTO`c%eK}?g2+OGoXJ9q6J4E4rBiK(aSrZx<_SJ}nb<d!agc09?94-Y?#!%1@
zk?q0_m=+T%d+21IMOS8~n{s8RHtqlKVCo&YhkhZpfPn%A{-rRmg}ch*Q%sUx_ttnl
z9<OKZ+P+nuwd>a4(w~}My;kpCWvutCuhIL~tnSro>U2-ty1otT*47}(TT^57_Vuk^
z-{&z_(f(h-I+*&b`k?x8^+L5rZB*wfe^Q=M?ocjQ4k){nMx{bg`1km&{C#{c@8E0s
zRQ5aeE%qsP0Sh2&+FwP5tIR!1>@U6`IFj)H?CsfyO%m>-YgVqBv%pnRJ}aSiX9UR>
z(>r2Bv~pL4I~kuNXKm$tS9SR;@@yRGi5mN(P}G9^?^FrP=DDifS?_a{w7Pt*tEzm4
z*ja~x1~|zv66FL#N0+&9$86@y9EH@*nd4emJ|kgN88Pb-3@w`NTIimYjL(_%2!R6~
z`-oRhKqef_5;!p9bL3og)J)fg@>#k!;0yM6;o&FfHG&@8N!;TZ7))WpJ;SxZJv(=*
z9HrLO&YSL9Qa(dwF!m3H!qH@Nj+*9L;x-}5S2;?kJz}b>ynKe~4Lg~4;S^W7dzKlS
zE8FbJK*S8{%W#ldEe1m{q)j3`B%-r2)~>86FLf<Vj0MxhdaC(LN?c151HpWmRYuLq
z+JzHc?nD{B0Nlv$^BKd*fq?F)Dt5UO<)kIZDhu_QKLPcbA)V59NvHJ5)+{Na>SVmj
zDgxD+>vAnN2PLk74*JluCOQ_YuEpkvly7onpQF%l6vNi<)lq<%c@d}Kn2gVrRr3E{
zX6nmn)41@nfPn%A-fb9|Rp}}#mz#5Hy_}+cg_W?)jBQqj*yU=4a<j6YKg>^N&yBbF
z&AgOV@v<V9tFFv#QYUV)WB*-zv#Gb<U$vm)%h$EjXCN9K^15R|-~MW^FAV2?q40=^
z+oG1Tx}3$h+hY-*hl_7E^|MTgbez3(C4FoQ+gnn~V*CWv<yvH^lPt{LiS17JySroI
zuo2aE`uYs5OKbyPV`X4ywaf0s@$KL5IQD@}^wDEpU&tL8GWx}@*u+vc!t2KdX?O;L
zKDcYrntXkIJ`bEXVK0|JZC{<`-qLaG{fpb5`RafLY_PbL?d2O>W407F1%5+o({bq4
zItLI)kU68-$L@OEgy*-w+cTk*1$f<<@LIKY-D_yAQLWzZ*R~G{Xt^TU2Rk`ny+9ue
ztl^?kb{20O6QzwIP@W^&30gN@41-_GwQe}W6Cm@vJM`ym0Qz(KSOA~wDrJp)9vW#K
z(iy`?m7}Qi1JC{ng&c>^V%rhfs+6*Ie4dh{$S&L{V|cj?rn8RQ22P`oZBdw@&EuV<
zS?Ov2pUAvSJy$(KxlP#wDt{w;6cKOZpLa$n>*wyV$I8-xm<%)lqjI2FW7y5EF2XNn
zfOSM3m|n`x=FMY5sjbuMJz)^sp+2o490KXAwSZY7r(V97?Cv))LLaK7k7b~Erim7g
zIYR5bMDhEz9XjZ2(ZZ~lo=yEW4UEs9I*G+AxG^S}#!%1$6o%mgG!)dDg9ADa3c-G@
z-3Z3C)}Sxy)BQdy0Orhap13O-N97)*j}-$`oMB*BD5h-*hK99GM)*VlKPx6`OzAlG
z!3p%S05K+)G9RxUv;AE-7NJp^FQRRX1qGDssMD|Aj&|Hb9}Ad0lbo$>Ed!xQl!nnZ
zJsJ(@5>T#4_Tdc#C)c`tPAU47^VTuj)IDIJG0|8UI}|yQjbOKm4rsuhXkY%<XSuhU
z@b_5SO7p*j&i_}ai<NIEr|`e<_wva&+h?5Xoh}AD=a;hG9A}m>_S+5ePt-i^cl60B
zR1-Vv{ol7#(=*T6@Y)1JF|8{Wj12gKa^cU4>AUWA6BpJMWMr;bLB_1Tz;zfy%<CV~
zHtN(3oqqWAO?8CL%fQI3SUfPlACj~}ifR}tD`gRW+?b13TWFu5=@CuWFvla&aLgkY
zN}G6g*JVf9bo}XaN}0~9#%%0Xuy6Xqq2cI&XkO;yz|k!z{wMUYbeJ*Q*;EDj6a+U%
z>(qmWU#`K~QOEvjq1g&6+0%PODKmKWn0P~%(Zs<VYBgyrO9Z=N`MEZj3d|Cu)tH!S
z)w=Xy^h}ch(yBY;)kg%za!1Gh{23c?{+XpL#Me1#5(YsG?3&1k)(BQxa`<J%vhxpJ
z0BBFs$I?&a|6?XQgW>;Pb}{=rdy<#&-TW5*q*AJ!qy&`vl{eI-YM1(1^<k&0Kq}o#
zwTfq+1^8UG&JrbQDfK9Ii;|hvB(hc}4+xWEi`CZLiE3A2S%in<Ncqu?u6XeniQLKL
zTD7(n3=>*M!&);KKZM2dW#cV_mV}-9h}NoYGz`%b<yD(q@!8|4$4;yyv`cRcg|%I{
z-p~k}L#TZD3U&8bC1Fz#<E{LdwQ6Xr#5t<Fv`!6-oeeu`6PzOAO9ESATeH<QI7xxk
z>y2P8;1CdwxDIZ2#h2%Xk)7I|9fiKyiM5Z;5?WK(&;w$`pS@1q>$uP^eV@;yyv|v!
z?#i7HrK2lR>upBB2=p4^`QI5MZ8Vj(c;^mRygFaOX^GugpwPxHAJHz`wFZMoQ;cb9
zX7MQ%>IpWbZftd3YKw&Wjje8cM7e&f<yw8vi*>{A70A0x&i@M-c=>m*|7L&V%Xl|G
z7pH*dl-bIO%0A`O%8%9QYO{Jk{aR{Xzs<j@)zfX8=5ELBlUjR>{G*F1f1px5(I$0U
zeOLLUW7M7YuiZ5@S_8zgEB6fbmrr$&H0TvcHTwYopj2ujcIL21TQ+9ejbS(_5NQ{V
zS%tPxe`saDudjU0Dz!gP!|Hn@A%84tXr1sT5S6oYvh7k(Pql6a0RzQ%5HVeb9`=A_
z>L(1BFRoIz=Yg~lgU4*@to#7lpbtPRS|3)lCah?_psZI#t!m@}&=x|EgRIuIHZWvF
zl@{f1d^_py>jRXDj{YLcQESw}JU~v4p+ef$KC~TYvINFvILQPk8JQM1%!CtH3Q}c*
zD_)eRe%lPX@`BE9sN>E7JxW`Y)@k69SKL4#T3GJ52-G-t5lg11@5A|j4^ysJ=cu1l
z8u(M(V6P+MZU2iGABm&R6y9!6*))W8l2L@h0XOYX*gf{df)WX6!8#543_&9*w&;qn
z60pmjeY&IO(V{KB^|x4Pp3tIFHq6)A6Le|y=mKXDUTeKHjCX>_lE8Du?!Dj|32?_p
zEdcjw#1q`$2w;Oh6!L1AD`1yFf(m?4UsvRg?!J1K*~U*<Kn^S<Dl!kxC9REE2f!83
zx<Y8`uz;2o!_L3>3lh>!j|I}Hm2{9;<fvD%@EtJ3Ik_VBlO6tXBbD9$@Rn~|%HCH_
zr-&1QI2#7s)&mDdw5^feP&nAr;K#xa8oakxj}EA|Z;t8z7(v_Ib?=R~thK!hFjR~4
zosMjacdx=(CaecTKC#1=XFeXYQvlx-eD6L>Q!(Eb*v+|J6{T#8K(P%PQk|)$ewI#J
z`d!gy@0~o)wx#m?-^A3*)k@`S%BlSC{7Sx>eUmlWRVF+B;BsI~&BvfkRm#21@EQT(
z)`rGh2H9Pa=iPzZYt8Yu*@C#xG0tc6Mu-|{8V^e5NxN7_D{{sjdSR6b@B|CM9vDsa
z^QDevGcmpE{U!}pk?}Ni_4y_M-2%Y3j1HW6*j#Do+!WH9LSk!396TzrqkL8WV}h!-
zfZDZGOkPKA=^DVsBWSRS)X%0n|0IiEf4ik<{b-uIc^C{Ct?+xntM4BW+zhlJ{jp=m
z%@V}ckOf4~66Za!GZaIiBa&TKk@2)A_KMkt&szZOJ<9pQy-A05idXaE0&)#(UOgZe
z?%dHs<>wN}_J_AFvVaUMCXrR0vmT-S0Wbw85XT0wcH<zJ73n$Z7}>%dBNlK(|GU|R
z4F9iS*R$K%SJ*@BDfSXq`2t?YPvUL-bROo1`PDcRJj9>ozvgc!CCWUdO4*=nQwEg%
z$_2``%Bb=!<r(FFRTWgkGW8^NyV?hd!VT)z)koDIs=v-&Gcsc)xxjUhVnQx{ODUf^
z&BZGe-s$rY-!roCh{-NKkDC$_rPRe|DZDQfT6pXX7hj~P>5PKuF1}DvlgIq>qvyGJ
zt)gZhDqRQXy0}|Wvrc03zmxtV?a)@dQ$SX6s&ZY5+RjF1aq^Hb>y2<I5&%<h!O2Is
z_)@&=!%?12^#-QT{KrL`)Ot|fMCg>9Zzl2^`wwWFLjysmdKMou%f*)<C!FRRI9WjR
zBh0@%-^EuWju`raZr8dXM9{rHPtmz%@}TY+z|lfCLcu9BO*la?iwBH|dZ}4E7}-KA
zD?Gxkm;z*?ya)={EAKaxM<JWQ@w2GjeBP&n=JE`b4C8qrSL^rbC=j%En~9u#P>00`
z>_XdueVDeDY_^M6q1gR~U)u)JC`eYnU%k#OZofflVPR!8da{gC?e|40pP%F6%N3Q*
zWh2DDZP0rm3Y{O6t!gl!$?7xUu5Kh!e1@4+Z1rH*fN_Y|u1<+WNddI$dw|;!<po)j
z20yHewU!u4_UXaWRT2*rJE+yJU!@Mubn(T2F6gd$w8pQjkmE^2^%C`0xxCE9t0_?o
zw#FmGo6#B}u`T&c0&omWiC9GIz&&15E&zx{JZ&egkb|#*WX$b8&wvhACt4ZwPCc&D
z#g9X|aD0Y$#QA9-K@UJ33Wp_Q?wpL*bc{-WtzIlgU*nqE^~KZ7-+C~@E|!>U)Wd!t
zuFDq)1^GP^8x$9cfJ#C)2KADdod1_Hb}74s-OV0mKW4wj+@H^v^5ghc9^{8W4}6w?
z1@-~2DT=Z{saBelt;!kT3?5cKq}-%@0aU|(E5B6!q?V`))LOMcJyi{<XQ>ydA5(8r
zzpQ>seM)^PbGF+)$uZS9;PaE5j1E2xA#W&9@|qkycoEQjVST}D**|#3(8O@oT}Q}H
zY#fMz1Z*(E;gR|G$S!LP4Hy_EM}tKg=neaH^?9?fP#^&H15ep0a!55|DnT#~m>Yfm
z=)nA9IYJw0CFkEX5gJC<LwwhOgTREw%sAp5PWi3uuSPnDw?aZg$F`k@R__Z?-%hQU
zW3Nf?i)ur$;NSw696n8Y(1+>L2`)P(`eU-EWF)H81fEr7!OMxf;J&qoLgC6K5?g{D
z2Z48RZw#2gIkx2c<t|>QsFV#86QeCSh*DZ`j2S9AM`ErC*8>jFM2t+lL5|HP1A_!|
z1x%Hlz5|#mkp-`r5RC{ZHmoYMPnDQ5Px4D6n&_#CSIFhCsXwrwb*hV(1GKMt8xF7h
z*yJN=cqpsP*80NH5wuFkBqv>DLV;hqSh&~l&NXEJG!d}@%}S+5u2W4R=sg<jGC9nf
zup~~n*(@(i_-qda2aS=)q#-#Hn!pDL1%Y&rG4FA+(P4cM%LtaE$|n*r=v=LNpU*#K
zZ6X`R2;RWF8xqA+6pova@Px}xH>*p-0z<)2KQD(_Q#dp<h$~KrQ#CX&5-BxT2E-2s
z>G0SY3i+ozV%9!3XjBf%0oL5qvVB+4VF|w33#|oN!lZA=IyOTW5aZU{Z_J--=J58%
zMoR85AN)rDNbxRNt7d;}p8+PaQPg5a1S8;}gkyoqGiBd3M?BCEq}D)i6*XM_H2<fu
z-!k@F%=jMc@{eP8Z&aenjmo!`SJfKz6!jAIJGL|S-|NK&HI|3t(xqbr0x4e22MR91
zej%Ewe2P7Ll^AJVp!}qSoe-NkN0-lZnlGA}Z}xcdMUv<C^0{NQFcuDAI}=g{s%bma
z9!!bH5zcc`UDI;Tt5H39uu5>6u}ovbG31GOzOBqaa3!Vkj;RY(K0QA#l1L7d7kQ+u
zY$%N)JINL2HkD0~ZSF4NPy~mCF0d~JyPVc4aa3HeZK-;)P5w+O&z@hIp3a>jS?9l$
zr*0W}KoG^EKKM%2n&}`7nU^?e%>VIf)#spY?gk@B%Rde5`ESzse<B2bnB|j|4=8K+
z{d|D^4H5tJzrCxSpS7@A4}*Z~Cl*5E0M0w|td%>u@54*wS!?tAEr%c9D(467Mo{$;
zjmACzOTIyNROIF@=1KBa3#eVS&JWu4pmQR+ILxJf8h>szi~gLY=unMw2FT6<&{a^f
z2S)-|MdC~)pyZ6*eBB8h8}_x(#{zJd+j(1d;OyoTg1U;-&)pvlb{u>D4Ek7#K5OM9
zQirK`#7*oBhoYb>pw^^;n-~CX95MWTqDA(v*!h8DB_em8VF7-2HGqSU<p?-PiwMyZ
z!$jk?YP|+X?R|2EtH|??UAgikn|_R}AT`J19G(0(f&!)S-!%k!7%HS7GDN#=;?KG6
zI0D-KaQkjco8|mJg{cSGDQc1O38kL@H{Zp+@Q+Uaopq(Gl`jM;ZCIA=B*_Tk4r(>|
zYijjn-=k`7_ViD*Wmv|S9EV=2<{_w1E}ETFVIWx`<Z{)41e|Ii;-Uf56YA?hZ$+w?
z>0X>?Jw{bEj6~P346KgTjXMVqP?cN$7FkMmNp6TJeAwysM~9CkWug=9$5N`6v_)=$
z{sAQAG?*ZDMj6zdb+&Ifzw37dcjM;rn=CyV*g&d8c{FoVfN_|Fj9zL!2f?@!Fmpw+
z?|+&JaK@?sWdYZ-o-}ZlI%%gkPm?99fRpjWuBz(kIQA38^sxZY*AbJi$_aoDW0>TO
zVDbtGnUC!1zrRXtXzl&@1r`vowKVfiZ~|g$Z^T17c&!i#!9lx05;_6Q?gjhUDPm99
zxOR_~a~<bvFqDgVi#^~p9x06ln5$v7<KWgW^;f-yM=D|nahUB}cFF&>P}3m`8?`iD
z&i_89zF&D!F<|F+BR`2f$@>1$`Jb78@NAk4%dxaA%&mvNEo81|LWgGs9Z=j|q~=JA
zJ86xt(fyX^y6>GxZE6V{Nv8H1(YV2bZvhxIfx)-!iuLQ@a08g-dBfF5nZRli2$aBj
z&LR?G;rLqC;EQ@de-W6(ue$$PYXa!E066d#0Dz6<!yEvB<gdo3erW<oGPz|7^buMw
z7LBh3J86-Vm`eTZ3@tN3+>zOaINOhbK0^rd#xVf4g>arGb(MNeXmLWxlE`qh%J$6(
z_a8E=&}^x~qG42_miJ(;jiU-Q=`zPA6lo~3!Pk#D7$q(qEoW=|j#IK{TD_u<XMN;R
zaA*v&9a$rOg!iF}su28)ql)dm{W!8V2ST(Ift~|;vZIbY^fwbP>of5p=l?FIzE7PG
zUS0|RDExrj%XVeX-?#8&G?uc#e43f5Z3y}vwCh19UFxmWStEGSl(VV&8`m0tPgLJD
zxA8QPlxeyB3Yr2#(nTzhIK0a3!Sc-R+c0PXiCKU|>gi~bM>{tKq!~;`j8ZX1IzrKe
zPEDOnJiA7Hoq%Ffy2t`FaFXMFoW@>4C_ogT*pPBXvQMlRWCOrmY5^Btaw10GJ3?1M
zFfdNK3OQ!X6azMkuIhgeDd*==Y)JJ*7es!b2RuG9KNmR3ieWdkKPo%DZ=nStffF3#
zU&<Y5rGn(rZ_-h@BH6|7`?A^Hms!BYj(1FhbPqrcvl;6z5d*CxP?6>`AQyALVBfm!
zzK-?!H|S#lOZ>m->?Vf)Kju?-JuLh`%b!(_P}-F9lzWudp!<6UYy%#83oF3emBpSH
zW=fOX(1q^<7X*_I1g*&oP`d1u%o6#a<|!n#QmU;q*fUU)If!!t<{<d>f|;ePcdNP$
z(<PZF?CT?z8;wAvZoL{ABYiV?y`;$&#jG9<g{7vZveTZUlmKM1*#f5Zl(NBIJ1>>R
zn*fzyYbd9Vjqr^+1e$c@-el+y{H@&F+1#Skj}4CU^-(@>(<vWeq|;t|E>X*kg6s_&
z5OElSm!PzbT}Mm|?5<M7q#Yta0c_XUb=*SdYC^v>A{5!SjGc`R8{5DEfFX$7htafC
z#vV`*7^0uUK`k;UbR(7BW9RAA`}Lp(Ezg)PmU?BaJ@Yn!LMRRn8I(cm9`^YYnik4w
za{ph&AgiCFd{SA(KhI~f8`vuQ$ve1(2-4L~cHHLuh6k)l=rDFgNBnZv%@N1$Xt~o|
z6+d8Ep7w4g-c}y7*3@c`bL&o;EhKouW@t{hy4=z1j#~}6?i+VnK*r~{Vk2D0btf%s
zh0?9GvRg*`EfikC2O^Fv)@9myg!*_DjiEZ{N!eW&Cr+xDSS!aip>jp}j*KacbjEt2
zKtL8semb&t#7LK2+bX%2b$Q>i4@NIHyW|Q>7526`?vh<lD^4sgAm009atP#(W?wu*
zi~<~#VF8q3Qytn!Ix%@nVp45}uzLuN1|<pf!zNEm`?{R5>_^{zLymzxtrmds3C%$B
zq<p%nDUf2<P3`sxLac+-Jw(rsm4MyxAUBbHv85tCO^&%Mty+Bm3e%FMTbJ>~Zo5%%
zsX+E!ZUI31|4Q~5hW}q>-)7IVKl2hu|Br#@&sJ#u?B(b28~E+~8}R@0JbzUwQp%O(
zunXt}uV6^IP`O6A6;#3l$`6!RR7IVoR;f*}6*APQdVzYSdb9c^=>PoAek~ct8&g0E
zejP5xgS5>kyIV?^A$ae@ICBk3c|6g-+E%DzKwpF(FJ<H+4oiA>I5Z-73scuh`RGPk
z2thxE`BxJWLD<cLh$|kEVrbG09LDaUmPo1mMt`VZ=(M*Z(a41DvJM;lSl;x$k}pYF
z^~O*?7<t9bW{pB2=oA1D<k>E-l<IB_8yKD7g+<h2DXxd1D)eytLRVhL=1S&;lP;FU
zx1dd-;Yj7PvXU)&AfUtObY%YBvNYH)L$?L$M3Iu~WDQ#Uq25@en8`-8guIaev}?+u
zvJow$Vhp(nR6(Lqqr5aN7J@n%t6rGM8zv2l1FG4YmN0g1m}%qq8(yH86+&yU-034l
ze~~it7Fb|vOM^H%L%uk%L@EeuYHgpoUV_@Ry}iCe+qiXG_qOJ)uGuHaW^6*cjBp<s
zJ7=cs?oH5U(N6VI^wg`Rz#9}tI6C!&NkZ>x6I44Un6mCo2DbZsA^%|UnX=b6LDH{#
zLPLai(d(5}vP0+vtSUm@-Vs9?kxdYB!)V6*FPl{~!dO1E9Z(ZOe*S>ezJk?q2&^|R
zv^7kjZ)h(3ACc0-CZE;~9M8ViY)mNB3&kZUUrZ@76NJLP1EJvj$0S5-5F7mvHAdzw
zlJ8rCo)~r7Zi)C-(6mJ1Pk2G%q7|B5kh_v^pvn8psD1F70YfEtE}9rQ+Qqjh>gEvH
z2gd?KP|qL&a+~4n57HXk4W*b+*mX$4+5*7n`~?G&{$Iw}GWhZuWiLQ+X*a)?{}h@&
zZOR9gC)FwH7I+1_zsVIZ$xXM4!}=!KHg|nLSl7@X!5k#$LbJ9Z78aBq-(qjCkWok@
z8ig8Th=apI7Ala$#ssCq?di9S5}L3JWA#mlZTU`H0?Cps2+MeaP0A6pcJpn{a*9z&
z8OZ^ZAW?a%y*xJq=q4-;(6NIUTN5+{_Gdvb@OFnd7o`E~gzzR~2#P&a5y|A>ryi>g
zJLor%hkYbU+o^}crhy#qv_0Bn)F1Xn5>;*XMw1yCx^Sool8yycxZQ{X<KQ8Rjhb(E
zI7GUUl?Zichl$35_QRMHJ$8z-9-|UYjzMDwXE}K`<2z1J&vt+-$_d^PaX|Z}iv<C<
z%NeFAw@@rVAJzK=fxx?uSI=??IFYp(tDq3!^A4w(N#PMJse~q~sPxt;>Stj8UjZk8
zYP<47rC(wE<Gh}|!1iHp-q|*W5HG0?no<m%x#_A~1u^s9k~OwMyioTT1YNRVVF-lX
z3`@dRI9h;*7piv~VKFO~J^aTi0^R=LAI`OqIj3}$vL3<Yws8cM0w~Xo0!r%V&X-RS
zB|mg~lC^CzAWz>`$~=6D{b3<ha(!@Qn9R;a+364LTXTh3Nc%&dJkC<_Gfox+puJEy
zReT2-p+bd8EVgYKPiH>c)bX)XPNa{ee4}#=Hf^eWY*^B04&rSSJ(&^gvOVI^(EiY;
z)>*&=wvNF}OMwAhBGjH~en5p!oQm6WMY13Ne75ZFr>w`MSjQO5v=lg4^1=Qa?ljOm
zGTeb!Pj-;q3-&8@ngDyl?B^}5Jhhz^Bl5VvNP+DP8~&JdGS!y$d-=yBvPmym1@$x?
z$3ZSTO)B^Qs~EeA{g4;&2EHG*|36d8l<ms<l&^xSU##v@FH`S#THf1|&VJ|YAUb;3
z7a4$-7NoDl>Y{Z4i$C_ygeDX}W2M@Ydp%9h4@y@k+3+iESJ1TNSa85tAmKQ6u4Qc?
zFXS#gXlplblbNOtztGm?IV~5C9+Gf6_c(QA%=W<7GjXnHWfaEo^6<&uZ_8dwgXA}i
zA<7KTDWZDU+U|roGKn267Sy0aQ73W-ZCO~B+{3WMGOKx&EqgO94-RVm`T>yR0?b*q
z4BoUX!+H?B#;~v};x{<J1+@lB^0X#MvgQg09h{y?Zt0(O2udjALibs;=%B+)tr1Bu
zicGx@MlaP5<Px%t5Sf`8y&od}AMO9@)#_U1VdXS_A3qcJzvmH2z`Uo6&B4j$vyFJI
zVkAgDW}7v_x20L`pr81@Wz`IwHZEeIEfgB0v6^(+C5VBnST^dvTLQf4bql~fy9Ec+
zNwexTp+o{Na^NOQAyQk8xZ`iSOD@~Lw)zz6Idu#MPHIaK3?u4T>ejZ5CwA9%K~%Lr
zblWkO#>D6D0;{S*2)4(hZIZyW-OccztnI*DLbFca-4F`GdIhStp25=vc*iN()!v&V
zo^M}lsoI`X#HMersFeib#`$UANH-LjX)9hC9b6d;``dCwvWo~<>!F60Om!>&P65kF
zpJJo$5XJ=9@1tR#SWMb-MJ}!Sm2BD7$6H#~v%_(((wq<{bb;24C+>Oqa}vPyhb#d4
zw~ry^OrZ`|MY@;}^}|vZs4Xjoefn6zT5W&mmJSOb+W%*;^BMksiM_~Y^LE(!jq;!4
z{NJIR58IwUs&4oMzgqp)+p@FgEW~!{hY^`D7jtjJ_5$OlO;}_IjY^Zf&UqqBm+s#u
zIP)UId+c@2lNq27E5?GdZEWF^RGW){;NAzl1ydGyyzTOxY)BUvR^oULhtpDav(=Uo
zNM(YOr%&t<O7qybq9H~s7xPrB96Pqek+Mi-W*93q=<<Z3oM^khCTm6+VW?v&L@SN9
zTV+NLV#ktsmlQ-O+nrSqCTkLP37?+II%gR@LUViAfQ~LHcVYN!a+Xo*(<Q`?@ED`C
z*s?@28aR*`ryXODBtoH&jJF~%+`$ebM5!k@fdext@GC`wHjdq(?SjK3#S~z-^vj`s
zoRt5;|6f?01>e7G_$PQZ`_5bQ{>Rus1A7tAr$L=sx1jLj84#R$oF@h8&_={PwWlr5
zJND{5kH|%H)OuF#@j70WlhqL5GM?C@KDn7cbk%*9#WLa<Lk}ofkYHO#u{9l3d~on9
zPnFc&IpW!u{FljAU1?Q5icjkWQp@-*C;Mo!0;ZapWUs-)Sy*48bw*cet4Pba%~>)o
zoQq`dwLx7FY)<xCV&!g*LA{H7`9#6Y75L5_`@P#F20r|T1?_<|9WxJFgD}*N0>|5f
zgYYscSs}S1*~h=yE5JSYi^nbCPVaHd(Sbe#t__fk$F}qb_UZ>-lCAl;Ri8ON=?wJe
zEWZ68>`&^>*0FjsnTXd>b<md!GwCMU|0lDf82;~JkMW6o3x7X<L|KH}z<;2wQm>;8
zyV(_=l>7K;HLexIUQA;c+|p1_66xxzy{>rkcuEncS(0a>s3u`Dn%H!~84^yxn#1s)
z4fA;TK%`;inrX{{%~?+@GIZz_SxfBs&bjl_2?R7_is9xew&z;pE+Q5bhM^=1q&lcC
z*&gI_=I@I2K|o|SKz(DUEAAc#dUrtl14m)801mtGT^`n2k0nI`$xac{46#AD_-<Ex
z-9J>W?^uu&#Af#j<7(*!K{WWc|8SjsD7+pjEf{HA!2g%L1oh{qx#AnfQD+hzP=D^k
zOcr>ELA;mPl;BoHIDdjzUyPKZJ+8QoceI?{lvy}one?AFf)qiuVUyiIAgWL1<Afi0
zOHZ(|)Yry2Wh|fotA2>|5w%wQBph|4fz;6Ma7+ph)L&2G$H4w?F8Tjiu6$YP;V<*6
z@OZ(Xzm%OWw0vyrcQUo2g?v@b5m)^5oD#9}Or828TX8`A$N-ka)m+DxG7in>)+mIW
zTZ8alC-lLEycs>XtO3&hR_r&h&T5T<O9zc;=SereDYhY)71Sm61*s>Gg>aBo!+*kG
z_aGsEp_2`w4SEE|%IN-RTk=;$zq!;~j>zFXf_ibXZMPGJ4u$|is7&Kv6caMdHk<hO
zT=%Bj?7qG>fiqJ&vdbsrE>5H)?Qk*>mfZf-Pxjrv37dlUhptU3uA4=NAiK`16qF=#
zV4n>cI3^d(0ddZuncS8$mc9JcZ_TzO%}PvwUKq<mqumMqpkoIgAzo}#CO5|#vAfJ9
z_ijAfg0VoKV`7JzBOI^5NCIw4BqJkNq*C&xDjW4VZUIO8zsCNH;s0aodCvJ<zK(Z6
z@8?qf8U6sg0lunCROTwHlm_J#Wds(&pHrSz{-91)m#8PI-O%#6M*V{Nu=?UZVOC^<
zfGWpQo+;%z8JZW1dAc~IeUXbd@_fe$1AY;zk;1~hJROcaPT*~JGN2CV?5xA<T;pn>
z0xn&+U`pm7^gS{s^-`AnvOD!Ii=BBI^iS$!sn#y<lc=B~lZ>VvvRT$)*Do|<{I&2`
zN=kSUlCaVG$leQ`lZ8BGEpz~0K~{6W@V!Gb2Mh)1olw%SOqn!XIt%JD%aJnEe(Ip+
zf-bqg5gIh)wvq@6Dek8$T&S3k%!X?@XhR~WSrmI{fs1e8e$zLIHcYP7+rulhCVF{J
zwF`$Je-qTHte<6qV(BGLm=P8$KD$65%x~JoK*s>eBpy;gT%!*OUl{(4@W=s-VMV~I
z0~}lg<kWIMOpW|T0KUROU(tDGjUEv$QvAeylIq0dZCzwJPpCWjH$kcnrJFw39;2Li
zjf?Ai99vER+B{1*tahO30&Gzsdu3g+4SDv-x}z~e(AS`Qz68woEp+h{xxHP~e&MCW
z51l2b#SovD3`|ki^X2*fB&Hr#{svE8mHg9u4es_kDRZ*fKgC@!Y~8bk^S^Oy-GUq8
zA(y#{by>)4s80So?;5UbqIC?Lb1<=v$<28%`W9^dNNNa+4S1Qs(h0zp=N*@R#ssEk
z0t-jb<Z;_+Wsj>IL#_6YttQOXnJ}Yaz%1gc$44RMn7_H^^s1Q4gt{#gs<D@JeV2?6
zX!<zL7}RS{InM;sk_l$t5E@r3oZgLN4CR{IIp=%Vz6B=SwoJHjB?Q2;#BELE0Bpai
z<yr7fUOc;F!(-p1Pi7?!22qD8!tQ?@bx1gi-x`E<q|_FbW7u>eZ;5aE%yT9Rwr4_@
z^8e!)I}Q?nufg|M9S=bR=t=1Lwm}2narpCVRpaWHbF2WHT=5yXPg(H3;Pv%ORa^H)
z_%;(q9b*4z%eIDn(4WP6jI~Wl&==Y=FYU`A0*+6&Wj9+g1_vRwACN3`_Pu&nTy;?I
zmTDXUVad0w8H&06xab2axU#|%Z8gj?;I_b{+x8)if~~YQ46SBgvXxt8=JbUnHOIbY
z%kR&~fDH&PqOcVJD^prr@o5g)w`l~&e(WM3Q<o*$3I&*`wo0^;J>smcV6KHhLjdps
zTmD5xU0Z|ubSP_(Pj~PIo5)TXnO*iwri|R1!Se77gtXl)*aC!sPiw2TEwEomE!krm
zUGXUn+MX;WIT{m^P|;0abcS`a6p`gsTTXvQ_1g_^EP^`>AbAwpd+aaH20u<jLuA}X
z-pd4?&*wTs7#%_S;9U-~6QYv5VKS<2iuKA){<hrz+nIX4T88_-8u=4^H+z}2=a}zf
zN5$vIi?En2=ex$YV_3;Kdd?>498!L(Hv7z_F6oh0(g=aLtCSrQ2e@%8v{sTSi-xMN
z*=@p0`c{ze!f_SI7(bnmMP}xpJWp72jtTUOnd|vbTmewd-Q(+lZrBD1)=-lWRDc-D
zidp};TTGBAWrFOFb7CxzL*#MbHG^i(q@e4T{K15j^q3(r+8<|c0TTI*0C{dYcF1@-
zsqY07(p{Nt8a(tC=t;|A#&3Dv@e$!s8pP{unZOR5gD#sS{KJm}fw>P!HfN`ecbA(D
z{dgv9+W&{xUl=cj_3tds*k9mbcOi}=%W)Q3hcj>!Bm&#`E`BEO=RqFh2VoI(F~6K&
z1G}JG_-*`7_y+wZe+28skN9)^m;5*U_x!I42iIVlG6y$@9|e1%Rqz#jlF|Z=g6+y_
zibvU_?1kUpL$DvZRJl_57`zUB1|EdJq<md@Q2CDXBsdH|g*TE{l|L$fQ(fvLb*4H`
z)nJLdQms>u$Nl7+)sx|uum?Vd1F$qYOFazl1s{Zt!u9GW)z7JS!0YIJ;7L3V&%@8E
zzffOR|5yD>*5Wlm<qBVTtPGAQQaL=I(>GVdw@TltOMI7$?+Wo<C%)Unx1Tbr>|z;Q
zCW8;k;0hUBFN2TE;6@qTB!f{A@WnD%C4)6G5cN{|aq{VS8ElflX)?H52KUI|zhv-b
z8GKa+_sZa#GI&4+kICS>GI&A;&&uEh5hyEUP$L6bGi9}WI$Z`mG8mS@hz!n>!AE5v
z3sZ~5lUgE!Nit}bfy}O+C!a2m!G$uoNCpzS>ZS7O!!o!=2G_|zqE)?JK7C#W&x^oy
zgbX@muw4dT8T8A*Cxby5$TqkR%BMpzh|A!78OXZ0E|*WTH;Xoiry|)^MemVM^)isH
zEozZZXUpIm8JsJF!!r1b2qv5;gGL$1>=R`639=0nZkF$4Gbj91KK)z<zmUNTGI&V_
z|0jZCCWC1*fbV<;_4O_6T{_FNru{n@Au+m92C}n?H_N9s8SIq7E*b2W!5K0*QwIBF
zASYDu{qpG{89XV2AIRW`BA8e#13A4W$|Y%HL`KRfH1U1%=@J>pm1*LK<kQtMxIqRF
z%i#MWD3R+;NlZS;xmqIUK*`5sq?~~zGJA;}lO=b^cVCi$S(qHCB`?d!-^kz<8N4Qf
zQnw7`dQ&QsOp?QWk|Ewr>X*SD8OYX73dpA+8OTOYl8v4umybzu%1)9i)1<G+lwXs<
zH)J3e%gH;$)8tcR5SD>N!DQJvlV#^jeq6qLRRmLtWFXhKDKq8MLK&=;!38pSL<YYV
z!Bn~6PnAigu9uO=$>0PToG62nWFXg+si(^)Ic%o($|tW3WT(!So5*Zg*ld}7_NgMt
z?9*g$Ez$oate@eGKUMiS?EinpFW^Vw7J&Y@b*7vgpE|}>%F@5HYPxxTpTC&smDZ-G
zeYR3VZya~d8cLpfGQg;bxP{LbTzKXOzf>Bou#2<fw*F*}0O)@66A1#z6#JYR$E~xv
zl1J_%z>thvgYpR(l8O`I#nzbC(EmyhZ**HgoEpcCv%8f%SBeM_Fgk-&)6|h-7iT<r
zUlu&BR`=hIwiMnTFD+#!^4XBV*@$wfaFxE;n_GmNGobxcTeJ_xajE*aow->U)_%)#
z^(8+y>C?_c^(Dza7{`6;<A!Eo?OR#>C%pgtCbWi3XhZShw{m*QlBZ-#ST?-2(gc}w
z-zpn;Fg^hw-!lIXHo*yN@eKZ-CBEssr<vdnX1192{|c!7;{Ri~{cjFm&v$^zzXUeG
zckyrYUxA8Wp=?xoAse_6_X9tNJ3c1hhL2{oS3RhHM7>je=51XkoE9dfM|74;^ALEp
z+XWZq&ONaWOKDivNtYcKV#9obh?o%a`E9tcL2(U0@~x#W*oCt87I8xqX5ouCgb)eO
zdLwgPxNU)Dtt0IHvt7zkyvSGp*d_B_N-biu*EV+PGMCb>u**n9NXoZlG8-k~vGg9B
zlp3-REO04x3j1J}&;)|QEm=E({V5i-%jdZix5BQdtyx(E0b&!WFbiH3yQ<u!tj3!r
zJwVsdY=iZ6ziBPOt~}DE)YCiIyOFJd&~kwj0jQ&zhQsVbX7&z<(dsoJ2ns;4P5}K#
zg-cn7?Au_Lr`7jDVkGYWG}qW`D_uBRvMWe8xHq(4>%?skp-2c0_(kRq&vGe?@tWFg
z>hG|t&A9DBU!Q5J&8}JGf=>%}#r7d|6->OOE_5qGxS19ueM}<e3gIbP+@1ivGuZCa
zC64SmyO+fB{iwv+_1l0_5_Jl<r=rXoWVRc-Loq1AQh!K)0OI8*WN+S7kKXE{3r7MG
ztwr!z*=Lu!lr0LosXi(c8d_kgE|3acw6L#N_}dXh+`QNYPyXyCVGSk(m*gH90|0k`
znx+Em^HbFM(*9?^vPt=rT8TM-8v7kPDC~bui{n~qU0Iw*eIs$5jL`f`;5Y-}4_v*E
zmY()~<&P$o9&=|6$8iVsu#(5SPkpj@n;y37`P**$D*@g7v|@FuHxS3o)Bz=r1GyB?
z?2(>h@ZW#I6QX^wi~nkApFfV<srM>*TqUJI<(fJ<=hN42xK^UGf?2>Fh~uK_LrNas
z*=gYHXJfvZ`nA6OvaRn=x<NJj^0fH$Qnpoy3T>#2Z90sfby^+v?^n|w+M>d_BZ!Wu
zEzvO)p8?LFlIL2i^b%nlN}7z8^(*J9*5*Ci#xfdPk!xohmvQHHW1U2)n*3FK{cA$G
zXY<oD?zL@D96}oG`$bBg>o6rPELF+#t=eO+>+d_Q*rt`V|4(IiGW>s$AIVRF_V3fm
zLU8Fmg?oRe!I#ff>Z49K<$qQ>Tl3NkQA?KxE_6(x7<<N<$PW5GKEF=VN~nYi<6!n{
zXF|rVfe?1DgdcYHsKYuAj)3bf&4<{1?XGya1L0K{x$>cHO6cH_h;dodW{t#om|Fo;
zs>)t$vh~=KiKgt*$TU!jhkou%q?c7AvH$$k{sQ#O8juVU8<KE;62LAf6l8U{eu1wi
zS&v^hMCXt%+Gl$I=Cd8<fr}oma4`)j<YapnCK*-kCeQ!yObzWJqAfOsB7iKN@v*xd
z%9lk(xRaD#U!;&(w)X#Q?Z`4K0m$8uh7JmBKkaOs5>#<fy-=BF_tN~IflI&O{c}2R
z=I8O7`3uSfkX-%B<**0-yLt@PfWzu%)hGX1v-@p>V~fSa)l%;5-RQ(%4AaIN+fP_j
zA`UVIp=Jh+21sP3Ig1jswU$poGBZKvKBx<?1q4`t^k`~h?pbg0LN2qnO>nwH*x#8h
zFVeCV_0wy2ZCy2m)uzth(CP_aw6#x@8P=H@OlKq$9<aT|N2IU!WBQAu#DvFeJ#EUA
z@B~IiA2f_RVK9eVa0rPLZW$w65U!Y^YX%o(prS!8H;4nmgePpTUl-6Cun6HQGy&nB
zWonmQHvvZ}+&pLNd_tB<CL45y*(!{aCVblVMj@Fzfx?IK!^ctOfNay#wx+J4z$T*?
zce$C1<b-=A|8E6TZ&X()_bD6slibT^u+Op;+4JzMxJH*sH$yMohQ`AUcEGam5>wr-
z_rv+5Fk>ezkBFM@<#chq#OBkB;<gl%H;yZ<`xO#w+t|5x3HJu>?2}gZ;p;tL*+_&e
z?qLpFsOZi(?z3*>^8m)CkrIq5gZF$}6qNTiX@4B|H%D-=wyk-Rc68@FVCFn_?zx#-
zu=%Mc!?+c(-*E34GWx}@q4)x5#w&T;Wv0O8K33bDwjX`<Ap!E~$rCI{+aJe8-DfL#
zZaYbVv_E9$Ie$O=@O>s|t2tdTK3^c$$r&{ZxpY9!MlQuZHT1Fx(5f--kI!>_s>{XE
zxFT2NBX@~2(B`KnPqCo(wD?@dXYh2M#ue!gUwZIUW@{8n@wER>V^1*re~p*(ebD)T
zUD4p*^N{jI<#lNJpAO0TKiB(D_QErcn1yP6?p4~nYSwna7w^;VV_V2hb;axQl!eQM
zdUU$KwtC2P8`a|r_Vfvtj@ACCcO}Srx>smzH9TJ9G<vkw3%Z>cMwP#^r}SktoE9xg
zd%<=ymW9=)Hb2_QDqml&?#kD$db*g{Cr&>LOUEd?!GHr%_yRZGC04#^yZOnw2<{iI
z%rL~ZUHK<lMLRP&@d<<QtSvk{i`xI*p1e-vffaz%(-*AJWx}@!ym@;D1$kZhQ(J0B
z7SOnqF7{~C;rmnYAS-`ktJ^0tkR}eOYBE+Jx&-V&K{8anHb(0N2Nk}ogjSybwQ$;4
zSwg|3s2h1t2k9yh@(bHDnpwM$^pR*@+o~<A595AiUE<=ea{q5&>ZjCotU<XQ6u?hF
z0Ze4qI-PVo<G8UrFOOtPc!Zp=;_lt#ucGIkx`9@tP0!st({{)A#j8MX<P-2E%X5QS
zi(3#ha(x0yj}XId%8uLq>IAV4?pa{H#%fo587$Qlx(3IFx=6w5g6A<^7{sxgQokej
z3YEOg*=3K!mkP$5ld{RV1sy9J1eqwvTw$w0?XiD%pjq4=wCQ`zb1mz;Cw??8NKxqO
zr7_zjpyBXsdcXrfqOwyF#+AZ3U5*wS@g=a0%O@jEVUK(>lPw<EAIW~Q#ths!!={(w
zMe(D+H7ilJ*l+hKNMkX`$K;?tdy|mZ=4fyrex#r}?9nP5!II}_cTWC(POg7X-SswX
zx*hRFVv+%#9aTz>X9=E~gxu47J>e0I)sXERqxnCP1sS|`FNTD#6<)s2#N&6J&i?VG
zJ3WrOD#0bTmqn*@IMnoq&i<K8#i+Qw`}4M~iBFB!VtmY2PPQK(>4m!MSK|6-BRtX@
z!o|yQ?1!~O6W2^>%U}&JhUch*H23`IhK_Zv$LV94e+T1kRER5$_9G=VVDm|8@`-VJ
z{?=eKVfy1Mg|x#7^e(u+rhAxhF-O0-f@Vb>{IirkJaV1Y!{_#RHR&)^IDtg&faTOr
z{0fJ6*|gwLd<77wD$VvinnEBgSVDdXuK<42DpuO}iS;wz+s~<w+teT!Up~eOBUOPe
z2nEGh>Pqd<*d%hr#y=r;z#NN<FAlXlhx=X*`Cty2;ohgjEk`+E5&b`3(*HkYe}xY4
zG0^z+@i_Q^_weU%7x)^S1$@xby$yP~Z>o#bHfY?wU%dqywm%r(-2dmKp6-IqF}o=-
zuGno-h<=lGk71vj=~5OUWoiRwpOymI+}(Anl;hr%H6_^XN4b<{l$3YyeXh&}Md++8
zmE9u6<9YUW_9-c`9$ig7E<$q8e0GTo`qYfpCb-58!v(@Jj06LsYcQ0PmQ|CEaVaOu
zRAa4jUq~dS5{Z`t+kf~uwb;kdq~-IaxPG)ANjpKG!)`waM<U|gEQ#*XdffU8S^75J
zD_w4}znkSZtke?5Mj3`x5|mgJ9yiNCQdq-=aj6Pf+hPLWZ#KFCZxXFeRxr_M_EG{8
zQf>1MfwfN^gQEaxGYCmK!4d_&ERjFjp!bfDc%9S_h_6eW!dS0J@>-&_>?H6G9fe~A
zcr28Xq904Se6G^qwjYWGKEY#Vf0aXFRQlrT3WNql^Y|h;!bXMrJ{%XDr6LG0K0_)4
zh&QxDRcj=oq55&f92{wcFP~@DIe{Yx35GP-X~Aw9^%XZNg0m@__eZ(^S2J~=I#D^S
z%z|eBB6b(6&N*8lwA_Hjc#@Lm#?p-K6;7zdT@%ZsrVe$4I4nsy$7uf7zxw9fjt!T+
zMjy+j>Wkyj*}Y1&{g#kXi;d*Z1@bbwjX<<|G%M!%il3Rp#iuQ>0&(0w8&hf>!pdRv
zH<}~v`pbkm*yh{29<abW6kiJz7w01wG8&gp6g8UXW$c<pv&D^;8u;V5yBRIE-^nv7
zkmy9=QB<1YB|A117d`sMjt$#4(8mHUuEgmY+>(4dd<H=H4HRpFwrq1K7#z{s(#4*m
zdEb8JGo5CmlWK6L{=#4!*U#f-HizBZ8S>%s7H!#vy5^J3!JHj+<!hxTwDYZPo)BM!
zHcwGn9l{&KU~zPe_m}K@pIMVyOHFA1pUyfN{$I@=<uEw`5AaU@cjW}-9OX{sRdpTq
z`_HJ~$+;fnh;(RxiIu>Im0cgkT87(u;I*ElBAq*%Tg9q2$CeF}F%r55u&A5bX-_&c
zq}+jPUtnF>X@pGa9ec%=yORNHCy9I^Yj1=mhNxq)t+z2tK5?T4JQazRPpm&buoW0)
zW`)KZ?(L#ga~nDPGQC6};ZUx=Q?Nq9TJwHvXwZcqTjuW25PW$YIG}A475RqKiV#yJ
zy(E$Q_x2voGTVVuDM`FYQ(>DiOgpihGjBMPSwkh#%rC$`<Ph<68Jutsm0I|paA+G%
zK1;}(7C3Y8BuH1YVEcgdz;v?1erL;b%V>C#e4%zHH8Z|!D`U=`nHtTDj#OK6Gi{M6
zit|Nq-e^9B2a&`rNDG>2Acv{gc@N6{|461@to&6OP)hl^>=kw)J2Ex3^*C<7^(lF7
zxX7q>SGr2eXvWjiANz&53i&LnkP$zLj;VPrdC!1BGa^liVbt>cWTaoh>3YHf2mArL
z<<>cWz`-0Eb&%$bO2MDoe0z79wMG--?-|!lKtv2lrHSpnER6*9o7>PB?{E9PFa$+S
ztlm?1$8q7UM_K4_M`}s>C>Txs{OF59%^YOSz1DV4jUPWQ%%=`4aI;7qY_er)>*_$k
ziiKd*L7I<Tlh}h7S!*;oejI8vOWEqM#fc5RIk?XUiH;!rp`1%<X41JU8y!2z3uh+k
zW4*H^5<eD~mgE!LX3T-yYs+Zv=tnm#H)q~-3l?bqpUU<!{Qn|*30A+ou<LzMSppl~
zdsS7fhwje<skPv3_+`Im<nSKo&a$jv?_I0z<!)H13*Ks<5BGz);Yq^hap%ep$7m$P
zS)(6-*r>>Pz8sEo!s7yL>VvG&&pKW`dmL~rZnWTIWtQ{Y5P{H<IhVVwan-_NxPAz#
zgp-`tg6JIDV=Uggw!7lXbMIieI?kC(2zCK<ql%qZEtkunAzK<KSG_EjMeHJsXVrNH
zvYkLh?B$uc;OBBeW_vqK&H}*YNb^-D_y10&epo#Q_joq)AM-GKh7JU8?JqttPS@v7
z%O|19SjWb4Lo+&7f_qOFH~C^mJHoQI#b?Ipw%mEjc84o`@+jN58P|tG1DHI{V{tLS
zHA(uINgZzUrTWMh|7fnbQA@4*;<!LJlusg;fgjq><!v42+1e6u@Egx{Y&dT-eJp^C
zIIhigPE=W_>`}|}EniQNFjftfbK-PaZc#qNgNzm>v7F@H<-l$ByBB_bzlqV1rJ<fU
zZpj@~mOAX^Bzsd55t)x4u9Ld^w|5_Df#Qodj)&=##l0NOius?tkC}ApPc5+e;|*er
zIBZcG%_rMrjktARqVsOHK$7}DEsV9WbJ-(&5^sfvk8di(H@-yqt~yukRL@nvGUi&~
z?C^~{b8%MLCl%L4P5<W5iI~{o!RMhX1D4gUShZsHiZxYf7a6gi*e|0QgD<n7>Q&XN
ztJg@%`B%34K%N3tt(Lj@RA(HE4yX!^=#qT>nL`gwiTRS7iTYm-8=fd-cLQv2$hkEL
z1-YX9sLh2nGABuu(eh*o`PRLMof%pr%OXa$tj1l~%8SNRjqD}j!B&t<&Wa%EMtwLi
zBDha0p>Yw=+TofU-m=BGeBBvSXe$l@7?ne~MM(1SaaoS;paPVS;P6ssyo?l6Gi96c
zyh8(zRNfry(mUn;e=>s~-|4XVS;)V}m%|tE$z#rVy97oYH&!~|b#U!<x^q5o<};q}
z!*aagKofl|3s)$Pn=6O&8P{bDUZFr{;RcQ7ioEhq;-&<U6IqwSPmOQIM(3P)fCYan
zSr=^zW2L$8>f6n2;@1`&^u%$`Wq&^V%nTfK`k+oXAca+<=?@oN{u6U+wbBrASG*l<
zb}sQrGNN<(=S%UabH4u0sSlg=Ncvtk+4FsITtz!hqG_3tv|}0-L{lo_;D>umKvOL!
zMT57DtHJsG>y74r{h5^szWfI*^)TX_$1{yA=4Ydp=UXr6?^yf8AJE4FhxY$6eiGv+
z!DsP)SpR*3KL)G+8OrhS)wLftfPY%~w(@IrhPob<fKR;w{<ZE`e`z=Q|MTKC7bGQY
zv~f^}H_I?A&qKYidgzMc04x@GKF6h0Q3Ag&(2M)X4oC^)A55_={E|S#EoHI4m1g~;
znFQ$rrZ86;otsYV&1o$~3UH;lOu#BJ1?OaK0g0!uw-CG8pUg5G@XNkBMp9@+h5M!S
z{Ff%UjpUL9+(__Dq*l)lO|iP1bhuNLw#UR>gM!%N<)#eWGB4S8(&JOoL-wuoB6nMg
z6!ZhHkiG!KR8KNUQ`_Zlj&>=n=!i7Z7_MCdbhR28{U@B!&dil8o6Y+5w0fGr1g5{4
zz=>7le2;X&fc*_p1-kgd)*G&=1(1<YbnkR?C|S11?@8wcqdB(`k#VA_K9EBW{Uyo&
z!)4$1vcL1qxcl!eaQ_x5gW~Srqu4$*sN!;fxBJf_okmhGC@u*0@8(#rpZo`JAM*S9
zlGE$R_o#=Q&|6aHv};Hg4t<mR!V3;XX{Pp&nZMic3<N_`Foe78rH6>;98!#FH4!7`
z`_2vyodX86Y=i;{w^tIk-R{5Z?0}ZwU#G;{cR1{-L{59=_*Xhz@kI{$$}Fi`^W%<X
z4eCq~J+5525`=mr>e~m)%cUFE3e5el?frzAXb_@$F%g(EdE+(!m9-FX{@Wo6whfF#
z2Lj|<rOnrek(xZ8Bo~)Thr=z$xNq<spnHL6{EJFG<xtRWUz8~3&yxO+5&gdoJN+*H
z3J<YoS?uke@fqbA@m=E~Zc;RqsB;=kC7vI@SZZnC-hG3GxPiFulyOn)_Si}ye$+vl
z>#B}6$;-H<MhD|NQ6V*-rCi3~O`empPVFf+WY(*1EfMbgafGoNHx9&caV-?59IEzY
z?d;e+Gxz$?lhSVO_HOINvY|MxupP(wOwU%67~Pp8@{=p1uJi5P%@*AH;@#t6(50{G
za$IG_+<iiV8CYR~bw<2PoV*+&GF?#x((0tv$~m8JF$YS$1%MIXHl8VBS+Yhg&)<GA
zA$7da0!PmOW10F<=>OfUG~n*v_pniRY{q=e`4EZY8c65z%G^F8Msr7huQ9>vy~<MG
zcxn7h%%B<h{HA2gpiG8e4$k4|m?^H^^l7t~4qIvyisP<G=Yu@Oib>I>X$otp$jcV2
zGa-5{5V54u^^wk*5b1*&`aiiymr)04Zoe$SL0)R9QBNGV#5-p~q-!y!t2Fb;=k=Lw
z?zceD<G3My92zL;j$cMI+`#;3Zeku--9iDcyT^ss96G~k#{{{cI7oBj5_5^^ddkvj
zPaIdrJC|yZibTpAh){`1J>Il5!9sf80)^=R>FjKV|6hOyphfWX{UQEscmQcv;>sP$
zZ`CTbAD*?}8GE3y6_%P}bZ~?QR#Ylk&-<3GqX*1-spJG>R8m$09VX7q)D`o-n2-K7
zv&G=(4&)`g!oj6t7p`Kaj1S}^>t)6kqEoj=gzeBa_{k9YzM78@F7s_NAlVaM<V03*
zqeadyj}37Xpg_0X3r809{*b&zd)_zlv64-QseDk#2Cv)9`cPhCGLd&!R8#OwaepO_
zu~IXxNe>T7T-`r*e?kl02*bdTJOPT<ejy(bFClL+j3M}x@EKBNEw6+@=8!kgLfsGp
zLD~ZeSYNjllqbiI;F<Kvk#JxU{%RL35_uoZCmoVdF=T`vz9wAi2?UX0bU=!F=G~D`
zEFg2!{3YLv0@__;k8(;cbnBZ!3BR`U9vK^%lx-7fU<#hoyss#j|I=6_zLm=m9AJ0A
z3TQ2l!mIxul=bk_|5@di>U{O={2IXPY!9*Z8(ZCtdKd~Jp?=6p8pE-OxcJ2NL4aIu
zs|i`(R^J6LZn!zyZ}b~9mj_G}^YUrPc!IsGsJ@SQQ4nw$u<LWfJ{?wVL8&iZ4>i(0
zh|>wh^Z&+J@&DRRwaikQ_e1R$W62v9%=2<wlTiGc?F7%v3tMg6oClNbe%&J+w9Lm{
ziN&utZ2*xB<h7=CDJI-T*!d(}H_rb#ih0TQK$}^K?%@zTd1Ac~P5%vYzF^BZsfR`t
z*^;^&!KDiNJa{B~U97_W1{u0j5hWi$5x=zWy+jdP>4G;Ja$SZrI4QXb8Gn*5<NgEM
z=FmV8+V$>LYiOtvcXW+jT#Jm)*-i^oIxXX-&@e85#m&89HWh=IRW7$T`p?MPHApw(
z4XrMAGsfRM!xcXvH_M_v2vIcfqk}EuZh?ArA2d=Urn{Sji%sEyuoWDveLlJk6bn9i
zh{n<@2Evpw)Qj7*1nOZ}6dr(j+ir1D-sw<#lo8OGm*zgc;8NV+2-_m^1EGEh#a&{%
z(A49qr?BpB!fn79P+{XlYGviaigGRH{{hS?Ue9j94dA7?NAMsl0Dcd)^%=^&>;UfI
z*Z}LG`;g>q{+swqTi-|0HmY6UgRwZGyZ{^Jr;b!xbL&|p?|E$l0wAY|jgicq^ZI!m
z7`V1ZHO9&;92${k5aI7sWa@ALk)}ZQm7d5v*>=mU-*3RaOb@#oLu6tXgzP|WnaU1y
zLxb&RpUl^3goli13=~at*awHa1JRY6JDXb+679CyZWPJvVsj_%rf8_rid?(w=Mecp
zac?B<Dts4EC`K3LL=&I4UnfN-vhIW5L?c3uEw%(PbL)d*dQ`pvkhqwBtiOprx25f*
z0}MhwE&CeyhosUEk6L0Ktb7I4d&zbS$QXid={+OW39q4AU$F(8nHNkPxUcn~FXa8k
z%5RbR8}>9;1AIbywH74z`t+c?9#)ocNP;1!ZH&QEhE`K}pb*qhX#_>RXge4zCCO^R
zEHKb3t!7FuqVs<-^Dx|<GgrBgzs_Uq4LrV`fAJ&Y12|fhD?1&kGiC7vayq!oW*y{8
z#wT}7HjkAbvK)Pe<G9fIkaC>ET4f%RQ)hL{={fb{qF*Ky6RmeVAB^__A<nsgnH-9A
zr6mjVBK_4z5<H(StNA3(y2iN9x^{BIG-05vE`C~?uc`^#gXNa4K#jcPs!`Y2K0`;x
zPQzPHyQ^be$usn^)<}taP$TD7i8%&sYAECytEso2|3Hm7L@%|}q9@)v9^Oj2cG+m!
z18?tm)`W1A1p=M_1AIRF*S_HkH;`?CUxE{GGI8@|;8M(oUBX4`W$;?^QT5~SM({cH
zi|Re<*VPBqN7W~A@7FWx&(s&ySJc<lzrNL_Ok9vsDX*=md{#dFNCr>HK;F(%DX)X6
z9F~#ts+dZ7L(S}ui^$o(7Qq~OE6kie`LtIAWea4mP6qPcnX;&Sx?2QukC4F}8ORKC
z<&8LV?-Y^q7Rlf`8QdU)Q5ifY19@M~JbACqJbCrbyx+@re~`f+W$<Si{8a?=<qbpg
zXUnI#G6>2*-nlbh)^q+nGV;qZ_=XI=BLi89`LYt_iij+qAcImF$h&jOkCso>GT1Ex
zdELzdnQwthL@tnb?kt!gpJvHG)^kCteA*&|HW_S{!O1e{l7YNaXu*Jdk{1*$kXTyq
znv9fpXH`h(6|&Y9$B1_oZ;GIj$pE)w;7+*8BW18e21{j7C4=QMXpq5~bd{W|NPJHa
z-^Jp4qWCTm-=*SvlK7r1zNd)qsp5N@_?|AlXNd2a;(M0(7FXN3W{cl*#CMtao-4lR
zN&Y|X|J)D$|32J-cRjCx_n-E+G;7X@(?!nCHNkW6M-zS*a(PimynE(_^W|#R^+U^Q
z))NnnXT40nz%`+oMuaQ7XkNljyvPD!FdiI_op`pn@o09`Z~EReSLa<8XlKL&;}J8Z
zYZHy8J%nx)SE527n7r@C)T@ie{p7fFgF`u1rt(Zujl!Z-lZcP4PjK6<&VsPt4~}cU
zCzl^%IP(~FkmkeHCP~)yq6O1|_@42&dC1`?el$ni*XP}2_Uv^Qc+fNS0RzqzEAu-&
z5sgpy`^Zu}U>~R&F=x!LEcKxMe*wFJ;r|_Q1O8iB0Mz0Z06%U4yMaH*pW%PRZ2<Mk
znMzdoD0G5e!hM`Lw5xk?>*m$!SJj`qrFFu2CR0r=<9=(?&B|DIL66LEq3UcDEa$`p
z)$%SG#Owo4F6#zr)4NQ54c5m@{jg-JB(gJakTxrxzQVj}>V{?C0d1;$<+$Y8tW!z@
zBIhN}reatsl~~07CsAy+)rF~ymU*toAshXPsauwrF#VMAD^u$(GeycQ!o))wG0J{s
zHY%apU}M){f=;B$VYjft1szqEQiRBBmtg9^C5t2S+cZ2dbqkZPl3kj#OM0-%rEHa;
z#xfi*J2~4jKzgPcO{xByZj^Efg`bx$rP5@>xpepC{XS`lk`+&C98Fm0QjSB#?GCRm
z(EOjq-pBC&G28&q1n(bT;=fiZl^yW^|CD-!x&u1Dk2#;PZ#kv?%?rYz+c5m3iknb6
z;qEG=4}hbB+oy<~ibhMu7{An>sctDF1V?woPXSLKu0Vp`nBVkYW$!~Fvjhm=yne|;
z;pf{j(=zjPfd?gc%iMpG3oZe3THK^(!F})TAu==9S|eIB#2P_gRItYQkgdEWEkCqw
zbzE*CJ^Au4*m4@vvc!;n5bPndp6A#y$I|jZv_R%W&^78eys~;dwhXCMzMZ-staf<9
zm+GDMKA}|1Z?tENrRBvnUxqe9&cXb?p@;@{w#nQJ%ez$gMYf{8j8dWrcYzz>JXVj$
z+TU((QI(!KL;@!1r&Y>+#Y<Xw`87_UljGl3Z4<1q>S2nMaEZ+SAA4^C-$rrvkMGPn
zHz5gE2qB;lAO?~+C%HrH#Ic>&a$-BT6GygXTd^!Tk{rhg1T2ZGT%p_)C{WIqD=m~l
zp%5tLKEh2YPzr5Bq1;d?Q2PJQA!#+*S+85@`~E)v@`-q?UClf*v$HeLJjeIh;b!bu
zSr+KMl9`a19htNJnTuJm5=GmfPLy*uCiH(Th8d$T(e>nM(qz0~wEW9&v9@5KyR$dW
zSvfB3J9DmFUU8Rq)|G!@A4R5tbh)`#(q&3;asW!(>Ebu{eKJ}~dn1$<`MW!M<ISZ6
z3#h>ZpQNK#u2=YU@6{bc&)s8MV9)DeLu1=(4?nr>z~^MY&sN&g(H-T-3zsU^TqG4P
z$k-sP@cBNrW47dbq{6rRpza99VKiOmlCx{4;}pb4&+f?&+;M=ExnEaX*S~ucTIW7S
zp1<l2a6}CC!x67&$H9-uwmhx0MV$W&82;ZNVE$8*Ap09XGGP6*{V&jcVsBpK92m%4
zV93W89xa=urU&fo-rgJid{sv%gTcNs9Na9d-3A<X?Qfj%;tn}|N|Zrq?LMJ5hy2{I
z=AF5hE?AX149``#9p8OCW`lcc0JCS6BGv}peE7?nIEs6H+26Xx^Qr9YdWHSg?rmUC
z=v<etN(L7|LG!X81}Jy-d_*MkkqUFbMQrWWt6-xt$^zH4(;H>|;3xg0vc38Rr7bPp
zUA=LR&N;^IRIhB_nwr{AD6G2sc5gwq-Q)l1ozBGy*~9(2e&0_%fbmL8nEbz&@v>pO
zOol<rzJt6%htq1r{k;Rvzv%Z7`(wMVeAgFenw|EBd^<>#3izWjaf<nwY=UUs3p^Jb
zwBXnwVP&|Z%4V&jm>p{+4YqMQ0P2RhZ+TT1nE;tvQy~P&NTa~WV%^xHb?>ojMRfqH
zB^TkD^UGA9k<<#Xw#DJ5z`R-@!K3U+y@DEI#jGiuSLSt3a^HWp0A{xczA@}#QJ}dQ
zt|Oiz<Ql;nGPP5G;>s>RjukJkNePW0p#9x9jC)UTw;i7A04<WI10?+h?89L9HR)1J
z>(5Dc9ZJ=LP)BRJaN`uQ{~vF_iZ%xRzNO?j5;WdH{@?$=e}Q<v-Ut&a0;hrakZep&
z;|}k;Vx6mgL|Ny$jX2A*4qRQA+gwI1lcQCEIwcK3n|t%6!}rLwcC*rkhIpUecywb$
zvVdP_klpx-|9a#-?~K+?_EES*<9WS_%dl03GOekNj?_5s)t||}9j9<@iJQIIJXQ4=
zhE##lC@&Z#S*g-lTb%YrRWFgTEuh(k4Uo2R-lQ+&)cLK_wXJc|D*;It3+@ml-tYI<
z%FYHA=Ii3dK*LW*yPUO_utj-N;j`uQE5^(EHz@Us_djTu-Sk7C{O?6>Ad6uC3w|H3
ze_eb?Z>)2ckXIlpX5wFs8_(V#AJtPzZ#v?8_vXB5ue3H4r<#;9+qmSf=gUzXpzy7W
z5AIFREanVjr}fJXTO<%i^=}jozW83fih;3YwKaBPlZA{RBS)`YzD@R`T;b837axR~
z?%pPa1OO?uNN)Cl9+DFn53Q4s>(y^7?N}8b$Wq=pq!P)B@Jeaa#Tvrqd)s3(WEbZv
zRd??lAAl~p51;B8cEQ-`;x}i`O96cpC@nfZ-X9HefBMsg`5Sr!0OO&^VmTm(D(r>*
z53a-K88-t1;05CYav(6kYDtt_P97nj&=GVd^&$hvN%R8xYn%%Dnv={$=34VaWDNbq
z_YxPBvY_Nd%1c|4Who#-Qr9fdHcv~tm(=N4FxqdIW}MU=hhX)Id2}7@Ca(2DpNMoK
zmPMBs(k!RMVm>Du;UZi-^~;`N5F~1c{ur2!Uw%azF!ev>JI0sNaHLb7e7j#BKw`19
zScC0elSVchOZdBTFce^#$5Yi<QKKIipGQ}+x^q*L+a)@ewlbSvXI$*wmZsmFAMwuq
zK@MNf9)rdoQw`2aHJ-X?S!c;!(mdyogTc5{8adgK#a?gojRb{ZzsSV%y(&kOU9|vV
z@0yfH>o9P*EYbDz8Mr>uv;g*<<CzyjZB!NmI!x0EtmkC7u>YND7-t&KkUpe@YzO*Z
zKScg)q*v32VgFlXo@(CzeMkejb?VJ`>G&+xVX>R#Go>`_P8Ep52*^C~BYvfghq0+)
z(##ngNMgj3dV`Nz3<jgkQ5+G&u%Q6vfjQM<7)R{V2Bu_Hz#jo(nQ(mI#qQP{J=5iu
zBXc+oveHb3co;zGARGty!rX~{#1oD%a3Z!$))5f-%|sn&MyCD0(0cZ#+mRLjGvW@d
z%`>+Ek2D$apw^a{F2RQfePgGqqOO=2qdUi#W%j00UM|+v?(h2-eLmInk660ab`~Pa
zN{o*o-vo@Q<8h@e%(Apj9q((4G)!ol($V)b=f1J>1w~yf1jjGXoceyC*DhrEBb=%$
z>I=fCD>9NYi>XXW+V^AU!Qm_+Wi+xtIEzb3-!I%SF7*XdkR&`6s+F<C{{a5~56#2j
z;ggT}|8nC&EB=4?!SUgcP{z<YmuC>yt4}W$D&w=C@?3^+VXILjnC`yu1JFMAy3|bj
z>~fD-8)bX{kwae*vQ+i&l$QA7`}aylw`?KU?5yAJ*_o1!?^k$q#P{pX31_8k3K3{d
z?5{uYy2!kFYt23i-*9~2-XI;=<Oaie0OtiIVVH5%3Mm*@|4HG9=ekd?o@=&qqKfR*
zBl6c_eNy2Xvy_&!#)tLB9K@4sSo3!YeM77D5}A5{DJAl%9BxB<!z~9V3>~#%jBx?y
z?k7^2H&!Uz*#19&JZnJU+K-+?A12Qt-fuR%>mSSApZ|O1|A7&36rvgf&0Rvn&0ZFd
z21u_rRpcvJd=lQzX+N_zA{$M}c*#kQvX(>RGiaX1lf5Wr1r^kqYOrf(bBi)F1xzIQ
znIpwt^%{7G;_9+Q_W4(;u^^4eyf62;9|GAIzA!u}^nat-{y&jkK}V5Y<T&FtV|03^
zcMpsoie=b6;7-=+V}pXGtWS2oc<k8Q<>I(iS+2VGiXVd3xOZ^r@sth!fSz#Mj9)&Q
za&XzAv}b#K6q@5c;z9q~iT%m`l{D^Jn#$iYMQOmA_`y7Dk4p#sv@^8DFM8yi-Ey=m
zmCCorNA|vVwkv|{o&CK#Z~v=oz)?yApsqUzEpV@{V<JWxKh-j|gmX5Z@>~q*;Ws~g
z^F-02>c1*2s*8{4jiy%`9|U9TmnXw1i~L0jht~Lkz1jbBoW`NPMhepwoHL35(!vjk
z#+B3L2v<L-a1-x;zyQu?AKC$wC6k;51n@`F@Ber8$J+Rqfkp)xgF}QSgZXNPzTW8p
zT1ca5{rj(L*RzLF`o|AuXcK??;$xZUJy!o3SZd^H&|=UU2#DS>;<?DLOApzD9PF#u
zM;WTR_>t_<AK{J%Q_G~VI>;F7x5b9R`m^ZNkMB@8MB_&=)15;!j<pvYWfBL%Lij=h
zaHCCN&5$wn*GnJ%iKbuS_~A^npXRP#D+2yb&mtU~nZgRG!r9a&W9+Uj?w{)C%}PJ9
ziXYayRlFw+DD(2_0V~$H^qSASGoK#AK1zF<;-h<mE-u38(}{Z_-Uo4#_oOd0eZD}h
zXB7$~tY@BHt!F9oisG5d%sHtPzB<oT>u>H$Wg@NqQfU#B{|_<lHSlk@@h<Xz9!lmR
z|MzL+Mo0p$(L8z>bb%|N4LpfnMt9Oj=${b*G|HT3R+}y6$%ww){lA9>E_MGFJVoPq
zsr%0jvim@q6;z)A(oe==*nv&HD5G2KkIQ5~sW;B`TZM0)l4&ztlP|{5$udbf`QGrU
z#1Ypz*L^KDzL_8Jau25(Z<p*+21@nh9Qv`;ji>z$va?l61$6o@f8qP^GGq*}Iy%uE
z=<8suNjst+!=DTpgAFJEFL_?#XkHJlMWB&Ruf1b=`^gvpamTP;wnNHh0S~;yBw0%-
ze0ZeslH~JYAY&i^1I{Rw#*&QZqpMr`$Pu!&T;Yju0lYmtA2{C}$wWRg$e79o;2U`g
zv8Hv1CLhHg3T{9jx!UiGj01+!7KCJkVlATNIIj0+KL9Y3RO*rfd6BySHHO6=Gl8d;
zw_hj8;j)BvlORV<%cISdOlIvtU<EKg@JCZP*a%04>KGzPnqw^~-y)95#>Z@msA{Sh
zWltHucq})|kf{sNat=d-wWFbx-<r<${{hBg=KpgnA^_^iJHP<<828~)FaO&VpE%Iy
zqSM`NBleF1dlycG>JzHHA+?d5sjOag@q%7#$ytvn>!EpDLUK#KGKa&2UU0~I=3}hi
z4*TR>?~JC6?4xjKh>vGpK}We8H)Y~0FT&EDsgY_|xOB$HF=y(z?zm`Yy!KrvKPkoe
zLWT3D_%Xeh7xoK^{W?>Sf0BG^swcy`_|eR3W{kVuT9+y7npHGE)hAU)*Bn2J2@DQ6
z%2q)wXJN@%YDzJ~XGEv7k1~4e;`zPkiFK(QWBIZ;{RXut^$#}ljs8ZZVeUZAk8S2;
zauJyZ>A$j<FMsOi9q}1VJw01L@Z}v1U06qhn|;xOl>qf)j<;j6fm9$Q7wZ{cm8NQL
zG~Bx{d*H=aRUW8xqcuLA9hw|+)?4}7EQB_T<Ln2^#q|2i4GOoq_^~}K3RZ4eYjM`f
zJY$udz<;?~;m{eM*2C*+<=_qT9o17DgmJLK$B-w*1~pZ8r|}^k`>^Q5`_<5y=J@1+
z#%fZaKc_LNpY2G|)Q)84Trr-%a~>PJ#nrp6(w^D6kBU!$Fg%Sm>kUgeH5c@5KkVK1
zX*_@3JRFjK$3Dsf!31ZbGX7f|pW4Gg*79gf%irXL9UQtG2iZy5L1~LmV$O|I^e>Qg
zWw8^R>}09R$a2l$Z!nGH{XY`<zp?+nX&g!RAO>I*GJt3Ow=O<spixO!4sgxkok5o}
zaSVAgyG-jB`skpcJx_&w<MS~U01>9|x3$uOYL;oI4IrPMYJ~2#BM6uy>DIGz7%a#&
z9AlKsarLu#bA@tb-W{rQWPAKLwskq2jI$b5(-LZp;%p4|o{Bd43eK^+y5WinJ|^>S
zSFyQj;`0U?>*xrV<FKldFPL)#t?egV`{vyaH}l3oxS*|F;(T-ukI%&bA4=D{thk0L
zkO~737@=Nh@Q3{4nBNEwRgJVoJyjCokDz<5emM5I^F)vDFqEcYqOH%GY~SgZ>iFz|
zMhO{3wKKN@(XiphaL7#kF_iE6Sh~*FzNO3J$kkm;M(S%_7#LsWZ-|+a$~w=TTdA!x
z8lTyN^2f546x1Lfo@K$oTmy)73&Q|qikPYP*XRH7dGD;Bw6Kpd`fO1fMyDHeI$caV
z;Pdkw{WJa69AQo~OU(vzyLo|mo%w+Itoh-0`dI#3+5g)kuumR2f|RF(bvE^?j?N>?
zacMJ;q!0LHAWnrJK;xcDhCS<98k>Lv>6DK3<MIGE=k(KY?6;oD?8o&5d8E$zV{X9n
zq|jE@7KK9{@W^7mG#t)j^}cyztmXHtZH>e8fE!oN1Tl^|kkZR8KPZn(BjtE~f=DRO
zoNEf3!vcM@a%3Kvj$4r~&thbDL)1)pfTiqW)%is4f%5C`gwC2>suMLam1tK@ID+Fj
z+_Pe>6FMTnRpJ&LxV+&uc&fn#0^UblK3jP}9vM%{acfxzbMgX?0;_E4&^$og;WE>4
zunX0xDgbu@?Gb?2TLF~H-}ntf@}ROSFZcV~{1akZVy&a{$ZS$xf$i9jaRK!=1sZ%2
zfp4)<)C>bbSU`~m`1@~6H}EfP{L*-f97X)(67m$h0ggikfP3lZ=E3G_<N*G4)`ZpC
zcgw@*M`<_`*a}?amHuD@04y@<hUI#+<LrV=orR?>0w{ItrCorOjrpPD1`I}*2<s)w
zwAjJCCYWH`Tl}%;AusFgt64uR$ohuaTNMsB#lk?BU{BzX*R&CFS>*}<e_P71@u4wf
z0R6n|Z?(`HYS~cAqwtVdU6zsROwQ+bZo7)cAwwZrxrF_X?I4vHZm6GlHLo0PuC({K
z<IRN^VP!pXa{+Z_WM94Kr25-}!kCDGgB&5U9!v-~H;?SEg}cb9fZI-if!*S7<3;;v
z;dgV2mU#-1-xn_*FF4>xvr^x|b~$tM0&~o5J^!qr5>Z-3k#H+O-tqcJgj;6bMm>*?
z2A`*<1IYHlz(}h1wZLwl{#`*~Fcye)u!Ijw0SOGq<VY%m!bnr!Olu7lU62<Vc(CX~
zJUronIufB`hB1nz`(0+V8#|0Uj6KFT<Y=-UTEJV#>*Oms1Xw@|XcOH|FQIqP7wK2#
z0YCs-0(;@<<_*Bxd@E~RfH5Ht0RuWYgv{h_<wSSDCo{OyG?~NY>M)KI_2Dkh`0-c?
zFkBL|WYOe2>Z4>1<a|V(@abEENx3)-X*J3mWm8u(YS9v*7M)Y=1AcO&nCGOJyP3N@
zB#`-2@@NCN_IRWax?=VwkwV#<>W*fnJznW&ijESrvl)ojV*MryxebBI(Qxo)@r(>J
ze;n@>->(3^j|;rI1qFF@Et=p`<R){4(%JR|LXML|k~OqNd*>nGgUI6qna5r0Nh!ye
z7Y^iX`{6GlgVE-#TEgM8NGaPYv4i@M4?BvD5^FVd?0j=1t9iCeQo0cK0CXmmMS!dn
zifLR2N>PxNX6rn!wMyRNuN1pe&2kd(TV+BmUs{UAk^!+Zw;aBPNiT3xA)B3A23VUH
z`rDzkXBAZl25W@np%gIbO%T+v`tby0oC7vsI*O9gr2yOJ7s|zhEUgA0ddP#x#;O#e
z4Kv8_-z=8nz?!lIkGK&gQpT=}4;=pqL;*Sp^|GHJp-BVQ3~6;HE5v)lZ&mplF_rzz
zku=;msg|u}C6Q;Onbn+vOsWyq4PG>LuNVuFI0JjrcLSkTh#*|bV9-UpMU_nd-_P(F
z<~sTn4dC>jBotr2yZ^dJ#Y=GVJc9aMo;)kvzt+820%kQ%73a^Ns|v3Z<BQNf1O~fo
zpVQLhv~EovAOcM1-L9tb-ViV5e#0&skhO?qEosNzzmGg*tNO$f;|qJ$Nv9QSj>FBm
z^&*gU-W_w4gJ$>O_yRNmt~@Tg$)<V_3!;lfbMosS$szG54cZVd>dmNUt&?D!*^nk(
zK1i^*{R4$X_o4AZ^m#08aM|bHY%aaoi83m#dZmeM{~uz^KrS952EV`eA^%6ouP8zO
z@6GgX?DjKZ<$pAHInav36+Vni7cwgQcn%l#6h(X_TbkIKGvH9I$Y)oUrL02GSSK&K
zx7K6Rrl`=(VKr&=@r`4^+}<>rXS(ETE#ut(BYhHB8`dST(?T9BMCu|eXC(+b@kcia
zt8)MMdsP#RIE_624kFhe>?{ECU895%9AN6hhiuwZ4m}r7B~%&mq_>CuZ}jG2@LV0~
z=XjJhvxg0LZ@3;Vwc_kHV2)nuwJD12kU51RnF&S`1_3@3rs*SJY^!JrVv}crS4o&}
z*ZsfLBBa=q=YfIjQ7)B=w*Fr%$?G0&e>%u54}+I4z|ONUcd^sqSR@L<MvTaBKDXZP
z#c)8`TE+s<04M@Ktm>8kuVTQy+5@@T8h}cK0+@@U+;PJHuih}~%^l`m^b~qD<o+3m
z0Q%1UTNf|w!FIsqG^sN%tzQP;b=ZDvX<ah%#Y-IYrj<S5U0ACGhNzt!1mVf%vhiy2
z1<C&$W!;R#y_~ClVOO|j<hJz7Cj`M9k!{kETvS1)Ri<0x71&N3p}MlTY9(a7?0m-_
z9^GWae098>N9F5{by>XAvU6IBHr^}A^G;uN0sAPU*-hh1&@;zu8(FnGo=6<eE5=1v
zKB{@9z=&ClRybnBWVOQSIN)?vFrK|6HLul2+!inE0o)|31vbZ{(%fstAN>n8eP;Xr
zYP|4d2ANMv$x>i{Zy+tCoopc|!3%H)xtLrDOpu-AF8BjJN_LZ1$eZvH`iOi<4cea$
zr3X?E&8HLLB{-j!(xr42u)<qtJKX}0!P9^vb}_w@-T=?RyXY?ZDBVq8p>NW6=tuNR
z(=hv+L(KzCkC|^yMBc9XusAF=SD72&S=f$z1ScWG#}4ErzY=<eoyhL7%X}2xhOd}!
zBD2Rw=9k~u0`)Id)XxM~;uvy-q(@3RR?>V)kCOCgNsp0qoTTF=ogis}q!T5b#OY)*
zh102Inxw}{I$hEklFsCG4w)<IJV}p}biSm8k`_t2K+=Vh7E8KF(h^QfNtvXJC0!zE
zxug}6dL^xtbg87vB(0LPTGARxmrJ@r(v^~~l61ACYb0IEX)ReN>3T`)B;6pXPttlx
z8zgO%)Guk1q|K7HNE(oIqol2p1|@BiG$d(Q(soHVNg9zfDrrp84oNpl+9~N4NxLN7
zD(N;!kC*fWNw-USqNFED+AV2Z(uAZ*vHx!{%(Lk?^h~-xxdw~DW5$Mm>7}qK)D&OY
zgKKrxdZucKRF%>8-*3<?WWhL6+jls609j2FOoCEWFg9wL{JMM%yFeW2?Kjc!E_cHm
zOGv4D#d!MdC%rRoT**Gl?ih+Au|2Yk{|mB4N=KBX9Fi9gKZN@?*=+T(II`P2W(CQ5
zXlyKPbXJ^a?)7<fduhhBEsmV`c!Vy;)JAJ)qe(Q9H|^H&gE#&%?Dvk*MOhu?3S|i2
z4rZy+o_}Nf^8I%-Eegk%_7G*A)gC+DrJX|4IOm{mG#thIKgTdnq~Fpl<b7if5P<WH
z3vFKIoJ%X?$je?v4%K@FrSa0u^k1XjekjV@a&F5RTA98zUdP@phZ&!)51tUY0Q9vs
z7iZLQmpAW_v((%#$H&)mvD!fcm|@3~62sOC#~2(3fmi|ca|p_Ac90{r4ma0)IN3Yv
z`LozZdA*zC>liqAf&TT*a4&@NJp@(xLYT6JHoP|HlIKajMtX;wytl%syI-6oxd-sH
zo>$fcgIPTkZ498h%-jUNRnQy<GivG59)3_YF5f%r*7fY8HigF5pegPpe%>yrdCyVi
zmpa~^e~a!+vpv2Vjc^R#%o+~|8;6tqWAX!h>e;Nc+vBTx)d05CYK#kfxz*fTcB4o0
z{tNrxE(6$Kza@F(5M=*d4cY%<XaSxeZ;*dLzCVhVQ9n%}6Zm8FJ+mL=^?8ueyEy*W
z^X7Xw%ff&3f{5M7*-goEVODdo9Ft`{W{A{Inuv%BhANb{%{2*2Q|)x7H{;1hVi^An
zwm7*>7R`AF$vR=r!P{99Zh_)0m56+~SShv&J1A~fh2gWy6KJ4nhVjBzk{=1{Ty0^S
z53is!<=iezIkh}l1RM>SLJ+pNs0f#da|AL{TNs70QPk3qYDD@Ht334~R|<0!O2i`U
z-3F+U%<oOE78bDDl&1{YBpY1h_jMpr2WuajiufkEcL@VkZ4tNpv3p!q$vYE}?JnwK
zxIVm8M=a1Jje}=%Kr&Lh01n__&n#OAB=T@|rEs0*m7Fg7vH-9<t$0k4E@;t;f?=V~
zBMFYAMQV}Sx)rRMHw{~#S?*-%h<UwiA;-~ymnw=c4a1dyE!=)FjcWP55)2;}JbvQ_
z*>rvbz8$P%8ME@q^6@Y9``gi$4(NFNJVQK*%9+FOz}ube7Yo8|?Loh^Z*JhhS!l0+
zb07$05LPk&G4BA67~l=~i3ppjEe1k!sNE-LLRj{t7?DiqCNp@KLQ&33+#!suwZ#!%
zo6on=7ug)(*MBajRB<c-C8iAA^s)DUn6cC_lEzZ_LN$>eBJ0-|be!=|8lqRxSIvFQ
zVspE3ulcaM*IMhglG(#@8m84<TFTgURIfJ86kO5~4*J{RNa1hwGkX#eu_GDwMj0!6
zlNK*5Qv=>jW-euM3UVghs71@ll*%6EW6ag|x?)R#&0^-9<06SmF>6mo1o(j#uqso%
zNO02@0K^sM`<AI@YflYY<o9EF0m2$O&I_HPclNRHL4g?NvQR>mAu0~9G?Lu#8aBG<
zTZtcbdOR`Vph7OvI{9RHmb9>woiI)`;AwGQ%`RqD35%O(fO0;R&dp6OchN?sSLH99
zSR^`Jw2>9TLxTwbZbGS7^}3Qg2xC3uf#NyQSGIKVC4zSvW(>IXA&4f_EE>?QwZvow
ziLa+vTiL^5Vyh^51(W{=7_|m;ZTZm9H39+naxw+_|5|tNyVI{4;w{X=dW>G!%rtK)
zJUL+CVb&4;_-d643%i$jXFqig`zVrRD2_DVQ94b3YRqu4ohh|;SB>)zyWBhLgNN8h
zVb~mRaxJgt$`rX`#+Jd4cxSzHBl{?vf^k1T2D#~)-L@w7v+TXjIOW$Td1t*+&pryf
z<?+UW##$%b-ONaO;X*1NRO+vVXPoOTz9G&&O1-P&4FiojI@--Vut+Z!Nv31RN#5cc
zUtk}lZhyR<MNc|J;$_;*_Smwha2XP9SFg1H@l$W{Pyfh13ZHdxY?Td8;13x-S!;i-
z_1naMtYLDvcWC)HO8p)24a}b85TBW;Un^ALc|#Df5jT8@KbZB#DeR;074N@?;r|SS
zhu?JaJXvjgVQeux;>}(j-{g8uq=m(_*yvv!^3HnhT=r4;9v^3^f{ByYO{T-#;Z2hY
zuh!va(GH#{*gJIH-xc<CaU=@%QwO||4EJo&D_auV_$UVUtrhH}aOjL9QSb@$I5(5N
zI*8}SjMHpB0#M5XK+0)ihH7v5^7eRVJ^Cm1Q8@eJJZZ2)KyjvT{4ZF8r4(PA{oU6(
z$Xk5dAJ|9XQ5Q$vV3*^^JC)9Ti08$&F6qOt=&IAbvtHlMJ_?79c&qCdqME<h%+(Hi
zq9?x`PKE-9tX6lYrTumOA`ZJbr10Gy--wB6(qcCcj)_MxFt?R<YMt(`Tw3p){p9iN
zqcos34ySyVx-YxamfaC-(>Y&wXFc*7`zYL){6Cm@4B{cxu=YJpzQK9F7D%8^LGoW}
zo@G8M)`9=O{@;Z(SPm&Nh=>Pyq&ijWkDYn#Sg0AK!KJ<^)2qR)#V_+#Ug|=UtALUq
z+{t}eG4F6J<SWI6E)D?|VVsB4XZ%aXnQMCzK2w`JX>>6V*^38h(>iNq2Ey9~s4Av+
z2>2SH&|pb8WxmqQE*Ofy`m~$zHF_xI3`gco&DYsdc$Bk%#zydsWT2YPb<yh7b7O_s
za>m1(_*1yW#luGi+YoS>Q#zDP;cK-nNtx!e^tZlnD*Y`q5=cNJ)8C%p;_R(R)uct}
z|F;|FDdxej(N~k-l2yj%#`gcr`yPuU<yse=?MA@WX`X5|H;j88_=6C(!Uf8rw;{fT
z?_O@$W*?kuv%VU)czJ$z@37k^D=fChJKb+1Yz}E>1>Z1rcb7a~!23Al-ZG^Do$<}C
z<q!Q^SgXC|yJI-QNt@Y6;and_veRaIl$+62PSUm6-;Jw$Vtj}E)T=P@#bca_n_XJT
zd0U(Pec_L5#57r`3R2B+WG{7TnBkIlmI_b^<JL=42CVfK@BA72D81>7M_fNFCf#_L
zDw2hnv6)i?Wq=SCwYL`U#qlG(Ltnp7;Vk6;gAMacod55qMdUSP06*9`+c?-T!U@Xk
zu?~nnnRUrtCvC5)ZaZ|i81at}S6b6OFu`&y4RLZ3&+v4i8L930H>*!6^UiwlCiYQU
zvoZn9hjsK&H*+j4(ZUFr7H)U(n0N2cEi;vx8{$Z#>QXbp)$$143W#VzQmb4j`}3vV
zS?}U7@a~=*E=Zv2l1q(}`ny)S(Eb<hNADf#+o^Eb8b`9!6KSEF*WF?Fs@2~!PMdv@
zch+AwvX8>NDSkXZ{<~q$-j(8LgRdQt^WuF`uNXf(_Ik0L{`e(@kuSc@^?HK@6_IA&
z)|BC)Hv4;BRSV}a>=qT=c2j&Sv;I54KW65>#;&BXH&rhC$UEx~Q`kr87nA=FF|IN2
z?;hh>AOH?Q1i*Z<j&$KPa0|TszNH7#d2~6V0nUd7@E+g;d}a<Zr<lu;G58Ymr{-hk
z``@>$ATZx*Rjs$QjAZS|WQ(-q<Z7=)P?+PPjBJz!9UGm$Y=o+w79n=FDn!yOtu(f3
zW?5hMhDSPNefH{NVbgT6rjhO=@@NSqwLO?Wq;*T98<r+D?XE&1vJ>hFNE*NNryR*w
zbCQt{RynOmi)7|RBAN4dBBR1+ldaYYE@ZPTsGc6AMXtvKf@I)u2$22P32o$B5i01g
z<dGAk6)#6%m)Dg|fSf2I6rDU!$a-lZuJ*A*1YZKr7xq6M|L-?$F+L;*;q8x*o5-IK
z0lAc(OrHT3$TIT`^EX*<`FO+&+S)BxfCTfgM>5)#GFIb&m-J>1`SVBzmt+tq(}5#Z
z{z531QwR^9Ni%02%e6TNyrnllW$KAxl~2`U!G;hu?AC_1iwYvX_I7a+AAZ0QW`#o+
zS7191M-TWwd+O#DieDjHjDP&X029)h5BR&*SY$0x90V36luK2C=6V*D?{7ZfBduy6
zt02ZtT6xMvkazO|pJ`2D){-3Nq7?DBB0?4%zt$eXt>q-dm}umuTEn8X2qKUW)&$$2
zDD<&DBFb8d{S90Oz8nEeU`b@FzYS;K)__o#`Zfm+`08J(i3jp>9Ym(4&s~jKwGZeP
z3_C#vMKvGrp{u7<-Gb2eE|%Z54MFZL6Ik0naaR&y!<c$-fZ%Dbc*(zMW4Nrtw<g?H
zAAssL=xgI+$Y-O>|I^Oo|05CKznJ`)tU(sQ_N=%4JN)8HAh#n9hi+tQWy4nlfE6<y
z60+K<Ibc^b!IC`oqh)Tm^x${WgI~(}Sx<Y5uV2SLie%N@Kfy9P4yKiETCoy=eSR?|
zf&qYz09(cbzy=)gB2qP2+v88FlJ|LM{b@e?C~fg2kZIZFs4JU!ZT9!BuV;$0Te)gI
zY)<rbeOk^^%VQ!k*Ga6~h-?!&e0C{tGsocf4!O2V=}kC+JjyQ5rS^_H!Z51(^LX!p
zwd#p`*hk^mkN{AI+mjSJ0_c~<6kG+@-&igL$6h4l|GUO3Ts9?;L)oSLuW^H_wZDEs
z*%{)gtvFrbDfE9K193Ko0pa^-@&Z|JykvyF!&lx?l|QjhudKB^>=RH3Vv4Zin)S-@
z?H77y{r&^?QF_&#ml%e3Z-A4dYvwG~lf+ls!w*iJxl%mQTi;UJ5ltYM6ZD&|R)9dX
z#Z$(7WjM+nAU35Z1XEYp+?YG#NzQf1=0ytE>ICvEucjm2a4nW@M_63BL|8wGBO!Z-
zMpR3CIDy>CF5fzPPrq8*%j*yN#5?O*_#`}glG2ZEni%YU9cQzH=@7!cly*F3)sCms
zsG9rho8Isi-&)5$N-LrXWL|dp46(U(rR=!eKTE=F)M{>26>am*dg|}&qj2>n2DyGy
za?ZN7>Xk*G)r<Fk@n(gOkpCwbM!>k%_%k$r6M*7&4tbFLold5k==G5QO|t@6KTomO
zSTAUVJ7HE?#tg{?CBC3<3qrlEFlGIo)5hK}wG=Ik0&0?*#PWHj8ZNc>drTkeZ7rON
zjZYa?(hhR{p3%DbS<5dB_}X9}^HjHT9ISp%=p}Vali`ow$abxaDX!nMdP&Ywu#{oB
zmxY)rm$|O7C9dC-dWqXok{P_3pk(Alp3*0NvK9g49I%C;*Ju#M9&y#V8f21zSb_ru
z!~Eg=9@iSFtYgVu#tL6Eoa?;Yc@n1|?r_%cX;+Ve7e`cuuURnNtp$7IOd-2_rcInU
zkzT4bfo1)!VAAyI<7=wwScmBK4rc~7f~m?2CQk%}7~GpZSXXNNTaW;D@-+5$%4dx}
z>paKP6%{f;hdBonGKXG1+33A`EQjo-1CF&b&;}PiIIFW^s>YJn%Ey-8>^yri{DFiZ
zY=-oSwEq7z^BDRYT17q}ZBW7gkm>)UiIJ{XKAj`G&cl7ldyBlqH^0t4%8Il(aS(U>
zaHG=IYM5$ucZ`#7ig{<fwt;;V#&rp#c5>;{lC7Jn&HB3drgPw^wt{^W4%-t4Vn1`~
zTe7kx%wL@%q^fPkq{Fl3A`6?e1cw3r-MVrf;qD#!*$kxtz626JyF3Rdn$Ftn?~!38
z-q}C9fPEAm?TG`poZ#yD*}5{++Uf<3D;Aw21fHvJS6DVAc;Z!8j;7q9s?!&2&1}tZ
zzRFyfJB^3Rc!xHtLgkvoe%y`GO~))MHmKxM>New~L3?{=?eVjZ(uIx$@~gV^|6{K`
z0)61g*o95k>h7ewv+kBI@9Zabu#du5$p2fJ{C_m;|0~E_Bm@MotrnsEd-@YH`WW{z
zdQWi@IMF!<QurU7>7Dfgtb8x1R=z;uFczWgkUAi9Qm~1Xv5B4uZu=>ls1@(e{Dm^w
zn-WMg<?@8L5_6Qvl1xOv15ZWr*4kfhz2|8m;cZaQ<(m>7*E}=cw``S3eXKD>scVcf
zuiRO?6YQh(vo3L{>!q~1(-&%Cz?rN{=mD%>Yu9+ZvtD|PeH0Gi#38OvBlhNvTHDJf
zTylhW_U-SnkHWDvG0L@Ho}I;~*5;!3Gq!?W%svV?e*$?OUHUbreMI3pDhDy;P%5u5
zXHn*NJmidB3Lhr_?<4Sk8;moJUmO1*Q^-bOe!NCU!VmC#L;wv#wBHu<X7gpsLZA<5
zfhgNnk7cO}+FI6_LBV{p+Fp@f+0+zmXS*ARyBu_uR+7#BVL@S=KLSkS5Du(UeS^-`
zO4~}Y1-{VO7$R8Pk${Sqyg)09DkT^Co4Q084ESB*wwWbifISPJXcRlgEwj=<3@^NF
z;`v&UQfXot%q@s9L#z(amJw|OjytrHx>9xt^BOO1L+~1d>5egdBZ{A=KXobP;eyu8
zqmq{*R<V_(m*o}wP^&^$$}f%hV~8nS6y&1tpo@$1x(B(LF|aeSjS%=~g>Wavvn>pw
zB`xCNp6&KAu}ZvQL}BtqU#Q1WR$9$Ma*#*{Y}uegIs)|R;&43<6&SpW4mArkT>y?*
zOTTjMK?UxBu@+>g3^W2f4hOGl^hg|?mTQeyvJ9YYg)?ZsD*Zdht6vZfaOF}zfLNvN
z|MwvS;74QtIfg7CYk&ZBI{68?m%K>+hLxZQm_8@b3+XTEv-B@!AM<e23k2Zv%-hZ9
z%)eOHh41B0X_U{=5R+4e<<Uc7<xYFtkdtJXsz%>J&Xn!}IZNhc(yE)j!KOu)D}G2?
zUR43|0%=ap_VOUxq!l}BKO;Yu{8{Z*RVMkN?4<REfN1?6OOY)1mE$cpvcg*GrTv-J
zWh*D1Cw(E<541+=P8pXgf27fyk+Y<y0smQ;y#>&R#8}1tP-6#@v+x~hryM-?D~m3i
zB;_cv>zSt*l*Vj_&<@frhaH(QqrMn(Am)sInqs8*Gi{f?7&gEVq)vtw+e=pDs-yB~
zC1zQV_7`%RoPGEu%&1&!lupfjWh1xBad$erk&9E6*sFcXj#O*eeYW(hWce4<xfg#X
z$0ggzk;KxMV+}2hNC&{z6moM~{=dvT9QMCi<T=t}eET1f|Bb{kkpKJ85;uBkXGa!i
zKbP6HvxRK@$v%qo)0{w_IF}xtY>K8{S@C9am2%dl6Z-BiIMtky!wDJVTyo0wK4M-=
zTp57pErO62etx>()I3Y!<WC@DoJ+}(TgR;N?!qu;xl**>+um8vnCzqQ=}aKyvdaJ`
zeN?_aV87_@CqxhZYIeW21QIbL;?vE%v2~>4ZpJ(ez!HsH^^u6p8*-V7&)kvVX_;Nc
z=4qEx=ImqZ_P_2G;le%ijk}c*_9c***`>Bdab~K`{$4&)dZMnmM&ZHs|Gmg?gA51u
z-w%NN+n-iL>VKU6!<=lMVE+7j+0g&*SE|>JM*w5n+{I5UJdb!Qz#EETq7+NQFzsOk
z2}!aGvORLVr?^odxDu*Y-rAJpd))|qHkB-H$Zr!tg4%o~i8PB|NhOi~+rL*8+w)~r
z#G^kqWVfo-hr~K8*+#gY1>rMvUfwODJt<|E4+h%m0Y$Wxn+S~0-HqRZa4@xm8t?0!
zm8?U)AmZEF1#1RB&KeK794RcVnFPJE;ee3=96}`O$>$v%pgkaEb(Gmo0L8$~0IZzx
zh07)||CuhpE_bDLNN^?u8bki1Y13e0=2hLx-v9sNfA)SslK6?INP4QIr%8Icq(6}K
z3`x(F^ejowmh>D+cSw4!q(7AOJW0=&^a4pQl=LD=FP8KYNiUW3N0MG9>E)7MA?c4L
zy;9PvB)wYFpGbO*q}NJ%out=GdV{1lO8P&N-X!VGlHMZet&-j*=}t+1D(TN8y<O5f
zB>g$3camRl`b%;Tr}vUyNqV28_j9_7JizIL<ky@&M1CXb!;(HC>7$Z9Ch6mnJ|XFo
zoIXvS;dD27R?_DreO}TRBz;lRmn3~z(pMz?t)#C?`a4Nq<Meg%hNQoj^esu>mh_L3
z{z=k5bNYMorlf!1bPst)(!WUhuB7h?`G2!vUIzc4o9PsCD_IQxpUu60BYIO}U1ExB
zG=)Md1XdOx*79pa<kqmeyA`QsQvykB-Rjxx&rv)|Ecbj>R$Ako^(3Ngo>Zf4d<kT3
zbt$bWht}Hc?~{H$$2;rK1KCIES2sya6lW$kMksb-0mPN&NG=>=w6`bE8p_1)iuVVr
zfGe95NV*PFm76ALk<+x8YQ|*)Pw>uq^>6H>^gf!H;MyLoJA$)QyxrM+_Gs=QQ}I4@
znAxdQI}^yy?(&?Yj|r&N-ts?inK<Wkj#4=L63E%^az?=)z<RF7?6rO$QFy0!*5f~C
zABD$YQU?5=jST-|9PLBv$@TOFe0_{m^yYnb^V`}4a;74OFivfn9KwY>3*&-t7;0$K
z`eo`Fi`Wo3W|KZ4F`K^`h5A#WwaS9(hL&&`0pKiWG4sW!?r4Kqfy-sT)Zd%BjklyU
zbZV6{kaV|^w=yxO2S8MwRfK8C&GcU+{Q1rvd$%@$yy_S{eZpDjA%e`kI{+Uh)A}Wy
zdiE79-0GSH@|jnVG5SZdG!j7m5zivn=}gPt-k11rlr4NUrmeg+(Nk)6ON9kIj+ABC
zDuS%q${)v_x!1f8FG4<RmaBW7@)$4^^Oh%&Nf)@Z`oZEJ|CnusX8JENOl2ki7^Uq=
zLjp<JU3vklAa^Pp-!YfviMRgEp-K;06H{H=8SU`@YHco-tT_=L>aFafaAWfS-Ubr<
zJZgMJ=8z4*|9csz{^f}L`8BftlprtoV{YE=|Lxys<8Vp=t-%dNl{j$YHJ4$ueQWf=
zMCl^HSBBFR!)|0_x&RqS>oYmo`c{uI%j|7DrG9YP91gbj+u+bH`I~};@Nx@9d;%k{
zUxOaRB3*4kamdpd*oXiD7OxZnh4VwRXLC3#tmyqhTKz?)jzt|2EPFNnj#xMpXy_0&
zrZ%m;F;lR_AB4hr#*`VzXxP=z;`2+UJ{L?&{h?-r-+It!Bz%c-oqfNE7IGuQv=m|t
z7&A0a&kBre6pI}P73>$*8v3$JbF60Q$;Beyuem(0dqfY9uYhqy&`iX$6^madih4E&
z!+s#Wc=Ds|{sts16dtOrMR`zU+XlpCH^R0uw#xPMYpu1G8agllo<asu3(F3}kO}&Q
zmAzlg#V9PngN8#%m9Mcr+#v>U(_lK$=x@vi{<k@hUPDHZvuQPAf#<t@pM8mi1C46J
zz#cTaIxG{+^Kb?7>)_#;*<VTNJ3Jbq^p77*)ULac!~*8)!JxDb9d0|wh<fm~6~J5<
zMH(NTbBig;rC;q-A9+xFYu*)u**c63y)?Blig2PxVm@402y@-nbPV3ka8^!v8zVm@
zGxs<9P0jVS7w_(Io9{j(!4k$zqAT@MjHdbmd0htorJFN;3V?2p^h_Ts3_iPD{cP=N
zysa3OgHog77cd`~7h`&u8{PyG>lKpW`jO+0%jEx`cPk%%N71e!aa<4kZd#ZssKi46
zSThUA<HEze%7q9m<xgSW&ks|27D>$GXGZ<8Cc}l>fMIxJ2po8+xX%Hcm+rN{Zv6Q9
z+XT})RFt#riMe>*jvk>Iu1MQl*be<AR!{*M?Pd6-Qfqpz)7|w$?iLNWeX-JOcK#n=
zOf<}M%?b1=x`Dh*Vx$i;0Z+7l%Igvp1C3>5tX{T)jx!+Cl~9VCS>Mv4=vxl&I<ici
z;AGp$UO);;;W>sK0b5xmyiYcAWiWZj?&>iIp2P-W(W!e>$hBZ%348Po2>c3Dmh_cD
za4~Q2Nqn9?lyhm|m4;+@vohuz5{sFIj)~i&?bkDfU6sE9QJb=BmM?=!Ig8>`ZoXP!
z(cLFehKV)A$+)U8S>cbg;^-CgEcaA~TRlrUqESdb8)drnha7LONjF5bFKtX9`&)+-
zKBv+QwzCCVu~i@zTa2uF<={tC&oQX<dVQjVEffwwqjt=!Z1~@!w)B%vPIVFAkXY2q
zC+BMjMAJ_$^QGjG9g@Y_N*{s=B!lhMT=W6H3~2!&8FUJC=Z99RmyS6tH5ac_*fIHk
zlyRwnf4?$bG(Lj_P(lL8{(S-Y8F`qziY#9T(W$h8#_2DB|NpK@fd9Y1^g~|wv3bAw
z?DvQNFEA1u&f?@A;p?F;@#KEtA)#4~$$i2L!*RhRzY@v8-EEiT0pUHQ7c<DOg|p5>
z>SQL53Qz`dLrld-1PF-jB1WFvH;;~?<e{p}WFilzu36TJ$Aw>x^LtAk6K+SjGlu*o
zbth-3dqQ;O=@J(F&O(Er6yR^_GgI@BD1z*sIB|T;zXh4r{n7E!K(Hl@Y?DZUIzGQW
z5^f70H6G}uGsbts+9!mX!sOZB7K%1)CchPqU%TO5*(#RB=Y-GG?s7DWrGZDgAas^B
z_#)zDLtYUMFuN-dR)j-H3Y_O9F;{l8Aby_Yp@?PpE)4m3!ddd7n1#EU6j6-S1x?sz
z049$vMPc*gy?#wR``z&Wf?^ST7Y3r?dZh4X*$ntEUJyfxUm%4!{4|k(Q*PR?3SXby
zOj8RH6_Q$E1abW_<SOMQf0w!+_CTS4UEhb${U(158Cm%K=jAvw!0R?LVPktUd0Fs!
zy_^Xp0^SheV#py&{w(nSUl*PMg}{yM@RQ$*{r_-E-!kW#H_!#-T@o|CHcmAT&+Pvj
z5=gD(cZ%6ZI23=}1<L3uqrGVdUxpU{@_1GF+LS;#tqwX<FMOq0Xr7ej2^web)bZS$
zs9}0+2ZY`<PyMsiKlY99PGn0wI@_qMxzPmDYjrxI9;O*1IMDXN@7CNfuKU>r$yFWV
z6$xb5TI+;nmgbsytuk-e#x1&W>>in5X|zV;-G@N4zwH4nU3IV4hF+~C`)uVMzw?<p
zW0;Kv?Lj!8v%gj);N-f5Frh$mkgE!J;do!#5sI0aKO0-~S$$A#c4&pwrUX*YwmAtm
znfeeGt1Oo}3uxooe63b<c><ZiO2{bvIXgAPX6lc;^LAV*=fY-f7ufzk1mZsaJxK<_
z2k0#F82KliMZ-Y*dfnX5tTInkuzxZO!}su)R{vDZkzzw#o>g3%x6s!X;(4e%Y+U(b
z_>NYMq?S#&W)vY(SuWD_Fum8gT0F3sDH$N}BP_2HiEtuN;5CXc&ZD&WuSzAw%)J|h
zrDGrK06o-g=dlxU&K3Sf>_fcsA8Vav6vj|<gwn1ypKAlUl~OF(bVXOJg`GZyFYDJ@
z=NYAFWn*Jk)GrEs>y}>?VuzusLOPwOj8r{B>))gBtMWs!&&PAPRwt$uVQJd}O#!i8
z)5G1)qiR2rl80h%opebQXBLqIj(XgVOASlJE#v??&@D^2C^MT?6TGeJyMl6P`nnxe
zZWLtWS_<tLAEHBq{lC#LuQw;sbLm*}Q!>qHL^iPR@W0gwB)G#0tY5oULz5Ejgs|3V
zX8t697<wdMzp8g#rCq-wiS^7T?0}h=sjvW<n-DBg3ds%sXCY@oC-%Di^$j1ia`wkh
zRP%ClC2E<H!U6I!wFYy2ltyrL5GsvJig(GSTiwQ^iM6hU2aQyz6E}_Im%2T^IkAQv
zd<$I2XSq^tuHb8&eFX>Fw2=fMO|YDN-?22o4h`<53HIxg`S|BZ6S2f9Hs2h4fzyv(
zdlb<gQUWX9)I9YS38c|=C%k3O0=v_H8h?D8SNw~4GhoMU_7`jfq8$HAy#F%^-Ot>M
zo@8DG``-xQ0M6|3_1~007Mw6G&?^EhFJA6xB=>+Km4i+%dmw>)IL*{S`Do#}Jk%Nr
zcj7D;tnX+euV;OA!E18@$#70^de9bLRpAa~geu3vg4J~#me-(&Wh1Za?)cUn&!0%{
z;&Ni50rS6)QvwPL=ggmQCKk*VMtn`;`1rch-MJ6ls%b$Wf$Xb(dW4(xx*+Q~nRU1{
zE-vE;ZH~HqprrZG-I3J6ZzI!-EN%r|eAn=>Z3CU}gx24O|8a5X_xgKfyH-HTUd2Aj
zxvaZyVguST!s$q;YfI)jno=2pyERk>qAA*2-mZ|QB}P*MX^k9D7MWVJ28FZCdJODJ
z>Cd0iaANZRFyj;h|L!Aw$t=<Vz2B$wNML`SO>d)b0PA<5*=b%Q@PB$-75>E^XdR(f
zK#7C6-B`Gw2AUp*w!+-zB|^{eIeK7GOF<MU!W4mWg`qU!@gSm})xtz?E&vRluZ_mc
zuBHM)o<vR=zCbH<WtV|#U%gP1rLcE~FVP+nEJed`RX}SCJ={Yj1u!{f_;Gso`b_DS
zP(?*JW)G8dpz84yL)vL!Q(^cbtsreF51+_3o}+{pDL%?vZg1UQ;Y0d~4yLw>!K@!O
zPtyvr$}bC+LOsZiPB?#!V;21ho@wUkP%UftAnWk>RpwO_%sQtZ6!4s=P+xRS2sbyI
z|D(-tvVzxFfGN-nIDP)(pJ?3|Qa@%XURba(d_jssz#hfyVO*}!52)nQ(a;L}H(0SK
zMONg7o*Gtyyr%VCqG8u+gL!4c$_guat+({lkP1KIK$w=1!<DjzTrKo}M;XRZ!1z6q
zK0=Fu0D7YFiE*;>Dz8o;&7PwWpE*>SnLkHQKWqluW|q{Bd08vOZ%iN?*Cr<jj!cCG
z)xOP;U_1*tA~6XuK=$Nbt5{PZ*dDfCUF8QPLRjU8IN@?y*cGyaKHesb8V3{`k7)H^
z2aGLC@ka60c2AE#S+GKmK~7^D6Uf!o>XahU(iEJA+0n0DVrik<*%#_gJjFZh<-6EN
z>2qx&$o#DxERGg7vV)>;mM=rQxrS}Y>Pvp7RDWWkwI`9qQa_-XHg)(TNcZc>R}q@Y
z9;dr2-#m#w)YaFikf61RjlJj~!{Z6_)sXCAkb&|`*X$Bm{mV)R>l4Vy6>!pkTl&Yf
zr|f7iPM3SKzi&PJ4Z-C4(F&7D0_idxkFpjf%wk}p1KVSNz2OhnY2F65|BnRpAO1aT
zyk>k&Jfw*DNrGHUo}m=c^>b(qZKY?@Tj}$#{`EBvG^d&C%}wwZxW{};StGu$ufn#Y
zm8HoaMHG3qj8Fa~Ogoy>J$XZz0Uc#z^0qMU{5~UXsp8$6!b0RAaFRa=xO=P<i{NsM
zg#=57uMtih{1yABV1c{kFijyFSdkxACOln+B*}h3M~VRSp4S=j!Q?#Zqa^p2Y+7W%
z71`3|DGTt*M+jr%p2B*V#Sk6F7Z~Z#LTTnE7C}}A_P(kP-f%itm|yo4HZ+8T>}{4c
z?ky~B%Dg9k5l?Xs#5rK&2AO>-E8`a(DhFagO9zZ#tRbw`DWGc%1o=!nvOUP8-PRF;
zB*xpreg)r;29X7a63KpHxDB8rDWp5{g#ZB9gGC$$K;-QTLuV(F&C>qDjJBt^xvO2Q
z>0io@BZQ7Mq#BCWG-w|Adww1a;$%-TTs)D;9L>mQZ76{-10$k88fXr2w?LXFY`c4y
zR3eZ$=t07ww@0En;jGpS3=!-t^8Nt%tjj_T0Jve5r#;LH+uH$if=n=C_=gC52GrE#
zkA%XW{N*8l#sd?8wS~boiZ<*oCm--MMf!4p>$6(8+L!{W&4B;kg@$n<F~}zJI9*8Z
zFh`r`eP6G#yLtn8-5SiGY9C@gG2(cATEopa>2}RuR9?6M;EWTe<JIKCGD1Ql1q&8V
z%KAQOGQN5i`#S64E6Bj#n&4obcT;;_x6fXp{FgbU+c16+b9KebjK{&=DA;H7Zd;WH
z_dZ)2SuYr}zVON+z>3QA?&!+vj(!gn7fhTu0U5HzsH<F=1wZds;k<5*RGup5;%Vh}
zsbC^|f|$1m#+7d$e`a?D^SU+Z)c;L>tPKp!6W}|k3G(wzdEE`)%dk!XGq{z*g)Azd
zLZV_yKJdMDZz?#ZC#PU`KgA0<(0CpHr|%fAlbPfS@)`Vnj;HsUqs(>Yt?u5}|FgfM
zpRUa7F0g-oML`DLThamDK)@F&$o`6<S_Ca#xRa|2#J%yJrbsx%-{XO2VZe56$m`ai
zJY`pwTQ|psX~MR^LR~62TKsr^L<iptlZU|Mk!5+^WB#=c)P!5Ru;wE@Tol#Tvv?XT
zK?9#ct$)&*8kLqWViDsp>?k!6mZ$=|@W9(q{xdyXtx`d1e3@qqtB2p_^*o1q9&_6c
zzJ0Os+`PccPeu9nYxBBix*DDGjs|$nuwxv200S|0gd7jOP%P#P@=X@aV~$Lo^3_#k
z3#uoy#M%b>z~Cdd4Xg-65Kl1<50g>eKzP;B-|E8*l!2;l^#!3_U@`<SeYtySeqjTY
zE7<WpD|m%#QQ;dEdC->HZXim9Ob)Orz5uD6(R;<XbTIG+asEHZFwZd$qIV<y_ZP%#
z{Lbhw4qBB!lFT|Me-X=ZBqKRxgsA2_?$aEn8WNrSIHk8HS*lj#xINk5jl17`Si_|~
zv6)%Q9MTtBxKuU(t19X#-hvH>$x~c7CVOlz&)fNwV0q2g$`P(9fz+3dYFi6S_I$Fe
z@%->+z0&c>PR+5cD-mN!_l|Qlf_i~^kM@@FNN0c1$!k@BU%>K5aoq1mOI&fUX+c&e
zSVvfQ%fn%gX<8CQ=3_Rc3Ht1Gd-R{?idI~IfHKtU6G)i}BZc0H+A`D#`bE5sKu#ii
ztlt9n{a!P~k;JCn9mj3FGWZkCy}qSzo9NYbYRZF9qMiA{IY1j(dIdMch&Ucphq34g
zk43P|y}EpKmF%UOrG~x#{Q>-Go^4L1_d)yj5(&Zo@67*=9X*(YC=#VpTs=|%+conu
zB0R+rNhT(f&Bfa1+r2YaZD${42DK-UgwyT%V1IVEKhiHBJV!j<pFFLw^e2#!6Y4&f
zFAmP07Uvm0nXDHY27D=}(YFepU;;Tg-Hv3Hubnw>;tUPNga{`idu%R-KjuL}OKJ~O
zC(-7_@jci|vt})}CFF-2FWqN6aEMJU1@?Dl=iex2?-fcvHzkmj6OYjKc;@;s@lnmW
zY}_{QSUI*T&(#TJ>BPS1if6Sym7g8TTKT8(;LZm`-Pfx7M>v6e*m(V2)orVrfKnn?
zV_}^8CC?SJWc78bW>eVz))>Yb;|k+N(vM6h_2d%r6wRYEXo%iG|6mSB{=ZYrhkLss
z=q1Fg$>6m5f9lGC3u+gZHU!wGQZsU(Ht5#E*}4gkPYO((79itxxH8btDq>FQSS=K5
zbr+&Cd2aVYpu={CM)h^*L-tP#3L%*Kf_y0(HB4)gR5=tB#yYt&XOxq_o5HGS!s-c?
z6N=b-H)^nZRz<5TMVW&g+znM$a6cChW|T*Zj+WD@1ufxrxWxOrM)NivrZvv#OY(yI
zxNqo!Kr^xj@lr>+ZzvLfN1%yMb@6cb{Ghu*x*X1Le{Jw@PWKiuV<MBK#2sFIjQi%6
zcD0AX3^a`gFO13;`~Nz_+-?rW+dhiiN#+<&8tZ!dw%h(bnC$O<8?sT%5<6{eOT!^@
zH(0Oi25m`Xxx=pKYW1vc3&Ww{NO@k9@`KGq<MfMCg0PxrurrB_cW@DM#g9EQJMT><
z0o&g({_>I7a93aZoYK?ABr@Q+H5<Z&2TYJaS`)rUxv*`&pd3(jU+?ah%!8yqm{zzF
z$$HX<_pCAZHl~h@1C$=uCr$SjxQq>vy&hJZBKz*!@lQ>ELrI?S-ktPqXE1@~#m0<M
zHt-X%-(Odw^y<VUa_u<#dRewCC$k4}G>U9WAH_dXTEO=IAq?(!tMLdSK>prJ?k8W-
zi8Mg3=KlX)^JMcL+qe7Qyr@@<<g9t+fMH;7Nf974q01`e2>CE_1QGVj7r@c(7r^px
z$Pe!<#Cq|Pd+T99a+?u`Iv@Hv?%vl44-H<!f$leWFR)0UjN`?I>Ty1D81oFX9Ir^>
zJwoe*lv4*lc9?OIdw#H8f0X-;YH1WOA7W!X!2Lc9paH0^!XdGN@74Q)Vw{G!?;?OL
z0^#vI=Q1DSL)|}_Dkhva3o&Yt`^i*|WQ{B~Ojtxm4Rp`2x*;7OIBKN(M^W7pXloNQ
zw|_4tP&IPRF&Gnuegm~9x2f<U8o=KFQO3;%{yk=VK>Cm|q>wa|Q-J;dEAlM)6Zr=n
zK_}5hdLq4u-b8;-KQ{L=^Uc}t0q8`|pkJ7;{F}=_FN#Z>Y`G7JrqViG4HsY55xTE5
z4QG~q8|RYuq-i+wBVN{&CQ@5vANgDAF3ZILb<2?{^(-$tT7=o|sT5gyieOw6u&+yz
zQ6kVNBQ%Z?t_XXODI;YqX5nW3h_KNfEPKYV$YjR~qb*{gpu<E&=bn_)0F-D#YNSVs
zuwSbS3wbwnO?WA>Hj=+eL%p)^(>~H9ZgbWr|Bz*>5Xc(ke&l@C(J|7)fW0t55rCDy
zFt8b_Q{erFe29|W!ULkhDCZNs+wY(}%pf}_E%Kq{qBt^<_hm1t{SC+s!WRO%*OWZk
zz^aj(0fIIVvx{+Owr*j8hi4QUKjt7MSPznh{q)(Je3fbpRO}*%sw5(UljtZp95zBA
z?I$hySU!<#fIs=8h2zH_?CCt9itkWB<Op+*NdA+3M5HvA@KRn9{6@a?h2Wc-oi5}X
zIbqljY}|a_v6N2(4QEBOjm@J=Fj&02Q@omx{|gOd_&f|5K1P$<NU3p;QRw=$>`WrX
zty>{j=lcQaMdKA>oZs+)6rR+COx**LLm)l5b>!>Oqk_Pdq6epo`TMrZ#uO`ZRAUm^
zaotMfsktCMW*{|YyU;{$kqX3X0}7jPa<F>^5oFPT>b1iq)SRov6<<d*GI4EkFZZ5x
zmiLvtsOgvYgkb83p`O{g4@nNfLmWdJT%DqN@$&a-r7*7A`L<>N8k5La@Ak>E_stU6
zCtg6yh2nF^iV1YB3icUGVlUq2lq%YC63}=Lu^G&lA=RyD&Gw%Qw%6~cOenVh{}=z;
z^=g;?p~O#qU(ydG{ZP`6B>h;@PbB?R($6IQT++Wu`h}!lO8R$6zmoK8NxzZwACi76
z=|2UfhNMJNDyb=Ho}_&w?JH?NN&8DWK+=Jd4w7^)Ne4^1x1>WP9V+QCN%xU-UrG0q
zbbm<?kaW1D2TD3Z(t{)&De1wIj*|2cNe`9OBk5>K50i9^q=!p-grrAGI#$wrNsp5B
zXi1M@l#Zk0C7mE?0jCq`Bu=N$sgh2U^jJx!OFBc+nUc<ubhe~(B%LeiJV}p}biSm8
zk`_t2K+=Vh7E8KF(h^BaB`p*B|2c+nHQAdShpb=M8owoPAgr&MUPhlX4@I7@Q;a$0
z{YEf7_0xa2QJPx?CWm8A8?r#8WBXIPp%9fE&Q$4AHnOpsFzg)RcA}~C^~#t5EDq!3
zT~`IHqPUx8<;dv{XXo?~*b4DW^AJdD>nmc}OnM{AYXh|`_2mX*kPqE-JLeGKW^gS+
z2Hi{VDrIe6Z_W?ec%!TeQ#QV@Tn&%S$-~V9wmp{UgTX8fbUL93`F}d|{~1PqO#Vr>
z0R8W3mJrnOzn0{IJo?v_UYJFBWm)JT7O9s8`1cVK%B6=Y63T`o&sjaz9V^IRX#fZz
zeWkx{8gZ=@f<`DT+LQ2ucIyeiJ<<5N%Hl}PBrhBP>I1fZ##!c?%)8Cx{*ZeI&@xy3
za(41&+?|}jmo2%}du;y?*+=Pl_rb~i(2UX4=Suu`zf{13z_o^e7)#&M3{yCXwAgM9
z;&zH5vd8YKae2oMF&A<S;@gt@U_gjdJhH1-3zJW)7%2Tgr>4K5<S_UCKX&ROxUAVI
zk(O=xyXfvUuP76M?f*lK2?qY10}H?)G7ot_e@Xs8^XXaicDl#h+blKDG;b5Df!^UY
zN8ikIH!cV_z@vl(akN6&QUR5{AJCxX0a)J3#<qE&3*$daE2WQeSU?rCa!q(kpdk<w
zy3m81oDGzMD*|BzW5kdd15p!*AZTw9b?mE+p3Lc+^jI0yPoIb>w@eG7a5<7a3-*Zm
zBk<Ee3<{DvF)?S<SclC{>A)&p;D{s5O8c$7rfPY0O+&b?-52T_)TYm8YyDjT+<SRQ
zBa2i4!c2820A%qP9RJ(egZ{{%P-9-V2JE~S)i5qFp}>yC+6F~*bw{KLIEEt5X;AnG
zvqIA)e+WNgfyN8>o~m_MsLA|_V?=RZcQ#miPty;UKl1BqqV;|Tf<CBOtNE|7{0ty>
za2kg5H~`myp}`mo3g{<bc2Pu-|N0sjo&7Bs-6~%!iYRNJsH5dDvqaZ@0k21P>jk<r
z>`1Q=)}9sn|8a)7!8GZqbQrmYOfv2^j&t1oGdDYv9{1WmwrSd7CW(F8?vAlzqR!{6
zBZ(CA(3iN{w-{#|#4W+t=7#amSC4y-eQzK3Q5MYhBofcNl@%D@9MC1fHRtmBV@Am>
zDXFmBnB<w~C%KXonD2PDVjGIEoNL=Y<uKSbzI@T-!QAcD)wtT*Gq4BQ+Bu9%f5ZVn
z;D+{RrHft3k?#GOwULrgZt8+4$-ro;$Epf)P4b|DhR+E#*s|egLiva#tZ(_F|B%m4
zh4Y1gHKG>+R!%56n?bgLo2;)&WV-gZ#t-`&-WglIU>{}R#ruDmVV-5~M{l7;<QdXH
z`WlyIUh)6EznYWCWD9S4S5uL9UaHaAk}Tdbt17|x?a~*#GlNsvM;V1RN#wG1I|VX+
zfN&*G`vfj4T_LByr%L64B+}IaDalngax@u;Q1^*w;k4n;xcQaGBrnySvptDawY^!L
za)9>4xaC}K`z)owSDl1flE_kv?zvi>*i*_v+Y{`vE_H2?y}Q1@GLntSG456IigJe?
zNU}_s`@O_74*<^KN`=kl<YB#YXSOrJiH_ObId;Vc{`6`OQ(cSOlcU`~Js3K3?a^3z
z?JkG*mY@UI{EyOCCjWb|;p5*c#>Zp`8B2=ETA%=3h)jUbkoW08_yR4abu<F$;8Ls*
zPrxIXAU1HaS!uSwH|R3+=jP+)JOA-j!eSuJ4X_{|TP&~Eh#K;_wC1yknB(<LzLxfA
zcGv1@|E;A|&Z|L>5by)s*qYWh(BaZ<pEKp@;TG$yozz1;mS$LtM|7a2pq(!v?Q3ag
zj(|ZAk!}Wd5hCOx>B!(5kMn7&Q>y-k9w^|Yvw~~LC(>-5StjXN{yRFZtgQ{%ihMza
zTtg@D-_dbZ0az@X`K1DR39c*QF_ZYE@w|6*BK)tqaBu{wwLj97LRF%Z_*0-$3hQA?
zhLacf&Z1L!ygjZW)UwQja60%5Krs>V)Qc$k3U2hLQ;PguVMN}=@ZgbINO&C7h^9{A
zsmQ_|+*Ow@=7UJ5ENBS?8xfDs;=6-5O0qqN&gat(H&K^g0@U&wD^jJxP}Cscx26Rt
zO5jbxZ&q`+6gmYyX{gaB)6mf(S(#Wv;NC7X9?==HT?+wPnu2nr)5PFR;nHka#9DST
z7YWW{C7)4rN^uAYn?f;$0Kl)$986~*|Hl%;+-#1Z=NtEuSD^tsh|a~O-u@R#A^~R9
zDc-KC#n&E1KH>uVCusj*>)w3@*kyLP-qt3^@w9c=ST)GbMeq=86sK;}^0#rpk3Qy0
z@UDmUXhDhACXwc{!AUH%)L3Adxt3Wx??u1lqv~DilE`J*>=eFctv%~y$$E8W&t5Az
zysfP4Ym>-Z>AL-v*KAzo?~&UkrN&9A9h0MvQInj=L8-CzYaT%AiJPfE>b`n~)d*Pa
zpmyZDN%9!T%m^@aB~v)MUSUIY^2{37bO-O?>Z{IDI=Cizw0n^-W97nOEA1jQ`qgq#
z`Q=SY<=uUgN1=y<=n_{#A=^UWWTiu$mZFBk4<30t<wT=GHw`vd;QcQ!%$tn@`Wd}|
zjwkn!YU6!m0I>USc@l|x9bw1|w;(ANOK_R`W5j>~JowNN2C^ZE<e<$?fpMwoxMruw
zf}K2tjgI948Myy@Y}hO2o~9ng8j?s1>5hxKP^v4Z@jn+_$+^s<=PD1^pG2<CfYY%h
z-ItuDeTsU;xc1#&irzeYvBD>u<cT#Mg5T17gbc#K>##G_$m|i6k6bl&%dE@BwZD2%
z^vpa%;pk5u>$Yc0ea(PwM4){Kws^KRPEoHI=UmR6sVe3T`GdlzHi<-=KBvVo-LtGc
zaEkTY>QD9)1NYEarTV%gGHf=`vHEu}U46DNku6&ozn*u7;BcX#aKNjx!tV9?_pU8V
zBCB;V8L5ZdT^JZ2LGBP!QUP=8nA4P<{|6YyviRRa=}zh;uah?8TVw+|)~T(&Br@_L
zBZ!L;%&c8v8f1SrF2CX+F@~qSs*Is8i8ONVcqoFCB1jq6oxp+XD(3C2W|R&l3mNdB
zL%>IRCM*Ir#3JOck${>L7B4L>p;PRxk`H-!XW136zM+6Ew<YIub}oj^R=l(oI*m)d
znWcGOLrEmgbCk%^-D8hsK_m>(6nW%;8X=@(zCz?&-ah+ANMy&ckMhjwlE|Uw?#-(9
z1vjVBx#*Ovuf~pF@*%94`%g7HZZJ95?Gs~N3WPRw;7q||pTrZhyGrif&PK58<|!X3
zPb`>3MrU^uM0z5?{Jhx@$Q2=XPqDiiJHRI%*r3yu@e3zs^9SZ)f-GmJACV<lq@ob7
zm+fWa=~5m+T`~7ERkzH}|9cxx8^+V5KUqXhgxCM4bOKKM*VDJmk>)C(f<EH368zt~
zr?ubkBOJ_-NM{%8DiH3GcvAJLgWHE%+}iAt#hU{-M}|B+y(rT=@KOIv>%Wm*nt|zX
zI5%lPq<?eCmc!aYv%@BDl|RtHfq3XwT8AoyEga;dEcX;^tVy*2HA*Rjr?P`Gb3d1}
z`E$LME4yqO^d|@4lYXpq1+uS#5AfezwmI#D!Rz8hzj66&79%A_$lnDB7?IbD{#A?8
zoZV2Xe?hrSM@HY(8k3d6NUPc)A}hXjKpFycQ+o1x`BQ=A6v_t%Q^uaD;j)uV<AuD-
zfvtcQ<fHQsvH#Z@=B4I5`UY(yUz3Z-bi@MHeJ5{rbF!RiY#nsp=^bbh&>DlDh#w2K
zpU+h6uIeS@tlgJ;XEtwQA7$xmO(KV9*eUoo&55IgFck^F7gLFQrr2CGZW;Eh5Kg`s
zu5eqIL<&zxs4f<2{=ie(qbyyLap$v_ij8346H5KQBs??S2|s+r&uDt4WPdlFKXAS1
z!<{OQPdJIxoRAJ&^ntBA4O}|t^h0wd06WC_A?LDj*-7UKj`yqLK`4p*obKh3rmV*g
z=rX}E=d$r3$3ZE(IsZ*%`(BqszD{?K363a{7!o@3*8*}+=9_WT72IrDG4}@5dbT==
zWS#3M%WR{`<eHvz)$IYChD7a|zl{s)ukg;iA&-5ODbSEaW^H$e)vAt=2SAXei0%^%
zlnch)FI0<1a;th+W&8hV<3<Dj9yZ=GzCr%aX=EAM2n67($%D`ae#B9LXVP-S0LJMh
z^bYzQ{Rmz`W6b&Hax-fF0GWgCGN1U~v4Eul)lT51g;I&jZUQ~8&C|j`@A+6P<r-_7
zwS<<-D$7Dq78c33^a?-%@?xuHl{U))T_W$X)imSfCKl9HQfcdja=QgMVxDNLSl-vl
z8|pEb9?LBmI3KfYQtY_wsp$-GcwF9)TB*R!+>WJgbAfi5)a)vcoGz5=@GQZa&f@`b
z5Vw&uLo~Qbj)I+_O6SPIt4825R}%Ok|L|s23ibSy%v7euvL$S>u;^pxEUB4h*K^Ji
z^f;;fW_N{-i`Tz^$LWa|UfA4I2{q_)OMN-o3p(9$H)n04rIx!n>j*88ignhOmekAS
zl>@{s<{T&Hrb}ej3%W=$v6aQ?Y}w)Lb()q5HtQ<7JYJXpJY`YOVrUY@Ls~yHkB*|W
zt`Oz{K0NJW`0EOz(T<>4RW^!x>x6*8(oyqY`b1-JxudDcQw)hN3gn9vv~-8q|7RJH
z^N*nq&}#AqNs|4H>x@}F?f-!!Qg*h{NiNntHgw8E<R{DQYsOi7{Zgz_zfco&w<eLQ
z)7|E7XUMU$?ijZ{y_0b(yZtLwKh%~)eoh?vT=Wcvo?LqlGymjVH7*=~uISzFo0OG)
zWm073bipt4-ez85<GyXj@S5lC+efK6l3d0N%Cq%)^z{CuTVE{eQr5y_yfvB+-_<wd
zE1Pa>5~(WPJuJHgo9k4RRowV?2oYTz7FW91oJ0;zcM@jqDu&~^valI9+{>ZzE9O41
zNa3_DiA17qg$c_7!l!y_IWg`$;6O1AesHT&e<WGq_F?I)nL0D)*uTCmnC`euVJgo5
zeE)x&?2r7Pr;$gH^ZQsDrWeyc0SUax1m5faf&W|{?Zt+`j>=NYZ4xaSSoTpY^J@Lm
z<!Q4zz#WODJ1bvpztB1`E6f60JXL}E`qVk>9W4NqQceOnpo5DbVRVQbQ}h#;=f4`{
z-)2aWNP8-FhYwt;5LQ5mhTSN_Wf`-tOLihfD!iN*iF9c6Q*A1nZ0y>BllAB@*}p6R
z%$hIK3gp6QlwtY;<Te_MbT9)qBq;%#d#}UEItv0iyDs)X2R^Gu*~n=K+7JUg#G(!k
zrziv}Udc1P=nby~k0-ktPd;G#IRwkV*S>?wDv@A;x9oAT|Iagk<#8mvi<Uy-k3j!F
z&p6l3JHIrE%$^I#2)zM#rQZ)Uep8Ui`375t94&zxlSt^<=A@DrbrskOO19$D<O4a|
z($J}@on})Ki98+Cj@#^yS>m~6d$e9B$Da7SSaH9i%8KhxB7vtn^I*;)Vv2gjxZ~iJ
zg3mwZDSTR!NZILb8-~g&1<wt)c6o-hxoDjG(QAU+ed^J^ExFpQ%w&7snqqg=czNMn
zoZq~|AIa$*@^HHAo!v2Qip@nb;D|=iyL(k<fN&D&H{Gd9?EP=--Excv&l8q_xeuPK
z^v|DM;dYkfI2+}-9~tL;aGB`YuE`1?@%}G2jOFGf=CSk{TEp^x;RJAtoA+Pyo8?I)
zkaYACz)24W5q}7lO7TbEkilP4M`LAU5;@55>gdJURCNVK;aEG<ntD_7xlX;(u!A!!
zKKY6n%9ykyk=hg|8y9Ru+#PnBD%gC4*0L`5+PEuItj<(eH71eK)LoB|^stj<x@2%S
zT-K;lue6Ef6+L=GVbhvKGE>L5B|UHze&!(-h_-o(dD0SQyRWmkXq@(Fs#Dh~+_oee
znE$LpM$a_2<sqDCq48kKcbs|=mQ~>ob%^fi?~S`bvi`9eoza*?-b{Dnxv(SJno@=f
zhU%5+=^3(6>EVW?kE>^0%n;=`t{l&cKS~XvYUpfCZgAU^MO<6d0O>=fK&n%(?3<n$
zRZ35o{J#$~_8)76jjN3J$)WK6JqtcSUmyaohMq?sHVtzIP61b$yEAXQR{kpvc5L>;
z-0Ck_z(b^(g~>|7O7~f+mBlj!i-Z2Q`oQKe*L?I@wj{56xP4TVr3ls#B&TPH;8p%M
zFhd%Js0S#4!d9|UXi@r<x!_(B@G-DV$-Pc1IcAtM{3ryn)dz9lKpspW<#8QypK=%6
z%J8CjDj-<13D{@xcynD(T`h|u8i4=0#zoth_OcQBP#jVG9w?mP7R$?S)kYg;`c>Z1
z+&DHQI}<p@)TG?W6z~ewV4o`OStj#ac7DM+HjbID8zD2V3`EgR-nK1T)0w4s47$~{
z&7;pM?cp#}1o($I`v8<I=n)`ooY@lXc`Z|NSw|R<Zs3S`JsIiWC*<N$A$C%Z-UjV~
zGQ*|X-_{-gA{;Y<6}Q#PWCeYES_A@X(O6J&YSv<MSbiRe__hcTvpx~A|DSA_=K=r!
zWgvbJA~%rZkO}bQ%-jCG|5cN0A84$mqg*VfX$@#v7rNhkxrAQ+m9n;NNFuE$jA$;Z
zWg5x_*n~t*K3bRky+Oz(*jQEg)TU&JYoA=ONNs0$&Z%WO=ThyLsqNs~oW3AYsJp%(
z+Ao3xcMAg|dthDm_nD<B7HV>W4M`*kb;p7`LKXRu9*Mn0v@ZMmxHOB6N-vs{t!{^_
zG87H^kT(Q~i1I{ImvgClL#i)#DvVYokq;DxITz2xqC&T*(=#GlU#05x$pH6pa#3}a
zZ)-Th^DgmG%KF+eBh~hY6b2iU$O8&t%>{#!76wTRQ+8pfqdp*P1$8zT$FE8;+pI8S
z`~OfQX^_LnYO=$4k33`~$=8Va@gv&jcji8b@;TkO$9(epTm!TSKjpr*dIsoN5^gMz
zI(4Rn;ua{gP`lJwiy<ka0G~JKyJAxm0W3HmewkM+o7?7Gcg0wsLC_ydg=3h*+!YIl
z5o6x~5CZAQF;pAeZtWD?z*?EXlDBZID^>v12kHXCjpU|e9-(!_v9iLj!%d<A-b0+%
zQLYNXi5a-KOtsDnjdodxW5h_ylsQ5VZDVa8GiXWC4|+zxZ!#&6a~<buSQfFg@)Zcl
z3HZ21%=Bp8eynVf$Q6*(BB3UWnDTKOoOzg55Xmkak=AD99+R_kQc)goz-^(Ll%mby
zSPU~XpTWRNKnV_ZY98%s?v!GeYfhzKGJz(^;{SFT`1f1m6S6Nk8eV{F5dZfBavj-)
zY(VeRzVr|}jaC8?{7hhi??N8nZ_RzpBY_LD&O8nAe|MQLnR~v^^}(rbVO6hFk8ZSH
z-cV0MbOVo}!<Gg2Hl$vK(HXvRkxX`1x=Gqmv-dO_6h?o$)s?nzxLR6Q0z41o{9x0M
zZWab?8*Kn>5=P^?vMA7Ew}^~8G$QM_Icn2JVTRA$0BNhR^4Dc;Ei@pzkiGNMHaRA$
z-hldr<-U%ge!$}|WjdiTSx>e!M8mQ<%WL>)9cQk_jxD^?(bOGztk1|gA&!<y>rx_*
z&4Ir`^raK8G(de*vc(o*zwScTJ{ZNN=Vf7}O>A~sg&lm`ghreu*ecaUcO0EZmr=S6
zPym4#PQ*B0am51m5j<-2FXMH5p?DD63S%&c#N_^Yx~#HrvrkIZ^oKk%G2K?=k9ERD
z2!YrDZz;sVrPLP_x|nlhP3-UrErw{^sj?--ZQ%w#q9O8;U@$hpQyIjXg`$yIn=d3Y
z1)m^h&^Gx~K9~tHBepH_)uR`z`B?U4zt0t;vaJLfAvB2hE#otCyl@xTR@&7jCgb_y
z$!~*yWG0y^o27B~{{I*M(`kjVzbEk%mq=PJX@#U-Nh>8?D(Nywt0b+Kv_{h9lCF?+
zrKGDQT`lPvN!LnR%jr70p3^$IK~kTj^^!J7+9;`C(k4lpC2f&3An8U)TO|!j+9qj8
z(y*lMl5UbTB5738n4}$&ZsxR;ZsD|xZsl|vJzmliB;79QiIScqX}6?tNfVMLB|TZv
zQzSiA($ge8UD6*&dWNKDN_v*0XG?mHq&p-%SJEF!dY+``OL~E%7fO1Oq!&wi38$CR
zA4z(dq?b#2g`_{0^h!yulJsgxe<JBMl3pw6b&_5$=?#+JIG7xZ_@9Fr{`b-F|EVSK
zk+Y3$#tXP))FzRQtdg)4i<<CGmMl5k4AHl~%Wqo0tQSYX(m#GMQ5)vDB8e=ZW#mwO
z^-JMt8br?SHZ%QK$wL8V$#66w)+Ld-)K47{1Jl(NWN$Xvdr!$7oL6b+ln0el6V`-P
z_UppGcXdq?DNF0<7&k{hi>zT4JPLQEj(Rz{C6h=_>gau&R?FKvi`n~-t=y7gn6Hdd
zeG*AZ;lb*nH>%{JiX!9Edh$OjOq!BWw<?8Pd8IDr(z?{}{n(>0s!bx{sAEuKdib&g
zyDTwp&1tE@x>Tt?mfXZ}m*%<{EUoCO6>4kmO0iw9uoe2hW8nX190LS^Gw8wOCQ@j;
zYb0`J^715-Ejn8D$~%x9A<*D6Q-2Kp%>f*9v+UFXQ?=_r<H@uKOGm1@f*koJN1{0<
zd^xvtKK_W>)0&e>4@$-~o66;}(Od-EmilYWS*@bl$4zAbn@=`+@IOmeEB%FV-iI6~
z>d(1koPF3r#;Nql394-?ltjK#$M-kQi3#jW!<`T_!$^k#X;pBuy&PNdvS2txUFCvF
zWGi(HeoHe%&^r%oVjR-0r`znVo^ZBsrhoibsw;Z;z~l)CiXTju=^Y`{3|+|7DPh_{
z?lzvf;5PAG@7YUvuHhtdnmU^N(`~UA!tG^qBU!sk40pj>3dcwiiAA?L;b&NP*aG_l
zk^MPoy-+qTdfxMb!j#GXLyQXy{Ck?1WH!)0entLHr_hyj8~wF8(5!-FfIRg7(f?+c
z9mG}@QsIvv(<j`}3aSH8qjLaIoa%6n;_hsVrkZU%76b$giZpPCHuhS~n{GyXD#WHW
z{9%y0E6N?2S-JUh%oE&{V+t1r_~HZJBR5X6!n5F3HmK*)unr3QF*|Ig8o-U3tdio{
z<~CP#6id4j^NqtnmzA9})9mc2>}rT#DZiklL0_}Ta#b?M)F6RMT+D_-a(9ov@eSHl
zl84+an#armHXD2eg-3bHnOEHcm^7l%*`A`KF#ZVEfa(nc!#c9pa6Q6lszJ8(z;26^
zGkc|2HG|%E*_@@!eG&^RTEapuqz<q&5EO}9_tGnVEv*TJ#=_H~3we-Z!Vz!K-?Sz|
zOEF*=d6`p28%6`mx=?iPb&S>!{Qt4{Ch$>J=l}4%=S<kbA})X;Fo*)m5<rl}1(T2!
z5-<q_1cXU4Nro&Fk_;grV$_*&-?zpUmuj^d_g$;Cu2r#G>t57av9-3^s;%1A_xqf4
zW-@bT&diNV`+GnC@&TUY-h0k-_Vesdd{G31f^d}3My1<>C&>H1#^TrTEcPN2EOGk`
zdnz&j)qH<Dz9N|E^yZC<p0-AQT6vl<T`GJo;k;}PA~B2e`w-#fp`3T;c<W#vKvT}P
z(zZ@`oON@%yb_+%eWlj~k)kCf1sJ^&;v`CO@}*6kBDYWBb5sAQ9mRnlvZaCoba4B{
zkqz$2vu4bgEfZdCHNCMezE4EeD|~L&0uArlVE;6B?a^+<iMO`K{$}0vl8Ap;_}q+l
zwE8y$ktQ{zJ}X+k%;_clW{RX_oNZ0=u;KTo$~k&oH>g?@L}pZHb5!B4^R~l|K&^$C
z-`3yoPkBer(2X}+f-Ye&YNpboeTi9I1%7h-mZG@WMHlnD)jn3DoOXmZe5-@Vd<ve>
z!Lo>z9!97i>YerCiGuzwd~W7St#+yZ`;le+2-&|!*~Ru&`=|C>Y;Ts&wjkQyZxQKl
zIb{4Ve}AWe!<w8NYPb}O5l|XB6taeQ!z)4@<-auRQesZTX2|`KV-H#C+{*$K&Kb5!
zUMvVv#YaZtotPS+H}E(6Wje;edl*e>VoE?i*dCBhnwjR@A-x51lpc-RG}tyOJYx$$
zIV7$0Gk;;UZHf6FDoc|1!{jfbPt5$>LEi;c;#F}02Ae~2$6#uNK9B~vL@*<R=Nip?
zV$1m2w=}f+yh5Xwx!b`IlWMf4)+6@X;G>L|NHI8s!gng}1rTV+?Fh$6SWk!nALC#E
zL723V<05jt=Xk1wd&J-ZClpC;tEa7A*_@DGBc~O1YZMT@PR-w7Zd73Qwmug`Obd;w
zh#MtZJ$fo%osO)^4M-c(%*W;Z@3Z)2d^~%I<wE|q%{~CyK%c{X>h!aU;NDJ&fT-Fc
zs=(Ox?j7>He@M4qUKd1yh?Eg$;t%8&MenK0Kk};;9w*%7aY8<#oscVod!{iZiDHOR
z8Ex(TdHu%g)MZtpRoxIAp2jRUT6HodP%_Psb@F2(C{^KehfdY7Ef4M?I%30FeV?Rs
zcNANUIxR-E<`*~A`+uI*?%mv;)zXLsOFwN24kNyGp@TcotUxpC*0vq=m>9liuF&m_
ztAfb6m{PtN?GRnYOTZ;6;{ZAPF%ORQ-y)IRu8aLTg3ytpcMh&!LL!(muR!E3Cw(OC
zNr^7$E9=sX59R8(_d#vGs)ES8=&XB{^?o|OVScJ4J=%lS%ik1p_uSNwhJ^0_q1IXp
ze=k7%-^q5ZeVhFeJAfUBSb%Ty1^i_Gq|+^)@SV}Qti;pmYwQFsg2X`n=ByHb71@4>
zwh!EMt*h&B!vUrh3$*(hg*KPGrD^m_$R+}DRjWx^43eOUG^6?WCUPkbJivUYYL$1A
zVQz!W4LfjzF;I`z74j=7@z)^BNvVIjd*&RP{(*T#uCBctb!jQm$8QY4pm;KMM+O5#
z7qVO11${r@Q!|?w-~6Sm6o0Rv73Q^)!X5B|)1Fhj@oA-gpCF6}4l)yB@fhJijJbsM
zYO%L1AQ-HHqaCBfywwLF#-ZUF@OlbXT*E0-tI5&I_cUQqA^WheMGV%!{nog;<~thp
zWdUKiMcLIsspB>-^t9kwC2`N>QiOPSAB(ixppziL@oknf@p+-EYxsApTr7@BDX7)>
z-j?~%l1ZhL++}_#2>_`es$fR5BW-nx8n9Q$KuZkuZ)pFIwVt-{_YaW&?QhSw%k6gi
zOho^F&i*4C$i~4IFpsTeoj4DEg4iE_=EM1cyqNnC`};Ef5PymPF=5~T7amBf9wYn9
zPL-A^@gL9-uoIPS1ccRff{jpib?j0Zks+xRo1GA;4@VFz%Do60t)%RisHV^cj-(dx
zH6z%BN>;=!lGZkY5sbNl*xAa;#C(mMrK~>ai$wAM_L#Q`QVn*x3^QV2KiMhL_(r~t
zP(|zlWk?bc#;`M#ol6|=98?|BE**BJGGGA%kLV%Gn;X3#c~vN}AN9UNMDBQwKO~J|
zx@XRvJFTK@otUK?Cc9V(W8Jf6AbAdL(smf%c{jt&W7Zt{IU>hnzmgSqXVaY^xWX1s
zyG-%K9+E~#cvs%xYl5NzcKtM#WGB@iWkNrd)<50Z)gopfEs$S|$mpz_obDk!%LhL~
zAyaYJx`nB&EcjzNzTMf)Zp4Kn<jY%--zu`09*8unt&L6<!b(<$qHmANvG2|fwELS#
zfhL~bE!R;uSS?&?OA)*S-7NKYKw=>;`O8(Y9Dh?4##J)E?0z{J-8ryttLY&5q7aj^
zm(|x`SP+E;6CseiMD+gvivN8Y`<k7{4zVA$7TZ(4mG|GeAo8djV^dgFgSmiMvpD75
zb7st#!Q*}#_wWJ{cVY3wHD?<&g<FIBLqWt-iOAwA%`%Riaa66-E)~&=(T*04RO%WU
z91Zj%*)e8HHy(W%;`ty15az8N^PP(WAR<nW9KftQ{WqI$8ZRisCx3Rg)}jr;efuC;
zOW1=XS<@fZUUG`06ce<8H9@3&OzBz|rM44}QaVH94%byBLc&(^%xwo~eX0v0-DApl
z9=&K1&fcx%`XlS6eMU?A`j@(oK-Zw)2*>(H2iAlREDo*Ho2q1Mp1w`%cYAQ3H2VK&
zzv=Kudb5brJK39t`G-if_r0W{74kne)k03=quEAwD!UdIzOS&)_$WRdw|o`f#;@SN
z;J^DXT<QNq`G0H#_HrRR%$y>3b`wl%W$4pIGhDU@&)WQo5fgk1R8t^`1o;eF8p>99
zbb4C_-CQ)nWlyu`2;=oKxc(}l2;sgEcWw@@R~a@#7!gSCqWSx~K$OxesR+Q$3QeeD
z<cs%q*$3Nmi0guJukwtZJJw|%Y0m*KRSh{8$a%{9)9Q^}=!Z>k*#-8TW#qD14RxZg
zk-jPoP#Yu8Muq#h>?!sfST=h>xzSxs*JaLVmp#{>lU(;a(q(7iU4nX9_Dt+qU4uN%
zg_PTK=v8th@kEzhLhpU4)xfg5;<IF$UO9dSWv;yckFoeEd?33F(f@yGms&fmW4`s$
z+ZsHuZ+CPFLZFTx?_M0B8zKN7%Nm~ubi%q#Z>(UQP?nTD`Ph2xI6FQ#0oXHA38Uh#
z=tx8yBG^_zBj9bV@kp6XxAE1QiCv`&9?zkF8u~5417zo&QV3)gFo_m45Vu2~M#kfU
zFzYtG+5E<3bd-ZW(SxL|3nF`zFO~6NeAn}u!Of}&#@#W$th#ewh2b!*dksN1X}?mW
z`ijR;9w2vu72uH2HQB9%N7bhaN&x*iHUS$lJoW+GB2P0IVw%VTzck<KPI$C>%}{X>
zKKY35$+<Z=7E@=Zij@}Mxk|F=puH=PrA5&3$u1gR9FgCphV@{rqn*Jq617>z7>|0X
z@M3`Xbar#I4|#|pUI^WW7uFezey?yhYq;tDA7+It{Jj_cKhy0^_TBLLnZRn<&Flj{
znXf}+pkIFL)4*Xtqhcq%-}%sXh%xRlioxOw6d=heI51di;6{?u^Sn`>r4^;jLB#jA
z32}=+d$U<E6<-*(S)}rXz&Wz|AxK(+P$%LJWVajjQhGI=Q?bOv5m82lA97jWWz<V)
z#VOWTE4W+bru&Fd9vfe-$i2837iy6_iC#3zr?g@?#Gps5qbMHGOL-^?mK^ij%t5r`
zt0?hQ!$bumM~pk|EsR-2WPgjpIj3CH?&T!KYx5}2;a9R<;2M*vJT&~KyXZQjBr~xB
z(h4gc{@2Dp8Co%<1qNB=ZH4iySZR+LwWC_W0Q`TX1;gV;FU$BMrQYfW#GR8H=}o%-
z`y=%??_yuFOV|V(M<9OvZ~bWrP9ZMnP^TwhL6TkCo#df){<v?{3D~BcfX4?9=_AQN
z>=$-6<nq1Vr}F4mR9@n%wd-U8_K9nBBl)heK}rQRiFusT4CU}=6H*`$t74NZZHG(<
zY7f}Op-r(OqHgEk9=Rw`I{)>b(m!p0HU^P~b!)1KZ1D>WnF%SrER^Du+*+;9?qp9l
zpD43CPh6uLy{rpP>Ju#!D=LhY8)jBrEbsfD?bdqL<qA&3xDQE{WGud4spWsE#e<s*
zZdS`rx4t?)cu=30UndS|e}`L_w}NJb<|x^#wKuF(=r?M^K==Pp>qHB;|3ASr1?-=*
zp==>Lg}r8-$Vc*0c=-OH`9B<<tL3m;71ks3#76s_(+dTgA$oyI?Md%#{+ijtJbvO0
zR293z;XN#LalS3SElT$NlsST9JYvP7A|w`q7)*ua8E*em-G!tmi-y#E!5kndzOwX!
zMs}G)It<AU<@NE5(|I5o1WYuREQn@MWRu`PTi}-j#*^hP9DfdOXXl3*`-wveOUNa&
ztB{@n0su0Pog~)Ry^fb9gz^6N&K5ZwcN+C@@l%n&1hK1~wwE}nX8$G+Mh|4tGJlI`
z?;Q^5jPgz#$W88<GuO?WDGELqmH%&t{Qm-Wn0+s-fA9Jh**`6-Hi+DS{!~f9v{As_
z5Hon)<#E4TXZ-jLb!O?Y5d%TwLE8?cr!nh-hA8=<b&F|87|afPg2Jnt>vZ)G&cs<g
zj1@U0Ptx!K-KpPO7fp~!w<oU2){gDtgERVeYru2LK%93QUk$Fa)kv(+&>tHVxlzYB
z9fv66)*boDI<q-4y`5U+-XKz=VjVf1-by6ml}xx;(%tdDZ<)VCbz+W&r^^aX!ypc1
zxlS>qVo$nLyxjAPX{rqqv^Ja&oQfv&PZcXMel4d^U8YcLZV69U4Jg(cK==O`3n9Mm
zwBEJ8w#VA@kp068{r?sAefF;r31~kyixsjB>}+WNpJnf|ulNvt06&7S=O;ok@C*Kz
z|2V5K%?0Nq){V$C(ZC%MwOR?HK+~~^*b43<u^OJ1diq335W7k#gGKxgKcvg*Y65M)
z!7oLC_e2T{>nh?%Bh2W}rO`ll9x&CrH?>Vy5@PnY(p|^M)7XxQE>?sV3twY#=+Fg@
zE3q9ZTbkOujkThw_eo`Ybc?Va8A7BxnG{2*lasJI>}G{7_2I&9R|@MwZ*n1n(jy~X
zRJ;&D>5(-dfwWyPpC#<J2`-k4K}fMp*e$BV$yj)$4L8Yz*>y5ji4Ypca^PyBN)kA1
zrRXn-;h?2)Lw7uftkyuOzY3YFA*&^=g_y5hsz)hlOqspKB$#7Ys8LQJ5vRCVIY!G7
z1t`OeIM5`s%hVF<CE%j+|1j)-uVNGJ%j`MU!{0&v?+c0)hACq7#vf=2BuTgaWXy`w
z=<tHH{~Yb`3IvfgxDSMY!8XHSvoS9BkLu8@*6>ybkw>^GWq<*4zKvKqAQ*A1g$7JB
zVt!q>c8$VvkcI{1#=O3f8)*)hGzXB~vUi<oihkd33L@1o2HNR;Zy>87j(}Vsf!wyv
zEqg*C)?Kc)2M?3?qf^W&PV;W_JL}wI|Dsx;8<<xIk&Czwa~*HQ6K~VA^+J&X2D*+0
zZLT*3k&?I%18g|7K~N?;%&qg@iwv-yaa8XAE{mVVEp{=RZa-u%1trk+AG_7p29Zj*
zE>)z)`12y>yzcJ(dE2qdM&{>hw2^HH=JZXAlyKK~FVY{asvN9V%UTWFh9D9Ox24Mc
zt@TE~mb&$e%DUjHi0DX<x$h4iErg{`$yY?WOt3xcPV#WCk9Vo=ZPL2u4I-g%A4v1%
zjR+n%jqYqon#cb>d#1?ShwU&!!&4VT9^s9tB8S8eqfVrBYY&!Rv{m(}O2gDOFnA<R
znBi=((-Vedyf7Gq*N>kPvVtOnIiFvISeBhk^MMuo@>$iG)3wI51d(mH57O^sHjc>*
zAFa!;xJRKpK|?9^f731dK)cqu+WrY_ekWNqtOdD1zUFiJCVs!Q+nOFZ4IC<vDq3OJ
zU#k+%vJV_;+{C!SWD>)=a@rgzpZLAml`4J(P+^sLg%oD-k-ypd#-NT`E&dict4gaY
zCiGpW+9Q+7o?YWqg+{$du3EUssj!l&C_%J2lE6b7u*6p@WmCU#Is_=c6c#TOabRh)
z%G<NkZ0xQLAWEm&91lCyprRWHS&n^`4GSG8^pI!K-w1yX8Rwck+lLWNE)r+gJ6)C(
z*PTc<_y{TwKlZ9aab1PKq0<i)a2<5?5Wu)6$W{HE<JPNuO^Mbi*E-%9P)1S|<#w8x
zc4U2&L#b5BZ%O@Mo5kzdJBa@EslCejm(>>8?>`9a>K81Qbgk2iE6rjcy+?}0vhB#T
zOXr`JMgO$JZ&eUkcB@mx9gkn#QMRc&^3!OT0!eEe-P^8f?_eQ%Ifhj_?WHq;hBLXx
zu&bAs&RcU0{nPqfA1n}8tJCXF=S;h`2i7@n?WQ3pd1~OR8Y&3b@-YN`5U{0E6LhC|
zx%l&a)HJNp+u#c3p$&ad^O06fQhefe7jc%!*kAe~bf<jX{Fhf$JC4-bv3GFM_q!Zs
zNophAsu7><ae2i4M{k$B|7Tm)Y^%w-(0a-qVz0EXwSUV-Fb}f*?&62=CVpT1Ibc>c
zAjbk6z!2uNH7gs&SdB=SDg)S1TkU%%@}&kn52BL#>ICcJwQe)pKE!;Mb*Ou>uTkdd
zu-?u?IGyxWXJt=!=fc+mUSgA>&4scw7o<Xoa_O=&i(Os&IIBe{{z)K2J*1-*@o^A^
zU^1*psjJrQPOG98wR*O|*$^VZ$xB;tRge$e3OLhAGe~<sv)xPVaAc#VWl)lO5#QSv
z5aGq_z03;AxT3<>g)A>+VsGmkhpo?<?k<=HQyuC#1fH#R@Qy*;-h*XF#6awH)&$ff
z?6e}W%B;s7&S(xwMy516dXX8m{@}DDsHM!;0+$_JC2rX8g7{HlD9nlI$VVye?AXC1
z8i6bj5t|zhN=;+{xhPO2s`$idYZ9xV$W1D%p{VN36m(RY)|9{&lh(Yb=PSwoms|WQ
zK8fAS4uIcZfpx!C9>3%J^jmch>1_KTF^Ts`>W=%hddZRMKrPS@)Iq^xaG>tRN}S%W
zX<f(CI+typ8!@9;qP3<bh@7|Rv(sBOUV7dg_p5bslv@jHXf_6s?6wc4IJBA*h<PHH
z5}vNUDWYmTM8nxNJXnf>-j|g-?VJ;#wG+v<6`UF2lykL4H3dbk+!QI=;wiTzDwHH@
zmCEy1snw?2l?Q@L`Xp&K5dN?!PsR{5Jr?QbQmvoI1s4nHnA4$;aa)XWVYGsCA`+dg
z8Unii{}=zePv@KXSjA7iS;3zwc#DF!D%hjoZ3^D5;2jFyso-4--mTz03f`;WeG1;M
z-~$RisNh2iKCIv)3jR#NM-_Zb!JjMmxPre>@CgN<RPZSUpH}c01)o*$mkK_o;PVQ;
zpx{mgUsUi{3cjS^%L@Kl!B-Ugje@T#_?m*REBJ<jZz}kff^RGMTLpJ1_>O|_D)^p)
zzf<si1%I#L2LkS9A1e3<1^=kvM+*K)!H*UEvx0w7@Dl|;Rq(G0{!PKp6#QJlFBJT{
zg8xwPO9j7D@M{JCso=j9{I`PNNXRV(Z3UTvTtP%Lv#im$@bULgb|$g_k^g@yVgTM@
zzifZbMzh1&N_HZ<oIQ?g;5K*j99}Ox|L@>C|Epesvs_?MSRV{r*-w<hJGl~y-K!MH
zx~XCGah$c%ok}g7#FQ(7Cb`wo9ZDgsYdP72N^M_(1f0!&gjMf!=Xu&;$4(AHAdY3U
zNA`|VgqwwpN)=DHyg`<z9NOuN6f#q#x~8v^3KV5{grw92+d0X_7Grv-a7uZgvSSe6
z>9XI*fTWb}uxESwYm)RukR+4jso6??F|+3)m74`|k-<zYXNwG0QUS9vsnEpcYT?D}
zOxVv<O)E$yNNy4<JV+d<LIV6&S)Wu29|&n1_=YNw%mAC+DCz%3i(kyAvqupB>sR&?
z>jkT^?>A!l66=D<NZkhqwb)+3ew^GoM3+3vK2v1c6pfnM8e9cZwGROTDm@60AZ4Qs
zU|unt($kXxU-CEB<BLTAXK1Z-?O2x`TnY4$cR3~3Qkjl)r+8_dbkuEX2<B@;;142I
zHFQW$xgv6L(#6}|Ngl5L_xlRtIt}CI;0pA*51w<T6GfaBNsgMbjS-i}i5lvr;POFM
zN2*NC@oYd6!y*_Y>Hb2VLGP)qdNh3AU`3zwpQQPWF-FpilS;cID`}dBr!H9DC;g`$
z>_d<KQ9n3hc(6>vB=<k!e_Y1*VmGiu?I-NRttY>g{qN>rRo~V@Wjz8g3-8G`s88WK
zCL?2F?<IfHcvr+e#jEwAHHdu7;ESE^yNYDTFqpGM?Vok>=!iG$Ng7h<G1jBQFb8(L
z*HT~Y-KnqsF`Kgu%d#PeeCvJilufi{!(pSDw{3W;KVd6*^3jX5es2sO*C!!F(wnL~
z+0*jTx2hhl)^PfQYlU5f(~(ZF%S^D;+%o4(g{w%z1<#;0nAbk23@TFI{a9BiRB+XU
zB9=!!tsPat)f5TkAg7Bu&TKKxh|xNKXGBevuOT7&e~|s4g_LP$v!AnXcsAREpTwWB
z|AdGC`}2Q!1kBDlh)@MTkG8g~C7#Y`M#6orG6v;GZfsd#pDUf385oXe_MSsCgJj#E
z{nnVlGX5Hmp#|9+4iP3Nf1R3kn5aSay7K``9xmWYr;7ZPibwW@Lyx6+=LmM|5c?Ix
z{~BlUOZZT5`E#ssc7ydr)c$W>ur5tZFA)hE+N%v%L7hDAw>{S#TS8}S@lR)SV@$8s
zATl+lyt?D+#FB>64Tdd5L@oj8MrsVUJK0m~ycQAly!a>c9@0*|)*x~?_W`M-PROK2
zk}DEvvZvM=Zi)0J-vt`dx*+m8r!;Dd?`gSjGn7(Q@YR-H^t-hO)#scoM)#)ebs8p|
zTI+wvldC3J+b3;DJY(A(_iK!k(}`L){6TNuSQ!#FXhH-jfrx+D_<F>{t5L()l@Y9w
zSHIIsmzJSfh9a;VUt3pyJW$afx@Agju)2@FbaDQ%@TH6W-8%Wa4uz;p>#?N&J1u?z
zpUCcKOYFDpHtSQX^M_nMqV7Nt>C{r%?rXcj-&o^=G8J1NY<hb@1u)oMp7eS7<`d<~
zbLewghqnheVus;yWuD=9#03H5SoM*19zjF`u=PYb>;@UfW4HO8_1KPya(AAfx1cWA
z(x-EP%+_HP5Vd{VtvztxC{LUnt97kpW6&@70;gSF)apS>WEhB5`CDbYp4|zLtS1-U
zDLb}ZSITV&Hm5Oujvv`bfF;<*iD<NJxBkRB@io&tZU{E@30bM%UG8bFZpUm&=dRuQ
z6YGwr)zQ6OH_Y7-Z0r-VVoGo9g&hC{u=1|ZpIA4oSI9bkp{>vj!G=B|%Wg*2b22mV
zsMOQD^(WTZ@0f;>=>I*eHAwb}_}|ai83;&rqTK^4;PI@2UC3VHE`B8M;17SB^WZSP
zF?ot9k?Wuh(b1c-a$EffeS-G8DPSCp)vP((pSBnYwh>ycoSf4-sMI)PF02@2`5u|)
zqZ|TL7}-Q}bx$?s!ip^m8LOL!NEtR(iU|(^^~cjT7UxwP37I;`FuBNGC4&Wvg)wb9
z_oOf1>fhoO`*G|7-kJ9ELPWIl*0^hsiQHX-kO4Af^np%hqcCdvmhbfnFSp6FxGz0M
zoWY2d1T#~biirzdU3S_s$fMPcjNOp8BCdhI36XUpj*!zG4Jw7^YiglGkrsk59zxt*
zK`BjfGN|SC2*)H$dnOsv&BaVVE>x^f_!(2oU__Xwj!tm0ZjjNVmF$TG@rd;&S~woo
zO+(TS5z!Xa{^kt<99z^+7{<?aBke-7S0)%g047QO9o2#uhFI@y?VdV#$D*1VZ?%ka
zH=AK&53}ase|9UtkFDLv0eG7IGTReTzw2=Vyvj59eBPCK0t~pz=jtj?ZZ3!Xv9N!_
zWm$>{vst-FK-t=cV7xI8-O~gG4{{nCs@?}7e3U9A>!}*N$Fe{$ybUdNL#{#VzA*B6
zarGjXKv@M@gtZ`=fV-$jcmWT&-GYE~sjF+8ljeei6ob^^Ypd}$O?5YkC^j@~-k9v}
zL(WH?SDFL+$G3{6atZ2jt9yXRm@+JhdUeqbxe&Ge*lhC_UmH|HFtl7(Q6E53ooQlt
z*HwWk5rYL|O@57&a{_jU9U|=!_74V3Wkov_OW}Pd8)$_Ot5Vn*W}(O*$MS{A2RC>2
z%z6EXp;14Y#E&t5lC>DA7HVNd+24)XzR74{5A!fsebQYH64yf!o)Hwk#8Zb*o|TB6
zEjH%BO_pW<<6yqrfDR_0$T~r{0d3=f_4xX8V{#?3F2vXJs%cY6_Xf70%-6Zte<l<N
zO3(`NHs(3Uk7WcOQ2b9>hG?mK$)}od4;qfno@BI<%tdg&_-ZK5xpIOSG!<p<GY?ck
zS$M}cP=hdbD(vdOuj&4GTNhjSdyn-S!~ojMKGa@f*V!k*7wAd*9s3_R31+~3y^d{T
zm$C<uBk&{81mpQ^z6?14PC{<5Tlq8mT~zZu{!yxD;gU~VM+>odW%PY=1;TquC!0oO
zq7<yUNJLh?I~$WFl4Dguhz3U#<anYPWB-;4`~)J4eI&itcjtIJ{UA@sPh1T%&xpK=
zB*79LqUt!8TJGIgW^Hsw2-RC6tML!1#oe7u=D_|SjS+S)LKu55-BM+Kzu1}FCH>2F
zmVtc|DUm?&|3zjI*qyh@*O+j#vd>iK^I`2Q68=_7lVSFSDn^@%))>uNnHT4}7_+aW
zhI@BDh$un#iLNs>Dxi<NxFJBmHmQta>~k5MAq9iQK9%13(N6@TFIAO@X@dL!XoEN(
z#H)X*rt6eA`;!{lWHKc7M;Rty_Y!FGswLy_wKON#E%NzL#xCr06@-sl3JC=yh7Y1|
zOGJ3{ugD9X4f$Bj1U4mNvD3&wAuEQ*9_~W+4Yr$7l1T~BH>!6k$z!g+sm0SQ8})ZJ
z(VC2ieJJf43~Vy{tK|P{iT~dp5kHTzpSN?Yx2@XmaWkW;_8?LlZ)0<vGNQ>>(e9*=
ztusG)OERP#ztT9Vs$gdt4NBzt5Yo%62s<y<OWeY;9y~{wh8EwnO?Od;oBn3026WoH
zG+RB*QDEJA{NH7Nw>_`*w>j7$)ZtDWl4Ko0$k-?Xc=oO>>+FyFDUM$^Pu&pQ)F)Oo
z;n={G#vdeBw^4G_91QfScS(+w-HFevb51q!#_hrOKCRm1M`rSq)H=u5&ke!0J`F1J
ztxFf=eC4gVTYqAmR%q%Y-Ty<a&6f3;-OoP44%*Kn{@)Vh0eB8{e?C70xxex9`~PEh
zD9r&)TH}sv#VmE3wu}43)7T_PbCDQ}cIlwsn<LO^6=l~6k8PYGZ4?u}*^i84GR5qm
zEk?g)y^cn(fvxV@0(GwAK4haqxQs-!P9a4A{Yu+Rp<iQm=Fst@A{q&iS&oEDv0;S=
ztpnq1C#Of#)+2iKh%w7qLU}22LcS~nPLd?Rpl6H@wR&k}s}Tu&vgrqb`C&6DtrgAz
z@ruNmLS_&r&>PfX^h-;qqO}S+&M11eK%T<4I-z7cGLwV;7ORl_+(ZRS9WTNhq@rsS
z>##gfQ-c+O<aF}7AJpT#`BX=(&)X<ONQ2fo9ru{6q>?KS`Z?YI1FdNmzZ&_!f6nsl
z-N^oxVO@zwiGP|yNJR{DE2sBMP6D~hb|*fw&Nd2pYeFoIqAC6YkE1VHJh^Gz^v+}Q
z8av?|?cQt**?p3eC(vpj(sc68y5#5ziEhI)8oHK{l_tzXe6Nxank*UhX`Oe^;}T_H
zi-vMdaQh(3%f>mKxn7#Hm;AI&KiYJQbOuiV2?P^Br}dkdD-+jceUUdu(I7hgwIR5z
zPuFDvX^x?cC)TZ=*RNH`j?>1mIe2`Zc0dw7WOw2->#PB$kzE_ynkGC>{91|OQ(}0Q
zjVpg7JJj~J)*-t8hd}g?zt3CW*i&sEB7l9s7J>qJ7McEX`BjO>zz_VyiBwgXpEUd3
zh-2;sdn9j>88dlZT5)J4613E~JN*GVxeqetN=6=O@(ix7_jntTeFeLF=;3AwWWvW;
z1;l<r+@CM6h@nRqlWON6`8aTaGNtTtD?CJgL)1KKgxOovP$a7yS#CT{?rh|?LxbIP
z8d5JujaupInrR>ml4H**57gHBtD$s+NJ3`kgUCWMsJ%*;QTwGJfeaN_kS3%E3GE;Z
zUJ6H4*}{=#LmX3QiMwCs_dy~j`na#zj>cF6C1)eaj<>A^WSyvHbh>$})#izxzS`9_
zH|5~!MY0SHg3KE_NjUVwWLQWh`I+loUD@AP-4!5LkoptVV^vDgCqF~p|D!E_9(P0k
ze;n+8o1y<74GVzPq0B*6i9G>lx*?z65>HbVi7X(m=P^Hz{_3rNiR0$h$~}#CKY<Xk
z8*fXMZY8G1tZbPwahV6=UeJy?m^qp*o@sc|yvN(rf})uh>)Q7%p+RJKkRs+QZJQ48
zAYeV(JG`LL3ca390JNndX(su=6fYb0{<`$Cl}FJ(?X;~34IE?@*kfSEY8cW8avu4i
z;lQs&PZqu5Gmd4~KA{1)e@C;`X8TwQybDbRNY||1AF<+=BT~>NUps_`lSS$!WR~;E
zWW&6_!w>VH+9am?s5_t3`nxjJe-QFXj!)6wXtQ`Pw)|IRh2@VNV(fEGs9&E*!xcUR
zRA`PW|KonOF3s6b^x&rLBeWhghcfzf;U@}zLGmUDgspd!&Bjd~ts26{5Pb4r%k7ks
zN|5=oL@}^+?GeYw{+;kU4V{$#1uV$%=dp)bnf)R1e|=yDe$YF<IkY$RF-4Y-*uB4W
z`l9KD(+j3&PtTd2KRr+G`y>yo+u6xttIRw{k6-Bx?L~`aig|m)A}q&sjB9~1!%1Y?
zgR;MFDqV2j1p23qX4i<&p4f<EQf<UoOyuGN)wPO-4|9elF9o587C`75h$xUPaQNZo
z$9^YA;1b==t1dL049Zf3WsPlDP9yTFfGVNuUp7F0QuOhn(gjz~qJP>L)Q9#En9K_}
z4wD~|GC;Q=o}TJzj`qa5a*D8$E1G$3KMmF9&@ej7k93AA)_8+78_}~o)AYvLQL{sh
z=N=krPiQFlvQ2WfqOwUyLLu4YV8;Dge#!X~$0>Re6i;YKA8=3#!8+s$76KKX8Tae9
zgGKz$qM4WK;W3H+A1nQTcUm9XqaXt;vpejw>>KQ-?BBBi%#EncYuNF~{(UR^1$&!)
z!H4mQunDR_Y`}A%`+JuE`3F5KOqDB*QrtPt`zbApE&yeJ%W|>R%<+xJ2Z-3tDQ|f`
zNHl?G&YTI85E^bVxw8*+!EyqG3CK#NLIZgO7v5Z0fwW88GoGu8#w`RsRH%Ybv<}L6
zcO?{PD$fQ#O6Vkw)D9mkv~TpDBx_3jMpp8oNh5_ajb}pnEa-WV-9ms$#GpE0CJOZt
zJ`w8lB_7x)iK2%_iqdl_z;x#ZTH8P_lm{dUHbRU!6{TEE#ewDqsVL>MRHNk!)hKLr
zUzKdug4lwwht2TF3+*J}d#GUpbLJ6oxkMW$MLuu!QxgkG5+hz5sb1vP;{_6nwjwl=
zcyUnVg}=ELZW2Tn$nItfl`zi~G`Oc47HZ=AgVkfo+KhU<s{ZlO$8C@$M^cjVeTC03
z&lEADqQ`kDB&LxAV5-6|A{$Z~aGyu$Nx55S>v(29^&EEq@i-Ort$vR%tl|d<%_F^T
zl@?DW5JpNNGM_0|EWNAqLvIaxRgq*>#Nlca_Nx34p;6?S1u$WibASM{WdCz7<^TB_
zn*VCM+kTzx!)n--Y$yEvXK^p0{J&t@g#WeYW^r-s<$^<=Mlidojb!b#FUmb&k%icl
z?`O2S(5eu&WrF(^i(!h<QY5|{m^ktMLZfF!?DtDNKIjPi(3!W%xgKXU?1(ESO%&8p
zS>7Bm+~sqOLgCorCD6P}iv!evaB6ZF99HTA36nG-Pi$d_Gzs6+m=!0swj=}{-`nWo
z6ju^?^V&s#VLr;py~h=R(5OJ2UW*)|KthSg7Tw1foh}x|G7r==?J^4>pYN<lpw$PV
zzFeI1j2fv}EM?y6Mo$wCb#<;yaMXQRPBtS4pjezUB>jK3#dje7|4&&7<o{K+ZJqt!
z+1V|j{fXO3;l~@>ePJF{M8tEBw;H6g=uu{}r&f4}2sI4?NYB4^Txc{&#wR$VA<MiQ
z13s^`t;vk}#X326n55z^t<@;SE<3azc!K^c&l!r8hgN2)x7JDTD01~|T}WOX+LtUL
zQsmT$9asp&VlTAJ_}`m46q9k`BU)G2gho+3)$z_cy0mxSX7>JUU3kMHIg%IZN{rUf
zNYb06up)`=L~>dvIf-Q59r%evdit4KpSFcYVD@+_f00<Mf`Cd+C`sZf={xJz?H@?|
z7ay(RUlZD=4`Uj0P-XW1Y+XA*(f^m|&IWS-PqKIkyAjquzlQYhAISeXN!$P4(1Cqm
zpoM4_oJfS;$<!W9S#uHfw)oacJ*r=AXoA4wYz67(A9iHifoNU!*!2pL9`~RvbO3n(
zrpO@{JF5nI%s{8r%@i)(IBfK6OVuHy=<dTdj3YO(4P$>__T`tVZzbB2sSCOL!0RUv
zp_%%V8gH$_r1z&TgcRM5r3wi&PNx23dzr{}0I}`<TA#YchbTYyB<6LtG-$<@2dYTf
zp52NlN}&B@wg?f}d>QP~1F*ML_oi5%PQSL!xJSgKggj!X-pH&FW%8cG+8j1g*a3?c
z6$YwWeU!9VP^{o4VWfgK=OdDS1JoSIpx!DegG^~W+^0g;Jr|6n87!K4fxiDG{a<BS
zRfzukxb-Et|6A-2;r&yId|&_K(|9Al;k(iQ4r!9!dv)}5zAioWSr(8^7(B}nsicYU
z_+Dm}SnS4EgFO*RHyzH;5y!f)0MZiA-(nW|7-J;hxF%!eOE!Lyr@qlA3FE_!#wB{u
zd`}IS`z6X5i_dj5y4v~94?M=zHNn9k7&qxex3)zmo0Ej<J#e~_`B+DsoQU2pNXu!C
zSTd6^kq>h;eaXmIzP~YY_7c)fwM}x9@6*^E^InVjENglVG+ZRy=p0)i@BeIy|22Z$
z!G_y6+lN?>SlQbBZ~k>lh%y-3Y@strs97jtmX}ocCae3WR6B5eA*2i6$g-T_#^I{*
z@<dL@Kic%V$P@$8q)@|kLP+KbPoX)CU5TmWFsXzzRn2a7RO{4rb?D$e5D%INOA~1o
z5B{YZ(qpu4c8v*5#)M8_9*1|B^F5s6n$`Ea)%}97_bHlr$!A&vJt2`A+@a(>UR0PF
z_v^+n!a}QP=BbZrIJSi-H@I`6-z->7A#}B_S$L_O>PvpB;jarF)CamMLB5%(KPl>r
z(2BYRx4i!kru+XA>p6R<U1?urzsIJtHuebLhp*%p@n2eaZJ93+A0)oblykEo3+4+#
zq||F7G9Y6%Z!p{hF$ERf1B+HVY5V`pX`yzkK8RjLp|{O8B)HC^Z4@V_Fh9wLs|wv*
z5t&>6FU{sGaW$YeuyNF5D9|asHlppcxU1opCY4zI|6nwv)$36shkB5Jx=F-|@Bepm
zesFW~Y?Xq5WW%r{g3W>)m2b@X!OfKwc7oawrpCA=rWcjwFP+}LxxN1fW;<7NT^J@<
z`hfiQy2Uj8)oj;ft^}IV4*0mkatN}XM&*Rp|Em?Qu4(BPS4_1S=iUnzrZAMU0ftHx
zHl)s7c#IH}_y58i>OZEcEcx@g7A%8xV0G6mtM_}G5mz4`tNp(=+KR>2P~vM2fH!H!
zuJP4~7-6FDpUpH^%sR#-FY;D<o2t~Bd)3jNAzQ~qzD*QrucOJ+|4rKe|BL@^CT~n{
zRQ%+A1QASmfPe$}AOSP^U<HRLI8?!53htrca0T~Na4!Y-R&XB$M<_T_!BGnCtKfbL
zj#hAg1;;2jR>5%!x)mI+-~kFwQ1Czn4^nWVf|C@Stl+^49-`nB1*a-FO~L63W+^yB
z!I=uqQt(g(XDc{I!NU}stKd8Z=PS5C!NV0iLct>yJW9cZ3LdRswt_hd<|?>Iz&xI>
zV1a^#3Kl6?tl(k=mnc}GV5x#j6<ns^F$$I`Sgv4&g3A?Lp<tzgD-~R&;IRs>R&b4i
zYZW|B!F39*SJ0zi74851tvf9IeFOHt``T0NMYh*I*}l`>X}@QG!3MIi>`=sVUdK*m
zmq14NC^CQ_#>;s#5Apl|8@hiHS(+2&zQ|kaZI*J9rGZvhAwvILs@y5~bft$^l!ZYD
zs5I{QD4q@AQ<SO{#@Z1*o>JQCGAlk#MC9g~ON_cWrJXlu+oWkirek%QQUWJcm<exH
z9wScYqeMt(Jc?C%sn2jVN7Y)wo0dap43a9UxQaZCQ%xyT0ZrD*Cn!X5>LsO=E<;u#
z7!5>1Ruj=h!c4(c=S0iJh=4?%YM$9E<WWcy#5nU^%nxgeZy~2S+yxppS~8oAJDtjS
z#t4sLltn)hMJ>WfSH9GRDXJG#Zdr_c{6G=RUKU9%z0mn1K6$o_d8zrRDtQs=ktReL
zs}^;PNQ3zQf!5&`zm|`J{oh*qV|f1WYu$}U>Hc(tkQo`)SI(Gk<L)r-o7Jlymh91a
z^ECFz6GFCR$HrIj_Brw9I$JkRkT@<KtKp~(9oh#?gl;#Z8`4-i*y{>WyN0MfG^;Q6
za=MjGg58bPef}d7)#=A+sG34Eh25pI8B1nmlFamE`w_(w-?^V?_|}GI2;HhPe6a@y
zG&xZvb?eY9S^xR^9IXsx4YJm;G0r3v(ZeKqtXL;r)1YQ$Pp#=){X^3s0vM7iFL125
zC*5_F?!L0lIz&WsESed5L~F{ip=pCGPb%N7*oO4(?ab(pR`(+!{vR|_Q?<&a{I9~|
zXYw(K?y=I|Wj8_oSCMY>r+Qx(I<gPaiyYl-3qqQBL$2i~R?;j%CZ`9u>zWce0<$!e
z`JF9+zF!l4zgeu81}ZK5rMiB|A39u^H#pl5NpF{=cTV-+-jU1r%s*+<yD79lcv(0b
z9+Rb>I%B}Zi|Zz8!e^b^^{GUB_WK&*^`ZIXx0WJ!b?l;zqdMYf5bL~mzfoIMPq(lx
zG*6&#Hk!*~X_(B|-&*=v62mFF(y=i#ms|@|_`Ak-g2qO>@WpJ!KeK++F2Yqn$Ej;m
zH--)q_6^QDl$@H(O!~O#lMLC#iyzSDiRk~K)(#7QKeR{N$Jtlgzhc8+!FnPxfd7dv
z<Y)0GQ|<L1{GHjYD^~T9mEBYiRjGTj5ajr4g_k_6fNP}X<JhHU6RcRxNOp6BzeyV4
zjm=LX1&S?`*XTv6p2>&_R|jRYOx)Ql1W9Apq>xA^slwA(6=;gDq0nremQVpv(_>ee
zC6BQM;Fjp^Kqx6U!te!ZAe$40v11pRB~NjsA!E#LqA-R6=VG&BE4GyIdlhWfl1Qk)
zvCGUxn6X7;r&^#aHAV`L{WOcxi8iVbYh%mHTwMnlq=m7_N_=gQ<NDl_E66{v01isc
z7$6VgDYhZoD};4;)F~&pq{IcUtK`bwxGG`Jo4>(}n4pLP2fBQ6DZ=?>i|OtSCp$LJ
zEMt$a4DG^dL&Q9<oPbKRg=K6(lKtgVEJD!;F^;Px{a;D(f9A3`S&RK=djp)|E3KaI
zw6m9o@`R%s?j3`pTLGdY!Kz^kkNhxf_os{LkSZ>JbcfOFYh@^ZkhPYPL)rL|Nyj}>
zT~?XDy1^%HY4du2K6>FkgrxAx>%Y)W!nL7AeIQn2+38r``h*LGX;ab6b96(pE-RD^
zS_O81=ElcfCn+5WQo0xT|MHwX?N1w^^>KSB2TjOGm7plL38~n2Q0PXU-nxF0$R=7e
zGx!^=1@)oqK5#owV#XWjlNvMbiFI<GNY(?o`9lrWst~N(K{q=a?p~YtUi0`BWA+j&
z^47}533V^*L*2bXB(MQWo;0^<hMc5}2WfS02puJq+RkXUL}!si{}JoL*~+f!f<+oK
zN&j!MpywNf{J*94m-hMAyA}c{{*Zs_L#4!Ar%2x#-Nx08ICI@z#Ln!1e2)$-o|pJ+
z<pl@GZGG{xS_iwPg-QgA5HPQUC^Be-CbhdMS*-A#08^)Ye|s}?FT%2qyQ6vDw<$H_
zm0!pP|5*1ds|g|1tS^<PUbMN03`;aeE#e<Y|B*cX$*P`CiROBjHZEl$WR|UDqaBRO
z92xM4=cym27X4LLdXZbJv^G>sCJHI+F`{j+N4jkgJd_?wxvb?SJevAVrb47!#U2+b
zBCFUGMgUPnHC}fMoRXAbeO}zJl|K{47KLA4d#cuxEuq3RZsJh{h$bx@C529zm;hQL
zGG_zNOYyR?RAk2}{4!w))Q1Y3ZjV;na)Q{cCzC<BJrbYIEfdL(3cuW;?|-8I_p~-x
z_<ObW65@X!h6o^+A_~A)umPxII}rcZ#pm%Rehq)+yPXI|(lR=biQAf&8ZDZ7OTqHr
z?ID*r(ffdr((f(N>W6><5wc}oc3xp5vZF=fRt+yokE6yPsKVB)iuhx$HySne;(%9H
zpi$cE)f)qo^nM<wa?clCZZ>LuqaP=1EnaM-preKK!-OwMU#5{<4Bc%$>;SnMml}=c
zqIeL@s@+{rba7i?OQ6B$CNF4p)_c=0n??jG#Z<bh>k$-7E`o;i!`C#^?U^Zt&!4_m
zh%4;IA&USSGN36xCjF3O1RA`ZZps$nm1Jm*gF*pBHEws;!H^&zofzBFueD~-^;7~U
zfap-uA-pm<QxYBWmf3T}r^p*;S!1l5Ec|`Sdd>P1A^;D!54Q6W0r)!mRc5gfEDN5q
zm%=vi3HBQMCm#Wu;HA8Up9+n^1N<fa;deU~oR?NQmtOOY7^k28rM@U{=B%1SMZemm
zQYmldeD|ywGiHcq)x%uKXB@r7_+qKu$~$Zx;^}$X<#JsiRWx}yU{1(lyj8|Y=T#DY
z9>OiaW@J%*Hmru4e4C|T<tC{CR4>aBVW`7{+&#S?Y&gQj0zmz3C<R_3wL^Inl3yx0
zi<+w;aG;d}HWHrYtv+biV)2zvcCixRD+Ht6f$+tXWe6V-&u#6k0TE4Jw!BPw)aDhE
z{mWuySHo9IRi}8`fQKI75kuHG#l^}|?_wW90f|uf@S{Tv!b0%3h*jMZ+lE!D&-%B;
zo+clh4&f0^{5Ae3n=!NtCiyUfQ6pL@6|;F{v+u7ay&;^aMH5=2?lNzg*Wc18=ggxX
z^>TSUUn(9`UBA3g;Xp9O79rR~{9(C)>ZD_Do{)BSc<Sopp}b5w_U6GeI~%K@(9_b=
zDOl;+i09-QwGce+T3=gxZJ?2&#<zGqWacAU->Q~Z6=Ih+dvHBeiSWJrIH@#DLfP_C
z)fn<{i@oPmP1X8kre;*TvDDWI*OH|F!-&q#4`VwK|L;aS7x6#B&iCc_^5vS)3gV{@
zazKs7ZP&QXyL{`s(s}i#(LarvJ2r$ovFq3b2i0R@5s6!o(=op+XcGFF!Y?n@NyVxV
zlET)d3N8{ocJ;~1(;gffTx%fLyY>r}gN+%J$}BgErVl4YA5Imk``=u(PPfVJ$_SOA
zbpu(6gAq=9D5X8NDo=h>Hsr^8M39=$F;1DMggZS?e^O9+heUJn>Dqc)A6iDTq7?3w
z(Yesh5baE9d{_14`V%!2HKC<Wdy+tN<>^lr93)ifSiG-kXypDcvG`K<F*}a+x394e
zhAmLZx7yWJA!LSiwiEONFi(51YWDy+_SZIQEp87X6>MiJvxDf^w@0$J)7eROmNn`&
z&ojN5U9?6`xxULch1QV6U<x;fC|dLVV7@x?o)%fPAeX#a>u*(PwbMau6T)54!OFWk
zPkT`G{O?uo{;DCV2q885Dn^0H(#chcnHG0hUgW3!pSVj_d(kOcwOyGZO2|Hpl{=_d
zClrzq6;3FR69#t6=KNS!>aPo}6jB4TWGy;}@dQykePmtOwyyyLq)nBMrA>N=9Z^OJ
zBjBV|`CDI?&OhV<`lrnh(f`A(Gc5dl!1}~K5cdD4+K<`)Vh1As*Jfk{e~a(M3-~Gg
z>2Gx+^rcXG4msvJ=F8JFhKX_zUXY&GYimSMuIiXzJsZ<=VA?+8tJ6yqkc_Fd4H01^
z30rGa{X|zJD0gJsLA>qOKvk6|BD?Sz<9tL5n$9}D*639RVK|~HEb`UWd0Y2~IL~8X
zCu2T?IlK&Yx<5DO8J4=VMV`)#FU^xJ^lkVi#!ao?bTj81{XF8$5y_v?Z=NymO0*qN
z8$;7q4eq|E#^)DYdcTS0B@)GzgG@RQ66boP$gSUzMsxpORKmDoD#8bC7Lg<o=4^|Y
z`+noh!E9nmgQ@gwf)g-t6v{wmQ8c+*zk`f=)R-!eDzBLw1rc4}*D6B2WPC;U{~%ZZ
z^P71-`-p|u!S<uz0Nz9V&;5@LAz`gEs<|dcc9j?NOKIRVc~T|_9&1C$EbL5FoXDW%
zB|K`rbF@Ts{a4xvcU%a`YMqIS<M(7<+^_Rq6DkytP<kkVEg`Q{QE@6s7wia(Vz7Cq
z2osgUFRwmc>s@WA#_2F73Z(K99<6^|*bYJ<{*s31*ig08#SklWiIu?2{q5UwjxN%5
zuT>!!qB|oTb-|1-smb5I(Qr4f40)XDj$?!iF@lEtuji_&nKn38q4iGNuXEse+JoX>
zG)W{0>#QsUX`M5TO+>txr+z3tOPIM9etFFYTFdGF9|p&N{Qb;6z+P>i3)%m_+2OE_
z-oai&1n>fW`gimH?+Xd=t-dwiwbAn$2X(s#f-s_6`^}%m*P8A#vh|?5C$~P()FQs#
z*L*YgR$m{0V3@*LBPgEYF*3e(aA)PhWl&ghsGLvzkXFs$E!lgHBkdEF$!&yONi=c1
zgC>%>eHGkP5vZ`yr<&Mr4+q!QB0srCK-dL>fOy&H^_t<}%E@aIf^2s=5<#>`>2$xt
z91MT{bn<SX$r|b463>Uc2BAFMy%`Dn^>Z*J1xNr2!yd%k-b5sTyo~oTla<lw7LF!m
zzM2~36PBf1W?Qk|c@sZj=*b6BMgzr9IVx>qzfn%8fTUGK^JMlLV%C;L8(-)N5ZT!v
zM4J6<%Ktft^8Z?{9)Kqy`@a%VKZERjegF@0B$NCue==5iU0sWlZ#KkfY;zy$YXSwP
zvN)DOhnJPN89B`;1Vwo@g41Qqn2SM*`4qnu`#Y<>BtEY9%9vlnKd`Kfg5z9WM}8Mf
zGiN1W>UCot{ytDFYH@WLDB+kErs&Mf#LfuuP&-NXmm#rhJDMQ;WoOaiAO1Vc%Dvxp
z1ZO28E%iZZO#UIr2r1UV@VC&tiJM(rh^2slk|O#!gxcP=tdc;RuR6=ny`|+9Su^G(
z3>&R!H%%svLqrzG`<#O*!)PlE2Fb7jqL@O&x{0_b4@UsmjLGJ(DRIc9X?QlJeMU-7
zoVM+xV9S~@JE0YDt`(bej|Wlxbfbk_Z0)&}e4)kzS2EDY$fke=IBWt+PjI%jk`&LH
zF(<KMlmP()Kmj;tnukrpH1BI<h~gV4@3G-upvaBp6C<t+vg>;4{Ma^7TVT$`imUf`
z)S-{VeogfMKx>_aSiYm!Es+1e3;sXLdJ>Pmk3Th`jZUSQ34C{+{$&1(uNp|B+E9yA
zDmYQ2l&EAn?CN!;bN{%D{%PdWijaShwK|neS(NSWRWRp8e_VL$jj{(9=>oVFp=PHQ
zldfAT{_~<guK2q$$+>=m*5ayAlT*@E*CXd?4;GfaUAmyBl>TW*YC?@pr<nw6aXQ5W
zE#s2+|0oCP`gb%m^`Qo*b}>ne0`d}{t<64HqPkA!tJ*^woJyIcN*ITcuJtwQgF7D-
z4lNM&zNq!EIpiacgSigGrOD+%U|N%ii58xHs_f^r*Jucd{&&OO4}YJ6-QQQp|2r2k
zz-sJm_9gc1_A~bD_8-9y?8|1cVz!>0z^-D?vv=4(_`ZAwuY?!yImjIL)PK$jKpaZa
zjj?z2^Jb;WO=9MvRN0BPEb4`>D&b3&>No{E&b>-qo4BHQgKAuK&vU=Rq^p<sF{;%G
zTsW_Zyh$_%QHoq`Yw{*#+z{dX)+vjKh>V^et1KeoWT>he$podU(fS$8H>w6Ch&+|v
zIZkN8Yo+UR@>R)wN?mT2P)>6p5FPKBF%y2aAX?os=Mj}gR~TK<?o#jO_TC`oozf1V
zBU>0a(ACPf%hq;e*La#hGLm<Qc)m?y?uZBt%bSo92laxnl8X8hq}IIyX;_f8eNn_b
z<am*-nRgT+fH2~AQwap^gLMMv5n{@g3#O58QKgGu(SWbOKnbiTDXc}4nxug#nNawV
z2r2TxW;tseC4qKnGPG6UD{mJ`sOw-Dg+$5ZnMq?n3ItJcm#UbIW6({62BB=1!ZdiD
z_~1l24ks^zJ&Q~=C1@jl3hn<rERaYKT7QG@|7!aT`w_<29OV1Hg#C*Bo6q4J_!WHT
z_dyJN&viK9KMQ^B)tJ*sZVzJVBjgE|M8?0Im#cHb%tw{$w^s@=ctmUf=DG%A0K(I+
zzq9Y7%=lQdnxU6@gB}yQOsq74Vv?Bx>}5NPDCHBZnkzlc%^s2YiK0xBXN;(0mIJi-
zo|c=6&eYEwW;zCIbDO`Z+2^SiNcMLy7R8|Bm9=EQ$wqR$7elePEg<50!u>taS|tM=
z_S?^F`4=6<Vqf!S(X6QsgbRylThoSvKZX(@EpQ;DSptcZSUVVOfopFE<1BsTtNbz!
zRKF1p*!d+m(IEKnb_gVc9mv9{#HL7r;X~{ztpV0ti=T%4U(c{w`wMHXeUNotn!Q>X
zLZ;~=oAOB-{ClG3HShgt&){)Hh7^Sd&Nh1ZbnOx9ga&mVR%xbzqBUkYyBM6^9|yTh
zsddHWkDad(Nt;5ON%x;3&rENNjAwg?>5X+kp^)w;L5x{gnPw)w)$67Z@^)`b6=yxl
z#w0a(RFrMJ8Kgbty@is>y#BY^0Im-qb+<En8O_WsFaGzcllM?4MrbH1LP*x_%z`0m
zB^tFCJ!11vS?$#~YSq?;kc``znyM**Sj$UzRG$5mYX84AMD3wgrwoVDx-if5X5B-7
zQfQCW(8~M&UCVkGlz*Y!Y5&xITj>5zfyM7`Q27P?1Z4Sn^;<2o{|kl8XQ;oXt%+nu
z72c*6*#D|v&?8SVpYG8TxD2y9AjXNLbQ-zEeDKB=0!Q5>WIiK1%-2C|fnuZ;YWB(^
z7dpTJJ%T$&-5(>*F#Ar!npSn*AAr5k<ox#O?j>HzIE0L+l;?9I<VE%3<{H^!zPzKg
zwE9|FKxfe<H1e|a->>jAwIBwqAYMn_VO9u4>R;i9R8oF@eER8G0Y@>vANg+};1_1j
zBhO5~3RIyAzsTA$@?<BCA~d4Qx0(rwNEe7S_ih659@DHJr5~wCF@ff^$-F$dfL5p^
zgou@L|BN1#`a_!IM*5J4r2Ovyi*MlvutyO8;~o1Hd$1L<4v1`CPneMaDTS?L%;gu)
z?|@B;<$uZ-3$M^5_gohX+qm@mvmz&#ei~+|BlY{rdk4{3h*n&norQrgR3W(LowUKo
zX?2+1OxSse0q?5Nc2cdUaBA)y;TYaFhR<DiwTXfVgidhWCnGa#WRs6PRfrvv%xHB8
zS-E|wjG|-uq%r3@x4!xquNpa>F!O|vj@#kd)Hr#Kvp?#M5e6K~Lt9BQJI2YXi1O`G
z4!-!*FAVi|vCtOhYd(#@A&o%d;I&s9S`pp<H}eAa1-pPvwV$>ZWA|Sg+5c@}B+T{N
zl-k`y>dREmwKDQ-G=nu)X^!>hcE)dn?`uj&|E{cXCPpWl)tQYo4fUr;ubeCe^6BPm
z%t=1CuG=}2hH~+E|EJpVu_cV;zS|Hi(Kt{mJn+;3(~67~Q2(@LAqou?>WEuX?Vajg
zft=6oIsDWl5BE^JJ4IjwPk6u}Yq>qeF><aoM&UT>&clqXSxp$(eEq4NZV`epdb?zi
z(4Y*Lu*{+tiu*O|3L$zgKI*QAv~gS?MrPk~n=Tx~f)lr06b&Ls#9_TfR-7t~L}@r9
zl9$+E?krQO)2+*Ue>~=-Bh)t1V|01KE@E&}B$zGtZQkt8F3Hj*aJoot?Tmj397o-y
z8%dRg`5-ILCXa2yxF{T4!L>)rs#1*v?f(JRY>Th7X0!KM4dQ=XV2`)XjO_koaCvx0
zn&2MU&9H7oDoP&t!Tx&VL)5L3+g~`}xW2lEhxZb!|0?rY8>ujBbu}bdt!tsul&ByU
zrr_?BWO0&|d{QiBewMTE>|sJ9Q{?;TZ@wl^oi}Ski?>ev<PYx|QEg3`kW@JyX+f4E
zA%$7ybblR?>rb|h2+=4M`5){L=P~4N6l_NpzK!{HWq7!-w8K^&zfWq6OF$MQ0xAXP
z=4ZwH!h{zC^`;#X@~oCdDC6m;wlH$@%D4;ZI#b?G9+3GIsfWakqC1Jt>MK4^-=S^c
zVVG9V3LNyP40cN3VWzn|Iy$Cr@W6hk#y=f00JrR8%GY~}G)0NM-WW!%Udh9!>-8dE
zZ7sr#!w{nq!amXIghwTB30IBOlh}1&crZFWm#sCg<-Xrvh_5g5I^e3HlPSg3760Y>
zzh58^mAhwXhb{5{|BL^f?37FWOvO*GQP8Vkt%7w5)+^{!aD##k3N|X(q+qjxeg#_;
z+^Aryf^7=6D;Q94lYkw3vx1!pZc%Wng2yYkO~Dfs+^*n>3U(=Yl7J`kQv?k0uz;uX
z(*!)7pP}HH0-nXsR`47J&sFd|1<zOT0tGKr@FD>(=9dU~DgTjz-3nf&;N=2d!LL;C
zDh00=a0kCe!D|(~PQmLH{IP;JD0riSKT+@|1#edHrwZO8U=P1d!P^zQL%};0yi38m
z6}(5mdlkG-!TS|_K*0wUd`Q8E6?{a&pDFmLf{!Wqa|It)@D~a`q2QAWKBeH(3O*y{
zf0tR%_%*RB?a|gd)@5w4eY#y>KgC{RpCi||2N{5Wc<-OY?Pg9kk-f>=Tt_B?5U4cQ
zLg$tRA{wc$Yaq5N$DImaavAPrEHj3tORS?Dnm)38ljQ1HdkSBbT-cIObgX5z|IFSD
z+rF|ujSs<?8yf{lyvXN)${&hC5HRgv0mNB;wb2$=tAV`Sg*vV@DzoHQr5LMt{FTuN
zN62Z|h!GP?V$p&tjY6aN7Vs<P@-{m;VY0~sat!ILML)&#fIzGBHVWBY?F{a9Qm(?^
zA?IMlp}Zk&fex@z=m*UGM1X+01Hi~8Z`@|kN+1^5p+-R}Ix0TN%7!~?4MLcRD%ouF
zDvA~Wu~bBEV^9DKF`rCw&Pt4u!6>dAZzrvWb}&mYkQ5`uDvXlB-eQ!J9mWGRcdXc`
z)Q*0S_zaCTAZ^^>$0IQj+0nHB$5{7U`1^|8&pyJgNBr-L?T74_?2lPLoC-_W2DTkm
zKlig&*cZ?TWbs^H&A0LMkTLi{{u};>#EttOc_O3WC*zj+X)|1GEptvC@iXVRVDFHs
zKoUs+KSKt?I7?$Y+>>h_{|RD*VRKW0$%6$Id66{eIV*vf<Y!B}oLK6epLdW8#4<lC
zCAG`Xkrp>+32`UX5t3fLP}=n1X#)LzuC(b%;7a)U(_L&8@Hyj^_yy9s<>E3AoaWqZ
z5u2Jzq^-}TrDFX<myJ^j)-eS#4f<s=+RCNNAog#I9D0|JbHUYwUs@sUR!DRzybTb6
zO&m$xa@a1dtjD@7f<hg9jMyOjM{@qJNO~GdYnUrY-jMvPJ;24X8NVXcVJHW8M?TpF
zMF;mLIaxbk4^RiWhM3xGWgm9rxB9@WK)8dwOnM&L%EUliC;PA?KY(+4g%1T`79rl;
zsA?nmMOCM)?Rsg)wWBC|srcp=Rl3C6+Su6~F=3*5uaOhIqts74ZyjDOfdiQ+bh9*s
z+EE@LZbm%%v7ECV7!%}SfF*-$+zregfc@W*i9P#*b+f&{b%FJX^@`PD{S0=1>!A<4
z#J<~p-u{4Pu-UKx>}1!$O5k%okWc3&unamKy1^ItN8e({vq2+W_B6)f$=BN1j;qnz
zI+d=q0q{k(7VY7($1%Rx1HGId!!@+VMmsI*@F6aHU&eExzwkE?EVRd37CU{o%O1~o
zC9KMG5G}^ryzdp3)qm_>F8d(H%RERMg{-+{-p!k>b44=;ShDgGZ#(AJSDkI+^rJs}
zOAz<}5hGlXsqwtFYEO$-9MSnu;|#%Y@y!Ri>>}Gmi!47t*EmHHqExdYE{?M3!trW9
zy|)Wq6=Q^LP(>v2?L@pN*w<wrYR}2r?5z%v`Vkd$%8)jT(TEqt+a=jBa-)<@;DjUj
zYFFd!cJyzOy+rIaI1Y$=>R3E40kTP~k(wgfGreiH$2t)&D#UWJt}TMsD%e|jXbIB8
z`UzgIImE?|Vb*OlwD2*WTmg+9Oji)?c2O&W5(5KVRm9e_-T1slSUFm^krkeJYCVjn
z&8m{6Flj@u@bVT<HG(Boc&qE1{caJ0r~`Ko?QH9}_&gwt+pOC#guYe;(&+%(Ukecq
zB6Y*4Wm#oj5q)Zpz^7ZqmbPcB#qQ2)#40Wkl%8zV9DLLzQp4DVBvEaviHw*B<QGmP
zvh$QtjBFaeQ^h{B*W_&y4iNS^cy^9NvZfqU3Y$Jy(IKdFjK0opz(<#eakTFdWDVj0
z%LE{zq4(nT)#8k`-(Fe`?<_Y_iUBdm_Ir4FgE+M8-NL2_10=)Iiw-cnwtB=-V(+Fk
zl~)4`K750thR#z$z{cU5dqo}WP#9y8D{wnLg=M6`!Ds<IEE>Sp<@nn%{0;8X$jdss
zd_ve4vaL&(w~rS!b`joD)}#2}z7gO<dx(7qG64DPF8eb3KI8-cij83lnGc@9H?nuR
z#Sg~5Z{!#9`}lW^2MCnk&!682gI(5L4yOk4=Zf4Sli=P}Af39|lR))bF}<w2(gUMF
zF>vJ#vBr?>b$s-J9KPKZDs)I>Z!tKjSRczvArtADTk9Glq5VjN`nkMvGR?_f@zFn(
z32uykG_S|NyJWTT@^Ow3O!g3YWAA`g8kT#M;s`TMhd;KgJxbbi_LO_8TXES|`c%}S
zXYg*U3{|xYJ~oIlfaqK>6~!Ua2CFo=mRxAHJ!!0q&1ZZUt+z7Tb1?KP^J4!A#lNdR
zKA9#ib=TfF_LSu*U3?g3T0SnMiM8hlV#T#LRg&ZHB<%)%prwb+0a9MpH3eTDC3@pp
zz6wWmxfj`ffJsyX8z;M1B08mlyknNu))F1i3Tam(K$|OsFUmy98`t#+=jJZ=AaW>9
z%xP!|j&a`>DAp%JS_z{&Qa1^)<#e!yuA5MBjo7lTyTohkC-oZQVHdWn?G>4#T)*k9
zlez*O4Q)So>X97Th3#v%i0$e6r|?M=XCr+Gy`pz|Er{_9+zR$qfh%Loj6>13<t@nR
zP0~~G`T)ERinW??L;*UF`OLuyMnU7t(Ic!U5p^o#NPKs;K$TG-f(C$T!6t^+K4P`Y
zlRl#a-&`byGvlP}W>5g=f5bC01NWJIl{i~7PAdBOT_9kpTRX+Lbi$K!a^CW?rOWb!
zVMN9sXz>oT7Fhg3_7%I99c?YJU$v{OPp$LuBITdu;ZbR{0Pti3quc7`ksqv&*eOB|
znMxzECcJ-|P+*bjpi7CNCF3Z|X}=S3Z=qe%9c`M!qtkd;M5|9u$R?+6=U#o4lCaL!
zB&@CB{V3_j;bu8-6rqU>Hqpn+UK%fv-la$Ptqt!R5qTRFTv4Qnv~?o6J^OMQn*FFd
z7ihg(A0C;;vadYQ;%%)8v}I}Rg2q0~{_}e3OJQ?Z4<b|%9w8Q53cZ&?!6Ue4|65d+
zTEjddybmPwGB!~<y?_%Q&j};AVc43|1;^LXzZi{=rU3GV_l`uYNY}1--Y=dNJnjP#
zr6{$Yg82WT){iax{k=UN(SLqq?_~Yik?c(NCi4HTLSBI9QXT{Uk(b68vdc(RM2<Cc
z5alx~TZA_u+HH9YE(b+}vj>bZa<t;e`yhNe=zfzysoA4Oe{ijA08T6*F@?Q5yW5=j
zBfc2&hT+Ph>kgDQG5}JJTS1sz?hr2-`$6*AD5z?7zflaNp~b0O(?QM=g8F4IJH(cY
zJ1dt&t)h)DmAVj+FsZC99$jqQ(FoBB*JE-7#xd0H7T(V67vEQPf^A?=8+{1k8@I><
z0cEQUF)E4TtITc{T2U{&?fjiliW7YQ2EQ=YWcN75F2XC2I}gzbMCAY67`h-Hc^*ct
z-o2@9x+2Ed+s42}T0te8AY?m+@GEiu&#~+$_<o4?buj-aasY9#%EVBa{;UiiL?%%w
z!fCDmzcp=TR;*-WN6aq^?rfpMe(|F(Z`1CRmhgdeJ*T)WRn;bOi%AYM{Y?=S4k)kF
zP_7J5aMqhxsZXp3Xi9@L33~M9Ra(_G;RDD%Ek!(h)tf}|&W?mfLrd;ggLbio#uFYR
zEN09mT95+AXd!s~ulD3dX)jRluQ5jBjICieZp(~R){*hGnpGV}!Q7-_ZPde}yw3Zz
z9=3$Xks0HmW+F;Mo=h&7OjuZZ%i*Pmee-+zr=je!!ei0nfh^l>fu<o%Ax}&pYqYwr
zx>a@iF|7^QfJ1vX;W6RygRES8U-LA})x;%W`#dW`)?&%uY@Al2{|8w|So{XW|Jud2
zu+jD%_Cmw~zZehG{HY8h{bEWdAYlpv{>;mxKkfPKu~VqGC0nk2-q@=0@N_})nXTDM
zC_o?BA|Cl6Y9n`{vDRf_BvLF-mGVOE#)$AWB88o@E2wtf71{)~gr_<?uE3qwz={PN
zCAeSk;5ABIzr*n2ARalc)@dkf!&As0DMjuS)r%y8;UvQ11uy5TzMY{VS`$8m?2uCA
z*ieY#W#sW9^I4Zg`k}{htqLDZoWnHpmR8j#2tN|UA=BF;^K-M-hnnzYX9sYibUsmF
zKlZfi)KHzIp*b!*iFno&Hu90a#EaiGas2%EhA0HOY5I!rMDlJ*VIr;&#EAT3#Q)Q>
zg#|TE0zLaI(f_kpi^W<H?ej!-Dmxdk{;!6t?>6NBdz3xRUPRRYci4yQ6ZrgFd;s5r
zkK%4V8Q%Z%_|d$OFXJoudR~u=0Gs)V$O>>StOc&-H}cycA$*iS&0plN@pt%#{1g6<
zG{?#RUjIKZ0%Uh$-DZ8N;9nK|n}VMy__=~#DEM~;|DoWQ3Vx;F*9!hq!G9_EZw0@R
z(6$t`6=Vu>1zieeDA-TI{t6CIaG-*N6wFj`u!2Jr9ID_j1@};JxPp5sxR-)^E4Yt>
zBNQB|;3x(6Rd7EAM=Q9$f@2gMtKc{V-3pFZ@Bk_QtFo|XkAS^T18jdTwHH_~T2<fI
zVr&Q_P3y)~q+66W$g1e@BMW;o%oL(IDS1zlhg;ZdbWoOTTXdUt64!;1vb8A{#odcd
z=xCrfB_X-gH}@nw+W&>y1g7IZEzvNo4kKHuClwRai>VTda7e+3zvDeIzf1`Tlhu-K
zxz$?j8^cJh-ofUZZ^z!+N$^XQg_P0PN7AJAB!9l-r5SSU=H08|ToXoGb@a$g@Al$c
z=IN}0j9>OB<`?VI<KL3iFTO>qz9x)}>Tn5iQvH%ZH53-q0ihk^J=z27v{yw$o08-I
ztfv5|3nQPp!xbO|{jrXmSZyTxkA1Y{pMohV*|xAp>yRgmbm}R+k9x;T#e_%NNVNz^
z!+=?nzb`$cTCTE>d>W3mVWd#6PL&v=7YAt~s(h_N7tDKNf7^cHEpk$FKGy1|`+pB8
z{qc9FJ<!gzJM5pp19&*Xt^|<}{I9s_tNCU8`S0sAa8Qp?TG!jtGH-1F>QO{KY=XiH
z`k!_ob>WX2r7p2$Nx?;FXK1R+y+Q)UA8=k0k~-*Hq9uQB6uZRW6lx%-=%o6F|H9~x
z+FPdFgS=M4@`O%}*BoF`ioivFzdUK4cV4Dfd6?(w%1kcP>us9Q(Frvx4Frx)sJYu9
z7=-R#F7FqN-m@{4kZMwFh6jz($C$76ZOQL2TGqvv%B@Gl!RE+L<4-t5w!&BEqlk>M
zL(dv50Ar9PKZfr%%4B1TCb{?SbFfA#NuL{0QS*n4KIOfbv~%codH>J1_?3JL;{7x;
z7a{=fjcnla)9h4l7>QgPQn7EnNMT8_v>8?<(N)%?KiP1(5D1oRJNhN<fNBXJJ;(~M
zxlV2k#5Qk>$d?gXSE`<QPtwQM<+q8Hp~csJ^G6M3XLun6^v-s2_d<I{K73f6WSdq6
z3j`Qus5{I2?wBV<F!7RYN9mC=HinV>)#1Hg08f2d*|qLGNEDhQhhR_g=f@Syr#qnd
zy3yZg{jCch>G;OX$EgJ340@;b$km+iXwzrH+oWV$$yyE5`tT9N^G|Xznel78C+=74
zN1G3lo!RdO4Mk=6aEkJsBI|GOx)fHO@;;9K7<i#xUX=xRYBjfn7dT#t(uzXAWO|Z5
zwyx`zw9K{zn>Cc{!t=#=Ia!H9$PZ61c@y@;{n|QNc#xKCJ6y*=_y2eq|LaZbulC;d
zOj!PV?GwNS+=fWtufPg;Fgu7H1^du;=mf6?P4EKSjXZ$+AyjoCKMv7BF8|Nw0gRqY
z%I?x2K;u7^7LPsBP>aq0G1E^<%b1=VZ+i!Y?V><f!o008a(TTXQ~mWIoU6#+Mt58#
zY^O!>-$+}X9<hj`C+|zr^fmcO!ylDaJU#g^heJ$VSeAK(Q4D`d8h7G_zNsEowml?T
zLnE=><dyzQX+;}H-0|C_&1g@4qn!I+MGC{hAM8y593({B-<0M)hVy|xqMC^iTQI{d
zucwUnqTGwUFVL2JpSMw+aBm4?7v3WnC}3LTZ6jkCqE}v4uZn~r4~-w?E)=hxR?S=D
zsp*7up{GtI7kpJsm`J@$;WXuhy&d^nV+rn*My@?2J_G}nqw`zUQ2ln{kEvlJQ_3a2
zTG_;3t4V{aob*wE0v4$VRR>;IbCbXk@_VHjS5FMr!|zhdB5v35`{feFwl|Qgss%}p
z1^z(%Tb=Aw!&0V`mZ~Kh`KZ25AQ7ehAC_;ggZj?~^?#fFCL4>)zZbI?`B1)?cX6`p
z{Qut{qXR|n@gKv8^LrdnX&~S01btCd4f|ucI-heuPFBL`wFcWmcwmSv@P<*x+uORR
zo&Y7WZY8>%#?-EhTKz2z6xSO8j$7(G+Xnr~?31K_n>9KAV4P*mzB&(?nCIZop=M?-
zHY>sts+c(gnhj9&M2?huTM<%U?6S;5QZOO$EzX)bf6k!-?|~_pF|Ev@$cR%y`Fq5P
znwfnh-)7=ow36BGe4GX%c7QsMGxsz4U?p@nyUDYKEGCgDNp^J5-&3pv9W_QtGX8_U
zPQmSJrE-wy)enZZ(Az2w(#%<Xm|+-i;|_s)!qR54x$wwfn3=;Q{eQT{&*CH5?JN)R
zzc<^1VGVS6+AUunMzVJZTAUDbL?Fj=R6@`a_sF{ZR~HM?>-fK|*XW??aFGxlIiZ7e
zb6DLzcFEo+N&+uupoYa4M$UJCD$QE&?o4v8^&~#q^r%p-l^p+%r5di<FjBmOeR48*
z33NjOC1IVBbF`p`ul@H&8X`|P-?5NNBb7ALY2&Lx{Z)M3xK}kCzHpx7fuoh6vE*VY
z#6Mfsq6pR_$~9co;YE&@f_^vlXb-lWn=MA|x^cN0mbP#%MdM3hhSIwfOt-t~+AqF+
zx?F(8=V@45!a05AFf^(l!ePWewyrz(fzr!XE~I}NO1b|RTD+T2Wlypr?C0!idx&+j
zwJ`1erw@GLa>p~Dgi1_8Ikq3<5~FkcCpw$DE?nlA84|M-CC}rj^=0f3iQ!NBte1z8
zJ$6+p1A*RIj}Y4ts(W$Z1-X_+-K`CAZ5YX79d7jm+Pg=8V%>W3<#PEPd5(stDU6h{
zZETK{Q!*)a(Ua_H>x|73U;ai7Usu0yDJ*0%Q)T__9k8@Q!=7|stolku8@u)!U20Mt
zE^&M)=p=CDeu#)o3qIX0m&ccfYyE8qFLA8NN=7U8Bzbsjzln0$jM=4Os}3)A+$Wt)
z#03$@H_m_S$<hT~C(u6)3(^03Sw~s;+iYECJ#Sm~VRjw3|EJ*jGl8vO=d*{|pZPRs
z0nX#_EQ$YPB(n1s6)ax`^S?$CP}O*(BrfA>V{m5qeIZ&6gI>X{X8heK|5P8tuTOB(
z1s<6ODB}~O{4-htu2K{(IpRr|afXp-ixz=>svqXL9lpkh?_S2KMhEgpsZNM~0&rcC
z`5`lIPFKJW>8Rwm1)ZPqxG^1!!axN&Ah8gPZ^pCfdQP5Ep5{(?$z#Zf#?H9T=<TmC
zbT$c+I^*p$br&IDI+Fa5Ye~Bdhnew?k*Jk*7r~Vg`RQSRTu<(@5TL@9Pcl>)XB#=3
z*s`Jv=76Y?Php)~6NqL5$hgvIN3IH_ah6H5SQ30~L@VDk>Ov&aVsC4p4JL9;;_J_h
zd}!orvL1^Fxxum33(a-L%SLU8Di^5nw7DVIA!(K$x@e*H%6LTH|GA|9pUCcEOYM*C
zt@d!-|GDuyJ;iU{FfwC1)C9=z?J*)Gy5Hi2N(;_=Szb4Vt=dsl9Y!MTlp!U1FB=MO
z0Zuk5`s&dhEdTH`dF+lGqG72EBNMhm^>HF&-;?mD&=;2dDO#st@`qOmYR}1aom@uM
zlk{=>rjJG6uKi|z4dc2n@?S&z?gV4J{HQ1H*SyJ(%F!G3f`*|cTq)+r30tGf|9Z3s
z)=3ZBV(5<ld!~k_DZIilrIS>Qn^d@4?A}{W)shYkUq^U3g?3Dl{JnSSnFY&cnRDk}
zB651k@qf+HFs}_)IM)BiNjH09e_MG+K=!P3yH-El|6`E)8-IUieQpmE-oMrMcKaek
z0^e!>&i)3ue-1-5iWTtvzYw&*8|)iCmKXCn*!o?^@8@r%I2nG>SCd_=guz~e{6$mh
zqGdv!o~VY0Kd3~z#EQn5dhk1x)H(^1`b12jII#tPR*BV<o7?caWu%H^W=#A(C9I88
zZt;hdAY9kg%BU5vA2O;Of2Ks!agt4iKMC>4pHrPmIJNj2N(qvTBj7t_nwnj+X3i7>
zJO1ua7nTX%b*TLH8`;ub5V3hS!QU4C(s0+$ZU;lAJfvJ)j`Xf<B+Y`)@I;6>m6yA#
zpPboU*)4vMgYKdQLcLnq>Z3q}Zi32%d4O!=F5x5#I}oTP1C&mZE>gZ*c=hsKx&C@D
z-b_T;gQluhpT|A97O^AR4;Eg%OgTX3LYylSvC{3B53g0JA^5wD@Ukm6fUpiFp4J9b
z1Q%&q9rz7S<dAhL*`X^_HD-~w(bwuj$OJ@Cp!DgYG5?V6;ky=jH^Ha_Rp8QZ^LDy(
zBRbnJ<s|LO!yt5ucpmONd`g8~dr9TRu6&AaiE^UG4^)i^<PLEwVgZnk6=JG`juI$c
zgJcYuT_Tlx6E+D%vlEfEsJV@3U{#H4INkpPtko8@ct^vf=SgG$dBZ-G5(0ncKi)9q
zE4E3*Wr$a*&kfffj2^XG2F?Cp+<Qi|{-$sZ$!b!F()4PxN~Fhh36dcRXEDA@e_~z#
z`90!}d-26TYe#0+gm5+3-YiyazDE-<(wc#ZHk{dMZD1{e1alYpd<)#!ly{19IZ+4{
zF}K1W-{Hq=&l@0{xiepH=74Y&nz;`vqOhAIle+08G!x7*#iD|~5$07Dlvbx1&isue
zE~aRzyHdZO@u_Uf@po%MRM&=)dfUgwn8|{KmPF5%=qY3U=EL8szGi8C?Fg?&S9z+u
zc?k%L18q2r5b2|tR3<9w8{d`maqG=_3iC4>=2hY2(!_4>r3_*;l`&e&g-?`;y06<;
z&s^^buXQZC)s&_^@xL#4V1L3<a{Om*t^KtB`&(-*ehMGMu4lG=n)OTk`u+TA2qRx(
zM=FcYgju1jfYZ1GXH@TAh<RY0`-w<pQvBkJA8K9cS`glVRglLz`>@OiA1SBB)dDwK
zcTo{8oXFLq?w$&~pbsiq1MR}~Rff#ydpSGvHj&#Bt=Hoc1j0Tv-cBXGOFCF(0qE_}
zwtVnWy(6YSZJc<ATEKdK&@Okl9*C!~b$u8$?3u;L=uLQ~I8CbkAY4FbA>o+1z%5CE
zU5-Ds?&|C(+xVhxkQE5m^?7WP5(P;~g;npUV{0eVR#Z*6mIQtW_2Hb4yQJf;>=Tau
zo0<aM2d6XaMfWmN8G9#8eQ}`KOOe;y%UY4XJR;Ac<15+oK;bc^^Us<<|FkX={XfVq
zwd_*Z{k_D7f~F3$=lKXk{ru_oa|ryuREyc|Kgk3pyMEs3Lk*D~*p4GiUeQGN{@Eyd
zOK5^l^YHhL@-b6c5pct&%x^w3s_hes3u+%^tD<;5H(MPi7WKOYyCSn-sxVD-^0|f<
zy1IrZ*ZwEevJ^QNqERARVY!4LaXJ1PX+ZVQVi)M9?}cJ|@B68Wx;MDo)iudst18H7
ztc4h#$>34IB#>E0Bjrh$NKx{9o<<S>hyRW4|9)1N#m{B$vO4hld*he?<e#o#;f*-`
zMzf`TIA!V922%-2mAWT8Mj`6TJk1TVV}gcG`AJ9SG3q>iT00ZF7Kd8~TV2ap*T6p9
ziAgAl1=2$ScLD`?K=h`%dO_<8gJj|zJvBJ3B||3~tWgwwC~pt1k;<_bU(_uC;K=UB
z2xqc|eeBH=k}hMxP|pews3fMLNncsNo*|RnytuPg8`6$&Gn&vh0zLWpwkzr5(w|&a
zI{&X3^iRXwH6`2x)N@%wAJ<nB25bRLqpFeh4WXOk0`p07unz?`%^$4RUV+x!rZ6(8
z_l=pY^frnliG@fGD=9$ziS_>78x?7_Tf;~9|Nr9u_x->l|4H7%f2rVe3O=vk3kvR3
z@I?iGrQk~n{(tO!34B!5_5Zu?y@7y&B4Gy^M0Uc2u!AgF*^;n?fNbI<nIvN-nJ^0w
z6m{4#Gk~quty;A%xK*oFY;9etVAWbhTx+cr#k%j>s<mkU-@8mQ^R}4@3BUe-Kl#8r
z%v<g~cRlBx^#uW66!0YhUl#Ds0=^>PUj%$rz`qLknt*>3@O1_cD{lz+rhrETd`rN;
z3;4Ex?+Ey=fbR+TzJMPH_@RIw3HY&qp9uJ=fS(D-{C$<f3iI~`Wd6Q@%-<J~`TGJg
ze_uf6?+eKMeF2%jFCg>x1!VrdfXv?)koo%pGJjt{=I^T<R++yqAoKSHWd6Q@%-<J~
z`TGJge_uf6?+eKMeF2%jFCg>x1!VrdfXv?)koo%pGJjt{=I;y0{CxqLzb_#3_XTAB
zzJSc%SItzJpD!Tu^95vnzJScn7m)e+0x~~eK<4KQ$ozZ(nV&Bp^YaB{e!hUr&liyS
z`2wCs#{qDtfTs(HI6jhel61a=zps#9q?m-sFUUXSQS#aHHS(X8Ol7%pQO8C9U#W&B
zq{`9M;(*J9qJD%htgrA^xw$l!8Sq1kEcEA`{C{C;$*JQ6nb@96PlGYh@wcYBRNcob
zsP=&;eOFITo%7ai(8@=qQS0-)_4UC9cV(Y5t+-qM4g#QY!6qVo2543>`^d#^XM-1#
zM-hu0d}JS=X$H+$U5;F&ymxJE!r>A=ZIq_;S!K~DqVhbEnw%=9VQj!Yb6Jdo_$*c_
zi_Z%QeuXDiXPw1)qUB>Q^{#B9(MDrA0Q%G<uU4c#sAv+-oW4fLE*Q?0R%b9#FFa2-
zgT>DEdmsj(RntQl>}r`qbf2?LmH4s7I_6=75cnEe3rPI^+~lQCRq_VIwIL66R#DN*
zayLvHnAt#|mC0-55sCA#XjT`v>b+}OTN`Nn-;<F48zDnKQyzj=Z-o4zyieYWSl@k-
z3v?$k0(3$=@J;NM1TyJ6L)l`SoM9>SHcT{x2(2zZi|XwFXIll99ZdxnInfzFQD>it
z)t`C^^8+};FgHRL+i3(s)uJBz$UFp_o)51MEX4Ux>!9#@h%~PqtE^4AY!5zo#?;&h
zMx#(()i@D)KHz{MINC(}PQ4yqJ!gJ!rTVCOh`dX!{$Z@M*wqM;zu$pyb8g80J#NIQ
zrGem4QkNT0(zE3%gm8vu&ZW-!dRTq98ypDg@2jw5HvnHw6>If~n?14`dZBT2_w!+5
z&|@D}kh$4D*#BOX{FJE$erv&Sd#RzRFW^Q<G3tLFv_j)e4Od#fE2POi*cV$-(@#^V
zsQ`M95*N+c!IT~SX_(_>7B$t>IyczMtK0#5Da_WJoDBneV(x4(HA;d!EZ_|^HM$)0
z?F$=V_ave~cKSCyt2JFF>@&nzXHm<_Kn>_FMq|Cx#`Sv?-=1Z<y|;W@5TsuH$Q)PW
zhUHO%eHwyNvhVN5_sf^4p`peDi~_3MHBEe_;It*8p^K4S>}}-!Q-v_!nIG`GJk?uh
zsiY4|b(xB65(<Sp7-hiRik(uuo(+5sOW$+(f1ae2%lFB%5$}64ECKRRaLRvz&6{w(
zN>6ZYs3e7URIfU9SF^|k3l2T2H3V;JM%IEfrKTo&-owWC&(C>OoSL-urlJ1L8&LT$
zd1abM>cj*7a<1AgayKAIJ(SFJRE<;%M(>fnw^j)3-qM`uYMX=9u*f1Bm5z_m$m0$t
z{@&1Yk2tQ*)>P$h4p3L=32AhLkUAzv4rA)q_?y!0(+7)MwLv071DpNm{t@!(H0n)N
zBz8E(7o}*?05JeZG`$iU(d+|$6Xcq-WDe;txDXem@%s9HJm>YHgIZ-a<^Ow2H%a*W
zGVFhP!vA*xsU};<b>uPfp?r#*C$Ew(lOL16M#QhRO0#mC@?OeYLp!}VUX|CuxFlsw
zlJcG~>o8V^C~tGeN@G>8@`iY7C}&bW;V!1J3EOHx@ONRsVKlw}!3}yet4jH&2+|KL
zJ~N57Fk-QmR<ls=$#nC|k>syo`%zDHsPbx>6ChOyGWRTH;>$Qat@7b?RbDT03m_x{
z*dS*kXg*lAEJlP_&_IaM3~Yl=;^~N3kqMvDZ+R5)ye8;8kTQp2tmde))2OETvAS3x
z-ugz5ON8_IeyWOecYLc&sA0LlZmAdg04h<Ye0_nlUStAOrLn49Ztx-f4xV-N?L1^J
z;c=0^8>PyN#LJeVXytP;6DV~y6s;<s&Qf83$1yH$qTF>c5)45&Tj2HuU^~uoKrp7I
z#0?MgLLYL=!X_xl16!%5#ElXH=1|Qo>pNturtyE~OZdB0dRY1#_J5V+XXKFFO<smr
zfCmxpuLP?;xjm4nM{CQG2mO=VP>Cc-fw)Wtea<mut6DyUqcu1)W`<w5iE@rO*;4HL
ztTp8VTfSXNW7FW^kndxvoj%Uwc$QH$HqOpvLHJuj$H2J#KJ_VlNY6Xq?R^`-`o{te
z^r=q%AszPISjM@SYiOSeQ*OGYb@ap7S)cVtWAcM9zCqR#sv5$8EJBVAs-9pUuPahR
z-HbWZxEi?{BS2@Wv!V%;9b6@NW#;_LiZN%DTS_UXnm@bKUL34<H_(je$i%|Ftu^)E
zjr+C{;o)%fbymQafmR*!=<nl6;pEP;ztHuAbYgHfVM$SNG80{}I(h%Cz>H$m!i^*d
zzOBGj$zyKx@g_gM!@7!D>2Y}l8ec{2s`{)+z6csy7lEr~5zuel$x+@ILm8F=6y++0
zGX2=k`Tr&fu{%$K#4nR<mR^*a+KF&m6?10u1=JS3Um6^eur3u=rp32hFWAGSTK4O-
z=JUaRWy#KT*h5U{1X5s5Jq!qw8KsdPU$IJH`I#2W-pyNp<q*027_c;?J39P~-jaSZ
zeZRm=8xtmEYd#N{^^gnG7#vF$<*?P$rYm`1qC<yX({z!y`CJ<H+rq<KcaWhwB9DP9
zNE|1b3Ad!M=dj@1wYt)V=FP0eG#aj#A0O7;+A@{9n;d#}rlyHonw!woU97^Y>)L2)
zMQmzc?B3o>jI}m94cGrKl$1q?`8$|gC4DE+<a2HL6B-vr3Z&39xjxMaop>mQ(mRM?
z^)yct9ZX88=yr{@Nht&$&UC&YU7tKhjJD2VuwPgO#yG~OGv2z5!iXz1;4KZg*DbH+
zh>_W*nHeDxR)AbLt2ku3sbOw$uUJ^)`+oklK%%b}30qhO66tLPTCCzt?yU{-r8l>5
zM10#d7Q~^UVFE<j!{{0l46<C7-HW-T$C)+gRrrQ42OrHSozlxo|7rUxD=Yy`tbt>h
zQAtiA26HRP7i*NW#Q^WsAk681J&pg-19^T=As0*EO7(47{waJD>JmN?y#tf<G<wIv
z<ecpX*3Wx3{aduWLDTY3&+rLAX0TkA1~Mslf?$RxcNb}J>=S5d4KmLUcLi1;2x)Ah
zW=<f=VY4S>+&TwG;E*<!{W)PA3SqRJMz7F)I_^}-=V#oF!9RJvbozyt(0|%N=pN2M
zbNk69X*4%xoo(hAgsm=#>yY$F-A_gH-_c;y6z&X!(lf?o?Pq6-`22~Y8+7-_T`3HK
z4{9StG=@7-H$#im4%)5Nq4%Fc>vcX=EB4+dnrmeL)19o6$SSgp+)3U<<lh2$qkOyk
znsOo{{P_?U^k51r`-fL_Jz(lzUjX-O=n-8`rn>F)#3<-q4E28O#X_gw%~fTc?l2Vy
z@Hbn1$I6gvnvu0mzcUTdz`mhUI66UNafUnHX)03T??a-*V&t`+_d7kG<P)0r8kr64
zi@nIU%mg=`%;OdCTIeSMY$|b|{K`~6oA}8_8f=Ynik*IM-SqkP+<HX(W6pN${k<cU
zB^Cog-)HYVU@D_vn9N691Ai^#oEzbA&l-U&l?ZphtqVHs8>6hWs%1nyGcsf~y^^E_
zh)xVy6MQOp1jSA-TldidS3^S+mxZ|-Mz9+GK;?gZq-!PoeL#AN#Q+SFUy`rnNph8Z
z6)XXsMAlyw9=|!tQl(DWrQEDMt-Pz7>>YGN_*Am}RqN;SKKET^huwtZo$~Jqs$3~#
zr73cBDw(1p`2pXu_20lv&&2ZcW6QdX{rldElRl?&l2L7QZLmoeSSEf6PbC%&oeJ}?
z+N^DjKZ_G4Yl=z5`RRi=`F!H%Mv6-1t4XR{!;nrxW2Jl%8(tb!JJCFgJ2@Xtu)Pv$
z83V&ARnCRwTP~#dRH)08;B-~8Lo{6j>Nr*tUa6+~3HppC{iRRlv6}Ftp^4_PW%o{F
zF+J5xk-8V+NA^W**HH&DOz_<2g{5$7ZV9!Y_z?LMvAYSAAsBFo;HBy$<`J!C7Ql*#
zsUDajfYn(jQY^zu0m4?Kx6Gw+2cexPhV@X)ZB(5cD*)C#uwQ`pI1PQk3K%VrD#Tua
zXe&(H#2$>~{QnS1IUo6d3&~-!Ou7OAfm{Fh!#&g0@ESNVD@LBp(uF(zD!5>+UO6-^
zd<xhw`0}O6hNiC@;cGtq?>4PkE_kX>H7sPPbGQeP?<vns19?k7Z7}ja$Z*ZvxV`JS
zm-L}$wL*l-@X0hj+t4()>$qj5#IG@F+i#x`4SrMG;PK&;(BPT!`ZO9$H}wR8t5Cg}
zD+c*UrT5K%$Q@#e1+_>^;qE{>J+}x`RjqQ^^pUjnHWm*ZHY}fOaJV4cjiZo8zfqZm
zVM=$!Jlp$uj~o@fFinF2rT;d0z63AvTjhU)#^2St^ndu@4?U1_51gf9{Tm)*bZ6G|
zSH61EQWav_HWqIvcvaQqDpW*mEz(TkqkO+ch4`<H#U>HssnTK<3Zu3aZlnZKzN7TN
zi!@A<h9RDhUA|eK1slK`>0b$6fGfjDNWPE^0TnTe<bm|XmDJGHsleV<{C8O9KUngt
zg-wf#Orv)M!vm?tWrhWXYAMiR#&nr+W70K457CVe7-*x3)rAL8-|q1#)yqr*0yy|m
zI|Oe1o2kDiJ=VC}q_%Uy{aI}m`+RFFOI%2qN)_AlybU6nOQ!zbhT02xWrP2s+0$#n
z{b&d?tAHr2mFf6Y9p@@Nu;Me5X1T(BY3MhLlwPf~!Lbx(%hcRQSX8K)nj6wZcf4Uz
z&&F^cDj2hpiMF<go5eE~J!Q>HV=?m7OtUA_p<&;c)a(lPPQ8V&ZwEK;uY`byao3re
z8`331UNosE819w&GGI*#_@Kq0vxJ=rczq@hq<i+xGpU!-|E{D^B8Bk$c?Ch7&Vm)d
zOUUj~rQDwK-v597#XJ=P<J5L#V@qS@>qROw5h)gtT)m*4Fh_++c53ArnO!U26sV9i
zq*{PkR4Y^CbRAD%aAs6{np*4YK8M%?YdsblD-GPu6eMcb`6^Cusda$m;Y{se?jxdW
zhbeQfb~E=6(Up>hr7WfY8B&#`_>~jnyX0K54-$YkaHAdnG=)#6A_Ob<^VZ#)Mz>=k
zl{|XlwdWybmatXKG<_u9zlGUXlstU3)|Y>Mcqr9oS)>n(qfnGFod<G(4BgcAjSH*Q
zOvBsKqkm?s1?oIYLx0zXPops#tq$F-?Twc$#S5CGhmO8yvS&k$It0hYlPp6fwAMh;
zXNPLg3Pc=$X9~1qZg^2H3I@2Gi?z`5l_?H$KFXdtABE}7V>VOoJHbck?@0%Gn32hq
z;lVWA*5H)5wxU+b-|}B6^c7FG_3#xVHN)l#pPB}#N76%tQ>L7nAoYniq?^t)YXgRF
zP@2P+>!Uts+VPvuRSJB9TD~&j-TO`E66gONH2!Y^^8eM4f013pCS4;r3^#zfa8~N0
zy^v~_;N}KHPnzzYN>nrT_oVITv&Cz`qr1XmQy-DIsm-g>+>mbdn=wHlIXng<(pjFH
z(!8PzD$k3kmAR0mQoR6`<}MTI2Ki{1K9*iMu+L;D>cXQ_?_27^sS)yK>hDRfe`{Xb
zsMKpii<?+$i`^n=Cu^qWp0sy=rb*js!Xr~ZlIWz=nc6$jUB5rsq^8F32)5y;bkdrS
zNQYjJi~0!qSSC0=a|~~9>A$aZ`VBA8f0~VBWq5e%n^H>{TJ#{5<k1?Xz5khG(wwzn
zxag-!OXA|msF`s;q}w~Qq#6cGjPn0Iq@|Mdkn{-|N>;=6|2aef%a_lW?~|6wA1J3u
zJCs$*Wy)iQ`+>ntQ*Ce@p)G@BB^1xx8$(@W&gZpKF}S{ZJQeVnwbRsaY@A9>qw2?1
z71s^wFmuoM)`~RShB`JC?DWTTwZ8=m9#<P&2H*uAq^9hxJTPlsc1qZ?@0U3}T;H#j
zm|KIlR%&ugRC}dTBXt=-qCW)V<y-nx)6}?eqp&1MU6Vn;0@yogrc~C#Dds^1T9IAq
zVxx|4!K<^+7N&xxM!2B%O=TF%YF+#H`R#tMod)V<mCa7+J0AHkUOqG+m2P3dtD!gm
zvx#7S;{2i(n<jsV>(Q3YLmh7JJkZ*UlxF36>M2JAUvwnd;G7?_9MSxrO#gqk^q6#5
z`j(u6eP9+@PMXLS$OZlwGJ<_4_m)S)6L773p?sx$zkCQ8K{6D(GFe%oc;FqhSNV<d
zvcXnx%(qzRZZ)%ods7DsjVz6JS><K+80rL}_tZ0zs=f6Q>?G`9MQX9{uyM^}9#Lv0
zzDi)^PGzyJ>3vTldvSWK4D3I22K$+-6?;?^D?=mq>CNI_qYSv8(+OV*$!L`i2vkuW
zH2ZWW^D<O34M~kULNpv49?$ir&KFqd`6o4tSxKmw%pr^}vG|yHXE3)!`f!80#txr!
znj4d+V^MR2R+z<#g^C?@@xB=^dO2b56m8XQj{-5H9Z+;biNzilD^<IV31zwIP9?t6
zZAPM7P4*k1={ML?M0vVhg9T_;Gc^QDwApC8h&?jc5n_)FD49UpWIqtIA#TYt2Uo%P
z8?0*PcqkrQ9vud?oc}}e*YYO0JGqw3l3r`y^M5crDRtSVnR!H}$ph)SLuS(Hb>WHB
z#b{W{Onr;J1UnGNeo0%edC-(Qn~*wp7Qbg@#{H14xNsybzvSU7wb_~K!#On1g_V1K
z>lSac#EsUybpM|kP1;iv9-lg!uG=;;wRfaT51JkA&I@Pb#6{%Xlm^FQ2gx*lCO!3n
znL;7dDeOS~C&&v^svnWi;k?ScLD`00;;eC3+LuueM7En}CV4^n^q))tZ@_?`7ao^J
zM_8CKS(rFU_w_o%WW;Tt(d&sDS497ElLq2P{?9FBD`_UX$;ISyay9um*-LIGcR@1v
zJMsv592o+iC$Es#$=}Hb<TLUWIV#I?2F?tba(~$_50}TvIr3Cw3@<<op~c7>vIg0N
zYvl&y58n*_VJEVPUji=TTKOhe8Q+bZLl4UPVP$wwei6Av-jLssKa#(YzmdO()nQk7
zANN)UDyJzUm2t2}p03PMij-nlDV&MS<5kKzN~5wtIZxRN-Q`8frO09UbJ!=|q1>a~
zuRN?graYw_QeIYGQ;sO_DW53+P`*88hUAzEnAioMPwIio<o>u!I}MlVV{n-@0hie{
z<7#d`F8S00t7sW6^JpaY1uk5Q>v1U!;xcCoE{j8S;L1YXaV-zgKrm;9?6|H9jly+x
zXgscKL(_0w7s|!e8G?(qR2f==YjtQPt~DViu63bWT<b%PxHg71;<`R`0j~b7opB9p
zJqg#1TWR@CTL<I1dFu#V&)b@f>z1ukaXo+Q99*|<or~-Ct&4Eoxpf7u&0E*u8r@3E
z-?eo;u6wppztW4g$+%v;jWV8>Y&!+lOScWc^|Eb4alLXI?T@Rs(GL09wli?Oc3T0i
z*KI4o_4;kgalLWdS-9S`ts2*xw|Q~BecL8nf3Y1G>CWvLxZb_}WL)pv-WS*Vw%c+2
z_4bjt-oKsp%x||($MtvHX=gvUy%^Vrx0mDk$aY%tquXn6J+Phj$rIZt&QI>3I6t-H
z1YDoqk%{ZGI|kzV+>X<6ePIX1`K28c=RfbDqxi}WTJozq7U25Y4jitf!#h^t`o@k5
zT#xKH2iLcD_;7u9$7WpL->KmG;m#9r{b(mG|I?kc{LgmM^1s+Q7T2$KPQvx;oilO$
z*Ulnbzuj4i>vub8pM1X)m=kFydYdRa(c7fcPGC+lnt?g#(hST=*JeacA}2SaWO7RL
zFkE{!JLoj>655rJ{8bYV@nQX+PqvdN;(=cdX}}HSR@ejou=deI$MT2tX~sGv{hKi-
z$bjZDTn9C;!F6zR6|VN?I$Td{rXx4J8MB#;YQ{Pwqr(^=GA4|fLB@sY_+^Lb_~nE#
zGsuK+7Os=Sm>FbRcowcR!dQo7W_U5KbHZ5Xq#%qrM~cF<{CQzNt_#EG;#v|>aa|Ol
zGh=ZCbB>fnXvyUfTJnkrRtq^RG8)&F5y*nc>Iki6T?8wKI3u%ht&9}nS`}G{YjtD^
zuC)=Yd~!~N&c(V2ZI>rP>-9!3*U9<_ZI?fCKCZzit$kw@J0jT>#V$j(M0??SeiVBF
zxiAU~RI)XSy@qUyV)m1rQLJ0i9G#47G)imV9i4~ko+xeUkE67umqckxe-foNUJ<1&
zy(&sudi5?^*R{K7A6~zU)^g*nQ*pg%7cKwhUD>$awrd)$x9`fs_0C<iMR)JQ226gn
z3p+5`w+jn|{CXGm8gl<G+KS)qCb<4?cUN2=*iFafq209ie!rWpt4DX!9y_pmDz1<3
zrsMv^Zd&FachfTew0kwK&+M+m_26#o1?13fI_@v*rX|0$n~wX-dphCz${w)i<ga@u
z&adsE<-fjXD6WV1&~blj5ABV&_sqfdojr73y|<?f*AMor!S%yE6z5O&P@F&AgPomx
zaS<jk`SPL+T>o)V4_v>xs6Q%z{SWMaH!Gdx>*Q&$0B#}~Ql!NO*cG0Yx(ptM(@-(t
zxXZJftC^Y`(!M3<nJ^;fg=eP02U(n~El%Ci@B0dync?4SWVj9CGib~#i`=<!vKPaX
zw&D3Z_~p+{+FKc(K~v(4N{RnmQR}rsV+X+5&BWi*Jr{~*jrdN}tQFzuU8S{_iFaBL
z5G^8)7U73<&9X;K@t>A9{u?#;i{H`>H@{+1iz_@e_1UKt24re(NV|_-X;M#PcuMM8
z17qPrrs3@^54~toC6rE+G2>HJI$7KPL-%9h8X!IS$2Ux{zy>CrKrY3OAde&m$)(`d
zo8<@OkD2e^@A2@5KgYcX%)`jkQpdPFm(SPaDBI|A1rYis5P<$_{A9W>^#AQJrNqQ!
zrS;4H_nW#A#%*zlJB&Ibjc;PBe41${U#-Ck5(g@76T~&?`y4HK!QM1=cGDK`h@~a8
zif@#dCD36WNI_Lh{r_|o>pgMRPQ@zRol~<bO6JC_X3R<5%*!w#(z~4g50aEil(CTP
zFM##$TIo|*{|>^mcZTQE1Y{#pqES@CP)YMB3W-SkPwCR2nE;|LT$H*VdY)bepQ*nm
zZNI`}vfb5%3sbMnz!S^BJ4?Fx1T&r{5H4VX&y;l0wEv2ouslMJZUi7}K%T(Xo-}xn
zd-O@#$dZSz8loZk{xH-!P4cvqhs{7S#3Z2l`_jc3X0pS&a9-+NOSLW<g$&cgB;J#L
zdEe2}X|JD1|7qH|KAfAnT^Hi`QmZnAl&NvUrmRE=?F?^A50x{MiIRtZs&&t=49`iO
z<)Op5)J<bPw~k`#Z|Uxj%vhef@a)w4(Le){slO-Pwf<6*1wrZmiDWcRnvnhdoV+Iw
zMdbfW<tOC-D22*4<^JPN{Qhez%vZsy8SmSzEHoW;Q`;YPj5*0lEFz|QP$$k+Vds}h
zt(N9{>X4MQ(Li2r{x~!hivqLFtH7MFC$_kCX{d8ju^^!pwo;q9sVM33iN;__9c5vf
z8;4&K>A%CAA!sec%=bX;lZrKi<{YigN@-reV3x-uEu+rDl$;^PJ5ykk1-S*r0#5(O
zN|2sUlYfB-;7^k(=_~0HiOL)`e=5U^yGrGRdV83-0U-??7*vG5tU|ndr(e<hmcEA!
z8#HU)-#-~`>Ja1%FG`*1NYu+Fs%fRihMF0P)rCvb*kkqj+DyGQl623hjBXgHcwFI<
z)DN*-oz-g4BlKG>H>B`g?66<*@D*VVO>7Jor+$bvRyAiD-rm^ocN6mA4lkts#a0pe
zT9<%c?VhQ-CH?jgYu>`9p}RHB3v~@Iz=0WN&nYoB$tOQGD7Ri8()}NqO`$Wx^O@0K
zO1xdG9Y<!%e+T5fX4<LqQtwoK)B=4V1L+T)&A2v7{|8GCLJuN6C;glBBh$!Y=mA2o
z{CSETkx!Jz$%T*!1m!3+b`Q!g$sa&7HvqA~=OaVt1<K{hFQH|7TeDFdr=Kh@I=6CY
zC75xh4@pR3%;v(F>InlBQ^LkVdh^QTX_v4U(U2!$`C&wXMyT>a#HUE2Kvo?r-@CaB
zo7zWMu;?g-=#ZpyU0uL}P(x;G>Va{(XtY*1ka)Z0{Ljsc7MCCn4rF7<-%-WVov2Ir
zz%7O;(!5}OBR?>fahs#Xi*X0Bc^T8Zln>EjiV?EA`0Z>oyc;<GzKoY&o=anoc@Wg1
zo+lkrSM&1AbJqu5Rl!PL);eB(IlP?$&aCCE{I%S2s=OeGoFNF^T;laMREW4t>IzXx
zktevRMkE4JSBW|oAzKg(Q4!5Lz^x#iy!*=+dz=lB%ghx4h1KP}3FV8u2wNRM-c49B
zZon)2RIrlwT=|lqv&!cT1VxOIvqfP@!;WAsGyqBt!?%(fbCn}DyC1e}aPyf9J2+0s
zEBG8Mr(Klq#ev6()GWM~v*I4HJdVhm<K(84Yv}s_A^%_c8<xnQHbTIW0*(@Jw18s-
z94la!fa3&o2$(J4cmZ<+oFL#t0VfGKS->d*P8D#PfYSw>A>bJT&J=K#fU^ahBVew8
zc>?AOSRi1bfJFk%6>y$_^95WW;6ee51uPM;RKP_HE>@QaxKzM00hcjYt}YjFg@9)Y
zxKhAX0<IQtjeu(fJWIfJ0-i0PQ@{!VD;ca(T>@4!Sfkc5=vL2Ruuk;|STA6MfL;L`
z1zaznPe8wb0Re*oZV+&zfSUwt5^ytv=c!u+JfFb})C(C5saply#^82!hk!c;3=0?$
zFe>0K&j067`QJEL;VhDJ$lI_1=!_G9$)C01@~+Y%LapjdP61`>gHE5TG3dv(t;GN6
z<Z&<u`31jR_NgiV?+dS_LbEC6j8%M*4&#m0c)wk;Y9?j5P`x(lV{Q0MdLYP3vC@^W
z)-Q9d54y2svz@tIduMW1tSW7EpvLeDDxI^?G$ypqkTw}otW}riiPn9r;hby2%PB)?
z;ijKZrIv<iiJElTK$oaV8%}aVcp1~;T8y6NOz1Es?#48K)UE9NIQO+#+GswN;WFC9
zVdev<tv7-DNZ>^lJz`diGrW}AM-ENBmUwn1p0_#U6|*|(!b|8W&SEO+TB2pJbS&50
zyUl8&^gl!TT7td*ucWV$^&=p^s7z9>HCg=sTW*_2tI0z=%qsg_>|j+$o#{yYi4aw}
zNb?9GJr$@F1u4fSa<AY~1%w|ookQ1mSE->%#!|b)@{EdSChvBndJBM)1E1-0#ut6g
zY8APx4F!U2EV>$*>H-YypI56P6a8WGvQ2x1m2dYTQ%I$sRWoy)8k*hKCRkU)%HMIe
z8p>^B`509&(D3GDCyo_ZSg~v{Vt5xUp4+voRt=d%3QgKiRuv@l6s_o0ry9!dfR^wf
zr#0LnV?}q7M&n8<04^dnvYxzy+&_O(3Y4EDE_brTeB{cU6;7O?>{V`mowvs4tZtf9
zRGgdd$jQ#0g!xMo$s!FcvbK1AZl@!AD!mu<AtRHBkXQ}Lp$(Qv8E&5%av8Tdy*l!7
zPDH*<@lh5<Br6e(th^jLVQetIB!L<=v?%RrC!-m;0fde8+6%nM=7J-f-;q5LcX2kO
zC$Ul|4sVON>l$m~DX42hqZ)FyPhE+PG{A;6un#J|z^#VL(ynw0ie#QW?#(WrBfnsL
z!td-H{9IOxh(0b~jTecMXcN_&QCm}+M$x*q@vL%ez8F^8r?h{0BuiH99hj`Q2Go#=
zA%Vr@(N;@aRfIfKEC&ViJ#(;0oJaKl%vG30aX|`ARxyNUWYq!{VeJjK<<u)?6IMNd
z;?6eTVbUxve*RC%Y8lF`qKR~7sE;xFFWV(p?yr=8BEJlq`$FUbdMt6}|M2VoY7dwu
zFDq-RZ>;q;G}+H|FrP%aAYqt<@K^LeBul17OmQC;JFDQ0$X9Y1a`mz=dzwd6iu)8o
zMM(F2&MM?M&+|4Qh1fD0SC?fyCLfw=9Suuh)xx=CqsanpZRw)Qpa)eIZo>Xvja<oY
z`YHJ;rBAEDN<jNIT;!?e-895ps~m?a61CCIE)Ox|5&st*w%F@;xvO~8Z+VQV|8IN|
zJ_HH3kEF%S3(~mZtf%CG{QN&(Qm#>Q;D>WIJbLz!;fMuJ{YBFG;|*8PV~d5WTEZFA
zNQ7x5*ObD0t`ld?_cf>5+ORX7GrLY?Tdut`@~3k|RoVczRpGPgxz8e_ZbIWU;#`e*
zck}xfiE6aTSkDfxqXs4xhuDN_66D(n((ak+-J*)OHJw%;K8xBpTZBDKsDjQHjWpRn
z!Yp0(Ql?4ItqZTE+T5Y$D!YXG;-&NPqI&7dUj{@Cf7i7LLhSTfq!EI%7A4*zoqs_@
zecBXZwc*w2Ogo)+LZ`1-zpbyRN}EUc?C`2|=0k#}qCEcB=-?NkijOqC$LaqdNgf1G
zy&dxJl}_;L_bU&iv-E#>_kU>*q(c0W$i(l5y~i@IeIX1N87<8)4PX&RkqT>?8kuU2
ze3J^VfZ!;U@|7`-o=A8>{$*~_8(-4~uO~>8WN`Y2Xni<^BZP^&rh!vI)ilpWTq#tW
z%yn&Ye^ZmFxc9{gu)yc6@zM;m1>)l_=B7IdUspPDoCMM>XPw+eBtC@>kw=h_Pcn~k
zm{1PoQ@r+(<qaNK<kT`oq6kR<c*}crBiG>kKSfe5mx=tWe71B4=|OIgrYLhP=d>?;
zP7)zK^#yN4sJU8K!0(`r81aE-xysjVc-!&%P`Xzw9PpAhmS07<hS?uM`f8$iDD+o4
z8(qAOP}wS)-=2|747#A~k?T#>521{3EkxKot#XuUigjpyXF)Su?`labqt;kI_w<!Y
zuRilJ`cJbtD^n$#v?lCk`WEw6$9J_7|HJVK>q^V^t_fEqDIT%<a2!V97@WJ6_#Ydd
z`HWE&tM2rKs~L4Rmzc+w=vY<@Hzz3ib6ay)RO#<c-OsGa=QT8+tm(1pu#0IrQmif)
zAzh#ch$RqKt28%e{+ro!&1=|srKTdR4oIuuf*r2wDix9e=Grh=!&So?KoPKW<sTQ(
zUMnu^_l@Z!tO-}9qp;E136yJYNWZ=H0YU!{YuZ8S|4H&#310gpvKRjOSIfVVUsq(M
zr{YlZm2;JQm4nI=+R`8X{9o?@yGnA&pv69zvQ)xN0Z~PL-g>Mbzspli>HfGOD#<5<
zmb$83^^J_)f(9~qSu7d)n3Gj9gbXUHg&96moQ~+Pl1aD`Ku9n!5iC0oj>)vNp#zYV
z36De;b{b1^1xPR>9Ycnzq=XEjrxRq<J}1~v$*S{K+o#wYnFS7e?X;mPnaf|RhH%zn
z_XnIcJb5=yfsJY=a+J7vF0I$W>t*&*Ae_`Ls1oXIR$z8dm5d;RRv-dhmA%Our0)-#
zq7pBel%1Vb@A6f;8l1kSET<1Xu(X%fd8^lX+%A9CNM{wyekxs~s33akxcUjf8EyHl
zq1ro}b=f4Y1k42|GtcYsaM{UBh8`YyA&eDabEghc$qX{7u)YHF5l$N8lAh(#^M8gk
zNkZ(5A@a}UeDW)@P`U{>tp0eye!4wPGC$Ob&5p~$Sy&i4v?A<V9g~o2?n=+ET+H^x
zYlmlO_9*0j^?@W0lk1XKI6fP~+cNC87y!%|nnhT+eKdeiwU1otta5wpg;nkVV}R7U
zG(V7jd2@uLIqWVCnw8=8^r&m0xNYebsuGD07FWmQ%W-#lz1W-Aa>{f~Eurq=M#i74
zlvQ;|FGG=Yte$0vO9qb7UeQEZqIFnUkZQYp>mWP>VA<ybn*wTGYVVOv45g~>ivq4q
z0SDHZ8-k=wf#qRuS8268gyPf35}zWk2buyVc&=;x{}$$~Rg7}AIe$sG0Zmop`N_vU
zo2p{yen7VxNFqVl5m%2oYST5U)>%K7-n`l?CZA2y-y6d9)Lg?Ncy+9|nNn+>lS<dB
zusb4SSZnQ6-(~bjdg32qpoeQcoGQZ}diZxFALeX2=V7$bgs9FqQB4S<x!POuL#%zy
zD=tYKJWBshls=H856Ey*fk+>pB6d$bB7uLaOj9-~&~5y0`C}?2E%JD4YUpNBf{nDv
zk?*7F$4k(a^khqCPp6C0`?fy*+qDbTP#<H#vZmq!h_aC<GvKEoC@CYllrr6;Fo`|R
zT877u=a{;C>dJCLQoI555<V{wl=HJ^r_1K4$mMOgMs)>vXtf+8oL*b;VVIm}>a=29
z4*O_Lu8PH+TI~qGNzcqIXCI2>X;3<CHdnK0>-7a2X#Tz8Aac@FU?JK^=2m)x2wPgo
zHvUdN)7%8fN@8tsr~A1lh6ww-#$4{Nsh$Oeg?70H`-dOyS+rA_$#JJZ8_Sp<Xf0y{
zUH=25I}tZY`h)Za=}d-^+2kC={<#g2z7ETsa4smtey~@5Tz(gO!YE}WB7R<oXj?Zb
z2b9;2^WMPCqP2%K)y3_b4GxNG^>7uL&61tK)mm<)Z7h&b&*5Ps^_!~d8Li4oWNf!o
zHEqgu&=FTR^Bj(KOlO|U71yvJ!ZL?c3ufHhjC>QfFR#m<fCBTG4L2uX8@Q>uA?u|2
zV_#|ciuJttNvNON5W|gX!dKu34y&UUu~SR9<tFYQP-jl(>Umhoy6kBvhij`4b+!h4
z0_%dn6q;i-ZI(;*ao>kJ!(PiTFI0n8FJO09H=d$W{v?j+P`xaPX{x-B+UQW_)v|it
zgluZ><wXu7D)B5q0B_o5Sef$!5L&ckbym0V8qX_pZg7hnPUmwEgbQ%1#RvJqZmQfz
zhLsPE&!BGQE(akhKC+jIkonuVC(8Eu)yOHlf;mEnQ&m~5*X36ueDJrIf~kW;1vWd8
zp=!ra6>+@P?W{haM|ok&A?3NMd|nYdH_G|{nUb<c=_lWV>|YO(>DUWsl(FQ0>ci)P
zMIjcvQ7j)T`ifS)AlOjDLnbPwPl)PbSwZJdoT+7rkU3#97{U|eB`Gk3$(Ljb%a&xE
z$aI3m*ACZ;nl1=80T*JGGoXbtv|Lwp*;bFGd*&SFtm&}JG_2_b;Y}%HKy6wK*AM58
ztsYB{emp}k$ERp8SRdX<mA*5R^QeY()1_&=s_~@j6jo_f_X&v{YgHIT3&*S!rhs-6
z)orWNeLL<Ko%^(|X~AP@8r_zRn}#QyqsC2Z3<qeqSBt<6Ei=k^hc(%GrO)LBVg!k%
znUwx_N3su``oEUWMdZI{5XG}ZzD)X^{5NGVVr>2@ArnZ-%xuhLf%*f3z&T^$|CSxH
z(+#O|P|(*va6zf07lyfB`+UYhU2m#`(J)XfjdBC!?~&`l$5XgpTc(Caq{N9P7KTMc
zx3NW@5!gj*YUu8t2R8?X&^4xR>xpGJ@YBf@U!8tbs)h!oga+IEDJzJS&y;*HnK(0k
z17{9l8pB|Pd1x683MkHv5cen!N+A>n(Tv}|k>;?rJ3Vez*g2^-r`Q?vF~7b}mFAi)
zP5o5h4ig&eNU#HO(WHuYZU(@r4yIR*y8+Y7sGL11pEpXJ4P5pJnL$1>6b5{p#SWY6
z*fcFFaW*l7Z43sTY85Vf6>=T1<}{@|ETwEnV5EnRnd|m>aP+HlQVA+%TQv*))@fbJ
zQ^u$;mg$5Q#yt%?3ICr_@c);;lrNGq$WO=|={;$eG)hDM*G1H>(h@>r0huV@D4q}s
z=VC0~o0NoK<kxBq-GD4LQL7>fja6r5{SvIVPaN+^V2=`*rG-D@b||y<Y14g{M`WnE
zD6eIPei<*Eb7Gt!J2|<!aB+lmmGVhHbL|{2SK(mcbsRw}m6<Ohfvk74@-kWA1%DWT
zr!3CM0c=Q1UC?FI<OIu@2_B3-TUpF_ezP(APf#<?rvEf_0MY0!fTE5pG;c_fN|hwf
z8|VCqPJ#Iaulh~(UKQc<scp>=bM>8`|E7(NvDk6!_VNo4p_$|8KW$S7g}0!C$H=SG
zszzV4G3TG^5utwiZ%hz$htGpRl~5ZklclD|MbY1q4*aP(>7t|bKSR!!a8d}!H_C4*
zeUvg~xAKH$_5bkmhaNENfo#P^4262R(0B!$e)xNUtS)uIS&GR4mW)%J$v#-@b9sVQ
zjIAk|4WVbU_Ync05|**S)>AHH`zZZ&O;GBRe(r`HG3D&a>KNf)J3~1)**9e_AA$ft
zmIgj%u@jcaNYO{@E1jwYlYUFLYjCu*O6E&IKdhauG$s3xeo(|znPtvOpSxNZ168I_
zC;fD;$LnJj*GnN`pmi?mru33JOGTjnkoK)phLKg$%lMh*pU{bs6R@TBvdT!Az!1RD
z10C)QLP*W5Jt*CBBbx$cY(=`y?MYvmJz@vj-)7ybJ-mgaNLS#~Mb0<h;uG<)5|UU+
zP-Z;DU14YKyH-nPNTdsJAo2`zo+A+lGYOBG=qCmCWJ{zIO`J{LaZN}`A_^@0&!XyT
z;pXD?c!NH_y4~>h=A5UKl9y0Uq%%5U38t2*b}$7D90~8xQ<$@k9tjiiq!U`*newZf
zPviK{+IPBU=rH?Fj$Z+uNCq|k9+B!mCZM2hPxzU_pt&P9Dh9AnBqx;U&`JJuvcQ#*
z1AL|2r&T9&`~NkPa)YuA**7kfdrND`y<`#%33RM~)<$|T(=u~DW+_c;$^^vzfRgaz
zsWYn>#(N(6hbgzXA(Bb+3ePZ~TJc3X@?6+ks_gk5I8VU-6FMa>TEE!jf#chC0tKz{
z*SV3NnAD0qJH?vmPDZUay(~0(jXgi;6ESQqHhnauuu{~%Lo++ij+~OjDm<atG}enB
z^o^~Ki{pQd<w<=P?0M)KO%*kflc|i&B1S=O(R@cftSsCO-WsUcpfu%T5Ot5y-Q@$B
z%^U3K-qX~yHgXa@^o=p^Nm>)Mv3`3=&_}HY=px^vxv}sMOpJ%}&(oB@KGL0@C@e;b
zmXCkfRN(4MMIzLuCLfjxye88}tBVTxn%cKrQ|H1+x31Dm($jq2qfiC^r0=E{vofrX
zgR3Ja(kxbk&3h<uH&{lEI~eZRw#9#IDn1do_SfJ_`Tx#jHS#-<hu{OaU4BE!RjxbM
zmH)%{=mB%*Z3`bxBWG!<$w>5E=8mV|Rj8ptWAR~{HBj+CmmyH5l*tfS6}B#wYG`h|
zR6%9&i=7Q{BSy;P0Mcet8-C^zP0T|Yq}dGWc)h~wscxi!7+Bfe&Nht&kY?F*V3=qS
zs?mVYUFYIs@cmjfG^1TQh#D}#4ie!f;67i)(Lb@>(5EUUgdXH-IBNgTD>#9!f4hWK
zK`%&elarwRUxEA|m%|R|Ao70xL+&b{CKo{e-z;Ab3xL1MpDI0+9Hm5YOZQ2aDLW7+
zq)B;Dc~SX1?G?{MncbL^%?$9Uj~P7><@)OVwn1FuiD%4eOY2~7>&~_H^tpbys7HCW
z#MaGE-OWSbB|lK8yLkA%M2<}jk5}b&avGea+RRnudrXOkdJ)&>8&XU4$K23COXbub
z@s2TLSkz0o()r>%#M%(~fNv1D3J~Q(*uq`U8+q~khI3${DqLyQ%Xys_FNOn!55n+<
z8qOVE!<%yPVxO}K55%E$sjE6z<KkrIXCqZ;jMR&ly0QupZjU*wP`e?d%d4qHNOPp`
zWhOW372J*jFH*l>sD!CY4Wm@oCOp9`ZFzFt=_&$HqVPCQkxk`z+^^z#^91Hby@adV
zFNOi}2B9HQe=Zth%5|wf;id$PFPjT9TIgG<1NQO;INS2p{*)V=T)fQP$V9JYl}_Yt
zX05oI&*_WtHhPNIv9JM(4)*Ly@eDc}oOuhHsFDB*dG_owuED4CnJ&{7Cw=v%)`?CH
z2pQHswoVY`Q9Z~<>?TcA26Zo=TDY$dWT5WruFCyn^(G!TLOsCs|Fe*TPP&U^lI!JD
z<cnbYzcsb>+z{!-oPN!DllXCS7&ZQ4gPS=|ZWFxkB^q|6BGQ|N(jAdvg^5!<amMG&
zJzrFEv!;?zmq;J*_dVp26st)(^OLTP{I3pEWJ=zd(pQ5_L!@syU2HV>j3(shz8{Fz
zYc(ZJk$y~UF*C)+(^+Y_QcTy-><@E9V;5-}8zPbZsJx3@m}2Ge(@VE4SZ*3KgIBT+
zn6>Y54HBNnfFv$U@wGY(HUfjqq3n|lyt;d}{>$e^2BvkGG~bBL_voCf?h>PYp{B81
z|9=4a4yCV17Fh-F{|CsI$O5ob{uQ!s7AZmHmelrw|FO4B71h*J#T#g9bUBb37bkG2
zQ`u(R>08sh^R1thP+0*~%O&0ziR|?0SY@>_tJnG&f*SEUK1u<tr7jPs<pwv8A=~N8
zEM;x7^5Hte2~npHO=I4-Vnf&F3TUR?0ec}#)+n{<^iNY~*SPO|a1{_(ePHU$+xmWa
zz}x8NMgadZ53SbvzSC0?tathX>&~5$T{W?K%ET#IITM|evnIMGP0VsSCsk)nn_O8@
zU0Iz|ojuXHWu3?At8r1kfleQHMDhN5%81b7Kbxe~CmVto@~vNekwO<$xA;DE`pPs7
z1i~cK2>pV|g1riyk8*2V<dHMg(0F6KOg?dl`(EUO$0TSeDr*8%#>4GXMzG019_^-_
z2>+jv$e~Jlk_*Ylu=c%E3DX;ie=dlej$NuVGrKa8BwHM)64@FZqcd*fz&><;Dprm@
zW-9HgjtolT+L^E|Yx!6$V_SLuowUl5cP728*%Hr*oJz&7j#NpIj+@mpxYIXm7W?l;
zU1fvQuPmNH7L~=_n)@X)7+f%GpEk<rSrI!6#*t#n;yLGdHhR**Cq!%ZYFe`<GK9*i
zEcEvYV-$BNxw!TJS!cc=iq{I()<jNAr}(&IP~4HI_x3ex;5YnD(qNAne_rCOKQ6y6
zq_qSiL(w!c!)B_eF<D-U$$d$>-2Tm8+ET2lBc`j0(*Lefv4p=jN#B#R$z!1X=gWUV
z6p%|PUg`W<p@tmBo0JKThz_Vb{X3X}e2KeiBkZ4<3}@0xH8i0e%B2#h@<yNAPc@9J
z<kQ+BqBFpl%ALw85uFJxbv5=vCv2Q~Y&e^}E%Gyi8mOFu5_6&Z74a;1D~6eq#I*XI
z1v9LKrwkO@g`3>4(`KDC*gTkNTE$ZufDhn243#1;dTKirO%KN_T(!P>=vM-~=+oDz
zp=s?fX{enoJR$-v#P4thYI)&P+9LGRk1D&vPW!P;VXVVP)TyBr$BsG+ml!Ws8;S5^
z0bh_>TRJ_XcuOYJ^S??qOJp;0ecYoUoAM8Tj!zGSx<`hAr5eG)avvj0rH#x9`A%Y}
z&fb5x>t;a<_L<Ux&}ot3z^F`~0?pMhV^?1DC7&p}(qhE7bzQ8`y@nw~$zPkw7>(Zl
z+1;E*Z_1)egZ)3$KQaPXE@VlE+8s-_mDf6}yc<Py&%Ml9y)5n)`Nfn+Id=d2MvvXt
z$VgzfR?h8+KICr1ZVwfnQgT2eFS3QK?iF5H2G7X;zg)ubJ+k079lo6Ymm)8h^Z@Bg
zg5-I49PgIj$I1W3^w)t$4XsRf=VFM{#^kn$HXXXKwu#S~2l<h<?C=(qA#_kfc6Ro7
zR`{nKQ#gw^tp25A3ZK9*f2U&#pTr7(t78hE%nE<CV+x<b3jce@6h4&|{$<A$K8+Rr
zL5CDRKARQ(Hl_bI=~hWuCEp;c<V^hczw%FLY{Y?m)k&2>W??4UOq*IXE?F$>b2SYb
zLVfR97wxrrI^`NhRpsv%Xk%B5jEn=mE9IFTK?f)=4S^nx8Gbv<7tlhiOrFTAOQ$g!
za6l5-f)gofR)<kk#^jbYx)2n|CrFj<7J1FroniOpHA3MNkKM$`SYYR3Q9#<8-Y1DE
zzSsIW`C=TiQY$%9{BIp)1vfPYcy|mpHJ+;W><gS5D{$(pYwcO1+vMsCR+LV^^A-9}
zhb5)|8PaMAe_tf?$h|oIUyT^xX`lTKHjPbcXnoquK!T(YOr&0g>1YY%GS69$kV`Bs
zf(Xt?nMCywzZ$CPkcugC^PC1OmioJM)KGbc)Ja*sc<xi(?^Q$VI;1Lk))gGOpSeo1
z?)>dWHG~YGur%KYm58Gnf&ssyB<Ocn#$wAGC4ER?9QpB=ny9q~8-OwxhIg#qUpJ^=
zqdTHrYELyc7=YPgX^X%>eIS&fZZ(OGk_KThn6GTD=DB?c834gP&CfWp(dUBCQqb>d
zvIiTS8!)AuFn;G}a`oZ1od0#FF9Sppa~d$>_8Ut7JHf?QDV6V#Gl>uX{gc63j@=6N
zjZDO*HlD@)I`%`W9!Yv~)!*&4_Q~@Yp|w&FgoZ{Y0k@Sb2KliQ3OyG53_B08rF^ib
z71V4WJHaO2BySAs!RXokzX{XfczSkfWCGA!)J|y9$=t%BII^jbv*l;(XsEwQKA*?D
z@k;hTe!Gq)gfb&Jz_3sr)e*c46*EqmGGSs2xrE>3`FEdTJ$GcrLOoumM#gts&(V%d
z97Y_f^*70@ClBWs&O1ks;kZaPFkC0+cSO%oA+SjflD!rQO609iPv;nyj@MyK>3@I9
z^xrByCLMtWpf5Rtl#u|rg8Z5sB45kB<mqyyycOAhe-Hb=|0pAr1&9i;O}SlpGPWrk
z56I1@j0Qyg6}OTy7A2`S$G+4r0`*>QcBU8csJHOgDOTO8-p!M@?q&Q)>x{mKTafK#
zJF*dz{>#%;Iajul*r>PiKstL_ARRqPzD?k*W2DtPdBC3}e5-ng=rUtA@)z9Z&hp@+
z-o>r{_GM>}qhft0P5z`!n==mKD%FR0TlTTF#Ij%0oV+pXU-f=IK1SQ9dLQq~eQZ}V
z>dHrBA5*cNX50HcAHsbWD?@#dXJ6izl%?cDwvUae2?xl>WFM0-B{FQW4lv=b_>k>O
z#t!iz+s95MdhUgXR@#>~uR+)U5BY!7-@#b^)SYTGgL~AA1pJYJKW6Y^^%4PpBH*P0
zUMAq>0$w5Dl>+`$z^eqjTEL$Pc#VM93V5A>KNs+N0dHXNM)f8E4+?mcLtA$N2Qhe)
zx>vw`0v=#+uX?k9w+MKvfVT;FyMVtC@D2g*6!4b<-X-AO0{%+Cdj!0f!F}p|0{&XS
z-w1fWfWH;+cLF{j;DZ7_B;dmW{$9XG1bkG${R|#Z9~1Bo0zNL_69PUd;2#BiO29t}
z__Tn}FnCaXR=`67J}2Pw0=^*NivqqR;L8I3L%@Fu_?3WP3;2zI{}S+90sqb5%j%y6
zd_};&2>7aie--dG%Kyu9M3N)Q`1Du74`2My1MSoUq0=Lyz&e++=vT*ndea<>j7hHv
ze?=}^!z_?W_CG6PJjWm37Dh&&AZ;bGiwdHR<1fefA%kR?TDgb@&je<wg`t7Lo<=ZD
z8LPdCte5rMw#(@epcsPc#As?<{(q^Y<jXgZugH9<JtTj}I3+^kBhxVzYT8MMYIKk{
zm*iRSc;xNuUF;yW|GuHRgH&i#WEwmA(dcc*K7WmnHlD=$j1LLqr$znwsc+_=^~jEl
zOy$VJ6tH8Er4w7v?VFqe@~h9{xX$XX$8}I-3UFN^k8c;vk3q*8$i?>Q?@ed+qQ%Nh
zuWMC3(;}0BptqeA6b1+;IT|E6I*|AJvEW-J``>*-*SlQ)e^8PRlEEZQK1Yz#KPcmr
zD~@pq{||k>SPcz1R*^AJ8(hT1qkrn~Jgj-#-r$*zuZY_oJk=g)fOVOb<1@>`@`&}_
z)5oDE-loSpyz`29lm5{074a55(eV{=Ymp~8{a-67%jN6HTSS%Cw&T);M1D4Q#*UQ8
z8wh^(F^jDhc8JND<<tBsr!b4B==Q+S>c}jxbUj#pkq)7T>5662mE*|nm&3eyuU({X
z-qgrUjDnv!>9zyMYCxY78Bq=Cq^xREDWQ$!*`mZXkv$Dfh@1i3-R&e$H^SXQs%|Aa
zlmmCpWL<v1CSvNw9}<Q~W&rKAEbvmt%qYrV>BNA>(!t6_r}N1%Wsq)iF#1n2BvMCS
zL=Mnq`CXEs%vY{&$6et6i=x^TN<;6I%@uIWHj|n&!utyPUasl-w&VA7Zlw3ed8SD|
zEDomnwx|c&M8Wk1ITH5=jV&kLA6{CghGwVDxEa+%mql3+`LZ_$X#{;?7xi3Q96gL|
zMVYd9ZY^?K+6&;g>2FbE{G%<-FNQTxiZ(GjYdoJd|7?qMhhe#NpDS-*_CnOyfEWKF
z*Z=pIlwA48<YTEn$(Mf07wmbFd~9L8<bF8M9<!#Oag5OIGbooG_$S?v;F$EdxiR|i
zNFnN9BF{DVR<oGS8aaz4$11qH1EM&Zp)H=F<&RhFs^&QFy;Xbu8y+b*UYJf~thFho
z>~Zd?lQ^aW=V&n<9LWQwFjVR=83kRF3ED5cLX6z8d@H9%lb_Skqfk~P7bsS?lij2d
z!KaE~BW0qgno%x!dn!YC|NF8Y;Te%RKzO~pu*3S4T1e1M)5P8_nf6i+y!tPW{zv6H
z^!fUqAR+qS?XpCcOLs^Uk`U|-k%egR5V=qLElhseKEOcMeau^-Sh+c>oxZ~(3sCd%
z*b?&iIm~RK@y9cE-oh7}5vKEx6Q)I+=$m26A1@gqb4;5@>-%)x@xqiJIZZKTkMlFc
zN#M$N^q9^)UYJ^sei3_|U;Sg=r+Q3BMv8!GnN<qub|PIcmb0V?;`yoBt2wT_Pu27)
zxBt0UlJ1ormEI-Y$V5Z}43S&NGl&AxPtKE_u>HA7egGc91hzl<ic@J)u2UXRURK^t
zvQKo>W1cdJZx-sGc<L&%Nfi^XC3%Z?;#1rb!>p_p!B(=@cxjJY*BKKjC3%aN^+b}l
zgfJ(`Tby}#EXiBq5W&rR4kl;axpm7yo&rtJd2<t<gXWAg56N|q+4vYAoVcCUK_=FT
z<BYjM%t2<~qi1ZnWzWGD%brpv;*Yz;iL4q4eK`aCEbonj%(5rn<F2mu(|6_~Ac(us
zi(Dwo7Wv=Y&gdX#teqZk{@#F-Kl@h<52~Kw5f1B|^^Mj1=?gqa*Fh%2FK=i$FB}r}
zGIJhE+!5drS#D6Z6S*g2?D;pMUM4@HQTyWTvcKkm$PSLD{7f#*O6GHM=V$eK9^~tw
z2=eu^cvExmLcA08D^C9l82y(D$Wc-+J(upnMZBz1>~}qw-)Q<r1^qEjr4d5(w}<}p
z8Rl+*bHgj<=Z3zKB|v7jJgrTtEq$#HlbLNY<468xDBWsH_WxzSj@b&G5Lpb|#xs}S
z^u<C3xM`=AcAk;Xr~jFub0mMV9-YyVML=hXOp|`J3p&YGTe9VN{_9t9Y!^4{u^k>M
zVc2&3flyElGeW>0=Y7w8zm$Q~H8eFeGExjoj}QIlnh7&h1<mT${Vh)acRi)SmD2yN
z(peJzwuAq#cIW6A*F{bf|JE^ub5i<A#}v*f@LxNoa89^C?3lv2i|!j8Q#g0geXU~(
z=PtT`?wG>4i|*?kQg{w`(fy)h3g`RAN1Xm|k`#~poIIICrA^Xz+Ev^UzY*ziIrhlG
zZ4@sWkV3)i2&U(RyFdGgZ+RBMkHEOB020$IbB+nyb^}{3QzRTbmcV#E^<IwuwLxN5
zImOE5FKc#UP>pg%HQJ`8Ge9OO@1B&qw>{7LP<~I<sO9=ZmI2q9ZHyFRgsY)=+L*bQ
zkDRcSu?hR1GB9oG6DezF)C?K>gUswo%kRsVs<jNYBNP9j=U`5bECp&)<nisrZyE6Z
z2IqmXeOdI+k|T?Mp~H#Oe~%=2q(743WE*)yo+)1?e~m0)SGD)L@0g8@6YTdprf^QM
zKkk^qIl(^MF@<x2{a(iu&I$Hs9aA{pHDBqN!a2eIyiF+w47M$!BXyCA<c(?iEwgi6
ze6TLtAeTyG9Hr-Wtt&>OdX2AvI%nC2Qu^On8YU@z`5k#Bd78|Y?!nK*KcJImVdLsB
zI>`qmMkm>?^#k7J<a^9FS~}S!vbH0U;irojGVGV{*UaU!Sed33pQ2~hbR;r-p~aA4
zzXIJvB(HOd^gXk>Baz{oVGJ4e%QvepAEw(L(<8I01Chz*`<p<9|8jK=aAa;jO^?jV
zjzlJ5&SbM+YbJ;z_mv~{$eh`M$mAq&o%~n*w{P>F+4#5y8P5M-5?lXwkipU=iHrYu
z|H6{0>cH;FPFPa>*Q#q?;oY<Q98LECnaYkthO+>%S<HS_JaYy|=BiJ$$c&0q0GX9m
z(eW+xN(SUBl{jlJ$BN`i=+-E0RPl7e_!l{{l1Gbdmx!|idu}{Gzs5Er_N(!o$2l_B
zPt_xHc1I$Uuo;bKzx+LgBJ(`0$PII9T?ZnQlQ5_Fuk|;U^PX97gQjOvrT=vui1GLY
zjQOu%SslmtmLnRB(S7H1ATrqr%n1K==5QfPsCq+>jJpGo$>E0^G0XWce|C`fOfalR
zrnV!INtoq1>{nx-D>yPb!h&I{=}2S}NNx^i(;C^?yI3(|Myfjyne2pN;=d}MKfrs&
zh#7HpATlDdUu<V&Ld3d94{~I#{iSBk(DQ#631NR1BLc`*q?)`W7s&T2rzsb=jqbO_
z3{rn;NjRr~%-DvPsG$MJej4KR&Ni|wA+(IJM7l_SED9FP2FGV-#bch8$CdoHF>MKD
z)rR`=3n)#tO*~H3iPnuhUe&QhZp%Ji)v-lwn{d3UW9KQ`_~TU_qq(*$y8gRKyCnSm
zmbl3)@?^PO4$F_opDP2EVr7fc4tao6+)0jC%h>_ImUFzSW5+SusN+=~V_$5J_K8q0
z&Ii><9vHB<<h!wrJ5@2Y)~|AP8*G~TsLWaAa^%;#kc6R@<)tY=k_RLu>Ne6enGySB
zo)dW$5MT&dPLS-@XD^05H~Vf}wo++E7El#(%g+zMq9)(x=K1csjT)_(#@5FN3tXFB
z6)u*Pu-hclL`e*%g)}EI>~)Goiob5dt#K(v&QPGT49QQuUWWXLS;_?#$kRsJ(Sou7
zy1#~H6m&LFJ0YISx!d@B6$yDvB!p;7sf%SZ_Ves)xqjB+Fd~BQ!m?O*oR%v8@9RL0
zMJPIBTrT5SHvH>i&avn$7QtAq??_}4`2QUCYtYfx7&7wrI#Z7>k;aZhCP7${!+tfE
z3L~f+uF~*w=oxPZA|pbhi(%rw0(TAL!*tUfdSn_p5Sj4_EI0qPesK{;rg)wnnfeYy
zCMQ8M%76KfjOEDGP1Ymh=}2S}BqKTOm+zBTIWl+uT7wLw|3jr`B>X)heN9dzL&#*Z
z5P5)tBucI$`^X>3>#zjQfNx-qJXc;Lua|eqSIc+He~@2AHeglhr{pP>$OL?=azJ@2
zMM~dMukkdn2@_QPH1Q@sHvT2?CZ9|1B;MpgiMJAO@+0u8i8uKo{d?j~E`|Lv@h0C}
zK1jG3i^QIIlMmvXi8nd&e@nc{k^dy|CZCXhO}xol^kL#n-l8`WZ}JwsmUxr5=+B8a
zd5d08xEV8CNxaEh^ikqX-lBICZ}JwspLmnE=;OqjyhVo-Z}Jwsmw1!6=(EI|yhX1h
z-sCO%oZCMiO|+o^@vZmTm%A$w9vS%#sRpepH*h}6tVA`>neFg*+`#!Lvw${Evd*Im
z9%UxbCOOi%3GY#61FcDM&XYnPWp>a;8OnJ&;G@hoQ<q?z%m3F?`Tz5BA-R_fl-76D
z@?_<PMnpDY_bZX-w#i@0K!|N^LVeKkvHbEE14^fy{44rTXB!df8QI7->Iv<JD)&cA
zu;V^xVBAe^T*Slm?|+Uby>Y}lmv@hB09xFPWJua+dJKBdK#P4)f6sQ_w~UCu8c0J#
zz<30Kk)w?PgAFj!*!pX1|K)*KPb{5QR7L;kM{Q6f0A%vp=s{?N3>`Hir(aXA23b-r
zqJ34e|4V}~#$6(QHm!!W$$`!QL2*nI8Ep8j7Ndgf*E%1|K3uHmbV`)|cP3R5sUm-p
ze<Xh*k5uL=H+AR^@PDrGY8Bg^$vKS&&P~m@Fo};!dl}3aI=Qr08!UHY^_zC{b~m)y
zd%--7ZcNFU+DI_jY`iy5d-c5mEl|I1FJmPGYr*F^{V$aixBR#~Kq^Hlz`wSAfr1d6
zhpnxxo<P(FG?9g3o<REBnOR|$#1)=Emz#S64Tzi%WOC&hZ6e?LS{-IAmKpCw{&3>o
z7#TQHILC-iZ8-)yWrQ9Lev#OJ+zHK;IhDJf(zSH@ZT;y#J%S@5=K{fY<kYM;Fl!$?
z`LT~!&<Nz(>7qw<aAY%3EtF@sX{ZfIs<}I&xu>GME$b6b_3t%^6VNl#1Qe&WG3|p9
zitJvZGoq1)BKf21*Bq@o*64bU(*F$UFOu{ZQcQj?50I<n7nSMCwQb)6{!6~}sYn@>
zF3~kuREZ`sG&abjti&~zCG=pOk7t!!7iMb{X)tJIVvCqd`F|Fui2jmp53(e}0i^Wt
z+6%l$hYYV<zpZ<{8d}{hMQQ9=b2T-w6M4V3SkAK3v9>tw`l-Fk_EcMDTQWPF)I!e}
zrNK&%3%P+%o3pZx*D;_?VT+80fXAg`$=4TE+Y2|iJ-mj#oc`xXidQ})kCAea0q8f@
zD>y`=GB&cddhQrZKEA}%qa2b^<UYDxfwo_1PTQwMRUlC#m$m5(Wr{>hnU4XXD_u`d
zseWCKF^d*2$zOVSBQCjIdsv<nRe-unUeYnB8*WiNU`Y$+7VpejJ;My~AyERv=e98{
zv%WL=q%;(GsTRU8c~NEsqi08Qx9I3uXh2i~lI_X#(W3;5CTTB0x-fTxh#YW~IRNP&
z$bCBR<>*a4U5{S3$OS+TvYR#qGdAc$gPr@R{@$qD_@Lf+k7hP9`cDw~rvlV}C^Y|H
z5E;Hdd#(3?|4mQZ6nf5ZkJS+hx>*ct)6vkde6}C0aIqXveEUAR9f=UD5_)Ej-=0sS
zUx>`owv(#V(EN5H-ZUy(9>^OagWL0AQ{eLoI@F_0p$3h6iL%AHP|G8ME3JnLGV_oZ
zQqa_%XRFv9+Jmie#BBiiz5@^PeZkg$i5eQ(J{53+XzR5~4NYp#5*>65n5kHAO8;%r
zWs)*izKFa;rsBW<^M68vqg}8|w)Hq?uuGaMUqEOm_hqD)A&0A(roH6I858sydB11|
zP(+xKHk~+)P^9yAanRT3L8Lcuf+Cj7Q6`Sl-Iv!r)s<11{YS6RBR4798OR-97DJqZ
zV$6{ti^1P1?>k*kqYWBr6q*$6blef=;XIP?MofE|x9$)_Tz*RD?Jy~7JMM_{IAqp{
z^LG}HQF)JFtaV1>{C^pZ|8t)_kTgqW(%+A90|<4Cc1K_IVsf|i!vPs>>P!r1^q}WY
z-npB%?C4GAhlRn>lYr3NHfn^7>g7p@a}CI4cYemxKaroDzNU2A+H(3&zhZkty8%V;
zh3&ST&^WRQnqq8qx_k2OUd%G2<jAzJ9;sf@6M@tWmh3hC_&`Q`9PLYu4jO0~+?BT}
zgbr-UkvT<r#0Er90AlUQ<WtTB=}NqeU7(S+7=s1ej31B-U-$(_Z^G~N=#7ka1$t#|
z47hI8ZwYyUH0(VMpq$)JVIW^7H{O#N$$`uN?vbQ>NPlu6`Aja8A5k3b@B4p@drI8r
zH7auFrpv!+!T}dhNqI|#0DcZ_`N>EA-Zn{*lGH=jUqW=;TiW7@z~*ENx=50)X$_q~
zCV67-u28{NwR7*$<r|m()T6>hv7M`+{c04m_m^!kt4`K`lo2yd@_B2!q<Pm27nLs<
z<aq6X`N!0jWsNRZOZMtJWvr|drBS$M+^F24ER;Wh44^OBOX|sV>3ivbRLdUH^_OwY
zbY-K-z*c&FjfidNcN8I|`7*wXE_J#aD!d!1sq>&Fe17S2HI$X?`vPynhyVmFu$3<L
zLYV~_vft&mk7Q=wdETlf98T#Q3tg_pQLN}v6djrj`K9rcYrzbjIn?smi-RZr!#;gL
zg58t3<$24edF~o}zB|xlFQtb{Kl}C>Ng|<f%DQCL=6YOB&RX`#?f9f&0yM40m{Qw#
zw0V)Q3Sx6#Q>&4?1K-uRWumvig{X*G&)G(!%H?gzL$9xrskFJ6Y^l4k(d8TIZtw?u
z!FpFi!0F*R?`@}|K6m^0EHFd7csDFADj9+rYT6`=VQMxA5n4T;9YQI@4Q{yeq53W=
zII}}45WdcDq5|I{6_R(8`IC+<iIBO!OzD4r=@topAD7;d{z*<o{_h%c33-UTC-;Om
z&<c42?0xT(UzWd71}ig_Rf=2LtX!`=si48f?GFz!YjPI0WyDM%jYYLKiN`|~3I>}j
zj43sI6r^?Pf5xcbfLe}J*qP1M0P1K}Uefxm;el72Ejy+1Dp%<#DZCm}IHvNdP!#f4
zyC<5n>I9b5ptT>fMzwWk>qz$oHEFeFGMiVtVyd`e<AoP!Y+3`Y6H73T$CMuuBDzv%
zy~_^W)Ld^BU$CdJgxYwCvNMTN&sg>BWTro9*-m06xA>H@4aV|D7Q-2DBoP*}*uHqJ
zbz;R!`j};{t-G$1nB14mIa~Lb4DVzWCiJ#mt&%s6L9bR_l3_7@_-lg_2QFcIV{v?V
zhYvE_{Q9bLmTViu2CT$gwGnPtY$PYq_5VZu@AUUEkw5u$0S^oKhJbGhctpUr1pK>z
zZwvU2fbR<Uo`CNQ_<?{Q3iy$L9}D=2fS(HZnSh@Q_=SL9GI&(|PQdR4{11mVNkAf?
zEMSI!T?FhZ;0XerC}1}VZL&=fP!-T7U?%}PGuYjBl7J@**h9cm1nenbrhvT!>?>eD
z0s9L$K)`_v_OkUBun&WSY^Mr1SU|ggLj*icz@Y-3F5oZ$hYL7Dz>xw@5^%DBQv{sK
z;7Hpj0Y?isM!>NGW(hb>K!<?Y0*)6jN5BaJPGoSJZMuLn7(Bx^lfhZG*#gdCFxQqR
zV7`C_3>MmoxcqOnq|{OSKjM-8Ak9u=HH747FNivZ%Kf0sZXa2nV6Iwr&cV&e1$;xJ
znZROU8#U96jA$%LtV};FNF#Y}bQY5f?SH~Ro;D`hlgWkVw@JunjHWdKOG4n}vIpMh
zVyptaX;^4P^c0}GNG@zgbgd}9B|ji{8OR*!N{-CV&`aEgM0)_$`E9iSGwxYa=E0n=
zAV2!eExbSTa`i~|h@K22r?oNrk};Ax=19*kk;<o-v24lyr}cA^um4Gs(uDOtf&`^k
zq)AEFKlF10(318QsGISUrd%dD`coF~sbv3y|I&AMzi5A;nA^q(wZ@%o$ORfRhvfM;
zui`VIXow!UanXK2ZZ(b%ZOO=Kj9h|<SjS6JCNUN6e-uT!SUGcgqL>(FHGP3`ejC-D
z#uytP4onUW%1dQUtV8!da<{%i9nn5O&)LR|JBH|qGky~OJPH3U&)Us9^rmX9s#A&f
z2FjD<L2WVvvqHJ$jL~x1kPrQvqhV<Oqsr$?^7-<9rMGfr(zXA?3qSNgyY+xo1PfDX
zR)UU2y{SwMjYwM}mQaRPgQD&YN$OV8zJ+Qmms`{~_ThGxFuB_6!+#)NrZ&v#?H!@z
zqI!pUE{}&s5D`gff5quP_5YDd<$L5_u>bvY+lMz~iw?r3){Qwiq<tLF$&RVoUw3n0
z=^Ll=&FttG<|_X_(IG%&M%(C>u1<a$NRYZP@rjAN1?kgRB#M$FMPKV_)!?WdsO7iq
zuwsB3Qz|0)lN09lHTFVhjmO2)-a_7E`b^Gvc^fCEul-t&V!!BMpg6N_o>K-WGHO)`
zJr0C@g_~mOt$?5L19@mMv+5{0GU?xX<R(N<1#&Co^0pjH^vI>8pBR+NTjc&9_h5Z`
zWO}_G?VizrKzp`4sZEx@hV)*?<x#<-p*V8lPQGN$)CRDj^1qX%4HEv|C%s8dAdAUQ
zkO}-0c^SNcpOU{*CMdPaZYAxUVAgwxb>O2?ZvbZ2P`M%8QN9;q;XGGhqs!G`FK4Q^
zZdqd#Qw1}0Xp5abC)_xBfT)S16r{T~j-pQAg`u5?mufFiLtU(1^*Eb6Zm1Ax^e613
z%&rs(*=P(XdTU($gkZO^d1}aJS%}N&cOh9@Llx`~>}6=3x4}i@TD63<8a+o1nbIDh
zY*Iawb5onnZbN1&TP#p8`<@36>^31+4JmE-yokmKWA$g7tBI+K)1-b%_PXV??NfjC
zhHk^GgN~Kedoio*i=cmWB6tVY$95Y!NvXGJDIMT4%)0;`<YmqZ5w&Z~M99j_XH-jk
zG8(#TA+@5WRh>RmF|(nLX_*I&wwQpimmInF63iJyV{<p~Oo1M#-R&zejk#L-P%0|v
z$^gwnNcHl+=k&iyLQgy)=a5~}f21nwwVVFaP@m`sY<=xUjM*L@uTkc@j6uft$-{p<
zgYU{S`{{S(jOcKn=8&`6athNElLQul?#6?(cSz~&Y%7+Zovb|(4vh{2E_2%^Z`0$#
z6lZi27r~yugT2NRWaBP47b-b2c`7e^j78EfIiP;8@3J1z(}CuswmGsIph+c|D_pg{
zdU)4xqh~M%`kQj67es2EMGieur$vVXsfF_Vwn$VAkV=rIB#a@Iq$E?v@zCEGVvQ8#
zr08kDazfjzJPoj<5|r{rL{n_>))>T8t_k<#RrjCE7r^2Jx{m9nTnPLBagsDnej0W^
zmD1f->-&P}NZ>!9ZArWI_zT@A)(8!xYkTX)r#P2#^ec15-Vq%O6xPZm?X_T&#PAim
z_K`vk1TDWd$}fLo^UvPl>-ydP+I2lXItD1OlNTK)lw)CsEpQgExcWTCk$(SvEz;T1
z(Y&9*Wv3lv$ZV)%?v+Np$PJGyaOS2-($&)&InHl3=y4u(d~s&Mb!=8Rvp1xlzj_kK
z`5kRmbF8)ttyWw|KcoDA52;?l-=9k_kj^BZTtMz5f0Kvc1Q3$<$w!o)$^x7K9&ZOs
z%vm%fTVB}U4LBD2T%I7<>j~qsDSy)INGhLr{efCnz+K5Wpk7azTiCVK;%};~_4>V)
zZYK-%+Uu1W(0>^7bS>WmJz(5nph9V8iL<80%MAg0J(KFUI41zlgm3p{DQlC~>x1PX
z>x_5I1JcH@EUQFRS}*4Xd);FpUTgh;3J&Ze^Rmhy6|y7JZ@qmvyz=Z5m~~~ZyOIw;
zSsi%MW$wy4q@Si^_N%dqnX`XOtqsBIYWDKIDU{#nh9h6Vz9`7ce=vEcl?6T3LB{0w
zdeJ;8Zwod-U$wJRu<E^DGPfm-eL!RQx_quG$nKVTeT<Xtb-?1>)bbsMKaZXv5zH52
z5PtxMt;OyQF5cA#rzycClY!2?!~$3+KAPH>^MEs!i9NRg^RS+M`4C<I{iJIo{Cz}v
zo7fQlb0%3$HbaE<BKepcm50lV<W2JRkOh2+h~R}vgK~xPi1Lc^K|AaR$%^2XXckf|
zo1I&d4YK5QhcWX&Q)!cJFw3%z=Ts^TI`0j*f>=U~Po5fkre{cPr*rGDLCiXAMXfvF
zvKP3Vfm;6M6k(FZXrcbJGGeSMm%}8B1;mPHFpbP(C&yl<O49hUj9xxf7<<JR%A7ri
zbCa|fyESr@im|n#UNJ^u3=4*7^=2&dK++clJ2f`>i`;NAJNb(&T&QhA@)ubMQQP?B
zFN)as$zK%4(#c<B;YV#b$zS9g#i-;jvM{AKM;}!lgE7=aXz!uQgJs(^n7Hz2;kFsQ
zRCxsMEb|4a{K><%U)ywg{<nejE5-5yat2w3|Nd9~31vseA77r1&k`%1j=dpW`_s$J
z`Oxg+i!)y<Ryeaaq@NeO#BqK(s^y&>Q3uEQI2}@o_yo4XnZ2?3{%#!QH*~q#x<$tU
z<r(src12mcl(cJ$tmOu2veB6->-dg4->9tmki8*Y@nH_{#J^Q(#+|SK>*)HwlDtip
zOV|B(E&mD8$>`GdQ}$3DXgpywBA_YJWO7rcllE!J{;!_XNmW88L?;1lh!xvMN2Rmd
z)>(3s>EEql=p325M~{vpI+0Jzc3mmvA`!t3SWHa*#>CT^60+EEEloJSYl*WF7AP07
zH>B$;Zslv~y|XoI3A8Hb_~Ojj3M-u18`5=EOdpMYuF&92`TrAW(2vWczmYDa3{ij;
zWB|Kf=?Y%|e<}{}Ts3r($w>&ho2J+)oN7HB8(p4Csw0F7jb?^vaBZ}2bh4vgM!mV7
zkQE~i<g}RH)$`R*PpdlPUUmqVl@-)W5fXs{sEB+l)*aL;z3VorAv0%0ZMBvqIm)z+
z#oo1%)){PMl7tOj=ry72XL66;9&<-VUA2pyHSlNK;A#lEdN)|;8?8RHug*unx`wsA
z>n)t#tO_t}-%{shudl)bMImohW33umlIpm`HA@s8H)`lSe(<FVTRK$=ny8XlWFYG8
zHCH|A8o`g@G>%c(MrT9s8jGmKNxn7ggJmwC&t2_?e1V?Pd)Hb7d2CDZY}%GLjw@L_
zp|_i^|C6}>f1mUL8Ai?~*OS*}J2HJ-B|oq9LM*Ud$`kF)6PRnLk+TTW2?VZafQ^!4
z5p?6l)NOaJ*IQN5#8mpdyPB(Q6Tgl(1n7OD`S>P&h42(UwyK>Q+*ND<q*Om$29IZ`
ziXo&atK%ZOk1Q5fVztYt3fE4pz?}9X2oYeRMF+pz8OpgP)8G92GOpe2O)O+m+OO+r
z+##{C(T#`6hkBoEF5J`<fJU=$DD~K&xa93<s-xVxoY;u*QSNNMo#|^XaMm}t*kJYg
z&cXsi|6ySjHbQLSB~3I&7(Xia`YIj7=R$rOuouD=xRD{=>*I6~FLS|gi-|RRD`|AK
z&t-SQf`l3R(pe%;Mg9(B`E_EO%Nr_yZ=JKk!;$@l^8a0=Y)Pp>{*SHlFmed;e;aQ6
z*m%vajn3*SEh59f*P7V(wT3cia4GRWr28KUQqF09!K*=2{hlv6yQ_4rJjI+*jW5zs
z;B#(dY2mP7>_r|Yo3*xChPP|N)umUTIg9?|9CCf5tA_n=V{~R$sY%W^ue8kL^w&D(
z2HkXX$b<M7i)DG)I6J#f7pm<Hi-+YC>rv}7^q;2Y(&!morCibnHJfxNt3hGc@`8HW
ze+$YUx!$z@mPTiEmCEG77ESTGJ<zkn<U*|?qBF+c$cmq}?-LD{tD@7pN~`4&NeWFA
zEhS2tR$aY`7k=;an!-z>)4EEtNiXvmRR)X|dXX-FWkAv%2=$0g1sC3a_6Y`3VIxs7
z`O&ivQRGVY|8YHUVtme)UePH)YFgXeQS|CmW0AA5B$|9XRh(2``I`<gO8>h{`z8GS
zniP;d<Sz2AJW^gQ-yr{4u`AWePufNEXS|uT%Ux4*tYtoDgWnnOI2)k!aQGYD4Glua
z(`Qhz8tP}fVJ3b>w-s#AL0<#q8tJbZH_EfudTU@A#wbpoq4QK^JTTmS^@VM8W8cQ^
zyO9=FZ%3d_yOVljV+-jsafo6Pn`fENy}=!<&v??5wum<z1zzlju*Iv7XG1ccF=s<!
zAI@{xSJZm#WsTTS!FjU%H0X14Haz1gQ#D=e`}qz2pwH)OF)hnDRHVWX+@xDrb8z~>
zscjiLwZt2w#(CAuJe@lGmpFZuENDu`^A_XFOIhfK0Zb6em$}q3j`n26vsOdGzhdb)
zS)fxtMZ$}ap^Wnb3xw#4;6hnJe=Jl(Cs;QESko{yF7#N?4<4wBwJ6^gtOO6giIwu4
zsYW!`du5nVL0;w4NxPc%7%+#uH&+a2ykM&Ti<Q5u*5`%!HO1A1_%bp3zl?+3$Q;oB
zvn1sTa;tn$b|D_nS<(}vRGHfzi?cdf*cIUg9OmS$#2Kipg=uA-eW|zJ*-+_Hba!Sn
zvP|lhWN$;X2-~Y7PckP_x^f-$2v~%ZyB{aRYHA`!$I4b{ba%$t425|O&7~UZrQ~A!
zZ27YyI=8DdpA0sqWrd#L1{eC@rL_F7Z<jL`QNpqClA^t)biF*9+f|xN2AP+f8?Y~D
z9T@u$DShrMS}yplGShM^qW_P*H-V3;I{(J+l9>dMMNv@@99I@00YpJuFna<dgoF@w
zm?V>AU@{YCAp}%R+-hc0_kBYfw_2CFRjpbTcddJ?wXNEp*1FYJt5#auzTb1sGuxSa
zW^Ste{ol|3EuVxZ_uPB-?b)BQ;aYn(7J9rm*k$`#T?ivv-NJE4N3oR9aN=#ex}r}H
zlm@A-zjU|;rCIglBr2&yCD8O<%(fus062;>l1|#j{jydU{p(DrqOSgu;abEv#zsXY
z3=d`u0JfXBUnf5O#n$ONobU0z&D2hjs>IwoHLa$<ilJTms4GrPcM-3rlKnsT<tcpP
z&)b)LxF#^tw*C``Yk_Rjl7<FDl^hgIx!=>tZxY7|Qo_<Hqk()bV82rH8UA0Ot=7zq
zX1;NuF%feAqqOId@a_Nk`|E~lA?`d<p+J@#6Y@CCCxiJ76JunRs@>kk2d(CY14l`H
zY3pCYmKo!@=d2J2wcqPTaAky67L~~<+M^X5AFg@g)L%&z1^R2*GRs1wBzp$jtqd%>
zNT=5uaxIRui@j56ncOy$vzBX~*fB?{G1OnfD3oLEtgjLum?fbwMiKXTWiSx&b3DaS
zsdy3c-N061%?*dImue07FXpw{8Box{J+6jGGd$xmS6R@nqDfS|&@Np36t6aOc)R)+
z@!_>oE%)Js8x0E1Z0ADxf*s<OmdV;hAC4DQZZ45}x}ksJaLr>(wo_%bA2V4K@ViA-
zX^&cT>{GRKKPYFvQWd>>^;hGL8fUDuGl}I;OYIS6F!i2J%w@=h)e1!@5!JiNEe^*@
zd*5w)_9HRHzjaEjV)*|Axc<V=d)hbp1pP?8M&GFS>fhI2G{zY7VWQq?oQrtBZyKMP
zqs-}Msp&Sin&+EOny;Ime)~h>yD32^;#iaYjs-$TLOv56Ckh1}#fk4I5!vKh&QT`(
zQe|FCj#A+d$`XTcRP38)Of?*pQ_2EUYrK9kz;JZzk!S3KWWJWFPRuh-#>32+GdyuT
zVFnmDv=Y__#Y$N34z2fw*ZbL<_1*3e*QRCmGmb6arT|#cI08Z^s1kmp8r&^GcUOR6
zN4T9u-1thInsoa|s6P-*mIPTqT)}!-C-kK%p@v@Us`SFR%C#iEE7u5pu1Z)XvP&0-
zgd6-_9wsP09Bo2Xs}lNLO<uPA`Ik7vwup1n6K~(q{6(od;%kNB5kqY2J$`qn#S?E|
z>)1TRv%px+b=A7VVy|wBmwpWJ=b#_v5U?<-2(WOheEeI)I<h{T9ktYBXlzvmn%#bX
zfM@c>GtGwLB#@Q><D%9eJ}`gV70+}e^tPDcj>yy?7E$G_IoQx>dixf%l4m&S$ULJ3
z?Vfd1>I|^)D)WZAVA|HskQTudcW)D;(j=UVRTg_&BfOAqs<qhfZfE3gK%5rKg;r1{
zh?JmcN0{yZJvE<(pDVOywSVaI^^kst{t3ozjd7mwI4l4UGB=o)n$LdwovJiVO5T<Y
zT_EPfWHj6Oe3?7Ah5EKyNj4=*U*>7|1pV$!yYA+r)T89Br(|IR&lWvfVj}RfK(SUS
zS+41s<6di-dNZ$eqs>~&Lm{@98Q-Be)IrGbb|sTIz1GEECXe*F>fE6aWPQBi%}T}A
z^t>=iY=(mBV!@SgthCuthDotOTI_8T^))If_tg3Vkq}tfZ9w~ZBRg$OV<Yb0a^Du{
zvhplzZ8VTu<yGRe@P;5<67pe3NNJQ;?hm0C@KHKxgVIzr@l8=l4^TV^i{jKoLl~F{
zKMp5#C>b`%>==y@lz?#xzyM0j^Q7ikrXqS>G9Tyi6t{`aOlnt3#gaL|*a(BTV$1+U
zF#@7AsYUSrOEvQ<L;!i$I2$%Vck6q@3aHffe&5)?lF=&6bA3*<o1J6Q`l`%K)6Q%Z
zi17PumrMAHyMG0vSEt&+p_YUpMe7a(X=zoaKOgqa!2%gPh1~Hch_BuQ`kR2M9b~lF
zsbwe!^-xarB|CQ2&OP`c_M0&V%WaQ=bOYe%PrVT~)N%JTH8)J0E7jreZ?sLki3yZ;
zKTT_Ts&>JH$BRLqMXsn4gWlA?Y`C^Io8TgOYE*}C5AwZVnfUYgIhTl%w@0O}xceJy
z4;Mn@re4#P>Cf&*YIq&*pY#W*j)wkvFuIHhb{0%6g70x6h5p#^hr?=*sd|z9N~Lb-
zUuv5wDff9go4xVdurlpY`|Tm8h=xDEU8;iJ|6{cE8h-AA1fT?-e_t>RV<v9@tBgmD
zFU^@|(7f1u+V*LX{-N4AO9f+n!=%Gi66h&v2y}G>I)R8mpcd)uf)8wN_}|P_EO4c;
z1;(^=*s$rvYO9v?G9&Ho;B+vPC!^TP06Ux+bDWn^rjBiyRtBqh8Q1awsy&^zgY$=g
z)FOcwRjT&LEER=YtC;BrfYA&z)iWJ7EsS3bJh(IDs&@;#T0dTS!%M~aH-*6HN1I$V
zox<QpU!XL7lJW+<J|DHeL}^WvmS@Eh-rEzDDpmYz;3~_4fgV0mqmEV!9Wp*HswgZi
ztShW9EHA7ntS(%^DjPLdc|UVUIbd-F^#|2m=DynT4c8)pnh)dk@J{?psn3xpx2VAf
z2lH4wSftAWe(sltExw1<8WqXBkY5yc1$=>aIH6$V1w7evN}gB#P?k>lc|<f{evk6@
zhbg!Crl{E0+5uZHA3q24dzE-bN{&$5uImxs4XlK+UH5WyEB|(J|9dp^EOVOipwXm%
zuAi$Ptv#xF(l_$AdRp1vJX~9E9AxKoOrZcOlYg)I+g;)Sd+bZ;01NiJhil#3&reS5
zqruY&TQWuh_*~@-$t5O=b-H#INJq{XD_tyA+SI?n_GQ)JhD3o)y`wVm=Yj(lQpxvA
zC9m&a&yRdNLsjWzMaPM|%CyHRcXNhy%?*ditmWqZb^JQCgRV)$eP#Nyc4|?B=*BFH
z9-g?(oBP+=u0%rTE7PB~Ym2+Z)W7h)G*+AX*9_M-8%Nq1D=U746_etymjpBPi5<OC
zZL9iM^F?fD+*0V$%H-eLwcme<cjbw~Q>DVU^si!SFUQ*|Tt$*{l*@`()t;REsHnK;
zRjFdJ|0if>zwu8*{ulxI|3d8}tp`lO)%}}>Yi{EZTf>{eWl3eZZ29pgV)Ax<C{^t5
z-#8=$GlP!iy_Hk7e_ik}ukeP#Nm7Mt`=RXEVjO0tJK)o|PWH#QZR%6UKLllR!-Qt3
z{O0}++e=<z0!mCl?Tj~gw5FQ(TV>K@Wq-T<lhhOT#k<gu_`BlcVlg8>-%skmw*I!^
z+79lPEayp@g@u=ey{Fyi|B0BL*<DiQp?;5T0f&k?sNxzP{W13#P;<ldlcZXE3;J6@
z>5a_hnjuMcz*`wZ2(vI9D|3Ew-1f;d{G^MMI5I>1E%rx1!N9D9UXT@MbNyp~;k7=I
zLF+R7f3$Xnrah?r3%tKh{SNI6XaF4qzW@2~2=Y%@0i0?gPR@VypPDhX1sr0*)GaE8
znvBqFso}hf{q`tP`r0Z_&Bsu<4mV85CwGE5wS^G^K+4#SJnnrZCYV-&pCmC1mjfq>
zXZ=9Us7kHe-_s2y1aI)Tr)@TvcNiS;IO&r_gT{S6grR~CFNj&**awvgBB}i>@w71#
zEX?m0K`D)US?O~iEhn&Lp$zqr8tG5Z;0<rv1oa{=e}}{nVOF@uhjCBXYbuxZ@fcBH
zwTn*vOo=t8)hu$dVc9QVt)i5kg{>Kg)S)HBxSOsiOM+go;aT(|wu-*7wTd7mNh^hC
z{oT;ALQ^TuULChv?Jg{}@l1x!+TPRw&L0*pqlOy-z<qiB|6=?95G|tN=X~uZ`2PH(
zK2kqKKT2<e6mXk<6}W+~=${%ItchnE6~=laXq;hOX*>jZ;NQ&&=FzYZ@R_HXJI#B{
zXH2`1Lxr5I(n`GVs1tU|=?o0V(!xArC8Q$u#GQ_6DkKdhcC07yk3u5tSWLOnB)X1;
zBs58InjFih9Om7v6`FS3M`5GCm6)oIZF}b#hoP~lc!R?`I?tGZ#5nh-o`hjwZ?JHa
zU{o;8z{3GTD3eW&V=GB<()pH-6(n%7lyN&2kpOOK1Vks_%k^<>Hiw_OlAuEz8-xtB
z(wYKtxcAD#RRF>zfj&6eNv_u54Z63ITrDU(4pho26pkhF{3&7`N=l-|j@8spSv(`c
z{3x+n$0}M!>{6ByLC40F+}5HLnnjk|Qe48LL^+6$nJyAZsW?;YL4&cZLl$jNH`D1G
z$66}PT0|k1(kWa51RFQLE_R41IJLU7i#es?X}zMgeZ|=A>;P}^f!8I-+ndCS=;P)Y
z&}MB0QzI^KeUa_||Hl6rI(Eb3r&Kzs2`(hKh~Q#^H3Vx3E+JS)a4Erhf(-<h5o{#5
zoM02d6$DojTt#p-!8HWe5?n`cJ;4nG-2|Hnwh(M3=poofu$^EBK`+6L1UC`%5$q)B
zCm0~uMQ}60Ai)s9Fu@4HEd;v>ZY9`5a2vtx1W)4d6vqw@Pj&Qi*ylKn;OPX<Ab2Lh
zvj~2V;MoNG2}TLV2o4bZKEZPco=fmNg69*wfZ&A$FCus`!Al5UO7Jp*mlM2#;FScg
zB6u~yYY6TncrC%}2>yWJAi?W}{@-%VywaS52q2^MEA_**r?llm-w~-f{QV)@#J%OY
zS80{1J@n2$1R2x&eTk4;(;wu#3OoFh)SIg^<w1LK2KU=o^Tf%SwAp6cw3+HY;TMU;
zMKif>4DZzSzq>)|RG`1hzM7$>_DLn&R%a@uY}-Q^syxy8j8tRqoc;jl;bWnN1Yzzz
zmdg7n^zgr<ro^<2{yhaJ<TSYF_eJN8bEZ4i+|=*4%?Y$Zj4CY>x8C$;vDh*Mik|*X
zu4ih8lazr4U>T(21?$#utFD?SGL#bC{XYAG%XFor%5){Ab-&(Q^kwG7(u}kFe^2db
z4L<?xI`{w>rB~^f>u(tQ8<oZm<9_24MEzU`?SPk3_qS5xA}MVsac^R-<lMoHkby*m
zvSj`pN}@S6V<;Ti;)PZSLu~R-S5inRS$u)kPMFWObhxI#rX(2PbXor0O4o1cS^co*
z<8}R1NqZ(Ul!1(@2u4DFx2q=N_X|6b{HvGdAqbk~eo4<-1%Gjyn5%4$Yf-=-LGVhy
zYf8O$OB;+&VTl0gnO`*i6r~YrdVvjaBj<M2V}zMp2mkS&Jgg?erR-bWL9}Jp={~e1
z1S434-(<tST`d+&h@i@XyRPrzU*BXy{8a9Db?zG66h<uNj$MPC{LJ5JW5CP9VF=KI
z!O$i&uyxn<qJ2NJv68^9@wdS;*e$X=W+w{-V*zMP(c(K(sr{22#fn|`21DQ~`CVlZ
zrrY9L+!GSib^cjH%HA4rg^=Bs$bOEE23NX$?e5U7>xCA3{>@5uO|rq2!JfDwT>fpa
z_W}Q}0skAz0KTW)t9_vt>0QtP{LGkcY=T#?f0|{G4nCT?|8xAUAFAAWpp`o#e%RwJ
zX@T<yc=i`;qs^M8Pf@z+FNH&Y7~FDF*%$5@pRZ~8!<0*>lxbfTHAMU&=#TPT9GMUf
z_UE|uUC2E`$ww;<_FzLnKG@?46_qjTVlGkP>vhx-$eORz-%HDiIJTj<&0tep2WjNr
z5OMr2rG!7NfO_VSlaX>Manwg0fc!tP*8qlxR0IOP$=KE40SPPfQDacR9rij8h6Iz9
z#%13lzd_aql&5hiv%sqkfzJe1E0chGI~kj`s3sux(x@fK{@|iKD8O4DldAk2oeDq?
zgj+V^^d+CIqsma;Gs+EC<_>PcY3lZGjzHG|hH^#ln+XOBRGFa#7v$&tuwSEyr_>Vt
z%rbamV9f#b$O<>~liA@n?3XCzadktOQ36v{2%!Zq%wSfASeE>#g^vq<To>Gk?Kh}Y
z;NwmuMG-XtToZm*YuwVI;5OvEPB|$lIhVlWNjs`%E2=dZX%`jWBJltDnt8pszu`89
z!2)=ScBeK!#}3EqNdI;&vb2W<fkR`Z&&rWvt2cr7MJSc)pZP|@SVH~VY~$i84qc_<
zg?m_G?J*^T>{qI_xxdG@bWh@ARi-~{U;4hPJ?691*{@VdPybdffwMEDS@?#P>UWzv
zxglfC6SFBkWkUSa*x$`;{If)(OCtUWJ@bUdd3e851%lZ%OX?FyiY@<Pl7d-2{Cgw?
zayofz%uJF3qQS@zM1wi)C32fo96LskpYQu+@^eK$^z@+{X@|N^>h>qq{I#==5$ZEf
z^!!?yo{`2b*#91Bm=~Evkozsy_tJM5ztw)A9jQD4I-_|^-#3eqWqDa;<4WAX2(|*@
z7c)GbQr_il;fSrH&pJKyAa_MyJN46_NKN!b&EZ-n_ne@TOY{1;gv0G(HM&~jmg|l_
z%Vh1`w}l*k<;}88cw<z<VCzh)MB$PHI(u<;b3<2v1siHHEz%a;!=1iowOjT?bw=W6
z(Xp^7xG0tJo5}@Va6L2ge4hQvW7vNR^agZh9<At98FP08&BPA3e-m&mW;fVnS|zsa
zp3k;Atcp98R>d9tJJ=bWMc2Zr<f1e#cN)*T?Zf%#m6h)nzD&nkFV-bdgL_xOzESj=
zuT+!&zoN5@n_*|2ua^Fkhigsx46sKOB|;7a3;RGja|*B#?hs5lVT{IxZ{c~zKbd9t
zPGT#*$j*Mxv>?hfD$*`Kz{8K{8>a6eEeuBg4>M+J(D>b8Txz^z=9#l$3w(+BiuI8G
zH}(JR5hyZSbW8lb7+McucgX85s&EHA@XE-Q+}F=FL%F_Z?lyXsfx?G%T&OU-sW1}s
zt+0^~W_Gm!m^pc1<rIbs5QdC59cgaLRUh&#jj)(rAWvAHx*6vB+<8LeFsZ>-%OI#{
zh<2lYlb>|XH%vFz=Bj0}2PT4r;jQ6K^Ua=IAJ;IV4jxAUJ#F3=H>{OdZ#LTK4NM&1
zMw5L_{{Ol($o_w)Pt>~fCfNQyr+<k+N>O7MVt=%oH=8ehcWYkBC`wu>E$jCB7|{vM
zdnnm+F5o1ulH-`n2d{Nl3*0FMcahKfH>piYY$r1c5)-UAtciv24C(jqv6<vnvKUhG
zMmpiP1eSq8(3)s5SI3^zs$^vdM{!(_3|{^`dF^Vyqtd5E(lbI8aIZ5^LSQ}3>&R6n
zTac{Ikt5Vr8B|C7(;{fDbKi?Vcmk334z^`LRWoNj*hQs2Z%fCnn_2B6N2|$bxy&UP
zCwSaJYid1P5!OSPqKzD>UK-rF9^X)`{je5c-gc<pBllDrV8}J2&Y%bUkXraT>gntP
zVGfNl)+4k9q%vnkjT~ivbe2H_pIH+!z6a=Qpt-ChID+%}0%3MARabMIcjOrRqXX6n
zoL^3cT?{jR;T9|1o$ir)9A?&7Gfq;Jea79Z<h!MORaDptg%en82YbeSEa-o~W?o?q
zH@Xo4;2M3N_LAoR?sj}?N$aC~Ffm;ghwT}p16y5bGy_ZMd3YYfXKJT@=9lmpPjm#M
z(`RKNp*gXDO9%X*c5K{GTo<A*Gwq0rg$!ut=73aBYjil%)6a&Y2_gu_t(*_I41O`F
zFLILh!!x*oYVFj&Q!L&DRo)gI#=DaR6XeyfbqC*$9-o&v1rYUQrfIK!G05@2l{ZJE
z{`jH=wumgwJmY*#I;BNjmdV=F9|^8N^-~#Kfzi=?P}if4mAQIW5ozIWdb+`G<C;>g
zDOGMS_-}zAGs^ah;5m*yd*5k0TOQ#fu(RQ9X#{#lMxC7CZ_3rA#qKR`?s(S+dw&-T
zTgdkMl;V~aNcP}sj_6!lpJ_K8bRSJgx748KsDml2XLD!6=bjnS1==9zZI93jlT);t
zezbvCa?OK3l`0YXe*sN99rph})}GMb*EPfdTA;6lF7Rpa1$@8$2K4_5pawS2SYh~#
zGmU#d{QunegK5A&;4x;s=`~LW_uvlmHS-Utd)@MHq0ZD-1>7ajEqMQqzY4vmzT#jo
z&<&e5pD?h0PiW)yB@j!#(q0j|Pkkls=AO8A`)`D*S6>OVP+25I78?}-fZHP!1laMh
z@V3xbf|07i72v9N6$=%+Pbh0Cb3+zq*OvkjjR^e6@upC=>nrW>!qWtVbr@+l4f6;S
z&KIa)&M6MzN`coK(fXUIon`RaQtuI7X>On%v8yKGCfD&c)xi1Ngf}vCa#6!0!V5`X
zITBnzc3WxCE*6S=eN0RdZ}+ku;2^@uz%^7AxYTeS0t}H4-W$|hW`2jRaD_0AHamVO
zl-By#8#aP*OG(EAG&v9-K`7FW>z9{wolu_ZW4C89<Fg9~3326A$5+&SyiXiR*T!oP
z2DYJgM0bWzhnMzKq1|b74?E7HF(Jobtq{`iVs=smIE+woDCDYi)0z8c(vHhK;T=&L
ze#;Zg@jV)sDmXV<7Kr$;!9|mAiN6T=U|87UZpG5&jo3v4R>fX)W4y#^{A|1hfo@>z
z{vKBiqM(Z$gTi}9UsX@1=*MsA+iDkNDIQl(AOg)lq5AjEA$dlr;pl_6MJ68Nha%(n
zF^`F1@`Ukyp<zki@J3xot>wb;)=0uhqvL8p|L>_8dm4+3Q;hqJkKyklXkPPQ`rq>W
z`u~5Tn&ydnBr3A>UFN7&N~@ECgLJJFhtE!BRvJu>E<2T_+wwOk<!dSJo0H*=r!EhU
zAS^i^DcOeNt4HYzG+ACkzS3=@o9P}M9Ltr88!6={{r@ohf0#B|GY8DQaJReQ|L=J1
zHSHuMrT(jr?!){WGWU~NdGH7_Ee@)__+Q$&1)Skov+~}23HNA>?hR&YR<mG^;E2PH
zA7m+q+V(u|QM#roGFB?LEjrc~(#$!toUE(~kfB^(W}4P}ljy+C)83RSYLD(UT=Ql%
zK;<1+%zVK@W(>SUXdy6?#v*a-J+BE|@YWGhO<SUSGArleT;tDheqk;ILjtIR3*T{K
z=+y7D%dera?9ru)TcTq)os)~6Vggl$hcJx;ajo@bBy|bacTLsu3aOUfg6L@A-ouQB
zT=j7K8(<EuFz6|c`M6!pP^1dE!azbciJsc{=;Vgy1s!l2#l%jKTw9}~nCzl7*HCA>
zg0tPv+EpvWEblz+F=-gOq9d6a<FUD_7O^5Q+R#D6SOnprf~J@Uk;r(VkNVwCA~Lp0
zRSNyT%QfwC?P=|A`r-O={Ve@){f{tUS#Au#&gV<>P<Z^i<hzdnl6t&Y{jEO7_?}|!
z>EK|QywSa-w*8{7Wiq^9>B)jv5MVx%`JCfvrB+qSw~dUi)XnGNJ~bOgv<BQ-DCEH9
zF=3OpDph)@f&f%l+=zTs0+mB}n*y&F+&?;MFPmaEC~hcGTl~X|)EqYPVHf-`!^tE9
zD&QD_Qlz(qcjtd{b%)VIu9l7n`RsQ5M5$nu!QM%g44<BBn3Do!-mX}V{;0OefZDSh
z9|v|&7KeJ^iH2A6iyV`~KIa5m!ufXt7z9L!-LA$u5_M(LE05<G307rY2b>@U1ZDZC
znmwMVrOpd+JkT5Phu}((Xb+12v55Kqnr*ynH0mGe=jn%Pw`+^6_GH#HcXSfxSL8av
zGl&qJmeAQvAxjQhc3kcJoki?dI<A7ziOjGdo1X;U;Tlf<bB}C7`7iF2u21zwyJ+t!
zaU(R{C{?;KdH~b+J}TF-yc~*Mu1X(|P=>J<9;*7RQngRc5ElMbXURAH^5_JP6y>T6
z^j=W7mv{6f|JE)&a8B(pXWhhprCxMI$8%&QSHWP8Gm~0=lY9M>`4;H2NYw6LDVT{n
zw`)>WJ<<J{YFK%$m4G8meXKDIQu#LW7jdCgKYq1T_qynQ%tOM|T-{__D3mly>`Q;v
zVxQ1z=-MPz&=DPHYaH3(4y+`=qzxqFaP(OuYA=r$swg`*$ogO#qWf}od9J?5%psXu
zr2Tb|N9g_!Nxc#H{|TCTjyWCszf1o+Jb;Y=C-8)<d!1f(MJL-rSQayk4QNRigI)u}
z(H3I-^eJ9wFMst8Z*bLVmq`t7iXP59t!2@e5qC@~<E<~{Vbw{*(mzd(#nWp>4+9cv
z8a27byAB&2@*N<&;;QTh*9`n$Uvs3Bc)z*6(D!-u4&K4)>mQIh*cLt17WGn<$w}(V
zOw-Tn{EZmN6&FYq1*3=9I!oogG@-ZRR8YOqZjSwkS6cCs?4x~M^k7@tQ{p%Fr9W%$
z&OM2SPc~s%5j}{nk6d$@%9&(r%s87;d+{GLdC@EH+b9j#hN#Qdc9i*&eNuw<&gEiw
zD)*fsRpE~w$aU*-wO+yYRj`9~|CwU7?OeM}s*vITW3=rWes0x1g!k`F`t|VsI|~tj
z&M_V^{$x%uTg-F+ZU2AS4v`!vdj|RFI9Dyp=a>FsMh*c7W#|}~zaD?9I|w3?uhk!C
zk+W0gj3dgm8ty_o3?D8Dy0>|KYk5hx<-j@>N1EeCHM5HvKvE^fB0xvDREgL4eik<s
z=~=T1q|VIZFhUf=d|Tw8t<O<w8Hh4)>j{qcy-Lq~;()f`e>l#cW;SIbWs-=F;|jHR
zVcw7$FGBml!6I%QXbVtqmp|sflU2x}<0_?!z35C0j7B^`ubbTh+`(KJD@WV~ud5k;
zqM?+PPxW7NEUsEN#0Fq~2=yYUwvr&~!6D`A?jZFn$5Z0|FGTzwbC&U}(Pj+C{vV~C
zrxjXl-3`&1woX8XOfji#+>-^zu2K?=oo{?md-OkEVZYLWv@Kf1amQRIAge-2b@BRC
zZ?$KNxU1OOsb9FH%6rE~SxEV@#@bxfTkLY{<H8EXvHVi|g+t&xI~$Lan$;YgVM`L+
zAoCUa<P`1UiQf|!=haP8B`c%TnE^l+on5iindei8M~UN<`ZUkw<7MyM`k7R=J9>mI
z(lA5J2Azy_!CQxyYkt)1JWWPtTBFl!X=G#yKe^O1O&+Q}H{((<OxMZ^vn|o7wiu$B
zB4J>mut`dl5>LK{V==YU9*s!@))t*&3kfXFboXK50z|u`fcU!&GPWuBe^E_~YCqFH
zhv%O<{bc=K{cGb`qr<q!c+B|PJRJ7FSDMdTod@4(T8{g|f&_J3u9lDRvy~JfN?~ss
z3<#w4wH(YWS$D#5Mvn74bq6?pl;h*NBV7&tIG_5?9Ji4Qy>|Q{i#i$ax12MBK)F7P
zE3zylG~i74(Y^LTuC9VT1uYD5PJEf`V{XMfYc{_Ge`oLGBl*WK=U}kaLC*v+m4V#V
zxHm$>Q>bTrmV>*@eeokoxX`9}EXVCyFCs+Jt&Es^&7#*&C~dgKQCiO&1jor@7%MZ9
zlJk#v&+g8_1gwWuBx54SBf0)E#|E<CJvc65`~LuJef<1Z`-?tSpN;rG?Rr#yQ2&ko
zPgnr2Fg8Lic$smp@w)LhbF^7xE-^i3FHVGe%xBHFzta<7=!KE;M)hNN;~;DSgS-t2
zDNvZ;1NduFf?0@24k75k2zKrlq`I;YivcTxhCgBE>UfnjYZgXYp}PZPR>rglB=~s`
zlXAu)Tuhj7gk57gsl2{lk^YGV<w9y3St*p6dB$3(cG$)&ZljJ^WZ=!Y@t{0o0WVNV
zSj@;Xno_^WPCp!xXEd;{?T`t=(^%i)BsoA{s4UTb(pX7F?}b+^uxqW*c+%QZqwB)C
zT3<G_oK(@`pYS333k|6f&9;1>f=<(ltA#NYbftuSf#Xx^y5$W<%gO4dBBh<o8;P2p
ze)CXb`VB(^CEo`L7S0a@{$HV)XTtyYL&gdEvxxsQO1nj?7|LdBjv|J$4OPWr1i^t0
zwkxR&E2n4|zs9lP+G)G~F5yHQqVsGKACSI488#`6>yr|+JOB0xL+)y)ej{5$Hb>{$
z>PLet@#>RPw2xmFJf4+zu8{h%EPC{Ctud=LC%=M|dndV#w70vy7KrKfFG$61jvmF?
zdAXSG@M+%y1^PG*xg>G2^{L*}-oA&Z^S(Bz&Xb~ZhHEDqmAR;;>=#{M*4Nq(ALb-W
z?X+kADpkKRdZaDE3_KaMldeD+a}L4xdY@IQ_SV)pysuSjUY06b8J%s5K1$nweW_3S
z*P3GPx}&qW&OxrZ%XWX@;!v``+6H@A&9&2>xKiqs*#DJG|9=kReJs|0t#8$bX*Xz<
zL)rh@nkWLVuFV=hk+11=ys9tlQM>4=`^4C9DUe#ZA&Tg?up7v=&KOf5RW8c;04WK^
zv^RxVr~2Vnr7C>U6KyHLTdV2zSte^wHwnJ$%A0$n>NZ3d*y<5ea{$AqD$cOMVV0Jl
zy<nco2W{u-gQY6`(GzU(k`;(fpLM!Eaz>e`Fd&Pog3;q`2^3)BQpQbOYT-2)IxJAh
zCZ#de8|~S>#kQ<|;sdFdUD4xgiJ(+hdY|Hj_TqbDHC8`6O{%grdaON8Lx!SrA7XZ;
z>pttlcFYsQxn7n9G)L##x{NY(wllQ2wVOsR6P1LWQeOo9f3c=rtUaUc)~D!hME?A#
z{*f`!Xf*nbU7-JGm~Dsv^wf~fgKzn94ziwYbIID}>>R`r%aX!?blhP>2P8#2d}$6+
z9mO+MZ$?ctxP8F4<3>f#=b&Ymv9L$5d*D~n?{j?&7t-EVVW;MJH%AYo0s1J%m}V+I
zIxfgT_BKKY>SMls`2Ahn4yh>b#xprs^Hv%Wjw^GF@bUn3y+W?GAY5dHF_~R%3flQn
zj@p`7{HDe(Zsf-(Gv35M<;>(m<SBT1V}_{lOh3=j#3na_3%Z$`dfvc5!m{kS9E%ef
z!#D{OSn(fn@Ti(t6#>^mcbD+3<ajby%Ty=sLxy=S{C_cbpZZnWx!PmeSMdEEL==!e
zAzH25xW;(h9AnmD_p?uI{6lg0L22ix`7-g~ibV~b0k$XMy$<n>*}P0b)FJ))9K0Ec
zxI&H_bBwQaXF9;{(A7?p1aF2N7z$0=^N{_PoFlHlvhP9WyVRLmJ^tn(qj`%;J3Kue
zI2cUPQW@_>=AWpgpvlY-XfrlQkh?L1nu4&Y8jqlk`A@1RCYiscryNeQIuh9O_-f?L
zBGF6c6t*y3J`p{1{5<5lUoH7e=40bs3Hzm1CcO2w^OIzJ5pqAFW^1MA?sEGmh}!tW
zk?#@p7H@5j^c3+4hN50OyG!V}9){V;e^5QZ2@?oKoDD|{CTORP{EATQjv8#8xi+?$
z#V3!c`<rNXrh|5Y|3m-h3h4jb5B<OYf&TB_hy`d%|0ftlq;?zXc*>KpPxVH-#q%IX
zSytY)SwdOXMG>prhK849fd%E5REsR_s%4J|oanSOqzbyC)wWPd)%^z}0?Uh08yral
z&e^i&_ljthEv*&K$`C<4U=*EHQP%peKY;h<ng{O5=uM@q-lXHfNuHL3ASYgEFFw8>
zud?EsXQe9L(F$AQzKnYe%OU+{BQ<@9YX2zJ(G@MX)h!io9<(Q<n9$!6qVxpQUVHoc
zZ^TI6moHW6i<a3U5!uO-sng48(Trq$kIkG<R6F&nIZ}1a(NbIZKVR3WCWvCCr=)0u
zpYy4zo%*LIq)Hh6e;`zU@bkL%iLUGW>T~pki2ZS{eiQ5fexrYG>|wZI`@7WGVw`2%
zXgp%PZT!_7XBHyz$7b_v^M~fo%?~V&qyI#b2>#wDb2Ei>D@`^PXNIQ9pyG*XvZnMz
zk|~i`K_NRLCT|+^!toffh84@o@x)<y@Td$8(CjiFGHuO}?GOvuQiel$GO!$KCreMU
zlprBR1Fl-m6H8#7{baM7a;!L>PL!R_Q@xLP)3Sbn<JLp-jB<1{oAR#XGO~D0m@r&K
zg9mqN))oly>SVs_Pe@o}?NiQidc66v<p9;Ev=AU8Ubd4{Edi)=ELo*p;<%j_kM$|=
zIJJnqO<_zq9wkmaPq)<6Cy@sGK!ul*EP;I@QGaKrRGUTyv;F_y_#Z<*tSElMjRbEZ
zcr(Et61;`rj|kpM@HT?C6TE}qj|tvM@GgRP6TFAuy##+k@IHd~6MTT+PYFIq@F9W^
z6Z{#$M+iPj@G*kB2tH2m34%`&e2U=H1fL=JEWzgpK2PxH1YaQdBEgpkzD)2Hg0B*M
zjo>c`{*vJ91m7U|D}rwl{58Sf5d1B{w+OyX@EwA`BltfA-zE4S!QT^npWq(|en9X;
zf*%q5nBXS_|48stf`20TXM&#*{G8xl2!28EOM+h!{42q)Io$2|8^OO5{D$B^2>z4c
zzXWt@0{@?@nNf3+al28bzX<AothO@;719<(w05}J$;FVj5Nq~jrs;)83MS~vJ9bL=
zNmmrX+ijRcs-*dSiWl0eA9N7<FAI9sL=nr~hAbo9F-f|g677lUhqB^pr~d64sYk1#
zOSv2=*U;4oG(}(}eW_2{i+yiU+vSMy!DyW=f=tOx>r=ha?(2;E4%#C1s3W?>mPL$J
z04l4fRN9y0_~6x4wU<a$`J%P9P;hH^E!JLKw2S|^Ld?~d?@85djMmr_FuE<+g&<}!
zQ?<ux{>JC7`tft5%7W3ww&o7kyEU(wQ5cqQ^e0`5MWvU?*3M%8w`=hDaU8h)t+4+&
zQy+(DpzTAy6SL%~k0Ktl4gUcNA1DcLDB7JDek~UJNry`Vwjzr7&oBkbwUbhP1*JL;
z(zOo-(Y*4uA4^61q6qeE!{@NI;!&Svvi9a%vD#yr#<5?ix?mLHpKb6_lx~XpRByBk
zkE4U=&$2;aTXdzZGu%ScsV_54yYZ4SVxCsWG0oRRSJ*mG)14JTik0HKNc(WVI$nHv
z@yXKQZHYG7@{JJJ^s&&<&!Q-#Jy$RGPSw^tsp1XM<+fzFGBF1$z%<Q0?e^aHc;BkJ
zWbxd(XrnD&7eo0|2o=t2NIvW1UJmmLuDM@Uw`chO2>oD9KUi<ouhai-%r!#BoyK3x
zW6f>meOY$&|1+=Dy0&G(K-VTOyfoHCf?XXw@c<9S;9)nxGvp@WMs&mir50#r0f7*l
zm|`ZoI@~_4dpi7!6?wh0tZiZ}viE?b7dDAySYvQVNllyVs*5zcmLtRvINjVXWkivZ
zO`Tb8Fo57YE_OI`G0pHVhmbb{SL}$p;e$a86Y&iHS{*7w9?w!YIQ;M|1|D5;uv1k1
z`H6YGy3O$@b$5lhQGQ7v942>LBgR$c!SA4@N1u$2qW~7I!?g(N7d>zsy2uMRaU$f?
zh{B=t1HMzk%#h3tp&d7m8ll@?6{X&=mun3aRu>i*vOyfN*HAj)^L92fF<Y^#w1c@$
zTo#DO-5CK*G-m&IgQmR$&R?B=hJK57gZ`3{XOtk)?{&tzi2hY?#{PGu|CvXN9RX6Y
zs}pK%e(npAIfr56G~TBcc5!{ACKeSrBWA#9>iR@3j3zw3wqZoMgp5V6p2g~Oe6AM4
zq~wH_fLr9`neI~ic5Q8ir#ODPjQH81<|6B5Tb_`Ejo;6Xu&lV%-3k8`a9YX7XsL1~
zCJQcNhZ?(N>I3dpcm#$deu)s#O;XEV6U{>IaEDO89$#zg`(TS(gp3=1lzP9XHV=Ly
z;fJ?4Bm|!DE$C|Si0*YL&#JWiEie~ln`DZMd!yiI<oFZSN)suaWAWNqUOt+~s@G03
z3-d6^BN@3Cdk}YxJ02dtT5V$}=VU>UQnMa3B!RMEAM(~7DDeNSnt82RV*JWD2@!y9
z)fa1j(za&q!tXLA9BpHPFBas&-4jk!Gpu5v@2Jpg*RGp$6GwNdua|B7S4BOxi0?GD
zoW9g2ZQ%I}dEq;IekI|9>!Pi;kTuECspR-nyZ@M&s33BbRKdz<i!BvY2(yxULVc-E
zJBm*fW!JwhmE9F>w#8^svFQ60FSH9U`i-cvS=K#W6?NO14B~wV<DfVvgg<GQv~vZ^
zMF;;{b_CrP-C&Elv2e24mzkz7*e;}kEARV-G;nL8>upgt>0V#^(jK+P4iXHo>g(mm
zEo-9dY!#m_<>6|g389aE*fWBLt}GZSwLV4u_k#AW_O(7*p9c9~yZ$}c0Y9d{3yNTG
z<0$w73mX?3cOgRX+pq%K%RJItWo|M1!8Q1?`GO6<zu(Q#k(7~GvN;^jlQ1uJzdC*&
zPfXnu?~;H=5|eyH5)><CI1(8tWc!Y1$Y8}<xs6(`Vy-z}qTJTXYKfPb{3OTEsc4lV
zh2uFA{bVSakxWe%xjUYWm#9=4OMIZxaUv0z0=pu+B%yzAiABXb%<(K4TN1`XyOUn*
zorR(+yO}jCLsH@*P3Jr@pSz1YVVn<?!d2bs4RE^3dAJys-6d`iYGHUI7M6<6<3;Co
za}Ay8z#_JC<H3>u6nEK`={)f8JOsyZ>@I;jU@xMla>q6$f<ofhAg5EDhY5-8ZoEMZ
zN%-pk+T;xi8`QrEN$c(sC?EucjiJ*J%XBvy5@tGtysl$}8P)F6jz}kuwCdbn3=K<x
zrwgW{h(MRE;&aE}X&g#@&^-h$lNbjx{({9zX-D7&#NOl;93<}liOm1k-o^#SZ2cj9
zx%Q#fuT8|3-53qnWPe(ySc3hTnX3K%2PNz_fO(J1O<5B~3}+i`_jL6?Xs4u@T4{Z8
zXQMy*SUTu7MtRWYoKCzf4bCjh(6o!&9_Ke(^~G|)w$>;jH`|B~km-;-(?_{>)5Nnx
zHG^xVJ_VzjY_ScMj?tAa)3vMCd?0S^&gY~`*F`tl!g8de6-rU5;R&=?-yuw7s~nR0
zlqjOo>@ccxp@tbuR`?QZtY1=BPCl5jzt_$_=Xuscpbni<4|^Ta4tRlZ7)x?BA-5(<
zZe<nif`{&74XK^_4;fqC5N)@`V3dz`Y`rvvV(qn%;LT>D7wrBY1=W8&PoJ-MY0v0C
z(BCq~z!&(Lum=1q?)k9!_;+)8|A$MlLp+st!r@!O;u;4hr-3@vJc1Ou3r;kHuFf7;
zXcIr0$8WTgiy?U+?|9q_URQ}7g0kEf@<7c_xY!uKZs<J=QO{gz7fZ>WmBXJ0Y!C#o
zyv$Bz<Us?rES*ecSGZsuzrkMCU{?Un)4-MMNp`V8?JqRhPT>KpG!kSSIX;-n?U33P
zJ_G?^yqY?9D6Wt{zR?a(0D&lYxL}w7z_O!~VhN0|w8fBMnZb#5yMkzKGhDT`#tje0
zmoLfdJunw1r-*5AbJvyJ)z=beaI**_BEU!*BX@kOt<Gc=$A@r&xc?h9^D@}~-i7#|
zf7LJ7Cu`4Yjo)Iw2BU~$YeSsHa5YP}q{42`LJdlvEu3-JPTjpmI<;3tyKPaEX|YGr
zB9UnC{qRz8=`FuYD!ePY#TIqUX3Z)dhAL2ocA0A!uX5!*4N{e>q7hsDsY}&y#C4PO
zx}kkkFU-DH-YmO)UK8aJWhdvl;L=?uK$#-NlY;j2Rw0rr3!R(M_K>Z%$3=2%Ey9gy
ziYF}Xl|K#gfvJj)mkJL@gSJ>lYWjjqe=SH4?SWqfc(oOueI`}wi*B|h61G+v?XyhQ
z?tE*5SaEJyI@=oUvV}rsXcRl(Gf9enk}#j#8I=A1i2V;Mjd|wz=E25o#)<k{dY$%#
zc7FE#-xNhW>}s8bBvu4Mtqgj=TQ76>n2Eo}{L}Gs*4?W2J}puPKV2U~NL-IGS#1lQ
zD6go>9SI@$(k9_*cX!(3;;*mabzS?tiPB82jA;ymJ;+WCa53SbP(Ztre=j<}iOQZS
zmEAi$x&yf5Xk)3J(m9D#!_Ct;t=!=03VS-6aov<dJD2Z@-MPQ%i2Q-IrsAykUXog~
zK6;Anv8?yBGD?#CR_{)GTzD8i7^|-R-UO+JO;H5I-JC51LdtA0=^0!K<5o;Kt=V0b
znRw#um(%FVwQY_fFm89Y(9_A<_<&X;9we^+Vnj0*Tz1E9>-6H<az2J%T_^95&M4yC
zhYS`vSrPgoS*ImcZb_?Gcb%bFL7Sq8Z*Ox%t(Xf|9EVwT8t>gjbDxyvPwfBYnt7c$
z-+0Mbp??DV-$FzHv}x~WeM)r45FPJiV}YG9V@N;)kR<qOECzCp`65w@W4H2E&(ddj
ze==A6>KFp%xwE+kPR>?iSD2Z1ifxwiP(I6`xj8@@t+g>k$!p2xBQIHcozETa>59-U
zPJKG+rb0#et7G}LTMx63RuaNFcBecP$1bDNXGyL1#+=L{K$h5u$<|lEmKCZ3h>wV1
zQNm%y?##4lBcfE7d=5rp2wu0{INr_*C<`!5*Hy*LnNrzzj@_y^)33XM)mw4a?`7BH
z?Xf&|OBdOxw=xiDWhW61JqjbSJ0ofSsx{O@`4;iS5SD(EF~d$xGDFU>TTUrCSM1QU
z-upnBwbd~MF}Jy*Qy7Y1P$s#Hg->#kQpH!-1*Ou({x8<d%guSv`&pxZuJ`E&!T*1;
z_0G;n-4sKx9h=7$o%Ku;A>#r_O`NtOSUYdSV)iRFHxNU_orp2l&Y&~yCnNkg6_tog
zx7#xLuzR^n(29%Z%AOe4#rBME`9sE8YK<f}&EkN+eT&y4jQMw`KFzO~MhkYn=+V|0
z-4I_!z>e;WA;ON$`-SlnnxW(A!hVM%0O8ASw^iy<!ABK4vpqK2_716wh;V?*JP5ce
z&dH3Vxl2#uUHj@fS$Df3hDbUqjR|%ptD%E4ARN2tk6E)_RO)Tg66iHzBY|P%8`XBo
z<&%Sva?N0Ydbx+a87^=xfaYxMYIp3;{$6|i1m21_AFKCv!cw?sW0$9$|Fu4bNVYby
zRJIUskfyGS#A6dqvbiI#V82p7TVjZ0>&+G`H@Wa?y`2c4F@uE+7TuB(jL=5jk25a4
zRO$!g|G6}<_#W4O59`0NdZE5Z_rU+(o%+*|{{73CU=$(Z;3}inxD?dEW5zqiXXYN}
zVdinr3u-sdz`1d&`QrbY1Tf?HVF@I$QC${J2Z>_Jp&sN#q^JhO38jnKc{E8_Dhihr
zma!G?97i&v%-hcCB;iXXa|;f%y*99gNtJ|LXdhu%mwAOa^MvW2^;(P1nR7pqD`j7i
z&XK~ZFP+wL>eOi5p-jM2>?-k*e+=hT>b(V`?f6IfyVNt-IhKS}DX4`rKbaOkew>qp
zC>1D3rw5M32zhf(rtVaeub(Ej-|vQ!4n%a-$uMZn*_0b;?CJ;E!zbYo>Lr3~1v;Va
z!UGXG51{H7Vx5DV$G@B+WR1IF=Ygrkao-SWjs%;%oFsIP7nX**7kd3$`RCJVpqM8R
z9{U?ATqJCpPeQWA7&(4Fp`kp_-qgm$o-lm8GzU7HdGfy0#<cD2+=JwJsi(hlPiiE*
zx-&IG)ChJY7&T($6j7EMuRjp<3J;~u<4DYzBs!g%5S;F=g(nn58HcVXc%okT9APcy
zO`1zWO=<f(M^M)&J#qdyiT}4mGcPr#7>^qp_4oCdzCYrBEV0~bxf0jM5Gu#!v6wcu
zj@@aGg<n6-53Gykl}X2<Cx-YqHqkD*yABK;KPVFepx?#WZxv@;@{M#bcEu1b2bhMM
zLzX;#E!UpIdP!=p5T<w0aqFb6HN_A%XRUFdoqH`I5e6z57Y;9Yu7d8&Go_Mywb*`K
zqE%_9Y|9fUeoiT_%=l}4(cy|4vne*tcJC6Wv151Q&m9MG!x`YPuSvag$M$8aK2z=V
zEqxC=cBel#Y&ey-K9jEOj3EG~O)Smodcd$*TpF{hri=Q1FLSd!F~r8Sxy<DQ3%!z#
zu*Mk+Sv}z2$P_KR|Mx`jKm0t0_<!?sA7XyLVwmv%9Wbtk_aCQug4qRczc1w4`rq|?
zr4OX!zDqwamHx0&GsL-hPED!xn*2P=L95iWP0gK#lsQKzb%QhVB+e)21RKM^t`dKM
zZoDJxWJqC6I17|szLL$V3&Jp=!-If;+_43}YYw$B1a+aFmX1I|@x?hyDKt%~OQt!T
zqm^RJWUe%JrQ@GA)<V5!qo+k&n+Mw%f(9TQ?zSKc=N<@z1@1A?M#JDCfng0IY`gPV
zWz@-JSBL^~j<QpFxX`uG+u149g{Ilav5aZuG~+)$i8BTLU!sBgKgW2`Sf_sl`QOoq
z1zKWvKZ71)VY6(~W7)N)a%oj9xSMOGR9tl2snQ*=DR!uBHiX4$cI>uDTzcUSIyEOr
zwYg&mon`aJNyls%o|B5{P9FAp?L6;v_AAw~GR7li*^*Ku*RlhQ`}n#pdgV-Ne<tq=
zL9%S#E`lMO)ENW9A!(5v{3_R^!Oi@z)Q8nEmu=n^k>_k#f=MrEb@ovI(|f2Faxln9
z48gK&@)%X>d{}WlumLR;{pS3|uc&u*41q3fa^%t&H7O50p_#07a4^S6W40-V5SKO?
zY8HnQI4GGX)iKYk=Cyrw-Q7}c?Ee3+{|~!oUGh8fpI{I)3FZ-W5OfmECs;sm7{TEL
zM-beD;7Ed_2#zK=hTxtA_aZo!;NArHA-FHWaRm1xxIe-11Sb$YfZ#-elL#J2&_(bd
zf(H{kgy5kB4<mRu!N~-t5S&VI8o?t7PA52nU?IUGf-?!uA~>7ikp$-uJc{7a1m_Z*
zNAMVe^9deH@Hm3U6Fh-I=K|-61d9ola9HXr<FMRW!C|GdieNRtg#;H7TuiWrU@gHV
z1nUScC0I|ef#5O@8=cDuHW6Gwa3#T21XmMWLvSs@bp+S5`+vB0ux4Ip79swp$1tG*
zxJdh>b|Dh^zd)?WHp|_Tzv0+znS9ixarwL~r&=B><nnnP64!llu-ubc;EoiHaIV9_
zv<$+Yt>Gd#ql9=7f31!oj+V`XyU7i!OY#<r>nQOs^Y~eGEy&GojPU?k6YY?paefq-
z1jLz|z4$~bSH7&*#(40oEP=U_xMM0Q0GuX;FgU782$(LK`$OppSRdnovur6`G^FC2
zxN1@#-Ld2OC3Dd{*@nd%L(D9jg2zk_CZwAgT+QQF-bxqRNm6fC#}GNo<{YQ+5it=-
zrs9+zuT#u%a|{7*f%w_s3Z*kdnT$4-L8|XBG}$b)HoURJZ4XzbWrM@Q+F?PDvv&T~
z&#_-=xY+$aTHB>*yTJWF7STVi(BCx<g15f`<7wmX<{{<^^E~r8aT5Gr`o9fAUa3gn
z9In(MO>QbniJ@~Zr6FrFXNppRbC`|qQ_dOZ47G`OvVz>oL5_df7$4@ThB3rNptM#d
z^A8B#_X)OI%>`?mpmZsfQBxXC5lCQ%&bi<eB+Pk~QiC`pFEiNA)av<0saKtn6^_<>
zK)pjo#^gM6CYwvGwQwsV{*Y_3AD<$Ecfl|<+a~q9qFHlXD?RQY=L{57DGhSd3NI>#
zI#k$I9d=a+mF<FY>h+jb8}z5c(4}g3wZj&h^{3z%o9!$PhrQv55Iq!374-k1nt3&s
z|JUjt>0#Ze#k50{yWJB*;2oRPqHKbN(?~MPnsv@=bhygA$nF@T@7UBDQnKb4k6$4k
zS@4$zs#(@6+Z2N%1e-LMg%r`T+amGsN!-#2RI%*rHxxspo*v^^JBUI&CXcjNKp|Ui
zqWanibTM8oo%HS)V)fYMSu~|>6;zh?Jomzb6*K6LAs~;<I@p<93B9})QY=V+o;~e6
z#aw~kG}}JEDZBU)+?cH5$#I`8<)eAg+)t#@Y>6Rak4@>k#03Rjmd+L}bX`(AZ|x`S
zSE^-w4Dohtiqp~<d(fRr<?~HAd=!nQj9jw&|1iy`;ip%-O1npUQTsitfcJ(K@O=0K
zX+t#7YhV-jvi^Hm1<f`p5Fz*s<4Sl6e+jX{3(Tp|1E@7OnBDLZ@&ofR^OxpF$#X;g
zi^QC%s&LK%l0aLq-<*e%G*cQb=PZ)6XQ-k$N0Ufa;s%o_HOU!s9!%9*@JgH$sSt^C
zJ30@#5DEPh=cxEssVJ~>8l|R<zH=rCkkgmA^GK5CX2DKKZmhsSNF1JqWl&lgCNV7!
z2pwapf%ThR+xTD9q$~(QqJor5U)V;g&Lrni!b`70_15tX4Nv+h<DA2_Eu0I40Zbd`
znle=<etVbjJkAB&QoB14^oitRUXybH*ZJb3Rt1hd7?y(FeIl2GJ4;K0Fg1V+jS{FM
z@Z!q24vDk81Xem66Jobk7$;PHM0`-e*O0R^NpCuraMclKWpSuOT*1yNN-6hyh$CMw
znps)JA{|vh;4cIROZirCR#x?N`C+On5^Lz&YFBY*(qEEuk?2w-m+3JNMNG+oGc9?`
ztNDC5D{Ih4=+N@CT1u-$v^}C>os0R(bXKN?r*XoQK9m0)p=odEwXpgBss5#Lgyz;q
zYnLPX$0f$o+7ZUT%u?w2{7h5JZqhIl5!$IV$YXF8cx@s=B@ymO%e{%zX$m^jXlq(^
z@bu{SAdG66r!&w3V>B)aDex#Q%F^+#5_q$5cXg3(sDc)yPp9;3+}j?s^of^W-@}(z
z!Frp>8>=<Y4CFFykXEq28h=geZ3$OFVUt`?WVbRz#n=RAF>Wkp?s}?VqRp8s@kQY0
zXQ7*`{}vo<Hy7JNtuT7$tt_*dtJJ%N#S#+Eu?l9Wg_vo>fsM`ed<vG>oNso1xH<ws
zVeDTpw=@reD{B^0T1D|i&5ZEim~C+n+zEuZopHfJwS&0yMI*{!L29Q!&8OY#cl$&M
z^KH(gC;-lz{4Q~x70goGBFc3~ntjl&COU5+Ib$mrF7SWE|Jw=q-z)I>wTFJbRtXQF
zx5~G7*5{TO!r3+IEI^;a9Ee|Xh=|$~hA%Zw(3GC_Ni8Qc6lGz<BiAZTgW6*V0~pGt
z=pmI_BwY{EbrJl>XjW&<l0)S1d|P8D0>?D7S(?aIDXtvFRdnKxCwbL%vwRZH*BwLH
zKATjK@|tFsy@I4aboW14%@r5TE0k((i6MTUO`KM8n*lLex*v_w!?{aKP(QL^+u9fc
z_Sv+dNLBCv8#zTkZtD6gc`q_Gb=JptbUu6R%v9k#aJ$sUvJ2xnGcvX4jUh0fO?GCc
zo}puRW?I!1D_L)#pCjYvYhygJt}W(os_PI)X`urYcO=sI#@kfBY^Ndk{|9RD<#PmL
zd$j9+(hh_Mz!BODS^zt~CWhcK3-o=|`<h`kCi~Cv=~lsZf4}wD${oBWhJZn9v+ZD3
zRFQ-NRi;00>*B2JnjIfakyh}k7!aD(*=z@S@##2FI!fdfeDazdm$plV`(g+S)S2x_
z;DsyjGzI?Fekt|kvKFbj`WQk2HDuEU<kcmy&m<zch5B&n%Qr}cMq(8?MCQxkd9>Bj
z=?)etabYEvy!wK|+ACI^z<#BAm&XvT2j-$+c_{9OM7?I>uhl=`c2d=4Zw8eMsv}m$
zI5%0Wa8hyoqSObDDrb-ab=zht`miR3csxsVwiOk9NG;t=eW>f_(*CSH3B?dXcSklm
zL;1$BB#bP{rH#K74)K;8H7HFC$N!BQ&8RV2q2s^PxX<{x@s{zqIoh0VmYZwM?dB!s
z{pPd(-)i`0#XbJ}^8c0**f&p~q32<l!j2PKY_4ifj_!Rxo_-9HgI>^COjjL*6GGnz
z6g+=Yo_;)DMuI_j;cD`>At$o?NjHAjxIDc`&tv9+i~R7SQRN9PVEcCD-g){|eZp)m
zK!ENer~VHZlcyh~Pb}{6c7`}vFl%g{J{bw1<%@j*VW%;bw`L+Ipj{!vY4hQK$cK4T
zUE*bF(B180%yrOr%w?{4dE|b1`Ye57DRd!2oHu|^INdj!H*z9u7g&adL_F66C+0z<
zHZdNbm$}^p&w)jXW?h&*Ay1!+x6C6AL)Oswa0l2k?A^43^7K-?1EIorHr*XC`Kor2
z|0Lem8KSRH6oqGCmSvJ?dX?Mj1FM12U&7@G@7JNC=~V&L&TTC#JRZ*1m?H51&6;@w
zyvu%WTy2ci@7C9AZ)ltULyM|4hR7kFY(}X3T4QJ3k}z|;(%>aCiOS5hW}!=8bLub7
zlg_nXGuFT{_$6vCd!nK`c)$VQ0d8s79F}@~p5|a8gs+p=oAndKN?_<!&5mEo)(Z78
z#1hGUi6<FGm5D#SE>Y;IFUj!<*TfJ(BsUVpx|hOpl6X-2-$%v2{GL2?`LR0AU~kAZ
zbWGgEUF*R3%-asSmOKOTKp&j8#o*=s$ny>j-*3n`vJ+NzyirSIOF&i{2dOnd_#CD%
z<x&`QacuO>bS04GF@z9l%4Q+X%S`2`r83uc&|IH#j$0bH6)^-0S((i^oEMzN^Go9Z
z2DgfFIOQza$7oXwp+V4Qwb}tMI+fp7new2YJ%&d3a#<?G?*B2`bWLkT%%ADnZ*hP&
zzyjzQ!+-_Ana0cJer6+dgP&oifm%yCjaO0?!DfPoapF7{w5vtJ>G_y%@<1CuTFV05
zn{vUC$C=yh@MqxiBp7aHoF|yZg2TX0#DY@0+?}`(sML+KxVRZE8QCGp%Q!%-Qk~ZL
z>caZM2A*T4O^#=^;An&CEqK=j$Jy*F45h-s2;=tRHi>iRR@<#L4EwWUANWtg@j*e&
zP%?%BE{{7TSgdOn=JoDlXKoh4cO|<_nSzZA?zmvEmhfaH7-0K;o1)5nP~!(XP82o1
zBCmI(omK&zXaT2xGIODc)w9LpXNGx!fMAijY|h1EX4J!cqr;BKRpu3J;Kre3Mi@qy
z51Csj^U*drnTrE02pu1eGxA2;%vR%Wb+@}iEyQRY%kKYtZMCMYHv5c^jScYrvp_?9
z?C;>8JBHXL4LZ}6QqW5kzCb(ppzW@j0OBi{>5m6oyy$<}ty*3AkBLh1@8sBOepO}h
zG?HE_T+u@)0<@yp-Odgh1lvZO47PEdjmlT`r;cPTsU5zqS~~N4C&X5v0f!lD)pw=T
zfHrpvV}rWd;SCl6I@-XPFLW)Aw0Pls2RNY5>lTqNoQ-zBY(0(J+|`aaM2_ydBeoK)
z8)g*SZ(V#!I@y%KYJRah5)`(yjcv+zWfyT?S@oQ``^p29A6tPY?3vA4UmBn$hV5dV
zLRRVZb-N>*JRaB$cf$3Zn5OLStIp3Cb5*-hZpzqL6Phy7XtX^VIHRjw%t0cPpK$La
z-jIu**eL?KMmt|Ey04fwYs5h^t9g5DIa=k&<|;)Rpl$@0Vc|?zKoP8ES2vc97#h`^
z?!|YA+V_7`8WeW_Gjm`3Jg<GFAEK8-2k<=oUi~%wPsVU#j?rLjGrkYY|JRK#&9UZD
zW)q_Ro@U--zWN=U5dTgQ+<sf&<Pv?bjE4udfv!6nrso-rMsmZK;4EN5Relyomy>fV
z7l|i7&OA6)bNha0BZPC^%;#A#Rxkd?!Cs8T0%V9!&IQs}?!;Hv_KB}H^ANKri%ab)
zg3QdG386i%DeSHhNcE*$Ex_U<UQtX8Q6ogK9v}7)umwmO`K#}zz3NPTwN{K?V;O2%
zh8-As>~4lA_+SYSRAH)XvDfG3nmW#Ng+Ll#LZs;00uj2W$F(_vp7S~`;)efDy!Npy
zqBM?l#LMEJog`$`@y~eL8m>pcvO*Zh?c`bXAFO_HD?7JM$pfDX?}HIP3rMsWrh@Kf
zFLpvYLg5V30A+m0tMN*2eeq)W+jg37w(Wa>5wwGb3c0GV@#BsH!j@lD!+}-&i!EG3
z#o5SXlE9g_t0d4PX23601RBvPocrwBIcHX$u^ydD-{d%XIl1eb3{1Mcoe^3k@O8&?
zTt)5YzE|18t%M(=%7CkyzrB_gx1CeT*~ISu0<B1ch3^r@y~ZK%`!QDgJ`$||t%)H5
zMSC`;bb2?6Qm&80pTSq}6{pc*vah3FJ=ToFaD-86`-t|j<;iYxx2w&~Be;N_6BI++
znB`^1)0LtTQw-@y#GUR&BZhRR%QqwTh7X%#x!4>_6PqLR4pn?vw(7Lnd7Zyyzf$x3
zu?<XnFpC#2X$l&;-R<qT!cq>9#>}+i-}8v^n0=O1VejbJdW^^Z*<2b*Rn~ggomm64
zwwN3L;`G?$=8UHjPg{U5)5hH2Oup(P(WD8VNlgmI5ESF&Y`k)*LF}3gb@3=>a62sM
zLuaE^>bzgRB`O_xsZ^;yh8UJZ8F+C3r=7BND5s_s@6T=XYDerbRjSY(Lww6k*{FW0
zmvrQc@lAQqe&zaw=+wUVN_7bQe}!gt8h<pJ^^f&t?PG0)_2wT+Di+PgAubvmSY8)j
zI0#PwWDB}WAs1Kea=Cq8(W%_uRKL0p@9OZSGG8kk<9_9{_zshYQ@&<sV6Bpuogt2s
z;cd4_Bi!qVF>mstjV!)5q>9<e4}UqWo}e!RUo_I?)|mD6viqlr{-3nB)R1rt-sE>=
z^PMI&BYu0P-;asgH!XSDNnER-cEo<mrD}WgV{PdFP$+<U4_MuZWGHw+A$JSR=Up9)
z#Uo}Q`}^SWyTk~1-;$bga?FF4<Y)6sDGdP|>P=oBJPP?;9k^*+LBu~3jZnT?`s}M>
zvmNk~R6jOF>ku~uBX)oZE%vm9*-g(X1q%gX%97Y%WA1OdPXACeY2NRpCNcbfB-H)!
z^R|Adz7f&Cb{q4IEyg{jY0fiGHy;|xuK#x5*5~2UwN%EEW~I&Ub?Yw61NHlF6`8<R
zoGZ)ofRWfKBn!IXY%a+Ik!PnAj!GlwjNgNa58^=dw{yOd^Q=XAz2j^Z5yFmfcQVcj
zNa--vOgF?r?6DgN317ZvC^a3Wu@12YxLTP@X#_tYQJC{GrFN#2omHN3@vgI5Id3|g
z^|iae?CNs+g`11>Yw~*GmJVhfjPfmNgTyOTR1*n#TZ-h`1Fjx$b3uf#$PFOQ!q~uG
z^upB|Y3&fi)P+jBnT*1k-7PHwd+D}46=87cf`|dcdH_Pj?P3I7I1q4!0%T%!xsn4b
zHK3bc2`+Xg@Hsr)_L5TZ1)R&p{eL=(|1;aT!kDgKqL0*0|91O$sJU@NZXV(d87H-^
ziRc6+Zu#2x=TpUDc*uC^Fzj{4x<o_Nf);5`>LPxGVd6I>tXaH%?qRY4p`pYjk@dB9
z+Sk;QJu@73?HLQ8B@>J+GB~LvOh(=mVCG~sOlAyUdx3z@wFI&Z+#5oy>}<60(eg*A
zQB#*l!{dt~LQ{7(-?~zhGRfaeinz=1l9-Lj8M84q)`>9~3cs$E_n)!T;rbOEbrSG*
z2N*7e^G{5Qov${%&HZ!N4&Na+t0RWkPN8gmIi*o(@c7!8mp(9sMEz32!P_oCNcb7-
zR~qmQF~oNQ0brXLCbEvI5p*AWnDNEuVvzUxi&O=>|3_&p8h&okzJMym>97I#0ulc<
z8#h1;Xzq6q1zc^%Dh*WD&Eo8;$^#N<=hP?kkkBO-7?BCW6X;`Ts0FF;&^EQKN$Od>
zXLH2s>EsS45&5@=UBwN!*7!tSp%mRnr9f>l%sEm#+a-3d4QaVKeQKp~xkAVo;Y3*o
z8Ur1Ex_|qW0$n+OCg)*;-P<;GDQ~iU+cNwZyarsfn0<EG6}LluCly=XVH+h(mW2h7
zD2tE%cH1{ED`bh!f{E8_7lUFYG;oPgLx2T2<_$R2_NHRl)wE;>+yCR?>;peHKmzc&
zJ_;Uym+B|!H|wwJpCb0>u|~6TmT{GFkMSBT{!DX*SqBNg_szS_w}yJp+x?zcq)80C
zg;?jzi8oWRDt0aNz{H9v>@;kSKxog$B$E0SCf#lM)d08rb2ct!d_!?tV{o~Ni}PyY
zKQs0{*T$+1z;-O+4~qyO&hH(ZXB2}~Tf<N|j4R?lvYp(FyC!az*28V>oHn>y&h^Bo
zwPJ*M63jB{T$I@JkXEx9W$rfF5_dyr!MR#I@+2RI>xjo+=SJ{wMmoCLK=D`S(Fo-@
zXo-QJ>ljV{OnFF>KqLDRD2&q@r4x?Ze>xj84loixG$@WI8h}h5r*i`d9nuaL8d)~1
zIgSpR{^XaL2ZOL9<SZKNZ7+-(`3IT1n&yX9kY&%NG#Ii-Fo+;_fSMeWm8|q2@Lv!l
z2A}WKNKnDbv*u!W1peQwnVXIGjW+$a`dV$b)@*mD+WD?`Y;5Zg(YUxEKC4_VA+FE%
z)%vfu3B+eipM?0hV+a>E6y|C;kR<;aQy#Pnmp1Y`hF5<f)p2rc3wk~jep7jx&?!}<
z)Tn&5;i_{)ALoB6)epidf(8tQ^_cyL#i^O)1g>yACmJ$LW_+C-3xBJDNR_@x1CjEo
zHFlerh~~rPfyj@A(13q~2Z=M5?Vb!IvN8MV82;^s+IfLrvR}C=BVs``Wgnx)HdY_!
z!z#s{36`wti^w&96*DvH5ve(X|5vVQf6$N6JM{;&a}n`-K5qP%%!yjL*<wO9Am=}|
z`j&(cvP%^=GX&(|*|7VI`9w;^&VH~wuXlzmBtIVGn;UmSQq2#+W#FqcfUhF6%y+6a
z0i_mZIV#n5o)%>UnJOXJ0Ie>DK?~XMnTzuvMYBV}uvQ?5r^^rKThPTqoG}?U`qhHS
z&H~%H(l!>4!eAd=zLhJ6CtTDxPqE8{Yvi2x#n2%@TOeu{ojKcfXVm&SV9N>BqLXct
zWa`5BjkjV*t;)ezZ?(<%B@Vogap?&WY6F*^H|ZMN+)5kF8E2q24;&FYYse0l!`UhB
zf5iVf1&$6+)xXf)+8@4M>@Rj&^p1?ND0t(HEZX-Ln<hK@#c`&rp9D&Hn4{X^TO!gi
z*Bv_r?a{Lt?`5{fYS*wvSfqzfxJ6t&;fJJ}A@eyIRS!jau3qDb4Z~$V;3!!r$;H2!
z5)ITI{o0%CS8h^4>?AY^x1nt|XAWhaxE7B>*+;wTR88DJ(+`u{vLm(~O&N-YB0C$!
zD#*aTQ&x!luJyQjF+uK;QVV)w+t30yytjWJE7X%zdP_~$yG8H!+9K7xBi1v--e(~_
zvyi3BmhCNiUn(=2#s2Tt%&0lixWF*L|95KrIdA;`zz018&LPeNTM1V8EMEo|FIG)H
zj*r5yFK(3Pp?Bnf1C<Zuyvi+NYs~pc`-ks}g>j7RBCKN|Z)i+rSvJ%tC9GX~t*B}Q
zG-?rbtSDh)gT9+X>^mFy?35>;f~=p^nLiK>I(mWBpzZ+!?HS5htzZOzabU&2tbpay
zF-;TLuT=B)0Ub3DMHQEgge9HN2f*r0>)~~x-!56dC^(=EO{s}hp20)l70apHP9>Sn
zSeZm*`2T<Xe-HgQBmc>6g3Sb52(}XR5NspZPOyWZm*7T%n+W;{b`tax3=r%hxS3#(
zV2EItV1(cng53nS66_(kjo@~IClNfE;3))m5ImJ&FTp;7rx84z;28wZBzP9V?-4wk
zU_Zeq!5F~-g5M{24#9H?o=5O}f)^0Hkl;lGFD7^i!Al8VM(}ciR}j3C;8g^#CU_0O
zodmBXcpbqXa5(6^p5P4xZzOmV!J7&Gkl-x@e?;(Bg0~U8o!}h=e@yUBf_D+To8UbJ
z?<M#Xg7*=;pWp-H{@<#ZeWuem#~7_|)pc#_(D%bobM!g}SQN)0v!;}MeZiViy)L|w
zTZ7h)IQpN`nI9fNAjhF-#bs#bb1E-WVV@<}92DV){qRcJ*J<zAff4BcP=wpI<OG(2
z2U(i1_~EhQ4mx<LG#V!l3`eVm!m;cYEFHJ2ld*Jwc6Y>`?KLW2dA|3lsDG}k03IGd
z_~xO^hBb4d(K5N?KDq_>__NgQo`C{%dnh!3N<;)C+){S5&L!#|_QAiTy0;JHqwb*~
z9ZChUM%A0f1-}skKCVluo!$R?YG-NMPqlx+_IH_nhIW?zxc;><-Dow=GaiNy@EPX%
z|9Jc_Wh|)*Uk|i_+lrVaiiqM)x-7$9wawF0u0v=4L1wv%nZoNG_7kOJzIe-K&T&;w
z?&NMCdJ4Nc-NT+xI<HG)IobserC=&|@(j;q;lx?=USe(z`&rJxW1f7%Ko*w;NHR3+
zr6J~F{kl(S{~hlaTuz0cbd#>HJnY5k=IX42TqN?b19RBpc0Xn<dO&Gt8*fnsOnZ8S
zt)AShSCp3B7MXe5?jKSP*1$(|Hc%`bNbexemB#JoIjc*_%p3UAA?08Ve30$`eYLwZ
z{Jf?8L!S+wzuWce^q=dW8ROyYH)ISNzc9Ww4=|56S+w8l%ty>mhI-e3$KR8Lol!rz
zc;qA~#-|oMJLf5L@(d5e`9l*Wknxq}4dXnU8fSxrcQVP()t|CCb*@M$F&Dr3kUWHH
zcE<I=t+~-;LYG?-b3`6&KW%9YIs>H1V2|ZIGtXFyg6&#2J6FXs*w*?cIenX)A*oTa
zl7=d)#x}|FRhO#sEE2@$<nuVsphcrlrY4;Lc0_0DN>f($vO7~1nr10%N70#-A5vu3
z&TfYP7ig0-^Blzgx!RZk%ikH=rAXlax(D_FZZZ^B49wZAj6%U0wMt(%K&BeL3?B8K
z1AC+Dp(w!G83PFJb83XID&au}Ye(#TmxL^VXc>z}4TWflD=I_eX<-wbP*k>jy?SSj
zz}hCtQrqyrUPD8Ztyd2>fXi4^!%wf^)ec|uE2;nffjx(20cW9u)R>v(+mG<_(J`q)
z@FvG#z=y(@&27JowV1=i`Gi6qeY$q|8rh-3+JVvB{?)eN1X3lk^G%xkY8Q4<hY$Tw
z>ac%c)X+xQ!pPgg@Voe-SHwy>P&V!q^#3Z&++^k%Cm9YsjM!hRzKa{Xcl5vkn7g3}
zzHm?Hy3#p&GyAo_;h$%V^}EN((&+Y@0~64skw&>~Sx;8AH7J3o^?EnnL6bb~V7VD1
z2gVO^Rp+)M!O51x&}2=Nht#MYG5->&LE!-e9v=$TZGDe5S|-;%dXQLqQ+^~>+nYDQ
zqLO1eY;UIw=1Z#bNG1;^<*k0qA*N`@Y)xuM>i{B?2eNsMm1M)|YKrMvi$~r!AXeXT
zpGej8?m4h8x;vCBjZv=9@f7w8FbRXRdU*SQQV9YHz;7T&5ILJA$4B-1*3=&Je1!c<
zjbix!URo`jnrSB?`p3KazHmI)4GQ2nV^8?VxD;ByUjqAYFbB*#bDs(`%(dAmJ-E?p
zqo~Wnp3kDdF34UYl4Zi^k(|}UscS}2K9rM!hhB9xw7dcl@`*KUS56`{>Ev<PV>wA_
z9BWVpf-^^^)XNFAho_lM*#~MF+{5!vUzlPxWdC$I93%!p!=B8hts=%#d<i2t{s<Qn
z>0A{=*&FtBHm-`IloTSnkd^UFHtl#t8P$w~!pUG>#8X*J46I6+k(iM7Vb8kEQpJb`
z+F?$cUw*i`MD+nw?3rS?Cm70WRoi7i%`E;I=S<b~KqaA#@5elk(wjdFvXa@BG3)kf
zrnpv0Hko;Chr$P^wQ5h$1DDL9fInpBXHh3gd{tDD_!G0-2sQUD-Y_^$Q|jR&Bj74;
z^@h3eqgf#C|EZd}-uMLGzaP=7wfnTG7CXIn#K0jqy@sN<n3KkA%=N|g;xXdPE;>>=
zw}2TQJj6RRx9WUj&QCfE#HBvGw_j>dcmN@_hjNEndv9s9OrExg$8Uml{j*ZFy@w3A
zFb*>ek8PA@NbHUwF-KPI!2^NU4zD|2Zl*qPAeuQ8$1d4)>awvo>W*F{*31m~p6?n!
z-0tnhk+w(5%0|S>aKt}_R>dlrx!*f+U?TcG*;sG8(sW!Sn;#(iE`v%tG%+TVUXvz<
z?SFXq*R%z&0G@6<YHTp_^(%1-e6F2iaSF&uH3Ns{h!0Q}=<=BCzp+1k*U1{OsBK)4
z(x2ak0Un_@i#vB#R8iceaxr`>aU^I^PO0CI_jpm;z8^_FUN(R*z3?fko)BI|xf`r(
zVQe*+{QEc&dH}`#Q7X1>08x6E8d;+M@?sgISF||(SKW#6mVPW1*)f2?yxweHZg`QL
ztM9^X!iapBf{5a+QkTq(S0%T8`2ZsHW_60ot6Jg*9^>6AYDjtT?u-{KBfaYe5RP|!
zHfvd4FkG*}kP2}ymk1l#K`EgrG465&9RrBSn|qKJc{`ioPK6mnRdxi(fPT;_b$MO9
zFY<i&2Y6iGEQ*4>FU6g(HEx0R8K$ESaiiPF7<^FiqI^ueLU~p;3>?N{8Ryy!JUT{-
zyI<#^oD!a=s)FJFE*}3^`?dCsK1E-sw<6}>x%wUYOZt2ISH>vgKx39sX>`C3;DGT%
zW0&zZWP;<&+2$g14Lku}YW~=K-uzHL82%TZ$x2L8cypdk>|3?(1LB?9A+jzeODgs)
z*D=VDcJ~XHZ-cXrn!#4Vj1q5HM7DI^DT2-o&YDYa;7o?^pvOf_xxr$1xg_^+KNl8=
zs-@z*A^x7cm@><+N<@Hlm56QslHl<UA{r08pb1Yk_X&H-!DNfx5<@0$GUrWW@{Eaw
zbFd`d!Y3&!9O7>i6}%}d^#;p4%>h3gHVYc`5i!<-@PG?nt~iH+ZIPBuFc%<~xXxcw
zK}j>kr>OJEv(@<{!3Q7YmQHM(VI+-WguTH7G>Y;;@4QtQbPiSoB5*kt0Hu|*ad;*E
z4#i+Ux?ObvAKZrU(SJ7e9XmQx-u+mZ5Dr$beC!=}L&dZGjM^b@G3WI(c<crL@~1+;
zgU#5@%>M!4N03(pe~h5n$SCt}5esmT3G<j)C(rvvycWc*55fUUA|CTEsbvd2u*Sw=
zhA1O&V$AbALBnTts5x&G!3785rx>|dzj&V44Q$l?v?uYu(FX84-OwlKi}Y>!)%x@L
zN7(!GAqCnD51_XgPZ}Q};wOs=(qW!#USvM{zqrS9R;Ay@JLu?JhS>@s(t?+pygDw`
zH2oevFpk}jL9{kQ4gsqpAM>lpM_>#-crYHB)E#sqn1rxNK}<ybadAZ0aboYR!}rgV
zur9ZoGUrBo{tDR}vo>4kD?87`H*b=VDJOf+c{#p*hfbjycMxt#mM{aWF0tJ2!P^go
zB<;hQGuL+o1K~ip2L}~=XZyY3o*78#49u84bLN~G?#^IKVds$%=NHKI86Vhutu6?M
zo^IGm7s9lqB|i_Z{>sNKf7<Lhs3*cgU(a#p&%#pDcr)@BS9##ly|}9j#!zCl=QrT(
z9(-}<Z)k!#0&~6%Vw+D^eg|IeC0_O{f{Sw3lxo;s2RNyke=lC{FWS<x+#PI3bWa#I
zvpLK^8LtlJa<cqimPT*_w1L;cc3S)lE@10>D&O$=zpR5FO?I}x^2|;6V}TRzi}-95
z3@ZyLV&&nRV|b4XhJoORb~8C{hxMFsA{R9m3~S&{h7gnzOuE2ixM1R=UvNA=spJPl
zL8zYMofn*f#3lT|F1V&FC92<#kiL9!p0UU%xMsOmAQCJv#gsZPmZxhu#tY%u`KT1!
zif`A?&%+iic#TCvL}XBA8t$G7A|HO65F*IcJe8v&m<C~USLO}11jOA?@OyUukJV1o
z@N*w*0Qb?$^v(KZ`lI^i#sToP8bL&$*UgdUF=i)jdL9KJ=T;o*2TG3+9Gj~11X#P7
zIi2{E@7iA!f?;9FDiN8mb{YaLUQbwT^5>NtL;iWaXG_2rNu06wW-q+KvlYU;7G{*k
z+w!22TgVG<=<tRU+#%=v%Bb_=<2ZS6ORn$8dC0>`Wg}6Z&)dbF?<Xjw+ozh1Sw;>_
zxW$2P-mj-~6peDzxSGzFbF?`e=;8(cM9KXWZH@%DkXw7_b4nf@|CEPW22(W%C%LeL
zZ|DdJM+Yw`qmGJf9d7?7+=4hIQqksDk1$te85(v<`-scuyhF+L6*VwTE14$yVfKFW
z@XU>3h+fM+_FQL#2dXH<Kc*(~O!k3dj5gPjAopsK65hgj7o-1&X)BrkuX)CApzkwE
zze=BkvtZ>=x3Tp7nt`Kp1gYTzC2hUI^yg+*oNkfHzLtTbSQN=3wd9BwpLq`sW+Z8k
zinuEv>SgPQlLqE6lZ@&dyn-AUUJeY<_fou*GX3WtIFbpbauJ-W$sJU@X!=@JVe`Oj
zKB_tTn@Qtjl0A(d#4C{pwQXP)lc8r}!||z0;NB^Cc@iN{Cc00JS0t~Il>;+*K%N|H
zByC?0rao!s{yAQ@+==FaB0D41ka7MFW+W}iLjM=qq5o^)T@ZVl>xc8hU{FqRC;B1t
zG}!&Wr#4N)PrcTsJ)nK6&)2u;x9gu6lZ|!8#m1ZP`o9o<K%Y_{?m;)qo@)Yd$=(wh
z(N$!+6^Cf*cSXfs&RiR@U8z-Cmi|55*dyKzi+RZUIO0t80i2evB+`t?$0E;GwI8YU
z%F5i#nF`Qnwi=cIm1D{~cx(VR8Win5Ln)z>iel6`yidY?Z7Tvc@V4(zN<P!`#sfT7
zx&=)#;&i1xX?jLDgI|U)%e?s|9_sz(`6itAS$WNrGQ*=%D=<w&FlZN^vPT5fw@cb!
zS0NI>Vnh`Xc=?EvY|d>J<_Ll*ALt7{K4G;GGQFuH)KslI%#i*mU7%1Rts+Lkh#s3`
zoLU60{8XELWf6ZSmv_P+70=eI6#Jz&d9gQ)*c}LR2(NS;Ss8JPT3ni*RctZW;e1;8
zF#<|}S01t1S;4Xe+D2^R5q*OH-=Ueen#+v88ZqM-{SAGGK3#i412y*D{aZC~VvfkX
z{LoKlE2VRp79^OM@*&nbfav2{V+y9<C`oQk@<K_Z0r9DwyXUp+SK`Ol4InbN9Tq>~
z=7aFb#C<?CCQf*{<;w>UayvKQy(R#E=+y$Z9ZY$sObm&9_pKX1l<nMncbS$MloIOR
ziC=(n%j*UZW;^#_B)DOmC(Rb?Dj|ykwj~$YF@U(*xmo#^>_JPW;gSSmCs(y<0AaPW
z28!k@CY^R0OndB3;HEO#wtQfook>mQ(WWwNm!7L0^SO4$9M->riWrRlRi_*XvHurp
z=C$T=#_x<%jB&933F!O59$?|nc7NLdVsG0->m*jJ*oEnd>y`Lp^8n&-1NF~=q-N4c
zgBeL{6U$rPKg$LXeLJ_5Foj$mO#Z$8()bL@Xk+~V;;Cni2P%$1=DwS47Uy7sWBz~G
z`wsZFs<ZDq9A7yh6B0<sP#__TMA?IF$MHzKVkL1xhArE&tyq>ENw%YqkhsjWSaJrV
ztTI9udympW8%Uuovowsd3Y1kgEl|q%{%1(K_v#+$n!?-f{l4ZG>G8d~=RD_}d&aXL
z_h*Sp&GW6Q2T8rNFU6!(KPlgLKO?HLu?P9Ov+t-DQs{l@_iA<|(3nTLt_Rt>vn#mL
zG$(1gl-guZ%p<<K2U)u_X62+KUZofP?$ci_yF%3Z`W|HL&OQ;jh`~9zrX|Wkj)OjD
z>W$>B`nm)X^G>y{C*KYq4Xul>GnKOzhlKvR;wDk`g#I5QZIST*I>`Tykjvz5`Cj=I
zWip&JE>`}i4pK|i?|&DPKcTOZk?5gu4Jnaxj!pWN2>!q+Kuj9(HPdkI1G>cG6a)R5
z*e?fcvB_N!{s6oIZQmJUL8bu-1lPzg%rbHf*k-d+E1)w%W@6}qws^whDZb8$YPpb}
zZw>|^-fHlUd`xT>h=EQ#=7KPZ=C?y&4<FGvfu9QosCNv(HS+OHeM?rtt#i3naOBgO
zxD`_&j<tdq-%*UOWg=-)g@cVqu0`^`l8o21;ES0?G+7XOGb;aEg1!><2QB)x?V_AD
zEC?Y{4K4c8DLL?y5ph>Zw1pnz<*p<_-SWY&ccqjFBcB&Kf$Coqk=>It>NF%<fu}x-
zwB{85A2V?+N%SC{c*t88M|kAxO#W9ZsXtMRl=pG|4}|s40_jnywr{7u;Awx4yT8<y
zDeM;AeR1?#31lIRvASQL+>y<jWm6B*ZQGzhEL6o-`s19c#I|WZxaxb5f;;=xkCg8w
z8Tr1nTiX_jkOX?F?1=vo(NfK}0Q&?#touNW5b3tF%NrA?7m=Trd!fMNRshLk&Gf^x
zhTMuvR{w!~OdM692f4VjBNU1G_X&O|pPcAny73osbY~~)bQT#p>x}A|iE7RBZbJ|9
zb7$was!VFBeWn|0lgG5V-K%<**<mT%I@QTO-Now7qL!2M|0wBR3IG3y$bVmf0$7On
z-)*1*E|7174Zy322Rc+aN|^&~U>$6LexUqFxlegf`B)vIPEb!$H>f+IJGcurKradQ
zfbZ-!H)$}EI=R2*CNMfSIro?RQN;7EfnEk05VC3JzQDERi3yz~$8vwe?Q9aim}YeD
zW86N&ENIQWfm@Z3AGk>#IqxaDXL-wXhI6?;<JKQ~iZgdV^ZDE-(0y|29n<8={R8i$
zQH7Fw2Y=ke+2`KNEqM$~ZSLLNiX~y4n0syVMndDr2Q5vGoqHoU=}9p{xep~CPTL5d
zNYtBPR`2Aaqnoz5zvr((u+DQIWe(ngb0YVTd~o$L{oI?lnT(ZzWbV&-BMiDY-iI{q
zG52BKJb|7i_f}>OvX2DzB>O(uEvpev9;$plk`#ajsP^)NLeDeAFS$wPJD#oOWoGO1
z7t(y@Kf3}+ndww|g+2aSCCog0JR<AsZ1`UT5sO0yIcP$;e`R)AZxq3{!-*+|8Mz_|
zU1<o(plCgBvh%-zod3rm$M0rk3|4)u^bSc0@-6*?*X%mjK=;d(Kax@bHipT@P!<RU
z2kkv;`%9ZLC0b_8x5$W1Xx_H`F46W{-E*oPem`Yjw=enUiXDkc&HR2-&l)>aj@1@K
zHAAL-X?aNkk@;9#-Lu*b?`*JKGuW}M{Ar?U^MSUmr^XIjYcf|enXi?sPE>EE&+2+s
z*%2(jyvS%?x6gbh{}~aAjXg+j-<m0%A`>iF+OJq|?aMz)ATvubR`sl~bN=hMt$n(S
zie$y+xy0mu@c+M3EmPi5&QPYxzmiXa|Nk>mRFYQrH1?O4$;4KE-r<(aO=`1IQ-5wa
z{#V4(f2sTaD}|Q+>w2091)U+cQK~+dew)+pc^jrNL?_*DPIlSQ<0TVdykeu}t`w$R
z-R?PrzKo2W*w%w|$eZNi3|LlFR<ChZ7CBdxEOD+`l3(qd901=J!oDABRNa|=P2xXa
zIEcQUdO|;E$OTLp>NZ$Uxhzf*i<4#LzN<i|pG-a`T76ZIr@vGxj}y;@BrY}i*UH<j
zA~T`1@VRzjCp<lMgh$LY6FQ*UgSlS0XCusfqAvX*sXsB-zWTVJ@%25mp!?-%;>Np;
zI8@X1+K*|PGIS&;>_~MFvJz((?xyUpQzqFfUrwz2^o<f(hu14pvPip4lr8poJ*B(;
z@kI6JEuPT-{gnxlGC`@v>c3feUhS_QuZ9rm=TG0#`TyT){+EwHX5&fI5&g7S)Ji<J
z(yXs?Z_ix4nY+tuLuX+6GFNO|A-OMPZg+wa)Uk+Si5ux?qCgtwD7KGb#Z0z5HwfL=
zDS2T<<UN~tj1252S^xiy|J(Nk%HyZr%i%9M{1u1yad<z6zvl2a9Pa1v0S+JJ@BoLu
z<?ta6ALj6P9R8leKXCX6hmUgj7>AE@_ymVfa`;CMpW^UO93JHGX%3&^@L3L@<M7WM
zKF{F`9KJ~5OSvyo_?O&QD10sVuN=Nk;TyScQutQx+Z_Il!*@7*m&5lse4oP)IQ)>q
zk2w68!@qO*4-P-!@KX*y<M5vxe$L^)DEuP#OAf!{@M{7!Ns~ELI8-^z;jkZvxg2U7
zIylVZus??bI6Q>IfgBE^aIiLn!=W4w<M2=p594q+ha)&VoWmnH9LeD*4v*w;G>2mt
z|9`Ti{!E=Mos4K7Ta=^ZX1SmALtAU2rpHH#LYP<z7=)^XqludQE9YNDr%+GeWd#L7
zV#?PO%tG2G>vNSO4K!@)i0c^~BdB2Gt@L{vk6H=pkbX?0ZEX({+j=tvfJxyhp!z27
z7ADer%W!$zQ{#bQ1^JjTbT8;3xol5Vwu4m|Z_P@jaCne#9yEKT_Ot~v8|OAHn7d&5
z?75!#)8~5U!8yk>uW9<C`3?0=4NbF~X3q6&tM$Vj#yewUdvoqv-?->ehtOA2^!ok2
zHczwHwXxmXO#fQhgM7DZGdVV=8eRoEJU0A^zgi<p1w&HPgXFgB6~a$s9T3PUxwFMv
z$v?yWf`XdY_G~1)Uj~LE)#4S*`-wGLcM-T)7StZ;LDI}<CMi;Bpb1Jvj~`Ju1Y$R#
zKyJ<{lu$1^=MA%?{)(RF{!+0_{L2L^ErC`|{4uABR#x)j)sG678Cm}h1pGi8+ylyb
z`Jc%D^D*N8rAGkq_aI;1CS{J;m^wA6#L<p~f?i4-p<7tS^tUW-N*4rUf>B=G(@8Wc
zgn!REJDP%iq<3cXKlOKVLhm<C=+>SN+7mkyk1)+dV*nQ(cwkXu%iOmtZq{!*hAf|w
zz&Qc)%0H}!<i0x+<`n44a7!UdYUFHt=Gpe)lP}`ydRD}{IpS*fBOfmL%hMAkLc|Pw
zWvW%xUO!Ar5JHA|Q@v%pZu#mByhN*gwW%jWID40!mzdbN!fhlRj$toL-pXs@eKEh%
ztvw`xysRv?^G+AHgrZ@OA5zfC1;IcEMB*X1%rVQHw=(>=;q@Vc$%@^b<c<H1cK2lW
z`@Xv;iwZ}M(Eo!G`WM;%8su{!`+Gqdg6!XIu>8MIbx1F&<%s%wr!89G|H6mF+2Gt&
zOUlZKT+UruT(ZJNq;r+{s>XHU5(Hf--2bz-Ai_7mmfbmfMzFbgOuq$cShifg)zHdN
zXLX`@2_H+$vt7)dWd<B#qr#|8)xjw2luD3aSQb01r5<t>dmsbDwpxT#=H$SV9~-Nl
zY;AMmuJo0Sd{4+alApnfHxd`oilQ<n_4=)JuNe8Eu(7m=yTKC*k9=Qf)}MOF<qrD%
zP8xg));aze<yCV=ejp5GM$4@Tbr8FFf78g1#19%?+ZaWhH_-HgODB~(Yw}B1lvWfQ
zU+x_Ga#e9wa8pHPOIA3GD@`+G7Of;lJT95!yt%ImP2t?0dU#w1oQ=M4Yp@wsWYJTK
z%JLWIT%Doc)<s-+#q-eWs*n%!dX=vMj@&*^&KG3;kAb@%{y$2yf6tan<vPRwKTp0|
zzFmGo{ws0;9EZrD7brhNHh|Y?Ebw`-32Z>dzzfwo)TjP4%bqE(jpTRkdn~GRrcFHe
zL#Cj&B1dvR<>gB}{wC_OYjHw+#<c8jl{%LNpyTHe{c``sZ<oPy6?)w=AESdmXDVC^
zZY1}8rT~8{K`H0H!>cf!uDKtx&>1PhH}`M63l?-p?mw7f_$?hNoBK9X48MgCq3t}l
z!9VkJz>4(!KuK{L?|#D?l1EbR2TZS?WLZ+be8d}^BIa^GVXFKu%3(MO_JmPlU$cDK
zU${Y~6?DMmKI~lHK_cmM_iXmmS8PbWfWblpkx3}2|0R9XnuPGVVI)xuQF}W4iWf%=
z5NU)12a7}?A%;mC(x*ZN?_)m<pcQJ;l8#WY-NWwnqn**DQop|gUjNJzmsXQUr+_Av
zd623W0lYm8gh!=64dfWG6T^RLg*O!9wJFrDL6gc!Yog9-Oe!?7x`UU?Ww8z<q85X%
z7C95Z?qX1Atr`tlfq)Ic5JH!uTIVVR9+_P157vX&Nk$K#&&mVkf5QJ4{C~GP5z)Wa
zODD_cBMI6yN}jEC-O#g@>Q%)2|0=J)6P{AkC<VPxP1n-bjg5q;%cy2+=-EzW0Tad4
zovBurVVW2wP0=oz5ge3yT9WA89+D(<s8VbnPv)7Id1Csnc&K7g)Az~8#4~t$wq?<X
znft4s+xm%KcGOXvFWG3qf!B-BC#iqSV^V)<u{=`zCfNj188~v+voy?Jd0ov$A#>^J
zIn6eYVcJhk`|I4c{Q@4t)3e1k4%6oRmhrk_`a1&peoar5GNa;ok>Ztfo2+ibJ-+o*
zLET$>Hrr=iG965BW%x1j`C<Wj#{VP#SG(#!{Qu+R=j9gZlkYwQ*l95biN&}W(`}-)
zIE>9RSEe00)AlXDckNkZ>X-k^!_z!&o=&zrx(tFbjch0jvSPR1VXZe_W#~Wu%rMsS
zu<<&Kn_{^{=&&d&M!}XZI0}?QKmR?&`Sz@f*#g($TpR00BzH$=#i>8Y^rxEqy9H0P
z9&PANtKAbric*g<C2Q@bz(J-!Lh|4L_&bVYf6<p|IGSTBS==PbL*`jR4Fq9bN5h=Z
zlTAvyCI95Nr!q{_Hl$(l#uOp~o}Lv`+F31`@5tvJQONMjotcKG`;ZvPF*-nTXT@aa
z{I+w*%S|=+u=dR4W>UI2!sP#RCG`Szkn&??uKbWZUz&?pfM=$T2J>I#F(g4aSssoa
z2t<*K=gwNFlCOd5Z@7=*-n90o!ee4Z3~42p-GtyRld4>W!9?t-!O1_ne)9^ezJRC5
z&~<HfY)HapDpR#fHaB#Hy^M4kth*>%@NmU~zpW*o^tU)DHVAKVpt3UiTVzh@&dG=^
zyaY1+7H2-<K9jIlu=GR_CpKBh8iDJ2#;26Z3qGZt{g-E6T8n(Kfy8%qR@U}dkf9c&
zsT_On9~9TyGq<GS3dWE!(a!D(n^(kP1JSvx#S@Lfqmgyi^0u;A{wu|}|HbrK>WvMs
zw>r~k^)%{T$?e|F@Jv6L*0b)M7|DOAD$BBtqZ<x`^@zw1kwph$Ya>Rzm$(vn5PpF7
zGV=q<b?4DU0p<H=zMR&M<`~i-+S&Kg*^P7#M5(M=Kzn@g<L9PfBK-d_=|&0vUy%=y
z=fn5+Qu$H&b7iWs2Jt@cRNht(Qw!8h>c#3K=6&Ela4nQ*Ee0bL3_#=Jf!L`OfjaPN
z2&b1<CX9E*iy+`O6>H~h%Jw9}2C^r^Lf<rAC!*mY;TYI5!cw}C7?VZ6%Zms@h4F&R
zTD*|YP`)*9qfjiwALgMXl3_aXYJ~x;cnO5Z46*25c@;uC6#gs?CsXgkjzz~YAPkC@
zc%Ja8T|DAJo>%BVnRp!jh9o2}qEW&tjiPAF_5!M*yP!|{v(1BQ#MeYDVKBcCSkfX@
zSu5{gQ3&%Igmy!`>25eYC42_+8ncZHVG&C_5hk+8D;J736P5EWo|>(TZX%n80~VqQ
zhS;=Rnzaah{q-c)GLwVkEo0|@7qS0e0_om4%0&48w@Ob)UEk^Iu8EDJepupdmL2&X
zL^<V0Gh*`azoqAc)T*?6lf|juJt8&|TlnEh1Gu$u)~p4sn|whaN(3hj)IWE+a}}Zh
zLd2f$Z%3%u>COgB(a?<cK(jWu4-b!dbqC#T(Kx1fL<RJZRk0%yzGs=}5on-%T#_?5
z^><Sp6_Z$Yc|#2OYnX{>riyDIhAF|en5f)%ed2M&iDsuA61A}r6hW4^RpM!GMwF%?
zKj#M<uchDp$WJkx?K>|G!>O_12~UGeU8vj~ZGID$0Q7_%tiL+`o_t~RH^dIJGd_iI
z3D%E~@!D1Lpb$ZA>`*)71DEP%=VGEoW$ia!OLwlCF2t}ZhJ<g-Z!y#OP%ojxdLbG2
z=-&(0tPoaA&i`@JuO$5cn|!D|3$cIe;raKN{IdM9lB<kF9^ey|N+ksO|Mid$KBK&)
zD(V<@E~0<esoT{(up7GnKW8aS^G>qRwArX<Z4iy9s!7=hxBgtXYDuMPhj2M>8h5Fw
zRD7=uE`Z%kfOuK6_b_@+j?$p?X$R3pF3f=j)=rt0j%KfJpE{E26i^U3=ja?eib~RP
zBekg<k+=m}ek*%w3cr=wVzp6;Tgh3Z4day;26@+xrkV*Y#f@o0Y35Db2?c}gQAEpZ
zg{L}fK!Ob|2zEtVbPSWc8y|@hhioJS<tuv}A4=m2)DB~EcRiD)4dIU(_Zn>kZ|gEI
zUu;e$Y99=dA5qnolPKV{J!6=7elWS?gsN?o7bXGhr?I^5<PpJcPe|N0F6Tq3hC(y!
zO4@KH$RF(PsP75}VHV^pLq=lw?X#*T^By5;FjTSZ-XyBp(gq_zP$=R}+#S!68aHk2
zaE=sd=mNpbyh{_Q+o3jf<}4g#-pyN_OM@)|BoD%oMuL_>OhSUF6RJo<fJ74icdLZ|
zm*Ld^T%LpVe;M-s{!^KV$lp7a+m$!K0Tim8>W|eYzg?O@n5T)6LU|?GXvn!x7t^dr
zP>qBcnYtz$eZ}Jr=GAAT;Yn_+QY2@BW~MakEJT=f8p|s$l#Sp6e_sQKO{M|NTOo`o
z!3n<n2#x1P0z89ZsKi3x!P)ZGW+TzzNkT}#r9npjt<FaNBTxo6T+FM^`Yh%t3s9H0
zJR3nwA`2zrZ{)QKWAE|~)4eDH9T{R(d%eu4Dz7<PdloYzFT&E*WMhmF2%9834<v$#
z<TYjEyWn+6_65o*lx7?DLa(<SR$&-=`n)GwbI9}XTXGWX30k5uI|h>8FQHt{+mLN=
z3dyd<n5epJFKbE21KyOm80W2L^nZn<u2cS{oUcqn<j+&3&!v4NC1BtGxnoDuNK{z}
z#pDTsql29#(yz|{g^)&Z$Bwd7Yx2-b9)HpSxuIgw^Y4>S8p*jnHlBun%hFckHf-FL
zrJWzH61KWJ=1fH8%0#jyPpH9(zmB<i9IZ5Z+!JYyj>g9Im%1{kO&H&#KYvY!Yo?P|
zx^B=@6!+P_DQUQyV@RKcm|$53%;F%mI9%nN4YL`h<`2>^HN?hH@7*kz($4a<(_Omo
zpKtK7d_4`zhS+F3Y=McMGtqY?Z)9LaoiUPbcD&N|Z?mE%I?o0_YAmt#fv@N|q%oyz
z{YNDAa+s1GP&Ue+$(KtJd69Im@2lT#iP{+QS}m6+;q?mi2L`f5HC*+RPQRISrSzP<
zxk8OXT?{$CTB*T+Km=f@6G}!OG1>r4gaj5-^;gF}M>FpghwmK2CQw`ZT>3|S4Ees=
zsLy~c6lFdSh(CNW9EQu8dqz|&Y*|P?MkF;cq~!wJmt`R=PLcA1Q-4dhS343fJ#F#_
zW5~;ez)V?c7SOE%dRDsPs6BkSy_$w`O$>>;5b87=Mja_USVtF2S6#VW*qhE6GIMn(
z`B-O}_Sy_=iE&pnuq<5zX#(T&=y6Y{b!uH~A~{4RX6e+!2Ks!k{z}^EVcWfxFsn9(
z^m>r&WU1c7pkTY@GA+tcNcZj$&jUjL50Sbh{J&26Gt7Y&$t}qL@u2**QlM;8?pIay
z6j=J*V|Q)$`8lDlVnQBDjA|*><jY2Q6MMMAkgtgb_sI)pBg+s81(IBt>v0>tymi^g
zETnva={#+WJ6mJOvn`1*e|al~-le>oXhX=!C}Udxstj#`p&JCyBp!J|urb({_kl3<
zG|fY!f7X@X0FJx_gfYR=e~38rv_(-84ji0NFfb|NT!v`fw4q;S;BQO~b>$<ERhUL+
zq(#5(6Lv-qlR!9)$nX`Zr5!lBFIDh>yW!->(JCCmD23@mP=Fk|81@P%nW$Ew|F{#?
zZPpgp!ot;_EkUM}=$|8uA#YKd=Jl!ZfzP7NK13YX(V{S!C(isPrZ8wsF-D(~{9pa0
z`LZPCc1!0=Z_9P^Wy%2Mb>$pszIwE3Z3Tcr{Z2VGr+c1t*C9j=J5MF)nL;k`vUI#x
zv>@yeu4fS=WZeU}a(f9oLRK!*0}Y=pNjYPyazHp)n%nD2yU^7J1hE7Q46!{pXtD($
z3rttDFXVSozYgc@`DDBXe}GDzn{v7lw9hI8zNu31{zV>QBTX<QFEII_oO8{bZ|cJ_
zRKkJ;a$O|o{&eROe<wuvz&h+oU|lDaGzgKp5go)k?0O7y)R)sO$p3999Sr)3eJGJT
zhGBb;!A81-hE^9f`mVuzB~mZk#{z~CIBaC2{2O)%R8cx?9I$nC=5)hfC+h%#Tq5$M
z70|M|mTYb(YVby|w`jBrLMQVJu54#fCy#*vY@i7V_#%j5pARXRr;Wz@A95ikVZWi@
zY(k~IjOk9uY?wJP=jewYi?>i`?=9$iMmsd*3M`GC>vFmmWgi#wWS^Zr7Wv^;@+R^z
zy*gpef;lpLCJ>z2mD3%xfdJB;WqvP?cjppcxE}qS?V35;G~mZLD~JtrF|^JBpLe>u
zjpY7;(*ulvix57vCESYevk`ho9(oI*{~ZYSiPR8ZDpx9l<?CSo^Vqi({Zo?KVo0FV
zl_@}tkq~Ex3l2jxm${N^Q`7Ic+ZqTdSR8)f#st0WZKi)U#%RVI;?-u0D#v~i@<Ii@
z63dm4{>JP1^A=J(Tc1gWO=84<IEFkq+cL#|GInc)x2-*h41ZCG5<LmkF|b+PKIx1T
z2-2lv-y3S`TwM%_bNay57}D|?lJrgctcnfb9h(z4SjV~t#b#3N>2i#q!12=9H5)=^
z8-nQB*BnL~R61zTKN1b%Z*)zJCfdo6SJ~JeH`W(fR@&6WUnjhBE$wV5GR#zWS8N74
zE7Jr^wx&xBnJ%D!Ktmx{aY+YUwAs87{BT%K5gX@w>Jq5=IQNT92kOBzwUjN?B*+?E
z+{;LqW*To0DF};Ud6Zx%Gyguzox@-F(Z+@_`hTG$T_Qb=?0;qQ599}-_gk!Ngud_3
z>TvZ0^>V3M!UM*CLh?5s4h}8E&A|(E90;|^yBIiDD9JZGo)5<kXFiMBJ#dVWI5NHP
zNJqP`(OHZW-?_GSJ$?5l3&}ELS<3~e%@#&>F_kuM9&>~doK3|L57ZeUVHgSLfh~L%
zZSyHYD&APU2C02PFhz0tvbdsJp*Z%msi<K3&JdEort&0@?aFqX{2pRqMUOA-#ADP-
z>ys;=<l4oVkGM7=`5rN)u7A$uhQoLeR7zz>ga+t#cMv*~jF9{bp=diFwv~ZK!fheW
zCN|neUqing;_*y>+Ev=t4%&z^n*F-PJ<?6?fx|pG-HQc1*FEQ&Idi&4cRfAQ;;n5$
zwn@LY7XCTmNNrOvR10bu45J4wN>Susoi&rBUmZB&JH-%g>Kr(do&V>O_<ysM-zY2P
z7vv5^065pU+Q0j&mKgHYglVdCTiYS0b&+?LECO<Lo9|4h{1Myo9{h=M%iA719$Rl7
zbr!dU3#3RZysN^Kc<@%dKp1`Elp$y{{CHHsYkc=l9z1OK_r{RuCYZ_h-ni~c;AmJ1
zw_lcxOPgxEUVdFI@96D`j`Fj!BZe$D+cQO9H{v0D0oFIQTCDPUAu6Cd(^TvGGe&$w
z@t%H)+k|&x3<+>LXoePB16%|bJh~$i9+wSk+O07^9?W`qM=*hn4W>Vaq&SSkw1vz}
zPSTf1Wg026bFODhIrT~?4&O7!h^{S$yq0~SX!8S65{|b3+ZpO-<C%VM=?s<jZtJs$
zCD8GAxGsi7m(2<Z!D*{|h&i%_q+cW5(*1pP9vi&}{+g(tjUGAwoe=%u|8J$|r4K;^
z%!Cb)SKchg<-1`8^oeqaGEG?u8<vRDtK6VG2rI#_)Uk*WSOcG-v#@X6raq|t^}F98
zB#BvSOidp>Z9X%DFi7sTW7BSeDqPIWPckiA?RbvJVx}w*{Dhk4GRvT;X){+_$ZTo!
zuVWrF=P<2g?Kqn3Tbo*%kg^dMV<Z!YL30aucktK|VyujJTR@Y`<H^iq;dEw9GS#4N
z(59u|MF;Ykt;*DjAXL@Fews3>NHD=R*pv9r)|-L0h#A<VZNu6L%oHa{j%zNKhkL5q
zig07bSJs@7Hk*%{kxSF&@RkvR$cnJyFUEp!qVc=6sRHU<n?XZ`<9AEChjpXaP2SPu
z$t3k*Wy=(ntGtvAMzOmC8!AY(Wj>bfMJr)*aw+a1Q8}YGv}LTOvVxGW5$0U50&zn?
z%l6)tZ0?l7#DZ7|5yqyP4QSb7L|C9VDp)tl3Lz8@NA~Z-n``zU#4K1%`ulP=Y4JO}
zOo;TQ#2aE}7aF1@llUJr|Mvs(2)SC`Dess6p{!845as{xkN|q&8T5zmbaiK-UUg&>
zjbB>;bDs$0J1|Y5IXOx91|GINr~7CdbQoq0kt)!moUl^l7>7r805TN}Io?Pjx9Gq_
z#jJ<9MMad5gWEX>Iog`hV&=hImOClaVn=46R&@;3ieMKUzQaxg4dBsu1`ZeMISjlN
z;TahnJ@AMPIfzwbDdjU1`36*LpeZ<T)KO}&sCF<7E#9!&Q=9|dSI`3XjEiLTAz88}
zfg^<7zjJaU4aq`0;o(3(g+$y?&ljd8f~tX{auxcTV0H%w3=+qQ7K&xyU3sB0FfIYC
z&dBD7x+^~i4ndjQS`8s8_MYj^uCA^b8xf`j=1?;lAabWQ#D&VAWGl(O&YTxXxAqE6
zsB{IWSejTk5h*7r)tiCI=KWd~gd!jaQ9DU5N6PGG^natIo~I61u7>^3gOL9{DK&nZ
zE50>`EN_e)v?WqX->9di-I`hPCMO5CCkPr&FnMA~_{OAUwy>qN{n%S|6h!-+=^K}F
z9OWh)-2-9;;30-9m3GOp>?eBmLx0A~8rGh>KT5QR5pfMM<cMRo2)4ScqXtNy4VTqk
z#x`wzmeuWQLm)tkt|N9zpSTIZaXi)f{z<J}e6VX0o#S|eF=Tg*X37_C<YKJo3M*n`
z;fFHESZ~4@i6PM|<C|>J+yaV8KuJwrKwTAzw?6Y>0xuitO)(^cJx!TsSM+L0mRJ%i
zlmD`xb@dlNOrYe0OU{3XGE#!2f0eRBc^J07^|0!H=-XWX|E=qP;RwuEH(5tJ%kT8y
zYz_N7u6&xpt`JmrfE>w$j)BQ?L)Kz}XcrMglIN=t$m-Cn1riu>z!D;^+zUaO6I#WP
z$5|DbQA%WG8<ysDAO3GtbS$X}k={^MeR)pz82eSNUDAl?kUXr;`n9@{f>aj0W~S=3
zT^SjY#<^-+wgNQcA!X0HnDgpNVQ{+C>w={T7080vg^V4(bU=oDZ~u+|{Y_RUkDok_
zLnnvhIXsHPqdA<w;Y1FP;cya%lR2D1;Z$uJhsSa_ox>R%x;UK4;Vcekb2x{?xg5^p
za6X3%I9$l#A`Xw^@OTbS;P6BaPvY=o4o~4QpThzU7jsxhVX;=iVJU@6wPh5RY2_SN
za9GJ<6^F|?tme?o;R+5{a=41Z8f`U&YqV1-T&u0)a6N?^v|0-5G!KXM95!&+$f1|R
zCJvi9Y~j$y;YJQyIrMYb#$kZNAcyT7ZsIV+VVJ`RhaD7lYF!*|rZB2);qWvLw{p0R
z!_zt3&fyLYyE*(Ghi7njCRzW(q*6)xne>r#4)VJ!lGnrj?^lokjDY{oS;{TSU)7QD
z_B$hs4WLltRt#=E*cEmm<^|!n3t%FH417&Qg#@2{h<n@TjD2xDypJteEM9u-3*v}}
zMIB(_aUejAf=Y`*K5$>IY6uA6wnH$IJgYP_EkQNl2SquE+hK{zx}snhN=cH%fgC-=
z`ixd{-qC8QbuGo7wl<Hm+7lghhfs`=e8#nk$TH}7kftufo=)XHqwW+2;w<(<y@jZd
zp>W=1LRmxVAu<v)kFWF8gdyeSLdPo>b4ing`al~&nH)lS1TUNxqho;3JBOFh$0zD1
zbaLkpr-#JI6EeoUh(%14f!TUtj{2j)8f24TM$pK6h*EDI%rC=BBoX^)@+*rde`5PT
z-YYxtgJi=0=SlUFdV^Z6ysWg!AIRs(<8b4)Z*nSHm8py&H)_6oIBb{&*8ZU6A}uQY
z?mxfwa>A*U&Ygd`(7L}Rh9s`OOrgkWT~uON79{a!mL#0Dv@)`aO*iF&jh9fQvrhcN
z#2$HL$h#WO6nT&s!iKwik%ktipqokLe1mM)AnENI-cIl!_F$t4Pg86u{NH64SU<ra
zrQuQ2?sQG0)n^Q)xH(ozm7jCOOeWbnOP~WFmXAJXmA4&)Hf#zl#N1Z0?=4sCK&ZK?
z<YVe%C{_a0D%J4{#1sP5W+{4_Tz%d&8d_lKu9GL3kOpJLa3zvSq&LC9TH;hK?@BlR
z`5p2CGmh|@SW$neTs|5>&jlFW@JwtV+Ca>D-QPoKw0_jRS2*)4V@qg|MseLm!R8iE
zL}kE6jcomQO6qlLzVeC^R7Su9aH;f?)M>SrzpZ;sF(@9IsVkXaCa@K3p|P;gVo2{U
zrLh@GXPx+(>Gik7kfhPZR$--jvC_v#&z`^x)n=WTl)-UHN_`9|8XIT?xr}`(fhB>@
z6Trga>ijbE9r?<gSMvSnD^q_OW5}oOr2+A>An_r^e0w{LC|T$s4OmRK<bn&kIhwak
zXja9LN4<vn9c4tL(@N<yRPxAe)M*Ou!@Qri$B;LDlX5(kW5$X_sw|O?OS<Sx>OTsU
z+?_Bfwp<rO7WMTC@ixndvc$XDS=ok{N$5K=T)Io?t5sBgj_S>Cq$LI(+QtmSY21J`
z3Q%Og;yOfiMOvA~O?g5aAH0(!(_2{{L$-8xrc5ks)htdZ29qkn$mYrXO`Bf`q5p?U
zYbE@TN%uqlKTdXo0=P&1QW>q3fd2oj^0iuw9N+i#dF=}cHR0M`B_z67k+dnSxrM5g
zL<!SkTOqU|OBB$(cCAWCIkKlM-k(;PrHlmuqLt59ebzFc$}L-<R}R-hPgzTu7$;)F
zBPe{!k+7%J`dG#_n<Rnu1cE-w#EcfE52(UC9kEI1f<%5MelTv2zmrC~9vc;M3~A50
z#ycm2o$_`e0V>s&k3CzgVM{NaPt$c!EqQ?->MY7Xo+qTeEh>OHA)H2Nxou)Sq(#91
z!Z>-!2ojQV^7K-tr)@gx!Nq;*fuWvKh%dnbUnf-gSu`XJ9V#t#npk(9UaY_iOQc3-
z+~x68@$1;z*!f>4sTV3AD_0@@=Zo_9<fEiIsqgFEa)VeGLr&C6nS|~ZP(xIwkCfX5
z!Dv|3Urf8|;jF|~T?~0$eVOQUeT_&QOY$ioR~FggH|VdX?WV{;n$Ixpy6a;|!0J&Z
zi3#S?Ktl&%)R0@D6IPwP`n873mA@QKJ9E-)=CgK9Y#lkDj?P}cI|A7Wx4K=cyC^-q
zmDgQmYP&mzjOR<_BgND&Z#!~E(LP8&T6Rv>L2r#Asd-x_?}sHAg(y;B!oC8QeSjsw
z08E|fu&=Sa-8A$Zunbmthbv;pb`JhgJcB4Um3}vkr_D#2-ms8}?smpjgAtjo)QX2Z
zp9EncwnWv)J50h9LfJv?z-KgZ2g(SyF8~AQm5^z{@}`)JSF{@2k4|u}t5{UIntV(z
zt|^A}=o$IJv=*vqcP2EfWAF0b7U5u!^M8u;xP<@j$^+yhWtY4}u9Y{*+vGj+UGmfN
ztMcFB4=`MrtSnS2lqTc{>`^X-9pEpO-ys^<yULep9^`{A#0Xub`qi_cJG@r?rTVD)
zhUIqfo!=atBQH>_xi_tNOpd(B_#;G-oWafe(cm0;41R6#w1<O@QDx?#Ir2nYBfcWD
zKnX{3b`8&wr{JC;;m`2nM&=-FlIbo@1LPl?BabJ~rxN`P$dQLDDoJ=V@;z3YF~Q6j
zWkQZzj3+Xuj2W9FACHIVerAy$hGT(U?Z9zEa^!J%6yAC5(9(s+Ol6I7H&81O?1buB
zgL32}@rW047;k9w&|x`XUvUW&7>GXMJb1_|HaLmMmxsL1o9;ynV|bU<;9&8FhQEDy
zjy#<d+)Ohk!Hl1df<t3N$pWDgS!#oKz%MuwUt7B$hpOKb7<C_S214Hie4YUp^LF|+
zZ+1HKXO!3GU6ObJck;{CGY-j-4+lEGC*0ESgn>EoNO}?VhNR06%aJFMD}>&GOqDfb
zC+~#c*N)sRk>OYHQ3AQ#ZxR0ue}gb-9sLFGARJjD9%p{2Ap)A=h}(FhQw+RT#QV0X
z1H4u{!ccibIV*YL2!;oa3{a3FPE&surpYX{33qYaK|qYW939}+1EVW>M~ErUfQ@_*
ziQhX6&hZLp>j%~I;h^{7$r;LhjlWsQg4+;ywNbkAh#c8PFa+Ug2KtPUnrpyqIQ;q_
zAbZDaraz2m8mRsh{(mDSX(a6buT@IrC*^YKWhpGx#OktS_5?NF=<N*pTh-)W1E+oT
z1G43m$0qrNTh7K9G8rOiy_g|O*5@igys{d&kt2kvmsziAb?Nt{rw;C@Sm?c$d`uhZ
z##obWWHlZ?RHS|nEX5j-1cuNEb?Nt{A2uD!`dGfygsfYRd2zDzQ;O~Ot=<Rg!!1x=
zbfJ6BPJhq~?FGY3x+(lw+Bxh=)`%(3n;H>`H4<}~3@mnPcq`k(#LyRN4S39AqGL5P
z<bofhpT4k`p<Q~l32kkxfk-AYkVz@Dg%FblLLR0{(drDBH7?4kmd8dMZ^F>6#Og7+
z8ughIu<|J!6&`rU7Lw4re%ifaZzoZ;1QI>W{Cmk?-edh7QDACCB<8U_yv1HW+yxiT
zS$M3oCfd;A@p8VuPVj@QExewgb>C}3i-U9ZcX4=<^MADTYYG3KlRiKM@X7M2u>Ft8
zSIKuG3gADKVaja8|J<aUr`)T&qV`jr>H>8GB7&TcbN&zisZ(Az63o&%O@^keU^ebX
zIgVDvO|2~%cmA6tgFY)qsa5(w+G(qqCA&4XtDVYPXXFvI^(-8up0?N4F^h2nv!d0q
z;>MMuHLwV$bxQ)yF5gC&f_oskCnn)IaGIT+NT0wqwE#0~uPZ|SDyTKR9XL{aNP<9@
zej76;7fn&k!wZ*q5!M*S*g#MMT_ls5g~sP7Co61=#vBJtfP_;xA;Ny2mvZV_klCVJ
zY~ot8D@R$&3tMh{&dK3+Z-dX{r%bojO0$14WR}m<{&-nP(z+73Pk@kv;1!#~GMJIW
z37&fjM|hi-VHn_>U+rnE4|cHTZekt>b<0A&jm=?l*wISE%=@A)^CqIz^RX1{rdlJf
z-R)@&djlYW7*aofyU-0o&e74u*wuDt4npy2b*no3%^rk^Mv^n~0-*V3u_m;Qyc_99
zme#~pNgc~diHYDx+&yx>ArmgK|3|Q|gYqbO6|Db%fqZ{1rBV5z@+ACxPF9=LtJUA?
z*4zJzKNmwbX0400eL&O;mG`MCgzr@-`b?EIzjLAJGgZViAA}+|T?ye_5h|Tig{|h1
z(B58GjN}(a{K3>5vr{P8h?PlbJmyBBwTQ!YB*;$Jsa-hZ;T7X7_O=j4gwAN6P-<C1
zq$dr*cC?O>)MKZJ#b;>`ySS$nA)QIy4}xs$RH3IZDIaWxe6l|3Rm9R!{bL|@K`p>c
zhI)nPhuY|dtZWfln$W@^90Q~7$uL^P`UcM+#vPn1Ddi70Blt>_4ve~&$p0MD36TG(
z$H3!%xO|g*vUDeI*!Z_O79>$HPPR+zTAv8?D6srVI(Ie=Q&Ao(jho0JBx(tO7R*zY
ziDfvcDVgm+%ywc%4rQU|V$}mp?Fhu$h<(63J40Z3+*%&O(*0i!t2pi!jeJZ9>tlYR
zIVBO{vXa22EvC+REj_xP(egih^cEA6?!#iO7~PS|T05gFWK>M&HGR>R2et9RroT_4
zMDPzENye(+D%Q@}Mq(g;qMgnQk4fPHDxDkrKBK;;nyK$V%xC*GTkcAAR(GWf-#(uq
zoM!giZi=-KCl->9EbD8oG4Gvq<~#Casf-~S{)p*Slk<O=v|PgfGo)LkS1A>67Bc_7
z2K&EKC93>Xc@^?KpL&T3A)$?b!gH(?@s5Z9wTlQ-17QHVzd61q42End(dB8STb5(9
z-RGHwx#Jw+QKzq;T2x06xC9azvNJk5gy+A$7y?>>1nYow2thI2$OA>oMui?``m%{2
z?2hfWdIV=~sPZ?qH#@p*RgZAOY=F<O^-9V}I+?(D+WxIV`bFP<*f}A{p`V_Fjvco8
zkPMvX=(N=bB7CJSI$aoLP~Rd%E8XbDyMWYfNx<7iE!-Uup=M2AlrVk7uM`XbMYyFh
zr+b_=327*Xj5@@(kVHTC2R$SVS`!kWfX8Tq#sg|rH~|tLK*wpeUP6s0L^DT_3Ajy2
zHt8Es<MjgtiFQt#eU`1)fY-+Se;sEt{a=BkUZ&23$M0JCCAm{7kcUfG*;woJk@c}o
zs^P;{CD8D>!K6fjonTrz!VpfTE~F<W(dfxg*F=Tl!uHr^B5=vz6{WAzMV&>#ml8S+
z><;6oI<4-y=U)ny(@ErG+7vg$y2v4$K_zEES%!=s*ayf9&^mP&+y0U(K+qHe<7Iby
zH`CK;T%6o*=oS3LG<&i|V-e!XMgrqzJx4Nd$QiijWA@W<W#v2j$)-{C#KM$Rv4h*h
zUz_;trq7OH$JYpRq>(@@Wcy&Ylvsc$Nta_t_f30%BYf7>sg1Esw&lqd@`Sqdd(zq4
zxJ>ofT_$98v34p`wL=9MnZr86rSyb0mG!6M3KI$@|36Zaj#LW~+rurt5BdLJqz)|Y
zni#Skm&)VB3%dx3ZjkTE?^lz59q}U%)c`EpdHw|9lJ><VI*8(#k*v?<ZiT)c@kC4Z
z?`z|$Ihua&)Dmhuxoqd&iKY(vVl;R7EIYUmb1D=hdfkW*IO%$hrr(=5p02iKJL9*S
zaCMK3kqqKTD_%R;h>aUWXMt97utO#l40IsEE*#yF?!5^|31nw0@DmeuMf>t}^|^`B
zFy}b;#E@AW?1P>5t@4DL;j0VpJ~k4@>vAc9!#v`_7;?gQWHJv(z1{rI<`4-C8*uKw
zpuIidVVh{w^7fol5*W?B+8R3z!!FZ^PJ(SNg^~=U8;22weE*q#I=5g*#Lfvi%7P!~
zvjk~)?Vp=oyC;?{1$hcPHoE3;+s6HOaD>L|C3hvdXdYCo$L~!3KTbk;?|Y=DrN7G#
zd8~Y#yjt#%&y%l}@0VXx4prtM6KE?k16~6Sz#o-QzzxhqKA<&fK>a>)0^OxP{-4nT
za5=OUW2O1nkCw;2wwX!U^(VE~#YC>re1BsLVzv00IJ=u^1fu!jrv2A6d;Qpk3KMVc
zMke34o~qhb)_`b%rxny7R?bEwUFrz1YHwm<U;G%3bRbeN57Tlc3u6-{v#||nE8$Tv
zxs>d$YzMfFDFW!vP)ajV{x5hd$fPa`b%X;RXE~w(^Cf%v+#JQLXnoo{w9}akpDhJ2
z1@L7;!%5fiMR$T<u^3937K?To%MBJS4DG+BotFA3AIv2IXWRaLt=M9nE&KN|o1iOr
zH<m;quoeo15TZ5^ZrpzjTO{}K@q*z%pvlt~;CjQ~ByQuC1jC+YK8$BGfq%4U{~e()
z(&9ki-+{=-ZO*bNGG)@HoRjuQV}~=0NBqf0;=FSBpEY~J`>$baf%Y>tccR6iXo67J
zZs0El;y7m~k^oZ_w<mA5VFqxa=DmCfO0lu;--lff;R-#x=6#9Z$Q#EQL{f%^f^6t^
z^1-CDfmVO_;W>!PrA3!|TEVs9pkNlA+C9A4%SdJ@f1`(alWE^)^8e^E*np77$!O7f
z?q~Er?Efx9{*ULBPGy*UgFIV$6c&Kr%D>h)G8u2m6ucp|H`4Bzx*oN-SyaV$$zJmT
z?1?*UA8&3L>V;BoHfp?{wqpmOm_Shc&9vJ`<60JyI@O~Lb1=jFJdXKo0QUqFZcjYd
zcK?7|zbpto-F4uD#7UEmqn~XYtM>21JcBfx&8DdFy76(*7<%G4wsDwtNz<-5`k@^a
z^S>HGKBlp%kE;}in0QXTr)8b{_xb(F6&*EROLsk<7%Vg8u{N#{<IoJ8VhRaD1o+xJ
zSO~zV?&8S%6SbQU{kpiEh5k>~Zale+2bt6(>;RMhEs>-p@c6kwdR;zDE|E`z7T~YS
z5y~><bol?isZO9VK^_%u2tp(LRP#!_`h8GnuAM4ixkuV5XSII{jsA7`NIAB*3Jv&E
zPp9p>LWx<bjCoHM%6D`{()MdRg+O8&D2F@jG|otuZn0CuxM<F>QzRN{4W=lb3v7%u
z{A?jwE%S8v*~-~16z8Ret(>2V;dWn$?MycdrMbFNzD7b<k@FF0HfXvEIv;Koy0+`e
zl9-9D9nH-kQ4nVz`ydyLYFF7<92MTi<|K*nYoVw!g{}hi!@tY#kHE7XZe68}FuO=7
zWK0#U47Gvm+RTZiUUvR3l+;VrsmcS&sfhU5D9h62=@Gw;tG^+Rgv35&njJ>c{0gI{
z8>_3t8{kme8{o>2vvFewT#4yRiyAJabFL7h7-AcRaqOaoOKB&V?gbkcl8@;mipB?j
z1BxMyB-K$2=HE`9_*X`)?Al?%-4!21b+mTgQzI-6ec@JW0*TGg@2^kt#loM~a*p+)
zV?Q=wZjKKmUIN6WIV(>NcBd6&J;?PipP13KTQm6?mX4_*eu(Y42xH;q`VdGV&I&|L
zH#(D|6Z2slj1RCa)>ui*q2U$~YW7CLFyc+jNvqrIYTsq=E>>Y0K~KEDZ7RuhxI~TD
z(?1hUf42US|6{v4UU?YYqKde`F6r)XDFaAN{7B;5GS1E<a3{CGX!6gkGo^|}9oxyr
zG&te-C~Ajkr)Ks#3UOZHg<yLxGQN<sAF4lkyJA7k4)QT!T^}DwoP3EpQ`Sk1SgX+p
zqOh|4NPo48zmD{&yeWPJi7vg!PW^&IAZmSoQBrzlp4heV!|4ua2Pc({!5xNKk3|ia
zr!L$fV3|De5%wptkwl0tGhB~N9u;Ovd}Vw%$;6i-Pe|$vB=TeSRuX@$t*5cfm+jnD
zZF=Kt<A>R%@Db6s)6>Ry_NeY+RtsBx>F@jW_@R(os>%{OgU_Zh6DDC#aaKY?1aAT^
zp3U@Y32#8Uc%0DxL#4SAPW<Pkxyb*wSZb4_@-_0Gkp*l9vd~|E_&-zBP3qmL^IvFe
zlp5hCa*jYV8g@33a6C*Va+eKKh)`fn!A2(dxz+~dB|Mq5m<@FLRjK{Z25H$G3PxZu
zABGKBhz<PJHcF)(W?GNXOf5Btp&+w1z0w8-dS17X&_ft?I=3$ss)AD(baPbOD-7FP
z1cw~rU!vv-Gn^zIaTRzY#M%s|e8ic+Nt_FanHp)4+FzKPy$H5)&BXS$98^a%cVz`4
z@L4P0jZeamBnU+>ab9SqS^ePI+X~;@{Dxph7#=%Ra+<qYYz``@t{&CFO{Sh!N7|md
zR_rNksv|K1`7qE8(4=(vu#;$GbWQG_KGy?@F0TiUDam>^We8(s7)%%Q8b?^HMtB@m
zcfh20G7=|y+0b0X&i~aCqI}N>{U1;y`RDRX>A=6MZD@^8urK$s5Qj!B`2VIK#s!p8
zbNp!Av}XDWj;7u6OQH?CD~?>`uz9qzUzZD+!l>}4(>?upAJcq!<H%ROMmf?B=ETks
z<$uiU74@ez?zH`$tR(kQi<^-h;Dj1w@-ZEz?l{ty+w4Piu#=t9{Ez8xvOc7rVZk^O
zliO4{S}RJZDkDvQvS}_&n!Rji8fCsdjs)d4$-sm*mv@HicFEOR#|{C()Eq}@a+|zU
z`pyrk6Wgf%Fj%=z^!~~D@09jS`2QTDe>h|(^na(yTjgDl0UnV5g8U!3${0`rrHV)S
zo^m1Nfe$G!DgRJ4^(eJU-Kd_c{#1QLeLF=R{Ez>YP<fanSc%&vDOKXOfvnUn;QADk
zWJ24`az{X7!SpOTi4ybeh?a|_MqG_1T<O|XTt#G*{%|FrH4(2}#PyU0(Sz2@JU=XK
z6}0UfiD4FAHaJH)656B068jM!6r&16JC`Mzpyn2I_MXr2q}yL;JNN*a*lF!N=CwlE
zY={?DAyXUCZ-yanXUqHNyn$|b3nz7WKTaU(2)4jJ2ZV&%w~<Nme!@optVdgW6VJM!
z{W8%5qS$v9LJmY5d`;@%P$bE=T*%dFNiI{ngySO#O#{xAAn=kJwd<$nC^Z<X6~VR^
zbRY<tdqp%HfwTfDIw&eV&dJn7gehrn;qzsMc?D|MaTTYvXy6BYHi<aZiznnLOVEl;
zM839%E1lUxk<R_sIAL7DvW#kX@}V%u#k5`Q{73x1OVtyU$CVCcD58HZk{&|@z;Ef_
z#`yFs7E>vD)MEUj>G!1Wd%vn!FyJckF&!|?@ndaooayf<ns%%1gS*%ky=#gI)B5-{
z+ed(bsfp^ZHi0o)P;)5xnCkC{Po=i*c8+_p=qwkPaM_hi79FOZ_!Qf`x=A@6HC|V|
zN6qPRd={GewmLqUN`>sG=28X(DO&>Rp6bUql~iP^+83W>-?S`!cZs^w?&WjZDP0@8
zK7NetDPY*%qWY_?GiLC<EHU-P6Q5}NRZvMxYU5*)ndEg1r)PKWHH%Hi`G1I9FOgWk
z^6T;?IO}g!-c_f_^=d0@0_@rRe@i>X|C`m=kd|0)*obI9T)+e;>@Hn4PbHxXM8>W6
zdK+?wv>j8s&V~}oAUD)5w4t8Woz=ojNvY1T0X56te_%ri$V#S3gtZJ2zRYL^0=hjm
z#>I3v+t8>2nchfqn+>6l&h$Y09$Eiu<b{&FP(B5k|0>x2)yXY#J7NIrkk6HS<%{Gi
z<e!2UxC_>R56O?q&p<=?CZYs?rbvoI83HQ-Ct?H5M0B825HGMwS*_G5ElRtx8QDb6
zMaIC3lq=vvbdz$Iaz8kS#}PB=W#vuf1LZSSQXT3L^$0{1m<)@;h3YA42{?+?YMt7G
z%z~TM9pEi`)r-_Cz+v13JHz|chhS^?jQX<rruu>U*?)Go;PKPX=I|U2&*g9@hu`P$
z2OOTqVGoBf4&xm5a=44b-5l=Wa4(1Fb9e!V7jk$Jhd<=-Vh%6i@KO#h<M470f5hPx
z9A3%cRUBT;;XV$p;qb>C{)EGya`-b2f6n2x9A3xa^&H;7;f);L#No{x-ooLn9Nxy^
z?Hu00;hh}b#o^r?-oxQ9IJ}p`Uvl^>4)5deehz=l;cqD1uRXxwgA^Xne#_xQ96rq9
z?>PKDhkxMk5e^^a@G%Y_=kN&*pQP}Q+EWxB)Sl+>84jQ2@Hr0u%;EDKzQEy&9KOWi
z%N+iN!&f+bmC*kVX{)4OrOu`L{{wOrGyz-xCsx<`_&nS6lfk$$s=wOw-ld#G-(;en
zHpS=KR;CGzZUx4;Gpny=ID5V};S9&;*j7u5L<b_7!YLPt<VD>>;<KSg8m`pXVHfNX
z4fZ(R#>W$kgqgBzj?c2qilvKJ(j_kIuSj4rD=^#QGpQ4hoxWQdWLuhP&l0jot#Oxa
znW>fOxRpJ5^)rdyne8#x#%I`8K<dqs^)|{&g**&7|NASlq|8Cgk6vZJ@_{-@U5iuq
zVch)hzyJ3~zy?)n61CY-s~V+^HdLKSNu&*u*DR$JW)Ddb<_R^wcD@Zx$V$3t!%#6z
z@+pkZqHC8(aPxB;gRB=KXg{{ou{7C+_7f)mTPtD3Pg3qw*2|yD7s?ByKar5&|K`80
zII<|(RFx66jN8)LMC^xBy*jaFnh%89I1(vlj76t=1qL}Xk(;E%%F~DJV8?u#6TtfT
z34I`4bf(WBT~b#YSJ43cusZ27krC_T$J?%-kS;`~$P`Tat4$w>+TRdA&bG;%+1A<Y
zbW*Wd^d4&Bi)>qerF>hM%LnPrRG|YwTYRDIBj3^%C2Dnd%?GR}>2^AS_<}5c#;F-)
zDb3-Md!tZZI{&W3(3z<xZ+t%W5Vu3q5FbK=!FSYr$JL&|W2P?H`j1L#4Do*sDD{da
zUoRI(QFsG>xBu40S(+5FcX1U76~Z!WtGd4(H@$W-S(Qs8H>pAo<CZwmz63MHPtn!r
zf;Ydf6%KkNFfCn02h4ZmBNx&UT&#LeHZ9ebIC8QCGugSqi59vi65frbBtjl)XDLF;
zGF1CX<O##AlFulrq62T6Cq+%XkdT7oWmq2$w@hKCLp7rjW;+ce6s)#C^>>gAUCC?j
zEr@tGM_lbBAqDwsb$oGuX_-78(@hY>Ayu=Q`m@xLtWWqVJn;hCQf!llU(|SAfAa>m
z9mn7f(C7=MQWLL_BLT8aeY`>48r5HUl2o$!K=H;;vA-J4J{xIXcVbQ^7)PpOo0bgL
zzLHVP+jUQ$DHu6I|Iblcr2ijecHixW_TSnwjR281NjFJU?gmKZZh%zo21w;@fK=`V
zNab#T`*}Gkf5SDEzX2ZL_o*BX*HjJ%Nab*VR1OD7<#2#h4hKl(aDY?}2T0{`fK(0#
zNab*VR1OFDM~;We<8b{aetnQbDxbrBDxU+S@;N{%p97@wIY26(1ElgfKq{XDr1CjH
zDxU+S@;N{%p96fA<9Ut4zjF9Ghi`EBCWmiv_%?@s<M160-{tT<4&Nv1f4p>~g#W|>
z=nHwMJOg@wdbtZ(fUZOwu!rPV<S&#_$_dH}WCuGBvix5v2bB-iVd_+Msk&a>1})(o
z>YvoVWqSMH+Hc(b+MvSVrXTRR()*&G#qDo0*avgV6Qd0<x1q2i54F3vbw`@LpmsI?
z#lp~+W6^8<wQIQnPQp&_N?tsYW;Svu@3FyBcUX=xUeTZG+5@bDbYen#ko|HXVJVvo
z*`+<iEK&~ShZ|t1O#+zd!wo#l#_s^h0@w(f;zT_8!bH{p?J;KZbD+@YL9nYv_`lJB
zTiWlLG0g!`#Enh_31g<fl&*S$jqU*$3V1gAkX&G8pcQ!qnZfdt%me;FNzjknt+2oe
zB2i-}qmur>M)3gR-us(C*U;J?VP5TN#G3Y7-hvfgnp^;uyu?14miZmCM>;^LE)qbu
z0qJ2oL1rQ;DRb0#l=q50fK+X;te^!SXBIkttbsuiiO}h+A<;VV2lwB9ioKMBDN;-O
zj1@VUPtqG8Q3$9RJ|4`x{n_O2pu_Nc6Mk=tI$L;-S?w9tzk>zHVt^5W!G8y1^8U_@
z#11CYfRo0Sc<O!Z=P#M5&%uHystbGlO|%1VvLQT(IG|mLFlX9pO#XkGguET&l$(_j
zWc-Lo|CCPq)>f>zqSNA)G-^wR_@R0tT|5!Rb5!~Zqoo(C4R@JH#?5ggQ`?>?mZToJ
zaJmR5lJx5RoMTwN&xE=zj{K#~%0#jGiypOM${QAdboa|r#k>!vkdFyPAdaM~9hp+3
z>QPv&IICqS-E}VS)0&%22%F+al-j0Dv)3o{mSNsQq+QP>*ex@|+8Rfu)Uc8vo|C?3
z7CXR!^n0hibFm=#(584PQRgfWv*CJd);p>723z(f?_s4mCEvz)2~jV&><wl5zMj6-
zOK(?kWR2IG-rGQB4fKCV{&Jx@S-D-_F29KAUq^!fM@GOnl5`@GshC4A^95Rw2@V<2
zT2<ZOgXH_dltXvlf2EKu^v03l2opv;vbq{cPTfLp1I@%lH?xDL8z(){OE6XpZokCT
z!R}G<mDpwm$_?VAsf3}$i4<r&9;X3GPmWN%5%`@S>s(6QNQf~g<KSDpl=-#!><~KW
z%d{8Y6^_EXIP!UBOpivg{3Zfc)0Dr7i>k2;vJP@*963q1E60lmSzo<Nbhe2Oy{bX9
z2_=EE4wy!r?)vM*d;h=pOM4vYNxL#dUDmHkOJc*41d;Aet`ncBL;g4tmtxzow<s-0
z9}99wx+Eb~DmrLF*Az$6Qrp|9nO0$kQi^zyUP~N<jsGwqV)DN+5^QaTAgk9L`ImBy
z^r6%(jlnDO#OsKZI73bs{Tc<yR^`JYWpva*!{vrizpYr<_5k^q8qgL;20xrs;wh@f
zLBbjaup+&aNIWV=ZyvO`xpK(PisEa}CLa^NhBy)uwq}Zer^km*aDOhg?HI3D_8V4F
zeDjm!lZFLJ1N(v{0tya}l1VJO>y1CVwW9d;D)KR53CEE-@U%?c!uq~c1nZI43<JkP
z{qjh++Cl641(oyIjvBn!gmrTqNd?h2EQJ$~wv<8|uzI^dTzA5-enwZD2iOeP(wSAa
zGc+wBWGnF_$rcHv><TtSypic)xKDf9boXoH$UF$j$=+nC@gX%CD0DWc`l~q~udgV+
zemwb@I@b|Lw!v+gc1(TeM3lXV<X?QvT;P0`eA4i)?h{^XjsbWre^}enRZ;xYqsYgE
zm+=2XnE%fg@;o^RYrj8$-*+L?-(|}Es-lipYmwFOfq!qq{!U8^4Q$I0w~nN3qf&Qv
zB7hZ4@RZ7Sdj;J{pa!Rp0tESG@$Z!H3oTF$7<s|sAo$!$%Hk?#3e~#ClI`4OR@o!e
zou>*Qy&Re0$`6FLpQ&dNOBFi{je@6~CDgSipRZ{NQeKxUE0ptuTIN&{5?dO4z2A$h
zd@SjY@<Ut2!1XiLSt--PC}#^jlFJu^c@O!5BR>`=-c3B?D)cl(oK+oxR)m(TL{7bO
zBp)Ue9UZlie-|b}E-x*2kNiaFf=+&RmHXPlsCET{Mj~{Iv!(^Aoi;>uW!l)0p9=GX
zlq1C)jxiz}X*?t<MxuMnm5*GE@WjU4AhMA}f{;TV5SlgXk)U)1-CHpRNpZ*_=P~~O
zB69v8gY&;kep_BGeIZ@+ovv6Lm3!hyfMA>SFiJX%f{*pj3??T``K9mv+_d+ti6arA
zCsS||{a%ken25iRg{B=${&{>Ij^%3}As<uS-GkyyU^@<1R)XyiDC_jK>;5JY5TkHC
zr>UBuzMD~6QB+BS$ZH4fJk_s=bhr49`%f~e_-f<czMh>?!`aEN8cQ7&#kZ~_A5))e
z<Bfg5V30!@q*BdOzhrOheKYgl5l50i+oy9?5N`~7Z<8~>BhnHK`68TP6#P)yQb+M#
zHXxkVv-&>ttQhX~@FHX`hzIpo%Mbp#qWG3w<YU6n5l33VzV-~KnWrPNF}-KzAL_pt
zR8f3gIr*6IlJkG4R47TOOV>+pAp6H^sZhQ^en`nt@*(X%pnR>)P@C0@)knmOR(u?$
z<O8lMq(&tX9+0cR)5R!vN3Jjlgl?j{DmvQg>AHK{79z66Bb7zFv%!z#sVv~@SK^~i
z-$YNlH`KsntPVxEC+piLm`U2JeJO2zTiRcQMtOSNBrGo<N$o@78K5uWZh=svD=Eq6
zZy`r$sAedOEE8QI9gv|4w2(i@#ok|ty_EE&35QySn6!vKfwMBu9Cngr!Dx#_AKth1
zdM%he?IkfKr+dB0l1bLlfw^64?P8^Gd<{=MqkUitPfd#_;w+tn?iC`1FP*vX*qVQO
z4n=#;ev!mB{a0H>8uar2zmfGnTDnET{|BJ|dmlN#C(0+t)v^!%KUX6I=)3R~FF{<8
zi;)lT6Lq*c9kIV_k^eJ}{Ga!$FN=4D@9G!kyq!9OwKurB1L~D#5MDg|%|E!hL%;oM
zuP_zU!4k;&kWv5<lAR?!mheY=mnq5)^0OB+)`PQ`<lB*%hLK1#^umA_IbMUHLwh;(
zFq!mAI8Xm^>NW`QB&+`di$r~}jD*V}`W+I~k>+i#PPn%Jb4m^pu(Gos#|ja)azfU;
z%e}?*NxHd<C!NXt^Hb)^ZlWSYJnYxU=74yyM{{Vevs|2}s?k;`t(u(WUMF1!A5F`F
zpQ*V@#OAixSUz8ngQ)Z7XN_yiIk~6<!{x?i<SbdvJn%nZ!O3|`YTGefwP9bNwyGtF
ztm2!=3)TL`^=IY2KnDnfNYF`KF)$HmekJWarUEp}n6;<*J2Z+gv_CU#BjhNIwQwVV
zd9aIg*wK$8vKFyu&$9pv2a|8;Z9YFO&oDlrs|=?Uf91k+$oPBuNyF&>PDu@^M<{nd
z|M!gCAU%#)z~AY=nm7`h)Mg6SrklgA<o<gw@z=43zep&xioqM7GSM^LgX2N!3F8(^
zYV~#7IhYRGcu3m!)Xyu5&$)nnOic>K15`>!7=gpH%F6_E@}TwoT&nf}vH!TQ4Vr4#
z#&(D)$X{*owmyhet@cB!O|o&%rx2-bCm&NMTjR(}m{BdKA9dq0rhCJ|^m}XEl@-M|
zLXdmoP7}7;cxxZ%al?ssP=8g{qp*48J;8*bCXQ5twr6N^0VkJo;oX~A&7rBLn!EeQ
zeVCy`l}dY3Ofqhn_kFt8Wqf4O2)<sL8%?cY>)$8A%XXA<o3a!!08RiU;QQ8>|LQo>
zcr|3QUDZzzofU=7q9S2zI?Kq}cEpjc%Qo+%Lt{7{O=nl~*ev|TX2?xnARp7%bsrP&
z#G9P1wAz1@zT^pRobOggnW;rt3!M1$!xhChxyi@WQcoQD#%xPdjD*xd!)5I!qu9Le
zSZ>1697n1#m|WW%i!_^-G%J_l`G2S=-uVRim@qZOkyxxR$`w5!MyNR5^;{SlT(bH>
z@-boQR^lPN-8`k(UXP6P%1rv0-lgehx3r_8_-FT#kEs>w<C};pONImkI=n7DOL$Os
zaq1@{*jw{WHr3Dg|5izAm3Cp>e+k+@D&HwT2jBimWjitgzpai^J@CW-_j7<xRLcdt
zR!2h=-ar0MPgtHS=3!D#xrpHtbUUTw<dEl!xiVc5@M00j{)4TE71==JYRU_Q;VjE^
z1uGC?k_axA_`}3x3=9TKTq@5K^Ub>AE4tv;M9Py%x3~pDMB3;@VgZ4!FkSM{U`+zs
zjnHJ^5U4Geyih0^Psrhw(}Y1a5|6l2o2=3+4kwv>JU_v~mqQeQ!31Gn=nX?;LdD9Y
zSIPz1RS@|R7+OSF%6esI_D1G+dLV3|weQX_;9S#_2);>_JT&$uNuxsx$FnzWiQh{)
zM)lXqIW|UQNn5Z1*-x-{V>-@oR{Du0A)<ms5bcxYZBw?1B@7Ae6t9K0@{H`7k|Iw%
zq$p(YiE@-Rc2|Zaz(=N-rAntS%}-e!^1`-~^Iwy;Nou$9z7mxGDW4%9ip&3*f8E34
z+p)!t%;dJN-`;e8<LDMKuBNS4@Yv#?oCdx90P-<yiEZ)I`#?Hdv1$h`ZkC_?VMXz6
zASG_wY{D0gBPXA2Exy3!Q(y~Pd=Mn`k0EgWv0308jw4H-ZLHwYt)zbkt?yS9y;)Iw
zZY%ki`noMnGWGRS7TaTn*bBF2;`wW~{4snHIqr(@*nfnHErMER3mPz7aetFT-C9y%
zns1g5(GmIi-iqR%?=_9c)_4>RQZuD!)lGX>20>8<A=0T$%h>t9_FpFSWc}ws0;ryc
z`2Y7Q%jFm3p!79voFPe#y~uP`BNK{F;1uTeZidZIID*)X$C3k1HQ$(XMIJ%CG?OJ@
zwAVrBM24XE=4ui5nJDF>PLR_PoU1EmEF;^eL$kg=r<b;(ByhHw{Aue&LM_|YM;1B^
z?V!cY4OQ<{6yJN0d`!dL+Kc2`w%O!#i4w8aF-w_hufMLM_=da4$AoQDZ%!8LRsGbm
z)DCC|EpKmqss{?d7s<zjv$Yp#w`}(?T_&%k%(;?s`bEXxBeSUdv?oI*Y_+{g9|Qq<
z(HUNxPLQ^CCTEbtX8X~WUgY3{HLkr4D@}N;rOT5$4ijunn|hHJH>0t!{&g+x08vO>
z2FL>NMH*<@dhMX)?ed2y*H(V%`{o=Yg#I5d-6ctHNdJ;YA_`a|<o=h)*U7(?pO-&G
z?B9vXagf=zA@=WOkPken{6+bfI#hZTQ9_E;Ms<t&1L-cr4th|1{eOmJNMNC|cSjzm
z`biPz;t;j*a`>pjgd?w@17YAnFt>V`{>9P4ylC_+k@g{Tf3cq5jvOwzwLajqFSsO|
z5cOI0T3o1`oa;K<#h1A3IQd(0&LcKj4uUaiNtvhi0e{vg2O#^N_70Z~8#PG!n@JrJ
zzp0mkX@8@g744o52QA~sn>E+D21*f1aym-*Sm*o58-Q~P(wovf_;9L6apdI(qKt8B
zh5;1)Wf89@KN9gpI#^N&#}wKtyfbiRh`Hb7gcl2&%Z?3H-cEjMbP^*#UQGi>KyC-?
z!!UD&#UMp6lKSAFfR}J-^p-2}Fg$Epoj5(QTG%gR_!KJecfdevsi%!Te^lZwi0f7;
zOIgK*Y=H6>d(bw}_*{li9i_a5qn1u3M;=^M0$y;5g<dcQAx{G}H*k1)m5X5o>4&Q~
zLqDCqUX(#de~P)1_qGrgK~7jJgjwASsD>yt)1%04;E&8Giy}8cn5sM+OQ}y&;*o|B
z9)U>!%+)-8_P}v`5ZG#IL<&`?;VIHt3HiU&sh+8hMFfy};QlM6XA<k|yMeX6$O^h#
zo+NfHDDFUxjY$FIPQnXT4Odehe{d)xD)t{HG^~&GBCXdpWr0`=V5k$O??G@?WhA)=
z!RceelV^Ebx;XF8qyeRK=RapUkG#D|^%cxyU2H^K7HkN%1tZXf)7Oz_yxzW*x@`lG
z*<AFr-a(XVJkf6ds(qMM6_cnGqQKi2?BK?Xjy%yX(nY_F3VOM{cObB9O1@p}6=27S
z2Zgg5@(<_a;tpTL6Jm2SPyCy7%l&P<1?K)Y_8vm)<H-aP=v0j3To~$TgPzb&GdyCY
z=r5(G&z-=~oOp=obvE=4plHO*f)P!H4{m$~!6@7B@(h>9zC=k3yv)Z<SfaiCF`Tk;
zyzSluJBSQmg~t!~n`Y<I<n$@D{z3ZvJ9i3tNY4NN#{ca5E=T;QwSyY<#|EVS*nrd@
z8<6^A15$r%K<bYTNd2(^sXsO#^~VOJ{@8%;^Ljtv@Iwwi;_zb*|IXn*IQ)dePdWUI
z!+&!4Ifwt^@Cy#V<nSvFzh=-OaVT@BaHw*a!(l%Ta|v{44hMyKj{Y1D;P4O*2XZ)w
z!@(R5;czI2!#F&Y!^1cn&fy3S59ja*4o7l0io+v09L?bv4##phjzcGh<2gKv!=pKz
zz~Mv=kKu3<hm$#+!r@d7r*U{JhtoNn!J&)8nH<jIa5jf?IGoGjJPzk`xPZfj94_MU
zI1Z2J@B|J|<nSa85pG11hDoy}{P#<@N`I1v$feK#+=l$W!;}I<@%@SNqIx8v@}8sq
znynI{mDbXr7wO14+S)<i5}u^m>uU~>G)gPHFo+1{Y!^#ZvlMl?iFHglJtK2=j8~Uf
z>k*cD+F+O#8Qmhxpvs?c!IB#0>7ZG`J`oar6&K5o4hjXSsiJO=&mRmy#EX8GMB6BZ
zIQsWO@p7_YJ&cZE5Jr7`MhCLDu^|);BeOf2M{Jacdm=qnM!zX^B1oe0dy(L^G329^
z<>-hoLSC{!056OZz@zWW-jPJS079~ienc1~JW+XpF9cl;1kd@fxMDe$M?WAGiziF@
z_uorsZHnYNp;$ce_+p6Rp(w$mYfE~Gj@~C!7$l29-Vd?_jU(f{GJunm6W*iGuv-{2
z9HVC}e0$dZEhZ`~&bW-eRk)~<4JDI-s*$>aPJ~zFN~qEI2z6MAlF-p0z5`X)kUr)^
zZstKs6`GQ5^tFusZ<f@p%9qMsWrqBF`8erOsk!ebV#X4Uy~u0X2YPJ@T)#*w>0)u@
z87`&X*f9dK(ASGpmf=h~Xd}Ir#=Pd4?<~DxrT|y>z}^uc+lDKZcFDG-*c&OmMp)4z
zKm21%nd%&QSs#&lZy6(KP+c!FVEUA!?KZ~^7PUPw!nzA-#|<ZP6lV6Op%=+8@fz*Z
z!?39f@y*o%dRTXvzlS=Bm(I@psfiwL>OGV)QFc25%_uSlg&R0$ooBq39<97vFk)MK
zhv5zO%aqN{IA3bKe(-BvVlhaT{89w}@FzG$(N6_`97oVEb?-MTn!2Ulp}?P~EVetI
z)novj0R(JwHU^34FNkO%EW09M<b*#Sd(Int2wpLbH97wW6LY^#L>v0MJQ=yaE|i~9
z4p%CaA1J?t_5TUT4E&pnYx^7gDBSLh!|iSfMw&ZdbxTAvltFG1r*bqE^##C+l@b$d
zh^I;j{ea_v)-h2S%+*vy5PnizfVf6zk#8;&g3&NhMa&f*AEpxUaYgPPoIojku4Be2
zIp7B^Z3RuGk!%z4PZFcYSvd)2th~MX!ec>PJ~*i@QT#;Vd21|A4wPo9Sf+g*Z?n%R
z2HACuCk&Dx;fUv0E_7iq<Agz+(^DUWu{4)zI@T{xA)*KKP12OQntTuyy2?Akz6MuX
z*)S$W!UfcEs?7$k3?l#!eD0`O0f-pd+X)3Z*gI@sP3#(|fDD*!*EpuHRitk`!-R$;
z#;#jRvK&L$`9E1wcdN2;w$cx)e<F5*$>v4fozv^YUNtb2HIxzIvOur_;)zMb-;jlX
zB64r+T6FO8GXC5)iw2gk5PXGtkwNmbOral)tst6sNNbUd6>&5Ya^gIzyVA=O9u}Mv
z!CoYojAn{aU_@GsHJK0*<G^Pfwz%o8St`KT+KU8}9hriP8ZojYuX^!zUfQh_Zki~-
zc6#q<yj#fg?4Co3eRVPXQJwj8DJFK;Jn?VElRptOU~})0XaFQ&b{oKzk|4c-H<Vh?
zd4eC>KfQpXHj^|U<3<7Zze&cybf^JAWLd&tYckI8h;-K2X9Z)?+KUwPeR=h1Y7nY0
zF=$4rTwic(R_Fg98vjqukqcn`bFcgl<xr(e=~jM@ET0RJh39~IFZd5$ugK}1VrR?6
ztZ;%Q#L-`cV}i~R;x7&E2LaolO@c6?jkwm5le*RB4od4p{5fQ>gfJp;RF>L3s!4HB
z!e|m99TCJXOudO6HA0btafzcmF#}v2@@!%4KBaF3LGAN`lg6kgS`T7LY5Aaq!fNrW
ztI7|-i5Ju->4+cuoG;>Rrc(7mi{`4W!fGMH@#A60gRop{$V;FE-Js)yIl)U-mgiSE
ziz=&ER4;M6ho2&LG&DZxnmNn4j5_ncB_C1cp_3y_7hXS5lNUa`NPOz1S4B?j!jPvK
z9Y*97kB?QcMx4gmT*Yjt1Dg=q1sppOhLM-Q82&+2Y&5)JNly0w!JrxX@0vNAM@L}$
zdVVwH|3M$+;)kyg($nU~%yBM8YGCNpI;gZ~_)>QMFDLQ;XDN>;YvBL0MtWCT{*Bjo
z_Yu95v7e4t*4o|6lUfqzWJawcS|T!)gL)tet7^12p(#peS2927zy5x~*6Qm;a>zc2
z2l$dpt(-jbote|vkv8l7EhfflYws}_hHt=Irc;S|LIQGGtygfYo!&bU==*S_yTuGs
zp7^(uqn8O9u&H+fCDiQB0!tD*&+4vg+6^41S&`=HMH=|lOyPlyTPktnBMN3lpy{uU
zx$$(t9BS-6s!x(Eqj>?SGM%-7tln}!fX3U4Z0~(gB$I7Q$BE?`uPbhThvPAy|NXGg
zgK`tTl|Rc(vR@7%^WW+6nez9M`|kqzQu!)m|GNSDfP3Wokq`V2@{`yhUX))$oRAOX
zPY@{xY9D2gau^~6JC$RUW0l#+1bC8Cs4PV;z*WjRWE5zD_i#knf_#8yBci}=WCXli
z*$3+4CiolPtNaF80UuSKQl3Lzz}J;`l#i6pl&{nrwLfwLj!;J<%lKq?Y0p)ULw>*_
zwM?ysE@A^Lk2WGlV5hoO{T?Eh#MHfrP;iC%WA!@q7Gw(imHL4CJLC#Hs6Ma0f^32B
zsee~L|HeDow^C64Ja()k$zR6i;`{5^2^eoBhOi4tZmb;NT5J`*^J2C59uR}{RT&fu
z;(JJJGrot$$@@7po`>(@@nQHL5kC^&N5m)KdsKWnzQ@Gp;d@;CBz!yL#rQrtUWxAs
zaU_3LCdTXVJt^LT@2T;2d{2v$ny1IN<9kN01K%@yhv0io?-BT(*XzXhf?n`}%5lB3
z@O@(MB7C3Jn~(34dza!nzt@fL#l6TBqZIZw;=82RkMCu@5qy{R!iroe-=*QZVi&2o
zYS&17SMM5+Z}+Y#_+Gh-)LgTR)VyX_0lwGnA~kQ=RgG`Yu2b>du#2?3aTghr=3Qh=
zT6RHPrEJ`V9Cb?TZWZ5w-2?F5zWY#oZ`wTy-=W<EOUG`~{;u6K@g3d00N<zWJ{jNJ
zb{FCM^xb59w(nkp@9y0V_&#HI8@|ulP3k{;HyN3od&tO~w}-U9XV2mI?%gvE-+T5<
z!uJJxNX-}RA?^R+9@73x_K@~pzK4v=m3zp@T)n3r-#^|1k2>XNd)o1R?Vb*N|6)%R
z-`DMx@qPVX@@8+|I~3oy?j_@Y+g>vMckU(azh^JOa_?T!{$K4q5#RUiB{S#2y`}g*
zu(t}|5A7xM=l6Tp<NFVL$-8)D??!w-wl{?DC-#ze{nTF4qo>cul2@KN{}6mXcmB}+
zk|d3lZkO=?Ptr%SLp}-~K&!A1oCELw-^*_x4#;TbWM#RsQ8@>hJnvRsRR^kbkf*Z^
z_Cl8+FXtobo2cS{_8)a>CiYI$3?f3!ASO9CCd?ozXq0L4dl%?UW+9BoNzA}&Ucz!v
zZvx^tBw-<ic%OvoD1f4lNgUn!Um(p${j$;YOMS9T5yxRrTR4v3mTue=1GJzQ+2-ll
zb1XFxbmUpc2pnT4<tWP({6>vts1b{^IM~?a0VPSbm)w-=cwR>dXw(FuSr}x(hdF#i
zAcqM>>WOI^iBZLLK#s-K-QAH_(gB?&c$<X8qM2Ksi5YswXc~;ckykpSdWM_!WF|KY
zEM*$CWVCU|3A_oV0jPF5h@XwepR~GLn<y0lk)7{{@fuw532#=e{~;W7g85*~&pH|v
z!J5;~ZwQjGt(+Mjk>N=LPwp5+gBUn6i>4e--jOm)H|k<k1}+HU!)be0>VJd^ma<5V
z{Kxs+!p~^r<rvIw8`Tz$L%FqNxu?zJT*lnS9MgFH<;1^<Q;LguTqDP9KEcXEGn@s4
z#eiWxmj~DJcZ{&P<vyrY5mT17x1P}dc~YgMUaC%49tQpYk-SYFE&UR=zRADV-dTMT
zUNC}RZ;{ANdUdzTU$|93ysYa*;zzGC&aR>;HBD19R@yg?MxeBiHE!rdp2ucoyxr<`
zW~Vw6ROycOM+k_#P%lzD_Cc75tVHR$f;_9c(v5?E#gUo?UX8ue`$WJR%~taam+~=-
zPiAP+Oy}Bqk0mjBGsNjO(&84oVqW^aNn4u*bHUR)txvSSVOc?Cm|A3uK26LwGk@Xl
zol0l7-3gI2ZPcki6PA#PThbXP(x_vYe`ea;(>tY4T{75J=jpG8FQ)##7IU1O|AW~1
z|B*ah_R1H_kAae31xo#K^-#4Oc0Uh%la1gzEn`z_W4%cV4R4I|(P|U5sbxyrWQBq;
z6UrzgV<A7Yd01kzke+LG99@+I$%_q@lwFz2WTADBvFXYB=&3Tmb}5|miG|=e%&u-X
zxvZ)oPc>Q-4-|{`Obt$~LsmzX&l3nTF_T!BmZ1jP?URLKI6=u|*QeT?(N=mZ$2gmc
zQ$u0yF@ZSh(ErOrB=G*{g2#VJIZ9cLJirggh4K*P3)Klq|6KLS?{qc)Usbu#HlPG9
z6<ZLQx&-zg5yDuwVZu&c`>02S28q1Ps7J(4_+Z7|&^r85p?yIKdjj%v#7JNtf_3<1
z6VzqaE4?HbtcP)<C(t^upLjW>o<f%r1>jYkFree+mIM0>*K(>Di95lB>^zp=K!<Rv
z)Rl6>UK5lv$x_HQvjcN8jDMn$G@NraH~}_?2Wob35o-Z(Tn&f<fgDR@1PA6Ft(IDk
zAau7d&ua6AM~)X-LnfbbO$JNY!CY}ho+WHc>iGnFf)Q@?dnr3Ja(Zb__n}!D<4P8!
zVfLMCn?k`hXBEDJ&RL884}0GM-&S?@eeS&`k&=+G6Ci*>$N-W!i-ZuC;|x2Aona@=
zASAM_*otMz(Xiu$We9s&a@iw5!`^$ew560nTc9m<+ZW2Fw9o;iEiJp>|D5wkzB;<+
z`ij!_d%v&wVIJw~-m~r*&-_2Lrmf?>+V^rTq=Kylk#JB*xBFId{@=&8^Z4KW%x{<r
zjGq}T?9aIHZ~WKNjWn@ESUd|O%L;?drZ#O9jN(-P2t_g9-i_3;r<$|8GI6jdH?$xH
z2PD(wNEHRAL_W?wZfSP7&bDv9K*M;4x@Q)p(p3V%{Q2LHeb3Nv!kfF1Iu=reSIxT+
zWK~(!?{sy-2OnwcJff&N9aS@q3Y)2axQOahV}MTRo?evn$8q_j^1z?_$bNmjz#0Z;
ztjbBT?rB9ieK_e|{0<jqtv^iDq0QY>iyA~n{?_kwbw<<vRHrJ^$n{^vtTW8Nndh3j
zL+dx4J;SQL)biibT?V65F>V|h_cecw^AC{+vvQ33w!+=Ve;LzWpEW&e+RI&;cg-Lg
zGqtWrx5(1!lAuY$?{QvJZXS6oEWgAa`gFKvTC{W{k9rZ?<I+%kBaYNSL!2<~eg1+=
zqxXJ=YEy;IR5x;`V|(<vd)VKU&4V!S4fb8H^V7Dxk5Ac_H+3VUI&8CEx8(u_qhGzk
z?*H~<nj!7-chAO5-Q8T|wYvVaul=cK**6}in9%}F$=2?p&=w1T(_Vuah4Y0&oG<Cl
z3V)e*QM2ZCOa0%W-2OirnLSq<zc<b_0_-*h`%K=yQ@R(Tl|>korE0I7M<c5N%hXP%
z-{wVrsd;CKZlq#EM6cIT;{G<}1@1b0nHOGOwdGc-RbA`#-AKj;ld{)&GQ}PvpBFLD
zzP<n6vXX)s(9n%+<wdyFFAsJEL_QO_ndE()^itN;tDcuF-N?9J#6B{Y+d^RR=(B71
z3occ>Brq8rl~+iMUW6?kN|Qe2hu{8fuk&;qKtnh3p%*c30y`-e)bG#x+H{L<+~VEH
zjb4P7*3rn~ce={1pL&{Rwuids6vZsA23&L~-Wbe=9_N2Q^7Xi8eoOn`(~LdMUN(ln
z`gf$U78ZcZjC+mejo-ogcc3}Vtbz^yRPz$^Zu2MRUt#|n1zY?EV1Ha=-D^E*y`HyE
z{Aa$9tt4L=R$5}Nh2boxn{sy>@{K2}UG9Fdx(4U2=IN@)HkNmeE2=1wKo`~PHBDqd
z%)3KWdYt-8pQeZmKzYiXtY7m%WCG0lF{|mJB00u*G8jM}pezQ&V)_M`l)=U@ocnSH
zrKL2iOA)CSLOg|NTVwY20yg7VvOg`21An6vp8ar|msv1;L9%f{T7_jUnUbJ<zLhk%
zc{`YI0oAZP#04zGKrRk%lyxs6qzfHpfp4fl|8|Xq@$F7FMebpSQCOA=krj58K#755
z2Zyh0VAS4({NXI^`Hm!0w8rh&w?B2oA(Dk=klwe-HzwO2dmsu~TyqkPZ#vBgCo_<5
zQnr20{Isu3p8vrA%2<b(kC?|8uN!gpIXfQ+U@X#IQ<S+woDO-$b9rFcFByCKp4FU!
zv2JK1i}12{n&tVP{c`HBIpk#8{8Zs5-o31-ogGe9g>fs~)vDks`|B$QYj)h0ZlrcB
z;utPmmi~fE4KpRDJ9VD}6}Ea!_Yw}fe1KQ}B?m{71Eyh@yfulsqRI+ex~q$m_jDc`
zU<e&uIi@`RZB5nT?y92Xy-L-yz^`7J_}$-AU4@L(;-cPI;TG#JxO9A6p8QjX{YH6X
zE!~TXs;zLB^cP&3a_C^{o4N$}`9H*%!{GaW63+bJ!-sF3*<(Iu4YO*k3$ro*|CvMm
ze@CqzjXniy*0<E7g)jf~^;%uw>Fm+)>2!K~3<p$Ccdh9lUq7Op{vLZ+Fv)$3^vM8~
z3Uy#eL+6$t9M^;W)Fsx|x4SlgLTN<-|DiR0<Ug3lpLh-QbktV+j+FYptqgHKL(H$6
z;}QR}hP}_W{_EFXyc=m`ix8_E9mo7mS6SDw?`pR4=58dA-Rzd8K7Xi1Vn<uRC=Pq1
zdF;Euo*mgvRjHbT_1(xMi*S6e`idGGmj?xPF8287@mFYS2zMiAY!TrM1q`oWy|Q-6
zQKGJ?zU9iPw57YQxTBuyS)9V1gaXFlhq0soO5IesjE&vMLl0MYuPltR3;FZEv$r>i
zoF5LpFq^wq6s3Q6^Z=BGlQOve+57@edGJKpxdPSC$=$UWSA>ap?OmR*7#MGJT+mCJ
zMrhxQX>e8EM)Loo89e9@Ht#cM89zY$&-?6bHafQh1iO*eu?S60-gyOHwNG}eGoPbo
zsBB268;Ko@2zO8*Ar*+ova_<$8|qwY>aG{--|M1OU3s`-%I-jU#3SoOkERY%fmK_(
zk<hUS|2KzY7c*BCq?c^is(F#E-5ZLk&%wXRUwCciI}Ngb1Jw<oy&HMki!h^Vpffd)
zn(UXS=ptiUyOF@Xh=Fwg7Igp{U3fs&3-k?T=ZkeCm3t9lDNcw2d;)%Ks27jy`I#Kr
zz3)+K40j`~dlCD(kYw!6(NeatU72$68}u4~t<=T&f1f#(nGy3=^EGp-wXaoUo%?^G
z&tGmk`tOJT><D;d&$FfiTfBrvCpSmmfFnH05_!m;z9Gdl)~=@V)fDq&o{?m}$CfI=
zAs(f(LYHXY1dslIj=?2-{r?yLv-lN7_=#mi=MXI?I+y4?qVtI^AX-7RlITLBi-;~J
zT1B*)=n|q!i7q3$oM;WvTB0k6t|VGVbQRInMAr~qOY{Vy>xiC6bUo1xM1w@@i8c^z
zBpM>Rk!TaqW};!Dn~1gu8u7IfjS`I!Z6mswXk5^QFG(~-w4G=N(Je$fiEbsjjp#{4
zPbPW_(Nl?@Mzo9Q=|s;Ux}E5mM9(66wxH+w&J*-}-vvZ3Bzh6ii-~p<O$*xN`x?<p
zh+Zn_WxmUaUP1IqqE`{Un&>q|uN8EM?>eH_6TN}2{{Xv};lF3t+lGN005gnL##ZBU
z<8I?E(=bN~{QoxS1aCK=GT*j*h{&B`Rak4Rgp~&J{{z7Of6;oc_!aaepCCh0etffU
z6d6IBbn(7rWEOK^!hGu}FiMf@eQT&drvP-{A!ORq#^w9QDt9>GHW6mL2A7GtnQzAR
z&6!qWHo&AQoEW^qn@~lLjt{;{G7#y+^*S<^;dcdnB>#s#jD&G=<RZ23K}L)k;?j|v
zmV9-6QEByxWJeC;vIKx2+-{o%#*fK25@|yg(*SVWqA6+nYm=t52*MU4Jd6DJwjf3L
zZI*qAq>xuEA^<jE2M>e;*|@tnRoc-9(Z^9pqNuckFauj<;fb<_25xYii&VjcjMyQK
zaEY>LqJuy;eWyz!T%xRlGK2fJ^j(R|=AJFbCn1~+lFh)Kk$I+lDfvDU<uMTnDSV%i
z{f;c6oiZ&zVt$Zd{Z6Hl=f~l?EYeYT(JhNYWb8kKnz$I5ctX)p!b*FRG~FibjugJr
zsH|!r*vjbEcB%hsVBq=pH}5s)8Lt_e*>eoh&|lfVrtZif@EF`(PM1a~2`rv02rEx9
zVb!Qt%+pR1GQDdip{_u83$!VRnhjp%`(hSSF{^I+*`Jb}uBruFx{+A62=iYdAD#2U
z$+6Z8PtCe7sp_4E?r>2aGFhiBiIkZ0(-L3jT{VOHq}CGdZZ1k-Ey&MOkg;W)e_{2k
z2`l)YBCs}fHx;G9QKOpGFz1GcR%?3I(!H^$H&tlkhmW`dU^(TITQu_`*&Qk>VTE(9
z5$6;n?2dPIo{;?fAIbn2(8z9L?*jibX*^+kYR)vbAs5KU!2deMdh(y$3G`+e6`p81
z!a>@BtQ9Cjka#Q_YZd<5doOkgV^L6&rUw>8;KdTe{=wrtmLpn+?}vNO)7nYYHXMP-
zo_MS!#2=qe*(3K}vZ$nMxU*qMeSQWY0^&e>;<+vwIRe#UxaTC0jR?TYqAAN4mmuY#
zqmikwEPj3hr5u63IF{DhtsNrVWABw(IaMudW}u9x;AjjI^i;W4Y%F}TCL9uYQ#b)d
z7b^6jdg{YR^5!@3Sa}{|z(0pXX#d_zJ=cF^paz)LNa+*BTNU-M@;;?z1?D2(4Lp&+
zY9R3m!g@pri#*SVS%DhBSO&&&$oM2&J;dV+JmYpvnT!bl*D+My8N&!rOqeKTuHM|J
z3?oXZ!Ylw}0{n$GrjSMmSy$zBD$}Y})H0@IQ&oxJCeeaw)4UM)ztgb9ttlXz*|qE?
z>;i4@1^5fHG(K%2FSxY~QNZ7@?E=;+?X0T`HbB)0$a-WkD#b!d0mUl_{w^*v+zh!6
z6|L7|zG0DsBb`w!mMAzzUoURnsEw$~zqu5v4mh7p<YMm!+K#nOA62D1JU19^;3#n-
zffiqLa4wp-IMhT4<bIBp64Fn4rL+Yc+dVKRjPjbn*!4NK`Z?N5So^}1VipA_&WRz!
zizt6#zAsQfL<?A`6i~$(!g!!2g(STQ2ozJ-KL#)IIsJB~6j9R<tVeD~VHM>@t)<9!
z3lG9MsceQVKZmQ?qF)Y5d3<c=2z(EY$|%wzW84KZ>JOl0fbdcNnX!YdO2cuxtO~^e
zZ6Azx0{V!ZQC-q?fb+Jhv;i`mgoK=r@evRn$nh+%R3T1KEGs`p-Z^Qi74E0z(&Yeg
z*~n+SOiuw2Aoc@oFlSW=OE?m42$q($!iqc(3BmYV9sDVt(r1w9d#b!M7!AwBX@mcc
z1}2Z!;zaj7#FJb=%4`*~*c>iB)dEvb4Ed01$^Ta}tJ4BTk~!G8!q|^hvYVBc(Er!9
z-HAc0${4NZ@+;dpmtPyhA!6A+4_Nd2PR<im#r|=JHl0^nH<HVDxWWF~N-V8O)o<cK
zr8sovMMIK_@FkqCvNPWo2zpgje^&jlPU@EF-(4_i3#61%od~LvO;>&Aao+bu17Ceb
z;d5i%n>jyNs+VL6YcCXy3#H|j9|<UU)Tnm2rMrzAx(+X<MpZ~xrS>`XPigwsWp&3O
zs||BYB39T#7rlXtPJvyprcBd}_U<TJVYx+17Pi7swc)7nXxRNiUh%?XAJ|8EzvzE!
z@%?vEVMO%5vGaCcK>b%=y0rh#V%DYBQNaIfGd?qV*eC2t223;8e<yY$Yjwyi+k|~Z
zLb<~O#KjSouzg{togyL=s;WMjqzuryZX~Ei1^Ve|ufVSRNZ7vYHUGQ3=T%jIQ9Wb3
z_U`7ns1GvN8Hl^u+wp+0*HDY_QJzPI$B#r}!A7u@A^@8wdyK}yjgycWVp4KT(wFdh
zXDM%4<<60VlSt@L+7<!p!ar^7-pXb6!}T5^dCkIsTFwuZ?CA0n)^>qiVcsi8;IA2F
zgg1A0@&)e_QDv{lSzqO>#yVknq<Yp%JNTbc=bG*<gILfFvdLa&pMtGV*JkY6^f%d|
z&(+++o4Pwhu3m2=SE%bNRR6Ju7EYIy{e79zlhxhrq9@+wXP?R~k^6YypS}qN#}oWd
zDZ8mV#ob|e=50-SL;ENds2B^BjwL@5jyG6kvz40o`X9vBGGJ#eHs3WbLI$8-X#e+Q
z598uL_iuF?>BI4=y>$Ywnlz{URm+dN-5r&K|AFcvu{w>s-JZ)vV3~xQ_9b#3TdoqG
zEmc*Y&Q*q_F^wGEEpGm1_QB7dNVPJxWFr4N``UMAi7vDmk1N&GrIDO_y?KDQ;o-@{
zg!VU){bar;v463DC`s<?(n!JWx#XN0Ig$O;ambx=*gt$wY4f_YS;U@fSDD-O=R*$?
zzCBgd+pCoFSEZ3`8?RNLY}-EceJb%p?qlWMyy<*XRR(248uPr#Es)b*be`HgPl?X%
zIl4`b&PRVxT3^?FY7yg})9~kX{lnIZK#QuXcOES$`II6`UXCCxdD3P-4JyA+w)yi<
zl#=E7e;9)$ugv^0JIri0-Zi!X5GbQA{!kjZQ0ojHpzWr{=R9aAK7k7xQj2f9V7@o`
zHr@_bCH}VbZa9_)y5)ip9GR`$(mA1E3K3^;%}wI;tLM4>!~mSH`JwX)k@2-^$<fCs
z<I$W(0^gKd0^fql%Vj>b>;Zg!{`ZD!JH*g0o&1<mRZDs(muXzi`GTtW*}gH{2-p}Q
z%lpn(F0k{GBCfw`$;|7O+D=N#oV_kdW(%sTqjc9$fAMi`429a{uxfr_X=@MB*(I|+
zR;q7IBVq4mH)!sH+BtGRw6GE};e7kIQ&T=!&Fn*!YGUa@{W$B@M9>SoD=|Y$rM;sf
z#*;b#&PDX@T!)L%HDa@^h@QPwsqw_LOl6I2T(>OjHClP~M>mOLUDw0fv~LhwVvNC_
zsHp&xAO@9LFp&sFE&G?<m{@J;W4^BythxUGAi#a%zn6gjJKC6OR2v(N&BlesoyPZI
z4g9M)1gPHg&DF>Sda3!K`7FEyKek3#v#e^X9@c^Tt)E+eQ1^;|(|2iUb`<P=Noht-
z@D*ZXhkaWommtE)JCp9)M%GoE)Z#l?n&*|n-ghS1S945;?<}&_W)E%OcIk`YG{=1B
zNjtV~)ADu8T9pmPcd-n+J-;g06mAHFBFKOlO-l1_T3Uhg7LV@&IWp?r;k$^c*DP+|
zh0;de1K0*A6C(kU%}=bDOZO--N148!3Z(ZW*yOLtxY-^6*FxvbVTU0v2}QVg;u2{D
zzpN~f5Xx~V=j%gA!QMD2*3{&?T0VSPSu}=yCm!JDeB8n9`TXZ=<v3h6H`E@Bqy%;t
zzkH2s#bq#(a2*-Hbh&KuWjs`LUMDn<5R+sTS5OtO(8W1?FULzm!nmoECW{BJl7YsT
z)pWMDHOHdDI9<~aP9$RSgt*~KIkG#DPBW52EB>CGDm&%`>pLT~aeYI+@Exc+xwRz@
zLkjFekQBKx_onG3X2|r}f14YJ)+)+#W&wyTyd@yP#R9c)>`oG&@axjG1P{exjj&Zg
zY78aNGZ+_W>~EIiv!fhimy9(bs$0}{3$@OsMD*P)&;Jb!v3`dN`TtX+n{6;Av+sU2
zYj}Mc89A33JW;!5_o{=n5Am}AScxP%t-No>r4NhH-9_K|;d<>3){^coUs7I~rG;~$
zaC(&Acr@QRQSVA+yI+?^B2!=j>$&#)+H8~2HZhO<ncyK&{^3gb&FOu(<maOHs{(Tq
zibGovEiGJ$g^M%s(R$vM%E{K(l&a!s<O}U|L;A5*rCG<C^&MO_TUN@(DwVEDBZFwr
zZTxJN+V&IM-cmhVB-E^Gzb>H^zB;|<AhyWhfX$l8)>pXI_t6-A)uW=hXZxpXr&%z)
z#~`-CI9z`WBhhX$9PI>7oXE#$Dc^I4@$uR^+S0(|KiLg4xqwM>*z_F^g4AaMg1TzS
zkq;<C#?SvfxczS$ThA_LPq0snLx2FX(|F1F!ki6fv+K=Y;j~`@|DbQtj&QiO+S$yq
zG873;Tm|j>#*N@lvHw~(Y2g#;UYyP_#?0lgCH(%IwU(3Y{V@c_1>*p~2e3JR;#O_2
zB|T9WPBg;yv1DT)=SwFZyyH-7g|-{*z=Z(VUo3(=%L6{sM!%v8`<<m#Fw(<oO`N?0
z{!vi^fGJ0{qWWA7cog`=L>d!7qX@%dN>)@^&=*>V@`7@3#$eCqyZwOAwdj^Bn}d<Y
zP-`$gV4l_znY*V{D3`!51D0R<)-6v7o7I5%<E&+x?u8R@c_3Ggku_Rt<x2Z~rDbig
zhG3+#jRTOxkcm_%i$|`|TAK5pmRYgJN`osOfRT;*&gIq1T@qs4xj>p}#h8!WsDI~q
z4_6|C1Mp13@|}-d@3FOugMpP{ps>tO!NM$ByH*<vp5IUIDLIeQMvPpkcY{!#igiFB
zhfSKhal$GlmJc7KRs8(-vDv`?vjzj<XQJ^SzI?$h^KkmFP9qhk>uw9g%49P)JSVUj
zW<TzARO3~Aw_SMWKF4Zz!p1bxAGNsIqWTIfT^SB?bpvdDlF`|rTxhybgaf0(f(*>l
z(mbo_EVEO8p4%!C9B&|-G(s}Kf$`igBo!A+q%jU0>A<`=4(CSjic!h2?f7!fwVgAN
z#%XV5(@v$4kJJ^TFP{m~@X;Fndgcp@c)egw7Ay6J(#T5c8l{<Eufm`!4EvEsivT#(
zqiSFi>5=_Fz2(>AEJZjA7gL75O1+z=^e&a&zo=2whz^%IUq3eW7S(&SQt#F@PeAI5
z|Cirgtx%#BSB|>!&s6z(rE<Cc4`S91^HZ}M@_vl{m0bjtfczIpBLzXiE%U8ydBDx0
zCF{ithY=xk>~OdkEfLPKSdW90)-<HY^O$*;P;Xmxig=@lJM7FS9^rjPEd!NWwxp2;
z@Km>~@3va>VwPS4TUBxsRXs$hx-~skjHlj0l~;A4$Y_@pvvMT6WaJ%G-(gC9T@%wh
z58yO2;c0`b4aITtB4QiIHw0F=9LfOmz)Cm};o_kV^5~8)@lfi-dDP%pN`srzNE_%X
z|JVj-C4vKh#sIf3<aU+Qt>99$Q%wD;vsx}us_F`)M`LWpn4x0dM*l*({WbM_H~a2O
zpU`lq=D8Eo2XlkV7*B7nrZd_IG;pc=-(mljJYH%7@7!lUWe}wQFI;?|WFI2`$9m%$
z<L}7f7XcQ)`@s3zfEb@2c;E&8lecJP2HQ*#DMgVrOH7h`v@V6VCu*R6nFy;wtQE_l
zK|J@gmzwOu?z=(D``T;jjDl-NC4mK@Xb66tSZJcYM^=|$<vL0bw#UE3^7GxOjW%^F
zSTyQEEsJY^6x`VSR45XtY>L7GQm)N!>zxFZM}_|+q-kKFaL-vN!{$MODE#t#4{6zY
zrI5wYlfdP<HH8*rNAw9VZ;-Q+8~{*s_g<}^uu@$-r;H4Qw!|7!vd`a{Y&G=%24m4C
zWCa!VJ?>?0)`Hta(k~282r{F1?tZPnVryr?=IGlg&;Q%G|Ifk5#W~CPu@N(NWw-w)
z7qq7C_30^MFZ8rq=e@)o_HXQBUv@J*SlJBMr$s(77qDO3VCHQpJM7=s<(-1Z1nV(H
zsbO6jDa9Jxyryh5*cG)qY+u;L9p9=x>fti}r<C86Mn<t#HxzAK`BgE5DMVq`gJ>ou
z(GK+r>wYIYRwI>~x^_uV#OXQMT;%C&vWa9WPa&)B=Z5(Y>`q7Io=QX3rIBdN>yYwT
zfGqCm4%-)Y`sLY<29)wQr;%8!!<^}9+VNn<CaC4Hp$8h{De2hk+u?Yb-SAAd&T&ee
zO=%<=^ZFVWhm*+&53gvVgpNDZE9{EXvNau`)WpyKk?byp|9;5chW2kyqtvJXAFvJC
zfIc+$F%LJ70g7&$c|Nj#K4E@t?T?tC4L}RK#Cq8Jk@XwRTKyMYCR>V_!_Y6m?oknp
z%R~K}(h9ai{sx|KWel6Dm|Nc`TMdraSOd9F`yQ3?nFV9zyNxPw5L|q>(nIPx@!drx
zmnvbfLY^R5^8-{C*V<s2H3lSaEn4-hV@u$0?fa6-0pE2;m6)5gkMj*rY8~hVmgXd>
zkGM}7w;XF0O?!$4tU4CxGj2U5jhj1`w1s8zc;9!W5zl#c`);Q~>^r0H9(qeo+!fuQ
z&p=UAaS=<(iAS1UVkR&QUy2K&_7^-W2H`<zT^46YAul77vWg#FxfN+s756zZB-Cm9
z0p+`wEPUdkGh0EXyjnZwKtt=q97r?h4(<6rgF%=3mU*)2H%>KnXP2`X?hAN*8X0>a
zmU!9|^OoHX`!{wL%kE2~m3^r_jVwJUyX8a>3tcD|OSQ9u3qg+a=G3Lxiq-T$Eoo%w
z*=$bn)U}o2crqmtv91ggJT{b%>NR%uBm2_fb%fH*t^w&8@)Y${AD<C!)2+Yx$S#_d
zq?VK_E!mt#1|P4-ob!q)T!effv2(Uhp*oLL>TF0OgO68rkFvFbSHYW&XSZ5*={?`1
zS|%v9w4{;9$Lkw)SUo!mud(YYe@(SbRch-xJUta}bc(sz6JO-48s_g=yL~(E+kx?J
z&n$Z2GHR~MJ@NB@H+B@me=$V;ylM<KmKhftPn&*oAuvB)uy#ZA-?i4uh5LclU}0OB
zHl|MOsn>gvZVDHW?_n>}jf}PH2sJj6@yPe&1Z%BM`hwGbLWHE&g|~u-NR0fGn|P|;
z4UfYpXPY^r2ZL1ya4LixHuA475`RG<<;c(jD?tG9rPA8<smu5jJUtf~34=mYF!IlO
zLy!nh$m=Pb-jKeq1B)kw7&I9VJMt5KB$-1Am94E|_>~|U0?n6A|447{bSPjkk|MxR
zj^v++u<Q&36DfGF2*c&b4_zegf-$HGg|~(zw;dF*;v+vU<^^CMiz7NNmxFZV--{Xs
zzT}!x(F6~^pw|CQAKdLQ47IUT1N@@qAS@0=Wv2stEt<Hm_sG8#)0a9Jj!{-eI4R@I
zM}DBS0K+q(kw>ir_g*9Yf6Ac$w~jY|3Xak+x{bZq)vT;=#XDYEm7c?0lU=<0ZTmqV
z@7Tvio^X-ydWNvPhq9HX(q$Zv)x~4gRx}?#Ck{);da+A?Fo*WU=}Ntw>Enfc!1Iyp
ztoso)JO0Faa(vH0O5M@4$SvlQyie(K0c$F%Rj)?Q5qY{X$itKhThquc1`Cg;&N|64
zI~*>uvjVJo#tSp~pHkntH1dmi71!<j?GD=)c1}Xr4$&Xg12~cvdBmo9I(@}hDuN_Q
zka^PO+V6?vK&Z~IbmxThY|$N0)!F?5?M{N7=ZGj!6u+xd{E6wKyzBq-#I+svZ`*S6
z{~<~R{QTd8EoAsF37`Kb*jvUfumdbZ2B2S=W6VwF{pP2T_%~bETR(AJ|GA4=e;UOP
z%9lC7I!1FUH?@weoMf%n{#v>i>0>yiMlGeb8@W)MT6b=EA|T?E#!+r}#Bql?RqM%u
z<g`$;5;(x%bMzZ3{6|yq`cUJDkP8=)y{UBk<Y|WrpHuM+lI{xhu_~Bu0PzHtc|?;Q
zYJj_{ipNSPPsuA|Zm2oc8jRvR6bg|MVLkYPu8dkZ!PGX#QV9Xofr<oAGvXdSOogqa
z8F{U#1Xjlu1iEKc?<2Ol@CSWe0$NA*3x*||wh&H~=vY!5@FTvypafCF&Q_7^v!zp%
zv5Cjp;PgK(0A&Q3BSxI7Hzf2GGc~V0xp2f039Z{%uKlHDfov?;oD=|I1gAD)qt+wN
z_Fy|;Fr+v+BCTHzxmJp1$>PuSP&^<2!boH*CfXUh8t1|PC&2N)r<sqLi;Y+D<?pOL
zyR2){$bUD_*dND(#-$R{Q9Cq37SRD8JuXAArq8%p>)vxpnkN%9%mw;wlZq>?0DMMs
zEKt)1+#0Yq;J0B}f*Z9odpzU%^X6@T<VSqvlw;Q@+g{hObR}A_yIH3{_p&Wm90nMW
z2q8$o3B5KJDC1t&ac*~pV|zO#k9x+_ZS0b{?^BZ^N|P|+wb@bss%T3Zi3Poiz79IM
z9fjA}H6yaB6E&p0B|YDJZSv^N)6+WWZrN4$i7-tZjVdG2o<@Q}uNopJF<VHaj>0tm
zCDxjCQc*LNo|s0~L9aIXy!e2;Xo2>D3yJ^SO_>SdG!hQN2SPtJZ9HJ1)VrhL66^Yi
zRnKhNkN+uk@$>(`_`k)kH^NWdN%TgdHxa#==q*HVC3+jt+lk&m^iHC85xtw}Jw)#%
zdLPmIi9SH|L81>4eVFJYL?0#k7}0MK{U*`JiGGXdw~2m-=o3W0OY}*i-y`}I(eD#|
zTF_^FKOp);qCX<~EYatPK2P+=M1Ml`r$k>M`ZGa$eLpAq3!=Xy`aeWpB>EE3UlDzo
z=qp5DCHflC*NMJC^i85~5&bpMw~79S=x>R>L-bvuza#p4qJJRzN22c$eV^!`h<-ry
z&qV)1^shueB>Fd^e<%78(T|CKLiAIjpAr3>=oftb@6NU`{Kt{Mh8V{q`u`5&4dne?
zW2ViYSQgNJH(NWuYA>KMR+Tdkw;J)o@K!E|PR<yug^07=RazG9l*%lCQsG3F&;iEb
zT2~MIvo>DHI82*<Deno6?S;rxq4hGxX}w|W&&+FWgBVfP1}By*i*HQv)V>N>bt#9Y
zF<z^2wbvyBj)1BwBne}pmdmw2#1m|CyhCs{L1f&77{QM~V~nTq7g2pu!&n1IFX@nC
zOxCJw?G-O+0G?Q&3`~@?)f$ItwSRe!A)b%p#7+Pl-WDL^!N?={L1V&HtEu04g%Gd^
zBKo9_)+qJ#$O^8XY>dgbK1u67WpCulFs!}+CTO*>iN+zGYO6!QBe;4Y@EBtcu@<@Y
zsevz*SNa)lep4yEDURbN-<0ti>Hl*avs$e^5bHAm=$~uY^Xxc}Ct}y&^m6dgyP7q6
zW+lr<bCFQ!IR(fXcNDJRU}W%ZhN)fZEPc;-xQX2`VKed2Cn?-amoL2x%^7Si>tC=y
z{m2Z}8iGUtCsIBpQU{xA2yYB;5zOH;{oez$0%}WCX-i`oc|M!mTygpaCXoWRkU)Z#
z^<oj{U14W`OXd!ra%{U&O>-IvK3m-EmDy?*h2!A_GVdb#1G|u{sPG!Q=e_f)XAV1%
z|0z|))72as!9^dNt*RDy*Kp3@!-rMV=YRK%<_C7^{MTq0o0UqVX(amG?B;%xtyGvb
z#Cqc|vZh6>9^W&Lm)TV>pGg&}1G*}WY@cgQ9z>|Y-pN)7M}KJl<v{j*HYOdtD;2#(
z=?kRJMP8*&fJngyJCsD?-YD=-J0p>xn500Lh<DaEhDrYQbQ^nk>Fd-ab;a=We}DEU
zV=u7ZLGyQzag5P`OrW<IPZ}SXBh6B?0=d6=-2V^Em&{MB(bin65xzeUTF<dZtzUcG
zCH@t+Nl%<!s8%?zSOAcwVsG}B%jkAB2FQ0kxkorz7s)-MKyLCqDLq7-=aBEYF(u{#
z)90>(@cmG>6gyk~n)dzV@Dj5Ik9*kid@sn>KU26~eLtR9V%DJ;Px=Sn4-P9am*MXI
zcQ)ToWjy^eeN)@_EcHd~ltEzWl2Xq1GwJ7|Ti?Ftsga(htM5lLIKOw?IAlQM!Tc~Z
zLgZ~6H%=_J-%Ib8-tjeumW8Fp)PINsTIiiJYt{^YlYg>oQEwU7`603&ng-r#uF)00
z4<28Fy!O7{GVV6lhx^L$PNB!eg)A!RFzJGX8{vM`j4d>&0IK@3HNl?B@#J|m%TY==
zxn4B)cM@@;w+!l|XgI-n$H3BHG!_rG2D9NZ2wh7;r7air|4@Ng{Yju7;8oRj!~|HV
z{QVDdiuVHl9VeH71`u7EE}hVDJs$~II-&KJBUypiLTX}&h!wk|e>cAVcjL$Xajb*g
z!#;-Yf1`1m@ketykO{6fe{AhzRaqBk^8jn@)hjD&Dwk9T=2ot(te#g2&-*|nPpcrI
z2!_0%RiEZR$GLg_=4MQuekAYWkpIzZk@KI#LrJ^`!SOiYW)FE=%j~P=G=$s2V#*A8
z-D9g4bM-mi8Uh1_NqfjI^y>Wl+Ny!wkpPO(cx)EHPUgZwFe04xhWvg`3DQJ5s=f2e
zK*h4xoTZtIkSxGMh<P*Q<@qJx)VvfS*NRvJ*%`_s&jo75ke_OO+VdN-G#D0#;}AV>
zn*RXMs`%Qdk!R|V-)dRq{KsmV0mdkM_^#I;0+~7#Y~>=)if98oK^nradgKP`k6LCr
zzvf!Lq7a=Rp?`<`PAj{pkMYbXcu!?u#bS;1okABs<VCG~r#y~%&DGIjLA>d;PCUdB
z$G}Y3aLk9iC;9(sW?jLm%|DxGnq!T#j04$yU+%~brfUbW8iU90X{-fc^=$~>0Aa9y
zE$_KRfK@EKb40n;b`VY@g>S+QHY>l-(#65ndOq6O@Sk4g0=w<~4>)&J)&AS36^1R8
zMh@SY$<a$Ryr5FoQrIVj8BXl{y?I~RHE{{f)&AD&N<Cd8)2qN3jxpDHuF3Oh;`!WR
zmk+0~#o^sb`%XyLaaqR2$wL{3xv{3!pd5qT$8BdG$cK61ox|T#ir<t*hToJM+@(@H
z&s%IiP<*}WmDKA3@fMYxu2j}FI=up8J<$y5WkjVq$r$3GO*99_3tS#@+TqAR^Cy8>
zXle>a6Vki7x0t&(UP(rP5vrA;F<s+Pd@Nwbz=eq&BFCPwGhV1C{=ZEb4SxO)F%~jo
zp>dA!U0{C9G~>tw`deiAIuSO(r@q`i@c-jeT3@Zaln7-AYZH#_LOQOX{31i{(drTN
zpN77K@8V#k;KL^lfLpaXx`HRc6M;XCb9Iz(5g2lzmZ8aiwlxHMH1u>82*(qZUZz!m
z<vlouC+z^{y9BY4e9X7CXRGpPCqJE+hGhuNko&w1ufTf@^8^`CGUXtrhn(fHy*yb1
zUp#YCI4LF5cbd2H1^x&U{N@L64tY|G+>+l{L|S8<!25{7)yE7fPhk@j58UmscLFes
zX9Ey1?c&h~`T0M91)0@seqo+$e8yhEm#^|)XL<v6Tgwg3Q`v1R19jZ96oz)VL<HN~
zh>Q01YJO<x{jEH{f2|%{r|+L$KZKn=+U#2E`CJuPbrZo;wqcJ)E+K#_f*-GI7OpWO
zuL<zt09FQ;Q%n_T=o=9hUl|q0KB2b3p>rXa(!jjH(iHODIEBsk{+lXdm(?Cg$F8dB
zIwgG~Ud=$a-1Ew-;cG)USpu;sKP<Ob`xCq2%^!*P)3FsOt&QPWX=_`kNqjmby{^ax
z%nd{PC0XaWu{N-@;Shno^lE=%FRsYY2z;tEpec<^+ne3+CX@l-FleFpMugq+<>Twk
z|IY4Pn5mw5(C++Csi|wP^jh@w0CR=snK&0&IwsByHZ=vYA8p+_k^e8S2CPOX**S5I
zRCoD$z1+pFm?zSXfv;A5Z29^h$U;2+HvshSQAR8K9ACfMf9QNuk)7v?6fVG4NtFek
zT|kpTddDirT#3LmIs9JkV%M(^(Cd#YFQqlTk;lBaI9e#Le@VOv$KV2N)#R=2>n*s%
zt_%K->Qj>~bWKi&Fb=cK&7LO#ps?`zp}}ei1P>L+PXfrY{!p>`l(n@X@)NQRcFG2T
zoXb%u{u%bG0WH+#Ta_`|lx{4JH=oZ_KFvpPKnvhH#UfF!lzq}ID;r@dm30kGH(-E<
zn@c<o5N1Xvtd>Z%CIGIuNeO`kJfTlTOq}38zBReu!mj>9Ep=aROnqBaB3;kDjE?Z!
zo_RpostQdA0QCb5fz%B6dY!JapEOX&((t4*4o&G`ar=^Z<wEeVO@Z8Z_WbEXseh{E
z$@%|bNce;QwzFr95@U{$0`Bi8(2bsN{*N^jnSL+wWczpFLF^)a>D<spD3UlTX<M_@
zLC)4|$CTx#-Qs<(xNvFt)q|w~GFJmK1OjN450-yl7uHgJwk?(j)?>-l!YU(FPW}N}
zEtT5%oJjmj&zY*cZ0^2axp0~J?dK;ZL=MsG!<Uyp-{7bWR2vR&%SJdM05O|?5Nbsp
z%M1pMZ_5BXmZzcrNUsCwv>JSG>LX{A2F(L1BN#J)Z8iZau%RV^9S3@HDVYl?!#~68
zm>>lg%nQ=l)_=T<6qYxV>W=37wchPpY5aV6NCc%~7fuL^V?nqs5N3~mxYtFr0Qi(b
zlmpC`5Ci?YyNFeJO@|f?4lGRsh4WXw{ztGI81(*gjUMA6<9Xvvb657Tc?66~ar0vM
z1U%1vYQANd>;{Wj`&!3Xb?_Cq_^V|Q+)9%X(!KdFN?PoC9X1m(wqX19IBBIp4CVJf
zsmQ*fY_@My?_%P}^7WR(`$fnt+$lvYlQ7a$^EI+E*wBzl2^7-GD6++IITIeuFiXvY
z`nk0YTM{O-)E|8=vsL$&BX?qW;{32o5DnQ~JRsKY6fyt-|F;cld1PFaC;y+xFjn5#
z5Q(+P{b?HYj|VXbR)M!i@Xpu?AlV3YmRvNu$e{M#ev=`}_;fwT?R!O<D{)8RZY#s;
z`A-g;sl*rnQ=3&E{&GTzxdLPBZ6~C;lI@<{=%_;HO^3|Lg$sIg3DRHsdR><*%|eIO
zxOa&;4o@qKjmFI-J!BiE(po(DZxRlDuSxws;{PrH{^v#JUWohgvl~4}|1lO!$GHE=
zXwMANN^C%s_t4jC`@(Mf?YD_7RB?HN>1c6v;7n?*k4XoRUfUPeee{ItS?9mS{}h(1
zYfzf!W82eQ<hdt&B`pAEJyZi_NRP`+4DlGkOEwekh>(e0ZeW+ZBhx?JIYLGF+?tM{
zG0>WLZj8=Y+^hM4oquB1)}kWbbfkF}b;BJQJnvA^80s|!{Px|es*k$n0{*AGgstgK
zMRuD*$8#x=zYDw3y;t)CyJ}jDSmBsb`6=lzDlbMIvM|LV#<;I4Vt2W5AnUW|>(&0m
z9@y_gYCu?Nz~(g4sBd!%#Z-8Sm2lRCS3;DBQbQxdw>vDU!i%hH?VeQUZAzUv`Tt_e
zG%qu!7(X<IfA#YJq;xxmcBUEgJe{kcU@8x$I5;>LZ6olO5U7+`Wc*dHfOLfw7l$#k
zfxISqi++S<hCEF>&MwNZbd{!4XfY&p&qku9NQuiiQY4dsf&%At1$37@Hv<mYY7XkX
zCfo`|x*dq8xA<pPbxq|>u85wcN^*_qq_9<bZgBqLlz&#8IE}D}hpSlw8q&z~+Uf@V
zqD<1osc1uUeN1{(_S(N0i&D?hwCqvFzd0QjMqbaIQCT6dPkFpi<D{FZDmCX=mp{E3
zuNoV_=gOAUCqmfdVb~DN6!__8p_7a!B@5Tv&kb`18#M1!*qdlt<Y1lRxhcE>5+$*Q
zkQju%L%G(nW)t=PGG(AS|38>DF?Kg3|C>w;nSRbOpS2FM60FJkrW;>g)NlHjO=Y%J
z!VwmXAyT+-F`L`Rz)2^YL&EjMKeuc55~%aNNUi@i4yvJ~Yr(&+MPg6??1U0*MP7Pc
z3D!P3E(s4Hc&3QS$wBB~fJ10R-&gT#RY-FEGv{a>i_~`mYX(2>YTCHpHvC?2@Cp`t
zjvjubpa^H%&g-6aK$RN-T2dEGNcneVu(d5LBR>2iJ!>?uIrG8bjzb7Fp(6$7W&}%`
zD^vM`79A_ADd`&LZQ$Yl-IU5dq^d#<NDT+eX#^QTxZ|KGb1%IMn>tw0WIQ&}NvaeD
z9pHJ)w9JU_U1|UOBeTx2b~SG^M;mvuKNhvJ|2N&-b!_@1Z1oGwQ$6z`UuqlSujfn3
zaQspB*rWT<cHN?E*PGMZienM0!cp$>FJ^T^mPK^9$nH!D7jZbutX1mlveH{IYP*{A
zJfBKP)|W)Y6Y}6dGY5kSk7AmG|H*-I`*m{L%hYw%R<|LIY{d{XJvRdOfDp{;vQFEV
ziF3En>8qk`Y)NlHM<Mulo*sM~SsvOL;lUf|BUq|zbxzmWbL)<y-mOyxIh980;#1wi
z9F)yLY+!96D7o-%v#yr%?8p9`f0_N@w5`0}s`lU9t<)>||4L?!1>*M{;}^yX_6u$f
zDEeQQKVuciM)59i^SN+^scFUjD>Ek{&34}?y4-M78)3o@|48Z8Nf{Gu*~L7@^NSSz
zW8<pF1(w6=8bG)>0XmUqnZqxvtLX%qM`{{_Q!)msFGiBos)V3J;sJ+&IpHRm+on(7
z&K^k}OS4Ih>Ii38aXykY2s7cTOJM5J8qL4J9vvZ4F=KmpUm5GxG_u|nV?<q%fD|+z
z`q^k>gk;u&OYE9MTd8lqQtI2BMlRf9q~t}xi9Az6fT--B!$tPB#bhNLp@KqotxTUh
zgmtZlp4apC<8*EpuMPfcl*%VfDWTE4OBqe+|7S46Fy<Sl0Q2`R$o82sZ#REu&9~0B
zzE|`<@W1T=J+_Uq;VwenUFh@4_@AdZFV%)Y6qJ$YKJv0xt0hN-3oHs_XPP$cyZ7)J
z?4Ri3yO*b%Q@ovhFL{1Y;!0N_nncuim}kayF+@@9?D0nIrZ5yD7MUMX+%zu=I@YUk
z&aN!*{YC5Pt_*S&Tr{%Du5vLL{=L_hKmp}NhALW*<olZ*HBfC^pGZ&^MTYW-G}27f
zMro_hJFs(~dYwg8$O{hdDe@u|uL9X<7~7Yp`?`$1!2SaC?;{ZZbGh+t<85=GIU3r4
zb;$eMZQf%3*!;C+T1Q)Jtqv<=-Tg1#8IBU**6{c%UYw<HtxB!1O3_ssZ$jVeWTkNt
zG|9&3U5uPkVy=f(r_#HSIJU&B6i>K|fHDHHw;!zu^~gmGq!2NOQ_=SY*(2TdKQfHw
zd&Bu&CM%%R?nM^Ng3T#=UEO<VJo?*N$N-qXamXM}=!YHmg;^zL3?uy|Ry{>2+Qj_4
zHBDpcAZ+<QrIB%3kz}sKPY_;|P{T3Qzp7Y$q5%lBVh!&hA<%oPkP0~>wd9Dk<IHsx
zN6V`T!|)3$2^@cg0UD9A!Yf-mdobt!1^!o$`4974(=xUjyRd730Y?9}W(I?mEyfU~
z3AjY0rE?@E+y1>CVot78n3GTj+1!f?zX`^J6RTrk68e_fzp|HGm&$rZs7Vk`%J_>E
z7x?J*`I;{c#o&j>2UH4RPQS3n&iEd6^CG32CuMv^R<Dai<>9Q(QL1c5?Il#bYIN%|
zGXqioV6)t_v?Rraxjcq0F;Sp6;Ea#Q<OsO@$bP-?7;42i${-{%1B!FBb8;YnpMZl~
z0qef^8mjdarPi+9GP|Jf`<lx<_q~5d3bdkMXA5@QTmK{5G-9CArcIfW;yf;E5ojsW
zs{>S-CZTd=>(q@j08aUTcVkh8|88Z!G4?m&#?8h%hyn_lH^UBKS<|c-&iicc-|V*V
zC8<~crUH4;_Ybcel7sov_l`EQQem%b?g+m3SC$}1%nQR<Ou(1#=U&@lb6fDe=b6E*
zgI^_&TmWx^xOe!-iPUBO13kMOdU2`t{Z<S1iUEZtEU*N8TNM2Mf#X~q<LtMVRs<u$
zqp%eR*QQt`8jc65BoNDi<FybteObJHJuWVAE-BM5)k0?Wl?@b14rn44*VkOw?OZjS
z6XJ1Jaj`CW7BlheB?nttTM^I!8e>sowl=+XRS?MD^|4qBq$(gZHH3DV=Vo_NZZ756
z>EI|5z*U6@T2P2$yUds8{~Tr|EWddL@_$@nj0Fnt9PbPKq|Ba0o?Zg&mRJ-H9?kW^
zv~M*d_}$?bcI__&rV7+g4=cN6eFk~iVUPB#m$CCsVEb&G)X6&u*>Z%6$Qa2WF*|fz
zo+~ME34<O__1WxP@ekURpHTX=IRjjVVpLoX&<=1%EW~?Y=S>e%oo_02b`8l4!+YG@
ztnz#k_6MEOKez_F@Y`2Yduo;Tv}T4Dr&i=FnQ;6AUP(uGIw_afRo^<4>f5f=*Ob|{
zIG6jHNGjO`9Y<DKo&TL(dI!PUkJwkK37YaD80lgh4*K!Plne*g5!Hp^ioiz#=w=fa
zhoHq428oe}d@j3P5N0g(|E&z5+rKqWH9j_)+22^J_tjt2on5<Rc&g)JZn(e7i3|Xk
zND7g3!qZ|tBAVee4g94xa<p*$c`Bnce8b;RUO_Cg?;zIc2AZWb18k)dHXv9{<r=#;
zly#f=sZwLtu9*?&IwD&<?;#wDCNTlAhDcPxy@{6sDi4}8nDTR0t$uGA(<VaSs@h*s
z9Y4VJ4@ZNF;rd;CVO<?%**(9z32<Ud_@6Q?q0BzTNqAMzU&W#=Au=4~ePuV^n>7gi
zMX4v1*}FLNnxnFSYY7~52<**@I@(n>DD`$7kl72PJkDJ2`L%mi5*49OYW$F_sw2iI
z4V3GDD?^meuIB0HK;u$lH@3B?RsAJz?%E?W3PZEM8+4$u3hk0*U_AHmtm09&&@FS8
zg0=(?H?ey^qJ&(-A5+Ey%OX(ZvJkp}xX4rs<{6tX8bjbwqz-WYkzIQj;cbj4$O4i%
zNbFCZCyhA#gdbYI8<=oq0obE7y`S2d^?f~G>Gqb)f#`KHmTzZ4!`JJ4ojtoV&6h}3
z`<t&SRd)@{9DuraH!D5&7Kmvsjxl^)xcy#pX9ca+4y7rlWJaPT#n^4NN@6rZ=cvS9
zJnsf-K!ehNSZ4p?&LzMrA_Ef~j24CxlybPY@EW^x$KU1XzkaGxBiH}$$96LO_XK;_
zu#A0;>A(VMGj2CtfGu!{IRn{0<K`vM2K>zY*gC*E!dhc>Syv+W=WAbb;TQcFX+*iG
zz!Pu6JRh4Bm~sT?@%-~BW~CpGOWy|+t5FcH>-!DGYUC*k{ewtDTR52h{j(3`Vg0;F
zs(4q9#J?XIHi~!r^?gVxaQ&lVK*o{%L+8-oH!0*rMa=R2;?NRv2{hsTG8O(2hm@G}
z_?>QUKA(_LAfGSx?@H!`nkW}f=5@kXnlm>wVT3?Q3EMxPqJR+a)F@Tlvm{hvuZO+e
zKZ;&N-o5K3)@)8o=|76%d+c{9noR#dGDgUIa?TNcmhFBgBDa#wfB*uf2H$}(h2W1b
zO?sp0b=j431cV|X`=s~fBzhb6+r)b;AtO_5Fx~{ou`C7SGmqdJUk$Ka3>J|8_@@})
z;$%q+DEQ0f>E!#ECWAPlfWD9v&?tTCYQLYa|J~WK4F5gG-ZKs{Hb4XLV`Tq38p&zz
zHea>&v({NX$o&&{TDDpcy{Zs^>mqP{EJc!K<amQGe?q*<AuC*5fpZV>0Y%o2Rxzr;
z=#IcOg`?h#UyPt#(cK|6p6i|fWth-{4SrT{c+OQVPzFRi1xA~{iNSB`6+V4Wg?Y#~
z+ylUn0&|ZigyYW+S*q9e*`DP|h5)t)XH@afJbf6d?V()wT%T@g@E2a56b{0*(A~o_
zAEgNO!SCwBnEUGN48<`rh?Eq~oU2#K<{p^`#WajqaPor2%KrKe^6)D19u}|SJ#99e
zz6m!k(E#igar@gI-W+xy$v|?0PBV|@l9-KSUEHE`-J8$ZPsBk>fQIqq03wHhKGZ0u
z=qwL?%qu}O`ehHpDn0(^!}D26{QQ%6_?LQRW?!SjTefVWUNXu5*D!0L`J}ntc-QD)
zzh^a0Yu)p;uDvqj!A2DWbpn0A^yi+>;Z^y0zyTb<O+y77OJ#l1yxhgkn0&cpu12V-
zPP=@Wagx#Wtl@G$Yke;9JN#|18+VFOud4PpE>_sCSO%UK#V8;OEyWN<3;a2ZH*Wha
zv6iY!WFj-BIQyED0b0~qV3uZ&-cnONGdzm_Dg6v)4k<2j(}wBmvjhCHbAKoTpP&K$
zfl^18l^Koqx@$51$u1{1*cz8#$Lv8!I>SF#n=v(WFq$#jOn9DNU&3OKH&DEppItQK
zLYfwvl~(if|G)WvJnwC}8)g0!KO<@oHHlh8ONj15bO6zTM14g4L<bQaOmqm*U5O4Q
zI*jOUM0Y2;2hlx=?nQKOqWcgXPILs(eTnWzbbq2Fi5@`oK%xf`4G<kg^kAZ+i5^09
z4AHSf#}OS*^iZOQ5j~vf1fmm(P9j=LbTZK?M5hv+MszySBZ$r*I+N&;L}w8_is)>j
zM-x4U=&?kPBYHg1GNN;cmJ^*zbRN<9L>F-CukcqAT}X5h(Zxioh*lF_LUbw7Wki<~
ztsz=VbOq6sMC*vIBD$KN|322qtTZA3zGK!IzcJRbU*f{Q`rq2jWS&Ls0MDCc7TMjG
z!+2*sjmv3UTdizsT`W_I&Dd|2c`je?-^O9ybiTjrx{pn2L&1SCFf&Q=8=e(gb}6t>
zScEpw=GRg9`_`7MK2go`8qG{BPM=ulvL~?a6er}`Gf%Icx%xN!PZ|G>nF+$0=DFwj
znDssd!+z_|+xZ|@wZEpi4K-vAFD@L}jtv4Ejtvrt?YJ<jmwQ*~PIKn4;=+*^=ld`E
zdX)<e_Z&pCX0cLLBy(tSre-eN^K|MtEw5BM=Uv(|n6fAizf`G?pZ`PIdWQdQVy_yb
zjg`hu;}7Okvjy=$pF-Prj`jFIu@&g?*j3fOt18K>f4!<}^6cF2rj61|#(Ci7r8ad{
zRSE1GUR;Ol>L-mw!#~PJW1_S`1no$-yg;GK%heUfhRR-QZ&iU(%xm~Sf!56XTyWvP
z{i8icA-Hdr{z-aWN&cwX%i&_3zr=H(v3KR2UQeVn#un80v5SgAeahKg)$f<`e+#ot
zvJCSYbE<K_aS&_yCsw@v(XPpvnK%!NLBA~C{~vajqGJY(Js;R1cjFN=l<g7zp)=6t
zV*Eq<2NDAuWWQiz>^qx=$RqE)^-7yg${c|v6%*XZkBH@P3ItG18+6GF;>cReXR<sg
zoPJ@KT$}Zs*r-(BoS9zSS*WC`;b(hZ-kPJY8%1ZKYCR8TrWL0>umPXJ|EUiJjdi_v
zz8uZBRSe=SnW-4fVl1D|{{9fm9b<dgP4Ayh-FsdcNieBXP<Js*svZ;${nY}-u?Id)
z$?m`UZKVzT{2$47F#Puz>t!Dx1L$<)1VjQ}ZrlqC;0NX~a~3jzZZ@wqA2EB)cVGdW
zVlA~!wl24Bv7WJB)i3w2<QKBS@d=!7%Jv^b20if;=i;(%U;d$FFXX>)uzarGEd%DF
z*t?Ihm8jsR{E1A7{5coYF5e$*_qjwT`z;E);pI7lX1{9dLmt28KQwC=!n4(}`WTEq
z(yVl}&7$M9aQ#P6R0^-vAu|0V3Wni77sQGC{!S)9{OXRF>w7EL4rh-||DI(2s}(r>
zK+BQn7snBvpBG)Oe>{zkgF83{*Eo86lOZh6nR|K(@>#(<0c<8T_TDmi{G1BP^Tej%
zb#`;`A4uKv=0z>$qQ7E#pe7WA89xzNo=QmIk=4UW%>AJtD3hTq{(2F#hVPipm3$vZ
zS}b6Gb&{RQ9~U-h{GQ<XG+~Gmlf72VKwOpJFGw=Rb1E!>R-Mqo{A;EBKap7*EM~Tw
z1F-H#BNlL?<LYh799Nu=Wd6&?ag#S0*v|Psrmb<2vMoVZe=N2}IE8qY-`zvQAc46C
zrLr9-$EhvfQ`!>G93wR6o@H6Sw$zPB9<}P#6Bh~hJSeqqS1N7E94&%CJa?a0YTqej
zh4w3~`-yj`i(N`>t(n=yIolQhuR@eoft}fn_l>BY_2C`-PpPkKK;|gCUO0k!?w?&I
zDUfZTvv(7H*mEZ=mOURaQEAD#%q)@F$a_1oP6?<p`;p!Ja5I&^zfykJ$jp)GX)&3d
zyh7Jv$UTDGva1i6NpHSVX`ht;zs}g#k^66naklXYynYUY&(CeJ{qKX5{`9XZ_Q!EY
z@p5qm;&2RSVLB8?6eKc2lun*J5!ib2%S4_{7~6b9a(!&$`Up<WiQ|Kf?L1=Q(1}wg
zPevxeX{p&?eW}rnvEyc1iT;`@ZN=Qi38X-zI_Ep}F_W!O|IZ;;98L-0Sa9S~R%d??
z%xkTWbBJNNGvsoXmm!~fzmIMSHNeai1L$zFQ${u}^3cS}Kv^rG$0VyV7a>On^;c14
zB1R#r!oeGRbO^o^95WFCOml(l*jgWo3u}7iG^?e*(iZc0*X5yLgwm3hdw3mi*r*9L
z#32^-d0@<%Wp(sd7oG!O5D|GTaj?=syl{%u)Zdfbk8Li}JW7-O%-Pnq{+@tyTSJN;
z`KTws+ln{Cr_Bt+|LoG=!%I{3aKyoZ6prvRs#APOd3*pbp+d_4=P~O_^AmHMITZ1~
zL)m#=mgQG{52T^_MM^_@tsORJt$!K2Y|vQR4L?wJ!$f9YaYk|{pG04;(^YoXYuOwV
zFDkX-G@M)HY3Lg84;_dbiXywF>08wQ`ASPRWy*^SJyp{$L%3HGGH)CDJXLnHQrStF
zIp}pUdJG+=16TSuLld&?_1DSjM_5YrIGM|eJej=$KA=53Ouz%eAiF$xAPvveO8Xiz
z#}{YWup{Ji6;oeg1NP+7Z&EF-N-cc-``Kz{ZD6ad5@h_HZaizW8hf%k|H<{eEK@Ov
zl^gqlvC^ah<(bT5QA?5$PYw9KXyRih^=MOnHe`_NK4ebRGi$OiBpC^{A<-W4rppYx
z{tER9+qrQ#udjO8QBNvEQkOxR`_*m<;Hj3XSUfJzZ+}JKXJgj5M`g)}sWEmZWU2<S
z_2xLeBta$DVD512Qz`RT<b93*y<8Swb%xULPzIUno7~bFQSr#mgG@@5INafwCnUv+
zf=leGhJ$52<v%N^XOXvhYQzB5^UQYA-^^c8aEaado{&nahaIn4-9nj#9_x`<8PXq0
z_6PpN+)t_R5<BM%0sl}vY~)U*KdUp9gV<U(2zwegfPA-SCGHB_7xwkzXUMUtd`&4E
zyUc<jcNwon14wuteS_IG&%Van2RZW!rG0$;W1S-ZuXVin8}kBl0@i=n7>4y<?r{fb
z${<N@*e#fjhR;FI;h_6qmsH#@2XmeprLsP=Y7h&$rE8;_=D_@lx4%%P0Pt7je`gnk
zx62x4tAc4=28nLHto`zwr>MW8?=!n#_F!4^RMr1(Lk2l+8_dJ|UHii8(S{dWp<LK9
zfY!@gHKcD{W`)>Z`rRJExF(x{Qcl}T-dA?|3ln4)#;I5l>oUmhjP0x6^7FM&`AR94
z-axPS7}aT`E`yY}UIw2xI3xhY{S|$m*@LTIsh+hh!vB<6UYA+!t>iiJP-v@Eo>laH
zX4_8@98>kM#V0EzugokHCHMPU`%;QxI_A=gCd@WD*wfUA#m3B1vHA5|@N%5<+>yH$
zXan>@3og|^w^CMf>{O-wT>c-!{)gee-?J}(|25ethyK3}nt<z!hmj57HRDg_Am}0|
zn2XH~hzYpB{JQxlECFwu|FCwm##pnhMOMf<75M{ivA$*f()yjpUE^PT+a4w6DCkf7
z-l2ba_EK)}{mTTL5`Q0Y?tCv{?plQT0IOO+HUlXE-rc}cl|$P^h4d|Xf1Oa(^IZVI
z6}7Qw7VN>lQK*mcgYDF)6k2h~jsV3Po0K@Nf>egerTCZR?&tDi4siQKYR23!&LcTp
zH&9>ZLAQ-C1bK1YZYAac7zVC)6csfKjXEwAZ~%+xRu~6GY^{GYU4WKCUPzD*x+0cB
z4NxQ}IfonODJVqQN$T&S=1{mbCdX?Nb&T9!1Y&@=c|G-@k8ko<Q(vn?u#VP;u|<hH
zqompfCTnxDBYXUYNOxWh&lfJx_QfUmTdCp8;VdOeh)|~smW6+5_EseF5VtnaDAoWm
z3t5_E#~Y~yd2E=!id6K#*AkDep;`(!5C6jKF9qz-BI>f_in7Wbf13z^0<)BaK138A
zrY3Nq0$RU~vb8Z9T|^+D!Egb>Q6X+WfkwA)bM)6x33;2ne}z2%7clD%>j?8Fi1gbX
zk$=nBpMU|jpok?}lW7>lR=9cd(a8)8hirRA_7gj8kUWit&UjndoR(&ge6hydzu!GD
zYbMFsOR9diM(%gVJ*O0TVg{KN!9w&~BwvcQ6)FUXzVGeppOO`ny`xl6m)YR$sIjfx
zioVb6v?m{uC675vDY+rD-kbDOu-GcpE3E5dfj(6|Y{6$rEhlD9^g2L!TM`Dy{(W29
z2HB1IE0hY>X4Va2>)aBE&{WCW$tvvM*lAmdM_DjVDZM^}jJ^;N`+dI!Yo<cIk_xVs
zU6|0MRFcfB<>r#(`mIE7c+=bDI$x)eJN9Fx+GUwFVmb87e`U9%3i`m#Y#`aER82I+
z&;KFpb;e$Y@82flQR6eDJv+&K9J&7HS*KW!6|o2WUwNzEMGD~bkw)zD+&y3ppqE-p
z3$F0JbkH!p-&(-~c||~djqosvA{?~89)ZiLm{^MlMhhUO3=sN_0S-WpWRZ;&Tju|;
zn2y19qEYZA*udiPa7-{AgIF;glQ^t6klF$?scU0xVtmGH9RdscH5W|QM&d;V9jpg6
zD}0iBOm!y1V6oueCC%G|CKWRV^M$cRXysrbXp@ZBpmBN+(ZV)}Y&7L@p}r3$o8u@^
zoVI^1Vgy7PRiRO0=*DQ{6P+ushjc>miGz04dviKG%tL75Fu>z#v%iWK>?P0th0MCa
znq$6Vwwe1G-vt7&pFO}97Pp|AGOga!01hl$Md3B}z#!V=kJwMy2bX6eg4yVI`^|BH
z71>X%FAEp>>S24ADTS`dw1{J=-$L_*g*?%rY9=ZEW`18Oe064%Hw}}WcdoE~L2_o&
zFje#_Wv|GD2eCTyp#D#V95>m=Sh5$YM#@8OtcuG~lR-8*FDzY7xX6ha?A$%*-7Qr8
z%{FD4xK{g!euvpn{Bjh^Hvftaw<AwehNeD){O(?ufdbjBK$=UQE0CS4haKIbRI)A;
z@}?EZ7ho##zOu`jE*9@$XsP-h)@B;L@k@C!ONIR#{1XH)QuVN*K%j06$NKV{^Yecg
zclVjdQtV;&DZKwqHJ$+O$4c``<p16s*?upvUZI^p?}(n=RQe9n8i>R2Tk8~t8U7__
zfcAf+hb=5Dr#2XA!H&;E<iVgxxpvS#`qW2GB|sI-8^%q&4V{o$#jgF=B6e*qc2z@X
zF80ic3rhf#=jf2&P<brX&@9t&Nw_?;LwGWZqIM~2Bw`(an}gREkKBjJS@hy>MKy-|
zy@eVlfRli6WGwXmao`mpz*;osu*wpE(s}I{FxZfwtvnWQgEF8Z$Wt5ElQ+YlLB+ft
zup}^SC%6_1F9?{KqGN+bXp@N-4l*wS<GMV!HAX71&x&}tc)FP*b&5e4Sj@3n7aGSc
z>IhX|0JzhjaQYIZj4h_|NE+5G!uZ3{apGyCm~{q`pEn|x<yA~CIfMsj(MB<Zt-)|S
zIC5`({`*-Qv#zy{!}))XxtH-RV<9g5thm$P>)jhNDabGem%nvpLBMCk5*#xE)~TQc
zUq{>5>J7*9ZE|7Fcdpl336q(2f%WEc#N?G(Dm`+lf=zIfsN>M8{4MxXj+d*KiUw3f
z&pu4qNjGPZe>35hv6tjpo&Kys^8>r*k}i2hFWEz>vnGRNoL<i8oDvU}NOc~2<ZwDR
z$E#+_%^8t=(<S#X^+e~5s&i9iw>*2T?8%g0C_P!8+3by{%jqX8vY%Q;3D3>yVT*25
z3SFN;Hcc<~B1Qj3R?4hCjy;~W70-G|so{hSvR`|#=;kZ#D)PRrA1BZLVRKYa()Af6
zzV^}qMQ2)(|DC;em&pHFJ#5r0r2}&PbNnA`Con)>GNZ=p(Ej__rCwI_iVU)rEiiZx
zuVyuuwFe{cylb|y9|oLlek7J~^6qWgB^=8jr&Pi%8(OxwQaCaNDpFBM@{NI7$cIwz
z+~IhcJv{0g)mN=LlK&~=5XvB{RM^e6AXj4*l4QZSI1fjL)KGV*SJ+#>s6-vJ_@7cw
zYvyF`LVbjuThG;lqp+Q)7Kf*xtuCjl?8Y14)YR8CD8o}8?&=0`pR2JB{gVEI;0%xu
zEP;a^TIK2(n4eb3HFflV54-ICJ2b5cXOO<I)y-6#YYQrcZ2;PCfgdGy<c`8?Z2RWV
zHFdRSwt5}uc@51#_vS1_8CbQA)KjOc?DTI`Y3i%XAV1+cSe;5rMh$o5qH=wME`p2k
zo7$TE9etk<7kgvHr`_vuI5&k#H?@VD#HZDnEuv%(b7pZ0xjsZ527gE2XLjc4XQ0(i
z^Pcnn|Hc3Cve)I`L-+}6iJm}o9nlkst|z*IXpm?<(FUT8L_<V35^W;dOf*b%6VVo;
z5u&X`qeNpw+lX!^8Yh|{niMqUZx^(~zlCTg(XB+c5j~0M$wW^fdMeS=h;|V@o#+{Y
zZug%_^em!h6FrCMxkS$+dOpz$h+ataBBB=)?IxNgnjzXl^lL;fA$lp%%ZOf1^a`R^
z3VN0QYC*5@Un}Si|8+#KCwc?XuM4`<e<RVGh~7-}7NWNjy^ZMYMDHMaC(*lz-c9r#
zqW2QLPtg1Q4-kEj=tF`&?0<ylqeLGg`VFGr<m>+cc00p=KVWaOzrh1wEIa_}jg)bb
zaVvCzubYF-QnMCWz^;Vd|F`BB)?U_3tJ>OVorV~|M{~M?{N?el_$DIPG;F!QT?B;r
zJ4lnmMai;wt7HbwkXGJ~xj{1VpDs=O9ZoyEf2*{e+BRl?C*ALK_WDm25n=ugkzI?k
z9pc!kAxC}xX;fU_ZtUM8&9((>gZ~t1)OI-M{M+c6CGa?h78l1edGB<|VR2@7{HGpP
zVlFfN9!_olNdghmzg>zwHPChdnKKCwI%zr(C-CJ0`O?3=JlK|mb)9#$DHw(AeK~CQ
zaPkv3T|fmvg9mSj2KX8AlXWHkoyTB^doGrdY1?H`=Nuk7BpDB$b3@#5t{m3w^PyA#
zw}ldF8e&QCl2Y%Ho>*emnf~qkl>ic)gWCm`LZXGwWFat${~T#&-@YgmiZlmP5s8ZL
zze3u?w=WL0harTM;CG%tDD`izMr)yTg6gLhTu?lU$T~2xqH!524-Cn&6i@OY-8jw`
zfT8~FXe`H9Ou*k>+<umH0NB0+#fSoVyr1~x5_&>5JqO|8zet2v`nT60E`h%a!36?d
z5OI{Us!M5*YeVos<?j5V+zR+eh+sld_+``)kqi;o`S9BaEQyRm+-JCfM&Lrp{~yP!
z3#>!T=gjr&IO8u^`G@nAfFAy>=qc$>0KofCBK4S6MjwXwt1T`7Ec)r+OsxRWwObF*
ziM6L$=fd<*fk@8cWe#|oD(w0TlDu_Q&m4E6!n$wh8OXKCF0KRFE|x0uVtfAgSj%Ig
zil_hbj8a8?50YRtxj6~us!->cI_atxbjW_pO)8aydv@uM3D1r!pZpN6lC4;kH1W0<
zUSr!AJSpp%uckI@>9IJz|1_7kNCIN1)6VU*owM&gexrt&t?e<n@5KRn%}<U6&z%Li
zQ(?|`F4S=Lp&rAlY*?^8cc@ob_xtZ?>e<`_SKO3a_VHZvHHVGn5Mt-oy`ia-pa0|8
zPZ+%a{(-Z9lrhOT#;7tHjihmwajkKm@s#l*P(eR4_cX_uv(2b^n%QICWIk@bV7_7g
z%^GSQWKD;szzNnSpn_-EPpq4*Z(2Y7_hEypd(?g<#x&Df8BQQXD#4x9%J`X)3?~k>
z_AD{Rm=+}4U^3PYe3VpTV0-Qw?Cr?4fw?{S@m))deQ{r^H86cjN!O4PW4QP>eag^v
zLraYP`Il%M(3|^yGOWZnfPaNGxjvP!F5RcZI9z;>hj<dJ;3jN+odaIW-WG2Ux5wgx
zL%Ww4qi`EgZkl7!&cG_;x5G<}iTnyynaI&t1`Lyq=m7&{^J<r`sHts;0c<+jIk<I?
z5@WP!)gtb(A<TF5xkIPZZK3#+I}`OGnEAqkn`EW6p)E<ALJ8w1^cWU2&m#=j_>qfc
zbNPCPT_4tU7>Psi0mo5k%^^tOL1Z`yMSbUFuR+m*N4X(!mt&`v7!7DhxV4_Ecp7I1
zs!;&Iuv775urW3vz~?A<1b#y(9s%0-z@N*WXRkyX2R=#7inWAeh=)WI_Wdw>sa0@N
z2$4MC3u-AJtwq5|G89FLO?%JYtHc<G7Q}<mL{PrwhT$XSJ3@|__He4z_e}O4GzQiR
zF^2xv<an>(ooS3U1(wERn-DI#%gMWy7zdda;09nL!MN<dRzAJ5vZiuLbzpAg%F60_
zLw+ppS_weoa!jq*@R_oCD>0||3n@bev_vvtog*jG%1|UYag}vF-4u$n<4gy?6vK!3
zfX}F~<{(r8t-<(!c~qsC!7zMr2hWi;@?ss|h7mU^l97%416>TEMj%$C!jWXB?=o3w
z9d~1no9hB4#&M=q7m8r|fR7RR)$n4XO){vn1nL-W|9g|MH;n<t(OC8O8^1Tlz|*%I
zXn<dU({BSZ;Irx~```3^v{mVB)Z*`n&-hN3(E>H+?kSxzdD7&`lVN;o2V>0HD|U$%
zm8|b6Xs@DpW6KfM+C)K{>}%RY*0$%6^+;}EIOn10#!Mw<lJ$6~mYbx?0>Z+KIVG4-
zc7+!2s;}DR*wzAN^&CyE5+z9g7Iw8ZZDZe)9OAn^wk5C>URAL~tgTtN&N6*+y}n2J
z21Mpec9|Bxy6^rK(J;gX0q4Rl*BaVv_qQRA8S-FxJjUaSL4zH_lFP2rS_%7}hQ5<W
zA_rlk;~YwYYwg%IU*<tRXRZub<(k=;z$p?u@JanxiyKN|=mXS2lpx2)0wy1!?tDHT
z_^cKYzf3+_9!%osgGk1E5){vTpY#7dmSEP|))@04^9XnV*07)B!oTj{`W|GrYj6uA
z$uYTnYAj3P6czG}U_EnR*@M1-<T|IWQ8?UfJ;S&Ku-t{~%yPJHLh5#xAKCAIc3btV
zGau)FO6?6j$Xo{|-b3xG*tcD|z`k~Twd~{Z%amF=dyud0WH)?M+b9N;uuVJ3e;88T
zZ|tt~jq3Tw4&Z-E-KX^M1a^iw&qEhoRRyk!1optR-DKxy|4C^;q-U_u?Yl7g*%vH?
zc1ki*Ma~8O?M_!WTp}EAtKM9u2Fa}NK^|&vGd5q9kgr)_FRs}~cBrCC=}>zQGI4Bk
z^C-@}O})xQuT7~tM|SO*%3G9*`T8HoE@sw+)*j}i#vhC`j3M~?pZd48XSi6o9$u`Q
z=3~3dk4;ZsAYVd(u$t^aGP+Ll7!Q?e^)gzG&6XXF)w6!Nfd474U}Fz*)3vxI7tOu<
zLIqNxPO1Ln&t(59XDbzTjqTyd=ngeoJ*?Y0&Yud+oe&U0!NB;eevPXhxX^%W<zN*g
zJ_puRkx#JGySl39m&f^^($dbJJw0!3lBea^R%jPtTS?{GcH(y(eq-<6D>C9$Ju~Mn
zrS2^~NGOYq)x#`s(Ga?54^KJtI{AXi)nLN59;BIt0>DGn8nviKU3&c1-s+iyw(vit
zx19gqoxRAw`!@mm>nY>USpP4Yqs^t}$>w$DOV+N|9K`osZ9Vg!+7iBGy;{^>Vum0!
zHeh~B&ojXb{aDX?O8%)f1|@J=TTr@+9r*lVR-GF!S1QubiK3sIY&E#vnnmh^(n37&
z!wJ^fejaFrubX82e$?;H;Wjwy$&#P$uPJ<KFHObUVpRI~`YSyiZWX12F+T7I{ogE`
z!f$>`>z@X@1H@}&xGvKREp$sMLOg>l2n!T@k`Q_L2<|dRKLN5&@*vItVwEeUQDT?5
zS`glBdrAoxaxr(!5aYQ^xxN#m+4Og46O-rkd0ey*{;hVil{OQ2?y;N}^K`vXnANX3
z8@o&+jQF3w7+7VCK<<I}?`YWk_CU1n<>s%f@m9>b>r1Y{f9+#v_fbXGfJX+3N6hWo
zq0M?mmX_6rgdfGo{U9LCat&31RS1fNU@5eAeA3F4Oi3&wp)BCDv1AgjcOSLAGjPFt
zP`hMuZCM`Px>Yu26dt&*|Hdy2%EWmik3-{UOtjWH?<J@p+xCi3M1=E{U{HP2wfYd-
z6T*j>XS_ljjOgPO#*FE%uB+L~_!d*fRj6D+ixjRXqAeBykmz`9nWC%%P}b2}J&COq
z+#N{-BG2KV#&Cm;km0rD5EOBg9xS{(){I~pI6;>Ofs+;v!v2tdAuxU;?3c+yxximy
zqOd70;YP}{rBJbjxceYiEw&3)9`Ba*Hi{XgmGIRTl=5+c)*>79Z2caOm+G<Q9iN9&
zDOjWN;Em=)03a8Do(7K6(G~%!W__@$c_ifjNenoD2bvk9*?5xOz&^(X$A6o9ke9Z>
zm<9e(<L}2YX`#mzQASV(FAcRpt&y;tFB{W*=W$l3;?<pgttoI-&jEwjB4ZSoB2AqO
zBEd%3Z*d-4eIJ8&2+6r}?n_~9(ak*va_dy7p5N*#uM}N?60bQKSOe`hf1Cbm3N8h&
zu7;iEIR2;bS*v>X@23|vNXr%olufEyZ}oj#Gf=pOy81iEdq#4x#f59^E3Z_11WMmT
zoHpPfviL<;IbUD>cUk?h_rI+42h(GX;}rR)FLwEQc#`<R<`OSbN+`_H?4Zeqbsols
z@iuI6F~hm2-_I@V?0xRhNKC;V<cWvL*F#Gb*8;`WfSvt_KvSxErfjk@lG}PlcvV)p
zxn{WeZLrf`+_idEvWfpGwR8S|pt+El3z6gZ6>Cqc5*a_9{-<B!e+&5kZUpp!NKjvF
z*$ObG<|vND(rkW)MbTJCKqScqa(fD#IMB#oG?*S7I7iP!C`FBH4Pem===8cUH1yE&
z!w#0@pl>K=qLz)xFJ^HV@k9K7;;F-nf2wWTz%nhfl3y3M%m~;uF0qt>S;0|)rXK6@
z@ulI0mcWWO!SO5&10PigAp>XW?GbrnzdRL<@`@`UZispTGR@c?GXKwc?0Lgy%m?=W
zqsHgvA+Q1Vn2(w7S;MRuR-?7uy6;O&X|0HCvp5S=tM7b$%$RyFY#>Nw+!+AF$hqu#
zI8zC((buh&77L0%1PlDpvUz%a7i;ZE1y9O2p-==Se#-UiOKYXCf~S!(8!mzpzSVbu
zmK7{`j<bRrk%bKQO3r)uE-GTUfHTy<*<>sgK3<JLHW6i9IM!O?EEwcFNob?g?YEVd
zHNhhgMs{8WhtlO$4BVoX!t<V83{Q7beGKeyYn9DSLu>6q$+_FWwY9;@8y42C!Qawa
z-?H8w`nrWXNNIU<s-dOibge`s%PHmYuJGFvHqeqY4zkKL!<=g6UL|g&O`lS_BHDtj
z5}Kz-eX4cniF*DYm8-Xx$_9bm6D<dYD;n?*uo3h3GjzSQ|1~gcoB1&`ej~u$-(*Z?
zPkf2Bu6tx{&mn_Yl`&c`G%P|CX}Bd43`WD2?eoBw-v2IV%obif;zcbFAL$v#Lxra3
zSu|UTr7J^;AmmQqTE~*X03QPX&cbW#?BhiIIx7CT!Y?Iykhpi78?$Y%Zc!}6H{8IY
zRIH^X*qTk^vD5kb=Jm%>chy>BJxJc$;TAP-uN6=^2%3R=N?9<zsWVC4bh;Y3S-4_4
z^s~NaG*?BtxY9X`bfq<zt72StWIt`a?lcHQhw(pUFgtsA#@xZ?G`#?(sRfFbFeLW~
z_XLQ_)$QNmaB<$_v-yzDKl_iHl)6vt8HKuccYBkXx&^zj9N-@SoR4vj9O;p}!})so
zs?T`~=DpE-xzd6zqbGnS>}k#}y8Ccq5G)hVI1g{|9PZZ+%@3tzFHj@yQ5wO|{{z`A
z4F7$Ly<rSC#v4K7G~-I+A>$Xuhvop}0$5-+m}i?em`|9$FyFWKwkE<NunvAfrz2+g
ze(NXJySjz{RbD4gZGH^qJOKRNSqEpm4X8(CwDBMX`mdBu{*I<$|M^Fjn5|~<HZK3y
zq#L_NzV=@&J;Mt%3I1zkK!eky_TM0p_;hdEf1RvUGb8=i%Xo;~0`-4gI+O35!;yLe
zD-!Ue2W!LaX>&s08^m(HTMo}or)|W4qipQXid0)$n06lcq=^Ubqrxi_Eh!Y7Y=KW<
zG8hb0!cQo>2j43LA9gNG#TxnJE5pED6lb>oPT3dDmg&Dq0`}qO=2qzbWR-WwV2PcJ
zQV||Q4vs4-f4Fr_38u4uC*lRrglJnR41XAy8X`%w8Vg$9b&GV$-&vE21QX#1wo-Zh
zE~*O-NWpLmUA%{yUU-W5Z<e7SJCTSed-rV;*>7h9x0{Lpz}w}}-Cqq@p|U29+?Ys&
zgEGwE0a@YwOQ*rG39d$r=R@*E+|QRnO|Tu2f>3{uZ<+r=+4F}dPY+Z=IO1{5os&9R
zgZ`&v#KOaqXW;mUtQBk(mw&|9|4_qXhGk4M>frhRGjlI<5u$zWG+)MAUj)B^uaXz|
zDz}8Msw}P9&wi%bUYORQa8bOo4W~gk$iA+%_~h;><-zmP<2M2L2>xo>ZF)2++jBCR
z(*hCdf+e~<l#GY#MYax6$j;+S;F{wYfZA7x$Pvnq4cHJP8{r%j50rICewE$rq479p
z;QAWiwm0zmqTXAzc8tDixy?Y_e5cmb)^{_eJl}$HxVG%ZN!I%QI#z@97?|69G;h%g
z#eH?;P-?J}_}UW>-mcXE*d7%5hHPO^>@Gc)OW$LB(Fz+ScdiTwM3@9r{L)$S4y{O&
zUjS?htzcqBTW``T4s6eG*fjV;$nBjsVJY@R@%YW0|M#;Q%<8m;n)jHs#s}~K+K*j<
zOD_L5^dNb6lN*MkeeLA!mpkp>*!6ohYFOS=dUyiwUCeSlb7Zf>?dWnl*P8w@UDJS#
zJ(GBtjEftey?*tqP!A9G{G&4CbD>Dl(u3sOkYK!Z)ZvJ9I5xNJGGEiJ4L!)r?fKQ^
z9jkeVEIVzFkfw^&J%@ADii5m$sBdTOI~Ca<WzNj2hyPrOg<so)Oxz77w+3mV?Co#G
zcJkUz;pkI8*R;I32g$c%ZYU7;(hJy&0)~VA=B$5cs_L?O#$$r}-BO_0D|2UA+&LQd
z;otVqG((*K><ea0HQI~^jJI(5&qp4>d(A&u2U|5(xAi1`{D1bJe#0eK=^*98uI2|N
z-!X??s?`)O$~{xXGmr(Q2gcWnOt*+QYLNEUp-H{k&h~h?5hh=75&?P0kH>}|i8ZA{
z!lE^FyZ#vLYe6bbK#@aF)jIt2)mR;Bg9}4goSQ?pPO(CoV>VYl=T>vRHbc+Rvrv6c
z#5y>-h#12Tt=_Y*NlT&}?F{}|NgQ0kWKssK3_VG!jO=@KDdLgfh7ki_1DF3~VC`Y+
zM72G7rX$zPr3iT9LeQLWTxc+dp6g-wIJ#s!7L&u5J{r0-XZ9;sOAQZ~29P&c6<%2l
zgn6OJAKI+dm-cn9hPy2x=2g0(4ZXlieW}PsWc@6hk7vpAe;EVT@2=)I%%#R##@TF{
zF__)_B^P~7&&)w=p0U4P+c!Uglybq17Sa7CK9dlelN+X2um@=xLvDewR9fkL!283A
zDiW3{uKf=y7fw8Ej;L+yxIZeYkj|bXd6*~n1~_K4;|t8zL2NI0sz&h4T)cX?;L>4t
z$gI|5#|{d@<t_Yw*!vRrsH(I5y9^045kV<}f-s6okYyn3B0}~AvS1PjxWOcuBts^d
zIGGT_CgWE3s+m!%ZPnJc?zMHVR$Hys*1ff@w)(kLtqWGHt+m$H|8tg^+&TB2JNF{}
z`hEY;{KPl8_nv)w&$~QtYmh{33q)Jvq4=ym`0qnRH~f74&_V(bdZheVD{t%Q9}HyO
z1hejiBhOJtyJ{=P-YB$d)6fE9Uu*+8#PYVhP+DFym8*VD<6YKXbGjIVsB;L>!NYbA
zzpOB;>#o%uSb6bF+ey3XrvF)l467ePbns$zynLq7qICLybywo`oU^QFsE7zXZM>C@
zC$g2W!%708Jh+X9nzE3xo;E}RfP=|(CcU;3p<HM4Qn|8#Eip6m$=3fIMZZ*^4ga4L
zVE-FeHRU{Ij`jL)9x5Rd)rS8{FA|2SMmApW-NV0!T9@(Vw_BK|{X@m+C7xsX8CNu2
ze8Pk2+rQ1qIO=%A5|b^x=+Fwne%qMOq+7%VC;r0XR`_|w!>!E1<ZkQdI}dxG)#AuO
zp{3h~5Jveltz5p?(<RbNVvJgF)rL&v+P&R+M@!w3i=HO`gwjJp$ECM92?w1n9UB6K
zct-j1-KIzFXL;)u$L}TogmTsoA#C!=+SJ^wObevwR5ARqbuJCEu=1#Be-ZNTAA;hV
z9S1q)3X_5%Oi61O+o**Hi|#7tbLB+`b0s*mG+l0vzB3j>+a)~c`ubSD4n7gu)-`lY
zdWGd^TPfjHLabTCzt2dW!ROsB2Q4D}|7hj+it>B)aCrS+r9P#8piR*l;phJY+yM^L
zJN2vdXRY^w|KU$7Jb=BkJjW{|QTXczR>$CF3)tC0pr=rTJ!%ZzLwGB&XVYi5gN@AJ
zUoO_+*)#@Y!4~47>u-eZ30bBg@a{c9u<JAjpH!Zf&Y(9O3&-I(zN#}gI0)$#O}3wu
z739g9;8G8f6%*XiB)GCwN?MH2!QHrpjE_r|&6WI<Kye@99Z?H`@fS)jNW)(bkZKgx
zfZw9q;rMS$<$&2~$jLB%oAj=c`M3mV$JFMci>A0)dUwc5k@mPY*6h06ts#Y_lhWeu
zw3$We4#V{%2>WlCdlO(~e-jLf0cQkj=HX7+DId&CE+onnxeYKW<oNGMrI4A1G9#9(
zf;LMphhi$)yg{b_-$3I3E!Q3al<5lfPIb0&|2|sVCk$1PkR>)zK+}iKS^z*t`@DBE
zdcfZ%QH-3GNBRFDRsBbY5Fc{TPW7Lid4T^pE5nX-cpo)C%lo?G;d}FMNDx(qmQH_z
z(54y;TfVj&4BHHAlt=3_VR>QXQV>TnQ?&V&di!^-=QVhN)nLo4?mqe(t497%6{=A{
z`9`<Z$l@Ai3l%ZF%)9x(>v&aOv#g3bMB-brD86p1QcW~e>}(e5k^M&dq><v+f)n_i
zRV4<75VpC42K~u#WSaD1CQVu4PhRE6=UNBHXY){5`moNy5by(<@&d!ZM{c9OfEFxH
z+fXTOll*3oo@nU8YB)bd`(d0;7BykFv!5up|9CSW#J>vM208x^BVb>bE8kZhSKfdg
z@E~=%S_58SyLvSu06wk0q5fT)fcSsq+B(DsJ43q^_k`!QzXJy_pqByprx&sRzOO&M
zk9G`}4O5HXojn~%+kVC0WZ$>Rn`bQFko&<s3?lDt*6ku2{WR0k^0%}Df13S><ncph
zYG9Nmh#CEosf~@F(A@5|cuunX3D45N8H!mx$&(sBp;_K%@tkCNKQoiKn|)7ozociL
zWr6wbULA_H1LlT4dxELeC3hF^k9iUUH}3rr*DZ^)%L@=6z}^~fdESTkV3_U;-UpcR
z!QD;J@Y9++wZBI@7^&B?1K?3+E|A`ru{mZ>0<uv&#?S)|--vtb&l!H6;fw4Y#rrd+
zwoiXxJQ9AvUOiU=>rnUy#)oBX-rqBY{Bz~qy|6!J2etQiY%rdyh_-@<gMlZH&i7l^
zhtE~FhI?_7qK*AEGeAIma2oJ{h+I}fkVjAwVHV6$O}sDi8nEcafLA0=Kn#`sc{Z1y
zgB>v}N#XPeZ04vRu#+_V|C-~`PS(87HHBgjETT4r46d1B1|R@XEs=*(;TXHSzQp+d
z_Y~zl^$4{Im|qVd-shpP02tspfUth~K3?1Vbfa*UnVb<%Ghr1F9K%yKi>10&D&5Yo
zROw`75XNuG&C}ve-2sL<&FbAEwI9xuPzlheHN7+aghDZX7%l0x+$B{;5mkbsiP02^
z+{}3;2{J`LzB>0^0nr3_(2w!Eq;83sMpXNYsf>L5kknAy@NET5ZOIg;A+va7%kj5M
z<^P71)W9Co9M<(lCj1<!{NFk)?SyYQxBz61Uw<JF$t}7ejhCAY50~BD4X;63=+|;j
z2>2Tz6dP<dj4ixKs;tPAl1WDk`aYBYl_~mpkpJDGoud8;d%#i3%}SZ`l@%I7+-4>?
z&%p#`Z{_4{G9U4Si+{m+mA?tR%D@n!IB&B<W=OL{hT}jyQjN#6@UF4p$DH*$St$AB
zAw+o&YSVJdva(O!?1Q-N?x%UnL_C|&5Q05B>OnK#Bd8wGsVDWF%FFq>(2nk*dV-s?
zD0e%oc_nKWD!$?Gyx;snd5uGLBsQ6i6>)mRGVDNxF*xEas?ezFIa`d?Ffdf>a2^==
zCSk0-d}!$HLwMJ{aVl?5RA|rop&ExWO(U;mWV|{~pTNgPjPunuw2D|Z5O~>KmzZoD
zKEbAMZr547gi#JIFjW7q<}2!Qb+h_SHDCRurfbDozjmYcDx!bY!pisO&Ub?UwO{7m
zZ)>Bl6fFt1WbL<i<mM=9xs(o`>0xMn>8^WY?xV66>OuPLX}P%%u!(V$LN&<aZ_0fH
zWST+?I9qDakU2A`&j=Vtq6#1^Ycr(joJY7cw@j@Letz{apo0>VSHd8jm-`$BLklnU
zFz`Ohm{sEV%X4>iLueLQ+YWdE4-4LI$lZPEWVCLV<mN9RAA|!9WxmlDWub2FxitRE
zx!aX?z@v8yTHse4@E482c8Ga#8G)ey{$E%EL_B{<{~+Slg2|`ZoRzzK(h&iT-SaH~
z8$kX~g8k%|fV`$oRvXj{)yLI8!vk=wcCPlA_L;s6SpPr%?_Jw^job;8qP-K1dY~3Q
z`Jus?fT9X@(GEfoYS>BRNd;W>NyqG0swnz=>GB@VYIT%M?g1<%m`Agl-F_aVJw`f#
zhSRcPnNQ0*9%+_K2V*!5Sw}1T+k%k#hZ&TA!COcgkaEU`q%myls3pa(O{3QoJcrbB
zFq+!_w#~soK*^54XBAS$p1@>whPu(W5q|>-h1ME6WE@gdNmJCp53(;53?RM%BInQr
zzTXC5hy<j9=yZw(q$JS5wA&(>fIpCm_UYaMxPlN|Kj}6KyC4#Gk6eLC@(J@$$K$0k
z_Tl8!GyQ9$gRq&WrB0ZSQWr^kd^p+aXc!)IFw<^>5`}nh(n6;qb%oUab~rT|>Iy_1
zh!c~fIQautOgcL!05c_jnRLq;&Z3#XG^P<7{KR#dF8c|<gUMemPfzeFFr_;K#TZS%
zt)w?_$OGsVPrZuC|HFzBh6Z2??)=Mu0aU5%`{;iiLruVDR|9fujj~{@3vm;I2yy^8
zop5|mH$Cxu{I5ePb92i<y;8NnsY53c^}3BcttnrG05r*ZEaX4iu78V{-YzhP?L!F7
z-e+eJZ7wrQh?FH#QocMz<pqh+W)t3_^^muZvojkt7e!`ZEsl;Lj#YAw(7#E%Lo$yc
zF0y;AT>Oup)Gb+e4EZOt`qZIyu6x=-ruCfpS^tvrc?U#<GP{PFiPC3={0d`kz9^X!
zMRnm8ri{Pkpl+eGfuXhNZQagz%3K`j&Kd}jV8B@s1T4XDCyP&&)BklXZ)clOa@)`v
za#foum;aj!HcA?eVn^l63dMw6dCNhFeqxIMo39<GXvaaef0I5^59(L{FV*+|_cAD7
zl!hLVGXGTIj9W>pFTjE$Zly>U04}&g>Xl<iL#zYaa7OuisMRD{KqDVG$&*-OZQWo@
zNg<lbBhYii0CdfKZ3-*krqoZJ8;jfEp9OOd1SIHb>%*Z=<=`W)S?5X2-OJ3$a%bgK
zcl5vjghWH?4sT%@|3G@X%28?B=0~IgUSsO0p8`|S6hD-*U4|6(y$Fp!KYwVH`Vm0!
zj#l(O?OAQDa<qD>>Q^qXn%o<PHuzu}JWYOpH^mG=77&)f@RxSq)ko8f&d$geL4R7X
z+m6<%vAIjIzOr(q0BJRtSp;b;+7~7kwuHy33&C4581cSLcVg-LvgUho)+ss^B*%@7
zhkAC6(ic2fo+Ew*)5^ST@vw5i)wJy6?hp}~gF_pMxvq^VaCV7};Rt|8SWsW@%f`P>
zUdrqkj=SR=Vb{m_ZnPTXef4b1&?(d?z(&w$KE13}TGpDb{uQ_IbF)QgT4M6h$tZh<
zcCs4|!Lh>3v1)DW@6YBn1XxYhkqZ{?B-GF)3umt}v{xu97xazbl?e-#A@aYG+ByZg
z{R<G)=TG`HeFGwXe1QPAua?69(R`e629Pww;?a&6yNiyzUMjgX99^Y@!5$b2(8KF{
zP7;s^EdFkm;ASVh2Q3VNcW{nZ!2^kwbiY)9WT+ZT2*Jc!;;Ti|J?iBAt_<}=Thnd2
zS8DZVD5)k){GkBl2?Q%z&W%nQ2CuX(>QD`SrLv!z6O6optp6|K|GHnKJbvl}oIc3u
zk2(Dbrw?)ZFsDD|^bt-U<@9k*pWyUKPM_lRX-=Qv^jS`S$?2~seboCiP9Nj+=bZk6
z(&xOt=JYq5{+83{IemfC-*NhTPG98oB~Jf~(wDujaQZ5zuW|Z1r+?)1El%I&^c_lH
z^ZtR-*S&9W`X;5jz3)-_C-3`|?(u%W>7P0Mkkh|#`d3ar;`DEve$46LIsJswe{lLK
zr~l;iUz~o%s88Wk<y7NT=hVaL2u|}j&F6F^r(RBdoEC7pAE%=@-JjFZoQ~o208S6&
zbS$S|;&dFR2XQ){(+Qj&%;_PVPULhFk^ki@$13>mUG)_8GwnLW^ou!L4~ZE=tzcvt
zwR$<LmCdW#^W%Z6k74=M7y)oSQM9D7DZH=c{G_asG4;pYA%;5W9cm-a-2}|l+2tbE
zPpz|p0EUV5;WCl+w{p|Hm6WHlz0n*x6haRz(2jT9Ls^BGdW3Y~aI65b_j_L#yTts>
zDdX>=RXy$w(T6T^*ibtvxI|mCk19w2HE`kb*M#8}z>RjyRkZr5_L56@C3^%OwPUD*
zh{9|{epy`*ppFs4@yjrBL<c+kpz?`7^O9x?B?X5%-QB&QY{DT-l?k|e8UC7c-y6J)
z6+#&a-%uD`K31!B(dE$hAw&QP0EuN$2Do%$_;&*00MaQyrl#!|HD^4|YIFNjLT$+T
zKT-Lfg8zQ4e1I5$6M+MC0&D>;1OnJA8sNdT4(&|D{=P?h8vZ~9`VsnZ`dWPeHotf1
zzj3xt?8C3P`6QX*a(VU(3{uJJ+U<RnS#W0ElfAE`9~uVG`xZ0n6eo}Ok4Jg5YAu&+
z!TTDo1gUB>;B{bpNuu}A@p^}WF$p`0_w_=LR!efuF`C}D8K_zA&CvUYnI3J8=4=6a
z-(<nU9c(DxH)eaZ^_q8gDP%5Sl;J>C5eWiiW`LmZHbenZ3-KC$VG#tq?=j4(KQ#p-
zU0|(aFrI~5KNpX@&y1G$6q9%?B!V^RBi|Ti=(>kv<dj8wrp0OKQrd(6WIc$th_wms
zIY{|n?`P>m@LR;@1LZtqi0eb~4K&NC{A~#VAd9szfU{^D^V|20WaiC#N}yQ<>`)yE
zfKHQ5VYbZa7Y)I!K$@p-JZy^WVYuAQ;Wh?+=-ZE3AMYt4nfr^|36w)t9QD63>udf2
z;A{aG0TBcudDDCk;1xxjgGgHpNCBu1&5OPr&8(mI7~htKS`qSrM_2bvWb*@G00^~{
zzy%bRVocDmX?4@!ql8b}nEmfx$@(9oR4e%JH025P5Otk;zWOuGr!64*07L-MVdK9;
ze<<e~mfl;|BPwikpcNe+sBc9Ccz-dR>)8EBeXYimIM`b3DoGX?evX~6z6X-OdZvz5
zUy&oD4kya0Ltv2B%}*+a+=ww{kfUI!uSx~ChRhm>(}lkVa~)jDOu#Awdw`6Q`npsX
zZAhI3?5e&YRpT0xG)Kw2ts=5(W|mGTqWWL*&=iKm!@r`jtm<X4AhT9i{~(2GUf<I(
z0G!F%V5A$y5uu*Rhf5JB#7_eiVXQ=sJKRWmX7W_&Rn?T3s=vuioF+U%YKTErI>W;(
zK{dH{e*YEI^y4K{3*QsJNg#2Dw|LH!<E4>|Gam*hR(UgViN+ltuVS$EkB0g@=gM1@
zmA($!&LGCFB^;-t<~d6a_m*8U1t$all2+eii%P?dc+Qj0)2z}d4^-dY&T5X(M+E!L
zL-9ZI)dLmvK=n-6{w>jdqfgg~Ine*vpXksgR}z1#1D+}#gj2u8|0d_bP7-*qRYP4q
zWw|;|lU_`SiI7hIH-_58A{<CkYW~nR6oJjHIt$#T<eF0w!NsPY1RIa}OJSCxiw~B*
zJd#$`_G)wRP&e4vBenH%Hdf3x;E-K#$W|<UnpU%_=gVt_9$h`u<5No2gXMj|EP8ZC
zj{WYcobBB-6eVzQ3*@b3dExe9!Q)tRKF3~8i-m>rDMI}_hI(@t%NP%T${OgVCx_2m
zF^@Lu&6;u2*+S2MHGsH6>IU@^^+EMLIAhgoTea_Mzt%PQ{~r%zpxgA{{-50rvKuZv
zgG%SmT^xYfDUnvxh7nMXI^-WJmH*Q3$%lvq;9m=dsE?(XEH$*_DSAS!^vtIDACcqh
zD1zH#%?+}=$4bqPY2Ni)20PvYFGX`6C*|kpw~hTR1JNk#{rok+TY^<IOI0XkB3P<{
z5SUc<=`^V)68*HP6So8~8|>r5?AzH4rzpx3v9HJ5XZ>^7m-R%q@P-~a8IJFkC=oz7
z?NiQ^k2qcjN`R?At}+Op#zKl;ATOJIPy8ush=~GWX_WKj(}R3WV8OuHK>XAS*Fc&=
z9<re{7=vXbI2xEEtM?S@jj~3?fV&L*-yVXD?CmG=zY%JOg6N;GYC+uayRs+z7k}-O
z9vB!p6^Es*9hqtW4y^7+z&yf$RwH&Bcgpkbv3ja}|3T`qQuX?~9|%Xuj-ePz_G(Mz
zhGgcFsmony3|2T)>jd~gcE8>ud7+%SnmOyd{_dZJ@)6Ff4;6s6TYhqyD^L@TOk)A-
zVpuT^Vcf5#;d&LN>NxKn+t=H<<B+*8whhHmm3)oFuakJHnXA$SwjJye0u>JW8(RnC
z4DQ&w$NIT)$>20{=wc*HJ#oNLKZ-xpF0h%o_}q8++}C{N%8|0+VfMdmiavz+e>ZD$
z;Q!m8{8nk(C$pYs(wkICL}g<7>$umOV*r+>ku)*#Wb5<pF+EZ)njmY|mZXBN9%1L{
zX6|YtE$X56V_@B5VYcOZ_gFsOHg8hh!avR-|AYx29y*Q0>L7kxj$12;u>`SJdv~C2
z-q;(+KcTGX&`#R3Zpva7LYT^Fplt6R)1wnt-@rM?5kiTBLpxZ<x*1Gs8J@LhPkHcS
z*`P*;w!3aExrAZu4h!utkHkmyFB~OVvaz9U)WF$IV{3zbRLzbfmT+El>YAS^m)yEg
zQs}0kt#kspDYS-YI5HwaY>-)hD?`^6OA2G_e=5QMo2Xr{O;m4Gi<L(exHe>d5>t|1
zj5#c-+|&rt5+cNCCNS}<A>a(no;@4UP(uix&HNBB46JjUeyLpIpDSs_mgGqH%iU58
z?A>Ge__SM};YEKaEQt1Geh$lj^G1WFcc$@M>3q!mrCfHKf_45c@=qwJCz(gQUT3)(
zgu2j{IFVM>aG{uYkN8CS#ylTynaDXLyvY&hRa-kXbK9Dt{a{+C`j0Mqvic|!!3Nv*
zwR)(2rDTMAlOES+2$$p=*S_hIa<TMij3;$8U$wLSG&g@GQN$4i9dXdAW|$p&EFP|W
zoq6fLStIVST}ds6gM+zLIA}sW2zRYEDp|xZXFu3+-IJtWSDH&B_y1AK*A)EsJ9Rt|
zKrV(9aFTY4_EqhV`U2?ra!dX*8^yl<MJm}ecK|k62*d|_dte1jyTCU?Dx@~2t^;!&
z!FUzT->`^GQ{N<4iL=+3FHb7Sw<tM#oP3%bZO|%l4BTj}hm3uDl)*v!4y*P+w`_f(
z71c?B`e?Mb?=Z46BPwSY6BghwB#a;Jgah5w#p+h#{Xpu_XKqYGs3jDEu8!R_d<V;w
zIaX=;t(xq0VAIP7Lwz$Tu#SH&ZOYhvlv@$a?Fcs=(+K@9biXuYWw^bc-lKf}l^*P?
z4hM;IXVk@DCOhPrzX7exWEZQ%#OHbcMb`fmWs8FUu7nN1<I3Br7e2rX5eukG{TlGU
zo>5;@|D{caKJY|D1^SwHH~a+NfmU#$z8F!!w!&8Uhx#AfuY9h<WNKX?9|6mR#kFaQ
zQs_xvA=An4DFgCRJ4|qBV-IIa^*!a#qz}ePSQ9dDseZ^en=4H#a9M@NIT6b@go21Z
zPE$@}A+ux`Snr>CarA;)8>09+z9YGQmpp7CusA%kQCz=Eq&{SDiC!i>D`{z8V$e@}
z$OrIApwDJ9Y^FU<*&Uykp+N1yoF<KF><mJ`%r>`iTvwe|L=pTUTF4<Rz7*2Hlz~2(
z&b!Rw4D#u`Q;24P2rh+Uynp9f_H1s_`w6qcu)l?SKV&+8d_{$#<Q7F%0hN6D_Gc(x
zdupOlit&TN$GWA`v@$qi)0&Ux?Kd;e-hXhFyv4T9d&az_XI_ZgH6LW*$n<Hv{&m<{
z&AaRo9^m15_t<ZsJO}H&k@u~*?=c&YJsClvbW6+qA>XZdEvz>p;{QK^UibAGAUl=s
zAok}=%BSj)hy>gTZ=gFN7o3WqX}#K4wCAwykJ20TI52_l(O+}E>a}ia<1z9%403I>
zrz^znMF%O0)<<W;Na}-%AU+U{l6wQ4jF^&)o$=$lt*pPQN?`j8vGd9(%VHf~?P4QX
zMRl^JoiX_ElL_Qqi+AU+NpvQe+Ex8M@opl`q4Udo7G5XWIA)^|32-pp2l3(8STE9Q
zie8*v*g<LE<=c;?w1Dig+V}Xf$+4f~%X_JLh_9#^HZ+)fei{wfU(UHZ-vjvM;b|U#
zwE2pd<8oy`EEtGi8&F1J5i!f(0=YB^FXxNn+g~j60M5<gTY99B&6TL=VW0vgXchxP
zHsmmX9G;;Yg|CPh(}PbU`yGLDYQhdom+Eo&<{jFVzM_>-Ecb*4v6%q49M%z}0mRvd
zeprkTKcGY6D<ZHZ7)jid;Z@J}NGP7QU$5{W5UsC>j93Yp1^By07}@y?vDuNlP&hyy
zruz$tlVD?<_|`yy66?c0OKn<wHzAXks3{XNA!h`2p2s##|0pcq5)T2axebYEl|uOZ
zRo3CVhwpwpgnfXW4EdyBG(P#1b@=YeXirZN8=1ct@=5e^6j92WqEu`|zpVrkfkx+o
zZ#QW|F$rznM4S#gSO}AX0({}4*pI&5&7EP~mKtIG?=R*yOZ7d=X-4JvY%JZh3VI1c
zLoQO4K_1EYOuRgV&ZmMai}}$&KA=mW9>Ibe5!Q`n1J+)jO1H~`E7wM$aO&eyHTw1@
zcK@$c^nTq7E58})_tgd90&1PFZNrz_k_X_%<Wj!MjHE;xDBQ!T@s#*n`EEwKE8fIA
zl4D5p1{;vB^chWhie?|kvN`i+o1pE?Um&?O4JJo3af6$?xT$b50NyMsu8aUjc@Sa%
zCPfx+<pat6QMOA>g4G#Jr0C|8S$Syb`E`rbspOv^fQTeV(Tk~@Mhl#im-1f*R!X^g
zak`<RxIB{F&vkKvAs!|XS)!Qm+%iu&cMHTT2W%n#gw}<V1+K-mFdynAh&=p2fgIKN
z_x8tRO-tk_eHg^CTDhCP#3s@Uub)x`%LbH3Rj|7|6l>w=i%>_{yj3o{B3%`6I+2s<
zKn0*R3FUU>b#*K}d@IyG!~lODHh_y@19-FcrhYJN0MB;l6DZf0b|REpI2H`xwi=8B
zjfBkqNmX(cX!`r&ST~IPpnqX0mP)<8u)<ggB@t+fB9O$;A`X(eL}wC|MuLMxGfiqV
zQEIwp_#AeOeHqvENyo{RzUeBJ#)1R%4l}7Rcm9-DW)7dUN|SSUQW;sx!!=srAO(#n
zpT6x+nv%N>6tIL=Xo20uo{a&!qEU=mA_peHv1!urQn;N=_oh#~V&L9}fn&>zdnfsG
zr>qF}weoHNYk(UYn*mF5cR9F<R`3Khz%ZiKES6g`q=&RJNU?_|RoIFHSZ`E!W9fFo
zPn#a&6s4-amAI?Z!UA#=#7w7D!^X571{cVK*#0;6lRv;A(+n0#O%M&~Gl;`ghziW^
zSd-?H^FLqd!TGPfrUljAYM=5h{`@!nY)wvJ41ybl717sl?`K>e5S)W6fvumn#V(SZ
z+6hl`JW4;nE~F^BE8F5aU~@yo2`az7F8-Km3@k*ho0A8z6WmQF7_7=L`rL9JI_Qk8
zS>|c$&!{%bqTpC^oNH~CS@__!5J)I5{(zaXnYG?KlV3t>3$$f!S}PN*fPavPTw-%~
z$%cJ&ax7{vQLA-x*yg%_dvo5<m2bU#qJ)RT`F|j)<nsKtlQq~&B9w<Vu9Wl+<NxO>
zdQzXNeM6gtlm8IqMg_QJlAp~<zx&y1C3}F{8P_9GG}`vJ#gdwKC#O*Tmz#Mc`f`9F
z#3m13BIDf={oshYd80>?e*#087@3@mmbx@tvAx`9H0{>1-2QuHTv|d;9*Vk*hI+t-
zRRPZ3X}DCDAlN<b*~IpnFc##%@a~bnQ@*-OR*jzIq`go<X6sgn3NrhNa``jq0>wK(
zLQPIYyGPM@D~_!xjGK6tV@&pKE9;f=M9a_lY8CI5J;_5{w^|g;(oK_I&eNh=<!iN#
zlI<a!JlOSBBwLI~b|<4cWg`y7dHYW$|Abji`2R7=oeKVYT|F3aKenph1@Au^cwoKS
z?b;r_NN>}x&>xrV2LGAIxf%MJ;MO3#=qPh^tQ3|t!yMIw+L?DndVx%uottH>ff&gj
zq=u)ooP*^?s%e(728ODYR4zZMBsafZ)8F08ny@hUod@nYfWC#b1+B|eDFSJx&1twD
zfK@@`$I6+JyJzcr3ERp(pOgERL3|!@8{=@nlZxbyN|}n0;PmmdIsyVRSl@xUL0AGR
z@ttI=n`PWK3F1qlB#@oHd<zjXa?iL)M>*itSBF~x76v&P=Y1-P16>0T?>nh7cbiv7
z2e99g3ppK&Bc)g<!%dFC^^8kZX_~U!({DBEh{=ar4&BlxEzUj7;W^$9(E+(WgxED_
z8j=4OsN}fMdq|xNzu$+|PqkyT)3hG~2cS+rM}PD`v&8=gm#RJ@zpepSrO!XD2h*i5
z)E6j=_P0P{69<=0>{mDOn8YLNAWtr@^580BsRGW<q!K{|aRWlsXDotfTYC^fa0<iC
zWbY%FDvJ6G>DXuIMNq}zL`!d-BWIu%OQm<}?1W@7#e@D1>|eat8l*09+7V25Nub&2
z8JHFZjGTx}=1aG#>?*8>)ISt!3l7q~XJiSIF0A(?rdao3)tcJkI)6odLsLU}V`E^>
zJV+qm<cS(E1qYN4<SGeQRN_b(rW&Dfka}y?QtJ&N%eix*x_~c61X$B7uK75)(dK<c
z>Nvq9c0}D0fHY|9AXDPg)*J*iR-Qa4iXmkcn5XpKSjyGn2Q5VEA3G_xj=&(I#%V9>
zgPIuse}n@0-l5vH+WzXd)gzSal_QMnFQFt085ib;_m-;mVNpw+xh=H*C%yXz3HLvk
zoQ5jEpw|rpY-tMM-DCM!Iq%)H?U~2`?o1wqvRz(bn?r>6#vzMEOEg9me6V2eCwa5w
z_5(RXD6+xr$s=9c7#a;3nAjas18UZw-12;y-xj68iP6a;(A0f*SEedx+q*LTLb>2#
zP15$k<W%<qpVp;OL2BCnAL<>hV#|80d?mU?Qg(ataM%5Av{xZBeb{<M`L18q?*qxh
z&`6g`9V^2GV)<t_S5VIP@2Xq!6(9L$!T<ZzprQt0>+_K|PYWaR$NT!x&<Eaa+ylP&
zeJ^`pjR%&~md8A}KS9>$+%!mvI&YDwh53*R^G5L|>pMhx&{&n7F+-BG3g%>%wn}nm
zd2<F*gC;w@g)kVR(UTjKJzM`I?}xUR5V0B-N?PCka^}(888$*{-*|HWpQHfr>+8zh
z%2Pl9+FzZemca7oEcGVX{=KhxVf(inSTEb*5&RJR14k+`eFhMKw&~x{Z`Xh4epPVG
zjA9sAz*L&>VHN%4zJ)spTvFoxLK0DhT!MTraw{(jvqf$^m922~6|jh!dkDN#OSBE3
zz+hX+ADKWA-jBI8l$GS%cMykVv3Bk9{)O8J60;5>K%|wN#jSd54cmPq(#1vxVA9e@
z1#!fnhh*XXD4j(t*w-0qn+aAGJ#!S%V8IXy1}3ziqq)hMoub$0<1Mh(jrb<;9wo1F
zH#S(tf6Cj2HyLLHUp}{UlyNM+qtf|_-daAD4~1OL=sT3n1PbC@7TO$+_?wAxiyWEs
z!XF|*5@`@5-yCK#6llifwG(PRa))8IVZOPU`9u+g$<-g>J&3gsBEj?%l^giowX_HC
z=Y~hc)E<e<Kk_Mk^(?c;DdMy8sO&jOKY2P+kZj`C$66V7(J#0ulx&XE{QA;GqPDn}
zfIr05yt)TiplNA^Zz~-X*nvgj(470{({!a2e~KB0VJ6bu9jm7qk!0vX;g+B$(Me@x
zLuQEo<J-Xa|BVV(^8wn`+7hh!b-;%Hsrz+pog$bFAON^(1G?83M_?#OYhbAbIkles
zr}E3Ux6vDcEfmF=<Q%Y12W!X6F9+G#I+=40zEN&yqnLF-pg2?DtNN3(Q6)H!$g5=D
zsV&T!y;io)N^+x&U2ad#a?P?D_cIuh7<M=1%`5&X;f-69GiiJZH&;S~IW*JcaRqoo
z|M%!1o842Q$r-L){!B)}-aV#An{T>TQX;&bj>gEj^?I_~x`}a)&Cae2UHmOcCvQkj
zC!ix!+;nor^qc4$IQupK+|`m2$oluF|59M%zeW2*-(|guzj*rpXAcYvZFYa}Y_j5E
z_E<et?#q}liXx5Eh6YeFWGZg<M`jXgfu|=$+EdPX<5)iPMX63g8`^>@K&R?vb=k0%
zHf-mKO+>@|B>5+t6FY_mQ3;pu46^IZ9?1*k#w&K&tp9vvjiP@=S)+Zbov)2o+m(Ai
z=WGuqi*g+L*=Fkipd#V7(pKzqp7<VhS6r2M@7q$~qQvy%BJ|umtxG<9+1c_SU+Gd{
zC0`qxoi;zmU+uthjr${mh#S*KZRgF#_4Wz0f8IfQdF6{&{1k?W9ihOc-cSeqEio&(
z5S3k|Mfbk4WabS(^bZSoaPK9d!6>?n*IH8DTuJo#9kjw9U$;f5@TtiKMCWb8y$F2^
z%R6WYV3`C61%$q$oNAH9L*<Nfs1U3!|M2~VrO=a{PYix-;<gE8;&_W@{3B>Q8()$6
z*+ynCUY8esTPP6H&UqLW@Qsc~1(z>eCrY5KBfy4*rDe0kNZ;@|$oWk}x(}9@3RUV!
z&dt#W0wZg2BeJ+9O^?4r*MHC1+l2zj{eQHwTETx$siW0u^$hhHZGWvsJ4bs!drhCE
zpQK-`Kk0lw*x^ZRvle#=gSR#agpK|_xIF;D6=spM{J4@s=}H6V#KD8o=#~S~7(p*Z
zm$vjn4~+57&SrYn3b;=$WXet!XhvK%s&FNEq&<Dm*U}lgR;ms&rH_$I8-*mHDK|S#
z31w3oJj6r6ZnjFIatu_l&`_imn*iyBvO%H*Dl|>LW2D}oIr5^7c+hcba_?*;W~6Yz
zfoBU%eXdk<CYBwBaR%}0DMfnb_|q#DDhg>kdlB`sWzM46@o>BE;i-DHe6n@<=PoYN
z2jp@)k~RG(FlR2ESM(1u6EXcN!?6egNx@k#?U1MsO06S?b1KeQ_3Ecd_5Oy>+k)NP
z!HM*tzC$XRHKZY)SEylQH&jaaEiDSscS?;0h7)7oA^-(&Xr<+CC;We&a*m=8>OO5i
z{h7KNfBXl25@pF{`zeW9EiuCJW=vW&%r#)#Wb&5uCSiZLyGVV|m-EPex@yD|?0g?S
z>Ep>`iH)sI;H&If6Ob<iXeDwgcrwF=pUI<&EFbS=Y+PMl++?gcGr1H;*%IwkfQU{R
zXQ^)x3g!WOG5e}uNFFCbGele%?C$M^Hybu$Y;TzP-Ts>O4b`QMvpeJ6z9RQ&CL|b3
zbm8_m)=~huM942VdXI5=^fu?-{fcsbQ(4H^kG$q{g_AInTtckw0*<F2!tr(wc0pd(
z1@A+;0~VPc#jdA}cU@l7<3e#T>0FE+7^RgvFA$5qneLqyJ3sZ8l)bHF7M6ASM<s-6
zkoBLhlqmX{+O3*j{i>R$T#G+l{G605^C=y6G74eh!ONGsdlqGWEnK&&Zr&)E;*L5(
zs9;O7l!!oV!r=+oX9-KQM5ha(1;whZ%PUibLNFamTuw*qz{K{7EE8g|23{}%c``yy
zQeRX)9ddrNaUJJ|>y8(zq$i7A&JSD9TU)=}@Ws3utA8L?!<SrvYK+xZ$uH`{0Mx-=
z4i3W5<G|y;Iov~xj~hZTPV8g;xkWiXpcqJWoVI^MtW865IZlZawZvG*t0ud4*yE~k
zH{(u1@Ci0}DW?@>m1HE-XNKfz<vx?*`{&a$BX7lp!ewhPc^tY}*OoeNlgtlW=Ahku
z4V(G-E6xyll<@yPr9#1fx2WUP^VE;Q`(LYlsMqS(INt=?Jvh0Y96I)ck>UO8aRG=i
zw`hYW`ePlQME$?57<&Duqg@^MB*OckoSbvZ$d6pq?ZLeM{C$|SP};=hjh@7`y(_IY
zOuWYc7eI+&cy4I&B&P41Jcq|()$yLh)V<6!OS+RmL^yxF2U4TG>S%lMk8e?f2YBfF
zDrY)Qk8kiKB=E%9OUW$Uat7`|?0-io>+yf>SIS-Z<t_Cn^&9F-+I(#%Bmn=?i}fw~
zkDTuW#xFO?gDU5$d`U14y)7{`r@B#q<zYY04B<~uN?2-bU%WYp;Lfd`0oeHw*KELG
zcn6W<2B%kaa=Ahn3Fwbmctu|XF;ZXX^CUWCg9|f*V#qRJd)0=4F#LsD*TY^D5)S-E
z@-?`AQVo146hsheB2lW2MEZ%dD-B{?LTWwge$@I67bYvBIRpmvEAly68tsHJDeMeN
zgWWCQ$*97!ISj-ih!(&}1KMcqF|^VZ#0M9l0;nN^{t*n0zgq5r@ZNH&<JgaPve4ga
z!$F!Jh7SJ1)!_QFkvc}+f(pJVl^RePiN73%0Ssn4b2<>lf-qR40FjaZT8{LTPYcBY
z8O=Jxr$GN8=_g){^!rIosR)W+R~YaCwf(W)&Ov~8qn}{TO;B0Vk&Oz*Vrm>By?2+F
zRjyedSOqi`A{vF%kl(vUynsHuSuU+A-yDP#l^OyB=FFKD8vb)u6c{-$;KuYA{{f&q
z?vqx(A`<Pumw=-uQE4zO2@*m@EDQ^3e?vdRBFVdetbd=f0{<T|9pp6S0d<<XUEQN?
z(C&a0paWSz{w(PX%{Jhs=uT01p&<YYGn5#43MRl^(&PrSXPCm!Kx>#zL}JI_zz%A_
z_#NElNl1i1fQ0Y!pAaTE34vliLgzq~SPcBpcwo*#EJtF6-VHDr$gDR7!|385c^Hc0
zM%*+&R%`|e??7-#`g^NAiNma?ys;oIm~VhoEE??z%$bi&D+qQNuF`Y{BNjasHjcR-
zl9vmjp2P+RnbN_l3JxH87DQ$QLIM8d5QsLmq5*-@GXLDb+&L)8P!s&s*bn$K|H8R6
z5t;D^5=-&wO`gOWr)4(aZWAcqg2;0OGKUp6r^r-Nn(JU&XWG5|fafvIHD~<>Ylzlh
zM-;$LY=x1W5MO7Y19CWoK_ruR?mW_l(QhKtPfztET64Fd49#B^2|=pjFAw*%;1nqe
z%vplk*O7HyiNNU)b<Aq)CQ-{~;jR*ibm3AD*=Df6-H)>a_Beg)3>bSWR)|l|Iv6@W
zfcpc$m;l+&$}+q{A*_c8%oT2q4G`zjarq3npCCVB3|R!KFg2q@`%pHm9-DX8pLNmM
zMS&vo@YMIi4T~DtHAVeI&V>kUq}(xoCj9?61=He6*#G@f`HQ-rIzz344zN#6s8^}a
zDGQ+uXwoj#o&^fXdguZkLjvVkkJfJmC}kr;%N*W+<n~K^p~NxH!0AJ5DJpRyhX<*d
z?+t1(N9>m%@Wn_Vw$>mCq(@)=JZ;GZd$~Tcw-%FM=&K)5WI=#k0e-o!lPx)jsNvET
zjL|mxx+q*2`67lH5yXDZWY9Nq)GagbK{KxB_FCjMP63QwV}Bb!Ls;ZH`pNe)Ig?M?
z!=VU0XM88~>Kd9{&CRqPq84-nn~Tiw(oP&PTo-Z9Vvp8s-N}@-^9P}DL+90Fjgy@#
z)4`jTc(kaCgu~4CHRU59f3;33F?zF5n=X^VjoHkO;X0gkoJSk9tOAZ*EFKGcw{+uI
zuCDYoR-y@B*Xe2b>FXHD=Xc9J+P1yRW;RLx-Gv^Q(pzAznP*qJ`UI}+CyP8<m*Zr^
zz4nAO9fQ=PkSZ2qbpl!cU&Q|=dz!l+9zS_9r&Bofb9xx3hjTiW(<3-NlGCF&oyKV)
zr_(t-n$sDa&g66!r?Uz51$=Wjol9wvZyu-fIbFc%LQWTPx|q`?oF2pJQcjQMbQ!0|
zak`w-6`U4xTEb~5r)8X$b6UY^C8t%KR&%<N(^Z_-a9Yc09jEo2uIBW3P8&FF<g|&?
zHJq;Hw3*X&oUZ5e1Wr%n^dwGC=JXU!H*mU<(;%lUoVIe>#%YMtc1}Au?c_Af=_XFQ
zIE`@H&1ny(QBHd~J(bfKr+u8pIqm0kGp7TbZXxpj5z0l19@f649Sqywi`=b)efxEy
zB3TXjZoQVscPtCd7A0Ua%@WO4#K3pcW0G<a6lu}kXvR%)z34%z-rBSA6hWq&SeC4U
zP`6S$ZSNZ*7)0Pw0vCTUj_f95IPuMfN=}pN^B4^M`zOHuI@@F^FIkBOjMge03;uCB
zldvM;US?W>`))%Bv9?0oG{^R}^5rpHITL(V5K$*ek`<T~tF(mvIr<WHvqKZL?@h;v
z^>^N6`p%(4#Qq$cEJuGHY8PoednyNV%|yy`7CHH9)5l!D)6gk&E?NKiN{yn|Xg6r{
z)ce)rmEYjcz4}SyC0DzgGSt%r+B333GxNKOyUIe}OdMfkuaz?yP)+Sqzr9;%)s|#E
zDx%s2dJ_8D%$Bj<wSKOAnX8fW$G<BS-I=T-2KY9?>V=XU`(y0{9bipkF)LDduz)R$
z+9y*}greffT6eYvjlD2CLO^U1yB3N$?m<&z`S_%d>3Xc~`q7O-v3<!JVw1nX@xH+Q
zt;rbEwzFnhJypH|MfH+^PW}m{A_~najOlbOxc8fYsJa;DpUpd{^jqz@i}@0NR9xb7
zk}FZgrCJ}1FeGS2!r(hKsK`39_9D^I*RVQYxLv3-;s3n~1flN&_w$=t9&R7c>dW=-
zkVpTCpA$TZ1=eyMq35#y#Ia9~7eJ_VMBzn*OCmKUG<Ms&d!Mz$jy7}SzW78BY<n%G
z;n~$RYiT4|56{entsZa@dzH6SCcsxEm!amWf37ly8}ew#gEM^Z8shl;^;PV>8kI~S
zdlrE<CM_i(*Y)4-z2e(pX;ce%sa)=ub9^jUMP}yiAm@J`!T(&NJ*pL`Ta>r|edwPE
zGLl^D@?4e}>K0i)S1#g=PTtNY@%$)Au0h%3v|7jKhiQn&gQ{o?^cUQcCD#{gp5aXG
z>i5O!j7~P8I&N&w8EQ%ij&OvWMNLY>u~rBoxe+=$RC9l`p_8+M$DSotX;HEfRVvm7
z9rsZ7?87EZbYtk096~ztY3nGRdhMg^6uazQ;S@_0BpX}~ZnmR<l|fyuFUszxcrA7L
zHEm)~PD>t->de)`j(gJbOb2R_HUBBG#FT!2!p)OO&(-Bm`-@Oja{iA}wkgVEYMy$W
z+OIyOsc`&QtX-z<)|cwrbwC6Dn|>VIz1!b#=)`~BspUGkTM*ejSwO^zoTlzyq@U{O
zWFo0Uk^W6VrlWX73SE`GFajhUK;am|xbHg0Ew2j3HUsvGDjS%!ePMAcye8tXGc0FX
ziyo;0*i;80FWU4UJ8eSsv~K8KIf9vQ<H;WIxlRsq`@uup3ySx^tR~YDJa)-JQ-nt4
z&K*GxLTtDGO`QkV?|o5c+H>V{^}Se0Xsi*sqpd9n!+ZZ)Xy9oEzmkG>o6<vy(icv{
zh5HirE)Byb@i2OTZj4NI5<#ZhVv}ni>wiCWg`%!d!?62#PCEoq!0*&GeZJnIU#>s>
zZ(95R-(*XpFj=U1SQwsR?)Ulm9xY_0*b%S6Ms3i|3p`qf!$iYHT`1M!<y<WWDcEBb
zP^9Hs749IH;mTAuBAdf<W|OubAam8y4A;nYUsQuU$A11iDQ~@et_QX*79%JM05UxD
z4MiTT5eF%Tdtp_;gYbD)NhCIkGId@q3q%@YE@wHz6?>e?{~8tjT<sI>T=gY&rSgE%
z__>y6XYyos5-`H!7}e#_%x68=mUesTI!54LfYE&t7_9@eYRAGTIj2cCW!M|YI9T#t
zc`ALuC>av#GCFx8>f(l@Z|n+200tC9kvzKJaOg3PSyPnzo4`GkqhFPmI8>}sVe$l2
z2|m(}1yb2Z4>ltnlTD^THnZ~f2{z4PEc~TcgtPSxJ<0VsJYTb`7N~`>C9rP|-g5{k
zW_s55JimdpZV)@CAh`~m<K{wGL!6u?5)U?ea(z*kzJ1kSDpV()Y<4HiP2-u8Ewf=*
zm}~jC>KZylAVdCxP%K;jS1Ee8_PVx1eG-;G|4^>_T<d>dB|bUXMjeYBFYTtzXpAw%
zaE9W)D(5TgzMHrGBcbV?$yS&9)UYiD8*Rf>Cl59h^10UkqEJ*@vc;!F?Lw0YlRIO)
z%?ir;b1NIny1bohgklmilR-@B&+P?hzI5jH0<=xzpH5f(yECuP@&as2Zgkfz*_V)_
ztUtHhLwmpWsrIAAZW)o>fNp^*)A4njoC0aS8S#V>dC`cPMGpz->(=!6^or8}Zf2*T
zB5sZd8ndu5jw1r_UU3*G;)Gy!U)8XPWwRsqH)|L3^<Vvh&^Ju}2mjx0?RVNK>Mztq
z{~`b18OcrPngv?7<1xx!GDP^q5S68daptosM+*HPi`Z#(*~`Ldg^>)q9Z7Nxv(k>!
z8!#WqoZqxx!AG*`FkvJUW0IY$N-j1`X_XKqGiR0fH_BIEQR)`A)scTfod%N~sFEAc
zwhVX%Szg5e)XPlrG^$4Si=$Sv{&=cO)Q)0^+FcG&O%T!b`a-RpK^Xr=U^N{fevHMj
z4tQttpy)-pzgfMJR;ez(^!Gw{ph_W^RdNu()IpHbHN2O)p14D(5|jU3t|*r)FCgxB
zmwJz;XvZR4>;u|IdZ|0?k9~FUBOf_JYWAw9J}axkFo6XhNbu0pBE6&>F4iK4<NJw}
zjRat5g5w27o$ahU9SiE3axPq7cwc0eUY4De9-L=RWLeUh(dAt!^`5clrN(G~q#YVo
z<~`$!NgX$=(#BzV&<_5Y7JF)i2cGXvt1t6v_bqlRw<Vpxa-qe4)6G!i^71a(`^+$!
zh#>>N3gR<PYxa~a{)a)bhZY$tMiZYW^+PfZNP331k@J5foPYIQ`dIC9&7)qf9tBST
zI0U=-=}E@iUEb)d%$`mZz#w~y#nW!fRbFA+iX=~U3D!UsXx1EL<ryF4KhHPr<?Dpv
zdXl~F+Q%jv*^@F5H$~=WP3v|M{-Q3wcBN3@reu`FGM?p_8EO_`g@A>T4K#G<$Gos*
z>xIH_EcLiNmK-Q1igJI`K8AL9?UOYkJm6rm+b!dO0WR&20YewsoeIQfWf3k}9C3>m
zJ0|eKUVM$v9h;I7cYRMLbC$m-om$2x1-mQRKp*)dp|BmvE;KY>Tkd$I<&G_KpO-CL
z*x2XAMgE_h|6>(|AGs60KeN;h^#=7ltqAdd9#Ph5{{;TmDas}KX2b#dzW#IlUFUm(
z%z1_Mm93S|RF76lB&FD)h~-}p?u&>gk7FIaZOrY@_o~cABy&x+h-W`6^Zco-ZW3FZ
zjNtcTnPZJ4;c$@)i#_O43%RUBm}EBbtty4gTiu&1hHLR?8S>CA^T4Rso4#Z^p+YKr
zCqrwW39X7zlK)$&s={Gr%sfUWEw`R*nWpTJN#&cOU4zk#30da*CuP$0?C*y={H5_8
zZ3gXc#H02%!SR!w@?Sf^qfH^tGe|gPX+6@gh{<1A-iFv`j5&ZOJX2!cmd<kcLwfeN
zrrqA)YK(EHgrhNasDnh5W2oQC!Ng00y~Gocd8S>!?*FF%|4Z8quHOgyUpVFNtDi(P
zxdo=%+ce0ao#ImMD`3DZk=4H;(+!t1*}#yVCDTeQND^e*<=TMr9bLpRv)jiqv(YTg
zaFR^lI*nC3RWFD%HYGQ^JN8Hr0i3nN7>F>+%6?LK4L@T`72(*6CHtujvEx3nwA%oS
zVYcQtrHU1rw_`t{P(XXfF*Lw3a$IaS;|v)S)9cy{LiPvR;0Lt3-(S5#=x*SD^`SCu
z@V{jKlXL?pvU|Izmk-2J5&4Sh|CJvq$`93iSO5>HzeL23GVOHjY5f4bMn8RD?F9Qi
zALrLDL>2(=Zzn=M#i<dENz_XF{u}P<(%cExT?9U+nH3r?fi$y_tGXETqRD^n)Sw5R
z;1w}AMl-;{Z#%xsn^5nTIJLck7ysr^1iswh>qy&aecyE6cWDWr9D8@3bGcDEGjduQ
z<cu9o`+>sK(z7=0%01{5!*p#h(us|WSpog*za25xcrb3!v_B*M=Yd$B`G;ctpQS#c
zjng991NxEbf%-aqNPlAAuiXFXIcg)|ePS)0s*FTi`uhT_feb_u9%i@0Z$IAyM2c$Z
z#1Vj42zqz%06<tuqAZkUUJsJjNCk01^3|{-8-!q?CP*+t$r8%D1nHk$<w=aUuCtH<
zVT$2F2zh52D$y9m4&cwk)};BJf&8A6;|2-&wFg^aTsG(@KpoJMwL>m7+fU3{dtmPd
zNR2QDI?g)***;zCL3BY&!Jm-r0Kw!4`Uik=jva%TNZ=0yOoL>;kH_20y9_zLARQ~5
z#F0?2JwUXC1gn^$KX{+T?3?F&1|qsD`B7hzV*gh3_W*z);)i4uRRq8eM0y410odkB
z=}wF=u6^CWdk9d7M51dfi6KNX6*`aqI+A`}9?vzM6n2foYplA53?Uh|@mC<>)zaR`
zl-URf`JOPt{}_K6;s5iMprT)*j{@emsx~Rl;Lm;c6G@)tPEwa;cSVngBGaSZwAN?S
ze38dfk~_gxd9`9!S}=(MfC_S~-zle0pfZ)(r@rYC>o7gJ19kXZp$T$aUCqqDeFFXB
zpHV*a?b|Ol^P$^a@}Uj=06oEMCr2l}b7bkp?cO%b;k^0wtHnN3liN^@0<F|BZ_a!j
zAVGmU1R`3;!OV1|<>*B=FDtI#1NYNU#7Zd1tu7}|u{?TLk^G%<*2n3N5Q7p#l7sHn
zi<uEAGCkV4SgAYax(CTWp~-~*KZpeUxL0{y`Ai*;*njKPUBCgpOZ~O_p*BHVsIAo!
z+BdZ)wRd%0KV0w9@7Z^o!{^9}M`NpvhWiMB9t_D>Q=F$lfNcT%52tHSKa;ln7f0VQ
z8;AMUb7_jftdj0HSMc12Z`6e(xEqv&WT&SHziENYz2iLEG{|x?pVACkrg^kg<Y^8p
z+!Yf%+AR7VLn&wu_c6Bk4i0}rqu4Y5=w`@t82r(-9H|IwNGlDZurd_u?}Nu9^Rz$x
zP>;3<nOb6q`;O(o>Fn02Z#&Pz^bu{{*;72)QWVe_Yy&70&Yunv(GXq<Jq%&#a^8Kp
zZ5Mqf(h!5l$|AZ6E$g*(UZU@E+VKgvi%qOs&g7N0^k??f^05}&t9^C6GtJQFwERn|
zAT%vNW61_<C*CY1o(3fT2_W{C`d5N0@Xw#=FPbx_h)M3goEDrq%qR>H%ji;nJ-91C
zLiy*;F=lo~8s^AhW&oLQ?Ocl54f+=t^SPR={{s~ODV8f+paXaf=%20XxxfK<4{<+B
zwO!i1@B=!6-UNOwU9GlyM;2kB8X6LSD#P`h^s0Wkt)7!70pCUe0Gh!HA_`_E@s^po
z4N@*kT-zUKXqDSaJy5S$a-2lC!@h=eU=T4U5#F9ajghmB^y{i{8{I+lgoE0Wi#XVF
zfL@SopF#(2piSL%q%OrqCSu`YoLUiWrcEDaz5*gdH^MsyBeMbRsLh_EOCaz{BEv}<
z;5h;}Cz2rGC_y8vUZ&2a31%IkOFec`LQAy2r)}~Ko6bpp6exzAu7QA;^Z^s3F9c5{
zDu155%*F>Mlei>=7#Gwk8_FPN4>Wn6eSgua1xjPMh5&|*l{M4GS|C#vwy`##LiXTx
zg_{c*z{zuL;&=?Fivqh9QhNUanr6QAHb}>YRgZ*(C-`v$qNWlEhjizkyxc~NkST6>
ziZU0r$t$Fn4MTy{9f-_q5-OF}^B5-oFI6zmuV^9lE6S%zsdSxNzep@djR4p5xg_2)
z;Uy%l!|D_>)9WNzfwq#czN<#;SRk^#qf;JK+>JS=>1Z*ZLS{G((>Et`Lxa4EKMCwu
zq9LWb1-N&31lXP@PER+xOiH=nJ-<SXb+IL-p`YEru}C<ZBJ1bM`Fki!UzdN(WT8Vl
zQ>r^7@9LgxXS*Wd!RXbzDF0fasKnfqf@T8#!|@fS+8By}?gKc0{08)U3+Kq3fIk)<
zmEm3dy3u*3P-%AmZz29a_h~iiZ`C&CXG)9pLf^ZmEvfz71@I^}DkzJLe|fKG&B!mm
zM`%Xk;8X$neyVn&<Gwekb_|yQY&$k89_tT1FAOrx+7%BA`%G`jM}z4(t{PUf$+(NG
zQ1Rg@e%c?kPrda!p+90NuRHx(vsFZ|BCDrCR%l)RaV<ijk<>_cS64IWDYke42X)*z
ze7zM0gyIq_Q~B5{8^NBt>DkZ4#5>(5Ww(IREBHd(9uis;PvyDu|FOQB6<I#6-^eFQ
z$1I^(!vF8D#1-Wy_}@R(C2CB4Q2j_-p>5Uf(f+P4)=$$P*t>NvPvuzS<K%KLm78a;
z?*OhJBoIv_B+1=8{Lp2N)0*7MeCur(S7TJNfMK&B9GCA3$F0vu6#R1GgALc0Rf|ks
zv<@xR9%#X(cOrwCX-@ft)0hf%9ENdNz~NMDXe|L*;Q>G4qy^R-gYR^wT2_e=#jydi
zX+0W+rQ4m>!juag$Fm))JEf8ua{iA{ex>NmTA%u<T8m%*xBm>J4q)7-<5NK*`YE!0
ze(Ym>GrjR|!e*M7ks5=dKbI4el_1QX9m$bm#3#EcU-I#{&Jy^Ncxtq}Bd3zwKL;V?
zLL>{S=c2Q)$nx>Fbg;GUe-(RaV`_h#+hO1WI3A(w%^dxa#W}k|4=~>%_d2h<e?81t
zzKbRaU7I*EH3~B!pmpqh6D^P-?C!#LpKGCmXhq-ps9C5eyZ@h{=!>;7^)a<d`K<yy
z?Y{Wgni`KDfbW-MMVxGtlF6Bsvu<O&Vcz!Zg*n!fI>?>Dz6E;#wWG)~Okr2t+Na)G
zE)=*UH4d$HW5<oCBM_MnT7a??NnZ_ga`v%YR2vPZzQlUl@q8m<11rxd%HmqQ7?;K}
zt1T1Sp6E@D#eyEx63%0H?<<2$<3(-X=c(V&OxMjv6OR$rO`<GyAlm%-;?<HNuv016
z3%^{X)-T#a+ws>AuNK<D?*HFW^b~;PFVQsk{~W4(XJ4%UeVIo*HQC)sWo@U&JSB~$
zfaCzHEoA5Ull8w6CiXz;P%J9QtsE~ZGmINMBCVg7UrhI}+9$6l7fS9-O>!r;Vj}-x
z6LXw$IIM?l&IkCdJ#X`oLQ#o=)I_w>4Gu;nE>XcqJJcNwp_XtAhB_RCus<E*GuIb^
zx7bFOzbs#<PEYC(w>vipH#Cz6BxK#q3`UI4R=&b_PLl^rVsz?YwBL;sn5?|oV3-7d
zA%;nD@+XfM=U<g}%Fp@D7H$KOU;L!d2c4-2?nYm{WEKezX1_uwT3!CqgisW@|4&rH
zh^MEdlpia9K>VMXYPou%I-q`2y;uFE`e)b!uF$%$H{1+_(073hHVfLoxPG>NxBi-o
zH9o_mHRjf$(&4+Ft9<P@IQr==JSdOp(_z@RA9B|U(<kJC5zTWA*J_jJ77k;+Zmz2*
z?}-A%Umj_vm3W4m0FW2ukv1Nq=&p$#Z60qig@q}_Tw!6?e7`odFvmpt>OmfDI?tw-
z#BE}_?t2WCNzXl6nTVkk7N@u`Y3MO)%O>AWL+x@P7KC$unsHe^(xX-KhFIoGt6#~D
zHAr7(JA?XSJX8{WW%S$hoytub$Q!w{u%RQ3zQDsRFp5{PqeaAc&Ly%>4JO=aKi=WN
zH|9#4cpmru$zas@+PGtp>D0;s`#`9#NQBuEd_P?i2d3@ZD8iICt;;va`uD116?Lq-
zR{fUxnl@28NqZFNe=tM*Kl)SRK@2P>q9v<~H|^Ee9Lx9|=o8O$DkC!GMe9=QR8VQM
zi*YPsvlf&1E(v=eoOjZZWZl~F!8uK99D{y4EXhvI={uv-lQ@1~wo7W9)8a{#@0)_^
zLIbdn>~9NaM_~2cMArWo@xR>fbUc32R!+BZx}DP<obKfGG){MMiugu|+g0Q{ozpWo
zJ(JV3I6a%wFLQbhr{{8d9;fGXdI6^wa(WS`U*Ys(PA}o~Qcj0BO>&yz^fFE_=ky9r
zzsl*AoL<H0*Esz;r{Cc8YEG}=^jc28$?3N^y^hmwbNU@lzsu?MoZi6cjhx=Z>CK$p
z!s)G?evi}JIQ>4SKj8FsPVeCKPEPOQ^lnb?;q+ckf5_>5oZiprk2rmR(+4^IF{eM_
z^dU|k=JcnWKEmmvoc@f{$2k2tr@!FzaZaD$^hr*i;`C`wpW*abPJhYn|5FuxzIKMT
zzxr+E1LZtrYSwyaOC9MBr7hdDtSIZxj<oUhEngCDB5kQ7+!aHdKZilJsV`{e&v{Jx
zT>I3oM9<U2oYYiY_da)!77M()EOCwb#t*5reWLm|sF3E}ncoqFH0`OweaflYbjM<d
zVMdtp092$m%=6Aw_+7YB1fh(j4s&NVV5yudvU)luExI&EW|)=oV?-8dQOE5wsRN3w
zq2KJ}<++k*%aU|BUc97K7>-0$Y6@h3$0N|F;~G0;JY=kZQ@aC6`jWJ`W$snNs$=*6
zW<_aM`hk`CZRH{5J#`dffFBDVfWK-D+Ns)k+PAc)aPuFjPlY`|vpxVckgN3{>d)za
z%-Sc6e;6+vW*61;eL33$HGRD^JD74?cx(UB^i?SB&}rixn!XyRKaGR$H2Qw>8kpQC
ze1jZ2A=`8FBv^)%8~(nMJ7+m&o`}rn?!(Ltg7Tq#U2)^acON&Ww+_(aTg&AZB2<8H
zbNYn<TjY!K0d5XOTHz!>e0|CW2_8%#b@A|HR<w4pYw<CBqKKc;P4L0=ODjvKbGg{T
zjM3!l<zwI3i$K&Za~92xhueJ*vsUgdte6fn{hn|~um{r65}Zh+tb$c+rtL;d_Vony
z!(WeR(Xe_BGaKK6qsMr(Lp9&-xl0zzqX~{+!inAUVr`Ht_Q0)=J}zd}+FcApqX9qB
zv-)e9n_$5qY_jey?hbAxy^%2>_WkWZj|Rl`-Nh)jhk29ygLUq1T(V+OSYlL#Vo_Q^
z5!3%QDF}dZhc-ps2~j|kaUt)`?}??U8Q9RvwH^Czdz4*Za&L^1ltpYytbKBoh|=1b
zI@+D|6}{SG3?wc_7C-VHDt)cp{`OX3_e~s{nvR~DrfqQCQ>LRY%Q@2CQb6{pUQj}h
zy7!yU6_2_DQiZ7CM6J<r1#_HqWZLC)rXe3yjASzFyknP%y|yGZ4V5a@wmGhpsn?2`
zLxFXmBE~k5Fy3Zk0cQ!dTW@2`!};699xX^6h0428w^W3C;B|)B@V&%>t+1&RE>8rK
zc=qhsY~L%&^~Kn0ILB8dhAJZG{}`o8QMM}ISN^CTuC7rpQ6EDbz$z`NRB1ogC+R2X
zXX(%9+6U(9A(^Bi<FwEe?1FJK+ma?1+nBCpQq+dv>;k8c9-@dRlVb8*C*BdY;Wli^
zh?LvdPxsNu$2oDwpf+;w0_rD@erac;$+Mj}n$$)6+TjEqr_N227u(nsW|~${ryji#
z7-AnxUf`r#R!4#z{ZK+giRV4-mPIz!beSR{bq~QApZJWEMM~RCQ_r%qBO6YR07d`}
zV0qv`gR5IlsE>L`O<pR8A29fzGzDAwBSC*durKIe9iLs~FRa6vN=`3eTEj(%&gRJr
zrOxlxS<xmOE5|D^rb4qzW0ZSX6{c|_3s(kv0r?8pK#`l6T;!xr5wsR_vyH@(Y9pt7
z1)MZ#g#t&zq)sCI#MspjQrnW!{z%-r+pg}}-v&w%1_-kgv!@~gA0<E{K>OMdZSA6(
z$c89mK)mlw)1@Lxc+wSP2dRTm>!`EX`G1+BuZMQ8Lj9?_Kmn@4fBGjeF*O&P<dNFR
zj(2#IenX}^F&hC$zU;b<ZJPN<eqB6(3Q}`i?%{?|0oK571PqRBSv1gw74+NEDqfwY
z8lgI;r2?o8AP*dO7Lh|BbRf{X8vEOb8k<fgGH-F>N#Bhr<fll#2yDG0H5)Z>WBpVj
z#i=WjzFNMEm%nO}&;!un&q4*<>hR?{2i6t#tPJ@k#(^ldKk^;1N>fuaQKea0$oZ&<
zIB*sweKu|>Heais+{oCGEA9~35pw?ThoGNokNOj}Q2hkn=v%b!Yk$>eC~xcCI)K6c
zKlyR0MWc``SQtb$kU1fJe<=6B30$(BXIa|Y0+-rt^x3(HQ$Y$b=~TTZ*aP{#X2aKH
zR|V1%X46vUIPP4oz07x;<7yA@igZo3+PiZbTo<I<i0@V#9x|)xM&C2v1$InQR<g2S
zcMn(s;-d?uW*F-1ILB(?++kdOO^#=z4HSxRn}+2*TG=@QDBv$DZz*@-2G9e`pI5c9
zTD5kT_9N{**aG}mKTX;B@7V|Rv!&kEl+*N=Zw^NSV0GbM9pv2ZDEKF8C(P1MwqB5B
z;K=%8EupqR32{&-(`LdANU=^j>=~!;K>22XYQZWf7T(Gn&BvXHo>?YG+aE5hA_xo;
z2&b3_TOqx=M8d5kq{L=+d6|#^)>5?;p=mfP!-Z$Ug-EkTdVLvA(?o;rA~q<oNUJ~>
zP{w@1HY7jZrmIl3zEDq~xUUbKDCsI~6H?SluXAMpxu7Y?*;oo_W`<XyMKL{^r4IIG
z(cVy?EDSR_@cW@ydw**eZnAhlO3eE`@U>>jrvXX3D%=eaj0gcftL%)jC<1xkMY`QH
zz`0uP%e2hZkjwN$nInJR!}$I+xpfCk0DuaAV=n*-YY|n8Odo$?B#dioF-#p>smv_z
zMP&23d^0GE1>57~&e|0k1X3KU01&>y9R%fzG@mrOppUO7eUcPE0XcO<d$5hPhG?7%
z#_{8lfl9_{1logPfv5gadfhZ;P!SH1SaV2?+1?ur(^?$-JmLRGDn}}M7vle2s1>P?
ztA{K1;DPZ6?9~#N>=iva+aV8?JFg8x=19NUelh3x>aGyjtB%xSsuFYTTtMcl!G4a)
z4Tt|$&RemIa7cA|I~E8f!IfhX8t=xH!&3J*XMx|^i>t`h=PMW!T)Saxg;3G9)IxU(
zRMI8G_KLJeGJmdK$9sN9fl$o4)B>N<s!epv)&hr*%y?fB|D}ny;K}mOgseBE=DUL+
zHhC2Sa48!|X}?a^j{K?_LSa3rdF~92D}c~J*}|q6Uw&wk>DfpoSFX!z_=Qkl;($~U
zCXyRjs`bp6i-}BqM_9Ky_^9jC>)Gr+y-%nV;s3qrt%|luJ5sw_*VK3QGWAw{oBo(_
z1Nh?i{~0|XJu0&0+w`<B*&I7{)g{|Pwtcg!SV~!!YJ(ZJW9FBXpOp#Zm2o`7K?sK_
zI_Gb3d=oKcMjm8YealaBi%zw)3%3#3X59-&(U}d_cbBUU$z>%jWxXsKF?{U#?jh%Y
zK0E;Qo!U9-U)0mpeC1O7Nq*v~74DpFOaWim{$%-h;R=4foHJV3kz%Rk?rcyjwY>;`
zldUc$b=h=|>`>d1Iu2X28-yC72O_hQL{?`JB3Wy#pDSl9=0$IB7up+5Eu-g<V@{^H
zkLV|G)1bfbQccg4GyS~8Q>F+dCdQ<WW$c{uGTDx>8Yb~Uz?&6TLn9OGCkVs@50Td)
z=Qqk(={Pu3w~KX(rIx~`hD3^R%vkIzy9=ZF!ag(RFl4IU`2>}|eKhd|LHc%D>KF`!
z8_BI{KO5d*&8qOsyOYw~?Mc@P{Z7vRiAtw}sNXLl0>BJlfVZgUt5+$V>OJbK>Sr)h
zSPqYXKJ8rC2mDeQ(%zzIfM@B~>G$hz(0#(u|F{uH1z0D{ToPTeq#wq}h1HlqkS`hF
zI^W`-R@-7D(JA*jH#3sR?07~_geg4gkgceMn~0cMKHu%!+oK`~RBbfRpc(Tm;O<Ac
zRJ6YDjP}6!BEu#7?&S6=qF9%<yoTpmiQB%dC*D=Oi%cKVY+gveB}zV%WB*rpOqt65
zV62S{5*LfoBZa2_C9k7Z91dSUceo)hLy`VXL3(BNJ;JTOvduTI<AY^7ETEieg;XOR
zZiUX97TUurZTghH{V~rzD>kri<5Caiuy1d$vwXYed9+qXX*281_nVm>ZH<F8w94h&
zWD0yvF(UW00XMxY=wBOdV-W&=#equ&ATnQq&jE_+mp+QREzF`C_{`1zkQP0ko&QCO
zz6SBXPlNvNL_`8DvRl$EsY-WvURg$S*k6Z(A9Rn|MK;FTr*8O{uq`E4q$+S6R3qk<
z<KrNk(}5*S6A*Fx7`!6s9;j*~RK*7Ld*H|$HfReo565Y>$Iqdg`->O9B5dyMsd9H#
zyTU@D7R|#8XO6<o^Zb%a#LiljD#I~StPSpcUk%G^i0mue22aIV<#0Fb%+XJd(&^gO
ztdCMdLLarHO5IJSEGxVs<6mm@5LU?fJ6IvG(`%={^`uJN-SkUBg9tl7*}HUbk0SH4
z+BAc;vQr$8X{lli$XqSF_XA>SDsH3wv;AH>K0*8D?eG0c7yz>V^OQ=0|M9RkN4*3n
z;FWf(U-Az4d$nls=fdC1R&m)h)%rvA=?iEZ_gwP2(8k2{R1GTkx$yWcyVuUV+&+O;
ze+eIux5dg%Oszs?-IzX@Ha>&*caG&N`O;JMHd{-VJu6mkbZRB4=SI_B?8mhsPVG}F
z`bp?Hn8LymDbA$6^ca!`uNwYl(KY-!V-nEDQq}G*jKw`v3=c5?(92<n%&TDWw6$<o
z-NOAIA^*fBUY4r*-1r~Wwk$5xNd}{Bvn8U7)Oy3qY;A0;7RHn5|AUIUOg&S%PkmOK
zr0mg7)V`$zwGZ@_`Zp!(-TCA79xOad1x@y}4OojYi(ua!#vPMua}Cz|Z`+uOWr<x7
zDW@9)PDl9_$3hp1JdU$4i*ulSF0nhOnZ4{71a2jXVHyI&cxNoy-_c1kO=B?oik;Uf
zcYOMG$C5EBAC#~;w0Y~CnoQKdk}Q2UXn-{z)jax|<w{d=<e|_bF~Lk-O{=k59x_PG
zhoF7aNbs<4566k1VwQhSwzT{Q>pVD@_kKRkv+&`f)jYo010B)cXDrhW-F>nL&T4y|
zul+IP`xfK>6N=ugy{qli_ERrFFfiz;|J!~Nqf$*cP{wQZj(Me8VgX4+2xWk(he32B
zEI7k`#*iO??#l7W>W%z3*||~J*#}aMsE-@aAIZH9$kA5!xdkJ6$tGRQj#L9mc4I{+
zznK?FU&ZFo@@t=pGz%?{rjB<hiOiDt(Pe;>oazp^q>wyQ&Sbj8+O>Vp3ngw!t#+sI
zYr;J)OE*D<UdAUQ8J|$Q{jJl4!cI%oqkG*5+c@WPls}7aNw<@7H5Tud^|ArZKVm?r
z0rco~sDc~j2@N&^h`@GqOB?~lcvxUomE7Mf=gd?7qE$kb82`Uq(J#>cs2u?Le}S^x
z#oC7}<OyzFA+vXFY|%tyjyBl%Vx(h6@2yLQA^nKwD>!TWfxrsIQ|sO7JFI1DMV61J
zq|x(Ej|n3H{H=AE6mA?sOg+eg&e~l^gfFyFhtghn|M+KwUO)tbW{l{GT4Jo@4cSy5
zvP|VFyy@vnNqSf|^>$c^U|eT1;*Lhzs=t1i5L<OvYArf>hSuu1QPsJabBapB9dKNH
zy!8scJ<NYkm<gw*)=->y$66WE&7zu@ZivD|<;-2XNXNjsWuZ_e;s5hBkD@KnF4z8|
zFVH;tp#F%99pH;k|JV0`(~FeR>g1iz$CjEQgVKA#Y_b`wJjs(-viD4{Mea508>&ki
zXLrWCeM?t3#SS-LN$G+6b;mZyQXp4f%Fbab>-w6LmGwO*H4n|+n1O*$pc0KpiHOaq
zC|^?UQq*EqQzL3hJxIM>eL?w!HbOgAi)puNZ|g_u8)5%@mwv7OxEqb%zjIlP^=MO}
zUCEk|i#$Ln^hu2AY{UpWuPiA6S4KIJ0i-{5a5d-pn%oy}uHcf~t2vIIv~qNguI6})
z<|%A(Ctm2$!qTpj-*^{zv<_)9>3x=K;w&qc>$ZA~2Y3{cF}6r+SoA@=VlDOyqjqSe
zU9lEv4aF|ysy%aS*-pYWtTy|^bdOe#COg;#IC_P}BIo))_Qr^c>bsKN|Eo#-pO3U=
z=>O&_Pbt-Vv33(`DhLkCO#oLrSD7N4m$5C3gUUPMc!8VQnA+%5y0oc|nLOjFFEakY
zErs&Ozbh1hJKP4BcR1-vrMg;nhs*s<Xbk5Yt*Ug2%PKjDtWuQwo7J7XN-KNCUYeLX
z8CCjRT8wNpkKN@)@}>Hxztii$o=bJ{IxsqQlFJ^GYca|YFOUsl?r#>P#ZEhXLXX8$
zC%U_RQioR)whr@d6(8?>h4KIS3oC_U$@xD*+o)(8wIAwV(ofOhDf7k87d^1Adcd*z
zC!19TlVWk68xQ3tK1a^OK85L9hfxx7LbcQANTxb7DN9Cm9e1pZk>oVI={>*J17Bh%
zY5;Rq00oE+Q0)qPXV5C%OxFKM^+N?1-#fI&w7;t#>WlQ#^`Gpk@&6*9|8YIwSl#Hv
zSktLTf~9Gs<K>atc+w`can@~``yl!5v;p_XP9UrvdeYZ8uDMAVEQU(B%BhysloPGV
z3yzapn|Lz*e}<wbbf30aeOK*=CGZT(ISbCW(<Rg7U<MWC{$_PrV!BGyUL@wFI#8u$
zTEAnC-?TkSnKr{VX*RxakV?Js0Lp&8{q#bC{p?G%Q;QYng5Fqgb0`9rS!l@#-^bWZ
zD?CKyOny1auTBcAULrpgLT4SIRXgvjVMDlvP%r}QAeaEd+L~Ka7>(jA-ghYUdQjVS
z_w8a;#-!TVRC3$}_7Zm1A-TU%E_{YvS@O!?7wQyGwYp=#t*y?BEFUlQv#!|w^E#o}
z?Wq>@#0YJf<DQVh&KJqvDBqsI`Tz272*s20f3&hv!GCwEqt#M%mwKoA1|m*`pbvOi
zKUA;R&((iwxgQ7*H+d3kWDJS{awtIE;rjw55yL~UVMLb!!`v=^b7#1<lb|~G^tDH0
zm~xdsJw(8_o<0OzA=2Sd*VwUshFk+>!9g-%V<C9;6R#D@1BJVLi49r{jgP}D+QTsx
zw`SDOq+aM*)eV$|P@6b)YaR8l%@LSYnGlc+h?zopA3W|E5ag&wY-I1o#O0AlxVJA%
zEo(;oPzoWCT}xoZk##ZZUORcUu@rz;!9ATWa{S^Cw+{MYL__m9PwHfzU1kLdW?vNv
zxAk>xf@1<rdz}<bz?8NpPDl7QJKG^+jnh^R)UlmRA!-Ux1E4ut^367<yfK^Vo*rzj
zfYyXJioZ17<~tnL8+P>!PIJ^xY<w(@<q>d*?r5wRPzHQV&$f}_XQhlbG-aRwt7#)2
za5yxzSxH&iyV&{PspyT```QY4{XDL&R-O@-_CEMCl#2M2W_1>Jxdr1buQ6q@Xm3{-
zKxVc5=$OGiU3@UJaN?QdK&^e<w|{3m-rE)c+VPfIZQ)pm;NT6?XFF0+Y^Pprnf#0s
z^9@uGuYkTdtlcpQRspaf%BGKRx9m;Rj#sHZb@nSK3j67nR1eD6wMFvn+@kythh`|o
zvg?U4cX<?U@mRUG?=4pJJ0eg)EY(d8FdP3lQ^~auT_KPsiR0BB3^S|7-4+kmy;4sL
z4J<xaXfHyZcA>$aE95Czw{Y(5h*Cs8W|C;U>YKT*94WK~O{BUjUmQAH;JkvVO;kWE
zADwLeFkn<M8TC!dw>#O9ns?3^u}h|>!srq==H_Pg08YF)a;249E!R@U_0&G~##=&V
z$@(9uoT>oP`)KV>cmVteF@RsggMZggPilY|IRsp+&tenAu^IJv<4d)5OKuuR{s}GY
zOl>AMW;WpYre%T22#3VJIJfiNo&ERXx9($$VN{_|RClVM7|@YT?l5PYTmX<TU9fzr
z8tm?2X0yA+C(6BZuc775Ie3duUT-Q+?h!UoH%(1r&4TN2Z)cDJ{`hvApB?++C$z}f
zcc?;<Q1kR*a*whD8#EQlyyolMVGdbAoB?}iXfJYj`F6|S^_+4x>*wNs3YCbZVs3Z3
zQlK+|>7s7aU@Cdp=7%M>-ogr<@`|a@Q{5I?Mp!<A3l4!JieiOYJX~<bdN#tB{!}RR
zlvFR-uco+IEp^cr9%XKK=GRjqx3U6`dQB*R@&ApA@_Y4Ac>Z3i{$4u}*uQ5ejmlSm
z2>O|REF=RDy4nn+?1*VzR7MH*Ya_U)o(|GE1$A<(2#dr$Jwbm7fo7tRTfjsDcyA9m
z%V}Pfa$pBjUY19#?@w~v3yT~iJjDA_0gXi-U_(17l6*7gU<*p69HlvV_OA7j6qdp&
zC9X&emnu(=k|r={flB!Btm&nlJx|KMnhGP=xn@MN!_d>DnhheCsYE(qNO%$0RyW26
z`9%Mx6iv{gbQIqZWawxGQ>Aw|Q^Kksrs}kETy8MKXvL3mF+Jdr5Ka4{*7wJ#M-<Iu
zKj{s{TmwWu7=R}>jwTLkS72kxWJ+E=4Paa)p$>?UiaR*7S1^~X|1aWyx!T|8$2@-0
zbDaK~)8BCVTTY+n^aW0T$La4meUa0bIQ=h9U*_}`PG9BpHBSG)>Fb=n!Recv{*lwS
zIDMPbcQ}2Q(%ruIIQ<i+?{m6`(+@cPGp8SN`WH_B%IQa({*BX*IsH4QpK$sQPCw=J
zpPc@S)6W<!P&idN)i~8T^>8|Z(>zY|IUUKVms2071)T23=_pS3=X5luV>ms4(*rpj
z%juUm9mnZGoQ~&o0;dOadI+ZzIi1Amp`1?UbPA__P7mYsa89RkdIYCOa(Wb}(>N{U
zbULR;b2@|5nVimI{QrrHeu+L>`<k{yy-z((c}xN7<>&s{l!A5PfHuPg??Uc%*xg&<
zFG_Yt-)`YSeDO-gogE~aPxPgBQtr$J>rL`5L-guFe`N%?Hp2x950$f0^XnEoKScfs
z+|$<74lu(bv?VTzWlWFh4BKt}T)F%g-(jrV)CYyax23kD@O*8ln+}fR!XJwcfGMr+
zX#=cATG-HJ{i5lQ57E+Rz4MY#`o`2Y;<<mAi^2^7X$-+>dTx4&jp=dXb*eYD)$R4B
zA_&ag0f>D|qnSBme%A8MGFId`GnD!u`m{h>?xI;F%5qDzyM=)A*Fb9B79HSWcXmr(
zm0ljFHJJTdQF;(bZJ~Ea7ZoV!hYY6;Si`_(WwTg(Qu%f-YjA<+6h+Se$;$N#{(BU@
z|DUPz)mpV3en3~N534T&4}7vVM{Crg+WFeG+C$n)+Nb(>eSyAKk3lc+b^SK|F`Fo0
zpL+`#&VZT3?q=Y+YeSLE;5|zKenXk4>dadxIjK7lln8ymU!`xCGxJA_Yp(Av^F2^>
zkQ?wIq~6Q}6;U<1`uv4l3OUWcy1&K07E<wWw1+x-6a>=2l*Ft1U(+wd@%WhG1MRlD
zg#MX9=-^#%AFX-`#9+WJp;aHxaEZvvI9N9Ss!)Vt;39Yhf|O8sUBT>3=I|`0ezZaV
zO6JsFpz@}Zs1aLn?Jk{NJ-c`|&HBJ}))7GKl51Eo5i5sdxI=+UWc|93MXKIi8tV_S
zz*bc(dbrK4-S;7{Pgy7gyjcYJAZi^1t0DKh#hG{Ji}42xxMz1+)Q^h{#|AE#=J#mJ
zFhb?6orHnL5}Q^$ja(TKi-cx5fj6-Nb?*ja4D@DPF6gUeJV;jsWbFueL8Lf5-Uxj?
zKa<k5XMDmZl;mE>>m-v7``+ixgxP}mLdPS0Wy_R&A2Bm@B5E4Git#{R#(NgS0>WV-
zT%veWtq&33Kl#iwU%1)%U#I97>Jzk^w4>Fp0sr?$O5O0vbMsr|vV6CjR~>0C75}mU
z_3aj)bnJYGZeDZ7bO>iq%Vl{4@z%!N*K`Xq^e@Ew!=2r?aSSVDifHgVaM=hP36SW!
z*pb&F&>LILYr$ajv(@a|ZTWchN!wY;RZ*dN3EyQN6g^I>cEMf{uBH;J12H|A{s1b@
z3Mf;V!jW-Q^7qQEn>yJ^p?y=R&CbhoR0f(Amz5#$*NVI0klzXfvF0FGZjfqPy-^Z3
z&{$-3f#o*{71(r{=9ZrnmWfYXH(QQ4oV9l3=|W+#%T%}0zS5v+1BQ6h{BTVV6EV(7
zZW0RZy-ab-@Q{9lGzBt^G|D_1;_PQTE-q$s>`=c@Bsu^0S3(N@yH)wCx<VaP@5iZs
zthO2Uz$5fZeV2Z}n;pRN+bR#NP8=!yC~_?cXEcZg1>qKqV2}MRkQLD#d!ih0!?e&z
z#{kG3D(u?Us$fS)xX-^b%p^{Ya_cSYY~l#&M3B>K3H)U%!mowmT!6I1x#Wpds0mo^
zOn9`&h183VF(NmHqcQO9rBNnHE+}*^Ix^3a0>y=Rv<cjlznaEGi}`DSu|Y@UVCSMq
zYO9X1tYlFqSIZ3&%mZM3G4XxsVi4E#QtdA1uQ=O=xSV_tr@QD1%PqWMg!5_89E^0)
zD+=wy!<`GuNkYP>5&I&Vw!}p*Hg|@AmqDg*m{`@s``Hbppq`!ovlab(-K$-r9i@I-
zU8vlo%(h&|%GS$9;|y?j-z~vK3{p$VyOC%JX+4PbbLE29u4G$PaJjHmCGs!ZAEl4g
zDqWn!1O~FPGu(@i4jm9yQ|{KF*|UB9|JZvI_^7J0fBf8ggDiItQ4x@BKxHRkM^KO?
zBqTr*Aglt0A(<otlbJBt2nd?GR>cKnW(aDvYF+ADmsVT*rfS{yTC3K&RBN?TwYDyO
zyZHZ}bDqiEIdkviPT$)1|NH&SCpk~%-nr*F=iIYA`?KkVsBFryKUJC%jP}o#&XHPm
zn3upPiNC&nq-RfFX;>i-qujr#dcHkTPu54Tlf=2-A*VZdvHz5(;mKV}f7_xa8ju|g
z#P^*17Mx5xfK#Y0p_8(`yk*^c67%dc70k8KemoiLxGY|IWlJQ&LuAOfUWZaXwjJ}J
zK$QEZJqn^TqJ7cD>^OgMM1j6)MpsvI#giX=hJ3k>x3*oX$*vkJl@>&zeX=Dvmiz0x
z72~{R?a1hh?M$M!xw!g|Z4&8%Un)rX`EP1POe@kZ)?Px^p9=kAWc}=A%tIW2|9i53
z*>7k6uB%zlH%r3xp-}r|Z>bmIYikgHZfOYg@p=*I)g0)Y(<$v-TpDO<;z?>~2WzfH
zCJK2j6uZ|rE(^C~|G~jr9!?}?HHW)DlGHuT?C&16jg?WqKf2c<N+vNs7^Z`4wEI@8
z{H593(Fikb)Vnq6{XTKuRhtEA_HhnEkcM<QGA6;qjY~bSk&>SF<SgcjqZqQ^U*-8f
znaBVCi{63wUl(gb+4XF)-O^}@4#pO#>9exfjP1l)oGVHfc5S)3T<lR(hgT|lR3v&#
zwj1Nh7DP{kAQ-kaIQSELa{9&7_k<<V(Q0DkNOVxPNRfie2l-P`$luWJJ#L!ZjcqQj
zSS>;Zmrot13N&^_kH!dRDbmN`13?BS>4X(*BA}(vo!H!{8TixkIlnLCe`(`<RJL7S
z>1%+siI7_+a?kcVWOK1}@IiS1oumf6X^bA3Ezg@S&BTmKlW@-Z4UtptzNhrF<FM#J
z4D&#}C<{?Wrj5Jbp-gw#CFLUifBDo)RfhkJ=n+{H9cy7D3u%9)FhPgJ9|?{9ZE~(T
z-fFm*)|T&6Wh|up|3?ftzn*39Ykjrj5ecLYQ2=k(p48q!{Qtp_{}<?|>AUo+^!xQ+
zBPwWr<2YlHQID+P2aS7;7mPpJ?G<15H4+vt<^unuIfo2^aLC41gG9DYw6EzQVQ`6!
zkp)TU?F}eoG>$_V842_7<8$;PNU<|b6LX*p25~6E$xd=*+hdzVyy<5$J!E^}k~lf-
zG^NVYk4n-ASk6JJ-u95Ak+VO*sJj^sC#u?JKQWJ@ryc2RvoB2%zAwS1pL7Dt5_P7Z
z1?DmIL}fivAp0XkPEDq%Qwi=H!T1pARO*S!3RdOwWoND;O$w6D*Ff{g>AGqNmLV-_
z4ut$tRx*-C0^eyu!gHh`0=ob`rKn&^0<V>EG5gVEUWG$U7#?xGqWJzK>VvpbDkCc+
zwVb%OBylhOEHVd?K4BHIw#(FuCIUWk|DOpAzg6s7SOFfZZPc#O-qpQ`rgN+Qp)u9i
zV<2%Nb8i-Atv(CMiY;Sknpp^$a1cWA2|G_Q60_VBXdJbo^zZl2ESoNrL0rf%d#?13
zGrd{JXLt*2&T8}MEbD-iXdPsP`Iz$9>g3#8;GQ(*%|L{R5EPJ7yEZioDVuoMQS)Ht
zWI^%rs`xrWzAs3ur0BpLmE8+1jc{kHZn3zzG7ED(j$ednS_Vlk)KmOa5R+<zb1>pG
zvRzc-uY)Lp3*NXc5L-fZVM_zltWrU_D9a|<DNIaQ=)#;H3a2*sE$7u@w3_nDTABjY
zdA2R82!ZM3yQb*RLQenpW*0HY`FrX6^uF2^+EMuUzw*;zL`Q-g8lV?u!C++Ab^Af~
z<G3YPUm{{fmgjlKC?wII=m@kTdqtPsgptY^yF0AoUa9xXD|kU^KqNXmTRPl^BItL>
z=Hj}iZkGJc*b)V4N3ZBGNfc)>_<V{xX=`NHo$gj0x<E1n<sT>wX^bA5Ekgje0titA
zEeIbzKC$~9O21aM?;hFrs(TcaJEB9;_3WIsY;_{M&o-(OcK(@T%TH{*ng1!McSncF
z$(F^aJJ~`wTS@GA_*6OCN8Y92=j*>O8^etAjl*H#bE5W~7H0oo7vd8A)JDf;D}hZh
z;pmrY(NP$atVrJIXOyOdqhp0<P!>#C8leyAwrZ!%_D%atzW4p>(=eWpEk^F5EJDmz
zlFvfFLur>-$6bph#%1#rjGLmz_hSKlL>7IVHh0zxIi(Z-v4f*-5%o_nuTtu-jUJcn
z%SvIPxQ5)qQ8g}GAv;p4=D(<oj>#5LislQ$W>tjMH}@5Y@`}_@0b8S^v(@@5+)Tov
zq+3|H)&ENQ+=?^#pE7)HQLo$xvRI9L4@@Ke<mQ)lxpm+>vYSVLU%}iG9R<wU$<{b#
zl}eI`)vJ3B`=P`;c8h|S)Bgk63Wnbpdr2FtZP3nw4e+1!v3fN){$~wl%rI(=tBvOp
z`#}#d3$di5xWYWbJx!Cg`pgruP_5%>XsC)?Kre$vD}kP0kVW&dAiI%_J;E&wka0p#
z-eiPnmW?x3IMQWpTrBBb9u5clKjE0V74%#3dwDbFKmaW4{)9NQ|F2v=$9aJYZevv@
z`quyX=|-K4cI6d>Yv38ohok>{nO=vbiSTm^!M~)A>m?Qux7z>7OdOo$;X>$%`Gff)
z&I3pLv|~`8)R9@#BDt0R&pA5mr#>Jgw4!IfcR3g`38Q%A53V1H)KR;B=kisFc~}^T
zR7;Mh|LZOXATe+Izu@wLQdne(&b%h+|7)0Ww*H0QuJ?i6?>Kf%4{Q8CcpE%HE;h#O
zc!CV(vO@RZWJ_B&VzoT(#`IUV$(HDpthZ-7S&v{z(j-8;HcEHfsZ~Q1ytUEE*&eeg
z(ktMz3bSfk;-Z7OpDj`lg`$(Pb<0i@OyTTNWmU_kinurBxnE9J5blaj#E536>X<gw
zyB>OOq2{RcM_R%3@>$&Pki!lCVb{v;KBJN^9etw{fF7omS)BBl&4~IP%6xy@tI`I4
z>b{^d6z$RRXbY@rvS<rG`=RMkY{KN}pMHHq`;X-Lzg&%=#n*oyHkBD`_4oBgUDK|H
z{qGNP!Qlt%aW)#8<$83sF~@pzzS(fcP`Ms28=(wYeRNi~PW^nulHx%*QpwNT+C)OW
z^1KnJDX7|`GqZj>_7>+bIJUJ!_kUF=-%hTo9NQe7k*$+W(pVg{e7A#cnRmDx$zeZG
zx)+R2&(@R)nLQ$59_9y5t#bXTSAsX3Bhcl(tmd0;iB7|4W=H4RDPH<P;{w7)@n_xK
zRV%w$dU#qlr)JwtK4GlFP&s9+SLzB(`Qqk$si5mPA)1GNPSgEatm$mLP_pw`+4RDF
z<@2sNivKAMmGu9ajGf8uVSm&{YAdx1K>z<qAEQ?x0@#y?05ILCF=EEk4jaP%@UmmT
ztyGF_8LXSV>!u5u<;6_KmKK6iJOdXYzE6q=-*HJDm9<DVp#N`Owhq=aWzhHtBp<k>
z^~e(iN_$CTzv;4Z<t+_c1fpML(#Tkbf!kaL+jmNBR{!6)M6)~*-t0q{v_IniH9<4R
z^`PC3X#Eel9E_FzE%0o@;V!jw{oim&W8=ASL<s!)|2mTqk7YOz=?HRi8jWXN;sLSI
zAcMj5f7>OG0lG`-4En$C776zjk~8&Xmz}8$2f?I8<P3Vt<!r5N_BT@8hW=0S^*@~5
z$?*Fadq>l>(a`^&s&#-4cmT0LdO;4bP+y1Gz}M)Hb$kCUGlItD#$Co^##{fx<)8KA
z<UN&on47Z_T2E}*X^K4Z<>HT|31m#~s2u$yXy(P;bSoP3Xv=+D<r-<q)x*M^IyOfy
zrHY;XZOj}}4D;tzsf{_x(ycUg7OAEAgLe7_bA-$sA$qnfvl_}$mA#57p^64BMSnyF
z1iTei$L+7k;DKLvQURF5$eECT$;nm2GK!TM+%QOk&TF#xSddd3znV@Ho8!skL)=br
zp)pzaoUxJSn?n<m5Rq89@npiQAu&~)JQk=gnb`z$0^xS>G@zcQNKef%Gz-&x1gK3t
z*#FOEIN?X@m+OPI>$S<S1)AIA!aO~?00a*Bw=6{2e57p_QG&2aQ(bGvUpPw=Saa`J
z=$7r#`9e#S1@?3gQBIJnUZd=?Xh`BT)ffXU(UY^LUF}R?`W>>nT2l2#NxKf4sr0om
zdQ!F;v2-&gXhzaZn@Zn|$*zu68IShpJajcXmegLBD)b{ZGS;>IK9b$NT(yIT+v8jy
z&))6Pd4rHM%=tds`;<qH1iMoi{HExMLK&OIM6>aHh7v5@9h#kYLY>5V+;s}p+UT5Y
z<vuBUpX_k=R=DFjLk{+S)ssc?{}Y*Ut}#fzML$V<RGR@$z=`SWzk@}K@mk;^k;PCr
z+OqX?HgjW7AL*6DQlYNE4lP=QHe?rlP6iaNMD$>9KFqQpug4*F3a6nlH$|{vyL+cT
zI#D)apz09ZF(A4KjTn|GV==gwlwhX9uQB5(EZ<nhudJ+^EZ^cW>JAZ!7G`TPVB?$4
z<DI5Ctgp_wSdPO{Co6L_7%j+_rB=@;sRiU3gM?RGS?6u#^S)Qe{}gof(fn*hJ~I$3
zs|;SprDPM3`gzqY<O}q{6a`f%x-e^DD2}!i(n!9~luOHZOD~+<k3Uxswnb0DjLOcx
zsz3y==DBk%!7d;cu)Cc9>@x8ZbKf7RVCM9HKkZzm7iv%G-_{@3&NVcn)VRQS7)e3D
z`S}lxKo)jj&St2Y#3HGikzx{?g<Tz&@2eK4S!jGSSnIlPgpF^9d5rtcrzk|s$<C3+
z)AsNT)@0_$EUX*t6hr2eEP9Y?C!9$@lltD%)HCKJdH$C%V>{x1?bp59b=o}k6IS*w
zP5fZAJlhjNjYz@`Q22R}3<|paZW(BK>X^rry=zyr47+A_DkKMOeZNBvH&%bPOP;xx
zzo}rajV{ZUL`zwB@RPAxrXThD1@fF-pjzhbj4nktvvay0Upyh`3n3V)h$dP<*6;le
z*<WYp{NXN%eAZh^FC)<<*-{oZX6ZN#(|3-Vx}Y4|&Fd7TZPC(y;W+dmcDxc9iXVqI
zm&2cu*VmHM70gx95)p4V3lg_GI1*G@i8x8@J8yncKI_#u|5Gq@n9;@P++cla7Mg*@
z;f%3v`J&1A1>f{9<WOJs6Qw!){O_%w%n<S8Ed3#z{qu}7j0gXv)&I>y|BsD87SULo
zqkQ-Kv-^|ZhKDv!%;s^MsAKMr-4v@<b6gfQo0Gw=ImCSkmvl*$IX??SH+#*qIa8kh
z$p6t{9Hak0KUw=B;(ye$7ysQ;xh}f89|8^MVPkd3|FJgE49_U<Dt`lF-8CcHo{@GX
z=iN)hKDMN?>srSQAin4t9uzD?V9K<5^N_U$;qkagz+9dDzwx{>zH654dKF6Fnm{<O
zp%LM^`G0$&tFVV>=OW-lxWh!p!Ly8A_?b*IGWGcDl?Ff%Qi&F1CkWvZB6~TzWLE9(
z?b-2(qz&d&D2-@}uFO_6#+#sMG9+&0B0J}ek0sXeS1MS2Q8=w3@MsoCbkZXY$hw{1
z*p+=|N*se#Ia7UfdA72K)DTC&lcF35{PaeFYU-$5r8}obEAS$-lcPIG^SL<7Hp~yZ
z=;nR0r-eUM(DU>EoA}?^?{*YFIgj8}g3}02Cpd%POoFor&L%jA;E4q15}ZfyB!VXs
zoKJ88!BYq>B$!XIfM6lPMFfio786`du!LYK!6gKj5?n^Gj9@vz3WCcCt{}LQU?ss-
z9Ga`mH3ZiZTt{#{!BYutAh?m>CW5CCtRlFXppW1dg4G0T1oWG=0@j)J1OozYHMa@a
zV1@(?nPCAN&Fusu1e*vp6Ko;aO0bRK4ub6jcM{x1@N|N^3GN|y2Ej84b`bm)!LtaS
zP4FCo=Mp?mzzfU^30@@NUh`stmk_*^;AI5&$@706GdAm=>KB0jzge5Z9$@o&UJ<*a
zJn6iq&(Pf;>3LAWKwyb@MT;XmiGjDUromiob5Z8H&v?%7jPeZgy)#)&rXTboF?tD-
zX$m#KqD1tV)%MrdE)=4NvR%Jgp=_Js=ti!R%aFw=9XF3lD@<3*+GTiib9LIKviX;k
z&wjU#|0x)oqZ{OKJF|`HD3y_w1dh$cwfjV7wIvJgS)-t>i=N6)!VK}Z(y^8z&(4Y#
zgdmmpQa+Xs6grIJ^Zw*fF!`hFxjf~BZ2AY6=_Uvk5|o?e)7BTC<tJX*u9vG7Jlmq{
zxR5GCSo-uH6$H2&a8p|%=<sUgLg_8S-m!S_C+hLuF+92!?`?v<A)9`Q=~&OFX*;x4
zHJGN}@s$vZA=FArC~7%xd;VfDEG$fyEVz4tG8+8+AIWZD_<fAMtuf83&Cx0}zqV7`
z3tNDnYA<OY=(;{pFV?ppKG0qIv-$^!05a8BYwSkM;2Vtljdy$AEB=SypjZzX{DsIs
z#l{(kY(VUl)8;&~k8qIwnPtM%!(7dsXi5>VmSRFw3$qtfod)JQVVz;FUIfSWNVuK8
zz2)c}{REtTDYJFG2*zM#H_SDJY%$!Bw)y>y6zQo(bk1h8FgFsqloe*4O6U>+Kg24m
z5*8xnYMy)s0rCB9WNK&n#^vZs(KrN<5I#vQjR<GwlToz2a?XhgHVa!M+s)cM&HkQv
zZi9FMro#?vZpzEiHvqlc8NXK8OPT(nc0W(;+6;bTRUi=)t5#U_m~}k8CQmTrZ4D#;
zpJ+xv1nIyngiU++dIS~l*TXoPM~;Epkxzc7Uf3g<TZ^#J5IdkjXb$0$g!pXm`pj)>
z@R{3$4UgHd3X(n~@quM!(2q^MGK2_|sISu3(1<k6W=KSZF+=zooSF*54UN7~J5u@~
z79rxaVIhk)g$Ly5!*sJTKOn6B%w2L;HRfaTAS@fYC=C0|b46@$v$3FM3xX}lYda?9
z=qvE-A|Bb9`>t`$sseTvT;GY0Tz(#r)t)2YPU9jTKpl~(L=Y2-sCx!K|NC<L|G3dd
zkL$VGL)sel6}!~Q17K6Mt{<z=PH^VqSNS6kU*ELFkL-B?!}>v+Fz45NPcB{b8bT#H
z<nIhdks5n@rVwKo!`47+IFe^O1#BnAoDZ)Th=U)f?vJaY{(fw+HUgWogIFSg&Pe<-
z=Wn92jI>E0TEm@IGvpjhKVy_tzdH5vmhFNRDS7vgUno0xAd0-zS>jT*Gi7^gz2a~3
z?EKw*3a+~7maM6P)V(luYh3&bVFZM8^CbmSL)6Dr@KdrmHPiOCwB2srhSSRrt~-(c
zDfl`((akughh`GXr@ynFHqD-P)paF|k96_ik5#t}f3zxVYA9vHUv2%gIw*XP%67dn
zPwBU$|7SDfbi<?n80-I8Hd{N1?azE-Z;T?<EOr6sWwUDK>dIBsa^o|sAI2YbfOi?B
z=5)tRpkqvwXYnn~6zSJmXI|#*nBUH@4QJk^#~X?Eszx`k1LC=U`wJg3hutHKR`ztL
zBnNJ$<G^i-BFnOrvN|LnEr%mT!xnf0ucQ=kM%oqao(YeN?Q-UPl}3l#+%~@1<m1K9
zKh8Gj41APBb$J<%&<w|G{@r^x;*z^AI>*=87(~VZE(gvFS2z2cr{GZZ`x-3Q%cIEU
zo39Oao`j+;hA8tNmQ}y|(HzIoYlsH;?l#R?vS>Zd@@%LK8_I(nm>_(TO7p(BQCWMi
zsH?{W>a7>L#h8J3$wb+(Oa9p+-sn{QL8T3x{y&^u!Ppb*3T>QLt#xW|=p$h9zfXVC
z=nYGtbB)I{?*;$<yN=Ees}TRR$=3|cb~C~o@x&p>W+mKi2G8D<({Yl$TYKtLH6WO{
zfk7M84PHOEx)4aMx*+n0dnbF_>I0D=kE7%rAMrOLfRtaP{24sTF@#oX<+VsL)6`O3
z@AY|`A^+u6-r!uvJe;Y|2D}IsSHl@T@z_}B5CqC|P2NDW7i$BlfxPutA0p(bsAICD
zZY;HmAi~!1=yDu+#2cgl|AX@!!|^JQBg7RSQXkOEj7)>Qj!yq+kAg7XilE4F9ujSy
z?&va<`Xoi+YYexESXzT8IGVvI&mnmzF%I3iVh11Z9PCYb8gs6>1y-b%xgwf9%_aKA
zfS;#^K?^{Jw@S&y;PGzJN5V~hZ*>^66*HwSh;$T^9T+^r<)|TZg%_!iY7wSQH2Va3
z{zn*#7#A7C_3!Ajw0pHh?4^JIs!r5c6-7$p71}sw4q{QnSBp>(;Se%-H5n<N`aXO4
z8bLnX_|+X5_Hm>bZ_At(+kzplGF%<NCIHDwbD&OUsAx>Twqx^3f%(d#)p)X@C^C!#
zpYtxB(g%<um;r_GU-$3yHI3%)!E8*w#`a6%a0$AqY}&h{EjTxNWwyk&_E3(ccdXzN
zD}$U_l}=-3qvI|1ZKFtbc#x|2tBWG<`1VX9wA2olfN}NJ@SMMr(QZ^Oobk9IgO}X+
z&s|DScSd=(aYLVvL*9X+NkzqZ@=!Q{B)Ne)<lPQKKp?r`MyESfkG(0odDLGN<PA}z
z8P8%KEp9=`LgYF?IOICYm)4kmt)=cMnnwo|eA}bQFup4j@0;4!#bId6A(-N<e}SI_
z1C4f9H|JeYKJTm}_@9DP^8d*Hb+s`<|CwH=eWe}Lra%MmFJ%A=#E`(KDHGS0+Jll7
zE@Ub9@hw%Z1NBNMEHsx(t~^?e3f>q+deL@$hTBzVC;qULiLi5SqS^S5mzBZV7DbZL
zmP}Ir)b1^V*cc+)N`G~P;%PRfU21B(l2%zS1)DFro7<vg5QwK@;~Hm(hopR{(fX-v
z9rfs|S_OwcdOA0j$RMal#ZlsKM*^UxW)itKrhabUkyytnue3IbY@t4VnA>HX5Q!yZ
zW5*_Th`)cT^k97yNkXf2F2QlNK~y$}Wy<o##DDd8-*d}v<9|xsd!jrWXm7#pxT@Sb
zd%fcuBmN-549l#M*z=NeJ@wwCBTk|nVS>_tswk3y1~MnOv+na&387V7*eJuWEV=O?
zs}u~J{_m?#Wr*@!1AqUg^#3;UjLk-;@qFUE{sw+C0?84`;A0N%9AbBW-ZEcJyBFI=
zouufEUuE!r?|ue3nY@+ZmY~?ZjNiCH(^8FNo^NyVnY(k1DtiWS5f>bYrj-Q{xkS(d
z#v6`YrseDH(x+!Fv;q8hGJcjJdO`vR_n=PXNHbn?<b#q}5IsT=3_MwCcN_`h)ePYs
z5~wPw{ldPxB$52b_+g&m>uC^{``Wj_C|Y#r9=`s)>~4nN=h=svj`-j6wKZCUb{;GN
z9zq6y&-5eo(fTZXiSF0W)o*}|@Fo2NL<Kn-`$QSy0GwsqXgp~AHaSDS_Wz^?$d=AA
zw@VF>4cTQzq;^d?vdq&->7tONX0ucVW!SdOcBxZK`HG-o&LmWb9xWobOaC*oLn`vp
zX#jJN&~RoT#?2PORRL8nyz~&}fP%+=OE~YFj^wS`BtrI^jnL)Ea9QSgG)U<@j@foZ
z4x~T$a^jTSNxCOaV?wngx_6dTFs6_g=5DGqosltHWfL!038ocU1VNIE)StpMUsQOZ
z)Dd2=66~$a)63B%TmsFDq?&VYK4lRF6EV|gUM5FmZy}ZdG<i^$`Vg}mH}=cs?Oo)r
zZRchl;^G0S1BUV<F$^N_<Exj@S4$v4Sp}`9xOj!^$=*@~4L~{<)PPLW2$zlTUn+d_
z&Am&Zo%I$Wvm95_LR%~EUM{<_w;~ci6hv^8%fX9mgL)A=4j$eoXT{#-AO?|izBnkO
z|Hq|faxd@l(g5=0!AX_(C_jj5>SdEIrq=WCl!q}&qQa;MvS99ATaW!V%%9<H<w2j2
z0Xn>;N_;6Mo7|ZXMP>+_ptrKUp|L(3lF09t^nW4u|DUKou5Zwu(5f^InE(o1uj37|
zzCsz0!49ZCfCQSSB1d|_Z@^oz`$M;x&lQf${H7SPqCs5XT)PbT!4;tpLK!KaWc^F;
zc*I%ZxFLp=#eRL1Yx=Q!86{WL{3oUp0e6c+Ue(2rp*RapSylb2y5Q~IyonkSt>f?*
z&r>{DU*WbVE>y=Z)XT+}UPAnfYG|`HmLr%!w+tHBcXQSCVqZc`pk84Y-?EAZdbl#s
zRWTzgN|~>u#D3Oj`Ox4^uu3@!hOIHA9|mvhwmWG%b)$NPo#}mzy7QQVtTv_zzRWE$
z<)mp${mc&BGlO1|YM;c<|NiWLhTqS$X|VcvR_~9q{!&Q)nUN3aKW_d1^2bpkFDXyh
z+En}Vid!Jo$CTnP7)M$}1U()4qN`^GQN<t5w-B>Kf0HTKA18Sw;?huSSZc2l=<^$K
zA=uss%>_U6hQ3po(=pD8R7+O0teY@~7dujm)o>19P`%#q1>q26xe!oSZxcM`(6=1r
z{nkN&^`#6~%o9fk5xoXPu4vLP9c9?o$1AwO3EGk`sN95_W9ZwN+<=q)sSpPyw0a2(
zQ0~CKoZEtmCVZHIUQSkm6SNUFOgv*sBDmYo7c$Vx$tPDrX%rM%MZq)-eLs`iZpvff
zU<+49a;l`czG-`lOrSCJcbVLPk`*KZbtPuQS|4O6&|}G7e~^JgveW@WqBbA}WkY|T
z$@$9q3?@C-&F~d~XqUpoOD2XF<NaEHV;|ywZekFi^w;+qS84|k|Knj?_;>tN#|H9U
zj2n-R8f>dAuBfeTf}Sl@H<`CEFO|YeCHV5rDkz`3b3Xq|Y?e~W)DSy@3j(LP#$rR*
z*${iv@41ifnTs1=`9mtc>eztndX-9Z?oIi)Xz@c5%dam=#nQoIJlnA;lA*X8J^qfJ
zD9B9Y<)l9yC)@Diw^G~C5JU3aDs2`{AqV@0Vq_iUwrX7Q>GKvx0#F4Sb{E-?_KS2U
z8O^44$9SIO{+Ud=?dr~R;2RwHiQs?Lh{JHfJ*v@7hZf^`jt6E^H`q78iL-I!d6qsp
zgg0X8=<vgdF(=<LEIfWF<Hr|6mg!1ug7fgFE*~THqwYI#2ggx*_~DN@lGl>{pU#Z)
zjDh-XdcO8+Z8bZ@&S%qQ8`8_l81l0eX~UdbRf$b16z~}Yk9qq~19>}2-ni~{$9DK)
zL%CNM7k0aw>?zz`3a@wKZ~ns3EpB|RH8Heuqo|Dy;ly|bVRz~P<|&+-!nx(nc(8o-
z?@#1^2|V-)JM<XOl-ge}a^0PbJX}T&Z^GOCWOrXYFVPIy-Rc<9re?GI^8F*pU5Xu}
z`{S&Tu&2kMcC$DVOCW|ksVzd~<L<?!@#|?E{Pe;pvPZAZO6`#^c64@=B!#cvYyC8_
zQE1`NpWdlBnqnde>KxZ^&R!N^FCv&RQSdK|Pk*I5|A!pK*4UAlFq+u;+zq3HkikLt
zaAKP<>B3?5`_%68t>$p{U54K`v}3g8u=;--_WrBD0lZ`kG?p1>|8GYFa3t23!-9>|
zQ<c78t27iVL}s;+7y4~!U_J6~N2>^%XGPitK^2a?+>r{kc`g#zQthjgrv4-MIFium
zPlA&4F85crV5=0$&ynXi+S}MYTtnt@oQ@lLVHPc3<OkOPt3RQOA9=}&oQ~t{`4Ahd
zf!bQcQG@xF59|lT>eX=Bmc(TtY*GXlGV;nS-q@l*Q*}7$EHv_ZXR9Zh)<oKQI!@^Y
zuoiiX<lDP9i+2EqiaH>zwMNFXcn3uxn2&WEQjWYoi`iBz{1b#5z{tIhAqdjDTnv^0
z39f{Z%E+so{r_#A4EhkQv^gxquVt`{5cB3NY5&vAjCSPz*r%VM-KSNsS6OrVx&QCG
zvL%MxQGR`rvv7kbhr9~J1HhpKIjl4f=u|GSPaB1}rtFzfs%E<>Hkuo6WH1~_Aj#j-
zgc%KHxVb(I<FIAiE{hM2+39p=_dU1s1FG!l)dLc{DV_W^F>gOsmq|#JzzQ$C$dp1D
zbTyHeP^Wr@{ZXpz%bq!@SwRzwjp9c;C(Ir6(%opdvOeN1=c43VOgh=IN}H?f*?Kva
zPmljxLANzFlApU7Of3@V_}k)hTZ|_8m~`4)WPiPeUR>U#3bHM+5iVzk5JEtRhmBBn
zOS!<_kixvOXQrr56KBMRi}QAI&m)-cMZ_>zNAjZv^7V+f0)~>6{$MT5kxaMQYl&`7
z3Mt*}Fk(F4VlRDZ&rPVrjD+|e{1vh;z<U(Pz2kWx^BvN*ptFZBum={>tIhA`@MyyF
z^ZzJT#9;CB8qWVY+E#6!_AKK6kAzoPJ1YWD@GjeJ9BY&qml;nv>;aA&A2&5y8VWb(
z<zq^egc~6^YVvaamyg|`_Z>It?&k{Yd0=LYd_s1?^}XWZ-;Xl#?T@WW*hSX&I@$3Q
z68G~Kw*;^Pq1h28I%_I(K{wzzUU#qgUZc>l?sk8KUF|5aK_&P?9=ERN2aAZt$m?X^
zaZCqR8H6?oUlt;eKHtvJZp-)bq{62J0pQUGsm<+k!5Cw)Q@iDh7<A2KV?*Yz<c*&-
zZI+l<gMQ`W%aws@`Q?YE7@K;iIkyI!VKwBi?Sr0n)bMw|`#CeG&z?4CDt@NV5wH9@
zM@#DNXA1m~L|~S2(O{jlxf;~vC>cyX*3w)JLqX(kD+z~%W_-|FJ$EOWscX<LoW;W3
zNT6?lqawTj1;>z&?BCw;Jmc4tW&TiIbG;nJcO4124E2c7dB@S9A^9XvUvBja8uY5<
z|0gk6{G6mes#j|tY3=L_I0Q^eTkEwkq=*XWJcLgVht8TXGBY)$oB?T<*xx>(6JTOD
z2S$6+=Ga7T(#7Q-Js^Ubquv*(>plQdKeH#kq;0R@8D;l9BgWG|X}XL3zY-$j5Z+lk
zG_#OZmkZ^47_R1g)XmO}x7pd3y(=k&1*?=6L}KGP-<%<Qdg4sQsRoh#A|Dcu!bqkB
zM-ZWQxWV3dp1QsAyJ<*~%heUqe3;_|cHkxQK8rpQQimJt3mWTZW_(9Mx;cituC89E
zILp2HerY&lcBX!2hZ3ilSJnPSVo2obs$cS?g!Vmol+t??XKdOHc2L?hmOXXoHKku0
zW60%NrE^!<9;RuTKN8@E!4i}86MLUXl&9CfuT)<hLn>F0k`P4nP<_P~Y^&UIsM#+R
zTxO?wWi5@|Gjsl-VBzQg2zD>S@5}6S&4mB|samUcv39%mwDyi}=*Q~w^a{NmzW)dG
zJM~xeFO8A#3i2D@G7cJd7*84RrR@`6{{?AJ;z*vG*9xzG(C-eD_(o~=(aCdEb`!-v
zpo>K<FpmI(D_+(Q=jP~P-Rvw5M6mYO!r7e1vBbROS@mGLJboD_E3CfZ<6Vzkq8i?H
z5lNHXE4{8e7YBV<MPO1ZTN+@$B5J)=+8lK%^s0FkwcBA~n>Udy2ky(-xUqSOZ>MBe
z?v(Z=ovE9kc?(qv%j5b$3$pWIK|^=PTPhm!BYG@#v6<ha#}c#EJ3hZU3^z(T?#<h2
zxDxk8UDr#SoKEalJj+g#*WWJNb{E}HC#HEF4TZwknct;Wah>^=b}x~P<~=f6K~Ds)
zd5~J~wA^oy4*HpQZ}Vp9WKZ7``?1^*!4m|67(m$H%iL1tZS=Zn)5Z&`2O%Q&%=@Ip
zTBjY?WqyZ7M&<s@Yoz5>CyzRec`C;D4#Hx?QJGguvn9c8RWyT|K^tr2=-)35&%`Yd
zxy@c^q9rHzK==87xpA0&nLbl{Sla~u|BG$T|IM+PF86WerGaa=zC?EE<}>A?xM8}o
z8--%Xceh=i)AN>UZ_Z?I<-{I+g-DG#>L$A(hU|CP!+YLjQ}&9Kon!a$!hE~znW?Iu
zPIYXW%Pl-@!K5vr)4u<*7_?{RsdhG@7*gB08Z`TTgKtCW+X=gcL@Q4ZU#q;OQ)7Ak
z*e3nBp5Kyn?ph}@JL|hb#9#Jwp?a!DV!1Al^2E-g?o6EyH`xC3i7r~cSm{wm-x$yD
zYU(Ro^hwZz88-tL8wR^QA-S4-q0*SGG30!8C2g@gTkH-TcHUR7%E>eHPYN=A{vW{}
zWZEe(IC@aqrQM3GUwx7DE399wKLZWGDMr}1)_CUYKh*yP49jv5u))@@Aj$FwyGU*m
zSs3Kblj94fh-@E%{#z3c=6YvH#_IzY>{EaTi}6Q<4=3M`2mLMsvrdu^NVt;^fnGp*
zaEZ`4xpT7d5uDdB9TDQ*LEm*Wa8Ewa;tNvZzCkba%)l1;+i^&Vp4`+kZ(W1~ubsze
zt>bn`;%FOmThDDO+5sJhOsF{Mc^6-A?{;DubaT&NUyL|D2z@R3aIdrSpnHTC`x|`C
z5vVUV@H2EN_en&5${`!yB<lEi&!e^&(qd`5JLmyNb9)OyZdx3W!{wZyy!-n+HMdAa
zFHD05JvGT#-@_Cy4Y$eu-;hBnMYD04AD*=Ze!N6k{hd0N-2m3a7vHS_KR^VqIa&z2
zz%L;I+@oKwKV=w3fpMns(7&)gogV4E-BHU@339sG2OH>WP@2BH1ep~M)wPI;I^?&A
zS6)?`({Yr;sH8s6U-C-MHbaES|HpxZ?gvqwcp*cNMr{G-VN0!SO}J*880jGo<FN+k
z$6y@>3$>Oe5Mg<X{K015lr?;E<-n?{cZ;)t$NCs=Y+=|3@dg(fiKkD)(_4-=mO6AC
z@s`j(NCyr>K(^lNo$b=NA!N5zB+sXv*8+uJP$-6KAe0JtkyDam>;t!O?feZn9djH}
zq9U+1&1kHsh__ls+^=l&g%ItLW3qe!!Y|>mS|;j0W-DX*zR^aJL-j2o9)V%#e=~O2
z_0Ez_3I}ES(d%2CrHW+r?p+7TDR>j1Fy@`qzCb67oabZmxzZ4{XS|1t{0%|{${*K{
z!Q+L_?=<;1(jz8jVLoPtn1A{}ERi2L1_4i)>Z8$OWCM|!DM&?%2oK;zCF7y}9W{K{
z4gOVNNJ27oIwFIG+eGI-k@WuvW~@g3?{DizYqw|x>>YMGgaV9hj3LQh#xOrT%oxN{
zLUfHlE6ESbw=d)rM@Dn6n%K#l(8*wrgXPcr3Slmcc}u~oH@EmOr+CxNAE$l}nBx)F
zX#xLJNSuu^q|eLT3kw=pEhTXVhK=XFK*X{ZN6RIDY@QH{_RK=?cbLk4rE_GbxBR!H
z)TX_pbfYddm%9UVGshm}K^%|50orhd^?wzyx5}Pgq$W6v#E|mNl{C#srqJndgMHG6
zII+2BE8W`|L&iH-(zFx-O{et}`_p)$@Ynp8QvKH0Y?nl}9S0BAU6{04*?RVRLgG35
zIt5wBxY#VP6BG1s&+J6@lBMj0QS8!nG%hQoxluBbJ*WS_iT{m3$nuBcCtpEuKfx%$
z7{NHf0|IuM2MJzD@G62=6Z{UrYY1LT@Vf-BBX~W*8wh@n;Ee=tB6u^wTL^xi;H?C2
zBX~Q(I|$xM@GgQsAb2;ydkEf3@IHb+B={qO_Y-_Tz#p4G5%59trvi4FKO^`M!G{Sx
zLh$DVA0_x0!N&<cLGVd}PZ4~Y;4=iDCHNe{=Lx<*@I`{ZAovo&UlM$o;I9b2Lhx0B
zuMzw;!Pg1?hTt0n-z4}J!M6$imf$-C-zE4vg6|RhJ;C=0en9XK1V1Erh~OUyenjwN
zf}arlQ-A#f8UOPtBcDx0p6|ZeU0Nl3pIu<TAlAkf_G6{mC~RyFCgBtot=eaF|F`VY
zir<QJ^t`^#vFkR(ig}2L<DAd8?)nh1hX)UzA?ScE%ZG}<E{><<i{m58mRuhz;`@IF
z<z=#VIPV0S0tmIrt?4C>v`g%PS4Aq4k}t;hS5R$;EppuvZhio+S|YK0Sn<O<WJkOY
zD7CMSA=T%GOz|#~9YNL|L1>#@iT}1eC88OYd@=H3rQYo^Wb<sxWO|>hml95LFCb29
zEFl?qm;Lqd4~4Z<$rs*p6`X-sJ~v~^K++^}!Z#k4S+!h@lh9mrrC;0qpqOYSUrgGn
z;KFoXXFsL?XIIz9PU*+WwBwxpQ;TX45236j(pcYaSpGjk9LY;AoBy#RX}LMJfRmP)
zq|+9XI}bk4;NwVh^`Q0Ba^FHRokHh6tqcpN|NF3A-2Q)n9@VF7KZgDPd${oR|J28j
zEzsqXgh;o#y|yI?<1#5qGP}|)vCo+%7tKUn>18lh#zo{A4A_zrZ5d3xpbLX7$g=i`
zbk;MwY%a2EE}bON<-VeztBxTxU?5X`tR%Wcz6MwiPsUmjet~9}a$(2cMV8u<FD9R$
zU}=sm<$g~YEC`ZVxYBQl(B4U}IoM;#J;&h&d%3fjI;R>g_+rQiSeJ=wOQKzjICIcY
zCSr|urGB3D;lmQg2$chAjg|69So599=Om7D*s=<lWDw%rGO?cu-rB_WV1I{Q9Q?gR
zJV8x|(-K4eKOlB<2qD=Hy2rJErNG<nMRHTAe#bs&e`ohCOC;Wjrzr2THMZDwhbvnG
zh<xHlG&clP;Mua^mPjX|!yWe8Cud5;v(x}<oc<rpf($mlpJ=_bsnGtPqg|u@m-Z$i
ze+<%3LXh!VeV2ZT{(VFTdsY9$=*6x##v3b*24fEk8vBe}*x9Vhc*IQv5UJ{=3GOZQ
z@h}FBGd!!MuC{AY0LuUcS-T{x_&v*|(zC132gwKjLIW(`wum#+vsh|R@oWSk71lzm
zDFqvzBB?)CgaqbKq}DoRb2NV{)x2H#6THi~b`*%<WP6ggU;?%q4D_ln7ix*N4xW$$
zYY5ZstEqF_d?#7ya!6Yc6`t3JfYH1<erk%`AEMHMQghptAK)<@pbA8GiE3eqXnrn3
zN_27iNnyj=fVM$-FC82_lW6GpZHi8f$4h)9p7$Il<3@Brq+IGPLiRf`PyUv8%3)J@
zN-D>@@<WiELQ)m*P4F&<p&DOhtB?XiHtoYi-3ZJZ4uu=!3pqj#a94hFbD$Z)uLQzB
z&_#sNfGv@<clKyfzuje_ddx@YRTm&a2G_1b`Y9uLK;H8i;S=&je~4<CNt3DoMwG&o
zUy2qzbL9K)Du6y@=Qj8y%8>iNPqYNS3pKUUBFD2phI;8jxIp9*nG69j@*j-#R#y8W
zh_fkP(Fl6)g%Q|@LNE&(Ea3!Q5P_j5q{=WhlvJF@pqE*Qy@6YGN{3-l$uJpQrJEQt
zAEqHFY=;pujnx+^t0Z|YJS}zjU5orOiJ^$zAV&AM(kcXNps6w3<l}T}i9dp1|KjdH
z6L*Co4AEKe4q$8{hspdvp8sbvSo2IqZV$h9NZZLi!<zmN{)A%4*w>WFnmxJOWBP0p
zCM*<IUi7ic?kd}VZhzY4PgizZ_<62|e5O|>^S>lYv73t}3x9b;oZ_dAh|(f)XS~f~
z_b;a{f3?zxaBLNqvT;W<2YFty3Gnep$j%z?>QD_oZYYjVm+j^C?axSz$E%k0t+7h?
zhYYliP0*Gi#H`mVZKb7M6WA^LJK9w(8_VYmeS`lgU9F8FQQ)>rUJ;hAaxt~lbhJwd
zt}R#Cna>lQH))cBXhRIS0p0SD*cot6(*#O>h&)7;&sf#1GZ;fwK$lb`-{C78U}j@6
z*hEj#F0#w356RaxZjI8JEwKtgXt^VTKnx%lwmecf>0|xO_IA*m$o*JB!q5Lc`go>~
z*Q@nw^;eC<Vd=le`0;;m`G14z|9}y2RFDa(qzwV`^7x6j4U}-C9lTSw<AZjVqk1d(
zC^v5Q7J}3eDzdd<zRii_OS{q0x5V-^Khp}r9PRS3G=bIpj^-T7bBkfU=?_U{H#zFj
zl!u6f6G^4`2BMwg=wo1g5<$ZXf=C=x=@-<b*5v2_qdY}ADV|6uh?w;P<z{CMuk~qA
z3l#Sm*^?WE8M#-)4HT7JC(r*DW}J`szu(vAXwPeY`2V+jty8i&cA9I>mG7A_H%X{Y
zm%;pAZrKhu*lm5Bc%9bRCfDa5+^fSd?=201x^3a=USE*TKc_qFfun9MpS$!4{-<oR
z^)X}%bSdeua2(RB$LvbG#J>0N2qJCNc+NGk4MOzb=FosfI_PTyKN2DSQMtf=z2#FP
zUgju0+8#q%K$p@&{-T7_30P!U-vs1hGsS6`e!X^Sn7TGt!5NMrL7-cL2{?<nvt9{5
z6Y>6%b0+Qb_Hl<vjJa1S80%w573lK4twL}e(1tuKSY2X<s+ZWgCtpDWs@hbx#MZhN
zJQQ<hPDFtOC&-yT@t^FU)1CT;izVLU!%7$V`9F{c`<Tue*!ApnZGg5!`<C`oJx4!9
zZ->SIA!7u%{fmr86FY+ANnoYnY~T26jy7h>qtb;7M7`+MSB^(O>SN06^%OW7=%hZk
z9Px*UqW-(f&T-@JW`0`1<iRH_DLnICwo)YupLaANOl>7Fwbbzhkdn{mBjf4o9CIu6
zVZpOtc7m@((_6sBKsE+GSJcwmWv5q%;9FM*`^AvAw6s*bn)e(J%vAi=M*{-sP?vKd
z`J{Mkn#<8z4V%CQFigeBhYfa3Je%tnyf?M6YkdJk-Nf*YccdY#4=C))i>`(Q*>CIW
z#dcB7C5Qsu3^z|g3xYSm-Dp9BKo%yRJlxfjcof2OJSYF*Pnw6M{m(RJTmb(6C;Ce5
zQLPr1!28*>#ClhtFNOqwF2%o!@I?{ERBRG<^Ce%5P&H_gSgkl++#F(j%S}#_?wKi0
zm-OrGmiH6XfhrVOA44j@Dt)vYe!Qru+Sf?CeDeRz_fm&O-=OTWn_@NGbs~czCpn`k
zFdw$TE>*mrF6*ZaQ%T`)<f%&i9erZe5NPz*E8Mi+M$V}SFMF16F8eK!1|wCE^12vu
z1me(i(~@*yR=Rwv`OSp-@Drui4KbgP8@a)>q@|$|Iu^0y_{k|p*Y0ZF2_ifgbjY0w
zz74U>?xhQ1FHdPI(Nrcs6#uhIp2Va6sMOvRL&iU-bKLZ%#E0ZDBCrGOS}VKF`OGed
z8+$H2gGd}zRmIQ${@PRq$^T~UyV`Sz{Zp)eOTSzH&=_NEfY1M9%KHC*{G+46cX9z2
zBkD6n`Scv-oY~3xfFC?zqu-CjVK8+Rb97Nl!xlbyJjXiv;9Dwap>#8!xFC6yrT(O|
z(R>nt&9t((GMImIaVpzXAr{A*E>2}A5W)9SW|RMRL1=OLcY<T2K<S?8E+`HeAq)x@
zPGL*=`5zsl^H_!_91JAX6_8en1a6*_9Yq4k2h+?-%%8h?su_}wq97tEkbc^e@1l`*
zd!6|<U;o3j-V8DS+qBD&@%s_&51{=|(0Xgr^|^YP9?{RzJE8k~TmRfR(wJf_F=`+m
zJZRi!JZHTBf6Zn<$~wOK*487)3a2XIClCa+6hwaKq}z_CQif~qa`>uPv*pr3xvNM7
zh^mA-u0i+;CwzZAqez*P@&&ORK9Xs{yOLCe`8!hA@qEYR#sCiv1pXkpaV)9pQp5z_
z@r7aRLZKFajgVV-<`T-3ZwZvIQ)``=NAp*trYa8X*s+6<vcxs(W+&s(cNIer=)9ki
z60Ep;&mv8ox-ZF0+jb|K<#m{UqQP<8UP$4Wx`mLM(RQ04{hi%bApLl|5Ol?6xzqUC
zEa}9Z^kqvG+AmFNNWyHR%#Ya5Qpq};wB8B#r9@C1kJ){LJ2gr32Qef2kXF&6-xk+J
z{=dF#95XIAMq`!F*Pha<p#M7qm#jalV@TTP((0`H&2}aJ+w!_JKl<Xh?ohfE>Z2(Z
zc1`qDaw#vIC`7W~<cc)A9B%A>a<n9R#;W9aT`c69L``3!smq!VWBZ<OOH32*SBSbm
z42hCmTDaNFxUTeTr!6~1;yPY+o({*5{MW5~jF`YwZm=uC8>U<?Zd@%fj#SfAAx7~w
zsYi7~v}QIZ$ZTz}$xn8D-nq&MZ;BxcuuIk|#V8@gM4{=g?Xr(k1}gQ3V<IWAD>bc*
z$)xJoyKFD7>ocHyZq*9@r(oO~s~2;|E%&>mrN-9;Q&pmm1m~N2jompU!S&kN{~XEk
z86^JSXK%B7ZIHGUxqp77eXNhstB?`wN&O$j1fv%5f$XDyIeJ_rsT@Qb3`e%W@<3XS
zcviWfanh{&%x7Ia#WS3g!3dH9czE*Mv=7H5B0ur`Y+_R!<OWl_HxbdF%$SzCAcA3>
zBV%OqgS-sRZDcf3?1Bi!v)%e8&lnfPY`S%<`7;;%L8|K5e9lovm3+ZYhIZx?E@*X(
z#M&?d+Hp%n*j<V@aEgm|@}Lsq;ffcQ^i7G|N4h<*J+mEsYm;3A7SW=9E{4HLGh{la
zGqWI4lrg_{F(s_RA@f}q(#qv9sA>jzyDS`$c1;s>BsCepRv7TH{EYoZJ4#!P2*AJ4
z*Xo1ySJ?{IsdpO38yk%avycPydD2-knI4xE`r_t5OVgBcAMz_yV;xG-^2q;!UBXL_
z`7F}wS?RA1BLfi3pA+_wBhO&Wm@>`q+q;)0m83-o<q~S7-AN0B?)kP0owbm|az$_=
z1?ws#zvFX7gWD{-$Z_9E;$0cWj)P8<>6eD~vc=8<gXDuk%|x$~I0BJZLtt-1En&yS
zkgNoHgzEYlC^x0<`&RvOB!a<@{yalCNT&C3+|SYnU;6xZTQrXR5h{o}u6?w%xgL(u
zA#YRj!`CAMZ=DbM%bVod@4W)g_QoIH|D%qYiS#DmO*DgPgQ}R1!pMDi_oJLe8|lw;
zqe*UHj`6e*&Lba?EqTWAb@H0>q({AI0L;OpFy@%o(SsKz8f)#RpLkA~6G{`q!H47P
zk2sE*_&NxQhwkC7zYzU#JJAH)KNv6WuwOc^fAMT-Xe$H;P>Jw7$Tc{6_%I#wiq!vK
zjQGFCK>aFxEKdGq?2m~5^S|=5F@}7nu-|e+`bf8*>AV|Y0fa-4_`q&0Tr6q1$(JjX
z)y5bSgS)KWYLnSz`M~zc=tU)8q}fsjV#ovTlGx8rxAnEL{|z?{lU*6DYAd$IT7)f{
z8^YVpnzqa4V#`aUogS0!YS8T3U_;nLI$Fi2-(Xh^BcG&+^OX0sJ=Wyf$^fwjKoIbp
zfn0`~P^w{O*k0eZjs)UIpQ+&V$B^_Jwu){B*2;L&Jhbqr{7UObvuG|Jt>8iY-|gU?
zdh4ZbCcBMz!zu;oK}y2T`I0Oq$9<_ZL+bx(7*6<!`eU#G)U`{r<Jcpt=HIsgY>Gpp
z=#oXVnuwdQ4Nn@3uYaHVFnXcVhmCP$OmVraEix<^)+7a5?A`^xk#8z(hypPr8h5#@
z`N@nxj64Eu!hAvSW2x5yPm$xx@LwujX^ia=JiMDZVQ=qkZwAip8$d=bQ@ZnakO=0q
z7}AX6?YKcHq6QM1#GRtBn&}g}Z9;;Benjb$FNPfBE;Yu2vPs%wh_OrBXZWHdXYpR4
z;Mg2PesRA(&P^v$ogq?vBiL;@*Okv1w2uENC{BxsMB}c;DMi}YW&Ol1olWy>?BNQ6
zNUYtp)_Wy)0OErsG!;D5wA_E}ud~axkx^Cd2MW?&Smt4^7Nv0?H2*;@qV3T3XlH8|
zXqReH?MmnbZ$d24d$b3%F4zV<t-YwdqP?NLtNlUyMEhL(JM@Kp^uzU|5hv8EkJTsZ
z)AbYe1^Oc75L~XW(KqT_5IZ!aH|sm~Gm$^|BIFo|BeK}_`Yo_6x(^ly4<YO5v&bp@
zn*Nslo_<LGRR2={r;%gyGmbEhF@{46Io`-MW*YO1g+?**k*qY<8K*%9vDIiaT8+~Y
zhxB~oV&e+PC$2HRXWVN1!1$5zQ}`o2X*_SdY`kv#)_C9e$oPwaC^G+>Kl<zYM}nw+
zYySx-f4d*imGyV`!^T4Y{r<TqKiIzz<%jzhqdc^~4CP1rSE2lP|EVZH-S0#B+5UQz
zU+f2iqJOy`WWN5l{a_jNe?&np>t96&;2mnw!6<X0z-9D`LWXPfj^?856P=CHj4nXw
zi58<gJX((Oi0B%WM@A7_$T&J$hjLI9^&5kusNWb8!;l%nVtrALh#^*uF*0^6N^fio
z$}utY!Z<!Q6Xm$re3TPnyyl59Ui0J_uQ@lyYn~e8HP47OqMRMufpSh<Lpe9jYd$%C
zB+B`5Uh~2@uQ@+H5#^#d%+ida_(>=i$B~cLSQ1}`a%p@u%CdMB%JMkI#8@8Rj&fyu
zC(6|ac+G1M@R~Oq;BDS`U?|Gd4tP;+KETIh%Yi(U)d%LF^dI13Qh$KAJaB-weCq+;
z@`eMv<)H&u8piemA(W8=ttguhaJI6wvk%JlPCn*4JC8xRs}m7(jNP4MQJ&G6i?XA0
zHp;U)dHv^fE=GA?=W>+icdkcyVJF_HvA1(8%8NS@fXleF6JEE*zJuV!jVlg9F=y;Q
z$lD(~I0R+q!BHr$Ja|0Hs}Ay!zvdtxpKA}!LwVgn%pc?WgB;6^2RW9T4xWngmV?zO
zZ#~$6@{WVZ>S5e<@N|?vxDpHBxaUfbr2m(3`G0Rj_&r*?SDVNlVi@P_f12V*1nkm+
zf$v>5CT-Fx)aJ(OAD&8-@SDmG=8q#muuFn%DR;=Suy<ycdS%CnFG@V#jS8NQ-tpcb
z*i605%^}14m&xi*b~MvB*md6}Z_z0)DoxoKKg>PBlT^@w;7NX9XP!!aF5}lL)puxd
zo=VuIdlc^}>TL&W$-@G21{xYqib5#6>3Eyn{7*U!bMuu(Y>Vf(W^k4x9J_ZFoDevF
zOP+0AHW!!Ad{DmJ!@9Fz5fRkUCvKq2E)A%9^a4b{g`OM*iykDC+yQ@9dcHLdnH=a%
zH`7cwzKsRj(*!3>3L}wzjm2jZ8<IB6T>n3iVPk7$w?qCnL|cs0{{cw<$3praMMi+n
zjTty;uQ8s_em`)2!cokTl!r>H4^AOIk-(IbH=Zeu@gObFwL}87QcXJ1QGAsAx;?>U
z{?!GhmEll`3^0#!A&#%~ZP^m>!MV7`2Ppb8&r!sdY@n6Lw6c63JBoYkpB41sr*7KG
zy?9cllt*`AULs~4m*HFI;>&LE)rVn=jO;e~br7YAahdAE$_fE9n-lJPFSz-B(gx3b
z%Y`uC$<5LHg{y~=YYRt<a9b%0!-<5<CPunyDGzQlO^n2muD>q@VPCrb{tPi89_8!b
zi}=6zeUW{n<!EEHGObSQKpx<`U<>e}&h%lR=_?Tr_*}>bZv(CVp8hxEXk#j9@hVsX
zT?U%_Y2$a!YyE4yL$)1OKGggN*>>1O>@c4p7xFS+gAa$44DRD8B@gK`E>=Z)r&>6>
z!`oKce|aj%G)S6XOy+ETiUaawxL?!>k9bcZ8G6|0F1zof=_koBqfFI7Ca$Zx(?m__
z`bV;aanv!=Xr<~A$;iY`S4eg_sy>jcg`9PM^a3!B>3Th?Q`OyBFI)6;19C9=%&u-7
z9HDmBv(ca_o*?G0sq3lwGP0FP*NIUFYzPQXPU4=BQ7ESqnQkq&oIn)5!ReHtC#)w4
zy%4+8f?lxWi9j8)-j}<6qE4HgUCRGfGvj8Y)B3d@(*CC1fC!-XFz{Ia^3TTjk*?`e
zDY+NBT|$g6KCsJ<y}o?z;!pUWLLhbYiw^{`Hb7tDMo0^5_Z|Xph;SY~d}sQBvBVb)
zS6Z_<j`ZVhMNgbeOT@|mTI)x4*>xlp96MG)Q5i?Z@%8#JH{D(5ohe>=7yYwiAvq09
zROL;L@xxuq8lhcF_d5Y`Z+Dsf>MYV)<Q`BuvNev3)-FlgRW1G|gd>KjYa(GB@TFa2
zKTAm1C#Vt4s^cElQJ5;*5Z45ex3|c18Z$BVLffkp#^HoUrAz*}nFaevK~yM-9cMpN
zujH>KG3`-41<$HDa<O9$xZw(D!|dKU*=^+sHAJCOt>phJAUiN-;%r}tQ@@Zs&no`K
zwZA8RELNr=5?}Wi)gqIfDCbq3tw`tQY?Z5V*zHPx8skIVPik<kRu>`RnI<{bw9D+W
zlPPA@I5j)wwzx<uKEuuGTrDDPm%<H?C;gKa=3O=yw>&kxd~W?2{7>m%hZ*O&#j*Lh
znF%(oJ{ALDxl#1|9rm;9iE++V!|Gu#KF0lCEcOs&Wm@ZRK$x0#NPwV<MvemnG^$Ai
zvFiCd?UgI!+n=J!XsY8#M(#53nnH0Qpj;{mRyCc(FUOZEub?50G~|d^<K~4+^<yDV
z(+H8k&IF4tl#;1eXWmDiL1{~WeH<ytU3#V^NeQzn`G50VI=x2Rsq}@@|KG&_&3?C|
z_^E#;_!oko5&WFs7X-f~_*a7eP4I67|4#591pi6!D+xV}phi$9Xb{XH*o)v{1bY+g
zL$EKwegsW|9)kS|9!_uo!6OI`BzPpjqX-^Na1g;`2o5GVgy2wu#}XVya5%vc1V<7a
zMbJxdG{G?hk0W?I!4n9MB{+`Yc!CoMP9!*q;ADbR2<8&ZBRG}dG=kF!&LB9G;4Ff(
z3C<ySBEh)?=Mg-K;K>B%6I?*>6oLy0<`XO+SV(XY!6Jgi1Q!!5Ay`Uq2|+}V<oSP~
z>NpKHKR-nbzzJH7b}h1h90UE`KK)tf;T9n_=)>8s5dMT~X~Zmk6nR#<{{C$7{n3ub
zeHIy5b1qCvDTjuq%#9?=W^?u&?LwAlZ)#%x*^R)+A#$Vnn4{sDrHiSws>ic12dPbM
z^CBf562SmqNhZRA%EZ>o0=3fE)$7Ke9K=&0k8cG&e`#||P&&Px<ZQlZMGZq81k4mo
z5dQCosMjFl)p;hnkco1YLs4~8v#(m@F<Fe$Rm_JaZl9HcIbKb7JefCK_Bkzli1}(k
z4s<0w4tEAEiKmy#hA$5D_;ZNjQ0zmN3fbv}E~XdnDH6vbX5kX#iiQ_WASgo|jFa^L
zPOkqOtKY0oh5g@&>@@~W>ev0VDL%%vRghI?1wzeY3BPAQd23JDpinj&;-iHS!WES!
z%m>A$k`O|O58FO{LQ<NORExOXaWBYTO)qpqg=bi6oZZ0tv|otq%I;_ds^3OSe3a{W
zF)1!gRvkjBCzIt)>%HV|GeJ$J(i$J>I)+ju7PXxeoDZ@69d`c|dYzNLP+sTG_=tY&
z3_ah?csmF3gh`oWkWaSvL?<tqt?}Wm<reAwdS+MpHTH`)JaTH~KB)9`YkZh%Wa&{x
zx$04kJj(X(`DyvwRsZ0B3NpF=_cG(#(EnenPXzzJf_=dDe%-6zw*K{TB>r~E=p?1A
zW>@n6rW`V19ig&@{`dsfavD`63=E3nMCcMSM;NIFRNoXwUT>Gij(l5AM4ORvhs3Ag
zpn-CBc-8P4t#PFAb{QJmY1@~$><$FBZz5R*OnP3KDb4Y*u5ExFT$Rl(hZ}6~DHP;m
z;%)_PbsVX^U9$9wcPlIuq0#}B!oxXp0>S$eVcb#H`Ww~c;f(n4Qf}pDds*ubR`U(4
z1jPht?BI()jKNWuU77B(Gk>)~zSptmDE(}XBi*;#Xzn1pY{ET5plpAG{mf6(X~IVe
zT2B9ugt;$%-(-J=*Z+8}RNJI&M-=b_+HKm;v|nj|(T~z+>dW*-{bIxg`Gx*xWCfjL
ztTlFkX83{ejPZf(TK*4SOsF?(6v^bJo}w&HT(c^KNwegv^zHtF{lVoK*<Gted7E;L
z6tpSVNC}&AO^EM3D^jizdz5mGSRhhqR;IE!<XCPeeexVlN+~CHCDBz!mV~ryiiq6f
zp~wgs2pW%<bgg`6vf&;mfB?Vi%pi~&jDN|N39#O`BlImzup#Ctm;$fe(QL`n%Yws}
zCZ{pvwb*U5o^dp1`4>`sb<Owb_3&Hi;StT(EKjCdm78CYa*{u(s6aghq+;dwk_Of0
z-zEQl9b?zA*R&(F675XwVZE1LqMw6k0G}e>$9m}a?=*h#A6(8VDi<~+>3Shge-}=?
z=`kB$abcNcBd+%haq%2?+v4_zU|&ioi;3q%H@u_uMDdOn#&zPnk&ds++_2o%D%2y(
zbG)lYz}QBboZCe~|D_8iR5%9N<;!^71^4UZRrD7ZZn8*A)EGqEejy{6<wB5SpU232
z$c4W!X<a=7922#|8~)+@BK2@o8rkA3zv}){p4Dh!WUFHy)H1NJ%`l)cZg&nC70LC2
z{b_?a5`3ljXbfK}>HqEA|EDkF{2Zs<5C6Y68SJUQrk`!`>8|ZMZQ`>a#94Z5r>fr(
zc{5s#8M`$;%{4E@x5lL2PZD$K*Vx{-NfkV4s6tC^jZbxr3}HAGt2c1PY1i0QmrRxP
z;*>`fWOea8*D*|l=*=1y0WuW7Vu`f<+Jyhk&lOC~@m$xGsT{A6Pl>&mP^zZgU{{sV
ztIPeqf;JeR;yT*Cjj<?rwsadEcFrTjALibzpgSWz**yoqyXi!r$i6z=Ww-Be5;8>M
zlU)1%a6(_Wa;M~jkqkikb#{ki{13kV`?4wUK`<uiPwBPVSK4J-e|8NnrT;X>Ps&QU
zo<`xxu}QnkUfe{+(3AeIyq2wTWY=|RF_LaGg*BCCb;~X+Coi&be^QWju=rd|0vNu#
z5gJ+)>5!=^@wQ;U;OkBulzzML4zlwYHC}1Mwm6dSBFTiC7T8b};6KyJjI|o&DjZ&=
zV5^BE>n^x!H*BwxVh5tM)SNr)u303!o3dR&vn7t~yKn(?gGSf}b{hc-8y1UXlKtYx
zWF<9O&5XDyKFhV_#Yz%j$SefHhSTnrJMK_bg0wk4)3u>jN|GWzQV_c*au%`6w-reg
zx%-rH3dd)N1?J}Eud25RBFq<<&E@q6u9Fy#QzOSp`u{`5KGaUo)*|-DgWBhMF1+^k
z=}#KWm}RUo&P1%gm(n+b|KqMWD|lLJT7B&ye_p<~5H{PObAv(H2lM3hf=D{dnM_MQ
zS?+K1F2=bhp2)y_B%W9##SdKb=3NvPPkEfxpWRO(4Hr*!A--=qD>D<{FGgYx&I@ua
z-C8gm5%FLjXKp3&V2O`MnQoSf!L>e#u&=W+GVz>L=M{x`d~1QLch8-w#ISiQf>q-C
z1A1;7Pt1ih7|los%F~1i(cbWW&ir1YZT!^coR=4IfTfqv@FSePC=yStm0Ztqe;6@H
zMH3GnX`JGq?}LiX6LDq}a62!*sR>Dy$kU-IL#y%Kr6CcBl)t^gc34Qs+@7B15ypIn
z2DCN~{n8nKYa_C>v{VOb15$Z7^skcs55xP=7^eSNFN3_Vf&G((zoyj<>$O6hur96F
zdbYXege(t>I5~q|K6`sRSwH2zs_eJHc!6sglg}PSsv^l5<s$plL5gQFX^eudE}rk2
zW-nEvMVeh{m&)rYGT#`Ff~hIKFe_I~8zGkLoXw5xIb;lY{8<XtZE@tnbxFI}xCh{@
zPxl!(tuN6oqg9FdrZ}?Wy4183Sn~aG9U!=G%Ko?8AbMib@k(zZ@%gUlaXvZHlS0TL
zOux=9eIYR;;|kJ-_{pwq3+>{Nf<Ly2PFm@s{9mKh0G#stf0wa$wGoi|Uk)$-FX8*Q
z4)VV{^tX@=Y%V<Q4;s&YP5Z%rq*~`=vYjWLY6w&#XrKtjRqfA1um*ofxaS>vOl3~T
zIEQ`K=1Iu))Y`mL5J?jj8{KiKjvYMOD6+4z9BFEr{65b*NBIqXBQLiG0qm<edE)Uq
zo|cI(bK9pNKk;}gc%ChOgn1gK7@IOS10k&t<hE7X18s67fD%{={OvH|?M^Z3Ikm@5
zNIkr0OydM&b>_wtQk=xo9Ho7Uh9D?PHS!Zu;&ac|9{X9;(3nsUdP0uTx)RlMm7i$y
z<{n#uA?G2OBjI4~*2X$dT{aK!S5)I1!%fbVyk&uHk~YZ?2)fSW>+wA;3qv7_q*fGi
z&V%T?jE!IqF#NvEKG#NR3$%@h1Rm3F)qbwMqigyoeLi-B2y}n9=+En)8N-Z|5f5-X
z=!I*H9~;jahyEi=*anG3*^!o0$D*FGi6!9aJ3a@I&E@W#$pzoj+oFp}iUzxrjJ#)2
zC0TC^M*`1Ki>4-dSInMimIm6Usv(CpzGf390iN;X-=*fmG+*p)h7IfInUT0_=d0s6
zy!)=q3X>A~*F2QCYny-cr9=nQymCDK$xYEl!$R-PR*ORSY(yBI6G<^=)nwQxLr8;Y
z{Z_iZBT-dml?LhXoYfZe5*<|&^b)Po1<x#+QBEoba(V1lBZwjPtSLl7dY-Te)&{L)
z_qSF!4|>*FPXqC~JnJ0xe4#$}tV`M1rTlLUB8$NP=Rv((`vB2@2eKO(;;_gcM1xo+
zg<@``H`akqdp)Vf5ox#C#Yd9M#pJUUvZyW&OJ$cyWpECshUNv6pk4}<I7wlf;z)0w
zMGzAk6|~$~Y;Me%MPg2GgVMjMI1=8&iO`MUC&haieX}|<w;W66JL9Sq3|r#JY@dw?
zt~<0YiQu|Fvx66rE7XLS6ePho(%8GqkPEXMHJv+b*U~St^EWP(!mATDE9jcz#jZ6I
zm;!d8m&M$$yTPIZNoF=qmD2g+MXpWB)Wq~A;<Kfus&DK6yYdrPeZ>Ei?)l=2TnA2D
z)b5Y)tRRwN1D2G}-8qfZ6l8M!k3>u%V<hr_&I13xgZ%;dzen=bUmaiV+W2Y_=3yPT
z>X4yD(S+0s%j?Mzb@Y#vepbhk3EQQKml8`HuP@a>zKH!@PL?r0P_V#Ltx}2}+$=JO
z^d1&TG$i~zW(x_vM8Wze|4wPm#yC=9yNp>VU8IE#5EL51R9SprogY%9)A2E-`VH|c
z5@CxP$!l0vFFw?5`HmdQu|cKwrZ^H|yWAs@qi(Vn1vh&D`;o}T$Jc@FjoDok=5a`l
zg0(ST;adA-8_R+3l{O(B*w2S0hVeNC<>~QqOc_{t{|}}NC-@xa3ctDejW^^tkNAm#
zesjFcwZ<XE01VT_Y7fS)jo&0uOs-H+aQeTGUc~ewMCiLif5(^v>i&vkwogd|d{cfi
z0vSfYS%}W941$oa<f)GC9@EuBso~l@eVi2#-Ix@cU(X4Pb0BZ-!9AyEr(@4CjtqR#
zvne$ajiYSF`aqi(Ne^&xFKee{Ugk57TzvAm6r#^l>a5!89v0iJ&r{LgxSsW6qnQ4x
zG26IB@6bnRcWaZ_b8Htb!ZkRKq=cLF<DB=ugk)qHS1VAIqji=K3qF<x9#21^>T6fT
zkp+Bprl=N)x)b7`b@b2V^IzlJSy}5XUCMU0K8_UMuG(wmf~+jj!mGB(y6@^#>h8#i
zZ^UWPTQBQ*G+>#DnIC9|e_bOI9C)W!@iP#~4I(}%KU&w*HwMiR<5t#s?fXhQ>f#$X
z`8loUR!H$dJAx7OJh(#gurB@DyuUpr4u_|oI9b8uizCaoU!T-7CRP525ls;Y&Ydgb
z{NatMnu^u&^*pY{sGe~oGv%)9{&!OK2eR$cXDV$!HNK`FE7SPQoi*5Y^;h~sO?V~T
zmCmsIzv`=fyvik&UDwt(H#gSgwS)pYrgV#3#kFm5Wb1Cq^a?B$=GidsHVpl$kN1@y
zT=z8pQ@Vn6co<`qaU>%z(s%$6hYrzlF$m^dH|G&CIPZQm-LWT<{-2FVp~fQpb$ylg
zsdf+%Kz_>*yVUuoV|=_GOJS0}z311aPV|{oV8oDvqyY91K4dTF3UDZzkqQ?1+J!FH
zleRc|erDF_UzeYF+Qa-$8NJiuNLXC0PtbF693qk=wi!iYyDs(fhRt%O&3quh8J)bX
zjs80E-|Bd+%NYz!VMM6<J?pyv9rR8GueYrAiNlnJuZklf@dkaghK3KaoxzEQTSPz>
zagYr8jF;c+-_e{03)leC5$<TNii=#t6MBAgmi}{rv~@i2d2-t;azLKwr!*WJCC^6u
zFKv|5s)V9qm2X?(EK%o=`i<h3bvc07s_7p5@hzOM%#evVF@P|d@%w9ekd9?Ona&;i
zq;hG_oc$8dZHtxuR>ysuPtTAtAb}@MV!uwkGU2(t63gSaDOf7woBOe~`iP$2Tep&8
zUE;s-^F?ftvesK`m0CIdKZ@PSaN_@#eX8|^7BE*Uf)1bswm{cvPilYGPtZ3be)qYs
z4!#vW0k0z>sA)_zma#h#7j!S;hCOb)<GfS+yYC3`si!?3+jhj?CNp$;^CL2ejpq@P
ziCUFQLZa$PkPe>Hgd>D!ovJ7z;b@9FNTjOtbdREEGd*ir7(%s^ewnYA8X>Ruq`hK~
zPdL!vhN_IAHdv@9PnA$rr0<C8D)3Z0d@+sk*f=c*p<UB!oKeLy7X<vF8U*B771$E+
z7BxvH@xZ(seY?#QJ@3k%dg_u`00FtXZyT5ct&%5sh<ny2z7-b969l2Moxat*QF>~H
zJl(TyCDdPuKwX}o6p-7HHJ%MZ2jNLy$(}8;rbwzOj+|N%C!3qmIr=HOr*%5)s6#Ey
zARM6CEeq5L3mwtoHsSx|Y2_4FInp=FSd#oxfgf@Q@tqyQF^kXNa*?OXTM<J1NSTh@
zbCFPg@S8k|F!CW`I|9)t9=ty>@e%2_-jAeFBG7WTAIY6^7}~jAa4}e}CfJm<$zZBC
zCs5)RCN7TKh_?jx52D(=^882sk6I%~ze!)By@vR|$Fi<}Xa0}%@$D{&a>Sa%93%?a
z@?rXXBFgU=q3mC4<03KX=$>~)%bu_<`Ty)q_tGggS*h6<hjP>v@vE+5bzx5*{Hom3
zpHSTs*2j^E)D^p8-Ivx`KIBgpNlwdJZ&%YuHpG#7bi1A*ab@CEvR4<`YmqjbB@CC#
zTJKa(+YND~AFa|)==n{gEZ~&oJo6s|<VfA5Iw7o&Z*w_P)~yD642&w|zBBkpAsH@f
zy;(KOs)~ygqAn;R<<L+LkyB!)$ku;fr9nH6i3dOt4b`i99vzk5ao(5H$YjT_&M6i0
zzp~cvKB3HVY5#M8vB%jz5&7eQ=110#7m@w1T)#m7IdXr_FsdDMfBw4<cWZr)0k{S4
z*MMCjuQ0bDw>X#YV?(MP?I@F9Czez?PK&3;ILb{dPX&aHsR*%CoY=>Q<YusM;Yo3L
z^9sTdu>%h|!BKLQL{sPwg`0hi!e(|zg`-29<pG{g)h|-cm4<2q2)Hk{%^_=@lP@M8
z7HP8Jf);6>><xsxK5q>U1aDh7A_M6R$#?X*wAO)yiwI!aQk_V+IAoNIb}vG^8$=og
ze>mh7hVkNEEOhkCOQI|a!B`6?Z@AXG($B>!!Yp}6v7?~P`e<DsBp*#2nnR|$m^8(K
z5RAhR9JU7i6b;?rXwaO*X30P{WUh;`T<nX~ARQvi9~UE&f<QCJ#iW68W&=F=<O8QV
z3RIKrDn*D>F=ZBoMZ%yVdGh>U!r<e(8j-!@`aF05oXnQ6Tda%G&HtO??fqDV#`7aN
z$S2Bt)%AD@g8DG5A7<s9@)qAYm*xcj<|wJ?I6S@+d+4ByfiEo>@(N+d#}U>EjuMve
z&4Oma9^T{+Nph^c=kI7|KQ2rKmb~|Qv9fpWiSIyzdS%iMl_K0P1iUb}3gu;@3o{Xo
z>p!2u2d6aeA6t|L?2Nae0h)e_^QmHOfHUdpOx1>4qXPL<U8RpU#F6a~0ygLOZNY6=
z{%22|E=+Dq7rnOG@og`SBfsHNErakQDfBRs|BexjZGLlYs>~x8NB+VFeXjF3m2uO2
z2h!hxCD=8Dacm`_^Nv;C%epx77Ou}k3JG*6>_-YSGUEn0Lcv3-KU`TH=?PEK204#9
zuiD@RyZsqaOGZg1KmWgp|LJCbOZ^VTPb?!?POyUDa)K)et|VAVa23JT9D3Gx)(W`J
zv!39o1UC@eNN^Lu(+E}(+)U6%a0|g|f;9yF1ZxS_5v(T|Ah?y_HiAKd4Fp33!vq@%
zZWl1(X(HGxV5_H%;0^)XJv#~RB6vE%-30d#JcHnw1Um?Ri{M!V&n9>d!E*_oNAP@t
z-zIng!3zmqL~t*`iwRyr@KS=85!^@ca)MV7+)pq{Fh(#=@BqP1f(Hp+N$@IyR}=gW
z!D|R!OYpk{uOoOp!5avEkKm02Zz6az!CMG^pRfNa?NRnkZoky^{eRY{UWTR(8_vrS
zBSkq%lwMJe7UdXG9w*A<MR|fK$BJ^CD94L(f+#17a*`+~i*kx6b48ga%BiB9Cd%oe
zoFU4Yyqq;#lygLRqA2Hza-Jwp66MLFoG;1+qC7>E3q_eP$^uaqigJ-Ci$qy0%Eh8A
z5oM_;mxyvHFPD{xvRsrEqFgS@6{1`z%1TkL66I=9t`X&0QLYo^dQqM#$_=92D9TNu
zJWZ5UqTDP>pD4G8vRafiqV$WhR+M$3tQTcKlv_o)jhDd&QHDer7G<L-w~I0&$|g}Z
zi?T(Ot)grb<qlD{i*lzZcZu?JQSKJy9!~%FX2r;NsQ($-zbCa)_6j~``O|Uu0WB-q
z98OBY4U^NvmD}3A<7EbU?yV1<AZLI)?LB{ob$m&*`DfQCBv|MG%o^G<y3t#Cg#xh8
zf=wuZgRP&K1DlJxya{HYkAiSd{0zYiWC~De#fShA5FxijI1k(c+~IE4&(rRFk3F&Q
z%<{P}EaHDk13C_i??DUtXG|!a(gJ^LK*o_1J?EJaVTS?>TqzoEhekHTeYU?bG4?Cf
zmJEyUMoW&%B<-@Ye|hwQOQok^MsN|ZaLZ^y_BXgMO@Y1`3>#Oqw7dSQ?i04wOAbuG
zK+)H>#gUKr4E-dK&<+aWl*Wlnew>TUhj#@;@(`fQ`RQ<jJt@P8E_v^>$JK!u5Z{G?
z8LU@kU_`91Na<|>rVCoK(qEHdNbJ6(4L^>vDj1AMmBHZW|KSWtOUJS;EXv-}#%ez8
zX6;jbE^L9GLIz&HaW7+za-EcsDjnA#)eGEdv^*>osr#HwwyZrZZD{l-VkmkZD$VIQ
z%E4qS<ss?Swj2&zVD;giTg$CXNlGMM(q%<C$k=JCJWpx*(m?e#VTk}|4xu9%hhSIT
zDwG=?Wm74YEc4ek^9Vu^#x>QGm&W-Stk0}nvA${k2FuzJDzj-y0pdo8iT_|pPRBqO
z9dW29xq{9r&cPnh^N3h0f=^@+;<i?QvON#{3;jw~lWflQE?>2^Ih8G#E7eF0iKy<$
z7TvWZ2g0H3I+jvXvQf{L=X8w7vMTIb6y*aebo{cS3CWiIydtM#)c?4;Wb-ck7kbK@
zm)t$Nr`1*b{O`jWk$2eWrQfJ803WalmH>@e5&*8h9zK8^!8n&)ZoZs8pmsy#O9zw9
zMfP^rndK)2-{*hIrW-zh{J`!p+AZRCn~UrhIEne5`rhY<r(x`!4aTA!^*&HTyjN=w
z)m<JgHW%5w%M&MViGs1^z+wH^ZhfxHQH4Ibr8!XB5`?x@P6~<C{yMw;lSEHdytM~<
z@#st$3<PQ23Yl--B7b$z7ZHkYiBP#PDW2$Hjncsl2apZ8S|8=IgO!btGfNcR|FTbC
zNz|^su#Ub5c=q3cnJha~I%3_8EW34biKfsgcHhum{hmCLXMLia$lDI++_o^!WmmbS
zl(zw?ln@j}nhLb1U1C=!2KFy%@+yA*4`BHWzxxmaU>>4>J+JHV`EAkffj7Viqs};B
zJeOg4FVE>1o&DaHM&fnvNLR1O0p*z8Hjbr}R$=m8>|UJ%OT}z!6t1+*_5OSu<xSyQ
zsN7+uVL6aH*W`3e`FGWtZ0wI07-zVt6%nnuw-pRJ@(~ZHxtaEjxU=oJmD(uxK|U;V
z5Z~sGwke062|F<o^&;g4S(bdyQSX+rSQ42+`6epX<oDh65fmgWmzRk|AxH(+O^sdR
zs2WZ|TR}-d?r~J|rhYvX<QYl)Fw9A$BKe6++Jx&Oy_{T|EY*@b;n*aubzAS;<nFap
z27*u?i!s{osGCe_b!8A%LI{Z2BA5Q9j!MJSr@FVtv-$cT$$rG}`w}~(nc6sQk+wl=
z(7p{Wpi6rh5dcQ(v-S0Qn|>+mgPuoB;Qq!;qYSx!cVlO`#dyT{Wrp41Yr93JQUyM)
zo#*m{aHyq82E_d@X<pY}fSChL@$x{O9GoAJ36=dR=Q%e~rHv@yOtPT@g%{f9T@1@*
z%PID-H2-Ta2=WB<2s$ZLtDY`tz=q3V(C}QMaYq6}FboEXdk^AXSQ0h&3TJW;|2FQS
z+1Pr#r-o|+zH0I8&k{&@{8n#%HRUe8K!pFsV-Q=^gm=>9`KicR>~W#p^z0<O4$Q3Q
zbZIIFkwj|%jgcm0PmIaY^Yu(}3eOqR6&*qZU#*`rtzJxS&ZLRn{79Nc^1HAAFRX6?
zIWKP9O7Bh~3_RzI%h8u|jQ*x-SSX5xT3L?>i$bL<B3_E;Z<khj{Cn80xm1N)*IB$a
zJvWf0T<SN(!`F??(MtuAOo9*3o<!sMn`jP$(<NHt3VP#3L4Tdl$$RdmQIHu}`0ld2
zK8)emA@E&G^TCGJ^PDGbPuq*Zb%`%uEUg*aaa6!OvpxU|KWQo8d7Qpl;tNXS@+;}}
z_bfp3bm&;2L)q2vFX%OZJ%$J%gFyqV(VDdjweM@MAQsR9J&4#Jx9YFzUl?A*{#XyI
z-^-0B*wwHY_*(6LjoWw(Qsb8*qQl{_!g{!o)rGxF!pIcgJp;mRb%9850KyX*(<xE6
z8&@uT{iH;Qd?lYZA8hkwe4#*W7t)tMJ%p2IKE6^)hP;Zii|16_tDyIl-+(Ql+86Sc
zB+`V(aCf~lRBkVY-$SjOE0^Q4k7k7JX^Z=H(#ZF@;&3<!Ssj^;Y(PL4*x@w5s=*iB
zBxcL6@a3?q?Bk+PU4%!Cpp+5f{$FsvB|k?$L+^j&)TvW^Ay5YpviV?>GX*<ORW0~~
zpucK6B6~Df)rKQgfd<$#374k!DbuG;o0{8H+uDC9YB_yEj$WbnABC*beje@!bG!f#
z@hwbT>LzXaPsO*-77L>PY($}J!UO*wdtU+{MS1@J&df%xOgsTWkwwa-LI5R*cMbvp
z5{`sh8kb~~EF`;OlMvQBRI1in>#@7B-uGRPTI*T07F&x)Ydu@*Z7t$mwOaq*_n6(8
zcjukVqPD-^|0f^d*`1yDectz-dEe)L9vZS<8U;dDJHuRrJAT5}%`B;={h<>U^G3&P
zF2JwnumvzTL1&6`y<HvHeDOx0t&T0K1IQw~8aH3WyV_KpK;rd=VCm|P7%x+1qTYpZ
z345{3O?4>2I}VJ-0_YUN*loeGNK+i1*$n4ZxbZ6Xl+De8kAW8vqbKHH@!QSpEHJk+
zuO=L12!3buyJ!-Aypug-b8B5V9*?ohCSCXY*o#$kU~Q<ilX_oKhuo!9waB_HItaJ?
znzbxCsvN0|M28{cuLh&0#>?zTF1m05{I^<>&@jF_7T>iDt$xplK~W=3MVUDgi%voG
zPzf7m(S>zr!cI*3m}<MCI~H*He>O3a`oH1vH$=NfI|3Gf+4&Ogp28%p$-S#S->2LH
z&Xo?rLwA?x^A;`enI)O-DG7|>B&u?^d1jooGsF@fm2iG151nG+k@Kf^CwI(8nXKYz
z6N(?m@0VGamq;^Qo<#ZXkUqladS?hphNO^R2Q7hEPOPymY0?1yX+Ha=UgvmNPS<kg
zi!NU!7wm4~JX)I1x+KbV=YbQ9I(0mBc+k80)sx@fEpUGPxP-H3XmSwV+L8Lo?NrF~
zyuOykFLV6l*eN8{VCKfaZE3CsIN-OE8lW+Wdf#|~eGUvB?RLH};r#xCjOOS>X$AQH
zzmgcI8~f=G>PKl`YG-P@kt_4v|KH{PZAn(sdy3Duu?`yiI=mROLv5hFjNB!1uaRH8
zV!es?OKZ}dL_u%=2BK<(ES^yOKzdHJFwc`PuT2ikNB5J<TO@KWk&TxB;wP_5*h0x6
zG(L`cZ2B>T(KW2JN^P<gwZ4&`zirLvN(slRBr0-;^-(@?*d*XY_A@ynvtn{R!blRe
zxYy|uefCe42o9b-AzvZCg<W&{uzl#ioVlP5xBt1=csm=PM@~N5TB~JJ|Lc;w<Z}YL
zn%fd?SIIk>cR<eAMCJbh+DSw^NxNVB7c%{wjjZ1@QS;~a?{Y_f-?x1QJQP&%NNa*R
z5Jx*=(PGOGQrQ|}Duw~&>Z&^^5M*mvPL;$|YO0Mj#@d*?F<_@713fcTszzt)SX+pD
z>IXv;f-|Y7I<4ckdIIC%O52eao0?u}a16L{df@hd!$UQg+c%Qo@#uyAe~Sfr>U|Ch
z^=_zuUmMxLrbcrNji)T-l2AiK7h)JOBr7r^Slb?geRyURb^F>`_U&e-E9(E1I$EMy
zT0)vPdtzmTMLSS#hjmFOJ79`B!K~azq8({l;grr-=|iQ<zKlG9q^9jmJ{Yk7yZ{1;
z6zXip+E#>wQJk(yMGV>25c<#&9FO>`$Obn50gV6eN7h0j)&Hrd^?_O&c@bZ~i$872
zAkE+8myFZIoiNIWf;Hi|(19d!uaS)xiR1KR*;N`&Nh87B`41SN%f$3=`>_`r_3c84
zkD*to+$0!@KJOvdJZT;9*GmU{&#>fP7||$wl~1ltXl<2_F&V3g!`_4u=a@sRJGIaD
z5uPB&OAKd^nH<5FYx@Q#PABS|Vj;_AgL6&L+AD|g0ZrZ@4QP21MR)xRI2rX<!uq7m
z1=*Xv_&xehdJ^?X)Yxs-NBd+OmPBH$h_>RdfbEM`c&YWQcb72qj7|>6a_*})Z`X46
zWqy(#cptax1;W}`dWW>gl>YBT783kDmHe9gODonQ+8sL44~7NsF8w`N02d%1nE(9W
z9tVFm`ls0Lc)?cncOGY`tsOIM!UUDIcK$w(h7L37Mt_b;4zBkC4^nL(Wv&F0^y#zV
z;|#iFZU8Q13Ibpsh38SlZ6c5Rv;MJB@x7aI!#LIFT3{4R+(qU;5zBu45dj1(`J2EZ
zYUKo#r&aK1(OvekT<-5BtBZ%*5&xC-H+aII<#0)asUr*TQfA<GSkr9hL1DT)fV?Mt
zPmOUr6X!-j;lMmG?Le%na}=B1FZ?a+(g+B;MV$E4e9WJjacK-@M&9B#RQ~TrQndbG
zk^VD%SM8_T-uU`I;7?B=ISvQtAbpn4L)zPiFX8z!IS*1F^XB=aT{_5PNz}de??2?G
zx`%cz$9k>}yw<|_oP_b%<QPoc&=2=Hai=NEZtPOq!N_$`EY3K$jQ*3*_w-BBV%R(C
zbGL(Xx%v1xXqC$i`nt0O3ouWjPHjmP#rDrKIv0Xd>)dPP)+4NypCnEF=;Yp*xuzfL
zbLHvwb3LIFs$a-0mMH%5T@vzmauluX?vb#;aqPI;6cetOgBhKJtka<Me=xa&;O|r9
zO;i9b(H3b(YgZr=;6r^+eU`pnzgm9^c>pFEM;RBO+V|G~{?Q<e@ot)q!gGba+UZZs
zY*dAP8x#u9VX5H@y$_4RYlNB3#VxS#6k(~hv+gzruncQ_A2;PW_J-}gjE1=IN5U#?
z?=ZWGGX34-f;W3xw!16ETG+d@b7NWN{Wf7nR^FNI^beB)a1qI6_nqqT%vc{S4(KcU
zygl3fX)Ytd26K}*F5Wkw*Sd6_6+E)t9y2+hugbkwDLWPZYzj-A<alNnM^1w*isPmQ
z^yVBCeQ@iAsgi&m@!Kkk>{r5<L!oyryhs?G?cQHp|Bw1#>kLglM<0Xwzst!J-&y^y
zmC53K{5Z3|Gg&tpa#u#;e_uL5d-^9QamwZM{04FGbSLS{-$dKfBI2JOB#mWNa$-Kp
zV%sxGWIvNjKeI^HDN_HD<bHW6zGY7vOfBT_y&)eQcw)^#*Iz~d<={ePTK`J+9EU&f
zKb<TQgXIE9erK)QC$hVCTXLU#NIs>rYzJh;3r2gL*T}OAtaS`Xb8AaZ$OoTGf-RS%
zTja`HPpp}7_7M6{!q+n>IUesQ4COw#tG>Mp6Mf#&bOhnt?Z>hWi0}VXiE)blxqg;D
z1^NHO2<1EVKThRONKVJH^z%xlAqWxoCHIn`5*|Nx?{2*bYosT$G>Ia$^*T+k>c<>r
zNr?&Zf!zPT==sy}QqQp@D%1KGA-E5q(?3u+20AX1lkXN7KbBL*E={6Vt^c`LzOo7N
zf&5~!wMvgjb6J^0iCX`j_*q}LMCKzo>lJIIc9VK<PNF(I0t$RS1KGt>_W2|~+4B}5
z*6ku;!akgm*FIFTK^eBj!56slRN7-<F6kT)kR+Y1Bx=X|kKibEPXm~6zfRs;W-T~q
zOJgKfjA*-N_KEWUCi$FbQ=#{}4cR^?BG>1Q`pd>}V=?*M*hHiM{=fX=Pi+V?B70jZ
z(>XbgryK`XpYd{iaU?gF2A~<}TfyWMd+j=btNf{#oE<P(`U;<+gWiF|g~$8T-pPjf
z!k_wcZqFPug|~Z{M{RmiSBbgsGJl#;SKnP_hA_t~lJUqo)8GA;S);Jmr!Lu#|1a17
zZGzvWvAcej_NKO;yh}Fyhj)BK5|v!n>f`*L`VMDzr|&ztJHzSSDjjvuYaPm^1D~9i
z{lvG4=I-ac%ME(h5`Nm}#CWwOQRUUYUTc1CY)T^c8hNGNBHA0|sgFq>jHyr5Bik``
zQBl4#Cl)Fzc{(Ux-}mc}4&)1yV~*-6NFIcNB8kCv3^c3maDPO(zZ>Q2_&_EeDbeFt
zaz;KZn_J3Ww>-Y&4T}<ge1Y_gI+6!6^`Fm8;2u~(rMldB3-Y^*tT#i(O6mVVl>E{*
zK=OZ259+J+oAmdMsi6Fi{fAG1|5NC^OkfTtj&b9ti!@CjNNXg78pn;Jw7CDfeqBe#
z*G?!!;(yv`zz;m^Lk^@<X3QvIEhc-h8;&NW!3EIvWs<tkDtD}hL0-hl*#oOoOw+S+
z_lpK3gJDq%Q69iGV8^lmvMnljAE_%i{I|prj|DGxBn#;1<o+82`um>`!iM0`%!aZE
zBZ+j@vxWcrqCn3We}m}gjL}RGH27&jC>o20;6??fB&xEQ8Ex#0h&aRk&-oryS(t{q
zu}->UtlBa&<MscC2RG|j7#1cMtc%mM67-FLlt}ac-$?NHQSt`)1QvjUv}&zUTaQTK
z>$OL;zd$A^LN<^v@`3cCLg=%|68eR)7wUq~GuERD@GZs`<JJGn))jGAvNEag2BG&<
z_|O-g#Y+HK!foLlA_Od#gcjZ_wBvnhR0^*Z%G9ivYT@}JM$Z{MP<XZo3(G{J7oH>r
zkn7G=c&V7AU3{cZs_=Irp2)=m!v2fX#X%TDoIVT!d9F)zVN&SX=^NUIBh)2A&+dJz
za550)5_YfbMPQ94SC4l+E5KW*G^G_@F4ij7&MzLgrJ}iu*B5}MChNwN=GpqaR7Hiq
z5QB3wwTs7Zx25xUXUi0vI*84qyA)~uQA0gG5!;=f0#?M{U-=W;QreB%n22d575Wp8
zQQg8k0^s-Av6gm&ywlwM>`DHnZz+$p(qcI*J}QCWA(6Ma@EJa;Ei*SDUol_&*Leuy
z7C4QzF*i;66s#1;g@5DvzXoEQX^e&3KU@2wb|iV2G<=IYdQ}otTK&6C+g3D@{jAMt
zxtOtPZ+<Ep=z9hyXM$%Op)cPKo)N1d#b&tkj_Ui2zkbAd$OBRm580JO{nk8mI_@=1
zz(%^&I?>ke_F&CHcP^*@Bu;W&vOFI@a?C$Bs2Tdk+^giHpv6a?Dd7wy%kqgOaF}Nk
z_HX2q*_N(KE{N2fEX^k_gR4<vIib|57;Ez3+t%#HO0x?mkH{yQOo{{tLVIL5xho^5
z?Iq!fB@fR>>TrvGhYB<&B%a)D&Fs@-C5(Lk*Ah_jz4iO`eGmn(fV@s>zrp^8BPp$#
z3cuU!*pGI)r%H0>evkHtUa=2l-D)IRosan{hnytjE95Tg9sNYE4ZSuwFP{jWTx!m<
zx7b}A$vwn+FJ(1<B#E-<{ta{Xg=0)bLcXHyw!y;nZ|P0x*(o^(j}^)5d`hT{+|zUh
zuI|*FIx*s|W;NJNr1vOmOtQ;ND2cM^{v((iNemn*4aiI5EgT<9^In@o;dKA`cycwy
zxgq=HzKoLUB?((w5*5__Yld7nlSJ+{a+bA%pH7zW@%<kqBx;<D2;lSdq1uhwq2$SL
zu>U=p)+bTId7(xXeTo_ZOR8$C=GO!(s+LsM%rqR|c6;$>?QDm8Rc2h1MA^p<uXr#=
zpT+Z#KgGdfZIQ2#OJl5X%-n+($Ufe!Nt8$L@=Dd@M3&3%<+6a}(pUGRvvfh%lB}b<
z-NQKML`OGZbp*1WNDj0`x<KB({s0B4M3UA@*SwNsI&rBuQWdMJ6}^1A0(VOirP1@4
zCe1ckg>)EDj<7>*i*$iJyz?IwsGx3Kh<Tb`KBmrj&gWt4OTo@(1L+ad!##$#c>YXo
zyyQW}K-MQ0P}asHftzy}3i&`GH;@~~pRGVl<^S*V|9c!+il0RO^qT~{S-@Kayj8&4
z1pK*xw+ncOfOiUbmw>+z@NNNrDd0T<{z|}m1-wtd`vrVJzy}3<NWfnU_^^PF2>7Ug
zzY*{;0e>stW&s};@OJ|KUce^=`~!nq3ZE44DFL4r@EHOBDBzz2d{)3e3;3LX&kOj1
zfG-O8l7KG@_!j~HD&Q*u{!PGF1$<4w*9Ck-z&8baOTf1Ud`G~)3;3>p{}6DifbTK5
zt?+#TKM?Rk0Y4J(V*x)A@KXW*Dd1-UelFk_0{%<DF9rNcz<&$)HHRh<P!muW&=4>{
zp;=(=AYeZMks6c6{~SZ`_g>Wh+((PS3*dcyH@!kXPXD>F1L}V@8NJB&^X>mptH7OS
z9i>`G&e9ZaK=wJFw1b`V|4^n#%Wc01iCwq~<u6L>b8aiR5p_U&%&@(tjue#}GWSlF
zz>6k@qe>c3B-Y7`YE7@RlO@nuBe?}@+==<uLV3e_cw3n}&)LCJ#QVmPhmJ#}$>FK@
zUKnjuxht=iAVpDmDB2ktI$ddw&fHThgiJc5p$93I&)NH_28%8Pol8Y1&XmtXYm_z&
zTSHXdih;PtQ8kQVTU;CH8P~@YiV-jw?}Y7OJn+&W;b<Z_H?($bj1Hj|X^uKWSRI%M
zLM#e)XsxoETXrC`k!6n!;80~$Q1)h4XKQv>8_$<Ebe{T6wN|~jDhMM5cu^$r;_1YO
zF7YucnzWsbN?m0vJ1TlJ*BOS9$%!>v$oYTN|B563@9BvDIa4blx1s)5-hUdCKcqSm
z4<o+w4W-*UyDb@Sn)ynu=zq6hScXXg%ZlVG>VM{u_Qr{3K`6qL)@`vqk?UJOQ*cAa
zC65F<Sl|_T<LrHY6H2r;w;&f49vywLt?W>RTa-VMSD)xq;P26rD=~lpdbwK0b`C%o
z+g(o^tf}%SB3BLhy<&yeCs*Xfiz<$qE$-LJ;~N(!5iidRaUH7aGL?2I4%k@Z>I6R`
zx42&?n>5w3uSqV;OK8Mdzzm%wlMgtMZll62@)ff6{hd_LcwllVp7E|;$%dWJxX)~F
zeddF!sH;$nhVTD1$QEaq`UUX+{f!nT&yzKIZ~s0Uv?iPK5|-iWN^K|92rDvbVw%z=
za(Bf`iisf>AdF?+*(-|8xy;DvK*<x|&n`Ljw)Ans*tb;2$`6x`G}_!F3666lHuH_m
zltZpRUnM@aBpdP)nd#YUXKvW(Yr8=Ha^ES6O}aX{n)+&aBn@)Tg`z4)MQXlJ?BB?R
z!&T~s&SZ#MPNw@k1>KEX?lv!S<JLnI?@WF2D5_2zt=3yR=T;SMh_pvIXN9*T^W}h2
zrl@jJ;XpTDkGFELSDHL0j=rsleH$FftG`s8MwI^_NiHY&doMBoZ`B5C6SOkK0GzDd
z1Y5wLw6|gX9|LJ%xxN7zfN#}*qyNRwjnPJ#u^RUOi;UZiCyh7y-2C6*24O4B+53fW
z^6Z<kx~K4IZWhitlMA2YA##1~<H9$%x!C?h3tthP%G$xgXL&B%EuzwNaJ)SkCr?QH
zE>B9U<_HR3;$es0>Z8J^c%s(~BUAV?cR1LxDAGaA%Sh<RcG+9P3d|GavP<s>1n@Wj
zBTd=h#mI#d?P!P~b##Vj*(&;DRtc!GsyRXZyD&<-)78S~xt9SuLoz%4RjUoQKP^a4
zbBED@BOy(_C!QTW59}(+KMDgkz3wXW@qEWlZn5w$w%%-~SmA5j#_z=k6~4&547R8x
zE-@2#cBb$JKH_aOFo=<k4rE9G-Rj`gDol;POxqw^#oC2U{%ih1Y%7n%p_`@ZXV`nD
zf`gnFY2r)%FYbA;4Qka!`gnqKk)@QIOg`e_uiL1;lV*krE)BJ=6=Hy?^Jjq{<Kb51
zDxweHG(=}ii0Z(Tr=?uDK>8)!|3&0wLSEL2v~n$>-LAckeBTlMQvC^Iym2IQ{XY5)
zHt&D8snTIQD-+Qbr=D1Jp@vrZ5J=}CH7w2DO`kDqROdsus}40I0c~9fnOb?;{h_mz
zUijIu!Tp1JdttLK=xT2dce3X{^e`W@!t1mo7U9XZhb~Z8RLJ6*j|2tCWlf!exX`==
zZx1q**S5u4JJv?%AZVaFmzS6N5P=t9v!fCca{RJYs#b<gWXG_OW*ZJR0qdd|cX%1P
z$cGHPNJw}?=dTF#OzTTEuqeD5)r@H3P(IIc>L!R13ay>UD;{cTr87klZsY;3h%}?X
z5T9|GGFeP^__Zxzq%#iD&Bdl%;bY3R?O~`XfRY^@tl4a(lco(7{25!R+{s$ZQHCnm
zTfqM?xai@#)}y`~(#eGxsTg`N=l>TH<3eMYez!hf`-8TKJWdk=ZRel$$!LB;oI8PF
zCwwm9ATLH#JR|ajw1KsPEypkW=1mN@c>X+k#8C<+GLdY>F!C^+sc0Qr0v95v?Y&B6
zAv`|07P$NArGA&dgKP2NXu9W2R!qJrxrWB?P4LUOOPmHocO)vza318;wYw`2{V*BH
zOQf>#LR+$*$qQermhzZn3zpLGN(JI%)Rhc`lC>Z={#GSrH6@$#T1SZklsH22@SlFF
zSVv3#Cu@w$^)K{e^_{fKwXw(q_O1U}oQw@5voxx>Q`r7%!L&ppoe9JGP;~Q2KcM5D
z_rg~*l$GK`Nz|bad%bd2cg2;VNIU`6r$~OZ&H0_&vG!z&t!BcTpGiu`L=x5LkJCMB
zduDJT|6NxD&UECg5{}9l_IjK8H*!ZY%Yjof{^!di+-sAa^i}Yvn3loqmg(Ou{Xco9
zyo$|q{Ox~|utkz6UEk)Fq%nidg*SEKSIOqGLn*H6hrg6PYmP~xmi-A{y3PzPdPXv(
z{%Teqr8d#l-U6*YC4Yt6Jbom<-SQQGrf)ng&9vtS$#vM_<Mg%a!zzP+4y}_GPJq6{
zm6t|SwjpC_BXXfeSPpWVTRj)~w&mG?-1WC6KF)WlrE#uIw$o7V(LP2AeJ_{~E(Bs#
zGGEBwdoJbA;NKlm@09=Fi7X-HH2n7%`L{M*Yu9ep-qMHa_4<YS7F7EwGfp&qo8NJu
z<fChmA-0_wwu(zzBj7b_GRfISe5EWh>fXo}(>me{C97p`+sdmV1n0%LLUF{cO3RhK
z8Jx5`U^QwBcSCw*tlfwvKMkXB2S$axP;(R#MhCNAjd=4=<2ZK?)rK*OY#HGD7evCM
zrYQtx`lgS#$`4u*w}LJ}NW+J-h7T!CdN#E2$k8y3vHRQ9(aN?49l?$m_~=jv)0;Na
z!bL2oB^Zx!ecuRmsBg9#>Tg}!Nz?p+|K~67h)SiA*4YjwGe^5eeJpPo#OAUX9_ga4
zXq2i=mPUA`un}8)ytcG8q(5eGU`ut5Pn4@E%D6z;ZJ~V6&q7n2R4SrIj$qCoHi~tA
z77Q8zNUbz?@w^z9QATW|^nU=EN{q{m3jJk$o%T=dbZrPZ8<!M+RwhsIdmh<!9(Dx?
zx#}cw+WqZo={)MuleCI;fmapl%&82C3u0TG8hXok@wWM^I~uy;Tud$8=KVXld*wql
z(}(_z{*y-0kvxw2VSAK_&WwR(phlb*O!U}rw4S%ntZY;KKz^~LhoAIs?=4|%Nun?{
zXs?=i&tP>?<!sBnHZsK0zE(ey`cy*IojisHn|fpz%%D;$snq%_^1C(1^GP1NhlDwj
zJlZdVF~1=UNtLR{7Im!_v_AJ5xp);@(CSAj-<5DRCKFVjKhej6B8H}ss>V940tegV
zE2IComQU&R(<C%2lN<c*h$Ug<5$@v7g4=9g$W<p-)=YcqK>9DI_in$v+tgBp+iYLR
zr@Otz$NmqwehsDn!^p1){yt6KgbuJ0^}kQjuGD^~ZPN{Xv_4&5fK0$=>erz<$csjy
zv9D2TM2$;~`xVE-f9^6@R!dBL;ip31YMXxHKe^(68}rRZg>R5Z$}>`XJ@p(di^Unw
zWRmFteXU-YFY{LTfl#pKzMO?$aPxo%>tFbZ&>%1Bg7yn9dwHyllBLpSE~c0Po&d0q
z)2#5{T-oi#4HteW7RSaL7QQdgE6%IJuS6T$+gkV;w}#~Gk;2b;QLTd6vDj*8FKGzT
zMCilY!fmU;(Qtc$IgqtB3oHUm-J&TKGyAi3Gz+M=6Vz{Uczl6ZWIye|p0-&)pBsWR
zQ4WD!?k8Fxc`ntW!KBd%=7aq-fMxeH2SEzslyhb@*45m?sCQkw3sJ@(gym3@w>*3u
zYp^3z^qYgAe!yB#L^a_Jcp}^#$26Jg!5l<6L6*&oHQIT<fWBBa2jTWORsYq196&gM
z@)MDLpxNv_6Q0Rtkr)yy-?tPVQF!_0(>Oj>w_sKmbo{YSq)84|RWUKb+(`@xwuhy$
z=(x@xWtMm))b6&BS@?}AxV7!yWe(x=e+)4;z(Md_eX4dZ8Kcc7e<wY*jl4XCGS720
zYQI*9?%C&UWIt;2e|Z}{cIJ3F>^G(0gV^SEMrS)L&Us^U-l4KR{>@MxcE^p<Il4N9
zs@xH;f=V_-(rYHYc8gbz6-eZCYHLzEP(!>23AZ6}dCgs3{aL+h1hOlo8Fi#k6x$z{
zqBvU$w<&%gS0BdKv1Y={6D6#xQU*=S@8JNDVIAyNs6vNLid=CgbC#$X|HRc&|7|JM
zzh386d(75<t_h6d$-PQ$zwZdTiZv5nUnt@0NNIjoQDNgNR2l!sTfgDF-uTBGB&<Dw
z6k)2`xjy9jKIj%`Jxx=kCT!%*XSed%|NSv(9F+d=NRZzD4_bf3{hy{isJ*LC!jX2G
zew+Tfv752dIK%jj?JW2o{ZVODtA*eb#gUIw6c(vsVKRk9jti<o2B^Jz<)-0Qnunem
z%c_x*9;ZC|V3xVT@2f>Y34IH^Qme+%T9aWbsr}%8sijY;b)+LKJWGe{ypOR|p-%{J
zfCd36C|XgL8pm1xe(LNQwbH%CrO^<o)Ffzi%1+S1#gpbzV%NX_SYy5d8!hh3?4k|f
zLBCR3L|F}Baa%Ep^MDr)!OBQGA9U{+qgvH@8!a(}{36le4=7EKwUNwS#ifmnFkf;>
zY`BN=!`1`^kdJ0u$neM2Y0m68Di}dt8j40kSl<XZozm5m4H2RI!yi@J@$9|KLfyXL
z;&!?M!yi<ucWeWl9cpifup4Uz7s8FJ!yi_^_qK*r<KUtigQsdD!@dmPO!xmD+I|F8
zzn5w2v<tPXkq2l$aQ|;>U+F`T_hYW!pl^a@@EQGGBVdd~1>idP3ZHCTYCL4XZQ%dX
zpP>P5qHZjYHg}`cRCTDe4d(f9bg#X44QOL@1CA%~MqLqWTOA1xI(7GeR*Y*%W`jLc
z7jA3sWSY)Fi^l}CDwiLEbHg<8O?jxjt1~w2iK2kEhi)u`LwGzA+GFA_0c|ue!*Gqa
zr5qMqZS>9oZIpGXfnIre&ww@^SCF%&Jl53;B^PzA;mm8%5xWJnas0<>L<S%&PGm#i
zBtA&kx{-OOG1x(mnI_1;+SI)R+Dt7lWf}^NBl!^JtWi&LE%ddsT2VcVzN|X||7a~R
zga2W#FP5iR3zRm(hy%Unl2AL}*gK92z_BC%sV3Z*2p&q4&j4E@xNopd_+1oC4Zz_H
zcc5Gq_;<EY(6hIod=(Xhs>9JP@aoXC!?xbRU-_cp0d1NVnAJkPF)+ME2znQ1;vhZ_
z)Wt=)v#u!3zr&Qa!!X+^T3~hvb;B@QWaJ5pbDQ^7g-42#!&UI*hAR)>k~?5cXJ~;c
z#9wry5>-VQLQGw(k&7$4azr!@eMO|H3H(1#v$XSwfOfDJpgK0H8x7%cu=>p08)qn<
z!~`us>zOoT?{~7g=R^3|Y8#*vht3xc36;W^D;Us9wLo3Cp(ToNg;s_s($Lk~8R61l
z|2^>3aRW|iJaq&;bR;tFmb>uBNPnx0qvys}O0DQ?hNF~MGuoZ<|NTe{fuGOLqy;&C
zcF>}f9r(8YG^7R%B#Si~yQ&Z&W_C1$P|<|an@Wt%kiKgVOktLPPhp~G&(x00rsGjy
zOX|1Sw|wYZlB~Qx#5wjm_mjA-p50PK7~e>Jv05c1j}MQpZ^_b^{5k)ISLnFr4qJYb
zG_DOP6T>p}8UBZ*kdhVB^QsM`CcW$t`cFdLQ<y5u;68M;Yj!VrNfhGnAouJ0|MP(i
zZqzEoHlkXE;usi&&WRn&Ard6jx_&}xAcj+*&r~mkO@zySbkTEoYC#TIx{|*ncRVSr
z$ePpu|1zYD;-et<+98MiR=kmg5;DI3=M&>7{WCIOU#`8RwUS%5d-tzOp@ivtjS7c~
zZ4TBlQ)=F@e+dw?lf9lt?$M+)_V>(44Z-6nN8x&8=^pI*w%9u@-oE1YR5h~8b~n}9
z*gRIAwo4}zNX6}~a8RS4+ES>6>zUiZG4#4vH)vP~od4o*il8Lc+$HxKN&mBmqdP;^
z?H--l4Qu6D&BlokM{gN)Yn_aOfJVZ*RG?M-Le9Nsvp_DF5bxO|wJWfX*6Y<9DF-{%
z$TD|VA$XKSGs`_7;n7HgDYL`zb?fm<xg-9{Gge9OeK@r<-DKm`gOd*(r{2%01}wYn
z4{RB7PgYQ*ov;k!yh=XGn0%`Taq5Fr@S#YoJHIJ&1UmD7^Zh@K7_;=Z^?kKY<o>^i
zOzUI+AC(%x(ypi%&+%lbCL8K(7Cve2V*ge@g8O%^JY%W!eA-he{)lSuK2b0pr>hfE
zD77MYaKGnW+^$ADCyF=rhZ4%B6ly{u_k12GMWvPOTWPzn{DF%Uh<f%<(bABI>It8R
zSjcu}P6UHg-^8X`zm86|z9|;3kF>SL;_z(3K{0Xa<SCOUfsr?N*}itu-r(bwk1w3P
z!!Ydc`t0p!TED$#FPduix)1)y6l%I737yY}O9eMBX_&iYKQ}CF6^~RtPI{)LhVn=1
z6TvJn<W1PRuoyt>ii72i2dNz-NMnGjAnvSZ4o0)_6Escmj}Qc4``XRy87BrV(+Dd6
z4=0xr{JoPrszH*~mf{pRUAsoRNBdkKj97pLdLwcHT&O<)4M2ZmGOB|wLw4X>jpzF~
zCBBuPSv-UD&@e}^^p55(aK&OfZ?D4w*h=Ou+qX96P!<6K+NvOO=5DO)6TiV1*)exz
zF&ex@rF<;y$)Z*GkGAu|+=JV)Txh&Gm__v1Uqy3wG3o8w<K}RdlhYhoj@KMHYMIz2
z(o>q_`GSm`9fI@?2OqqE&?>|;UL)ot7L#R;g!u~MG6dYXkmSt?%vflSoD)8p`q{I`
zGmV@3M$U~Ojs>#1735-$72V8>!08uCG|2EVP9(-LgRMD|$<V+8S8VufQQ;d(f#8BT
z(jl|1r?4!f=19JWN;|lr4-mUISQ$ay-;9#M+?zj>k+9Isk0TvtD4xj9s8}ErE}LM0
zU>l@rUS!<uhLR_^n6n-e`TIC>K`0(-gffDS;sE}1MlL|s0j^RogWN1Q5`uPuCjWy1
z0lI~W%p6!oqa3gf^wK2CY3|3;u9~<R%oiL<AgM#?!CcO$V+oeu^4Br<VO8VIk&5n^
zeQ?s6_GWVwGa9RJEU#d<?N90d0CE^Ht|o^WHTq`#FvR?|kPpb2eztFQYUDt2xHeeL
z?$d!9^uPW;xqKr#gF<&6q-5`pN{ywqB`=2!bXA=5Cgr?aN1s{Gkj;4Q2NIR<OpT%D
zo^mzmrK2rYEbt^som8t&e;jZH$NTCWC-1)|^#d9<>rvd1q0Q_wY8tkZJD4L~FSkaR
z6>{#3*W@&kO{vk;IevdNE#h-*i^0<{I3FoaEG<0dmV5EIFYgnJxu>+4J^fO&U}itP
zwhvT(HmILn-1#_{5p$nwkCqyRp=e%V^<GalyLD8LH*-h-dRDT0?u=JokTSk5P6eUm
z@(T23L$DnbwnKxQd@>KK$erBM)LzsF$fGosgW<LaqeUUf#tT^)q`524sF$7~rT?Zj
zjcBdf4cZH!_Z5iqy-a^zn`R6_<?pkMC;XfP|Htl8dmB3~bx<USsXCU4BSQu$Q}<*H
z+LQ%Rxw(I+EM9GEo^kmud|w$9mc3o!y7*P!m>kYP%GkIJCfS#+@bmFTt-{#nSi-@7
zS39;kZY(Z^J6D3S(3B<*{#sf4N3!RZf&uRanQx9TZ(!E=6SY0fiIlnHPy>(Pe+K{4
z;~6_F&}AW78i4TwOCt?yxv6qUf4>%FWEAEp#cg_#!C$CtqtdWrQ67mr_+3i>`;$e)
zNE=i1-|1!A)7mWZ8(i4#KkHJHsAk2Zgfcq=mCU7*?Ib6y7$xY?5a|><J~fd>l6VxX
zW;pxe?!X%|)2NF5TX)4j6kG)e;eMb#1K>EJ)JyWC-w#9Ri){>?AUKT|oSa5m3dK6x
zyi!TBfzYF-7OX8SMqrXds|Dvh()~K=Stl5q*JQ8do`Tdqn0kR%x@R%<KG|CzEO6`U
zpDCU}Luvxe3{~vmP(wMpT%jdbjv;q<z9q28(``<TXS`J(Slr|)H(`tXvUmr@d{(E%
zvHA4DTIEVlBXcgT*=ex?38nu7wHt`Om%aq`e;<d9|8V0Z?QP>xT>Spe|D+Z0OVO&S
z;TdAP$o@qs+K?U9E;&xpz+Ro%5$2&jq{uJvrKA@T7(#(C_&pEa!$Ad6WDx$Y++xjr
zs6JQwz&HoWiVVWx7HM}F&Hm6Y&8GfZ)Uj!v@Cz7H;CHmMp>|;Ux!Q1;WiTB4v2VAr
zD*8NVRTb(eG#`~gqST(jM*e|15vIheP=SzY4w$P+H;m-Wb87Iv{Z4=ezCq`h2+oFT
zgW+cJKmAee+xV$r>Zfa8YbR=B$nU<h`rpe_sIlwmNz9^HSZO08`*Hlo-S5!@Y|aHw
zY)~o>mZnf;cd2KfBt8G_swumkiu~-2gB54~vJ~nhE!W5NaS}U}LJk$tnh~t-D@1i!
z9dT?5<#dnpDtE_dC;iVweH0XG9Hq$0f7fn!k<aYaIg-HIGa!Y6yIdWjFur@?XJ!T!
za{A*y7QYQid5+D*t}?wJpPJ%_i|b1%*q7Gu_=OfLBj<DPF;bJk${1d?xxJQyS0ZPM
zHPxbIZ_zGd{w#EDq=yno6;t!tv_4o2S4F0)dXqeRSBVGx|33eB{$yU{PaeqNAhS?F
zQ@|ntcNB0Z0e5C_7jstucN1{1fI|cvD&Xz{4ij*=fO`nIr+^~_+>61HW>COU0`4u~
zXaRp9;1~hN3OG){@d8c|a32Bp6>vWRCki-8z+wR>3pho<sRHgV-~j?oW3a@WF5rOz
z&Jge*0S^}N5CIPr@Gt=n7w`xHO9d<wuw1|j0cQ$WDc~#tXA4**;2Z(x3OG-|Y5{8m
zoG;)40T&9mNWfYF>jYdZ;1U6s3b;(b<pQn{aHW7p3b;zZ9|~A6;86mG1Y9j(gMf_!
zh6QZm@_#2WPDlN(TlIsqKWj%J`lmDh9pS%4M+)VB6J8Q(mh!_(9QF^&I#naqJd^Xt
zEOEb1E?vEWo^;g@p7VgDBj`vS>K|))ONgb^>jdHoIIN0rvl92~<m{uEP+EQet&1eA
zohelMJw`uR%{tiTIt$LXu>3T_&lCJ&wUwpWEK&Rrd#0LC_Uwx#v`3{5rc$bhdy5S%
zUEP_{a2q!<mpHz5RGiCDT-5Lv2}MWhAph&h6lJ0`4p!6(h%0fwPOcm?iBIgbcn((7
z<@NjSSWk=2$n7aQuaom@A{=YaVhL+Q3blC=JEo?{w&k1`MxJ^kU+CgqC?(GC<cdEt
zzYv!<bX{sX<;6U*p4zaK$GbYf6vjKoL6+!j2{Vb!EOEU|E*ra=&+Lrrq?u9qe@_(r
z!{4{GLE1RP|2AsJYL{vEYR_o@(0A6S>$UniXa;W8x1jRpSH^H-iZR~^8z&i87>^on
z`QP>5*_|xzRc(}`o-kAUxQANx#t4hJivi3W&Eqf?$}w|aR%20NrZa!Q?foT8_(RT^
z^$~6tZ{)GExE_aGM@2jOKC)fUO-<C}uZKGYlwi*^@F3c$)40#L`9mHOi=Sw~aK?hS
znw#5knVnlLG!;IT^~~iKJ{ZQsqky8bvlY-fX-2V|x>%x6vxJ%<)+fYhAT8q!<JnW#
zUCa1d(YxX-ss0K;;hopa7o#LNF9a`tNUO}Ojid~$WsF4|qyGglI7L!P7;NmKa3>Nc
zu-}{bN-GWq^Prrc>A*7Q$xN{%G-C$aE8J?o)VfTy=Gg~O!#x5@%8-<CEn9pX7?CJ%
z6Sdl45fTWO5FQ6diP_Oar}U9A%WO@Ei__*p9wSW2L_1C0$ciYNCy7BTj-wgU&um6n
znsX>i7K)wSf}|mcF`!FIUz8dv|DQR_<qqfbsu%A>IpQVILtVGX4QVc+^nU=EMC*U<
zssBQ+(>_ED;9zncF1h^KkeWp$w8MQ-GxdPgb6FE*TJ7owuRTLLs3NIK>YeAI-L)N#
zmWasAB<#H^$+<*sIhhrI$3gsogsUSp(?5~Pk}$`sXnTY0*U9;5=89GQU~g2y+L%JQ
z(6wIvhqf7t^ak+y<NK;ax)8tZZ~Vl+{5%OweX5*#!g<8++R#)aq9K~<im##l8@cdJ
zv3%!$DPcG&Rpy`hSVDu35a}aOIKFmw9?m9l(M?+<6suDx1?m~hZJPw$Ew!!T#%6)T
z`8{^f!+fQZQzay^6smr9dCB26B(p=2R>TIet(kG$C~><=HeUZPj`1fIIT%s@(=SFk
z4Qyz(qmiV5A6txjldqD83%WSQtHTmTO8<96x<6F@S%=)eAL_+=oqjs`wf+eC5Ou!y
zg%7}{e6xSK930=_C1q+W&_DQ<l_6*j#Z~4;W8IV54hZe_tWu|KyT2MOJ17&!f-PCQ
zKdGZaIibY{YzP+%r8|2KD4k`6L0Ecv_I!pttF8d#=q65ICs0QbcgLIpcn{AjP0aQV
zmViFN_W-nloj##9k(X%LAC+bVdvhL3&aco+S-gVauor(|%yl>0<5scQdp+rAg=a<L
zNXJI=YgEK&oFJaeAN{nOjnra^Zkh;-_Q2XbrL=8i2UX0{Hiwua9mn>JGL5pW74`XV
z5iicu9&@KT)hS<RmMDX`ZAV28BUl!I`P4O*#nH-(P4rkhYjDMGJY<IcpI{8u@6@M3
z{%_TGAW3)n-;zR^LJ(nJ^q+-O;svzHu{oEP*1o_GrW}!LO$wz#Ju_+8)`lLqjYxrj
zz*a;<aAK8vt*bDgI0YM0HU8y0##Cgv$P(vwa_O&b;#iKalg`?fRCOM!mk8E$v8*{(
z0-6%=q0UPkU;K!py5UX<)yfpg5Qn@R(QK<%J!$@=>PdXnvY*M1-hZ6;p4?yR{kYUz
zrY0}<^&WVM8zmk;cD}~ybW}h1qZ1|kt5S2QWqh<Rah%%w@Otp+*}jnT_L<7(ccYww
zq&Zc^a?<$fpOWDP@mPCHxWT4Cv0ot<U-T@;bmd>AnH-;*%~#Sls<K#YEj`w4@)@5R
z9f#saa@ELQK7jLN4^F=Sk^k>>W0-!g{zL73?Z?_El2+&cYf7O?lV`#n+pCo$gyx8)
ziL*ExdBL8)l-8z4Pc6gZ^z$mtYDZ;T5i4;;Rz~s`XvwvUYxn~F^c86ot5Zw;bDEOe
z2^qjHhtBH!k|Q}?&Oy_hLe*ldsjs&nM~H(s<rM44<vWODH7&<`u1%q2F^*MVm{>M$
z`d-0*kLSoVOLDJ~Qx3U<&+Ah8#9Ns{#bUq5&|-x6b3Zt<B>S2CWXu@e`;B)?k7h-x
zmi6xI6oQ%omT$gQvY(GRa5U@uf#K&%owuh@g&4{>U!7Z8H~1sCDdQZMqvN~ze9n^(
zgLSEedFcOK6%Zw^dI@ssP1kXp*UO0@DgVDSnMd&VH1YuX47op!LKcw6w14Z<^e{Yu
zpF|DN>8K8NW#25k2V<JyK`g2a)|S3l6&c3VT%mL$wQX{zF4a6x=`G@Hg9kuadeoI@
zV2&H+8ehneOgUHzM-eVJ9_On~jM)vK7Gkg3(Mnfg`v9rK4&2hR+KNgKp(eAGSyFAz
z^MfXb`7#&yY9@0XX0@NuW%rm_tIX_dTZH*hnw>&q%*&qJZAxEcd)qF=2eI{T@sI^F
z3r7n<(xe=jRDtU}WPwbpT3QoCgaI}9VYhQnN^`Lv@qq4&>4?j)!m*BA8R(hbr+APd
z|JYe}N;tlnrgEa9B)x<2;;j*+Rpki=k#LsQ|GJal@6+Uctw0-&+$9UNChchLd{hGd
zqxPA;lRjCm*5j!Db%Xwh{u-)(jWnh~FAz6QHLf!5HJ&lH_I);dt9J;!t##@;4&CD|
z1+A-nWIB)EDuK}1){2y`?4{|nF4~n{<va+kgo<^MqiKra#nJZGE|i36<VzP3t*jeZ
zSFJ(;OfMqtPnZqkJSwil#(kP|gkm36v3Qoq>^mP8+Vx6SS(NUHtO(V?@`;+@n`zZi
z95e7ehd&#AwpP@~iQL%X#af$lg-t@z8k!YCJ+Cl0numy`chhT`M+gIh{q=)&fsQRZ
zxsBra*l(H>?%@9DW<spWY)lXOb0is|0s>pwcA>+rq6xdH?f_x4?1%M2e-2b!(ZZIc
z%(5tiGC#W-k`EIz%Gi?^N7q7E#H|tC;&IY&+>Xd<t_3lV5red7nN8}PFI4f?PcCFm
z*cD_-CZ0Ji=MpQciA0aA%M!`qQI)w0Z?lreDVEp?2j&0!lQ@ArZ%6$aeY&<;t0r&b
z!guzkBZb<Iel56)XA0}T+p{LubqU+*mAPy@EA2SJ7dr=6R=dro#QA;U-A8g}Do0jG
zr0SV@#20gIH;;5Wwur+#;`oVNc(+htT$sz)qx`a8#@<B}<YHkYXZ%^r^di|-(Uw9L
z<_@o-BsTI)4*(&e<mjoXIm)_7?z!rGzOtRiN!)libtJQm_*z+t&rU#@PTY2ZoOJqy
z49^1vvgsn8TFG8cU$03Wf}*Jn5Ud+smsU}`4<eH5_38UO$0v8)v(n@eDOPaVBN@AG
zG1VtaiSj3M_G?da+&S_frT;sT(+U3mhJ39})*8V5KcQ=&`K>q){%j0H#DAml9n=HL
zJz$g`+_ve9cgbn=INXmI;Pw`-^27Mih8AsIs|>M{#+db|IoOZbKyjcBW}K(YGf(it
z#?m%+HIrH87n98xR_cept^*C`tkRGCu=4KjzqwNBrfyri#nIK&8Xp3!#hC#{osswr
zek6{p&cLkm^Ozi_Mzc(rew2@nrIi_WNgqqh?kb)#rLF}&_FarW8Ft;OK+nNm{JUs0
ztz>%r<Z1Pjr_@iKJo&)-DO2mGPOG1GK)nsWZ~<QwW|;!0qw%mClp%w*c1Y;j2^S$t
z3dpE)hF#C~e=}(O-@(Z7*`&Rv9j}ds{eMR8{&ZYvOQF)6Ukc#H)lk1Enbjc|oFER#
zO)I5CvO5)_j`AL1g|@fI;>mNEb|pJcep>f2KO!$XLc+W()k1@>NBW`(@cI&>Xi4Vd
zp!VZ<*Et%jwp6qKMRaqvar3|-srAR!9N4v){*$KCm1<(%h`z|E%0)-zyF)hKej1-=
z4s)_574~n;agm5ha<46}E8xhwe=JQhoI<sA_)++qq|<r>$0X+ka?wRBUsUyjIXuv+
z6pF6<wL;jn2PL*I<P@EiVyk{IM=88Ig-YvweH<hwFv%$_{_+66Sjms1#p3(_U}9Wm
z9HBps{C{t18?+tC4dh_QZg>0AmO`mGzbAm3EGvXqhk#2?oV%0{^~AZ-P(vw{i-S+A
zujlF%z}dFX$m8USxBkv?<ail1rPld3Zsh2ZO5`i;>;K9TUH4~cGHX+)>gJbScaerm
za<7r|QpYfC_uqZ2gsnY=+KYab+3t>e?*4r1tMB9!%sH>4Db#_5D~qpF)71md)h}=U
zEgy1(Iqp*(sW$&|r9#_S;(nc^UY*ae{_Iw1Wq+7zW!_Z2rfHES#?xd-5&agq>N1Al
zqP1NTf+JIF*(u`-ft^)lQjg$USC>4>$A42lseA7Kb1EUHlHY5lR;G2K`roViNPUr>
z)}Ml|uM*XMP#)+z|I?Qb1ZR>mJPi`)PYjl`bkR^}GEV3+bsS};Sx0B_Ow<^qiqJ6P
zPLUrQQLB+K^L-t5X&>5IK7`6pLwGGs*}%EGoBLojMWa}}IkJ8nZ=x>aXCG%(u(XZl
zph8+}QAB&#6~4GnT5&Ma6yY5Eu**ICeW-4mkFOS$|Ke099xSB+x?OQr2XNRmz9v`O
zwHl2gOanjcrrCj>o%`l?>6=>Fg=|;I=!LR2P}V`kS{I8U5gyOpIPBU!WFS6p+K<H!
zV;>E>u@8xkx8h|W=*Am%OL+h$W)J5Z-eNf-mBXl<O*8M)T#LxVo=F5g?8<S*La#0`
zNE)oW$EtaOo?$+2EFM2)#(^^?(25>W?#ImB$Y_)`6LRS5zDK7z_L#p$0xRuo#?%SH
zsy5_ZM>=wNK(ll#tdrZh{_kvJ{0#oTKi7}Yey=SjAEEx=f9cOrDHNvj8@S?B%R(t=
z)6$k!e!!2sqvevP4JlNh^Bv6LRIWm+YPau^7atzMv8;PjI#}CNs6FSG<hm=vOI$BE
zci+uXy4a6Vht6;Oh`XQ-!@G<8O`e-9;&F1O8B3u$onMbtR~>sclFO!fCs!PD5})Ns
zr%DUkoI<^4zrGSV#)1<03OVZpmLs_O!LxoUVLBnz1^*MzRN#E4QMz8tEETG-iW0A1
z*9BN4aP@=N)k-6%Poeg+Z(nV@P0L~7A~)VB^nX{pEMcJZe-CmW!QVfVziR`uJ+uR~
z+0X(WgE}BDYhR!S$UgcJ`cl1JKUq(r4#>0mJNnngV&ev5i?Qv$bVyieg{33MFV3tM
zmJYiST9|>{IXts%=Kz=<Gb^;4EyCU;^YrFAVa>Biab|-s3Ax#Pg{h5FDw`78Jo3<h
z-VKcOI`iAg&u}Y@e3{lUhuN2Ln6rgxi{2x<gqw#8gOm8tu7@{Qi5b%0GMZ0e3gg$T
zV8Mfh4T@g1>o3LH(aTO1rR{#Z7E-LfP0=VGmr9o?tcb41mAOGYe!E6c3|~_EEiTY|
z#^~mz$&)8R@JIEY(k@!V52ZsU2InJ5C{5kTvv$%{CGjp+kdUg;7KK?6LYnoYs<pL?
z1z<6AFY<Z*`djan#;~2tpZKQIU?mck)wVz-%W9+6wa~JLJjAP)n{PMK>>{nGy2vA}
zDpByBl^HQl-6^1tz;sJDM0mKsot*yfON=@C8+wOsYG)w>_{n5nYm3?7@-zy+K@a9j
z{?0zhlFUbP#{H}qd-Vh6&!l6hhop6W*81w*P8f46%nq_C|4Qz>acs?ul|lM1cMO<2
zJ@0*u!82^nGpLXByj#SH+chC+49BEtRX9yA^(F3kI01M#2rS(=h-1$Q4QfcCw6kB%
zNZRu39LpX7<g^F3Ff8}qBb&QospI{#46Z&N*(g_=yB#@g`6V^eYq!vU(yFdbp`5c{
zP1-!CmA%CIy*e!xFGo$>Gc|QAp51i4+t=$umoNWgfBUEf`E86Bf_^YZSxV`Df4!I>
z?kBF_q`zV8VJt;0peJnm{`-&LuYk1zeQ9YJC+vATZ}ejYwD(|h4)Wu5m#Y^w+xyTY
zutCdmfw|s~sngvL#SHmt>+X=`#|-W&Np<(3t>N>u3(4j&l>Yal`M-Ke%$TUp*0yN1
z<SFZMf9tS5jY`4`HLAl`)CY2KVTR+|xNGL~1j+Mv{iiYu*a>M`zp0;Isy>Asoff0m
z7+lR*W_o-GMo`idiW0^^Z&LrJ5mdCI#kA({CMP3Jqz5n>ez4yWsJJy18%H+3z}%c%
zaIa6Jn(_%=sa2elr&MTmteb_hLxPwU<7WO%?$^m%sg#)XP>IC$gwp*ANzYo!PAfB@
zI&pt%JU8Wzzda5fz4c=uDRbwR-{DNH+L}gn=Ps`pbmt7I+a`2{?Fi2h{Pw1tOXQKy
zOBF9tD2@8gehpsElml=fvt=M4Klzz3c;&>T@%?`~G0sB$pEaodcb2v*bqD%y{OK{$
zJ7ebz@?yZ93p^iHDas(-bU=BG>@r6~U0RNKUoP8h^7>WVd-Dy7WlyAO#U@Sny?^Ou
zVOb@uMPE|Ij}OHU+OfO#tC_y@d-R{QjXKjiQZEOO6fn*OsE#eFqkb|h+r*NpDuLMb
zvQ~KVJjIkl=^|<}_egN)L~BjVIZgWQKwf_xN0WR)9FyiX20c7D+>vDFmzkc0UjBt_
z+UGB-^J#RNmKoev5BoipYg<E9uI5Vr@tt_aEzsgqjr{6X8h?!A5*|LnkA71=catxO
zigrZPD3jUk6`ti>Bj<zWk0bXQ`Cu7SQ@aoh%Kv|#|1ba3PUKH(5ila)8Ufb|*eYO~
zfKdTs0=5gdPQbW;9RhX=*d^e40lNj<AYekkqXj%hz+(kGPQc>@JVC${1?&-UqkumW
z@FWH|nLifrWC2eR@KgbRBH(EPo-W`S0-h=0SpuFd;5h=GE8uwo{#3y81-wAO3kAGL
zz@&gF0n-BZ3V5-AKNIj00k077N&&AD@M;0C5%5|8uM_Zk0dElSMgeaU@MZyT5%5+4
zZxit60^Tm*9Rl7d;9Ua#LcqHP{H1{R2>2@j?-lSq0q+;^0RbNr@F4+zE#SifKEmn$
zI%0(N_w^8}f7X*P$-4aagYOnS{nESRAl^~0@_P`|)4n#=6}8lzh{B3OM-vy-ml&_A
z{+&E_%O(X)I4V7qs)a`T9f(i}^HbLLh1|WaML}4PPSbLwhJL78pXWT#*<`!g<51qB
zo;*~}Azn7x<kNKdC0cldVtzeZdN8mL(98YKkYX=SG{E;3D(=h|!A@nq=l)23{p@Xu
z73dk1rd3FH)vNOv#5`JsbPnii6iG~|x*dM@Ehq+>WjMU<(1xrEE7l~Q-j#YldgRu1
zJ`X1`Rq<DJSmdLb|5mNR(DW`?gOU1jziR-03?`9wM>>$#V!vP;)&ucS;5p#>OZEEV
znfSYp{Pj5%!$Il)FqHhn-+!Re`1#tEu=;(V7wMz*{ZSDhuAhXczs>rK`X|Ot#(qW>
zGXI@u^cuf3{_K0lZ`X~rFwBgCrNZ$vw$msRETg^-=Dl_3bM&{>r^vkh;I}%^N;c3d
ziURsDjI$hZ!SN3Bk^=*J8@^Ka54-?zng_o*930Ow`$XE>ky<ayl6JO)QTC2UC_cu`
zc$+H1(GIJE@Wb3Dh-);i5fx}=LU^*WZ#~LG8aK^E#*B7LWW9%1Tij$B0)NRP5IuAw
z=1;h7aT81UIlDE|*s*p^sI`f0-YdDOkNy_zWYfKsm#W(|s|)3hX=ti-zR+5Wa7J9q
zl`%JRli#MQC@l$GjXi)gspXcc<_^&<6l22w`XO!|&Xu^$A9G{vCdc09lGFWS<j$Y?
zZ+D5MlYZkr-sakH37c}t4IlsMG`D6#eEf|YKFD~i&-27;I0lmu0MFuO0yn`jz91e-
zV7<!1i5NV8W}(VaSF}0Q9BOCXr0M?OQQMtpyCd`Gx!P;`AjJLG>!<3s>o1}f$YDmp
zxW;&TySDKE>P8cdRql>j<p)eTusB;Ts;M>9&~MMVfu5lrx6?K_yWnjYZit7Ps7ZNA
z3`S#+_}2E85WY6htv;ze+T3s0f&dOaSAR5yy6?VPx^OyVJKRI*oW}b@buu=Iy(bup
zz3{f6PAI=~_df1y#lGctPVm07A{31#_?^T1xRZ+B{LWpx=Ti}D=J$<OmKbC6W@*RR
z#CKLI-1&|1Sgf6f_tBJa@km3gp(QMqY^>6jk=rr>W+vDK-%&ogk=`#@1&WiRLRO<#
z@!j?@mU=v!nHw75O36Fk$-Cp(q2^|Am9aK{_YltiFQ@UpJL?;@ue4R<S7iCOuyyOx
zC=FV#4+G=tN7G*{h@BvMMQ;ZgFEzJpvr^OFvsZdAa8={<kYDC{acd_^E!5YwAfH{h
ze*B{FMBzF*VIo6cABmzo7b8lW{NHO#-Hng6e4<pyp=ZzZ2#j!yUjMC)aCHb7Oei<g
z_W-S1jfu~Q@f{+MPfPEK@#P^PcsZYVd8Uw`_rFHP91lwGfkEUUAoNMq`lNg0{?k~}
zPZxz)dwMtxBiP?Br|uxYRh+6zoCUi`o-DgZu>y%St*ib`6wa1hLPa!(CYt}C?Xedx
znwG1TW%QpMK*$N$_n&H0wU~C3_D_8Za{pYTe`%DF1B_1NdgpmCC(tw4{WNlL>&5W=
zYJhGYZc&tP1!u|<H3!REkzRqzFTYjVNu52pEpkeE_<FPzT-WxXwYV~+KfM=Pi)&K`
zYkD{4Jl|PW0c;aj)<A0BC)=kad2&an&(%N`5nxvs!}y3Y1i{(TrXDdbROdXE8u4Ty
zv_cg!=`M*hqtG|QdP7~HXM&%ZBVh=A&)UH)(08so2B~8bDrk2@wCD&n0yH6wHqXC)
z&CCF7O+J>>%Z_B8GX<(MU!7Qj$<0c41m|ijihxpsRIyMD^H+-luwM8;l#eCCJe|`2
z0#Zke5`CR^J$Vctzww{;^bhhnLfynfH`!6!qvm$S5!zFq9u4zzGn58?Nv&hCw^y^k
z1@>=8OTqdYu*1HbSXb1@#JW69Yi-x+C-|KqXQ_(iiBckg2#~e3j2tpU)x{xlH^t&@
z9n}1fg~&?gmuz>_z*8)DC`{<L$<ruJ(>mP?_2a(dY0$jvj8n>c7FJ8+m#_0@QT|JL
z5|!y7Ubn@1kM<qUq6(@TlpdfQU*7Y`w%uV~T+HNZX(pWiUrdaI{;poB{Z^Yto*|3B
z;Sq35dS5(ZXubV1Q8>2QTbXn4Z&Lk2p6@zSaTcsk?~}I=jDu+sOdK6i?sf7~#6m1v
zxD)9K-;|G2q2`Pw`Qj;FqA-__J0?9oza^)$gZ7x}+GfW<7UMA<cP9)DF29hMH_j1D
zF3-GYRC*lHPtY6kc;cOY2{nBQ{N7BSS)fvN_Y6#r#ULSQ_}#Pe@yFOu`vIAA@XL3Q
zyQ6&LRn$ux56&)QFq%A^U1*}WalxwKf-n-zQzzxJi2bQ~{Hg`s))Y^U^8W+19-{SV
zkLUyR+0gv`&L}kIA|LQW-|!UpzPX<jP<zxm-aZr-U_m?)W(1<UAyf3`=juREmo606
zz4MjHTXXwx9Ew~t`Gq?6y07-UgQQ;>fv$sd07AApWBZ4|Pu=UbcL{j&>$e-fkSxzu
zhM&7HA(M>G%wy0lj-IE`{XdMHNAUL=@>}wyHcH!HTcveq*P;@@=Li-$L_bnLPQMtr
z!C%rpfDLelvBc;`wD1FdUheI>M_8>K5+qN?spJOC8}<+A4X}~rK`G2@c)ChYH$n3p
zVOPo|^D%Fp5YXoXl@IL(k2%{U333Mnpj<KY@)$EupA^uS(?<U6!sqfdl+0%Uk$-N7
zhKMF($BODq;4yft7w48^uih_2u$jw_WWOiHLv#6^@A)&79f%F7!Y?+Qs=2kFgf-K`
z&-aV1Pq+Ob3}>{BmxqD*Q(>H=H!f(U35CH(RW)*1{XW~wU3si)g~^k)R=cj47uox9
zas4naI3j?}$yqjta2>FfMuY2PsP2{VXNTKFM<*?qf?Qi2EuqF(cLFBlP%Ez&_yFhs
zQ^e@fx9VqUTjBpZoTRpE-+s%Dj!RDke^j7*q(#g<7u{cW^*$h<e8$o{xhR6;=_%Xq
zDUxwjb!sj-sUr7|yi_5(tV~a)0pA|E#+-A`%IaBzdcjRxOER~jQRX@KN*7~IzfFq?
zI8b56@7o}exp#+0ZsuI^+_};SSEeWBHUI3fjAL9V*ba&Rq~@TD@1p-C@9LgFdLrg;
z>a+Yx01hjVFcM{^A=zN$p9?o~ck8)xE2UY&2W~%%BM%?AK71qk@SV{1QwFQh{ofx3
zKjTPL_dHb}qFt;FMJ|AEZUGFXQ64rAmvV>CiNgaW-oZjHUAE}bG>XB7^gaAOP0NMF
z@?|OiakF9{_UP#Y@q{3q`R&{7O|dL+?k|e<>%c-*gJSO7xpE=+^=TA@%`=+Eg-|O9
zIQi&~rxj9Rd%7eq4X$*`F-j{L!5GOWH{Eo-V#Qaar_nrDBm625G9m1lV0LoSn2MSi
z8`|kVY2$aK4`5*xejld0kCD6UQR}0u`iaZy*%M6fkCzBq5x;mHFOj=}I-?Hk`@BUd
zQ=vOFnkMlBw|t~@6jA<vfOZ|xuG8Mv%k>NOca0;E@Ao|8(QlcYf8X6VTLE?XK_^Gx
zc!gw=WZtwW0Cxl*RwPF^Zf~M>dYKp32Eb8#8(n4z>n-0}pIMKNpZT>R_Br+JzA|qg
zZOql&=Z*@F(T+~oRYpuQLVev+T-p+8>tNEulqp7Y-?yUzLTPI(%3LES9AqT=Y*EI7
zmSE0B%Z^SuHhM}2DgEDp>_?2GewSXVJ*n-CFN!~i@jL=nj|jYI{T^tJcXNA<Y{Jzx
zN7*Vg1n8E^QT`IN1bJr#cXEX&LOi7dvFG6Q;W)I*_2c|fB8q&wgfB*yx2Gj}sl`%q
z%bNIT`mpT}Amd`WM7Zf|LjDp{g$~Bkhvp?FxeCl|C1f#LoB5T>+5vO#A^#0?FLxyW
zc3wo*SN~~)Ibp7tFTID2>4RySGmmVyj=fdvR5CerPUPG}-cqn#T>f7|jLY@=^p)B_
zko~uSEKwW)zAyLeo1TSDw7=fwcN699+@7~PJb5T+Z5laZzdeoG;@j)<CA3Y>UBfSu
zyQixJ{dH-S7)Kn6--FcEU*FY>zxryHK-q;KZB19?7rvg5y?@|XCtV^}&EKGSwd&I-
zG>-5p|5MC{DcEBc1|2p_fdK@m49CEKCFwvL5`BGpNe9rIF_51Ga?*j7X_Pw8LnV}r
zfPlOrR3at!EmSNa<^PA1dkOyjP3x!4K=t2Cv}g3)5c`utKG4VYmr(_LH)9NH0M0R1
z8C}MYjSG#Njb9rt8vpQp9DGMN3jMu<UlSZ}hC97`OhBIn4XN8rS$^}TDFFmMNOyU2
zy;B2v$WMzbl3V;XvGJ_Jtl=2F+qmp3Dc1?-?JZJf`O92Z8qiPB^LIC?%%}n{FGr-6
zwjEtmWh7SfQl2((^ZwI=wVjbpINfuX(LamprQl=dBWMDVKuq26B+vP`xh&Qg5x2g{
zb@ZFdtistS=w4x!_IjL$2W>8=k%su8l*!8Ab<E%MBzc=Fy5Q$eFKpp9pv~EuE^i5B
zm8eEe%Y);lzh^GRn?<`f#84}{FxK)&9C4NG)|Ui=*+>e^E<7bJ(3H>Y!V5f2;^w*F
z)+5nz)*S!HO=Fwq(Sni7rm|a~=BXC>HJ0306u^E>bXwgdu)Hc-BPnKeOcYgnhwlF!
z^!WrPt<&{C7(<L@#y#KBcKyEF|NmFOr*pKc5O7~UE&%RkwOIiu)!oH$dvZ_aOyOmB
z%WEXAhPhAxBBaleY>x<NKH%4T+0$+4D$4&4fd9V{BM0dJLWbXcv<I~#H9{^>zpV9X
zlt=eW;#GnC=uui4Z9y#7YB;``Re$9<TE?!pLmArBoL)eyW9+MD9UXlZ%fw)_bfNNc
zmUwjT*cI1Hn&IW?`AqHX7gL5PWXMDHVGl9hYV3+@rM^Synm$Y*&RHx9BaLjMsI;}&
z{%y{)Jj7`1id!Tc&FSjAR%$WgdK+zIaI<uwanUw0n=2(ut?7AvNDt20<Pz3gT1!&x
zCkk{)30-}9ZXeQv6J2d*xIMU-N40LYec5m=m-@!8I7`B?E<L9Y5zL9fm5p#^F5=f(
zvyxMa_n7I~5R3=w^Zg3OeY=_T?TMnbPB}xt|I__Hkc=h96-KH4x_+!aLc0$c0N)`S
zaWV5}c^VZ8VVv>1OEQeiX6sYku8)ZaeUtPU8q>@BP;@vSLtRUx12wsuIP0|8@s*tX
znYHrgN@$wX%ktVNb+Oh)R!Fv%SC-x^U8tDxyqM6>b1*H<3zN*@$}I1a_{Rd%RT8FE
z=_NEloJYumbLnak{Vj^-Zq9x#DSA!xf1A|*k?F-u^i;pA&i?T%qP)I3eJuPV=@Gdn
z#;!O+>OP#V8%SchXH8Zc9VwQ$VTn7AUur%2l!RwRy0#C~qH`KGU2UrwZ@t<2M0&38
zFV^U6sq^~uqP)&2JMV61<ZFv61cqxQ3@g$L^BR6etk`UQA}1ectxa0$oZ0{Masu05
zhkm{O9O``@Y^*UZH~x^>{NI20eg(W%Kv|n}X2q<<%Zq8&*<hBjDY&4-h`Dpd;{HU|
zd95yi;3Ou57hIx@Yv;`>Ly>p_DM1)nD0og8m1o`E+6q^>QY2F0*&++BR~8P+wxArX
zr9ddSM_D;lG>Alzprl#I_yw0MlNXEIQRcmr24gj_<VzNTEBJI@W4YIIRYH`fxg(&1
zD7dVzS&I~zP!ouC`W5H@k^lEnL;yaC`k!BF7ikBQmyi<pyZEyvjhcxa`b57Jg`Jjm
ztwxTXgKRqD5^-=|Af0W?(<q>r2iKC(lx(&>RV~{=^euBOtJ0`qo)75_$J=5&ebwgL
z%;)+c=ZOC0x^kg3>Xm!CPdRB;E!dR^vITLvW&gIYo2$>quDD!UpXM~mmFFR4)x<hM
z)tjS;=@#VCdEwZjEGlze4klKd+_yZpD7+eJT!YK;AIBtJXnm69vxhu)orI|&jl$$G
zoB8Eb7lh)W*2K}4(B=4Ad-j{+>0BXUX-=aYc^)e#YXCP(7ZyD8M}etV!n7)lg5-I;
zXILmJO&TOf>vPKi-J<_Xr2Z-W-;GQsq=(#2-qA*p)nvN1TuW#-YOm-!qw-G_c7SJ$
z0%QW}G_KBM0#fE9spwi8F0PD6!ZddY&ZNCI>}4G8etywg_v%(2S<d%6!%v!jQif0G
zw6Mtu&nu5#sg=a`Kj*WZBu1N0jD$Sps{difeZfX$u69lir~;!Cjs*>wWC;b=Dnsu@
z6H3hB+fBC)D@6l}u%!>GRvN_?h7!Fl(#8qrFZ-ZsrKnNf-4U#8P0*)X@OmFqxpY0~
zcc=pu8tL6n_d(0bLaP&SYGL=jq^#-AXN$DYVOEL_uJ?_Rj^?fi&j(rXuJVl%4N>K1
zb{IL+EYY;!AAO)I55fFkrLdqiC%fW&_Ae-3MUJW*xds~J;4_el0QvjE>@X|%LmvZV
zY0o+mZAcrA>_~LouIppnDncD7NW@C~6kOfM6QN;aZHN=#9K&C^{15-1lyQ*$0_6X_
zw0oKU@AO<hpjBy9Se>tp0r6I(^eK<SJ`ApBCU`i*{$<2Yhj1;~h)rKAwSMc;sHN&@
z6L;>_MZ5%4)wnkJLLnfMu9b;XFVunPRmat(%eirN?25~z^KW^Yl~?tx*;rsD(%Wo(
zI(!~a#y@t&%~Id1(kPLh$JuSOCT-4suDZIZW=8u0`cLY=K8=#-o(6X3df5#>n{8j#
z?)Yax9j=xztW2Zyxu@;fiJ`V7#Lp3PbLL}B?Tey!x#-i%G^(HH(R<eZmNmsKn!Hx@
zez7$6RcX{Z&tvs%hC`bXan6q1yEj*Jyef^F=6UoFM%^+D;^|tSk9pAInJ$#Z-;i$1
zi<7Afqk?N`H}Y4pZQ%I2YRXMDGpe4T|0FDw{(qnUJAY9}<WK&MfR73ITLv#NFBR}I
z0WW88v-!AyzZ3BH0zM(&9|YVY;FAJACE(KnJ|o~C1^knM&kFcw0iP4_c>!M#@I?V%
z67XdK|03XD1$;%ozX|xNfUgPox`1y8_@;nw3HY{v?+EyJ0pAty9}I3a-xF|~fbR?V
zfq)+h_>q7g3;2nEp9=U-0Y4M)a{<2)@LvLcDd1NE{#(GWIV>UqY69v48Uh9cED&%9
z0s9HqU%&wZ4is>ZfQ15@0u~9lqkuaJxU+z}2)L_&y9qd0z##$-6>xU}hY2`bz&!-q
zQ@{~)|BoQI5&Zo%c@7f54%%MY6yyS3uC3LM*Ur<ffjwZ0_J;PAK3Jcs&(qJ;pEPzc
z>Wo%+0^MM2HvX3X-uXr?gja*5nKhr`LAIM6lAHOmxXmKc=DWfd#Em;J{~;VTATT+^
z&c6tsj;tVMzQ}`09o9MX58}S8U~m3S_>5%8p!v3SQ&tK8tmw=xuA8q2Hw~K&%lw^~
zq~lOGUl%xRvXOP4!$$JFn4V<8FrO3Gb7U93R$EIO<4DJg0xR$gq7kHwuzbM%X112L
zuI_3pjd#|zg&?FOKTXj{?l+YArT&-$4wyOffa&FvC(byqZ01CK!>9cZESWfSN@eA=
z88aqV&Ny)Y<Lc*yKnz(Aqqnn%>=?%9^e}Vgl#<Hw1NNUdb9zPD!~;qz_Mccf?ZAqO
z6*H!l&n%fdd3t5#6#EzkZD$XeF_`c3W!+j9>g;R{qY!&5U%9Wv$}y>ciUf;d$WR1g
zU9>CrWZR1R>rFgiUM76E+G5qs&v?e)t>q{>f^s)hDOM3`L)mopSpF@LR)o4yGCYKg
z&Wyn?+Ly;WZ>4NMe2_X(?jF&<P{%ei%zIJ(zaKf17$+OLUZFjutt9W^>woFbsx+&2
zJW8z|v<nr*bzw-OY@X)U>}T@Jg@o~hBQ~BQaXV|$9aQ~Ttkw=W`d^Ayn?9)8&XCZo
zZOysVHk&hWBR1|WA?rxTsW{_N%g2F?`ovU5AeRE+>`<fdVcY6@nVj+U=VFR-$>{d<
zI_k^p;aKdz>bl2WcYep(Wdh|4X`(#`rQ2D^#0j+Y*HBljhZCtdJL-?|w>z_Y%XYZr
z*|gvqKKf(dkR0t%B_W2<5AX{0bd0_(+}4f?33yCZZK&==<=yNlkM~gh>rr=eL2Jau
zBc&x=pN`T<&x3uwnDnJ6gPhwLg!W@exOKhoIAm{&%MTllnkJrIorIXu{~bw);O~{>
zO=SOwXjf}5=|lCE`nk~i4L53y(~O6|!EvC@Z{u84%xG3T(gr<7s68A<vI5lJV-kJQ
zV6`_^P8YMWW7*lcB-Gl1&rI)BG*Ou<G^c}_5LIx|RNd@cEgGwKDa&cQAlA(?twTxP
z$dq?=EpUnDlNh7)jLYd}VHZkGV;$P8Ag!XHQqPprcu|BZ#n{<i;D6SO;dTW2FxP5|
ziXkYW*!M=J@8QzO(MYa|2UgmSvL#XE3*|H3MQP`A4jP(As1qYr3F}YQX>=UzGKIWp
z;8z3G&DPlasUszw9Yj#f8%Ynbk2~qn%WY$p$-HO>rBcw*OAb9SKT>LprH1RdopUMo
z*DWgY*{&thN%J>i&oc#k(Kvr^)>6Ebw#kP1Lz+zKe}A%!7#+p{RQedB-Krf7NnqJG
z*zv4sbNX27+p(`tN{-Q?zDYFm7HpL+kkh8zB~Gvo=>%J!J|>@|a~^hNYa&=CNV|2)
zm|GP;bS^(aAnuY7$J0kM`tI}0Msm%}`Xl|OU<$XoUS9kZcljByalag-iF}YE0t80E
zPDnLS4&hDXhP$n<m)jnCTg-H=gcR8jHgFQ@^Kp7IvYu=%IscW-ViZNvC|0Jssk(5K
zPbLEz)J8DDG;`+G?B|KYdG9^_BsQQqy*{58mKsd#$JSQq0{O{-HDVrzN%QC#knX~2
z?(CI^&~a2O3a>}{<xZMM8|0oIR^T^~$fp%D0Av2Q_H{=`sl^eON`v9{|53y^$Ji4!
zKaS9Ttt})UlT*kjaRM~<qGE5Gmy?!btdt^TX%N_Q$M?`)<HVvYk;W0}4N!}!hhu;P
zO>G438=c&LgD-)6h5Y0LYt9W4t`)ro^$YMwvg5$DAQX)>a3q<J^-qeowC4{}=h0rB
z2H@`R^HiYgBT-+zXwt<|4~Wg#GhRY?Os|Hw$<Pn?iLojgWNQUK6Ch6nt3&YyW;!x)
zEGT|D;l`wRZq*X@_FlM;`WH85Zs=sC&8W5}8sla`bF16c>UC?xPW@6s*_1wk?Np!h
zmBnybE?;%T%VKUvNQmO;<MTOd-34=ZdA<1wUVmW3#x@CQYx+3qW<AB{>~NCD*pV<V
zOFMI~EnFQDiz!<fIRB4=f9uFq<SlKq7S=9j{QnaDEd4k7*T@8VtnrI)$_?1sD~;HW
zJ!j=RVvOw0J_P_&jgNO){9H9E2GTSKtcM+y3I82fY3+D=sDk-sHMUsWLZ8@`o2N+g
z$Dz3rW%F}os(#1NbDz2Sl|TM}F5|iwYqB67X4a#kA1Jd*I*=+@Ci7qZcxPG*8-a20
zt`4X>*ji8UCo@#XCqX=nw4(AEYc|Xuz8VPYaCV3W7m2E2Ma3S4n{1}+;`ys#U$)WT
zC6KaW(GZICWH`B^fl5~k$C_nGNRi?1`Ov`zLHaTDU~QNSv_obGz(4dYpY_ETn4fU{
zUkx$3^)K|J^<A|S$U~&YwqNu5*xp;14>fSxZ{}9FtI<`b)f~8L3;idZmpupd4g&ov
zN66}TqkPJ!r_H>TPno7eUJ%ExoaLcsr`~}W{ZPHuCui;BO*FUqxQRUU&q6`=)=Mke
z*gGH}j&D|L4Etaa%``;~&s&|}V{cq5&`grh9M{_)GcV9feNwvGSX;Oo+ZXP!H0+mc
zhc50>xmEq!+V>6=_*Y2ykM8XU{F+yiddJ39DICnLs$WRYltaXGe@8;zQ_#Buu$y|7
z&)F~W)K*{&p1*H6V^6UPWzs+>{ojjROz`(tu>XCf?V^p*4$)Si4$wK;&BzDz9<qXu
z(Ptt&zFR*BIYPD|L)dP{6k{Qx1bzgMzz2-i^Ex8(xmj2|DiYA`SfbA&i>413Rw_5<
zv4{wZ3Ux%XI0EV^4aFMXPgFmnW|yJd{I<1{vQC!zXn$^|vx$u6KY28^^kx?g5W{no
z;LR^Y=T1&$R6svm#}TLIRK%>@4#A>A(cFX85MxsC61)&475`<X@he`4a;qyhz!UAN
zG$iJ~gkj5to(ro~4#5^JTqyFs0lgM0<l_h{8p!RRTWus&%)*ss^3=Y4%F5;^;t|jz
zjU6-em0Qij{EPM!Yq2O6;_4j61EH`Z_lYhV#l!KpatWOsi`)>myY+)4xfTU@Jynl0
ztf;@$R%CysiLcljyq|c@y^Id#HnAwMkiqT;j%!IQVKG1^*Z;K;<1Ayeew991dqS%s
zFOrsgwyB?c+k1D*hckd=3cW6k91$rY7-@04x+2Y8r$=mzN=Mt;UX*%<vCk)E%`wZG
zTXQavQ$IRS9HjLUwjR<;YdrV!Dz@#QCv-9j-8t6)D1IatpRrPmVVN|Bqk4Cy4uNBQ
z(iHpA1iCHC@6s1*cKc-<#ffsfalCh@d}Lxe$x6h4!#qGWu68q3&gJ@dgu>>;-%Im4
zrgujyt$!7V@_6+)d5`P0X!R=+_DFA0KB}puA*W*Bgw5D_g`7BzCpH_gF(l!N_L_NV
zk8-y(vxLk0{OHY=E^MQOkkbDm0s;RQsQx!eYeF8-zv*N3kba*2G_w8AftSxWvHtlv
z8n)*ifAXpFkoIS4$vwk;w#zx<eHua4Y-~|~pQv*vgt|D0^EC1>TbtYbNvf^{M(OM>
zq0e}7eC+Sp(v!u-(rvz{EV1ZBNSk-T;snl;OY@AN?(I+8LXnrZgyNAHy!ttPpXyJ=
zL|e*)t!OuY3L@4v9%_z7ah%RWydxX(6#tEL-Ag{?^uK}_CmKciDf*t;?b=~D3o7#2
zl<mEH=0n@v_$qU&+ttLrmJMZsbZqq)y|ifTAg@gBj_1wvG*l8`-fYZ!3R-XxIEf>g
z8st<zuYZD9PaUywoHUGhFN(#&#m6VXbrodHt*)12&sPd6ACZtY^$yEN|1I&}=2q!K
zVv~^2doGd?MS6G7hw#bArJ2J7lQSOryO`8560RP-cPJhxyl{N7YhIEaED9cSAG!F)
z)+jbfqlonmVdU567+k~*yvVuwI+9v;shD@8gz>oE!I-vxEeJgW-2G%Y)9C)&y5m+0
z{0B?;`TpON7(X>e=(p*IXb)?1$r)r%y8olSsN?D1l;t8inr`xBd=xKnIb!2VX)w^`
zjmBzhk1j7yS5vz#FVCj?e8iWs=RV1T+||1`O)@{j=gUK%WG)5bPcip8={eP6;igKf
zw!U{%J`NBHrU);tyGXkjDOIKy+)e*Uh~vG%d`>?);T+#4KHr?n^ER9)URYUe7wJV^
zc}R76YI|K=2s4)kwsBl1+#o&C&fdM)6ZLz%yZYGTe0ROxLQWDd(&y5;Mtb3v@81@_
zlx9Z^&W5>*vm&5o(iL)Q=M`c(6A~`Y|3l$_C3#8PTU)H1to;@GzSa88q(<Ln>}$k~
zU-{<+)HRCBk%cf=)q$F`q0Zn^q+5im9~5%MC})Ux%uc)-dqaH`kL^wMeC$&c`d-H1
ztnkPB%9Ab{q0W%zpEW4jLm8;+=mh?{Ydd4@lOoYb(LQRP*L@X=N|y$DiWT-8_a?=P
z1w}G+xL>U6;!9WNu>^{KD`NZ^Esu2}*9Ch33)LK^vXcg6zGsbRdzjc1tt-Kl)0pJ$
z2-LM>gSG9g5taj_Xt{@PprWtY$k3Uvf)|RGsF`#{`+2br!QjvJ@QGA4PQ)V(P`J$#
z8A*$l<-Ztk&p;FgOn^|?R?~E#knq^TF7lA<6yvFmbabHJ*lL95cXC5-rH;*Ql8^Ae
zK9qc<?WaYxtF)K(J)wj>SAX5u+gNIxYi#y^0{pMIQ~Rm1)Z$D8tTTVohH!CtYpkm=
zSOeuQUGSmzBT{0NQo6J^tfVm?%<h0fGBG%(a+lbl&!UGPD9;mn5Az~x!!-LCMZEg}
zG@GFGo3J;l?TW(%m%6>t0Y8U!Q<b8-z1`AKM@z5@{#1x}utG?OzJuobsYja#H^GWg
zJb8Z{Igo|1W!ZZfSdV5?)L2EcQf@g9vP2m3o50h;^`Lz5%s>~KkE{;#?BRYKvhqeK
z^%X3OC5mffh>?d2J`CfnU2W~b`SD;ms0K~`Ov~}rF}Eh|2tu@TlyW@|8=57%wY9i(
zeRI4Eix&+(d_jAAG{mOU?^v|HNNL*7ww{gL3vk0{uS&l=v7L5P`Z8o2v6^LAKV&#=
z4l|X0zZ1}OFXgIdo7S$U&Mp;ex>(A?epjKHnp9<*EqVCL&dxA=T$m$4zfF|>4}!z5
zHcQjApJ>mKU+Y8krTV>wjw(R6{BPLJYITv~6kHVR3{huF7IJoE{uHt%+}#dO5}fMm
zEu-N|4+WoM6g8ps5t<xI<aREqQ@`^HQeV6P$)c#cJzV(K!pw=f&`se6PAO+9&nZ=B
zjB9xKI!0RN<WFa7Lrv82Q~2?eHwJpD+&8cae{FXdoFQcdxx*fmdrfp_+pe%%I;>-{
z2!{m}K<-X3ibY2c;m%-PsC8{{%H%0*uJhEHdR0S36ei0&0*bt#6`#Yw@$<q>o$#G(
z4DW}%jG&KZ_GJRYP(3Grgr9khlZr~rosg=e@WJx+U%DXBGb;bCDq~&nd_v?Oaxzkb
z8jRiIJwcjX8vlC@!QaOa|Dz%Lms<ZfXlca#KCf%~NWDZ~q_0QZ?=AYX`uoNJ@B~L7
zOZYm}0l2|<$awibaz+TND_s{?rLTx`WWT#;b%ouVEvuxq6~<orQ?6cCSku{$xr$fY
zuP&NZ`>(PEtY{};^rbz!t89t}3u8aMMG@9y8Fq0;PTbPCfIb&?blTc8F3C2`94Wjg
zC_Eo%FIlhdq5>OY$xpdR=Y@qCVub~>XcyrYAo<LjpYnRQN{5=F|Hs~Uz_(SM?caOu
z&4fs{6Gni5Ldb$7iW6rM65?&gGjS4UC$c5mie<@>tT-k>P&$B?S%w*s5+H>XN}(+u
zO=-(0v;|s9n5EFtbkhQb_75%n+QR=iL$-8>bY&~F-}m94tz${|-t(UQ&gUJ)^X6vo
zcCn2V?ga+HIl_{zHObj*i7#~FHKKz|;%7ulG~p`a{+W23MiRG8;`u1jE1Yeo@)+>9
zQ>023+ifeNW5GNv*ygf;4TWuC#hlVPjdNDdDW6j}r+UtM_T3^j$!v?oCgq0RpvM6l
zti#*mXy>Bc60ZMSA_3h?Avejd%3ZPzp1?~ou4->|RyInCMB?g%>jIR+8dH^Yg?fDb
z;yn}SpGHa17Ck2$jkhKS8VZ=ypy(D!D3>BHX)4+rJ)2^>Orgr96O4E4WVg_y;Te}a
zR&t1ITQ1z#<JsNg?56pl>3=(-GqVXl*7?&wcdvDs4K7WDl=f=c0%huqW2#IY(4S?m
zOdYs&K=rm)qk8LzPG{50qUx<#vuvRQ(|i&d(4XdOI?5lNmW`U5u0PFg%ePt0hZ|=k
zRG1D;g^|(GsTdhMsmVfBoMscxxXVkQtBeZ$pLS`{^*=^BM^Yln3FHu&FF!0dNN?eT
z%XB-y#we1g*2y%VlL`FS8js)A>J5ZLjxr_b|LV;z(b`uwJ$jod_LnP)^snA@xQ$5<
zWceEg_rTOGvAUMkR^`9+)0%$Y9-W_!drY!hAVSEJoCJeky+?HCY)uuu=)7#AH|ShS
zwIlPfO#Li$TSE1JsiwMMl;tS5YJa5Fm1+4HUZd{guK(gWx+m@1tE&__%B>qc4G&JL
zqc(^~_5S)Q(XrYLzB{7MY_?9FW8t{Bbsz0nlIYf;riI=pvXEO>z%xV*I*vkBhy#aW
zY$SamUH4#O#_ZJ8bzzjIB!_QP7JGpqJIKe;@GI%SO^Ll|p{DwA@(!&3c@jCSOjf=|
zO5_)%Yove3pTb8bKbxY+Fu5h&N@ea>&JrjtU9DlRXs|6ydAs5;qo?|Amo^_qM-*uf
zH_0^o$z+o$34(*E^R{-l0No5>(eGCDA60#(G2@owi=Id4aT-us{d1j_0jQNAs8)!m
z?WLLzs=|%+x32#Y{nPZca+5UCuuJQs%f?E@@=4}RW*w@q*A-8)o=dxzc1Bt1^(E$K
zXH|8bv&rRS@DY#=p^Jm!i>s9v8-Lz>I?EtY?S20WO}j!-Bw-JwbK|GArQt!-@TV;=
zGDkUsTHB(?P`*K?NG>MxglP&PKCcM|`exBkM@9EZ=glmNGi_(~L>FOw%IN|+b<cGg
zapOiTdgtYg0Gw4-nqI|BImK|cNHx*LW2I&Cc<dJ@Ek}PV_>&$YPtrwDUG{39>AB1K
z|9KK}`c+8t$em<?d@oRd4;j}@KMh4`K0<k^dHp7O6UF57QMX?50$Z$Ced_C`bnc2)
zU>L@vh3+v?`sl45#k!A{KLv2ahRO6#GZ0|b%2D&F=_a^I!_q0}ip`aGt55q5>yFS&
zZLmf}jh2CylgKjjrENwFJ^O0`IK=?$q3ZB^T?~%aR&4f7#gV;&j!I3R_@kw4O{78D
zHX|cdPgtDtcJ0)BQDKFq!pLdS64dA<YqM{-2_>n9(qb!Dt(>`s(YO48M>X_$qASKq
zE;$X<6E&xn2EuSMD}nefOiGI3r_zhNSxVLFqGiWx>S>6cKUON0Cqh0oS^JHyPH#^@
z;YA*2a7MlU57Tu;^?zqbD<%B4NV_5VKPtT-y(f>A7r-L0T?RN3kiegSPXK{k;2cs+
z_K+LNGvsY$yi%lim8+Ef%HzsU>At`;AvW!KXgiOqEmF^a+wxf|Sxan|y4_a7)OWUG
zBhxgC)}dbw8l0ID$yN-Thlv%LQ&g-m4WF%&RiMa<LjsFCu@xuThMBqtpXdy}f*5lv
zE>l(6^gEKRf<YMKn}CZ4do=JKF4kENME4lkCAbDC&1PdOXR0P!af<$*#V+Bq6ibQd
zwv;7nD_x?J0J?1m>U%-9kxqW0O1yYzwu*M9CFUENq4u2V-uU-vRN`XD%(g{aS&>RS
zlsfFFO~5;LG|*Lzs4~QjhhayBBT5HSd0;pkYXV_lD^PI6N*1ZZZVGzfzUy+7`dqNa
z!^Q#L#LIcFCNbnxFUmA{^-P&+E8esgxJm#MbUUiNZfc>Vc|tn3uxqOMxNKSL@AM;E
z5^T5tX0&Z(no`@=rf`>|sF0ax!`S?1JAnJlF)-Q9+vxc}N?I!^jpTP^J@S8lS{{S9
z!~2QMjn-kiE+yXVx9cp&Jj*$<{({@-7G5(s@P=k<-5sq3$;YJyUNB)W3}!H04;o9;
z#=E%VpuTEP6shj|(&CYr)I7KY4Q@sy?=pYhm7y6QYMSVcBH`Ud=@N3AoPtO$50@fg
z98BIRHY_>Wq&p*Hqt)ooNu)IUDUfcqr&|j4&#mPA!wfBSP<ynBih5}hrJ1!n>0n7Z
zWXek!e8<YrOdY#8D_V(mpHDp5w>zs1C9Ca6x`}1qTN#>GqtUa{^M5p1D8b4XA@`HF
zlzgQWwt#zww*h=|_y6u5Ft=#4<P|ub{5!+cS*@p!>uRB1fL|5xn%q<phr>cUhg2H#
zQ`3ASWpI#iJDQ;9@pl4lvoaV6caON()Pc|Fa%XV}X~W?;N6)$ud(Tp8jBV#|(Cz6!
z;)-Bs^nO#{&B2SD#Yp9yfZG}UgsF2-(j7^eO-6sq6s;ur2K3zpop97^ho=*dS08=n
zYBe%7Qwy9WgLlH<4;&ju0}xM;T6VW%MoGXA<ve2^m~X=9JLvlNAn+f*N2NEUccl+x
zNggfd$tTMWd4@b!UM#PWtK>#`J*0sSxf`AVm&ljN*C0#S0r?Qn0uLi!@RPs^ctt)c
zzahUXe?TNMn&gp_iG$1_bID?|f>e=4vYu=w9i*G=CYK=2=o)epIRJaZ{p2utlst*d
zW3P~-<PGvJ`9P7B(TF@eS#c;cl)1`ccpFqHjqo_wu5>8f%5Fp|U8Y>4+=Pr}hm`x3
z!^)$|lgbh073HY%hVriR0bh9n-~0?wIz%~HlxK=^iYU(#<y28l6XkSK&Jg8HQJyWz
zb3{2yl(R)SN0d%c&J|^$DCdcCJ}qrUwgs$QXj{a}#kM7)JeQSAZRfFanQb{Mi)|&M
zEEQ#$D9c4zA<9ZoR*AA&lq*G9Bg$G))`_xSlntV66y+*Wt`=pJDA$N`tti)tvRRbt
zMY%zg8%4QEl$%+(#kQ4|TW#A|x!vYsWs9wqm2R6ylx?DH7iEViy`tP9%1%-GMA;=u
zzbFHu>=xxtQ3gdB5@nAl!=l_J%3e|K7G<9(FA(J(QC=v@i$r;`DEEr;5>ZA(xlfdz
z66L2w`594uR+N{D@-k6gF3Qh|^7Ep+LX=mE@+whY&H4XZX#SrfayywW@0ab;E&mCp
zS1`H;jMRv9`gt>^O)DX5Mds@3S8zsg<~R+D963JPgj&x?3kGe%jN@Q47wss!X8P@>
zD9^yF7Y(5CTMc@Kr13M=ITV|HQ-14Pf`QheitmoD0vSV+jtsOm2AZ6$AF*f{aMZd`
zPg}GRbx%$k>S;bCh%zyAeq$`O>DQar{>ntQX^kRhd~dpJ*k%)RK$kP1)u~?@G_3{M
z<A+qsfcl^~@n7>pLNc0JtC{fh{2xW;N;s*#!2kF;&fIq8?*D}K{|OEMi9KM>ySjp%
zl(QUU{L8z#k#3@nX|l$=nuc-L-dGW61(({?;ca8i%wv9H8UUu3HmX~_-Pma<!$0Pw
zY{V3fGsC14fRn<l8Zt){f|wXo)R>={dYS7<fN{wa?1PT46iD(+bvx!2bN_Jt{UXgO
zl!sJV*TADs#=LGGTc>{nM`A!H&S++cX-u%7;dgZbgjBI)d5r%b^K*Xw!~d^>yhIwn
z#WzY1Sn&Rnq}|a?Lp>1;6xGH0&(@GxCOc!~<mg7!eGXZby^h6#df$QxVEubj&1h4j
z8$jET4s274g{duLO;wEv9X-+YAY&AnoqZSSj2JqzM(Ig5lWGyh-;8=sNSnzb&0%e%
zwr9t*!53>@+h{_CKe`S?$Ycoi$yB3Is*Py%AA4wp;89j-PSME1=vvfRO#<0>clMT(
z?2RoIk1>m)f!dp%|6}DRBoYMP&zZ^=Qm=d&@xQYCg!1Bl;`#FlP5K@%4bNo<LtOx2
z)>P?MPgPb4FvMb{+`<`o`m`yENubWa&8JVDp){GOodAuF+yd|_gt9Jl+M8(}hWME7
zu)p&(b(;$9xUp|_nvKD_p{+rM_?GSSO+_<XlW8cU8Izx2x^4CKDhwc5k&@2zQ9WH*
zW&AYc`@%5LI1fMo$j_K&3)V3TV_qC5p8@~Bb0tLi7R$dz$jEQx&*1HC@;Ul>mimc1
z+A>yZmgxaw;)?+G2|C}^h@cK}2Q2Le3*TXKZ(9GWJ<(QnkflkDq<yTj39}uJf$dOr
z;=i(BxQp9YTTH%K_zOk{+^}|NHg@uwbbO-O%~2#|t(MO)cYLaGA+j(4&l+XmzsZdk
zy-N>`+Ozk@Or0<`MO`!@K^pT^Ej%gxuo(xuJ{p#sh)Lf*_<zIZQ)xYDgVx>L6Wy9{
z*fblca92^GGu42cYELdb6k|u<@&}4cTLIn4HVoCN=`d|!j@H)X%wVF<V8SlFiBVQF
z>UFJC4#o|U)A-pK-JZd5J*j(@r2iXytWVR<&-&<=4Bnfp%?f+9(v6+b%@och9f+gJ
zKAGaKk>b1|eVyf#f&H&fWB;T4KU@FTDrdv5XRZ84d8d55bTjsV3_qKr$Oi60xR)vH
z_P`==miyg337-ac(i`b3rEg<ijjTQU;-@t$uRDrl;Nf)H^9CPZ#v+^6(A=HHz&8kU
z$2Pa&$I^41x9}?W^k}MVi6R$xJDF*vMb&Pcdd%sA`BAu2-%I;%zLQt7?N6FYc14jC
zd`~*m>A`lfQ#%1#FOqif>dd~8uKVNlyy6SBt?P&)TX<JGIMl(4%e<lPKnVLbg}LW7
z>OPWw`0M5MizZK`f0{OiqevT$HkvcTgH<)rR14Unc~VL?dVI5Xn|*WI858Ok9=VkM
zY3kh=MMCjyBu)Cr!Fo%Pn@xDxxCj529=?xeI>Ch8bFt>(?kMt!d(&mK8hm)QA7Zz+
zho<2a(<Ai*>5d<sA?C+#HP!f{NGraR%(pZN{UM4`OeX{NK~7Yq`%t=L(I#G<ZkbX3
z{|xE-5`KRty)TcFPnBoG;<p~2e{uOS`8V==!2g~CzrPKni|m7c@bl!4%JIq+rA*lj
zTin&kS7CX3Gs9MK%)jQ2UuMU<t<|QIiNxkEoX5H-$o==+)H=*(_x0Qf&RvYCeq>c-
zS9Oc4N`ioIWuIKcoeh(wi>;me<he@`2M({SfSadZw}lzlw9Q?Ll!hTBZ-7@*5ZajX
zZm%!U9`?+1Y&x5JZ+(izAKTnCWh=#^Ec3K_x>^L}%njUq4`22rOy_tMMw>$Iahfhk
zx&)yRjvh3Lz9e1p1-nX4MeFet){H&eyU$(b>4u_9RJEJ?A-Z+T+~#Egu(;iDll6%X
zDE9?A0O^FFEC#w^`<&>}q|M&eB`OB)Qz((v*7kYs;^wXd76OvjGt`t4m`c#;T}bi7
zD88D3g4^7{*yu(T4iM?;?nak7X0$Mib`N!j<I(mz1wqwJ85!zEMpgEV5DTZaC2iD*
z+V}c*cpQaA{LTmqc22&6-Pp<f0o_TU>*fAX2V&`Y>RsDai5gSaxUG$c=Hf=(g0y)=
zUA10}HAka>G-kU}5D5cKYloxApm{yqug_iQb@$Ss(x8KO9Hv$yFihCgVnlyhOx3z@
zP@uus_KM!G_jGr7eO?ZMe*r!JM@yH}{J$r`7C&8nUhae!z~#q$$!aTbN5hu4SM6%k
zE<b7ipD4s2-Ni4_Y_Gec$S{0Sx@fDxUEF*W+@@biS6*K&s@CQUbVreV*y;hInZ0h!
zbe3LeZ>T@_v-i<IO$%2?k#@M5Otf-<hz(I}jM7Vw(%>S>jXkA#Xk=V;CwTk(ba_e!
zJI=~FwX&F{hi6U{ovFpm+#Kz;%zY;B>d9NYw7=Pm`|OGaXi!s{EXsqe1)5!57;1HZ
zHuepGlempOZQCu2=6E#yyDN(PzgcjF72zHvKcXN<P2C<3&);TqGe*GR8|lYa{7F=-
zjS{ElzfE2%0r~H<$o=;>G98{epCkW;Q~p$?K?x(n$B(p2^^^A*dcf2ptk%_n2myaj
zhZ9L_J&D8j^lnq*Sket}<pOq#qoErId^7fZp3C#}pedBu;Jp<tfCN$ByGG6eoZjP9
zT*j)Tq?>{sq#$Pe(di)zEvojnff@BN=Kb`5sT<v31+{ZF%qgBzF{g^2Sf~5XR+=-B
zR5zbpy3<0F>s-FpfUk?=iqYr$EHt4GOdOan-h@t5#I?aDBusU%UNOqLrYd!2jTlhi
z*tVx3W#Fo0HIFOJW4l`DE`S^~%5iB39=OU`ScvF^D)>ZDf|VjJ|2NY7A9Io0XS@6n
zG5{1wKb0CY%yE;ik=W>B928^HVH*r?oji3pSlU3)4;}^$DGT=bdpr7koF#K-xIq5!
zRdHfns13JWA4ML;Ere?8Oj6Phk}=5Qy9fT2NAFD>4%)*o7)5U5-gH2}gO6_T_aZws
z7B0Y|IItD%cbnVzbLon})qJDg_O|APXo@1u@dk3L6`4B0=_gqJ&@D8~)aYE_8buD{
zRx;H}FQqV!?&NpU?egCQ*;;jnFN%D{7RA{$P@Td=0n0hgQ|=#(Gfn@Y6f3({9B0}L
zC|jeuEw?8{{z;LBr0<<e?W*XoZSQJ^VRIBoh%IWp>H{oa86WVZH&U!EF&<j2mp_Uu
z#Na!ujK`V)Ry6{gAzuW#pmgT-7=0@L@>}=w_FSk%yrJj+XfjhGGszZm19?HQBeU0~
z|LYJxO?InKKDOKgmJS!7db(In4R*MgXSA<%4IW6v?LbGOkkAM+VxqdT+!VYp<vwoR
zX>|F(-2eyzuy3r^<I^xxNwu=b030}!XKsczg57(Pd9K&wssTYq^TkoedhW81plS|x
ztV~;=K*tJDMo8ywXB#rXgq&<QbEZ51G<QPP)Z$@EJ7vDbdg*Oo|0vDOAp-FcJO!e1
zqAA*FYP~c{aV6}qUf$q&T>f7yDF>D5<X$olKK*A(UzHYTnisobBP|OoO<`XfKqmCM
z8n@Xu(i`4pvBO`e*?|2q<RiDbL!zIMpAE>gJ&p}f7l|Fx;8W>K_m+wsUwiOINK9oG
z$TX=M2haNqdYKG*n^UhS6Z^ClyC^a;rhtm$(j|=_q#~o*F{5I#auPLL;sm_#O3eW5
zjuFcm6gp9%nCimHrY99uZVD)GCaW5LB}I$s#ZbJZsk%2Nv#PD|K!XMut)9<Z1z7gN
zB3^UrSWV3r#3X8zE4Fejr_t7?(d0^3ee_EGf|m}_KTYKuqDXiSvxb#sCn@~gga2QA
za{+IdPO-z!|0NPx0uP}3$gh-%%2wn8`9Y@j|H=3N$9urk5x6E0?Dls0To9$5E5ope
zz%a7Ti^P+RK^=3iskc({jWq#}AELOUCLHMObae^*{4sZ$0%ND%+|lLn1srs{AM<6?
zgE8fnun*QcFd{fz*==7kN7qlj5B828G_V`n8mv6)0IB44(L9IzA%{$vf#hf45CopE
zugm4)cYVcDBiDlC_jZa~?zc1=>pUSBc49w_tUcn!yNI+?vP(sn%p(sg4=6!piK0kF
z<WVRi17tZ-<ZsJ;@>1zNnj&!UXY`$>6*jff@dvi2vk6G_)LK&vOah$2jMJI4i*#To
z6+fe|H1+Hre9W2vfZaKtR)UaHIy#fylaR37oCI%IH-@0m=khzNr+0zhp-#_^8n2t)
ze999*bidr(A)A?<p(AMyP#}G0v&+kPJ*eIotC-Laov4C_OH5(qHBW(}D5W1xK*j~-
zVpFGb&E3Eub9Hj79!)LCjmjsEgygm_T|1BpfCk{g>B$FmA;2SMl=QJiG_-_Tp+06h
zmg7IfV=gsaBu%)HJ*C{=P7R@M25-UB&mNCq7=4SWZVKZM4+2=Gy}skuk-r0Gg8q!Y
zu2zjqG-i<p2OVzf!i?D!Kqdruu2%+_d6Xhtz;3sT6F+G-9(c8>I&koLYh1gb%fy%p
zjpif@Z#g&*KWD109DGD$&>L#S1Z3OTr1Ma5pM{FK(`7ByYcRFqq}OocZc_ngu)5j+
z^u5!|yBq)rsioFX`i4z@%-_*Hl`8N<4dsl%N1)d*Wnm^L_V={}+-&TFp7WFY?*^{_
zL;k;;m4)#CX(uD)+vR1_6WL?{yeLM~v&!i*-wv{->Fm7ejKK07_YA?2YV~ouVo1<x
z(RhMoEF5VZsa9N5`>yoPWEvGmS>YoZ#;hfVY^@d@hBTI5cj|j7deOIdCEK*XB(B);
ztP(5SUsC{3Gz=$@&J>$F_5FrY>MDnZv=(R@vNd*`Wwlv~_1>NQPP(CJhiJq*nhIKD
zW0~#KN+Yzc1a8d-%R}8_JYLk)(iR&tR_Y|Pt#Ij$K;NM|N{Khfjs=@r`-$}FQy=0L
z?Fncq+8!GX3_LR3N<|b0i0uM=NK)QPw|6L_$Fz!5cWjhpYcWL}3Lqy6tN^?c%?Hvy
z>L~s%ox%@mT0-|ghxCvn9g%(`EAkYe|F4pR^5yc~um-*id*B4J0Qo?A5V3z45khY(
z#{nmFxw1ieNa<AeVb}Po@`UnJ<sG`Uf4n~&_NX69b-J^cc-p=G(1b4tx057otF4zM
z2QX8)+b-nJLl}OlNTOnDMUX~GB|LPl<Jexh>0!HEI8@N|@IismV7pd$i<mjD**b*h
zN9xkFU6HuYOjq(*;bp>sh3dmWt}L_NC|XQCjM{n58rwDEVU%Gpv=sY=*Acxyry%)E
z(%l1~xyjy#JA{`Cz1vWPx9v+j-$+HhOZdeYX!dP=ENy`;likO5v8cev%5DpYuF|Xm
z+ojx-slS*WsPMuPY^68oXz2ClUnwS3A~R7j^^Pi#c}4wTV#|>&7Mwcc1{=LlWfZ){
zA<X)VDSHCN8cHNls`T`P?DM(z7^Y`yr#t9s>&btF4}5=#rw^Q^V>SHK0|9^Dor#aJ
z4^f38s)x%`-s8Lt{XAW5m8+KnHx^9ijy>XYI`#6O=JT+>BnVas4?rg6-n?&$)|9%y
zFuLI>Rp|}->}PU-vHnst!v$}v{J+xmKZY!pfYY&!#L3f&f+(OW<?{+$0zdirqzBA;
zV4Bik%zoB@MTTzz3-}oIf~ka)e3_GR`xFbanR2W6$KOuRu~9FYMzYY`L%l4y1_TqN
z#~ZcMR2<Y@>#XbJ>T^~}&FP9sJW>tP<&AmMRK7`);l~^_m&1}SbC$sQqusF<xtibv
z5~BN03G#<?vHw2PK%?X*lm}fdXbP~*UBMlFJ^a=$nu?*xw^oI_yP=(6x1yVA<HvlB
z^Z%zv%I!)qd4kl*f06gerviKUf-SL=Sk%M_)A*h$7mW5By<J_Nppx{zM4p@!x~x9*
z>2Q7E`sd8UMJB~ghS)HXG=qyW2~0_Ps<RHkL=a(u)LJwRIV$N?Y4UkI-CQn2un*EK
z+WIYBMy?zCYY?~q1RgOZ&>cfEXp8=O+EdxB`9QkzuL+ODT^bIoD|UiqS2IH|VJMaL
zzQb!jeU0Gwv=-m>u?dzPBL+RB2c4y*{-<seJgb(=?}?44K!y|=I-}2p8M|f1he?-)
zFBC0$R?~wQ#0s)f&YSp2Gv&PTchVh~|Ezw&%MZ{$P32o-`Ibee6i(5d{7yPF;GwUT
zZa2m9n8$$?(J7e;bSJ&pbN`LJ@AfRvkWbJ5(ZnGEt!oRAeP00n-%9ZHpXmS14!-|m
zpPOsz6S0mgw%Az8Fh7!0Zq`d67Hc(@PE3_+gG#70l8Y6Z4W$}WRd!OfdS516Um8Qh
zKrdx*gR@<1fofw>iJt!>q;d(-e|_>}(%<lJ_CJw1u}L_}H>ER9XML1A=Pm?XF&ynX
z@j?$c7v5HPag`=hbKI2ais>^XB;xo1{nKoFk&4)9pg5EcrgaDuF9C^3w}DU5&=0p%
z_=X7Tv$*=K4%3zt#ZE;_T%^hTfJh?A8XM)DOCh5*v~$+0Ip}Ha6b;CHk-y@fW+N~=
zb_(d;kj_zb2y`#f(+!TW2NHsyIsFCFm6B;kuZ~Rw!F$QhoOU!#pRDQV;!wy1dn5$_
zq8n8bM=RQp^*tLGo3)C`|5B5L-$#-C`zrZuWd8mtya2Avej5;X_*9Ilp=lyzJY8-V
z^i{1$A&rP##0S$5F6Z1LbVoT9FCDX>2Z5SonuDd*oJ~<s+r4nrVpcg=_PD0=8=Y#z
z#BJO{WeZT*N>>+*RPf*OLAsa?xq`Y_K@$UYYALLkh#zyc^0>M0xKu!z54B-*Gh0Wq
zWc$1!{3|kiF&U7ykd5pkTh++2A=f}>HpEHjpU@zhQ`*(%^>62BPwerBJ!-@R0oOuj
zEygpGF2lQx0q98~>pPfz5(;Qm%Xhb^k)=a!gmzD)10VE5CF|i`^l-ZxG0{9E5$CKk
zoLz-;X&b1mK1j1AdoZ^6fUdC$G{xm8hB04kZr|!vBY~l|qL6NkN#tM_^J&&J2dYP8
zjrQPsI1#qOX8<|?W(w-zlk73S8rd@BdgtM}wSh2ZSaGl`#1j#-IZf@~eCf1>efTfv
z<Ll>}{QRFLDRYQhz6CMB(~Q=A<h<CK*!#R>Q%?6jy4W>)U!5n2C@KVGdqdFcGn1+9
zCblbNzVPG~X1iQuZfr8>-$EL4N<ZB{G-P4bL7xnt1+i6Ux}?<nV6TWdKy!{+6utxo
z6*qborOeeea9U<_^^*1xW=DNR?2O#EWG<cTn%<|os;@8AT|f*(7FVBGWjc@QW2d7f
zdq`JK=aF`6HDDW|^uj(R01IxKo8=u9*Z<07Y?%Cyv_JU$le}5}KAA^uLkz&xM!Uej
z?XxNsk*5|8-kw&VxO?GQUFY%R2uObGXlPnvzq(6>kTU!SarU?*(9+Te<SXcOF%#)2
z!i+$*-Zpkr*{}Di5fj|3q_aUor{*ms+sS5n(k-a10s-83aWRh&`xmToLCHO0SQF(e
zQ){Yj?eNa7_s(wOp@8=5tR7Gq>!Q1VYF(*AMi;LA=9~=~-HB7HYX$>=&@67eW3_#8
zuL=e~7ZZfCdsUub3)ru21bSkdr4wY0cSjg*hG3Xz?jL$q`#spNO2XW)&3<jS3P~;(
z^;2drwY6)oFhZ0LW;XG#qt$*ZUH=a0HxjaaZI*-Z0k~AY1G&E*hUGs`K9ihD=9A4N
zOs*jN$=&2(@&frS`9S(7c8D{T^OY{;3gs^4G36!Y?SI?eV4-4RN`+rGW4G6IK-};I
zPdJUIgX*ty^|iPFx6tG9fj6UwH;&c-HEOgXMcxT^VQ{Sk2kLi}BA9Q&lft%J7KCf!
zMhxMEK4F3_1+sz<9&a=mSwTEuf`x2>%uv*ywLMgDO5)N4G6;fZ^RDM6@%}OxgKB&p
z${?0|LoG1d&KrNPFf!9*4%F1aau=4tk+aXfaj^<i7F&Nsz~>9}Qo~u0Bk9n&g`?5e
z5(owy#Vx?m@PzSbXoR~Q)0Y%Z2yveV+!#O(Rj{CN<LL?eJq3RdO{?^|++JXr1q=Qq
zOvac@es7D*mmlZQCjC|5&;pQL9A(oRFs)MF)(7Uy%X?K+Qav4g0u*p~q4jj21-5sD
z$(sUWwEMkn-c|~fGofAdbhRJtZ1uMIJO!_fRY^V?STisG6z=EHUqkz#7y@EAIH5rF
zB|xpQpdj&hg8qX0MH6c2K+>!8mx>1u3I(=11PQ4-j{T~{mDGrd_J+F(fLI6*7}%9y
z45Ux2?xM&@lsd;e`$w}?ILBBtI@xaGjwt<gFvQX1Q1I#u(J21v5S3@g+r>ar4<QyZ
z<bbnU1ssDz`G4W)Ed9)nsLO?WfN4+<_W}D8qFd_eoS~YIj!@p^V!}5f88<qYN<7s4
zu%Jz}uF-`p2@XRcPu})%aQ7VnreEoorjf<+Ug=?@1r?bPI}3czsm#UCimfh5{DMEQ
zhryF{1$xkdE}tWag@#<oGi`TJUqzEImG;kHlF>vLSr(fPx;ib(C6?$yj5OBIN}R9*
zYJqA8R!+0a*GXp|_H{0d9<+GjqysY8uj%wptA|_=n}!CoTGrlKYydsSQyP$f<fshy
zg(fqW_+Vk?i}HTF&5ZEM7|mfHwyZ$4MmS@2QV36@kU5ym)oZ5DHE9Ya{PjkY{@?jo
zTWkuoDpDk~td<+LqJfSc_2$l58CMWJ|3|U>KXSADIJp1skiRScaov&qP+Y7=F0#T%
z4Jskcw<2dDWmQvVB_KzGY%gf)3AeT3Xay`s5{}a$s|>ld>Y1K0c{?g`xv@7fCmGw<
ztTN=*>Y|KmN>f*2%fn#@ATPFUd_6Ko-8VjWT}v5NgZgISLt1a5#8q&ff%8g}r{@BJ
zS@tE<NZ%yR7h=v}!v_@2wg)2<)qV4`YsSFcT>eX{WR^y&ILooR&qEJ&u>a8af^9I?
z0K(0*0y(~rdp$|I|91A1Cy6qu=V$^u3n9Z5M8%~68cG4n8Ptr3q<~GKjz$(#b7k#A
zRR5<+&q&H_QYv4MfBq-`L`q}l;85C0To%<cNmC=u@}J8@M@wqsgVwJ->5@Yx2U6sm
z*x6{thIBx>Ns}*ShNo#pA)Oj2OO5F(N&;N-d@%j@MZWKtk=quVdAx)@A)@58+Y5)W
zH5?qq%_W;pG;3)?Yz7AABFpMOYx67X<K<wscPxFn$D~R0{Ac<9{zqs3lU^~(|7Ytz
z;WUxw>{?NNL6p~t@_JF;Aj%tA*>Af^ly`{oaZx@i%6CNhJ}>PfM9K0B+WPH0uV25N
z=jrRW^L%&x_7-s+&pX#|=Xu!r?cWfeKOxE&Mfn#|e#FbXJW-x3%B7;@`S|+twu|?z
zqU8DR`tx`my8b+#AFe--x4S>@PI29RqI^J<-xQ^2ciyYw{a<;Rf1D^!5#=ONIz=hy
z%IEp}`tx~yz5aZj=dM4W=b`J*kBjRc5#`gO6z$Fz^%cnc^8!(CfvC4&y7*kQyMX5f
z>@VPX|N0Afp1uA8o(HeLK-5=ozqs#7QNAY1KZx=zQT~gU<L#oHEK1SN@nU?(^Zb7O
z<9Qyw{_%W1^^ZRwuD?f=_loidqI`#!6I4+ah_YRjJpW+-1fEy0f5I2U=MRZe&_Cg2
z{{93(=Lz}j{Y|!;MR|)TZxv-!lrgUV4@y!{`m^kkpCJ|GYszWIQUb8bnP=1=Q&Tb3
zcm#GK)SPRe91Xxt1=<I*>%s-s?L|KJ)g7+x5W*jshWGY>8rf!r?aNfX&NMdLQ3GdW
zrsjni3Wk1G-%VDTxs3H`ZOSy2d#DePe!))858H3st%CQ-f%cej0+pUXu$@}QgIzFl
zKv&Jd@pz01KxMj-Z-PT5+waI(BdJOviM7GIMyfp>jGwhfb7fUwXQ-yGzIF;V;9v?8
z`wdoI05T38GXkfXsnl%Q1;2JaW#T#OO=g5hvh~hJG7g%UY;_p0L~MG-IRAf_gzUSM
z<n_{B|Do)EWOmF6&TA8?$t{aX9YRuA;$kQ$`$FCU9a;JdPLcae_^L>8Yz_zxkZn07
zc&>hd2rnEAYl<7rLCcpedtilGBhHV_MkBh&mfSXiTCY=jy^4k*24J3Qq9}>(IryRR
z%LkdA+rpKnJY_Zx`%a6^f^bqzB1>}H295P{_!<Dw;$!mM4X(eL3^85*Bcv6QvXopV
zzb4PXzghi6+_56`Z$630x$R%=-es&nF>;|g$lQXHcXrG7HvIh=lYWXgWAm{Twpey?
zwkY~#Qnwu}%y7l1pIvW8^32#gklaivb2>7GX|<6D(|$c^<w`SRow34W(7()&Ie98*
z{Rt0dx}xZd)OBVW{nOfRieqy@a?ZDS%Gajsc`Viq`#bd@01C-2fIo}P!s?~tzju{M
zzf=An;b#(le~9S+&&o&13UV`fN2yV6&uSyEesQxJac1UHb*4@uHy9f03}ZfHWu6-H
zbM<E`bjE%pzhTdPu0@TM4~bsQR*qq%F3m91SFlWcrLbAEWEu7sHmDH`x@dzgVVcPl
z4i6p*9{70rxVZDYdA7ZzRpB&vvUdN4Tei>BN?l4}QHJ@0IXK#%Uav+9htxTG2Ni1V
z#^ae{+Ww?@y4wtdYhB~uEJeGUjpg?@sgXrPBA2eTq>AwlK`GvDKzH@<G$8gP>(t2X
zp*-6_k{onIwtvr>JGFiUbxz1=01~foP7Agb)*;W(^<N-eAmR5uc>jz>{+}`+e%(Wk
z1NzrK@=fFcI1RaedX!sp9TQlj5)XlIueN6moF4~bW}@OIU6<)@O7dboz%$IGb2hLY
z<gO8S42B}u9^`&584n2CS2<BxS)*-VEK~uw01j8b`Is>DU)eSSOf0=cv#;cc_5AWY
zmAL5Rty??pDFsO~y+^xSSmwBF4=hxXc^;3@ZU}fpvdI(nM<mpSMu!`&{%fv^fK}XP
zRhGCn(cxClOxyh&i{v1iY$>#)3W@hQRk8`BSab%l-NjS*WU#l`?&e94thi~|?&OYO
zS=$9{hsKeI!T&oXWv=9q{{;<z#`eE6wvdK&XYGiP6x0JZp8@-%`l<K7oY5yCvLd#G
z@q%fxDJSj4DfX{{nw(6Dl~pjrgIV9wH0>VnRrBeemN}dpTZ}d=BMs)k@R{4d7Dd{a
zo(D5tBHer2Z_S8Y7Fz@&H;~R@5lQ!>EMm4E%reMJy8nh#O&Wm13##jn^CwapTYxU>
zBi`)0ERAh8%iS-_-BP;NZDzdX`oFJ9K>zr>+%0|W<Lt|!)fG86whSZCOuX5PwS&6@
zJLRm${ymu8^-ZnsnatRIC&kW#zGOa$ln;x1jWuBSJV25I%7a>&IG0af|Jg#5u8GWx
zEych#48?n6a9}xWXvtaQLF?C^cyGQL)k|aN^68lUhA>Dq^JKK{w)0?i*GpI4{E-Ry
zbp4N%PL`Cd<N-2TE|m7-4Sw9QQi?i~CfRlJ>DAN?gBKi~I&A#||Bl%6gIMOHeom|e
zy;n074RccO>196S*whDgfm0??tmnP;3zH6uG{uUKr&^z(C_D#A)=6j9Ipzn4es9C_
zXU&>5BentqQBInNwJlL;hN`L7A>;tA?IFAccAd-Xg%G~WGrNHbowf&=(39!1k~lG=
zbz1Cv&{|5?4vSVQvt)|MevnBv8LrxU_ZQ44Jw3J@lr9~L)_8EP=tN|#67#`KSIqy_
z=S(Q1^8YBgRFX^OC>cw7$xoEU%FT2K_~gf84_H%yH33P$+e4%B;SmbIOa$G~6;O(N
z>`-F*oh%fBVxCY~D7H-gU@i2`;)54Cs;N6DR{@n$^F3_q&=U$xknK;_U>hvfwiwYZ
zh@R>0a5MlllR=l4A{GhJZmem)wWgM|SlJSm{Tg1b16}v#b~RF*Sr=#R`QQ>b^hr6;
zD!RGq{f(SfP>8rPKTts_DujS_{e7DnF-awudhlAARgi1xT%$Nk@Bo1CI7KC81Mxe4
z{;!dwHPRpCy$H7YrsB0Y?@cd@<j2ae>rJ)_?J~eJI5|U>qR%b~)4(nfPycv^3#4y9
zcpEmlrSwlLkQc<tLDUqhTk#-KT5cE%XW&cLiH~Qx!n2T4buRtWQe}%(fT}aBy7~@O
z>@?W&OJPD!Ea%75e?PzX9kYHqD^>}L7Fcy$NTNuimqb661(9kBu31Rf9iWM*xmCjU
zxK@Q}dg<!5|83TDvtm`Ca~Wy3#snnMsaLr+dyp-(i+RVhO&Ku1oqZg9;&B5Ft@-7B
zk9^;Z-tn<&KL4!A2}$%)zwM+&k9U+viXXyrtv}ABfizdhZ4;>q$Y=u6^MAZ_i-g}7
zrGLrO5Cwdd{HXjcIf*PIZp8im0+`>DvQXIp3&7K+Oa2&qu|!1%5?l5<Iomh6;y&Z5
zw0$peVWtj#YJrN(2$;56&73E>#@YI0xBVb-hoK67WuSwGb5OXVD!j6-=Z9SP{J2g5
z&;0dRDn3N+Fwu-%|0Aw@eq5(-qTYmX@oVGS^&j)l=*JDjC5m9y5@rv3Ch;(>2?y{-
zNn6qPxgI^!-feqgHLM9|pqrU|Q|b!<1BQAXwsuf}_i2u5yjJzGs2a8c02AZ#Pe&Xr
zviD&{xPWm3NNZ|C>;eD;qwwi*Dkie+S;k!1j&dW<vxDkr+YvspN7xQt66~YsxNcV$
zlUpdjY_+4f%Q1u69@cn!;55h6(!M-jC9TAEgsr>OyQ*R1MYwaZ52V1+&I2ikb91k8
zgT)axhf?pM$j3=d5w!n&j!HJrO6azldIJ!~!9TV+fMYyxl0Tnl37tEsmjf8Q2XMI|
z$66Zq&NdH`HqiDQ!O9&ix$ru&5yfFyme<L@gGJ_D<uf^2)FVc%RwGk0b7RE@5bI7h
z0}+i5xP&I37je@piC+QI=Zsirj+~gZ7drLe>`n%%F`v#5dodm~rcnj6lF@H=0LtBI
zun#2qm_9Tg*y$r|k+JH&6RbQnDSv^pd^a>HZs3n`aiFx!QK$<x8;B)Cpg7GsRTW?<
zhOs7Sf*!`vGlsi2f$}ur2GDb(HNWeWbPC4gXjgkebD<*#hg2&lqFplKMvzbxk=1?5
z@VjK5-W9}*2D)-vnbnY;<`eG3Jg<t_)qQ8=gbb@)QRi_}c)6yqw+G?wU9e)h9MqJ_
zwv!15K~(K76@Hc$=3w${8QjSDI!T)Lrjw-D4<C*T5d6=E<uLdEJ0wYm<ZH<i@^hst
zN2@-^kBN9<E1`A^<AlhT-^<-`lDm`1KS4F;ziWobe_Q4n9yhk}8!#9Z>-$X@$A}|V
z3pxv}LN6rovsz~X6JEtCQ?qzyhZ&8>$Lc`iB&!~fNi^y;%1Mk*dcLUlcXeiCYme1~
z9!Psx%K%#Mh*W+p13xESy|vebB)a}pxki#};Q807EX(n-{lD}$s684my5pGI!vbnU
z2JI6yrKDBvjEg@zBC~;IRICw1O|k01k)h6Hw~iz}di3_2|D2hW`q(OvvX``5o&9N>
zpG1n2?Pr#m-XmFE4&(WoSUh3+r`6t^A6tzU?Iatlo=MhQWR2^$C>^xjJ=LTMO#d%k
zB}rGwqvT7;cygU`f`YgIo*!!gY}V%}#}iJS7>2@=HQcvsD$Y&}vnVWNLjXNxlUokh
zw+<jf1YI4Dy4G4q)sUodNm+o((6x{#D+81zw7r`9zMzL!GAUGihinhzJ)Xv;8p<pm
zl+&#KpF|{epPZQ$&ZaNuX`V~~;L1{z%oNdy$@+|fpXPoVQb8e^0H~0ueUB^h!oWFU
z75{9f3Mi<ILO>QRH_(>@iEa>1`6YJ#OFxm6m1MVk7ykL*@dG!l_1Kv&BA%R|H9G4%
z^{Ym{X^QqTqmE`LVyYspDLRtP)zYOme#2y&j?~4P`PrHKlP0Uxd4&5LrfAB{7xTKA
zcbPS)KDO>yF$2^$Ds{09tZ%(8FFVzr^c5v!)}nc_wP;bRb*q<UW+2llK9b=A>5Zc=
zn^4WyKm7k@kurJL{|NuT6|v3eXE0qkU)s!OmO68cw&^3*u9L2Qpv<J#BP(N@(1tyv
zHTP|x#*EZ9nChgnQD95gZa14lhymSroCIa(MY(UyP`Q{R%p#K94;J|!>H3ZhW~0^^
z+kke;R(*f7IH#GKJDJ+_9LkaGu9v>JhbF->5@9(1k7NHQa=H8%DJ74Q50s7n<C%aQ
zxy}swV6o7ERHkvj+vLSPYNR)}Y@6QDXyU-}LhiX`28@wB7pbm^A@@3}rvo~U=D~H;
z_yfJ%u=V;yDmJp5GOc>q$#e_*#X`kGnhu%@PhdZLpoRC_M_9|{qP@?l{lGDUL)Z@3
zZB`3xTYG-wEETW=8T&>1MC(-u!%(WL^E8NZEx`E0A+W*I31R?^1BjR&N1=meA@=}7
z5n)t7xn}x*`)PFjpDbM};rBbzdx!w8kuQ-C$}f{~q!{se7a<n-L7;yBUde-BV3QI+
zX5f2~@%v{v-XRjk%dB|OpYYJJEH^{jPZNe!i$WPUUuWX6Y%lRJz^pia+bcXa@krY3
zg?j}YVR*f%TaekNAUY=7l`PEKEQCLG12A8Iya7jHKp&8TAP}X<)4$<()JI`1Z|X(5
z*o2SLuQ=-YQJ7O%&R^VynaU=n?QIUbeH7Mj;DH0u$=mLtnYWpo{Kv$X3zz^s;Mc~!
z{3S=kKAPf6$vr)eLU_sG1<42dD9+dP4vZYD`zScU3OID8_#TQ@fhX6y4JN)b^7!Lf
z)sLoe*5jb%M==prd%}Krk+KHACAt@*og&-+nh(u82Ht6aJ?D-df2REZ2<c);SwcMW
zP59@-9Ix!OkGm+g9c=JKauOKF;cLvf53TU_7_q#3LS~ipi7^)lC?yMWBv#W9FRG1B
zS(t2;jv9Ts>G${7hdxzNAM#$JRV`P?ws8p|N0cS8GFcq2N3z%p-2IoCFqx6Y*w$mj
zIA^)V9m(!`>8fg)3do3Y2G;Br3{co=<VrTe0OkHt_g`ZdA<NE0zC&iR8(sf|TrQEz
z6(j-t<mZzf_&4<cGO{*dJ@t}pIaeZBXPm6_Skm(ayUlinnXxr!$tF^o`>k8=sX8Eq
zrsE;oi_bP8mh%52CATEKExF}S6GCoP%5pseBBRuO_G2pv>0QrPdqUmF-|21f`n){1
zqW$#93F^Lcjx8a2!5vt3)ziDE2n`DxI9Lk7UKNH!hCQ8f2KGtT1nA)iip(=8#o~qT
z;gC3|Mov=qS-@i&PW4)cpClo*CIE-Wz<`KazRT4bX2vl4gvfMtU&FB-Eh=sn``t7V
z50YY1KE4;}n1XPg(`5-A^qmDFDmo7yyFQ+M?WD-L>b~%?C6u`%nMnFtRbi^!KhFV5
zgMOrRbT~w3cT;`9JT~_x((`|$R4pmp@bq6Oe^&Y>-VEgjDT3Ou>lKsvIokCYD-H9R
zE;Q<>!H3Ho3K;3i`oPoEwT$%SSR3f7Bj@MnT;X(?MpT*0Z&K`EU5v<3$CFwjXT>}q
z63MW0*?F0S*i2IH_#bv~de@(=rFUw~4SH9xd{C25%BbYZ$oz7-DUA*xoq|F7{D*(!
zgzk7wOX#>*D+pae&dKTMYb5QX8qr(2vgR9nI==pxmZ0NfEu5g7j<iOzqE)qoHoXse
zAZNDUr=f?Q|D&ZU3BNZ0`|DbAHaVzFQQ)qf-A}CwF+Srw$b5*<G@T<Os=9AXj-IA>
zpHI?^vYoIRhd`az1%O2#;$dAaef<0x8&;86EH_QkJFHV38Qq2hZ4NgOya&(*$K>od
z=0Of<TdK;isSEllN4MA0>T$Fo54JlH?rQOLI;i^sfYZUC(BPNklcJiP6nTAWB$Tu6
z(DQ5jd_|lJrHY=ft%>vXIBSs$mgW}s6in@rf%B5j209(YiOCv1DyT+0IcvC<71DGy
z@9S~aFwQNum@+x3EoNYWtZ~Ql^Z#;5=>P(Fg?zt!rgV9BD?dk9M^1=!VPgdUkjtIg
zNVROFZ<Y>U|2%fcD(sMVYIexT*q9H5Eg~~>xnpZ|xEh`AdHX-bs0lptbuBdou})BP
zJ}Jy4H3n*I1J!ofd)M$jT0cii)rqkkpeomTR3qKLp+&&IeIoC#Z%@`zrpCOWtdLB}
zX@4cbG$b1umPcL(9biL`9MaM;A=Uvpa?Kta*cgr)7#@ng^fyk|w?3<(i=O`~X_812
zxnCj5z8tOQPagAsw+A+>;I}jKP1ZyL4P$Nl^(qyy48wo;fHlN+B=_#lS@|EnY)$)<
zvAYIZ#CgqB^MR@P_BDR~cSuUT)Inloj2x1Fek`VLFcugq1;}h1?iLJvx|GrV+D}G~
zxZsk^=DmVg2%GLqQf`f>&{kr^wwHvFZ-??uws#C*7Y4qS+Z!)|%Jo|Mr`d8N1+n1p
zsM0GLOI<x3JdNKw2EoY#-^xoaF{LUmwi8rMw<^->`$_{z2(EL$%$&{!Eg$DFrD=Ao
z8#I+$MFiB-L=~US9p0WExWP0B8SFa5Kg8P?!{MJAX-kA26r*YR+6_lc37!-4gWyfp
zL1r@e0CT-aCa;Bzehn+fOc9)$Rz1eg|3wm6MD9~2Dc2o~wg1U8|JU_^)znynsdwp2
zHckW2p^Q=hw#_nL+;7dVGdbmNntGYnd`i6<U~g+0Agi^}{V}CB<D~L;Sp#CTS}U~}
zrqr5}^!09j{!fsUHfaL6M}Au_k*?eo3nL{6DYSN0(_OU5+l3T+{t(SA?Dg3C^`DJ+
zX;R|6ey*dZr`zp>1Jmx=Zf_7tB?7@d_F1Gb)`#u0hO}A}*7VgFo!Icg0&a+#=RbyK
z2WTkV$LxKB1KjN5)d44t@+tIBdz?>??FP}sR)au|h}PTZN`0<wntKmOGQgs8F^1!P
zc0{GBatyAkh~H~Q>bbFAklJJw@7sV><`1MzZjHQhp4Lvl<Ai*Dj_NLC#RviIlhd5#
z4bqeOlxL#hs#CQcy(qQ|)UUD%{A@tI0dG_m2y}(qzzsq`Vuh>Aix#Z$3UsCSv%7x7
zPiL5Q{E4w1kUraL;J==c(JM?>A|IpQn_xxLelLG?$c$s5=YKwn|CPQjy(*8BSI9l`
zJ@U`V@yP$NliW>SSI$%#lxvljKaMl(ER~cKuwv;L+`n+tsdwNRs?}>IcgcG^okbRG
zo$XzI%lph>vJAc3hnzQU6nu&!t_|#Rm|1*=*k$fAo6SyQ`#bl}&2n<t{>t5e-#2Kt
za5`rUZ50&+xpTL~9i1(18@3M;73g);%|O?JeS{)3b$h!z09MHs_eY5i)2o<)#|7j+
z%4wGb0xgbOm&m`W@=O))vjCRVt&CnwS0lFSwW!PIgXctXyFf#=LoZA*x87&5SE)DR
zI>3avXE7g(o&Yu@q!6SM+JB4uB<~x<$2E8Kp*CQt(Qt-75#B&$g>H&DhA;;K!}Z}T
zm8?a*27#O<FyNq9Kr_&NScU&AR>@v^vEEOonW8b#EvBc3S~n^@!5(;~TmWZ-CKq;2
z%rg1}yHW-aG=)AwzXqzXMU{Bl=`$Q9;U2gk1j0T*MRj;RC`6ypcK>UpN*d@h^h*SK
z1nS_>=;fZ&|DgC^`BEQV)h-lwNN>t><qh%;@(;*JL<3z$o`+U&va$u9|F<jO%IO}U
z{Enl{rB4}WLrMa*K@8+Dps#I@Ns{u`3Kby@z*HM*SlO$1$a{%hN<YX0;=c_5Wy(j3
zRMJU@fgbN!oSA<^i$~2?Ni(tM8?JV}XA|zoKUc+uZJ%OrM^yl)T8X#C2Okgw-PgH-
zIOb@ave?C@;r3J5!nBvNy|=^_^7@c^*XMzGkizh3eN5mi1E+j8V^`wlDXd@ZrG+eh
zBje2w$dOnWknxTwg>%_M*5M&D$}#mv5POROn?uiXgc$?kmoajFk7FeW^8-^0-c<C<
z+C=u;E<CA_rOvT;8?4z{z~53Qtje&TlOMwMOPDvm{VM1yT00PG(AtUB4~S;iqOZo+
z#cUkyR~KsGzHlsr{VqV8Bg-_kpOzv>A?TqCoHgnI?p?_c2<_isVM6x9_+%B^mF-U$
zKsFj?Si>zFC#Ym9vA+oB6r{~7Vo(1izG&n9{uf<C>39W$eU8eYryY#>Yzj)~<+z4T
zfv%RIC&<7a?0=>F{|IS=q}1T7SLE6FH#a}<`Mwx{U0%yL`3CITFt+VsZ23E9-2pc4
zEc&PAKv%~uLYq3VLl0R%8P2{woI_#7Z+pyIH6?Z-nA2re;q;9LO0WCVAC8ue(5ahS
z%*dP++XFHek%po7ea7=J^N~4y!S6w!p?p#py8r|ZOM2DsFs95+Hk?rHZPZ!WXi5*P
z{{|A5-;~eE-TJSOE9i}Ove%mK-Dp<n4_Iql)G!z@>7h+cCS4UdFHX>+wWMpvEy|Yb
z1-q*UqD#vsOFx-&6!aS^Dx7f{^jBNerW=fib;$^n(>=kG6t!U2t7at6j!Pi9(kd9a
z5y|>BZ!9i>Vyl;~T{qg4;Mm^b5^P!gdf$MBFqYKnZjYJ}Oy&PE(q;+2_e*cdPWg5+
z5g1^0<x|6F1DaHrlQP<B>6opiEZIDsvM*J(TZ0hhT?kj^v5xtlUaIt2d?Xk>${d#a
zAfN?Z?tuLpB`VlUYxHPu=Ani5!xnwPXp@W|p?60FbS(w;ZVdDSyBA9aAe7*93l|hF
zVQk*R)_`GIFPc@U-AA=mt_dS033&WEZ+n<$=&*m&qPt(ZmTDzfUA4Hm1V%YDy4cs_
z-NjkbN3EeLq;0TvA!}={2zouxlAvO?V?Y7TUHQKiQgLDpXNu?@47GJPdmIoFAoaH~
zoq_$43ss~O9A2H;Ekj!;ZDnNu4W>2I;OxnhC$ri07+wFZ(i;+f-<3X)C1e23lTVf%
z@(kz!7DF3YB{$0J<?V8Z+%4}0Ho#@_HS$gJ0r?Po1rH-rz?1S3`4#!7{D%Cl`~i{3
zXp%=xCJr)#%q5GFOT3CSlJ#Ue=^))?H@O5Fg=@%7<N!HD?k9)IqvT0)guDXZ!#Bvg
zKpv5l(LfqFS#c;cl(|40SfNxYjmmmuyV9X_E4!6Tl*^QBl$(?T$|2=`<*@Ro@}zP^
zc||#@yrI0Sd|<w3jZz4b4cqpM@_;CB6Xor!yu)@-ln=7<pzVvIyi=5SiSm#rza+}L
zMR|`XzbwjoMfnv`-Y3fYMfp`xeod5L7v%$@{4Z8MX#0jJ4~z1fqI^h{-xB4wMfn|3
zJ}k;dMER&F9~0$wS^2o_2~mDel;0QS4@CK-D4!DL)1v&LD1Ri%XGHm9Rz7PxBFdwz
zJYsuJl+TOu1yQ~z%9lj>vM7Hd%2!1BQ&GMu%GX5sGg1Crl&_2O7py#L`=uy<CCXom
z@;9RVttfvd%HNCf4N?9<lz$ZEo1%P6ly8gjPpo{$_O2-ZEXu!#^8bnQJyyPN`>QDb
zCdv;)`FBzNw<!N1%72RTU!wd_lppcZE{ReWB@v|}N|l!O5%!Uy%;)_7DoLr6R*~<>
zZ%DwdAJ$JWJ|YW8AFT^BOotk%7TdFTUzE|&XW!}Z(a5S<O(IJz^5&Xa^r$P$eO@n)
z(VcXqs|9G4$PnY$1x*@YDX8TWK>RKWyN@g~Eq#uvjW}D7Wea*1e9^*^-#EGhBIa(S
zff73x50-v$>L&Pk%&rdwc577^tKy@;m|jEzIqe|5;WC3a{YV4lUiw?4AIj^|s969>
zSf*{%@$r#p)I_oXjk4fYrkz`cqi!Fey^JaX)qD25kZ~GDoN*QO3`@eYY)XN=V)<J4
zOH`|3BouP~|5QmjRk~UpAzvteNM@53^1c$0a=;5|g;yP45}?+L7MHJuS-9=rwdQd_
z*NQ2BtzEOaIw{vlV_+(=JQ)-8o#C_CI!&dv)+TCF8jwX;wU1kb?n>8M1I2HuG|?QO
zIbX0nwXvKa$kBm7S6HGL1>c^dY_rOFwswyHL6Kr5Ac_r6YbO_(#{VvoukN$pvddeU
zxJ@S}!MI1&@|6hDh0%L<Qx`=uPNU_n3U>jM)d8^Q5aaPz2U<JvKW+B-KUhRt){>+V
zqp~H5k^qpTaEP8D(8n`c-nJOrl+vkAt${pSQdYX$Z0e7Hi>`mWMDu@0uS$QD7lF_J
zw)|&u4pI+YOunp)Q&uWBDo+fHBgo0k%r<SXHJjtFF^njKJE&D><oPPuL+m3Bppi6(
z5sq=A*g%%d3HNKJ1g<s->uZ8-Ycj1-D-=WEA8JG%102I6wbJfvk?5%hlSUUz$I`0d
zrmRnHVUZkZpma)!78D_D%t(rQ^k-C3^cgpDjx<nmmcn=iH3-a*9)By}rtRC&hf8T6
zYPWbU#t)k<8-1Qi!g#)JGw09WAuNvCkUidDTMekorxsgg3o(h+Pl`QFhsu{Q{_3X}
z?gDgs81~b$AWw>EKY6K2LbPK2)XI!K!TJ9=lCqp^m9LlnD9uT?TqBF)<G|o}tY(SU
za#Ds27fpJr_2e;_QPw8jazZ1WzybR|qh%JS#g7N=O{CnS{m7b#kZyjbo&Ci>eN<5T
zIW46X@#8>gh<I{JX*SzLR-4LcANBK=tn1LWWOIBhfWO9&JvnWO-r8ts*B<J2UsCPn
z?F;Cl3zx^oV5B;&f`D0E5Bg<qe5zPJf95}i*ng~wzz-H{Mu?vOqa`?iOp|VtPmymV
z1>|~Y;I2sB1ujqlbe2&?NdqmoUx%~UjqGNSi(NiPT{z@zb#ffJY&=7_`g@hNTnuTe
zX3jpDs-~Q=Pzy8OxZIi=I&H;tZ^-OQGtg^;-Y_|+o29(S)aXI#QFkG0_iBq$$>6O9
zgG~?UY#I&>9`M9GC$+tH_^qEe*9rk8eI6DZ#OEw)eMJuHrn^%%jh|A;v3TmN3Eb&A
zejeR9GS*$;#k%A?RVDTR8zWtS*AXrhe}Ja{1!(TCA<rsHl}A!{fn2{+ezik|IX&aP
zlIoV_Onpn0Gfw7rmTEYJqkp%jhvFTxfklR6wal9JF7^3bjCE)Mo^>J^IzIJARxJc8
z^?bh?*^+fDjd7)oOr)BY-is<r)~g74&)l()La96*?&67(;1~$cH<!N^69ny{@-I@a
z!`ZGZ=wkk&1wK5ya+3-#oNOM>++j5jZ=%WQX@CQ*rA&D276dR4+s{=jpsCk+L)0ov
z!wmxXkNP&wvwwu!-R)|`0&JMk{V6HM^g>3pe+Pn9gef{tMORc=3m&dRAHq{HNDaHw
zM9!lopU2Zp&E91JAg<JU0UJyCcTF!9heEEf4>^tlte=t|M5mYSX3)@mo?-!hy)KLx
z7(9nUorPfptPatHHRJ7+|5v5EBxNe`$}ar#pZOD67|#czRm#vIbE4@rRUGKmzh;+?
zJ!|>h8Fj+@)Oa3D6HbW#In})Dg}tHb5pt-LkbZO9=fG$>A$~P$7)^+dc8p-IMMtfM
z8CDm)=D?bQVL^chw9kR@WQ&&e=C}=Fj6%Y>9Ks=~8HS{skY0RXiD=qPP1894f4d~z
z4om+J<&Vfp@(pF?e^MN9&hjW6ON-uUi>a-x34lYI8MgU~H}k1XPutRfzX$Fwo?u?r
zN;PsqmNz+59w9<{XXg2>g{`LCZ2Tyl?w=itI67HgHG1ylg{>vZvs9U0*e*x+1ev*{
zIOy>+{xNT-MM$pX?lo(ke(PT6WkIm4ZJ``?q+aDiV?G>+k!okoR(ZSl`M*+9roj6@
zUs^fz<3CawKLMNM2&>o!nU{jux$87oALXHLs%~iKVoiRgD^A?>Gz_Af>7QmpjQHad
z&<rQ(&DCCS+6<lE(-JOj{*Z2y|KB|inY4J{Y4P#kP_~fB)Ld!lOq;BWet^><qUhM-
z_W5Y2B@CzDE*ewk1Is+y(HIPLd0{bQ$9lEj(UfEm$j{}|How2!q<<nC;suxyr&^9m
z&!{*y?;gEov))4!pTKxr>_w;`xcESj12^aEY`@6UWODI&SJV98M$?_1|6`@Ngx|l)
z_3~}<`=pK>B>z-aE0A6P-9OE0#0oSuHeH0cc@f2Jv^7+>A+>9>3!6F|g4q^ZGlb{r
zM}~SJgb+>XSl!|3X3s5KtwyF=J5C4a)gM14;Sd71!Ysr#ugba;^}r+b=L?my>mk?k
zXVwj&`TCQjn#R7C2D-X^-d27_E?=i2#66>8fS$?&wCc@}H4yCKtQv3&AlAHPLm*dg
zQCbHt2zZ0j4JE|MtzD}|tf0XsldHG()Oo@{FNc`!<|pc^Av{$t#LzyPUK;3a?U>GH
zR^t%*K(D}9(-HI_usIxpD+D_z^Q!szKUGqSiBsMxO*LHc`xe9};)Dp3$g*R9D6-Bl
zF`sI~PzTID%$S-U>O7xYnREYS`I_F>Om^2uUHoJm9roPWOHGds16KqCTXDXn%T8?l
z(4;~8Z1IyY6B<b5q+`x2FxLTC28M^upP!S*)E3aFKcfRQvNV1o^colC&a7-c#QGII
z=u44r;1x0O?dDtkCgjuee~jdkq^IN}`7ZeGZy~S3-~LJZQBHoWX=CYrSLSl8^FsHG
zL&XhksQ$n$^8&7+&J%1!NV*qiI^!I}%%>|qV9k_ZNg~uA9!zx$Wi8u_yRDfKELEjH
zPs%)P9^gC7!0nLK=FMbP_H?Mgy|Hw%4hZ*V(x?8gDGP*KxNBTqz#@)2hRd{~mO!A#
z=V_mr*K0kpCF8@Ksn(s8&UMTv_V*xz2Y@`NNq~3RZfm%jDG$<iS)wHwDi8K_04*S;
z_6q`P#G-3u=BC5*F#r@OVUZcQ9!mkZBb=q{Tcqr?Ha}8US-y*||2zpO2Ui3C=g)}u
zxn2H&{4P0*tRi<|Cm63ZD;}W#06gPk`C%yw;mV|E3kMU{EK^A@b$8M(Q%lnGgnGDX
zokVY^OK;ex%SkRgZW(>tv0_^$a!0zf+q?ZlmfzBzQSD(rfuZQ&LjCS)COg^-W>Ewj
z+@lv&;9thz<Y1nv<k5SR*P=s!RgqKK+&-QG4dJ1BF{H`w?S{4vFhfBGY?FwwID_Mv
z<TJ;U)Xf8ta1IKH0dX0NmKq`3VH!hNHQj6N4vsa0%F;|Qx@{y7ND|2s7!Nw1J>wLP
z`f(;l{g`qN5Vk2Yi@wv@_5)+QA4wqCoo6{!vWZ@+@9e@Q3+FkCTLNJulJW+99AjkW
za+UPa>-9okF+5k{EC|DBLmS-eUER>4)Oy>nb9VrGg)7RYbN;_pQWT*7FOh18v&tjh
z_#|+<=aA5`=MDAE&FJem6bH$17f|2?Bff9nnD}Yngb{L-f9z!<HgQZO7i%u1IdDsr
z4$ZsGq%$H*;-`WM-eWc8-7s{&>5hhU=f*4>1sO0J$w*)P6pZ8&Ak`f6ksQXJGK~F5
zcD6ia(s+9QkCd*H$TISnbe+;D-zOs&=->Ji8L93YXMvd+hMHBsxf+~gkpgv}6>Z)y
z=+Lt{8P2B2@#?;u<XJKmGP5~iBSeM0C$m^Gj2@zne5t2*s-@?I$T$_M`D03h{@6C>
zl_GOgSW=EDIohLdI3|?w^!y(Ir+>vsnq;38OYi^hi=R1G@{;M;CoMSPAVVT!Y#6&@
z>rZ(*vhuknGWyO$YT}c@P>i#TOf`&&W@SsT!~)lR$6>P9Mq1+zG-oR5I_CUQ)?9Da
zeDb7*h*>k&$In1BClc4OKTfU716jxpWa}gEo3*VjemdIru_$!)ZG#M~&1q{5Aaebz
zXH6Q!^?!RMX|MD?5I%kb?2dipS4yeU|FQ4@*5ZAO9e`v7Gz}GGAThxZ+R*EF0&^NN
zA9bN@0`fEzKOv{iAk3XunZxryyl?*X*1{RA*Qy_>CT|EnBq5-@z?3&=%gVpbnvb{j
zs`VTM6Y(l3vTXx{l+C}^l4DRYj|+Abcf%fEAX{^HNx6xuY^g+BN5=yStJ01D#tLTX
z&Opcu(|sqvoO~{5Zj0N3UJhzrFmjuUY-Sk`OifMt-8$t07|IcfLIvsqvRwr>d$!M~
zXRJ|6HX`gej7Ff1t}bRqEEr+ULYqP#cehUEYl`9h;P&xnj<Tlj)jX5Vh1$R_PZv$K
zQ0Lm=^6ql^6OP=CaP;o$?ZCVQ@znX6_0E`a$_+UG&y}Qe$vb4R++*DXct?E7SSd_S
z8UimM(6qRE#2P119iI*Xvz7E&J5y444PKpdh$@mHs#c^M9(e>lmka7co6gs|7_Ep;
zLt{3Po!0mO!^Y_M9N5&;qWlg48F<mDGesL}v~8FlpNclrk=CIPh{0}M3@Z>~$l&OM
z5S}`(AAzo1&ow2Bi=`K)jb&u-oV!g+_L=dsK=v}yG>op-%L6(!o)ul+S=Z2{g_t1S
zn>1A7=<WPij$g|AOHx2?!>byX+hm^{1j^UN@~7p`0q5&RISPBgA^9uv1M)+_`ue{7
zBl&rteZ4OKM*bu4zWyrzlMo<&*~kQP3NXK>ky&IOP`{RwGWZcUl67P=utYkDpY)Im
zfc^DZas~MU(7)pFFuEJ~Uk{RRlkWln?8oFq@+vUEen;LSe<2@`4;57zizvhsmD7-Y
zV1_bBDN@b_7FdN+3%{iG%2vg#>;N9vF6BaH9}vN=Qm$8S0Vdd;%9oX|0Tt|F<q73!
z;DWuZ{7m^3kiq_>yr=y4$JC)F)hLIfrvVcDo6)oI`fzj>ULT1r!0V&Y<#>H8T7lQc
zqjh-wesm39pNww8>(fy;UVj+v!s|29FkYXHUX0i0Vk7bTV$6=$pTtha>rZ2o@cLTp
zOuW7xn~v9`v2*bH>zEU-zljy$_4lzQczq+b46lEPmE!fy7_z-9e~Q)P^_|#iy#6&t
zYyWd>JzoD312ClWehju?<%3u|UjI8rDfwp%sM*SgF~G*Fat!pSB(C6fM0_+}N5{wE
z^|*LGUdP2xz^gqz5w8VtP^eCbgF^MhI4D$4j-wycQ{#nrJuME})HC8Gc%2-t#Os;y
z8oZtrZ@}xccoSZy$D8qbb{tfxv*ImyogD{N>YO-@OPUwoiPxg|F1#*`@4@S${d8WR
zyC0KWJ#Rl)U3K~XJiM;hPpK;1e+pj9_n(2+iv1WDwR-<dyw>bT47^&qe?DI8_b<k4
z<NovTx_bW#ysq6}j@R}3DQz3}ufpr5{pc%o+x~5Mb?wJeQd{?<msIzDiY@Nh-;3Aw
z{gfW>0ZNbW0Hw!&fYP(`07g&^9+-gF&;i;@;RBSO-UCzddcgsVpt|P(?Vr5|7UK1i
z1C)||2WT&S=0Fu*FFk;<Q!hJ!QByBJumP{1Kd=?AR~~4^>(vK3@cM-Ve!SjzfYNi*
zf!%n$`2ZcYTW?b^RM-P<my{}Ui~PR49{>J_{Y2))XYrF}7+bd1ltVMtba{~Y8kQsG
zB>@LPUnjG`Owkz@%`aY2Owk4w)rUM!X}0jl#P~U&dcM_+FGgp)fe_Cm86UIx+NY%d
zUW&Iq2jUji?{w;LvnI#S260Qts$m@7dKSD1tbdcs>qZ_9-jfCvL(MhPBj10D5gBSb
zL)(LA$7h1ba<XX{<E|&t(28c&+_r4*Go0G)%eB-N#b<!p2CJA2M&oVZ!2@qaL^gK8
zTnV_N5@fFGfK(}_soopN^y;?S?{K<(wHmsq{6AKjBH{OQ$o)|%-$zb>dHp5jJmpTY
z5wxjb^D+uhh7HPM+0C*hrx{kG_oAupp>B>ylfvLmS%(!`3tKg;K<_g{IldAPpjg<m
z=UDS{GJJLx!)Tx3QGqW%q_HrFh#1@gX=^HIc1+fqc`g-^mP4yW&l^{`eDL3I^7e!o
zQX;Ei?iLlh&(LbnFKNx5Vn2K6Gd2q;!#>rTj>Krt4U8<v<>N;j1dRvoMW_=7WCPV^
zv+i<kP;rtBt-JIJqU1B=9J>Bb<N3cHlKv#0CYQ?>$oI-WBcsSt5+pa1FOmny<K%hr
zOW^Z<q}Y%nbQX{SRw^5S$Qw}}&MmWWj&PLF6J6)(#8QU#0=WWNpUmc-EZLma_E{WP
zX^H_TmC=U5ooc2Spi^m9KL_HPlGXk_gS)gK0gleXWx6hT<`^J#=x#AwWM`}J;sTps
zVa15f%xe0xG-i0bUK5daF0=G)nV1**ImfAFJh9KGXl+F{6`=I?qPZNQWO?E(hs{`+
zcsrlXi{ivvo+W2l;_U+V?fHqf3)$NxiMNZ`+ZBnoi`m<yiMLDG+ePB7NLh4V;w`7@
z+{9Z>)q=!ZPSxU*Rp4scOSHH+_EL^HR?2*XG9q`>Q3Qd3Fi86bmTn9=o9GB<yqQkg
z%7D)eU&Tr&Sy-E@IRAgAq--P)$^ViYrNpV9+l4*Mr$wg43&C9#TlJ$i+H<WfdTV>b
zyb%icsU`J+uiU5Mry?`sb3th-*)R;&+S>ZIxDQA--*FX)U0fgXZPXIGB<=*UO~gA4
zVzXQRS#B57vpfFEiQh0+OZ;i^IUs(K)p%3GIgyF6%eeV3-Zu~QK?3wuY3VyNJ{$B6
zPt|DQAe>_05v4sXPx;+#oJ!AO4V85LkCx7plv?RL@;V6+N&bR-mh@j%7VNJ0{4DYW
z7xSnt2TB~a6qwc4um5b+58mj>=ojFNFG0_aArq}lTYW7~h6TXSfTFpqluw_z3Vn2L
zeW>q{rjI(~i+Od{1W}Xf3i(M;#7o!4{iqG7489Gz+7{)Ywz>SwD&l2vFU1ANe)a8s
zO>MsT!d!GEKlF;`vQm1+HjX!LLyNAu1v#ir0A>~OQo421ExdI<d_YrOXS`^vw1<qx
zJh9-fVmxq+2eC9QBXi^P(7GC{36_j@q%7FMELg|Yd&>BLv;;LhM6l4uNKg?=BR8SA
zO+HTEC;yeW$wSD$ajU^Dpzg4igB{!k;<*vdT^k4^fSa#4dR9~hU42MN=%@;}ci?R`
zVDkOXU)uxB+8!^29wdRSK+HF6$c#bx4Ahhz)}&s;8mV**f9IeN&u;SU2AUN<SOZ%q
zOw@>lZ1jN>;zHJ^QB#xU(4LgGajdQx1K}bDh`d$EK~Al6h!sJY@~pvxxKwAoz;d)m
z+G-6r@e(gGTEZ28b!in646#nV5OprLCcUodKssShu*Dm6hm3$)F?iE^pgi?5j4G&G
ziXpoW+(K(BxEZxATct)Ufq)O(3TF<zTBl-8@tl%5?5Wq`sY@-wfCTzLJDmw@Is#oT
znz7f{f-zVfXaPGtkQ$RhwgZ5mG#sK?HiiA)i*)gbyBGHIJgQm0!kT(vO%M(%t5F~D
zi&KEb=$T&M*VRpF@q4L#o`<K?xgSIv1J9H^;Snh2gVvN{YkC6|LanC*&D44a&Zaro
zkRTW<vDoi&AchW_o&^41-dCyof4l_aP?7W*>1BC3tbb3zme)zX4eal&%6$eqfYhi0
z$~v<)q62Z^?E!QuCI#>vsrb><5$J74?1GbLGA-mX+HZ6BKrZF|A$JetJi;Gy_dqUb
zzL~oRa#{85+&z$U4sYe`f%ABZ-=F2~fn4H#DR&R#?8_Uudm!iaexADr@|E(-+&z%5
zly@lqKSr7?A;#}aX!^?KpU553-(d@wELMJ7ykxA@N+@`p1r}-$oYdAo`2VQs<CY4h
z{<)5xo^H1@?Dy`T?e+$NrwD}}`^*<F&H-yUS8&<9l-`Vd0LEuoeQ4c84ddgBugFDp
zd^s1*Wu<hT`Ua{yuRhc^MpxbWxu}khTG3oqN>^`%;7O}%Jw;PpXM8!YZdf9VP`C-j
zTTvrbdYo4u__Y?>&lg{oi^lOeUNo1L(l7q>0II{h={-T$xbt$*IHATX;^ofmfO4d@
zt$k5bn=igJ7mefFbkST^N|EcR$g;FP@H^mpy1fBsS2v)0=zqTWxjCp#fH@cOQo4Lo
zH>!hdyYW0tb=>|({r{xTOFxrm1ON9f_yAuC|C@->*+2MM?zSSnhF;Iz19@M+n!5+`
zBk?!$6bs2AOFL+2X@!gKYz6TOHDV!_Dfu2}@*A*qU4c-+{%$qmvcz%?RBiAWJ*I*-
zOA*yCGw%9JJt|VSTjBB2SEw~TXe+Gtw*ucwIHTTf4KE<Me+*lxWr4Moa+r5GOICP8
z9f`{Cww44cW93?PsJ8O8RGeysmu`@C^dW2ce==69RTOHg#eDSo0Lc$oaE2Rms*s^1
z6nv5E{})NpBIRtdUcN*+Jh;Ns{C9D@6uZ<2GCNzgKnE7Dw~1Kd79wTwN>I>lHI`<O
z8PQST%o;VlG}}8u-#-!iFW8VSw`Tv1tch2k9lhitYbSNub_^BuzI3Q~`PH{m$Xwd4
z(b{&^$IH>Kouqg8?P5W*8O>YT1P-M`x^2cK)Kdm6(t`l6j+dcDVXL`J(v1`|DQ9fa
z;1e8EI9ppf#2YJr^dWDRPpcuN>tB_=CMnZMqkI|u`H%mJtd7^@Y8;qpJgafw`he0Q
z-newba*PB1d@=2MDT}W}t8%iRF&$9mRt0>!gzB?2+dIZb0P&4>bRU_dZO7_(b*@H-
zsZlexqXXKlZeS5M2YhYxOoct19>Uq*xb^pyqE&_3R;`Oyp;dik@9=lCp&RRmZs)Hp
zeVw=LS*@Qc<^RVa{vW?D$m8WE`BwQgcq(*}?<zzofp`6PKlTlQ=jI#gAlj=F_fwY0
z$|Mjui;w|_&7S(i{nU9etNXbYsi_hOIAaKAA=O`Jd;nF8(wXb1W6qsaLCftC%?UcF
zjXL9F^k+rcD$p^B(m^%f86QyQ4Kc2ix}b5IkR{aN@CO`zm&lXaAShxss*Ddzrie@S
zYu13GDWHfsFlF_C1rA4XFi2r=6PYl)er_OYOb}(s2PT;)zLnP`?x#{iRy1+3b$#M~
zt9#DCbmLO$+Qj`?PggFKuHtZ5L*sVr<^25bk(5cKO!iAXAIEBs?20!4aOEUSPiqGJ
z!BNvQ?>U>@Ia?>vB_ZS={M7mNf#-BS?W^PUIXfM*o-llWD`oy7S<Q5IV{p%BS*t>R
zou|v%cpX{=8D{vyIgk22Wk(#}c1wqPr*!Ge9qe!nb?LC+x5aBQQDqVtHT-kG(9$+M
zIMtcaY#=FG>9B5}8UGY(V&KL-8qS8E|6?SCf|W}5$R{B3?+wK4{a9I~9I(6-So3{v
z#=(M+^fnlXE4)4=oYFhFRr*|RuM2831dt$2HOz*HW3B*XF*}#N)(qCVdbBDicpwba
zQ``mHYkdI00?^5L+rr#D-fAuST33@+?*!8;jx2hh(qvPx!+HViEk0sR>KtN|v^pkc
zt4?+ezzIHJNM|*9tl<vmnxs`LajW<mXw48n<p!J_l7l61@WjbXKVx-vS+maT>eL5~
z80G4M3EkDf)<}5|@a$NP?L!<my`ur;fNB9L;i#d*2lNSm5cvRS!{hVq{vlSRcQ<Sd
z^dbfg%c222DOf;?j=&++?QU!62)aI`drd05Ks_BQ<PU?Bz#uw;y@Q|s7fFgt&XJp>
zi!87DTwDlIzA0zN;SkyNQWox))rrFn9QV(k<;P**h-OQLN^dnk4s&p5WX=2w%TH<H
z5bvC={G7Eba3oLLuGR5Xxf(4Nx|mg`b8feEh&ML=a|CbI&(74gYEQfoXZ$2cCOH_c
zthpC+!6uhd(uIGfdZ+WDchdTQ^7Y>@LHoZ(zEJvjP=7M-9T8W&8Ka^=k{<r33{wyv
zrXb%CJ05+%0vhE%Yp33t__~~J6qb|?N!%s8N7<QK%G~U-T8jM6O<u}2({{CK+qF8r
zHfI~f5XI_J<_wutvzR>Iw7rzK%Krs@tJdVKRhBF@$)m+JD5XPGy_{d&!CDn~rA*T*
z%Kzs{Uy<<pj=WIrl@H5*CX-1GV*hR=-yy$OPEs0`&nw@{yktL)D^{rFBC0<c;@M_j
zT>%Z$DEfq931hW_j-i^(>=lUzWPM&Faz%4=>#Plt_DYT~y^)Du%rzTQR#&JeNYnAo
z2D=MECC~;DEy$VpO*2)}K<pct*18<fU>z=8)YF4&n~+k;1zEkNk8LE|d0^j0BM($A
z2C>UFbBOniMn2L3p=jKec$8lJsPq7>TjX?hC1}%24CU0})C;I9u1npLXtkcxXL*Q`
z5U&Rue_bHJ1&OV^dt0&>QqNV%PGWB{fbY&IbuLj6euG=H7b6pu4nZ#D{yzYC`JQ}^
ze1-gdto^;@C(2@Fe~vPMw5pNH%#I{*eFh|XkjZo6f2Tpf9s@B;IJ3KUdDv*>FR>OM
zpcRq~!f2Cywt=8VgDq(q4mNSytodT=YSHT-QiV&T`(mJP_8m)<@Q`{c-?>qZEEv+Q
zMrxRKfgqA8dYCRGe}T0~eZ%piEiZ!%y%K-xTnP7|u@`lHj)q`67ufUXSxakW_;md;
zSse)R^`5`j+E^JrSHFmAT^IBLvJildez8I17g>t|Fsy)XYPxQrbD}N~^iy>MtBTIK
z{K8?hL%%6jb|5)I$bnf+Q36>7^T)}*0{)MK^8XtohrB>Sv_|sJuK30*V*K>_E?d9;
zvk}v7{$a)#zsSk)&0x0*tpe!it1*m)NIHo!oK(_3oM!<v^_%oh!!#ktcN1tUwF*sR
zL>oQ%Eu6nr59;9IJto9rG=V_%vHu|T*#`7cz-rFyL1x#$#$$<1(gep3DWqQ7SGxzC
za&dj&_3he0UmahcGyZ>w#>P?x(2$i>!>p7`AF1N}|8sqsR?+i+gS=Rh7bEvimE0(=
zhX-&6kbrl~m&lg^1MnvK01yE0hg|Te{G@yY=zmA$H-P>30g-_Gmj_>A2bn?U0`+eN
zsRHKTda@mef8As^@cu3%*8uJB067G#zr*BFApIR7uK?%o4Pc3Uph(JSVEmn|IDqgs
z7aYe5r3$jfdSyG1MY@&U$|XSdyGFSQxPFI}`+@5BsPZH*{a#Uy0@3eX<%5rXMyFIb
zN+Cd`urC+o`J!AQ%3@ZQ*h^ViYA+LIxhN|{St-gYQC9zd_TB_OuBz-GzxUi}3oXq|
z(?VNh8KAW3k|s@C+ENN+PugUfCTY_JXeX0tGR<UeIx}fHr3I!Sf{I0DUorz|Wm6Fp
zD~cfWRaACgl|>PER8$0)`nvtTXPI>7E;DB)1N!;@jm49h+<VV+&OPTj&-#5tyIQns
zMB5_TR?&JyyH>PqqFpE2cF}f-wo|n0MY}<?U83D6+D)w8?A#*S3q*UNXfG1&R?%(~
zt(UdkPM>IdMC%vrcG32VwokMH(e4m!zi5M^9T07ZwYqaqwEI~*=-esVuxKNqjf!?i
zw7Wz*EZW_ojfr-TXfGD+UeWFo?IohURJ50g7LGxzgZ<9SMSF#4-!IxLMf(BKUM1SA
zMf*X~en_+*7VR~x{fP5`Xb-aXfb&|>epIv{6Ya-Ed!1;n7wrwAy-~C`iS}mE-a_qv
z<AFA+U4%XQK6Q`s+PellIylljQ5hifB}0ZY{e?&;%KTzt?d=!l%qfBp;T@|GkzEJf
zY=ORzrlYE7UixjDb2)zU$TrZnjI5Qja9RlwRKm`xl;_slFP(J2j=(7+TS4G_*`hvH
z1e%5Erj(MO%>r=g*SFgdHE-l15CzdoF4n+`C`lv0W(x(>%37fOX!;&IYEK!tkiX-?
zsWr>-2IIzN3&6_EOO!7xf7^yay8p)^`ByuST&6yzj;E=>xqjlFk>2Ad7`JS}B*WIV
z$|IL`@pfAbR`Oou$P1tJMD}0jiR?PlAO*#jj%>$!S|baDV;oSPriAYNu2(Mm5khbF
zf7}z<_^^@iRU>{7-a&TCEifbD7FIZDqFF-;y7RwBJ?WWW@&QDDZydnNksb_S9nlLM
zK;AC(ZVNoO>|S`~JJl^9|6@Sve$`0+suACq=HF}`%4H`kz_zFy8U86BK)*5mhwuMk
zMe86psJ~Rp-XmQxUOp1Uyw%Fqh%v5PE0`2&u4@H=gTZdsEq|@@$hyy9o^F7j^y9`C
zy>g^~OzYHat}-7@8NosM8-kVRzTC{okNlsJ{P`n0Kz=pZTG%$Tz!0>tVs=Yks(j1~
z0Q~*egROnrNbZV}0LWcS1_~oLZ@YcomVV{2(*dai;&+}7(`H5nFRVj-ApSgZVS&WU
z2JduR08Uzl`6!PiU*$6$yv9H*_x~a7=Rws8z5jc_{+UH;5&wS!d5rv4o2fNw`=Eb+
zCznj{-u?XoM|?$rwr)DHCd+HPx4S#Q%U@49d!qvu$DC=eR%TrbF2h3VPh)o0v*bXN
zEFVmbUzxF76h;LhiySZpnVo)jS-XEQ445UB)j6f|RL!pB4KQV+C9BFcyBc-$?-e!P
zFbc;G^)SCg$+@RMIJBM<zrSaE<6LdM{huoqj-ot_Ut5M##`ZxK)e#^S(b*c`l>Nf`
zkbi*r9LKk38Hm59q6ze2>UzXu*Ui^9W$C{uHW)&kB2GeU_9vr+(SW-;h=c@2@S3IC
zK$a)Bcq38pc72cr`qczc4~pH@JWuP&a#t%fr4V13<2~6gMF?vuk$HT}0&Po{r*?RQ
zyGDVS$FHXNU&pDl>Gpk5ovr%R5%pzM^XMekljq1gTDca`KL6hB?f=}K#=pH>i&#%<
z8w8JvwIRM6*M$5u#k#r|U$V`30t!Ejf8#7o&vJ8Hz!x0~`y&-?emI%jWmQ#k7w#DB
zJ>g@x_2>EBy10_xia@UMFXeaZl4bnX598KXS86eNf;*r5L~pb=40r76w#F0g#r;1#
zN4q%7{Y-X9Z3-4}0Jk75Tt@fB3BSZLxYl+@vFY9r=<(~3ip}~!HwAVJdIuJIcLh%P
z3%dTvsamaS$z|H~aMT-g;F>p=YI?S7Dky<KF%AP9E(U-)j+<7BJKtKS?X(#fi{xE5
z<c~xvszW@Pt4l``6&=%rr!c0E+k-(c1q5(l?xmHLl@-+hRltOBoPr1ogXg|G`X~Z~
zUUf>NBks&X$LOQ#;Uq`AFG{4-uW)cgfucPS@$*zka)_S)QxzRWfRu-n-va+@qxvEB
z3H6V#?$02Ns0DZ*`4LdRtF*1!)!N}P?@v)%eGFQ>vo{qdVK(DrilpYK?bMxl>x?~>
z4ss!l&5#w%`Z&6G9=eA!$nmuEv<*17FLIErAWd5AcJAQN+B${S-ap+z<`buGKrnO;
zE_9Gh#5rgsNbA%`jbQ&)|L%Z~SNa&{5h#NeVK1u})-6O)!9fTX;EVJVQgv&B*d~lU
zI-?wAeb6H8rDh0mMxCj;Ec-Y{`JjdQ!5&;OH4L*67d*G04rKkHn-WELmh)mBn>1))
zW2)5$c_>kAfrG54Gh<$Us{;cAF^mpT_I@4{bqSA98niGu(6!nCFvDiv^{&(mnpYUT
z5>SPxRTFcUQKiwpfGLXp)A$UAS2{=p6j?~1)Y!@aRv<&Rdjr8?)T8W(j-LO{%O<P4
zVgFl1{r~;y5&ZISjy)b%M+TwYOqR9dgZgxH60gPQ9>vNuExmD%9PY_&*FSe;Cy4M9
zpPcPH2N71~7;V>7J`3=~-%%jkwVp`tQiI-wS-vdCOuwst9vsp0aK;$sujEF<7ZX2o
z6S5($SnAQQvj=#KuN(>Cr4?@KGw(Q%ku6Q9+hUVuzeRcV{+-a2Z}jY3@`&M$Az5Vr
zR_|UCA6KAWZ)QT27`bGsZVNw?^xf)?;k_6Y>{|Pd7)C|Ue~s)>$Q~em0c`ibKmVP9
z_hts-B@SfWSPJTC){cs7aY04J5s)hios}GF%+D)0M?er1q3Z$ziZ*ilf19FJl1tRj
zDF0O2#`gB(^G0?tCNJsL1`o?79#rI(oN^0Sr>~^whixAH6;r0lf{`Im+d<Y9M~<)%
z!fU-zR&hD14>B2ZF!wcU{sBl&&>PuksvO)h5(T{x*~-B=XV>h0$|bKCAmd-$xP^~r
z{p*I)C%$kbg7K`EEytT{JQjY{79C0Dkn<adLR^3!l(=Xat0(}ut>Yg?id#m)MSTPL
z%lm^CS|}9-vgims^#_<7s=s2a|3T0HV-*x*ougc@98r7JXQ1^z0lOazNNGQE=IdOq
z$3lj&RKvO*DEpZ6WXRc@IdbBt7T52H+u2^dp@@4kR5^c`nt`%&C$mUup#;h$i|6di
zY_-5G89HRl0oE|~dCPxEhUHGMTth5KgWcf({}}V2C76OUA_v!ybChPLYdj=|inC-`
zv~Zd*1@WW{hEsR-FskXX(`Yw8|A%<}-y>?df*RBB`cHhx$i-lyTgay39J`WyWl-+A
z>A(0Om?eq<^)5Fu|HhF$pnHJy%V~f)SAw-hh<YWcn8_-oAdL+bHew<zZP23PFXaJt
zH>mD=Pv=9~ZNz<xpE44|Q0ira`*IB>o5?JjJ?-=;;<4CduP{#bypi3YaGh*?WG)JG
zZ-&8~mkd0+jZ?ePR7!2h$Z%1YwAt(1XkmDjG|;YH`X$f}iSnX=VV3#+KU>l2$W7|c
z)XBgBm;8yZO(+=g5Q!9NGnflu<}_axV)In4*iMad>pc2zk26e0ykq223@Jv2i!>y&
zcwkti?y@wb9$^t5v?zR&`!?mePg1P`Y-@YmIIPN%OE9c1vc5>{);uh;)FWjeFI`IU
zgYha}dfG^H*~mW7yjHflpJ9TGX6A~V?uDEVi22o@;PbowmquEbkL(4lTgipRnP2HT
zPJ^;np7?)j_&gt6XP}+S{{ck_D6gxV)bEjF$ra>hTB~-4BpZ;uOb%W>*K5r40Ceuz
z?EnV#*rh|WDgjCX&hHCEC`uHf@aah%_V<WLB4=C<%Rc9L&0EcIixmgCRH{%xI_D|<
zkgNnhiYta%Q|2=&{h8cvt)J#DTN@7a(wbB5&J8HS7N#Kd7{vgORw}(l4&y5Q(G?bs
z#^w-B&}FVI^wjQ;_=cE_TY9~$Fr7X$bGT-Uw<qRC0=hq_4?={F@^}vnXIH?-JG!;Q
z5uYQo*wQ;PXGqYM)g)qsN^iQzffAw;3po9mX0Z~1Wo{3RhJxR=F^uT3^~@So`VqSS
zrzqDb_;*P82@rtSsP9*wRR4-7z;)!qhyi?4J4IWgT~h2y-<E8H7p#`BkU58hV>PG5
z=G@I)_tLD=xp$cZ<<H<wHP0e_Gj_7Ja}SR$7-X>XnMxPEFB`Am5Uz!t`_4<3I!G^a
z(AaKl45G9l#Y~KWC$%A#k4Bue!eN~H9Seaeejnm<y`OC)j487~VvV;a=neI7gW1*G
z<Gr69p`CgtfH?>Rdm`weNgslyf-ah{C)jg8!2Q_!nU_A#Qja`lVn5T;YTz2@;Ctn6
zca1+v<Dw`~V~ei$BZhOB<8)k=B8~FrH7IWw<K_G)Z7o143DTXEa>if7BPI4Tr(kU#
z!X@3*njd6yg}zYqkG`l5)QA+YAy=jzPfaha9Q>r+?+0u;KGU9h+@3&hUzCmf!zuEq
z`NTA%)+Hx7_V0dX_rUW5Ueu*T>6k#Y4_K5zJcklggYYA751r+fAzut=3gI4sclbeG
z|9ij5c(EPD0EfcV>`5ca5CR$V>7u6LD4$?NUp|>U1^<7kqAgNN)jz8>%D%n?nWzlO
z)=UL~85S}cRHEbm9Pj+BKetD?Ix!A{(-zt66^qWe>ps7QR>0y^F8jp{WKeyc{%4S&
z;*|*p1|ePb)p8K>Yi2*Q{z|Q{&24Yl(d<cRpgACmXKzJw;ft>D_1d>(vCW8Zo<N9w
z4}Rin5-O%{r)<KKaq0|_Ru%al7x|ws%12LK1o^++6A2^?tCybt6O{uB{{0=%e;-ia
zB8$oU$*+O^|GD>IHjP~b9dWx5?F_U0C>KMSSjwCMq7#L5LmB4LKM4WUUDhzl4*7K~
zZmRUd_A%AzeW7@)t6fq=Wrb#`RNNNRqhWV*Fc$FjxjTJ*-ax;;E7DI-Wu!9E!>k?0
z2$h5>8+LU{im2@Q)O_6K4?!A5apgdS7LdgvbJqqDybg|!bAo={gn&DD+0k4mHfGm`
z8V9O2<rXJdM^px`55;H)_1(w@U?;rm0?AUo>=9JD?bO2ogv;yn(4>^{$SQ=!_VXH8
zuB|<ec(W`~R4Q9N6byI)s@w}{Jc3!sl(wpa5oiHk1md;e5EbxbuFY~#L!FFlDo#*R
zTZbY*;tj$EivWHd6N|s%Pn>rC>b8U&al2#+!!j}>TFrKMhW)z$c-;i(A3V6lAI13&
zupwxZ&7qL)^P_mMyA9VMc8{%;4vzyx9VB0%wa2ItvljO9$F1k~ze^R(Lk_BMtF6kV
z#x41-evYqBOawRe%NA9_OEHQY6@^Mqg^FD}66e?)Lh;iQ$6_=q$-2Vqhmf1NW@|d$
zGX!!8p<OxPxyz2o%EU1sa%}Pn-Gy=@dLH6@@Rj@RXr7gr0GiJ$)Pl(-ma?;4>Wh?;
zv-jcK?dV*X7!Nv|$=1Rwfs9US@{v+c<TV-JYj@aC%+LQFit>aySJ|P)QT=BbxrY1^
zI{zn&yYnUaZ`%3IYqn=HcUm|+=5CHq^^`Ki(%a>b*wW<!GarVp%^ReKy!s$25{LC*
z3|dpIJ}?MaLf*}RLddt^zcuc~2x;&4>)Tnas?yswIpT{Y_<8!YSh&eoqo6X55rKrj
zCgz4M4uFf~J}EMuY_{k%c(>z!3l}bg`t9!WvbgrrYu7t~3zFxv&2De;QUZIp{p`8|
zUZsTrDAQ0UsuHBx13$LG5iie|c(a+VW~jFpxk1!d%jWyWLf)j=#?<QFfftF?QHUI(
zM(8b@rQjVimbislQR5BuQ|Yii)H}L+K1$F3@yaQRR!?qM|D>Fv_ETjb^%F{zOjP>G
zTpVW-#lKs<QD0vqN)0Kk{!qz{nV*ll|Dzuk7J=t&i-5;BCR~$f#g&WY7-(h}6`3F1
zl%2A&Firk&H_|nc1r>$3NF}?@z>Xnr2=KLGZ-fb^;&Z2WcYwZ5=YaxmTy^zcu-Y#A
zpF!1%k54#pI7}gn3Ykueu{l3t9`E>zWM+9*V)B@eQyG)neijyx!!Q@SYJ<(;6rYti
zZp?Jb*zWeTFw-0szV)}BWk=_-#3azUj`WT}?xU<%+I*XzwO6_M@mFm~r|17MN{@nn
z-&0%Fr^q?vpmu_GZHfaFqm`=zlew0K1Gj$nAP#zH_U-<lADq@IQ>V)x2t!?pxEqDj
z#Q6m|XQO0~W**%M7KgM<iZMML0M8TV;?K$X&?LJxyBwRL=%NB%wYzS}3#&7X2(?2z
zKiqk*TzwzOuFX!zHGcmf<C{3|0MyJl<Y(o=;UxPs%Sx@NSi?OK_v;RL*K>*+l08vd
zYo<`?(UIi~4~Z~HI6p5JNGaE!g|ybD>p_@q@DAzG(-!L;NELnjR53?tvd|(2P^Srs
z?L#SG^!vE}-%acP?pD99x|Hr>?D+I&#OEcB2XpL@jpQ)QYUW3Fq+3Kih&gmKv<>Hh
zTvwdib{##S>3_yUx+*aZ)NYa0G&9MwIHb9kyaxH3sQm>O4>j{p0faIutO1_#?mWP}
zcR8+VXbym4dRUquXBH-=g6b~WJO&A>skWTCOPYOsfpSlv9Jv2nLb8adF<jGmY_A=~
z^Ae@ST@@A~0S&>xfV+W$12Bm$*A?Ub9JQl%Lt+Z3y_Cd?C6@Ad$(&+o3w)7qYSzGz
zDaOE#g?#U;-uDPbX0_hw`9D>;TEV}&mG3J5ROhN)>J^9pcn1*x-Q=U>E3gHe3S{0(
zwR^SyP2bl={{0jOSwWm1;qDRRvF|*{J+V^T#CaW0DL;_weLFwKo!|#@FJ$M(%N?YP
zV4s>5!OYFXUenDfa?P@XSz7tzxegMek1pudIzP&5TO6>;b!Bo26rOY`<yIaLalj(8
z>ZpK0(fWn@>HGu_PdLCFkF<iEzRQas0GQq3L0=oD;!iY8odg}jh<}Rox!e1^gAu)l
zr@-IIQ}7R19D`Ou#ZBUsSe#wPQ~C}bsBwTLR58p|_|En402nQ`q=QE44GBSBYVi&X
zy4wJL&tA@5sV>YcF704um)<5;Qm*sFc|8YjIKYBNvds~-><$1MhKo=mDN@YBp7Er<
zokzSJum}#V^@ay2aEvI6a?5-N>A-qoj<HM@-qGhBK)eRSs$m1Xf!qIp|MLS#|KB3#
zpaR%z@(>~b&(ZEWy2A$@aj%U073=oG-xY<dzKaLO0ek>?G`@g0SdmW2Y&QZ%5yqkO
z;EU!E3QmMs=oS<Bj(62LP(oWm;LFnC@lIK))2$YEdWVIb$uyatk&F4u<QKLbni);!
z5DXR#bca#Zqc+g%4b#9FE+ao&OfAbI_6gQM)Te+mDi93v9`7lpmSthDqEZsIS^2{d
zS-ZT!=pMFYAE?xP5=#SQA`~hxG*H?vXS!`2y@QKvum-@6<qi1|xk#BCwvIOhN+<*{
zC8TthoVhanxzq$|d@kzU(tt>CE^w;OK15VO<7Mt!HqE6w<pA%}yP=HD&<&l;RH4=y
zKcX@D!!PFYe^}94$aU%~>gh`O=&pZvev2<ioCsNJy=-2GVY_60<obYFUp27A++4Hq
zW?JaON<xY+Nz4Sj7m}``$$sXoojEGD&gDdn^De8mlUdJ7%mCe6Ws|HjNwCsnB#&^(
zqkitx*X(C}dU0pG%Itfv;4BBEF55hKvmM=)i4#EgCfRIei5WLrMNFrT%sIdQSA8}#
zbNe44-#)DTRSm1JL*{=05x+&X|H<+Zx!|AT%-Ridi2)LwnaxQ@&uPlZ4d--HE|ofW
z$E^5Zx=>Y4J#>aMIuTbK@TN#eQW-)}X76M2qg*Q&ACuXm759<aoX#6t9PycXkJnD?
zET&9lnJr<o13g$w`=5pWOYJj=S*Eoc*&*`~KmWJV{J)Q>ud630TV;2v)OGR2iBrK6
zVNR3tj7Tg4bDE%e*&mSE9LiM}{n>^q#v2l+fNY%vigo7asTk&|NN#?j&Tb?N6DMON
zMYIfBNa{vi^+4`x&iPEzp5l{=OmS{S|A2*lXD|kw`0BBC6faM_4-|W4%faPd<g&IL
zS))(;6F;+|o$r6t|64-#tM{V%k2`Z;$Inj8!q|MWxs4KIGs`sAb|+~ImHXC*ZAKSw
zN}K`ecar|1?PDrQ=3#8g*E+TFJk@S2or%*imVIQnSYs*7pjVh3u=VtJ?8db)aT>-|
zOb%s^Vlvte59GElwyl_IM{!faUF21jrx1C7)vwMJ{<2A(%eQ>SW-L_xpP+ga)uVou
z%tY?*&$arZ=l*80l>ZNZl9b-kEKSrwU@+A%+-YjNX2qsxl~6eSn^`GhirwrDdShO0
zz1b@l7?y4tqK0Nef6bv?{wVFQ-H#y1D39<Pkb~7pe>Ani7#`ga=;;ai!x8)icEjE<
zsP9GW6#@wZq5h#Lt1nO*kt=eW-j#^yNw?2Y0~g?}5ql;QAl63vMEu;KT=qtK2XsFg
z#?nsfEQn_}hXTkj5T@7CVYx`lwC6KRisAWm0M$HUvn8+#?}Hf`hvf2q)1OVbpW)e!
zet+0MjG%*BnC82=rJX%KMEC!(N~3~*pHru+m#A-$E#xWfc<su(wy9(&2&&7|DBETP
z*5bErq-R!DbkG=EIFNk(Jd!_?tDzJH7XN6tuWP(qt#7N6U>QA`j|e2S!d1bRr0ZB&
z({7IOn9WY~E!QBylg_@&S)^$*%eSyw>u#jTpkY0Y3p<cxk=qQA>jha@F2ya?KKObD
zgYZuHS;Vw!lB78&SC?iNswd{{b5qkweYB73v94nz)qa``jGP-d;NZXP0)wE%0}$Ip
z*<YRBi<F^&zvL!K$C1p#EPV-_fUdCL*H7P0$*q#{MsgimI2l+z2@RV^*a;shPoOSI
zaQT0iqBSeK$ffZ6ACuR<FYw}cNn$o6sF`F%L7}iV<{F#ef$<)fk~{EtSz<0I@)c;P
zu%@U&%8zzX<|^gBrpu7Ri8^%t`Noi?<%u$o?k~_mVMDq_Ohl$`M^~=%pwwk;M>y^J
z(~lWxZ%E7m?GfTHNU5=*-NI3krp!}eBrW9bU_Mvt8^uVTeb6|P#fdX9k|J8VEYRxA
z!6OG`u2K$f)U(L{Q<X~;{JT&2jXG0pP<N^c^=b8=WC`)1g7-t@4Q;Bn3Uz?)(4H-D
zyW8F-!enHub<P9_ODHrh-+8Tw;E}W=bJ7mVS#5b3$3Yo`E2lzk-#G71QDHuJ%}e16
z9N*%g#fq>CSmw|n2Q9$+j+$i5vBo^2=b(j=$||Dgv$Gteo`6%B?LKJ{zNr~BE5b(A
z{qsv4#E<9Yvu&N963@3#`;ErS`*@(uK}($Gj6j=D^FW(}7Pdo^m+mt>Sm~feB+*gD
z-72g@tN@ua!g-Ha0T$+0E_a%PDfs!{N9})?sQ;_Fl|I|eI;KCsi@p%-(OaNz)Q-`c
zC12Cb%e<aoC1vZap2+5FjcmO#Q4YE<EHGNZj&8GJV2D`Az5Fh?meZ`i`7I;Ovl9zI
za|fv}=AoK(|7P9Yi|!V)8~B`&(yGLKP`b6ixMjQ9H7j?<O@1&pBWMv+>u;JWfixxN
zf$AaBTh#eA#{gzw!uj#+GoRvOOC+Ee-T>eKs}-#V`~MMDQC1ha&Er*x#l?S@5=W}U
zu^V`aj^E=Md~U=r{`gsmDo_o%zo_rhyaFi$&W!n&k}Wn~#wpjIz1&Fo`H4lKd_XqW
zJX3nN3p<n-9^~bWzVpTY@B6!X43)(ngZ%M#Q2Nqviid4`#yEzv6BQUkZ-H@EHatvH
zxRMmY7BjU4=Ud=@1NGGYH%X~e@b6~jZM9Rq5*EN3au4~Z)}h@i#|t_g@wvHeOAIM(
zfSU7wo#@f^P=$ruR5#@3i4NbEtHf*ZP_w99+oz-cT$o3#KIe6y?08N~n8kxF3{f<N
z%LM)T>>^FV)RtDL*>$xnO+bgE!R37dds9H%bwq(Bl*%jWgcXxQ)d1)(JeptR`k-8L
zdKyt2hy-?In4*D>5Tk(PfTuwKY$HHwngJ}xB1l{Z<V>X*Po`2^XDkeJ7E+=RDNa8Q
z0RX24Mqrj41sgE%1u+Ub8fL)!xa=ZJn<Dc{r~w+#0(8^OoE)x?74T5=DrlyYf=qIq
zKlGz=@B$eVVm|seAU#ZnpF~H{F`IyE<RBL^9&3(^r9%g`?Yho#qFf)I49LH6N~@x+
zCI{5V@XOP3d*1S@y@_QLl^9tjXVjx7Vmqp{P=8Q;5a!pgw?}8C<;-7e_dWV-PB_6x
zVmTP`I5K?<{qu9t`9;Q-rFz9o?6aJW_u|WVOX4hyIaXkRgU#WSuacUtR@-z86$nsX
zXY<Dl$5DJ)VkyQ`WHYQq(w5nLa!}?f<u57HBP~YKs}f5<dXaS*i&{TMgUG?$*Z5yg
zNs*s1P)*PO<J734M%CNZpO7YUDfu*F08Y}HwTSi!?V0yt5&!?K50+F`@(Ct;X5>Mw
zhHnNwQDBKPx6ng%<49a1xRNq*iz^r4OL|AD#Z@&FL>3_1(LLPxU2=~f52+_54;w9+
z3*1fq0FqAt5gP`Af_H(tJ?5vtFaSz{8xL+;WN9H?3>hyAaq>e9pdvsGlKn;tQ-g!^
z<GJK3EdLFiP{T$ClE82tdU3!5M5&L7Ce4sV`kCv$m4!1f2WZJ7%o>W@m_&f{U;`@N
z(@N-gN|Sfk8weoZX_vozEt`+WnGFqB(}TU9!tpMkfdoAuv>^bw64dE>FY1AJ>A;K#
zr$BB>zL+A8p51&%qp4?IeULeTFR^wg3R-y{nvWgiC66-G8@i*X^9BlgfN8<6)R`90
zk-Cpy0NO93?J;IG#KrVg)%c<7(K_&$i>Nmi2yMfhVjS$sLoELiSDNjin|0(U(r}5I
zu;1IS5AjKQg0Gi{Ew*_Lg$)GSGk@||83J+1!`w2O@p3^4J#HJ&ffw?36oY2Oe3|P1
z4&?zwt0F=5I{fk<{uAGpIOjM8A?@)AauLOrQU*WeD@;Zpta!aIgjCUCU`b=n_(Ecm
zXcW`u@efn%M_$t1d1y?xD=)J$B<nqq4dn)&9Pdo5#7Qzt_Q}~KvJKI6s2PWtDl*R(
z2*9tyJX`)yp?9w6{w5Ch^&b6=8;#?tNt}&w`DKNbtm87uw#ISQ0x7bGiIjAqI}e!@
z>g+c({PeeM6p^l}#!;+JtiUJ+NTdjF$7lyO64eQ$Qyu&bSf?q?_>jpYmiwlq_dSWx
zbb9oMK4KURJ^x+G2NnE#0@?qo5CQZ>p#Lu-JIE)=kF_$b3)ugk)V}}jvjy%TIb=Mh
z=qZ%3Cp!jd^v0s4i&n4~`&C~3ypUOOeu-z^A2K<yjeXLUh?BJ!ETK9W4ea7o?;k(k
zLG}?WEu*4oyxne(eR;Wq4A2J{l}h6Sy8LcxIO*^TxRA#<@cSW?<IZ>^CA?9GE=_L-
z3Y!14(>O%R*HY7+=RSHQMY8eqGWDz@952xA4R*7TD(4ftFu)<xDQ3En&NU$KVRYca
zh4WGIicKCr<E<SO9%)pSWXt2p28cfsFvnwJ*3PeRpXXuI>O`nrjGoy6<n1DSZ-9vo
z&ZlQPNHcLBHf>d`pKv$@D(U=Y>M|<+WX8R<dV7F=#7$N&aJSxJ(>h~d(mkl=(ZCE*
zwZO9LW262K$1ON)T3C=?uo7r-0Z!<P{QQ5B`u{@eLFL7Ff1khGJ;d7*=Yu~-WU*SZ
zo-)Q4V_b38jG;h=68yin!KF8VOFv}b(($^)c^FeK87RV;lP|N$n?21v;}#(SeAYOQ
zn#8$9lK_l97UR1y92EJUES14G_$Xf5V;n_OViiWwpGOsDvqejYparnQ0$6DEqqP1n
zWU^OIF^q+t|KruT0_5L6k^p%CxxY8P+dK5X&rh2HxxifTnWEvIe=zDm<&T^m5X&x&
zdv5z^WrbXYW*Qvv$@zE64U}cwx{f+My>p#|a@o^H+6|B4LAjX+u2pr-VY#^6oV^*P
zd{`kC)-7~b!z<;5wqHg+!75)99P*1AkkMWTY9HqPj!fe;o?oy{3`L_rpbj$q-?@+O
z|4r(0MP06*uQsV|>PB^&+NTbxyVc9otJG`No7ALwxB7s3NPS#=N_}2^30cB#sBfu9
zh(eAbE;56-Ng1gm%gOn$9=4H<WE<%tgJd_k4AFzvlAB19+)W-JhsfjPDe^pdiM&qU
zAa9W)nxY+}xwILY8(K!Cwp=?OC}VBfMs1tcrwwYmwac`tv}?7Sw4`>o_JDRsdt7@;
zdtQ4<dtG}&drLc#wuk-=zfRByAeNlBiS~BUj)*oP+N5aj5bd3!y-T#85bY;fd(inQ
z(cUfEdqjJ$Xzvs4{i6M}Xg?#`&x-Z|(SA;}4~q67(SBaEUl8rXto@?%5Ni)Pza-j6
zMEhmYenqs8iuS9beN42Ei}q`xeL}QPvi7j^e?<Fr(SAd;Pl@)MqWzX=zb)FQMf;3s
zpB3$MqJ3VpFNpR<(SC=u|Lgp&Xul`g?~C>&(Y`F&S48`&Xn!EuABy%h(f&xZuZ#A_
zqWy_ze=6FaiT3BB{e@_MDcUzg`zz7@TC~3r?VF<gt!RHI+TV-zEz$mgwQoD$5$zvE
z`zO)<S+su<?Ge%bmB;_YDgNh0>a|K-d9U|XG*LHEL5WT|pPk7qUvi`AD|N#a$LEgs
zpO&bH3|CGX<s@oTFILG)M-8ja!zN`Fs^6&Hb;5GR6WM<UY=23EJcfcOwV<mg)+G}O
zCJEWBFCQx4rnc|B#`KoRhBD)5>Jl{=O>y*=d@T-#Ocr+I_~Cd?w^1}-Kx>gh|9bfb
z<2W`XsxgjO9`(}fC4Qr`-$a$2&8Bd3Pwb`dh&ObNVPy3DKUQf|@b59zjWhp8q=h^L
z1n_GLJ5=S+ULY~S9|1F7J6ta<@GPb0=9#Q<5SI|lLNm9bx;u(n=^fP0QTl$l)Y0tS
z8LfASb4e9-EZr}cI-0!$qry!cL>!a0^eVaZ&g{=OE+}xCK$y+X2jz0`vOnHvA*4<%
z8oGnm*BXOS5so<4*$3nzfwFgI+~nLXu>l#=$Q)+fT;1(}KT}3D&a%YJX$Bnu;0208
zzL(1(8)hAeiH`y{0*KF>hTNV0{(k=eKuP`EA@T!F5Y~M*vMZ!@LHm(0GiO5>u!Sgq
ztfK<jAPShly4Vqj^6)C^;02hzcQ@-YPRKLLL^VkiMcY6s$RK|GA-Ns(zf06NwU21u
zDvS&K_pTz&Kz*Yl?zCR;E$|n+Q9CZM2jP^+Dh)+?5HJ^_N!F|e_Ab2WC_d14t!_~i
z(tWOWsr92;;k2hNe(dL-3M@;kRm9&#!EHC|Jpr$eKH|8qVOZ~+qg`zM2(aaTFa-*v
zU*XZafdCAp78MGk{t&_x=mRGF05p`%)@)SU^x>#YbPCCW`I=2Z$QGcXqSlPJqA51O
z21u^M4KDn*iry)HE?b~&v7vUz=cQqXU@d_PRt@`o<Iv&kv$bLC8!~378e336bs}Y$
z+3An_5}-8Rw4a?6y_9WuX!S?baHPq&)aS~q@dRh?gnO51HU;Z5`mclGr4OM9L%?5V
zujYR2;2zt^(~NtYQH**!>+!gcQ~7_qa*?9#ATN@$)Z3J|@u6rxaaUpu<fgf#wqPmS
zY{3|f5k8zHfOx_ADGB?aLE?$ePOJt^=gG!vn<amf*A3Aqylz-1;G?gTttNPX%m=f@
zb(1%8O7#b~87Vy>(F{r}NOPgHm&5;*!#_3YEis2(CQts1L=z}mMAj5cnOUl6rlBl|
zZl=o_lb8L1l5MG33ma!`TA~rOjYYFF+w0l`2q@y-xWg8Sfk*#5?RDFASDI)5UGrtL
zvMkn}SvX>jKQUoh{yL>8Mb)i_+2Z?u9zFdZAVl4+99HI8Z~yoSiFIRKjpn_a?&dsf
zA^4~LedZxLhC4m_=U*|5A%04t4U{dD%_6gyS+hI{=#0SN5ROj{XMqKo^P0(noWjTk
zQ<l+;#9B}|hW%m@lADp%a5%>W3luSX&(;}dZ(hO!+G=GH-psRSm78jr8F5(l%8F|R
zwU3+ZBc~@?LG4P}d@T!VjXn&x-t}+<TBWW-d|`45%r_EO9iOCBQY+3~#yOpxXaSXD
zIb+QITLl_O1|&=l!Xic~?J`<6sQ&L(KC9s0_gMw-R&@_7{)g2!$;qUOG?EL*PI4u=
z72M%}$SdUcnnRnZE!1jZrytPvYd325YhTm8r~Ss7XB7S0IS#Uh##LlL9Gp+_ob$sb
z3s5-^m0%q6>pUl1Vq-g>KhuG!$YIoT{twU9mRdW`XHt*Mdf0s93<s&D9h+I_s2KEZ
zF)2AXfb%(C_(OUVI-i~9AZHTi|3a}qUQXpAHfyhEep$u7{6prKi`kbiWq!GYefg8j
zFPE|}U(NjTEcWHgnO`nrU;Zfb%jN9LUuJ%}f_?eZj4u~evM+y^`6VCG_cOobBl=$E
zmwZIO$o!Iz=;xVV@)7+i^GiOWUuS;FNA#P_FZqamoB1Ul(VH1xR`C)2AoEK;qVHyY
z$w%}?=9hd#KcwgX1mz4x>n0B>XOJrOLA6SGFk|1wCnY+;%qEa}IU7BIw0z!P9Y#B(
z`oY>j^&KFy4fh7Z!IB%Z{dL0km*1Jwa=$OJ5!9SU&Xf~9v-L++X1cQZT%^`H`&6dy
z1joGHqksJp18?7#=qhsmi}+g;{qs-DD`%kp+dTT=HdFr_irqh7AgTV@r>4z6;{E@)
z!PNiyBKKdFF@FB(<l#o%|7#_N{!u@o0|eB|<~^Gw0QopN`H;IwOpBw^>2Hkmo|tF{
zy^Ce*-&xRWHXvt4@#T#3n?(_@sO<a&tN5P@$`=&n3+ht!Q)D)|Su549%Gm$^c^@uy
zpcGq93ov#*qDULOKG;_((m%lbF`y%b)+j_69Wkw5ngxTbknL109W|tt9+ZQHPw&#Q
zf1|=?>>r6HqPFy1mpB0YJN6M9RTyKBn5+OGKxsXivK~xQ)m(aPmVQFcFr90_CX=|a
z`}QGVLvm-reRA~~a&~DHqm5mnSU5C$n$shuIyvM(WZ#&l+GHd!cHF2Vb3BOTXEww4
z4?BQ1KlWaYVxqBEq?WmB!zk0n>&BLT3Wk52|55zE<4QDtQLi8q$UTV3x$)iH_S#!=
z3%Ubk!Qi++5*3WJ*o(-xqS8byaAXli9ZL5aS}JS<JfW?um8J}I1`tEW7Ieu=FqXc9
z45IxucJ;K-u!>F=qa}Lo7=oSM@P)gKhg}(q7S81<^l8t69|p#87}|%T$b1hAJK+ov
z^B1}KFm{~}EylfHjye#4FJN-<33&Ze<0m=xugJXy$3TM#ZDTeP3%gOY1QSEwYs$^*
zUZbPzvrZ=~>gK}PiI}9n%CVu`1k$?j7OG)wI7XeCk)xhKrxO!%oMg9jVd9*CRo@@3
zV9PZ1$z9eK)(3Pf2=hq}Q#?%h?lRl};D$wPeY#MD%i-#A#G55v2fD5Ex;F$+s0{u0
zphUJ=qimT|9~q=OsRx|B(c6uRV+>|vN;lpA$0%pw|HrLHbBlVSdYGI|?$V}fm!)xl
z@pW>TsB5T011QGuOH|ZSJXq8vguBtFhq<c*DGk`ik&4<nApcq@we85FU<oSIYT=it
zy4Zm%xSU)uz0<Vc-E3Q0&3Sc5j{^IZru0Dk$1890_RzdpxT{cSj?K(8EV%I}#AiA7
zOS}VEDZRbkh|e1qusZyGQ_maRaA9CB<8;B>H$)nYJp-3+-V%6z#{E=IBr#wBWqx$q
zY>T5PR2fx4u|y}zEz#B?1iB*V6iKZSB=-t9XR83JTJK<#vg(cj9p(ENZ<;y{9X%ii
ztlkFB9K_2EcT<Tkwfy)pU@OkTBhx%*z}*)1_lCS72IWGhbSgmb9B;}EuAR~gV{yeO
z`{(_cgdLi!6YK#`gNHOQ$X$l6lkn~i$*pn#+lBiPxGOezZC@CkRa%>{x_1a13l&%y
zBcaIGF-R6TFA?a=@_n$VQ8RK2djJjn1&B;w_l0br<y`;2OhL4*f{0xO5kQKPzVp+V
zz`OD5zQoodYm=4Su9DK`*{9|clF)xfJo-<K_RoEZi;CQTRYw2(Q^nk$vHm05Pc~?W
z`w|xxyZ;PpMiu+C?Tfdf|Jyy0t#_LGzo6LtbHkLFe{QC#sPVG?_1DIm`rlII{wui!
zF7^J|r+Guq@&2FsgQ@?`Mee_foA6TOXP+8=b0weu?dO{M-&ExOE4i^THGcMKQ+Ej;
z|BwG@=%2^`ZC8}-$}{Q`bwvFa;`hG^3;(Uf-0gCaVYR3aK{f79I9rYE)Iz9f_v17H
zhI%T%#WhldZj1^P4F-%tZ*bQQ`TCiz=DJ-DwLj}<43Yr&^rDV+?lL47`@;xp;cANO
z2D$LYtUZ|}&ekCu8!Y_8bxRRCFb6r*d1LNH%!=qr^f}_|a!YVoM_@G5ltU$0xX@ii
z|8Eigj~-;Mo8?aHtQ{HcG5n>>Mt7Brr@3yG3#ZK5iCGP+!keEBM7&-8fo=$;RUG}r
zb<@~KWFdo40{~Nm`C7j1-+%sZFEamIlyUy?PgAZu1N<-H(SNKP_}{*Szu5hAw~*k!
zi`b{F7u?7C-#M$>)PGNr`>*2OqSX1rKJ{J#>_?1$=d6#K`u7#N|H_R1`KRSt73)6|
zyxP=%cd`4=nEy)lX<66*@b~}Jk4^o1i`;)zM*sX%)$=#-@%KMz>VI32`xk!N)cMbR
zE8Yia|0ABAr@mw8pPv86C>}+5TwS0h6c1{EeMBqC(Eale1mv{PCMYgC1#GIDvlg5$
z<D*AkSjBBKZ2><{cN(;e+*hcN<?gj}+||4MKB!OhFO2QK)$c&%xSSS(j4mvDq{pOn
zkAr}tVtxHy&JL8jFM48H_SMnnhY6w@q2WFJeEy+a0&4Cq=^1M7vJ((fv?P?*U5_~8
zHi{V9sk2yg*N^0qgmd>y&pUI^c$M|A>juKG?fM4+5yoct2Xc;`oSm|B&#u!Jue+^J
zM<z)f431vkPT=Z@bQ0IkinM;2E!whw7$soks}2Turh)5?VvU&E{49IKG-JdYyg@`b
z)eX5D!`=aXun+kgY{q}Z&;LuH|C4{A{?EVEOO$`oav<-`&%VS!k-6WZ4DE}5THNqQ
zaKEHSKWIch+Ls6xyZ?;Sk7E?o{^<9-|8MLtaNkQ3{k(rUEHik!Y$Gc~EW@G<>jVF!
zTpy?Ahoooc8Af1{eTf~#o`4MXa}oPA_b=3$kN(}mh6&i02o$^j4E28z`_$b?%^&E0
zR>;u*C5gTwzksTYU<&?8d17xl2uQ&GVvMBTm*_3>1XO110RG9V(-(mLg8{<?Ojh5I
z`2Pi?_CNf3kKNwilL${#hRIU7Fd*sy>FU#=I(I>z=eT(s-Pic7HvZQ$bAtQEHzp#-
zQCOe&1i8Q;tNzVi9|!|*CC0!P{k^a~l*2}gIU0z7o!02xIF0N45de;bDYtaKZE_mr
zbNi{2s1fL(M}M{5@DecL7u!wxyZrsW#Li-`zl;q~$v)Lj{ws!lhev<?dBf26B?gP!
ze^mwp;-B2D)c%JP;7hfp{`F$_pTU5t*r&3|ds+XH{%@H24;8t85$c%IKbhrX`gt^(
z4dXw&#?U`K{~dt-*G?hlt2%!9Px*<rCx)@#2S{8U!+y62!?4}&nWhov+lAk|VY!Cs
zKIn<`one^ncxz%8-gh7$Xip=%w1O?Q9aM)t&>i-NIbh-2rXYzd{44#=W53dGH=xal
zA-tv`5<hkfugL_fmxV6M*I7wq{2~AX-yYljRq;7|biG02>$)fr#pq%rK6xyoGdkq6
zjcyp21UN4l<}6Miaqf)q36VRg{|gJUcc)>5RR4FP^dJ5`u6$Sdwel}@ntFkHQ2i|s
zeJ&wi*G|@Yw1@vAm_la!GUu|t&-{|J{<ku}<Pz~~nO|}t>6Oecx$OS4MnFa$OK{qo
zgU4+5nZ>I7Q!}13nLcNXZ_oKh0b=>KDMKpDN<u6OT+Q{UY23>V7|y?~20>0rkkS2+
z<uR~JdxJ3~2DkgS(<Db`3vvFl9*-JFA7%6}WO)>wqfXdzdZB}|b$w)Xrj1U7EKjL+
zZ}I~5dVOfS9_-=N{CxwcnM0{D`U<i<2gOVn);5A~5Y-i77A8tzt+zYC%n{DNj!wJL
zGmz!6W~uR=b)fEKN}bX6pXD)dYk)vN28`BnX=O1hY~KEnT3IFof0ievUL<7Nqnz{q
z`1#*Y@qgy3jY|K!xYHrQUt9zU-sqvrGGy}>7~2kdUmaEBKIPGWaEF17#xF|j8T&yo
z=GXc5Sf8-sm&dRXM*2=Sjxd&p0eF2XHkzEVg6<`g=u+GbTHO7v><{naulJ2#83(^1
zu^X><CwSgi<bbj8$}w?T?^pgQ7Ov6%MbCc+8B)j)c~x7fCEvyU|KCUdcLw+j_#N>z
zxt%s(ASTRHCT`R$tXb%0fu7}VKq=8<9PV@2xskw&GE%&>z4Iz*=q7V7R2*4@5)d&O
zv&XA`h%k^QSk9Sm#(9mLf8KHwR7_z3eBh8YDm{kJ7?G%c#^9B>WOL;h20?`u)NhNT
z7E8Mycq7!N#bXeU27Z5-p8w+j{-vExD%BSJ^32#4>7K-;dDsYPup*7?Zyp%b@mn{H
zg;gatT75hIz}-k;x?-tEzwY_IXmqfrVki{YUETvXBF*oKvG4XKQOgh__i1t#N~?a-
zQVN{^>YzyNQJNzt)jevHT!K^LVhGt|IVHv{oR3|;Upj;8`*(Zv9}XB#!cbx##DHTV
z(T-(|#gc@JCR11UQVSUs?JhTtcynSe-s)H_9AndP-Zn)pXAyhN8q%UyUlx*$5j%sP
z|KmtN0rq!-ysXvyR{|It|NHOVHZ!nP8_4^}cj_y&p}g;^Kpum0zg*y<<>^e#K8-*F
zWTmy}(aiFYkO9_;N^7a#QD2qm;vc%u0W^}F5h#`&QM(YWCKg1^vJU@lpeo{v8gCD+
zT*lA;tH*HuQ$@K`4<RcEiLfXELvc=q5CwpNH0guP|L^<&-TxDnAqD@ws~)3nQNMv4
z;N9d$+F4q{=1q?MYq>$$WmZ%f&1s0!tZD`N1&RXESK>OeO6$%2Mn)fx<>IPrcf`-k
z?;Z{!Ujr!-FE2`Q+{@j~{W|@RQL$VuG%1}7p1MWL9fe}<S{TZD5gvu2Hbeak!qMlY
zqAsFUdYN^&dOOmWSaBWK*>W(VnSHVK0VTc8AB;jo?2ASF251#qI*>ZJL~9`GvQ_9>
zw9XMfBj4GfVoW^{k442j3V)19lt`3K&Jwv$?M#BH`rHhgW+P;BG_wJ*+Y8aZF^JIF
zF#gs8f+4aaMl3YM!&{ch)#A<UhMv?lUKmf2syRR>-s6P~9YS_uYCaarF_+B88cma+
z*N@`I$d{uzXWd~aFXd}P3~`ZG#bwj9OfEh<vm>Li5*>LX?hXE4Z=~Fi|LZ!7%m1kV
zcM<slDN()u=@kIu<;ii7@jJ*mIV)5S8Q&@g5y@OS>N(Sfy#&P~PtkCVlDJCo+`2JN
z|1*k@bCV7byq2^UhhUQt8G9nMBP|O;$#sSDfZLYXGm;vJZ6=LHBG%|Z!5I|TA&O7B
z6qAD`{m;sEPuY@rW|Dx+HKe&nWKvd`nWx=>f~Vl@d;yr;F2K`0`gi3Z0%&bs{wYZn
zgx1UAU*=k^%#*a)JBY=}I8*w0qh$Hxo+EY?((}Jm`MiREN7PB`B6YpGSN#&1OwJ+~
zk`Dm&>s5_t^R)Ha)!G-we()FP3AOO2sPLy0?x1)6rPM)ABk3BxOJRUqIToc$V}M+^
ziV7h%Z$f2d-Ed9zWkt?`;g#Srqr$&^w5U#Ig<g6T#k>se)pcA4CgC)CH$4?wyg|5)
zeSHCl1R<mm^&pQH$m-pI=k|so?#%&2ordS)LW>0k$&|a%T@zT<I6Ts*tMcr85F<|S
z$*BRF&$McU8|WNL!!?oB#KrT>CsIv7FYomG`UHzDN%d^B3mBQ3gJHJ06qBEW9@(R*
z#cbD(7etz39;nO>l;kiMosMPbX?UVps>ICTsR1srI8!~FU#j6SaE)8+AU?br3qZEi
z{8#&YG(9;G>ErN{u1TyCGVU?@2>3g9Q`qi$Du%GJ9n*xjKZ&?pCJs8AM)>x52WU=n
zq#w3Xy!5(QWcyHv<;g+Ph%InKci~{BuIc>zZ&U!u>``x2ey=nZv`6E!k`p;cma___
z<{{nimu7l1WAi|KOj}us$&Zxr_pQ&{u{+RtY%%G~vAC4%e?J#6mo^8-;^Z-)a}((*
z&Iu>CtmIao^5w^E$=;Wo0PElxU`<6@2gT!VMdXyzciT=td2&47Tk*uxO6=b>9*$2&
zJ}1Eom2cWgC|v(vuPE!42XX#at2Y4ovzFXUzNKAJ5GSBFUEqjI0LgeL+<YrAQu=_!
zWoG=Sd0Pvu3-z}90SZM6v@_QCk&O=E=;pMyq(9u^uvj~Ys`Qi%y6a;?$-P#}Le&O@
ztnEPg#$gEXoJi^RP6y!4bCP4Y&8h$$Gb}aJF_!kNcK|0k|A(57F#b^f)PS5aY$DZs
z;EAX5$MzOTtWoL_X13-HYzlT%YCf4681#oJ4!_^EExz2b-v&89Z39)bc~iHTUjmFR
zQE!O4<62{Y`-X)<VC4WsjsllZ5>t1(*TU!!<=-|VX)6??1rKOw4ZE-d6*!^*vw;9J
z2PkwkERn4rAE{7*UIJmCKpb;<<?ug_c5Q|5)5@_nQIG}r&RCiL@B%k>P$Oc9U{q)c
z^yBX-`ycF@aGSB+)J^yQ1m!tJc}}fUAA(H$5$!nb%7S<PzxzhHtTiwlykmfWLRg*+
z7c6~c9YMc;kXmEvbePvr(}BbFz=7INO#wcNv;z4VnTIgVG3=EAFSCx7+$mS{NU~FU
z;2An)%LS&~LHf!{?vN{iDcKzr^$p!M5AapYdb?dN<z2EjsxKIN!<|u4+Nb1}eGYg}
zbMigO&Wu{eY*W|t{g0|YB_ndlmXf_24>XJ3Q(1r|w-vKz(`jewxz0O~n(-u;|F<jJ
zxnzg>Rn-L?kayuHK0E1zSkx+8FCv$EkV{$1rOlmbZvmT^ECHqK$l4+au*Ovg0WMSb
z&8;41Q4`9NlR+(vi$$U~m*$_-Hn8C>ThX{Jc^qgRCPPJ{)hIy7m`w^Ywyb}^c1-6c
zCt*x};w#RW^064?V_rCKx!nl({$HsmE46asRj*eblivPuCFz=|>?13oqAs1DlWQZN
z#2-b8sa~99tN^jQx*PfDB{$mqft<R3C}+e^ygfM$FJPx^VMd$2DoiFXD?19pfufKV
zC?xQ}cAZzfg9*mCXJl`!I7=5nHgk+VgQnzEjH*|5tJsdpXrHqp4S;aK%%c@BxU<h?
zvaLwm)$q9&#aPZZkEOIIV=-=bOR8whaUcrBh}2jLxXV5A6EPNJvCR0|<P?l$fLttR
zm9c#<MwQBHEOmiU2yV>=9iR-u+!N(8S(N2&R6hRcTlkP(_@v?WOjg~9|EpHC^GUCI
zIes}Pz5n@z-N_jfm96AtIVO<uRF>SB`fXCjWv-mtd^kCia+<mMbz;B}bIr(vXdD+C
z%-u5v>C1CQ^1VF1Ejb+lX8T~#9pkbxdfO~lhrKa)tkz`Z8u#z8%<l0-I%0-p7GIw{
z0b@k=wq!P^?bb2cIIPA<V}m0!&IK^}I^rd`rQc<dhh;XFTi!cuKTX|6Jmfb_37zL8
zj|WTGLIQFUfbF=9c7LmJfm(qZ;<CuQGLL2S`i@)b1WUWl@M5U`f4p+Jf`3n{in>gV
zsSm5qs4uI3C#RAc;wM*;`^a<T&)SJvleSa4U85x+i~Dn)gIr8q83i)MDcp_bGP%*L
zW{_H6(hrEzvmA(gMCbWU|MArhaw)y7(6iq)Ek$)9NA%Pa9Aqvr@-x@WNe(g<U$cOw
z(;cLmxMrFhL<p8@WtdQ|iqs{>EmiKWYGrBru2WK%7~c)OWHGZK%}rfmJZb4A3<}FN
zKXr+5l7Zyc%0sr^m%79_q2=zStt_k4HH&**XPU&5a`#!S%QrG&PUb$pnHC<$Wvwd^
zAjWb0=A|BGRMN}c%UgN<71sjpkeg{zr>${(xdU^ig})~=HtqEJ4$^`5Vxhr8ybSwb
z5g&>KShZExiGoav_>&c_9N5lPey)SW==03ePp{$e{u^{3@PC*OvCSX$4Y8nmHes`=
z{6Ai)q4od1N?htL<u!cB>nA=Vc`7*IGTFL@se|8eI#*b@s1_}5<p44mpLy+!{&n6V
zqy}8xgX(5~HE_51wB#wEZ852q<IZ-pnNE(QTV$sF-`-bA>GFB>XMbj->xAUVplhjY
zT!<}QM(&Ze7qV@Xv#88PDSP@KM#|<TPXcAlq-$(5Cbw<mcGp4#0x@d8b+?h)Y038$
z<^7shSBf*uG#w42T<hE!g083EG}1LYc_QelCmmy)MKfzQaS0h#G8a}EI)jn*pEgj+
z{eOED<z;o18d3JB-z5uhwEa+9uHBRu8_4@&$&giqE%Mp{P5w|gX65>*hCU8pb&5I*
zd#+~_Wo%OuK1aMUw<&paV^QpTwq{%OAz|M~P&SNp{+N!?3+Vl*)jovs*u2;_W1dw~
z9>ey`5lp?_>p-#1oaPe4ZDwZ`&LMBGKM<P3j48B*n}Ut~7CA?ssR#2Rk2>JP+YzL~
z9($W)jCAIBO;rytsqKO29`?vv<$~u;l$y6ITOICQk%jQgVx6$3->}&M7MuS}n`ID6
zFpvCiW=_wkH%W%D8|T8zuThL!56wYnG<DI{_x3Ww#nc;n9kA-=PrBLKj5<Sz!KQvd
zxCp8CK>-Ci`@GDXKJ|8f{-ge114*iXSGOtOKrz6~pSU}DCYafIvPS07J(a0$SLBS_
zpPB25szJ)e{2u)m(+q4ZetdEkKM3ShXgeBB0{v0>bEf^@l#jJh!g_F?zHKCIM)C|0
zHg@UAymA&TY32BakdCtawSJqR?H6T6+T6+0i}7M}3cWeS;>CA!8YAoPGtzi^@-)y`
zE$ff5d$EhmqJAdc6DBd&CA*G@nf#60Naa~cH>g}M>j$u<(!75=XbEa&1vJqsfAM&>
zaj-srG1ovjJ^weU%N2FGdcNAEwy7J{ZEBx7sP0B3kgL>d)tl6$dbj$3dPsd-eM)^^
zeMx;?eM5aqJwg<63~`Ye#7)XbCD4M-CrzY{Y()KlJ~D_LqRU`AxR%^RlH_j05g#It
zlc&h@<R$Vtd4s$~j%bQ@jONm2pw?KKRtb6Id{`LTP*-@H)~5|>yHSzkD(zbBCM~Jm
ztv#R}(jM2I(w^5|(q7lz(B9IHWHPDu`qKoBAOhL>H_`rGwEqz8KUw=PmqJ^Y;!;IR
zM5~F`A=+`G9WUAmqCG~m$BK5MXeWvGIMGfPZHZ`|taZ7jh_+O;Q$;&Xw8x9~1kp}s
z?F`pU(N?l{rt3t}zE89#iS}gCo+8>)Me7#rX`(${v}cHRmT1ou?QGG`5p9`h=Zbco
zXy=P|foRJ`yHK<htgUn{5^a@e7mId@XqSriEYU6#?Q+qs5bfElUFkYUw5vpWu4vB_
z?fIgu7Hy4aYeicp+IrD8h_+F*O`>fU?P}4k5p9cTTSe;;?OM^ciFO@p+g%-^?G){L
z(QXiJmuNR~`G2mW%vG*d-c%daM}Yu7L|)L&(QeP!Q<4IYT{R@5Y1){xcY3!2>QZij
z$L{$OiqeUa;-Fm@X7Tu_6-KUTq%GSo(0H@O0l}j1IWtSqqb3#CsbhS$S%#+1W>9Rd
zvN1k8i?HK5V}}FBaN%<zf2O+Jc_!x>#NnLchU>Jk?TIRL>@cjGRqnE|e;}}XE>)3S
zbGZC}qM}ujE7f1C?Wp~Y%6Ie!wzK(=X~u3lGcWFxVR)v=W<P2)UVIakwIJ$0yU-x9
z#7|1j16?ag^Vn=FIc&r^Y{+GZsAlv%{(naLrX}YVW!}vECS`M<Y4Vkf+T*7;rRMDy
zM!IGs%RtxIHIZyvd#0(xCm4Nd<F9y~(-!IayOFlp$vL2H%=R*wB|lT*qQ%dPS^U}p
zBc(0L*`Tza#KyMz3bfZ3Xy>2*Kx*cV_0RbJ?^d+!<lAHtEP&n0*ZKZ0*8h8xl@pa-
zGBr=%J#}JHPu93s5UZC9_$NL$xd?A%74hczR;byJZ6@j%%$*2dDSzz_7_D#J_&WX1
zxP+!9D?sen8LNd%C0u)1+<sLX=~CG4(SKzO1&N=NTnM_PUD<ZhOqH1~B%=*_k($`+
zM%<JEtzl+<*H33kIOzYH5z0P3Jy{O=;Zzx$4JeztZDy7~Du1iwQybZB@&}xdT);`o
zbA1|Q28%SAQHSNsEPvd@D8p&`tq&O%BbEP46%_lsRe4<bxjIv=Rdt~MKBxW}8NdN@
zfP9PmNdumSc8B(Iu{eU{b7nb6J@ss6J8#NT7iE<Rc|PXMMfnJKJa;v>QOI?g@aRe$
zE3P>_+#t^-?^-Cl%em~Mt~0s+yOMeRvp|#Zkc&#@x-0~4q{>0O#FYm(bS>i9)s;-*
zvxfya+d+2H2UFD~PpA)`pIgbSv^n5Ac<e=`MI?a)B*zj5qGCXzc`;>y*;wHqI=zXS
z7^@MK1V0rA5MU@K-Lyh)#2+3&z8jzg04CEjBvP$cEOU^4+?ls;im!x~7V#ggUVkLY
z5#e36bpIc#d{a@rsh$b+pGV0_@c#WoTlFrY|445CJTH^fDGd%83paJmP!ICB8iB_G
z$VBEx8j<w#g}i_>M5+*CIJ_a3Pu9<uahs)|&mTm#xZjPMRa8u=4i7N@mMbXhLN)YY
zwv})!Y<B~y)WgFm-~hHus-J$t<IQ?Yhd<1KZdk%)EkG5c+(YN`7ubbarKB<C2rdV@
z)iBD3`-9t4g+coytv<$4n2jUYmlO{)+6PY>Q=WSYe8c7gZ9{;8ShB4jjlhK|((?k6
zCI%z%=F_mo9|}bMd*EyY4(O<h)YVVO3&8(hj?FgyHrUtWT8lP|`~c^Eo%#>;)5>x+
zqOMZ@rF=y}h=Aee$SQ50wWWn}QGWy_-jG{c;nBmx{@wss8?D-a8auso@=m!BJ>G2p
zgg^+cZR&FEuc&sn1rhhid?3hgZ1Qt(qzRBm#wX9!F14W{FffQzn?3!3Xhlb#K1|)8
zU2uEStY5&YGxz85aXjLBTa3Auv`2V!mfp#RAm0D+`%pUZON%srZUUNUfWlhloj-mD
z?)r)?M@jFqIyj(5kiUsUQ#xhGBT7^G!x~3?x=n}avtEsr8lu3sZMuKJUFN}wQyuIc
zLTVp{GiAn~Q#RvyzpHTo$KTRk*5V!Lra`ogdQU~We}HBPxRL3~0@9hb#NUHP<HZg)
zIDosF^D)gKC|TS6K-;GeUW@eWMqTd#z!qmY+CoLqp0{5VX#^oM0XO0ylp}Wd!hvqK
zC$+Od%q0BBf3#<79q|dd>8b`<!25B7K8zL!`Dsi_t5p<o{TW)b-DA3A&}^c8r{KkE
zFWROpuhGMUf&QS^8wylx(0hRBM&IeN_u{7S*}sGIyP6~YL#Xi=?e}^kQLoqC9K`An
zkNF%P^U`81U`^v1Z`2EL!GO1dvM*Zn5u>EtmwbTg|KpUq6|ITfOQx%v@#}x&PkdqW
zEND>G#Gj{f$29zWWVO5`JGE-Lt(w0gxfB$)lAU?#e2n7!1>gdN=BQ#zyfe83#GgSL
z3n88!&$cptb`>B58=;Na<izA+kW?;<{5EQyVDm}O-0WI`gyx`pwau2gCCMsK*GT#c
zSfBX{_xWlA%GI`XbNk;cMLUn&tNu=%t;|vm7#Toca^*zDPtK6D;8BK*^DfZijq!4S
z;=}mg{%yW6<h@{v;2ocuJO|TwCRrmljcJ`#SlE#ohXw|t02rsd&b2bf1<KW*9!8eL
zot{Yl7YtUCcwO>rkkuud_?5Z#sJvZ(mR+cNu3Y~XU8O&w{~5=zJh=knSVMHV>CGHR
z-pXtK`mS;}%#$|ze@b#WTN?TLec1k|Hc5MfNDhO^4#wmyCv;VE8HidZo2i*Op=L2X
zxBa0YtHlnN-K=u`f3KqK1^(|s^=kDgq>$XCO&kOIkCA=YewIV>5x}%U)N2dVVxlb+
zAen;(wfMVrck4pDUVz}SM6ap)$NFH-k4GO|GZf(uzEV<`<WRa66thUVqZE7e7*J*@
zbDH{oTSX=vyrw<SLyhRrjF8zD;mRmQ?42@cwIhDKweTl%e;V}Kl;h%>W512eoaeK+
zF@y5xdgw5K=B){{B32Q+t!iW)Hv`&g7ixl`7B_H{QEN5q=as>xoFG?;+ipJ6#=|4V
zJ9G-EJR6bS3@Nx70x;JEYrI@>m@-)ogF~uEY5`fz%7@hWy})0DEfW^LP{_+vU_hV_
zAQBhi2$R95xGr`86~R(>%6q=4<W&RU(ijdLlx)NL3gR1D6NTzF^i9<0h-cS*{misA
zWd=Y0H!4~;d4im!-k=;&Hrj63JpKSLeGM361z9gAK&Bt$7T)bO-k7(ash(>^<?@v>
zS1pUuyv@5j`U8E&lkmi3HRvms&Ctl8&&;<0|HQEkY6U{$N(<w%@uHI-f0N4_>t8ie
zcT)2FLTAsy4>5{Ygi3eJlmJ=C92{c0>cX0-oW8(_k-lS+=YhWW$>vq1&z^-7qgI#$
zSK9y0ds`EuMgK<BNXtpda|@j-3om?gl&Sv|oKt|SuavoJ)>j_j^gXn~NZ*OcRfVoJ
zi>$XburV{MNq3A}Ay-OVbm8MS^EbI^zJWS={!dj#6#RQq`7Qi^bJPL#M)m9JTcn(9
z0Rr&n$XkfeU9IiW4r<Tj!2pVKDfjL@Vi9?ddffs!^{d=d_lU)YYw}Xu+dg41bbW<;
z>K?Ih-QZyA2O?l~IIIsdW#Ng*4l<p%p6u}HVZZAzFL&uWY~fC!Yr6qC=0W^FfY-oo
zTf^?IaG<xB0?FZ2t4ZNqKhG&WY>_c2nDb_x13i3yp@VE9=+10QuN%U_!cbHK0KaEk
z-1W`WgUxnvRw=i`=NDY_S?>BeY?0JfN0H8&VKWTTl1%i_q9enM1W*8!&B@a|CHAnz
z>*#`MoSESL?$j8*#b^7l#d~RkdI*CqN?!=1;P0dcU^djW(r`>rBAgO0^L*FC7S3*{
z_x(8Xy1V`17<~&m>O%QqK9pxT+R^`1IIyZ+hb{a*fXSl+UX3hViVnwfq+b+-S)@3$
z`y+mDcob^nh18SH-W9`>d202y#q?MN6s-0R1Yo7F0}M0=d;U6i<{h?RMC=^}SUFYK
z_qbd3umwYCM{O}`)f^ZcqDJ9{fPglCiSK`e{Cr(`N1YA~z@6&t>bKOtkXd9M5{vId
z?*HEqpWmTfqTQ#xRFqBqE<9v`gRCbmDUrZc!?UVaTErf17KO514XFp3y+BMxMXfdp
zGQ;f(t5X-7{W=|fz(vyhjSXILn0WYWmk|$K)u{)YcSQ?hHSmUvA~`muE;eVez~mmF
z-XBPX>p975#l;repm{qNRw;gXC)@UGQWu-!dT61F2vx}1`@9UD&{fCbv{zc>w?mDB
zUv-H4E}M8r!%B<gPaO;%xKa6qt*PG4yv=-6pDSk9Vh5Pc%~h!fn_t@oFjn1N4-9Rc
zYksa49$m1~BGIbV534-f_ud}PyVs>IHNQ2wS?AR1!@j;bY-Zb1B$(e>XCDqYiUj}+
zZ+^}<i;HC>H`n>%HRLdPxz6G8f3KqTBmQr`db{!urT1Ofpz+dV6NDhx_3~E-axJA?
zYi;TC(;)nO!V}r@euMA>C8e=Y(a}PPFmKA0GFO$i-OB0P_$MQM6O#>~?_^n+0J^?}
zwbd%^c9gwk<9$85e#xon>o8JtQnJ3_*)pGs&EWur&Fw*bpa|z3E3E`0<5hdVyqwXe
zKj1UdS63)~R_D8kx2=@9>YTeuK;K;+2vJ7*rX*`Y-x;!1OETW3nfIoL@#F~eQ9knJ
z^_-|3YYaqj``-<Ua)a_$<o-QKP9Vdm`Eia0mEhm^(=C+@L?@`u>)sFmIxl3K9zgb*
z<z;#i*t4$>0(!?_Ak1aiDLrzrGZtN#&!L9!5W{)~+|sT9x2yDRav;Drr%lJ=@n(sm
zx(8CYPZ$cP^vVGnSUlN$&b0#i&kvAlv=9+|-tZ6;B&SG*omli?wv2RmgS&8q;Vp%G
z5ud}Sr@!Dqm=D!Dc+~wtDD5i{nNu4WgoTeDu2Xz+u`?EfFrUV4dH{hdkcgm3q)>aO
z_~pWX%pF)rUG$>bKoo%lXd!j*Y1&?J4`z1Jj;bs)UZOf27=T{kXJ+RqA%6ZhDcUyV
z=epI)lsA;7LiRn5Qct1G*Fv8(3(hNLuBv`}75LmI!F=Z#_#CpCT0!3&Sr7yILQ+R*
zP8l_)6ub1UN>0}Wrl9qck}ZYKn?+=_S#n(|b5+x$8mDhlg>l|aO0FrGKC_L{tX-_M
z*bSzuYQNYD`XIsuE;7@%x={M8j3Cqlk)hqKl)38cYiadhO5ZFqea(f^XOSUjRtr|j
zT-9^`v4Xyv4D|8+ze>@zk|)U=WtF;4xkY;aZ%(#PRJzFVl7RtmR3Rb&|4$xT_FC>x
zfW^s9%-ne-BB?Uq!QA207Sp3)gh#~!zCL#+PX0i@zAMsCjY1+Qt{vsj!?3Y1Ev%gx
z_42#vv{QcrH}zfgKf{Cqk+=g$mlu-wlziwm9-OlgsOR4WO&EYfG$<Sqx-d<lxFrPU
z=1@q7MGqD<<kjr*2Do*u-DGIX`x(u<F0dQbjO04JjQM1p<e<{or*Uks%^7rN3B7vB
zvbV5=4|?>^nOM|}WLv?sndJ$}`O}s3l@@6uhHHH5sD^pa6WP4VxEfAQuI1ZbF5n{l
z*s(Bink_jiWv)^#Ur@yf++<8fqx*lHvXbimcc?cjuj5zQpZICXO&A+s!zI@Q-JllS
zz6ND&VWfrWIjr|Ul1|0zw98*x_L)2F7VgsIMi5yo8=yhiQw6g)Fz{6DImoPX`>&9@
zntynq4dMG8$*$v+{Z10E&1ZTI3ebWKHZmIy_#v>3E?tM<Px&ETZ?%Xcr49uVudoSL
zZTzLlJ2;4NcT`_Wc^TS`a!?T;-geK6HuDf~NNxZ>T}R^M@|Xu^N$B#2kjXI{&{`2%
zyTxv-Wk+2MJSo0?EO%G@=^DF{Oi8ZCQao9jhq43Bnn5+fp(9jTSG$FgiH<exn$tUD
zHbhbVzeH(J@Nd8Jl=4gUcy)vNLG^n?1(wg{<QYT)>A4xgN(YG$5JJ_C{0>rAr*N%}
zY0_OAPH~VGlmfc`>q9a6zU#Y(dc53rdI9%bwKJQ4Cm{S#O;D%Xn(^DTmCgi$t>-()
zKKd}Ki?1FE22czb&Nj*jW*dsJRR<&9Xuu2Yvt<ZHsk^z&dNWTrY-cJ9?Sf&t!T?c=
z$ZdwdhF6Pcr|+&UYf#d03hmW+T;_d@yE?cDT4G_i)_c$`9G&g#9O>-SQPl|XBEfEy
ziG(i=zPB!flLWj2bnL5jWO39Y8p@ZdWYrpg$25#+7M|7Nx`?}=@?hPrP0gTSGALly
zwT3XfctBokq<JdvC_)Dd#)fIEKc-9MK?z4=ThQ-~pa54-Dq-nD?%ZrIgb}+o_JE99
zO2)g$Lc8M5ab*8Y;@W0%B>$UgkMZ+AMB{&NA}6V<l~C^8UicO9jme9^%zapL`7m>8
zkQwvREY1qA-EoHvCyjfO7h-Iiu$c20+n5*qn72*+;xF5bD3-hc=hZl}B9HOdFkl<T
zeB!}JZTgO%k=%mLD`XM%nB0~Rzs-j^Pq}HE9hs|=n?YtX*_Y286?(1|d?KCug?nrU
zK+pe)N{51f_rm|b8|VHK5+>i*&em=&aG%Se&vHTAY$3AK1~$nRqT`RHa>$rY5=q-}
z!OFtM_yh-J``iu!*2BAbA_3b$f{ZYrkJ}*|!00gT5!(d4^l;VAv|G}`ai@K`$ARsV
zd*If$Tct-Mp>qx`;Hbj~q%&K{w8N4PB)d+iw-ToQa1fG6hkrM6=kNtn2!n_`r$XYi
zZ%8_j?7E=ulqQ8BFc_g3_<#^F7F)uMQq#V=-GS7x!l#LPsn`gZ&|2Tq!_cg|kbB(&
zH%3h$%t!GgKmS)K$YT9F>VMy_tdQLGgGt{+Wq{0=v;DPaW+<clPv#fn&KZA7Zj_(i
zWH(OOVG=)8&YIFTTCLRzHyjDU)S8xW$<%EYUh2XgMLu-)5ZLlh>3;^h(SC2z3+;a=
zgvI=aYIOemdqm6s5D{1N?Rv~+lD8+fO;mj3G`S^wbTO6Oc=Y#izx&#f+zWSlax0{S
zGh~Y@aAAgS;hegvoJxD%B_mnS|6xTLR$f)h)LrTifad#A@`iSS_DM-jP{?I+{@)I;
z;C|Gn6OR4W07ap}pn(B|cm}<|ONVNV56Jt$J_duPYGQ-VbNi<*Y;nYA=H{Sjeb5PC
zt?$s$bohN?Slns!Eamo7=e0Tz?Vghzr#+0ycy&w@MJ-{fJhu<g6ngfwS$+p{@bY;Y
z_1&XzF48(sh5)t*_jUw_GS%GOF+d?H=;)*FDtC>$-OocDrk-IB6_9>Vr_oF;57oQ;
zp(t7;GN1#TO^o8%eGZu5@}Zd8ty*A!L27=4Q(J@3+?aa<rlJL@_6;;Fl2T1eHy~J=
zd+n#rm6IORh^ES6bEpSK8o0LEBk|%;FuqgoMZHP!*f|jg$|>eSKeIhk(@h(y<-~lL
zY#2pQLx)-+@DFoS4JZUyO3~n(27gdM_&4gXrLs9IYjVJ#lTV*aZ1sl9sce8b2}JpF
zIa4m}?C6}ZWk*w;VnKIHEW|*ChW(fp6gOj_38U-!bbkK7U(qf?oiCt(EAKC4JCE_6
zctx@g{IQ<+<PJN7@L(0|#%x4ZcrZSTxL>=Am3yjCf^`4Ap2(nTIG~Xc+zXPoNaH|e
z$~!!FF>M>-jnl%|s60=@@aKRcl#E}CKv?W*_JK!?`YhZ%68H7o+Q7!Kb4kB(9CMP}
zF^*MaOMz2w4(zi86Y^O|O;#5wcb+gAq@sqP{~aT#6-ob?R*6B4!j#(r6ZtG6$?Psx
zZobgZN$#3qB>9wN4@h1rn`LHN*yd<36AF>fB0#}-QCsavj6(gHM-3EG{eP+gsPEgA
z=T${r0_^|m)NiPNCG*J+;P>B6Uer{?|F>)VwR^Q!#<<V(y`3AAeI{G!QB!c#2#LkB
zFl1MoYdg2p=kvN<{?t8GUdY_Sc8tW;#{<)4-j%B-HEeUho-Iz)A_v(@Tt1WUfF`|L
z13#tiF#DHit}comF|eO%ibcia+IR5Gn*uqItM_CFSw>s~^h~YQX_`?F5>d(!Vn3kI
zb%joKkd@}Yc0-s8`g`ZPhIt-N$YLpQ?_B`b(Noto#8an27W}530U|*rfTRF+%r4)_
zQ)@yN`&~>nyDXCG-{PGII5b-?pQc@W1%@nkC51kMAW?=Xz%7fovoXvg^+OinZGdV*
z-iGk345prIbPqvP$aroQe{PfmE`}_egLV2)Hy15jI>DZtqFjmpcl-^_XO-903F<}a
zEvWVJdnCZMk`Ey-_|Mv6ZL9Vn?dg0su>AFoXbQ>G%<|Gu=|SdRkq2S%g3Tf2^|;{*
zURyFta;fV)T=v0sIDk&2t{L-@R+xV8>c(TQ<p7Su21b#&3#vm=xZSYtXzCq*f4gz-
zEqv8oZLyYE?u!@M+}z{%QCxi|A7|1+z*!X8$(HdQxa=OD|MZB(Lp?+Nd=ov2>n`UU
z;;=>hV13xjA_jO?*=RD^Gq~$Pj&%77^P;r{{9#z;kO0}|4?_GbcdrE~90cV#)c*?f
zuev$zO}j+K^y|3$%bfN7#bO8z5Wn?dmiV|QFgU1(y(~9w3SGHR^1bmF77B+c+2d|*
zMvM`ady#k#|0Sz`g>A=S^`=a~J<l(9kO4B~6cb08?Oqe~A}AW^`BbRqKH};SvN?HN
z@jTr865F&>tgMk6pyUlAAeqkhl%=@#HGb_m78?=A^uVCMht2tvI$Zk(^I%TlO1;M$
z?W3r9Ua;cX?)osooZTIOD}bMw9X$O*AvmTfv=@)%y#NpRJ)4OsUW<dkIuM)6|KpWf
zMO%ydUvI0``1L{gUCXWvCI==e0WwF<jFQ3sIY7|paiDE`U}<h+%A{lnGS%^9SpgkZ
zWOP4z{8*n#<lzbla>|oIkW)*%1q#qcYn{DtlZPOrd}R7(A@SYk(O>wXLE?+gOZJ1{
zYO+<%Wo42{%?FT;j3F<MTzJwOjM~V??M7<nCwFja3!GkQ`Nn6lL9In0<&%q!aB}@O
z8_6wC2FA1+<Yhjeg~VVZAF8F3sQ!1KC$h1{Krog6k5PW6C_h8>uTPOlsND5kZH1xs
zPo50nKkaf!V<W;y7={Oec|_5~z%G9U0|2nHFraKBf`j<sRr;cwH)yo_yJa6{$){Ck
z2|1<D6=MkIrNzK(;Xb2hRp|?Ij=AhZF!P4GK*R?tDo6Mz{cbTjF>h%Pg%f}&n4P4h
z&lF>}s97;nW`m=M0nxJA`rjh-VG-Y&ZnP|YMb3+v^^I7hEW**4vj3GnP38Y%R2Ba}
zew?bJ?%&g}|6f6Vt~F?%`A^%&?-D(ZKgrdMqM}2CH<aQC=A}*nsQca3-4tMzq70{h
z=8)0TN+6>h>2e^hC8u4Oc9+UPvd~V=h)6Yfhm#6;wt1zS!_3!$?vnhUEtji~XJ3DT
zBfdgzPJprxW4sq(+JZHk)is*858#DBlqpA3{|_DfvG5Lz0fAr)Er1&au7ikFpN383
zxKWNF(6`D)(BT~zf_|SGgxRhD(+lbVxI6t+d*Y}~mrz+<&J#uZX~V7l0r<(nz;6bQ
z4a1J>@JATFOGRy+d(pJl>G?m2;(sq!K7<<JGf?yM=cJn4qb<<3X<0IX<Z3~uui>0f
z1o8t*Z3}z2DA##XczT?^A)XmYKhO+exLr!O>5lkTx%JqjoA0+$43GAuZ)f$yMPKYV
z>5*Ta*8Q0`L2b|*W{P2Hw_I(6qXddf06}1d1@{3yHp|&B_4Y~?s<wZ&dEvMDd&0V#
zx^!#c*yXq>rM|f8*sqP{jhLk?HbYbr>!UF16hIQ0;z2|?;rCQhL?<;YGB;eQ-xgmx
zO-^76<|vDr`g>b&dE0w9N0|DSoR64J>}Yo>W@1(;GcE%P972xhx|@20`~TvKwt?KO
zzNwZgfW&`Kf8u4y2sEY+*>Zk#B%=lcYjxgg!KNE?a~ONi{nZaqA#0~czh|vMS&FYr
zhC!=e)>$S+t9e~!+H-}SSk|DdT>ZkMjQmLdRYvlcCwGE;AK4_Q`Ad;+W;|AAc1d%5
z_?8`f>YtApX`h!I1nukd0g%bLOw1ZlhRHpbO}=3#o#{bOq_@#X?d+ruYS+oar%TPW
zS?x(P<Y%|@Z)Hmwl=d6*lll2ysVJ4owaV{Qk9seefci$ak(Yr1Vi5r(R|c4l$H<iy
znK?aTOhWK)1Mmr<8jK(P?Lr4CdrHa1rstbC5~^1C2fC3_;^W-zPh+6oyjJRa5O{;*
z1B2y?=hS!P4_XuTW_6<79|aU$Dw^b9@)CmS+2)ng64*|0cY)E)rv1-jn0B-Jz|jzo
zPRn1;()2vusgR6a7oVeDod0e740P?4)15~bszDq#pP(qH0*ph5ZglGCq`5Aai;1%9
z!pt~32K~Nh7{Ou)a*JXIHRvpm$aRHW{EuBn=CFrO=mZ=HZXZAYFIKb~a;^HBa<K{x
z^*#EDJCnm;k~7K5A{g>VJ;g>-e(Dd(y&sjRBifSO4U%G{zX&H}s^^L{Q4f+OeNCe$
zle^5q^_Q=&@T85GA-eM%`k(O}TA190@oXY%i!dJUs<$$QQp+2yP9|L7Aq)3i<|V7=
zauF-C>3%cCLq(_9yqgU{1G(c0PJcmA+-rhGJ3AQ##SjXMILGGGAX6w5PX3UEpU>*T
z-kpN_{xb~o&HaDPinf~UR+`B%YEb!VLHj?Pym+FblXCgJ%#JC+cex`l{hNss9{W~q
zjF5TBOECA1q)W~_WXB@SqKSp|Wv|7uHeaT^*mfDD!tI{Ou*vf_Be@UME+zG2qc$5u
z-)o_)kFtB^@;AQDY3n&`SO){iy%Uv-$@IcrpEz_cW)?ZQH|I(2!CYKS28yt2Bspyu
zhiWJ@$|47=HQ({Rw`_TBRWgPVZIw>%Pd^8YitOl!;MvfFhz&8G8?F8xAUH5NWH|RV
zVOGGz>V%;3|5W8R1^>Q__`ec$r5aK{u6|AZ11f<wAwuFN^0emAmT3LjE!y`A;tU1f
z#3D3YdA}mp9-jU#F)ywdhxz6U*Cj%W_L^cs5EgG1|9Gs*UW;%cTS1P;IAz_Vu6-P<
zK#tqEF5#gsdo7}Q5RAAcL<=9rfQaB1HAAoBbF<gNdEDF+3sM}tdY<9tx{}8%?zK2$
zI=oOH80c*;mxVu&8kt$uXh-2WE^J<!>f5X`v?D34%L}Y=om;y1^BBv$RxUE^8zG8g
zKf61IVc2H-;Qc((YOjUMs~TAnz&b=s5JL>0VmvdBv-{#=3R%>=SytoP49%qzW4(+Q
zalV?Zl9m7iujz;aQHsVJ(G!NrI_LsEpzu+3;e$Ld@oKhS5VMVnsP0B@jAkq#5Sp4H
zdENpq6X`m@F*UAc{Jb-UlED=068Ms|6X=BuR-SbSl6xWyRYEvGT^~=yjhW9i)H?yP
z1O0zC_K$J-|8|=H_mKJrwV8$j|Hu5q%kI#?QtQe3u^pIZ`Omzar8d1fhaK(#Ph{5-
z!vPwfbq4{h)w1R3>_m~=dt<Lf4uE0*DA$%zAp~>=O-8_T?@&SK7TH2|Hgx8@$@1Nm
z>a3UO2>KvKO)$>%!aLxyLIRa!%7Wbp%nCTY(zM<8O7aDD&x*fuig%kp9;YWS1;r5j
z<b|DdS@{34_a%T)Rp<Wqo_hnx5;6(63xmieOCW%NfRF`9fP|2+iYSw0G8wW=GBY6r
zL7AwnR;#v^x^!bExYWL?ZPi-sYi%D|+iIWIx}j~gwN=~N+7)fJ{(s*&CuDN(oy?g9
zZQs8!&X<sT@A=NTXZhCO*JsxsY;)b~5WaM5>s^sYgXyaZU1-%_==|S`v>$z;z8n!i
z)xZGWfgFH#eYd_JzQF7CoAiVF9r```1Ny^=34T(4UVmACU4Kh|n`vwq%VQ@qHzEdR
zvxRIq<b`Ush3#NXh$7m}_9K7bddLq4kwtJ1djR;NkFh7&^Xz5zI(v(~ZD__YBhNS)
z)kUTnvyFwua--a+Hnza;*krUDyN&(EmB#hPO~ygv4&xr<0pnrRCw|g+-gwz~-FVA*
z`@`L(h8hf5F?r`px=qpxB;79Qg_2&x>5e>)q;;Iu=QT*`m9$Y(pQKHa`X${dX|tp)
zoVMn*N!rC}TV6oYc1b%V4N4l4G%RVSq`Nrn%G)hzx1@VGy*O_#r+f4ENqUK-mrA-{
z(ukxzl3ph1<&s_@=|?2}sH9hNdR5-XB)wYFYb5=+q}NJ%out=G`Uy!tDe0#;y&>;_
zqz5@YkoRdxZ<O>VNpF_)7D+!N>1QSVoTQ(Z^b4FG%!^7IleAaTLz3Rg>1}zpOL~W-
zUzGGtNxvlNe@XgfN$=wH?!0>>{feYtmGo<z-kW!yr1wkubx9xK^c#5(a{6H2Ly~@z
z*8d6GdJW%?>WlP4ET3J<{$$jpjs6ifBMGVy$B9;4-2r}6gAW0Agh>#ls?>IHKwB&}
zf}tBo)HznGili8qJ7~iGqU1GjXw)hl*cwGftq7e!K^X}e>Kd;eGvv^u_2{uR2??*+
z+s*yXu9>YSj_Y)LXEheso5G<dSma|lLlI}?*j)o&pjF^>Y^|2U_<3WKGkS4WhmWnX
zRen_cgJfOp2R^%u{hzKL+2QcwtX?2nlM;-iH0asGC2ZFeW#>nApbHsM>rfZH&0BD#
zBK`-xhPeCefhWkeK32$*<Qu9$%434)1r%H(?0@5_{`a-|uk|I`$F%WrCu>vmgcM5u
zR#C!jC6c?E0Q4L8%Mjmh*C&tbpA{XJ1+h+55mwchwR?743E8Q+D)7Jxs~|c#Iusn2
zvf9kl6T7k3reCWl;o5x*Ny=+R>a5$!=~>Ys;51|9#5(<vUt=*EC>R#BzuY7F^xF!u
zoD<CfpS7xq;E6<gJFFC4>1Z`b#l)bW)lQrvMxom#;?Ikk;C#Jm8b|`pQ!pl_V0hAQ
zbW6U^-)NZ`LjS*4GuE)r=>OC&((a90{r{prMy5n_G1iONMQZCVZYOfey9ay&0ueYE
zC*ek{>*S#bc~?28+0K`04}5nuoNrgt|CZs6oE9AgR#9d&4OZ=|Z4(eq0s*iJBre*&
z!DRA_wChhCnTWkpq9ef`V7=2|&%SMuSqaB&O+chAfV-sEXrGBrPQ=`d=m;>kjCs|x
z<^ivnRAt!3o87Bgylu#wo7o4GvJwf$z+yoVtY;R!#2}_{^~CR8o`~N$(c$2?l=;&b
zOcFxXZHXz`9<>*X2>-`vf(rS6kEZR>{#(z{1NsqG!yYmw8P^@}#b06qS~96r3o~u7
zg(9Kr0>MJ6Ux++X7=5WKXF=&IGopZ@H^?J+5OhJA-^7uV2`l_LcG-(CJvd;IOinMT
zQ_~ufaqNU<Rxza&PKs)Oi-bSg*kwi(qHdBmWmO<%l3g2c;Wgv~fYU!rLZvrU-zj3O
zwyH(NByZQMO3V~3mUw*v6=!p{-kMd70Cc23h=5?K7|4a>s%*7n->XGSWxzt>EmgLg
z5l=Q|qJ7`xud5bm6C5T>77s31E#&{rnz0QQx-;}1?Xb2v3oCzTbj)zg$0lJXoPSc%
zl~szGM5wO>$4P@X_s00&3a)58m|Sx>H(G#=w^FrI$bf@_rgw_&m2`YEb=SX}U<Zzz
z6wL?s)7ZK+jt%=Fu{e0HatK-&c!~DO+h-?c&6PH5_GM+kEJzM(pl_J)L?YJ4NAtki
z9M#B=_;>E$R9x2%?;ZEot>~6zVXjiTOuN0{e-g1cAvzi?&ShKEc(G(5O70|7bS7$_
zdgo{YCh7biqkT=o_s{j=`ZB#k|AKzMei+vM8L;Jllzo{!4FsU+#&+YQ#+QwsWMOZ}
z^bx`>ts?p6eO!2)739#oYv!4VdxprGf-IPKwZO<wR~7QE72bWd$(48gi6)!I@@`nM
zyB&s4_{h27lXpNwE!-e}J19KG2OOdnXj&6w#$<{(Y((X{Fn%mXodQp*fWNs>4CVm`
zy%T48C(t|k>#=;k?^?S=ASKtbPE?uZBK7Blv-^O<?lY%$J)$04P=>k<$DRN?`LqD5
zIpAQtsq6&iqi|N=(sz~p97R5$drlE=`U_%&4>;%^b0P4%i|AucpX`6LaFri$@SYK)
zlihP?&7RGl`x)`B4>+iWMf}Ptq&X8ZrMpN5P~0S+?XZy`#sa5ZUusd_XGPBrI=sTT
z{>KDX(Lslo75`3q#d|vF5D8{`PlrYsm!ba87;FOUNBaBv3hh&xwl_K!`&JH{mip;k
zXql;&nLGSfp5@7p^I6eT(EfT=wA6Tc!P0)A+9Xh$E9D_FqU@*&JokoG%ReW2GC1C<
z3aK$D$Myh#1k+1>CSLUHY;b;2Rp8hEuyVd8dJ;HqWg)dQYEaItjugQCB-?+|*|c=8
zU*p{gU2=xCJ9DBZqC2&!NA95AvCCFYTbJS%r+>zc^qb2rtP1V3hF;=4+?VN@nD+g`
z{&%NlY-e9(L-noNooPSnINunV9vz2wTd8VF8}!{;9dJ-Ct;e0pnW#7U?!jBFuL|w4
zrGT9sJwvdoX1yAeU4;|(fWmfP`NYHEwyrAFmTO%&Q=+GX+X_`BWH4@%A9n|mUZRir
z`!#~qy|zHBDbdri#cJ|XKe=GQ*57^;SoL6Kf5bYf<D;j7)nc|P3%jdbpNbO=2A7=l
z)vwWxxuYty_n#IPN&X)u>VG_r=%2&vT;%?rl#%ssw;Ab3Zo??|hr$6r(BaCatb>>}
z;Mc0atfE4mFX)IM2Qwh@P2%nl$cw*^FtbO&q!@Q&f|hBhD+9r>ySAwlmUgfQq_#Gy
zm{-{ij6VFeiVBDdXgO$&JkFL2iN96DnNH3EiMZBA3AF`K*Y0`q37<TGs88PJE1hPf
zIU55`Mk8yR_&wZ-lr*@d$z@gL_caOk$e-Ix6gf?5+DYD1dr(`oCkX64YO>N3k_yGI
z)Pf+AH%H=?wUbb^5!lgi3>GKvH8taD($*aCPbxhP9?afqN=ywjdnxYM?+dhuDg0M8
z`(N^QNffj8lHQ*%-A<XZZi>K@{`DyKXJCq)jPqYRnO&qmqEFK<r-R%dbr07<s`(%T
zjsu~U3gvXz!LitNE}vf&xZ%mBaJappu(Qp-du9U`em$aTy7|9FCPdG|Hn~_8CE4Cu
zp~B&pr=k#5Jf4S*5|Ucmsg{j0a&mMcn4H5Z(%8%SkT_ZG<Mp;AdY#eu@P6<Xz&Ue`
zmA4b4XM(rFw9XmHn_YO1J6;A?O!bwoECFY&kb=foIm?Sq0B6%!ar&d?Acsph(?Ot4
z*$v;iLGZM1wS_0l?wvHnkN;O>d~`f|pPlo6P@~5I2S0GXO+@?2w@I3UnA*0+G8iQP
z52f|L1MB}sY?=NgeVlfcrnN;U57(MiO#mfc07f^!LDS|71ln?M9Qb?A$96oCd=qd*
zr(>+9s6r+TY(lK9N-s)mP_+$tT9qMij~|h@iKL4Je_p=meppAZr~fUZ6FDJzHkcaE
zmZ=HxR;EahC<zAOA`6m0(GGwxkuP%_w{$uEspJRGC1NHoIt|QBQcWMUGDFAvCV=63
zP(EZMN8hgXdu2|`ZQM|j;IG<EPj61d(}?I)@HBxHr#C>fwpRwdRKpXLKH%?_uPou;
zrrtn>*B#$iZgdLRnaE1jwj1jZ(HdKaq#Z;Gp{xf12SXMS^3H91g*pFGAA08ti8wkv
zItd)jXO(IkIh}2G$-f3*$lP1Thw7k%*>u1adcg}M|KnKO_YKPoC;5N42AJ#>+82=j
zw_X1(n*^)>8%C{h5Pwqp+G@hfkyI3<;<uhIPq*-suc7)cC7mHET|>1lcxe)(tW`oU
z06YN~ZC(FRtHam-WUF3pm)uJMm)r^glgH2GYig(({SA;NUJ~>}DOk}KfMUQ)xRrZC
zA#V%*f|@I>-cVS8UAo>;1H0^hxb>uS;J(G<2W&RbRXW8^;`*l=&_#bE*4bol1f_XA
z*hqaIfsyZe*JC28C588EJ*w<Y477i{-cPj!tAE?x0!h0SA*u{TYsB@Qnh(E!n5=4v
zy@dg%4V`>q&K^~(JJsJ3X(T1kK)T(lI=k_6ISM%S1xWv04YB6f!)%5XJKKHN@?m+K
z*8hpxCpCOOq`j;U(a+W^5e4)q<oi6&a*)^KW7n{6u|FarXoKN1t~2g4UQ*i>(!FY`
ziK+t-)~)jtCb|K;-mN0#^fvA@*^J!;iaE~xieM0%Ohbck8QmouD}$f^d0!Hc__uK_
zqC%8mL=7p#*`dbRMh<kB_ho^ue;fB`IUiYfOfcCpmY4W!&%3j)p+OFs+xz-8*m?a$
zQ7_{*ZonFNit!`izeJIQyB!=#eKz?GG-dh4UlU%^yPf<>ZB*O5w8`Hh1gWoz+}FDu
z^sO=v!t7eGB^I}NP`yfK(g|_rE22+#JGcXnVbSH?BOGk^I`CYB1dM=tWecn?{6uzF
zaK`T!DcJWqFmAs?-12}(EWX#F0}i){d+rm?%zHWawN3sYS%OxeDmqz$xK)HS`c?Sg
zTzx&?WD{84H~JG>@*d<h0P-Gm=$e!Pg(>G@F<l>Y=nyPEGKC@UJHik6phF*!hwNzy
z^U4T$-|j2)U_Dk~-0G7<9~z~<0sVi8X6$0GvTAJ!JOB=;U(Rc}F<O{H{lpDj0UTT&
zo*U5rGt&?E=>|_FHW18?&VdkBtQuL_|9B_Ez+e+K#fh!mJ?8*`)gJ%^+%$_|6&V?w
z4W7?XmDb~Vw!g6cRWj%r(%!pZA^7<^@{^ZY_`xgmIlsoN{%a&JIt$%STS*}^M54`n
z(5+s(`te&6$>6!sncyjHt$<{{1gFAaM}~f0&EZ5G4T;VGN2hV<s|m>i<Oc5Wg^70k
zM8|<1KGjUX37!8#k@l}w=wAf#-yZfe;Qk%V>Xi8Z<6&xo8Wmnfeiy-szy#Wt*KL(%
zXCkKy!8*uGX!3-_q4KmELZ9>Vt+H%iTyh_9VcrXBd3erGw+Aegcz}amgL0pM{m0s=
z48YV|-(BAl-=Rm;@Uk77v`M+p+7UepiGMX9H`;JI&*3NWk24rF2Y>^(h+&-o8n-yC
zpUR{MRz=m;0};&h!wjaC18(_hPb-<n_%X~!=ur{>yPfbq9@Vz9lYsyASk@M7Q*>Sm
z*@JQN7wUueOMK?RAHSd6eCUoYz>bPwOEp7O-17yZU2?fjQU04TWFq$3&(QytBN%y0
z=YU7$yrls=+U@gke~uT5)#Ycs^-H@Gu{u3EAFM7_O~i}i#YyCf`?F-VLWtI>$l=U9
zyf+cMr$y(2-I;8o+S`v8w(J9I*N~L-sIyNUBV@tW3Dy^XQnU!{O;d&jJ0>bS`iv|(
znS$OnedO;rYk|jJwXimdg(3e>(2QF4Yi)x5f?lNEIAHyUqUR3R_Nf+0hc*LfQPfuq
z2D;)B!{e2qVclmbxCBp%F2#t=S2pB2w_E67ML1UEZm<e?`qfvx1B>Y%SWFLEMl3Qh
zx&*8htA@%X7!s$@#BvV;8-h)JUW*4Eq8A5VqTS^sK)>#)P#|Ju^Q7qFtc;*t89Ams
zKIov&_x(|O>Z)4>YaKUOSi}4Z4wz%d{g<85MJc4C#J@54vf`$e+T5KMU5JriteOfO
zw>dg3_qadz?VbGSPQmJ-v$d}$*g3`d-=G=wsPj2q->*HRHDvpBv_(r(@g)urkum-Q
zem8pDuO$}-rbJ8d23Dws3dX<UxLr%=S#hu>kY(d9<*(sEhZr*JMf#W_<FFR?RfR4Y
zVOa}E5H1F*i&S0r@sA$Bs$HOrvltC-P}1)1ItT3StqOH)wz4-qx*Y5+Woy*jR|(m(
zpR%}={GvjZPG%X?jX%RoL@e&zXJzq>=rX?C6azC7vPf$Fz?U6wO-o{J)5msf0fQIg
z6&G3=JSBP_7+j!g2};PI)vYqqy^36?avBcuSN-}2E)&e{d)~qv>Hj0Oc^ba2(4N(&
z0Qc+r>{QmwzG;jyE;R0T+6$^pIDC`4gPQ#H9$x?|8R{)lx&zd++NMC45BAeS)LB4o
z_H3@Ejea?M59C_Y=s#xffpckeM?asv2hQUU{6+R2IG;c8#q2%s9R9!;viHCR{DD8u
z-UAo%2fmiQ2QK0d{AJc2IESYUjsAW19w=7IbJ=^KSSin<bQ$o!&c$cWcR;?TpQH!%
zXW1zB5u*U9L4$tf^s0e<Rd%+w1KV^%P@=C2w`}1YGJA3Vc?rrycT*5BszkQ|<upkC
zPyCSwyskxH=Ee}!q34#cf)l}NRLv~HqgCPT#|9L3S0OUVF-5;S1mB?_RlK0K2$bB>
zD0FW8YLf|tGU+yFZ^HpEvIdFG;-nk>J=BV;RAv7doRSblQ~@onMjL@5!<U@<_%!^2
z65MuB?UlygXMtsqSO|8TBd@JPQK?inZ$K7$1zzcn$WXH<3uq1^ZhYW5UgF^(y@5sw
z-3SvTLv?tTo6dWY72kv+G-ZJ<9uiXE0W)83HY1x;8$HKSD6-2GyhTykg^NA~D6N?D
zkXp=q(ovsl7qiwiw|JUFO)~*DP>$M&7zAFRyx;;M|4-Mn>Bd}kjsB*-QoA|9qHm6t
z4cEF<LxKm2?GhmVe|WH|l;O`AJScctv;tDo3RQ!iQ+rOPsIpEJP^ax>gWuODeI9o3
zq&i%8(m50y+*K9$`3#E`1)D%Qm|dnC!R*K^uU<cJ;+6-(aH+2d)qC278{n|QMe}ct
z3O2uYtCh{uqN}(hx<<`R=FFzuThSK@L#JroVZN^q>__|s`G5POVDBLthStRB%FIX6
zzT|9H@52hF@kyUJOS1W6>nK)4SAb0~>&{>l9kPg3ye5a!yKi;JO5T}}|EreHko@n`
z_9E$5JET3YoBB#%{~m+{FospZ8~A1RnsJIzWn61KoM2bT;GacMM6&sk_dOA^ad?jX
zNLl3x&Fni+pj*JtB*DA>SL8seESJ2;icMgi<{frO)~F!_sfv)mT8Hv4>Tw~|<5;tN
z%0D9#y$?H-I4wrF9`cpyJR*wpCjx8!2oD6YCpX0<c8JiN7w4OZz{)$q148WAubbjt
z5q6_)WsSED2|*|x#rgT!Qj>MjU9=Vw-o?Ffh!^Rkc*2?h&~8M`)E^g_EI@aY<uBpg
zQ{2U^gl}IAxeoX8c7G>E{Rp?ZI^J2_9+cj*KZw|!BRs6u@!HxZ%8n^U_hc~FPx~07
z9msym2CBPU>TU60!wkcN3g$Kh{G73$i_oGY+*V`16T?`%%Uds>$?teez(E}0>&@{F
z416tKE^GwtC@aEmdTE)-F2=}l|74<@@V2TUa8NLed$p&&1Lsj+G|sD%P40ViykDfg
z6_azAxA=Nri)8+ByhF^7O`aB@LY8&HVt~-j_9j#l;P<~l>wmZw*6{tJUaWr(F@Ik6
zqOr&b824qcv<JOa4cgTC@NtL=#2Q728lb^CA;$x|sYP_{d9?zn&du13DJz1W5Qz=6
zC4~B0c|xt^pK~ioPSWqG)z)=>b}E~tnmXd#j@|oj6IvcqOHg!teg>Oz2F`zljeNe*
znp{CZ0b?8><({r)u3zL&Sz$&-q<ou2waA~k+Ki0N^eJ3T%P%DPKS%qhW^81)=|9!a
z#*ZJy7c!-)AX6<?EmY??R~)=i+=5VB@0Hu#;iQ+G^u+U!ly+AI4o|m8N|C~7C0Jae
z3i9E|;vD6T<*@RlBffE$VELg7tt_vIt_8~;)|rW<YTt5Up@CS`7WTIBQt~)@$hZrq
zuYZ@&EAtLJI9`+9b^6+G%CRr9c4T^V4LY()wZ@+F*xOwsmZ%{Sb930ifa7%GsFOx<
zp*rx;V^(&jL|22|QdI;SM|K@D`Ut=nDKa$J=Ldv<cv$JO9iwShLv#J*mo2Q)`9DnC
zq2c>!od5T;BK8?r{;tW^CZHHtHgKP`Y<SY5WPg2Yy(oypErrFcbx0*5ktY8<wM=o#
z*6iG*FcH-^`Qg6sG*Ml6O4RU(Pu|*6HG7#-Yj#ijIwVOGqSV})29ocBqFitOoQus!
zS5^)HrvQoSpts!<<R+2;%ycy4N<7U-nc^Lur-tvT)M5K(7}wA;wH$n<h8zSfs5@fn
z)ONSkH^CPvMdJL$YPL9~cI`q~Tx%8(wET0`up^Wjwo7G|{uY1O?;&j#vNF2P-{wMb
z{_oO^3Kq~G*U!*)WozXR_8i#DYOz6PW-oJyj<JQ!9#*)h<X4E7$B`fMH&`}DKn~Sp
ze(c!6=q;y-2v$9;7}YxLEQ%$7g!0hCR(8in*Mr^6gs9|kuZNRfa>9&jC5u+9tH`Ek
z^+*l)Fp->0L=wB1o6ba0x@#ptlwh~4L>h0<@AFZzjx^!Wl!s`N!QD$Ht`&2o>0ayL
z&yB9b;ICu#8FVZa6IUwsu-W_G5-;R?T^6?K{69gPrs4Y*eS{v?e*^sQM~x}Q^_KP9
zu7pf1HYchvVnyO}=o*g*2zz1Su120Fy)(+T2I3-Klk4XhH)!7j6Ew(O@~)>-IoO<f
z=%A|BcKSSi^otrs&^7nDxPGRn4s)5vu_5~euJwciFqR2V0U9JvAsNpA;2GkUN7qjk
zjR}ccwaZ_!l`?O=pA-T9-hPtGDdyNay8&OeLl~xB9NX|7Qj!pkGg(IH6}2?+#FMkg
zE_#(Bw5DAqf4W}Ccy8F0D4G*nJ<XkaJUEaWyu116J*!roXpo-RWh!b&RyD)`qL8TY
z!1DH<5$FF6g#Y(3c>gN28!YSoL-;i^C%Oe&X(jVyvX$CLT$t|cmcqkxl&?MG#Tsm+
z-8g)=ST@p#JGxmMzKW4@1Hu~nGJ))C40vDk0{iv7WS3|M-k;8S4DDQK<?)p0Ch$0)
zRb(=-_O(I`7W-RiM#23z=--Fl{x@+FJydRGZe4UEm}_R2X26`o9<1oYN#Ff5<Ciz{
zE`^%DZtc?e=ms$-GU<|ix3@TzlKY)XzW%Oc@j(lVbp8+3p3}7FkO6p@&1ZMv>_2Xn
z{|{_4=`bVp*-?-kgx$)357|kfrcQTB3$XEM+UL*SV@5i&)S`Wbqwdfu#HbXb!2t$k
z-t>}GB&B1vXh(yGgI~NjgnT!$0q`GqgNw4KAv<gq<>d8)utXM*QXn3ZOGo%M^XF%=
zVf&WPBe`Je;ITqz+XG{!Kyt}1ii|XSPRY{ibvU7e08Z~~c^!3`cGOz9bG=~>YH@7F
z@$p}fE&G2_{&I2tUqSePSFjj70H=RoYqY<iNI~>`?31H8NRmRmkT^HFBZ6n{jmfS!
z;eP+o<Y@#;quarjS5*#4)@Wf0zU~zK;!R_Jh~$p%)Bl#uJyIOK03GnFR?te`0n(`w
zxtXor@RWS#9j%1v<=BY@(QW9&MXI*{<ei`c)!vD?`-Ev-HAthQjEa;vvOYe#6|84w
zka5T_5mlv*Wp5u&ddVr9Hwux^{}sy=q4PgqYt-=l1?`uJ{;kya>UZkDU<GUy3!-xO
z(?$-ebC(*QGoJ2Wu&MsE&}6L?7eS(-edG~-A>tZrui*EkIV_^nowQx23CSzMhmLT6
z8iIue;P@tj)Rkd3Je19P4+R`KL*fdYm?I9R4o65^QK;ew59zZuVuz$%U?M9c?}&qh
zJ2<55Y?E!L`)Jl%TcKmd1_>+2tH>^ftn0+tM3r>8Jix6rB4p@K0zv2qk9V~;Qs&*|
z=P|!@c;)><4lP%?t(R7`k&T+i2LsBf)DsNIV2(HY8lZV#y=!0tzmY*SMRd+uFWnII
zceb`S5l~b=2<|WY9!_oo>mBPLjbNB0w$EP#w$I<<uzikh#T=c<@{V%5BHo+d(?qPp
z>^RxIxyc_UJc4qBm&3z==hKi^!@B}>2gD<<@O8I`-BULsf{0!Ofbd%UfR>)dhw42s
zR7ZL6*SbddoytA17EE@pXu#z)1l~xXb7i=PWQL7g5_OpZ`st`cOe?ir<84Q^tv*<^
z6U6yHMKcz$o%(0A=d~%0YdbPCT8Eu%qiP0o+)8#lp$ipeio$I2-%7=o9Jk(OQ4bjQ
zshVSxGMvixk;-1P_2QgFU04&{fi8qtKuvp0-i1NK0s8{_%BHxt?vmw2k8p*+amS{(
zGKX7Mt@v@`?p&1B?r_(Rowq^40FR`6OXuxW+0}7^l}0Z_cbb_mOK&H&5YN;iLeGEd
zmkGK-=l@oHp{6g?m+R%I0I)^hp*JB0c(=Y^zf!+mzX{R6cj)&35Ab3AG5tyXdHrSm
zb^R^<ZBz&w#`4(7%+00(CvYKK&dOOeYKHA#O{|^mX8YNd?0R++I|wP_9#j{6m_5dx
zWY4pg+3V~r_O_uJ!;C!RWW#Mtg@m!tSZ<UX)y5WMhtXuT8@rAD#+AnP#!bdS;|}8<
z;{oGg<1yn&<9Xv{<8|XL<88-%>I3`7p$21l59WPK(r-)pu%zFS^t+t?Pu^ip59d81
z>7$Z<PtwOE{l26>ko1R=J}&7KlKx22|CRJfNuQGR$C5rR=}#nmM$%^`eNNKnC4GU@
zBY7`M`jVtSmGozl{#??RC4EKGUr72(Nne%pSCal(($^$?UD7us{f(r*mGpO#zA5SN
zCH;e>Z%O(`N&h72pC$c^q<`h~Z+S;KJ(~Bnr0+=jcS-*t>ARA?C+R;WeP2+QCaEqd
zlhlyZlr%@uA(9T2beN<kNIIOTYlLegrz2gXB+Zp{w4`~Gx+Kk)v_R4^l8%-1L`hGQ
z^khj-;q+A3Y2y4}q#4DmQU9{`mbOT72}R~cec1oDsm3@ZKb=Uov`Sw#F<4Dn_Ptl0
zV84qjiZ+6658IxlZChEcR+hlGKeHwg^Yf!#Fuz?jCo1`v+XGabG!;dSCg8d<5#yVq
z4Pg9Ic5#+QJ>3ZVbVKtet@%Zwt}Tw%qigl5VWCOiiMrl$METN=yMCX5ec}HfuW948
zPw7MTo%)+>1AE7~!1y-b2h^OoYsn=G0B@ho>2LQ13FLXwM6lL_AvcmJkR5}fl+a;F
z>v65jv`xEZx4g5Be8q0q9@^TFPFxJHe487p5Q>rTHka3#$TUov>zlZrcAM_83YRE2
zN!_ZB=w^?RNgMVcwqinB@^!X)5j;Wa;}mG-m7R^A5P|lV1iGn<t-K~BXQ4_h@gi|A
z?YqT>CV=1~x~7s;T%jYo)<-6qJ*zV5sdMCpNSXy$ys*$ig@+!EIzcr77|-3MEnW}8
zktsuizg(JO#UVs~^LPQEwKuro(r@sGg_gWD!#D0=hUtIfB7&tj(<U4oe|=?B-6CeC
za=8ifSPJvDwjHq=9;B3FAh2j%HFW-)+SB6vzYjnB`+r3)j5d$dddPB^t<xrb>thC%
z%iS{;CD^oKjoFDaCyUmY<Yu)aMM<xzJ(p^nJ1WbYqyFrk|74uB>;A{`Ars}h9pSP4
zsoz-C>`K(N#nGm$p8x8}e@B!rUHR1`3D~Fef4H_r!}tCA4E;uS0t>S*vG;-Y|HTxy
zf}JL2WYWDTx%@*`Dytqa(8T)-wFtW8O_6wFZ7Q)1I$Iq~x{&gIqZYrAyo2gC@N9KX
z!G?a05lB8yDyE>sO&P)t+PcFio8-&=L#>JGP)X;P^*%?)7f28!5#|1Ig9%j5G@fbq
zjUYF?nG3MFe@^$I_P|FJt7+mMmfSz7q0!iTZ<oMVLr_Ag20j3P5$k`0rfopguQ&8H
z`a`H)u!sH9C^l|Mas3~=e4e3Dj<N!RnXk>?=&$#{7c$1DmV-L*F7a-y3%D55#z!8W
z;{I}#V*+XwW~|S*zvn)Q`WO3e86aJc=}-&Zw6@^1+tnb6J?!7*4|fCC+Uth1#!ZN|
zoHijSgkIekzgm8?wLPaTZ)G4z^-ST0@&Kj@f-``aTDT8tOmK^dnup0($bh#gvWjY;
zfUFDF`9mUJ7bQffv`tV5;A3{Gh16Qvw<}sDGm92Yt!)BA3cd3%xZl`D{;-hnqK#=%
z%LBGHMEe+q0`b#8SLmerPULG_>u;n`EGjX_!=1-8r#C*NNv-lj4u_{Dgr8S;0+R<m
zykm79#<ZvRdhM#y=0Ff5kD)<tP;qnWirwukh&L9mx0Tj^u6C1#@4xD^QTgW!`Wvw6
zFNOX7ZuU3h45P;QP>PdZ0P%e;IaTSfEN&$nj*@O*7r^_u*5B5E3Nv0<5Sl#QSRc3m
zFQ)>7i4ok4OaiF*Q#bp=P44xbUT+(8Vea(Agm7~`n4N2~4tlnAGEK%X^?6zGegc7p
zx^5IH6F`-8Yu>x(nXH>`rRgE+fYpWpc?=EM9|kf!pClWQPS)vbqS?NSH@~7=f?oVX
zz<(Td2-u)y*M~1cWzjgNLn<%~qo_S$9K|X{P23=i85jro18`4}Gy!S2#nVmdFYh>i
zn%_r80Iu)my)R-Dj@pup2KKpB1ia<_T@>s&>Ja@{<7sITUjKi}apW>J{uzGtm3}WQ
zEFo|g|IVb>8<huTxTH%Lb%c&O1RQd3dO2Sy^bc4bC4rzwF34Gl@feEn;E^Piem>&x
zr#Je&jg5HusCGr%xy!l&!BBHIM#bt`=fgT&6wo>96!(p}Q|slaj(Kkj43MMT^}A+f
zsUOc@9atT}V-vn&mmz`)j`Glv;#L&(LajM^KQ-J*zqS(v80+}>xrRk_bY~xRhxUWj
zl-p1bQ&?L=(A!00SPEni^q$9jPNsLc$6Zn3u7vX+9hG&6N<G-2sONM$AYDAI?R7K_
zalIESpb9maLbw5yB-*KzH6Tu@q&1EfKA+za_W!drV-EA{pVi*b&OUaGTYiWvj<#o2
z(NPCuQO9jrax#^LbW}kLqXDqLSrwuyscfwRa-)KT<DS%>h~<iC8(8jOt=Y0;(Bbc>
z{3eLMN;zW7Gr1~JXUd|j=nVYjYWWdK$3L|Iq9Z9?u3ho_FC^;6nrI99k-ex44oTto
zQsP4_;$fCjM`kMDc2R=vi1mM_W=v&X{qx$J+L@MR57dQdCpsKp%~_g-4yMyVBiK?6
zd28&XG7*k@z|3eEUCE-|EV;IOq$ue%&90$|7%q*5#G=X4*ryiIcqFCEH(feNFjf%V
z$X+m3DzS-2Qn+}=qvI33i4D;Xbm3ywm8I<~J#4o0Al<YtJe|mtEY|;OO<QgBup|0D
z?GfwxSN(l=bk}gLlg-8WD1`8nfGWcvp_=e8$lMzp{&D!P&v-=!>JL&Ma9(r|Ud~pw
zRqf?Cv=fh|uP7rc%F^03vB{WJSJ3~K;Om~P(QbGu_CW~D4&xt|82O<Iu-a{(8j@ge
zBWFc-V^UNw#kv5=CIu;?15r(D;&g>1x`g)dxfdkh^Wtb1*c_o+VP|kQ^Wq|tm6i_a
z|HDN7|22A!zDIwbHL&N5<+fF?=FA+NyTZZMNww^*WKEFCE=6Tj4Z|l{!*=uSpsH-d
zFnfk3x2z>=l|=gV6=Ags<;i#$d}+L`h5?nV5i-^&E8%L!#biyA<d#f@KhMPeozy;>
ztfdcY<L3Imsog>H{}z1>e)t#t0zlv;*d|x76>5@jvH`cpR`lDo2DN&fx}-C~M&5Hm
zbRSOhnaBpo%4weUe3GnZsA%8#;*<n~5m_7Ei}%&RI<hkssheukFz;$V-1dn?{n-$`
z82#yH-P!3+diLWq?ataquc1PZP9ms?{|Rfx7`9RW2mt{f|F53h7{fxD3k!c%7V~lN
z5gZrCL(|igOycwwB5Pv0SS?u@kkk$GFhQp*H`Qs26Ln{COhb1(s)^G{Hfsma)|G*l
zmOvM|J2vd`x3>p^9#QlDsQR^&W`8Xa`%TeHF+WGa^^%p>k+Jh8WA~5W{YZkolKekZ
z_iMUe|0%0wcLVKzy>a09?*aecwV)Q&Oe+Ba(e3b=!=)J5<@Xlyg*j01<St!+kRyx*
z@LukfNXiAe;~w%Kds@69_;<*;GuluKlX7a)uFJq4?=FEy5sku683xjRpc8&&xS_lt
zD9{8SEVY{Zo*E*$Q>&!Q4D4xbJ5^4C&w|5M=KjNPMrzfhZR;qKj#AT&zzPIYfK?fl
zP~)v{#)yUBGpqoBd`n11q30f5V05T8gb-*X<H8gGzqB|1l2Q{6N+o?@z>RVCr~FIR
zVzFoh6FtKz>WQu|#ZK9RYFOAl>1E~b7xur!nz4lK((l&(sx4MtnUQm1L$S+mW81PK
z67e+ncpv9Xxb!#s;mTa)<xwfJxW!S$3$-t-&PlN8f%73*<Xq9451E40ynz#(UW(Q2
zuMdBIe<IFHV>#g5&-__AnNoAVLrAdi3xn7=rtPdt)QysuiEj8*oq;q;7He_bf)Q17
z`$IPdPmsrJAW=v4a{Yw+f1Rio%VP$5;bq?JEPxa&9C#HeT&+D=J~u%h=={&o?$xw=
z^$VHFzHDq%UjHB3g^{Ud&w8~zmU2T1Y4-3W5rY0}@rH54)+6H0J+&&}uHCY7n#32k
zgig)iAe!z~C`pKD$(gmS6i|d3g#ZAjpboDOXY@?kpZuOy3gN0jP!*yzs)K>L7B9!b
zEBJBbEVHK~>zrEs6RC1a;{hxc1mn;dQ1DD-irKR+`&?Q~EU9w2u2Dqu@lvsz(HA0<
z&7R8aGinL)OqJ0}4`u>_%r<*knmM08j7&3o6vdPjCa87uO_fi+1PF+P>JIru{l8~N
z>2t9Df&Wp>KC9n{AHM9ktRpNoVz_oGTZ)}d!Mlfgm!z9PFai(?MuwISg`(x&nCLG<
ziuMjo4#=g&Mq<MqtLiIB)L7iv;Tq8o<sx|)ye=Vz=W@p(`T+kiQXd-*1$8K5;j(k`
zWa31?QIyH;+P!Vn3C^a-?AQr--5c4)tn^X^5C_76UBuz%M?7qfcHo)qiFlq78wQ@&
zv-MfwIe8QzhCivBLc9K@;R*Pq^M8a^s^L4VJ*pS#*XpmbCG6Ae4Wq*7RhrYY4F#x8
zK8Ca>6uI`VHzN}jcX574B4wrvagMa%x<01v?x~SawCwpfze~K0BouT5g{i?WXb3UJ
zVH}oJ41+gx)rDqcX=<!HO(&?*`1S>e7ZieP>I@2u?khK%k?E;D-mWtDX%mDV$(g=-
zvl%H&?WuN$UKQX+F*HGUYoJvWNp^j7s~MS_+H<W|d}LoCW|{)uQA-fG)P51>8>ulP
zlTv#!tpU4cg_vLw(Cqq%T7F6YG!+$>2R@Q#*EDj|qZo``0a=L8bw%ofVUah{0Stz_
zjWRLZp%$Qzi%jKfE-)jDQW^}ae26Eng$hkGxq)z1efUL=bdRwAKcN|AtX02RdqQc&
z|EpdUDUao0^9`wL#|rX6AwLgRW2foH4k3~?V3t4zl}D5(FZZ{)YpFs`17B<-Q@g&t
z>`T~~DPD1}B{nEh9UG0lT+BMuG<~JM(E1~o&NAdDw0J_uk3fJqW&@vk5Mhh!sD@@S
zSsuMX*`Ji}*>uQE)Ti25F8Z{Oh13p5l|FIvXlZv_gCB)LJKM2#D6=Nm5<*T5Y@?J8
zLTH8MNX2lk>=gUU$TV)!u6wgKQMVSxMxk5vs<137-QqTi+CW<yp$L{D4+-6>;2_W(
zCeTwS_V$r#*M+YdlYn<R|6SVWHGF?X`;$Ha_+OvUzooy!idl%=&R#+-uyw%T`mXWj
zhq356+G4zj?i#t=Wc!$FBzKO}ZcRx)v^GVO4k_ZW?qaC;3&)E`3Mud@%7R`G*U4Qc
z@<bRsfFywA13Zc+s^D@u$JMuiJdSvZ+vt2QfsvpanImL{=!W?fkc}ud@2(KY{w0Ax
zTLa7#Vz)nehRHTk|L6#&{*^ZQ8ym?R0FxDRolwXDr9?y>FxN>u0S6bSyhdH4S0VM}
z1Zs$TqA68Kj3A~PHCrBN;VK-NOgxx`JZ}J)l?c`(tPjfL<NL!{j<$)%kZH5F8GzN8
zs%0q4Mhp|^hDbbfbC(6b;}niBiaY51qo!8E=1y7Il<I>+5C6JuW?*IjAev3c8RYl4
zcqWc(BtO|U`Rma_E9!OO(o!I40@MZRlK40J(bwlJa23c`$AivlJdo{Hfa@mQR55UG
zK+RxpUC<L2OKQww6H^~;(F93xW63SYsE(kUX}ZJ<4=@~g{ow#y8AvJgBgqWCgfz9*
z&(X$9{9zg>ZkFO5&gT`SU8g3fRm6c!#0xl`=NsWlVmH1;F}P)3!axz1o+g&l8T}fs
zYn(X$@6(KP*=oH<`}aWpk5t6Qh;u%R=Lngr)Mv@a)Mk}-`DaLDbUf(GVg=|-Koz80
z<@88touss?d<%b*s2?q{d>AFhVgY3Ftz@{4GF^!J*!G0|Es44C-da@=W>wx>Dtlro
z8|bctvWr;%cWOpHE7JF9cYYYByjq))wXu^i-d(EMa7yEy>hYZNfxi95&n8+g^I|8V
zKNqo$SrqV9qy{C~qAEB#5#JZYP8>nT$9-Akn>OEcq`9=^zzthU6ZLOrY%KP%0*FW1
z+s87LvNDv?w9kC;V+ndo^8X3i_cZN$!2WO2f62~fUF>CJsR5PX-{@<d85y74Mp6q=
z)`!rKrb52a4wRNk1A%5~=gWPx+Kfy{<#`S!7bNjRstvT0JePY|tvpaagIv5QZ3zS+
zNTbYgeG?^bPj*+}v%H%JvG4`c4F^lx6ll1fW(o#DY))|(ibSsr23nCP&YS+hN)r$Q
zNh4AaX%mDL3OO7eO(1qixxExv@j=v#%l+TAW<;R^PLjunI%l~rs~K#S9!Az-!XA`^
zQV#hV0)8>q_HtiUGoC3nROGJh^0)RC&&~aXTG>IxhtHLj82T|%a^F+~tx;@X9yHEf
zh!^wwpe+f5cJ6QJ{2!{Fs2S(6U$OQ2x3v?I1#oF&?2O@By{emyHty;cZ-dV(Q~3DL
zIgb>-o;-7}JT@MOpqF*29VY!v#rg2;X+@LWYg#;5f3V8Iyi9^U?4G0>VnGJ|0*u2o
z&X$d&a$8{KStzA)Lsj5gFIy~j9kFr4weHjhEv_f7INeN+A9*7O$$ZR>osRK4iLFyR
ztJV}Ha;C(ol*zSD<Im?GtP1r!RTaAUEz2lG@?xifqf=BJV8l^!)m1^g)&Dx{<KXE>
z;3;I`X;bXf;aV+oVT=@<*K3M$Z(LK9^ZLy*lRKo(i=Beb`c=Vym1I(7ONzSD<)R<`
zHNp8$>pw>urx~+ZoqkYz6+gy(MM`34p??>t8ljz+r_H5mTW71uPlMxaEmkMDe~e50
zo=L09u`mx*1&++Ky#C0-*hKVVqiU&!1ic_5TfE3%>jeyBr2&tywTyEB7qaY0ahH4l
z8I`=hYvujC*qPvco2u56fOqQ(v+)iqqz`p!Dn;n9Yn*LOCb?t&*MqVLGp#*X9h-n2
z_*i!)Tf8l<-^NcV+^F>gc!ToakXeK=Z(Mr!ZTQ(=#U}s5KU#aUHs(fe{HjRi&hNt}
zF4}stmg1BHsDac32@w4e*5Pq!-dHrVR`log6D<89`G2Su(zK91T>k{H|88SPjmo$!
zAp1W?#+p5<UTzBC<5p1tDHpf=QjLC!kJ7?I7Qj;Q7`4^&%#niEA~|Nyh~#oIy-*&s
zCE2p<3aPS1kAee^q;}f)3Vs{OHG9rToehisJ5@G-07$;F7Ez;W4g8#9#ufY~g*4^(
zVX;Iyr^*kFG9ar$d=(e`UQHc4_G<cmpt5pK0iOkrr4VSL96?&}{m2}%M>Q5k`LQ;E
zE!D9E;1{$bilXP0%=qlZ&wRQ)&e#F0|NF7ZbDDtwyhDGCO*hKfi$>4j3m>;#GWZq8
z_pdo`ACK7DqC)Eio9bY%rQ@fGf-L#?zKC)CW4#$sfWxOrYe`zM$q<BR=LwUezRkU&
z-QV5>*BrHz`##!vQ$0Az(vD3Lg3l7JGPF|$3`9|aFZW#l#s5GJl#;rVI5Wj6iwMi#
zT8|HoQ0h$nM=*6(rZIgkwceA{s%B>(em8qPVRExW0um?A)Ve?*+~W03b21jiT}>>H
z9gD%)G~Z}d+qmQI9_zxJd!yS#&`MGh4QI0nB@q!&i@FEgrD_jT8YD!$Bv421)EjDt
zvz7QB{bxG=M{8GW_&%(?ub+piU-#>OU}v#97K0t|M0o!{YNU+`WPKrn{w`eRDNCNN
zGldsC4VA%l7KihMv`c<~IN<`Sh(%a;lrAR}o9t4C+pY0(w%cn^12Y8kS}AHTVwuAw
zE9BE@yu>4(U=bti48&;*u8Dm^WjXcjckwCX-{T1iKl&u$M;~WPM6xlwVmA&?Zo72N
zT57^33?8ikYqpzEy1M~BRKAW7Fi11ZHFcTEF2>!~jn&Spv&id~t=sk}TkB3Xp7C;g
zZAp~2yEhPiw*X6Z&6MNo;KjF03mRWx`r@6P!Hcw_vq|R@-3Vi%j4Peo*U6+4X%&JU
zy0M6>{q<CcmA5)wE&!eqH0UgrHDXGGo;?DBbc)dbVgFmo_UZR)zkw+bUkE;%1}&$R
zU7C^3mb5pCmPPt2YF5uR&~!cxD}c=~RUVs)K4oZXOm7jSw{|Kne@6CYwMA=-l*Xo@
zFR;s~nf>~wX`HdKFpc>#F7<n~Ba=w^{B%`l%W`Wsmc%Bb8(USOB@=Wb#l@ED>fG4+
zB>0D6>7|WU{+GojfqxihGI<T$H#q3BrG9Vj-^ItJdWUx4?NZ)_(B=)6E(rhMPEFgX
zJ*$`Kcd(JDGW{K6rg7t-XLTBXY&HSDt0d!82f84L!2yMUw?YR);9758z+E{DM>ehz
z`KQ24c9#+SHEoCm*QVPR&7_jf77w)X0Q668P%3Q-AYzuF-&@-Q?E#77jL1RJ)>Y~v
z@xXp@SG~8Pp&KD#ZAfzW1wA1Oe&droZUlIbKB=xl3~a?NSM-nG<^ZZmS2lXuINWu?
z$JO<Rfo+f!vU(O(;PUzKBf`tVP23w-8bE1>U^u|L@CkLDd*I{Alo0=TZ`&Skn_n{h
zsdQhpU6|<~7`zaKJfe1Y2nqlNiHcW!ojUr!fF5wsC(*Q`*NwPjFXiPQYw3D*y=7oa
z6i1P$C4@rz(8$KN03cJE#7nta*#F+swD<G{`aU+6UB&)lc+*(k|BkmTGCCD^BvG&(
z+YLu5&HLL56Jefeo7uoy<Idl_qmdI$z=dV_7-1hmF@WsVoma;y$yQRn%T&j_7_3ce
zxS-fhEj91kO+XW6JnB}d12$!6P$Cz+p(fC-GH#JhjQFw&*(ik}<bM?XU8KDW+uz3w
zRl`eUS?ugA$Uc@Nal2MX`(rVpc4R)vI9o)tU6UJdhxW){{|?#b#;VXxtL%exq3P&C
zh8lsbh=h$HC!K9vTDNWc$9B;d-)}8)T;#mi4DmWL(b!T}c*muB$L!CMGH_#6;KgOu
z9xRN_L=Q6b(x#^9k4x$DbMN_$;QfheEAQvTW`Xxw)fjFr<MAk&xbwitlxHzF#93uh
zvf-4DepHV7d<*Ad{r|V7{kOhQf0upL*z|97knfHarT{q(<42nhiUsKk^5@(e9sbeS
z^7hi?flJF{v-x^cOwV&@#~!vsX?TGy1nv=kK|pOG;bv-I?ILdKN#mX^yEVjq+(`dh
z-hHGfHV1vERE=PF>H{}@mLXnnHU8h^LD?g!F+=kk2qTcveeU8$qy!1(Q@D6ic|xw;
zu_AE2n5|da=^VKxAB2r-m{`{ZeKG<<L?sP+&6F+E5{>NS*j(^f%r<Ahqg8c7USm@r
z1ScL~HP#|QQ;w<1Wv4xmXf#RwFVGHZ`2L~xmOf6efd}9#`rnwFtz;2)6T64~%ot;=
zHNwW7#*q(xZxGo{3NOP|#7kDW>;?mZ<_XD|zlAeRwwd7~yY#jeHc>HI+oU7PHBY3f
ziP!_%RB)c;bNX6Pc`vTHvrV?0__12@k#EP9P#(!E3W@Rey{HTsW(M6sYB6~75C|U>
zZe&4H$Oy@Vs8|Py2`*oU{e(YcfygcsjxAfiYCLsyePy!Gon*3AXw7E5N8A2TeP9BA
z-Z{bmoyO+mnth_lrZLxIRHXy^1gKBYOs*v-nQS`#*;cPwjP4Sf6iAtX!Fp)x(9x(!
zALnbeu>LQx1vAM)eib2#on8rN*bGV%tq>lI6~c(W#AbOC``S9#H24{^vXd<EyzV`3
zZPgT$tzoVu4s)xzB@ph5xpgh;<H~9t7tdeO;w8Usm<osO@^<&RZpwM-I6U1xuh!5u
zi+*#d!V?m`s1R>%iNnk)@AkIIfT9vQ|4n^`rmuk4?^<K(2fxDq540GW9GjQ%cCWM}
zscl^A6Ce4f#pZ+4`D~4v#oF=kwCZd#-J4KuuN^?3d>z;VR<IAnU!Xm7eWKGSa$@Wp
zus4UTO8?v(e5)FKC#%&Ga<(D1U?h3O5D#UV6HZF1%sY-;277iU8@~3{lN0re&i|2m
zyQa762lZ$4f3k(Fh26=1jx+xP<3{7h{|8p*zf>0rjYOs=K#aiZ?`<nwLzt(2zKfsw
z--&A}AG;nw<pQRtwwXJ1Pkm^rkqCXx8>Bp<P5!oK6v)*NCpLf%xUjH{j=5&s6ZG(y
z0R6GKhChKp%i&IO&-a!Zi7I6byay1AVeA-4mS2b3nLGJeu0KA=NW^!lu*OsG54DP$
z9#y`{Ti@c5H~nCh85ynAxlP_+b0E+jc5igA3pBgeP?_Mi@J=CX>fb-t=u&#jW)BK@
zBF_u2v8$f8Q2i0*TTu%)fLfuzFm})3xBhUZu{~j{RJa%!F^Dq*s%5=DaPpW@>>b4a
zpP?BS;^T7taSf4V$G#e3i-&6-HXb{kLf*t$N*g0tB=^StA2&uil4eotjx8Z<!D%Tr
zQ)rPHEi&Yg*Dmfv(}Sb=0ZHII95{Z~sdnHT>zJi+CzNiKANO{-R{-k)*oR#x<qGg@
z%;}QOJ&4EQC*=~G`3VNzWOq$_^INdx1QFqI*rLz(Op7f==ISaIsZ~3p68FaH9qY5B
zL*i{icK|#tL~YpOF>5)pB>DdkH%#5E0g#uQi=#ZNC`1#3gMpL=y$yY;#S)I=9Pjte
zek1zHx4z8>E7bKx%V1%WAAdJjWL)fAOs_?3o!azr6dLGV4639h*W>0qW+bpwko?cs
z0~&k4s6Mvt|MSCtM&Mt31R`T%3$d~aRqH`Ht}MH^u-{TNs2yq2!bI|PWJYWe_*%ub
zXRzW`jX}z0qgije60Coc|A)~|=+$1-m+SWf_v=Zc$hax1uV1YWMgM7JvHA$>-)c_?
z#|T2F2_NwohLcEt-|RtbEx^7?;><C%YPIbKX_cl2G84V6C=P)XcnZ!z1JyxqJJQQU
zK<$={yGCk%l_v~~5Af>%X$A0l*v%1j0*E)1ipO8eJ<XkM2-NX}@gJ8PE&wzI04kE|
zpo8>{Y)`9U7Hx0hH5NFAIf}|7`M=v;)&+IGxf@qtbjcNg3L_92$-G2%XAE>3WjSzG
zc0@**J*Q>F3K_IkL--C6K35Al67VC{vj+fp35=j#6dS>)>;f;fp3Zu2LjX6#8(-le
zLHZJBXRBJq{2&8kUwg=800slBle~rPYVlr!v|ve%LT6^pnng%;c<T@lc`F-yW<&v!
zeUMh{65K|LGUEdWkcXg1D7;Yk|1Q;_G<;HjLtm}gk|?se6IdS>SrseAcIjgwwe7OM
z!vlqXC$kQv%3$$e!qOCm1m$(RYdYJG<=VNHIGBo(-Bk1UY6z5}s!;3CECOZZv{(tc
zvRKu2m9Q&=TWkk6=q~8^8)q+Y-wjswCdG=u-U?N>Swi+4%C{F2gfB4oyzaSt_AW_&
zP4OAO<&1VrGOdiRiY?F1l(5^^%K<V>3JSvKv9F*IkdJFBHQvrPk$1kt7M6kiH_1&+
z@9mUR;!bN<#>bYSE6doL3}<&TmqIe1gQtz6;xTJGDlIJ1`M*_PsKNWcTrbzFf&aM!
zI6&?CZukMO)UVfXf?e<q{T}@R{bBtv{Ym|K{bl`i{Vn}%rm<lxkDUxp;Z!yocEjbY
zoK>?eYzJ#%?QA#O&#q+G!-IH`-2pG+1MFe;7<-aE&t7J)v$xpWhGq;i@{E%Ww=vb2
zZ7ejF8|6l|vBlV7G#Ty2Zezc3rExv5M-Liz821<t7!Mnd8BZF|8!sEL8*dqJTep%A
z_V=L%W3Dq?<2W7X8ZW6^(g~8DDd|K>&ysYKq?09`BI#5~r%8IYq|+sxA?Zv>XK`BS
znl0%ZNsA<%E9pE*=SzByqzfcnDCr_e&*gNnYl);aoGx)KmGnGGmr1%@(qc(VBrTP+
zOwtvSu9S3@q~(%UNV;0mHIlBCv{KS4N!LkQE$MnrYh1OGZjf}Nq?;t&Ea?_Ww@P}x
zq}wFDK+^4!UMT5BlJ4Nt<EoRiUeX3hy^=Oc>XWodQop1-C2f|pMbcJD+awKe+V1M$
zw8IsYG$d(Q(oRWtN!lgpZb`c(-6PKb^>qG!UVmE8)7EFWjv|X=<=FGKse)}JJZEf4
zb%VM`m!x!g_>9Z3ABL+sCO&1^4-wY53hZB`nv#;3eY<i=GHXKbajNd-HMu>!3!x5M
za?q;S%IqAVc9*0@hICWLavj1AT4dck$W*D{RK9f|?@HkNPg>u`;@FDpOeTBMF+~Z$
z>+ci+kXpdN*cZPc*#GoYEBoVPWne!G=f7QNfDGT-?rji(4ohqaoe2GiyI}n#bpF$P
zKV)H%&i|qM3{9V*-=P1A)v$YU8Y3O}KVS9{NL44Zs3^*j8{1825h*D5)^_YFY<$Fr
zS|N<Y`&yEzSeB{=Zsp#txLS1Mb!zDe344%+*5@j%God=A|4wY#%LG&3r!;ZLooj8_
zgdZw{ChS{WQeTqmJX-&G1m$swc8B(=K3ZR^e?<Q-;sB<xFzbbUzSw9)9KcWPt05cz
zBI3}N*pg~-)DN_WtP`N@>1gb(QV~PAMCBbUF<B=<xYF^<xz1Z;vH;y|Kl#@IPZI&X
zwd5@8J2JZf+1VznFl+jHm-^Z1TG@AR8rtsizLBxVl=aWfBCgU`uSVSAXzHDPcPWNV
z1=R#wsr(_?TBaZ>uClYy6Y?NY9cABOcJa1)TkB*PaFwXQuw;&XC*h_xMB*V5mmocP
z%j;XvGQj&j2!Ek#sT`5y1`Jnm-=+3&sQ$s5$GcD|qC9JO)FLY4VWiv}x~O!dC}Cg=
zT)ark!x|pAn6lw}y2&tJH9USXnf+SG|5s>6CFK9-^jX>!*;v;pJ|i+IRtY&N3%04`
z?_x<&(rapNxgF9{XI0?23X8M^M%QMAQH8xoVZYi?^-0cXsMU%^3V?t$V6>hEGPFFU
zzL}-I|BdRrR*d(NN3G*MJ+>O%Sfd(8pYY6Aix*Z4E8fz4hZyzto2~2?#wx(>I<_st
zQCAfeRil9yUfK$l!&QNstk9@p{okY+C$V<@d-{o5c0GS7ZUp_8UmUB!Na}2QszE^(
z-=Qspd}!O)caw(&&5W%_^OdR<of6JF#WPOvEL`%=)p(6vRiQwyb>>ZqRfFNocTgL?
zN4%gaM1dvAuPJ`D0*vm0m*h)UMkmJBfzeXch?s;Un_Om0E>@m#_N|=F_9v{NR1t5i
z3ZYa6WS&ezsWO(AG8ehDZ{2+{I*M?(K+N(!Nd7-T+o0k5L4B6q%f`co|9NASab^En
zO!cQsJ*50_T*0v@R|j}LnL}>Jrc|{+%f=ug_6D>f%R(g%DcGE<ie_t*RD%I+Cik#!
zyVyk0lN9tqTce~^s5gp)!&d+9X<TqUU#YfhrKiE;^MvX>!Q9?TGola;(0_-(+H+4u
z+4R;x7=eO7s0gAS7ob0<<sND?BZ-1psTAY+0OR)t3)P<Hl$KC}97PmM5QS26zoJ&8
zLA5#3$5*2|Brp_P0Ikfi8v*u;l4z*02xt^!Oawjk0>AOrE)x}?lD=fsrtKQ&`2nO3
zdV{2pp%h*-AX?}J=ibGzxQA(H;WOte+AZ2ydX65}f6uN2@?Q-9*dx|{&bK>E2$M<q
zt45E)h~ALNNKkeBb#;gebr%C&HV|xSK>H{PHz4VmW@lw*OV|&jR>XnGLU{Rk;OM?a
z6K8PpR#A<v1)lz3T_8B%(RP&>r8_CQ9=NbxM6uS3dhK0k>Jc^ki8MOMZ3#d!LVY^^
zuJcEuxkYMmLkXJ$>QMthRbo6*95NKPb-Rol+(F7}tMvwV$!Mic<a)gu8DsWLQyA1l
zuX3=ah4J4Du8QGer@7#s$`Pz7)(EUL`P<#aO|S@Tz{J2xuk71s!Wa`48D{pl6gWfO
zWL_?>3SdlLibyW3w*8ZP>M^?_(iDSUpm^F3V$@fu$LIk=3S$`rfQpZs916|>H;W@f
z%pQfhDfXtFxLH@b!707J3NS`w52Dx<><=h+NN<e%M4J)VPb;)wIe58Ct++4`yC(e7
zV_laR)ppBZQ6-n<@_7Bf9IaY2ir8iP5A@UUV@6*H=-CYU&Zmk@*Dv4MjxFMPz_FF|
ze6HbZEv0+3%YqXT8hIi8ZxM|m(_@>^l{Kp6=LhKunH&bN<si`1sE9q<S2i3?#P0mq
zMzFh)U6iWCY8(04V0U0(eqV}df4o1J4{982>CTsGM_ivu#Q5~shU|>9gBQ#mT34fT
zmG;?>1QM~kI#vsIn^R92v5s?E*1fcBg1&FAOwb$B|4r>n8ZyQ<=)3X5zwQ@ub+%#P
z{i@ZY2U(A4h~YKd5;kxVCyS2NJ{kO5f^m;*iJgyp(k>R!GhVLg%l9?>z*g^6oNl1q
z_}#ha+eP%hb>qA^wiU|rX)H1+RXdn%iDWZ4xQ3h6vJ`5(=<hQVz1nH9EtsbjEafaL
zTkmO}Cb8hFnEACUcGo9hR`~xuscD~t_wQW29ua@v*8j-Hv90U?djbBxGGmu<$avy|
z+ZNVC5Ilq27g-BY--stpq9<l^GHsn|vPycWU97YOjL+Z|y_Jp~*9PGmt8uVySwe64
z`Fo+LzO8-?yEaO0RD=!JCV}gbhFIm=EZmam?3%7^rFdaF#y0)k$#uRc{_Sxv{3FgD
z9!77lzBB0eqf{V7|FFMPcwz$r@x|kW7&2u=sGUkAHsJPEo;uW#6L<%8;w5+z;DuDf
zGSUQHhpO~>#2pO+#l+(f*1Iy;31DwD0PqjL;HgQ>G>=1sTQNeIgY^=?)#WQPnTNSN
z4&H-GBzAc5SWs`HAC{U<ULVorr}b~J{TiZm-!U%x;8yv6TKdlj&<N}{BOS?AepR~{
zH~4t{DDnvSq@WiI4hJZy(<@>ALYQJWENwoyUs5zSsJ3j4pg{f-Pid;1h4QVt{9L~;
zK^<45uyKSU1Ve;{>F?gXW~4iNLts6Qz(~9e64o~qp`a{mZvVSa`2Wt<j5+LT#P(0n
z&Q3HhBca$1NOh=-d`8AnUAB()tO*G%Y+V8YDKa;95u~|VwmnlhT{-$gIZj0T#HYIw
zv0WIu5NxkwTQg?c9+2lGiYSUK+Lh;CnTX{xW81-UDXYwQepwd*Z36L0d`YFYo%0?^
z#O0dU1>h3uf5rn#dRwZgpEX=&NbxQ$a_)~3bcfFWBG#_`-_O`dw6Fc=-#^F^puCgO
zLq-pi^aM$VOFBZ*k&=#*G*{BmlIC&h8l5j`fuv(39V_XHlAa{#$&#KT>8X;QCh6&t
zo*^mE?;7nI&GWlJd43lt&+i(2=4hVRHG1M`p4SD+^SVHJUKc3O>jLF@U7$R#3zX+|
zf%3dAP@dNX%JaHFd0rQ2A?IV_XrAAN-+6u)D9`U2J$Ljx{`YyKd0yA(d82t=7bwr`
z0_AyKpo`>nJg*DCFP6VAq4R$T75zEUSj%ok2JjN?<C+$Zd4_9{%do{M0RNDHRpud7
zsd_(LYYnmt_<(;p;XB_&dEU$C4_?iBdaRM30E%a=tzoA$V7jQ(9|jCRXb^5Ft~q-g
zEZ2@#YKO0xj<V9vB6i|`tah$xF)!FHX4}+`0z117YCil)z&U`I809Zp{PiLR)}wf#
z_S#FpyXisMpr)}_W@p42!0ZauQq>O3+P%tjk%NA#t_u5_FA)50y~@gOVXPkfu410F
z2iG27T;>6^LJQoJi^5Hq6zxDw6|=#?Cy?M;eft?31<RokR+eYS>cDb^DxR{#5ZgU<
zYZI9rQn69^CIGp-=O<Mm@9h?z>HHtAZAB8W_D%g{y;Fah&1auve=yb<w`FuLs3lC$
z5Ud4cDLKbOA{N96c%_okv^V$(bP9Kf!0>`UZ8IYak}FP*O_1m{(8E>H))qinKC$2c
zerN)<DQV<^<FoBi2kYwVJKH@J-9oc%jHZ_0<M?o^o(X6uj(&0M=>>mLOTck_x|7@t
zu-jk|sN~1?&VoN?FgW%#iK@c@qpRx-iXuDjW$<vjrcz5-E&XHj&-AB^!+BBM3CmuW
zKfH&(RsDPuxT<MQ8HZ@_+RorE|1M!KEO<xF|L^ol9Wq&Jn*i`E%G4LUE7t!HH0=la
z9Q|fQ0RICyfL}69W3zErM(h6rzgaC-h{kAuU{dH1;f|0R480!^nG_mQi@HgOnG&Yk
z7PTZmhi2?s&YEu6kU1tGU0&(&HNZM63xn=V4C5FV`9}Ax^t6pJ6T@-ZuNK?vn4C>!
zM6vh~n&{h`?a34Udoy1Kt}Q0;dzF?!++*$M-nw=w^5x?P1AlN{S`W6%EGU9oM-?>7
z0$pM|KB2~hdni?o?XMHS-MhTvk)zWZTl>L*f~piswZ_k5fyRtlZ$>7j%&GmzKomzS
zum3e>C^Kpi|NAGbR<=a@lis1f#m;8e8zYRXume2&fiL0@q`{nkTA(Kiz#)JQv(#5u
z+yINIh)%8S4EgJYqEX@r`CHu82=8n_y$%?dsP^))xKxN3{ZDXD<f&kz5ovAC%|i1u
z{ZeXvAuXcO8`1m;N_DCcfac?YoW<^y{+8C!b+~hqnrLCU)k!Jq3su9eN0MEiOgFj(
ztxVfx0%tqvdUQneBk>~Lq6lcZu+)qUP0+O0+fcXxk*0i55U$+d_jS9cuH@2-sJFml
zriV}for&c%D)A0}47#~uR^_Y}^kPo^7Vi37k>N|!I5J0f1zMU5*984LeIfdhZW|gx
zTQ4s*68R6jK`Y{KVKGiNPa8avbpOd?h5i4a23YEEu%Y@|?cfKp1eF_!OpP@Q9b3&P
zY(ID%9Q1&>+vUa5-sBJZU>1-T0mTcu{<j&r)br4#8ZEk1WI=2vcwNW*>8h+Ees;hX
zGMJFyN$q;=x-TMksOPz=klz;TI4kBC+IHH*Y(HiaIh|8*P;dI;rv%5|ZPvj)E7k;#
zm#U@)I!p}v5$@o9S98+)Ub#!~S^KP&&(mT)@Hv-NraLK;`u&qe252wO{Fq=b_^yRL
zlK+S4UQPGv-)05y0z77%Wo$C;P+p+_xiI+%sH<;rBC%al-sBHK2!Tvo3eb7lzQ+u!
zH6v3J92xz)NTE~{`eb;!nhdY7Pr~1i8KSO$_jBu@9djhbvH%BPMCn=XZyqyZvkA=J
zq-Xm;h8@)7em6GXyvK}GSM1}Mwrd@=p8B940W#3~IwAb=K^{KG@T##~9%%75c)Ifz
ztIO%~7N_K-N)Hk{f?Q6|D^(x2V^6gAu7YG#Dt`w^0X~89R*3Weqnfdb-J<_ipRIi~
z`E))GS0J&z9lPWN9=xvLa!^i;$-Pne(i5)u$WN2jD!>^Z0HYb4@hL{6r5M4c{cK_}
zw)z*ULcS%ItseOdZD74rHIl)8Vmd5D0?ej}mSU)so^X>_02F&vuheHOJ58{=`&BEu
z(_*b)Hv{jAgY64=!d|cm@Et4#DFnMbiWh1Je{~SdLiB4HVr6!ItOd+gGGDr<d}?MW
zPfC|-H=Xs0Wc(}(<2hK&0lg8QIT5{4Z_$H5{=7uLT>ls%fj_N(R*wPw^Dg~f{XyV=
zKB_;i{}@q1Khs~;e*+BAzoB9%0}5y^8^cZo4(MbygB1Y@^gLF^RwIvi6T5)b0S&Yb
zSVDUcVfYbt4SWkXvCp$Zs4;X8yPtiNeHW;pKVm;&M}Q0ZYxX<#C-ye`C+v^I5qo^1
zak_CP@W^Hv^Ne$W54sX{2y1{4dZE!^>;y*WE@Q9J1C-EfjT?+xfD?L~@n6PQffV{J
z<FN4qV1+(wykz_WXraG1{$l+7IP6*}JktC^G#9#BG&%;Kz0p(fc_=y#pSMMkd}-bu
zosQ2tqjT{2U(p5l{Bm?DKJSW_;`1xf3Vhxht-|O1Q52~%ABb+j=Y!Gh`21#+bn|aT
zefWGh+KkV`(RO@35~X~<N27c2`B)SXPv-Yy44*%Y4aMgZv61-v-&h_#pNbJzKaQP@
z&!5D`<MWvqarHuM8a`i&&BEtTV{`HO^BD2=ix>(<o3F&q!{@6p;_%n8a(uoKtHkGT
zVm0`DGqxF@zmILh=O1G`@cHK$rkQy(MjXBqBM$!=BM#q>fx{fVm*$|+I|QFOy(92B
zq!+y94C@_>&k?;Cv7Ax87_pqZUhtMv&<oyj#`c1@oD+NJ;q#PUaFugvFUBqB^xhJD
zj_U<iIpcdVZaMB=j9bo`y%@KgNxc}ioGHB+x16(kF>X22dtrIVnc3Tc&%$0x2%X)#
z7oT$u>G+&~h`3sC2qTuW@Q@3i=N^K~JZI^l)A70N&;)!IADV*C(nB-wx#AGsV@~;@
z`S@IWh`6dcgt5x0K7_H#sX4R?pS6e9;&bDn_4wR$2vv7;wj9D(<!n2IvC6sdkQbj9
z9U`vk4-r@1L%Z<Vc<5q$`fsJN+IcG$Z%)gtG*)f5(pa_MN?e6*Jq@4XTZyY(w@$+6
z?ptZB_S{Nib@8ouk2(8pU5L+1Z$;r9O&hEImxk}31O00`EPzq{IjrajY#H0ey4V-k
zci2ltjxibNye-Dn#y4=ohxFAK-fWkQ6ZmRf^`dB^s{7pK6+lhO!2zzuz8mazap#k<
zO>(4o<hWWzvB=c+dsmB$eoxIl;M$pQ;=Q}tYf&k=A&lhoW>?1<CR@N<9b9Um>}<rb
zBULugMWV5*`!tiyrN5G_N%F#)AfcM^zlHk#Mke?&&#rEP?9czUSCq=^;K6JaQvlJv
zDi9{ruNB<{kxDuPzi!_I6VnjSC)2odO7p2En?qNS`C)_KgO*xag%EP7h@0==cAX7f
z0YHic+uHr@2;ZN&0R;m(eI9{waEaSwOX(Rjv0(1>wE9s6p}4UTg+VzRyZhK6&1rKJ
z6+?i?1FZgVr*zkJO*C049>Mh>f}39(KtZrofdI+cBF)^jXPn6v(KURokPQ&!4dDCs
zix`iKMN&YAm>C0es5c;GAxzoM$B-F<E0H5Hl%B>t90M-jR!zpOwkf!t67E+AsHj6t
zfNEdYcpCfx_X-%ZxAUIu;`+bl*6@9uK2ne9M}cAY3j@24_)<e)P?oU=<f%Knvb{>N
z(CIZt&h0^`ff~9;dW|QXTE`OzAn|lngPTaJtAj3qpczrnrPFIS!LmYvC2)L_njF$=
zlk3<67T;8dwHi6a?3sJKSjcSsLm<=){T+Pf{6T+*ebIn?^q;T)FGj$8HgdMvvoZO+
zq=TJG{Bb)Xuk{D~6ri=>kl_Fm?x{fHsNJ%1T48CKdyc5q6z2z>;jZ#SZdirb21MV@
ztZnr}0VhvsFxZVeH?I%zjx!0Cg%=?bazt$tYM}x!6%kqdbS!uR6ZE~vG_xmBWmAi}
zGZlU<@?@&~mUjY$h=K}{zU!@TqI0$2dFVBdN6s{R6hMPh9A2wTmnyr2--2S4VpyLN
z_CF|WHO4%4jed*vTBdV9;)->^6taL#fGH%Kro1@WAznn4X1gSHJ_}==V5*rdQ}b`7
zbs8j=QWFcX3x=HoWVTOKg*Mp&VB2Eh5gMR+_Nkea(qdUmrhx~T5@1h9x_4@Kedl`g
z82`6*TWnF0vtl8<q>I?x<Je;-RmDkv(cb-Lo#1oddsaTnV?n$bgKa*Je5$DdYTAOX
zzfZuC*Hwk~?6veotp9U0!(`R^=Me~WuIl=a%!}>8+X}GK<2echMUz0E8cf;J9-s0s
zdi<%Xj<Zg&^cWEZ-Qc^PEjW&RJFCmiTD10a_fy~%P`>+?T6vun+YMg*Z0YgjHIZ(T
zP$AZOUg{7WZ<=Z4cy_D{9Al$Bo*XAsY&v+Ngp-P{9lhdzz%zE*J@c(R?~d(4X6sxi
z)W`93$V^esOwZp{=H-3wICG<=@1*~qq<u}p_Y>MX`UGHrc=V6L2Kcc45~=`<gDrmt
zEcXXtr+>pJFqRs1sL1u4>K<`it~<qKg)IMfe2G!%N5qhEi&Or)9QYi6>9a<ad4a5k
zFu5SIt;u3j)>#M1hXl0zKX3~at|j$}(D_j1tpRz_+&v0dHm}Ie&i}{BCYwpEQLqS-
z6ktuM;}3XivdJpw4`iC69SRn#um^S@_`^`V05Nd<vfocK*($n>8#@A>5D`(;-dzQA
z*9QI@zv^#&ed0C>61SzpJpZrUXoUM|k*;d-gdk?N_}kk>;!6IXxseTjrWH{!r4{C@
zG6>uJq3>|3RsQd|LSBLPV49<7(#?TZIbd&(H`!t^$1PGMhF1H%_1;!o$L(JEfA9M{
z4JiK`8Rt-?Gt8yj{6F@!K!bSfex%+9pdD}?j`lr)hHvHW-OYZOrB)%bSKw{r|E2Hm
zG>Wo?#zrrawRko_{-63<py6BX_xUJtmnV!My`H!5rg#tUIk;63r04Ut@htm-p}f>Y
z{(F3Gto4UH;363G1REsh*fL~Dyxw;uSFHQh3VETZeNIgmm}i-61;aD#fkel~sDN<;
zE-s=T4rq9?drgZ6m>eaZ25(Ckf2|Gl8CDC1oM*CbdNlPrPM3n-RJId&0c}7a3BeHC
zjh`^|0r&Zx^>Am_iNf*)x!m-L+wBP*)gGk6)gzpccVQ%*|3kFXH3L!q`tS7V!2gF&
zLwq&%A~mR9RgULs3`M6D<=)u;bI#ruPEDTocV_HT92(o%oa1?D*v*X&R%7iGE0OMZ
z*$qhdd%&_)MwZ4d0hisX`RQp1<VlUyNzK_a>s}Kb2!6%dfyJ?X=s=fhIm+}pK#O4z
zlYTOr|CU!iE!f|5nU(#CvAtj)>cMe5rTKYa@m6#={A1Vhzk*E!CvM8KvUzswVzB9D
zi;m-DPT)gG;9Jmlol`Hkz4#Ujx5EAp_v0q*I_*tV{(O!3*k28Ji!=FJXoQlRmF&o=
z1%+yvarQf%FjuVzum!W#;_lOXx>E#KIfC28K0EgkGqNw8AyMg=&Ekd?NNL!xyR~sw
zSizi2&B&$4uX+1PiR9%r9}+c1*k3_WWTe@1%JE~segKz1@GFMB5yj#|aO3gxDxdJQ
z70inaHG4)MKW^xxk3X~VHaZcy2_X~NWNW8*+aTcZ(|3MEGkf&o$B0#UfQZ!sfditG
zM_`K;ED-1ae9hQ~c$|~;OSH!|L@gxwiWKw?!4@}3^(5>U2b@rt>8}`(AQ#kJ`yFJK
z0auj2OtH*As|q}Ion<eJ%<9bnTgy@j!m8mCiyfPp&M*LlH^O&{+}CcT_qcZj`qJ_D
zJEV&zzFfQRx+8+)XHU0sJhs;a$5T|RVZ;rjLjb`B;N}A~PNo^V_9wk$>*XuK7=j)*
z-D79WNS85tC`2tK#<>w0D>5ziJ46Q#ykzbCzevXJwlX%Qmw~ZG%%dg*#E+OA)_AQq
z><(l4H4vP-55EYl4MV4V?bZ{Q2v!@Ov9da$R|l(eRjUETv1$|hp&T?pNq`#Lir9=W
z&K24~uvqL%-08yY?prvMfuHWMFiGcsfrbFAJz7kAML$t5LGAB@`uFwsp=8$~UhjVP
z6nob=+t`K}yGN4j3n~3sgn;aK(A#Jrx)2}1yZAA#38AOl)jB{OEAci0*_{@ry8(%`
zL_<)o>4o+wkgludnas;@yZwyfkWdJS_5nQJ=SFx%Q)iGzsk^Qe71Z`SD0U@)o9CCy
zq7kmEMcBrEuHOyZ^-0O+J4b7vwN>nH9~I$0s_)Ge5iu-DH$~S+M4V7+JCo~*K6c1_
zFpzmnBX=9tZO|QR@p{|E%DqN}V5P7;Ts@-3WAZicx~%U?`<u4xY?q6mpO4pg0qx&F
zucOu*qJ1yqx>i)>yVhY^^(QKe&U{k5xoaI})@Dx-5)>5|srSpo@9RaR*R>84sm6nR
z0qEc~Z_5LnAujT{u3KobR_40aVG_}WD9=j?rQF^`zpn%^3D5F%-Q3rbU5?lg#LB1s
zR=0S%1C5QMBL@Ub>$MJ>!DequJ=MAZcYpzGCF@BEG8X%iJzSp^_WuVo<05ts^#4uT
z11T-y5AEW}sl6kxxlUIFS*9WGJL?^!MeC|oS^C;5N8!cl`FT|+)MMFIBl*3<!QDi*
zMokBd=gxk7(qE75hsicf?H@1wNO0AiZ{=!v?+M^)J?l=LEBl&M*?rU8wYAR&=AjQi
zs|szIXzj!F-eKs&Qszzh{C8NniI0Gk4vb}I9hU4)va)+d?@+K?m`avn-!!!^e}@A_
z?cCYAlwg)1Gyl|@MmdVD({kYSgZ%%JcCP+0?T4yMIx?y^7hN0Ajdlut{$c>3dVHNc
zTLd%O4~u+PTcN`i?y#*7`{n~EV0d{FAOGUsJTTO(I@YQTIjPqU2ZY)=GVL1x=(_AC
zq>#+9PL<-`(O|!WZC9Jw>g?M^ALkQG`D|<Rk_(?Y5w>&!ljq~A6X>{Kx3_oHaIKsB
zdDESrxi>lvvz(8FX7^-MINaV)*xBaaJ+lFZhI)Vxck_RXOz0hn7n+v*uPBf0cff^n
z65Qr~hxDnJt3nNrTV5E+|06UcNK|QGLhY|+{WkqCYy)fo?;+3TtEs*swbW5^L7^6y
zyBH3Pu&@ZM4eWxij+<$AddR;)z|AF1o^DSw;0j0)$T!upXe|%7#CGASl@tyQIS6}@
z020d|rdF`f@?`rf8gKzxq9j!gTE_WD29rV=zhd~;Aaujg$1{DoODz9)YE|`|?iFUq
zfo{@^OxQ@02E;l)jpP85M+S4Ps^#K3KcDuh!Q8QH&4_{>(fQdV_YH92sv&kcKa5W2
zt%=>fij&phZ5MJeUO0!HT*aBp1-pA$$p1?<qYU`p-_@Ch>?!51NOAAj<8x%$WglnN
z=UNA~+wsZ^W*{y0GFU-cF174{ktMxjgxH`a6+0dX4swhWuo$hJl`zV;z<n#r+h6OD
z$!Wh#f9WPo@W0O%HMgR-0Q`5VTEx`(x9dr@ekvk~5CjB5P;yIMx6pO3wFaePaU{65
z@onnJ%@FNBV|@|xd-Kr|FI%5&0m!aWS#1Fd_JZ|gz<uFDk1e8XVXq5}`&4yN^*3N&
z25bF|lq`inj&;HWc<r3z7wIK=H0Ti6_I}<n=yd*%(poiqe^ooGFF^*-qih6ncMq^5
z#&~0$ai{Wbko>|jGjf8$!Gr22lsHu!awBSGl{XwJ<mD3ufY#E?9x|WK;?c`8d&oKb
zA&WA5$O8V5<(WN1pn5IN>>-OdCkrxq$eh{yAxkoQ$Q=HVb2EEL5r4@1%pNkAKV)Gc
zaIum~N>oU;A?RrgyS}X^Q5?HLNM|Le`9qe&U|XoJn|4k(A}YP`ML<^V1C4b(veAUK
zOPv=dt#zf}*TlujISWJtm+SkK|1(T`37<KyYA@;A^&caDKggaj<`|DBU(o;RR}8sS
zEupXsX6`jDUUJc{@P`mZ<t{4ZN18+C3MHaa;!6{%wKfL>VPMyK>bgU2z)7@pwl~7j
zg`h5)Jq3p`sOPnt5rrw_#6Xc%Z=dXxNCTfPw5aZ|U!o%4hek`(aQe!EepIIMp$ade
z3d`UU?sjs|)&_)kBn;W5G9Vy~M_-6mUQxmkEDHwO-RA?*T*8jR)ih-Bg(fU`N$0ZV
z)<Oqmx3nohv5-*bit7T1=A&^R(}N}y0drOg|1Jdipt}qpudN}hKNJLOK`H3~o{0bk
zZzm=Pfd5+EQx?q`6T-8LBV)}Tg|(RK!waphf~l~WHMlng>OCz~x+~aBp|16iAE(hS
zLGNV~q%rC59RqxTA?GP=ScoHS@OxmW$bXOIe^a|(Ggh!2`qlX1-{LE>zV{SlVCbwh
z+oGaf<|Sb~v9l&+_fE%ep@fhk(t&*f$=HRh?Oq@M37tCmxOB=X4gj6%^C4j_Q6H;=
zo^BDB;<`4~J1*q%B|6o9)Y>Ue?@8#Ci|xzyo3h(q%Do=M8DKA1-5Cla(3w14Fflb#
zFt)q6OO#)SLoUrb8_qvdzB!wxe?jkwLIKEjC++dOWyq2Yz_7Fmdjjot=uh&Cmi{zf
zvi|?r`x3yYs_XCf?i)anB{P7afDR&?8UjJt1R)7zfh2?kh~NT~WRi@T%!FBhpooLj
z(xO)Dg0(8>OsrZLs#dKlZmpHp+S*#Ht<~18wToM=cKv>LndHq|X6{S|wg1l;JW1xg
zch9}=E@%CnF^2a;<^NI26$-weg#E8rJyYGSKBaz4jzwg6Em=oe$tC0gL;y_GeA?Hv
z?`kg}{0)LTr7y7vvSDj6N<j@uqs<*&?ydjkVh7nq9j!UOSLbeC6Y~;_pbt88XrlnX
z-^{(U*YMbYODtko=!Mi%-4^1p>CWqf3pm^5<h)wArlo8H&MUZAJ_{w>d3mxInUzQ9
zWrsV+G~&Fzx2k*?UU#o^4+jgmUI!L(*I^D|NILhFEt%=u+xv5|^A;ZKu{Y_I-|Aim
zXEcsg*!p1Xj6_4+jBo?zYH!jbue%Oet8mHtJ&0ZB*Y=b+$adn~oAm1Gt_2nu#Q|}b
zdAfpyZ8+LHAyBWudco^~tmF}`-OMrv@C32v>z}Zxuc5?JAZ-kwEs3$xT?Ysd>@y9W
z*l2J@gn%s)Xen$3s(WB7Or$=V=D|S(o!?@4Ab5xf*wH;?jjtKf8(YgaC9e`oI^`;i
z6Yu(s$*Y8MTX$7Si>J-UAOoFomYv|d#bVHx`@kY=@K$dByFk%O$#(T7<&TK}|Mb6_
z;ztcu)|2rtz)3i25T_FGHF^BQb|-%tx$d%&nUVYE#>XEVD~;K_WZDU2whQ%$4b)0=
zE%E?64ZCz~b$r}m%8mhKW4;d<bNpDQkdYk1OipP79^v`lgv@iev15zkWARdgvN3Yf
zrZd^YL-v$e_hW?lu`UcYc42<}NOZwRR_EJ(Y>q)RA4gJ$mhz*0YXtX3cw&0~4_0uf
zzpTy$>fejN@4JA!t}W8S+I^q?Mv&JQ<(!c^Ta2~rUlIa71?=7sI#8;H7khC&w%idL
zomqp`J=}cI&YH!Hk<O>(Kzw!2GA~*hmPoCoB_e9_Njd+M?wMvGa>^9$-#WqFNKMXD
zrmz!Zzg)Ep-IL8O*m6&M$QwWm2p8afAZHHHJ<=@cQNR#tG-H~4IsEVu7}Z!Fr1SA?
zjdDy5v@yz6r5NR&kgB_altE-%0_+Q5^Wl+SPg7&S(_1{EDCMT2UfGKQu8h3A(h+mY
zOg~-2hG#IWmXTM`^*=%JC`ym=pz;gl4dehH2^8RNwMso5)xa)O6YvT?ul_~x0OxZO
zVAAT9OUZgz2rnSlp<=)r+L797?E>vi4TvX}U!xu5c)~LR8!7ZEq&^riMmd>K$^Tx5
zy2w21bmR*o9cTrA4k1veo+hd`dq+Mn%0Z@xXOsnDkqNYTLj|2IXO=$!!d_qXL8oW9
zgNzl|1MPXFV}yfD6u<XEG&9UMem9HRr1`=0*rsLLeUY$hgRaru3S}ey%F==PZS1cN
zp3W$OG7HXT(lGy^4)s9Vyw35uYwH-C4Vr*&d&Ewbv@5Pfq%w@Z_+)8YcUPp~Bi(a&
zAei$!2EoTKuMff?gka94ew4Wgd0K+Q?<;VS@uG7S^k&2lSa2-AyusJmh20Crqu?f=
zci7)_Lx#||00oFcPHMpGI(M7{b>H|+jqNCC0-YHNL@Z8Y`1^hD5ZHQ1L9GrVpT#>o
zn0#67$es3vntY*_uxr;42N^}56zmQc)F*ob^gT%Mk@j%Go#Ib@rBQ~Lis$2WYfC9P
zBE|`88p%YEw4wHjpPfZaRTy?PlWz5<F>1}AQL^qv#Nx0GVAwZV3^=Z(!3&0Kk*E{`
zI$jm^IZ<0^vMSK9JuIjeH&H9B;ii&s*b_y{u88@qfpxQ+w@SCjVc%d1EN-O-is9B8
zn&^Vsj({J=+GHC1up3$6Gp?s+gyDKvo)9UwisQWxyMcv+<4Sr07_O}9r1O{SHp8xC
z8W%34+q&UGup9BTG5LSkHB|l|sGO%L=V=#_H%O_vNBM{4IzC8$+#El8u(FLz%TDy~
z+sn8vYS2xGe0AerGKULJh#w2Nt&CL3$!$qx!_YSNQ9xd$S0OW~n960hUW@X~w3PQ|
zqi}h2d?J`EAr*OGGOfC}Hz_e&YLjZ^--g?>cud|{Osn_qO<KBiETV*qP>Yq@hTdz(
z;>7p_u((t<96Rl+7TTVUhZGw|CL@RP?19}jY;KIZ!Q}ulqF;-FPDo~g88~yo`x#dO
zJ^v3=0F!(JPX2mz9~l6=kE@hQQ~+J3^~f)Jx#DbyzG55vDt=;E`6yQb=@hOQByQ5Z
zbktnA!Utu5pT|LmaJv@aXtK)3t%<_>$r5o2Zj@u#>bd4n_!2*m7dYx{L0m3{+3LYY
ze;>t*h|rp+OCZX!qoN?O$`PBES@5%Zx>>uK8Qw_8xZnmk0om%IX04_k9yRtF*rR*o
ze1xgfV$?Xfmt&euW<yM0oDZ8#bL4tzda(J;l(=iXoB2FtxxAxh=lE#zYpDvL>PJfy
zMnUdu9W_43N1I<x86-RCvGowBm^FLUG`jxRs&f@+|BKa1wN5=%-2fDTE>r<HPu+<c
z09UJfQ2}6|dOr|>o>rd&`v0ry+ra++m?+Q)3dk7X{!b+{5H+xvR3dKZRO}z^s3Wum
zs6ji)r9k`NOKwIy@%>~!kp7<|F9PTPZSpSpSW~n^fbl;@a|7XjhBg=Y{*_uCqK-Fc
z?ZEcmqMZk1|4V^3v{$=X+Xqzt{o2#O^nX!%6^Q=tY9Gt*O$XyjT0h;n(Rq%b+XOvV
z(Cv(#=LDh@t~<}UL(uaD{gR*;2zsHQUlw$ypkER6tAg$l^dd$tc3#5hCC;x2da0n7
z3Ho(GFBkL*L9Z0_DnWM(dbOb65cC>BzbWXof?mhy_0Bzl-o@x1=Uzc?VRWza20?EW
zG%jdD&>lf=67*Yw-puGN&RYfjwxG8Odb^-^2zsZW`vm<Cqjx#)7W5uLzbojyg5D?S
z{epf^&<6y4P|$}2eOS;(7=6^aU(m+{eO%Bd1btG_rv&}Jpg$1wX+eL;=rhg(g1*J*
z0q2hd{js3W3i=a4pA+<_g8od<=LP+_puZ6G1wnr)=!@L`f3BjfBzLMm2L4|^kw3Cq
zYa8R!@+0vSQ;DZ|;M(>7$|&)~8sk&ZXgArO2a#GF3_4*@()pCT-%4F_;zKq9WbDlN
zlpzX`K4Js%&^K{>==vt_?&_DbOxgXruw4(2iciMNgFYnZ2uUl+r**}p_tY)ltJraP
ze0&l(tdR`{PRpSXHFdAR<Oh{;mMV9@cEE;Rdj21xyr3vAsO9P%sN%DVJg*gNS7*15
zKW|qD9e|0-7++>T^u;_00~hFqo|@g@t%mi+(-nb!f(WcA$0)c%t|)lg_N+8tSm4Uw
zVXpB;xqJAw4o9r9pZzi$0V;ifM-1?6^xmp>&fDi{(JY$MM*+xT9rcbz->p_Un|{K(
zr?$d~h)T;a)HT2?RuYJ`2Ls&*o$Ug!V3=3)ctp;dVA;HdYNv}Opels(Zn<PJ%g3A5
z2x@W0bn1eK3Cdm*00}ux#DiJRDE%0kHHr$`7>N7$`H%X4>&ab2RVzQM`hN@K)3Ix=
zC*J-ZTv;yNTPy-HY!|xn-+Kq!?4z-h;)Uoyqik`#-ucn%*<qGU7;n%4*)@8L?3Kzh
zQ(mxRyfA(O7+)dlzD~=y%qDh=r4`Sx)hXA%Z)*~r7C#;gFDEPWFjdU*8-)adAF&ds
z8En1ZVi90uxJG$qW3Aojj*lM)W*3pAd0^ITdF%`1NgL*)c1@$_|0ep+U|{C<|5Ft0
z43bbkP)<>6lzsB2c`#l)Sc%Fag!WFIzTL{H3m+TwT+!sr()$td6EUE(vbNgywON!5
z<O=tNp`j{zZ)DkB=|5L4y<ni-+dd{f3(PGf4OvR3dgdg~pu3U*a{3+^4yv*<53}R4
zFg_Dp=4Zv59UrAg6F_z#LgIp(d4%dM7VZ(#RmznI9<yWkr1%UloS(hbtkuvnI0@^7
z5MqG=bxU#<=p{g_E0v2b-Db!5(eWZMo(Jy@4h6F=(9jMCFfYV*OWKc>%Xdz*VUf!J
zP9>z^`#R+r<)7*d<N#fwzDx#@`KSbT75O3g1bKknnlvs*rrm=BG)Zi$&TsR$T&d~f
z{0>J=l74N@eH<AqD*?cHN0KF(lkT=8OS0$r?bQf1MF8zx$(T*u`p#Ys=E1Zwdxi7v
zVh8cicC(OB`S9J9T-!QU(}<fq<Tk?&>%1q)jycdN)dax;ZrL$?FAo~OD=A#)*rCxt
zrg+>3cns}bNeN1KeV<FwdH-6xkU}~z=7=LE1W?@r@LDOmnUt3D&`LacJf3V3bZ**^
zq@MV&cp+AS>9(5d_vrc`sJ19-i~0<J?k@z!|Npq|pK1U3^gr*1#+bzdXmY^8EpPMC
ziyUGz)2#vPH6!Pivk>!oRT^Cr`ehb7%&|ivoYL~id0&|^&9P%pZX=n$#hknTpWXWB
z`u|mm)=1*0>Aga^>eF8z<`$t%&toELw&noctj=m2?#kwB<v&;S*oafH(eb%pd}h}1
zIy%PFA4%y?Ealce&9Y<dr1+fvj%ikheO97@^3PlDv15Ejd^Q+gE(>sCxl71zq<1AP
zLb|=mM(UWj^eH=@C&f<!&x^9Qs_5o{Mb_9F8kCu062433D&_h={?LX|y8a!?t+f8f
z_3E|w;dA>H3&a-=QLr<|Xr9o7(K#J;dE21#Cbua!MrYW(o7lPW1?cf;h@iRmIPa2c
z-eqC6>&VG=BQPU=a=(|pyiSva{xkg#XV~$4Tzo!wUMic?WVu~QN@TL?PUOHbHr!JA
z-$7O>@cUh>4bcFd@Ws~`BhbGQsBpw2s%umt0zOD9b1a#%f|di;|5_WIUR>~!q!(9z
zqs4Q$QxQOlA+&`YBH-x5#1FXhzWZ3hY{AQNrPy`%S@O*-b>{X~OmQ!bpmrIOE&|O6
z!RL|s1+Q###Lkw`Hu|`=X_answyi>HX!k_Co+vFrQXd513lD>RZz#DN_`j8kHU=@j
zL(~n*ow>dHmiVH<$Pqdk2bDw$Z*MBsu-&~s4xISO4w(NlV5%0zOR>2wlr8bm`*bVt
zm^3+Kk6Ij?_LnO=zVtHo*PG}+gMTG9HC_US=aFVPmw=98vmcilhAh(&AGHw7?JlmI
zzrl{ziSfnYb(X9TQ^%|Myt2+7eAL1|XL+Ua$oc=WVG|S7o7*JK;;vXr{1k*zZG%0w
zAF`J@AUSI@Za!?m$}87V3Cqg=N6-IJN<_i;P0I7I{}&+(V4HdeGJ%I7qPLMWBZBuC
zWCI+nRcRZw>$M+eF^D#o&U7Gy(D^7ca@(X?B7aMdea5Zsk0zZQdd<uXX~w}O9<{J#
zmjbQ}DN@`k_5E26bPjA}vCbYl#z9KxJ?7Br-fUj(-+0tQi!>$aa{qwznsDyt6*3;R
zun-tiYI!-3?6xuI<KoR^kpRoFL7wT2Vqp2H&I5-rAdqK(+vt3Y+oca!_%!GiRgZiR
z4^k)t^h|C5C>1m3|BQ2Tz~YUsY7YgYZS5>sv&M&tnJoU^`67qAIAHPGSA>Bg%^v$Q
z_YxeidFK$tSv3)w(8I3(2_NtS7Vo>%57a-@X%&@te#B?p0gKm8ds*g>va+$x=lE1U
zV6hJ_3wAft=zLr+Vh`S&?jUQ4^MJ+s#_9-$n!B5k9a4c(YmD1pa<|C=i?fUJP}h!o
zFv#@hRlY8E%d_17e>%1QJw!&J{@0tz={CzY>p#Z^#w&52j3y;npMCc0E6v*Ls;IF!
zGGZg+72sr&Y@IFL$tHYv`Yk6ldp+}N>^yai9be9PIry3&o0z8K%dFL=>~5L1KP9$n
zza3MP;!DBQNo2j;$){tAo_A6^y8Py^Jh9<dc8rdWF9D-dWFvuejGE1X#?4t`16Lkf
z(`?7uq<C3wV<^A(J}P~wI`X3HZ5ZY2f3>1{l-1;QvOwLUJd*W7H{Q@1UzSDT;J%#{
z+CcBFI%MT<_GMNFX2)wW%#E_9;l9WBW%05T%St`4+cUG+U#o7Wh(3F3!yO}ydcop&
z4LJ9Z4#~Z-cVLX1&os|v%6UV?>-AHNKX$NEj8Hd2*L5Dq@`gjt<9!J3FEaMw*myPi
zuvB_iwe3UZ^ELAkd?*7J-&-4e<TeAJTjR^YrYf6cZaYbw1~F&AnTKF#GF7D+8?Qp^
z$IE&Gbeohp63h(XD<u;vH_jQBX8jLPHYr*)xmo>KosS<sg|FD+ctf6MzuEn3Gy55Q
zIA(u#Hypi_&i)%}gOBeq%&OS@cs=@XnrtO1+i7JL^-lX>Eg5GeM|WK+xc}8+Bljo7
zSAzQ**<wld+*?5ZQ|_q@9qtQIJ0Nx0OtxR%P#a$NV<W%rcpdmHk*!^B&u=CPJ(CE3
z+T!GXc(0Mi8Sxe1aiy%~KMjx8I;lxNkyT{I%n&?3veUpb!D=6_+=KrQI2Yt~b(p#c
zxxe?Te+Pul3CQH#P2SYTYiDYEKZR{Ux`_b}9^58_ed<I+!+;??+$(*Uq!YH!0i(Hs
zCgoRkQn2muLcg_eEi&|Q9K;m9nXU;26vOncS8?O9Cp$=(INxH5aaCJex4RBd*)-`N
zsN7S46vXaX3Mio@Hc>4#cCh>Ziu+ICWgkB>9iEdZUU9$=Oqv=X`iAkya!&-Pv7t89
zRbsdQ3%3^^?Eu89YY5YYYXE2C>w+@53|cL-kGKkO&4M8m%*QpgY>9iOs|bH6pW`4M
z#8qVBb!H%840e|t^Oc^>9ldBet_8SvC9{mU7F!gopp}x!Lf#etFH!znRk*xy86xC{
z6W0b)|4>gGK%gF|$`$QFphaNFJU~JB11<_bm-&OJwcQ347tjg(aWEGSXkyB-tAp)B
z21FcM;ioz158@R7h^fZMljB`ma9jHV2Z<8bE(^0lwWkHI%p36fgI%!8MmY9ZgEzEE
zV3fMPi3e<4=pdVkYmeyxlikaL?E$=VTH2AmBMKYZ0xY6(Ul`a-Or>|hA3tF8X&8u^
z#I=v_Twb7GqI=c28JI|LczAk2!|<CWU_Bs8fqF_oj!IEvfC0w4S(OCW52*Y<KnW;X
zEx8D}{gd(ILHvrH7(W#|<Z80Mzf!NfVMyMFbm-gSw0!bR!!C)+;*H>Y1zFo~zRmUo
zD^rf7$!C&~PQo1pMviC1*W~9cDmL3<=w7zg(-GYYjNM?1cMIE74oF_uc?cin@VYmR
zJf9L@4W8E%Uw=or*jgvzrI!F9*BYW2SV@2l=Yj05Unu5D_^huQdoVq|DnIk2*ev|h
zrHwsriMP40#`^)e>!!4enf=6-29CM^|4fCPNgf6g$JY<y;{W2&|KE*(Tq<sv$B&Z_
z2ULYG<mY8V>~x~!rF6#`eym)`bMl^)$D5be%z3kmX%&$uYEFR<COHhBw$Tx5&g`AH
zY{G1zErDzi@=%*S#0+HbKx}}thk{;k&I93)b!tkd13G2K;5N$^%~}KCF1y{Oz9uwD
zkAKKLK7Tib$>JV{;gjk5cPbE6zN!2a^}nX5tJRBv|Nn2GL3RS+^Cj(2ZHeaBuGOCZ
z)F&@@VI8oD%w?dBD8f@645JVl0y5ml+v4#2FL6QtfQ5kC5QMXcr%Syq{6H4?`YWQ5
zrf3LKC0<dzfJt=zj^pvmDY4F<G9ekJ2J^`Y&M68#uNAK|(XkWsjpTjSr<d+>h>JRl
z-j9>_nZ5Azq_((^34hMtC+{=MBsTZWVtoEKd0%#>6zB6|)Qio))(z1%j}N_~?ZQRQ
zVHI9svNuj=vm2c{3UL-L4L8$8RLI0${9b|>pD@>uej|KmatEaI=UkaOU@E%Q`)n#U
zc*C^X4%%z<_-G+5HXN@B*I%)D`9Y`gcDYw`U)!&e-8WAQOM&Wz*$(1^_b)r)#Q6*1
zVJtS!2BsWP6xA9}m@9(6=JNjzMLV5btNur=Q$F<wz}T|*8IYMeNVMNlUoP_`r`c7@
z<n9}5gYW#yAWy}Pi=U3(EGMh`-5Z(rcR=PX7c+_b#@g^%7aO@fGJYDkJ((=+FSjQ3
z7NtFU-R^0f@<Y3*Y>Kgb>O3QN3*zg*-5I2<zuaYahGci-OlP%^!2dH-jr_agYr%gW
zY?hg}mIE0snEWCi<M6uI4Ls8G{}8}_DevR#zYM5;9pwAK;`_#@e%gO(4W6iVWEQV<
zrdbxl;&a3rvb~GTu-O{+S{*RTXB7WZ`Qss{t4mL$2P-{G8d0B@g7+`sf(FI<ZVQXQ
zururJkOPHwvu=ipw8&8LyQ``=g}a}I!9bv4a_rP)D3d1)mldI45Fkl4zAYS==TCAd
zmd2jZL$$s;>O;Lnga>uNjLCvn0KV=G0Un<9<_~gGy7AHU9Il1{S?`N@z-J^JjCKTJ
zLu;T#!>HM`0mDXZZ2<je0ugEqh`^wCHaM`ZvmQSx*j0qQZEdtr1FZ>A=&qUq>mTxm
zA*u7&Bi^My<~9$^X9jyeG)&3Ou$|Ci$+W&Wt9SYNzg*FllP{}3RQ{_h&v_xnX2hGY
z-Q~gkAuE<2ki2jK(AvW1$7_T8&oyj+vGTYFJh#af*3nI&)R4EL90bQ4gw09pD38NI
zW-R0acjN~2BoFS$tQ;8!vblN+dk;7&pZK})JuHr|2lx31hsaWyIWRN38-^y2`~3@y
zeV7?Plh1$2xGCFk2w4T`faHZr&!s}fdi*{E)Aalwq+X|}*8%xE3Z&jQwWZpPIqv~q
z+?dZ1kV^vB?MbXox>+kXp8;h!1E|W)j?eex5^W6aSS);VJ4>c<k5r1%`R8J-P2%hf
z1v^ko87h5nbHVo(YTL5ArKm5Hw%`FdJ0t=qdt21qZe@$q$66Nbm#j2p_jt1{vccOd
zY9baqCWj|)%e&bM$sE$W{&&Hn)c-$FMNwvD;23qQ`Wn!?pC$j)zLd{t{Kd1ZN5Juz
zoB^AOh!EvV0^JcR$#VcRT0kcP*vQ5ZjS7HVM+N>8<hW5$wN#kFhP{jQ&d0YpViH)M
zRe`XtE#PbQHPfm~MQnXnOlR_HFw_mXxNJItd!Kj+g;$vgtQ`bxhN$s16oD8W4Y*-F
zWx)!<zC04%<N@c%DNj`aggrD<Q?)r5b26&4qpCWTjTSHJ?m+AC2F~(yLZ~hE`hDI_
z!q5K}X7Q}4nuMmdyx4gpE}kKY^|7340VSbGdo)y37VJczM1;m?p$;mO*&DcBFwAOd
z^&)lYLdNStG`avKt)?Q043U^?c-d~I7>%5WF}iHC14R%s>J!=VVLk|;r<KDb*%It@
zPoP`>$P>Bz|D>WVfc@`9^*9AZ>;Kojn&WMQl@8gmDXGVpljf)l{NN25YdpI)c*S$=
zkw{ldQ8eJ&QrLp*)MlhvbhE#~veydnE)SMHsoW2#43R0Pa>b_WxgiF*4iT2#JPFih
zb9GuTMz(H`ib~#x@VeKGeHa&SK_3>%f_>}WtU)<T?+r@tEIN_d&Y(O#V~m}{7&qr>
zjLmvGGdP%IxVh)%z|8D!7<6?~0WLO-F<<{xinf&8puVRbr6BYwr!Q2m_akA_D~&y`
zds|Fw?T>BgEoOes(K4kxbjL14N8d~T8Ad0zBHn>cH4~f@QkWygPW8jY^cIVI%gsKe
z+)(&{U6)RXpM^<VLOi+kNZy3?7K>MtGIuG@4YlRh9ruCXlceM4`?P8{tz_(nZ?PE2
z3|2;EUk63|v79Dz;_cwEhID4_s9-!&1t1&i?OQDREsHxg&;QVdb*ldtC>s@g->ST;
zj#r!1E7fON9e}IIljLvOMAY}ZM0+BqJ;Caxxef#tAm}yQKEEx>u=i`JJO9L;qf#&2
z`G+M4ywoVO{aD8D@TANv7K8JT$uTl-@@5S?#hSYu3_B^qW}BAz&eCZ#?j!{H*(#9Y
zFY_G0f5oHBQl$A&spf<d2icB0`(Ys9;TG>(qzos4dZ8hs#xFBpe8|(N-?t12^+Mo{
z`T*$-;13i!WjFjS`FOK#yu=3w103WH9Z^3I0dju8Q;|Pn%q$0p2Ec;D?O3tYY7c>&
z)nlyzJcp-)t0B&R^7r?Vi6L`fb{P%KMl3Tk`nwb!O8yZ$%}N32jJV_g^+>Qt;Yv?9
zjFc`!IMW2-a72^}_=HDEe8l#!)L>v^7&yYFQ8fVwAk|SZ6#wDp|KW-@i`1)^DnC~a
zr;8TG<c-+SR*+zBheXzMCi`io{QDZaJuNmj-o>}$+_=wn*}Y{U(3{tYZlNl7%#GRX
z$FWo5LGa!{!nyHILm;wrIp&gppj>!yn_UmihzB4uZNyHLTNnDjcjaOKQ_0zXwd-J2
zyc4fzJ=vbqX`lPHnEQ_EYcI6v3_bq`kd+EqNp3?uKA-j@t3&&XzkM+Rk|QAL<+rni
zn~e>%(GGTO7d(8LBQ__qjm*{(ZjP#iZsKKOqXmyh`t$ABHXj+4p3Y8hs9nUR7Ca<p
z>a}IwVpG)dLdBYb$7gB2%)^rsI6VBAq1sna|GQjKhoUa$Z1qCzoA@Q`uUJ`pGdr~;
zx5P3J#HG!iZZj^lSwyPwB6H1$FbxFcu0oh}kVR%YKQhU<vbT=gIv1PaAL&1Xy1ywN
z8mxrLOq^R1AZD}xY)v%mYo_rb<vxFBc-U_9-?Z+sPcq{eoDh#<{FcfhZ<(91vN}@}
zl3DtdmXp=4N1AKHJAPjq4!mO+sMzFq1pF={jdDl46~E?SO$*sxP6bf!uRQ=xe^<M)
z_(LP7lj32{soY_0#i^8<@V-R^q*<G&n@kyftv1|vg@IA5IalhsYl?3gtgI&#?N(wo
zCYRK(-N~QG4Tl|(aprOP|87OAL7m<as$aP~m5I;cZvY2Bhb@+ka<4Qw9_G3~<{iVB
zD4Roa?Xr6(+H5beiSe_+_$=A%$3DjCT9Hyc<+aqt(MQ>_d1!nq*gQfuD7cSJs`iz7
zLU0yVM7!}b9D{y%&Y05u5i=y%d^-JI3PxnLCC8@4yTQynS(Jr7X6UMw)uFS}xF=p+
zX2)z%d<&ReBn#@&%dAN!Fwe~7wR|wMydijw!-i$P{=cJWRmlJSh3Zzm^Eq7cdY1eN
zb+F<iQ{;BV5_e-T<Zp48Afz)gY<J49<oW75GwzSEnF$52v_#gln|w{?^VsT@>Wn`S
zXpC_n8Sa>QJcXdPTr{)d+re}h31+)P8f9cN3p7=~FSQ<AXM4+$L#ErYJuiMP*shYz
z1nC=VYUIz>^p%srtRr-h9rLr|+j1LoqwZiHb1KMHg#qQnbKE{M*_$%ma+YI<4ck=z
zcPY0h`2Ibt|LfH+sSl~20QqAB`7(I|kwC|5r)rmJ3GD~k@AS*?Q~#NpqqCoG&i^Lw
z%zB*v%?;VPYZ}hKb5P2(XP@&QJe}^NEcbNh#~hkMWrk@wMQUgmiYE;FFmSc8B5FH;
zgn=OT4j^9pJ?<)ZNo&Z*kuY5YIUI&++H?>fuHQ3x)HpqKT!aCpx>P3UTD7;%hX5Hg
z1x{epX7>zW1;22QafPB8#J{)r`DKF`6bde5juxa1K;@%PIm_eQ1k4ijg|-K*jX?M2
zc9`1HL_<(OWE{$d5BJiIsM_jYRO&)*;Hu5I(OrU|M{aB%%+m32ADtJL_m#GLx{+}p
zcyut=5w16@;x$3PzneCZMDBDQ!dw8j*lY<;9o|A%_{E0G2267~$OPg#tS@@eHH3lA
z0;q*)Ou+7ru+b<(ND&fM*<B-#bPynf3}J7RW-WNSFo5i%BgQ+(9QqNJhX7L2=%a&y
zM%kxMy8hRya}{;2x>&7L>(o=#4QjjE1q`6`)Sc?3>ecFA^=5S+5P|lqPpi)%M(9=b
zZS`Gb3Mu3eQb5KKH<?Oikhwq$t|WEjRO}q>q>F4J=aHS{QlJO#MO5)VazEKmo+i(c
z7hz|3o4iXt))d$q3$!sn9hj=kK+e%(tx~JQZnHsa*SfSV+IiYe?NaS(ZLfB-wokiX
z+pj&XJ*T~>y{f&fy{movsqa834Gz)>QZt<|3Hq|2zZUd2g1#c?Zv}l-(ANb0ouI!L
z^mRes5cEw(-*Ub!=pO|AqoD5y`X@pEEa+bZ{i~qw3i=+S?>j#b^g}`a#^^`RzYF@Y
zpq~i(4?+Ja=)VO0x1j$K^uL_C6iQvHiwLR->JW5*paTURB<LZ69xCWyMh|lhVRVRV
zsG!3H9WH2rpiV(uf{qY$q@be&JzUVyf{qdN2u6=|jb(JKYn-6t1wBg8qXl&fIziB5
z1f3}8v4Tz#bTXq;TvG+DV|1!(nxI93E@pI^>o`G=7xV-{3k99dXpw7%pfd$67Ic=N
zCklF!ptA*?L)ZTxC92^2AL=;(d%6;6U#%%qJ^#N*MqQSAA~Z*;)Qcpnuo3o>LQ?S<
z)l|U`8ECK-!i*C^qIP9)vnSMojjs`~-(I%||GI-wy7P_P6H^>J)Xer$2_}q|Eck0J
znW(0Lx(J$$vV8E7SI0&>b`<4>1GDB}%|Ttr3q^<qvqCraA)d7biGou-{-$WBo1$;=
zfYj@^J7U}O!k5u<W;ZhQbZ@562<+9|7#rx=F*Gj>7{v}d21?uk*ey`7*bM-I<|yam
z+DZqaDKZA-W||?zBjd3#jvX`e@Fa68f?bD@;m=YS>%C1;AI~g=K!`|bgll_{mbr@I
ztdH#B`u{dXTS<1Se^nPL+w#BMZJ!uBB{2{>Q-iF+mm)gxv9OXu)5*O#Nz2C_P2H!j
z(SHW3ZR~`^0Q8_lw!DX-2XuW{^}s@s&PME>c=EG${2rTdfZutt5S0dgB}HXfnY#2V
zf3o9qc0vQ6%Vo_j20pWuy0ezkPdjm@9p}d<2smFP8((SQ+_;n5t7BQHZff~oYi-!2
z=l>ApOa<R}s18W~w-G|tkXs?0&(k((58AF>sSj2-Vn=7*_DT@ugpJ7$ryxC=P{au7
zCropyn$ih%bP0gZn6~oCY6pOnGj7P1&tuwk6;vl0rp0tzkv;DExWNGo`5d20&wjds
z8PlD3HY*(A`bU4BN#_829!;fR3d3bP>-~HE>3wpi;m@t}29d+Up8EIxa7vHY@-16B
zC|+rWH{gqMb@apjJd>ILMDJT$y;N9Xe7@hG-c!@SG9MsTq51+jAVLK+_S8Sm)xr|5
z9!R6XAgst?H)c?UHxeE`Yk?+FwF@^GZY)B;@9-0sIAVw9(k#6j=N@H!_$mE+2umaw
zKAWEZ1C=p~b{4erLxBG?MtPVn?bw9GVc5pTlhfo3?R5Y)iwGw@mO~k&%%&zUq<3m^
zpeA^3bQrc<^1?&N+}~t2&JRxv0h6=HguF7T%l*_FVgySWvV=}d3<gV8vMwOQ_MfE<
zD_f)23EPI+oCC21i9^BnN)ncH85sD^!ETp}v2WH3G)=%#5IZVy2%8F$xJw59Wo&v<
zmcQW-K4izCD=`QhP9aq}jj&OZNj0EmFtE-%_WL$marysVivMv38K!Pf?v*;&KjVvH
zlM_yi<$5v)3tyrXu;iwrTlhuR_EKvzsyg+SRR9>dt~Px3twsgmxI_UsZ6+rlJWlD<
zumJEL!i?_b50r~{dpWmVw;Q<~mlzIiR};yC!#RvAOT}9e0L-6<m7sJDG5$rl`~qZS
zo_{Ukjsiyhjz|mxe+}e#xiypnf6TlOa7BNTJ;NVX+%%Ol7c`YanVA?0<~m5(!DEgp
zU{u^JMe;*?2)3j$_yAZM1T6gaAFf%Tai%-ZF^nj)|EWU}|EFG{zCemeLL2%2ZT7!h
z5_S%gis2M3fh^krFi806c*;D28krC}rp|#9U>Ow<+jaq%Ng*8r5V4RN5{@{#<RWFI
zAE?_Gog3w_wsLtkx9HFc1Pp>J3D(*z2Tzh)i&WR53u<`?x*Lby3Lnh&s2;Y&v#A>?
zJpqv}bk5n1*ycRGe%;$DVn;yL6d3#}f=Ghub}#J)_%Oq5pi|Geji3KJ6>UEGCj5G3
z%FfT`XphZF9FEO%qpWmf`?gc{4gFX!3qT{vAXDgNfUcon#S-McmGc6UIEN^Dp6%z$
z2Ywq{==HVX;LV0D6spoFuznhub@29mDqmyg0EF|B;AZZ>9>SdEsef!9b)R7JIwO-s
ziIHH^CtHg#hw)A0pHAbuo^$8boaL??jVzB%i~!3JMh@P%QbQpk;=8-T%pQ(I)bN+!
z9mk6i?J=@fns9-=vq{6jlkBKESmkc;GEn3e1VB);jhn)r1U;fu$`BU!kp3cd;E<)f
z7w4Q{=mkCh4^d_+_}-!XRSl@GlXc{E?Ht=(K=P~#`cQWc5&N}4;G{&Np+Hfc=}&H0
zGe*qyJ7Q}kc0beIHV-trNN8wSgc-X=%s<zGlFpe=TKUGz_S#BMR~N-x=iapwa4@&E
z`FQgSqYj9N`E1_kV8aIHZDE)+0LI}7tRoiXy;ZX=T1i_&Hf*FBs6g~&8F5PN5XTM)
z@0od8*uGf038p%GYkdI^0-TVtOF_UZsgD=%JTODiBfTNYIhhwb+_9rDuftB)Wjao(
zfWV6RUjkIr2n$vM)*9;Xpr|!wMsPEOHy^PeMjSf^<drX~0i@%r95o@SiJclH*;_i9
zuK&@>#R|S}QGTI(qB_;%)RoW$u2-K_e@O<B1;k5sk%!6Ofdo*iZPRYiUeNw*yF2vn
zgRu@Wi-sy$oOYvF!7qF!u_d}DI!GCPj=e(U8amoRj;Gg9%a2ao8#cy43hCbs=YVSj
zk7UarCAbdfL2^SF;&c^G>%bHmu0<vP+Tdn-fHU<CQhIL@2G?lOrcn`g4QIs+Aek_!
z(N=xnA!A4CLdM4O*tW6kNCs9td+8J&C5+xS!XM24M=^Vu1~Qo?p1a1f__1Za&dzR>
z(ekyn;_51#kHC(_5me>}&KJr_pdaie_f!X|A-IWghh%jRO^2tU1q~6zAHq`3f$v?D
zcsIr}VRV(R4L)d`y1}5IYC^s8%&{!b9*?7M-^g<vTtFzc#r~hH_24?1MRwv2Iwz=+
zxv->=mhQlBu<v^)ju}>4Q`j%IM4%l6xUM{r&!(|_h6DrMIHa0bZhgaMua~(8=<TeV
z6L{IOv23O^M7zK}vi8x&5*qc#R<x&yn=;0+ngd{nP99?yXow-hXro&Ld-8a}g(>ip
zj!ray1phw4<R~6}IMxEmoKC1lkG})aF1)IT>ljv*-8H2bs*KgRbxq|HWr}X1)D6Xo
z9jGi+wBtyZ`Xgnbx>~tSdJ+2*M`jU=&)zsd;%NCYq{^lIN?Km`WH$FtN{oZVwUn%s
z69`jU&}#w`uTtW5&w95UM%BydKZ8&eNsJw=Y?t*)*s<x-t!Obm8GH}!#1R;uwJd@0
zAX!DJyptMWY7um*T=>RN$eVj>!(Aq+d3It9cnp$?gC;en-!0Q`rpir@or3eb3@<fS
zpBR0Zvg0t)eDFA@-ek!`BbyUO{c6E7^lDFSc&o8u8JGXZE6RA~tLk9&eDxjDN?z51
zY!8qV&6i+DT<-S*UB$iB7jA-}Q(VMK-&ocnTo(=f^deYzwj$)L7Wj!>K`sq_M=t2h
zvN0=h3{6y^tW?0~Eo|sSU^+&&)Y}^J0t==EcGG$o-@JiVU%0uQAt8?V{uT$U4;f{1
z%l56rF01x&47VUu05~ols02Jfd&IqRD8H5sQ{lyOl#$sEO#6;tXJ^FC!DUA5mqP)y
zY=@p_OMIaYiuT{m@Mya6mquS<qX*vr1og9cd^ZLf`VN3=C|al|6y;j=h)25}F$p)j
zRnrXN+Omtxb`$bO>5!t}XN!BY&)b5jxHTH4srOv=e>gVOv14p*uhmp`$fmkxwI>vI
zgAIz5ia~FUMj~ER*)+^Ddg70GAU52wLn0!^awLqZrVTsvUft|=V}@^rL>HlEgBEJ<
z!WwADGGGinMbG~M$_0wHf+W;Gt26N9r~eh3l9+%)p@KB@_h4rde|mXNM(CS+`D~k`
zJvJ}lW@oIozpT>NDJyDcC790`Mw30Q<dWE|#L-~BK{^4M%IHanEk%HmmeJ+K`GqrS
zTCFA9QxZqzWqQa6+G8aynl|D$cB~dA#)H)w*+Q{)vL6qB%dA33sv7fm-EG4#KmR{e
z)N1v+%7<hmGIxHcP0>&@`~U7&qa!8}b`SqF#~f*=M@+~JO3fWdWg$<P#pjKh*X}_4
zOlAqf_*|p(KpjLt<qNdY3<kv4`Diu5H9m$!OgHUOC(6Oun>t_)a#;=x?GDdYXyG9r
zA~2ada@6s1-b3T#t=5ev9QF7k-B3?M%-%F=!l@3Fvd(&pth8RL@uCz^4YOd3I!O*D
z-^8@>P=!>}4kH<o5n#fo_cZgT9}{q(3|aPUo6WPx+VfK3h$8V(n`ONhg^2xBSc30X
zBtVRE%OR$lI%BrW(&ngJnEJcuykY^iym2;_j^g_NF$zG_FT(j>sa&ZXle+S|5>o~%
zo#c3EJrXb^900es`1`QkhCfUw_~5Y2ihfaIGIr4wvQg^xyC_wtjJv3X{Y%zRcH#jV
zKWBMHO-M`v%O#|yzj8q)Yg$Ho+g$C-c1(^<91A8-CKdf<lFl?+OI~_I-`oYa+p$-c
zm<aZorC|$f#gnWJg4x>;PkF4yt{c-5$DkWkvLzsGXRp<+XR`H4Sp>^^&a+{bp8tm`
zw=2r+>NvGWeFa&(*8=r-xt2)X1wI$QN$$cH_6SxV(Nc}9YKv0Kb!D*2joNj3i^PMm
zL5>~6C3bzQ_NaiIo5t*(TJLG`1>H-N`FJC~Cl#blk8o;!2NW%$1U$ZQ_waQd2S7kF
zA6uq7xf8WI7)5F2l29kGW|3`=9xbQO4z^O6gdL2-Pm`1tELxx^FH3HqZi5Ils5ihc
z?tzJcThoVckdzfHo^3vN#puvOZ}{nQsRZT$<>54X2OHdN!stGHeeUei$&&ii3U4sf
z=3@?s;hx;b*k~Bjp$#xuZ}=Hp|Bon2L_426p}wnpbnsXD_QX`|kB5<IIf)c~1z5OO
z!{Fr@eYO)2Ynf_!Y)YIkM1dtHHcHNzYmj0LJkYu?v#bISm}|xhFa|2fS4L6eJ>;HR
z?)4xbf-co%K>$ftBEcu%jqu!C*EAkQ;|b`h$7KB!<>6s8v95#uGg`4%B#y`6cV~y}
z+$+yncib#Q8^#NMa5%q~0M>&?JWjKK9Z7$S@?^bjmlh<BLzmjf8FEsMp&{!onRk$y
zU>o-3aC_8U6U08%#yzLgnD;Yv@mgMaQuGA84nO^8cqLmC)4={HLZ@Q(61ElluBmiF
zlIt%$J>yEC=f8v0Dx{X&ryZqz?clHeFIxD&I|6bR5WWCuO<E(U19RP_E+$kIYXZy-
z3nr@<tIqkmtgGW13j&!{WxC6*phl2(PYaK5aQ?K*fs&*d<)<|LF`w*A%cljCX?rNe
z2iHj*kiD2W-uXtq8#JHzhIVieA>1Y6W=Vw3AM^8nm!g%D3zc2!GwLCq+3eh!D9Z0X
zIFs#zGY@O}!M8H*gMcEKiPn9xrt!>&$V@9~aRsb+O%MWR)l*cGx{ydRk-xNf`EfSK
zNNjFm271seYkHRHfrSRzces`MqauN!NbWk{$M4wlK0Uv@LmV?NaV9V(k8gJsRR$n%
zNnO`<f!*;Po1Z8I?_ODBRpxOA@8*5Oz<ZK;xeGTRYsWo3|6R&W3cl}F_N&8y0oDz?
zuNTQUQcX6KTgdN#(zQ?v0|D@-pV`i!3~>ONh^^*g*W$ik@b+p@@dh8|MQnDRzyr#%
zmrh;Bvl=vDLso7)j)#g#&OX<49?&;Uc48EkVO&(=vQkPKf}Mcn^|)uwo5#52YKe$U
zY-HLBTN$%>n`R_az~y;8%+^4YP@7N<hh2XP50oonV*t~6yAQy2o_31fM`3@dW{>}~
zOBeE3KdUurvqR40fO=LdqYu;wr)mWb)*xEyKv5mm)QLR!u!sc-rivE2s}}J9$RZXH
zn0ghpr%+`L_KEI5b9*QVw+xs4Pd>>(+UOXY9V@y^r<V9>JODz_8M=~dKA$R9{-hcN
zYDVy8@GcO#helZs=JL=#GuRb4V&RChXZA%=&gSz<az}Q};PU?pg{*-5KT*5vvs>d|
zwETZy1mt3w>;-0vrBs6j7i#WqhTp6L<sayhaQ?Ex5o_#^V9p|RQ`b3_lk3{i7*;y{
zd6kdBv^k&cbRf5@KS}`2D@$#QS)y4TZXOQ~i-MPh5IbL$vvJ#xpoJ&~mBX&e+e=jb
zcPRHL+DT-Ex*b3K4}8Tc5+_08+DO{+WxNBDpjis6q@GijTTA1yDRNrU?Cr|#a@8@H
zn&PZ%Ke6h>iRj8^S)8lP!XwlUvrL%&h|Kzq`jNNV^`|K@3x?IhAbjNS-B_4JWo4Lt
z$Un+^*HBf<(ui7-D9-x?G{3c4R@fczf;5GQ<|%IS_<7MkOu%d|SFSn7PV=JY{~-zh
zKU<a8)LQk2WFGkzd0#s}zuSOZ=xOH3jlg0f*k&O_zEC8%70Fih$oD`@-4qO%H_*Z@
z%}eBBn5CLFo4Hp3<p|Lm2ybDMT16iFX;vg^gH6GfZh%k$*pbS(UUV5LZ#;3eTrO!{
zs-Nbq5D7g9AgT9ug?t>N(^Z?zshG}vAY#Q+&qs=hT^6E<r2H*bEptH2lRSgdwFZq*
zG6XmCNae}nbHX_exMT9sH!Dre&<&#_=6HgIeyCE3|7-t*^k1os#QHx4NB~!=MaoaI
z*#!pNj6HvcmboVg$M^d^I9nUMfiP^Yt?q_EaC1_NV%1|p-nMWsP>4t!D5{-d1WcvQ
z4_de_K<go3PHysreGy*9ZN!b}#vkR}r43!a5TeylA{A}GKS!&JLFy~>p&To`-9^ma
zQUrr^JwnWJ0bSt3{sdv^c{!)L-1Bi((^jjgd%ZsBVL@`kUPDOsMYRrquVtJS4P6k4
z{qRa9hfnV}tbv-}#L$k1{TPq@%1TFUVpfl|*zmw?sTaCE8;&1hI4*B-Ak-x@qi~Z)
zkOtX?_YNou`1vc~5=@S=xuFJcOSCy6#@+QRu>X>ra{-cpeM45}8Em7NM>XB3t=r0W
z@#oOkx8<@ydK+T~eHxKi(iDtF%*KYvNDhE0q!T7zZ@2^AUK~_N!;1ixnqv5Lw&Dz<
zjTel>kX~|@1E>d?hZJIc$10ECOJ}K3!=RkeIZYFeX|icKO6cKCL^KDy4)jL0v5sKt
ze;CdGR|bWFufIiGNd88?r_3Z9iKbqqo~|CFysmsp;rT#(J8;aHr$w#Vs|#-ShA3wD
zNi$~5DB=eeUU)s~K+)cj-=djywq**}ph`vIskkjUQL4SIk?Fy<HtpM3*OP6dU>dr^
z5pO5$EwDlXk5RM?DV%jae~=C7_@f}<Y_nw<btF)O8RLT4*6b;&^T29F>-nMnGi7<q
zlW6++leA9j4mThWCgAfFRro!~IuBwii_)@>^v=VON2zYLzq2_Q>cadE7gYw4kBdxL
z#M8BNj!(gzrS{Xk!PDfSvBB_0cLdu)p4RTg<<%u+Ma46i`b;;J5_otp9uQ3UT%>=i
zrC|qN$|U~W>OllgtKZY?z$ULwvJW^-(-;*&>q5xB7tzTWhZ!@bBaDZ$XZ&z_pfxxE
z^5!AWmN{aBtjDu16m0Reb)P_Y#iA9+C}UZ(Q&)t1z<`IORpZ;jtZ3>$yq1&ZXf_#J
zc#DCeTI4-@TWE|hmKoL`Qfk@$dN_6yve%vmCU&D(NPAJ42T455Y{(#JapX`SZ+SQ%
ztNIl@XW48mXx)_>Bm?1S!JJwa1+Xn1Q{!#%b2Wd+I4twV<&M~Bn|rDC6uqaZ&PAeh
zIsLg1!y>9A)_YqD%W+Uerk~Z-HsowP?_Ar3RgLs>WdFeL*HMJI&CpfZ`XBTv*Z+U1
zXh^<Mzpnf;n-l+Yd@bOF=0QXA$QGzHh)EVf6)+K)ciECK@V4mQ&wik*9-5iVWy)=z
z*qQ_uCgy^5gtO#PgQf|5sUnoMty$VCtvqn&S#~ynuEZSJ0FEG#w58A)r3T-^u^oyc
z$x^7t)N{{7sfGw-!wAdV=yg?!7t`NIs3i1lyFQ<kn2ndVo~+Jem(6xVv%O!+E1<-F
znqL3MPWBbGQ~fpY9G*bMugld>e`#-W#B9!3-MlTzJXMOVw4g@1_v0+UBEVrwy*VqG
zK<`?SKl6ZvN!egEtjWf<n@)>GAI+N#j(d8__u++CXA?}4p*gcjU=0LMDq_?j$vVQ}
zFUsVAhNRx1*}MfSHstGa;9a^)T2K|NSp**}&&KDFp_}F%f>}P;{!x<0cFZYX=$$|X
zS(e8sX?9G~DN^5C;>1<T<A08$_J6;6o$|JFoZZq#oWm*D;_?{h08_PD@w0R-%U;+#
z*ETw4W?~_@KaH%+-v%w==;jMGtutKt`C8kPba`R{n2wT;{4vcyhICsh_Cx?7Qgp}?
zw_#<9W7GVO(%qmIynejhA-ObhGP)Ba-u!hZD~Ekn?tS&FcW$-oNJU~kI+9lhl!fOr
zO%Q>VxySx;<=L0*)&;l!|3y*$qHa*1N0d#Jyrh+CH`wh0|J#3;!>%<f0}Ew9I=XCn
z$blU*qbWzKMe~tp8534m;)qFDVU11dL7~<=P`@T?ru&{?<#prP4{S?0Q_f^)&mlh!
z((bCR`rM9deJ9K^78814K+y?3>*bQM({;uyT=hu<EBpU=i+MxcIqX%e9ZFsX{zsLf
ztx>8-v3j2J{Tx^L*2H3LiFwRoDCY5ghj#z!>CDl)vlC@#9qN9*Qa~VLn_r8C%)40X
zvULrw*c~O)6Q$sMEm@IA&NGUAi!Dx@RLRhD#Zh(~PfC=4;}v9SzD{wBbvnU&ak@{H
zJN{(HC?+z@VxP$u>QgMj7_F2|v^MSzsla_Sy$rIld5m-cjOjm)zF{X~((~U1=wE#A
zQ{F@laGQFK`mFj7)bu?K6?}WhPsk^z1h!H8ruO{78OlNjX+#jEl-bNRPlQ}%7p`+s
z@-FjMm?p-eco|}7hf~(fBfly;+tZw42k{WsVv9%?s_(!y4<HMQR_TS=ml>&Dl^jTP
zv4x6cZ_VI<l8dFR1AN@&_AggivIFK3wAIU5?Q`_mJbF5%I(boAjd+>^;i-61#(k|c
zd8OIjX|%;Ga*(s}ObgT!x)GKI1Dk?~wFn`(7#3dObO7v=*^Q#iMdMn^tBx<uIvz!E
zXrYD~gGrJtn8lFvksv%=c(KJ2u?XYf_Wz$L+DzF0zoh)^;H>da^Qp1viHdxmsF~l^
z;*6JUIChWSiMl*d4vzDv<|C*k%UQEH%Nx}0YkzCkopp(&0LmOd&d#4mlj}0gb$y4<
zNb|Cm<o#u38Pt~TuA{v0o%J>^i`)NN6zybkq56t?q|%cAwHhl<RAb1_kcIclEDgyS
zz-7+ChM(ApkFmvx<>0!5c=9)mEkbkcj?cyN*N%JjdYiW!J2tTleSoZ<$3CPxsux?>
z<9e0Z$sgMCIWtiOKJ#du#SUl|Rg7VUi!)!N&ijY$K39^c<P#*1ija9HuoDoo5GK{B
z6VJp9p&n-=9t4&D2dSeKb+md8{C}mW{9B}5p8q}If9#3<w@{f^iOxRDY%izx-^^wf
zh;=Gqqt}4~+Wj))nZ;;${30n{##8%kXR|old0Yh|clzQg*2Of(4x6YUojb$iA=Vl6
zn5@3U8}M$WVM}fBTLK#yu)SWSC5EVTc*+!0EO`l!C7&{dy|Oc!9YCq=&yZ#m6J4uw
z^Z)7lX_o!$Hj##*>KfSpfd5}Zu2i4J5BFuUQa2~+umNhaK=;OTy^m#=t|q~uSH8D6
zv%zm{VkMehnCrpT*R++LulK}q)mfPLdOtnmgV(X62I)ToqzlGyOBUmpw@YJXi4_=@
zPFak4;~O#Cogish`2Xy}DYCIvs6&o;1w&_<6?I~w7TrKJP5#6dDRo#%X|DT?oiH6M
zO4NXF7<2O|5t#R2gDGQi#>f-p$_{$|TMadr|63Jp6}eh{LtQ{qf%5-_+6ikgFky0b
zZUduRuIxQ73sUTq5R0{CdpNb()F7+@K`Egiwb#`60zj<;xJqe|2dC8Kc%$;%zYeik
z<*`YL)#z14uC{x9ugr_gU=FIwcyf5EtL+#qN~{8-D|3Yg(KBk6s<~BZs>lxFN$zzP
zlC{NkbwBB{V|i|(fh{FZ|7VQ+aad<z1+h6gmA8g0u;YDdq8_|g<r-_E8*aAwrgwDK
zWxhuFc@eEjZgo;o`F{jJfARew?EfRxdFq+!#p?Y)0v$}|lJm*!s0QNJR%l<=Zqtw%
z@u_@q$c8!#Yq{Qw%;6>^y6>vzw(dF$ySSA{m)oS%9{sMB$%|~(1NW|SForq{6L@cI
zDuQm3Fgm9tdnBPdB!?)y2EhFRbruJNS&kQDBq@yx-$-2^WNK~^&%D36R&ysr7K_x?
zz|H)*ZvL({;tk4eXRcM;X1~E==F$_YG8jd|8{!A33dIw|cz$CGpG_MqWG#So3nY^!
zUe<1d#Vkg-Fa}oO@^H+S4HjZ+owp?vWQQfBzJMrh*38fU+ZAm+xr?~e4HOFabNdDP
z>a;waW0Ff!a_RcsJjZ5#g*RdySYDB9B7*KLkXxB`QkN;Wz4W3T$Kw)f!7)^;exJM+
zCd@w9UtPLSl{<gB!H&OaiBrMf@?5RSx)GJx7iBijRUhoPV|IL^5zH>iH4s40Y}&29
z&cZp`XA6o3huAPk&wmGrDv0}gUR$8;`P{DkFBtp3GXiq8I=FGd3MSOz1Y8jY<QEmX
zoG;raPMYn6mQObaezC(Fwn7#GfJ`IS&`+8is6{Dh476;>EIan~nKkjF4Gxr)=uZ>o
z;0xN9GJmv*HSiq4tU5$_3IBKWC@-n=kp=WKcmeim4h=y;|Jz>!z9|O<z|aH$uM%pp
z%Bw-P1n^hFVfRwMw~J<JFp+KKk5D&t&UA=P8Q%_OU4X)bIIqVo^X1-X@}53`+%WQm
zy@&)uAecA^wz}7$t{c+cfWp^;f`SYP#2H8S`Zwg@vFsax)lbY#T_bejh~!h6n938@
zo%_(<$hD5xEct;jRT2XuI=J(aO{gHq3-36AM>SxKoS&q(H@Y*^!e+9@hkAi!!4S+v
z(N4AozKb@-%2g<=^o1iqTDWJ)lob?|LjP-Ra5{#K?j6Xl4dEJEE79vmDte)N#T56_
zh`V|U;1XH>l6zGs=wtJ!fI><%<*9XMy~x=5k}2-B$e*HpFJSq<1C&dt{m-ZVKs_8k
zex_eBlGs3N=PrcsDFKGgHfE+(L7}C;2(4<^Zo5wg&b?ZJd*P(o;1xe@k3_m!iU9Ai
zrLYBWl~vece~T3+)^n*nHv_b83R;|17B&Yt)5N-^wnF<+i8HyJ*?*zk?1I)=UD6w6
zl=nKu*a(`jw!|683LcbmR<LeN`)_pUzuiK4;rwImx;iy+I$lOz?0=a}L3I`(7Y0|e
zTHcjT{$H!kRn)oaVqpK)siz_js9o(+x2Wf-JJn0otJS^01KtOV;C}UK^*QxL^;Mt)
zy{mpq6mkeDAY+IdvBEQ8D_l$}NgX+rY#{BZBDe+7!#l~P<Z7~)+)Vb7`^kRtG<lA^
zNM0pxlXuC-ngV3u0&NVei&M23+FWh1R;kr#r)nFtcC8CYB<E>6wM(_DwY}QS+CJ@m
zZ9niyp3`2`Ue(^#-qk+-Ot&dzkVX(0?3yR&d_hkZbb+7?1wBR3MT{<Xl?YlYXqli(
z1YIg<xu6w-Rtj1r=rTc<3tBB`ji9xHu3)szwNlV}K^p{JCFp8F*9h7u=&6FP6?C1T
zrwMwxpl1krrl9K?-Qe;F+9YVRpe=%W8Etj73ED2GPtda%?Qr=8?G!X1Xi(5DK{pB-
z5;QDmM9`?9n*`k~=oUe{1>Gv>*@B)U=r%^rb!}&KyX!nbV}kAw^n5|TB<KZ#UMT37
z1>Gs=R|Nekqq|%e33{=hmk9bbK`#~bGC{vC=;eZ5A?THYUM1*mL9gce|9uM3f8E+j
z?dzZIs`{e!FGfIW1hUcb`*QyEB7|A@w(w87R?X0wGb=WITD$X^#SY-EXVeM%?&#C-
zST?8gKsLaNmR1F`{6=MAs>XVvA?UBrM;d@1#dM#aar?hl(OSs&VgIjHyi((z-9<5P
z!VB3?la~GLg!f*xRHrU72MI-$YY&EL->N+TI`RYK9zU1)gABWUm5-|Mw8yRuNzFFr
zN2mo|&>(iaT^o+vZ;1Or%y0`NzxA>S`}X~`eu=gYq-;G->c%a!4{z0mxAYkMFeA~-
zbf44YR0;b&P+d4xwYT&^$vUgl)|&;-+p3K`ADL(Z&+}w`7WO=w<1qRhaB1Ch%KLSc
zyEkjY;Wv!jjY)XG-5gTZ-w`!OGW2@>(zylIGuX(zfw%p>fj7GT2Pxwf?PBsiIZb_B
zorYg76wA9c(J@$QmJRO%q7<-T0={VHu-$z>5Bkniv>qSTx1Y1uw~tQvF+wwC162AR
z&n+%BKsKWZbj<*X!=$6Hw}F;vKwWDOFQU-FEHfFeTlLq|q10VX{}~1<HY#xzSUjFo
z$-TrnPqVMp*9=P;h4l+tg&DFsOjT>xw$y6nv88pI_~+`h#phvm{iQbCcAA+nU%wbL
zPkGK5FEP_<;gi;VuDae8j77g|WNbvD9gIyQ6*-QWc@N|bivdgbvHApK>(8~}v&)Ta
zjZU<ItwORqN4Ct1P>e@%z|vo!E=sZ%-eq8|E76)oscpjy8@Ai<hXIR^!H$$+<x%;6
zfErQMi25dJB_C+f?2h&?uFif0<WNZJU}E><{0ub(LlzJu@B^45LmN@Ko&vuL%**<c
za=KPVoVMK&+n!k{&Df$vXh99Y_E<Q}G7q4Ly$ElC{aeR5YyZ^PVU8U(P?tIZp-6wD
zWtW-ZPj?3z%fx_tswbuX&WPnP#j!&|M9<8OdE;CHSC2kxxEe^ms3-{Z-C!r+>04Rd
zpb_h1hdOqQ$jAFI?=-!yftP%suR|atBJ8LXh}S?yb=O6v^Xg|K&ZO)AP^C*zPgJ_p
zZ>awzXORQiZ0(wZg#;>BxUnYM)rEPr3RtUQidkC~reNPzq38|mNYI8eryKCOov5tG
zg!~alo$i1zm{AL}YsS2=s6<iYVKG)C#>*uK**)BRY#F-Amdpsb<Q=<4%oC#zs=Aa-
zO4iB|a!Av5t(XP;24L<|CwVy>Y(VKliVa>LYsx9-__S-vtge@NnlP2iy}}(oVqE|F
zVs@05AWJCN3ePW4ngKmr=L?~R7wgMtxilcVzL;(Lr9tcufaUJ+_(d4Qh_U^f0OnvJ
zhNN5#5X{wKS~i0BWDH&ZPGzTp?>m%VDF0TERqNHSK@WHj7JVPNmAs~n)~d8~HTZcC
z<`<7=ZM6uT)X9A9lO3drxH5>OF5eUfSxzrAuYwdwtu6UD^E~F)anbxN9vR!gcr$1a
zcxQk+r?m`#;7{j<YtsURQxR7O6Pt}!qmq>ma1v~FKudw+k|v<7#d*n%6B~JiYX{@p
za5LS4mce_BN>RWG0US2J<!m0IDyiSN{N(^O8ASP`E6UIWl*v$pE??Rke9Wc{0Hc|@
zjKT<hPq&A+dJZpQ*TKRl4Ns{GZ1S?FP}p~$zy|GH>>%4{vvl$sZYcM)02mv`Bz2wp
z+khyJI=>WExe>V4(Fm{O7oP3Fe8dCj%r-oL>3i)#paBan@QMh4_1Wv_;?OT0Ojt79
zhPZkLVM=eW3ed`X5n&|S%<B_&FoDN#7rk1*tD~wpMvJu*<pl&gn1o`uqr!{jwmIl`
zmmwUW3A;$LtU(~z43#7dH?dbhCkkzkR-t0e1Xtko9f4tBu71NUV(`LK+$=>6&lK;j
zn$9vYG$j-`74wk4#}K#wU94zpQR`DttCfon<|@zd?AXbPjZn>MNL0@4t~Uc%4PmC`
zmeV4gG<c$&iC{*e3+$H=pPXi?XFt1Ho#iS}4}EH(9nX^zLGV0Bw(hZxXBJ#zn1a@`
zwnO^TiLaO1F?vEG07e(ef`{rEr6QMsQQI|{)e2VbE2roHmiD5FiB9l)5;-ILxlCmd
z1HYD=s`U2TFn_NNn_T{1swhj9i<I}&Rq6v|Hu<48Q`?<kt?EB6cf^KDNZYiKD#}(=
zb#?{uQxou`i*=!31&X9xo&GVF*pt4qJk1?+11-?xf;L&vS9@N$CbG`ch1bL!4OJaM
zH~z6ER7uG#Q$NhoO9P4>!N$s3K`JH624+@qGPPoqeOgi8A{wGX04$f-K%vctybygc
zC2PAqtnN?2keJi4L!y*W#!;j)NHv@_?grGmXho~;sR(84LOCaQQ@7rCFpaJVb60RS
zcJkpEBnLxa@eKVOv_jFN=P!mL%<J<E&C|;@>j0>vjMP=$o56Da&5XS<YXPOcVBson
zb9;c#)nWYnKUvYn0{`m*<=4u|`h}hL=h*nfChTxUvY?x~9a&D4mXo*(9<V)+Cnch}
zo^7=Df?*4`7X0L8#D*(q0=DH@u`Cf8Lg8;>TGodJ11B_aDuh|O*(N2ydelf`MKS6;
z;V{H&CQWwq<L25Qykys#C5bSGeKpyZy%?0Mc964Pq4bo0*RCI)L<nzXBLwcOJCY~y
zydyu)QFe`?g-fia9$)|8P_z{!uKqz?qI@Imn*a1Zj7>?Ljaf8L7Jf^=yU>%<uq5c>
zwa}ik(6lS|6x)npY(ioySe->q%YOBmcj&&3P}PqgZ_xMTF5LL|hjvWPPIQCG3KGnI
zGFzAm;A!wD%><~r2E#vmm6h;4h>a!NTa+(-Qg6rk)WjA(6SC)=N;ig?P!e!2Z4UZ_
zZQWEQ22KRmtUDM!gw(Z4&pm&z<Fzoc8N4ncZCOu+>?{=788oUk6xuLM<^O@|^@{o*
zvYGr`o2y>0-Sp`#@-JFSKLT=@FMT^k(M*d2RKN8B*A}L^B;dd{xhj|X=UZ&8xtN_K
z{WHB0CA{Fe)arC?k+jb19-i%P<?5D;($kNerBcs~jv3{&h+KY^zBRey!nKvIf0qJf
zf4A~e^>DQsD1cv6A5q^XV-e5aLcWZ+{oiYYwWZoQ8ZzEKwXb;&5~Nnn>|e|h7)UjG
zYk$UD7>%=BO&ohc_NaDkbveic;ySl4D%G`}8}qkYxIySDM%o%2Q6&*zQL|(AJPw_)
z-6BMXUS92K3-ZFnt_!(iVY`J(Bq<e%m;uy^<Y)K=9Ft<ZMPO2OvQnvQ2gjt?ZV^<8
zGQljr&b9Lx2Pq-0?G}&=B|dJY|0;JUY`02fVR2lr48X<Pn|0{=GKWgpp3H^R1#{A#
zuff_*Dmh=_UY_k1;Svof5DIfR8_V<OJ5cl1wcR4dp&|$$P1L>0+tGnCv(+9iJn4Sw
zA*u1PTff9z6Wf{XzZ@a9u&_4=-PO@9RR4qk(ttYCNCxa+;2ZTQa=V4y78ADoU6yZ~
z7OV?3`9h**Z$)r|yRQuDsx>H{&0I<7ZKs!GE?vwK<9AuihN=L<5K!k9I}Ij~uKw4R
zL)A-w|985gO^17CAbxl;e`~xuu^qC|Aldjq`r=jr{~r9cpiX%J)uAcQTqJ~{)31_4
zHeT_*00>Nz!B^a)pz+mYt(?%9u5l}qBE8<Y93_{nIw^8Kq%ro-5CDd;-;%%amw!?u
zaqeIRwRAC7l1Y~-FN$Ydru<2~q>O2n+j5kav)h_GvbsEatF01Mn>Yt1f%R~qW-s4c
zoMrM3*Z%oyyA{nw{^$CCJH`M0hWddzS!tJ_HQ8Jlo8L14ulfukiRYGnJ(^A9cBfbt
zC!X3^RAaL)V^uv4aNkKb%Dwiq+~;t@<Zvog{_gj7ojImQLuZ!CMlz@EOomf6!>Ox0
zIP6<?Tpra!z-37`A^j;kknZ%b3cl`>VbV%C>X4fb*l}3Wqk=;(@#SMuP#>kd?2x6b
zQFCjFO(&@QuaTV!*{KcFc4f1ozqs~`5y;;N#2k(thh}zX(!Hp$JqXuvBgOG(42Jv&
z3pK`T0-3`T3U#{y?9vtv1_~RY4){EsVJxxf)2AaS7xhjl4BuJ`#!(ZDh+v`N|31eN
z>&}r0)2^O|iQ3>MkH0(MMcf!V#BHX-{}FM-e7QDm3@T02I08YNLO{u-I>_*k==ncT
zDW&)y*QozM{Lh{EC9AKqdJY?`w2?`&vSXiOL&e6v-v-V3>XgjD97psF#-6*7l;mO0
zO{0*eQC8Pn{GiQV8auA%P%u{`i~E}XU^QEC==FNdRzmw#e%blF9k=6p4gt4|vdK!b
zKVYeFn;MwktN*7n4k%w4b+H|PvwH@CzqRCyd}wfHe>+bQGa448O%O_A=sR|tPwg29
z&X>!=fTy1a<}3qxz0S6i+5DrPy!}EOUU~e_8H#d-5?6;H3+OGfmOKSKj(qq5mpWpH
zN$zNfI>9asUrnHh<v~wv3I>t0+cs^KOD-0I4oai#Q>;|@Iu@y3M=d#YFB~;iE`%gg
zL+1BY6AT2K+mQmoEKQ?E%GCtU)Q(vP!f}Qm@?g~8Lcz>%{?!07jCE~{T*^_VCXKN|
zh1ia0NEZt%Xz0Q~dP{>0SZ>teau8&hS~PDfJm%J29u0V53}wBO%wovYmN^5Ul2%3U
z>VmWZP%YNf==@AZ^KMiFvtWQt5(Za4YJ^;(Or}1W4-rUD?&X2tW)}ZD>PW8tFIKcU
zWTl!=-clB4b@(f>i9H3_>*mP%zV#=5kwrRJxu+HXK}w?~F&jM`yMLGDh1;5bjBT!*
z{xcZXV)J^2gUuRw1-?%(v8ozhfyj15*8mc*IT8x`yCc*Zh`2`FMdyiYmxU!e!#xX6
zq4?~U%unkX2Id#ahC-x_v4v%x?i00M7+DcwUl9s!cCY5((YxfYo%0pyP_|^Ysb?rm
zWKl%T$ckwCp*9M#G?}~aa|GUdA-iWZh3CnnUgN8>>*dm(A$TQg$+jFi$znN5qhT86
zXxTsa)bidaOnx1=@bAj?&Q15+Y10vU{yWrvD5&@w1twQGyVd{2)&ILAu+@P@nlXO3
zu^oYf?s89{t*E4>1@3C*L8^&{ea$>rw$u~$Avq2zc?+~@UzoyTdh~FfeNS*tET)^|
z@P?S`02oaF+NMWn#<tn<81y5|hbj5)CCI*FEHvh!_w;Pd$br81vslwhB$J{0?z9+r
zYVpX}_7Wf5kVucD!Q6Z#U@dXG13`DdBa99!xc)y*(bkb`$)RdMc~lvfoYS$Rdk)7Y
zH%m6aSHDvind~8j?qxvQq`<2@j+>v8QkShOzQJbuiXGoG3M?)n%{lDD**HqG@v1fr
zq!t3p!*O)aNU(dnY{j6|5jATT;&b0t?!(??fp?pFN&9c^vtw;|&j_$KQ5LB_l{K?K
zTRy#Hdg*lWlGA-$@n?!nX*pW+dt6`%LYu4wpife;Du7(=Y3W8fL%{0~cCq|Ix+rwc
z@Leq0Hg)&PaF24WcaI(S$MiVC{Ymm3Xg&94Wu(*-VEK(p18p=JUW}~Nb;?!ehi$l|
z=l=-hG6mn?Q~snLr+U@P)Q8n~5dX6j2%g_2zXD3<bS<cT6-b=VBzJ~`NO|t=E{muW
z`nD>ALEiJLc|c1RBCG3?g$~3xLNqszSs8M8BTzRGr~#R{6bYVsv6Bt;H+XzV4uZYw
zYrG84E~{XbQui$PDo=+u*xJgPxi)#N(WVVS5rGih0t$g$dmT?q-X*n%x~}5kNwT_>
z>rx(ElzC5aT_J`h`{m>MI*;So#e#2BS6*qf4I#S7U*I`0uHDJrnr#9#p0jYS;JEWZ
zrsfev*YHTHT`UaD@L-FDbQ#Y--^JntQZLtSWS8?K=A6ZF*F{G<$V}q8zN{S{2}o5G
zaT>wXox!kc&rk;$jgOf1%XK@?4Blf34VsK7_I4n61UJ(FY#Q9`V@TevTX@Xc9@C*_
zyrU`rh?r#B@{M%;4^~c8@O`y9Og&G1pVX7bwTap)?b~*%TrR$HRVa$x6*zndhf49q
znwMWg1PSnnYjZF0Y-YU~`FPZU%G((wMB6s#fztr=b!3rMcLx9jhFoZ_^Oo=^GP=&8
zvC|y||69epAtN7?G?Ur&j9FWPn`tpw06cckR@eBv5Qb|!a6ol<5HKGNyQ`7UEo^}!
zzu(Um=`K+p1nx<Mf*$f>08{-C`mj$-V?y65FAXH4n+H?!NA8!4DYhF~w%4$@tTuGh
z8$kOjqLDDdw!Ca(9{F(4f%ur5-<*Y|r=-&dQw27E>;<UpDDv2saNE$xhvaZYZ2Lon
zs<L*fxKxEbo(}xBYIBg!5vD4Pd`b!el-`6a{YZPb;LbG;po?W5f!;f;jMFQ+ya6V+
zL-XRPdUvmK081^a$C?Gkl7I(JN4ov6w^eW#xBn#+z?}XF^1oL}*sc1{?(eaMJ!2tB
zt(1iYND)mfB3@HvI&3@44~&4yO`_}sWCXKyJ>y;TUz%kjWX0S)N1_8zq;e5trOvxu
z78UBu$D;D*mNGjY7xf$g9vjH!Tr?^3o-QF$<tB-hf8BPNNA!$A7p9Qqxpcwo+(;2P
zGfAY)<7hchOEu<*p3z{dkgUvsEeXL$LU^j{x!;C4uK%B+XdB35$|+=?+M(E<`{o_s
zte&H?@crwho?*N7zYS_Xye=bDVQfLq1dL;|tQlP2K#~3zE^(Q2y^WI6QvW7iq{X$z
zq%+uFd+d-$YQyJ$w>J37V@4muvK}}1-$;UT^FYtC75}EA(#R8bEPC|!iO_qpzNPvX
zU*o-bbf&R4j-I2@o1tW;T;NBB-dM@Rj<SEfBm%wDK*x^l84o^+WXl1j9u5*()-F?c
zky#a+^Y?W&>nk>{XB=lQhpk^mVU*D-l?xxZ-iALa{~w}GP}B+P<?7$bI`Wt{3A+Bn
z=C%I+>0jgo^s*q}o$8}NKMu5oP1+6(Q!6YftndNQ6J}6Prw5540hA_h3d3y9s>-oE
zeWuk<lvA(lTco<rsvvME>%C1VfDT1yGX?1s&9XKo$f2Ovw?Q?XhG-YvT|5!|yaXvp
zh&KQ-nWu^SY{$ttu<e_mOA{6u7Nh}%!%w647$6ySUp4~Ap7msWKS#^Lc7mY%KqS=d
z@9qjS$=h|5959V-S4_Ju-Vcpd@%TIXQl^h7*4i>l_hkS_LqsFME?c|>SCl$p1G2lv
zP;H>#N_ze~l&2JJ9_d#1;D`Ukuh^QNN!Vn!k+bu2vYPzh#*-D68%)dy#qyil0`tvG
z?w{S0<Be5sewCfF;r4$TPuVp+$L6(X#se=?&x(^h%k9S6t9Z|Xue@sP*@B*l=vn@x
zIb*1cv1d9l$aJpSUR!>_0{&(;j4|?G)^iN__mMWagFS=%W5%{M@|0q?%g)TFeB;s6
zcsEvkXy^t#|DDQO1>ct;1K6Q1Mdh#i)jyHR<P35Zd62xR9jPtTwrQx6nAI1rgucgQ
z$2WFsH8oE$HznK8Z{`Ktb6rWU9_|;&LST2@z^%G_Od&f)R%<+T>qQEEYY1udeK3wU
zCEJvrg7IWGb6Zxf1kd%{V>-T!JVPdNSMj6r+dQc{dnLfNmnXRHF}W9wtyLgku1{;a
zZLWiK64xG+U%+_VQovJ|g}ewaU?w-$w|MID?I!Ct6*>@)z-G!F+;wof$>3e+Ha_o8
zK3e<O^J;y_#I0bJD!hdaoxVsr1dCpC8!Z&W9{(73m+WJYx4cJ~B!zq8aXtz5G0TzV
z_0=dy0U-&sOF|sd^g+Hx_OUf$eG9$TU4r33#6@#EuW;;oWEpbYhZEO6cHCIpXbiz9
zK{X6d2nJ4woFO<5XkCe!te4;A=l@R>?O4*NUab5it2O@lyBKMP)37UhWZ^6`?#jk^
zG~?9m^}oowYU)ow>7euPs}25epJ6kOmG?{q_no98PjZaWre);bu=!@YTaWv&gY_ib
z{(-S4RXtPClOXBL&*_-;7LxU*qg?yWHM}!jPZ>LNYR_bJX1i>#U&cvg42Lkj7Q2Hc
z=Ob#_Z!bXK?yU`P7-;Al*Z-F)IQOqrKOu$04-}vh?Z(gF(*7KCB<Ju+nHJ2=YvuUS
z9dL3WIaZG~JATYZq9&1SmZH+Sjyy$^s3MYbkIoe0lFYBLyPpr1(ISA<z82&H;(ygX
zUS7jB+3!GLZbnC$eLHmYmZ7vdq7VGO)>iyh1v5tgkQ?wp`e|{KZbYYVW(TNS&i!cL
z7<Du)@p%Fs_j2m*gM<_D;i!%zgR&=`;fS5wpWe_jV3n^8rW!apshO&V`k%R<-F56x
zbvE!niWTiR(ys2s4=7Tf{>#@>I9Lgj(K(oXd29m@anO#Pwkfl5cVy3W?7W4tN#Is%
z!FYn}WyrJ=Cb{s1f!H-4Kn*Elp(c#bS?Nb9U!TU7^qhbZ=#Wh^PZ<IIFT&}Or3jy;
z$iL}5q;Q`9z1nd54-Dr_?3AA4(GRa|pr)R6OXmj#Xw?Vm7|&3h;**V*v|tcDDZdBz
z&FjV<)b|{R9(2n(NHg`o<YG4Vpd0`{ffnpF<vto;!Rrj{$?3Mb<|oms`)h;u8WUrv
z{69chq-duri^zHE)yi#I&D^tkW@O<2WU3EpWl%7pVY~Ie4gC3o^D{dD+k0jqwd8CP
zJ6cXY*0)f^Bf)5aLTt0u2%^G{n5rmEc3bFDbVKI4Q+deCRl|LGd(^mdV(`mQY=#o!
zY-{N$Mqf9R*w|e9$|TGj`daSqro&SzPPctL9<JXHT66MRyMCV9GZX#nfI^!~KbghF
z$e!g}6g{ir)l6vNTy}o%<G`x@c*Jq%F0t#IyQc^{#yr`4@RS`x2#A>_ISB)Za$Q*$
zKgpUJ4fBl3|AUoj3ckOl>__#VD+wWO$N-*Wr~n{`dtMa?``QAu@FffTW1bJJpMW1l
zYihcAjhCv(<M$xi4?;*A4dyDrszZfL`Zh-TrDCm63&Dp{pC};UdRfl>(|3ni<euza
z?)M-puhi4x^;2IKwd)8tAvQ%`>2koJkWrr0w_$v1rZyUU-ZtRfds|Lm%~ipm$mBoP
z;IHKbSbc-Wa3xcNP${wNQqYSCy0@aaIqK(D!QaX`xAcvftqK++h}v0Q?cQeY4185i
zh}Ab@jCwNli1`HBc>P|^N2`CjF<!~^bU=+p+C5aMh=kdYA=R_1J?V9PO)iL1-=bOP
zHw>CcrDi>PLoUr&|9rFU+3<Wityc#+kop@yCJrxW;Chpv|MO}7?`i7Sl@FBpvgd#7
zq@KCh-Kt1uE*m$SL&jZKFV8``Ly#=e%vjwH*FGKyC4a}<2j8;WmdEzY0prpUBPmiu
zF<sh?LF%;FjG$h+T?C`e?Q9h{bnw}}PvWAMIdkmTTiP=l>`AAVrm)BS0T$<9s-S~9
zTSy^6OhApN&DYFk+`e4zoKSX#T}MvsIVty}z5llD{+q|QmHx)AZ%cbl%>5;?-8ywD
z3o)}CaO4n>;k02!f55kLYduSx#3IP?&J(_ECuh?0e~5Ckg70_LiE2dsuKFTbNX{kq
zX-=&rYp<W|=8^Sv6>xbRN?jgwAC;Kk)m})kSfH5Xh=b|!2%y;ql3p6RU0OVbhMXX7
ze|49;BHGQJQIFQ4>9MqF=BrD6ZK><ZMuC_aj=0PHNg>DeF!wj+yy9H<azNdEOu9<h
ziy&(8E$GP>FkJ?wxxSwR(@g8Jn~vOh^u1(9a-5Z}d$@xz>%HA||5|jfkamxW2|09+
z?V2>@gdU5!9Ka{)@#LfFlbMK+!;?+w;@!y!lqY4%byw2=*Kgg$^&Rg2yF(%Gk|R_<
zYJh&Ozu?|mfNfVgBQ)h~EH+vKZI&x0y+=5K_ho;Na@)I6yF+7I&&l9k8pk7r`z-v*
zS@@vmcKp?j*@m9^IK92tcI8}nsoeH&o9^c}uRM9iJvQCiF{EeS5M{^F*d22bTbW{)
z>!y%?H$9kJ^^C!%+l&W2{|Bl;MGdNNkaqGHZMAm$=XwkH-)2rOtubXO<zbVT#M?-1
zHdkqfJq0#vCdk5c%G8VflK7q}EEF>ve=e&{FF$iBka6*SxtQcsCbB;@9%^(zyUb`X
zN^M3$ue`6`5u23lbB&fE1W`v(96>~BKgG}g{fah*c+`88{r_vrE7sMs82h<KVpDS2
z&+|IT_sz`b<J#_`$eotHfoVO9a+f3IHJ^PfPF6}wI_6|sIbv4NDPXojHl`_MRb(3(
zmu)EB#4oqmjd4rQ!rc8Y`BD}0rE|_EKd|X1J^$CLa}{;2x>&7L>(o=#4QjjEg(%?j
z)Sc?3>ecFA^=5S+VuJUpPpi+VFRHJqZ>#UB9}|TfLJG(j;wDqc3^Et>f+|TJIhAaH
z9MMI#06k<Uxs+T@_L7^)KGYG~Po5^vkr&CU<ZWmhA8QJbMGCYrnp>L+ywSPZVy#lE
z(@xbkXzf~;wnaNn+o@d&)RDc~&DuWger><@wDz3#qV}rxw)U>}@n^eJ4bljpL|oSh
z`b|Nv74$kruXpVc^maz~xb_NqgP=DG8W%JnXpf*b3HmKTZx-|xL2niG+k)Q4=<TjM
z1ih2deXj2adY7Pg3wn>B-xc&;LGKgvenGz{=mUa2DCk3iJ}l@Xf<7wfenB4-^l?F-
z5cEkwpAz)@g8qQfr(Hi}^oOoz1U(?=j|Ba(pw9~W6G5L7^rwRUOwi{A{kfpO5cCB>
ze<|pTg8oX-ml%E7^=m<YBj_uF{#MXe1$|A>-wFDAL0=d24ME=&^esW(X7mrPKMMK|
zqknS!S<t@-`d2~U74$tp-xu@)K|d7qZ-Ra#=-&nXnA`s^QM8rhR;==g$|axWx{5h_
zmg2COM5=N)%!|{DI{VUpKL5XO*ldxpLwlBhsqwOy<0&Ut8XH|2`(4e^6sF7a?BCQ=
z26^XDn7?uuqP&~S@@{}D-T5`Uo=@y4#cPm8noW5PvQhl9;r<KOH`=jzd`}73lt!dW
zWs@o!mI9YKK_Q!LhK1F%+LYCNqUZkrGF~C$$?4>AoWpxR%k}?7+n=iukc#)Mra;L5
zkG(H}kE%NRzW3Y-D9DxxDxxwds}KS~Hc=sa0wjb42#Y9_WJrcg=7w1aK@cZuMXRk^
z5o>LWwwZw{t#22X)~#w=Xw|yaTKD#Ct+uwM>uVSF`=2Gr<SsL3mRQ@5`N2I&=H7Fk
zvpxGleOC>!rDM*Qa~ZLF-t4IX|5b0G3E8;eHPY+tJ7$?&B~JUd7=1M$Aj6Xw!7?-@
zTsaI!Gil%qkD(e<CYRmF{%vL&MGX)ukt2&){K~_jFj5@T>7*KqF%@!-2KMhW`f5<q
zuO31TSl<5<dj7{MdldZpnVJU~phXRX<9`yd024_mq5<}ihY<rfQk$n;tbI!RhW2V!
zcWAF2C;O@%o|7&O1%B>>JO!VO6+ibrUR*K>Z;|^wp4{yScYr?1BiD{vgtyh98caLV
zdBI7WX{=u2upG4ra$Ctg*-&Pqsg>RP!<i1UhU6YKd59uQ9N%5lT|tkJ=NWv4=UF^z
ziqE96{M13j&Hdw^<F>}5rpRV=s`L7uKkn_y=u`t^Dvho~ygq~P*=Y_^P2n@T!cYhJ
zAPWKI#>=1d-e~k`VYCt1+Ppk_ZSGUOZ)SRz0a=HUiU2+iqPFJ?;yzQfB=z2C@xUXB
zYbjsmt9jHSU>|;iH2DA<$ddv-lP@)l_@3r)6HSuLZu}XKAv|h|UdpGF!m}Bm9FGTq
zf$aVt@wmsM7D;~)6(EYfKHvLxqlXlA^G7Z_T4|K^_B5}}dekBXVqc;5pK|_xv!V?l
zLzT_y4a(26dcKv*dMbx0my$(t(E@ZbLe$q8Ny-pQ8gjcTyxTn^_gnv6`^k6iPVO{3
zqh}fTv6Zs<VXR-pi;|dwv=KRKJccr7^(=QM{4pP_39c~)&V_oa0PRrO@QOsx=5ll+
zW@&znesh8>I+ylTK&%)+A~c=P#8XmJUi0ioX(;Ng0#k*nOZNLz_TOUb&a=IzJbkGu
z>%{AxZ1*^S>iY@!e~s){$bRxKtvkDC|9Ef5XCTcPkaJ2NAUmh(AewuBIyT9yYfv8F
z?Lb6JYWOybzDb<^e@oG-$d}cBs&z`Lc|Ouy;EW!NjO$qmDtUpdMlKPREJ(oFCg6HE
zT%&@5KUA}A)?PzIMPzbM4S=g6)p82Dguq#3^&H6L9ZhzJbIP3zQ2pr^GoaO31JsmK
z$H=Q6O?JoRpHAa|K4?m{GqGm{07b##Y|N<9o{#9>INm-9??1n3IAh%Or;izDb8gRa
z0NEg02rKcjo7DuC0)wn%;X2~yVE?qk05+BXPgLGj)N9qhkp}XhcDlM&c~`qk`<QzI
zrh`Ac4y3nDifQXRAU3+{karp3N(J#D2~*%NA85k`!AE{KG_?b6rJkf*E_L2LS0=cA
zz|+pV<O=3xW!wBnE@(aRyUd!UI2l!rekXoGQu$U+H<tJ%W}QX9Z0vTxg*y3uv6NYb
zz-U!Zpx?dp#R5$tunhYIB|i`YJo52X4isof4pHv|Rw~rK-l&dXB=i5tLFo@|C9L$S
zx*0$IXM9k2a5eC4g>16tgxkO(#p?hC($OS0ESdQl@aw}h`h({h@N49Zo_c_ZGWOY^
zU5U<ILaouFPcP#D{&c4iz_WYmvNw-r00(Fjlc^g^ZwLX*hidfKR+_<Fl|3-cr+$E@
z@~A1@^FUSRx$VDZU~Vf27{Sc%sRfv;$eJuHx0E7RO5HpD+{gL6{@5!1e~5CbqBW3j
zlCf$l>VKU|5de<YhOEtZGQI23BsUcP{9S<mNR58v_s032+_N5FW{KH0n}P=FbB`v|
z_%1vDFbDL<E+e4Rd)5I^)CSMS#xV1+M#F)GaiQF!FkpjgOtU(^rvbpCG<X((O{9KK
zq?=y<$FY1apWbDh%LzSe0bU8I$Od?3YeZZC$kBuZyz0Xs1998reMS%`_pHg<zD#N`
zNorDAeeNd#=)*PJ3XJHV+y9FdQcUiE2CzZ9=Rbq|ABXbeG6NSopomF@CpF8q4IUqA
zQuUSOEAhF5Z9MvN<dF>yl+a71dkYpM5Ju^|Db&iSqh=A(cQM}g2Pt>WgAKj3XjiQ#
z;PE0iCo+Z6dR(-WRIo3Z_sAcub42E(1httXS%E}jELROJ_y_Kv!TjV(2ci>GnGQ30
zLt*U|o-Hi<!^o$({;xz)O0=1zQ0+=F{}0`STY5GQQ<}&`ITK%h&VrHq`+pvK!rraP
zO?g#4m%t}`JwZH+l#!~x{{j;)Ws&j0CPT(6=|8K^{KfS!ymZn3MhY>n=VDNZ3fXEP
z@nbQPf74i~Pf2_VlUGcx2FV_2{@X7B^bY#p2>AA%O|X>>C6NL-@*4*^GlZAAgS1!~
z5|X%92AWzuY}&W<6}+x??|}Bj-AJpaLFqLW?l3UW)BM2hcB-m_U{-=^i6R%%D_QR{
z{Kxm~maMktBJ4jmLLyThxygaUv;YZH!n~5%^D9@3uvtw?|3@lUD){%XIz(NjUZp;O
z3_uG}Df2!}(+adpwHF7Q((t_0sqfL;*F{!<3}+|z)e;1Kt0Xsrlb-tqcQ|^*<WOT;
zXnHsYX2;>_sb4W!B216Q<-Dl`$ipefM#^D&C`l?CUN`a;6O(D`XF!6Q3mv43zTN1e
zV|t2?)|_^Rr$2wiq*gIKUhMI2b)#G*in98=p6$GRckZv3WAtP2ekM4s2sd|nTU^^|
zNflH&X@#E-txH&oteUjQBYf)uA$_I`oiyd6D^Tx3WYlio&J!TL&0VZsVNO4Fy59@$
zJLGm@l?~e)LE=%Z#kIxDTxx#V_g*S0rhv$J36?3$<%hE$xxd(eF%-}-P=+XlzLF!w
z*LdmHcT8BHC%38!_7xEREj|AZvOpmV$Ttv)qYw63Ki>a;#SC2PKx)FIZ0G>{e70iZ
z9+JzBHsIY1O<4HV4@}=;krwIR8V3SDQX6Q3kdG%Kqa4URkYayKEtQ6Ml}rj3&i_{_
zS{c#R&nRyxRcY=|*yNkR&(4tbvy0~nDL<P8^U9#-&fDtkIJfCNO#p7OZ1&kW;8G#V
zsZj7h%ON{p*Yz}l&Gdr8rOakB1!W4f#DXrpl6fEPFE!eYt**z7u{D8rNqKCUaypr^
zO4V=w)oxS^dNwm{-?r2TWmH#~I3N?dm<Ee^;k0vYK&SM7i1H^z`ICC7`e$UBCfZeL
zVu1gU$09==-J_DDV3v)&2uUErfdXiEI*>_>CW>l;1_}PjaP$ra;pQDIC@FQ#F>4n<
zN&>o1Z$Sz4X+=Jo@7RsU*TSO!53!P3dHJ0V)W=9l3Q~i^xSMFMLN_wX6~UL9yM^bu
z<Z_Ut_Fl8CzRd4I0{z}FoxFvSQykqANikA;tx@*LXWs8{>PKqu<^cGA_>rT`p3h<t
zTvdD-CP^koNewWw){VO5n*pOzMc$b^9g%RhcY;wcqi#+iouxY~f$D`PxXPQr>3>ks
zYRI+f_msDl;GiGlK#zBrqLX|%ePKCD7O<l4<$53#_9Ga;_!ljD4-8pX&P(jzzP_hb
z5Y?1*hglFZvmmG{m$!Y{28l<CdRjn#>SgO6#<MrZ&>0i`v6jHo72RuYw&l^5_H4l*
zR*|lh7bs0FM4H+Qbwu<wyM>t5<G~n~$QA{RUkD@0FfBy9{v|bajdJYiS8X7s=YNQ@
zP0_ZH?<?D20obSfeo!&M&K}<|rIXB)JN-p|SJ`%0Y=E&S)vfh<nt%bU{+jdQ(Yumk
zfwOybwm$W8jGEPpcn}cf%1TlB6DlWnfClU#Cbcx&h-$S=QS>g;*CxJc;_tsv6YPG!
zMt}Soql$f8j~`&plXZBt29wfc>NUy(saEJgW?*aRgD~Ou4cE_Szy(`PWz0wSv;(*q
zWQp84wFHhi1uXNnv~+<&ub`#?lqcphXZw|MYXn{_n6O~m>&6K?y{8Q@%_S@4U^0>r
zD@QrHcyXGt<jOSl`dZMT?tj$;cWgAmcXH2Gz?V;|(uL3Lno<XCD121eq`hM@4?v*q
z|DKHNg>2_?17!644^^fr+U4Yr$N=_&TB<yTUyYy0DLvcS1WUSHSS~sf;E*o619g;E
z22er?*;m<b;>b{L&hG2g>z>5ieozzi)fh&wrzZ@^#uG_vlr>}&`O*c4+b`D&zsvOD
z@qaq!gmDalZ4*uP;ZEua0feb!vE1rfg22L8%6IH&^ZKW{Dm;E~n5Q3p*X9f5-p{?s
zXJqR`h8aP^k|5xjOcrH=<tPJL0mO@R)IM(qN_~q}vi$q$ccHi(U7n^N8-Y2gCy@E%
zP+Y~3Kk)1pPe6pP=f2CLAIx7UZ%nA+@U%Q;glBlqHV#h)lfzUb;<cbqv{ryXUi6%r
zzbJc{Vg{i4#||05+1=9tXvPuAY%Z2thnbv8-CZ#GHi|`}a$wwFY97?s`-82<y+Y;x
zF-lCqzn9cuY7z2)enI^)8A1xkZgMwyO&g&VYwg;d+A~I!@R9yL+ktY#x$m3oMf}uO
z)7;v$wnZJ>FxU)yILARQ!2=eKh4rBT@FwEY-7o@G>M#e<C!E80jobH`_I8Cgh|ptC
zAm9!(!*Rq=NukaY_KOg2=kR<7!Y1${GlH)7xnZwzLFnoQ%Xz{q2U$<=Hv7O(Ho{Fs
zR=@-&6$X<chRskwd?Z4?s|dDmhC!=QJ=wb@>|?|Jpmz}Tyd)k(nXfD84KteS9Kl1%
z-?wztqxP~&FTXLT8aAu3bO2^<HSz0EFVEG0ECjIT_tsHzYHT)~qpZwSu=WROCX9Xx
z>~yl(!0i@O-HI@ABu(g|A@JbF80vJM$-?jPfO)q2yuo2H3_(4^rhDAE4&ouW->gNc
zccb1r7*GhIuA*iTUYe$ZJv4?TbHGD%$_K7diMtUt$8ykN-v8;n{hQSmMO0t3h3k~u
zK46dl^hK=yQ`iPW|Hc`Iu0z+`UG=T*HaJu8(!kE~y+byO|1^C89DkZ!Yv8B^?<Lmz
zsr390RoWH&`wg=G{Q-IV-qSh<>1^+EpnO_VjaRWd)Q)3N>}l~rzgD&b(G1N1n-@gl
z>NevJK<P9$b-=3ebcVo^SL&Vg;DUbXDB{AlZr&Y|(Vh}-H*P1px0hoLaWZ`_e{b&p
zyaSgxBD=FP1;#yU2gK?CN?i$hnfF;q<)_3X7`MCK`ze>#N}c<*;OO{to_8j1{~ibG
z>1Jaq7|)U&9BV1FOp8*{eV_NatgVCbSlYdxvXUYAI<eQ^mc4Z_9(23+H?+D#E^pA~
zhXfrAx&zDyGVk-8|6inN?c`-ruRftpQVuAKB+h?x&+cK0n@j-9J1=><2r!b(UN;;k
zNAB<Y@r38v|DIf8S9*4VK>~Z90dLI+461<WG<J_JK<>MyKPfkS|7`F`AEI{Uiv}Jo
za(d6DfMEeyo(T*TYpnEpT$N#eGiu$lbWb&2RN>)CZ{B58%KirBQ`4U2@cBxO@D1<T
znK?^Kjj(i+GVZk<RZs-O&ln=}7w4`!#=z0vtTuw9^>hK831n^t95&<hs;0KnI&r-<
zpx(9kW9{pI6RY;55sXniI{*gs6d8cQ_(v4uU5)vmHR~F5kS4x^Y`<FJqpB0Sk)APw
z)R{R*bR+ex2ON=g*ro(Xc3&;{^%Q{gL5=>)RR)mg`Oi__QMC2s>tvMLi68$vKapWk
zg1H|r8;IA3rV1?B!G4MF{Y2mDWAdPO-9!Hyrah7uRRPUpvQlny#z8}Qp8>o!-wh3|
z@StVe;C;p*C%R?IS3B+Cnh;e0R{>cshwA#_k`rlUMIW{M(z$jZp53ztAkHP5QUy_3
zdX$zkmB-p%u?O?A^uUys_THDhQ#m%j+6GL@|L2fd3YkT=k!Q6+?biR!<9~cq*_eT1
zM<gdX*A6Mz?`?GZ`eip{_X~L7Dp5G*kX+Dyf-d@W^*db~yzT7}`}3*Cu9wlkF<+5O
zZIG~kAzjAx4<WmmmqZ@(HMy*&311)t$ha4*pv4%$8w&l^n7djWNLiOuK1%o&AtA=S
zrPxDNBo%Oo&^wumWDKkSm7{!3(Ol$e^^a;1e*8FpA|s<ifmJ8STE_b6lZBEADwh_I
zpR?cZC;oobZ51{MG%_<f1Q1<7T2iLu$(3~VdLST5alg+LOarL8Nio@f`?(L>Quy3x
z4&XgoHa$`Q3?|bKg0>rlaazPRPJcN2hl}iHactB9sK5`UOw`3;3ie|I${a(3A$(k*
zHBNSms^5999bgwlHTaF7KKa;GA<Kr2G&`DB<#QDQoAFWlKb#i*Jx|%E{8e3{ep&s1
zTukoKrXUtLVGba<=*hV4!>T#C{c#Irr;3-O5pi8p*){Re7@)IX>wqaXDRPbL->7dy
z>K_Z`zFgU-xNgn+($WgB-T`hm6>yEZL0fY{$`hR&Weu<^$mOevn~@|4#F-=KycpM`
zSwEL}qgWa$q{`A)1U!g4DuL!X?}+3M>wAJTH7neKK$oi_z|2|LW8ub5SoKN+;dVx?
z^PZBN&$w>QJGaVDeQBDwBJu?;{~u7a&E!V)9d!Y;e;=z)#2Gz_ldDwGuZ6*+)*T9X
zo4nk*2D)I}8!+9*-=Xa9q*bjf<@Z_9;Q(t19Hylrk>fUGO1KL6Kc)NgYuoK0o)jGh
zi06?@QifO-aRXS{TUTzdCAiC@CxYN^B$1p{0cCE015P(J@fwV`lsPDChdTqz5y<Ob
z>Tx#<tqIknr}^}pW8>_m{q*PwnD%_qkm_ipEXtU2^9eW8rb+KVV*?+z|KrdfP=2iZ
zO+7;`SAFUo>YHQ&*+9NZ-hutUP}8-WwCDakXhE2WEjCt(yCVeCmaD#9r)9qBB0BR}
z0(a*qc4#0R#qk;|xVfL*Hn#UR^W0HafB3wx+j5y%9KD(8^a>cVSmp<I<7tx}qymOx
z3w=y~X=$fRn13xYc7jWWX~<O^fX4tc46F`>xq)^x3$#VolrnCh4s$dKq0iF=w*<PC
zt35uwnf?v>`XJrF)XH0{cM6m9gx<#~s$-cdis98jAFlNHK&?vA7qx4P2aV?8lUY!+
zb0QOt>R~<uf(-lc^Z-cmU2}18D8KD0_6C~y<jt&ytH4BpXXzxDv<AGC?6_S;En%<E
zgRt5y&{w*uy}@9YtIX%~BHKH?&mDlnez4WG5h6EoEv`l-X56%66PxG!UU2AwEDO^P
zg~1;Na1WgkSpQ)R$El~bU%eUjdY$i#Su7boprO3cGJUI#rry&OfZW}i*WY;#OTUkM
zD3?>p4%P}U)c#Xkb>VhhI2BAf-$BB3Sad<K6!5xn6{EO244ia84M@|EElKMhF!Qsk
z&{YgqJU8>taGuSoDd1tc97WWP0Bs3;&M;^%2XqPxjm9ku9fh0SO_({}cd_2s*yUOa
zcvg6QC{2Qh68a8bGfX5c$X3bbXgc>7n8=i!Reo6A;B?_-cVev6lo40)z&VxRSdUb8
z;hOU<nyB)uIvzOS7WD;kHmXV72%X?r+9vHQgLC?Gu3{%AH*uP!Tx1}~`4q3ski^q5
z_czp>QHHIT122_K2!iuO^t4YP3O1Po@d-P8?hZERXW-V)^U!eTM24#9x3yvH?I!Gr
zQXnXLHsSx$K$pBIh{b~+31U;=4dd})3wp7AD|BI|cTPipQI-|KxzNO<(5mG)NA+Gf
zAJb(m_aHJJN0{z+2F+qT{Y_pX-dSpayOz1(QQ?6%aBaZT;f9Y5jhbPn7aml_0WZU<
zwV_$AD%Rb_=<Y$jsY>UX>3gY8cNZNmoJw@|#0os|_yPxMBhG+@d1ThCSw%RZc*GAM
zrsco@u!i<}812NfKU(Y{LE_xYo-Gdh+~9%{$d5>@rdBk%Hvo`Vc-uR4Saj={=TE(G
zEO1_f=bv4H^>-5I0in~O2oKD8OHlXc)AQ+dx6?yCa6K9K&QM2@A87;TES$H94dxI!
ze2KYLIS(^{O1;2Kh~}XO9Ox<>)Ul4<{02AvHMMzg`g>tPDy^J1c%BC5VOATq|5=#n
z^)B>adeQ~lLGcRC?G({JgX0l&_SPy4><r>G<)xl!RWyu_&~oTNfNtSo_QD7<0taR+
zjsLk$8LO^RZox^vEIKNMq8-&?c!vV740PEVx!?NlL*1X)mfY&UAUXzI(;DKD<C?5r
zWo5aucjQXR?W=ujAsDJ_=zpVSZ((#a2VG8Ju>n0LCSg=6cPpPh^LsY1W9d-|>fiQ>
zTo@gRsar|9<W{|3sImwRF5T*-2|+5{LEyM9`~)+p?%EJ;YHD@E(UP7i5D25b0ZGD=
zKiB!)8*RAh$gJoHj36DcFeS|j*#4C6Z@i<`24XJ%->e`J@z;r_HY+#(+m^rY#gP@!
zlQD~4*+?+EBa|M`JBsOTQ|6VGYt~R>za>f-A03PFERr=^*o}v30tOPTc%deV(Bt;?
z*nu}Ang{Tz$a=YBX9u2{H?R`XM#+hC%Ue}@aGhBI*TUXopkR#bN;)S`FFVf;-0{)e
zY%G3aQFWAs8X!)Toj&{n8}NqV)a4MLf=YiqS`I32AL%=W$A36J16iGcg<3GV83Qid
zuIg~m+k|*^SGm{M9vt&0IWvX%$v#(sI6Y8tm}k}G!aqIZWB$_UKyi_z1{SOS&8Lz|
zLgj%lW8#}o%8t7w{5Aa{n3YeZ5MXpjQ1xwaF6VaqKQGX>NsNFR7TT%ER}@0<i0&Wt
z1gHNu(fmI*tN*JmQEtlWlBdyGWO{Tw5N3s}#?*!!ndD~6cnP_%iaGaRYJ)x_uIOn1
z_5xC!8Mkj<<bfK-q&i6DhUYig!I&Q%2N;*jR;IC=P&15{Q8c40%<Wb;w!ay%2l&)%
z0Bm%Pw^4GAGNli&zOkY51v`KjL{9<08H=k%X#_e#+qj@nCfOyy-P^CDIZds2Q%e7b
zsCOx37x|esU%gA)hdQ9gKOe^#*yunALQ*Pab9$4QCPEH~TWR;5rfuRP2V|nOUz%7N
z8k<??X1X57O*?bta-Q2Qg&C0!ME0j`bpV&7Juy@>Fi=cPU|yp7{~Waz*C9L9TJ;su
zOn$BH_&9F={}h;pY>nhNx`!uUKV~C9^==Ofwkfd7EoRc-Pk~ZvJ1k#JV@-AAE~?vN
zY^UxIdEpRCx!Sy6VM(_|GzT(uC*4Z2pcow{EI~nBG7EW~HH!oCE&y@M#oI~3QE1%a
zmT;6KZ!pibn}?v5A<dEDj_y;kG#7>DvXN#Oc={EX_ojwi^&!0jiv&|1U7WE)0FXaI
z9NiM`)KZgDSRk=az#;VIqMOS$$-gN7KSY^B<9{9?L)7`ot@tI;r#U(?g}6Uv#id4E
z)bOSTUHaqDC3pNTxdq^~s0%FB0#cC~V{LYYi?hflHrT7G`gI$w2^z`?fG%SVWqO1&
zO=ke*>iZwJ8&5&>OpK?RY|2OlC>@zE9mBtF=l|J(e0uZ@fDEN-MjIrFWp`BK@0EiU
zZFcaT9X%cJ70DKSvSAh^(h5kV9$5X2>ukWJ{C}?UMFsyJQU0jTRWDI5Q@^A>iE5zv
z$e?j8d5HX6J4GwiwrT&92rUfKcM}|BF`O-!KTo;apHEpQI6HVl+{t7zOY?#6DZf_I
z>IroDTr0Z#)Y!u_+ahaYGfmCa=i_l!k%R1^J(`&?Dx}hT5h77cy>ZH6*!I)hnb4Oo
z<i+1PgXN2N7SzIAj|vuBph$s(2l7GqUDNuK6|jJp>CV|_I>;hodGE^l)y{?7;bgXj
zF1iw~P22-$F84y3ZE?6t^kxt92B5gyIfrF^ch0tuze`$aIn#DHAFw+MxjlQfg>k+Z
z=@Vc8r$+Ul+l!G`yIWd#Y>o3=KHIac_GH)_1i)~obFG-_@gqeKd(k|e9AmbHtXk^}
z2Wi#@x0g@rf<gyz6F_g|F|e>cot6oqox?B=%Q(+^<($ubdKOwvpGco^9xHDEHwrUH
zU+M1Xz*2jWyr<dSH8Xys7tD0P`2|mzcS(b%nI(WlJp!(Kb1vz<*-UHTWChQU<=znB
zXJNz63%PsGLem@?-8yKB4pCN!G63~q{`{gExB#3&K{F}~j2%?Lr-(Y6^txu%hg;xu
z0;MY5-+Cu^NIIXM|MluZMO~;aRVyI@tW!6ut;htjL%m$xtKOjAsvb}es`se(tB<Nj
z)MwO})Hl_))nn>=L?I`T(d1O(BGbrhR18^4DoHI_M>dmI(t$i8my^BZ268JofXbrx
zko(D_<Oq3&yhPq4Z<AxlGNNcFXrr}LQFUONHd|Y$E!8TuT5X-S8CHl6ZHIQbwpY7B
zyHz`&9n|j8?$;jGj%d$lFKKUTZ)?Z2_XY{$NOn6^BP93T+<%DnpQ8O2Yv0fPK(rt7
z)~SeA6)h31CR&GRb3{8tv_nOEf@n_^?J&^}7wt)+9U<D0v~`Yhju!10(dLTQDcU^I
zjuq|6qCG{lr;2u*XipREc+s9N+A~CZrf4UK*2UV1&a*^&wrD4bcCu)vh<2)Ir-^pD
zXwMPt4AIUMZN6w{v9`cDTeJ&VJKH%&w1uLbE825KJ5RLpMZ18t3!RHZd!A?)i}rlc
zULe{FMY}|_OGR76+G1ykXalS*ah8g<g|(&5GSQZcwnDU(qOB6`GSMy<?F!LWi?&9z
zD@9u?+Et>h6K%a{SBrKHJ^v>t7by6*Q+Z$QQvXTzNap}QU%NE9JOyV+pU;gnkM$lu
zoX$Wn>-~DC^MGXDW$VX#EjyO}P13Gia#bwsAm9{53WBPj*WHRK045hD!lMzz(XFOC
zdj*0pNxhuIkJL}7Cl_>8BNCU<=9r}TX*YaM?W7=B-3s5ZkjD={KUQaV8M0|H81Be$
z6L39%6bucmI`#Lbw6xj-A0WTCiGlFt3_;*zSPBGga%9P@8A)&Ta`(|5x%}UD3&9yC
zDG0y^;t0a{2VZVB`mb>Le;uv=dn-9ny;AwRvQCl&CcG_jMszB~AH+S#iD!M<fdVFR
zC3Reu^KVwZ@er-QS3>_A{q%-LrvSiHNKwiF(h0YA-cI1yt?a#(dW~6vqDChJlrggT
zL;L5-PA;+&n3SteI$#IH@aQA}f&3^b&j&q)cJA^Co#~Y?{P_fcQ%wIGmuGSGY=E<z
zgi{8Go=C_EDLLk+<<75kPoT4D3I62hSpXl=R;hw7FUrbGy~<6K_t`8vxBstHv`OR=
z^*MEzvNGYZPWEMFL3Ad@T|u^`I&LP!r50k6Mp%k+rA{NEEtjk`Is>4u0skWv(ie9M
z%~GPIE+Kt2#O{_|HY*xAF?tThF^-g^yabe_+r-8s3Y<}H+EZ#bsYTK00A>}rG-Y7Y
zjDJZta7MW{Mk^Co;^%eIX$VPdK|!WeN0EhKkSqk0DA$)hX)`v?|A!SNto$FO{;xvo
z7t_wv2G<KHL*AE{tdL@OD4&H`Iz(g9bm%ZX@DQ1UI~)-Se<>S|OL(wK0Z>LGUAzd5
z<65pSU7$&%|Lk{{fy+8fCT*^wMm-!FJzCC+X7hNj%+wzh36oX8jRdJQ5-8Y)M7WfY
zcLleE5gv{N$H)@{wHQhW@X)u>r*t_Y5*~cEuQ#gTtX@yc>@W@)p*1?<ni!ip`sD47
zNV|lv1PyKoK6fqD)xUq<dZnc#1NZv<u$|HjzpFc0Ak*kEK?hEKQtPShfQ<@4s{zv;
z3ZaN9I4MUyI=9_{;OF$;X<-^Qtua=e=RqAkmeYTqqUDkGicdYHz-&BNpY73tVM>t9
z0TPu+8EV$AkKAwm+psfM)h9P5E{)Cs71}N9rDuMPjJBT_1{vsiF;GLFREMv0-+oI?
z@QUx$=s)?nks+QLosBUpCiUq~pUfC6O%+D7hIaFr=V8w0CoZ_OAUX^1ro#zRb}F^#
z-ib^flF~EE4WSS1n3mRPKInZX;+IpU_gM^f&SK!Sa@~?UZN^H^zeD+<qAezus|WDI
zf9xkx7o9g;L1{lpkt^LpZbY!KPgxtk<n3h2E#WR4`v+@+Yd<s|`-`IIVpQXZS8gk&
zJ1QfoqTbT>mcSG(hf1{YEit|ijN@AnoeMM(mQBl=?)c2!g8dfOg!b1<+&^F#IoNKh
zBvKSD1n7HYbGW7px>>q3m~)d`e9Lzn7G&jLhWV%b|B1Z*=V#RKk+Wd6dqZ0U3taR+
z77-)?JTk%2y(Bq<CAV6z;&X*%JlQu|VvBvW_M=cfm!K>ts}@F!RUpd;b4`G00Nat<
z%!}q|p5)-wA)mVLD))7H0;9hv=j$5xh*=asy{P^kk>w+RToH^Py?2uXOh;0FH126D
zJ}B;M(K+w^emPItxW~=RycOtGy!&s-rA`~rJ;j9etzMR6g(fBm;&;lV*Py}#JTJNZ
zX7qitv`b`W1%8^yIY0VTDY>r>P9OC4{=})Q=*8%9vcs@^+-kAsRL^0nTfq5$<o};W
z+{z+#7qS4!eImKhg}{Cj$)arXqtq+LiciJghg?&F0$j<s&gs$f0M&X~<yQ))+=_w-
zCzC`TDC+13W`Xyj`qzC1+#7L67lF2qkyVbR0IZQoF`^_J?~-)gQj{yM)$ImZ5?z2n
zs<M7?a)UIABn2jS802y@co<1|Ar<{#1mjcmXFhLStJTr@Y^~gb%ZJH(Kc(O)rTlK{
z6P*9rzTGe`&j0VH=YOiYR@pCi_y_&2$l~aQILB>dO*W^SQEM}&YxdGwXyF-Wx=VTB
zzDMjfeRcE#fWKR|4y@d!XW$!^Xf)Qt){iYUw>RafVfWh&Xm|Adla%g!_@2pGM^YG3
zRvg)~;}5s#<_UHausXUJ=Rb$&Ss%ag$QyCBDZx|fIicDvrRfQ*Xb|Q9hr;ZyUa7tg
zAHJK&yIO_TGwA30_zU7@AVcoXEFTtD&t=@*^bC78qsqeSb6L+bGVIyNpCE-`^*q+|
z_zZhCVv~H=yz2R^=SgxIt8JL@0t?6F`PB>8v98aM6_RWibaSNgg6c&s*PPj`_j57?
z+*sm0-?gxM4(I=8a{k|~XhmeRTCKR1r{gweHh$b1Egq({kjau#0-V%*plE?cS}LqI
z?zg<kXU<Kk=-(AB0olzV(^G$20S)j(9#Obj(_$6Q;(@=9h)&*<RQl*16)gglTtXt#
zvrZ+9i)f@0sVNy2n&MhA>TmZLw+(%XY>F-g-5fzWv(CsF4~=mINcGp;t93!ub8h)v
zXbSe1c})56M(Q?VML@x+E*T_F)r{E9!3R<y3hK0-KeGXUgtiy?|8fxoM4l%ub)|A$
zXS5XK8AWKl0~s@2+!-~TAryRZ&2g5{>#&oG)TGBJvLsrGSGSNR$<veM)dd!5@yfP)
zd|im0^@LEFmuhu9yb=mBWtwS{-OX+9JOyzIh3MCL4B}LzI$D7tgvqvS4Z*m}^IZa}
zdUsclCH-vdLS;$BAi1}2$KKL8DL*seix=_%tu@s?EQpq4Kn<imTLUr^XqfsDY87Dl
zNGZX?S|q<|#<QQ{AU8}luECsW89-i7)?^9fLfiQ)>ZEl6Im|M5o%a1z3~2qk#<Y<j
zwL7vwZd2`p^8dNYy$b&Q1=T;A)a~jOi2C`q`YUn<DMuX7ZRAIY)G5>g8ZwZ6Ts{{#
zNGFYfGA@h^E_W_%KnT@z`gnF}YSGCKf^H3rgR>;pL68T#xL!x$&k#H>+MI!t9Aqrv
zn9*6<|4X5>g~#xfT7<M!Q{^yoC1U%nk%!imS_HQ7vYEABpU8c^hUelfwTNbea}T^_
zDC(dngd)Va@aXkC^03rG8N!}Gg=W6@8+xHOqtJ410HKsL$uEPtruR<s0q1v?B2Iwa
zS<S0`ms+sh?B((3k3F!Ar&ljEZ3?LGX$@qA;Jc|;Q!mbB4^{Dy#!}N(pxK&zO*A63
zcV3Fh*%KRi0AHy^8pCQ2(%{lL?8~qWC1f0pV$ZJ=$%#uXa?~g5z%|X?8^1rDb+&w|
zgX|{2mu9U{DT=UlA$B!@P)=&XK!q{XIY;K{0E&k9(TYpB{jX6`8kLvSW$L#{0cj`C
z;k@6Nt+Osyu_b<<EZ7L-TQI6gsM!bGwm1-mUl*NqF+w&mZQC4?rsVdS<Zm@%7&yr3
z@JnOqvg1o@JAJw%B4H6q{zfBG!uIucxb!V-jP;#*fHSh&<Wlw|eV@fXMwV}csvyH0
z9Ptnb3}?EwE}q$2moj4wcxOD?Yjz;ZXi`(6&EwpRRgOIQt;iOREc?tXhag$tu&Ma9
znB$F*T&6wSmzYn|Y7ZO(k))jWAC$9L+V*c|>Wc%YQjep_Htr6;BeE%jIWntk5~o||
z^8Y02|8tpot@6Aw$$ai3GosaCsOqI19pZ4F#aW(XWvnq^|56Kk&cIvBr)>o*^+8Q=
zjnSncGB>&c;BJ&nAUI&D21@-*f+>*8dM}q8f6|4|GO+bmt~9c(9ns}b9-M;I^;zOu
zvq539L8hiuU(T0m+Y#fK7e$w0sob)8N0Kg;9hER~3(|bWj>m7}z+dz;Bk)DhDgf`5
zO;Vp6cr&rF=Uh_abI$)Gmpg(DuNwwI>Hi7J`3nBsqn@r_M~0G5fZxBuj0Mbpk@JpD
zI_wk#Z)atj1F~ppB*f}SO9+_G@~lwwIR&OVkO)tMPraY|saGRoS8qCtCb=-s<nw9X
zM#)qL6>@<E$zN?|UJ|^TW}{+6udYifupsH{3(YCWIU7tX0trB9rKJ9JFdoV1-{h}0
zyN8Gu^88=Lh=6W$t?2;QQje@7U|ykaW`nQa<%o1;VM`a9IhW<MJ~B8XXjit--Nqf6
zN|6Qz#hBR3*Af!L`S)qa0(g|nBi~fs&_0J>&s0m)`^+ak)4$}rD0hDATDwB6?KD@w
zYB2V-0hH`>(OmaI?)|mG)2O?uXNmEwph8`}&*SMpc(?ASIgZ)buEfyb+`L_mA*}Nt
zJqpY0Qt9yry3AgE@bksQ1>8RBz}7a?HNT^sz2>ucM??-))OpzpAd5ofMXSbul`Yo0
zf(89dGS4eVM_tnD-Lgf8Y?JR=iOf3XEWM7KRVyBI3YP0BxkDrKPR1zIxxq`9!SRn4
zwy9zc_&kFQVrfcHEUYmgMDsCu7;%?en2Mb-t<Zd2cr_xrO}D^7a!z42QkJ^raHHTX
zEF|Srdq0jgxhmX!uV=0k6gd?ktjJFj6heZa6~pTEMvM~NeW0Dy2!WCy(2UArbZJK~
z!Zg1i7b=!u$5M1$;|?L^0Num%rDZ_=urs+Eksip6ZyV^W>(Ilrx;ug>=f?Kc<(TE&
za@EZ1Jbt863cCGGG((cVz(NHAWEAM41*71GTGUsnY4ldk|F2NARpblmPt?f@iZ`YE
ziL8m%fg##0TfZeKQe`!h;yr5<D!=>4Nojh|ofdi?oZg2u!G>=cm?YHrUWI`{0FpFf
zB@=)O&FU|D<cmTfs0Z2VmnOYM`GW%%2nuiKA|t$I(OSUUE?b>6=|apk)0R424|-rs
z30c`vQoG;ti~r*+c0+}6AO+Et7)bW44~1s&n`x1F0=HgGe)5~je)uU4@>&zfGom$o
zuVhJzGi3@x$+v+@)zYN5%%AlI4(^7l3^UBne}SS+B#r9-D6c972~R(g^EY60t7NOk
zC*4^|b<0V$&*M&Pgk@2w32xY97+YjjbS;4GBH=78MOrLYX*y3W|NUufQ2J|4#zEyr
z*I-a<r2T1=;UWnGf`pOb<c-(!RWQr=i=(RnaFcA|;iOxp(5&NPXV}7~D}C$IPXqVU
zO|-V&INuwi^>AR&WYa<<2j9&4NJ<K&7F?6uqk;40aZ=IrDZ}uX|DW=vqP(frsozH)
zzdN;2gB<;z5W!^o%dFS|<`hV8B<JcZX+=yqt|5Q8ea*;7iY$(`&>6T^Lx;dA)&{Qw
z%t_{2k)%9_b5*wH(`?OY@JxjOQtY7;K(XH5C{i_S@;PA2&%)SjwIXpw{Iaa61I&sL
zCew+U)uptoFoY3G#{;nL#ErLEPOwUfX5^ICE9m(jP2K+Y0|VqC2WW?Sm--triEJTX
zB0tttZJu_CcBA%iw$Ejf{zTQ(Qj4+`*0pLW%f_fceXC9@?soEYsqVQB(nJlUX3Mm|
zoMx&~Im1Ef=`&^~-Q=lKUf>`b>AmLtY^~$t6|B>6(Q#JrQr>9_H_kd<Pq;J<9T`uV
zoIdq&*7KU#X>mf%wPHDBSof8}oSy=^78@ibbSs<~B+z9qJm&3Thwf&w%)_NJ-bBu_
z-jzuo+fe@Bp}eGMlgS2kKYsWx`M@o6V^+CNc@GhJXOgKWP6XEp$H;ZF4Qv@)AvXa0
z?72dwvcF4HxH)g>zt|A;@7`h@LPc~vhM<$SEJ<Ifx-X^b?^M_VCrG*)7r$&AN<(xV
zhO&oTnx&ywI9(+3{oz`nG#{M40#;|X(JBo?<L5sL4?hxAuTVawQU8(k(MuqNsbqJy
z7Qn2~l5?0!+tsSlHxo-hYJ%IIF)TsE7rhvUe<z8I%GT)23ambtG_Gd%fL*d?q*&lQ
z7@ADG*l_q>KHfDa8ppdhx+$xuxlo$AmP+4x${X-mz;fx|4I05;7QG1IZzJtlQU=d8
zD+E@y`P{8~JGBjPU0<ah?C^%%JZo}ks!u3)U6?C2UxQ&Z-2d-#MY&vg4cz~2B!{df
zU)9dmZun>z0lCx_1EigJW0{#nkJF)Vm#gb)+qrpLm3mOEs}U}73qq|7A&2Fn)ofp3
z7D{0YVm)6fR|L+sXERG!2~8j?SW@I#tNX(KkVjPM=&Er<&X5qXz0?BOm%bXZkhihX
z1FIJDNjK;LUo*0pAl+f^aLGB5>n_eVntPI@&tu9xixe3;%;L=AOp~;TtcSUIk_w14
zUP_5jJ@g&!4v~~ScbuFdxi*cLQG`xc${XVAM0Z*47_R@%Q?x3wN&TwwX9dRH$i`@M
zc2%C{%_yl2DJ@L*(dLFTIm%l*&w%ofqqqqO{1VxExC4%ur8AKkQCJH9vRZ=4<WUZK
z!*nC)Gop<EJ&T^0X4+$jGe{nau;EaVATB>Jg4-H(gR>b$BEz%A*_d_z)@+Q8J}6U#
zQsG-e#IAbFIM%t*%~+Z&dYzg%u;Q@4jrwDwkOq8SxI{2l=C-qb{Z|II{%C;#Y)=2D
zD(Y_aFQkz?sZ7=K)RVQFmAePff5|$MNsbD<_|5wbE{+`?s0>k$q7XW~VyJ7BFf9X7
z)pvMMt$_`-BP&{Ni^`2~i$Zb6{(|sM{}u;o;bp3G#+%G*QyxZ=S;5D(%Vo7qGO2S4
zQnR)@YqO<cHjmC?gKo~ss$r1klMnT|5MtQ=*izv@*lNbB=4{#HfT*8wKUQhbXr5*G
zviT_qhNlsYuz+t6LQn%9`01TJmyKhqoR3_RZGqiqo-rC31{hlWs0_y5<sCszMEtKy
z(dLkd;!<mr+XkF_r8C+Btd^~4;6fJjR;YdUFP8xyB}pJVJL<)&;ro#lIZJLnS|lb-
zxv~8ypdSWN{;&a?g0*M`%-Lcs0JB-ZiC;s?Z?ko5k-TyA>K6g}i8cBoE(7RT_J2zN
zDtxQ9V9K)RTa_G9lqS7JonH-?q$?dY!JT&-<|(o~>H)k#=|n)u{4Y{B$fRz=@xA^C
zhNHo??P0@kDE%L!d|Sc4Kda}U`d_#D1H=H#A{)q+<eTI-+UeQ~Euwu*``B3q7CI2A
z=uBA`;=G6#zbs9aYUVpg1AU(y)e|P7q&v;Ir4-S~8gaH{#2WFS)D{b09yyXT#X+hl
z4CcWNU|6^*P6kOjy?h2*EPT_9+!nW?%Azo5D=+EUVi)UU6A{WyaV-|Uv33!iy>MBG
zpq3GtJOH`HLPwt<qLOc`09*a!!Hqm3J7BTShA73U4zip$0~QN9Fx-&K{}t5!cd`0K
z<!?&GK>9EF8$tyA9E)c~&;#K!8|)3+Ci%`f^Rc@)onDh~z<QC%(RP4aO{%g5ZsLQJ
z<X}~{yv_mb=rRJjIO+qS*>ax4yqYzRHrrqRq_m&AiG#nn)d+q`v<=|5k(O-Dvsu-W
zAPPJ+6fx#^C$VAZk4!NRqanH#!^oEX5367{KS|-~bP@cNTizBM%xKM^^na*wR8fwq
z3)F9s8Dt-#|GFek{m1DxNuf3k#VN%^2;4&8M6X*>?%3Uqh(zhrbkwwz;je-+g4WV@
zHzR+9j;v%ZgbWqyZeH~~H&-&HLK<VG$BU|F5v~?O(M|*^K@ZME#oQ5+f_xfpr8o&e
zRX!fwlsi(=^pVD!C@F^<Wf#J1sN9t6l#A|3V<8zA(9r5et<6>xQbIZr6s|`Ym(I*P
zxhF?*9Nohuv<#^al0|b>VYB+DQfr3S--Z(PoxPdRSZVv!UY^E0_Y_Y5_bA$VWQ}^8
zvPb#rM|!A((ZDceH=%V_Qq48iZw8Fdtuy4#Z+{D@E{SSkVl)VRzC^knP`nJ+|6VIJ
zK9CJd%BU%yIPEAhv+bn+jYMZbbQ^%oqAo#_k8QDVb+Sr9GVQZtG1H)#oA(+)cSk#*
z_a6$uCR@6j4D`mCNLEVZgJXP<mt15VWN}o-`XKy2OJht)Zb(VWP?yFK+CZ0T=Vrqw
z`1$`jjsJ_1q3Rmt>mTX)Pvd2g3DF&x_Y27KH0C}2@S0in0isbd*-6<~+GcljXGJ>!
zVs%;;#&{6TLQoY9xS%F5LxM>61`7r(q$R5xw_ej@2l4pmc0jy{RAe}*W_@LxLq@<t
zOWFUmTG8<pJMgAP!vL==EnRT@gqp<%lS@ayLa$)FN%_w0H1)eB+MW>&0n{ql!q)@T
z`0=1pjF(g)Ag4D__HO;64Y>6D4^d_+S{dn9-%(})1ANQwP)2g1yD&7BEWsv`AlJ4r
z(IfZUewA~_`!j&5<|VEzcY5?P0CEATkP|Cy-^R0w^`{e{f%e5+G~S+R)pxP2VE6U9
zg{_!WT3`Hn15%BQj_wA0bI9V1;iER3egKw-8+#$M{vupQ6TMo(G&XuEV45pi@7#7@
zniUAWE=vIm<%0N5c{K90%?^aC^G*P^iL_;idd%jogsHCr7N(v=4=7J9udo}!f@l|p
zu!b~cI0Q3?X6v*Su;9|{ZdSEjcIb-A{|=P?A#U=f=F@JsJNw7~etZVfngO}YLQ+{u
zsM4&Y%irup9*uAZ9AWZZ6{yn{9GI)5(!CvGc9^-xj2Rgj=I9=qT+EhwzmZ{_f;<}D
z5R#SDdIBEE>40ZtIN(~rvqKhpnX@I!CQqr!nA`%*og9+BvhvP}O%9Y#P3nix_W*aU
zsiz*9weGMFc}6yPTUxr15row;Ly3ic&;rdoa&#s=|LfI-in<Wqzm;k&EP$KURzv~r
zP%l^aA`|ef>H+njdXIX)`lxzDeMWsreN%l~J*K`#6mkL?O->~)G7WLV3&~PaNovVD
zvYE6ZZ}1LO65LB}Ah(hO<RH0++)o}QN60heCGsYDn;awWLC<)CHd;GXb7|AG+1f&F
zsaC1gYU{Mks6N=C?a(gQ_G&k1w`vEpgW5gX{o1425$zf6CGAb^ZS9!$URt{`YYz?8
z2#kTw2GOn)?RwE}5bZ|MUL@L0qP<wOmxy+=Xx*Z16m64en?>sp?H1OyI9o;Q7425h
zwu#m!+IG?UMXQUpL$upi8*m0i8xn0;wA)47DcT*P?Go)y(O$~hUC!O2y-c)wM0>et
zBckmV?G>WEQnXiz_7kGLnzehK*NFC7(SB02*NOIe(SAy_pBC*6qP<bHH;MK$qP>~5
z`<%CkcE4zE742t5dz)xKC)(RZ`+3oRL9}0F?E&W<qP<hJUlQ$?McX6VsAyxNJt*2k
zqWubM?{ePF+QZJTiuP-wy+^eFBigTv_8X%8rf9z<+IvNNA3gt01qFY4l%FX7RHq^b
z@MY>D^_S!nvVeHWr{Dwd7cEaaS6i!HuRW2q<C9uP+z=}(<vKejJ4gjJekK$~w{v5*
zjJW3vpXDG$v`2g9_fj56nhIOy?BY4RcQNB{KbK#LWM?dEbCsVaw`HQp6+Ccw7qc8K
zLteKoSBVb^!d&GZcW73eh*0Tn3;W$b`p9<eW{+N72nLThcQIRV|68b<-!^sH1P576
zAF-A)oV&R(eHYU^EN>0_!ai>&GFl;_nGS0O6<OS<;^K4rJU$M@o=FZ;Mth`d(ho!x
z^@QuyMmr;X;S!5o&da#7!!EWM=_J<b9USGh`$1U&aM^ryi|?5}uK)YuaFBohiHQ!f
z1VdqZ_Wti{^e(rb-*FXpG1+T!>6jAtK05z2KUq5x67rCb>v|tES_k7Ft7gf9T}4|0
z-X{LGn-@DskU006Z2j?%A(bBNNyzP1gj9&7T?jg0WBnA@|Ls$>3dH}tpe|MRrFJw2
z<?hJTm<D;Of~=C0rxM8bREyHTMph?F;`AxEucLM0EXC^4F#=GtA?n*~$6ZX&>mNh!
zK5f3xYX{T#m<pH{ld_DbFVSgDc$SsDg`IZb)y5Qnw@o&hHo@vrbeskTNEdZn^v?Nq
zW11J;gE6g<Ek2)MOjPG9g;M3QukzhDZnFWL(*GRwGm82dGKSo)jX^n}<DY-;49NKw
z$VjY=*w({KzElsl_}oF)s<0Pfe<AF!`c@ApZ&9Nj4j~_8wT|?Vlpu^56*<v?P~@ai
zr_}4Iw!PSkbUr-8JtR^}^eS~9OM^;7sobbh0o%V9ag{XND{7)M9To#+tX#C86eJW;
z)VHBN2ebyI?(M9oH+-jiGt9E^MfTEhaxocFFQo{b4!9i59Ci1n*?wq}TBr%~^?bdR
zrg-%+|LrkjI*~&*JG0K%mbKm{jI*64{DjWL>u>V<{iuF|ztJCCFyoB=k8yJS|H+D0
zP7ae(;s1ZK@<~Mr#7-Ed=p-NXLqg9_$5^X(VrsF3(4CLmZ~V*9Ve6;?l4|vzZ4HGw
znhU~y?~eRtZ@|+81xgqDTVzS>MBvZ{5|q=L8(+c$9*V<0cc;4xIcr<PfhIb~It~Ds
z0B?JT-hnb%Sd4(HUKb3|UdH04_R!Az6=2gl=zpW)zdSY+LuipL|CN9YP#!QfK0giF
zVAoTR+0cc^nAi}E1bj`VJcJz^z02kc<&zCt?SL8^%K=dHm;q|yDanzPZ5nBN-rb(9
zSH8LNSv$by#~f_yy5+WRf_0}##(rjx?r}RIEd_zDW96wfkaPaOQqks<F7*-hB&9Mv
z;ul#O8_8xMD7RnChu5rK?Vko4=_MVJNBP_l+tXVR8-X!Y$krb;kHM&Lh?l?`^qmmP
zxAe-0drjI2`<ts=6y!VUe<Q+~A3F&kR}*i#({6OEiHCv?aG;2qqDZSwIMsHt7sZAH
z@>Qf=?#P%Xn;l_0#NFUVRK3r&#;@=6cC_;1MSD|y;<86=r@cHj48U(9U1?6csbE+9
zv=0#RQIM@8;0<!K@80yDQ)jScu-ZWU{C`5xE<pXCpQvXjpGfcgXZBRY8FOMjXUH1#
zO`Cz~f|kvKPR!Fn>m1a3{5w6Uu)#GXdlP<LW;;2Nb7Q#xYdL92bD5cbY_+GkxeGQT
zf3qjh5<sqbz-Jr)Q^xE~>2~GuTWz=J<k%R%eF0gY=GkI?5Ao9pF`?B*t7w$yNHQM?
zi4!Gv-^P1v0bLv$4M6K<gXxUZR={`&J0w8w7U4^A3}4EREWO+o{3Wqb06zncm5K=Q
z3GU<30Co(dqlQ)_C4o*gj$=*zq52!_hCt>2TqS~}AIg2oZ`IRa1>B|HtNsBIfNpXl
zd4Rm8odnyQSG!YtKC?4!^E40UN^R>qZ{o`KRA{L4`dJRLo<L1XrPAbk`$n#dPK-L7
zpXt@TroJZ5PxFkNdsE(!&Kr2_W6A{0`AMEbG)*$%yp~%M_L=nBw1kDP&Fi1)S}j_X
zp<p=eHg3DwXA$vI1Z08=-KFj>8s1Q|p56aN9=Nv8q|AmU!KZg_@dkM^h}+M0kP_nD
zXW_(C=MC*-eSMCv_&y8oNLJ&;wLLfs`UX^cVYlDH4MO`&j2SXgpi3H|5OP)V{AjoG
z>ZJSFW{N++G<bu1-mmbY&`?>6D3Q9KFWEi|3sQxSvJbS1f~%Syb2xVDwC)YeI#9?s
zKi~T%;|_ydZ(WauXAs@Tw$(t;io=u=RRnaXd$|4o3-tVJ<a&i%uMN|7*qqVhe?C3~
zAH@vFRl;ISKma-|rZOyR>FNl@B?;p$ohW$)H<<d6j`G~DYHz5i6{U6<-xYu=6a_>*
z@DlPv16tO_Pr~Sb$_0=md%4*_OrIzg<=$XJWaw+mkjM~6_lV>QzhtkYNTEK2IxN)7
zCj>M)rS}Kq!3Mg5ZWU2gRO82rO)*%gLKa1*D0UhBA=m%ShW<~PjS4`2QfrkjC0go^
z*w|r8JDCB7SVA*sD5?d&-+@)OaxUsYVZvnIzSCplz-28Vo8-7~!#m_FdF``sskFqg
z%IEL<8tN&GsR{aiZ4}7QjGYQ#=aG6j*4qTEQH5YZd}Jt8@Y64G2wRL5A0yLZr|{`a
z6GF2Oy*0^`CXPF<q17odn`_n@XLC~QWWc&uR**5xra6GZit<Zx2*Inxs<*srgmZo@
z4{&CnhDpujzt_Z0#S0Dt^au2qEALcN{@+StP3gab>`}-b@{(4f-I3_*AOG(73}kr*
z);VBe$Uu+J*#CY#abJAIZn+TR1bTRBGyI-S4j`yZ#*oO#A|h9AJi$OHy6&GLLxjs^
zoc^DpXe-Hs<SccI@?8bRC6&mO*aRT73uGhMOo-Qr&yai6O5Br`3)k)$3KHQ2iMZK_
zdMC!t1f&bdn)J8>DKSY(m{NZE{1Y6=9S$Rq3u9*h$d$6nZqsy{*~-LHW6E;op2fET
z_S_o%OHUbLKRI?fV9zJZ)8rS7h8=?>pG?#bl%3BY3$FQ`5wcOS@qlbHDM@eX6X^~T
zDHfEkRX@N%YI(;9Qhw|-fK)=<X@X=l$JlFDQqaOESB&ofz+-CkpWSW%nA86*g>;c$
z!w>(uEaUg%-5s9+>lu&}w@sC8%~~)BzHKbXrOh=JrHYH86$l{V1yWzoU#2oKw`HjV
zVXNuWXy-1uSeyi8IJqP06>^p161*dIpOLFaXc5%^sa2F(a<h6!dDeQd<o|kE%r#88
zlq>@Jlh6;;w<DO{O_QM_r7=_I)cf_$k^8OxKJ=x92a{_HR>#ghiF%htR5^NO{Vr}<
zs&oeeRAK6A3F`iQ8hP(^w+EqQ8K_sKo@A@Nu+ng)>H)!1r15OSCoTq}&I6+Up#f1x
zT4HA*r-nu%PC3$IGcKWkmVylf_xPFFuMP#XgWiy+$#)<Nov3?uA7Mic?x;2n)f=0L
zp&~Eh*vy8?BZ8%dx*FMzP~E_fMAS@EwhY;*ng0EN;1V+GMfq9<5^&OWed&{i!QyD`
zkw0EpzmwAc5sF*Ezk|wO)MEA1>Z{}|qLc5C54H2POSSK2_{wrD<51!}AT$<I(^wVs
zx?5>rNUMkEDRM@aqnk0b8_rEib;C~pgdaBwWx~fbz?~>!)pTdkzOu1D?pT4|oU}Kt
zYm$Pjp;hnA$5f5<=5D{YiEXwo_jShAfKr|D#N~Z;IqF-z9jvpSGC-C?A>$f5sm@AT
z-9W^s6M;BV*2`D=K;klpR4;aj<IcWi<aAuBGpe*+9e@J@Tw%6*+&+PX4whheDu$On
zwsn4q7bd(b9-T7{dK=W})Kiwm^wxK{VQQ#@N0BEGzbEhJ#?-?mYv>eLjkl@IRpEmH
z-|NZ8HU#VtfZM^A1e!Z^j#%y&%X8R5muLBWDIB=Vy}_o|V4KJ1332n_*L#7W=fd(a
zWMJ@zVF1{UKxL#Jhmp~bK0Mq!`yiG79ZHj;jV0%(EAT`1KM_xCD$u!#1DqK;&;00T
z0evW6e6ka${Nx(_SK|$+JhCA+1*}IW5MD;CM`oxpGfcbUjaT^Se)_6$bS<&TSz$o3
zfZ7fS8@&|%u)&Y&kaxQ<ROB!V-(Vi<q^t}z3nU>MbVcbITFi#3KQ+}bR7(GI$oUF6
zA2IsB)8=TmW*-3@@A1EL2IS;b>d_KH7RnYXkW=>{9(Ba+^aBZRMZn$aW)&(x;zHDV
zjr)BF7zzZ1mEH-KG`Sq#_e$`PLQjgQkK7|A4zQw0wE)&n7qCPgxku$n!zAj%st8UU
z7+qFauA1?vxi7Uipe@b_RIBWiEB(y#wAkb3HFa`-Na=r$GC|Q!Av4vL_~H5id$lb#
zW0>M4Q$f#U#QAtm2~vFguep1BBY>W<j{v$bHWS*@dJ>kTpYbm!7`T_HT1bM4ON;f(
z-GQ-OF}`NoWRpMs`q(*O0m5LsGvjqKVc9cc_|@qXuEO9>tqBJIWS|vLK}^pIS>#G?
zDdOEPNfi10x@*qDd5eTto_QzA=T?0ZLp`M?=rxwb0?#@vD?DrFa?Szal_E7=*0PfF
zmmfv>K)bFstZ5F8yAHD-vH)&Yx2QfffXqLasaLAkBKOZN>h0>C$o}(H^_%Lqk^krW
z>XYho$N==Z`b+gU$N}^>^<RV_3(!cCM@~Z?pebY~DMTiq3rQ(ihFm~v$wjCs)=K;&
zM0O${&?m@s<R)YU`U3ef`3m@rdtq~Y3|WDmCNGeekr(JK@-F!kd5?UcIpB>rT00rl
zN6vy(Vixj`oQM2C<)}qchYUd%Yt7nL<OtfX?b5oDCFoPy&Dw3q6BO0%*1nERK@V$B
zXg@@*pcl1QwO=4x(C@XsX#W_1*FN%Ja<1qp1E&2%&oW&1_N>J9+Md<8ezIo+uGjZm
zg6j=E&A8sw<HhweJvy#8_iV>?f6s1QZ;cXMZ;KAa_4epVxPCD@2G;}8lX1N>Iv&@a
z=tNu(MW^EWmFP@d?~cyF^>B0^u3w9uhwDAj3vvB=v;^00L=o?mb8oa7*9W3?xPCj@
zfa^oijkrD>rBFQ@rBFQ<rBFQ)_2c^eXb{&QMBy)*b0m5hu204^T%V4ei0hAIBXNBu
z=EU{+*f?B&5}SbQPh)4}`m-2??UfjX?X?(%?e!Ri?akOCTz?U}0M}o|igEpQtQ^<3
zV|2!T6I+4npJO$+{x-G>*WbtJ>>Z0yX#W(W(Ec@cF|L1)L7A2Fj~IpdU$ItPKZv#A
z`eCdCdt8lSK8HAByKo(H5c4@?=t00d<b;Exa2<AVEUqUVJPp^82Lbbt(FXzZ5a&U_
zJS6WRU>-8=AYdMH+QIp_o_=sKt`iO}#dYFAtnZMs4_4ti<sjf3GVNeJuG0^$!}Xkl
zn{b_Zuo2f;2U~ERbI^zDxd*r5I`3c@*F^_+;(Goe?9Cw;92$b_l0zrqT6`!M*Rn&f
z%MYnIgjF80>=1>m`VfV!<`9K#<)In4)*ULqwf;~cuImq-i|d+03vpd{2rE8h!=Vyf
zFFHga+;oUSc*&vFBebhQ|M7xcX#9qQ1Gs)iEPt31CUZf*BuIWKf@zogJYEDEmwAJY
z?trUs<bI1kYIpl3JpC?=%>n&iFB=YG@t%S?ROYf&glq^0p1lrwnVsQ*ikQPGKQi?2
zaJW;=rvDA-G_o)@n{hB+IS$5Z1WYYi>IM6P1iw^qgi5>NpdN%`I={h<e@)Q;^v8o7
zPVxS`_S(TdGgbiDE6AqwVP_$Bma|{g5=Q7FczLdzJS=<XXvej7@K(lV0p2Fkl|H<T
zwpzkVjXiC8dpk5{?(i09&H}C~*r>Sf?r?g~jh;f&a9ZsfocVuG(GAM~JCxTHZ7OL~
zWBB2}=@TiB&BG3Hlg{*aNTJbv#YVeJqeHqvqOOATa9WR@wW{1^e;~a2T#RI+Y+?aR
zykd(PIf8L@dIQZa#FT6axAK}F&cn>8VR=66o*D1>t=$+F#^z!S^&|t_$l_lu;aTB^
zaz0FxTe$<By@8*HQ@elq*RHdJeNC(oa-9yjF8!^Pk)l5%GeM=_XEQLW{~M|7SMcvS
zbr|e_yVVDg+jBayc>WLhmo{I!Qv1=r0VVKkcWG=t=QkHPNE^Y<rD|r&okGj7)Oiq6
z?P~P2ATJ6xq&(L99F@E+pDO|xK!gRgq11<QoyY{yhkHS#<}u6X8t}drPirXXLM%!r
zGRA_Gut&e!YrCOBqRpcTh|pJg?BQW%|FV3%PH$}Na)koO6Ntz)N`Sp0C*XZNs!W;+
zJHN(r)1`QzoZqO0k#0PeV~!*mWyg4n7qQYIHq&)pPtfB>*q<l@{rEC;IEr>ijklJg
zrt4eZL{sauA@7jK-{@}a3cApNFWj+(k#p{*@dS^*Or8C6{*SOAAD+W)8L%#IKuSie
zs||4|_H03hVAF{B4*I?@ksqGJl|IRP^U?W1JYq2DZt)`bFxyS{^74a+=h$vU=u$#%
z7iDTfE)kyjD5w9o(fWUvAPv}U|Aw<}^U6p#wg@U16px>rKFTemG_RkRp5j`jci}H4
zPTB<<EsdP=y0L_Uv`wpXH+ywgS+h4Zoz3v!Z1y%O@&y}|9I1>g%$Tn=`jOgfOoL52
zO<T6B^a;DM6vq}|ESqF=I$7~8>EO3?km87IO6^9`5StI`51%qg!>;8pGCJLvA%}CH
zf81thl>QG>9#Qb`59-;V{?C&+<SO!tR;Yc(=3suD{w$SJy)>YAxHcdcT3**&&70h+
z(szHs%KFuL*Q|G-YDQ91%z%fiOgu$fDB-6H+R|_%#V2{6TH`><lT>>)M^^N`n)Uig
zxp<Vmhv*;+EW+)}kub2e5y}Q&#PR^hFzfyLdPihx$}n?BtA4_Uq!(V-GEu%L?}oJI
zf!o#x^x1_}Kd1}99GCJwz1D%Cg;ZzPNYL{UJ?w4=u;F&5xX8P9vm;WJa<|5_56h+p
z3Vqlo={j^!>*&fbV?^_=^EsdaOBHT&fXHfHr}nQd>I)6V6U-8PqRad&{JG8(<S)CC
z)Bo!f@=r2P^(xo>I}dkcee43D*&vCWm;uF~oro_i4|pIWdR#$pP>^>$RIRfUiJhsQ
zN6`3;p3iykJR3v{s(yaPRGl)>mOO7lC$Gcobf^5BV_LD@Sc+qdGo|W<w)}g)rqBgv
zfOwa=!)ZK}H}8F$QFN=Z^T1$^Cy_ZBY&S_pt4}?_neZ*)5U2qcCXFJ_;lix<Iqvq~
z+e`vXAc+5ksY%gZh1c(IP<`VE|4tlm{N4ZMGvGKTmtnWs-Ry302b<gh?s?;yRvXaU
z^^jNhBe7oq9<Xp!p3du;BTp)l?x6AjmF+5#F;myu5L1HqA9piKdQrqa@-TMz``a8a
z7bGRElCNee4a2K_9W;qgMYt=-Wc!g(y!DMn2Pzk)^i~~2Dii>J#2GWnG_HkWHXLAt
zyb=j+y<V19IDaJ@+@pBS%jarsGH*dHlwgSZC&LkV)Tb!_e}XzsQRk^wsV|}acNg*i
zEY)uMFW-fk4R56*G9md?SNNbma3j63l{A3O+~V=`#8X4-90+1fx<TUlqcXq>Z;)n<
z3IyEH+VhNp4Xub_VQh?=a+gN^9PhE%9YR<W>(Wu}fF>^$D9v1d8H^-6e;1L9YmXZ<
z<@X1Sc?t~A?r@MEa*r>BZ|n6yK<{M04w3Vpi|gLV_)l?_ZuM?Q5}^uru)`fdZ4Wxh
zx@$wY2>}~0bhG!2T;+(IozkS3C4pKuG_+0LW<Jd)$puEnK~7o!0TV;>G#aLcVvw?S
z$VLbPpoQ#FTAsmwBIW;cl<A6AOq$fYlwadV>rdpoSTT6MHKZ+lW+_#je5y+PDc9|>
zVRK+VD+2VH+0SehtF{{c!z@tFn)9}?3at6opY6tQZfq&Wu#$MvUxAdA!zrnfhyCnz
zJGeK-mT;fQ;TZr<Z6xU_a@j^dJSVdb&Tezs4ez|zg&7|ViWMxkiM7$`FbnCDe<1gv
zdu^bn^nauRhorFbkUCE7RKKPEQE5T>tPZl9Tuc6-Rcq8CDbvpg2MUTgf53dGoo`jZ
zhI1lpIE5L>+RleIqMtdmpR5Z^&Tnr*-}7kSMtz%&CY`E$<0Lt1Z|a0iD8x*LIP1_n
zcw1ouV!QEs7dS{K?c7LpZ8{(5T<|Sn_)9|?c7A6K#x<F~I-8b}2c|hlHP)AsnK~W3
zC9Um&7&U5$L)fKjT8-|iUspcedE_JqLFna?l2X?k=h6OO3Y{-E12AOtJZcQ5n`w10
zXau&ULoE3JFqAnynopAj>oIunGn@A(#i|}Pn&MM^2^}ah?9rMR^-YKxX1zZp_Ty2b
zHZ|4WQTHu`7pxBZ{T?5O{Q0$*o~d+t3|v*JeHX(T3Sr5|9hsiy`aifaE>_PWBQ*FJ
zN`E44u@dM{0N3~o@Vev)NM;w#mVtTFEkClsl#xqfr66NnFh6H7TwAS|tkpVm!}qvX
z!!|?g9uh0VicSFLlZ#%kvU3dz!W<MdtUUPY6q}iV|9?3adk+G|Ggxf1Okqi~6M6?^
z#mAuPZ+1#hcK+2_iaHAwz~+(%rBDC=mp3-XDuyYSkTc|bqkE|#uZKkGV(w2{ewe%t
z(&@2EFq9KXb!x9E=zX6p^-W5jM;vPYJm8z3xK2|}tP1eWAT&FNgo}7DSV`e4U|a#?
z4Nf?}c41OLx|hb50bL>3YK`0>O%0L)V<PZWN$nbcIEZ{AC1F~GtHI-IqPe|8I-~7$
zH!!B*=tuFE3m@Nv**vXAf9yVk!#dOdDQgw{yHPz!y@nvc4EcwKc!W$o=V_hEl_GRC
zkO%{{4H}^QaIqR}qyDthf#|uUS|+P!&1$v;Tq5mY1=67R=NK9FSNZhQMzGDXmWf{7
z31%204$?gD#X9o^81<Jf2MnKSj@!&b*>cCI-vLcl8GO}RxJ7@|KjrETTF<zF8D*J~
zZ20mTeY@M&g*cHq&lVrbzA?Ub)CW5p@T*C4+(s9GM3YYWX&4PqfTf+DyHW3DveC?h
z-FCu@T<ej51C@xjpx6N)^S>l(ELu;wQGu9X&?^u`O>>sGk<KNI;03BArJa_z8@<fj
zJ?ih2{uA{cMZJeSmC1=e{_ICH1Ks0d%R%$1NrV<>l&FD6*P9X>IqF+rEHITS&8v1J
zQySb_Xgv^4-?H7K^2}rRF=7_HXrzIdbr-}|U~-zENEnpK8BEp0VCp@T1K&fC^OfUk
zf)^o}2~MpAFa@-*pXmA5lt&fv8}%n>{^LH~V`8hY<YiE54a$-;H}km60;!${YH5MH
zHdhcG&1P@P?N=kI%ay0sY%4G(#>J%64(g;B=wGUnvcijagq2&i2n3PE-qhiH+SsH7
zw_I-6>D{@pm6((YsL=*RT3}J68SE71AKLB~_R*tR?QZ#V!`Q6ok1R0E3g!P#R31{G
z{hy&;t^SfMMST9Bq4odDe*h|IhwgC=)rn@fgQNttANFZ?4IEgiyMJW|txSk?IQ<zz
ze|ix{GMA3T;K!M2-(2|(`di=OL1IC6z+UPDoSMKg*r9bgqMkx7xGpsMJdBHWKGy)i
zrvq@2gs;yXH&wtXn}Q6DEn$u+f3gAn7SMhTrkzy#1(xBubm~pRrsHSp(RDuU+F;p9
zwQCcr^P}EXGzL4R+A}kuRO-+kz)4!<A$?I8Zn8>4oX^tp?;vXwvW9$Ho2;Ss_wmp1
z8OU%3njMiUIhnp5RoNjh(Cn<+y&iK;Fe<OQ{cW!GdKjt_z0tM8-OQY(Mmgjvd{De%
ze2D?a0x8n&;Xv39ZQYuns|d!iS+j~-+(Jku9tUc`O6e$!uQFg<yb3)dA#F2I0^IST
z46GBbI3xcNazrG8Q!EB##JzY+Ln}4%LB&*tYWH0{{aO{RCE7vL;nH$p49|}Ifb;*~
zP{<qVBg!{2T=$RW@$M61tHH=!Kq6-h3L|GM7nv&dUIu?O&e>+Gr|Q$GR{ji#Z(|MY
zTleX)dd$TtX&?3!)d7QG$sPpj`088!!RAMQ<gjsm&WP2C`56@PP~_%Ho9(e+sg7p9
zPvyF<)A$BzG^$J}{U4$rq0%blZ|ZI8F>*-5FByCyXFDKcNg>Nr)KUgjZ>nc<pm6o$
z$XO1k46+VnhGNJ7vG^IeptzLIGrVjf3mn~gmPcM_vb?0aJiQ}#O)K&>B0bYuXszMs
z@ACA;UcVNZ;(*pOyGsVZGn4_!y@6l|Oi9=;gsoShm+jt|eK-v!o>V8;&ieSjoc@1V
zA#bbSQ@)(RxgW$wyU&O<3@Q@OzCeG}SQt9h1v4uNl$(BXH<0)Q7;%lMxw|LC)?$L{
zp+guHDmNJN?9oB!RJr2*<(Q%~F-2}8BajzcgDI+lwqj72Mk5cN>UvW=9;g4vvOcBs
zMLI8FARDI}=7rM#q3U==9j`u3h7uonPFt*faS#vle@@qtIS!bTvQ2R^RcO__w@`Ny
zrhI}!e9+y|f%+!gN%ZFnHAx?WfpY4|zosv-Q~g}2+mAT&GT)YV9wiemb7N!k8ZM*M
z^u=fcmBuSq2k5|?5%|(Z?b!(Y;SL2O|K93|tdd)`fs<gB1A*!Ug3azOmlvfskOsil
z1+6U~&d9&Xl?0;)+xQ}**92-j^LR#PormJjFFXYlxnu)Y?=UdTn6eU|yTetE0H7jd
zc4%Ws5=Op9>AyocQz5TI{y$TR4LqKaoY;mzbM-1@Zs3JE?UOt}PKkZay7OWi2M>K0
z_E!5!TaH`dZD|d)QjIN>{9n$L91QF)JQ>9~ugtH}A75xd-`(S5>oG4Yp)4O9%Aa-h
zd-gT@%I7cnBBo~o)FZQu({pBQonVXxh3XH6xn?kIK%2fLSjR`-Fw77={{*bR`aSZS
zfoK2tZ~rkf&^<9$jcvY0+Hao{j1;slnM%owJ{hBB1|<eZx%a{kfD7R1((r^~r^EhV
zgGm}R`+s%=bFv%fvuOd<|D6sDnP-?4%Kr~jwkr7dC_DhJQr{v=-~sRttw!s~?*8wy
zUuIQHwiU+QmBjgSrmk5M8Yp2memT?AVAdIJ#vm5cK@66bXB}QJgTBDPd8Q+!t_mZF
z-^0V-U+?SKz;346F)Q=os&CiZI0N;D8xUVWA<l5OfZq*KXT%V+iTSSOZhz3tWu;%$
z;|&w(8#2`XREI-ek;vf}B1rG$O!)$eFj*x=#!dcGI77Ugsbzq6yTT2HWl3+1$TzwE
z5Ba}-sYd_3*}oK}`{dZgz|hOFR|kPxgR(cvyFc5<Y1P^i&gOr2u>nhWpBLMNnbCpk
z24`k6Wb>0_&%sB~%bs<J*?Yw}d#A=O!t7C>>A{&jgL)!W<YyuXStl`73-9N1^XLJ?
z+z{<bWw?sMDaz1m)r-|Hs6Qj4$a+-ic~(0~tJI#-Zpkhe@c&zHLtk91by=&U5ao>=
zo9&)pK{4ukv@$of(lD@dQKy^vxQr`;ZT8OjnvK1#|9R?Uj6!$KG}i#vPK`SU3%YBL
z=1KNy>L1eF1$RVBX~v<9&d?jn9FgJ49;?t%2|d(`Oft|w2HL6K${T<laJ!dluEwDV
z&(O<lGg9?~jtrI1Wg`3w;4=`G<H74~<H!0RtVLx&RGTS6Hb+FbtOXeC@w4#w)e=*-
z+6}$o>Q?CWfV&vaG43Kf+O<HliAL&wGc`^k?GO@pwtErb$6kvnJ43Iue-^cOp*f`K
z0t$+nnmj?8fd{35*@#c*#F;<=o`D}ySg5sFuflTd8J`|1C`D#;FgHkL-@<}<PQM4D
z{HR&lCDxBs#R1WX6hX7LcC?&uCFTFus|yu%p}JJ9RBP3B>Snc7?LZZ<%hkQ80d}i;
z02RRQQSV3nuOsR+sQ&e)`Zj8Ry+;&O{u)hAMcuDyWHzdPEhUwx`Lzy}16q+iWC!Yf
z?IkxrmN-BTqSn{_<WW@mdWO7&I$v*-W8^(e(M~{(uTwP_Dtyh>79#6drB;jTUYoU6
z)b`q;U5?6LH)yw_uGc~B9#r*uR6By2UN32HqN3L^?Y)8X^-=#eR3k{D;e0@}-xlq6
zMEjs<9}?}uqJ2cPkBauYqJ2!XkBjyR(SA>~-)HR)oJU0a7Hf|<kBatX)*f~KP_#c1
z?USN?O0-Xl_Q#@qMzqh0_Bqi$FWMJG`xDW=DB7Qj_9fB&jI}R2UlHxAqJ2%YuZ#8#
z(Y`6#pNsYvqWxdd{!+BRV(nYbUyJr_(Y_<v--!0NqJ3AizZ326S^Ed)G1eY){!z4l
z678Qw`xnvvRkVK-?f;4PJ<<MMwEqz8KSld5(Y`O*4@CPRZ}Sw<s-h*L)o7dN$jf1E
zPTmmF4i)VQqCHWx!$dn=v?qynglI>Kc9dvGi*^iabMu^{9WUB?dj4~i2NdM~eE_HV
z>srG{eUj3AUu2e}dy_S$i*s@Bi+bz(!7ezS2A@Mj7&LJc@kx+uvTaSw)WgsucSl@~
zZi)2PRFafdAYxjxC}R(XgBc(+I0dK5!y6>_$W#Z6GFe}3gFA6LKw8TGw<zQ-^@#GZ
z;q|*`#oUnCXdvgHNNj^?gnxMuJKys}F66jbHTp}xH^_0_r^Pm7#;751P-ZOqs;BI0
zvo5;$2|hcIy>FbIlVg`)b_P$glx6kj%UQ<j%^jnJZsZ2T%y9kRVTJrbeL^{$CN2J`
z9_x0-nz4-3gfj@%?ral*>}rA4C9{WP4QJN`x0u3xr^cEvEgNA(7@TPtB(ua|**lc0
z_PvOyDuB7mq(~hRYs6F)LG?d4Q<XhNCyRy&<;gpC^9k8<qv8Bh{(qQqr=r}c4n_6v
zACl9NnDR|+k@h+5PaoB>PW&E`7jiJks`KaKC2wVFMog4^@*R<U@~un_h=%Y`p2_id
zt6<MMgE-&H)QH#@zVxmzJH3^u-2|#L${zD{mQ-Ele7hCEE~mg|NI2tTaADswY0`f!
z43uwWD%jCENB*2%)vWWk!a(^}rlO6lf$}%PnD|z9MU&t2RJ?!Ssd$f3`tMNc6!L;n
zr#_&3JMmeR`PLKLGE8YBrvSgEk{pi1!!rcu%yQ-fUnO=4j9eOP1u7qvy6YQzRmRpp
z^RCYRK~Ww)IH@Lh#ZxugCY@(M+})?dS}^<>I7cZ`GBNx?K6!(Ew3X);UMHsJE5@mr
z7V}_gHo=2naAcvuQW6cCx5Lt#ufchmQ=@-(zhSPp{_ieDxl3K6{)616Ar;`q^b?up
zK%i@Obt-dAUf-$eRDcFTeZ-BsmOMWgDk?ylq5Fa%^K;}(2V$tRKAjn&l|Js{g~)jh
zr1s1@d>Niyxl}QOv{f?{F3d4y&YyDm|1E|5PW`#^*2nbZXAD-PGu8%*FdUvm=@H8e
zca4#I%r-l!E*y(=xmWxc%7ITB5InLaY{k&eNSzo8J|V+RXUpFX8s~iWYe)fh#nUzV
zL%%T2#i*DUb8&X+`2odTWauW9NID!$(Nnp8@2iYg(jUIoFeUW-=P2hZS{@mto{As9
z3dnwZF@2cgB~%wD$>}rWL#ewf$WvnX{Yrj$2edU;&P$kgdTXp>m=aD!u;}ZbmymOE
zp+~$diF6T+`LR`ormkufTP3UZr0mLoO046{3|r`r-EG(osEOH*VUJBcl0XbQLsvLU
z)yAMGOq4gjz)|M5Nlk`Hh_uFhNdCV&^#n6w5;D}6_VGYj)8)*#^(?mF+a`@MjFs#E
zE>V<Al<%oi;PLanq?CMBJ6-G6?vup>3GR~*`DACc-rXJ!xV`+i78sR7Q1GAt+j76&
z>8eJ!so&Gi+~h{@m5-9NdW(U!<1JOqT|OU@=#{}s3hJuSpKv=+nnsEhwR(Ypg5m`%
zh_}`q47yvG@7d_9H#ksjDD5{GkPY5Yrz6K81Ab3tvtuwh)2<PAi+aNWug-!1Mt6H1
zk@~b@H%3b01yotsfS_BXN2j7yeWxDa>u{A^Z9MwC#X1=6vUpPwLJr_Zh-_HyAc||!
zH`aRGO?*uv8Esx;c0n<&axX1k3g3R@UuVl>?<8q-V_}fB!*4N=_hO|ZGDdF7`=2VP
z^Pm`0Gfh2N4;Mt_R|)35LFxYxB~Q^-lc@TEx<R>D$%~vB+m5K;MI;4hb2i_UvWv6J
z3eClh0K=z_mN>u&r)E0fV@YqB-W~+jdZtEyron)<BCc2%5H2RG<P|(72n~`dAgn{E
zdV6EQ?dLnddCZuE)qKz7FtRED#^8pN%rJ&Bh0&<B#`{Y>9SCW0(>l0(8k661>h*sW
zFy3Z_aZ)S@7?+R~3TT+-(TqRKkhZ54_!9?_yCY*JCGN^^qRLLJ_mRhqaGnzj0M0V9
zG5z&6+C?yz)yVM2)3C;aDtY5+x$woHBA53pBec_E+W>6|S)T#4W}-pSS`n>q>M9B7
zL9S{#W;8!wR2KJ5dFKHR>qdtGR!aZJDz_{6_kCmlo1j*yA@xh@Q|kZ0ueTBv!9PpB
zPyVQ#sa0s(wA;0>XfGt7_F4XFx`V7F&SOS%8HR`yv_TXz^@cbq`A30+Y@~M@7%#ge
z{u3`(cg(0!!~Io$zm9@#90BBMy&#xz#mc6pa7W)U%u~*BkW~}}^FBA8*uTtjAi@H-
z$}RC9dtopWdBnB(JpRUTfO+pb-|xNCOtb4fsA1a&t@8sh0T#r!D9kDshIUfylBZ5}
z5ZLLCS<ue<a9}$M<o-YQz63t5s^0(Jb8lB@X_847nzmEA)23-sN+|)_q-$uCE=ijf
zD0Grcl4&M$(^;CPQ0SB$p8{G1^{F5VGf}W8Dgq)3O5F>J;DSUz!5yE9D89e{?^&ju
zIrmQH%wz`S*?tPAZSKA2_dCmPU%2=2@3T!(N1v1Af2?RDy5+Wrw#5Gw5X!ZG@Yn`l
zi}wVCF0uesY3T<gqbHtRiE1OLoe9H2hnKfgd{ZobW^!Hf*Ti@2`(&qDe@-lueW$i~
z(T$syab`sLUkSYIdn9qa*At-H_lS!ICurv1n5WKVGNr;bj7{MhCVQx{AScKe+q0ti
zCTS#i(!Li73m|3G?AdVyclI>xI{bflH-;C{1GElVzz?7j;2GpnavkacEkrc_-FeXl
z2B8nb{vs+#=ecx7$xmV5c(ckR9(v;>`wiBP63gQp4P8=vVJ4Q9AiZEXNi3wDte|aA
zOCLDgDyx^VVb>@;KWeE-x`?aHVc|ir{1%E^yXT^7B$75nfxCHZ6K3GuVs<WEWwutP
zR4PHuTdMi2wb<iGaTz|DPgU)3FV|XDTT7oeRE>^Go;Fmog<QMN8)Rs?*5ch+<tAw+
zt|r;9jMb=(wBb%c9QGool^t!@4!lv$XX}uI0PzOv+JsvEbRm)CGI#a99zV*2bHuvw
z?m06|vXZ#=JCK?SBi%g=qs#H!3f>gfb=ao$%|;PyWJ$RjyuCDwcb(PCJD$@5x}CJ8
zRy%6i_$>kNZTQxDewJK!*$8~PZ`E5UGTaQQ#a-)#J}@^7E!2<Zp52j<uhl)HisKW*
zw>Puat*(1*Ymx5L4SlUhm-g}d_62;QxzZ$;5!X=%Znec5Lc4XO2d(yddr<h8*EDi{
z2X9?^D(#%=dVz+iyWYe<cvm5Y!XT~z8`YbQp5=QX*|6Yl50c5;*r+<J9~3v#7=sXw
z8b)rm^34A~T$`yGmmo`LwBCsxAT#A_8l8C06_95Zle*mHnGB2}1LG(@wwz0_JMNO?
zm*~uUE+4W4tHNWHIFaiYh_j;Fz>e?Aa8A8vKj0jaPUTEjk_Dm6veNiB=Wqyp(_{!w
zzo!onE+OlOu*-G=n<6G;k|U;=hs65bDMPpDo_&CBJ@MoYT^8g&3s%t=+sI+=dPs)Z
zeNQi79-5Y#Sx$J3wKh-HwIx|%!(A707<Yb3f|1Jq!?jm5?G?RU|0M~LH;n`G{r^Ak
z_bW}9bCt|%gW5}2he}(uTXem1Ah@+wDBxpBsjffgcY0Z_bDSOp^1uQZk^e*VRP)fJ
z{Gl(4Lyq&a@)h7aYkdCW^?VsLe~Jz_4~@wmG&1pagr*_V>PMMGC=C&Rn6Jv;qnde0
z&mSDJis%T(daKO}TD<d->!qk}9y0O=fvnOvLQqHh8~D%xfNjRFxc%=O&A602Ldx|0
z+E27|RPK9pYK#n(pJmhnq5jEdO;!|3+MWkxdkP%)9*MF=%VIhpTuSP5=NJw`Yl?mh
z02kqmr_$b(C+3{}tblK`4Byn4Hq;fg$;##KRJ#Op9{F6#k1W0uwc+RrdasuuEW78b
zA+KO2)%mr`3{RZ)mkStt*0CBHzNz<IIph_z^H<4M@|sQ3hfO2JoHE5jWvZtdth?l_
zELhSH3>iYZO+m8zyyl?Er9N_2?*o7ka_RQhq&1}Xe}uL`Gj?eU$lpn;{*+#!-Rw*O
zcE!xm+D<ZA-QT~)6X2eH{9*W{m3<j~{J6BEuwa#>QT@{5+X;uEom$uw^<fTbm;BJV
zzeByvtDkPLzHzOzTp)WR0pH?m4CYDj*|!pfD|}SfMq0APmEmCyyJ>ssqKW|y;a4Wf
z5RQ$F0E9Eh>YP?k<{{M9>g(o)hhYxJ&Er4ywwvq{gtosTLsT3a4v6Mtqdq3Bnf-#o
zE!zQ$0Apao9ByaQ&s(0M2cNQsxe`=uv0*fLC5tfi<1h)6oH)=K;z-J329O^T7qVF~
zBr`RLyetGsPn12hiZ6rr3TYWQ|DU26J5ZyeSdVD;Yg3Nj{^+>aX#jo}S)0>YvI7OP
z#$GQsm<@A)`NWTBy!Unh{KE$8`2h*w=!)1_z_gY0<^+?S*`NpvY(F(ERwT^&KqddZ
zK5@u$dF|3Kqv#TF*i-o)8HY)+F~FgmY*dd%JbwC|!XnmrVT-JBulF%OIZVHHrl0zV
zcGIITFyKNvu9AT}J$5R9tH{Q;dIC5HgCwpaJXW-o2e*L@%lyn0ZY1zw=|bDL$k5G-
zodW2Vk&AO#ItOX3xf9*7S6OW9n_+R|R7LSY?V<Pl7J&W$PQdrefX;}G2B1sHj+_9M
zbvzm~(i-%&`&tnYk+4#`hB=wl?9b_UU;i=(bMM0vm{k8CPwRia8{NO2*9ocsb?b-q
zC-gs(soHK*OD-WFAYVg0(AkF9c%Sj8@onR|<Mbh`Kb&Eb8saKmPnlg!Fx(jlx?wCv
zAtG2Mxr?K5mPyu9$Hkz8<Fte$B-0spjhShZ)%1IVF|`rgo;%FZ8<&wXjAia5OrgTr
zM=~cF9v+;f4QJj=?5$n3a6GK1aMyvtwQ`-xT#u^9#x<JT?u%Di-93J97$raK5hRl*
znWRG6SH7Jk%S`x>T_sLtH)>>u4Vs2>&1FdSp#xvYEBprIx#Ok8!Qe@K8mw(zgoih|
zT--NN;vm+ETg?f2-JEW>2bX9ckDG8!Ow3_FZ0jsP=73|UPPl<fFEB|T#l(K(YT%0O
zgrlG~=xgnw_1D&U+JZihXo1e0qps7r!==RG96C5$Ch+YnaX64@Oh`kN;A&yrS6!31
zPhc{90+p_^6Mw04RWrXWTv2v|Y{C`A2;CCS|MzI98uqxhhg_h)Tl-m7*E-vWJ7dM8
zH7}W=rbHxBi?O#Q{bj0qU7b)Sj&+8^J#7_{fNx)Un=j~X4Z{z`{w-P_D+LMOOd8cl
zaMJfHlK#x8lP&#*>izOTDRCfO@<Uo|<UtVQZ#P&!{(llN2EeX70&M3Yw%em}#q=!$
z9N<u2Tn1Q=l>p#TgmxcLhyhPpRr?C3@&-mjhJT_)!!}b9dys9O7%Ku0kfw5y2<<mS
z@~3BZxv%&RI<Zr6WyffFfu_X90XFEfYDW-P8;wSe>$CP9w0ZDV-2B=tM=KeC)~{vd
zjPn0s1o^*P$erZx#%2RP&Xd1Ru0ZZ9&|snrfs(5Ql+lN1P$$ZIkvGU}4&&A|n@~lv
z`<$IiuL^oS-B6Fht({!`9Cu+3-?fX8umjSdC9iv%r<J*S#x-m+L5Z@1*REXF1VqnX
z#5z$vJ+3APaP1-~>ncNI=TRqtX}06mQvN?otI&+a<VyYX`f&VluwT)}*y*5Wy`)c#
zo()Ryoite$c`8RaO#8ueU?x|8r@{K^_hd3XKQ;+yZ6urXf|kREN|Kv`bf+(RgM%Bo
zqC^IFb!;NQ^^vZ;fNQs!4k|fkD{5>18W4!=IVdAi8Jhq^wvy(&AY#9u4)V2{7_Lvb
zLjWE6fDCk9Y&?MOCRSd6w#y$)gKJ0GD^%Kb>?nO3QR;pP8Or|+a<fKmHijAR9_;F$
z{MpGBDEJCQ%xG6;?umZ8K~Koth`71{XCe($`(BG+XjIiMZ|tUle6wY@ES^UM0Q}#z
zRxse+gf1rTO3GY|Kd%^(kUA|RHgrPRvo=_r0T=;Nr=0C}fQscD+2E*Ra6B0_qiG7Z
zCwZ7FQo*3S#$ldRP~bK9cDQS4xOmtND^8Ec$8xudAL9H!s%cT9k9<~tK|j6Vdz?B!
zv@|vu)N~4232K_93OSfvYA~bK=zrB7%&b<{#HInTh-wx`vZyl%U?PObE}Yc`!WIih
zUWpDZe(rcEbFeEqJU8z#iq7~3>to9#@*dq7n|g|dAd?O?-8efW>~c=62lo)6$_`er
zG6#cJ`p4ay1WL~wmQh+6n}U7mRm}y;3Z*K$&9&YW^hH8*+^hHc`~k$~GP_xs;)Cu^
zfyS3BWi*Uf8PJ$RO7nW|+3|8Qi{P+^4lUy;r~H4UwpzpQNA$DxPa*36gQ&_+69UwK
z?KL3{Wz>1H+X%Z@WQ&9EGouRaZnK-#ZgGK!JA|-vgt)JRT*h|4B5XqV&NISxDSRz#
z-0+u*(EZtkSY^BM8(k&B!ANT&ztDANA*Qu!=(WhEao3^1o><~}g_zc^AFKf*L~ex#
zLHBHD7pn;%*_|mnnXCaXZgX$!7QXO>g*eG}4zt0sx|sJZOcO#FzOyL*H?^lVqlUEW
zas1&O{|hFH8DM!MNLL|Po)di-B(*2oT%hSkD8HD1V7yPt{9;+`4DgF?RkwV0M>I3F
zRme=5^O^v@&8Fu!$EIUXP9atS_N2=0P8I&;*~nxH`r(wDTkq|*f<AAE=kb(f{YvY0
zj+*tu-SWOv$K2Q#OEqFGt9@~BCyAu4a2S#n7ey2vYTiY`hk*FC$0YD6{~v+=AKI7T
z`9F+qKJPV(jYIDMA`l&B;ymS-2QN-9{h`HHxU-sy06p%F=yc`d0(xbm2@x)zP{4N^
zCFY@F`TeLpXQ7-%yaZ7v1aA0MmNyib6Gl9SFT?|2*5sWdp}M-Ac2aj2ob2F+;e^Vw
z>MApORlbq8%T`SDsP!WDtBomLG+vfnr#j1wrs<%Stb}KAje)sc%vuxl@)NY~fEm3!
z-}u_)t5rcyhZXRK5hu1L0$T;o+jecF_rF-XTEp+JXus7<^%ivedQ$&0nT8zVYsk0A
zUyaE|ov|Moz{d(i6{=079U)Y~zDbEt1^3(<KehERPYb%Qq4otQ<mEhwqs(D}ZFJJj
z<A%x{f;d<yq2rC<T<2^+W@QNl$u2NDYpf0cy6ZTIGnbg8gMP~{1v-C=ox-U+P)AY!
zcTG#IgPj#Z8K-Bh&FXefXP-VxJnIl%#IwdW25Cz@_H5N+le7YOhlo9J)>b%@ka`P$
z()xg}qf><Uox8{+JLx<2>%M_jRzd4J7|J+@W|PccjpZIj->{zm+Zzrm&DVLUNT7Bo
z7_gDoAK!w|AvWPM9%oi&OPr-ac8Cw+xG&;SJ7o@)OZZcBU{pirLM}+pNnmZ?W=iD5
z0wGmD*xJc}n48!JyPTf*{3bv5{<#*2qwA39$B#LZy?F5W**tbk)jZ*v!sY+3YKBJ6
z*RRpOTA({#xX(tH$L2u(3X$dlh?Z)5uXaRA9uy+vmwqqFV9_P9*+9XknyHip@2RY)
zvR|rHyFyu}CnnELi1jv4*z(w{f~|d({bD#Muw_b*jawns{?U8nwZ9@Z^Hl9n1qglt
z&QCrVNItmGBxWF<&|p3DZV7*G|6igROUZuy%i3SGB??zHS{++ZFrCMtESQZTmZ>~+
zJKgh%4c6nYOE^bY$L0h4KC-g_TdvIZlo@2{4FZuz<>amCve=nGq(C+SyU;4z2Ft24
zJ~M_X&e(-Vz9R3!ve>-B0dJRpWea0jRmNwg91|=5$g48&t7CHucZ5`Bh%$%VNk?g8
z(MUo69{-bs2$lbb>ti(iYGUYPNR<53fHUwv^jF@Ezfk?`5;-e3)IbGhCJ1gWgu?55
zf*M=l0EZ(3O}jgSqRgdheIXQ3JMTVjl1r67R_{0AV$G`orNTk8;T$Bj7E(jhFkvRn
z^W1hz>fi;L)Jj8SA@WsKIIy5K*lp^UWn*KH*DJJ;^Jx9AQ5u@AYvyk;d`=&)Ur$Dm
zYI3hJ!?-m|Ixu{Gs~KIJc|}tr7$^^Mh+sg>0uA$^9p2sbv?yH{i?A$y6a;I`rDjy2
zcSY(v^h`R=(@cB8Z|!lfjqs{y#a}^8<jsCFx+6<exB{CR69S!*hI>G@MlG(!NPy#G
z!K26`P<Z6W1DNpo%S|}7GoHp2oH+eYoiH`>BTW#>8h;=41l3x-lm-=l7V{shFgyy=
z!}fwe+CWE9HQu>Ktsw7)#7h;a8DCBTpp<_ls$Zdkm1nQF59Pinltt@sNMG4wMq9H0
zQ=ZYm#sKrcMp!}{eQjPh{@>k#GuMkF!R-J=xEtnI)Jhzmz!O)j)rUgAw5A}C=jPXy
zo*+Da?xtR!-|zF{G_LdoQI>>KWLhPV;fPAy=1aRxghXaO3CCAep3Q*(G6I5$;LQe_
zw9Go2ZYwdyfd5a$MIU*Iev$qP?Eg`tn*BqTm;e9f<HKHGYV2{|i}lDshcT<7uC9)j
zt46t7%e}hC#{<F3?gyFbjE*qTpe*A~(lbxDBvHmdlB#oPNkqSx+;0!3>VFH=fqaO-
zQb;#P5RAtSX(c}gsL!f7|LLpEofd9TGd<L-6rr8@QF<7JlONUaIuOWF-b`<wr#poE
zM>CU~e6->oy$q-Q4M%ukHpkd}y~acdKF9s73%J+#Y2Ct#L`XY|Zqfw7%@M>ZhLHD4
z=bUsl(4C?t12uP|I3>*v>Zqt`<8%cS2CUK7$_Z($C*<?HH(^2A;M(zpq<BOWYdro1
z_Y4;Lcv=IM|A*;^H2n~|f9)rKGj7ag0Zu+U^cCne;XHOcLOJ@IDxCyiyJ<h~Y6s@E
z3%}{z1Xq}_z~mWkWtT&AoOx(^zGt^vTC;FpsFA!Z^Z;y!M4CbIY_1S)|0~su>4^Wi
zOM4B)z!3}F9IHH~P~jTcJK4*!e&s9{Ml-3wdcq~yJE9e_MKIj7s+Kg#Zo%yqC9Zf<
zQV;*uU_U;EnP>s>mwqLKygXI`kPGACsIp%fhk(a2rN?I7!p&u&Ho41ubZKlMQ0P)k
z(ambrtL(-ODZZ{O<0Gfvk+89Dl2`xYSUK*(X(UttV{tA%?_3<^`}cA5_DuVzgdV^D
zjWqu68vX0~Sgmo$91WX&cEL6~vkSB=<0I>P=xUq}&%ocL)rc;REdl5qsx@%4I;WXx
zF=Q&%aDZ*%=}xhM)v>bxc7bBh>=sO0OhK80nNxnK>@~XTlNv(Zwo*CEVv7NOf!rAO
z7!En;x2!7TGsTRwfjWQrKKaO0$Epgp_6~}?O^_>7c<93C5^I0A1U{AjOSCIB{Qk7|
zjIQbP^=<k={XYFwWCH9U*OQ0I3r3MqV?>O5jHiZ78>A125DO*l;;LZX7*HbLE@!3M
zlxHVu>D%QW*@Jav;!!(mmi<NZ5|3s)EUv{OULzyhaV<=&fZbs3;Ow5oE9zt)zUrDT
z-ppE(a#fyf5+89@J5aAd0|+@{)rvuXJkF@vfgh$1)Z@j8svTm#P6XHSQv1~oF<<Ed
z;&=c}wUg(bR^~^ss@d+9ks$uSgu0pp<aQy1nkSq+E(xgYo1V@~!Vgrn1DTb*Njz|@
z+JPuI`an4UU!fUeNu&M&?MZEgbVW1#HEP7FLH-Jn##F`9n5u>y`7I@08EU|+kDUuJ
zt|F}kkkYbIYqJTJJ9C$iL%w2*P*@gQRxpmJpca;8e#XOG$`GP{ZEK&oG<FVvFO0D7
zaFeCz&CCIw({B*#{>*g}H;e{iOA!q;9r1{TI7fEIrEVY?Qgq~aEpgI{C5$QmH_2p;
zOeXI~<o`_>uKUR!|L3eg-ctZzk+RE9iP)~>SlU9E2A%n{LtJhl?6G!6pFsOWjBnn9
zPq5r})lH5UruTn`evYP}gZ!U$`X+t5zDw`ad-Q$K0&dW6K{mi0dQ3l}Kd3*ZAJvcP
z&*=mDtNLsD8$=@`$v9*Txyf9zh@3-KpkLr7vYqTAour5CBL~S1<Q8%}xdWYrj*th*
zW8^3~MxG-B<W=$-dBf0*k;pWjXt<5J#v<b!V}-HK*ko)sb{U=MIJVC?Xxw1jV%%=r
zVZ@9h#)HOV#!=&#@tiSWylT8=yz%y4#1RHTK}c7r7{`lof*2=?agrEMXX9j7nHa0t
zSmv4{#;IbQCPudyr;G6nG0qU<Ofk+9<7_d`5#wAj&J*LAVw^9=1!620<3cf3h;fk^
zE5%qP#>HYhON>jzc(xdqit!vVE)(OqY^-*jC&u%|c!3y~i*bb*Ys6S9#+71RCC1fa
zTqDM{Vq7Q2Ix$`-#`R*{AjWzzHi&Vf7&nP=vlzFqvC-8e#$9Y|a%~mkHZeAfal06I
zi18vZUM$8-#JE$8mx}Q+HtuqH#MmOnRx!4T(JRJwHg>o=#pn~`ZZUR=(J#hsF$TnF
ziLr;v|FdcRudsfP_M$f1>0U+8iLKxwUG^o9GStGTa*9x=suL=fc)63*Rqdeir#_+`
zVzTtOhR~jEl7thji7f~0g{b2J*zFmE3^0`NNKR_2R(o#GQ7Wd5ZP+v8R2hl7*abl1
zfNJ}zEDV!C!tMj$R;HC!pgm{>PIMc_PAETHC6KY6ULYe=9XlV$6vAAI;5R#?=REI3
z&uv$=!b4{a@V&4ee@O<vE_PnQ_9Bbey=wJmFFi<+8Pj0><Vpz{%Kt}dw`kfe`f2F<
z`2#YWe8ea<{>zC9ycPdefN)6lBkQ^#??RXgd0SC$Mki<Ij83}WwkqmdOmu9>%CVmQ
zYrLFHQ})j344-t$N2b@5#!ziZl=j}4y(pe>T08l&s{q>zfUaHjXLX?|vq)4K-x@OE
zdCKR;IVB!%3ew(12;gMq%S$=`KT9)~f&V|Q{YyJ5^DU3AjjaX&yqsK?cOwY`=Iy#t
z8lz~n@}o;w5=t@BpS~%PKXemW1ytZ$FMwd9X8Tq%k!znEM@e`QWP{Z*4&||xz`>*1
z@h9nyRAdy+9O7lSL_#8!xO%Xk_AsB*xCZM7e~|&MiPZw&!boHeI`8p{X-Q=Us@0xb
zzJjhgkod+AWh7R{YJfx`%8=m_*zF{>PTmJqH^odQ%m9sNdL=X{{~w{fPt)F~PuK4t
z6Ho_qv~g`_8c@I|6uVVscZ}_>z%8^tCL*G1f<dbn-LjiHBj`oK@?#o%tza9^0^d{s
zfy5yWXe~+`gc3Ezs*l%ac3qe~E6RMO?T4!oeLZL_Y$A=kK6}oad0GX*{Cu@Y*zC4G
z9YaAWj3k|4OChGV+uxjMQEdUHR#P}#%PIdiwI6B5eA1+U5`XwV@hiGMRtMr-2zMZe
zvt5=;>!i-cqg}$3w2}tvhd+^sbaZ}f9niUqtSp4UWhaft{pW)@*Q?&3tP$WoGeQQp
zF}4;VbA_nD2L0Y1V?1brU3Hc(tT{r_f~@$HSu$FiV{3rcFybr3F4)l;EW9GiaEvp0
z1X53wNl0=2|D>ipsn_XWCTEiej5CdU-*H4hv6pi)<4F3mq(X}ly>>QfD~r#(I82ec
zxB$wVonfxt*Xr^6S|YsW%q9EGXqw!lbg2Uwk+w5ShZ6cbvQHV#II*2oZt-?|yIUZU
z(S{W?TN%G-9QC&BjWn5NcZimuy|y47LP6)fwwe{2btg@g(&9+Ue55VAoM;)V{a^2O
zH=r|`l%M3fDBqTyD%UQ0|4X%ihTnH;-_S?s=jvYlR`~kR|Bp1F9>AyIx%)c#lQGq}
z&<GiK8qW@eHdL9!gIF?k!=>vy-otNDP1Ch<g-H(3@7h_JqLiNi%pL}qRx;<|fYnYe
zZCRS0Z=#r*lGWLDej<L$ei6ADM3Pz)kK3=0qogSwSCtM$FkF?LIVA#D01hjS$ZqBa
zv5eVRTt#GCMh}l`1@CXy$eP_Xo%jn5F<;*%hY&@(O>u!qwh~v9gKfsa5SaL|UE;G_
z?|5`-lS4S7WOCz?kxdSfOu`zN>^ZuOmyc_5um}vsjS|3QWFg%CH<|kX+VqcT1KQ-{
z_ZyD0hQgU??2a?WOwq<R=%wX}d38j^IL5O#30d^f+a&o0C35P4L?L3!A&c5Y1X+_-
zpbryc0{F*&CIi1RwgJEw#>S+2sjC$qT%1r}p0b(B*2mTZjRI+7_9ITOkz?R(wL=lc
zbPrE;i(Pr<NqJZ5Viy9P!uVpdunkqKKijm9BNJ+RuY?Tc|HJfmY5Kc}i`;`~oSTl{
z|C4`sYga(ASb(~K2~&mL-IXfNyXUU)`McfQl8dT(qebSS8ToWXIoeDd#QU_xJ==Or
z_&4(C8UsXjS+UWgreG$?w5pXE$!ag`vL)=TKEEg++MaK%1}NIuQ<8eY@ND7yANBv1
zkPZ5++IQ6I|CPiVK>;U|n(TX*BrTbwcBl4#P1To9z2fC>!Yq>^37{sn1z;7(ucRiB
zS36WDbP(K6pGXO^tHFBAmY}>ewi!qiB6=Pt!mcJr`6HQAOn6`n?0yflNxUTLjctN~
zY!W$800UXhx?Rp%;r4`3`NIh^qHALtu}1}RfZORrnp`FIw5DmhgfR0&w}cA6|3OU)
zA_F+0Kd2Qvt~N?yO<25HximgXPds>_3R4b8{xpCF8kuOtd9m$)!XjI<KdTv_aN@dl
z-BL*d-Sp_oz+`ws=;ElfZ_sO+8JQSj$I?_X%PpS@*083`&*)cPw2%Ye_FWnHb+K*i
z{&)(o_;wQKAZak>*W^GB(>&Ywk6VF@*<gMB!!j<_v8}+RTeZV?(&5QyA9V0E+3XHY
z3J+<=zO|o$AG-K@34DJ4r)tLeq*H&t_Pj<*fgS&aLcco;hMe7~WV6<&m~`~!NBV%=
z$c9kc$0g*VXT>f7_#L?v)=t_dNlp>&0lVIrYMpO#P&QMZxP0vw0rv<LDfx^H_r}=8
zV5B<f$UZ75BiweOa1cXMc6KN2>t7ztPzqf-M@DIL>>{9K5MTaLa`5ma$+<Q&dQ*1K
z>kFqn%#rf`K}KqMYzNNQo?N2GGVYUI-b_{91PN1lOdszV01DtEZNHRIp!)xC{RK^b
zfm}#FOMYprHtsxr{ZIbkoxTEUl_ZnSVhT@cY_)=3CpFUHBu?ls(LX(B6<thaC#uvB
zXC?XJCRG^<L9)qJQj3pVW=5B11}*s=9-r)3Ep}s%m-YN*g#+m&EdJ`nW^`$`-=~%t
z$L~{vB;t}n%m7~ewOlIQQg?;pw>O{#kiU-?)@7hS%=y1ZGuDx7HIM!Y?Ug(qd5HVF
zKqCtv?pL{}xL;-5dEIA0+%lL3mc?2CMHk7txU6Jm*_GK8qumqvBhY|J;E{VI8Xesk
z^MH4rMk4v<odDi0g{69-oGgU9a(PR;tK<%bVCa$yWCWMTE-M%xwX4&q2ns%`@|gDc
zAHNC|Mxg|gEkWz7*rh<BFrud2RGI2h%;<DnQ{Tqmww|w&mY(weB9{N7J+A#hpN0Nk
zA43)3G2|?A8M&2w-56mkH+CDJG@i*bT}bme?m^B%Gjna@j(7!))YZ&u*<>jIx-L4;
zBoX4u>D0SCiI;OS#jizctWk7oy9e4qQ%!F_=N+$hWiWcrHc1_w%;7F1TdMhjE6_Ao
z3$Jw3!RQ6*pa=ZkK7{kY+W-z#gT8|uECL(MD$xzW;`MYo96T2ZgkL=PA+)gPu|e$e
z?x``!Rm9c77D=9Ei`VZ7`}X?6eJFnEb))Vs3UFI|>`XM_^DQ+=7ySagY4R7)<BWD;
zp4;5%3A0{-v=20IIu_(h(ZN=1i-jqIEv#EKYVG>`ZSZ4zf}$<j?sHADhfZPFziP{?
zmd$PK^z?Y?YJ|c6w+4KeG34d5bn-Ba4yI6ocm=&753;0Cj0mz3%H*SVxO**HI08Yo
z9$g8jsBW+pC4pD(^#tgOUl{2@31O5vk6>Vriu_;H|7##S^nKbBd8q#vh;@wCy2v~=
z-#}d;<m(9d+EF(f&Edx0mil+&_o02DTuU0P!^b+q;hwgNNWizRyv-N%wuY@>AN#lH
zqF6g<Z!4+Gw>b&?aqzp4;jYwgSOe(MclDVXiSB}@dke<Xb0Iam9By2ynC~D7=)Fge
z0Kw9RP<x4t;GS3;O6kl1{VKq&42>KPk(}0EyNw}jJya?qy)f2_ljzB%x@?jX=3sEb
zNwiA=Ne;`wN&Chv&vJ;L881Oh`M*hOHBw8yWSn8#mWC~#{O6M^kY)w4&rnJ}=|b;!
z&_XD4LvP{$0%1Ap?Xx28kXP`;@ttOLb7q}8X(}hnhMiC{6LdH!3E34k(V20mb`3kd
zvKd`Hy!j|&%M<g0ot<DX?*SDs5;@1E%>GBFYKZpTO}<EejXFGUTke0F19tMC-?kN4
zZ$>95oc*+Bgql#RH^ADQ6_sr;qm$IWWxthFV@K)M;~$$`X?PXBMOz&4;0srAgBhKY
z)hmPLM!P2Gz3+Rat1SBzk_<_gl}_fJL{n`>XqF`W|M32Y^dIW;HG~2b_7}R{`XM8&
zCtYfCVX8vFb0%aJtuFkv2M{^zq)>J+Z;$#5o9}zL;lta1NB@&VrRc0!7XYs&7v}`H
zs`jR;=B+vVmUMtlj_n4Zm1J{nfKrubaAj6O;oUKMYC7;PjQIfGW#lR~bEb3va@X>6
zHxOutK0GBIHr26CV6&O*$!)Q-HwWZkLRk8VpQZty_Wv_UIsQMqf|R4{-<if23w!@h
ze*GQ10>jTx>r$93cV}QysE}lr{+-i{a7f(+$a!=y@o*72B@qXc&n!fUwjFsY?La^m
zvpbkwTpj>3XO#)l@X!<!R|(hut2K1|JYoztE`JA~&6A+NwJV^e7}o{%`U0)K7QdIb
zCEE~b>-BZGVUc#%dcEOJYcE=2mb*9kJORs%f`hHzVAxtf8|Af@cl!cX&|L+SefM6b
zMHIif)r`*1eCU%WrT1%#74V^JX|NZwq6t=a3;N1-dwlM8AC-cOU(OyCs-vv(gwVv*
zPisAH47PT9L)5n3?)8Mxd=HvOy=R|$i^tPKJAF3x0#|en*Z_3>eQeSf726Ld<3h~{
zS<H$G0&|c}M-~2+L9eIVji!W1re0~aw|jYb!Sh`HZ`X{qq*ecdK0#|Q#3727$M!%-
zTB%x|Ul#f78ezf#WOD{(<2kCnuO^LH6rCLF8Hxy<+4IuDs+SGwo!NK)x6*+(FJ=L}
z<*F6f<n^R?LRN{KwI^lIohPy;9k9D%fm1c4WkgGJ5|LS`@!Ex~fhSx(wExCJcWv<T
zM_SRN7l<@>VqnEGxVsImG1}1=ml9z^zHaX5>d41eE**JwIvkh8y0Ia-Dzy%Q$gG>G
zs6YU$=OR$sZ?y^QXGfMVc)#$AG=S6lZ)%^z{ntK6cI&$far^W9O*H8WVXZ4jx0;7>
zjpg^lh|EsNDoO^aE41Dd^tV_+%U#m~3zatl%H2dM<eX)dV{gm$4gL2ME`fg~gO~D(
zSOgBS#Uy%~+BL`)3MXIX#-Ojm7ocrot-WYD-Dsi4Svcrv?ShLbjPlB8XCrd|m^moq
z;O@-s6U`UCfRpxV`k!n**%1rF<5@(y3x&R2l1>Y|z&6V_7Qg$VbjU4<1&4C~vy3~)
zHc+ASV=Za!Kb8N-k@*^#PcA0!My38o$al#v$^RPDP>+9$vB$U-wfDbaJeTJ?eDZVe
zycJ+kC}VHi<O?Q>6;eeNP3?UxEnW!LHDTU@8zn)|SiATX7W*^E^Qarr209#I6-^*K
z7xkQOl1hR%EMI_e?*{ncypW~?B^4zmnSmc|@wE9YG}cB4(YOc3nPdw4Hz*7E&bWya
zOdMl8<n8bT+o%Y>&Kn5!mAwD>zXv?N5L$0Tx2DgxPB+PN`g~_!xU*aES~uFCqM0}h
z5N)B7E8HeIpFZJZpTj&rH-y-paHqT0>I)T}Qe={8cmUBm!LBBc-&-<$s!5j7f9Xb_
zaSw27^aesKu%{8O%#u5%nNYRyW2+m=4}}pGkMUv`7?BkTj~kbGJ@IpVVXYModl1O8
z*IRtF)FgB0>pdul1nnZwfiR(xPbHw}!9VzYq0X_7&oRk*_M9*13sYGSP0uY>?~-kr
zuNytlt-#pt)B8VKJEY<Fv*`VIrT!e*Og>Kjf?gc|{ni}OCNnxOvqp#R?U3@Y`fW~u
z5Gy?hfvRZ_`no)fvVU96J(K)VyAg=}w9|_4NNm?rYSovLziGGa)>~G<e>~Xj2RqE@
z;_Ps@2gomj)UpyXOb}dt6HXypfTz{WWXZr%m8IG8w|C$Sxof&TZC=#*t+)0gf(<`e
z>8C}bp~EIrbgE0%;2Q0QhF;U=>F`->;%{v-qY90+lP9((>@^}Q9+#AT@Ozuhs6sJ<
zqz^izCPM!S!wSJ{2(D+cJ{%4SLp7l;dU+vKGANH_|4qA2y9rBKOZzQw%)j4iM%QL_
zI#@a8)!oSP1<?pvksfy=fCPoW2CnWyfFLLUH3oph?dNlRlivSg?N$xHU(hF@|IfSh
zuaQxt30-^w<TmmsdD(CwCn$)@U&r1OdQgvu*HXku=0jg|1w>qDmOen2{~VKa6IaL~
z&V6u^GR&hqLk_`os~F!A()I#epHMg$>BhzN_}LNa<-y4z=HE)H--o@UB%5h2?zzxw
zLx`iL?1%@4?puQe8$n@}!ae5Fj#}<*7Agkf9)mDYp4SRxU>?5MXyNcCOa6N=#Ai;U
zpRp6dv?x0(5s_0&QbJsP8ylNkH;yq;Q`*(X!hBr&d0DFc4$HbKX!W=+LV5~Yi)(l!
z@_vV9T<3FN2>pdUb|nvM-tVwv7kWBy@Yz$>@$lLG@&eI?^#);3NZ67@OV0y~OtO=>
z_B*V^8W{UJTd4Xp+r1{}^YR+eH}INb`yE1iS6P8MVfUs;sMB4?sZW%bVB7DI9omeL
zC)7BE)B-~8<NZaiO+4<D=Z6quN`z`q9uaTS+K5*raJ3WFm7P{kk2eT;0+I&!D0}|U
z80}SUm^Kl;xX5h19)Gxs-}1It-)PN4rm3me$9He+ZO8vOyyheC&8QT&$M%oby2*qr
zr>WrQi61MY_^Y>LqQMh@fR(r4^eehGwht=q7}W}~*=zXrII_WLLzc9}`@ps7)Z0sA
zy+Ev#>``;sXOEbj8)l-HInY?`hT2u>Fbv1`!a6e_w6sv>i6PPFp^^9SIq3`+l>d*?
z4r}=Rv|fs?e=m?r$fL#u#>WbNThdN&zHuP4*aHq3@U?jS6~`-BglM*E(Z_1d=&+n$
zM{a**(H$*jboG!vaXjv7zxyIzcQ=fS@H!!*1G+3@a7A~vo6-6qP9d&L(iG6BgIrSQ
z!gJ9l)jDaWSxdSY6$##&G)+y==Ybmv+E|ZO-eE<8P-WfQAZB=>$p*t7fn&^L!sC<C
zK|Sc?;?5*bz88v!K<^V*nW!o_v>AlBlQaYJeZW#1yTMbTI0t>m_iZbOZs`r|hZyEV
zY2GlG(2MTbWkzd;IKR*lljh&%YYqEY(cz-I^Du$X7*i&|LFDJ~<MjTI)Msn@Z0P<!
zB=gX-^HpP&@$s~m^FQ(j%_iIp8PC~q(T9sC$B97b1Q9s?2$R09QS)XWe<|@@JF`rY
ziq$MCwy)Y{i)0~MEf3xHQHklLmATbY^lhKFD=TS4bhQ+H+xP7j90!Shr-`7@>`#Z?
zl;fxX<oI<(eS!M_hHJH&5g^|pZv6&S0ItpMibqe6YjAy3l8tJDlf1?bJ*0T|N%|nW
zCi^o!a>ch^X$W2YOoR2}6xr)EGj<iAt0p^ggU+GHSZ&0vckNeuZrtatW^jfAUzXu?
z#jXUL^Hp;g<yFj}DQD26x1P5{!1XN|uGz5zfa`qKpl2IgiUdGeJHKcthqPUnA$7;D
z0HjM*E4s;$IusbJX{QlAOv8$_h@)u7$M)3pKON<#@pD9mact~zz&J~_k&6vRd)4d<
zBi)HxlKzLDzxIm#{h9<3zyFn*aS5vboT6LWlUn7V_di-39}X1esiru}C?w>`B&L|e
zW(GIq6c_IW8b4~Ve(@a%jp)qyFhG_2HCH3XidLJ`kHi?9p}@m3oD<_F;H*%sNM>6-
zyT|(YBm977vaQXqS_EuQ$gs_b8-Q(@YBj6l6AQ7#p{qlaWl^hRAC;Mfv24H6W7-oj
zR6fL3@0r#igE>1+0A}tKNzpX6-yz1v$%a<+%x1BmkI9g_<2oSCnIb9K6P2uvMJqM|
zM)1e)IMx3`^9&6&TPGSDjrgE<|Ktx(u0TFlAUerJJXA)>IeTlOT`kDghjF%HsQ_ld
zw}LQ3m<+;^fVcS9Y7X5sR_c3Bnj)1t>Oy|FdMI5l{_Qq1TAn>bPPJ&apqdH1g6y-u
z;r#zH&Dcizwads@J&YP4`TNxpA2nL@k&<lf`_y+t9Z1H)-~J<`Z9lpoek$l}jcRo9
z3C4vPDjXa!%q;{*34O4KdRX9fW8C$|EFLbsrUx_^br*I|mHEQ>_$h#Qe)d8DgV(P8
zA4f<4nc<1q>u%zZU3!fS*~Iv0Kvtf;F2^9VYs>XMPd6NP2^sZ92bPxl$eu%A5UVy{
zhHY+qBw$-kcIK$b*@=R)tw7oFxAm-*fb~ZWp^hRM*4gn9fHh|s#UbEeoo6pXTxeN8
zSXp6|WLv#o@xjrzOkj}q9GfXYO6`9x?FJ3MAJl%OkJHcBckA!dpU{7cejpc+Ahd#S
zlAn=Zlh=(J<ACwC{E>##FA2Y;B0jF`c@rfyVbXOqZ!(qHj^H{dT)9fh;1&Gg8y!S$
zn@;F@5BGiF=%A>lUf*|d_w$VoijwnreK&WO-{|1qPBshPk^sPd57zbdz&Y#<^5ChP
z`D$gptFD`Pv94^WqU*nwo8)rhy3xU4lBzAhR0ypBp@deXqZ2;*5GTR6jyGYYcD?tw
z+lRY?-&bss>G<ap5zelAPc;c5N#4gAh8;ffmnzp?BG}=uZRchqxS$(>G7a9|FoI>)
zS-tR-Q=?@N*AF3d;00kYX7q>la|inSt4$IjuEVx%P4^`P^L2W7OTjx=A?CuMFUzLa
zbT6+#<YjvVeu=>G7_vLgH%Tx3hHRKf_YK-~gcdMm1muJC{u`u4BQ4~2#=g`$dGc>3
zS77KX5FKeE=)V9$zTFg(R>)^(JscfvB7~s;kT}R&nS#Bd!%f7A6aW^Plw^n=<MRJ{
zD*u0uOwzB`9@5t5xaa<OF_rb_sLA@Zo^UsU#%sOEPYI2^E#<G{cTM?j#?YbY>Ua@k
ztR3WXwV0IST(*MAs&@Z~68p)OZ)v}NOoIsaTtnz`pCp38qB;(U%*o#L&k&L6ez`lD
z>t~P(TBCP!sCJ(rLp45r8lcKmNy#K++~^Qpmm-GDeDZZbM%AZzGGx=@V*%M>vNflT
zx04OKu%;x^X-5vC@H7Ka?y3`=9UlV_tFzZt*p}Mwu(RZ+EF)f~|C2*{*}2kUQvN@T
zoTriV$j#&r#(LuuIo|%0ul>iZfLcPt3A)Q9bzTJ^HNN?{ec<xkq70O^#!F1NH!?C^
z8^m`0p2{njcyaZ16Hf5#KkjhZS;i)Xf_?a4Zm|n$DlEaNHAn>iA6|+g*MBt*{>L5T
zlL)`{D=>UY-s=ceRycGuN8W=k5}Jbw*gk*28{+Z$Q*hW%iw-jnos#*wW>Lrp0N7oN
zy!;^21?s&)m=D}@>%H9;%^cv_8`A+wQQnsV^%(7@*jhjEN4_`8Cqz(MoSQFdsQf=n
z+pKAujcdta{Sob{As&VU@e)WrBUH<Or^x*$VtKhyM>6t^dGK*xW@kW0e8Q=;S%zxe
z>A@fnt-fSoHl1mO+N(N|xan?32&o?_HjI8Bwu!n~y}z!(1Ek#zp<Om>eN%iq*7^YH
zRkMgIU@9NrbdXZ-R4Ytk0>NBfTNj!Fyru!KHIhsk?T(jX3rm$NB`6>!OZ{mPOK0dC
zx~<T+oi^c^)?mH#qJ;3ixC{GOq}mZPBf8w?IsBKEPh`9<RQ}(gpQGvL=qvPf$p71}
z@6tQ<9%KR>)Njyl(Qnu9&|~@${XzXP{iuFSe@-9JU)5jJ-yj+pNyd?h#7*XsMdTc^
zf~+H($aZ87c9I^lj~qlS@h#+batEpk93c;q$H-A~j66pM$gAWv@`iz&BV!z*4&26E
zV-e~OuRzZ6CS$v?%jh(EjD5yI;|Ajv<96c?BZe9T4;qgdM~!2~bH;%2s_~lf#t`Y$
z5MLi*5F{zOf@}=A!eWewajzJA#kh}+eXjjtypfIjU6+gT3NaoK<CS8(N{k1^i0l;1
zyWe$4j8}{C8Zllg#_Pm*y%=v`<BhJH#P}{T{+AfvEynkV@n$jJBF0<U_+Hoh#CR_o
z-{(3k#=F>f*!6xfen5=3iSc$Zeo%}b661%(_}^muh!{UA#*c~d4l&*-#*ee{F4rf-
z_(?I|EyjDq7!zY$jQwK#lo&tF#(Q1&iSaXHJR-*X#rRn<eol-Ji1G7c{DK(2D8>iH
z_$4+z<a(Hm54#=_<Cn$ws2IN@#>d3?RWW`|jE{@)2{C?MjNcIBlWaWd`lcAaCB|=y
z@jGJtt{A^3#_v=9Z)zXZj2UFT9>O2~U4BKk#V3O(UPb!y#@u9?C>;;jM#Ceh0atLh
zoZh=szg)2G>m+I)ZHk|sXSOXzFQ&tcvTX$7aZlP|TQGylYr9XY;&`=OZpUj<p7D}x
zn`r?|_G#tj3cL8{2#TO$mZwd|Ye#${k{@+dLvu#<%xhRDn?TaxwSl_%Q1>FjEdhsZ
zh7PqCwTEsOGGt4ygdFAn!!?xp_;0;JKT5WdmyDi&8xl}tqJK<Ai%O>ThBhSISkf(9
zO{60d3Zr_$T$Iy55sIL@I}-A>x@S~!b?wv93FaY%Odti2RF8JO73dNLXJ|(Z8L%o2
zSS)&~c}StWz5-yX%FgN@P!eA&T`Z5kCDQHow)w&wn*Qi1<{^c~0SeHl(%yPcYtUjl
zCj%4DA26z9c7rG6iv*ok=2OwJ<{^bX1PUu7JFwE7=~_>)#e>qMs77Spse7pXZ<zjJ
z`v0B!hY>IF5u?;N^zT9e{=?xgzZ5aivotdW^wW|Q>pZ<(=z!20IMKO+Tij`vRHqPA
z6bL~~8H#KnL?4b=RHNdtrt5GR>Z8Owq>x8lt1z`gK^`iIppwvDw9Kms22t56gdm$O
zDAbq~ZCSh;aMY<a#mEfCVmlW=6-cWC1;s+05&Q{-SVU0lnV5H@S_d9^-V@<RPA0e$
z)7APTJRhR?VocW5XGTNWZ*$UQ%-DaSg$j?fs0>XwXN?ZA%JpcQg1Tfui>`1zeC^?&
z*H4R=QQ@|D8<+pj)r|4vOns_$uKJCO?ut)?m1YEq>S})2Of;?1?ixx*(@^pib&Zi|
z?(P!>m=4<xnew~ZN3Xd9qTd+}p_UzzbaZHBd@69PAW_=QaQcMIH!(S?K{97@W1=nn
zB^{i{TfAc5YJI_QXPc+bPQVZ6_j}sMmp{bU!t;J<Eux+ADZ;RtueGqn0H#|D)_T(y
zatFMvFk*Xx?C>JyO_c{azOVhDYroj{56QT;$IF207*qqv7p^vUTsmB9+yPpfuQ%jI
zpU+mFr|&vEq}R3gjzm=THPdmz@0Kv7^8cyYXEgl&gT6oy>z~zMCufuQknf`ISGRGW
zIz4zxp1i;$eKgonRV++Z<v*N=l~fhvQuO5yiDtY*Ja(>+B%sK}YVP{LN(7DSScBXN
zp6g>g1~*rA(sg??U_cOVo{5j^qhfn)`QGX73UfnrdPIfBkBd@hL%S@l|K1Ml<`dUl
z%F)5~o=_JPV7x7f+;9Xh)26`?${=Dj@!E)=T!BnG`dvAmART%rqv~!AQoV{hF7Mt9
z$fnRQ<V~Ta_kSd>|M^w@T>XABi+mI}|E9O(HnT}CFceC-q{<E_1RvMEYK1P-y>Azb
z)9uAJZwL|cVIRt<GPB?VYJD%$Ppo_h5_&e9_C7^<I7JRQv0io|I32$AeOB1VkKLDs
zy2h%ujwDr;A^Sx|^(QT|s<sSx>3uDzcgkk{>`-S_Wll{nHKN!s&${^hP-j);X$eaS
z!}T*<{{NF^OeSk}zxJoM?%uymGwqAd$fvKhiuqcrhX3HsPeQ^Pyar*kIerFrY2;0)
zROJJyjPh`93|2c5zaB`=gpK@&Bt}Lz#is+cJ`&2Cw?>sdCMDG5l7-W-1L^zM%xDN*
zc9x8jC+>z4FbX+3c|%HdzZ?>MhLR=JvFcThq^D9slHdO+nqlg%qx%m+qmq6__r~X7
z1*Q;~z4M~}!VIOVvL*2XyViSGUOuDUcj{~`%Y5wp_oZctUL2ndpN~Nf<PCAv^DGN}
zIg5+BarqvgcV<J#d#{Avq0#YK*w{+Qxp~7+HNr+wSkAZft$pd`@AK7Y`HZw0(S7lm
zSdD1}^$7BH%vE)}dT*QG+vjeK_`+WI+-}JFo+L-gUA7t|X~ng{zN4>s{6oNfUPGvD
zn1nmO{}VKAf_?@WZ=5P_|Dh4_xmXfv_{tCM!_8Nf0@XZTcjfnc%kI!QDcJRfv_jFI
z_&hAd1QIRE+v!l15EHVR69pXdH}vt9v}+N_U#m<XqQUr?z<Cmh(#j2auzO<rRb}x(
z{EBzw;Un5dzc&e3FMtqZt02}BpP%oYR+Y-ryA1DA4%0~c4ZUdbF^;oWE=a}o|JOC`
zb=|MOh}yqT8zYR1{_X63NkU0J{y0=!OO?7e^tGaboKT~`FvMAv4Sw~O-wK6<Hv2h6
z-%>gqS~=uoCA!q1T_?PVV&)@5#aC5gN}PM9(cXWSq2e+1_E|8l(FQu`$TIG3wN$3s
zl()F;s2M5wK~@B)E*SLmdfM8Ub7I_mY8^r3Pg0x{DFTU(M6^*7#ckZD)Ow-F-=s=M
z9d95J#vhukF0Xqlizpg*FTMX`wCgnd{((MC@6sP4qse-56Zr<{z-r@a<E#0&Z<)Ta
z0d`HajK~LlclEEw$BO93hRh*d@#EhbIvxL11K>h0jQr>>u6s7(bCc-jREg2xqUI;K
zar$0mqqof<%8mE;s#~{H4V%1>#=Xj>?PLRG0(MmqGfBB*MB|IxC3CN`e35D}OuVgn
z;8G2LiMLgcSVAb|2E4?otLoJ?=oDq`M^`KM`h#5le^t|7)n6f(8jCXB)OYI7qnF1Q
zK(?C!|4H5y8dYOXrl`WaxpSt!=Q4<S<qe@r<dm9lynM8F6`2lceo3}b3@5w?$>nuM
z-m{ygvt+P%HpCagEZ9x@a#15rOl&V>mrf5pu062hog*>QK6)Q;qs1C7vuQ>f;uXNC
zi}Vf^qnxh$y~@f!GL_Iv|4#AwF)Tq(OWG~H{|3r_>o<^H|95ZyzdzMNQotgds}Q+r
zi03MIdHvp;U)8?!6$H-H^R?5G&R29pyfQEMMLEtXMH{#`r`Pmx|9lPj`~;Sf=j`}Y
z<prPIM2*}e6z!w!wEhS1+4&6#A1eQwq(?)>-uH}3<K}<=n{pDuck&9Tb+bUcW1D*;
zZ7|yG3wqPHJwXpr>e;-=Vlf%xo>gny<otD6nk#p&iinbbO+MO0lS&lhzBv>GWc8%n
zy}?3wP-Cl?_dOi<y&f~_Q3wQfTproL3Iu4^$2#;A4TRAAHv}^PT`d-H&6`e+`wo}?
zAJmLRWS4#uYJk2&enlJN=YS69L9)zEak^L81DT?5X}A9AWl-XuL9$#aQR3*9_)=iB
zCpVX4vaBp0vvjhutOehz>{5~5)b9PQ3t0UWipP2xs}1q9^TRJy%^WE<*L#(%BgwC6
zAD^|I<8#@Kc6^rP2cMjb1@|f&wUTWN+C%$3!SJzOmi>Q}{|_hi8mT8AA%8S#k#Ya^
zcL)hM3Fg1s3T!l^(-gRuWJRZZ3vI8%$mu{DPOt|a1eSR{u0J<(H@#RJBSCkwr!NHg
z0ZEf+i_TJ>$K8{gou8`e+wdVI2)VZg+5l&x&&!jA#>MN+=;Z8?rd%i0PS3=PPpf$^
zQuzP4$Imr-6(C4?iOW>uo}l-?Si4EX@1y!?Q~<eHzfu3Z{yZ5&&L_J`9R0tip)N<%
z_>}QnVUL?IgXZYvsxiq`#Fe`W>pGH{KR2%vFF*az2{!C{n3pJj*k({Kr(NUcAa|+J
zLJpk88#g~O-z1I1^)R!Zuk7@oSQH-c?xR(x%hAl;)9Ow1f^a=K$ApUp&r*@~LaQ@?
zqfWy|;N=N$HxD=NKFW)#Kg`%V`zF%tX1iCnwc*?4@B>9~mfL7@5ibVyc;b0_BOCg<
zQ4|~{T74e+VN4MSQ^3)p-r_DU*H;#pWGjV3W@YFvjxL~RG#!Qr+8bb|xUX?T^~217
z)!6CvxAeI;^aTP8Yy`^#kQ#Kp#!W@IJk|wOl-AMziP-tC^2X{9bFqt;<wo)yJX!Q=
zLcm25BeDm(JXlpE-flprPQ1-#{zl?eDnV?qS`ftzis0v6S?Btx1YQ@K$3){MwED#D
zMu}{maQ_&unf@?4lx%N1P!Ajl`IN$hLzGhSrTa2(82_-%gi`LV>Grj;k7Eargokb+
zR0v<?;W<o?@M7x^Gdsn~PWXxejK|Z38Jc=6z94)zzs^_tC_7IZkRsIQZVuA=0C==9
zg2etl?0ux0Km1*OM2^~=G4zat!oEN&uL1ExD*q4HR%ymr+A8v>{&&4eyFc4|zB_*I
zXsv_HQZp_$1tVT;15Q?}ckFG+e;eNa#6>VEFKMt2Kh+ry_q0_+0=|9aZBPMQ!|*P%
ze~V6wUjPB@e6n86P?kJF#fj_51K|g`Jeh8ncEham&`bI~^gmffoE|?PATB5MLjy76
zsmpjSwJ)zu3uI0FJOFta=^i4Ga@=306QA`R(e8ixV`)}86t5nw9Z+>^q&W(%B&scr
zAoXetas=1KmtpBTNJwqz(&vE4HivYYT9U6b7YC{KgEi~8*4aKyI;-^l6LPVJ{*Lpr
zz4s@dKe+;ftN={^i*Zec?kdYoB)m7L*R&(oQv(f5<sO^rzd3#u@PUCQ7Y}kW>yb%j
zx@#|oSmYd>;afv{QBnKMW{3MfOxvm%_2gRp0evL?IP_o9iug*bR6V&^jX<U$%sgaR
zL2y--aJ5Ii_wzKIBsw=<3y{~Uc8^U9vWhIMBr(_hWPLhV>*F=-Vkvsn)51#i+U!N~
z97TBTqwo5CI)qlmR{)__vPbP^r9~)v3IAbcAk0cDxb*ge>F}tCFVD-lS5&|rW=_P+
znws|Er`|{dGS&Y_=sPrh2daGjn3R#jMv-yt&`H35{1+NbWNK%u7eaMBgm;EJL-za#
zs@6fRXLg|@i;ULHUu*89W`H#aYCWyC){H8Y?>X^CMGedXVYrDres?`BdUo2%UNfrD
z1apv2@CeyjRKtP|&hmTPU_O9?I~!T?P}nc>u|hS7cSS=gcatydXSklW;|ddrgc+A^
z(0Qp5C*!<S4_|BfsXo6JQM`1aPg|#!Up?sLRI1N7d9&q5)gw0Nh5OBDWQYh;pHJpF
zJAGb%4;ouy@^&_L9oPR$HDfdB*MFfe)k?K1wf6YB(ORpjTD3Ol#R{&3VPx!WC;mLV
z>k_|E=8vUU=9k3l7}vGb2>*%CSFjY;)!pd45`uZmiuAxHi?W@tI+eRu_rcHw!x>D<
z?oC18er^Xkn)NGITNB9UXXt;D*n|czYXSIb(x?V_T8>2zY6f$kicRo}Yrm9+z@tsl
z8qQmXD2p*aX;y}}9E^3^&DW1ehscchY9LZWHVzGu%$Byy#yIWJ4QXY7`SDc%vre^(
zdfJmAD+!KfV>Rotc5Q7W&8pJ-KTP`s&Hq2BKZ`=(|Azg4qT}KXSkmdFPHpFtsD#b^
z3#N*?o{8GNM+g787LU%yy4^?rlL^4&cs*b$SJfAiVWK;m$$+b5=3R3C#p%GC72g2x
zmXgcV=u<LyvQY{~bCe9G-6Pzq{obBVI0Cql`KT>cKi#9dzj|#tKqti41JHS7bM}DB
zaSouQo_55yv<Kk_pzO_c)E3cTd!~EY`_h5tiC=gs)%R7?f|D1KQcKEZJ0Og~1>k8z
zbrE<s_f!7{VDO{xN5C7VH4t0jkFcocrUru0ZZwXlY4dc5A~Q#syJN`T(W`I$W*Q`^
z{9mfws^Q*$U;Dd$hQ3Arxc*K3Ph>J#O|H^zB_AU9k>^mWf4*^<@j>I8#-9r;*>gwQ
zk4~6NN=Kb(lFdYAFJ0f}-jt)Z;7aO3gOt(<-w+oDp5mUJqYl2SdSrz8kM~#o0e6ZW
zwFO?6yO(*o-7CGwr+~-|7jqXoa!-rAoIGuv>s!3LZw5-``krw3*o<D1!{-^XLQamV
zP#3Mf2_GLr<XGZK*&$jESsq@%AS!0^wfz1vlUUfGtmP}$H%~W7C2{>|i?`JZw$a%e
zL1t*In(KuUlgz-6wj!MnzQL8Km+5+zgY>L}OLdFofhW^%wenr~8DEZP9sFNt9BhRm
zK@R$J{A@kzK*?4Iyxnk7;+k@5_fy{N_*n;%vc(%lOP{?IeyUTf0f*u5{DiN}vkvER
z;lhP;<}`IOe;;df%tID}bLOzs|2aQ)&pMpXRUj#-=PBe~UbEHpd}3+jv;rRU*9gaI
zYbX2ik56T7kzZhKkq5Z^-=Z1q<h$f7{bubAttG!V9PKTeK;h9}Abaj@KYA(N%S`S~
zE&Aq;G;}Xo5^n@lvq*jRe8+C$OC=c@iOOPgLOQUf$F~5i#c;<c<=rQ<9Q)2Y5-3$l
zR(s~2bU>EIHv`ByWMlR~+JjUj!kn3Q_YV6=dcZd22v}x%cr@c9D`xhk18jVJBL^(&
zJ77y-u#w-R86VMJnV)XS`27!RMwb>uSDy9yo!U$Jz5nvp0`YC5wJz2EV3eM2@*?`B
z8?hci#0#YSeQH_lshJ}N&W&G$#lM)esx5x%6ctGf$jL^RmiA}ED762663wu#9%u-4
zRmqCR?D!5qzgAi8O<AB+=<O7O;+n)8o^_CNQXkR2co))q7^DkjNT<iQ1Jadby&72<
zY@O|dKZR{);_IvCk7PhvPs_0x`{K=j(I7K$78Eie)5Dk|nHb(nuM^3TgM<wf#kXQ^
zFhaHUNuuqUq`IRS9tg#!q@hgA{;$<&`2CFT(O)Hg@^|Bad}jywd$ia*G%K_5Qd&s6
zz$dC>+oSQ<dLUSF@g3zA`rJ^TSQr`$8QbKwdi<ziPs7LXuWlycysX&hT@@yK<hcV(
zb#uCz80Vp-<k4;+$YJ?~VxLJxSZpmWXTx-DTc1rnPr$;x4tg=LC3#V?oWCj<vT@20
zj5_K_2*bqAVR%Kc5r--aGL3MAVM_%1ga;<?6H+r<kbmTPL1d$eBQPfz8H3?BsGN@y
za~VAystY39LmXjP9cV?|C(b7W;cuM(pP?CB$)`~PaDjG)_UY8y9vvRP3}mZ_ROUo7
z?Kj;?-79`EIy@r*JrLgoKqjlUNmN@l7gK~reg5uGXPiH}CVnXZ=pfe61qr(xoIxSX
zUWe4jymu+M;4dIl$X(x~Rq>s`q)|CQV-TUjt__{IYSb|!6jW7BR=fUamw<YnEMUxv
zUjnEh3aK$r=>Vh%axwv<k-;ezgv>^U$^VPWp^${E{s}UmbK(~R&^lG4=3s!zgazI$
z$uOZ{yqLV}{X!nPUjmihe^c9~87{I|zXX5C^Dop^Y(w3RStMGT)27+UM;--*fyz9H
z8*`QvfpW}j*t75kX>Fs8@mAJ2PBpA0^_HbW-DXU3r1R^oHY;egGdHhmAp3V#-*Od0
z%X;D4GFm(1EkNrOa(P~NG*{7PAjcOMe7>3?7}|Qij9_QngENc%!^855VdYQ+$$_D~
z?Y*6EW@xL-38?%(TpzFL<MliBKavpns}asK33vy7E;`CQRFXfzOlFae7q%|Y?nj;j
zjNh=Y`;ctI1hn6)rI$$@#F=zdx!%mD)a%ew%#IlKbh_6@5FFz3aE$&ps+nk}nIEYa
zFl1H(;PYkXZ`kMQnwF9)O*Bo<8vrtgc3K49u!=1}sgY0h)UmFvtP*k`K$9of0heRF
z4;m3X73_HZKYIViY9G_^`#HS`QGg%PpCLua2ELJe(-@5kfY%w{cpEP;PpcZRIehGE
z46{J36+*Te!|Tt97c-v@yoh`+m>AfLe-KT625cT7$0-rI6QU_-aQSq*w;}on*Oz_g
zPrM}EfX!Rv_?d=Cs~<<yy~c|8#l`<S&sxiYbGu&RrSt}Dz9YxE>yW4CM+ZKR|F077
z%C<tscUSNAA$qP=y!(3MT_ve%lP47Fh1ZYI`&-_UXuuYb;W#f%zQfGSJICLDRjjwo
z5a#$kC6`;gaN9OpK|jyn`-@m_o0Z@31C5@bXSa7RZw2#4Vs53w#*H&guxZnTXLeZr
zDv)Om)a2Mm$GIu+YpD0tmw5k|+|4-P&?HPI1vsm9-91=(?*IHBF8|-88Pmuby^AIS
zzg@qgJL8=N5G!*%P`RGO`dj-TR?cb&?HDeLmCf-EAUKRf@+wtU$*Qd5p^<EH1G&8A
zSwqVU&TI&6zg0$UYrGw(8LI6+l*E-vdkalx)KUmoE>v&Ao0EmE^E(-_opEmg4rQ(v
zeIUmdXRyMM*txC$k`Sc)-y~}^vW9%wm}`9C?YjLZ=Y1!yfLbp!cI%M^(1D6x)Gmm?
zsn#y1#sKU6G^)E6L35CXXiVW=U&x1Gxu6dP0ghM8Dw?<3jBZtw<L%Shl`?7C`aXo`
zd03u&(Tr{r4rDcz!9JB;mXfBTE7R;la3GUKie~vt*k*H`%`SaOv#s6-#8`oYqJ@Or
z{|5U1;iQ3l1vLO~d?%m8ld!+ND=_S7zZu=3cy<v33*7+~F;;i<^@Nj&f`b^pu|4QP
z;?RCtj$|e806gv=IJQq_aWw~-klN<Z6??zC4x$pP@PV2qw0O{3=*+mEJYcYB1ZMo6
zT4{fJskcx~yQ;#bR8W(|Ud)1?&MZ=}=xTh|2%1r^+R`y+1?r@%_M^^8(9>omY9!i8
z4Xbgn$?8QdL%MRPyaK~8-k_StX%BJv|HGP5PB!cNv=6_%rzd6h=#ID_veyXGn^$?c
z(!NAaN)qqi3a1=b(FSsQ?PC9K2$r)Otmk%0a#wU~ysHorvz_=mAeX9o4>*)E%=D7y
z`uiASp&bz!vF-8QKnz+=PEJy1%VlLnRc0$2PPgP>AIRk`{q8?~7q~%#3w}?=ZDZUA
zzup1To!1jtB|C#1)toh+Zl9kQ4I0SyjkAC0WhhyXc1S2u`G1(+rs-{{{~sW)8~al3
z;K{$_VFmIV=8?l~b^SKKQAoMkR9=k^HxG?b<8UXgaz#3t;2<P8&@IM>C0k!UT@aOa
z?(TShQ%#0>UWuG7kDUKonlYZ#q6~nQhvPojC!+1~9=KLZlzXbu-BURVN+h(72MVId
zB<jjhU6NT}2P$)a`O47aAgps5LfhoRN>Ojz0;WX-w_hogUlmik-s*7ZS9$hYUPQe?
zb@n1#B!Oto?`qF|a1%$g%O=TeiU&AT%qyM>emyY!B+t!2wr^+y6NC`c*(h;E9MkSX
z9MdYL4RH1Z4-DbuD`QV%_aKKp+9_em@BcNLaT+;S@6fIp?D7`sXVJ^zVTg=lR0}Jq
z-jqc+AWGg8$rUt^D`T0n2yGUwncHA}Vw1GY(T(v?0VKz){i0cWQm2hr#8G-CD5JDF
z9t28P5yjdKs=KBX#hUEH%HHiY_O8_osn9lC3()TP9$b7hJ{^@`YNn*Vr1d5b(HpH#
z{TO-~;b5Zjr?iXQ|9_>1svlp|HN8PUtp5=H|Lx@c<SF?7HyZzCJXxrFuW2jM!%ioz
zfl4L1=*ZOm$m{mzrk}fhR}TnEDFjN2bEd?D)%e;l`n91%di_FpgL8~)bG>+;Ng@Cu
z7Z;!Fl{G+N1btgcq)Z!LpMXK>+@BEem_YU$5l2v^L<*#Ub`kiIt%mIS^(r84P{fta
zqBD>FJxBXZ1-k4I7{wzH-c*odY!OWy>o*mGR#29J8Z+HYBrG-P{U4!qYg)J7gZRHN
z`Im8p_PYYz`25CQW!@(kgo0jwq>aTol#a}A@S82`(ysNP6s{kc76BBOa#zu#T{<Ga
zOOV-=S?*qhUrUzp?bf4)34^MdXX$v>Wf}z>p=X(iCQH_GZ|p+3>x3!wU-^u#1Q3~N
zEsf7YT{9f|)oA+5Dvj~=7^YTgOi6Tsl|Qq<Ne%Fb7-MI_%=3B790!to9xE9P8omEJ
zQ1(YZM_+;J|C{vf`Yyc_v|yipP`^RHMZaCY1C;@f=nv|T=|}Zr`g8h#{;K|({sz&=
zNHUI0ByKX7EF$NS6=WUR1j%6+=|nfNedHjyf!soFCwGt-IYJ&JkCCI~7<rBikXMmu
z{03@@j5Nj>6Ad@w4i*{b7%R|cV3V=k*kyDYJ;pxcpm77bk=$<FVZ@9h#)HOV#!=&#
z@tiSWylT8=yip(;rTEzq20_IO*HdDAT8uvs;}6C73>$ysdRB}t@Ue6h8=rMOC&nL(
z@h4*ZsThAI#^=TOb2h%<8W7`~Y#ea?LX0np@g*_7EXH4o@mFGeMU1bC@z-MfjTnC`
z#@~tY_hS5m82>27*TncIG5(Jj|18G8i1Dvtd|ixx6XP3V{JR+c!NxaT{}ki@it+!6
z@n3u_)x@Zak%$pZtFbR{mYQN5CdT1n93jS$bSxcJI$DgUi1Ac0juGQnHl9{Gj*Ug7
z#cV7tEfJ$jjHO~6FUARCoG8XgVmw`pli65SIz^0A#W+ojZZS?5;~8R{A;y_voF&HD
zVw@w!xni6r#xun@UyKXHSkCqT!<sRLtU~<XVa4NL(8rKBvk&$FUAY{rqKz;!frP;z
z#Y{V3bKKgQy!6iWtGKFVJ#tu5wczsWEr81}7b$rlhnLo0`8?MlTTitkwzmL?*=i9u
zu6=3<@<0wRoz9YDpd9a*DkFATJW>e5l#*)Y5GOpKAamk4+TWaY?*DKr&Lf|cP^A3d
zAYB^iBEL2E7W7)5{P=(N3S4EvSePHx13ot;+d#6J@PG2Db^w6fokp(Lq9aXshVr%+
znKfZh1!wEo82x_a|DygsidAEHCND?yK>Tu8hVz@KU&Rvjt41yO4eb$>p+U>`_!Xer
z`Hew=ewW#pm8@YcX2z^Hb9qa9qMin9RDvh%kO($52-e!S>sNGld_U~t6JR6EZwQPM
zOH5~N9GbCmibkDd^RU+ENox(qR9^x3f6h5!IcJky!1zB<Y?>^g$mRconlXzkL;nB4
zxB6g3xA$v>xT=|D{p734j3KT!6{LOJTcpYNHyod;hR{B_))WF5uL5rQ4PeaG>h@+%
z#=6B{rEY&phn7kQC)ydm5|kj%N%BKXXMI!QYNbtvt?d6O$94OKGOo?>1N@NYk>~+c
zl|w40Pv_)YSU!hFI#f1T4~HexsQf=tAExQU^gjJ1vKDr`2aGd}Ti$9q@V3sU*7HHK
z0;iOdk%hr>cZPC4KhGk?<AfnTWlmY@qavPDW!P2|C3CWsHB)Ai-3<H+CDjf5u~K^y
zwty@<rf5pFq0r*v#0yEe0Yy`@2>7?>;@Iz;lpRAStqFAad4;T^Glw*rU96F2tF^2S
zZyzduv$XM|Gb|G=8Pzt+j+<RRm1eupOWTIdc5kqPJ}R9S&E)+5e$7}ww(8OBdw;&=
z_cpqr--L3}M|^n<(8$(z15qI>Uyt57Q3nBD+z<*qE)n49rhbD*2IUo>Y(2rQtbNDY
zXJ1~yak^-{j8kJj0l&<z0T=wzew*abN69e`tg?P*?(4LqEVgRLPh_+<_3MS$Dw(|6
z?VKrITp*R@8(Q?S7;vg;uzv9u2`9?`i!`wNTeN5OaeAG8z5X3yz?XM`JVXYJ5~CXa
zxSNbejr>>!GLj1se)6V5!7A=rUg-(U38UY%)q^Z8R8wbe&Ebi72$@GZEp1ASK;p$L
zSGZK?VMw`2*{*+y;FC9p<jg+XBtAI5vLj8UrifX|MfoY!5-+P<Gg~l3;$=JEvft|y
zFLS%fKWCYcR!c|OglG{I%+l&gM^~A|L!YAX*+04pB|MVCq}kayg|!aAD>786zM;}F
zGflL}z;m)CGTFyJmX+nlLv{f%HR!4IRMuXg^t9A~)eC*yNbp1Jv_8OJ7YOzEf*x8T
zieoo!yh-Mf(xOImPw>udu`G0H>6lkq%$gdM7CS7>CO=I`+~l`JDWu7q|L>#m|8w;9
z+FO?W6W!Q9lGD=ss#IBCc+k=;-#C98ErNj_<@e2(NGVJiBMM>4$l+>%2;}gV_QgMl
zYU<B_UB<1ef4H#w<yTCR?}ZbAriGoI$UHW0D6i|S_tR1>XElT_|GbQDd;c(?o98qY
zNHDp_DgoKtU*7bq8#$&smP?pY{y$ptYGjN4XZ?EZam}mGB<~~77|V?O<pS?Cqt%K^
z%?VvMxkSXEBzBjHrf_O1lk?Xz5&9MrjsAu*fqY8kMAgz$yUb|wkfz9jzg=oZ&mYoU
zvI?EbaaWiK>CSz%N=Mb0h{MhH14;G@*Rw;nc-T>t$^-w*W1`c+5TLYcGpOvF(weBv
zL<Qj?&0s&+a_!)s^7<c(K?Tg8lEvgxu>HL|qmX{`f&c6k7#_~TVrn;2$<%zdTQXCv
z?2MpWmAip9Ve9sY${W*BsJ27BLdGWhymtO6&AZM!r_H?u-I!5WufgJ#f9B$5e5Bn(
zGkdkGh(a4dTGC`=z-zzau)KL&EO-4vNb~g;n}>EQY-L3&OAvf#{v=>VcjhpagS?k!
zD&&OrpbImLK`yz8%KyW)3pDKl<1+FI{Y`zF_C@u>y|;f9gm_)GQ!umVI`LpvQop|u
zKRk30!b%1Y|K$F$n7Nv)&Pg0ql`RHU?nr1PZ3258{ZEprqSO1w0K6L2o@Z$nrXrIT
znn_L7FF2MK$XWfT0?5@lb{0xr!;At>W(8Ppdo3-XOZ!g&pv}ZH<jqzWld>=wXpbF9
z3;LA)(E$B?vUbRz+eH$V{LC!@gPTG0f4-3pKz{#sYKBGb({_>t`T^~j`u)%FWKVz5
zXsw&f2kwf!mYThs`obT=dwnJS19|NiySVCoc#tMb^ZH#_@QvB@h)9})mr*)yO0iRL
zO1A@6YiH2v=2;xYHVd=-$j;aQg60dqYzPIuC6kHy{Urc)b2fb<1_M?$S^^TU-xFZa
zvdS^A31xhy_n{9laIK&HRRZ^_{$fCTN;a+A(nBj-t;FtTAp7U{j{^uE)mCoxp1u~;
z*>#7#epW*ewbfg#?rv|e)#ve7WMgW}#xAGbF%tDeub$Nq^4lVc$Ml~D1V%A>pl~M!
zMPTf0gZ@~%V<IhU3RBhLW1Zn}Pg_MK;M-T;<_n_CycO(Y|3>fsFs)59Hj$h4pXrnE
z$GrcFR`yQ<(#@n<-PV`>;MfaBB9+p|ny;>j1iWa*%gngNHrtTXV-;^A6a4C5HCR7A
zDjoLd^8Sec+Dp9o0otyMQL|PfIuiTQ-PS|>va~LVfIW++r|$VALm?D+K}MmXe*#e0
zs@kKRN+E--yKE^%bp<QzuIZs2*f#kRpesC8u@=pi=&JwhRT<>-`^N+1R??cERhLzb
za`!fr5{3Pois+3!FoSz*troH9>JM*u{_En{bjb)T=r08VAnEE1f3P)|brz)Wo?wvz
z?u^f9H*NkVKO@cGkl>~EzY^^Z4Zok!N9jvZ2kd6#`n^QPkfo%R+)N%OuNc#f&BlJ?
z9^<LJlZK2RJj*0r0=AXKg(#iKT`9#5o|&|}Kfc@~&2%EWDC<C6CM__@R{FHUVK1GK
zaK~h1y`?3rD>=R^C)U!eZOgqrVD)l&@ASksGwyw9DR)7YIe3HWY1;#q4$Dr`(!`Up
z?*IlqFB<u+3ZhK_d-9z5CTS$4We(d?gBnY{{883ouJr80v-ay%hu-N{TZA<|Vc(sS
zc-FoPE8zsA1&tC7#Y*QTp0)1*$f>(F;`7sv;_SN%Sb==NYu|!Zo*?y!g&`WyG~pod
z+~#Bak-d2q>%)yV?K`p_1^K!>`@I5LzA^Lp4wl)B^*m;3WzZ91ZMaL9@gr1b^VY(B
z=m|wU{&1hWSrh~=oi299=A*?|J^n6t7&ZmIGfNhlWCwP}W)EO_|6YG<r^gqBjiZ%6
zeg>ESm(c!ycWX<Csjt#v882l|e_0lC{VLQrrR27$6E&Y{4`1mY$j!fhIHQ~ro!CDO
zbhSdYU$-<zg{{H}*2Ba4-EU=;kg;O+bCmMLaP1SIp{Swsc)dhJqv!Qc1#FF~`HD8!
z>^DQ4_LUx1v~?AHzHr;F^keV%zLnYXUvO;r4N3P-**QlA{IxRtQ~Rd?{w1VQjp@qp
zJJ4C%%`Q`TXu{>o0pY9$>nlH(A)MbonR8V&2s24Cc3oO_j4L?L_s^*VxUV#Xx_={s
zJE#A2fLpJ6STliZr#-3MAS1t6<MIO3UqJ=EMgo=cf0HcN$Z~R@QH<IjCx4w>0reG7
zvsSNyNqoKE>kD|@t9_vsaAy&4+2CvKa<BD!0|B46ys_IC?gSIwVzspNxx+zUdwbYj
z*Aejqd|_@N|Du{>&v80><sGMEGoZ3KuZUmr8MVM{$2q9n<T%F$PcY;L_d|qsuotCB
zsAy60ImP-Pj#J6<@a#b*Zuf!jhTZ7YgnH!OkT=lo3$-#Sq~vj~|KF_{XOs8pztPue
zcdKvyTlZviYX8ika41_HXnM+e+xj3-Hv5D?R;KXK@XsMt3^G7y&xa&B3J7Nm2|_!K
z7h)(H=miARugd(;j7v~)oJuLL-XTLcv;Pc0SWR}Q@lct|D@v4#lIN(OOy?_U9hBj8
z_fH3$OI58FHaO+TY$t(QN$j3<GdL#QZEK+n<C=aqVBD$N0@Vhie0{m}hRA#_<54Q;
z4TRC4jH)sxN(PnLl1bHGJm-}E73cQH5+;=Y57&d59@Jk(|BpwEImUb6x_kYfIMW^z
z=B<prWGAA}v~5TJ0!1+pfrhZx3NkW}1{R?3UY1i*@<{F+jS20me8Da><AE8S-lSk8
zWKpVF-t58e)-JE#-6*0-OOB}J$~fXiHGW6j_>}HmA6f<CPP9ilgUmBu@_<_VAII6K
zuID)0Dj)3(2=}<V#oOTv1o%{68^To7<ls0}O{Coo`wL~uji^x<n9ihvM~AS6ls!03
z)eNjUyq)2Y+Z%HCdVMHL#{%U`zRLCgg_^N}^poNGZtbYHF#WBJj_*Gcbg!JO&yj~X
z*k6L4cB<VnYfG7}%LbC#k{%fKqZc@L`<k4`0RB4<kmat!Dp;J#9E^jqS!(QeY4>{Y
zjKCp@(!zo<7ZB!b!KkvE`i@t#<BON^iSI7utM}@kW!T*Pa{ycJJl75zT^RSa&_Xv&
z+83Lv@YKxps4~PPtiv*lQ~PHRWruAAP3h61eNSnhFAuj>mMJ_m^8No15PndGa8ds(
zK)6=bWn_~I?BZQb82;NZZFy812?m%EC;_UiVl7hB(>-1M!2!PWj}Mbz=J$V<W^5x5
zkYfFy_8V<g`up$vljs@!i-7ksRsWuhx2;euFbOf+T#b7T3fU+2#%{H-KQ?Uo<zjbk
zmoSYM_g4VQd1P&Fw98g93;7_e2u@=y+e*s@{qbopy)K~ohz!-({)K>Q7Fn4iR1Or?
z)5{n?U`qePQ`#EEiKvnxn%Z9uh;pW+w!%0xCl9ww*vSPcu#;Q)p)ohE5)iJpL%3il
z5IT5mKmbxb24xBl&29Sy-_^iJWe8{Y&j*C(lZ$iPRaI|;s#{{(r|uT#?_mj29{+zp
z(+;5j_hMB1{3Eo0JIOzdCgVNMw>^*ldXb4^mRS@|^&eCy(CE_HIeyx%m)YzDGn-5h
zk?f(i8~KySM}=C1sf}{luhBXhN&ve?V~^L%M0UIb=N2<Ll`d9`{kKhHca79~+gTSC
zgbXx>JzOF$t=wXQl4ZX%>B&^-!W=i!&Pr|Olo`z?q_OOwwM#Lna@gEuMnvJWcAIF)
zy+hCqW#*X1AXw9l$mU>MkHw;7N*<*5zf?oZ&l|NTwAb`WdX2tUzf1p~{!di(Z6f>0
zXUU7kaHGn&*a#pG_{+w#dA$G0pJK(&;f1qblMH^X(y77`tipK8g?l!Wv#)d-&jQV)
zkd&Uu0~E@#k;Y1AC49g3qhuGG=WthlnXMfFwGp-Z5zBQvAGC@GF_ftZRExyADbdr!
zvnm9VXXXwr5tUXfHBoaCGD@~2OgQ9iW%?l^JJO^XCRs`68H~szuv4KL;sj+>w&oU_
zWI8FWUU)p<uJpXgCUR^_t808TXT8C4*ZMj-yxh2Z0nb#f-iU|{8iz$?edaXxy4MB~
z@<X2mQHSF`)am0c>*bS7Qi0DkdA(5R%bTn)1}0yf&w*Tln2+@Vnne+!mWIYoA5$S}
zg56exKe&eG|4h`rg#V9Nh~X7|K5Bsb_3QL6A{y{@GMUsOfBN01;Qd|WRM-aB8Lh^Z
z#)nXk``gA#$=CO7`1A0+JSrk{1a7GdM$QAQtp+HJ{Rp#5m&x|(#y75Yo8){_O4pTc
z5=;{vRshU)103^g;dkJn_e?O!d{TNzjlbJMG|9%jVpIM<d*1;bM{)K)yDQt+rWnDU
z3kIJtU<0;g%bjY;MUpMcLXx{&PSQy_Thd9VlVxF=XaPbGp%*1_0=_%hgdRddF};Nr
zLLecK5Q+mN<Vy&IlK*dJ-aGBh?VR=;!k6d!<Hy?fcDB4Tvs2#wBE{>#t2{a8cw8$F
zH8pkci7TG^7OvbV*MuG!!v_rC;y|F)SJ3J2@=aLS(bP1l6p6edjYo<H-ogVn%ewTG
zcQip-MMGtYzo8)%k^J^ExM`=vx4WQ;yO7V5*{oq<#|GXdAK$&g9~8y~C4J*gJnqfG
zO+P<0$1E_txy7MQ7|Hm?uizRw-tzIja(^waiuZWj_UNb_b1H7D@^3<7HC!%if@Dx!
zhB@iLr^H(7Z9tF)SUFNnR|P<F3nPqx4<;B(%BOjQxc3F&((Y}WkA6kQZ}3;*HN3&U
z7B%*^mHC74?cp{r5uhpxCoF=zzs61fBlZz*TV+SEHdqI?19D5Qcbu>QL`q`~zxSa#
z+I>meor*wnaEs_vFUIr0HzfLV%lVA*O~{{d<m8R54c_nJ(%YkR%o(PaE>-Q?)(~kx
z9*t>}7nK)z@4*eb#k0dl2YoF8)UPYl!K*&}2weJ7UYb?zk2DHxoER;`mtfZAh|w~9
zWrZJ^+Ax$TwefI2uI;;jjyc909>D@2+05ZLq0}Q^7O4s}w?;%X0D<RhTsr809CMsG
z{H_J4JrW*>@-I<-_=p^H63R<M7%KBZ-0VtT{DAZS17Q3I{{JrHbK?YV3i#jjuX|K<
z1~{pyZteM1(zSn!snPx3GI$ZUp5!vUbqe>?eN1#ZYIl;`99U}YvbRUe-h^%84tTi>
ziQ2tt?Po@(q4rD6O?$?rX1jG~yVoB);aIBqO=`_YNApqhX>J`S)P8qCOSz!8_Wdaw
z)kM!;rPl9==v35ikNJPM#LZ}zH}2E9O4Ky8OAT7V=l>wKo>}XVpW{&M`-kD=k*{n8
zsEr;wge@~NcmP#}TDq_tBTr6CO(5K0Dd)z>Lq?WOd2(R!TOZESIx$p7j~l`^nPZV@
zbF9aap;O+PXCumN1X?J8DH7Nc$!mqVT?_xUK6=a$R%sk*YTcMBu$^;)4Le**pxsJ6
z9me=;7gauRg|-3E4a~uK*<;;6zt*Px+oS#!5hBk*BGb@Bbu5pH&PLt#cm;Owk5a6O
zNB4WnfoD$=wF})}kzTu5|5oi(z8OAKsaDbb8%|FuIaAi|-GExVL!vWLyFHery0Ncz
zV}w2QhUL_Mmnb#l{Qm%R7K63_CFa}KBJ01>{^u)OkG^@)SJMM~COYe1>asis%4NqD
z+~%y8r*7x{XpKEbxwIQp1kKsWbk^iRf0}*OU5S8J<$%`7`rR(5ocw)EFZTbL44Jk@
zn_JjS<8os!c5Q!y#2=k2cEk*hy~~yql=&7et*EM4P+4ger=0Hl*X!OBd*a2Xt<~;{
zo1*iEunu!l20yBlm*#<(E@%b~QJ2tv%~ea-{g-YNcrQCq)q{2qj22?0-Y=u0wt_F;
zH$PAx;64rQzEHj3M(2e?q<ou;O-+B9-Ozn~+00MR<bTSF+|8l|sL5cnz;(;vLjvDH
zZZ1|CY^m>P@~uFWIO%3GSAUH?d2XGiH}L&y`WplP-t}%@^hC7sXw$FfJyfDC3(;5>
zVzj#Wa^4FIzx9_5%9m)1o-l-+YEE-sLnpzWleBM1{-K1kSi#vGJ$?v7Xk_;|)1`mu
z0>Os7e2#DKwjbpx`1t;xV|tkBF)y-)TNnO&U-g@(|4;NlXHIvh|Lvv#!EF2u9SPYZ
z+{%`Awm9Vqb<k#WAt8+3Anz*dfDNGxwR4@zv^ee&r*E#s0g|&V>VRyv0CtT{O|5<y
zI6~kqq^(?Lw*OU;obKRP*aHquejFd~1-@el6O#R}br)30b?cqvT0mHZSO^Vaf3s-l
z4Yv4ScS1LDtL3#i{!fhIZyNER>w$sGx8!uU^*=ufxy>$i?E=iMa6raZNzZyAJ!3_N
zUO3=FSp~Jgk}zl(D95<gq6CWssS}1FHqF2)ccJ&3k*8ZStbm54DkSFO>QIQ!ieXP;
zPmH-UJaEL~pv2}=y&xzi-LRMO`rEq)<eWLwMHg~Sim%w;xe0NAvAoU;H6z>t@=1%B
zzj^cK`=&beXl1C`-xT!wrp}oo)Lk$Rhdu*6$?Jg#0*HLTTbetK%m4ObM=<MT^E0!_
z_?vO2F^v5H1u6edjxGkVW|_yjCP^WYn(uFJk$RfKKwXnuaG*MKzQA@(-k>2yH%1o;
zMnF#zrE(W}keWcF*92Whhv;x1RZ3=^e;y&rQRtyiw1m@NQ(ZR{t8Ase7EwpI^SD&y
z&P^|4-@7QHX<jH=oE=7RHI>0Y16Fb#YmR?LG%&4<y}adf4aSaW(GYgJIm>k$@y#k>
zj|umbg);aAA$2NdR}62};O!n7U5H`i$><iV@L2sRu=`bUpM2_Dn(CYqU4YsQFpqcN
z57XhS=&uX<p~&PMUqvDa)Lb}9I9_4#oX0ijyUpl);2&zvbB!NlM5$OH3j<vtcoP;Q
zjmOEPL*|U0?jk#HbEBpfoc<rhe#-FwP2>PN#3+UK{~{x1{1W-SN1D^k<z}0CnYq(^
z(fk<x!IP{atH!#>+JRi$|J(Y1X=aj{&-N5b^ACR4GR~<>)wHibOrM|(6;vg(qv@-J
zXOXn0;mZdyrquCIF4V|AKks}&Nwx!$?tjUc9P?Oi95CHCpT{G@g5M5BYfGqE#@;HG
z8h7nj@hmtv2Vz*fU<MQk;ShA`K)BE!k*ms5Y3(o<hN*?944P8m57u$Jj#3fOW{Dp$
zGsVQLkQPJyPQKhPglHffXm9teK>+zkxT9HkmaP@HE>ARFm7UBJDt)Jg#Zx>M4&%I<
zv-ztVxCuS)5B^&c@}Ba<!?UqXHTq$e(t;Ty5UxyglJhp;S)Awtr?tgXL|-$*Soh2q
zHVd8%f)7uDw8P=+bZIbxp!vRq*q>xKmr>o**KkjXw6~cHPsk<y_O=ehnyQlzElWI<
zFM52rAA7HK9r9Gt$4HX})pAjhZ(+sKvZ{R85G*M2te^ps7;CVQfVqXZL*8(btib98
zFcpZT%>Fg90@ZUs-ou}0&J_3ok=N)I!fpZPC}7vx+Y#mjTw53$v-lk6^ZCCYyOObI
z5&dTYq<_CO{>iQcC$I@~{*Trus~lE;yHbdOui<2trKK);^tO61ZFvPvu#MrKXb6!}
zC_aOC!!cH;hNMc}Rvf;dJ|R`wqkK}OeB#oa?vbwWx)}t8IoOk&Wxc62(GQcuti_r)
z_!Hgd&7Ezv_jgksA2SV*aKh5CCKMJVqj!d@j{|zMi7#JE5Nl5?f8I&+a=Higk1-<T
zsNA9!Pe;(xSmj!3LY;iLdXJr9HTU}p&Ma_>KEX72hflXQ_5V~;C{%})6$U~ARe>v1
z=oD^<RMF8SN8k||Y=0A7pH~QbKH=WN2U4kDHf_C|?*V(L%^;~uV9Uof&7z`*9A|Cq
zw{`Ox5e+F}dL;>S@o>4+|2Hw~Eb~3H!}!8Dg?-7I{xeg&d*5gUD4yXN1J0(7@%}fv
z{`W)nv*-5KP(NFvCrJ{}HE*GvbaQoA%ze%h*a!4<2Alm2fxL~a@GRxOPK%ZU`ylf~
z*94$`%hm73?2gS-G|lgbF3pk=aHLF}2^RL<Vbe8u+oEMd*j96z>vlVB)K0s%G5DTx
z4NkbOE<taPF;}?8>W=JlM;)@?ZMa2Kvy-Exs909awT8mfk)G`O?OQa+CI3HxSr=P-
znOB<w5C?#<ZicAmssENoR}Wz&#u!W#P1w@;f%dvUGdxYK<gd0{F63xS=D*shRr8$^
zT_vZW`_G~?zSWxLvh$zUtpK6u$}G9>befjWJ%!F?j|_i6)8pOyMOUE3BQx5rrLKZ5
z$cDN7-!u5~jiO3y`9ftOLY0<hStS>|g$w>;qNiHZOU=<`Ll}rT*P|kxq)VsM*#+Bm
zOCh-NDs(|M+;}FIG84bab`I^)v^o^6%x*NI)had0o2`_w$L`VTy*d5A%9zcJ*~VO>
z7`Fc_jSWVl(Q0fl&VV=IrN-4pk8z7}D`J8^U_5R-XS`y(VZ3Yn#rOpBfxXOO<_OaV
zPoXL1Y~&0qHp|VG<_5FTY(*a7GtBeMOR=W(z<c0U^B&k2K5jl|zGA*%zH9!){KR6`
zUe+*cgypj)SW~Ro)?9cOlv^v2Z?Ms7wYFGiSm(hi;cBbLx&{6Q_gD`==J1^LiuH!|
zuJsq|lhpO;>pmM~nQ$uc<Pn@ga4Nxkg3}02Cpd%POoFor&L%iVz+*kf5j>vY2?S3R
zaIU9-U?IVI1m_c6KyV?!B7(&PO9(C^xR_um!6gLC2rea9PVgjx6$C2@RuNoAa5=#h
z1XmJVCE#k$8Ud?4YYDC+xSrq!f_{QE1ZxS_5eyKlC)hx+kzkPEMuM9NHW6$l*g`Nw
zu$5pN!7#ygf)Rop1UD1xB)ElO7r~PWZY6jM!BYvIM(}ikXAtZrcqYNK2%b&w9D?T(
z{1(CU2%b;y0)pQrcp;zv`xqk_X8!rcljcCUdqm6~=3CYwn2Q%$kKxk)m;c-_xsU*c
z;aLR*S3>mf^}FKY!og-Ph@pU}f)N{)DQ#Agb42(!p{Z_YpU6YW;Ws3K(p~2Oy#OQ0
z^yh&xgR>7fNC@j7u!cL1Kz^WJZeo8HGRa^BLT|9w^MVoi=;VB>p<nKEJ{aC+1hSBv
zb(tF;Sv&%77)aQCRpAcF>Mn4@laud@=pWI#d^h+Oc7&6zNf0T?ntG>NfqolT6hJ-*
zxEcvu#csZW==g-ru`mpS1o3R8o3BtTJ_zUJxdB5^hVk{Tb2IEPTp<F0HyT9NfhIX>
zPT=(aVCHAmmCSD)X+CVO!QOtBaRj^nE1LFeqSZs#5@Q?)ISu1b8f<QbcjL*Mf)UI1
zd%{PvIyjkBGJWQ`TJE7PTFWi}kJOWiwm0TMZW`{2z#mLT8>&t{H&-7&RUph?be^IW
zTpg_$!u;kKcW5wP+l57or#ktQ-SvF0eEBi2C@<d_^$%f?ce;EzWJZ-8;jpkf<l_cN
z)FO6Sx!^uZ^1UA_$Qq*?hOkg3t4e!^l|snWggDfpu$&Q|YPE#jeBi{g*{$#LKLu5N
zbbTU9^w{B!0!=%rlE`==$n`B1j)R_RrGVZ0uhp^x7uG9?YNG3gu%J2KT?dwoZ}t^(
z?TYNYlv8%O=X!}`Ou2$&V{~m6Uugjxc6ok>f~G{s^y;)CcG<XBC9(rwQjj%7*YK{(
zU<H`uvH74@lmY4bfwrqJM3$-(_@9DF%Kv}KjK#*O#*dA6%;Dw|V{h|Z_Dl0V^M9<P
zt!nGL)}vq1TJUwfW~QYvU$YN55!QdauO!0VPx(B$_5|y6=hZ&tF%ec{!hDE2e9K|^
z3*DRa$-PFqS=b-v88haG<oa{UG)rS-W`81OfO^(xx4@KVTIzxgA!xOv+}sn$v;6%x
zO$6;0U2&N^EXtJCi?Ho=6NY!CLE$MJl%C2huF#bthAodGl(4Wq-Q8zam#__5(#~E>
z1O>y!4h>(@N&Ac`mL_ha@*E6`L?<?BH)Z<+Wxjl1ipZ3MLKWa?bcG4w11bYs1f~Wp
zg_D9QR1>P}g2oeFkF`lWxmE7}0cM?PjWT0qsqtIz{bLXdB=8kZ*6L`}5LPR)1iIJ>
z(DjKftnT~Gesp`STrE9UDr?xv=%yiTy?L;^^&ffbq$;{P@r#{lt&p$IJw$o+y68q^
zM>aY2;-cooA+BVRKK<3U6ZX>d8i`=WUljzaqrogFi-mC3mpcCH<WF|--k-^rAE&w}
zH$@wVu=Y&GOey0deI!<=k4|>$zdn-a3VyG&r8?S>#b>sS-|D{K?2=<-Yo>mw(i2V5
z`Yc)_@_%px-*B+5f%f|JGIr^u@5|O4@Rrh=Kr|r87rko8-gza;id(G|thjuH#Ix{W
z1<%%K9R!a?CM}R1Q3bd+Vdpc6M+M-<AF!AdbGcf3i9NIONP&Io9}5-ieE&b3wKM#`
z6n1|<WiPXL4Q3o>6d@DPX2}0;Hhy9}Z+r+@-_fx8s5FCSH}ZqW%ty_4%zr_8H`Q8f
zt+ToyE4ama*!q?AUcc)G*&`GNK!`)*+5`*o1ziET6PzZ4rc@V(5aU5k(@qMfA+)B@
zdv?^<i{@@2lZW(=>ZuoT6Fk-PnmSq}HMyByG7tJ)#73w`2vqTsHfc~&J&$v!;EX0z
zz`QHO4JGG;Tap`lt28L7mLVyMLSVk?u|jccq68-qrZ(}t$yd-KGrPh|P2dPoZRRI^
zgT5{8IMPW%&sq`N!J}{{o?3cEa?*Q()F2)j1Q~alAWsm;zDqU1mIBKg9vveD`y5)6
zt|YugK}ZyYka$T@MDg&PNo^E7A{P#Do}v(;#E_eoY+NoEu_ZkAb<MLeS!SbZD8z|E
zw@`hRY2gV_%WSkq;!c&ipzrNOKS;xw>QXIjM(<1`A*A_JbviAWxR6FYP!~GT2Q+m1
zwk%H*RXKeX^)%AmeJh`*L0TnYF?86cm23E@?I4E4CqFg$s?a9N!uB2N)ukPf*@&CY
zrh!$CsL+t9w9s%lS?>Sin01vk!Gs5Z@uabcz01yH<C62ZCfbn&d&LJ1xZcDzm2%1+
z|ADYcEy*wXQdx)AMk8XQb+_8`w=NFI=_S}-I+^yv(X`5{Q7zX;+lR0Q^Kf_XuLw+9
zfFLP^z<#!&<i};RyRP7WN()YnhOv%YncVj5>v)FMB*RL>F2C?V*}}yt{`zQJ7VNgV
z5LPP%>^|RLC8DDzC=ES5+KPq_$Yi%_Z)m2aHPgDwe%P>6)L{3l*OeNyMnhaVIKv%P
z=C~-MkJFcGcICR8Wup(iQ9;=hZOMZ8a9E?N)63Xd75hqbN2xNQ`e<_&9}@$#ARP9?
z=1N-iff7h5V6R+zt3)*ZbERE;|IcO18MOXS8+k@OyTrKCc-r_98odU#+`Qg=4qCe7
ztR`!_^^4?+(C-gdoDZMG<>64PzX5xxj8A!;)|SaWqC}V}n5Kn7n|uYy@K2trU9r=M
zR@oG2P8ii*H5qBo`;|>47zNKJS1e~GWbB)u6W~4<V)4Dm75fd+Mh4CDT;Pfy=KY7%
z5G@eV2`uNh5<u9O&WP(LmXa~)C9XPv<5=1P!C~UDOSKkwDc@BL2xO>{wAsb3z9+{e
z0*i@0xX=}IFP=$}q556p>f75oTz%D~1lUvKYH$lH^%m}CA!x9o4oTOYd$_ekH&9!+
zZ$>%PL4#h-AUR0hWea{Y=o7jBPh{2)toi0|%o5}GMjJeUZekPDCwXi1v@DigNBX|n
zsg(V0Wr<v#2CY<<r<Ulc-1jGgrI>vHB`7C5b(AEhY=!Ix%ZEsW#iJF3>!PP*#qjsh
zy&#N}C+xx-UXcj)Q`yRv=+-@GkzHn!Y>};y-T34^5@E@5rA2kole18fDD+`<>N&f-
z<W7lZ)FK59Y>2u*7I@4`ce}ETku=^nVOhAw52mTT-QUrK+?(JEYnuX+^Qv}n6MOHm
z0kTR3YF7uMTe9HbRsOPCDF{6Kp~N#-RSi@}JF}2`*jQT|n`^MEgo#c`{_q2po?RW?
zoP~&}kLT@Uf7un6uPd8V@EZS9UM}bVY)=0l1&jZA#;ec+9LR29v(x9ly`&~KC<~?_
zHQZ%t^h<Ve&aY+1PEb=;MPdWFo#-5QBTBP!Ry&uo=l7c+(T-iM^hteeKo-Oo-%RY=
zu;52*1uXW1GbN%THI3BjSWXsSwvU;sPX088Zv2IO`QqZVR#;iILJd}`MlWU2iA*9o
zbf$tR7&C=t%pGf$E_<j>D{32huD~_*=YLUfZHXD&VmX7$o_#++cJ)rKGFSm0B%zKg
z3X!NxcZK~Rr=I##m2Pf~u`CpT>GA<C%T84(uya58QnvG>!<2T`M^De<<Edf|2tra+
zCG7gHH)N|0x<f(4>HocrW@a?Q=kNE3Hd<+(Yd&QD)jGmjWqrqb%0B16`TcM9!130p
z{nBuG1wI5GtPS|;A%$!1@-;#Z$w}KmuVf&-`)IquCLVhhN=+;g;<3MFpgL`j*<DhK
z{WVfNI_QfGWU=kxE>yHV&?MxtgWlCz1eJm<B1$z6iLiM{VW9{e^p@6YCgqV1gxlr4
z62Xcagm{y;Z!eaC3hzS)!Kw7e8}yE=CP4&>ILh!_6n*%2S4}E{s=tMl$%B5MK_%B$
zEd({I;~u0?8x=#2FOYqZfrYU>*;NC@24@lc5K|#W@m@v-9;@#;xDFKtBAw722xPCz
z{lA1+oz?)@=`J?jHcl}-><(6v<ydcw4a>r?gm0QD9HQ7Y?IrB0kA>%S$<%+TF^ks4
z_RE4sm#9bsWIJKc-*kjr6bn_lqb{~@79=x&XL&fuwu+YYowGZCI!U4_x?EX%8)Ey2
zE_1hWrb!j5)sogR&&%zk_b3HZO>FNhs5Rc8K9*XvCwa;)UH^`3PN}INSsfdi1vS&B
z4XIB4WEYiBlP@22OWMnaWbyJoQ3^VVq$=#u<4Cx7yc*~$6dNoUTX!GA(UI2Cz1II|
zrEJa#s%Ex(Kx{8?OGC{PceHJi5h_5KCE@q2VU!%NvokN=Dl2kGtJ1H0{~rr=KmPxQ
zePkS99AnfQ--6Zu4&yQ7*Rb**W*!FH{*z$Sf0lWTdAs?9`I`ApL;@IZ%@LZvPU{Mh
z4d8<;*Nd<4c2e#rLQhZgfjQ>kh_!DQ-+S7n^SWMF>Zv;-$1LHGiI~1%P#wF}bDqo@
z(RW)0KDLYWQ#z{C(>*N5JQz6p1dXIbQ>2xol~O0Z=OWVgBnP|af<to5Ie4Q^R!V)w
zr@D<-@ti{nJzkzrutaQS34z`vR1<!mebx3{N_r-Kp>GlNTuhoUS)3~KrKa*r$z{fK
zA?evfX{xBscE3#+M?GK@w^0u`vwxm*We;3miSR%4$9F`}4RX}nSc>wbsnJdH?L8A_
zOhrZje%r4SC6&QiS@Mun!}ZugOFu1psb|*o{Fzf{O~JqXS>ov*NG)v-(lYSG;{mR4
zE`q92TzpsR`g$mxNr^qO!UM7&dkQ;1{{+H_pH>VhxOnUhIkJ0_uD*$kfmJ~YZSW4&
za9%JB5sP@}MY;bU#;k4DVdf*|a^nNzWbFSpvcvi&XlHDsV7lBbk6I<HRy|u@{2RGC
zEj(9Qog%RjSqK0$V_h=`*uw+J)-&CpG&Veo?J{+aV#Bd17}#5Hepj|_u_|R~jd`<>
zraJ2LtDQ>Ow!(i3lvBS{>6-eOCkw7pH7%%C3fNWqt(0x^?WKITrr3d5Xv-XeRyYK*
zV7FYoTcSHbHKD1F9gu|pt_(AV^yCnwCVsP9e>YpcerQB#&8e~6Y&5$WY$&Sr*VtKy
z&6W5MQFU~yV*3l)$KCwvv!s9x5~=?W-hPpI_tcvnQrgD%|G~y*%=pZlXjUWA&m-n%
z)?_PW-Pt$)zxnllvIjEgijoc)d3_Va^PLQwcHaX@(WK|>3=C=C{izBD&&e6sbK66y
z>62WkOVh~13`~6=rc~ll@1$iHJ8JFlJar3lK=b#jZ|;xuT$BSni~F}^qD=YzKZNBo
zSot4eK5sUg2O4*<e4~PW#4d0i^~++uA*{&Y*0vglp30_R>tYzeS&1Kq?7Qv*zWx-y
z_5L$@SDx57zUfZVuX2gk<)zV6X%yDb$_ohL1ImK8E_Nv2E5^G(Gas?CklemWT2S?*
zoE|g$bVBf;f?$1YtU#b=?2_$(M7X?(htL(YSWn6+JI^EbgW|E@dR)P<Ha3Q1$Y9GP
zDQ|>(%1a?*Q;6F62egV7w0!Gq<^9WJhx8NcA^CnQ`D^|-@j9eA`JVO@`(p=l!OhY7
zzAp~?st~>>Po>ILGJV+_LK`t}>;{!&tcZ;s!WI|@0f%OI5)O;tvcHH|6~DfXX)E3o
zJ17f!#(~Kpp^%;NVGmAvp={18@A5z812o1)Wg$yTGhR$HXJp?y@ofIBOY&#Dp`haX
z|9%VszW!!RfW7Yy<9F}?sx;3u?>66)Ismrozuf;vyN^NEDdM`d!|xTYkBBM7=h?{X
zwOdTz1BEcFg$|{H{5nUTy(FjmAm=5w@1c2!4Jq?1`s+fSh_@%AufoKs&s9i7-5a@7
zE8^9@Ow{}W7fnSax)7dDh<8Vx=?YP(qmCzqYe6beX+SozTq}^bRWO9mUeGnn3k9|W
z+aW5KzNjOoX-%r^&o&|LlW0??mP)YS4s&HREKFX<BhSzpF4-S~g*J~sE6{Xl)gZPf
zxK08hb(oYjH1fomFtQa7U#KM&`W_bU*p<PC7Wv3#t^D8q2uu(W<;)KQ?oRkC%MLls
z4KhBS3($vR=NOsi2AP-wJTD+R(YNL(ITDYT`~Shry3r~^WRA1U3C2^#2KF9y|AX1a
z*d)FVWk`UK+{*e~Y56>p#{4}Fg^P?j&AwS3o5;DG47*wqS!obyJ`yH;J@&I%Pi@w`
zJ`y{chgLaWzxO0xUmge{#<K5to-j4yn}GF|>`{7jSC+qihX!q9>?qE1Pj!KoXW|r*
zG=&b24?Is#dfCh$$nEN__f^7Ub?iv)1~twFD)?J8fjW>lY$qqqO^{9M%U8xG3}I`{
zv2I?D;ItG8xo1K0_t<4knl4%$8}GK>u$C_k))Tp8JDG8$;BP@+s`ajm9pRR$<lA-`
zyg>STMlC5HCt`Rxps9)-K7_3@4|dT#C817f?Anv~wc!`KIk7%=m}^=x5b@W9n#iA{
zXNmokedmcYMCXtF){_qV|1iG)?_&QjCc@|E65|omgy=Y6US&RGehC?W3nK75>C6lK
zSCneE^U98vaIigqNTGaH4<h(ENkT_{rrmTB&xrUFa0r5Mn*ynh{9L=4CLT&^jp3PD
z8xF`kyrXiCvQ{{g4vFWA16^aqM)NN%C!4snq-ArkJy?U~37mu6aYw;ETN42?@l+{y
z0uqr@D?!z8$Ml789up|P(3%w_9tJVNBTn+kkPHMcYQWLfs?3e52sHVHd+I2xewr{E
z2^7dl(IgFZ<R18Czx^QO{JbS$aA+OE0D9CwEqRo{BV6*~bS6D#MlpTh*2ELL&fazV
zt~-6Z&fN9mT|dO%_aC}_*KNCQ_f04awRB)ag~6=|`Tr>6Q0$<NOnGHTYam?H(QaLt
zp(EridD8z3-dw^m!n*26Ynk??;Q+{@CH{>tnC=?*y9`~{YQGb_6$XRsfq`#G`F{<!
z{~ZmQzry${bbn*98q|DMb9-HErdx&^q*nlIFoosrNjc?&!!g$$&Ht1oY)x#2*gsq_
z+(iMnKef>EYdc||A5FPG(>9PuY`SZ@L1f~lu(kF~+?1m`{mP=dU(#%fD`L}zur-+?
zjwH#I%9eynWKZ%ZyXB@Gnm4bF<qJB?MR!%!1`#njOmu?%%oz3hKQ!;JiB096RvDQ5
zzM6A$psHXZ0g$IhWEtoySoy<lEs`m2k(37NBd~el&Zd&yQ3~_~Rksz(gW!LVx!A?F
zUWo<Y-;8x(QYFtjUJtI%w;Wlvebc0Ru&19J0%wU7U7#&giPh@ZWViIu{2;Q*lM_&n
z?c{_z{F;uG{QqN&J;pvUrXuoRkMX=|A^!JfSOfn9k@?m^zYp@@zx<zm<tJHW9^bwy
z8~v@4c)VNdp_Ck){DI{`g!19RmXcKG!}{&A4--fYBp~6w&Db5ppnFwMJM=w9i=Un2
zc)?A>?2G1I`Yk4jD2N1sh@(L|u-|IM`pK?X&Vvm_B68jQxjsO-?SXJ}unD12d=shy
zVMNxN4{pu3B)CP+g`f1_`v|Q<Z-8S<WU?<`bmKimIY`myyvZh-XL~X-Ip4RYkO%f|
z=i#z>1!UTTH~a6_<ZA@t$Mw5w0<U1z3WP^HOfbb$8TRCqr(gw$v66TysuiFl`*%g4
zsWy>&<TX9@mqY?nfdH1;QW&XmNe}$fNap+)pZ{YS%zU3>yNw)UgfYjcG|o1zg(UDn
z!~*%q9Dpn!1!fie{?CARaJ%_)^CfdPVt0;2E|5ax0y)LH!MfY}h4s$=`U)ZKJ$mMI
zKgck0NG%QoT9YZ=Jb#b|B|SnExCGIAxW%6MO23x&E%x=&vqM_!psd{w*;cqU7=THx
zO%(8(#Ov%gh}ZpbN{+eK^z@K}FX-)gJQY!LXIQB24DU&UmQ?+M=lh9Tb@-b|?B#i$
z3^@9@YR@fXEaD()@$}Lw7HkRBVp|ZkdoEFClK^a|G8;kUxpRDuxfrb|;=YpMpx?KK
zuZN3~Yyn2Qf=!k)=@F_DEZZYZf_V4bD=ld7Xhg7G0`D)RT~JR6a<n3yRbrERN*X>T
zSz*r)rCCmovPpYxrI*@;J)SuA98CO?+Jt1ao=20Vc8+*kqBKS4@;$Q9;R3h<q&P@M
z`?;U`#3p3$+)Q;yF?f1eCN$|;+8Ttm2wMg3Cn+Zq4S$^mN}uRx+*s*^@C1#qzAK8j
zDVFvqZV)g1DfLo$IMCDqYGc~uDWd%M$?{Npq%nZ_fO3dGNzE*8@2YJKwIg1kU;2!`
z!sq`t@qe>lyC{C@#RM-Qcqzfl2wqO`I|Q#F_+5fm61<Aw)da60crC%}1iapJgMc@B
zZW6G^^F4y!C-?(`+X()U;ExF2Oz;+h+X+Sq#t6m<_7dDda3{fA3I3SiZ3J&8cn85d
z3EoBUZi4p^{0YH(3I3GeeFT3-@aF{YC-?xt2MInza2LUc2|hybQG$;Ve4OAD1fL}M
z6v3wnK11+Xg1;d69Kq)azCiFrf-e#LCBc^o{)*r$1b<ENRf4Y({0+h15`3ND?+Cs@
z@J)ihC-?_~ZxQ?>!M6#%L-1XK?@9i@kjwuk!T!G#{=cWf#VX1Q-Oh<X>_j19b-_=j
zt+G982|MS-2Lz`w_B_>6X>APIn4uqVfhUDt?XjP+2Yz(Bh7)RyA@g#FImZRB$CvnG
zkW^S-5$y*HtxPirfrV4~an}mFH3zA2P3$<gTx?}4lmmTkJz$kn3(AX5)3mE0b}V;h
z$PivMNmi!pL}Eip)p+nCcFr+61;nb@F+xY+;tScx1<(lz(t+K%e?m^J+B|d{u{q$y
z2bd);zE6^NcV<5@A`;An6MNEixbR1H_+Bls+1w0ZR#sK8^Dj2cw&KdAYc$_(eQcIn
z`9B|fef+H$ipf)U?kT!{mGl2_246p)`Ix!dc+c=77Rb2>3fA{;T?{EI-Pz0}yH*aL
zl+)!83LkZcj_r&UaXa4(iExr*bcL3e>Cs+d&)j*jria(X7P@U(DwPQhi;d{apLBu-
zL3d7!r<sHh$<?&TOl|i^j<etV{CrJ4T4M9vj$J;K(j^~aNTn5Tsn(6%jj?%dmB&>)
zMPL}V1V<n$woEhT>2WB`JLN=bohl<+9xD{$QWrCGLegTtC;4;s{ZDJUtu<DV&8|?`
z#7!Z>z6IPQg5;*WJJZY8{_sT&%8jwPZadD&MZn2#U~acgyv^zVVQeKc78&i3{T*oR
zV%ylOY^Cw3c_?y!UT3}nYv3;HzP`o4-LJ(t$n)has6lAI&QKUOUSQ8^I5!zV2hB%D
za(`YWT?6-C7C@>qzK9%b=w&bZR~^i>HW3LV4i(_|MrTmMCGa6lHFriW>u81{0wVov
z4vhYCf>o(+a31XBWE{N#$4<1?WVjKEEiB~ZOgrEhy;6zlGWzrWyQd<s5w<;C90$u%
z(W#@q$WYxDf5eZ#N_e8yKjIF(dKI~z`fjvEl^OAu`8nN#b!|*}Xg0#!AjW?)Bw#!(
zsZGK%;vT(RD;2Tw4*m^C8q0FJk9Jjq0z@CFgK)483e|wW9S{-ugDsu@_D1|(u%)#L
zNe`qvZ^WPVhPRcebxOW<V&b(Elkepf9PwNRDXQ|SV9R)+v&BI32NAy>?j_<Ccj*%<
zs<jEWJamWCJ4RY^|401atE_zU7iOo)jMEVR_o1&e{_pD8Nv<^*HgQ+a{JxV_-x02q
z4z$DSSh?Gm+XZ1gwv)n@hGt)>jv+&yJENo&aaW4)Yr^Omn%AEmD-)h2MK1QO^lij8
zTd-ZG?J~B@otK@YsX-*RBs=vcNw^%;o9S0JEV)U8c3G@cunGp^Dtnx_iG=Xl=1*ty
ztxN1@Pe%e<B6*0I0RMjc+7MgJEsT$J(VvPWQjtvh|3Q3cn)P)}4C(0I={I5enIeYk
zQ3}>QIbYL1^|2Dcw7F<UAJdi)EZUehDq22WH^BM+zYl9;_<yIduTg~zz^^0H?*{Dr
z?_uYUSogZy?_J;JdeP#!YQi0I+k%`Eu@yjAiG}aAl{wv0T`lg=alz~bdyFs?DGY^V
zx}FIoNXre&32ezN*nTz#!a^@K;z7N8hO(kc;Xb!gFAzC+d=nPb1tan;_i4j?^z#z2
za}CZ!Ii>8Kr~_Zs?UkqmIR(=oa9yIK9?f9ilDf%&{1TCJCfHMi^Y<k48;tl+Z!_ii
zE>VL!wK;9nz7X1TSZU!y3%Ys42YQoh<=KS@Q7jVva&@b30ylkwnxfWk|FrM9CP^0h
zo1m?MU`kl`Y(^U6g-`*B*4*oQe5AdkJ^7ZA`@4S&&%MHjuUy=D>nb~?Y4?av-M@vx
zIam4-_#caO1)obYB>ITI@%?`YoPDj!teNJkW|uh%dcRfd&&UCq^Z;HRLpBn3hNX7J
zWRLBn_@U!yrBe+wH^q=x6gI{#xMN|%rzqC3@1<$mS!^%ea@P=B<yIJ$t|&~`9kOjX
zUQN3Kv6XJcqG?*09<_w^E=`#8q;tM2Tywrj@AW=M_9OD7G;i#A>Wiym%iWSbDGIS3
z``OWJ@6+_px)>6Cx|1m(-BG>2mVyOA@@YR^c6!2WMjcqIVpVRXk(C`y^^_C>Z%_PY
z+qa2OC!jgizF8SVo=$hx&^BlLp1$AyLlW~reRWf;f`=KK;bP}c+Q-=_Jx&Ow+mW>V
zwp8;O`2IhJ-No?#S8O-?moeTr(KyKnA_~yuumO0<_#ZPD^gw~R-rR~@o;%<l{HkSG
zV_+BThwlF>D`q`oz2$oM|B7x*XijwocXyChy1XOdGU9ogl(%*(HqULO<?hEe%d?a8
zs)~J@=f@NUB58N$xjk`bs(9XWAJwRDczIqTjdaR*_WY6*`VQhR&#uFB%pxe|Gt&B=
zXUPyE{Vu+Vc^<S~c2Hvcj8w(^=@e`DA5nGrg`{NJbN9hH<}9jGnsCtbaH28ki?rue
zih<!YUOg`)k);?nkr6?aV!=e8)~@LB{9J}{u}R#WWc{9>Q2mpFY92_p&)!G|d9l5u
zTyIlERZhN1^!DQvu*1nZ$bLyN0V3-I+Yah^jpBP~rQDv!WcTbY;J!qCmM{O39|6T&
z+g6C=^DQlj#q{rd|KAJ5zjeNKII{FEK+K;K_7-Od{zLy-W3_Gtsv1ikjfGE9IKgbH
zJ3&nh+56mbY^eqn;Mh_MR_-SiDd~<T-FwIU;N|zr6#q7<#7K@2pME^K8FcL2F@rP<
zdoZ>^I3Bs6s~m#KI0Tqs*PXIagR3znGX1%Baw<r%cau&|DP<F%j%rYaW61T_X&&oh
zd(>Iv=uCBr_t&X1{4wPIgH*vqUn)yePwF{);qxn~Vd}mgi6Kv>JO4DTQJU6Vt*iLB
zvRU3c`JZAu&-eeq=4570#twg}`JnlC>oBXzy2L_Auy6i-(*vnJ(7)MiidNL~sGA2;
ztn^$wkZQoES5G7ah^mc==l=c;Y*Wns`Ztiavpk-c^)in{m2^wf>v|bW;?Z<*-xFGA
z?c{#b_mFC0DEI$51~0z>X4ITwJYbAxb?ouf@BZ(d`C~|;S84F&QxlS*Qi%5&Axh&}
zwXD?B5%DpX@<nsWjE_FkMrf#xAqQZCIVQutkb)ym_-_dkZFlnLsVfCDykyD^hbzlu
zw<i|F?mp67n*l-M6S=nhb!{WOto)p^Ij19r`{`;R$>tbR{DEC`u{Ajcn{y07$98^a
zfoA{hj5WBm)X)c_)5oY|_kAYv@j2*uR>qM2&mGTgWBcHGm0$r&51FEARDCSqR@$Dj
z_ln_@y6N(w+9kR+bnhGE$^P~?m$~>}>Ey3(0uRA9sTAV7NF%uwxw(toIz{LIBj<lD
zm;W7P-ewkJ{vXGlW3~U@j8A!bV+^UcIx+_KNu8QyNTgA~^XN5DW}Dq=N!Q*VlodU<
zmH#OdH5dzXGnb<?^lvJ%`GL*BCd5%JX_1-mb}I$!tjVv4)o02L`zg4(S*#6Tb8x1V
zU#Ux39{JJ290VDHAd5va;eIcdA^kOW=X0#A=nv=fKcx<*$9OU>R3XE<l-gk8DSeR;
zoIu01T@Xw+$!zeR-TG_cX+>p4Z{E-Ulo~Y0L^7^S_JyexKnn2&<WKBE=t>GqxjU_h
zec!t`t@+O>`08WG#MPEj#g~eYGsA`41xdOm>`p!3cn`Yv*?0J#f~Y;#JcON^acNCO
z#3dt0%86V93)*WFo@Tq9N^@2ox=7Q!rdShaa5AL+R)$m+SA7Z%LFFcDVOmkgH7#XD
z5A4nVlt#+=zlm9wS_hjqnfb<}#&Y&1+mtecznYWw7&6~v)1M-3L&<n}D;EZm?oPX%
zO4%z9;4AJ5@IR%2;TY220ITcy!RKZj<Rd<W<4Wcw-R)EwC<oGaBK%K5+8pZ=A2Ewn
zs2xsOUA}pJbCK&mQ;OIH5B{R8=$SA0pMozK+mhX?x2&axNBs9Akbqo#lmgcC;&o+3
zKmRuWQ*dpJA=^zh%XuN!TM0+s#B^6n4l2E$W<#xlY-?;YmbU>J!?vVP!Uf3q%U4%?
zLAYR2{!%d!ovv)DdaSJIsRQ_*g1t3{%$Hj;#=l8L?j&M!lDp0O^{1K!H^-0%6Vu=I
z$SLOD#$0+>83;&U)7@!BEc&kSGY18&cCh6COBh04p91>-4a;MdSf^Uww_g8hCjB>W
z`TwK`v{9=ngW*6+5VoBWe|XY7Sj51_j;}dGdnQ?HHC7ynM>=4d*C|4o4c)0XbELcZ
zM$2g#p)wE3r*70U)V8OVMqpI#<9_?1Vn5N#6l@PQ!79L43w+|4d;5K6c_>&5_gk*d
zr^>|+vli<*V9OStuVC_$^@Fd|bN9i-O?j34Cmbs$!3+YPtw=P@D>eA~vDShN2nv>1
zXG#6vLkt#wudz=JFQNc0G}aoOhy!$s@sROHGY9^^)6Aua|9_5ot$By}toea8*gDdh
z5B=X3>l*7W=>OjR-yGvoU$tA^Q#}8WnjKtd3ARfUiWNN6gcy9@y`=WZabNfRQ>yj)
z1OuKwC0@pNO<}NHi3H^o^3FSu6fdcirRPKGzX^^)*~vYhN-d$vYk2-jjS<6GIBd%Z
zZ{7j)s<fru^Ea8fd$*o@@O&gSe!CZQswRZo<q!e|I^lyWvy*-))n~g)c|O77pzvk#
z?n?;MD09!BNu9KW#}tAY74&yJULGHC-u<ZlD!=CWAL{O<@WL<U6Q>AH`8AUB@eZL1
zK=bCWL%=5Ss=cWKeA(c8`F#K8p!{@<uB1`9p7*JtRY;1{E>Z>gu_ExvEnc|~)!cp=
zrbObJA>DX)R|T4R>^JI7o{vEG$1tg^6GVhyOq*d%Bm3`jY8zjFM8pTKLL{ogJBWq`
zzc}BY2uJAoLTa$JG>PY9+e_1UiVtirm64`I8?3%M!Z=-M6e<3M*Q5cbka-@F|8p;P
z4zn(X{x5147%v#>*@r0jI{($jt?XDj-kW_5_lR!nJ8x=aWyJ>%<$nr6*Ah3mk|mR(
zDwUuEBBd(@GNr8WjY(xie*}B}N0mKqjl-ET8w%24YyzWgJkx+Zy!R~)1=$pbL02{m
zWZDe#>`p6M8y;C!^uka0pVFoEF=VRCh8<V5(;$!evRTk6+4GY=o~3Emme^@v1&mDD
zAQjG7v)*aeL1V<4Ys!k=IFJ9OwGmlpvuUF;+r{|ooBfd~;2R%V!~YaSp%}8yVtl%$
z{y8FLIdWK{jM;C`EGv2p7#~wH^8J4wV;nP<8J8L3j9n%(kB27kD){{zU@d`#PweYl
z2>vT^=_Bd{#a@9xd@XsEjU5rn{Wj{U3?y6M6JSmuArH4ln*HsF%py%pM?K^UTX`T{
z504(c>W_L{?<ZrcpIx%ol?-Pz>QPq@3+rhSLlAjt{5*_|!2DPS@>0<JL$B3`Jt9iF
z07A$X*z5W#yP8`YDJbyJ+x3C=6YN9*H$nn;z-a?fzoiJKoA8?&dc9r;mq1+8&K-_8
zIUd5ND-HOiyV=n1=^e)skHY9WxCOL4w^<Ntj<8rBdb3`yNKf*FLiGuj;kJHnU(kUr
zi3CO5rJ;9M<#ZpZqvj=xwU7@d9@|M|!a>|d<UNfbdgFxB08F&QJXSN}-}!2j7Vksv
zOzQu-tpi~5e>iOZ3fR-o0Dgu40&ygU3z_3xuWAJdzRhJ}GT6!PlvDP`Z8w$`J$)ws
zQ&!J#9692$5%oDyqn_PPrR(o4Eh~EaV*aNf-55vixNO8>EBs9ed)I((Bw0sD-IbCh
zA01Ry^!(}kPeB%m@5M7QWpY4IrC%JGACEInRKI+ES<!=Q`JaNeJw7Nq$t~ZOR8m+{
zX=*9E`t^OwihlV5|5LDb#F70OjdeY2WWw$Urw#j<Gc?wTXJgM@17YebL;0VAcT;?T
z_@b`ys@$4qw_3u!)oN+Tnp5IAQo`vP9XBQ91BiH(75FVZjWLj%udvt;o63rw0D=01
zN}%pz><#<Bsm!|08f*U4EHa)n>T!CJcKWZ1=MG_ujj^b%MwwsiZ*Io^gyC)V{Tx4c
z)T_J)7FF&#R;$E6C4PV)@e1^P(f7tY5pi9#ej-T7@FwAiBYMJ{tG~v+{iICFxUFJ^
z^5N0u)!KIdTNnIsWN_MKj?=eGAzfF14Te)J-)6Bs^qsI5f?Z`rzum<Dl-i#hABN7e
z%wt_6(eS#Q-*9At+4s4^<E5$mPeI-mM@m-kIj(U#NDn-_9SYe`D;Ja%z5X-)r{JuO
zBTH*@#(*%Xi=kb>;Yks9u!}dKWpBO6{}e2p@qHxQ;aY)Y=hph952;*SU-{8pI#obT
z97$WzKG%rt@)OT)``KylH))n1PXB)s|10~+E#fEb_PkH<1A-qC{4>G75d4VXUkUyX
z!M_pwJHd|${)6Br1V1JCPlBHj{G8wy1ivKsFA2Sjph3_iXc5dIIDp_lf`bU|MQ|{|
zAq0mK+?(J&1otJlAHiV+_vg@?>pg(rfdoASy#$9796@j-!BGScA~>4h!2}N>IEJ8)
z;8=o(5*$bHFoK5@Jc8hOf)fZHN$@CwM-!Y#a1z1E1oH?^Avl#_KEY`OrxTn(a3;Z7
z1ZNYRL+}`a#}Yh_;PC`cAb29dxdaOc780CCa6Z8WlKyXE)&<tyknc}5?lR`F7g<yG
zGot?|>f*?vv?)_$Xxr`%>PANC^h*J3u2Qi6ePQljvaO;~S+Ser$ez@mX)m&&nHLT=
zw+ksYbWJ2D&UGkcKY68rFQJRaZTh={uQiVJsGXUJavMHGhk-|Fa{$Q!eBw9H-R{kG
zEZ*yOnaK0(+iwdt`x^pz8(ZPL!GCRukKm;7iTbU<hLRKG%UbG@(LT7D(~U`$xHngO
zsXTf*Z!LPaUTJN89Jx`OGg))lPz$9@RmjJo5K-r<CFNs}Bt%;jM4>qHqjqF6zp)`&
z*nuF!kOc4sA<uzS6y!RUvfhWzqYwG9f^loyBgs$K-3o>qj7~?m1@67bd9pb%fOs{W
zuLVYoqxKdn*xTdCnc9^}ylHE%R4E}q3DEkAnnGb=`2)IFsG8Jrc3F3ru&S)x08HB!
zgHQKCCm2me*w}*jA7>jE7?&DX8rK`&hZb;$affj)>;fM(o`!bd72|c|En~Ow7vp2&
zb7TtH%iPyI&>Us@%p;ING#|ObPcY}3i_CIF52`k6pf_wWBj(A79(=BOp?Nuc2yZmE
zLDO)nd6#*g`H=ZIG>R|5^Y{((ZS#HeujVJnIg(=yv4&Y*YqWJJB9KqErd!8YbFGC|
zsa0XEL`3pBYopa_ZH9F6OzS*oF0QbyMUIjmS#j$&>mKXp*2C75)^pa&)^DueTkl#Q
zT7R?t+5hVFb=)zqX8Q)l2G(wed}Uz$_C_3o+tK+0H*Iglv1xk*$JXsza13uh1;_R%
zsx`19nuB9!bT1rFj_!-&*64vao)R62<7v?`IGzzb497F0N8xx@bPA5&iq63Cyy$T_
zUJ#v!<3-WMI9?j9!11yuc%6Y)L}BSU@X9E!!`0Ca9IuU@hU0ayK{(zJ8;0XeF^=VX
zv2i&5AT|ldAI4_lxIK0vj?q{#j`7$@IPQq8!SU7@f9Gv6*pLmpJ=Tun9kH!A-W|7a
z{7HN$j`zk7!12ELK{(zY=QV#YJ`u-V@##1|9Ord@EWQB8$Kz!<J{ez*<J0kVI6fP%
z$MF|&UgziIyvJUQ^S*ki7lV1=%e}mRe$_i1$5(rOIR2*hNE~19&ByU~y~pDCX74;4
z|Ik~C<2${}aD1<qzxhwS{LLTqw&3_-?`9nT+{=68qaD0A{<dR396#PM0>^*s;BWqP
z#{?Wd+rfMLiygCZ{MU}Tm`TPC^vNJ|2l`~tfE}xF9Js@e<6b+0I1bqX@47+z?Km07
zVLQ<$gK~H7jpG43Jve%I;%g2Xz7uaAG-~Hm97pdw21nmc)OpaMJMjevjoVp;;}JX8
z;y7Vv0LP<tqRxYk-ibO7%G-%L51Mi->O5%Lt*G;$>9?Xc2F<*czj^kp<8hpGYaWir
z+=}pmj2*)6W%&Oh``9=D{=f5#bw-zQlW~vnobjGH5OKf?%{7P&bglUl^H<RR53$B!
zHZDVKkjt$d))Us-c*Xz1KT<WT!ZYt+Qi$6n-in>;Ur4#?WJ>7yO!{8hxo+?NLUZiR
zEr6W30m1MQLjl2}rRI2s(7NJU6I58-z5^C0g;IyTA#sUYGIPzlFt`;P;UwY8i>D&O
zngBV|`1J_(jSARv)<^>m@3Eqh-n3oQJ6z~<ae)W7_Z5afyolEpBpyKRxP@;;hcxi>
z9wC~H2e>dyh#!Hf)GzEryz8lX^ZbapR>uWPP<)f+!68C1?#)eF^Ygu}PnYE_CyevL
z{*$|qyQQH~#=Y~dOuW>A!Wt#MQ6@2s_W+^G*X?ND1BF2bzl;>u2#s11f|21o3Y6}h
zEPQcs6|HTCdPa6m8TElE<$>^<At^_=HPLems2vMn7SRHI1eYL*3;Fbv6EWfS3eyE|
zE@GG>sJ65p@)lFo#lFk~lkhG>R57Vw@K#dQ<#x`gmPH*f5Ru88yz8jjM5geipePV&
zHX!Y@y(iFk!nLrBWW$LJQA<D75;qIuRgQ8VNtnGeg~fz77w+C6n7UU4A|P4BV`Dh|
zKbRfCtkbN)<~8Od$p1F5FW5CGvi)m~BM+Hd5|^VE5+oRIi2R!Zlb|)zip#$caWg?x
zf1;2>{`ffV(33%FU?Ybr(6=q1f{5-*Ib~<OFWfOowpE?1;Mfp9RN!z$?=5SoZN$_h
z`=Q*F)2*L0O8TnmA_YZ59NB<DF6#wjwq}Tr*643;MX0{MPMc>dVVC?%II(~*uTwB>
zi2K|(hGQzI>5?e`B_EJHJ!$8`L?El*Bp65H;ZP>yR9j=x2V461V-JrNX8!p8Dly(1
zM-pP!T%5zgmFuvYvG|?O5h1J^!iM9>O$_qe)mUiY6nA35t`Rd^uyM}i#)lDs^z6I+
z3LkfRd^9+Y0p<c%Soudopr!_}t0I$!NEw2)yl<%Ju5Oripk{pX{eKvD_qm?Ei0GdS
zjgyVI@g`z^RGQZyJj+Yg{-C<gv!1an2HF19CVR0B7Hq42xT0V!<VG7(h#%0V+Oa*D
zKFY@Eb;tJSLY=Vl_l-}6R~iqiE#U#=JzlGVw>@8iJ-!KXKSkfq*BXDOJh8$Lh4a!5
zq1E)xafPKBY2heWgLkUdmer0$5t|&Ob*QyHwAhcVmmyiNlU#M5$gRT1qgdbt3!E5;
z6ZL_q>?m6VrI6s+^QS^_Jr4?b@bRKc57#R2Z7&g)ggiYV?3IMihIn+D)~3P!s7Ou%
zdq<(H5_ZGl;nlA2N<j+fq~*a{m<Y-$FV>oU*zrP4kZ3eQton({s?~=lvpvk4x>ROj
zgocyT21`KsMX)Q0x}T`E!M4AHM@RD&$oOC0MN<A(#=uSQV}8fXGk$6;V9zk{Tzm5G
zl=ws`L2<R+Wf(-c`fKd$mR?%JOO!3JBYrg3LS@i^**b#f_J)-xmK;8g`z$?kH5b_J
z_x+skE>`fi$C2dMt>~trqeWPq2(-f4P<*^x=W=$=&qSmsZ1^hHwm9<rf+%y<*F<@V
z_EvHkq(tgi%-;O_W4xt~R2k9$yQRu_WS{m%Btj!x_EUD@+rp_E?V7LjW@mgnw>CK5
zRl8OM9=ZcF3VULU-^XooeKJLkH&=Iso%PsuP3!98NEYl`wyCmMxrIu}nqk77+(BgA
zJurSaCd$xELE&vf6{*NMTa_5AX^UlUKQ|crU2s;}ocYE4Pw8yF|L@1{X88ZUakLRY
z_RnX{p@=fo1qs~;u=8IH&)}!`WG(oQKI3L9EaURniM|C1sqB&ytka$Cr)*t~<u!uk
zK=_G)AukTKAjPa0zcpIBFx%r`-Vr>Kzd;s?Ckx%I%PBmIcbwMS#f~gc1F=G1<}2@9
zH#=WN07>c-L&;XlW87?C6-YTNVxF&ppg9n(lSaGVS#F4#ia-mfJmQf{-4J&bK*F<e
zCsX`-i(Iu(v$7xUs)f$W^HFZ-C|lNN?`$^>BooF3;P{A-&vQe6hy@(NB(6m2Tg=zG
zp+bdV2ci#Jl#i49f49v4afexn{J-ZLqY(Y`>-yL2iBHE;c#yfq6%Pa+ycGk_w;U?1
z8qkXq;erBbS)gvBuLD2An*uFTqvrBPbLn+rQ$Mf#Vud$riX#Ir7*KcBA|Y3#QK}II
zH&~lqXwDS5fJ)B3`yB;ceH>|d-R?bULaJP~q{O_nY}Tr3{-><?>*C1I8^~l<Vq0QL
z><mb*{cPr|*U&Dia_;Nm$j$2(0Ss6DVo?x1W<N8RikRgkXaBfE>8fBn&%GETeTwC#
z6|oy%cvg&pZ53*KmDV_t@4A(IISV75Wt71;M2IucKh4Sq+8Ce2y$v!rsn|Y{F#b;!
zE$60}ZT(b)i32jff-E`zFSQOqcFz*y4^Rfa^EJ-@+BkAx1vAA~v$a-Py>e5}je)%Z
z`i#qzW_BC#W3kE%GBZTlx8cbwmCr1+4^|!|Dlz{zsvAipj{I0)Ph71ix@|gFbK#`J
zo}{*`8vEM#9QQq3g2)^;DMfDTIom$4kYjO>*R72sH&$&X6GvPB+BeEv+X*{&<X`Ch
z|4_bQI1XKvTlt)ZOhMl{kuRa^e??uFZi9f_^=@qt97XStd8P~G+4qhZsOiS$IFi}B
z6?;0Vqnvb9>}O|9AbhIv3a9_~We+m;IeXB^g9Sj;_{5xQHk&^(--HKH8MJ)2eqE%%
z9^r9AFRk#0!$IV+=Tt9ps6?c*YPB1(JVng!J=6{PxgroAk3cYjBVEEd(h@0ITdvIu
zV4E2_uGKqU9}eI4xJ#<XJKc>?)`5QUPIE&;JBz`+2fIPqBqhP%y||jPT@Z6?+<asx
zEPaU@3w~KVTH=N?v6CI%DQ=K~`EfAg8hN<2M8{#mL}+!88^-T@RfaB1-j&Daw!Z<n
zprn8*2q);ymi;eUn$ta|Ulh&{=T#tzPFQFME5TGj$JD<6#eDvcVK+1UzYi7w?-~qR
zfLX?RWC6X#_=)i=<74w+bDCLd*1>+~2e1Hm!Tc+90!P3CV1so!vIh2APg%d;qnVq{
zL!@R+mAVTrXs@zGdFLeVwUe$>NnfrQ5qb|2%6@NdiUgdL(|Qr4ccO?Jj>q~D%p6Xt
zUX7rdRK1SM4^q3A>g3dkH#>`>NdsM~kv5Ci*xua!<jJH(7YQ}`M8>2jFY`lK4^eV4
zWK%-SQAK^6CU+5mtG&4yL@T7cc9xz{EffI>)dGeXiVTE0PD3VnkD;z{CI!5+X!N8C
zD@cFtAdg63(}^4s*fdfF8h$ns$UB>mrEw|VJo@Gu_MfIhDoyM?F8L60-ZX%7u4;r9
z0WNjon^kc7e=r-xU`dy2e%l<2IbY1)XWwR{TH*@??c<7Cbu_7v<`;^g#me6<Bw|Zt
zwbsRvq0%kin6eUJ3Fy<tHLp*Y6sU~ps`xyf$7GBv!E#j)IwjFZxyhgGtl873@~Zbu
zOT5s1Z#j<hT&Gh1w4(^2O4SGANK6T1YFCX>&4g6DA$H*tlG#p|#y7<0x;J1*n~k8j
zQ|BkU>QfQx3#@3FLg9B?@e{$L4bGI}*GB5}vv~EhxSdikf+%8@(P)k%&$L?#+{sD@
zB)`ATmukAhZhpUjKIBrR*<0hsqt!;H2#&T^7wh%bx%z9TM7~SdRsVlE|0{U@zoX43
z%;k{(oo0+?cQV+B?%BT$@iO;zD5(ZosrFi@9(a4%oaS%yKc&m+;z(NO){#Knj&hZP
z)%yy^M6k5#NLU|7k~%C%uBKSZhJj(<C+lXHlwG13Yi;qx?p1iDj$3`MV=+7T%$4-T
ztCY_3$3^}+cZOA|TYqlKDZBOrkyROnRcaL0);QAFxs{qZ6YjZ=#pd4QMYGPn4S|YM
zTq4%Tk)zt}$4W8ROEKPKmyRu=j%!dlE*LLzFLq2P6)+|gZ3cV%+X+piI`rz}NK5Tj
z8eA3j2b*e|{3k=7O*@uSQonc`HA=Pr=k)&o<8o$P4om)S%d%ie{msAs%^v8;>E86!
zad>%C@(~rT*q>x9aRzY+H+}^#T1&P?`(L^xr@QT|#5yevYlXj7Wa;D97R8|s8Rl#M
zOS)OknZ{R%d3qXVY2V=&36Ocn4t~Bc7?3Kk{jd3|n?57G0+^0G<qmQI`@2H*^<tLp
z|J`mg=ga|LWz%P-VNMvq!w7j1qz_%N{w;)6a03j!_)4+=^?d)|3*vt3yO96iZ!R`|
z3HkpgU!(j#5=WXjw?c89Xbr|5jxx8xv#uBG-u&NeRu=QNIMUC#HJ)*1-*X*{*|sl)
zd6EM?Q6EP}I=72@8hf3qmYja!skEq9DvfK8BR!p4dnApOdaiT1vG?*9I93M@KwBJ{
z>)du}CCv8I*-<ET9E#btg4YPAYLQ$WM`meg9b7S~b|H^l;<NPdpNNh;ZQNN(M@Hhv
zE$w!2>O3TLt`jGn^@jX@X-4CXab%r_owci0@zpGaE|ccmDMdA#h;L0p#rOY%*$#&P
zPqW{%&kUb&Ec}1A!29nW<2B<W(=tcHtFPQ_H7`SUpx>IGTO+KQ$o?0E-`)4&Yxm2q
zbFU;>hNIP*_ec^H@eWBEvwM9cDB`8_8f~`qV-L$Q7r-Z-U(nf2dq<PU1;2?0bwTu`
zrDU?Xg2aU4lCvMEheSF2mXz<|U7BbKuB16dcn>3q8Gp{%b9aOdIS-{Tg~WVk=ZX$N
z1g=VUN7!bCH$j9pMXQtIjd_U<QfNl+LVAIs0->5~bSfkd)2zqd<s$B--Z;-YJ}(E(
zX5L)aiVTvWCM5rM1B_`TeAB5T=ut<F1GUnT3GtSYkT6wmK#yot19G(0LjcXc>I%xm
z3yXn3xH*Wt&Jf3YH%W0|eK|NAUjbZNIs)DnSxbAFZ_T`>fWKv}w^@q(>iHXGU?rX&
z*xPVaj(L*lZGa@O&ntQre1<?CR0S|X>Vxp|5`&~s?*ALP{m)Tm%$#OCY@Eb?%Qk-X
zv${1dGPh-jU1b+@NV9AVYrAh$uDpYfc3W}a-tTL7B;;*#zaw##j%rke9m%1XZ9n2q
zgj40*TI0y$=9cw!o<zBh#r31lB$VnV*c3;8X1A6~PNO~7q0l^{P3%tTPAeU8WNdb8
zWv$a+<Z3Rkmp{E$)3c|<S4lycD|w8ZWsWPOSn{1$O?Jh3Ux;RJt5Dhh`Zy9gyQSXJ
zyde=&BGo@~=?jk&qL4y#Y>cmPZ~w!asccN5d8uU^*8G@|bt%aB{=biLAlLep8sCDS
z|6ic(+hoSgKUjxYYpolt=fC=u;J^Ki+Mt!T1xiF%Os>0PEv<8-IM$FZZcGt4HXB{z
z#zL4sl1lUx=D^)756-5Y$a0cbk2rblc}qIlgSC0~#^EtNN#v?~(ud^=SB^zuJZq>a
zHx{-0d4<$+^;z(k10CkZVw_{t5NWPk?7SFxSGgM&DfFE-sHpw>_7Q(_|38%><L9A>
z?mq|n{|eauo%*%R(S|rux~(#JvJ*`#K}o`dq-Q)QVXU+g<JscR`Qo<dgxgQhMiy+2
zBg30prH+$69{W|Aha%h2mJq9|Mz$N{by=+8oEYT8NYHR%Ey+z^UxEX2c{9OytNVXA
zUhCd8PGb^~>s)@~k2cW8u~6AKw!~}Phal3c{`FP?!B2#1FcgI+DX2Ha{i1VS(E$#=
z@?1fu_|LP8j{TB)SJfJCjBjxNDIJ19I0S}hzb#>_xk71LOB|V$VQ}b*^LLEp;27cI
z_@jPDtyAs)`1~KpN|68Cd<)sXe}tdE-J`kRJuJQn<k<njm)Y%XPUORLW`{B|ORd|5
z#(GiZ1K-om`tAksCe$fpHt72^Z9U0YCuFfn=czjR{OxEJZa<rOmKW}`BBt@CtZr|;
zMmFh$+czk~qWhruMl@uWxj37KB$pH)XA7z7wzX8SgNRnLM0zn3zo@;TW$ztg5Dj|$
zx9Qd6*-^iW>VdW6)h2FLjEiNhlb4iFb7p64H;fN{$g78KV53^SvGGP!?|Ad1f4lcm
ztEVv2E*NhA%8Sb8EW4HeDV2=G8#v#XDM_vvdbZD#m->OdiX4D_{5ug_E#nm7^#3>U
zKeJ!)D1KrQ!D50X1Q!upOt6&T5`tv}ml7-|coM-1f|UfT2reVIoZt$AD+#V5xSHS^
zg4G1q5?n`cJ;4nG{RC?W))K5E7!a`D+dyy=!DfOj0ycOX2?hyn6mXNbNx&9wh+wOL
zZQd}!c7hRt9RxQM>?F8_U>CuY32r5L3c*teo<{I=f@cuyCU_>nvk0C|@En5Y5`2i@
zE`kpee1zbm1Ro>#IKd|fK1uK?f=?5ChTyXVe?jm$g3l9tf#8b-Un2NRf-e*N6~R{s
z{+i&c1YaZg8%h6<X4V<jFtf_Im5nx*uwOAm6Ju;?yln_O(eMn=lIP{nYg+ukSoalD
zow3+>;a2U2Tpvev!-h;gb^K*{tvIX?2Wo=hNaOn2I$_A&=1|C<dPFSwpR9=})*$V1
z<Q#4{Pt=o$0uhoY*K)mVG789im~M%kyG?tE-Sk2S$69veTWSoM4RItN_GgNXDX^A|
zZ-#pS$6F#T4BOO_Emup=apP5$_U-n?dBWd0W@R>enN6VVNWoP2PY#7)K~fixbW4j9
z-J;wy^@1nletXBe%2w7rJ03zEPck?Cdv&yJbs$v=S|W{sX71_+k8I!kF5Z9093;LL
z)z|d{GZqMq-{N#qra9iiseP_cbWOzCde>{0)7QTtB(@p%-&5nw=qdw3w>?9c)CJfP
zCkkc!fsFX2{tsaZZ(xr=`!^nz|82+w^kYQ&{Hr+(j(L+13t)|Tmbt@x$b8fM%sR>{
zM&`c`>m0V#y4iZna?349y;ECZFj6bb#fKjxm0Zb*)(O8HK|&|y;P8>s%Dz9k)Vpy;
zj@e*(vm>^>O-JV-$dT90Q1`aZ%7IWcaj)xP<_%G+r{*6sJztE}7o~!%ZR#|bEF%$Q
zooMokMjnx)v)S+cQ{wt`#C=0x3nbjZu=kY(I@`tdx1|EDZR(84zRC_n2SV`TV6CsO
zTL&awFmtlc7FDnmk;_B{c1tx?TY*Ty$7c|a6F6U{^zoh|E%DpZ>c+GC{YI)Y+X_Pw
zxaGr?qzo2q;-$ZpimNuxk)pc1Y<RBxdQ>J?yNL*c$M4{06bNZ}j?`AQ6?O%Db-{pd
z0#syOe2OpR21CoyLa4?>vU~5-2{c`S>O_stkxIU{d5s}(VWAe842Z|a5;c36>O8M0
zguo28l+NChC+C=}Om7>mbkqsgum!d45r2D^Z$gc~y}iB(xrM@k=HM2I`&8;Tx*cPH
zZWoPZQi<9Iv#Qn(?w?*168p&TAyj3E|Jxg7?6~3k?w4a81kCf7&lg+Ud&*2m-;LVo
zql&Z^!gQ&fFNAzI5v_bws%qQj2bv(ug=3E>JzFY?+vbOmtEdDq5(Cg+clnkeDNrDM
zqPXQ%x&Ql^b*=f4d6DTcHX1qXV&+Rw#GB&CNVX|ckQuS1IgcjiLB`IXDWZ`rHeQ{m
z>>TZJqzLbS+lDwvq<mW35<tr)6f~e8<X39bUSc=D+e6!Sje@l{juhdwnZnwMHl`0D
zK6X+^6+6GMTw=NG6$MN8_;?qV`tfGFepeKD_^e$j*<e0veG|%q2rgOM7z`ohRVW<s
zEf3X(5W5K9GdVij_TZt#pCpJ3^)qzDkxsnB%#emfRMg(rSPit_A@v&j-gDCGHU0DZ
z<DG(j>W6BB^==?6&G}Y}QQW4Mup7@4Z7VzS@>kW*aCn@j6hGW-+w;#LlA>n$6*SLm
zZl#L8rMkn^#*uuy|4~`#M-<bgO-Murdn(x*X+`YDV;0L%d8w+d=JS6rD`ZxS#Soo)
zit)U$mVL^uLy^mW%X^V7X+<UzEHPNHyeHRezSbvBLMx`rs$HG0e5p0PIYZc*Oc6lE
zi&NLU)FqHz(M8kod^PZazt?gz*2+TM;K#SPC4>!_Z-Q-V3A^ZQ`h=J4qqLx{7wJaZ
zGDWfyEhumIH#Lg|eZdxFcB<vJAQG4E3cLEmm&&eNc?kbga8~ys<LFxR$bLq55n>ne
zJpsZs(W=z*6;==bC=M(1`d-F;s4}=6i6*TMHP>J-uWX|14Q)yR>)yV%rU9GcNGRI>
zjw4bG*TZHB6jUGmg0B<t6{yARy63Aj?b#GR%?-Bsp_cJHNnixRQXkLaCwtAYnB92)
z9U5%i`^Hbj;<Jyrs-Gp!B~jv%cwuME7DE)@Q{^W){l7m~_x;j1#<&QPKMyqL!u$Vf
z1Ymm=k-leJeipT^H3nMGxm*sixox7g##t9F#?Zo06Q{wXbb9!xqpTGfZZ7smxZ;<8
zmf^#-v6{qt7jWY#q)n&@Hq;3AakxhtIY~T_AjG-2RS@DF$^I2N*hCyP=@N^67uReB
z-p!RcAP@HFm0H4}ORGXo){@wn1cxwu(9zbaOtsk38h|0BByWv=J|QFu$<)5yH!^?1
zg@}~lTP9c8UlimZm6^UPl4AqZ5jUapZ4PbmA<$bNukb;h<<IZ}m16LAPO{c!x<7Tj
z?4Dp%X1Y6!wumL-b8XB6Ike=k^-U-YwRE&28aWcBNJ{o8t$hbQi1iz(lf%K5O*|$j
z4gI|`w_24mdBbx5N7{pW>uPJN`J`E6{L}c3aWs24n~B`ty=!`r%JC%gV61u?sfuV+
zIijg{z?#9^miWbPKj3?OEnW1<*5z8MVqNdP++6xdh)~83*N>URJM-j-nJ{(sk%Ij?
zH}yPnibU9Xts+wl^zI|j^s}?3p_!tfk>{*;UxDWzOX?Lob-l>@mVI-k&q~EZ=kxNl
z%@J8y`y&+8=1j{^MMLN8tShy6kd+n9$+Fv~Pfx`|=jQ$*#M7cr(mqdJFA}k4-)&Qs
zZlm+sF`DMo^&$mp_Go4(qkzuGA1~2tU9Jp*K<}VE>9u^N*XW#GdA_DOa{jLc|8Gq*
zpEm1^&y6dLiI4@Z?Qc%IxE|;oz9)^Crt}q^8$BYhmgA>Ks;KP0N&cMFAx7t+xTdcH
zy`DX3&WvfPXz1K{dLQk#M<%E}m@!jR@l2QJM%8z;?Kxmi@Jv(IO*%KmJ)p&dl(E^j
zCtq1<=$w7$0u7$JUSwI#ei%$wz7L%r^;a#LVS9pRhVpsnd;|4b+6qwHi<GL(=J+hv
zO$CcQWq%kT8k4@+NctbCpjNZX*yHS9#!REx*k-(j3;-qO>B!ObfpwU*2AO`Ia53Lg
zZqZt6rfl_z&3GEs``RoYqcQUBEFYs!z9Y-WXm$NTmXFPl6Z1z|J~mT6_R}mMqYdr8
zEFYs;{hcfyqc!v=naNd^ilB~sFgs+^X=C_tmXFccx+2TRXl&h?<zqCqF3a*U>XHkx
ze2m7{-B~_HV{0d$|A%mQ-xzxm(Z2>8<KX>wEwX?<WxQ$popqaIkkN0c>1S6#2l#z>
z2)|-}jQC$iSw+agcNQ}5J!|bwnfBS9kme%E&<PHH6lqOTxO!6bNSVt#p7?+ZV-jj4
zi}W*&A{p;#q&CCVhwg~L{R&=MTpLssY?d;EeMnE_ARIU*$83YPCWC}s%g`U2W4330
zRL{6ezb}C{jYF6IXKf2oSn)(prt;j>lPS#gkvaIJ-nL|)>zQa$Yo&9`((|k>Rcz?(
zCVgj7AOB0bE&7s9j4plGV&rgg;%G@D=`4hy`la)=G#W};HU?@VkSo};VS8VZUY%_v
z5vV4Xwm>Ha(T+?r`x3p8`<EeXLZ47+Ak{-$sDcJ_6C$D|^l#78MTG1_-ZjMGvCAZ1
zqXw1+;enUV=zlpZ2O;*nZTzwj89Xs3#|()AbjU)CR9`jM&vKO))TR?er3-xXy13pq
z(JUb|7```+nI)l?O@S_CWod{0NSdM!A56mogMJBO)KkuqKT7(4I;a2h&8N(O@uhK<
zVL|?nJdC=3b-l<ml|7v`RpCwOe1-7scA)A5y&~IGwv6Lcg>0mA_WB=)1nN;(t?psH
zhd?MhGLuP-6U|b!Yg<F40Xll*o`H2rU3k}aUnSy#HB4SqUgRaILdKg$dOs!_^FF0c
zb-l<&wFg~H%X(6zA<t)s2uBWGT-Q5#PtfEmXz0AIQ$sP=_9F3f_M|LrZHdOn)0}IF
zJxe2)>w1y*Ir~0KP@V}ibiPT?H6h(I&}2)OD_q7@d2YRCYC8=%p0n>XW%SEaWAr2q
z7QX-Q$9}}{|F`e~Tx4{^@Bh!p<y#GH;N!@}d#ts^dPKJpd|l;P5;sK3#<P5kNZDJm
zBV}onUY8xRggofHEFU9M_R=gLqfv23mXFbx{cd(WLaW1F**!&U%MY`AiavF3c2Cil
z{=PPxbH?>PUo7xH+p~wKiHGkg&B2D_T2`HL7xCVx^>ED83{j8UlJdW+vHx@F|5q#j
zLx!q7SSo3dCsyRC@|@kdR4iiYLX5gzWTnb}<)5y||LA<)>2j@1+h78{NKBP|bMh5&
zCY>82+cj%)p!bM9!81+SFX^0}BSPvs?EbaAhwsS_qX^99sd2vu!oc-33MmulJ#0@}
zGgbLGbk1J8RNHIg_5{x~g({_UW4ccKSKEuEvDxp-N^|5XyZadJSVP{}Js4}s7|56B
z#^`%Ay~g+dT!v)eAFx_ujIqKv&v?lA)I5s)+*}U|;C@8=*~Id!8`-7SOSm<&qTJCS
z^}x(3VjdFBmo)i3AhQ;>iU%=CTCEJ<PwVU~7QRa8>sK@eTU$w4JyaVD-eH{-s=-^e
zzV7k~o#D=znJo~?JA~IA+{R(XCwRWcwaLW<B3N$LHgZu1jO@T{R0P0wM5Lbh$;?}N
zMW_{Ab(kjz=kkuSK&{Mb{j1D1Ofw<#c4$+s$-d^?yD-Wu5Bs|kfhc!nwmztAM2o~j
z$YV)a8D7XdT#)IrtIwj~*_AonQ!{L%l^sEzl^Z6nFrVb6lndba+gQVU<Dom+eFz8^
z+=Q^1$hlqz>q?tF<-7e@ces9WpNZxl`ss_*s)|wZW@f6U%3lLdQ%EV$^;O8|O(qA=
zWVYYnRxCw+DfaTdFZcf{hG<?#K)Sce_{g{b`oD)+)t=M#&Amuv)tM=Qk;8oRC1@Nc
z?wOa3y8IKlhHaUiw!<K!RrYITLYkZ)Gw9ryc%f#kT+=HOTaC$z^Rt;4@Snzg!rXDu
zCu@c%t*Gl2S*^0QVwkS*;&fhdwWbk)-pPB?S<@8umCo5`f7als?VYqI+oYmfl&9=1
zYE2q(QP(?Bv?fc_kLd~;I^R$%8<U16(2K;f*^jV%g^;Cl_FhQSX`x<`NH#;xxlA*s
z#cAq@!cjw>kr>nFj-3DHOj!RsVb&U-AqvnKb`LAxv-uzBJ$6reYML^N>6|@zo2IAg
zdXY;DUnI*9pRWvKI^QZX`#O-wfnMa!%KpPoQ>Z;UH>N$TX--=&vS)406!#(1hxbXQ
zk`}VWLMlr~4Vx=*hH8`rC(w(GTG_X4x<X>oIs5U8nzq&UB8gV^1hX<C<Y~@|cO({v
zDT>5dd(aw1UN&8xvqwaP4u=s@*E@Yr2Hp$>51ltxXq$uVli4>XUt!MZoPAd$k#=Yf
zr~k*YyBPkz!2WFPYa9+c;0;EnaWgyt{%HKo+#hpnK6rtxi2r#DD1?_`5s+gYWaV2W
z$N<!7U1V*uermm7y|-uU#hyJydJcsOlQa{lVw`yqQpM;fC(>%EYzC>@QYojybKn{2
zZR3R^5b*qPs8ty8gUl`s)=O`@cM@-G42J8VcHAtBUzSlW@o>09#Jebx6#9huf##5p
zeBOLh=gh&V=jQppCykxBKf(z(x<Acq^f}V^!ICt|_jvcsF-M}R%Rvf<+PxoA53TSw
z@f2I!XRfFT9&ZBE?_?4m)n4Cw2C2+iq4G+)X8Q$k^M%u;8gc2D^r2FoB8TpXR7fSL
zFWM?EksX#SCE3YEN-^ENT`8tXc9T*}i~coAF>(GqN-?c(4=Ba79^If6(}X);DJBBr
zVx^e&g>9*Ar)poFdUHZ<bhA=SZI3C%^peY!Vru)nN-?$lTYUfDi=E8(|HI6mn=6bz
z8|SlkQScxCx2boY8_$bMN5-<vv6!7ViD|q_x)1Ixgp%)IGuRLH4qIx@VgpPl^|v%M
zL66#3v@nuCdCF`%qsSc&v$(%<gmA<tJMxc96u+I?UgY!1ewS3FSMt;{D>Zv@pcmPE
zvfoywDtkVi8yECw@YMC5xF@@0zCxGN`R3ni(A4%KS5NkxrVxShl>JDjh;HjW{@)?a
zq`E*Q&P3?}bKcVK|456Q{fC;S?EiFbOlr~epp^ghGS<u9G=>?4Mg%+m<Hn!N!^|r4
z67ym6Pu6}`fz@Pfx1RiuFA4o2$Si$y-p?|N2o<+9?-`jzgem(N?S5H2L7QS`K~M^g
z#9ryM=IO*-n}U(hz9$}P73ppW`<syl(7HN<CyKl!Ph>_CUT!dOX@?IxCkd?UGWe9x
zgXM7AXou&9xc~YL>L|J&Iq10Q%?bc6|ML|EL>vL@+6+QQdK94&T7)w@2oXWDSl1k3
zE!DL>5)8D|ifWB+7-yAeZi7_0$+yVgY<B8DX5yZ_1&GV-TL{lI-dJ;s-lqwENxm}d
z6_D44ka%z8`+9|;a%)~OkFHSQD-XiWS=4^y2l^2Z3L*x?;1Bh(LUBW0705l<5rrcn
z;DhuR8vJL;|4(MtrPfT$_I1W5#t)52>~1#MX)<;X=q<%AIv`UdwQ_uzJQu+nTm*c`
zpCE!UJGh~?_abpt|A7MZR%dP6OYGriSMtTO?8tZ3WJw*pNS)QcUwj5>eVhIoyYv*I
z4c?xm&<5qbNT&t&seVY8qy<^hmaJpYYT1<T?aC`_dyy`yfA8{iO+{N;5xZ{N7K!D;
zm1$UzGOK?q+-X;+0Tv@5ieN*8A8$$#yQW-p&ysVS)hr#M-i3UxJhmU7T3zrAM4$<8
zk_mxQqH3_ahabq><uLqK^ezxS@BLszyLhORWQ!6f?7EM29>UGN^EpK`r=K@#qMc}>
zps?GE8#OKA`~Nrb|D4vk%w-fm?RA2`BlrfvHwpfp;2#LSMevUV-zNAD!FLJ1M{qa6
zKM{PN;0FXhB=|YOF9?1~@Lv)RX9Nv`CP9l}4#5Eg2NE1aa4&*`2@WARl;GY3_aV41
z!TkshBe*}oT!IG>JdmJ=pqJoqf+GlyBshxTK?0uZ{T9LV2%b;y0)pQrcp<@y{vUha
z0oYb`_5X$l86*&fpF&I`2qS?cPRM54j-5EeapJ^wrX$O;twgqLNsi+{NDP!+HWVnO
zK-tBT$}p5&Mhmo1+R~P8N@)vx5a?ob(Esn=dnCPg^`7)Zq5Xefp>dDieedpd_91u?
z!HWrALhw?8ml3?2;1vX~BzP6UFA%(%;57uVCHO^x*Ae^@!RrZrncxisZzOmV!LJa!
zncyu1ZzXse!P^PmLGVt3UnO`K!9juvw*QA~H43bKc5C-*d-Nmp4TuHupU3s{Z@<sp
z{{J=t`PC3)`=7KN=D{MfrP)?RW+V2+jYVc7mfv+nW+NK>o+7gm@8hu|vk^=2Drfwk
zA>{G|5DVl{w*L=@xi9|xT=|naQax0ir`D=L^)z?^xKsUx`ZBbEhrvK$mbOImYumvS
zxK(>ZdkK62O&_P1>D7o564x)#Z`AMCpVxo$A6b?XZ!<k@QgV7)q~!FlOUdbBwQ_3H
z!)E<BZLs_WDVaF6*GkF6sl7l-rm_=KGA;S9NXfLMZ<Ug%?+;1I)c1#_Wa|6nQZn`Z
z>(;(gL%w1CIITtTH7S|;eub1weZNmiroLY)B~z8>OUcyt`=w;+ds0fKzF#OMQ{V5B
zlBw^vTl-Eme$o1IMu}TWroLYyB~#z;m6ECNS6XYN&J0;osV}!!Q>iP1)>P`rO+wsb
z%YQ6+M9}|@jQ*dc{X|;{ncu1Ek;<b=<G-|%TL%$dGgwds$inLq+%c=4U!JBubT*@2
zpfe-8`3(*tq9&>-KrPwWdD+;0DUVMz9H^vKg9xZuuNBh#$-4RM$^2aSIj-<iJLTRt
zCE~b!5b-kM47ot#?UdwtY!a30cO_Z#Yo}Z*dr}Jxt{e$hu5$|1WNX^iW0$J@_P`sQ
z1TCJyI<SazZAF3F3d=Hucr>55Q@Nybd+pqpX0tzObQ=d(xFONac9A`%2j#j6#BR83
zk5uxy!CLN@t^ha2s;SsxdF=lmC(c6W;Bq(gzk>j~$39)T;pp2PRyMo;_gCgJ``=E0
zmsQ2$0U%2gSUdm}KvDcr7AiB$j3CWUQoSeYI~_Q%97VzZ!OyeRu+ewyj2ZK%ch2fH
z_RFsr3OSsg%k3Dq#emy{mHDblI~qE>IIM{d_KOSjpGr^rHkg?fVi%c>YP+MzY;?_h
zxyWpE4P8@YHoBs3C^8#esE-$!jc&y+6`75$&GU-PM)&GPMP{Rm_vYf(7ERmL#Z{J3
z5-2hot*x($`~M_Gzd@g_J+3WNUs5}izbjWMC%L)**9;=2=Nj$M0!O{zgPPf(?6>lT
z30&XOhQAsZMBvWCeB)e4)VaQ?m9tK~*Ws!P4I)%$;cL;>7q+d3Y~|`EereeBC^U!|
zorUYNH6ZV?OI0o&$qiv`>gpXtfX>2Viac(i^SF#wuBzD2VLW>V*Sc|cTI)yDLGHCP
zd$rTraCoC!Gj)SQom&SHm9wz7P<uZBJ+{fpBQ;!}VKcIkL4@WkENO5uy6ACuq1@83
z!Qp=1IM~45xfa-Akk^{^%YZqVpOp*G=lp-DozzIk47>kJl}8l(dqedg`uDMFwdz-Q
z!VAD%>XYgoD2~m7vxu$Qx!Mh&`(M{p=>DCcH|sm#6X?78Yi>@7PwgAw!C$6q7#aYT
z9IHA0^+HKa`c~LL3MDn^l~AU>Q#iB`@3=}^N+{UvfrN9K@Il{R@}VevkL)}o*k1Ck
zD11+@EB^M9KMS8Ddn8{I$n`g&akwWdKtkf51l_pDjOifx55j-`9wv7M`m~HWsw|KD
zmPU8L_5_X~LJWnPGu^)}RPtB*PkFq|PJdU(pZ)YN)Hc}=sJ-MJ>JcYF`kABtPHw!z
zD)?jion*|y-n}R2&^;!V3*K04{q~X%gxaC`C2#TjJd;sc4udK3iC*3k5n7bS1l}E^
zba}89YFbl$jge@$bt=>rruwR40e^RJs;^q;Bp63?w;uSEnLzc4FWH%69LD>}Uce&^
zqGdyGQux$2j^Zw3jM7FwB38h|C{<s-l|l;`bGUnbe1P#r^J<y<()tLzaW4zCcW`|M
zV+LOsMycP2;q?XZ*Tw=pu!;}mJ!Y?9L<X6BYlO=QjcF%%v|i09ZKcpOJS+xtaoXh%
z`$Q!3slGmJ?=Xwt>YE%5c1PjQLpT7L$k&Zg8iXrUru4yUn#(7}C~bq!+gLB`$oxLg
z(c;~7cK;7omMie&GZ+5<7O0n~GnF48;p6-_pbfV1^AV)ciIbeIn`b%%x9D+rvFfrd
znd85^I~)pd=kH|^cy@_Ti^Zcse<!qE)9LF6gKqqWTOFbFSRR#&-zTd5sxzbmbHiY(
z8~@tmrN}Sl0I?pp1L;b74!laD{&VEw2aXsFfP60Oo?g;@b~bIxTA=k5pJ&HMx79A_
z`vUuu#$jOJ!4@=hUu}H>I@qm_vs-28hV3+V=XOa=Y9B;gP!|jp>2ShsERlzXZ5-vc
z+2szm^7=u<1TE~EzS`o7smJoD-1nWwS?RS?ezR8UM`#d1KnvrFw)$>8cB#tecX=}#
zs28S=Wu4s!XUl%E`+r~M1x0y59R<#R2--h?(k5%`5DVl9?L++-J%D@uKkom-?O}9+
zzEib7b`UqiA1<3Y$5$SJt{MxTQV~VK7?bMze#hwR^JZQk{$oqy;F)@R-fzoWqd|6H
zH~70F+`@O?<MmVX=0N0_U~9kcM0NwUvtP$#oRjUf+%s@Ufy~fy>xxrQjH<2<x;&N#
zyLx>!U7>i$A7)OUSlh?U);seSwx}ZlpHmp2RR|P=dy8d)>2&@MFZKiftnclLF*{q9
zW8ATNC~q~3{qW$1E3?ku6%2DtzJm(2tOka>u;zsUIJ<B~=z?K$^`5--)cETCeYo=$
z262h6j<kx9VFwiI5OXQEFx1wDAWU8SG9NonkL9gs8SoOHKZdF*5rHQj?F|SdV7l(l
zn{Nd!>-K1*j|`v-jaz+y>ooeHpjq9^Cug7I^!~gxtPTb`;4KX6k@YAP=nX?Jk`MWC
zasO8<`Wf2u+G*NI^(=L=a)VOscE^eD8V9>ZD$BKTpi=Vr_a*}rGDNA}^3U7Y2?(DN
zCph}{9`FpZ0BMEU$%UQS74~<Rrr&F)eBo5-OkO(}MyPV_h=O#O$+#LfTJ}k~%ENWN
zYo}cPqEt4}rme2fCWn||PQk?1w$)}%{VaOqgf>M6x45BgXF9|c>v4FY+;wKRxaYoD
zC-u8_Ff>wGp^YzqK%~QDrQ>BO*R+adv*k_6qH$p6APe+6Q`=dfNY{vv>=!`B6P(d5
zDd&=7c?2FCp2Dev2>g4hw#dcGa<(($OU?1Ma`~HA)GjzX$^N7{5c|JffzHq2pzjx{
zuc<La0B<jD{}=o^Hn@$kq?oMhm^?1}#Q{+!O%JC8_t+%rT`zK6aLEV#o^8yyt!(?W
z&KUp2|8HRb!CtI~1GJUy>Xk@nJGxjVvu(aPXp`Uq;#`|;*Q%~T1VI&JkuO|91Gm;I
zvtu0CaTD|>{y;w7`zMQ98IH$)Z61s<ytvTWMHO0j4i*lC>h;lZpL&8+MQjj}Pu<Ti
z^ZOyO4))ma6ZB2bP=z}ZqC)HZwhs0%<{yih?P4S)zKO&~Q6U2p$4Ypv)Vc6rH&Zq*
zBxR=Yvta_+Fov|bmr!-vFO#a<G6<}^r(ifbsxFs7vnMA>JNw+tqHjCCFI6V?|HTTh
z{E4vto2)*hwkiKqE-tvEKb;Rc2N8~`u==xuD^;%dp6g;&d1425fmJ)@b5BXfU+dt`
zqV*Jn-H%mIfv0J6E)b)fqo=TH5K$Bh>knkz=JsTMwk>^|6>4*FY#BtbMAz#im&usR
zcT}fsrbQV&R$3=GN_YGVN2wh*Qa(!UzG--X8nolDqCwUJVAEhfo4!fz4gfRD*37?E
zhu-ywiHl8_y4^j9NQiv}H76RxS#8VOH1jkw49^j_2y2EVAMAKjs&eZff*^MC2x~5`
zN>i2Mnv@bem+X8{^sTqrZUh<qKU}L<5DNDa?L~0+=j%QCSBm%c|LGhDpOyN*a0Ci5
zVHj0Z9R(5F3dh^keirr_PT+){oA+eTfSR9{Wx0D<m?$4qYNByi5wa3sE5x`CBWLKr
zLfKhP6jH+p-~$V>4^~G*-C^$H0qldi4u6buH};;d_vWvsHwqVRXj>a<V>|>fE?5Ic
z6yiIeBRtw93;)bx^o~A4U+$pF66r&mR`wza^WNWdmj7qJnzr2E4yWP5%oD<^m~sQV
z|3@g}6@8mNLL1apsJ}w|&o`9MA*nrq5JZL9sksO$*r_&&%3$|Yb`sT2Ir~@AE$mMW
za}$eGy24P6oT6NNFK5}-PC0!asg9n+UT%cbPI0wM93yTk=Wn<|^y{J{r8;*dJR_A|
z+R_5oQ#K}cO_xoC?2<wuw3S=$*dbbQ-y>2BIunR;S{R=q=>+`ZnPVzsq!v=Ta_6j9
zSba7)$@&B$o)%_|n^AF0qvcUajK5a&=B#t1-mFciZkRCUun1U+rXUH*xd)yr%DzG-
zgtsIR*c6Hc1vm$`;lDFM#KAN*DZFhz`m_xH#maRb7&f>I*c9w&3oH$DuvsSSLu}Z#
z5H`IjFu5flt^GI3c^_~z3MQ@ckc#`C+y7jsJ*@pfKTKZ+uRh=WUwH3)*5v=>2vm5m
zob6>Vkf@irSjhj(<7YrBf!(AfXXbGhz`wVN1YEK!zu!|ZKO{@!Z%xtH<n0$T@#XFL
zrL!vlF#=g*;HPUL(aBRP4#Xmy%9K2j-+L@d16C0QS`lP^1<Y~ULER{dS1nc46V!Hf
zw|YIi|9@Nkl~$rH(AH}`YN>X$b_cwEy`ue9KSV!KZ`6C?@#_x#vH#>!`*+nn(W4y?
zw^=O4imf`c(57*5{+9fcqRN<efmp*7r-rS&oUqj;yMz)>t}%ScxAymFhoWtQStphs
zdH%}s?`D-eJ=dd!@L93ziEFm-Y>o?u;`*4^mUU^JDy&hgm%E`I>4B*!8`S*D-V_uk
zZMIf&HkBs1i>9znPI1yp&Y%&@aavIF4E533Aw$V?v;Z8m_DX(Ch0FZ5StY$Rt+rmO
zN}ePiYdQX@h4z%4aYxDbss9!;f|3_b@n}0Sni6l^wN#?yb;19;klFtnsXeLr)vv47
z%3I2X|E@h|u4iLnUst-07AN5Fz-M_@E*W~Ic7A&!`;*Ye#>5ymCLxtkf2@OiDfgHj
zl*^BPT_BIwkCIC6P9QXJk9J}K<k2bm7)P{i<C3j<oDjEH6{*UB!xQ@eg`A{C3ZRf&
zA+VS*QY;h|B-zDeQO=!A?Yy^NYG-o-VTPMIJ1ZZLUfK&-(jd`I&fAsL7rC-{?UYw%
zNHuIuAi%I+n^s`(p<vP7%R+@Oija>HIc4XS`#9k1?FqydE=&sB#N8_Cu}M^}>Z0M=
zIY#PCX9D4c3lnVi!O}|L)rM(*%3;Bki`#g8%g>G=K2?tX&j{^E1rdLmpyT_n_O5=U
zUJGl0ADDOMXTSfuN5I)F7Q<|9%qw5YkITz^8)I00*KYiK=(Jmd?&Z&8XEagrv-~zW
z4sxZB@>`Q-{4PDa(t`upnFuQSTs8K|?<>ycY%xaUx0AEzxt37;zmS4ho(AOq&FY`j
z&#SYQpDCeFc*RE&UN`C`4#>767Oq@+|92dCQ4I-1A8*tq6}T735g5mz(_X>YL*FU<
z%(P*0H6##jyl}xL7ra1Hvi^8mPOc&T)*9(B4kQp@ys+7mEMaE+)^O0@1^w<-q4t)3
z)_Uc--+#_wTtW$i7cZ<{YUe<iVVd0t?h#?JCo4iwjOTTo`MHZlkFGmL>e2ed0dDw#
z7OWm~ZH@_}Tyc|=@@iuOfyFTq1u!7NU*+ugG%uAuC|_=QsrI;Ao??GeyF-bwZpO$i
zC@C&s@cSWN;EtVPZNTLW%0)unUpwVWS(AE40`bImf+~U*!$Ho6M}CT_5Jlygz-DO4
z`)e+Y2e-$|y2CiQ*)M_rM-}~ieX8~&B?_AV?`oC8V*Pwd|1~ENb8@A66ei6<R}g!p
zE9Q@f{ax`;K({;{)Kl8em-RXO-RY<^*p)zhQp6u|UKW-z%fb*vF-O>bAM|E9ZfKO|
zrYX-ou}D<y`JJ>{24*ED0vA7C>vdb@$FlDDST-T*{*V3-HTxZ@+0n!V?$_3Bqiv0F
zY)x~toBL+aG+iTA+LAzI)2;cGk*t#w>kf5wkrO?m)cmA;^xXq%7evlwe^Mp&2?QL4
zzJ+to*lsGzoM1Q>GKbmumptG=1*}gXz-VFNMn)4=Tq%}E<x4vV^M6g&`i~_LSG2H8
z%Y|mUAZ9?Bj-3S}(&?3Q?N{&R)1m%!sx(rJ|M!{yzv7QN@}HI>_%(ue6TFAuy#((g
zI7IM%f)5b<I>84CK1A?gf{ze<l;C3oA1C+?4)>J2L-1XKe<1irf`20TXM%qr_#VOc
z34TEELxO)L_%{ZPQsWSU69`Tu=p%S2!NUknB6v8#BM2Tz@F;?l2~Ht+G{IvCP9->v
z;B<mz1ZNPON$^;Lvk1;6IEUa|4(A#32`(Ub9KquWo<Q(Kf+rC?ncyh|%L!HxtR%RQ
zU=_h?f{O?)CRjso3BjcVml0e}u$JHof^`H}5?n>Fp5SVNYX~+FY!vr@K+!MO4};Cm
zI5h$O-;b3*@jJpXM^6ILIrGN0v7Y$dp<qCm=yU|Z&fvloqtq_-xRT%0E||8G{Yl4K
zIDt@|z4>$~t##&_f96_*s%y3!>TszA6NMsnTB{5BAc|>aDzNO1FiNe@fv^3TZtOov
z-Rejj!T5~FINxj5dSXyP>5ci?qCt-E;{LQIC}+KV3{`cBR8>y`VLOYMHP`?%n;~{1
zb!F^dOYKs_jr&ubvJ8G;Y+@4dC`4j++d)<x^lT9PE?s$h2xz0PBhuc75f-EC;v?mI
zN2I7xe~<=ZO9JseW7;&gO#*>!H8IXHI##1wc>u7b=j<nAM_q|Si$Yy(42x}yjg>o&
zzMgvbXQ_AW{vV|tqNs<cRfzpP1keAIVD0}yeXPD%zr}G+|98A_Wc#d+_QFJt@sIso
z{Ud&Lyxwom^|5?cwyKw7vQU1Dbo$5v`>!2^*w(!D@R`vS4|Cdn#4Bzy#iNlfxSnU*
zV8rW=u}rNst@dwCo7nMuzhC5mm9H&bDrLl8To!>bU%#&|5`)cQgm22)U~e1()Df?S
zJOlOrdO2m5O5yOJK8y&jjC?Ea6Q+G5e&cdJR-?g<ETC-6$87L;Z{Kv(qqEe@S`mcl
zqL2*7M!dGcGqAu_=PdbhI|D0F3?cM{F$s{p@;3c$oo8UqCr~)+@2X&1m}wD3__aEM
z^Z$k`^A-I{Aa<8(`@;TrmhvDH3jDV#F#{*{-defaV=<4HgghP;l&kK0K%87TN9DFe
z8B?yy<0;*G7c!nwYoxDB7@mYFLKi4~+jQlEQw3k~9M4asBQuhiK2qt|@&swLR&3{Y
z!Oj`OHswV+q<<vU*q%TvO<eoVoJ?ztvQG)w$wav6yHwLpq?&dmrWQA?utE*RaRoy|
zq95!N#2m{K>(1|#@80}3YQgWN7IY;LYO@IDO)SzIh6{~A6pC>o(g(1doHXSRQ$keX
zTT+Ds`zDS?pN)LFc-G-{;cvu+PZIT(4jyRU1`Fs&OeqS@!$He%obE`U@GVj*B`8;2
zvM=@i4XO9y{y$ei-0yqTA8TIi6zu}-X+-#|(zojf3;5Z8|DF+W)E(n7!r>goR~L<J
z!O6YXPRBSlYhppTzriU#e*Gy>qqn~?G9Q&8XiprDXBLC!8Dnm1%KNtV!HS<<Ipa4t
zqCO2Z^))MMeG6+EYHF+Y`R)?Wz(MvESw1YA34CcGPTCc15KnUj^l8u$XV*4TS(W?z
z%2A2US`xeF1qwy?<32w;N#EtB4HaR3U@Ke*#I~|#R6}iqSNx*$U|DOfjD(>^myYqs
zy$$gKe&8siv*xeb9%=36(tv$lb99Ai%~Bmkr0%rqAttHf75=)$1EW@3luXJViG-o?
zw+Pb;R~PGRxLblwAd>#@Mqbj71^pj{{l9*oc9k|ly+A!m2`ZngeqUn(k!EXD#*TGh
z`8U8dQY8qth@Sbi?|wh8;)hl;G0TzFA56?=+~hpEADQyX>f@1UXG;`oPT+dRJUONH
zTp{vH4t`fUCjAM-um#uJ?G0>kz+`d9)OqkTbQJ$qs^iqe9Na^?cA{&P%E>d8qt7bk
z?PIPHwdbHy10xc%QT^C_)(X~ZkX<?42Nj~w_puA8(+4cT=O;AWC@t`Ta`o)>G!!r8
z48^SCh9Vk?1$_bR&nVa`?JSz9@NZ$1I=xYzI`S>5{ePs|w<Zw39?T=RlMTwOtKYXJ
z($NLMDBD(Cd}K`uZ68OqJt5V0YGP(_eTAEmD7Swy`2iEPI=xZ;@lX@h{zs{HcK=U+
zyHEW4y7Dq20E|Wi;0iSWUEmv`3;2@yhIWv4qP9}&($0Z>@OQP}=?ZuQQ}sGMsGp9g
zp+ow&KlvMyJgYe)kj7LV$=3;cH_FKITCNz+@R7&2+*v!8T(U{nlQD&y(AhDwjKj%I
zoYUAFGby(n1JjsHxt&(2F^k$HG46~bsDrtvu5k=Gfiug>j6=AuM6o9eG0Y|%<<XXc
z%U@vs8nd~^u`#a#euCgTkFUYwL~rM@+cnLSWAU~4%Ua=uZyp#Rt&teC)Zn;{zgWZd
zl#O|dk&F2RnvCpmIP1Y4TI%1rHNr}&k97IteqVVMLSesfcURA~gju#I4^?QK$Xz5F
z^J;wMoxa7r<h;mOCZ-(8u{f|D98;jNdBqJ>0s@Z-_j?P(xXxn<;-(McvgF^coaE6e
zHDexkvr)@<oaqkokNG#{V(jO!0MHpHdo|SUWz4TqHI67^HW;g^UBWC6zPs_x&&yfF
z6^M;_KvtN_BD!DK3)(8qu?OQMss*gZhDe&~shjQ5f@t0fun*vPdo?b6F^mmxM-A1G
z`p!r=25*okYZW|9i4i3J{}qaUo4y!PJ=(O<>b2@&$`zmdo_1g2z{tcYI1=~G7iBPe
zt*^#4Q~?ABcn+3GJ2*l$f*fKaEyinJ;cphbo4)#AkWR?n1VY)Knoqaa)Ru^^p5e6R
zVDDks@CNbuoVVKH&8nuiYZt8Ne^R~OiIdnZG|w3u$kuDWOzc;W^6kN&@XO%V8Q+(x
zY)Bx`?RxDHH&tf#TxRzv7YLj7rMc+S)&!#2_T*!kWc$MTk66I$^r_z}PL+8!i4jL+
zttW9jV<9YXzQ41zF%;16TlM77HY_2ioshVRqlUTZ^WWMnhVIy~G;|vh$1x@3Np6PD
zd|sLlPvy~%-f$?sA+f;q%w*0oeu%N<r<}KlGqaXAA0)F|*!@2S4!`j4XX-e$UcFF#
z7S=zFu>1MBK2xvPcmHQKfgNMXGOKTxkgN`NcE^P~&_y7Rwg!XHPh))^)#^xM<z`(R
z3Wvc2Zu2oYAkV$Qks8g-T@wg0D{QfJMy+#<vzwc9c@SP&$ranEX2<xjxfxf$oU0nn
zMEinaemRZuFY`cdW=j(0=1vPDdb_d9aM7~v^MfnQZ^coYohjnn!eEhtD-~DKqA2Wy
zTYZ(SoufAW3kC4uUtj3~bJ=Bgco<=>`3{bN4@MTE7aLc52Bs8MMhDZLhfo%LVqBt=
z*-;MD{{|>Lf?v)r%u$Vp>Q(k-Henc|A^-Skj{3LsMcMS$5VPcsMEl1tS>=JRSKEH3
zzn(E;x{rS2ZmW&-annFTBYczj)dmj$SiMuGceO>vFDh7nc~=aM1K2o^Um)mz`2QP#
z|Gzf%pXwK340w03{{KP=M3ar=3-@C>al4u58(2uzP4c|@oU|UHE{VHDzK`1zh$-8d
zk2=fNm5W&6PGl|+Ot@B^;iv2H8R<+vEl~|LMAa(YTqJN44MeRPGYiiROl`qe1zeWv
z#~SnUyj<}Bx7}ZQ>kQc~pg&Q?j83Mwsy!6z=;XK}n^sh4dG6cogxs_y5N<Y<PoW??
zn6StJjs-`e<bHdel%QN2NZ*bf(nz)@DqUB@7WDE^jBPp57b!vc(o-+cExARiW?)95
z0y8#8>vJ<^tAZ^!J(-kJ;K`L8aHQ?4h=k+N2laP^*&1CGWk<roP&;@=0%M-{v9bkU
zi_;=|R%-KUiE{UgEFbBSk1kpA$9Yu!^HTL}|BryOzy4+Y1nn8ERa4Z9;R@}CpSb>i
zD1jJME{_Ns;>(60^S|P>sy8L-m>zu|hj-akZK0v&nV*z%k9>qiO+JGf5-VJzW2>NP
zDi(73mvY7Ducj5;B27nE0<ooH`TR{~TW(8Y+Y;W&BUh(~DwnZ|cvCJ9nL2;GqYX~y
z)9h30^J$yYb;zUTPb_m?heWwcl>FvvqBJA&VcC;FKzNrpKRZz1)~6-Nb~r9l5*u<V
zF*kkHmua$Qd`FtB%?X5q4{A)4-NCdmJ6X(EQ8=R)1@gl5sNDJI<5;(Vp3CysO$kJP
zce#=+JO>L0LP@>)M(u*{Kf(T_J_!6D>V5%G0KZjdsxkF3P0^NVS7<-bN9dLC2KJzP
z%H8%$N3^yf#146!uG`=<x~v|jF34tJH~7~sq9l~ATj&`WVUHi#<c6pOas)ri?W<n3
zqINandsHnd-LTXH@vbeBB^AO$2{1Z<d2kMdBE7M$U<`hivt?~6_kcz3qAa$^%Hfqe
z20RbfW<@w6%uY-FZd=1jsAe2>tWsF1gSTv!;IJd5bfYt#ZS5H^E5tmKS2AZlOb>z=
z&{#}kScD7a3JU~_Z}Jj9bf1FYx>rQHxSC4oYG*~E+{V-eqiw)}A&m=wj6+AWL%h~m
zoM%}utWWhpxO3-xIJWwEmjaF^e%4krEHqcz;z;jFxy()A^#!Nt8}ls)&P6O2)-16J
z`eF}cEP2+C<?}KGa$()9V1i35%ZgxsL|CXyD6R4gj4GxeZcY<JNE8#<I03fVEdI}p
z3jRH;JdYRvlhl*c)i?z%RBu;*0ByjL+A)a#)23Yx?_kd&>hDPK{#WS{{UZIV`Zx4n
z+3xsHGLiVP+{>A-jhVPbgxuCxMZDYewQ8(5(WCW&1NyNrG^0Xr+GVWPSV%3%rBRH<
z+$jT-BbrWgV~G$=IIxh6<B1zA3m=X7B2J4Pugf?=gt~FT$TUu&ez0|8#-l5#Su8#G
zmNS+LNrWS#(m0ve-+5>mqnh~dR`SEBn(EQkXhu_cS0vs6DrsRT2BrbHCX?%+tsAjW
z*hW+^#hbA77Y6&FOBhWDt63)osHq|th;%YGD-OoxB0hl;<o-yECg@~#_A+1hT>Y@V
zw<Vm;y;bxdUvxn-67>iAec&H02R_5LvC&QiR6}GA`n08AFd&0bXfz2w{(&Pr+9LD<
z(u*A+@5*CgFq>Ez=o3=~6f%y@LIBdV7<~kVkCPkRekf+}N?NH6Kr<_lo9jO?_IyZ)
zLDo{<6#-atVzamU)-MEyh>PltF0t5}GB0_FJwi~>w1VB5EHXgcC-^Y@?G`bqO?Cc$
zCiQ0nR<#`s3u5s32O9<bUxoNT+8*s}Z347_#wu0Hmx|iLYZ6T(l|?G!8#~DN)6=4-
ze~jO@e-FcXYHqIC?I_*vNg$wHZ$1^jba7=4Bidx2uDpNuDvoh2963Qkhz2Gk8bOdv
z(t>Vi$fATTMTurQmflCG?)Rh?b|erI4h#@CXlJg(D_01n4EFcdF4(z={Yg~?6A0t%
zQoSNasFx$=tA4%1p-aI8;yAmkCr64lPfqE%S;TR^b%sps4jh)K$K)QRh1^VTk<!Q_
zrI*3qiiiNW&X8FGp#%a$yCjuu?!|ezX&W-!G@1Sr`+tt2U#0J_eOWt7y+)m=d{LQ`
zcmD?xJkU}eGnCA}T*X*nz<(=AKHMZFs54{Sd*<?Iuj`Z+-++?XjLFjTg+|EKlmAf8
ze`c#ouKf`|4W7O5BdHC234~%gRXf>vuVq?*dlh<VjJJuinDggJ!OUoKe5HmT99KJU
z)ywQpsu@DiP3ZmTd}^tty1{#I@8CDlGJi`yl$_ub7pMJNv_Z%~(TGCdC@)<t=+I~C
zd!*L%CJ>OdKc8w+rY(+ljpHq(9<=`oKK_*rvUzHE0wG#)12}KjOuYfiy$<}KmBni`
zn(WiHd81jCHP^p*yBtJBNvwCh?09fMhKe925hK-r*)Sbw!cd#?zE=Ku*<GUBM=z3w
zyFGyju3PgR@tJPtqDi@!liD%*QeM+Ds~(bSV)*}XZHA)FfQHYl+HdrUdMmVgp3A%c
zKYRIKI|7bERUGg@>chUO{$Q+(*`)g_L(nefIzHGS4BH$t!O;ZCnw#kb`6`*OZ7!u6
zGu@GeWX;#lb|N9<X{vC{!H(8ImdsV#!TbROiP`jYMM7K+XN=;^ezImpr`d7KC;_f^
z0xTR1ACA?JF&zCAS<0wp+`;rn&2sd(WX%%^Gj1%-xzX=CvOO$0&@4ujAYK8VkrCql
z_bZ_157chf=BiJrb<hL!e_{(fo<NW%+#D`W@a`;?63kF3{0w(`qfX{-O=_<H&Rppf
z?@e^Ly|B23J)D0m>&2x3mS0Beq{-=xI{OC${5*a3D%r<iPXf`L+>tB}gs207svaD^
zhtBW^r87K|K-AS(K24#_Z2_hOm~99{x(#>=+p3%jY_d&OSB>0OJAZ3E`;%(ing}us
zm4$P1;CyFlv?JE-D0ncQz9MeJT}!3fIui)F+LKQxlBvy>>b9lDmB0ObmKe_!$4T||
zB?4}dK4)%0ljAFO*<n8uJzamXRC6TJ;&vv1Q~JtVpmTr;Whkeh=NYP*o2-_9o4c-A
zUb*s8sYb#7U#%#s5%cGJst>WhAJHain-J~$E&XVHD`J7XQtVmasIvoSnv8+G0#cVy
zINniK8HsksV35cn6tIPO@PW?UbvZ9nD&@@iny!E!!I6b&#K9w-JuAy4zz<}M>m2}J
zXT!EIxGlu2C02JpjfEPtuQP*PE^aX<q905c76voi-O($0w9k6az&v|4tz1A2f|26x
zX$?ZRhZR$ehpi!SYM_-S8pnA!_3@BE=?@<6_Y73JD|>mUm0RT_@`WGFe@2h_`@+z$
zh51dCg+XOvff&RlOuq*le!)vWct1y0yxe${3l$Xj0KnufCZ(i<_jf;?^)T0uGc}gw
z{%{bMeBuH=c$BkzLT&+5c!kfuc7($K>#Pe3#2rkG6K4uyd~uD)gS%MQC0h+MXR-YL
zU`*ih2aj>T62xL+^<ywtR8U?$;)fzw6SQ@i%|uxn?73rQ%X?#?Kv_;t5Tw)J+b$00
zgGc8<exzn2ax8RPnDo3=;2sAbFi|gesuW0;`h>Xu;s1->|5s~A!UMnw@ctDocF(*2
zzBz%QZGn7J)68jZWp!FPpUQ`)>EisZlX)7!1md-Y@_B5?)WD~TxY6P&lvC8Hy<D!n
zymD%pbawV75U9-^bD$Ay5RM^2n$!y{d0{Xh%-#&phz_sRvg7EUXc{Ng+?hbURd+XH
zW(>`|<m^zIQkC~^<`yx_pJ_Z=sxOl0bbBvxM+IQ**CPN9(+5mr7|efxoUC5y{T83Y
zX9Kb-Pk#dOR(IwzFVD>3nyzkG{eX+^hanOl<n;Mv0E2USr~IXCbnSxY5Et{gE2Q4`
zCAPYq*K{Lt#SPAq2=##H9v8j7W}#GbB!L*L?l3ufhQGZWKrJ8O2H(pogAG!R?EW9E
zT%h3J-O8KlSarF2w)(oZM7v8L0~_Ge^(Wo$?0@mgBlQ(dN0lHgE5KnHR+;A*&3=Y6
zHT%Fe_OOKoi)ZNY=(pWbi-_+H$rXe+5X|<GWPkJ@95sK_t>MIRdAOyw6J{*+o#+pv
z-NsDJcae*JSaLR>I(v3i)$DndGo~$=Ur{v;Pxv)!{@iI*GpnoTELbq3dcpizJDZpJ
zqwPUn!=z8ChHM`u7hOYD)y%oom9u9}tD3j4V%qHTg|nuW&zZk)+QJ2MDy!zsm@%)q
zdZxJ#qduh?GJP2RuA}o0%LFq0eTJk2!(6I2`k(IRy|N<|=8CVYA^|Qd9CLt6_5#qD
zHt3;1Sti3}SPm~O9K#&_K_2|Tw00_CxeP)9_$5%jPS6Z&SB(Bh!=@dhEXDup3c!WR
z3+g_Q|9?aC!0K<imOw<Hd3v{gx2wH9e3)ZfI3I|i*-TBg4AwExNOuG=>3wza>Asn)
zE#tR?6FJ-wN3#}?Rv)R414)K%CckCIKaCPbJ1TNmOMuKi&S?E0YzFv1j{hEVALFcd
zZq3fn1ffSQ^kIZvJnzR{C}&cKXJDoMX_i~gDrP$f-R^Rz!XVH{%*WL{(Ll`AG&W|!
zuxVAW6RL#5tt<;U!7J-QW&1i}>DIc^?2JXsKGwH9A{1=Le+@<W96btIi&z^6EwV&d
z?Tv@l$Z*8Zi{$AiID)~l8pt7_RNu&~3>I-iJ^dN1w{ea<E?y_kTE|F3IIHDmK>F7e
zMJ>tSS)QvAN(NAJz`!vsU<*{{;cI{|5f->c9arwC!?h60a%+fr3FwV>cl5`~gwKG6
zV0atUj4CiAY}7~9pp?7w44G6&C7k{UGmXXQ_r7`7xRepPI^3-h2pK4Mv#Lk_RZ+AL
zo$dc~I#6>|Cx||Bk+i0pk$e@fLlkpAY7E=|x^@%(e^|eElfJipk*l5l*+-v^z`tz-
zJR3KA1{}y(crS_h)`dDdajUQmztHb%0M8_Z9n%^tn|Uk_P}3)PO0x#a!_f8*bZ|cZ
z*iJ?9Trr?}&TvreG!?;XsSEl8IE`_0l&yj?Qj{z5)YBDRR=LnOvuwsZsp=!)h69SO
z;PJpxj5$g0;e#p`lb6v&Y;Pa<o}%n^bEjuuz5R)rrxk0udfDw>3Fb%HjM-An)1ZVD
zhnX2_Z|A2XxNm~FaNtiF{(lG@e&OHC%6sa8>NItQx&u}~kE*X}!?Yu`YOO;%723eJ
zB09h?wD<Hw^#%HBy+c0>F+%RszoWnLZ(9aZMWpy-Pj7an-`euK+vqL7#B+G4EkZ$$
zvr^NVYHWIpZc-6LHU~+6vryA>A!|1_k!n`@QqGY+bO<L1c}Q3zOd4r<#mvTfYPKVz
z!HAGrn!Tvp*g#EnlEN4vs-Z8<%Gf5j9Ic$o!6Y~_9<R)Z3#B<enx7ZL9EU$2__~|S
zVq*vkn_I?uz=6iM>;?byRH0TFuYgpM+iwX~ySsRNE`ukp3PQV{+wx=!x|wQV+0yTM
zdH0EFLPnqqVL!MrVABDy@^>-|d?+_(%Q#(VQ^qsudctp`ajVb@jYCQa{L_+Un{bPe
ze#L9-7pjYKE*NFZ-HK=gY*+s7OZ2W9XA1VErK}r;rGGsAj%V0T!vRTSJB!prO&S#1
zgYiYcRMvD)^)U#J?4dkQit;Rqgu0G`jik{3HU=2~Z-i2>=v~@h;4%F=ZKnF7+M^z*
zd{x?R?jP4A;svw;8Rxwdl(U}x;oZ_Cj7Qo^&U4fTY)kCmN)gVI#B_1|jONQH<BTrO
z_c~iq=_KFd=_*4KPh?#JQRSQS1rEtnMAOfQ*gWCQ^V5a5ONDPpAm*Y!pC_SA;g(6a
zEP)kXr{Xsy5Ir8;RhNTQ)fMa%CiZ-QGLP$ScdDQxv5jdT&U8_M&E80lk!g#qe?485
zY&F=B=w((`6J1mV<!rw=6ylkm4IiWnmgitwBE}hf&IPCWdS%W>T9f0eF=M{K_<J=s
zPkvmIN)L=lM4?+WR$Jpja_UN3+LcbV^7VS|N^5y#%`Ry<iv3@~{C_OdeyA-{-&L<v
zk5z6_D%@`P%}Ioq4(2mc%`E5!aLOWZO%f5_TH@B{zRa4FH{`&Gq$YIXoM$XkNexgO
zrVJN{Z8YP5foy|?3Ql*Zd~X#uOuX<n8}~~u9+@+}If)?D?)obowsGt8l4leInmC>P
zNt4o)R9GOyLtXTCaU=}!sW^YKzXPds>*YPQI<bp|&_2XP(aZgv!Wm6G{VTROU2M(_
zjZB<gNLw*8LoTje7gw`##|)>|#1lIU=$vHQ!Wc;0l@G}-m%$iGjHc6@O=Nc3Rw5rO
zO^MUoP8)aIBSa(E1rQ4I->WjWhCFQziBsJkg;}&Ii$O(pJ1sSa|9=+$!|hp@{f@^^
zXfoCjTu*QV!Honr5o{*7nV_Fw3&8-vR)Rr-Z3Np1b`T5^+(K|G!7#y2f?Wh71iK0L
z5R4LxaTqsx32r0UM{qmAeu6s)o=WgEf;$PGPH-2&-2?{+o<Z<Tf@cx@9Ko{*o<s0l
zg69!DpWp=qFC_SRf)^3InBXM@FC};x!OIC=LGVg~R}uUI!K(>gL-1OHUnF=P!7mZK
zp5T`W-azn1f;SQT3c;HR-a_zJg0~U8o!}h=?<DwDf_D)dB$yzWB$y)jHG+2&yhq&s
zGZp<y`hHqco3DODZBhQFT&v8?u64_=w&Xr;v2eQHP1IES#?K}N9&kFuHzi@5=n|8K
zjTdhD&K7ZUuQoq6zMQT=KCWAnh#Lzv0T)*x^SZJkD*V=pI^>jYZ@L=!YTS@S>{xdQ
zKXYW0aSj(ZKP|-p4wQ0f?xhn?B4BJ@{mRT;SK|{hg>vTp&V+#*z=!PLtgK5{D`P?N
z<lb(p1?dgz<uvb!8MJlL&FAzcZLZQ*BHx3XlEd6C3MStG$6ka(G~$-W&D+!ck{1O~
z&AnWsn)UuRCIy1V7t?g`O|D=HOclK_?qe7yp%DeY*_2tK^3vIy^teSevwpB>4`lpe
zvFCN0)BTmJ5c|JZ(Qnb`G7mu7-mv_gqr9l}T6X;>`_Pm`oJ)83Z9Oy96#f@M*`<H?
zzL@Thyg*u#2yWS)&sBbAJ1~yG5;$~*+8&LWHDQ0?m-hJi>Lj9Cx<jIwKMPTM`d1^+
zezBG1x!9gWI7{ffxH^!)(GuPyIY+k<GApt%jn_t;-UTzLt2}HQl8ATd?vPp)oK_BA
zo8Vo=%}<*h52@B9LR`8#YU`Qwjp@yi4x$m4Q`QW3nwPdD0?5N`#>D`pU7%Hj(+0rt
zoTSF9(=#QX65%8w$wU9jMMX=QkuY%be#?Ptmm10(w(`PgN{)8BUrY>E6SK83bKc1l
z&-H)Q>54jCU8(L=??McKy|v@CsFu+8)*JLM>fiZfxBma`(hk!X*^6ct!Hpj{$vgC_
zWAwH8KY>uHbrw4k^!RkWxzM)@e8<j!2RQb5z%fQZy7sa;zS;cKrH<jZGoQ|#&+dGo
zHLW)|da%!YU%{mJkcvl17T@Bihn2|!)ncF-3#-d<9(9JcbKZ--%~8Qh%7;5O+~?nJ
z&by__GcdEjh{65eQLw%N+lQM4L#dkFu}xkPg@k~)Kw&6|&+OGtU+%0mo@o_KJDK`I
zq}2zFb2tZtdIp3`J_Hboh9ZaxVCrMNvtCc8xW(W)@KZqufS55zJle}6^N4|3HA6=z
zXghu3Y#Geo?Na<7pY$e2J0nYmt@z$g@_!vlmWpzivP;3g%apGuPbj}p{-I7*k5`-2
zF2n@6S-nqvPW`?556!17(CW2_c9wRF_L%mjK1?64AFD6b{rWEbQvGH~0^j}^dz-{U
zS<aQQTX^*VN=g^!<w7`xgzDY^^x@kf(2Zw;BN_Jy;gll^Yn&_mNmxH%17=)LVxYp@
zK;sN*Xbtl&As9s0k+{X~C^s$=&KlyGm%PHSQBxpZVp15aO}LokZ>}a85L4@7PLL`f
z&H^RC-`z<glIFr0yGSSm?;de{FA&YIQgbqRuKB*XmztA#$qPPPNEq`V48~<7LX*iI
z<9zB03{SX{4J`dgq4^8cl{98xZpR(e^7K32j7w<-ou~oh9I7klf;KLu8FYb&e~y|}
z57nS9W|^3!L5;6av(oQ)v#uhE8I)(x$Be}6HX0EbD={viF|H5Ad$~F=FXaXyYL3@a
zU@y!$Vx+-nhrhj@M4cI#h0#k3EsN_KR|<FRaXW^jxfeIlINE*3YulMF8<vhSv1+bm
z`2R?F0Mc*N=V>o!o3*{vTh*n?FM<D;HY6vyWjZpY2I1l)p82^f<&38x@U%NT%|e;-
zUgU1%b-py7CSx~Sk_a{pJ2e-0nw@0UPF%aeo31PuOG99DcT|n(7>Q?pZ^<Blaz8dC
z5zpEkdJfk<EF9iZVyw(h;cln-Xi6UJw&hq{>9xZaB>j$LS}qUD)+C}@=d~2f&|_(S
zhj~qBm>{M^<vc7bK|#q}iMFKI?ZV1EgX1|#ZH@#$d(z+)Ig9Z!-O4>7<2gynjqj$r
zBoE+*WQp6Uw;W$_^HVyoO<RdvyrBQ5F#n&&YG2h(QlAC??;qg*O_6T%t|X%P!Zg9f
zR<b|q?2o`{ne8O6`OQg$@O39=laA=P^|`AlJ+?9#*OEloUU$p_S^q;;2w9P#>g9g4
zCK0pO9qr3SH>Q<NIxwb`?u-OZ?n^X@c)fkv@h;}atPf)<+fk9G1_y^d^KnaZlH2n&
zy&NqS+9XzHdMGc|0X=ybSaW-8OI`HQ?h>?CZ6o+IeXuOUDv<|zOA;Y^-Q6i^1rAfW
zMn;drl(>3^(*SQu`rPt6t#}8xCMGmw*XDEu@}M&Oe}wwJqQ0-yX`j>X(SEJ_^fmf9
z`cu;W|LpPq(g?U9q?d+TW5OJG5ln-b!_UqTl<Jv*G<c@?{|HP7K(xa60$%ipx^Hw;
ziqFuX;32d|0xak*u1JQZ=-rMUG&7m%f{|_!oIv*%{+b!sgt)rAUhQZukSQCecAPoh
z;O5JWDV!Bi=!*;Y2fh=aRnJwAJ2_IVw>ug(Wa?z!*Z29`+qs5?Ugu~xlgYv2=Q7{&
za4*yk1Cg#)SP*l*xW1t<N5$`J1FhJGNU4!FA5^8fdPO85J<9a|J=#k4{|6z;*9E$!
z@A$v8&_C<TzkLLTJ@4p>X0e|s>bF7Z7Ll+0p>PXWrewTTQVkQ7r=y;Mpgq&eto&Y1
zhW<=WfSnYI`d0LH*=gd>n3<yrzZ@1pzSSWZ@bS$$_A*raY|Jyz{z+CV>;6xJV=zDD
zo~^I}2#b0Va&OoL1B&Mihd8YttG_n(4(z0<g8@~ftu2PZ;E&+p3Y)jFR}1`qk)mI&
zAE|v)3&8*X&8nf?t}H5Q-E2zEbc?50Sz=ZWSyl~L#=64E8Ez#mw))SuTG7iKk#>lI
z%Up|rS4VmS9l^=fuw+~o1UoDQvyvz-&m$pT>>xQ=;cr&Fn8wlMzOPLp;5ZlyE{IK`
zav^B{>~G~;!_#HU6!YdJLW{ejvLto$xb>N-#o0?sHz%jMtwK`pmlXat&3CF|WAYeI
zB)b?P3)3`iep1c^mTcdJEy<(Z;{0|TTqscHuyxmGrbM3ZElEWGc1K{O`KTsZ!pMkZ
zO^HnZPf&0&b;|I6A58!8?>ow?%3sy}!27RLgX(tmGW8DiVfAJ8ZNvjO40b>P*aKgu
z-3Kn=o7&&?3Hot*t-cNCMoRzD$Kw4Lb--jlCT1`@$T+>6*5@~N5CfLI$tbcLePqDF
zQq9u-E7D(^m4%E8h@o6~yBbMi8k<>c#uq8E!QTmG1!B$LO?=m^qNi~h^&(eA>Ox{W
z)0?!e^qHA5m<l!D;0fYr+wsk=p?0L-@eJpQGKRA8r;Ps*mODc;W=soiWB&Z%Z72|&
z25BZlW!!(}AB5ZQp>l}-Rx>9*%%GHW%G#N$J6`bbgzRCcysMuDW#ccH$uEETx@Zb}
z*~jd1dEztaQh9~UZbw|@KF0SJsJrn;!D%1j!gEyBnKpEJ*zzJ8Nx$&!BSvJXBG?8y
z9`22Ap`R>Wz9(4iL!6Pr+wdm!9V!6v9a~`^$BpBlNtTwl8c(OogG0hN)(<o*mZM;v
z`!QkVGgKkou{7`Af>Vz)HV6>ofJS0^48Dx)QRtuloyJT4ju-rE`DI)b!e4$UEWU;+
zfkLqgVCme&M*1jpw?5J$Zgu0IVhs&dB3^l`uQsjH{3y*o=$lZC_ri;Czki4QkB{;H
zr$esSr1;bu)Kiq#l+(qITc1SW>*eYsoU9J6y{oe8MmPOFWZZ+3*qKu^X3WnVO?m>!
z;}{z?Plzj1iDhjWZ-;zk4q2boz^_<+i#Ii#Az59lO(J-rKc5|mxfUMYf)Dmk=H~)M
zshzj(2KFbZ>TgUU0C_N<t&q8FTsKS+PLytX*!18*qU~ROPAY$G5~0&wx1D+35{JW3
z=4bmGC-bsf=D#bIjTzpMJy$>3U#-bGZn>Ujb|fDei$NbtsRM3de|?3Mv)!VF8QG`l
zUNor%no`$KcB-yBIjev>;tbp0L0s)1#$M-mL2pPR7`Z#qkLA*do1f|zJ7G5L{vWQb
zQ4pWu9PJ_a{5t~CJ$8S_{rhBh!+%+6dH7$#@UzS+p)qdDqq>sLA?pQRl1D!#lgGpZ
zH*Ror)05e>_L8gH9V2RHGiK}$d-Jd-)6L50u^Lx8`<uy@onKO6+?0p^m#)#K2!7PU
zPD)V@R~IYV394UPuAZYltZh_3P=BEzC?xRx^R#Or6L?npk@lXt7`(y#)R^wmbVLR|
zSzo3%>u17O_#OJg+Iam%{nzS^>VK`apx2|8X?h)FE&-FR_lLJ}9gqqAV?FAjn!Y>|
ze{v`a??<f@dJpiZN3c)hh}I&)u#~os^QbfNRdhNt4DSP19UA&<f=ZVj>``ZFIwH0s
zIIV9@Ybfrkg@@{Xe^==N`+C$vkg2zIo4>y+Si0AK9(5x7w6haj`B2xv-6AhSpj37M
z<qJUdZB?X`1>QOMpphQ+0OZ})J?;a;qfSG6;C|Cr3oSO-%17W)Y1~_)__}B$4&9Zm
zaVb%JEi+I+)Z(DGR3z|7=V6pS>Tzlil;PtT2t6^%qaMT>7z^$b9ph2QYkDnQY{!EB
zeVV8+W_s7@j|PYR+LX|T;HByYF`~8bjnoOemMa;t5g8Re$fHit^cCP|bu&DBD&uL5
z`usi~)j(=@Fy68EvWXt`WL00WV@JPlMGQ9mUCqLePrbjT1(^JJ(J(e!B|W1(>NqwX
zkQhY9oJ^g@5VJn&SBqxB-$yje{2pn2^m!zNcx)r~pw@A!UKfeNk$`7^k2(n@F_%Rw
z9&{|e_cteb)GABTG!cK6k0O|Y!I*NxfgbfJ`UaEZn*)7M?OLjr1&4-P)Yw7SQ{f1P
zglS}<AJrjRNYO}ZsJ)*LgF=(UCoSIJ9US(?1dn>WrlUD<Bby<zxL1tw_MrMW+y8rO
z8x(DW_66-J`23rr_kX7I`(Jine@fkT^aBlNhHY5EW#zucNEANts(V4r;@E`hSpW2J
zq}|i!c;lwCR%d8IPsG_9R{HDJktnqO;w-8c4vS`JT|yidj5aTaS1p`o%mg65J?`mt
z^byJ9FftS2ib%hDg7c+q{;o^}Z$ze+NWX8|Gz4IQ$WD;xYPECVZ%Y{%6~TE4`WE4C
zSpxSR@t6-<gy~d1g6v>a7dawPmJ;jX_b%Ehlr_~V!T%qx=ojjTX%A|v)z{Q0*Zv!?
zG$s+WxjCPyxS6zNv@%C2IMvL4tsb$96Q0fYza<f#ZOIDeLn2T7AaluN&d*$<hzg_x
zW%s6bK|NnrCsj1CUy?;vHncU)DkIja;0Xq6LO9%GoUTSZF=h_jt)>}TLyVPJ=&KWM
z-_6_fm*-ED+7wBi!W4D#*p8T6RE68Nza`Sz54n3ALeq&6uuEO^^lw>>)#to6L#nYe
zc`~C~^JqbuYb1u2h1r$na+wnwF5WIi{r2mm`U1(5is0%<Oe%?K)#6*vYq{~f%~CDF
z<cWL{xtm!aK~S{h_p}&7DWR+3&!RUu9GLdx35*?|$4t~bdO6I>9QNhf@Y%ek<_F|?
z>Pa5YY%24p*qLh*P7b+KMdn>mI94=<Y?F_hc8jR<x!KYvvipAwoPVh&Lf`)e^;K=U
z@}RmmF#i-{eIBW=$GPzD^8j4bJ+#a-FwS0PYaS)jZydmgJ%DhIQ07J)(e(%!))n8#
zSc%^K93|GK{AH%!Yz=uwJ5r#gFA)nT%WZWejLjLUa3#S^g)h^OoLyB~vSfL%)0mTy
zc5YO{xuidL_Mq=nf;3Jn_$(hL<F9#c+H4EV<0OxH<w8-?pB$}+tc}8C;jV*jcD#d+
z$6uUr3QGgBhb9Zd!L$CR=&YIZ_HjooAgQ%clZfM0SF59Hd!&_2h2L>>rE0DPE<xig
zhAKN~c)y-^)E%;9W8R7xj#bmu72!f2p7|f_{vWQiDX{dLpbf$Q|C8z(<y%PjME~2A
zT*|rR&hlAvTN^t<2+ScwOE}Lm56ZQ_=Z=*YZ%)XL(+5T-m*AowtF3T%9jxh!GZhfn
zY}df3jah9&?Tdw-!rl=wnxTT9G*@rrhiYIz7OHPeB5HdqpN}kacX1POY(iYTd|HNb
z(>nTJ6&KXaPf17k=Hz0g#e9Uj!L^9tEJ8VD;DW<Mhjz<S;(>jVi!i(gXe-?f@48?#
z0u#ATe~gO*>v}ukRTuPUCG&Jl<6HO}1fk^ZSsVXA>T)nyUBunbjrOV#+NoU}B12Nb
zsjVmQdTu-~DAltgS%q$^+R5&^?JP-z*wI1AIANdjc;&f>VoP!%6QLaCZeD9T5&Wae
zPhmEPERV{?XFkp=+0^i+)I)*)FIM#P^@-a3T7$YrJze!G4=C_dT+Dx+NknjUjbrj?
zFW`~|q9Me35dzgAo5ZR;XVJ_wOYPp6tS>_DwgRGfuu;U`GCgb&W*3WFn(ma!4<r$T
z)wN_Yz&&`k;Gz_gN$az6b&DANRjVY)WM^_^5u;`&*0z&%*W4{I^Oob!l6n<P))lpH
z808~S3E(>h_KhVWvhXjp3mUFte^Nc0k}HZh?^guk8PWBS=>ZX`c$DVFf!ztIf?%??
zh>k#cfN?Fe6r7Y${nQjbLAe9gkzCG^e|LK@=WZU7Q<U?+ccxeijYmpdiY1pZr-XSz
zotiI=WsHFVMMikj16G?3c4&b3wo6}f!%Mu@+(U-p|NALlSMcv0^>B4Pw0@pZKhkDG
z+vj@i1#tY2)jOdZ@V#Qrf`7}mt}u3Ko{bk=A#%uN@~i6A-Qi`u5?=N<SJ@UZ2d+Rh
zpjjf0!B<>$OxlUYi!O7)dfjvpe$&zH-@Me=Z3&B6(Y$wEkuZz>5CM=u=uchY-8|Md
zi%!-Jq^u&cogdXdc64K4ZeK>z!MNX%17`l-ay1%HxvHb43jr%wo4mtabqC>q!8zhg
zIs}#s@v-xQ0~0Dtu`a`{*xwn6amxU&;;MNWMHS=gjy@&KLy%$CJ<0aJPx$}-g*sB5
zqXyJd;Q{n+^}Fit)DN}&aT2VAEO57Wjdr*8oc5~rzCKEy4Bfvvy#<#4SL(Ov59rV9
zZ~a^LyrmLhygp>=Ru1Vq)dRH#!}5tUZ7VeY@_n2kUZ;7q#{A`)c?&`T(OfWJNTY=c
zAkuS)T+#qDbNRAltj)_Tp-PHhJZE1<+wN6T{4x`pq(diPP{#AZ-NI0{1HmYKZj0AE
z8jY2p{1Npw=j5f9$!BZ289ApXy~sTuse+snFq1Bwaio4|J;g|Q&vH)Dz}lZgq&;Xl
zYlQx&711`HqVG)S1r=+5B2XdHo~J@gyIQz_$gtLpC#hG<LQpIw#<X_?O`SasV0?!<
zy$m59L%rN9m3Lo(|5q#eP5RN=1K|Jv5g5Q!C859^!~K83<i;Y<F@YVoG4`7oUCtyZ
z-y%{s2VXulxdHT;u9a(!foDzUfrSwzvBk{WQ93tjyc}0*e&iJiTMs1H7eNzn2D8j?
z&ODc2w3O9S{nrIP2@l+uTvr5TV_v~SribX;2Mav2qf{!tIk}dz3*3>k^$5}w?-kLa
zjUn^XuG(f^L*T3~sRn<ti4(3aYk*IoU^?I`sxUvUoUlyH#W!D*>WCy8i;$w&?rEq<
zf|n-Y9E<A&&mnNm8B&eC$p+?~Esue<dFk=v)8>41IyjeIUF)zO)+g66)0#Zapw0CP
zCr4>QmuqnYYZ*QAeld=ZRY<*J_y1@9f8C#S=`YED>U|sz8TS)>fZ*2&K1lE(f)5jX
zgy5qDA0zlU!EX?Jg5Z+`pCb4)!EX}$7Qtr-K1=X9g5M_i9fHpje1YJ13BE}1dj!8v
z@CO86BKSjsKO*>Jf-e*N3BjKd{29TY6Z{3iUlRNk!B+_Wn&7Jhe?#y!g1;sBJA%I_
z_&UKi2);@1e+a%s@NI&72);w`U4nlg_(y_&BKT*5e<AoD!S@M%K=4C?e<k=gf`2FY
z4}u>N{HK6kg`i4MBM4`F8Zb_;hu~fWhY{SH;BbN?2#zE;ir_v3M-v<)`2RZ<{VLti
z?$Q>hKT!S3UzDBcb^fWs-Xy}vyFOAIgThfexA_#BBjTKMc(L-P=lP+RD>@D(c|iF*
zej?3BDlT%E14X++J-tD0RBkZ#yfta{ZHMr>0=rwK12&Qj6me16qWp|R$S47%34y@X
zuk#u=HLj9s3?vam-Zkq|A{9hk8PZ|R*aWYoWx-^rmhPmV_sbn;%+}H+$4-V#r*c{4
zi>yi;%%~%|xd>)l4&^W;rzpGMy+`zJ{?StJPD?g(vkTyvJ^R`^;WMugM2zojiA`^9
zF`yelKYap^=y><NKx><C+p#`4J?Lct+^6~wFf7{J9Y4+&@Ix3E_d)K|>WlSuLJ_jx
z7wT$@Om9zaDnjQV9q%GXL&ld*iR>p@W6%E^t8^*K&y+h<FJgZUAoACrwJBN)G=ION
zeWaHuUC{HrR)7AJI0;<wP7u+HF>4u56N-+)$$@vQE54J3v~eXDb)uDAG4J4EGRR}h
zM@h!~wyRc}41bIVT(uJCO(k$u=Fz$~81IWjMXa0mTygz4A!1T}dBhbHl;_HjE5^?p
zmFLYH0hwe`=CiIO{m5uNP>t7I4W&t1V0_nI4wES82d+f)CY1VzuDEf~6BNusV~@K9
z-v#&bkaI%;o9pRv_K?RFZ?-<-gZ`8-<}==MnZ-oW{Y23JwF-E7`)fC7)70;&+YtTh
zPNnwa?Dw@v#HDv_t(G09q0G-wmtQEZwUrM_M{;`-G3Z_EVdZSiAvq=7%<U5w-*{e&
zR8w;jZc!mncS*mRrvMakc0vN%zry>HOCdKU5n&!QoeDO_K?ScDlfACVb~nPyer?aR
zcyN2X3^8({8H!(PlL#U2dJ3}Euvx>{&Dv|cXn)-^(!g{lLq**AV1Re{!1iLAsu^vS
zA-h!N(!2KNRkqAoC{-Crb`*g=*%~0*nkAnyw#K28TaxX}q_E5#V#B4QaKqZgLVyZ%
zG$%>9>D}vjWzF~Omb!O(vJDKay|hYqYfUKq+8bf#v(R3Xx|28H#`9$KRN((%#{WA-
zds3?a=f4(y0Ky+<_ZP|&OCoffYY8W=1iL$r;odgshYk+sJzRT?jLL<Qh$4sibT`64
zhb5J>Tn7C{{|mgXz}Zho)9Ftl^dVF>+||VwN*v}Qrgf8kJfUSLd{L}pe^MRL#fcT8
zi(|T<owV^R%uq=}LP8H`>*~{!ETo<LC7j3Nf2iE~<<h>Le9$)q50?gHN3sVEaIK`{
z?CQYT3xa;`I8k}S-zA=KbF#aLyTT%b;A%)|!RldZ6R#l`Ltmea6v6*9iFk&xzbjvP
zmzTczZ-0~qPssm|SJY$GZsmCOF6CzRm)c})qw=zLxwc1%>XY;;SOg(#dd`2YP-Ify
zV?Gs*<#^2juCO$qC>a^W{;tHP5Q0RRM|-X|=pD7zGcc>LtTmWb8lBb~hLL1*6vk-H
z__4itTO`~(vw1Sq))1n3%Cx>njH?Qdbd26^+Gu4CED7Vcj<%YX+&q50tlIsMtC2J5
zOB&yHr>|RB6VLdTE1JQo_GEnD6?q~{gMP8jGce~9nYswP+?nUjc;8hotZpTY2M^V&
z9GWA{m^@pZ7bqDz&6ok#Tg(er80tCGJ7@KJ!d0GuQF)6k<Ic<KA)^Rne5#Q26n<K`
zE}Lh^DIOer_6TIUY8C?B*3b&f7SDD~dq)|r{sWs^eL~v_Y5xPdPyGj^`xofX=Ir>-
z68_JPz&{-+TIR<cs`vi>vI;Oiv6tBKJq-RL_daluXJB9ZRhMyBDSHoH3_e$7N2nVH
z#+gtcYq99|cDzNnk}mV47LLT@K_1e16_lm;`L3UXW_TUR-ApSG+a3S&wNMl=eG}%-
zDX^X6)c&n-NSE&3F3yqB*P%<QbC)thy4a5h5bfBPuuEnq0!9`Nx7EEC=)DdDo5{M|
zA7I8{m>6Fj%#?*_c32s5Kk7UnncNJ!TNGsu>v*MbXQC*FD!ASsQ+}ZQ5gI^;swb!o
z>K14LU#fmZeO&#8`bR_rIt0-_R%;#Fm0Cjkmi8;{5BhNZFnvDP0s6B32t0tj={SC$
z<_l73uyE8!3&NgGFy13Q5xlk-ggrtEDm>l9_Y!g5Z4~m2XGwtvIb_}yHOs=CN~f9m
zPo$S)<}i`&M}{F{>>&jbd$wr$r7a7Iltj!t3FECyqL~dudMFm*yYVu)zp_!xHeRA}
zSq-~+W**5nwnBr^JB)hDmRc1oYq7YE4@eb@r4=%rG`>N)Kb#Wj3d4q9I79I6m3bio
zJg3>)#xH47CCgCb2^!4|SKjy)O|x~zyklrCb7*(t_cSzCV(rgUJlYBf<O&*z7|+oR
z+3`J$H%Obx5nU9~L+p+EjE87Aa&c^$0Shij{gCivLH{43=(XA&?KJgu^>pRW@cnfN
z-?W>Orx&5dZMIt*GCe4F+_%1V{%Sw_lc<ka5)MdQa|9ez(i~LP`cJ=s(>#ImWShr<
zVad}#F^<mXNZyQ&%fc(!om-9^OZs5luZMU`{Cmxp`rn>JSZCKf&1zXmZb(jPD2t0e
zpYxnl6D*;3pwF%?p-uglxdvH#z<hjz%vajW`|&pA`elnG`-|Z1WoE(b4=+3Prqt8o
zkBS;|ER#1Tw-=#XWj?^T(KnrDQ@^@cl>e2h<x!rV?87L}(PHj6K*7TFXATiF^f59G
ze`mC4anq2*zYzTYxr)9+FM<AFwfYL|fIZ4p%G`X{_Qn*Vzq<B%XL6Bfq%FzWtq}d;
zrMy+SJddp@gn4ysK$m+5K@OX9FKzj`u=3ipF)Ynmdup#DcA<PLF_|yyicR-a$Ae|O
zUpJl?kZOvgJVmVddYelf3UW57Er<P$YLrjdKuRw{8NjNYYYbVRE2n*p*U~aimY76R
zS`q!SQ-w8#>{6rMg73EeAF_qf`jlD(S1fCTZ4709A5kehBj&C@e@ZEWk89E1g$a&X
zfq&&!COXW_fR@~avtop{$lY0y-{oh1kDzrIa-9mux@0>#hW{g?ilQym&VX;<_kq*L
z^}&35|Fd_WjezY4IFh|-FFZ45gB1laENo*KdzX7g_rx5D)=aiJ$hMsMAQM3=JUw}w
zBBZ%qbCHMN-~B;^DuEUWb6t`)d+~IgQkZYXeE1Uropqdrn569H^7K3NanmiBkNl*N
z4ax}m7vvzv)9I{Ak<PmSdDDJa%G)8?<(0;reFmk+Y9?beI`RyClUMm$LlIvU+{ke&
zY)_Q!|9#Yzih4F^{SV>uuMZUdZ}su&O2qa&Q@`JKrawz`9syS@W|{hQWc!%V@G@I6
z+<7f!QOmMiWXL<rl`z4K0e|4mkqFCDn8J5HE6mN7@G9?KF0;wp0atQ}9NvK=XVg3?
zCeDH@MJF2ugR}I&G!_#3VX+6kF6{aKmQ01bTs$Y}|Em;4@U74;)26FWsT-8{fdBtT
z|J#^CAa~dFg-Pp=89-+whpP_ZO1U<gq=6LTx4Tx6weD8n`xb5B9s54PF}z%-B*7HI
zw!_VtJN(YHsyNHcOkA^swO<z4>T7Sy_BQRQeTtx8gomoE*L;IKRAp0YFT0ob2o_Kh
z{o+rJDgrOIu$qh^%VX$!s|hcbHBttqrbYrUo~8A;8#fo^uq4AZ+>p>xo?*$)@%C=Y
zp`e>nBZ|-fFdOW##hNwW+q~>F8WEYgTALbPgi2S&^bjOf+G=^sb(f17ee^<UM#cW$
zsOVd?545YX|GxqMKN}$n_$2;|r4YL`s2&ehDu>_!74ZCsQ0<^IePE+E_`^W*5UxOX
zNLTN@V=vZ`CH0Tr=onOBSIWTp8LQ26*5Gm|o?Vndrm_a^JM;KQ4DAxzWaTCiuxH6h
z_vWY^r4C|_-14XaErx>}Af~MdDG$Cr`~Zg{W#!xaVL0dQ5Qg6eS{`Tao8%MNb<S{U
z0=J|NL~tOLIrnoIW1G5ko3xn|c@=qwwmo$~5hsnzmuAlCxHG4WHb|^V?5gIcZ<e~X
zF|~gYH-Jf9#27L?Y;O26AGXc^BcC#n)Yu|87Iv~1aAIr})mNY5WY;;ce`-Ih%W+zx
zyK~KSAIKcotaW)_<M!-l+F0R8C6@=w@c&ZfQ3d~gsJyLCR$F2Jf3bRt`n38dZ7ei_
z7HSPzuXZu~0e(w+Ti*vh0T&`ZXotR2|C0W+{>mqDOnm$@NSGt*oscvrN3-NOkJbaB
zP4PE|cjWONE#@w34#W0+YNf1KLP8qTa`o=dg*0C4-uE8Fr9|G6`T+A#<|_|%`k-&>
zt44q!h8TFg+#dnn_qMe~0`M!I_S(aYq!5RUIV6Y4Nu-Z|eK40PdF>B1ufZFOx4^yY
zxRYz1X&e^?A{nXxkaof&U##0761rC7xsc6UI{Vm}v*+=z*K!f8x3nCdec^1DIXDRf
z;UZhmvEB+UY{P3%<xDAt`S;^uLhq40guQsfT2LA3<B`-BLyd=*>=Vr^E$?gz;kd+Y
z!IKyAusGh*ieNYtghLhh46KbX7DKylaxhKodM8k`a=+q*%%Wyh1p8T}zATTzdzcuq
z(h39$MYzJgAiJ`HB)IoZ=f?S{9Dc@mK}T@0uD7&udd2kW={zaGrLIT{!r;f>&4usY
z6=GgXD_IC35w57Fs|~)1g|8KFBM&F!E#;x<JD9QZRG0_({J1t?Fa#@*uo$&+E{kQ~
z1z14VXm22nh)TTPiBv_}w;jw!U_-*4q4W2ri2EP$zjx?+YeDsOWr`YC-c`=b*^`Ya
zM7OU|CpzEd+^0GBnx6SJ@xqVzeZBPTe;(#|UvEiGWS7cJ=j%FC9-L|BbkU~U%4JdR
z$!=+6nJjS|P*M|c3h$MV>zb`DccqxuQ~u>v_k|7Y?pfM>Opc$|)FJHd$>ZrM+XB81
zWBza_+r`WJTSEdnD78=DgrIWAU4I|@lkU?UsqyIc=zLCq9g!lNJ#TjqoD|_|(MwLc
zCr9`=A$2fnpPBFKbE@6lq2})Fn>BYc6so7PKWTWnQ{&J;Jzpd$rv^$VrF3$3y)oRO
z$^k9qMV$xb^C;j{r_)W~bVbZu@Li5JpLFjfQpef-KSn)7Q4fLb-+Ahg`i3?hnm*@i
z-_YLEkI^^lm+DXCoCW_a364Cn?Eb_}!<oC>7pu44k&$Q4!IV<r%p3a3eg3cr2kTw#
z=<z<Ald;bEslC#XXKwx&_aH7T;q}nl;-W9h{qblhkiKe<c4RGPD_M@q6$l4hcGdE5
zC%kow9NBHAjQzfH)FcoTo@=!uZ!en*kxv4VSbtZ%BNz*D4Os6cM}Dg*8&HC%udWx)
zCdD-QU1i!HXSeM#ik|1);3ks@5D46X%vPs5S{Ry|7h!h6bYWMy$grZjBZP}U-0)3~
z`smpjR&>Wha6%257Q+DDVgA5JeTKOIFH!V!^s(A)+8p5hovN-}@}Jt`-KnFPN6b95
zd$wEb<XsG%7>4F?OqX|wUyV7*%J~Z`#C3e=?a~q0o;s4T>GBu|Wvk3ZS#z=2&XdN7
znhw7}s%cH?h>^<rd=VA0HD$2L3|<*|nHzC04OhJ{mD`y*oT*FX2`P{*mkrvoNW3@Z
ztHQ>Oie1FVOiuN${ZRB{_7<tWNNN(FBxgc4Tc02z;GVv<)6W#y1s-2&o7}qa4XROA
zV`xtu=6a5D@pm9<5=tMfo<}uJlKK`)9m;q&dEESD`^KWHf*JzO3*ySR6p9%%oDMId
z6S<Mv((Wn0m1^CV@-aoY6W!pz!U)iYIO0o@&96*0DQ93{=Z>sre^SL_|Hl>mT;Tt=
zfdBVR*#G@piGP~=KbR_G-1j^Y6|zHI<16nJfm|cpywY1Lr)+p)o0!T&kCXZqNg-}F
z&Js7v)Sk4nr}(;rk0@+Jc^Z3Dh^CEcbW<ZPF_7iGpfn?(&p8v2_J-4&=Es%VIWK*Q
z{YgCyrVwJ=<%m)c+w2`xDyN)&>0~~lk)vfaIi5nCZEOxV%akp|dOwI+T=lV-p9Mb6
zp3gQflncHls_j0aL+W003gNed`S_{X1!F~GN-dAQsoi3!9CNl*!|ACh9RII!GjptG
ziz8vMTA1f}&}Ae#%y!S|?Zgk#NBA$L2K1&TyIwi0e((h19c<;)v5_U@fgj^`Z`R-H
z7ac!hf2m%v|IbtOv-OdP?mZduzh?OVIq%cl|F&g^QV4VlE`XZ}SOlgJY*R4uix3J=
z40~=`=)%XuGM@IH)amvVf*QNL@mGgB!AXK&3-Dj4s+^=~oi2uV_9CgKmK4I^wrf+|
zY?yi``@o-XuIQ2VS-ECDt)1#oQYHQrg5aVOH$zu5)z=W|_anfcsKolbONca<c2C<b
z)zOoJsfbISMK0Gw)McN(`7thcSlT^%npEf36hhzj<YQT6w|!L?yx&8jf*r9Kc#Wvg
zCb40&7{$nx5mIgashJ~{U0S)DQDi%?+7F9SR$rVwz!X6+_4ppNf4B8Du^_u=H%fK)
zrDiZkSb4$>WP9q2%$GX8s@sp-|1XV9{ee_7qyIni|7Uw5<xM32Y5NfzOK^XJ2QcV8
z(0dSvC0>J|m*6;p2NN96VX5~Jf)fZ%B<Le}D8a)BP9k_X!6OJBN$@CwlL<~Ccr?Ld
z2u>w9jo@^GWdvssoJsIlg0l$DCOC)ST!Qlm&L_Bl;Bf?xCwKzE6A7L~@MMCg5G*HH
zL9mkGLV{HUs|hY5xR_uK!6gKj5?n@bIl)?jD+tyRTuE>h!FqzL39cd7K(LWu6T!6v
z*AZM#a09`O1UC_ECb*fPpI{5Y0KrxcgWfiR?F2grh6rvUxRoFr-6+aLWk|ul?<;Sq
ziaK7Mq1LFI;RWalNC6*KzpuWdjnEF)PJ|pVqMZdl;16j((N$Rgoe1l{e*Me(!}>4s
zZk12rrI1FI+MMs+V@ZlrjbJDcFCjQ8#3B4TSkDD+-cl$VFoqCMTR@_dT<pO+k3=?%
zaz!*=ardv|CRe#ch_{RcQ`Y;`J6j0!N+mWS$&+fhZ-E?EAjy-m>^>@c8KR7sS$b5q
z1;zCq&F#&+rS_~j8XV|a$m};72s;)V^_gEm7B*Vuh0H2TzsO;S(U{g+SYDK9WosSk
z(N5O9&R3du1`VPuC&4?3WM_3zNQ~M+g#brJuqQ4aW17VNFjs)}&L@c@bY>YoSr-8|
z-4cRKmb7)f%V=QggWz&PcWP^}3;ZU&cxn&#XjN!qJyS2nkP3goOqZpe1=tn5fa7WM
ztk|4)4oNII;TK2N*7jg*!@@{!OBl#KoKWx@T4^$E>BN(%>5k;UWbPv0n+GHD0_9=x
zKM?F^v2wohl=30`fOM#LsIO^0cmVvO_Cx&ueTlwXf2PnTc2>#GVlJ$qPLz>%iVM~`
zFCd5Eca#gpEX&C-_{`j$;DWo&Gs&#7!(DK<Sw=>e1-sICc8#;bxpjQ%n7{2%fFrV1
z0XUY5iGyd2qbE5jf3B?X5Jz2gYgQYY+<T1Md9BBh$}|JI+7bAgVZ}H$`4Vn$InY8w
z0efsYF}6>1xgb`96YlTAp3dYv$puS%H8hb}8<`0)vr-QFw?)L2u+)Vhg6C%8tNiRN
z;r%?$&AP~;CFeT3QZP+Un#0JnFEBz->x=l-vWQmcIKJLWN9E&eF^xfAYY1GJc(6U1
zCXt#2{okYL+x2nUpf(lp|LT=rD?Nqw`^SFYnL;pHm%M7*W3SXMHTur6f&!oRf<)j%
zQV2%tk_pK6ZSHd7=Vwmxwig92DO~l4RAXlffoWa#kky#8@_B`F>bBqWu(2S`zb4h!
zmO_A9F#p`}82FK9J_mVS=95uvemvc=A4(OSo;uz=lPvG0nD@$z?@lv1MoSF{rH*sW
zBeL0|=qon8W!v_glJ4x&Qe7KT3z*XFBsZgK#wg9`rSkmzJ8O?S<0SSc6+hrf&BtJl
z$Y+C|-MWRan9>3tOv=pZH>7q5`TsCQtpLXVHTC!EF!=gdr+o?X{}1$1eU*N({`AM*
z>;G#qy0{_Z*r@`+tBgQr86oS$b+Osed?P!3jU7y5j!D)9PFUySGH)SOHi)31GR9Qd
z_%*Z9#WfRz>#|;s@XnmOfahB5A{SG52cnF4jDEV(Ryq16&UTFri`{|jomSz2mX)oE
ziZyqXIrZ_iM*Z!;&^r(`D*#hJ-s&Zj^csf}m?wC+%MK3vwexMA{)W2_5?t}sm^xPU
zuvhaJ-4}{=s2iLIjTOzlDVsS1TzFtC2r1pi#T#my^PpvN&12qsVm{pBZ1@@@@ORA@
zhMIIyC6p>TY0FjmSZCCY&dVuNWjT<Y4j$(=4)w(@-x^Wj4sriCDEfK2s$Hmlq+Y8Y
zr+ias_}8{>XKIn_E6|ouwIyGhZV(qk=%P2IQ>-V2c(5+H(^XyYKqYY0RY5<nZQ|<N
zr$-f~c0pSO`;+S2n5tqH=y|*ZXV<xf-i5p^tMC!LTJ$M0`BJHTe`=v?uD+xWE2+nB
z=oWQ!&t59kF)%V!iCbvjd~toVy~s$qo$=7p!r!!#8bkLHvREdXs^GKe=E`+YEp|{j
zR?dE03_-Z+_wo>UQswS1VjLr_zC5b9g>-c{cF<Hz{Fc;?c<L0_qE#nt-cpAb%ICKW
z{(txEl~T20|M#)@A5*p4;s5(SwNm-9()X|J|AM(UrVt?3<>s;IOj|Ul+txiNu>R?%
zNZksh5Fgg1G|`5$1N>Cx_5^ScaCP3p50mPOq!1(4C52(n@dJC%MkjDhX4}ffE4`^@
zu7$;pj4kxhp5?Xav7d;Z`qoQ5-JU`icZjLnY*3DC+Y;CU4YzxxJoS2dn|>%&4ZUp^
z;N7L(HoI1x@ru&CuQzU{i9YfGsSWKZgmrf-Hbx7qEFey4S(5tB-OUF&Ty=L&O$h1k
zvZh>YuQVrV>nYTyBjg)^;r}DFaf&uhTLSL>J=z}q2w?pe>EA54hd=w^|MCbp>!D_G
zN?_oi6}a46y~mkdm(2ivXgCJRIr!zUUJ}~O>KTq9YiqMPW9`uS;Mi`!4Yr&4oMlP>
zsW;>&7C1&<4g(qpj#foFVT;M>5cMW!-Rx`w`-CEj+T%=1W<IV6`g@@k1$o12920n=
zk?42k;$`!4jwQ<ncdEhwNDa9d`-*<l#Qs>_p*G>iM7@aJ|09%H3L^YeXfMOkZ<Kn0
zIzqV|NlyQ5Od-6Z%e&hm(}6H2tGGON?l1Y_7fQ{M4!>9mp&eanU^<yjIoVXzd4bM{
z*0DdS)?KLv+%LLT<?eC=)$7FZ<_EpgTjk8%bm&*>QVVvb)}RHdR_V3{PO<`V)7T3V
zlthN(^>wNK_S9<Emrkw#u{0-X=L~V_gsWAlrp>8(uFvPDqgKhORgkKD@%}X1_hhMx
z_S7oZoyp~Vl;$L@yPa;(V;+@iT9aDoTB$oD(k)H@+KB0x^JhQ%lgbUG>X@&EJl-R+
zl$p$6DwPs85|!CKTjoQu`+vN0t%83KDBn}|sKeE%>QZ&9dWkxyep`K88?GIuEk^|K
z^Ryea$F-kof7TDw=jiM8v-Gd(FFPF(pF}!|ciBmoqs{L<iX_bJt(kl6J%J>q{6&uJ
zj>O;Wr3Dl7)=ctfl@R6fH}*TnyN1k1`8PIVHZrwjuWdzXBrWFeoz9L1Q}bmBfcHex
zkmSfCyeE;w+!^s+N}}vsHn{h=^vL8&sCZm-jEoB*6scv{3Yuti95my-hjN>3ue@-*
zbu{Qs>`-cV4#w+UOmA{_vUe3VCC*kBv#N!@yoIAna&`9Jp0!D`d-j1dm9b>92OGy5
zoIGRJ6yHKv-}FXXKvXifWROA#e`X9b@wOl7(Q5D^{Qa9hTNp$rLFiBK2ns=Jh`Ugh
zKU>YDt{suyn6L<s2^VSJlu&;N&X{W{lSvM@GmEXX#xUpqjezi9zg4f+ey+te1$sY6
zDk-KCP|Sb96v9Ee)j((JH)chWQht(|Qr4#Fm8o)c>{tphAYCE{P7}=OKbx5k-=Nga
z9W})Mq_cQy3gIAKYNFb${!*L7X6j?)sBcQOg;G5FqbpTt8-1P9+_WHF#gTFH`QMX5
z<aU>wQ-?iRYM;L1gY=ELOzK}SwV{Z$BIy=ktyoib_z0n@x=pI5J%xDfE~)5Tb+OW%
zq~>=Cp{e?tRMW;3Vz#?PiNW~D>XVh4pW5%`k>{62T4cdzV+t|bH)<2z=q6{~Fl0S4
zbY_sgm!y`n`+qp2|2N=%|D}GA-l&b!&)1(UX77LY?f=0Ma3j7epuD!w1Nn9V319)i
zwRgU=IE~#R%-uwp6C=~R%$eRdWtKU;-dZ<GPkHqlj(1_8Eh_}N(37&oMoxAyLaTwP
z*x3bnCy&+w%5Y_zqF<+<tUaWRQ~#ufl)ox5r7;yO;O`@Ytmv6v6aM%Pck8y~*AJiN
z=<j1dPlZ6}?yc20(|?%~Srnwq1CS>fD=L6BDFcCb7@J}F_8Ip`Cto;)$db6z-86#u
z^K2M1UUz~viOT0UocaIQdk^@ws<VIm+<TQcdqEN@17t=9kT`oV0!bV@PGTq6*;}@+
zZN;+W$Wmg55e#8dNZEuD_8ykxgx#_?gjGr@t1T4T(w0(2N(21AXGpp_x>r61-uC_f
zUi`82T-|l{InQ~<_u<L8WJinEu5Gm_bx*z2c@j?*w4g(#u|u|U%<A9roQw}h1#f7p
z=|DM~&IbZVnE|Sh_aX=oe6AS7YTBJG4b<@TUXkJJFgY&&pO_$_5~xOvDyjr>&sD>6
zUamd(N?JBRxyahXm2HUbzE00~?nLQLx&;o%0u4mA{ZaVlO)8Tb%GZWK?uve0l5IHT
z3szh4O$9=wGiid92ABU;6XQbT5dB_#3C8~w+7aYsQvKsKnZFG%!#S04=?=FDAW?`B
zRc+S5or`aL%<Oa3r!yq_(&oOhKjVtFjjTab2HDb(ze-r-nCata{+qlbPm{fDH?$$v
zV@{x=bU8}>)d7DEgtTFpTym=)Gy5Fb5oIi8Y4aO$D2Zil2>Y0m<x3}4XeN;@%+z81
zHw;>@wE3+Ar6yn3h9J#3y=l{LrZe8`XqX3>cAFVLPyCcI-lfe)W&7(QRI_3V^QaFk
z?ByHz)ROUY&G411De8PXq%v%1gXfB3Q<T8ESD<3SxSl7IeU9Ar3@=XIB1p)Al3mcy
zXx6f$`Zh#s&bj+bSJ+a2h{8EyoiHOX5aOxXoIJ5nRNnB>S*am_vtnu$!24oOzybJ?
z3zrtt=492@dwE4p9W13r`Tqd`{KWq`<Ux1<9jvW_2H-*MV||EzJfwaP>R%WIzyZ44
z*wg75!BKCLt}no-aXY%Z92HKMn?vDRSc~yh=pwZTnyAMHYlbr&xxsV_#R$g+6H(wg
zq_8m}j!GHJV<G0nAHirT_4ANd?wyYK(U#|;)RUP{bC)XIKi3z9`8L1*EQQ*g3(pi*
z_ER0<f6|#L83}B`0P2@Laf(81Wsf3vK%us57$<j~LIyMD26uy_(kor01ym{qHQVe^
zuqK*vlfP2+Nw_g&K6!~kpIhLsG*kBVQHAO#H6i7rG1LI?h9!g5ezQXDXD=u2Muq$#
zR$c@#==hp+B47WfQ~Zx%`a^n^-c`Fyn@sK^(>oaL8`}`NDyQHm-3$&wO4I)Q$~PHU
zX=(F_0%@{>(KHQWmD6ZCooYw2&yIwnMIW8R8G)B&(6n`J2wbJOzQOL-2gaGJlHFLJ
zEkBoC&)Jx|KC`8g2HFs)N^x^y*MCf#ljLHzSabThq~un%ZSH`LO;>A?kCuS-QZs!_
z&f(Y^rOk&uBE5WR8^XQ=^~jk=PQQFv()QR)9+C48(|9u+^sMyaHEoFOo>S_UesRXA
zG_AiD{9V*a*K?%z``ZxBU6F6KSvbt>b4yPlye$21m(q&1HFaRpl`hNp2^m{r=9I|W
z!|BSz0~r#2Y2CrHl__2SN04O%|EH20$Rp%+@)7yB)>}JBo2o6)Dz#?qXWC9JuDyad
zpab;rdZAvcpQc}`-=@E=f2e<L^feAMij0*;(Aa8RVze1A7{A9WxzflSFKyn#p~gmk
za3n>2O#;)M&9yD2Q`X&0TqS0^>2%j{pI#GS*?_L&z4GTAe%0j8nyg|@7q`vgM)mC6
zX&koJoJBEs*qPh7BdST~{D5D04d0kN83t+^T#DJ9cZ-v7)T~biV|MT0{<wUICyhtk
zcUaG+=7E;v3(P7r8PwK&hR9Khhj)iWQ3|2oigG^b0<I7<Q{4eVkwrj35!~N(qB^aY
zD=4gAk_$SIYris{ueGotcgpWiMWSIPKRKBr|E45RV4S;|n$!fIq2@BHmI@@9s+x1T
zX3#9O=>V6DH_kzf;abixUn5SXrx*8T(W8nm_fW%m24U+RRcgYM7j5OkLY?&KZsq>d
zW}3AWl?^u?3;UQpX<-q$hSX-{x+9_p5ZEU{Khmt8=w8K^dc0Je%V60=&eCj|=o}L3
zC30cMUWr`TvQXk>5}U-8#-;-+#Ml2uVq6RP-}CVB@2zdsMv`YqV+ZU1_q@C`=2Bh^
z%AyUGtkapvBXag4F<JMLRV1ro2y_R3EtQSGbs8`&KPvn2>A9|-Y)-Nyh5&atk^52u
zt{~OAX7Xr8KPG-DZ9ei!Y1(h?5!1lY<TSufzgeO4V@d94fGqpCkS{`me=X%^T?}FG
z6#1IWE^B7|+<3XKZ2HN~^dqIPqHU|Pc*ZiTnd#$2D_I!F(%R2F(z`ddAzG~>N1CeB
z%-JnHD`uQO_N5DWjg5XsN^@-+0@#8DQQ>W9wC<)Pwl{=Y>0jiO$$~F9R5nXn({`dV
zkCVaKL)w()^QW%<D=)y|H%JAb>wkX=_jNXQ|DOZ@e>E(BUeLbPC+pSv4*fYGeM~WG
zjVp{7zvqBgeJscR4--3F=?nOjzfA0}b)Tccq>!$t{0Si9d*{$!4Ivt*n$9MA)X`%v
z{a`54=&P#tmI=H{y|&|L3ZqT+fHw&Hw{SEzy|UwHiUQQGvkLZ~Trj1tceEZ&<&8R<
z!c~qcbc9q(q_?r-Dnvwx23UXwcqjlpkYkrAs<60@#_PjIcxEtK$px8uouk2SDwD-<
zcoZIS`X)!Gw$$x_y*I-YuZ4PKHLzBy$srCAc`IoOQF9h1-O<Axm!;H1aFw9Hslhvk
zRy#|k+7Ub=mAQq%Ca6&GKr#-wUY}!|E%H|G+Y$;_q7SiD{2ez9WKLmdA`AVzlQwkR
zc`E8#Xmo^>MoKpwwT`K>R0REvu)P6-9pjbt2w(qa)A(Pr^*`v_v@f+wH4nLt%vK$^
zWK|4dt`t|^QW~HjDX6skn0GeAjxTLKSoWrm#(F7lj8d~Y4T5N8deif|bmi!?#KhaX
zi!?EAi6PV#;NVnd_8gpV4z8HoK1wh%@5nCwYhpc=XZ^)t^s+JInUy;v^p;;!)^=yJ
z{^qZ*l?n&8qq{oWp|Fcn*y&a5yOXa$UG9@|vpUA&TOF)Y)mC=ewEQ4<&J~q8Y>o8#
zH8BLMRumIpa!v0BOzW?Om$OhprOiE$klw#GhG5l-JOIQ$>HQwvDW-mr^ZJPb99=3U
zup)-|)KD_2u(p;>uVn)~>xh}WC!DlYdN&>aJ;)&he*P2n7s3Dc)$Y+2khjQ*I4S;?
z#0D!fzvcd<t|)o5^nDhMy|g(Cdw5k0;lUIq4(ry+wES4~-I=^seXvI=Sty1eTshtH
zQqx5N+Z<&{d-<M8KE2^i=1W=HJoY^)#q}|S;sX1u(vPVojk&kb^?@taQa{PvH(pjY
zb;#HBBPFpWh5%gZeL20|rF}W|tKNMZtF*cUWOeYG7{YETzMt;!&6JYX`fIr^y7G{<
zQvO%P`YSiNRi<MV@GR)bg;~vikX2_@v3?zx%%_`Nw!(#OGs7%*%yPmzRzKO`e?<(z
zDHVsKMR0@Bo)qFtKZF5+mNt)iQ>vd}41p<u9i!5P7MbB1;7|Y#2*$rjH+IwREZN>H
z8svb1Qi7EK{|WyyIn$|Afu9%@G$d%Fpc@4Z3)&=TM9`?9n*`k~XtSU#f^HG?1VK*}
z^dvz~7IdqirwH0A=&6F9Cg?UnPZ#tILC+NQEJ4o}^c+FY74$qoe<tYpf?go#c0qqG
z=!Jq_B<RJ0ULxqFf?g)*<$_)z=ng@z6!a=VuNL$gL3avzt)SNldcB}G2zsNSHwk*P
zptlHmtDv_Ddb^-^2zsZWcL{p8p!W#cCTL91xS$C}+ugea-7V<7g5D?S{enIq=!1ej
zB<RC}{zA}S3i^nkj|%#jppOgsgrH9f`jntg)A8R+dz|QtwNLdk^!v2O^-sWQ3`dN=
zZAQ#^U42CSbmxDm1{CZ77AHf~U7KU)Dm+veTuw27?HFfrb&fq{>VeH68h<5F&2`FG
z<=E_|9?7sP3MxL4;*i`I=hz;n)5uuR-P={lZrMJ$&rwj`+nDya>vPCQl9@}}o4GeC
zG+<I2>fUsaQEYEho!sN=>kc<o<i4d~CL#_p!2}H22pIi`2>xF|{LgNP12!I5V5@)z
zcCL0S?0{a@ey8o#`|A1n6un#zLicx>zFYql`~Z6x2f`Du)L3gY!DHZN<9_40|11))
z(BN2=x$dY?kl5(I-OWO;VrMuZ-enb<x=$1;9E+U7{WGD$NopkA+qfs9xe$V%N@gP~
z>~roBsbyO)y2Bzhs|?tElF)P7F>vnlg+?qb2X}83FDW-0%m$d8u;F@>$X;^u<-Ux=
z&zcnV4&tQ+em<;Y$<uHhi_mbq<JjZZ3k_riJ<ZPCE>f|w_wEZtB{NGin5`_bn4eu?
zy@tJ$_1cEy%dE1Qn?)^GM52vJGsatm64J&%WJ6=EJK=n}VPe#MOODIfY@HzVWEsYc
z?x4sUJ)55WEVo)FAMUFt?-<<MMdhbw+vGblW))HOi=|mp)SK;uB3j=%X^6Da69d1e
zeQY(t!cug)7Wb!IG21>37-h3V4R9u`rf{X+Q41g-=kUk(=@|b5302wWy-9wrb<xIZ
zYqe9fYqdwTKkJ9-WsnG5tlz0Wi}5}fk$<<qPvBnT)&J5;_dS!%o6I`|@WO4Ozlu=!
zqb=UK&KSkGvG8!0UO~Mzr)L;p*pAv8aQ}R({#BMGxG%vS<-FzPW}?H-qv85$alHt!
z(i=h)#yZu0o^H5a#obZcVYgakHo)95>>Y){1QS*-lLqpZ{tS24A4Q`WyW43Wr+O5q
z0)i}#41D+TySB+YYL*GhM;I|y0~t5WmFoQYckz6f*$#N}XN99pbv!B)wcdryiD9UD
zX5yYLY#Q_A&)MV;&^Wv^y|V+MCX>x3o}c4}Q<;T=Cx4Nzidwxfx0I1hG^>7QT;YK+
zYTj9FQt;$24*P2bhO*}boIjt<ww|_GSiq=4hem2=6$OyWyepX_t!K~7N^1Nr3JGa5
zoNYrvrfFffzKmOMWIe*OXIY(z@Wh1-e6Yz|9_4Bn&u?+dUCe)XNFJSo;9|~jjg$2S
z3z3M~(8!V=(j7Oqk9X<o^dW9YS-dM~WXCxzfS6kt477Mh&8&iZE-;<FOQDB?<1MSt
zA+WE{dw}(gA?}KZFU;}>{Rfs2K1UB(jXNG?lf@7>0t!|G@WaQ2YeRgv^fbTJINyYl
z%DVtb(9#XL43}OV?a~+OLmGiBh!7<ubz$HQHleX2R9JvmCB6pC1MF_$|64~8=ks9w
zas7DhuiAN90eO_veb2$>@YvFrS6T0$nm^6t5xJZ@FqSsIf1V`3sE;9fu%fxNo$ZEc
zb8^YC+;^s~NS0r%j2)nCC}%NfG1JH7nn$=SruI+mQc>2%5EocckesnhF}wWaqD9WR
zRS0{!*GLKYVu<0K)1ky7AIn^x%*^Gg^viu^Q`enAKT;Z@*wD_2UBN$O8rj;Ls+|1p
z$g=5k{PZKGxF$A4S!S7Guw`0*O}}^`m-o$BD80Wv=27lpb{r8m$j@Yxrd})B=-rE@
z)B-WLvgN0pIhCD_6*+gWNbXm%0Se{+2f*1!pG;l_;{O%U_#4_Q#ssoc*R?!jow40`
z2He18QmvT|L%YM%j(|;;-j)qxz!*J+-KWgi=1}M+H(%Mj`WR!4)0QdukcB7Cp_)$J
zZRKXaUj;B$R$<SYq3OI?;epH@gGv=ky99*|YkGf_Loc7KEW0g|LOC+GPdUs%Qt8-9
z%+FWYty{NU3WZPaz7$H4xwBFbIoQoHSExQG@5s3Re*rPhGe%-(KSg^3JO3`^X0o8e
zVV!luve;;4m$kIjZQ1~L`W)dxI?^poimPLYjtEVmidv+?GV)Bz4{}SLm;}8g((8jU
z1RaLunC5cj543ey&pA`kfoki^FfqzpJBvU0`Ard^RunV_;N3`%*2EBUSXIqt-7KR(
zX<Ob6?|xD?b<vshBNb>(41tCf-=8rXnATs%JoyK{B>wgr>HTYChp_jnv`2<Db%t#<
zxi#sK&_{0Y)?TrLVW7}ouTW8XtL(*8Hf%GF4f6uOccE0^${6Ag=Zxc+?jdZUNXt~r
z%-`hd^`aY&krj&@V+cLmSp&vQ^Y08pm-MW)sQv_Aun%O<4?g~vQ~aMo{UzZ4?XTSd
z`=4Du)Ma~R46z$?I!31}43f*FEjjX^JSN-FJEji1jeexo@Wl|fNRf|~*aJxrR(?l_
zS4@6aDUH@Xv2o~u`{_%RdSHg5gN@jVY56m;4D9bJjh)YP^!6)Kj%s2&Y_iIr%i?gd
z<dfv0{slatUw<bhv^Ivg$%^|B_&2BBB24Qqa#hkIr$9E8SQ<l^WJQmllofx<o}Zkv
zU5udL%D{q6u_HP_hqCrM!4_ZySsfrUhLGjLJpWg`zJ4d$(5#CgDzc*4H1q#TIfrEW
zimciu%Jrelr7w#i0J5Spc$!b;GY{S8ui010^FIA*sjcbw??%=W<7Z^OF<QSvKTi9F
zR)k1kKhmEshS;<f8V!Iud9dx$3U<a9@p)&4s~{us8JRx|u5Y-D=6vqnXJ2px6xkX(
z5+k*HuF$R0TY*5^WO~cY%}nmJ$pjp&z+iQ^J70@(#ICtt4Q`TZF&aa#n63I$=b<TO
zU@6>-U@Gi`;H$!fWS+@x-0ilf$^A!P%<EwH15&zMV?2mVj-a(t!Z~EYvH;Q|XI!%H
zF_wd`JSRyxsEZ+Nb5kyqN+|<Wa52{xM#KwIX6eM*_u5!eUpysyf1VJVf@bcLE4sRr
z)=c=CMYue!$mb8Yz*mT?KiZwHM9yME5Ka6ysi3|XB01ORVnL<EAynM#Efwimevmyu
z#ud)}%5#>KMq`WzS=Paa+7FiW^kuVp&>gcKAByu+8M4^iwz<FXHz4?P!3JO(up_$v
z@2(FZ@a>xo+3;oh%lbZJhH-}R*pD;;{PddtpVfflmX!syq==Z|f`#EKAUQL2f7d@c
zN<%CUqz}7(=ooqjH-#HELoY$DbKK0Q?kQLtidJzY1Qlp=92auEqwbqNn1bA10n~|Z
z0cV)6teXoKV}0N{1s-pduBzRF&e8j_-;e}Sg7e}+C<w6lc$abPi*6xDuaE54G-CLA
zeE`9TvZ<w8qhqkc>}Ml1P${sSM!~s-X(768r24<!<V@N}ZvuHl8>rR7+xIhltlpqM
zV043T@2SSq|A{Vqx1->$q6Kx|K=Bb~GOv<?iYU<FX$uVBA31AZ<Z8{gm)<SLUONh~
zgMxA6#?XB?Js#8K4?vzp^;}J3Mm54CCNz2sG~m<5L?ex3n`$;`zX40MvDDQ%)ZwLA
z!RGsc7#nUXKpZD8#h93hIh8JC;ym>-KpjIH$J8vt%J9Zek*l@0!yEk#mA(Mpa}>Ho
z06L>01UdCphmP=4Urqob!CwO!{s44)dB4J|8XWrz0&uo?=lcQ?Gl&Oj3l^Iu6kuZ(
zhbW#2t+9c};Q3=6rA5%f!J0IJynq=i@Oc4q450ez5OYcyJcbZskfSg&^Vz0QG=Rse
z!Ze~7>#BnfCqz4Ut_!<*TSgGNzD@pU0|s_DNR?GAPE|!!OCSL55OoaoSGc9JnmZwN
zd!CT4UzfPBL34N+)l5R`-RKLp6fB0qGW83MLj~suR_a}8hC{Sgy8j7p+vf-ivb3b4
zWMP@Nuw-dT*_;CC_^6hS@)g{ptk)k2(bqfHY39?kmz4Tp5WrcHUa+t;0?yH4mm;><
zY_vuQHtHw>GeSuEAJ3;MTbljBP`nzAj^ii&4mu??REF^!?+t^easEG_7*`sDfb}yT
zzJKdTJIPOt_}0F$Szx<7xk5xqoKLw~RUcxICKw(^K&P4fnKq$lPoH$Ur{p(zg6EXE
z-qw*Z8nS7;?swjrOIa%PQ;j$5AeeG?Rwxvq+F1mI4nv<_>Vx<J)eNn1m@B*6J9q#3
z`vlk6XOYCwZHOI5wP9nFGYXY$jdz5%oX+sHY2EGenJw2mBI;$Dlvrg9p;a4lMI@7I
zWifo`qX8dxx^K7sit;#B;8E90iL`c&%|PY%)r*xkJIm_e_3DLrLO5`QaNJ*51<)IA
zF4&&)GI{jaxuUoaNjX^_L!8wreW-HX7Dq*uii1T5-y>e#AicU(iye(Z_S9!9zq~L+
z_Zk&g4}gvsf?M9GIo1A1vO76nT*Ebi*m3+r%0y-Cs7^K~rk2@Y4|u<!6HW4$d3~!W
zsSM6Y`TwD08zHYS+n<GGo3>FqTf3HAsXat~p}h;M;GX&z_yV7$-=yyW-bWu}l(E>@
zjQQf1#vf9%#1A^)22t(YzqiOQY%sjSdTCZT1UD0yQ3NWZ4H-5Ro&$u<6TgKP+cRvU
z3m``B_L-GfPT?h64Ffd9R{@;`1C!upUsD~9=QKA4Lg<tn_v7yzsXhJ75y^+pUBy$Z
zPG9EW8jib1_im2CPj7gv-EQaUF}UrRC~QTYX>#DZSJRactcOdd*r@Ikwm-81V2hFQ
zvJi|}L~!``MPkVcqWvwSe%ycL=6vn5vG3(b3SV=h#CEKuSQ%?!I5Nw}1NgYV5wEkj
z6$4lVD;+cz+_><!Q(OoH;qK(*=zf&PR%p*PLLTDAk6HJyHto*LS&(js)v9%jRbVL#
zn6%Wafu7<hA?;$jjrkq!rePXw5nKPvy7?P7J51in9^b`d2H>3OYk&cfAEoD$)L*&P
z7lcDVR{-N+4?n_3`=3O|brvMK9}rcNbqfuS#04Xs{>gj553;3;4rrck#byyB{a?v@
zV0J_=SAavLd@?m7!Wz#C^|`28YCgs+p{z60lXU#|A?FkPKd))pJnb~CUHeWyPCrlo
zB}V&f<MjU|7Pupnv9xg6n!-7{nL9kp`j*R?AC(>}4gvXv+wpiyXzcjZPxhj&&Rf<D
z0cSyR*oVep!WZ`7Am<IY^q^S29-ilF9ca(>N?9(!4iomCu#xkQqF5v$#!_4OoTr@`
zPx)0~$paJ;fpX$(#b%vr?|fJ5V70siBjJ#D6lRn_6k~`Q%B6TfK5o8rv_#0t3tq+Q
zZm{EKM1CZKMVT(pbO5tQiE_hJHoF?Q2{g+yMZ}P_38wp*9Abpb2DEt*%Ss>TEqvw+
zk{CX8s27DzUXY%ugNAJ&*v<#jPJqvAUr_!(5AOcPb;cx&__4tH+8;mv_xv@+5Onbb
zeWEfWwuB;~az1~ts3Ui~&B>-gTnzigQ<Egdt2Hk+7u;Wey+k=to2Iph&)x00uP=J;
zRKcEA$XV$bD@IlZ=0XjZyLv~1zP+PqVaWuBfDGn8Drcv6tO(f|tS?lqnT{9jj@R{#
zPk+nnXYd75hQhHqG$QF_<?Pt5g6(!^m*)pXqsZ}DHpCE_xigzO*f&*sspTz}U^Z>G
z%V*aA?q4jiFP<7Bm2h=zHq~|K2>l_o|I$!(J#+4XIw^TLhsR>UCgU#Y^?dzbOUPPs
zCHVxXf19-@w6C%LpP|11?4Kizu+jGYCj-@~iL!CDf*1<Bfbsj*S*$0OxFP~+oEM1a
z^ex!n!~DG}6mEp6b(3{d|0`7n!MYK4|8lXbb+pn7$M~}ln6)~%!(rV8yG}Vp6N?6g
zwLy5J#zvv&`^y3sBr3LoE2(VsrF0kPUFT)3iG|!3^m)sCwf=yQt(%^q%H<O8VqNgT
zIWFvPRkJV$t3LQj<|B{2L!;Odcs!kc3k=Y*-jery-V&ky`j))7_c#i`Z0b~q06YU#
z**4k`R=wrDj`BX6)ZkWThIyR%w^SE<n&2XEY++jQ3xk}Qe`TSo^+4rTD~FPmHygGF
zQ7Tjogs7JXx}{J|e!|!Pk;Ev|AJu1T*K5a+d&$VG5f6K;MSLAnminZ2;7+^g4)@#S
z8grJIf)`8ER;wOci2Oi6qnsaFpR^mJ17>v{<`Ls?k=!+7w8({w3RoFKl=038+)5$A
z#zYn6i-7f4Wpal0$YD8KhsR1$)RFo+<wcG;<I?#Qem%?)WmKWr2=FUNo<rchEgJwx
z7vZ<7a_jO(gpAW82S+<0wgCC-j9#8LMS0YZ=^0%cc}&4xvv#n%(zJA_XoIKap3pru
zAIa~h&sVM<Y8=J9mk>Y~;fNt9^49pmUY~Gda<_MILkW*k4*p19O<TvtXq57)dPuoj
zqWDbQ085Zr*r!3mMRgOXm!c>&OJREsCO1d0Wj+VAclr@>*5gkI_To^f`nddmA%O?)
z0s8g&NO=DY#SE}8YX(p|Va5;}IFt(lN17cmGr}siN=V|`Gk%i0Rz1$Lz4t!ZY|$4(
zjNr~#W0aeX6egArJj)MqS=*~TjolwhRTGRYrN(4A!thCDVUl{fKbEEU8RypUNV4cX
zE2IQl2ghgx;Cy|Ba#vPlecILTtF9R*Mp?a-wdUAj<V@42EBEW9Dbr)^_9jl5=gAqb
zMn%#?q@-J76-e69k5aCbWnpNXC@)ConTkg0;>X+F;lhmf#nd)P1{Ctg5Jec)P0FPf
z^0|~)SC;dV3-{hCy4&BSayG>fM;Kcf<+N-W1U7@pY=buZ@QtE&pOI3f{C`jFW@`Vl
zK;Nd{rGKq`sND?A&!zAP1T4T$fBze5V1}{Pf$58wo1oe(huR5NskMN&ELaqVHj|0z
z=7ku`Ic$-m%SuJo<HHs@YQZZu0^ZtegzK*v<{%*f8Z4ze<YQ_S*J@{u*!tuOIL20(
z8>4<$W6)vgT0Y9Ca4sF>*-@ZX!hWGgL5^J$3X;B)<qmLL@IYQh9o`u}BbeS|lY*eJ
zMWDwxM;i)SDVBF3bnD_e2$EpiA=K?X#vf?RbjmSq>bb#LED39l+JZSyS|B(OtV0;*
z1xuh6p>X}!%?-Yu^@kw>r~R%hLP1~4;Y;0g1fALXRL*uGh@R5D1yD3W)5Caw92G((
z!sLH_5WS4*|L!69e}eo)GqnA*qk;Z$I--EYv^RnLF%X#l6%6;|4*gN1r!mJ^Z$!W?
zTnGK%NB{A$!2uPRyoS2M)BfXe@%YK@7KyyAfL>_cvgGf5UHVXHwUXN5hlMt<BPp5t
zX^tw;4nEsfG%mDOh`HR6;9IEa*qy9MgM}ihBwK7P3Y%M?=zfNy{M*SLSpt28QpjGS
zER>G60%M^iTtG)8lup3;rSb@iJp3!6V$8gQrt1DqG@o_j<9>;Us&1zz$6#;d;4trg
zk7IFUvWV_COS<SVt8#aaDb7?3a`nTXr@H`l(a9IFVm&8HOm{MLGm)+gPcNZm6qnfT
z?<5P-f_V_Z!Z>sCu}}bm^S4UDKIHHb?No<@jz-t~BEOl0TKc!ByAC!i?&mp3O_tcv
z{RHR#M^OCF5zz1-r@amI{~ZVklJU1Oww?*$m3b38eKmNYEG0I1v~nKjhjv{qaVD+Z
zW9z{9b!KDNQ5Wi{kA=RPBG@Dz_$?g*u62BDEi!YI-lWWh(x&Px$j0|U=BV?3Qa1gK
z@$@6rpf85l-ksSbS$ioRP_#GGE=z8`Lu|x$%kkqXV~FM584(CYvZw(>4I2vW)?a30
zQo?YqRFIQnt5ErQ`mxIW&)JBf-SHB+^`b?h`P-xn)Wi_qd!s(OQ;lyC`muIR|K8})
z9Qs)>hCtt)*>j4mtYyw|!?up?buH)omlK|#`(deMeEeTa?f;I@AJJE7pJ`z&k6fEE
z{QrwTs$+=K3xR@i&7<2|W>wmY(?6TnCwtg7sT%5HwVifjftfDwRXCJB!_={!*s$Xu
zR^wkhC0ps86szH#S-D8g20rbMmzEmLcX#ergJg@ZnwZ(SzAUXs?U}!aoxPlQt${L<
zMP;nIb5p~TV5kwxAvel`$~OJ0w)Y60$e=HzhV#e3!ggkd4xD`ogyjneB(!$v1Udin
zK`gDkyJT?WKn(GCH|qt;4TpuCiW*^*4fG&B;bom#wr)2s+TgRLqE*Ixovpux8TFU`
zb^Q86c_Qu}QX-W9??v7r<Q>hUEkx|!m-VCI1@sy$|Br>0-|qk7(Es5{J8$tMyNV2E
zmNnFOs!Fv?Ue?(lU6K`c#HzgK2%90lC_{ky<_1^m5{EruW|=WDs>_{i`Q=qE2)gaJ
zpFbceR{PJXwwz#6EK8lIm#P|2Jj)V%N4dJK>xuhgXOTx{6=cqt?hl;>I?{9YY`=0h
z>u_U0*Z;0$H8JY-9okpgTJm@N_>unLIuOKC*BRFV1;fpx#b#!o%rNe(^frj);%;fW
z3&aqax-(OFwkc?~b*S&q%XxDBWfS$*fw2H;;6Qzu@|r=n4IS%kxuUEi_3rwv|KJ((
z+#=OO>w&R)WNftV>r}>OshKyh+^OAL7rk3#F)Kz%X>3C;g4wLKw=&!RgD15gEJh&L
z=>KE|`r@f^a-H{&`BCRXb77iDle>z!v5HOd$;YzrI^YHqQl{wo{}cXy=O;XYpZ=_%
z&k6dxpf3peqM$Dcx<}BL1${-(R|S1d(ANe1m7s43`fEYo6!bTOz9r~y1$|r4cLaS`
z(Dwv=U(nwP`g=kDAm|5zekkZ41^r0Sj|Kgcpnn$hFM@s|=wAi>o1lLe^ix6qA?Rm<
z{!`G;1^q(MF9rQd(7l5GOVF<c{kNd|1pP+PZw391Qx6do5O+FcejZ&=Lr|BXT?Fka
zXr7?m1nn+p4?%kh+Dp*hg7y)#ub}+|?Jwv6LH84Me?bQdI!MsLg1QCu2s%X2p@I$*
zbhw}g2zsEPUP?Xr9-tag{vVD!f6zuC_TK|~9&G=1=)X348}p1)j9+$sWc;stVwMZW
zDJpy_TYBxxQeIHq4A3_~@y+&np8eLiATU%-xU-_dcXKGiGI>ZQh-C2m)SRT2x&jB8
z28sEpQTEr<r4v?gRw;-3qZO{!iE3p8o+u5N3*{Az*(i)az&i?_snCN_RXx1wp{Pq+
zCV6_O+Kw&>@_nv#4=_Nr!IBTNO~CKelgu_Te^x!ov|Pjef$ByeX-<&|7<0d}|3>op
zOtTC3>y-b`BUcb(mHv%>n)bE!bFCMC{`dbHV+iiv8M}WwZB@I?$#BxrZs0W%F9fg8
z2pF`^czsg)EIPjI9Ix7QT%1?)UfI+E_tB4(iJBM!!FNW~yvzi40Kf=pxqWGS=I_NX
z3(2o%qm)o<msl93g(I)>79cmmcy0jl1wD1n=np<f%E;!}M&tvwMe6wgdQy~nv9r2g
zl!9(rWP5&L^BW>%Ihxw47~)^}^?YaCM~NS|fa_a;_8Ej6?79A#3G&#Q9}A&ihwD|!
z1xwk?CLK^y{-@bqt7-Guj&DBU@dw2&O9nQi>;D0C%fFg5kqgPg<V|=1^aU?ap|xli
z0SoX!?N{1Abgw>HuhTEmZ`EJWKQ;D;5AbouGS~rJkC-2SahfcIMl;=O*jh70sLkyg
z%l!}G!kKaogM!%sMBp)@cg@y!xPK$`uHq7#-hVCpGO@dcF>HkO9jbpq<XN+cnL~Jb
zi!8%`5(w`=gJ&339`_M0eF@ma3K(ouV7LL314pA40-WAYqt?RxGzIML=_la$rJM0e
zKaKue&5ibTq2bTCi`CD8!cIYwOS}Id>=Y{MIN1L1<QuYt%)b}<dt0xHu`YcDEsCPg
zgwWV$x<pKH={~%JPJC*+eD_~OtI|h0a%V^;DQ;zL_n>ferO!M1B1rdy>^u#!@5wR-
z-y`}CO)KRlAR2|9%kTma9fqDy>-XGm3G)hiS~kXWzcR+9FB8?*v83k{q2i~na=4py
zoBf4vI=j!7iM7;gnn&gOzhj9J(*LeUwNDZK+e6yOu}))JIv<Q7{&{Egl{Sv&HqPkF
z2F(!jl?*Rm6GJ@o&Mc2G&9OSvQ-e&)@0I-?<_WoF!AK-_0)zBZp1bWWH0%vGRvw>p
z_c~Hq4A;cAFn2FykyqNcKkepE&i?v2R;+C8BY2#a&hj`p9MIc~oG&*1`%00CgQY@l
zjx~33#dol=a<IJ$9nauy=YH|jSSjU`Vw;gNED4mGHPejAvdM6_J6>w}<$BS5FO|}7
z?H${M40OhUvSa%()ItX)W))k7ly%l{DMM`kuay$56gGb^>V|%d-lD%~^fii&2IFGm
z1!=th^fOltsA_{US#<Y5bHK=DZsl`A<+y*Lx&^gb-MHU&Hu#kim!XLsQPtAfI7Ylt
z;etz(if}~PL&^Q3vM0WSBY^ug)fNPAVX@Nl^gYxlbu0`b|G+6VQkPdW!dU2Vm&HKZ
zwZu6SmfH%1SLw2l0GV^Ga*T<XVYxkXW7MpURx!@jwT`d<lYswg3<dh{RPAnU40)PN
z%GJ$V`^LLq66=g!k8&lfApvk=FM|?MsdCDxj{Evrv7*Q>`&Drlvz1U@Hj@Y<jJwRR
zCnmp|m^5}fU79RUjvIXSP)=s16A%y(ikvQyGcGas@-g^0DFdxt;yQBBnLT^P2E#il
za~qPirOCW(ZchpiW=I*?7}q*y5Gvsg^J=#_NwzQKuy1?slMR;|;)LmLl`B8XdfMHd
zb&8y}n8o4-uW-0j#!zf4<877G%j5@m5wp*cZKGcl%{xa*u`zaX=VV@XJG^$AlZ!tU
z4LNw1lq8q`MTimAKh;mt^R$)ZLlVg~`hWPfV7yo7HVxTU9?VQzGPYhn>j=ShT_P1S
z9PimVlnC}_*lf^gD+#m$evcY=OJ~==nH(aINQt(Nj`zS=ov7C<^O`iqRwrcSm@+%}
zz|zZ45k2oqDYH%S?wxZ!lfk@rZ?`*3{;_=@OLcGi5-HWjc(=~=_vEad!G_zMtbccJ
z+4Schq8};ARxO@~R_Tn4mv#c-8!jUk@I}kvVs+BmbpI^ti@bPOWTG<wGr65x;JuQD
zqq1>+sVSbon&6A4MoRU;$N!DQIN8wj%XLjVQR_}_{NZE#$9zL&e80{aLedsXia2-^
zC4a3t{BNQnCQ2327$4BNzL-=UW%NaxlPeOu`+wz;Ll>ei_U~k0%mEl@6S*LbCKpLL
z9k)v5Zrv~551AOAE6#}|1(#R~TQO)BXJLDn|CS@mj(mJG{YcrWiTCZCoF|hbceiK$
z9(HUgpZNx?mJ-?$?}OsQy;ymfw{gAVv!BBSa`mQlVgi)K5nJQEk$7h!S2zo=solSm
zV0-cV$yG`QZ=n1C-sBmg1++;({`*3orJt-P^u5M7V=H;acv>@l%#r**_bz9T%gjw|
zM&G5)<~dLme=j9?cix|6rX?#rl(+fm2W=zyDl2`RR4mG-11d@wRUv?#mPXZ7H$#n6
z=)#CmksLUW2TyO+Hk36%WiCvWDv4)wG)G;La+i=^m$^^#=&JS`SxO~3{tqM}g8v;P
zPX4TQ)rM+QwFTM+pa5TqNC0nYf7QF{`S1a5($CSa(I3!1(*I=~fVcov#%YKK9yeYv
zK2aXm7Bx_Aae${wTH}&waWd7V*Hi6D=U87)51|yZS)n}xglZ&tjZNpjOFdv??2&rF
zYRe&9HIt?mlBtGJdnT{Sh8V&JI0f0}eq5-QWMQFDFLodb6dBBv^a(Fe8ByH*h)|^3
z$>~^NYl=dyh!f;~QMevE%GgA?G8br1U#4~Q<d2#a3Pzi_lJs=e1fKkv$q3q|Cc=_)
z_2(F-leJu1<TtBK@2VOEbO3HKqB?lTPoF+<4V&XHXSIu)1AZUZ^p>!A?>G|-MSy2O
zmCRm$(0hE;Usc~E+#WqsnC=ZXg(LnNUllOpk!jrStz=NB6dIbnelAn@AuhTJTc&Cr
z`oTML`gC?Nnhct5y*Mi1-(>PauHzxiGahCSE@OVec&k6ulmapFtYvCnoMl-Uk;Y>6
zT$)S>=;KgGGYANb_iETlu=n{z4bOrFSb%$3c_!%?x_wCjzPtUycmx)Ill4#Z7$gC+
z^sd@7+9g`GHWtyqH?dpjFz@z>ojo02X%J|`XHK6w$v0_2l{vj~TBWbjXV#3L<g1)e
zJ%0Sus)-ZLu?R+V;AGewePb66BlVi8<0@;arj9emO`29!Q!~Y^o;Gpv^hx8Vjjx(u
zPN<wv;~h1AG<(%xgkHF{&eeLn{iICM084>}0c3W6GlIA<c;p(64mvv&KrEZ4f{c3*
z9K!Z4T7#}Lk=UB?hUt(NL)fkIg{un~yuEiOaDJnv_8v<6FGmQD<>+h(1Xi%j-vp3Z
zn#|Bec;H*dsI<uks1+SXCG(aWIt7nh>nO-iJ~AI@;}ma;ha3Yo28W{@3bdy@;<zFv
zpPohGf8p>?cUR@;z6`x%=rVMPI~=`dC~!4~)nc=uG2)8=k+GmC9NNM|8}wX?NAGrw
z9<&TNA+w_B%E5xP*^TEKJQH(H4ow}VT6=#W(oz5fkWe5>Qym+st?hO-9-ZyXJS>HI
z21Sg-5TD5dpfsUTg0*8Xh8lt8I2Z8?n9%$H7hW{euKSion-Dd{?nR3byTli&16m4z
z*Z@Wz<Tj!QbVtn_jvSQTn`YB6ATtG2*#UXzk;ixNyqCt*44MU0K`rL5Qr{M4qdIIo
zm;bLMMw8JG{{KbVJK8exH?oor^&j@v+Als7n;U2ely_FNXXUmI;k)_V_h|jvmhk=7
z?pLMFUQHaK;yYtKkmkhc$aGsw-01HG-2`s$exFDQwd!#X3jclZ2^VIYt)#_FHW$f`
zRIH9CrCij+SuA;VxAjbJm+mO7c2N0m3V5)=2S^F6jt}k}NNo!01R{B=yr#7|BpF_D
z&~wu3>*9kt=bbHKyg)pb3A(<lnLFU`y;p{GTpu6EFcZ{ew&=4-=on@ZC4Q7$+J#FT
z2GvTXY3&~0AAO@Uz!q%EwfFYo{j!4_*7y66XJ-G4q|8wMzngwE(T~=f^*i+sjG@MI
z<9y@EA2#-XdiwuD4LGhl8T#hJXow+Kl>)D+5^*(XhjlGe(^VG*qRq9w2wSUMD;+tM
zjP$5C0Ne|z{APsh6kI+>b|K@rMKBCABftpbq2*jloxK69YWPJVxKqF$G=PW@oA3sX
zX|}@I6vO)P@ljuO*hj<Cv07QLmeYy|&`J>!&h$=Tk5xGfzpRNNVrUc0)nQ6i3^+5k
zb8%JD^}jorLyT*T*+2j;*ZxH2Xi>xf*x895yey8u<t5sISm+&s{31~vrO`+o%|7N|
z6X~Qhzw5nEIEMBO#}Q~AA<>;#h}8QE5F53@4?wyI<sw>w{wluH%eOyIw(U8%tmyXJ
z=tr6p*TxU-ApUhaQ9AL?1v5+=!jo_PMJ~Q}1ub9czHhfk32cnR?<!}Y_jCe_VBC-9
zo=Kw`G(oG;#Ng{Z`S$0J>Dyh@>0wfuHF0m}SRcN@OhqCRNS4Xp(N$ma6~!Hw5(>l*
z?3{~rhG>h{qog~ar~D)-z&54iw#E<WqzFBUnUWn)%ALYf$-WkyCxV3yl;aXFj}Px$
z95NwDMlrc5_u5C2g}X{B+`9NM=Ahu*{Uy~5FB`AK^f7sQy->mKmN92J|9?8g|Lv(?
zs*l2+e--(hoZgAi|HE$$#1XcAqdw8OnCbCQ5x^!k0E2zR+)T<}@@-C%%c1Np?tdWt
zNVQrWN4$1_E>zcaatmlEx4M?bU`Wg+(g||WfvjpVi^(HyLmWZdL;84?QWcuMYAhht
zR0h=`CX?)Q<f=b>z^0UMx-68+v?e~9%~{TTYr0HDqr#*8CWrR&<XeB8+<10bu~AAt
z();V<qgWHEyg%*Lx4>Up$6YA$ZBA}_qp7SYemDI{sfFVs)u(+kKvQAju9-BjWpdiL
zJx@-*mDxbdH$ImE=T3}|z)Yg$iusqW!$Pe1A)xy3&|GxMp{sH-Y3GZ<Axslr`s9mi
zq%t?f52aQyIbe>{snd041NH-En2M3Bli~!v0NGq9dxcq)*>qCA{*NNYg~0#5U!SRc
zfCwN25r9Tz4(m;Egg-w)KSrf9FKI+jO*qIbgt(1D79z%`=+aJC$ji|L>)21eEJLrY
zj!)`Ae7WMTr>n&(+03{6AXn}CtgN`_WAr1{dL)jJ>!@{=a?K8zVIY;mOVw=lqw<9i
z$CK}Hf$TV(nO&Fe`%>;}8{!j`=LXKDBJ>{>rEyVie)c)C{Y&PDX4A$i<Kugfb$Y%^
z8JGI1qEW`9doW~^$K;Iu9tXZ68Xw0xhRVc%(1nf6+ZTKO5QOvyg2v+Ec=DaDG_DD<
zezEWCJyOF}#tW#(VYEu2*i1STu`jGMYw9;St9x77k!PMyKT;wa<71T>H6S`69=VW@
zR@8|ojVPM!`IA0n(@^P?udkERtdEaTo@wnABX-)7RsBvWJM!8m=|@V9?*IFdW<u_Q
z?r*5JOuJBfMko3-Jwlox5B!bM-B@j0VLX#L8~pHJj+)=}XyyUlA@M2~%8Dx;cVw1_
zDDz(jkmMi&&Nemqu_NFM&|*h5f9As}X8vHu?QP}*CBaG>u$soOplk`-2vj=m$TFWr
zAn0%?3`HRVRP!*Lo-K|$$IM4r{CKLAV+qc7+#6>;1^pKGxY+6ni~{FK;F-_yHN}gt
z)qDs!%be|=%Uq-mRcQ(AZd0`xaTFF<5~G338+~Ey#aV?^JL(mz&-iOaAZ*VG<*wF4
z?e#k82ke$F?<%Th6dFh22+Ea?M=5kyyEn4@Pj=M*q_dNrpFQIh+TVr)^MI)%2=;w4
zAs3N5$lGME)>|8`l>iAOs-3IdsXea!j+_h>@Im@`eZF3cs9@LYPwDUJ-x>pr39tcJ
zWt<2vq1%n8jNgBsIe}@ZJ^5^Yh7~0%`BhBu4+STJrJ=8u1I?bD-!{&ruK{Ms>;PD0
zKSVrGZH6{CIoJO}p*@x!U@tpIq>O7Vi2u#ixTmHb2u0~C9}L1xSj;_(gmTqksrO7|
zp@=CffMtejs5cA6E`rcwPQoVM&jnJRQ-op{DO8&c0`St)!W=m9hOlpQfN@R0^Y_jV
zLb$*umGhY59JS>O*F&9I%j0KzHZijUdU|t^>UVrzIyFF_%?f&Q@*%pxNG*Aug5*Q=
z^c?V!L1fOm>M-7Ok74!zqFpj~C5H+1Gix$aJjhZyThv}5)bI_JP^s6@c%w`l=DC6y
zKhPK2^6Dd#k5Vz(<mr>g%xS8E&W*ix2lLp)qs~0FXN0I}NP4O=TCFgduDxjJkYwf1
zc)#f+7YKDeu-}3Rn#4o*39+E3LTJ$o!~Pl+pXG7A=uLBKL%~pkzlxolD%x{SLuIJC
zg-NAKf}5aZtP}yRXNitJr_tX;!!k{oGKD>Ok?0<Cpkl3VNwR#aL><wyflyNfQMDpt
zz2n&v<+j(DaL}_|v^0ILg>jJR+0kHx_o=fu|Bv`zCxicQ)0b=ewB_XA<SZ!$*xL9E
zWsz8^8SyoO|6y6nxBepAzWdsNjckk~n0r*8s?5%1by_itNPU^yS8<|4k}Km!E3?HF
zE#UVBTbw>7r%&%&Hf`NC^ds?At={-i*i9a)*QzkacFTbC#FpQw+cz~|RaW%qC-fub
zaYg({RskwGtf-=6gg0sW_=G2SIaKbF`1BrRl|EeQ-JAW%H;bc9r(DO`{woTlJlDsk
zDRakkHI9O}GQ$mi*c9>1+nj7EzoD$?jz;>CQd<+Bsw`E>82tIxUu&1HDJv?xoPMPD
zZ;ekuCo%LnD&0P(sZvfuCbE6XOJzlg9rPpRfUf_&wQ)onr`2fJXur|>>*e~H`eXVR
z##m!5q5}Nn0i40uC~)UCOQQmJX1i=EY$KeORFx#{mRo1z;xyx#b1hcb*=4WODg|{|
z!yTiBTk<Qd?~c~88IRbk{R*3k48A~Nr(>NcJX00649@(7!Zs<3*Wl~_5Q1o5qha@d
zr1r8_tGUR}$&g6ASXnZLAd^YcBG^END5egdZ5=L<7cZK_Cio|xe_fi88skOEj6k^=
zhGVtqg)phyY)EMXY)_N(=bY)VR;`aCh_sn2XkofvP;Wp4k>`eU5T09qlI=YXbV#Bm
zj*!vy`WTgYK5KMP4Q2*kOSWwnLhR4Zk*cpYj&RWpxiIR}Wua2!OfdpeU}l_Zew`uj
z+ej5R#b+r?gdO{AzS9-5?H5;;72UIiexxEc#b+uD%4dZUu8i^Cg;9&$9CnxX7n)1A
zIkcb|KaRDa3PZCX8idNWB9bx?&X>=G+~utQ@B2<>$^!9Ym33jX0cD8}YeMNHIXkeY
ztSGjeex%Bz>;F&qzZpxs(hq^3dWfKh3OYj2k%EpAbhMy{33|AoM+iDb(6NFR2s%#C
z@q$hebfTb>1f4AC6hWs7I!(~&f*vX8QGy;V=rMxM5cF6<j}vsJptA&>Eoh;ja|A6C
zv{=x&f|dw6Ptf^-E)cX-&@w?63c5(p;{`1jv_jCuf-Vtssi4aQT`uSfL01a8O3>AU
zt`T&tpz8!(FQ`w@N<pgxtrpZ2v_{ZcLF)wd3%WtjdO-t%HV7ING$d%Fpc@4Z3)&=T
zM9`?9n*`k~XtSU#f^HG?1VK;a`u}obG#kV9U3#hZCm;ZPLdul}f$dGLgW@za_fUO}
z%2X){=W=X%Rqw2yK9^0cPrfQ!|JKJ5t{Y|sD)}l6AqFH>T~Z+&50*}~R9PoCUi?5=
zad#K}NHc3|&p3_S-8Yy0b9ybVh&GyGIHH7-00WR3HiEYaBerL)P+N6;54mVapscvx
zA@n0<#}{9~^kpiAXF(6r^055O-_3jW^0n)0x0Hq%pRc?|Lg)&?E5u%qFA7PKbY}Jz
z7QLW!-@jy^T{AvUIi0zW-xRL(1s=Z%`dXfjd}d?)EoDVFze_(-d6vgZdXP0bwQI{C
zZ0q!wZosr_QQFIhw6zI7?Tb65SGT(2bJ07x=L%bHd3gs8NF8}7Z65J<S#b~OzkA5~
zZ@T{Xfx=%S+64IeT%o<9dm!mQO}|gyXB=j%G%hoqw;ksHkDPS$=1EsRvmJ+VDDS4t
zDo?b8L*Uqj1UsOxBbNK5XP(0Ty<}tqbH<qq`xoI5;t4x@l%`9RI&z+FHz*V{^%^#=
zOqCo{{8Xk7r`X6P?73Qn>M02}`5XP!-U;KzjbjgObdG(S%2mNUW+CH+xYFMUxL2wn
ztnt^v*p|2CiDQg49cldLg(6WtZG;r|{tHYK`T{O!yij2)zrYWFH0pjfiwB^hk|S2U
zGZnV-k|CPsaD{r5w;`V6`2PPuy8k~2`~O+mvsxwO{};k3nEo}!mn-kaizoz14ce7j
zLt$1I0$1D9<myiuLZ!{VvL?Pvd8=%7xMUTV<wZ&E*Iz9wx^X!DNK<fie5tY-;39vJ
zqHJTuYUJriC&*=+7C3AitK&<QlUW&Rs6;sLl3>+Xo{V&Y++X(=)~PY{Bb8=Te6jL&
zobDTKjU?FS(e8>i=9J`0CL>4(;}z67Cr8}+^oX?8s8RMJOV&nC87C6_yjm)0AYQJ#
zL$=eF<=dPj=U;lWL;D5d$15jCD^@m@V09{;B(c~hj>#=jPHr|FSY<^u^y674$r<C{
zE-U)wwe%xZCSCszB)1a$KZ7uU|JM3zM{0|p3)l+p|ECZQcrP>p)AV`zT74_x0=DVT
z>L2Uh03UP&5JIbrvyGdK$BlQ{T=75pCDiW@@<dOu(7;-aSv{kL>eF@x@+=o>)(jDz
zXAX=0?a40=!Bsp0hfT=dd||fE`l*-rCcl{1eByD5J4l|*<N$<zI(wBDid);2oM9z+
z@>8QH$6_r~P2I{S4>S34yG2*zD0^XL@x?v)9j%?hq297S3cYy78YooY&g+~|foH8{
zB752EmAH_#dzddY{r1*&p0T2TShdlf8KMw?Toc;CGlW3^^;JS#62#eNHCZFd;bf)g
z87HdRW`pP{V}K3VJW^j~xN!J`Y=JC??J(Xa0)u*fmV5)evp1Wtd*S9SEcuf}KVBFF
z*m81#U1s{~+0}Ystg$c*Pk+Qvhukp~=EfhVv0&|<{Do2K_EY1Bkq5O?4o7Qig$+Uj
z-~XRa_5Xc<|2YF=z6$&Q^Z!Q&v*XKG#n&@qU$sqY+5iJfNb1MNcMoxxS|jmw${GzT
zXW_M=HDoXtmJ8&xVIP(iyAGxwX^LGRU#qNM$i#Zcgnl3opZJ(V$)a&Y`i6D3O1&-e
zRl%mj3tlr)$1D$heqn^`bS3CNxNQ2KUGyUrZ9^Q<zZG2^7_0&V(4(f3tn21ypChN8
z@-te<(kEMGSJn0LRm$~9m-w{p3|sM2Kgmr`OeiZVxte~Y@-)N|=Nr6?N<Cs6A+9e+
z*=P{Z0G@oivy+OyE-RY-E&WL8ZH=!`*Z&K^90937nQTmU2tdKBGS^k|z@?Y)O8vFm
zIqCY}m%LBN``Q3)Hf;W0)Q9WG1MBAo{T2Olpnxrf1mG>l0sFuHg2Fa-nXjeBXNHB!
z@&W~&?J`(5`KrVeTBWk%=I}YNWv0k9{w6?MaGV>ch^p#24$NiF=+&upy&zXBdsZxT
zA=GFGaw=>$!`N?DN2vcOTPi4CWCdVL=&Zo3#FBRMTNQSp(gww|B;T0hl!dBjWwa@8
zRgR4`yQ2V(0h{~*lZ!p`*5ufx^ZP3z05aiTyLqb*GK!tjuYsAPFVOX)9ERQe779`V
z5Fu0vtcOCVt#E)3v#uXI0)3ZYHo$;{wQ8`}rW{5T>Dvk>P_S3Xcv&K){_0@TTdLP)
zJB%HUE@DZifNnR+qRiNm0Ye}hi|OO`?!B6wbGixq0m=pA%x+D5{XdD~|9%T}uc?Uk
z)2Qj>r2ojk1^{Lq=D#j_v5JJX0*>H;09cqNI2XZ~wTVu^zNoNd%+Gn5+<QW0S<&Mj
z`jO_~`gpCfRsaJrOMXQebot~7?*$xI>dJVHvfGNpg+l#c<x0tY-M({3WL?~3E2YXZ
zmYQ4mGLrFgZRIMcjQ>JEQl(YLtCfWsOz>tg&Ci!kkPG+R=TML}@hWBeyNpRW-}<ZS
z8Hj+|XV8ySj7YpvnIoiw&Cb_@?eA?akk(U+*rK~{$0{k=*1Wh6{l2GOs?zT}+=_O%
zStW^XT$th-ak7*ZF8@1-7-#EW!|v};?RIS;{D03S2PJ2Kn)pU#d0f_Z5`!aCa!by-
zdOKus-_Vbgm6|xBu_@ZfP-jc*gqo;_A@8{I8M5Q0cv<m&#q=X3v^*YCR_mlUxcR9=
za)IxJvZ6az(@)l`gUYY2sDj^+$b9mUY&-nnvZA{oskvL0)HKHty8I;lSd}j0yy0`+
z3zBo@JnJwF*Tn<M^GR`r<Rd@h=ZS09I;7ATuUD2c+i!#OZBLW-0oU_E_=W6S5B=;0
z3_?ZyY-(O~mcl4VYRFq#hnGz+)agg+Igz+uc`BOafba*OS6k>mvh%gm9V(vk{{zTa
zLf#@{wLaQhZIgDt_K`k_T&<UpI{kFuef|^C{#F||8m|!Ih%lF`o`Q0-CP1U>(ftW!
zFS%v+B?`(3j9|K~16z@UlX)&yP@z<WsH+LkF}x+=FkHqq`Gf=5`3lUdB*gbDRVtsI
z&0$dvCRHGxpk|uHX6@V@>|GKlr64Ci<Ec|fFg?Kp6}-vPR{fqM6;ydPkPDt89Pw+?
z{Uh6R*)u_{b7W5VjS5D*cAIg}N|n^2l`y@4!q611VND9XsRG-Za3wWj;L?p&m5pJ?
zHXWW)N9;&TttMS4rmM7c+L;9&FjW5kD8c{x@ctVF6!0QofuD>xz;|gcX@AmneJJGr
z$LoImV)z5!r@scNKzC!bG1sVs%y5VCfU(E;ILRyg7pRc?+QZ>^4iW<9tdTB6st&VN
z>Z<Kn7h+?}corhw4u-6F&N3{8)1Y<e2|2Ls@DgHZ=Q&S^g6+nb5S(XEvgr%b025wt
z_Jb(-RMtQd6`nO1gf>H^zxQ)N1_e=Cs!u1Y$<l8{NwWorp4Fn3D8Fu}%JeK2x&V4Z
z+S^+wn4Gx$O3}~gbvv(Z;TB0RXV_1BW{U=;S0uAs&#{(kl7`T8yd^{Yn&d^DEJcQ=
zv}l%W*Ll$_($>pU&H4W|RR2Fpe@0)X{ZqSCn?znAYkq{WyfKbomWnu64i(FGSJ@Tb
zaGcN%e>+6tqt?e;l%>R(4!H2$wfN(bQ}+TtDDQpxk&;*!Z&qiADez><cql(ZTWH?T
zjKFPdAXdgVE4wCIJdQ2i$K<vfPAZ#P`7QlO+4sdasapbO`Wj2V$IUaDZ)NGe@8pej
zFplW$ibeq$s+J^bcBY<1oF$juSm(gUu8BvKB?S~ZF9j};Z~b-LKmJu#+-)BHNR?I-
zM_6{%&8a*o=3_R@;3vpyb<F?8rs)Imu(JN&PHmiTbCR67=#;YQFMUTpQn@()KaG%S
zBtWhr&y%mU8QS^UtNIXq5j6g7`g=xi#QF{cA27oX(2*aS??dH=A_Y7Y6g6&|&9#xk
z9(NS{rk)8$8vxxHU~sU*>K$2`<o$CXY@Jh8$8X=FbUO^R`0ckkTacw*AMkJSRhp4H
z?<mNEBi@oDyd@>x5%?-$BKu+YI1Ajf-f<*-b`1QKHUfg9fkr`OwtFSPV5mxfRt$Ti
z6M0(arLW^Nqaak4FznaPTxV9E@D7$K>d%BYXOMYge&Prp!!C66bWFXb(a#~U#sK_;
zBOnetqvJ*pPqEB?<fv>(CDIJ+Z9l{Crlq@}!}k{f17x!RHXn9_<1Q)rezb!LT_MZO
z`HrrHsk@^TtJ6yZ{V?mcVZU+IFC`x-1{h7m3sBN918yAl`r*b3dj&=6iGa}G5A!>6
z{>gg*N)C{DmiuQM_ciI817^@ib-r~b2bmid<???&F|IR)K>t4t7Qo}kvjljHKl0z2
zgswb6XP|OWz>gG0$JX_uxj1LX{?bHNoj^oNMNmJPIi>Tnb?Zh>yT8?8ovBF><#iwn
z_yg;6CKL#{^7G9O3AGN5Z-sd3K;5Sz@au$DFJJv$^31p$4%usrBUGg-UV|+%i9KKm
z*%m*eY+9s0{YWhwh$Gg#B1$9;av+=0<lCGiw~wmj9cr(P!_{iUPecRc=_M)+(1E>F
z2liCt)pu^;+1NK)D)s6(;?OJN-z^TO0ga$#N&O&+zj@i~pFH(G>GhodUrLONj3e}y
z^d{}!i2HK@X(I^E@csXmB@l2EjuR>hsPr~EKXtfe%Eu1<u0GL2Sz9N04AEIK3qFXR
z41C+Qtmv+%=truZx&*>v!kbp52T<c}Zw4X`M<lVHBKPi%I}|LGKrBoQD3vN>TKX(3
z7iQ&>1@Y3np%<V(VDR$j1gUV*M4qzIkfQ}(zSETxe!JSCq{|asm31U()4crDAvtR{
zb3n3To>wKhDBF)&0}WZD4lS!<K^<(~UY$UYX~iW*Mz50LtjL{<pa+|KDg8+8vLRt8
z8&%mD{pDw$BUhDA=Hvgg`=!Jv|KAHCKN#}g<Jv#;Lv){hh5oj&zfoqKZan_|=Yapy
zPb%P9I9aMXvczd=Z>ANiBadr&AZ_95$m3e>&agA^)F`N7oGoJ&R0+0Lvnnc*4oqrQ
zlD6R!PEybU*(w`7^$Plr?9u5t?HJ=E`z=AbO`J8l4GPWUWZCI~*(f2y$jt=*Z<BAd
ze%cYx0j|}WfCcop_NCqjk^iRZn}7^{4<!Fz7`=>q<7lJY*l3(#v>DGBzx~gQ^2sh>
z4|+O>d*wMw2!id<vKTKgS;&>GIEq3dYm1ebyk-L{HBDIHOSXhUMr$=j@l**(xQa=j
z2vV2Z>TiMzQ?{oQY`tfzkOpTN@9_$`+8S?*7i{PF@r&!cb74EkYVNifF1<zf>>NLN
z%G7n^Ca)VeejQx%rmY)4Vcmqu>n2ZH$2^81@1`+p5K#@X?{bLTd`&F=o97NL+uk`d
z7{N|7>G8};$zFdu7h~@%3^g{Ifm$C$^=21t=3sz3Q?K{Y*UyIhB<zE~28{^kxsDsX
z@0?=>;YwACNEg^W`teohH}lzBuH{z#JBuLes7Jg%@$$QQYwd(cpw_=>Bv0`su4vd<
z;+@$5;Jk(g=%~g0H;Ae!_0<ObHGbh$cs*AX?4-c_VG1J2!oWdnz~eUDA`-!l6B~Cw
zlSO&%8tu{-qB?0k6-Aq<<2ee3;Ag;wgrQytfHMNc_Ez3<?9OD3QnvO^-f}yaQ4u!J
z`8~Yz>|DXTAgi&5UX1LA!lBJLz)w~cH*)?T_&;YFhJG&a|L@o4l0TEv$dH=E{>nSu
zEUgmkpfi>E<jz-LfhfHP{YWfGbpqkN71=5ozbIciLC!km<Feu|d+A3?W>o?KzOj)~
zVX&=EEcuon^~baD;WoTsFwtLG;5`S{tuQ6?&IBqbkctIBzTH`JvEg#yq63M3%DZ8@
zUr1v{PGBuBdBL%h<huJJj8FWgi|ll_K7n}LiWo_mlVE<vPjW|7QCabTY4jsCP&Cm;
zc|YQ)0?l{2azbO$pHN0EXe9|6g&S6=DqSNt&ym~9r}>->*klf+AF1q{61|kYHyr_D
z9id~%#p@Q9P2YAD{YVLO`5)r{{S5xU7wH=CzYiu4{21~7)+7+Sq)I<jrBd16ISBxq
z0SA1-V;49KfSSZm<@qT~ADS<pAv;2UbVw+WU_k?wqLWZ$JQ=~3LDxzr$+?wpv5~g#
zN?COlNO+V7wjF37sxJ$Gmt4_pA0SG;r5~vSwDw83(fjw)m#8$<%w#0qT+w#Z2=qDb
z8vMj6hx%^qnHY>5DH`S}uu=IP-$TxQd<@HuYr-F;3aU#W_@JT;C_5-`cAQ?)`Uxzm
zZ%NRPlvHB^!3PzEs`i#E5TV(a-;t}rPVzL$|98_1iC(CmsJH8XGe*Lz_hRFv{|sOM
zQ!4*2)PTZ1JCg$usMVc*j&m;C753-$64J92YzFPvFwf6(xC|xDI~`rq6$Cn&ZtDu=
zb8u;Q)JCQS36i@z=l>@W<7Q(4nFI|$srIqf0uO)-oqOi01R}hZY6n9q?hx)TwLfc$
z7?$I1N8a-<I?K+xb7F&I$iH<7#6haf#Wz^qSdg(<%h<X#2UyJ0c{lvCS(;{BwZtJz
zvy%gM*_uYq9aPT!6}jnSA_|<n%p=HPQ?BS>)-2d;KW(<8B(~luxyl4W4*GLpoLZC1
z+|usM_^IXBPA{8k+(|!D#h#qVXN>f0XI8?RO6u5V7oTg3uU)`f_Uhvc5J9NcEZER!
z*0Q4$5?*9L%jG1IO0+3b;4C6=mL8Bx=dnG~yleYiAQgXE;sCnC%+~-HHqh1$(>|uT
zMc%?fIL-awZ_^@XbEKd#;PVIR(Xzzw9%R0juRD&o^qY<JVL$e|c|SkqX~)q<*Z-gJ
zKb_|~rz-+K@nk`_3VMp5t%9B^=xKs(6ZCXJ&k*!XLC+HOY(dWv^jtyD6ZB_-o-gPH
zf^HY|=Yn1+=tY8FEa)YIUMlEif?h7@6@u;%^h!amV)SayHH_}`Tr22xf?hA^4T9b%
z=uLv&Ea)wQ-YV#Ag5ECZ9fIB|=v{)|E$BUrws~TL#sy6X+AioWL3ay!ub}q{dcU9#
z2>PI)4+;9PpuZ6Gmx4Yb=%a!@Cg|gWJ|XCnf<7ha(}F%D=(B=8C+PEnzQE{<o|hQi
z<9S)oR|I`k(ANZgUC>_%`i7vt7W7R)e<SEyg8o)V2Opu&z_(Ga&qaWp3VnuNr$_Wt
z^z-z~^&4RU_z>)ZU)SH)KhgIZE~B3@4E{iqU=z3ik;1EuMnnKQ3p<8ujXRC|j3<nj
zjkk@DjnAFN%}?k5->Ly)aTi0=0$Wk4<GUJ~Zsg6uVSt`=4Z%@4J2~(g>@wNdfn~`<
zgy{LS|Ka#kAW!a3kF|rfLvTBr7ZH7m#-C+#kM@!F369w~*C*=paLmS%zC*tq$M4W*
z^^c4$IR2a-8*_{*yt5}ezQ=eD#|P76*Z!^%I6jsgZ*!f8V}|+bdc*Y&j!&fLyA*es
zi(@t?b~&{Rlwum2XS)2WD@Dj;W4`N>uIq8k##PrFyFQ5HztU&(`sN*ga=F-XOCIvC
z4`at~<b8nS@$|S`_io4GxQHF^>~;f=SF_{SyM2e_P4u|?-0mxJ%+`bM_jZ36$87HG
z{%MclIA-%oj|n|maQq&<AIGoZ_-l6jNl!TP8U5*T&!6?Y2*;z?@gqGy!|@D$+-m`j
zE9h~rmR@(#@jpQW{uk-?nZEi5kNnS#k6|}l2#=v7bg#a@-VO1DK1EE?H?<eEN3?d9
z5YqbTuk$s~?YFee4tVc?Z_rk3ojIW8fID!^*2n{99Z-s6)^~>=HvG>x-b(Ms@pc^7
ziQ_3aE~m%C>W2La$483e6L5S8J03X9gJU*+hOQZUKOuSlq~~$G4##ZW7_w&w@{q^!
zFr;zFRXAqjWQcpnaX7w+-tXDtc^mzV@jtz%^sdD*%Ukc$dq0U|wx0L?YafgmgRPN$
zs{0_H#_#B}eJ<~V`NGA<Qs1t9^KkqbJ>Pdy-(zrmI6J<e@0B=S%#J_n`!$Xk)^)$~
zek*W%6+PeYfqoC;n62Uchx8wY;}7Zi{u}$Fyj=#c<LCST2FDZW@qmH>Fof^I#^iu=
z2V8+;mj3~t4EPt08PBp`;eN1;>%!LS{qEZDJ{*5VpWT1I{r4xN>jCVzcK?kyX5)PS
zXZC*?$02%t;IM%hpIt9x$Eyea49ATB8TjXcf59>1Jq8UJRD@%;-VfS1=p7t?K<^)P
z#-Mv}yq6viUOpIQ%wywxaAa^hjz_ZdyWM?pd=x!)o9+f2FJi~-?q_g(GClU>drrbJ
z>kl|SnC}0(kpi@iaiG3kKU|BGuMz#Dz@dMxOCUI@^5#54$+^?|3uScJ7uO^Z3%ns$
zaBk}k&Z=3adQe$0N^WU(N~m>G;&5yhkJ4MzcB|i0*Zn<p<l4_4WEFIE*>Gu(yD5RN
z;wR;bSZu8zCl$Ms?w#B-my}HlZ=fG(ds~?p-3bvwrolj_{Q$Y8&aqW`CPtxE`s)jw
zZ7!|l>sV#pu~wb5%|D)1_O<=@lgb=PjHG(G>1vsA(D^&q0+8*m@8-!4Fr{Q`6C<bz
z;25=@nPn!CWjJw6s=h0wlzL#G_k_Vec~;Z4dD_L=-}Iv~5B%9EFq(|V9A<(4ji((&
zyS%rcp8!56TrdjJS|^S6&fE;-5Na+m^lN8-nd~Pg<4HJ`QiBv4?+CCzO@QQK?|Hh!
z1tprT)F=BrQ%AEHLKJa}g~Ar#j4kX<cdT%=PE>u<^wBVJ0T5Cn@JgF#NXQ9C0nEz`
z0wjq!^vuL%7=7?JKUeBPTn3dq!kTCNXy(?F@iyw(x*`;=XZgIL!qqxb^=%VIBV=ha
zPzP%fF{z1G9z36b+^`sa7g4yS!0U*%MpU`%$RXajtPX*mdHqs*6GT1rE@3E_t7t$d
z#B2oE_Zs%*FA7~i+gB|6#L*Nk+|S~vF0P|7AR_D~?>akZNsWx`p_@^^C@(YRsSecx
zN`Myei85E~aMg_99hM?em<w9Oax+Q`NnbaNI2sRT=Lp?*VO7Mp3BYEE@lG@I8eRXp
z6O+J`|7h5E{7SFWJ^>2g5d@smkM_4Dff(_{+Hhxu0bubW@Qn!?$%7szx_@4F(#Wy+
z9O5Xv3?!ydRe27$#^mb?migi029UIcL4c&SpzbKQ&}Mh`=<ZW#qWH+J#j6vOseCtw
zMMEk%wk##1gtb|J6<m4*fBiwrrKxyrViGl&80kFer(VC*#0=!4gN79&<LA2fPboWT
z#D`@k<sU62(2|%)Ift3fi&-iGtYl5Jx(d<vy+sV29+q!BHRo&Oj(#48y4#SLKv%RJ
zu~$-Q7x^LxghHnXhEd8BwK+L&!Yomfi=~2AC&p7wCCBoaN(|F44G)S)@gY$>`Aq-q
z-|}SgPnD8cl_;PMmhaqPd<Zf#NI*BHO!F*edRtFPazZnuw^t>`Qu~(CYHycp8714s
zhL0X`V7KY|-$y$Zk`e6$ZKw8<t|8L*I@tTZi1;59Am6);%20m#bEpAFy)dHo)cH1f
zm%w+`TjmS<T71ER#ZgQ?6+Ry`_#3wW!A6PwGEnYoXu#6t4-RQ`bazeNQ!umI|JW~>
zH|mgPN8^6W?E!Rn096KAcOP=Gqf@r!kp?sDuV?nFLr!z_Hn83=?1YExa5RXw+}(tj
z8Qzsq06OA;j`krD<;S*IA3IB-wq}{ZEgXeu$PJDj&gsm}g7IwFS7Uk+)w_=6?IcGX
zyXC29RXxm&#S?cZw92f<5_qIK`N+8nj}-c#9rP~nHSmVHN})7`z9z(g2L|{8)6bC2
zhn&s#|BH#SS^rMIP(M(6NGl~zlf@4GUFmdV0>Q$g`gG@+D>eNtppd8DC5;R&tSpIt
z>S?n-f7CgD5HtR4X|in96UQ*sa}H<CRHAe_=Jv^>D2_Zl@k@PGb^f5qfq2<+?R=fw
zom^lKk}a773E(NI@gv2QGhEWd%3Yp}6x3#ScI<IOM4`*1La$F8MQw6(tPmMRhV_0>
z1TSDkO#hxWWS&T3iIhZR;z-q|oC{u?TF8UD$NKG^DUjdV?9Xo;5fDihN=a@=Aab}G
zr$8H$v2frOz}Rt4!RBPk$ATp~=y)lyXaeEHTl8ZTSfWAz_RkE%(xBE)foHwbld*`}
zoUV}5|GtA4GK-aL?UI;^{@PtHRTv~of??`Mf$a#bSTq|v1W;l&MtGS!x}$b^k|*3L
zRRCT8hmknJ|7+wEt(!IiDBzWd{;^YgPWyxQHKKtX39VpQKOg8{kLiDc2JkSW$OwWj
zxC`38-ziN9Kk7}~tH-g@J@;|v5q1L@<7zOk-1XvV?!VJ!!%BMM9Pz8I2un0vNm!Hx
zAD~D$Pxu6f!m=Hno`<-@heJR2JRqK(i$U%!2Rt;Lf|Cf_zvPZEZI+9ecmk>GPjO!%
zT;I&vo*S|j0p0@JTsV4QHyEzxd3;<HTV`K9G4AcsHs3TGIRX{yGtY=@+t0L~Ux;d6
zL}8+9c&%*7$KUw;eD?fv2f6f_x~I)~H{eNdUzd#Sk7t)?1v*TNX~d|)P!(Vz**l*V
zS*6#~vy<mRQHAt0OAehMjmXFQqdZ_q2a~qvVeZFcxo!OPX;WCLFL3m><RvVRn<zv^
z2=W8V7<<H$Z+XtSf20dB^E_>07{b_2lmG*DVU2f|Utm-}&x6Y(?{gl|_j1>wwv3IP
zr(IM}>g=&B|Bs34vD?ggcJpR_aT)a}nhUTH7H<sTJeaEsD?Bgp_1{N~?TG(zjeeAN
zw{{G9gZO^5AsbF0p7&<`D1~{>X%sjOkJa7#J4~<Di8-npz*&e5Urz;b3!~f-r%gVy
zVa0)BsggbDg9$|SZp!7epIU(JCl>qpX2HwJ+4^v4wr=g7n2lwlw|=}*b#^#uC`>Hl
zmnKW!OUlgp1OkAou^&>8P4{cogJ)ec*r6R85(xDThDu?1ww)aKn5MD}%alPry*0@W
z948fNYvMRmuc7Dg1WL6iOE7|I$acEOJ)0c)?{h_$8X@JNA;H3btCZL>T+%Cwb*!Y$
zl1nd7mbgetj~Y&_)n34N-gnT^zY0zLyU^GF8Cv@<wSBOy=msC){ecGN)ki?5KLMKk
z8PM;~gO-0O>;)=eF%X2c&=%MWodJuX3t=;K4XlQ4huzR_SPne~+o6|WJ@gjrhyDl)
zqR;fb`nTXAdcclo5G;uff-TWlSQ8xyd!iy(6qUoKXf31;8(>$o36@2t!nWvqSQqVp
zebLRZFp9&*=ojESo`apy8?ZF`J#3BsW_)fy|NGM)+VHrxVtmhRTZr%3ZOidJrwwy?
zUU3@`o$}_kh4DSF4chO#1u+-C%VJmn@)pJh<9l(;i|?he(fD2#n}F}-u_N)lDmDw>
zYhxw&ULRY8Z(oeQxjMEU-)5{1-?gzIzBk08_zuLVhB+8V*UAgUd*Qn=z8}6L@uB$M
z6o;Kp-sbob_->9*#`g*F8TdXaPIJCBPIKNGr|&;4PTzleoWB2zI5g^cXUDhT``iSK
zR`SkE^u+fC325E(wkM$5&$}>jD84UEjKTNi30OMh?MTo!UzLEiId5m84Byu!puNw#
zA+Z+UHz!Pd-;$s?zb(;>?>pLI=aYALdv|=dwfDn!tlf?8L_4jSUG21H?rk5B@B7-P
z<NLvOS~Cx~&%^gG+RO3%%l1|HeyklfNO@1R*W>${_6WY8ZKrke{4Urs<h`(qzWJqH
z9(=#N>mYo;w(D?wzrJe{zJImr7<~VF7tQl;chTB-XV)@(zqgCpU;J)YExte4)rjvu
z?xK1AcsIfKpLf$d|8@5OeE)qnt>=I2ruF>!Zd%V@?xywp)oxlFdw0`%{`YR$j{A16
zp!|Pdask2r6NvtIjCO|hOT_#;M&F20{6}M?;WMr>evO;{Gk=a4X5|Q)<DFRxoeb=@
zOM)8!F)k#wu1lSzMb?KF`GCQO?V^Bgb6xEmZzm(MMG)TMLGW>O#)p4ZwAN&-r|YV@
zE-0#PRZ1CeC^yH<sg73pXpX(3l0n56_$otTCUJ0G=BT`s-s7vLUffJ~NLfGEHJy1d
zVtH_<vo<U<NlOjF(>}A}cQ}GTX1*ijt8T)^hvoP}XUUc&se+1Vc$2^sbX}|1P_%hw
zHa3PsOqf&aosD<!L@zqd1*d?H8;ZVx?MW7xHIPaLtHnOeb%mo#PDV)=`?(+s(UgEM
z%F27CBN9x;lYBQv)1MD40iNs2)gHy35D1lpEtH3aHw;Vll2Jy5LwQ38p@TaC%?};%
zz#}>TKaUt!7*i12vs`;#TTk94n9(}>*V->p2IeVWpPs`@!B0`Eyo=3-MsQAaILtS3
z$~)VKSofg<hfRvZ=A|FkoK!q=ouh(qYoZhkx>oXib7Y8MYYrI}Ihc_++A#-pi3QZ0
zX}kizPFtUg9aCG=Bo_(2Z}MEj>Jbjia;uS;j|Rxg6;eLMy>_%!P3}>h_Og@y@Sa09
zB8hoSq^3|}N8v)7)0G9=UUNuxL!zWJVnbQ<z-n4Lx#ESTf=e%uxaReVxvE<qN$ett
zVH)o6izE(}lBiA;t8QVb{4qn)l_mSy1T1T&6Fx|GLu2c|)|=}8BHGQ`Z}c8oZy^3`
z00!901_5X8Gp_$X;|=Vn+F1_clCa-bPzdytAQi-N_|&1!u_TgDBt60_`~d+oJ9I{e
z$?%7Y0)SGc)A`U9j*Dh8nc2QTOS5;WKkTbzkTOG$ar8P(Khoqwtd(FDla3A@?}#;<
ze4vmT9I*9e=#d>}h&tdl1t4<7V#CTX&QUp+e18$s1&Jab=g8EhZ->4CTp8?rXj;6c
zmO834t&cS&<I)VRaAaXp_j7<?DmDwVC4K1P4r{6yg%&k6-<kDDrhq9n5Q1QCGhGQI
zSOlu6P}gkYsZDmo3r;^@4d^4<Pf9!NStU*WrgaOO{9!+T`y9UhA5F;7MzfIz1P~7-
z|A&$tDy#ph#KI2!fYBd=;7Y1Y_yMPmd%u3-rPLmwr1+cRjw@$tUScVeb<KB{{#f3L
zV2B9TQCr8j^ddj{2DO%AV~7>iv!{a_$ZJ*Id8YPVA<e~`6H9uKt+~SMS~EgnW*bq%
z5w4pm4na3Xo5!=q=}HqcimW<pQeNDNl$SzvV75?M7wtxcz6Rh&@sypeY#8O7az!Un
zMwIj_e<PS)n)obVWeZdoJY}aV^^PfTOq5dwA_o$xwYH0*2xciZXX$uTdu&fvaSWi6
z;;ecOCXT0i&Kwvo)-)G|O&ZUTfw(W@fk!=iY)+C3920DHB^IG~_tZ<A`6O$SGb`y7
zL0LrXV3`F6KpF!nh54S`*B74R)Xa4K@1{>7`V>U?*`dE`^n?`d{GV_?Rp!6{yZ1OQ
z|J>k>VrUf5uV_+8(>v_Qk60d|aR>yz(0iUEI*9cF6Bv7RP^3&pdYg_S5$kh|)xf$$
zji-Gq{CV#t=ao9^NgCE-F|{bAX$#z{-lsUrDKcIVHuEt>Mj`=Fto<wpOsCp=zN7fd
z`U1|7z^I$CJiQAY@jopOA%<u*QmTe(JDDV%o_in7*Z)Fl|2smzSs$w1sEs5EQrMZk
z9Y`R+eFsn$skOggRtQ2YremuHGtC!?>~rLi+b(xl6E`M+TB^K0AVLB{cVK~-2|IC`
z3!b9w>4n`+DZ6sHpME3`U`t{(W@`XTsLj@e6!Cr`*ixjL84hZX<D~`HI?d6M1Onf8
z;DnN{U)YOdY2syV@|MH6o|oAEJUPX29R>rovNH@ATYaf)i4F=1UP+IO{ANHH9qsAh
z26FX@-#Rq;Nr@H6iIK~6*}7O#+kIy3Ju4hSfLJeU>?9ZHc#T|g{rL{*Z%i!jM3>`b
zrhTr^Y-;rRxpBiD+tZ7;JGFXMVp)gwzv)&NTSoA`VnhWHSRS>{e=mO1sbkaie+bz{
z@c#n&i`Er>*vG;C=QQmq?E&Zlzl7dz3Gja}fiCY&{ZnIrG0iA7qR_}aWW3jzIpRmX
zm)k+?k;?pQZt5UT3pOdWFnB)T79e}F=Niwu+=5~cA{8;7ZVnhMI9PCq)IVD;3O;id
z4eG_}`8^Ic>pZGGZ*xPMJx+YE=QVD)vj;n7Hew(G<Q?XZ+$PDs-+10kUbW?aUlmtv
zr#a6%9B+0{NpMq0s3k<nW;XtR?0pA(9L3r9?5>P07fdsj?reOfxM0hYZCSSIvfN}#
zva#eM_ml1<oqf7HU$HGyj0howPUtP6cS6zKg%A=0CXmofNk|}+Ktc!!H6av3;QLRx
zyWP2+(~6fQU*6aLA)edW-Faqar#$^ZL9i<l545uW{h_i*_rsaDjwZ2b3@3sydVb)<
zqxrLN1R|XYkE2ihWm-3K1IpivF00s`(qD@&wFm+QT3<EnY})*B)W(p$&P{rDv7|Xn
zN<0s&9k@Bl(JiLG*kga?7CCl=cj>b{PVTNHewuxa*1?zmpT+k=d6-it+{qxeDdFX{
zzR9hDb|DRwF95khhPPPmg-Lcck=xtcv<X`p@=#|M-CNuYsJDHt^d-@Kx=%6&mEr(N
z5oZ?0rEiF8df`_~U*Hy4y9(@fFN!arV*g5i#p(Z<1XBC0`VV2>cL?<F=l@rE{(Ylc
z%bv;{j=(X-c6$wziR!HB2n2mm9Kc~Nk;rbwL)Iy+)h(|hIx@6HTLRqCX~;6AM$G(H
zG!gT{HWGQRxbrjJEQTymYVd4cwY+(9Uy#PenvqUd%HvE(XNSX`$oR!}pCNHaZ*+yc
zoz(x2cC4ls|Gz9R7TAVh;^UTvBEdv^yWhvQ>LCG2|Mw@`h;gp|HnRVGp@qn&xcoQ#
zJE6zVNor@}J@t-FH+lQboc#HOR}~aptjEV_YG?F3r!?|N3I(aL?hF;R)jhDM6`h86
zyEDAKAJDy@;l_GZYvMgEec&q;rxnDicBdFg?w+h1dT$?wUO^-5vM*nCw~CzZ9^JDZ
zLqAscJDYEPqImj5ACX&H!wpB={RI7!*vxRxI%+Iiz@gR5=1_7qk0ND6tX#VJLDjI(
z^<PX5q47T|^(XbY+Vk215+yI9DD$tbCp3^8s|~}HRfPL&TokA?=>N(;AoQazIHu<|
zrCi_F6C6mEYt%VYQQcys%<?qA)W+vo5{4qhkP8m?Ff@phSgAx4>glAjtX#d&<XX$;
z`{|kCSqv?jFfM;5ujp{D^Pl^jw-1)S9b7s#VuC@U>uiGcLf!U4{gUSf1r_Tn(zAh0
zB4^F8<#}v5A@axiUno$*{VIUI7Z);|HP76_#C2iXJERm?_<K57=os}UH@87%4P;)y
z_l#=aT-VdyYY?0qXKrB;EDXc4)jv{*o7#KYdX4{)!;r^0=JAqVNEz$}Tb%x9@xQm~
zcfjJ$Wh{lw?IW4RzX$Faf!;<ysY5qWxwDWQkzF!Ae8_S~??4&g^H2hoQMwIINO&e#
zW)et*X@RjQdo$z+8`1<pb1MuLhpcx*_H%^=GY){8H<w=wIo^qS1kH<3Js$Hx8giP_
zk=!(fcqNvRukxLY^=@Wg-i?D=GrfB>J^u&71JJnDI7)w959-6T3$^Lw&&U8gVnGk`
z+#jv&uRf{kH%AQoE!z8Rb}-C-X{+))KCuTW?N2JC?yRq^Z!E75bjDz4+SGw)Hu!IO
zN0+Cz6V709?ws>+;rnYY8!YIL-O}k?*Mp?@1&J7n-k|?ma|^GeamU5V-Zb|hzdb^r
zs|^dA!W#o&+Hil+F#Q%LgBKkAsIu<uJ#n0+1)WgpYv8gR4TQ^Qdts=$I1$>2F<S(m
zF67~ZmN+9w`+LFL%?~o>Xu&b55z=5a^&r_j;<Xg`@S*`mrX|hK@X8u@sHecH9;CK!
z)JLfYjnR-zQP{IJ`h#ty?`40AVJl?o8SdFcPvxn-)L!rPA#1#+VQ!s=#^@<q)Yw$|
zo=u?xj2n6))H|twZ71swtbwDk^2RV!68K8g@Dduw`o&XA-_I{A|9yslPUd}+FhYRq
z!`0s;hphBHj`M>|Wj|C-HhTW|*OwE0xqgoRurUPM|5Ns8|9d;}_T2Af1eD@E5ov*{
z<b35&&p}UG-O7Ve3_eq-{<glA2nK!OZQQ_a@Xr<$bq}+bL|Wdep+UxAe9qOAa|5wB
z4{(IgKS&=)57NQglrl|gO;K-*RaDKj5|G@p*H2VZ8J5>)dp8GQu*dY!gMX<`b1J>m
z1$7H_s-9Uv?2hmOnFqHNhIYGB|8K3qk1!@&!4%-})@YaS<NW_ZV%$I$8b|8S=u6@G
zcez$YuI=Ru=ihGZ**1{O(cIuW6^wmjA_T)jzae1puA^?E$MwRt;g=~lsP27}8jizK
zy;052iu%fTp0=}RXUenl)SdV2yb*ubJ>0YN-km)*DyrQM9wI;JT*I2Tdcud&X1qQL
zqN!CM-+Pm&r3h79)pOO>ZtFF9J2IZ5m?$S^YwFn!F^NuNri~tM>$;NZ^?ZL9cgf$K
z`9)r+eqU5uCbhh!=VWTRKB4z&n`o4Qdf1zFa6Ra5sersZ@mPwae)BJ7`eAF&NmTYy
zAkbK*?RC_ujXAD2`s2(so#v;Z^SX4m`kprCSf;68xO$?TNUx*kM5;BP+<X5RVND&o
zU`8imhwRQTBR_6tDQnP6*;Ti#=LBk@Um!VrrkB;sQV8U1mNMI&S45sZb)ooXGNR_5
zu7RYvP+&OF;N>;ZL~AY$>8F;<hA%mRKF9Z0X+F^Ne+c<IA%E8<Xp0f~?{R%Uy;Z+j
z{|$2e9%r0ve3Nki^Y@JZM2XU{j60o$qvfVlPE7$}$vvp;P-CI}In&tH8R-Zk!|V#}
zEhX2Od#Jn`Mh4*^WQ~gv7|e$ak<NGRE9L29d9@CTclb@s^0!e^pSgX}*LAl#j;ZB+
zuEYRxHrLBwwHi$L{In_T5Y*mVTm&C3`wb`CPjo@5hiU;3z{?+^f%I5yp4tFwSgDe2
zH@B+=r!b5GAh^zkwb2nlD$#pOTEG)iu9ohyOA>4>^&v`1!i=-EH5`PdFw@YzmFKtl
zB^o%E9-~aMpuMfszM0;s@ltyUW~>X>%}^X%JhRu=_i^&cYdR9q){cyzU!3V|#(bnE
z9?aO0^%vnn@m1&u(eJbfrW)KTOxNi8A3^RU`0p|D2lAn2Xa{MtwT)W0cBl53_J&UM
zef2VU`*-Tw^-J|0$O!&m=<wOEGrs+AkN;Czq?hZZ`9k^9ceyEu9UoWv;gBMIxGq?t
z()af*0t0H|EKC2!?SgEWvC<E?El6QDy7VJ%uF{KWqVy9U)5W?mmwq;(2q{-eozNpL
zjrTwQ>?r-5_rd1;D*b|60_}#eYdfSUV0|0?tx-RZNaHHnr$`?O^cl*b^eaA+yP<gu
z!~!ir><q9ZW2?$#aD$Tq2XpB^xv|u48dnX5J#@CQm_>BHy87|4-;Ko8-mR=e=Vm%G
zX;J#6Xa)Fx*d2jpiZbIP_Re11`b(muT!fiXx%$_HqmdYrVA8ln?D+$jwT-Jk3zbBz
zmTKYh6b%U#k82?N0IvS?!oFC<50%p*-t5_a$Q`jwHg&+>NK`eHjisyqeE80GvE|g5
z2u83z8KS{6im*yt{n2j_=XeRNrb})vE)Zdc?v2>6X|)J+3u~%)fIAeq1{_1Psk{2u
z2YexBnB3Umg>7uiBQpJlS(qn$xf<9$#r#3+z3>#GCQ}UWK5Wcg{qYtIT@%dMbv}qU
zc5^?``^GJPXw@*7^>9sY3$*eb$Tf)4{{zTeV%%&T0sr5X+Ph>fA^_ddw}ZJg*?%Be
zs!^&^LHeUB*aPV<Ha8HAcNo(3z^d<FL#dwycMf}9%?b=j7K0TSuGg!nJE`9CCJbAh
z-`kE%^f)s^2m%go<1joZ;DO8rsDE!ykaWYAh9kBgO#dX}se58_02(x1?^LUt<OcP5
zcJz5ZHUIW{F_e!=?cI>viz>(pc)4UKR-1)ay4$9Zyj3zuP_2~`vS6|w)nOHgWRpQ=
zw^@|hZXx8J{jV12CQIl-$s#I@o35T38FaQgVX6HFNnUx7rzu`N@em2&hNR(eFm3kI
zQo9Y7JaO_lqIa^J?y{s#S%6W!_b$7+mge?Za>L5bhM8-<^iS#qJ^%OQ|LfasN1tZ7
zRCblJ{8Pwv^QyRJIhk<%dvVS3+2HyOas3AYSxy&}vwSpwe-h<y3HWCL-xlyM0{)f3
zcS>2#snYjK-)GnFm3}B7%ac?3e(4A7`tPMICsyglr7TBH>8GWivGU!ep9}bffd3Tm
zO98*)(8c??+og$XT|h%XmZPV1x2vDH-itz4f7bv3iv=7gAj>O+`-8>x5CQiVaHxR$
z2*`5W;CYs-2XKE;&T@vihPe)8*TY=H87y&?3g{BhE#L?NM+(UD^dMi+C~@r(kmV&q
z`N87)5CIPr@Gt?#2*~p8;Q4Xldc1&#3&?U6;r>K%T_)fp0m}uf5OA`9Qv_sriST}<
zxSl3pm4MR)oFU*$0a;!ryvK3@0UjmFj~4J40gt8Ue}A%u7^fKn5aV-<c8})5<u~)M
zduDPUoR2knmwMll&&RJx1bt27Nt^%71aVmYR@xc6_fHN*<3|<}Jj#uCLPR>DG|5v}
zH;QKcUTRh}xi{6L7C6J@Mo}Vs@>CXO#UJCo1+M-!h2*J$JPppB!=93m`jbQG;aVUy
zK_1dTTbmb=k{Fu|bmq$?CC`h_JuTtck{pa7*9x8DG9r6g+@3@yPghh5%)gc}cO?e_
zvr#D1kBnJCQuntnC%+qWp}_rI9`1pC#jRjw6ikjbZ|r#j_wOX!L$rrM|1TlN>Bdm~
zDt!`JqOB$mYR`TB4Paw(*g&#IqZ3rY3&6~xro)ej>hMNff-tLKjSQPIa+P-zYjxv;
zbJaXSNpd&_Z>+vlO@iChU2aoG%?`qhWfdNsu3=7|I{u?uSu2m}c~u(Q*5rZIFS0;>
z2%Gw0g$VTwlMlIu<$f<%&1~=HC9fJTVZoO|Jh|Mz=41)W6|ElsIZ%MNL<7EdzmfZS
zOlNv7?MHp|*_V`~y)k(JH7zWVSVLYUdF*%|gWmG!5n^t>F7+&u+@Gou3dr(hY;c8X
z543s~LO$mUcMAS4uZ;Zew1`0YjD#|t+>b^*D8RJHC~diJTV9;}xZ-Ys_7@V`Ey;cR
zy6@2qoaIMhGE=BgL~reiwE@4#?0d4sF{S^D_0h=4ig=!9!UO1KV>mqg&ir2}_s=bn
zJ-?iffKrm);76!`zZY>=Amc+)s#@d;@-v~+;8jXVdhR8t`P!&cdYyL*ow<Wsl<80!
z;KLWC?(QWcl*vc3&y-hAnOr%Y)>zW4)WzhUhAJizPe75f6o*hW4vRtd>MW)Gg6UN#
z^&lJVqN|WO@05&DYT~VL(GjZ&Z}CQbG0%KqZ&>0{8V#CW?raHchWw7(E0oMu%l~ul
z%!1+p14yN@4PhF6uiZ1wkE}Gz|EJ_2F8{;%-;MMC3ef*|L-+qE2!gNuZ&T7k&xito
znB1XLKBp6ra#%KlI0hw_V8ib!u`MQ#{GA!*)n9YZ%hLYYnH)t=+5$we2`6ZeE<cjb
zi6}j6-z>2yBu}4I#7@Lb2c9nB+mbwp65$2XMwswr)GkX92h%ez3_&E12jnVI-O&!e
z_4gd}{<0ZZEIE>Tq8CU=X~Mh=A3p9uZ&_F#AA%C_&f1rgx2BgctcjT)Nd4WE9O3+%
zB9<kh0pUbK?maAT?yc)8u`MRQziS_cGd}c631>9vW<6EYb*7%uP##Q80M#uW-ypMD
zaFy7XcOE~VA&q>sT|yd8x@a7r0_VRKDczbp)EWqLSPU*u=9QB4i+|?b{N!^9<B7>q
zcJvo8mN21Yn=Nc(5z3aX<aw|^_9M9?)vlDN?~#Y!{2@bs&D~c>=;`@?5P67@*AV@;
zR4Ydg&^6kb+RfU}wAZx1>HYL^`aI<S*oL^?NmvKHZRq47qr|8(78(KLJI1w$#{J6I
z-YUL{7r9DC+A$#NWn<FG^hmbcu4`|h%%Q`UPe|>{v~?2W>KelIY$(m6DP8;TR|Fc$
zOtQNUoLGe53C_3(*Kn@IDXI2!(nN@H<})h{d0j!K^TLMVL%OF>T-d9)j%V)O>V3p@
z5N{MV8f>qe9&X4KMO(ds&6vjYdZ-3DLlI90fUP2^t)VOAbY%xuBjFLKv3%?h!HI%A
zIP4g49mhv2cbkp=k)lgA=niz|;P&eL?RcHtTqQmnzbW4x%|D#ow(J@u-;1$mYpm7)
z*8-N*gyB-_>Fn~vHuBZ6LENB+HJXr(jNzIknm#8O^KYS{Q&>G~ZKqY{eDW~we;iYS
zFk!DWiC1V4BPg9%_EqQsh3<5H_HHy1hQR_fgIzgvjZCwP?J5w$C?Rlhh7xft6JwZ-
z6R_Bu%~j}HD!$6xAheN4?*Zi@wxfB%55YB0d{=rK>VL0?rZjCqDj6S4kojz2@&Ag+
zNMf9Axb+|D)3g`080_tSfFeS+C&y!N>Zi|fv<K6Lgv}3D93pD&IMWPayOZkf_-8-j
z`|*o%ex^Wj991F}u(7gij)4&K8m!AK5MY&x$nRFZ#&AWSte3Vze-gQ#Hx@FDGvPuW
z)o=?2yHU)q5~+avbjJe>Phx<aQ@S;Y<j#RY#)Bq2bWkJ6^d_be8^+u<`EtS?d}DvV
zQ|e7~^00wqT_KH;2}>hA!PqP=$^O);F7xq`dSYLx?(NA#`!Fw{P{;1$!CK*2le5W=
z*{N0N?uK>m@i8n~CAGktJcJtik5$W+O}(RLR-I6tbA@k-<&wPl^HcZ;?vztwhmr>~
zTHtF<em<D;lAxvI;xib+$h#*?o!XQf?VQT8-#1Hai^+p8eabs|yS@G2E<$!`MOwY~
z9qkdlKeBtAguUQnWAT4oBtRv%YMKtxN_CA@hw(SRg~QMb!x@n9-0WM#y@_Yz-ngoi
z_G$&{VH0J!l5@1a*%Xds48d|{HSKCP(E2uAh0APL;mp2NVZV?MRr0T<Mp%}f>kud7
zwHQZoh>-`(V3F$+rYjBS%*g1jNry|Ei!7!%8}2f7mT}Yj)c<@I4s*&nGpl>-^^g(g
zp74zE%$`&;3A{XVyKx(!MM`_X+-v38ig7k&DrW7P?_~NSvAMsK9zEQo+%?z9+yNcO
zt*c>g3cjJbP3VDIIRBp@#`lbo`kne@#Q$$5pOC~iL7FS;*q)r+hx3DOqV+WX)GWUj
z0VUfKOzvVn5LI_$_c4KM{WU+Xkha=&Nn|AV>xVfyKN=H^!sIgf67v=LS!ujs=JNgM
zpM)WtL~>}SoFwfcvl#;?5(~5oPSUQFTo_->w(?B_W=I%YlSmld7rJ7xL|5dl$(O&V
zX_)!<o9Lf}r7KxRCFI9C8aZY=XuAYUl()!Fj(m{yF#5zw33q35qH{419X&){r>xX+
z*zB?e#>gkBkUa7J2mEln^Dh#<XmWyc5kzgL7wXPTmd?hk+{3<nYj8C~8vm!9R&8VQ
zaOPF$Xn;XshZ%L14F&8f$uA?1eB$9<yfq|sk+1&-f@n@(g2z8XyG@%xo+HSW^mYDq
zljKakvK_Tv(0=x3Qc0n^r02YGeEi;fR_ak}5-DAsE(3098G#s=&kyT0dF%l3mA-mh
z!V*qScfP!B&#)4^Qj(g*WpL3aZkI524^CELZ1>fVcRIGc(JOR>dwGVus`15fZtxFM
zdsZc<4J2NDw4>Hk=cElKx!+pgCok}?I8fGzwI(Z_f5j$$H0p(Td$ZW0t=C$=&p3Oz
zX~?@$A5KnA#gH0$jiXNR2&!!R0AVrTi}av=FZbSXl@z#1?s)Pl-pzOK$ZNoqJ~V)C
zY0J6vFB4L&I%8tNwl>90^2Q^tHq2OkI{lLxK;?f!w1bIuuy(w5s`gXl{+bN`pUd^9
z3=RH2-!dNkI{U!?rgxNiD@+t!mT7h!ri^oKetcsW)&8(8r%tJ*GQWT@liYuVMy-hk
z_-VGfZ?7`3w0N~y8713{mAh-wBaN1_<{qmIP-l73L@-q-b!nzIns7oRsfwosK|~pz
zBa|vc=`FamY!SQnQI6iR?iH0zI0?G$APq&h4jAvlihW)O$WhkJYDbKd{64ZUMLPVg
z{LE=}T!l(}<{IyWk)n+-*TC8j2?zE6fs@})$;;3HlxWkmh1v$}1Xm;e?+b|kJ5(R5
zFVVyLd656VsJ{=dz)8r?d6sd#vD0|Tc;`R5(lg>ud*zSYbi0eXkT9t>vL^6xugOSO
zg}#QZ;f!kTXz6Cmtm1JAk@5U61gn|oudWpWojtwhn!sFLD0Rl@H7bf_Utl9wDcDeL
zuERwmvL=!6?+7971ADJcNWtr=2QAI?+Kyl&JOGVrAxkUnDuH=X5MgUQh+G@-wD`Ni
zLiRpe2*c~U=D_W*gE7{u(pu5TJP`@YL+)}wFu1Bjqh;EH)xTUc3^(mX8HX0>b99C$
zj_GPo7|yglq!34lZzM?^MC0s8FV}Py8`!1hOk8D07U?lGFU!F9MKU0CHQ9Ibn13<$
zdHlT?GbIZzbVF9s)ir}TTe))bT-Ray7wLzf^$=s^P9IAD7efPx_<vLNr}S0Y+gg`a
zM9x4F{<SA(Q6GmgN90kSYNbRjA=eEOdhLPtNOVY75}BTzvX%0Fn%j>V6=b_rYa;`r
zI1lurCJA>md7N`LPoV+JslGhpOq#K(kMCnhBk#_Zkai}K=-H{sf^c22oWu}BuxJYA
zLT%=A7chL$r|y*Sg_FlPXIP-C@1k-dc&mjoDLj}4Kd+SBa<|5Z^=3IqUO0KQbBs8d
znAY5~3sd!dUMbo6`ZFBkZFfn1Y)u~32d05K^5%$#5=w&PuE~|lzTjBym;1Foc_h<4
zIMNGbrwiNva<hb9jz5?i1zdA~RO(23@(AbaE{}F%T`^Nr<nk|8@XoxmOTt9Y|GmlM
z1poa-^T6|Wi*}9nB{F+oufJgI4NJi98qd(3;Q#-Bql{{MXYn~fe|uN|W;Gc~@0T}(
zA;*O?I3P^QK`ziQ)PJSYDs4_Mu^G8b1O9&V)ROPaGv(uEhsW0ks24V^wqJ)bKWnzy
za`xc-HAUS=s=6f_P+n0{1}A>rnlidxx|p5Ux~RVsR7Px_H?}SiUl*cx)@|{|%BECI
zu9y^R3-{anFRMM)wz*$;Zc+D;UfVvIi6Fd@Fb(?#B{ou4fMS`4Nc&vE+b`i@cq^tL
zqf7uQS*F$Qw^kYAAve4gQxWQQULcB$28-Yn%0_#&ni<H9Z+S%}GZAM(3>c1tJ9A&P
zO&N&Kgmzj+J5CQVsFJwhZa=@H!Kz}oYrF}BRSzS>OdHhQAuqMb5QF7Y=07wwVLCz;
z#+j(3-$pL~>mZ=$_t!7dCu(W!D9HbibN!qB*PcXHSf`YP2(-Ng;UBrar$jCxceGr@
zceDq4q#dn2iA1nYG38OfpqZ^SvG(-SH*-wa$+lBllE?z<)Cy2Z_vNTbi6YdFU$sBO
z9DPc*cZ?;G9M-87pu#$&#J-%|)%{0?byMjSX=MG$xy}tFWHJ`rwCJtKwQqjaF!SZB
z>7Rt>#N-?Z#k4~4gG@qz0@f|8i&!T%mM`S?pR8xyObnD|a*5<@>UMCXBcfNuVySp9
z?Tp7F3~&6ETcvJClQquCP*6r58>W^SJm!~ozQCpB*WB1HA?54;NP?Un72xofYd30>
z$rI#A2df_f=_P#-NYni;BcH^^MK7uFQUvFs`>(}>F{9^}o*}2-P{+q__svpQT9e4(
z=v448S<*?Cb>y}`vRt6`i6ONTmQBgU&W$v%ZM8Go+c<hlw=>>N+hX#gd%1aYeD4Vo
z&hAOcMHuO+dd$(B%x*P(U{7<qkn@+c#dDkZw|M7#sl_Xk4NN)Uj7H8`Cz>o3SFR27
z%8!tBR$a+@=e#1zDG$?NDyxU2WR@S2oXlsS0W<7wk=rlfW>pD&l+>{`N#t{H)emv>
zA<Ue%ne8UG4dPm!O-0|4>hDZ0bj}vq$$m;~3d!xa@59FOnq+?oALswaQTxBc_51WX
z?ImrqrX&CFIO`4&P9g`LQ*|~sLXr$Vg=vztlsrE5a{iT%`kmA=e{!Ys(*|D|a@i$t
zrr>rMP{&vb$d%s~9MJWbNq9CTo1HIc8qA#w;?2_Z65C>OMcI5l>bFdkaC(!-C+F0B
z%_?Rrv0Rcne;MaEcF0MK!%5_ibNa<>rFD7YKDv96S6}`O|6+feFZC*rT;|+ZGvCxT
z-};r@8RM*eqIi;oE1X11W~aTgHJ$}=07F@N%$Q7S$s_N5%6b=l>Jka#x+GFDJ2e@Z
z170hWq0?$7OwOG2TRwg>WX<)aBvLLr^_+pFwv8ciiES~t{G9;|XJRjzlBE3qP_mO~
z5!n2{p-t6C=qnHj_(|9R?F9c{Yiu`uU_5W#3;sX5a-#J?h)Exujx*X?ubNZK`o@+E
zVui}V%zhT@oY-3}^9QNx4c9mz4`jymW{onfy@{gDGg@|ybE4_9b+B=baH1QsmG>Rv
zWRUD#iCiO{Sh7ibv}>iB{WgCU#i8x0SLfd~4Q>HFy=$tIVYVgST#MD>B~#mB_z%N9
zN(gekc7a-G<!euL755aF+qhp&bIXE2hAAMN0=!I!QJkD;tWro_Xr1MYr_vx{(J<Z2
zi_>)dk05sw{P#5Z3;7Bfz;bP_)}fuF-K*`=-a+)gar$h%O}{`-Ap_|9MzJy0m~HrA
z8E~cXQ{(l2_g)~}C~Oa0SF_NG*+|A+#|obfv-zH@LMX!WM5spyrHWN3>^dq_EGdzN
z=7{n%w#o-rwa{6~Pgpg<riaX$T94V0V!Tjc(VEN;G0x&()6G14!g5pfDvL?i<V+7y
zea;@xHA##t#VXm)xh9%=Z@&lmh5C@b-3tr2<d7o021+XPqhX#sFl*{EMfkOto{=}{
zQd2i_?h>vs!q3KLhZPgcz5^q~xZ3ZNLP4k8^MztqwN(neU*2vgh85-ZT#Bn+j8(xc
zO(0htW}N?Tr}X~;`aSxQi23OyZ<F?KcwKK#(!6(l@gy>@Bg-nuQ}LPa&RTUbBXq90
zp-3X%63G_lQXQ49wM21){P5b#INA6_zPAsu-8q#?NMs7co@TOzJpR!s49mHl5vg~Z
zlI#0II@)=tfpoMfCU-sXIv>&dViL|+63ObE3LzEq4}6-PGb?#$#0-x0gJBZZ^+_a~
z2kYcWvS4-UE3sTQ_2VcKgQiI+5=kVOcPao>t@;wh4f58t5Av?1PL=R(O0IVP5pyTt
z5~|n{c3mb;)KpBaFAFl9n+D4A40`_WiT~I4-A=?$s}^vUfHeZn7I2P$a|N6y;CumV
z1zaHDLILXptQW9Bz(oQs7Vvlhmk8J>V3UAL1zaZJasgKe*eu{m0appQTEH~|t`%^d
zfa?YH3fLlGtAIWM{Q|ZL*e+m)fB^wF2)I$epn#nWhFoC=Bd$#XMg@!s7#A=h;AR20
z2)I?iE&;a*c!Gc@3V4!$Ckwb;z*7Y57VuO7za`*l0)AV-(*^vFfM*E!T>;M&@GJq(
z7VsPa&lT`I0nZok0s+4#;DrKSB;dsYULxS70$wKI<pN$I;FbLRKZ+Qw`dfNJ`=@rY
zwl}$f9OYz1_>&u*OXwh0j)VNm+P%q!aOAqBTv`^N`I59RwkMI$(y2x-&+|La7o6N&
zD|CnVz9(VoOa`1wU$Y@YO#bINhxJ?`dE&gSZ1;^mC3_K^nC$3-rmKK|J`77#zWe0n
zPd{Mj<M01b>TV+0?);!r+3Zm%p`9@wxqs48{LpdjE#VC(+nfvUY^@(l>`KX{TM5H>
z%>%NSt1Ibut}>u}g*_j@XiwW)<c*C7aNKvvzRKODNguxQD1DtHnuTiipp+2isx*{|
zXIyn_7=h3c*=(6VN)s&bs0%jHO%#s?FTR^M?vAUZPeITB{`wpOv&%E|2lRg!mBvZN
z4kxRB&og^QK#YK63wE{Gp@5((6ReO$8Z*lzocJ)%wVWrga3W_^ZvuWt{^Iog-eet)
z1eWHC@+2Y06~RuzHd%{F<Y}rQPfkMDf3Z%8J`Fbhx9TtJ1krsKBmUpcJ+u4&!U#B#
z)61mWMkgu-9AlI(^;isgkM7HxR-X&C6<|)jZc&Z8RyfgLsJu1Q7KAx;`Hr@(!<}@{
zj&^aiIoZu@bo;J_PV`YKGbLC$5ppn6|KPtj$(NA+Ptay*%OL;%miB$b0)Ik#9Ug&0
z_3?T&LRrQ1i}fA)^ZJLz0Ar+4Zp?!o;6&qM<A=xu^rG?Je{j7B>8(OHBc%MeE2&?&
zI5-5$+yt_%_=B-Pf-7diJW5ui+822EXS`@D7b!=ogR~Oltl)k)7jdtONOdQKFdMl8
z>bJP>1<HgSvFi%%<r9H9IL?KY$O%Y)FqwVaa%-FU))}G|NL;c_xC>p+n;e;iTrN>$
zbo3yMGSmCGPU0Rfky(k>jh@+=(%VI=XFc45Vqd2CEKxigApimh($~owewC<wHhf!Y
zKVdY(b91`B%cazj*(~q`vS$iIi|>f;&rVQ>Snd?Jg@26*%9aHDtsSuEZA8M#1iyPW
zmus8v#=@R<<gFPya|Rocd&U>(i*y%#0vg-6XB<oi16w^U2pb*rZfV0A=8tj;_@*3o
z`Xqb%vK)3u#Ta&8Kf8Or==dCD&xytotsVTOZmu1Q%n2Y}Ou)|#gw7P7aSjmjY&xfk
zQJCvbU>uODFff|cdIHxEM0j}u@x_)SOqUp<?`2=2`(f^-8~C)0%=ZVP$VTL;&wQLK
zr5o8#e2w_T^Zn6nh!QP6&0V7H^8>*)Ob2cN6BC8CNF7G=E3#&87ahXJ#r1!#yNBp$
z`2Wl!i1g#qUf1X94{E1r!$=ZEefhT`8K<Tn1wu71@pg7%)&xT3Hfz9UU66CGt7JS&
z^SN6ko@H$k>8V=_1@FiqvkXead_{hE^tBYh!Z9nWBm}`E5>;<16izgUpvmt!J`wOo
z!$`v&_wwlwu_+|yKh6Z{KsQ}Nw=#*$)$0m*(&x~Dg5Kz5`DR^_+;4K#L%Vrjn!l7P
zZ%Kw&Y9{cWig4_+;B(srcVq;+X$kmahIG9s%#;ob3gzDJOd>gTmtL-BaHUF-=Uv`%
z^LODz>rQEydG22HPwEt=COx?DZ+Q|qxN9|<7)Q~)?ARIEUlXo*hovsXx7e<Xb-pRt
z>0BCb4Ok2PGh1)=Q7OsKPyUq6?C9GUO8p8agU$sbwvi%j<42N9-d({kZYq^WlH31{
zB8FH00$D$g)85opkPpe3WE30TjwCX<b{2}immSpd{39v<lp^1L<!LcdZ;|@$OCob?
zpiua|94e%_M<7Xh2=Rf&Qm_<|@9p5mqs=E@lZS?7Z7q-hH-|>v=EeS=-NMPK<?pg_
zZN4BVq3JG8ZiCQgh`vZ|DVjsHJRA(hJ+&QCSPIcRWpP{}gd_~q5DJt{rAV)jkcVEs
zx?x7gPWmS`W<?SSWY-jm1(<6}V;G^4Im+x$a`VV%Sw9~eC`SffncV7l?=lfnCc=uG
z^UQ2k`JdMRN^1A&<Q8g0e29}FG!r0{a>!64<bo4_#=p^}_e<5cBsWu4Vu38qxnWre
zY9YS!M~Fqn$Hsb1e!25V-iMZhBqZJLWP(ZmyiR(NMd%qfC$=%r39qOzo;mGZkvJsh
zzChTM4c+aEIDeL$an(tD47R^5HIHti`;nCd|D6jS;B&1)^J|xCztBE|-~UQv1b9OK
zr!m=B11kS%wj((HpHiZeZFjl6zD`i`K=L~>iRB2HM1Cn*-yE`h(yR|J<;XT=%nUOo
z3rVMpB4T>OLhd<u!Ac4$L+R%*n8-vW_nmusA!s`=43JZ^6>_Q46V3EW(7PF=6MOyw
zwJ6K<!oxjC;7JG8Gj1+YT((8S;G;M%aEpUcuJhv6ZE)LUC{J@RYY<9yW6U$9Y-(90
zd*`|dMzg)ZE!WDrFy|OgRtgbv&r&|p(@w)8=UB=M9V~--jJAjJ0dRaod_>-%QydHd
zd$GwM;2c4cp8o@>|NpJVeEm0iR3EP0r!6IaCf}wJ0DP(bj?ZM7Gn83Ha{19*4ffa|
zISA?c)LzuIx<EA7+<-OuJ3=|WEn>MO7jHU??sE&rG~XcYa~o1D8>J%#r7;rl<2ddN
z&_6yqBl%_It|briJ^zRm60-Fv<f3%gAM2EiST4ym-}{`Qc<lCPBowPt$Uf=tXf%r^
z%yJ5H=8ta?!}Wz!{fd<Cm}1DW$C2z$a{bgfyyb&Gma1+^A?dWkQ&-~B!JeDBc5>RU
zP8RK#(<FpanANdDar|>L%62J5>`KY)U;di+>W;UhUad`Tcg&MoHsXl+ihMiri0ILq
z5`w1W$ut9~+X)qs*?=PA2f1zx{~FCVe<D@O>Hj&zxX2i<|3dd^A8My-BguVaj^l%#
zkVtAD%C;0p`H>rKkY+Yw8A`F`7n4Un_`4VmIX+xVYN+E`v^?x-fyBz=6MVDvnw)>#
zAdY0E9O<Dgg<N|Z3xz+)^=pYg5c5xjKQ;h6DI#(Sx%|2$pFPELQooKA^6NQdv)E1q
zVG&X}TQ(<i5xM)R5{9bzd*?_WJdzsRmv3bwz%xtka&kR#@3AbaA9!jx6sk8hh<z)y
zbRaj3lAJPPy*}adGBF=yr`@%wfsWUoMaX9n`H}Cge^bnbqoi@`NEJK&MET;=NL~?n
zZWHsP!g%>4RDsk0CQNfOUR;=Fks1qOnz`(xI&SgOeDMPkE=vCo(2phhvHExQ=Mdei
z+~_dQ>np9_hrMFYqyL*mpth)ce+4;==-KnbaX4K;`rPGN?2jNucC5S>QC1MW0tyP|
zzCbNq=x$kjjasQr-I;A_s-uC=mOyagkG6&({O5c`@wG|~oT8q_P?%*PE580<W1gZf
z9o|SR?Ca7i)Reh+q@3v>n>xUt`lD?$8wTy3K6#9>NKrS=3;6KRKrQj23zU`#OH7YJ
z(ng(_p$!SgFgCNp;V5G`iY`*q|CZMgDrF;o<2ru+Zzjm(Q=vbkuhzcOuF|HH-;&M$
z%4xbTRmuotCp#RDQDpV-3dI~fRdbhdH=~b1@5_;0SErB#(;<Bf+9Rty$|#-aS0m>a
zzaoyC+oWx?B{keJ`5`gJ5$iQM!+X0x@~MPmeG2(Q9kLONI>3BqwSE!HCAsNDMkm)d
zU-G1cVr2@+S{<q$8Y4946sK)+zsY0cchdIPKeltRRC!AZ*+Lys`jS>v(z23kZ#aV?
zX}&@>)(@tTB-Ej<#*W#J*c6g;dNL&8IH^ye6cU6wWGrm8fwnqA^6*;;J_%MHAt79y
z+Sl<!UTBi1L`)ato@2hlhwsMYrRur-Z!IBf$vNZ!!~h$i1)=$W2ARLA;PrQz{;2+i
zF$KB4t}uSt_Z>kQJ2yx0<&;>iO->$9#51brA2<+UHTYYE>h?zU-k8-)T2_tgl0`)@
z+O##U$~8axt9OBI!a)nN)v;xEvy(T>`=RS{2l7doFL9mgKzO(WM@=Xi=5nSx9LV<I
zDb<;=k+{u4KP-YA*Xa(vZB{+u>QXx2X2-KUpKUtF@mpp|P)g~+E#a~XkiP9;j9C*C
z9bDpcwS&cw+l5^hJ82eGzk8N;dK&2uHp9Np&wu3qxY0NY^1sb`v37@6gIK`-$_yaB
z6ygp$RQ1UM*oag>zB`D=YI$s@tl#makWa}W8tQ2W>x|`@fr&^3<fT!g`3~K@L)t>y
zQXa=rf{a2Ts~gB#e`HFuk;@kfL_e1htxO@ysl&s%KDSRsa=*!qf4zqv1n0?tXEvme
z($t{^2b(|Ei4@5%Bj=yBjrU}wF7;$>3Rz4YT5woa1((B$HA3#1UdMZL_AwHImJ||}
zIwU<L8z`{qW}7JT^!t}_Bv+mxA!$n?L#adYQ0BweLjl1_D7l2(`Cdl$&?X^TkwR8d
zhx*%`%~{U;jNJ3;Q1K;X{XaebhY}e4?;xLOhia>}^R=D&Kt%lhHvIixhAr@X;~WF&
z!Tvw}=Rm_^V~gX8Dq|$%Hu0v6X6jxCNU(3f-U~iBu*!l)ihbcb9jKS2UB-2-14Wxv
zeCaw*9XT@BnO?02T-)Xqbr0>0+Tqm%V5i`Nok9z>Q^1MR#_bf=v0mTmpa)jvxofin
za$@C{K$h_Pp_-ZYZs|aRPe@_6ZYAd{?SGe;9xHDI>mBzXT@U;OVEVvLUvh!ENhWDT
zAS2f3KW}zXcd=sh>|Q9RQU}ktar6CMo<$wwnFh0et=b>JEW5~JEpMczo-plQh{;C>
zzyEwSm0@Z{P8?JG1G@f46Oi`5B(G?iHXPAEj@4FaTeWkwo3tNmPin7fAHfpfXuVMn
z>fNyay<Pt)=!6d;DI5)7p+&|S#tlZwc-DCPKfFT-OHdQn<GO&yM~Eyeq%{^Ml@`65
z>oj4qDbX6P>xLHTZdj&f6f7t6uo!kcr0YUq6KbbOa-Aa3O4?X~R<dStoha;p&Ad{k
zD0j~PKv;L0cpia8;%lZ9>0WdqyE`~wT|`CMSJ+a&Ia6w7L4@^cKARy-Qmw3n_-+<<
zLDVa;1fqK;vR_y$+mQB_I~MX?SX;AqBobY;&q8oqEymeQYG<mjA*W{)>75wb#&{sw
z;tAobk9#)LM8tupXIz`#8=nM!2t<(cL){NF;A8{bc%es3B-_JkpCWxED$N~8;$hoE
zM@*r-gGJaq%ZCT2|3?$#^Eg_6Ltm=>O^cF0kkha!@PF%5$bsfi2xT=rw_2i;mxmqB
zX^>`F2(>zejAssIb>?{j<$spPBzF&aKvXYV{B;jX(KN<G3nk9VPV90AN1U+5D|8H!
zH)j-y=EzarPD+hKYqUZ+r*f?+v~?BQ*T|^@s|EhFL`<$vjdlD%vkhVEJ-1`fOLG0z
z=No2rok0I26y3$CG3cX1<3}NWEnw!K5z49`A&=HvBKrFisWB^3NQCT=c+PE|k?c>B
zI{rmb^(#`<t*Jv9gXu(!J(qbyWlcw2kONxm(c+WGQ7rY%H_6`8D^tjI?2zp<d5XaJ
zHsduy&iwFFUitPnq%QFFKZPL5Uxogx9?}ocF4vAD7n3Qf^L%{@nb{m}2-f3`+f-z1
zkH}4zGp3~ePe*o0jp`noqIuaS=$%fi9s0c4_IZ0Im)v<Up8_i<OHEytnlg~A(nmUJ
zXm$h7Zsp{RfiH=Q<>)$FQ<G_M@d9}^vx~DFD=4F<mt1Mgx_av^a@~<v@;PzRJyM^R
zr;r>KE5^yR&e;e?vOnwMJZfk2g&#>ZuTLQ<s>8Wsb#j56#AF~z&NyQq*7!foD3egE
zP9Y1b!^6bPR76Y{<mx3~^3T%zj#Paxh4iNm)eUy%bHt{QeCw~mD1N1!gM4iY8BZMw
zN-T6$#C%20KkgU&TVE*q((v_<`2QC}{`aUJ&^{v_kO6qe!>aZF^~#s0kkO=|pT>OH
zbB4EoGBUEiw5<n3XuE4?zqC>5r?D!9G&A_%>e-sDuY4hN(H>#_dB5o*^x`mvr~DtX
zjHfe&lrqrwIH|pcrUK_tP69q(kedPBZ&$ki162&);mOye`PG&}a+!iMrCe`lxMPM6
zai-Y;eZO2nE`09GhAUSbOaCN9ovE4B4rr>nV>KO=y_|(mhh623_%LyJ#>L|Zvpl(q
zVY|<!aN-9n0>`|Uk4Z@QR;G}awO*s2N#Uqt!e^L%ml0Ow{8w)%R?dM~3fWk@^dr@s
znFl407i#3L@?|v4Syv{1=0d16xwURuaii(a2PlScS*nW7X?2&fSdHwjrcYU%5KQTi
zvO66qq*m>dIhdKn;WARQ`6_um(Z<&QpIW=5&%*70jwaynPt|{-e_~8D*1{I>za;0+
z*V~Ksy!8!@fLiEP%e|NUvGVFDQnq_r<JmL_EkU|VX5v7V&R3e$<mwRiE{zc{^6rkE
zIg@Tbr3s~YPx0coU|_SKvD>BVlxkA@cNxOvN-d`8r9e1_)Sgkc_m{3!Y8Xv#u;Ca(
zV}-=|TbDTLSU3uG6`ZuG*s=qjLEJE-G@z7QnlOgxF3wz>ODp;LUqy_YNR=^H|Dzt!
zb?qWpXkS!lj;u-@%QkaRy^77eG0+*oQGqP)A;a`rfA;u?=uTA7n>3a}o|zN$nd;r#
zRAc#af3OvaFFi<v4pC?wEX3LAw8Or9!8}Gd&i&4NvL$5qUMZS(W{AGf8Q$69&{&#U
zJ{0mInF-uPJk>2>c(DtMHrI|`9ysa@(lB$=d-PA*lQ*VjQ<`J4vv$;u?er{w*A3EH
zEfgN%JMzoQo*_8Jeop`Lup#Y?V{G%ikw_QfeYN}JnC5(>^UDt7WI)a6j(a6+n^MRq
z*`-f+);D}m*bl<<t`q8pI@oY?gto;~ZvTwVEPUCEB%JF~)l?aHm@}N!K14}~ix2=i
z%vUoW9V{@cmN2YI9Y^_^0yL<3#v<$27SGZM?~CbT(r+21gHgLos(*P3$r}rDWI3v^
zc2fPMIjrvcvp>C8jioKGojCttsb+fqd&naM|Gls6rMa{t5d9;jeH&7Mdl3uxMP1W}
z=@ojN-VTl6<@%lallotce$WffFzSquaT=n4-wWyge>4v;k1p*%D(AXYNI_)<ln_Fj
zSU}egc~oZ=Rp|N=7sA>R!LA>3(Z4O}?|OjCv2!2C^)rs%%#gT#%BARe6us*wTuN=3
zn68I-ojbs5Y~!rJ<712Tg?g`>kn86h_YTuEbUnxg+&l8uwQDEuH8vP(cZ%bOry69_
z?U&-U{LRPp2#?9J!*=1i9u{ptR^B#$D_`Tk5M_-W*iyw>d4k8XR_yGqN5yRxJdari
z*T#_g3*kIi^B&_mfv0Ge<al@s1n|h^!tOlHW&FD)`2tbk4@bLPZ}YFeYnI=e0R55(
zdf?$7hl3+mw7GuAn}_=$NcFkC_e&nw1Z8o`#(G#2=mDKg5&ciD*uWDs6*HptGxX2#
zNx5qlqXe45oh_{Rqiiv?^<4}tB`bc0_i`7ttM+w-!#?UMj%W&D-k06{BkY<TXb;4_
zL1b`k&A2<hDcU?68fuUathT>%`oDr;jkiL(_bB4~*I-pYUg-4SbMOD|2q?AtjaWOO
zfVX^63x0T@!HoM^GR{HQE6L{UD+nM;qvd&d;DJHcDYe+SH~cglP*}W>R0kl;ywOOL
zf7Qe1AR6ujofz{YRt}FV#5jUMS1R2GtTl9*YoJSL(2Z)x<?O2v^@ltQ{au`3Z=jCS
zS*!g)x6Uc*9%OGjV6A{%@hYlmP(!LeX!7$-Y|x!bUL#ux|3cXKIuM(U2|Wg}{2zPb
zfA@Voi}=Y`3;2Bje<0vB0$wZNbpl>5;0*%aDBw*3-YnoP0^Ta%Z35md;2i?qDc}zU
zyi35l1-wVVdj;$fFezY)!L;i~4BqGZF@yKJej?xl0{&FMpE0<@^`L+c3HY#pI|Y11
zz@H2FsDO_N_zMAlDd6J*KEdEquBRE?<$6ZIX9avtz~=@0m4Lq%@C5;XBj9fZd{Mxc
z1pJ+VFAMmJfUgSpnt;C-@O1&-5bzHI{!zd;1^knMZwdHk0pAwzF9QBmz;^_ESHSlK
zd|$v11pH9IzX|wv0Y4J(9|C?X;3oopD&S`V?iTQK0lyfc%|iUILx^!E^8ekhuhqWP
zE`jg=ODM|xTbEiikQ}d3?|cQbU)=^v2AYkAsx%GD)d6#NFJY|5ynl{V$~%{&>IafJ
zni~w70>k`pG_WlU)c}W$OPH@Igs5ATmHJaiK^Z6%lS)(umo1qh%qJ2XXFU(z`55{q
zaZnhhrp!=%Q_!D6mdR$VTvrZAH6jI3J{+cQJgu&gSF#V|CLw9LSUE;(Qph&xm~S=H
z;yX+ivv}BT@U5~1c5@0@pS^`NiDtey$GzkjnZ*M#Jn>D^xOb+I=eeK)!(6u=!(zw9
zR8%q}Tu2d4m+-AgA=|U#u`=^AJ4_e;6tjXs{c?ngSZZD$q+SXpXNP_H)Gx1YsCsr4
z{gZmd>Hp<KUk?A@o%-jH|F;>J8qa=HGkH%v|0hSFSDGJ8Yc-8{6KG|TM+aTqEB#H`
z+%D{T(Txaw3WwkXcX}Oki_$zhL-^v&#sng%MFU>M%<*nxZ1<qMd*w3fAmj8#+cQnP
zt=A?(KiUyUbTX-YHRJyoQ$FavUQw};@KpQ5jL9E#Q?ID%(HkG_Pc}CI=VN}TbQ{Wy
zM&?b%yxc(L{{u*jV9k%xf2<#a$Y00d^pE`uXRR-V#I&7-qWxGXi1Il!(k();a*4$*
z%O$z&dKTGa?(QkF=DszxjG<9WeI+!lt$xHs4YV@B$gVl&%hj)~rbNvAYj3|r+CRIC
zQcIcEV4hPv%R9o9)rCR~r*|DxQW?UD<1Ki51wRd;UXM%dh^3I7_M}2`b!%_u!f_r_
zXe<rNde=m`)Nq$=@yY{RncVy3wP#9Lx277=d99G*-HLY3rUcaQSjIGbaiTSj?u+5J
zzp=7|9shH8PkvBB-I`j`r_XDZxmiVUE3bWucX0g-2}>e{obuZXsiLg?qscqyfHno7
zk(vd&XznkKakVQCw`L~q&m_EUDP)-s7Ya>i#XBo#5fVa{Xuc+wR2|ST-TOBElMwOq
ze=5<Z!uIca{kMqgy~4QAc<Nuc{`XY<-#r4#B)Qc=|JH4u1z`ke3nR>P2tsZwf}BdU
zf0a`0Zhf^T8t4p!ya-WO>FqzU&o99drbca=U`0jg2`beei%=pos3f$SAQo^61M`s%
zd&(8Ppu8z{g8dAyPXC&(qUn{&v)|hCxn64h74|T-0Yf@NDV&wwjE1+-IHqXlG=BcG
z{GSKv_v+KNG|vB5zw!K^@zgqYJgLoOt@{}d<d59!wZUM5W;_yyBem9|DcjA(<htg`
zbo;hB71yPZEHY3?FKb0hw{D1OIWp5l;CC#>g$;&S3b`WtaPBUHZaL6NyHL{+4zzMH
ztZSETaqXYhDEf7BYBkQ?{(7}jqNCB@3A>vR%x5U(aH!2RsOo!1HGjg-#dWe8e`{)0
z-wuA2A`J(zt%hxDDT`PIitA?S#PX(AQVYof+I;Ibh2jp;T>{+5Z<qOMT?=#R2JIM?
zaKuv0efp~P;ZQgT;-8N0>~Nxm>o9lO7T3SXbn$a{Ppy=&Zc4475`Y4>rq-UpJB@wM
zrjBr;y(2DqXji&qCyP@(clV@IC7ks9AFPcd+BkUqU8=pHAD}PLPXH(Il`$PTfs_B;
zN7Xmi`a)Z43@YQ!^2I!h1KiUX%~yP`(u@ncF@L2IHnng+4Kjuit8x>vO3=Nh_!4Ct
zsO-B<u*(HeNt5qk)0!V>@9;GGy=)E?UwX80lD$GH_d3lgJ=co_CD>1cW2rY<E9bC^
z)p0RQZv$l_M9p$UG?rp@fD6l8$0yKt*2nW5G&0OOHwWi37S<x<#Dmb2ckx2C(kzP)
zruHq6OE1Oi_z6~dR+uIoXrgA?j9V_gLMb~iRT4s`7Or)xhi@@!`&msz-Q#;1VK|a)
z#(QWu{XqCOo^gDNSjuV;#f&F2DZXf|alEq59AVY}@P$R)!yP<WUNIR-TudaHr_2M9
z2GfFq38Nk9U%}7+05QI8jMQ(`57X|_jwP>=z&E#YL`|_2a!vN(pkztga9%NmZFQS4
z)!1cQ+;$7&5^av>H7R78Y}ZFSJttQ}hb_!GcIAGr*A^=d;?5NEN^U7+s%PD@ZOk%k
zOf^pY?fn!V4!_%_?K+n7^=TBFpodS;H6HJPdLAL{=vQ~`vMpZu=~6{6PfGFZ?FF2X
ztleBh72MEI)Q*L}#a!_F)myv*wel9Z<H1`QwUK{FB~r-U-UlwcHne$?rzQ|>#YPKi
z2P<sShDf_>mwmamPX)vKqHk@W)7$PZ-w^S)vtRy{mvP}vXAgFkP%J<Vh{P~kuAA4Z
zX6e?{`o2+9%?MEKqw=FBKg^Q6@hpL?xUp>H8;Vbh)PH0!`8obSU@ZB$Hb6T@I}s7U
zztm^K-tTqe5F_?qkqxx}Ey@#fcGU0f^vu~D2$nOODXatP{6RP62ArDgFdBkvNBz|i
z!c0}rdIH<{NjW5lx2{vNYo@p6(?gzqF3MjBq0o@y2r({H9zdqI=^H+ntyEKUV@4nh
zS%i1Ls}2`odYPh}6%KEteV*_4ZtlYV55q7zL5IvoEoUnONAXJ7fn7d3jPRYob}EKt
z4Jf?{ub!t48N%NMZX~vfmXDh}bLQ0XT-b?D&?eP;qo8*DbX~fCiebETc~N({{h=n+
zHKn4WYP_crCTxBjXj3XcbytT%5F|!p-e{L+c{s|JMuM$*_uVwSt&-BPR$WacvGD}<
zE)WYa8)TG*dp&BHs6KL~DuOLk{vVB_X^SYkg_>Z3Si5WvxIW%nFX|iabmS0J-@g$C
zJCOFnxGLmXjQ@p^O)VIvAJF|M>Kduc|7UI5eDEk#2nh=&Z(P`JyKkZN|3N(d$E)OH
zZLl^G`Tv>_1Mp1kR_$T!HSG(%R4>;X^bYt3{Qxn6p4Z<th8k0irADW5J~ID3@t?K*
zMf3STZWe3d?_4kOU<kYBAgoI}R&B=O@?BwvIR~y9Pz&+Z;QFhu`BcfMpU=Ey(MSA-
zo8Io4vpKwx%d+3gVBPAep(E{!G8LCw<3_OdGIrOmgk7h-q}cT=w+E(z<X|`oHC8yn
zv3<d9jd#sMaiFaWTLpTFV~CwVAB&r{od~{5ZEJC0gb=5Q-TXXrGX!Z{D{MuvJ<`!&
zH$N1erB1yFO)In_e-VweKS*6~a1+~Ib)b`}0j$5>+sco^KWFa1J!5Rlvy7StZe>%L
zh*sFKt*+mSR-i|onnW<d+x9mxkhbi#>&47F)OUc2SXh7laafT)Pj~Ht3UM)<U)mYt
zTn$gacC09@(<$t!PkF=`)l=-5&xDz;l8|xzK}>)p{<a{-9EUR>@b?ccLK;oiF15hL
z^|I)iEt%_jON<o)6>%w;&+iQeV$9Cc^?|2IKN_{u-IbnFSn6Q$>hT?Bv(3WwiLn2r
z4`hT~uTuKIn5-to_l#-!(^%!YcA0hrc?L!Q<A0k{$j#OVd4_GbK=J2ycFQ5JQ+mcm
zAJ?8jCb~`f1g9jM{Ec==1+lUF3ru%Nr1+{766^U3*|u0|;@k$2+bh=pKBL}}WB<0N
zI{VZQd5e?xye9bnV8ozEJ5B0GYbw|$MOxDq96<0q=5u<N<<i$yte`VnQycq)#kw``
zvRqF5;w{#fm)HDJ>WeS6fnjkfX14Bb;15ij9l5AzBOkIUau9%(sQ}|DwW6ZY!)yb@
zT0gzXvB2bHz%ta$|Kq#YVk?Z7M-X%n>1nsdH>NtMT~mQviq^{WH{1OEcft3k@ex~h
zoit)x|2LC>-rua>t?!2Y&l>pj?9u=Ik9WWS<rOHY&aC8YHua2w61<I4>h#d5hqRC$
zp~c@-@=V#6=h9dZ5O20oN<R+O1sA+spiVfDebvO}fL^Albz?T7zcZ93O4*7Q`u#zK
zrV+lf#g{9sc(QNQ`8Nm9X)jY(6`!f(JF+h{fcStJCkCep4ho>_mir-YWP|j*-W%8u
zM($ZJNGUEg{!Z^gYATHcKO9SN59Q+1x%_V%_&{Tf{s`j#|3f=P)5*4f{p^M1%vMM}
zhUkthXA0A9Dx!^(c9C<3C{CsmQd`grLqFQ-p`j$Ol%yBAcM}WnVk4l8rZzJg$tiMM
zGT)Z?C-=>}i=SVUPL?)(Un<e3W0JY;Wl3o|&^gMQ^!)S30*$O&@~2o*=<!ZzG06c=
za)?`d!aMv7TU#V`XI%>Up!=ZZH9NpT`kM8I+dMx*BQ20Hw5E^{8YXK_dt&8Rc3Cc`
zOxPs)A$y>2N+Az)AL!*;JH`z}Og=kT>*j_=FRzocvGMbN4AIBvKE(EX+c+HO|0(|!
zGQWTQ7PSY17y<P`X7>Cjx3yw$y`m0KY^7uinm)RI?XVH{rX#PZz4WY&P)N{SzgHiw
zmNCd_ja+|HCKSq?|HY>%#nzce%K5HH)x=Oj(xh*`P)2NBd|82BWt7Y{UT6p)hNMAd
zy&(u+mQZiRb|w}nKAWHaONnuUVd&@S2W!{E{^t?0^nWz<gK5H87^jCC4ccLm3b}UW
z6_Hcd{gm#T;Q3`vyeqYxt52NbYwCzniwRF7j7~wD&gsfBv-UU0*~h5(+Vv@<WyIOz
z6t&r59JVi6?{U&|CCmH>6Ajt4_r%mm=w3hlSf{6t+5sIH6~5`6zhqJFZR~9}q>z_A
zRwxOgbpho`DDz~N<g80x<s`$D$EAaIQwrJH`*H-@2{w1xi91*Rv0mVOPQsZ;ZR?YE
zQQ>*7@W?;t-mAp4l?|D?wNw{AY;mDTu-2hf5Wq|<sUm;rO>*|T_wmk8ohx;op8v(#
zD?~p?U#4FH``=;4a_tr4tgn;p=YO<k?0NZ{AAtg=gXPRp?T23}wUgF)DalM-@7EN;
zIMIP%tdJz!;c>5!l&i%PmY&-Qmt7yI6|2^MD>=bWl&K%`E69rC9d_8(cEj~Yr5abl
zXfa7}z0T$Ti2r+uQKhH#<Fvn!DcVVzL9S3uM}K;+fn>Q>h7(WWtc&RQEHA{O7DQZw
z_QQ}1NNUWHbU#}7;LkghzNu|#BwURZ;<@B%kzBGG!5v@~IVs%U?%vCCIs00kjOM|g
zH%VLImh=E704NZXDi0F~F=jmAsYQlMxDUrTM%&_}_G70V?W}}(LmKJTw-i!V<RP9*
zqia-$;!s?2lu|*Z_YY!Z*Gb44)BR|q;^Asar7qEmP-clJf}{q@S$Hb9&H#DloDsCv
z+VW3slxmHoi|Bz}Aoa7QRz%*22U?lE<7~_g9>2q_+ZL1W-Fh>}`j_bv)|1i(BZ&&w
zKU>fuyI>%mfX;#|(5bC}Fqv`d>U-gR{>1UW*COFxlSX><McQEn)_`d&4Rc$x=aw@w
zC-|--J3u_*D^G+1Tg$SchgeyA8WH&Vpv9VFRW-YINd*&MJB{`Pmd;m5Ju&J3-y&aX
z2WV5Y720O)5@`RQ)c&G<svoFN(r4={SoV)g^xF_4_)q$0Mk#WCEJpmVvyIz~U#oVC
ze`~o=oGNxl5lcxj(0W~{iY+=U*E^yr1ve`c$-OYEq7DT!Dl83@yru|9W#J{M?zqrw
zbsG$)Vllakh7{?;Q2}4q{rIzc*=|_w0Zf7I-b>nB-2K^jNgJ!XnCX?>gDNUKvtU`v
zOnUY<mqB(<&3rt}M1wt-waIf2&lSSbGZbe}j>^4V7j6$vY7exz4`h+Y+=HrHV&PyS
zj?j|WsN&4Jz&)6ar+W|#g~9d4U~dR>+h{9-GBQ(a_aSUN-GkuWh^Uzi#s1=zI+$xy
zn+Yf>m{VdP#H$?1;%K=CVFPB7OJT$#B1^hQi<Z;_RlwUp4XdIs8>ED``%pfvgP7G6
z(_X-U2PUPw(tRy=@m{0(?g;sA%zXDC7Uj-8Xo-IVw<(~tFQ+Pg>Ue|*1Bmm*ohjY!
zyhnk`{?Wr2{jZNA`Y2@h*^UUn9~g%ktBnixXaN7MyVw7($dq(!T_Oat(^hXe)tQHV
z)RmVzY3Zj<Fq-XY|Li-9mc~cZ<)U{heI&BaGWs5F60OXPa~!PyDw*xReumO7(EeS9
z@RZ&=L>)M&Az&tutA3f13(6saiBHDTA6q`tRq7`@XkeTMq@U#v1|XAT4ZO7X5n)`1
zuwV*=+F%&Sw-^0lrHC@yQ2K5il&NB8)XyDaEQbA$n;73GZk+64{Xm@j3*iB{k<_OL
z4J5~E!_-7hbzOC%LH}1A{xD4mjD@S+mn(^yNE)e=H^CSaRujYRnL|`n&KWwoC)36@
zhT-PI^0T`KsqWP6bqYs5s!pPAHl&d}d1FDZc#6_~x3=HJ>qe`PtxE4h32YiCsZjqw
zgCLec#=3Nn<&u2svF#1h+drg#d0iRmq$`cyR?zQ$*tcQN$LYY2r9rmEvu5zFth!*A
zglt)QZ}4~p{U+(SnNNK4@vr}Z=VDrQ?mr}p`gnQ>l?)f4+v#*dPQG}8D(-#Me%6;c
z@z@EAuBh%U9+&CQ^HP7>(}StO&eUE$jU8=aM{tl!KH~{HR$VYa!i0^y;hWpc*QEyz
zB#qj5bsVU9Gy-T1%_)Yc-hRV+nT-H-t#VP)^S{5|NO1a}qd#sC;}|1u{N$VK!JeA_
z&y9fExW^)T%hT|<i9?~Cy{WJ={-sp_X3@pF{^n5VrZ6>jiqmW`;rfSDeW*g*pRrXg
z5aPfx(28p4ZtD7s%l{@5@bOdi9f<Nh81}y&azB}@n77^i(rzYuIlh;3+ySHFfSIXT
zuR3m9(@2Wks+ae&r!#5^HdTnY!@YLggYt^V72$6&3S!j-7fSniB3;T3tX{A*CZceq
z4Ix5wI}0HJQ#WB|53)shk6ik<T>|g^65dVe5=Jcbh8Jgjs5OH%W=kx^K}O~7knf(M
z8qpQ$;fOj|(6e5g`Z@lc9{brV^61IDJ7)!@bAM_2zzjh#ssQbW%CZbUtvPc+?w!Fa
zKKGxzVn_tok4@=eeIF)!nvxDv?hg6sBg{T`;i?O+l0Hp5eSjkx#`M|gj8jbs>%F6D
zR9~ktz5hV6R38mmpb&X!l5v>i9V<9_zUr)q^kL}vKR`c->i<^jSL(kq_B9%y{d-8U
z`u7z7pBe#&r=xAuFxRitwk?+PiSpWX5lAt!o>e9WvL5Jp_6A=#BqMB1DL;1jvYm;6
z>vN|s+nDINK6FS-Sez7Ge{nd-DvvFG{v-a+_l(hc59Is==l?AD|FnOj6TK~sOsQbN
zdZ8KYM5=>q3g=#y;q)$*Hs^2}$x_4mk-eOoDoL?QgiLm<zf+vlizJMV>4Tl@%WXN?
z^Pt>s|JmYP`&`<W{pr!vyJ&JR{jd>F+lZ`5@{}()p7VbzwSH;Z!w%+NP8G)K3pqaL
z^!df1EQjdARhe@+>pH(8J<1_1krVsVinCYxg)<dHvoU=TlZ5m#G+d|yDTqakE`&N#
zF*&zGb?k=HBiV%NW#+2%2>2Sd3Wk$LZV+EYb}rhO9?_@nS#$`w?wO0p12>8D{{mSB
zP0#-!+C&1s-xlQjc}5?K_&+D>Nmv4pHkKQg8Bc$s`@ny7WezuJYoy8N92#aw#_u0F
ze$5={(e;eO<3M4<wp$&x&T?eigfV$jDOtB3*Cu;=*WVqEs3jJw>jkA;-HOQ^>dW<#
zQiw0TB)f_`ZKBnc+^OZ2(%0N6TB|R*+GWV{`EstP@6q+YC;vy^w<VE3;Y$I(;?PY5
z)F^c8ZbQH#0sAqym%G1!0|YE)aFBbjfI|e_Tfm_L?jzv70`4c^{sJB#;4lFX6mYnJ
zB?6WT=n~K^;0OUn3V4u!qXhH_I9kAi1w2H+Lj^pH!7=W!0*(`Kynu%bI6=UP43@bk
z30N**g@BU<oFd><0V@TZCSa9-(*>L%;7kFJ5b#I=j}q``0gn;zSOJd{uv)-b0@esP
zTfjL2&J}Q;fb#{c6>x!o3k9qbuwK9h0T&6lSis{2Tq0njfK37}6>yn=%LQB^V6%WL
z8C>OF&EOjMT5kW}K#a|#!5FBYhWsBlY5S2|`o1FQ8_UyUddc!Vc?$BbAuepp$o|sq
z8TnmG3l+=>+Mb?BJ+KORMQ7_PM>ftF3lvXdP%)*^n7pFuA<PPE!7)8wN)&PTKIsV%
za1PU#t4Y2buIw)ad|B=dFaaP_9wW@1KkCcicl6lt&!51?;h3Hir8X^1A5K+^Bb~Ge
zY3)R(Grv||rSW=`vgu>Do*s|B_Sb8j)NJkqW!RU~2w$GL@RH?&T=@R<S1%F0TP*bs
ztr++9TCpgC@D?oPMaGB2J;vOM{QHg1GfCotV^Rl7tq7#YQbNB#*41pym|^+7&o9gM
zc!`9od$06iT!`Ka6O$97D@}MzLUh$L<fg}eL&qM%OuPKwqscmg|4t>>!}I4&!~mP1
z%|SHKkan^50Bit1hYetbUW2Hh=jwOpkLj=JpCSU#!Nw6rqtSu5fma$S;}^zzwmSxk
zcmff)QfKQP!orrQmHY1f@*ap|^mCG0_b}TBauRQMNv0KQiR=M3k5Duwp=~J(VPm5`
zaJ#r!oK=<Y-bWan<(Pf<!DEW_TD`X^>K<qFSpMvCk1s1i))s4R>Mdx(K1KRSJe}DT
z+=p`uH*Af0b9pT9YW}Y2p2#~@mWycNUNF5#->AFGDk>&<R=~6bSvIg2HXykG&3%cz
zkS2xljH75~VN-;e%=k&6wy=AisH!>?gQq{+L1uCbxH4)+m<gA*ghuvacbD@9mvK&M
zjL3k;ZXLr77R9Z(K`&x$QFFXz7B$ITR^ttJZS^ceFaTH+(i=xJgHU=S=53*Yk$H%w
z$)ZiOX-puF^$1b*Y?z^hs5yeDdZnm(4mBnY`u!1MQsb`R7L8?dsh3{n>El@B9ybbM
zzP+doF-cj#GTzE%eEzVTEHEr<Vk7?uWtkDA+Z>Cz;%*YHoClPml?$0ws=KT<<Ow3)
zp=S#XMocHLPsBH8RZe5Es_0Wl9l}cLx%_V$A=BUiP>BdYL46=101hT+*{)|^*qAP3
z`MR)qDO>==L@)##8XWc`x&h7q<9jodrU)mer(sXj3dI8u)xqejP&W&YLTj8Usp_BX
zlC6b0)0I@2RKO1)gTIj`9Ip#(^mF_FAT#)Km)RCC<H1SmpA65IPl18ysp#<#y-|Jo
zW-u-a!K$?ll5+Y{Y3AA(or_(V6Iu5~cbS8S7EfPDKSceLtu<0>)}^OVeQE)3{Y+b^
z>GKx9hsC<bS}L<%$F3O0F>D%=hhefq4AQccmTB`1H*gHTpoF0{T|vdnWxbDQ-m)!|
zOBP>4*pz*;Y##~Bx^%h2ek`YPl3=+=qwTYivRrT8$YN5|KN*`NVQ5cJqB6h&v`FS#
zAT;2^$rzkbqMN-TzNX9a%c^z^<$Wn%DPiL4KS+%0jH9sn<GM?`K|6}PKoHyVoBr3H
zMiz5Ny|UTjZMOZ6qR06>2u+oG)tWxq;XKGY8S>7GMXUcQ=D`moEdKOSy<`~7d?na~
zf*U|IOvGvtdqrMR^l+9avHnT_CJ9e0eI#`gDquL7!P68DduoE=7?f#93;~N->=u0H
zsqVCm%gpk@64vGEBPh>NAarsDtLd~X%l)novpDzjpPVovujZK!Yc|maWx3xSHxB3D
zeS_>iyfHn4((nZ$=x5s87-n|!kVbkD*_20Br5kvD>9MY@99!FYQa@VL(;dz-o_)A0
z=R;5?m-sI0V6*J$tB;VdtV&l6B<l)UWn}t9BN8I~shD8qtL8WM=6zTz_kpkf5j6kj
zME!A`{zN-nJD5C3MiA2NNzcRibQs7xWuUVR?!HogeI*wMT)>9s$-^(QMoU|lp6hTg
zZVZLD;HU}+lh`ur^~xUR9$5e6I@vwko1Q~8aRnj@X2zfvStiykiUp!P*#zh;Ye7@_
zT>cfd`lN5XB|V#Z(G@U@&ETM9v>$XeSUpNtcX=qm$oc&;^}X%CD(9FxE|V|^(lu1B
zQa~}A!7Neq%!{VXrcgWZ4*sd0@ku((Rq0s{XEJisb$SCnPVSbOua-<YzhQdu59puN
zlXdB8hcjUbLT!cEX3Y0S>-Ca|*byfkBw<*UKF(qLEwsOd69``Y0w0}mX{q*D`dEj%
zd}DyhmY7=-r3ULV;Xtr|Deg3ne29Pl&WRFMD*qo!b`i2mJ5ZYk&)>VXH+7GGyncrM
zp#C?b+}HsA{>g8e68M+Zr#7w3Ok)Q$vU{pB(p#n$>y&X<E7djG7yPhV57B&0(ANp(
zt5)f+k$Fo#CEU}My07dj`2^u4rB*Ndl49PtkL`6NtlOx2u2OHA#btBGx@RcWbGg^-
zSguN?#w+t4-4yHKn*?V)w%Qw%Hag}v6kF`<UPn?zXSt8;btJ89lzU3=FIcz<cezpn
zo9S5|&FKaKONfWm68sl{1n@4hlf0v8+DL7>)~I!87iqU^k7>V$3~&T81TIF7z|-|x
zK_|Qp8Q^}#VMeWyFfKP9G+rd!pRx=w6C*TFYoi}*58~DPd7=^bA|WnWNFAQ&H(^QE
zz!R;QSfnq7_=s`SUQd(~uVE|{JklP;MomvTD$-ydZz*>SEvriegWeW?>@68rq}QW@
z%qig+$CTR{cdS{#gr7N#x#tVPOy)sW<1FsXSw@@O3NH${oHS&lN5=~Z3_aw=WF%Sa
ztvd0R&GF~15opZxm%D005j-p$ap>-;LN+DuF#_ijyPZUgZvK8DWM=s+p?eY+n<~!?
z_pzcK@(LHCEIV4+Jwr(FY$YM?N+C<jTa#S+T7ZCY&las!uP@PBc@<@frL`hHt<8!M
z!nNgr7;-MKuf3Q>1$VDnj2Rv8LI&ZGFGdAG)mt`h@d|Q#HUGeCkm_K@%<=HHrE#~J
z%OaJ6(p)GI`GNGLj?i&lAANS_l<}Tgnsg-QL9L8>kFjTZxD1#*Qz&%;|M2Xw%JDSK
z3WCs69J@{LPs0uBBLrz7T}?Di6b(sEAA5|`|82zBY7BzaPqX$R?Efl3|F?aUXY}$k
z(wREqB~8O#mis;Fv_EsIX@X3hZ%Qws#@I*pF7Z+AOsXww+Gorsp#I6t3niM#n{IH(
z5y%sr&2ZCcH20occ)up?E#X*}uBY~MqtyDL%%+|b=H}$O<l+ZByyC-elPdP7>l_L#
z^0z%k?pt=kRU^(5A7+DuXGMA;`{ccMz$C^l%l#(j-}C*3nXgsSKdI`b^a573I{bEK
zY)onjlgfe__ES-`m6hC(u4SxH?=805g3D|Q$u%o~LWigR$>21p58XxS`QWYl>-D|Q
z+{}TcJlT3Z`_@zicsrs8NbTV3e+DrwGG^$%)gw6Tqlo`|6`4_Z{d?2Mkm!gj=CZt;
zPDWPJ)crxoi6+Y5xiyV^h>oPWc~nK2T(Tg;)s@MqmOIl(NA5`KZ?BfJ*H$g!zL)d!
zrN<l7$V=`>MrErkvQ;59oRN{@y&!$x?!jrApM0pkwD)=Dhy-&)s0C(T$G3&CA4%=;
zr;(>TP{@uWvv%|KUiqr9P1;~SueWTM@T^HU4kX?}(WA0>ppwgJ-K<Ku6DnDT(E2Ci
zYo+>|(?~zQrjUnprhYT6Y9?H(E*!<%9{#ITcOZ?V<Bnu9c2uh!DZBXqaehAcvV@EC
z|0fV~0=biXs!h^XYANkG<ou}trT<G~uu)@dGmxO^U+_=Ky3v3p^&qbh^&zmeyou(R
zq;y!(*$awbmSY<^KzaqtLsK*X6=*GDrh1x?Dl^a$L|G;xOwn0NhTU3|<*MimWoQd3
zQG!=LY|Zh5YW%e+D~r0P**7-t;qq$ndSm8wXwVzuh#b?7K0sYe=?IqCijIReb%b%G
zT=Qb&6-H3^*r)^SL?D^F@YtU*qiV{G=~dI(X0%mQv`wB-Ii+o?w_;{R>vX@r4LK?&
zkEev;sDs8EOI0|^Cs$3ctejpob5bPKKFTwz2*F9EuaZSLc}81ROH0d)DZZIrf6MeK
zlYK4Ir?>jrsw$`Yeg5e)7_t!stC%vqWlEKQ=F}-uye*Y&mD4I_RQf0TysZ_}{Z-Q@
z`zl!#u7Xueo#~y?=Jk0iTBl5(+BUUy#ti?InH7~4Qz~appX#q<B=e{$8_`9!AC>E9
zrtozwUF&M1-fdmgi2M_p%rGBb=(TB8RWmDRR85{TwQ~9vB;Aa7k%);6+vI``uA1&c
zD=U2dwu;KBQzlPA+x?SUrhC1WRc&n*)7lv3lEPKA&7A4SFa!V0seZ4ws$y!(^p-ZC
zuXS4G4BxaW)(V*GQUAZ$M4zp1f&cHj#$;nXECC+>7p(U^RsJs>fnLR!GBM^}q0WDo
zJvOOzMX&OpGGmRr_0%J^d24yL8ndKG9hNlnc(0`P{7J^T!Wc7EFwwy*<vEkZXeW5;
zRg#y_o7MG-$yQiJ>Hh(6_A{<BYV=1yZBN&JrL7@Pe8W@Kn_e@J9IuV-r?eQdBr7y5
zSA^WY_AI7UTJX0AtCaRb-Fv6KAa#f91tJqz>MgJCJzL|N-k;HK-b@L(1y4MBilp$0
zr`NM=y=sn9Y7Z4M<|Uw9W1E+f?6~}Nind|US^tn|y7lRGy~HH9qNRe*sIW^|W4h2*
zPkM@>81j8N0A_b_dM(C!Uwxs|z9HNPGmdWT@cP1AXtb<0EN|8jwo=yg@&I}5wrd)$
zTyZk}llpsNdNtaj={0H=XKBpun@Gv1@<KwqLK41}f4Yl~#r)8B#z^RwrB^YdcVJgo
z!)37>*<UL^X4Mt6dH1GQI^?ls<HRzlVEI!_eO~`$Lbf!b=f7L~lIV-{R{cb1{jSva
zhn4RR{ZRcm{Z0K-?Mv_ghZ-}CI%Ay?Hnt-+zz_5pu=st<_>J+wH@r*isqWuA0tXan
zV|5;$d2uuh7q)oppx^9Mq>Vx$^ef2x8Sgk~!~R9uVJJZIV1H~ZGdDbF)`3OZ1l>Ru
zUo2|RqS@h42%4UQ#_~t$c@G6OTX6lKFDcT>b%U10V3yk2;h7U^hs3-8f<Z;vFnS{v
zEB@<#McN_w9gao<8-reNC{TO@Z^y!DR|MMbfR|j)pQ-b<BK9DHjs${xug?^9woo={
zUf5?05=DW|h-X${+r~hA*y>DCXd@cC7<7F97et?Er0V%doVqO>(&i5@(#phW&`ycy
z)$YA=&ql-`6$M0@Dax-~7ibd5=!H;qo4qlua%hn@5><*|iTVlry1oX6<<UU6^zVEK
z>TBy8OF!mS)_ZB(Qa{br>>J!QtO&us=r9L@T}a`9ysqKUfM4xfq>ZMf)C>T5149EY
z6!oGc>_b<M<YQj%#c;RK<j+gOoz$ec-yA$RN;5#CwE9CxmpqN1|5J%^sxef*Ngo65
z{}^%~nOa~Xc5CSX_S=Ga3#<oBH4m2ENt10r1HJ@FcRO2z<uXn;7D?OgrtS$d@p41I
zyPBm<7d|5$Xv83Wj(XF#Hex}zBLp=b&H%8<UN{g0!=A=Sm}R7MuPJo*gbO?A)?feO
zKTeWb5l^@G>40y7dWI@#kc1m~XpxnLAAPpP<gLd)=4d~YO<h9iHfkzTAUJ@v>rGfb
zK_*9lr5jg+ugNddcE80kQ#B0!%8>ebQreHfMhX(Ar#%%|G)7<vh4APgE)eYy>99p-
zRkyUZ#iXHX=sxsM!rzwmQJLv@r|1{8#=V=dXcAn3x5j#Hyyg0mkL-tX_=rflbs*^~
z6e!R-vP--HYHW!vEevJi1Fx|u)b8Zg#0^9Cep>3=3F#J$ZNdC=R-6>ul5jXqb$Q5O
z%#!`)hSu(mHf{eJ+Tn&l+dq-8)APSr^AXL5xSt>Chv{wl&x|2Pz<9X84zTA|pGH6(
zsLlFeX>i-=NNtZ8`TkBCU6(3t!(35&j#~C<t)yax&^u$AAcAHTl0@t5AE7A?ORP0j
z9RZ_GYPNoY+MC__Mpny=vpAz=rWM@3yr{d}o@-WAfT=Ai@YEi`)>ln5(22v3+Ks@z
zlAD918;ZI|e(icuacw9R#zDw)guBmMRn$HGYgf07x08wqshbmez>N#|e*3ExMctFX
zZr#gj^9Ld3=O@?u${0=Z&}MkcT4ZL=grEH}UH=D?YJ&f^k(<d&+WxToS*e`?FW^^n
zO`o72g}7iB>JRB(AmaZLBVzo(u*wEz6zQG1n;9U$?xEg~XwZ=`l9GEC$0toW5=J%1
zaTTLsT{<C&ulILSYgKA_@Hn^oSwkoN<nd?`OnuA`H~6=}7CXwr$zMOENcU1Kco-HF
zPzxYfdprCpm=PqtBIbEhBHDsnt@LBk`V*Ok@mEX+8Pw1sYmnht1!{y5QhwhW_ToP>
z)){yamKTW63t|vov#EpT4C4XnU*!fXtUWNhV2wv4_E`yEcq5X(Qv8o_@4U<-Cj1$L
zkR^U(e&8k{BM7&fVNb(c!?a>)UC&n)=>gIGDs;b<X4Eb7OsRl&pgP1|$w16;6#-2D
z6FkQK-KL%>_m%NQVEx={9BdohfpAT3Ti_;NAmD^;iM;AXtF!kVE^0Awwy)){*&~Yd
zO=!RE)4eQ7?zm|CYQYsJzEw^vV_8vocQJjk>uvp{BE6Y47insI)FBdfNpK>I`GakA
zr<)TE$0?~UEJP#1st7B`=5ai~EF5U%$?M!tRu<`gW!0G-M1)fZC&9M%GbsJvA0dmu
z)xV*4>3eIJlefQq1mo`E=?I9KQF^meO3l7!c>{ruWH$oxbJ{+iwlhL!aA%&g-NbYl
zO`E2NoiYrT{S(WL8#2JXCgF>Lk)SLdww*e}Uk|nOLwZf0Uon<5W0VE^{&ayPJB+47
zEEAs7fuvO7JnHd-ov|eo_j`?9>HlNzJK&=z)BoR@*(fa(HG=L07C{I#6j4A?0!bi&
z6bVfrz$V#bmuz;!W&;F7i3NLaSis)vc^<oKMbCnAp1t>acCnrP{6FveKC?UX&dlzt
zdguLrhacjTyi?vXZ+YtXk-qy&2j>Q_5#<^G))wjuF~Vu3MWJvM<SE#AkhvEM$U|M2
zV?t$*<HS(C#;w7uSbA!StpujGf*<|0#=lAI(wF#$KmL4y!|j~3wHZEqk-W}nuXKml
zD5@@qddfz5hSH&|fC%DxFeKA0oc>)y1Al#yp&rhE|H=oYrTeo$z{>8mi-pE7-MWIh
zzzlTSblrYXoBCZkUU`L$j&eq=Pyt{61w<JKxj$x0acOUIIVmu+x2v|UW=RsAHe_B1
zGOfUgKO+c8xR85Pn;_QZ(jI=CCoirQ8W`D{DM7Yj(G?>476bf9rfjLTDwY5KeGwg%
ziqBf73YB*D-`WmyW~l6Sx>;nwnPkDmkdx1)EiB*hw@t$K04OC<XyHETVuy_b<HR$S
zvT>Q*SIH~0d7I9-L}*iRE9BvBPlw2CY*7{LpVVo=Gj`IriF^f_ipX&d92DitdoB|`
zQgkaM<zAmI^_a0bx?mXs0cGX_G-n%?P1qJ`Dwf_GGn}uOQ!W;&?JVEAvIprrT<+}d
zbTQDH=YS786~>A{y$9OSHb}z(QUXMB!&WkiZzeSH2<1itkW7T_E?&eMU~T*jFOc>q
zKb-ZZ`!q3zmGb{R$sz*(&LJ;J9w{K*AiWDH!%G3};{`=kyvn8K-M~qSEqtr-tCWQR
z!mPc;2br6=KmUs*E>P<U{v_O}YkV@D%FgY#a)YsbOEris?e+Bm&y4l}#MU$AAe$Yx
z%yfZ~%TZ$h>?h=zLzB$4c_61_T^L-$Q!jeSsSI7-4%1>bgie45ls<y@23uHt<EWUc
ze#<uE#rPyB_#>2;p|QhMqG1E@O12M!emD8>Plbxt$>0Hd%qr_}I@%d*h3=(JRW2-c
z&QsbBN<4a|&wz2K>RHyBD}KdG=xR2+<Xng1Ik1tiCx9Tq7d}rR<lesA1&oV>>Gvx+
z4|g*?|GSbQ1nhcafCE@6eJrh$+<^ZzM8C$5juAL)c9)B?+3~>A3n@v!u*|I5pmf)5
zxYpOCm-@3P=!!4CxJuY{Telvam10&mAfSjC%RXqWMWNhtzx~<P*yA{n_p03rsl9>s
za>@dfrVxH>Q@@ixeZ`K;7q49?9G5Ly*E21?)Av(s9|i%!xK7?9b6M?`?R=|0^)%BE
zLL%=hblc#7$U;VneJi}4`R%+yi$ZeOjV!xlrR(bNg(??qg>>Haa=z1PlhiFFwG3p(
zoS8Oe|HxLz+YPzGoxWVlay%2x;Urub9IZSTyuOrtIB^@F6wh=OdbDtB2lXp<JFQgP
z+Q7Ym?Q!J$*+=s4V^YOOwyw#lKgQYYv7F<)R660(hj@S9I#}orJ^ypbw}gBvjh9wP
zw@4qr*}qsmUw#~*E6bJBlt=XY!2g-wZL_Qyk3{1T^ASGU!r#-1u}D43R?e~Z&SyfM
z)bXtv{D4B?4p8N{x1^Ye4;=CU6@j*PDu01BILy%?PIbtQRZ>s^Fwj#~Cu{aG4y&Z<
z+6v0phBTww$F{Mu#{Q<BOg`G_aENtkQp(CVIBYA8%w*g*l>%5V&$IHRwfd+mdK`37
z>||pWRqYj*{km76EW%pxxYPEV<fb-<pSKz`i;#Ue8l`z!>5%<G*Z%-AgTOx@!~mQ{
z?gs3ik0nJ?r30jyk`E98E(D)|S0NMdUVs9)0F?dL%5NzHlqt$w$p3qSa*=YY@}8!?
zF7nI)jW*SmSA*COP9Ch1PdUC>ZBc!o!2`xot}BXbr4*Vts2NY6<he^7xZSzEJcg6s
zS`>-aw19&()4e~(LvU+BHx7AQeY_Q?^Wak`<T@)28}xb%q14K0cqeQ2XTk%TlB<OW
zA=efGzXl1%*}YqMP^_h%!MzG!G%ZM#xTSE6^R@K}kLazP7H+8nmw@?j)f)_RfVwxd
zYk(R+d2$-*5pL%|o9AF`Cm?uHh&f;y!G|Kb{*tTcLwtq)wgtXA*50#?*FZ(>g;;HV
z?OyE~1c`!p3X(`zOYZ5u2&*mzzOLB=QN`dQ1fK9bt#)dodKka05nku}NiIk*>CRqD
z>JI;^CtJq1yEjd7fn$5Nb+$FG8cm<R6qWgyF2cjoC^mx1oeko@cx-X4ptS!P=Vhrk
z3SJjHzay6@KEkP18VJEu?EtG7&dqCi(6NqfbRUIt7_4?};5EY6%q0_CkfO_7TiOm5
zFL*gzgl}I8{uNA%FdK9X%+>(9Y9Hj7#PrAa@gVS8njA31PzkBe73;!RT>p0tQO;2I
zlM`}(=`@J`JLeBQ=Yz4`vr;25@0lp5Sd!a$t*J;F_d<8Z0p(sgN#KAwcaQA`!c8x^
z%qdStMKrKR0A>c*++eSRBpjg0fz_!KaO|(kgSXyXIcd%>^haz;ZY&3yk|$R=Z3@__
zMth3t!tGHiwL@r1o8MC~$Ja_t<Q(;&HsdYi{60@}?(p3~VuSj|T+pB_>^WugM>7$2
zF13NrrRk|_qU|lMAOymwfe9GlAZnf6M-q24Q$@L1`_~v#va%lt?3hj#qzggXc;gd%
z44ykt7=sltxf^MdM>+i@CKjqzEFs@*zJ^uS{YueF6^cn&d3ITB`%s<6ifKoIH12kW
z0A1PRokF2^^!(q2|DXMShxqBsk$REVA+1N+fYgVy5or@rKhglw6-b+r29dTP4IvF9
zZAH2gX#{B-(kRk)q^ppwM!E)R2hz1j*C9O;>3XC`Aw3%D2Be)xk3o7Y(&LaGk8~r_
z6Of*W^dzJwBRvJ_sYp*ldOFfGke-S3ETm^6JqPKzNY6uhKGF-2ZbEt?(u<H@jPw$u
zn~`oodMVP&kY0}T3Zz#ey$b2oNUuS9Ez;|dUXSz!q&FhH3F*y9Z$Wx1(%X>!3F+-f
z|BUnwq<=xW6=@7<oS*+22;^*kR<4p>lmg^EvLXBR@N1u_i}j?Kp!+-BT@5U~fx#y)
zwtYf(RX8h#3Y%OfiRHpE1|G{!b#3Wf@tFP2#-B#&)1S3r$E8~ZZC^0fBP*`PEW_8D
ziln8($M92Y)d-=>(HJCe&%!tcTmo<sz{xNJfF{&Z=D}P{Ue&Dn8-Et6?UZ8O_((hb
zprBCnd0VI`JssqY`arn7Es51to93c)#sfQP-zz@9R?NW-jp+KT8UehVeIu+cN}DG$
z6LMwFUem;p7!>OQjTj;OoQ{OGi;Iopj*UZ%_1)yYOTS_Br2CC83(chGe-G(EA{{8L
zlx~*(ArF$5G3{Shknm4d9{RQG`v3NG4pm##zDWBjDjwG~YYvysJJdXC;W*5X6ya%K
zb*LYzhL~4sK4iWYOw7B$X|3(8t=v~1?9>6S26@Nfvld?O?s|ucygAgFv#kwa`dD*!
zIDQQBe}IYt<?-7cwlpclQ~N9cVNpfcceWw7Ms1}oJkq^vwhJ6E99ZY{{;IIinfz60
z1HN=Pryy>Hny5h?<kztE-go+FtGC`as<^}FnGez#>-InC`QHV?eH6d^4dngn4(MNd
zlB?3j|Ab<Y%Q=halbO)Yp<olIv0tdis5O_7EnQw^dz5m980!;^L6YZe{7Ovv-CC2%
zmt1ny)qG1lO%(Xx_}DAE<3ndfHW`4y@I#e!%)~5SlzP3&Fvcpox85x5%dIiU_MC;W
zZkmOju-2lGJU046*6$uKJ!q<OkF2V+(ks?l6p{xXW!TD<-ESW(R2hx+$%;!UgPcRb
zX3cFDTmac5uC**CSH1al<%DM%=#NlsYpi!xJxzuQfbzCM3zW7fB#&=LH@2tF5~}Rn
zE7l7pRerjxQpTOe(xchr|7_{KOu2w$^XL$@?X!h_bk~O>OdCJ{^N2J@I$wGUbo|TZ
z3+1PjTqzH%e;fZt^ME__dC^SApqr<#>-->j)2W@0IeJ*TNNjMpp|e*6z~%-zdUWW1
z!l@aGJ!=`E=bPmM5CsRv8hu3uJ>MM;4O8@0M}QZ+r`*d8Dp%VA0vlHeJP1$0u7Jwd
z2ORPMJRw{Mm3ESLmAkY2?s}I2_gbeFbN?s<ob0VmzqdJ#v(Yx;t8tvH{chc>`T0MU
zC}+v<$RX)RsYBWe@_<cs%D*p<K{DomJjk(-qcfW6Eof5jn>ZZW7kPIJTW2T+8JM%+
zH|SiN766l3%BPS!c^b;3W5=LQwC!`D!nzpC!0cEjVKC8v4JT!=A&>v^BIhzXMc{>_
zV{SMPvUI7U!DXHju$O}Uh=)z{1CVyv`kGYw^qKs;e_@Nz&DPkyS)GDZG#2fFwHAfs
zUw<j1RaSg<VTDj-B(_ghE-tiR+=ILtEE<{*xmBt3)8}s9&rhEbD(xH|>jy&(kstPH
zER2iA@K?sj4{9jP(xwTI$Y0XtmhZXxb|VUDFxEFKX4fq2)tZW=L*71#4UX%YJYjI?
z`M(c&n@9&sbHUnwjC8p)NV<>wBE2r>$|L1j@*4SSi2i$7{sqv!E0h-H1oF0Wm2!vj
zs?#0fkG>Br^GWYkgM%tY$T2O~0&x5VZ)6&f1t&ViUto*tTeRMT9!&F2XXRg`F?VJ-
z7zBXuBa)%@J26mhCSXLfJ8#A&%nXOXUOU$hhF@<KOy}(4b^TrPBrxeB4=eJve?<$l
zC5!7mOMBR41!V7j0i(^F8Qa{)X>a3Rs1yesQ8n1x?n+&T)-#xNs+|DP4R-l27|;ps
z2=p@G?6lEfOnOU6$k#&E3gC%}ZfY@SH;-d)ei<DSk}R!`4L=jVg4vCHuuCq1aZT?f
z&eP`co9vyyhq_=P&{t*f@y38iTNiG046ty~7AL8}1-q9^hE&p;2cf$Io0HKA8Yj0-
z04);Tlds_V|0q$)0oC6J=)dLUEfW3ruGtl_{j;*D(*54R9J1qFUqYU}o^cPAxdkE^
zR%2{%R(9f=_6RtHg7+Ms)wRaI$*bpawL$K15fQd?kJunMX58tJb`1whp`*}eW^Kq6
zAT7VabSLFIj+iN!9YC3}AG9h9u$FYwMX$^d=aMwBTQ_#dbdQLb<8`rtSs8ispVnQg
z|BJk{u$)&?JWx2v*2g^1(JU}Z?0xw_T?F1aR&IXM-g|L(@f<g3IvN7uLhx;9V!w5c
ziw%GVOaXTz+iY3J?{D}kBb%Z5BxT8J;A0xQ(J{`*ZgBp8G4TJ&VEI<LSlTX42K=AJ
zzrzl&C<a+VvvB@So|m=SZ_>x#^GMa)Jqv`<J~}oM20KgknWvEB9#RXy3onVk0~?I>
zHS+l4z1e*0@x}E*3p%^SXrAyr(;>JUzHlMU_W*XoQV>?D+*uX^R-`P{2%bbyj)}lf
z6w=)x6_n7{l<zp^Dq)>>#D+s-B>7;cf|%VQRcmvBTu_D>GFwCh8-HxruZkMhJTOI<
zO!7d#IyUIJy>}M|JrXO(N`SCrxnO>o88K;f^`3lZIZ75PT@i!K;8}P8ncVwo#S-bf
zb4KvWj?WP)3&sGGHw$Gqb9JL9q~QIgFOnWQCZAR3`so^>I?Dg|CU+9}_qx<assiMX
zI{^o17+3+%ksp+I0`}iB$PMu5@30^I&aW7xl%-Kpf$ODDxz!e#mMu(rPhk<@b_0e|
z2M-5T9!?*x#U7dFi>`*0u3#+(cT1|%pNaAI%5&+}UF>PdI2xo(F=dh$1bFIT<#}5$
z^i)gPZ-Dm37!&2`^u|C|744N)72p=EX4W-jn{5uUR9&TDDS{wXh}`BD8|4vOcv<~J
zpo;{XS`>zZDMOWe(p%M7Bk6Vsg9%SDfk@er9-fFl1DO4F0iJqCxy=@pUDvcA^T1V}
za?+r1nA)pmKsXl_Ka^L}Yv)*lW<anfbOMZfOglq2bo%JM4u+b8HgH%}_Ry2g9)jvh
z1HK?vJ1eiIH<_|Vf=C;QLeGi;btJ+>Q{@@X|JM;^wc?T&OK(dZ<Qr1=doI<^Ua<q<
zXaZPXr$-apx-$5WX1<5S{xywldOg1WQP}jrABZO2&c+`oO{yk#YTM*-B2Tl#3*|d5
zC&Gc<7=v`%SwPx>Q?K6EU2FVXI_bUl`40cCsNq=^gRI*}%afdrKGzg`ZIBzpa!FbI
zW96i_bLo#b%KOL0z$h2W0m=~fbzo4S0#O$DMoctve*fb8=?ImZU9(zakk2~{TPq6Z
z1{Hp-MIpK4qsuENZ<tAc#IebVjfSzwm1j8pEKHAKtD;D+!H|Y?{a?jBw|5g7!q<Nr
zQBIIwl}n^IBtQ9twEdpz-}J6kF-T{f#e~G5Xi*(iYh5l+fAGZ039nVqAEB=uvB@yz
zS@6h76D;iOdOW+7(bafC*%%(ox14{8IlQB>Nm*ICt-+<BVlXc-gmCD+hAKrKKA1sr
zROa^RC3Lwy1_`lS<e^Ue9*rSd#)vI%Cre#h(XsmvLM@$p#twp!1=WYs+3ZM3NWU=U
zlG3UYrSc~@cutS^4-=a;G<G20fSfif`N4rdbAUgXng@>VCui3_M5jl^mjyndsjFfW
zvRxB&WZ0U3x-}iFHey1#+->M*d|tkOuTU}N|9eun{~c0}G#PS#-6*{y_m$_$r^?$E
z7odKhs61#|!T+5F=^0`ge*%1IgoFMY!v)hbT&X7w;e-wi)LK}fChT6HUPRDU#={g-
z;fPsQm<(4;&+?`!)LCY?IJAUY!78~|Ic%sY9MYi$-7;L#>9ZDYQs>wwBVhtWa)k80
zP39mQ_lFMKpnr`Pb9r`l&jt+fnogg!u-{%p*MB}J{NUg7kO6!=XaE|elcX!9yQSx)
zFXS%revlccQQiPvK{3b(@R`yDGy+qV1rYmtva&^a3}S!(kpIvuW&@jYm`h#<7L!!W
z7id?r0CH<abByl!l<8^>TBD2?5gPy_LQ~h60qa<V3#~{K+K;v&laIgqRJ3r3QDp98
z@R8J1OorZLz-Q`;776C=#1@L7^Y|{4pQQV|fiC$l7)x7~xcf58JK$7GYNQ_5-fj+D
z$Ih7p)A0j?3w5Kfo<<QeFcL&Be+WBh<zS7U$I^is+hH=0yD!k5vT}gNYnBeqIGmyb
zbF$bVwB3$xvUEVksB(jYF~Wa3@*l<_vGNbrE?M~h%CLI(lBUA{yId<x1r+d&(iPGZ
z(zo*7@}YqIdyIS;*ag2=hA72KP&rn)MR`>D@DEw=|FxCw{th$y?)!x14p_6YohCZa
zREqol0tl-g^Xc53efgk|Ct?QYKkgvV3-0)ayBUlsYYVh3s{#d0fcq1cz_lNEit~)-
z0r!pY85K19rpc?|4#0g~aaNdJvEApx<vwQXF;#UM!L8uFez>Nn)~~${xMp87dNw=-
zR|nwUK-D$Y`2c)y*D&@DHD>{b(y#V~TZ3$5)Shs4JTua(d0H+$u$j;!nJMTf5I%Dl
zQ~|=G%fSphLanh08}gLSsj8eiy1cq%hPo7PFJZ%~`b&a=wca{k)V~Y>9Y#@*&j|Qw
za6<QQ^#!<jHgBV!=JEi5I0!m`xMp@05OTWIu+dWe3|^NzJy8Cf`ebR*OzLrP-(nW%
zulg6jSn^>~&xB$xgH=#>0(5gdXi%qhunuaF=d)-aKj1*CU%{=-Y-`Eit;WkWt?g`}
zz(bC7X=B?<{_ttOU;uDj=r~aoHEm@6=Wu-;t2}===>H&V3oCw!uK(R-n(S9n<%w`=
z-l^ok`My@U<G*&n?P}P6#Rw?5X<Sdkt<8b@W=}<Xq}AWiRyY@u&480K^#khg3}U=e
z_dG%rC5>ubd<870s`hBTmq)I2gI!hrS2~bK;rRvr0HhwOq266Zusc)u;HuDJbP;ri
zEmqkrjs6@AC)8eB4R(P-n#L#)8VYt1`e^R6@MzaGrV;(4b3y%{L>J6`7oNP)_Q{gs
z8S{=PEQZHv!W_1h_*MlN{7cR@c=CFCnT0=E+FlRIj+#7>amf#M0_btUOm84U)km;B
z0h`CrA#zUO_WuzCkiJ~<S<(m62~sbJ{~2L1#a6|pXQ!j!!5X4Rn~kR%x$s05J5h1Z
z;fD%33V&=`R`z8$91K3;)LlqlAnpC^e5MX@trju=+G9nmk52VvHa>&3*5wN}ZD#f6
z4*x{x;?mgEtZ<&G_kxx{DfK&fY!*wCSeZMxuTVkf{;|VA7dA?6a;gi<4r3-eNE+$X
zO<pz<-77@D=+@YwSt;XDnl?zpS`?DLkUTp6SQ{Y0&Yaj37#l!<acrmna}eZ)V0j-P
zO*PCf2*8M}YzH_Wny-N|YWCL;Vu8!$JMNk)*o0bRhh)`vs~`rL?2vq;*bvzu-Ew3h
z8}6JTCkXR`>;D%LWrNaHK3e*xbhNY^S!l8Pvn&Fq>v9;=@p6mPr9{1BvdSRBMmd`&
z$Z5=X%OX+ds#sZ8Tibl_x3v(oAY9(6oILvr`{I?|mwzP;e>65TE3<&Lz60FyEYM@6
z_j|v<zIu<7O+Z6Au^HLVct}iQp&(Dqc>C)Us%S&XcdQdLq;~EWE9DJwI!!VlkJYBX
zK4aB>Y)D+!^f7&jlB~XjwPK>yvY70+?RZvg?$C>bYS+h#q5t5==6LG?8>vmo8D<Z)
zzShe0|K&Sw7eQ#L{;wAqO(5pyB|!W;1AYxkpUDM~Zs%P2QN^PyhHT(ZXp29+b4*fE
zY6F*+hQ*=~5U`6f1-%HTX3HcQwX*`&+#(l5d^oT<8(xyp36t*b;eXGo8Cu;^7dVjq
z?yc5bM=y0~BC$ZOb7-{?9o^j5rgy<ge)JSzvim59<`{jTmHU$UE?{mPj9hkX&3$PE
z6#bmFg4T2RsFnW3;b@yfPtyBNB}ZFxuyx<e`TsFQ*`z4)v5@~~Gk}3SLdIw-UZh~^
zodX+I7N%ax9D%&i=2_qmLsU($l_J&E0MI&cur!++m7{nThD>)!1@GR+w$Yp(w+q{7
zFm`xWUXx~R6=2N>3M_KN=R7(;XVAk!bq%p<W>$B~OBWe1PHPQ+l9!(3LF3(9M8Ek^
ztSalsM<Kxz3zaaIkyD<UXu}CdVwG9B*V1pxCE_M<f<)X@R;5@fJ@y0R0V;MrCuRa#
zAFF^F^{XBC^@aw)N};<%zPgy3z`M_1B7DrwKC#)*07#|c_;XVDM^pALV>&MI4aj(t
z)bu@OE%K{EqkOSh%stF0TO=4Dz&%WlsN!GvdgY`u@1{ROJ@owFha?F6dyafB<pU2e
zM+$-!;Cks1>1|nojG!|it=KX0rSik_Yf3leAZ4M_p*-+M+5M9Hk!DJ<0I5F`Ro6CZ
zV7B3$Y`h0%iW&LoB(&lfLx9{@p=ru8Yp=Tr_2Fi}>}&K_=;oKSkDY+_LAso*;}G08
zX_dk)rffCt2<r0b3xv?;%^sIL1?+e9(sT%Hic*K*x$SNB-Vg_+eOsrZFQ!;JEMkww
z7^4@f`#oLrtfP$G7o)|L)?y0Sy-<HqOi>onT@*JB_umn2n7-B?QPsT>KNP=>YVX-M
z{t<%=X|d(mLN911&_6QW9M#?Yv~EyY!rdw%74K`}4KV0M`dqzrGjkw;5Pp~6klM$+
zQulGJvue0E=w^rUC~!YP*MB$ZHX_{yxc|%L8-e%#5VHO(0IvVP(C0t7`u}HtaVUWS
z3a<rA`h`Pge7+ZU2M!SRZW<-Oo&mPje7GNVnzlG2O0oNRr(L&#EOejZwCmwyLd_Kp
z8F+IJ7WaCGqh_rpcHi%?u_?{3dz(Yy+L$)c9pw7I6CwYP{E{35{EuU#JaXcHetC6v
zjU53@SRZ+oQzk4^G<K$NZSw8ZTbMM_<EhgHrf5ZMVO9ZOrr>k%!)!BTHIwci@f_Cx
zxyA{Vt%@zkO800+{N@srbvb$dy=z&;uFq!(6^CN;vyv_>oNcJOOF%f3JpVX?SNPtS
zLWL`0^O%t4RMk}!tZQ#Ecxsw+Jq%)L`pV7Ol{!bq=E8(JNM7lbg|^UbddkwL5Vm#z
zPW#N-qc7$YK@uTbBe5E$fpj`NG+M%(E1D?*O~qc8SF3!-lN$w-L(={ikiV8YWku?g
zdXkGQ?SH|TH!B(240BLxDk5h+u#C@^ck_kWvNE=u$)Zj_pXPpJK;r_om#25qmloB|
z;dNdkMtZi!mStstv2sPVO6MVwlOAMM_IQN{i>JcIkB%*cX$ql8*?e}pyyWcT+gx0P
zR;Pm|3R7TRtQK0J$Wxr|yp(OW<a(KqVRc0s_Z`=9<nC<-I$V;~kX!ln)mjvi*XFnI
zg|<Zuv5mwQXQkyxLdRf?58rRCN@dr!Apg$mM9e`@oGpT3&O&hp?mJZGu#0}+*eIIE
zf7-j`x^ploT+K(qDx>^=PvR%!Qu3PAPg(@}zqjQ6kO6EH@yl;2qm?6-dw&mZz#)4=
zr&h}G%Kf85o{v6eAr(7h;Mmg!a4`4gA{VR(2kK<{thHF34G^D=+?@@Spq*gu(379`
z!z{RG^RP*<&*EXT;BW8WVldbg(srlQ3{<#a$vOOvnRNue`E5~XuBLH#I-5CWwX3>c
z%lZu_H3VJ%yYhczzr$hvggcSmh4gNu_aMC&>3vAIA-x~z14#dh^g*N#A$=I>BS^O+
zeH7_qNOvIp8`8&-{vGKPNS{Rd6w;@WK7;gGq|YIJ9_b56Uqt#6(wC9Gg7j6SuOWRM
z=^IGjMEVxew~@Ys^j)OyA$=d|KahTa^h2Z{A^jNXCrCd<`We#Ck?utL1=25(eueaF
zq~9R@C(>_`euwmXq(3125$R7ze@6N*q`z>g5~LEPs;nxE=BT?N-5qHcq+OAAL)sl_
z52U$Bdm`<Hv^S%D)IAv8Q{9WvJauoReUbL#{J)zh$0)t!+vG9QeNq9rhPYuxKw_)_
za4cCQ#?nVNS;U@bZdt(CfOEPjOA+~``wYfBDd&kC+tD#Uv;@2)oU*8CB5fdzhFyY9
zN&5Ob)`IS5Z4me*VBeauW8dh>l<`Di9CN0-r2X>#%vsqyQD6zh8ncq&t(=z3W#pAh
zHdIdf=63ocjKlhv4~8KNV;vm^Yxaiq-SQIobVV`maE@4iZLA@yq|7>1W^L;C@Dz^f
z<XR<S8HHo@OdN44byiyh3;_VADUHH}UK|KEcZe93zAjb=Bbuf7Wyx}~0kyg!KQx2k
ze^z|D{!QU~^7TKB;(zT25q?vpXQUxu3!LWsM2yB(X5~0#t(va2EGGZx!ZAF$*NIl+
z6|vT=baW<P2|$4|0(VODX0%jJ_-s1;5k{$VSS$=5X{_ArbOW+dCV`H7GIha#Jbi%{
zK(nQsV4IKY*)26mX&xY_U41EAB0Y{Q6B@fB7RqX5v<T&t0beYUP9cbEzjKjLSv1y?
z)z`Pq5DUGxNE|C2dhEfxj~|F1#2*W0<q|H&8rKR1(z@sSvZ`FybQgLUj5TMa_DUUW
zS~#XIBOew?L!P^`a?(jB(;riHE3&H2?5kC4Dk7is!evx)sZbra|J4%dWqBXz3VDH4
z3)z3(2dv))<#y+Lz^*$jN1)gRiaiIyXIl7Shtc#Vcw&bpC_CI?hng1~Tw<q{+u#;g
zxgh7LlYw)VZS**&&9MPKcK$e(?*;G;_g|c94KgVFc!+uIcX}H_D|7o_2T_{kALKKn
zx1?6U|LL%t&A)G9YivzcdS9!U=~|0I>G<!aRZe*0@AOC5>j3s^HJsvEz<#A$n6+sx
zR&L+HPLu8z|5a#1D7Gp)hTR;qU0Y)+llJ)FeH)iP2*hZIPG=K{0d^&TGg|=3nmk<D
zMgxBVzXTGB(d_Pv=lEJ63J)@XH`Jo@f0j>>R~TMV`HsJB5^NFvSTw71UEK9*g#z-!
zql?*>$lZOG=}WX_^(8F)DJ(K-llO<8QaNemcKRb!2!4hU_!3$889IskuXS)!&X-H4
zRZhPDP5L7=ik|--vYEiY?STCKy_6@70}PO6@BqA8dJsGSC3ytIMJ<8k2`9_f%XiDq
z$R7Y6KtH7r@&heX)+-k&e^$2to4f&8I5&4)%amsZaU>{rt;dUYUybPfa6ume=zakG
z2Q8wd+;=Bk(zxx=nCC^fs5dOS-_+h}mE=Y9!m>!>g2?)INm>k-MFc+gpU^eXQi5`S
zfe+g`=nQkoRp5r^!2d?8#@fFIGuWqOZ1=lbQ8?vNgJWRjGK1~3bBV#1>0MsX>rZrP
z*~<k^t47#x_vI`ngDTGsaFkJ1Vb!TQAg6&VFYIN(pcg<!!V%^asqV(!O)pb+eg<Sh
zphiD6m$hHbDGtN-2)WH^)x}|UsRyeTF45$R)582U-PxF_Ii&%}%MQ`Y6d-f~4RT?R
zbYW9T&6(+?!TRiN5xC4B?aF4fnj^x#sJmlDH7q?ta2b15FMJh64+;9BQO|7npO2%Z
zsNJyDba7CqS_%xn<CoRmT>f7{lna$nfcIM^y)T6&nXLGI4}1Ey&b{IUw!bVgpiu`0
z2xrnAL`8TI&GEI<qbPOyWV|hT<d`C$R>Y3ZN?bNU)zpe5(x{+|9XiSxqOW;0c2rj4
zvUMa?t!1&a<=L)WhTYmI?DCDV^;v<93L#jv#=pt8myfaGHX^Yjf1PO^qTFdTEuGAe
z=>j6<S;)PvRJvx;3zd_O=}mu3y<3-6@8~+v8JU^dEcLfEc1kN7#vW_-6)FnE*0QPM
zR5?gPT481ut@bu+b5$rIw_ZZ)D&JA|puh<=#5%GHF)@a})f)aJFHhi_^;{wX57P60
zclmH4A1<FJKdtmtDwR`}hkyUozw3?vBO~Atj1KX<0E>Es*E65z@jTM0z9em6N0u)E
zi?~JPheLN2F*3xV(!?fm#9?%%MPx}fPex()OGTdW_1~X>&re9cOX;J`2ekjk{zvBO
zu5M-+0jGL6>sYtR9wXo2ZgrY4+xmUR0K31<b9Ihzq9n9=8QNlmfS41VZXX~S(8SIy
z6zUDw6wrzITIvvzCE#!$u(W!(KXn-JZp3PiJAKL!iuxqw|GSb|L<xia|1WYanI(NB
z9V_htcmUb{H!q&kjm(hp!9+H}8tuKJy<wHNBji)GUtG(t-az@EvI7o0!yk>dHWUJ1
zzh+be;1$(VS&Wqh<6WsvXo5Z0rM<4uQj)Tiua+<56_2etQeg5z@h+6fJIFzG)?%Ht
zw6}<86^gC}4e{M+3e`~#Dl`d$Ch@R#j8@HoLcdz$yHUf^BnQ>l2*ozS^6Ja9Dn;O?
zd2v@aQYH-m*Jhg;QS5DudRp5<%}VmO-h^?)HQUa!oe>M;N;l$_^X<DbBSK~B;y_aq
zAU-FB{-pSS$j|420COn)5k_fAT<%7yr2XO5Hci&QTG9V8CHFiwmy2I+vu$~2Zd?K(
zI8Ux}YDgY45tXnYwNT9gKvW3Wt+g3%QNrQwv}u(+zIsyVZ!UQi)<5|FoTZGDACc>&
zAEb+=F;LJ-=EVDSBPEjCekcI!5x9wnf^_Z+4AiN-X4~bq0}zNqlKB>Sy#1%cmle(l
zfWoe*j^@~*N;;<I=wneh_Yq#}p?8Q1SJ=SjX1j@Hy5Ap%)bTCySo`)THzO)$3hI^|
zbJ_gswAC|O_%uu6z342bQ_&`SMzSh{E+|L;*Sa(D^%bHuq%q!;Cgm%1@Om>Yrx~iV
zdaBlssX{-z@!W32Cl9lq@yUJ&>NY|BMmjfWb%>j`Ki<RXXR*-TS?KeYRNGaxB;MWW
zXEEpk4VuAV^7s+s1cLEyPER{aWnYd}X~TA{HzDEUQ2xJ*Jdi;2uMhP5{{+PUwaPUL
z;2Q4wZ`TOG2-wFUR07M}=JOU-Kt>X8Fc9^&d0HXClxOTR=Hx`hRHo<dQJ?)g#w~-x
z8!%(aB3`Bw?6JgNbg*m3_+=hwTEG`-Xa{hqKwZF7!m&ep1nflzyO$lX%u^Z(w?LFh
z2##St)BJ<VzSy@a+|JePJ^Z7TT5EYkdnu#*DC^N|o3$);H^8OSW3R^%ncp0yedR;7
zGUJ=U5)olmiyn=+%DHg<R}ql?3zX~RMbdkcUsA|TQ1om5TNHP9Bg^DL_J_)JKPWl_
z5pUu2ptl2Zrm=H9PxnV{<nNSMnc3X>y0BNxjYGovBhs;b$(I+^`M6moPy21pgP0+B
zW^-eI;k9*fNJ`%%k8sfD*)W+rUO3e`)Qy@a6qJ0&_E~7V2=KW!-j7E4PIpiVHF1T(
zRs<i^8w9};B8j~L9*(c(rMbB9%Io;Rg+3E{7>Pqp`PK5l4k|B!IoA<|%&1Llifj1M
zYM#x7lF`d6Cmrzv{Shi%8sD3ye@&BmDEYOf1;gQnU^`!(YM$ZG>SecLujUICtcdT~
zjnqn%m9$~i=Xjg^-c_D?4S^_l<wU$4-jHHZ*6871?cL8Nq~TllqV6hbdSmh8!ny4s
zi1+b&nUANsr{T}W-mKQr6Fxm%=ol=#y~M>gFP@h{xYkBf(SGSMV%Ujn=-&M#VB0T#
z{!b?mf7&MBEPt$wQ|gpUQiy+IJ9hoOYXpQ5C{(=G$KD)oOAGi31ww_z?XYL^<-PA}
zTV=K3{y70(y}u0-e}p|V+S&Tq_f%W8n&p#iVNVlmqeCZ6q-V^&f3gP)H$3i#hI$G>
zpBGr;sq65-$+Q|$G=m<2A!hG;jkE63x3FqAIqNR)DXhD^(d@}HZBal{?JWs3f|b9$
z-p?!Rw8j6^Kf*G{vD~Knp3L=s;Qzl){t-NX$4lF!CdmcbKgSUOOXGu`?(;R?;3{u4
z5XM8_@aN<gi}*g@vQ^j)m&OM<t)K$<&?X8s&$$Z2pW{2e<`wuS3l%Jn@5cmG2ghSg
zG|<%24!K^r2S=Xq@A0mmc@^QPP{sWCz;0x*JitK}a{_DEBJYy?b$tIj_=}s%g%`KR
zJsGrm+Hp|GvH^nw3TXEr{vZ(YGB|lS*=d$wQ~Bh6GWO*<p~~g)0ZxaD0oWHc0sF!~
zi1F{jZP)WET2-Nnx_E!5ELpJ+5@7(`3IO|K9maxTzG|!_B2=<Io)4-xNiK2lQK;Ug
z*ynF=@rD9xSu%h~xE}H&^D5I_9re>Qy#AFU-`Od}RcJttT;`ww)szLK71O#F_^BTz
zpb<dsVD2rHm;U+z6W+l=7$OV;J^u$15ci)YJEh&EzS3x^SXwBxO2<nVNViH4ORq_v
z%e~~$as}uI+U1MoZSw2#=Zd1_D-)EN$|9u|`~@ykV#@2nsqhE>$(-<1D_x<wN1jU_
zDhr&Lx)=8jOUerBzTEvQuP6ffDqv}#x75M>X(NNG?#(hcsd^bkbu+g^TITbH+ERPo
zq1<^ZZ+f`J8x6PdDLb=|OCBJ@%@OZvz9tLsadC3@$95G5R>AsB?xa(-Vwx`^wcG~a
zdrMkcc|K}&0!vk7%gn2NxmTRcmY{m@a;dki9_t66xd>>1**chnt!6nU8o-~Yk@v5t
zmrHg-|7Lib*nOp#(5I{g()_eQR%5pP(5y6(_WER}3J1I75_qaC)DUQdQx5K9$g%D8
z4_FE8RR?hgJGhB%0Bmv03~K;@>H+v&%e}Zc9EP82ws);J(#}`!Aw01Uh;m?xfTqJb
z_p-xL9gY1FggkX0=8H&$zbK%rv35+up`P8|(#l_ZAkG!T8Ke&4b2G0Jk~`AXOkJr1
zA^yY&Y+O|<9RprA2ES|-h-DxoHT!tW#_@bX8CJcjGH6H0oaBW}?&yA4vL*mL8NfWU
zb`RnF{}cikk?ryg!2b_X=0PryNB+R&yQ}K|Uq-+-GzoZ)P`w{g<#-Ec!v86vXq&G-
z!uJVRsV%^_{yDac+v>xuY^J*Qp6Y_L+A=1{@YHGsnnNpZfGxw*KoL#pRCi6WMT5~j
zUk3YGILOiiMUu(0Tti1I%Q9A77DA<(tIWx`(4=0TM%Zq=&_;HMyGGfH3c423q|bCb
zqu~}hLaSNd4zUFcH$1rtKyD!H6kOJ;Rx^&wHIDQD2NPwpGFZM#u9IGoj*|KS0>Hr;
zC!s$+Duc}hD(AXBz}D_)W4kl8O|hK^SZA^9;7x>cDJ>$0?vIajTopC^R)J2|7hL7z
zn`mB*schoq$Q6d(78s%x@e$OSG>w5W*(<9}+-hf^aszVjD?~)RMe*TI)uqf&1$XT{
z-5+D)n#ysh(34IjJ`DKF-Q`&h_)E%G!g(BSYXe0&DDxTHGsowJFlGL^GTcz`_ALJG
zLS2Mr%#Rm16@5|+P>L5Ca?yeO#VZ~VUfdWTn!$jX{8Dp#jqPAf296o5%e+6PqVWYd
zkU<e6YgHVM$#wE!4u;YGq_sbU_g{w^&eonn50}UHcPeRBhgXAdz}!fnm3PnhcmKDL
z{|~GXs-Wk8F9Hx>_mXd<AyU0`q4d1mQ=S9SKHKCUmEn;8;~WLjga3E_XX~b^+x8gP
zK06d3w1f_hYo@K1ME_W*12$NGbnIsfWu<#ynl~DSlY?%}R749$f{a&lskV+;`iCRH
z+l3%K0vOO(8~1TiC9D@nvKQbuaV;!uC3|>+lLLqWhSA8r+0>7XJy&9HsMEC-_+v1D
zm9>E)0o-5c3n1BKFvwLRt^*y_?P~!J*8_e9)4f3^^0<aO8Kx4Dfx+J{HMj*%4t0o!
z2QL-M+c!ao0Sa@jA}5D>X>x1^IGHr1APY6{gru(VP6h%#cta5M2++82keya8kHhCy
z!F&Ps!4E^vKHfA(T$Rtessly<47Ti{{`~x3M3f7ZJ>{+P6zOGYz0`yJnJoIPD}H|b
zK&ShDN@~hW{yO}d1Tq6e*s|uwCpdj^O7hK1{#wf&Ze})z=L#<l#Sh5f`3I|jGc?xn
zrnMM)NQKsuJA?`s#m757{$Y(lz%Bh~YF<t1kHMN|uw||A^5yYyP7e=3y38~FJ?bL{
z9ti^`Y64fq$2vV2S)3&YsRXOJJ}qvZ?WKxMcq0416Z*C&KE~<5>80sB-5<lNoB8}&
z9v5ETN#cdTH!1QAdyl2mL`bW{$V;o@Am@g@<ZTFV657xhAMKR4G3zbNs*FP)Jp?N%
z5Gvy9e<jWT=a#RNE5Q5rG-)(>l&t)%>)+=2dGW)T5#PbsCe=21+Hd5-lh)#{@OPmj
zb#cfW>CB2RD&<5i-KhD<%LbPVl`M%*$>95yoEUS#00d_Zs%Q0ojcgvv`_L-7=q`#w
z{zqrt6M79+p6-vDt59v<dXv!h<?(}^?gxU}Q&58zzB`h)e}&loh4IN?k(UQLV3ccG
z;Yijb!Q}6SafZSJTa73wwZ<nowR6~LC-bb!oBJ|swVBN;_Y(%JE<VxejH+%2t^|BN
zlRLCfP#D1(wc=@^lJ)U}92+6hYC_ZMNtZqMCa!<6e$M}YLC6=<0I3?H{{JGqEAIh0
zf7UW>V4)HOZ-7^9*7E<4#kQ_g$(37E4J<L&Xirba^r33QVAC9&j*HbEFexZTrej6%
zsnn6Lj(2c-Aehwg4tLPy<O)<LJLrK)bEA$LtN3g+WY`0v>2yC^J9_d%=r>JuN?QFN
zuY&3*Y^`+pX@#5A3({#phNY9rv{yj-T}wu1tb-o=L1!6m;D<(uE$mQogwl9}sr?2k
zvur;JYG+;G)U*r#_t$J=h@ZMIQa4f+X+F~aNCzPGARUNwKcs_@4o12^(jiEPA}v5V
z4C!#BBan_nItuA%q=iVwARUWz9MbVf4?sEr>48WOLOK!YB&3s(9*p!5q*IU{iu5p~
zQ;`-SorZKe(qg0~NK28<KsuArGPRu1*=hx&6>24;RcbY(hpTfKtx@M9oriQj(gjEt
zB0U1>BBYCvE<sw0bScthNS7n^BCSJOkF)`)4{0N#el>t}1=41uL8L86LrB9&Tam6r
z8bR8IG>Wtx=_;hFk*-17ffVoz2-%OUCh+fcaxJ-!yhJ`G|C08S3Z?1N0%-;K0bC;e
zNqS!Tm+X-z$VbQ#c_YLL{8j#klA{bz4pC~97Qha^Qn^ogHH&qGW=*4(Qr(|pp5#@7
zt0ptWLdrBI@fM>cR$!~tiD<huDRb4KXpl|1(5M5^YO6oq(MD@<L{bNHxD*SkfjSaR
zv^oJ?9j}$?k6f)T-MOm0)#C8P(J(p_sr#X?fbkeat9bgOZm3J11*UU)Q`+MU?ZdVb
zxH?vAgW+Iexf9d+BCGxQr!1Qt25&mhP-+q9YB?XS*%VKVDi4dAd};;DVW(Em_R>@U
z;L-+RZVcuO9B$YQsN`R|syagL{6+9!Ib!To^VS@WQBMuvF$k75dI!T6W>3%IZUQw$
zt>Joau%i`h0pNk5IT6g`@2;5^r0Ucm+`Wc9*T7+QYN+Zk41hWzu6pEVrAGeQYRbTi
zJsOCDU5-7o4Bs{za19_R!c*D~L5S?iVm_EP6jG=}bA6xBG6kwNmEqN3Amf-qLxDq_
z5f1UE7IK$?8fw2s<#L60Ex)!L+gC&V(ktk=z`rIRUo?yOz|^pdEj}1+_y-p~rE{t(
z=Z-F~E}5Y&q4Iw>GLhQ<Cd#ito=>-Qx70-5BO9SG&407vW!=aWX-^R2ZJe)*n_3k3
zA(vdpoZ`xgU-sL2Auox~bShUHJZB7kGzUm_N{*xBG}}EWbQ}n#)q(mbNOKT+!oeVC
zgo6z<+f57mgn4N%kNE)o|3cjaF>g-1v>RC<(^yKISiU4rr+LX}?lMK6G3;iDDG*V8
zmc$`tecAxQ<Vzt9Qi`#JeIfPNs#z>*6<#lD_Zs5G8RC+YuQzSjrY(HxpD?PUabIC*
z7RIMLRvM%vv%J(cKIjnCN3@7)!iDi^PG7C_<<a@|3_lf>ge&F<t*(m~IaLn8=27p{
zxkKd%1;aMo%Z2l1(G7BWe5zBGjo=ZMXZ(B8MpSb6#eUH9zYk6LcOsyEe<Zo33h8L+
zHtBUa7jyu}%lFGaDI=5>$`#5}X*Pr3;gYSO4M0Y)9_xG!g#gpi7=+bH7h=DwoIId&
zbM1GFg9r3_>3$d4inOUF75nPFNe`2LH#&Vn6V3Z|IBArx-UntYX1eUR(N>n%H!9G`
zB*=bYTSbBXZW_VH#`FwZW18-E?Q_5ZO;<g(>vCJc*!ofM8VuBf#go;0sy$|qR$F26
zHBfI;yB9pLnJuK>P1&@0lxG^vQsifcXTPJIj1D+ja^Jyzx7&*2$+i_T|7I$b!%+@_
zKhQ-;e9zc|ey7-)^>mL%!jL#1G}KcagiwF}+$IODED43%oBV7nw>Y@H6w<q5r&e?Q
z|2TU79}J$oQRxG)|8*nd2tdAD|2IE=I0JQnqs->yFY-mgZ7nbgO7gc!1xziS78>Bl
z_#CDRO%o%Rd|zQYZZ91xI0@a_Lnj<3?C7oWY8s)JCLX>f>RT0n)OWzSLM$4DmW2w<
z?5LSTo$xGIYMZO{$E(1SDN!&1o1rvUshEo<yvr&`JGh-);*~JEZn?;w1<|qJg*x_}
z<=C=e%hRyz{=>J@W3BwqJ4DB%rg#NC)@YEZO}A}YqUxmvzgK(z5?j7<QG9kcQXx63
zNzv7sdif&TmoJOYVqeeRl2s8I4Lc4vWw%9<n^(+5<eFbthSstJrt}b|<nnkqwFix|
zuK^hBLX(JP61vDGC;e=LcS6tqF0z||gZ6ZJgZwv;>JL*om4~d?{;tyhp%ECW9B!>Y
zo(o<-5YrHZIIBQ?U)A>LH{4eUx*QrxK^GZAb)m;q-~O{)oqZkDQdr>wKbek^T>c&j
z((y=$=CAj*`bI)rK0D9*4!3oJH8up?U#SG1bRz1zpRM1m_#l{cBOTyn2R{3(`9tj!
z@EIQk(BFFMgM<T6(~R1Jz7y=N62co`*kA-J!NCYL93ajo-M0FUvE_k`ukd<6o8qa5
zpGF_o5%e8M&;KsuAVLmOLh`rr+4A1fCddGMVTO6WEDpJf50{48i~sWjZ4ku(C=L**
z;!_NNb?aFfXGcRiprA;6Q3fPg!#fKtRUlmVAt*-3rjJ!x{jAB=`v@Cu=WcPDg&b0z
z*`JceYUy-_B-o9BSLUhk)`Q=>Pp@C8Nq=2FKSo<pcGaY(1^Cx>@r6ufktQjxu_3nl
zBU{Z9d1Wd~R%<a19q|Q>6+77e<T2JxyID#@3VAZr1~~KR0#RB2EiRC|ef?~{L0ufu
zk~hoyJFVKFO*81$$ay}NbjzZH(Kw_cUoRizv=VE@p|w7dTwK1*rf;1+<1{IGU-|HC
z<`-S_;91H%{|m~!tzHl+Am42`#9&kT7^lCdX3t)1p51ke=vhzC|6Bs8er_k<N@JyV
z>1OF$c`U>N-6VgZOagrWyEE(r|MAQA0F8V~vgn8+emb=kPKQ8j8fg)Q37Xt7`|oDE
z<6FI>q&^q`l`);r{qyYiYpX{~gG{XpCSeF~^Kswa{#|TEL916J<4XGHm$^Fkv_34Y
z9-IvxNS+!$N1X?x`iO@{`m$c^lU4s``yk{w;AKy`v+MutaHN4n_t6ca#>d~$*Vb*@
zvKwGQU{&v(-Iu4(C3WCWO}{<`_Gb#*{(IOb7PhLq!WRLve#21kRfhOm_<-IZp9eYF
zjRWu;RJp{06lcQe%{tW6R-<6m6fN3>`unlR_sXsbG&F&Z1&b*K0D1Nf=KtG;45Rpe
zx$-*cLurGQOU{4-@xS_b9Sy-r1AxLCjVFHL{9?m7X!ujkE9b}F#BQcz&zs$`N9R=$
zgm{636@jnBpkrvy_^xPmg*<<?-Ko$TU!EZ+k+F|fCK)R`4f%BTPMZ^<F}^GVcD=Dm
z!Pq1ipUC4sF0`o#j-I929X&L%*V{r_Rs%q`;j?DGN7}fYed}wEd0F_@(4yMxTEw^v
z2pFJtFdm!aSqz@o5H?Jsh*O`vH0?dpLf_eq5s5E>7Nt!PW&9lJY-{NZZ#myK@KHIo
zMi`Y~d~t^Sf5sM=&5SjsB66ehs!f;a`QKfdPQco~PP$Jfa;bch{IEil67UGVN8AK<
z{cSM<S)JyGx5HM&w%&o+ZQn58gKRODg4peCV+#KM1MHpR_$)CpLvws!N&&NGm|}ae
zM&y>bI=ee(DQbKT?cA0HDU>U`O@Vs$mVKwW0LH>HHrJ{dNm0!MXe~VSsDCe8ErRtM
zX!Hy46P%stofSKy3!d!XBRie~VphSa8+OE+_O@0ZByVNi_t?tcR&A%7SasOP*^z!(
zb(=F$S{!x%KG_XBSbeFPfQJ7j8NoesrIP{wFP|tUDE+{%=K$$-k}r)V&yY5l={0db
zLjbmy@@GLfZ!jEHkj@}`>_Io0^7ymEZS|(LaY(4@O~*;#+X{<eV+UnNkYg<P4S)K_
z5L#2kkLUCgg!sjA$e_9`9d54n{^|(4yQ!UhMb)qWYgj*g`*A-AZ=W9z(D;P`_L8Ia
z_8CDfo0LEKD>-31zWB0hg%`tk|L$nTHSs2fW^LctYCsXu%#n)z4{2GApB+(VwR9xj
zn3ZbA(tF0zr-oeGhb8{Dkl2H9UsmTLUwX)m(q*dFn2N}qeQvWk7lU!gGu|#2+K-&!
zZG~pvA+tLXx$RxM>Q=?;sqtx&)9O+?0p*2~NGnX;Qp1oI^yTEig?riblb-+m$$CPz
zfbZW&Qa5RWv;;VTv!olPzeyj1ibRt8K?cAgxfVSC&X8}HpOZgQx<U58nSc|x29QFo
z_zls)-1W&{R1fw-4i7LB4g}CEH?VzO{Q!NVXm71pdDY7@1frHHEz_sga_Ad7g_OEL
z_p0>D6m>2~U&)}`Q;*<iIX2%!t>?~%H3rE@twZlI!|Y<y*Qbq^rxeaT4pl=3W<DyT
z)iAHmUj&Gg0oZ#$*$WcU%#IeWirc~K^B2{@_<}i##}bCP6Pv#%=vxEjDCVnC?!f3T
z3Pt_=s8a9Ko^Pv%lTQP2dz^cx`KJXUVD*NRu?T{gIk>F)Aoq9kPYeF_ZmRue-MERn
ztof&d8k(lh(<jbQui}n?{^`KZr?lmeb`<;{5G?6f<1H}zp@lRvY3i20V7=3+v0rQG
zpZWLqPp5N@%E5D2L)H%V6l>R=+_BORdK%~-%hboFU8ElDyqZhhjohn|-UPY;Xgi?I
zv8Qk2pUqz!4h`jL0jFao!N20L84fSC8JkGm088rq{D51lD+Dw^UU*%B3$V9Te@QT~
z)>{X7`<{Yoin3fb(o<Fj&WezYkpUB`w;tdEh%ViYlj#kkpph%v1HKmKPfL4L7777$
z8H!8KbNl~%qFky>ke`)n0ssFDX$bfN&9~rm9TzQ+LmJombdc}bAt}r|VIGpxAKbrk
zV%_!hM>sB5#36kvBoeUSF|{gar)N^+Hc$g;YsGI-NG{%nXY*<izOOMJp{{UgP6Mqn
zW{e#I%AOW&h51cI<c@{BqRqGME%eGCUrCkUV>9;(^VZA=H#BHCbbfOgxx^(^9`w-!
z`Xf}eJl^W?8&y!3+)xN}*Q<Wx-((y1X5*gk3ROhoVTwDP#)hE{Tan$S2D_Q{c1O<Y
zf?w-2(d}<(Jj58x%!6p$3yoVNIe#Zsa6^;Oucmkl`%3moe63$?0bi5P(+YrP!7$*B
zl~>PD{pK?Hk`~5lUGD2HXaknUgATh=5e|ov;uL%%{h#EXHM}bu2c05xg`WRi<N_iW
z$N@Or-&Y1J3m^m7cE?M7*Ny)ZBVey+nB@hbI2;Oi3ul0EyqbbK!J#}2qI&^#Nz=>q
zJY%M-vyZikAoYTozF;eLV+W5oZ)+>)?mY!{VC8D_L@Ce-JLY<>9IwDe3>k%2L*CxP
zMhLoSE39a53)B~;-cv?R^r5y^zzU(KbI&$g;9%V|)WpWr$DV@OfzS${XY2vI#!g!t
zUaO~Bh0V5Nz3ve>k9f$4rzF(o2Rj94$$Fmdq=zBkry#lj!OeO$+A5*+6(%tfse+U>
z)W_}r8;Ei~<o~@-u9RK}|KFZu!+&a0cXo>(2`blIxhC^w+T^FfBmf8(@d95Hg<~B+
z<-!p8P|ssIR<t&$eg`-8eDx=`-Cl9+Q^Ix|ibE#ZmFdjF+Qwet1;&u_yA{4x$W9bR
z6@_In+5RSOzY`V++wYP%L|}ogBJ)vY;1vD(zsN<G;X!qcm>IVv4oPI8Kbgmtj%Fj+
z2!X#0`kK7;9W=MH>bESG?l_)}-<G!?GmYOGhvP@BbBzCo+<6R8h_TVYD_Ini`<7z|
zH_aBtuQ|S&norW?hSNUS9OzXL?65^JeLxG!ERm|;s&vMSSlh*-il#BX${`yFIjaE?
zpiCzr_)SIRWo=q?eNgCDQ@q_Fg8^HnFXRO|4;WfR*7KXorhkWB>KrQ6#Ls`0|MyJ!
z2|)ZB$?*T5{7<d_UG@AQ8v$FJcIqIazQr^?52h@Sv8wT-KYGs%4j%_q1w8;b@>%Nf
zvu#t~7;0xn-#Xja3*Egwn$d`BE_$x9MMls)5NM+qiXf4p-l1o});6JgifIkz0+JV~
zPin&L{A><7-~&p6VSuE9LnzAJ|9hTni!qR@4Q&6>0N*Qmw$Sr`cXBpSj#j$J%cXCm
z)4~3K_8&PX*CZgh<2t!0^O2ZFOO!@~L>|$O%PkiRo8eIj8F&#XU7VnHoPbvjATqZ@
zENYpjpsF=M?Lzd+ab1i*?d9Q5^4)mzz9QsILjqzin$kIZYxP$!)|zE~3h<*-ERia2
zW7SlSSX?Re)1QEtPe)pYIqkp|QzjtkEemI+sf=voR*lLL5i!23b8!4<7}KG0OJ*KK
zH)xQYcOJyDwzV;*l>qH$5I6<KFs}`S+mPML_KAKd(r;WkQW%nG{3wU2ig~TDadAr;
z9hjmvKL-B#?XHlm+xQ3Hve&6XwMWI*JDqVYkd~<p6n?;-f&P`sSk2t{#yPdLm-iZY
z0O!~~&k;B_dj9u>z<>DnfwZ5rO1c{&|7Jks-_!EX%0Ws!-~vASNA3n#cRKNtSs)8_
zQ^8_E9+PGlHa$;QGzhMIDPLXVg4t^$aGD==G;fc#x4LWVTh|@X;uaJE_B~9tY2MJv
zc3+gY?8RzV=RoHzqxr5^Q&42E{|AE<aWVp@4fURd^O$WR&t)@6^F0N{-qkorr==0F
zO=AS9{d@rrK!--TPoesneQrP9a74n(oa_lt3|AIp7!=S<u>Nk&*k7z3q)o6wgSd?f
z1@)mcd<O6DEHBt!SS?SdImYo`Uq@XSLK;17nyGuMZ6v8SAQV0vxPHx$uO4sfQ>i^M
zI{-c#bP`c^DZH9n*iNA9Uj?{N@`<z$`7>DmW=mf10zO^3Mv6;2r1xc)JX|i9kCktc
z-zD1>mvW#oLupbv02TN~WxMkBAFwxQR+3iGscOdie{ie={kdzNW+PqlJiUQr88x23
zw`J~PEW0C2N`%-x8|_*pSPR@X8;nKli*7`lS;?AKAEcJkEKFx$!%DpoA1pKu!f+*r
zyYRzmqX=H?`P0#gRN79F1_1FQ)WpBWOC09JKZ7Ycs;HuaJ@70CGfBA-r~$Ok0e&oa
z!myjRbAS;G=}&Fv@E3mC-31JFJ?w#w)$_OiiKpYxkDb*HiuN=8#$?zhC%WVo7+w8!
zXPY56yc!;~+wms2<R+mG2iuyt<;KlxtV>?T-|BRa;dw>;WyzfctFYZK@B`|01vD7W
zGOvA{1f~^^hEwZxjIT4<n$!q>drQrVx`ylj+K6(j(jWBy(;@%o@zNg5`{&=av^(92
z?!ffq%k`OAe7axF^tSWVM+I}d4ZsSP&~%Ov%FQ&xpy)--u*z+E&Tb|roQN8cbDt7e
zvepD7U~Wt2ilObOv~ksdywXl>J8TzW3z4<MTu#o``0;tS3su%8x;pfTG9E*I!=HmS
z*P<;i2=8B<=;F{L3c#xaA-bV4OO^hw(znBmg}iFO*8&R}Ozh5daGAfR<<#|Cm6B7I
zqm1;esIdwpc4LO$%<_cQ-tD(2tn0@GrIADK5(cg=kwYVuM`Z4rxLW-}0eN==PPk*m
zO4cS^G!|)k=1Mes0XjYC;VM*a{H;#{(CaUf6K9gjgBnZdkI+MI|38o@7b^S9+rfdL
zn{>I<n_N#0Ot<`76963OXpPi_AONPoyjHEt$)zY7|9HV3LPHx8knPoxXiUX$;MeK{
zKFoRr%fwhhu7mMl&Vw6bLN%Sai9KL*>Lt(1{5g^?8R-~_l;cL4yU0axobDeVD>SGv
z(Z`|Axe|7xppSAC5bD8qB2y9B+=@Mq+#*!8FwvXBst?TE?**WJLsrJ0`kh?9kiEKc
z#N7LZS1(WWa_DLxuvC8I-{eVLM92RyR;Xf8q9=v=8I-y8dQMEwmXQl^%h~et@xsej
zCUU7WV4D2N+L55+ehfT@p1aXs=>38AIUW=0Y)JHQI^S8A7Ag#2R%$<Wj0TlrvV<Jd
z1*^HfRj7vY|Gmgo0{=c^^8YQs^X~&3|61Vq-&Xo6mCEt|eQ^M3tesq>vf*|ziej_d
zLtu5T0lR9nog;odl3D&Y8T}xAY+6p`;f(D!y^^ixbq=3{^TA-2d^wE;n~#^MJXGy7
z$!b&G=mn&<rqMiO9eS4(HJx@_yB~rTsHYydZE?Zrj*Q>WwBe~|*`~$NIzm+-Md0Do
z6wu7+>SY<F=}H>8z|*EiymhF^*yi*x_&`Oe$DYdgS+&@|5)dK5I|3DsaeM!Nt#4J_
zz%m^`>>%z0gBU%m@oYxD!q5K*#s3)s`M)Z_0<c+{3Hbk!bm#wXxi&YEPoePgGw;+%
z@hT~3k!$$DT{&XOGGQY-GNDor>XOW_1w$;i8?kucHV=sF9tzyVkIZye$yJx}eRNCC
zqeAs_67Ftfp6t$CeGMkV1%{1PNsfJypPM6xxP_O_OYF;H4KlO3J|@jGlYR16=?xZ(
zQMTm`G0JjYVjqX^ZDwjL_TJ>LIWx91N#K$>vLFdGC;B<G#zQo16VqXXCv7XJ)o|=B
zN*hWB0Cde^^hX#Sf1<BLD+U$R%0P1pkQ5Lm%Ih+hk?TBoN}lqmP*pUsclOo+T7$K9
zz;GpH9ay$rsCIcG&mrG5Cjf{5sm!l_<KN``?Yw83d)_2e!R3Eg|Hnf7&n<GkbcZyL
zy#Mc8{e-Mc?4La|Wl+iMnJN8+eKam-bB)l;U;=WKgPTa^)j8eDE#1;tom{aE2ldB#
zp}Hjr$XM>ktH+=#^y~j3CrrfI*s?`<ePaUhl{@lAo(p!Wx*#CNRDiP_&U>+l+<^V~
z@&1TV5eP#AoeD#APNy_A6rpA{_kn>E2&~O$7j<$Mc|sEc{bGiuri90#UyQ|}?l+eW
zT!UkLvk2JgPe77$M<&u5=HkoakVn_@K{l6>Ed^NBmH!k*d2Ircoo6fm(}C2B_y+l3
zyvXE#Chs2ql2AG2|BsL+5^16|RhkJIKo&~NB|qf<UIRz~CrW1m8qj6Zb$|#Om$pgU
zr6;8qr8fa1aHsSg#0qzjdqZ@P2YiRe$P?wMfEZdWFO-+dez{d%188C=%4f=(<jWwh
z&~0)Y@(FI2pOjye-;_U)cgo*EjByvGx6)7XC<V$GWuh__Vv4Gjh01cp4_U?6K>YEE
z%9+Y0$S!`Ja+?xYwt>CjN##Z5P2~e+r}Euz;X!`;vxuL5B+~Urk3xDh(hW#EksgEe
zSfs}xJs#;sq$eOf5$Q=tPeytQ(o>P1hV*o#XCOTj=~+n6MtTm?bCI5h^n9cjAl-!Y
zLZlZVy%^~wNH-(hg7i|Pmm$3z=@m$?M0yp{tC3!V^jf6XA-x{y4M=Z9dK1!{k=}yz
zR;0Hf{S(sLk^UL!9Z3IzbSu&r(m2ut(mRpfh4gNu_aMC&>3vAIA-x~z14#dh^g*N#
zA$=I>BS^O+eH7_qNOvIp8`8&-{vGKPNS{Rd6w;@WK7;gGy8Z`{8wmV+N0J~1&_t<9
z@_`TVg}@0sC4DCMkPm?PqZRT|u$FI<ACX^`zk*deNSUnE!WunCxk<S{E9C!Qz4Xw&
zWRi?C3fpJ^F+Iq(>UD;zCczmkb!PDxO@N{hjKN-p=nFN7#+eH6uN4GZyka4?qBYNa
zW~rB<A;?+;HC_}1P3)|VILWgH_%q6kI4D)%d=4H2#b5;Es*(?}?y3+yn>svYL&2d9
zIDIzI_n;vZFS4>X&@2WxDi|{O0GeHCh#M9Cc^D+uX5NiMVm7U)Pon8nAHuD!z;6VF
z6vP)@<<;A<l~%65>T0yB&hd9NV8gG)*BDu9^*oG2WZqEpz-1m%Fd2O<fi;}lc@rCK
zyoL4r7X78D_B6Y+0f$#q;;E-%Cu_j9ID`(9>Z|x7GsmG`iZ*eb)j(tn)Gc)V=SqG8
zXa1$q<I?wXq1+&!BR>e9zy-<?5EbxWoBQ`yZzO-ngBdkL){Dj#?mMO6VQY;qr;J`H
zx`md;nU$;GESF$LWt!FEw1uSBI$>P4Y5a1rWx|5aIJVYHeWbEDy`zwR6Uf*oaeGJ;
z0mOS@+!c%)N5)|`KFqfiXAcRR4cGroAP~tvPJTwN1O4ABsV}*VOh~g#{0Www)IpT0
zMLW6wXmZD-ZP)xqE4C~>T#!$qiBS$UFZ7Ki4G?Wv)d&W#2q@q&Vw~CIt*($w8&HCG
zi<-A3iIEN^ctdczA=I6mdmD;;^)8`TM<zx%R91q1%sw1FZLm7It{SU9;Xa}I6^Y?a
zW2b#Izb(^q(?lq2qWR~V3(19XUfGtWmxangiD3?7g6J14<uORJc?=ST?O>nJR7~#B
z1~>GGP~nn9fx~Y{qo|UB_AI7K`zsk!wZ*$gc>Th}P=|I>-TvWE{Z1073E0?MbpLKm
z3~^{yp9dZ>LFPFIJ{mNa5n|X_my-*x!>Mr6zl7d!{U7-MuU7hiq&@}W|Jun9<PVGh
z@FgH`IB2&rE4|IWQ+`v?)JuADOaIYV3O!$wfHdOS#2ElDO*c;i)PxpiU~!GSrl})u
z6kUuO69+g{;F(1Ri0l@m2y(Tbf8EWWZ4~;rB*7AlI|wf{U}XSEMhZED-1z}co})$Z
z*yRaGG42TFLEynD){>4VCx6pakj<hVE|h>2<BlRSt(_aKeICjC3$ahvT_g-yeF9R8
zgP%#}=?7c05d_2p3vvkVQ5(C6PE4IS37TVkcex_7N;>IgVu$>Zaxt;FLwZd+3eFZ0
zuPOiEn+zxLua=xcwo8h1C~yD|K@`9|d5iq4(iOCFrzsB;lF^1NdfBMwWaKd|P7?Ko
zjC>3|Cpg~HOfO=CC2S$sG#=BIJ-FHVqp->ioW;8t4Y$@u+Vzz#aDPl2Q$Qa~sngTD
z6P#j?X{+yj>UB2S`OAO(doaTvmwO*e7wgZNUt{-H2O#VifG`1-h?6${qQ7OHKy;V{
zY?n4i6G*TJUXUj6Fx6ycF@}h*8iw-@iW0<8RNuD85!8Qz<lbG>Nb!vdrh6lhPoN5;
zDDJXNV4#18g@ko-#y|!--rVn>vd8nH8XD8R{QRFwAm>MK`D%HLbTt?Q9{p`dbdkiN
z%)*y>YqM(><M}MwOK#DOV(0e|_U&L|ibE5hrKAm7FSF8$JVEf7Sk*36w<2+fLl)Xf
zj`mv=l4FpC{;^H85OwaJI2cZgu5y*LAx%Hc*x;tUg>2QB>-K>{zaxps4!^A((3Twn
z7r6@Am><K>3YGd3lN=i3=!6oE2G(6;899C@e%F)D(#k}K{D!p>)o)o$Zb3=&$J4qC
zeLFI7kV8?Bd8W_~qTfo9*>A<>Dmh^)_V>bJLiJq!2mH^gl>;H>uS4!FT`3hp_RoA^
z3>p(N9P+7Vzd66Dh`bD~ILOyXe}q<a?w=@y2@X-BnJ2hOkDti^;Lr96vY{1+YvYYV
zLsuqB96B%HmTd|h^V?iVdhcKHl~Cu31mxj#gmgB|0))>BnUCC$Tg~P@`U{mcCLkN9
zBi{lu)SVgqj%?lppL{<z{ShjfpMcz)j&M{{N=tw8S8|~?qmSDvyx5y4Vm|ws8F(F3
z43D7|3cCG#D|2+Z;>PO)N2g!{5_3B8C$Tir_^nFGBiN;-i3*`h3loPqR5|GI8g<x>
z<nrS@TnfJYHsRHj|KEd*C7|(pQgTUC!0!KN__JAhQyw5Mg?vDdf}OrlSqwOz&oYf*
zMpk117=>VGf_)GGnp;5;7v;K%k211l@FdMltB;6#FQZo}&t0wI`u#nlhp5>l=8BAL
zm$g<!y(XjNpo<8nTXV`A?EGvVjT#<3Dx=;y<&&?TnUSqcd#c2oJx&{F<xF`=#;*aj
z!(1uzq>waMWz^<#-$7tw^}d6zJA4d8IQ?Vx*)=tmTOR|Zo|w_XlJve*FDi8btW{be
zPq*K|IYCF!3}|&^#!z70Ti7;sf5t{8T{+bY>H1g6B?SJ($RptS_pOvG6-Y%=E$jpr
zN_R>xf(O7PxlukBe0X-qJC%JQE6@>27@`6$Rqj>ZV0*&9>3>PnCO{lTA>~^N>2hT+
z7bGmCK2O}Zd@(}bT1OSB=VH7jz06eD@1vdG5I?7$q*X{0$iw`a6Q)qa?16VQqpT1~
zq@IHYYfDWAzK<?_BLk`?5X_fevNBDmH;XsG#5L+3(3Vf%VA77O*N=C}^)Nv6YD(_U
zphm#>XyY?>x`GTh8x;bhT=D`_Yiy-{ZAfX`McH0Aq@o0m0KT;O_Hz0#mt2J{Nh<=W
zcj1(xud@=lG2)kAwh&a+dvS)b>#bTe_@l{EKq9M79$M%HVsSKKBkT?!oFw+gjQNHr
zG&pq*9VN?N(pCCeB1FDGzCvzRJkr<lDEVcE0{Y*8{PAzvTmH9S+oe7uGgf1<2?A8?
z0tXBktccW%hk>SN4EwK3RYoPU*{KLBot2S~u!wty=N4s#jY$ieqXI5I=`uHCqs^{5
z@Yu36Y^8>nS_~0K)XfR<$opFA5NGT>c(^Q$zk&8J1TwaHoADt?*WG1Cnucl*%?>~{
zNmTTnr*Zw?94h}8%YT-qLjJ!B@(G!PU+h<q&b<>=Aj|I~FUu@}LAazt$OY>2@9ft7
zo<!mO<_iT`XKA9+A(*mJsDM*cw_TI7dt(LlUkeq~CLpo3qs%5n1`vI};m`5kk;=)(
zSJEHh{hhrMvtela$O|&7N$A0oI{EF+T7f~Zxs6=QyIeVPq!^yunt&wOjv~Qr(h~Ts
z%gK2#3e08wVlmVgq7uqs6dZ+U8%H6<%NW=bVGykEBG(r125oVP0sKo7Wsc{Ses5&;
zCbvp*=@_h_;WgpAFHFpIDF5s5U;qe4!-gRnC*ok9^QG`=zWzN#IS=Ch9+wZ7K9R~H
z`ro51d@xkfRIu3@Dk0Jx<e7><Bmx*yoN&*Pq$$(p4suyPZ0HrDTBkEVF&`Q-K=x&x
z`^jpYq(DenPaWJ%POioVwwjOw`X}Z=0|&}Yj`lqbJ+Le@fQ=#EDdX*9Z^IT|S|EJu
zy2M<EXcjXB03s2Qh@6iTYV#)@LM0su$P5k9ESU#^TKnq3smKFJ-e3)baP<%ks^zM<
zG#7h*A7W~`s|GF+)N=C^a~$dvXC>jeKp%@pUF6AyeB`!t7lTWKiNmwg_kpyg3-HzS
zeTGu<iKfEbJX{z<f1=u<y~9E>@te!YS=#6NYJ*S}<;{9Xmk{YGxtDZ_Tr3|6UO+qK
z@0DR70c=$6)b@d0^gllW8F_Rn%hd$|0LkO0ju13V_pOXbd}&se`b@?u&B-g&mW*By
zw4G*f@s2@CnVo(N+0~v6Y0&&MmUiqodbsqAr16#3Zl!`R(-`$UH;o*VygTZlIh5Jk
zTOGW8S_BSUcK7-;F3;NArvr#6qVP7Qk#CZ>2YnElIyc<F!5VwEr^Ap;J`@SG01}92
zF62^Z^Au><N5edehqFk<p2za@KSY$Mk}F>#=Sf?o$z%r!{d;Enq6B2Sb%fG_=6KFF
z=>8xVZQz^q<{yp_wz6Pisl!d$QiJTbDkaz8negMa9-+F9M6JVvP6rBO0wvU+?c&8j
zoa?Swx@m||_madChc2#$U=aX@NrjG(Ycxh--8;hTJC(#@U}bXTS($mQOwmG_!imVa
zZ{i0X;1!w?N-T0{i{}<zI9?5~CusN;ipgEb!fol+Rj9BbafCz69TRk;Uo0V4^}~Ms
zbDB_1XP3l67~byk;hC8v-Q2Omfz?kTn|t<%^S1nW?&m^V==q;d?j`W=b@IK`AMya#
zN^7MHq?@FBrH^D;-b<bgcEAqM|KBb@CV#B-fD8d85TzSc&QNYw{-(V5@7XDwy%m+P
zwkAi^7F!t>QCpne{H4E%9%7b8F4W#yn6fa^%xYs%UpHKYIchLVVW^kU_=M4NIup|f
zms|tdY@G$j-j0N@lDd1jwFuv;vk4&{Xa?07Mwg{!Cvg0&m<GIL#loOv!-i|%{rIFP
z6owlj6wh>YxT#6~jH|jose$ykkhL7v4Io8=SP=>U3LL%RbG(5j9h?qFDTQ;TAjk}s
zmEQ0vpG`ZbK~R7f91`L60IIPX&U7As_%*iy?VOH>YBOl=*!lD$4;tKA9ES9X+#vNO
zw_!lh>X2tO8aXjc@(14aon<X8fhNdP6b0O0eA9P4sBkBRuL5}p(jGPW8ah1Qw)Q0A
z+BbZ<?X2+y)^cce<OtO7v3+xWOzwt<(K_}mRyY@Ca8rAzEeH)q{I-8`|DQnw?0IfD
z|Hp#GuZny}E+T`HD=?aXEWpmPxY;H0v`z6zPDZD%EkDl_cBaLNCU(YU-Xk@(hBFKL
zznV0;=R0u^o|}LiwvJGUl14+n_8YnUMcmqdY7rXkPxu^4ZWeoz-&{s++{UV^9I^CB
zp{i&CGSoWyEcClGBO~lG1{)$%Kv`WOH*37X)glg~KT+?nhZYtDKw=b4tK`oo;@Q+h
zgdQH5sB`EVM|)^%^JBfVyGky`qj5{)8$$I>2`}qu<_QQpg(!!y%t=Pstb0pe?oM>|
zeuCa&O=7vjP!wZ4ogrvYh^y0IBbRaAW#!2Irwg5==YLmu6akyx68S9o2_;vVrUbzn
zuqy*las%A;3ywe<sh0c5>*Wje)r`sntDyCa`ir#T?Abg`SFHg;=QsxqHoKw>Q|8%e
zF>p{cCzUh?LA=u%Ece_rN|4lp?DTs-jamb5H6$`PiJ$)iDE{wY`2olP^p4a)ega4k
zFet)*fdnLpT`bW^-wAy!eVK}V5VipzdXSK50c0qSG_)z^qMYlGyNK?6<(pex@<*es
z4TbHYz?xAFkWZl=5ZO9dSttRyZ`Y@byfVMIa6zEH8St&Za8=JTAgMdWlDg=3%#ifN
zUbBV0Z*3wBVwfUNvEShrfc^(wKNC_~L!L=n-qM!qJm4MXLON^Pv!V#!lz=3)E9DVR
z>lXQ4kpUhvUaM(uQ#V_(>!vM-{E6L_F^|onV+`FC{fU<)Ac5`S(op*eWEf(_@E1An
zi|g^dLu{wbvP5$?QX>tM?Wd?W6aWt#y4qI-V0s$<<T{q}v!=XlTSFwV!ePvVoghj%
zJ1eJHa?*Fm`~*eJ<c37Rp)SJYG65<VBQguQd=0N==`E)VlY{I3#t`KqrH6cqtVpLy
z`;x237~JtqWM!g*@?>c;VOuOxv#eqkU&s{?_U7w!pKpXVwk6iU1eWBn_G`tWQVa3Q
zLgXszJdM>ltNUP~)^Gw+OTu<!uL85E)FgZD6idiiO`WX9ukZgzs4<#Y#rv6Em2iv+
zQr%9<4;#zK#Xm;*@b;Z3RNLuFv_rjp(xqIp=xQ1nHI4jAt{A+Nx8qMsgmxU2h(a^E
z%LixGeLHF0PK+n#)ZskaL)15Rc1yHD3-*!AU@sZy^tdaW8*Z<MGh$i?%dVqo2PpnO
zQ?Tqze|_BEbT~@hI)05H6x1gm=lsfac<dG*MW=$$sUyfe4}8w&+(RM~MXr1w=>i_W
z$_YvyQRTUS?$<)1<U_jf=OvEpMrKG9sn_Q4uL%c&tHY6IMf*h>(l<tHDzDjgx&3~6
zC%A;Qu;rZLy@de%Tvtauq!_an@wRx?pUh>xSI*2>X(zc;f{)ubU9MQI7Z%kPYS%!)
zR_TjyJ5N5bD)sF+vvN}5>-0yM;jM|I=|M8dejn4`XVC)2-&u5?mLGLNF&ltG?^q~Q
zxiWDS8*BU1F<E74pou0AsBEX6Xr59~kEuVI%kaER_kI0|_1gEfSw+b@=lE6t2N(bo
z6*yb-IFX;sWkpxLgWVG&17ViVH=R+xxgeZ?G|<^@{o2A$ss&AoLUO$~LHkkh^<N8x
z&$KGB7AB`6kI!oFv(heFsT|3f9dlU4PxLxXsF=$CyUTS%u9Gj8p8;gQc_0Zq{+mZ|
z*9&%y0FHpI)C;;mZ`2EXF>C<!-a;NBQRDadTIrV7?`d1N0`r5RX4tRz{?YFzTjVX%
za{!7A2X`gQqRKX(es9{x@rzGK!p(pqUr-dRYj5$)_eE&NUj|#SPygvIaG0}{mTg|b
zQd;TX(eHg*mjKIG&=K25we|lMo|*0q`s&yq|3KIOF8tr@7c1hYK9BSTq%R_U3F*s7
zUqSjR($|o_j`R(rZz6pQ>Dx%(LHaJz_mIAi^dCq+K>8ulj~M+#{S@hENIz$Er}_ob
zFOhzQ^lPNwApIxOZ;^h7^n0W~ApMcipVXg`{tM|ZoaPfs^GUwMsGP4Lbs^1RbhrH7
zk#<4a6=^r5-I4Y{nv1k2(q2e=BkhB952Sk{-3w_R(!G)PMcNPPK1laP>PD&}%}3fF
z=>Vi2qyv%ehjb9q!ASQ<It1xZqy<QaF*-bd1k#a6M<E@Jv=HeSq+^keLpmPm0Z0J?
zix8LWCxF@gsIrf8TJ|ep*Au%&AoB<;cXbxo9EsjKZxjRoz-w#{gFU>lV`}N_qUnX>
z#*CQ&!d5j{+rxkZO!dS8Z{e6p)U(_d^#(l^-g*kdGrAExAah8S3w*<^&)lpkm=31*
zNL!BF=IU(v{oYqtgN+#FvFsPs6y&%fu1??YU*{-V<0#`ej+!=>Rk<72|1BWOCCVQ1
zS<)|Lfpmp*7`ZR=7fpMI?@mb4xIm)HGdmH#12pR`G|Uztq`^x<sSygg-nHjtRA`y`
z?k9h-RVA#yvn$9=UDK)X#rJ|FA8ZJKgj)lk&@h?6Q-p(0=kI2BrO$1XD<@xBPk#jQ
zY5ARyS+hkRm`0)(x>X3+Q7tVj;Wkv5{C%YRUfS8pQH^2}jzxDudd();okbN3c)qOs
z-SC&8LzdE)m%dc^ywLv6o_FRjl^1nI8(^*Ss;MrSJ=;@N>ZvK4F>`L=+?gewD)`?V
z_`A3S2C(?A*TV{}4#4;HjH9kL`EuraMjbhlHfh$jrw`;!g6G&TN8RaSU$n?^gJze^
z^~|Ue8ZwqQ#QxfpPuPG%1B#3d=-lm21zONYE_2+1vY{281x00Z%PMCWhhsc%Mf&SQ
z2A_*VQEF_7_fDBvHqtC2!>3V<Uy7Wy`6%thwhM@!{{!iAzmL2~zLI)M!ypTY53B&U
zN-s;FNx#T@%7f*D<VrvVUoD?5UoPJxKP!Kv?5PX~T)-vDdWajk4sZaTRX$0(AN;#6
zqRW$L^HaazE>9NvEA?M^$*g8lf5uB@4P!pxk=Qo+H}x0h&1bC-%$J6^K&6~7r=JG-
z3UmI-m+j|lzKi9`cCx<ma~R%!{%%D+I5vaKgDt-g!$E+u=xUbwJHId9G;Q<|qpL<w
zqatB`F5Wclh$>#7GWWLp-KK@x5ko)U!!Yslcbo1Hw|Z*YeH{bYqx-S&c3m+m-2<PW
z9%%C7PCEpjFaCe*eFuD7)!FwQ&Q1sc0t6zV09nd#1|fry*l`>?j%CMo;_O7WWm~o^
zIT~?91~GfDvPvnV>=6oOB$4ElmO|N3MromimI8&A7FtT7%<q4O<g0V<m5(TWzjq|R
z=sv#Zj^~_n&v^FZ!#YfyU@7<QIF{c@tn!%My<;Rbq;vEyjls)-s5RJfPG5Wse@j`s
z6UKlrhoi9?920mgmiVGrl>#AZ!0&KQC_o+yNB^ZLCGRN?VH1eB%8*N%oR$VcEHjv6
z41eoVST+XYs2y9Y51>|wcs_(YdT<{s3k3r4u26{KJe+r=$LDK8ykuIv1F6BGqkk1#
zoN60eL!p51&?suk=;)8FIRXL*OggnEbU1i7R7c`?jK1qo-lk<SbPNOytiOi}r3~+I
z{#qLCVaf{Za_k*P@jBMP;xX952EY)q{|{1D6aT+y$nMdgexhEaPE;O2(ZBhxIdKs2
z3>}}xzLgnHw9UPvi=0-@UP2bL%FQpfu~o986EUJ=NC@7TK!)5<uGFt462Leqj59<z
z_W_+^d1uCZ0+xmZ(&GY49?dZhhW>_=6OMV6HRY8<1SHJ~B+AXN&(b4;ef$1drxn9)
zW{94CSwPg9K)T$RHZhOZ2=f6G!8kuoiX6gFy($K;YDge?ZhjqST#ou1PPVV47Ic;G
z%y>&^Pjdp<a=%%}v8j~lIC{G7ny>jV5D_&bhUD8C<9zFHI0;p}V1uMJffV%leVtk_
z78$tx#MnyOKl^<BotN66BK!Yf^?gNKgM3~0YJb#bsqe!Ea5iiJ@BB9xfc=mEH|qiW
zu)K8$B43G3HxLLFE{^$;Z`W1qjYeTIv!Zq?oX#>=>B9W=SiRDkO*P!<`07}_!saeN
z(J+$ON&_CTwO2#ZKz>u<)Qp|jfS=ih`7+#3_H(!ezzH2TH>Ab`9?enXc7F)_a?}?X
z^|7rfUtK5|cU5=;QC|?1Y8iQgt)-xFr=jj6PqZ~o6dx+`2ggT=UZU9F(&D2{7<uyY
zg6>H+{h3|6Lhh19+)fC8O}b+-3FuB<htMqEMqi}WPn9eq=d=C)ctt-=AEWKl)~H{o
zr>UCqJ>~dZgSR1pY`6KX>9vjibP6W$y}c(3J~)amP2!H*ltA{|P1@Kz_Ncnh7Jnmg
z_#lLAf8*J#f_8$&Go__M*gCc+M&&I+uqEkii9OGo$J?yHU5UeiU)N^m(N1e3)S5Pp
zrT%P#d2Ip-bo~&*+giJr38ysYkl`VU-x%eYcYU1vgpS>qK+@d&WFrQOw}0>7D;(6i
z0pIQx6AC2A%@2ivx9H#d_l6%&w;6@&6NeBlfTQy0q}mu59X13re~!IsfM@QsE#xP(
zVQb=GeE$L333*^x;fJ*Z9EYky;UJNjcDC{%Z*yVICDk@#fb9PRwbhEYT028~MEgQN
zS@-D|==&po<y!vsUz6wo`^^;lQ7y6h#-1DSh5OI94Khl0F2kLLi{dO55h*Y6c`57N
zzu4BmKzw{TaiW8{8p~tUzo@7H%dVx$KztH*&taOz7$KD+nRGk-7mU-ZY+nGY0<Sj`
z@dXE-ljAn(*cXBR!`JU*Tf>FA*52C+OTu3G6vDePie4xUFsH(P^X&;E<HMCcS7qF_
zDClDn=za^>{tx^A8};K5_hY^Kx!R_Dt(*rB0P?RjfyCMQaUz0Dr+@bOqUK7Qg*Kc(
z((F^UnRzUORze{wNzs@ID=5;<zxkf9__ijF&bNITAq8g~v(Ia0QDH7vRFRzN9+n`<
zv`1-`d9<)kX;q){tkq{vWF3AS7qn;OCL0s3d^b;n2+$x7oY?eNn{V2dKo;$;Tuu%q
z3PY4y^%n~KMHh2qB5U59aONum$QBXy&pMs@$!yzJIr43lDB=@kekWaUEJ5a(JY}LV
zLf0ln=S!qzB)9$3f34&`mha3wQFuMs|A(qO6=eI~rM`!ty33LM^Lf1=vT<*PWdB*Z
z3hY1p$9ljvn0K9TOBCj~k;0-b1bHOXr24`MdfaBaN#DHG+X1>T;)16yT-?hWz2O)Y
z4647f4I`aFROutT6+FY)6Th^L^qzTwutAWIM<7fO2VF%$AC0c8zHHCvrt4XS*k9Pq
z5fv!x@`6JR#Ueb^vickQZ7}^b5p?-T8%rQKZ}35o&ov0@OZJR;@57;R2jl}Z6*KME
zS8ao_XIe@Lf>;nf`7l>(^+#c}Odows;!(sQ2zwDpzzY}UW?$6Lg8ry4_WkJ_i7f)r
z)2px83ot+hRQL%Y6&bzM{v-F^RfsP}-SvuEe4{Iw{(p_4--h^~yS1h2ci`?fQF-uN
z81VH8WSJ~ikIJFGYz&1vq0NZswdud=o_UQj>J{GInyu1uQv%sJyK>smr{7mdi9RX=
zsm0uYvWf<1aJa3@1EVh@>u^Oufa_v2yJbrPDLXrIr6tU?p%5fbC+%Y5UP>83x2dT5
zvnv^<8qw{&dsbp12!$domIt9gLzFHIH6rE%NIa|<5m?E%N`1ZnMqN8X?2qqoLB~XI
z%P5-qf0L&cw0yz$MR5aeO(5}Re#D}ny6c~PKIP#TJhP8_n*4-qt9wvlJo;!PRnprz
z8Hkn_G}cQIR=7ZfL|Y+V9FT2d5#ciP+}FqLWu9W2U-_d@nT?5Y`4UnFU1<N_zo#Fx
zlXmUqXT+qVD-vT#rp3eZ7!fP!!0S)JlxbD`n~78@+5bl?FDv-}p7Mq2Pz%+7+O6KG
z-lzUbeMdV$8>1bk)oC5tImiz7Q|&EX)klIhSgUV=$Kd@s9{g|kk1IM2Qbxy-T&LP=
zapM@s^|N+XKaN2(G!CSd8F|hjCl+WiD3QO(ym3sVL4C5tl8z&2&>2U68^Mj^V4CS5
zW69$fz-$Tn=N_w$@xuzV!%$H+2*!>t&?+>Cy9h#lLLU(QwHJX|0|DZBvx)?Vql4vn
z)=BOn>XJi?ew;1}_~KsbVePn+RoPt>z`pD9&|uQ82_&2jHGg+}MvXFn&2XK*i<wuD
z3jr6+fa8J=k*U1zW%d)e)J5otObA~3Tyy$j5H51W?yn_?Z8XwBFTOLTK$}n6#^V81
z`w>f<h`lQz@uqj&l71Y{O~iqj@Xeq<=F^KmVPnNz6!xD2e*{|A!K^IYMG-{iK?i~5
zC(pD%+3zCTcf=Kj@}J(igPA9|ixGqoR0*<ALjlV|3_3~;*CN8TM|rJ_p|&dyp~W?^
zV35e`>-|hR;dqYsBDn){N~FKwrUsW99&I3xhWVpi=|}&{>rWmf1QvPJW%@_!50872
z|8uE=|J#&%l(*H<YMpwQ`g?5@IDuQVzv$x->+3@OCo;3#R+rPeGs0@Z&*K$2uCb+7
zjQ2zG0sBBUN@m*%ISfz4!eO|RU>Ahh<22gHck_L0I(;l)?|_n_F3L$LDd=hzZRrf~
za7&K!R}^$lv8K~|t62^T6j5(6phB*N$N@Q_I2NU&jD>2fN1l-;@?w(OnN6#o+9ty^
zycN6r;t;e)m?X?FWtmJP@D!p;ZYJX|9*WV%H`wwTMr_zX7bDLTHql}b8%W(mpZ$Ig
zTio8BgTV_Hp2k)>x(R(<?Sp2D&Rjyn7#5Tn_IXJSmC3vhd;yuR>~%P)gqsho*Il-f
z!mQWSAto0pVyHk+Vx*RXxS|hIR5iAINERw8S42oAMkL;5@AG5mHUtxcf;Me3wZK+*
zYCser^e<MwqF}rsgm_}~jMnpYLjMm?PEqt$?NcqJex;tKyoJ;Mf`2Uu<ffJ+sEc8p
z)r4V2HMO+jZd1|vN2rZMMZpR&QfK!Oi5VakkJ7w3$R|S&OAkypKDy)}E+6w6Blj0;
z0`(YAOeb<rV()54$Y$zBwy(t`ZXIZQvWu3(7nxhVx$Uo2&t|r^1rtT{-(UjCt|Qtk
zd#}^pQB;eJ^8r@?dAqSp02%uXR;9|$Eh|}LXPzZAw!2?~<h>r0E3#-WN-9>s;zB&=
zTM16MC4-|u1sJ{J?&Ah!*VYzRk;aFFigYBV(w58gIu^D_D@*}vH(_s2TN%2oO6#l2
zDZU{OidNj+ha{$;;iI%QG8id!M;5W#4tN>5$|H1DN1hN8PSCJ0xg~F0^xhe)AA({`
zcqacZRrJgB$=U;2jrtCve;%ORu9W7p1Z+qk8?G;>tzTvg6H#a*h7zN-+*zlK-(}y+
z+<%RU6NnfzN4T8cVZ*i~PiU%(ZRBpDpni2B|4N<0sPHF{-8Pgf&`2*9m{&9r8Pvj7
zFIY-88_Z>!6(-Io2;FMJg`~EUxN2jOP9M=;fnw&N2i)ee>c354U-=L*+Mz#zthSQ4
zDj`qvx~d>~YR6Y%?J}2n9{-ZzY7<A)h6EDYN{)pxm=yPtckZmyWz7#V3`6@1Jr_$H
zPr~Kp2;0>AmC|HYG3;h3F`QYs?5=Dc>SB0XHVSwf6L6Q49D@tP-c#bP`n0mq;T8%u
zMQNOjih`<r0+#l~am4H;mmVxLmpD6zQMfn&g)0A8jK?z;cK+cu)~2$cfQ`+6#Q(Wg
zp8@`Ut){7$spFKp?IHlh6G(t7xmzv57>X0}D+XyTJ4stpyX~)SJmF(j*R|&fb?r(Z
z5$<+vzRU_*(;APqLgdv<XH3?bX?tnIlsOD@NX!cDParF<<ow~UuVR?lCoz}ReoRAJ
zR229{DOyLOSbAq7{4?2(34>UQU}_ATRq2U8UCP?#7T2Nr1oGvs%W2?}8E++F5FZRl
z=FgSip(fK61$BoD->WgPKzhEE2eau~kXBg*zE9p}^`CdOfTbgW<hY<=WJbj*V&T~3
z!qi7(;N}3IFjl48&-w?&XWofg63A{ZNw<RCZ6dT<9ZhUPjMA{i2}LV+u4XNpFRpXm
z1X9|!<TTRGe3_~s2o%V7So~p!JNvxqR|O2mF`^)q@&6G;i70m}Z>oob`#)bzssGew
zXl>d}+8g>Y$o6@${_}jOfj;h);Ks|Nl)NqRkzJ3`dQV6&vK0sh2n|g$J}$ibw$Opv
zCc!pWgxW&H+_EkbYxmQqwn(tQ{HZ8;$hg4VFVVoIUa(;h7=;6wk+IJ<<y-G=wv?oF
z!hoW6OxY^v3=cr#M94?NI@Pv@!b~EzSfX`AR|Rz!RUQ<%YB2AaN!zm$-vP2fNEnOA
z)*i?5L~FZTg88P;wFnPBAXQn)m5^l+CdeVgzowc<$E`Ucab%_r$4Vq+>4%M<bECun
z;=T|ptv79MljKtoY}OC}@%om_bS?>@T;~NZR*M5$!rqYST&ukTTaBU&hr18{|5Kf+
zHmg^wuW1Kri?ma<hqMp$@%noG%Kzrpfc8;OdOtC!W>;p%a$F$Q&3J@cQbRaPKkCnA
zp99$eGb=KM=yQLPkRK7kzA3Z4USC{*^c$A8X@<$2;l+ts6Jk|j!%w8h6luML2x@5z
zRB@Got5`4b5YaBWutL}Pyo^0KO=2Oc^u`<T6gDUV(?s~k5=*6-_i)US816*s$5t=c
z7o;VVXGnZNE1LQ^nR>#84_h#>mU@|r-|-h2baB^0Sge!rQU~sye!4D+Azewdn_)i;
zC+H(li5hx*U9QDQZqS?m)6vfK|E+}ocWJk3C#XM0{=Zk1);{*|yf23mNR1iGY2==n
zttBBM`7VZ_2cC)~_AYIq+p;+D&`?U*=wC!lbm3BIx)4#(VW3gYc!l)fbX%3Kc8}(C
zVV!_4oIoZ_7$wNa(&~NVv3?iFU^PRfJnftkwJuj4cy&1=-&TpD&3IyoG&{yL6+}-5
zEmIUGH_^;IL{mwZTV1PNejdYpkjSXCCXn_Lgs@D5$p)Fd)wxYYs@vV4p=uE$HFqVD
z08^6lgGdabZqlukXd#}xU0hsfdui>q7{lCgn($RaiN(_6maO+?V#{q=9P3Xb@>LXc
zej#9NPn1gY|5j>8D_!Jr&uOfE14QnL?Egoo3lw#Mx>ntyUZ~!Nyg%<~1GHnb1zIC~
z0>7_4s6CIoKe~RTexhEZZ_>}zuh)0$&+G5xy$Jj-d?2mkg=ZCA#tkIkGlpx#DT$@G
zWJB?f%oYGz3@DB<6X^=Ko2GVgm{l8&nan4h$h#o~gaDk;6*qCcejj3RM<KIxaNCKz
z9LMvjVi_Q70<#+`XSI5otIydIu^8_2i-Mt83$q2NVlfMHtRIdgndcFroeA-wC}T14
z9d~3dS}edznIpS<A;SE4UG>E5j`q`aG)x0TY9TMk7YKLhAM{c(>r&Ks>4o&$LLEe8
zQU=1CK5|NSd271-Zr*7NL(sK_@hY%1D~yc6@0s^Ksu2rDo6>vtV>D1imb}mS(B)}t
zf_!jR`eorzB+{G~<y@G#oA6Q8){@rwEp8l8;%#b*gG*cN4>MA%n!kn^o*{W*6Wdp=
z<paxPgyxvU_Wy{Y*J*Dd_vb<Cy=t}cdq@NRbN|{C%cU1M%9{xcAr@2<ds%bMX12i1
zcuZJM0|_L(g*a7am#Tq~7||Od%sPc{8Wx4hPW48HuHrfY-MR$Q-!|rSTFlTnh;<1b
z&d-$7ZsS?&km2n8&69=qZ%81;t)z54TP01DmAxA3&Rs_{3>%LVFtj9=Nz1p0RbjTh
zf!kEnzGZ}G?mwO)KLL|3LDSq$k&)b)M!H)pS^pso5K&PO`l*1YBT<zHB}fP%VU^>{
zTXyNZxo@%_ob#lBuX{qm16|(~EhN=4O6^jn3L>a#Bn9<HU}7`@>oB~qiMpPxycIAi
zWtJeE63*k1;zPKMwrI0ZR}J%gs9KNXfM&HGu|J+b%%2%rvv$4qiuRd)yuMlA^PgJ^
z{ujS_z;EoCI4ti$#Igg+hpnh7;_}7mRy5>3e1%`zGjjZ~S`uk1%+{!8h=9nBFywkg
z>Hna;n8Ckgi>s)zusRGO0g;k15u$#EqUd96v-;Eq{GAmrt1B$=2cW{C>(t15@W@zu
zORw}JOZ{+^hm}65+{n98x%=!T3+ZR7eW6Z-95@M*N<XDNMkW<SJ;UBACjB7nSzw2V
z{5Dv-DZ*QU@K&cj-$sIhsP+Bk;+DJY`E#q-#OV;jqg?QrZLt?iW<Lx4a7QOGStKD9
zDAjcMm%zQt)=2{9*~YlYr7^IImBbEl0tpjLmw>|`#YkC~L%5m!3V4x`5d%sIv6j3B
za^&z&*#5s+(YL|==LT((dZ)Tnd0*N5pPiYJ1ajxbbGkfdc1e8PI5l%2>J4VHN@*as
z&4obIFt#pF5;d#q63Ch>xi^=@gWirb!Ra=ht-a)7_Wp($!dki}v1YL1%^4yn)2cEw
zDkEqxoHUNu%HG~7>L7O{R%27qwM8<U3Zh{UE*~QYv7Q5r>LxRU_gs#v6>Fbn6{s03
zG%uV$cHI009At9VS_n7{<;un9bN#gM6ane-#7ZQf${C{|)2E(L7xT$<r~jJsbq8zA
z@aKj1A{|6My0f3QSf)E6oF()(VT~*#tq^78xV-&<?W_)S%FK0GAzz1@5F(((QG)>S
z=kU5((}u3>o94W{_B|G2uwd2?ggOxZe}DY%{8u|3KY2EXb2yyK;XDpc;P6BaPvY=o
z4(D^YfWsmVi#c4#VF`zeI4tFGF^6RwmUFm-!wL?Ua#+cshr=okt2tc8VGW119M*BT
zoWm6y)^oU$!&Mxv=5P&%YdKuU;d%}?aJZ2}FNX~rHged+p^w964qG^E<<QSz8;9*2
z1~}~CFvwwu!%hx2aTw+>!eNxd7>AoV?BZ|>hj9*1;czR5+c@0L;SLT@<!~p5-5j3A
z;prTn!Qq)4p2gwW9G=7Bxg4Iy;rSe1z~O})Uc}+WWd9$eI2HYBeX4ewHXHQ+O69N0
zMJU3*jzqIG=Va-+Vd>DZcIW`MBGxqstI@gy(&tL<&}FdYn6i-jc({#cML(Ot-oHWQ
z&RY`5nJa0#Vb<wVku}ULdS!fV&+wKks}WifOdw6}H?ge63eOhwEX!J6s$5+1FV?ii
zl>)-{M1!<ch4AR2!9Qi(g~IjsaZ>8=lLc%Y3FO9=G`fKT2gws*yGs2T(pG9#rJZwW
zn3{@$O(N~lttU2Os~n(}%gAx4fT)F<`&nu9nE=W5x^nZbgIOnso)wzilGq?Ue!#?Z
z5^si51pefrBvaA)L%Cw7U6djC66;CWAt~92NsH?iOEzA|?SDfe9<u)rRaYqL3h@3v
zRzKDzz}N3i?M+DgSL@%=pC+ro{(t%QfIVNCAy!E&Hj`FB!UQN=V<2H=Vseyl%(RzG
z^j1&MG~~#OV|)f8MtgJpLR-)NUYiDc6@^5fTB<K3Yz3@U8xo#1>_IEFsbh&0UMrP|
z)Pq*)5_>^O<`bDzDP;Z+&{itiO6@#tulA+BOg~$PbYcI${XOvS^nkr6659D7w4sHi
zUOz&BArlqd9EbkXUJRLe0uf5N8RF1SatOaN_d}KrwIMMFAi@T!6N4=z(UuYtYnW17
z&^_KpM3{cZ5=h};*8?5fB3Smo^@a$Anp{K@M|`J?L%|rVE5p#@Qo-ENzuB+I=~q@Y
z`n<@P4bq?{)<6|>LqD?@2Bx2?@ioyjqgY=(p(r$>kSH=~=g^OBgOJdC?4+}6sG%2}
zRhaS<p+9J^4=bShf8{TVTBQb|{l8OvO!<rYzNTu2YBRNJb*k2+?a(e$57ur+big-|
zA!w#vrHAw%=+EeX`gg|1|CeXS7HEs%DqcnmTcJ=6b$El5A#7%+Y18RHa}{z~TE1d%
zB<3n%5;VTp7wv+lHyv3dE*&M>-{i{QQg8`mBgCkyfvUTKn|H<ym!m9zoAL6iTp4cV
zS>~9^RrF;f^bOt(hg*-I$IXAq*s!APhV|NnpT}(u2&)9KAk*$YVkpdTQ$Ai1(C9v*
z_J*RO48FSTiS4}?&1AioyVDyanvOMG`)sm&cbuHQ+vpX}HP~6cK#ti~ABDSV^Nz7}
z#hzQBh496{fwwiUv`L-mSeC|T!9+Fi&<N$@VPs|H89k#w^OE{V`;9tgaA*GBM_^nU
z#lW)gZ{}Ynqv$nA`W->uubGQ<z}7JSe=4#6I}F)9W~z^=tCcU53zVr=GjvTNBrV}a
zgq5g2$PL>JCrht<f^k<<MSq8mL{OTk%rwK;#$FY-p|ts`2@GH7X9733Ceb0?8e@D2
zW3Y%7r=8E<zAz=c-Jb|Z`wV5RHQZ^@T;}V1pW$kGT)@?qXs5Vjm}3hoP`9~E>5l%M
zBbz56YfrREOB$>^GTau0b(cKPu&o!H7D@Q!RYg88%s4B3lU>!2WY9mEECoRotS*F>
z|CVAM@}OwUxh2s`4Gv{GG~4OZF!CI3+e^y%?LYC%^}j`artWQ#?%vv{&)X3uih<HJ
zW#n*M6neMvIj~IZ-hP<oT`CFoJ@8}gEbRjAGVN;ZI_+l20PckcKngyAk895&=g+I!
z@3eQc_qD%6PxzHypbti_;6wG%`qBCXeX4$(J`YiWO7*3%5L^kLfhN68?}Y8ZHpCS_
zN54qF9MOVq&~Mf6)_<h$LB61$=}*Ff@R#~;^f&c)^}p)>&_9E%;VD{F3nCL?1N;zI
zXw}*htwcLnn*)1<$=W#0r5&Lif`~)|;iLG4`cL&k^-t<s>g$M8^n&^{)~$!tg!+Jb
zk9s>Ym|d%0sa~R<r=FqifK_7{F^!tljp}N6H+hiXs8~IbHrZ;4lPnwf(Y`t8vk&)8
z$MJ)GZXEx-?-(5av~M(y@9rCk<2(DXybgS8pN`|3J&39>@OM3%aD2T7_SFM_+p`hJ
zS9@T5G4Pi?9volpDZ%l@o)d6<p=TzJ&-F~g@#&tUaeS)h2ppg2IS9v}_keI4_-GHz
zHwOMRMc(|A6nXQ*De~r?)CL@rDe~q-ioAJG3jW*!A55Ku<Nc{wIQ}R#1;=|+V{zP-
za^QGpiq!dz6shy=DGZE(w<NdY_=98=#~YIY9IsC{;dotgEsobFYjONuvI57elM8XY
zDoJX7MUvF~vLxw~OOs=8yeK&e#|x4pa6C6T5XW;8r{Z{4q6^0}5+NMbhx|AeJk*I}
zzlTWqfZb$N4&FTg$Dz9q!0~|HhvInPZpfww9<-a({NUZB6(e^ahvT8U3HBp*lbVd)
zy#z<+?iw7&>|TZA(Yw7kj@?bLjN486YQpX<IJ${>%fKmn2H`k$59!-!dyd3$#-3ww
zoVAC%fA$_skb!gd%*XM>J>@u_yobDb!JgGP7Vl}mv1Cs>j-`7@UzP3IhU1dG<hxhy
z9fG50?;$u=?<M`bY%i(#^1aw$2d>yl-n??}$vCdsyBNoHd#i9<zn6TwjeE&=Y}iY_
zY13X(XW!m9j?D=b$F>Bib09(L988cpcP2=k!->f_#uDT!Y)+hrV^?Akj;AClaom<z
zj^mERIvjT<n(?uffl7eH|2;^%Mss5x5&M69>u>*Gd!kEvWdq4+a*J?V6b613=i8L%
zecF-OEKN<+!p#u-1`G}HAMxSXu3=T$)b?|RZ^KK%x*bo%q)qXw5g3}Vk2Nu{zm!c_
zoKeo(U#tJRk>U2=E#UShqSBtCg5wA})#ymFrST=cC5o{TIua4-{-hd`4lfBggIrTQ
zCym>xbj77%)~2?o(56@-EbZk_!(b2(DjEtCUW@pXeM7q|fkVz^c!!91yN4t;LDeu^
zTPCylOT^fML4IFxxRjmqnt8X2ilnuPPD-T8REF@It3xc?7cq}XpC~&|@8-Q+Ec7zA
z5oM4zQPC!1*F95v7(RcK^#<(LPk#IJfBzf*2ls%zRN5CL_Nox)1qzuw9HNO@_$gC+
z!J+j>>x*;C*oJ=4xBRLIB8#QORT`1<2&EfgZy%=iEj2`)LY>S@Zs^zc8i=%<ZJ|Hh
z2qQ#D=djz%pgx4mi*xAbeT()M!nvP_<=8SrR-mCD+3PLRC`l><;<=BIaDjFR_Q-R?
z5NXz%yWbFI78#q67@6L$_g%XZBmwG(xRwV4@Bw3A=L@#~BmeJ}$p4en7D4~NN_k2F
z_3>~0+mtv}Izlg5s9**kAbk#F$#94{LDB`xTps!ADz=o3J3?5>x(6qAu!UR3q)Q^W
zqeKA6P|GQ-HdW^dwdqJ~m)<Td<!lgBnx$_WZoS$wx2lQ!1bp$tHfi#sz7@%!ma|A=
z0C4Fcj%4W#)9zYu>M!^nB?h;OB(}=)==^I_0l3xY7A|<(UuQjh!ly!u8xyBUhZo^;
z?~KzAoOZIjfKGby1BRvUuL72EA}($9Xe0J@TbC;@kNFEjy75i{X-i^@w4H%Dc!k?k
zwBm_V8K#Ni{!ixrAms!_ze+z?yGtuqf30?@1C*Ok)Ym^>61lG>O%&?9TOe#_l4&;1
z#FECH5mv=EQB3De(gfJKa#d#Zo3PM?H+v?g1__F1IB$CQOon5TDI8p~zw~THMj9A%
z`>9wQF*P`$X;s>M<;4tNt7u5FA=yvbjR$R@!Nkj1$7P+y>W^d?ib{nc)RBa4N76#a
z(pTPXReH+oYbic+Sey+>UAjdu2kt@;%d}&6)@i`O#KUF`zN98S-b^tH++xY{nS8vh
zxLoMDZY8PaX_iaA35}HEb!Ei1>}yf8T)WHbNBo+7y|M*D9h#F0ZL18`UmXe{Ut_OP
zn!_!YC|92mVu+TA1Ch}GL)9vx|2qc~v`@9U@cp?On!bamCBRdCEdu+mXZ3(Rm7H0k
zthiuD#GXp*eK17AR<m)25k<$>r*h9#LkUR&94$`!-TrDpLAPo{UK$aS2PdbWG>Wz_
zvdv!6Ys-_i!gs8+w+6@{t7-rjL4+c-T|X=>=mrT41!osLqzaq;kdqWv#v=a4!ru2+
zwNl4d*95BG3wnu8lteZlcKXay?gj}<r|d{sj*}$Je(Xgwj+i|eo@r_|Xm+G_A>m1Q
zfS5~iSTpoKW|-%$2@TZpAeyl}a6D=6U}gCV+Rr=5{C6SrxAKtkyz;&}NSy@f_<F<u
zy+nOTeNMSreOJ>Vc|TFB*CMbGx<%WkY|~!TK7oDUWW5+!f=`E3|6%=)S+hX$gey`p
zF3sbbWn0IpZ5cL(D`!n1Bpl`Zow#BSlEl@c<Qnnj$O@WQ%%iGPA=3Coh#UyIfkxZH
z3GJ$%aUXnohar|w1|y_TV!R;ZHK=XDQD#2*pSV7jyv`8!himdtn#19wp1XgGW}c4q
z{DQdIIZosHbE{xFyj!fcd&e2P1(rc^((eR0BnG}oKV~7t?c)8IEq8Q8`P<B@NJl$w
z6<s;egG3BKKgnyn>efptuLE(aH7$R~6le>fhv(O<SGWTUGzYzhdljwZUrbo3CKhN_
zxJ_a);tdxU93Da;*P_D5yT!u6(m`bH_*QEJ??I6;aO`CC{}Bpe{0%{@kGbkAu>XHw
zIZZjjmmDEYZkdu4P?;y0VCl348=qs*xy`E9mgIrbypFj8+@_+XPu<FBo$<E{M3p}|
zTv{U!H!l}#3@~HMcw#CjR!wEzhwf*%7Vi;oZA%^i8dB93%E%&e4Z~bxw0YM&hQ9M0
z0sV&LFllNW(dP^yClILCaO!jRFbp%V5iod@L#0&?!jeh+<qYB2+Wm(!9IYZ7+@2gF
ztuV4O|AE~PlSmrUGc0Ml!ZY{IF7gvv1iF8)Jl#)?$ZTz`n2nj;<+ADTu@)B{BGe(6
z97MS`8M;5Mo&sNOp|moVD(BDT<Fs&_fROC}2P!KR{J&IrSsejB;5_v)O{4KYZ`EFh
zmcL9tPv0lGrSseD1-cnhByEx*m})#FLkXpyHQ0F=Y18-ZU9(N-4X>bEir?N6v-equ
zuxk9sdjWwZNKKX*mOh=3X}Gnx^HiBi+sMwg=JhNH5rf?ALwh-MR)f=erA`TsgGh8E
zP-wzVEu4-a{;*sfEnU6WN#XQINboJJ*qQuh-;v-uXeuY-E=@n+JyMv$B>oY>lrj9=
zWuHs9mtV>0l)YNQdY_wpW&+!vAcd9Mil+G@vZ=wA6Ixl?-rq6#zmLTKo(lW_N$OMT
zI^{*hm*0Hv<L>t4DCu>)6#nXj^hG_%HbHCYwkTY8;8}DH)xQ))8r}VqhhrTdk~7h6
zW^8AN(YK(Tgh2b|JGM@{i>>DKL<x0!@-XRk*LEV42eC6}l4;g%i^A&0HyE}_6NIIF
zUGh+A=gCq?jF4EATW1>2cFcL#Gw+c(<R`qpdvJ0j`W1?C8JdO!9j2!DSxIN+8`o)f
z-}kh%@jy$RVo1Pn@(^jcydm~}7Jln;<*X;Uv@CS3&;{+ugQY(xU08$#2|6vmxJqp}
zqJ<BiO9X7*<U!IT7LASuAItQN$v$tq?;wU_{Yn7`+5bl<3l#j1BLevE)PvM=^)z?_
zexen^67NRsRsCRC^_^}P16V@fWl5);E8*&9jELo^l@P3${3{(BBzAx-@w4M}`}jM(
zYX)M(k#M{Cx{z_vsrs@^N8mA{I>0hcGuqGx|7Nd}HsFgPTBr|BAIKMmy|omHvgpHm
zB(^JyHN<h1%ySmDr7be8q<MmR1sJrVH|P6coC`RAB>i9@BQl{Fr{()#8e^l>gXB9x
zrb?)dv<m1fnUP~+AsrVlD!^XVhp4m9UFvEn<fbe#NI^sLf8ML${~uLdb*c;C3A_y!
zw2!NAg9|uJn+}(m21EnD0k*)u(msY>pb+bUUq3_Nr9ZC!zK@;%TfcmKf#!#_rN-Cc
z>p+AlIvr?!Lqc3dTx)84(J+y7hrP(fSn1!gjt+(gxh%*cmY<`J3!cn5IvfkRP|!AG
zh@*tdgla+!;0Mw!ME~Maylmx9k)Rv;$nq{xgVb%j3uDwe{L2b12}`fFMMj=*vvASK
z8amG94nWz9Ef+XhEU3J}!lKFhkmT(Y7sfPl%f*j7RMjHgq4fgCKb++vmcC}SP^Gb2
zE=E=t)6@S)Sr^4c#p+`E$;Qk@tHmMRLlz6bgaWM+W4iA-o_U9P9&-Vos8x5I!(GnO
zEVIaNGy4BbV*fi@OK2tPZ`G~J2g;e>`ozuk!j|M1X%XNGe;Cqxp7NYdZnvqZ?%-NZ
zQvFUKce)2AU7%ryX;m^bY~M27zQw-F`<Ju2G#xI~Wkd2PX&D`1g?hCFRDhN_ZNDwW
zFw~2|otlzPY9S*dO%grB#i+Z=HRD<t8m~wdN0JU{^B+6UID{XubeUUq-A@_T$?urD
zZ?tsxWrxE>=uks++{!AAVJH+$xVqKkkxU>c(}9NA?bM>J9Z6kDWB{g#bmzRR?0fD7
z&)mu%lb_JcwaFu-?SGBgbxES3bgEtDwD<+AjjKhUJ0|}>R?*MWkJj!({GW#*|Nl_g
zslbyU{cly$Jy_YGjggr$MZI~V5&I{dGkX0?V<~>KQAbB|qO_R`d{)g7q!F9dT)Hgr
zBi3G%4#1a0j(SO>rA3gE5K#p2;$ka}SkignaE9k(xA56~$??*7AnI5}#E6+hu*8os
ztEBF%;~1WCqPJKyiQMyuq$o2&c~~5xmPv=jVa>9+pxiW>Cq!!#CG%a$vC;wgi)=G<
z+b8X=eD)L8;4z|QOfY$@yoB6p_lJKRiHn%cpePpvZf6MnF9=`Kn><FE3m4+E3-Q_m
zQ+R%Z29XQzN**oUopoKv;O_Uq%wZw^h>;9?>7-w_mrBa-W38Kbme4vv{|{H-W^|SE
zoH|U|0PnaR@T2>uR-~Pw{TLB|=faCGm0k(*h7x?{@?dL-<Sv8QFO${y3yJ6ILY*YN
zAK{0K(?aIYWu*7E{r3Y2>HTt=g_ADuM8FM|Ae};!C8QH3GR1MDgiM^<gr`jl7B%r)
zqo3sWEa|4qvwN2mbdT(d<*bLP5iEmAq8~VzPMtcHEJ?jZJT>TVizN~j<=p!m-;?Ne
z^BZWlugdRH(g|Q(=%W=9c0M`mq_;_kZR~uH9AO!jpFT|onmGqBZNb|zsxtZ(^5GVe
z;pz`YLqukgu|gqkq|pD}qu~GB>L|4m+P@TJf0MLz+NIiK+NbdCU8i5DKbH5*|BpN%
zA>^RBAY5oB{eyPY3lgdo!5-Xkiu^OZ86zadgnc#%2}z}pX+mP~TT8edm&>$H%updy
zL8I+}<3cGcLS_pID>gCmzoS~BYFRYD<64RJ+9F$qy|+<DR?8w?&~f)`3Dv40Foq)}
zA$cqzF;}2cAtDCEW@p0Z-$*22v&^35sLas+VSOn4{!dh2MI4~P$~8v%Ka!j&&EMH2
z#Z3Doh}kk%7jqL9&#?k!(vh4Y%^75obn)y6nw-$%rJF8hu|bDCC^}ktlhdW?JVe%R
zf)X7^`k@i$!Fawt%(F>_#Aplt<TPmuB;xYME#6?T$ncoUN^fUs(1KRck99+`P?|r^
zHfeKbovsNiqqL)$ciWJhDvcpq&Cc{-X{~$J=RDL%Q=Kpd+LKfA(6^b@^1x#%?CL*_
z(ZX%(1#FGU$@w}IW!C<*Ls7aQSW)Adw`(Z*30R;;os@?fH4`a_)4JxcKZa;RcJ~C{
z9>}?yJwk2B{=Yx|cmBi*kDq)ghnI2q9S$$&@CpvE<nSsEujcT(9A3lW_c*+k!|!u=
z9f#L*cmszwa`*!dZ{qM~4sYS`Rt|6D@OBRG;P6fk@8a-o4tH^Q4~IYG@Lmq@<M2lu
z-p}C!96re5Lmckra1V!jIZSYv<S@ly4~P3W{4s|QbNCYuf6Cz_9R7^MM>%|q!=H2b
zIEPPg_#}r<ariWc&v5uGhtF~NJcqyF@C6QE<nSd9U*_<a9KOQguQ>cQhp%$@8i&8(
z@V6Yk&fyyz{*J@nbND8Qf8g*f4&UbR9S;A<;kz8Z$K?MfEBYncpR_RYe_f*<3p)VB
zBa!*%Po5yXpE1H5y6;}X+#-Wp>m^*6z4TpSrRqw~lb4Zz(X+PDqh7_9m)1>M!Pdx0
z;u;xALQN`}t;E2tXR+LFn+qLxw0dSA{9E!9+8ayGk&b_1t3PwwU0M0q0?+LCjwe3>
z@4Dn{X)~g%V8mI;4C^L;&3bdr)57~>$>XKlRT6`22RZ&~k-faJwIdci#m^}ryDN2{
zUErB}$35gH;O#y-ISc#lc+D>($Ies1oTozCyZvUqAB$$y9m(UQsa`I&&Cau)4sM=R
zT2aSMtmi%;^a`8*EefJ@9ii>gmZ^VGBg)T}7Ma<f$35$k3#A8DR(wht*dM|R8swm=
zaU|=u14aMc?g`0ad|b(tYx#$R%s+x;?XNemx_V53bdp8VpSTDi0EqO4tR+=J-+ayn
zSd^BQt!4PC6yX!MCl};FM4K&l>5?g!^HzTLLx$~uEdsVx$@%iiqDB%#m$xbN_wq+P
z?A_BuWA(P=$<kpCN%BiqZPbfwsqhzKILu|rdAo`jvV%lq-CFV_3@M}>kXbMKkh8gS
zUyrQs<R9-zp*z<lPn4cG%wMgN+sqozLdQng``ecY?<e&CkxEj*|JRf+)zOHIw^r>`
zFHrA>1<>p2XWCKPY((SRqFs(?fG=x*(}(Dj^a?$W9KieZ-{!FbeEYZZSgUEv29qT}
zH{Ky4RLc$Dkx1J{5V5d10LiIo1pKlPn8LBubX~Bl=h1CR1v1w2+-8N82~*1PaPRx9
zt>81ynruiN-{EFC*=+VbnI}wKuw&P;1==E5o#Zx3=lN$rwZXU6(`$I1emJLXc^W$u
zHC4?t%2`HH^AE!{&a`H(eV+bs_KF(*;p~(#{N<LKC2rYdp^V|(Zy?mjSIQ_&J~3a9
z8n5r2QUE7e#Qc=gn{cx(vtq+&HSj&&Q1e}ML0e_MOsbSoad6MVTxtxa|NBT$K2oQv
zP3l$Zv)WL&Ms7m<&o^|ZUJc9N+w~{E{mJ|P@r@EXLaf%<Vo6_$IpoVEJj%0euN{}k
zJd!0qblfMQ=%BG>F|XjugOG)EJiI8=G-5=|7Aibu9Bi$!NHb4Ur1Pfe>-y9sl2GgP
z?#Cr$+^Z0vJk;evDiDMSX$~-b-Fykf0DrJ1<KFUj2_+vPuNK2j$3@~lLgrddlTFgf
zPM6RtkjLR6>SEDZ&XoApc)}2q#&PzsdWBv8k$_#KCi<CU^hGu|`Ctm*3y&UQuhC$4
z6xJZGu&bzn_+FB2g1mS1L5%)Ci`f4hjvc;C{fpYIe5RcBUpqfHB`f5^h4EO<f+eFn
zO$TI``$Km!%EvF}0_)b3OBj78V>@H?oHn}vWrtibUst~R=WDDQjh_kxm_J!AEkc1V
zo{Z2EUnk;~G8cHaxopYX6%5yL9}2iuCd&pZ>$Ia}8ceez&{^Ql{HdHi_aye}V72h-
z_T*w|CW9C=rtKMOxB&(83C@n6P<{ALhV5k0YGp&RR9f?ptu%$mDHe=2g}Uf+bl`lR
zf2;0tQ+pOkw}%8zi$saR`LY;NLa<J=D6IaPyKYT5TENzoERmLN(cZI+P{I1p>eA||
zJlbjdU;#6m|A_y4nSQKxk9HjB{u1R^|C#u|{$#E6P`B9KSTyyl9WOGb(sTT$JIPOI
zmp@q}jmyGhfJ-KgW(1LT9<9w}|LRLFleYCE<RsaC)4DH*TP$gD@PK!lN`*Fc7bL5(
zVhz$NWH?eJ{(#ASFiPB1yy?uzu2sn6!B>txZm53iKsx)(dcUq@mGo#Oks*phafI!R
z1-UV0T4`!~Y57xKY~FjFLJvfe9%)G|v2lSrB@N3}#OOFSGi@%cX?==eZJH)vZBJIp
zuLVf!Mgvz<)h+L7lIu+<T=Ql-!?vl+gl(xbHbgg|;-ONX4}=Ssa#$4By>$Y^X3}{Q
z`hS>uq5{7E6!nMdZxLg^7M6c|wZH09^o__0`ow=NCGbB9n*_DZtS%56u+vo(r7SSa
z7U?j2PlBFBl%ZziP-)4S8U8_n*2Y8J3A9MU9?4FQ?s!OoP%j}_rLepZMk!+?{YweY
zPGdfG$6AS=5En_uFJvAP?YD22U<Y90O-yS2!5H!^v6B++C%s65xJN_)VtfWbzw$pN
z3|TFl+a2GP=tQH}w&O|(=8c3Qt@edF5#AVo()ztZ_Wwc346^@^1O2~5{f)X4(GPDz
zk<Gtga;>xhwxzX_+p1JKecfSfiR$>fups)9YoxbVQ-~-Qblwm&YH@NQ!{ZWj+J=*>
zr9H|?SK>2M2?2sjr4xM7NU!E{<&`O=3~BA_LgQ8?S4oS@4W?!8-oMLs@%-`|#0Iq|
zS4!_BR#CFjp@-7(|Hz10arKj|B_YwS#h<K~rnoFdBJH~D(b@UkD;TaNQ-xmZNUo4p
zp;#_bZmZI|z;uRh^cey^e{#8W+bnz_p@kLwB9|WW5X03d+M%^4>!iP$RWdlYMWJWc
zAcoBpT$j=R#fl!#KGaUrRP|hSgmSx5Y%}>SiW`$n@>WyfY->*ho60I^-NV&N^O}V(
z(41_fi+~L4YT7p4Vu^C+fmgE*sTUd9SQ2@(w`wQJkl40)0Nr+1nx3rm%(>t;@)H^u
zOCqDTBwkx1Vz4d2Mqd~!5O(Di2H~FPHkQ_-ptDoJyCX>wYwOw~nFiP8lJ~oFU2UJn
zzidT`P=WU32I=u`71j}4FDRrsF9ajCIM97<&NVzu`Y3Vbh$oR(`&6w+rnLy~P-hNd
zLibIZ&?V&BhSPXR__6bZmUbVQT!+3MsnyG1m(wH2sT-=#olS?k{@G<hov8d@J3-M-
z0NuYC@ji%`|KH)|KLyb}H|jeP7ih2kYl~^Wzv%yZ4{+UJc@T5NAI<n~E#O+G9JA;3
zbWTgl36>Qj=nC%hZWePop5SUei*$mHHm>F~MZ$M%;c7fPL-qSPLbI)aV;>KdVAQNT
zQan;Ekt&dYFm)l=Dz%1qved;Kn~luD@hooxHRXX_f0L_(Y>0G?S<d4LSep4fka;l;
z6l?P7yp;zA<qtO-d_E1^f@34w|K}+1^6RHvh5TRls>RAa1-b2V|ATczfJx6~*0Qv0
z-k_s5)*>Ujx4zyrZ3^40J4N9+LN>Oe7X7rvGPTH^_cwQ1;N|Pss;+-38oab8<<ntO
z*)61hMi(q5waqR({)FRMizgf;tk+#hq{G~<&6jDfz3>4nSa3Yd>dbP9Rf$^|=1NiK
z-j+m4%#b!+h62k3!SBtT>^7GvXI{=lZY>_6ne9pWB$!0H)`%q6u3&FuV7Eo#np8Dw
zTD>@og2`rSmbNJ9@9+lTbBp}jQGbNRhK3`vxl}pB!CB3s1BK=xM4b=gRx(5#wH*Q_
z;;Oar1Z37lIqs<c1GoPVt`%y+=0D{Bm&5+=ZtZyF|6Bhb%m0@|mby*aOqsDuyn7+)
zCv7TDd-sCCG!<5S_#*qL3q?u~YePhSZO9#}$DQ+X)5TS^4rZSsUlKX&B%=+Ol-F*t
z<dlUhU2Q?x-NIMwNN$qmhY2rAyvIPT_eLS39I9B_@aIEV-*$*rX^|w7(n(rG(_sng
zstC6_Fy(g=E`(majA7O12(4^SBKx%D_$fwaEFaX2h@?OkT}HH96o#Jv1;ZBlLcrFQ
zL^f*4m6oV78i<x7%(Wa{8P_n|OZDRyGt9?{JBmMvywq4}W#&mGKAI4G-EA)0)c-8c
z?2QTX6Iw~={~_vyih7~?xTYfe$2NHVf2fbqSL@%=AIVJv?7#Xg_ke^$uZ`gGRS9W*
zY1kKOh1{}s6SUN)umo_9sS*Ne3xSg3B^kf}+%dAxlYWJlC61a5!kVb`pv~mgM1PhL
zlV_QeKO*_S6mD_u@JV!RnMI;D$9A~~i90VN#vlr#tCUy5Yq$(^9%e-J{xuR>9y@WA
z<4rREoyyG${y(GqLp@e4RoAIe^<wot<kWs${Tvy$XCpdUlXekue>|%FQSXnO-}7{j
z-mY(l&%guvFZ4IR<yl~Q9gmOJCmHlM=XrA5T043Q3$!)FP_xy?R96;cm61D{!tGIU
zznxJa&+H%?{-uir<37$|T9`Pzm_}u9q-T5>OoPGtZ{COkSZkwQy~cK&gS0lN<00cj
zD#P)2&cNp~jN|6Ug7F(~uV~=LGGu(UI0h*}7^w!MQD~r6)J`Q)h+w3EB$fe|v-WHH
z0;f{zZ=!jBSb{L8N_kzUQWy3{T9Gzq9Grph5_}Ene(ls~uQ_$DVI`I~gmx_U!AqXq
zF`636k~;!k1kZ^~MhMlguM3FD6mkxs&2j1rz0hZ-!y-EeP|hBut=<Sx!bU-hW>U*J
z`%~*~r@p8$;O~r30>e3y_P0|nCFYCN6dP(9h+`>|f%Nk@_3|JhRMHX$?P#aIl%TC`
zjr9hUPsbH^j^bFB`Z{7^zn4CCB*(He6mFt6>6F6qv5SY%tR;A7D8kSl%3DFGpavL!
zP<3)N6sC-eliL3cQYI++MY>yiKr2<>QahBdluJ;Q_0N|?I!j4Pwg{vb(oJ~{&K*L@
zj_&sv?X#&sphw!1NMk8U<5}5vyDbW%$%7fTpj*HeNFs41u*vYWg!#aPBcmXjBM}Of
z%g?=wp(_{7SE5N|tdtDaW$Z-bYJ{k2y}fI=pq%mCsSIssqtMC?$+)z&Ty`K+@I8jO
zrb~XpVkZ>1M++F*lgL*o`PHClgeMbbQag2RB14)c;t>n$2bHk)6pj<HMUu!PFUft_
zS@RqHG0FT%oB0PX<y85y8w9N0B=X6(Xi{k?1uFn|_IYUU0kmai%c@WkIpky7Y$?j$
zGBuWU#w^d4Pg!3s6GKFj{ePfVplHV<yVp;(e`y8!Z2c6yCu{QWKlxwX0}@v5S?hq~
zU$q7BqwOPPb)Fuy4@xj1mf@Qv3}385J4+aE<p}#M!@A^@896@6{}rat(9*An!$~1P
z7F@5ZH5Ly08@)j$5`h^7;(uxL6m6d7(b~0hwMVqKwXcx%XF6#7Mtz%pg}z6BPXF`&
z>ItyFao?Z^xOZb#04vUKSQ&UZe!~@IjN46%;=nso3ZQasfffSu!miT%g~TK&j5OWI
z3+kFcd5Yo?e0o_%uL_^9lSS6`aGuFlrQvvwb2_3Gh~p2OV=|ab@_^*_W|8S8TADs`
z1!1;%BgbwwVN72znJIDxESD)FXSK2k3&%gXI?>XkkXJ6-Y>>(SJ&JylJ`(xAPgeIS
z9(9584I_TGr;r4Col5BGS%+Ef4=em6$14^2rkOF_qHM&ZLK?xh?5)4fZjDAen+jt=
z|CT9D{;;nR%uAe>bt|cUknj)BWvpZI?!ro6xWnsjf+PtnIM~RjH^BHe-R?^CM|%kU
zRQB{sVl<1bsRC4CkT%<%g|Mmu5VuUJZS{77okcn(&LZlT#mdg%Pk6q!ayj`4H0kz~
zMzQAz|67F7)dDQFkcJ1FLxHA3J2u*mzgEs4e}m^*Z6Wyy_}fy571yOrv~Ro_y};ZH
z%)WB-vbkvJYvd;&Ye^v|_A0f|esGzP>8293@En?Rdr9rXH`))Z!O2t6uOo6ri8shD
z3j3C9^ez0DIbtW;{0#XC?OvVSF<7Zoj{#F)GpP)9(G7pk97Fx5ayFIC|1w2C4fFrI
z+F|Og>NurGDa&_52&aaj$B<Imo^`RB2T0cu3kQiV3JW}yZs?|>@alWfD^|n5IfWdQ
zG3^-p;b(=j7RjVxCC9KCPL#xVx7y6|?WrMX-4JbVewflLoFHzp5ko0wUf96!|FTsW
z0>RW^qKlf8A9}XBQLQ*@tWcmlvzxm3ls!FNWOh$Y4MKy5<%%nA)wR{FNW2nig|`oJ
zQOwu`!H?Yff^znv8(5Q{6GaN~)Iii=fHo_?Hd~6`ECq7PnOh5O##LKt01+^Z&kuFB
z^e|hPsN5ZTl{NI~l<;l0ruw6ydG8?BQb}uJrE+WV`@EaC3E0{EU#IA2>LmYfA>{sZ
zl*g2H`ObgK`<qiEzrp-8N>q*FRpsp#nklX9>0iDtv?7#3GPqN<Dfulvo=_AiwOSC<
zx|zvJb+Kec@fHk`I`R`RZcZJHuhuV@F@x0vv4}_M)GZ1(->KM)&8?|}zR7U07XLy_
zY#|j^9vekn9m}46Sqx9ro*F@{lyeBdtXmD+6<=f6$Ge#ctkdVw6Th_S<n|O&L+6c+
zQaZrrrQUZ=J^MU(_gywU+m#y5K52f_K9h0@95#<ML~z2Cj|3FxEmUsmdW%iM8GD4m
zv?WE7MPseYZ~VfFj6^k#KwIJ}gH;Dx<gH4h)gx@Wn92X<D$x9I)Gp8-)eqH|A>Q}T
zE$8$8!u>sv?tyW7m9+$rDM43<IvV`GA?HrgSJ~X=CyTGE&ezcyrJAB4%WXC0BzbMt
zy{-x$iXaN;j73AEo~bVA9wUh*>&ZeI8K=w(J0XytL=W$CEi9=W^{lNShN&in*&#!Q
zG}@+RFh5%CCrZpn7vgh}sXJt)Z5VI!vqbC?4#k-UbV!4I*A>E4IO1(*VG4%8`D}mu
z-}I2q2lDu-f9CLg4*$a8Upf4M!w)(98;5`A@FNcY!Qsao{*%K`IQ*2ue{uL3ho5u!
z1&3c!_?6>p0-cIe<xrzgcNTEikHh{P4&ZPghl4mA%;69YhjKWK!vi=R&f$R^j^OYh
z4iDz=5DrIjcqoU5ad<d~qc}W*!y`Ey&7p%sCx=II=;Ck;g-1J&;qX`r$2!MRINmvd
z!ii2dg_E3<Ih?}bR1OO{oW|jF4rg#Ulf&aUoW<es9M0x&4u^9&oX6n_9G=MGNgSTc
z;d~Aka9BiPv2!7ZB^)l|u$05a9F}od&fyXcD>z)r=>OG<{(XH6{C}sYyAc0lpRzii
zxnO;-H-)Tlo3x|yqiK4rBYF)b246Iq5l$v@v|CG!2IVv&mp!}{L27R)VsAv!T>7#N
z4b_}F@*A)@Mw1TRaH8DtXDYS<n<I(=wx^CjYx5RE)cTrYjSvA+l{*aA{f%7qVOg#`
zSal`q?iWQmwYy(x6e@7AR+Jx!oWsB+hw+Q@!1q396?sLBTHBgBoX8!==2s2Ec2tLa
z%<=_XSMQl}&fQPieB5~IFh-l_hs)A92ke&FWJgI3f1EY*CGmT2OdU!LfgSmx=B7Ux
zBOv9H_upeEo^B9W4@UntD9G`9h4!3&03!Zv(r?pWv!2uYOZWFczCB<YGy@K<B)l<%
z=YeRvuslfk*r}nGmVsB>)4^Gf5Q`zA04olV1dZg$@7f0V$VNsT^jswfEl%7PT{EUm
zqmO^Dr~sbOmU=7U`FKZXYbY2eW`?zm{zwEgHGRW1E`6ch3t)2{*4EjE>8mG3+2KO4
z?;et>3$BDqLO~|O(AL{#QmXd_8o~NgZw@SIOJczmrpzkXY8zLu9tzdsSh&d-9QA!N
z|Br&eAOBxP4A2ABX=<^$L5-_ds}HD8sc)!XY6oc(5h=D&+lm$9F70XU0~!N(G4g_K
z(Jw|8@W=Gu<vS+6rTe)dq?N?Oc>vX}I!z)y=OO&5YHx&^b(Z+xys?NIiaMF8shzyq
zIfxr^BG4OOWXJH=)%d)D4l*7}VPWcxP+M;2QPd69Y1U~thjEKko4xr6s>rpJBRPjN
zD_KFV<vfs^iW)Q;&Y|4+6LGK+&4vut7)c$?%~f4gBTVFvy*r`vaQ^me8J%+kuaJeT
z(s?k)VyV4!7EnK7C(&(!+wIjx3}$_EbSZSY=^#S2lrTAlnd2Vqfyy$BS;_=k$5Pe2
zb1bPC3-iJaFN;|8Q|CBlPCLHL8-Qz5D>B5pD%(PVpg&9!!P7TSV6B)~KE5N3vH`(6
z=`}a|^pglfUqd|!p~ZmpE)p-(>nE{iCl&i3i)f;rX_X-sz1%sI)p*jvaIDea?B`ER
zrncJ7N#NC+d>xp~9dJrwX1dc@FHb6geM1lman~%0<2crnlZgHvCbXq6e{d}hd%3b|
zJ{!`LsIxD6p#s8d`q%>2m6Jd`)0R`QAiXk=H>wgQ#^_6o05VxfSWzY%ojXi@SQ)77
zAoBk~+WFczWrtd&yrVwzEzQtAUgJw4?`gd{1q6<bYI9YvrOS^GiOGc)_=37vpzQs9
zgwQtSC9j5U6}rtSnlyI2Juf1@wlI6}Wsk+BkG~0OaX$G8<Ww+)WU*UwX+ceh%;VoY
zB{~LP3S=jfpMVe@OjtPfZ$%1OdCOJ8a@lkz&4Pzv8`d*_H4izR_uppQ{%c5$p}bsv
zglO*~sb~IFp1WWcBSlS0oUJL6nmuntnDyGGTNW#KU(R`(r^Ns>@zhb@gwD5I_OafZ
zHv{Feg=g9j;agHphTDF8T5++KJD6@&y7lhEF?Ou<SO)ojmv+7OiattTgP7kxNe`+0
zaDNY2_JFPZtkp<0?fv8RWj16o*{Fz3R2ZIdqu;kR3a&TaSC~#QUXMt9-~&egH3uP|
z^<XWOklqe>31j12M9GsVd&38^Zy<^T5^)oOHV{@1&P<?LXdV7y-$o-BGw>?gp3LSs
zid+#wm5{J=4L+pIW*pD8k{nOEhnl=Ja9tCKD#9>bH%xsI`+r>3&p`yB8^8gqRo~FZ
zDsjti{%sa^rI6ZjyLOWOmQoxDg_;@=uDPj@eWnQU=FX6Rl)jl{cSSj`hlbHzI^x1#
z2wP@zY9h5Gv)?6&%c!?8)Je26lL<!MR8oEv-Ntg-Rz*{8EbD468v)aM3#~{~D|)qj
zINL{qXP+Xp4_|3$`b(`!O&Y9JsAKF2tlnPMd;c8rNf`}KyY%3H49Gzgj32BlS0~x`
zV<ik5p|`7oVl9X+)rIquF6z4vVdFUgoj4>{#4h2rg*h029L&K<J9vklDMlz$Hl~mm
zv_;E7KK6E9VKxtt%@TxHtRN%+2Icd@M~kJ#^%4FpL$DQQra;;sEzJSh@<zVTPbb7G
z`3ZQL{J%ocFVGLxZq?=?1IT#gCrU+n0ObKAsaeEoDu<1np_h21_hRY{3XX{dg?3J|
zE?0i&zJhdI<wcuChrz}a5~lfcnV=f53hb7^ekpfeI-Gu<;cG-Usg4v<AV+dJ3L3Cj
zafnuIqw?d!Ke8DP-AAQnVAzk<eD)-v0V5d^Jd|PuQ7Q*r6P9>8;pBmg55=Ki3}LCj
zMYdCedFP~j?p~v~S;t3OgpuP<AzyMxBj&hctZlsw6|D5Z$Qr)BLBfWzmD^OLoc7R{
zHr>&dLf+&}xgug1a9Ob17A*LVjZbi7;{LEXg~Z9&ndExD3qnK?Ea1hPnDi&g#1)h3
zY_4pdIFTYAzD7)9w<(2u%3Zlk$qlV!A`lwE1>(H4_3R|eV&$A4m9ejQwz%#P`oBOs
zRnbn>{-L+(SLHF^_usm|2mak2h!%AFtr>yh0Q}*LuyT2zGb_wGb4_toH9>3!ulXsI
z9;C)FF`7V-%)uHTZ2urrD~`L$1A!PMY}CLArae>JI$MT494Y8-`7c9SN^#yaRo@_k
zav|(7!;xXvw-$8UFi2TFQONE$bq`tL>qFso7mTqQTgl=dj35MHN5r)_)PznWArff4
zZe;uaDh2U86zy7VthyKWzrRpc{ktDliKR{=1WgXl6vJX>Cv&wE#wu4_@dLJ?MZ1J;
zsVRkoiR~JpO8efH>bwoHfY(*yjWDt7B%xsI$+z>hT8x{zBXt7yXI)z;wf)r+8!s+*
zr9xP56ZU2%f}ND(qH=ZUyR4m?9uwN>Paz$$?DlIG44Y-e%2^#W{Ivyf8ciVqGQOo$
zpW2C<C)r%s9H3G1mJVN&6q@KwAp<hVZmBNzgd)wpus6!QNG4^SDt~^FeMd9h-I_wS
zV|1fb)2ajBmY5HAg2V@nQ8A{XQ|oD<NHphMp*h_nQpaP=9F{BmuVGFYhN7!FI(3F?
zLfSeV)+?AWX=1K-2;1Kl@3)DM<B(7(vj6wf&Q;*~`?X#IEx<$n_RQb^g8e;^e-Fe8
zy4z)T$Z6B2Lg8<q4Za~YFcr>_!_F=#fWpC2;h%-0u*g;F>q3kkgdE}_cS134>_6<<
z1qH<M&EH6478N$by)05#8H@NEv-f34DP4;KP)i~w6R4C@+}27KkzwcB1|<_Jv4v&r
z8}?v%0gSLDFlIfEj;ajR)B!-R7>v^W|5h^pk5u+3`2P##1GOI_fSnBe|LO1pdP03&
zJ6JnTTdYO2Ymgi47urX9KmAz!1ifDG#7eP8e<%OX{B1qKRiTysCaO_RXUK7$%r&T%
ze2{Z0*VAV04$e7D7jGkbaL(e|Rnt=MoXu3ywn9kflw%5zOx2ldi+7$t^TvWJms!Z2
z$1`oZ@ou^ioyc_gC`XhB7{<`TqT>oQAJFH+@H=PlM%nSN&ccHVv@x2qcxuKQ+gUfM
z0O8}E#YNnsnwr^>4J(M9sv*{46hEw{QQB~CM=Quu*MwRUzMre|p(kjHu#K&XnKKj@
z1=~YV{nGZ7G7Wz*W>HHVPeT7qB8h=wh6<fMwwA>LOW)$9*t6~^V<sHz4*FV_M%P)K
zjtNG>4#bH24o&6fEMdC(Vxo30A}V~=xfRSFpqSED;J*zyJ)PBTcox%0;gRvgN{JDB
z9`>1viQiQq6lMr&XB22&^j;+li4aQNHKC69#4Zj)-Hl3kk*qKRYX!*tQ50v*tYm|x
zxH1%VmA1jG0s)ms7E<djU&KZ*?#7FW$6FoVO`Bd%=>I{m0Mf70kI@p^O64f^1GP)}
zopLIjsq0e3gOw_k7+TtBl#NY<87q7#czcIlJm(xjbijpwx~&X(eF}*jTQuU^Y(uRZ
zUx^j8cQ6=7hQEW-H)YR`n;_6P-3O-@f#^Ci7txi4Las;UI=<+mnWP6i!`J*>s8%dR
z6F%mUm1b4SW@OroSf%@(Nepjwe*tfEY9S$ab8tslc&i$H-XMvSz%pPti-m%wJNwg5
z{Oq`~0-_D6A`){fhlOqyscTrYvX(IA^lcv#43!s!#mKeIsRe_Tj$A&U1`H;X8Iuvs
zrn}E0h%EF)n^N=T#d6k`JJtq0%7r6oQWOiE&8d^+8)w=CCy6ED=f>MKj_m&<l*J1E
zpQhZeyr&+m)~M&GPie!nGHr`?ulBY+Qm;UE;C*yGushf~OfB_ybRu5fDeeAfA(xAT
zD4}+nbVVGw!<P8TdNc&8in3fIyKF5evmSt6x7}46jWsuug>K{)TMwzMr(lcP1gFj7
zupfCk>4VL-;aH6iE)2wi?ezZ5Qq`kbXp!6+Zfx|aP4=Ojvd|E1HSD-1)OefxAz~v+
ztQYB)FtXELV{Lo|3zM@LLHL@RF|UJ7*m0N{*~qZeS1dv9Tx6<%?=&&aV++H`kW?>~
zgn8cGk>}eg_KkI2<c(6tJcK-CA-qSfvrYS#^&Es~aq8PmJGW7)a;09l6w>?sQlGFi
z217xQF91m+ed-FS-dpU8Hnw`PlZQY7fKa24UMbZZi~SwM&=;b;O6I{a@-(?mjsP=F
z#593ETkNIrzhG)jrp0AU{)hd)P5U$QevVRqq)t-K13|$4wWg48byKcIHfz5yo{;xD
zO%%|M%SZ7YLyYR!?MPKpm6unN7|4TM%7e7pcG@sfLC^4IVyK^PJ+%}S9Fi;9h_M3-
zYeV4ng2WTuHK7CspxKmaan8$)ckS`aeR(AL2|H_33c1oda=GAVRYIUz1uE9Ng{t>F
z!&hD^plMAl$>+<j@COlE7h#6HEliYJES9WW%wkYHJMLHkRZ|Kn(B)gy>oUxSSoV2n
zAB}0^8NT8c0nN5l89tw`&9|2)X7wEBGAvjKd+tIx`w1F_6_luHd>@or4E&?C<&yXj
zLx6-ngOf92<oIkz`(l~9lyig6@>wVLJ){4pD|#35|6H#fqdu%QDPJnrDbsDX`nD9(
zJVtT}OtU)C%yO8ykj{%QW>ap>zl2Y=HiZC%K5dNTieQK_fqqHHm)Q2g2Ad_PDTTC-
z@&m7T!m@#vect)?GS-S!n}k-ZN+F{oTA_l;8EGlC$?7r#Uv1#AL$nRxrJ}wq(ZbFE
zvW}9!Hl~nM-LH+6?4c~aGm8t|IIxcQl1R$OQ#Ba3YA%I%R{fERkNO&ror<h|m58;*
zXR6JW&=DW9uB-h@=(@(#GNR4Np#sQ84V2Wno#Qi}D(C-gId7pjHAAUtLgD8K1D%D%
zisQEu11L8nDMrum+9QN^!IQEIojOb_m;7*jNK5*Vrc`fzhBtk@P!U4^4_EF`)I-%u
z^=x&o)?ZtSJfM$g|5ARh+@Vj^n_(IBsLfjNUs-HVA{k^3g%DcNC@dLy;0AkwG3z;u
zlsaT>V*;7=wlQV1#(}^LI~Usetz|vd8{mv&g`*>NrELh_tS5WdH0O$?1=vdZUQA@R
z2j}8N1t4oAUY3)fS!z!<8@oDt)pRbmm!4;}-F8)}kwcqJB{<9F$3^dgvP^Ceij<FY
z$ymM8rh9wY<B@BnSk$=)nF6`s+-Y!vVq)HrmrHRTMTm0+M@3jFBi>|?xhRc1m(l-i
zihij+Q@cT%4!Qq4<z=Pq+n?I4DVpasM~trQ?=8;cVsUPFw5n{^SR*Pm8&XK}id{o;
zZ6zC3@8mDeI^8~=c}|<@xoBz~F%z3Bi3DaWUA`7Su@ndAhws2#w~DRHTTAa_ZL5A;
zSg^OJ)?(x6m&+bDs~>a7%F|@5g&ckJSI;s0^`enlAcbt~v0SEjS?E1bo0Sq9ZYrN<
z+p@VVkhp}QTmCblx!uE4tI^)Wv|7o2mQg_zOWf4{_&+>zU%P_*get8`A!<&ec9bL;
zPd@-_c;-*#>dx=52Cu$ZczYm)r0w$kYq6OWo6F)me@@U@$j8b4?^5<E`2Q>ALv@Ji
zR4dd?kO1BRPT-g7`&vKEsTFDKpaZ;6yG{F<_Li>cPJO0cs|S!B_zL|lJ)ys-zx(a4
z7k#{u>FjK#k8>SUlZo<b=R)R^Y0*W_m0Yc5++-&gXv?9Pk=sPa7C=>sn{#iHT$$8+
z7abbQnbNJ;ewX9ViQ5=cXwo&yuumCEdl$C#Tqz~4qs|Tdf_dL!`nHWQq$}}l_QU25
zsv|6xwNWC6q!n*vTCk0a0#JBEqE+MbHnwtQR|BiYM(V~|)a+#@Gc8ORwGmP&VyH|U
zin+S7kzXPCm<Xzxm_NwWW<KU*y%7mZNr)~uzd$hti(*=ZX6EC%k<^Uj0*7ZdT<4+b
z@-ZiDFH;F`tc!JYVEJ9)4->s(otMcens@^;y;27i7N-OKOk39m`$9yC=7!6i3|(6Z
zX)YX6s^Cx!K`QYTq16eq-fSy{+b+%MTg{axQKr#sLmoCCDnf6La17<aW<);-us4KQ
zzqKu$x@v0C)Y7SC^w!`31==Xh*;YA|o^Il3;2GN(g6BEW4blq%{z_;LiLQ^mvYpL`
zwzLTmmSB1_5)CTKOf9TvVJ)uh)XqkpuPa~&c$0RgcAvIKdsus1dmb6Vf2X~xeW-n^
zEBZj>1~^=I=@ay6`W$_MUWSMvE0HO@6*d7|up*qJU!q@)%wV_c_rgNpVf}IadHq-V
z@AP-|5A{#`nA7_&{~zdq{<^9Kl${K8GjJLMr!#N{17|XD76WH9a1I0KlK54SQ=iY_
z1sq;T;YG^D6keiSO5tV7cR0M9!z(zvlEbSwyqd%Ba(E4g-{bIF4!=*~b;|V=-l+V5
z!kd(vIlP6#TRFUq!`nH$gTp&Hyo<xTIo!qJJskd!!h4nbIQ$WZ_jC9FhYxc25Qn=t
z+{58s4ig+Enf%YKC~o~+{YdEhPF7!38&pL(LmZ0rsg2aR+};#m5kk1Y1~b;7Xa4H9
z>!VqO@>ufRt?$_y0mM_tEPZM&iZ=7U!W>&sj%})H1=Tt%dF}_Ix$uS*5>5MZu?oGo
zv-h#=ZEeSGFR*r+Fa%S5C715SV7b3p?t037o5tE8Y)$!yR5OQTjsc-*tKDeYeU<yZ
zzRCtwDAh!W)g1Y%dQn+#zt+3*h>vNeF^lijnrf78oSDKf6CLV=<yAI~Yfm*04M>i3
z)xC|gB7dxCqBSqhv%wZkdHcu>*Ne@L(y=3f)QVT0wm~~gp9}k++2H?`+1jtQPHm8S
zn_8;8tz0V3|E%-+6q4Q}(uDnDu+-ZShh{n2iU@D~uY%9F)zfNtrcJh843?!fAtZ=4
zDhIoleqSLcg*ZtReES{t_ElmAh4m?<t8UC?jFPEiVHT~IMfoY`uB)&`fXvjA2(n1M
zHshJ{{Wq!Y_!5t)1shUGMxAq+>TN+b*_cg5Zhoc7rU^|c(1QM4DF%8mh*YFVRx0Q2
zqM{j#hBT)FG>>Es=DGLtill9uNbD-#pEt&)J?m2K^pi-9BO|HYW+a?j|M;NI`!O9>
zW=)B2=_HWy(^bd5gAD6HT1IBzSvFcQGRifl4xr62?|*Fnk16_j`eaD`TeSh|9(98f
zQ{MQN+GF*amJ||F=FH?$4fPf=lCJdzHdE&<gf$UL#y<4VM@ge9&VI#hyP9lIodW66
zpj>W9rWaHH>S|(~(-=(~Y*S__PS#zE3(6anCwgW*K9c+dY0ioi5@XiqvTrPjwfhQ7
z!^r8`#8|a1!%6KH60F`T?$6Q`a$wF^M`C!}7-o_e>*P>-4$Vi307;#;{j@%X<d!hk
zv!5-ni+tpva4Sqn3ah{%xBGeS+?erfX}ynplJdZx76=`&GKI{R2t;6C-(CcI@1ILs
z=nHd(S!hm0rI!>FQ*L6@m8<G6vYGO0Qjx)mH`mAPT_TN4zLDeaTxhpoMN;8DvYPh3
z-A?vkCzPn~_fwlT5&nNA5`L)*)H1bNU8!zVTh&f=i@Fmsz)KJX@CNmE^<JzA537%>
z&#S*uf2Y2yeyDz`DcV5oK<#kNrA^SLX>+s%uotY>Rw9c)E2xMqkR_a>U7}qLox<(l
zD*o3>5(ppVEOvT0tm3em!(|-Sa9GP>9f!*~T)|;IhbuW;#o=lW*KoL&!*v|4=Wqjs
z8=YPb8#rv_u!%z-hs_+eaM;SBpTah0JBI-dJ2(t-7~-&#!%ZB9IgD@^r7-5)OktOE
z3x#p#DI9L)a2to)Io!eFsT}U)u$#lvI6R%hGdMhx!?QR%o5OQBr1Ar2+<6{9r*Z_G
zQ#k@4l_LON#II9%0?set=TxqM^UL@-l`r6&$`=5sd;yTk7XYbz0g%cU0I7TdkjfVT
zseA#D$`=5sd;#z}{(dTF!1)dQ{6-F`+yUh`@pCGFz&Vva08;q_AeBD=QuzZQl|KO9
zN#_3`ZJL5PT#xzs1SEV@^cKkVpR(Gx_m}-&?*ZGiAB2o5ELlNa><@j<R+Y_eL)2X&
z;3sJ<s6v5QF%uH&(1_fFUF5+isIl~ehmEo|+29!A3|~sZ%+S=6q>SQwY_h(_S~Jfc
z^AWWMqL$E`&#<-cU^gRTnX5cXR3L#s9A-}>yT^R`<f~Kkb-B=lg5#qw^b1pKkVD_H
zwP@gY=-p7NMxh09RmG?Y`C+=PMT6m~rEo*XGsK3QR%{2;|DU1g*Xc)S_iJV9OX^DH
zBeV4HKRNCLJsP2Wa%8t7Ey!XA3d>>t-Vz8QgfCO$#DxMSaet?0)-5Z^Pas7bdXTg-
zq>-3dHa<rd=vZ`WV$vMvk*e{xa_-o@o>_Mmke`4g-lI@8eU7}KW-QgdP$z8X(h(es
znL;OSS*$#9`d>XWwZD^}fO}KwR3cBEZcogcQP=nyLzt9^PaDN}Cu74IH<xYv_!7^o
zeLKldz}cEYlFC>vLp?Ljg<*d~qZi3Z8M>@f<=Vl!!TO9LKLJ%!YCGYOkICoz6~Su)
zS+5x)!-;Zs^lvt35P57HKH;!jxh2ePqTY<nu(c<vQ+Y5LYJ|HlLu-3!q57<6=FpqS
zPiX3f)K((x%#lOGT!W%WTK^i){Mk_ZGtaDhpC&&61KIzFDbFg(v+7_({@$iOsQwMK
zK$n(8JfKO?@!$8KocZ7OyKR#%nY)Rkr$;tvcug`BygO`dyR4qw?BC3_&p*n!DP%8N
zHK9&;KBXD`8*=V-*-zFsdg0`Xpe<x#UX({OVa*UC#y7AzqR)QcHeRH;nIuX+G2spS
zf_{X>B&dH-T7Vg0X(?#&Jn`(coD16)79ic7>}xvxVLx@5r*dz28PKYnolp05`lHR*
zmFa`$<s=n^eut$4kJECCy`iGH>7=H`{uU4cjffV`y8b5nU<1}Kun;vlPw^CVJ7jyV
zuGJr5>7|K-btNj|no#bl4*1~Q#{7uSVEccyqMrf%{;Apl>ZS1i*{f84)0x@agG{xN
zT%vY!TWgJ9CvH4be*VEYo8>vwGl-bq<p|tjMnnwHR>Ar);zDY5Iu_!lq8-84Ju~+H
zfc%7|vax3%-FNcYR;&Gimaw0h%ES#P<qN*_%=oC7`~)ng^bEkRGa#2;p}Aq`Gpi{=
z`qHBOz=9upX04e{egg7fPk$2Vhs0x-CXL3pCcwwY*M%@$Y)r+)66KuF9Yp-(IehJf
zCWQU+MhKc8QrJc$g!l4~D3+)bpE=Sq>(K|uPe9mxU=K;y?#Pwe+uXl>PbA2O`<QDh
z+phP_?Dr1&33ZD1==sx%r2#Lz0TC2{5E>AeQrAUi+_G4?@$5g?Oe3=Yk5ORY|ETh7
z<?rfn^%%8OZB%1e2kuaRqQ0#DSu4<v)TV3ewau^$x<`8yTEf5TLqQu9!v@f=ck4In
zJ^D-fAHV5}@hv>Z46BTSbLSRj9%UMf&a;>)S-gnGr0|i2k@|_#<=_JLrnrGZbZ%!x
zaPgv`zr#z2^KcYV=_X7mcX>Oeun~Vv`kh&~l$X<Y-p%4o^b%vvt<2;sUhIpLy_tN#
zYIw%byB}bNTJd58AZ~Y+LCVgw0(*El(msO~szt^dW<PvCukk{ExDf$m=sUi{?8o9+
z1hsPq?-6mbIL~CJh4B(!6G-F?`F}otONoyL;oHoJ=Zl$1WW2=ROf1%dQNPzUp%~_X
zWS?W!feW!3uztCgR~m_S8bdDR0N@cdZf3@t@se;Ho~if(qzmd1?U~j8L0(f(O8lKX
zx9!!uri(}>5kzfcOuTb1?*rm{pYE3nnH5|d*;tyq!Ilv1nCqA&p!Fnip3ZAkhDVxX
z0YV6HMJIhY!I2|0xobrT(SBHEuQ;$kb7;<ZCIRpDyx#~z+K8yDjBx7VT_Lck&eQnl
zD(~>Ngj^Hw7VOdyKFU}xewTMgd64!~CT@^3#cRYE(zGDJc^5NeHSnp<ZvG0AF@*H@
zQZUZ6QMa-Ezgf{Q2mk+oR-yi0ZBSlNn!klvX?TUd=OE%>l_PDm#hS~OwsdBmcwN?c
z$Ay3J%=jTT(I0*(tft*Vdq!Y69i>&|vr!YHb<#N)TH#P98Ptn9{ecj|y|IrF@8gEq
z4_v{vxTT`^-?p9uQ5~ot^QlfctrOPwbdBiuirZW`>g4l0GY6hXenNM&^bDtrc|O>)
zr#u!0!wRtRP1Q5w!PCi4z|`DxK>nnkk*|pxxf~_6e7en^)z~vEZ$iwtHegZ6EEE$~
ze*_WH<K!nar>kcuzMHPi%7+-T+*K_18s#DP^>oBcdsM{i?-`Q!Y!Mc3VKJ}&aI$CC
z6aC0fXeHzSpHP%1)B<&`8c~0!eu9`^A;bdz17dwO>-QU`@qgz(ZGE83D~q^-=M<b~
z^Mk#sd>(ASuoL9Ly_<H6#Rc8NWx2mxTgr(#k`!4*tTXqPdE3dOtHrG;57xU^%<AmU
zqq^oTE+4*~Jl%w(TgE-|O8Y1q=H6OL90B}|eyo@)ygnWa{8oEsO^Y}5u@haI*UKQ$
zMff%3Bmk*K$kxnS&bGDt*#5sv(XY{`YCqA+)o0c9$}7sUZ#>nzwH}hBc6csxUUQ>!
z5Z5^f@8iBY)HCam8uAmCwQjwKWU56i@>#ue%$T_SHRY;Lf8#m+oiO<c)#&I!o?7tJ
z`E0%>sy8l{blf-IGwb#X$xpzyrH3S|?U&0S*WCA@bL+Z7u3~s6275h5;+Dn7{o+&4
z%zv#SKLK^D=TM+VvXgu|+-kbTEee%83)b2Y18qGc>1LS^T44i-XP+zg+>YIH_nYJ=
zG}7O5NZvd1iV$cVKQxtoM!{vDcS8R#<MTn}C*W%AIXG`B$H)c74JRY#=$;v$ewX|N
zENuR7RP?hD|7W{)h<d+Tro5zV{KoTNcyLqC(Ru5lEac8{bJ^lwp65BPU?%wqZQ9g>
zY;}3+zp5G#V+xut7j^1qU&>t8dgbe$S^oRUPr%vQ<H}qAm8}klXPqk7+<y%t4<FYA
zRO@?=BKB@MvO=5Zc!qAt@TtnqO;|;O8u<wbntPmi6Y^Pnb{5yI?EKBUo>{v<X7Bn)
zK-Avjpo-somPb*c5f=(JybYD?8j!kcL{hi=upW{u{+L_=c+5Q~CFqb6hbV72dpxrq
zc$EBvj_B$+5;e<{*QgG}HWNCd2o8__%`wK%$E`}0%dVN^nXwD=f0sD_3H^Tn%>9+O
z;rUyuUZg&$4b_U_2lyzYd}H;skPH0Jw*<;VQ?#4}#EXWQcjOQA;0%^WxE}i_d6381
zdx7)vJXiyWps45!dly};?#zcut@pN5VaNY#?@QpEsPDe#Sgu9DV+9471W+!4&3&M@
zE{B4$SuR1OuuhT*8~4b%$pWETq=!~*D;`g4pFVwRZGEa$TYc(-S0^4=AFnE&SX;Yz
z)U#goD7IGL@Bc_PnaoTkuh_nQOFo3(X6ApNzxzl0<dKjNw1nGj)lMquAZqVQbKO~w
zRLg>Up=`H|fmgjD;Ukz}DQ*=;x2)^ePnTC%Q!~w8-`s$Yv~}#`w&X{%*AFC!2KS}>
z$PP{GnzN}}9s7EXYylFkkVfn#`5;ls(rho;N|c+u!8!0!(+jiVOiwxiX(1c~l2(oz
zQlq-i93n$5vQ3w8@#5ImY!_>D3+5TIKj5&D2n~2p<*{c;*#E<%Hgapnr8en%(o@g?
zJO<VP_mW5ZKl?|Z-Vu1hhDVXvr1cRS{Gi9<X<n%%I(jnTvF6=y^hs3b;At3+w3%c>
z+JlOJW4#qBiaMn$*Qd^I)tK)==?-Ll&eG@3QV3)bjO+vmf<+ST;<wh7^ktIi4S5;@
z62AP2M21*LQb~<C30c2;Qp2`GEsmb@ybw3{<>MLXn}D0LlE`~d7=-cgIoh{@9%AGQ
z7B*X-80Dp%(61quS|0k0Okt3??-$yvPw(=)Py$HOaC;P85Pn1O{}I9z0oK3cr5)07
z;zMGW@UgHRkBXl&bi|MZ^S&Mm%fR>HvWTLHLL7eMUW(j~Q;n|JI`x@#qlCt*FmHG;
z?US{PH^0+}wRh?W1q#i>dJs^f;t<s2Dm00_kN3uWI~vK?faR^zr&Gkep4!^FdpO-#
z{A<Y*@5KBc{RjCP%J0z;kh4zdJt4L$xLuU|E`K6C_00XT;I5;|*HGa`eJVp+>*<jx
zhb(XQbdh^xEU0fLUqi*JjzH&7;jE`#;<SWIz4C*9XGW{B;N35guc3}E{m8ntQjLO6
z&;=EePvNP{-?QLj<n$?we^O7M$WdZcGon^%hKHwjb;hErBjju7CBgq)!Vd-fD+n)%
zqs2M!|C13fg7p6mSo^#y9VAVLZO=+b1ik_PKX*uvORq{F%VT9Pr2l>LdEguFke@0Z
z6`uj*qII+Nq5Rjh2I*wTUTetal#7e$YH>rEYnMC?DBGW%9aH;r=>$kDF3P`yH>MSi
z0_na%Ko_V3Fx88jS*(wIEBwGfAp>LtqBk%v*(i@mfp_o<N(E0}(3egjM(zg2j{O<)
zfK#oNq@2&C$~3M?H$vZ0<h#J-y0LUenuOQv1E-0;xPkdO%2%^6lpk^-xG8^6`3@In
z7f&1IYM$Iw30XOZi{8sro0PBfx^c&)d#Jko0+p$oD|hn&G$T@#@9})qYRAe}E<HCK
zwaPWT`sMIWR8q*~BUQmpQLf<n0OcY^<y*X10}Da<K5t1i(@D9K#TUt2D)TC5aWw*S
z-7Dq1VnfQ6-Y(!G`@wTbxr!@^m~HVN@nu9Y2@^xrEi)Q`%PX~Yl9aEK{XbH?T@Y^<
zUz85TPTwlsExjR6kypy!lXrav`+0wn`)UO2sop_)a)M=q1wvdm&&%X;T^dmD82Ct(
zOn!EzyxIb(r5T{@lk1>J@VJ9*)rp&lVi5Ji54?94qAC=B6>U};tiv9#w&gW9Le)cS
zwa1+&A$F+!?y9nYKVu)N(b&B9g(9*0HER@^^lN?xP<uC6z&w}_Q}7vkkNxn?hY<=C
z@Ib@x7(ZjT*y~6)BS$}rBDOG*&8b;LGK#C&Y^p1>$=#=Qr#I8PVC>oU^gJ&Gf=XTr
z<sAr?p$_PH&d+rB_7mMH&hr`9$oT)K2)N0cq|2mPI0t45JB3p|)gtZG5iPq;wA!fH
zmNz_D9iJQve!)e)1{5Z#`|7p_DZem)z?W_h;Tma4Eco*~$=6WLwo$ql7#j47>LG-d
z)Id4%H4+F{91kS;jK7kvp+P-5f@0T+?pGlSdE*n|wzMY}yzWx+HB_kS2#gKg?s_oP
z3Vv$7{8u{q#aM6+<PU3%@`tnaIT+|Voi<pZRC$XR!o`mu!ort7CSOB8d-d5=wY;8r
zuI5VSs~!p4uf*c&_zw9Rs@$m0s-Kdo6q<7!)gUfsPxIT`W5HXVAzwqqZ2w0D`0X1h
zeMM>%zbDQSZWJQ5_Wwqm#lH>KvlvX-&Uv$^{fGTD7Tf_T&JLp#XNx`;BUPt<yoE|<
z-u(I5Emy??qqmc<VYJTB5eT<VR)|4a71I22<yGNtuUu+D5q9Yae_N+nq)~0ys7EYp
zzY_y{*Dd60=-Wm;T>la@rG)ZkPm?_t#DdqtN6NKEA1T`!bP^Z$AZdO*YsrqxvZKLz
z+n%u)?=5<;{*`5+!fc`1+*N>0!j12fuVM82^#CfbQ+>irf!s{1TzKYE7{lJ)OumMC
znf~8>f;dcEEM6k+1`W^#O8-H5v^-xvSGcc6+^<^4#NX|`Ego7ayE3Co>k*!rt#0M!
zMGaWN4pr*x*6xma<Y^XnoAR?d<Y`qFP|Epr=r$Vo5p^i)84(ZVhC1fZjIUu&OH{4_
z3+9I{%55m2$e6vlo_Z~~DAs&`5GIxNR&ZMCS+?dp7smfTNsup+kCbkeqT+6GlPC!%
zAp%gHpJh5iOU@S$2i9cak*XyNX{RbP(C|Ogo+MoPlh>ZV-qJ0VsxKf;+-y7pu)>(j
zuKvDW&|;MTwUe?&1|JAtS>|Q6ZTgwv1nkr2QEj1musxF_1d11!s|t3P@S_vg#=O@Y
zPQHdp*Xan42_2q#ZoHC)LB9Cc#<g$(u>Nc0Ybd{6KfZ3m@j;nBP%_{sWFUL5fQiM;
zpCeyG4QK10$AwiVl5WLVwc@x6J6~vv`QAnw-Zq+fbm)kXS*OE+%EJnz4?=hsd8xv;
zuYo?)PvYcj=xT?4T-{Yw>U>l06eVLI;g?5VV1a}5=*QMg(^V;GL)unpDJ1CApNRPr
zOUc*JH?sd5h3SHPm3%C`d~cP;i8sLm$R6Q*JS_XH*AWO%wX@(U?nLm$-7URfi}Q_G
z@w@vAG!VhbYd8JW(2$jSEAf<P<LZD{fapto%$#dy>CZ{)seeNhd#$0^etikS*ll9I
z@nYv`xlJUn3d5kMx>t9kx%T!>%U8lpOKIRL)O)?5-ZeU+^sTjXQo-v5OFPq7JhjSx
z2p2x^E<drZGn9S0eiA(utq+e<*{Lo#F)TW;QFboZDjv)}`2${svH6;gkbG!9LYDcb
zm|``&3dqvovLs7_$tyd{eh9_0UG44d;%0@-n`dj?y}5kZqxJeCXUl2<qMbr{rB9;{
zb(Eczzw>S9S)A@`^b;M<LmCa`Hhnvn5B?A?+H*B8`x?VMq;v$YPTToe;e#|^&8di7
z04*Od;Fuld&gy4hYJJC|6Q}A6X(wt<cpq;!pAFU{{1CrG4X|<7-U!`?4O;UVz0me1
ze-ZqDlJK~If3FB1iU*3*#f9Q(-~bmx6Zm2A53mLrBTbRQpbAp(>312t`R$Z`FTEo-
zLOU=jx65Ay=I|r=e))~E!{Q(NCl|1k^O}^ObFo(O=2Y(Dwv$E;JT4J3Xb>nr<$^0S
zUWIZyx9~09n#!GAKx3)z#^rofEF$H4CSS5XbCideaLQx>DfhBY88(M<A8X&>ajE>8
zb<=nrC=W1s8lDdxN)HyF4ekl$e|dfbmZjXo8?dtC&{rO2-QBqo=CH&^)}S+`M|k07
zCx>!>=~-$0D!*c#-gRQSj|AP_oP!Ii3^0^{syxA8Ey}>_)+VCkMiS9ik20~^uEp+?
zdx%OWQa{Bcrn_JPn}Z4=@r%NWd7Ky1s&=A@@R79$#}uTt$nzv?(5@AkZmolt^B9Zv
zvYVE(6egn`8dR8OyO(D&sa&Qv>!!Eg@0bv8H*8lIX$Tj*8Ua#ZHBI0BhLwtUJp>P-
z&z|AWu*@{~DZTXBZ+T6~yCMgBaQDgNKQi)d2!m3L%>Fc!K0nK^{&}b^Pqa8x_lgd+
zkNJ)HJsXaJ!2pvk-2H+uT$(39=XVS2f1ihBe+i;^ARy5G&;Ai`G6I&gYYQauaP-&F
z3_tuEfmyXcX|<#-G2(1XCPOLTN&VQPZE#uxjtdq)51BUN97|_<rJPIp6B<JjM{M@X
zX>-0zDK*#97;M{@ECq$7Jh2RG)dH2=qGY3v_+ssv$c}}xl#(XWh;5dt>7|;;04(b7
zN%m<;_sVoPLs3R-wH7j#a<1+mYRTlJAbJJld|HHwfKvl^48B8Xo2mZq5a}pP^za?h
zQPNq`-{ghh`|bbiAA#}_kRD#%u<a=GeKZeFH*o3pt9?m?H*6+r6blYcG_w4{n%<J5
z^yp$l`l2pPsDQf>p5>&+&T80}cU0^us5WJYwM$<P+E3)FC9%@7ZW@#&hc!;|J$NC)
z7Ms2jo&_Q2CYtV*t($>-ap>_9dZqDFG(flZL`HIUy1fx!^J4T4x`WtC@bR-ai&$Hk
zO+^2T-O%zDl=GA&=aYJui9@Y9+1#pTiR=f=N9YUCaBa+JCyD}I=x^B8X*Cl4Id=>C
zj#!b&W{+nMI#u=rU221)6pRWP6pREySmgTpDcwivTCQm-Yz*88owK;Bs~-+VxRV!u
z|ERl1$)AJ%?|4DJTsTX5Ov*_Iz~grSu>i-n>j?C{OeCR~E%<pAxQ|@%OU(cIaYD@4
zI&NR1BkVGK!dus{ppPIz1euWs{}iWgyo;2*c=YJ|EIEg3bVLqUsfMU)oGAf2SRm%N
zgddjSivD-rAl00hz2Uqf;TNEPq;-T1Ka<jZwaYfaCwEmpb6@u&uj^uCU5Fj-v@R3u
z*aTw^um1(F>-NgJG##<TyQ#Hu?S54u&{Zh)%-qeqo|`M{S*tH6{EI0dXKU9}j&zq}
z;0vCnfmty-C6l(|>>y;g(-AWv8g^AbJ9@(Rc~7pY><Ny@)5?#@efPJfw>1hI?1DIP
z-a<7^RZV6I*L~|w(gE<PjJza*|1S}*5U}g_`}yB@)3?t`;(py}TsZh^r*Yu`X<Rr!
z8W#@m2A+<_hr@3g9}bYlhXbVX;Q(oTI6xX74v@x&1Elfc0BL+UKpGzo@OEDAFFDjX
zEO2-Shj(&#7l(IKxKp`@!(VZDFNgoj;e8z5&*1|cKFHxi9R8ZahdF$N!d=Rv96rY3
z;~YN0;gcLbMd5DcX%2tG;WHfmmc!ps_^k4K3I~)u96rb4^Blgw;foypfy0+Le3`>n
zIDD1E*EoEg!#{HP28VBQ_!ft6bNCL2f8y|64&USOeGWh1@Xs9X<?ure|H9#4IsAz1
z|6$T9L0Sc=|0D7tp#IO3@7ZU|cYi_uk|SVAKU1U^-dEFI%|L+R@~#IFg_x*l)Ea9+
zdU-Zt^)|^p58m~=0KxB~k$@)=a&}a|H8x*f1Yt<PK|hHg>`pUT8I=XnGETK5$t#QK
z%MkwBY2Y(3l6=$#OT+K-j7wBl0U{&3@T%E<X23TpV@W-fXI+{>JUxQZgMw!<zG;I~
zmR93sndcGXMM^6%3W3F27&Vv4|BsRoyLYJcV`-jvoA7VKYhs5$SOUdQw|+V?x3UR!
z-?DjgI@`Pg#K(qA&K)D3hL<1~C?jtM%%3M_{3k(5TEBaQUc{<kz}XMCiOcnMjlx24
z0uV$C(&I#UaLa7U${bGn?o?8gEwz!?*AuNy8znPdShF1u)sDeB?R?sbMLp*x4IP4c
zrrzEtw20%ZX&pL*GW~z_#N=espT(OmO;}PmP@DS#B=Do86RpKU6*O6M#V^o`mAq<u
zR`#*CoI^+Wb2sfU^sQZAOQc`~o44>8Tv2axId6M+*^kg3Dl<IkbH6Z-Ub}u;T{V<*
z)XUlHr#!P2V)q5)Yv@BpUqe(aZ9;uk_Q8ywZ^q<b`a2T9z^q2h-l_G?o<0A6x9#ip
z%YR|f4zmA;3jsmiA|HV`U5msQ#aY6)@WAG?T1ULzHFh)3j)TPs4QvwTTw<W?$8kS+
zF*bL{D)KeV!?yAI28_xCNwZ!}tZa{`T_tDEY-k#&$#hn0PxrK^h)?9~?5<pL4xDk!
z_IW%ZDwrOqC-u<XGssFm;fh~>&LAt@7SK~@T~OM(uUa=d1(sOOJ+;J>QXDt6D(leW
zXpA?LcB?wXya_umWNb{SaSfI>f#haU28>Tu9QH#pHnE|wTqg&0b2sG3^e;_EB;XCU
zvT%AuETExoh`}b<`n;CvXa08|r1cEh{hXnmw2t_{osx~(IqM6Jp#r8Cxa~OSc;JKq
zv!}<s{3h$uuv-mvt<~d=!a8YMt=XnmdTWM<O&O^8IdAK^tn|@F6)iZ*Q?Z(4skK)5
z#BQpSStYH=z%lXkd6^!FMj%Y>WM-oSwNlLecsy&xsGOmX1pgl+juR03@5_+*zlex_
z%b*2xoirei6vxRx<X{K*fX!j>|K}@99FVQ9qKi7<Vg#KkA&;(uys~D_#4T<yu&Rj}
z8v%5Wy>4k<#&ZDOrJ^$&pd^E9NR13I?aETNFVqof2GLqBMYkju&jIV9x=%EZRAT^m
zo)sDddnATeAFoV#$67eYDuejj-Lgrg_RucbGW-_nJXmo_vhe9h{mmzXA!g>ZlqFv5
zCbR^x6Lcq-y|ruD(efJGEM+&;D>LL%?9!gpkKjmja1O8*dD1?T)d3X(6+OiQS&<`t
zgvfFFR*kW#I5?E&=g94L?OBp06i~?t(q2oNi;d0_xVMAI0<+u#SL=|H&?bGv@P9>+
zFOl8SZPF_7HF2ZZAY39SWMiMHBN%s9I<D3UWw{&%tlliS_qEvEYxj_^;Y7;l2-bb3
zox5z-p#_jFqx;4Xa>{_kiv`&O*%>(I`&Bg}dbfibt>$&W;)UnK5v<0;w-{<XQ%5*&
z2jfZ(mlQbw;NcBQAM^VASSUJW!0L_q%8yx{?pF+TruA+|Hz!>jWZ|~viL{D2E*LO-
zy5LzFa6LA(=`llHs*Wh%4ls`S(;%us3?}!gG{*&uPo{l`-=A*dI!WjV@QuT^*4kue
zZTXQ4w8n4>XD+;njoK8WeN09_!_nG+z!M@p6XeF?#phcOV>M1RS^{<I2msz~=fah(
zf2gPtWvWby%KOqie4<PrPuxr?)7a1{+YB>B?thnXt$=@fguUVc;*sJp;wo_~BLChZ
zJ}$l~9U{$=PLSFW(f2axf20SYBm7r+j64a^KjPpSTqIvFKOz&~MW6jA&>(4&a|D@U
z{x35{wSkr%=7|ID&*-`L9#ga$XvyX>ef(H&<Y}SqOQf_|By3H7%#_*&s2~@yB=~9m
zXQnU)+zX=a9z+%zJXPPF-XOK2skP8D<vFH}Heg)!${(2mq19QYyv-|L0Mq5Jbhd-a
zNEv=GrueFQF}`?YgR~Isg6<r3aZLopSUB$KEq!V{tukctFT71g++X<v)8eb%J<99F
zELFG)e^HH-FvYmy^-zg>xErM7&`PVTLwSdJ_!wAJiAylO&w)yufe(fmZorp78DXlt
z!ZalZ%I<pJ7;B7=&y>X-puEK!Yq;F`nlfJE%-PC-#bwQOLkEb`BF-8uOX7eM$u;mp
zwygikD{BK+H1BTXUROTkgV5Fkoj^<l%|lspt`Y41pC!QK-(=}dX{mUxm=cEyR|~VM
zH*{X#LW~m@);e)*mzVA0>wT+}or)uj2GVQwydzqyvgZR8KU?;0Wu+f>gW(ihr*Cc)
z+HI{HC}wAvF3eLo4mNkQi<Lj!Xl1cZ-{h!#!x3XRa<<&Kk(DnR&55=R)i;8c940NR
zH8)IY2Dkf(T^acPT%3i99u#JlkWhWA_#Iq3&GO!Fu$D~t#4wWGdcPx9@k*fTluRLr
z%t~mdaaOVU^OnA!(E5hFd9b0rc0EV*JZwC;vD?yk0T^!t&krtUJyOmv)S&5EN1P3l
zd%)yw@VXPMo&y=*WRQcB)%%E*(dYlKW{_TL1Ev#4UM+m=%2@ER)#PjF9i{(;mj!XG
zxBy!JI}q<{g0x85D!h!_{ta2dE&m@f!h`&ie`?TD6iI`A6yr#_4yi$?Rh%lyhc)O@
zvt!rN)RnE)rJSir$Tb?#4UrqDu@k+bU861SREyaW7dc~Ke!XDn8ir+p7nBUt%8JH9
zuHiLk^A%|08OTG{musk{4^39MxdcerQ-f$-(UFEKeGAe4Re|U5m}j5Vpua6pZsoNa
zoRgJA*$nq4@d`nEHPTv~$hu{^;VMtl53Kc^>6Kzy1l`Vmsxbk`na;wSDsAeh8WUiC
zt}5@d`@e_W|3~2dUnjmL{<|0w9uj&!iygnVAUnFnD=<4?g5`+bu|FKcPSD1ZsvPG*
zZzxDaPGlp+VY9{&%W|Z%gl(2T44#~0x6bpA8ct2MfDqyi=vyP+s|*;Q1fP6{_2!`Y
zhB}rPV4Sg9ngkQPNr&37y#}p0lrqbX3@LTdOUb8lFqUcVCAP`ruTCAI!5t8n<{J-!
zT$BAc@5leehUqUxIqvB?f`a36wl=M16Jn&e1`H2`Z~SE?8>K^xUQ5>K2nN2^&L<I{
z^KwpN1&y%aW~$s58>(asGtjA@<!G?Xv2}AK-v97eHduR0N~L`DW_85+c5we&WB=BK
z!6NU4tk!#9HT03(|D(kt1<?JciQB~j?EPjz7w8iB0(e6nCohLzVB$^rU;0zyl3JPR
zPk;puJeEYHj1vPf+=vY|a+&gJlvitD9@NAz33D@A$H6tY^s5QekPv*Z=hM35U}|s#
z=fD~Wgc-L_dBc)HPLxaXQ2&QkPCTt;$M;xjq!>~*!yPsB+UILsSwylReHx#cDz}-l
zz2`w;CI@GL^D_DDu=SQgjq+s8E7UkFZ<&G4uy*SXP~YD0;Fm;XVKv*Z)KZm)nTMBB
z5|w@u*c28uNh%y@SY~+<S7imJ(cj%myWOzDa=93@Ekz#qN+*NWu-rPfnK2tP27>Vd
zS*YX;p#`iY_kW`>hw%UBK>t524HJJLE&wm^0z9nxtSO9gblR4qCg4?<Au7jTv5=kQ
zZeyUz6@>#Dg;Q)D08oUf#G6qD*)+}f+{Q|Ec@5{AT0ksC2RF45_am*Y#0F3L)vK}4
zt~KOqsN>WEVxB`EqSiH6#%xr|Igi3O*F;$J$1XDztrZaE+<{oVn#NGT`!KS5B40g(
z)iWe(sHeSv*yaw%XakX;3>Y4$7d*;p82+Dz8d8N}v?sL&shU%#3{*c8&Y!i2Ry1Vy
zNJB+y3W#Cu03#@;UzCCJU-Q-#SSLnaX((GQ3~{uYh>l{p&=#5$h9{x!8(AF(eA!S(
zXQ9Cn)?s?>VA-18MzKTAX0;vsRYPs${vR*E-1k=DDd9~~7AK3xQ~Uqz@C5p-_$T=P
z_DM^n9_g#nRqzb_t~?w%0desCZ<OIQ;2-#52KlBM9m)%wlW$m@uHl?TTt3;Zq0C>i
zg_5GOhqGi&QD5Z~&c`(}5I9rVk`m>7apM`|8acB8`WN)bglxx_P4@xk2HOyjyu0P+
zuWJ<Vt`$MZ`Q7A}FqJ&M$;ZQVow*wLTMO)lv!@MM46o7}Tj6tUj+J;Cq;-<3$>WJc
zLcT~i6ih`@9#6^}3HVZe)f4q3!kU&sKxgj^A`)^bbW~hT-cUFY2#2C`dV4mw+%&8?
z9!653csw5QC8Meq5Bt2ycsQI$ra}R~mej%#TEY=Lu`e9=g|w*O=TqZ>R3PYy1T=3_
zO?bjuDCkWFXyWlau|KLtQa}<s318Ts@+Tq@%@_3qJib6Q?AHPsO&p?g>S_wK!_`S=
zdpzGhzfawQ(D5*=^wJbFd5T~t6b(c|UY|b@-UMaXUKPHzXji<v!caJgT0BWD<q7zG
zULWe#yz#KA212QnCzzte9X1MaOoj{d1latKlYS&Mi;s$D;^$?~cXnF=F%gduNjSPH
zW!<IeL=HO6S+VrTt>^wU_U-pBj9s?keQV9u5rso3H+!`iFSJ-xa|=XY`JSHkCH*}>
zFyKOgj90c(LmVZo54wM0+QTMC$;5HT@n*eeQ2N6_EOkB@wNtJuAgrSUQA6d4f(wcW
zm`g0mxxfE9JJ64K+i;+-Eg;mo1EsZ!J*W&+{9N|f`q<pF_mZ!n^fL<wIZ|A(5|=4d
zSAs;?#o0#An3C$$2_I3l%h-?)jV_$dEF9>lPOI|+owJ~W7GBp%M{&seyAAzJ6%aKY
zcvmfKrCR<9>1vfsR`~WD7VCTHWTSq;*#!hm-zqIOTj{O+*>s|r@h|K-!V2y|rUq-y
zF+O;0m@St>CmK3R?th4l1l&58!0YEwxdjye{@7o&_woJ|<|9yxB5j4xAe+lKw?Jiq
z>RG^pjT=hG+)2Omu_aG~QM9G}C5;Xy<(6KrL9-V#a;Le=HC!4wDmIsgIL+FnX|S~4
zFsSMw%hu7(D%%Tp_F0mZx<_CdyhLr1tME#DEiHfy#lXu^daw<Yc_6)NDPyS2Oppq#
z2TTrFesmN1Uv41u|1e>pAfJV}KI?(;FBf*<XMLY-!wMv_>JaG^vtz7uVLL*u9HC&1
zGrBCU>#c<e<UDOdL#k}cOASeC+LrcSP3zr4P==m#8df&h*-5|FvBj67NK{kJBts_8
zs%!$#NQydOFh~IOT7%&Td2Di$O1?>{Y)Q$v+m{N56O$)X1@qEiP)u`PKiP|^t~?o#
z95^3+{q0$ZmI%V!R4c`hb-OJZfU!8t!B{v#RhyiolIIrDOCuh)ZA^j0Mjs`uvt6TM
zPdt?fdo)iVl1QaOS~B7fMg!i6H{sKKabK!LMl?B1Ir6-fR-+>n#ugWAmFZMzeiHC6
zlx*+q?^em&Kr{)jN_}LpW}*>B6ExLKB0l;6Z^Qcr^p@@a^98wIdS2?1n#5bh_3-`q
z_y25LR+w^tu&qtn=Ca+p-5Jg84M+T8uN$tHa@qcFtsT*9`&4&#x-;X>!Vw#IFC~%)
z>fqV_4QhK&rag=BSnhm({|2px?eTq9)U*wsubkrIS#WA$GT~_+B{eimGkPH@O>h#Y
zat{ejm)(fXR{pDVY-O=XaP;QxE;@y$77*lowYhOhspthH;Eorx5Z}n<KZm^Qt1P{A
zY@AYX(^lKgLk0O<K}-)j?fS}si=&Y(AaHq>T3}kA%|s^={%Ocs2i6|fHmPY6AC1kJ
z&C8K351QACjjuS^_>TDpjyVlOcEu`NR2pC$ixV9ji;<K!8Hsp35iQ~Khy324S0$W{
zkQRvglA%z7O{$Yr@;66WG==H^WCS52{I~GF7=RAYZQ|dg;}Hww8tDajnyks&_o4oe
znTdC4wTAr(%}1FckyJ1q2zxwQB#}`4(Nr{;NJSYxC2C(pFcAP_B@~bPLy@Q!P5J#8
zD}UG*N+i4i4=dtG6YZN)BO;+h6kHmASd9kbev}bRCIiV(R1GK9C>`->wk?RnJ;{VO
z8qsixBvYPvC>~CL{S@*geZdr7&?1hqFCvNF#sdK@oQ(UtDPI63_(GuoxJ&^xiMY|^
zR-R#Bgp;K+(YA=F8jVIHfp|O^k0(M&PdI?J7>IkL2{jb<gB3>jW?}mxv?K;CnF@G4
z(NH+*3kM@$rp47@B#?-PgKRc@CV_fOv(d8TgcjP}hzW{2m@3`wi+I95kJm%*$RrSZ
zH5_IPpgCqrJcC&sF_8{6iKkF1q857OI@}~g*<kMSGubuCg!(B<YJD`iOvH|*j4D1=
zd_X#^v&jBGNL(q1E5)yg|1AzkBcza&khV*@^cpn%-EvIcB!BZC&h7vE<0GG<M$VCT
ziXghiagMFC^RJlL(Md-GLAsh89BRB+XUA7Dv7>{knAp*g#1lI^e2R%39W&Gew5w_G
zM4`qIcwl>Y%x;k2l-?N=*>xzj`>0JYxelj-5G1VJ{M3gpd1|xIIse~gOY>1twP-k?
z27C!E8jr-G2cf0BxI%nMuQ#0V`<cKYC}EwC5nqtu1>ilYN%F$acN&&Hx5CHwNAd(Y
zfH<HT`AH-oF~;|Q{y9fr_{)4vgi_I{23ZzFM^V3~sv(a*9*(Dy$wV*^Nd`moPM?ak
z@D(bcoH!HekTe=5*vr(1^u(Xw<rUNrXyQy54QNm?pe%gKh?<zh+Y9O1o;Y)9A7Wnv
zg{NvU6OYB4?Nb}1#nQx?5IvHRnc6Jo1c&?yo!Rt8jcPYf{3DWnm&ybu&V<%V57kzo
zUazwy#g&PDNc3YSIFwtpzHT+0L<m#(QwJL(2gjg<yQK_4qMtLXrK6d*pVmwdF>0i5
zy?A>wGmV)?f*_qhe00JXk$bFIi`NAvLG5pYm+(&Xh34Cc7x(e#yhS+&tnlC=gbsr8
zZM@&b<idF{Hgk}2EaYWgf>*m+8em}W+>Wiv(S!05U4_HnpmXGEQu`7e2(i#H8?r=t
zsl$24@aO1Q*OCjkMl<?<1)=|6lTH_ZCoU826;^zzW!_tuNlZXY4H-%(iM52&TKGBh
zC+}KNF(9aBI3cK<+*eHz2dP&7*~6P+WT>Di(;YM=nT&=LK*|D9O^tgr%^!?Mlfk5x
zNO*jnMASzovdKxRgICS8YKl;pR-3<68#kzpK1ip&XEifJ3sXzOVNLZrI+&WAq#AW@
zN9Ax7xeu6_qe?BYX16&)fSR17I^fugDqB)c{~zg~DPbolUXznllM8Dt=7;V7iv>{m
z6CnXST>O?O3m1Q?{r~AQXA0ip>0!NGthFDSEME;f<gCguC|ejF2eXk-z1~F18`ct(
z6XOX5gULWB>QNK%0Msh{Y{xoDC8{@8wxoPvG&^VtDC$5w8jQxhk$5WZPb9#YPN*ru
z9*W>VVX7TXPEw6n=(T9d#=;z;j&5q~SvtjSac5i1TDn%?6`LHOvz?5ACkXb07WMd}
zp^(p?3i!iX5I9VdoS~^WLvNds4pK=UoM15qy#>(6wQe$NOuWhRm9?0nyKpqo{v#eY
zte1ZrejvaTZC5v{Ikm4H@&IT!6Lw6K)f=g^v$BuH#ZTz}(Zc<LI7M70o+my4`hSUZ
z5%B+y<YVM7$uEf`@$#SHV-^ZAmB}=#o_G>kVZIR5tkg&->i6S!&<l2;HyMq1B2=J5
z#_pJLve&41jsjeBO;qwr8=xBZGSTBMrM8+K*U`3YG$&_@%VWpXtSKOJjkRw<+#5`J
zQff-`rxHn@ClCmDQi-4%^m>wDm9hiJZ(D?uo#>ivqM=_Jy>iKjYqEW1POz)#b|Y3(
z{_C1x-vTE`bn}J=2)qooU8Vl+Gx3yb%HeWYG*m;v0%=JY%n8D=l3S2^;o;*P>FeP9
zT`paLC|@^7x4<6oK53WqG<<%%BE2o`l?7=39w;9MuHbapBS+-p<wf#R`BeFIxkK)S
zH;{7>MSQz_xqO9uwS0qoi+rbipS(+cTHYhSBEK!~l{%!;rBk6zya@7zh~$x`qvHLa
z|EEWQ_=$GSbsa-tlPk($gu^h0Ar6Ba1~~L{=;P2!pfaF*%;6^tx&#hI4kZp{4jVWe
z!r@R3hjBQZ!x0=dayXL112`PT;b;!WaCjhx2XS~Xhldd8YH}UQ;aCpGad;SqhjTcd
z!wDQ7!Qn&>6%Jh-x;dQ0;bab{aCjt#M{zin!)Y8&=WqsxGdVn(!&w~8=5P*&%^Z3d
z{(m{6|IZgc7PG>u!sY+?B^fJ38iiK#0J)_Tvc$_RadpLCZmz_022tyw1rpz$spVLs
zR*o3YO-@oxy(?YWlp@LnLX^b2ucaX5NMXFmNvg)yk1Ja;I4HvkB<6jsrZ{3HH#tdl
zK;apSrmQanh~DySTkV`GbgPQ_CEaUK11RsS-$7p!PEegDC#l4_O%{E{3h+5-O4Ny5
zqsd9CF=x%OXbQRiM@k0?i2p~Vez!?4%T4kOc@^&R>+yL1=U;6EnDBD0bFzst;jJl8
z*U?<|;Eaml0!s%3OR-od`_<1AJ0n84flwvAQ7pj`Wx;#lfQTp->xf)fJ_OovKu7i=
zWiU!^7G!BHx&PNnSN^Ll_Wk|+3`bx=VQ!<~6%WCUUS${t#)^pVh=EUHw|&2peC@2k
zj=^OqQ^nmX#H}tCkK<Eq#3Q6#N%Cd-vPIkt!*#-^A2QtkQ3v<GBYlu2C#l3Iud}%S
F{}1O3LE``b

literal 0
HcmV?d00001

-- 
GitLab


From 7543ffa3b19afc2786e87bc176096172fe5825d9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Thu, 10 Nov 2011 16:53:08 +0100
Subject: [PATCH 019/546] always load the filecache

---
 lib/filesystem.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index bd68831a711..93f52423332 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -443,3 +443,5 @@ class OC_Filesystem{
 		return null;
 	}
 }
+
+require_once('filecache.php');
-- 
GitLab


From 5a8235eca0c282d79d48f65a5419c6c855ecdc36 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Thu, 10 Nov 2011 16:54:45 +0100
Subject: [PATCH 020/546] use force parameter

---
 files/js/files.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/js/files.js b/files/js/files.js
index 4dca1a110ec..3e1bffccca5 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -346,7 +346,7 @@ $(document).ready(function() {
 function scanFiles(force){
 	force=!!force; //cast to bool
 	$('#scanning-message').show();
-	$.get(OC.filePath('files','ajax','scan.php'), function(response) {
+	$.get(OC.filePath('files','ajax','scan.php'),{force:force}, function(response) {
 		if(response && response.data && response.data.done){
 			window.location.reload();
 		}else{
-- 
GitLab


From b2f2a8774586a49dee066a1fef674b26c04c5755 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Thu, 10 Nov 2011 23:50:43 +0100
Subject: [PATCH 021/546] use cache for searching files

---
 lib/filecache.php  |  6 +++---
 lib/filesystem.php | 16 +++++++---------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index 902a8052afc..db3d6ca1d5b 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -62,6 +62,7 @@ class OC_FileCache{
 		$path=OC_Filesystem::getRoot().$path;
 		if($id=self::getFileId($path)!=-1){
 			self::update($id,$data);
+			return;
 		}
 		if($path=='/'){
 			$parent=-1;
@@ -115,9 +116,9 @@ class OC_FileCache{
 	 * @param string $query
 	 * @return array of filepaths
 	 */
-	public static function search($query){
+	public static function search($search){
 		$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE name LIKE ?');
-		$result=$query->execute(array("%$query%"));
+		$result=$query->execute(array("%$search%"));
 		$names=array();
 		while($row=$result->fetchRow()){
 			$names[]=$row['path'];
@@ -330,4 +331,3 @@ class OC_FileCache{
 OC_Hook::connect('OC_Filesystem','post_write','OC_FileCache','fileSystemWatcherWrite');
 OC_Hook::connect('OC_Filesystem','delete','OC_FileCache','fileSystemWatcherDelete');
 OC_Hook::connect('OC_Filesystem','rename','OC_FileCache','fileSystemWatcherRename');
-
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 93f52423332..c3830b34168 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -390,15 +390,13 @@ class OC_Filesystem{
 		$files=array();
 		$fakeRoot=self::$fakeRoot;
 		$fakeRootLength=strlen($fakeRoot);
-		foreach(self::$storages as $mountpoint=>$storage){
-			$results=$storage->search($query);
-			if(is_array($results)){
-				foreach($results as $result){
-					$file=str_replace('//','/',$mountpoint.$result);
-					if(substr($file,0,$fakeRootLength)==$fakeRoot){
-						$file=substr($file,$fakeRootLength);
-						$files[]=$file;
-					}
+		$results=OC_FileCache::search($query);
+		if(is_array($results)){
+			foreach($results as $result){
+				$file=str_replace('//','/',$mountpoint.$result);
+				if(substr($file,0,$fakeRootLength)==$fakeRoot){
+					$file=substr($file,$fakeRootLength);
+					$files[]=$file;
 				}
 			}
 		}
-- 
GitLab


From 88de9e40503833f76e79e8ac722025ceafd15c4b Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Fri, 11 Nov 2011 20:46:06 +0000
Subject: [PATCH 022/546] Keyboard shortcuts for saving. Refined code.

---
 apps/files_texteditor/js/editor.js | 59 +++++++++++++++++++++++-------
 1 file changed, 46 insertions(+), 13 deletions(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index fd93ac5a7a8..828839cbc92 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -77,8 +77,10 @@ function updateSessionFileHash(path){
    		"json");
 }
 
+var editor_is_saving = false;
 function doFileSave(){
 	if(is_editor_shown){
+		editor_is_saving = true;
 		$('#editor_save').after('<img id="saving_icon" src="'+OC.filePath('core','img','loading.gif')+'"></img>');
 			var filecontents = window.aceEditor.getSession().getValue();
 			var dir =  $('#editor').attr('data-dir');
@@ -93,7 +95,10 @@ function doFileSave(){
 								$('#saving_icon').remove();
 								$('#editor_save').after('<p id="save_result" style="float: left">Saved!</p>')
 								setTimeout(function() {
-	  								$('#save_result').remove();
+	  								$('#save_result').fadeOut('slow',function(){
+	  									$(this).remove();
+	  									editor_is_saving = false;	
+	  								});
 								}, 2000);
 							} 
 							else {
@@ -101,7 +106,10 @@ function doFileSave(){
 								$('#saving_icon').remove();
 								$('#editor_save').after('<p id="save_result" style="float: left">Failed!</p>');
 								setTimeout(function() {
-									$('#save_result').fadeOut('slow',function(){ $(this).remove(); });
+									$('#save_result').fadeOut('slow',function(){ 
+										$(this).remove(); 
+										editor_is_saving = false;
+									});
 								}, 2000);	
 							}
 						}, 'json');
@@ -112,7 +120,10 @@ function doFileSave(){
 						// Temporary measure until we get a tick icon
 						$('#editor_save').after('<p id="save_result" style="float: left">Saved!</p>');
 						setTimeout(function() {
-									$('#save_result').fadeOut('slow',function(){ $(this).remove(); });
+									$('#save_result').fadeOut('slow',function(){ 
+										$(this).remove();
+										editor_is_saving = false;
+									});
 						}, 2000);
 				   	}
 				} 
@@ -122,21 +133,17 @@ function doFileSave(){
 					// Temporary measure until we get a tick icon
 					$('#editor_save').after('<p id="save_result" style="float: left">Saved!</p>');
 					setTimeout(function() {
-								$('#save_result').fadeOut('slow',function(){ $(this).remove(); });
+								$('#save_result').fadeOut('slow',function(){ 
+									$(this).remove(); 
+									editor_is_saving = false;
+								});
 					}, 2000);
 				}
 			}, 'json');
-		giveEditorFocus();
-	} else {
-		$('#editor').data('editor','false');
-		return;	
+		window.aceEditor.focus();
 	}	
 };
 
-function giveEditorFocus(){
-	window.aceEditor.focus();
-};
-
 function showFileEditor(dir,filename){
 	if(!is_editor_shown){
 		// Loads the file editor and display it.
@@ -190,9 +197,31 @@ function hideFileEditor(){
 	}
 }
 
+// Keyboard Shortcuts
+var ctrlBtn = false;
+
+function checkForCtrlKey(e){
+		if(e.which == 17 || e.which == 91) ctrlBtn=false;
+	}
+	
+function checkForSaveKeyPress(e){
+	if(!editor_is_saving){
+		if(e.which == 17 || e.which == 91) ctrlBtn=true;
+   		if(e.which == 83 && ctrlBtn == true) {
+   			e.preventDefault();
+        	doFileSave();
+			return false;
+   		}
+   	} else {
+   		e.preventDefault();	
+   	}
+}
+
+// Sets the correct size of the editor window
 $(window).resize(function() {
 	setEditorSize();
 });
+
 var is_editor_shown = false;
 
 $(document).ready(function(){
@@ -220,4 +249,8 @@ $(document).ready(function(){
 	}
 	// Binds the file save and close editor events to the buttons
 	bindControlEvents();
-});
+	
+	// Binds the save keyboard shortcut events
+	$(document).unbind('keyup').bind('keyup',checkForCtrlKey).unbind('keydown').bind('keydown',checkForSaveKeyPress);
+	
+	});
-- 
GitLab


From 024f4375b6fc476033dbd13f03e663076d44398b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sat, 12 Nov 2011 01:00:04 +0100
Subject: [PATCH 023/546] keep encrypted and versioned flag in fscache

---
 db_structure.xml  | 16 +++++++++++++++
 lib/filecache.php | 50 +++++++++++++++++++++++++++++++++--------------
 2 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/db_structure.xml b/db_structure.xml
index c7fa423e14e..39dea564b0f 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -126,6 +126,22 @@
 	   <length>32</length>
    </field>
 
+   <field>
+	   <name>encrypted</name>
+	   <type>integer</type>
+	   <default>0</default>
+	   <notnull>true</notnull>
+	   <length>1</length>
+   </field>
+
+   <field>
+	   <name>versioned</name>
+	   <type>integer</type>
+	   <default>0</default>
+	   <notnull>true</notnull>
+	   <length>1</length>
+   </field>
+
    <index>
     <name>path_index</name>
 	<unique>true</unique>
diff --git a/lib/filecache.php b/lib/filecache.php
index db3d6ca1d5b..928fc02e669 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -38,10 +38,12 @@ class OC_FileCache{
 	 * - mtime
 	 * - ctime
 	 * - mimetype
+	 * - encrypted
+	 * - versioned
 	 */
 	public static function get($path){
 		$path=OC_Filesystem::getRoot().$path;
-		$query=OC_DB::prepare('SELECT ctime,mtime,mimetype,size FROM *PREFIX*fscache WHERE path=?');
+		$query=OC_DB::prepare('SELECT ctime,mtime,mimetype,size,encrypted,versioned FROM *PREFIX*fscache WHERE path=?');
 		$result=$query->execute(array($path))->fetchRow();
 		if(is_array($result)){
 			return $result;
@@ -60,19 +62,24 @@ class OC_FileCache{
 	 */
 	public static function put($path,$data){
 		$path=OC_Filesystem::getRoot().$path;
-		if($id=self::getFileId($path)!=-1){
-			self::update($id,$data);
-			return;
-		}
 		if($path=='/'){
 			$parent=-1;
 		}else{
 			$parent=self::getFileId(dirname($path));
 		}
+		$id=self::getFileId($path);
+		if($id!=-1){
+			self::update($id,$data);
+			return;
+		}
+		if(!isset($data['encrypted'])){
+			$data['encrypted']=false;
+		}
+		if(!isset($data['versioned'])){
+			$data['versioned']=false;
+		}
 		$mimePart=dirname($data['mimetype']);
 		$query=OC_DB::prepare('INSERT INTO *PREFIX*fscache(parent, name, path, size, mtime, ctime, mimetype, mimepart) VALUES(?,?,?,?,?,?,?,?)');
-// 		echo $path;
-// 		print_r($data);
 		$query->execute(array($parent,basename($path),$path,$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart));
 		
 	}
@@ -83,9 +90,21 @@ class OC_FileCache{
 	 * @param array $data
 	 */
 	private static function update($id,$data){
-		$mimePart=dirname($data['mimetype']);
-		$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET size=? ,mtime=? ,ctime=? ,mimetype=? , mimepart=? WHERE id=?');
-		$query->execute(array($data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart,$id));
+		$arguments=array();
+		$queryParts=array();
+		foreach(array('size','mtime','ctime','mimetype','encrypted','versioned') as $attribute){
+			if(isset($data[$attribute])){
+				$arguments[]=$data[$attribute];
+				$queryParts[]=$attribute.'=?';
+			}
+		}
+		if(isset($data['mimetype'])){
+			$arguments[]=dirname($data['mimetype']);
+			$queryParts[]='mimepart=?';
+		}
+		$arguments[]=$id;
+		$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET '.implode(' , ',$queryParts).' WHERE id=?');
+		$query->execute($arguments);
 	}
 
 	/**
@@ -137,11 +156,13 @@ class OC_FileCache{
 	 * - mtime
 	 * - ctime
 	 * - mimetype
+	 * - encrypted
+	 * - versioned
 	 */
 	public static function getFolderContent($path){
 		$path=OC_Filesystem::getRoot().$path;
 		$parent=self::getFileId($path);
-		$query=OC_DB::prepare('SELECT name,ctime,mtime,mimetype,size FROM *PREFIX*fscache WHERE parent=?');
+		$query=OC_DB::prepare('SELECT name,ctime,mtime,mimetype,size,encrypted,versioned FROM *PREFIX*fscache WHERE parent=?');
 		$result=$query->execute(array($parent))->fetchAll();
 		if(is_array($result)){
 			return $result;
@@ -201,8 +222,9 @@ class OC_FileCache{
 		if($mimetype=='httpd/unix-directory'){
 			$size=0;
 		}else{
-			if(($id=self::getFileId($fullPath))!=-1){
-				$oldInfo=self::get($fullPath);
+			$id=self::getFileId($fullPath);
+			if($id!=-1){
+				$oldInfo=self::get($path);
 				$oldSize=$oldInfo['size'];
 			}else{
 				$oldSize=0;
@@ -221,7 +243,6 @@ class OC_FileCache{
 	public static function fileSystemWatcherDelete($params){
 		$path=$params['path'];
 		$fullPath=OC_Filesystem::getRoot().$path;
-		error_log("delete $path");
 		if(self::getFileId($fullPath)==-1){
 			return;
 		}
@@ -258,7 +279,6 @@ class OC_FileCache{
 	private static function increaseSize($path,$sizeDiff){
 		while(($id=self::getFileId($path))!=-1){
 			$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET size=size+? WHERE id=?');
-			error_log('diff '.$path.' '.$sizeDiff);
 			$query->execute(array($sizeDiff,$id));
 			$path=dirname($path);
 		}
-- 
GitLab


From bf40691acef66d8ef14b0917d12c32633804d3c7 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sat, 12 Nov 2011 18:06:07 +0100
Subject: [PATCH 024/546] some fixes in the sqlite3 driver

---
 lib/MDB2/Driver/Manager/sqlite3.php |  2 +-
 lib/MDB2/Driver/Reverse/sqlite3.php | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/MDB2/Driver/Manager/sqlite3.php b/lib/MDB2/Driver/Manager/sqlite3.php
index c5c19a90fb5..7e30755fc3a 100644
--- a/lib/MDB2/Driver/Manager/sqlite3.php
+++ b/lib/MDB2/Driver/Manager/sqlite3.php
@@ -798,7 +798,7 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
             return $db;
         }
 
-        $query = "SELECT name FROM sqlite_master WHERE type='table' AND sql NOT NULL ORDER BY name";
+        $query = "SELECT name FROM sqlite_master WHERE type='table' AND sql NOT NULL AND name!='sqlite_sequence' ORDER BY name";
         $table_names = $db->queryCol($query);
         if (PEAR::isError($table_names)) {
             return $table_names;
diff --git a/lib/MDB2/Driver/Reverse/sqlite3.php b/lib/MDB2/Driver/Reverse/sqlite3.php
index d5595da84c5..33e5b590268 100644
--- a/lib/MDB2/Driver/Reverse/sqlite3.php
+++ b/lib/MDB2/Driver/Reverse/sqlite3.php
@@ -69,7 +69,7 @@ class MDB2_Driver_Reverse_sqlite3 extends MDB2_Driver_Reverse_Common
             return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
                 'unexpected empty table column definition list', __FUNCTION__);
         }
-        $regexp = '/^\s*([^\s]+) +(CHAR|VARCHAR|VARCHAR2|TEXT|BOOLEAN|SMALLINT|INT|INTEGER|DECIMAL|BIGINT|DOUBLE|FLOAT|DATETIME|DATE|TIME|LONGTEXT|LONGBLOB)( ?\(([1-9][0-9]*)(:([1-9][0-9]*))?\))?( NULL| NOT NULL)?( UNSIGNED)?( NULL| NOT NULL)?( PRIMARY KEY)?( DEFAULT (\'[^\']*\'|[^ ]+))?( NULL| NOT NULL)?( PRIMARY KEY)?(\s*\-\-.*)?$/i';
+        $regexp = '/^\s*([^\s]+) +(CHAR|VARCHAR|VARCHAR2|TEXT|BOOLEAN|SMALLINT|INT|INTEGER|DECIMAL|BIGINT|DOUBLE|FLOAT|DATETIME|DATE|TIME|LONGTEXT|LONGBLOB)( ?\(([1-9][0-9]*)(:([1-9][0-9]*))?\))?( NULL| NOT NULL)?( UNSIGNED)?( NULL| NOT NULL)?( PRIMARY KEY)?( AUTOINCREMENT)?( DEFAULT (\'[^\']*\'|[^ ]+))?( NULL| NOT NULL)?( PRIMARY KEY)?(\s*\-\-.*)?$/i';
         $regexp2 = '/^\s*([^ ]+) +(PRIMARY|UNIQUE|CHECK)$/i';
         for ($i=0, $j=0; $i<$count; ++$i) {
             if (!preg_match($regexp, trim($column_sql[$i]), $matches)) {
@@ -90,11 +90,16 @@ class MDB2_Driver_Reverse_sqlite3 extends MDB2_Driver_Reverse_Common
             if (isset($matches[8]) && strlen($matches[8])) {
                 $columns[$j]['unsigned'] = true;
             }
-            if (isset($matches[9]) && strlen($matches[9])) {
+            if (isset($matches[10]) && strlen($matches[10])) {
                 $columns[$j]['autoincrement'] = true;
+                $columns[$j]['notnull']=true;
             }
-            if (isset($matches[12]) && strlen($matches[12])) {
-                $default = $matches[12];
+            if (isset($matches[10]) && strlen($matches[10])) {
+                $columns[$j]['autoincrement'] = true;
+                $columns[$j]['notnull']=true;
+            }
+            if (isset($matches[13]) && strlen($matches[13])) {
+                $default = $matches[13];
                 if (strlen($default) && $default[0]=="'") {
                     $default = str_replace("''", "'", substr($default, 1, strlen($default)-2));
                 }
@@ -107,8 +112,8 @@ class MDB2_Driver_Reverse_sqlite3 extends MDB2_Driver_Reverse_Common
                 $columns[$j]['notnull'] = ($matches[7] === ' NOT NULL');
             } else if (isset($matches[9]) && strlen($matches[9])) {
                 $columns[$j]['notnull'] = ($matches[9] === ' NOT NULL');
-            } else if (isset($matches[13]) && strlen($matches[13])) {
-                $columns[$j]['notnull'] = ($matches[13] === ' NOT NULL');
+            } else if (isset($matches[14]) && strlen($matches[14])) {
+                $columns[$j]['notnull'] = ($matches[14] === ' NOT NULL');
             }
             ++$j;
         }
-- 
GitLab


From 486a31bfa38c0cd0dc02f46d65d3a443359441a9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 13 Nov 2011 16:06:29 +0100
Subject: [PATCH 025/546] minor changes to mysql setup

---
 lib/setup.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/setup.php b/lib/setup.php
index e2d56ddaf4a..1beb9e4936f 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -158,8 +158,8 @@ class OC_Setup {
 
 						//add prefix to the postgresql user name to prevent collissions
 						$dbusername='oc_'.$username;
-						//hash the password so we don't need to store the admin config in the config file
-						$dbpassword=md5(time().$password);
+						//create a new password so we don't need to store the admin config in the config file
+						$dbpassword=md5(time());
 						
 						self::pg_createDBUser($dbusername, $dbpassword, $connection);
 						
@@ -219,7 +219,7 @@ class OC_Setup {
 	}
 
 	public static function createDatabase($name,$user,$connection) {
-		//we cant user OC_BD functions here because we need to connect as the administrative user.
+		//we cant use OC_BD functions here because we need to connect as the administrative user.
 		$query = "CREATE DATABASE IF NOT EXISTS  `$name`";
 		$result = mysql_query($query, $connection);
 		if(!$result) {
@@ -241,7 +241,7 @@ class OC_Setup {
 	}
 
 	public static function pg_createDatabase($name,$user,$connection) {
-		//we cant user OC_BD functions here because we need to connect as the administrative user.
+		//we cant use OC_BD functions here because we need to connect as the administrative user.
 		$query = "CREATE DATABASE $name OWNER $user";
 		$result = pg_query($connection, $query);
 		if(!$result) {
-- 
GitLab


From aa7c5a971ce9431c0a51e1110046f211fa446c11 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 13 Nov 2011 16:08:47 +0100
Subject: [PATCH 026/546] small fix in sqlite3 driver

---
 lib/MDB2/Driver/Manager/sqlite3.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/MDB2/Driver/Manager/sqlite3.php b/lib/MDB2/Driver/Manager/sqlite3.php
index 7e30755fc3a..71b9597d202 100644
--- a/lib/MDB2/Driver/Manager/sqlite3.php
+++ b/lib/MDB2/Driver/Manager/sqlite3.php
@@ -168,9 +168,6 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
         if (PEAR::isError($query_fields)) {
             return $query_fields;
         }
-        if (!empty($options['primary'])) {
-            $query_fields.= ', PRIMARY KEY ('.implode(', ', array_keys($options['primary'])).')';
-        }
         if (!empty($options['foreign_keys'])) {
             foreach ($options['foreign_keys'] as $fkname => $fkdef) {
                 if (empty($fkdef)) {
-- 
GitLab


From b2f1429b75085eaa3dc2be37df43283b47cd1e39 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 13 Nov 2011 16:16:21 +0100
Subject: [PATCH 027/546] automatically upgrade the main database on version
 number increase (doesnt work with sqlite for now)

---
 lib/base.php | 10 ++++++++--
 lib/db.php   |  9 ++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index c52b4493e01..554036164e6 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -119,6 +119,12 @@ class OC{
 			}
 		}
 
+		$installedVersion=OC_Config::getValue('version','0.0.0');
+		$currentVersion=implode('.',OC_Util::getVersion());
+		if (version_compare($currentVersion, $installedVersion, '>')) {
+			OC_DB::updateDbFromStructure('../db_structure.xml');
+		}
+
 		ini_set('session.cookie_httponly','1;');
 		session_start();
 
@@ -187,8 +193,6 @@ if( !isset( $RUNTIME_NOAPPS )){
 	$RUNTIME_NOAPPS = false;
 }
 
-OC::init();
-
 if(!function_exists('get_temp_dir')) {
 	function get_temp_dir() {
 		if( $temp=ini_get('upload_tmp_dir') )        return $temp;
@@ -204,6 +208,8 @@ if(!function_exists('get_temp_dir')) {
 	}
 }
 
+OC::init();
+
 require_once('fakedirstream.php');
 
 // FROM search.php
diff --git a/lib/db.php b/lib/db.php
index c059f5ab336..0fee5e03816 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -338,7 +338,6 @@ class OC_DB {
 	 * @param $file file to read structure from
 	 */
 	public static function updateDbFromStructure($file){
-		$CONFIG_DBNAME  = OC_Config::getValue( "dbname", "owncloud" );
 		$CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
 		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
 
@@ -347,17 +346,17 @@ class OC_DB {
 		// read file
 		$content = file_get_contents( $file );
 		
+		$previousSchema = self::$schema->getDefinitionFromDatabase();
+
 		// Make changes and save them to a temporary file
 		$file2 = tempnam( get_temp_dir(), 'oc_db_scheme_' );
-		$content = str_replace( '*dbname*', $CONFIG_DBNAME, $content );
+		$content = str_replace( '*dbname*', $previousSchema['name'], $content );
 		$content = str_replace( '*dbprefix*', $CONFIG_DBTABLEPREFIX, $content );
 		if( $CONFIG_DBTYPE == 'pgsql' ){ //mysql support it too but sqlite doesn't
 			$content = str_replace( '<default>0000-00-00 00:00:00</default>', '<default>CURRENT_TIMESTAMP</default>', $content );
 		}
 		file_put_contents( $file2, $content );
-		$previousSchema = self::$schema->getDefinitionFromDatabase();
-		$op = $schema->updateDatabase($file2, $previousSchema, array(), false);
-
+		$op = self::$schema->updateDatabase($file2, $previousSchema, array(), false);
 		if (PEAR::isError($op)) {
 		    $error = $op->getMessage();
 		    OC_Log::write('core','Failed to update database structure ('.$error.')',OC_Log::FATAL);
-- 
GitLab


From 9686c5b6aa981481063477efa54f21e9debfa453 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 15 Nov 2011 15:58:12 +0100
Subject: [PATCH 028/546] fixes in the sqlite manager driver

---
 lib/MDB2/Driver/Manager/sqlite3.php | 72 ++++++++++++++++++++---------
 1 file changed, 49 insertions(+), 23 deletions(-)

diff --git a/lib/MDB2/Driver/Manager/sqlite3.php b/lib/MDB2/Driver/Manager/sqlite3.php
index 71b9597d202..a6fde69d6c4 100644
--- a/lib/MDB2/Driver/Manager/sqlite3.php
+++ b/lib/MDB2/Driver/Manager/sqlite3.php
@@ -531,9 +531,26 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
             return MDB2_OK;
         }
 
+        if (empty($changes['remove']) and empty($changes['rename']) and empty($changes['change']) ){//if only rename or add changes are required, we can use ALTER TABLE
+			$query = '';
+			if (!empty($changes['name'])) {
+				$change_name = $db->quoteIdentifier($changes['name'], true);
+				$query = 'RENAME TO ' . $change_name;
+				$db->exec("ALTER TABLE $name $query");
+			}
+
+			if (!empty($changes['add']) && is_array($changes['add'])) {
+				foreach ($changes['add'] as $field_name => $field) {
+					$query= 'ADD ' . $db->getDeclaration($field['type'], $field_name, $field);
+					$db->exec("ALTER TABLE $name $query");
+				}
+			}
+			return MDB2_OK;
+        }
+
         $db->loadModule('Reverse', null, true);
 
-        // actually sqlite 2.x supports no ALTER TABLE at all .. so we emulate it
+        // for other operations we need to emulate them with sqlite3
         $fields = $db->manager->listTableFields($name);
         if (PEAR::isError($fields)) {
             return $fields;
@@ -633,16 +650,10 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
             }
         }
 
+		//rename the old table so we can create the new one
+        $db->exec("ALTER TABLE $name RENAME TO __$name");
         $data = null;
-        if (!empty($select_fields)) {
-            $query = 'SELECT '.implode(', ', $select_fields).' FROM '.$db->quoteIdentifier($name, true);
-            $data = $db->queryAll($query, null, MDB2_FETCHMODE_ORDERED);
-        }
 
-        $result = $this->dropTable($name);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
 
         $result = $this->createTable($name_new, $fields, $options);
         if (PEAR::isError($result)) {
@@ -657,20 +668,35 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
             $this->createConstraint($name_new, $constraint, $definition);
         }
 
-        if (!empty($select_fields) && !empty($data)) {
-            $query = 'INSERT INTO '.$db->quoteIdentifier($name_new, true);
-            $query.= '('.implode(', ', array_slice(array_keys($fields), 0, count($select_fields))).')';
-            $query.=' VALUES (?'.str_repeat(', ?', (count($select_fields) - 1)).')';
-            $stmt =$db->prepare($query, null, MDB2_PREPARE_MANIP);
-            if (PEAR::isError($stmt)) {
-                return $stmt;
-            }
-            foreach ($data as $row) {
-                $result = $stmt->execute($row);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
+        //fill the new table with data from the old one
+        if (!empty($select_fields)) {
+			$query = 'INSERT INTO '.$db->quoteIdentifier($name_new, true);
+			$query.= '('.implode(', ', array_slice(array_keys($fields), 0, count($select_fields))).')';
+            $query .= ' SELECT '.implode(', ', $select_fields).' FROM '.$db->quoteIdentifier('__'.$name, true);
+            $db->exec($query);
+        }
+
+//         if (!empty($select_fields) && !empty($data)) {
+//             $query = 'INSERT INTO '.$db->quoteIdentifier($name_new, true);
+//             $query.= '('.implode(', ', array_slice(array_keys($fields), 0, count($select_fields))).')';
+//             $query.=' VALUES (?'.str_repeat(', ?', (count($select_fields) - 1)).')';
+//             $stmt =$db->prepare($query, null, MDB2_PREPARE_MANIP);
+//             if (PEAR::isError($stmt)) {
+//                 return $stmt;
+//             }
+//             foreach ($data as $row) {
+//                 $result = $stmt->execute($row);
+//                 if (PEAR::isError($result)) {
+//                     return $result;
+//                 }
+//             }
+//         }
+        echo "changes $name";
+
+        //remove the old table
+        $result = $this->dropTable('__'.$name);
+        if (PEAR::isError($result)) {
+            return $result;
         }
         return MDB2_OK;
     }
-- 
GitLab


From 916c72b40be8db891856669643e7b605c087297e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 15 Nov 2011 15:59:01 +0100
Subject: [PATCH 029/546] set the installed version after updating the database

---
 lib/base.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/base.php b/lib/base.php
index 554036164e6..b6e8ccbe283 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -123,6 +123,7 @@ class OC{
 		$currentVersion=implode('.',OC_Util::getVersion());
 		if (version_compare($currentVersion, $installedVersion, '>')) {
 			OC_DB::updateDbFromStructure('../db_structure.xml');
+			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
 		}
 
 		ini_set('session.cookie_httponly','1;');
-- 
GitLab


From 98dc0882cbba43e892d2a5a7bf015d0218e026cb Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 15 Nov 2011 16:08:08 +0100
Subject: [PATCH 030/546] fix errors during database migration

---
 lib/MDB2/Driver/Manager/sqlite3.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/MDB2/Driver/Manager/sqlite3.php b/lib/MDB2/Driver/Manager/sqlite3.php
index a6fde69d6c4..8f4e1312eb8 100644
--- a/lib/MDB2/Driver/Manager/sqlite3.php
+++ b/lib/MDB2/Driver/Manager/sqlite3.php
@@ -660,13 +660,15 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
             return $result;
         }
 
-        foreach ($indexes as $index => $definition) {
-            $this->createIndex($name_new, $index, $definition);
-        }
+        //these seem to only give errors
 
-        foreach ($constraints as $constraint => $definition) {
-            $this->createConstraint($name_new, $constraint, $definition);
-        }
+//         foreach ($indexes as $index => $definition) {
+//             $this->createIndex($name_new, $index, $definition);
+//         }
+
+//         foreach ($constraints as $constraint => $definition) {
+//             $this->createConstraint($name_new, $constraint, $definition);
+//         }
 
         //fill the new table with data from the old one
         if (!empty($select_fields)) {
@@ -691,7 +693,6 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
 //                 }
 //             }
 //         }
-        echo "changes $name";
 
         //remove the old table
         $result = $this->dropTable('__'.$name);
-- 
GitLab


From 153029a1705fbeb16bd70b73f46550c0c902d0f4 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sat, 26 Nov 2011 01:26:01 +0100
Subject: [PATCH 031/546] increase version to trigger database upgrade

---
 lib/util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util.php b/lib/util.php
index e010a572e3a..d70c7c605c1 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -62,7 +62,7 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(2,90,0);
+		return array(2,90,1);
 	}
 
 	/**
-- 
GitLab


From dd7a411f9aaceab1bf8eab551e5f95ff5feff6fb Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Tue, 29 Nov 2011 22:11:42 +0000
Subject: [PATCH 032/546] Disable save button while saving. Streamlined code.

---
 .gitignore                                    |    1 +
 3rdparty/css/chosen/chosen-sprite.png         |  Bin 742 -> 3998 bytes
 3rdparty/css/chosen/chosen.css                |   84 +-
 3rdparty/fullcalendar/GPL-LICENSE.txt         |  278 +
 3rdparty/fullcalendar/MIT-LICENSE.txt         |   20 +
 3rdparty/fullcalendar/changelog.txt           |  313 +
 3rdparty/fullcalendar/css/fullcalendar.css    |  616 ++
 .../fullcalendar/css/fullcalendar.print.css   |   59 +
 3rdparty/fullcalendar/js/fullcalendar.js      | 5210 +++++++++++++++++
 3rdparty/fullcalendar/js/fullcalendar.min.js  |  113 +
 3rdparty/fullcalendar/js/gcal.js              |  112 +
 3rdparty/js/chosen/VERSION                    |    2 +-
 3rdparty/js/chosen/chosen.jquery.js           |  169 +-
 3rdparty/js/chosen/chosen.jquery.min.js       |    4 +-
 3rdparty/when/MIT-LICENSE.txt                 |    9 +
 3rdparty/when/When.php                        |  725 +++
 apps/admin_dependencies_chk/settings.php      |    2 +-
 apps/bookmarks/bookmarksHelper.php            |    5 +-
 apps/calendar/ajax/activation.php             |    7 +-
 apps/calendar/ajax/changeview.php             |    5 +-
 apps/calendar/ajax/createcalendar.php         |    5 +-
 apps/calendar/ajax/editevent.php              |    9 +-
 apps/calendar/ajax/editeventform.php          |    9 +-
 apps/calendar/ajax/events.php                 |   84 +
 apps/calendar/ajax/guesstimezone.php          |   39 +
 apps/calendar/ajax/moveevent.php              |  118 +-
 apps/calendar/ajax/neweventform.php           |   52 +-
 apps/calendar/ajax/resizeevent.php            |   49 +
 apps/calendar/ajax/updatecalendar.php         |    5 +-
 apps/calendar/appinfo/app.php                 |    2 +
 apps/calendar/css/style.css                   |   83 +-
 apps/calendar/index.php                       |   39 +-
 apps/calendar/js/calendar.js                  | 1123 ++--
 apps/calendar/js/geo.js                       |   20 +
 apps/calendar/l10n/xgettextfiles              |   10 +-
 apps/calendar/lib/calendar.php                |    8 +
 apps/calendar/lib/object.php                  |   37 +-
 apps/calendar/lib/search.php                  |   26 +
 apps/calendar/templates/calendar.php          |  223 +-
 .../part.choosecalendar.rowfields.php         |    2 +-
 apps/calendar/templates/part.editevent.php    |    1 +
 apps/calendar/templates/part.eventform.php    |   12 +-
 apps/contacts/ajax/addcard.php                |    5 +
 apps/contacts/ajax/getdetails.php             |   12 +
 apps/contacts/ajax/setproperty.php            |   17 +-
 apps/contacts/ajax/showaddcard.php            |    5 +
 apps/contacts/ajax/showsetproperty.php        |    4 +
 apps/contacts/css/formtastic.css              |    8 +-
 apps/contacts/css/styles.css                  |   16 +-
 apps/contacts/index.php                       |    6 +
 apps/contacts/js/interface.js                 |   19 +-
 apps/contacts/lib/vcard.php                   |   50 +-
 apps/contacts/templates/part.addcardform.php  |   18 +-
 apps/contacts/templates/part.details.php      |   24 +-
 apps/contacts/templates/part.property.php     |   27 +-
 .../templates/part.setpropertyform.php        |   15 +-
 apps/external/ajax/seturls.php                |   20 +-
 apps/external/appinfo/app.php                 |   10 +-
 apps/external/index.php                       |    2 +-
 apps/external/settings.php                    |   20 +-
 apps/files_sharing/ajax/getitem.php           |    2 +-
 apps/files_sharing/ajax/setpermissions.php    |    2 +-
 apps/files_sharing/ajax/share.php             |    2 +-
 apps/files_sharing/ajax/unshare.php           |    2 +-
 apps/files_sharing/ajax/userautocomplete.php  |    2 +-
 apps/files_sharing/js/share.js                |    2 +-
 apps/files_texteditor/js/editor.js            |  113 +-
 apps/media/css/music.css                      |    3 +-
 apps/media/lib_ampache.php                    |   12 +-
 apps/media/lib_scanner.php                    |    6 +-
 apps/user_ldap/appinfo/app.php                |    5 +-
 apps/user_ldap/settings.php                   |   21 +-
 apps/user_ldap/templates/settings.php         |   17 +-
 apps/user_ldap/user_ldap.php                  |   78 +-
 core/css/styles.css                           |    8 -
 core/js/jquery-tipsy.js                       |    7 +-
 files/css/files.css                           |    9 +-
 files/index.php                               |    4 +
 files/js/files.js                             |    4 +-
 l10n/templates/calendar.pot                   |  366 +-
 lib/app.php                                   |    4 +-
 lib/base.php                                  |    8 +
 lib/config.php                                |    1 -
 lib/hook.php                                  |    2 +-
 lib/l10n.php                                  |   16 +
 lib/setup.php                                 |    2 +
 lib/template.php                              |   27 +
 lib/updater.php                               |   91 +
 lib/util.php                                  |   16 -
 settings/templates/personal.php               |    4 +-
 90 files changed, 9150 insertions(+), 1654 deletions(-)
 create mode 100644 3rdparty/fullcalendar/GPL-LICENSE.txt
 create mode 100644 3rdparty/fullcalendar/MIT-LICENSE.txt
 create mode 100644 3rdparty/fullcalendar/changelog.txt
 create mode 100644 3rdparty/fullcalendar/css/fullcalendar.css
 create mode 100644 3rdparty/fullcalendar/css/fullcalendar.print.css
 create mode 100644 3rdparty/fullcalendar/js/fullcalendar.js
 create mode 100644 3rdparty/fullcalendar/js/fullcalendar.min.js
 create mode 100644 3rdparty/fullcalendar/js/gcal.js
 create mode 100644 3rdparty/when/MIT-LICENSE.txt
 create mode 100755 3rdparty/when/When.php
 create mode 100644 apps/calendar/ajax/events.php
 create mode 100755 apps/calendar/ajax/guesstimezone.php
 create mode 100644 apps/calendar/ajax/resizeevent.php
 create mode 100755 apps/calendar/js/geo.js
 create mode 100644 apps/calendar/lib/search.php
 mode change 100644 => 100755 apps/calendar/templates/calendar.php
 create mode 100644 lib/updater.php

diff --git a/.gitignore b/.gitignore
index a84615cf138..68c48822e9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@ nbproject
 
 # WebFinger
 .well-known
+/.buildpath
diff --git a/3rdparty/css/chosen/chosen-sprite.png b/3rdparty/css/chosen/chosen-sprite.png
index f20db4439ea5c1038126bf326c8fd048b03a8226..9edce05a6a899eaf98481d12dddbc433331a01ee 100644
GIT binary patch
delta 3675
zcmV-h4y5ts1)d*}7k?-S0{{R3m1Swo00009a7bBm000XU000XU0RWnu7ytkYPiaF#
zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag^g>IBfRsybQWXdwQbLP>
z6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V<bNTej)S9!ipu-pd!uXC
zy!YnK{<YUW=dAOcv(E>>2n?1;Gf_2w45>mM5#WQz#Kz&|E<k|_Bya!_2(x4%bNwR$
z0Qi19JS!r=2fhFSc+(3A0KiR~z%U$#{}1XynOp&YgaN>GkvK~TfD`~gdX7S-06<0o
zfSs5oQvjd@0DoZ1V`Ad~P%QvpCx7PC0DztNnR@{MTa+Oc0iclpAQNSXL;z?z0Ibhe
zibVieFaQ*0OT;+<*ew7sNmph_0I;_Jz|Ig0vH%DS05DOAg((08djMd_BO`bKgqZ*o
zM)FrY@hh$n=PCdIc$u<1xg<G7fm;YIaR*mdE*>b(Nq-kB6gFW3VVXcL!g-k)GJ!M?
z;PcD?0HBc-5#WRK{dmp}uFlRjj<yb8E$Y7p{~}^y<NoE(t8hR70O53g(f%wivl@Uq
z27qn;q9yJGXkH7Tb@z*AvJXJD0HEpGSMzZAemp!yp^&-R+2!Qq*h<7gTVcvqeg0>{
zU%*%WY=8NFJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4Gw+sLL9n&JjNn*KJ
zDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@uU1J0GOD7Ombim^G
z008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaen{+UPL4=RLZkI#|QubM4*8xut6L2
z!5A#S1{}c!+`$X{U^aw8B*el(5JC!MfE;pQDXfA*D2C0j9V%ci)Ic3Hz)@(1lW-0$
z!d18qJ#Y{DVF;eVD7=9Q1VP9M6Ja6Rhyh}XSR;-I7nz0lA;Cxl5{o1t$%qtDB1@4q
zNPjU>ic}y~NFDM$asoMrTt>Q)JIDYsg8YWOM=_LvvQa(M47EeKs5csfMxqPQWOOl_
zj~1Yt&~mgIJ&ZP?=g_NY5897DL&q?{=okkx#B4Aw#=}CfI4lX1W6QB3tPHEh8n9NZ
z1G|a!W6!a71QLNozzH@4cS0ax9zjT0On+ET*hr`#93(Um+6gxa1B6k+CnA%mOSC4s
z5&6UzVlpv@SV$}*))J2sFA#f(L&P^E5{W}HC%KRUNwK6<(h|}}(r!{C=`5+6G)NjF
zlgZj-YqAG9lq?`C$c5yc<iq4M<QwE6@>>d>VnA`E_*3F2Qp##d8RZb=H01_mn13=s
zRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_bh;7Ul^#x)
z&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#lnCF=fnQv8C
zDz++o6_Lscl}eQ+l^ZHARH>?_s(;?93sv(~%T$l4UQ>OpMpZLY<EaVMmaA2&olxsj
z8&hYgJE(`MXQ*#fKcs$H{fP!y!%V|ZL!?olv0vl7#vlu08MAmSA!`k*hIN58#3r%L
z*?e{?yO{kQyNf-lsi8STGfFd8vr_YvW<Lkxm~r@=bWRE9D5sb6eu~}{?|&)cDI2CV
zOt~>-Tx+V9mzG$oNUKq+N9(;duI;CtroBbGS^I$wLB~obTqj3okIn_1=Tq5J-KPqt
z7EL`m^{y_eYo!~ZyF_=tZl~^;p1xjyo=k72-g&*}`W$^P{Z##J`lt0r3|I!U3?v5I
z49*xl#WitnJRL8`+woCDU4O$sL#1JrVVB{Ak-5=4qt!-@Mh}c>#$4kh<88)m#-k<%
zCLtzEP3leVno>=<rYWX7Ogl`+&CJcB&DNPUn>{htGUuD;o7bD)w_sX$S}eAxwzy?U
zvgBH(S?;#HZiQMoS*2K2T3xe7t(~nU*1N5{rxB;QPLocnp4Ml>uz&Hk$+oGt8L;Kp
z2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=KYhjY
zmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C^>JO{
zdeZfso3oq3?Wo(Y?teD!Y3_&IpUgC$DV|v~bI`-cL*P;6(LW2Hl`w1HtbR{JPl0E(
z=OZs;FOgTR*RZ#xcdGYc?-xGyK60PqKI1$$-ZI`<U(7eax5&54Ps4AXUxnX8e<S~7
z|9bz?0H=T@0cQh=fkA;=0{i%Sd?CM%KRVlG_OjXSL5!feL4OrNkAkg&<-x5XXvpl4
zts(d4n9h;TX%2-@e(2WF2Vv%6i^F~lCxwTFSB5{1aEMqM(J_}bchTHKbKgYzM3zL}
zn`bdkIj=2BH7Y);E^0j5H@Y;sKgKR*S<KZ~omfe1OB^{aDy}weY`)+8?emA?o#G4Q
zdl#55$X#%Gp?}W8^o6GusV)*MI+j38h)y_^@IeqNs1}SR@)LI@jtY6g9l~cKFVQy9
zh}c71DjrVqNGeTwlI)SZHF+e(Go>u$xr8UFki1L{Ox>G0o)(&RAZ;=|I=wN2l97;c
zLaHH6leTB-XXa*h%dBOEvi`+xi?=Txl?TadvyiL>S${1GwnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_Iu74EU7nc=(*eKk1<r{}@%D<W1l(ea<#JOb8X3}Qq=H4xyTMm}0m*$raZVlPm
zv<=@@wC(lwMcXfz%_!TugSJDtqrW`3yk)1!&dobNRHRh&RQgml?$X`0Vb}O>(e4|2
zy!JHg)!SRV_x(P}zS~s+RZZ1q)n)rh`?L2yu78QD>G+oWZC$NSZE@|#1JVQi2O|!)
z*SXZy9nw8iQjgXv>qid9AHM#b?{_T?HVsvcoW|lKa720J>GuiW_Z|&8+IEb4tl<aK
zA9fvQ9WQD^n(~@Pn^T(mTVh+fPs~2i*6QAR{72g#51ceSS$RtHRLN=D>4MXfXY$XC
zoqv^`eSR+a++f?HwtMGe&fjVeZ|}Mgbm7uP|BL54ygSZZ^0;*JvfJeoSGZT2uR33C
z>U8Qn{*%*B$Ge=nny$HAYq{=vy|sI0_vss+H_qMky?OB#|JK!>IX&II^LlUh#rO5!
z7TtbwC;iULyV-Xq?ybB}ykGP{?LpZ?-G7JGKU@CX*zeqbYQT4(^U>T#_XdT7&;F71
zj}JoykC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTP
zlfP|zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr$76X
z8IzO$1Ou4!{9`jM+W-InAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5
zZ<1fdMgRZ<0Ffp4e^F6UQc_Y=Q&Ut_R8>_~R#sM5S65hASXo(FT3T9LTU%UQTwPsV
zUS3{bUteHgU}0flVq#)rV`F4wWMyS#W@ct*XJ=?=XlZF_YHDh0Yin$5Y;A3AZf<UG
zZ*OpLaB*>Qa&mHWb8~cbbai!gc6N4mcXxPrczJnwdU|?$e|vj;e0+U<eSUs^e}8{~
zfPjI4fr5g9gM)*FgoK5Kg@%TPhlhuVh=_@aiHeGfi;IhljEs$qjgF3vkB^U#kdTp)
zk&=><larH_l$4c~m6n#4mzS5An3$QFnVOoKo12@QoSdDVot~bapP!$gprE0lp`xOq
zqobpwq@<;#f2F3Trl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Z
zw6wIfwY9dkwzs#pxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK
z#l^<P#>dCU$jHda$;ryf%FD~k%*@Qq&CSlv&d<-!f6&m-(b3V;($dq@)6~?|)z#J3
z*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe-{9cj;o;%p;^O1u<K*Pz<>lq(=H}<;
z=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku
z`T6<!75e)7`}_R-{Qdp?{{H^||Nj#LH>i^!0bqY%Nkl<Zc-qv|*J{H+5CzbyU3Ixj
za__x&JH7Wl|Nk|4utVZt8#94`^{|4K4uU&(1^UB<f5!UV6VXw&&ca1Fns<mW3!4TU
z6^6;eN>T+>Q{e^Xseq&L0`odh4XD~y+}^OCg<&Q;C~m{<NMHY;9!@HX7drmJDF8rs
z<(+>JN*e-Gl;yI(`W%3<@})9>$Zidb04T52$N(_ccdKU!p_TnE03fxFWZol0H|Op*
z)<^EHqf+IGueD_LN80V3=R6L|tEmi*dG$=BrECtE_0)n=Hho?_wGWw|%CyhIjtmYG
zEvd4wTTLj6cK^Z)>{mVa<nOtEI8upUq~3RU*b-r@5u3bn@T0J7qRd0?jDbU8n~2C1
z&kP*57WY`5ftSdh+%j;Zc1lEaEoKaC#<K@x4{NbY&ZzvH5JKcczQ8F-W@z<ic2x8V
t?0N>Gq8DIyI}jC7{=o?JD?~(}0|0~!uhzlT_-+6I002ovPDHLkV1o5cKhppJ

delta 395
zcmV;60d)SJALa#+7Y-%}0{{R3uWtyw0002<lfer21U=)?Z<EOlV1H3bL_t(|+U?TE
za>6hW2H=$?x#9xGbV7#^2p!UU?|T2Ii5zE`@j;o)o^r^4@E+uEG;9AL5Yg|RggC18
zQMd^X&mV%1!lnTZ1H(jNQeptiBq%KM5<6S~%8q~;z&Hxm<i4d5G*P(kmk7yw$3Ngb
z^#>#5>!HTsTvr`c-+u!kZqCC5mm$tL^@ay66=w7#;zQa^u)dMjNZr&1fIxv4F1=b&
zcadNb06;rcUjqO(x?<;Ih0@*WcIOs&sq-<!DJ!n#uEf!{B>FrQzYhPPl@+Z-p#CxH
zIMkgMhm@g85_XG(@cS18PL%|ofBbiG&?#J$-*DK{d~1+fzG!0bqh{GcR3GYR2<-WG
zJWTBwfeThLb2|w9jqK$u0uOqp@wnF32y7N=2g089a+e4!qPiwi*LE5REUGhWvbM9@
pegj?4jMSL~<8&5_rJi)+@d=yNidHAaT2cT2002ovPDHLkV1fyUx26C9

diff --git a/3rdparty/css/chosen/chosen.css b/3rdparty/css/chosen/chosen.css
index 247d07bf021..b9c6d88028f 100644
--- a/3rdparty/css/chosen/chosen.css
+++ b/3rdparty/css/chosen/chosen.css
@@ -1,9 +1,4 @@
 /* @group Base */
-select.chzn-select {
-  visibility: hidden;
-  height: 28px !important;
-  min-height: 28px !important;
-}
 .chzn-container {
   font-size: 13px;
   position: relative;
@@ -60,9 +55,21 @@ select.chzn-select {
   white-space: nowrap;
   -o-text-overflow: ellipsis;
   -ms-text-overflow: ellipsis;
-  -moz-binding: url('/xml/ellipsis.xml#ellipsis');
   text-overflow: ellipsis;
 }
+.chzn-container-single .chzn-single abbr {
+  display: block;
+  position: absolute;
+  right: 26px;
+  top: 8px;
+  width: 12px;
+  height: 13px;
+  font-size: 1px;
+  background: url(chosen-sprite.png) right top no-repeat;
+}
+.chzn-container-single .chzn-single abbr:hover {
+  background-position: right -11px;
+}
 .chzn-container-single .chzn-single div {
   -webkit-border-radius: 0 4px 4px 0;
   -moz-border-radius   : 0 4px 4px 0;
@@ -94,18 +101,19 @@ select.chzn-select {
 }
 .chzn-container-single .chzn-search {
   padding: 3px 4px;
+  position: relative;
   margin: 0;
   white-space: nowrap;
 }
 .chzn-container-single .chzn-search input {
-  background: #fff url('chosen-sprite.png') no-repeat 100% -20px;
-  background: url('chosen-sprite.png') no-repeat 100% -20px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
-  background: url('chosen-sprite.png') no-repeat 100% -20px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat 100% -20px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat 100% -20px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat 100% -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat 100% -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat 100% -20px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: #fff url('chosen-sprite.png') no-repeat 100% -22px;
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
   margin: 1px 0;
   padding: 4px 20px 4px 5px;
   outline: 0;
@@ -123,6 +131,11 @@ select.chzn-select {
 }
 /* @end */
 
+.chzn-container-single-nosearch .chzn-search input {
+  position: absolute;
+  left: -9000px;
+}
+
 /* @group Multi Chosen */
 .chzn-container-multi .chzn-choices {
   background-color: #fff;
@@ -197,18 +210,18 @@ select.chzn-select {
 .chzn-container-multi .chzn-choices .search-choice .search-choice-close {
   display: block;
   position: absolute;
-  right: 5px;
-  top: 6px;
-  width: 8px;
-  height: 9px;
+  right: 3px;
+  top: 4px;
+  width: 12px;
+  height: 13px;
   font-size: 1px;
   background: url(chosen-sprite.png) right top no-repeat;
 }
 .chzn-container-multi .chzn-choices .search-choice .search-choice-close:hover {
-  background-position: right -9px;
+  background-position: right -11px;
 }
 .chzn-container-multi .chzn-choices .search-choice-focus .search-choice-close {
-  background-position: right -9px;
+  background-position: right -11px;
 }
 /* @end */
 
@@ -226,6 +239,7 @@ select.chzn-select {
   padding: 0;
 }
 .chzn-container .chzn-results li {
+  display: none;
   line-height: 80%;
   padding: 7px 7px 8px;
   margin: 0;
@@ -233,6 +247,7 @@ select.chzn-select {
 }
 .chzn-container .chzn-results .active-result {
   cursor: pointer;
+  display: list-item;
 }
 .chzn-container .chzn-results .highlighted {
   background: #3875d7;
@@ -247,6 +262,7 @@ select.chzn-select {
 }
 .chzn-container .chzn-results .no-results {
   background: #f4f4f4;
+  display: list-item;
 }
 .chzn-container .chzn-results .group-result {
   cursor: default;
@@ -309,6 +325,18 @@ select.chzn-select {
 }
 /* @end */
 
+/* @group Disabled Support */
+.chzn-disabled {
+  cursor: default;
+  opacity:0.5 !important;
+}
+.chzn-disabled .chzn-single {
+  cursor: default;
+}
+.chzn-disabled .chzn-choices .search-choice .search-choice-close {
+  cursor: default;
+}
+
 /* @group Right to Left */
 .chzn-rtl { direction:rtl;text-align: right; }
 .chzn-rtl .chzn-single { padding-left: 0; padding-right: 8px; }
@@ -327,14 +355,14 @@ select.chzn-select {
 .chzn-rtl .chzn-results .group-option { padding-left: 0; padding-right: 20px; }
 .chzn-rtl.chzn-container-active .chzn-single-with-drop div { border-right: none; }
 .chzn-rtl .chzn-search input {
-  background: url('chosen-sprite.png') no-repeat -38px -20px, #ffffff;
-  background: url('chosen-sprite.png') no-repeat -38px -20px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
-  background: url('chosen-sprite.png') no-repeat -38px -20px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);  
-  background: url('chosen-sprite.png') no-repeat -38px -20px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat -38px -20px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat -38px -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat -38px -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat -38px -20px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, #ffffff;
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
   padding: 4px 5px 4px 20px;
 }
 /* @end */
\ No newline at end of file
diff --git a/3rdparty/fullcalendar/GPL-LICENSE.txt b/3rdparty/fullcalendar/GPL-LICENSE.txt
new file mode 100644
index 00000000000..11dddd00ef0
--- /dev/null
+++ b/3rdparty/fullcalendar/GPL-LICENSE.txt
@@ -0,0 +1,278 @@
+        GNU GENERAL PUBLIC LICENSE
+           Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+          Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+        GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+          NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
diff --git a/3rdparty/fullcalendar/MIT-LICENSE.txt b/3rdparty/fullcalendar/MIT-LICENSE.txt
new file mode 100644
index 00000000000..46d47544964
--- /dev/null
+++ b/3rdparty/fullcalendar/MIT-LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2009 Adam Shaw
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/3rdparty/fullcalendar/changelog.txt b/3rdparty/fullcalendar/changelog.txt
new file mode 100644
index 00000000000..50d0880fd7a
--- /dev/null
+++ b/3rdparty/fullcalendar/changelog.txt
@@ -0,0 +1,313 @@
+
+version 1.5.2 (8/21/11)
+	- correctly process UTC "Z" ISO8601 date strings (issue 750)
+
+version 1.5.1 (4/9/11)
+	- more flexible ISO8601 date parsing (issue 814)
+	- more flexible parsing of UNIX timestamps (issue 826)
+	- FullCalendar now buildable from source on a Mac (issue 795)
+	- FullCalendar QA'd in FF4 (issue 883)
+	- upgraded to jQuery 1.5.2 (which supports IE9) and jQuery UI 1.8.11
+
+version 1.5 (3/19/11)
+	- slicker default styling for buttons
+	- reworked a lot of the calendar's HTML and accompanying CSS
+	  (solves issues 327 and 395)
+	- more printer-friendly (fullcalendar-print.css)
+	- fullcalendar now inherits styles from jquery-ui themes differently.
+	  styles for buttons are distinct from styles for calendar cells.
+	  (solves issue 299)
+	- can now color events through FullCalendar options and Event-Object properties (issue 117)
+	  THIS IS NOW THE PREFERRED METHOD OF COLORING EVENTS (as opposed to using className and CSS)
+		- FullCalendar options:
+			- eventColor (changes both background and border)
+			- eventBackgroundColor
+			- eventBorderColor
+			- eventTextColor
+		- Event-Object options:
+			- color (changes both background and border)
+			- backgroundColor
+			- borderColor
+			- textColor
+	- can now specify an event source as an *object* with a `url` property (json feed) or
+	  an `events` property (function or array) with additional properties that will
+	  be applied to the entire event source:
+		- color (changes both background and border)
+		- backgroudColor
+		- borderColor
+		- textColor
+		- className
+		- editable
+		- allDayDefault
+		- ignoreTimezone
+		- startParam (for a feed)
+		- endParam   (for a feed)
+		- ANY OF THE JQUERY $.ajax OPTIONS
+		  allows for easily changing from GET to POST and sending additional parameters (issue 386)
+		  allows for easily attaching ajax handlers such as `error` (issue 754)
+		  allows for turning caching on (issue 355)
+	- Google Calendar feeds are now specified differently:
+		- specify a simple string of your feed's URL
+		- specify an *object* with a `url` property of your feed's URL.
+		  you can include any of the new Event-Source options in this object.
+		- the old `$.fullCalendar.gcalFeed` method still works
+	- no more IE7 SSL popup (issue 504)
+	- remove `cacheParam` - use json event source `cache` option instead
+	- latest jquery/jquery-ui
+
+version 1.4.11 (2/22/11)
+	- fixed rerenderEvents bug (issue 790)
+	- fixed bug with faulty dragging of events from all-day slot in agenda views
+	- bundled with jquery 1.5 and jquery-ui 1.8.9
+
+version 1.4.10 (1/2/11)
+	- fixed bug with resizing event to different week in 5-day month view (issue 740)
+	- fixed bug with events not sticking after a removeEvents call (issue 757)
+	- fixed bug with underlying parseTime method, and other uses of parseInt (issue 688)
+
+version 1.4.9 (11/16/10)
+	- new algorithm for vertically stacking events (issue 111)
+	- resizing an event to a different week (issue 306)
+	- bug: some events not rendered with consecutive calls to addEventSource (issue 679)
+
+version 1.4.8 (10/16/10)
+	- ignoreTimezone option (set to `false` to process UTC offsets in ISO8601 dates)
+	- bugfixes
+		- event refetching not being called under certain conditions (issues 417, 554)
+		- event refetching being called multiple times under certain conditions (issues 586, 616)
+		- selection cannot be triggered by right mouse button (issue 558)
+		- agenda view left axis sized incorrectly (issue 465)
+		- IE js error when calendar is too narrow (issue 517)
+		- agenda view looks strange when no scrollbars (issue 235)
+		- improved parsing of ISO8601 dates with UTC offsets
+	- $.fullCalendar.version
+	- an internal refactor of the code, for easier future development and modularity
+
+version 1.4.7 (7/5/10)
+	- "dropping" external objects onto the calendar
+		- droppable (boolean, to turn on/off)
+		- dropAccept (to filter which events the calendar will accept)
+		- drop (trigger)
+	- selectable options can now be specified with a View Option Hash
+	- bugfixes
+		- dragged & reverted events having wrong time text (issue 406)
+		- bug rendering events that have an endtime with seconds, but no hours/minutes (issue 477)
+		- gotoDate date overflow bug (issue 429)
+		- wrong date reported when clicking on edge of last column in agenda views (412)
+	- support newlines in event titles
+	- select/unselect callbacks now passes native js event
+
+version 1.4.6 (5/31/10)
+	- "selecting" days or timeslots
+		- options: selectable, selectHelper, unselectAuto, unselectCancel
+		- callbacks: select, unselect
+		- methods: select, unselect
+	- when dragging an event, the highlighting reflects the duration of the event
+	- code compressing by Google Closure Compiler
+	- bundled with jQuery 1.4.2 and jQuery UI 1.8.1
+
+version 1.4.5 (2/21/10)
+	- lazyFetching option, which can force the calendar to fetch events on every view/date change
+	- scroll state of agenda views are preserved when switching back to view
+	- bugfixes
+		- calling methods on an uninitialized fullcalendar throws error
+		- IE6/7 bug where an entire view becomes invisible (issue 320)
+		- error when rendering a hidden calendar (in jquery ui tabs for example) in IE (issue 340)
+		- interconnected bugs related to calendar resizing and scrollbars
+			- when switching views or clicking prev/next, calendar would "blink" (issue 333)
+			- liquid-width calendar's events shifted (depending on initial height of browser) (issue 341)
+			- more robust underlying algorithm for calendar resizing
+
+version 1.4.4 (2/3/10)
+	- optimized event rendering in all views (events render in 1/10 the time)
+	- gotoDate() does not force the calendar to unnecessarily rerender
+	- render() method now correctly readjusts height
+
+version 1.4.3 (12/22/09)
+	- added destroy method
+	- Google Calendar event pages respect currentTimezone
+	- caching now handled by jQuery's ajax
+	- protection from setting aspectRatio to zero
+	- bugfixes
+		- parseISO8601 and DST caused certain events to display day before
+		- button positioning problem in IE6
+		- ajax event source removed after recently being added, events still displayed
+		- event not displayed when end is an empty string
+		- dynamically setting calendar height when no events have been fetched, throws error
+
+version 1.4.2 (12/02/09)
+	- eventAfterRender trigger
+	- getDate & getView methods
+	- height & contentHeight options (explicitly sets the pixel height)
+	- minTime & maxTime options (restricts shown hours in agenda view)
+	- getters [for all options] and setters [for height, contentHeight, and aspectRatio ONLY! stay tuned..]
+	- render method now readjusts calendar's size
+	- bugfixes
+		- lightbox scripts that use iframes (like fancybox)
+		- day-of-week classNames were off when firstDay=1
+		- guaranteed space on right side of agenda events (even when stacked)
+		- accepts ISO8601 dates with a space (instead of 'T')
+
+version 1.4.1 (10/31/09)
+	- can exclude weekends with new 'weekends' option
+	- gcal feed 'currentTimezone' option
+	- bugfixes
+		- year/month/date option sometimes wouldn't set correctly (depending on current date)
+		- daylight savings issue caused agenda views to start at 1am (for BST users)
+	- cleanup of gcal.js code
+
+version 1.4 (10/19/09)
+	- agendaWeek and agendaDay views
+	- added some options for agenda views:
+		- allDaySlot
+		- allDayText
+		- firstHour
+		- slotMinutes
+		- defaultEventMinutes
+		- axisFormat
+	- modified some existing options/triggers to work with agenda views:
+		- dragOpacity and timeFormat can now accept a "View Hash" (a new concept)
+		- dayClick now has an allDay parameter
+		- eventDrop now has an an allDay parameter
+		  (this will affect those who use revertFunc, adjust parameter list)
+	- added 'prevYear' and 'nextYear' for buttons in header
+	- minor change for theme users, ui-state-hover not applied to active/inactive buttons
+	- added event-color-changing example in docs
+	- better defaults for right-to-left themed button icons
+
+version 1.3.2 (10/13/09)
+	- Bugfixes (please upgrade from 1.3.1!)
+		- squashed potential infinite loop when addMonths and addDays
+		  is called with an invalid date
+		- $.fullCalendar.parseDate() now correctly parses IETF format
+		- when switching views, the 'today' button sticks inactive, fixed
+	- gotoDate now can accept a single Date argument
+	- documentation for changes in 1.3.1 and 1.3.2 now on website
+
+version 1.3.1 (9/30/09)
+	- Important Bugfixes (please upgrade from 1.3!)
+		- When current date was late in the month, for long months, and prev/next buttons
+		  were clicked in month-view, some months would be skipped/repeated
+		- In certain time zones, daylight savings time would cause certain days
+		  to be misnumbered in month-view
+	- Subtle change in way week interval is chosen when switching from month to basicWeek/basicDay view
+	- Added 'allDayDefault' option
+	- Added 'changeView' and 'render' methods
+
+version 1.3 (9/21/09)
+	- different 'views': month/basicWeek/basicDay
+	- more flexible 'header' system for buttons
+	- themable by jQuery UI themes
+	- resizable events (require jQuery UI resizable plugin)
+	- rescoped & rewritten CSS, enhanced default look
+	- cleaner css & rendering techniques for right-to-left
+	- reworked options & API to support multiple views / be consistent with jQuery UI
+	- refactoring of entire codebase
+		- broken into different JS & CSS files, assembled w/ build scripts
+		- new test suite for new features, uses firebug-lite
+	- refactored docs
+	- Options
+		+ date
+		+ defaultView
+		+ aspectRatio
+		+ disableResizing
+		+ monthNames      (use instead of $.fullCalendar.monthNames)
+		+ monthNamesShort (use instead of $.fullCalendar.monthAbbrevs)
+		+ dayNames        (use instead of $.fullCalendar.dayNames)
+		+ dayNamesShort   (use instead of $.fullCalendar.dayAbbrevs)
+		+ theme
+		+ buttonText
+		+ buttonIcons
+		x draggable           -> editable/disableDragging
+		x fixedWeeks          -> weekMode
+		x abbrevDayHeadings   -> columnFormat
+		x buttons/title       -> header
+		x eventDragOpacity    -> dragOpacity
+		x eventRevertDuration -> dragRevertDuration
+		x weekStart           -> firstDay
+		x rightToLeft         -> isRTL
+		x showTime (use 'allDay' CalEvent property instead)
+	- Triggered Actions
+		+ eventResizeStart
+		+ eventResizeStop
+		+ eventResize
+		x monthDisplay -> viewDisplay
+		x resize       -> windowResize
+		'eventDrop' params changed, can revert if ajax cuts out
+	- CalEvent Properties
+		x showTime  -> allDay
+		x draggable -> editable
+		'end' is now INCLUSIVE when allDay=true
+		'url' now produces a real <a> tag, more native clicking/tab behavior
+	- Methods:
+		+ renderEvent
+		x prevMonth         -> prev
+		x nextMonth         -> next
+		x prevYear/nextYear -> moveDate
+		x refresh           -> rerenderEvents/refetchEvents
+		x removeEvent       -> removeEvents
+		x getEventsByID     -> clientEvents
+	- Utilities:
+		'formatDate' format string completely changed (inspired by jQuery UI datepicker + datejs)
+		'formatDates' added to support date-ranges
+	- Google Calendar Options:
+		x draggable -> editable
+	- Bugfixes
+		- gcal extension fetched 25 results max, now fetches all
+
+version 1.2.1 (6/29/09)
+	- bugfixes
+		- allows and corrects invalid end dates for events
+		- doesn't throw an error in IE while rendering when display:none
+		- fixed 'loading' callback when used w/ multiple addEventSource calls
+		- gcal className can now be an array
+
+version 1.2 (5/31/09)
+	- expanded API
+		- 'className' CalEvent attribute
+		- 'source' CalEvent attribute
+		- dynamically get/add/remove/update events of current month
+		- locale improvements: change month/day name text
+		- better date formatting ($.fullCalendar.formatDate)
+		- multiple 'event sources' allowed
+			- dynamically add/remove event sources
+	- options for prevYear and nextYear buttons
+	- docs have been reworked (include addition of Google Calendar docs)
+	- changed behavior of parseDate for number strings
+	  (now interpets as unix timestamp, not MS times)
+	- bugfixes
+		- rightToLeft month start bug
+		- off-by-one errors with month formatting commands
+		- events from previous months sticking when clicking prev/next quickly
+	- Google Calendar API changed to work w/ multiple event sources
+		- can also provide 'className' and 'draggable' options
+	- date utilties moved from $ to $.fullCalendar
+	- more documentation in source code
+	- minified version of fullcalendar.js
+	- test suit (available from svn)
+	- top buttons now use <button> w/ an inner <span> for better css cusomization
+		- thus CSS has changed. IF UPGRADING FROM PREVIOUS VERSIONS,
+		  UPGRADE YOUR FULLCALENDAR.CSS FILE!!!
+
+version 1.1 (5/10/09)
+	- Added the following options:
+		- weekStart
+		- rightToLeft
+		- titleFormat
+		- timeFormat
+		- cacheParam
+		- resize
+	- Fixed rendering bugs
+		- Opera 9.25 (events placement & window resizing)
+		- IE6 (window resizing)
+	- Optimized window resizing for ALL browsers
+	- Events on same day now sorted by start time (but first by timespan)
+	- Correct z-index when dragging
+	- Dragging contained in overflow DIV for IE6
+	- Modified fullcalendar.css
+		- for right-to-left support
+		- for variable start-of-week
+		- for IE6 resizing bug
+		- for THEAD and TBODY (in 1.0, just used TBODY, restructured in 1.1)
+		- IF UPGRADING FROM FULLCALENDAR 1.0, YOU MUST UPGRADE FULLCALENDAR.CSS
+		  !!!!!!!!!!!
diff --git a/3rdparty/fullcalendar/css/fullcalendar.css b/3rdparty/fullcalendar/css/fullcalendar.css
new file mode 100644
index 00000000000..4e9e95e894f
--- /dev/null
+++ b/3rdparty/fullcalendar/css/fullcalendar.css
@@ -0,0 +1,616 @@
+/*
+ * FullCalendar v1.5.2 Stylesheet
+ *
+ * Copyright (c) 2011 Adam Shaw
+ * Dual licensed under the MIT and GPL licenses, located in
+ * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
+ *
+ * Date: Sun Aug 21 22:06:09 2011 -0700
+ *
+ */
+
+
+.fc {
+	direction: ltr;
+	text-align: left;
+	}
+
+.fc table {
+	border-collapse: collapse;
+	border-spacing: 0;
+	}
+
+html .fc,
+.fc table {
+	font-size: 1em;
+	}
+
+.fc td,
+.fc th {
+	padding: 0;
+	vertical-align: top;
+	}
+
+
+
+/* Header
+------------------------------------------------------------------------*/
+
+.fc-header td {
+	white-space: nowrap;
+	}
+
+.fc-header-left {
+	width: 25%;
+	text-align: left;
+	}
+
+.fc-header-center {
+	text-align: center;
+	}
+
+.fc-header-right {
+	width: 25%;
+	text-align: right;
+	}
+
+.fc-header-title {
+	display: inline-block;
+	vertical-align: top;
+	}
+
+.fc-header-title h2 {
+	margin-top: 0;
+	white-space: nowrap;
+	}
+
+.fc .fc-header-space {
+	padding-left: 10px;
+	}
+
+.fc-header .fc-button {
+	margin-bottom: 1em;
+	vertical-align: top;
+	}
+
+/* buttons edges butting together */
+
+.fc-header .fc-button {
+	margin-right: -1px;
+	}
+
+.fc-header .fc-corner-right {
+	margin-right: 1px; /* back to normal */
+	}
+
+.fc-header .ui-corner-right {
+	margin-right: 0; /* back to normal */
+	}
+
+/* button layering (for border precedence) */
+
+.fc-header .fc-state-hover,
+.fc-header .ui-state-hover {
+	z-index: 2;
+	}
+
+.fc-header .fc-state-down {
+	z-index: 3;
+	}
+
+.fc-header .fc-state-active,
+.fc-header .ui-state-active {
+	z-index: 4;
+	}
+
+
+
+/* Content
+------------------------------------------------------------------------*/
+
+.fc-content {
+	clear: both;
+	}
+
+.fc-view {
+	width: 100%; /* needed for view switching (when view is absolute) */
+	overflow: hidden;
+	}
+
+
+
+/* Cell Styles
+------------------------------------------------------------------------*/
+
+.fc-widget-header,    /* <th>, usually */
+.fc-widget-content {  /* <td>, usually */
+	border: 1px solid #ccc;
+	}
+
+.fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */
+	background: #ffc;
+	}
+
+.fc-cell-overlay { /* semi-transparent rectangle while dragging */
+	background: #9cf;
+	opacity: .2;
+	filter: alpha(opacity=20); /* for IE */
+	}
+
+
+
+/* Buttons
+------------------------------------------------------------------------*/
+
+.fc-button {
+	position: relative;
+	display: inline-block;
+	cursor: pointer;
+	}
+
+.fc-state-default { /* non-theme */
+	border-style: solid;
+	border-width: 1px 0;
+	}
+
+.fc-button-inner {
+	position: relative;
+	float: left;
+	overflow: hidden;
+	}
+
+.fc-state-default .fc-button-inner { /* non-theme */
+	border-style: solid;
+	border-width: 0 1px;
+	}
+
+.fc-button-content {
+	position: relative;
+	float: left;
+	height: 1.9em;
+	line-height: 1.9em;
+	padding: 0 .6em;
+	white-space: nowrap;
+	}
+
+/* icon (for jquery ui) */
+
+.fc-button-content .fc-icon-wrap {
+	position: relative;
+	float: left;
+	top: 50%;
+	}
+
+.fc-button-content .ui-icon {
+	position: relative;
+	float: left;
+	margin-top: -50%;
+	*margin-top: 0;
+	*top: -50%;
+	}
+
+/* gloss effect */
+
+.fc-state-default .fc-button-effect {
+	position: absolute;
+	top: 50%;
+	left: 0;
+	}
+
+.fc-state-default .fc-button-effect span {
+	position: absolute;
+	top: -100px;
+	left: 0;
+	width: 500px;
+	height: 100px;
+	border-width: 100px 0 0 1px;
+	border-style: solid;
+	border-color: #fff;
+	background: #444;
+	opacity: .09;
+	filter: alpha(opacity=9);
+	}
+
+/* button states (determines colors)  */
+
+.fc-state-default,
+.fc-state-default .fc-button-inner {
+	border-style: solid;
+	border-color: #ccc #bbb #aaa;
+	background: #F3F3F3;
+	color: #000;
+	}
+
+.fc-state-hover,
+.fc-state-hover .fc-button-inner {
+	border-color: #999;
+	}
+
+.fc-state-down,
+.fc-state-down .fc-button-inner {
+	border-color: #555;
+	background: #777;
+	}
+
+.fc-state-active,
+.fc-state-active .fc-button-inner {
+	border-color: #555;
+	background: #777;
+	color: #fff;
+	}
+
+.fc-state-disabled,
+.fc-state-disabled .fc-button-inner {
+	color: #999;
+	border-color: #ddd;
+	}
+
+.fc-state-disabled {
+	cursor: default;
+	}
+
+.fc-state-disabled .fc-button-effect {
+	display: none;
+	}
+
+
+
+/* Global Event Styles
+------------------------------------------------------------------------*/
+
+.fc-event {
+	border-style: solid;
+	border-width: 0;
+	font-size: .85em;
+	cursor: default;
+	}
+
+a.fc-event,
+.fc-event-draggable {
+	cursor: pointer;
+	}
+
+a.fc-event {
+	text-decoration: none;
+	}
+
+.fc-rtl .fc-event {
+	text-align: right;
+	}
+
+.fc-event-skin {
+	border-color: #36c;     /* default BORDER color */
+	background-color: #36c; /* default BACKGROUND color */
+	color: #fff;            /* default TEXT color */
+	}
+
+.fc-event-inner {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	border-style: solid;
+	border-width: 0;
+	overflow: hidden;
+	}
+
+.fc-event-time,
+.fc-event-title {
+	padding: 0 1px;
+	}
+
+.fc .ui-resizable-handle { /*** TODO: don't use ui-resizable anymore, change class ***/
+	display: block;
+	position: absolute;
+	z-index: 99999;
+	overflow: hidden; /* hacky spaces (IE6/7) */
+	font-size: 300%;  /* */
+	line-height: 50%; /* */
+	}
+
+
+
+/* Horizontal Events
+------------------------------------------------------------------------*/
+
+.fc-event-hori {
+	border-width: 1px 0;
+	margin-bottom: 1px;
+	}
+
+/* resizable */
+
+.fc-event-hori .ui-resizable-e {
+	top: 0           !important; /* importants override pre jquery ui 1.7 styles */
+	right: -3px      !important;
+	width: 7px       !important;
+	height: 100%     !important;
+	cursor: e-resize;
+	}
+
+.fc-event-hori .ui-resizable-w {
+	top: 0           !important;
+	left: -3px       !important;
+	width: 7px       !important;
+	height: 100%     !important;
+	cursor: w-resize;
+	}
+
+.fc-event-hori .ui-resizable-handle {
+	_padding-bottom: 14px; /* IE6 had 0 height */
+	}
+
+
+
+/* Fake Rounded Corners (for buttons and events)
+------------------------------------------------------------*/
+
+.fc-corner-left {
+	margin-left: 1px;
+	}
+
+.fc-corner-left .fc-button-inner,
+.fc-corner-left .fc-event-inner {
+	margin-left: -1px;
+	}
+
+.fc-corner-right {
+	margin-right: 1px;
+	}
+
+.fc-corner-right .fc-button-inner,
+.fc-corner-right .fc-event-inner {
+	margin-right: -1px;
+	}
+
+.fc-corner-top {
+	margin-top: 1px;
+	}
+
+.fc-corner-top .fc-event-inner {
+	margin-top: -1px;
+	}
+
+.fc-corner-bottom {
+	margin-bottom: 1px;
+	}
+
+.fc-corner-bottom .fc-event-inner {
+	margin-bottom: -1px;
+	}
+
+
+
+/* Fake Rounded Corners SPECIFICALLY FOR EVENTS
+-----------------------------------------------------------------*/
+
+.fc-corner-left .fc-event-inner {
+	border-left-width: 1px;
+	}
+
+.fc-corner-right .fc-event-inner {
+	border-right-width: 1px;
+	}
+
+.fc-corner-top .fc-event-inner {
+	border-top-width: 1px;
+	}
+
+.fc-corner-bottom .fc-event-inner {
+	border-bottom-width: 1px;
+	}
+
+
+
+/* Reusable Separate-border Table
+------------------------------------------------------------*/
+
+table.fc-border-separate {
+	border-collapse: separate;
+	}
+
+.fc-border-separate th,
+.fc-border-separate td {
+	border-width: 1px 0 0 1px;
+	}
+
+.fc-border-separate th.fc-last,
+.fc-border-separate td.fc-last {
+	border-right-width: 1px;
+	}
+
+.fc-border-separate tr.fc-last th,
+.fc-border-separate tr.fc-last td {
+	border-bottom-width: 1px;
+	}
+
+.fc-border-separate tbody tr.fc-first td,
+.fc-border-separate tbody tr.fc-first th {
+	border-top-width: 0;
+	}
+
+
+
+/* Month View, Basic Week View, Basic Day View
+------------------------------------------------------------------------*/
+
+.fc-grid th {
+	text-align: center;
+	}
+
+.fc-grid .fc-day-number {
+	float: right;
+	padding: 0 2px;
+	}
+
+.fc-grid .fc-other-month .fc-day-number {
+	opacity: 0.3;
+	filter: alpha(opacity=30); /* for IE */
+	/* opacity with small font can sometimes look too faded
+	   might want to set the 'color' property instead
+	   making day-numbers bold also fixes the problem */
+	}
+
+.fc-grid .fc-day-content {
+	clear: both;
+	padding: 2px 2px 1px; /* distance between events and day edges */
+	}
+
+/* event styles */
+
+.fc-grid .fc-event-time {
+	font-weight: bold;
+	}
+
+/* right-to-left */
+
+.fc-rtl .fc-grid .fc-day-number {
+	float: left;
+	}
+
+.fc-rtl .fc-grid .fc-event-time {
+	float: right;
+	}
+
+
+
+/* Agenda Week View, Agenda Day View
+------------------------------------------------------------------------*/
+
+.fc-agenda table {
+	border-collapse: separate;
+	}
+
+.fc-agenda-days th {
+	text-align: center;
+	}
+
+.fc-agenda .fc-agenda-axis {
+	width: 50px;
+	padding: 0 4px;
+	vertical-align: middle;
+	text-align: right;
+	white-space: nowrap;
+	font-weight: normal;
+	}
+
+.fc-agenda .fc-day-content {
+	padding: 2px 2px 1px;
+	}
+
+/* make axis border take precedence */
+
+.fc-agenda-days .fc-agenda-axis {
+	border-right-width: 1px;
+	}
+
+.fc-agenda-days .fc-col0 {
+	border-left-width: 0;
+	}
+
+/* all-day area */
+
+.fc-agenda-allday th {
+	border-width: 0 1px;
+	}
+
+.fc-agenda-allday .fc-day-content {
+	min-height: 34px; /* TODO: doesnt work well in quirksmode */
+	_height: 34px;
+	}
+
+/* divider (between all-day and slots) */
+
+.fc-agenda-divider-inner {
+	height: 2px;
+	overflow: hidden;
+	}
+
+.fc-widget-header .fc-agenda-divider-inner {
+	background: #eee;
+	}
+
+/* slot rows */
+
+.fc-agenda-slots th {
+	border-width: 1px 1px 0;
+	}
+
+.fc-agenda-slots td {
+	border-width: 1px 0 0;
+	background: none;
+	}
+
+.fc-agenda-slots td div {
+	height: 20px;
+	}
+
+.fc-agenda-slots tr.fc-slot0 th,
+.fc-agenda-slots tr.fc-slot0 td {
+	border-top-width: 0;
+	}
+
+.fc-agenda-slots tr.fc-minor th,
+.fc-agenda-slots tr.fc-minor td {
+	border-top-style: dotted;
+	}
+
+.fc-agenda-slots tr.fc-minor th.ui-widget-header {
+	*border-top-style: solid; /* doesn't work with background in IE6/7 */
+	}
+
+
+
+/* Vertical Events
+------------------------------------------------------------------------*/
+
+.fc-event-vert {
+	border-width: 0 1px;
+	}
+
+.fc-event-vert .fc-event-head,
+.fc-event-vert .fc-event-content {
+	position: relative;
+	z-index: 2;
+	width: 100%;
+	overflow: hidden;
+	}
+
+.fc-event-vert .fc-event-time {
+	white-space: nowrap;
+	font-size: 10px;
+	}
+
+.fc-event-vert .fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay  */
+	position: absolute;
+	z-index: 1;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: #fff;
+	opacity: .3;
+	filter: alpha(opacity=30);
+	}
+
+.fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */
+.fc-select-helper .fc-event-bg {
+	display: none\9; /* for IE6/7/8. nested opacity filters while dragging don't work */
+	}
+
+/* resizable */
+
+.fc-event-vert .ui-resizable-s {
+	bottom: 0        !important; /* importants override pre jquery ui 1.7 styles */
+	width: 100%      !important;
+	height: 8px      !important;
+	overflow: hidden !important;
+	line-height: 8px !important;
+	font-size: 11px  !important;
+	font-family: monospace;
+	text-align: center;
+	cursor: s-resize;
+	}
+
+.fc-agenda .ui-resizable-resizing { /* TODO: better selector */
+	_overflow: hidden;
+	}
diff --git a/3rdparty/fullcalendar/css/fullcalendar.print.css b/3rdparty/fullcalendar/css/fullcalendar.print.css
new file mode 100644
index 00000000000..18c7c9b10af
--- /dev/null
+++ b/3rdparty/fullcalendar/css/fullcalendar.print.css
@@ -0,0 +1,59 @@
+/*
+ * FullCalendar v1.5.2 Print Stylesheet
+ *
+ * Include this stylesheet on your page to get a more printer-friendly calendar.
+ * When including this stylesheet, use the media='print' attribute of the <link> tag.
+ * Make sure to include this stylesheet IN ADDITION to the regular fullcalendar.css.
+ *
+ * Copyright (c) 2011 Adam Shaw
+ * Dual licensed under the MIT and GPL licenses, located in
+ * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
+ *
+ * Date: Sun Aug 21 22:06:09 2011 -0700
+ *
+ */
+
+
+ /* Events
+-----------------------------------------------------*/
+
+.fc-event-skin {
+	background: none !important;
+	color: #000 !important;
+	}
+
+/* horizontal events */
+
+.fc-event-hori {
+	border-width: 0 0 1px 0 !important;
+	border-bottom-style: dotted !important;
+	border-bottom-color: #000 !important;
+	padding: 1px 0 0 0 !important;
+	}
+
+.fc-event-hori .fc-event-inner {
+	border-width: 0 !important;
+	padding: 0 1px !important;
+	}
+
+/* vertical events */
+
+.fc-event-vert {
+	border-width: 0 0 0 1px !important;
+	border-left-style: dotted !important;
+	border-left-color: #000 !important;
+	padding: 0 1px 0 0 !important;
+	}
+
+.fc-event-vert .fc-event-inner {
+	border-width: 0 !important;
+	padding: 1px 0 !important;
+	}
+
+.fc-event-bg {
+	display: none !important;
+	}
+
+.fc-event .ui-resizable-handle {
+	display: none !important;
+	}
diff --git a/3rdparty/fullcalendar/js/fullcalendar.js b/3rdparty/fullcalendar/js/fullcalendar.js
new file mode 100644
index 00000000000..fcdafbfca49
--- /dev/null
+++ b/3rdparty/fullcalendar/js/fullcalendar.js
@@ -0,0 +1,5210 @@
+/**
+ * @preserve
+ * FullCalendar v1.5.2
+ * http://arshaw.com/fullcalendar/
+ *
+ * Use fullcalendar.css for basic styling.
+ * For event drag & drop, requires jQuery UI draggable.
+ * For event resizing, requires jQuery UI resizable.
+ *
+ * Copyright (c) 2011 Adam Shaw
+ * Dual licensed under the MIT and GPL licenses, located in
+ * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
+ *
+ * Date: Sun Aug 21 22:06:09 2011 -0700
+ *
+ */
+
+(function($, undefined) {
+
+
+var defaults = {
+
+	// display
+	defaultView: 'month',
+	aspectRatio: 1.35,
+	header: {
+		left: 'title',
+		center: '',
+		right: 'today prev,next'
+	},
+	weekends: true,
+
+	// editing
+	//editable: false,
+	//disableDragging: false,
+	//disableResizing: false,
+
+	allDayDefault: true,
+	ignoreTimezone: true,
+
+	// event ajax
+	lazyFetching: true,
+	startParam: 'start',
+	endParam: 'end',
+
+	// time formats
+	titleFormat: {
+		month: 'MMMM yyyy',
+		week: "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+		day: 'dddd, MMM d, yyyy'
+	},
+	columnFormat: {
+		month: 'ddd',
+		week: 'ddd M/d',
+		day: 'dddd M/d'
+	},
+	timeFormat: { // for event elements
+		'': 'h(:mm)t' // default
+	},
+
+	// locale
+	isRTL: false,
+	firstDay: 0,
+	monthNames: ['January','February','March','April','May','June','July','August','September','October','November','December'],
+	monthNamesShort: ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'],
+	dayNames: ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'],
+	dayNamesShort: ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'],
+	buttonText: {
+		prev: '&nbsp;&#9668;&nbsp;',
+		next: '&nbsp;&#9658;&nbsp;',
+		prevYear: '&nbsp;&lt;&lt;&nbsp;',
+		nextYear: '&nbsp;&gt;&gt;&nbsp;',
+		today: 'today',
+		month: 'month',
+		week: 'week',
+		day: 'day'
+	},
+
+	// jquery-ui theming
+	theme: false,
+	buttonIcons: {
+		prev: 'circle-triangle-w',
+		next: 'circle-triangle-e'
+	},
+
+	//selectable: false,
+	unselectAuto: true,
+
+	dropAccept: '*'
+
+};
+
+// right-to-left defaults
+var rtlDefaults = {
+	header: {
+		left: 'next,prev today',
+		center: '',
+		right: 'title'
+	},
+	buttonText: {
+		prev: '&nbsp;&#9658;&nbsp;',
+		next: '&nbsp;&#9668;&nbsp;',
+		prevYear: '&nbsp;&gt;&gt;&nbsp;',
+		nextYear: '&nbsp;&lt;&lt;&nbsp;'
+	},
+	buttonIcons: {
+		prev: 'circle-triangle-e',
+		next: 'circle-triangle-w'
+	}
+};
+
+
+
+var fc = $.fullCalendar = { version: "1.5.2" };
+var fcViews = fc.views = {};
+
+
+$.fn.fullCalendar = function(options) {
+
+
+	// method calling
+	if (typeof options == 'string') {
+		var args = Array.prototype.slice.call(arguments, 1);
+		var res;
+		this.each(function() {
+			var calendar = $.data(this, 'fullCalendar');
+			if (calendar && $.isFunction(calendar[options])) {
+				var r = calendar[options].apply(calendar, args);
+				if (res === undefined) {
+					res = r;
+				}
+				if (options == 'destroy') {
+					$.removeData(this, 'fullCalendar');
+				}
+			}
+		});
+		if (res !== undefined) {
+			return res;
+		}
+		return this;
+	}
+
+
+	// would like to have this logic in EventManager, but needs to happen before options are recursively extended
+	var eventSources = options.eventSources || [];
+	delete options.eventSources;
+	if (options.events) {
+		eventSources.push(options.events);
+		delete options.events;
+	}
+
+
+	options = $.extend(true, {},
+		defaults,
+		(options.isRTL || options.isRTL===undefined && defaults.isRTL) ? rtlDefaults : {},
+		options
+	);
+
+
+	this.each(function(i, _element) {
+		var element = $(_element);
+		var calendar = new Calendar(element, options, eventSources);
+		element.data('fullCalendar', calendar); // TODO: look into memory leak implications
+		calendar.render();
+	});
+
+
+	return this;
+
+};
+
+
+// function for adding/overriding defaults
+function setDefaults(d) {
+	$.extend(true, defaults, d);
+}
+
+
+
+
+function Calendar(element, options, eventSources) {
+	var t = this;
+
+
+	// exports
+	t.options = options;
+	t.render = render;
+	t.destroy = destroy;
+	t.refetchEvents = refetchEvents;
+	t.reportEvents = reportEvents;
+	t.reportEventChange = reportEventChange;
+	t.rerenderEvents = rerenderEvents;
+	t.changeView = changeView;
+	t.select = select;
+	t.unselect = unselect;
+	t.prev = prev;
+	t.next = next;
+	t.prevYear = prevYear;
+	t.nextYear = nextYear;
+	t.today = today;
+	t.gotoDate = gotoDate;
+	t.incrementDate = incrementDate;
+	t.formatDate = function(format, date) { return formatDate(format, date, options) };
+	t.formatDates = function(format, date1, date2) { return formatDates(format, date1, date2, options) };
+	t.getDate = getDate;
+	t.getView = getView;
+	t.option = option;
+	t.trigger = trigger;
+
+
+	// imports
+	EventManager.call(t, options, eventSources);
+	var isFetchNeeded = t.isFetchNeeded;
+	var fetchEvents = t.fetchEvents;
+
+
+	// locals
+	var _element = element[0];
+	var header;
+	var headerElement;
+	var content;
+	var tm; // for making theme classes
+	var currentView;
+	var viewInstances = {};
+	var elementOuterWidth;
+	var suggestedViewHeight;
+	var absoluteViewElement;
+	var resizeUID = 0;
+	var ignoreWindowResize = 0;
+	var date = new Date();
+	var events = [];
+	var _dragElement;
+
+
+
+	/* Main Rendering
+	-----------------------------------------------------------------------------*/
+
+
+	setYMD(date, options.year, options.month, options.date);
+
+
+	function render(inc) {
+		if (!content) {
+			initialRender();
+		}else{
+			calcSize();
+			markSizesDirty();
+			markEventsDirty();
+			renderView(inc);
+		}
+	}
+
+
+	function initialRender() {
+		tm = options.theme ? 'ui' : 'fc';
+		element.addClass('fc');
+		if (options.isRTL) {
+			element.addClass('fc-rtl');
+		}
+		if (options.theme) {
+			element.addClass('ui-widget');
+		}
+		content = $("<div class='fc-content' style='position:relative'/>")
+			.prependTo(element);
+		header = new Header(t, options);
+		headerElement = header.render();
+		if (headerElement) {
+			element.prepend(headerElement);
+		}
+		changeView(options.defaultView);
+		$(window).resize(windowResize);
+		// needed for IE in a 0x0 iframe, b/c when it is resized, never triggers a windowResize
+		if (!bodyVisible()) {
+			lateRender();
+		}
+	}
+
+
+	// called when we know the calendar couldn't be rendered when it was initialized,
+	// but we think it's ready now
+	function lateRender() {
+		setTimeout(function() { // IE7 needs this so dimensions are calculated correctly
+			if (!currentView.start && bodyVisible()) { // !currentView.start makes sure this never happens more than once
+				renderView();
+			}
+		},0);
+	}
+
+
+	function destroy() {
+		$(window).unbind('resize', windowResize);
+		header.destroy();
+		content.remove();
+		element.removeClass('fc fc-rtl ui-widget');
+	}
+
+
+
+	function elementVisible() {
+		return _element.offsetWidth !== 0;
+	}
+
+
+	function bodyVisible() {
+		return $('body')[0].offsetWidth !== 0;
+	}
+
+
+
+	/* View Rendering
+	-----------------------------------------------------------------------------*/
+
+	// TODO: improve view switching (still weird transition in IE, and FF has whiteout problem)
+
+	function changeView(newViewName) {
+		if (!currentView || newViewName != currentView.name) {
+			ignoreWindowResize++; // because setMinHeight might change the height before render (and subsequently setSize) is reached
+
+			unselect();
+
+			var oldView = currentView;
+			var newViewElement;
+
+			if (oldView) {
+				(oldView.beforeHide || noop)(); // called before changing min-height. if called after, scroll state is reset (in Opera)
+				setMinHeight(content, content.height());
+				oldView.element.hide();
+			}else{
+				setMinHeight(content, 1); // needs to be 1 (not 0) for IE7, or else view dimensions miscalculated
+			}
+			content.css('overflow', 'hidden');
+
+			currentView = viewInstances[newViewName];
+			if (currentView) {
+				currentView.element.show();
+			}else{
+				currentView = viewInstances[newViewName] = new fcViews[newViewName](
+					newViewElement = absoluteViewElement =
+						$("<div class='fc-view fc-view-" + newViewName + "' style='position:absolute'/>")
+							.appendTo(content),
+					t // the calendar object
+				);
+			}
+
+			if (oldView) {
+				header.deactivateButton(oldView.name);
+			}
+			header.activateButton(newViewName);
+
+			renderView(); // after height has been set, will make absoluteViewElement's position=relative, then set to null
+
+			content.css('overflow', '');
+			if (oldView) {
+				setMinHeight(content, 1);
+			}
+
+			if (!newViewElement) {
+				(currentView.afterShow || noop)(); // called after setting min-height/overflow, so in final scroll state (for Opera)
+			}
+
+			ignoreWindowResize--;
+		}
+	}
+
+
+
+	function renderView(inc) {
+		if (elementVisible()) {
+			ignoreWindowResize++; // because renderEvents might temporarily change the height before setSize is reached
+
+			unselect();
+
+			if (suggestedViewHeight === undefined) {
+				calcSize();
+			}
+
+			var forceEventRender = false;
+			if (!currentView.start || inc || date < currentView.start || date >= currentView.end) {
+				// view must render an entire new date range (and refetch/render events)
+				currentView.render(date, inc || 0); // responsible for clearing events
+				setSize(true);
+				forceEventRender = true;
+			}
+			else if (currentView.sizeDirty) {
+				// view must resize (and rerender events)
+				currentView.clearEvents();
+				setSize();
+				forceEventRender = true;
+			}
+			else if (currentView.eventsDirty) {
+				currentView.clearEvents();
+				forceEventRender = true;
+			}
+			currentView.sizeDirty = false;
+			currentView.eventsDirty = false;
+			updateEvents(forceEventRender);
+
+			elementOuterWidth = element.outerWidth();
+
+			header.updateTitle(currentView.title);
+			var today = new Date();
+			if (today >= currentView.start && today < currentView.end) {
+				header.disableButton('today');
+			}else{
+				header.enableButton('today');
+			}
+
+			ignoreWindowResize--;
+			currentView.trigger('viewDisplay', _element);
+		}
+	}
+
+
+
+	/* Resizing
+	-----------------------------------------------------------------------------*/
+
+
+	function updateSize() {
+		markSizesDirty();
+		if (elementVisible()) {
+			calcSize();
+			setSize();
+			unselect();
+			currentView.clearEvents();
+			currentView.renderEvents(events);
+			currentView.sizeDirty = false;
+		}
+	}
+
+
+	function markSizesDirty() {
+		$.each(viewInstances, function(i, inst) {
+			inst.sizeDirty = true;
+		});
+	}
+
+
+	function calcSize() {
+		if (options.contentHeight) {
+			suggestedViewHeight = options.contentHeight;
+		}
+		else if (options.height) {
+			suggestedViewHeight = options.height - (headerElement ? headerElement.height() : 0) - vsides(content);
+		}
+		else {
+			suggestedViewHeight = Math.round(content.width() / Math.max(options.aspectRatio, .5));
+		}
+	}
+
+
+	function setSize(dateChanged) { // todo: dateChanged?
+		ignoreWindowResize++;
+		currentView.setHeight(suggestedViewHeight, dateChanged);
+		if (absoluteViewElement) {
+			absoluteViewElement.css('position', 'relative');
+			absoluteViewElement = null;
+		}
+		currentView.setWidth(content.width(), dateChanged);
+		ignoreWindowResize--;
+	}
+
+
+	function windowResize() {
+		if (!ignoreWindowResize) {
+			if (currentView.start) { // view has already been rendered
+				var uid = ++resizeUID;
+				setTimeout(function() { // add a delay
+					if (uid == resizeUID && !ignoreWindowResize && elementVisible()) {
+						if (elementOuterWidth != (elementOuterWidth = element.outerWidth())) {
+							ignoreWindowResize++; // in case the windowResize callback changes the height
+							updateSize();
+							currentView.trigger('windowResize', _element);
+							ignoreWindowResize--;
+						}
+					}
+				}, 200);
+			}else{
+				// calendar must have been initialized in a 0x0 iframe that has just been resized
+				lateRender();
+			}
+		}
+	}
+
+
+
+	/* Event Fetching/Rendering
+	-----------------------------------------------------------------------------*/
+
+
+	// fetches events if necessary, rerenders events if necessary (or if forced)
+	function updateEvents(forceRender) {
+		if (!options.lazyFetching || isFetchNeeded(currentView.visStart, currentView.visEnd)) {
+			refetchEvents();
+		}
+		else if (forceRender) {
+			rerenderEvents();
+		}
+	}
+
+
+	function refetchEvents() {
+		fetchEvents(currentView.visStart, currentView.visEnd); // will call reportEvents
+	}
+
+
+	// called when event data arrives
+	function reportEvents(_events) {
+		events = _events;
+		rerenderEvents();
+	}
+
+
+	// called when a single event's data has been changed
+	function reportEventChange(eventID) {
+		rerenderEvents(eventID);
+	}
+
+
+	// attempts to rerenderEvents
+	function rerenderEvents(modifiedEventID) {
+		markEventsDirty();
+		if (elementVisible()) {
+			currentView.clearEvents();
+			currentView.renderEvents(events, modifiedEventID);
+			currentView.eventsDirty = false;
+		}
+	}
+
+
+	function markEventsDirty() {
+		$.each(viewInstances, function(i, inst) {
+			inst.eventsDirty = true;
+		});
+	}
+
+
+
+	/* Selection
+	-----------------------------------------------------------------------------*/
+
+
+	function select(start, end, allDay) {
+		currentView.select(start, end, allDay===undefined ? true : allDay);
+	}
+
+
+	function unselect() { // safe to be called before renderView
+		if (currentView) {
+			currentView.unselect();
+		}
+	}
+
+
+
+	/* Date
+	-----------------------------------------------------------------------------*/
+
+
+	function prev() {
+		renderView(-1);
+	}
+
+
+	function next() {
+		renderView(1);
+	}
+
+
+	function prevYear() {
+		addYears(date, -1);
+		renderView();
+	}
+
+
+	function nextYear() {
+		addYears(date, 1);
+		renderView();
+	}
+
+
+	function today() {
+		date = new Date();
+		renderView();
+	}
+
+
+	function gotoDate(year, month, dateOfMonth) {
+		if (year instanceof Date) {
+			date = cloneDate(year); // provided 1 argument, a Date
+		}else{
+			setYMD(date, year, month, dateOfMonth);
+		}
+		renderView();
+	}
+
+
+	function incrementDate(years, months, days) {
+		if (years !== undefined) {
+			addYears(date, years);
+		}
+		if (months !== undefined) {
+			addMonths(date, months);
+		}
+		if (days !== undefined) {
+			addDays(date, days);
+		}
+		renderView();
+	}
+
+
+	function getDate() {
+		return cloneDate(date);
+	}
+
+
+
+	/* Misc
+	-----------------------------------------------------------------------------*/
+
+
+	function getView() {
+		return currentView;
+	}
+
+
+	function option(name, value) {
+		if (value === undefined) {
+			return options[name];
+		}
+		if (name == 'height' || name == 'contentHeight' || name == 'aspectRatio') {
+			options[name] = value;
+			updateSize();
+		}
+	}
+
+
+	function trigger(name, thisObj) {
+		if (options[name]) {
+			return options[name].apply(
+				thisObj || _element,
+				Array.prototype.slice.call(arguments, 2)
+			);
+		}
+	}
+
+
+
+	/* External Dragging
+	------------------------------------------------------------------------*/
+
+	if (options.droppable) {
+		$(document)
+			.bind('dragstart', function(ev, ui) {
+				var _e = ev.target;
+				var e = $(_e);
+				if (!e.parents('.fc').length) { // not already inside a calendar
+					var accept = options.dropAccept;
+					if ($.isFunction(accept) ? accept.call(_e, e) : e.is(accept)) {
+						_dragElement = _e;
+						currentView.dragStart(_dragElement, ev, ui);
+					}
+				}
+			})
+			.bind('dragstop', function(ev, ui) {
+				if (_dragElement) {
+					currentView.dragStop(_dragElement, ev, ui);
+					_dragElement = null;
+				}
+			});
+	}
+
+
+}
+
+function Header(calendar, options) {
+	var t = this;
+
+
+	// exports
+	t.render = render;
+	t.destroy = destroy;
+	t.updateTitle = updateTitle;
+	t.activateButton = activateButton;
+	t.deactivateButton = deactivateButton;
+	t.disableButton = disableButton;
+	t.enableButton = enableButton;
+
+
+	// locals
+	var element = $([]);
+	var tm;
+
+
+
+	function render() {
+		tm = options.theme ? 'ui' : 'fc';
+		var sections = options.header;
+		if (sections) {
+			element = $("<table class='fc-header' style='width:100%'/>")
+				.append(
+					$("<tr/>")
+						.append(renderSection('left'))
+						.append(renderSection('center'))
+						.append(renderSection('right'))
+				);
+			return element;
+		}
+	}
+
+
+	function destroy() {
+		element.remove();
+	}
+
+
+	function renderSection(position) {
+		var e = $("<td class='fc-header-" + position + "'/>");
+		var buttonStr = options.header[position];
+		if (buttonStr) {
+			$.each(buttonStr.split(' '), function(i) {
+				if (i > 0) {
+					e.append("<span class='fc-header-space'/>");
+				}
+				var prevButton;
+				$.each(this.split(','), function(j, buttonName) {
+					if (buttonName == 'title') {
+						e.append("<span class='fc-header-title'><h2>&nbsp;</h2></span>");
+						if (prevButton) {
+							prevButton.addClass(tm + '-corner-right');
+						}
+						prevButton = null;
+					}else{
+						var buttonClick;
+						if (calendar[buttonName]) {
+							buttonClick = calendar[buttonName]; // calendar method
+						}
+						else if (fcViews[buttonName]) {
+							buttonClick = function() {
+								button.removeClass(tm + '-state-hover'); // forget why
+								calendar.changeView(buttonName);
+							};
+						}
+						if (buttonClick) {
+							var icon = options.theme ? smartProperty(options.buttonIcons, buttonName) : null; // why are we using smartProperty here?
+							var text = smartProperty(options.buttonText, buttonName); // why are we using smartProperty here?
+							var button = $(
+								"<span class='fc-button fc-button-" + buttonName + " " + tm + "-state-default'>" +
+									"<span class='fc-button-inner'>" +
+										"<span class='fc-button-content'>" +
+											(icon ?
+												"<span class='fc-icon-wrap'>" +
+													"<span class='ui-icon ui-icon-" + icon + "'/>" +
+												"</span>" :
+												text
+												) +
+										"</span>" +
+										"<span class='fc-button-effect'><span></span></span>" +
+									"</span>" +
+								"</span>"
+							);
+							if (button) {
+								button
+									.click(function() {
+										if (!button.hasClass(tm + '-state-disabled')) {
+											buttonClick();
+										}
+									})
+									.mousedown(function() {
+										button
+											.not('.' + tm + '-state-active')
+											.not('.' + tm + '-state-disabled')
+											.addClass(tm + '-state-down');
+									})
+									.mouseup(function() {
+										button.removeClass(tm + '-state-down');
+									})
+									.hover(
+										function() {
+											button
+												.not('.' + tm + '-state-active')
+												.not('.' + tm + '-state-disabled')
+												.addClass(tm + '-state-hover');
+										},
+										function() {
+											button
+												.removeClass(tm + '-state-hover')
+												.removeClass(tm + '-state-down');
+										}
+									)
+									.appendTo(e);
+								if (!prevButton) {
+									button.addClass(tm + '-corner-left');
+								}
+								prevButton = button;
+							}
+						}
+					}
+				});
+				if (prevButton) {
+					prevButton.addClass(tm + '-corner-right');
+				}
+			});
+		}
+		return e;
+	}
+
+
+	function updateTitle(html) {
+		element.find('h2')
+			.html(html);
+	}
+
+
+	function activateButton(buttonName) {
+		element.find('span.fc-button-' + buttonName)
+			.addClass(tm + '-state-active');
+	}
+
+
+	function deactivateButton(buttonName) {
+		element.find('span.fc-button-' + buttonName)
+			.removeClass(tm + '-state-active');
+	}
+
+
+	function disableButton(buttonName) {
+		element.find('span.fc-button-' + buttonName)
+			.addClass(tm + '-state-disabled');
+	}
+
+
+	function enableButton(buttonName) {
+		element.find('span.fc-button-' + buttonName)
+			.removeClass(tm + '-state-disabled');
+	}
+
+
+}
+
+fc.sourceNormalizers = [];
+fc.sourceFetchers = [];
+
+var ajaxDefaults = {
+	dataType: 'json',
+	cache: false
+};
+
+var eventGUID = 1;
+
+
+function EventManager(options, _sources) {
+	var t = this;
+
+
+	// exports
+	t.isFetchNeeded = isFetchNeeded;
+	t.fetchEvents = fetchEvents;
+	t.addEventSource = addEventSource;
+	t.removeEventSource = removeEventSource;
+	t.updateEvent = updateEvent;
+	t.renderEvent = renderEvent;
+	t.removeEvents = removeEvents;
+	t.clientEvents = clientEvents;
+	t.normalizeEvent = normalizeEvent;
+
+
+	// imports
+	var trigger = t.trigger;
+	var getView = t.getView;
+	var reportEvents = t.reportEvents;
+
+
+	// locals
+	var stickySource = { events: [] };
+	var sources = [ stickySource ];
+	var rangeStart, rangeEnd;
+	var currentFetchID = 0;
+	var pendingSourceCnt = 0;
+	var loadingLevel = 0;
+	var cache = [];
+
+
+	for (var i=0; i<_sources.length; i++) {
+		_addEventSource(_sources[i]);
+	}
+
+
+
+	/* Fetching
+	-----------------------------------------------------------------------------*/
+
+
+	function isFetchNeeded(start, end) {
+		return !rangeStart || start < rangeStart || end > rangeEnd;
+	}
+
+
+	function fetchEvents(start, end) {
+		rangeStart = start;
+		rangeEnd = end;
+		cache = [];
+		var fetchID = ++currentFetchID;
+		var len = sources.length;
+		pendingSourceCnt = len;
+		for (var i=0; i<len; i++) {
+			fetchEventSource(sources[i], fetchID);
+		}
+	}
+
+
+	function fetchEventSource(source, fetchID) {
+		_fetchEventSource(source, function(events) {
+			if (fetchID == currentFetchID) {
+				if (events) {
+					for (var i=0; i<events.length; i++) {
+						events[i].source = source;
+						normalizeEvent(events[i]);
+					}
+					cache = cache.concat(events);
+				}
+				pendingSourceCnt--;
+				if (!pendingSourceCnt) {
+					reportEvents(cache);
+				}
+			}
+		});
+	}
+
+
+	function _fetchEventSource(source, callback) {
+		var i;
+		var fetchers = fc.sourceFetchers;
+		var res;
+		for (i=0; i<fetchers.length; i++) {
+			res = fetchers[i](source, rangeStart, rangeEnd, callback);
+			if (res === true) {
+				// the fetcher is in charge. made its own async request
+				return;
+			}
+			else if (typeof res == 'object') {
+				// the fetcher returned a new source. process it
+				_fetchEventSource(res, callback);
+				return;
+			}
+		}
+		var events = source.events;
+		if (events) {
+			if ($.isFunction(events)) {
+				pushLoading();
+				events(cloneDate(rangeStart), cloneDate(rangeEnd), function(events) {
+					callback(events);
+					popLoading();
+				});
+			}
+			else if ($.isArray(events)) {
+				callback(events);
+			}
+			else {
+				callback();
+			}
+		}else{
+			var url = source.url;
+			if (url) {
+				var success = source.success;
+				var error = source.error;
+				var complete = source.complete;
+				var data = $.extend({}, source.data || {});
+				var startParam = firstDefined(source.startParam, options.startParam);
+				var endParam = firstDefined(source.endParam, options.endParam);
+				if (startParam) {
+					data[startParam] = Math.round(+rangeStart / 1000);
+				}
+				if (endParam) {
+					data[endParam] = Math.round(+rangeEnd / 1000);
+				}
+				pushLoading();
+				$.ajax($.extend({}, ajaxDefaults, source, {
+					data: data,
+					success: function(events) {
+						events = events || [];
+						var res = applyAll(success, this, arguments);
+						if ($.isArray(res)) {
+							events = res;
+						}
+						callback(events);
+					},
+					error: function() {
+						applyAll(error, this, arguments);
+						callback();
+					},
+					complete: function() {
+						applyAll(complete, this, arguments);
+						popLoading();
+					}
+				}));
+			}else{
+				callback();
+			}
+		}
+	}
+
+
+
+	/* Sources
+	-----------------------------------------------------------------------------*/
+
+
+	function addEventSource(source) {
+		source = _addEventSource(source);
+		if (source) {
+			pendingSourceCnt++;
+			fetchEventSource(source, currentFetchID); // will eventually call reportEvents
+		}
+	}
+
+
+	function _addEventSource(source) {
+		if ($.isFunction(source) || $.isArray(source)) {
+			source = { events: source };
+		}
+		else if (typeof source == 'string') {
+			source = { url: source };
+		}
+		if (typeof source == 'object') {
+			normalizeSource(source);
+			sources.push(source);
+			return source;
+		}
+	}
+
+
+	function removeEventSource(source) {
+		sources = $.grep(sources, function(src) {
+			return !isSourcesEqual(src, source);
+		});
+		// remove all client events from that source
+		cache = $.grep(cache, function(e) {
+			return !isSourcesEqual(e.source, source);
+		});
+		reportEvents(cache);
+	}
+
+
+
+	/* Manipulation
+	-----------------------------------------------------------------------------*/
+
+
+	function updateEvent(event) { // update an existing event
+		var i, len = cache.length, e,
+			defaultEventEnd = getView().defaultEventEnd, // getView???
+			startDelta = event.start - event._start,
+			endDelta = event.end ?
+				(event.end - (event._end || defaultEventEnd(event))) // event._end would be null if event.end
+				: 0;                                                      // was null and event was just resized
+		for (i=0; i<len; i++) {
+			e = cache[i];
+			if (e._id == event._id && e != event) {
+				e.start = new Date(+e.start + startDelta);
+				if (event.end) {
+					if (e.end) {
+						e.end = new Date(+e.end + endDelta);
+					}else{
+						e.end = new Date(+defaultEventEnd(e) + endDelta);
+					}
+				}else{
+					e.end = null;
+				}
+				e.title = event.title;
+				e.url = event.url;
+				e.allDay = event.allDay;
+				e.className = event.className;
+				e.editable = event.editable;
+				e.color = event.color;
+				e.backgroudColor = event.backgroudColor;
+				e.borderColor = event.borderColor;
+				e.textColor = event.textColor;
+				normalizeEvent(e);
+			}
+		}
+		normalizeEvent(event);
+		reportEvents(cache);
+	}
+
+
+	function renderEvent(event, stick) {
+		normalizeEvent(event);
+		if (!event.source) {
+			if (stick) {
+				stickySource.events.push(event);
+				event.source = stickySource;
+			}
+			cache.push(event);
+		}
+		reportEvents(cache);
+	}
+
+
+	function removeEvents(filter) {
+		if (!filter) { // remove all
+			cache = [];
+			// clear all array sources
+			for (var i=0; i<sources.length; i++) {
+				if ($.isArray(sources[i].events)) {
+					sources[i].events = [];
+				}
+			}
+		}else{
+			if (!$.isFunction(filter)) { // an event ID
+				var id = filter + '';
+				filter = function(e) {
+					return e._id == id;
+				};
+			}
+			cache = $.grep(cache, filter, true);
+			// remove events from array sources
+			for (var i=0; i<sources.length; i++) {
+				if ($.isArray(sources[i].events)) {
+					sources[i].events = $.grep(sources[i].events, filter, true);
+				}
+			}
+		}
+		reportEvents(cache);
+	}
+
+
+	function clientEvents(filter) {
+		if ($.isFunction(filter)) {
+			return $.grep(cache, filter);
+		}
+		else if (filter) { // an event ID
+			filter += '';
+			return $.grep(cache, function(e) {
+				return e._id == filter;
+			});
+		}
+		return cache; // else, return all
+	}
+
+
+
+	/* Loading State
+	-----------------------------------------------------------------------------*/
+
+
+	function pushLoading() {
+		if (!loadingLevel++) {
+			trigger('loading', null, true);
+		}
+	}
+
+
+	function popLoading() {
+		if (!--loadingLevel) {
+			trigger('loading', null, false);
+		}
+	}
+
+
+
+	/* Event Normalization
+	-----------------------------------------------------------------------------*/
+
+
+	function normalizeEvent(event) {
+		var source = event.source || {};
+		var ignoreTimezone = firstDefined(source.ignoreTimezone, options.ignoreTimezone);
+		event._id = event._id || (event.id === undefined ? '_fc' + eventGUID++ : event.id + '');
+		if (event.date) {
+			if (!event.start) {
+				event.start = event.date;
+			}
+			delete event.date;
+		}
+		event._start = cloneDate(event.start = parseDate(event.start, ignoreTimezone));
+		event.end = parseDate(event.end, ignoreTimezone);
+		if (event.end && event.end <= event.start) {
+			event.end = null;
+		}
+		event._end = event.end ? cloneDate(event.end) : null;
+		if (event.allDay === undefined) {
+			event.allDay = firstDefined(source.allDayDefault, options.allDayDefault);
+		}
+		if (event.className) {
+			if (typeof event.className == 'string') {
+				event.className = event.className.split(/\s+/);
+			}
+		}else{
+			event.className = [];
+		}
+		// TODO: if there is no start date, return false to indicate an invalid event
+	}
+
+
+
+	/* Utils
+	------------------------------------------------------------------------------*/
+
+
+	function normalizeSource(source) {
+		if (source.className) {
+			// TODO: repeat code, same code for event classNames
+			if (typeof source.className == 'string') {
+				source.className = source.className.split(/\s+/);
+			}
+		}else{
+			source.className = [];
+		}
+		var normalizers = fc.sourceNormalizers;
+		for (var i=0; i<normalizers.length; i++) {
+			normalizers[i](source);
+		}
+	}
+
+
+	function isSourcesEqual(source1, source2) {
+		return source1 && source2 && getSourcePrimitive(source1) == getSourcePrimitive(source2);
+	}
+
+
+	function getSourcePrimitive(source) {
+		return ((typeof source == 'object') ? (source.events || source.url) : '') || source;
+	}
+
+
+}
+
+
+fc.addDays = addDays;
+fc.cloneDate = cloneDate;
+fc.parseDate = parseDate;
+fc.parseISO8601 = parseISO8601;
+fc.parseTime = parseTime;
+fc.formatDate = formatDate;
+fc.formatDates = formatDates;
+
+
+
+/* Date Math
+-----------------------------------------------------------------------------*/
+
+var dayIDs = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'],
+	DAY_MS = 86400000,
+	HOUR_MS = 3600000,
+	MINUTE_MS = 60000;
+
+
+function addYears(d, n, keepTime) {
+	d.setFullYear(d.getFullYear() + n);
+	if (!keepTime) {
+		clearTime(d);
+	}
+	return d;
+}
+
+
+function addMonths(d, n, keepTime) { // prevents day overflow/underflow
+	if (+d) { // prevent infinite looping on invalid dates
+		var m = d.getMonth() + n,
+			check = cloneDate(d);
+		check.setDate(1);
+		check.setMonth(m);
+		d.setMonth(m);
+		if (!keepTime) {
+			clearTime(d);
+		}
+		while (d.getMonth() != check.getMonth()) {
+			d.setDate(d.getDate() + (d < check ? 1 : -1));
+		}
+	}
+	return d;
+}
+
+
+function addDays(d, n, keepTime) { // deals with daylight savings
+	if (+d) {
+		var dd = d.getDate() + n,
+			check = cloneDate(d);
+		check.setHours(9); // set to middle of day
+		check.setDate(dd);
+		d.setDate(dd);
+		if (!keepTime) {
+			clearTime(d);
+		}
+		fixDate(d, check);
+	}
+	return d;
+}
+
+
+function fixDate(d, check) { // force d to be on check's YMD, for daylight savings purposes
+	if (+d) { // prevent infinite looping on invalid dates
+		while (d.getDate() != check.getDate()) {
+			d.setTime(+d + (d < check ? 1 : -1) * HOUR_MS);
+		}
+	}
+}
+
+
+function addMinutes(d, n) {
+	d.setMinutes(d.getMinutes() + n);
+	return d;
+}
+
+
+function clearTime(d) {
+	d.setHours(0);
+	d.setMinutes(0);
+	d.setSeconds(0);
+	d.setMilliseconds(0);
+	return d;
+}
+
+
+function cloneDate(d, dontKeepTime) {
+	if (dontKeepTime) {
+		return clearTime(new Date(+d));
+	}
+	return new Date(+d);
+}
+
+
+function zeroDate() { // returns a Date with time 00:00:00 and dateOfMonth=1
+	var i=0, d;
+	do {
+		d = new Date(1970, i++, 1);
+	} while (d.getHours()); // != 0
+	return d;
+}
+
+
+function skipWeekend(date, inc, excl) {
+	inc = inc || 1;
+	while (!date.getDay() || (excl && date.getDay()==1 || !excl && date.getDay()==6)) {
+		addDays(date, inc);
+	}
+	return date;
+}
+
+
+function dayDiff(d1, d2) { // d1 - d2
+	return Math.round((cloneDate(d1, true) - cloneDate(d2, true)) / DAY_MS);
+}
+
+
+function setYMD(date, y, m, d) {
+	if (y !== undefined && y != date.getFullYear()) {
+		date.setDate(1);
+		date.setMonth(0);
+		date.setFullYear(y);
+	}
+	if (m !== undefined && m != date.getMonth()) {
+		date.setDate(1);
+		date.setMonth(m);
+	}
+	if (d !== undefined) {
+		date.setDate(d);
+	}
+}
+
+
+
+/* Date Parsing
+-----------------------------------------------------------------------------*/
+
+
+function parseDate(s, ignoreTimezone) { // ignoreTimezone defaults to true
+	if (typeof s == 'object') { // already a Date object
+		return s;
+	}
+	if (typeof s == 'number') { // a UNIX timestamp
+		return new Date(s * 1000);
+	}
+	if (typeof s == 'string') {
+		if (s.match(/^\d+(\.\d+)?$/)) { // a UNIX timestamp
+			return new Date(parseFloat(s) * 1000);
+		}
+		if (ignoreTimezone === undefined) {
+			ignoreTimezone = true;
+		}
+		return parseISO8601(s, ignoreTimezone) || (s ? new Date(s) : null);
+	}
+	// TODO: never return invalid dates (like from new Date(<string>)), return null instead
+	return null;
+}
+
+
+function parseISO8601(s, ignoreTimezone) { // ignoreTimezone defaults to false
+	// derived from http://delete.me.uk/2005/03/iso8601.html
+	// TODO: for a know glitch/feature, read tests/issue_206_parseDate_dst.html
+	var m = s.match(/^([0-9]{4})(-([0-9]{2})(-([0-9]{2})([T ]([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?(Z|(([-+])([0-9]{2})(:?([0-9]{2}))?))?)?)?)?$/);
+	if (!m) {
+		return null;
+	}
+	var date = new Date(m[1], 0, 1);
+	if (ignoreTimezone || !m[13]) {
+		var check = new Date(m[1], 0, 1, 9, 0);
+		if (m[3]) {
+			date.setMonth(m[3] - 1);
+			check.setMonth(m[3] - 1);
+		}
+		if (m[5]) {
+			date.setDate(m[5]);
+			check.setDate(m[5]);
+		}
+		fixDate(date, check);
+		if (m[7]) {
+			date.setHours(m[7]);
+		}
+		if (m[8]) {
+			date.setMinutes(m[8]);
+		}
+		if (m[10]) {
+			date.setSeconds(m[10]);
+		}
+		if (m[12]) {
+			date.setMilliseconds(Number("0." + m[12]) * 1000);
+		}
+		fixDate(date, check);
+	}else{
+		date.setUTCFullYear(
+			m[1],
+			m[3] ? m[3] - 1 : 0,
+			m[5] || 1
+		);
+		date.setUTCHours(
+			m[7] || 0,
+			m[8] || 0,
+			m[10] || 0,
+			m[12] ? Number("0." + m[12]) * 1000 : 0
+		);
+		if (m[14]) {
+			var offset = Number(m[16]) * 60 + (m[18] ? Number(m[18]) : 0);
+			offset *= m[15] == '-' ? 1 : -1;
+			date = new Date(+date + (offset * 60 * 1000));
+		}
+	}
+	return date;
+}
+
+
+function parseTime(s) { // returns minutes since start of day
+	if (typeof s == 'number') { // an hour
+		return s * 60;
+	}
+	if (typeof s == 'object') { // a Date object
+		return s.getHours() * 60 + s.getMinutes();
+	}
+	var m = s.match(/(\d+)(?::(\d+))?\s*(\w+)?/);
+	if (m) {
+		var h = parseInt(m[1], 10);
+		if (m[3]) {
+			h %= 12;
+			if (m[3].toLowerCase().charAt(0) == 'p') {
+				h += 12;
+			}
+		}
+		return h * 60 + (m[2] ? parseInt(m[2], 10) : 0);
+	}
+}
+
+
+
+/* Date Formatting
+-----------------------------------------------------------------------------*/
+// TODO: use same function formatDate(date, [date2], format, [options])
+
+
+function formatDate(date, format, options) {
+	return formatDates(date, null, format, options);
+}
+
+
+function formatDates(date1, date2, format, options) {
+	options = options || defaults;
+	var date = date1,
+		otherDate = date2,
+		i, len = format.length, c,
+		i2, formatter,
+		res = '';
+	for (i=0; i<len; i++) {
+		c = format.charAt(i);
+		if (c == "'") {
+			for (i2=i+1; i2<len; i2++) {
+				if (format.charAt(i2) == "'") {
+					if (date) {
+						if (i2 == i+1) {
+							res += "'";
+						}else{
+							res += format.substring(i+1, i2);
+						}
+						i = i2;
+					}
+					break;
+				}
+			}
+		}
+		else if (c == '(') {
+			for (i2=i+1; i2<len; i2++) {
+				if (format.charAt(i2) == ')') {
+					var subres = formatDate(date, format.substring(i+1, i2), options);
+					if (parseInt(subres.replace(/\D/, ''), 10)) {
+						res += subres;
+					}
+					i = i2;
+					break;
+				}
+			}
+		}
+		else if (c == '[') {
+			for (i2=i+1; i2<len; i2++) {
+				if (format.charAt(i2) == ']') {
+					var subformat = format.substring(i+1, i2);
+					var subres = formatDate(date, subformat, options);
+					if (subres != formatDate(otherDate, subformat, options)) {
+						res += subres;
+					}
+					i = i2;
+					break;
+				}
+			}
+		}
+		else if (c == '{') {
+			date = date2;
+			otherDate = date1;
+		}
+		else if (c == '}') {
+			date = date1;
+			otherDate = date2;
+		}
+		else {
+			for (i2=len; i2>i; i2--) {
+				if (formatter = dateFormatters[format.substring(i, i2)]) {
+					if (date) {
+						res += formatter(date, options);
+					}
+					i = i2 - 1;
+					break;
+				}
+			}
+			if (i2 == i) {
+				if (date) {
+					res += c;
+				}
+			}
+		}
+	}
+	return res;
+};
+
+
+var dateFormatters = {
+	s	: function(d)	{ return d.getSeconds() },
+	ss	: function(d)	{ return zeroPad(d.getSeconds()) },
+	m	: function(d)	{ return d.getMinutes() },
+	mm	: function(d)	{ return zeroPad(d.getMinutes()) },
+	h	: function(d)	{ return d.getHours() % 12 || 12 },
+	hh	: function(d)	{ return zeroPad(d.getHours() % 12 || 12) },
+	H	: function(d)	{ return d.getHours() },
+	HH	: function(d)	{ return zeroPad(d.getHours()) },
+	d	: function(d)	{ return d.getDate() },
+	dd	: function(d)	{ return zeroPad(d.getDate()) },
+	ddd	: function(d,o)	{ return o.dayNamesShort[d.getDay()] },
+	dddd: function(d,o)	{ return o.dayNames[d.getDay()] },
+	M	: function(d)	{ return d.getMonth() + 1 },
+	MM	: function(d)	{ return zeroPad(d.getMonth() + 1) },
+	MMM	: function(d,o)	{ return o.monthNamesShort[d.getMonth()] },
+	MMMM: function(d,o)	{ return o.monthNames[d.getMonth()] },
+	yy	: function(d)	{ return (d.getFullYear()+'').substring(2) },
+	yyyy: function(d)	{ return d.getFullYear() },
+	t	: function(d)	{ return d.getHours() < 12 ? 'a' : 'p' },
+	tt	: function(d)	{ return d.getHours() < 12 ? 'am' : 'pm' },
+	T	: function(d)	{ return d.getHours() < 12 ? 'A' : 'P' },
+	TT	: function(d)	{ return d.getHours() < 12 ? 'AM' : 'PM' },
+	u	: function(d)	{ return formatDate(d, "yyyy-MM-dd'T'HH:mm:ss'Z'") },
+	S	: function(d)	{
+		var date = d.getDate();
+		if (date > 10 && date < 20) {
+			return 'th';
+		}
+		return ['st', 'nd', 'rd'][date%10-1] || 'th';
+	}
+};
+
+
+
+fc.applyAll = applyAll;
+
+
+/* Event Date Math
+-----------------------------------------------------------------------------*/
+
+
+function exclEndDay(event) {
+	if (event.end) {
+		return _exclEndDay(event.end, event.allDay);
+	}else{
+		return addDays(cloneDate(event.start), 1);
+	}
+}
+
+
+function _exclEndDay(end, allDay) {
+	end = cloneDate(end);
+	return allDay || end.getHours() || end.getMinutes() ? addDays(end, 1) : clearTime(end);
+}
+
+
+function segCmp(a, b) {
+	return (b.msLength - a.msLength) * 100 + (a.event.start - b.event.start);
+}
+
+
+function segsCollide(seg1, seg2) {
+	return seg1.end > seg2.start && seg1.start < seg2.end;
+}
+
+
+
+/* Event Sorting
+-----------------------------------------------------------------------------*/
+
+
+// event rendering utilities
+function sliceSegs(events, visEventEnds, start, end) {
+	var segs = [],
+		i, len=events.length, event,
+		eventStart, eventEnd,
+		segStart, segEnd,
+		isStart, isEnd;
+	for (i=0; i<len; i++) {
+		event = events[i];
+		eventStart = event.start;
+		eventEnd = visEventEnds[i];
+		if (eventEnd > start && eventStart < end) {
+			if (eventStart < start) {
+				segStart = cloneDate(start);
+				isStart = false;
+			}else{
+				segStart = eventStart;
+				isStart = true;
+			}
+			if (eventEnd > end) {
+				segEnd = cloneDate(end);
+				isEnd = false;
+			}else{
+				segEnd = eventEnd;
+				isEnd = true;
+			}
+			segs.push({
+				event: event,
+				start: segStart,
+				end: segEnd,
+				isStart: isStart,
+				isEnd: isEnd,
+				msLength: segEnd - segStart
+			});
+		}
+	}
+	return segs.sort(segCmp);
+}
+
+
+// event rendering calculation utilities
+function stackSegs(segs) {
+	var levels = [],
+		i, len = segs.length, seg,
+		j, collide, k;
+	for (i=0; i<len; i++) {
+		seg = segs[i];
+		j = 0; // the level index where seg should belong
+		while (true) {
+			collide = false;
+			if (levels[j]) {
+				for (k=0; k<levels[j].length; k++) {
+					if (segsCollide(levels[j][k], seg)) {
+						collide = true;
+						break;
+					}
+				}
+			}
+			if (collide) {
+				j++;
+			}else{
+				break;
+			}
+		}
+		if (levels[j]) {
+			levels[j].push(seg);
+		}else{
+			levels[j] = [seg];
+		}
+	}
+	return levels;
+}
+
+
+
+/* Event Element Binding
+-----------------------------------------------------------------------------*/
+
+
+function lazySegBind(container, segs, bindHandlers) {
+	container.unbind('mouseover').mouseover(function(ev) {
+		var parent=ev.target, e,
+			i, seg;
+		while (parent != this) {
+			e = parent;
+			parent = parent.parentNode;
+		}
+		if ((i = e._fci) !== undefined) {
+			e._fci = undefined;
+			seg = segs[i];
+			bindHandlers(seg.event, seg.element, seg);
+			$(ev.target).trigger(ev);
+		}
+		ev.stopPropagation();
+	});
+}
+
+
+
+/* Element Dimensions
+-----------------------------------------------------------------------------*/
+
+
+function setOuterWidth(element, width, includeMargins) {
+	for (var i=0, e; i<element.length; i++) {
+		e = $(element[i]);
+		e.width(Math.max(0, width - hsides(e, includeMargins)));
+	}
+}
+
+
+function setOuterHeight(element, height, includeMargins) {
+	for (var i=0, e; i<element.length; i++) {
+		e = $(element[i]);
+		e.height(Math.max(0, height - vsides(e, includeMargins)));
+	}
+}
+
+
+// TODO: curCSS has been deprecated (jQuery 1.4.3 - 10/16/2010)
+
+
+function hsides(element, includeMargins) {
+	return hpadding(element) + hborders(element) + (includeMargins ? hmargins(element) : 0);
+}
+
+
+function hpadding(element) {
+	return (parseFloat($.curCSS(element[0], 'paddingLeft', true)) || 0) +
+	       (parseFloat($.curCSS(element[0], 'paddingRight', true)) || 0);
+}
+
+
+function hmargins(element) {
+	return (parseFloat($.curCSS(element[0], 'marginLeft', true)) || 0) +
+	       (parseFloat($.curCSS(element[0], 'marginRight', true)) || 0);
+}
+
+
+function hborders(element) {
+	return (parseFloat($.curCSS(element[0], 'borderLeftWidth', true)) || 0) +
+	       (parseFloat($.curCSS(element[0], 'borderRightWidth', true)) || 0);
+}
+
+
+function vsides(element, includeMargins) {
+	return vpadding(element) +  vborders(element) + (includeMargins ? vmargins(element) : 0);
+}
+
+
+function vpadding(element) {
+	return (parseFloat($.curCSS(element[0], 'paddingTop', true)) || 0) +
+	       (parseFloat($.curCSS(element[0], 'paddingBottom', true)) || 0);
+}
+
+
+function vmargins(element) {
+	return (parseFloat($.curCSS(element[0], 'marginTop', true)) || 0) +
+	       (parseFloat($.curCSS(element[0], 'marginBottom', true)) || 0);
+}
+
+
+function vborders(element) {
+	return (parseFloat($.curCSS(element[0], 'borderTopWidth', true)) || 0) +
+	       (parseFloat($.curCSS(element[0], 'borderBottomWidth', true)) || 0);
+}
+
+
+function setMinHeight(element, height) {
+	height = (typeof height == 'number' ? height + 'px' : height);
+	element.each(function(i, _element) {
+		_element.style.cssText += ';min-height:' + height + ';_height:' + height;
+		// why can't we just use .css() ? i forget
+	});
+}
+
+
+
+/* Misc Utils
+-----------------------------------------------------------------------------*/
+
+
+//TODO: arraySlice
+//TODO: isFunction, grep ?
+
+
+function noop() { }
+
+
+function cmp(a, b) {
+	return a - b;
+}
+
+
+function arrayMax(a) {
+	return Math.max.apply(Math, a);
+}
+
+
+function zeroPad(n) {
+	return (n < 10 ? '0' : '') + n;
+}
+
+
+function smartProperty(obj, name) { // get a camel-cased/namespaced property of an object
+	if (obj[name] !== undefined) {
+		return obj[name];
+	}
+	var parts = name.split(/(?=[A-Z])/),
+		i=parts.length-1, res;
+	for (; i>=0; i--) {
+		res = obj[parts[i].toLowerCase()];
+		if (res !== undefined) {
+			return res;
+		}
+	}
+	return obj[''];
+}
+
+
+function htmlEscape(s) {
+	return s.replace(/&/g, '&amp;')
+		.replace(/</g, '&lt;')
+		.replace(/>/g, '&gt;')
+		.replace(/'/g, '&#039;')
+		.replace(/"/g, '&quot;')
+		.replace(/\n/g, '<br />');
+}
+
+
+function cssKey(_element) {
+	return _element.id + '/' + _element.className + '/' + _element.style.cssText.replace(/(^|;)\s*(top|left|width|height)\s*:[^;]*/ig, '');
+}
+
+
+function disableTextSelection(element) {
+	element
+		.attr('unselectable', 'on')
+		.css('MozUserSelect', 'none')
+		.bind('selectstart.ui', function() { return false; });
+}
+
+
+/*
+function enableTextSelection(element) {
+	element
+		.attr('unselectable', 'off')
+		.css('MozUserSelect', '')
+		.unbind('selectstart.ui');
+}
+*/
+
+
+function markFirstLast(e) {
+	e.children()
+		.removeClass('fc-first fc-last')
+		.filter(':first-child')
+			.addClass('fc-first')
+		.end()
+		.filter(':last-child')
+			.addClass('fc-last');
+}
+
+
+function setDayID(cell, date) {
+	cell.each(function(i, _cell) {
+		_cell.className = _cell.className.replace(/^fc-\w*/, 'fc-' + dayIDs[date.getDay()]);
+		// TODO: make a way that doesn't rely on order of classes
+	});
+}
+
+
+function getSkinCss(event, opt) {
+	var source = event.source || {};
+	var eventColor = event.color;
+	var sourceColor = source.color;
+	var optionColor = opt('eventColor');
+	var backgroundColor =
+		event.backgroundColor ||
+		eventColor ||
+		source.backgroundColor ||
+		sourceColor ||
+		opt('eventBackgroundColor') ||
+		optionColor;
+	var borderColor =
+		event.borderColor ||
+		eventColor ||
+		source.borderColor ||
+		sourceColor ||
+		opt('eventBorderColor') ||
+		optionColor;
+	var textColor =
+		event.textColor ||
+		source.textColor ||
+		opt('eventTextColor');
+	var statements = [];
+	if (backgroundColor) {
+		statements.push('background-color:' + backgroundColor);
+	}
+	if (borderColor) {
+		statements.push('border-color:' + borderColor);
+	}
+	if (textColor) {
+		statements.push('color:' + textColor);
+	}
+	return statements.join(';');
+}
+
+
+function applyAll(functions, thisObj, args) {
+	if ($.isFunction(functions)) {
+		functions = [ functions ];
+	}
+	if (functions) {
+		var i;
+		var ret;
+		for (i=0; i<functions.length; i++) {
+			ret = functions[i].apply(thisObj, args) || ret;
+		}
+		return ret;
+	}
+}
+
+
+function firstDefined() {
+	for (var i=0; i<arguments.length; i++) {
+		if (arguments[i] !== undefined) {
+			return arguments[i];
+		}
+	}
+}
+
+
+
+fcViews.month = MonthView;
+
+function MonthView(element, calendar) {
+	var t = this;
+
+
+	// exports
+	t.render = render;
+
+
+	// imports
+	BasicView.call(t, element, calendar, 'month');
+	var opt = t.opt;
+	var renderBasic = t.renderBasic;
+	var formatDate = calendar.formatDate;
+
+
+
+	function render(date, delta) {
+		if (delta) {
+			addMonths(date, delta);
+			date.setDate(1);
+		}
+		var start = cloneDate(date, true);
+		start.setDate(1);
+		var end = addMonths(cloneDate(start), 1);
+		var visStart = cloneDate(start);
+		var visEnd = cloneDate(end);
+		var firstDay = opt('firstDay');
+		var nwe = opt('weekends') ? 0 : 1;
+		if (nwe) {
+			skipWeekend(visStart);
+			skipWeekend(visEnd, -1, true);
+		}
+		addDays(visStart, -((visStart.getDay() - Math.max(firstDay, nwe) + 7) % 7));
+		addDays(visEnd, (7 - visEnd.getDay() + Math.max(firstDay, nwe)) % 7);
+		var rowCnt = Math.round((visEnd - visStart) / (DAY_MS * 7));
+		if (opt('weekMode') == 'fixed') {
+			addDays(visEnd, (6 - rowCnt) * 7);
+			rowCnt = 6;
+		}
+		t.title = formatDate(start, opt('titleFormat'));
+		t.start = start;
+		t.end = end;
+		t.visStart = visStart;
+		t.visEnd = visEnd;
+		renderBasic(6, rowCnt, nwe ? 5 : 7, true);
+	}
+
+
+}
+
+fcViews.basicWeek = BasicWeekView;
+
+function BasicWeekView(element, calendar) {
+	var t = this;
+
+
+	// exports
+	t.render = render;
+
+
+	// imports
+	BasicView.call(t, element, calendar, 'basicWeek');
+	var opt = t.opt;
+	var renderBasic = t.renderBasic;
+	var formatDates = calendar.formatDates;
+
+
+
+	function render(date, delta) {
+		if (delta) {
+			addDays(date, delta * 7);
+		}
+		var start = addDays(cloneDate(date), -((date.getDay() - opt('firstDay') + 7) % 7));
+		var end = addDays(cloneDate(start), 7);
+		var visStart = cloneDate(start);
+		var visEnd = cloneDate(end);
+		var weekends = opt('weekends');
+		if (!weekends) {
+			skipWeekend(visStart);
+			skipWeekend(visEnd, -1, true);
+		}
+		t.title = formatDates(
+			visStart,
+			addDays(cloneDate(visEnd), -1),
+			opt('titleFormat')
+		);
+		t.start = start;
+		t.end = end;
+		t.visStart = visStart;
+		t.visEnd = visEnd;
+		renderBasic(1, 1, weekends ? 7 : 5, false);
+	}
+
+
+}
+
+fcViews.basicDay = BasicDayView;
+
+//TODO: when calendar's date starts out on a weekend, shouldn't happen
+
+
+function BasicDayView(element, calendar) {
+	var t = this;
+
+
+	// exports
+	t.render = render;
+
+
+	// imports
+	BasicView.call(t, element, calendar, 'basicDay');
+	var opt = t.opt;
+	var renderBasic = t.renderBasic;
+	var formatDate = calendar.formatDate;
+
+
+
+	function render(date, delta) {
+		if (delta) {
+			addDays(date, delta);
+			if (!opt('weekends')) {
+				skipWeekend(date, delta < 0 ? -1 : 1);
+			}
+		}
+		t.title = formatDate(date, opt('titleFormat'));
+		t.start = t.visStart = cloneDate(date, true);
+		t.end = t.visEnd = addDays(cloneDate(t.start), 1);
+		renderBasic(1, 1, 1, false);
+	}
+
+
+}
+
+setDefaults({
+	weekMode: 'fixed'
+});
+
+
+function BasicView(element, calendar, viewName) {
+	var t = this;
+
+
+	// exports
+	t.renderBasic = renderBasic;
+	t.setHeight = setHeight;
+	t.setWidth = setWidth;
+	t.renderDayOverlay = renderDayOverlay;
+	t.defaultSelectionEnd = defaultSelectionEnd;
+	t.renderSelection = renderSelection;
+	t.clearSelection = clearSelection;
+	t.reportDayClick = reportDayClick; // for selection (kinda hacky)
+	t.dragStart = dragStart;
+	t.dragStop = dragStop;
+	t.defaultEventEnd = defaultEventEnd;
+	t.getHoverListener = function() { return hoverListener };
+	t.colContentLeft = colContentLeft;
+	t.colContentRight = colContentRight;
+	t.dayOfWeekCol = dayOfWeekCol;
+	t.dateCell = dateCell;
+	t.cellDate = cellDate;
+	t.cellIsAllDay = function() { return true };
+	t.allDayRow = allDayRow;
+	t.allDayBounds = allDayBounds;
+	t.getRowCnt = function() { return rowCnt };
+	t.getColCnt = function() { return colCnt };
+	t.getColWidth = function() { return colWidth };
+	t.getDaySegmentContainer = function() { return daySegmentContainer };
+
+
+	// imports
+	View.call(t, element, calendar, viewName);
+	OverlayManager.call(t);
+	SelectionManager.call(t);
+	BasicEventRenderer.call(t);
+	var opt = t.opt;
+	var trigger = t.trigger;
+	var clearEvents = t.clearEvents;
+	var renderOverlay = t.renderOverlay;
+	var clearOverlays = t.clearOverlays;
+	var daySelectionMousedown = t.daySelectionMousedown;
+	var formatDate = calendar.formatDate;
+
+
+	// locals
+
+	var head;
+	var headCells;
+	var body;
+	var bodyRows;
+	var bodyCells;
+	var bodyFirstCells;
+	var bodyCellTopInners;
+	var daySegmentContainer;
+
+	var viewWidth;
+	var viewHeight;
+	var colWidth;
+
+	var rowCnt, colCnt;
+	var coordinateGrid;
+	var hoverListener;
+	var colContentPositions;
+
+	var rtl, dis, dit;
+	var firstDay;
+	var nwe;
+	var tm;
+	var colFormat;
+
+
+
+	/* Rendering
+	------------------------------------------------------------*/
+
+
+	disableTextSelection(element.addClass('fc-grid'));
+
+
+	function renderBasic(maxr, r, c, showNumbers) {
+		rowCnt = r;
+		colCnt = c;
+		updateOptions();
+		var firstTime = !body;
+		if (firstTime) {
+			buildSkeleton(maxr, showNumbers);
+		}else{
+			clearEvents();
+		}
+		updateCells(firstTime);
+	}
+
+
+
+	function updateOptions() {
+		rtl = opt('isRTL');
+		if (rtl) {
+			dis = -1;
+			dit = colCnt - 1;
+		}else{
+			dis = 1;
+			dit = 0;
+		}
+		firstDay = opt('firstDay');
+		nwe = opt('weekends') ? 0 : 1;
+		tm = opt('theme') ? 'ui' : 'fc';
+		colFormat = opt('columnFormat');
+	}
+
+
+
+	function buildSkeleton(maxRowCnt, showNumbers) {
+		var s;
+		var headerClass = tm + "-widget-header";
+		var contentClass = tm + "-widget-content";
+		var i, j;
+		var table;
+
+		s =
+			"<table class='fc-border-separate' style='width:100%' cellspacing='0'>" +
+			"<thead>" +
+			"<tr>";
+		for (i=0; i<colCnt; i++) {
+			s +=
+				"<th class='fc- " + headerClass + "'/>"; // need fc- for setDayID
+		}
+		s +=
+			"</tr>" +
+			"</thead>" +
+			"<tbody>";
+		for (i=0; i<maxRowCnt; i++) {
+			s +=
+				"<tr class='fc-week" + i + "'>";
+			for (j=0; j<colCnt; j++) {
+				s +=
+					"<td class='fc- " + contentClass + " fc-day" + (i*colCnt+j) + "'>" + // need fc- for setDayID
+					"<div>" +
+					(showNumbers ?
+						"<div class='fc-day-number'/>" :
+						''
+						) +
+					"<div class='fc-day-content'>" +
+					"<div style='position:relative'>&nbsp;</div>" +
+					"</div>" +
+					"</div>" +
+					"</td>";
+			}
+			s +=
+				"</tr>";
+		}
+		s +=
+			"</tbody>" +
+			"</table>";
+		table = $(s).appendTo(element);
+
+		head = table.find('thead');
+		headCells = head.find('th');
+		body = table.find('tbody');
+		bodyRows = body.find('tr');
+		bodyCells = body.find('td');
+		bodyFirstCells = bodyCells.filter(':first-child');
+		bodyCellTopInners = bodyRows.eq(0).find('div.fc-day-content div');
+
+		markFirstLast(head.add(head.find('tr'))); // marks first+last tr/th's
+		markFirstLast(bodyRows); // marks first+last td's
+		bodyRows.eq(0).addClass('fc-first'); // fc-last is done in updateCells
+
+		dayBind(bodyCells);
+
+		daySegmentContainer =
+			$("<div style='position:absolute;z-index:8;top:0;left:0'/>")
+				.appendTo(element);
+	}
+
+
+
+	function updateCells(firstTime) {
+		var dowDirty = firstTime || rowCnt == 1; // could the cells' day-of-weeks need updating?
+		var month = t.start.getMonth();
+		var today = clearTime(new Date());
+		var cell;
+		var date;
+		var row;
+
+		if (dowDirty) {
+			headCells.each(function(i, _cell) {
+				cell = $(_cell);
+				date = indexDate(i);
+				cell.html(formatDate(date, colFormat));
+				setDayID(cell, date);
+			});
+		}
+
+		bodyCells.each(function(i, _cell) {
+			cell = $(_cell);
+			date = indexDate(i);
+			if (date.getMonth() == month) {
+				cell.removeClass('fc-other-month');
+			}else{
+				cell.addClass('fc-other-month');
+			}
+			if (+date == +today) {
+				cell.addClass(tm + '-state-highlight fc-today');
+			}else{
+				cell.removeClass(tm + '-state-highlight fc-today');
+			}
+			cell.find('div.fc-day-number').text(date.getDate());
+			if (dowDirty) {
+				setDayID(cell, date);
+			}
+		});
+
+		bodyRows.each(function(i, _row) {
+			row = $(_row);
+			if (i < rowCnt) {
+				row.show();
+				if (i == rowCnt-1) {
+					row.addClass('fc-last');
+				}else{
+					row.removeClass('fc-last');
+				}
+			}else{
+				row.hide();
+			}
+		});
+	}
+
+
+
+	function setHeight(height) {
+		viewHeight = height;
+
+		var bodyHeight = viewHeight - head.height();
+		var rowHeight;
+		var rowHeightLast;
+		var cell;
+
+		if (opt('weekMode') == 'variable') {
+			rowHeight = rowHeightLast = Math.floor(bodyHeight / (rowCnt==1 ? 2 : 6));
+		}else{
+			rowHeight = Math.floor(bodyHeight / rowCnt);
+			rowHeightLast = bodyHeight - rowHeight * (rowCnt-1);
+		}
+
+		bodyFirstCells.each(function(i, _cell) {
+			if (i < rowCnt) {
+				cell = $(_cell);
+				setMinHeight(
+					cell.find('> div'),
+					(i==rowCnt-1 ? rowHeightLast : rowHeight) - vsides(cell)
+				);
+			}
+		});
+
+	}
+
+
+	function setWidth(width) {
+		viewWidth = width;
+		colContentPositions.clear();
+		colWidth = Math.floor(viewWidth / colCnt);
+		setOuterWidth(headCells.slice(0, -1), colWidth);
+	}
+
+
+
+	/* Day clicking and binding
+	-----------------------------------------------------------*/
+
+
+	function dayBind(days) {
+		days.click(dayClick)
+			.mousedown(daySelectionMousedown);
+	}
+
+
+	function dayClick(ev) {
+		if (!opt('selectable')) { // if selectable, SelectionManager will worry about dayClick
+			var index = parseInt(this.className.match(/fc\-day(\d+)/)[1]); // TODO: maybe use .data
+			var date = indexDate(index);
+			trigger('dayClick', this, date, true, ev);
+		}
+	}
+
+
+
+	/* Semi-transparent Overlay Helpers
+	------------------------------------------------------*/
+
+
+	function renderDayOverlay(overlayStart, overlayEnd, refreshCoordinateGrid) { // overlayEnd is exclusive
+		if (refreshCoordinateGrid) {
+			coordinateGrid.build();
+		}
+		var rowStart = cloneDate(t.visStart);
+		var rowEnd = addDays(cloneDate(rowStart), colCnt);
+		for (var i=0; i<rowCnt; i++) {
+			var stretchStart = new Date(Math.max(rowStart, overlayStart));
+			var stretchEnd = new Date(Math.min(rowEnd, overlayEnd));
+			if (stretchStart < stretchEnd) {
+				var colStart, colEnd;
+				if (rtl) {
+					colStart = dayDiff(stretchEnd, rowStart)*dis+dit+1;
+					colEnd = dayDiff(stretchStart, rowStart)*dis+dit+1;
+				}else{
+					colStart = dayDiff(stretchStart, rowStart);
+					colEnd = dayDiff(stretchEnd, rowStart);
+				}
+				dayBind(
+					renderCellOverlay(i, colStart, i, colEnd-1)
+				);
+			}
+			addDays(rowStart, 7);
+			addDays(rowEnd, 7);
+		}
+	}
+
+
+	function renderCellOverlay(row0, col0, row1, col1) { // row1,col1 is inclusive
+		var rect = coordinateGrid.rect(row0, col0, row1, col1, element);
+		return renderOverlay(rect, element);
+	}
+
+
+
+	/* Selection
+	-----------------------------------------------------------------------*/
+
+
+	function defaultSelectionEnd(startDate, allDay) {
+		return cloneDate(startDate);
+	}
+
+
+	function renderSelection(startDate, endDate, allDay) {
+		renderDayOverlay(startDate, addDays(cloneDate(endDate), 1), true); // rebuild every time???
+	}
+
+
+	function clearSelection() {
+		clearOverlays();
+	}
+
+
+	function reportDayClick(date, allDay, ev) {
+		var cell = dateCell(date);
+		var _element = bodyCells[cell.row*colCnt + cell.col];
+		trigger('dayClick', _element, date, allDay, ev);
+	}
+
+
+
+	/* External Dragging
+	-----------------------------------------------------------------------*/
+
+
+	function dragStart(_dragElement, ev, ui) {
+		hoverListener.start(function(cell) {
+			clearOverlays();
+			if (cell) {
+				renderCellOverlay(cell.row, cell.col, cell.row, cell.col);
+			}
+		}, ev);
+	}
+
+
+	function dragStop(_dragElement, ev, ui) {
+		var cell = hoverListener.stop();
+		clearOverlays();
+		if (cell) {
+			var d = cellDate(cell);
+			trigger('drop', _dragElement, d, true, ev, ui);
+		}
+	}
+
+
+
+	/* Utilities
+	--------------------------------------------------------*/
+
+
+	function defaultEventEnd(event) {
+		return cloneDate(event.start);
+	}
+
+
+	coordinateGrid = new CoordinateGrid(function(rows, cols) {
+		var e, n, p;
+		headCells.each(function(i, _e) {
+			e = $(_e);
+			n = e.offset().left;
+			if (i) {
+				p[1] = n;
+			}
+			p = [n];
+			cols[i] = p;
+		});
+		p[1] = n + e.outerWidth();
+		bodyRows.each(function(i, _e) {
+			if (i < rowCnt) {
+				e = $(_e);
+				n = e.offset().top;
+				if (i) {
+					p[1] = n;
+				}
+				p = [n];
+				rows[i] = p;
+			}
+		});
+		p[1] = n + e.outerHeight();
+	});
+
+
+	hoverListener = new HoverListener(coordinateGrid);
+
+
+	colContentPositions = new HorizontalPositionCache(function(col) {
+		return bodyCellTopInners.eq(col);
+	});
+
+
+	function colContentLeft(col) {
+		return colContentPositions.left(col);
+	}
+
+
+	function colContentRight(col) {
+		return colContentPositions.right(col);
+	}
+
+
+
+
+	function dateCell(date) {
+		return {
+			row: Math.floor(dayDiff(date, t.visStart) / 7),
+			col: dayOfWeekCol(date.getDay())
+		};
+	}
+
+
+	function cellDate(cell) {
+		return _cellDate(cell.row, cell.col);
+	}
+
+
+	function _cellDate(row, col) {
+		return addDays(cloneDate(t.visStart), row*7 + col*dis+dit);
+		// what about weekends in middle of week?
+	}
+
+
+	function indexDate(index) {
+		return _cellDate(Math.floor(index/colCnt), index%colCnt);
+	}
+
+
+	function dayOfWeekCol(dayOfWeek) {
+		return ((dayOfWeek - Math.max(firstDay, nwe) + colCnt) % colCnt) * dis + dit;
+	}
+
+
+
+
+	function allDayRow(i) {
+		return bodyRows.eq(i);
+	}
+
+
+	function allDayBounds(i) {
+		return {
+			left: 0,
+			right: viewWidth
+		};
+	}
+
+
+}
+
+function BasicEventRenderer() {
+	var t = this;
+
+
+	// exports
+	t.renderEvents = renderEvents;
+	t.compileDaySegs = compileSegs; // for DayEventRenderer
+	t.clearEvents = clearEvents;
+	t.bindDaySeg = bindDaySeg;
+
+
+	// imports
+	DayEventRenderer.call(t);
+	var opt = t.opt;
+	var trigger = t.trigger;
+	//var setOverflowHidden = t.setOverflowHidden;
+	var isEventDraggable = t.isEventDraggable;
+	var isEventResizable = t.isEventResizable;
+	var reportEvents = t.reportEvents;
+	var reportEventClear = t.reportEventClear;
+	var eventElementHandlers = t.eventElementHandlers;
+	var showEvents = t.showEvents;
+	var hideEvents = t.hideEvents;
+	var eventDrop = t.eventDrop;
+	var getDaySegmentContainer = t.getDaySegmentContainer;
+	var getHoverListener = t.getHoverListener;
+	var renderDayOverlay = t.renderDayOverlay;
+	var clearOverlays = t.clearOverlays;
+	var getRowCnt = t.getRowCnt;
+	var getColCnt = t.getColCnt;
+	var renderDaySegs = t.renderDaySegs;
+	var resizableDayEvent = t.resizableDayEvent;
+
+
+
+	/* Rendering
+	--------------------------------------------------------------------*/
+
+
+	function renderEvents(events, modifiedEventId) {
+		reportEvents(events);
+		renderDaySegs(compileSegs(events), modifiedEventId);
+	}
+
+
+	function clearEvents() {
+		reportEventClear();
+		getDaySegmentContainer().empty();
+	}
+
+
+	function compileSegs(events) {
+		var rowCnt = getRowCnt(),
+			colCnt = getColCnt(),
+			d1 = cloneDate(t.visStart),
+			d2 = addDays(cloneDate(d1), colCnt),
+			visEventsEnds = $.map(events, exclEndDay),
+			i, row,
+			j, level,
+			k, seg,
+			segs=[];
+		for (i=0; i<rowCnt; i++) {
+			row = stackSegs(sliceSegs(events, visEventsEnds, d1, d2));
+			for (j=0; j<row.length; j++) {
+				level = row[j];
+				for (k=0; k<level.length; k++) {
+					seg = level[k];
+					seg.row = i;
+					seg.level = j; // not needed anymore
+					segs.push(seg);
+				}
+			}
+			addDays(d1, 7);
+			addDays(d2, 7);
+		}
+		return segs;
+	}
+
+
+	function bindDaySeg(event, eventElement, seg) {
+		if (isEventDraggable(event)) {
+			draggableDayEvent(event, eventElement);
+		}
+		if (seg.isEnd && isEventResizable(event)) {
+			resizableDayEvent(event, eventElement, seg);
+		}
+		eventElementHandlers(event, eventElement);
+			// needs to be after, because resizableDayEvent might stopImmediatePropagation on click
+	}
+
+
+
+	/* Dragging
+	----------------------------------------------------------------------------*/
+
+
+	function draggableDayEvent(event, eventElement) {
+		var hoverListener = getHoverListener();
+		var dayDelta;
+		eventElement.draggable({
+			zIndex: 9,
+			delay: 50,
+			opacity: opt('dragOpacity'),
+			revertDuration: opt('dragRevertDuration'),
+			start: function(ev, ui) {
+				trigger('eventDragStart', eventElement, event, ev, ui);
+				hideEvents(event, eventElement);
+				hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
+					eventElement.draggable('option', 'revert', !cell || !rowDelta && !colDelta);
+					clearOverlays();
+					if (cell) {
+						//setOverflowHidden(true);
+						dayDelta = rowDelta*7 + colDelta * (opt('isRTL') ? -1 : 1);
+						renderDayOverlay(
+							addDays(cloneDate(event.start), dayDelta),
+							addDays(exclEndDay(event), dayDelta)
+						);
+					}else{
+						//setOverflowHidden(false);
+						dayDelta = 0;
+					}
+				}, ev, 'drag');
+			},
+			stop: function(ev, ui) {
+				hoverListener.stop();
+				clearOverlays();
+				trigger('eventDragStop', eventElement, event, ev, ui);
+				if (dayDelta) {
+					eventDrop(this, event, dayDelta, 0, event.allDay, ev, ui);
+				}else{
+					eventElement.css('filter', ''); // clear IE opacity side-effects
+					showEvents(event, eventElement);
+				}
+				//setOverflowHidden(false);
+			}
+		});
+	}
+
+
+}
+
+fcViews.agendaWeek = AgendaWeekView;
+
+function AgendaWeekView(element, calendar) {
+	var t = this;
+
+
+	// exports
+	t.render = render;
+
+
+	// imports
+	AgendaView.call(t, element, calendar, 'agendaWeek');
+	var opt = t.opt;
+	var renderAgenda = t.renderAgenda;
+	var formatDates = calendar.formatDates;
+
+
+
+	function render(date, delta) {
+		if (delta) {
+			addDays(date, delta * 7);
+		}
+		var start = addDays(cloneDate(date), -((date.getDay() - opt('firstDay') + 7) % 7));
+		var end = addDays(cloneDate(start), 7);
+		var visStart = cloneDate(start);
+		var visEnd = cloneDate(end);
+		var weekends = opt('weekends');
+		if (!weekends) {
+			skipWeekend(visStart);
+			skipWeekend(visEnd, -1, true);
+		}
+		t.title = formatDates(
+			visStart,
+			addDays(cloneDate(visEnd), -1),
+			opt('titleFormat')
+		);
+		t.start = start;
+		t.end = end;
+		t.visStart = visStart;
+		t.visEnd = visEnd;
+		renderAgenda(weekends ? 7 : 5);
+	}
+
+
+}
+
+fcViews.agendaDay = AgendaDayView;
+
+function AgendaDayView(element, calendar) {
+	var t = this;
+
+
+	// exports
+	t.render = render;
+
+
+	// imports
+	AgendaView.call(t, element, calendar, 'agendaDay');
+	var opt = t.opt;
+	var renderAgenda = t.renderAgenda;
+	var formatDate = calendar.formatDate;
+
+
+
+	function render(date, delta) {
+		if (delta) {
+			addDays(date, delta);
+			if (!opt('weekends')) {
+				skipWeekend(date, delta < 0 ? -1 : 1);
+			}
+		}
+		var start = cloneDate(date, true);
+		var end = addDays(cloneDate(start), 1);
+		t.title = formatDate(date, opt('titleFormat'));
+		t.start = t.visStart = start;
+		t.end = t.visEnd = end;
+		renderAgenda(1);
+	}
+
+
+}
+
+setDefaults({
+	allDaySlot: true,
+	allDayText: 'all-day',
+	firstHour: 6,
+	slotMinutes: 30,
+	defaultEventMinutes: 120,
+	axisFormat: 'h(:mm)tt',
+	timeFormat: {
+		agenda: 'h:mm{ - h:mm}'
+	},
+	dragOpacity: {
+		agenda: .5
+	},
+	minTime: 0,
+	maxTime: 24
+});
+
+
+// TODO: make it work in quirks mode (event corners, all-day height)
+// TODO: test liquid width, especially in IE6
+
+
+function AgendaView(element, calendar, viewName) {
+	var t = this;
+
+
+	// exports
+	t.renderAgenda = renderAgenda;
+	t.setWidth = setWidth;
+	t.setHeight = setHeight;
+	t.beforeHide = beforeHide;
+	t.afterShow = afterShow;
+	t.defaultEventEnd = defaultEventEnd;
+	t.timePosition = timePosition;
+	t.dayOfWeekCol = dayOfWeekCol;
+	t.dateCell = dateCell;
+	t.cellDate = cellDate;
+	t.cellIsAllDay = cellIsAllDay;
+	t.allDayRow = getAllDayRow;
+	t.allDayBounds = allDayBounds;
+	t.getHoverListener = function() { return hoverListener };
+	t.colContentLeft = colContentLeft;
+	t.colContentRight = colContentRight;
+	t.getDaySegmentContainer = function() { return daySegmentContainer };
+	t.getSlotSegmentContainer = function() { return slotSegmentContainer };
+	t.getMinMinute = function() { return minMinute };
+	t.getMaxMinute = function() { return maxMinute };
+	t.getBodyContent = function() { return slotContent }; // !!??
+	t.getRowCnt = function() { return 1 };
+	t.getColCnt = function() { return colCnt };
+	t.getColWidth = function() { return colWidth };
+	t.getSlotHeight = function() { return slotHeight };
+	t.defaultSelectionEnd = defaultSelectionEnd;
+	t.renderDayOverlay = renderDayOverlay;
+	t.renderSelection = renderSelection;
+	t.clearSelection = clearSelection;
+	t.reportDayClick = reportDayClick; // selection mousedown hack
+	t.dragStart = dragStart;
+	t.dragStop = dragStop;
+
+
+	// imports
+	View.call(t, element, calendar, viewName);
+	OverlayManager.call(t);
+	SelectionManager.call(t);
+	AgendaEventRenderer.call(t);
+	var opt = t.opt;
+	var trigger = t.trigger;
+	var clearEvents = t.clearEvents;
+	var renderOverlay = t.renderOverlay;
+	var clearOverlays = t.clearOverlays;
+	var reportSelection = t.reportSelection;
+	var unselect = t.unselect;
+	var daySelectionMousedown = t.daySelectionMousedown;
+	var slotSegHtml = t.slotSegHtml;
+	var formatDate = calendar.formatDate;
+
+
+	// locals
+
+	var dayTable;
+	var dayHead;
+	var dayHeadCells;
+	var dayBody;
+	var dayBodyCells;
+	var dayBodyCellInners;
+	var dayBodyFirstCell;
+	var dayBodyFirstCellStretcher;
+	var slotLayer;
+	var daySegmentContainer;
+	var allDayTable;
+	var allDayRow;
+	var slotScroller;
+	var slotContent;
+	var slotSegmentContainer;
+	var slotTable;
+	var slotTableFirstInner;
+	var axisFirstCells;
+	var gutterCells;
+	var selectionHelper;
+
+	var viewWidth;
+	var viewHeight;
+	var axisWidth;
+	var colWidth;
+	var gutterWidth;
+	var slotHeight; // TODO: what if slotHeight changes? (see issue 650)
+	var savedScrollTop;
+
+	var colCnt;
+	var slotCnt;
+	var coordinateGrid;
+	var hoverListener;
+	var colContentPositions;
+	var slotTopCache = {};
+
+	var tm;
+	var firstDay;
+	var nwe;            // no weekends (int)
+	var rtl, dis, dit;  // day index sign / translate
+	var minMinute, maxMinute;
+	var colFormat;
+
+
+
+	/* Rendering
+	-----------------------------------------------------------------------------*/
+
+
+	disableTextSelection(element.addClass('fc-agenda'));
+
+
+	function renderAgenda(c) {
+		colCnt = c;
+		updateOptions();
+		if (!dayTable) {
+			buildSkeleton();
+		}else{
+			clearEvents();
+		}
+		updateCells();
+	}
+
+
+
+	function updateOptions() {
+		tm = opt('theme') ? 'ui' : 'fc';
+		nwe = opt('weekends') ? 0 : 1;
+		firstDay = opt('firstDay');
+		if (rtl = opt('isRTL')) {
+			dis = -1;
+			dit = colCnt - 1;
+		}else{
+			dis = 1;
+			dit = 0;
+		}
+		minMinute = parseTime(opt('minTime'));
+		maxMinute = parseTime(opt('maxTime'));
+		colFormat = opt('columnFormat');
+	}
+
+
+
+	function buildSkeleton() {
+		var headerClass = tm + "-widget-header";
+		var contentClass = tm + "-widget-content";
+		var s;
+		var i;
+		var d;
+		var maxd;
+		var minutes;
+		var slotNormal = opt('slotMinutes') % 15 == 0;
+
+		s =
+			"<table style='width:100%' class='fc-agenda-days fc-border-separate' cellspacing='0'>" +
+			"<thead>" +
+			"<tr>" +
+			"<th class='fc-agenda-axis " + headerClass + "'>&nbsp;</th>";
+		for (i=0; i<colCnt; i++) {
+			s +=
+				"<th class='fc- fc-col" + i + ' ' + headerClass + "'/>"; // fc- needed for setDayID
+		}
+		s +=
+			"<th class='fc-agenda-gutter " + headerClass + "'>&nbsp;</th>" +
+			"</tr>" +
+			"</thead>" +
+			"<tbody>" +
+			"<tr>" +
+			"<th class='fc-agenda-axis " + headerClass + "'>&nbsp;</th>";
+		for (i=0; i<colCnt; i++) {
+			s +=
+				"<td class='fc- fc-col" + i + ' ' + contentClass + "'>" + // fc- needed for setDayID
+				"<div>" +
+				"<div class='fc-day-content'>" +
+				"<div style='position:relative'>&nbsp;</div>" +
+				"</div>" +
+				"</div>" +
+				"</td>";
+		}
+		s +=
+			"<td class='fc-agenda-gutter " + contentClass + "'>&nbsp;</td>" +
+			"</tr>" +
+			"</tbody>" +
+			"</table>";
+		dayTable = $(s).appendTo(element);
+		dayHead = dayTable.find('thead');
+		dayHeadCells = dayHead.find('th').slice(1, -1);
+		dayBody = dayTable.find('tbody');
+		dayBodyCells = dayBody.find('td').slice(0, -1);
+		dayBodyCellInners = dayBodyCells.find('div.fc-day-content div');
+		dayBodyFirstCell = dayBodyCells.eq(0);
+		dayBodyFirstCellStretcher = dayBodyFirstCell.find('> div');
+
+		markFirstLast(dayHead.add(dayHead.find('tr')));
+		markFirstLast(dayBody.add(dayBody.find('tr')));
+
+		axisFirstCells = dayHead.find('th:first');
+		gutterCells = dayTable.find('.fc-agenda-gutter');
+
+		slotLayer =
+			$("<div style='position:absolute;z-index:2;left:0;width:100%'/>")
+				.appendTo(element);
+
+		if (opt('allDaySlot')) {
+
+			daySegmentContainer =
+				$("<div style='position:absolute;z-index:8;top:0;left:0'/>")
+					.appendTo(slotLayer);
+
+			s =
+				"<table style='width:100%' class='fc-agenda-allday' cellspacing='0'>" +
+				"<tr>" +
+				"<th class='" + headerClass + " fc-agenda-axis'>" + opt('allDayText') + "</th>" +
+				"<td>" +
+				"<div class='fc-day-content'><div style='position:relative'/></div>" +
+				"</td>" +
+				"<th class='" + headerClass + " fc-agenda-gutter'>&nbsp;</th>" +
+				"</tr>" +
+				"</table>";
+			allDayTable = $(s).appendTo(slotLayer);
+			allDayRow = allDayTable.find('tr');
+
+			dayBind(allDayRow.find('td'));
+
+			axisFirstCells = axisFirstCells.add(allDayTable.find('th:first'));
+			gutterCells = gutterCells.add(allDayTable.find('th.fc-agenda-gutter'));
+
+			slotLayer.append(
+				"<div class='fc-agenda-divider " + headerClass + "'>" +
+				"<div class='fc-agenda-divider-inner'/>" +
+				"</div>"
+			);
+
+		}else{
+
+			daySegmentContainer = $([]); // in jQuery 1.4, we can just do $()
+
+		}
+
+		slotScroller =
+			$("<div style='position:absolute;width:100%;overflow-x:hidden;overflow-y:auto'/>")
+				.appendTo(slotLayer);
+
+		slotContent =
+			$("<div style='position:relative;width:100%;overflow:hidden'/>")
+				.appendTo(slotScroller);
+
+		slotSegmentContainer =
+			$("<div style='position:absolute;z-index:8;top:0;left:0'/>")
+				.appendTo(slotContent);
+
+		s =
+			"<table class='fc-agenda-slots' style='width:100%' cellspacing='0'>" +
+			"<tbody>";
+		d = zeroDate();
+		maxd = addMinutes(cloneDate(d), maxMinute);
+		addMinutes(d, minMinute);
+		slotCnt = 0;
+		for (i=0; d < maxd; i++) {
+			minutes = d.getMinutes();
+			s +=
+				"<tr class='fc-slot" + i + ' ' + (!minutes ? '' : 'fc-minor') + "'>" +
+				"<th class='fc-agenda-axis " + headerClass + "'>" +
+				((!slotNormal || !minutes) ? formatDate(d, opt('axisFormat')) : '&nbsp;') +
+				"</th>" +
+				"<td class='" + contentClass + "'>" +
+				"<div style='position:relative'>&nbsp;</div>" +
+				"</td>" +
+				"</tr>";
+			addMinutes(d, opt('slotMinutes'));
+			slotCnt++;
+		}
+		s +=
+			"</tbody>" +
+			"</table>";
+		slotTable = $(s).appendTo(slotContent);
+		slotTableFirstInner = slotTable.find('div:first');
+
+		slotBind(slotTable.find('td'));
+
+		axisFirstCells = axisFirstCells.add(slotTable.find('th:first'));
+	}
+
+
+
+	function updateCells() {
+		var i;
+		var headCell;
+		var bodyCell;
+		var date;
+		var today = clearTime(new Date());
+		for (i=0; i<colCnt; i++) {
+			date = colDate(i);
+			headCell = dayHeadCells.eq(i);
+			headCell.html(formatDate(date, colFormat));
+			bodyCell = dayBodyCells.eq(i);
+			if (+date == +today) {
+				bodyCell.addClass(tm + '-state-highlight fc-today');
+			}else{
+				bodyCell.removeClass(tm + '-state-highlight fc-today');
+			}
+			setDayID(headCell.add(bodyCell), date);
+		}
+	}
+
+
+
+	function setHeight(height, dateChanged) {
+		if (height === undefined) {
+			height = viewHeight;
+		}
+		viewHeight = height;
+		slotTopCache = {};
+
+		var headHeight = dayBody.position().top;
+		var allDayHeight = slotScroller.position().top; // including divider
+		var bodyHeight = Math.min( // total body height, including borders
+			height - headHeight,   // when scrollbars
+			slotTable.height() + allDayHeight + 1 // when no scrollbars. +1 for bottom border
+		);
+
+		dayBodyFirstCellStretcher
+			.height(bodyHeight - vsides(dayBodyFirstCell));
+
+		slotLayer.css('top', headHeight);
+
+		slotScroller.height(bodyHeight - allDayHeight - 1);
+
+		slotHeight = slotTableFirstInner.height() + 1; // +1 for border
+
+		if (dateChanged) {
+			resetScroll();
+		}
+	}
+
+
+
+	function setWidth(width) {
+		viewWidth = width;
+		colContentPositions.clear();
+
+		axisWidth = 0;
+		setOuterWidth(
+			axisFirstCells
+				.width('')
+				.each(function(i, _cell) {
+					axisWidth = Math.max(axisWidth, $(_cell).outerWidth());
+				}),
+			axisWidth
+		);
+
+		var slotTableWidth = slotScroller[0].clientWidth; // needs to be done after axisWidth (for IE7)
+		//slotTable.width(slotTableWidth);
+
+		gutterWidth = slotScroller.width() - slotTableWidth;
+		if (gutterWidth) {
+			setOuterWidth(gutterCells, gutterWidth);
+			gutterCells
+				.show()
+				.prev()
+				.removeClass('fc-last');
+		}else{
+			gutterCells
+				.hide()
+				.prev()
+				.addClass('fc-last');
+		}
+
+		colWidth = Math.floor((slotTableWidth - axisWidth) / colCnt);
+		setOuterWidth(dayHeadCells.slice(0, -1), colWidth);
+	}
+
+
+
+	function resetScroll() {
+		var d0 = zeroDate();
+		var scrollDate = cloneDate(d0);
+		scrollDate.setHours(opt('firstHour'));
+		var top = timePosition(d0, scrollDate) + 1; // +1 for the border
+		function scroll() {
+			slotScroller.scrollTop(top);
+		}
+		scroll();
+		setTimeout(scroll, 0); // overrides any previous scroll state made by the browser
+	}
+
+
+	function beforeHide() {
+		savedScrollTop = slotScroller.scrollTop();
+	}
+
+
+	function afterShow() {
+		slotScroller.scrollTop(savedScrollTop);
+	}
+
+
+
+	/* Slot/Day clicking and binding
+	-----------------------------------------------------------------------*/
+
+
+	function dayBind(cells) {
+		cells.click(slotClick)
+			.mousedown(daySelectionMousedown);
+	}
+
+
+	function slotBind(cells) {
+		cells.click(slotClick)
+			.mousedown(slotSelectionMousedown);
+	}
+
+
+	function slotClick(ev) {
+		if (!opt('selectable')) { // if selectable, SelectionManager will worry about dayClick
+			var col = Math.min(colCnt-1, Math.floor((ev.pageX - dayTable.offset().left - axisWidth) / colWidth));
+			var date = colDate(col);
+			var rowMatch = this.parentNode.className.match(/fc-slot(\d+)/); // TODO: maybe use data
+			if (rowMatch) {
+				var mins = parseInt(rowMatch[1]) * opt('slotMinutes');
+				var hours = Math.floor(mins/60);
+				date.setHours(hours);
+				date.setMinutes(mins%60 + minMinute);
+				trigger('dayClick', dayBodyCells[col], date, false, ev);
+			}else{
+				trigger('dayClick', dayBodyCells[col], date, true, ev);
+			}
+		}
+	}
+
+
+
+	/* Semi-transparent Overlay Helpers
+	-----------------------------------------------------*/
+
+
+	function renderDayOverlay(startDate, endDate, refreshCoordinateGrid) { // endDate is exclusive
+		if (refreshCoordinateGrid) {
+			coordinateGrid.build();
+		}
+		var visStart = cloneDate(t.visStart);
+		var startCol, endCol;
+		if (rtl) {
+			startCol = dayDiff(endDate, visStart)*dis+dit+1;
+			endCol = dayDiff(startDate, visStart)*dis+dit+1;
+		}else{
+			startCol = dayDiff(startDate, visStart);
+			endCol = dayDiff(endDate, visStart);
+		}
+		startCol = Math.max(0, startCol);
+		endCol = Math.min(colCnt, endCol);
+		if (startCol < endCol) {
+			dayBind(
+				renderCellOverlay(0, startCol, 0, endCol-1)
+			);
+		}
+	}
+
+
+	function renderCellOverlay(row0, col0, row1, col1) { // only for all-day?
+		var rect = coordinateGrid.rect(row0, col0, row1, col1, slotLayer);
+		return renderOverlay(rect, slotLayer);
+	}
+
+
+	function renderSlotOverlay(overlayStart, overlayEnd) {
+		var dayStart = cloneDate(t.visStart);
+		var dayEnd = addDays(cloneDate(dayStart), 1);
+		for (var i=0; i<colCnt; i++) {
+			var stretchStart = new Date(Math.max(dayStart, overlayStart));
+			var stretchEnd = new Date(Math.min(dayEnd, overlayEnd));
+			if (stretchStart < stretchEnd) {
+				var col = i*dis+dit;
+				var rect = coordinateGrid.rect(0, col, 0, col, slotContent); // only use it for horizontal coords
+				var top = timePosition(dayStart, stretchStart);
+				var bottom = timePosition(dayStart, stretchEnd);
+				rect.top = top;
+				rect.height = bottom - top;
+				slotBind(
+					renderOverlay(rect, slotContent)
+				);
+			}
+			addDays(dayStart, 1);
+			addDays(dayEnd, 1);
+		}
+	}
+
+
+
+	/* Coordinate Utilities
+	-----------------------------------------------------------------------------*/
+
+
+	coordinateGrid = new CoordinateGrid(function(rows, cols) {
+		var e, n, p;
+		dayHeadCells.each(function(i, _e) {
+			e = $(_e);
+			n = e.offset().left;
+			if (i) {
+				p[1] = n;
+			}
+			p = [n];
+			cols[i] = p;
+		});
+		p[1] = n + e.outerWidth();
+		if (opt('allDaySlot')) {
+			e = allDayRow;
+			n = e.offset().top;
+			rows[0] = [n, n+e.outerHeight()];
+		}
+		var slotTableTop = slotContent.offset().top;
+		var slotScrollerTop = slotScroller.offset().top;
+		var slotScrollerBottom = slotScrollerTop + slotScroller.outerHeight();
+		function constrain(n) {
+			return Math.max(slotScrollerTop, Math.min(slotScrollerBottom, n));
+		}
+		for (var i=0; i<slotCnt; i++) {
+			rows.push([
+				constrain(slotTableTop + slotHeight*i),
+				constrain(slotTableTop + slotHeight*(i+1))
+			]);
+		}
+	});
+
+
+	hoverListener = new HoverListener(coordinateGrid);
+
+
+	colContentPositions = new HorizontalPositionCache(function(col) {
+		return dayBodyCellInners.eq(col);
+	});
+
+
+	function colContentLeft(col) {
+		return colContentPositions.left(col);
+	}
+
+
+	function colContentRight(col) {
+		return colContentPositions.right(col);
+	}
+
+
+
+
+	function dateCell(date) { // "cell" terminology is now confusing
+		return {
+			row: Math.floor(dayDiff(date, t.visStart) / 7),
+			col: dayOfWeekCol(date.getDay())
+		};
+	}
+
+
+	function cellDate(cell) {
+		var d = colDate(cell.col);
+		var slotIndex = cell.row;
+		if (opt('allDaySlot')) {
+			slotIndex--;
+		}
+		if (slotIndex >= 0) {
+			addMinutes(d, minMinute + slotIndex * opt('slotMinutes'));
+		}
+		return d;
+	}
+
+
+	function colDate(col) { // returns dates with 00:00:00
+		return addDays(cloneDate(t.visStart), col*dis+dit);
+	}
+
+
+	function cellIsAllDay(cell) {
+		return opt('allDaySlot') && !cell.row;
+	}
+
+
+	function dayOfWeekCol(dayOfWeek) {
+		return ((dayOfWeek - Math.max(firstDay, nwe) + colCnt) % colCnt)*dis+dit;
+	}
+
+
+
+
+	// get the Y coordinate of the given time on the given day (both Date objects)
+	function timePosition(day, time) { // both date objects. day holds 00:00 of current day
+		day = cloneDate(day, true);
+		if (time < addMinutes(cloneDate(day), minMinute)) {
+			return 0;
+		}
+		if (time >= addMinutes(cloneDate(day), maxMinute)) {
+			return slotTable.height();
+		}
+		var slotMinutes = opt('slotMinutes'),
+			minutes = time.getHours()*60 + time.getMinutes() - minMinute,
+			slotI = Math.floor(minutes / slotMinutes),
+			slotTop = slotTopCache[slotI];
+		if (slotTop === undefined) {
+			slotTop = slotTopCache[slotI] = slotTable.find('tr:eq(' + slotI + ') td div')[0].offsetTop; //.position().top; // need this optimization???
+		}
+		return Math.max(0, Math.round(
+			slotTop - 1 + slotHeight * ((minutes % slotMinutes) / slotMinutes)
+		));
+	}
+
+
+	function allDayBounds() {
+		return {
+			left: axisWidth,
+			right: viewWidth - gutterWidth
+		}
+	}
+
+
+	function getAllDayRow(index) {
+		return allDayRow;
+	}
+
+
+	function defaultEventEnd(event) {
+		var start = cloneDate(event.start);
+		if (event.allDay) {
+			return start;
+		}
+		return addMinutes(start, opt('defaultEventMinutes'));
+	}
+
+
+
+	/* Selection
+	---------------------------------------------------------------------------------*/
+
+
+	function defaultSelectionEnd(startDate, allDay) {
+		if (allDay) {
+			return cloneDate(startDate);
+		}
+		return addMinutes(cloneDate(startDate), opt('slotMinutes'));
+	}
+
+
+	function renderSelection(startDate, endDate, allDay) { // only for all-day
+		if (allDay) {
+			if (opt('allDaySlot')) {
+				renderDayOverlay(startDate, addDays(cloneDate(endDate), 1), true);
+			}
+		}else{
+			renderSlotSelection(startDate, endDate);
+		}
+	}
+
+
+	function renderSlotSelection(startDate, endDate) {
+		var helperOption = opt('selectHelper');
+		coordinateGrid.build();
+		if (helperOption) {
+			var col = dayDiff(startDate, t.visStart) * dis + dit;
+			if (col >= 0 && col < colCnt) { // only works when times are on same day
+				var rect = coordinateGrid.rect(0, col, 0, col, slotContent); // only for horizontal coords
+				var top = timePosition(startDate, startDate);
+				var bottom = timePosition(startDate, endDate);
+				if (bottom > top) { // protect against selections that are entirely before or after visible range
+					rect.top = top;
+					rect.height = bottom - top;
+					rect.left += 2;
+					rect.width -= 5;
+					if ($.isFunction(helperOption)) {
+						var helperRes = helperOption(startDate, endDate);
+						if (helperRes) {
+							rect.position = 'absolute';
+							rect.zIndex = 8;
+							selectionHelper = $(helperRes)
+								.css(rect)
+								.appendTo(slotContent);
+						}
+					}else{
+						rect.isStart = true; // conside rect a "seg" now
+						rect.isEnd = true;   //
+						selectionHelper = $(slotSegHtml(
+							{
+								title: '',
+								start: startDate,
+								end: endDate,
+								className: ['fc-select-helper'],
+								editable: false
+							},
+							rect
+						));
+						selectionHelper.css('opacity', opt('dragOpacity'));
+					}
+					if (selectionHelper) {
+						slotBind(selectionHelper);
+						slotContent.append(selectionHelper);
+						setOuterWidth(selectionHelper, rect.width, true); // needs to be after appended
+						setOuterHeight(selectionHelper, rect.height, true);
+					}
+				}
+			}
+		}else{
+			renderSlotOverlay(startDate, endDate);
+		}
+	}
+
+
+	function clearSelection() {
+		clearOverlays();
+		if (selectionHelper) {
+			selectionHelper.remove();
+			selectionHelper = null;
+		}
+	}
+
+
+	function slotSelectionMousedown(ev) {
+		if (ev.which == 1 && opt('selectable')) { // ev.which==1 means left mouse button
+			unselect(ev);
+			var dates;
+			hoverListener.start(function(cell, origCell) {
+				clearSelection();
+				if (cell && cell.col == origCell.col && !cellIsAllDay(cell)) {
+					var d1 = cellDate(origCell);
+					var d2 = cellDate(cell);
+					dates = [
+						d1,
+						addMinutes(cloneDate(d1), opt('slotMinutes')),
+						d2,
+						addMinutes(cloneDate(d2), opt('slotMinutes'))
+					].sort(cmp);
+					renderSlotSelection(dates[0], dates[3]);
+				}else{
+					dates = null;
+				}
+			}, ev);
+			$(document).one('mouseup', function(ev) {
+				hoverListener.stop();
+				if (dates) {
+					if (+dates[0] == +dates[1]) {
+						reportDayClick(dates[0], false, ev);
+					}
+					reportSelection(dates[0], dates[3], false, ev);
+				}
+			});
+		}
+	}
+
+
+	function reportDayClick(date, allDay, ev) {
+		trigger('dayClick', dayBodyCells[dayOfWeekCol(date.getDay())], date, allDay, ev);
+	}
+
+
+
+	/* External Dragging
+	--------------------------------------------------------------------------------*/
+
+
+	function dragStart(_dragElement, ev, ui) {
+		hoverListener.start(function(cell) {
+			clearOverlays();
+			if (cell) {
+				if (cellIsAllDay(cell)) {
+					renderCellOverlay(cell.row, cell.col, cell.row, cell.col);
+				}else{
+					var d1 = cellDate(cell);
+					var d2 = addMinutes(cloneDate(d1), opt('defaultEventMinutes'));
+					renderSlotOverlay(d1, d2);
+				}
+			}
+		}, ev);
+	}
+
+
+	function dragStop(_dragElement, ev, ui) {
+		var cell = hoverListener.stop();
+		clearOverlays();
+		if (cell) {
+			trigger('drop', _dragElement, cellDate(cell), cellIsAllDay(cell), ev, ui);
+		}
+	}
+
+
+}
+
+function AgendaEventRenderer() {
+	var t = this;
+
+
+	// exports
+	t.renderEvents = renderEvents;
+	t.compileDaySegs = compileDaySegs; // for DayEventRenderer
+	t.clearEvents = clearEvents;
+	t.slotSegHtml = slotSegHtml;
+	t.bindDaySeg = bindDaySeg;
+
+
+	// imports
+	DayEventRenderer.call(t);
+	var opt = t.opt;
+	var trigger = t.trigger;
+	//var setOverflowHidden = t.setOverflowHidden;
+	var isEventDraggable = t.isEventDraggable;
+	var isEventResizable = t.isEventResizable;
+	var eventEnd = t.eventEnd;
+	var reportEvents = t.reportEvents;
+	var reportEventClear = t.reportEventClear;
+	var eventElementHandlers = t.eventElementHandlers;
+	var setHeight = t.setHeight;
+	var getDaySegmentContainer = t.getDaySegmentContainer;
+	var getSlotSegmentContainer = t.getSlotSegmentContainer;
+	var getHoverListener = t.getHoverListener;
+	var getMaxMinute = t.getMaxMinute;
+	var getMinMinute = t.getMinMinute;
+	var timePosition = t.timePosition;
+	var colContentLeft = t.colContentLeft;
+	var colContentRight = t.colContentRight;
+	var renderDaySegs = t.renderDaySegs;
+	var resizableDayEvent = t.resizableDayEvent; // TODO: streamline binding architecture
+	var getColCnt = t.getColCnt;
+	var getColWidth = t.getColWidth;
+	var getSlotHeight = t.getSlotHeight;
+	var getBodyContent = t.getBodyContent;
+	var reportEventElement = t.reportEventElement;
+	var showEvents = t.showEvents;
+	var hideEvents = t.hideEvents;
+	var eventDrop = t.eventDrop;
+	var eventResize = t.eventResize;
+	var renderDayOverlay = t.renderDayOverlay;
+	var clearOverlays = t.clearOverlays;
+	var calendar = t.calendar;
+	var formatDate = calendar.formatDate;
+	var formatDates = calendar.formatDates;
+
+
+
+	/* Rendering
+	----------------------------------------------------------------------------*/
+
+
+	function renderEvents(events, modifiedEventId) {
+		reportEvents(events);
+		var i, len=events.length,
+			dayEvents=[],
+			slotEvents=[];
+		for (i=0; i<len; i++) {
+			if (events[i].allDay) {
+				dayEvents.push(events[i]);
+			}else{
+				slotEvents.push(events[i]);
+			}
+		}
+		if (opt('allDaySlot')) {
+			renderDaySegs(compileDaySegs(dayEvents), modifiedEventId);
+			setHeight(); // no params means set to viewHeight
+		}
+		renderSlotSegs(compileSlotSegs(slotEvents), modifiedEventId);
+	}
+
+
+	function clearEvents() {
+		reportEventClear();
+		getDaySegmentContainer().empty();
+		getSlotSegmentContainer().empty();
+	}
+
+
+	function compileDaySegs(events) {
+		var levels = stackSegs(sliceSegs(events, $.map(events, exclEndDay), t.visStart, t.visEnd)),
+			i, levelCnt=levels.length, level,
+			j, seg,
+			segs=[];
+		for (i=0; i<levelCnt; i++) {
+			level = levels[i];
+			for (j=0; j<level.length; j++) {
+				seg = level[j];
+				seg.row = 0;
+				seg.level = i; // not needed anymore
+				segs.push(seg);
+			}
+		}
+		return segs;
+	}
+
+
+	function compileSlotSegs(events) {
+		var colCnt = getColCnt(),
+			minMinute = getMinMinute(),
+			maxMinute = getMaxMinute(),
+			d = addMinutes(cloneDate(t.visStart), minMinute),
+			visEventEnds = $.map(events, slotEventEnd),
+			i, col,
+			j, level,
+			k, seg,
+			segs=[];
+		for (i=0; i<colCnt; i++) {
+			col = stackSegs(sliceSegs(events, visEventEnds, d, addMinutes(cloneDate(d), maxMinute-minMinute)));
+			countForwardSegs(col);
+			for (j=0; j<col.length; j++) {
+				level = col[j];
+				for (k=0; k<level.length; k++) {
+					seg = level[k];
+					seg.col = i;
+					seg.level = j;
+					segs.push(seg);
+				}
+			}
+			addDays(d, 1, true);
+		}
+		return segs;
+	}
+
+
+	function slotEventEnd(event) {
+		if (event.end) {
+			return cloneDate(event.end);
+		}else{
+			return addMinutes(cloneDate(event.start), opt('defaultEventMinutes'));
+		}
+	}
+
+
+	// renders events in the 'time slots' at the bottom
+
+	function renderSlotSegs(segs, modifiedEventId) {
+
+		var i, segCnt=segs.length, seg,
+			event,
+			classes,
+			top, bottom,
+			colI, levelI, forward,
+			leftmost,
+			availWidth,
+			outerWidth,
+			left,
+			html='',
+			eventElements,
+			eventElement,
+			triggerRes,
+			vsideCache={},
+			hsideCache={},
+			key, val,
+			contentElement,
+			height,
+			slotSegmentContainer = getSlotSegmentContainer(),
+			rtl, dis, dit,
+			colCnt = getColCnt();
+
+		if (rtl = opt('isRTL')) {
+			dis = -1;
+			dit = colCnt - 1;
+		}else{
+			dis = 1;
+			dit = 0;
+		}
+
+		// calculate position/dimensions, create html
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			event = seg.event;
+			top = timePosition(seg.start, seg.start);
+			bottom = timePosition(seg.start, seg.end);
+			colI = seg.col;
+			levelI = seg.level;
+			forward = seg.forward || 0;
+			leftmost = colContentLeft(colI*dis + dit);
+			availWidth = colContentRight(colI*dis + dit) - leftmost;
+			availWidth = Math.min(availWidth-6, availWidth*.95); // TODO: move this to CSS
+			if (levelI) {
+				// indented and thin
+				outerWidth = availWidth / (levelI + forward + 1);
+			}else{
+				if (forward) {
+					// moderately wide, aligned left still
+					outerWidth = ((availWidth / (forward + 1)) - (12/2)) * 2; // 12 is the predicted width of resizer =
+				}else{
+					// can be entire width, aligned left
+					outerWidth = availWidth;
+				}
+			}
+			left = leftmost +                                  // leftmost possible
+				(availWidth / (levelI + forward + 1) * levelI) // indentation
+				* dis + (rtl ? availWidth - outerWidth : 0);   // rtl
+			seg.top = top;
+			seg.left = left;
+			seg.outerWidth = outerWidth;
+			seg.outerHeight = bottom - top;
+			html += slotSegHtml(event, seg);
+		}
+		slotSegmentContainer[0].innerHTML = html; // faster than html()
+		eventElements = slotSegmentContainer.children();
+
+		// retrieve elements, run through eventRender callback, bind event handlers
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			event = seg.event;
+			eventElement = $(eventElements[i]); // faster than eq()
+			triggerRes = trigger('eventRender', event, event, eventElement);
+			if (triggerRes === false) {
+				eventElement.remove();
+			}else{
+				if (triggerRes && triggerRes !== true) {
+					eventElement.remove();
+					eventElement = $(triggerRes)
+						.css({
+							position: 'absolute',
+							top: seg.top,
+							left: seg.left
+						})
+						.appendTo(slotSegmentContainer);
+				}
+				seg.element = eventElement;
+				if (event._id === modifiedEventId) {
+					bindSlotSeg(event, eventElement, seg);
+				}else{
+					eventElement[0]._fci = i; // for lazySegBind
+				}
+				reportEventElement(event, eventElement);
+			}
+		}
+
+		lazySegBind(slotSegmentContainer, segs, bindSlotSeg);
+
+		// record event sides and title positions
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			if (eventElement = seg.element) {
+				val = vsideCache[key = seg.key = cssKey(eventElement[0])];
+				seg.vsides = val === undefined ? (vsideCache[key] = vsides(eventElement, true)) : val;
+				val = hsideCache[key];
+				seg.hsides = val === undefined ? (hsideCache[key] = hsides(eventElement, true)) : val;
+				contentElement = eventElement.find('div.fc-event-content');
+				if (contentElement.length) {
+					seg.contentTop = contentElement[0].offsetTop;
+				}
+			}
+		}
+
+		// set all positions/dimensions at once
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			if (eventElement = seg.element) {
+				eventElement[0].style.width = Math.max(0, seg.outerWidth - seg.hsides) + 'px';
+				height = Math.max(0, seg.outerHeight - seg.vsides);
+				eventElement[0].style.height = height + 'px';
+				event = seg.event;
+				if (seg.contentTop !== undefined && height - seg.contentTop < 10) {
+					// not enough room for title, put it in the time header
+					eventElement.find('div.fc-event-time')
+						.text(formatDate(event.start, opt('timeFormat')) + ' - ' + event.title);
+					eventElement.find('div.fc-event-title')
+						.remove();
+				}
+				trigger('eventAfterRender', event, event, eventElement);
+			}
+		}
+
+	}
+
+
+	function slotSegHtml(event, seg) {
+		var html = "<";
+		var url = event.url;
+		var skinCss = getSkinCss(event, opt);
+		var skinCssAttr = (skinCss ? " style='" + skinCss + "'" : '');
+		var classes = ['fc-event', 'fc-event-skin', 'fc-event-vert'];
+		if (isEventDraggable(event)) {
+			classes.push('fc-event-draggable');
+		}
+		if (seg.isStart) {
+			classes.push('fc-corner-top');
+		}
+		if (seg.isEnd) {
+			classes.push('fc-corner-bottom');
+		}
+		classes = classes.concat(event.className);
+		if (event.source) {
+			classes = classes.concat(event.source.className || []);
+		}
+		if (url) {
+			html += "a href='" + htmlEscape(event.url) + "'";
+		}else{
+			html += "div";
+		}
+		html +=
+			" class='" + classes.join(' ') + "'" +
+			" style='position:absolute;z-index:8;top:" + seg.top + "px;left:" + seg.left + "px;" + skinCss + "'" +
+			">" +
+			"<div class='fc-event-inner fc-event-skin'" + skinCssAttr + ">" +
+			"<div class='fc-event-head fc-event-skin'" + skinCssAttr + ">" +
+			"<div class='fc-event-time'>" +
+			htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) +
+			"</div>" +
+			"</div>" +
+			"<div class='fc-event-content'>" +
+			"<div class='fc-event-title'>" +
+			htmlEscape(event.title) +
+			"</div>" +
+			"</div>" +
+			"<div class='fc-event-bg'></div>" +
+			"</div>"; // close inner
+		if (seg.isEnd && isEventResizable(event)) {
+			html +=
+				"<div class='ui-resizable-handle ui-resizable-s'>=</div>";
+		}
+		html +=
+			"</" + (url ? "a" : "div") + ">";
+		return html;
+	}
+
+
+	function bindDaySeg(event, eventElement, seg) {
+		if (isEventDraggable(event)) {
+			draggableDayEvent(event, eventElement, seg.isStart);
+		}
+		if (seg.isEnd && isEventResizable(event)) {
+			resizableDayEvent(event, eventElement, seg);
+		}
+		eventElementHandlers(event, eventElement);
+			// needs to be after, because resizableDayEvent might stopImmediatePropagation on click
+	}
+
+
+	function bindSlotSeg(event, eventElement, seg) {
+		var timeElement = eventElement.find('div.fc-event-time');
+		if (isEventDraggable(event)) {
+			draggableSlotEvent(event, eventElement, timeElement);
+		}
+		if (seg.isEnd && isEventResizable(event)) {
+			resizableSlotEvent(event, eventElement, timeElement);
+		}
+		eventElementHandlers(event, eventElement);
+	}
+
+
+
+	/* Dragging
+	-----------------------------------------------------------------------------------*/
+
+
+	// when event starts out FULL-DAY
+
+	function draggableDayEvent(event, eventElement, isStart) {
+		var origWidth;
+		var revert;
+		var allDay=true;
+		var dayDelta;
+		var dis = opt('isRTL') ? -1 : 1;
+		var hoverListener = getHoverListener();
+		var colWidth = getColWidth();
+		var slotHeight = getSlotHeight();
+		var minMinute = getMinMinute();
+		eventElement.draggable({
+			zIndex: 9,
+			opacity: opt('dragOpacity', 'month'), // use whatever the month view was using
+			revertDuration: opt('dragRevertDuration'),
+			start: function(ev, ui) {
+				trigger('eventDragStart', eventElement, event, ev, ui);
+				hideEvents(event, eventElement);
+				origWidth = eventElement.width();
+				hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
+					clearOverlays();
+					if (cell) {
+						//setOverflowHidden(true);
+						revert = false;
+						dayDelta = colDelta * dis;
+						if (!cell.row) {
+							// on full-days
+							renderDayOverlay(
+								addDays(cloneDate(event.start), dayDelta),
+								addDays(exclEndDay(event), dayDelta)
+							);
+							resetElement();
+						}else{
+							// mouse is over bottom slots
+							if (isStart) {
+								if (allDay) {
+									// convert event to temporary slot-event
+									eventElement.width(colWidth - 10); // don't use entire width
+									setOuterHeight(
+										eventElement,
+										slotHeight * Math.round(
+											(event.end ? ((event.end - event.start) / MINUTE_MS) : opt('defaultEventMinutes'))
+											/ opt('slotMinutes')
+										)
+									);
+									eventElement.draggable('option', 'grid', [colWidth, 1]);
+									allDay = false;
+								}
+							}else{
+								revert = true;
+							}
+						}
+						revert = revert || (allDay && !dayDelta);
+					}else{
+						resetElement();
+						//setOverflowHidden(false);
+						revert = true;
+					}
+					eventElement.draggable('option', 'revert', revert);
+				}, ev, 'drag');
+			},
+			stop: function(ev, ui) {
+				hoverListener.stop();
+				clearOverlays();
+				trigger('eventDragStop', eventElement, event, ev, ui);
+				if (revert) {
+					// hasn't moved or is out of bounds (draggable has already reverted)
+					resetElement();
+					eventElement.css('filter', ''); // clear IE opacity side-effects
+					showEvents(event, eventElement);
+				}else{
+					// changed!
+					var minuteDelta = 0;
+					if (!allDay) {
+						minuteDelta = Math.round((eventElement.offset().top - getBodyContent().offset().top) / slotHeight)
+							* opt('slotMinutes')
+							+ minMinute
+							- (event.start.getHours() * 60 + event.start.getMinutes());
+					}
+					eventDrop(this, event, dayDelta, minuteDelta, allDay, ev, ui);
+				}
+				//setOverflowHidden(false);
+			}
+		});
+		function resetElement() {
+			if (!allDay) {
+				eventElement
+					.width(origWidth)
+					.height('')
+					.draggable('option', 'grid', null);
+				allDay = true;
+			}
+		}
+	}
+
+
+	// when event starts out IN TIMESLOTS
+
+	function draggableSlotEvent(event, eventElement, timeElement) {
+		var origPosition;
+		var allDay=false;
+		var dayDelta;
+		var minuteDelta;
+		var prevMinuteDelta;
+		var dis = opt('isRTL') ? -1 : 1;
+		var hoverListener = getHoverListener();
+		var colCnt = getColCnt();
+		var colWidth = getColWidth();
+		var slotHeight = getSlotHeight();
+		eventElement.draggable({
+			zIndex: 9,
+			scroll: false,
+			grid: [colWidth, slotHeight],
+			axis: colCnt==1 ? 'y' : false,
+			opacity: opt('dragOpacity'),
+			revertDuration: opt('dragRevertDuration'),
+			start: function(ev, ui) {
+				trigger('eventDragStart', eventElement, event, ev, ui);
+				hideEvents(event, eventElement);
+				origPosition = eventElement.position();
+				minuteDelta = prevMinuteDelta = 0;
+				hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
+					eventElement.draggable('option', 'revert', !cell);
+					clearOverlays();
+					if (cell) {
+						dayDelta = colDelta * dis;
+						if (opt('allDaySlot') && !cell.row) {
+							// over full days
+							if (!allDay) {
+								// convert to temporary all-day event
+								allDay = true;
+								timeElement.hide();
+								eventElement.draggable('option', 'grid', null);
+							}
+							renderDayOverlay(
+								addDays(cloneDate(event.start), dayDelta),
+								addDays(exclEndDay(event), dayDelta)
+							);
+						}else{
+							// on slots
+							resetElement();
+						}
+					}
+				}, ev, 'drag');
+			},
+			drag: function(ev, ui) {
+				minuteDelta = Math.round((ui.position.top - origPosition.top) / slotHeight) * opt('slotMinutes');
+				if (minuteDelta != prevMinuteDelta) {
+					if (!allDay) {
+						updateTimeText(minuteDelta);
+					}
+					prevMinuteDelta = minuteDelta;
+				}
+			},
+			stop: function(ev, ui) {
+				var cell = hoverListener.stop();
+				clearOverlays();
+				trigger('eventDragStop', eventElement, event, ev, ui);
+				if (cell && (dayDelta || minuteDelta || allDay)) {
+					// changed!
+					eventDrop(this, event, dayDelta, allDay ? 0 : minuteDelta, allDay, ev, ui);
+				}else{
+					// either no change or out-of-bounds (draggable has already reverted)
+					resetElement();
+					eventElement.css('filter', ''); // clear IE opacity side-effects
+					eventElement.css(origPosition); // sometimes fast drags make event revert to wrong position
+					updateTimeText(0);
+					showEvents(event, eventElement);
+				}
+			}
+		});
+		function updateTimeText(minuteDelta) {
+			var newStart = addMinutes(cloneDate(event.start), minuteDelta);
+			var newEnd;
+			if (event.end) {
+				newEnd = addMinutes(cloneDate(event.end), minuteDelta);
+			}
+			timeElement.text(formatDates(newStart, newEnd, opt('timeFormat')));
+		}
+		function resetElement() {
+			// convert back to original slot-event
+			if (allDay) {
+				timeElement.css('display', ''); // show() was causing display=inline
+				eventElement.draggable('option', 'grid', [colWidth, slotHeight]);
+				allDay = false;
+			}
+		}
+	}
+
+
+
+	/* Resizing
+	--------------------------------------------------------------------------------------*/
+
+
+	function resizableSlotEvent(event, eventElement, timeElement) {
+		var slotDelta, prevSlotDelta;
+		var slotHeight = getSlotHeight();
+		eventElement.resizable({
+			handles: {
+				s: 'div.ui-resizable-s'
+			},
+			grid: slotHeight,
+			start: function(ev, ui) {
+				slotDelta = prevSlotDelta = 0;
+				hideEvents(event, eventElement);
+				eventElement.css('z-index', 9);
+				trigger('eventResizeStart', this, event, ev, ui);
+			},
+			resize: function(ev, ui) {
+				// don't rely on ui.size.height, doesn't take grid into account
+				slotDelta = Math.round((Math.max(slotHeight, eventElement.height()) - ui.originalSize.height) / slotHeight);
+				if (slotDelta != prevSlotDelta) {
+					timeElement.text(
+						formatDates(
+							event.start,
+							(!slotDelta && !event.end) ? null : // no change, so don't display time range
+								addMinutes(eventEnd(event), opt('slotMinutes')*slotDelta),
+							opt('timeFormat')
+						)
+					);
+					prevSlotDelta = slotDelta;
+				}
+			},
+			stop: function(ev, ui) {
+				trigger('eventResizeStop', this, event, ev, ui);
+				if (slotDelta) {
+					eventResize(this, event, 0, opt('slotMinutes')*slotDelta, ev, ui);
+				}else{
+					eventElement.css('z-index', 8);
+					showEvents(event, eventElement);
+					// BUG: if event was really short, need to put title back in span
+				}
+			}
+		});
+	}
+
+
+}
+
+
+function countForwardSegs(levels) {
+	var i, j, k, level, segForward, segBack;
+	for (i=levels.length-1; i>0; i--) {
+		level = levels[i];
+		for (j=0; j<level.length; j++) {
+			segForward = level[j];
+			for (k=0; k<levels[i-1].length; k++) {
+				segBack = levels[i-1][k];
+				if (segsCollide(segForward, segBack)) {
+					segBack.forward = Math.max(segBack.forward||0, (segForward.forward||0)+1);
+				}
+			}
+		}
+	}
+}
+
+
+
+
+function View(element, calendar, viewName) {
+	var t = this;
+
+
+	// exports
+	t.element = element;
+	t.calendar = calendar;
+	t.name = viewName;
+	t.opt = opt;
+	t.trigger = trigger;
+	//t.setOverflowHidden = setOverflowHidden;
+	t.isEventDraggable = isEventDraggable;
+	t.isEventResizable = isEventResizable;
+	t.reportEvents = reportEvents;
+	t.eventEnd = eventEnd;
+	t.reportEventElement = reportEventElement;
+	t.reportEventClear = reportEventClear;
+	t.eventElementHandlers = eventElementHandlers;
+	t.showEvents = showEvents;
+	t.hideEvents = hideEvents;
+	t.eventDrop = eventDrop;
+	t.eventResize = eventResize;
+	// t.title
+	// t.start, t.end
+	// t.visStart, t.visEnd
+
+
+	// imports
+	var defaultEventEnd = t.defaultEventEnd;
+	var normalizeEvent = calendar.normalizeEvent; // in EventManager
+	var reportEventChange = calendar.reportEventChange;
+
+
+	// locals
+	var eventsByID = {};
+	var eventElements = [];
+	var eventElementsByID = {};
+	var options = calendar.options;
+
+
+
+	function opt(name, viewNameOverride) {
+		var v = options[name];
+		if (typeof v == 'object') {
+			return smartProperty(v, viewNameOverride || viewName);
+		}
+		return v;
+	}
+
+
+	function trigger(name, thisObj) {
+		return calendar.trigger.apply(
+			calendar,
+			[name, thisObj || t].concat(Array.prototype.slice.call(arguments, 2), [t])
+		);
+	}
+
+
+	/*
+	function setOverflowHidden(bool) {
+		element.css('overflow', bool ? 'hidden' : '');
+	}
+	*/
+
+
+	function isEventDraggable(event) {
+		return isEventEditable(event) && !opt('disableDragging');
+	}
+
+
+	function isEventResizable(event) { // but also need to make sure the seg.isEnd == true
+		return isEventEditable(event) && !opt('disableResizing');
+	}
+
+
+	function isEventEditable(event) {
+		return firstDefined(event.editable, (event.source || {}).editable, opt('editable'));
+	}
+
+
+
+	/* Event Data
+	------------------------------------------------------------------------------*/
+
+
+	// report when view receives new events
+	function reportEvents(events) { // events are already normalized at this point
+		eventsByID = {};
+		var i, len=events.length, event;
+		for (i=0; i<len; i++) {
+			event = events[i];
+			if (eventsByID[event._id]) {
+				eventsByID[event._id].push(event);
+			}else{
+				eventsByID[event._id] = [event];
+			}
+		}
+	}
+
+
+	// returns a Date object for an event's end
+	function eventEnd(event) {
+		return event.end ? cloneDate(event.end) : defaultEventEnd(event);
+	}
+
+
+
+	/* Event Elements
+	------------------------------------------------------------------------------*/
+
+
+	// report when view creates an element for an event
+	function reportEventElement(event, element) {
+		eventElements.push(element);
+		if (eventElementsByID[event._id]) {
+			eventElementsByID[event._id].push(element);
+		}else{
+			eventElementsByID[event._id] = [element];
+		}
+	}
+
+
+	function reportEventClear() {
+		eventElements = [];
+		eventElementsByID = {};
+	}
+
+
+	// attaches eventClick, eventMouseover, eventMouseout
+	function eventElementHandlers(event, eventElement) {
+		eventElement
+			.click(function(ev) {
+				if (!eventElement.hasClass('ui-draggable-dragging') &&
+					!eventElement.hasClass('ui-resizable-resizing')) {
+						return trigger('eventClick', this, event, ev);
+					}
+			})
+			.hover(
+				function(ev) {
+					trigger('eventMouseover', this, event, ev);
+				},
+				function(ev) {
+					trigger('eventMouseout', this, event, ev);
+				}
+			);
+		// TODO: don't fire eventMouseover/eventMouseout *while* dragging is occuring (on subject element)
+		// TODO: same for resizing
+	}
+
+
+	function showEvents(event, exceptElement) {
+		eachEventElement(event, exceptElement, 'show');
+	}
+
+
+	function hideEvents(event, exceptElement) {
+		eachEventElement(event, exceptElement, 'hide');
+	}
+
+
+	function eachEventElement(event, exceptElement, funcName) {
+		var elements = eventElementsByID[event._id],
+			i, len = elements.length;
+		for (i=0; i<len; i++) {
+			if (!exceptElement || elements[i][0] != exceptElement[0]) {
+				elements[i][funcName]();
+			}
+		}
+	}
+
+
+
+	/* Event Modification Reporting
+	---------------------------------------------------------------------------------*/
+
+
+	function eventDrop(e, event, dayDelta, minuteDelta, allDay, ev, ui) {
+		var oldAllDay = event.allDay;
+		var eventId = event._id;
+		moveEvents(eventsByID[eventId], dayDelta, minuteDelta, allDay);
+		trigger(
+			'eventDrop',
+			e,
+			event,
+			dayDelta,
+			minuteDelta,
+			allDay,
+			function() {
+				// TODO: investigate cases where this inverse technique might not work
+				moveEvents(eventsByID[eventId], -dayDelta, -minuteDelta, oldAllDay);
+				reportEventChange(eventId);
+			},
+			ev,
+			ui
+		);
+		reportEventChange(eventId);
+	}
+
+
+	function eventResize(e, event, dayDelta, minuteDelta, ev, ui) {
+		var eventId = event._id;
+		elongateEvents(eventsByID[eventId], dayDelta, minuteDelta);
+		trigger(
+			'eventResize',
+			e,
+			event,
+			dayDelta,
+			minuteDelta,
+			function() {
+				// TODO: investigate cases where this inverse technique might not work
+				elongateEvents(eventsByID[eventId], -dayDelta, -minuteDelta);
+				reportEventChange(eventId);
+			},
+			ev,
+			ui
+		);
+		reportEventChange(eventId);
+	}
+
+
+
+	/* Event Modification Math
+	---------------------------------------------------------------------------------*/
+
+
+	function moveEvents(events, dayDelta, minuteDelta, allDay) {
+		minuteDelta = minuteDelta || 0;
+		for (var e, len=events.length, i=0; i<len; i++) {
+			e = events[i];
+			if (allDay !== undefined) {
+				e.allDay = allDay;
+			}
+			addMinutes(addDays(e.start, dayDelta, true), minuteDelta);
+			if (e.end) {
+				e.end = addMinutes(addDays(e.end, dayDelta, true), minuteDelta);
+			}
+			normalizeEvent(e, options);
+		}
+	}
+
+
+	function elongateEvents(events, dayDelta, minuteDelta) {
+		minuteDelta = minuteDelta || 0;
+		for (var e, len=events.length, i=0; i<len; i++) {
+			e = events[i];
+			e.end = addMinutes(addDays(eventEnd(e), dayDelta, true), minuteDelta);
+			normalizeEvent(e, options);
+		}
+	}
+
+
+}
+
+function DayEventRenderer() {
+	var t = this;
+
+
+	// exports
+	t.renderDaySegs = renderDaySegs;
+	t.resizableDayEvent = resizableDayEvent;
+
+
+	// imports
+	var opt = t.opt;
+	var trigger = t.trigger;
+	var isEventDraggable = t.isEventDraggable;
+	var isEventResizable = t.isEventResizable;
+	var eventEnd = t.eventEnd;
+	var reportEventElement = t.reportEventElement;
+	var showEvents = t.showEvents;
+	var hideEvents = t.hideEvents;
+	var eventResize = t.eventResize;
+	var getRowCnt = t.getRowCnt;
+	var getColCnt = t.getColCnt;
+	var getColWidth = t.getColWidth;
+	var allDayRow = t.allDayRow;
+	var allDayBounds = t.allDayBounds;
+	var colContentLeft = t.colContentLeft;
+	var colContentRight = t.colContentRight;
+	var dayOfWeekCol = t.dayOfWeekCol;
+	var dateCell = t.dateCell;
+	var compileDaySegs = t.compileDaySegs;
+	var getDaySegmentContainer = t.getDaySegmentContainer;
+	var bindDaySeg = t.bindDaySeg; //TODO: streamline this
+	var formatDates = t.calendar.formatDates;
+	var renderDayOverlay = t.renderDayOverlay;
+	var clearOverlays = t.clearOverlays;
+	var clearSelection = t.clearSelection;
+
+
+
+	/* Rendering
+	-----------------------------------------------------------------------------*/
+
+
+	function renderDaySegs(segs, modifiedEventId) {
+		var segmentContainer = getDaySegmentContainer();
+		var rowDivs;
+		var rowCnt = getRowCnt();
+		var colCnt = getColCnt();
+		var i = 0;
+		var rowI;
+		var levelI;
+		var colHeights;
+		var j;
+		var segCnt = segs.length;
+		var seg;
+		var top;
+		var k;
+		segmentContainer[0].innerHTML = daySegHTML(segs); // faster than .html()
+		daySegElementResolve(segs, segmentContainer.children());
+		daySegElementReport(segs);
+		daySegHandlers(segs, segmentContainer, modifiedEventId);
+		daySegCalcHSides(segs);
+		daySegSetWidths(segs);
+		daySegCalcHeights(segs);
+		rowDivs = getRowDivs();
+		// set row heights, calculate event tops (in relation to row top)
+		for (rowI=0; rowI<rowCnt; rowI++) {
+			levelI = 0;
+			colHeights = [];
+			for (j=0; j<colCnt; j++) {
+				colHeights[j] = 0;
+			}
+			while (i<segCnt && (seg = segs[i]).row == rowI) {
+				// loop through segs in a row
+				top = arrayMax(colHeights.slice(seg.startCol, seg.endCol));
+				seg.top = top;
+				top += seg.outerHeight;
+				for (k=seg.startCol; k<seg.endCol; k++) {
+					colHeights[k] = top;
+				}
+				i++;
+			}
+			rowDivs[rowI].height(arrayMax(colHeights));
+		}
+		daySegSetTops(segs, getRowTops(rowDivs));
+	}
+
+
+	function renderTempDaySegs(segs, adjustRow, adjustTop) {
+		var tempContainer = $("<div/>");
+		var elements;
+		var segmentContainer = getDaySegmentContainer();
+		var i;
+		var segCnt = segs.length;
+		var element;
+		tempContainer[0].innerHTML = daySegHTML(segs); // faster than .html()
+		elements = tempContainer.children();
+		segmentContainer.append(elements);
+		daySegElementResolve(segs, elements);
+		daySegCalcHSides(segs);
+		daySegSetWidths(segs);
+		daySegCalcHeights(segs);
+		daySegSetTops(segs, getRowTops(getRowDivs()));
+		elements = [];
+		for (i=0; i<segCnt; i++) {
+			element = segs[i].element;
+			if (element) {
+				if (segs[i].row === adjustRow) {
+					element.css('top', adjustTop);
+				}
+				elements.push(element[0]);
+			}
+		}
+		return $(elements);
+	}
+
+
+	function daySegHTML(segs) { // also sets seg.left and seg.outerWidth
+		var rtl = opt('isRTL');
+		var i;
+		var segCnt=segs.length;
+		var seg;
+		var event;
+		var url;
+		var classes;
+		var bounds = allDayBounds();
+		var minLeft = bounds.left;
+		var maxLeft = bounds.right;
+		var leftCol;
+		var rightCol;
+		var left;
+		var right;
+		var skinCss;
+		var html = '';
+		// calculate desired position/dimensions, create html
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			event = seg.event;
+			classes = ['fc-event', 'fc-event-skin', 'fc-event-hori'];
+			if (isEventDraggable(event)) {
+				classes.push('fc-event-draggable');
+			}
+			if (rtl) {
+				if (seg.isStart) {
+					classes.push('fc-corner-right');
+				}
+				if (seg.isEnd) {
+					classes.push('fc-corner-left');
+				}
+				leftCol = dayOfWeekCol(seg.end.getDay()-1);
+				rightCol = dayOfWeekCol(seg.start.getDay());
+				left = seg.isEnd ? colContentLeft(leftCol) : minLeft;
+				right = seg.isStart ? colContentRight(rightCol) : maxLeft;
+			}else{
+				if (seg.isStart) {
+					classes.push('fc-corner-left');
+				}
+				if (seg.isEnd) {
+					classes.push('fc-corner-right');
+				}
+				leftCol = dayOfWeekCol(seg.start.getDay());
+				rightCol = dayOfWeekCol(seg.end.getDay()-1);
+				left = seg.isStart ? colContentLeft(leftCol) : minLeft;
+				right = seg.isEnd ? colContentRight(rightCol) : maxLeft;
+			}
+			classes = classes.concat(event.className);
+			if (event.source) {
+				classes = classes.concat(event.source.className || []);
+			}
+			url = event.url;
+			skinCss = getSkinCss(event, opt);
+			if (url) {
+				html += "<a href='" + htmlEscape(url) + "'";
+			}else{
+				html += "<div";
+			}
+			html +=
+				" class='" + classes.join(' ') + "'" +
+				" style='position:absolute;z-index:8;left:"+left+"px;" + skinCss + "'" +
+				">" +
+				"<div" +
+				" class='fc-event-inner fc-event-skin'" +
+				(skinCss ? " style='" + skinCss + "'" : '') +
+				">";
+			if (!event.allDay && seg.isStart) {
+				html +=
+					"<span class='fc-event-time'>" +
+					htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) +
+					"</span>";
+			}
+			html +=
+				"<span class='fc-event-title'>" + htmlEscape(event.title) + "</span>" +
+				"</div>";
+			if (seg.isEnd && isEventResizable(event)) {
+				html +=
+					"<div class='ui-resizable-handle ui-resizable-" + (rtl ? 'w' : 'e') + "'>" +
+					"&nbsp;&nbsp;&nbsp;" + // makes hit area a lot better for IE6/7
+					"</div>";
+			}
+			html +=
+				"</" + (url ? "a" : "div" ) + ">";
+			seg.left = left;
+			seg.outerWidth = right - left;
+			seg.startCol = leftCol;
+			seg.endCol = rightCol + 1; // needs to be exclusive
+		}
+		return html;
+	}
+
+
+	function daySegElementResolve(segs, elements) { // sets seg.element
+		var i;
+		var segCnt = segs.length;
+		var seg;
+		var event;
+		var element;
+		var triggerRes;
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			event = seg.event;
+			element = $(elements[i]); // faster than .eq()
+			triggerRes = trigger('eventRender', event, event, element);
+			if (triggerRes === false) {
+				element.remove();
+			}else{
+				if (triggerRes && triggerRes !== true) {
+					triggerRes = $(triggerRes)
+						.css({
+							position: 'absolute',
+							left: seg.left
+						});
+					element.replaceWith(triggerRes);
+					element = triggerRes;
+				}
+				seg.element = element;
+			}
+		}
+	}
+
+
+	function daySegElementReport(segs) {
+		var i;
+		var segCnt = segs.length;
+		var seg;
+		var element;
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			element = seg.element;
+			if (element) {
+				reportEventElement(seg.event, element);
+			}
+		}
+	}
+
+
+	function daySegHandlers(segs, segmentContainer, modifiedEventId) {
+		var i;
+		var segCnt = segs.length;
+		var seg;
+		var element;
+		var event;
+		// retrieve elements, run through eventRender callback, bind handlers
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			element = seg.element;
+			if (element) {
+				event = seg.event;
+				if (event._id === modifiedEventId) {
+					bindDaySeg(event, element, seg);
+				}else{
+					element[0]._fci = i; // for lazySegBind
+				}
+			}
+		}
+		lazySegBind(segmentContainer, segs, bindDaySeg);
+	}
+
+
+	function daySegCalcHSides(segs) { // also sets seg.key
+		var i;
+		var segCnt = segs.length;
+		var seg;
+		var element;
+		var key, val;
+		var hsideCache = {};
+		// record event horizontal sides
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			element = seg.element;
+			if (element) {
+				key = seg.key = cssKey(element[0]);
+				val = hsideCache[key];
+				if (val === undefined) {
+					val = hsideCache[key] = hsides(element, true);
+				}
+				seg.hsides = val;
+			}
+		}
+	}
+
+
+	function daySegSetWidths(segs) {
+		var i;
+		var segCnt = segs.length;
+		var seg;
+		var element;
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			element = seg.element;
+			if (element) {
+				element[0].style.width = Math.max(0, seg.outerWidth - seg.hsides) + 'px';
+			}
+		}
+	}
+
+
+	function daySegCalcHeights(segs) {
+		var i;
+		var segCnt = segs.length;
+		var seg;
+		var element;
+		var key, val;
+		var vmarginCache = {};
+		// record event heights
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			element = seg.element;
+			if (element) {
+				key = seg.key; // created in daySegCalcHSides
+				val = vmarginCache[key];
+				if (val === undefined) {
+					val = vmarginCache[key] = vmargins(element);
+				}
+				seg.outerHeight = element[0].offsetHeight + val;
+			}
+		}
+	}
+
+
+	function getRowDivs() {
+		var i;
+		var rowCnt = getRowCnt();
+		var rowDivs = [];
+		for (i=0; i<rowCnt; i++) {
+			rowDivs[i] = allDayRow(i)
+				.find('td:first div.fc-day-content > div'); // optimal selector?
+		}
+		return rowDivs;
+	}
+
+
+	function getRowTops(rowDivs) {
+		var i;
+		var rowCnt = rowDivs.length;
+		var tops = [];
+		for (i=0; i<rowCnt; i++) {
+			tops[i] = rowDivs[i][0].offsetTop; // !!?? but this means the element needs position:relative if in a table cell!!!!
+		}
+		return tops;
+	}
+
+
+	function daySegSetTops(segs, rowTops) { // also triggers eventAfterRender
+		var i;
+		var segCnt = segs.length;
+		var seg;
+		var element;
+		var event;
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			element = seg.element;
+			if (element) {
+				element[0].style.top = rowTops[seg.row] + (seg.top||0) + 'px';
+				event = seg.event;
+				trigger('eventAfterRender', event, event, element);
+			}
+		}
+	}
+
+
+
+	/* Resizing
+	-----------------------------------------------------------------------------------*/
+
+
+	function resizableDayEvent(event, element, seg) {
+		var rtl = opt('isRTL');
+		var direction = rtl ? 'w' : 'e';
+		var handle = element.find('div.ui-resizable-' + direction);
+		var isResizing = false;
+
+		// TODO: look into using jquery-ui mouse widget for this stuff
+		disableTextSelection(element); // prevent native <a> selection for IE
+		element
+			.mousedown(function(ev) { // prevent native <a> selection for others
+				ev.preventDefault();
+			})
+			.click(function(ev) {
+				if (isResizing) {
+					ev.preventDefault(); // prevent link from being visited (only method that worked in IE6)
+					ev.stopImmediatePropagation(); // prevent fullcalendar eventClick handler from being called
+					                               // (eventElementHandlers needs to be bound after resizableDayEvent)
+				}
+			});
+
+		handle.mousedown(function(ev) {
+			if (ev.which != 1) {
+				return; // needs to be left mouse button
+			}
+			isResizing = true;
+			var hoverListener = t.getHoverListener();
+			var rowCnt = getRowCnt();
+			var colCnt = getColCnt();
+			var dis = rtl ? -1 : 1;
+			var dit = rtl ? colCnt-1 : 0;
+			var elementTop = element.css('top');
+			var dayDelta;
+			var helpers;
+			var eventCopy = $.extend({}, event);
+			var minCell = dateCell(event.start);
+			clearSelection();
+			$('body')
+				.css('cursor', direction + '-resize')
+				.one('mouseup', mouseup);
+			trigger('eventResizeStart', this, event, ev);
+			hoverListener.start(function(cell, origCell) {
+				if (cell) {
+					var r = Math.max(minCell.row, cell.row);
+					var c = cell.col;
+					if (rowCnt == 1) {
+						r = 0; // hack for all-day area in agenda views
+					}
+					if (r == minCell.row) {
+						if (rtl) {
+							c = Math.min(minCell.col, c);
+						}else{
+							c = Math.max(minCell.col, c);
+						}
+					}
+					dayDelta = (r*7 + c*dis+dit) - (origCell.row*7 + origCell.col*dis+dit);
+					var newEnd = addDays(eventEnd(event), dayDelta, true);
+					if (dayDelta) {
+						eventCopy.end = newEnd;
+						var oldHelpers = helpers;
+						helpers = renderTempDaySegs(compileDaySegs([eventCopy]), seg.row, elementTop);
+						helpers.find('*').css('cursor', direction + '-resize');
+						if (oldHelpers) {
+							oldHelpers.remove();
+						}
+						hideEvents(event);
+					}else{
+						if (helpers) {
+							showEvents(event);
+							helpers.remove();
+							helpers = null;
+						}
+					}
+					clearOverlays();
+					renderDayOverlay(event.start, addDays(cloneDate(newEnd), 1)); // coordinate grid already rebuild at hoverListener.start
+				}
+			}, ev);
+
+			function mouseup(ev) {
+				trigger('eventResizeStop', this, event, ev);
+				$('body').css('cursor', '');
+				hoverListener.stop();
+				clearOverlays();
+				if (dayDelta) {
+					eventResize(this, event, dayDelta, 0, ev);
+					// event redraw will clear helpers
+				}
+				// otherwise, the drag handler already restored the old events
+
+				setTimeout(function() { // make this happen after the element's click event
+					isResizing = false;
+				},0);
+			}
+
+		});
+	}
+
+
+}
+
+//BUG: unselect needs to be triggered when events are dragged+dropped
+
+function SelectionManager() {
+	var t = this;
+
+
+	// exports
+	t.select = select;
+	t.unselect = unselect;
+	t.reportSelection = reportSelection;
+	t.daySelectionMousedown = daySelectionMousedown;
+
+
+	// imports
+	var opt = t.opt;
+	var trigger = t.trigger;
+	var defaultSelectionEnd = t.defaultSelectionEnd;
+	var renderSelection = t.renderSelection;
+	var clearSelection = t.clearSelection;
+
+
+	// locals
+	var selected = false;
+
+
+
+	// unselectAuto
+	if (opt('selectable') && opt('unselectAuto')) {
+		$(document).mousedown(function(ev) {
+			var ignore = opt('unselectCancel');
+			if (ignore) {
+				if ($(ev.target).parents(ignore).length) { // could be optimized to stop after first match
+					return;
+				}
+			}
+			unselect(ev);
+		});
+	}
+
+
+	function select(startDate, endDate, allDay) {
+		unselect();
+		if (!endDate) {
+			endDate = defaultSelectionEnd(startDate, allDay);
+		}
+		renderSelection(startDate, endDate, allDay);
+		reportSelection(startDate, endDate, allDay);
+	}
+
+
+	function unselect(ev) {
+		if (selected) {
+			selected = false;
+			clearSelection();
+			trigger('unselect', null, ev);
+		}
+	}
+
+
+	function reportSelection(startDate, endDate, allDay, ev) {
+		selected = true;
+		trigger('select', null, startDate, endDate, allDay, ev);
+	}
+
+
+	function daySelectionMousedown(ev) { // not really a generic manager method, oh well
+		var cellDate = t.cellDate;
+		var cellIsAllDay = t.cellIsAllDay;
+		var hoverListener = t.getHoverListener();
+		var reportDayClick = t.reportDayClick; // this is hacky and sort of weird
+		if (ev.which == 1 && opt('selectable')) { // which==1 means left mouse button
+			unselect(ev);
+			var _mousedownElement = this;
+			var dates;
+			hoverListener.start(function(cell, origCell) { // TODO: maybe put cellDate/cellIsAllDay info in cell
+				clearSelection();
+				if (cell && cellIsAllDay(cell)) {
+					dates = [ cellDate(origCell), cellDate(cell) ].sort(cmp);
+					renderSelection(dates[0], dates[1], true);
+				}else{
+					dates = null;
+				}
+			}, ev);
+			$(document).one('mouseup', function(ev) {
+				hoverListener.stop();
+				if (dates) {
+					if (+dates[0] == +dates[1]) {
+						reportDayClick(dates[0], true, ev);
+					}
+					reportSelection(dates[0], dates[1], true, ev);
+				}
+			});
+		}
+	}
+
+
+}
+
+function OverlayManager() {
+	var t = this;
+
+
+	// exports
+	t.renderOverlay = renderOverlay;
+	t.clearOverlays = clearOverlays;
+
+
+	// locals
+	var usedOverlays = [];
+	var unusedOverlays = [];
+
+
+	function renderOverlay(rect, parent) {
+		var e = unusedOverlays.shift();
+		if (!e) {
+			e = $("<div class='fc-cell-overlay' style='position:absolute;z-index:3'/>");
+		}
+		if (e[0].parentNode != parent[0]) {
+			e.appendTo(parent);
+		}
+		usedOverlays.push(e.css(rect).show());
+		return e;
+	}
+
+
+	function clearOverlays() {
+		var e;
+		while (e = usedOverlays.shift()) {
+			unusedOverlays.push(e.hide().unbind());
+		}
+	}
+
+
+}
+
+function CoordinateGrid(buildFunc) {
+
+	var t = this;
+	var rows;
+	var cols;
+
+
+	t.build = function() {
+		rows = [];
+		cols = [];
+		buildFunc(rows, cols);
+	};
+
+
+	t.cell = function(x, y) {
+		var rowCnt = rows.length;
+		var colCnt = cols.length;
+		var i, r=-1, c=-1;
+		for (i=0; i<rowCnt; i++) {
+			if (y >= rows[i][0] && y < rows[i][1]) {
+				r = i;
+				break;
+			}
+		}
+		for (i=0; i<colCnt; i++) {
+			if (x >= cols[i][0] && x < cols[i][1]) {
+				c = i;
+				break;
+			}
+		}
+		return (r>=0 && c>=0) ? { row:r, col:c } : null;
+	};
+
+
+	t.rect = function(row0, col0, row1, col1, originElement) { // row1,col1 is inclusive
+		var origin = originElement.offset();
+		return {
+			top: rows[row0][0] - origin.top,
+			left: cols[col0][0] - origin.left,
+			width: cols[col1][1] - cols[col0][0],
+			height: rows[row1][1] - rows[row0][0]
+		};
+	};
+
+}
+
+function HoverListener(coordinateGrid) {
+
+
+	var t = this;
+	var bindType;
+	var change;
+	var firstCell;
+	var cell;
+
+
+	t.start = function(_change, ev, _bindType) {
+		change = _change;
+		firstCell = cell = null;
+		coordinateGrid.build();
+		mouse(ev);
+		bindType = _bindType || 'mousemove';
+		$(document).bind(bindType, mouse);
+	};
+
+
+	function mouse(ev) {
+		var newCell = coordinateGrid.cell(ev.pageX, ev.pageY);
+		if (!newCell != !cell || newCell && (newCell.row != cell.row || newCell.col != cell.col)) {
+			if (newCell) {
+				if (!firstCell) {
+					firstCell = newCell;
+				}
+				change(newCell, firstCell, newCell.row-firstCell.row, newCell.col-firstCell.col);
+			}else{
+				change(newCell, firstCell);
+			}
+			cell = newCell;
+		}
+	}
+
+
+	t.stop = function() {
+		$(document).unbind(bindType, mouse);
+		return cell;
+	};
+
+
+}
+
+function HorizontalPositionCache(getElement) {
+
+	var t = this,
+		elements = {},
+		lefts = {},
+		rights = {};
+
+	function e(i) {
+		return elements[i] = elements[i] || getElement(i);
+	}
+
+	t.left = function(i) {
+		return lefts[i] = lefts[i] === undefined ? e(i).position().left : lefts[i];
+	};
+
+	t.right = function(i) {
+		return rights[i] = rights[i] === undefined ? t.left(i) + e(i).width() : rights[i];
+	};
+
+	t.clear = function() {
+		elements = {};
+		lefts = {};
+		rights = {};
+	};
+
+}
+
+})(jQuery);
diff --git a/3rdparty/fullcalendar/js/fullcalendar.min.js b/3rdparty/fullcalendar/js/fullcalendar.min.js
new file mode 100644
index 00000000000..fc06a89a610
--- /dev/null
+++ b/3rdparty/fullcalendar/js/fullcalendar.min.js
@@ -0,0 +1,113 @@
+/*
+
+ FullCalendar v1.5.2
+ http://arshaw.com/fullcalendar/
+
+ Use fullcalendar.css for basic styling.
+ For event drag & drop, requires jQuery UI draggable.
+ For event resizing, requires jQuery UI resizable.
+
+ Copyright (c) 2011 Adam Shaw
+ Dual licensed under the MIT and GPL licenses, located in
+ MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
+
+ Date: Sun Aug 21 22:06:09 2011 -0700
+
+*/
+(function(m,oa){function wb(a){m.extend(true,Ya,a)}function Yb(a,b,e){function d(k){if(E){u();q();ma();S(k)}else f()}function f(){B=b.theme?"ui":"fc";a.addClass("fc");b.isRTL&&a.addClass("fc-rtl");b.theme&&a.addClass("ui-widget");E=m("<div class='fc-content' style='position:relative'/>").prependTo(a);C=new Zb(X,b);(P=C.render())&&a.prepend(P);y(b.defaultView);m(window).resize(na);t()||g()}function g(){setTimeout(function(){!n.start&&t()&&S()},0)}function l(){m(window).unbind("resize",na);C.destroy();
+E.remove();a.removeClass("fc fc-rtl ui-widget")}function j(){return i.offsetWidth!==0}function t(){return m("body")[0].offsetWidth!==0}function y(k){if(!n||k!=n.name){F++;pa();var D=n,Z;if(D){(D.beforeHide||xb)();Za(E,E.height());D.element.hide()}else Za(E,1);E.css("overflow","hidden");if(n=Y[k])n.element.show();else n=Y[k]=new Ja[k](Z=s=m("<div class='fc-view fc-view-"+k+"' style='position:absolute'/>").appendTo(E),X);D&&C.deactivateButton(D.name);C.activateButton(k);S();E.css("overflow","");D&&
+Za(E,1);Z||(n.afterShow||xb)();F--}}function S(k){if(j()){F++;pa();o===oa&&u();var D=false;if(!n.start||k||r<n.start||r>=n.end){n.render(r,k||0);fa(true);D=true}else if(n.sizeDirty){n.clearEvents();fa();D=true}else if(n.eventsDirty){n.clearEvents();D=true}n.sizeDirty=false;n.eventsDirty=false;ga(D);W=a.outerWidth();C.updateTitle(n.title);k=new Date;k>=n.start&&k<n.end?C.disableButton("today"):C.enableButton("today");F--;n.trigger("viewDisplay",i)}}function Q(){q();if(j()){u();fa();pa();n.clearEvents();
+n.renderEvents(J);n.sizeDirty=false}}function q(){m.each(Y,function(k,D){D.sizeDirty=true})}function u(){o=b.contentHeight?b.contentHeight:b.height?b.height-(P?P.height():0)-Sa(E):Math.round(E.width()/Math.max(b.aspectRatio,0.5))}function fa(k){F++;n.setHeight(o,k);if(s){s.css("position","relative");s=null}n.setWidth(E.width(),k);F--}function na(){if(!F)if(n.start){var k=++v;setTimeout(function(){if(k==v&&!F&&j())if(W!=(W=a.outerWidth())){F++;Q();n.trigger("windowResize",i);F--}},200)}else g()}function ga(k){if(!b.lazyFetching||
+ya(n.visStart,n.visEnd))ra();else k&&da()}function ra(){K(n.visStart,n.visEnd)}function sa(k){J=k;da()}function ha(k){da(k)}function da(k){ma();if(j()){n.clearEvents();n.renderEvents(J,k);n.eventsDirty=false}}function ma(){m.each(Y,function(k,D){D.eventsDirty=true})}function ua(k,D,Z){n.select(k,D,Z===oa?true:Z)}function pa(){n&&n.unselect()}function U(){S(-1)}function ca(){S(1)}function ka(){gb(r,-1);S()}function qa(){gb(r,1);S()}function G(){r=new Date;S()}function p(k,D,Z){if(k instanceof Date)r=
+N(k);else yb(r,k,D,Z);S()}function L(k,D,Z){k!==oa&&gb(r,k);D!==oa&&hb(r,D);Z!==oa&&ba(r,Z);S()}function c(){return N(r)}function z(){return n}function H(k,D){if(D===oa)return b[k];if(k=="height"||k=="contentHeight"||k=="aspectRatio"){b[k]=D;Q()}}function T(k,D){if(b[k])return b[k].apply(D||i,Array.prototype.slice.call(arguments,2))}var X=this;X.options=b;X.render=d;X.destroy=l;X.refetchEvents=ra;X.reportEvents=sa;X.reportEventChange=ha;X.rerenderEvents=da;X.changeView=y;X.select=ua;X.unselect=pa;
+X.prev=U;X.next=ca;X.prevYear=ka;X.nextYear=qa;X.today=G;X.gotoDate=p;X.incrementDate=L;X.formatDate=function(k,D){return Oa(k,D,b)};X.formatDates=function(k,D,Z){return ib(k,D,Z,b)};X.getDate=c;X.getView=z;X.option=H;X.trigger=T;$b.call(X,b,e);var ya=X.isFetchNeeded,K=X.fetchEvents,i=a[0],C,P,E,B,n,Y={},W,o,s,v=0,F=0,r=new Date,J=[],M;yb(r,b.year,b.month,b.date);b.droppable&&m(document).bind("dragstart",function(k,D){var Z=k.target,ja=m(Z);if(!ja.parents(".fc").length){var ia=b.dropAccept;if(m.isFunction(ia)?
+ia.call(Z,ja):ja.is(ia)){M=Z;n.dragStart(M,k,D)}}}).bind("dragstop",function(k,D){if(M){n.dragStop(M,k,D);M=null}})}function Zb(a,b){function e(){q=b.theme?"ui":"fc";if(b.header)return Q=m("<table class='fc-header' style='width:100%'/>").append(m("<tr/>").append(f("left")).append(f("center")).append(f("right")))}function d(){Q.remove()}function f(u){var fa=m("<td class='fc-header-"+u+"'/>");(u=b.header[u])&&m.each(u.split(" "),function(na){na>0&&fa.append("<span class='fc-header-space'/>");var ga;
+m.each(this.split(","),function(ra,sa){if(sa=="title"){fa.append("<span class='fc-header-title'><h2>&nbsp;</h2></span>");ga&&ga.addClass(q+"-corner-right");ga=null}else{var ha;if(a[sa])ha=a[sa];else if(Ja[sa])ha=function(){ma.removeClass(q+"-state-hover");a.changeView(sa)};if(ha){ra=b.theme?jb(b.buttonIcons,sa):null;var da=jb(b.buttonText,sa),ma=m("<span class='fc-button fc-button-"+sa+" "+q+"-state-default'><span class='fc-button-inner'><span class='fc-button-content'>"+(ra?"<span class='fc-icon-wrap'><span class='ui-icon ui-icon-"+
+ra+"'/></span>":da)+"</span><span class='fc-button-effect'><span></span></span></span></span>");if(ma){ma.click(function(){ma.hasClass(q+"-state-disabled")||ha()}).mousedown(function(){ma.not("."+q+"-state-active").not("."+q+"-state-disabled").addClass(q+"-state-down")}).mouseup(function(){ma.removeClass(q+"-state-down")}).hover(function(){ma.not("."+q+"-state-active").not("."+q+"-state-disabled").addClass(q+"-state-hover")},function(){ma.removeClass(q+"-state-hover").removeClass(q+"-state-down")}).appendTo(fa);
+ga||ma.addClass(q+"-corner-left");ga=ma}}}});ga&&ga.addClass(q+"-corner-right")});return fa}function g(u){Q.find("h2").html(u)}function l(u){Q.find("span.fc-button-"+u).addClass(q+"-state-active")}function j(u){Q.find("span.fc-button-"+u).removeClass(q+"-state-active")}function t(u){Q.find("span.fc-button-"+u).addClass(q+"-state-disabled")}function y(u){Q.find("span.fc-button-"+u).removeClass(q+"-state-disabled")}var S=this;S.render=e;S.destroy=d;S.updateTitle=g;S.activateButton=l;S.deactivateButton=
+j;S.disableButton=t;S.enableButton=y;var Q=m([]),q}function $b(a,b){function e(c,z){return!ca||c<ca||z>ka}function d(c,z){ca=c;ka=z;L=[];c=++qa;G=z=U.length;for(var H=0;H<z;H++)f(U[H],c)}function f(c,z){g(c,function(H){if(z==qa){if(H){for(var T=0;T<H.length;T++){H[T].source=c;na(H[T])}L=L.concat(H)}G--;G||ua(L)}})}function g(c,z){var H,T=Aa.sourceFetchers,X;for(H=0;H<T.length;H++){X=T[H](c,ca,ka,z);if(X===true)return;else if(typeof X=="object"){g(X,z);return}}if(H=c.events)if(m.isFunction(H)){u();
+H(N(ca),N(ka),function(C){z(C);fa()})}else m.isArray(H)?z(H):z();else if(c.url){var ya=c.success,K=c.error,i=c.complete;H=m.extend({},c.data||{});T=Ta(c.startParam,a.startParam);X=Ta(c.endParam,a.endParam);if(T)H[T]=Math.round(+ca/1E3);if(X)H[X]=Math.round(+ka/1E3);u();m.ajax(m.extend({},ac,c,{data:H,success:function(C){C=C||[];var P=$a(ya,this,arguments);if(m.isArray(P))C=P;z(C)},error:function(){$a(K,this,arguments);z()},complete:function(){$a(i,this,arguments);fa()}}))}else z()}function l(c){if(c=
+j(c)){G++;f(c,qa)}}function j(c){if(m.isFunction(c)||m.isArray(c))c={events:c};else if(typeof c=="string")c={url:c};if(typeof c=="object"){ga(c);U.push(c);return c}}function t(c){U=m.grep(U,function(z){return!ra(z,c)});L=m.grep(L,function(z){return!ra(z.source,c)});ua(L)}function y(c){var z,H=L.length,T,X=ma().defaultEventEnd,ya=c.start-c._start,K=c.end?c.end-(c._end||X(c)):0;for(z=0;z<H;z++){T=L[z];if(T._id==c._id&&T!=c){T.start=new Date(+T.start+ya);T.end=c.end?T.end?new Date(+T.end+K):new Date(+X(T)+
+K):null;T.title=c.title;T.url=c.url;T.allDay=c.allDay;T.className=c.className;T.editable=c.editable;T.color=c.color;T.backgroudColor=c.backgroudColor;T.borderColor=c.borderColor;T.textColor=c.textColor;na(T)}}na(c);ua(L)}function S(c,z){na(c);if(!c.source){if(z){pa.events.push(c);c.source=pa}L.push(c)}ua(L)}function Q(c){if(c){if(!m.isFunction(c)){var z=c+"";c=function(T){return T._id==z}}L=m.grep(L,c,true);for(H=0;H<U.length;H++)if(m.isArray(U[H].events))U[H].events=m.grep(U[H].events,c,true)}else{L=
+[];for(var H=0;H<U.length;H++)if(m.isArray(U[H].events))U[H].events=[]}ua(L)}function q(c){if(m.isFunction(c))return m.grep(L,c);else if(c){c+="";return m.grep(L,function(z){return z._id==c})}return L}function u(){p++||da("loading",null,true)}function fa(){--p||da("loading",null,false)}function na(c){var z=c.source||{},H=Ta(z.ignoreTimezone,a.ignoreTimezone);c._id=c._id||(c.id===oa?"_fc"+bc++:c.id+"");if(c.date){if(!c.start)c.start=c.date;delete c.date}c._start=N(c.start=kb(c.start,H));c.end=kb(c.end,
+H);if(c.end&&c.end<=c.start)c.end=null;c._end=c.end?N(c.end):null;if(c.allDay===oa)c.allDay=Ta(z.allDayDefault,a.allDayDefault);if(c.className){if(typeof c.className=="string")c.className=c.className.split(/\s+/)}else c.className=[]}function ga(c){if(c.className){if(typeof c.className=="string")c.className=c.className.split(/\s+/)}else c.className=[];for(var z=Aa.sourceNormalizers,H=0;H<z.length;H++)z[H](c)}function ra(c,z){return c&&z&&sa(c)==sa(z)}function sa(c){return(typeof c=="object"?c.events||
+c.url:"")||c}var ha=this;ha.isFetchNeeded=e;ha.fetchEvents=d;ha.addEventSource=l;ha.removeEventSource=t;ha.updateEvent=y;ha.renderEvent=S;ha.removeEvents=Q;ha.clientEvents=q;ha.normalizeEvent=na;var da=ha.trigger,ma=ha.getView,ua=ha.reportEvents,pa={events:[]},U=[pa],ca,ka,qa=0,G=0,p=0,L=[];for(ha=0;ha<b.length;ha++)j(b[ha])}function gb(a,b,e){a.setFullYear(a.getFullYear()+b);e||Ka(a);return a}function hb(a,b,e){if(+a){b=a.getMonth()+b;var d=N(a);d.setDate(1);d.setMonth(b);a.setMonth(b);for(e||Ka(a);a.getMonth()!=
+d.getMonth();)a.setDate(a.getDate()+(a<d?1:-1))}return a}function ba(a,b,e){if(+a){b=a.getDate()+b;var d=N(a);d.setHours(9);d.setDate(b);a.setDate(b);e||Ka(a);lb(a,d)}return a}function lb(a,b){if(+a)for(;a.getDate()!=b.getDate();)a.setTime(+a+(a<b?1:-1)*cc)}function xa(a,b){a.setMinutes(a.getMinutes()+b);return a}function Ka(a){a.setHours(0);a.setMinutes(0);a.setSeconds(0);a.setMilliseconds(0);return a}function N(a,b){if(b)return Ka(new Date(+a));return new Date(+a)}function zb(){var a=0,b;do b=new Date(1970,
+a++,1);while(b.getHours());return b}function Fa(a,b,e){for(b=b||1;!a.getDay()||e&&a.getDay()==1||!e&&a.getDay()==6;)ba(a,b);return a}function Ca(a,b){return Math.round((N(a,true)-N(b,true))/Ab)}function yb(a,b,e,d){if(b!==oa&&b!=a.getFullYear()){a.setDate(1);a.setMonth(0);a.setFullYear(b)}if(e!==oa&&e!=a.getMonth()){a.setDate(1);a.setMonth(e)}d!==oa&&a.setDate(d)}function kb(a,b){if(typeof a=="object")return a;if(typeof a=="number")return new Date(a*1E3);if(typeof a=="string"){if(a.match(/^\d+(\.\d+)?$/))return new Date(parseFloat(a)*
+1E3);if(b===oa)b=true;return Bb(a,b)||(a?new Date(a):null)}return null}function Bb(a,b){a=a.match(/^([0-9]{4})(-([0-9]{2})(-([0-9]{2})([T ]([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?(Z|(([-+])([0-9]{2})(:?([0-9]{2}))?))?)?)?)?$/);if(!a)return null;var e=new Date(a[1],0,1);if(b||!a[13]){b=new Date(a[1],0,1,9,0);if(a[3]){e.setMonth(a[3]-1);b.setMonth(a[3]-1)}if(a[5]){e.setDate(a[5]);b.setDate(a[5])}lb(e,b);a[7]&&e.setHours(a[7]);a[8]&&e.setMinutes(a[8]);a[10]&&e.setSeconds(a[10]);a[12]&&e.setMilliseconds(Number("0."+
+a[12])*1E3);lb(e,b)}else{e.setUTCFullYear(a[1],a[3]?a[3]-1:0,a[5]||1);e.setUTCHours(a[7]||0,a[8]||0,a[10]||0,a[12]?Number("0."+a[12])*1E3:0);if(a[14]){b=Number(a[16])*60+(a[18]?Number(a[18]):0);b*=a[15]=="-"?1:-1;e=new Date(+e+b*60*1E3)}}return e}function mb(a){if(typeof a=="number")return a*60;if(typeof a=="object")return a.getHours()*60+a.getMinutes();if(a=a.match(/(\d+)(?::(\d+))?\s*(\w+)?/)){var b=parseInt(a[1],10);if(a[3]){b%=12;if(a[3].toLowerCase().charAt(0)=="p")b+=12}return b*60+(a[2]?parseInt(a[2],
+10):0)}}function Oa(a,b,e){return ib(a,null,b,e)}function ib(a,b,e,d){d=d||Ya;var f=a,g=b,l,j=e.length,t,y,S,Q="";for(l=0;l<j;l++){t=e.charAt(l);if(t=="'")for(y=l+1;y<j;y++){if(e.charAt(y)=="'"){if(f){Q+=y==l+1?"'":e.substring(l+1,y);l=y}break}}else if(t=="(")for(y=l+1;y<j;y++){if(e.charAt(y)==")"){l=Oa(f,e.substring(l+1,y),d);if(parseInt(l.replace(/\D/,""),10))Q+=l;l=y;break}}else if(t=="[")for(y=l+1;y<j;y++){if(e.charAt(y)=="]"){t=e.substring(l+1,y);l=Oa(f,t,d);if(l!=Oa(g,t,d))Q+=l;l=y;break}}else if(t==
+"{"){f=b;g=a}else if(t=="}"){f=a;g=b}else{for(y=j;y>l;y--)if(S=dc[e.substring(l,y)]){if(f)Q+=S(f,d);l=y-1;break}if(y==l)if(f)Q+=t}}return Q}function Ua(a){return a.end?ec(a.end,a.allDay):ba(N(a.start),1)}function ec(a,b){a=N(a);return b||a.getHours()||a.getMinutes()?ba(a,1):Ka(a)}function fc(a,b){return(b.msLength-a.msLength)*100+(a.event.start-b.event.start)}function Cb(a,b){return a.end>b.start&&a.start<b.end}function nb(a,b,e,d){var f=[],g,l=a.length,j,t,y,S,Q;for(g=0;g<l;g++){j=a[g];t=j.start;
+y=b[g];if(y>e&&t<d){if(t<e){t=N(e);S=false}else{t=t;S=true}if(y>d){y=N(d);Q=false}else{y=y;Q=true}f.push({event:j,start:t,end:y,isStart:S,isEnd:Q,msLength:y-t})}}return f.sort(fc)}function ob(a){var b=[],e,d=a.length,f,g,l,j;for(e=0;e<d;e++){f=a[e];for(g=0;;){l=false;if(b[g])for(j=0;j<b[g].length;j++)if(Cb(b[g][j],f)){l=true;break}if(l)g++;else break}if(b[g])b[g].push(f);else b[g]=[f]}return b}function Db(a,b,e){a.unbind("mouseover").mouseover(function(d){for(var f=d.target,g;f!=this;){g=f;f=f.parentNode}if((f=
+g._fci)!==oa){g._fci=oa;g=b[f];e(g.event,g.element,g);m(d.target).trigger(d)}d.stopPropagation()})}function Va(a,b,e){for(var d=0,f;d<a.length;d++){f=m(a[d]);f.width(Math.max(0,b-pb(f,e)))}}function Eb(a,b,e){for(var d=0,f;d<a.length;d++){f=m(a[d]);f.height(Math.max(0,b-Sa(f,e)))}}function pb(a,b){return gc(a)+hc(a)+(b?ic(a):0)}function gc(a){return(parseFloat(m.curCSS(a[0],"paddingLeft",true))||0)+(parseFloat(m.curCSS(a[0],"paddingRight",true))||0)}function ic(a){return(parseFloat(m.curCSS(a[0],
+"marginLeft",true))||0)+(parseFloat(m.curCSS(a[0],"marginRight",true))||0)}function hc(a){return(parseFloat(m.curCSS(a[0],"borderLeftWidth",true))||0)+(parseFloat(m.curCSS(a[0],"borderRightWidth",true))||0)}function Sa(a,b){return jc(a)+kc(a)+(b?Fb(a):0)}function jc(a){return(parseFloat(m.curCSS(a[0],"paddingTop",true))||0)+(parseFloat(m.curCSS(a[0],"paddingBottom",true))||0)}function Fb(a){return(parseFloat(m.curCSS(a[0],"marginTop",true))||0)+(parseFloat(m.curCSS(a[0],"marginBottom",true))||0)}
+function kc(a){return(parseFloat(m.curCSS(a[0],"borderTopWidth",true))||0)+(parseFloat(m.curCSS(a[0],"borderBottomWidth",true))||0)}function Za(a,b){b=typeof b=="number"?b+"px":b;a.each(function(e,d){d.style.cssText+=";min-height:"+b+";_height:"+b})}function xb(){}function Gb(a,b){return a-b}function Hb(a){return Math.max.apply(Math,a)}function Pa(a){return(a<10?"0":"")+a}function jb(a,b){if(a[b]!==oa)return a[b];b=b.split(/(?=[A-Z])/);for(var e=b.length-1,d;e>=0;e--){d=a[b[e].toLowerCase()];if(d!==
+oa)return d}return a[""]}function Qa(a){return a.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#039;").replace(/"/g,"&quot;").replace(/\n/g,"<br />")}function Ib(a){return a.id+"/"+a.className+"/"+a.style.cssText.replace(/(^|;)\s*(top|left|width|height)\s*:[^;]*/ig,"")}function qb(a){a.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})}function ab(a){a.children().removeClass("fc-first fc-last").filter(":first-child").addClass("fc-first").end().filter(":last-child").addClass("fc-last")}
+function rb(a,b){a.each(function(e,d){d.className=d.className.replace(/^fc-\w*/,"fc-"+lc[b.getDay()])})}function Jb(a,b){var e=a.source||{},d=a.color,f=e.color,g=b("eventColor"),l=a.backgroundColor||d||e.backgroundColor||f||b("eventBackgroundColor")||g;d=a.borderColor||d||e.borderColor||f||b("eventBorderColor")||g;a=a.textColor||e.textColor||b("eventTextColor");b=[];l&&b.push("background-color:"+l);d&&b.push("border-color:"+d);a&&b.push("color:"+a);return b.join(";")}function $a(a,b,e){if(m.isFunction(a))a=
+[a];if(a){var d,f;for(d=0;d<a.length;d++)f=a[d].apply(b,e)||f;return f}}function Ta(){for(var a=0;a<arguments.length;a++)if(arguments[a]!==oa)return arguments[a]}function mc(a,b){function e(j,t){if(t){hb(j,t);j.setDate(1)}j=N(j,true);j.setDate(1);t=hb(N(j),1);var y=N(j),S=N(t),Q=f("firstDay"),q=f("weekends")?0:1;if(q){Fa(y);Fa(S,-1,true)}ba(y,-((y.getDay()-Math.max(Q,q)+7)%7));ba(S,(7-S.getDay()+Math.max(Q,q))%7);Q=Math.round((S-y)/(Ab*7));if(f("weekMode")=="fixed"){ba(S,(6-Q)*7);Q=6}d.title=l(j,
+f("titleFormat"));d.start=j;d.end=t;d.visStart=y;d.visEnd=S;g(6,Q,q?5:7,true)}var d=this;d.render=e;sb.call(d,a,b,"month");var f=d.opt,g=d.renderBasic,l=b.formatDate}function nc(a,b){function e(j,t){t&&ba(j,t*7);j=ba(N(j),-((j.getDay()-f("firstDay")+7)%7));t=ba(N(j),7);var y=N(j),S=N(t),Q=f("weekends");if(!Q){Fa(y);Fa(S,-1,true)}d.title=l(y,ba(N(S),-1),f("titleFormat"));d.start=j;d.end=t;d.visStart=y;d.visEnd=S;g(1,1,Q?7:5,false)}var d=this;d.render=e;sb.call(d,a,b,"basicWeek");var f=d.opt,g=d.renderBasic,
+l=b.formatDates}function oc(a,b){function e(j,t){if(t){ba(j,t);f("weekends")||Fa(j,t<0?-1:1)}d.title=l(j,f("titleFormat"));d.start=d.visStart=N(j,true);d.end=d.visEnd=ba(N(d.start),1);g(1,1,1,false)}var d=this;d.render=e;sb.call(d,a,b,"basicDay");var f=d.opt,g=d.renderBasic,l=b.formatDate}function sb(a,b,e){function d(w,I,R,V){v=I;F=R;f();(I=!C)?g(w,V):z();l(I)}function f(){if(k=L("isRTL")){D=-1;Z=F-1}else{D=1;Z=0}ja=L("firstDay");ia=L("weekends")?0:1;la=L("theme")?"ui":"fc";$=L("columnFormat")}function g(w,
+I){var R,V=la+"-widget-header",ea=la+"-widget-content",aa;R="<table class='fc-border-separate' style='width:100%' cellspacing='0'><thead><tr>";for(aa=0;aa<F;aa++)R+="<th class='fc- "+V+"'/>";R+="</tr></thead><tbody>";for(aa=0;aa<w;aa++){R+="<tr class='fc-week"+aa+"'>";for(V=0;V<F;V++)R+="<td class='fc- "+ea+" fc-day"+(aa*F+V)+"'><div>"+(I?"<div class='fc-day-number'/>":"")+"<div class='fc-day-content'><div style='position:relative'>&nbsp;</div></div></div></td>";R+="</tr>"}R+="</tbody></table>";w=
+m(R).appendTo(a);K=w.find("thead");i=K.find("th");C=w.find("tbody");P=C.find("tr");E=C.find("td");B=E.filter(":first-child");n=P.eq(0).find("div.fc-day-content div");ab(K.add(K.find("tr")));ab(P);P.eq(0).addClass("fc-first");y(E);Y=m("<div style='position:absolute;z-index:8;top:0;left:0'/>").appendTo(a)}function l(w){var I=w||v==1,R=p.start.getMonth(),V=Ka(new Date),ea,aa,va;I&&i.each(function(wa,Ga){ea=m(Ga);aa=ca(wa);ea.html(ya(aa,$));rb(ea,aa)});E.each(function(wa,Ga){ea=m(Ga);aa=ca(wa);aa.getMonth()==
+R?ea.removeClass("fc-other-month"):ea.addClass("fc-other-month");+aa==+V?ea.addClass(la+"-state-highlight fc-today"):ea.removeClass(la+"-state-highlight fc-today");ea.find("div.fc-day-number").text(aa.getDate());I&&rb(ea,aa)});P.each(function(wa,Ga){va=m(Ga);if(wa<v){va.show();wa==v-1?va.addClass("fc-last"):va.removeClass("fc-last")}else va.hide()})}function j(w){o=w;w=o-K.height();var I,R,V;if(L("weekMode")=="variable")I=R=Math.floor(w/(v==1?2:6));else{I=Math.floor(w/v);R=w-I*(v-1)}B.each(function(ea,
+aa){if(ea<v){V=m(aa);Za(V.find("> div"),(ea==v-1?R:I)-Sa(V))}})}function t(w){W=w;M.clear();s=Math.floor(W/F);Va(i.slice(0,-1),s)}function y(w){w.click(S).mousedown(X)}function S(w){if(!L("selectable")){var I=parseInt(this.className.match(/fc\-day(\d+)/)[1]);I=ca(I);c("dayClick",this,I,true,w)}}function Q(w,I,R){R&&r.build();R=N(p.visStart);for(var V=ba(N(R),F),ea=0;ea<v;ea++){var aa=new Date(Math.max(R,w)),va=new Date(Math.min(V,I));if(aa<va){var wa;if(k){wa=Ca(va,R)*D+Z+1;aa=Ca(aa,R)*D+Z+1}else{wa=
+Ca(aa,R);aa=Ca(va,R)}y(q(ea,wa,ea,aa-1))}ba(R,7);ba(V,7)}}function q(w,I,R,V){w=r.rect(w,I,R,V,a);return H(w,a)}function u(w){return N(w)}function fa(w,I){Q(w,ba(N(I),1),true)}function na(){T()}function ga(w,I,R){var V=ua(w);c("dayClick",E[V.row*F+V.col],w,I,R)}function ra(w,I){J.start(function(R){T();R&&q(R.row,R.col,R.row,R.col)},I)}function sa(w,I,R){var V=J.stop();T();if(V){V=pa(V);c("drop",w,V,true,I,R)}}function ha(w){return N(w.start)}function da(w){return M.left(w)}function ma(w){return M.right(w)}
+function ua(w){return{row:Math.floor(Ca(w,p.visStart)/7),col:ka(w.getDay())}}function pa(w){return U(w.row,w.col)}function U(w,I){return ba(N(p.visStart),w*7+I*D+Z)}function ca(w){return U(Math.floor(w/F),w%F)}function ka(w){return(w-Math.max(ja,ia)+F)%F*D+Z}function qa(w){return P.eq(w)}function G(){return{left:0,right:W}}var p=this;p.renderBasic=d;p.setHeight=j;p.setWidth=t;p.renderDayOverlay=Q;p.defaultSelectionEnd=u;p.renderSelection=fa;p.clearSelection=na;p.reportDayClick=ga;p.dragStart=ra;p.dragStop=
+sa;p.defaultEventEnd=ha;p.getHoverListener=function(){return J};p.colContentLeft=da;p.colContentRight=ma;p.dayOfWeekCol=ka;p.dateCell=ua;p.cellDate=pa;p.cellIsAllDay=function(){return true};p.allDayRow=qa;p.allDayBounds=G;p.getRowCnt=function(){return v};p.getColCnt=function(){return F};p.getColWidth=function(){return s};p.getDaySegmentContainer=function(){return Y};Kb.call(p,a,b,e);Lb.call(p);Mb.call(p);pc.call(p);var L=p.opt,c=p.trigger,z=p.clearEvents,H=p.renderOverlay,T=p.clearOverlays,X=p.daySelectionMousedown,
+ya=b.formatDate,K,i,C,P,E,B,n,Y,W,o,s,v,F,r,J,M,k,D,Z,ja,ia,la,$;qb(a.addClass("fc-grid"));r=new Nb(function(w,I){var R,V,ea;i.each(function(aa,va){R=m(va);V=R.offset().left;if(aa)ea[1]=V;ea=[V];I[aa]=ea});ea[1]=V+R.outerWidth();P.each(function(aa,va){if(aa<v){R=m(va);V=R.offset().top;if(aa)ea[1]=V;ea=[V];w[aa]=ea}});ea[1]=V+R.outerHeight()});J=new Ob(r);M=new Pb(function(w){return n.eq(w)})}function pc(){function a(U,ca){S(U);ua(e(U),ca)}function b(){Q();ga().empty()}function e(U){var ca=da(),ka=
+ma(),qa=N(g.visStart);ka=ba(N(qa),ka);var G=m.map(U,Ua),p,L,c,z,H,T,X=[];for(p=0;p<ca;p++){L=ob(nb(U,G,qa,ka));for(c=0;c<L.length;c++){z=L[c];for(H=0;H<z.length;H++){T=z[H];T.row=p;T.level=c;X.push(T)}}ba(qa,7);ba(ka,7)}return X}function d(U,ca,ka){t(U)&&f(U,ca);ka.isEnd&&y(U)&&pa(U,ca,ka);q(U,ca)}function f(U,ca){var ka=ra(),qa;ca.draggable({zIndex:9,delay:50,opacity:l("dragOpacity"),revertDuration:l("dragRevertDuration"),start:function(G,p){j("eventDragStart",ca,U,G,p);fa(U,ca);ka.start(function(L,
+c,z,H){ca.draggable("option","revert",!L||!z&&!H);ha();if(L){qa=z*7+H*(l("isRTL")?-1:1);sa(ba(N(U.start),qa),ba(Ua(U),qa))}else qa=0},G,"drag")},stop:function(G,p){ka.stop();ha();j("eventDragStop",ca,U,G,p);if(qa)na(this,U,qa,0,U.allDay,G,p);else{ca.css("filter","");u(U,ca)}}})}var g=this;g.renderEvents=a;g.compileDaySegs=e;g.clearEvents=b;g.bindDaySeg=d;Qb.call(g);var l=g.opt,j=g.trigger,t=g.isEventDraggable,y=g.isEventResizable,S=g.reportEvents,Q=g.reportEventClear,q=g.eventElementHandlers,u=g.showEvents,
+fa=g.hideEvents,na=g.eventDrop,ga=g.getDaySegmentContainer,ra=g.getHoverListener,sa=g.renderDayOverlay,ha=g.clearOverlays,da=g.getRowCnt,ma=g.getColCnt,ua=g.renderDaySegs,pa=g.resizableDayEvent}function qc(a,b){function e(j,t){t&&ba(j,t*7);j=ba(N(j),-((j.getDay()-f("firstDay")+7)%7));t=ba(N(j),7);var y=N(j),S=N(t),Q=f("weekends");if(!Q){Fa(y);Fa(S,-1,true)}d.title=l(y,ba(N(S),-1),f("titleFormat"));d.start=j;d.end=t;d.visStart=y;d.visEnd=S;g(Q?7:5)}var d=this;d.render=e;Rb.call(d,a,b,"agendaWeek");
+var f=d.opt,g=d.renderAgenda,l=b.formatDates}function rc(a,b){function e(j,t){if(t){ba(j,t);f("weekends")||Fa(j,t<0?-1:1)}t=N(j,true);var y=ba(N(t),1);d.title=l(j,f("titleFormat"));d.start=d.visStart=t;d.end=d.visEnd=y;g(1)}var d=this;d.render=e;Rb.call(d,a,b,"agendaDay");var f=d.opt,g=d.renderAgenda,l=b.formatDate}function Rb(a,b,e){function d(h){Ba=h;f();v?P():g();l()}function f(){Wa=i("theme")?"ui":"fc";Sb=i("weekends")?0:1;Tb=i("firstDay");if(Ub=i("isRTL")){Ha=-1;Ia=Ba-1}else{Ha=1;Ia=0}La=mb(i("minTime"));
+bb=mb(i("maxTime"));Vb=i("columnFormat")}function g(){var h=Wa+"-widget-header",O=Wa+"-widget-content",x,A,ta,za,Da,Ea=i("slotMinutes")%15==0;x="<table style='width:100%' class='fc-agenda-days fc-border-separate' cellspacing='0'><thead><tr><th class='fc-agenda-axis "+h+"'>&nbsp;</th>";for(A=0;A<Ba;A++)x+="<th class='fc- fc-col"+A+" "+h+"'/>";x+="<th class='fc-agenda-gutter "+h+"'>&nbsp;</th></tr></thead><tbody><tr><th class='fc-agenda-axis "+h+"'>&nbsp;</th>";for(A=0;A<Ba;A++)x+="<td class='fc- fc-col"+
+A+" "+O+"'><div><div class='fc-day-content'><div style='position:relative'>&nbsp;</div></div></div></td>";x+="<td class='fc-agenda-gutter "+O+"'>&nbsp;</td></tr></tbody></table>";v=m(x).appendTo(a);F=v.find("thead");r=F.find("th").slice(1,-1);J=v.find("tbody");M=J.find("td").slice(0,-1);k=M.find("div.fc-day-content div");D=M.eq(0);Z=D.find("> div");ab(F.add(F.find("tr")));ab(J.add(J.find("tr")));aa=F.find("th:first");va=v.find(".fc-agenda-gutter");ja=m("<div style='position:absolute;z-index:2;left:0;width:100%'/>").appendTo(a);
+if(i("allDaySlot")){ia=m("<div style='position:absolute;z-index:8;top:0;left:0'/>").appendTo(ja);x="<table style='width:100%' class='fc-agenda-allday' cellspacing='0'><tr><th class='"+h+" fc-agenda-axis'>"+i("allDayText")+"</th><td><div class='fc-day-content'><div style='position:relative'/></div></td><th class='"+h+" fc-agenda-gutter'>&nbsp;</th></tr></table>";la=m(x).appendTo(ja);$=la.find("tr");q($.find("td"));aa=aa.add(la.find("th:first"));va=va.add(la.find("th.fc-agenda-gutter"));ja.append("<div class='fc-agenda-divider "+
+h+"'><div class='fc-agenda-divider-inner'/></div>")}else ia=m([]);w=m("<div style='position:absolute;width:100%;overflow-x:hidden;overflow-y:auto'/>").appendTo(ja);I=m("<div style='position:relative;width:100%;overflow:hidden'/>").appendTo(w);R=m("<div style='position:absolute;z-index:8;top:0;left:0'/>").appendTo(I);x="<table class='fc-agenda-slots' style='width:100%' cellspacing='0'><tbody>";ta=zb();za=xa(N(ta),bb);xa(ta,La);for(A=tb=0;ta<za;A++){Da=ta.getMinutes();x+="<tr class='fc-slot"+A+" "+
+(!Da?"":"fc-minor")+"'><th class='fc-agenda-axis "+h+"'>"+(!Ea||!Da?s(ta,i("axisFormat")):"&nbsp;")+"</th><td class='"+O+"'><div style='position:relative'>&nbsp;</div></td></tr>";xa(ta,i("slotMinutes"));tb++}x+="</tbody></table>";V=m(x).appendTo(I);ea=V.find("div:first");u(V.find("td"));aa=aa.add(V.find("th:first"))}function l(){var h,O,x,A,ta=Ka(new Date);for(h=0;h<Ba;h++){A=ua(h);O=r.eq(h);O.html(s(A,Vb));x=M.eq(h);+A==+ta?x.addClass(Wa+"-state-highlight fc-today"):x.removeClass(Wa+"-state-highlight fc-today");
+rb(O.add(x),A)}}function j(h,O){if(h===oa)h=Wb;Wb=h;ub={};var x=J.position().top,A=w.position().top;h=Math.min(h-x,V.height()+A+1);Z.height(h-Sa(D));ja.css("top",x);w.height(h-A-1);Xa=ea.height()+1;O&&y()}function t(h){Ga=h;cb.clear();Ma=0;Va(aa.width("").each(function(O,x){Ma=Math.max(Ma,m(x).outerWidth())}),Ma);h=w[0].clientWidth;if(vb=w.width()-h){Va(va,vb);va.show().prev().removeClass("fc-last")}else va.hide().prev().addClass("fc-last");db=Math.floor((h-Ma)/Ba);Va(r.slice(0,-1),db)}function y(){function h(){w.scrollTop(A)}
+var O=zb(),x=N(O);x.setHours(i("firstHour"));var A=ca(O,x)+1;h();setTimeout(h,0)}function S(){Xb=w.scrollTop()}function Q(){w.scrollTop(Xb)}function q(h){h.click(fa).mousedown(W)}function u(h){h.click(fa).mousedown(H)}function fa(h){if(!i("selectable")){var O=Math.min(Ba-1,Math.floor((h.pageX-v.offset().left-Ma)/db)),x=ua(O),A=this.parentNode.className.match(/fc-slot(\d+)/);if(A){A=parseInt(A[1])*i("slotMinutes");var ta=Math.floor(A/60);x.setHours(ta);x.setMinutes(A%60+La);C("dayClick",M[O],x,false,
+h)}else C("dayClick",M[O],x,true,h)}}function na(h,O,x){x&&Na.build();var A=N(K.visStart);if(Ub){x=Ca(O,A)*Ha+Ia+1;h=Ca(h,A)*Ha+Ia+1}else{x=Ca(h,A);h=Ca(O,A)}x=Math.max(0,x);h=Math.min(Ba,h);x<h&&q(ga(0,x,0,h-1))}function ga(h,O,x,A){h=Na.rect(h,O,x,A,ja);return E(h,ja)}function ra(h,O){for(var x=N(K.visStart),A=ba(N(x),1),ta=0;ta<Ba;ta++){var za=new Date(Math.max(x,h)),Da=new Date(Math.min(A,O));if(za<Da){var Ea=ta*Ha+Ia;Ea=Na.rect(0,Ea,0,Ea,I);za=ca(x,za);Da=ca(x,Da);Ea.top=za;Ea.height=Da-za;u(E(Ea,
+I))}ba(x,1);ba(A,1)}}function sa(h){return cb.left(h)}function ha(h){return cb.right(h)}function da(h){return{row:Math.floor(Ca(h,K.visStart)/7),col:U(h.getDay())}}function ma(h){var O=ua(h.col);h=h.row;i("allDaySlot")&&h--;h>=0&&xa(O,La+h*i("slotMinutes"));return O}function ua(h){return ba(N(K.visStart),h*Ha+Ia)}function pa(h){return i("allDaySlot")&&!h.row}function U(h){return(h-Math.max(Tb,Sb)+Ba)%Ba*Ha+Ia}function ca(h,O){h=N(h,true);if(O<xa(N(h),La))return 0;if(O>=xa(N(h),bb))return V.height();
+h=i("slotMinutes");O=O.getHours()*60+O.getMinutes()-La;var x=Math.floor(O/h),A=ub[x];if(A===oa)A=ub[x]=V.find("tr:eq("+x+") td div")[0].offsetTop;return Math.max(0,Math.round(A-1+Xa*(O%h/h)))}function ka(){return{left:Ma,right:Ga-vb}}function qa(){return $}function G(h){var O=N(h.start);if(h.allDay)return O;return xa(O,i("defaultEventMinutes"))}function p(h,O){if(O)return N(h);return xa(N(h),i("slotMinutes"))}function L(h,O,x){if(x)i("allDaySlot")&&na(h,ba(N(O),1),true);else c(h,O)}function c(h,O){var x=
+i("selectHelper");Na.build();if(x){var A=Ca(h,K.visStart)*Ha+Ia;if(A>=0&&A<Ba){A=Na.rect(0,A,0,A,I);var ta=ca(h,h),za=ca(h,O);if(za>ta){A.top=ta;A.height=za-ta;A.left+=2;A.width-=5;if(m.isFunction(x)){if(h=x(h,O)){A.position="absolute";A.zIndex=8;wa=m(h).css(A).appendTo(I)}}else{A.isStart=true;A.isEnd=true;wa=m(o({title:"",start:h,end:O,className:["fc-select-helper"],editable:false},A));wa.css("opacity",i("dragOpacity"))}if(wa){u(wa);I.append(wa);Va(wa,A.width,true);Eb(wa,A.height,true)}}}}else ra(h,
+O)}function z(){B();if(wa){wa.remove();wa=null}}function H(h){if(h.which==1&&i("selectable")){Y(h);var O;Ra.start(function(x,A){z();if(x&&x.col==A.col&&!pa(x)){A=ma(A);x=ma(x);O=[A,xa(N(A),i("slotMinutes")),x,xa(N(x),i("slotMinutes"))].sort(Gb);c(O[0],O[3])}else O=null},h);m(document).one("mouseup",function(x){Ra.stop();if(O){+O[0]==+O[1]&&T(O[0],false,x);n(O[0],O[3],false,x)}})}}function T(h,O,x){C("dayClick",M[U(h.getDay())],h,O,x)}function X(h,O){Ra.start(function(x){B();if(x)if(pa(x))ga(x.row,
+x.col,x.row,x.col);else{x=ma(x);var A=xa(N(x),i("defaultEventMinutes"));ra(x,A)}},O)}function ya(h,O,x){var A=Ra.stop();B();A&&C("drop",h,ma(A),pa(A),O,x)}var K=this;K.renderAgenda=d;K.setWidth=t;K.setHeight=j;K.beforeHide=S;K.afterShow=Q;K.defaultEventEnd=G;K.timePosition=ca;K.dayOfWeekCol=U;K.dateCell=da;K.cellDate=ma;K.cellIsAllDay=pa;K.allDayRow=qa;K.allDayBounds=ka;K.getHoverListener=function(){return Ra};K.colContentLeft=sa;K.colContentRight=ha;K.getDaySegmentContainer=function(){return ia};
+K.getSlotSegmentContainer=function(){return R};K.getMinMinute=function(){return La};K.getMaxMinute=function(){return bb};K.getBodyContent=function(){return I};K.getRowCnt=function(){return 1};K.getColCnt=function(){return Ba};K.getColWidth=function(){return db};K.getSlotHeight=function(){return Xa};K.defaultSelectionEnd=p;K.renderDayOverlay=na;K.renderSelection=L;K.clearSelection=z;K.reportDayClick=T;K.dragStart=X;K.dragStop=ya;Kb.call(K,a,b,e);Lb.call(K);Mb.call(K);sc.call(K);var i=K.opt,C=K.trigger,
+P=K.clearEvents,E=K.renderOverlay,B=K.clearOverlays,n=K.reportSelection,Y=K.unselect,W=K.daySelectionMousedown,o=K.slotSegHtml,s=b.formatDate,v,F,r,J,M,k,D,Z,ja,ia,la,$,w,I,R,V,ea,aa,va,wa,Ga,Wb,Ma,db,vb,Xa,Xb,Ba,tb,Na,Ra,cb,ub={},Wa,Tb,Sb,Ub,Ha,Ia,La,bb,Vb;qb(a.addClass("fc-agenda"));Na=new Nb(function(h,O){function x(eb){return Math.max(Ea,Math.min(tc,eb))}var A,ta,za;r.each(function(eb,uc){A=m(uc);ta=A.offset().left;if(eb)za[1]=ta;za=[ta];O[eb]=za});za[1]=ta+A.outerWidth();if(i("allDaySlot")){A=
+$;ta=A.offset().top;h[0]=[ta,ta+A.outerHeight()]}for(var Da=I.offset().top,Ea=w.offset().top,tc=Ea+w.outerHeight(),fb=0;fb<tb;fb++)h.push([x(Da+Xa*fb),x(Da+Xa*(fb+1))])});Ra=new Ob(Na);cb=new Pb(function(h){return k.eq(h)})}function sc(){function a(o,s){sa(o);var v,F=o.length,r=[],J=[];for(v=0;v<F;v++)o[v].allDay?r.push(o[v]):J.push(o[v]);if(u("allDaySlot")){L(e(r),s);ma()}g(d(J),s)}function b(){ha();ua().empty();pa().empty()}function e(o){o=ob(nb(o,m.map(o,Ua),q.visStart,q.visEnd));var s,v=o.length,
+F,r,J,M=[];for(s=0;s<v;s++){F=o[s];for(r=0;r<F.length;r++){J=F[r];J.row=0;J.level=s;M.push(J)}}return M}function d(o){var s=z(),v=ka(),F=ca(),r=xa(N(q.visStart),v),J=m.map(o,f),M,k,D,Z,ja,ia,la=[];for(M=0;M<s;M++){k=ob(nb(o,J,r,xa(N(r),F-v)));vc(k);for(D=0;D<k.length;D++){Z=k[D];for(ja=0;ja<Z.length;ja++){ia=Z[ja];ia.col=M;ia.level=D;la.push(ia)}}ba(r,1,true)}return la}function f(o){return o.end?N(o.end):xa(N(o.start),u("defaultEventMinutes"))}function g(o,s){var v,F=o.length,r,J,M,k,D,Z,ja,ia,la,
+$="",w,I,R={},V={},ea=pa(),aa;v=z();if(w=u("isRTL")){I=-1;aa=v-1}else{I=1;aa=0}for(v=0;v<F;v++){r=o[v];J=r.event;M=qa(r.start,r.start);k=qa(r.start,r.end);D=r.col;Z=r.level;ja=r.forward||0;ia=G(D*I+aa);la=p(D*I+aa)-ia;la=Math.min(la-6,la*0.95);D=Z?la/(Z+ja+1):ja?(la/(ja+1)-6)*2:la;Z=ia+la/(Z+ja+1)*Z*I+(w?la-D:0);r.top=M;r.left=Z;r.outerWidth=D;r.outerHeight=k-M;$+=l(J,r)}ea[0].innerHTML=$;w=ea.children();for(v=0;v<F;v++){r=o[v];J=r.event;$=m(w[v]);I=fa("eventRender",J,J,$);if(I===false)$.remove();
+else{if(I&&I!==true){$.remove();$=m(I).css({position:"absolute",top:r.top,left:r.left}).appendTo(ea)}r.element=$;if(J._id===s)t(J,$,r);else $[0]._fci=v;ya(J,$)}}Db(ea,o,t);for(v=0;v<F;v++){r=o[v];if($=r.element){J=R[s=r.key=Ib($[0])];r.vsides=J===oa?(R[s]=Sa($,true)):J;J=V[s];r.hsides=J===oa?(V[s]=pb($,true)):J;s=$.find("div.fc-event-content");if(s.length)r.contentTop=s[0].offsetTop}}for(v=0;v<F;v++){r=o[v];if($=r.element){$[0].style.width=Math.max(0,r.outerWidth-r.hsides)+"px";R=Math.max(0,r.outerHeight-
+r.vsides);$[0].style.height=R+"px";J=r.event;if(r.contentTop!==oa&&R-r.contentTop<10){$.find("div.fc-event-time").text(Y(J.start,u("timeFormat"))+" - "+J.title);$.find("div.fc-event-title").remove()}fa("eventAfterRender",J,J,$)}}}function l(o,s){var v="<",F=o.url,r=Jb(o,u),J=r?" style='"+r+"'":"",M=["fc-event","fc-event-skin","fc-event-vert"];na(o)&&M.push("fc-event-draggable");s.isStart&&M.push("fc-corner-top");s.isEnd&&M.push("fc-corner-bottom");M=M.concat(o.className);if(o.source)M=M.concat(o.source.className||
+[]);v+=F?"a href='"+Qa(o.url)+"'":"div";v+=" class='"+M.join(" ")+"' style='position:absolute;z-index:8;top:"+s.top+"px;left:"+s.left+"px;"+r+"'><div class='fc-event-inner fc-event-skin'"+J+"><div class='fc-event-head fc-event-skin'"+J+"><div class='fc-event-time'>"+Qa(W(o.start,o.end,u("timeFormat")))+"</div></div><div class='fc-event-content'><div class='fc-event-title'>"+Qa(o.title)+"</div></div><div class='fc-event-bg'></div></div>";if(s.isEnd&&ga(o))v+="<div class='ui-resizable-handle ui-resizable-s'>=</div>";
+v+="</"+(F?"a":"div")+">";return v}function j(o,s,v){na(o)&&y(o,s,v.isStart);v.isEnd&&ga(o)&&c(o,s,v);da(o,s)}function t(o,s,v){var F=s.find("div.fc-event-time");na(o)&&S(o,s,F);v.isEnd&&ga(o)&&Q(o,s,F);da(o,s)}function y(o,s,v){function F(){if(!M){s.width(r).height("").draggable("option","grid",null);M=true}}var r,J,M=true,k,D=u("isRTL")?-1:1,Z=U(),ja=H(),ia=T(),la=ka();s.draggable({zIndex:9,opacity:u("dragOpacity","month"),revertDuration:u("dragRevertDuration"),start:function($,w){fa("eventDragStart",
+s,o,$,w);i(o,s);r=s.width();Z.start(function(I,R,V,ea){B();if(I){J=false;k=ea*D;if(I.row)if(v){if(M){s.width(ja-10);Eb(s,ia*Math.round((o.end?(o.end-o.start)/wc:u("defaultEventMinutes"))/u("slotMinutes")));s.draggable("option","grid",[ja,1]);M=false}}else J=true;else{E(ba(N(o.start),k),ba(Ua(o),k));F()}J=J||M&&!k}else{F();J=true}s.draggable("option","revert",J)},$,"drag")},stop:function($,w){Z.stop();B();fa("eventDragStop",s,o,$,w);if(J){F();s.css("filter","");K(o,s)}else{var I=0;M||(I=Math.round((s.offset().top-
+X().offset().top)/ia)*u("slotMinutes")+la-(o.start.getHours()*60+o.start.getMinutes()));C(this,o,k,I,M,$,w)}}})}function S(o,s,v){function F(I){var R=xa(N(o.start),I),V;if(o.end)V=xa(N(o.end),I);v.text(W(R,V,u("timeFormat")))}function r(){if(M){v.css("display","");s.draggable("option","grid",[$,w]);M=false}}var J,M=false,k,D,Z,ja=u("isRTL")?-1:1,ia=U(),la=z(),$=H(),w=T();s.draggable({zIndex:9,scroll:false,grid:[$,w],axis:la==1?"y":false,opacity:u("dragOpacity"),revertDuration:u("dragRevertDuration"),
+start:function(I,R){fa("eventDragStart",s,o,I,R);i(o,s);J=s.position();D=Z=0;ia.start(function(V,ea,aa,va){s.draggable("option","revert",!V);B();if(V){k=va*ja;if(u("allDaySlot")&&!V.row){if(!M){M=true;v.hide();s.draggable("option","grid",null)}E(ba(N(o.start),k),ba(Ua(o),k))}else r()}},I,"drag")},drag:function(I,R){D=Math.round((R.position.top-J.top)/w)*u("slotMinutes");if(D!=Z){M||F(D);Z=D}},stop:function(I,R){var V=ia.stop();B();fa("eventDragStop",s,o,I,R);if(V&&(k||D||M))C(this,o,k,M?0:D,M,I,R);
+else{r();s.css("filter","");s.css(J);F(0);K(o,s)}}})}function Q(o,s,v){var F,r,J=T();s.resizable({handles:{s:"div.ui-resizable-s"},grid:J,start:function(M,k){F=r=0;i(o,s);s.css("z-index",9);fa("eventResizeStart",this,o,M,k)},resize:function(M,k){F=Math.round((Math.max(J,s.height())-k.originalSize.height)/J);if(F!=r){v.text(W(o.start,!F&&!o.end?null:xa(ra(o),u("slotMinutes")*F),u("timeFormat")));r=F}},stop:function(M,k){fa("eventResizeStop",this,o,M,k);if(F)P(this,o,0,u("slotMinutes")*F,M,k);else{s.css("z-index",
+8);K(o,s)}}})}var q=this;q.renderEvents=a;q.compileDaySegs=e;q.clearEvents=b;q.slotSegHtml=l;q.bindDaySeg=j;Qb.call(q);var u=q.opt,fa=q.trigger,na=q.isEventDraggable,ga=q.isEventResizable,ra=q.eventEnd,sa=q.reportEvents,ha=q.reportEventClear,da=q.eventElementHandlers,ma=q.setHeight,ua=q.getDaySegmentContainer,pa=q.getSlotSegmentContainer,U=q.getHoverListener,ca=q.getMaxMinute,ka=q.getMinMinute,qa=q.timePosition,G=q.colContentLeft,p=q.colContentRight,L=q.renderDaySegs,c=q.resizableDayEvent,z=q.getColCnt,
+H=q.getColWidth,T=q.getSlotHeight,X=q.getBodyContent,ya=q.reportEventElement,K=q.showEvents,i=q.hideEvents,C=q.eventDrop,P=q.eventResize,E=q.renderDayOverlay,B=q.clearOverlays,n=q.calendar,Y=n.formatDate,W=n.formatDates}function vc(a){var b,e,d,f,g,l;for(b=a.length-1;b>0;b--){f=a[b];for(e=0;e<f.length;e++){g=f[e];for(d=0;d<a[b-1].length;d++){l=a[b-1][d];if(Cb(g,l))l.forward=Math.max(l.forward||0,(g.forward||0)+1)}}}}function Kb(a,b,e){function d(G,p){G=qa[G];if(typeof G=="object")return jb(G,p||e);
+return G}function f(G,p){return b.trigger.apply(b,[G,p||da].concat(Array.prototype.slice.call(arguments,2),[da]))}function g(G){return j(G)&&!d("disableDragging")}function l(G){return j(G)&&!d("disableResizing")}function j(G){return Ta(G.editable,(G.source||{}).editable,d("editable"))}function t(G){U={};var p,L=G.length,c;for(p=0;p<L;p++){c=G[p];if(U[c._id])U[c._id].push(c);else U[c._id]=[c]}}function y(G){return G.end?N(G.end):ma(G)}function S(G,p){ca.push(p);if(ka[G._id])ka[G._id].push(p);else ka[G._id]=
+[p]}function Q(){ca=[];ka={}}function q(G,p){p.click(function(L){if(!p.hasClass("ui-draggable-dragging")&&!p.hasClass("ui-resizable-resizing"))return f("eventClick",this,G,L)}).hover(function(L){f("eventMouseover",this,G,L)},function(L){f("eventMouseout",this,G,L)})}function u(G,p){na(G,p,"show")}function fa(G,p){na(G,p,"hide")}function na(G,p,L){G=ka[G._id];var c,z=G.length;for(c=0;c<z;c++)if(!p||G[c][0]!=p[0])G[c][L]()}function ga(G,p,L,c,z,H,T){var X=p.allDay,ya=p._id;sa(U[ya],L,c,z);f("eventDrop",
+G,p,L,c,z,function(){sa(U[ya],-L,-c,X);pa(ya)},H,T);pa(ya)}function ra(G,p,L,c,z,H){var T=p._id;ha(U[T],L,c);f("eventResize",G,p,L,c,function(){ha(U[T],-L,-c);pa(T)},z,H);pa(T)}function sa(G,p,L,c){L=L||0;for(var z,H=G.length,T=0;T<H;T++){z=G[T];if(c!==oa)z.allDay=c;xa(ba(z.start,p,true),L);if(z.end)z.end=xa(ba(z.end,p,true),L);ua(z,qa)}}function ha(G,p,L){L=L||0;for(var c,z=G.length,H=0;H<z;H++){c=G[H];c.end=xa(ba(y(c),p,true),L);ua(c,qa)}}var da=this;da.element=a;da.calendar=b;da.name=e;da.opt=
+d;da.trigger=f;da.isEventDraggable=g;da.isEventResizable=l;da.reportEvents=t;da.eventEnd=y;da.reportEventElement=S;da.reportEventClear=Q;da.eventElementHandlers=q;da.showEvents=u;da.hideEvents=fa;da.eventDrop=ga;da.eventResize=ra;var ma=da.defaultEventEnd,ua=b.normalizeEvent,pa=b.reportEventChange,U={},ca=[],ka={},qa=b.options}function Qb(){function a(i,C){var P=z(),E=pa(),B=U(),n=0,Y,W,o=i.length,s,v;P[0].innerHTML=e(i);d(i,P.children());f(i);g(i,P,C);l(i);j(i);t(i);C=y();for(P=0;P<E;P++){Y=[];for(W=
+0;W<B;W++)Y[W]=0;for(;n<o&&(s=i[n]).row==P;){W=Hb(Y.slice(s.startCol,s.endCol));s.top=W;W+=s.outerHeight;for(v=s.startCol;v<s.endCol;v++)Y[v]=W;n++}C[P].height(Hb(Y))}Q(i,S(C))}function b(i,C,P){var E=m("<div/>"),B=z(),n=i.length,Y;E[0].innerHTML=e(i);E=E.children();B.append(E);d(i,E);l(i);j(i);t(i);Q(i,S(y()));E=[];for(B=0;B<n;B++)if(Y=i[B].element){i[B].row===C&&Y.css("top",P);E.push(Y[0])}return m(E)}function e(i){var C=fa("isRTL"),P,E=i.length,B,n,Y,W;P=ka();var o=P.left,s=P.right,v,F,r,J,M,k=
+"";for(P=0;P<E;P++){B=i[P];n=B.event;W=["fc-event","fc-event-skin","fc-event-hori"];ga(n)&&W.push("fc-event-draggable");if(C){B.isStart&&W.push("fc-corner-right");B.isEnd&&W.push("fc-corner-left");v=p(B.end.getDay()-1);F=p(B.start.getDay());r=B.isEnd?qa(v):o;J=B.isStart?G(F):s}else{B.isStart&&W.push("fc-corner-left");B.isEnd&&W.push("fc-corner-right");v=p(B.start.getDay());F=p(B.end.getDay()-1);r=B.isStart?qa(v):o;J=B.isEnd?G(F):s}W=W.concat(n.className);if(n.source)W=W.concat(n.source.className||
+[]);Y=n.url;M=Jb(n,fa);k+=Y?"<a href='"+Qa(Y)+"'":"<div";k+=" class='"+W.join(" ")+"' style='position:absolute;z-index:8;left:"+r+"px;"+M+"'><div class='fc-event-inner fc-event-skin'"+(M?" style='"+M+"'":"")+">";if(!n.allDay&&B.isStart)k+="<span class='fc-event-time'>"+Qa(T(n.start,n.end,fa("timeFormat")))+"</span>";k+="<span class='fc-event-title'>"+Qa(n.title)+"</span></div>";if(B.isEnd&&ra(n))k+="<div class='ui-resizable-handle ui-resizable-"+(C?"w":"e")+"'>&nbsp;&nbsp;&nbsp;</div>";k+="</"+(Y?
+"a":"div")+">";B.left=r;B.outerWidth=J-r;B.startCol=v;B.endCol=F+1}return k}function d(i,C){var P,E=i.length,B,n,Y;for(P=0;P<E;P++){B=i[P];n=B.event;Y=m(C[P]);n=na("eventRender",n,n,Y);if(n===false)Y.remove();else{if(n&&n!==true){n=m(n).css({position:"absolute",left:B.left});Y.replaceWith(n);Y=n}B.element=Y}}}function f(i){var C,P=i.length,E,B;for(C=0;C<P;C++){E=i[C];(B=E.element)&&ha(E.event,B)}}function g(i,C,P){var E,B=i.length,n,Y,W;for(E=0;E<B;E++){n=i[E];if(Y=n.element){W=n.event;if(W._id===
+P)H(W,Y,n);else Y[0]._fci=E}}Db(C,i,H)}function l(i){var C,P=i.length,E,B,n,Y,W={};for(C=0;C<P;C++){E=i[C];if(B=E.element){n=E.key=Ib(B[0]);Y=W[n];if(Y===oa)Y=W[n]=pb(B,true);E.hsides=Y}}}function j(i){var C,P=i.length,E,B;for(C=0;C<P;C++){E=i[C];if(B=E.element)B[0].style.width=Math.max(0,E.outerWidth-E.hsides)+"px"}}function t(i){var C,P=i.length,E,B,n,Y,W={};for(C=0;C<P;C++){E=i[C];if(B=E.element){n=E.key;Y=W[n];if(Y===oa)Y=W[n]=Fb(B);E.outerHeight=B[0].offsetHeight+Y}}}function y(){var i,C=pa(),
+P=[];for(i=0;i<C;i++)P[i]=ca(i).find("td:first div.fc-day-content > div");return P}function S(i){var C,P=i.length,E=[];for(C=0;C<P;C++)E[C]=i[C][0].offsetTop;return E}function Q(i,C){var P,E=i.length,B,n;for(P=0;P<E;P++){B=i[P];if(n=B.element){n[0].style.top=C[B.row]+(B.top||0)+"px";B=B.event;na("eventAfterRender",B,B,n)}}}function q(i,C,P){var E=fa("isRTL"),B=E?"w":"e",n=C.find("div.ui-resizable-"+B),Y=false;qb(C);C.mousedown(function(W){W.preventDefault()}).click(function(W){if(Y){W.preventDefault();
+W.stopImmediatePropagation()}});n.mousedown(function(W){function o(ia){na("eventResizeStop",this,i,ia);m("body").css("cursor","");s.stop();ya();k&&ua(this,i,k,0,ia);setTimeout(function(){Y=false},0)}if(W.which==1){Y=true;var s=u.getHoverListener(),v=pa(),F=U(),r=E?-1:1,J=E?F-1:0,M=C.css("top"),k,D,Z=m.extend({},i),ja=L(i.start);K();m("body").css("cursor",B+"-resize").one("mouseup",o);na("eventResizeStart",this,i,W);s.start(function(ia,la){if(ia){var $=Math.max(ja.row,ia.row);ia=ia.col;if(v==1)$=0;
+if($==ja.row)ia=E?Math.min(ja.col,ia):Math.max(ja.col,ia);k=$*7+ia*r+J-(la.row*7+la.col*r+J);la=ba(sa(i),k,true);if(k){Z.end=la;$=D;D=b(c([Z]),P.row,M);D.find("*").css("cursor",B+"-resize");$&&$.remove();ma(i)}else if(D){da(i);D.remove();D=null}ya();X(i.start,ba(N(la),1))}},W)}})}var u=this;u.renderDaySegs=a;u.resizableDayEvent=q;var fa=u.opt,na=u.trigger,ga=u.isEventDraggable,ra=u.isEventResizable,sa=u.eventEnd,ha=u.reportEventElement,da=u.showEvents,ma=u.hideEvents,ua=u.eventResize,pa=u.getRowCnt,
+U=u.getColCnt,ca=u.allDayRow,ka=u.allDayBounds,qa=u.colContentLeft,G=u.colContentRight,p=u.dayOfWeekCol,L=u.dateCell,c=u.compileDaySegs,z=u.getDaySegmentContainer,H=u.bindDaySeg,T=u.calendar.formatDates,X=u.renderDayOverlay,ya=u.clearOverlays,K=u.clearSelection}function Mb(){function a(Q,q,u){b();q||(q=j(Q,u));t(Q,q,u);e(Q,q,u)}function b(Q){if(S){S=false;y();l("unselect",null,Q)}}function e(Q,q,u,fa){S=true;l("select",null,Q,q,u,fa)}function d(Q){var q=f.cellDate,u=f.cellIsAllDay,fa=f.getHoverListener(),
+na=f.reportDayClick;if(Q.which==1&&g("selectable")){b(Q);var ga;fa.start(function(ra,sa){y();if(ra&&u(ra)){ga=[q(sa),q(ra)].sort(Gb);t(ga[0],ga[1],true)}else ga=null},Q);m(document).one("mouseup",function(ra){fa.stop();if(ga){+ga[0]==+ga[1]&&na(ga[0],true,ra);e(ga[0],ga[1],true,ra)}})}}var f=this;f.select=a;f.unselect=b;f.reportSelection=e;f.daySelectionMousedown=d;var g=f.opt,l=f.trigger,j=f.defaultSelectionEnd,t=f.renderSelection,y=f.clearSelection,S=false;g("selectable")&&g("unselectAuto")&&m(document).mousedown(function(Q){var q=
+g("unselectCancel");if(q)if(m(Q.target).parents(q).length)return;b(Q)})}function Lb(){function a(g,l){var j=f.shift();j||(j=m("<div class='fc-cell-overlay' style='position:absolute;z-index:3'/>"));j[0].parentNode!=l[0]&&j.appendTo(l);d.push(j.css(g).show());return j}function b(){for(var g;g=d.shift();)f.push(g.hide().unbind())}var e=this;e.renderOverlay=a;e.clearOverlays=b;var d=[],f=[]}function Nb(a){var b=this,e,d;b.build=function(){e=[];d=[];a(e,d)};b.cell=function(f,g){var l=e.length,j=d.length,
+t,y=-1,S=-1;for(t=0;t<l;t++)if(g>=e[t][0]&&g<e[t][1]){y=t;break}for(t=0;t<j;t++)if(f>=d[t][0]&&f<d[t][1]){S=t;break}return y>=0&&S>=0?{row:y,col:S}:null};b.rect=function(f,g,l,j,t){t=t.offset();return{top:e[f][0]-t.top,left:d[g][0]-t.left,width:d[j][1]-d[g][0],height:e[l][1]-e[f][0]}}}function Ob(a){function b(j){j=a.cell(j.pageX,j.pageY);if(!j!=!l||j&&(j.row!=l.row||j.col!=l.col)){if(j){g||(g=j);f(j,g,j.row-g.row,j.col-g.col)}else f(j,g);l=j}}var e=this,d,f,g,l;e.start=function(j,t,y){f=j;g=l=null;
+a.build();b(t);d=y||"mousemove";m(document).bind(d,b)};e.stop=function(){m(document).unbind(d,b);return l}}function Pb(a){function b(l){return d[l]=d[l]||a(l)}var e=this,d={},f={},g={};e.left=function(l){return f[l]=f[l]===oa?b(l).position().left:f[l]};e.right=function(l){return g[l]=g[l]===oa?e.left(l)+b(l).width():g[l]};e.clear=function(){d={};f={};g={}}}var Ya={defaultView:"month",aspectRatio:1.35,header:{left:"title",center:"",right:"today prev,next"},weekends:true,allDayDefault:true,ignoreTimezone:true,
+lazyFetching:true,startParam:"start",endParam:"end",titleFormat:{month:"MMMM yyyy",week:"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",day:"dddd, MMM d, yyyy"},columnFormat:{month:"ddd",week:"ddd M/d",day:"dddd M/d"},timeFormat:{"":"h(:mm)t"},isRTL:false,firstDay:0,monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday",
+"Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],buttonText:{prev:"&nbsp;&#9668;&nbsp;",next:"&nbsp;&#9658;&nbsp;",prevYear:"&nbsp;&lt;&lt;&nbsp;",nextYear:"&nbsp;&gt;&gt;&nbsp;",today:"today",month:"month",week:"week",day:"day"},theme:false,buttonIcons:{prev:"circle-triangle-w",next:"circle-triangle-e"},unselectAuto:true,dropAccept:"*"},xc={header:{left:"next,prev today",center:"",right:"title"},buttonText:{prev:"&nbsp;&#9658;&nbsp;",next:"&nbsp;&#9668;&nbsp;",
+prevYear:"&nbsp;&gt;&gt;&nbsp;",nextYear:"&nbsp;&lt;&lt;&nbsp;"},buttonIcons:{prev:"circle-triangle-e",next:"circle-triangle-w"}},Aa=m.fullCalendar={version:"1.5.2"},Ja=Aa.views={};m.fn.fullCalendar=function(a){if(typeof a=="string"){var b=Array.prototype.slice.call(arguments,1),e;this.each(function(){var f=m.data(this,"fullCalendar");if(f&&m.isFunction(f[a])){f=f[a].apply(f,b);if(e===oa)e=f;a=="destroy"&&m.removeData(this,"fullCalendar")}});if(e!==oa)return e;return this}var d=a.eventSources||[];
+delete a.eventSources;if(a.events){d.push(a.events);delete a.events}a=m.extend(true,{},Ya,a.isRTL||a.isRTL===oa&&Ya.isRTL?xc:{},a);this.each(function(f,g){f=m(g);g=new Yb(f,a,d);f.data("fullCalendar",g);g.render()});return this};Aa.sourceNormalizers=[];Aa.sourceFetchers=[];var ac={dataType:"json",cache:false},bc=1;Aa.addDays=ba;Aa.cloneDate=N;Aa.parseDate=kb;Aa.parseISO8601=Bb;Aa.parseTime=mb;Aa.formatDate=Oa;Aa.formatDates=ib;var lc=["sun","mon","tue","wed","thu","fri","sat"],Ab=864E5,cc=36E5,wc=
+6E4,dc={s:function(a){return a.getSeconds()},ss:function(a){return Pa(a.getSeconds())},m:function(a){return a.getMinutes()},mm:function(a){return Pa(a.getMinutes())},h:function(a){return a.getHours()%12||12},hh:function(a){return Pa(a.getHours()%12||12)},H:function(a){return a.getHours()},HH:function(a){return Pa(a.getHours())},d:function(a){return a.getDate()},dd:function(a){return Pa(a.getDate())},ddd:function(a,b){return b.dayNamesShort[a.getDay()]},dddd:function(a,b){return b.dayNames[a.getDay()]},
+M:function(a){return a.getMonth()+1},MM:function(a){return Pa(a.getMonth()+1)},MMM:function(a,b){return b.monthNamesShort[a.getMonth()]},MMMM:function(a,b){return b.monthNames[a.getMonth()]},yy:function(a){return(a.getFullYear()+"").substring(2)},yyyy:function(a){return a.getFullYear()},t:function(a){return a.getHours()<12?"a":"p"},tt:function(a){return a.getHours()<12?"am":"pm"},T:function(a){return a.getHours()<12?"A":"P"},TT:function(a){return a.getHours()<12?"AM":"PM"},u:function(a){return Oa(a,
+"yyyy-MM-dd'T'HH:mm:ss'Z'")},S:function(a){a=a.getDate();if(a>10&&a<20)return"th";return["st","nd","rd"][a%10-1]||"th"}};Aa.applyAll=$a;Ja.month=mc;Ja.basicWeek=nc;Ja.basicDay=oc;wb({weekMode:"fixed"});Ja.agendaWeek=qc;Ja.agendaDay=rc;wb({allDaySlot:true,allDayText:"all-day",firstHour:6,slotMinutes:30,defaultEventMinutes:120,axisFormat:"h(:mm)tt",timeFormat:{agenda:"h:mm{ - h:mm}"},dragOpacity:{agenda:0.5},minTime:0,maxTime:24})})(jQuery);
diff --git a/3rdparty/fullcalendar/js/gcal.js b/3rdparty/fullcalendar/js/gcal.js
new file mode 100644
index 00000000000..709e25cb262
--- /dev/null
+++ b/3rdparty/fullcalendar/js/gcal.js
@@ -0,0 +1,112 @@
+/*
+ * FullCalendar v1.5.2 Google Calendar Plugin
+ *
+ * Copyright (c) 2011 Adam Shaw
+ * Dual licensed under the MIT and GPL licenses, located in
+ * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
+ *
+ * Date: Sun Aug 21 22:06:09 2011 -0700
+ *
+ */
+
+(function($) {
+
+
+var fc = $.fullCalendar;
+var formatDate = fc.formatDate;
+var parseISO8601 = fc.parseISO8601;
+var addDays = fc.addDays;
+var applyAll = fc.applyAll;
+
+
+fc.sourceNormalizers.push(function(sourceOptions) {
+	if (sourceOptions.dataType == 'gcal' ||
+		sourceOptions.dataType === undefined &&
+		(sourceOptions.url || '').match(/^(http|https):\/\/www.google.com\/calendar\/feeds\//)) {
+			sourceOptions.dataType = 'gcal';
+			if (sourceOptions.editable === undefined) {
+				sourceOptions.editable = false;
+			}
+		}
+});
+
+
+fc.sourceFetchers.push(function(sourceOptions, start, end) {
+	if (sourceOptions.dataType == 'gcal') {
+		return transformOptions(sourceOptions, start, end);
+	}
+});
+
+
+function transformOptions(sourceOptions, start, end) {
+
+	var success = sourceOptions.success;
+	var data = $.extend({}, sourceOptions.data || {}, {
+		'start-min': formatDate(start, 'u'),
+		'start-max': formatDate(end, 'u'),
+		'singleevents': true,
+		'max-results': 9999
+	});
+
+	var ctz = sourceOptions.currentTimezone;
+	if (ctz) {
+		data.ctz = ctz = ctz.replace(' ', '_');
+	}
+
+	return $.extend({}, sourceOptions, {
+		url: sourceOptions.url.replace(/\/basic$/, '/full') + '?alt=json-in-script&callback=?',
+		dataType: 'jsonp',
+		data: data,
+		startParam: false,
+		endParam: false,
+		success: function(data) {
+			var events = [];
+			if (data.feed.entry) {
+				$.each(data.feed.entry, function(i, entry) {
+					var startStr = entry['gd$when'][0]['startTime'];
+					var start = parseISO8601(startStr, true);
+					var end = parseISO8601(entry['gd$when'][0]['endTime'], true);
+					var allDay = startStr.indexOf('T') == -1;
+					var url;
+					$.each(entry.link, function(i, link) {
+						if (link.type == 'text/html') {
+							url = link.href;
+							if (ctz) {
+								url += (url.indexOf('?') == -1 ? '?' : '&') + 'ctz=' + ctz;
+							}
+						}
+					});
+					if (allDay) {
+						addDays(end, -1); // make inclusive
+					}
+					events.push({
+						id: entry['gCal$uid']['value'],
+						title: entry['title']['$t'],
+						url: url,
+						start: start,
+						end: end,
+						allDay: allDay,
+						location: entry['gd$where'][0]['valueString'],
+						description: entry['content']['$t']
+					});
+				});
+			}
+			var args = [events].concat(Array.prototype.slice.call(arguments, 1));
+			var res = applyAll(success, this, args);
+			if ($.isArray(res)) {
+				return res;
+			}
+			return events;
+		}
+	});
+
+}
+
+
+// legacy
+fc.gcalFeed = function(url, sourceOptions) {
+	return $.extend({}, sourceOptions, { url: url, dataType: 'gcal' });
+};
+
+
+})(jQuery);
diff --git a/3rdparty/js/chosen/VERSION b/3rdparty/js/chosen/VERSION
index f374f6662e9..b0bb878545d 100644
--- a/3rdparty/js/chosen/VERSION
+++ b/3rdparty/js/chosen/VERSION
@@ -1 +1 @@
-0.9.1
+0.9.5
diff --git a/3rdparty/js/chosen/chosen.jquery.js b/3rdparty/js/chosen/chosen.jquery.js
index 5ea409d90e3..e7e661c0962 100644
--- a/3rdparty/js/chosen/chosen.jquery.js
+++ b/3rdparty/js/chosen/chosen.jquery.js
@@ -1,7 +1,7 @@
 // Chosen, a Select Box Enhancer for jQuery and Protoype
 // by Patrick Filler for Harvest, http://getharvest.com
 // 
-// Version 0.9
+// Version 0.9.5
 // Full source at https://github.com/harvesthq/chosen
 // Copyright (c) 2011 Harvest http://getharvest.com
 
@@ -16,18 +16,22 @@
   root = this;
   $ = jQuery;
   $.fn.extend({
-    chosen: function(data, options) {
+    chosen: function(options) {
+      if ($.browser === "msie" && ($.browser.version === "6.0" || $.browser.version === "7.0")) {
+        return this;
+      }
       return $(this).each(function(input_field) {
         if (!($(this)).hasClass("chzn-done")) {
-          return new Chosen(this, data, options);
+          return new Chosen(this, options);
         }
       });
     }
   });
   Chosen = (function() {
-    function Chosen(elmn) {
+    function Chosen(form_field, options) {
+      this.form_field = form_field;
+      this.options = options != null ? options : {};
       this.set_default_values();
-      this.form_field = elmn;
       this.form_field_jq = $(this.form_field);
       this.is_multiple = this.form_field.multiple;
       this.is_rtl = this.form_field_jq.hasClass("chzn-rtl");
@@ -40,22 +44,28 @@
       this.click_test_action = __bind(function(evt) {
         return this.test_active_click(evt);
       }, this);
+      this.activate_action = __bind(function(evt) {
+        return this.activate_field(evt);
+      }, this);
       this.active_field = false;
       this.mouse_on_container = false;
       this.results_showing = false;
       this.result_highlighted = null;
       this.result_single_selected = null;
-      return this.choices = 0;
+      this.allow_single_deselect = (this.options.allow_single_deselect != null) && this.form_field.options[0].text === "" ? this.options.allow_single_deselect : false;
+      this.disable_search_threshold = this.options.disable_search_threshold || 0;
+      this.choices = 0;
+      return this.results_none_found = this.options.no_results_text || "No results match";
     };
     Chosen.prototype.set_up_html = function() {
       var container_div, dd_top, dd_width, sf_width;
       this.container_id = this.form_field.id.length ? this.form_field.id.replace(/(:|\.)/g, '_') : this.generate_field_id();
       this.container_id += "_chzn";
-      this.f_width = this.form_field_jq.width();
+      this.f_width = this.form_field_jq.outerWidth();
       this.default_text = this.form_field_jq.data('placeholder') ? this.form_field_jq.data('placeholder') : this.default_text_default;
       container_div = $("<div />", {
         id: this.container_id,
-        "class": "chzn-container " + (this.is_rtl ? ' chzn-rtl' : void 0),
+        "class": "chzn-container" + (this.is_rtl ? ' chzn-rtl' : ''),
         style: 'width: ' + this.f_width + 'px;'
       });
       if (this.is_multiple) {
@@ -66,6 +76,9 @@
       this.form_field_jq.hide().after(container_div);
       this.container = $('#' + this.container_id);
       this.container.addClass("chzn-container-" + (this.is_multiple ? "multi" : "single"));
+      if (!this.is_multiple && this.form_field.options.length <= this.disable_search_threshold) {
+        this.container.addClass("chzn-container-single-nosearch");
+      }
       this.dropdown = this.container.find('div.chzn-drop').first();
       dd_top = this.container.height();
       dd_width = this.f_width - get_side_border_padding(this.dropdown);
@@ -92,8 +105,11 @@
       return this.set_tab_index();
     };
     Chosen.prototype.register_observers = function() {
-      this.container.click(__bind(function(evt) {
-        return this.container_click(evt);
+      this.container.mousedown(__bind(function(evt) {
+        return this.container_mousedown(evt);
+      }, this));
+      this.container.mouseup(__bind(function(evt) {
+        return this.container_mouseup(evt);
       }, this));
       this.container.mouseenter(__bind(function(evt) {
         return this.mouse_enter(evt);
@@ -101,8 +117,8 @@
       this.container.mouseleave(__bind(function(evt) {
         return this.mouse_leave(evt);
       }, this));
-      this.search_results.click(__bind(function(evt) {
-        return this.search_results_click(evt);
+      this.search_results.mouseup(__bind(function(evt) {
+        return this.search_results_mouseup(evt);
       }, this));
       this.search_results.mouseover(__bind(function(evt) {
         return this.search_results_mouseover(evt);
@@ -129,30 +145,52 @@
         return this.search_field.focus(__bind(function(evt) {
           return this.input_focus(evt);
         }, this));
-      } else {
-        return this.selected_item.focus(__bind(function(evt) {
-          return this.activate_field(evt);
-        }, this));
       }
     };
-    Chosen.prototype.container_click = function(evt) {
-      if (evt && evt.type === "click") {
-        evt.stopPropagation();
+    Chosen.prototype.search_field_disabled = function() {
+      this.is_disabled = this.form_field_jq.attr('disabled');
+      if (this.is_disabled) {
+        this.container.addClass('chzn-disabled');
+        this.search_field.attr('disabled', true);
+        if (!this.is_multiple) {
+          this.selected_item.unbind("focus", this.activate_action);
+        }
+        return this.close_field();
+      } else {
+        this.container.removeClass('chzn-disabled');
+        this.search_field.attr('disabled', false);
+        if (!this.is_multiple) {
+          return this.selected_item.bind("focus", this.activate_action);
+        }
       }
-      if (!this.pending_destroy_click) {
-        if (!this.active_field) {
-          if (this.is_multiple) {
-            this.search_field.val("");
+    };
+    Chosen.prototype.container_mousedown = function(evt) {
+      var target_closelink;
+      if (!this.is_disabled) {
+        target_closelink = evt != null ? ($(evt.target)).hasClass("search-choice-close") : false;
+        if (evt && evt.type === "mousedown") {
+          evt.stopPropagation();
+        }
+        if (!this.pending_destroy_click && !target_closelink) {
+          if (!this.active_field) {
+            if (this.is_multiple) {
+              this.search_field.val("");
+            }
+            $(document).click(this.click_test_action);
+            this.results_show();
+          } else if (!this.is_multiple && evt && ($(evt.target) === this.selected_item || $(evt.target).parents("a.chzn-single").length)) {
+            evt.preventDefault();
+            this.results_toggle();
           }
-          $(document).click(this.click_test_action);
-          this.results_show();
-        } else if (!this.is_multiple && evt && ($(evt.target) === this.selected_item || $(evt.target).parents("a.chzn-single").length)) {
-          evt.preventDefault();
-          this.results_toggle();
+          return this.activate_field();
+        } else {
+          return this.pending_destroy_click = false;
         }
-        return this.activate_field();
-      } else {
-        return this.pending_destroy_click = false;
+      }
+    };
+    Chosen.prototype.container_mouseup = function(evt) {
+      if (evt.target.nodeName === "ABBR") {
+        return this.results_reset(evt);
       }
     };
     Chosen.prototype.mouse_enter = function() {
@@ -164,7 +202,7 @@
     Chosen.prototype.input_focus = function(evt) {
       if (!this.active_field) {
         return setTimeout((__bind(function() {
-          return this.container_click();
+          return this.container_mousedown();
         }, this)), 50);
       }
     };
@@ -235,9 +273,13 @@
             this.choice_build(data);
           } else if (data.selected && !this.is_multiple) {
             this.selected_item.find("span").text(data.text);
+            if (this.allow_single_deselect) {
+              this.selected_item.find("span").first().after("<abbr class=\"search-choice-close\"></abbr>");
+            }
           }
         }
       }
+      this.search_field_disabled();
       this.show_search_field_default();
       this.search_field_scale();
       this.search_results.html(content);
@@ -252,7 +294,7 @@
       }
     };
     Chosen.prototype.result_add_option = function(option) {
-      var classes;
+      var classes, style;
       if (!option.disabled) {
         option.dom_id = this.container_id + "_o_" + option.array_index;
         classes = option.selected && this.is_multiple ? [] : ["active-result"];
@@ -262,7 +304,11 @@
         if (option.group_array_index != null) {
           classes.push("group-option");
         }
-        return '<li id="' + option.dom_id + '" class="' + classes.join(' ') + '">' + option.html + '</li>';
+        if (option.classes !== "") {
+          classes.push(option.classes);
+        }
+        style = option.style.cssText !== "" ? " style=\"" + option.style + "\"" : "";
+        return '<li id="' + option.dom_id + '" class="' + classes.join(' ') + '"' + style + '>' + option.html + '</li>';
       } else {
         return "";
       }
@@ -353,12 +399,12 @@
         return this.search_field.removeClass("default");
       }
     };
-    Chosen.prototype.search_results_click = function(evt) {
+    Chosen.prototype.search_results_mouseup = function(evt) {
       var target;
       target = $(evt.target).hasClass("active-result") ? $(evt.target) : $(evt.target).parents(".active-result").first();
       if (target.length) {
         this.result_highlight = target;
-        return this.result_select();
+        return this.result_select(evt);
       }
     };
     Chosen.prototype.search_results_mouseover = function(evt) {
@@ -391,8 +437,12 @@
     };
     Chosen.prototype.choice_destroy_link_click = function(evt) {
       evt.preventDefault();
-      this.pending_destroy_click = true;
-      return this.choice_destroy($(evt.target));
+      if (!this.is_disabled) {
+        this.pending_destroy_click = true;
+        return this.choice_destroy($(evt.target));
+      } else {
+        return evt.stopPropagation;
+      }
     };
     Chosen.prototype.choice_destroy = function(link) {
       this.choices -= 1;
@@ -403,18 +453,29 @@
       this.result_deselect(link.attr("rel"));
       return link.parents('li').first().remove();
     };
-    Chosen.prototype.result_select = function() {
+    Chosen.prototype.results_reset = function(evt) {
+      this.form_field.options[0].selected = true;
+      this.selected_item.find("span").text(this.default_text);
+      this.show_search_field_default();
+      $(evt.target).remove();
+      this.form_field_jq.trigger("change");
+      if (this.active_field) {
+        return this.results_hide();
+      }
+    };
+    Chosen.prototype.result_select = function(evt) {
       var high, high_id, item, position;
       if (this.result_highlight) {
         high = this.result_highlight;
         high_id = high.attr("id");
         this.result_clear_highlight();
-        high.addClass("result-selected");
         if (this.is_multiple) {
           this.result_deactivate(high);
         } else {
+          this.search_results.find(".result-selected").removeClass("result-selected");
           this.result_single_selected = high;
         }
+        high.addClass("result-selected");
         position = high_id.substr(high_id.lastIndexOf("_") + 1);
         item = this.results_data[position];
         item.selected = true;
@@ -423,18 +484,23 @@
           this.choice_build(item);
         } else {
           this.selected_item.find("span").first().text(item.text);
+          if (this.allow_single_deselect) {
+            this.selected_item.find("span").first().after("<abbr class=\"search-choice-close\"></abbr>");
+          }
+        }
+        if (!(evt.metaKey && this.is_multiple)) {
+          this.results_hide();
         }
-        this.results_hide();
         this.search_field.val("");
         this.form_field_jq.trigger("change");
         return this.search_field_scale();
       }
     };
     Chosen.prototype.result_activate = function(el) {
-      return el.addClass("active-result").show();
+      return el.addClass("active-result");
     };
     Chosen.prototype.result_deactivate = function(el) {
-      return el.removeClass("active-result").hide();
+      return el.removeClass("active-result");
     };
     Chosen.prototype.result_deselect = function(pos) {
       var result, result_data;
@@ -530,17 +596,18 @@
       return _results;
     };
     Chosen.prototype.winnow_results_set_highlight = function() {
-      var do_high;
+      var do_high, selected_results;
       if (!this.result_highlight) {
-        do_high = this.search_results.find(".active-result").first();
-        if (do_high) {
+        selected_results = !this.is_multiple ? this.search_results.find(".result-selected.active-result") : [];
+        do_high = selected_results.length ? selected_results.first() : this.search_results.find(".active-result").first();
+        if (do_high != null) {
           return this.result_do_highlight(do_high);
         }
       }
     };
     Chosen.prototype.no_results = function(terms) {
       var no_results_html;
-      no_results_html = $('<li class="no-results">No results match "<span></span>"</li>');
+      no_results_html = $('<li class="no-results">' + this.results_none_found + ' "<span></span>"</li>');
       no_results_html.find("span").first().html(terms);
       return this.search_results.append(no_results_html);
     };
@@ -611,7 +678,7 @@
         case 13:
           evt.preventDefault();
           if (this.results_showing) {
-            return this.result_select();
+            return this.result_select(evt);
           }
           break;
         case 27:
@@ -623,6 +690,8 @@
         case 38:
         case 40:
         case 16:
+        case 91:
+        case 17:
           break;
         default:
           return this.results_search();
@@ -758,7 +827,9 @@
             html: option.innerHTML,
             selected: option.selected,
             disabled: group_disabled === true ? group_disabled : option.disabled,
-            group_array_index: group_position
+            group_array_index: group_position,
+            classes: option.className,
+            style: option.style.cssText
           });
         } else {
           this.parsed.push({
diff --git a/3rdparty/js/chosen/chosen.jquery.min.js b/3rdparty/js/chosen/chosen.jquery.min.js
index 1d6a6983d8a..371ee53e7a3 100644
--- a/3rdparty/js/chosen/chosen.jquery.min.js
+++ b/3rdparty/js/chosen/chosen.jquery.min.js
@@ -1,10 +1,10 @@
 // Chosen, a Select Box Enhancer for jQuery and Protoype
 // by Patrick Filler for Harvest, http://getharvest.com
 // 
-// Version 0.9
+// Version 0.9.5
 // Full source at https://github.com/harvesthq/chosen
 // Copyright (c) 2011 Harvest http://getharvest.com
 
 // MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
 // This file is generated by `cake build`, do not edit it by hand.
-(function(){var a,b,c,d,e=function(a,b){return function(){return a.apply(b,arguments)}};d=this,a=jQuery,a.fn.extend({chosen:function(c,d){return a(this).each(function(e){if(!a(this).hasClass("chzn-done"))return new b(this,c,d)})}}),b=function(){function b(b){this.set_default_values(),this.form_field=b,this.form_field_jq=a(this.form_field),this.is_multiple=this.form_field.multiple,this.is_rtl=this.form_field_jq.hasClass("chzn-rtl"),this.default_text_default=this.form_field.multiple?"Select Some Options":"Select an Option",this.set_up_html(),this.register_observers(),this.form_field_jq.addClass("chzn-done")}b.prototype.set_default_values=function(){this.click_test_action=e(function(a){return this.test_active_click(a)},this),this.active_field=!1,this.mouse_on_container=!1,this.results_showing=!1,this.result_highlighted=null,this.result_single_selected=null;return this.choices=0},b.prototype.set_up_html=function(){var b,d,e,f;this.container_id=this.form_field.id.length?this.form_field.id.replace(/(:|\.)/g,"_"):this.generate_field_id(),this.container_id+="_chzn",this.f_width=this.form_field_jq.width(),this.default_text=this.form_field_jq.data("placeholder")?this.form_field_jq.data("placeholder"):this.default_text_default,b=a("<div />",{id:this.container_id,"class":"chzn-container "+(this.is_rtl?" chzn-rtl":void 0),style:"width: "+this.f_width+"px;"}),this.is_multiple?b.html('<ul class="chzn-choices"><li class="search-field"><input type="text" value="'+this.default_text+'" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chzn-drop" style="left:-9000px;"><ul class="chzn-results"></ul></div>'):b.html('<a href="javascript:void(0)" class="chzn-single"><span>'+this.default_text+'</span><div><b></b></div></a><div class="chzn-drop" style="left:-9000px;"><div class="chzn-search"><input type="text" autocomplete="off" /></div><ul class="chzn-results"></ul></div>'),this.form_field_jq.hide().after(b),this.container=a("#"+this.container_id),this.container.addClass("chzn-container-"+(this.is_multiple?"multi":"single")),this.dropdown=this.container.find("div.chzn-drop").first(),d=this.container.height(),e=this.f_width-c(this.dropdown),this.dropdown.css({width:e+"px",top:d+"px"}),this.search_field=this.container.find("input").first(),this.search_results=this.container.find("ul.chzn-results").first(),this.search_field_scale(),this.search_no_results=this.container.find("li.no-results").first(),this.is_multiple?(this.search_choices=this.container.find("ul.chzn-choices").first(),this.search_container=this.container.find("li.search-field").first()):(this.search_container=this.container.find("div.chzn-search").first(),this.selected_item=this.container.find(".chzn-single").first(),f=e-c(this.search_container)-c(this.search_field),this.search_field.css({width:f+"px"})),this.results_build();return this.set_tab_index()},b.prototype.register_observers=function(){this.container.click(e(function(a){return this.container_click(a)},this)),this.container.mouseenter(e(function(a){return this.mouse_enter(a)},this)),this.container.mouseleave(e(function(a){return this.mouse_leave(a)},this)),this.search_results.click(e(function(a){return this.search_results_click(a)},this)),this.search_results.mouseover(e(function(a){return this.search_results_mouseover(a)},this)),this.search_results.mouseout(e(function(a){return this.search_results_mouseout(a)},this)),this.form_field_jq.bind("liszt:updated",e(function(a){return this.results_update_field(a)},this)),this.search_field.blur(e(function(a){return this.input_blur(a)},this)),this.search_field.keyup(e(function(a){return this.keyup_checker(a)},this)),this.search_field.keydown(e(function(a){return this.keydown_checker(a)},this));if(this.is_multiple){this.search_choices.click(e(function(a){return this.choices_click(a)},this));return this.search_field.focus(e(function(a){return this.input_focus(a)},this))}return this.selected_item.focus(e(function(a){return this.activate_field(a)},this))},b.prototype.container_click=function(b){b&&b.type==="click"&&b.stopPropagation();if(!this.pending_destroy_click){this.active_field?!this.is_multiple&&b&&(a(b.target)===this.selected_item||a(b.target).parents("a.chzn-single").length)&&(b.preventDefault(),this.results_toggle()):(this.is_multiple&&this.search_field.val(""),a(document).click(this.click_test_action),this.results_show());return this.activate_field()}return this.pending_destroy_click=!1},b.prototype.mouse_enter=function(){return this.mouse_on_container=!0},b.prototype.mouse_leave=function(){return this.mouse_on_container=!1},b.prototype.input_focus=function(a){if(!this.active_field)return setTimeout(e(function(){return this.container_click()},this),50)},b.prototype.input_blur=function(a){if(!this.mouse_on_container){this.active_field=!1;return setTimeout(e(function(){return this.blur_test()},this),100)}},b.prototype.blur_test=function(a){if(!this.active_field&&this.container.hasClass("chzn-container-active"))return this.close_field()},b.prototype.close_field=function(){a(document).unbind("click",this.click_test_action),this.is_multiple||(this.selected_item.attr("tabindex",this.search_field.attr("tabindex")),this.search_field.attr("tabindex",-1)),this.active_field=!1,this.results_hide(),this.container.removeClass("chzn-container-active"),this.winnow_results_clear(),this.clear_backstroke(),this.show_search_field_default();return this.search_field_scale()},b.prototype.activate_field=function(){!this.is_multiple&&!this.active_field&&(this.search_field.attr("tabindex",this.selected_item.attr("tabindex")),this.selected_item.attr("tabindex",-1)),this.container.addClass("chzn-container-active"),this.active_field=!0,this.search_field.val(this.search_field.val());return this.search_field.focus()},b.prototype.test_active_click=function(b){return a(b.target).parents("#"+this.container_id).length?this.active_field=!0:this.close_field()},b.prototype.results_build=function(){var a,b,c,e,f,g;c=new Date,this.parsing=!0,this.results_data=d.SelectParser.select_to_array(this.form_field),this.is_multiple&&this.choices>0?(this.search_choices.find("li.search-choice").remove(),this.choices=0):this.is_multiple||this.selected_item.find("span").text(this.default_text),a="",g=this.results_data;for(e=0,f=g.length;e<f;e++)b=g[e],b.group?a+=this.result_add_group(b):b.empty||(a+=this.result_add_option(b),b.selected&&this.is_multiple?this.choice_build(b):b.selected&&!this.is_multiple&&this.selected_item.find("span").text(b.text));this.show_search_field_default(),this.search_field_scale(),this.search_results.html(a);return this.parsing=!1},b.prototype.result_add_group=function(b){if(!b.disabled){b.dom_id=this.container_id+"_g_"+b.array_index;return'<li id="'+b.dom_id+'" class="group-result">'+a("<div />").text(b.label).html()+"</li>"}return""},b.prototype.result_add_option=function(a){var b;if(!a.disabled){a.dom_id=this.container_id+"_o_"+a.array_index,b=a.selected&&this.is_multiple?[]:["active-result"],a.selected&&b.push("result-selected"),a.group_array_index!=null&&b.push("group-option");return'<li id="'+a.dom_id+'" class="'+b.join(" ")+'">'+a.html+"</li>"}return""},b.prototype.results_update_field=function(){this.result_clear_highlight(),this.result_single_selected=null;return this.results_build()},b.prototype.result_do_highlight=function(a){var b,c,d,e,f;if(a.length){this.result_clear_highlight(),this.result_highlight=a,this.result_highlight.addClass("highlighted"),d=parseInt(this.search_results.css("maxHeight"),10),f=this.search_results.scrollTop(),e=d+f,c=this.result_highlight.position().top+this.search_results.scrollTop(),b=c+this.result_highlight.outerHeight();if(b>=e)return this.search_results.scrollTop(b-d>0?b-d:0);if(c<f)return this.search_results.scrollTop(c)}},b.prototype.result_clear_highlight=function(){this.result_highlight&&this.result_highlight.removeClass("highlighted");return this.result_highlight=null},b.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},b.prototype.results_show=function(){var a;this.is_multiple||(this.selected_item.addClass("chzn-single-with-drop"),this.result_single_selected&&this.result_do_highlight(this.result_single_selected)),a=this.is_multiple?this.container.height():this.container.height()-1,this.dropdown.css({top:a+"px",left:0}),this.results_showing=!0,this.search_field.focus(),this.search_field.val(this.search_field.val());return this.winnow_results()},b.prototype.results_hide=function(){this.is_multiple||this.selected_item.removeClass("chzn-single-with-drop"),this.result_clear_highlight(),this.dropdown.css({left:"-9000px"});return this.results_showing=!1},b.prototype.set_tab_index=function(a){var b;if(this.form_field_jq.attr("tabindex")){b=this.form_field_jq.attr("tabindex"),this.form_field_jq.attr("tabindex",-1);if(this.is_multiple)return this.search_field.attr("tabindex",b);this.selected_item.attr("tabindex",b);return this.search_field.attr("tabindex",-1)}},b.prototype.show_search_field_default=function(){if(this.is_multiple&&this.choices<1&&!this.active_field){this.search_field.val(this.default_text);return this.search_field.addClass("default")}this.search_field.val("");return this.search_field.removeClass("default")},b.prototype.search_results_click=function(b){var c;c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first();if(c.length){this.result_highlight=c;return this.result_select()}},b.prototype.search_results_mouseover=function(b){var c;c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first();if(c)return this.result_do_highlight(c)},b.prototype.search_results_mouseout=function(b){if(a(b.target).hasClass("active-result"))return this.result_clear_highlight()},b.prototype.choices_click=function(b){b.preventDefault();if(this.active_field&&!a(b.target).hasClass("search-choice")&&!this.results_showing)return this.results_show()},b.prototype.choice_build=function(b){var c,d;c=this.container_id+"_c_"+b.array_index,this.choices+=1,this.search_container.before('<li class="search-choice" id="'+c+'"><span>'+b.html+'</span><a href="javascript:void(0)" class="search-choice-close" rel="'+b.array_index+'"></a></li>'),d=a("#"+c).find("a").first();return d.click(e(function(a){return this.choice_destroy_link_click(a)},this))},b.prototype.choice_destroy_link_click=function(b){b.preventDefault(),this.pending_destroy_click=!0;return this.choice_destroy(a(b.target))},b.prototype.choice_destroy=function(a){this.choices-=1,this.show_search_field_default(),this.is_multiple&&this.choices>0&&this.search_field.val().length<1&&this.results_hide(),this.result_deselect(a.attr("rel"));return a.parents("li").first().remove()},b.prototype.result_select=function(){var a,b,c,d;if(this.result_highlight){a=this.result_highlight,b=a.attr("id"),this.result_clear_highlight(),a.addClass("result-selected"),this.is_multiple?this.result_deactivate(a):this.result_single_selected=a,d=b.substr(b.lastIndexOf("_")+1),c=this.results_data[d],c.selected=!0,this.form_field.options[c.options_index].selected=!0,this.is_multiple?this.choice_build(c):this.selected_item.find("span").first().text(c.text),this.results_hide(),this.search_field.val(""),this.form_field_jq.trigger("change");return this.search_field_scale()}},b.prototype.result_activate=function(a){return a.addClass("active-result").show()},b.prototype.result_deactivate=function(a){return a.removeClass("active-result").hide()},b.prototype.result_deselect=function(b){var c,d;d=this.results_data[b],d.selected=!1,this.form_field.options[d.options_index].selected=!1,c=a("#"+this.container_id+"_o_"+b),c.removeClass("result-selected").addClass("active-result").show(),this.result_clear_highlight(),this.winnow_results(),this.form_field_jq.trigger("change");return this.search_field_scale()},b.prototype.results_search=function(a){return this.results_showing?this.winnow_results():this.results_show()},b.prototype.winnow_results=function(){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r;j=new Date,this.no_results_clear(),h=0,i=this.search_field.val()===this.default_text?"":a("<div/>").text(a.trim(this.search_field.val())).html(),f=new RegExp("^"+i.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),m=new RegExp(i.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),r=this.results_data;for(n=0,p=r.length;n<p;n++){c=r[n];if(!c.disabled&&!c.empty)if(c.group)a("#"+c.dom_id).hide();else if(!this.is_multiple||!c.selected){b=!1,g=c.dom_id;if(f.test(c.html))b=!0,h+=1;else if(c.html.indexOf(" ")>=0||c.html.indexOf("[")===0){e=c.html.replace(/\[|\]/g,"").split(" ");if(e.length)for(o=0,q=e.length;o<q;o++)d=e[o],f.test(d)&&(b=!0,h+=1)}b?(i.length?(k=c.html.search(m),l=c.html.substr(0,k+i.length)+"</em>"+c.html.substr(k+i.length),l=l.substr(0,k)+"<em>"+l.substr(k)):l=c.html,a("#"+g).html!==l&&a("#"+g).html(l),this.result_activate(a("#"+g)),c.group_array_index!=null&&a("#"+this.results_data[c.group_array_index].dom_id).show()):(this.result_highlight&&g===this.result_highlight.attr("id")&&this.result_clear_highlight(),this.result_deactivate(a("#"+g)))}}return h<1&&i.length?this.no_results(i):this.winnow_results_set_highlight()},b.prototype.winnow_results_clear=function(){var b,c,d,e,f;this.search_field.val(""),c=this.search_results.find("li"),f=[];for(d=0,e=c.length;d<e;d++)b=c[d],b=a(b),f.push(b.hasClass("group-result")?b.show():!this.is_multiple||!b.hasClass("result-selected")?this.result_activate(b):void 0);return f},b.prototype.winnow_results_set_highlight=function(){var a;if(!this.result_highlight){a=this.search_results.find(".active-result").first();if(a)return this.result_do_highlight(a)}},b.prototype.no_results=function(b){var c;c=a('<li class="no-results">No results match "<span></span>"</li>'),c.find("span").first().html(b);return this.search_results.append(c)},b.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()},b.prototype.keydown_arrow=function(){var b,c;this.result_highlight?this.results_showing&&(c=this.result_highlight.nextAll("li.active-result").first(),c&&this.result_do_highlight(c)):(b=this.search_results.find("li.active-result").first(),b&&this.result_do_highlight(a(b)));if(!this.results_showing)return this.results_show()},b.prototype.keyup_arrow=function(){var a;if(!this.results_showing&&!this.is_multiple)return this.results_show();if(this.result_highlight){a=this.result_highlight.prevAll("li.active-result");if(a.length)return this.result_do_highlight(a.first());this.choices>0&&this.results_hide();return this.result_clear_highlight()}},b.prototype.keydown_backstroke=function(){if(this.pending_backstroke){this.choice_destroy(this.pending_backstroke.find("a").first());return this.clear_backstroke()}this.pending_backstroke=this.search_container.siblings("li.search-choice").last();return this.pending_backstroke.addClass("search-choice-focus")},b.prototype.clear_backstroke=function(){this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus");return this.pending_backstroke=null},b.prototype.keyup_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale();switch(b){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices>0)return this.keydown_backstroke();if(!this.pending_backstroke){this.result_clear_highlight();return this.results_search()}break;case 13:a.preventDefault();if(this.results_showing)return this.result_select();break;case 27:if(this.results_showing)return this.results_hide();break;case 9:case 38:case 40:case 16:break;default:return this.results_search()}},b.prototype.keydown_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale(),b!==8&&this.pending_backstroke&&this.clear_backstroke();switch(b){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.mouse_on_container=!1;break;case 13:a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:this.keydown_arrow()}},b.prototype.search_field_scale=function(){var b,c,d,e,f,g,h,i,j;if(this.is_multiple){d=0,h=0,f="position:absolute; left: -1000px; top: -1000px; display:none;",g=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"];for(i=0,j=g.length;i<j;i++)e=g[i],f+=e+":"+this.search_field.css(e)+";";c=a("<div />",{style:f}),c.text(this.search_field.val()),a("body").append(c),h=c.width()+25,c.remove(),h>this.f_width-10&&(h=this.f_width-10),this.search_field.css({width:h+"px"}),b=this.container.height();return this.dropdown.css({top:b+"px"})}},b.prototype.generate_field_id=function(){var a;a=this.generate_random_id(),this.form_field.id=a;return a},b.prototype.generate_random_id=function(){var b;b="sel"+this.generate_random_char()+this.generate_random_char()+this.generate_random_char();while(a("#"+b).length>0)b+=this.generate_random_char();return b},b.prototype.generate_random_char=function(){var a,b,c;a="0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZ",c=Math.floor(Math.random()*a.length);return b=a.substring(c,c+1)};return b}(),c=function(a){var b;return b=a.outerWidth()-a.width()},d.get_side_border_padding=c}).call(this),function(){var a;a=function(){function a(){this.options_index=0,this.parsed=[]}a.prototype.add_node=function(a){return a.nodeName==="OPTGROUP"?this.add_group(a):this.add_option(a)},a.prototype.add_group=function(a){var b,c,d,e,f,g;b=this.parsed.length,this.parsed.push({array_index:b,group:!0,label:a.label,children:0,disabled:a.disabled}),f=a.childNodes,g=[];for(d=0,e=f.length;d<e;d++)c=f[d],g.push(this.add_option(c,b,a.disabled));return g},a.prototype.add_option=function(a,b,c){if(a.nodeName==="OPTION"){a.text!==""?(b!=null&&(this.parsed[b].children+=1),this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:a.value,text:a.text,html:a.innerHTML,selected:a.selected,disabled:c===!0?c:a.disabled,group_array_index:b})):this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:!0});return this.options_index+=1}};return a}(),a.select_to_array=function(b){var c,d,e,f,g;d=new a,g=b.childNodes;for(e=0,f=g.length;e<f;e++)c=g[e],d.add_node(c);return d.parsed},this.SelectParser=a}.call(this)
\ No newline at end of file
+(function(){var a,b,c,d,e=function(a,b){return function(){return a.apply(b,arguments)}};d=this,a=jQuery,a.fn.extend({chosen:function(c){return a.browser!=="msie"||a.browser.version!=="6.0"&&a.browser.version!=="7.0"?a(this).each(function(d){if(!a(this).hasClass("chzn-done"))return new b(this,c)}):this}}),b=function(){function b(b,c){this.form_field=b,this.options=c!=null?c:{},this.set_default_values(),this.form_field_jq=a(this.form_field),this.is_multiple=this.form_field.multiple,this.is_rtl=this.form_field_jq.hasClass("chzn-rtl"),this.default_text_default=this.form_field.multiple?"Select Some Options":"Select an Option",this.set_up_html(),this.register_observers(),this.form_field_jq.addClass("chzn-done")}b.prototype.set_default_values=function(){this.click_test_action=e(function(a){return this.test_active_click(a)},this),this.activate_action=e(function(a){return this.activate_field(a)},this),this.active_field=!1,this.mouse_on_container=!1,this.results_showing=!1,this.result_highlighted=null,this.result_single_selected=null,this.allow_single_deselect=this.options.allow_single_deselect!=null&&this.form_field.options[0].text===""?this.options.allow_single_deselect:!1,this.disable_search_threshold=this.options.disable_search_threshold||0,this.choices=0;return this.results_none_found=this.options.no_results_text||"No results match"},b.prototype.set_up_html=function(){var b,d,e,f;this.container_id=this.form_field.id.length?this.form_field.id.replace(/(:|\.)/g,"_"):this.generate_field_id(),this.container_id+="_chzn",this.f_width=this.form_field_jq.outerWidth(),this.default_text=this.form_field_jq.data("placeholder")?this.form_field_jq.data("placeholder"):this.default_text_default,b=a("<div />",{id:this.container_id,"class":"chzn-container"+(this.is_rtl?" chzn-rtl":""),style:"width: "+this.f_width+"px;"}),this.is_multiple?b.html('<ul class="chzn-choices"><li class="search-field"><input type="text" value="'+this.default_text+'" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chzn-drop" style="left:-9000px;"><ul class="chzn-results"></ul></div>'):b.html('<a href="javascript:void(0)" class="chzn-single"><span>'+this.default_text+'</span><div><b></b></div></a><div class="chzn-drop" style="left:-9000px;"><div class="chzn-search"><input type="text" autocomplete="off" /></div><ul class="chzn-results"></ul></div>'),this.form_field_jq.hide().after(b),this.container=a("#"+this.container_id),this.container.addClass("chzn-container-"+(this.is_multiple?"multi":"single")),!this.is_multiple&&this.form_field.options.length<=this.disable_search_threshold&&this.container.addClass("chzn-container-single-nosearch"),this.dropdown=this.container.find("div.chzn-drop").first(),d=this.container.height(),e=this.f_width-c(this.dropdown),this.dropdown.css({width:e+"px",top:d+"px"}),this.search_field=this.container.find("input").first(),this.search_results=this.container.find("ul.chzn-results").first(),this.search_field_scale(),this.search_no_results=this.container.find("li.no-results").first(),this.is_multiple?(this.search_choices=this.container.find("ul.chzn-choices").first(),this.search_container=this.container.find("li.search-field").first()):(this.search_container=this.container.find("div.chzn-search").first(),this.selected_item=this.container.find(".chzn-single").first(),f=e-c(this.search_container)-c(this.search_field),this.search_field.css({width:f+"px"})),this.results_build();return this.set_tab_index()},b.prototype.register_observers=function(){this.container.mousedown(e(function(a){return this.container_mousedown(a)},this)),this.container.mouseup(e(function(a){return this.container_mouseup(a)},this)),this.container.mouseenter(e(function(a){return this.mouse_enter(a)},this)),this.container.mouseleave(e(function(a){return this.mouse_leave(a)},this)),this.search_results.mouseup(e(function(a){return this.search_results_mouseup(a)},this)),this.search_results.mouseover(e(function(a){return this.search_results_mouseover(a)},this)),this.search_results.mouseout(e(function(a){return this.search_results_mouseout(a)},this)),this.form_field_jq.bind("liszt:updated",e(function(a){return this.results_update_field(a)},this)),this.search_field.blur(e(function(a){return this.input_blur(a)},this)),this.search_field.keyup(e(function(a){return this.keyup_checker(a)},this)),this.search_field.keydown(e(function(a){return this.keydown_checker(a)},this));if(this.is_multiple){this.search_choices.click(e(function(a){return this.choices_click(a)},this));return this.search_field.focus(e(function(a){return this.input_focus(a)},this))}},b.prototype.search_field_disabled=function(){this.is_disabled=this.form_field_jq.attr("disabled");if(this.is_disabled){this.container.addClass("chzn-disabled"),this.search_field.attr("disabled",!0),this.is_multiple||this.selected_item.unbind("focus",this.activate_action);return this.close_field()}this.container.removeClass("chzn-disabled"),this.search_field.attr("disabled",!1);if(!this.is_multiple)return this.selected_item.bind("focus",this.activate_action)},b.prototype.container_mousedown=function(b){var c;if(!this.is_disabled){c=b!=null?a(b.target).hasClass("search-choice-close"):!1,b&&b.type==="mousedown"&&b.stopPropagation();if(!this.pending_destroy_click&&!c){this.active_field?!this.is_multiple&&b&&(a(b.target)===this.selected_item||a(b.target).parents("a.chzn-single").length)&&(b.preventDefault(),this.results_toggle()):(this.is_multiple&&this.search_field.val(""),a(document).click(this.click_test_action),this.results_show());return this.activate_field()}return this.pending_destroy_click=!1}},b.prototype.container_mouseup=function(a){if(a.target.nodeName==="ABBR")return this.results_reset(a)},b.prototype.mouse_enter=function(){return this.mouse_on_container=!0},b.prototype.mouse_leave=function(){return this.mouse_on_container=!1},b.prototype.input_focus=function(a){if(!this.active_field)return setTimeout(e(function(){return this.container_mousedown()},this),50)},b.prototype.input_blur=function(a){if(!this.mouse_on_container){this.active_field=!1;return setTimeout(e(function(){return this.blur_test()},this),100)}},b.prototype.blur_test=function(a){if(!this.active_field&&this.container.hasClass("chzn-container-active"))return this.close_field()},b.prototype.close_field=function(){a(document).unbind("click",this.click_test_action),this.is_multiple||(this.selected_item.attr("tabindex",this.search_field.attr("tabindex")),this.search_field.attr("tabindex",-1)),this.active_field=!1,this.results_hide(),this.container.removeClass("chzn-container-active"),this.winnow_results_clear(),this.clear_backstroke(),this.show_search_field_default();return this.search_field_scale()},b.prototype.activate_field=function(){!this.is_multiple&&!this.active_field&&(this.search_field.attr("tabindex",this.selected_item.attr("tabindex")),this.selected_item.attr("tabindex",-1)),this.container.addClass("chzn-container-active"),this.active_field=!0,this.search_field.val(this.search_field.val());return this.search_field.focus()},b.prototype.test_active_click=function(b){return a(b.target).parents("#"+this.container_id).length?this.active_field=!0:this.close_field()},b.prototype.results_build=function(){var a,b,c,e,f,g;c=new Date,this.parsing=!0,this.results_data=d.SelectParser.select_to_array(this.form_field),this.is_multiple&&this.choices>0?(this.search_choices.find("li.search-choice").remove(),this.choices=0):this.is_multiple||this.selected_item.find("span").text(this.default_text),a="",g=this.results_data;for(e=0,f=g.length;e<f;e++)b=g[e],b.group?a+=this.result_add_group(b):b.empty||(a+=this.result_add_option(b),b.selected&&this.is_multiple?this.choice_build(b):b.selected&&!this.is_multiple&&(this.selected_item.find("span").text(b.text),this.allow_single_deselect&&this.selected_item.find("span").first().after('<abbr class="search-choice-close"></abbr>')));this.search_field_disabled(),this.show_search_field_default(),this.search_field_scale(),this.search_results.html(a);return this.parsing=!1},b.prototype.result_add_group=function(b){if(!b.disabled){b.dom_id=this.container_id+"_g_"+b.array_index;return'<li id="'+b.dom_id+'" class="group-result">'+a("<div />").text(b.label).html()+"</li>"}return""},b.prototype.result_add_option=function(a){var b,c;if(!a.disabled){a.dom_id=this.container_id+"_o_"+a.array_index,b=a.selected&&this.is_multiple?[]:["active-result"],a.selected&&b.push("result-selected"),a.group_array_index!=null&&b.push("group-option"),a.classes!==""&&b.push(a.classes),c=a.style.cssText!==""?' style="'+a.style+'"':"";return'<li id="'+a.dom_id+'" class="'+b.join(" ")+'"'+c+">"+a.html+"</li>"}return""},b.prototype.results_update_field=function(){this.result_clear_highlight(),this.result_single_selected=null;return this.results_build()},b.prototype.result_do_highlight=function(a){var b,c,d,e,f;if(a.length){this.result_clear_highlight(),this.result_highlight=a,this.result_highlight.addClass("highlighted"),d=parseInt(this.search_results.css("maxHeight"),10),f=this.search_results.scrollTop(),e=d+f,c=this.result_highlight.position().top+this.search_results.scrollTop(),b=c+this.result_highlight.outerHeight();if(b>=e)return this.search_results.scrollTop(b-d>0?b-d:0);if(c<f)return this.search_results.scrollTop(c)}},b.prototype.result_clear_highlight=function(){this.result_highlight&&this.result_highlight.removeClass("highlighted");return this.result_highlight=null},b.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},b.prototype.results_show=function(){var a;this.is_multiple||(this.selected_item.addClass("chzn-single-with-drop"),this.result_single_selected&&this.result_do_highlight(this.result_single_selected)),a=this.is_multiple?this.container.height():this.container.height()-1,this.dropdown.css({top:a+"px",left:0}),this.results_showing=!0,this.search_field.focus(),this.search_field.val(this.search_field.val());return this.winnow_results()},b.prototype.results_hide=function(){this.is_multiple||this.selected_item.removeClass("chzn-single-with-drop"),this.result_clear_highlight(),this.dropdown.css({left:"-9000px"});return this.results_showing=!1},b.prototype.set_tab_index=function(a){var b;if(this.form_field_jq.attr("tabindex")){b=this.form_field_jq.attr("tabindex"),this.form_field_jq.attr("tabindex",-1);if(this.is_multiple)return this.search_field.attr("tabindex",b);this.selected_item.attr("tabindex",b);return this.search_field.attr("tabindex",-1)}},b.prototype.show_search_field_default=function(){if(this.is_multiple&&this.choices<1&&!this.active_field){this.search_field.val(this.default_text);return this.search_field.addClass("default")}this.search_field.val("");return this.search_field.removeClass("default")},b.prototype.search_results_mouseup=function(b){var c;c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first();if(c.length){this.result_highlight=c;return this.result_select(b)}},b.prototype.search_results_mouseover=function(b){var c;c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first();if(c)return this.result_do_highlight(c)},b.prototype.search_results_mouseout=function(b){if(a(b.target).hasClass("active-result"))return this.result_clear_highlight()},b.prototype.choices_click=function(b){b.preventDefault();if(this.active_field&&!a(b.target).hasClass("search-choice")&&!this.results_showing)return this.results_show()},b.prototype.choice_build=function(b){var c,d;c=this.container_id+"_c_"+b.array_index,this.choices+=1,this.search_container.before('<li class="search-choice" id="'+c+'"><span>'+b.html+'</span><a href="javascript:void(0)" class="search-choice-close" rel="'+b.array_index+'"></a></li>'),d=a("#"+c).find("a").first();return d.click(e(function(a){return this.choice_destroy_link_click(a)},this))},b.prototype.choice_destroy_link_click=function(b){b.preventDefault();if(!this.is_disabled){this.pending_destroy_click=!0;return this.choice_destroy(a(b.target))}return b.stopPropagation},b.prototype.choice_destroy=function(a){this.choices-=1,this.show_search_field_default(),this.is_multiple&&this.choices>0&&this.search_field.val().length<1&&this.results_hide(),this.result_deselect(a.attr("rel"));return a.parents("li").first().remove()},b.prototype.results_reset=function(b){this.form_field.options[0].selected=!0,this.selected_item.find("span").text(this.default_text),this.show_search_field_default(),a(b.target).remove(),this.form_field_jq.trigger("change");if(this.active_field)return this.results_hide()},b.prototype.result_select=function(a){var b,c,d,e;if(this.result_highlight){b=this.result_highlight,c=b.attr("id"),this.result_clear_highlight(),this.is_multiple?this.result_deactivate(b):(this.search_results.find(".result-selected").removeClass("result-selected"),this.result_single_selected=b),b.addClass("result-selected"),e=c.substr(c.lastIndexOf("_")+1),d=this.results_data[e],d.selected=!0,this.form_field.options[d.options_index].selected=!0,this.is_multiple?this.choice_build(d):(this.selected_item.find("span").first().text(d.text),this.allow_single_deselect&&this.selected_item.find("span").first().after('<abbr class="search-choice-close"></abbr>')),(!a.metaKey||!this.is_multiple)&&this.results_hide(),this.search_field.val(""),this.form_field_jq.trigger("change");return this.search_field_scale()}},b.prototype.result_activate=function(a){return a.addClass("active-result")},b.prototype.result_deactivate=function(a){return a.removeClass("active-result")},b.prototype.result_deselect=function(b){var c,d;d=this.results_data[b],d.selected=!1,this.form_field.options[d.options_index].selected=!1,c=a("#"+this.container_id+"_o_"+b),c.removeClass("result-selected").addClass("active-result").show(),this.result_clear_highlight(),this.winnow_results(),this.form_field_jq.trigger("change");return this.search_field_scale()},b.prototype.results_search=function(a){return this.results_showing?this.winnow_results():this.results_show()},b.prototype.winnow_results=function(){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r;j=new Date,this.no_results_clear(),h=0,i=this.search_field.val()===this.default_text?"":a("<div/>").text(a.trim(this.search_field.val())).html(),f=new RegExp("^"+i.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),m=new RegExp(i.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),r=this.results_data;for(n=0,p=r.length;n<p;n++){c=r[n];if(!c.disabled&&!c.empty)if(c.group)a("#"+c.dom_id).hide();else if(!this.is_multiple||!c.selected){b=!1,g=c.dom_id;if(f.test(c.html))b=!0,h+=1;else if(c.html.indexOf(" ")>=0||c.html.indexOf("[")===0){e=c.html.replace(/\[|\]/g,"").split(" ");if(e.length)for(o=0,q=e.length;o<q;o++)d=e[o],f.test(d)&&(b=!0,h+=1)}b?(i.length?(k=c.html.search(m),l=c.html.substr(0,k+i.length)+"</em>"+c.html.substr(k+i.length),l=l.substr(0,k)+"<em>"+l.substr(k)):l=c.html,a("#"+g).html!==l&&a("#"+g).html(l),this.result_activate(a("#"+g)),c.group_array_index!=null&&a("#"+this.results_data[c.group_array_index].dom_id).show()):(this.result_highlight&&g===this.result_highlight.attr("id")&&this.result_clear_highlight(),this.result_deactivate(a("#"+g)))}}return h<1&&i.length?this.no_results(i):this.winnow_results_set_highlight()},b.prototype.winnow_results_clear=function(){var b,c,d,e,f;this.search_field.val(""),c=this.search_results.find("li"),f=[];for(d=0,e=c.length;d<e;d++)b=c[d],b=a(b),f.push(b.hasClass("group-result")?b.show():!this.is_multiple||!b.hasClass("result-selected")?this.result_activate(b):void 0);return f},b.prototype.winnow_results_set_highlight=function(){var a,b;if(!this.result_highlight){b=this.is_multiple?[]:this.search_results.find(".result-selected.active-result"),a=b.length?b.first():this.search_results.find(".active-result").first();if(a!=null)return this.result_do_highlight(a)}},b.prototype.no_results=function(b){var c;c=a('<li class="no-results">'+this.results_none_found+' "<span></span>"</li>'),c.find("span").first().html(b);return this.search_results.append(c)},b.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()},b.prototype.keydown_arrow=function(){var b,c;this.result_highlight?this.results_showing&&(c=this.result_highlight.nextAll("li.active-result").first(),c&&this.result_do_highlight(c)):(b=this.search_results.find("li.active-result").first(),b&&this.result_do_highlight(a(b)));if(!this.results_showing)return this.results_show()},b.prototype.keyup_arrow=function(){var a;if(!this.results_showing&&!this.is_multiple)return this.results_show();if(this.result_highlight){a=this.result_highlight.prevAll("li.active-result");if(a.length)return this.result_do_highlight(a.first());this.choices>0&&this.results_hide();return this.result_clear_highlight()}},b.prototype.keydown_backstroke=function(){if(this.pending_backstroke){this.choice_destroy(this.pending_backstroke.find("a").first());return this.clear_backstroke()}this.pending_backstroke=this.search_container.siblings("li.search-choice").last();return this.pending_backstroke.addClass("search-choice-focus")},b.prototype.clear_backstroke=function(){this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus");return this.pending_backstroke=null},b.prototype.keyup_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale();switch(b){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices>0)return this.keydown_backstroke();if(!this.pending_backstroke){this.result_clear_highlight();return this.results_search()}break;case 13:a.preventDefault();if(this.results_showing)return this.result_select(a);break;case 27:if(this.results_showing)return this.results_hide();break;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}},b.prototype.keydown_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale(),b!==8&&this.pending_backstroke&&this.clear_backstroke();switch(b){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.mouse_on_container=!1;break;case 13:a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:this.keydown_arrow()}},b.prototype.search_field_scale=function(){var b,c,d,e,f,g,h,i,j;if(this.is_multiple){d=0,h=0,f="position:absolute; left: -1000px; top: -1000px; display:none;",g=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"];for(i=0,j=g.length;i<j;i++)e=g[i],f+=e+":"+this.search_field.css(e)+";";c=a("<div />",{style:f}),c.text(this.search_field.val()),a("body").append(c),h=c.width()+25,c.remove(),h>this.f_width-10&&(h=this.f_width-10),this.search_field.css({width:h+"px"}),b=this.container.height();return this.dropdown.css({top:b+"px"})}},b.prototype.generate_field_id=function(){var a;a=this.generate_random_id(),this.form_field.id=a;return a},b.prototype.generate_random_id=function(){var b;b="sel"+this.generate_random_char()+this.generate_random_char()+this.generate_random_char();while(a("#"+b).length>0)b+=this.generate_random_char();return b},b.prototype.generate_random_char=function(){var a,b,c;a="0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZ",c=Math.floor(Math.random()*a.length);return b=a.substring(c,c+1)};return b}(),c=function(a){var b;return b=a.outerWidth()-a.width()},d.get_side_border_padding=c}).call(this),function(){var a;a=function(){function a(){this.options_index=0,this.parsed=[]}a.prototype.add_node=function(a){return a.nodeName==="OPTGROUP"?this.add_group(a):this.add_option(a)},a.prototype.add_group=function(a){var b,c,d,e,f,g;b=this.parsed.length,this.parsed.push({array_index:b,group:!0,label:a.label,children:0,disabled:a.disabled}),f=a.childNodes,g=[];for(d=0,e=f.length;d<e;d++)c=f[d],g.push(this.add_option(c,b,a.disabled));return g},a.prototype.add_option=function(a,b,c){if(a.nodeName==="OPTION"){a.text!==""?(b!=null&&(this.parsed[b].children+=1),this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:a.value,text:a.text,html:a.innerHTML,selected:a.selected,disabled:c===!0?c:a.disabled,group_array_index:b,classes:a.className,style:a.style.cssText})):this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:!0});return this.options_index+=1}};return a}(),a.select_to_array=function(b){var c,d,e,f,g;d=new a,g=b.childNodes;for(e=0,f=g.length;e<f;e++)c=g[e],d.add_node(c);return d.parsed},this.SelectParser=a}.call(this)
\ No newline at end of file
diff --git a/3rdparty/when/MIT-LICENSE.txt b/3rdparty/when/MIT-LICENSE.txt
new file mode 100644
index 00000000000..b4429c89ac1
--- /dev/null
+++ b/3rdparty/when/MIT-LICENSE.txt
@@ -0,0 +1,9 @@
+License
+
+Copyright (c) 2010 Thomas Planer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/3rdparty/when/When.php b/3rdparty/when/When.php
new file mode 100755
index 00000000000..5f97f0eb9bf
--- /dev/null
+++ b/3rdparty/when/When.php
@@ -0,0 +1,725 @@
+<?php
+/**
+ * Name: When
+ * Author: Thomas Planer <tplaner@gmail.com>
+ * Location: http://github.com/tplaner/When
+ * Created: September 2010
+ * Description: Determines the next date of recursion given an iCalendar "rrule" like pattern.
+ * Requirements: PHP 5.3+ - makes extensive use of the Date and Time library (http://us2.php.net/manual/en/book.datetime.php)
+ */
+class When
+{
+	protected $frequency;
+	
+	protected $start_date;
+	protected $try_date;
+	
+	protected $end_date;
+	
+	protected $gobymonth;
+	protected $bymonth;
+	
+	protected $gobyweekno;
+	protected $byweekno;
+	
+	protected $gobyyearday;
+	protected $byyearday;
+	
+	protected $gobymonthday;
+	protected $bymonthday;
+	
+	protected $gobyday;
+	protected $byday;
+	
+	protected $gobysetpos;
+	protected $bysetpos;
+		
+	protected $suggestions;
+	
+	protected $count;
+	protected $counter;
+	
+	protected $goenddate;
+	
+	protected $interval;
+	
+	protected $wkst;
+	
+	protected $valid_week_days;
+	protected $valid_frequency;
+		
+	/**
+	 * __construct
+	 */
+	public function __construct()
+	{
+		$this->frequency = null;
+		
+		$this->gobymonth = false;
+		$this->bymonth = range(1,12);
+		
+		$this->gobymonthday = false;
+		$this->bymonthday = range(1,31);
+		
+		$this->gobyday = false;
+		// setup the valid week days (0 = sunday)
+		$this->byday = range(0,6);
+		
+		$this->gobyyearday = false;
+		$this->byyearday = range(0,366);
+		
+		$this->gobysetpos = false;
+		$this->bysetpos = range(1,366);
+		
+		$this->gobyweekno = false;
+		// setup the range for valid weeks
+		$this->byweekno = range(0,54);
+		
+		$this->suggestions = array();
+		
+		// this will be set if a count() is specified
+		$this->count = 0;
+		// how many *valid* results we returned
+		$this->counter = 0;
+		
+		// max date we'll return
+		$this->end_date = new DateTime('9999-12-31');
+		
+		// the interval to increase the pattern by
+		$this->interval = 1;
+		
+		// what day does the week start on? (0 = sunday)
+		$this->wkst = 0;
+		
+		$this->valid_week_days = array('SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA');
+		
+		$this->valid_frequency = array('SECONDLY', 'MINUTELY', 'HOURLY', 'DAILY', 'WEEKLY', 'MONTHLY', 'YEARLY');
+	}
+	
+	/**
+	 * @param DateTime|string $start_date of the recursion - also is the first return value.
+	 * @param string $frequency of the recrusion, valid frequencies: secondly, minutely, hourly, daily, weekly, monthly, yearly
+	 */
+	public function recur($start_date, $frequency = "daily")
+	{
+		try
+		{
+			if(is_object($start_date))
+			{
+				$this->start_date = clone $start_date;
+			}
+			else
+			{
+				// timestamps within the RFC have a 'Z' at the end of them, remove this.
+				$start_date = trim($start_date, 'Z');
+				$this->start_date = new DateTime($start_date);
+			}
+			
+			$this->try_date = clone $this->start_date;
+		}
+		catch(Exception $e)
+		{
+			throw new InvalidArgumentException('Invalid start date DateTime: ' . $e);
+		}
+		
+		$this->freq($frequency);
+		
+		return $this;
+	}
+
+	public function freq($frequency)
+	{
+		if(in_array(strtoupper($frequency), $this->valid_frequency))
+		{
+			$this->frequency = strtoupper($frequency);
+		}
+		else
+		{
+			throw new InvalidArgumentException('Invalid frequency type.');
+		}
+
+		return $this;
+	}
+
+	// accepts an rrule directly
+	public function rrule($rrule)
+	{
+		// strip off a trailing semi-colon
+		$rrule = trim($rrule, ";");
+		
+		$parts = explode(";", $rrule);
+
+		foreach($parts as $part)
+		{
+			list($rule, $param) = explode("=", $part);
+
+			$rule = strtoupper($rule);
+			$param = strtoupper($param);
+
+			switch($rule)
+			{
+				case "FREQ":
+					$this->frequency = $param;
+					break;
+				case "UNTIL":
+					$this->until($param);
+					break;
+				case "COUNT":
+					$this->count($param);
+					break;
+				case "INTERVAL":
+					$this->interval($param);
+					break;
+				case "BYDAY":
+					$params = explode(",", $param);
+					$this->byday($params);
+					break;
+				case "BYMONTHDAY":
+					$params = explode(",", $param);
+					$this->bymonthday($params);
+					break;
+				case "BYYEARDAY":
+					$params = explode(",", $param);
+					$this->byyearday($params);
+					break;
+				case "BYWEEKNO":
+					$params = explode(",", $param);
+					$this->byweekno($params);
+					break;
+				case "BYMONTH":
+					$params = explode(",", $param);
+					$this->bymonth($params);
+					break;
+				case "BYSETPOS":
+					$params = explode(",", $param);
+					$this->bysetpos($params);
+					break;
+				case "WKST":
+					$this->wkst($param);
+					break;
+			}
+		}
+
+		return $this;
+	}
+	
+	//max number of items to return based on the pattern
+	public function count($count)
+	{
+		$this->count = (int)$count;
+		
+		return $this;
+	}
+	
+	// how often the recurrence rule repeats
+	public function interval($interval)
+	{
+		$this->interval = (int)$interval;
+		
+		return $this;
+	}
+	
+	// starting day of the week
+	public function wkst($day)
+	{
+		switch($day)
+		{
+			case 'SU':
+				$this->wkst = 0;
+				break;
+			case 'MO':
+				$this->wkst = 1;
+				break;
+			case 'TU':
+				$this->wkst = 2;
+				break;
+			case 'WE':
+				$this->wkst = 3;
+				break;
+			case 'TH':
+				$this->wkst = 4;
+				break;
+			case 'FR':
+				$this->wkst = 5;
+				break;
+			case 'SA':
+				$this->wkst = 6;
+				break;
+		}
+		
+		return $this;
+	}
+	
+	// max date
+	public function until($end_date)
+	{		
+		try
+		{
+			if(is_object($end_date))
+			{
+				$this->end_date = clone $end_date;
+			}
+			else
+			{
+				// timestamps within the RFC have a 'Z' at the end of them, remove this.
+				$end_date = trim($end_date, 'Z');
+				$this->end_date = new DateTime($end_date);
+			}
+		}
+		catch(Exception $e)
+		{
+			throw new InvalidArgumentException('Invalid end date DateTime: ' . $e);
+		}
+		
+		return $this;
+	}
+
+	public function bymonth($months)
+	{	
+		if(is_array($months))
+		{
+			$this->gobymonth = true;
+			$this->bymonth = $months;
+		}
+		
+		return $this;
+	}
+	
+	public function bymonthday($days)
+	{	
+		if(is_array($days))
+		{
+			$this->gobymonthday = true;
+			$this->bymonthday = $days;
+		}
+		
+		return $this;
+	}
+	
+	public function byweekno($weeks)
+	{
+		$this->gobyweekno = true;
+		
+		if(is_array($weeks))
+		{
+			$this->byweekno = $weeks;
+		}
+		
+		return $this;
+	}
+	
+	public function bysetpos($days)
+	{
+		$this->gobysetpos = true;
+		
+		if(is_array($days))
+		{
+			$this->bysetpos = $days;
+		}
+		
+		return $this;
+	}
+	
+	public function byday($days)
+	{		
+		$this->gobyday = true;
+		
+		if(is_array($days))
+		{
+			$this->byday = array();
+			foreach($days as $day)
+			{
+				$len = strlen($day);
+				
+				$as = '+';
+				
+				// 0 mean no occurence is set
+				$occ = 0;
+				
+				if($len == 3)
+				{
+					$occ = substr($day, 0, 1);
+				}
+				if($len == 4)
+				{
+					$as = substr($day, 0, 1);
+					$occ = substr($day, 1, 1);
+				}
+				
+				if($as == '-')
+				{
+					$occ = '-' . $occ;
+				}
+				else
+				{
+					$occ = '+' . $occ;
+				}
+				
+				$day = substr($day, -2, 2);
+				switch($day)
+				{
+					case 'SU':
+						$this->byday[] = $occ . 'SU';
+						break;
+					case 'MO':
+						$this->byday[] = $occ . 'MO';
+						break;
+					case 'TU':
+						$this->byday[] = $occ . 'TU';
+						break;
+					case 'WE':
+						$this->byday[] = $occ . 'WE';
+						break;
+					case 'TH':
+						$this->byday[] = $occ . 'TH';
+						break;
+					case 'FR':
+						$this->byday[] = $occ . 'FR';
+						break;
+					case 'SA':
+						$this->byday[] = $occ . 'SA';
+						break;
+				}
+			}
+		}
+		
+		return $this;
+	}
+	
+	public function byyearday($days)
+	{
+		$this->gobyyearday = true;
+		
+		if(is_array($days))
+		{
+			$this->byyearday = $days;
+		}
+		
+		return $this;
+	}
+	
+	// this creates a basic list of dates to "try"
+	protected function create_suggestions()
+	{
+		switch($this->frequency)
+		{
+			case "YEARLY":
+				$interval = 'year';
+				break;
+			case "MONTHLY":
+				$interval = 'month';
+				break;
+			case "WEEKLY":
+				$interval = 'week';
+				break;
+			case "DAILY":
+				$interval = 'day';
+				break;
+			case "HOURLY":
+				$interval = 'hour';
+				break;
+			case "MINUTELY":
+				$interval = 'minute';
+				break;
+			case "SECONDLY":
+				$interval = 'second';
+				break;
+		}
+					
+		$month_day = $this->try_date->format('j');
+		$month = $this->try_date->format('n');
+		$year = $this->try_date->format('Y');
+		
+		$timestamp = $this->try_date->format('H:i:s');
+					
+		if($this->gobysetpos)
+		{				
+			if($this->try_date == $this->start_date)
+			{
+				$this->suggestions[] = clone $this->try_date;
+			}
+			else
+			{
+				if($this->gobyday)
+				{
+					foreach($this->bysetpos as $_pos)
+					{
+						$tmp_array = array();
+						$_mdays = range(1, date('t',mktime(0,0,0,$month,1,$year)));
+						foreach($_mdays as $_mday)
+						{
+							$date_time = new DateTime($year . '-' . $month . '-' . $_mday . ' ' . $timestamp);
+							
+							$occur = ceil($_mday / 7);
+							
+							$day_of_week = $date_time->format('l');
+							$dow_abr = strtoupper(substr($day_of_week, 0, 2));
+							
+							// set the day of the month + (positive)
+							$occur = '+' . $occur . $dow_abr;
+							$occur_zero = '+0' . $dow_abr;
+							
+							// set the day of the month - (negative)
+							$total_days = $date_time->format('t') - $date_time->format('j');
+							$occur_neg = '-' . ceil(($total_days + 1)/7) . $dow_abr;
+							
+							$day_from_end_of_month = $date_time->format('t') + 1 - $_mday;
+							
+							if(in_array($occur, $this->byday) || in_array($occur_zero, $this->byday) || in_array($occur_neg, $this->byday))
+							{								
+								$tmp_array[] = clone $date_time;
+							}
+						}
+						
+						if($_pos > 0)
+						{
+							$this->suggestions[] = clone $tmp_array[$_pos - 1];
+						}
+						else
+						{
+							$this->suggestions[] = clone $tmp_array[count($tmp_array) + $_pos];
+						}
+						
+					}
+				}
+			}
+		}
+		elseif($this->gobyyearday)
+		{
+			foreach($this->byyearday as $_day)
+			{
+				if($_day >= 0)
+				{
+					$_day--;
+					
+					$_time = strtotime('+' . $_day . ' days', mktime(0, 0, 0, 1, 1, $year));
+					$this->suggestions[] = new Datetime(date('Y-m-d', $_time) . ' ' . $timestamp);
+				}
+				else
+				{
+					$year_day_neg = 365 + $_day;
+					$leap_year = $this->try_date->format('L');
+					if($leap_year == 1)
+					{
+						$year_day_neg = 366 + $_day;
+					}
+					
+					$_time = strtotime('+' . $year_day_neg . ' days', mktime(0, 0, 0, 1, 1, $year));
+					$this->suggestions[] = new Datetime(date('Y-m-d', $_time) . ' ' . $timestamp);
+				}					
+			}
+		}
+		// special case because for years you need to loop through the months too
+		elseif($this->gobyday && $interval == "year")
+		{
+			foreach($this->bymonth as $_month)
+			{
+				// this creates an array of days of the month
+				$_mdays = range(1, date('t',mktime(0,0,0,$_month,1,$year)));
+				foreach($_mdays as $_mday)
+				{
+					$date_time = new DateTime($year . '-' . $_month . '-' . $_mday . ' ' . $timestamp);
+					
+					// get the week of the month (1, 2, 3, 4, 5, etc)
+					$week = $date_time->format('W');
+					
+					if($date_time >= $this->start_date && in_array($week, $this->byweekno))
+					{
+						$this->suggestions[] = clone $date_time;
+					}
+				}
+			}
+		}
+		elseif($interval == "day")
+		{
+			$this->suggestions[] = clone $this->try_date;
+		}
+		elseif($interval == "week")
+		{
+			$this->suggestions[] = clone $this->try_date;
+			
+			if($this->gobyday)
+			{
+				$week_day = $this->try_date->format('w');
+				
+				$days_in_month = $this->try_date->format('t');
+				
+				$overflow_count = 1;
+				$_day = $month_day;
+				
+				$run = true;
+				while($run)
+				{
+					$_day++;
+					if($_day <= $days_in_month)
+					{
+						$tmp_date = new DateTime($year . '-' . $month . '-' . $_day . ' ' . $timestamp);
+					}
+					else
+					{
+						//$tmp_month = $month+1;
+						$tmp_date = new DateTime($year . '-' . $month . '-' . $overflow_count . ' ' . $timestamp);
+						$tmp_date->modify('+1 month');
+						$overflow_count++;
+					}
+					
+					$week_day = $tmp_date->format('w');
+					
+					if($this->try_date == $this->start_date)
+					{
+						if($week_day == $this->wkst)
+						{
+							$this->try_date = clone $tmp_date;
+							$this->try_date->modify('-7 days');
+							$run = false;
+						}
+					}
+
+					if($week_day != $this->wkst)
+					{
+						$this->suggestions[] = clone $tmp_date;
+					}
+					else
+					{
+						$run = false;
+					}
+				}
+			}
+		}
+		elseif($this->gobyday || $interval == "month")
+		{
+			$_mdays = range(1, date('t',mktime(0,0,0,$month,1,$year)));
+			foreach($_mdays as $_mday)
+			{
+				$date_time = new DateTime($year . '-' . $month . '-' . $_mday . ' ' . $timestamp);
+				
+				// get the week of the month (1, 2, 3, 4, 5, etc)
+				$week = $date_time->format('W');
+				
+				if($date_time >= $this->start_date && in_array($week, $this->byweekno))
+				{
+					$this->suggestions[] = clone $date_time;
+				}
+			}
+		}
+		elseif($this->gobymonth)
+		{
+			foreach($this->bymonth as $_month)
+			{
+				$date_time = new DateTime($year . '-' . $_month . '-' . $month_day . ' ' . $timestamp);
+				
+				if($date_time >= $this->start_date)
+				{
+					$this->suggestions[] = clone $date_time;
+				}
+			}
+		} 
+		else 
+		{
+			$this->suggestions[] = clone $this->try_date;
+		}
+		
+		if($interval == "month")
+		{
+			$this->try_date->modify('last day of ' . $this->interval . ' ' . $interval);
+		}
+		else
+		{
+			$this->try_date->modify($this->interval . ' ' . $interval);
+		}
+	}
+	
+	protected function valid_date($date)
+	{
+		$year = $date->format('Y');
+		$month = $date->format('n');
+		$day = $date->format('j');
+		
+		$year_day = $date->format('z') + 1;
+		
+		$year_day_neg = -366 + $year_day;
+		$leap_year = $date->format('L');
+		if($leap_year == 1)
+		{
+			$year_day_neg = -367 + $year_day;
+		}
+		
+		// this is the nth occurence of the date
+		$occur = ceil($day / 7);
+		
+		$week = $date->format('W');
+		
+		$day_of_week = $date->format('l');
+		$dow_abr = strtoupper(substr($day_of_week, 0, 2));
+		
+		// set the day of the month + (positive)
+		$occur = '+' . $occur . $dow_abr;
+		$occur_zero = '+0' . $dow_abr;
+		
+		// set the day of the month - (negative)
+		$total_days = $date->format('t') - $date->format('j');
+		$occur_neg = '-' . ceil(($total_days + 1)/7) . $dow_abr;
+		
+		$day_from_end_of_month = $date->format('t') + 1 - $day;
+		
+		if(in_array($month, $this->bymonth) && 
+		   (in_array($occur, $this->byday) || in_array($occur_zero, $this->byday) || in_array($occur_neg, $this->byday)) && 
+		   in_array($week, $this->byweekno) &&
+		   (in_array($day, $this->bymonthday) || in_array(-$day_from_end_of_month, $this->bymonthday)) &&
+		   (in_array($year_day, $this->byyearday) || in_array($year_day_neg, $this->byyearday)))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	// return the next valid DateTime object which matches the pattern and follows the rules
+	public function next()
+	{		
+		// check the counter is set
+		if($this->count !== 0)
+		{
+			if($this->counter >= $this->count)
+			{
+				return false;
+			}
+		}
+		
+		// create initial set of suggested dates
+		if(count($this->suggestions) === 0)
+		{
+			$this->create_suggestions();
+		}
+		
+		// loop through the suggested dates
+		while(count($this->suggestions) > 0)
+		{
+			// get the first one on the array
+			$try_date = array_shift($this->suggestions);
+			
+			// make sure the date doesn't exceed the max date
+			if($try_date > $this->end_date)
+			{
+				return false;
+			}
+			
+			// make sure it falls within the allowed days
+			if($this->valid_date($try_date) === true)
+			{
+				$this->counter++;
+				return $try_date;
+			}
+			else
+			{
+				// we might be out of suggested days, so load some more
+				if(count($this->suggestions) === 0)
+				{
+					$this->create_suggestions();
+				}
+			}
+		}
+	}
+}
diff --git a/apps/admin_dependencies_chk/settings.php b/apps/admin_dependencies_chk/settings.php
index de2f97aa79d..34028056dbe 100644
--- a/apps/admin_dependencies_chk/settings.php
+++ b/apps/admin_dependencies_chk/settings.php
@@ -51,7 +51,7 @@ $modules[] =array(
 	'message'=> $l->t('The program mp3info is useful to discover ID3 tags of your music files'));
 
 $modules[] =array(
-	'status' => OC_Helper::canExecute("ldap_bind") ? 'ok' : 'error',
+	'status' => function_exists("ldap_bind") ? 'ok' : 'error',
 	'part'=> 'php-ldap',
 	'modules'=> array('user_ldap'),
 	'message'=> $l->t('The php-ldap module is needed connect to your ldap server'));
diff --git a/apps/bookmarks/bookmarksHelper.php b/apps/bookmarks/bookmarksHelper.php
index 44d4235b9b3..ac512fbc241 100644
--- a/apps/bookmarks/bookmarksHelper.php
+++ b/apps/bookmarks/bookmarksHelper.php
@@ -56,6 +56,9 @@ function getURLMetadata($url) {
 	} 
 	$metadata['url'] = $url;
 
+	if (!function_exists('curl_init')){
+		return $metadata;
+	}
 	$ch = curl_init();
 	curl_setopt($ch, CURLOPT_URL, $url);
 	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
@@ -66,4 +69,4 @@ function getURLMetadata($url) {
 	$metadata['title'] = htmlspecialchars_decode(@$match[1]); 
 
 	return $metadata;
-}
\ No newline at end of file
+}
diff --git a/apps/calendar/ajax/activation.php b/apps/calendar/ajax/activation.php
index 89239f21759..72882496ab6 100644
--- a/apps/calendar/ajax/activation.php
+++ b/apps/calendar/ajax/activation.php
@@ -13,5 +13,8 @@ if(!OC_USER::isLoggedIn()) {
 OC_JSON::checkAppEnabled('calendar');
 $calendarid = $_POST['calendarid'];
 OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
-$cal = OC_Calendar_Calendar::findCalendar($calendarid);
-echo $cal['active'];
+$calendar = OC_Calendar_Calendar::findCalendar($calendarid);
+OC_JSON::success(array(
+	'active' => $calendar['active'],
+	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
+));
diff --git a/apps/calendar/ajax/changeview.php b/apps/calendar/ajax/changeview.php
index b396ff4945b..ef05c7cd496 100644
--- a/apps/calendar/ajax/changeview.php
+++ b/apps/calendar/ajax/changeview.php
@@ -7,10 +7,9 @@
  */
 
 require_once ("../../../lib/base.php");
-if(!OC_USER::isLoggedIn()) {
-	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 $currentview = $_GET["v"];
 OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", $currentview);
+OC_JSON::success();
 ?>
diff --git a/apps/calendar/ajax/createcalendar.php b/apps/calendar/ajax/createcalendar.php
index 3fb2e8398a3..325a5ec35bc 100644
--- a/apps/calendar/ajax/createcalendar.php
+++ b/apps/calendar/ajax/createcalendar.php
@@ -20,4 +20,7 @@ OC_Calendar_Calendar::setCalendarActive($calendarid, 1);
 $calendar = OC_Calendar_Calendar::findCalendar($calendarid);
 $tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields');
 $tmpl->assign('calendar', $calendar);
-OC_JSON::success(array('data' => $tmpl->fetchPage()));
+OC_JSON::success(array(
+	'page' => $tmpl->fetchPage(),
+	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
+));
diff --git a/apps/calendar/ajax/editevent.php b/apps/calendar/ajax/editevent.php
index 3abf4de98b3..46feb068499 100644
--- a/apps/calendar/ajax/editevent.php
+++ b/apps/calendar/ajax/editevent.php
@@ -34,7 +34,14 @@ if($errarr){
 		OC_JSON::error();
 		exit;
 	}
-	$vcalendar = Sabre_VObject_Reader::read($data['calendardata']);
+	$vcalendar = OC_Calendar_Object::parse($data['calendardata']);
+
+	$last_modified = $vcalendar->VEVENT->__get('LAST-MODIFIED');
+	if($last_modified && $_POST['lastmodified'] != $last_modified->getDateTime()->format('U')){
+		OC_JSON::error(array('modified'=>true));
+		exit;
+	}
+
 	OC_Calendar_Object::updateVCalendarFromRequest($_POST, $vcalendar);
 	$result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
 	if ($data['calendarid'] != $cal) {
diff --git a/apps/calendar/ajax/editeventform.php b/apps/calendar/ajax/editeventform.php
index 34d6c657cec..63c72934079 100644
--- a/apps/calendar/ajax/editeventform.php
+++ b/apps/calendar/ajax/editeventform.php
@@ -26,7 +26,7 @@ if($calendar['userid'] != OC_User::getUser()){
 		echo $l10n->t('Wrong calendar');
 		exit;
 }
-$object = Sabre_VObject_Reader::read($data['calendardata']);
+$object = OC_Calendar_Object::parse($data['calendardata']);
 $vevent = $object->VEVENT;
 $dtstart = $vevent->DTSTART;
 $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
@@ -63,9 +63,16 @@ foreach($categories as $category){
 }
 $repeat = isset($vevent->CATEGORY) ? $vevent->CATEGORY->value : '';
 $description = isset($vevent->DESCRIPTION) ? $vevent->DESCRIPTION->value : '';
+$last_modified = $vevent->__get('LAST-MODIFIED');
+if ($last_modified){
+	$lastmodified = $last_modified->getDateTime()->format('U');
+}else{
+	$lastmodified = 0;
+}
 
 $tmpl = new OC_Template('calendar', 'part.editevent');
 $tmpl->assign('id', $id);
+$tmpl->assign('lastmodified', $lastmodified);
 $tmpl->assign('calendar_options', $calendar_options);
 $tmpl->assign('category_options', $category_options);
 $tmpl->assign('repeat_options', $repeat_options);
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
new file mode 100644
index 00000000000..9a2ba880608
--- /dev/null
+++ b/apps/calendar/ajax/events.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once ('../../../lib/base.php');
+require_once('../../../3rdparty/when/When.php');
+
+function addoutput($event, $vevent, $return_event){
+	$return_event['id'] = (int)$event['id'];
+	$return_event['title'] = $event['summary'];
+	$return_event['description'] = isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:'';
+	$last_modified = $vevent->__get('LAST-MODIFIED');
+	if ($last_modified){
+		$lastmodified = $last_modified->getDateTime()->format('U');
+	}else{
+		$lastmodified = 0;
+	}
+	$return_event['lastmodified'] = (int)$lastmodified;
+	return $return_event;
+}
+
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('calendar');
+
+$start = DateTime::createFromFormat('U', $_GET['start']);
+$end = DateTime::createFromFormat('U', $_GET['end']);
+
+$events = OC_Calendar_Object::allInPeriod($_GET['calendar_id'], $start, $end);
+$user_timezone = OC_Preferences::getValue(OC_USER::getUser(), "calendar", "timezone", "Europe/London");
+$return = array();
+foreach($events as $event){
+	$object = OC_Calendar_Object::parse($event['calendardata']);
+	$vevent = $object->VEVENT;
+	$dtstart = $vevent->DTSTART;
+	$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
+	$return_event = array();
+	$start_dt = $dtstart->getDateTime();
+	$start_dt->setTimezone(new DateTimeZone($user_timezone));
+	$end_dt = $dtend->getDateTime();
+	$end_dt->setTimezone(new DateTimeZone($user_timezone));
+	if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
+		$return_event['allDay'] = true;
+	}else{
+		$return_event['allDay'] = false;
+	}
+	//Repeating Events
+	if($event['repeating'] == 1){
+		$duration = (double) $end_dt->format('U') - (double) $start_dt->format('U');
+		$r = new When();
+		$r->recur((string) $start_dt->format('Ymd\THis'))->rrule((string) $vevent->RRULE);
+		while($result = $r->next()){
+			if($result->format('U') > $_GET['end']){
+				break;
+			}
+			if($return_event['allDay'] == true){
+				$return_event['start'] = $result->format('Y-m-d');
+				$return_event['end'] = date('Y-m-d', $result->format('U') + $duration--);
+			}else{
+				$return_event['start'] = $result->format('Y-m-d H:i:s');
+				$return_event['end'] = date('Y-m-d H:i:s', $result->format('U') + $duration);
+			}
+			$return[] = addoutput($event, $vevent, $return_event);
+		}
+	}else{
+		$return_event = array();
+		if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
+			$return_event['allDay'] = true;
+			$return_event['start'] = $start_dt->format('Y-m-d');
+			$end_dt->modify('-1 sec');
+			$return_event['end'] = $end_dt->format('Y-m-d');
+		}else{
+			$return_event['start'] = $start_dt->format('Y-m-d H:i:s');
+			$return_event['end'] = $end_dt->format('Y-m-d H:i:s');
+			$return_event['allDay'] = false;
+		}
+		$return[] = addoutput($event, $vevent, $return_event);
+	}
+}
+OC_JSON::encodedPrint($return);
+?>
\ No newline at end of file
diff --git a/apps/calendar/ajax/guesstimezone.php b/apps/calendar/ajax/guesstimezone.php
new file mode 100755
index 00000000000..a3594498b0f
--- /dev/null
+++ b/apps/calendar/ajax/guesstimezone.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+function make_array_out_of_xml ($xml){
+	$returnarray = array();
+	$xml = (array)$xml ;
+	foreach ($xml as $property => $value){
+		$value = (array)$value;
+		if(!isset($value[0])){
+			$returnarray[$property] = make_array_out_of_xml($value);
+		}else{
+			$returnarray[$property] = trim($value[0]);
+		}
+	}
+	return $returnarray;
+}
+require_once ("../../../lib/base.php");
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('calendar');
+$l = new OC_L10N('calendar');
+$lat = $_GET['lat'];
+$long = $_GET['long'];
+$geolocation = file_get_contents('http://ws.geonames.org/timezone?lat=' . $lat . '&lng=' . $long);
+//Information are by Geonames (http://www.geonames.org) and licensed under the Creative Commons Attribution 3.0 License
+$geoxml = simplexml_load_string($geolocation);
+$geoarray = make_array_out_of_xml($geoxml);
+if(isset($geoarray['timezone']['timezoneId']) && $geoarray['timezone']['timezoneId'] != ''){
+	OC_Preferences::setValue(OC_USER::getUser(), 'calendar', 'timezone', $geoarray['timezone']['timezoneId']);
+	$message = array('message'=> $l->t('New Timezone:') . $geoarray['timezone']['timezoneId']);
+	OC_JSON::success($message);
+}else{
+	OC_JSON::error();
+}
+
+?>
\ No newline at end of file
diff --git a/apps/calendar/ajax/moveevent.php b/apps/calendar/ajax/moveevent.php
index e2b777969da..6b315a39213 100644
--- a/apps/calendar/ajax/moveevent.php
+++ b/apps/calendar/ajax/moveevent.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
@@ -11,93 +11,49 @@ OC_JSON::checkLoggedIn();
 $data = OC_Calendar_Object::find($_POST["id"]);
 $calendarid = $data["calendarid"];
 $cal = $calendarid;
-$id = $_POST["id"];
+$id = $_POST['id'];
 $calendar = OC_Calendar_Calendar::findCalendar($calendarid);
-if(OC_User::getUser() != $calendar["userid"]){
+if(OC_User::getUser() != $calendar['userid']){
 	OC_JSON::error();
 	exit;
 }
-$newdate = $_POST["newdate"];
-$caldata = array();
-//modified part of editeventform.php
-$object = Sabre_VObject_Reader::read($data['calendardata']);
-$vevent = $object->VEVENT;
+$allday = $_POST['allDay'];
+$delta = new DateInterval('P0D');
+$delta->d = $_POST['dayDelta'];
+$delta->i = $_POST['minuteDelta'];
+
+$vcalendar = OC_Calendar_Object::parse($data['calendardata']);
+$vevent = $vcalendar->VEVENT;
+
+$last_modified = $vevent->__get('LAST-MODIFIED');
+if($last_modified && $_POST['lastmodified'] != $last_modified->getDateTime()->format('U')){
+	OC_JSON::error();
+	exit;
+}
+
 $dtstart = $vevent->DTSTART;
 $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-switch($dtstart->getDateType()) {
-	case Sabre_VObject_Element_DateTime::LOCALTZ:
-	case Sabre_VObject_Element_DateTime::LOCAL:
-		$startdate = $dtstart->getDateTime()->format('d-m-Y');
-		$starttime = $dtstart->getDateTime()->format('H:i');
-		$enddate = $dtend->getDateTime()->format('d-m-Y');
-		$endtime = $dtend->getDateTime()->format('H:i');
-		$allday = false;
-		break;
-	case Sabre_VObject_Element_DateTime::DATE:
-		$startdate = $dtstart->getDateTime()->format('d-m-Y');
-		$starttime = '00:00';
-		$dtend->getDateTime()->modify('-1 day');
-		$enddate = $dtend->getDateTime()->format('d-m-Y');
-		$endtime = '23:59';
-		$allday = true;
-		break;
+$start_type = $dtstart->getDateType();
+$end_type = $dtend->getDateType();
+if ($allday && $start_type != Sabre_VObject_Element_DateTime::DATE){
+	$start_type = $end_type = Sabre_VObject_Element_DateTime::DATE;
+	$dtend->setDateTime($dtend->getDateTime()->modify('+1 day'), $end_type);
 }
-$caldata["title"] = isset($vevent->SUMMARY) ? $vevent->SUMMARY->value : '';
-$caldata["location"] = isset($vevent->LOCATION) ? $vevent->LOCATION->value : '';
-$caldata["categories"] = array();
-if (isset($vevent->CATEGORIES)){
-       $caldata["categories"] = explode(',', $vevent->CATEGORIES->value);
-       $caldata["categories"] = array_map('trim', $categories);
+if (!$allday && $start_type == Sabre_VObject_Element_DateTime::DATE){
+	$start_type = $end_type = Sabre_VObject_Element_DateTime::LOCALTZ;
 }
-foreach($caldata["categories"] as $category){
-	if (!in_array($category, $category_options)){
-		array_unshift($category_options, $category);
-	}
-}
-$caldata["repeat"] = isset($vevent->CATEGORY) ? $vevent->CATEGORY->value : '';
-$caldata["description"] = isset($vevent->DESCRIPTION) ? $vevent->DESCRIPTION->value : '';
-//end part of editeventform.php
-$startdatearray = explode("-", $startdate);
-$starttimearray = explode(":", $starttime);
-$startunix = mktime($starttimearray[0], $starttimearray[1], 0, $startdatearray[1], $startdatearray[0], $startdatearray[2]);
-$enddatearray = explode("-", $enddate);
-$endtimearray = explode(":", $endtime);
-$endunix = mktime($endtimearray[0], $endtimearray[1], 0, $enddatearray[1], $enddatearray[0], $enddatearray[2]);
-$difference = $endunix - $startunix;
-if(strlen($newdate) > 10){
-	$newdatestringarray = explode("-", $newdate);
-	if($newdatestringarray[1] == "allday"){
-		$allday = true;
-		$newdatestringarray[1] = "00:00";
-	}else{
-		if($allday == true){
-			$difference = 3600;
-		}
-		$allday = false;
-	}
-}else{
-	$newdatestringarray = array();
-	$newdatestringarray[0] = $newdate;
-	$newdatestringarray[1] = $starttime;
-}
-$newdatearray = explode(".", $newdatestringarray[0]);
-$newtimearray = explode(":", $newdatestringarray[1]);
-$newstartunix = mktime($newtimearray[0], $newtimearray[1], 0, $newdatearray[1], $newdatearray[0], $newdatearray[2]);
-$newendunix = $newstartunix + $difference;
-if($allday == true){
-	$caldata["allday"] = true;
-}else{
-	unset($caldata["allday"]);
-}
-$caldata["from"] = date("d-m-Y", $newstartunix);
-$caldata["fromtime"] = date("H:i", $newstartunix);
-$caldata["to"]  = date("d-m-Y", $newendunix);
-$caldata["totime"] = date("H:i", $newendunix);
-//modified part of editevent.php
-$vcalendar = Sabre_VObject_Reader::read($data["calendardata"]);
-OC_Calendar_Object::updateVCalendarFromRequest($caldata, $vcalendar);
+$dtstart->setDateTime($dtstart->getDateTime()->add($delta), $start_type);
+$dtend->setDateTime($dtend->getDateTime()->add($delta), $end_type);
+unset($vevent->DURATION);
+
+$now = new DateTime();
+$last_modified = new Sabre_VObject_Element_DateTime('LAST-MODIFIED');
+$last_modified->setDateTime($now, Sabre_VObject_Element_DateTime::UTC);
+$vevent->__set('LAST-MODIFIED', $last_modified);
+
+$dtstamp = new Sabre_VObject_Element_DateTime('DTSTAMP');
+$dtstamp->setDateTime($now, Sabre_VObject_Element_DateTime::UTC);
+$vevent->DTSTAMP = $dtstamp;
 
 $result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
-OC_JSON::success();
-//end part of editevent.php
-?>
\ No newline at end of file
+OC_JSON::success(array('lastmodified'=>(int)$now->format('U')));
diff --git a/apps/calendar/ajax/neweventform.php b/apps/calendar/ajax/neweventform.php
index 9d4dcfa2e13..588d364871c 100644
--- a/apps/calendar/ajax/neweventform.php
+++ b/apps/calendar/ajax/neweventform.php
@@ -15,43 +15,35 @@ if(!OC_USER::isLoggedIn()) {
 }
 OC_JSON::checkAppEnabled('calendar');
 
-$calendar_options = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
-$category_options = OC_Calendar_Object::getCategoryOptions($l10n);
-$repeat_options = OC_Calendar_Object::getRepeatOptions($l10n);
-$startday   = substr($_GET['d'], 0, 2);
-$startmonth = substr($_GET['d'], 2, 2);
-$startyear  = substr($_GET['d'], 4, 4);
-$starttime  = $_GET['t'];
-$allday = $starttime == 'allday';
-if($starttime != 'undefined' && !is_nan($starttime) && !$allday){
-	$startminutes = '00';
-}elseif($allday){
-	$starttime = '0';
-	$startminutes = '00';
-}else{
-	$starttime = date('G');
-
-	$startminutes = date('i');
+if (!isset($_POST['start'])){
+	OC_JSON::error();
+	die;
 }
+$start = $_POST['start'];
+$end = $_POST['end'];
+$allday = $_POST['allday'];
 
-$datetimestamp = mktime($starttime, $startminutes, 0, $startmonth, $startday, $startyear);
-$duration = OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'duration', "60");
-$datetimestamp = $datetimestamp + ($duration * 60);
-$endmonth = date("m", $datetimestamp);
-$endday = date("d", $datetimestamp);
-$endyear = date("Y", $datetimestamp);
-$endtime = date("G", $datetimestamp);
-$endminutes = date("i", $datetimestamp);
-
+if (!$end){
+	$duration = OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'duration', '60');
+	$end = $start + ($duration * 60);
+}
+$start = new DateTime('@'.$start);
+$end = new DateTime('@'.$end);
+$timezone = OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone', 'Europe/London');
+$start->setTimezone(new DateTimeZone($timezone));
+$end->setTimezone(new DateTimeZone($timezone));
 
+$calendar_options = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
+$category_options = OC_Calendar_Object::getCategoryOptions($l10n);
+$repeat_options = OC_Calendar_Object::getRepeatOptions($l10n);
 
 $tmpl = new OC_Template('calendar', 'part.newevent');
 $tmpl->assign('calendar_options', $calendar_options);
 $tmpl->assign('category_options', $category_options);
-$tmpl->assign('startdate', $startday . '-' . $startmonth . '-' . $startyear);
-$tmpl->assign('starttime', ($starttime <= 9 ? '0' : '') . $starttime . ':' . $startminutes);
-$tmpl->assign('enddate', $endday . '-' . $endmonth . '-' . $endyear);
-$tmpl->assign('endtime', ($endtime <= 9 ? '0' : '') . $endtime . ':' . $endminutes);
+$tmpl->assign('startdate', $start->format('d-m-Y'));
+$tmpl->assign('starttime', $start->format('H:i'));
+$tmpl->assign('enddate', $end->format('d-m-Y'));
+$tmpl->assign('endtime', $end->format('H:i'));
 $tmpl->assign('allday', $allday);
 $tmpl->printpage();
 ?>
diff --git a/apps/calendar/ajax/resizeevent.php b/apps/calendar/ajax/resizeevent.php
new file mode 100644
index 00000000000..28a185411e0
--- /dev/null
+++ b/apps/calendar/ajax/resizeevent.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+error_reporting(E_ALL);
+require_once('../../../lib/base.php');
+OC_JSON::checkLoggedIn();
+$data = OC_Calendar_Object::find($_POST["id"]);
+$calendarid = $data["calendarid"];
+$cal = $calendarid;
+$id = $_POST['id'];
+$calendar = OC_Calendar_Calendar::findCalendar($calendarid);
+if(OC_User::getUser() != $calendar['userid']){
+	OC_JSON::error();
+	exit;
+}
+
+$delta = new DateInterval('P0D');
+$delta->d = $_POST['dayDelta'];
+$delta->i = $_POST['minuteDelta'];
+
+$vcalendar = OC_Calendar_Object::parse($data['calendardata']);
+$vevent = $vcalendar->VEVENT;
+
+$last_modified = $vevent->__get('LAST-MODIFIED');
+if($last_modified && $_POST['lastmodified'] != $last_modified->getDateTime()->format('U')){
+	OC_JSON::error();
+	exit;
+}
+
+$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
+$end_type = $dtend->getDateType();
+$dtend->setDateTime($dtend->getDateTime()->add($delta), $end_type);
+unset($vevent->DURATION);
+
+$now = new DateTime();
+$last_modified = new Sabre_VObject_Element_DateTime('LAST-MODIFIED');
+$last_modified->setDateTime($now, Sabre_VObject_Element_DateTime::UTC);
+$vevent->__set('LAST-MODIFIED', $last_modified);
+
+$dtstamp = new Sabre_VObject_Element_DateTime('DTSTAMP');
+$dtstamp->setDateTime($now, Sabre_VObject_Element_DateTime::UTC);
+$vevent->DTSTAMP = $dtstamp;
+
+$result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
+OC_JSON::success(array('lastmodified'=>$now->format('U')));
diff --git a/apps/calendar/ajax/updatecalendar.php b/apps/calendar/ajax/updatecalendar.php
index a81644ded17..e99ca16e22a 100644
--- a/apps/calendar/ajax/updatecalendar.php
+++ b/apps/calendar/ajax/updatecalendar.php
@@ -20,4 +20,7 @@ OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
 $calendar = OC_Calendar_Calendar::findCalendar($calendarid);
 $tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields');
 $tmpl->assign('calendar', $calendar);
-OC_JSON::success(array('data' => $tmpl->fetchPage()));
+OC_JSON::success(array(
+	'page' => $tmpl->fetchPage(),
+	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
+));
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 2dc01eab0f6..5675e624dda 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -21,3 +21,5 @@ OC_App::addNavigationEntry( array(
   'name' => $l->t('Calendar')));
 
 OC_App::registerPersonal('calendar', 'settings');
+
+require_once('apps/calendar/lib/search.php');
\ No newline at end of file
diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
index 80d29ca8974..0204f2fc12f 100644
--- a/apps/calendar/css/style.css
+++ b/apps/calendar/css/style.css
@@ -17,19 +17,12 @@
 #editentry_dialog {display: none;}
 #parsingfail_dialog{display: none;}
 
-#calendar_holder {height: 100%; width: 100%;}
-#onedayview, #oneweekview, #fourweeksview, #onemonthview, #listview {display: none; position: absolute;bottom: 0; right: 0; left: 160px; top: 80px;}
-#onedayview table {margin: 0; padding: 0; width: 100%; height: 100%; border-spacing:1px; background: #EEEEEE;}
-#oneweekview table {margin: 0; padding: 0; width: 100%; height: 100%; border-spacing:1px; background: #EEEEEE;}
-#fourweeksview table {margin: 0; padding: 0; width: 100%; height: 100%; border-spacing:1px; background: #EEEEEE;overflow: hidden;}
-#onemonthview table {margin: 0;	padding: 0; width: 100%; height: 100%; border-spacing:1px; background: #EEEEEE;}
+#calendar_holder {position: relative;bottom: 0; right: 0; left: 0; top: 3em;}
+.fc-content{padding:2px 4px;}
 #listview {margin: 0; padding: 10px; background: #EEEEEE;}
 #listview #more_before, #listview #more_after {border: 1px solid #1a1a1a; width:25em;padding: 3px;text-align: center;}
 #listview #events {width:25em;padding: 4px;}
 #listview #events .day {width:auto;padding-left:10px;border-bottom: 2px solid #EEEEEE;text-align:left;}
-#fourweeksview .calw{vertical-align: middle;text-align: center;width: 50px;}
-
-#sysbox{display: none;}
 
 .actions {height: 33px;	min-width: 800px;}
 .controls {min-width: 800px;}
@@ -60,3 +53,75 @@ button.category{margin:0 3px;}
 
 .calendar-colorpicker-color{display:inline-block;width:20px;height:20px;margin-right:2px;cursor:pointer;border:2px solid transparent;}
 .calendar-colorpicker-color.active{border:2px solid black;}
+
+.fc-list-table
+{
+    margin: 10px;
+    border-style: hidden;
+    border-width: 10px;
+    padding: 10px;
+    vertical-align: top;
+    width: 100%;
+}
+.fc-list-table tr:hover
+{
+    color: #0000FF;
+    background-color: #CCFFCC;
+}
+
+
+.fc-list-date
+{
+    margin: 16px;
+    white-space: nowrap;
+    text-align: left;
+    width: 100%;
+    background-color: #808080;
+    color: #FFFFFF;
+    font-weight: bold;
+    font-family: Arial, Helvetica, sans-serif;
+}
+.fc-list-time
+{
+    text-align: center;
+    white-space: nowrap;
+    width: 1%;
+}
+
+.fc-list-event
+{
+     text-align: left;
+}
+
+.fc-list-event .fc-event-title
+{
+     cursor: pointer;
+}
+.tipsy-event .tipsy-inner{
+background-color:#0098E4;
+border:2px solid #1d2d44;
+max-width:400px;
+padding:0;
+}
+.tipsy-event .tipsy-arrow-s{
+border-top-color:#1d2d44;
+}
+.tipsy-event .tipsy-arrow-n{
+border-bottom-color:#1d2d44;
+}
+.tipsy-event .summary,
+.tipsy-event .timespan,
+.tipsy-event .description{
+padding:0 8px;
+}
+.tipsy-event .summary{
+background-color:#1d2d44;
+font-size:1.2em;
+font-weight:bold;
+text-align:left;
+padding:0 8px 2px;
+}
+.tipsy-event .description{
+line-height:1.2;
+margin-bottom:4px;
+}
diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index 8b8ac729588..3313750d52e 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -10,15 +10,36 @@ require_once ('../../lib/base.php');
 OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('calendar');
 // Create default calendar ...
-$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
+$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser(), 1);
 if( count($calendars) == 0){
 	OC_Calendar_Calendar::addCalendar(OC_User::getUser(),'Default calendar');
-	$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
+	$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser(), 1);
 }
-OC_UTIL::addScript('calendar', 'calendar');
-OC_UTIL::addStyle('calendar', 'style');
-OC_UTIL::addScript('', 'jquery.multiselect');
-OC_UTIL::addStyle('', 'jquery.multiselect');
-OC_APP::setActiveNavigationEntry('calendar_index');
-$output = new OC_TEMPLATE('calendar', 'calendar', 'user');
-$output -> printPage();
+$eventSources = array();
+foreach($calendars as $calendar){
+	$eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar);
+}
+//Fix currentview for fullcalendar
+if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') == "oneweekview"){
+	OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", "agendaWeek");
+}
+if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') == "onemonthview"){
+	OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", "month");
+}
+if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') == "listview"){
+	OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", "list");
+}
+
+OC_Util::addScript('3rdparty/fullcalendar', 'fullcalendar');
+OC_Util::addStyle('3rdparty/fullcalendar', 'fullcalendar');
+if(OC_Preferences::getValue(OC_USER::getUser(), "calendar", "timezone") == null){
+	OC_UTIL::addScript('calendar', 'geo');
+}
+OC_Util::addScript('calendar', 'calendar');
+OC_Util::addStyle('calendar', 'style');
+OC_Util::addScript('', 'jquery.multiselect');
+OC_Util::addStyle('', 'jquery.multiselect');
+OC_App::setActiveNavigationEntry('calendar_index');
+$tmpl = new OC_Template('calendar', 'calendar', 'user');
+$tmpl->assign('eventSources', $eventSources);
+$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 2917d9f9134..005e359f8eb 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -8,261 +8,10 @@
 
 Calendar={
 	space:' ',
-	firstdayofweek: '',
-	weekend: '',
-	Date:{
-		normal_year_cal: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
-		leap_year_cal: [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
-		calw:function() {
-			var dayofweek = this.current.getDay();
-			if(dayofweek == 0) {
-				dayofweek = 7;
-			}
-			var calw = Math.floor((this.doy() - dayofweek) / 7) + 1;
-			return calw;
-		},
-
-		doy:function() {
-			var cal = this.getnumberofdays(this.current.getFullYear());
-			var doy = 0;
-			for(var i = 0; i < this.current.getMonth(); i++) {
-				doy = doy + cal[i];
-			}
-			doy = doy + this.current.getDate();
-			return doy;
-		},
-
-		getnumberofdays:function(year) {
-			if(this.checkforleapyear(year) == true) {
-				var cal = this.leap_year_cal;
-			} else {
-				var cal = this.normal_year_cal;
-			}
-			return cal;
-		},
-
-		checkforleapyear:function(year2check) {
-			if((year2check / 600) == Math.floor(year2check / 400)) {
-				return true;
-			}
-			if((year2check / 4) == Math.floor(year2check / 4)) {
-				if((year2check / 100) == Math.floor(year2check / 100)) {
-					return false;
-				}
-				return true;
-			}
-			return false;
-		},
-
-		current:new Date(),
-		forward_day:function(){
-			this.current.setDate(this.current.getDate()+1);
-		},
-
-		forward_week:function(){
-			this.current.setDate(this.current.getDate()+7);
-		},
-
-		forward_month:function(){
-			this.current.setMonth(this.current.getMonth()+1);
-		},
-
-		backward_day:function(){
-			this.current.setDate(this.current.getDate()-1);
-		},
-
-		backward_week:function(){
-			this.current.setDate(this.current.getDate()-7);
-		},
-
-		backward_month:function(){
-			this.current.setMonth(this.current.getMonth()-1);
-		},
-
-	},
 	UI:{
-		weekdays: '',
-		formatDayShort:function(day){
-			if (typeof(day) == 'undefined'){
-				day = Calendar.Date.current.getDay();
-			}
-			return this.dayshort[day];
-		},
-		formatDayLong:function(day){
-			if (typeof(day) == 'undefined'){
-				day = Calendar.Date.current.getDay();
-			}
-			return this.daylong[day];
-		},
-		formatMonthShort:function(month){
-			if (typeof(month) == 'undefined'){
-				month = Calendar.Date.current.getMonth();
-			}
-			return this.monthshort[month];
-		},
-		formatMonthLong:function(month){
-			if (typeof(month) == 'undefined'){
-				month = Calendar.Date.current.getMonth();
-			}
-			return this.monthlong[month];
-		},
-		formatDate:function(date){
-			return date[0] + '-' + date[1] + '-' + date[2];
-		},
-		formatTime:function(date){
-			return date[3] + ':' + date[4];
-		},
-		updateView:function() {
-			this.current.removeEvents();
-			this.current.renderCal();
-			this.current.showEvents();
-		},
-		currentview:'none',
-		setCurrentView:function(view){
-			if (view == this.currentview){
-				return;
-			}
-			$('#'+this.currentview).hide();
-			$('#'+this.currentview + "_radio").removeClass('active');
-			this.currentview = view;
-			//sending ajax request on every change view
-			$("#sysbox").load(OC.filePath('calendar', 'ajax', 'changeview.php') + "?v="+view);
-			//not necessary to check whether the response is true or not
-			switch(view) {
-				case "onedayview":
-					this.current = this.OneDay;
-					break;
-				case "oneweekview":
-					this.current = this.OneWeek;
-					break;
-				case "fourweeksview":
-					this.current = this.FourWeeks;
-					break;
-				case "onemonthview":
-					this.current = this.OneMonth;
-					break;
-				case "listview":
-					this.current = this.List;
-					break;
-				default:
-					alert('Unknown view:'+view);
-					break;
-			}
-			$(document).ready(function() {
-				$('#'+Calendar.UI.currentview).show();
-				$('#'+Calendar.UI.currentview + "_radio")
-					.addClass('active');
-				Calendar.UI.updateView()
-			});
-		},
-		drageventid: '',
-		updateDate:function(direction){
-			if(direction == 'forward' && this.current.forward) {
-				this.current.forward();
-				if(Calendar.Date.current.getMonth() == 11){
-					this.loadEvents(Calendar.Date.current.getFullYear() + 1);
-				}
-				this.updateView();
-			}
-			if(direction == 'backward' && this.current.backward) {
-				this.current.backward();
-				if(Calendar.Date.current.getMonth() == 0){
-					this.loadEvents(Calendar.Date.current.getFullYear() - 1);
-				}
-				this.updateView();
-			}
-		},
-		events:[],
-		loadEvents:function(year){
-			if( typeof (year) == 'undefined') {
-				this.events = [];
-				year = Calendar.Date.current.getFullYear();
-			}
-			if( typeof (this.events[year]) == "undefined") {
-				this.events[year] = []
-			}
-			$.getJSON(OC.filePath('calendar', 'ajax', 'getcal.php') + "?year=" + year, function(jsondata, status) {
-				if(status == "nosession") {
-					alert("You are not logged in. That can happen if you don't use owncloud for a long time.");
-					document.location(oc_webroot);
-				}
-				if(status == "parsingfail" || typeof (jsondata) == "undefined") {
-					$.ready(function() {
-						$( "#parsingfail_dialog" ).dialog();
-					});
-				} else {
-					if (typeof(jsondata[year]) != 'undefined'){
-						Calendar.UI.calendars = jsondata['calendars'];
-						Calendar.UI.events[year] = jsondata[year];
-					}
-					$(document).ready(function() {
-						Calendar.UI.updateView();
-					});
-				}
-			});
-			window.setTimeout("Calendar.UI.loadEvents(" + year + ")", 120000);
-		},
-		getEventsForDate:function(date){
-			var day = date.getDate();
-			var month = date.getMonth();
-			var year = date.getFullYear();
-			if( typeof (this.events[year]) == "undefined") {
-				this.loadEvents(year);
-				return false;
-			}
-			if( typeof (this.events[year][month]) == "undefined") {
-				return false;
-			}
-			if( typeof (this.events[year][month][day]) == "undefined") {
-				return false;
-			}
-			return this.events[year][month][day];
-		},
-		createEventsForDate:function(date, week){
-			events = this.getEventsForDate(date);
-			if (!events) {
-				return;
-			}
-			var weekday = (date.getDay()+7-Calendar.firstdayofweek)%7;
-			if( typeof (events["allday"]) != "undefined") {
-				var eventnumber = 1;
-				var eventcontainer = this.current.getEventContainer(week, weekday, "allday");
-				while( typeof (events["allday"][eventnumber]) != "undefined") {
-					this.addEventLabel(eventcontainer, events['allday'][eventnumber]);
-					eventnumber++;
-				}
-			}
-			for(var time = 0; time <= 23; time++) {
-				if( typeof (events[time]) != "undefined") {
-					var eventnumber = 1;
-					var eventcontainer = this.current.getEventContainer(week, weekday, time);
-					while( typeof (events[time][eventnumber]) != "undefined") {
-						this.addEventLabel(eventcontainer, events[time][eventnumber]);
-						eventnumber++;
-					}
-				}
-			}
-		},
-		addEventLabel:function(eventcontainer, event){
-			var event_holder = this.current.createEventLabel(event)
-				.addClass('event')
-				.data('event_info', event)
-				.hover(this.createEventPopup,
-				       this.hideEventPopup)
-				.draggable({
-					drag: function() {
-						Calendar.UI.drageventid = event.id;
-					}
-				})
-				.click(this.editEvent);
-			var color = this.calendars[event['calendarid']]['color'];
-			if (color){
-				event_holder.css('background-color', color)
-					.addClass('colored');
-			}
-			eventcontainer.append(event_holder);
-		},
 		startEventDialog:function(){
+			$('.tipsy').remove();
+			$('#calendar_holder').fullCalendar('unselect');
 			Calendar.UI.lockTime();
 			$( "#from" ).datepicker({
 				dateFormat : 'dd-mm-yy'
@@ -284,30 +33,20 @@ Calendar={
 				}
 			});
 		},
-		newEvent:function(selector, time){
-			var date_info = $(selector).data('date_info');
-			var dayofmonth = date_info.getDate();
-			var month = date_info.getMonth();
-			var year = date_info.getFullYear();
-			if(dayofmonth <= 9){
-				dayofmonth = '0' + dayofmonth;
-			}
-			month++;
-			if(month <= 9){
-				month = '0' + month;
+		newEvent:function(start, end, allday){
+			start = Math.round(start.getTime()/1000);
+			if (end){
+				end = Math.round(end.getTime()/1000);
 			}
-			var date = String(dayofmonth) + String(month) + String(year);
 			if($('#event').dialog('isOpen') == true){
 				// TODO: save event
 				$('#event').dialog('destroy').remove();
 			}else{
-				$('#dialog_holder').load(OC.filePath('calendar', 'ajax', 'neweventform.php') + '?d=' + date + '&t=' + time, Calendar.UI.startEventDialog);
+				$('#dialog_holder').load(OC.filePath('calendar', 'ajax', 'neweventform.php'), {start:start, end:end, allday:allday?1:0}, Calendar.UI.startEventDialog);
 			}
 		},
-		editEvent:function(event){
-			event.stopPropagation();
-			var event_data = $(this).data('event_info');
-			var id = event_data.id;
+		editEvent:function(calEvent, jsEvent, view){
+			var id = calEvent.id;
 			if($('#event').dialog('isOpen') == true){
 				// TODO: save event
 				$('#event').dialog('destroy').remove();
@@ -316,14 +55,14 @@ Calendar={
 			}
 		},
 		submitDeleteEventForm:function(url){
-			var post = $( "#event_form" ).serialize();
-			$("#errorbox").empty();
+			var post = $( '#event_form' ).serialize();
+			$('#errorbox').empty();
 			$.post(url, post, function(data){
 					if(data.status == 'success'){
+						$('#calendar_holder').fullCalendar('removeEvents', $('#event_form input[name=id]').val());
 						$('#event').dialog('destroy').remove();
-						Calendar.UI.loadEvents();
 					} else {
-						$("#errorbox").html("Deletion failed");
+						$('#errorbox').html(t('calendar', 'Deletion failed'));
 					}
 
 			}, "json");
@@ -334,27 +73,27 @@ Calendar={
 			$.post(url, post,
 				function(data){
 					if(data.status == "error"){
-						var output = "Missing fields: <br />";
+						var output = missing_field + ": <br />";
 						if(data.title == "true"){
-							output = output + "Title<br />";
+							output = output + missing_field_title + "<br />";
 						}
 						if(data.cal == "true"){
-							output = output + "Calendar<br />";
+							output = output + missing_field_calendar + "<br />";
 						}
 						if(data.from == "true"){
-							output = output + "From Date<br />";
+							output = output + missing_field_fromdate + "<br />";
 						}
 						if(data.fromtime == "true"){
-							output = output + "From Time<br />";
+							output = output + missing_field_fromtime + "<br />";
 						}
 						if(data.to == "true"){
-							output = output + "To Date<br />";
+							output = output + missing_field_todate + "<br />";
 						}
 						if(data.totime == "true"){
-							output = output + "To Time<br />";
+							output = output + missing_field_totime + "<br />";
 						}
 						if(data.endbeforestart == "true"){
-							output = "The event ends before it starts!";
+							output = output + missing_field_startsbeforeends + "!<br/>";
 						}
 						if(data.dberror == "true"){
 							output = "There was a database fail!";
@@ -363,65 +102,54 @@ Calendar={
 					} else
 					if(data.status == 'success'){
 						$('#event').dialog('destroy').remove();
-						Calendar.UI.loadEvents();
+						$('#calendar_holder').fullCalendar('refetchEvents');
 					}
 				},"json");
 		},
-		moveevent:function(eventid, newstartdate){
-			$.post(OC.filePath('calendar', 'ajax', 'moveevent.php'), { id: eventid, newdate: newstartdate},
+		moveEvent:function(event, dayDelta, minuteDelta, allDay, revertFunc){
+			$('.tipsy').remove();
+			$.post(OC.filePath('calendar', 'ajax', 'moveevent.php'), { id: event.id, dayDelta: dayDelta, minuteDelta: minuteDelta, allDay: allDay?1:0, lastmodified: event.lastmodified},
+			function(data) {
+				if (data.status == 'success'){
+					event.lastmodified = data.lastmodified;
+					console.log("Event moved successfully");
+				}else{
+					revertFunc();
+					$('#calendar_holder').fullCalendar('refetchEvents');
+				}
+			});
+		},
+		resizeEvent:function(event, dayDelta, minuteDelta, revertFunc){
+			$('.tipsy').remove();
+			$.post(OC.filePath('calendar', 'ajax', 'resizeevent.php'), { id: event.id, dayDelta: dayDelta, minuteDelta: minuteDelta, lastmodified: event.lastmodified},
 			function(data) {
-				console.log("Event moved successfully");
+				if (data.status == 'success'){
+					event.lastmodified = data.lastmodified;
+					console.log("Event resized successfully");
+				}else{
+					revertFunc();
+					$('#calendar_holder').fullCalendar('refetchEvents');
+				}
 			});
 		},
 		showadvancedoptions:function(){
 			$("#advanced_options").css("display", "block");
 			$("#advanced_options_button").css("display", "none");
 		},
-		createEventPopup:function(e){
-			var popup = $(this).data('popup');
-			if (!popup){
-				var event = $(this).data('event_info');
-				popup = $(document.createElement('div'));
-				$(this).data('popup', popup).append(popup);
-				popup.addClass('popup')
-				popup.addClass('event_popup')
-					.html(Calendar.UI.getEventPopupText(event));
-			}
-			popup.css('left', -(popup.width() - $(this).width())/2)
-				.show();
-		},
-		hideEventPopup:function(){
-			$(this).data('popup').hide();
-		},
 		getEventPopupText:function(event){
-			var startdate = this.formatDate(event.startdate)
-			var starttime = this.formatTime(event.startdate)
-			var enddate = this.formatDate(event.enddate)
-			var endtime = this.formatTime(event.enddate)
-			if (event.allday){
-				var timespan = startdate;
-				if (event.startdate[2] != parseInt(event.enddate[2])-1){
-					timespan += ' - ' + enddate;
-				}
+			if (event.allDay){
+				var timespan = $.fullCalendar.formatDates(event.start, event.end, 'ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}', {monthNamesShort: monthNamesShort, monthNames: monthNames, dayNames: dayNames, dayNamesShort: dayNamesShort}); //t('calendar', "ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}")
 			}else{
-				var start = startdate + ' ' + starttime;
-				if (startdate == enddate){
-					var end = endtime;
-				}else{
-					var end = enddate + ' ' + endtime;
-				}
-				var timespan = start + ' - ' + end;
+				var timespan = $.fullCalendar.formatDates(event.start, event.end, 'ddd d MMMM[ yyyy] ' + defaulttime + '{ -[ ddd d MMMM yyyy]' + defaulttime + '}', {monthNamesShort: monthNamesShort, monthNames: monthNames, dayNames: dayNames, dayNamesShort: dayNamesShort}); //t('calendar', "ddd d MMMM[ yyyy] HH:mm{ -[ ddd d MMMM yyyy] HH:mm}")
+				// Tue 18 October 2011 08:00 - 16:00
 			}
-			return '<span class="timespan">' + timespan + '</span>'
-				+ ' '
-				+ '<span class="summary">' + event.description + '</span>';
-		},
-		addDateInfo:function(selector, date){
-			$(selector).data('date_info', date);
-		},
-		switch2Today:function(){
-			Calendar.Date.current = new Date();
-			Calendar.UI.updateView();
+			var html =
+				'<div class="summary">' + event.title + '</div>' +
+				'<div class="timespan">' + timespan + '</div>';
+			if (event.description){
+				html += '<div class="description">' + event.description + '</div>';
+			}
+			return html;
 		},
 		lockTime:function(){
 			if($('#allday_checkbox').is(':checked')) {
@@ -441,54 +169,41 @@ Calendar={
 			$('#caldav_url').show();
 			$("#caldav_url_close").show();
 		},
-		deleteCalendar:function(calid){
-			var check = confirm("Do you really want to delete this calendar?");
-			if(check == false){
-				return false;
-			}else{
-				$.post(OC.filePath('calendar', 'ajax', 'deletecalendar.php'), { calendarid: calid},
-				  function(data) {
-					Calendar.UI.loadEvents();
-					$('#choosecalendar_dialog').dialog('destroy').remove();
-					Calendar.UI.Calendar.overview();
-				  });
-			}
-		},
-		initscroll:function(){ 
+		initScroll:function(){
 			if(window.addEventListener)
-				document.addEventListener('DOMMouseScroll', Calendar.UI.scrollcalendar);
+				document.addEventListener('DOMMouseScroll', Calendar.UI.scrollCalendar);
 			//}else{
-				document.onmousewheel = Calendar.UI.scrollcalendar;
+				document.onmousewheel = Calendar.UI.scrollCalendar;
 			//}
 		},
-		scrollcalendar:function(event){
+		scrollCalendar:function(event){
+			$('.tipsy').remove();
 			var direction;
 			if(event.detail){
 				if(event.detail < 0){
-					direction = "top";
+					direction = 'top';
 				}else{
-					direction = "down";
+					direction = 'down';
 				}
 			}
 			if (event.wheelDelta){
 				if(event.wheelDelta > 0){
-					direction = "top";
+					direction = 'top';
 				}else{
-					direction = "down";
+					direction = 'down';
 				}
 			}
-			if(Calendar.UI.currentview == "onemonthview"){
-				if(direction == "down"){
-					Calendar.UI.updateDate("forward");
-				}else{
-					Calendar.UI.updateDate("backward");
-				}
-			}else if(Calendar.UI.currentview == "oneweekview"){
-				if(direction == "down"){
-					Calendar.UI.updateDate("forward");
-				}else{
-					Calendar.UI.updateDate("backward");
-				}
+			var scroll = $(document).scrollTop(),
+				doc_height = $(document).height(),
+				win_height = $(window).height();
+			if(direction == 'down' && win_height == (doc_height - scroll)){
+				$('#calendar_holder').fullCalendar('next');
+				$(document).scrollTop(0);
+				event.preventDefault();
+			}else if (direction == 'top' && scroll == 0) {
+				$('#calendar_holder').fullCalendar('prev');
+				$(document).scrollTop(win_height);
+				event.preventDefault();
 			}
 		},
 		Calendar:{
@@ -510,8 +225,14 @@ Calendar={
 			{
 				$.post(OC.filePath('calendar', 'ajax', 'activation.php'), { calendarid: calendarid, active: checkbox.checked?1:0 },
 				  function(data) {
-					checkbox.checked = data == 1;
-					Calendar.UI.loadEvents();
+					if (data.status == 'success'){
+						checkbox.checked = data.active == 1;
+						if (data.active == 1){
+							$('#calendar_holder').fullCalendar('addEventSource', data.eventSource);
+						}else{
+							$('#calendar_holder').fullCalendar('removeEventSource', data.eventSource.url);
+						}
+					}
 				  });
 			},
 			newCalendar:function(object){
@@ -526,6 +247,46 @@ Calendar={
 						function(){Calendar.UI.Calendar.colorPicker(this)});
 				$(object).closest('tr').after(tr).hide();
 			},
+			deleteCalendar:function(calid){
+				var check = confirm("Do you really want to delete this calendar?");
+				if(check == false){
+					return false;
+				}else{
+					$.post(OC.filePath('calendar', 'ajax', 'deletecalendar.php'), { calendarid: calid},
+					  function(data) {
+						if (data.status == 'success'){
+							var url = 'ajax/events.php?calendar_id='+calid;
+							$('#calendar_holder').fullCalendar('removeEventSource', url);
+							$('#choosecalendar_dialog').dialog('destroy').remove();
+							Calendar.UI.Calendar.overview();
+						}
+					  });
+				}
+			},
+			submit:function(button, calendarid){
+				var displayname = $("#displayname_"+calendarid).val();
+				var active = $("#edit_active_"+calendarid+":checked").length;
+				var description = $("#description_"+calendarid).val();
+				var calendarcolor = $("#calendarcolor_"+calendarid).val();
+
+				var url;
+				if (calendarid == 'new'){
+					url = "ajax/createcalendar.php";
+				}else{
+					url = "ajax/updatecalendar.php";
+				}
+				$.post(url, { id: calendarid, name: displayname, active: active, description: description, color: calendarcolor },
+					function(data){
+						if(data.status == 'success'){
+							$(button).closest('tr').prev().html(data.page).show().next().remove();
+							$('#calendar_holder').fullCalendar('removeEventSource', data.eventSource.url);
+							$('#calendar_holder').fullCalendar('addEventSource', data.eventSource);
+						}
+					}, 'json');
+			},
+			cancel:function(button, calendarid){
+				$(button).closest('tr').prev().show().next().remove();
+			},
 			colorPicker:function(container){
 				// based on jquery-colorpicker at jquery.webspirited.com
 				var obj = $('.colorpicker', container);
@@ -551,429 +312,233 @@ Calendar={
 					position: 'absolute',
 					left: -10000
 				});
-			},
-			submit:function(button, calendarid){
-				var displayname = $("#displayname_"+calendarid).val();
-				var active = $("#edit_active_"+calendarid+":checked").length;
-				var description = $("#description_"+calendarid).val();
-				var calendarcolor = $("#calendarcolor_"+calendarid).val();
+			}
+		}
+	}
+}
+$.fullCalendar.views.list = ListView;
+function ListView(element, calendar) {
+	var t = this;
 
-				var url;
-				if (calendarid == 'new'){
-					url = "ajax/createcalendar.php";
-				}else{
-					url = "ajax/updatecalendar.php";
-				}
-				$.post(url, { id: calendarid, name: displayname, active: active, description: description, color: calendarcolor },
-					function(data){
-						if(data.error == "true"){
-						}else{
-							$(button).closest('tr').prev().html(data.data).show().next().remove();
-							Calendar.UI.loadEvents();
-						}
-					}, 'json');
-			},
-			cancel:function(button, calendarid){
-				$(button).closest('tr').prev().show().next().remove();
-			},
-		},/*
-		OneDay:{
-			forward:function(){
-				Calendar.Date.forward_day();
-			},
-			backward:function(){
-				Calendar.Date.backward_day();
-			},
-			removeEvents:function(){
-				$("#onedayview .calendar_row").empty();
-			},
-			renderCal:function(){
-				$("#datecontrol_date").val(Calendar.UI.formatDayShort() + Calendar.space + Calendar.Date.current.getDate() + Calendar.space + Calendar.UI.formatMonthShort() + Calendar.space + Calendar.Date.current.getFullYear());
-				$("#onedayview_today").html(Calendar.UI.formatDayLong() + Calendar.space + Calendar.Date.current.getDate() + Calendar.space + Calendar.UI.formatMonthShort());
-				Calendar.UI.addDateInfo('#onedayview_today', new Date(Calendar.Date.current));
-			},
-			showEvents:function(){
-				Calendar.UI.createEventsForDate(Calendar.Date.current, 0);
-			},
-			getEventContainer:function(week, weekday, when){
-				return $("#onedayview ." + when);
-			},
-			createEventLabel:function(event){
-				var time = '';
-				if (!event['allday']){
-					time = '<strong>' + Calendar.UI.formatTime(event['startdate']) + ' - ' + Calendar.UI.formatTime(event['enddate']) + '</strong> ';
-				}
-				return $(document.createElement('p'))
-					.html(time + event['description'])
-			},
-		},*/
-		OneWeek:{
-			forward:function(){
-				Calendar.Date.forward_week();
-			},
-			backward:function(){
-				Calendar.Date.backward_week();
-			},
-			removeEvents:function(){
-				for( i = 0; i <= 6; i++) {
-					$("#oneweekview ." + Calendar.UI.weekdays[i]).empty();
-				}
-				$("#oneweekview .thisday").removeClass("thisday");
-			},
-			renderCal:function(){
-				$("#datecontrol_date").val(Calendar.UI.cw_label + ": " + Calendar.Date.calw());
-				var dates = this.generateDates();
-				var today = new Date();
-				for(var i = 0; i <= 6; i++){
-					$("#oneweekview th." + Calendar.UI.weekdays[i]).html(Calendar.UI.formatDayShort((i+Calendar.firstdayofweek)%7) + Calendar.space + dates[i].getDate() + Calendar.space + Calendar.UI.formatMonthShort(dates[i].getMonth()));
-					$("#oneweekview td." + Calendar.UI.weekdays[i] + ".allday").attr('title', dates[i].getDate() + "." + String(parseInt(dates[i].getMonth()) + 1) + "." + dates[i].getFullYear() + "-" + "allday");
-					$("#oneweekview td." + Calendar.UI.weekdays[i] + ".allday").droppable({
-						drop: function() {
-							Calendar.UI.moveevent(Calendar.UI.drageventid, this.title);
-							Calendar.UI.loadEvents();
-						}
-					});
-					for(var ii = 0;ii <= 23; ii++){
-						$("#oneweekview td." + Calendar.UI.weekdays[i] + "." + String(ii)).attr('title', dates[i].getDate() + "." + String(parseInt(dates[i].getMonth()) + 1) + "." + dates[i].getFullYear() + "-" + String(ii) + ":00");
-						$("#oneweekview td." + Calendar.UI.weekdays[i] + "." + String(ii)).droppable({
-							drop: function() {
-								Calendar.UI.moveevent(Calendar.UI.drageventid, this.title);
-								Calendar.UI.loadEvents();
-							}
-						});
-					}
-					if(dates[i].getDate() == today.getDate() && dates[i].getMonth() == today.getMonth() && dates[i].getFullYear() == today.getFullYear()){
-						$("#oneweekview ." + Calendar.UI.weekdays[i]).addClass("thisday");
-					}
-					Calendar.UI.addDateInfo('#oneweekview th.' + Calendar.UI.weekdays[i], dates[i]);
-				}
-			},
-			showEvents:function(){
-				var dates = this.generateDates();
-				for(var weekday = 0; weekday <= 6; weekday++) {
-					Calendar.UI.createEventsForDate(dates[weekday], 0);
-				}
-			},
-			getEventContainer:function(week, weekday, when){
-				return $("#oneweekview ." + Calendar.UI.weekdays[weekday] + "." + when);
-			},
-			createEventLabel:function(event){
-				var time = '';
-				if (!event['allday']){
-					time = '<strong>' + Calendar.UI.formatTime(event['startdate']) + ' - ' + Calendar.UI.formatTime(event['enddate']) + '</strong> ';
-				}
-				return $(document.createElement('p'))
-					.html(time + event['description'])
-			},
-			generateDates:function(){
-				var dates = new Array();
-				var date = new Date(Calendar.Date.current)
-				var dayofweek = date.getDay();
-				if(dayofweek == 0) {
-					dayofweek = 7;
-				}
-				if(Calendar.firstdayofweek > dayofweek){
-					date.setDate(date.getDate() - dayofweek + Calendar.firstdayofweek - 7);
-				}else{
-					date.setDate(date.getDate() - dayofweek + Calendar.firstdayofweek);
-				}
-				for(var i = 0; i <= 6; i++) {
-					dates[i] = new Date(date)
-					date.setDate(date.getDate() + 1);
-				}
-				return dates;
-			},
-		},/*
-		FourWeeks:{
-			forward:function(){
-				Calendar.Date.forward_week();
-			},
-			backward:function(){
-				Calendar.Date.backward_week();
-			},
-			removeEvents:function(){
-				$('#fourweeksview .day.thisday').removeClass('thisday');
-				$('#fourweeksview .day .events').empty();
-			},
-			renderCal:function(){
-				var calw1 = Calendar.Date.calw();
-				var calw2 = calw1 + 1;
-				var calw3 = calw1 + 2;
-				var calw4 = calw1 + 3;
-				switch(calw1) {
-					case 50:
-						calw4 = 1;
-						break;
-					case 51:
-						calw3 = 1;
-						calw4 = 2;
-						break;
-					case 52:
-						calw2 = 1;
-						calw3 = 2;
-						calw4 = 3;
-						break;
-				}
-				var calwplusfour = calw4;
-				var dates = this.generateDates();
-				var week = 1;
-				var weekday = 0;
-				var today = new Date();
-				for(var i = 0; i <= 27; i++){
-					var dayofmonth = dates[i].getDate();
-					var month = dates[i].getMonth();
-					var year = dates[i].getFullYear();
-					$("#fourweeksview .week_" + week + " ." + Calendar.UI.weekdays[weekday] + " .dateinfo").html(dayofmonth + Calendar.space + Calendar.UI.formatMonthShort(month));
-					if(dayofmonth == today.getDate() && month == today.getMonth() && year == today.getFullYear()){
-						$("#fourweeksview .week_" + week + " ." + Calendar.UI.weekdays[weekday]).addClass('thisday');
-					}
-					Calendar.UI.addDateInfo('#fourweeksview .week_' + week + ' .' + Calendar.UI.weekdays[weekday], dates[i]);
-					if(weekday == 6){
-						weekday = 0;
-						week++;
-					}else{
-						weekday++;
-					}
-				}
-				$("#fourweeksview .week_1 .calw").html(calw1);
-				$("#fourweeksview .week_2 .calw").html(calw2);
-				$("#fourweeksview .week_3 .calw").html(calw3);
-				$("#fourweeksview .week_4 .calw").html(calw4);
-				$("#datecontrol_date").val(Calendar.UI.cws_label + ": " + Calendar.Date.calw() + " - " + calwplusfour);
-			},
-			showEvents:function(){
-				var dates = this.generateDates();
-				var weekdaynum = 0;
-				var weeknum = 1;
-				for(var i = 0; i <= 27; i++) {
-					Calendar.UI.createEventsForDate(dates[i], weeknum);
-					if(weekdaynum == 6){
-						weekdaynum = 0;
-						weeknum++;
-					}else{
-						weekdaynum++;
-					}
-				}
-			},
-			getEventContainer:function(week, weekday, when){
-				return $("#fourweeksview .week_" + week + " .day." + Calendar.UI.weekdays[weekday] + " .events");
-			},
-			createEventLabel:function(event){
-				var time = '';
-				if (!event['allday']){
-					time = '<strong>' + Calendar.UI.formatTime(event['startdate']) + '</strong> ';
-				}
-				return $(document.createElement('p'))
-					.html(time + event['description'])
-			},
-			generateDates:function(){
-				var dates = new Array();
-				var date = new Date(Calendar.Date.current)
-				var dayofweek = date.getDay();
-				if(dayofweek == 0) {
-					dayofweek = 7;
-				}
-				date.setDate(date.getDate() - dayofweek + 1);
-				for(var i = 0; i <= 27; i++) {
-					dates[i] = new Date(date)
-					date.setDate(date.getDate() + 1);
-				}
-				return dates;
-			},
-		},*/
-		OneMonth:{
-			forward:function(){
-				Calendar.Date.forward_month();
-			},
-			backward:function(){
-				Calendar.Date.backward_month();
-			},
-			removeEvents:function(){
-				$('#onemonthview .day.thisday').removeClass('thisday');
-				$('#onemonthview .day .events').empty();
-			},
-			renderCal:function(){
-				$("#datecontrol_date").val(Calendar.UI.formatMonthLong() + Calendar.space + Calendar.Date.current.getFullYear());
-				var cal = Calendar.Date.getnumberofdays(Calendar.Date.current.getFullYear());
-				var monthview_dayofweek = Calendar.Date.current.getDay();
-				var monthview_dayofmonth = Calendar.Date.current.getDate();
-				for(var i = monthview_dayofmonth; i > 1; i--) {
-					if(monthview_dayofweek == 0) {
-						monthview_dayofweek = 6;
-					} else {
-						monthview_dayofweek--;
-					}
-				}
-				$("#onemonthview .week_5").hide();
-				$("#onemonthview .week_6").hide();
-				this.rows = monthview_dayofweek + cal[Calendar.Date.current.getMonth()];
-				this.rows = this.rows / 7;
-				this.rows = Math.ceil(this.rows);
-				var dates = this.generateDates();
-				var week = 1;
-				var weekday = 0;
-				var today = new Date();
-				for(var i = 0; i <= 41; i++){
-					var dayofmonth = dates[i].getDate();
-					var month = dates[i].getMonth();
-					var year = dates[i].getFullYear();
-					$("#onemonthview .week_" + week + " ." + Calendar.UI.weekdays[weekday] + " .dateinfo").html(dayofmonth + Calendar.space + Calendar.UI.formatMonthShort(month));
-					$("#onemonthview .week_" + week + " ." + Calendar.UI.weekdays[weekday]).attr('title', dayofmonth + "." + String(parseInt(month) + 1) + "." + year);
-					$("#onemonthview .week_" + week + " ." + Calendar.UI.weekdays[weekday]).droppable({
-						drop: function() {
-							Calendar.UI.moveevent(Calendar.UI.drageventid, this.title);
-							Calendar.UI.loadEvents();
-						}
-					});
-					if(dayofmonth == today.getDate() && month == today.getMonth() && year == today.getFullYear()){
-						$("#onemonthview .week_" + week + " ." + Calendar.UI.weekdays[weekday]).addClass('thisday');
-					}
-					Calendar.UI.addDateInfo('#onemonthview .week_' + week + ' .' + Calendar.UI.weekdays[weekday], dates[i]);
-					if(weekday == 6){
-						weekday = 0;
-						week++;
-					}else{
-						weekday++;
-					}
-				}
-				if(this.rows == 4){
-					for(var i = 1;i <= 6;i++){
-						$("#onemonthview .week_" + String(i)).height("23%");
-					}
-				}
-				if(this.rows == 5) {
-					$("#onemonthview .week_5").show();
-					for(var i = 1;i <= 6;i++){
-						$("#onemonthview .week_" + String(i)).height("18%");
-					}
-				}
-				if(this.rows == 6) {
-					$("#onemonthview .week_5").show();
-					$("#onemonthview .week_6").show();
-					for(var i = 1;i <= 6;i++){
-						$("#onemonthview .week_" + String(i)).height("14%");
-					}
-				}
-			},
-			showEvents:function(){
-				var dates = this.generateDates();
-				var weekdaynum = 0;
-				var weeknum = 1;
-				for(var i = 0; i <= 41; i++) {
-					Calendar.UI.createEventsForDate(dates[i], weeknum);
-					if(weekdaynum == 6){
-						weekdaynum = 0;
-						weeknum++;
-					}else{
-						weekdaynum++;
-					}
-				}
-			},
-			getEventContainer:function(week, weekday, when){
-				return $("#onemonthview .week_" + week + " .day." + Calendar.UI.weekdays[weekday] + " .events");
-			},
-			createEventLabel:function(event){
-				var time = '';
-				if (!event['allday']){
-					time = '<strong>' + Calendar.UI.formatTime(event['startdate']) + '</strong> ';
-				}
-				return $(document.createElement('p'))
-					.html(time + event['description'])
-			},
-			generateDates:function(){
-				var dates = new Array();
-				var date = new Date(Calendar.Date.current)
-				date.setDate(1);
-				var dayofweek = date.getDay();
-				if(dayofweek == 0) {
-					dayofweek = 7;
-					this.rows++;
-				}
-				if(Calendar.firstdayofweek > dayofweek){
-					date.setDate(date.getDate() - dayofweek + Calendar.firstdayofweek - 7);
-				}else{
-					date.setDate(date.getDate() - dayofweek + Calendar.firstdayofweek);
-				}
-				for(var i = 0; i <= 41; i++) {
-					dates[i] = new Date(date)
-					date.setDate(date.getDate() + 1);
+	// imports
+	jQuery.fullCalendar.views.month.call(t, element, calendar);
+	var opt = t.opt;
+	var trigger = t.trigger;
+	var eventElementHandlers = t.eventElementHandlers;
+	var reportEventElement = t.reportEventElement;
+	var formatDate = calendar.formatDate;
+	var formatDates = calendar.formatDates;
+	var addDays = $.fullCalendar.addDays;
+	var cloneDate = $.fullCalendar.cloneDate;
+	function skipWeekend(date, inc, excl) {
+		inc = inc || 1;
+		while (!date.getDay() || (excl && date.getDay()==1 || !excl && date.getDay()==6)) {
+			addDays(date, inc);
+		}
+		return date;
+	}
+
+	// overrides
+	t.name='list';
+	t.render=render;
+	t.renderEvents=renderEvents;
+	t.setHeight=setHeight;
+	t.setWidth=setWidth;
+	t.clearEvents=clearEvents;
+
+	function setHeight(height, dateChanged) {
+	}
+
+	function setWidth(width) {
+	}
+
+	function clearEvents() {
+		this.reportEventClear();
+	}
+
+	// main
+	function sortEvent(a, b) {
+		return a.start - b.start;
+	}
+
+	function render(date, delta) {
+		if (!t.start){
+			t.start = addDays(cloneDate(date, true), -7);
+			t.end = addDays(cloneDate(date, true), 7);
+		}
+		if (delta) {
+			if (delta < 0){
+				addDays(t.start, -7);
+				if (!opt('weekends')) {
+					skipWeekend(t.start, delta < 0 ? -1 : 1);
 				}
-				return dates;
-			},
-		},
-		List:{
-			removeEvents:function(){
-				this.eventContainer = $('#listview #events').empty();
-				this.startdate = new Date();
-				this.enddate = new Date();
-				this.enddate.setDate(this.enddate.getDate());
-			},
-			renderCal:function(){
-				var today = new Date();
-				$('#datecontrol_date').val(this.formatDate(Calendar.Date.current));
-			},
-			showEvents:function(){
-				this.renderMoreBefore();
-				this.renderMoreAfter();
-			},
-			formatDate:function(date){
-				return Calendar.UI.formatDayShort(date.getDay())
-					+ Calendar.space
-					+ date.getDate()
-					+ Calendar.space
-					+ Calendar.UI.formatMonthShort(date.getMonth())
-					+ Calendar.space
-					+ date.getFullYear();
-			},
-			createDay:function(date) {
-				return $(document.createElement('div'))
-					.addClass('day')
-					.html(this.formatDate(date));
-			},
-			renderMoreBefore:function(){
-				var date = Calendar.UI.List.startdate;
-				for(var i = 0; i <= 13; i++) {
-					if (Calendar.UI.getEventsForDate(date)) {
-						Calendar.UI.List.dayContainer=Calendar.UI.List.createDay(date);
-						Calendar.UI.createEventsForDate(date, 0);
-						Calendar.UI.List.eventContainer.prepend(Calendar.UI.List.dayContainer);
-					}
-					date.setDate(date.getDate()-1);
+			}else{
+				addDays(t.end, 7);
+				if (!opt('weekends')) {
+					skipWeekend(t.end, delta < 0 ? -1 : 1);
 				}
-				var start = Calendar.UI.List.formatDate(date);
-				$('#listview #more_before').html(String(Calendar.UI.more_before).replace('{startdate}', start));
-			},
-			renderMoreAfter:function(){
-				var date = Calendar.UI.List.enddate;
-				for(var i = 0; i <= 13; i++) {
-					if (Calendar.UI.getEventsForDate(date)) {
-						Calendar.UI.List.dayContainer=Calendar.UI.List.createDay(date);
-						Calendar.UI.createEventsForDate(date, 0);
-						Calendar.UI.List.eventContainer.append(Calendar.UI.List.dayContainer);
-					}
-					date.setDate(date.getDate()+1);
+			}
+		}
+		t.title = formatDates(
+			t.start,
+			t.end,
+			opt('titleFormat', 'week')
+		);
+		t.visStart = cloneDate(t.start);
+		t.visEnd = cloneDate(t.end);
+	}
+
+	function eventsOfThisDay(events, theDate) {
+		var start = cloneDate(theDate, true);
+		var end = addDays(cloneDate(start), 1);
+		var retArr = new Array();
+		for (i in events) {
+			var event_end = t.eventEnd(events[i]);
+			if (events[i].start < end && event_end >= start) {
+				retArr.push(events[i]);
+			}
+		}
+		return retArr;
+	}
+
+	function renderEvent(event) {
+		if (event.allDay) { //all day event
+			var time = opt('allDayText');
+		}
+		else {
+			var time = formatDates(event.start, event.end, opt('timeFormat', 'agenda'));
+		}
+		var classes = ['fc-event', 'fc-list-event'];
+		classes = classes.concat(event.className);
+		if (event.source) {
+			classes = classes.concat(event.source.className || []);
+		}
+		var html = '<tr>' +
+			'<td>&nbsp;</td>' +
+			'<td class="fc-list-time">' +
+			time +
+			'</td>' +
+			'<td>&nbsp;</td>' +
+			'<td class="fc-list-event">' +
+			'<span id="list' + event.id + '"' +
+			' class="' + classes.join(' ') + '"' +
+			'>' +
+			'<span class="fc-event-title">' +
+			event.title +
+			'</span>' +
+			'</span>' +
+			'</td>' +
+			'</tr>';
+		return html;
+	}
+
+	function renderDay(date, events) {
+		var dayRows = $('<tr>' +
+			'<td colspan="4" class="fc-list-date">' +
+			'<span>' +
+			formatDate(date, opt('titleFormat', 'day')) +
+			'</span>' +
+			'</td>' +
+			'</tr>');
+		for (i in events) {
+			var event = events[i];
+			var eventElement = $(renderEvent(event));
+			triggerRes = trigger('eventRender', event, event, eventElement);
+			if (triggerRes === false) {
+				eventElement.remove();
+			}else{
+				if (triggerRes && triggerRes !== true) {
+					eventElement.remove();
+					eventElement = $(triggerRes);
 				}
-				var end = Calendar.UI.List.formatDate(date);
-				$('#listview #more_after').html(String(Calendar.UI.more_after).replace('{enddate}', end));
-			},
-			getEventContainer:function(week, weekday, when){
-				return this.dayContainer;
-			},
-			createEventLabel:function(event){
-				var time = '';
-				if (!event['allday']){
-					time = Calendar.UI.formatTime(event['startdate']) + ' - ' + Calendar.UI.formatTime(event['enddate']) + ' ';
+				$.merge(dayRows, eventElement);
+				eventElementHandlers(event, eventElement);
+				reportEventElement(event, eventElement);
+			}
+		}
+		return dayRows;
+	}
+
+	function renderEvents(events, modifiedEventId) {
+		events = events.sort(sortEvent);
+
+		var table = $('<table class="fc-list-table"></table>');
+		var total = events.length;
+		if (total > 0) {
+			var date = cloneDate(t.visStart);
+			while (date <= t.visEnd) {
+				var dayEvents = eventsOfThisDay(events, date);
+				if (dayEvents.length > 0) {
+					table.append(renderDay(date, dayEvents));
 				}
-				return $(document.createElement('p'))
-					.html(time + event['description'])
-			},
+				date=addDays(date, 1);
+			}
 		}
+
+		this.element.html(table);
 	}
 }
 $(document).ready(function(){
-	$('#listview #more_before').click(Calendar.UI.List.renderMoreBefore);
-	$('#listview #more_after').click(Calendar.UI.List.renderMoreAfter);
-	Calendar.UI.initscroll();
+	Calendar.UI.initScroll();
+	$('#calendar_holder').fullCalendar({
+		header: false,
+		firstDay: 1,
+		editable: true,
+		defaultView: defaultView,
+		timeFormat: {
+			agenda: agendatime,
+			'': defaulttime
+			},
+		titleFormat: {
+			list: 'yyyy/MMM/d dddd'
+			},
+		axisFormat: defaulttime,
+		monthNames: monthNames,
+		monthNamesShort: monthNamesShort,
+		dayNames: dayNames,
+		dayNamesShort: dayNamesShort,
+		allDayText: allDayText,
+		viewDisplay: function(view) {
+			$('#datecontrol_date').html(view.title);
+			$.get(OC.filePath('calendar', 'ajax', 'changeview.php') + "?v="+view.name);
+		},
+		selectable: true,
+		selectHelper: true,
+		select: Calendar.UI.newEvent,
+		eventClick: Calendar.UI.editEvent,
+		eventDrop: Calendar.UI.moveEvent,
+		eventResize: Calendar.UI.resizeEvent,
+		eventRender: function(event, element) {
+			element.tipsy({
+				className: 'tipsy-event',
+				opacity: 0.9,
+				gravity:$.fn.tipsy.autoBounds(150, 's'),
+				fade:true,
+				delayIn: 400,
+				html:true,
+				title:function() {
+					return Calendar.UI.getEventPopupText(event);
+				}
+			});
+		},
+		eventSources: eventSources
+	});
+	$('#oneweekview_radio').click(function(){
+		$('#calendar_holder').fullCalendar('changeView', 'agendaWeek');
+	});
+	$('#onemonthview_radio').click(function(){
+		$('#calendar_holder').fullCalendar('changeView', 'month');
+	});
+	$('#listview_radio').click(function(){
+		$('#calendar_holder').fullCalendar('changeView', 'list');
+	});
+	$('#today_input').click(function(){
+		$('#calendar_holder').fullCalendar('today');
+	});
+	$('#datecontrol_left').click(function(){
+		$('#calendar_holder').fullCalendar('prev');
+	});
+	$('#datecontrol_right').click(function(){
+		$('#calendar_holder').fullCalendar('next');
+	});
 });
-//event vars
-Calendar.UI.loadEvents();
diff --git a/apps/calendar/js/geo.js b/apps/calendar/js/geo.js
new file mode 100755
index 00000000000..acea17c0269
--- /dev/null
+++ b/apps/calendar/js/geo.js
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+if (navigator.geolocation) { 
+	navigator.geolocation.getCurrentPosition(function(position) {
+		$.getJSON(OC.filePath('calendar', 'ajax', 'guesstimezone.php?lat=' + position.coords.latitude + '&long=' + position.coords.longitude + ''),
+		function(data){
+			if (data.status == 'success'){
+				$('#notification').html(data.message);
+				$('#notification').slideDown();
+				window.setTimeout(function(){$('#notification').slideUp();}, 5000);
+			}else{
+				console.log('Can\'t set new timezone.');
+			}
+		});
+	});
+}
\ No newline at end of file
diff --git a/apps/calendar/l10n/xgettextfiles b/apps/calendar/l10n/xgettextfiles
index 4cc636436b4..27b8e457193 100644
--- a/apps/calendar/l10n/xgettextfiles
+++ b/apps/calendar/l10n/xgettextfiles
@@ -1,7 +1,11 @@
 ../appinfo/app.php
+../lib/object.php
 ../templates/calendar.php
+../templates/part.choosecalendar.php
+../templates/part.choosecalendar.rowfields.php
+../templates/part.editcalendar.php
 ../templates/part.editevent.php
-../templates/part.eventinfo.php
+../templates/part.eventform.php
+../templates/part.import.php
 ../templates/part.newevent.php
-../templates/part.choosecalendar.php
-../js/calendar.js
+../templates/settings.php
\ No newline at end of file
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index f6d40aa534e..3db4398096e 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -240,4 +240,12 @@ class OC_Calendar_Calendar{
 			'ecc255', // dark yellow
 		);
 	}
+	public static function getEventSourceInfo($calendar){
+		return array(
+			'url' => 'ajax/events.php?calendar_id='.$calendar['id'],
+			'backgroundColor' => '#'.$calendar['calendarcolor'],
+			'borderColor' => '#888',
+			'textColor' => 'black',
+		);
+	}
 }
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 33871cd3185..58d46ce6a7d 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -30,6 +30,34 @@ class OC_Calendar_Object{
 		return $calendarobjects;
 	}
 
+	/**
+	 * @brief Returns all objects of a calendar between $start and $end
+	 * @param integer $id
+	 * @param DateTime $start
+	 * @param DateTime $end
+	 * @return array
+	 *
+	 * The objects are associative arrays. You'll find the original vObject
+	 * in ['calendardata']
+	 */
+	public static function allInPeriod($id, $start, $end){
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*calendar_objects WHERE calendarid = ?'
+		.' AND ((startdate >= ? AND startdate <= ? AND repeating = 0)'
+		.' OR (startdate <= ? AND repeating = 1))' );
+		$start = self::getUTCforMDB($start);
+		$end = self::getUTCforMDB($end);
+		$result = $stmt->execute(array($id,
+					$start, $end,
+					$end));
+
+		$calendarobjects = array();
+		while( $row = $result->fetchRow()){
+			$calendarobjects[] = $row;
+		}
+
+		return $calendarobjects;
+	}
+
 	/**
 	 * @brief Returns an object
 	 * @param integer $id
@@ -279,6 +307,7 @@ class OC_Calendar_Object{
 	 */
 	public static function parse($data){
 		try {
+			Sabre_VObject_Reader::$elementMap['LAST-MODIFIED'] = 'Sabre_VObject_Element_DateTime';
 			$calendar = Sabre_VObject_Reader::read($data);
 			return $calendar;
 		} catch (Exception $e) {
@@ -398,7 +427,7 @@ class OC_Calendar_Object{
 			$errarr['endbeforestart'] = 'true';
 			$errnum++;
 		}
-		if($fromday == $today && $frommonth == $tomonth && $fromyear == $toyear){
+		if(!$allday && $fromday == $today && $frommonth == $tomonth && $fromyear == $toyear){
 			list($tohours, $tominutes) = explode(':', $request['totime']);
 			list($fromhours, $fromminutes) = explode(':', $request['fromtime']);
 			if($tohours < $fromhours){
@@ -453,9 +482,11 @@ class OC_Calendar_Object{
 		$categories = isset($request["categories"]) ? $request["categories"] : null;
 		$allday = isset($request["allday"]);
 		$from = $request["from"];
-		$fromtime = $request["fromtime"];
 		$to  = $request["to"];
-		$totime = $request["totime"];
+		if (!$allday){
+			$fromtime = $request['fromtime'];
+			$totime = $request['totime'];
+		}
 		$description = $request["description"];
 		//$repeat = $request["repeat"];
 		/*switch($request["repeatfreq"]){
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
new file mode 100644
index 00000000000..41faf49a519
--- /dev/null
+++ b/apps/calendar/lib/search.php
@@ -0,0 +1,26 @@
+<?php
+class OC_Search_Provider_Calendar extends OC_Search_Provider{
+	function search($query){
+		$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser(), 1);
+		if(count($calendars)==0 || !OC_App::isEnabled('calendar')){
+			//return false;
+		}
+		$results=array();
+		$searchquery=array();
+		if(substr_count($query, ' ') > 0){
+			$searchquery = explode(' ', $query);
+		}else{
+			$searchquery[] = $query;
+		}
+		foreach($calendars as $calendar){
+			$objects = OC_Calendar_Object::all($calendar['id']);
+			foreach($objects as $object){
+				if(substr_count(strtolower($object['summary']), strtolower($query)) > 0){//$name,$text,$link,$type
+					$results[]=new OC_Search_Result($object['summary'],'','#','Cal.');
+				}
+			}
+		}
+		return $results;
+	}
+}
+new OC_Search_Provider_Calendar();
\ No newline at end of file
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
old mode 100644
new mode 100755
index 317bb17ddbc..2003b7efc49
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -1,217 +1,50 @@
-<?php
-$hours24 = array(
-	'allday' => $l->t('All day'),
-	 0 => '0',
-	 1 => '1',
-	 2 => '2',
-	 3 => '3',
-	 4 => '4',
-	 5 => '5',
-	 6 => '6',
-	 7 => '7',
-	 8 => '8',
-	 9 => '9',
-	10 => '10',
-	11 => '11',
-	12 => '12',
-	13 => '13',
-	14 => '14',
-	15 => '15',
-	16 => '16',
-	17 => '17',
-	18 => '18',
-	19 => '19',
-	20 => '20',
-	21 => '21',
-	22 => '22',
-	23 => '23',
-);
-$hoursampm = array(
-	'allday' => $l->t('All day'),
-	 0 => '12 a.m.',
-	 1 => '1 a.m.',
-	 2 => '2 a.m.',
-	 3 => '3 a.m.',
-	 4 => '4 a.m.',
-	 5 => '5 a.m.',
-	 6 => '6 a.m.',
-	 7 => '7 a.m.',
-	 8 => '8 a.m.',
-	 9 => '9 a.m.',
-	10 => '10 a.m.',
-	11 => '11 a.m.',
-	12 => '12 p.m.',
-	13 => '1 p.m.',
-	14 => '2 p.m.',
-	15 => '3 p.m.',
-	16 => '4 p.m.',
-	17 => '5 p.m.',
-	18 => '6 p.m.',
-	19 => '7 p.m.',
-	20 => '8 p.m.',
-	21 => '9 p.m.',
-	22 => '10 p.m.',
-	23 => '11 p.m.',
-);
-if(OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'timeformat', "24") == "24"){
-	$hours = $hours24;
-}else{
-	$hours = $hoursampm;
-}
-$weekdaynames = array('sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday');
-$dayforgenerator = OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'firstdayofweek', "1");
-$weekdays = array();
-for($i = 0;$i <= 6; $i++){
-	$weekdays[$i] = $weekdaynames[$dayforgenerator];
-	if($dayforgenerator == 6){
-		$dayforgenerator = 0;
-	}else{
-		$dayforgenerator++;
-	}
-}
-$weekendjson = OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'weekend', '{"Monday":"false","Tuesday":"false","Wednesday":"false","Thursday":"false","Friday":"false","Saturday":"true","Sunday":"true"}');
-$weekend = json_decode($weekendjson, true);
-$weekenddays = array("sunday"=>$weekend["Sunday"], "monday"=>$weekend["Monday"], "tuesday"=>$weekend["Tuesday"], "wednesday"=>$weekend["Wednesday"], "thursday"=>$weekend["Thursday"], "friday"=>$weekend["Friday"], "saturday"=>$weekend["Saturday"]);
-?>
-				<script type="text/javascript">
-				<?php
-				echo "var weekdays = new Array('".$weekdays[0]."','".$weekdays[1]."','".$weekdays[2]."','".$weekdays[3]."','".$weekdays[4]."','".$weekdays[5]."','".$weekdays[6]."');\n";
-				?>
-				Calendar.UI.weekdays = weekdays;
-				Calendar.UI.daylong = new Array("<?php echo $l -> t("Sunday");?>", "<?php echo $l -> t("Monday");?>", "<?php echo $l -> t("Tuesday");?>", "<?php echo $l -> t("Wednesday");?>", "<?php echo $l -> t("Thursday");?>", "<?php echo $l -> t("Friday");?>", "<?php echo $l -> t("Saturday");?>");
-				Calendar.UI.dayshort = new Array("<?php echo $l -> t("Sun.");?>", "<?php echo $l -> t("Mon.");?>", "<?php echo $l -> t("Tue.");?>", "<?php echo $l -> t("Wed.");?>", "<?php echo $l -> t("Thu.");?>", "<?php echo $l -> t("Fri.");?>", "<?php echo $l -> t("Sat.");?>");
-				Calendar.UI.monthlong = new Array("<?php echo $l -> t("January");?>", "<?php echo $l -> t("February");?>", "<?php echo $l -> t("March");?>", "<?php echo $l -> t("April");?>", "<?php echo $l -> t("May");?>", "<?php echo $l -> t("June");?>", "<?php echo $l -> t("July");?>", "<?php echo $l -> t("August");?>", "<?php echo $l -> t("September");?>", "<?php echo $l -> t("October");?>", "<?php echo $l -> t("November");?>", "<?php echo $l -> t("December");?>");
-				Calendar.UI.monthshort = new Array("<?php echo $l -> t("Jan.");?>", "<?php echo $l -> t("Feb.");?>", "<?php echo $l -> t("Mar.");?>", "<?php echo $l -> t("Apr.");?>", "<?php echo $l -> t("May.");?>", "<?php echo $l -> t("Jun.");?>", "<?php echo $l -> t("Jul.");?>", "<?php echo $l -> t("Aug.");?>", "<?php echo $l -> t("Sep.");?>", "<?php echo $l -> t("Oct.");?>", "<?php echo $l -> t("Nov.");?>", "<?php echo $l -> t("Dec.");?>");
-				Calendar.UI.cw_label = "<?php echo $l->t("Week");?>";
-				Calendar.UI.cws_label = "<?php echo $l->t("Weeks");?>";
-				Calendar.UI.more_before = String('<?php echo $l->t('More before {startdate}') ?>');
-				Calendar.UI.more_after = String('<?php echo $l->t('More after {enddate}') ?>');
-				Calendar.firstdayofweek = parseInt("<?php echo OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'firstdayofweek', "1"); ?>");
-				//use last view as default on the next
-				Calendar.UI.setCurrentView("<?php echo OC_Preferences::getValue(OC_USER::getUser(), "calendar", "currentview", "onemonthview") ?>");
-				var totalurl = "<?php echo OC_Helper::linkTo('calendar', 'caldav.php', null, true) . '/calendars'; ?>";
+				<script type='text/javascript'>
+				var defaultView = '<?php echo OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') ?>';
+				var eventSources = <?php echo json_encode($_['eventSources']) ?>;
+				var dayNames = <?php echo json_encode($l->tA(array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'))) ?>;
+				var dayNamesShort = <?php echo json_encode($l->tA(array('Sun.', 'Mon.', 'Tue.', 'Wed.', 'Thu.', 'Fri.', 'Sat.'))) ?>;
+				var monthNames = <?php echo json_encode($l->tA(array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'))) ?>;
+				var monthNamesShort = <?php echo json_encode($l->tA(array('Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.'))) ?>;
+				var agendatime = '<?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>{ - <?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>}';
+				var defaulttime = '<?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>';
+				var allDayText = '<?php echo $l->t('All day') ?>';
+				var missing_field = '<?php echo $l->t('Missing fields') ?>';
+				var missing_field_title = '<?php echo $l->t('Title') ?>';
+				var missing_field_calendar = '<?php echo $l->t('Calendar') ?>';
+				var missing_field_fromdate = '<?php echo $l->t('From Date') ?>';
+				var missing_field_fromtime = '<?php echo $l->t('From Time') ?>';
+				var missing_field_todate = '<?php echo $l->t('To Date') ?>';
+				var missing_field_totime = '<?php echo $l->t('To Time') ?>';
+				var missing_field_startsbeforeends = '<?php echo $l->t('The event ends before it starts') ?>';
+				var missing_field_dberror = '<?php echo $l->t('There was a database fail') ?>';
+				var totalurl = '<?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?>/calendars';
 				</script>
-				<div id="sysbox"></div>
 				<div id="controls">
 					<div>
 						<form>
 							<div id="view">
-								<!-- <input type="button" value="1 <?php echo $l->t('Day');?>" id="onedayview_radio" onclick="Calendar.UI.setCurrentView('onedayview');"/> -->
-								<input type="button" value="<?php echo $l->t('Week');?>" id="oneweekview_radio" onclick="Calendar.UI.setCurrentView('oneweekview');"/>
-								<!-- <input type="button" value="4 <?php echo $l->t('Weeks');?>" id="fourweeksview_radio" onclick="Calendar.UI.setCurrentView('fourweeksview');"/> -->
-								<input type="button" value="<?php echo $l->t('Month');?>" id="onemonthview_radio" onclick="Calendar.UI.setCurrentView('onemonthview');"/>
-								<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio" onclick="Calendar.UI.setCurrentView('listview');"/>
+								<input type="button" value="<?php echo $l->t('Week');?>" id="oneweekview_radio"/>
+								<input type="button" value="<?php echo $l->t('Month');?>" id="onemonthview_radio"/>
+								<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>
 							</div>
 						</form>
 						<form>
 							<div id="choosecalendar">
-								<input type="button" id="today_input" value="<?php echo $l->t("Today");?>" onclick="Calendar.UI.switch2Today();"/>
+								<input type="button" id="today_input" value="<?php echo $l->t("Today");?>"/>
 								<input type="button" id="choosecalendar_input" value="<?php echo $l->t("Calendars");?>" onclick="Calendar.UI.Calendar.overview();" />
 							</div>
 						</form>
 						<form>
 							<div id="datecontrol">
-								<input type="button" value="&nbsp;&lt;&nbsp;" id="datecontrol_left" onclick="Calendar.UI.updateDate('backward');"/>
-								<input id="datecontrol_date" type="button" value=""/>
-								<input type="button" value="&nbsp;&gt;&nbsp;" id="datecontrol_right" onclick="Calendar.UI.updateDate('forward');"/>
+								<input type="button" value="&nbsp;&lt;&nbsp;" id="datecontrol_left"/>
+								<span class="button" id="datecontrol_date"></span>
+								<input type="button" value="&nbsp;&gt;&nbsp;" id="datecontrol_right"/>
 							</div>
 						</form>
 					</div>
 				</div>
+				<div id="notification" style="display:none;"></div>
 				<div id="calendar_holder">
-					<div id="onedayview">
-						<table>
-							<thead>
-								<tr>
-									<th class="calendar_time"><?php echo $l->t("Time");?></th>
-									<th id="onedayview_today" class="calendar_row" onclick="Calendar.UI.newEvent('#onedayview_today');"></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php foreach($hours as $time => $time_label): ?>
-								<tr>
-									<td class="calendar_time"><?php echo $time_label ?></td>
-									<td class="calendar_row <?php echo $time ?>" onclick="Calendar.UI.newEvent('#onedayview_today', '<?php echo $time ?>');"></td>
-								</tr>
-<?php endforeach; ?>
-							</tbody>
-						</table>
-					</div>
-					<div id="oneweekview">
-						<table>
-							<thead>
-								<tr>
-									<th class="calendar_time"><?php echo $l->t("Time");?></th>
-<?php foreach($weekdays as $weekdaynr => $weekday): ?>
-									<th class="calendar_row <?php echo $weekday ?> <?php echo $weekenddays[$weekday] == "true" ? 'weekend_thead' : '' ?>" onclick="Calendar.UI.newEvent('#oneweekview th.<?php echo $weekday ?>');"></th>
-<?php endforeach; ?>
-								</tr>
-							</thead>
-							<tbody>
-<?php foreach($hours as $time => $time_label): ?>
-								<tr>
-									<td class="calendar_time"><?php echo $time_label?></td>
-<?php foreach($weekdays as $weekdaynr => $weekday): ?>
-									<td class="<?php echo $weekday ?> <?php echo $time ?> calendar_row <?php echo $weekenddays[$weekday] == "true" ? 'weekend_row' : '' ?>" onclick="Calendar.UI.newEvent('#oneweekview th.<?php echo $weekday ?>', '<?php echo $time ?>');"></td>
-<?php endforeach; ?>
-								</tr>
-<?php endforeach; ?>
-							</tbody>
-						</table>
-					</div>
-					<div id="fourweeksview">
-						<table>
-							<thead>
-								<tr>
-									<th class="calendar_row calw"><?php echo $l -> t("Week");?></th>
-<?php foreach($weekdays as $weekdaynr => $weekday): ?>
-									<th class="calendar_row <?php echo $weekdaynr > 4 ? 'weekend_thead' : '' ?>"><?php echo $l->t(ucfirst($weekday)) ?></th>
-<?php endforeach; ?>
-								</tr>
-							</thead>
-							<tbody>
-<?php foreach(range(1, 4) as $week): ?>
-								<tr class="week_<?php echo $week ?>">
-									<td class="calw"></td>
-<?php foreach($weekdays as $weekdaynr => $weekday): ?>
-									<td class="day <?php echo $weekday ?> <?php echo $weekdaynr > 4 ? 'weekend' : '' ?>" onclick="Calendar.UI.newEvent('#fourweeksview .week_<?php echo $week ?> .<?php echo $weekday ?>')">
-									<div class="dateinfo"></div>
-									<div class="events"></div>
-									</td>
-<?php endforeach; ?>
-								</tr>
-<?php endforeach; ?>
-							</tbody>
-						</table>
-					</div>
-					<div id="onemonthview">
-						<table>
-							<thead>
-								<tr>
-<?php foreach($weekdays as $weekdaynr => $weekday): ?>
-									<th class="calendar_row <?php echo $weekenddays[$weekday] == "true" ? 'weekend_thead' : '' ?> <?php echo $weekday ?>"><?php echo $l->t(ucfirst($weekday));?></th>
-<?php endforeach; ?>
-								</tr>
-							</thead>
-							<tbody>
-<?php foreach(range(1, 6) as $week): ?>
-								<tr class="week_<?php echo $week ?>">
-<?php foreach($weekdays as $weekdaynr => $weekday): ?>
-									<td class="day <?php echo $weekday ?> <?php echo $weekenddays[$weekday] == "true" ? 'weekend' : '' ?>" onclick="Calendar.UI.newEvent('#onemonthview .week_<?php echo $week ?> .<?php echo $weekday ?>')">
-									<div class="dateinfo"></div>
-									<div class="events"></div>
-									</td>
-<?php endforeach; ?>
-								</tr>
-<?php endforeach; ?>
-							</tbody>
-						</table>
-					</div>
-					<div id="listview">
-						<div id="more_before"></div>
-						<div id="events"></div>
-						<div id="more_after"></div>
-					</div>
 				</div>
 				<!-- Dialogs -->
 				<div id="dialog_holder"></div>
diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.php b/apps/calendar/templates/part.choosecalendar.rowfields.php
index db0c71252bb..a789be45a43 100644
--- a/apps/calendar/templates/part.choosecalendar.rowfields.php
+++ b/apps/calendar/templates/part.choosecalendar.rowfields.php
@@ -1,4 +1,4 @@
 <?php
 	echo "<td width=\"20px\"><input id=\"active_" . $_['calendar']["id"] . "\" type=\"checkbox\" onClick=\"Calendar.UI.Calendar.activation(this, " . $_['calendar']["id"] . ")\"" . ($_['calendar']["active"] ? ' checked="checked"' : '') . "></td>";
 	echo "<td><label for=\"active_" . $_['calendar']["id"] . "\">" . $_['calendar']["displayname"] . "</label></td>";
-	echo "<td width=\"20px\"><a href=\"#\" onclick=\"Calendar.UI.showCalDAVUrl('" . OC_User::getUser() . "', '" . $_['calendar']["uri"] . "');\" title=\"" . $l->t("CalDav Link") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/public.svg\"></a></td><td width=\"20px\"><a href=\"export.php?calid=" . $_['calendar']["id"] . "\" title=\"" . $l->t("Download") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/download.svg\"></a></td><td width=\"20px\"><a  href=\"#\" title=\"" . $l->t("Edit") . "\" class=\"action\" onclick=\"Calendar.UI.Calendar.edit(this, " . $_['calendar']["id"] . ");\"><img class=\"svg action\" src=\"../../core/img/actions/rename.svg\"></a></td><td width=\"20px\"><a href=\"#\" onclick=\"Calendar.UI.deleteCalendar('" . $_['calendar']["id"] . "');\" title=\"" . $l->t("Delete") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/delete.svg\"></a></td>";
+	echo "<td width=\"20px\"><a href=\"#\" onclick=\"Calendar.UI.showCalDAVUrl('" . OC_User::getUser() . "', '" . $_['calendar']["uri"] . "');\" title=\"" . $l->t("CalDav Link") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/public.svg\"></a></td><td width=\"20px\"><a href=\"export.php?calid=" . $_['calendar']["id"] . "\" title=\"" . $l->t("Download") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/download.svg\"></a></td><td width=\"20px\"><a  href=\"#\" title=\"" . $l->t("Edit") . "\" class=\"action\" onclick=\"Calendar.UI.Calendar.edit(this, " . $_['calendar']["id"] . ");\"><img class=\"svg action\" src=\"../../core/img/actions/rename.svg\"></a></td><td width=\"20px\"><a href=\"#\" onclick=\"Calendar.UI.Calendar.deleteCalendar('" . $_['calendar']["id"] . "');\" title=\"" . $l->t("Delete") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/delete.svg\"></a></td>";
diff --git a/apps/calendar/templates/part.editevent.php b/apps/calendar/templates/part.editevent.php
index ae969f2dc3b..b3acfc4a072 100644
--- a/apps/calendar/templates/part.editevent.php
+++ b/apps/calendar/templates/part.editevent.php
@@ -1,6 +1,7 @@
 <div id="event" title="<?php echo $l->t("Edit an event");?>">
 	<form id="event_form">
 		<input type="hidden" name="id" value="<?php echo $_['id'] ?>">
+		<input type="hidden" name="lastmodified" value="<?php echo $_['lastmodified'] ?>">
 <?php echo $this->inc("part.eventform"); ?>
 	<div style="width: 100%;text-align: center;color: #FF1D1D;" id="errorbox"></div>
 	<span id="actions">
diff --git a/apps/calendar/templates/part.eventform.php b/apps/calendar/templates/part.eventform.php
index 8588b9168f7..dfa5fb8c78a 100644
--- a/apps/calendar/templates/part.eventform.php
+++ b/apps/calendar/templates/part.eventform.php
@@ -13,9 +13,7 @@
 			<select id="category" name="categories[]" multiple="multiple" title="<?php echo $l->t("Select category") ?>">
 				<?php
 				if (!isset($_['categories'])) {$_['categories'] = array();}
-				foreach($_['category_options'] as $category){
-					echo '<option value="' . $category . '"' . (in_array($category, $_['categories']) ? ' selected="selected"' : '') . '>' . $category . '</option>';
-				}
+				echo html_select_options($_['category_options'], $_['categories'], array('combine'=>true));
 				?>
 			</select></td>
 			<th width="75px">&nbsp;&nbsp;&nbsp;<?php echo $l->t("Calendar");?>:</th>
@@ -23,9 +21,7 @@
 			<select style="width:140px;" name="calendar">
 				<?php
 				if (!isset($_['calendar'])) {$_['calendar'] = false;}
-				foreach($_['calendar_options'] as $calendar){
-					echo '<option value="' . $calendar['id'] . '"' . ($_['calendar'] == $calendar['id'] ? ' selected="selected"' : '') . '>' . $calendar['displayname'] . '</option>';
-				}
+				echo html_select_options($_['calendar_options'], $_['calendar'], array('value'=>'id', 'label'=>'displayname'));
 				?>
 			</select></td>
 		</tr>
@@ -66,9 +62,7 @@
 			<select name="repeat" style="width:350px;">
 				<?php
 				if (isset($_['repeat_options'])) {
-					foreach($_['repeat_options'] as $id => $label){
-						echo '<option value="' . $id . '"' . ($_['repeat'] == $id ? ' selected="selected"' : '') . '>' . $label . '</option>';
-					}
+					echo html_select_options($_['repeat_options'], $_['repeat']);
 				}
 				?>
 			</select></td>
diff --git a/apps/contacts/ajax/addcard.php b/apps/contacts/ajax/addcard.php
index 0cecd3bdc06..dd5b90651f5 100644
--- a/apps/contacts/ajax/addcard.php
+++ b/apps/contacts/ajax/addcard.php
@@ -68,11 +68,16 @@ foreach( $add as $propname){
 }
 $id = OC_Contacts_VCard::add($aid,$vcard->serialize());
 
+$adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
+$phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
+
 $details = OC_Contacts_VCard::structureContact($vcard);
 $name = $details['FN'][0]['value'];
 $tmpl = new OC_Template('contacts','part.details');
 $tmpl->assign('details',$details);
 $tmpl->assign('id',$id);
+$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
 $page = $tmpl->fetchPage();
 
 OC_JSON::success(array('data' => array( 'id' => $id, 'name' => $name, 'page' => $page )));
diff --git a/apps/contacts/ajax/getdetails.php b/apps/contacts/ajax/getdetails.php
index 0e76de61afb..260fb53a686 100644
--- a/apps/contacts/ajax/getdetails.php
+++ b/apps/contacts/ajax/getdetails.php
@@ -51,10 +51,22 @@ if(is_null($vcard)){
 	exit();
 }
 
+$property_types = array(
+	'ADR'   => $l10n->t('Address'),
+	'TEL'   => $l10n->t('Telephone'),
+	'EMAIL' => $l10n->t('Email'),
+	'ORG'   => $l10n->t('Organization'),
+);
+$adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
+$phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
+
 $details = OC_Contacts_VCard::structureContact($vcard);
 $tmpl = new OC_Template('contacts','part.details');
 $tmpl->assign('details',$details);
 $tmpl->assign('id',$id);
+$tmpl->assign('property_types',$property_types);
+$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
 $page = $tmpl->fetchPage();
 
 OC_JSON::success(array('data' => array( 'id' => $id, 'page' => $page )));
diff --git a/apps/contacts/ajax/setproperty.php b/apps/contacts/ajax/setproperty.php
index 18e00872473..c9102c4a2ee 100644
--- a/apps/contacts/ajax/setproperty.php
+++ b/apps/contacts/ajax/setproperty.php
@@ -70,6 +70,9 @@ $vcard->children[$line]->setValue($value);
 
 // Add parameters
 $postparameters = isset($_POST['parameters'])?$_POST['parameters']:array();
+if ($vcard->children[$line]->name == 'TEL' && !array_key_exists('TYPE', $postparameters)){
+	$postparameters['TYPE']='';
+}
 for($i=0;$i<count($vcard->children[$line]->parameters);$i++){
 	$name = $vcard->children[$line]->parameters[$i]->name;
 	if(array_key_exists($name,$postparameters)){
@@ -77,7 +80,14 @@ for($i=0;$i<count($vcard->children[$line]->parameters);$i++){
 			unset($vcard->children[$line]->parameters[$i]);
 		}
 		else{
-			$vcard->children[$line]->parameters[$i]->value = $postparameters[$name];
+			unset($vcard->children[$line][$name]);
+			$values = $postparameters[$name];
+			if (!is_array($values)){
+				$values = array($values);
+			}
+			foreach($values as $value){
+				$vcard->children[$line]->add($name, $value);
+			}
 		}
 		unset($postparameters[$name]);
 	}
@@ -94,7 +104,12 @@ $checksum = md5($vcard->children[$line]->serialize());
 
 OC_Contacts_VCard::edit($id,$vcard->serialize());
 
+$adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
+$phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
+
 $tmpl = new OC_Template('contacts','part.property');
+$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
 $tmpl->assign('property',OC_Contacts_VCard::structureProperty($vcard->children[$line],$line));
 $page = $tmpl->fetchPage();
 
diff --git a/apps/contacts/ajax/showaddcard.php b/apps/contacts/ajax/showaddcard.php
index 2f534f0fe2d..98367758fd4 100644
--- a/apps/contacts/ajax/showaddcard.php
+++ b/apps/contacts/ajax/showaddcard.php
@@ -29,9 +29,14 @@ $l10n = new OC_L10N('contacts');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 
+$adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
+$phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
+
 $addressbooks = OC_Contacts_Addressbook::all(OC_USER::getUser());
 $tmpl = new OC_Template('contacts','part.addcardform');
 $tmpl->assign('addressbooks',$addressbooks);
+$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
 $page = $tmpl->fetchPage();
 
 OC_JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/ajax/showsetproperty.php b/apps/contacts/ajax/showsetproperty.php
index 6188f4773c3..2ec4b89b824 100644
--- a/apps/contacts/ajax/showsetproperty.php
+++ b/apps/contacts/ajax/showsetproperty.php
@@ -61,11 +61,15 @@ if(is_null($line)){
 	exit();
 }
 
+$adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
+$phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
 
 $tmpl = new OC_Template('contacts','part.setpropertyform');
 $tmpl->assign('id',$id);
 $tmpl->assign('checksum',$checksum);
 $tmpl->assign('property',OC_Contacts_VCard::structureProperty($vcard->children[$line]));
+$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
 $page = $tmpl->fetchPage();
 
 OC_JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/css/formtastic.css b/apps/contacts/css/formtastic.css
index 629c220732b..fede92b61ca 100644
--- a/apps/contacts/css/formtastic.css
+++ b/apps/contacts/css/formtastic.css
@@ -94,16 +94,14 @@ This stylesheet forms part of the Formtastic Rails Plugin
 /* INPUTS
 --------------------------------------------------------------------------------------------------*/
 .formtastic .inputs {
-  overflow:hidden; /* clear containing floats */
-}
-
-.formtastic .input {
-  overflow:hidden; /* clear containing floats */
   padding:0.5em 0; /* padding and negative margin juggling is for Firefox */
   margin-top:-0.5em;
   margin-bottom:1em;
 }
 
+.formtastic .input {
+}
+
 
 /* LEFT ALIGNED LABELS
 --------------------------------------------------------------------------------------------------*/
diff --git a/apps/contacts/css/styles.css b/apps/contacts/css/styles.css
index 68f843b7aaf..f351589fe12 100644
--- a/apps/contacts/css/styles.css
+++ b/apps/contacts/css/styles.css
@@ -3,16 +3,22 @@
 
 #contacts_deletecard {position:absolute;top:15px;right:0;}
 #contacts_details_list { list-style:none; }
-#contacts_details_list li { overflow:hidden; }
-#contacts_details_list li p.contacts_property_name { width:25%; float:left;text-align:right;padding-right:0.3em; }
-#contacts_details_list li p.contacts_property_data, #contacts_details_list li ul.contacts_property_data { width:72%; overflow:hidden; }
-#contacts_addproperty, #contacts_addproperty_button { margin-left:25%; }
+#contacts_details_list li { overflow:visible; }
+#contacts_details_list li p.contacts_property_name { width:25%; float:left;text-align:right;padding-right:0.3em;color:#666; }
+#contacts_details_list li p.contacts_property_data, #contacts_details_list li ul.contacts_property_data { width:72%;float:left; }
+#contacts_setproperty_button { margin-left:25%; }
 
-.contacts_property_data ul, .contacts_property_data ol { list-style:none; }
+.contacts_property_data ul, ol.contacts_property_data { list-style:none; }
 .contacts_property_data li { overflow: hidden; }
 .contacts_property_data li label { width:20%; float:left; text-align:right;padding-right:0.3em; }
+.contacts_property_data input { float:left; }
 .contacts_property_data li input { width:70%;overflow:hidden; }
 
+.chzn-container { margin:3px 0 0; }
+.chzn-container .chzn-choices { border-radius: 0.5em; }
+.chzn-container.chzn-container-active .chzn-choices { border-bottom-left-radius: 0;border-bottom-right-radius: 0; }
+.chzn-container .chzn-drop { border-bottom-left-radius: 0.5em;border-bottom-right-radius: 0.5em; }
+
 /* Form setup ----------------------------------------------------------------*/
 /* .forme {} */
 /* .forme ul, .forme ol { list-style:none; } */
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 7e93d6183ed..29d41d3c4c4 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -75,8 +75,14 @@ if( !is_null($id) || count($contacts)){
 	$details = OC_Contacts_VCard::structureContact($vcard);
 }
 
+$l10n = new OC_L10N('contacts');
+$adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
+$phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
+
 // Process the template
 $tmpl = new OC_Template( 'contacts', 'index', 'user' );
+$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
 $tmpl->assign('addressbooks', $addressbooks);
 $tmpl->assign('contacts', $contacts);
 $tmpl->assign('details', $details );
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index 9270297f322..ba1c0e536c2 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -56,14 +56,15 @@ $(document).ready(function(){
 		$('#contacts_addpropertyform #contacts_fieldpart').remove();
 		$('#contacts_addpropertyform #contacts_generic').remove();
 		if($(this).val() == 'ADR'){
-			$('#contacts_addresspart').clone().insertBefore($('#contacts_addpropertyform input[type="submit"]'));
+			$('#contacts_addresspart').clone().insertAfter($('#contacts_addpropertyform .contacts_property_name'));
 		}
 		else if($(this).val() == 'TEL'){
-			$('#contacts_phonepart').clone().insertBefore($('#contacts_addpropertyform input[type="submit"]'));
+			$('#contacts_phonepart').clone().insertAfter($('#contacts_addpropertyform .contacts_property_name'));
 		}
 		else{
-			$('#contacts_generic').clone().insertBefore($('#contacts_addpropertyform input[type="submit"]'));
+			$('#contacts_generic').clone().insertAfter($('#contacts_addpropertyform .contacts_property_name'));
 		}
+		$('#contacts_addpropertyform .contacts_property_data select').chosen();
 	});
 
 	$('#contacts_addpropertyform input[type="submit"]').live('click',function(){
@@ -82,7 +83,8 @@ $(document).ready(function(){
 		$.getJSON('ajax/showaddcard.php',{},function(jsondata){
 			if(jsondata.status == 'success'){
 				$('#rightcontent').data('id','');
-				$('#rightcontent').html(jsondata.data.page);
+				$('#rightcontent').html(jsondata.data.page)
+					.find('select').chosen();
 			}
 			else{
 				alert(jsondata.data.message);
@@ -111,7 +113,8 @@ $(document).ready(function(){
 		var checksum = $(this).parents('li').first().data('checksum');
 		$.getJSON('ajax/showsetproperty.php',{'id': id, 'checksum': checksum },function(jsondata){
 			if(jsondata.status == 'success'){
-				$('.contacts_property[data-checksum="'+checksum+'"]').html(jsondata.data.page);
+				$('.contacts_property[data-checksum="'+checksum+'"]').html(jsondata.data.page)
+					.find('select').chosen();
 			}
 			else{
 				alert(jsondata.data.message);
@@ -148,10 +151,12 @@ $(document).ready(function(){
 
 
 	$('.contacts_property').live('mouseenter',function(){
-		$(this).find('span').show();
+		$(this).find('span[data-use]').show();
 	});
 
 	$('.contacts_property').live('mouseleave',function(){
-		$(this).find('span').hide();
+		$(this).find('span[data-use]').hide();
 	});
+
+	$('#contacts_addcardform select').chosen();
 });
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index adfa32b6f5f..4865fae7642 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -95,10 +95,15 @@ class OC_Contacts_VCard{
 
 		$card = self::parse($data);
 		if(!is_null($card)){
+			// VCARD must have a version
+			$hasversion = false;
 			foreach($card->children as $property){
 				if($property->name == 'FN'){
 					$fn = $property->value;
 				}
+				elseif($property->name == 'VERSION'){
+					$hasversion = true;
+				}
 				elseif(is_null($uri) && $property->name == 'UID' ){
 					$uri = $property->value.'.vcf';
 				}
@@ -109,6 +114,11 @@ class OC_Contacts_VCard{
 				$card->add(new Sabre_VObject_Property('UID',$uid));
 				$data = $card->serialize();
 			};
+			// Add version if needed
+			if(!$hasversion){
+				$card->add(new Sabre_VObject_Property('VERSION','3.0'));
+				$data = $card->serialize();
+			}
 		}
 		else{
 			// that's hard. Creating a UID and not saving it
@@ -286,7 +296,13 @@ class OC_Contacts_VCard{
 		$property = new Sabre_VObject_Property( $name, $value );
 		$parameternames = array_keys($parameters);
 		foreach($parameternames as $i){
-			$property->parameters[] = new Sabre_VObject_Parameter($i,$parameters[$i]);
+			$values = $parameters[$i];
+			if (!is_array($values)){
+				$values = array($values);
+			}
+			foreach($values as $value){
+				$property->add($i, $value);
+			}
 		}
 
 		$vcard->add($property);
@@ -342,7 +358,17 @@ class OC_Contacts_VCard{
 				$parameter->name = 'PREF';
 				$parameter->value = '1';
 			}
-			$temp['parameters'][$parameter->name] = $parameter->value;
+			if ($property->name == 'TEL' && $parameter->name == 'TYPE'){
+				if (isset($temp['parameters'][$parameter->name])){
+					$temp['parameters'][$parameter->name][] = $parameter->value;
+				}
+				else{
+					$temp['parameters'][$parameter->name] = array($parameter->value);
+				}
+			}
+			else{
+				$temp['parameters'][$parameter->name] = $parameter->value;
+			}
 		}
 		return $temp;
 	}
@@ -362,4 +388,24 @@ class OC_Contacts_VCard{
 			return null;
 		}
 	}
+	public static function getTypesOfProperty($l, $prop){
+		switch($prop){
+		case 'ADR':
+			return array(
+				'WORK' => $l->t('Work'),
+				'HOME' => $l->t('Home'),
+			);
+		case 'TEL':
+			return array(
+				'HOME'  =>  $l->t('Home'),
+				'CELL'  =>  $l->t('Mobile'),
+				'WORK'  =>  $l->t('Work'),
+				'TEXT'  =>  $l->t('Text'),
+				'VOICE' =>  $l->t('Voice'),
+				'FAX'   =>  $l->t('Fax'),
+				'VIDEO' =>  $l->t('Video'),
+				'PAGER' =>  $l->t('Pager'),
+			);
+		}
+	}
 }
diff --git a/apps/contacts/templates/part.addcardform.php b/apps/contacts/templates/part.addcardform.php
index a596ad8163a..627053547ad 100644
--- a/apps/contacts/templates/part.addcardform.php
+++ b/apps/contacts/templates/part.addcardform.php
@@ -7,9 +7,7 @@
 				<li class="input stringish">
 					<label class="label" for="id"><?php echo $l->t('Group'); ?></label>
 					<select name="id" size="1">
-						<?php foreach($_['addressbooks'] as $addressbook): ?>
-							<option value="<?php echo $addressbook['id']; ?>"><?php echo $addressbook['displayname']; ?></option>
-						<?php endforeach; ?>
+						<?php echo html_select_options($_['addressbooks'], null, array('value'=>'id', 'label'=>'displayname')); ?>
 					</select>
 				</li>
 			</ol>
@@ -45,15 +43,8 @@
 						</li>
 						<li class="fragment">
 							<label for="tel_type"><?php echo $l->t('Type'); ?></label>
-							<select id="TEL" name="parameters[TEL][TYPE]" size="1">
-								<option value="home"><?php echo $l->t('Home'); ?></option>
-								<option value="cell" selected="selected"><?php echo $l->t('Mobile'); ?></option>
-								<option value="work"><?php echo $l->t('Work'); ?></option>
-								<option value="text"><?php echo $l->t('Text'); ?></option>
-								<option value="voice"><?php echo $l->t('Voice'); ?></option>
-								<option value="fax"><?php echo $l->t('Fax'); ?></option>
-								<option value="video"><?php echo $l->t('Video'); ?></option>
-								<option value="pager"><?php echo $l->t('Pager'); ?></option>
+							<select id="TEL" name="parameters[TEL][TYPE][]" multiple="multiple">
+								<?php echo html_select_options($_['phone_types'], 'CELL') ?>
 							</select>
 						</li>
 					</ol>
@@ -67,8 +58,7 @@
 			<li class="input">
 				<label class="label" for="adr_type"><?php echo $l->t('Type'); ?></label>
 				<select id="adr_type" name="parameters[ADR][TYPE]" size="1">
-					<option value="work"><?php echo $l->t('Work'); ?></option>
-					<option value="home" selected="selected"><?php echo $l->t('Home'); ?></option>
+					<?php echo html_select_options($_['adr_types'], 'HOME') ?>
 				</select>
 			</li>
 			<li class="input stringish">
diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php
index e9fa8356e8b..f6d69005a08 100644
--- a/apps/contacts/templates/part.details.php
+++ b/apps/contacts/templates/part.details.php
@@ -27,24 +27,21 @@
 				<input type="hidden" name="id" value="<?php echo $_['id']; ?>">
 				<p class="contacts_property_name">
 					<select name="name" size="1">
-						<option value="ADR"><?php echo $l->t('Address'); ?></option>
-						<option value="TEL"><?php echo $l->t('Telephone'); ?></option>
-						<option value="EMAIL" selected="selected"><?php echo $l->t('Email'); ?></option>
-						<option value="ORG"><?php echo $l->t('Organization'); ?></option>
+						<?php echo html_select_options($_['property_types'], 'EMAIL') ?>
 					</select>
+					<br>
+					<input id="contacts_addproperty_button" type="submit" value="<?php echo $l->t('Add'); ?>">
 				</p>
 				<p class="contacts_property_data" id="contacts_generic">
 					<input type="text" name="value" value="">
-				</p><br>
-				<input id="contacts_addproperty_button" type="submit" value="<?php echo $l->t('Add'); ?>">
+				</p>
 			</form>
 			<div id="contacts_addcontactsparts" style="display:none;">
 				<ul class="contacts_property_data" id="contacts_addresspart">
 					<li>
 						<label for="adr_type"><?php echo $l->t('Type'); ?></label>
 						<select id="adr_type" name="parameters[TYPE]" size="1">
-							<option value="work"><?php echo $l->t('Work'); ?></option>
-							<option value="home" selected="selected"><?php echo $l->t('Home'); ?></option>
+							<?php echo html_select_options($_['adr_types'], 'HOME') ?>
 						</select>
 					</li>
 					<li>
@@ -78,15 +75,8 @@
 				</ul>
 				<p class="contacts_property_data" id="contacts_phonepart">
 					<input type="text" name="value" value="">
-					<select name="parameters[TYPE]" size="1">
-						<option value="home"><?php echo $l->t('Home'); ?></option>
-						<option value="cell" selected="selected"><?php echo $l->t('Mobile'); ?></option>
-						<option value="work"><?php echo $l->t('Work'); ?></option>
-						<option value="text"><?php echo $l->t('Text'); ?></option>
-						<option value="voice"><?php echo $l->t('Voice'); ?></option>
-						<option value="fax"><?php echo $l->t('Fax'); ?></option>
-						<option value="video"><?php echo $l->t('Video'); ?></option>
-						<option value="pager"><?php echo $l->t('Pager'); ?></option>
+					<select name="parameters[TYPE][]" multiple="multiple" data-placeholder="<?php echo $l->t('Type') ?>">
+						<?php echo html_select_options($_['phone_types'], 'CELL') ?>
 					</select>
 				</p>
 				<p class="contacts_property_data" id="contacts_generic">
diff --git a/apps/contacts/templates/part.property.php b/apps/contacts/templates/part.property.php
index 4bc3a4d85f8..afef4311260 100644
--- a/apps/contacts/templates/part.property.php
+++ b/apps/contacts/templates/part.property.php
@@ -23,8 +23,20 @@
 		<p class="contacts_property_name"><?php echo $l->t('Phone'); ?></p>
 		<p class="contacts_property_data">
 			<?php echo $_['property']['value']; ?>
-			<?php if(isset($_['property']['parameters']['TYPE'])): ?>
-				(<?php echo $l->t(ucwords(str_replace('cell','mobile',strtolower($_['property']['parameters']['TYPE'])))); ?>)
+			<?php if(isset($_['property']['parameters']['TYPE']) && !empty($_['property']['parameters']['TYPE'])): ?>
+<?php
+	$types = array();
+	foreach($_['property']['parameters']['TYPE'] as $type):
+		if (isset($_['phone_types'][strtoupper($type)])){
+			$types[]=$_['phone_types'][strtoupper($type)];
+		}
+		else{
+			$types[]=$l->t(ucwords(strtolower($type)));
+		}
+	endforeach;
+	$label = join(' ', $types);
+?>
+				(<?php echo $label; ?>)
 			<?php endif; ?>
 			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
 			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
@@ -34,7 +46,16 @@
 			<?php echo $l->t('Address'); ?>
 			<?php if(isset($_['property']['parameters']['TYPE'])): ?>
 				<br>
-				(<?php echo $l->t(ucwords($_['property']['parameters']['TYPE'])); ?>)
+<?php
+	$type = $_['property']['parameters']['TYPE'];
+	if (isset($_['adr_types'][strtoupper($type)])){
+		$label=$_['adr_types'][strtoupper($type)];
+	}
+	else{
+		$label=$l->t(ucwords(strtolower($type)));
+	}
+?>
+				(<?php echo $label; ?>)
 			<?php endif; ?>
 		</p>
 		<p class="contacts_property_data">
diff --git a/apps/contacts/templates/part.setpropertyform.php b/apps/contacts/templates/part.setpropertyform.php
index eb8a67a8aa5..f216a55f5e9 100644
--- a/apps/contacts/templates/part.setpropertyform.php
+++ b/apps/contacts/templates/part.setpropertyform.php
@@ -1,10 +1,15 @@
-<li class="contacts_property_edit" data-checksum="<?php echo $_['property']['checksum']; ?>">
 	<form id="contacts_setpropertyform">
 		<input type="hidden" name="checksum" value="<?php echo $_['property']['checksum']; ?>">
 		<input type="hidden" name="id" value="<?php echo $_['id']; ?>">
 		<?php if($_['property']['name']=='ADR'): ?>
 			<p class="contacts_property_name"><label for="adr_pobox"><?php echo $l->t('Address'); ?></label></p>
 			<ol class="contacts_property_data" id="contacts_addresspart">
+				<li class="input">
+					<label class="label" for="adr_type"><?php echo $l->t('Type'); ?></label>
+					<select id="adr_type" name="parameters[TYPE]" size="1">
+						<?php echo html_select_options($_['adr_types'], strtoupper($_['property']['parameters']['TYPE'])) ?>
+					</select>
+				</li>
 				<li>
 					<label for="adr_pobox"><?php echo $l->t('PO Box'); ?></label>
 					<input id="adr_pobox" type="text" name="value[0]" value="<?php echo $_['property']['value'][0] ?>">
@@ -36,7 +41,10 @@
 			</ol>
 		<?php elseif($_['property']['name']=='TEL'): ?>
 			<p class="contacts_property_name"><label for="tel"><?php echo $l->t('Phone'); ?></label></p>
-			<p class="contacts_property_data"><input id="tel" type="phone" name="value" value="<?php echo $_['property']['value']; ?>"></p>
+			<p class="contacts_property_data"><input id="tel" type="phone" name="value" value="<?php echo $_['property']['value'] ?>">
+				<select id="tel_type<?php echo $_['property']['checksum'] ?>" name="parameters[TYPE][]" multiple="multiple" data-placeholder="<?php echo $l->t('Type') ?>">
+					<?php echo html_select_options($_['phone_types'], isset($_['property']['parameters']['TYPE'])?$_['property']['parameters']['TYPE']:'') ?>
+				</select></p>
 		<?php elseif($_['property']['name']=='EMAIL'): ?>
 			<p class="contacts_property_name"><label for="email"><?php echo $l->t('Email'); ?></label></p>
 			<p class="contacts_property_data"><input id="email" type="text" name="value" value="<?php echo $_['property']['value']; ?>"></p>
@@ -44,6 +52,5 @@
 			<p class="contacts_property_name"><label for="org"><?php echo $l->t('Organization'); ?></label></p>
 			<p class="contacts_property_data"><input id="org" type="text" name="value" value="<?php echo $_['property']['value']; ?>"></p>
 		<?php endif; ?>
-		<input id="contacts_setproperty_button" type="submit" value="<?php echo $l->t('Edit'); ?>">
+		<input id="contacts_setproperty_button" type="submit" value="<?php echo $l->t('Update'); ?>">
 	</form>
-</li>
diff --git a/apps/external/ajax/seturls.php b/apps/external/ajax/seturls.php
index c8e97754544..e994385a199 100644
--- a/apps/external/ajax/seturls.php
+++ b/apps/external/ajax/seturls.php
@@ -8,16 +8,16 @@
 require_once('../../../lib/base.php');
 OC_Util::checkAdminUser();
 
-if(isset($_POST['s1name'])) OC_Config::setValue( 'external-site1name', $_POST['s1name'] );
-if(isset($_POST['s1url'])) OC_Config::setValue( 'external-site1url', $_POST['s1url'] );
-if(isset($_POST['s2name'])) OC_Config::setValue( 'external-site2name', $_POST['s2name'] );
-if(isset($_POST['s2url'])) OC_Config::setValue( 'external-site2url', $_POST['s2url'] );
-if(isset($_POST['s3name'])) OC_Config::setValue( 'external-site3name', $_POST['s3name'] );
-if(isset($_POST['s3url'])) OC_Config::setValue( 'external-site3url', $_POST['s3url'] );
-if(isset($_POST['s4name'])) OC_Config::setValue( 'external-site4name', $_POST['s4name'] );
-if(isset($_POST['s4url'])) OC_Config::setValue( 'external-site4url', $_POST['s4url'] );
-if(isset($_POST['s5name'])) OC_Config::setValue( 'external-site5name', $_POST['s5name'] );
-if(isset($_POST['s5url'])) OC_Config::setValue( 'external-site5url', $_POST['s5url'] );
+if(isset($_POST['s1name'])) OC_Appconfig::setValue( 'external','site1name', $_POST['s1name'] );
+if(isset($_POST['s1url'])) OC_Appconfig::setValue( 'external','site1url', $_POST['s1url'] );
+if(isset($_POST['s2name'])) OC_Appconfig::setValue( 'external','site2name', $_POST['s2name'] );
+if(isset($_POST['s2url'])) OC_Appconfig::setValue( 'external','site2url', $_POST['s2url'] );
+if(isset($_POST['s3name'])) OC_Appconfig::setValue( 'external','site3name', $_POST['s3name'] );
+if(isset($_POST['s3url'])) OC_Appconfig::setValue( 'external','site3url', $_POST['s3url'] );
+if(isset($_POST['s4name'])) OC_Appconfig::setValue( 'external','site4name', $_POST['s4name'] );
+if(isset($_POST['s4url'])) OC_Appconfig::setValue( 'external','site4url', $_POST['s4url'] );
+if(isset($_POST['s5name'])) OC_Appconfig::setValue( 'external','site5name', $_POST['s5name'] );
+if(isset($_POST['s5url'])) OC_Appconfig::setValue( 'external','site5url', $_POST['s5url'] );
 
 echo 'true';
 
diff --git a/apps/external/appinfo/app.php b/apps/external/appinfo/app.php
index df14954d86f..0f536cbf418 100644
--- a/apps/external/appinfo/app.php
+++ b/apps/external/appinfo/app.php
@@ -25,13 +25,13 @@ OC_APP::registerAdmin('external','settings');
 
 OC_App::register( array( 'order' => 70, 'id' => 'external', 'name' => 'External' ));
 
-if(OC_Config::getValue( "external-site1name", '' )<>'')  OC_App::addNavigationEntry( array( 'id' => 'external_index1', 'order' => 80, 'href' => OC_Helper::linkTo( 'external', 'index.php' ).'?id=1', 'icon' => OC_Helper::imagePath( 'external', 'external.png' ), 'name' => OC_Config::getValue( "external-site1name", '' )));
+if(OC_Appconfig::getValue( "external","site1name", '' )<>'')  OC_App::addNavigationEntry( array( 'id' => 'external_index1', 'order' => 80, 'href' => OC_Helper::linkTo( 'external', 'index.php' ).'?id=1', 'icon' => OC_Helper::imagePath( 'external', 'external.png' ), 'name' => OC_Appconfig::getValue( "external","site1name", '' )));
 
-if(OC_Config::getValue( "external-site2name", '' )<>'')  OC_App::addNavigationEntry( array( 'id' => 'external_index2', 'order' => 80, 'href' => OC_Helper::linkTo( 'external', 'index.php' ).'?id=2', 'icon' => OC_Helper::imagePath( 'external', 'external.png' ), 'name' => OC_Config::getValue( "external-site2name", '' )));
+if(OC_Appconfig::getValue( "external","site2name", '' )<>'')  OC_App::addNavigationEntry( array( 'id' => 'external_index2', 'order' => 80, 'href' => OC_Helper::linkTo( 'external', 'index.php' ).'?id=2', 'icon' => OC_Helper::imagePath( 'external', 'external.png' ), 'name' => OC_Appconfig::getValue( "external","site2name", '' )));
 
-if(OC_Config::getValue( "external-site3name", '' )<>'')  OC_App::addNavigationEntry( array( 'id' => 'external_index3', 'order' => 80, 'href' => OC_Helper::linkTo( 'external', 'index.php' ).'?id=3', 'icon' => OC_Helper::imagePath( 'external', 'external.png' ), 'name' => OC_Config::getValue( "external-site3name", '' )));
+if(OC_Appconfig::getValue( "external","site3name", '' )<>'')  OC_App::addNavigationEntry( array( 'id' => 'external_index3', 'order' => 80, 'href' => OC_Helper::linkTo( 'external', 'index.php' ).'?id=3', 'icon' => OC_Helper::imagePath( 'external', 'external.png' ), 'name' => OC_Appconfig::getValue( "external","site3name", '' )));
 
-if(OC_Config::getValue( "external-site4name", '' )<>'')  OC_App::addNavigationEntry( array( 'id' => 'external_index4', 'order' => 80, 'href' => OC_Helper::linkTo( 'external', 'index.php' ).'?id=4', 'icon' => OC_Helper::imagePath( 'external', 'external.png' ), 'name' => OC_Config::getValue( "external-site4name", '' )));
+if(OC_Appconfig::getValue( "external","site4name", '' )<>'')  OC_App::addNavigationEntry( array( 'id' => 'external_index4', 'order' => 80, 'href' => OC_Helper::linkTo( 'external', 'index.php' ).'?id=4', 'icon' => OC_Helper::imagePath( 'external', 'external.png' ), 'name' => OC_Appconfig::getValue( "external","site4name", '' )));
 
-if(OC_Config::getValue( "external-site5name", '' )<>'')  OC_App::addNavigationEntry( array( 'id' => 'external_index5', 'order' => 80, 'href' => OC_Helper::linkTo( 'external', 'index.php' ).'?id=5', 'icon' => OC_Helper::imagePath( 'external', 'external.png' ), 'name' => OC_Config::getValue( "external-site5name", '' )));
+if(OC_Appconfig::getValue( "external","site5name", '' )<>'')  OC_App::addNavigationEntry( array( 'id' => 'external_index5', 'order' => 80, 'href' => OC_Helper::linkTo( 'external', 'index.php' ).'?id=5', 'icon' => OC_Helper::imagePath( 'external', 'external.png' ), 'name' => OC_Appconfig::getValue( "external","site5name", '' )));
 
diff --git a/apps/external/index.php b/apps/external/index.php
index 116e16d9096..86b19abc10e 100644
--- a/apps/external/index.php
+++ b/apps/external/index.php
@@ -35,7 +35,7 @@ if(isset($_GET['id'])){
 	$id=$_GET['id'];
 	$id = (int) $id;
 
-	$url=OC_Config::getValue( "external-site".$id."url", '' );
+	$url=OC_Appconfig::getValue( "external","site".$id."url", '' );
 	OC_App::setActiveNavigationEntry( 'external_index'.$id );
 
 	$tmpl = new OC_Template( 'external', 'frame', 'user' );
diff --git a/apps/external/settings.php b/apps/external/settings.php
index ad33c16e1bf..3e0c3425128 100644
--- a/apps/external/settings.php
+++ b/apps/external/settings.php
@@ -6,17 +6,17 @@ OC_Util::addScript( "external", "admin" );
 
 $tmpl = new OC_Template( 'external', 'settings');
 
-	$tmpl->assign('s1name',OC_Config::getValue( "external-site1name", '' ));
-	$tmpl->assign('s2name',OC_Config::getValue( "external-site2name", '' ));
-	$tmpl->assign('s3name',OC_Config::getValue( "external-site3name", '' ));
-	$tmpl->assign('s4name',OC_Config::getValue( "external-site4name", '' ));
-	$tmpl->assign('s5name',OC_Config::getValue( "external-site5name", '' ));
+	$tmpl->assign('s1name',OC_Appconfig::getValue( "external","site1name", '' ));
+	$tmpl->assign('s2name',OC_Appconfig::getValue( "external","site2name", '' ));
+	$tmpl->assign('s3name',OC_Appconfig::getValue( "external","site3name", '' ));
+	$tmpl->assign('s4name',OC_Appconfig::getValue( "external","site4name", '' ));
+	$tmpl->assign('s5name',OC_Appconfig::getValue( "external","site5name", '' ));
 
-	$tmpl->assign('s1url',OC_Config::getValue( "external-site1url", '' ));
-	$tmpl->assign('s2url',OC_Config::getValue( "external-site2url", '' ));
-	$tmpl->assign('s3url',OC_Config::getValue( "external-site3url", '' ));
-	$tmpl->assign('s4url',OC_Config::getValue( "external-site4url", '' ));
-	$tmpl->assign('s5url',OC_Config::getValue( "external-site5url", '' ));
+	$tmpl->assign('s1url',OC_Appconfig::getValue( "external","site1url", '' ));
+	$tmpl->assign('s2url',OC_Appconfig::getValue( "external","site2url", '' ));
+	$tmpl->assign('s3url',OC_Appconfig::getValue( "external","site3url", '' ));
+	$tmpl->assign('s4url',OC_Appconfig::getValue( "external","site4url", '' ));
+	$tmpl->assign('s5url',OC_Appconfig::getValue( "external","site5url", '' ));
 
 return $tmpl->fetchPage();
 ?>
diff --git a/apps/files_sharing/ajax/getitem.php b/apps/files_sharing/ajax/getitem.php
index 075ec043eac..d9df4abe984 100644
--- a/apps/files_sharing/ajax/getitem.php
+++ b/apps/files_sharing/ajax/getitem.php
@@ -1,5 +1,5 @@
 <?php
-$RUNTIME_NOAPPS = true;
+//$RUNTIME_NOAPPS = true;
 
 require_once('../../../lib/base.php');
 OC_JSON::checkAppEnabled('files_sharing');
diff --git a/apps/files_sharing/ajax/setpermissions.php b/apps/files_sharing/ajax/setpermissions.php
index 7ee8f0e57bd..200202c704c 100644
--- a/apps/files_sharing/ajax/setpermissions.php
+++ b/apps/files_sharing/ajax/setpermissions.php
@@ -1,5 +1,5 @@
 <?php
-$RUNTIME_NOAPPS = true;
+//$RUNTIME_NOAPPS = true;
 
 require_once('../../../lib/base.php');
 OC_JSON::checkAppEnabled('files_sharing');
diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php
index d1f50994317..9b10260da5a 100644
--- a/apps/files_sharing/ajax/share.php
+++ b/apps/files_sharing/ajax/share.php
@@ -1,5 +1,5 @@
 <?php
-$RUNTIME_NOAPPS = true;
+//$RUNTIME_NOAPPS = true;
 
 require_once('../../../lib/base.php');
 OC_JSON::checkAppEnabled('files_sharing');
diff --git a/apps/files_sharing/ajax/unshare.php b/apps/files_sharing/ajax/unshare.php
index a19a85cfda3..d8a72a00efe 100644
--- a/apps/files_sharing/ajax/unshare.php
+++ b/apps/files_sharing/ajax/unshare.php
@@ -1,5 +1,5 @@
 <?php
-$RUNTIME_NOAPPS = true;
+//$RUNTIME_NOAPPS = true;
 
 require_once('../../../lib/base.php');
 OC_JSON::checkAppEnabled('files_sharing');
diff --git a/apps/files_sharing/ajax/userautocomplete.php b/apps/files_sharing/ajax/userautocomplete.php
index 21516c3d091..9d971fb62af 100644
--- a/apps/files_sharing/ajax/userautocomplete.php
+++ b/apps/files_sharing/ajax/userautocomplete.php
@@ -1,5 +1,5 @@
 <?php
-$RUNTIME_NOAPPS = true;
+//$RUNTIME_NOAPPS = true;
 
 require_once('../../../lib/base.php');
 
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 4056d693bfa..4457dddbe15 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -224,7 +224,7 @@ function addUser(uid_shared_with, permissions, parentFolder) {
 		var user = '<li data-uid_shared_with="'+uid_shared_with+'">';
 		user += '<a href="" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core','actions/delete')+'"/></a>';
 		user += uid_shared_with;
-		user += '<input type="checkbox" name="permissions" id="'+uid_shared_with+'" class="permissions" "+checked+" />';
+		user += '<input type="checkbox" name="permissions" id="'+uid_shared_with+'" class="permissions" '+checked+' />';
 		user += '<label for="'+uid_shared_with+'" '+style+'>can edit</label>';
 		user += '</li>';
 	}
diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 828839cbc92..c3c051944e3 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -4,7 +4,6 @@ function setEditorSize(){
 }
 
 function getFileExtension(file){
-	// Extracts the file extension from the full filename
 	var parts=file.split('.');
 	return parts[parts.length-1];
 }
@@ -12,6 +11,7 @@ function getFileExtension(file){
 function setSyntaxMode(ext){
 	// Loads the syntax mode files and tells the editor
 	var filetype = new Array();
+	// Todo finish these
     filetype["h"] = "c_cpp";
     filetype["c"] = "c_cpp";
     filetype["cpp"] = "c_cpp";
@@ -56,14 +56,18 @@ function showControls(filename){
 		$('#controls').append(html);
 		$('#editorbar').fadeIn('slow');	
 		var breadcrumbhtml = '<div class="crumb svg" id="breadcrumb_file" style="background-image:url(&quot;../core/img/breadcrumb.png&quot;)"><p>'+filename+'</p></div>';
-		$('.actions').before(breadcrumbhtml);
-		$('.actions').before(savebtnhtml);
+		$('.actions').before(breadcrumbhtml).before(savebtnhtml);
 	});
 }
  
 function bindControlEvents(){
-	$("#editor_save").die('click', doFileSave).live('click', doFileSave);	
-	$('#editor_close').live('click', hideFileEditor);
+	$("#editor_save").die('click',doFileSave).live('click',doFileSave);	
+	$('#editor_close').die('click',hideFileEditor).live('click',hideFileEditor);
+}
+
+function editorIsShown(){
+	// Not working as intended. Always returns true.
+	return is_editor_shown;
 }
 
 function updateSessionFileHash(path){
@@ -73,20 +77,17 @@ function updateSessionFileHash(path){
    			if(jsondata.status=='failure'){
    				alert('Failed to update session file hash.');	
    			}
-   		},
-   		"json");
-}
+   	}, "json");}
 
-var editor_is_saving = false;
 function doFileSave(){
-	if(is_editor_shown){
-		editor_is_saving = true;
+	if(editorIsShown()){
+		$("#editor_save").die('click',doFileSave);
 		$('#editor_save').after('<img id="saving_icon" src="'+OC.filePath('core','img','loading.gif')+'"></img>');
 			var filecontents = window.aceEditor.getSession().getValue();
 			var dir =  $('#editor').attr('data-dir');
 			var file =  $('#editor').attr('data-filename');
 			$.post(OC.filePath('files_texteditor','ajax','savefile.php'), { filecontents: filecontents, file: file, dir: dir },function(jsondata){
-				
+			
 				if(jsondata.status == 'failure'){
 					var answer = confirm(jsondata.data.message);
 					if(answer){
@@ -95,10 +96,10 @@ function doFileSave(){
 								$('#saving_icon').remove();
 								$('#editor_save').after('<p id="save_result" style="float: left">Saved!</p>')
 								setTimeout(function() {
-	  								$('#save_result').fadeOut('slow',function(){
-	  									$(this).remove();
-	  									editor_is_saving = false;	
-	  								});
+  									$('#save_result').fadeOut('slow',function(){
+  										$(this).remove();	
+  										$("#editor_save").live('click',doFileSave);
+  									});
 								}, 2000);
 							} 
 							else {
@@ -107,25 +108,25 @@ function doFileSave(){
 								$('#editor_save').after('<p id="save_result" style="float: left">Failed!</p>');
 								setTimeout(function() {
 									$('#save_result').fadeOut('slow',function(){ 
-										$(this).remove(); 
-										editor_is_saving = false;
+										$(this).remove();
+										$("#editor_save").live('click',doFileSave); 
 									});
 								}, 2000);	
 							}
 						}, 'json');
 					} 
-			   		else {
+		   			else {
 						// Don't save!
 						$('#saving_icon').remove();
 						// Temporary measure until we get a tick icon
 						$('#editor_save').after('<p id="save_result" style="float: left">Saved!</p>');
 						setTimeout(function() {
 									$('#save_result').fadeOut('slow',function(){ 
-										$(this).remove();
-										editor_is_saving = false;
+										$(this).remove(); 
+										$("#editor_save").live('click',doFileSave);
 									});
 						}, 2000);
-				   	}
+			   		}
 				} 
 				else if(jsondata.status == 'success'){
 					// Success
@@ -133,19 +134,25 @@ function doFileSave(){
 					// Temporary measure until we get a tick icon
 					$('#editor_save').after('<p id="save_result" style="float: left">Saved!</p>');
 					setTimeout(function() {
-								$('#save_result').fadeOut('slow',function(){ 
-									$(this).remove(); 
-									editor_is_saving = false;
-								});
+						$('#save_result').fadeOut('slow',function(){ 
+							$(this).remove(); 
+							$("#editor_save").live('click',doFileSave);
+						});
 					}, 2000);
 				}
 			}, 'json');
-		window.aceEditor.focus();
+		giveEditorFocus();
+	} else {
+		return;	
 	}	
 };
 
+function giveEditorFocus(){
+	window.aceEditor.focus();
+};
+
 function showFileEditor(dir,filename){
-	if(!is_editor_shown){
+	if(!editorIsShown()){
 		// Loads the file editor and display it.
 		var data = $.ajax({
 				url: OC.filePath('files','ajax','download.php')+'?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent(dir),
@@ -175,26 +182,23 @@ function showFileEditor(dir,filename){
 }
 
 function hideFileEditor(){
-	if(is_editor_shown){
-		$('#editor').attr('editorshown','false');	
-		// Fade out controls
-		$('#editor_close').fadeOut('slow');
-		// Fade out the save button
-		$('#editor_save').fadeOut('slow');
-		// Fade out breadcrumb
-		$('#breadcrumb_file').fadeOut('slow', function(){ $(this).remove();});
-		// Fade out editor
-		$('#editor').fadeOut('slow', function(){
-			$('#editor_close').remove();
-			$('#editor_save').remove();
-			$('#editor').remove();
-			var editorhtml = '<div id="editor"></div>';
-			$('table').after(editorhtml);
-			$('.actions,#file_access_panel').fadeIn('slow');
-			$('table').fadeIn('slow');	
-		});
-		is_editor_shown = false;
-	}
+	// Fade out controls
+	$('#editor_close').fadeOut('slow');
+	// Fade out the save button
+	$('#editor_save').fadeOut('slow');
+	// Fade out breadcrumb
+	$('#breadcrumb_file').fadeOut('slow', function(){ $(this).remove();});
+	// Fade out editor
+	$('#editor').fadeOut('slow', function(){
+		$('#editor_close').remove();
+		$('#editor_save').remove();
+		$('#editor').remove();
+		var editorhtml = '<div id="editor"></div>';
+		$('table').after(editorhtml);
+		$('.actions,#file_access_panel').fadeIn('slow');
+		$('table').fadeIn('slow');	
+	});
+	is_editor_shown = false;
 }
 
 // Keyboard Shortcuts
@@ -205,25 +209,18 @@ function checkForCtrlKey(e){
 	}
 	
 function checkForSaveKeyPress(e){
-	if(!editor_is_saving){
 		if(e.which == 17 || e.which == 91) ctrlBtn=true;
    		if(e.which == 83 && ctrlBtn == true) {
    			e.preventDefault();
-        	doFileSave();
+        	$('#editor_save').trigger('click');
 			return false;
    		}
-   	} else {
-   		e.preventDefault();	
-   	}
 }
 
-// Sets the correct size of the editor window
 $(window).resize(function() {
 	setEditorSize();
 });
-
 var is_editor_shown = false;
-
 $(document).ready(function(){
 	if(typeof FileActions!=='undefined'){
 		FileActions.register('text','Edit','',function(filename){
@@ -243,7 +240,6 @@ $(document).ready(function(){
 		a.click(function(){
 			var file=text.split('/').pop();
 			var dir=text.substr(0,text.length-file.length-1);
-			// TODO this will only work in the files app.
 			showFileEditor(dir,file);
 		});
 	}
@@ -252,5 +248,4 @@ $(document).ready(function(){
 	
 	// Binds the save keyboard shortcut events
 	$(document).unbind('keyup').bind('keyup',checkForCtrlKey).unbind('keydown').bind('keydown',checkForSaveKeyPress);
-	
-	});
+});
diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index 67d56075194..a6738058be3 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -31,7 +31,8 @@ div.jp-volume-bar-value { background:#ccc; width:0; height:0.4em; }
 #collection li { padding-right:10px; }
 #searchresults input.play, #searchresults input.add { float:left; height:1em; width:1em; }
 #collection tr.collapsed td.album, #collection tr.collapsed td.title { color:#ddd; }
-a.expander { float:right; padding:0 1em; }
+td.artist img, td.artist a, td.album img, td.album a { float: left; }
+td.artist a.expander, td.album a.expander { float:right; padding:0 1em; }
 tr.active td { background-color:#eee; font-weight:bold; }
 tr td { border-top:1px solid #eee; height:2.2em; }
 tr .artist img { vertical-align:middle; }
diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
index 0ad84d66809..bc1f853047f 100644
--- a/apps/media/lib_ampache.php
+++ b/apps/media/lib_ampache.php
@@ -128,7 +128,7 @@ class OC_MEDIA_AMPACHE{
 		$albums=count(OC_MEDIA_COLLECTION::getAlbums($artist['artist_id']));
 		$songs=count(OC_MEDIA_COLLECTION::getSongs($artist['artist_id']));
 		$id=$artist['artist_id'];
-		$name=utf8_decode(htmlentities($artist['artist_name']));
+		$name=htmlentities($artist['artist_name'], ENT_COMPAT, 'UTF-8');
 		echo("\t<artist id='$id'>\n");
 		echo("\t\t<name>$name</name>\n");
 		echo("\t\t<albums>$albums</albums>\n");
@@ -142,10 +142,10 @@ class OC_MEDIA_AMPACHE{
 		if(!$artistName){
 			$artistName=OC_MEDIA_COLLECTION::getArtistName($album['album_artist']);
 		}
-		$artistName=utf8_decode(htmlentities($artistName));
+		$artistName=htmlentities($artistName, ENT_COMPAT, 'UTF-8');
 		$songs=count(OC_MEDIA_COLLECTION::getSongs($album['album_artist'],$album['album_id']));
 		$id=$album['album_id'];
-		$name=utf8_decode(htmlentities($album['album_name']));
+		$name=htmlentities($album['album_name'], ENT_COMPAT, 'UTF-8');
 		$artist=$album['album_artist'];
 		echo("\t<album id='$id'>\n");
 		echo("\t\t<name>$name</name>\n");
@@ -163,10 +163,10 @@ class OC_MEDIA_AMPACHE{
 		if(!$albumName){
 			$albumName=OC_MEDIA_COLLECTION::getAlbumName($song['song_album']);
 		}
-		$artistName=utf8_decode(htmlentities($artistName));
-		$albumName=utf8_decode(htmlentities($albumName));
+		$artistName=htmlentities($artistName, ENT_COMPAT, 'UTF-8');
+		$albumName=htmlentities($albumName, ENT_COMPAT, 'UTF-8');
 		$id=$song['song_id'];
-		$name=utf8_decode(htmlentities($song['song_name']));
+		$name=htmlentities($song['song_name'], ENT_COMPAT, 'UTF-8');
 		$artist=$song['song_artist'];
 		$album=$song['song_album'];
 		echo("\t<song id='$id'>\n");
diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
index ef63cea45df..c2bea2d836d 100644
--- a/apps/media/lib_scanner.php
+++ b/apps/media/lib_scanner.php
@@ -93,6 +93,7 @@ class OC_MEDIA_SCANNER{
 			}
 			if(!self::$getID3){
 				self::$getID3=@new getID3();
+				self::$getID3->encoding='UTF-8';
 			}
 			$data=@self::$getID3->analyze($file);
 			getid3_lib::CopyTagsToComments($data);
@@ -105,21 +106,18 @@ class OC_MEDIA_SCANNER{
 				$artist='unknown';
 			}else{
 				$artist=stripslashes($data['comments']['artist'][0]);
-				$artist=utf8_encode($artist);
 			}
 			if(!isset($data['comments']['album'])){
 				OC_Log::write('media',"error reading album tag in '$file'",OC_Log::WARN);
 				$album='unknown';
 			}else{
 				$album=stripslashes($data['comments']['album'][0]);
-				$album=utf8_encode($album);
 			}
 			if(!isset($data['comments']['title'])){
 				OC_Log::write('media',"error reading title tag in '$file'",OC_Log::WARN);
 				$title='unknown';
 			}else{
 				$title=stripslashes($data['comments']['title'][0]);
-				$title=utf8_encode($title);
 			}
 			$size=$data['filesize'];
 			$track=(isset($data['comments']['track']))?$data['comments']['track'][0]:0;
@@ -150,4 +148,4 @@ class OC_MEDIA_SCANNER{
 		$ext=substr($filename,strrpos($filename,'.')+1);
 		return $ext=='mp3' || $ext=='flac' || $ext=='m4a' || $ext=='ogg' || $ext=='oga';
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 7906241f79b..3261708f590 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -26,7 +26,10 @@ require_once('apps/user_ldap/user_ldap.php');
 OC_APP::registerAdmin('user_ldap','settings');
 
 // define LDAP_DEFAULT_PORT
-define("OC_USER_BACKEND_LDAP_DEFAULT_PORT", 389);
+define('OC_USER_BACKEND_LDAP_DEFAULT_PORT', 389);
+
+// define OC_USER_BACKEND_LDAP_DEFAULT_DISPLAY_NAME
+define('OC_USER_BACKEND_LDAP_DEFAULT_DISPLAY_NAME', 'uid');
 
 // register user backend
 OC_User::useBackend( "LDAP" );
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 8dbd3c0462b..1f2d8ed9af3 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -20,11 +20,21 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_password', 'ldap_base', 'ldap_filter');
+$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_password', 'ldap_base', 'ldap_filter', 'ldap_display_name', 'ldap_tls', 'ldap_nocase');
 
-foreach($params as $param){
-	if(isset($_POST[$param])){
-		OC_Appconfig::setValue('user_ldap', $param, $_POST[$param]);
+if ($_POST) {
+	foreach($params as $param){
+		if(isset($_POST[$param])){
+			OC_Appconfig::setValue('user_ldap', $param, $_POST[$param]);
+		}
+		elseif('ldap_tls' == $param) {
+			// unchecked checkboxes are not included in the post paramters
+				OC_Appconfig::setValue('user_ldap', $param, 0);		
+		}
+		elseif('ldap_nocase' == $param) {
+			OC_Appconfig::setValue('user_ldap', $param, 0);
+		}
+		
 	}
 }
 
@@ -38,4 +48,7 @@ foreach($params as $param){
 // ldap_port has a default value
 $tmpl->assign( 'ldap_port', OC_Appconfig::getValue('user_ldap', 'ldap_port', OC_USER_BACKEND_LDAP_DEFAULT_PORT));
 
+// ldap_display_name has a default value
+$tmpl->assign( 'ldap_display_name', OC_Appconfig::getValue('user_ldap', 'ldap_display_name', OC_USER_BACKEND_LDAP_DEFAULT_DISPLAY_NAME));
+
 return $tmpl->fetchPage();
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 32e1b29dafb..2abb0b47291 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -1,12 +1,17 @@
 <form id="ldap" action="#" method="post">
 	<fieldset class="personalblock">
 		<legend><strong>LDAP</strong></legend>
-		<p><label for="ldap_host">Host<input type="text" id="ldap_host" name="ldap_host" value="<?php echo $_['ldap_host']; ?>"></label>
-		<label for="ldap_port">Port</label><input type="text" id="ldap_port" name="ldap_port" value="<?php echo $_['ldap_port']; ?>" /></p>
-		<p><label for="ldap_dn">Name</label><input type="text" id="ldap_dn" name="ldap_dn" value="<?php echo $_['ldap_dn']; ?>" />
-		<label for="ldap_password">Password</label><input type="password" id="ldap_password" name="ldap_password" value="<?php echo $_['ldap_password']; ?>" /></p>
-		<p><label for="ldap_base">Base</label><input type="text" id="ldap_base" name="ldap_base" value="<?php echo $_['ldap_base']; ?>" />
-		<label for="ldap_filter">Filter (use %uid placeholder)</label><input type="text" id="ldap_filter" name="ldap_filter" value="<?php echo $_['ldap_filter']; ?>" /></p>
+		<p><label for="ldap_host"><?php echo $l->t('Host');?><input type="text" id="ldap_host" name="ldap_host" value="<?php echo $_['ldap_host']; ?>"></label>
+		<label for="ldap_port"><?php echo $l->t('Port');?></label><input type="text" id="ldap_port" name="ldap_port" value="<?php echo $_['ldap_port']; ?>" /></p>
+		<p><label for="ldap_dn"><?php echo $l->t('Name');?></label><input type="text" id="ldap_dn" name="ldap_dn" value="<?php echo $_['ldap_dn']; ?>" />
+		<label for="ldap_password"><?php echo $l->t('Password');?></label><input type="password" id="ldap_password" name="ldap_password" value="<?php echo $_['ldap_password']; ?>" />
+		<small><?php echo $l->t('Leave both empty for anonymous bind for search, then bind with users credentials.');?></small></p>
+		<p><label for="ldap_base"><?php echo $l->t('Base');?></label><input type="text" id="ldap_base" name="ldap_base" value="<?php echo $_['ldap_base']; ?>" />
+		<label for="ldap_filter"><?php echo $l->t('Filter (use %%uid placeholder)');?></label><input type="text" id="ldap_filter" name="ldap_filter" value="<?php echo $_['ldap_filter']; ?>" /></p>
+		<p><label for="ldap_display_name"><?php echo $l->t('Display Name Field');?></label><input type="text" id="ldap_display_name" name="ldap_display_name" value="<?php echo $_['ldap_display_name']; ?>" />
+		<small><?php echo $l->t('Currently the display name field needs to be the same you matched %%uid against in the filter above, because ownCloud doesn\'t distinguish between user id and user name.');?></small></p>
+		<p><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1"<?php if ($_['ldap_tls']) echo ' checked'; ?>><label for="ldap_tls"><?php echo $l->t('Use TLS');?></label></p>
+		<p><input type="checkbox" id="ldap_nocase" name="ldap_nocase" value="1"<?php if ($_['ldap_nocase']) echo ' checked'; ?>><label for="ldap_nocase"><?php echo $l->t('Case insensitve LDAP server (Windows)');?></label></p>
 		<input type="submit" value="Save" />
 	</fieldset>
 </form>
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 1154efc17b1..106240e74b8 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -33,6 +33,9 @@ class OC_USER_LDAP extends OC_User_Backend {
 	protected $ldap_password;
 	protected $ldap_base;
 	protected $ldap_filter;
+	protected $ldap_tls;
+	protected $ldap_nocase;
+	protected $ldap_display_name;
 
 	function __construct() {
 		$this->ldap_host = OC_Appconfig::getValue('user_ldap', 'ldap_host','');
@@ -41,13 +44,16 @@ class OC_USER_LDAP extends OC_User_Backend {
 		$this->ldap_password = OC_Appconfig::getValue('user_ldap', 'ldap_password','');
 		$this->ldap_base = OC_Appconfig::getValue('user_ldap', 'ldap_base','');
 		$this->ldap_filter = OC_Appconfig::getValue('user_ldap', 'ldap_filter','');
+		$this->ldap_tls = OC_Appconfig::getValue('user_ldap', 'ldap_tls', 0);
+		$this->ldap_nocase = OC_Appconfig::getValue('user_ldap', 'ldap_nocase', 0);
+		$this->ldap_display_name = OC_Appconfig::getValue('user_ldap', 'ldap_display_name', OC_USER_BACKEND_LDAP_DEFAULT_DISPLAY_NAME);
 
 		if( !empty($this->ldap_host)
 			&& !empty($this->ldap_port)
-			&& !empty($this->ldap_dn)
-			&& !empty($this->ldap_password)
+			&& ((!empty($this->ldap_dn) && !empty($this->ldap_password)) || (empty($this->ldap_dn) && empty($this->ldap_password)))
 			&& !empty($this->ldap_base)
 			&& !empty($this->ldap_filter)
+			&& !empty($this->ldap_display_name)
 		)
 		{
 			$this->configured = true;
@@ -63,9 +69,10 @@ class OC_USER_LDAP extends OC_User_Backend {
 	private function getDs() {
 		if(!$this->ds) {
 			$this->ds = ldap_connect( $this->ldap_host, $this->ldap_port );
-			   if(ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3))
-				 if(ldap_set_option($this->ds, LDAP_OPT_REFERRALS, 0))
-					  ldap_start_tls($this->ds);
+				if(ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3))
+					if(ldap_set_option($this->ds, LDAP_OPT_REFERRALS, 0))
+						if($this->ldap_tls)
+							ldap_start_tls($this->ds);
 		}
 
 		// login
@@ -88,15 +95,16 @@ class OC_USER_LDAP extends OC_User_Backend {
 			return false;
 
 		// get dn
-		$filter = str_replace("%uid", $uid, $this->ldap_filter);
+		$filter = str_replace('%uid', $uid, $this->ldap_filter);
 		$sr = ldap_search( $this->getDs(), $this->ldap_base, $filter );
 		$entries = ldap_get_entries( $this->getDs(), $sr );
 
-		if( $entries["count"] == 0 )
+		if( $entries['count'] == 0 )
 			return false;
 
-		return $entries[0]["dn"];
+		return $entries[0]['dn'];
 	}
+
 	public function checkPassword( $uid, $password ) {
 		if(!$this->configured){
 			return false;
@@ -107,7 +115,28 @@ class OC_USER_LDAP extends OC_User_Backend {
 
 		if (!@ldap_bind( $this->getDs(), $dn, $password ))
 			return false;
-		return $uid;
+		
+		if($this->ldap_nocase) {
+			$filter = str_replace('%uid', $uid, $this->ldap_filter);
+			$sr = ldap_search( $this->getDs(), $this->ldap_base, $filter );
+			$entries = ldap_get_entries( $this->getDs(), $sr );
+			if( $entries['count'] == 1 ) {
+				foreach($entries as $row) {
+					$ldap_display_name  = strtolower($this->ldap_display_name);					
+					if(isset($row[$ldap_display_name])) {					
+						return $row[$ldap_display_name][0];
+					}
+				}
+			}
+			else {
+				return $uid;
+			}
+			
+		}
+		else {
+			return $uid;
+		}
+		
 	}
 
 	public function userExists( $uid ) {
@@ -117,6 +146,37 @@ class OC_USER_LDAP extends OC_User_Backend {
 		$dn = $this->getDn($uid);
 		return !empty($dn);
 	}
+	
+	public function getUsers()
+	{
+		if(!$this->configured)
+		return false;
+	
+		// connect to server
+		$ds = $this->getDs();
+		if( !$ds )
+			return false;
+	
+		// get users
+		$filter = 'objectClass=person';
+		$sr = ldap_search( $this->getDs(), $this->ldap_base, $filter );
+		$entries = ldap_get_entries( $this->getDs(), $sr );
+		if( $entries['count'] == 0 )
+			return false;
+		else {
+			$users = array();
+			foreach($entries as $row) {
+				// TODO ldap_get_entries() seems to lower all keys => needs review
+				$ldap_display_name  = strtolower($this->ldap_display_name);
+				if(isset($row[$ldap_display_name])) {
+					$users[] = $row[$ldap_display_name][0];					
+				}
+			}
+			// TODO language specific sorting of user names
+			sort($users);
+			return $users;
+		}
+	}
 
 }
 
diff --git a/core/css/styles.css b/core/css/styles.css
index bfdcc54c364..d1c648383c0 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -98,14 +98,6 @@ label.infield { cursor: text !important; }
 #expand+span { position:relative; bottom:.4em; left:.2em; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; }
 #logout { position:absolute; right:0; top:0; padding:1.2em 2em .55em 1.2em; }
 
-/* BREADCRUMB */
-
-div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
-div.crumb:first-child { padding-left:1em; }
-div.crumb.last { font-weight:bold; }
-/* add breadcrumb divider to the File item in navigation panel */
-#navigation>ul>li:first-child { background:url('../../core/img/breadcrumb-start.svg') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; position:fixed; }
-#navigation>ul>li:first-child+li { padding-top:2.9em; }
 
 /* VARIOUS REUSABLE SELECTORS */
 .hidden { display:none; }
diff --git a/core/js/jquery-tipsy.js b/core/js/jquery-tipsy.js
index 9567ed3bacc..ef4bbfd87a1 100644
--- a/core/js/jquery-tipsy.js
+++ b/core/js/jquery-tipsy.js
@@ -31,6 +31,10 @@
                     height: this.$element[0].offsetHeight
                 });
                 
+                if (this.options.className) {
+                    $tip.addClass(maybeCall(this.options.className, this.$element[0]));
+                }
+
                 var actualWidth = $tip[0].offsetWidth,
                     actualHeight = $tip[0].offsetHeight,
                     gravity = maybeCall(this.options.gravity, this.$element[0]);
@@ -61,9 +65,6 @@
                 
                 $tip.css(tp).addClass('tipsy-' + gravity);
                 $tip.find('.tipsy-arrow')[0].className = 'tipsy-arrow tipsy-arrow-' + gravity.charAt(0);
-                if (this.options.className) {
-                    $tip.addClass(maybeCall(this.options.className, this.$element[0]));
-                }
                 
                 if (this.options.fade) {
                     $tip.stop().css({opacity: 0, display: 'block', visibility: 'visible'}).animate({opacity: this.options.opacity});
diff --git a/files/css/files.css b/files/css/files.css
index 6bb3ae28bff..22f4810d0a6 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -41,6 +41,9 @@ tbody a { color:#000; }
 span.extention, td.date { color:#999; }
 span.extention { opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
 tr:hover span.extention { opacity:1; }
+div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
+div.crumb:first-child { padding-left:1em; }
+div.crumb.last { font-weight:bold; }
 table tr.mouseOver td { background-color:#eee; }
 table th { height:2em; padding:0 .5em; color:#999; }
 table th .name { float:left; margin-left:.5em; }
@@ -66,4 +69,8 @@ table thead.fixed { height:2em; }
 #select_all { float:left; margin:.3em 0.6em 0 .5em; }
 #uploadsize-message,#delete-confirm { display:none; }
 .selectedActions a,#fileList a.action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; }
-.selectedActions { display:none; }
\ No newline at end of file
+.selectedActions { display:none; }
+
+/* add breadcrumb divider to the File item in navigation panel */
+#navigation>ul>li:first-child { background:url('../../core/img/breadcrumb-start.svg') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; position:fixed; }
+#navigation>ul>li:first-child+li { padding-top:2.9em; }
\ No newline at end of file
diff --git a/files/index.php b/files/index.php
index 8bb5b618d87..4b3bbd1bfd4 100644
--- a/files/index.php
+++ b/files/index.php
@@ -89,6 +89,10 @@ $upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'
 $post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
 $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 
+$freeSpace=OC_Filesystem::free_space('/');
+$freeSpace=max($freeSpace,0);
+$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
+
 $tmpl = new OC_Template( "files", "index", "user" );
 $tmpl->assign( "fileList", $list->fetchPage() );
 $tmpl->assign( "breadcrumb", $breadcrumbNav->fetchPage() );
diff --git a/files/js/files.js b/files/js/files.js
index 4eaa098241b..53437453ff9 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -14,8 +14,8 @@ $(document).ready(function() {
 	$('#fileList tr td.filename').draggable(dragOptions);
 	$('#fileList tr[data-type="dir"] td.filename').droppable(folderDropOptions);
 	$('div.crumb').droppable(crumbDropOptions);
-	$('#plugins>ul>li:first-child').data('dir','');
-	$('#plugins>ul>li:first-child').droppable(crumbDropOptions);
+	$('ul#apps>li:first-child').data('dir','');
+	$('ul#apps>li:first-child').droppable(crumbDropOptions);
 	
 	// Triggers invisible file input
 	$('.file_upload_button_wrapper').live('click', function() {
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 66cc90a4bfd..56fce2285ec 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
+"POT-Creation-Date: 2011-10-22 13:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,318 +17,180 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr ""
-
-#: ajax/editeventform.php:25
+#: ajax/editeventform.php:26
 msgid "Wrong calendar"
 msgstr ""
 
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr ""
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:21 templates/calendar.php:11
+#: templates/part.eventform.php:21
 msgid "Calendar"
 msgstr ""
 
-#: lib/object.php:292
+#: js/calendar.js:153
+msgid "ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}"
+msgstr ""
+
+#: js/calendar.js:155
+msgid "ddd d MMMM[ yyyy] HH:mm{ -[ ddd d MMMM yyyy] HH:mm}"
+msgstr ""
+
+#: lib/object.php:344
 msgid "Birthday"
 msgstr ""
 
-#: lib/object.php:293
+#: lib/object.php:345
 msgid "Business"
 msgstr ""
 
-#: lib/object.php:294
+#: lib/object.php:346
 msgid "Call"
 msgstr ""
 
-#: lib/object.php:295
+#: lib/object.php:347
 msgid "Clients"
 msgstr ""
 
-#: lib/object.php:296
+#: lib/object.php:348
 msgid "Deliverer"
 msgstr ""
 
-#: lib/object.php:297
+#: lib/object.php:349
 msgid "Holidays"
 msgstr ""
 
-#: lib/object.php:298
+#: lib/object.php:350
 msgid "Ideas"
 msgstr ""
 
-#: lib/object.php:299
+#: lib/object.php:351
 msgid "Journey"
 msgstr ""
 
-#: lib/object.php:300
+#: lib/object.php:352
 msgid "Jubilee"
 msgstr ""
 
-#: lib/object.php:301
+#: lib/object.php:353
 msgid "Meeting"
 msgstr ""
 
-#: lib/object.php:302
+#: lib/object.php:354
 msgid "Other"
 msgstr ""
 
-#: lib/object.php:303
+#: lib/object.php:355
 msgid "Personal"
 msgstr ""
 
-#: lib/object.php:304
+#: lib/object.php:356
 msgid "Projects"
 msgstr ""
 
-#: lib/object.php:305
+#: lib/object.php:357
 msgid "Questions"
 msgstr ""
 
-#: lib/object.php:306
+#: lib/object.php:358
 msgid "Work"
 msgstr ""
 
-#: lib/object.php:313
+#: lib/object.php:365
 msgid "Does not repeat"
 msgstr ""
 
-#: lib/object.php:314
+#: lib/object.php:366
 msgid "Daily"
 msgstr ""
 
-#: lib/object.php:315
+#: lib/object.php:367
 msgid "Weekly"
 msgstr ""
 
-#: lib/object.php:316
+#: lib/object.php:368
 msgid "Every Weekday"
 msgstr ""
 
-#: lib/object.php:317
+#: lib/object.php:369
 msgid "Bi-Weekly"
 msgstr ""
 
-#: lib/object.php:318
+#: lib/object.php:370
 msgid "Monthly"
 msgstr ""
 
-#: lib/object.php:319
+#: lib/object.php:371
 msgid "Yearly"
 msgstr ""
 
-#: lib/object.php:337
+#: lib/object.php:389
 msgid "Not an array"
 msgstr ""
 
-#: templates/calendar.php:3
+#: templates/calendar.php:8
 msgid "All day"
 msgstr ""
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr ""
-
-#: templates/calendar.php:32
-msgid "Monday"
-msgstr ""
-
-#: templates/calendar.php:32
-msgid "Tuesday"
-msgstr ""
-
-#: templates/calendar.php:32
-msgid "Wednesday"
-msgstr ""
-
-#: templates/calendar.php:32
-msgid "Thursday"
-msgstr ""
-
-#: templates/calendar.php:32
-msgid "Friday"
-msgstr ""
-
-#: templates/calendar.php:32
-msgid "Saturday"
-msgstr ""
-
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr ""
-
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr ""
-
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr ""
-
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr ""
-
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr ""
-
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr ""
-
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr ""
-
-#: templates/calendar.php:34
-msgid "January"
-msgstr ""
-
-#: templates/calendar.php:34
-msgid "February"
-msgstr ""
-
-#: templates/calendar.php:34
-msgid "March"
-msgstr ""
-
-#: templates/calendar.php:34
-msgid "April"
-msgstr ""
-
-#: templates/calendar.php:34
-msgid "May"
-msgstr ""
-
-#: templates/calendar.php:34
-msgid "June"
-msgstr ""
-
-#: templates/calendar.php:34
-msgid "July"
-msgstr ""
-
-#: templates/calendar.php:34
-msgid "August"
-msgstr ""
-
-#: templates/calendar.php:34
-msgid "September"
-msgstr ""
-
-#: templates/calendar.php:34
-msgid "October"
-msgstr ""
-
-#: templates/calendar.php:34
-msgid "November"
-msgstr ""
-
-#: templates/calendar.php:34
-msgid "December"
-msgstr ""
-
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr ""
-
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr ""
-
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr ""
-
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr ""
-
-#: templates/calendar.php:35
-msgid "May."
+#: templates/calendar.php:9
+msgid "Missing fields"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jun."
+#: templates/calendar.php:10 templates/part.eventform.php:3
+msgid "Title"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jul."
+#: templates/calendar.php:12
+msgid "From Date"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Aug."
+#: templates/calendar.php:13
+msgid "From Time"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Sep."
+#: templates/calendar.php:14
+msgid "To Date"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Oct."
+#: templates/calendar.php:15
+msgid "To Time"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Nov."
+#: templates/calendar.php:16
+msgid "The event ends before it starts"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Dec."
+#: templates/calendar.php:17
+msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
+#: templates/calendar.php:23
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr ""
-
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr ""
-
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr ""
-
-#: templates/calendar.php:49
-msgid "Day"
-msgstr ""
-
-#: templates/calendar.php:52
+#: templates/calendar.php:24
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:53
+#: templates/calendar.php:25
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:58
+#: templates/calendar.php:30
 msgid "Today"
 msgstr ""
 
-#: templates/calendar.php:59
+#: templates/calendar.php:31
 msgid "Calendars"
 msgstr ""
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr ""
-
-#: templates/calendar.php:169
+#: templates/calendar.php:48
 msgid "There was a fail, while parsing the file."
 msgstr ""
 
@@ -350,7 +212,6 @@ msgid "Download"
 msgstr ""
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr ""
 
@@ -367,7 +228,7 @@ msgstr ""
 msgid "Edit calendar"
 msgstr ""
 
-#: templates/part.editcalendar.php:12
+#: templates/part.editcalendar.php:12 templates/part.import.php:29
 msgid "Displayname"
 msgstr ""
 
@@ -375,88 +236,135 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr ""
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr ""
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
 msgstr ""
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:7
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
 msgstr ""
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr ""
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
+#: templates/part.editevent.php:9
+msgid "Export"
 msgstr ""
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr ""
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr ""
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr ""
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr ""
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
 msgstr ""
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:39
 msgid "All Day Event"
 msgstr ""
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:43
 msgid "From"
 msgstr ""
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:51
 msgid "To"
 msgstr ""
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:59
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:64
 msgid "Repeat"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
+#: templates/part.eventform.php:80
 msgid "Attendees"
 msgstr ""
 
+#: templates/part.eventform.php:87
+msgid "Location"
+msgstr ""
+
 #: templates/part.eventform.php:89
+msgid "Location of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:95
+msgid "Description"
+msgstr ""
+
+#: templates/part.eventform.php:96
 msgid "Description of the Event"
 msgstr ""
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
+#: templates/part.import.php:1
+msgid "Import Ical File"
+msgstr ""
+
+#: templates/part.import.php:4
+msgid "How to import the new calendar?"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Import into an existing calendar"
+msgstr ""
+
+#: templates/part.import.php:7
+msgid "Import into a new calendar"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "Please choose the calendar"
+msgstr ""
+
+#: templates/part.import.php:20 templates/part.import.php:37
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:22 templates/part.import.php:39
+msgid "Back"
+msgstr ""
+
+#: templates/part.import.php:25
+msgid "Please fill out the form"
 msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr ""
diff --git a/lib/app.php b/lib/app.php
index 30ebcf032b3..d3d99865762 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -100,11 +100,11 @@ class OC_App{
 	}
 
 	/**
-	 * @brief enables an app
+	 * @brief disables an app
 	 * @param $app app
 	 * @returns true/false
 	 *
-	 * This function set an app as enabled in appconfig.
+	 * This function set an app as disabled in appconfig.
 	 */
 	public static function disable( $app ){
 		OC_Appconfig::setValue( $app, 'enabled', 'no' );
diff --git a/lib/base.php b/lib/base.php
index c52b4493e01..700236c96c6 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -92,6 +92,14 @@ class OC{
 			$_SERVER['PHP_AUTH_PW'] = strip_tags($password);
 		}
 
+		//set http auth headers for apache+php-cgi work around if variable gets renamed by apache
+		if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches))
+		{
+			list($name, $password) = explode(':', base64_decode($matches[1]));
+			$_SERVER['PHP_AUTH_USER'] = strip_tags($name);
+			$_SERVER['PHP_AUTH_PW'] = strip_tags($password);
+		}
+
 		// calculate the documentroot
 		OC::$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
 		OC::$SERVERROOT=str_replace("\\",'/',substr(__FILE__,0,-13));
diff --git a/lib/config.php b/lib/config.php
index 2c82036257f..8d03271b3ea 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -94,7 +94,6 @@ class OC_Config{
 
 		// Write changes
 		self::writeData();
-
 		return true;
 	}
 
diff --git a/lib/hook.php b/lib/hook.php
index b069a7da6c0..83a16106bf0 100644
--- a/lib/hook.php
+++ b/lib/hook.php
@@ -20,7 +20,7 @@ class OC_Hook{
 	 * TODO: write example
 	 */
 	static public function connect( $signalclass, $signalname, $slotclass, $slotname ){
-		// Cerate the data structure
+		// Create the data structure
 		if( !array_key_exists( $signalclass, self::$registered )){
 			self::$registered[$signalclass] = array();
 		}
diff --git a/lib/l10n.php b/lib/l10n.php
index 54331d44ae4..a5544eb3a27 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -109,6 +109,22 @@ class OC_L10N{
 		return vsprintf($text, $parameters);
 	}
 
+	/**
+	 * @brief Translating
+	 * @param $textArray The text array we need a translation for
+	 * @returns Translation or the same text
+	 *
+	 * Returns the translation. If no translation is found, $textArray will be
+	 * returned.
+	 */
+	public function tA($textArray){
+		$result = array();
+		foreach($textArray as $key => $text){
+			$result[$key] = $this->t($text);
+		}
+		return $result;
+	}
+
 	/**
 	 * @brief getTranslations
 	 * @returns Fetch all translations
diff --git a/lib/setup.php b/lib/setup.php
index e2d56ddaf4a..8afe0070e9b 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -77,6 +77,8 @@ class OC_Setup {
 			OC_Config::setValue('datadirectory', $datadir);
  			OC_Config::setValue('dbtype', $dbtype);
  			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
+ 			OC_Config::setValue('installedat',microtime(true));
+ 			OC_Config::setValue('lastupdatedat',microtime(true));
 			if($dbtype == 'mysql') {
 				$dbuser = $options['dbuser'];
 				$dbpass = $options['dbpass'];
diff --git a/lib/template.php b/lib/template.php
index 440b62003e7..881d2a27b1e 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -98,6 +98,33 @@ function relative_modified_date($timestamp) {
 	else { return $l->t('years ago'); }
 }
 
+function html_select_options($options, $selected, $params=array()) {
+	if (!is_array($selected)){
+		$selected=array($selected);
+	}
+	if (isset($params['combine']) && $params['combine']){
+		$options = array_combine($options, $options);
+	}
+	$value_name = $label_name = false;
+	if (isset($params['value'])){
+		$value_name = $params['value'];
+	}
+	if (isset($params['label'])){
+		$label_name = $params['label'];
+	}
+	$html = '';
+	foreach($options as $value => $label){
+		if ($value_name && is_array($label)){
+			$value = $label[$value_name];
+		}
+		if ($label_name && is_array($label)){
+			$label = $label[$label_name];
+		}
+		$select = in_array($value, $selected) ? ' selected="selected"' : '';
+		$html .= '<option value="' . $value . '"' . $select . '>' . $label . '</option>'."\n";
+	}
+	return $html;
+}
 
 /**
  * This class provides the templates for owncloud.
diff --git a/lib/updater.php b/lib/updater.php
new file mode 100644
index 00000000000..e4db719a62c
--- /dev/null
+++ b/lib/updater.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Frank Karlitschek
+ * @copyright 2010 Frank Karlitschek karlitschek@kde.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Class that handels autoupdating of ownCloud
+ */
+class OC_Updater{
+
+	/**
+	 * Check if a new version is available
+	 */
+	public static function check(){
+		OC_Config::setValue('lastupdatedat',microtime(true));
+
+		$updaterurl='http://apps.owncloud.com/updater.php';
+		$version=OC_Util::getVersion();
+		$version['installed']=OC_Config::getValue( "installedat");
+		$version['updated']=OC_Config::getValue( "lastupdatedat");
+		$version['updatechannel']='stable';
+		$versionstring=implode('x',$version);
+
+		//fetch xml data from updater
+		$url=$updaterurl.'?version='.$versionstring;
+                $xml=@file_get_contents($url);
+                if($xml==FALSE){
+                        return array();
+                }
+                $data=@simplexml_load_string($xml);
+
+		$tmp=array();
+                $tmp['version'] = $data->version;
+                $tmp['versionstring'] = $data->versionstring;
+                $tmp['url'] = $data->url;
+                $tmp['web'] = $data->web;
+
+
+                return $tmp;
+
+	}
+
+
+
+	public static function ShowUpdatingHint(){
+		$data=OC_Updater::check();
+		if(isset($data['version']) and $data['version']<>'') {
+			$txt='<span style="color:#AA0000; font-weight:bold;">'.$data['versionstring'].' is available. Please click <a href="'.$data['web'].'">here</a> for more information</span>';
+		}else{
+			$txt='Your ownCloud is up to date';
+		}
+		return($txt);
+
+	}
+
+
+	/**
+	 * do ownCloud update
+	 */
+	public static function doUpdate(){
+
+		//update ownCloud core
+
+		//update all apps
+
+		//update version in config
+
+	}
+
+}
+
+
+
+?>
diff --git a/lib/util.php b/lib/util.php
index 14313569a1d..0f79948bc24 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -180,7 +180,6 @@ class OC_Util {
 		}
 		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
 		$CONFIG_DBNAME = OC_Config::getValue( "dbname", "owncloud" );
-                $serverUser=OC_Util::checkWebserverUser();
 
 		//common hint for all file permissons error messages
 		$permissionsHint="Permissions can usually be fixed by giving the webserver write access to the ownCloud directory";
@@ -239,21 +238,6 @@ class OC_Util {
 		OC_Template::printGuestPage("", "login", $parameters);
 	}
 
-	/**
-	* Try to get the username the httpd server runs on, used in hints
-	*/
-	public static function checkWebserverUser(){
-		if(is_callable('posix_getuid')){
-			$serverUser=posix_getpwuid(posix_getuid());
-			$serverUser='\''.$serverUser['name'].'\'';
-		}elseif(exec('whoami')){
-			$serverUser=exec('whoami');
-		}else{
-			$serverUser='\'www-data\' for ubuntu/debian'; //TODO: try to detect the distro and give a guess based on that
-		}
-		return $serverUser;
-	}
-
 
 	/**
 	* Check if the app is enabled, send json error msg if not
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 54487165f3c..8c5de5ccf2a 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -50,7 +50,9 @@
 };?>
 
 <p class="personalblock">
-	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?>, <a href="http://gitorious.org/owncloud" target="_blank">source code</a> licensed freely under <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank">AGPL</a>
+	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?><br />
+	<?php echo(OC_Updater::ShowUpdatingHint());     ?><br />
+	<a href="http://gitorious.org/owncloud" target="_blank">source code</a> licensed freely under <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank">AGPL</a>
 </p>
 
 
-- 
GitLab


From bf719d6670840e227cc60f3a26d536b9971dc391 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Tue, 29 Nov 2011 22:54:51 +0000
Subject: [PATCH 033/546] Disable save button whilst saving. Refined code.

---
 apps/files_texteditor/js/editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index c3c051944e3..94402dd00d8 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -243,7 +243,7 @@ $(document).ready(function(){
 			showFileEditor(dir,file);
 		});
 	}
-	// Binds the file save and close editor events to the buttons
+	// Binds the file save and close editor events
 	bindControlEvents();
 	
 	// Binds the save keyboard shortcut events
-- 
GitLab


From 21d613cbc651d537c6fe145a8ddbec99a56035d1 Mon Sep 17 00:00:00 2001
From: Thomas Olsen <tol@tanghus>
Date: Thu, 1 Dec 2011 02:02:45 +0100
Subject: [PATCH 034/546] Added export.php for contacts app. Works the same way
 as the one in the calendar app, except there is no UI for it. Fixed
 indentation in /index.php

---
 apps/contacts/export.php | 44 ++++++++++++++++++++++++++++++++++++++++
 index.php                | 17 ++++++++--------
 2 files changed, 53 insertions(+), 8 deletions(-)
 create mode 100644 apps/contacts/export.php

diff --git a/apps/contacts/export.php b/apps/contacts/export.php
new file mode 100644
index 00000000000..3c74d7f553a
--- /dev/null
+++ b/apps/contacts/export.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once ("../../lib/base.php");
+OC_Util::checkLoggedIn();
+OC_Util::checkAppEnabled('contacts');
+$book = isset($_GET["bookid"]) ? $_GET["bookid"] : NULL;
+$contact = isset($_GET["contactid"]) ? $_GET["contactid"] : NULL;
+if(isset($book)){
+	OC_Log::write('contacts',"book isset($book)",OC_Log::DEBUG);
+	$addressbook = OC_Contacts_Addressbook::find($book);
+	OC_Log::write('contacts',"Got addressbook",OC_Log::DEBUG);
+	OC_Log::write('contacts',"userid: {$addressbook["userid"]}",OC_Log::DEBUG);
+	if($addressbook["userid"] != OC_User::getUser()){
+		OC_JSON::error();
+		exit;
+	}
+	OC_Log::write('contacts',"User match",OC_Log::DEBUG);
+	$cardobjects = OC_Contacts_VCard::all($book);
+	header("Content-Type: text/directory");
+	header("Content-Disposition: inline; filename=addressbook.vcf"); 
+	for($i = 0;$i <= count($cardobjects); $i++){
+		echo $cardobjects[$i]["carddata"] . "\n";
+	}
+}elseif(isset($contact)){	
+	OC_Log::write('contacts',"contact isset($contact)",OC_Log::DEBUG);
+	$data = OC_Contacts_VCard::find($contact);
+	$addressbookid = $data["addressbookid"];
+	OC_Log::write('contacts',"addressbookid: $addressbookid",OC_Log::DEBUG);
+	$addressbook = OC_Contacts_Addressbook::find($addressbookid);
+	if($addressbook["userid"] != OC_User::getUser()){
+		OC_JSON::error();
+		exit;
+	}
+	header("Content-Type: text/directory");
+	header("Content-Disposition: inline; filename=" . $data["fullname"] . ".vcf"); 
+	echo $data["carddata"];
+}
+?>
diff --git a/index.php b/index.php
index 558733e1cda..7ead0fb48a7 100644
--- a/index.php
+++ b/index.php
@@ -100,14 +100,15 @@ else {
 			$error = true;
 		}
 	}
-		// The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
-		elseif(isset($_SERVER["PHP_AUTH_USER"]) && isset($_SERVER["PHP_AUTH_PW"])){
-			if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"]))	{
-				OC_User::unsetMagicInCookie();
-				OC_Util::redirectToDefaultPage();
-			}else{
-				$error = true;
-			}
+	// The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
+	elseif(isset($_SERVER["PHP_AUTH_USER"]) && isset($_SERVER["PHP_AUTH_PW"])){
+		if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"]))	{
+			//OC_Log::write('core',"Logged in with HTTP Authentication",OC_Log::DEBUG);
+			OC_User::unsetMagicInCookie();
+			OC_Util::redirectToDefaultPage();
+		}else{
+			$error = true;
 		}
+	}
 	OC_Template::printGuestPage('', 'login', array('error' => $error, 'redirect' => isset($_REQUEST['redirect_url'])?$_REQUEST['redirect_url']:'' ));
 }
-- 
GitLab


From 58d1a3516af1450c6d82f75384bfb2a3f8ea3282 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 1 Dec 2011 16:06:27 +0100
Subject: [PATCH 035/546] Removed some debug statements. Changed double quotes
 to single quotes.

---
 apps/calendar/export.php | 26 +++++++++++++-------------
 apps/contacts/export.php | 28 +++++++++++-----------------
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/apps/calendar/export.php b/apps/calendar/export.php
index 3e93a1ad618..1647bf14a99 100644
--- a/apps/calendar/export.php
+++ b/apps/calendar/export.php
@@ -6,33 +6,33 @@
  * See the COPYING-README file.
  */
 
-require_once ("../../lib/base.php");
+require_once ('../../lib/base.php');
 OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('calendar');
-$cal = isset($_GET["calid"]) ? $_GET["calid"] : NULL;
-$event = isset($_GET["eventid"]) ? $_GET["eventid"] : NULL;
+$cal = isset($_GET['calid']) ? $_GET['calid'] : NULL;
+$event = isset($_GET['eventid']) ? $_GET['eventid'] : NULL;
 if(isset($cal)){
 	$calendar = OC_Calendar_Calendar::findCalendar($cal);
-	if($calendar["userid"] != OC_User::getUser()){
+	if($calendar['userid'] != OC_User::getUser()){
 		OC_JSON::error();
 		exit;
 	}
 	$calobjects = OC_Calendar_Object::all($cal);
-	header("Content-Type: text/Calendar");
-	header("Content-Disposition: inline; filename=calendar.ics"); 
+	header('Content-Type: text/Calendar');
+	header('Content-Disposition: inline; filename=' . $calendar['displayname'] . '.ics'); 
 	for($i = 0;$i <= count($calobjects); $i++){
-		echo $calobjects[$i]["calendardata"] . "\n";
+		echo $calobjects[$i]['calendardata'] . '\n';
 	}
 }elseif(isset($event)){
-	$data = OC_Calendar_Object::find($_GET["eventid"]);
-	$calendarid = $data["calendarid"];
+	$data = OC_Calendar_Object::find($_GET['eventid']);
+	$calendarid = $data['calendarid'];
 	$calendar = OC_Calendar_Calendar::findCalendar($calendarid);
-	if($calendar["userid"] != OC_User::getUser()){
+	if($calendar['userid'] != OC_User::getUser()){
 		OC_JSON::error();
 		exit;
 	}
-	header("Content-Type: text/Calendar");
-	header("Content-Disposition: inline; filename=" . $data["summary"] . ".ics"); 
-	echo $data["calendardata"];
+	header('Content-Type: text/Calendar');
+	header('Content-Disposition: inline; filename=' . $data['summary'] . '.ics'); 
+	echo $data['calendardata'];
 }
 ?>
diff --git a/apps/contacts/export.php b/apps/contacts/export.php
index 3c74d7f553a..4a1e7a172d4 100644
--- a/apps/contacts/export.php
+++ b/apps/contacts/export.php
@@ -9,36 +9,30 @@
 require_once ("../../lib/base.php");
 OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
-$book = isset($_GET["bookid"]) ? $_GET["bookid"] : NULL;
-$contact = isset($_GET["contactid"]) ? $_GET["contactid"] : NULL;
+$book = isset($_GET['bookid']) ? $_GET['bookid'] : NULL;
+$contact = isset($_GET['contactid']) ? $_GET['contactid'] : NULL;
 if(isset($book)){
-	OC_Log::write('contacts',"book isset($book)",OC_Log::DEBUG);
 	$addressbook = OC_Contacts_Addressbook::find($book);
-	OC_Log::write('contacts',"Got addressbook",OC_Log::DEBUG);
-	OC_Log::write('contacts',"userid: {$addressbook["userid"]}",OC_Log::DEBUG);
-	if($addressbook["userid"] != OC_User::getUser()){
+	if($addressbook['userid'] != OC_User::getUser()){
 		OC_JSON::error();
 		exit;
 	}
-	OC_Log::write('contacts',"User match",OC_Log::DEBUG);
 	$cardobjects = OC_Contacts_VCard::all($book);
-	header("Content-Type: text/directory");
-	header("Content-Disposition: inline; filename=addressbook.vcf"); 
+	header('Content-Type: text/directory');
+	header('Content-Disposition: inline; filename=' . $addressbook['displayname'] . '.vcf'); 
 	for($i = 0;$i <= count($cardobjects); $i++){
-		echo $cardobjects[$i]["carddata"] . "\n";
+		echo trim($cardobjects[$i]['carddata']) . '\n';
 	}
 }elseif(isset($contact)){	
-	OC_Log::write('contacts',"contact isset($contact)",OC_Log::DEBUG);
 	$data = OC_Contacts_VCard::find($contact);
-	$addressbookid = $data["addressbookid"];
-	OC_Log::write('contacts',"addressbookid: $addressbookid",OC_Log::DEBUG);
+	$addressbookid = $data['addressbookid'];
 	$addressbook = OC_Contacts_Addressbook::find($addressbookid);
-	if($addressbook["userid"] != OC_User::getUser()){
+	if($addressbook['userid'] != OC_User::getUser()){
 		OC_JSON::error();
 		exit;
 	}
-	header("Content-Type: text/directory");
-	header("Content-Disposition: inline; filename=" . $data["fullname"] . ".vcf"); 
-	echo $data["carddata"];
+	header('Content-Type: text/directory');
+	header('Content-Disposition: inline; filename=' . $data['fullname'] . '.vcf'); 
+	echo $data['carddata'];
 }
 ?>
-- 
GitLab


From 95ae0f23f14c9e6854999233481e107cc330d70f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 4 Dec 2011 20:25:46 +0100
Subject: [PATCH 036/546] Added UI for selecting/editing address books. Export,
 CardDAV link and activation/deactivation of address books done.

---
 apps/contacts/ajax/activation.php             |  23 ++++
 apps/contacts/ajax/addbook.php                |  19 +++
 apps/contacts/ajax/chooseaddressbook.php      |  19 +++
 apps/contacts/css/styles.css                  |   1 +
 apps/contacts/index.php                       |   7 +
 apps/contacts/js/interface.js                 | 120 ++++++++++++++++++
 apps/contacts/lib/addressbook.php             |  20 +++
 apps/contacts/templates/index.php             |  16 ++-
 .../templates/part.chooseaddressbook.php      |  23 ++++
 .../part.chooseaddressbook.rowfields.php      |   4 +
 .../templates/part.editaddressbook.php        |  31 +++++
 11 files changed, 277 insertions(+), 6 deletions(-)
 create mode 100644 apps/contacts/ajax/activation.php
 create mode 100644 apps/contacts/ajax/addbook.php
 create mode 100644 apps/contacts/ajax/chooseaddressbook.php
 create mode 100644 apps/contacts/templates/part.chooseaddressbook.php
 create mode 100644 apps/contacts/templates/part.chooseaddressbook.rowfields.php
 create mode 100644 apps/contacts/templates/part.editaddressbook.php

diff --git a/apps/contacts/ajax/activation.php b/apps/contacts/ajax/activation.php
new file mode 100644
index 00000000000..6e137692dac
--- /dev/null
+++ b/apps/contacts/ajax/activation.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
+ * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once ("../../../lib/base.php");
+if(!OC_USER::isLoggedIn()) {
+	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
+}
+OC_JSON::checkAppEnabled('contacts');
+$bookid = $_POST['bookid'];
+OC_Contacts_Addressbook::setActive($bookid, $_POST['active']);
+$book = OC_Contacts_Addressbook::find($bookid);
+
+/* is there an OC_JSON::error() ? */
+OC_JSON::success(array(
+	'active' => $book['active'],
+	'bookid' => $bookid,
+));
diff --git a/apps/contacts/ajax/addbook.php b/apps/contacts/ajax/addbook.php
new file mode 100644
index 00000000000..ce74ccf9d28
--- /dev/null
+++ b/apps/contacts/ajax/addbook.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once('../../../lib/base.php');
+$l10n = new OC_L10N('contacts');
+if(!OC_USER::isLoggedIn()) {
+	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
+}
+OC_JSON::checkAppEnabled('contacts');
+$tmpl = new OC_Template('contacts', 'part.editaddressbook');
+$tmpl->assign('new', true);
+$tmpl->assign('book', $book);
+$tmpl->printPage();
+?>
diff --git a/apps/contacts/ajax/chooseaddressbook.php b/apps/contacts/ajax/chooseaddressbook.php
new file mode 100644
index 00000000000..e150f97f541
--- /dev/null
+++ b/apps/contacts/ajax/chooseaddressbook.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once('../../../lib/base.php');
+$l10n = new OC_L10N('contacts');
+if(!OC_USER::isLoggedIn()) {
+	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
+}
+OC_JSON::checkAppEnabled('contacts');
+OC_Log::write('contacts','chooseaddressbook.php',OC_Log::DEBUG);
+
+$output = new OC_TEMPLATE("contacts", "part.chooseaddressbook");
+$output -> printpage();
+?>
diff --git a/apps/contacts/css/styles.css b/apps/contacts/css/styles.css
index f351589fe12..048f4cf9d2d 100644
--- a/apps/contacts/css/styles.css
+++ b/apps/contacts/css/styles.css
@@ -1,3 +1,4 @@
+#chooseaddressbook {margin-right: 170px; float: right; font-size: 12px;}
 #contacts_details_name { font-weight:bold;font-size:1.1em;margin-left:25%;}
 #contacts_details_photo { margin:.5em 0em .5em 25%; }
 
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 29d41d3c4c4..57c28a5761c 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -79,6 +79,13 @@ $l10n = new OC_L10N('contacts');
 $adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
 $phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
 
+// Include Style and Script
+OC_Util::addScript('contacts','interface');
+OC_Util::addStyle('contacts','styles');
+OC_Util::addStyle('contacts','formtastic');
+OC_Util::addScript('', 'jquery.multiselect');
+OC_Util::addStyle('', 'jquery.multiselect');
+
 // Process the template
 $tmpl = new OC_Template( 'contacts', 'index', 'user' );
 $tmpl->assign('adr_types',$adr_types);
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index ba1c0e536c2..077bbd2071e 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -1,3 +1,106 @@
+Contacts={
+	space:' ',
+	UI:{
+		showCardDAVUrl:function(username, bookname){
+			$('#carddav_url').val(totalurl + '/' + username + '/' + bookname);
+			$('#carddav_url').show();
+			$('#carddav_url_close').show();
+		},
+		Addressbooks:{
+			overview:function(){
+				if($('#chooseaddressbook_dialog').dialog('isOpen') == true){
+					/*alert('Address books.moveToTop');*/
+					$('#chooseaddressbook_dialog').dialog('moveToTop');
+				}else{
+					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(){
+						/*alert('Address books.load');*/
+						$('#chooseaddressbook_dialog').dialog({
+							width : 600,
+							close : function(event, ui) {
+								$(this).dialog('destroy').remove();
+							}
+						});
+					});
+				}
+			},
+			activation:function(checkbox, bookid)
+			{
+				/* TODO: 
+				 * Add integer field 'active' to table 'contacts_addressbooks'. See apps/contacts/README.tanghus */
+				$.post(OC.filePath('contacts', 'ajax', 'activation.php'), { bookid: bookid, active: checkbox.checked?1:0 },
+				  function(data) {
+					/*
+					 * Arguments:
+					 * data.status
+					 * data.bookid
+					 */
+					if (data.status == 'success'){
+						checkbox.checked = data.active == 1;
+						alert('Update Contacts list.');
+						/* TODO: Update Contacts list.
+						if (data.active == 1){
+							$('#calendar_holder').fullCalendar('addEventSource', data.eventSource);
+						}else{
+							$('#calendar_holder').fullCalendar('removeEventSource', data.eventSource.url);
+						}
+						*/
+					}
+				  });
+			},
+			newAddressbook:function(object){
+				var tr = $(document.createElement('tr'))
+					.load(OC.filePath('contacts', 'ajax', 'addbook.php'));
+				$(object).closest('tr').after(tr).hide();
+				/* TODO: Shouldn't there be some kinda error checking here? */
+			},
+			deleteAddressbook:function(bookid){
+				var check = confirm("Do you really want to delete this address book?");
+				if(check == false){
+					return false;
+				}else{
+					$.post(OC.filePath('contacts', 'ajax', 'deletebook.php'), { id: bookid},
+					  function(data) {
+						if (data.status == 'success'){
+							alert('TODO: Update Contacts list.');
+							/* TODO: Update Contacts list.
+							var url = 'ajax/deletebook.php?id='+bookid;
+							$('#calendar_holder').fullCalendar('removeEventSource', url);
+							$('#choosecalendar_dialog').dialog('destroy').remove();*/
+							Contacts.UI.Addressbooks.overview();
+						}
+					  });
+				}
+			},
+			submit:function(button, bookid){
+				alert('TODO: Add or update address book.');
+				/* TODO: Add or update address book.
+				var displayname = $("#displayname_"+calendarid).val();
+				var active = $("#edit_active_"+calendarid+":checked").length;
+				var description = $("#description_"+calendarid).val();
+				var calendarcolor = $("#calendarcolor_"+calendarid).val();
+
+				var url;
+				if (calendarid == 'new'){
+					url = "ajax/createcalendar.php";
+				}else{
+					url = "ajax/updatecalendar.php";
+				}
+				$.post(url, { id: calendarid, name: displayname, active: active, description: description, color: calendarcolor },
+					function(data){
+						if(data.status == 'success'){
+							$(button).closest('tr').prev().html(data.page).show().next().remove();
+							$('#calendar_holder').fullCalendar('removeEventSource', data.eventSource.url);
+							$('#calendar_holder').fullCalendar('addEventSource', data.eventSource);
+						}
+					}, 'json');*/
+			},
+			cancel:function(button, bookid){
+				$(button).closest('tr').prev().show().next().remove();
+			}
+		}
+	}
+}
+
 $(document).ready(function(){
 	/*-------------------------------------------------------------------------
 	 * Event handlers
@@ -79,6 +182,23 @@ $(document).ready(function(){
 		return false;
 	});
 
+	$('#chooseaddressbook').click(function(){
+		Contacts.UI.Addressbooks.overview();
+		/*
+		$.getJSON('ajax/showaddcard.php',{},function(jsondata){
+			if(jsondata.status == 'success'){
+				$('#rightcontent').data('id','');
+				$('#rightcontent').html(jsondata.data.page)
+					.find('select').chosen();
+			}
+			else{
+				alert(jsondata.data.message);
+			}
+		});
+		*/
+		return false;
+	});
+	
 	$('#contacts_newcontact').click(function(){
 		$.getJSON('ajax/showaddcard.php',{},function(jsondata){
 			if(jsondata.status == 'success'){
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 87477ed7ed4..93f069cff2f 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -140,6 +140,26 @@ class OC_Contacts_Addressbook{
 		return true;
 	}
 
+	/**
+	 * @brief Activates an addressbook
+	 * @param integer $id
+	 * @param integer $name
+	 * @return boolean
+	 */
+	public static function setActive($id,$active){
+		// Need these ones for checking uri
+		//$addressbook = self::find($id);
+
+		if(is_null($id)){
+			$id = 0;
+		}
+
+		$stmt = OC_DB::prepare( 'UPDATE *PREFIX*contacts_addressbooks SET active=?, ctag=ctag+1 WHERE id=?' );
+		$result = $stmt->execute(array($active,$id));
+
+		return true;
+	}
+
 	/**
 	 * @brief removes an address book
 	 * @param integer $id
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 630dca41b2e..20a1e34eb78 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -1,12 +1,10 @@
-<?php // Include Style and Script
-OC_Util::addScript('contacts','interface');
-OC_Util::addStyle('contacts','styles');
-OC_Util::addStyle('contacts','formtastic');
-?>
-
+<script type='text/javascript'>
+	var totalurl = '<?php echo OC_Helper::linkTo('apps/contacts', 'carddav.php', null, true); ?>/addressbooks';
+</script>
 <div id="controls">
 	<form>
 		<input type="button" id="contacts_newcontact" value="<?php echo $l->t('Add Contact'); ?>">
+		<input type="button" id="chooseaddressbook" value="<?php echo $l->t('Address Books'); ?>">
 	</form>
 </div>
 <div id="leftcontent" class="leftcontent">
@@ -17,3 +15,9 @@ OC_Util::addStyle('contacts','formtastic');
 <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>">
 	<?php echo $this->inc("part.addcardform"); ?>
 </div>
+<!-- Dialogs -->
+<div id="dialog_holder"></div>
+<div id="parsingfail_dialog" title="Parsing Fail">
+	<?php echo $l->t("There was a fail, while parsing the file."); ?>
+</div>
+<!-- End of Dialogs -->
diff --git a/apps/contacts/templates/part.chooseaddressbook.php b/apps/contacts/templates/part.chooseaddressbook.php
new file mode 100644
index 00000000000..a698a334174
--- /dev/null
+++ b/apps/contacts/templates/part.chooseaddressbook.php
@@ -0,0 +1,23 @@
+<div id="chooseaddressbook_dialog" title="<?php echo $l->t("Choose active Address Books"); ?>">
+<table width="100%" style="border: 0;">
+<?php
+$option_addressbooks = OC_Contacts_Addressbook::all(OC_User::getUser());
+for($i = 0; $i < count($option_addressbooks); $i++){
+	echo "<tr>";
+	$tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields');
+	$tmpl->assign('addressbook', $option_addressbooks[$i]);
+	$tmpl->printpage();
+	echo "</tr>";
+}
+?>
+<tr>
+	<td colspan="5">
+		<a href="#" onclick="Contacts.UI.Addressbooks.newAddressbook(this);"><?php echo $l->t('New Address Book') ?></a>
+	</td>
+</tr>
+<tr>
+	<td colspan="5">
+		<p style="margin: 0 auto;width: 90%;"><input style="display:none;width: 90%;float: left;" type="text" id="carddav_url" onmouseover="$('#carddav_url').select();" title="<?php echo $l->t("CardDav Link"); ?>"><img id="carddav_url_close" style="height: 20px;vertical-align: middle;display: none;" src="../../core/img/actions/delete.svg" alt="close" onclick="$('#carddav_url').hide();$('#carddav_url_close').hide();"/></p>
+	</td>
+</tr>
+</table>
diff --git a/apps/contacts/templates/part.chooseaddressbook.rowfields.php b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
new file mode 100644
index 00000000000..f6c11310960
--- /dev/null
+++ b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
@@ -0,0 +1,4 @@
+<?php
+	echo "<td width=\"20px\"><input id=\"active_" . $_['addressbook']["id"] . "\" type=\"checkbox\" onClick=\"Contacts.UI.Addressbooks.activation(this, " . $_['addressbook']["id"] . ")\"" . ($_['addressbook']["active"] ? ' checked="checked"' : '') . "></td>";
+	echo "<td><label for=\"active_" . $_['addressbook']["id"] . "\">" . $_['addressbook']["displayname"] . "</label></td>";
+	echo "<td width=\"20px\"><a href=\"#\" onclick=\"Contacts.UI.showCardDAVUrl('" . OC_User::getUser() . "', '" . $_['addressbook']["uri"] . "');\" title=\"" . $l->t("CardDav Link") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/public.svg\"></a></td><td width=\"20px\"><a href=\"export.php?bookid=" . $_['addressbook']["id"] . "\" title=\"" . $l->t("Download") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/download.svg\"></a></td><td width=\"20px\"><a href=\"#\" onclick=\"Contacts.UI.Addressbooks.deleteAddressbook('" . $_['addressbook']["id"] . "');\" title=\"" . $l->t("Delete") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/delete.svg\"></a></td>";
diff --git a/apps/contacts/templates/part.editaddressbook.php b/apps/contacts/templates/part.editaddressbook.php
new file mode 100644
index 00000000000..4e63ce5ec17
--- /dev/null
+++ b/apps/contacts/templates/part.editaddressbook.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+?>
+<td id="<?php echo $_['new'] ? 'new' : 'edit' ?>addressbook_dialog" title="<?php echo $_['new'] ? $l->t("New Address Book") : $l->t("Edit Address Book"); ?>" colspan="6">
+<table width="100%" style="border: 0;">
+<tr>
+	<th><?php echo $l->t('Displayname') ?></th>
+	<td>
+		<input id="displayname_<?php echo $_['addressbook']['id'] ?>" type="text" value="<?php echo $_['addressbook']['displayname'] ?>">
+	</td>
+</tr>
+<?php if (!$_['new']): ?>
+<tr>
+	<td></td>
+	<td>
+		<input id="edit_active_<?php echo $_['addressbook']['id'] ?>" type="checkbox"<?php echo $_['addressbook']['active'] ? ' checked="checked"' : '' ?>>
+		<label for="edit_active_<?php echo $_['addressbook']['id'] ?>">
+			<?php echo $l->t('Active') ?>
+		</label>
+	</td>
+</tr>
+<?php endif; ?>
+</table>
+<input style="float: left;" type="button" onclick="Contacts.UI.Addressbooks.submit(this, <?php echo $_['new'] ? "'new'" : $_['addressbook']['id'] ?>);" value="<?php echo $_['new'] ? $l->t("Save") : $l->t("Submit"); ?>">
+<input style="float: left;" type="button" onclick="Contacts.UI.Addressbooks.cancel(this, <?php echo $_['new'] ? "'new'" : $_['addressbook']['id'] ?>);" value="<?php echo $l->t("Cancel"); ?>">
+</td>
-- 
GitLab


From 830efdccac71ebbd4ee5f9414abd0878f2ff9349 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 5 Dec 2011 03:38:06 +0100
Subject: [PATCH 037/546] Fixed adding, editing and deleting address books. One
 minor UI flaw remains.

---
 apps/contacts/ajax/addbook.php                |  6 +++-
 apps/contacts/ajax/chooseaddressbook.php      |  2 +-
 apps/contacts/ajax/createaddressbook.php      | 26 ++++++++++++++
 apps/contacts/ajax/deletebook.php             |  4 ++-
 apps/contacts/ajax/editaddressbook.php        | 20 +++++++++++
 apps/contacts/ajax/updateaddressbook.php      | 26 ++++++++++++++
 apps/contacts/js/interface.js                 | 36 ++++++++++---------
 .../part.chooseaddressbook.rowfields.php      |  2 +-
 8 files changed, 101 insertions(+), 21 deletions(-)
 create mode 100644 apps/contacts/ajax/createaddressbook.php
 create mode 100644 apps/contacts/ajax/editaddressbook.php
 create mode 100644 apps/contacts/ajax/updateaddressbook.php

diff --git a/apps/contacts/ajax/addbook.php b/apps/contacts/ajax/addbook.php
index ce74ccf9d28..d8e5a0ecd59 100644
--- a/apps/contacts/ajax/addbook.php
+++ b/apps/contacts/ajax/addbook.php
@@ -12,8 +12,12 @@ if(!OC_USER::isLoggedIn()) {
 	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
 }
 OC_JSON::checkAppEnabled('contacts');
+$book = array(
+	'id' => 'new',
+	'displayname' => '',
+);
 $tmpl = new OC_Template('contacts', 'part.editaddressbook');
 $tmpl->assign('new', true);
-$tmpl->assign('book', $book);
+$tmpl->assign('addressbook', $book);
 $tmpl->printPage();
 ?>
diff --git a/apps/contacts/ajax/chooseaddressbook.php b/apps/contacts/ajax/chooseaddressbook.php
index e150f97f541..d55fdf3e93b 100644
--- a/apps/contacts/ajax/chooseaddressbook.php
+++ b/apps/contacts/ajax/chooseaddressbook.php
@@ -12,7 +12,7 @@ if(!OC_USER::isLoggedIn()) {
 	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
 }
 OC_JSON::checkAppEnabled('contacts');
-OC_Log::write('contacts','chooseaddressbook.php',OC_Log::DEBUG);
+/* OC_Log::write('contacts','chooseaddressbook.php',OC_Log::DEBUG); */
 
 $output = new OC_TEMPLATE("contacts", "part.chooseaddressbook");
 $output -> printpage();
diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php
new file mode 100644
index 00000000000..3dd38703c17
--- /dev/null
+++ b/apps/contacts/ajax/createaddressbook.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
+ * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+require_once('../../../lib/base.php');
+
+$l10n = new OC_L10N('contacts');
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+
+$userid = OC_User::getUser();
+$bookid = OC_Contacts_Addressbook::add($userid, $_POST['name'], null);
+OC_Contacts_Addressbook::setActive($bookid, 1);
+$book = OC_Contacts_Addressbook::find($bookid);
+$tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields');
+$tmpl->assign('addressbook', $book);
+OC_JSON::success(array(
+	'page' => $tmpl->fetchPage(),
+	'bookid' => $bookid,
+));
diff --git a/apps/contacts/ajax/deletebook.php b/apps/contacts/ajax/deletebook.php
index c13217ef2e2..238975436e7 100644
--- a/apps/contacts/ajax/deletebook.php
+++ b/apps/contacts/ajax/deletebook.php
@@ -23,7 +23,9 @@
 // Init owncloud
 require_once('../../../lib/base.php');
 
-$id = $_GET['id'];
+$id = $_POST['id'];
+
+OC_Log::write('contacts','deletebook.php: '.$id,OC_Log::DEBUG);	
 
 $l10n = new OC_L10N('contacts');
 
diff --git a/apps/contacts/ajax/editaddressbook.php b/apps/contacts/ajax/editaddressbook.php
new file mode 100644
index 00000000000..abdad09dea0
--- /dev/null
+++ b/apps/contacts/ajax/editaddressbook.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once('../../../lib/base.php');
+$l10n = new OC_L10N('contacts');
+if(!OC_USER::isLoggedIn()) {
+	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
+}
+OC_JSON::checkAppEnabled('contacts');
+$addressbook = OC_Contacts_Addressbook::find($_GET['bookid']);
+$tmpl = new OC_Template("contacts", "part.editaddressbook");
+$tmpl->assign('new', false);
+$tmpl->assign('addressbook', $addressbook);
+$tmpl->printPage();
+?>
diff --git a/apps/contacts/ajax/updateaddressbook.php b/apps/contacts/ajax/updateaddressbook.php
new file mode 100644
index 00000000000..ccf1cef03f7
--- /dev/null
+++ b/apps/contacts/ajax/updateaddressbook.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once('../../../lib/base.php');
+
+$l10n = new OC_L10N('contacts');
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+
+$bookid = $_POST['id'];
+OC_Contacts_Addressbook::edit($bookid, $_POST['name'], null);
+OC_Contacts_Addressbook::setActive($bookid, $_POST['active']);
+$addressbook = OC_Contacts_Addressbook::find($bookid);
+$tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields');
+$tmpl->assign('book', $book);
+OC_JSON::success(array(
+	'page' => $tmpl->fetchPage(),
+	'addressbook' => $addressbook,
+));
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index 077bbd2071e..f34cde89576 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -36,7 +36,7 @@ Contacts={
 					 */
 					if (data.status == 'success'){
 						checkbox.checked = data.active == 1;
-						alert('Update Contacts list.');
+						alert('TODO: Update Contacts list.');
 						/* TODO: Update Contacts list.
 						if (data.active == 1){
 							$('#calendar_holder').fullCalendar('addEventSource', data.eventSource);
@@ -53,6 +53,11 @@ Contacts={
 				$(object).closest('tr').after(tr).hide();
 				/* TODO: Shouldn't there be some kinda error checking here? */
 			},
+			editAddressbook:function(object, bookid){
+				var tr = $(document.createElement('tr'))
+					.load(OC.filePath('contacts', 'ajax', 'editaddressbook.php') + "?bookid="+bookid);
+				$(object).closest('tr').after(tr).hide();
+			},
 			deleteAddressbook:function(bookid){
 				var check = confirm("Do you really want to delete this address book?");
 				if(check == false){
@@ -61,38 +66,35 @@ Contacts={
 					$.post(OC.filePath('contacts', 'ajax', 'deletebook.php'), { id: bookid},
 					  function(data) {
 						if (data.status == 'success'){
-							alert('TODO: Update Contacts list.');
+							/* alert('TODO: Update Contacts list.'); */
 							/* TODO: Update Contacts list.
 							var url = 'ajax/deletebook.php?id='+bookid;
-							$('#calendar_holder').fullCalendar('removeEventSource', url);
-							$('#choosecalendar_dialog').dialog('destroy').remove();*/
+							$('#calendar_holder').fullCalendar('removeEventSource', url);*/
+							$('#chooseaddressbook_dialog').dialog('destroy').remove();
 							Contacts.UI.Addressbooks.overview();
+						} else {
+							alert('Error: ' + data.message);
 						}
 					  });
 				}
 			},
 			submit:function(button, bookid){
-				alert('TODO: Add or update address book.');
-				/* TODO: Add or update address book.
-				var displayname = $("#displayname_"+calendarid).val();
-				var active = $("#edit_active_"+calendarid+":checked").length;
-				var description = $("#description_"+calendarid).val();
-				var calendarcolor = $("#calendarcolor_"+calendarid).val();
+				var displayname = $("#displayname_"+bookid).val();
+				var active = $("#edit_active_"+bookid+":checked").length;
+				var description = $("#description_"+bookid).val();
 
 				var url;
-				if (calendarid == 'new'){
-					url = "ajax/createcalendar.php";
+				if (bookid == 'new'){
+					url = OC.filePath('contacts', 'ajax', 'createaddressbook.php');
 				}else{
-					url = "ajax/updatecalendar.php";
+					url = OC.filePath('contacts', 'ajax', 'updateaddressbook.php');
 				}
-				$.post(url, { id: calendarid, name: displayname, active: active, description: description, color: calendarcolor },
+				$.post(url, { id: bookid, name: displayname, active: active, description: description },
 					function(data){
 						if(data.status == 'success'){
 							$(button).closest('tr').prev().html(data.page).show().next().remove();
-							$('#calendar_holder').fullCalendar('removeEventSource', data.eventSource.url);
-							$('#calendar_holder').fullCalendar('addEventSource', data.eventSource);
 						}
-					}, 'json');*/
+					});
 			},
 			cancel:function(button, bookid){
 				$(button).closest('tr').prev().show().next().remove();
diff --git a/apps/contacts/templates/part.chooseaddressbook.rowfields.php b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
index f6c11310960..7f7b5a9154e 100644
--- a/apps/contacts/templates/part.chooseaddressbook.rowfields.php
+++ b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
@@ -1,4 +1,4 @@
 <?php
 	echo "<td width=\"20px\"><input id=\"active_" . $_['addressbook']["id"] . "\" type=\"checkbox\" onClick=\"Contacts.UI.Addressbooks.activation(this, " . $_['addressbook']["id"] . ")\"" . ($_['addressbook']["active"] ? ' checked="checked"' : '') . "></td>";
 	echo "<td><label for=\"active_" . $_['addressbook']["id"] . "\">" . $_['addressbook']["displayname"] . "</label></td>";
-	echo "<td width=\"20px\"><a href=\"#\" onclick=\"Contacts.UI.showCardDAVUrl('" . OC_User::getUser() . "', '" . $_['addressbook']["uri"] . "');\" title=\"" . $l->t("CardDav Link") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/public.svg\"></a></td><td width=\"20px\"><a href=\"export.php?bookid=" . $_['addressbook']["id"] . "\" title=\"" . $l->t("Download") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/download.svg\"></a></td><td width=\"20px\"><a href=\"#\" onclick=\"Contacts.UI.Addressbooks.deleteAddressbook('" . $_['addressbook']["id"] . "');\" title=\"" . $l->t("Delete") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/delete.svg\"></a></td>";
+	echo "<td width=\"20px\"><a href=\"#\" onclick=\"Contacts.UI.showCardDAVUrl('" . OC_User::getUser() . "', '" . $_['addressbook']["uri"] . "');\" title=\"" . $l->t("CardDav Link") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/public.svg\"></a></td><td width=\"20px\"><a href=\"export.php?bookid=" . $_['addressbook']["id"] . "\" title=\"" . $l->t("Download") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/download.svg\"></a></td><td width=\"20px\"><a  href=\"#\" title=\"" . $l->t("Edit") . "\" class=\"action\" onclick=\"Contacts.UI.Addressbooks.editAddressbook(this, " . $_['addressbook']["id"] . ");\"><img class=\"svg action\" src=\"../../core/img/actions/rename.svg\"></a></td><td width=\"20px\"><a href=\"#\" onclick=\"Contacts.UI.Addressbooks.deleteAddressbook('" . $_['addressbook']["id"] . "');\" title=\"" . $l->t("Delete") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/delete.svg\"></a></td>";
-- 
GitLab


From add48b26579cef68ffa776022f31138ee9de152d Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Fri, 9 Dec 2011 14:35:59 +0100
Subject: [PATCH 038/546] optimize timezone detection

---
 apps/calendar/ajax/guesstimezone.php | 2 +-
 apps/calendar/js/geo.js              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/ajax/guesstimezone.php b/apps/calendar/ajax/guesstimezone.php
index a3594498b0f..07aadc5cb12 100755
--- a/apps/calendar/ajax/guesstimezone.php
+++ b/apps/calendar/ajax/guesstimezone.php
@@ -28,7 +28,7 @@ $geolocation = file_get_contents('http://ws.geonames.org/timezone?lat=' . $lat .
 //Information are by Geonames (http://www.geonames.org) and licensed under the Creative Commons Attribution 3.0 License
 $geoxml = simplexml_load_string($geolocation);
 $geoarray = make_array_out_of_xml($geoxml);
-if(isset($geoarray['timezone']['timezoneId']) && $geoarray['timezone']['timezoneId'] != ''){
+if(in_array($geoarray['timezone']['timezoneId'], DateTimeZone::listIdentifiers())){
 	OC_Preferences::setValue(OC_USER::getUser(), 'calendar', 'timezone', $geoarray['timezone']['timezoneId']);
 	$message = array('message'=> $l->t('New Timezone:') . $geoarray['timezone']['timezoneId']);
 	OC_JSON::success($message);
diff --git a/apps/calendar/js/geo.js b/apps/calendar/js/geo.js
index acea17c0269..744d960b75f 100755
--- a/apps/calendar/js/geo.js
+++ b/apps/calendar/js/geo.js
@@ -10,6 +10,7 @@ if (navigator.geolocation) {
 		function(data){
 			if (data.status == 'success'){
 				$('#notification').html(data.message);
+				$('#notification').attr('title', 'CC BY 3.0 by Geonames.org');
 				$('#notification').slideDown();
 				window.setTimeout(function(){$('#notification').slideUp();}, 5000);
 			}else{
-- 
GitLab


From bd68cee8cf0c1d3daabc34672a261bc3cd26eb74 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Fri, 9 Dec 2011 14:36:43 +0100
Subject: [PATCH 039/546] add resettimezone file for testing timezone detection

---
 apps/calendar/resettimezone.php | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 apps/calendar/resettimezone.php

diff --git a/apps/calendar/resettimezone.php b/apps/calendar/resettimezone.php
new file mode 100644
index 00000000000..1ef9591ae39
--- /dev/null
+++ b/apps/calendar/resettimezone.php
@@ -0,0 +1,4 @@
+<?php
+require_once ("../../lib/base.php"); 
+OC_Preferences::deleteKey(OC_USER::getUser(), 'calendar', 'timezone');
+?>
\ No newline at end of file
-- 
GitLab


From b3661adf028570f6158dfd5092ecb1398d5be0df Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 9 Dec 2011 15:10:51 +0100
Subject: [PATCH 040/546] Various fixes to multiple address books handling

---
 apps/contacts/ajax/chooseaddressbook.php      |  2 +-
 apps/contacts/ajax/createaddressbook.php      |  6 +-
 apps/contacts/ajax/showaddcard.php            |  2 +-
 apps/contacts/ajax/updateaddressbook.php      |  2 +-
 apps/contacts/index.php                       | 37 +++++----
 apps/contacts/js/interface.js                 |  8 +-
 apps/contacts/lib/addressbook.php             | 82 ++++++++++++++++++-
 apps/contacts/lib/hooks.php                   |  2 +-
 apps/contacts/lib/vcard.php                   | 26 +++++-
 apps/contacts/templates/index.php             |  2 +-
 .../templates/part.chooseaddressbook.php      |  6 +-
 .../part.chooseaddressbook.rowfields.php      |  6 +-
 apps/contacts/templates/part.contacts.php     |  2 +-
 13 files changed, 146 insertions(+), 37 deletions(-)

diff --git a/apps/contacts/ajax/chooseaddressbook.php b/apps/contacts/ajax/chooseaddressbook.php
index d55fdf3e93b..e150f97f541 100644
--- a/apps/contacts/ajax/chooseaddressbook.php
+++ b/apps/contacts/ajax/chooseaddressbook.php
@@ -12,7 +12,7 @@ if(!OC_USER::isLoggedIn()) {
 	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
 }
 OC_JSON::checkAppEnabled('contacts');
-/* OC_Log::write('contacts','chooseaddressbook.php',OC_Log::DEBUG); */
+OC_Log::write('contacts','chooseaddressbook.php',OC_Log::DEBUG);
 
 $output = new OC_TEMPLATE("contacts", "part.chooseaddressbook");
 $output -> printpage();
diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php
index 3dd38703c17..8fec07ebcae 100644
--- a/apps/contacts/ajax/createaddressbook.php
+++ b/apps/contacts/ajax/createaddressbook.php
@@ -17,10 +17,10 @@ OC_JSON::checkAppEnabled('contacts');
 $userid = OC_User::getUser();
 $bookid = OC_Contacts_Addressbook::add($userid, $_POST['name'], null);
 OC_Contacts_Addressbook::setActive($bookid, 1);
-$book = OC_Contacts_Addressbook::find($bookid);
+$addressbook = OC_Contacts_Addressbook::find($bookid);
 $tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields');
-$tmpl->assign('addressbook', $book);
+$tmpl->assign('addressbook', $addressbook);
 OC_JSON::success(array(
 	'page' => $tmpl->fetchPage(),
-	'bookid' => $bookid,
+	'addressbook' => $addressbook,
 ));
diff --git a/apps/contacts/ajax/showaddcard.php b/apps/contacts/ajax/showaddcard.php
index 98367758fd4..5842046f00c 100644
--- a/apps/contacts/ajax/showaddcard.php
+++ b/apps/contacts/ajax/showaddcard.php
@@ -32,7 +32,7 @@ OC_JSON::checkAppEnabled('contacts');
 $adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
 $phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
 
-$addressbooks = OC_Contacts_Addressbook::all(OC_USER::getUser());
+$addressbooks = OC_Contacts_Addressbook::allAddressbooks(OC_USER::getUser());
 $tmpl = new OC_Template('contacts','part.addcardform');
 $tmpl->assign('addressbooks',$addressbooks);
 $tmpl->assign('adr_types',$adr_types);
diff --git a/apps/contacts/ajax/updateaddressbook.php b/apps/contacts/ajax/updateaddressbook.php
index ccf1cef03f7..011dfc35d1a 100644
--- a/apps/contacts/ajax/updateaddressbook.php
+++ b/apps/contacts/ajax/updateaddressbook.php
@@ -19,7 +19,7 @@ OC_Contacts_Addressbook::edit($bookid, $_POST['name'], null);
 OC_Contacts_Addressbook::setActive($bookid, $_POST['active']);
 $addressbook = OC_Contacts_Addressbook::find($bookid);
 $tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields');
-$tmpl->assign('book', $book);
+$tmpl->assign('addressbook', $addressbook);
 OC_JSON::success(array(
 	'page' => $tmpl->fetchPage(),
 	'addressbook' => $addressbook,
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 57c28a5761c..917335fb68b 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -21,7 +21,7 @@
  */
 
 function contacts_namesort($a,$b){
-	return strcmp($a['name'],$b['name']);
+	return strcmp($a['fullname'],$b['fullname']);
 }
 
 // Init owncloud
@@ -32,16 +32,17 @@ OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 
 // Check if the user has an addressbook
-$addressbooks = OC_Contacts_Addressbook::all(OC_User::getUser());
-if( count($addressbooks) == 0){
-	OC_Contacts_Addressbook::add(OC_User::getUser(),'default','Default Address Book');
-	$addressbooks = OC_Contacts_Addressbook::all(OC_User::getUser());
-}
-$prefbooks = OC_Preferences::getValue(OC_User::getUser(),'contacts','openaddressbooks',null);
-if(is_null($prefbooks)){
-	$prefbooks = $addressbooks[0]['id'];
-	OC_Preferences::setValue(OC_User::getUser(),'contacts','openaddressbooks',$prefbooks);
-}
+$openaddressbooks = OC_Contacts_Addressbook::activeAddressbookIds(OC_User::getUser());
+OC_Log::write('contacts','Got IDs'.implode(',', $openaddressbooks),OC_Log::DEBUG);
+// if( count($addressbooks) == 0){
+// 	OC_Contacts_Addressbook::add(OC_User::getUser(),'default','Default Address Book');
+// 	$addressbooks = OC_Contacts_Addressbook::all(OC_User::getUser());
+// }
+// $prefbooks = OC_Preferences::getValue(OC_User::getUser(),'contacts','openaddressbooks',null);
+// if(is_null($prefbooks)){
+// 	$prefbooks = $addressbooks[0]['id'];
+// 	OC_Preferences::setValue(OC_User::getUser(),'contacts','openaddressbooks',$prefbooks);
+// }
 
 // Load the files we need
 OC_App::setActiveNavigationEntry( 'contacts_index' );
@@ -52,16 +53,18 @@ $id = isset( $_GET['id'] ) ? $_GET['id'] : null;
 // sort addressbooks  (use contactsort)
 usort($addressbooks,'contacts_namesort');
 // Addressbooks to load
-$openaddressbooks = explode(';',$prefbooks);
+//$openaddressbooks = explode(';',$prefbooks);
 
 $contacts = array();
 foreach( $openaddressbooks as $addressbook ){
 	$addressbookcontacts = OC_Contacts_VCard::all($addressbook);
+	OC_Log::write('contacts','index.php. Getting contacts for: '.$addressbook,OC_Log::DEBUG);
 	foreach( $addressbookcontacts as $contact ){
 		if(is_null($contact['fullname'])){
 			continue;
 		}
-		$contacts[] = array( 'name' => $contact['fullname'], 'id' => $contact['id'] );
+		$contacts[] = $contact;
+		//$contacts[] = array( 'name' => $contact['fullname'], 'id' => $contact['id'] );
 	}
 }
 
@@ -75,10 +78,6 @@ if( !is_null($id) || count($contacts)){
 	$details = OC_Contacts_VCard::structureContact($vcard);
 }
 
-$l10n = new OC_L10N('contacts');
-$adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
-$phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
-
 // Include Style and Script
 OC_Util::addScript('contacts','interface');
 OC_Util::addStyle('contacts','styles');
@@ -86,6 +85,10 @@ OC_Util::addStyle('contacts','formtastic');
 OC_Util::addScript('', 'jquery.multiselect');
 OC_Util::addStyle('', 'jquery.multiselect');
 
+$l10n = new OC_L10N('contacts');
+$adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
+$phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
+
 // Process the template
 $tmpl = new OC_Template( 'contacts', 'index', 'user' );
 $tmpl->assign('adr_types',$adr_types);
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index f34cde89576..8e699f52c93 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -6,10 +6,15 @@ Contacts={
 			$('#carddav_url').show();
 			$('#carddav_url_close').show();
 		},
+		Contacts:{
+			update:function(){
+				alert('Contacts.update()');
+			}
+		},
 		Addressbooks:{
 			overview:function(){
+				/* alert('overview');*/
 				if($('#chooseaddressbook_dialog').dialog('isOpen') == true){
-					/*alert('Address books.moveToTop');*/
 					$('#chooseaddressbook_dialog').dialog('moveToTop');
 				}else{
 					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(){
@@ -71,6 +76,7 @@ Contacts={
 							var url = 'ajax/deletebook.php?id='+bookid;
 							$('#calendar_holder').fullCalendar('removeEventSource', url);*/
 							$('#chooseaddressbook_dialog').dialog('destroy').remove();
+							Contacts.UI.Contacts.update();
 							Contacts.UI.Addressbooks.overview();
 						} else {
 							alert('Error: ' + data.message);
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 93f069cff2f..882a64bab88 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -43,8 +43,9 @@ class OC_Contacts_Addressbook{
 	 * @param string $uid
 	 * @return array
 	 */
-	public static function all($uid){
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE userid = ?' );
+	public static function allAddressbooks($uid){
+		OC_Log::write('contacts','allAddressbooks',OC_Log::DEBUG);
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE userid = ? ORDER BY displayname' );
 		$result = $stmt->execute(array($uid));
 
 		$addressbooks = array();
@@ -55,6 +56,24 @@ class OC_Contacts_Addressbook{
 		return $addressbooks;
 	}
 
+	/**
+	 * @brief Returns the list of active addressbooks for a specific user.
+	 * @param string $uid
+	 * @return array
+	 */
+	public static function activeAddressbooks($uid){
+		$active = implode(',', self::activeAddressbookIds());
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id IN (?) AND userid = ? ORDER BY displayname' );
+		$result = $stmt->execute(array($active, $uid));
+
+		$addressbooks = array();
+		while( $row = $result->fetchRow()){
+			$addressbooks[] = $row;
+		}
+
+		return $addressbooks;
+	}
+
 	/**
 	 * @brief Returns the list of addressbooks for a principal (DAV term of user)
 	 * @param string $principaluri
@@ -62,7 +81,7 @@ class OC_Contacts_Addressbook{
 	 */
 	public static function allWherePrincipalURIIs($principaluri){
 		$uid = self::extractUserID($principaluri);
-		return self::all($uid);
+		return self::allAddressbooks($uid);
 	}
 
 	/**
@@ -85,7 +104,7 @@ class OC_Contacts_Addressbook{
 	 * @return insertid
 	 */
 	public static function add($userid,$name,$description){
-		$all = self::all($userid);
+		$all = self::allAddressbooks($userid);
 		$uris = array();
 		foreach($all as $i){
 			$uris[] = $i['uri'];
@@ -140,6 +159,28 @@ class OC_Contacts_Addressbook{
 		return true;
 	}
 
+	/**
+	 * @brief Get active addressbooks for a user.
+	 * @param integer $uid User id. If null current user will be used.
+	 * @return array
+	 */
+	public static function activeAddressbookIds($uid){
+		if(is_null($uid)){
+			$uid = OC_User::getUser();
+		}
+		$prefbooks = OC_Preferences::getValue($uid,'contacts','openaddressbooks',null);
+		if(is_null($prefbooks)){
+			$addressbooks = OC_Contacts_Addressbook::allAddressbooks($uid);
+			if(count($addressbooks) == 0){
+				OC_Contacts_Addressbook::add($uid,'default','Default Address Book');
+				$addressbooks = OC_Contacts_Addressbook::allAddressbooks($uid);
+			}
+			$prefbooks = $addressbooks[0]['id'];
+			OC_Preferences::setValue($uid,'contacts','openaddressbooks',$prefbooks);
+		}
+		return explode(';',$prefbooks);
+	}
+
 	/**
 	 * @brief Activates an addressbook
 	 * @param integer $id
@@ -149,17 +190,50 @@ class OC_Contacts_Addressbook{
 	public static function setActive($id,$active){
 		// Need these ones for checking uri
 		//$addressbook = self::find($id);
+		OC_Log::write('contacts','setActive('.$id.'): '.$active,OC_Log::DEBUG);
 
 		if(is_null($id)){
 			$id = 0;
 		}
 
+		/**
+		* For now I have active state redundant both in preferences and in the address book
+		* table as I can't get the OC_Contacts_Addressbook::isActive() call to work when
+		* iterating over several results.
+		*/
 		$stmt = OC_DB::prepare( 'UPDATE *PREFIX*contacts_addressbooks SET active=?, ctag=ctag+1 WHERE id=?' );
 		$result = $stmt->execute(array($active,$id));
+		$openaddressbooks = self::activeAddressbookIds();
+		if($active) {
+			if(!in_array($id, $openaddressbooks)) {
+				// TODO: Test this instead
+				//$openaddressbooks[] = $id;
+				array_push($openaddressbooks, $id);
+			}
+		} else {
+			if(in_array($id, $openaddressbooks)) {
+				array_pop($openaddressbooks, $id);
+				$openaddressbooks = array_diff( $openaddressbooks, array($id) );
+			}
+		}
+		sort($openaddressbooks, SORT_NUMERIC);
+		OC_Log::write('contacts','setActive('.$id.'):all '.implode(';', $openaddressbooks),OC_Log::DEBUG);
+		OC_Preferences::setValue(OC_User::getUser(),'contacts','openaddressbooks',implode(';', $openaddressbooks));
 
 		return true;
 	}
 
+	/**
+	 * @brief Checks if an addressbook is active.
+	 * @param integer $id ID of the address book.
+	 * @return boolean
+	 */
+	public static function isActive($id){
+		OC_Log::write('contacts','isActive('.$id.')',OC_Log::DEBUG);
+		OC_Log::write('contacts','isActive('.$id.'): '.in_array($id, self::activeAddressbookIds()),OC_Log::DEBUG);
+		return in_array($id, self::activeAddressbookIds());
+	}
+
 	/**
 	 * @brief removes an address book
 	 * @param integer $id
diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php
index 155cf40f914..356ae26df97 100644
--- a/apps/contacts/lib/hooks.php
+++ b/apps/contacts/lib/hooks.php
@@ -30,7 +30,7 @@ class OC_Contacts_Hooks{
 	 * @return array
 	 */
 	public function deleteUser($parameters) {
-		$addressbooks = OC_Contacts_Addressbook::all($parameters['uid']);
+		$addressbooks = OC_Contacts_Addressbook::allAddressbooks($parameters['uid']);
 
 		foreach($addressbooks as $addressbook) {
 			OC_Contacts_Addressbook::delete($addressbook['id']);
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 4865fae7642..b03e6ede998 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -47,15 +47,35 @@ class OC_Contacts_VCard{
 	 * ['carddata']
 	 */
 	public static function all($id){
+  		OC_Log::write('contacts','OC_Contacts_VCard::all ids: '.$id,OC_Log::DEBUG);
+//		if(is_array($id)) {
+// 			OC_Log::write('contacts','OC_Contacts_VCard::all Array?: '.$id,OC_Log::DEBUG);
+// 			OC_Log::write('contacts','count: '.implode(',', $id),OC_Log::DEBUG);
+//  			$ids = implode(',', $id);
+// 			$prep = '?'.str_repeat ( ',?' , count($id)-1 );
+// 			//$repeat = str_repeat ( ',?' , count($id)-1 );
+// 			//OC_Log::write('contacts','OC_Contacts_VCard::all: repeat: '.$repeat,OC_Log::DEBUG);
+//  			OC_Log::write('contacts','OC_Contacts_VCard::all: from: '.$ids,OC_Log::DEBUG);
+//  			OC_Log::write('contacts','OC_Contacts_VCard::all: PREP: SELECT * FROM contacts_cards WHERE addressbookid IN ('.$prep.')',OC_Log::DEBUG);
+//  			OC_Log::write('contacts','OC_Contacts_VCard::all: SQL: SELECT * FROM contacts_cards WHERE addressbookid IN ('.$prep.')',OC_Log::DEBUG);
+//  			$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid IN ('.'?,?,?'.') ORDER BY fullname' );
+//  		} else {
+// 			$ids = $id;
+//  			$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? ORDER BY fullname' );
+//  		}
+
 		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ?' );
 		$result = $stmt->execute(array($id));
+		OC_Log::write('contacts','OC_Contacts_VCard::all: result->numRows(): '.$result->numRows(),OC_Log::DEBUG);
 
-		$addressbooks = array();
+		$cards = array();
 		while( $row = $result->fetchRow()){
-			$addressbooks[] = $row;
+			$cards[] = $row;
+			//OC_Log::write('contacts','OC_Contacts_VCard::all: fullname: '.$row['fullname'],OC_Log::DEBUG);
 		}
+		OC_Log::write('contacts','OC_Contacts_VCard::all: count($cards): '.count($cards),OC_Log::DEBUG);
 
-		return $addressbooks;
+		return $cards;
 	}
 
 	/**
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 20a1e34eb78..2ecadb4d60f 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -8,7 +8,7 @@
 	</form>
 </div>
 <div id="leftcontent" class="leftcontent">
-	<ul>
+	<ul id="contacts">
 		<?php echo $this->inc("part.contacts"); ?>
 	</ul>
 </div>
diff --git a/apps/contacts/templates/part.chooseaddressbook.php b/apps/contacts/templates/part.chooseaddressbook.php
index a698a334174..dc5978d2d03 100644
--- a/apps/contacts/templates/part.chooseaddressbook.php
+++ b/apps/contacts/templates/part.chooseaddressbook.php
@@ -1,11 +1,15 @@
 <div id="chooseaddressbook_dialog" title="<?php echo $l->t("Choose active Address Books"); ?>">
 <table width="100%" style="border: 0;">
 <?php
-$option_addressbooks = OC_Contacts_Addressbook::all(OC_User::getUser());
+OC_Log::write('contacts','part.chooseaddressbook.php',OC_Log::DEBUG);
+
+$option_addressbooks = OC_Contacts_Addressbook::allAddressbooks(OC_User::getUser());
 for($i = 0; $i < count($option_addressbooks); $i++){
+	OC_Log::write('contacts','part.chooseaddressbook.php: '.$option_addressbooks[$i]['id'],OC_Log::DEBUG);
 	echo "<tr>";
 	$tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields');
 	$tmpl->assign('addressbook', $option_addressbooks[$i]);
+	$tmpl->assign('active', OC_Contacts_Addressbook::isActive($option_addressbooks[$i]['id']));
 	$tmpl->printpage();
 	echo "</tr>";
 }
diff --git a/apps/contacts/templates/part.chooseaddressbook.rowfields.php b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
index 7f7b5a9154e..4639ec20b14 100644
--- a/apps/contacts/templates/part.chooseaddressbook.rowfields.php
+++ b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
@@ -1,4 +1,6 @@
 <?php
-	echo "<td width=\"20px\"><input id=\"active_" . $_['addressbook']["id"] . "\" type=\"checkbox\" onClick=\"Contacts.UI.Addressbooks.activation(this, " . $_['addressbook']["id"] . ")\"" . ($_['addressbook']["active"] ? ' checked="checked"' : '') . "></td>";
-	echo "<td><label for=\"active_" . $_['addressbook']["id"] . "\">" . $_['addressbook']["displayname"] . "</label></td>";
+	OC_Log::write('contacts','part.chooseaddressbook.rowfields.php',OC_Log::DEBUG);
+
+	echo "<td width=\"20px\"><input id=\"active_" . $_['addressbook']["id"] . "\" type=\"checkbox\" onClick=\"Contacts.UI.Addressbooks.activation(this, " . $_['addressbook']["id"] . ")\"" . (OC_Contacts_Addressbook::isActive($_['addressbook']["id"]) ? ' checked="checked"' : '') . "></td>";
+	echo "<td>Active: ".$_['active'].",ID: " . $_['addressbook']["id"] . " - <label for=\"active_" . $_['addressbook']["id"] . "\">" . $_['addressbook']["displayname"] . "</label></td>";
 	echo "<td width=\"20px\"><a href=\"#\" onclick=\"Contacts.UI.showCardDAVUrl('" . OC_User::getUser() . "', '" . $_['addressbook']["uri"] . "');\" title=\"" . $l->t("CardDav Link") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/public.svg\"></a></td><td width=\"20px\"><a href=\"export.php?bookid=" . $_['addressbook']["id"] . "\" title=\"" . $l->t("Download") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/download.svg\"></a></td><td width=\"20px\"><a  href=\"#\" title=\"" . $l->t("Edit") . "\" class=\"action\" onclick=\"Contacts.UI.Addressbooks.editAddressbook(this, " . $_['addressbook']["id"] . ");\"><img class=\"svg action\" src=\"../../core/img/actions/rename.svg\"></a></td><td width=\"20px\"><a href=\"#\" onclick=\"Contacts.UI.Addressbooks.deleteAddressbook('" . $_['addressbook']["id"] . "');\" title=\"" . $l->t("Delete") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/delete.svg\"></a></td>";
diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php
index 6664a3671ac..c6772489ea2 100644
--- a/apps/contacts/templates/part.contacts.php
+++ b/apps/contacts/templates/part.contacts.php
@@ -1,3 +1,3 @@
 <?php foreach( $_['contacts'] as $contact ): ?>
-	<li data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $contact['name']; ?></a> </li>
+	<li data-id="<?php echo $contact['id']; ?>"><?php echo $contact['addressbookid']; ?> - <a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $contact['fullname']; ?></a> </li>
 <?php endforeach; ?>
-- 
GitLab


From 5cb10548b30544c0407294fa7e520479673f956c Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 9 Dec 2011 15:28:51 +0100
Subject: [PATCH 041/546] Resolved conflict

---
 apps/contacts/index.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 29c9e4f1219..f4624db31aa 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -77,7 +77,6 @@ if( !is_null($id)/* || count($contacts)*/){
 	$details = OC_Contacts_VCard::structureContact($vcard);
 }
 
-<<<<<<< HEAD
 // Include Style and Script
 OC_Util::addScript('contacts','interface');
 OC_Util::addStyle('contacts','styles');
@@ -85,13 +84,8 @@ OC_Util::addStyle('contacts','formtastic');
 OC_Util::addScript('', 'jquery.multiselect');
 OC_Util::addStyle('', 'jquery.multiselect');
 
-$l10n = new OC_L10N('contacts');
-$adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
-$phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
-=======
 $adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
 $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
->>>>>>> eeaf539a4414e3081b6f6652167363a3221a1973
 
 // Process the template
 $tmpl = new OC_Template( 'contacts', 'index', 'user' );
-- 
GitLab


From 2e951c0ce58f784ac442c4fd391d1b5d407e8f35 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 9 Dec 2011 21:44:13 +0100
Subject: [PATCH 042/546] Gallary: Fix alignment of album thumbnails

---
 apps/gallery/css/styles.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index 070effe3a92..e23d822fec7 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -13,6 +13,7 @@ div#gallery_album_box {
   border: 0;
   display: inline-block;
   margin: 5pt;
+  vertical-align: top;
 }
 .leftcontent div#gallery_album_box {
   margin: 5px;
-- 
GitLab


From a3cb04013e8cc527c88c94045e9370e8f21d2be2 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 9 Dec 2011 21:56:03 +0100
Subject: [PATCH 043/546] Update OC_VObject

---
 apps/calendar/lib/object.php | 17 +++--------------
 lib/vobject.php              |  6 ++++++
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 1e834241f63..1c145003511 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -460,7 +460,7 @@ class OC_Calendar_Object{
 	{
 		$title = $request["title"];
 		$location = $request["location"];
-		$categories = isset($request["categories"]) ? $request["categories"] : null;
+		$categories = isset($request["categories"]) ? $request["categories"] : array();
 		$allday = isset($request["allday"]);
 		$from = $request["from"];
 		$to  = $request["to"];
@@ -511,20 +511,9 @@ class OC_Calendar_Object{
 		}
 		unset($vevent->DURATION);
 
-
 		$vevent->setString('LOCATION', $location);
-
-		if($description != ""){
-			$vevent->DESCRIPTION = $description;
-		}else{
-			unset($vevent->DESCRIPTION);
-		}
-
-		if(!empty($categories)){
-			$vevent->CATEGORIES = join(',', $categories);
-		}else{
-			unset($vevent->CATEGORIES);
-		}
+		$vevent->setString('DESCRIPTION', $description);
+		$vevent->setString('CATEGORIES', join(',', $categories));
 
 		/*if($repeat == "true"){
 			$vevent->RRULE = $repeat;
diff --git a/lib/vobject.php b/lib/vobject.php
index 5a76cfd2d43..e3479fc6d36 100644
--- a/lib/vobject.php
+++ b/lib/vobject.php
@@ -48,6 +48,7 @@ class OC_VObject{
 			}
 			return $vobject;
 		} catch (Exception $e) {
+			OC_Log::write('vobject', $e->getMessage(), OC_Log::ERROR);
 			return null;
 		}
 	}
@@ -132,6 +133,7 @@ class OC_VObject{
 
 	public function setString($name, $string){
 		if ($string != ''){
+			$string = strtr($string, array("\r\n"=>"\n"));
 			$this->vobject->__set($name, $string);
 		}else{
 			$this->vobject->__unset($name);
@@ -195,6 +197,10 @@ class OC_VObject{
 		return $this->vobject->__unset($name);
 	}
 
+	public function __isset($name){
+		return $this->vobject->__isset($name);
+	}
+
 	public function __call($function,$arguments){
 		return call_user_func_array(array($this->vobject, $function), $arguments);
 	}
-- 
GitLab


From 1746cba249328d92cf22bd81e367dd35dabed60c Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 9 Dec 2011 22:36:39 +0100
Subject: [PATCH 044/546] Some small changes

---
 apps/calendar/js/calendar.js |  5 ++---
 lib/updater.php              | 10 ----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 005e359f8eb..c3644b53704 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -7,7 +7,6 @@
  */
 
 Calendar={
-	space:' ',
 	UI:{
 		startEventDialog:function(){
 			$('.tipsy').remove();
@@ -271,9 +270,9 @@ Calendar={
 
 				var url;
 				if (calendarid == 'new'){
-					url = "ajax/createcalendar.php";
+					url = OC.filePath('calendar', 'ajax', 'createcalendar.php');
 				}else{
-					url = "ajax/updatecalendar.php";
+					url = OC.filePath('calendar', 'ajax', 'updatecalendar.php');
 				}
 				$.post(url, { id: calendarid, name: displayname, active: active, description: description, color: calendarcolor },
 					function(data){
diff --git a/lib/updater.php b/lib/updater.php
index e4db719a62c..cc4a4602539 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -52,13 +52,9 @@ class OC_Updater{
                 $tmp['url'] = $data->url;
                 $tmp['web'] = $data->web;
 
-
                 return $tmp;
-
 	}
 
-
-
 	public static function ShowUpdatingHint(){
 		$data=OC_Updater::check();
 		if(isset($data['version']) and $data['version']<>'') {
@@ -67,10 +63,8 @@ class OC_Updater{
 			$txt='Your ownCloud is up to date';
 		}
 		return($txt);
-
 	}
 
-
 	/**
 	 * do ownCloud update
 	 */
@@ -83,9 +77,5 @@ class OC_Updater{
 		//update version in config
 
 	}
-
 }
-
-
-
 ?>
-- 
GitLab


From 33caa64ccec78fea98b61485cb459987dfa2998c Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Sat, 10 Dec 2011 15:11:41 +0100
Subject: [PATCH 045/546] check for php version is greater than 5.3.0 - we make
 extensive use of Date Time Libs

---
 apps/calendar/appinfo/app.php | 40 ++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 5675e624dda..5dc41a77cab 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -1,25 +1,27 @@
 <?php
-$l=new OC_L10N('calendar');
-OC::$CLASSPATH['OC_Calendar_Calendar'] = 'apps/calendar/lib/calendar.php';
-OC::$CLASSPATH['OC_Calendar_Object'] = 'apps/calendar/lib/object.php';
-OC::$CLASSPATH['OC_Calendar_Hooks'] = 'apps/calendar/lib/hooks.php';
-OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/connector_sabre.php';
-OC_HOOK::connect('OC_User', 'post_createUser', 'OC_Calendar_Hooks', 'deleteUser');
+if(version_compare(PHP_VERSION, '5.3.0', '>')){
+	$l=new OC_L10N('calendar');
+	OC::$CLASSPATH['OC_Calendar_Calendar'] = 'apps/calendar/lib/calendar.php';
+	OC::$CLASSPATH['OC_Calendar_Object'] = 'apps/calendar/lib/object.php';
+	OC::$CLASSPATH['OC_Calendar_Hooks'] = 'apps/calendar/lib/hooks.php';
+	OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/connector_sabre.php';
+	OC_HOOK::connect('OC_User', 'post_createUser', 'OC_Calendar_Hooks', 'deleteUser');
 
-OC_Util::addScript('calendar','loader');
+	OC_Util::addScript('calendar','loader');
 
-OC_App::register( array( 
-  'order' => 10,
-  'id' => 'calendar',
-  'name' => 'Calendar' ));
+	OC_App::register( array( 
+	  'order' => 10,
+	  'id' => 'calendar',
+	  'name' => 'Calendar' ));
 
-OC_App::addNavigationEntry( array( 
-  'id' => 'calendar_index',
-  'order' => 10,
-  'href' => OC_Helper::linkTo( 'calendar', 'index.php' ),
-  'icon' => OC_Helper::imagePath( 'calendar', 'icon.png' ),
-  'name' => $l->t('Calendar')));
+	OC_App::addNavigationEntry( array( 
+	  'id' => 'calendar_index',
+	  'order' => 10,
+	  'href' => OC_Helper::linkTo( 'calendar', 'index.php' ),
+	  'icon' => OC_Helper::imagePath( 'calendar', 'icon.png' ),
+	  'name' => $l->t('Calendar')));
 
-OC_App::registerPersonal('calendar', 'settings');
+	OC_App::registerPersonal('calendar', 'settings');
 
-require_once('apps/calendar/lib/search.php');
\ No newline at end of file
+	require_once('apps/calendar/lib/search.php');
+}
\ No newline at end of file
-- 
GitLab


From 56f12cbfb1439dba6bdfd22023d84b3db153bf68 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Sat, 10 Dec 2011 17:54:42 +0100
Subject: [PATCH 046/546] delete unused files

---
 apps/calendar/ajax/daysofweekend.php     | 11 ---------
 apps/calendar/ajax/duration.php          | 12 ----------
 apps/calendar/ajax/firstdayofweek.php    | 12 ----------
 apps/calendar/ajax/setdaysofweekend.php  | 30 ------------------------
 apps/calendar/ajax/setduration.php       | 17 --------------
 apps/calendar/ajax/setfirstdayofweek.php | 16 -------------
 6 files changed, 98 deletions(-)
 delete mode 100755 apps/calendar/ajax/daysofweekend.php
 delete mode 100644 apps/calendar/ajax/duration.php
 delete mode 100755 apps/calendar/ajax/firstdayofweek.php
 delete mode 100755 apps/calendar/ajax/setdaysofweekend.php
 delete mode 100644 apps/calendar/ajax/setduration.php
 delete mode 100755 apps/calendar/ajax/setfirstdayofweek.php

diff --git a/apps/calendar/ajax/daysofweekend.php b/apps/calendar/ajax/daysofweekend.php
deleted file mode 100755
index 606d13b1e1c..00000000000
--- a/apps/calendar/ajax/daysofweekend.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-require_once('../../../lib/base.php');
-OC_JSON::checkLoggedIn();
-echo OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'weekend', '{"Monday":"false","Tuesday":"false","Wednesday":"false","Thursday":"false","Friday":"false","Saturday":"true","Sunday":"true"}');
-?> 
diff --git a/apps/calendar/ajax/duration.php b/apps/calendar/ajax/duration.php
deleted file mode 100644
index cdc41388abd..00000000000
--- a/apps/calendar/ajax/duration.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-require_once('../../../lib/base.php');
-OC_JSON::checkLoggedIn();
-$duration = OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'duration', "60");
-OC_JSON::encodedPrint(array("duration" => $duration));
-?> 
diff --git a/apps/calendar/ajax/firstdayofweek.php b/apps/calendar/ajax/firstdayofweek.php
deleted file mode 100755
index eff82cece1d..00000000000
--- a/apps/calendar/ajax/firstdayofweek.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-require_once('../../../lib/base.php');
-OC_JSON::checkLoggedIn();
-$firstdayofweek = OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'firstdayofweek', "1");
-OC_JSON::encodedPrint(array("firstdayofweek" => $firstdayofweek));
-?>
\ No newline at end of file
diff --git a/apps/calendar/ajax/setdaysofweekend.php b/apps/calendar/ajax/setdaysofweekend.php
deleted file mode 100755
index b5ef5f8573f..00000000000
--- a/apps/calendar/ajax/setdaysofweekend.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-require_once('../../../lib/base.php');
-OC_JSON::checkLoggedIn();
-$weekenddays = array("Monday"=>"false", "Tuesday"=>"false", "Wednesday"=>"false", "Thursday"=>"false", "Friday"=>"false", "Saturday"=>"false", "Sunday"=>"false");
-for($i = 0;$i < count($_POST["weekend"]); $i++){
-	switch ($_POST["weekend"][$i]){
-		case "Monday":
-		case "Tuesday":
-		case "Wednesday":
-		case "Thursday":
-		case "Friday":
-		case "Saturday":
-		case "Sunday":
-			break;
-		default:
-			OC_JSON::error();
-			exit;
-	}
-	$weekenddays[$_POST["weekend"][$i]] = "true";	
-}
-$setValue = json_encode($weekenddays);
-OC_Preferences::setValue(OC_User::getUser(), 'calendar', 'weekend', $setValue);
-OC_JSON::success();
-?> 
diff --git a/apps/calendar/ajax/setduration.php b/apps/calendar/ajax/setduration.php
deleted file mode 100644
index a75c8faea42..00000000000
--- a/apps/calendar/ajax/setduration.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-require_once('../../../lib/base.php');
-OC_JSON::checkLoggedIn();
-if(isset($_POST["duration"])){
-	OC_Preferences::setValue(OC_User::getUser(), 'calendar', 'duration', $_POST["duration"]);
-	OC_JSON::success();
-}else{
-	OC_JSON::error();
-}
-?> 
- 
diff --git a/apps/calendar/ajax/setfirstdayofweek.php b/apps/calendar/ajax/setfirstdayofweek.php
deleted file mode 100755
index 571b95af0e3..00000000000
--- a/apps/calendar/ajax/setfirstdayofweek.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-require_once('../../../lib/base.php');
-OC_JSON::checkLoggedIn();
-if(isset($_POST["firstdayofweek"])){
-	OC_Preferences::setValue(OC_User::getUser(), 'calendar', 'firstdayofweek', $_POST["firstdayofweek"]);
-	OC_JSON::success();
-}else{
-	OC_JSON::error();
-}
-?> 
-- 
GitLab


From c7b7758816445c400867e82f2174cdd9ef8b025c Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 11 Dec 2011 16:26:00 +0100
Subject: [PATCH 047/546] Updating of contact list when
 activating/adding/deleting address books now works.

---
 apps/contacts/ajax/activation.php             |  2 +-
 apps/contacts/ajax/chooseaddressbook.php      |  1 -
 apps/contacts/ajax/contacts.php               | 36 +++++++++++
 apps/contacts/index.php                       | 22 ++-----
 apps/contacts/js/interface.js                 | 58 ++++++++---------
 apps/contacts/lib/addressbook.php             | 63 ++++++++-----------
 apps/contacts/lib/vcard.php                   | 22 +------
 .../templates/part.chooseaddressbook.php      |  3 -
 .../part.chooseaddressbook.rowfields.php      |  3 +-
 apps/contacts/templates/part.contacts.php     |  2 +-
 10 files changed, 96 insertions(+), 116 deletions(-)
 create mode 100644 apps/contacts/ajax/contacts.php

diff --git a/apps/contacts/ajax/activation.php b/apps/contacts/ajax/activation.php
index 6e137692dac..49aaac97287 100644
--- a/apps/contacts/ajax/activation.php
+++ b/apps/contacts/ajax/activation.php
@@ -18,6 +18,6 @@ $book = OC_Contacts_Addressbook::find($bookid);
 
 /* is there an OC_JSON::error() ? */
 OC_JSON::success(array(
-	'active' => $book['active'],
+	'active' => OC_Contacts_Addressbook::isActive($bookid),
 	'bookid' => $bookid,
 ));
diff --git a/apps/contacts/ajax/chooseaddressbook.php b/apps/contacts/ajax/chooseaddressbook.php
index e150f97f541..f74b580eae7 100644
--- a/apps/contacts/ajax/chooseaddressbook.php
+++ b/apps/contacts/ajax/chooseaddressbook.php
@@ -12,7 +12,6 @@ if(!OC_USER::isLoggedIn()) {
 	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
 }
 OC_JSON::checkAppEnabled('contacts');
-OC_Log::write('contacts','chooseaddressbook.php',OC_Log::DEBUG);
 
 $output = new OC_TEMPLATE("contacts", "part.chooseaddressbook");
 $output -> printpage();
diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
new file mode 100644
index 00000000000..3c3bb5fe955
--- /dev/null
+++ b/apps/contacts/ajax/contacts.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+function contacts_namesort($a,$b){
+	return strcmp($a['fullname'],$b['fullname']);
+}
+
+require_once('../../../lib/base.php');
+if(!OC_USER::isLoggedIn()) {
+	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
+}
+OC_JSON::checkAppEnabled('contacts');
+
+$addressbooks = OC_Contacts_Addressbook::activeAddressbooks(OC_User::getUser());
+$contacts = array();
+foreach( $addressbooks as $addressbook ){
+	$addressbookcontacts = OC_Contacts_VCard::all($addressbook['id']);
+	foreach( $addressbookcontacts as $contact ){
+		if(is_null($contact['fullname'])){
+			continue;
+		}
+		$contacts[] = $contact;
+	}
+}
+usort($contacts,'contacts_namesort');
+$tmpl = new OC_TEMPLATE("contacts", "part.contacts");
+$tmpl->assign('contacts', $contacts);
+$page = $tmpl->fetchPage();
+
+OC_JSON::success(array('data' => array( 'page' => $page )));
+?>
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index f4624db31aa..cbd1dee1d91 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -31,18 +31,8 @@ require_once('../../lib/base.php');
 OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 
-// Check if the user has an addressbook
-$openaddressbooks = OC_Contacts_Addressbook::activeAddressbookIds(OC_User::getUser());
-OC_Log::write('contacts','Got IDs'.implode(',', $openaddressbooks),OC_Log::DEBUG);
-// if( count($addressbooks) == 0){
-// 	OC_Contacts_Addressbook::add(OC_User::getUser(),'default','Default Address Book');
-// 	$addressbooks = OC_Contacts_Addressbook::all(OC_User::getUser());
-// }
-// $prefbooks = OC_Preferences::getValue(OC_User::getUser(),'contacts','openaddressbooks',null);
-// if(is_null($prefbooks)){
-// 	$prefbooks = $addressbooks[0]['id'];
-// 	OC_Preferences::setValue(OC_User::getUser(),'contacts','openaddressbooks',$prefbooks);
-// }
+// Get active address books. This creates a default one if none exists.
+$addressbooks = OC_Contacts_Addressbook::activeAddressbooks(OC_User::getUser());
 
 // Load the files we need
 OC_App::setActiveNavigationEntry( 'contacts_index' );
@@ -52,19 +42,15 @@ $id = isset( $_GET['id'] ) ? $_GET['id'] : null;
 
 // sort addressbooks  (use contactsort)
 usort($addressbooks,'contacts_namesort');
-// Addressbooks to load
-//$openaddressbooks = explode(';',$prefbooks);
 
 $contacts = array();
-foreach( $openaddressbooks as $addressbook ){
-	$addressbookcontacts = OC_Contacts_VCard::all($addressbook);
-	OC_Log::write('contacts','index.php. Getting contacts for: '.$addressbook,OC_Log::DEBUG);
+foreach( $addressbooks as $addressbook ){
+	$addressbookcontacts = OC_Contacts_VCard::all($addressbook['id']);
 	foreach( $addressbookcontacts as $contact ){
 		if(is_null($contact['fullname'])){
 			continue;
 		}
 		$contacts[] = $contact;
-		//$contacts[] = array( 'name' => $contact['fullname'], 'id' => $contact['id'] );
 	}
 }
 
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index 2937e8a0925..f9539e8f363 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -6,19 +6,12 @@ Contacts={
 			$('#carddav_url').show();
 			$('#carddav_url_close').show();
 		},
-		Contacts:{
-			update:function(){
-				alert('Contacts.update()');
-			}
-		},
 		Addressbooks:{
 			overview:function(){
-				/* alert('overview');*/
 				if($('#chooseaddressbook_dialog').dialog('isOpen') == true){
 					$('#chooseaddressbook_dialog').dialog('moveToTop');
 				}else{
 					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(){
-						/*alert('Address books.load');*/
 						$('#chooseaddressbook_dialog').dialog({
 							width : 600,
 							close : function(event, ui) {
@@ -30,25 +23,17 @@ Contacts={
 			},
 			activation:function(checkbox, bookid)
 			{
-				/* TODO: 
-				 * Add integer field 'active' to table 'contacts_addressbooks'. See apps/contacts/README.tanghus */
 				$.post(OC.filePath('contacts', 'ajax', 'activation.php'), { bookid: bookid, active: checkbox.checked?1:0 },
 				  function(data) {
 					/*
 					 * Arguments:
 					 * data.status
 					 * data.bookid
+					 * data.active
 					 */
 					if (data.status == 'success'){
 						checkbox.checked = data.active == 1;
-						alert('TODO: Update Contacts list.');
-						/* TODO: Update Contacts list.
-						if (data.active == 1){
-							$('#calendar_holder').fullCalendar('addEventSource', data.eventSource);
-						}else{
-							$('#calendar_holder').fullCalendar('removeEventSource', data.eventSource.url);
-						}
-						*/
+						Contacts.UI.Contacts.update();
 					}
 				  });
 			},
@@ -71,10 +56,6 @@ Contacts={
 					$.post(OC.filePath('contacts', 'ajax', 'deletebook.php'), { id: bookid},
 					  function(data) {
 						if (data.status == 'success'){
-							/* alert('TODO: Update Contacts list.'); */
-							/* TODO: Update Contacts list.
-							var url = 'ajax/deletebook.php?id='+bookid;
-							$('#calendar_holder').fullCalendar('removeEventSource', url);*/
 							$('#chooseaddressbook_dialog').dialog('destroy').remove();
 							Contacts.UI.Contacts.update();
 							Contacts.UI.Addressbooks.overview();
@@ -105,6 +86,29 @@ Contacts={
 			cancel:function(button, bookid){
 				$(button).closest('tr').prev().show().next().remove();
 			}
+		},
+		Contacts:{
+			update:function(){
+				$.getJSON('ajax/contacts.php',{},function(jsondata){
+					if(jsondata.status == 'success'){
+						$('#contacts').html(jsondata.data.page);
+					}
+					else{
+						alert(jsondata.data.message);
+					}
+				});
+				/*
+				var contactlist = $('#contacts');
+				var contacts = contactlist.children('li').get();
+				//alert(contacts);
+				contacts.sort(function(a, b) {
+					var compA = $(a).text().toUpperCase();
+					var compB = $(b).text().toUpperCase();
+					return (compA < compB) ? -1 : (compA > compB) ? 1 : 0;
+				})
+				$.each(contacts, function(idx, itm) { contactlist.append(itm); });
+				*/
+			}
 		}
 	}
 }
@@ -192,18 +196,6 @@ $(document).ready(function(){
 
 	$('#chooseaddressbook').click(function(){
 		Contacts.UI.Addressbooks.overview();
-		/*
-		$.getJSON('ajax/showaddcard.php',{},function(jsondata){
-			if(jsondata.status == 'success'){
-				$('#rightcontent').data('id','');
-				$('#rightcontent').html(jsondata.data.page)
-					.find('select').chosen();
-			}
-			else{
-				alert(jsondata.data.message);
-			}
-		});
-		*/
 		return false;
 	});
 	
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 882a64bab88..23c0b106462 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -44,7 +44,6 @@ class OC_Contacts_Addressbook{
 	 * @return array
 	 */
 	public static function allAddressbooks($uid){
-		OC_Log::write('contacts','allAddressbooks',OC_Log::DEBUG);
 		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE userid = ? ORDER BY displayname' );
 		$result = $stmt->execute(array($uid));
 
@@ -56,24 +55,6 @@ class OC_Contacts_Addressbook{
 		return $addressbooks;
 	}
 
-	/**
-	 * @brief Returns the list of active addressbooks for a specific user.
-	 * @param string $uid
-	 * @return array
-	 */
-	public static function activeAddressbooks($uid){
-		$active = implode(',', self::activeAddressbookIds());
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id IN (?) AND userid = ? ORDER BY displayname' );
-		$result = $stmt->execute(array($active, $uid));
-
-		$addressbooks = array();
-		while( $row = $result->fetchRow()){
-			$addressbooks[] = $row;
-		}
-
-		return $addressbooks;
-	}
-
 	/**
 	 * @brief Returns the list of addressbooks for a principal (DAV term of user)
 	 * @param string $principaluri
@@ -181,6 +162,28 @@ class OC_Contacts_Addressbook{
 		return explode(';',$prefbooks);
 	}
 
+	/**
+	 * @brief Returns the list of active addressbooks for a specific user.
+	 * @param string $uid
+	 * @return array
+	 */
+	public static function activeAddressbooks($uid){
+		$active = self::activeAddressbookIds($uid);
+		$addressbooks = array();
+		/** FIXME: Is there a way to prepare a statement 'WHERE id IN ([range])'?
+		*/
+		foreach( $active as $aid ){
+			$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id = ? ORDER BY displayname' );
+			$result = $stmt->execute(array($aid,));
+
+			while( $row = $result->fetchRow()){
+				$addressbooks[] = $row;
+			}
+		}
+
+		return $addressbooks;
+	}
+
 	/**
 	 * @brief Activates an addressbook
 	 * @param integer $id
@@ -190,34 +193,23 @@ class OC_Contacts_Addressbook{
 	public static function setActive($id,$active){
 		// Need these ones for checking uri
 		//$addressbook = self::find($id);
-		OC_Log::write('contacts','setActive('.$id.'): '.$active,OC_Log::DEBUG);
 
 		if(is_null($id)){
 			$id = 0;
 		}
 
-		/**
-		* For now I have active state redundant both in preferences and in the address book
-		* table as I can't get the OC_Contacts_Addressbook::isActive() call to work when
-		* iterating over several results.
-		*/
-		$stmt = OC_DB::prepare( 'UPDATE *PREFIX*contacts_addressbooks SET active=?, ctag=ctag+1 WHERE id=?' );
-		$result = $stmt->execute(array($active,$id));
 		$openaddressbooks = self::activeAddressbookIds();
 		if($active) {
 			if(!in_array($id, $openaddressbooks)) {
-				// TODO: Test this instead
-				//$openaddressbooks[] = $id;
-				array_push($openaddressbooks, $id);
+				$openaddressbooks[] = $id;
 			}
-		} else {
+		} else { 
 			if(in_array($id, $openaddressbooks)) {
-				array_pop($openaddressbooks, $id);
-				$openaddressbooks = array_diff( $openaddressbooks, array($id) );
+				unset($openaddressbooks[array_search($id, $openaddressbooks)]);
 			}
 		}
 		sort($openaddressbooks, SORT_NUMERIC);
-		OC_Log::write('contacts','setActive('.$id.'):all '.implode(';', $openaddressbooks),OC_Log::DEBUG);
+		// FIXME: I alway end up with a ';' prepending when imploding the array..?
 		OC_Preferences::setValue(OC_User::getUser(),'contacts','openaddressbooks',implode(';', $openaddressbooks));
 
 		return true;
@@ -229,8 +221,6 @@ class OC_Contacts_Addressbook{
 	 * @return boolean
 	 */
 	public static function isActive($id){
-		OC_Log::write('contacts','isActive('.$id.')',OC_Log::DEBUG);
-		OC_Log::write('contacts','isActive('.$id.'): '.in_array($id, self::activeAddressbookIds()),OC_Log::DEBUG);
 		return in_array($id, self::activeAddressbookIds());
 	}
 
@@ -240,6 +230,7 @@ class OC_Contacts_Addressbook{
 	 * @return boolean
 	 */
 	public static function delete($id){
+		self::setActive($id, false);
 		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_addressbooks WHERE id = ?' );
 		$stmt->execute(array($id));
 
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 87f2ff5e666..7285761fd58 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -47,33 +47,13 @@ class OC_Contacts_VCard{
 	 * ['carddata']
 	 */
 	public static function all($id){
-  		OC_Log::write('contacts','OC_Contacts_VCard::all ids: '.$id,OC_Log::DEBUG);
-//		if(is_array($id)) {
-// 			OC_Log::write('contacts','OC_Contacts_VCard::all Array?: '.$id,OC_Log::DEBUG);
-// 			OC_Log::write('contacts','count: '.implode(',', $id),OC_Log::DEBUG);
-//  			$ids = implode(',', $id);
-// 			$prep = '?'.str_repeat ( ',?' , count($id)-1 );
-// 			//$repeat = str_repeat ( ',?' , count($id)-1 );
-// 			//OC_Log::write('contacts','OC_Contacts_VCard::all: repeat: '.$repeat,OC_Log::DEBUG);
-//  			OC_Log::write('contacts','OC_Contacts_VCard::all: from: '.$ids,OC_Log::DEBUG);
-//  			OC_Log::write('contacts','OC_Contacts_VCard::all: PREP: SELECT * FROM contacts_cards WHERE addressbookid IN ('.$prep.')',OC_Log::DEBUG);
-//  			OC_Log::write('contacts','OC_Contacts_VCard::all: SQL: SELECT * FROM contacts_cards WHERE addressbookid IN ('.$prep.')',OC_Log::DEBUG);
-//  			$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid IN ('.'?,?,?'.') ORDER BY fullname' );
-//  		} else {
-// 			$ids = $id;
-//  			$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? ORDER BY fullname' );
-//  		}
-
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ?' );
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? ORDER BY fullname' );
 		$result = $stmt->execute(array($id));
-		OC_Log::write('contacts','OC_Contacts_VCard::all: result->numRows(): '.$result->numRows(),OC_Log::DEBUG);
 
 		$cards = array();
 		while( $row = $result->fetchRow()){
 			$cards[] = $row;
-			//OC_Log::write('contacts','OC_Contacts_VCard::all: fullname: '.$row['fullname'],OC_Log::DEBUG);
 		}
-		OC_Log::write('contacts','OC_Contacts_VCard::all: count($cards): '.count($cards),OC_Log::DEBUG);
 
 		return $cards;
 	}
diff --git a/apps/contacts/templates/part.chooseaddressbook.php b/apps/contacts/templates/part.chooseaddressbook.php
index dc5978d2d03..9574903cf95 100644
--- a/apps/contacts/templates/part.chooseaddressbook.php
+++ b/apps/contacts/templates/part.chooseaddressbook.php
@@ -1,11 +1,8 @@
 <div id="chooseaddressbook_dialog" title="<?php echo $l->t("Choose active Address Books"); ?>">
 <table width="100%" style="border: 0;">
 <?php
-OC_Log::write('contacts','part.chooseaddressbook.php',OC_Log::DEBUG);
-
 $option_addressbooks = OC_Contacts_Addressbook::allAddressbooks(OC_User::getUser());
 for($i = 0; $i < count($option_addressbooks); $i++){
-	OC_Log::write('contacts','part.chooseaddressbook.php: '.$option_addressbooks[$i]['id'],OC_Log::DEBUG);
 	echo "<tr>";
 	$tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields');
 	$tmpl->assign('addressbook', $option_addressbooks[$i]);
diff --git a/apps/contacts/templates/part.chooseaddressbook.rowfields.php b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
index 4639ec20b14..f612e39ecaf 100644
--- a/apps/contacts/templates/part.chooseaddressbook.rowfields.php
+++ b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
@@ -1,6 +1,5 @@
 <?php
-	OC_Log::write('contacts','part.chooseaddressbook.rowfields.php',OC_Log::DEBUG);
 
 	echo "<td width=\"20px\"><input id=\"active_" . $_['addressbook']["id"] . "\" type=\"checkbox\" onClick=\"Contacts.UI.Addressbooks.activation(this, " . $_['addressbook']["id"] . ")\"" . (OC_Contacts_Addressbook::isActive($_['addressbook']["id"]) ? ' checked="checked"' : '') . "></td>";
-	echo "<td>Active: ".$_['active'].",ID: " . $_['addressbook']["id"] . " - <label for=\"active_" . $_['addressbook']["id"] . "\">" . $_['addressbook']["displayname"] . "</label></td>";
+	echo "<td><label for=\"active_" . $_['addressbook']["id"] . "\">" . $_['addressbook']["displayname"] . "</label></td>";
 	echo "<td width=\"20px\"><a href=\"#\" onclick=\"Contacts.UI.showCardDAVUrl('" . OC_User::getUser() . "', '" . $_['addressbook']["uri"] . "');\" title=\"" . $l->t("CardDav Link") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/public.svg\"></a></td><td width=\"20px\"><a href=\"export.php?bookid=" . $_['addressbook']["id"] . "\" title=\"" . $l->t("Download") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/download.svg\"></a></td><td width=\"20px\"><a  href=\"#\" title=\"" . $l->t("Edit") . "\" class=\"action\" onclick=\"Contacts.UI.Addressbooks.editAddressbook(this, " . $_['addressbook']["id"] . ");\"><img class=\"svg action\" src=\"../../core/img/actions/rename.svg\"></a></td><td width=\"20px\"><a href=\"#\" onclick=\"Contacts.UI.Addressbooks.deleteAddressbook('" . $_['addressbook']["id"] . "');\" title=\"" . $l->t("Delete") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/delete.svg\"></a></td>";
diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php
index c6772489ea2..8d89e9c7ad1 100644
--- a/apps/contacts/templates/part.contacts.php
+++ b/apps/contacts/templates/part.contacts.php
@@ -1,3 +1,3 @@
 <?php foreach( $_['contacts'] as $contact ): ?>
-	<li data-id="<?php echo $contact['id']; ?>"><?php echo $contact['addressbookid']; ?> - <a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $contact['fullname']; ?></a> </li>
+	<li book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $contact['fullname']; ?></a> </li>
 <?php endforeach; ?>
-- 
GitLab


From d55e689261314b3eae88f1477a3887adec361df1 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 11 Dec 2011 21:17:10 +0100
Subject: [PATCH 048/546] Added readme.tanghus

---
 apps/contacts/README.tanghus | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 apps/contacts/README.tanghus

diff --git a/apps/contacts/README.tanghus b/apps/contacts/README.tanghus
new file mode 100644
index 00000000000..d5b3fa23e11
--- /dev/null
+++ b/apps/contacts/README.tanghus
@@ -0,0 +1,19 @@
+As I like to run regular, automated backups of my PIM data I looked into an 
+easy way of getting the direct link to an address book, and noticed the 
+elegant way it was possible in the calendar, where you can click on the 
+'Calendars' button and download it directly.
+I modified the export.php script for the contacts app and can now run backups 
+with wget and http authentication. Hence the name 'tanghus_remote_backup' for
+this branch.
+Then I implemented the nice popup window function to get an UI for it and one 
+thing lead to another: 
+
+As for the Calendar app there's a js popup for address book activation, CardDAV link, export, 
+edit, delete and add address books.
+
+When making changes to the address books the contact list is updated to show the
+contacts in the active address book(s).
+
+When an address book is activated the setting is saved using OC_Preferences::setValue().
+
+Most of the code is copy/paste from the Calendar and Contacts apps ;-)
\ No newline at end of file
-- 
GitLab


From a8148fa94a6805ca7c6585e136905d5ec155a102 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 11 Dec 2011 22:08:01 +0100
Subject: [PATCH 049/546] update apps when their version number increases

---
 lib/app.php  | 29 +++++++++++++++++++++++++++++
 lib/base.php |  2 ++
 2 files changed, 31 insertions(+)

diff --git a/lib/app.php b/lib/app.php
index d3d99865762..b017ca7532f 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -362,4 +362,33 @@ class OC_App{
 		}
 		return $apps;
 	}
+	
+	/**
+	 * check if any apps need updating and update those
+	 */
+	public static function updateApps(){
+		// The rest comes here
+		$apps = OC_Appconfig::getApps();
+		foreach( $apps as $app ){
+			$installedVersion=OC_Appconfig::getValue($app,'installed_version');
+			$appInfo=OC_App::getAppInfo($app);
+			$currentVersion=$appInfo['version'];
+			if (version_compare($currentVersion, $installedVersion, '>')) {
+				OC_App::updateApp($app);
+			}
+		}
+	}
+	
+	/**
+	 * update the database for the app and call the update script
+	 * @param string appid
+	 */
+	public static function updateApp($appid){
+		if(file_exists(OC::$SERVERROOT.'/apps/'.$file.'/appinfo/database.xml')){
+			OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/apps/'.$file.'/appinfo/database.xml');
+		}
+		if(file_exists(OC::$SERVERROOT.'/apps/'.$file.'/appinfo/update.php')){
+			include OC::$SERVERROOT.'/apps/'.$file.'/appinfo/update.php';
+		}
+	}
 }
diff --git a/lib/base.php b/lib/base.php
index de2a7a673d5..548cc09823d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -134,6 +134,8 @@ class OC{
 			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
 		}
 
+		OC_App::updateApps();
+
 		ini_set('session.cookie_httponly','1;');
 		session_start();
 
-- 
GitLab


From b41ca8bacb8e1bdb9a28ab7e3e76b817262338d4 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 11 Dec 2011 23:23:59 +0100
Subject: [PATCH 050/546] after editing a user quota, set the value of the
 quota field to how the server parsed the input, not the user input

this way the user can see when an invalid input is given
---
 settings/ajax/setquota.php | 2 +-
 settings/js/users.js       | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index edbf5b74516..5c07285cfca 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -10,6 +10,6 @@ $quota= OC_Helper::computerFileSize($_POST["quota"]);
 
 // Return Success story
 OC_Preferences::setValue($username,'files','quota',$quota);
-OC_JSON::success(array("data" => array( "username" => $username ,'quota'=>$quota)));
+OC_JSON::success(array("data" => array( "username" => $username ,'quota'=>OC_Helper::humanFileSize($quota))));
 
 ?>
diff --git a/settings/js/users.js b/settings/js/users.js
index 684fee21c64..18e7a9df104 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -101,8 +101,11 @@ $(document).ready(function(){
 				if($(this).val().length>0){
 					$.post(
 						OC.filePath('settings','ajax','setquota.php'),
-						   {username:uid,quota:$(this).val()},
-						   function(result){}
+						{username:uid,quota:$(this).val()},
+						function(result){
+							img.parent().children('span').text(result.data.quota)
+							alert(result.data.quota);
+						}
 					);
 					input.blur();
 				}else{
-- 
GitLab


From bd65c18f21ca973e90334f74e3325ae449194d42 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 11 Dec 2011 23:32:57 +0100
Subject: [PATCH 051/546] also update the data attribute holding the quota

---
 settings/js/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index 18e7a9df104..4fea52e4a1f 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -104,7 +104,7 @@ $(document).ready(function(){
 						{username:uid,quota:$(this).val()},
 						function(result){
 							img.parent().children('span').text(result.data.quota)
-							alert(result.data.quota);
+							$(this).parent().attr('data-quota',result.data.quota);
 						}
 					);
 					input.blur();
-- 
GitLab


From efecb694eff7129d1ca24627ac366f3bcc939864 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 11 Dec 2011 23:33:24 +0100
Subject: [PATCH 052/546] make filesize parsing case insensitive

---
 lib/helper.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/helper.php b/lib/helper.php
index 5b3e394cafd..24d436225b7 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -160,24 +160,25 @@ class OC_Helper {
 	 */
 	public static function computerFileSize( $str ){
 		$bytes = 0;
+		$str=strtolower($str);
 
 		$bytes_array = array(
-			'B' => 1,
-			'K' => 1024,
-			'KB' => 1024,
-			'MB' => 1024 * 1024,
-			'M'  => 1024 * 1024,
-			'GB' => 1024 * 1024 * 1024,
-			'G'  => 1024 * 1024 * 1024,
-			'TB' => 1024 * 1024 * 1024 * 1024,
-			'T'  => 1024 * 1024 * 1024 * 1024,
-			'PB' => 1024 * 1024 * 1024 * 1024 * 1024,
-			'P'  => 1024 * 1024 * 1024 * 1024 * 1024,
+			'b' => 1,
+			'k' => 1024,
+			'kb' => 1024,
+			'mb' => 1024 * 1024,
+			'm'  => 1024 * 1024,
+			'gb' => 1024 * 1024 * 1024,
+			'g'  => 1024 * 1024 * 1024,
+			'tb' => 1024 * 1024 * 1024 * 1024,
+			't'  => 1024 * 1024 * 1024 * 1024,
+			'pb' => 1024 * 1024 * 1024 * 1024 * 1024,
+			'p'  => 1024 * 1024 * 1024 * 1024 * 1024,
 		);
 
 		$bytes = floatval($str);
 
-		if (preg_match('#([KMGTP]?B?)$#si', $str, $matches) && !empty($bytes_array[$matches[1]])) {
+		if (preg_match('#([kmgtp]?b?)$#si', $str, $matches) && !empty($bytes_array[$matches[1]])) {
 			$bytes *= $bytes_array[$matches[1]];
 		}
 
-- 
GitLab


From ccd9b56609ceb0d5f8470c386702751acfb49994 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 11 Dec 2011 23:23:59 +0100
Subject: [PATCH 053/546] after editing a user quota, set the value of the
 quota field to how the server parsed the input, not the user input

this way the user can see when an invalid input is given
---
 settings/ajax/setquota.php | 2 +-
 settings/js/users.js       | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index edbf5b74516..5c07285cfca 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -10,6 +10,6 @@ $quota= OC_Helper::computerFileSize($_POST["quota"]);
 
 // Return Success story
 OC_Preferences::setValue($username,'files','quota',$quota);
-OC_JSON::success(array("data" => array( "username" => $username ,'quota'=>$quota)));
+OC_JSON::success(array("data" => array( "username" => $username ,'quota'=>OC_Helper::humanFileSize($quota))));
 
 ?>
diff --git a/settings/js/users.js b/settings/js/users.js
index 684fee21c64..18e7a9df104 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -101,8 +101,11 @@ $(document).ready(function(){
 				if($(this).val().length>0){
 					$.post(
 						OC.filePath('settings','ajax','setquota.php'),
-						   {username:uid,quota:$(this).val()},
-						   function(result){}
+						{username:uid,quota:$(this).val()},
+						function(result){
+							img.parent().children('span').text(result.data.quota)
+							alert(result.data.quota);
+						}
 					);
 					input.blur();
 				}else{
-- 
GitLab


From 9c6d3a83fd0541ec95f13cef40f1030455391b13 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 11 Dec 2011 23:32:57 +0100
Subject: [PATCH 054/546] also update the data attribute holding the quota

---
 settings/js/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index 18e7a9df104..4fea52e4a1f 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -104,7 +104,7 @@ $(document).ready(function(){
 						{username:uid,quota:$(this).val()},
 						function(result){
 							img.parent().children('span').text(result.data.quota)
-							alert(result.data.quota);
+							$(this).parent().attr('data-quota',result.data.quota);
 						}
 					);
 					input.blur();
-- 
GitLab


From 5e711f37ca3f009317a3c8cd0e47ed4f15922142 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 11 Dec 2011 23:33:24 +0100
Subject: [PATCH 055/546] make filesize parsing case insensitive

---
 lib/helper.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/helper.php b/lib/helper.php
index 5b3e394cafd..24d436225b7 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -160,24 +160,25 @@ class OC_Helper {
 	 */
 	public static function computerFileSize( $str ){
 		$bytes = 0;
+		$str=strtolower($str);
 
 		$bytes_array = array(
-			'B' => 1,
-			'K' => 1024,
-			'KB' => 1024,
-			'MB' => 1024 * 1024,
-			'M'  => 1024 * 1024,
-			'GB' => 1024 * 1024 * 1024,
-			'G'  => 1024 * 1024 * 1024,
-			'TB' => 1024 * 1024 * 1024 * 1024,
-			'T'  => 1024 * 1024 * 1024 * 1024,
-			'PB' => 1024 * 1024 * 1024 * 1024 * 1024,
-			'P'  => 1024 * 1024 * 1024 * 1024 * 1024,
+			'b' => 1,
+			'k' => 1024,
+			'kb' => 1024,
+			'mb' => 1024 * 1024,
+			'm'  => 1024 * 1024,
+			'gb' => 1024 * 1024 * 1024,
+			'g'  => 1024 * 1024 * 1024,
+			'tb' => 1024 * 1024 * 1024 * 1024,
+			't'  => 1024 * 1024 * 1024 * 1024,
+			'pb' => 1024 * 1024 * 1024 * 1024 * 1024,
+			'p'  => 1024 * 1024 * 1024 * 1024 * 1024,
 		);
 
 		$bytes = floatval($str);
 
-		if (preg_match('#([KMGTP]?B?)$#si', $str, $matches) && !empty($bytes_array[$matches[1]])) {
+		if (preg_match('#([kmgtp]?b?)$#si', $str, $matches) && !empty($bytes_array[$matches[1]])) {
 			$bytes *= $bytes_array[$matches[1]];
 		}
 
-- 
GitLab


From 59ad0a6c9c9862792ec92f9ab53dfc30d54867fa Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 13 Dec 2011 10:39:31 +0100
Subject: [PATCH 056/546] Update README

---
 apps/contacts/README.tanghus | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/README.tanghus b/apps/contacts/README.tanghus
index d5b3fa23e11..28043063fcc 100644
--- a/apps/contacts/README.tanghus
+++ b/apps/contacts/README.tanghus
@@ -16,4 +16,7 @@ contacts in the active address book(s).
 
 When an address book is activated the setting is saved using OC_Preferences::setValue().
 
-Most of the code is copy/paste from the Calendar and Contacts apps ;-)
\ No newline at end of file
+Most of the code is copy/paste from the Calendar and Contacts apps ;-)
+
+Tested with fresh clone from git@gitorious.org:~tanghus/owncloud/tanghus-owncloud.git, removed
+database and config.php.
\ No newline at end of file
-- 
GitLab


From a9e94a34c9a80929d606c4d64711ad8ecaff35e0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Wed, 14 Dec 2011 01:15:07 +0100
Subject: [PATCH 057/546] use fscache for getting used space

---
 settings/personal.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/settings/personal.php b/settings/personal.php
index c27ca0aed63..c7964a2ef5a 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -16,7 +16,8 @@ OC_Util::addStyle( '3rdparty', 'chosen' );
 OC_App::setActiveNavigationEntry( 'personal' );
 
 // calculate the disc space
-$used=OC_Filesystem::filesize('/');
+$rootInfo=OC_FileCache::get('');
+$used=$rootInfo['size'];
 $free=OC_Filesystem::free_space();
 $total=$free+$used;
 $relative=round(($used/$total)*10000)/100;
-- 
GitLab


From 835d6a9b6e1be4eab22d138e0ef01e608a5597bf Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Wed, 14 Dec 2011 01:16:14 +0100
Subject: [PATCH 058/546] save quota in human readable format (42 MB), should
 prevent some of the overflow related problems

---
 lib/fileproxy/quota.php    | 4 +++-
 settings/ajax/setquota.php | 5 ++++-
 settings/users.php         | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index f770c9cb32b..94a49176ee6 100644
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -27,8 +27,10 @@
 
 class OC_FileProxy_Quota extends OC_FileProxy{
 	private function getFreeSpace(){
-		$usedSpace=OC_Filesystem::filesize('');
+		$rootInfo=OC_FileCache::get('');
+		$usedSpace=$rootInfo['size'];
 		$totalSpace=OC_Preferences::getValue(OC_User::getUser(),'files','quota',0);
+		$totalSpace=OC_Helper::computerFileSize($totalSpace);
 		if($totalSpace==0){
 			return 0;
 		}
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 5c07285cfca..d4e3c58ac11 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -6,10 +6,13 @@ require_once('../../lib/base.php');
 OC_JSON::checkAdminUser();
 
 $username = $_POST["username"];
+
+//make sure the quota is in the expected format
 $quota= OC_Helper::computerFileSize($_POST["quota"]);
+$quota=OC_Helper::humanFileSize($quota);
 
 // Return Success story
 OC_Preferences::setValue($username,'files','quota',$quota);
-OC_JSON::success(array("data" => array( "username" => $username ,'quota'=>OC_Helper::humanFileSize($quota))));
+OC_JSON::success(array("data" => array( "username" => $username ,'quota'=>$quota)));
 
 ?>
diff --git a/settings/users.php b/settings/users.php
index 686c4b6a9bf..e5dcc049481 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -18,7 +18,7 @@ $users = array();
 $groups = array();
 
 foreach( OC_User::getUsers() as $i ){
-	$users[] = array( "name" => $i, "groups" => join( ", ", OC_Group::getUserGroups( $i ) ),'quota'=>OC_Helper::humanFileSize(OC_Preferences::getValue($i,'files','quota',0)));
+	$users[] = array( "name" => $i, "groups" => join( ", ", OC_Group::getUserGroups( $i ) ),'quota'=>OC_Preferences::getValue($i,'files','quota',0));
 }
 
 foreach( OC_Group::getGroups() as $i ){
-- 
GitLab


From 3844fb0e4ce093bb3c2e67d20f85f61b7723efdc Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Wed, 14 Dec 2011 01:19:23 +0100
Subject: [PATCH 059/546] also use fscache when getting used space for webdav

---
 lib/connector/sabre/directory.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 139c6b784b1..bb03851e39d 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -116,11 +116,11 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 * @return array
 	 */
 	public function getQuotaInfo() {
-
+		$rootInfo=OC_FileCache::get('');
 		return array(
-			OC_Filesystem::filesize('/'),
+			$rootInfo['size'],
 			OC_Filesystem::free_space()
-			);
+		);
 
 	}
 
-- 
GitLab


From a862fec9a329c449b808e8d888764cbc9cc0bc19 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Wed, 14 Dec 2011 13:26:34 +0100
Subject: [PATCH 060/546] make remember login token also dependent on password
 to protect against some brute force attacks on this token

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 558733e1cda..2d759d68d7d 100644
--- a/index.php
+++ b/index.php
@@ -88,7 +88,7 @@ else {
 				if(defined("DEBUG") && DEBUG) {
 					OC_Log::write('core','Setting remember login to cookie',OC_Log::DEBUG);
 				}
-				$token = md5($_POST["user"].time());
+				$token = md5($_POST["user"].time().$_POST['password']);
 				OC_Preferences::setValue($_POST['user'], 'login', 'token', $token);
 				OC_User::setMagicInCookie($_POST["user"], $token);
 			}
-- 
GitLab


From 65214bed0c1c6058a1178b1501bf4f227ec471dc Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Fri, 16 Dec 2011 17:31:31 +0100
Subject: [PATCH 061/546] make the sharing app return the corrrect result for
 is_writable on the shared folder

---
 apps/files_sharing/sharedstorage.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index faf4e68d9b1..d78e273bf38 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -285,7 +285,9 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 	}
 	
 	public function is_writeable($path) {
-		if ($path == "" || $path == "/" || OC_Share::getPermissions($this->datadir.$path) & OC_Share::WRITE) {
+		if($path == "" || $path == "/"){
+			return false;
+		}elseif (OC_Share::getPermissions($this->datadir.$path) & OC_Share::WRITE) {
 			return true;
 		} else {
 			return false;
-- 
GitLab


From dc641943d9245b371eca1928a64bcadfe72f9cf6 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Fri, 16 Dec 2011 17:39:15 +0100
Subject: [PATCH 062/546] fix some display issues for readonly folders

---
 files/index.php           |  1 +
 files/templates/index.php | 63 ++++++++++++++++++---------------------
 2 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/files/index.php b/files/index.php
index 4b3bbd1bfd4..7e156130d8e 100644
--- a/files/index.php
+++ b/files/index.php
@@ -97,6 +97,7 @@ $tmpl = new OC_Template( "files", "index", "user" );
 $tmpl->assign( "fileList", $list->fetchPage() );
 $tmpl->assign( "breadcrumb", $breadcrumbNav->fetchPage() );
 $tmpl->assign( 'dir', $dir);
+$tmpl->assign( 'readonly', !OC_Filesystem::is_writeable($dir));
 $tmpl->assign( "files", $files );
 $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign( 'uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
diff --git a/files/templates/index.php b/files/templates/index.php
index 722c38e4776..c4acab25cc4 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -1,42 +1,37 @@
 <div id="controls">
 	<?php echo($_['breadcrumb']); ?>
-	<?php if (!isset($_['readonly']) || !$_['readonly']) {?>
-	<div class="actions">
-		<div id='new' class='button'>
-			<a>
-				<?php echo $l->t('New');?>
-			</a>
-			<ul class="popup popupTop">
-				<li style="background-image:url('<?php echo mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li>
-				<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li>
-<!-- 				<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='web'><p><?php echo $l->t('From the web');?></p></li> -->
-			</ul>
+	<?php if (!isset($_['readonly']) || !$_['readonly']):?>
+		<div class="actions">
+			<div id='new' class='button'>
+				<a>
+					<?php echo $l->t('New');?>
+				</a>
+				<ul class="popup popupTop">
+					<li style="background-image:url('<?php echo mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li>
+					<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li>
+	<!-- 				<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='web'><p><?php echo $l->t('From the web');?></p></li> -->
+				</ul>
+			</div>
+			<div class="file_upload_wrapper svg">
+				<form data-upload-id='1' class="file_upload_form" action="ajax/upload.php" method="post" enctype="multipart/form-data" target="file_upload_target_1">
+					<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
+					<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
+					<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
+					<button class="file_upload_filename"><img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button>
+					<input class="file_upload_start" type="file" name='files[]'/>
+						<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo  ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
+					<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
+				</form>
+			</div>
 		</div>
-		<div class="file_upload_wrapper svg">
-			<form data-upload-id='1' class="file_upload_form" action="ajax/upload.php" method="post" enctype="multipart/form-data" target="file_upload_target_1">
-				<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
-				<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
-				<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
-				<button class="file_upload_filename"><img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button>
-				<input class="file_upload_start" type="file" name='files[]'/>
-					<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo  ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
-				<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
-			</form>
-		</div>
-	</div>
-	<div id="file_action_panel">
-	</div>
+		<div id="file_action_panel"></div>
+	<?php endif;?>
 </div>
-<?php
-}
-?>
 <div id='notification'></div>
 
-<?php
-if (isset($_['files'])) {
- if (!count($_['files'])) { ?>
-<div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div>
-<?php }}?>
+<?php if (isset($_['files']) and ! $_['readonly'] and count($_['files'])==0):?>
+	<div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div>
+<?php endif; ?>
 
 <table>
 	<thead>
@@ -53,7 +48,7 @@ if (isset($_['files'])) {
 			<th id="headerDate"><span id="modified"><?php echo $l->t( 'Modified' ); ?></span><span class="selectedActions"><a href="" title="Delete" class="delete"><img class="svg" alt="<?php echo $l->t('Delete')?>" src="<?php echo image_path("core", "actions/delete.svg"); ?>" /></a></span></th>
 		</tr>
 	</thead>
-	<tbody id="fileList">
+	<tbody id="fileList" data-readonly="<?php echo $_['readonly'];?>">
 		<?php echo($_['fileList']); ?>
 	</tbody>
 </table>
-- 
GitLab


From feeb0c742a57eb542f6e904dd4c8b5310bcc066a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 16 Dec 2011 17:42:07 +0100
Subject: [PATCH 063/546] Misc. changes after review by bartv.

---
 apps/contacts/ajax/activation.php             |  7 +++---
 apps/contacts/ajax/addbook.php                |  4 +---
 apps/contacts/ajax/chooseaddressbook.php      |  4 +---
 apps/contacts/ajax/contacts.php               |  8 +++----
 apps/contacts/ajax/createaddressbook.php      |  2 +-
 apps/contacts/ajax/editaddressbook.php        |  6 ++---
 apps/contacts/ajax/showaddcard.php            |  2 +-
 apps/contacts/ajax/updateaddressbook.php      |  2 +-
 apps/contacts/export.php                      | 11 +++++----
 apps/contacts/index.php                       |  2 +-
 apps/contacts/js/interface.js                 |  2 +-
 apps/contacts/lib/addressbook.php             | 23 +++++++++++--------
 apps/contacts/lib/hooks.php                   |  2 +-
 apps/contacts/templates/index.php             |  2 +-
 .../templates/part.chooseaddressbook.php      |  2 +-
 .../templates/part.editaddressbook.php        |  2 +-
 16 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/apps/contacts/ajax/activation.php b/apps/contacts/ajax/activation.php
index 49aaac97287..f4a2c94a148 100644
--- a/apps/contacts/ajax/activation.php
+++ b/apps/contacts/ajax/activation.php
@@ -8,16 +8,15 @@
  */
 
 require_once ("../../../lib/base.php");
-if(!OC_USER::isLoggedIn()) {
-	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 $bookid = $_POST['bookid'];
 OC_Contacts_Addressbook::setActive($bookid, $_POST['active']);
-$book = OC_Contacts_Addressbook::find($bookid);
+$book = OC_Contacts_App::getAddressbook($bookid);
 
 /* is there an OC_JSON::error() ? */
 OC_JSON::success(array(
 	'active' => OC_Contacts_Addressbook::isActive($bookid),
 	'bookid' => $bookid,
+	'book'   => $book,
 ));
diff --git a/apps/contacts/ajax/addbook.php b/apps/contacts/ajax/addbook.php
index d8e5a0ecd59..36acb9af391 100644
--- a/apps/contacts/ajax/addbook.php
+++ b/apps/contacts/ajax/addbook.php
@@ -8,9 +8,7 @@
 
 require_once('../../../lib/base.php');
 $l10n = new OC_L10N('contacts');
-if(!OC_USER::isLoggedIn()) {
-	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 $book = array(
 	'id' => 'new',
diff --git a/apps/contacts/ajax/chooseaddressbook.php b/apps/contacts/ajax/chooseaddressbook.php
index f74b580eae7..b0a10bb3118 100644
--- a/apps/contacts/ajax/chooseaddressbook.php
+++ b/apps/contacts/ajax/chooseaddressbook.php
@@ -8,9 +8,7 @@
 
 require_once('../../../lib/base.php');
 $l10n = new OC_L10N('contacts');
-if(!OC_USER::isLoggedIn()) {
-	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 
 $output = new OC_TEMPLATE("contacts", "part.chooseaddressbook");
diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
index 3c3bb5fe955..b34cf414249 100644
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@@ -7,16 +7,14 @@
  */
 
 function contacts_namesort($a,$b){
-	return strcmp($a['fullname'],$b['fullname']);
+	return strcasecmp($a['fullname'],$b['fullname']);
 }
 
 require_once('../../../lib/base.php');
-if(!OC_USER::isLoggedIn()) {
-	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 
-$addressbooks = OC_Contacts_Addressbook::activeAddressbooks(OC_User::getUser());
+$addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());
 $contacts = array();
 foreach( $addressbooks as $addressbook ){
 	$addressbookcontacts = OC_Contacts_VCard::all($addressbook['id']);
diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php
index 8fec07ebcae..f94ad34e8dc 100644
--- a/apps/contacts/ajax/createaddressbook.php
+++ b/apps/contacts/ajax/createaddressbook.php
@@ -17,7 +17,7 @@ OC_JSON::checkAppEnabled('contacts');
 $userid = OC_User::getUser();
 $bookid = OC_Contacts_Addressbook::add($userid, $_POST['name'], null);
 OC_Contacts_Addressbook::setActive($bookid, 1);
-$addressbook = OC_Contacts_Addressbook::find($bookid);
+$addressbook = OC_Contacts_App::getAddressbook($bookid);
 $tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields');
 $tmpl->assign('addressbook', $addressbook);
 OC_JSON::success(array(
diff --git a/apps/contacts/ajax/editaddressbook.php b/apps/contacts/ajax/editaddressbook.php
index abdad09dea0..ced673ce807 100644
--- a/apps/contacts/ajax/editaddressbook.php
+++ b/apps/contacts/ajax/editaddressbook.php
@@ -8,11 +8,9 @@
 
 require_once('../../../lib/base.php');
 $l10n = new OC_L10N('contacts');
-if(!OC_USER::isLoggedIn()) {
-	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
-$addressbook = OC_Contacts_Addressbook::find($_GET['bookid']);
+$addressbook = OC_Contacts_App::getAddressbook($_GET['bookid']);
 $tmpl = new OC_Template("contacts", "part.editaddressbook");
 $tmpl->assign('new', false);
 $tmpl->assign('addressbook', $addressbook);
diff --git a/apps/contacts/ajax/showaddcard.php b/apps/contacts/ajax/showaddcard.php
index 92e24216c5e..54592c89c0d 100644
--- a/apps/contacts/ajax/showaddcard.php
+++ b/apps/contacts/ajax/showaddcard.php
@@ -30,7 +30,7 @@ OC_JSON::checkAppEnabled('contacts');
 $adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
 $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
 
-$addressbooks = OC_Contacts_Addressbook::allAddressbooks(OC_USER::getUser());
+$addressbooks = OC_Contacts_Addressbook::all(OC_USER::getUser());
 $tmpl = new OC_Template('contacts','part.addcardform');
 $tmpl->assign('addressbooks',$addressbooks);
 $tmpl->assign('adr_types',$adr_types);
diff --git a/apps/contacts/ajax/updateaddressbook.php b/apps/contacts/ajax/updateaddressbook.php
index 011dfc35d1a..516736cc502 100644
--- a/apps/contacts/ajax/updateaddressbook.php
+++ b/apps/contacts/ajax/updateaddressbook.php
@@ -17,7 +17,7 @@ OC_JSON::checkAppEnabled('contacts');
 $bookid = $_POST['id'];
 OC_Contacts_Addressbook::edit($bookid, $_POST['name'], null);
 OC_Contacts_Addressbook::setActive($bookid, $_POST['active']);
-$addressbook = OC_Contacts_Addressbook::find($bookid);
+$addressbook = OC_Contacts_App::getAddressbook($bookid);
 $tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields');
 $tmpl->assign('addressbook', $addressbook);
 OC_JSON::success(array(
diff --git a/apps/contacts/export.php b/apps/contacts/export.php
index 4a1e7a172d4..fd2d7da1750 100644
--- a/apps/contacts/export.php
+++ b/apps/contacts/export.php
@@ -12,21 +12,22 @@ OC_Util::checkAppEnabled('contacts');
 $book = isset($_GET['bookid']) ? $_GET['bookid'] : NULL;
 $contact = isset($_GET['contactid']) ? $_GET['contactid'] : NULL;
 if(isset($book)){
-	$addressbook = OC_Contacts_Addressbook::find($book);
+	$addressbook = OC_Contacts_App::getAddressbook($book);
 	if($addressbook['userid'] != OC_User::getUser()){
 		OC_JSON::error();
 		exit;
 	}
 	$cardobjects = OC_Contacts_VCard::all($book);
 	header('Content-Type: text/directory');
-	header('Content-Disposition: inline; filename=' . $addressbook['displayname'] . '.vcf'); 
+	header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $addressbook['displayname']) . '.vcf'); 
 	for($i = 0;$i <= count($cardobjects); $i++){
-		echo trim($cardobjects[$i]['carddata']) . '\n';
+		echo $cardobjects[$i]['carddata'];
+		//echo '\r\n';
 	}
 }elseif(isset($contact)){	
-	$data = OC_Contacts_VCard::find($contact);
+	$data = OC_Contacts_App::getContactObject($contact);
 	$addressbookid = $data['addressbookid'];
-	$addressbook = OC_Contacts_Addressbook::find($addressbookid);
+	$addressbook = OC_Contacts_App::getAddressbook($addressbookid);
 	if($addressbook['userid'] != OC_User::getUser()){
 		OC_JSON::error();
 		exit;
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index cbd1dee1d91..235e025cd82 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -32,7 +32,7 @@ OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 
 // Get active address books. This creates a default one if none exists.
-$addressbooks = OC_Contacts_Addressbook::activeAddressbooks(OC_User::getUser());
+$addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());
 
 // Load the files we need
 OC_App::setActiveNavigationEntry( 'contacts_index' );
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index f9539e8f363..02470d5a767 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -1,5 +1,4 @@
 Contacts={
-	space:' ',
 	UI:{
 		showCardDAVUrl:function(username, bookname){
 			$('#carddav_url').val(totalurl + '/' + username + '/' + bookname);
@@ -82,6 +81,7 @@ Contacts={
 							$(button).closest('tr').prev().html(data.page).show().next().remove();
 						}
 					});
+				Contacts.UI.Contacts.update();
 			},
 			cancel:function(button, bookid){
 				$(button).closest('tr').prev().show().next().remove();
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 23c0b106462..7d55a00d601 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -43,7 +43,7 @@ class OC_Contacts_Addressbook{
 	 * @param string $uid
 	 * @return array
 	 */
-	public static function allAddressbooks($uid){
+	public static function all($uid){
 		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE userid = ? ORDER BY displayname' );
 		$result = $stmt->execute(array($uid));
 
@@ -62,7 +62,7 @@ class OC_Contacts_Addressbook{
 	 */
 	public static function allWherePrincipalURIIs($principaluri){
 		$uid = self::extractUserID($principaluri);
-		return self::allAddressbooks($uid);
+		return self::all($uid);
 	}
 
 	/**
@@ -85,7 +85,7 @@ class OC_Contacts_Addressbook{
 	 * @return insertid
 	 */
 	public static function add($userid,$name,$description){
-		$all = self::allAddressbooks($userid);
+		$all = self::all($userid);
 		$uris = array();
 		foreach($all as $i){
 			$uris[] = $i['uri'];
@@ -145,16 +145,16 @@ class OC_Contacts_Addressbook{
 	 * @param integer $uid User id. If null current user will be used.
 	 * @return array
 	 */
-	public static function activeAddressbookIds($uid){
+	public static function activeIds($uid){
 		if(is_null($uid)){
 			$uid = OC_User::getUser();
 		}
 		$prefbooks = OC_Preferences::getValue($uid,'contacts','openaddressbooks',null);
 		if(is_null($prefbooks)){
-			$addressbooks = OC_Contacts_Addressbook::allAddressbooks($uid);
+			$addressbooks = OC_Contacts_Addressbook::all($uid);
 			if(count($addressbooks) == 0){
 				OC_Contacts_Addressbook::add($uid,'default','Default Address Book');
-				$addressbooks = OC_Contacts_Addressbook::allAddressbooks($uid);
+				$addressbooks = OC_Contacts_Addressbook::all($uid);
 			}
 			$prefbooks = $addressbooks[0]['id'];
 			OC_Preferences::setValue($uid,'contacts','openaddressbooks',$prefbooks);
@@ -167,8 +167,8 @@ class OC_Contacts_Addressbook{
 	 * @param string $uid
 	 * @return array
 	 */
-	public static function activeAddressbooks($uid){
-		$active = self::activeAddressbookIds($uid);
+	public static function active($uid){
+		$active = self::activeIds($uid);
 		$addressbooks = array();
 		/** FIXME: Is there a way to prepare a statement 'WHERE id IN ([range])'?
 		*/
@@ -198,7 +198,7 @@ class OC_Contacts_Addressbook{
 			$id = 0;
 		}
 
-		$openaddressbooks = self::activeAddressbookIds();
+		$openaddressbooks = self::activeIds();
 		if($active) {
 			if(!in_array($id, $openaddressbooks)) {
 				$openaddressbooks[] = $id;
@@ -221,7 +221,10 @@ class OC_Contacts_Addressbook{
 	 * @return boolean
 	 */
 	public static function isActive($id){
-		return in_array($id, self::activeAddressbookIds());
+		//if(defined("DEBUG") && DEBUG) {
+			OC_Log::write('contacts','OC_Contacts_Addressbook::isActive('.$id.'):'.in_array($id, self::activeIds()),OC_Log::DEBUG);
+		//}
+		return in_array($id, self::activeIds());
 	}
 
 	/**
diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php
index 356ae26df97..155cf40f914 100644
--- a/apps/contacts/lib/hooks.php
+++ b/apps/contacts/lib/hooks.php
@@ -30,7 +30,7 @@ class OC_Contacts_Hooks{
 	 * @return array
 	 */
 	public function deleteUser($parameters) {
-		$addressbooks = OC_Contacts_Addressbook::allAddressbooks($parameters['uid']);
+		$addressbooks = OC_Contacts_Addressbook::all($parameters['uid']);
 
 		foreach($addressbooks as $addressbook) {
 			OC_Contacts_Addressbook::delete($addressbook['id']);
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 44505031c64..8592ffe1c4c 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -1,5 +1,5 @@
 <script type='text/javascript'>
-	var totalurl = '<?php echo OC_Helper::linkTo('apps/contacts', 'carddav.php', null, true); ?>/addressbooks';
+	var totalurl = '<?php echo OC_Helper::linkTo('contacts', 'carddav.php', null, true); ?>/addressbooks';
 </script>
 <div id="controls">
 	<form>
diff --git a/apps/contacts/templates/part.chooseaddressbook.php b/apps/contacts/templates/part.chooseaddressbook.php
index 9574903cf95..ba008837f0e 100644
--- a/apps/contacts/templates/part.chooseaddressbook.php
+++ b/apps/contacts/templates/part.chooseaddressbook.php
@@ -1,7 +1,7 @@
 <div id="chooseaddressbook_dialog" title="<?php echo $l->t("Choose active Address Books"); ?>">
 <table width="100%" style="border: 0;">
 <?php
-$option_addressbooks = OC_Contacts_Addressbook::allAddressbooks(OC_User::getUser());
+$option_addressbooks = OC_Contacts_Addressbook::all(OC_User::getUser());
 for($i = 0; $i < count($option_addressbooks); $i++){
 	echo "<tr>";
 	$tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields');
diff --git a/apps/contacts/templates/part.editaddressbook.php b/apps/contacts/templates/part.editaddressbook.php
index 4e63ce5ec17..cb1371731b1 100644
--- a/apps/contacts/templates/part.editaddressbook.php
+++ b/apps/contacts/templates/part.editaddressbook.php
@@ -18,7 +18,7 @@
 <tr>
 	<td></td>
 	<td>
-		<input id="edit_active_<?php echo $_['addressbook']['id'] ?>" type="checkbox"<?php echo $_['addressbook']['active'] ? ' checked="checked"' : '' ?>>
+		<input id="edit_active_<?php echo $_['addressbook']['id'] ?>" type="checkbox"<?php echo  OC_Contacts_Addressbook::isActive($_['addressbook']['id']) ? ' checked="checked"' : '' ?>>
 		<label for="edit_active_<?php echo $_['addressbook']['id'] ?>">
 			<?php echo $l->t('Active') ?>
 		</label>
-- 
GitLab


From a7b048dc05b4fd5d81cf769e1662e1381b305682 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 17 Dec 2011 20:05:54 +0100
Subject: [PATCH 064/546] Added thumbnails to contact list. The contacts have a
 default thumbnail when the page is first loaded. Once the page is loaded the
 thumbnails will be lazy-loaded to the contacts viewable.

---
 apps/contacts/css/styles.css      |   1 +
 apps/contacts/js/interface.js     | 146 ++++++++++++++++++++++++++++++
 apps/contacts/templates/index.php |   3 +-
 3 files changed, 149 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/css/styles.css b/apps/contacts/css/styles.css
index f351589fe12..8678ca99244 100644
--- a/apps/contacts/css/styles.css
+++ b/apps/contacts/css/styles.css
@@ -1,3 +1,4 @@
+#contacts li { padding-left:25px;background:url('../img/person.svg') no-repeat; }
 #contacts_details_name { font-weight:bold;font-size:1.1em;margin-left:25%;}
 #contacts_details_photo { margin:.5em 0em .5em 25%; }
 
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index eb81e872682..93fb13372b2 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -1,3 +1,118 @@
+Contacts={
+	UI:{
+		showCardDAVUrl:function(username, bookname){
+			$('#carddav_url').val(totalurl + '/' + username + '/' + bookname);
+			$('#carddav_url').show();
+			$('#carddav_url_close').show();
+		},
+		Addressbooks:{
+			overview:function(){
+				if($('#chooseaddressbook_dialog').dialog('isOpen') == true){
+					$('#chooseaddressbook_dialog').dialog('moveToTop');
+				}else{
+					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(){
+						$('#chooseaddressbook_dialog').dialog({
+							width : 600,
+							close : function(event, ui) {
+								$(this).dialog('destroy').remove();
+							}
+						});
+					});
+				}
+			},
+			activation:function(checkbox, bookid)
+			{
+				$.post(OC.filePath('contacts', 'ajax', 'activation.php'), { bookid: bookid, active: checkbox.checked?1:0 },
+				  function(data) {
+					/*
+					 * Arguments:
+					 * data.status
+					 * data.bookid
+					 * data.active
+					 */
+					if (data.status == 'success'){
+						checkbox.checked = data.active == 1;
+						Contacts.UI.Contacts.update();
+					}
+				  });
+			},
+			newAddressbook:function(object){
+				var tr = $(document.createElement('tr'))
+					.load(OC.filePath('contacts', 'ajax', 'addbook.php'));
+				$(object).closest('tr').after(tr).hide();
+				/* TODO: Shouldn't there be some kinda error checking here? */
+			},
+			editAddressbook:function(object, bookid){
+				var tr = $(document.createElement('tr'))
+					.load(OC.filePath('contacts', 'ajax', 'editaddressbook.php') + "?bookid="+bookid);
+				$(object).closest('tr').after(tr).hide();
+			},
+			deleteAddressbook:function(bookid){
+				var check = confirm("Do you really want to delete this address book?");
+				if(check == false){
+					return false;
+				}else{
+					$.post(OC.filePath('contacts', 'ajax', 'deletebook.php'), { id: bookid},
+					  function(data) {
+						if (data.status == 'success'){
+							$('#chooseaddressbook_dialog').dialog('destroy').remove();
+							Contacts.UI.Contacts.update();
+							Contacts.UI.Addressbooks.overview();
+						} else {
+							alert('Error: ' + data.message);
+						}
+					  });
+				}
+			},
+			submit:function(button, bookid){
+				var displayname = $("#displayname_"+bookid).val();
+				var active = $("#edit_active_"+bookid+":checked").length;
+				var description = $("#description_"+bookid).val();
+
+				var url;
+				if (bookid == 'new'){
+					url = OC.filePath('contacts', 'ajax', 'createaddressbook.php');
+				}else{
+					url = OC.filePath('contacts', 'ajax', 'updateaddressbook.php');
+				}
+				$.post(url, { id: bookid, name: displayname, active: active, description: description },
+					function(data){
+						if(data.status == 'success'){
+							$(button).closest('tr').prev().html(data.page).show().next().remove();
+						}
+					});
+				Contacts.UI.Contacts.update();
+			},
+			cancel:function(button, bookid){
+				$(button).closest('tr').prev().show().next().remove();
+			}
+		},
+		Contacts:{
+			update:function(){
+				$.getJSON('ajax/contacts.php',{},function(jsondata){
+					if(jsondata.status == 'success'){
+						$('#contacts').html(jsondata.data.page);
+					}
+					else{
+						alert(jsondata.data.message);
+					}
+				});
+				/*
+				var contactlist = $('#contacts');
+				var contacts = contactlist.children('li').get();
+				//alert(contacts);
+				contacts.sort(function(a, b) {
+					var compA = $(a).text().toUpperCase();
+					var compB = $(b).text().toUpperCase();
+					return (compA < compB) ? -1 : (compA > compB) ? 1 : 0;
+				})
+				$.each(contacts, function(idx, itm) { contactlist.append(itm); });
+				*/
+			}
+		}
+	}
+}
+
 $(document).ready(function(){
 	/*-------------------------------------------------------------------------
 	 * Event handlers
@@ -79,6 +194,11 @@ $(document).ready(function(){
 		return false;
 	});
 
+	$('#chooseaddressbook').click(function(){
+		Contacts.UI.Addressbooks.overview();
+		return false;
+	});
+	
 	$('#contacts_newcontact').click(function(){
 		$.getJSON('ajax/showaddcard.php',{},function(jsondata){
 			if(jsondata.status == 'success'){
@@ -159,4 +279,30 @@ $(document).ready(function(){
 	});
 
 	$('#contacts_addcardform select').chosen();
+
+	$('#contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+		if (isInView) { //NOTE: I've kept all conditions for future reference ;-)
+			// element is now visible in the viewport
+			if (visiblePartY == 'top') {
+				// top part of element is visible
+			} else if (visiblePartY == 'bottom') {
+				// bottom part of element is visible
+			} else {
+				// whole part of element is visible
+				if (!$(this).attr('style')) {
+					//alert($(this).data('id') + ' has background: ' + $(this).attr('style'));
+					$(this).css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
+				}/* else {
+					alert($(this).data('id') + ' has style ' + $(this).attr('style').match('url'));
+				}*/
+			}
+		} else {
+			// element has gone out of viewport
+		}
+	});
+	/*
+	$('#contacts li').each(function(index) {
+		$(this).css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
+	});
+	*/
 });
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 649c4807dd5..bada45ee0ec 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -1,5 +1,6 @@
 <?php // Include Style and Script
 OC_Util::addScript('contacts','interface');
+OC_Util::addScript('contacts','jquery.inview');
 OC_Util::addStyle('contacts','styles');
 OC_Util::addStyle('contacts','formtastic');
 ?>
@@ -10,7 +11,7 @@ OC_Util::addStyle('contacts','formtastic');
 	</form>
 </div>
 <div id="leftcontent" class="leftcontent">
-	<ul>
+	<ul id="contacts">
 		<?php echo $this->inc("part.contacts"); ?>
 	</ul>
 </div>
-- 
GitLab


From 092c41f375d70c9936bf010806dce1b34c05f43e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 17 Dec 2011 20:38:52 +0100
Subject: [PATCH 065/546] Added missing files and tried to revert the wrong
 commit of app/contacts/js/interfaces.js

---
 apps/contacts/img/person.png      | Bin 0 -> 978 bytes
 apps/contacts/img/person.svg      | 175 ++++++++++++++++++++++++++++++
 apps/contacts/js/interface.js     | 125 ---------------------
 apps/contacts/js/jquery.inview.js | 118 ++++++++++++++++++++
 apps/contacts/thumbnail.php       | 150 +++++++++++++++++++++++++
 5 files changed, 443 insertions(+), 125 deletions(-)
 create mode 100644 apps/contacts/img/person.png
 create mode 100644 apps/contacts/img/person.svg
 create mode 100644 apps/contacts/js/jquery.inview.js
 create mode 100644 apps/contacts/thumbnail.php

diff --git a/apps/contacts/img/person.png b/apps/contacts/img/person.png
new file mode 100644
index 0000000000000000000000000000000000000000..17e791965402a1b9335d662b8909a8d392870416
GIT binary patch
literal 978
zcmV;@11<cCP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H115ZgrK~y-6oz%ZiBS#bm@bAugcl{$W5*Vz&A;&@Hd=w|0?yo>f
z>ysiVXfH*oNTJCUiFBe(drhk73P%(vLc>+5PZUT{oPpR;i~#{&+v}a3AMd4!5#+!p
zd8F5j_I>uN*?H?QGsdl*ot;1k@q-ZJYi3?_9OrK$dP_t<t*)*n5A`|Y;Cj8D$>;NX
z^YimxluD%_m&;)=7@*l~Chd0nuYSM(tX8YV_w|Z#X|vhv>teB3URhZQJkLX~*8>1l
ztJR=TD3r6=?CXbm$HL6~qFgTf#u#X=K|~l1hv@hFD3wY+GryP!Hpa|)o`)n!V66oa
zftewtgzx*%TF*`d12~JK2&2Te@xfpK0A~}yMD(H8>%m$Jtu?gPFvi@#MD$@ISShvN
z?RI&T*cbz242TF}7_!!Se<Iiz^V`wUkr@t$AR=h3!OT!fq19?>Ywhn7!Rzbme=_qg
zdwY9ON`Z)At;NB?0j#xutgWrRn+OJgsi~>AzVGY9!$VwOU*qKD1X4=M<#Iod>-!`u
zgotNmW@ILlL95k*loE4ub212m?zp}OM|yX6cS>vhEr9PTl}e^iD0o*_SD2oj#_8#)
zIzB#*nE6#4$8T!2n))PMuh(aTAow1@%f-b-cWG%UU}iL%O@v{Hd_Ip-sRX4I8jXg$
zxVVUj=*KV&-)wAb$a~@K?d{Kn5C_$2HMg*^;CY@0W`?!)ri?ML)*_Wk!Sg)Cag0Wz
z5ucx*heY(OR;zUYAay&fQtIXM^73cJVlg!w4&gWs9LE6wFf)kgrj$~!*1~mNR4SEB
z5Co}4qwx)ZS0BOF+NVJfr273nj4>a<qq_Y9B7&3>>2%s-=BFd;4y?6)JQ~;0kLLEe
z??Y>?;W!Rl*M-*l@o4|fbyG?`a$OfhgeZ#cq<rZ1L{S7Hf)D~qsYmz0j@G(+c6Np&
zNzmzZAcVMc95)aCw<m-^r_+Iy5}i&5TI((V=l@5+Ns@fEzrX)05tW$PwbrH!g@Th#
zr;*8I;QKz5Qi$UiQc7H2UUIwLmhE=i3L%<W>ooujJTM?zTU*ZoJa=8U?7Hp~$8o+S
zq6KU1l<T^o5aJ(ZKDO2#T5C@Lyx-j1e1F^c7g6goY&SB|-T(jq07*qoM6N<$g6)jY
ArT_o{

literal 0
HcmV?d00001

diff --git a/apps/contacts/img/person.svg b/apps/contacts/img/person.svg
new file mode 100644
index 00000000000..c4842c5916b
--- /dev/null
+++ b/apps/contacts/img/person.svg
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="22"
+   height="22"
+   id="svg11300">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         style="stop-color:#b8b8b8;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3789"
+         style="stop-color:#878787;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6954">
+      <stop
+         id="stop6960"
+         style="stop-color:#f5f5f5;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6962"
+         style="stop-color:#d2d2d2;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3341">
+      <stop
+         id="stop3343"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3345"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5060">
+      <stop
+         id="stop5062"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5064"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="24.999998"
+       cy="28.659998"
+       r="16"
+       fx="24.999998"
+       fy="28.659998"
+       id="radialGradient2871"
+       xlink:href="#linearGradient6954"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.67742373,0,0,0.19285627,-5.0162555,9.9977318)" />
+    <linearGradient
+       x1="30"
+       y1="25.084745"
+       x2="30"
+       y2="45"
+       id="linearGradient2873"
+       xlink:href="#linearGradient3785"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51613236,0,0,0.51667107,-0.98397254,-0.49180897)" />
+    <linearGradient
+       x1="29.996229"
+       y1="21.440447"
+       x2="29.996229"
+       y2="43.531425"
+       id="linearGradient2875"
+       xlink:href="#linearGradient3341"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51613236,0,0,0.51667107,-0.98397254,-0.49180897)" />
+    <radialGradient
+       cx="26.375898"
+       cy="12.31301"
+       r="8"
+       fx="26.375898"
+       fy="12.31301"
+       id="radialGradient2877"
+       xlink:href="#linearGradient6954"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.86552039,-0.07102871,0.06760608,0.84907396,-11.038912,-4.204803)" />
+    <linearGradient
+       x1="30"
+       y1="5"
+       x2="30"
+       y2="44.678879"
+       id="linearGradient2879"
+       xlink:href="#linearGradient3785"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.52770326,0,0,0.53573244,-1.3310981,-1.4043014)" />
+    <linearGradient
+       x1="22"
+       y1="39"
+       x2="17"
+       y2="37.4375"
+       id="linearGradient2881"
+       xlink:href="#linearGradient5060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.74999995,0,0,0.43478262,-5.1276295,2.9173914)" />
+    <radialGradient
+       cx="30"
+       cy="33.1875"
+       r="4.6875"
+       fx="30"
+       fy="33.1875"
+       id="radialGradient2883"
+       xlink:href="#linearGradient5060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.81491924,-3.8844793e-7,1.136461e-7,0.25340272,-9.9475804,6.5902095)" />
+    <linearGradient
+       x1="22"
+       y1="39"
+       x2="17"
+       y2="37.4375"
+       id="linearGradient2885"
+       xlink:href="#linearGradient5060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.74999995,0,0,0.43478262,34.15,2.9173914)" />
+    <linearGradient
+       x1="30.00001"
+       y1="6.333993"
+       x2="30.00001"
+       y2="24.913183"
+       id="linearGradient2887"
+       xlink:href="#linearGradient3341"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.52770326,0,0,0.53573244,-1.3310981,-1.4043014)" />
+  </defs>
+  <g
+     transform="translate(-3,-1.0000003)"
+     id="g3758">
+    <path
+       d="m 12.177403,10.099947 c 0.23753,1.124653 0.370116,1.975373 0.177421,3.100026 -1.502303,1.247697 -5.3445034,1.80835 -5.3387447,3.100025 l -0.5161321,3.875036 c 0,1.284073 3.5817448,2.325019 8.0000528,2.325019 4.418307,0 8.000053,-1.040946 8.000053,-2.325019 l -0.516134,-3.875036 c -0.0061,-1.105498 -3.870993,-1.808346 -5.354873,-3.100025 -0.126751,-1.043848 -0.02586,-2.056174 0.193549,-3.100026 l -4.645192,0 z"
+       id="path3766"
+       style="fill:url(#radialGradient2871);fill-opacity:1;stroke:url(#linearGradient2873);stroke-width:0.99989432;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 13.21875,11.09375 c 0.08722,0.856711 0.3354,1.801007 -0.04818,2.615857 -0.642554,0.728465 -1.594602,1.093826 -2.46738,1.472715 C 9.3226847,15.510467 7.7137266,16 7.9252179,16.998373 7.7834779,18.061416 7.641739,19.124458 7.5,20.1875 c 0.3063993,0.160613 1.0809439,0.584904 1.625,0.6875 2.520767,0.666947 5.16785,0.725367 7.754874,0.519516 1.511711,-0.166212 3.088649,-0.352665 4.432626,-1.113266 0.335436,-0.07362 0.107122,-0.316411 0.114936,-0.654915 -0.132062,-1.021278 -0.264124,-2.042557 -0.396186,-3.063835 -0.587648,-0.5027 -1.391296,-0.753519 -2.106391,-1.064577 -1.082782,-0.447299 -2.251468,-0.853003 -3.086912,-1.707994 -0.391617,-0.689558 -0.161473,-1.538743 -0.107324,-2.28649 0.259681,-0.52835 -0.223399,-0.401903 -0.552932,-0.409689 -0.652981,0 -1.305961,0 -1.958941,0 z"
+       id="path3742"
+       style="fill:none;stroke:url(#linearGradient2875);stroke-width:0.99989432;stroke-miterlimit:4;stroke-opacity:1" />
+    <path
+       d="m 14.5,1.5422262 c -2.185818,0 -3.957774,1.67899 -3.957774,3.7501272 0.01713,0.7664876 0.08155,1.6770462 0.527701,3.750127 0.263852,0.8035986 2.617283,2.9465296 2.638517,3.2143946 0.511701,0.267865 1.319258,0.267865 1.846964,0 0,-0.267865 2.110813,-2.410796 2.374664,-3.2143946 0.502046,-2.1545496 0.500773,-2.9465283 0.527702,-3.750127 0,-2.0711372 -1.771956,-3.7501272 -3.957774,-3.7501272 z"
+       id="path3764"
+       style="fill:url(#radialGradient2877);fill-opacity:1;stroke:url(#linearGradient2879);stroke-width:1.08445191;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 10.62237,21.7 C 8.8506083,20.838176 9.6954668,18.924844 9.8723695,17.7 9.1223696,18.569566 9.5000001,21 8,21 c 1,0.355621 1.6845389,0.59817 2.62237,0.7 z"
+       id="path3848"
+       style="opacity:0.5;fill:url(#linearGradient2881);fill-opacity:1;stroke:none" />
+    <path
+       d="M 12,13.35048 C 12.366027,14.309818 13.343418,15 14.5,15 c 1.156582,0 2.133972,-0.690182 2.5,-1.64952 l -5,0 z"
+       id="path3833"
+       style="opacity:0.3;fill:url(#radialGradient2883);fill-opacity:1;stroke:none" />
+    <path
+       d="m 18.4,21.7 c 1.771762,-0.861824 0.926903,-2.775156 0.750001,-4 C 19.9,18.569566 19.52237,21 21.02237,21 c -1,0.355621 -1.684539,0.59817 -2.62237,0.7 z"
+       id="path3720"
+       style="opacity:0.5;fill:url(#linearGradient2885);fill-opacity:1;stroke:none" />
+    <path
+       d="m 14.5,2.53125 c -1.666616,0 -2.9513,1.2303173 -2.96875,2.71875 1.39e-4,0.00624 -1.45e-4,0.024997 0,0.03125 0.01647,0.7081029 0.08609,1.5272795 0.5,3.46875 -0.0051,-0.03667 0.09671,0.2041393 0.3125,0.46875 0.232433,0.2850235 0.566603,0.6083312 0.875,0.9375 0.308397,0.329169 0.598847,0.668975 0.84375,0.9375 0.09435,0.103448 0.171956,0.186905 0.25,0.28125 0.166811,0.03524 0.415249,0.03212 0.625,0 0.06182,-0.08397 0.114751,-0.159431 0.1875,-0.25 0.218248,-0.271707 0.473896,-0.575993 0.75,-0.90625 0.276104,-0.3302573 0.569207,-0.6813941 0.78125,-0.96875 0.197562,-0.2677316 0.307312,-0.503144 0.3125,-0.5 0.460701,-1.9997828 0.473735,-2.6695721 0.5,-3.46875 0,-0.010182 1.19e-4,-0.021091 0,-0.03125 C 17.4513,3.7615673 16.166616,2.53125 14.5,2.53125 z"
+       id="path3730"
+       style="fill:none;stroke:url(#linearGradient2887);stroke-width:1.08445191;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+</svg>
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index 93fb13372b2..d4b08deb417 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -1,118 +1,3 @@
-Contacts={
-	UI:{
-		showCardDAVUrl:function(username, bookname){
-			$('#carddav_url').val(totalurl + '/' + username + '/' + bookname);
-			$('#carddav_url').show();
-			$('#carddav_url_close').show();
-		},
-		Addressbooks:{
-			overview:function(){
-				if($('#chooseaddressbook_dialog').dialog('isOpen') == true){
-					$('#chooseaddressbook_dialog').dialog('moveToTop');
-				}else{
-					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(){
-						$('#chooseaddressbook_dialog').dialog({
-							width : 600,
-							close : function(event, ui) {
-								$(this).dialog('destroy').remove();
-							}
-						});
-					});
-				}
-			},
-			activation:function(checkbox, bookid)
-			{
-				$.post(OC.filePath('contacts', 'ajax', 'activation.php'), { bookid: bookid, active: checkbox.checked?1:0 },
-				  function(data) {
-					/*
-					 * Arguments:
-					 * data.status
-					 * data.bookid
-					 * data.active
-					 */
-					if (data.status == 'success'){
-						checkbox.checked = data.active == 1;
-						Contacts.UI.Contacts.update();
-					}
-				  });
-			},
-			newAddressbook:function(object){
-				var tr = $(document.createElement('tr'))
-					.load(OC.filePath('contacts', 'ajax', 'addbook.php'));
-				$(object).closest('tr').after(tr).hide();
-				/* TODO: Shouldn't there be some kinda error checking here? */
-			},
-			editAddressbook:function(object, bookid){
-				var tr = $(document.createElement('tr'))
-					.load(OC.filePath('contacts', 'ajax', 'editaddressbook.php') + "?bookid="+bookid);
-				$(object).closest('tr').after(tr).hide();
-			},
-			deleteAddressbook:function(bookid){
-				var check = confirm("Do you really want to delete this address book?");
-				if(check == false){
-					return false;
-				}else{
-					$.post(OC.filePath('contacts', 'ajax', 'deletebook.php'), { id: bookid},
-					  function(data) {
-						if (data.status == 'success'){
-							$('#chooseaddressbook_dialog').dialog('destroy').remove();
-							Contacts.UI.Contacts.update();
-							Contacts.UI.Addressbooks.overview();
-						} else {
-							alert('Error: ' + data.message);
-						}
-					  });
-				}
-			},
-			submit:function(button, bookid){
-				var displayname = $("#displayname_"+bookid).val();
-				var active = $("#edit_active_"+bookid+":checked").length;
-				var description = $("#description_"+bookid).val();
-
-				var url;
-				if (bookid == 'new'){
-					url = OC.filePath('contacts', 'ajax', 'createaddressbook.php');
-				}else{
-					url = OC.filePath('contacts', 'ajax', 'updateaddressbook.php');
-				}
-				$.post(url, { id: bookid, name: displayname, active: active, description: description },
-					function(data){
-						if(data.status == 'success'){
-							$(button).closest('tr').prev().html(data.page).show().next().remove();
-						}
-					});
-				Contacts.UI.Contacts.update();
-			},
-			cancel:function(button, bookid){
-				$(button).closest('tr').prev().show().next().remove();
-			}
-		},
-		Contacts:{
-			update:function(){
-				$.getJSON('ajax/contacts.php',{},function(jsondata){
-					if(jsondata.status == 'success'){
-						$('#contacts').html(jsondata.data.page);
-					}
-					else{
-						alert(jsondata.data.message);
-					}
-				});
-				/*
-				var contactlist = $('#contacts');
-				var contacts = contactlist.children('li').get();
-				//alert(contacts);
-				contacts.sort(function(a, b) {
-					var compA = $(a).text().toUpperCase();
-					var compB = $(b).text().toUpperCase();
-					return (compA < compB) ? -1 : (compA > compB) ? 1 : 0;
-				})
-				$.each(contacts, function(idx, itm) { contactlist.append(itm); });
-				*/
-			}
-		}
-	}
-}
-
 $(document).ready(function(){
 	/*-------------------------------------------------------------------------
 	 * Event handlers
@@ -194,11 +79,6 @@ $(document).ready(function(){
 		return false;
 	});
 
-	$('#chooseaddressbook').click(function(){
-		Contacts.UI.Addressbooks.overview();
-		return false;
-	});
-	
 	$('#contacts_newcontact').click(function(){
 		$.getJSON('ajax/showaddcard.php',{},function(jsondata){
 			if(jsondata.status == 'success'){
@@ -300,9 +180,4 @@ $(document).ready(function(){
 			// element has gone out of viewport
 		}
 	});
-	/*
-	$('#contacts li').each(function(index) {
-		$(this).css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
-	});
-	*/
 });
diff --git a/apps/contacts/js/jquery.inview.js b/apps/contacts/js/jquery.inview.js
new file mode 100644
index 00000000000..a38ab164977
--- /dev/null
+++ b/apps/contacts/js/jquery.inview.js
@@ -0,0 +1,118 @@
+/**
+ * author Christopher Blum
+ *    - based on the idea of Remy Sharp, http://remysharp.com/2009/01/26/element-in-view-event-plugin/
+ *    - forked from http://github.com/zuk/jquery.inview/
+ */
+(function ($) {
+  var inviewObjects = {}, viewportSize, viewportOffset,
+      d = document, w = window, documentElement = d.documentElement, expando = $.expando;
+
+  $.event.special.inview = {
+    add: function(data) {
+      inviewObjects[data.guid + "-" + this[expando]] = { data: data, $element: $(this) };
+    },
+
+    remove: function(data) {
+      try { delete inviewObjects[data.guid + "-" + this[expando]]; } catch(e) {}
+    }
+  };
+
+  function getViewportSize() {
+    var mode, domObject, size = { height: w.innerHeight, width: w.innerWidth };
+
+    // if this is correct then return it. iPad has compat Mode, so will
+    // go into check clientHeight/clientWidth (which has the wrong value).
+    if (!size.height) {
+      mode = d.compatMode;
+      if (mode || !$.support.boxModel) { // IE, Gecko
+        domObject = mode === 'CSS1Compat' ?
+          documentElement : // Standards
+          d.body; // Quirks
+        size = {
+          height: domObject.clientHeight,
+          width:  domObject.clientWidth
+        };
+      }
+    }
+
+    return size;
+  }
+
+  function getViewportOffset() {
+    return {
+      top:  w.pageYOffset || documentElement.scrollTop   || d.body.scrollTop,
+      left: w.pageXOffset || documentElement.scrollLeft  || d.body.scrollLeft
+    };
+  }
+
+  function checkInView() {
+    var $elements = $(), elementsLength, i = 0;
+
+    $.each(inviewObjects, function(i, inviewObject) {
+      var selector  = inviewObject.data.selector,
+          $element  = inviewObject.$element;
+      $elements = $elements.add(selector ? $element.find(selector) : $element);
+    });
+
+    elementsLength = $elements.length;
+    if (elementsLength) {
+      viewportSize   = viewportSize   || getViewportSize();
+      viewportOffset = viewportOffset || getViewportOffset();
+
+      for (; i<elementsLength; i++) {
+        // Ignore elements that are not in the DOM tree
+        if (!$.contains(documentElement, $elements[i])) {
+          continue;
+        }
+
+        var $element      = $($elements[i]),
+            elementSize   = { height: $element.height(), width: $element.width() },
+            elementOffset = $element.offset(),
+            inView        = $element.data('inview'),
+            visiblePartX,
+            visiblePartY,
+            visiblePartsMerged;
+        
+        // Don't ask me why because I haven't figured out yet:
+        // viewportOffset and viewportSize are sometimes suddenly null in Firefox 5.
+        // Even though it sounds weird:
+        // It seems that the execution of this function is interferred by the onresize/onscroll event
+        // where viewportOffset and viewportSize are unset
+        if (!viewportOffset || !viewportSize) {
+          return;
+        }
+        
+        if (elementOffset.top + elementSize.height > viewportOffset.top &&
+            elementOffset.top < viewportOffset.top + viewportSize.height &&
+            elementOffset.left + elementSize.width > viewportOffset.left &&
+            elementOffset.left < viewportOffset.left + viewportSize.width) {
+          visiblePartX = (viewportOffset.left > elementOffset.left ?
+            'right' : (viewportOffset.left + viewportSize.width) < (elementOffset.left + elementSize.width) ?
+            'left' : 'both');
+          visiblePartY = (viewportOffset.top > elementOffset.top ?
+            'bottom' : (viewportOffset.top + viewportSize.height) < (elementOffset.top + elementSize.height) ?
+            'top' : 'both');
+          visiblePartsMerged = visiblePartX + "-" + visiblePartY;
+          if (!inView || inView !== visiblePartsMerged) {
+            $element.data('inview', visiblePartsMerged).trigger('inview', [true, visiblePartX, visiblePartY]);
+          }
+        } else if (inView) {
+          $element.data('inview', false).trigger('inview', [false]);
+        }
+      }
+    }
+  }
+
+  $(w).bind("scroll resize", function() {
+    viewportSize = viewportOffset = null;
+  });
+
+  // Use setInterval in order to also make sure this captures elements within
+  // "overflow:scroll" elements or elements that appeared in the dom tree due to
+  // dom manipulation and reflow
+  // old: $(window).scroll(checkInView);
+  //
+  // By the way, iOS (iPad, iPhone, ...) seems to not execute, or at least delays
+  // intervals while the user scrolls. Therefore the inview event might fire a bit late there
+  setInterval(checkInView, 250);
+})(jQuery);
\ No newline at end of file
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
new file mode 100644
index 00000000000..bf0a6e96a5d
--- /dev/null
+++ b/apps/contacts/thumbnail.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Jakob Sack
+ * @copyright 2011 Jakob Sack mail@jakobsack.de
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../lib/base.php');
+OC_Util::checkLoggedIn();
+OC_Util::checkAppEnabled('contacts');
+
+if(!function_exists('imagecreatefromjpeg')) {
+	OC_Log::write('contacts','GD module not installed',OC_Log::ERROR);
+	header('Content-Type: image/png');
+	// TODO: Check if it works to read the file and echo the content.
+	return 'img/person.png';
+}
+
+function getStandardImage(){
+	$src_img = imagecreatefrompng('img/person.png');
+	header('Content-Type: image/png');
+	imagepng($src_img);
+	imagedestroy($src_img);
+}
+
+
+$id = $_GET['id'];
+
+$l10n = new OC_L10N('contacts');
+
+$card = OC_Contacts_VCard::find( $id );
+if( $card === false ){
+	echo $l10n->t('Contact could not be found.');
+	exit();
+}
+
+$addressbook = OC_Contacts_Addressbook::find( $card['addressbookid'] );
+if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
+	echo $l10n->t('This is not your contact.'); // This is a weird error, why would it come up? (Better feedback for users?)
+	exit();
+}
+
+$content = OC_VObject::parse($card['carddata']);
+
+// invalid vcard
+if( is_null($content)){
+	echo $l10n->t('This card is not RFC compatible.');
+	exit();
+}
+
+// define the width and height for the thumbnail
+// note that theese dimmensions are considered the maximum dimmension and are not fixed,
+// because we have to keep the image ratio intact or it will be deformed
+$thumbnail_width = 23;
+$thumbnail_height = 23;
+
+// Photo :-)
+foreach($content->children as $child){
+	if($child->name == 'PHOTO'){
+		foreach($child->parameters as $parameter){
+			if( $parameter->name == 'TYPE' ){
+				$mime = $parameter->value;
+			}
+		}
+		$data = base64_decode($child->value);
+		$src_img = imagecreatefromstring($data);
+		if ($src_img !== false) {
+			//gets the dimmensions of the image
+			$width_orig=imageSX($src_img);
+			$height_orig=imageSY($src_img);
+			$ratio_orig = $width_orig/$height_orig;
+			
+			if ($thumbnail_width/$thumbnail_height > $ratio_orig) {
+				$new_height = $thumbnail_width/$ratio_orig;
+				$new_width = $thumbnail_width;
+			} else {
+				$new_width = $thumbnail_height*$ratio_orig;
+				$new_height = $thumbnail_height;
+			}
+			
+			$x_mid = $new_width/2;  //horizontal middle
+			$y_mid = $new_height/2; //vertical middle
+			
+			$process = imagecreatetruecolor(round($new_width), round($new_height)); 
+			if ($process == false) {
+				getStandardImage();
+				//echo 'Error creating process image: '.$new_width.'x'.$new_height;
+				OC_Log::write('contacts','Error creating process image for '.$id.' '.$new_width.'x'.$new_height,OC_Log::ERROR);
+				imagedestroy($process);
+				imagedestroy($src_img);
+				exit();
+			}
+
+			imagecopyresampled($process, $src_img, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
+			if ($process == false) {
+				getStandardImage();
+				//echo 'Error resampling process image: '.$new_width.'x'.$new_height;
+				OC_Log::write('contacts','Error resampling process image for '.$id.' '.$new_width.'x'.$new_height,OC_Log::ERROR);
+				imagedestroy($process);
+				imagedestroy($src_img);
+				exit();
+			}
+			$thumb = imagecreatetruecolor($thumbnail_width, $thumbnail_height); 
+			if ($process == false) {
+				getStandardImage();
+				//echo 'Error creating thumb image: '.$thumbnail_width.'x'.$thumbnail_height;
+				OC_Log::write('contacts','Error creating thumb image for '.$id.' '.$thumbnail_width.'x'.$thumbnail_height,OC_Log::ERROR);
+				imagedestroy($process);
+				imagedestroy($src_img);
+				exit();
+			}
+			imagecopyresampled($thumb, $process, 0, 0, ($x_mid-($thumbnail_width/2)), ($y_mid-($thumbnail_height/2)), $thumbnail_width, $thumbnail_height, $thumbnail_width, $thumbnail_height);
+			if ($thumb !== false) {
+				header('Content-Type: image/png');
+				imagepng($thumb);
+			} else {
+				getStandardImage();
+				OC_Log::write('contacts','Error resampling thumb image for '.$id.' '.$thumbnail_width.'x'.$thumbnail_height,OC_Log::ERROR);
+				//echo 'An error occurred resampling thumb.';
+			}
+			imagedestroy($thumb);
+			imagedestroy($process);
+			imagedestroy($src_img);
+		}
+		else {
+			getStandardImage();
+		}
+		exit();
+	}
+}
+getStandardImage();
+
+// Not found :-(
+//echo $l10n->t('This card does not contain a photo.');
-- 
GitLab


From 9e50cecf2750270e5c60a2c3fbdad5f95cdeee39 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sat, 17 Dec 2011 21:12:36 -0500
Subject: [PATCH 066/546] Fix shared status for files inside a shared folder

---
 apps/files_sharing/ajax/getitem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_sharing/ajax/getitem.php b/apps/files_sharing/ajax/getitem.php
index d9df4abe984..51fda6aed40 100644
--- a/apps/files_sharing/ajax/getitem.php
+++ b/apps/files_sharing/ajax/getitem.php
@@ -19,6 +19,7 @@ $source = dirname($source);
 while ($source != "" && $source != "/" && $source != "." && $source != $userDirectory) {
 	if ($values = OC_Share::getMySharedItem($source)) {
 		$values = array_values($values);
+		$users = array();
 		$parentUsers = array();
 		for ($i = 0; $i < count($values); $i++) {
 			if ($values[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
-- 
GitLab


From 3d1accab701730fbd2b0cb89cb8c727301f5d756 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 18 Dec 2011 03:45:13 +0100
Subject: [PATCH 067/546] add licence file for sabredav

---
 3rdparty/Sabre/LICENCE | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 3rdparty/Sabre/LICENCE

diff --git a/3rdparty/Sabre/LICENCE b/3rdparty/Sabre/LICENCE
new file mode 100644
index 00000000000..3d07eaace83
--- /dev/null
+++ b/3rdparty/Sabre/LICENCE
@@ -0,0 +1,27 @@
+Copyright (C) 2007-2011 Rooftop Solutions.
+Copyright (C) 2007-2009 FileMobile inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of the SabreDAV nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE. 
-- 
GitLab


From 4eb36b0ecf40266ceb2abf0f5bc17dad4bde6951 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 18 Dec 2011 22:58:20 +0100
Subject: [PATCH 068/546] Calendar: refactor common ajax functions to
 OC_Calendar_App

---
 apps/calendar/ajax/activation.php     |  3 +-
 apps/calendar/ajax/createcalendar.php |  5 +-
 apps/calendar/ajax/deletecalendar.php |  8 +--
 apps/calendar/ajax/deleteevent.php    | 12 +---
 apps/calendar/ajax/editcalendar.php   |  4 +-
 apps/calendar/ajax/editevent.php      | 23 +-------
 apps/calendar/ajax/editeventform.php  | 18 ++----
 apps/calendar/ajax/moveevent.php      | 26 +++------
 apps/calendar/ajax/neweventform.php   |  6 +-
 apps/calendar/ajax/resizeevent.php    | 35 +++---------
 apps/calendar/ajax/updatecalendar.php |  6 +-
 apps/calendar/appinfo/app.php         |  3 +-
 apps/calendar/export.php              | 14 +----
 apps/calendar/import.php              |  8 +--
 apps/calendar/lib/app.php             | 82 +++++++++++++++++++++++++++
 apps/calendar/lib/calendar.php        |  4 +-
 apps/calendar/lib/object.php          |  2 +-
 17 files changed, 131 insertions(+), 128 deletions(-)
 create mode 100644 apps/calendar/lib/app.php

diff --git a/apps/calendar/ajax/activation.php b/apps/calendar/ajax/activation.php
index 72882496ab6..3c2bc6de23f 100644
--- a/apps/calendar/ajax/activation.php
+++ b/apps/calendar/ajax/activation.php
@@ -12,8 +12,9 @@ if(!OC_USER::isLoggedIn()) {
 }
 OC_JSON::checkAppEnabled('calendar');
 $calendarid = $_POST['calendarid'];
+$calendar = OC_Calendar_App::getCalendar($calendarid);//access check
 OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
-$calendar = OC_Calendar_Calendar::findCalendar($calendarid);
+$calendar = OC_Calendar_App::getCalendar($calendarid);
 OC_JSON::success(array(
 	'active' => $calendar['active'],
 	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
diff --git a/apps/calendar/ajax/createcalendar.php b/apps/calendar/ajax/createcalendar.php
index 325a5ec35bc..f8b5974f54c 100644
--- a/apps/calendar/ajax/createcalendar.php
+++ b/apps/calendar/ajax/createcalendar.php
@@ -8,8 +8,6 @@
 
 require_once('../../../lib/base.php');
 
-$l10n = new OC_L10N('calendar');
-
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
@@ -17,7 +15,8 @@ OC_JSON::checkAppEnabled('calendar');
 $userid = OC_User::getUser();
 $calendarid = OC_Calendar_Calendar::addCalendar($userid, $_POST['name'], 'VEVENT,VTODO,VJOURNAL', null, 0, $_POST['color']);
 OC_Calendar_Calendar::setCalendarActive($calendarid, 1);
-$calendar = OC_Calendar_Calendar::findCalendar($calendarid);
+
+$calendar = OC_Calendar_Calendar::find($calendarid);
 $tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields');
 $tmpl->assign('calendar', $calendar);
 OC_JSON::success(array(
diff --git a/apps/calendar/ajax/deletecalendar.php b/apps/calendar/ajax/deletecalendar.php
index e8ffe0d0598..fc308da6dad 100644
--- a/apps/calendar/ajax/deletecalendar.php
+++ b/apps/calendar/ajax/deletecalendar.php
@@ -7,19 +7,13 @@
  */
 require_once('../../../lib/base.php');
 
-$l10n = new OC_L10N('calendar');
-
 if(!OC_USER::isLoggedIn()) {
 	die('<script type="text/javascript">document.location = oc_webroot;</script>');
 }
 OC_JSON::checkAppEnabled('calendar');
 
 $cal = $_POST["calendarid"];
-$calendar = OC_Calendar_Calendar::findCalendar($cal);
-if($calendar["userid"] != OC_User::getUser()){
-	OC_JSON::error(array('error'=>'permission_denied'));
-	exit;
-}
+$calendar = OC_Calendar_App::getCalendar($cal);
 $del = OC_Calendar_Calendar::deleteCalendar($cal);
 if($del == true){
 	OC_JSON::success();
diff --git a/apps/calendar/ajax/deleteevent.php b/apps/calendar/ajax/deleteevent.php
index 9e3c7dd87dd..269f4a47f42 100644
--- a/apps/calendar/ajax/deleteevent.php
+++ b/apps/calendar/ajax/deleteevent.php
@@ -15,17 +15,7 @@ if(!OC_USER::isLoggedIn()) {
 OC_JSON::checkAppEnabled('calendar');
 
 $id = $_POST['id'];
-$data = OC_Calendar_Object::find($id);
-if (!$data)
-{
-	OC_JSON::error();
-	exit;
-}
-$calendar = OC_Calendar_Calendar::findCalendar($data['calendarid']);
-if($calendar['userid'] != OC_User::getUser()){
-	OC_JSON::error();
-	exit;
-}
+$event_object = OC_Calendar_App::getEventObject($id);
 $result = OC_Calendar_Object::delete($id);
 OC_JSON::success();
 ?> 
diff --git a/apps/calendar/ajax/editcalendar.php b/apps/calendar/ajax/editcalendar.php
index d23e5287868..e44763c9aaa 100644
--- a/apps/calendar/ajax/editcalendar.php
+++ b/apps/calendar/ajax/editcalendar.php
@@ -7,13 +7,13 @@
  */
 
 require_once('../../../lib/base.php');
-$l10n = new OC_L10N('calendar');
 if(!OC_USER::isLoggedIn()) {
 	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
 }
 OC_JSON::checkAppEnabled('calendar');
+
 $calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
-$calendar = OC_Calendar_Calendar::findCalendar($_GET['calendarid']);
+$calendar = OC_Calendar_App::getCalendar($_GET['calendarid']);
 $tmpl = new OC_Template("calendar", "part.editcalendar");
 $tmpl->assign('new', false);
 $tmpl->assign('calendarcolor_options', $calendarcolor_options);
diff --git a/apps/calendar/ajax/editevent.php b/apps/calendar/ajax/editevent.php
index e3c84520481..f00ab1d960b 100644
--- a/apps/calendar/ajax/editevent.php
+++ b/apps/calendar/ajax/editevent.php
@@ -7,9 +7,6 @@
  */
 
 require_once('../../../lib/base.php');
-
-$l10n = new OC_L10N('calendar');
-
 if(!OC_USER::isLoggedIn()) {
 	die('<script type="text/javascript">document.location = oc_webroot;</script>');
 }
@@ -23,26 +20,12 @@ if($errarr){
 }else{
 	$id = $_POST['id'];
 	$cal = $_POST['calendar'];
-	$data = OC_Calendar_Object::find($id);
-	if (!$data)
-	{
-		OC_JSON::error();
-		exit;
-	}
-	$calendar = OC_Calendar_Calendar::findCalendar($data['calendarid']);
-	if($calendar['userid'] != OC_User::getUser()){
-		OC_JSON::error();
-		exit;
-	}
+	$data = OC_Calendar_App::getEventObject($id);
 	$vcalendar = OC_VObject::parse($data['calendardata']);
 
-	$last_modified = $vcalendar->VEVENT->__get('LAST-MODIFIED');
-	if($last_modified && $_POST['lastmodified'] != $last_modified->getDateTime()->format('U')){
-		OC_JSON::error(array('modified'=>true));
-		exit;
-	}
-
+	OC_Calendar_App::isNotModified($vcalendar->VEVENT, $_POST['lastmodified']);
 	OC_Calendar_Object::updateVCalendarFromRequest($_POST, $vcalendar);
+
 	$result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
 	if ($data['calendarid'] != $cal) {
 		OC_Calendar_Object::moveToCalendar($id, $cal);
diff --git a/apps/calendar/ajax/editeventform.php b/apps/calendar/ajax/editeventform.php
index c91f136e898..fe6c6f73570 100644
--- a/apps/calendar/ajax/editeventform.php
+++ b/apps/calendar/ajax/editeventform.php
@@ -8,26 +8,16 @@
 
 require_once('../../../lib/base.php');
 
-$l10n = new OC_L10N('calendar');
-
 if(!OC_USER::isLoggedIn()) {
 	die('<script type="text/javascript">document.location = oc_webroot;</script>');
 }
 OC_JSON::checkAppEnabled('calendar');
 
-$calendar_options = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
-$category_options = OC_Calendar_Object::getCategoryOptions($l10n);
-$repeat_options = OC_Calendar_Object::getRepeatOptions($l10n);
-
 $id = $_GET['id'];
-$data = OC_Calendar_Object::find($id);
-$calendar = OC_Calendar_Calendar::findCalendar($data['calendarid']);
-if($calendar['userid'] != OC_User::getUser()){
-		echo $l10n->t('Wrong calendar');
-		exit;
-}
+$data = OC_Calendar_App::getEventObject($id);
 $object = OC_VObject::parse($data['calendardata']);
 $vevent = $object->VEVENT;
+
 $dtstart = $vevent->DTSTART;
 $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
 switch($dtstart->getDateType()) {
@@ -66,6 +56,10 @@ if ($last_modified){
 	$lastmodified = 0;
 }
 
+$calendar_options = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
+$category_options = OC_Calendar_App::getCategoryOptions();
+$repeat_options = OC_Calendar_App::getRepeatOptions();
+
 $tmpl = new OC_Template('calendar', 'part.editevent');
 $tmpl->assign('id', $id);
 $tmpl->assign('lastmodified', $lastmodified);
diff --git a/apps/calendar/ajax/moveevent.php b/apps/calendar/ajax/moveevent.php
index 51fafdfeb97..f2256d4eee6 100644
--- a/apps/calendar/ajax/moveevent.php
+++ b/apps/calendar/ajax/moveevent.php
@@ -5,31 +5,20 @@
  * later.
  * See the COPYING-README file.
  */
-error_reporting(E_ALL);
 require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
-$data = OC_Calendar_Object::find($_POST["id"]);
-$calendarid = $data["calendarid"];
-$cal = $calendarid;
+
 $id = $_POST['id'];
-$calendar = OC_Calendar_Calendar::findCalendar($calendarid);
-if(OC_User::getUser() != $calendar['userid']){
-	OC_JSON::error();
-	exit;
-}
+
+$vcalendar = OC_Calendar_App::getVCalendar($id);
+$vevent = $vcalendar->VEVENT;
+
 $allday = $_POST['allDay'];
 $delta = new DateInterval('P0D');
 $delta->d = $_POST['dayDelta'];
 $delta->i = $_POST['minuteDelta'];
 
-$vcalendar = OC_VObject::parse($data['calendardata']);
-$vevent = $vcalendar->VEVENT;
-
-$last_modified = $vevent->__get('LAST-MODIFIED');
-if($last_modified && $_POST['lastmodified'] != $last_modified->getDateTime()->format('U')){
-	OC_JSON::error();
-	exit;
-}
+OC_Calendar_App::isNotModified($vevent, $_POST['lastmodified']);
 
 $dtstart = $vevent->DTSTART;
 $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
@@ -50,4 +39,5 @@ $vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Element_DateTime::UTC
 $vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Element_DateTime::UTC);
 
 $result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
-OC_JSON::success(array('lastmodified'=>(int)$now->format('U')));
+$lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
+OC_JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
diff --git a/apps/calendar/ajax/neweventform.php b/apps/calendar/ajax/neweventform.php
index 68423adb344..e12e99219e6 100644
--- a/apps/calendar/ajax/neweventform.php
+++ b/apps/calendar/ajax/neweventform.php
@@ -8,8 +8,6 @@
 
 require_once('../../../lib/base.php');
 
-$l10n = new OC_L10N('calendar');
-
 if(!OC_USER::isLoggedIn()) {
 	die('<script type="text/javascript">document.location = oc_webroot;</script>');
 }
@@ -34,8 +32,8 @@ $start->setTimezone(new DateTimeZone($timezone));
 $end->setTimezone(new DateTimeZone($timezone));
 
 $calendar_options = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
-$category_options = OC_Calendar_Object::getCategoryOptions($l10n);
-$repeat_options = OC_Calendar_Object::getRepeatOptions($l10n);
+$category_options = OC_Calendar_App::getCategoryOptions();
+$repeat_options = OC_Calendar_App::getRepeatOptions();
 
 $tmpl = new OC_Template('calendar', 'part.newevent');
 $tmpl->assign('calendar_options', $calendar_options);
diff --git a/apps/calendar/ajax/resizeevent.php b/apps/calendar/ajax/resizeevent.php
index 28a185411e0..68347906529 100644
--- a/apps/calendar/ajax/resizeevent.php
+++ b/apps/calendar/ajax/resizeevent.php
@@ -5,45 +5,28 @@
  * later.
  * See the COPYING-README file.
  */
-error_reporting(E_ALL);
 require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
-$data = OC_Calendar_Object::find($_POST["id"]);
-$calendarid = $data["calendarid"];
-$cal = $calendarid;
+
 $id = $_POST['id'];
-$calendar = OC_Calendar_Calendar::findCalendar($calendarid);
-if(OC_User::getUser() != $calendar['userid']){
-	OC_JSON::error();
-	exit;
-}
+
+$vcalendar = OC_Calendar_App::getVCalendar($id);
+$vevent = $vcalendar->VEVENT;
 
 $delta = new DateInterval('P0D');
 $delta->d = $_POST['dayDelta'];
 $delta->i = $_POST['minuteDelta'];
 
-$vcalendar = OC_Calendar_Object::parse($data['calendardata']);
-$vevent = $vcalendar->VEVENT;
-
-$last_modified = $vevent->__get('LAST-MODIFIED');
-if($last_modified && $_POST['lastmodified'] != $last_modified->getDateTime()->format('U')){
-	OC_JSON::error();
-	exit;
-}
+OC_Calendar_App::isNotModified($vevent, $_POST['lastmodified']);
 
 $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
 $end_type = $dtend->getDateType();
 $dtend->setDateTime($dtend->getDateTime()->add($delta), $end_type);
 unset($vevent->DURATION);
 
-$now = new DateTime();
-$last_modified = new Sabre_VObject_Element_DateTime('LAST-MODIFIED');
-$last_modified->setDateTime($now, Sabre_VObject_Element_DateTime::UTC);
-$vevent->__set('LAST-MODIFIED', $last_modified);
-
-$dtstamp = new Sabre_VObject_Element_DateTime('DTSTAMP');
-$dtstamp->setDateTime($now, Sabre_VObject_Element_DateTime::UTC);
-$vevent->DTSTAMP = $dtstamp;
+$vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Element_DateTime::UTC);
+$vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Element_DateTime::UTC);
 
 $result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
-OC_JSON::success(array('lastmodified'=>$now->format('U')));
+$lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
+OC_JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
diff --git a/apps/calendar/ajax/updatecalendar.php b/apps/calendar/ajax/updatecalendar.php
index e99ca16e22a..14f560da5a3 100644
--- a/apps/calendar/ajax/updatecalendar.php
+++ b/apps/calendar/ajax/updatecalendar.php
@@ -8,16 +8,16 @@
 
 require_once('../../../lib/base.php');
 
-$l10n = new OC_L10N('calendar');
-
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 
 $calendarid = $_POST['id'];
+$calendar = OC_Calendar_App::getCalendar($calendarid);//access check
 OC_Calendar_Calendar::editCalendar($calendarid, $_POST['name'], null, null, null, $_POST['color']);
 OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
-$calendar = OC_Calendar_Calendar::findCalendar($calendarid);
+
+$calendar = OC_Calendar_App::getCalendar($calendarid);
 $tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields');
 $tmpl->assign('calendar', $calendar);
 OC_JSON::success(array(
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 5675e624dda..ee990723c0c 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -1,5 +1,6 @@
 <?php
 $l=new OC_L10N('calendar');
+OC::$CLASSPATH['OC_Calendar_App'] = 'apps/calendar/lib/app.php';
 OC::$CLASSPATH['OC_Calendar_Calendar'] = 'apps/calendar/lib/calendar.php';
 OC::$CLASSPATH['OC_Calendar_Object'] = 'apps/calendar/lib/object.php';
 OC::$CLASSPATH['OC_Calendar_Hooks'] = 'apps/calendar/lib/hooks.php';
@@ -22,4 +23,4 @@ OC_App::addNavigationEntry( array(
 
 OC_App::registerPersonal('calendar', 'settings');
 
-require_once('apps/calendar/lib/search.php');
\ No newline at end of file
+require_once('apps/calendar/lib/search.php');
diff --git a/apps/calendar/export.php b/apps/calendar/export.php
index 3e93a1ad618..5fbd2533ab5 100644
--- a/apps/calendar/export.php
+++ b/apps/calendar/export.php
@@ -12,11 +12,7 @@ OC_Util::checkAppEnabled('calendar');
 $cal = isset($_GET["calid"]) ? $_GET["calid"] : NULL;
 $event = isset($_GET["eventid"]) ? $_GET["eventid"] : NULL;
 if(isset($cal)){
-	$calendar = OC_Calendar_Calendar::findCalendar($cal);
-	if($calendar["userid"] != OC_User::getUser()){
-		OC_JSON::error();
-		exit;
-	}
+	$calendar = OC_Calendar_App::getCalendar($cal);
 	$calobjects = OC_Calendar_Object::all($cal);
 	header("Content-Type: text/Calendar");
 	header("Content-Disposition: inline; filename=calendar.ics"); 
@@ -24,13 +20,9 @@ if(isset($cal)){
 		echo $calobjects[$i]["calendardata"] . "\n";
 	}
 }elseif(isset($event)){
-	$data = OC_Calendar_Object::find($_GET["eventid"]);
+	$data = OC_Calendar_App::getEventObject($_GET["eventid"]);
 	$calendarid = $data["calendarid"];
-	$calendar = OC_Calendar_Calendar::findCalendar($calendarid);
-	if($calendar["userid"] != OC_User::getUser()){
-		OC_JSON::error();
-		exit;
-	}
+	$calendar = OC_Calendar_App::getCalendar($calendarid);
 	header("Content-Type: text/Calendar");
 	header("Content-Disposition: inline; filename=" . $data["summary"] . ".ics"); 
 	echo $data["calendardata"];
diff --git a/apps/calendar/import.php b/apps/calendar/import.php
index 211791f551b..759726b8d10 100644
--- a/apps/calendar/import.php
+++ b/apps/calendar/import.php
@@ -12,11 +12,7 @@ OC_Util::checkAppEnabled('calendar');
 
 if($_GET["import"] == "existing"){
 	$calid = $_GET["calid"];
-	$calendar = OC_Calendar_Calendar::findCalendar($calid);
-	if($calendar['userid'] != OC_User::getUser()){
-		OC_JSON::error();
-		exit;
-	}
+	$calendar = OC_Calendar_App::getCalendar($calid);
 	if($_GET["path"] != ""){
 		$filename = $_GET["path"] . "/" . $_GET["file"];
 	}else{
@@ -47,4 +43,4 @@ for($i = 1;$i < count($vcalendar);$i++){
 	OC_Calendar_Object::add($calid, $vcalendar[$i]);
 }
 OC_JSON::success();
-?>
\ No newline at end of file
+?>
diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
new file mode 100644
index 00000000000..b023d531aa5
--- /dev/null
+++ b/apps/calendar/lib/app.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * This class manages our app actions
+ */
+OC_Calendar_App::$l10n = new OC_L10N('calendar');
+class OC_Calendar_App{
+	public static $l10n;
+
+	public static function getCalendar($id){
+		$calendar = OC_Calendar_Calendar::find( $id );
+		if( $calendar === false || $calendar['userid'] != OC_User::getUser()){
+			OC_JSON::error(array('data' => array('message' => self::$l10n->t('Wrong calendar'))));
+			exit();
+		}
+		return $calendar;
+	}
+
+	public static function getEventObject($id){
+		$event_object = OC_Calendar_Object::find( $id );
+		if( $event_object === false ){
+			OC_JSON::error();
+			exit();
+		}
+
+		self::getCalendar( $event_object['calendarid'] );//access check
+		return $event_object;
+	}
+
+	public static function getVCalendar($id){
+		$event_object = self::getEventObject( $id );
+
+		$vcalendar = OC_VObject::parse($event_object['calendardata']);
+		// Check if the vcalendar is valid
+		if(is_null($vcalendar)){
+			OC_JSON::error();
+			exit();
+		}
+		return $vcalendar;
+	}
+
+	public static function isNotModified($vevent, $lastmodified)
+	{
+		$last_modified = $vevent->__get('LAST-MODIFIED');
+		if($last_modified && $lastmodified != $last_modified->getDateTime()->format('U')){
+			OC_JSON::error(array('modified'=>true));
+			exit;
+		}
+	}
+
+	public static function getCategoryOptions()
+	{
+		return array(
+			self::$l10n->t('Birthday'),
+			self::$l10n->t('Business'),
+			self::$l10n->t('Call'),
+			self::$l10n->t('Clients'),
+			self::$l10n->t('Deliverer'),
+			self::$l10n->t('Holidays'),
+			self::$l10n->t('Ideas'),
+			self::$l10n->t('Journey'),
+			self::$l10n->t('Jubilee'),
+			self::$l10n->t('Meeting'),
+			self::$l10n->t('Other'),
+			self::$l10n->t('Personal'),
+			self::$l10n->t('Projects'),
+			self::$l10n->t('Questions'),
+			self::$l10n->t('Work'),
+		);
+	}
+
+	public static function getRepeatOptions()
+	{
+		OC_Calendar_Object::getRepeatOptions(self::$l10n);
+	}
+}
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 3db4398096e..ea60526a5bd 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -82,7 +82,7 @@ class OC_Calendar_Calendar{
 	 * @param integer $id
 	 * @return associative array
 	 */
-	public static function findCalendar($id){
+	public static function find($id){
 		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*calendar_calendars WHERE id = ?' );
 		$result = $stmt->execute(array($id));
 
@@ -148,7 +148,7 @@ class OC_Calendar_Calendar{
 	 */
 	public static function editCalendar($id,$name=null,$components=null,$timezone=null,$order=null,$color=null){
 		// Need these ones for checking uri
-		$calendar = self::findCalendar($id);
+		$calendar = self::find($id);
 
 		// Keep old stuff
 		if(is_null($name)) $name = $calendar['name'];
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 1c145003511..58fe60611ce 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -367,7 +367,7 @@ class OC_Calendar_Object{
 			$errarr['title'] = 'true';
 			$errnum++;
 		}
-		$calendar = OC_Calendar_Calendar::findCalendar($request['calendar']);
+		$calendar = OC_Calendar_Calendar::find($request['calendar']);
 		if($calendar['userid'] != OC_User::getUser()){
 			$errarr['cal'] = 'true';
 			$errnum++;
-- 
GitLab


From ff346ad1352ba5f99e409e2e1efca8a3e356af31 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 18 Dec 2011 23:01:45 +0100
Subject: [PATCH 069/546] Calendar: small for loop fix

---
 apps/calendar/export.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/export.php b/apps/calendar/export.php
index 5fbd2533ab5..9b3ea5005d6 100644
--- a/apps/calendar/export.php
+++ b/apps/calendar/export.php
@@ -16,8 +16,8 @@ if(isset($cal)){
 	$calobjects = OC_Calendar_Object::all($cal);
 	header("Content-Type: text/Calendar");
 	header("Content-Disposition: inline; filename=calendar.ics"); 
-	for($i = 0;$i <= count($calobjects); $i++){
-		echo $calobjects[$i]["calendardata"] . "\n";
+	foreach($calobjects as $calobject){
+		echo $calobject["calendardata"] . "\n";
 	}
 }elseif(isset($event)){
 	$data = OC_Calendar_App::getEventObject($_GET["eventid"]);
-- 
GitLab


From dff9585f64e2723eaf2d088d9e946fe1d649ccd8 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 18 Dec 2011 23:04:45 +0100
Subject: [PATCH 070/546] Contacts: add missing property_options template var

---
 apps/contacts/index.php   | 2 ++
 apps/contacts/lib/app.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index de7b56dd1ae..58ddc74f532 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -74,11 +74,13 @@ if( !is_null($id)/* || count($contacts)*/){
 	$details = OC_Contacts_VCard::structureContact($vcard);
 }
 
+$property_types = OC_Contacts_App::getAddPropertyOptions();
 $adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
 $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
 
 // Process the template
 $tmpl = new OC_Template( 'contacts', 'index', 'user' );
+$tmpl->assign('property_types',$property_types);
 $tmpl->assign('adr_types',$adr_types);
 $tmpl->assign('phone_types',$phone_types);
 $tmpl->assign('addressbooks', $addressbooks);
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index ba086e4aca8..79e00920a65 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -38,7 +38,7 @@ class OC_Contacts_App{
 
 	public static function getAddressbook($id){
 		$addressbook = OC_Contacts_Addressbook::find( $id );
-		if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
+		if( $addressbook === false || $addressbook['userid'] != OC_User::getUser()){
 			OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('This is not your addressbook.')))); // Same here (as with the contact error). Could this error be improved?
 			exit();
 		}
-- 
GitLab


From fbad1da9e2cea507d7a69a0d3291268b8e76b2c2 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 18 Dec 2011 23:05:36 +0100
Subject: [PATCH 071/546] Contacts: check if PREF parameter is set before
 useing it

---
 apps/contacts/templates/part.property.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/templates/part.property.php b/apps/contacts/templates/part.property.php
index 6264f296743..d930a9ca99d 100644
--- a/apps/contacts/templates/part.property.php
+++ b/apps/contacts/templates/part.property.php
@@ -20,7 +20,7 @@
 			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
 		</p>
 	<?php elseif($_['property']['name'] == 'TEL'): ?>
-		<p class="contacts_property_name"><?php echo $_['property']['parameters']['PREF'] ? $l->t('Preferred').' ' : '' ?><?php echo $l->t('Phone'); ?></p>
+		<p class="contacts_property_name"><?php echo (isset($_['property']['parameters']['PREF']) && $_['property']['parameters']['PREF']) ? $l->t('Preferred').' ' : '' ?><?php echo $l->t('Phone'); ?></p>
 		<p class="contacts_property_data">
 			<?php echo $_['property']['value']; ?>
 			<?php if(isset($_['property']['parameters']['TYPE']) && !empty($_['property']['parameters']['TYPE'])): ?>
-- 
GitLab


From d5e9c7d5724d30b659119e11f567492d30f0581c Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 18 Dec 2011 23:06:54 +0100
Subject: [PATCH 072/546] Gallery: fix calculation of folder thumbnail
 selection

---
 apps/gallery/js/albums.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index 7ab243ededf..fb091698a76 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -69,7 +69,7 @@ Albums={
         if (albumMetadata == undefined) {
           return;
         }
-        var x = Math.min(Math.floor((e.clientX - this.offsetLeft)/(this.offsetWidth/albumMetadata.numOfCovers)), albumMetadata.numOfCovers-1);
+        var x = Math.min(Math.floor((e.layerX - this.offsetLeft)/(this.offsetWidth/albumMetadata.numOfCovers)), albumMetadata.numOfCovers-1);
         x *= this.offsetWidth;
         $(this).css('background-position', -x+'px 0');
       });
-- 
GitLab


From e1b9b65e4159bdd6e0ed81c8cd6b588f03b3a018 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 18 Dec 2011 23:08:00 +0100
Subject: [PATCH 073/546] Use correct appid for lostpassword email preference

---
 core/lostpassword/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index de0d393ec78..ede94dab2d7 100644
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@ -14,7 +14,7 @@ if (isset($_POST['user'])) {
 	if (OC_User::userExists($_POST['user'])) {
 		$token = sha1($_POST['user']+uniqId());
 		OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', $token);
-		$email = OC_Preferences::getValue($_POST['user'], 'lostpassword', 'email', '');
+		$email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
 		if (!empty($email)) {
 			$link = OC_Helper::linkTo('core/lostpassword', 'resetpassword.php', null, true).'?user='.$_POST['user'].'&token='.$token;
 			$tmpl = new OC_Template('core/lostpassword', 'email');
-- 
GitLab


From 25fa9bf8ec2742fc96e52cafb61ab0f72db8ba08 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 21 Dec 2011 18:37:17 +0100
Subject: [PATCH 074/546] merged with stash

---
 apps/gallery/css/styles.css           | 11 ++++++++++-
 apps/gallery/js/albums.js             | 18 +++++++++++++-----
 apps/gallery/templates/view_album.php |  3 ++-
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index e23d822fec7..2178a4224d1 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -14,6 +14,8 @@ div#gallery_album_box {
   display: inline-block;
   margin: 5pt;
   vertical-align: top;
+  padding: 10px;
+  border: solid 1px black;
 }
 .leftcontent div#gallery_album_box {
   margin: 5px;
@@ -27,7 +29,14 @@ div#gallery_album_box h1 {
 div#gallery_album_cover {
   width: 199px;
   height: 199px;
-  border: solid 1px black;
+  border: solid 1px #999;
+  padding: 0;
+}
+
+div#gallery_control_overlay {
+  width:199px;
+  height:199px;
+  position:relative;
 }
 
 #gallery_images {
diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index 387cc611d5f..7ffa2cf891d 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -57,14 +57,15 @@ Albums={
   // displays gallery in linear representation
   // on given element, and apply default styles for gallery
   display: function(element) {
-    var displayTemplate = '<div id="gallery_album_box" title="*NAME*"><a href="?view=*NAME*"><div id="gallery_album_cover"></div></a><h1>*NAME*</h1></div></div>';
+    var displayTemplate = '<div id="gallery_album_box" title="*NAME*"><a href="#?view=*NAME*"><div id="#gallery_control_overlay"><div id="gallery_album_cover" title="*NAME*"></div></div></a><h1>*NAME*</h1></div></div>';
     for (var i in Albums.albums) {
       var a = Albums.albums[i];
       var local = $(displayTemplate.replace(/\*NAME\*/g, a.name));
-      local.css('background-repeat', 'no-repeat');
-      local.css('background-position', '0 0');
-      local.css('background-image','url("'+a.backgroundPath+'")');
-      local.mousemove(function(e) {
+      $("#gallery_album_cover", local).css('background-repeat', 'no-repeat');
+      $("#gallery_album_cover", local).css('background-position', '0');
+      $("#gallery_album_cover", local).css('background-image','url("ajax/getCovers.php?album_name='+a.name+'")');
+      $("#gallery_album_cover", local).mousemove(function(e) {
+
         var albumMetadata = Albums.find(this.title);
         if (albumMetadata == undefined) {
           return;
@@ -75,6 +76,13 @@ Albums={
       });
       $(element).append(local);
     }
+  },
+  rename: function(element, new_name) {
+    if (new_name) {
+		$(element).attr("title", new_name);
+		$("a", element).attr("href", "?view="+new_name);
+		$("h1", element).text(new_name);
+	}
   }
 
 }
diff --git a/apps/gallery/templates/view_album.php b/apps/gallery/templates/view_album.php
index ae43e2fc557..4acc965269c 100644
--- a/apps/gallery/templates/view_album.php
+++ b/apps/gallery/templates/view_album.php
@@ -15,7 +15,8 @@ OC_Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' );
 </script>
 
 <div id="controls">
-  <a href="?"><input type="button" value="Back" /></a><br/>
+  <a href="?"><input type="button" value="Back" /></a>
+<br/>
 </div>
 
 <div id="gallery_list" class="leftcontent">
-- 
GitLab


From 6a1a7fcd268e90a3b6c33f9568403a441ce983da Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 21 Dec 2011 18:40:43 +0100
Subject: [PATCH 075/546] merged with stash

---
 apps/gallery/ajax/getAlbums.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/gallery/ajax/getAlbums.php b/apps/gallery/ajax/getAlbums.php
index 7454b18edab..e4736076fed 100644
--- a/apps/gallery/ajax/getAlbums.php
+++ b/apps/gallery/ajax/getAlbums.php
@@ -4,6 +4,7 @@ OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
 
 $a = array();
+
 $result = OC_Gallery_Album::find(OC_User::getUser());
 
 while ($r = $result->fetchRow()) {
-- 
GitLab


From 1383cb51e7672b422732a1d20379baaa4f3f7b62 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 21 Dec 2011 21:55:52 +0100
Subject: [PATCH 076/546] removing and renaming albums

---
 apps/gallery/ajax/galleryOp.php | 29 ++++++++++++++++++++++++++++
 apps/gallery/css/styles.css     | 19 +++++++++++++-----
 apps/gallery/js/album_cover.js  | 34 +++++++++++++++++++++++++++++++++
 apps/gallery/js/albums.js       | 10 ++++++++--
 apps/gallery/lib/album.php      | 19 +++++++++++++++++-
 5 files changed, 103 insertions(+), 8 deletions(-)
 create mode 100644 apps/gallery/ajax/galleryOp.php

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
new file mode 100644
index 00000000000..cd7cab202b1
--- /dev/null
+++ b/apps/gallery/ajax/galleryOp.php
@@ -0,0 +1,29 @@
+<?
+require_once('../../../lib/base.php');
+require_once('../lib/album.php');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('gallery');
+
+function handleRename($oldname, $newname) {
+  OC_Gallery_Album::rename($oldname, $newname, OC_User::getUser());
+}
+
+function handleRemove($name) {
+  OC_Gallery_Album::remove(OC_User::getUser(), $name);
+}
+
+if ($_GET['operation']) {
+  switch($_GET['operation']) {
+	case "rename":
+	  handleRename($_GET['oldname'], $_GET['newname']);
+	  OC_JSON::success(array('newname' => $_GET['newname']));
+	break;
+	case "remove":
+	  handleRemove($_GET['name']);
+	  OC_JSON::success();
+	  break;
+    default:
+     OC_JSON::error(array('cause' => "Unknown operation"));
+  }
+}
+?>
\ No newline at end of file
diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index 2178a4224d1..09f9daeb6b1 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -16,6 +16,7 @@ div#gallery_album_box {
   vertical-align: top;
   padding: 10px;
   border: solid 1px black;
+  position: relative;
 }
 .leftcontent div#gallery_album_box {
   margin: 5px;
@@ -23,20 +24,28 @@ div#gallery_album_box {
 
 div#gallery_album_box h1 {
   font-size: 12pt;
-  font-family: Arial;
+  font-family: Verdana;
 }
 
 div#gallery_album_cover {
   width: 199px;
   height: 199px;
-  border: solid 1px #999;
+  border: solid 1pt #999;
   padding: 0;
 }
 
 div#gallery_control_overlay {
-  width:199px;
-  height:199px;
-  position:relative;
+  border: 0;
+  position:absolute;
+  right: 10pt;
+  background-color: #333;
+  opacity: 0.5;
+  visibility:hidden;
+  padding: 0 5pt;
+}
+
+div#gallery_control_overlay a {
+  color:white;
 }
 
 #gallery_images {
diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index c475c60d5da..619aa391c56 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -39,3 +39,37 @@ function scanForAlbums() {
     }
   });
 }
+
+function galleryRemove(albumName) {
+  if (confirm("Do you wan't to remove album " + albumName + "?")) {
+	$.getJSON("ajax/galleryOp.php", {operation: "remove", name: albumName}, function(r) {
+	  if (r.status == "success") {
+		$("#gallery_album_box[title='"+albumName+"']").remove();
+		Albums.remove(albumName);
+	  } else {
+		alert("Error: " + r.cause);
+	  }
+	});
+  }
+}
+
+function galleryRename(name) {
+  var result = window.prompt("Input new gallery name", "");
+  if (result) {
+	if (Albums.find(result)) {
+	  alert("Album named '" + result + "' already exists");
+	  return;
+	}
+	$.getJSON("ajax/galleryOp.php", {operation: "rename", oldname: name, newname: result}, function(r) {
+	  if (r.status == "success") {
+        Albums.rename($("#gallery_album_box[title='"+name+"']"), result);
+      } else {
+	    alert("Error: " + r.cause);
+      }
+	});
+	
+  } else {
+    alert("Album name can't be empty")
+  }
+}
+
diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index 7ffa2cf891d..ae7d1fac500 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -57,13 +57,19 @@ Albums={
   // displays gallery in linear representation
   // on given element, and apply default styles for gallery
   display: function(element) {
-    var displayTemplate = '<div id="gallery_album_box" title="*NAME*"><a href="#?view=*NAME*"><div id="#gallery_control_overlay"><div id="gallery_album_cover" title="*NAME*"></div></div></a><h1>*NAME*</h1></div></div>';
+    var displayTemplate = '<div id="gallery_album_box" title="*NAME*"><div id="gallery_control_overlay"><a href="#" onclick="galleryRename(\'*NAME*\');return false;">rename</a> | <a href="#" onclick="galleryRemove(\'*NAME*\');">remove</a></div><a href="?view=*NAME*"><div id="gallery_album_cover" title="*NAME*"></div></a><h1>*NAME*</h1></div></div>';
     for (var i in Albums.albums) {
       var a = Albums.albums[i];
       var local = $(displayTemplate.replace(/\*NAME\*/g, a.name));
       $("#gallery_album_cover", local).css('background-repeat', 'no-repeat');
       $("#gallery_album_cover", local).css('background-position', '0');
       $("#gallery_album_cover", local).css('background-image','url("ajax/getCovers.php?album_name='+a.name+'")');
+      local.mouseover(function(e) {
+	    $("#gallery_control_overlay", this).css('visibility','visible');
+      });
+      local.mouseout(function(e) {
+	    $("#gallery_control_overlay", this).css('visibility','hidden');
+	  });
       $("#gallery_album_cover", local).mousemove(function(e) {
 
         var albumMetadata = Albums.find(this.title);
@@ -71,7 +77,7 @@ Albums={
           return;
         }
         var x = Math.min(Math.floor((e.layerX - this.offsetLeft)/(this.offsetWidth/albumMetadata.numOfCovers)), albumMetadata.numOfCovers-1);
-        x *= this.offsetWidth;
+        x *= this.offsetWidth-1;
         $(this).css('background-position', -x+'px 0');
       });
       $(element).append(local);
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 6ddfe46de3d..0999429c5d5 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -1,10 +1,27 @@
 <?php
 
-class OC_Gallery_Album{
+class OC_Gallery_Album {
 	public static function create($owner, $name){
 		$stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_albums (uid_owner, album_name) VALUES (?, ?)');
 		$stmt->execute(array($owner, $name));
 	}
+	
+	public static function rename($oldname, $newname, $owner) {
+	    $stmt = OC_DB::prepare('UPDATE OR IGNORE *PREFIX*gallery_albums SET album_name=? WHERE uid_owner=? AND album_name=?');
+		$stmt->execute(array($newname, $owner, $oldname));
+	}
+	
+	public static function remove($owner, $name=null) {
+		$sql = 'DELETE FROM *PREFIX*gallery_albums WHERE uid_owner = ?';
+		$args = array($owner);
+		if (!is_null($name)){
+			$sql .= ' AND album_name = ?';
+			$args[] = $name;
+		}
+		$stmt = OC_DB::prepare($sql);
+		return $stmt->execute($args);
+	}
+	
 	public static function find($owner, $name=null){
 		$sql = 'SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner = ?';
 		$args = array($owner);
-- 
GitLab


From 5e6fa608eb2d80cce3b1263eb68a8edcd1d0c05c Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 22 Dec 2011 16:31:01 +0100
Subject: [PATCH 077/546] use OC_JSON::checkLoggedIn() in all ajax files

---
 apps/calendar/ajax/activation.php     | 4 +---
 apps/calendar/ajax/choosecalendar.php | 4 +---
 apps/calendar/ajax/deletecalendar.php | 4 +---
 apps/calendar/ajax/deleteevent.php    | 4 +---
 apps/calendar/ajax/editcalendar.php   | 4 +---
 apps/calendar/ajax/editevent.php      | 4 +---
 apps/calendar/ajax/editeventform.php  | 4 +---
 apps/calendar/ajax/importdialog.php   | 4 +---
 apps/calendar/ajax/newcalendar.php    | 4 +---
 apps/calendar/ajax/newevent.php       | 4 +---
 apps/calendar/ajax/neweventform.php   | 4 +---
 11 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/apps/calendar/ajax/activation.php b/apps/calendar/ajax/activation.php
index 3c2bc6de23f..ada2e44547b 100644
--- a/apps/calendar/ajax/activation.php
+++ b/apps/calendar/ajax/activation.php
@@ -7,9 +7,7 @@
  */
 
 require_once ("../../../lib/base.php");
-if(!OC_USER::isLoggedIn()) {
-	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 $calendarid = $_POST['calendarid'];
 $calendar = OC_Calendar_App::getCalendar($calendarid);//access check
diff --git a/apps/calendar/ajax/choosecalendar.php b/apps/calendar/ajax/choosecalendar.php
index 0935a4c42ad..9281c8edbdc 100644
--- a/apps/calendar/ajax/choosecalendar.php
+++ b/apps/calendar/ajax/choosecalendar.php
@@ -8,9 +8,7 @@
 
 require_once('../../../lib/base.php');
 $l10n = new OC_L10N('calendar');
-if(!OC_USER::isLoggedIn()) {
-	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 $output = new OC_TEMPLATE("calendar", "part.choosecalendar");
 $output -> printpage();
diff --git a/apps/calendar/ajax/deletecalendar.php b/apps/calendar/ajax/deletecalendar.php
index fc308da6dad..901cbbfcb08 100644
--- a/apps/calendar/ajax/deletecalendar.php
+++ b/apps/calendar/ajax/deletecalendar.php
@@ -7,9 +7,7 @@
  */
 require_once('../../../lib/base.php');
 
-if(!OC_USER::isLoggedIn()) {
-	die('<script type="text/javascript">document.location = oc_webroot;</script>');
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 
 $cal = $_POST["calendarid"];
diff --git a/apps/calendar/ajax/deleteevent.php b/apps/calendar/ajax/deleteevent.php
index 269f4a47f42..b25a5af1a29 100644
--- a/apps/calendar/ajax/deleteevent.php
+++ b/apps/calendar/ajax/deleteevent.php
@@ -9,9 +9,7 @@ require_once('../../../lib/base.php');
 
 $l10n = new OC_L10N('calendar');
 
-if(!OC_USER::isLoggedIn()) {
-	die('<script type="text/javascript">document.location = oc_webroot;</script>');
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 
 $id = $_POST['id'];
diff --git a/apps/calendar/ajax/editcalendar.php b/apps/calendar/ajax/editcalendar.php
index e44763c9aaa..7aeb5bbe305 100644
--- a/apps/calendar/ajax/editcalendar.php
+++ b/apps/calendar/ajax/editcalendar.php
@@ -7,9 +7,7 @@
  */
 
 require_once('../../../lib/base.php');
-if(!OC_USER::isLoggedIn()) {
-	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 
 $calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
diff --git a/apps/calendar/ajax/editevent.php b/apps/calendar/ajax/editevent.php
index f00ab1d960b..5a487da1758 100644
--- a/apps/calendar/ajax/editevent.php
+++ b/apps/calendar/ajax/editevent.php
@@ -7,9 +7,7 @@
  */
 
 require_once('../../../lib/base.php');
-if(!OC_USER::isLoggedIn()) {
-	die('<script type="text/javascript">document.location = oc_webroot;</script>');
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 
 $errarr = OC_Calendar_Object::validateRequest($_POST);
diff --git a/apps/calendar/ajax/editeventform.php b/apps/calendar/ajax/editeventform.php
index fe6c6f73570..2c81539d2e0 100644
--- a/apps/calendar/ajax/editeventform.php
+++ b/apps/calendar/ajax/editeventform.php
@@ -8,9 +8,7 @@
 
 require_once('../../../lib/base.php');
 
-if(!OC_USER::isLoggedIn()) {
-	die('<script type="text/javascript">document.location = oc_webroot;</script>');
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 
 $id = $_GET['id'];
diff --git a/apps/calendar/ajax/importdialog.php b/apps/calendar/ajax/importdialog.php
index 232b4ba5807..8d8430da7aa 100644
--- a/apps/calendar/ajax/importdialog.php
+++ b/apps/calendar/ajax/importdialog.php
@@ -10,9 +10,7 @@ require_once('../../../lib/base.php');
 
 $l10n = new OC_L10N('calendar');
 
-if(!OC_USER::isLoggedIn()) {
-	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 
 $tmpl = new OC_Template('calendar', 'part.import');
diff --git a/apps/calendar/ajax/newcalendar.php b/apps/calendar/ajax/newcalendar.php
index a7935c95672..af3ba4fbbea 100644
--- a/apps/calendar/ajax/newcalendar.php
+++ b/apps/calendar/ajax/newcalendar.php
@@ -8,9 +8,7 @@
 
 require_once('../../../lib/base.php');
 $l10n = new OC_L10N('calendar');
-if(!OC_USER::isLoggedIn()) {
-	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 $calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
 $calendar = array(
diff --git a/apps/calendar/ajax/newevent.php b/apps/calendar/ajax/newevent.php
index 1a696cf7780..c7c4d29943a 100644
--- a/apps/calendar/ajax/newevent.php
+++ b/apps/calendar/ajax/newevent.php
@@ -10,9 +10,7 @@ require_once('../../../lib/base.php');
 
 $l10n = new OC_L10N('calendar');
 
-if(!OC_USER::isLoggedIn()) {
-	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 
 $errarr = OC_Calendar_Object::validateRequest($_POST);
diff --git a/apps/calendar/ajax/neweventform.php b/apps/calendar/ajax/neweventform.php
index e12e99219e6..6de1f8ca307 100644
--- a/apps/calendar/ajax/neweventform.php
+++ b/apps/calendar/ajax/neweventform.php
@@ -8,9 +8,7 @@
 
 require_once('../../../lib/base.php');
 
-if(!OC_USER::isLoggedIn()) {
-	die('<script type="text/javascript">document.location = oc_webroot;</script>');
-}
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 
 if (!isset($_POST['start'])){
-- 
GitLab


From 9bb004963b0ed205a01bfd7e09744263136d5b66 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Fri, 23 Dec 2011 12:28:44 -0500
Subject: [PATCH 078/546] Fix whitespace folder name

---
 files/ajax/newfolder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/ajax/newfolder.php b/files/ajax/newfolder.php
index 6966e912c56..d244fb7be19 100644
--- a/files/ajax/newfolder.php
+++ b/files/ajax/newfolder.php
@@ -9,7 +9,7 @@ OC_JSON::checkLoggedIn();
 $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
 $foldername = isset( $_GET['foldername'] ) ? $_GET['foldername'] : '';
 
-if($foldername == '') {
+if(trim($foldername) == '') {
 	OC_JSON::error(array("data" => array( "message" => "Empty Foldername" )));
 	exit();
 }
-- 
GitLab


From 1fe55b665609ad5af1c6b5af4f0b4fad9bede9f3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Fri, 23 Dec 2011 19:48:22 +0100
Subject: [PATCH 079/546] fix upload error reporting

---
 files/ajax/upload.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/files/ajax/upload.php b/files/ajax/upload.php
index 041ec0c92e3..5f0f68d9531 100644
--- a/files/ajax/upload.php
+++ b/files/ajax/upload.php
@@ -14,9 +14,10 @@ if (!isset($_FILES['files'])) {
 }
 foreach ($_FILES['files']['error'] as $error) {
 	if ($error != 0) {
+		$l=new OC_L10N('files');
 		$errors = array(
 			0=>$l->t("There is no error, the file uploaded with success"),
-			1=>$l->t("The uploaded file exceeds the upload_max_filesize directive in php.ini"),
+			1=>$l->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'),
 			2=>$l->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
 			3=>$l->t("The uploaded file was only partially uploaded"),
 			4=>$l->t("No file was uploaded"),
-- 
GitLab


From 8ee53708ae708f7765f13f7dee34c68a4f95a6e1 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 25 Dec 2011 15:07:53 +0100
Subject: [PATCH 080/546] use pre-decrement instead of post-decrement

---
 apps/calendar/ajax/events.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index 1430432b8a3..998991c2fb4 100644
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -58,7 +58,7 @@ foreach($events as $event){
 			}
 			if($return_event['allDay'] == true){
 				$return_event['start'] = $result->format('Y-m-d');
-				$return_event['end'] = date('Y-m-d', $result->format('U') + $duration--);
+				$return_event['end'] = date('Y-m-d', $result->format('U') + --$duration);
 			}else{
 				$return_event['start'] = $result->format('Y-m-d H:i:s');
 				$return_event['end'] = date('Y-m-d H:i:s', $result->format('U') + $duration);
-- 
GitLab


From 9eef57faed0f6c8f1481a3bcb38df24605e12384 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 25 Dec 2011 23:19:49 +0100
Subject: [PATCH 081/546] make repeating events editable

---
 apps/calendar/ajax/editeventform.php       | 166 +++++++++-
 apps/calendar/ajax/neweventform.php        |  29 ++
 apps/calendar/js/calendar.js               | 123 +++++++-
 apps/calendar/lib/app.php                  |  41 ++-
 apps/calendar/lib/object.php               | 336 +++++++++++++++++++--
 apps/calendar/templates/part.eventform.php | 251 +++++++++++----
 6 files changed, 857 insertions(+), 89 deletions(-)

diff --git a/apps/calendar/ajax/editeventform.php b/apps/calendar/ajax/editeventform.php
index 2c81539d2e0..4783fcca897 100644
--- a/apps/calendar/ajax/editeventform.php
+++ b/apps/calendar/ajax/editeventform.php
@@ -40,7 +40,6 @@ switch($dtstart->getDateType()) {
 $summary = $vevent->getAsString('SUMMARY');
 $location = $vevent->getAsString('LOCATION');
 $categories = $vevent->getAsArray('CATEGORIES');
-$repeat = $vevent->getAsString('CATEGORY');
 $description = $vevent->getAsString('DESCRIPTION');
 foreach($categories as $category){
 	if (!in_array($category, $category_options)){
@@ -53,10 +52,150 @@ if ($last_modified){
 }else{
 	$lastmodified = 0;
 }
+if($data['repeating'] == 1){
+	$rrule = explode(';', $vevent->getAsString('RRULE'));
+	$rrulearr = array();
+	foreach($rrule as $rule){
+		list($attr, $val) = explode('=', $rule);
+		$rrulearr[$attr] = $val;
+	}
+	if(!isset($rrulearr['INTERVAL']) || $rrulearr['INTERVAL'] == ''){
+		$rrulearr['INTERVAL'] = 1;
+	}
+	if(array_key_exists('BYDAY', $rrulearr)){
+		if(substr_count($rrulearr['BYDAY'], ',') == 0){
+			if(strlen($rrulearr['BYDAY']) == 2){
+				$repeat['weekdays'] = array($rrulearr['BYDAY']);
+			}elseif(strlen($rrulearr['BYDAY']) == 3){
+				$repeat['weekofmonth'] = substr($rrulearr['BYDAY'] , 0, 1);
+				$repeat['weekdays'] = array(substr($rrulearr['BYDAY'] , 1, 2));
+			}elseif(strlen($rrulearr['BYDAY']) == 4){
+				$repeat['weekofmonth'] = substr($rrulearr['BYDAY'] , 0, 2);
+				$repeat['weekdays'] = array(substr($rrulearr['BYDAY'] , 2, 2));
+			}
+		}else{
+			$byday_days = explode(',', $rrulearr['BYDAY']);
+			foreach($byday_days as $byday_day){
+				if(strlen($byday_day) == 2){
+					$repeat['weekdays'][] = $byday_day;
+				}elseif(strlen($rrulearr['BYDAY']) == 3){
+					$repeat['weekofmonth'] = substr($byday_day , 0, 1);
+					$repeat['weekdays'][] = substr($byday_day , 1, 2);
+				}elseif(strlen($rrulearr['BYDAY']) == 4){
+					$repeat['byweekno'] = substr($byday_day , 0, 2);
+					$repeat['weekdays'][] = substr($byday_day , 2, 2);
+				}
+			}
+		}
+	}
+	if(array_key_exists('BYMONTHDAY', $rrulearr)){
+		if(substr_count($rrulearr['BYMONTHDAY'], ',') == 0){
+			$repeat['bymonthday'][] = $rrulearr['BYMONTHDAY'];
+		}else{
+			$bymonthdays = explode(',', $rrulearr['BYMONTHDAY']);
+			foreach($bymonthdays as $bymonthday){
+				$repeat['bymonthday'][] = $bymonthday;
+			}
+		}
+	}
+	if(array_key_exists('BYYEARDAY', $rrulearr)){
+		if(substr_count($rrulearr['BYYEARDAY'], ',') == 0){
+			$repeat['byyearday'][] = $rrulearr['BYYEARDAY'];
+		}else{
+			$byyeardays = explode(',', $rrulearr['BYYEARDAY']);
+			foreach($byyeardays  as $yearday){
+				$repeat['byyearday'][] = $yearday;
+			}
+		}
+	}
+	if(array_key_exists('BYWEEKNO', $rrulearr)){
+		if(substr_count($rrulearr['BYWEEKNO'], ',') == 0){
+			$repeat['byweekno'][] = (string) $rrulearr['BYWEEKNO'];
+		}else{
+			$byweekno = explode(',', $rrulearr['BYWEEKNO']);
+			foreach($byweekno as $weekno){
+				$repeat['byweekno'][] = (string) $weekno;
+			}
+		}
+	}
+	if(array_key_exists('BYMONTH', $rrulearr)){
+		$months = OC_Calendar_App::getByMonthOptions();
+		if(substr_count($rrulearr['BYMONTH'], ',') == 0){
+			$repeat['bymonth'][] = $months[$month];
+		}else{
+			$bymonth = explode(',', $rrulearr['BYMONTH']);
+			foreach($bymonth as $month){
+				$repeat['bymonth'][] = $months[$month];
+			}
+		}
+	}
+	switch($rrulearr['FREQ']){
+		case 'DAILY':
+			$repeat['repeat'] = 'daily';
+			break;
+		case 'WEEKLY':
+			if($rrulearr['INTERVAL'] % 2 == 0){
+				$repeat['repeat'] = 'biweekly';
+				$rrulearr['INTERVAL'] = $rrulearr['INTERVAL'] / 2;
+			}elseif($rrulearr['BYDAY'] == 'MO,TU,WE,TH,FR'){
+				$repeat['repeat'] = 'weekday';
+			}else{
+				$repeat['repeat'] = 'weekly';
+			}
+			break;
+		case 'MONTHLY':
+			$repeat['repeat'] = 'monthly';
+			if(array_key_exists('BYDAY', $rrulearr)){
+				$repeat['month'] = 'weekday';
+			}else{
+				$repeat['month'] = 'monthday';
+			}
+			break;
+		case 'YEARLY':
+			$repeat['repeat'] = 'yearly';
+			if(array_key_exists('BYMONTH', $rrulearr)){
+				$repeat['year'] = 'bydaymonth';
+			}elseif(array_key_exists('BYWEEKNO', $rrulearr)){
+				$repeat['year'] = 'byweekno';
+			}else{
+				$repeat['year'] = 'byyearday';
+			}
+	}
+	$repeat['interval'] = $rrulearr['INTERVAL'];
+	if(array_key_exists('COUNT', $rrulearr)){
+		$end = 'count';
+		$count = $rrulearr['COUNT'];
+	}elseif(array_key_exists('UNTIL', $rrulearr)){
+		$end = 'date';
+		$endbydate_day = substr($rrulearr['UNTIL'], 6, 2);
+		$endbydate_month = substr($rrulearr['UNTIL'], 4, 2);
+		$endbydate_year = substr($rrulearr['UNTIL'], 0, 4);
+		$endbydate = $endbydate_day . $endbydate_month . $endbydate_year;
+	}else{
+		$end = 'never';
+	}
+	if(array_key_exists('weekdays', $repeat)){
+		$repeat_weekdays_ = array();
+		$days = OC_Calendar_App::getWeeklyOptions();
+		foreach($repeat['weekdays'] as $weekday){
+			$repeat_weekdays_[] = $days[$weekday];
+		}
+		$repeat['weekdays'] = $repeat_weekdays_;
+	}
+}
 
 $calendar_options = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
 $category_options = OC_Calendar_App::getCategoryOptions();
 $repeat_options = OC_Calendar_App::getRepeatOptions();
+$repeat_end_options = OC_Calendar_App::getEndOptions();
+$repeat_month_options = OC_Calendar_App::getMonthOptions();
+$repeat_year_options = OC_Calendar_App::getYearOptions();
+$repeat_weekly_options = OC_Calendar_App::getWeeklyOptions();
+$repeat_weekofmonth_options = OC_Calendar_App::getWeekofMonth();
+$repeat_byyearday_options = OC_Calendar_App::getByYearDayOptions();
+$repeat_bymonth_options = OC_Calendar_App::getByMonthOptions();
+$repeat_byweekno_options = OC_Calendar_App::getByWeekNoOptions();
+$repeat_bymonthday_options = OC_Calendar_App::getByMonthDayOptions();
 
 $tmpl = new OC_Template('calendar', 'part.editevent');
 $tmpl->assign('id', $id);
@@ -64,6 +203,15 @@ $tmpl->assign('lastmodified', $lastmodified);
 $tmpl->assign('calendar_options', $calendar_options);
 $tmpl->assign('category_options', $category_options);
 $tmpl->assign('repeat_options', $repeat_options);
+$tmpl->assign('repeat_month_options', $repeat_month_options);
+$tmpl->assign('repeat_weekly_options', $repeat_weekly_options);
+$tmpl->assign('repeat_end_options', $repeat_end_options);
+$tmpl->assign('repeat_year_options', $repeat_year_options);
+$tmpl->assign('repeat_byyearday_options', $repeat_byyearday_options);
+$tmpl->assign('repeat_bymonth_options', $repeat_bymonth_options);
+$tmpl->assign('repeat_byweekno_options', $repeat_byweekno_options);
+$tmpl->assign('repeat_bymonthday_options', $repeat_bymonthday_options);
+$tmpl->assign('repeat_weekofmonth_options', $repeat_weekofmonth_options);
 
 $tmpl->assign('title', $summary);
 $tmpl->assign('location', $location);
@@ -74,8 +222,22 @@ $tmpl->assign('startdate', $startdate);
 $tmpl->assign('starttime', $starttime);
 $tmpl->assign('enddate', $enddate);
 $tmpl->assign('endtime', $endtime);
-$tmpl->assign('repeat', $repeat);
 $tmpl->assign('description', $description);
+
+$tmpl->assign('repeat', $repeat['repeat']);
+$tmpl->assign('repeat_month', $repeat['month']);
+$tmpl->assign('repeat_weekdays', $repeat['weekdays']);
+$tmpl->assign('repeat_interval', $repeat['interval']);
+$tmpl->assign('repeat_end', $repeat['end']);
+$tmpl->assign('repeat_count', $repeat['count']);
+$tmpl->assign('repeat_weekofmonth', $repeat['weekofmonth']);
+$tmpl->assign('repeat_date', $repeat['date']);
+$tmpl->assign('repeat_year', $repeat['year']);
+$tmpl->assign('repeat_byyearday', $repeat['byyearday']);
+$tmpl->assign('repeat_bymonthday', $repeat['bymonthday']);
+$tmpl->assign('repeat_bymonth', $repeat['bymonth']);
+$tmpl->assign('repeat_byweekno', $repeat['byweekno']);
 $tmpl->printpage();
+
 ?>
  
diff --git a/apps/calendar/ajax/neweventform.php b/apps/calendar/ajax/neweventform.php
index 6de1f8ca307..1812407dd6e 100644
--- a/apps/calendar/ajax/neweventform.php
+++ b/apps/calendar/ajax/neweventform.php
@@ -32,14 +32,43 @@ $end->setTimezone(new DateTimeZone($timezone));
 $calendar_options = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
 $category_options = OC_Calendar_App::getCategoryOptions();
 $repeat_options = OC_Calendar_App::getRepeatOptions();
+$repeat_end_options = OC_Calendar_App::getEndOptions();
+$repeat_month_options = OC_Calendar_App::getMonthOptions();
+$repeat_year_options = OC_Calendar_App::getYearOptions();
+$repeat_weekly_options = OC_Calendar_App::getWeeklyOptions();
+$repeat_weekofmonth_options = OC_Calendar_App::getWeekofMonth();
+$repeat_byyearday_options = OC_Calendar_App::getByYearDayOptions();
+$repeat_bymonth_options = OC_Calendar_App::getByMonthOptions();
+$repeat_byweekno_options = OC_Calendar_App::getByWeekNoOptions();
+$repeat_bymonthday_options = OC_Calendar_App::getByMonthDayOptions();
 
 $tmpl = new OC_Template('calendar', 'part.newevent');
 $tmpl->assign('calendar_options', $calendar_options);
 $tmpl->assign('category_options', $category_options);
+$tmpl->assign('repeat_options', $repeat_options);
+$tmpl->assign('repeat_month_options', $repeat_month_options);
+$tmpl->assign('repeat_weekly_options', $repeat_weekly_options);
+$tmpl->assign('repeat_end_options', $repeat_end_options);
+$tmpl->assign('repeat_year_options', $repeat_year_options);
+$tmpl->assign('repeat_byyearday_options', $repeat_byyearday_options);
+$tmpl->assign('repeat_bymonth_options', $repeat_bymonth_options);
+$tmpl->assign('repeat_byweekno_options', $repeat_byweekno_options);
+$tmpl->assign('repeat_bymonthday_options', $repeat_bymonthday_options);
+$tmpl->assign('repeat_weekofmonth_options', $repeat_weekofmonth_options);
+
 $tmpl->assign('startdate', $start->format('d-m-Y'));
 $tmpl->assign('starttime', $start->format('H:i'));
 $tmpl->assign('enddate', $end->format('d-m-Y'));
 $tmpl->assign('endtime', $end->format('H:i'));
 $tmpl->assign('allday', $allday);
+$tmpl->assign('repeat', 'doesnotrepeat');
+$tmpl->assign('repeat_month', 'monthday');
+$tmpl->assign('repeat_weekdays', array());
+$tmpl->assign('repeat_interval', 1);
+$tmpl->assign('repeat_end', 'never');
+$tmpl->assign('repeat_count', '10');
+$tmpl->assign('repeat_weekofmonth', 'auto');
+$tmpl->assign('repeat_date', '');
+$tmpl->assign('repeat_year', 'byyearday');
 $tmpl->printpage();
 ?>
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index c3644b53704..93dddf516f9 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -25,6 +25,19 @@ Calendar={
 					minWidth:'auto',
 					classes: 'category',
 			});
+			Calendar.UI.repeat('init');
+			$('#end').change(function(){
+				Calendar.UI.repeat('end');
+			});
+			$('#repeat').change(function(){
+				Calendar.UI.repeat('repeat');
+			});
+			$('#advanced_year').change(function(){
+				Calendar.UI.repeat('year');
+			});
+			$('#advanced_month').change(function(){
+				Calendar.UI.repeat('month');
+			});
 			$('#event').dialog({
 				width : 500,
 				close : function(event, ui) {
@@ -132,9 +145,16 @@ Calendar={
 			});
 		},
 		showadvancedoptions:function(){
-			$("#advanced_options").css("display", "block");
+			$("#advanced_options").slideDown('slow');
 			$("#advanced_options_button").css("display", "none");
 		},
+		showadvancedoptionsforrepeating:function(){
+			if($("#advanced_options_repeating").is(":hidden")){
+				$('#advanced_options_repeating').slideDown('slow');
+			}else{
+				$('#advanced_options_repeating').slideUp('slow');
+			}
+		},
 		getEventPopupText:function(event){
 			if (event.allDay){
 				var timespan = $.fullCalendar.formatDates(event.start, event.end, 'ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}', {monthNamesShort: monthNamesShort, monthNames: monthNames, dayNames: dayNames, dayNamesShort: dayNamesShort}); //t('calendar', "ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}")
@@ -205,6 +225,107 @@ Calendar={
 				event.preventDefault();
 			}
 		},
+		repeat:function(task){
+			if(task=='init'){
+				$('#byweekno').multiselect({
+					header: false,
+					noneSelectedText: $('#advanced_byweekno').attr('title'),
+					selectedList: 2,
+					minWidth:'auto'
+				});
+				$('#weeklyoptions').multiselect({
+					header: false,
+					noneSelectedText: $('#weeklyoptions').attr('title'),
+					selectedList: 2,
+					minWidth:'auto'
+				});
+				$('input[name="bydate"]').datepicker({
+					dateFormat : 'dd-mm-yy'
+				});
+				$('#byyearday').multiselect({
+					header: false,
+					noneSelectedText: $('#byyearday').attr('title'),
+					selectedList: 2,
+					minWidth:'auto'
+				});
+				$('#bymonth').multiselect({
+					header: false,
+					noneSelectedText: $('#bymonth').attr('title'),
+					selectedList: 2,
+					minWidth:'auto'
+				});
+				$('#bymonthday').multiselect({
+					header: false,
+					noneSelectedText: $('#bymonthday').attr('title'),
+					selectedList: 2,
+					minWidth:'auto'
+				});
+				Calendar.UI.repeat('end');
+				Calendar.UI.repeat('repeat');
+				Calendar.UI.repeat('month');
+				Calendar.UI.repeat('year');
+			}
+			if(task == 'end'){
+				$('#byoccurrences').css('display', 'none');
+				$('#bydate').css('display', 'none');
+				if($('#end option:selected').val() == 'count'){
+					$('#byoccurrences').css('display', 'block');
+				}
+				if($('#end option:selected').val() == 'date'){
+					$('#bydate').css('display', 'block');
+				}
+			}
+			if(task == 'repeat'){
+				$('#advanced_month').css('display', 'none');
+				$('#advanced_weekday').css('display', 'none');
+				$('#advanced_weekofmonth').css('display', 'none');
+				$('#advanced_byyearday').css('display', 'none');
+				$('#advanced_bymonth').css('display', 'none');
+				$('#advanced_byweekno').css('display', 'none');
+				$('#advanced_year').css('display', 'none');
+				$('#advanced_bymonthday').css('display', 'none');
+				if($('#repeat option:selected').val() == 'monthly'){
+					$('#advanced_month').css('display', 'block');
+				}
+				if($('#repeat option:selected').val() == 'weekly'){
+					$('#advanced_weekday').css('display', 'block');
+				}
+				if($('#repeat option:selected').val() == 'yearly'){
+					$('#advanced_year').css('display', 'block');
+					$('#advanced_byyearday').css('display', 'block');
+				}
+				if($('#repeat option:selected').val() == 'doesnotrepeat'){
+					$('#advanced_options_repeating').slideUp('slow');
+				}
+			}
+			if(task == 'month'){
+				$('#advanced_weekday').css('display', 'none');
+				$('#advanced_weekofmonth').css('display', 'none');
+				if($('#advanced_month_select option:selected').val() == 'weekday'){
+					$('#advanced_weekday').css('display', 'block');
+					$('#advanced_weekofmonth').css('display', 'block');
+				}
+			}
+			if(task == 'year'){
+				$('#advanced_weekday').css('display', 'none');
+				$('#advanced_byyearday').css('display', 'none');
+				$('#advanced_bymonth').css('display', 'none');
+				$('#advanced_byweekno').css('display', 'none');
+				$('#advanced_bymonthday').css('display', 'none');
+				if($('#advanced_year option:selected').val() == 'byyearday'){
+					$('#advanced_byyearday').css('display', 'block');
+				}
+				if($('#advanced_year option:selected').val() == 'byweekno'){
+					$('#advanced_byweekno').css('display', 'block');
+					
+				}
+				if($('#advanced_year option:selected').val() == 'bydaymonth'){
+					$('#advanced_bymonth').css('display', 'block');
+					$('#advanced_bymonthday').css('display', 'block');
+					$('#advanced_weekday').css('display', 'block');
+				}
+			}
+		},
 		Calendar:{
 			overview:function(){
 				if($('#choosecalendar_dialog').dialog('isOpen') == true){
diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index b023d531aa5..6e92cf67c5c 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -75,8 +75,43 @@ class OC_Calendar_App{
 		);
 	}
 
-	public static function getRepeatOptions()
-	{
-		OC_Calendar_Object::getRepeatOptions(self::$l10n);
+	public static function getRepeatOptions(){
+		return OC_Calendar_Object::getRepeatOptions(self::$l10n);
+	}
+
+	public static function getEndOptions(){
+		return OC_Calendar_Object::getEndOptions(self::$l10n);
+	}
+
+	public static function getMonthOptions(){
+		return OC_Calendar_Object::getMonthOptions(self::$l10n);
+	}
+
+	public static function getWeeklyOptions(){
+		return OC_Calendar_Object::getWeeklyOptions(self::$l10n);
+	}
+
+	public static function getYearOptions(){
+		return OC_Calendar_Object::getYearOptions(self::$l10n);
+	}
+
+	public static function getByYearDayOptions(){
+		return OC_Calendar_Object::getByYearDayOptions();
+	}
+
+	public static function getByMonthOptions(){
+		return OC_Calendar_Object::getByMonthOptions(self::$l10n);
+	}
+	
+	public static function getByWeekNoOptions(){
+		return OC_Calendar_Object::getByWeekNoOptions();
+	}
+
+	public static function getByMonthDayOptions(){
+		return OC_Calendar_Object::getByMonthDayOptions();
+	}
+	
+	public static function getWeekofMonth(){
+		return OC_Calendar_Object::getWeekofMonth(self::$l10n);
 	}
 }
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 58fe60611ce..c5ae760d00f 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -356,9 +356,98 @@ class OC_Calendar_Object{
 			'weekday'       => $l10n->t('Every Weekday'),
 			'biweekly'      => $l10n->t('Bi-Weekly'),
 			'monthly'       => $l10n->t('Monthly'),
-			'yearly'        => $l10n->t('Yearly'),
+			'yearly'        => $l10n->t('Yearly')
 		);
 	}
+
+	public static function getEndOptions($l10n)
+	{
+		return array(
+			'never' => $l10n->t('never'),
+			'count' => $l10n->t('by occurrences'),
+			'date'  => $l10n->t('by date')
+		);
+	}
+
+	public static function getMonthOptions($l10n)
+	{
+		return array(
+			'monthday' => $l10n->t('by monthday'),
+			'weekday'  => $l10n->t('by weekday')
+		);
+	}
+
+	public static function getWeeklyOptions($l10n)
+	{
+		return array(
+			'MO' => $l10n->t('Monday'),
+			'TU' => $l10n->t('Tuesday'),
+			'WE' => $l10n->t('Wednesday'),
+			'TH' => $l10n->t('Thursday'),
+			'FR' => $l10n->t('Friday'),
+			'SA' => $l10n->t('Saturday'),
+			'SU' => $l10n->t('Sunday')
+		);
+	}
+
+	public static function getWeekofMonth($l10n)
+	{
+		return array(
+			'auto' => $l10n->t('events week of month'),
+			'1' => $l10n->t('first'),
+			'2' => $l10n->t('second'),
+			'3' => $l10n->t('third'),
+			'4' => $l10n->t('fourth'),
+			'5' => $l10n->t('fifth'),
+			'-1' => $l10n->t('last')
+		);
+	}
+
+	public static function getByYearDayOptions(){
+		$return = array();
+		foreach(range(1,366) as $num){
+			$return[(string) $num] = (string) $num;
+		}
+		return $return;
+	}
+
+	public static function getByMonthDayOptions(){
+		$return = array();
+		foreach(range(1,31) as $num){
+			$return[(string) $num] = (string) $num;
+		}
+		return $return;
+	}
+
+	public static function getByMonthOptions($l10n){
+		return array(
+			'1'  => $l10n->t('January'),
+			'2'  => $l10n->t('February'),
+			'3'  => $l10n->t('March'),
+			'4'  => $l10n->t('April'),
+			'5'  => $l10n->t('May'),
+			'6'  => $l10n->t('June'),
+			'7'  => $l10n->t('July'),
+			'8'  => $l10n->t('August'),
+			'9'  => $l10n->t('September'),
+			'10' => $l10n->t('October'),
+			'11' => $l10n->t('November'),
+			'12' => $l10n->t('December')
+		);
+	}
+
+	public static function getYearOptions($l10n){
+		return array(
+			'byyearday' => $l10n->t('by yearday(s)'),
+			'byweekno'  => $l10n->t('by weeknumber(s)'),
+			'bydaymonth'  => $l10n->t('by day and month')
+		);
+	}
+
+	public static function getByWeekNoOptions(){
+		return range(1, 52);
+	}
+
 	public static function validateRequest($request)
 	{
 		$errnum = 0;
@@ -397,7 +486,91 @@ class OC_Calendar_Object{
 			$errarr['to'] = 'true';
 			$errnum++;
 		}
-		;
+		if($request['repeat'] != 'doesnotrepeat'){
+			if(is_nan($request['interval']) && $request['interval'] != ''){
+				$errarr['interval'] = 'true';
+				$ernum++;
+			}
+			if(array_key_exists('repeat', $request) && !array_key_exists($request['repeat'], self::getRepeatOptions(OC_Calendar_App::$l10n))){
+				$errarr['repeat'] = 'true';
+				$ernum++;
+			}
+			if(array_key_exists('advanced_month_select', $request) && !array_key_exists($request['advanced_month_select'], self::getMonthOptions(OC_Calendar_App::$l10n))){
+				$errarr['advanced_month_select'] = 'true';
+				$errnum++;
+			}
+			if(array_key_exists('advanced_year_select', $request) && !array_key_exists($request['advanced_year_select'], self::getYearOptions(OC_Calendar_App::$l10n))){
+				$errarr['advanced_year_select'] = 'true';
+				$errnum++;
+			}
+			if(array_key_exists('weekofmonthoptions', $request) && !array_key_exists($request['weekofmonthoptions'], self::getWeekofMonth(OC_Calendar_App::$l10n))){
+				$errarr['weekofmonthoptions'] = 'true';
+				$errnum++;
+			}
+			if($request['end'] != 'never'){
+				if(!array_key_exists($request['end'], self::getEndOptions(OC_Calendar_App::$l10n))){
+					$errarr['end'] = 'true';
+					$errnum++;
+				}
+				if($request['end'] == 'count' && is_nan($request['byoccurrences'])){
+					$errarr['byoccurrences'] = 'true';
+					$errnum++;
+				}
+				if($request['end'] == 'date'){
+					list($bydate_day, $bydate_month, $bydate_year) = explode('-', $request['bydate']);
+					if(!checkdate($bydate_month, $bydate_day, $bydate_year)){
+						$errarr['bydate'] = 'true';
+						$errnum++;
+					}
+				}
+			}
+			if(array_key_exists('weeklyoptions', $request)){
+				foreach($request['weeklyoptions'] as $option){
+					if(!in_array($option, self::getWeeklyOptions(OC_Calendar_App::$l10n))){
+						$errarr['weeklyoptions'] = 'true';
+						$errnum++;
+					}
+				}
+			}
+			if(array_key_exists('byyearday', $request)){
+				foreach($request['byyearday'] as $option){
+					if(!array_key_exists($option, self::getByYearDayOptions())){
+						$errarr['byyearday'] = 'true';
+						$errnum++;
+					}
+				}
+			}
+			if(array_key_exists('weekofmonthoptions', $request)){
+				if(is_nan((double)$request['weekofmonthoptions'])){
+					$errarr['weekofmonthoptions'] = 'true';
+					$errnum++;
+				}
+			}
+			if(array_key_exists('bymonth', $request)){
+				foreach($request['bymonth'] as $option){
+					if(!in_array($option, self::getByMonthOptions(OC_Calendar_App::$l10n))){
+						$errarr['bymonth'] = 'true';
+						$errnum++;
+					}
+				}
+			}
+			if(array_key_exists('byweekno', $request)){
+				foreach($request['byweekno'] as $option){
+					if(!array_key_exists($option, self::getByWeekNoOptions())){
+						$errarr['byweekno'] = 'true';
+						$errnum++;
+					}
+				}
+			}
+			if(array_key_exists('bymonthday', $request)){
+				foreach($request['bymonthday'] as $option){
+					if(!array_key_exists($option, self::getByMonthDayOptions())){
+						$errarr['bymonthday'] = 'true';
+						$errnum++;
+					}
+				}
+			}
+		}
 		if(!$allday && self::checkTime(urldecode($request['totime']))) {
 			$errarr['totime'] = 'true';
 			$errnum++;
@@ -468,27 +641,146 @@ class OC_Calendar_Object{
 			$fromtime = $request['fromtime'];
 			$totime = $request['totime'];
 		}
+		$vevent = $vcalendar->VEVENT;
 		$description = $request["description"];
-		//$repeat = $request["repeat"];
-		/*switch($request["repeatfreq"]){
-			case "DAILY":
-				$repeatfreq = "DAILY";
-			case "WEEKLY":
-				$repeatfreq = "WEEKLY";
-			case "WEEKDAY":
-				$repeatfreq = "DAILY;BYDAY=MO,TU,WE,TH,FR"; //load weeksdayss from userconfig when weekdays are choosable
-			case "":
-				$repeatfreq = "";
-			case "":
-				$repeatfreq = "";
-			case "":
-				$repeatfreq = "";
-			default:
-				$repeat = "false";
-		}*/
-		$repeat = "false";
+		$repeat = $request["repeat"];
+		if($repeat != 'doesnotrepeat'){
+			$rrule = '';
+			$interval = $request['interval'];
+			$end = $request['end'];
+			$byoccurrences = $request['byoccurrences'];
+			switch($repeat){
+				case 'daily':
+					$rrule .= 'FREQ=DAILY';
+					break;
+				case 'weekly':
+					$rrule .= 'FREQ=WEEKLY';
+					if(array_key_exists('weeklyoptions', $request)){
+						$byday = '';
+						$daystrings = array_flip(self::getWeeklyOptions(OC_Calendar_App::$l10n));
+						foreach($request['weeklyoptions'] as $days){
+							if($byday == ''){
+								$byday .= $daystrings[$days];
+							}else{
+								$byday .= ',' .$daystrings[$days];
+							}
+						}
+						$rrule .= ';BYDAY=' . $byday;
+					}
+					break;
+				case 'weekday':
+					$rrule .= 'FREQ=DAILY';
+					$rrule .= ';BYDAY=MO,TU,WE,TH,FR';
+					break;
+				case 'biweekly':
+					$rrule .= 'FREQ=WEEKLY';
+					$interval = $interval * 2;
+					break;
+				case 'monthly':
+					$rrule .= 'FREQ=MONTHLY';
+					if($request['advanced_month_select'] == 'monthday'){
+						break;
+					}elseif($request['advanced_month_select'] == 'weekday'){
+						if($request['weekofmonthoptions'] == 'auto'){
+							$weekofmonth = floor($request['weekofmonthoptions']/7);
+						}else{
+							$weekofmonth = $request['weekofmonthoptions'];
+						}
+						$days = array_flip(self::getWeeklyOptions(OC_Calendar_App::$l10n));
+						$byday = '';
+						foreach($request['weeklyoptions'] as $day){
+							if($byday == ''){
+								$byday .= $weekofmonth . $days[$day];
+							}else{
+								$byday .= ',' . $weekofmonth . $days[$day];
+							}
+						}
+						$rrule .= ';BYDAY=' . $byday;
+					}
+					break;
+				case 'yearly':
+					$rrule .= 'FREQ=YEARLY';
+					if($request['advanced_year_select'] == 'byyearday'){
+						$byyearday = '';
+						foreach($request['byyearday'] as $yearday){
+							if($byyearday == ''){
+								$byyearday = $yearday;
+							}else{
+								$byyearday .= ',' . $yearday;
+							}
+						}
+						$rrule .= ';BYYEARDAY=' . $byyearday;
+					}elseif($request['advanced_year_select'] == 'byweekno'){
+						list($_day, $_month, $_year) = explode('-', $from);
+						$rrule .= ';BYDAY=' . strtoupper(substr(date('l', mktime(0,0,0, $_month, $_day, $_year)), 0, 2));
+						$byweekno = '';
+						foreach($request['byweekno'] as $weekno){
+							if($byweekno == ''){
+								$byweekno = $weekno;
+							}else{
+								$byweekno .= ',' . $weekno;
+							}
+						}
+						$rrule .= ';BYWEEKNO=' . $byweekno;
+					}elseif($request['advanced_year_select'] == 'bydaymonth'){
+						if(array_key_exists('weeklyoptions', $request)){
+							$days = array_flip(self::getWeeklyOptions(OC_Calendar_App::$l10n));
+							$byday = '';
+							foreach($request['weeklyoptions'] as $day){
+								if($byday == ''){
+								      $byday .= $days[$day];
+								}else{
+								      $byday .= ',' . $days[$day];
+								}
+							}
+							$rrule .= ';BYDAY=' . $byday;
+						}
+						if(array_key_exists('bymonth', $request)){
+							$monthes = array_flip(self::getByMonthOptions(OC_Calendar_App::$l10n));
+							$bymonth = '';
+							foreach($request['bymonth'] as $month){
+								if($bymonth == ''){
+								      $bymonth .= $monthes[$month];
+								}else{
+								      $bymonth .= ',' . $monthes[$month];
+								}
+							}
+							$rrule .= ';BYMONTH=' . $bymonth;
+							
+						}
+						if(array_key_exists('bymonthday', $request)){
+							$bymonthday = '';
+							foreach($request['bymonthday'] as $monthday){
+								if($bymonthday == ''){
+								      $bymonthday .= $monthday;
+								}else{
+								      $bymonthday .= ',' . $monthday;
+								}
+							}
+							$rrule .= ';BYMONTHDAY=' . $bymonthday;
+							
+						}
+					}
+					break;
+				default:
+					break;
+			}
+			if($interval != ''){
+				$rrule .= ';INTERVAL=' . $interval;
+			}
+			if($end == 'count'){
+				$rrule .= ';COUNT=' . $byoccurrences;
+			}
+			if($end == 'date'){
+				list($bydate_day, $bydate_month, $bydate_year) = explode('-', $request['bydate']);
+				$rrule .= ';UNTIL=' . $bydate_year . $bydate_month . $bydate_day;
+			}
+			$vevent->setString('RRULE', $rrule);
+			$repeat = "true";
+		}else{
+			$repeat = "false";
+		}
 
-		$vevent = $vcalendar->VEVENT;
 
 		$vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Element_DateTime::UTC);
 		$vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Element_DateTime::UTC);
@@ -521,4 +813,4 @@ class OC_Calendar_Object{
 
 		return $vcalendar;
 	}
-}
+}
\ No newline at end of file
diff --git a/apps/calendar/templates/part.eventform.php b/apps/calendar/templates/part.eventform.php
index dfa5fb8c78a..1f2073f4bc7 100644
--- a/apps/calendar/templates/part.eventform.php
+++ b/apps/calendar/templates/part.eventform.php
@@ -2,92 +2,221 @@
 		<tr>
 			<th width="75px"><?php echo $l->t("Title");?>:</th>
 			<td>
-			<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Title of the Event");?>" value="<?php echo isset($_['title']) ? $_['title'] : '' ?>" maxlength="100" name="title"/>
+				<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Title of the Event");?>" value="<?php echo isset($_['title']) ? $_['title'] : '' ?>" maxlength="100" name="title"/>
 			</td>
 		</tr>
 	</table>
-	<table>
+	<table width="100%">
 		<tr>
 			<th width="75px"><?php echo $l->t("Category");?>:</th>
 			<td>
-			<select id="category" name="categories[]" multiple="multiple" title="<?php echo $l->t("Select category") ?>">
-				<?php
-				if (!isset($_['categories'])) {$_['categories'] = array();}
-				echo html_select_options($_['category_options'], $_['categories'], array('combine'=>true));
-				?>
-			</select></td>
+				<select id="category" name="categories[]" multiple="multiple" title="<?php echo $l->t("Select category") ?>">
+					<?php
+					if (!isset($_['categories'])) {$_['categories'] = array();}
+					echo html_select_options($_['category_options'], $_['categories'], array('combine'=>true));
+					?>
+				</select>
+			</td>
 			<th width="75px">&nbsp;&nbsp;&nbsp;<?php echo $l->t("Calendar");?>:</th>
 			<td>
-			<select style="width:140px;" name="calendar">
-				<?php
-				if (!isset($_['calendar'])) {$_['calendar'] = false;}
-				echo html_select_options($_['calendar_options'], $_['calendar'], array('value'=>'id', 'label'=>'displayname'));
-				?>
-			</select></td>
+				<select style="width:140px;" name="calendar">
+					<?php
+					if (!isset($_['calendar'])) {$_['calendar'] = false;}
+					echo html_select_options($_['calendar_options'], $_['calendar'], array('value'=>'id', 'label'=>'displayname'));
+					?>
+				</select>
+			</td>
 		</tr>
 	</table>
 	<hr>
-	<table>
+	<table width="100%">
 		<tr>
 			<th width="75px"></th>
 			<td>
-			<input onclick="Calendar.UI.lockTime();" type="checkbox"<?php if($_['allday']){echo 'checked="checked"';} ?> id="allday_checkbox" name="allday">
-			<label for="allday_checkbox"><?php echo $l->t("All Day Event");?></label></td>
+				<input onclick="Calendar.UI.lockTime();" type="checkbox"<?php if($_['allday']){echo 'checked="checked"';} ?> id="allday_checkbox" name="allday">
+				<label for="allday_checkbox"><?php echo $l->t("All Day Event");?></label>
+			</td>
 		</tr>
 		<tr>
-
 			<th width="75px"><?php echo $l->t("From");?>:</th>
 			<td>
-			<input type="text" value="<?php echo $_['startdate'];?>" name="from" id="from">
-			&nbsp;&nbsp;
-			<input type="time" value="<?php echo $_['starttime'];?>" name="fromtime" id="fromtime">
-			</td><!--use jquery-->
+				<input type="text" value="<?php echo $_['startdate'];?>" name="from" id="from">
+				&nbsp;&nbsp;
+				<input type="time" value="<?php echo $_['starttime'];?>" name="fromtime" id="fromtime">
+			</td>
 		</tr>
 		<tr>
 			<th width="75px"><?php echo $l->t("To");?>:</th>
 			<td>
-			<input type="text" value="<?php echo $_['enddate'];?>" name="to" id="to">
-			&nbsp;&nbsp;
-			<input type="time" value="<?php echo $_['endtime'];?>" name="totime" id="totime">
-			</td><!--use jquery-->
+				<input type="text" value="<?php echo $_['enddate'];?>" name="to" id="to">
+				&nbsp;&nbsp;
+				<input type="time" value="<?php echo $_['endtime'];?>" name="totime" id="totime">
+			</td>
 		</tr>
 	</table>
 	<input type="button" class="submit" value="<?php echo $l->t("Advanced options"); ?>" onclick="Calendar.UI.showadvancedoptions();" id="advanced_options_button">
 	<div id="advanced_options" style="display: none;">
-	<!--
-	<table>
-		<tr>
-			<th width="75px"><?php echo $l->t("Repeat");?>:</th>
-			<td>
-			<select name="repeat" style="width:350px;">
-				<?php
-				if (isset($_['repeat_options'])) {
+		<table style="width:100%">
+			<tr>
+				<th width="75px"><?php echo $l->t("Repeat");?>:</th>
+				<td>
+				<select id="repeat" name="repeat">
+					<?php
 					echo html_select_options($_['repeat_options'], $_['repeat']);
-				}
-				?>
-			</select></td>
-		</tr>-->
-	</table>
-	<hr>
-	<table><!--
-		<tr>
-			<th width="75px"><?php echo $l->t("Attendees");?>:</th>
-			<td style="height: 50px;"></td>
-		</tr>
-	</table>
-	<hr>-->
-	<table>
-		<tr>
-			<th width="85px"><?php echo $l->t("Location");?>:</th>
-			<td>
-			<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Location of the Event");?>" value="<?php echo isset($_['location']) ? $_['location'] : '' ?>" maxlength="100"  name="location" />
-			</td>
-		</tr>
-	</table>
-	<table>
-		<tr>
-			<th width="85px" style="vertical-align: top;"><?php echo $l->t("Description");?>:</th>
-			<td><textarea style="width:350px;height: 150px;" placeholder="<?php echo $l->t("Description of the Event");?>" name="description"><?php echo isset($_['description']) ? $_['description'] : '' ?></textarea></td>
-		</tr>
-	</table>
+					?>
+				</select></td>
+				<td><input type="button" style="float:right;" class="submit" value="<?php echo $l->t("Advanced"); ?>" onclick="Calendar.UI.showadvancedoptionsforrepeating();" id="advanced_options_button"></td>
+			</tr>
+		</table>
+		<div id="advanced_options_repeating" style="display:none;">
+			<table style="width:100%">
+				<tr id="advanced_month" style="display:none;">
+					<th width="75px"></th>
+					<td>
+						<select id="advanced_month_select" name="advanced_month_select">
+							<?php
+							echo html_select_options($_['repeat_month_options'], $_['repeat_month']);
+							?>
+						</select>
+					</td>
+				</tr>
+			</table>
+			<table style="width:100%">
+				<tr id="advanced_year" style="display:none;">
+					<th width="75px"></th>
+					<td>
+						<select id="advanced_year_select" name="advanced_year_select">
+							<?php
+							echo html_select_options($_['repeat_year_options'], $_['repeat_year']);
+							?>
+						</select>
+					</td>
+				</tr>
+			</table>
+			<table style="width:100%">
+				<tr id="advanced_weekofmonth" style="display:none;">
+					<th width="75px"></th>
+					<td id="weekofmonthcheckbox">
+						<select id="weekofmonthoptions" name="weekofmonthoptions">
+							<?php
+							echo html_select_options($_['repeat_weekofmonth_options'], $_['repeat_weekofmonth']);
+							?>
+						</select>
+					</td>
+				</tr>
+			</table>
+			<table style="width:100%">
+				<tr id="advanced_weekday" style="display:none;">
+					<th width="75px"></th>
+					<td id="weeklycheckbox">
+						<select id="weeklyoptions" name="weeklyoptions[]" multiple="multiple" title="<?php echo $l->t("Select weekdays") ?>">
+							<?php
+							if (!isset($_['weekdays'])) {$_['weekdays'] = array();}
+							echo html_select_options($_['repeat_weekly_options'], $_['repeat_weekdays'], array('combine'=>true));
+							?>
+						</select>
+					</td>
+				</tr>
+			</table>
+			<table style="width:100%">
+				<tr id="advanced_byyearday" style="display:none;">
+					<th width="75px"></th>
+					<td id="byyeardaycheckbox">
+						<select id="byyearday" name="byyearday[]" multiple="multiple" title="<?php echo $l->t("Select days") ?>">
+							<?php
+							if (!isset($_['repeat_byyearday'])) {$_['repeat_byyearday'] = array();}
+							echo html_select_options($_['repeat_byyearday_options'], $_['repeat_byyearday'], array('combine'=>true));
+							?>
+						</select><?php echo $l->t('and the events day of year.'); ?>
+					</td>
+				</tr>
+			</table>
+			<table style="width:100%">
+				<tr id="advanced_bymonthday" style="display:none;">
+					<th width="75px"></th>
+					<td id="bymonthdaycheckbox">
+						<select id="bymonthday" name="bymonthday[]" multiple="multiple" title="<?php echo $l->t("Select days") ?>">
+							<?php
+							if (!isset($_['repeat_bymonthday'])) {$_['repeat_bymonthday'] = array();}
+							echo html_select_options($_['repeat_bymonthday_options'], $_['repeat_bymonthday'], array('combine'=>true));
+							?>
+						</select><?php echo $l->t('and the events day of month.'); ?>
+					</td>
+				</tr>
+			</table>
+			<table style="width:100%">
+				<tr id="advanced_bymonth" style="display:none;">
+					<th width="75px"></th>
+					<td id="bymonthcheckbox">
+						<select id="bymonth" name="bymonth[]" multiple="multiple" title="<?php echo $l->t("Select months") ?>">
+							<?php
+							if (!isset($_['repeat_bymonth'])) {$_['repeat_bymonth'] = array();}
+							echo html_select_options($_['repeat_bymonth_options'], $_['repeat_bymonth'], array('combine'=>true));
+							?>
+						</select>
+					</td>
+				</tr>
+			</table>
+			<table style="width:100%">
+				<tr id="advanced_byweekno" style="display:none;">
+					<th width="75px"></th>
+					<td id="bymonthcheckbox">
+						<select id="byweekno" name="byweekno[]" multiple="multiple" title="<?php echo $l->t("Select weeks") ?>">
+							<?php
+							if (!isset($_['repeat_byweekno'])) {$_['repeat_byweekno'] = array();}
+							echo html_select_options($_['repeat_byweekno_options'], $_['repeat_byweekno'], array('combine'=>true));
+							?>
+						</select><?php echo $l->t('and the events week of year.'); ?>
+					</td>
+				</tr>
+			</table>
+			<table style="width:100%">
+				<tr>
+					<th width="75px"><?php echo $l->t('Interval'); ?>:</th>
+					<td>
+						<input style="width:350px;" type="number" min="1" size="4" max="1000" value="<?php echo isset($_['repeat_interval']) ? $_['repeat_interval'] : '1'; ?>" name="interval">
+					</td>
+				</tr>
+				<tr>
+					<th width="75px"><?php echo $l->t('End'); ?>:</th>
+					<td>
+						<select id="end" name="end">
+							<?php
+							echo html_select_options($_['repeat_end_options'], $_['repeat_end']); 
+							?>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<th></th>
+					<td id="byoccurrences" style="display:none;">
+						<input type="number" min="1" max="99999" id="until_count" name="byoccurrences" value="<?php echo $_['repeat_count']; ?>"><?php echo $l->t('occurrences'); ?>
+					</td>
+				</tr>
+				<tr>
+					<th></th>
+					<td id="bydate" style="display:none;">
+						<input type="text" name="bydate" value="<?php echo $_['repeat_date']; ?>">
+					</td>
+				</tr>
+			</table>
+		</div>
+		<hr>
+		<!-- support for attendees will be added in following versions --> 
+		<table>
+			<tr>
+				<th width="85px"><?php echo $l->t("Location");?>:</th>
+				<td>
+					<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Location of the Event");?>" value="<?php echo isset($_['location']) ? $_['location'] : '' ?>" maxlength="100"  name="location" />
+				</td>
+			</tr>
+		</table>
+		<table>
+			<tr>
+				<th width="85px" style="vertical-align: top;"><?php echo $l->t("Description");?>:</th>
+				<td>
+					<textarea style="width:350px;height: 150px;" placeholder="<?php echo $l->t("Description of the Event");?>" name="description"><?php echo isset($_['description']) ? $_['description'] : '' ?></textarea>
+				</td>
+			</tr>
+		</table>
 	</div>
-- 
GitLab


From ffa835c56f4575b3e6e40a1d2247f7b374fdc892 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Mon, 26 Dec 2011 19:59:15 +0100
Subject: [PATCH 082/546] fix the default setting for yearly repeating events

---
 apps/calendar/ajax/neweventform.php |  2 +-
 apps/calendar/js/calendar.js        | 10 ++++------
 apps/calendar/lib/object.php        | 14 ++++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/apps/calendar/ajax/neweventform.php b/apps/calendar/ajax/neweventform.php
index 1812407dd6e..88468dd3dbf 100644
--- a/apps/calendar/ajax/neweventform.php
+++ b/apps/calendar/ajax/neweventform.php
@@ -69,6 +69,6 @@ $tmpl->assign('repeat_end', 'never');
 $tmpl->assign('repeat_count', '10');
 $tmpl->assign('repeat_weekofmonth', 'auto');
 $tmpl->assign('repeat_date', '');
-$tmpl->assign('repeat_year', 'byyearday');
+$tmpl->assign('repeat_year', 'bydate');
 $tmpl->printpage();
 ?>
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 93dddf516f9..892dbd79e42 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -292,7 +292,6 @@ Calendar={
 				}
 				if($('#repeat option:selected').val() == 'yearly'){
 					$('#advanced_year').css('display', 'block');
-					$('#advanced_byyearday').css('display', 'block');
 				}
 				if($('#repeat option:selected').val() == 'doesnotrepeat'){
 					$('#advanced_options_repeating').slideUp('slow');
@@ -312,14 +311,13 @@ Calendar={
 				$('#advanced_bymonth').css('display', 'none');
 				$('#advanced_byweekno').css('display', 'none');
 				$('#advanced_bymonthday').css('display', 'none');
-				if($('#advanced_year option:selected').val() == 'byyearday'){
-					$('#advanced_byyearday').css('display', 'block');
+				if($('#advanced_year_select option:selected').val() == 'byyearday'){
+					//$('#advanced_byyearday').css('display', 'block');
 				}
-				if($('#advanced_year option:selected').val() == 'byweekno'){
+				if($('#advanced_year_select option:selected').val() == 'byweekno'){
 					$('#advanced_byweekno').css('display', 'block');
-					
 				}
-				if($('#advanced_year option:selected').val() == 'bydaymonth'){
+				if($('#advanced_year_select option:selected').val() == 'bydaymonth'){
 					$('#advanced_bymonth').css('display', 'block');
 					$('#advanced_bymonthday').css('display', 'block');
 					$('#advanced_weekday').css('display', 'block');
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index c5ae760d00f..b53feb0bf0e 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -438,6 +438,7 @@ class OC_Calendar_Object{
 
 	public static function getYearOptions($l10n){
 		return array(
+			'bydate' => $l10n->t('by events date'),
 			'byyearday' => $l10n->t('by yearday(s)'),
 			'byweekno'  => $l10n->t('by weeknumber(s)'),
 			'bydaymonth'  => $l10n->t('by day and month')
@@ -700,12 +701,13 @@ class OC_Calendar_Object{
 					break;
 				case 'yearly':
 					$rrule .= 'FREQ=YEARLY';
-					if($request['advanced_year_select'] == 'byyearday'){
-						$byyearday = '';
-						foreach($request['byyearday'] as $yearday){
-							if($byyearday == ''){
-								$byyearday = $yearday;
-							}else{
+					if($request['advanced_year_select'] == 'bydate'){
+						
+					}elseif($request['advanced_year_select'] == 'byyearday'){
+						list($_day, $_month, $_year) = explode('-', $from);
+						$byyearday = date('z', mktime(0,0,0, $_month, $_day, $_year)) + 1;
+						if(array_key_exists('byyearday', $request)){
+							foreach($request['byyearday'] as $yearday){
 								$byyearday .= ',' . $yearday;
 							}
 						}
-- 
GitLab


From f7674d06d3819fadb0c019adec8219b1fdd9001c Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Tue, 27 Dec 2011 12:36:51 +0100
Subject: [PATCH 083/546] pdf viewer from Google Code-In program

---
 apps/files_pdfviewer/appinfo/app.php          |     9 +
 apps/files_pdfviewer/appinfo/info.xml         |    10 +
 apps/files_pdfviewer/css/history.png          |   Bin 0 -> 539 bytes
 apps/files_pdfviewer/css/style.css            |    27 +
 apps/files_pdfviewer/css/viewer.css           |   285 +
 apps/files_pdfviewer/js/pdfjs/LICENSE         |    30 +
 apps/files_pdfviewer/js/pdfjs/build/pdf.js    | 27022 ++++++++++++++++
 apps/files_pdfviewer/js/pdfjs/src/canvas.js   |   869 +
 apps/files_pdfviewer/js/pdfjs/src/charsets.js |   105 +
 apps/files_pdfviewer/js/pdfjs/src/cidmaps.js  |  6933 ++++
 .../js/pdfjs/src/colorspace.js                |   411 +
 apps/files_pdfviewer/js/pdfjs/src/core.js     |   652 +
 apps/files_pdfviewer/js/pdfjs/src/crypto.js   |   597 +
 .../files_pdfviewer/js/pdfjs/src/evaluator.js |   857 +
 apps/files_pdfviewer/js/pdfjs/src/fonts.js    |  3568 ++
 apps/files_pdfviewer/js/pdfjs/src/function.js |   351 +
 .../files_pdfviewer/js/pdfjs/src/glyphlist.js |  4292 +++
 apps/files_pdfviewer/js/pdfjs/src/image.js    |   257 +
 apps/files_pdfviewer/js/pdfjs/src/metrics.js  |  2944 ++
 apps/files_pdfviewer/js/pdfjs/src/obj.js      |   742 +
 apps/files_pdfviewer/js/pdfjs/src/parser.js   |   636 +
 apps/files_pdfviewer/js/pdfjs/src/pattern.js  |   291 +
 apps/files_pdfviewer/js/pdfjs/src/pdf.js      |    15 +
 apps/files_pdfviewer/js/pdfjs/src/stream.js   |  2113 ++
 apps/files_pdfviewer/js/pdfjs/src/util.js     |   286 +
 .../js/pdfjs/src/utils/cffStandardStrings.js  |   298 +
 .../js/pdfjs/src/utils/fonts_utils.js         |   408 +
 apps/files_pdfviewer/js/pdfjs/src/worker.js   |   193 +
 .../js/pdfjs/src/worker_loader.js             |    53 +
 .../js/pdfjs/web/images/bookmark.svg          |   661 +
 .../js/pdfjs/web/images/document-print.svg    |   532 +
 .../js/pdfjs/web/images/download.svg          |   619 +
 .../js/pdfjs/web/images/go-down.svg           |   200 +
 .../js/pdfjs/web/images/go-up.svg             |   196 +
 .../js/pdfjs/web/images/nav-outline.svg       |   202 +
 .../js/pdfjs/web/images/nav-thumbs.svg        |   283 +
 .../js/pdfjs/web/images/zoom-in.svg           |   436 +
 .../js/pdfjs/web/images/zoom-out.svg          |   424 +
 apps/files_pdfviewer/js/pdfview.js            |   738 +
 apps/files_pdfviewer/js/viewer.js             |    55 +
 40 files changed, 58600 insertions(+)
 create mode 100755 apps/files_pdfviewer/appinfo/app.php
 create mode 100755 apps/files_pdfviewer/appinfo/info.xml
 create mode 100755 apps/files_pdfviewer/css/history.png
 create mode 100755 apps/files_pdfviewer/css/style.css
 create mode 100755 apps/files_pdfviewer/css/viewer.css
 create mode 100755 apps/files_pdfviewer/js/pdfjs/LICENSE
 create mode 100755 apps/files_pdfviewer/js/pdfjs/build/pdf.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/canvas.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/charsets.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/cidmaps.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/colorspace.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/core.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/crypto.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/evaluator.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/fonts.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/function.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/glyphlist.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/image.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/metrics.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/obj.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/parser.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/pattern.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/pdf.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/stream.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/util.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/utils/cffStandardStrings.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/utils/fonts_utils.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/worker.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/src/worker_loader.js
 create mode 100755 apps/files_pdfviewer/js/pdfjs/web/images/bookmark.svg
 create mode 100755 apps/files_pdfviewer/js/pdfjs/web/images/document-print.svg
 create mode 100755 apps/files_pdfviewer/js/pdfjs/web/images/download.svg
 create mode 100755 apps/files_pdfviewer/js/pdfjs/web/images/go-down.svg
 create mode 100755 apps/files_pdfviewer/js/pdfjs/web/images/go-up.svg
 create mode 100755 apps/files_pdfviewer/js/pdfjs/web/images/nav-outline.svg
 create mode 100755 apps/files_pdfviewer/js/pdfjs/web/images/nav-thumbs.svg
 create mode 100755 apps/files_pdfviewer/js/pdfjs/web/images/zoom-in.svg
 create mode 100755 apps/files_pdfviewer/js/pdfjs/web/images/zoom-out.svg
 create mode 100755 apps/files_pdfviewer/js/pdfview.js
 create mode 100755 apps/files_pdfviewer/js/viewer.js

diff --git a/apps/files_pdfviewer/appinfo/app.php b/apps/files_pdfviewer/appinfo/app.php
new file mode 100755
index 00000000000..a446b4caa41
--- /dev/null
+++ b/apps/files_pdfviewer/appinfo/app.php
@@ -0,0 +1,9 @@
+<?php
+//load the required files
+//OC_Util::addStyle( 'files_texteditor', 'style' );
+//OC_Util::addScript( 'files_texteditor', 'editor');
+OC_Util::addScript( 'files_pdfviewer', 'viewer');
+OC_Util::addStyle( 'files_pdfviewer', 'viewer');
+OC_Util::addScript( 'files_pdfviewer', 'pdfjs/build/pdf');
+OC_Util::addScript( 'files_pdfviewer', 'pdfview');
+?>
diff --git a/apps/files_pdfviewer/appinfo/info.xml b/apps/files_pdfviewer/appinfo/info.xml
new file mode 100755
index 00000000000..86a6c3f22f7
--- /dev/null
+++ b/apps/files_pdfviewer/appinfo/info.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?> 
+<info>
+	<id>files_pdfviewer</id>
+	<name>PDF viewer (pdfjs-based)</name>
+	<version>0.1</version>
+	<licence>GPL</licence>
+	<author>Joan Creus</author>
+	<require>2</require>
+	<default_enable/>
+</info>
diff --git a/apps/files_pdfviewer/css/history.png b/apps/files_pdfviewer/css/history.png
new file mode 100755
index 0000000000000000000000000000000000000000..afa0e4ab70fc83fcd35be727f6f64788beb3417d
GIT binary patch
literal 539
zcmV+$0_6RPP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x00(qQO+^RV1`iAv1SCGyI{*Lyy-7qtR5*>Ll1*>oFc5~H8Hdj%L8z6s
z2ysEx{(#<l?C*!mUP0m#Do{b?Gmx?OuuYaO^t2;c9$TKr?>jd9XGochMx$SG9N&wG
zm|5`N6GEVzLkO4|X2xo@`gnbP{Rt42fM&CK@0|M)MSr$L1QDt7%LpM<bycFO)p&n@
zC(rY%LV$k1|7BeP%nT7hRcW`|)a!KsilV?dhjXsF=n`B3N}nRa>2%_7H~=snkJ)TC
zJUu<p@Av6;yI&OOC7@K$YPCqyluoC^%gYN%l8|K?jYi{p1prYLAtEdm3wFC5-EOy1
zl;=6?^_pI<ce@9rf^tl!Q#P9oMNtq%5owz8`1pvb;=RAN;JxQ`Isx$T@IV~L%;$5m
zEW^wwih|K-#PN9iUV(EC5h02qo}ZstE|-<H$z+0aj@fK>TR{kcTCE1a;c#HT-xJ3%
zNs@4PcgJ8bz|3&YVP<lrz|1OYtJR`juUD_4stkuihQlGt<&yLH9Bx`Dqup+!syOE=
zfcKs>O;J_0+wFA^-rnB!MNxdHsxvbUAt)f9;Z@bEsuvNzTCH|v-Subx3r>K>XP=J1
d4#@vK_!}QH$$pNdlPmxL002ovPDHLkV1i+g_a*=U

literal 0
HcmV?d00001

diff --git a/apps/files_pdfviewer/css/style.css b/apps/files_pdfviewer/css/style.css
new file mode 100755
index 00000000000..9ad6eeaa814
--- /dev/null
+++ b/apps/files_pdfviewer/css/style.css
@@ -0,0 +1,27 @@
+#editor{
+	position: absoloute;
+	display: block;
+	top: 80px;
+	left: 160px;
+}
+#editorwrapper{
+	position: absoloute;
+	height: 0;
+	width: 0;
+	top: 41px;
+	left: 160px;
+	display: none;
+}
+#editor_close{
+	margin-left: auto;
+	margin-right: 167px;	
+	display: block;
+}
+#editor_save{
+	margin-left: 7px;
+	float: left;	
+}
+#saving_icon{
+	margin-top: 3px;
+	float: left;	
+}
\ No newline at end of file
diff --git a/apps/files_pdfviewer/css/viewer.css b/apps/files_pdfviewer/css/viewer.css
new file mode 100755
index 00000000000..a4aad0addc1
--- /dev/null
+++ b/apps/files_pdfviewer/css/viewer.css
@@ -0,0 +1,285 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- /
+/* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */
+
+#viewer {
+  background-color: #929292;
+  font-family: 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial, Verdana, sans-serif;
+  /*margin: 0px;*/
+  padding: 0px;
+  /*position:absolute;*/
+}
+
+[hidden] {
+  display: none;
+}
+
+/* === Toolbar === */
+#controls2 {
+  padding-top:2.8em;
+  width: 100%;
+  white-space:nowrap;
+  overflow: hidden;
+}
+
+.separator {
+  display: inline;
+  border-left: 1px solid #d3d3d3;
+  border-right: 1px solid #fff;
+  height: 10px;
+  width:0px;
+  margin: 4px;
+}
+
+#controls2 > a > img {
+    margin: 4px;
+    height: 10px;
+}
+
+#controls2 > button {
+  line-height: 10px;
+}
+
+#controls2 > button > img {
+  width: 10px;
+  height: 10px;
+}
+
+#controls2 > button[disabled] > img {
+  opacity: 0.5;
+}
+
+#pageNumber {
+  text-align: right;
+}
+
+span#info {
+  display: none;
+}
+
+@-moz-document regexp("http:.*debug=1.*") {
+  span#info {
+    display: inline-block;
+  }
+}
+
+/* === Sidebar === */
+#sidebar {
+  position: fixed;
+  width: 350px;
+  top: 62px;
+  bottom: 18px;
+  left: -290px;
+  transition: left 0.25s ease-in-out 1s;
+  -moz-transition: left 0.25s ease-in-out 1s;
+  -webkit-transition: left 0.25s ease-in-out 1s;
+  z-index: 1;
+}
+
+#sidebar:hover {
+  left: 0px;
+  transition: left 0.25s ease-in-out 0s;
+  -moz-transition: left 0.25s ease-in-out 0s;
+  -webkit-transition: left 0.25s ease-in-out 0s;
+}
+
+#sidebarBox {
+  background-color: rgba(0, 0, 0, 0.7);
+  width: 300px;
+  height: 100%;
+  border-top-right-radius: 8px;
+  border-bottom-right-radius: 8px;
+  -moz-border-radius-topright: 8px;
+  -moz-border-radius-bottomright: 8px;
+  -webkit-border-top-right-radius: 8px;
+  -webkit-border-bottom-right-radius: 8px;
+  box-shadow: 0px 2px 8px #000;
+  -moz-box-shadow: 0px 2px 8px #000;
+  -webkit-box-shadow: 0px 2px 8px #000;
+}
+
+#sidebarScrollView {
+  position: absolute;
+  overflow: hidden;
+  overflow-y: auto;
+  top: 10px;
+  bottom: 10px;
+  left: 10px;
+  width: 280px;
+}
+
+.thumbnail {
+  width: 134px;
+  height: 134px;
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left:auto;
+  margin-right:auto;
+  line-height: 134px;
+  text-align: center;
+  overflow: hidden;
+}
+
+.thumbnail:not([data-loaded]) {
+  background-color: gray;
+}
+
+.thumbnail > canvas {
+  vertical-align: middle;
+  display: inline-block;
+}
+
+#outlineScrollView {
+  position: absolute;
+  background-color: #fff;
+  overflow: auto;
+  top: 10px;
+  bottom: 10px;
+  left: 10px;
+  width: 280px;
+}
+
+#outlineView {
+  padding-top: 4px;
+  padding-bottom: 100px;
+  padding-left: 6px;
+  padding-right: 6px;
+  font-size: smaller;
+}
+
+.outlineItem > .outlineItems {
+  margin-left: 20px;
+}
+
+.outlineItem > a {
+  text-decoration: none;
+  color: black;
+}
+
+.outlineItem > a:hover {
+  background: #ff0;
+  box-shadow: 0px 2px 10px #ff0;
+}
+
+#sidebarControls {
+  position:absolute;
+  width: 120px;
+  height: 32px;
+  left: 15px;
+  bottom: 35px;
+}
+
+#sidebarControls > button {
+  box-shadow: 0px 4px 10px #000;
+  -moz-box-shadow: 0px 4px 10px #000;
+  -webkit-box-shadow: 0px 4px 10px #000;
+}
+
+#sidebarControls > button > img {
+  width: 32px;
+  height: 32px;
+}
+
+#sidebarControls > button[disabled] > img {
+  opacity: 0.5;
+}
+
+#sidebarControls > button[data-selected] {
+  box-shadow: 0px 4px 10px #ff0;
+  -moz-box-shadow: 0px 4px 10px #ff0;
+  -webkit-box-shadow: 0px 4px 10px #ff0;
+}
+
+/* === Content view === */
+canvas {
+  margin: auto;
+  display: block;
+}
+
+.page {
+  width: 816px;
+  height: 1056px;
+  margin: 10px auto;
+  position: relative;
+  overflow: hidden;
+  box-shadow: 0px 4px 10px #000;
+  -moz-box-shadow: 0px 4px 10px #000;
+  -webkit-box-shadow: 0px 4px 10px #000;
+  background-color: white;
+}
+
+.page > a {
+  display: block;
+  position: absolute;
+}
+
+.page > a:hover {
+  opacity: 0.2;
+  background: #ff0;
+  box-shadow: 0px 2px 10px #ff0;
+  -moz-box-shadow: 0px 2px 10px #ff0;
+  -webkit-box-shadow: 0px 2px 10px #ff0;
+}
+
+#viewer {
+  /*overflow:auto;*/
+  margin: 44px 0px 0px 0px;
+  margin-right:12.5em;
+  padding: 8px 0px;
+  position:static;
+  height:100%;
+  width:100%;
+  text-align:center;
+}
+
+#sidebarView canvas:hover {
+  background: #ff0;
+  box-shadow: 0px 2px 10px #ff0;
+  -moz-box-shadow: 0px 2px 10px #ff0;
+  -webkit-box-shadow: 0px 2px 10px #ff0;
+}
+
+#pageWidthOption {
+  border-top: 1px solid black;
+}
+
+#customScaleOption {
+  display: none;
+}
+
+/* === Printed media overrides === */
+@media print {
+  #sidebar {
+    display: none;
+  }
+
+  #controls2 {
+    display: none;
+  }
+
+  #viewer {
+    margin: 0;
+    padding: 0;
+  }
+
+  .page {
+    display: none;
+    margin: 0;
+  }
+
+  .page canvas {
+    box-shadow: none;
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+  }
+
+  .page[data-loaded] {
+    display: block;
+    page-break-after: always;
+  }
+}
+
+#loading {
+	margin: 100px 0;
+	text-align: center;
+}
+
diff --git a/apps/files_pdfviewer/js/pdfjs/LICENSE b/apps/files_pdfviewer/js/pdfjs/LICENSE
new file mode 100755
index 00000000000..f8a84820570
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/LICENSE
@@ -0,0 +1,30 @@
+
+    Copyright (c) 2011 Mozilla Foundation
+
+    Contributors: Andreas Gal <gal@mozilla.com>
+                  Chris G Jones <cjones@mozilla.com>
+                  Shaon Barman <shaon.barman@gmail.com>
+                  Vivien Nicolas <21@vingtetun.org>
+                  Justin D'Arcangelo <justindarc@gmail.com>
+                  Yury Delendik
+                  Kalervo Kujala
+                  Adil Allawi <@ironymark>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+
diff --git a/apps/files_pdfviewer/js/pdfjs/build/pdf.js b/apps/files_pdfviewer/js/pdfjs/build/pdf.js
new file mode 100755
index 00000000000..3447358d3bb
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/build/pdf.js
@@ -0,0 +1,27022 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+var PDFJS = {};
+
+(function pdfjsWrapper() {
+  // Use strict in our context only - users might not want it
+  'use strict';
+
+  PDFJS.build = 'PDFJSSCRIPT_BUNDLE_VER';
+
+  // Files are inserted below - see Makefile
+  /* PDFJSSCRIPT_INCLUDE_ALL */
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var globalScope = (typeof window === 'undefined') ? this : window;
+
+var ERRORS = 0, WARNINGS = 1, TODOS = 5;
+var verbosity = WARNINGS;
+
+// The global PDFJS object exposes the API
+// In production, it will be declared outside a global wrapper
+// In development, it will be declared here
+if (!globalScope.PDFJS) {
+  globalScope.PDFJS = {};
+}
+
+// getPdf()
+// Convenience function to perform binary Ajax GET
+// Usage: getPdf('http://...', callback)
+//        getPdf({
+//                 url:String ,
+//                 [,progress:Function, error:Function]
+//               },
+//               callback)
+function getPdf(arg, callback) {
+  var params = arg;
+  if (typeof arg === 'string')
+    params = { url: arg };
+
+  var xhr = new XMLHttpRequest();
+  xhr.open('GET', params.url);
+  xhr.mozResponseType = xhr.responseType = 'arraybuffer';
+  xhr.expected = (document.URL.indexOf('file:') === 0) ? 0 : 200;
+
+  if ('progress' in params)
+    xhr.onprogress = params.progress || undefined;
+
+  if ('error' in params)
+    xhr.onerror = params.error || undefined;
+
+  xhr.onreadystatechange = function getPdfOnreadystatechange() {
+    if (xhr.readyState === 4 && xhr.status === xhr.expected) {
+      var data = (xhr.mozResponseArrayBuffer || xhr.mozResponse ||
+                  xhr.responseArrayBuffer || xhr.response);
+      callback(data);
+    }
+  };
+  xhr.send(null);
+}
+globalScope.PDFJS.getPdf = getPdf;
+
+var Page = (function pagePage() {
+  function constructor(xref, pageNumber, pageDict, ref) {
+    this.pageNumber = pageNumber;
+    this.pageDict = pageDict;
+    this.stats = {
+      create: Date.now(),
+      compile: 0.0,
+      fonts: 0.0,
+      images: 0.0,
+      render: 0.0
+    };
+    this.xref = xref;
+    this.ref = ref;
+  }
+
+  constructor.prototype = {
+    getPageProp: function pageGetPageProp(key) {
+      return this.xref.fetchIfRef(this.pageDict.get(key));
+    },
+    inheritPageProp: function pageInheritPageProp(key) {
+      var dict = this.pageDict;
+      var obj = dict.get(key);
+      while (obj === undefined) {
+        dict = this.xref.fetchIfRef(dict.get('Parent'));
+        if (!dict)
+          break;
+        obj = dict.get(key);
+      }
+      return obj;
+    },
+    get content() {
+      return shadow(this, 'content', this.getPageProp('Contents'));
+    },
+    get resources() {
+      return shadow(this, 'resources', this.inheritPageProp('Resources'));
+    },
+    get mediaBox() {
+      var obj = this.inheritPageProp('MediaBox');
+      // Reset invalid media box to letter size.
+      if (!isArray(obj) || obj.length !== 4)
+        obj = [0, 0, 612, 792];
+      return shadow(this, 'mediaBox', obj);
+    },
+    get view() {
+      var obj = this.inheritPageProp('CropBox');
+      var view = {
+        x: 0,
+        y: 0,
+        width: this.width,
+        height: this.height
+      };
+      if (isArray(obj) && obj.length == 4) {
+        var tl = this.rotatePoint(obj[0], obj[1]);
+        var br = this.rotatePoint(obj[2], obj[3]);
+        view.x = Math.min(tl.x, br.x);
+        view.y = Math.min(tl.y, br.y);
+        view.width = Math.abs(tl.x - br.x);
+        view.height = Math.abs(tl.y - br.y);
+      }
+
+      return shadow(this, 'cropBox', view);
+    },
+    get annotations() {
+      return shadow(this, 'annotations', this.inheritPageProp('Annots'));
+    },
+    get width() {
+      var mediaBox = this.mediaBox;
+      var rotate = this.rotate;
+      var width;
+      if (rotate == 0 || rotate == 180) {
+        width = (mediaBox[2] - mediaBox[0]);
+      } else {
+        width = (mediaBox[3] - mediaBox[1]);
+      }
+      return shadow(this, 'width', width);
+    },
+    get height() {
+      var mediaBox = this.mediaBox;
+      var rotate = this.rotate;
+      var height;
+      if (rotate == 0 || rotate == 180) {
+        height = (mediaBox[3] - mediaBox[1]);
+      } else {
+        height = (mediaBox[2] - mediaBox[0]);
+      }
+      return shadow(this, 'height', height);
+    },
+    get rotate() {
+      var rotate = this.inheritPageProp('Rotate') || 0;
+      // Normalize rotation so it's a multiple of 90 and between 0 and 270
+      if (rotate % 90 != 0) {
+        rotate = 0;
+      } else if (rotate >= 360) {
+        rotate = rotate % 360;
+      } else if (rotate < 0) {
+        // The spec doesn't cover negatives, assume its counterclockwise
+        // rotation. The following is the other implementation of modulo.
+        rotate = ((rotate % 360) + 360) % 360;
+      }
+      return shadow(this, 'rotate', rotate);
+    },
+
+    startRenderingFromIRQueue: function pageStartRenderingFromIRQueue(
+                                                IRQueue, fonts) {
+      var self = this;
+      this.IRQueue = IRQueue;
+      var gfx = new CanvasGraphics(this.ctx, this.objs);
+
+      var displayContinuation = function pageDisplayContinuation() {
+        // Always defer call to display() to work around bug in
+        // Firefox error reporting from XHR callbacks.
+        setTimeout(function pageSetTimeout() {
+          try {
+            self.display(gfx, self.callback);
+          } catch (e) {
+            if (self.callback) self.callback(e.toString());
+            throw e;
+          }
+        });
+      };
+
+      this.ensureFonts(fonts,
+                       function pageStartRenderingFromIRQueueEnsureFonts() {
+        displayContinuation();
+      });
+    },
+
+    getIRQueue: function pageGetIRQueue(handler, dependency) {
+      if (this.IRQueue) {
+        // content was compiled
+        return this.IRQueue;
+      }
+
+      var xref = this.xref;
+      var content = xref.fetchIfRef(this.content);
+      var resources = xref.fetchIfRef(this.resources);
+      if (isArray(content)) {
+        // fetching items
+        var i, n = content.length;
+        for (i = 0; i < n; ++i)
+          content[i] = xref.fetchIfRef(content[i]);
+        content = new StreamsSequenceStream(content);
+      }
+
+      var pe = this.pe = new PartialEvaluator(
+                                xref, handler, 'p' + this.pageNumber + '_');
+      var IRQueue = {};
+      return (this.IRQueue = pe.getIRQueue(content, resources, IRQueue,
+                                           dependency));
+    },
+
+    ensureFonts: function pageEnsureFonts(fonts, callback) {
+      // Convert the font names to the corresponding font obj.
+      for (var i = 0, ii = fonts.length; i < ii; i++) {
+        fonts[i] = this.objs.objs[fonts[i]].data;
+      }
+
+      // Load all the fonts
+      var fontObjs = FontLoader.bind(
+        fonts,
+        function pageEnsureFontsFontObjs(fontObjs) {
+          this.stats.fonts = Date.now();
+
+          callback.call(this);
+        }.bind(this),
+        this.objs
+      );
+    },
+
+    display: function pageDisplay(gfx, callback) {
+      var xref = this.xref;
+      var resources = xref.fetchIfRef(this.resources);
+      var mediaBox = xref.fetchIfRef(this.mediaBox);
+      assertWellFormed(isDict(resources), 'invalid page resources');
+
+      gfx.xref = xref;
+      gfx.res = resources;
+      gfx.beginDrawing({ x: mediaBox[0], y: mediaBox[1],
+            width: this.width,
+            height: this.height,
+            rotate: this.rotate });
+
+      var startIdx = 0;
+      var length = this.IRQueue.fnArray.length;
+      var IRQueue = this.IRQueue;
+
+      var self = this;
+      function next() {
+        startIdx = gfx.executeIRQueue(IRQueue, startIdx, next);
+        if (startIdx == length) {
+          self.stats.render = Date.now();
+          if (callback) callback();
+        }
+      }
+      next();
+    },
+    rotatePoint: function pageRotatePoint(x, y, reverse) {
+      var rotate = reverse ? (360 - this.rotate) : this.rotate;
+      switch (rotate) {
+        case 180:
+          return {x: this.width - x, y: y};
+        case 90:
+          return {x: this.width - y, y: this.height - x};
+        case 270:
+          return {x: y, y: x};
+        case 360:
+        case 0:
+        default:
+          return {x: x, y: this.height - y};
+      }
+    },
+    getLinks: function pageGetLinks() {
+      var xref = this.xref;
+      var annotations = xref.fetchIfRef(this.annotations) || [];
+      var i, n = annotations.length;
+      var links = [];
+      for (i = 0; i < n; ++i) {
+        var annotation = xref.fetch(annotations[i]);
+        if (!isDict(annotation))
+          continue;
+        var subtype = annotation.get('Subtype');
+        if (!isName(subtype) || subtype.name != 'Link')
+          continue;
+        var rect = annotation.get('Rect');
+        var topLeftCorner = this.rotatePoint(rect[0], rect[1]);
+        var bottomRightCorner = this.rotatePoint(rect[2], rect[3]);
+
+        var link = {};
+        link.x = Math.min(topLeftCorner.x, bottomRightCorner.x);
+        link.y = Math.min(topLeftCorner.y, bottomRightCorner.y);
+        link.width = Math.abs(topLeftCorner.x - bottomRightCorner.x);
+        link.height = Math.abs(topLeftCorner.y - bottomRightCorner.y);
+        var a = this.xref.fetchIfRef(annotation.get('A'));
+        if (a) {
+          switch (a.get('S').name) {
+            case 'URI':
+              link.url = a.get('URI');
+              break;
+            case 'GoTo':
+              link.dest = a.get('D');
+              break;
+            default:
+              TODO('other link types');
+          }
+        } else if (annotation.has('Dest')) {
+          // simple destination link
+          var dest = annotation.get('Dest');
+          link.dest = isName(dest) ? dest.name : dest;
+        }
+        links.push(link);
+      }
+      return links;
+    },
+    startRendering: function pageStartRendering(ctx, callback)  {
+      this.ctx = ctx;
+      this.callback = callback;
+
+      this.startRenderingTime = Date.now();
+      this.pdf.startRendering(this);
+    }
+  };
+
+  return constructor;
+})();
+
+/**
+ * The `PDFDocModel` holds all the data of the PDF file. Compared to the
+ * `PDFDoc`, this one doesn't have any job management code.
+ * Right now there exists one PDFDocModel on the main thread + one object
+ * for each worker. If there is no worker support enabled, there are two
+ * `PDFDocModel` objects on the main thread created.
+ * TODO: Refactor the internal object structure, such that there is no
+ * need for the `PDFDocModel` anymore and there is only one object on the
+ * main thread and not one entire copy on each worker instance.
+ */
+var PDFDocModel = (function pdfDoc() {
+  function constructor(arg, callback) {
+    if (isStream(arg))
+      init.call(this, arg);
+    else if (isArrayBuffer(arg))
+      init.call(this, new Stream(arg));
+    else
+      error('PDFDocModel: Unknown argument type');
+  }
+
+  function init(stream) {
+    assertWellFormed(stream.length > 0, 'stream must have data');
+    this.stream = stream;
+    this.setup();
+  }
+
+  function find(stream, needle, limit, backwards) {
+    var pos = stream.pos;
+    var end = stream.end;
+    var str = '';
+    if (pos + limit > end)
+      limit = end - pos;
+    for (var n = 0; n < limit; ++n)
+      str += stream.getChar();
+    stream.pos = pos;
+    var index = backwards ? str.lastIndexOf(needle) : str.indexOf(needle);
+    if (index == -1)
+      return false; /* not found */
+    stream.pos += index;
+    return true; /* found */
+  }
+
+  constructor.prototype = {
+    get linearization() {
+      var length = this.stream.length;
+      var linearization = false;
+      if (length) {
+        linearization = new Linearization(this.stream);
+        if (linearization.length != length)
+          linearization = false;
+      }
+      // shadow the prototype getter with a data property
+      return shadow(this, 'linearization', linearization);
+    },
+    get startXRef() {
+      var stream = this.stream;
+      var startXRef = 0;
+      var linearization = this.linearization;
+      if (linearization) {
+        // Find end of first obj.
+        stream.reset();
+        if (find(stream, 'endobj', 1024))
+          startXRef = stream.pos + 6;
+      } else {
+        // Find startxref at the end of the file.
+        var start = stream.end - 1024;
+        if (start < 0)
+          start = 0;
+        stream.pos = start;
+        if (find(stream, 'startxref', 1024, true)) {
+          stream.skip(9);
+          var ch;
+          do {
+            ch = stream.getChar();
+          } while (Lexer.isSpace(ch));
+          var str = '';
+          while ((ch - '0') <= 9) {
+            str += ch;
+            ch = stream.getChar();
+          }
+          startXRef = parseInt(str, 10);
+          if (isNaN(startXRef))
+            startXRef = 0;
+        }
+      }
+      // shadow the prototype getter with a data property
+      return shadow(this, 'startXRef', startXRef);
+    },
+    get mainXRefEntriesOffset() {
+      var mainXRefEntriesOffset = 0;
+      var linearization = this.linearization;
+      if (linearization)
+        mainXRefEntriesOffset = linearization.mainXRefEntriesOffset;
+      // shadow the prototype getter with a data property
+      return shadow(this, 'mainXRefEntriesOffset', mainXRefEntriesOffset);
+    },
+    // Find the header, remove leading garbage and setup the stream
+    // starting from the header.
+    checkHeader: function pdfDocCheckHeader() {
+      var stream = this.stream;
+      stream.reset();
+      if (find(stream, '%PDF-', 1024)) {
+        // Found the header, trim off any garbage before it.
+        stream.moveStart();
+        return;
+      }
+      // May not be a PDF file, continue anyway.
+    },
+    setup: function pdfDocSetup(ownerPassword, userPassword) {
+      this.checkHeader();
+      this.xref = new XRef(this.stream,
+                           this.startXRef,
+                           this.mainXRefEntriesOffset);
+      this.catalog = new Catalog(this.xref);
+    },
+    get numPages() {
+      var linearization = this.linearization;
+      var num = linearization ? linearization.numPages : this.catalog.numPages;
+      // shadow the prototype getter
+      return shadow(this, 'numPages', num);
+    },
+    getPage: function pdfDocGetPage(n) {
+      return this.catalog.getPage(n);
+    }
+  };
+
+  return constructor;
+})();
+
+var PDFDoc = (function pdfDoc() {
+  function constructor(arg, callback) {
+    var stream = null;
+    var data = null;
+
+    if (isStream(arg)) {
+      stream = arg;
+      data = arg.bytes;
+    } else if (isArrayBuffer(arg)) {
+      stream = new Stream(arg);
+      data = arg;
+    } else {
+      error('PDFDoc: Unknown argument type');
+    }
+
+    this.data = data;
+    this.stream = stream;
+    this.pdf = new PDFDocModel(stream);
+
+    this.catalog = this.pdf.catalog;
+    this.objs = new PDFObjects();
+
+    this.pageCache = [];
+    this.fontsLoading = {};
+    this.workerReadyPromise = new Promise('workerReady');
+
+    // If worker support isn't disabled explicit and the browser has worker
+    // support, create a new web worker and test if it/the browser fullfills
+    // all requirements to run parts of pdf.js in a web worker.
+    // Right now, the requirement is, that an Uint8Array is still an Uint8Array
+    // as it arrives on the worker. Chrome added this with version 15.
+    if (!globalScope.PDFJS.disableWorker && typeof Worker !== 'undefined') {
+      var workerSrc = PDFJS.workerSrc;
+      if (typeof workerSrc === 'undefined') {
+        throw 'No PDFJS.workerSrc specified';
+      }
+
+      var worker;
+      try {
+        worker = new Worker(workerSrc);
+      } catch (e) {
+        // Some versions of FF can't create a worker on localhost, see:
+        // https://bugzilla.mozilla.org/show_bug.cgi?id=683280
+        globalScope.PDFJS.disableWorker = true;
+        this.setupFakeWorker();
+        return;
+      }
+
+      var messageHandler = new MessageHandler('main', worker);
+
+      // Tell the worker the file it was created from.
+      messageHandler.send('workerSrc', workerSrc);
+
+      messageHandler.on('test', function pdfDocTest(supportTypedArray) {
+        if (supportTypedArray) {
+          this.worker = worker;
+          this.setupMessageHandler(messageHandler);
+        } else {
+          this.setupFakeWorker();
+        }
+      }.bind(this));
+
+      var testObj = new Uint8Array(1);
+      messageHandler.send('test', testObj);
+    } else {
+      this.setupFakeWorker();
+    }
+  }
+
+  constructor.prototype = {
+    setupFakeWorker: function() {
+      // If we don't use a worker, just post/sendMessage to the main thread.
+      var fakeWorker = {
+        postMessage: function pdfDocPostMessage(obj) {
+          fakeWorker.onmessage({data: obj});
+        },
+        terminate: function pdfDocTerminate() {}
+      };
+
+      var messageHandler = new MessageHandler('main', fakeWorker);
+      this.setupMessageHandler(messageHandler);
+
+      // If the main thread is our worker, setup the handling for the messages
+      // the main thread sends to it self.
+      WorkerMessageHandler.setup(messageHandler);
+    },
+
+
+    setupMessageHandler: function(messageHandler) {
+      this.messageHandler = messageHandler;
+
+      messageHandler.on('page', function pdfDocPage(data) {
+        var pageNum = data.pageNum;
+        var page = this.pageCache[pageNum];
+        var depFonts = data.depFonts;
+
+        page.startRenderingFromIRQueue(data.IRQueue, depFonts);
+      }, this);
+
+      messageHandler.on('obj', function pdfDocObj(data) {
+        var id = data[0];
+        var type = data[1];
+
+        switch (type) {
+          case 'JpegStream':
+            var IR = data[2];
+            new JpegImageLoader(id, IR, this.objs);
+            break;
+          case 'Font':
+            var name = data[2];
+            var file = data[3];
+            var properties = data[4];
+
+            if (file) {
+              var fontFileDict = new Dict();
+              fontFileDict.map = file.dict.map;
+
+              var fontFile = new Stream(file.bytes, file.start,
+                                        file.end - file.start, fontFileDict);
+
+              // Check if this is a FlateStream. Otherwise just use the created
+              // Stream one. This makes complex_ttf_font.pdf work.
+              var cmf = file.bytes[0];
+              if ((cmf & 0x0f) == 0x08) {
+                file = new FlateStream(fontFile);
+              } else {
+                file = fontFile;
+              }
+            }
+
+            // For now, resolve the font object here direclty. The real font
+            // object is then created in FontLoader.bind().
+            this.objs.resolve(id, {
+              name: name,
+              file: file,
+              properties: properties
+            });
+            break;
+          default:
+            throw 'Got unkown object type ' + type;
+        }
+      }, this);
+
+      messageHandler.on('font_ready', function pdfDocFontReady(data) {
+        var id = data[0];
+        var font = new FontShape(data[1]);
+
+        // If there is no string, then there is nothing to attach to the DOM.
+        if (!font.str) {
+          this.objs.resolve(id, font);
+        } else {
+          this.objs.setData(id, font);
+        }
+      }.bind(this));
+
+      setTimeout(function pdfDocFontReadySetTimeout() {
+        messageHandler.send('doc', this.data);
+        this.workerReadyPromise.resolve(true);
+      }.bind(this));
+    },
+
+    get numPages() {
+      return this.pdf.numPages;
+    },
+
+    startRendering: function pdfDocStartRendering(page) {
+      // The worker might not be ready to receive the page request yet.
+      this.workerReadyPromise.then(function pdfDocStartRenderingThen() {
+        this.messageHandler.send('page_request', page.pageNumber + 1);
+      }.bind(this));
+    },
+
+    getPage: function pdfDocGetPage(n) {
+      if (this.pageCache[n])
+        return this.pageCache[n];
+
+      var page = this.pdf.getPage(n);
+      // Add a reference to the objects such that Page can forward the reference
+      // to the CanvasGraphics and so on.
+      page.objs = this.objs;
+      page.pdf = this;
+      return (this.pageCache[n] = page);
+    },
+
+    destroy: function pdfDocDestroy() {
+      if (this.worker)
+        this.worker.terminate();
+
+      if (this.fontWorker)
+        this.fontWorker.terminate();
+
+      for (var n in this.pageCache)
+        delete this.pageCache[n];
+
+      delete this.data;
+      delete this.stream;
+      delete this.pdf;
+      delete this.catalog;
+    }
+  };
+
+  return constructor;
+})();
+
+globalScope.PDFJS.PDFDoc = PDFDoc;
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+function log(msg) {
+  if (console && console.log)
+    console.log(msg);
+  else if (print)
+    print(msg);
+}
+
+function warn(msg) {
+  if (verbosity >= WARNINGS)
+    log('Warning: ' + msg);
+}
+
+function backtrace() {
+  try {
+    throw new Error();
+  } catch (e) {
+    return e.stack ? e.stack.split('\n').slice(2).join('\n') : '';
+  }
+}
+
+function error(msg) {
+  log('Error: ' + msg);
+  log(backtrace());
+  throw new Error(msg);
+}
+
+function TODO(what) {
+  if (verbosity >= TODOS)
+    log('TODO: ' + what);
+}
+
+function malformed(msg) {
+  error('Malformed PDF: ' + msg);
+}
+
+function assert(cond, msg) {
+  if (!cond)
+    error(msg);
+}
+
+// In a well-formed PDF, |cond| holds.  If it doesn't, subsequent
+// behavior is undefined.
+function assertWellFormed(cond, msg) {
+  if (!cond)
+    malformed(msg);
+}
+
+function shadow(obj, prop, value) {
+  Object.defineProperty(obj, prop, { value: value,
+                                     enumerable: true,
+                                     configurable: true,
+                                     writable: false });
+  return value;
+}
+
+function bytesToString(bytes) {
+  var str = '';
+  var length = bytes.length;
+  for (var n = 0; n < length; ++n)
+    str += String.fromCharCode(bytes[n]);
+  return str;
+}
+
+function stringToBytes(str) {
+  var length = str.length;
+  var bytes = new Uint8Array(length);
+  for (var n = 0; n < length; ++n)
+    bytes[n] = str.charCodeAt(n) & 0xFF;
+  return bytes;
+}
+
+var IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0];
+
+var Util = (function utilUtil() {
+  function constructor() {}
+  constructor.makeCssRgb = function makergb(r, g, b) {
+    var ri = (255 * r) | 0, gi = (255 * g) | 0, bi = (255 * b) | 0;
+    return 'rgb(' + ri + ',' + gi + ',' + bi + ')';
+  };
+  constructor.makeCssCmyk = function makecmyk(c, m, y, k) {
+    c = (new DeviceCmykCS()).getRgb([c, m, y, k]);
+    var ri = (255 * c[0]) | 0, gi = (255 * c[1]) | 0, bi = (255 * c[2]) | 0;
+    return 'rgb(' + ri + ',' + gi + ',' + bi + ')';
+  };
+  constructor.applyTransform = function apply(p, m) {
+    var xt = p[0] * m[0] + p[1] * m[2] + m[4];
+    var yt = p[0] * m[1] + p[1] * m[3] + m[5];
+    return [xt, yt];
+  };
+
+  return constructor;
+})();
+
+var PDFStringTranslateTable = [
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0x2D8, 0x2C7, 0x2C6, 0x2D9, 0x2DD, 0x2DB, 0x2DA, 0x2DC, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2022, 0x2020, 0x2021, 0x2026, 0x2014,
+  0x2013, 0x192, 0x2044, 0x2039, 0x203A, 0x2212, 0x2030, 0x201E, 0x201C,
+  0x201D, 0x2018, 0x2019, 0x201A, 0x2122, 0xFB01, 0xFB02, 0x141, 0x152, 0x160,
+  0x178, 0x17D, 0x131, 0x142, 0x153, 0x161, 0x17E, 0, 0x20AC
+];
+
+function stringToPDFString(str) {
+  var i, n = str.length, str2 = '';
+  if (str[0] === '\xFE' && str[1] === '\xFF') {
+    // UTF16BE BOM
+    for (i = 2; i < n; i += 2)
+      str2 += String.fromCharCode(
+        (str.charCodeAt(i) << 8) | str.charCodeAt(i + 1));
+  } else {
+    for (i = 0; i < n; ++i) {
+      var code = PDFStringTranslateTable[str.charCodeAt(i)];
+      str2 += code ? String.fromCharCode(code) : str.charAt(i);
+    }
+  }
+  return str2;
+}
+
+function isBool(v) {
+  return typeof v == 'boolean';
+}
+
+function isInt(v) {
+  return typeof v == 'number' && ((v | 0) == v);
+}
+
+function isNum(v) {
+  return typeof v == 'number';
+}
+
+function isString(v) {
+  return typeof v == 'string';
+}
+
+function isNull(v) {
+  return v === null;
+}
+
+function isName(v) {
+  return v instanceof Name;
+}
+
+function isCmd(v, cmd) {
+  return v instanceof Cmd && (!cmd || v.cmd == cmd);
+}
+
+function isDict(v, type) {
+  return v instanceof Dict && (!type || v.get('Type').name == type);
+}
+
+function isArray(v) {
+  return v instanceof Array;
+}
+
+function isStream(v) {
+  return typeof v == 'object' && v != null && ('getChar' in v);
+}
+
+function isArrayBuffer(v) {
+  return typeof v == 'object' && v != null && ('byteLength' in v);
+}
+
+function isRef(v) {
+  return v instanceof Ref;
+}
+
+function isPDFFunction(v) {
+  var fnDict;
+  if (typeof v != 'object')
+    return false;
+  else if (isDict(v))
+    fnDict = v;
+  else if (isStream(v))
+    fnDict = v.dict;
+  else
+    return false;
+  return fnDict.has('FunctionType');
+}
+
+/**
+ * 'Promise' object.
+ * Each object that is stored in PDFObjects is based on a Promise object that
+ * contains the status of the object and the data. There migth be situations,
+ * where a function want to use the value of an object, but it isn't ready at
+ * that time. To get a notification, once the object is ready to be used, s.o.
+ * can add a callback using the `then` method on the promise that then calls
+ * the callback once the object gets resolved.
+ * A promise can get resolved only once and only once the data of the promise
+ * can be set. If any of these happens twice or the data is required before
+ * it was set, an exception is throw.
+ */
+var Promise = (function promise() {
+  var EMPTY_PROMISE = {};
+
+  /**
+   * If `data` is passed in this constructor, the promise is created resolved.
+   * If there isn't data, it isn't resolved at the beginning.
+   */
+  function Promise(name, data) {
+    this.name = name;
+    // If you build a promise and pass in some data it's already resolved.
+    if (data != null) {
+      this.isResolved = true;
+      this._data = data;
+      this.hasData = true;
+    } else {
+      this.isResolved = false;
+      this._data = EMPTY_PROMISE;
+    }
+    this.callbacks = [];
+  };
+
+  Promise.prototype = {
+    hasData: false,
+
+    set data(value) {
+      if (value === undefined) {
+        return;
+      }
+      if (this._data !== EMPTY_PROMISE) {
+        throw 'Promise ' + this.name +
+                                ': Cannot set the data of a promise twice';
+      }
+      this._data = value;
+      this.hasData = true;
+
+      if (this.onDataCallback) {
+        this.onDataCallback(value);
+      }
+    },
+
+    get data() {
+      if (this._data === EMPTY_PROMISE) {
+        throw 'Promise ' + this.name + ': Cannot get data that isn\'t set';
+      }
+      return this._data;
+    },
+
+    onData: function promiseOnData(callback) {
+      if (this._data !== EMPTY_PROMISE) {
+        callback(this._data);
+      } else {
+        this.onDataCallback = callback;
+      }
+    },
+
+    resolve: function promiseResolve(data) {
+      if (this.isResolved) {
+        throw 'A Promise can be resolved only once ' + this.name;
+      }
+
+      this.isResolved = true;
+      this.data = data;
+      var callbacks = this.callbacks;
+
+      for (var i = 0, ii = callbacks.length; i < ii; i++) {
+        callbacks[i].call(null, data);
+      }
+    },
+
+    then: function promiseThen(callback) {
+      if (!callback) {
+        throw 'Requiring callback' + this.name;
+      }
+
+      // If the promise is already resolved, call the callback directly.
+      if (this.isResolved) {
+        var data = this.data;
+        callback.call(null, data);
+      } else {
+        this.callbacks.push(callback);
+      }
+    }
+  };
+
+  return Promise;
+})();
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+// <canvas> contexts store most of the state we need natively.
+// However, PDF needs a bit more state, which we store here.
+
+var CanvasExtraState = (function canvasExtraState() {
+  function constructor(old) {
+    // Are soft masks and alpha values shapes or opacities?
+    this.alphaIsShape = false;
+    this.fontSize = 0;
+    this.textMatrix = IDENTITY_MATRIX;
+    this.leading = 0;
+    // Current point (in user coordinates)
+    this.x = 0;
+    this.y = 0;
+    // Start of text line (in text coordinates)
+    this.lineX = 0;
+    this.lineY = 0;
+    // Character and word spacing
+    this.charSpacing = 0;
+    this.wordSpacing = 0;
+    this.textHScale = 1;
+    // Color spaces
+    this.fillColorSpace = new DeviceGrayCS();
+    this.fillColorSpaceObj = null;
+    this.strokeColorSpace = new DeviceGrayCS();
+    this.strokeColorSpaceObj = null;
+    this.fillColorObj = null;
+    this.strokeColorObj = null;
+    // Default fore and background colors
+    this.fillColor = '#000000';
+    this.strokeColor = '#000000';
+    // Note: fill alpha applies to all non-stroking operations
+    this.fillAlpha = 1;
+    this.strokeAlpha = 1;
+
+    this.old = old;
+  }
+
+  constructor.prototype = {
+    clone: function canvasextra_clone() {
+      return Object.create(this);
+    },
+    setCurrentPoint: function canvasextra_setCurrentPoint(x, y) {
+      this.x = x;
+      this.y = y;
+    }
+  };
+  return constructor;
+})();
+
+function ScratchCanvas(width, height) {
+  var canvas = document.createElement('canvas');
+  canvas.width = width;
+  canvas.height = height;
+  return canvas;
+}
+
+var CanvasGraphics = (function canvasGraphics() {
+  // Defines the time the executeIRQueue is going to be executing
+  // before it stops and shedules a continue of execution.
+  var kExecutionTime = 50;
+
+  // Number of IR commands to execute before checking
+  // if we execute longer then `kExecutionTime`.
+  var kExecutionTimeCheck = 500;
+
+  function constructor(canvasCtx, objs) {
+    this.ctx = canvasCtx;
+    this.current = new CanvasExtraState();
+    this.stateStack = [];
+    this.pendingClip = null;
+    this.res = null;
+    this.xobjs = null;
+    this.ScratchCanvas = ScratchCanvas;
+    this.objs = objs;
+  }
+
+  var LINE_CAP_STYLES = ['butt', 'round', 'square'];
+  var LINE_JOIN_STYLES = ['miter', 'round', 'bevel'];
+  var NORMAL_CLIP = {};
+  var EO_CLIP = {};
+
+  constructor.prototype = {
+    beginDrawing: function canvasGraphicsBeginDrawing(mediaBox) {
+      var cw = this.ctx.canvas.width, ch = this.ctx.canvas.height;
+      this.ctx.save();
+      switch (mediaBox.rotate) {
+        case 0:
+          this.ctx.transform(1, 0, 0, -1, 0, ch);
+          break;
+        case 90:
+          this.ctx.transform(0, 1, 1, 0, 0, 0);
+          break;
+        case 180:
+          this.ctx.transform(-1, 0, 0, 1, cw, 0);
+          break;
+        case 270:
+          this.ctx.transform(0, -1, -1, 0, cw, ch);
+          break;
+      }
+      this.ctx.scale(cw / mediaBox.width, ch / mediaBox.height);
+    },
+
+    executeIRQueue: function canvasGraphicsExecuteIRQueue(codeIR,
+                                  executionStartIdx, continueCallback) {
+      var argsArray = codeIR.argsArray;
+      var fnArray = codeIR.fnArray;
+      var i = executionStartIdx || 0;
+      var argsArrayLen = argsArray.length;
+
+      var executionEndIdx;
+      var startTime = Date.now();
+
+      var objs = this.objs;
+
+      do {
+        executionEndIdx = Math.min(argsArrayLen, i + kExecutionTimeCheck);
+
+        for (i; i < executionEndIdx; i++) {
+          if (fnArray[i] !== 'dependency') {
+            this[fnArray[i]].apply(this, argsArray[i]);
+          } else {
+            var deps = argsArray[i];
+            for (var n = 0, nn = deps.length; n < nn; n++) {
+              var depObjId = deps[n];
+
+              // If the promise isn't resolved yet, add the continueCallback
+              // to the promise and bail out.
+              if (!objs.isResolved(depObjId)) {
+                objs.get(depObjId, continueCallback);
+                return i;
+              }
+            }
+          }
+        }
+
+        // If the entire IRQueue was executed, stop as were done.
+        if (i == argsArrayLen) {
+          return i;
+        }
+
+        // If the execution took longer then a certain amount of time, shedule
+        // to continue exeution after a short delay.
+        // However, this is only possible if a 'continueCallback' is passed in.
+        if (continueCallback && (Date.now() - startTime) > kExecutionTime) {
+          setTimeout(continueCallback, 0);
+          return i;
+        }
+
+        // If the IRQueue isn't executed completly yet OR the execution time
+        // was short enough, do another execution round.
+      } while (true);
+    },
+
+    endDrawing: function canvasGraphicsEndDrawing() {
+      this.ctx.restore();
+    },
+
+    // Graphics state
+    setLineWidth: function canvasGraphicsSetLineWidth(width) {
+      this.ctx.lineWidth = width;
+    },
+    setLineCap: function canvasGraphicsSetLineCap(style) {
+      this.ctx.lineCap = LINE_CAP_STYLES[style];
+    },
+    setLineJoin: function canvasGraphicsSetLineJoin(style) {
+      this.ctx.lineJoin = LINE_JOIN_STYLES[style];
+    },
+    setMiterLimit: function canvasGraphicsSetMiterLimit(limit) {
+      this.ctx.miterLimit = limit;
+    },
+    setDash: function canvasGraphicsSetDash(dashArray, dashPhase) {
+      this.ctx.mozDash = dashArray;
+      this.ctx.mozDashOffset = dashPhase;
+    },
+    setRenderingIntent: function canvasGraphicsSetRenderingIntent(intent) {
+      TODO('set rendering intent: ' + intent);
+    },
+    setFlatness: function canvasGraphicsSetFlatness(flatness) {
+      TODO('set flatness: ' + flatness);
+    },
+    setGState: function canvasGraphicsSetGState(states) {
+      for (var i = 0, ii = states.length; i < ii; i++) {
+        var state = states[i];
+        var key = state[0];
+        var value = state[1];
+
+        switch (key) {
+          case 'LW':
+            this.setLineWidth(value);
+            break;
+          case 'LC':
+            this.setLineCap(value);
+            break;
+          case 'LJ':
+            this.setLineJoin(value);
+            break;
+          case 'ML':
+            this.setMiterLimit(value);
+            break;
+          case 'D':
+            this.setDash(value[0], value[1]);
+            break;
+          case 'RI':
+            this.setRenderingIntent(value);
+            break;
+          case 'FL':
+            this.setFlatness(value);
+            break;
+          case 'Font':
+            this.setFont(state[1], state[2]);
+            break;
+          case 'CA':
+            this.current.strokeAlpha = state[1];
+            break;
+          case 'ca':
+            this.current.fillAlpha = state[1];
+            this.ctx.globalAlpha = state[1];
+            break;
+        }
+      }
+    },
+    save: function canvasGraphicsSave() {
+      this.ctx.save();
+      var old = this.current;
+      this.stateStack.push(old);
+      this.current = old.clone();
+    },
+    restore: function canvasGraphicsRestore() {
+      var prev = this.stateStack.pop();
+      if (prev) {
+        this.current = prev;
+        this.ctx.restore();
+      }
+    },
+    transform: function canvasGraphicsTransform(a, b, c, d, e, f) {
+      this.ctx.transform(a, b, c, d, e, f);
+    },
+
+    // Path
+    moveTo: function canvasGraphicsMoveTo(x, y) {
+      this.ctx.moveTo(x, y);
+      this.current.setCurrentPoint(x, y);
+    },
+    lineTo: function canvasGraphicsLineTo(x, y) {
+      this.ctx.lineTo(x, y);
+      this.current.setCurrentPoint(x, y);
+    },
+    curveTo: function canvasGraphicsCurveTo(x1, y1, x2, y2, x3, y3) {
+      this.ctx.bezierCurveTo(x1, y1, x2, y2, x3, y3);
+      this.current.setCurrentPoint(x3, y3);
+    },
+    curveTo2: function canvasGraphicsCurveTo2(x2, y2, x3, y3) {
+      var current = this.current;
+      this.ctx.bezierCurveTo(current.x, current.y, x2, y2, x3, y3);
+      current.setCurrentPoint(x3, y3);
+    },
+    curveTo3: function canvasGraphicsCurveTo3(x1, y1, x3, y3) {
+      this.curveTo(x1, y1, x3, y3, x3, y3);
+      this.current.setCurrentPoint(x3, y3);
+    },
+    closePath: function canvasGraphicsClosePath() {
+      this.ctx.closePath();
+    },
+    rectangle: function canvasGraphicsRectangle(x, y, width, height) {
+      this.ctx.rect(x, y, width, height);
+    },
+    stroke: function canvasGraphicsStroke(consumePath) {
+      consumePath = typeof consumePath !== 'undefined' ? consumePath : true;
+      var ctx = this.ctx;
+      var strokeColor = this.current.strokeColor;
+      // For stroke we want to temporarily change the global alpha to the
+      // stroking alpha.
+      ctx.globalAlpha = this.current.strokeAlpha;
+      if (strokeColor && strokeColor.hasOwnProperty('type') &&
+          strokeColor.type === 'Pattern') {
+        // for patterns, we transform to pattern space, calculate
+        // the pattern, call stroke, and restore to user space
+        ctx.save();
+        ctx.strokeStyle = strokeColor.getPattern(ctx);
+        ctx.stroke();
+        ctx.restore();
+      } else {
+        ctx.stroke();
+      }
+      if (consumePath)
+        this.consumePath();
+      // Restore the global alpha to the fill alpha
+      ctx.globalAlpha = this.current.fillAlpha;
+    },
+    closeStroke: function canvasGraphicsCloseStroke() {
+      this.closePath();
+      this.stroke();
+    },
+    fill: function canvasGraphicsFill(consumePath) {
+      consumePath = typeof consumePath !== 'undefined' ? consumePath : true;
+      var ctx = this.ctx;
+      var fillColor = this.current.fillColor;
+
+      if (fillColor && fillColor.hasOwnProperty('type') &&
+          fillColor.type === 'Pattern') {
+        ctx.save();
+        ctx.fillStyle = fillColor.getPattern(ctx);
+        ctx.fill();
+        ctx.restore();
+      } else {
+        ctx.fill();
+      }
+      if (consumePath)
+        this.consumePath();
+    },
+    eoFill: function canvasGraphicsEoFill() {
+      var savedFillRule = this.setEOFillRule();
+      this.fill();
+      this.restoreFillRule(savedFillRule);
+    },
+    fillStroke: function canvasGraphicsFillStroke() {
+      this.fill(false);
+      this.stroke(false);
+
+      this.consumePath();
+    },
+    eoFillStroke: function canvasGraphicsEoFillStroke() {
+      var savedFillRule = this.setEOFillRule();
+      this.fillStroke();
+      this.restoreFillRule(savedFillRule);
+    },
+    closeFillStroke: function canvasGraphicsCloseFillStroke() {
+      this.closePath();
+      this.fillStroke();
+    },
+    closeEOFillStroke: function canvasGraphicsCloseEOFillStroke() {
+      var savedFillRule = this.setEOFillRule();
+      this.closePath();
+      this.fillStroke();
+      this.restoreFillRule(savedFillRule);
+    },
+    endPath: function canvasGraphicsEndPath() {
+      this.consumePath();
+    },
+
+    // Clipping
+    clip: function canvasGraphicsClip() {
+      this.pendingClip = NORMAL_CLIP;
+    },
+    eoClip: function canvasGraphicsEoClip() {
+      this.pendingClip = EO_CLIP;
+    },
+
+    // Text
+    beginText: function canvasGraphicsBeginText() {
+      this.current.textMatrix = IDENTITY_MATRIX;
+      this.current.x = this.current.lineX = 0;
+      this.current.y = this.current.lineY = 0;
+    },
+    endText: function canvasGraphicsEndText() {
+    },
+    setCharSpacing: function canvasGraphicsSetCharSpacing(spacing) {
+      this.current.charSpacing = spacing;
+    },
+    setWordSpacing: function canvasGraphicsSetWordSpacing(spacing) {
+      this.current.wordSpacing = spacing;
+    },
+    setHScale: function canvasGraphicsSetHScale(scale) {
+      this.current.textHScale = scale / 100;
+    },
+    setLeading: function canvasGraphicsSetLeading(leading) {
+      this.current.leading = -leading;
+    },
+    setFont: function canvasGraphicsSetFont(fontRefName, size) {
+      var fontObj = this.objs.get(fontRefName).fontObj;
+
+      if (!fontObj) {
+        throw 'Can\'t find font for ' + fontRefName;
+      }
+
+      var name = fontObj.loadedName || 'sans-serif';
+
+      this.current.font = fontObj;
+      this.current.fontSize = size;
+
+      var name = fontObj.loadedName || 'sans-serif';
+      var bold = fontObj.black ? (fontObj.bold ? 'bolder' : 'bold') :
+                                 (fontObj.bold ? 'bold' : 'normal');
+
+      var italic = fontObj.italic ? 'italic' : 'normal';
+      var serif = fontObj.serif ? 'serif' : 'sans-serif';
+      var typeface = '"' + name + '", ' + serif;
+      var rule = italic + ' ' + bold + ' ' + size + 'px ' + typeface;
+      this.ctx.font = rule;
+    },
+    setTextRenderingMode: function canvasGraphicsSetTextRenderingMode(mode) {
+      TODO('text rendering mode: ' + mode);
+    },
+    setTextRise: function canvasGraphicsSetTextRise(rise) {
+      TODO('text rise: ' + rise);
+    },
+    moveText: function canvasGraphicsMoveText(x, y) {
+      this.current.x = this.current.lineX += x;
+      this.current.y = this.current.lineY += y;
+    },
+    setLeadingMoveText: function canvasGraphicsSetLeadingMoveText(x, y) {
+      this.setLeading(-y);
+      this.moveText(x, y);
+    },
+    setTextMatrix: function canvasGraphicsSetTextMatrix(a, b, c, d, e, f) {
+      this.current.textMatrix = [a, b, c, d, e, f];
+
+      this.current.x = this.current.lineX = 0;
+      this.current.y = this.current.lineY = 0;
+    },
+    nextLine: function canvasGraphicsNextLine() {
+      this.moveText(0, this.current.leading);
+    },
+    showText: function canvasGraphicsShowText(text) {
+      var ctx = this.ctx;
+      var current = this.current;
+      var font = current.font;
+      var glyphs = font.charsToGlyphs(text);
+      var fontSize = current.fontSize;
+      var charSpacing = current.charSpacing;
+      var wordSpacing = current.wordSpacing;
+      var textHScale = current.textHScale;
+      var glyphsLength = glyphs.length;
+      if (font.coded) {
+        ctx.save();
+        ctx.transform.apply(ctx, current.textMatrix);
+        ctx.translate(current.x, current.y);
+
+        var fontMatrix = font.fontMatrix || IDENTITY_MATRIX;
+        ctx.scale(1 / textHScale, 1);
+        for (var i = 0; i < glyphsLength; ++i) {
+
+          var glyph = glyphs[i];
+          if (glyph === null) {
+            // word break
+            this.ctx.translate(wordSpacing, 0);
+            continue;
+          }
+
+          this.save();
+          ctx.scale(fontSize, fontSize);
+          ctx.transform.apply(ctx, fontMatrix);
+          this.executeIRQueue(glyph.codeIRQueue);
+          this.restore();
+
+          var transformed = Util.applyTransform([glyph.width, 0], fontMatrix);
+          var width = transformed[0] * fontSize + charSpacing;
+
+          ctx.translate(width, 0);
+          current.x += width;
+
+        }
+        ctx.restore();
+      } else {
+        ctx.save();
+        ctx.transform.apply(ctx, current.textMatrix);
+        ctx.scale(1, -1);
+        ctx.translate(current.x, -1 * current.y);
+        ctx.transform.apply(ctx, font.fontMatrix || IDENTITY_MATRIX);
+
+        ctx.scale(1 / textHScale, 1);
+
+        var width = 0;
+        for (var i = 0; i < glyphsLength; ++i) {
+          var glyph = glyphs[i];
+          if (glyph === null) {
+            // word break
+            width += wordSpacing;
+            continue;
+          }
+
+          var unicode = glyph.unicode;
+          var char = (unicode >= 0x10000) ?
+            String.fromCharCode(0xD800 | ((unicode - 0x10000) >> 10),
+            0xDC00 | (unicode & 0x3FF)) : String.fromCharCode(unicode);
+
+          ctx.fillText(char, width, 0);
+          width += glyph.width * fontSize * 0.001 + charSpacing;
+        }
+        current.x += width;
+
+        ctx.restore();
+      }
+    },
+
+    showSpacedText: function canvasGraphicsShowSpacedText(arr) {
+      var ctx = this.ctx;
+      var current = this.current;
+      var fontSize = current.fontSize;
+      var textHScale = current.textHScale;
+      var arrLength = arr.length;
+      for (var i = 0; i < arrLength; ++i) {
+        var e = arr[i];
+        if (isNum(e)) {
+          current.x -= e * 0.001 * fontSize * textHScale;
+        } else if (isString(e)) {
+          this.showText(e);
+        } else {
+          malformed('TJ array element ' + e + ' is not string or num');
+        }
+      }
+    },
+    nextLineShowText: function canvasGraphicsNextLineShowText(text) {
+      this.nextLine();
+      this.showText(text);
+    },
+    nextLineSetSpacingShowText:
+      function canvasGraphicsNextLineSetSpacingShowText(wordSpacing,
+                                                        charSpacing,
+                                                        text) {
+      this.setWordSpacing(wordSpacing);
+      this.setCharSpacing(charSpacing);
+      this.nextLineShowText(text);
+    },
+
+    // Type3 fonts
+    setCharWidth: function canvasGraphicsSetCharWidth(xWidth, yWidth) {
+      // We can safely ignore this since the width should be the same
+      // as the width in the Widths array.
+    },
+    setCharWidthAndBounds: function canvasGraphicsSetCharWidthAndBounds(xWidth,
+                                                                        yWidth,
+                                                                        llx,
+                                                                        lly,
+                                                                        urx,
+                                                                        ury) {
+      // TODO According to the spec we're also suppose to ignore any operators
+      // that set color or include images while processing this type3 font.
+      this.rectangle(llx, lly, urx - llx, ury - lly);
+      this.clip();
+      this.endPath();
+    },
+
+    // Color
+    setStrokeColorSpace: function canvasGraphicsSetStrokeColorSpace(raw) {
+      this.current.strokeColorSpace = ColorSpace.fromIR(raw);
+    },
+    setFillColorSpace: function canvasGraphicsSetFillColorSpace(raw) {
+      this.current.fillColorSpace = ColorSpace.fromIR(raw);
+    },
+    setStrokeColor: function canvasGraphicsSetStrokeColor(/*...*/) {
+      var cs = this.current.strokeColorSpace;
+      var color = cs.getRgb(arguments);
+      var color = Util.makeCssRgb.apply(null, cs.getRgb(arguments));
+      this.ctx.strokeStyle = color;
+      this.current.strokeColor = color;
+    },
+    getColorN_IR_Pattern: function canvasGraphicsGetColorN_IR_Pattern(IR, cs) {
+      if (IR[0] == 'TilingPattern') {
+        var args = IR[1];
+        var base = cs.base;
+        var color;
+        if (base) {
+          var baseComps = base.numComps;
+
+          color = [];
+          for (var i = 0; i < baseComps; ++i)
+            color.push(args[i]);
+
+          color = base.getRgb(color);
+        }
+        var pattern = new TilingPattern(IR, color, this.ctx, this.objs);
+      } else if (IR[0] == 'RadialAxial' || IR[0] == 'Dummy') {
+        var pattern = Pattern.shadingFromIR(this.ctx, IR);
+      } else {
+        throw 'Unkown IR type';
+      }
+      return pattern;
+    },
+    setStrokeColorN_IR: function canvasGraphicsSetStrokeColorN(/*...*/) {
+      var cs = this.current.strokeColorSpace;
+
+      if (cs.name == 'Pattern') {
+        this.current.strokeColor = this.getColorN_IR_Pattern(arguments, cs);
+      } else {
+        this.setStrokeColor.apply(this, arguments);
+      }
+    },
+    setFillColor: function canvasGraphicsSetFillColor(/*...*/) {
+      var cs = this.current.fillColorSpace;
+      var color = Util.makeCssRgb.apply(null, cs.getRgb(arguments));
+      this.ctx.fillStyle = color;
+      this.current.fillColor = color;
+    },
+    setFillColorN_IR: function canvasGraphicsSetFillColorN(/*...*/) {
+      var cs = this.current.fillColorSpace;
+
+      if (cs.name == 'Pattern') {
+        this.current.fillColor = this.getColorN_IR_Pattern(arguments, cs);
+      } else {
+        this.setFillColor.apply(this, arguments);
+      }
+    },
+    setStrokeGray: function canvasGraphicsSetStrokeGray(gray) {
+      if (!(this.current.strokeColorSpace instanceof DeviceGrayCS))
+        this.current.strokeColorSpace = new DeviceGrayCS();
+
+      var color = Util.makeCssRgb(gray, gray, gray);
+      this.ctx.strokeStyle = color;
+      this.current.strokeColor = color;
+    },
+    setFillGray: function canvasGraphicsSetFillGray(gray) {
+      if (!(this.current.fillColorSpace instanceof DeviceGrayCS))
+        this.current.fillColorSpace = new DeviceGrayCS();
+
+      var color = Util.makeCssRgb(gray, gray, gray);
+      this.ctx.fillStyle = color;
+      this.current.fillColor = color;
+    },
+    setStrokeRGBColor: function canvasGraphicsSetStrokeRGBColor(r, g, b) {
+      if (!(this.current.strokeColorSpace instanceof DeviceRgbCS))
+        this.current.strokeColorSpace = new DeviceRgbCS();
+
+      var color = Util.makeCssRgb(r, g, b);
+      this.ctx.strokeStyle = color;
+      this.current.strokeColor = color;
+    },
+    setFillRGBColor: function canvasGraphicsSetFillRGBColor(r, g, b) {
+      if (!(this.current.fillColorSpace instanceof DeviceRgbCS))
+        this.current.fillColorSpace = new DeviceRgbCS();
+
+      var color = Util.makeCssRgb(r, g, b);
+      this.ctx.fillStyle = color;
+      this.current.fillColor = color;
+    },
+    setStrokeCMYKColor: function canvasGraphicsSetStrokeCMYKColor(c, m, y, k) {
+      if (!(this.current.strokeColorSpace instanceof DeviceCmykCS))
+        this.current.strokeColorSpace = new DeviceCmykCS();
+
+      var color = Util.makeCssCmyk(c, m, y, k);
+      this.ctx.strokeStyle = color;
+      this.current.strokeColor = color;
+    },
+    setFillCMYKColor: function canvasGraphicsSetFillCMYKColor(c, m, y, k) {
+      if (!(this.current.fillColorSpace instanceof DeviceCmykCS))
+        this.current.fillColorSpace = new DeviceCmykCS();
+
+      var color = Util.makeCssCmyk(c, m, y, k);
+      this.ctx.fillStyle = color;
+      this.current.fillColor = color;
+    },
+
+    shadingFill: function canvasGraphicsShadingFill(patternIR) {
+      var ctx = this.ctx;
+
+      this.save();
+      ctx.fillStyle = Pattern.shadingFromIR(ctx, patternIR);
+
+      var inv = ctx.mozCurrentTransformInverse;
+      if (inv) {
+        var canvas = ctx.canvas;
+        var width = canvas.width;
+        var height = canvas.height;
+
+        var bl = Util.applyTransform([0, 0], inv);
+        var br = Util.applyTransform([0, width], inv);
+        var ul = Util.applyTransform([height, 0], inv);
+        var ur = Util.applyTransform([height, width], inv);
+
+        var x0 = Math.min(bl[0], br[0], ul[0], ur[0]);
+        var y0 = Math.min(bl[1], br[1], ul[1], ur[1]);
+        var x1 = Math.max(bl[0], br[0], ul[0], ur[0]);
+        var y1 = Math.max(bl[1], br[1], ul[1], ur[1]);
+
+        this.ctx.fillRect(x0, y0, x1 - x0, y1 - y0);
+      } else {
+        // HACK to draw the gradient onto an infinite rectangle.
+        // PDF gradients are drawn across the entire image while
+        // Canvas only allows gradients to be drawn in a rectangle
+        // The following bug should allow us to remove this.
+        // https://bugzilla.mozilla.org/show_bug.cgi?id=664884
+
+        this.ctx.fillRect(-1e10, -1e10, 2e10, 2e10);
+      }
+
+      this.restore();
+    },
+
+    // Images
+    beginInlineImage: function canvasGraphicsBeginInlineImage() {
+      error('Should not call beginInlineImage');
+    },
+    beginImageData: function canvasGraphicsBeginImageData() {
+      error('Should not call beginImageData');
+    },
+
+    paintFormXObjectBegin: function canvasGraphicsPaintFormXObjectBegin(matrix,
+                                                                        bbox) {
+      this.save();
+
+      if (matrix && isArray(matrix) && 6 == matrix.length)
+        this.transform.apply(this, matrix);
+
+      if (bbox && isArray(bbox) && 4 == bbox.length) {
+        var width = bbox[2] - bbox[0];
+        var height = bbox[3] - bbox[1];
+        this.rectangle(bbox[0], bbox[1], width, height);
+        this.clip();
+        this.endPath();
+      }
+    },
+
+    paintFormXObjectEnd: function canvasGraphicsPaintFormXObjectEnd() {
+      this.restore();
+    },
+
+    paintJpegXObject: function canvasGraphicsPaintJpegXObject(objId, w, h) {
+      var image = this.objs.get(objId);
+      if (!image) {
+        error('Dependent image isn\'t ready yet');
+      }
+
+      this.save();
+
+      var ctx = this.ctx;
+      // scale the image to the unit square
+      ctx.scale(1 / w, -1 / h);
+
+      var domImage = image.getImage();
+      ctx.drawImage(domImage, 0, 0, domImage.width, domImage.height,
+                    0, -h, w, h);
+
+      this.restore();
+    },
+
+    paintImageMaskXObject: function canvasGraphicsPaintImageMaskXObject(
+                             imgArray, inverseDecode, width, height) {
+      function applyStencilMask(buffer, inverseDecode) {
+        var imgArrayPos = 0;
+        var i, j, mask, buf;
+        // removing making non-masked pixels transparent
+        var bufferPos = 3; // alpha component offset
+        for (i = 0; i < height; i++) {
+          mask = 0;
+          for (j = 0; j < width; j++) {
+            if (!mask) {
+              buf = imgArray[imgArrayPos++];
+              mask = 128;
+            }
+            if (!(buf & mask) == inverseDecode) {
+              buffer[bufferPos] = 0;
+            }
+            bufferPos += 4;
+            mask >>= 1;
+          }
+        }
+      }
+
+      this.save();
+
+      var ctx = this.ctx;
+      var w = width, h = height;
+      // scale the image to the unit square
+      ctx.scale(1 / w, -1 / h);
+
+      var tmpCanvas = new this.ScratchCanvas(w, h);
+      var tmpCtx = tmpCanvas.getContext('2d');
+
+      var fillColor = this.current.fillColor;
+      tmpCtx.fillStyle = (fillColor && fillColor.hasOwnProperty('type') &&
+                          fillColor.type === 'Pattern') ?
+                          fillColor.getPattern(tmpCtx) : fillColor;
+      tmpCtx.fillRect(0, 0, w, h);
+
+      var imgData = tmpCtx.getImageData(0, 0, w, h);
+      var pixels = imgData.data;
+
+      applyStencilMask(pixels, inverseDecode);
+
+      tmpCtx.putImageData(imgData, 0, 0);
+      ctx.drawImage(tmpCanvas, 0, -h);
+      this.restore();
+    },
+
+    paintImageXObject: function canvasGraphicsPaintImageXObject(imgData) {
+      this.save();
+      var ctx = this.ctx;
+      var w = imgData.width;
+      var h = imgData.height;
+      // scale the image to the unit square
+      ctx.scale(1 / w, -1 / h);
+
+      var tmpCanvas = new this.ScratchCanvas(w, h);
+      var tmpCtx = tmpCanvas.getContext('2d');
+      var tmpImgData;
+
+      // Some browsers can set an UInt8Array directly as imageData, some
+      // can't. As long as we don't have proper feature detection, just
+      // copy over each pixel and set the imageData that way.
+      tmpImgData = tmpCtx.getImageData(0, 0, w, h);
+
+      // Copy over the imageData.
+      var tmpImgDataPixels = tmpImgData.data;
+      var len = tmpImgDataPixels.length;
+
+      while (len--) {
+        tmpImgDataPixels[len] = imgData.data[len];
+      }
+
+      tmpCtx.putImageData(tmpImgData, 0, 0);
+      ctx.drawImage(tmpCanvas, 0, -h);
+      this.restore();
+    },
+
+    // Marked content
+
+    markPoint: function canvasGraphicsMarkPoint(tag) {
+      TODO('Marked content');
+    },
+    markPointProps: function canvasGraphicsMarkPointProps(tag, properties) {
+      TODO('Marked content');
+    },
+    beginMarkedContent: function canvasGraphicsBeginMarkedContent(tag) {
+      TODO('Marked content');
+    },
+    beginMarkedContentProps:
+      function canvasGraphicsBeginMarkedContentProps(tag, properties) {
+      TODO('Marked content');
+    },
+    endMarkedContent: function canvasGraphicsEndMarkedContent() {
+      TODO('Marked content');
+    },
+
+    // Compatibility
+
+    beginCompat: function canvasGraphicsBeginCompat() {
+      TODO('ignore undefined operators (should we do that anyway?)');
+    },
+    endCompat: function canvasGraphicsEndCompat() {
+      TODO('stop ignoring undefined operators');
+    },
+
+    // Helper functions
+
+    consumePath: function canvasGraphicsConsumePath() {
+      if (this.pendingClip) {
+        var savedFillRule = null;
+        if (this.pendingClip == EO_CLIP)
+          savedFillRule = this.setEOFillRule();
+
+        this.ctx.clip();
+
+        this.pendingClip = null;
+        if (savedFillRule !== null)
+          this.restoreFillRule(savedFillRule);
+      }
+      this.ctx.beginPath();
+    },
+    // We generally keep the canvas context set for
+    // nonzero-winding, and just set evenodd for the operations
+    // that need them.
+    setEOFillRule: function canvasGraphicsSetEOFillRule() {
+      var savedFillRule = this.ctx.mozFillRule;
+      this.ctx.mozFillRule = 'evenodd';
+      return savedFillRule;
+    },
+    restoreFillRule: function canvasGraphicsRestoreFillRule(rule) {
+      this.ctx.mozFillRule = rule;
+    }
+  };
+
+  return constructor;
+})();
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var Name = (function nameName() {
+  function constructor(name) {
+    this.name = name;
+  }
+
+  constructor.prototype = {
+  };
+
+  return constructor;
+})();
+
+var Cmd = (function cmdCmd() {
+  function constructor(cmd) {
+    this.cmd = cmd;
+  }
+
+  constructor.prototype = {
+  };
+
+  return constructor;
+})();
+
+var Dict = (function dictDict() {
+  function constructor() {
+    this.map = Object.create(null);
+  }
+
+  constructor.prototype = {
+    get: function dictGet(key1, key2, key3) {
+      var value;
+      if (typeof (value = this.map[key1]) != 'undefined' || key1 in this.map ||
+          typeof key2 == 'undefined') {
+        return value;
+      }
+      if (typeof (value = this.map[key2]) != 'undefined' || key2 in this.map ||
+          typeof key3 == 'undefined') {
+        return value;
+      }
+
+      return this.map[key3] || null;
+    },
+
+    set: function dictSet(key, value) {
+      this.map[key] = value;
+    },
+
+    has: function dictHas(key) {
+      return key in this.map;
+    },
+
+    forEach: function dictForEach(callback) {
+      for (var key in this.map) {
+        callback(key, this.map[key]);
+      }
+    }
+  };
+
+  return constructor;
+})();
+
+var Ref = (function refRef() {
+  function constructor(num, gen) {
+    this.num = num;
+    this.gen = gen;
+  }
+
+  constructor.prototype = {
+  };
+
+  return constructor;
+})();
+
+// The reference is identified by number and generation,
+// this structure stores only one instance of the reference.
+var RefSet = (function refSet() {
+  function constructor() {
+    this.dict = {};
+  }
+
+  constructor.prototype = {
+    has: function refSetHas(ref) {
+      return !!this.dict['R' + ref.num + '.' + ref.gen];
+    },
+
+    put: function refSetPut(ref) {
+      this.dict['R' + ref.num + '.' + ref.gen] = ref;
+    }
+  };
+
+  return constructor;
+})();
+
+var Catalog = (function catalogCatalog() {
+  function constructor(xref) {
+    this.xref = xref;
+    var obj = xref.getCatalogObj();
+    assertWellFormed(isDict(obj), 'catalog object is not a dictionary');
+    this.catDict = obj;
+  }
+
+  constructor.prototype = {
+    get toplevelPagesDict() {
+      var pagesObj = this.catDict.get('Pages');
+      assertWellFormed(isRef(pagesObj), 'invalid top-level pages reference');
+      var xrefObj = this.xref.fetch(pagesObj);
+      assertWellFormed(isDict(xrefObj), 'invalid top-level pages dictionary');
+      // shadow the prototype getter
+      return shadow(this, 'toplevelPagesDict', xrefObj);
+    },
+    get documentOutline() {
+      var obj = this.catDict.get('Outlines');
+      var xref = this.xref;
+      var root = { items: [] };
+      if (isRef(obj)) {
+        obj = xref.fetch(obj).get('First');
+        var processed = new RefSet();
+        if (isRef(obj)) {
+          var queue = [{obj: obj, parent: root}];
+          // to avoid recursion keeping track of the items
+          // in the processed dictionary
+          processed.put(obj);
+          while (queue.length > 0) {
+            var i = queue.shift();
+            var outlineDict = xref.fetch(i.obj);
+            if (!outlineDict.has('Title'))
+              error('Invalid outline item');
+            var dest = outlineDict.get('A');
+            if (dest)
+              dest = xref.fetchIfRef(dest).get('D');
+            else if (outlineDict.has('Dest')) {
+              dest = outlineDict.get('Dest');
+              if (isName(dest))
+                dest = dest.name;
+            }
+            var title = xref.fetchIfRef(outlineDict.get('Title'));
+            var outlineItem = {
+              dest: dest,
+              title: stringToPDFString(title),
+              color: outlineDict.get('C') || [0, 0, 0],
+              count: outlineDict.get('Count'),
+              bold: !!(outlineDict.get('F') & 2),
+              italic: !!(outlineDict.get('F') & 1),
+              items: []
+            };
+            i.parent.items.push(outlineItem);
+            obj = outlineDict.get('First');
+            if (isRef(obj) && !processed.has(obj)) {
+              queue.push({obj: obj, parent: outlineItem});
+              processed.put(obj);
+            }
+            obj = outlineDict.get('Next');
+            if (isRef(obj) && !processed.has(obj)) {
+              queue.push({obj: obj, parent: i.parent});
+              processed.put(obj);
+            }
+          }
+        }
+      }
+      obj = root.items.length > 0 ? root.items : null;
+      return shadow(this, 'documentOutline', obj);
+    },
+    get numPages() {
+      var obj = this.toplevelPagesDict.get('Count');
+      assertWellFormed(
+        isInt(obj),
+        'page count in top level pages object is not an integer'
+      );
+      // shadow the prototype getter
+      return shadow(this, 'num', obj);
+    },
+    traverseKids: function catalogTraverseKids(pagesDict) {
+      var pageCache = this.pageCache;
+      var kids = pagesDict.get('Kids');
+      assertWellFormed(isArray(kids),
+                       'page dictionary kids object is not an array');
+      for (var i = 0, ii = kids.length; i < ii; ++i) {
+        var kid = kids[i];
+        assertWellFormed(isRef(kid),
+                         'page dictionary kid is not a reference');
+        var obj = this.xref.fetch(kid);
+        if (isDict(obj, 'Page') || (isDict(obj) && !obj.has('Kids'))) {
+          pageCache.push(new Page(this.xref, pageCache.length, obj, kid));
+        } else { // must be a child page dictionary
+          assertWellFormed(
+            isDict(obj),
+            'page dictionary kid reference points to wrong type of object'
+          );
+          this.traverseKids(obj);
+        }
+      }
+    },
+    get destinations() {
+      function fetchDestination(xref, ref) {
+        var dest = xref.fetchIfRef(ref);
+        return isDict(dest) ? dest.get('D') : dest;
+      }
+
+      var xref = this.xref;
+      var dests = {}, nameTreeRef, nameDictionaryRef;
+      var obj = this.catDict.get('Names');
+      if (obj)
+        nameTreeRef = xref.fetchIfRef(obj).get('Dests');
+      else if (this.catDict.has('Dests'))
+        nameDictionaryRef = this.catDict.get('Dests');
+
+      if (nameDictionaryRef) {
+        // reading simple destination dictionary
+        obj = xref.fetchIfRef(nameDictionaryRef);
+        obj.forEach(function catalogForEach(key, value) {
+          if (!value) return;
+          dests[key] = fetchDestination(xref, value);
+        });
+      }
+      if (nameTreeRef) {
+        // reading name tree
+        var processed = new RefSet();
+        processed.put(nameTreeRef);
+        var queue = [nameTreeRef];
+        while (queue.length > 0) {
+          var i, n;
+          obj = xref.fetch(queue.shift());
+          if (obj.has('Kids')) {
+            var kids = obj.get('Kids');
+            for (i = 0, n = kids.length; i < n; i++) {
+              var kid = kids[i];
+              if (processed.has(kid))
+                error('invalid destinations');
+              queue.push(kid);
+              processed.put(kid);
+            }
+            continue;
+          }
+          var names = obj.get('Names');
+          for (i = 0, n = names.length; i < n; i += 2) {
+            dests[names[i]] = fetchDestination(xref, names[i + 1]);
+          }
+        }
+      }
+      return shadow(this, 'destinations', dests);
+    },
+    getPage: function catalogGetPage(n) {
+      var pageCache = this.pageCache;
+      if (!pageCache) {
+        pageCache = this.pageCache = [];
+        this.traverseKids(this.toplevelPagesDict);
+      }
+      return this.pageCache[n - 1];
+    }
+  };
+
+  return constructor;
+})();
+
+var XRef = (function xRefXRef() {
+  function constructor(stream, startXRef, mainXRefEntriesOffset) {
+    this.stream = stream;
+    this.entries = [];
+    this.xrefstms = {};
+    var trailerDict = this.readXRef(startXRef);
+
+    // prepare the XRef cache
+    this.cache = [];
+
+    var encrypt = trailerDict.get('Encrypt');
+    if (encrypt) {
+      var fileId = trailerDict.get('ID');
+      this.encrypt = new CipherTransformFactory(this.fetch(encrypt),
+                                                fileId[0] /*, password */);
+    }
+
+    // get the root dictionary (catalog) object
+    if (!isRef(this.root = trailerDict.get('Root')))
+      error('Invalid root reference');
+  }
+
+  constructor.prototype = {
+    readXRefTable: function readXRefTable(parser) {
+      var obj;
+      while (true) {
+        if (isCmd(obj = parser.getObj(), 'trailer'))
+          break;
+        if (!isInt(obj))
+          error('Invalid XRef table');
+        var first = obj;
+        if (!isInt(obj = parser.getObj()))
+          error('Invalid XRef table');
+        var n = obj;
+        if (first < 0 || n < 0 || (first + n) != ((first + n) | 0))
+          error('Invalid XRef table: ' + first + ', ' + n);
+        for (var i = first; i < first + n; ++i) {
+          var entry = {};
+          if (!isInt(obj = parser.getObj()))
+            error('Invalid XRef table: ' + first + ', ' + n);
+          entry.offset = obj;
+          if (!isInt(obj = parser.getObj()))
+            error('Invalid XRef table: ' + first + ', ' + n);
+          entry.gen = obj;
+          obj = parser.getObj();
+          if (isCmd(obj, 'n')) {
+            entry.uncompressed = true;
+          } else if (isCmd(obj, 'f')) {
+            entry.free = true;
+          } else {
+            error('Invalid XRef table: ' + first + ', ' + n);
+          }
+          if (!this.entries[i]) {
+            // In some buggy PDF files the xref table claims to start at 1
+            // instead of 0.
+            if (i == 1 && first == 1 &&
+                entry.offset == 0 && entry.gen == 65535 && entry.free) {
+              i = first = 0;
+            }
+            this.entries[i] = entry;
+          }
+        }
+      }
+
+      // read the trailer dictionary
+      var dict;
+      if (!isDict(dict = parser.getObj()))
+        error('Invalid XRef table');
+
+      // get the 'Prev' pointer
+      var prev;
+      obj = dict.get('Prev');
+      if (isInt(obj)) {
+        prev = obj;
+      } else if (isRef(obj)) {
+        // certain buggy PDF generators generate "/Prev NNN 0 R" instead
+        // of "/Prev NNN"
+        prev = obj.num;
+      }
+      if (prev) {
+        this.readXRef(prev);
+      }
+
+      // check for 'XRefStm' key
+      if (isInt(obj = dict.get('XRefStm'))) {
+        var pos = obj;
+        // ignore previously loaded xref streams (possible infinite recursion)
+        if (!(pos in this.xrefstms)) {
+          this.xrefstms[pos] = 1;
+          this.readXRef(pos);
+        }
+      }
+
+      return dict;
+    },
+    readXRefStream: function readXRefStream(stream) {
+      var streamParameters = stream.parameters;
+      var byteWidths = streamParameters.get('W');
+      var range = streamParameters.get('Index');
+      if (!range)
+        range = [0, streamParameters.get('Size')];
+      var i, j;
+      while (range.length > 0) {
+        var first = range[0], n = range[1];
+        if (!isInt(first) || !isInt(n))
+          error('Invalid XRef range fields: ' + first + ', ' + n);
+        var typeFieldWidth = byteWidths[0];
+        var offsetFieldWidth = byteWidths[1];
+        var generationFieldWidth = byteWidths[2];
+        if (!isInt(typeFieldWidth) || !isInt(offsetFieldWidth) ||
+            !isInt(generationFieldWidth)) {
+          error('Invalid XRef entry fields length: ' + first + ', ' + n);
+        }
+        for (i = 0; i < n; ++i) {
+          var type = 0, offset = 0, generation = 0;
+          for (j = 0; j < typeFieldWidth; ++j)
+            type = (type << 8) | stream.getByte();
+          // if type field is absent, its default value = 1
+          if (typeFieldWidth == 0)
+            type = 1;
+          for (j = 0; j < offsetFieldWidth; ++j)
+            offset = (offset << 8) | stream.getByte();
+          for (j = 0; j < generationFieldWidth; ++j)
+            generation = (generation << 8) | stream.getByte();
+          var entry = {};
+          entry.offset = offset;
+          entry.gen = generation;
+          switch (type) {
+            case 0:
+              entry.free = true;
+              break;
+            case 1:
+              entry.uncompressed = true;
+              break;
+            case 2:
+              break;
+            default:
+              error('Invalid XRef entry type: ' + type);
+          }
+          if (!this.entries[first + i])
+            this.entries[first + i] = entry;
+        }
+        range.splice(0, 2);
+      }
+      var prev = streamParameters.get('Prev');
+      if (isInt(prev))
+        this.readXRef(prev);
+      return streamParameters;
+    },
+    indexObjects: function indexObjects() {
+      // Simple scan through the PDF content to find objects,
+      // trailers and XRef streams.
+      function readToken(data, offset) {
+        var token = '', ch = data[offset];
+        while (ch !== 13 && ch !== 10) {
+          if (++offset >= data.length)
+            break;
+          token += String.fromCharCode(ch);
+          ch = data[offset];
+        }
+        return token;
+      }
+      function skipUntil(data, offset, what) {
+        var length = what.length, dataLength = data.length;
+        var skipped = 0;
+        // finding byte sequence
+        while (offset < dataLength) {
+          var i = 0;
+          while (i < length && data[offset + i] == what[i])
+            ++i;
+          if (i >= length)
+            break; // sequence found
+
+          offset++;
+          skipped++;
+        }
+        return skipped;
+      }
+      var trailerBytes = new Uint8Array([116, 114, 97, 105, 108, 101, 114]);
+      var startxrefBytes = new Uint8Array([115, 116, 97, 114, 116, 120, 114,
+                                          101, 102]);
+      var endobjBytes = new Uint8Array([101, 110, 100, 111, 98, 106]);
+      var xrefBytes = new Uint8Array([47, 88, 82, 101, 102]);
+
+      var stream = this.stream;
+      stream.pos = 0;
+      var buffer = stream.getBytes();
+      var position = stream.start, length = buffer.length;
+      var trailers = [], xrefStms = [];
+      var state = 0;
+      var currentToken;
+      while (position < length) {
+        var ch = buffer[position];
+        if (ch === 32 || ch === 9 || ch === 13 || ch === 10) {
+          ++position;
+          continue;
+        }
+        if (ch === 37) { // %-comment
+          do {
+            ++position;
+            ch = buffer[position];
+          } while (ch !== 13 && ch !== 10);
+          continue;
+        }
+        var token = readToken(buffer, position);
+        var m;
+        if (token === 'xref') {
+          position += skipUntil(buffer, position, trailerBytes);
+          trailers.push(position);
+          position += skipUntil(buffer, position, startxrefBytes);
+        } else if ((m = /^(\d+)\s+(\d+)\s+obj\b/.exec(token))) {
+          this.entries[m[1]] = {
+            offset: position,
+            gen: m[2] | 0,
+            uncompressed: true
+          };
+
+          var contentLength = skipUntil(buffer, position, endobjBytes) + 7;
+          var content = buffer.subarray(position, position + contentLength);
+
+          // checking XRef stream suspect
+          // (it shall have '/XRef' and next char is not a letter)
+          var xrefTagOffset = skipUntil(content, 0, xrefBytes);
+          if (xrefTagOffset < contentLength &&
+              content[xrefTagOffset + 5] < 64) {
+            xrefStms.push(position);
+            this.xrefstms[position] = 1; // don't read it recursively
+          }
+
+          position += contentLength;
+        } else
+          position += token.length + 1;
+      }
+      // reading XRef streams
+      for (var i = 0, ii = xrefStms.length; i < ii; ++i) {
+          this.readXRef(xrefStms[i]);
+      }
+      // finding main trailer
+      var dict;
+      for (var i = 0, ii = trailers.length; i < ii; ++i) {
+        stream.pos = trailers[i];
+        var parser = new Parser(new Lexer(stream), true);
+        var obj = parser.getObj();
+        if (!isCmd(obj, 'trailer'))
+          continue;
+        // read the trailer dictionary
+        if (!isDict(dict = parser.getObj()))
+          continue;
+        // taking the first one with 'ID'
+        if (dict.has('ID'))
+          return dict;
+      }
+      // no tailer with 'ID', taking last one (if exists)
+      if (dict)
+        return dict;
+      // nothing helps
+      error('Invalid PDF structure');
+      return null;
+    },
+    readXRef: function readXref(startXRef) {
+      var stream = this.stream;
+      stream.pos = startXRef;
+      var parser = new Parser(new Lexer(stream), true);
+      var obj = parser.getObj();
+      // parse an old-style xref table
+      if (isCmd(obj, 'xref'))
+        return this.readXRefTable(parser);
+      // parse an xref stream
+      if (isInt(obj)) {
+        if (!isInt(parser.getObj()) ||
+            !isCmd(parser.getObj(), 'obj') ||
+            !isStream(obj = parser.getObj())) {
+          error('Invalid XRef stream');
+        }
+        return this.readXRefStream(obj);
+      }
+      return this.indexObjects();
+    },
+    getEntry: function xRefGetEntry(i) {
+      var e = this.entries[i];
+      if (e.free)
+        error('reading an XRef stream not implemented yet');
+      return e;
+    },
+    fetchIfRef: function xRefFetchIfRef(obj) {
+      if (!isRef(obj))
+        return obj;
+      return this.fetch(obj);
+    },
+    fetch: function xRefFetch(ref, suppressEncryption) {
+      var num = ref.num;
+      var e = this.cache[num];
+      if (e)
+        return e;
+
+      e = this.getEntry(num);
+      var gen = ref.gen;
+      var stream, parser;
+      if (e.uncompressed) {
+        if (e.gen != gen)
+          throw ('inconsistent generation in XRef');
+        stream = this.stream.makeSubStream(e.offset);
+        parser = new Parser(new Lexer(stream), true, this);
+        var obj1 = parser.getObj();
+        var obj2 = parser.getObj();
+        var obj3 = parser.getObj();
+        if (!isInt(obj1) || obj1 != num ||
+            !isInt(obj2) || obj2 != gen ||
+            !isCmd(obj3)) {
+          error('bad XRef entry');
+        }
+        if (!isCmd(obj3, 'obj')) {
+          // some bad pdfs use "obj1234" and really mean 1234
+          if (obj3.cmd.indexOf('obj') == 0) {
+            num = parseInt(obj3.cmd.substring(3), 10);
+            if (!isNaN(num))
+              return num;
+          }
+          error('bad XRef entry');
+        }
+        if (this.encrypt && !suppressEncryption) {
+          try {
+            e = parser.getObj(this.encrypt.createCipherTransform(num, gen));
+          } catch (ex) {
+            // almost all streams must be encrypted, but sometimes
+            // they are not probably due to some broken generators
+            // re-trying without encryption
+            return this.fetch(ref, true);
+          }
+        } else {
+          e = parser.getObj();
+        }
+        // Don't cache streams since they are mutable (except images).
+        if (!isStream(e) || e.getImage)
+          this.cache[num] = e;
+        return e;
+      }
+
+      // compressed entry
+      stream = this.fetch(new Ref(e.offset, 0));
+      if (!isStream(stream))
+        error('bad ObjStm stream');
+      var first = stream.parameters.get('First');
+      var n = stream.parameters.get('N');
+      if (!isInt(first) || !isInt(n)) {
+        error('invalid first and n parameters for ObjStm stream');
+      }
+      parser = new Parser(new Lexer(stream), false);
+      var i, entries = [], nums = [];
+      // read the object numbers to populate cache
+      for (i = 0; i < n; ++i) {
+        num = parser.getObj();
+        if (!isInt(num)) {
+          error('invalid object number in the ObjStm stream: ' + num);
+        }
+        nums.push(num);
+        var offset = parser.getObj();
+        if (!isInt(offset)) {
+          error('invalid object offset in the ObjStm stream: ' + offset);
+        }
+      }
+      // read stream objects for cache
+      for (i = 0; i < n; ++i) {
+        entries.push(parser.getObj());
+        this.cache[nums[i]] = entries[i];
+      }
+      e = entries[e.gen];
+      if (!e) {
+        error('bad XRef entry for compressed object');
+      }
+      return e;
+    },
+    getCatalogObj: function xRefGetCatalogObj() {
+      return this.fetch(this.root);
+    }
+  };
+
+  return constructor;
+})();
+
+/**
+ * A PDF document and page is built of many objects. E.g. there are objects
+ * for fonts, images, rendering code and such. These objects might get processed
+ * inside of a worker. The `PDFObjects` implements some basic functions to
+ * manage these objects.
+ */
+var PDFObjects = (function pdfObjects() {
+  function PDFObjects() {
+    this.objs = {};
+  }
+
+  PDFObjects.prototype = {
+    objs: null,
+
+    /**
+     * Internal function.
+     * Ensures there is an object defined for `objId`. Stores `data` on the
+     * object *if* it is created.
+     */
+    ensureObj: function pdfObjectsEnsureObj(objId, data) {
+      if (this.objs[objId])
+        return this.objs[objId];
+      return this.objs[objId] = new Promise(objId, data);
+    },
+
+    /**
+     * If called *without* callback, this returns the data of `objId` but the
+     * object needs to be resolved. If it isn't, this function throws.
+     *
+     * If called *with* a callback, the callback is called with the data of the
+     * object once the object is resolved. That means, if you call this
+     * function and the object is already resolved, the callback gets called
+     * right away.
+     */
+    get: function pdfObjectsGet(objId, callback) {
+      // If there is a callback, then the get can be async and the object is
+      // not required to be resolved right now
+      if (callback) {
+        this.ensureObj(objId).then(callback);
+        return null;
+      }
+
+      // If there isn't a callback, the user expects to get the resolved data
+      // directly.
+      var obj = this.objs[objId];
+
+      // If there isn't an object yet or the object isn't resolved, then the
+      // data isn't ready yet!
+      if (!obj || !obj.isResolved) {
+        throw 'Requesting object that isn\'t resolved yet ' + objId;
+        return null;
+      } else {
+        return obj.data;
+      }
+    },
+
+    /**
+     * Resolves the object `objId` with optional `data`.
+     */
+    resolve: function pdfObjectsResolve(objId, data) {
+      var objs = this.objs;
+
+      // In case there is a promise already on this object, just resolve it.
+      if (objs[objId]) {
+        objs[objId].resolve(data);
+      } else {
+        this.ensureObj(objId, data);
+      }
+    },
+
+    onData: function pdfObjectsOnData(objId, callback) {
+      this.ensureObj(objId).onData(callback);
+    },
+
+    isResolved: function pdfObjectsIsResolved(objId) {
+      var objs = this.objs;
+      if (!objs[objId]) {
+        return false;
+      } else {
+        return objs[objId].isResolved;
+      }
+    },
+
+    hasData: function pdfObjectsHasData(objId) {
+      var objs = this.objs;
+      if (!objs[objId]) {
+        return false;
+      } else {
+        return objs[objId].hasData;
+      }
+    },
+
+    /**
+     * Sets the data of an object but *doesn't* resolve it.
+     */
+    setData: function pdfObjectsSetData(objId, data) {
+      // Watchout! If you call `this.ensureObj(objId, data)` you're going to
+      // create a *resolved* promise which shouldn't be the case!
+      this.ensureObj(objId).data = data;
+    }
+  };
+  return PDFObjects;
+})();
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var PDFFunction = (function pdfFunction() {
+  var CONSTRUCT_SAMPLED = 0;
+  var CONSTRUCT_INTERPOLATED = 2;
+  var CONSTRUCT_STICHED = 3;
+  var CONSTRUCT_POSTSCRIPT = 4;
+
+  return {
+    getSampleArray: function pdfFunctionGetSampleArray(size, outputSize, bps,
+                                                       str) {
+      var length = 1;
+      for (var i = 0, ii = size.length; i < ii; i++)
+        length *= size[i];
+      length *= outputSize;
+
+      var array = [];
+      var codeSize = 0;
+      var codeBuf = 0;
+      // 32 is a valid bps so shifting won't work
+      var sampleMul = 1.0 / (Math.pow(2.0, bps) - 1);
+
+      var strBytes = str.getBytes((length * bps + 7) / 8);
+      var strIdx = 0;
+      for (var i = 0; i < length; i++) {
+        while (codeSize < bps) {
+          codeBuf <<= 8;
+          codeBuf |= strBytes[strIdx++];
+          codeSize += 8;
+        }
+        codeSize -= bps;
+        array.push((codeBuf >> codeSize) * sampleMul);
+        codeBuf &= (1 << codeSize) - 1;
+      }
+      return array;
+    },
+
+    getIR: function pdfFunctionGetIR(xref, fn) {
+      var dict = fn.dict;
+      if (!dict)
+        dict = fn;
+
+      var types = [this.constructSampled,
+                   null,
+                   this.constructInterpolated,
+                   this.constructStiched,
+                   this.constructPostScript];
+
+      var typeNum = dict.get('FunctionType');
+      var typeFn = types[typeNum];
+      if (!typeFn)
+        error('Unknown type of function');
+
+      return typeFn.call(this, fn, dict, xref);
+    },
+
+    fromIR: function pdfFunctionFromIR(IR) {
+      var type = IR[0];
+      switch (type) {
+        case CONSTRUCT_SAMPLED:
+          return this.constructSampledFromIR(IR);
+        case CONSTRUCT_INTERPOLATED:
+          return this.constructInterpolatedFromIR(IR);
+        case CONSTRUCT_STICHED:
+          return this.constructStichedFromIR(IR);
+        case CONSTRUCT_POSTSCRIPT:
+        default:
+          return this.constructPostScriptFromIR(IR);
+      }
+    },
+
+    parse: function pdfFunctionParse(xref, fn) {
+      var IR = this.getIR(xref, fn);
+      return this.fromIR(IR);
+    },
+
+    constructSampled: function pdfFunctionConstructSampled(str, dict) {
+      function toMultiArray(arr) {
+        var inputLength = arr.length;
+        var outputLength = arr.length / 2;
+        var out = new Array(outputLength);
+        var index = 0;
+        for (var i = 0; i < inputLength; i += 2) {
+          out[index] = [arr[i], arr[i + 1]];
+          ++index;
+        }
+        return out;
+      }
+      var domain = dict.get('Domain');
+      var range = dict.get('Range');
+
+      if (!domain || !range)
+        error('No domain or range');
+
+      var inputSize = domain.length / 2;
+      var outputSize = range.length / 2;
+
+      domain = toMultiArray(domain);
+      range = toMultiArray(range);
+
+      var size = dict.get('Size');
+      var bps = dict.get('BitsPerSample');
+      var order = dict.get('Order');
+      if (!order)
+        order = 1;
+      if (order !== 1)
+        error('No support for cubic spline interpolation: ' + order);
+
+      var encode = dict.get('Encode');
+      if (!encode) {
+        encode = [];
+        for (var i = 0; i < inputSize; ++i) {
+          encode.push(0);
+          encode.push(size[i] - 1);
+        }
+      }
+      encode = toMultiArray(encode);
+
+      var decode = dict.get('Decode');
+      if (!decode)
+        decode = range;
+      else
+        decode = toMultiArray(decode);
+
+      // Precalc the multipliers
+      var inputMul = new Float64Array(inputSize);
+      for (var i = 0; i < inputSize; ++i) {
+        inputMul[i] = (encode[i][1] - encode[i][0]) /
+                  (domain[i][1] - domain[i][0]);
+      }
+
+      var idxMul = new Int32Array(inputSize);
+      idxMul[0] = outputSize;
+      for (i = 1; i < inputSize; ++i) {
+        idxMul[i] = idxMul[i - 1] * size[i - 1];
+      }
+
+      var nSamples = outputSize;
+      for (i = 0; i < inputSize; ++i)
+          nSamples *= size[i];
+
+      var samples = this.getSampleArray(size, outputSize, bps, str);
+
+      return [
+        CONSTRUCT_SAMPLED, inputSize, domain, encode, decode, samples, size,
+        outputSize, bps, range, inputMul, idxMul, nSamples
+      ];
+    },
+
+    constructSampledFromIR: function pdfFunctionConstructSampledFromIR(IR) {
+      var inputSize = IR[1];
+      var domain = IR[2];
+      var encode = IR[3];
+      var decode = IR[4];
+      var samples = IR[5];
+      var size = IR[6];
+      var outputSize = IR[7];
+      var bps = IR[8];
+      var range = IR[9];
+      var inputMul = IR[10];
+      var idxMul = IR[11];
+      var nSamples = IR[12];
+
+      return function constructSampledFromIRResult(args) {
+        if (inputSize != args.length)
+          error('Incorrect number of arguments: ' + inputSize + ' != ' +
+                args.length);
+        // Most of the below is a port of Poppler's implementation.
+        // TODO: There's a few other ways to do multilinear interpolation such
+        // as piecewise, which is much faster but an approximation.
+        var out = new Float64Array(outputSize);
+        var x;
+        var e = new Array(inputSize);
+        var efrac0 = new Float64Array(inputSize);
+        var efrac1 = new Float64Array(inputSize);
+        var sBuf = new Float64Array(1 << inputSize);
+        var i, j, k, idx, t;
+
+        // map input values into sample array
+        for (i = 0; i < inputSize; ++i) {
+          x = (args[i] - domain[i][0]) * inputMul[i] + encode[i][0];
+          if (x < 0) {
+            x = 0;
+          } else if (x > size[i] - 1) {
+            x = size[i] - 1;
+          }
+          e[i] = [Math.floor(x), 0];
+          if ((e[i][1] = e[i][0] + 1) >= size[i]) {
+            // this happens if in[i] = domain[i][1]
+            e[i][1] = e[i][0];
+          }
+          efrac1[i] = x - e[i][0];
+          efrac0[i] = 1 - efrac1[i];
+        }
+
+        // for each output, do m-linear interpolation
+        for (i = 0; i < outputSize; ++i) {
+
+          // pull 2^m values out of the sample array
+          for (j = 0; j < (1 << inputSize); ++j) {
+            idx = i;
+            for (k = 0, t = j; k < inputSize; ++k, t >>= 1) {
+              idx += idxMul[k] * (e[k][t & 1]);
+            }
+            if (idx >= 0 && idx < nSamples) {
+              sBuf[j] = samples[idx];
+            } else {
+              sBuf[j] = 0; // TODO Investigate if this is what Adobe does
+            }
+          }
+
+          // do m sets of interpolations
+          for (j = 0, t = (1 << inputSize); j < inputSize; ++j, t >>= 1) {
+            for (k = 0; k < t; k += 2) {
+              sBuf[k >> 1] = efrac0[j] * sBuf[k] + efrac1[j] * sBuf[k + 1];
+            }
+          }
+
+          // map output value to range
+          out[i] = (sBuf[0] * (decode[i][1] - decode[i][0]) + decode[i][0]);
+          if (out[i] < range[i][0]) {
+            out[i] = range[i][0];
+          } else if (out[i] > range[i][1]) {
+            out[i] = range[i][1];
+          }
+        }
+        return out;
+      }
+    },
+
+    constructInterpolated:
+    function pdfFunctionConstructInterpolated(str, dict) {
+      var c0 = dict.get('C0') || [0];
+      var c1 = dict.get('C1') || [1];
+      var n = dict.get('N');
+
+      if (!isArray(c0) || !isArray(c1))
+        error('Illegal dictionary for interpolated function');
+
+      var length = c0.length;
+      var diff = [];
+      for (var i = 0; i < length; ++i)
+        diff.push(c1[i] - c0[i]);
+
+      return [CONSTRUCT_INTERPOLATED, c0, diff, n];
+    },
+
+    constructInterpolatedFromIR:
+    function pdfFunctionconstructInterpolatedFromIR(IR) {
+      var c0 = IR[1];
+      var diff = IR[2];
+      var n = IR[3];
+
+      var length = diff.length;
+
+      return function constructInterpolatedFromIRResult(args) {
+        var x = n == 1 ? args[0] : Math.pow(args[0], n);
+
+        var out = [];
+        for (var j = 0; j < length; ++j)
+          out.push(c0[j] + (x * diff[j]));
+
+        return out;
+
+      }
+    },
+
+    constructStiched: function pdfFunctionConstructStiched(fn, dict, xref) {
+      var domain = dict.get('Domain');
+      var range = dict.get('Range');
+
+      if (!domain)
+        error('No domain');
+
+      var inputSize = domain.length / 2;
+      if (inputSize != 1)
+        error('Bad domain for stiched function');
+
+      var fnRefs = dict.get('Functions');
+      var fns = [];
+      for (var i = 0, ii = fnRefs.length; i < ii; ++i)
+        fns.push(PDFFunction.getIR(xref, xref.fetchIfRef(fnRefs[i])));
+
+      var bounds = dict.get('Bounds');
+      var encode = dict.get('Encode');
+
+      return [CONSTRUCT_STICHED, domain, bounds, encode, fns];
+    },
+
+    constructStichedFromIR: function pdfFunctionConstructStichedFromIR(IR) {
+      var domain = IR[1];
+      var bounds = IR[2];
+      var encode = IR[3];
+      var fnsIR = IR[4];
+      var fns = [];
+
+      for (var i = 0, ii = fnsIR.length; i < ii; i++) {
+        fns.push(PDFFunction.fromIR(fnsIR[i]));
+      }
+
+      return function constructStichedFromIRResult(args) {
+        var clip = function constructStichedFromIRClip(v, min, max) {
+          if (v > max)
+            v = max;
+          else if (v < min)
+            v = min;
+          return v;
+        };
+
+        // clip to domain
+        var v = clip(args[0], domain[0], domain[1]);
+        // calulate which bound the value is in
+        for (var i = 0, ii = bounds.length; i < ii; ++i) {
+          if (v < bounds[i])
+            break;
+        }
+
+        // encode value into domain of function
+        var dmin = domain[0];
+        if (i > 0)
+          dmin = bounds[i - 1];
+        var dmax = domain[1];
+        if (i < bounds.length)
+          dmax = bounds[i];
+
+        var rmin = encode[2 * i];
+        var rmax = encode[2 * i + 1];
+
+        var v2 = rmin + (v - dmin) * (rmax - rmin) / (dmax - dmin);
+
+        // call the appropropriate function
+        return fns[i]([v2]);
+      };
+    },
+
+    constructPostScript: function pdfFunctionConstructPostScript() {
+      return [CONSTRUCT_POSTSCRIPT];
+    },
+
+    constructPostScriptFromIR: function pdfFunctionConstructPostScriptFromIR() {
+      TODO('unhandled type of function');
+      return function constructPostScriptFromIRResult() {
+        return [255, 105, 180];
+      };
+    }
+  };
+})();
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var ISOAdobeCharset = [
+  '.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar',
+  'percent', 'ampersand', 'quoteright', 'parenleft', 'parenright',
+  'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash', 'zero',
+  'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
+  'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question',
+  'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+  'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+  'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore',
+  'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+  'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+  'braceleft', 'bar', 'braceright', 'asciitilde', 'exclamdown', 'cent',
+  'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
+  'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
+  'guilsinglright', 'fi', 'fl', 'endash', 'dagger', 'daggerdbl',
+  'periodcentered', 'paragraph', 'bullet', 'quotesinglbase',
+  'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis',
+  'perthousand', 'questiondown', 'grave', 'acute', 'circumflex', 'tilde',
+  'macron', 'breve', 'dotaccent', 'dieresis', 'ring', 'cedilla',
+  'hungarumlaut', 'ogonek', 'caron', 'emdash', 'AE', 'ordfeminine',
+  'Lslash', 'Oslash', 'OE', 'ordmasculine', 'ae', 'dotlessi', 'lslash',
+  'oslash', 'oe', 'germandbls', 'onesuperior', 'logicalnot', 'mu',
+  'trademark', 'Eth', 'onehalf', 'plusminus', 'Thorn', 'onequarter',
+  'divide', 'brokenbar', 'degree', 'thorn', 'threequarters', 'twosuperior',
+  'registered', 'minus', 'eth', 'multiply', 'threesuperior', 'copyright',
+  'Aacute', 'Acircumflex', 'Adieresis', 'Agrave', 'Aring', 'Atilde',
+  'Ccedilla', 'Eacute', 'Ecircumflex', 'Edieresis', 'Egrave', 'Iacute',
+  'Icircumflex', 'Idieresis', 'Igrave', 'Ntilde', 'Oacute', 'Ocircumflex',
+  'Odieresis', 'Ograve', 'Otilde', 'Scaron', 'Uacute', 'Ucircumflex',
+  'Udieresis', 'Ugrave', 'Yacute', 'Ydieresis', 'Zcaron', 'aacute',
+  'acircumflex', 'adieresis', 'agrave', 'aring', 'atilde', 'ccedilla',
+  'eacute', 'ecircumflex', 'edieresis', 'egrave', 'iacute', 'icircumflex',
+  'idieresis', 'igrave', 'ntilde', 'oacute', 'ocircumflex', 'odieresis',
+  'ograve', 'otilde', 'scaron', 'uacute', 'ucircumflex', 'udieresis',
+  'ugrave', 'yacute', 'ydieresis', 'zcaron'
+];
+
+var ExpertCharset = [
+  '.notdef', 'space', 'exclamsmall', 'Hungarumlautsmall', 'dollaroldstyle',
+  'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior',
+  'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma',
+  'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle',
+  'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle',
+  'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle',
+  'colon', 'semicolon', 'commasuperior', 'threequartersemdash',
+  'periodsuperior', 'questionsmall', 'asuperior', 'bsuperior',
+  'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior',
+  'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
+  'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior',
+  'parenrightinferior', 'Circumflexsmall', 'hyphensuperior', 'Gravesmall',
+  'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall',
+  'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall',
+  'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall',
+  'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary',
+  'onefitted', 'rupiah', 'Tildesmall', 'exclamdownsmall', 'centoldstyle',
+  'Lslashsmall', 'Scaronsmall', 'Zcaronsmall', 'Dieresissmall',
+  'Brevesmall', 'Caronsmall', 'Dotaccentsmall', 'Macronsmall',
+  'figuredash', 'hypheninferior', 'Ogoneksmall', 'Ringsmall',
+  'Cedillasmall', 'onequarter', 'onehalf', 'threequarters',
+  'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths',
+  'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'onesuperior',
+  'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior',
+  'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior',
+  'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior',
+  'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior',
+  'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior',
+  'periodinferior', 'commainferior', 'Agravesmall', 'Aacutesmall',
+  'Acircumflexsmall', 'Atildesmall', 'Adieresissmall', 'Aringsmall',
+  'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall',
+  'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall',
+  'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall',
+  'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall',
+  'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall',
+  'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall',
+  'Ydieresissmall'
+];
+
+var ExpertSubsetCharset = [
+  '.notdef', 'space', 'dollaroldstyle', 'dollarsuperior',
+  'parenleftsuperior', 'parenrightsuperior', 'twodotenleader',
+  'onedotenleader', 'comma', 'hyphen', 'period', 'fraction',
+  'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle',
+  'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle',
+  'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon', 'commasuperior',
+  'threequartersemdash', 'periodsuperior', 'asuperior', 'bsuperior',
+  'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior',
+  'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
+  'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior',
+  'parenrightinferior', 'hyphensuperior', 'colonmonetary', 'onefitted',
+  'rupiah', 'centoldstyle', 'figuredash', 'hypheninferior', 'onequarter',
+  'onehalf', 'threequarters', 'oneeighth', 'threeeighths', 'fiveeighths',
+  'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'onesuperior',
+  'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior',
+  'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior',
+  'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior',
+  'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior',
+  'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior',
+  'periodinferior', 'commainferior'
+];
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var CIDToUnicodeMaps = {
+  'Adobe-Japan1': [[32, 160], {f: 12, c: 33}, [45, 8209], {f: 46, c: 46}, 165,
+    {f: 2, c: 93}, [95, 818], [96, 768], {f: 27, c: 97}, 166, 125, [732, 771],
+    [700, 8217], 92, [699, 8216], 124, [126, 8764], {f: 3, c: 161}, 8260, 402,
+    0, 164, 8220, 171, {f: 2, c: 8249}, {f: 2, c: 64257}, [8210, 8211], 0, 0,
+    [183, 8729], 0, 8226, 8218, 8222, 8221, 187, 0, 0, 191, {f: 2, c: 769},
+    [175, 772], {f: 3, c: 774}, 778, [184, 807], 779, 808, 780, [822, 8212],
+    198, 170, 321, 216, 338, 186, 230, 305, 322, 248, 339, 223, 173, 169, 172,
+    174, 0, 0, {f: 2, c: 178}, 181, 185, {f: 3, c: 188}, {f: 6, c: 192},
+    {f: 16, c: 199}, 0, {f: 6, c: 217}, {f: 6, c: 224}, {f: 16, c: 231}, 0,
+    {f: 7, c: 249}, 352, 376, 381, [773, 8254], 353, 8482, 382, 0, 8194,
+    {s: 91}, 65512, {s: 3}, {f: 63, c: 65377}, {s: 243}, [8195, 12288],
+    {f: 2, c: 12289}, 65292, 65294, 12539, {f: 2, c: 65306}, 65311, 65281,
+    {f: 2, c: 12443}, 180, 65344, 168, 65342, 65507, 65343, {f: 2, c: 12541},
+    {f: 2, c: 12445}, 12291, 20189, {f: 3, c: 12293}, 12540, 8213, 8208, 65295,
+    65340, [12316, 65374], 8214, 65372, 8230, 8229, {s: 4}, {f: 2, c: 65288},
+    {f: 2, c: 12308}, 65339, 65341, 65371, 65373, {f: 10, c: 12296}, 65291,
+    [8722, 65293], 177, 215, 247, 65309, 8800, 65308, 65310, {f: 2, c: 8806},
+    8734, 8756, 9794, 9792, 176, {f: 2, c: 8242}, 8451, 65509, 65284,
+    {f: 2, c: 65504}, 65285, 65283, 65286, 65290, 65312, 167, 9734, 9733, 9675,
+    9679, 9678, 9671, 9670, 9633, 9632, 9651, 9650, 9661, 9660, 8251, 12306,
+    8594, {f: 2, c: 8592}, 8595, 12307, 8712, 8715, {f: 2, c: 8838},
+    {f: 2, c: 8834}, 8746, 8745, {f: 2, c: 8743}, 65506, 8658, 8660, 8704,
+    8707, 8736, 8869, 8978, 8706, 8711, 8801, 8786, {f: 2, c: 8810}, 8730,
+    8765, 8733, 8757, {f: 2, c: 8747}, 8491, 8240, 9839, 9837, 9834,
+    {f: 2, c: 8224}, 182, 9711, {f: 10, c: 65296}, {f: 26, c: 65313},
+    {f: 26, c: 65345}, {f: 83, c: 12353}, {f: 86, c: 12449}, {f: 17, c: 913},
+    {f: 7, c: 931}, {f: 17, c: 945}, {f: 7, c: 963}, {f: 6, c: 1040}, 1025,
+    {f: 32, c: 1046}, 1105, {f: 26, c: 1078}, 20124, 21782, 23043, 38463,
+    21696, 24859, 25384, 23030, 36898, 33909, 33564, 31312, 24746, 25569,
+    28197, 26093, 33894, 33446, 39925, 26771, 22311, 26017, 25201, 23451,
+    22992, 34427, 39156, 32098, 32190, 39822, 25110, 31903, 34999, 23433,
+    24245, 25353, 26263, 26696, 38343, 38797, 26447, 20197, 20234, 20301,
+    20381, 20553, 22258, 22839, 22996, 23041, 23561, 24799, 24847, 24944,
+    26131, 26885, 28858, 30031, 30064, 31227, 32173, 32239, 32963, 33806,
+    [12176, 34915], 35586, 36949, 36986, 21307, 20117, 20133, 22495, 32946,
+    37057, 30959, [12032, 19968], 22769, 28322, 36920, 31282, 33576, 33419,
+    39983, 20801, 21360, 21693, 21729, 22240, 23035, 24341, 39154, 28139,
+    32996, 34093, 38498, 38512, 38560, 38907, 21515, 21491, 23431, 28879,
+    [12155, 32701], 36802, [12204, 38632], 21359, 40284, 31418, 19985, 30867,
+    [12165, 33276], 28198, 22040, 21764, 27421, 34074, 39995, 23013, 21417,
+    28006, [12128, 29916], 38287, 22082, 20113, 36939, 38642, 33615, 39180,
+    21473, 21942, 23344, 24433, 26144, 26355, 26628, 27704, 27891, 27945,
+    29787, 30408, 31310, 38964, 33521, 34907, 35424, 37613, 28082, 30123,
+    30410, 39365, 24742, 35585, 36234, 38322, 27022, 21421, 20870, 22290,
+    22576, 22852, 23476, 24310, 24616, 25513, 25588, 27839, 28436, 28814,
+    28948, 29017, 29141, 29503, 32257, 33398, 33489, 34199, 36960, 37467,
+    40219, 22633, 26044, 27738, 29989, 20985, 22830, 22885, 24448, 24540,
+    25276, 26106, 27178, 27431, 27572, 29579, 32705, 35158, 40236, 40206,
+    [12009, 40644], 23713, 27798, 33659, 20740, 23627, 25014, 33222, 26742,
+    29281, [12036, 20057], 20474, 21368, 24681, 28201, 31311, [12211, 38899],
+    19979, 21270, 20206, 20309, 20285, 20385, 20339, 21152, 21487, 22025,
+    22799, 23233, 23478, 23521, 31185, 26247, 26524, 26550, 27468, 27827,
+    [12117, 28779], 29634, 31117, [12146, 31166], 31292, 31623, 33457, 33499,
+    33540, 33655, 33775, 33747, 34662, 35506, 22057, 36008, 36838, 36942,
+    38686, 34442, 20420, 23784, 25105, [12123, 29273], 30011, 33253, 33469,
+    34558, 36032, 38597, 39187, 39381, 20171, 20250, 35299, 22238, 22602,
+    22730, 24315, 24555, 24618, 24724, 24674, 25040, 25106, 25296, 25913,
+    39745, 26214, 26800, 28023, 28784, 30028, 30342, 32117, 33445, 34809,
+    38283, 38542, [12185, 35997], 20977, 21182, 22806, 21683, 23475, 23830,
+    24936, 27010, 28079, 30861, 33995, 34903, 35442, 37799, 39608, 28012,
+    39336, 34521, 22435, 26623, 34510, 37390, 21123, 22151, 21508, 24275,
+    25313, 25785, 26684, 26680, 27579, 29554, 30906, 31339, 35226,
+    [12179, 35282], 36203, 36611, 37101, 38307, 38548, [12208, 38761], 23398,
+    23731, 27005, {f: 2, c: 38989}, 25499, 31520, 27179, 27263, 26806, 39949,
+    28511, 21106, 21917, 24688, 25324, 27963, 28167, 28369, 33883, 35088,
+    36676, 19988, 39993, 21494, 26907, 27194, 38788, 26666, 20828, 31427,
+    33970, 37340, 37772, 22107, 40232, 26658, 33541, 33841, 31909, 21000,
+    33477, [12129, 29926], 20094, 20355, 20896, 23506, 21002, 21208, 21223,
+    24059, 21914, 22570, 23014, 23436, 23448, 23515, [12082, 24178], 24185,
+    24739, 24863, 24931, 25022, 25563, 25954, 26577, 26707, 26874, 27454,
+    27475, 27735, 28450, 28567, 28485, 29872, [12130, 29976], 30435, 30475,
+    31487, 31649, 31777, 32233, [12152, 32566], 32752, 32925, 33382, 33694,
+    35251, 35532, 36011, 36996, 37969, 38291, 38289, 38306, 38501, 38867,
+    39208, 33304, 20024, 21547, 23736, 24012, 29609, 30284, 30524, 23721,
+    32747, 36107, 38593, 38929, 38996, 39000, 20225, 20238, 21361, 21916,
+    22120, 22522, 22855, 23305, 23492, 23696, 24076, 24190, 24524, 25582,
+    26426, 26071, 26082, 26399, 26827, 26820, 27231, 24112, 27589, 27671,
+    27773, 30079, 31048, 23395, 31232, 32000, 24509, 35215, 35352, 36020,
+    36215, 36556, 36637, 39138, 39438, [12004, 12225, 39740], [12018, 20096],
+    20605, 20736, 22931, 23452, 25135, 25216, 25836, 27450, 29344, 30097,
+    31047, 32681, 34811, 35516, 35696, 25516, 33738, 38816, 21513, 21507,
+    21931, 26708, 27224, 35440, 30759, 26485, [12233, 40653], 21364, 23458,
+    33050, 34384, 36870, 19992, 20037, 20167, 20241, 21450, 21560, 23470,
+    [12088, 24339], 24613, 25937, 26429, 27714, 27762, 27875, 28792, 29699,
+    31350, 31406, 31496, 32026, 31998, 32102, 26087, [12124, 29275], 21435,
+    23621, 24040, 25298, 25312, 25369, 28192, 34394, 35377, 36317, 37624,
+    28417, 31142, [12226, 39770], 20136, {f: 2, c: 20139}, 20379, 20384, 20689,
+    20807, 31478, 20849, 20982, 21332, 21281, 21375, 21483, 21932, 22659,
+    23777, 24375, 24394, 24623, 24656, 24685, 25375, 25945, 27211, 27841,
+    29378, 29421, 30703, 33016, 33029, 33288, 34126, 37111, 37857, 38911,
+    39255, 39514, 20208, 20957, 23597, 26241, 26989, 23616, 26354, 26997,
+    [12127, 29577], 26704, 31873, 20677, 21220, 22343, [12081, 24062], 37670,
+    [12100, 26020], 27427, 27453, 29748, 31105, 31165, 31563, 32202, 33465,
+    33740, 34943, 35167, 35641, 36817, [12198, 37329], 21535, 37504, 20061,
+    20534, 21477, 21306, 29399, 29590, 30697, 33510, 36527, 39366, 39368,
+    39378, 20855, 24858, 34398, 21936, 31354, 20598, 23507, 36935, 38533,
+    20018, 27355, 37351, 23633, 23624, 25496, 31391, 27795, 38772, 36705,
+    31402, 29066, 38536, 31874, 26647, 32368, 26705, 37740, 21234, 21531,
+    34219, 35347, 32676, 36557, 37089, 21350, 34952, 31041, 20418, 20670,
+    21009, 20804, 21843, 22317, 29674, 22411, 22865, 24418, 24452, 24693,
+    24950, 24935, 25001, 25522, 25658, 25964, 26223, 26690, 28179, 30054,
+    31293, 31995, 32076, 32153, 32331, 32619, 33550, 33610, 34509, 35336,
+    35427, 35686, 36605, 38938, 40335, 33464, 36814, 39912, 21127, 25119,
+    25731, 28608, 38553, 26689, 20625, [12107, 27424], 27770, 28500,
+    [12147, 31348], 32080, [12174, 34880], 35363, [12105, 26376], 20214, 20537,
+    20518, 20581, 20860, 21048, 21091, 21927, 22287, 22533, 23244, 24314,
+    25010, 25080, 25331, 25458, 26908, 27177, 29309, [12125, 29356], 29486,
+    30740, 30831, 32121, 30476, 32937, [12178, 35211], 35609, 36066, 36562,
+    36963, 37749, 38522, 38997, 39443, 40568, 20803, 21407, 21427, 24187,
+    24358, 28187, 28304, [12126, 29572], 29694, 32067, 33335, [12180, 35328],
+    35578, 38480, 20046, 20491, 21476, 21628, 22266, 22993, 23396,
+    [12080, 24049], 24235, 24359, [12094, 25144], 25925, 26543, 28246, 29392,
+    31946, 34996, 32929, 32993, 33776, [11969, 34382], 35463, 36328, 37431,
+    38599, 39015, [12238, 40723], 20116, 20114, 20237, 21320, 21577, 21566,
+    23087, 24460, 24481, 24735, 26791, 27278, 29786, 30849, 35486, 35492,
+    35703, 37264, 20062, 39881, 20132, 20348, 20399, 20505, 20502, 20809,
+    20844, 21151, 21177, 21246, 21402, [12061, 21475], 21521, 21518, 21897,
+    22353, 22434, 22909, 23380, 23389, 23439, [12079, 24037], 24039, 24055,
+    24184, 24195, 24218, 24247, 24344, 24658, 24908, 25239, 25304, 25511,
+    25915, 26114, 26179, 26356, 26477, 26657, 26775, 27083, 27743, 27946,
+    28009, 28207, 28317, 30002, 30343, 30828, 31295, 31968, 32005, 32024,
+    32094, 32177, 32789, 32771, 32943, 32945, 33108, 33167, 33322, 33618,
+    [12175, 34892], 34913, 35611, 36002, 36092, 37066, 37237, 37489, 30783,
+    37628, 38308, 38477, 38917, [12217, 39321], [12220, 39640], 40251, 21083,
+    21163, 21495, 21512, 22741, 25335, 28640, 35946, 36703, 40633, 20811,
+    21051, 21578, 22269, 31296, 37239, 40288, [12234, 40658], 29508, 28425,
+    33136, 29969, 24573, 24794, [12219, 39592], 29403, 36796, 27492, 38915,
+    20170, 22256, 22372, 22718, 23130, 24680, 25031, 26127, 26118, 26681,
+    26801, 28151, 30165, 32058, [12169, 33390], 39746, 20123, 20304, 21449,
+    21766, 23919, 24038, 24046, 26619, 27801, 29811, 30722, 35408, 37782,
+    35039, 22352, 24231, 25387, 20661, 20652, 20877, 26368, 21705, 22622,
+    22971, 23472, 24425, 25165, 25505, 26685, 27507, 28168, 28797, 37319,
+    29312, 30741, 30758, 31085, 25998, 32048, 33756, 35009, 36617, 38555,
+    21092, 22312, 26448, 32618, 36001, 20916, 22338, 38442, 22586, 27018,
+    32948, 21682, 23822, 22524, 30869, 40442, 20316, 21066, 21643, 25662,
+    26152, 26388, 26613, 31364, 31574, 32034, 37679, 26716, 39853, 31545,
+    21273, 20874, 21047, 23519, 25334, 25774, 25830, 26413, 27578, 34217,
+    38609, 30352, 39894, 25420, 37638, 39851, [12139, 30399], 26194, 19977,
+    20632, 21442, [12077, 23665], 24808, 25746, 25955, 26719, 29158, 29642,
+    29987, 31639, 32386, 34453, 35715, 36059, 37240, 39184, 26028, 26283,
+    27531, 20181, 20180, 20282, 20351, 21050, 21496, 21490, 21987, 22235,
+    [12064, 22763], 22987, 22985, 23039, [12070, 23376], 23629, 24066, 24107,
+    24535, 24605, 25351, [12096, 25903], 23388, 26031, 26045, 26088, 26525,
+    [12108, 27490], 27515, [12114, 27663], 29509, 31049, 31169, [12151, 31992],
+    32025, 32043, 32930, 33026, [12164, 33267], 35222, 35422, 35433, 35430,
+    35468, 35566, 36039, 36060, 38604, 39164, [12013, 27503], 20107, 20284,
+    20365, 20816, 23383, 23546, 24904, 25345, 26178, 27425, 28363, 27835,
+    29246, 29885, 30164, 30913, [12144, 31034], [12157, 32780], [12159, 32819],
+    [12163, 33258], 33940, 36766, 27728, [12229, 40575], 24335, 35672, 40235,
+    31482, 36600, 23437, 38635, 19971, 21489, 22519, 22833, 23241, 23460,
+    24713, 28287, 28422, 30142, 36074, 23455, 34048, 31712, 20594, 26612,
+    33437, 23649, 34122, 32286, 33294, 20889, 23556, 25448, 36198, 26012,
+    29038, 31038, 32023, 32773, 35613, [12190, 36554], 36974, 34503, 37034,
+    20511, 21242, 23610, 26451, 28796, 29237, 37196, 37320, 37675, 33509,
+    23490, 24369, 24825, 20027, 21462, 23432, [12095, 25163], 26417, 27530,
+    29417, 29664, 31278, 33131, 36259, 37202, [12216, 39318], 20754, 21463,
+    21610, 23551, 25480, 27193, 32172, 38656, 22234, 21454, 21608, 23447,
+    23601, 24030, 20462, 24833, 25342, 27954, 31168, 31179, 32066, 32333,
+    32722, 33261, [12168, 33311], 33936, 34886, 35186, 35728, 36468, 36655,
+    36913, 37195, 37228, 38598, 37276, 20160, 20303, 20805, [12055, 21313],
+    24467, 25102, 26580, 27713, 28171, 29539, 32294, 37325, 37507, 21460,
+    22809, 23487, 28113, 31069, 32302, 31899, 22654, 29087, 20986, 34899,
+    36848, 20426, 23803, 26149, 30636, 31459, 33308, 39423, 20934, 24490,
+    26092, 26991, 27529, 28147, 28310, 28516, 30462, 32020, 24033, 36981,
+    37255, 38918, 20966, 21021, 25152, 26257, 26329, 28186, 24246, 32210,
+    32626, 26360, 34223, 34295, 35576, 21161, 21465, [12069, 22899], 24207,
+    24464, 24661, 37604, 38500, 20663, 20767, 21213, 21280, 21319, 21484,
+    21736, 21830, 21809, 22039, 22888, 22974, 23100, 23477, 23558,
+    [12073, 23567], 23569, 23578, 24196, 24202, 24288, 24432, 25215, 25220,
+    25307, 25484, 25463, 26119, 26124, 26157, 26230, 26494, 26786, 27167,
+    27189, 27836, 28040, 28169, 28248, 28988, 28966, 29031, 30151, 30465,
+    30813, 30977, 31077, 31216, 31456, 31505, 31911, 32057, 32918, 33750,
+    33931, 34121, 34909, 35059, 35359, 35388, 35412, 35443, 35937, 36062,
+    37284, 37478, 37758, 37912, 38556, 38808, 19978, 19976, 19998, 20055,
+    20887, 21104, 22478, 22580, 22732, 23330, 24120, 24773, 25854, 26465,
+    26454, 27972, 29366, 30067, 31331, 33976, 35698, 37304, 37664, 22065,
+    22516, 39166, 25325, 26893, 27542, 29165, 32340, 32887, [12170, 33394],
+    35302, [12215, 39135], 34645, 36785, 23611, 20280, 20449, 20405, 21767,
+    23072, 23517, 23529, [12092, 24515], 24910, 25391, 26032, 26187, 26862,
+    27035, 28024, 28145, 30003, 30137, 30495, 31070, 31206, 32051,
+    [12162, 33251], 33455, 34218, 35242, 35386, [12189, 36523], [12191, 36763],
+    36914, 37341, 38663, [12040, 20154], 20161, 20995, 22645, 22764, 23563,
+    29978, 23613, 33102, 35338, 36805, 38499, 38765, 31525, 35535, 38920,
+    37218, 22259, 21416, 36887, 21561, 22402, 24101, 25512, [12116, 27700],
+    28810, 30561, 31883, 32736, 34928, 36930, 37204, 37648, 37656, 38543,
+    29790, 39620, 23815, 23913, 25968, 26530, 36264, 38619, 25454, 26441,
+    26905, 33733, 38935, 38592, 35070, 28548, 25722, [12072, 23544], 19990,
+    28716, 30045, 26159, 20932, 21046, 21218, 22995, 24449, 24615, 25104,
+    25919, 25972, 26143, 26228, 26866, 26646, 27491, 28165, 29298,
+    [12131, 29983], 30427, 31934, 32854, 22768, 35069, [11972, 35199], 35488,
+    35475, 35531, 36893, 37266, [11992, 38738], 38745, [12011, 25993], 31246,
+    33030, 38587, 24109, 24796, 25114, 26021, 26132, 26512, [12143, 30707],
+    31309, 31821, 32318, 33034, 36012, [12186, 36196], 36321, 36447, 30889,
+    20999, 25305, 25509, 25666, 25240, 35373, 31363, 31680, 35500, 38634,
+    32118, [12166, 33292], 34633, 20185, 20808, 21315, 21344, 23459, 23554,
+    23574, 24029, 25126, 25159, 25776, 26643, 26676, 27849, 27973, 27927,
+    26579, 28508, 29006, 29053, 26059, 31359, 31661, 32218, 32330, 32680,
+    33146, [12167, 33307], 33337, 34214, 35438, 36046, 36341, 36984, 36983,
+    37549, 37521, 38275, 39854, 21069, 21892, 28472, 28982, 20840, 31109,
+    32341, 33203, 31950, 22092, 22609, 23720, 25514, 26366, 26365, 26970,
+    29401, 30095, 30094, 30990, 31062, 31199, 31895, 32032, 32068, 34311,
+    35380, 38459, 36961, [12239, 40736], 20711, 21109, 21452, 21474, 20489,
+    21930, 22766, 22863, 29245, 23435, 23652, 21277, 24803, 24819, 25436,
+    25475, 25407, 25531, 25805, 26089, 26361, 24035, 27085, 27133, 28437,
+    29157, 20105, 30185, 30456, 31379, 31967, 32207, 32156, 32865, 33609,
+    33624, 33900, 33980, 34299, 35013, [12187, 36208], 36865, 36973, 37783,
+    38684, 39442, 20687, 22679, 24974, 33235, 34101, 36104, 36896, 20419,
+    20596, 21063, 21363, 24687, 25417, 26463, 28204, [12188, 36275], 36895,
+    20439, 23646, 36042, 26063, 32154, 21330, 34966, 20854, 25539, 23384,
+    23403, 23562, 25613, 26449, 36956, 20182, 22810, 22826, 27760, 35409,
+    21822, 22549, 22949, 24816, 25171, 26561, 33333, 26965, 38464, 39364,
+    39464, 20307, 22534, 23550, 32784, 23729, 24111, 24453, 24608, 24907,
+    25140, 26367, 27888, 28382, 32974, 33151, 33492, 34955, 36024, 36864,
+    36910, 38538, 40667, 39899, 20195, 21488, [12068, 22823], 31532, 37261,
+    38988, 40441, 28381, 28711, 21331, 21828, 23429, 25176, 25246, 25299,
+    27810, 28655, 29730, 35351, 37944, 28609, 35582, 33592, 20967, 34552,
+    21482, 21481, 20294, 36948, [12192, 36784], 22890, 33073, 24061, 31466,
+    36799, 26842, [12181, 35895], 29432, 40008, 27197, 35504, 20025, 21336,
+    22022, 22374, 25285, 25506, 26086, 27470, 28129, 28251, 28845, 30701,
+    31471, 31658, 32187, 32829, 32966, 34507, 35477, 37723, 22243, 22727,
+    24382, 26029, 26262, 27264, 27573, 30007, 35527, 20516, 30693, 22320,
+    24347, 24677, 26234, 27744, 30196, 31258, 32622, 33268, 34584, 36933,
+    39347, 31689, 30044, [12149, 31481], 31569, 33988, 36880, 31209, 31378,
+    33590, 23265, 30528, 20013, 20210, 23449, 24544, 25277, 26172, 26609,
+    27880, [12173, 34411], 34935, 35387, 37198, 37619, 39376, 27159, 28710,
+    29482, 33511, 33879, 36015, 19969, 20806, 20939, 21899, 23541, 24086,
+    24115, 24193, 24340, 24373, 24427, 24500, 25074, 25361, 26274, 26397,
+    28526, 29266, 30010, 30522, 32884, 33081, 33144, 34678, 35519, 35548,
+    36229, 36339, 37530, [11985, 12199, 38263], 38914, [12227, 40165], 21189,
+    25431, 30452, 26389, 27784, 29645, 36035, 37806, 38515, 27941, 22684,
+    26894, 27084, 36861, 37786, 30171, 36890, 22618, 26626, 25524, 27131,
+    20291, 28460, 26584, 36795, 34086, 32180, 37716, 26943, 28528, 22378,
+    22775, 23340, 32044, [12118, 29226], 21514, 37347, 40372, 20141, 20302,
+    20572, 20597, 21059, 35998, 21576, 22564, 23450, 24093, 24213, 24237,
+    24311, 24351, 24716, 25269, 25402, 25552, 26799, 27712, 30855, 31118,
+    31243, 32224, 33351, 35330, 35558, 36420, 36883, 37048, 37165, 37336,
+    [12237, 40718], 27877, 25688, 25826, 25973, 28404, 30340, 31515, 36969,
+    37841, 28346, 21746, 24505, 25764, 36685, 36845, 37444, 20856, 22635,
+    22825, 23637, 24215, 28155, 32399, 29980, 36028, 36578, 39003, 28857,
+    20253, 27583, 28593, [12133, 30000], 38651, 20814, 21520, 22581, 22615,
+    22956, 23648, 24466, [12099, 26007], 26460, 28193, 30331, 33759, 36077,
+    36884, 37117, 37709, 30757, 30778, 21162, 24230, [12063, 22303], 22900,
+    24594, 20498, 20826, 20908, 20941, [12049, 20992], 21776, 22612, 22616,
+    22871, 23445, 23798, 23947, 24764, 25237, 25645, 26481, 26691, 26812,
+    26847, 30423, 28120, 28271, 28059, 28783, 29128, 24403, 30168, 31095,
+    31561, 31572, 31570, 31958, 32113, 21040, 33891, 34153, 34276, 35342,
+    35588, [12182, 35910], 36367, 36867, 36879, 37913, 38518, 38957, 39472,
+    38360, 20685, 21205, 21516, 22530, 23566, 24999, 25758, 27934, 30643,
+    31461, 33012, 33796, 36947, 37509, 23776, 40199, 21311, 24471, 24499,
+    28060, 29305, 30563, 31167, 31716, 27602, 29420, 35501, 26627, 27233,
+    20984, 31361, 26932, 23626, 40182, 33515, 23493, [12195, 37193], 28702,
+    22136, 23663, 24775, 25958, 27788, 35930, 36929, 38931, 21585, 26311,
+    37389, 22856, 37027, 20869, 20045, 20970, 34201, 35598, 28760, 25466,
+    37707, 26978, 39348, 32260, 30071, 21335, 26976, 36575, 38627, 27741,
+    [12038, 20108], 23612, 24336, 36841, 21250, 36049, [12161, 32905], 34425,
+    24319, [12103, 26085], 20083, [12042, 20837], 22914, 23615, 38894, 20219,
+    22922, 24525, 35469, 28641, 31152, 31074, 23527, 33905, 29483, 29105,
+    24180, 24565, 25467, 25754, 29123, 31896, 20035, 24316, 20043, 22492,
+    22178, 24745, 28611, 32013, 33021, 33075, 33215, 36786, 35223, 34468,
+    24052, 25226, 25773, 35207, 26487, 27874, 27966, 29750, 30772, 23110,
+    32629, 33453, [12218, 39340], 20467, 24259, 25309, 25490, 25943, 26479,
+    30403, 29260, 32972, 32954, 36649, 37197, 20493, 22521, 23186, 26757,
+    26995, 29028, 29437, 36023, 22770, 36064, 38506, 36889, 34687, 31204,
+    30695, 33833, 20271, 21093, 21338, 25293, 26575, 27850, [12137, 30333],
+    31636, 31893, 33334, 34180, 36843, 26333, 28448, 29190, 32283, 33707,
+    39361, [12008, 40614], 20989, 31665, 30834, 31672, 32903, 31560, 27368,
+    24161, 32908, 30033, 30048, [12043, 20843], 37474, 28300, 30330, 37271,
+    39658, 20240, 32624, 25244, 31567, 38309, 40169, 22138, 22617, 34532,
+    38588, 20276, 21028, 21322, 21453, 21467, 24070, 25644, 26001, 26495,
+    27710, 27726, 29256, 29359, 29677, 30036, 32321, 33324, 34281, 36009,
+    31684, [12196, 37318], 29033, 38930, 39151, 25405, 26217, 30058, 30436,
+    30928, 34115, 34542, 21290, 21329, 21542, 22915, 24199, 24444, 24754,
+    25161, 25209, 25259, 26000, [12112, 27604], 27852, 30130, [12138, 30382],
+    30865, 31192, 32203, 32631, 32933, 34987, 35513, 36027, 36991,
+    [12206, 38750], [12214, 39131], 27147, 31800, 20633, 23614, 24494, 26503,
+    27608, 29749, 30473, 32654, [12240, 40763], 26570, 31255, 21305,
+    [12134, 30091], 39661, 24422, 33181, 33777, 32920, 24380, 24517, 30050,
+    31558, 36924, 26727, 23019, 23195, 32016, 30334, 35628, 20469, 24426,
+    27161, 27703, 28418, 29922, 31080, 34920, 35413, 35961, 24287, 25551,
+    30149, 31186, 33495, 37672, 37618, 33948, 34541, 39981, 21697, 24428,
+    25996, 27996, 28693, 36007, 36051, 38971, 25935, 29942, 19981, 20184,
+    22496, 22827, 23142, 23500, 20904, 24067, 24220, 24598, 25206, 25975,
+    26023, 26222, 28014, [12119, 29238], 31526, 33104, 33178, 33433, 35676,
+    36000, 36070, 36212, [12201, 38428], 38468, 20398, 25771, 27494, 33310,
+    33889, 34154, 37096, 23553, 26963, [12213, 39080], 33914, 34135, 20239,
+    21103, 24489, 24133, 26381, 31119, 33145, 35079, 35206, 28149, 24343,
+    25173, 27832, 20175, 29289, 39826, 20998, 21563, 22132, 22707, 24996,
+    25198, 28954, 22894, 31881, 31966, 32027, 38640, [12098, 25991], 32862,
+    19993, 20341, 20853, 22592, 24163, 24179, 24330, 26564, 20006, 34109,
+    38281, 38491, [12150, 31859], [12212, 38913], 20731, 22721, 30294, 30887,
+    21029, 30629, 34065, 31622, 20559, 22793, [12122, 29255], 31687, 32232,
+    36794, 36820, 36941, 20415, 21193, 23081, 24321, 38829, 20445, 33303,
+    37610, 22275, 25429, 27497, 29995, 35036, 36628, 31298, 21215, 22675,
+    24917, 25098, 26286, [11935, 27597], 31807, 33769, 20515, 20472, 21253,
+    21574, 22577, 22857, 23453, 23792, 23791, 23849, 24214, 25265, 25447,
+    25918, [12101, 26041], 26379, 27861, 27873, 28921, 30770, 32299, 32990,
+    33459, 33804, 34028, 34562, 35090, 35370, 35914, 37030, 37586, 39165,
+    40179, 40300, 20047, 20129, 20621, 21078, 22346, 22952, 24125,
+    {f: 2, c: 24536}, 25151, 26292, 26395, 26576, 26834, 20882, 32033, 32938,
+    33192, 35584, 35980, 36031, 37502, 38450, 21536, 38956, 21271, 20693,
+    [12056, 21340], 22696, 25778, 26420, 29287, 30566, 31302, 37350, 21187,
+    27809, 27526, 22528, 24140, 22868, 26412, 32763, 20961, 30406, 25705,
+    30952, 39764, [12231, 40635], 22475, 22969, 26151, 26522, 27598, 21737,
+    27097, 24149, 33180, 26517, 39850, 26622, 40018, 26717, 20134, 20451,
+    [12060, 21448], 25273, 26411, 27819, 36804, 20397, 32365, 40639, 19975,
+    24930, 28288, 28459, 34067, 21619, 26410, 39749, [11922, 24051], 31637,
+    23724, 23494, 34588, 28234, 34001, 31252, 33032, 22937, 31885,
+    [11936, 27665], 30496, 21209, 22818, 28961, 29279, [12141, 30683], 38695,
+    40289, 26891, 23167, 23064, 20901, 21517, 21629, 26126, 30431, 36855,
+    37528, 40180, 23018, 29277, 28357, 20813, 26825, 32191, 32236,
+    [12207, 38754], 40634, 25720, 27169, 33538, 22916, 23391, [12113, 27611],
+    29467, 30450, 32178, 32791, 33945, 20786, [12106, 26408], 40665,
+    [12140, 30446], 26466, 21247, 39173, 23588, 25147, 31870, 36016, 21839,
+    24758, 32011, [12200, 38272], 21249, 20063, 20918, 22812, 29242, 32822,
+    37326, 24357, [12142, 30690], 21380, 24441, 32004, 34220, 35379, 36493,
+    38742, 26611, 34222, 37971, 24841, 24840, 27833, 30290, 35565, 36664,
+    21807, 20305, 20778, 21191, 21451, 23461, 24189, 24736, 24962, 25558,
+    26377, 26586, 28263, 28044, {f: 2, c: 29494}, 30001, 31056, 35029, 35480,
+    36938, [12194, 37009], 37109, 38596, 34701, [12067, 22805], 20104, 20313,
+    19982, 35465, 36671, 38928, 20653, 24188, 22934, 23481, 24248, 25562,
+    25594, 25793, 26332, 26954, 27096, 27915, 28342, 29076, [12132, 29992],
+    31407, [12154, 32650], 32768, 33865, 33993, 35201, 35617, 36362, 36965,
+    38525, 39178, 24958, 25233, 27442, 27779, 28020, 32716, 32764, 28096,
+    32645, 34746, 35064, 26469, 33713, 38972, 38647, 27931, 32097, 33853,
+    37226, 20081, 21365, 23888, 27396, 28651, 34253, 34349, 35239, 21033,
+    21519, 23653, 26446, 26792, 29702, 29827, 30178, 35023, 35041,
+    [12197, 37324], 38626, 38520, 24459, 29575, [12148, 31435], 33870, 25504,
+    30053, 21129, 27969, 28316, 29705, 30041, 30827, 31890, 38534,
+    [12015, 31452], [12243, 40845], 20406, 24942, 26053, 34396, 20102, 20142,
+    20698, 20001, 20940, 23534, 26009, 26753, 28092, 29471, 30274, 30637,
+    31260, 31975, 33391, 35538, 36988, 37327, 38517, 38936, [12050, 21147],
+    32209, 20523, 21400, 26519, 28107, 29136, 29747, 33256, 36650, 38563,
+    40023, 40607, 29792, 22593, 28057, 32047, 39006, 20196, 20278, 20363,
+    20919, 21169, 23994, 24604, 29618, 31036, 33491, 37428, 38583, 38646,
+    38666, 40599, 40802, 26278, 27508, 21015, 21155, 28872, 35010, 24265,
+    24651, 24976, 28451, 29001, 31806, 32244, 32879, 34030, 36899, 37676,
+    21570, 39791, 27347, 28809, 36034, 36335, 38706, 21172, 23105, 24266,
+    24324, 26391, 27004, 27028, 28010, 28431, 29282, 29436, 31725,
+    [12156, 32769], 32894, 34635, 37070, 20845, 40595, 31108, 32907, 37682,
+    35542, 20525, 21644, 35441, 27498, 36036, 33031, 24785, 26528, 40434,
+    20121, 20120, 39952, 35435, 34241, 34152, 26880, 28286, 30871, 33109,
+    24332, 19984, 19989, 20010, 20017, [12034, 20022], 20028, [12035, 20031],
+    20034, 20054, 20056, 20098, [12037, 20101], 35947, 20106, 33298, 24333,
+    20110, {f: 2, c: 20126}, [12039, 20128], 20130, 20144, 20147, 20150, 20174,
+    20173, 20164, 20166, 20162, 20183, 20190, 20205, 20191, 20215, 20233,
+    20314, 20272, 20315, 20317, 20311, 20295, 20342, 20360, 20367, 20376,
+    20347, 20329, 20336, 20369, 20335, 20358, 20374, 20760, 20436, 20447,
+    20430, 20440, 20443, 20433, 20442, 20432, {f: 2, c: 20452}, 20506, 20520,
+    20500, 20522, 20517, 20485, 20252, 20470, 20513, 20521, 20524, 20478,
+    20463, 20497, 20486, 20547, 20551, 26371, 20565, 20560, 20552, 20570,
+    20566, 20588, 20600, 20608, 20634, 20613, 20660, 20658, {f: 2, c: 20681},
+    20659, 20674, 20694, 20702, 20709, 20717, 20707, 20718, 20729, 20725,
+    20745, {f: 2, c: 20737}, 20758, 20757, 20756, 20762, 20769, 20794, 20791,
+    20796, 20795, [12041, 20799], [11918, 20800], 20818, 20812, 20820, 20834,
+    31480, {f: 2, c: 20841}, 20846, 20864, [12044, 20866], 22232, 20876, 20873,
+    20879, 20881, 20883, 20885, [12045, 20886], 20900, 20902, 20898,
+    {f: 2, c: 20905}, [12046, 20907], 20915, {f: 2, c: 20913}, 20912, 20917,
+    20925, 20933, 20937, 20955, [12047, 20960], 34389, 20969, 20973, 20976,
+    [12048, 20981], 20990, 20996, 21003, 21012, 21006, 21031, 21034, 21038,
+    21043, 21049, 21071, 21060, {f: 2, c: 21067}, 21086, 21076, 21098, 21108,
+    21097, 21107, 21119, 21117, 21133, 21140, 21138, 21105, 21128, 21137,
+    36776, 36775, {f: 2, c: 21164}, 21180, 21173, 21185, 21197, 21207, 21214,
+    21219, 21222, 39149, 21216, 21235, 21237, 21240, [12051, 21241], 21254,
+    21256, 30008, 21261, 21264, 21263, [12052, 21269], [12053, 21274], 21283,
+    21295, 21297, 21299, [12054, 21304], 21312, 21318, 21317, 19991, 21321,
+    21325, 20950, 21342, [12057, 21353], 21358, 22808, 21371, 21367,
+    [12058, 21378], 21398, 21408, 21414, 21413, 21422, 21424, [12059, 21430],
+    21443, 31762, 38617, 21471, 26364, 29166, 21486, 21480, 21485, 21498,
+    21505, 21565, 21568, {f: 2, c: 21548}, 21564, 21550, 21558, 21545, 21533,
+    21582, 21647, 21621, 21646, 21599, 21617, 21623, 21616, 21650, 21627,
+    21632, 21622, 21636, 21648, 21638, 21703, 21666, 21688, 21669, 21676,
+    21700, 21704, 21672, 21675, 21698, 21668, 21694, 21692, 21720,
+    {f: 2, c: 21733}, 21775, 21780, 21757, 21742, 21741, 21754, 21730, 21817,
+    21824, 21859, 21836, 21806, 21852, 21829, {f: 2, c: 21846}, 21816, 21811,
+    21853, 21913, 21888, 21679, 21898, 21919, 21883, 21886, 21912, 21918,
+    21934, 21884, 21891, 21929, 21895, 21928, 21978, 21957, 21983, 21956,
+    21980, 21988, 21972, 22036, 22007, 22038, 22014, 22013, 22043, 22009,
+    22094, 22096, 29151, 22068, 22070, 22066, 22072, 22123, 22116, 22063,
+    22124, 22122, 22150, 22144, 22154, 22176, 22164, 22159, 22181, 22190,
+    22198, 22196, 22210, 22204, 22209, 22211, 22208, 22216, 22222, 22225,
+    22227, [12062, 22231], 22254, 22265, 22272, 22271, 22276, 22281, 22280,
+    22283, 22285, 22291, 22296, 22294, 21959, 22300, 22310, {f: 2, c: 22327},
+    22350, 22331, 22336, 22351, 22377, 22464, 22408, 22369, 22399, 22409,
+    22419, 22432, 22451, 22436, 22442, 22448, 22467, 22470, 22484,
+    {f: 2, c: 22482}, 22538, 22486, 22499, 22539, 22553, 22557, 22642, 22561,
+    22626, 22603, 22640, 27584, 22610, 22589, 22649, 22661, 22713, 22687,
+    22699, 22714, 22750, 22715, 22712, 22702, 22725, 22739, 22737, 22743,
+    22745, 22744, 22757, 22748, 22756, 22751, 22767, 22778, 22777,
+    {f: 3, c: 22779}, [12065, 22786], [12066, 22794], 22800, 22811, 26790,
+    22821, {f: 2, c: 22828}, 22834, 22840, 22846, 31442, 22869, 22864, 22862,
+    22874, 22872, 22882, 22880, 22887, 22892, 22889, 22904, 22913, 22941,
+    20318, 20395, 22947, 22962, 22982, 23016, 23004, 22925, {f: 2, c: 23001},
+    23077, 23071, 23057, 23068, 23049, 23066, 23104, 23148, 23113,
+    {f: 2, c: 23093}, 23138, 23146, 23194, 23228, 23230, 23243, 23234, 23229,
+    23267, 23255, 23270, 23273, 23254, {f: 2, c: 23290}, 23308, 23307, 23318,
+    23346, 23248, 23338, 23350, 23358, 23363, 23365, 23360, 23377, 23381,
+    {f: 2, c: 23386}, 23397, 23401, 23408, 23411, 23413, 23416, 25992, 23418,
+    [12071, 23424], 23427, 23462, 23480, 23491, 23495, 23497, 23508, 23504,
+    23524, 23526, 23522, 23518, 23525, 23531, 23536, 23542, 23539, 23557,
+    {f: 2, c: 23559}, 23565, 23571, 23584, [11920, 12074, 23586], 23592,
+    [12075, 23608], 23609, 23617, 23622, 23630, 23635, 23632, 23631, 23409,
+    23660, [12076, 23662], 20066, 23670, 23673, 23692, 23697, 23700, 22939,
+    23723, 23739, 23734, 23740, 23735, 23749, 23742, 23751, 23769, 23785,
+    23805, 23802, 23789, 23948, 23786, 23819, 23829, 23831, 23900, 23839,
+    23835, 23825, 23828, 23842, 23834, 23833, 23832, 23884, 23890, 23886,
+    23883, 23916, 23923, 23926, 23943, 23940, 23938, 23970, 23965, 23980,
+    23982, 23997, 23952, 23991, 23996, 24009, 24013, 24019, 24018, 24022,
+    [12078, 24027], 24043, 24050, 24053, 24075, 24090, 24089, 24081, 24091,
+    {f: 2, c: 24118}, 24132, 24131, 24128, 24142, 24151, 24148, 24159, 24162,
+    24164, 24135, {f: 2, c: 24181}, [11923, 12083, 24186], 40636,
+    [12084, 24191], 24224, {f: 2, c: 24257}, 24264, 24272, 24271, 24278, 24291,
+    24285, {f: 2, c: 24282}, 24290, 24289, {f: 2, c: 24296}, 24300, 24305,
+    24307, 24304, [12085, 24308], 24312, [12086, 24318], 24323, 24329, 24413,
+    24412, [12087, 24331], 24337, 24342, 24361, 24365, 24376, 24385, 24392,
+    24396, 24398, 24367, [11924, 24401], {f: 2, c: 24406}, 24409,
+    [12090, 24417], 24429, [12091, 24435], 24439, 24451, 24450, 24447, 24458,
+    24456, 24465, 24455, 24478, 24473, 24472, 24480, 24488, 24493, 24508,
+    24534, 24571, 24548, 24568, 24561, 24541, 24755, 24575, 24609, 24672,
+    24601, 24592, 24617, 24590, 24625, 24603, 24597, 24619, 24614, 24591,
+    24634, 24666, 24641, 24682, 24695, 24671, 24650, 24646, 24653, 24675,
+    24643, 24676, 24642, 24684, 24683, 24665, 24705, 24717, 24807, 24707,
+    24730, 24708, 24731, {f: 2, c: 24726}, 24722, 24743, 24715, 24801, 24760,
+    24800, 24787, 24756, 24560, 24765, 24774, 24757, 24792, 24909, 24853,
+    24838, {f: 2, c: 24822}, 24832, 24820, 24826, 24835, 24865, 24827, 24817,
+    {f: 2, c: 24845}, 24903, 24894, 24872, 24871, 24906, 24895, 24892, 24876,
+    24884, 24893, 24898, 24900, 24947, 24951, {f: 3, c: 24920}, 24939, 24948,
+    24943, 24933, 24945, 24927, 24925, 24915, 24949, 24985, 24982, 24967,
+    25004, 24980, 24986, 24970, 24977, 25003, 25006, 25036, 25034, 25033,
+    25079, 25032, 25027, 25030, 25018, 25035, 32633, 25037, 25062, 25059,
+    25078, 25082, 25076, 25087, 25085, 25084, 25086, 25088, [12093, 25096],
+    25097, 25101, 25100, 25108, 25115, 25118, 25121, 25130, 25134, 25136,
+    {f: 2, c: 25138}, 25153, 25166, 25182, 25187, 25179, 25184, 25192, 25212,
+    25218, 25225, 25214, {f: 2, c: 25234}, 25238, 25300, 25219, 25236, 25303,
+    25297, 25275, 25295, 25343, 25286, 25812, 25288, 25308, 25292, 25290,
+    25282, 25287, 25243, 25289, 25356, 25326, 25329, 25383, 25346, 25352,
+    25327, 25333, 25424, 25406, 25421, 25628, 25423, 25494, 25486, 25472,
+    25515, 25462, 25507, 25487, 25481, 25503, 25525, 25451, 25449, 25534,
+    25577, 25536, 25542, 25571, 25545, 25554, 25590, 25540, 25622, 25652,
+    25606, 25619, 25638, 25654, 25885, 25623, 25640, 25615, 25703, 25711,
+    25718, 25678, 25898, 25749, 25747, 25765, 25769, 25736, 25788, 25818,
+    25810, 25797, 25799, 25787, 25816, 25794, 25841, 25831, 33289,
+    {f: 2, c: 25824}, 25260, 25827, 25839, 25900, 25846, 25844, 25842, 25850,
+    25856, 25853, 25880, 25884, 25861, 25892, 25891, 25899, [12097, 25908],
+    [11929, 25909], 25911, 25910, 25912, 30027, 25928, 25942, 25941, 25933,
+    25944, 25950, 25949, 25970, 25976, {f: 2, c: 25986}, 35722, 26011, 26015,
+    26027, 26039, 26051, 26054, 26049, 26052, 26060, 26066, 26075, 26073,
+    [12102, 26080], [11931, 26081], 26097, 26482, 26122, 26115, 26107, 26483,
+    {f: 2, c: 26165}, 26164, 26140, 26191, 26180, 26185, 26177, 26206, 26205,
+    26212, {f: 2, c: 26215}, 26207, 26210, 26224, 26243, 26248, 26254, 26249,
+    26244, 26264, 26269, 26305, 26297, 26313, 26302, 26300, 26308, 26296,
+    26326, 26330, 26336, 26175, 26342, 26345, [12104, 26352], 26357, 26359,
+    26383, 26390, 26398, {f: 2, c: 26406}, 38712, 26414, 26431, 26422, 26433,
+    26424, 26423, 26438, 26462, 26464, 26457, {f: 2, c: 26467}, 26505, 26480,
+    26537, 26492, 26474, 26508, 26507, 26534, 26529, 26501, 26551, 26607,
+    26548, 26604, 26547, 26601, 26552, 26596, 26590, 26589, 26594, 26606,
+    26553, 26574, 26566, 26599, 27292, 26654, 26694, 26665, 26688, 26701,
+    26674, 26702, 26803, 26667, 26713, 26723, 26743, 26751, 26783, 26767,
+    26797, 26772, 26781, 26779, 26755, 27310, 26809, 26740, 26805, 26784,
+    26810, 26895, 26765, 26750, 26881, 26826, 26888, 26840, 26914, 26918,
+    26849, 26892, 26829, 26836, 26855, 26837, 26934, 26898, 26884, 26839,
+    26851, 26917, 26873, 26848, 26863, 26920, 26922, 26906, 26915, 26913,
+    26822, 27001, 26999, 26972, 27000, 26987, 26964, 27006, 26990, 26937,
+    26996, 26941, 26969, 26928, 26977, 26974, 26973, 27009, 26986, 27058,
+    27054, 27088, 27071, 27073, 27091, 27070, 27086, 23528, 27082, 27101,
+    27067, 27075, 27047, 27182, 27025, 27040, 27036, 27029, 27060, 27102,
+    27112, 27138, 27163, 27135, 27402, 27129, 27122, 27111, 27141, 27057,
+    27166, 27117, 27156, 27115, 27146, 27154, 27329, 27171, 27155, 27204,
+    27148, 27250, 27190, 27256, 27207, 27234, 27225, 27238, 27208, 27192,
+    27170, 27280, 27277, 27296, 27268, {f: 2, c: 27298}, 27287, 34327, 27323,
+    27331, 27330, 27320, 27315, 27308, 27358, 27345, 27359, 27306, 27354,
+    27370, 27387, 27397, 34326, 27386, 27410, 27414, 39729, 27423, 27448,
+    27447, 30428, 27449, 39150, 27463, 27459, 27465, 27472, 27481, 27476,
+    27483, 27487, 27489, 27512, [12109, 27513], {f: 2, c: 27519}, 27524, 27523,
+    27533, 27544, 27541, 27550, 27556, {f: 2, c: 27562}, 27567, 27570, 27569,
+    [12110, 27571], 27575, 27580, 27590, [12111, 27595], 27603, 27615, 27628,
+    27627, 27635, 27631, 40638, 27656, 27667, [12115, 27668], 27675, 27684,
+    27683, 27742, 27733, 27746, 27754, 27778, 27789, 27802, 27777, 27803,
+    27774, 27752, 27763, 27794, 27792, 27844, 27889, 27859, 27837, 27863,
+    27845, 27869, 27822, 27825, 27838, 27834, 27867, 27887, 27865, 27882,
+    27935, 34893, 27958, 27947, 27965, 27960, 27929, 27957, 27955, 27922,
+    27916, 28003, 28051, 28004, 27994, 28025, 27993, 28046, 28053, 28644,
+    28037, 28153, 28181, 28170, 28085, 28103, 28134, 28088, 28102, 28140,
+    28126, 28108, 28136, 28114, 28101, 28154, 28121, 28132, 28117, 28138,
+    28142, 28205, 28270, 28206, 28185, 28274, 28255, 28222, 28195, 28267,
+    28203, 28278, 28237, 28191, 28227, 28218, 28238, 28196, 28415, 28189,
+    28216, 28290, 28330, 28312, 28361, 28343, 28371, 28349, 28335, 28356,
+    28338, {f: 2, c: 28372}, 28303, 28325, 28354, 28319, 28481, 28433, 28748,
+    28396, 28408, 28414, 28479, 28402, 28465, 28399, 28466, 28364, 28478,
+    28435, 28407, 28550, 28538, 28536, 28545, 28544, 28527, 28507, 28659,
+    28525, 28546, 28540, 28504, 28558, 28561, 28610, 28518, 28595, 28579,
+    28577, 28580, 28601, 28614, 28586, 28639, 28629, 28652, 28628, 28632,
+    28657, 28654, 28635, 28681, 28683, 28666, 28689, 28673, 28687, 28670,
+    28699, 28698, 28532, 28701, 28696, 28703, 28720, 28734, 28722, 28753,
+    28771, 28825, 28818, 28847, 28913, 28844, 28856, 28851, 28846, 28895,
+    28875, 28893, 28889, 28937, 28925, 28956, 28953, 29029, 29013, 29064,
+    29030, 29026, 29004, 29014, 29036, 29071, 29179, 29060, 29077, 29096,
+    29100, 29143, 29113, 29118, 29138, 29129, 29140, 29134, 29152, 29164,
+    29159, 29173, 29180, 29177, 29183, 29197, 29200, 29211, 29224, 29229,
+    29228, 29232, 29234, [12120, 29243], 29244, [12121, 29247], 29248, 29254,
+    29259, 29272, 29300, 29310, 29314, 29313, 29319, 29330, 29334, 29346,
+    29351, 29369, 29362, 29379, 29382, 29380, 29390, 29394, 29410,
+    {f: 2, c: 29408}, 29433, 29431, 20495, 29463, 29450, 29468, 29462, 29469,
+    29492, 29487, 29481, 29477, 29502, {f: 2, c: 29518}, 40664, 29527, 29546,
+    29544, 29552, 29560, 29557, 29563, 29562, 29640, 29619, 29646, 29627,
+    29632, 29669, 29678, 29662, 29858, 29701, 29807, 29733, 29688, 29746,
+    29754, 29781, 29759, 29791, 29785, 29761, 29788, 29801, 29808, 29795,
+    29802, 29814, 29822, 29835, 29854, 29863, 29898, 29903, 29908, 29681,
+    29920, 29923, 29927, 29929, 29934, 29938, {f: 2, c: 29936}, 29944, 29943,
+    29956, 29955, 29957, 29964, 29966, 29965, 29973, 29971, 29982, 29990,
+    29996, 30012, 30020, 30029, 30026, 30025, 30043, 30022, 30042, 30057,
+    30052, 30055, 30059, 30061, 30072, 30070, {f: 2, c: 30086}, 30068, 30090,
+    30089, 30082, 30100, 30106, 30109, 30117, 30115, 30146, 30131, 30147,
+    30133, 30141, 30136, 30140, 30129, 30157, 30154, 30162, 30169, 30179,
+    30174, {f: 2, c: 30206}, 30204, 30209, 30192, 30202, {f: 2, c: 30194},
+    30219, 30221, 30217, 30239, 30247, {f: 3, c: 30240}, 30244, 30260, 30256,
+    30267, {f: 2, c: 30279}, 30278, 30300, 30296, {f: 2, c: 30305},
+    {f: 3, c: 30312}, 30311, 30316, 30320, 30322, [12136, 30326], 30328, 30332,
+    30336, 30339, 30344, 30347, 30350, 30358, 30355, {f: 2, c: 30361}, 30384,
+    30388, {f: 3, c: 30392}, 30402, 30413, 30422, 30418, 30430, 30433, 30437,
+    30439, 30442, 34351, 30459, 30472, 30471, 30468, 30505, 30500, 30494,
+    {f: 2, c: 30501}, 30491, {f: 2, c: 30519}, 30535, 30554, 30568, 30571,
+    30555, 30565, 30591, 30590, 30585, 30606, 30603, 30609, 30624, 30622,
+    30640, 30646, 30649, 30655, {f: 2, c: 30652}, 30651, 30663, 30669, 30679,
+    30682, 30684, 30691, 30702, 30716, 30732, 30738, 31014, 30752, 31018,
+    30789, 30862, 30836, 30854, 30844, 30874, 30860, 30883, 30901, 30890,
+    30895, 30929, 30918, 30923, 30932, 30910, 30908, 30917, 30922, 30956,
+    30951, 30938, 30973, 30964, 30983, 30994, 30993, 31001, 31020, 31019,
+    31040, 31072, 31063, 31071, 31066, 31061, 31059, 31098, 31103, 31114,
+    31133, 31143, 40779, 31146, 31150, 31155, {f: 2, c: 31161}, 31177, 31189,
+    31207, 31212, 31201, 31203, 31240, 31245, {f: 2, c: 31256}, 31264, 31263,
+    31104, 31281, 31291, 31294, 31287, 31299, 31319, 31305, {f: 2, c: 31329},
+    31337, 40861, 31344, 31353, 31357, 31368, 31383, 31381, 31384, 31382,
+    31401, 31432, 31408, 31414, 31429, 31428, 31423, 36995, 31431, 31434,
+    31437, 31439, 31445, 31443, {f: 2, c: 31449}, 31453, {f: 2, c: 31457},
+    31462, 31469, 31472, 31490, 31503, 31498, 31494, 31539, {f: 2, c: 31512},
+    31518, 31541, 31528, 31542, 31568, 31610, 31492, 31565, 31499, 31564,
+    31557, 31605, 31589, 31604, 31591, {f: 2, c: 31600}, 31596, 31598, 31645,
+    31640, 31647, 31629, 31644, 31642, 31627, 31634, 31631, 31581, 31641,
+    31691, 31681, 31692, 31695, 31668, 31686, 31709, 31721, 31761, 31764,
+    31718, 31717, 31840, 31744, 31751, 31763, 31731, 31735, 31767, 31757,
+    31734, 31779, 31783, 31786, 31775, 31799, 31787, 31805, 31820, 31811,
+    31828, 31823, 31808, 31824, 31832, 31839, 31844, 31830, 31845, 31852,
+    31861, 31875, 31888, 31908, 31917, 31906, 31915, 31905, 31912, 31923,
+    31922, 31921, 31918, 31929, 31933, 31936, 31941, 31938, 31960, 31954,
+    31964, 31970, 39739, 31983, 31986, 31988, 31990, 31994, 32006, 32002,
+    32028, 32021, 32010, 32069, 32075, 32046, 32050, 32063, 32053, 32070,
+    32115, 32086, 32078, 32114, 32104, 32110, 32079, 32099, 32147, 32137,
+    32091, 32143, 32125, 32155, 32186, 32174, 32163, 32181, 32199, 32189,
+    32171, 32317, 32162, 32175, 32220, 32184, 32159, 32176, 32216, 32221,
+    32228, 32222, 32251, 32242, 32225, 32261, 32266, 32291, 32289, 32274,
+    32305, 32287, 32265, 32267, 32290, 32326, 32358, 32315, 32309, 32313,
+    32323, 32311, 32306, 32314, 32359, 32349, 32342, 32350, {f: 2, c: 32345},
+    32377, 32362, 32361, 32380, 32379, 32387, 32213, 32381, 36782, 32383,
+    {f: 2, c: 32392}, 32396, 32402, 32400, {f: 2, c: 32403}, 32406, 32398,
+    {f: 2, c: 32411}, 32568, 32570, 32581, {f: 3, c: 32588}, 32592,
+    [12153, 32593], 32597, 32596, 32600, {f: 2, c: 32607}, {f: 2, c: 32616},
+    32615, 32632, 32642, 32646, 32643, 32648, 32647, 32652, 32660, 32670,
+    32669, 32666, 32675, 32687, 32690, 32697, 32686, 32694, 32696, 35697,
+    {f: 2, c: 32709}, 32714, 32725, 32724, 32737, 32742, 32745, 32755, 32761,
+    39132, 32774, 32772, 32779, [12158, 32786], {f: 2, c: 32792}, 32796, 32801,
+    32808, 32831, 32827, 32842, 32838, 32850, 32856, 32858, 32863, 32866,
+    32872, 32883, 32882, 32880, 32886, 32889, 32893, [12160, 32895], 32900,
+    32902, 32901, 32923, 32915, 32922, 32941, 20880, 32940, 32987, 32997,
+    32985, 32989, 32964, 32986, 32982, 33033, 33007, 33009, 33051, 33065,
+    33059, 33071, 33099, 38539, 33094, 33086, 33107, 33105, 33020, 33137,
+    33134, {f: 2, c: 33125}, 33140, 33155, 33160, 33162, 33152, 33154, 33184,
+    33173, 33188, 33187, 33119, 33171, 33193, 33200, 33205, 33214, 33208,
+    33213, 33216, 33218, 33210, 33225, 33229, 33233, 33241, 33240, 33224,
+    33242, {f: 2, c: 33247}, 33255, {f: 2, c: 33274}, 33278, {f: 2, c: 33281},
+    33285, 33287, 33290, 33293, 33296, 33302, 33321, 33323, 33336, 33331,
+    33344, 33369, 33368, 33373, 33370, 33375, 33380, 33378, 33384,
+    {f: 2, c: 33386}, 33326, 33393, 33399, [12171, 33400], 33406, 33421, 33426,
+    33451, 33439, 33467, 33452, 33505, 33507, 33503, 33490, 33524, 33523,
+    33530, 33683, 33539, 33531, 33529, 33502, 33542, 33500, 33545, 33497,
+    33589, 33588, 33558, 33586, 33585, 33600, 33593, 33616, 33605, 33583,
+    33579, {f: 2, c: 33559}, 33669, 33690, 33706, 33695, 33698, 33686, 33571,
+    33678, 33671, 33674, 33660, 33717, 33651, 33653, 33696, 33673, 33704,
+    33780, 33811, 33771, 33742, 33789, 33795, 33752, 33803, 33729, 33783,
+    33799, 33760, 33778, 33805, 33826, 33824, 33725, 33848, 34054, 33787,
+    33901, 33834, 33852, 34138, 33924, 33911, 33899, 33965, 33902, 33922,
+    33897, 33862, 33836, 33903, 33913, 33845, 33994, 33890, 33977, 33983,
+    33951, 34009, 33997, 33979, 34010, 34000, 33985, 33990, 34006, 33953,
+    34081, 34047, 34036, {f: 2, c: 34071}, 34092, 34079, 34069, 34068, 34044,
+    34112, 34147, 34136, 34120, 34113, 34306, 34123, 34133, 34176, 34212,
+    34184, 34193, 34186, 34216, 34157, 34196, 34203, 34282, 34183, 34204,
+    34167, 34174, 34192, 34249, 34234, 34255, 34233, 34256, 34261, 34269,
+    34277, 34268, 34297, 34314, 34323, 34315, 34302, 34298, 34310, 34338,
+    34330, 34352, 34367, [12172, 34381], 20053, 34388, 34399, 34407, 34417,
+    34451, 34467, {f: 2, c: 34473}, {f: 2, c: 34443}, 34486, 34479, 34500,
+    34502, 34480, 34505, 34851, 34475, 34516, 34526, 34537, 34540, 34527,
+    34523, 34543, 34578, 34566, 34568, 34560, 34563, 34555, 34577, 34569,
+    34573, 34553, 34570, 34612, 34623, 34615, 34619, 34597, 34601, 34586,
+    34656, 34655, 34680, 34636, 34638, 34676, 34647, 34664, 34670, 34649,
+    34643, 34659, 34666, 34821, 34722, 34719, 34690, 34735, 34763, 34749,
+    34752, 34768, 38614, 34731, 34756, 34739, 34759, 34758, 34747, 34799,
+    34802, 34784, 34831, 34829, 34814, {f: 2, c: 34806}, 34830, 34770, 34833,
+    34838, 34837, 34850, 34849, 34865, 34870, 34873, 34855, 34875, 34884,
+    34882, 34898, 34905, 34910, 34914, 34923, 34945, 34942, 34974, 34933,
+    34941, 34997, 34930, 34946, 34967, 34962, 34990, 34969, 34978, 34957,
+    34980, 34992, 35007, 34993, {f: 2, c: 35011}, 35028, {f: 2, c: 35032},
+    35037, 35065, 35074, 35068, 35060, 35048, 35058, 35076, 35084, 35082,
+    35091, 35139, 35102, 35109, {f: 2, c: 35114}, 35137, 35140, 35131, 35126,
+    35128, 35148, 35101, 35168, 35166, 35174, 35172, 35181, 35178, 35183,
+    35188, 35191, [12177, 35198], 35203, 35208, 35210, 35219, 35224, 35233,
+    35241, 35238, 35244, 35247, 35250, 35258, 35261, {f: 2, c: 35263}, 35290,
+    {f: 2, c: 35292}, 35303, 35316, 35320, 35331, 35350, 35344, 35340, 35355,
+    35357, 35365, 35382, 35393, 35419, 35410, 35398, 35400, 35452, 35437,
+    35436, 35426, 35461, 35458, 35460, 35496, 35489, 35473, {f: 2, c: 35493},
+    35482, 35491, 35524, 35533, 35522, 35546, 35563, 35571, 35559, 35556,
+    35569, 35604, 35552, 35554, 35575, 35550, 35547, 35596, 35591, 35610,
+    35553, 35606, 35600, 35607, 35616, 35635, 38827, 35622, 35627, 35646,
+    35624, 35649, 35660, 35663, 35662, 35657, 35670, 35675, 35674, 35691,
+    35679, 35692, 35695, 35700, 35709, 35712, 35724, 35726, {f: 2, c: 35730},
+    35734, {f: 2, c: 35737}, 35898, 35905, 35903, 35912, 35916, 35918, 35920,
+    [12183, 35925], 35938, 35948, [12184, 35960], 35962, 35970, 35977, 35973,
+    35978, {f: 2, c: 35981}, 35988, 35964, 35992, 25117, 36013, 36010, 36029,
+    {f: 2, c: 36018}, 36014, 36022, 36040, 36033, 36068, 36067, 36058, 36093,
+    {f: 2, c: 36090}, {f: 2, c: 36100}, 36106, 36103, 36111, 36109, 36112,
+    40782, 36115, 36045, 36116, 36118, 36199, 36205, 36209, 36211, 36225,
+    36249, 36290, 36286, 36282, 36303, 36314, 36310, 36300, 36315, 36299,
+    {f: 2, c: 36330}, 36319, 36323, 36348, {f: 2, c: 36360}, 36351,
+    {f: 2, c: 36381}, 36368, 36383, 36418, 36405, 36400, 36404, 36426, 36423,
+    36425, 36428, 36432, 36424, 36441, 36452, 36448, 36394, 36451, 36437,
+    36470, 36466, 36476, 36481, 36487, 36485, 36484, 36491, 36490, 36499,
+    36497, 36500, 36505, 36522, 36513, 36524, 36528, 36550, 36529, 36542,
+    36549, 36552, 36555, 36571, 36579, 36604, 36603, 36587, 36606, 36618,
+    36613, 36629, 36626, 36633, 36627, 36636, 36639, 36635, 36620, 36646,
+    36659, 36667, 36665, 36677, 36674, 36670, 36684, 36681, 36678, 36686,
+    36695, 36700, {f: 3, c: 36706}, 36764, 36767, 36771, 36781, 36783, 36791,
+    36826, 36837, 36834, 36842, 36847, 36999, 36852, 36869, {f: 2, c: 36857},
+    36881, 36885, 36897, 36877, 36894, 36886, 36875, 36903, 36918, 36917,
+    36921, 36856, {f: 4, c: 36943}, 36878, 36937, 36926, 36950, 36952, 36958,
+    36968, 36975, 36982, 38568, 36978, 36994, 36989, 36993, 36992, 37002,
+    37001, 37007, 37032, 37039, 37041, 37045, 37090, 37092, 25160, 37083,
+    37122, 37138, 37145, 37170, 37168, 37194, 37206, 37208, 37219, 37221,
+    37225, 37235, 37234, 37259, 37257, 37250, 37282, 37291, 37295, 37290,
+    37301, 37300, 37306, {f: 2, c: 37312}, 37321, 37323, 37328, 37334, 37343,
+    37345, 37339, 37372, {f: 2, c: 37365}, 37406, 37375, 37396, 37420, 37397,
+    37393, 37470, 37463, 37445, 37449, 37476, 37448, 37525, 37439, 37451,
+    37456, 37532, 37526, 37523, 37531, 37466, 37583, 37561, 37559, 37609,
+    37647, 37626, 37700, 37678, 37657, 37666, 37658, 37667, 37690, 37685,
+    37691, 37724, 37728, 37756, 37742, 37718, 37808, {f: 2, c: 37804}, 37780,
+    37817, {f: 2, c: 37846}, 37864, 37861, 37848, 37827, 37853, 37840, 37832,
+    37860, 37914, 37908, 37907, 37891, 37895, 37904, 37942, 37931, 37941,
+    37921, 37946, 37953, 37970, 37956, 37979, 37984, 37986, 37982, 37994,
+    37417, 38000, 38005, 38007, 38013, 37978, 38012, 38014, 38017, 38015,
+    38274, 38279, 38282, 38292, 38294, {f: 2, c: 38296}, 38304, 38312, 38311,
+    38317, 38332, 38331, 38329, 38334, 38346, 28662, 38339, 38349, 38348,
+    38357, 38356, 38358, 38364, 38369, 38373, 38370, 38433, 38440,
+    {f: 2, c: 38446}, 38466, 38476, 38479, 38475, 38519, 38492, 38494, 38493,
+    38495, 38502, 38514, 38508, 38541, 38552, 38549, 38551, 38570, 38567,
+    {f: 2, c: 38577}, 38576, 38580, [12202, 38582], 38584, [12203, 38585],
+    38606, 38603, 38601, 38605, 35149, 38620, 38669, 38613, 38649, 38660,
+    38662, 38664, 38675, 38670, 38673, 38671, 38678, 38681, 38692, 38698,
+    38704, 38713, {f: 2, c: 38717}, 38724, 38726, 38728, 38722, 38729, 38748,
+    38752, 38756, 38758, 38760, 21202, 38763, 38769, 38777, 38789, 38780,
+    38785, 38778, 38790, 38795, {f: 2, c: 38799}, 38812, 38824, 38822, 38819,
+    {f: 2, c: 38835}, 38851, 38854, 38856, [12209, 38859], 38876,
+    [12210, 38893], 40783, 38898, 31455, 38902, 38901, 38927, 38924, 38968,
+    38948, 38945, 38967, 38973, 38982, 38991, 38987, 39019, {f: 3, c: 39023},
+    39028, 39027, 39082, 39087, 39089, 39094, 39108, 39107, 39110, 39145,
+    39147, 39171, 39177, 39186, 39188, 39192, 39201, {f: 2, c: 39197}, 39204,
+    39200, 39212, 39214, {f: 2, c: 39229}, 39234, 39241, 39237, 39248, 39243,
+    {f: 2, c: 39249}, 39244, 39253, {f: 2, c: 39319}, 39333, {f: 2, c: 39341},
+    39356, 39391, 39387, 39389, 39384, 39377, {f: 2, c: 39405},
+    {f: 2, c: 39409}, 39419, 39416, 39425, 39439, 39429, 39394, 39449, 39467,
+    39479, 39493, 39490, 39488, 39491, 39486, 39509, 39501, 39515, 39511,
+    39519, 39522, 39525, 39524, 39529, 39531, 39530, 39597, 39600, 39612,
+    39616, 39631, 39633, {f: 2, c: 39635}, 39646, [12221, 39647],
+    {f: 2, c: 39650}, 39654, 39663, 39659, 39662, 39668, 39665, 39671, 39675,
+    39686, 39704, 39706, 39711, {f: 2, c: 39714}, [12222, 39717],
+    {f: 4, c: 39719}, 39726, [12223, 39727], [12224, 39730], 39748, 39747,
+    39759, {f: 2, c: 39757}, 39761, 39768, 39796, 39827, 39811, 39825,
+    {f: 2, c: 39830}, {f: 2, c: 39839}, 39848, 39860, 39872, 39882, 39865,
+    39878, 39887, {f: 2, c: 39889}, 39907, 39906, 39908, 39892, 39905, 39994,
+    39922, 39921, 39920, 39957, 39956, 39945, 39955, 39948, 39942, 39944,
+    39954, 39946, 39940, 39982, 39963, 39973, 39972, 39969, 39984, 40007,
+    39986, 40006, 39998, 40026, 40032, 40039, 40054, 40056, 40167, 40172,
+    40176, 40201, 40200, 40171, 40195, 40198, 40234, 40230, 40367, 40227,
+    40223, 40260, 40213, 40210, 40257, 40255, 40254, 40262, 40264,
+    {f: 2, c: 40285}, 40292, 40273, 40272, 40281, 40306, 40329, 40327, 40363,
+    40303, 40314, 40346, 40356, 40361, 40370, 40388, 40385, 40379, 40376,
+    40378, 40390, 40399, 40386, 40409, 40403, 40440, 40422, 40429, 40431,
+    40445, {f: 2, c: 40474}, 40478, [12228, 40565], 40569, 40573, 40577, 40584,
+    {f: 2, c: 40587}, 40594, 40597, 40593, 40605, [12230, 40613], 40617, 40632,
+    40618, 40621, 38753, 40652, {f: 3, c: 40654}, 40660, 40668, 40670, 40669,
+    40672, 40677, 40680, 40687, 40692, {f: 2, c: 40694}, [12235, 40697],
+    {f: 2, c: 40699}, [12236, 40701], {f: 2, c: 40711}, 30391, 40725, 40737,
+    40748, 40766, [12241, 40778], [12242, 40786], 40788, 40803,
+    {f: 3, c: 40799}, {f: 2, c: 40806}, 40812, 40810, 40823, 40818, 40822,
+    40853, [12244, 40860], [12245, 40864], 22575, 27079, 36953, 29796, 0,
+    {f: 76, c: 9472}, {f: 20, c: 9312}, {f: 10, c: 8544}, 13129, 13076, 0,
+    13133, 0, 13095, 0, 13110, 13137, 0, 13069, 13094, 0, 13099, 13130, 0,
+    {f: 3, c: 13212}, {f: 2, c: 13198}, 13252, 13217, 12317, 12319, 8470,
+    13261, 0, {f: 5, c: 12964}, {f: 2, c: 12849}, 12857, 13182, 13181, 13180,
+    8750, 8721, {s: 3}, 8735, 8895, 0, 0, 21854, {s: 7}, 167133, 0, 0, 28976,
+    0, 40407, {s: 4}, 64054, 0, 0, 22169, 15694, {s: 4}, 20448, 0, 0, 36544, 0,
+    194797, {s: 4}, 153716, 32363, 33606, 167670, {s: 3}, 40572, 0, 0, 26171,
+    0, 40628, {s: 4}, 26629, {s: 5}, 23650, 0, 194780, 0, 32353, 0, 0, 64070,
+    {s: 5}, 34083, 37292, {s: 7}, 34796, {s: 8}, 25620, 0, 0, 39506, {s: 4},
+    64074, 0, 194692, {s: 4}, 31774, {s: 6}, 64016, 25681, 0, 0, 63980, 22625,
+    39002, 0, 194679, {s: 3}, 31153, 0, 28678, {s: 9}, 22218, {s: 3}, 21085, 0,
+    28497, 37297, {s: 10}, 64106, {s: 6}, 38960, 0, 40629, {s: 9}, 33802,
+    63939, {f: 2, c: 63890}, 63897, 0, 34847, 194575, 0, 194771, 194584,
+    {s: 7}, 137754, 23643, {s: 4}, 25890, 0, 0, 26618, 0, 26766, 0, 148432,
+    194848, {s: 21}, 34110, {s: 15}, 30562, {s: 12}, 65075, 0,
+    {f: 2, c: 65073}, {s: 4}, 65072, {f: 2, c: 65077}, {f: 2, c: 65081}, 0, 0,
+    {f: 2, c: 65079}, {f: 2, c: 65087}, {f: 2, c: 65085}, {f: 4, c: 65089},
+    {f: 2, c: 65083}, {s: 41}, {f: 3, c: 12436}, 0, 0, 22099, {s: 41}, 65508,
+    65287, 65282, 0, 9665, 9655, 8681, 8679, 8678, 8680, 9634, 9831, 9825,
+    9828, 9826, 13216, 13218, {f: 2, c: 13220}, 13207, 8467, 13208, 13235,
+    13234, 13233, 13232, {f: 3, c: 13189}, 13259, 13200, 13268, 13206, 13090,
+    13078, 13080, 13077, 13059, 13091, 13143, 13122, 13113, 13115, 13056,
+    13105, 13127, 13086, 13098, 0, 13183, 8481, 9742, 12342, 12320, {s: 3},
+    {f: 9, c: 9352}, {f: 20, c: 9332}, 12881, {f: 10, c: 8560},
+    {f: 10, c: 12882}, {f: 26, c: 9372}, 12867, 12861, 12863, 12852, 12856,
+    12851, 12860, 12866, 12862, 12854, 12853, 12859, 12864, 12858, 12976,
+    12973, 12969, 12975, 12948, 12970, 12952, 12971, 12946, 12945, 12947,
+    12972, 12974, 12950, {s: 8}, {f: 3, c: 9131}, 0, {f: 3, c: 9127}, 0, 13260,
+    13061, 0, 0, 13215, 13219, 13222, 0, 0, 12958, {f: 2, c: 13192}, 13256,
+    8749, 0, 12848, {f: 6, c: 12842}, 12855, 12865, 10145, {s: 3}, 9673, 9824,
+    9829, 9827, 9830, {f: 4, c: 9728}, 9758, {f: 2, c: 9756}, 9759, 12953,
+    9450, {f: 2, c: 8554}, {s: 3}, {f: 8, c: 9601}, 9615, 9614, 9613, 9612,
+    9611, 9610, 9609, {f: 2, c: 9620}, {f: 2, c: 9581}, 9584, 9583, 9552, 9566,
+    9578, 9569, {f: 2, c: 9698}, 9701, 9700, 0, 0, {f: 3, c: 9585}, {s: 20},
+    20956, 29081, {f: 9, c: 10102}, {s: 3}, {f: 2, c: 8570}, {s: 3}, 8575,
+    8458, 8457, 0, 0, 12292, 8646, {f: 2, c: 8644}, 0, {f: 4, c: 12535}, 0, 0,
+    12957, {s: 3}, 13179, {s: 3}, 13107, 13134, {s: 30}, 32394, 35100, 37704,
+    37512, 34012, 20425, 28859, 26161, 26824, 37625, 26363, 24389,
+    [12033, 20008], 20193, 20220, 20224, 20227, 20281, 20310, 20370, 20362,
+    20378, 20372, 20429, 20544, 20514, 20479, 20510, 20550, 20592, 20546,
+    20628, 20724, 20696, 20810, 20836, 20893, 20926, 20972, 21013, 21148,
+    21158, 21184, 21211, 21248, 0, 21284, 21362, 21395, 21426, 21469, 64014,
+    21660, 21642, 21673, 21759, 21894, 22361, 22373, 22444, 22472, 22471,
+    64015, 0, 22686, 22706, 22795, 22867, 22875, 22877, 22883, 22948, 22970,
+    23382, 23488, 29999, 23512, 0, 23582, 23718, 23738, 23797, 23847, 23891, 0,
+    23874, 23917, {f: 2, c: 23992}, 24016, 24353, 24372, 24423, 24503, 24542,
+    24669, 24709, 24714, 24798, 24789, 24864, 24818, 24849, 24887, 24880,
+    24984, 25107, 25254, 25589, 25696, 25757, 25806, 25934, 26112, 26133,
+    26121, 26158, 0, 26148, 26213, 26199, 26201, 64018, 26227, 26265, 26272,
+    26290, 26303, 26362, 26382, 0, 26470, 26555, 26706, 26560, 0, 26692, 26831,
+    64019, 26984, 64020, 27032, 27106, 27184, 27243, 27206, 27251, 27262,
+    27362, 27364, 27606, 27711, 27740, 27782, 27759, 27866, 27908, 28039,
+    28015, 28054, 28076, 28111, 28152, 28146, 28156, 28217, 28252, 28199,
+    28220, 28351, 28552, 28597, 28661, 28677, 28679, 28712, 28805, 28843,
+    28943, 28932, 29020, {f: 2, c: 28998}, 0, 29121, 29182, 29361, 29374,
+    29476, 64022, 29559, 29629, 29641, 29654, 29667, 29650, 29703, 29685,
+    29734, 29738, 29737, 29742, 0, 29833, 29855, 29953, 30063, 30338, 30364,
+    30366, 30363, 30374, 64023, 30534, 21167, 30753, 30798, 30820, 30842,
+    31024, {f: 3, c: 64024}, 31124, 64027, 31131, 31441, 31463, 64028, 31467,
+    31646, 64029, 32072, 0, 32183, 32160, 32214, 32338, 32583, 32673, 64030,
+    33537, 33634, 33663, 33735, 33782, 33864, 33972, 34131, 34137, 34155,
+    64031, 34224, {f: 2, c: 64032}, 34823, 35061, 35346, 35383, 35449, 35495,
+    35518, 35551, 64034, 35574, 35667, 35711, 36080, 36084, 36114, 36214,
+    64035, 36559, 0, 64037, 36967, 37086, 64038, 37141, 37159, 37338, 37335,
+    37342, {f: 2, c: 37357}, {f: 2, c: 37348}, 37382, 37392, 37386, 37434,
+    37440, 37436, 37454, 37465, 37457, 37433, 37479, 37543, {f: 2, c: 37495},
+    37607, 37591, 37593, 37584, 64039, 37589, 37600, 37587, 37669, 37665,
+    37627, 64040, 37662, 37631, 37661, 37634, 37744, 37719, 37796, 37830,
+    37854, 37880, 37937, 37957, 37960, 38290, 0, 64041, 38557, 38575, 38707,
+    38715, 38723, 38733, 38735, [12205, 38737], 0, 38999, 39013,
+    {f: 2, c: 64042}, 39207, 64044, 39326, 39502, 39641, 39644, 39797, 39794,
+    39823, 39857, 39867, 39936, 40304, 40299, 64045, 40473, 40657, {s: 636},
+    8364, 8486, 0, 0, 64256, {f: 2, c: 64259}, 257, 299, 363, 275, 333, 256,
+    298, 362, 274, 332, {f: 4, c: 8539}, {f: 2, c: 8531}, 8304,
+    {f: 6, c: 8308}, {f: 10, c: 8320}, 461, 282, 0, 7868, 463, 0, 296, 465, 0,
+    467, 366, 360, 462, 283, 0, 7869, 464, 0, 297, 466, 0, 468, 367, 361, 593,
+    8049, 8048, 509, 0, 596, 0, 0, 601, 0, 0, 602, 0, 0, 603, 8051, 8050, 0,
+    331, 629, 652, 0, 0, 658, 643, 720, {s: 682}, {f: 10, c: 12832}, {s: 108},
+    {f: 4, c: 12892}, {f: 15, c: 12977}, {s: 50}, {f: 26, c: 9424},
+    {f: 26, c: 9398}, {s: 48}, {f: 47, c: 13008}, 0, {f: 10, c: 12928}, 12944,
+    {f: 6, c: 12938}, 0, 12959, {s: 6}, {f: 2, c: 12960}, 12955, 12954, 12963,
+    12962, 12951, 0, 12956, 12949, {s: 6}, 9676, {s: 11}, 10111,
+    {f: 10, c: 9451}, {s: 510}, 8414, {s: 815}, 13274, {s: 3}, 8448, 13250, 0,
+    0, 8453, 0, 13169, 0, 0, 13197, 13211, {s: 3}, {f: 2, c: 13271}, {s: 3},
+    {f: 2, c: 13057}, 13060, 13062, 0, 13064, 0, 13063, 13066, 0, 13065, 0,
+    13067, 0, 13068, {f: 6, c: 13070}, 0, 13079, 0, 13081, 0, {f: 4, c: 13082},
+    {f: 3, c: 13087}, 13092, 0, 13093, 0, 0, {f: 2, c: 13096}, 0, 13101, 0, 0,
+    {f: 3, c: 13102}, 13106, 0, 0, {f: 2, c: 13108}, 13116, {s: 3}, 13111, 0,
+    13112, 13114, 13117, 13121, {f: 3, c: 13118}, {f: 4, c: 13123}, 13128,
+    {f: 2, c: 13131}, {f: 2, c: 13135}, 0, 0, 13138, 13140, 0, 0, 13139,
+    {f: 2, c: 13141}, {s: 132}, 8501, 976, 8714, 8463, 0, 981, 987, 977, 0,
+    {f: 2, c: 9832}, 9836, {s: 5}, 12347, 0, {f: 3, c: 12339}, 8252, 8265,
+    {s: 5}, 8723, 0, 8771, {f: 2, c: 8818}, {s: 6}, {f: 2, c: 12312},
+    {f: 2, c: 65375}, {s: 10}, 9115, {f: 2, c: 9117}, 9120, {s: 4}, 9121,
+    {f: 2, c: 9123}, 9126, {s: 12}, [9116, 9119, 9122, 9125, 9130], {s: 8},
+    9986, 0, 0, 12349, 0, 12447, 0, 0, 8709, 8864, 8854, 8856, 8853, 8855,
+    {s: 4}, 9664, 9654, {s: 4}, 8656, 8596, {f: 2, c: 8600}, {f: 2, c: 8598},
+    8652, 8651, {s: 10}, 12336, 8967, {s: 8}, 10048, 10047, {s: 7}, 9643, 0,
+    9642, 0, 10010, {s: 12}, 9702, {s: 4}, 10070, {s: 379}, {f: 2, c: 65093},
+    {s: 679}, 64103, 64098, 32227, [12232, 40643], 28331, 64082, 64061, 64069,
+    64062, 27114, 28212, 64096, 64071, 64056, 64066, 64078, 34395, 64105,
+    64052, 64099, 25581, 25802, 30799, 64084, 63856, 64077, 64097, 64072,
+    64076, {f: 2, c: 64091}, 64081, 64067, 64090, 28041, 29376, 0, 194885,
+    64086, 64080, 64049, 64059, 24034, 64063, 64101, 21373, 64055, 64095,
+    24501, 64064, 0, 64083, 0, 64085, 64104, 64068, 64089, 26202, 64053, 64075,
+    64100, 64065, 64048, 0, 64057, 64051, 27493, 64058, 27599, 64050, 25150,
+    64079, 63773, 63964, 63798, 28122, 63952, 26310, 27511, 64087, 37706, 0,
+    37636, {s: 120}, 133390, {s: 120}, 35999, 11991, [11965, 158033], {s: 5},
+    37555, 38321, 0, 0, 194812, {s: 13}, 194965, {s: 8}, 194794, 0, 26478,
+    11974, 0, 194594, {s: 13}, 13314, 0, 0, 26083, {s: 4}, 134071, {s: 10},
+    171339, 0, 194611, 24378, {s: 8}, 11945, 0, 20465, {s: 7}, 63753, {s: 7},
+    11964, 0, 0, 194732, 26435, {s: 3}, 133732, 35329, 25142, 0, 0, 21555,
+    23067, {s: 3}, 25221, 0, 0, 194819, {s: 6}, 21567, {s: 9}, 27506, {s: 4},
+    29986, 19256, 0, 0, 24063, {s: 6}, 194827, 29626, 134047, {s: 3}, 194600,
+    0, 194849, {s: 5}, 194623, {s: 16}, 194675, {f: 2, c: 11916}, 23577,
+    {s: 3}, 131083, 23426, 194642, {s: 5}, 11997, [11999, 39136],
+    [11998, 169599], 14221, 0, [11927, 14586], 0, 194887, 0, [11909, 20155],
+    131490, {s: 7}, 13599, 0, 194738, 0, 0, [11971, 35200], {s: 4}, 31237,
+    {s: 4}, 35498, 0, 32085, 0, 28568, {s: 7}, 25591, 30246, {s: 4},
+    [11978, 163767], {s: 5}, 146686, {s: 5}, 13351, 0, 0, 33067, 0, 0, 194842,
+    {s: 5}, 11950, {s: 5}, 194714, {s: 3}, 194831, {s: 19}, 22305, 135741,
+    194586, 0, 64003, {s: 7}, 21534, 15240, 20839, {s: 4}, 63839, {s: 9},
+    20023, {s: 13}, [11946, 150804], 24421, 23020, 194658, 0, 24217, {s: 46},
+    13416, {s: 8}, 21200, {s: 9}, 26625, 0, 195024, 195039, {s: 5}, 153215, 0,
+    0, 11959, {s: 4}, 36534, 63775, {s: 3}, 63875, {s: 5}, 31867, 63906, 0,
+    63898, 0, [11961, 32770], 157360, {s: 4}, [11911, 132648], 0, 0, 131210,
+    194604, [11915, 13630], {s: 4}, 21589, 0, 22841, 0, 0, 23414, 194669,
+    23572, 14306, 23782, 0, 20040, 0, 0, 194742, {s: 4}, 158105, 25371, 0, 0,
+    26211, 0, 194779, 0, 0, 27126, 27014, {s: 3}, 27596, 0, 28183, 0, 0, 27818,
+    {s: 3}, [11942, 20012], 0, 0, 29935, 30069, 30188, 30286, 16305, 30570,
+    30633, {s: 6}, 31571, 0, 0, 16996, {s: 3}, 194924, 0, 0, 32328, {s: 5},
+    11955, {s: 4}, 33089, 17491, 0, [11966, 33401], [11967, 64094],
+    [11968, 64093], 0, 20857, 33626, {s: 3}, 17701, 0, 34292, 131248, {s: 4},
+    34429, 0, 13358, 35014, {s: 6}, 18406, {s: 8}, 36808, {s: 19}, 166279, 0,
+    0, 167447, 0, 0, 38969, {s: 6}, 39432, {s: 4}, 39903, {s: 10}, 148206,
+    {s: 5}, 21385, 0, 64017, 194785, 0, 146622, 132625, 0, {f: 2, c: 19972},
+    19999, 20011, {f: 2, c: 20015}, {f: 2, c: 20032}, 20036, [11907, 20058],
+    20095, 20109, 20118, 20153, 20176, 20192, 20221, 20223, 20235, 20245,
+    20320, 20283, 20297, 20308, 20346, {f: 2, c: 20349}, 20375, 20414, 20431,
+    20477, {f: 2, c: 20480}, 20496, 20507, 20519, 20526, 20567, 20582, 20586,
+    20539, 20623, 20630, 20636, 20684, 20710, 20713, 20719, 20744, 20747,
+    20752, 20763, 20766, 20831, 20897, 20924, 0, 20974, 20980, 20993,
+    [11913, 20994], 21011, 21065, 21089, 21094, 21139, 21192, 21232,
+    {f: 2, c: 21258}, 21310, 21324, 21323, 21345, 21356, 21419, 21466, 21478,
+    21493, 21543, 21581, 21606, 21611, 21620, 21645, 21654, 21665, 21677,
+    21689, 21695, 21702, 21709, 21774, 21803, 21813, 21834, 21856, 0, 21896,
+    21902, 22024, {f: 2, c: 22030}, 22071, 22079, 22089, 22091, 22095, 22118,
+    22121, 22127, {f: 2, c: 22129}, 22165, 22170, {f: 2, c: 22188}, 22193,
+    22217, 22237, 22244, 22282, 22293, 22307, 22319, {f: 2, c: 22323}, 22348,
+    22384, 22412, 22428, 22456, 22502, 22509, {f: 2, c: 22517}, 22527, 22537,
+    22560, 22578, 22652, 22656, 22697, 22734, 22736, 22740, 22746, 22761,
+    22796, 22820, 22831, 22881, 22893, 22986, 22994, 23005, {f: 2, c: 23011},
+    23044, 23052, 23075, 23111, 23125, 23139, 23149, 23166, 23198, 23207,
+    23212, 23219, 23264, 23296, 23321, 23333, 23341, 23361, 23420,
+    {f: 2, c: 23422}, 23434, [11919, 23587], 23595, 23600, 23651, 23657, 23676,
+    23755, 23762, 23796, 23844, 23846, 23875, 23878, 23882, 23954, 23956,
+    23961, 23968, 24024, 24032, 24056, 24064, 24082, {f: 2, c: 24084}, 24088,
+    24110, 24152, {f: 2, c: 24171}, 24232, 24234, {f: 2, c: 24254}, 0, 24274,
+    24327, 24334, {f: 2, c: 24348}, 24354, 24360, 24374, 24379, 24384,
+    [12089, 24400], 24408, 24420, 24457, 24476, 24487, 24484, 24495, 24504,
+    [11926, 24516], 24521, 24545, 24553, 24557, 24572, 24599, 24602, 24627,
+    24673, 24703, 24734, 24740, 24752, 24779, 24795, 24824, {f: 3, c: 24850},
+    24860, 24956, 24973, 24991, 25000, 25026, 25055, 25109, 25129, 25155,
+    25158, [11928, 25164], 25169, 25174, 25284, 25340, 25354, 25357, 25368,
+    25401, {f: 2, c: 25410}, 25445, 25460, 25469, 25476, 25479, 25488, 25502,
+    25553, 25564, 25609, 25616, 25634, 25684, 25691, 25709, 25723,
+    {f: 2, c: 25790}, 25829, 25847, 25851, 25860, 25878, 25881, 25927, 25959,
+    25985, 25989, 26050, 26096, 26098, 26156, 26188, {f: 2, c: 26203}, 26209,
+    26219, 0, 26276, 26312, 26348, 26373, 26387, 26419, 26440, 26444, 26486,
+    26491, 26544, 26546, 26617, 26583, 26585, 26608, 26668, {f: 2, c: 26672},
+    26715, 26738, 26741, 26746, 26756, 26789, 26802, 26832, 26838, 26856,
+    26861, {f: 2, c: 26864}, 26876, 26897, 26899, 26933, 26939, 26967, 26979,
+    26994, {f: 2, c: 27007}, 27046, 27053, 27063, {f: 2, c: 27094}, 27137,
+    27151, 27157, 27176, 27188, 27198, 27205, {f: 2, c: 27216}, 27222, 27227,
+    27267, 27273, 27281, {f: 3, c: 27293}, 27356, 27367, 27372, 27422, 27428,
+    27445, 27462, 27478, 27488, 27522, 27582, 27617, 27633, 27664, 27699,
+    [11937, 27701], 11938, 27737, 27766, 27771, 27781, 27797, 27804, 27856,
+    27860, 27862, 27872, {f: 2, c: 27883}, 27886, 27914, 27918, 27921, 27950,
+    27991, 27998, 28005, 28034, 28095, 28100, 28106, 28118, 28137, 28194,
+    28241, 28359, 28362, 28366, 28413, 28442, 28458, 28463, 28467, 28506,
+    28510, 28514, 28541, 28555, 28557, 28562, 28564, 28570, {f: 2, c: 28583},
+    28598, 28634, 28638, 0, 28729, 28732, 0, 28756, {f: 2, c: 28765}, 28772,
+    [11939, 28780], 28798, 28801, 28821, 28855, {f: 2, c: 28883}, 28888, 28892,
+    28935, 28960, 28977, 29002, 29010, 29024, 29049, 29074, 0, 29131, 29139,
+    29142, 29184, 29213, 29227, 29240, 29249, 29267, {f: 2, c: 29269}, 29276,
+    29325, [11944, 29357], 29364, 29383, 29435, {f: 2, c: 29444}, 29480, 29489,
+    29507, 29548, 29564, 29571, {f: 2, c: 29573}, 29589, {f: 3, c: 29598},
+    29606, 29611, 29621, 29623, 29628, 29647, 29657, 29673, 29684, 29693,
+    29700, 29706, {f: 2, c: 29722}, 29732, 29736, 29740, {f: 3, c: 29743},
+    29753, 29764, 29767, 29771, 29773, 29777, 29783, 29798, 29803, 29809,
+    29824, {f: 3, c: 29829}, 29840, 29848, 29852, 29856, 29859, 29864, 29867,
+    29877, 29887, 29896, 29914, 29918, 30030, 30073, 30081, 30096,
+    [12135, 30098], 30099, 30132, 30180, 30201, 30208, 30218, {f: 2, c: 30229},
+    30233, 30238, 30253, 30261, 30275, 30283, 30309, 30317, 30319, 30321,
+    30324, {f: 2, c: 30372}, 30405, 30412, 30444, 30460, 30516, 30518, 30556,
+    {f: 2, c: 30559}, 30578, 30589, 30613, 30634, 30694, 30704, 30708, 30726,
+    30754, {f: 2, c: 30765}, 30768, 30773, 30824, 30878, 30920, 30924, 30926,
+    30948, {f: 2, c: 30944}, 30962, 30967, 30971, 31025, 0, [11949, 31035],
+    31037, 31045, {f: 2, c: 31067}, 31115, 31126, 31128, [12145, 31160], 31163,
+    31178, 31194, 31235, 31241, 31249, 31262, 31277, 31289, 31301, 31308,
+    31325, 0, 31341, 31352, 31392, 31395, 31411, {f: 2, c: 31419}, 31430,
+    31495, 31508, 31527, 31537, 31559, 31566, 31584, 31593, 31597, 31602,
+    31633, 31663, 31703, 31705, 31755, 31759, 31776, 31782, 31793, 31798,
+    31825, 31833, 31847, 31854, 31856, 31932, 31935, {f: 2, c: 31944}, 31959,
+    31961, 31965, 31979, {f: 3, c: 32007}, 32019, 32029, 32035, 32065, 32083,
+    32089, 32093, 32122, 32134, {f: 2, c: 32139}, 32204, 32235, 32241, 32249,
+    32264, 32273, 32277, 32288, 32327, 32354, 32366, 32371, 32397, 32401,
+    32408, 32580, 32591, [11947, 11954, 32594], [11953, 32595], 32609, 32657,
+    32703, 32718, 32735, 32741, 32748, {f: 2, c: 32750}, 32762, 32782, 32785,
+    32788, 32804, 32806, 32826, 32828, 32864, 32881, 32885, 32926, 32934,
+    32939, {f: 2, c: 32983}, 33046, 33048, 33082, 33098, 33100, 33153, 33156,
+    33204, 33231, 33273, 33283, 33313, 33330, 33332, 33350, 33355, 33359,
+    33422, 33454, 33463, 33470, 33478, 33534, 33603, 33617, 33621, 33670,
+    33677, 33682, 33688, 33705, {f: 2, c: 33727}, 33770, 33807, 33809, 33866,
+    33910, 33960, 33967, 33984, 33986, 34032, 34045, 34060, 34100, 34142,
+    34191, 34231, 34254, 34221, 34322, 34345, 34386, 34403, 34412, 34415,
+    34426, 34445, 34449, 34456, {f: 2, c: 34471}, 34554, 34557, 34571, 34579,
+    34585, 34590, 34600, 34622, 34673, 34696, 34713, {f: 2, c: 34732}, 34741,
+    34774, 34795, 34797, 34817, 0, 34822, 34827, 34836, 34844, 34902, 34911,
+    [11970, 34916], 34968, 34986, {f: 2, c: 35005}, 35018, 35026, 35035,
+    {f: 2, c: 35056}, 35078, {f: 3, c: 35096}, 35111, 35120, 35134, 35195,
+    35284, 35286, 35301, 35313, 35335, 35343, 35349, 35362, 35406, 35455,
+    35572, 35615, 35639, {f: 2, c: 35651}, 35668, 35740, 35742, 35911, 35924,
+    35955, 36004, 36057, 36065, 36088, 36094, 36123, 36201, 36204, 36228,
+    36237, 36245, 36262, 36294, 36302, 36324, 36332, 36384, 36427, 36460,
+    36464, 36474, 36498, 36526, 36531, 36561, 36564, 36601, 36631, 36662,
+    36774, [12193, 36789], [11981, 36790], 0, 36832, 36836, 36854, 36866,
+    36908, 36932, 37000, 37013, 37017, 37019, 37026, 37044, 37079, 37085,
+    37108, 37143, 37148, 37169, 37178, 37181, 37192, 37211, 37217, 37220,
+    37262, 37278, 37288, {f: 2, c: 37293}, 37298, 37308, 37360, 37367, 37371,
+    37383, 37416, 37427, 37432, 37443, 37447, 37455, 37472, 37570,
+    {f: 2, c: 37579}, 37599, 37645, 37653, 37663, 37671, 37703, 37714, 0,
+    37738, 37741, 37787, 37818, 37801, 37825, 37834, 37858, 37882, 37885,
+    37903, 37940, 37951, 37973, 37995, 38002, [11986, 38264], 38310, 38313, 0,
+    38324, 38333, 38362, [11983, 11990, 38429], 38465, 38488, 38532, 38564,
+    38569, 38610, 195060, 38622, 38633, 38641, 38658, 38665, 38746, 38755,
+    38766, 38771, 38810, 38818, {f: 2, c: 38837}, 38873, 38878, 38900, 38922,
+    38926, 38942, 38947, 38955, 38974, {f: 2, c: 38994}, 39001, 39020, 39096,
+    39098, 39103, 39112, 39141, {f: 2, c: 39218}, 39232, 39245, 39260, 39263,
+    39345, {f: 2, c: 39353}, 39369, 39426, 39446, 39460, 39463,
+    {f: 2, c: 39469}, 39478, 39480, 39498, 39510, {f: 2, c: 39605}, 39673,
+    39683, 39712, {f: 2, c: 39731}, 39795, 39801, 39847, 39873, 39879, 39895,
+    39911, 39915, 39927, 39930, 39933, 39947, 39975, 39978, 39990, 40001,
+    40019, 40035, 40048, 40055, 40194, 40258, 40263, 40291, 40297, 40316,
+    40318, 40333, 40369, 40387, 40391, 40406, 40415, 40427, 40436, 40469,
+    40477, 40612, 40616, 40620, 40679, 40686, 40720, 40722, 40727, 40729,
+    40751, 40759, 40761, 40769, 40773, 40791, 40808, 40817, 40821, 40848,
+    40852, 40866, 0, 13317, 194564, 22048, 24267, 11925, 0, 144954, 0, 28665,
+    28390, 29107, [11940, 64073], {s: 4}, [11980, 64102], 0, 23986, 0, 20435,
+    20697, 20720, 20931, 22134, 27220, 27905, 28112, 28226, 28377, 29668,
+    29729, 30060, 30801, 34805, 144382, 29608, 15091, 13531, 17420, 16010, 0,
+    0, 19432, 0, 16090, 15138, 0, 17786, 16531, 0, 18021, 16643, 17043, 18094,
+    13448, 140809, {f: 3, c: 63584}, 63610, 63615, {s: 23}, {f: 2, c: 8836},
+    {f: 2, c: 8842}, 8713, 0, {f: 2, c: 8965}, {s: 9}, {f: 2, c: 8741},
+    {s: 14}, 8802, 0, 8773, 8776, {f: 2, c: 8822}, {s: 4}, 8487, {s: 209},
+    {f: 2, c: 8922}, 8533, 8984, {f: 2, c: 7742}, {f: 2, c: 504}, 470, 472,
+    474, 476, 260, 728, 317, 346, 350, 356, 377, 379, 261, 731, 318, 347, 711,
+    351, 357, 378, 733, 380, 340, 258, 313, 262, 268, 280, 270, 323, 327, 336,
+    344, 368, 354, 341, 259, 314, 263, 269, 281, 271, 273, 324, 328, 337, 345,
+    369, 355, 729, 264, 284, 292, 308, 348, 364, 265, 285, 293, 309, 349, 365,
+    625, 651, 638, 620, 622, 633, 648, 598, 627, 637, 642, 656, 635, 621, 607,
+    626, 669, 654, 609, 624, 641, 295, 661, 660, 614, 664, 450, 595, 599, 644,
+    608, 403, 616, 649, 600, 604, 606, 592, 623, 650, 612, 594, 653, 613, 674,
+    673, 597, 657, 634, 615, 865, 712, 716, 721, 8255, 783, {f: 5, c: 741}, 0,
+    0, 805, 812, 825, 796, {f: 2, c: 799}, 829, 809, 815, 734, 804, 816, 828,
+    820, {f: 2, c: 797}, {f: 2, c: 792}, 810, {f: 2, c: 826}, 794, {s: 3},
+    {f: 2, c: 610}, 618, 628, 630, 632, 640, 655, 665, 668, 671, 688, 690, 695,
+    704, {f: 2, c: 736}, {s: 6}, 8862, {s: 287}, 12348, 12543, 0,
+    {f: 2, c: 12310}, 9838, 9835, {f: 2, c: 10548}, 10687, 0, 12448, 0,
+    {f: 2, c: 10746}, {s: 13}, 962, {f: 10, c: 9461}, {f: 2, c: 9750}, 9649,
+    {f: 10, c: 12784}, 0, {f: 6, c: 12794}, {f: 15, c: 9150}, 0, 0, 10003, 0,
+    9251, 9166, {f: 4, c: 9680}, {f: 2, c: 8263}, 0, 8273, 8258,
+    {f: 16, c: 12688}, {s: 13}, {f: 2, c: 9136}, {f: 12, c: 9842},
+    {f: 2, c: 12441}, 8413, {s: 450}, 20296, 20319, 20330, 20332, 20494, 20504,
+    20545, 20722, 20688, 20742, 20739, 20789, 20821, 20823, 13493, 20938,
+    20962, 21079, 21196, 21206, 21243, 21276, 21347, 21405, 21522, 21631,
+    21640, 21840, 21889, 21933, 21966, 22075, 22174, 22185, 22195, 22391,
+    22396, 135963, 22479, 22500, 22628, 22665, 136302, 22738, 22752, 34369,
+    22923, 22930, 22979, 23059, 23143, 23159, 23172, 23236, 137405, 23421,
+    23443, 23570, 64060, 136884, 23674, 23695, 23711, 23715, 23722, 23760,
+    138804, 23821, 23879, 23937, 23972, 23975, 24011, 24158, 24313, 24320,
+    24322, 24355, 24381, 24404, 24445, 24589, 24596, 24600, 24629, 24647,
+    24733, 24788, 24797, 24875, 25020, 25017, 25122, 25178, 25199, 25302,
+    25468, 25573, 25721, 25796, 25808, 25897, 26013, 26170, 26146, 26155,
+    26160, 26163, 26184, 143812, {f: 2, c: 26231}, 26253, 26299, 26331, 26344,
+    26439, 26497, 26515, 26520, 26523, 26620, 26653, 26787, 26890, 26953,
+    144836, 26946, 26980, 27045, 27087, 15286, 15299, 27113, 27125, 145215,
+    27195, 145251, 27284, 27301, 15375, 27419, 27436, 27495, 27561, 27565,
+    27607, 27647, 27653, 27764, 27800, 27899, 27846, 27953, 27961, 27967,
+    27992, 28052, 28074, 28123, 28125, 28228, 28254, 28337, 28353, 28432,
+    28505, 28513, 28542, 28556, 28576, 28604, 28615, 28618, 28656, 28750,
+    28789, 28836, 28900, 28971, 28958, 28974, 29009, 29032, 29061, 29063,
+    29114, 29124, 29205, 15935, 29339, 149489, 29479, 29520, 29542, 29602,
+    29739, 29766, 29794, 29805, 29862, 29865, 29897, 29951, 29975, 16242,
+    30158, 30210, 30216, 30308, 30337, 30365, 30378, 30390, 30414, 30420,
+    30438, 30449, 30474, 30489, {f: 2, c: 30541}, 30586, 30592, 30612, 30688,
+    152718, 30787, 30830, 30896, 152846, 30893, 30976, 31004, 31022, 31028,
+    31046, 31097, 31176, 153457, 31188, 31198, 31211, 31213, 31365, 154052,
+    31438, 31485, 31506, 31533, 31547, 31599, 31745, 31795, 155041, 31853,
+    31865, 31887, 31892, 31904, 31957, 32049, 32092, 32131, 32166, 32194,
+    32296, 32663, 32731, 32821, 32823, 32970, 32992, 33011, 33120,
+    {f: 2, c: 33127}, 33133, 33211, 33226, 33239, 17499, 33376, 33396, 158463,
+    33441, {f: 2, c: 33443}, 33449, 33471, 33493, 33533, 33536, 33570, 33581,
+    33594, 33607, 33661, 33703, 33743, 33745, 33761, 33793, 33798, 33887,
+    33904, 33907, 33925, 33950, 33978, 159296, 34098, 34078, 34095, 34148,
+    34170, 34188, 34210, 34251, 34285, 34303, {f: 2, c: 34308}, 34320, 159988,
+    34328, 34360, 34391, 34402, 17821, 34421, 34488, 34556, 34695, 17898,
+    34826, 34832, 35022, 161412, 35122, 35129, 35136, 35220, 35318, 35399,
+    35421, 35425, 35445, 35536, 35654, 35673, 35689, 35741, 35913, 35944,
+    36271, 36305, 36311, 36387, 36413, 36475, 164471, 18500, 36602, 36638,
+    36653, 36692, 164813, 36840, 36846, 36872, 36909, 37015, 37043, 37054,
+    {f: 2, c: 37060}, 37063, 37103, 37140, 37142, {f: 2, c: 37154}, 37167,
+    37172, 37251, 37361, 37705, {f: 2, c: 37732}, 37795, 37855, 37892, 37939,
+    37962, 37987, 38001, 38286, 38303, 38316, 38326, 38347, 38352, 38355,
+    18864, 38366, 38565, 38639, 38734, 38805, 38830, 38842, 38849, 38857,
+    38875, 38998, 39143, 39256, 39427, 39617, 39619, 39630, 39638, 39682,
+    39688, 19479, 39725, 39774, 39782, 39812, 39818, 39838, 39886, 39909,
+    39928, 39971, {f: 2, c: 40015}, 40037, {f: 2, c: 40221}, 40259, 40274,
+    40330, 40342, 40384, 40364, 40380, 172432, 40423, 40455, 40606, 40623,
+    40855, 131209, 19970, 19983, 19986, 20009, 20014, 20039, 131234, 20049,
+    13318, 131236, 20073, 20125, 13356, 20156, 20163, 20168, 20203, 20186,
+    20209, 20213, 20246, 20324, 20279, 20286, 20312, 131603, {f: 2, c: 20343},
+    20354, 20357, 20454, 20402, 20421, 20427, 20434, 13418, 20466, 20499,
+    20508, 20558, 20563, 20579, 20643, 20616, {f: 2, c: 20626}, 20629, 20650,
+    131883, 20657, {f: 2, c: 20666}, 20676, 20679, 20723, 131969, 20686,
+    131953, 20692, 20705, 13458, 132089, 20759, 132170, 20832, 132361, 20851,
+    20867, 20875, 13500, 20888, 20899, 20909, 13511, 132566, 20979, 21010,
+    21014, 132943, 21077, 21084, 21100, 21111, 21124, 21122, 133127, 21144,
+    133178, 21156, {f: 2, c: 21178}, 21194, 21201, 133305, 21239, 21301, 21314,
+    133500, 133533, 21351, 21370, 21412, 21428, 133843, 21431, 21440, 133917,
+    {f: 2, c: 13661}, 21461, 13667, 21492, 21540, 21544, 13678, 21571, 21602,
+    21612, 21653, 21664, 21670, 21678, 21687, 21690, 21699, 134469, 21740,
+    21743, 21745, 21747, {f: 2, c: 21760}, 21769, 21820, 21825, 13734, 21831,
+    13736, 21860, 134625, 21885, 21890, 21905, 13765, 21970, 134805, 134765,
+    21951, 21961, 21964, 21969, 21981, 13786, 21986, 134756, 21993, 22056,
+    135007, 22023, 22032, 22064, 13812, 22077, 22080, 22087, 22110, 22112,
+    22125, 13829, 22152, 22156, 22173, 22184, 22194, 22213, 22221, 22239,
+    22248, {f: 2, c: 22262}, 135681, 135765, 22313, 135803, {f: 2, c: 22341},
+    22349, 135796, 22376, 22383, {f: 3, c: 22387}, 22395, 135908, 135895,
+    22426, {f: 2, c: 22429}, 22440, 22487, 135933, 22476, 135990, 136004,
+    22494, 22512, 13898, 22520, 22523, 22525, 22532, 22558, 22567, 22585,
+    136132, 22601, 22604, 22631, {f: 2, c: 22666}, 22669, {f: 2, c: 22671},
+    22676, 22685, 22698, 22705, 136301, 22723, 22733, 22754, {f: 2, c: 22771},
+    {f: 2, c: 22789}, 22797, 22804, 136663, 13969, 22845, 13977, 22854, 13974,
+    158761, 22879, 136775, {f: 2, c: 22901}, 22908, 22943, 22958, 22972, 22984,
+    22989, 23006, 23015, 23022, 136966, 137026, 14031, 23053, 23063, 23079,
+    23085, 23141, 23162, 23179, 23196, {f: 2, c: 23199}, 23202, 23217, 23221,
+    23226, 23231, 23258, 23260, 23269, 23280, 23278, 23285, 23304, 23319,
+    23348, 23372, 23378, 23400, 23407, 23425, 23428, 137667, 23446, 23468,
+    {f: 2, c: 14177}, 23502, 23510, 14188, 14187, 23537, 23549, 14197, 23555,
+    23593, 138326, 23647, {f: 2, c: 23655}, 23664, 138541, 138565, 138616,
+    138594, 23688, 23690, 14273, 138657, 138652, 23712, 23714, 23719, 138642,
+    23725, 23733, 138679, 23753, 138720, 138803, 23814, 23824, 23851, 23837,
+    23840, 23857, 23865, 14312, 23905, 23914, 14324, 23920, 139038, 14333,
+    23944, 14336, 23959, 23984, 23988, 139126, 24017, 24023, 139258, 24036,
+    24041, 14383, 14390, 14400, 24095, 24126, 24137, 14428, 24150, 14433,
+    {f: 2, c: 24173}, 139643, 24229, 24236, 24249, 24262, 24281, 140062, 24317,
+    24328, 140205, 24350, 24391, 24419, 24434, 24446, 24463, 24482, 24519,
+    24523, {f: 3, c: 24530}, 24546, {f: 2, c: 24558}, 24563, 14615, 24610,
+    24612, 14618, 24652, 24725, 24744, 141043, 24753, 24766, 24776, 24793,
+    24814, 24821, 24848, 24857, 24862, 24890, 14703, 24897, 24902, 24928,
+    141403, {f: 2, c: 24978}, 24983, 24997, 25005, 141483, 25045, 25053, 25077,
+    141711, 25123, 25170, 25185, 25188, 25211, 25197, 25203, 25241, 25301,
+    142008, 25341, 25347, 25360, {f: 2, c: 142159}, 25394, 25397,
+    {f: 2, c: 25403}, 25409, 25412, 25422, 142150, 25433, 142365, 142246,
+    25452, 25497, 142372, 25492, 25533, {f: 2, c: 25556}, 25568,
+    {f: 2, c: 25579}, 25586, 25630, 25637, 25641, 25647, 25690, 25693, 25715,
+    25725, 25735, 25745, 25759, {f: 2, c: 25803}, 25813, 25815, 142817, 25828,
+    25855, 14958, 25871, 25876, 14963, 25886, 25906, 25924, 25940, 25963,
+    25978, 25988, 25994, 26034, 26037, 26040, 26047, 26057, 26068, 15062,
+    26105, 26108, 26116, 26120, 26145, 26154, 26181, 26193, 26190, 15082,
+    143811, 143861, 143798, 26218, {f: 2, c: 26220}, 26235, 26240, 26256,
+    26258, 15118, 26285, 26289, 26293, 15130, 15132, 15063, 26369, 26386,
+    144242, 26393, 144339, 144338, 26445, 26452, 26461, 144336, 144356, 144341,
+    26484, 144346, 26514, 144351, 33635, 26640, 26563, 26568, 26578, 26587,
+    26615, 144458, 144465, 144459, 26648, 26655, 26669, 144485, 26675, 26683,
+    26686, 26693, 26697, 26700, 26709, 26711, 15223, 26731, 26734, 26748,
+    26754, 26768, 26774, 15213, {f: 3, c: 26776}, 26780, {f: 2, c: 26794},
+    26804, 26811, 26875, 144612, 144730, 26819, 26821, 26828, 26841,
+    {f: 2, c: 26852}, 26860, 26871, 26883, 26887, 15239, 144788, 15245, 26950,
+    26985, 26988, 27002, 27026, 15268, 27030, 27056, 27066, 27068, 27072,
+    27089, 144953, 144967, 144952, 27107, {f: 2, c: 27118}, 27123, 15309,
+    27124, 27134, 27153, 27162, 27165, 145180, {f: 2, c: 27186}, 27199, 27209,
+    27258, 27214, 27218, 27236, 145164, 27275, 15344, 27297, 145252, 27307,
+    27325, 27334, 27348, 27344, 27357, 145407, 145383, {f: 3, c: 27377}, 27389,
+    145444, 27403, {f: 3, c: 27407}, 145469, 27415, 15398, 27439, 27466, 27480,
+    27500, 27509, [11934, 27514], 27521, 27547, 27566, 146072, 27581,
+    {f: 3, c: 27591}, 27610, {f: 2, c: 27622}, 27630, 27650, 27658, 27662,
+    27702, 146559, 27725, 27739, 27757, 27780, 27785, 15555, 27796, 27799,
+    27821, 27842, 15570, 27868, 27881, 27885, 146688, 27904, 27940,
+    {f: 2, c: 27942}, 27751, 27951, 27964, 27995, 28000, 28016,
+    {f: 2, c: 28032}, 28042, 28045, 28049, 28056, 146752, 146938, 146937,
+    146899, 28075, 28078, 28084, 28098, 27956, 28104, 28110, 28127, 28150,
+    28214, 28190, 15633, 28210, {f: 2, c: 28232}, {f: 2, c: 28235}, 28239,
+    {f: 2, c: 28243}, 28247, 28259, 15646, 28307, 28327, 28340, 28355, 28469,
+    28395, 28409, 28411, 28426, 28428, 28440, 28453, 28470, 28476, 147326,
+    28498, 28503, 28512, 28520, 28560, 28566, 28606, 28575, 28581, 28591,
+    15716, {f: 2, c: 28616}, 28649, 147606, 28668, 28672, 28682, 28707, 147715,
+    28730, 28739, 28743, 28747, 15770, 28773, 28777, 28782, 28790, 28806,
+    28823, 147910, 28831, 28849, 147966, 28908, 28874, 28881, 28931, 28934,
+    28936, 28940, 15808, 28975, 29008, 29011, 29022, 15828, 29078, 29056,
+    29083, 29088, 29090, {f: 2, c: 29102}, 148412, 29145, 29148, 29191, 15877,
+    29236, 29241, 29250, 29271, 29283, 149033, {f: 2, c: 29294}, 29304, 29311,
+    29326, 149157, 29358, 29360, 29377, 15968, 29388, 15974, 15976, 29427,
+    29434, 29447, 29458, {f: 2, c: 29464}, 16003, 29497, 29484, 29491, 29501,
+    29522, 16020, 29547, 149654, {f: 2, c: 29550}, 29553, 29569, 29578, 29588,
+    29592, 29596, 29605, 29625, 29631, 29637, 29643, 29665, 29671, 29689,
+    29715, 29690, 29697, 29779, 29760, 29763, 29778, 29789, 29825, 29832,
+    150093, 29842, 29847, 29849, 29857, 29861, 29866, 29881, 29883, 29882,
+    29910, 29912, 29931, 150358, 29946, 150383, 29984, 29988, 29994, 16215,
+    150550, {f: 2, c: 30013}, 30016, 30024, 30032, 30034, 30066, 30065, 30074,
+    {f: 2, c: 30077}, 30092, 16245, 30114, 16247, 30128, 30135,
+    {f: 2, c: 30143}, 30150, 30159, 30163, 30173, {f: 2, c: 30175}, 30183,
+    30190, 30193, 30211, 30232, 30215, 30223, 16302, 151054, 30227,
+    {f: 2, c: 30235}, 151095, 30245, 30248, 30268, 30259, 151146, 16329, 30273,
+    151179, 30281, 30293, 16343, 30318, 30357, 30369, 30368, {f: 2, c: 30375},
+    30383, 151626, 30409, 151637, 30440, 151842, 30487, 30490, 30509, 30517,
+    151977, 16441, 152037, 152013, 30552, 152094, 30588, 152140, 16472, 30618,
+    30623, 30626, 30628, {f: 2, c: 30686}, 30692, 30698, 30700, 30715, 152622,
+    30725, 30729, 30733, 30745, 30764, 30791, 30826, 152793, 30858, 30868,
+    30884, 30877, 30879, 30907, 30933, 30950, {f: 2, c: 30969}, 30974, 152999,
+    30992, 31003, 31013, 31050, 31064, 16645, 31079, 31090, 31125, 31137,
+    31145, 31156, 31170, 31175, {f: 2, c: 31180}, 31190, 16712, 153513, 153524,
+    16719, 31242, 31253, 31259, 16739, 31288, 31303, 31318, 31321, 31324,
+    31327, 31335, 31338, 31349, 31362, 31370, 31376, 31404, 154068, 16820,
+    31417, 31422, 16831, 31436, 31464, 31476, 154340, 154339, 154353, 31549,
+    31530, {f: 2, c: 31534}, 16870, 16883, 31615, 31553, 16878, 31573, 31609,
+    31588, 31590, 31603, 154546, 16903, 31632, 31643, 16910, 31669, 31676,
+    31685, 31690, 154699, 154724, 31700, 31702, 31706, 31722, 31728, 31747,
+    31758, 31813, 31818, 31831, 31838, 31841, 31849, 31855, 155182, 155222,
+    155237, 31910, 155234, {f: 2, c: 31926}, 155352, 31940, 155330, 31949,
+    155368, 155427, 31974, 155484, 31989, 32003, 17094, 32018, 32030, 155616,
+    155604, {f: 2, c: 32061}, 32064, 32071, 155660, 155643, 17110, 32090,
+    32106, 32112, 17117, 32127, 155671, 32136, 32151, 155744, 32157, 32167,
+    32170, 32182, 32192, 32215, 32217, 32230, 17154, 155885, 64088, 32272,
+    32279, 32285, 32295, 32300, 32325, 32373, 32382, {f: 2, c: 32390}, 17195,
+    32410, 17219, 32572, 32571, 32574, 32579, 13505, 156272, 156294,
+    {f: 2, c: 32611}, 32621, {f: 2, c: 32637}, 32656, 20859, 146702, 32662,
+    32668, 32685, 156674, 32707, 32719, 32739, 32754, 32778, 32776, 32790,
+    32812, 32816, 32835, 32870, 32891, 32921, 32924, 32932, 32935, 32952,
+    157310, 32965, 32981, 32998, 33037, 33013, 33019, 17390, 33077, 33054,
+    17392, 33060, 33063, 33068, 157469, 33085, 17416, 33129, 17431, 17436,
+    33157, 17442, 33176, 33202, 33217, 33219, 33238, 33243, 157917, 33252,
+    157930, 33260, 33277, 33279, 158063, 33284, 158173, 33305, 33314, 158238,
+    33340, 33353, 33349, 158296, 17526, 17530, 33367, 158348, 33372, 33379,
+    158391, 17553, 33405, 33407, 33411, 33418, 33427, {f: 2, c: 33447}, 33458,
+    33460, 33466, 33468, 33506, 33512, 33527, {f: 2, c: 33543}, 33548, 33620,
+    33563, 33565, 33584, 33596, 33604, 33623, 17598, 17620, 17587,
+    {f: 2, c: 33684}, 33691, 33693, 33737, 33744, 33748, 33757, 33765, 33785,
+    33813, 158835, 33815, 33849, 33871, {f: 2, c: 33873}, {f: 2, c: 33881},
+    33884, 158941, 33893, 33912, 33916, 33921, 17677, 33943, 33958, 33982,
+    17672, {f: 2, c: 33998}, 34003, 159333, 34023, 34026, 34031, 34033, 34042,
+    34075, {f: 2, c: 34084}, 34091, 34127, 34159, 17731, 34129,
+    {f: 2, c: 34145}, 159636, 34171, 34173, 34175, 34177, 34182, 34195, 34205,
+    34207, 159736, {f: 2, c: 159734}, 34236, 34247, 34250, {f: 2, c: 34264},
+    34271, 34273, 34278, 34294, 34304, 34321, 34334, 34337, 34340, 34343,
+    160013, 34361, 34364, 160057, 34368, 34387, 34390, 34423, 34439, 34441,
+    {f: 2, c: 34460}, 34481, 34483, 34497, 34499, 34513, 34517, 34519, 34531,
+    34534, 17848, 34565, 34567, 34574, 34576, 34591, 34593, 34595, 34609,
+    34618, 34624, 34627, 34641, 34648, {f: 2, c: 34660}, 34674, 34684, 160731,
+    160730, 34727, 34697, 34699, 34707, 34720, 160766, 17893, 34750, 160784,
+    34753, 34766, 34783, 160841, 34787, {f: 2, c: 34789}, 34794, 34835, 34856,
+    34862, 34866, 34876, 17935, 34890, 34904, 161301, 161300, 34921, 161329,
+    34927, 34976, 35004, 35008, 161427, 35025, 35027, 17985, 35073, 161550,
+    35127, 161571, 35138, 35141, 35145, 161618, 35170, 35209, 35216, 35231,
+    35248, 35255, 35288, 35307, 18081, 35315, 35325, 35327, 18095, 35345,
+    35348, 162181, 35361, 35381, 35390, 35397, 35405, 35416, 35502, 35472,
+    35511, 35543, 35580, 162436, 35594, 35589, 35597, 35612, 35629, 18188,
+    35665, 35678, 35702, 35713, 35723, {f: 2, c: 35732}, 35897, 162739, 35901,
+    162750, 162759, 35909, 35919, 35927, 35945, 35949, 163000, 35987, 35986,
+    35993, 18276, 35995, 36054, 36053, 163232, 36081, 163344, 36105, 36110,
+    36296, 36313, 36364, 18429, 36349, 36358, 163978, 36372, 36374,
+    {f: 2, c: 36385}, 36391, 164027, 18454, 36406, 36409, 36436, 36450, 36461,
+    36463, 36504, 36510, 36533, 36539, 164482, 18510, 164595, 36608, 36616,
+    36651, 36672, 36682, 36696, 164876, 36772, 36788, 164949, 36801, 36806,
+    64036, 36810, 36813, 36819, 36821, 36849, 36853, 36859, 36876, 36919,
+    165227, 36931, 36957, {f: 2, c: 165320}, 36997, 37004, 37008, 37025, 18613,
+    37040, 37046, 37059, 37064, 165591, 37084, 37087, 165626, 37110, 37106,
+    37120, 37099, {f: 2, c: 37118}, 37124, 37126, 37144, 37150, 37175, 37177,
+    {f: 2, c: 37190}, 37207, 37209, 37236, 37241, 37253, 37299, 37302,
+    {f: 2, c: 37315}, 166217, 166214, 37356, 37377, {f: 2, c: 37398}, 166251,
+    37442, 37450, 37462, 37473, 37477, 37480, 166280, {f: 2, c: 37500}, 37503,
+    37513, 37517, 37527, 37529, 37535, 37547, {f: 2, c: 166330}, 37554,
+    {f: 2, c: 37567}, 37574, 37582, 37605, 37649, 166430, 166441, 37623, 37673,
+    166513, 166467, 37713, 37722, 37739, 37745, 37747, 37793, 166553, 166605,
+    37768, 37771, 37775, 37790, 37877, 166628, 166621, 37873, 37831, 37852,
+    37863, 37897, {f: 2, c: 37910}, 37883, 37938, 37947, 166849, 166895, 37997,
+    37999, 38265, 38278, {f: 2, c: 38284}, 167184, 167281, 38344, 167419,
+    167455, 38444, {f: 2, c: 38451}, 167478, 38460, 38497, 167561, 38530,
+    167659, 38554, 167730, 18919, 38579, 38586, 38589, 18938, 167928, 38616,
+    38618, 38621, 18948, 38676, 38691, 18985, 38710, 38721, 38727, 38743,
+    38747, 38762, 168608, 168625, 38806, 38814, {f: 2, c: 38833}, 38846, 38860,
+    38865, 38868, 38872, 38881, 38897, 38916, 38925, 38932, 38934, 19132,
+    169104, {f: 2, c: 38962}, 38949, 38983, 39014, 39083, 39085, 39088, 169423,
+    39095, {f: 2, c: 39099}, 39106, 39111, 39115, 39137, 39139, 39146,
+    {f: 2, c: 39152}, 39155, 39176, 19259, 169712, {f: 2, c: 39190}, 169753,
+    {f: 3, c: 39194}, 169808, 39217, {f: 3, c: 39226}, 39233, 39238, 39246,
+    39264, 39331, 39334, 39357, 39359, 39363, 39380, 39385, 39390, 170182,
+    39408, 39417, 39420, 39434, 39441, 39450, 39456, 39473, 39492, 39500,
+    39512, 19394, 39599, 19402, 39607, 19410, 39609, 170610, 39622, 39632,
+    39634, 39637, 39648, 39653, 39657, 39692, 39696, 39698, 39702, 39708,
+    39723, 39741, 19488, 39755, 39779, 39781, {f: 2, c: 39787},
+    {f: 2, c: 39798}, 39846, 39852, 171483, 39858, 39864, 39870, 39923, 39896,
+    39901, 39914, 39919, 39918, 171541, 171658, 171593, 39958,
+    {f: 3, c: 39960}, 39965, 39970, 39977, 171716, 39985, 39991, 40005, 40028,
+    171753, {f: 2, c: 40009}, 171739, 40020, 40024, 40027, 40029, 40031,
+    {f: 3, c: 40041}, {f: 2, c: 40045}, 40050, 40053, 40058, 40166, 40178,
+    40203, [171982, 171991], 40209, {f: 2, c: 40215}, 172079, 19652, 172058,
+    40242, 19665, 40266, 40287, 40290, 172281, 172162, 40307, {f: 2, c: 40310},
+    40324, 40345, 40353, 40383, 40373, 40377, 40381, 40393, 40410, 40416,
+    40419, 19719, 40458, 40450, 40461, 40476, 40571, 139800, 40576, 40581,
+    40603, 172940, 40637, 173111, 40671, 40703, 40706, 19831, 40707, 40762,
+    40765, 40774, 40787, 40789, 40792, 173553, 40797, 173570, 40809, 40813,
+    40816, 173746, 11948, 13844, 14509, 15820, 16348, 17854, 17936, 19326,
+    19512, 19681, 19980, {f: 2, c: 20003}, 20089, 20211, 20236, 20249, 20267,
+    20270, 20273, 20356, 20382, 20407, 20484, 20492, 20556, 20575, 20578,
+    20599, 20622, 20638, 20642, 20675, 20712, 20721, 20734, 20743,
+    {f: 3, c: 20748}, 20787, 20792, 20852, 20868, 20920, 20922, 20936, 20943,
+    20945, {f: 2, c: 20947}, 20952, 20959, 20997, 21030, 21032, 21035,
+    {f: 2, c: 21041}, 21045, 21052, 21082, 21088, 21102, {f: 2, c: 21112},
+    21130, 21132, 21217, 21225, 21233, 21251, 21265, 21279, 21293, 21298,
+    21309, 21349, 21357, 21369, 21374, 21396, 21401, 21418, 21423, 21434,
+    21441, {f: 2, c: 21444}, 21472, 21523, 21546, 21553, {f: 2, c: 21556},
+    21580, 21671, 21674, 21681, 21691, 21710, 21738, 21756, 21765, 21768,
+    21781, 21799, 21802, 21814, 21841, 21862, 21903, 21906, 21908, 21924,
+    21938, 21955, 21958, 21971, 21979, 21996, 21998, 22001, 22006, 22008,
+    22021, 22029, {f: 2, c: 22033}, 22060, 22069, 22073, 22093, 22100, 22149,
+    22175, 22182, 22199, 22220, 22223, 22233, 22241, 22251, 22253, 22257,
+    22279, 22284, {f: 2, c: 22298}, 22301, 22316, 22318, {f: 2, c: 22333},
+    22367, 22379, 22381, 22394, 22403, 22423, 22446, 22485, 22503, 22541,
+    22566, 22605, 22607, 22623, 22637, 22655, 22657, 22680, 22716, 22815,
+    22819, 22873, 22905, 22935, 22959, 22963, 23007, 23025, 23032, 23218,
+    23224, 23274, 23286, 23323, 23325, 23329, 23352, 23479, 23511, 23520,
+    23583, 23594, 23596, 23606, 23641, 23644, 23661, 23773, 23809, 23860,
+    23869, 23897, 23934, 23939, 24007, 24057, 24104, 24114, 24117, 24155,
+    24168, 24170, 24183, 24192, 24203, 24243, 24253, 24273, {f: 2, c: 24276},
+    24397, 24492, 24554, 24583, 24649, 24660, 24679, 24763, 24772, 24829,
+    24842, 24854, 24874, 24886, 24926, 24932, 24955, 24957, 24959, 24989,
+    25016, 25052, 25058, 25061, 25064, 25092, 25095, 25137, 25145, 25149,
+    25210, 25232, 25256, 25306, 25332, 25366, 25386, 25398, 25414, 25419,
+    25427, 25457, 25461, 25471, 25474, 25482, {f: 2, c: 25518}, 25578,
+    {f: 2, c: 25592}, 25618, 25624, 25632, 25636, 25642, 25653, 25661, 25663,
+    25682, 25695, 25716, 25744, {f: 2, c: 25752}, 25772, 25779, 25837, 25840,
+    25883, 25887, 25902, 25929, 25952, 26002, 26005, 26036, 26046, 26056,
+    26062, 26064, 26079, 26238, {f: 2, c: 26251}, 26291, 26304, 26319, 26405,
+    26421, 26453, 26496, 26511, 26513, 26532, 26545, 26549, 26558, 26664,
+    26758, 26859, 26869, 26903, 26931, 26936, 26971, 26981, 27048, 27051,
+    27055, 27109, 27121, 27210, 27221, 27239, 27249, 27311, {f: 2, c: 27336},
+    27395, 27451, 27455, {f: 2, c: 27517}, 27568, 27639, 27641, 27652, 27657,
+    27661, 27692, 27722, 27730, 27732, 27769, 27820, 27828, 27858, 28001,
+    28028, 28089, 28144, 28229, 28275, 28283, 28285, 28297, 28348,
+    {f: 2, c: 28378}, 28454, 28457, 28464, 28551, 28573, 28590, 28599, 28685,
+    28704, 28745, 28824, 28848, {f: 2, c: 28885}, 28997, 29106, 29172, 29207,
+    29215, 29251, {f: 2, c: 29263}, 29274, 29280, 29288, 29303, 29316, 29385,
+    29413, 29428, 29442, 29451, 29470, 29474, {f: 2, c: 29498}, 29517, 29528,
+    29543, 29810, 29871, 29919, 29924, 29940, 29947, 29974, 29985, 30015,
+    30046, 30105, 30116, 30145, 30148, 30156, 30167, 30172, 30177, 30191,
+    30212, 30220, 30237, 30258, 30264, 30277, 30282, 30303, 30381, 30397,
+    30425, 30443, 30448, 30457, 30464, 30478, 30498, 30504, 30511, 30521,
+    30526, 30533, 30538, 30543, 30558, 30564, 30567, 30572, 30596,
+    {f: 2, c: 30604}, 30614, 30631, 30639, 30647, 30654, 30665, 30673, 30681,
+    30705, 30775, 30812, 30846, 30872, 30881, 30897, 30899, 30921, 30931,
+    30988, 31007, {f: 2, c: 31015}, 31039, 31042, 31060, 31083, 31100, 31147,
+    31172, 31210, 31234, 31244, 31280, 31290, 31300, 31360, 31366, 31380,
+    31413, 31421, 31486, 31531, 31607, 31648, 31660, 31664, 31720, 31730,
+    31736, 31740, 31742, 31753, 31784, 31791, 31810, {f: 2, c: 31826},
+    {f: 3, c: 31835}, 31858, 31869, 31879, 31902, 31930, 31943, 31955, 31962,
+    32060, 32077, 32130, 32133, 32141, 32145, 32158, 32179, 32185, 32208,
+    32229, {f: 2, c: 32245}, 32303, 32310, 32324, 32367, 32376, 32385, 32573,
+    32603, 32605, 32613, 32625, {f: 2, c: 32639}, 32651, 32674,
+    {f: 3, c: 32765}, 32775, 32781, 32798, 32825, 32904, 32910, 32975, 32980,
+    33005, 33008, 33015, 33018, 33022, 33027, 33047, 33072, 33111, 33135,
+    33139, 33163, 33168, 33179, 33182, 33227, 33237, {f: 2, c: 33245}, 33249,
+    33263, 33270, 33280, 33291, {f: 2, c: 33299}, 33306, 33338, 33348, 33389,
+    33412, 33417, 33425, 33450, 33456, 33488, 33514, 33519, 33526, 33622,
+    33656, 33784, 33788, 33880, 33939, 33969, 33981, 34043, 34118, 34134,
+    34141, 34181, 34200, 34370, 34374, 34496, 34580, 34594, 34606, 34617,
+    34653, 34683, 34700, 34702, {f: 2, c: 34711}, 34718, 34723, 34734, 34751,
+    34761, 34778, 34840, 34843, 34861, 34874, 34885, 34891, 34894, 34901,
+    34906, 34926, {f: 3, c: 34970}, 35021, 35040, 35055, {f: 2, c: 35086},
+    35110, 35125, 35162, 35164, 35179, 35184, 35196, 35237, 35253, 35260,
+    35285, 35401, 35415, 35431, 35454, 35462, 35478, 35510, 35529, 35537,
+    35549, 35564, 35573, 35590, 35599, 35601, 35653, 35666, 35693, 35704,
+    35708, 35710, 35717, 35743, 35915, 35923, 35963, 36026, 36037, 36041,
+    36050, 36076, 36085, 36087, 36097, 36099, 36119, 36124, 36206, 36241,
+    36255, 36267, 36274, 36309, 36327, {f: 2, c: 36337}, 36340, 36353, 36363,
+    36390, 36401, {f: 2, c: 36416}, 36429, 36431, 36444, 36449, 36457, 36465,
+    36469, 36471, 36489, 36496, 36501, 36506, 36519, 36521, 36525, 36584,
+    36592, 36615, 36632, 36645, 36647, 36652, 36661, 36666, 36675, 36679,
+    36689, 36693, {f: 3, c: 36768}, 36773, 36868, 36891, 36911, 36940, 36955,
+    36976, 36980, 36985, 37003, 37016, 37024, 37042, 37053, 37065, 37104,
+    37125, 37157, 37210, 37223, 37242, 37258, 37265, 37269, 37296, 37307,
+    37309, 37314, 37317, 37376, 37385, 37411, 37494, 37518, 37551,
+    {f: 2, c: 37563}, 37569, 37571, 37573, 37576, 37652, 37683, 37686, 37720,
+    37759, 37762, 37770, 37819, 37836, 37862, 37881, 37890, {f: 2, c: 37901},
+    37934, 37964, 38280, 38305, 38335, 38342, 38345, {f: 2, c: 38353}, 38368,
+    38372, 38374, 38436, 38449, 38456, 38461, 38484, 38516, 38523, 38527,
+    38529, 38531, 38537, 38550, 38574, 38659, 38683, {f: 2, c: 38689}, 38696,
+    38705, 38759, 38774, 38781, 38783, 38809, 38815, 38828, 38841, 38861,
+    38880, 38895, 38919, 38950, 38958, {f: 2, c: 39010}, 39092, 39109, 39170,
+    39185, 39189, 39221, 39240, 39252, 39262, 39393, 39436, 39440, 39459,
+    39489, 39505, {f: 2, c: 39613}, 39681, 39689, 39691, {f: 2, c: 39693},
+    39705, 39733, 39752, 39765, 39784, 39808, 39814, 39824, 39837, 39856,
+    39871, 39880, 39935, 39938, 39964, 39989, 40004, 40022, 40033, 40040,
+    40240, 40253, 40298, 40315, 40421, 40425, 40435, 40570, {f: 3, c: 40578},
+    40624, 40676, 40688, 40690, 40713, 40719, 40724, 40731, 40738, 40742,
+    {f: 2, c: 40746}, 40756, 40794, 40815, 40862, 40869, 131317, 151044,
+    151538, 163187, 194581, 194630, 194713, 194726, 194789, 195038, 13790,
+    {s: 4}, 172722, 0, 0, 131416, {s: 4}, 132529, 0, 0, 132844, {s: 6}, 134488,
+    {s: 21}, 154060, {s: 9}, 14756, 14776, 142914, 0, 0, 14940, 0, 0, 143339,
+    0, 0, 162228, 0, 15044, 15051, {s: 5}, 14981, {s: 8}, 15347, 27384, {s: 5},
+    15665, {s: 9}, 147531, 0, 15936, 14497, {s: 34}, 158878, {s: 12}, 18207,
+    162876, {s: 4}, 18462, {s: 71}, 39709, 39724, 20482, 20958, 21255, 23532,
+    63784, 26142, 63785, 28746, 64021, 21857, 27706, 31328, 156492, 34819,
+    38315, 38741, 171581, 173594],
+  'Adobe-Korea1': [{f: 95, c: 32}, 8361, 8208, 169, 0, 0, [12288, 12644],
+    {f: 2, c: 12289}, 12539, 8229, [8230, 8943], 168, 12291, {f: 2, c: 8211},
+    8214, 65340, 65374, {f: 2, c: 8216}, {f: 2, c: 8220}, {f: 2, c: 12308},
+    {f: 10, c: 12296}, 177, 215, 247, 8800, {f: 2, c: 8804}, 8734, 8756, 176,
+    {f: 2, c: 8242}, 8451, 8491, {f: 2, c: 65504}, 65509, 9794, 9792, 8736,
+    8869, 8978, 8706, 8711, 8801, 8786, 167, 8251, 9734, 9733, 9675, 9679,
+    9678, 9671, 9670, 9633, 9632, 9651, 9650, 9661, 9660, 8594,
+    {f: 2, c: 8592}, {f: 2, c: 8595}, 12307, 171, 187, 8730, 8765, 8733, 8757,
+    {f: 2, c: 8747}, 8712, 8715, {f: 2, c: 8838}, {f: 2, c: 8834}, 8746, 8745,
+    {f: 2, c: 8743}, 65506, 8658, 8660, 8704, 8707, 180, 732, 711, 728, 733,
+    730, 729, 184, 731, 161, 191, 8758, 8750, 8721, 8719, 164, 8457, 8240,
+    9665, 9664, 9655, 9654, 9828, {f: 2, c: 9824}, 9829, 9831, 9827, 9673,
+    9672, 9635, {f: 2, c: 9680}, 9618, {f: 2, c: 9636}, 9640, 9639, 9638, 9641,
+    9832, 9743, 9742, 9756, 9758, 182, {f: 2, c: 8224}, 8597, 8599, 8601, 8598,
+    8600, 9837, {f: 2, c: 9833}, 9836, 12927, 12828, 8470, 13255, 8482, 13250,
+    13272, 8481, {f: 59, c: 65281}, 65510, {f: 33, c: 65341}, 65507,
+    {f: 51, c: 12593}, {f: 42, c: 12645}, {f: 10, c: 8560}, {f: 10, c: 8544},
+    {f: 17, c: 913}, {f: 7, c: 931}, {f: 17, c: 945}, {f: 7, c: 963}, 9472,
+    9474, 9484, 9488, 9496, 9492, 9500, 9516, 9508, 9524, 9532, 9473, 9475,
+    9487, 9491, 9499, 9495, 9507, 9523, 9515, 9531, 9547, 9504, 9519, 9512,
+    9527, 9535, 9501, 9520, 9509, 9528, 9538, 9490, 9489, 9498, 9497, 9494,
+    9493, 9486, 9485, {f: 2, c: 9502}, {f: 2, c: 9505}, {f: 2, c: 9510},
+    {f: 2, c: 9513}, {f: 2, c: 9517}, {f: 2, c: 9521}, {f: 2, c: 9525},
+    {f: 2, c: 9529}, {f: 2, c: 9533}, {f: 2, c: 9536}, {f: 8, c: 9539},
+    {f: 3, c: 13205}, 8467, 13208, 13252, {f: 4, c: 13219}, {f: 10, c: 13209},
+    13258, {f: 3, c: 13197}, 13263, {f: 2, c: 13192}, 13256, {f: 2, c: 13223},
+    {f: 10, c: 13232}, {f: 5, c: 13184}, {f: 6, c: 13242}, {f: 5, c: 13200},
+    8486, {f: 2, c: 13248}, {f: 3, c: 13194}, 13270, 13253, {f: 3, c: 13229},
+    13275, {f: 4, c: 13225}, 13277, 13264, 13267, 13251, 13257, 13276, 13254,
+    198, 208, 170, 294, 306, 319, 321, 216, 338, 186, 222, 358, 330,
+    {f: 28, c: 12896}, {f: 26, c: 9424}, {f: 15, c: 9312}, 189,
+    {f: 2, c: 8531}, 188, 190, {f: 4, c: 8539}, 230, 273, 240, 295, 305, 307,
+    312, 320, 322, 248, 339, 223, 254, 359, 331, 329, {f: 28, c: 12800},
+    {f: 26, c: 9372}, {f: 15, c: 9332}, 185, {f: 2, c: 178}, 8308, 8319,
+    {f: 4, c: 8321}, {f: 83, c: 12353}, {f: 86, c: 12449}, {f: 6, c: 1040},
+    1025, {f: 32, c: 1046}, 1105, {f: 26, c: 1078}, {f: 2, c: 44032}, 44036,
+    {f: 4, c: 44039}, {f: 8, c: 44048}, {f: 5, c: 44057}, 44064, 44068,
+    {f: 2, c: 44076}, {f: 3, c: 44079}, {f: 2, c: 44088}, 44092, 44096, 44107,
+    44109, 44116, 44120, 44124, {f: 2, c: 44144}, 44148, {f: 2, c: 44151},
+    44154, {f: 2, c: 44160}, {f: 4, c: 44163}, {f: 4, c: 44169}, 44176, 44180,
+    {f: 2, c: 44188}, {f: 3, c: 44191}, {f: 3, c: 44200}, 44204,
+    {f: 2, c: 44207}, {f: 2, c: 44216}, {f: 3, c: 44219}, 44225, 44228, 44232,
+    44236, 44245, 44247, {f: 2, c: 44256}, 44260, {f: 2, c: 44263}, 44266,
+    44268, {f: 3, c: 44271}, 44275, {f: 2, c: 44277}, {f: 2, c: 44284}, 44288,
+    44292, 44294, {f: 2, c: 44300}, 44303, 44305, 44312, 44316, 44320, 44329,
+    {f: 2, c: 44332}, {f: 2, c: 44340}, 44344, 44348, {f: 2, c: 44356}, 44359,
+    44361, 44368, 44372, 44376, 44385, 44387, {f: 2, c: 44396}, 44400,
+    {f: 4, c: 44403}, {f: 3, c: 44411}, 44415, {f: 2, c: 44417},
+    {f: 2, c: 44424}, 44428, 44432, {f: 2, c: 44444}, 44452, 44471,
+    {f: 2, c: 44480}, 44484, 44488, {f: 2, c: 44496}, 44499, 44508, 44512,
+    44516, {f: 2, c: 44536}, 44540, {f: 3, c: 44543}, {f: 2, c: 44552}, 44555,
+    44557, 44564, {f: 2, c: 44592}, 44596, {f: 2, c: 44599}, 44602,
+    {f: 2, c: 44608}, 44611, {f: 2, c: 44613}, 44618, {f: 3, c: 44620}, 44624,
+    44628, 44630, {f: 2, c: 44636}, {f: 3, c: 44639}, 44645, {f: 2, c: 44648},
+    44652, 44656, {f: 2, c: 44664}, {f: 3, c: 44667}, {f: 2, c: 44676}, 44684,
+    {f: 3, c: 44732}, 44736, 44740, {f: 2, c: 44748}, {f: 3, c: 44751},
+    {f: 2, c: 44760}, 44764, 44776, 44779, 44781, 44788, 44792, 44796,
+    {f: 2, c: 44807}, 44813, 44816, {f: 2, c: 44844}, 44848, 44850, 44852,
+    {f: 2, c: 44860}, 44863, {f: 3, c: 44865}, {f: 2, c: 44872}, 44880,
+    {f: 2, c: 44892}, {f: 2, c: 44900}, 44921, 44928, 44932, 44936,
+    {f: 2, c: 44944}, 44949, 44956, {f: 2, c: 44984}, 44988, 44992,
+    {f: 3, c: 44999}, 45003, {f: 2, c: 45005}, 45012, 45020, {f: 2, c: 45032},
+    {f: 2, c: 45040}, 45044, 45048, {f: 2, c: 45056}, 45060, 45068, 45072,
+    45076, {f: 2, c: 45084}, 45096, {f: 2, c: 45124}, 45128, 45130, 45132,
+    45134, {f: 3, c: 45139}, 45143, 45145, 45149, {f: 2, c: 45180}, 45184,
+    45188, {f: 2, c: 45196}, 45199, 45201, {f: 3, c: 45208}, 45212,
+    {f: 4, c: 45215}, {f: 2, c: 45224}, {f: 5, c: 45227}, 45233,
+    {f: 3, c: 45235}, 45240, 45244, {f: 2, c: 45252}, {f: 3, c: 45255},
+    {f: 2, c: 45264}, 45268, 45272, 45280, 45285, {f: 2, c: 45320},
+    {f: 2, c: 45323}, 45328, {f: 2, c: 45330}, {f: 2, c: 45336},
+    {f: 3, c: 45339}, {f: 3, c: 45347}, 45352, 45356, {f: 2, c: 45364},
+    {f: 3, c: 45367}, {f: 2, c: 45376}, 45380, 45384, {f: 2, c: 45392},
+    {f: 2, c: 45396}, 45400, 45404, 45408, {f: 2, c: 45432}, 45436, 45440,
+    45442, {f: 2, c: 45448}, 45451, 45453, {f: 3, c: 45458}, 45464, 45468,
+    45480, 45516, 45520, 45524, {f: 2, c: 45532}, 45535, {f: 2, c: 45544},
+    45548, 45552, 45561, 45563, 45565, {f: 2, c: 45572}, 45576,
+    {f: 2, c: 45579}, {f: 2, c: 45588}, 45591, 45593, 45600, 45620, 45628,
+    45656, 45660, 45664, {f: 2, c: 45672}, {f: 2, c: 45684}, 45692,
+    {f: 2, c: 45700}, 45705, {f: 2, c: 45712}, 45716, {f: 3, c: 45720},
+    {f: 2, c: 45728}, 45731, {f: 2, c: 45733}, 45738, 45740, 45744, 45748,
+    {f: 2, c: 45768}, 45772, 45776, 45778, {f: 2, c: 45784}, 45787, 45789,
+    45794, {f: 3, c: 45796}, 45800, {f: 5, c: 45803}, {f: 3, c: 45811},
+    {f: 5, c: 45815}, {f: 3, c: 45823}, 45828, 45832, {f: 2, c: 45840},
+    {f: 3, c: 45843}, 45852, {f: 3, c: 45908}, 45912, {f: 2, c: 45915},
+    {f: 2, c: 45918}, {f: 2, c: 45924}, 45927, 45929, 45931, 45934,
+    {f: 2, c: 45936}, 45940, 45944, {f: 2, c: 45952}, {f: 3, c: 45955}, 45964,
+    45968, 45972, {f: 2, c: 45984}, 45992, 45996, {f: 2, c: 46020}, 46024,
+    {f: 2, c: 46027}, 46030, 46032, {f: 2, c: 46036}, 46039, 46041, 46043,
+    46045, 46048, 46052, 46056, 46076, 46096, 46104, 46108, 46112,
+    {f: 2, c: 46120}, 46123, 46132, {f: 2, c: 46160}, 46164, 46168,
+    {f: 2, c: 46176}, 46179, 46181, 46188, 46208, 46216, 46237, 46244, 46248,
+    46252, 46261, 46263, 46265, 46272, 46276, 46280, 46288, 46293,
+    {f: 2, c: 46300}, 46304, {f: 2, c: 46307}, 46310, {f: 2, c: 46316}, 46319,
+    46321, 46328, {f: 2, c: 46356}, 46360, {f: 2, c: 46363}, {f: 2, c: 46372},
+    {f: 4, c: 46375}, {f: 2, c: 46384}, 46388, 46392, {f: 2, c: 46400},
+    {f: 3, c: 46403}, {f: 3, c: 46411}, 46416, 46420, {f: 2, c: 46428},
+    {f: 3, c: 46431}, {f: 2, c: 46496}, 46500, 46504, {f: 2, c: 46506},
+    {f: 2, c: 46512}, {f: 3, c: 46515}, {f: 3, c: 46523}, 46528, 46532,
+    {f: 2, c: 46540}, {f: 3, c: 46543}, 46552, 46572, {f: 2, c: 46608}, 46612,
+    46616, 46629, 46636, 46644, 46664, 46692, 46696, {f: 2, c: 46748}, 46752,
+    46756, {f: 2, c: 46763}, 46769, 46804, 46832, 46836, 46840,
+    {f: 2, c: 46848}, 46853, {f: 2, c: 46888}, 46892, {f: 2, c: 46895},
+    {f: 2, c: 46904}, 46907, 46916, 46920, 46924, {f: 2, c: 46932}, 46944,
+    46948, 46952, {f: 2, c: 46960}, 46963, 46965, {f: 2, c: 46972}, 46976,
+    46980, {f: 2, c: 46988}, {f: 4, c: 46991}, {f: 4, c: 46998}, 47004, 47008,
+    {f: 2, c: 47016}, {f: 3, c: 47019}, {f: 2, c: 47028}, 47032, 47047, 47049,
+    {f: 2, c: 47084}, 47088, 47092, {f: 2, c: 47100}, {f: 3, c: 47103},
+    {f: 3, c: 47111}, 47116, 47120, {f: 2, c: 47128}, 47131, 47133,
+    {f: 2, c: 47140}, 47144, 47148, {f: 2, c: 47156}, {f: 3, c: 47159}, 47168,
+    47172, 47185, 47187, {f: 2, c: 47196}, 47200, 47204, {f: 2, c: 47212},
+    47215, 47217, 47224, 47228, 47245, 47272, 47280, 47284, 47288,
+    {f: 2, c: 47296}, 47299, 47301, 47308, 47312, 47316, 47325, 47327, 47329,
+    {f: 2, c: 47336}, 47340, 47344, {f: 2, c: 47352}, 47355, 47357, 47364,
+    47384, 47392, {f: 2, c: 47420}, 47424, 47428, 47436, 47439, 47441,
+    {f: 2, c: 47448}, 47452, 47456, {f: 2, c: 47464}, 47467, 47469,
+    {f: 2, c: 47476}, 47480, 47484, {f: 2, c: 47492}, 47495, {f: 2, c: 47497},
+    {f: 2, c: 47501}, {f: 2, c: 47532}, 47536, 47540, {f: 2, c: 47548}, 47551,
+    47553, {f: 2, c: 47560}, 47564, {f: 5, c: 47566}, {f: 2, c: 47576}, 47579,
+    {f: 2, c: 47581}, 47585, {f: 3, c: 47587}, 47592, 47596, {f: 2, c: 47604},
+    {f: 4, c: 47607}, {f: 2, c: 47616}, 47624, 47637, {f: 2, c: 47672}, 47676,
+    47680, 47682, {f: 2, c: 47688}, 47691, {f: 2, c: 47693}, {f: 3, c: 47699},
+    47704, 47708, {f: 2, c: 47716}, {f: 3, c: 47719}, {f: 2, c: 47728}, 47732,
+    47736, {f: 3, c: 47747}, 47751, 47756, {f: 2, c: 47784}, {f: 2, c: 47787},
+    47792, 47794, {f: 2, c: 47800}, 47803, 47805, 47812, 47816,
+    {f: 2, c: 47832}, 47868, 47872, 47876, 47885, 47887, 47889, 47896, 47900,
+    47904, 47913, 47915, {f: 3, c: 47924}, 47928, {f: 4, c: 47931},
+    {f: 2, c: 47940}, 47943, 47945, 47949, {f: 2, c: 47951}, 47956, 47960,
+    47969, 47971, 47980, 48008, 48012, 48016, 48036, 48040, 48044, 48052,
+    48055, 48064, 48068, 48072, 48080, 48083, {f: 2, c: 48120}, 48124,
+    {f: 2, c: 48127}, 48130, {f: 2, c: 48136}, {f: 3, c: 48139}, 48143, 48145,
+    {f: 5, c: 48148}, {f: 5, c: 48155}, {f: 2, c: 48164}, 48167, 48169, 48173,
+    {f: 2, c: 48176}, 48180, 48184, {f: 2, c: 48192}, {f: 3, c: 48195}, 48201,
+    {f: 2, c: 48204}, 48208, 48221, {f: 2, c: 48260}, 48264, {f: 2, c: 48267},
+    48270, {f: 2, c: 48276}, 48279, {f: 2, c: 48281}, {f: 2, c: 48288}, 48292,
+    {f: 2, c: 48295}, {f: 2, c: 48304}, {f: 3, c: 48307}, {f: 2, c: 48316},
+    48320, 48324, 48333, {f: 3, c: 48335}, 48341, 48344, 48348,
+    {f: 3, c: 48372}, 48376, 48380, {f: 2, c: 48388}, 48391, 48393, 48400,
+    48404, 48420, 48428, 48448, {f: 2, c: 48456}, 48460, 48464,
+    {f: 2, c: 48472}, 48484, 48488, {f: 2, c: 48512}, 48516, {f: 4, c: 48519},
+    {f: 2, c: 48528}, 48531, 48533, {f: 2, c: 48537}, 48540, 48548, 48560,
+    48568, {f: 2, c: 48596}, 48600, 48604, 48617, 48624, 48628, 48632, 48640,
+    48643, 48645, {f: 2, c: 48652}, 48656, 48660, {f: 2, c: 48668}, 48671,
+    {f: 2, c: 48708}, 48712, 48716, 48718, {f: 2, c: 48724}, 48727,
+    {f: 3, c: 48729}, {f: 2, c: 48736}, 48740, 48744, 48746, {f: 2, c: 48752},
+    {f: 3, c: 48755}, {f: 3, c: 48763}, 48768, 48772, {f: 2, c: 48780},
+    {f: 3, c: 48783}, {f: 2, c: 48792}, 48808, {f: 2, c: 48848}, 48852,
+    {f: 2, c: 48855}, 48864, {f: 3, c: 48867}, 48876, 48897, {f: 2, c: 48904},
+    {f: 2, c: 48920}, {f: 3, c: 48923}, {f: 2, c: 48960}, 48964, 48968,
+    {f: 2, c: 48976}, 48981, 49044, 49072, 49093, {f: 2, c: 49100}, 49104,
+    49108, 49116, 49119, 49121, 49212, 49233, 49240, 49244, 49248,
+    {f: 2, c: 49256}, {f: 2, c: 49296}, 49300, 49304, {f: 2, c: 49312}, 49315,
+    49317, {f: 2, c: 49324}, {f: 2, c: 49327}, {f: 4, c: 49331},
+    {f: 2, c: 49340}, {f: 3, c: 49343}, 49349, {f: 2, c: 49352}, 49356, 49360,
+    {f: 2, c: 49368}, {f: 3, c: 49371}, {f: 2, c: 49380}, 49384, 49388,
+    {f: 2, c: 49396}, 49399, 49401, 49408, 49412, 49416, 49424, 49429,
+    {f: 5, c: 49436}, {f: 2, c: 49443}, {f: 2, c: 49446}, {f: 2, c: 49452},
+    {f: 3, c: 49455}, 49462, {f: 2, c: 49464}, 49468, 49472, {f: 2, c: 49480},
+    {f: 3, c: 49483}, {f: 2, c: 49492}, 49496, 49500, {f: 2, c: 49508},
+    {f: 3, c: 49511}, 49520, 49524, 49528, 49541, {f: 3, c: 49548}, 49552,
+    49556, 49558, {f: 2, c: 49564}, 49567, 49569, 49573, {f: 2, c: 49576},
+    49580, 49584, 49597, 49604, 49608, 49612, 49620, {f: 2, c: 49623}, 49632,
+    49636, 49640, {f: 2, c: 49648}, 49651, {f: 2, c: 49660}, 49664, 49668,
+    {f: 2, c: 49676}, 49679, 49681, {f: 2, c: 49688}, 49692, {f: 2, c: 49695},
+    {f: 2, c: 49704}, 49707, 49709, 49711, {f: 2, c: 49713}, 49716, 49736,
+    {f: 2, c: 49744}, 49748, 49752, 49760, 49765, {f: 2, c: 49772}, 49776,
+    49780, {f: 2, c: 49788}, 49791, 49793, {f: 2, c: 49800}, 49808, 49816,
+    49819, 49821, {f: 2, c: 49828}, 49832, {f: 2, c: 49836}, {f: 2, c: 49844},
+    49847, 49849, {f: 2, c: 49884}, 49888, {f: 2, c: 49891}, {f: 3, c: 49899},
+    49903, 49905, 49910, {f: 2, c: 49912}, {f: 2, c: 49915}, 49920,
+    {f: 2, c: 49928}, {f: 2, c: 49932}, {f: 3, c: 49939}, 49944, 49948,
+    {f: 2, c: 49956}, {f: 2, c: 49960}, 49989, {f: 2, c: 50024}, 50028, 50032,
+    50034, {f: 2, c: 50040}, {f: 2, c: 50044}, 50052, 50056, 50060, 50112,
+    {f: 2, c: 50136}, 50140, {f: 2, c: 50143}, 50146, {f: 2, c: 50152}, 50157,
+    {f: 2, c: 50164}, 50168, 50184, 50192, 50212, 50220, 50224, 50228,
+    {f: 2, c: 50236}, 50248, {f: 2, c: 50276}, 50280, 50284, {f: 2, c: 50292},
+    50297, 50304, 50324, 50332, 50360, 50364, 50409, {f: 2, c: 50416}, 50420,
+    50424, 50426, {f: 3, c: 50431}, 50444, 50448, 50452, 50460,
+    {f: 2, c: 50472}, 50476, 50480, {f: 2, c: 50488}, 50491, 50493,
+    {f: 2, c: 50500}, {f: 3, c: 50504}, {f: 3, c: 50508}, {f: 3, c: 50515},
+    {f: 3, c: 50519}, {f: 2, c: 50525}, {f: 2, c: 50528}, 50532, 50536,
+    {f: 2, c: 50544}, {f: 3, c: 50547}, {f: 2, c: 50556}, 50560, 50564, 50567,
+    {f: 2, c: 50572}, 50575, 50577, 50581, {f: 2, c: 50583}, 50588, 50592,
+    50601, {f: 2, c: 50612}, {f: 2, c: 50616}, {f: 4, c: 50619},
+    {f: 7, c: 50628}, 50636, 50638, {f: 2, c: 50640}, 50644, 50648,
+    {f: 2, c: 50656}, 50659, 50661, {f: 3, c: 50668}, 50672, 50676,
+    {f: 2, c: 50678}, {f: 6, c: 50684}, {f: 4, c: 50693}, 50700, 50704,
+    {f: 2, c: 50712}, {f: 2, c: 50715}, {f: 2, c: 50724}, 50728,
+    {f: 3, c: 50732}, 50736, {f: 3, c: 50739}, 50743, 50745, 50747,
+    {f: 2, c: 50752}, 50756, 50760, {f: 2, c: 50768}, {f: 3, c: 50771},
+    {f: 2, c: 50780}, 50784, 50796, 50799, 50801, {f: 2, c: 50808}, 50812,
+    50816, {f: 2, c: 50824}, 50827, 50829, {f: 2, c: 50836}, 50840, 50844,
+    {f: 2, c: 50852}, 50855, 50857, {f: 2, c: 50864}, 50868, {f: 3, c: 50872},
+    {f: 2, c: 50880}, 50883, 50885, {f: 2, c: 50892}, 50896, 50900,
+    {f: 2, c: 50908}, {f: 2, c: 50912}, {f: 2, c: 50920}, 50924, 50928,
+    {f: 2, c: 50936}, 50941, {f: 2, c: 50948}, 50952, 50956, {f: 2, c: 50964},
+    50967, 50969, {f: 2, c: 50976}, 50980, 50984, {f: 2, c: 50992}, 50995,
+    50997, 50999, {f: 2, c: 51004}, 51008, 51012, 51018, {f: 2, c: 51020},
+    51023, {f: 8, c: 51025}, 51036, 51040, 51048, 51051, {f: 2, c: 51060},
+    51064, {f: 3, c: 51068}, {f: 3, c: 51075}, {f: 4, c: 51079}, 51086,
+    {f: 2, c: 51088}, 51092, {f: 3, c: 51094}, 51098, {f: 2, c: 51104},
+    {f: 4, c: 51107}, {f: 2, c: 51116}, 51120, 51124, {f: 2, c: 51132},
+    {f: 3, c: 51135}, {f: 2, c: 51144}, 51148, 51150, 51152, 51160, 51165,
+    51172, 51176, 51180, {f: 2, c: 51200}, 51204, 51208, 51210,
+    {f: 2, c: 51216}, 51219, {f: 2, c: 51221}, {f: 2, c: 51228}, 51232, 51236,
+    {f: 2, c: 51244}, 51247, 51249, 51256, 51260, 51264, {f: 2, c: 51272},
+    {f: 2, c: 51276}, 51284, {f: 2, c: 51312}, 51316, 51320, 51322,
+    {f: 2, c: 51328}, 51331, {f: 3, c: 51333}, {f: 3, c: 51339}, 51348, 51357,
+    51359, 51361, 51368, {f: 2, c: 51388}, 51396, 51400, 51404,
+    {f: 2, c: 51412}, 51415, 51417, {f: 2, c: 51424}, 51428, 51445,
+    {f: 2, c: 51452}, 51456, {f: 3, c: 51460}, {f: 2, c: 51468}, 51471, 51473,
+    51480, 51500, 51508, {f: 2, c: 51536}, 51540, 51544, {f: 2, c: 51552},
+    51555, 51564, 51568, 51572, 51580, {f: 2, c: 51592}, 51596, 51600,
+    {f: 2, c: 51608}, 51611, 51613, {f: 2, c: 51648}, 51652, {f: 2, c: 51655},
+    51658, {f: 2, c: 51664}, 51667, {f: 2, c: 51669}, {f: 2, c: 51673},
+    {f: 2, c: 51676}, 51680, 51682, 51684, 51687, {f: 2, c: 51692},
+    {f: 3, c: 51695}, {f: 2, c: 51704}, 51708, 51712, {f: 2, c: 51720},
+    {f: 3, c: 51723}, 51732, 51736, 51753, {f: 2, c: 51788}, 51792, 51796,
+    {f: 2, c: 51804}, {f: 3, c: 51807}, 51816, 51837, 51844, 51864,
+    {f: 2, c: 51900}, 51904, 51908, {f: 2, c: 51916}, 51919, 51921, 51923,
+    {f: 2, c: 51928}, 51936, 51948, 51956, 51976, 51984, 51988, 51992,
+    {f: 2, c: 52000}, 52033, {f: 2, c: 52040}, 52044, 52048, {f: 2, c: 52056},
+    52061, 52068, {f: 2, c: 52088}, 52124, 52152, 52180, 52196, 52199, 52201,
+    {f: 2, c: 52236}, 52240, 52244, {f: 2, c: 52252}, {f: 2, c: 52257},
+    {f: 3, c: 52263}, 52268, 52270, 52272, {f: 2, c: 52280}, {f: 4, c: 52283},
+    {f: 2, c: 52292}, 52296, 52300, {f: 2, c: 52308}, {f: 3, c: 52311}, 52320,
+    52324, 52326, 52328, 52336, 52341, {f: 2, c: 52376}, 52380, 52384,
+    {f: 2, c: 52392}, {f: 3, c: 52395}, {f: 2, c: 52404}, 52408, 52412,
+    {f: 2, c: 52420}, 52423, 52425, 52432, 52436, 52452, 52460, 52464, 52481,
+    {f: 2, c: 52488}, 52492, 52496, {f: 2, c: 52504}, 52507, 52509, 52516,
+    52520, 52524, 52537, 52572, 52576, 52580, {f: 2, c: 52588}, 52591, 52593,
+    52600, 52616, {f: 2, c: 52628}, 52632, 52636, {f: 2, c: 52644}, 52647,
+    52649, 52656, 52676, 52684, 52688, 52712, 52716, 52720, {f: 2, c: 52728},
+    52731, 52733, 52740, 52744, 52748, 52756, 52761, {f: 2, c: 52768}, 52772,
+    52776, {f: 2, c: 52784}, 52787, 52789, {f: 2, c: 52824}, 52828,
+    {f: 3, c: 52831}, {f: 2, c: 52840}, 52843, 52845, {f: 2, c: 52852}, 52856,
+    52860, {f: 2, c: 52868}, 52871, 52873, {f: 2, c: 52880}, 52884, 52888,
+    {f: 2, c: 52896}, {f: 3, c: 52899}, {f: 2, c: 52908}, 52929,
+    {f: 2, c: 52964}, 52968, {f: 2, c: 52971}, {f: 2, c: 52980},
+    {f: 3, c: 52983}, {f: 2, c: 52992}, 52996, 53000, {f: 2, c: 53008}, 53011,
+    53013, 53020, 53024, 53028, {f: 2, c: 53036}, {f: 3, c: 53039}, 53048,
+    {f: 2, c: 53076}, 53080, 53084, {f: 2, c: 53092}, 53095, 53097,
+    {f: 2, c: 53104}, 53108, 53112, 53120, 53125, 53132, 53153, 53160, 53168,
+    53188, {f: 2, c: 53216}, 53220, 53224, {f: 2, c: 53232}, 53235, 53237,
+    53244, 53248, 53252, 53265, 53272, 53293, {f: 2, c: 53300}, 53304, 53308,
+    {f: 2, c: 53316}, 53319, 53321, 53328, 53332, 53336, 53344,
+    {f: 2, c: 53356}, 53360, 53364, {f: 2, c: 53372}, 53377, {f: 2, c: 53412},
+    53416, 53420, {f: 2, c: 53428}, 53431, 53433, {f: 2, c: 53440}, 53444,
+    {f: 2, c: 53448}, {f: 2, c: 53456}, {f: 3, c: 53459}, {f: 2, c: 53468},
+    53472, 53476, {f: 2, c: 53484}, {f: 3, c: 53487}, 53496, 53517,
+    {f: 2, c: 53552}, 53556, 53560, 53562, {f: 2, c: 53568}, {f: 3, c: 53571},
+    {f: 2, c: 53580}, 53584, 53588, {f: 2, c: 53596}, 53599, 53601, 53608,
+    53612, 53628, 53636, 53640, {f: 2, c: 53664}, 53668, 53672,
+    {f: 2, c: 53680}, 53683, 53685, 53690, 53692, 53696, 53720, 53748, 53752,
+    53767, 53769, 53776, {f: 2, c: 53804}, 53808, 53812, {f: 2, c: 53820},
+    53823, 53825, 53832, 53852, 53860, {f: 2, c: 53888}, 53892, 53896,
+    {f: 2, c: 53904}, 53909, 53916, 53920, 53924, 53932, 53937,
+    {f: 2, c: 53944}, 53948, {f: 2, c: 53951}, 53954, {f: 2, c: 53960}, 53963,
+    53972, 53976, 53980, {f: 2, c: 53988}, {f: 2, c: 54000}, 54004, 54008,
+    {f: 2, c: 54016}, 54019, 54021, {f: 3, c: 54028}, 54032, 54036, 54038,
+    {f: 2, c: 54044}, {f: 3, c: 54047}, 54053, {f: 2, c: 54056}, 54060, 54064,
+    {f: 2, c: 54072}, {f: 3, c: 54075}, {f: 2, c: 54084}, {f: 2, c: 54140},
+    54144, 54148, {f: 2, c: 54156}, {f: 3, c: 54159}, {f: 2, c: 54168}, 54172,
+    54176, {f: 2, c: 54184}, 54187, 54189, 54196, 54200, 54204,
+    {f: 2, c: 54212}, {f: 2, c: 54216}, 54224, 54232, 54241, 54243,
+    {f: 2, c: 54252}, 54256, 54260, {f: 2, c: 54268}, 54271, 54273, 54280,
+    54301, 54336, 54340, 54364, 54368, 54372, 54381, 54383, {f: 2, c: 54392},
+    54396, {f: 2, c: 54399}, 54402, {f: 2, c: 54408}, 54411, 54413, 54420,
+    54441, 54476, 54480, 54484, 54492, 54495, 54504, 54508, 54512, 54520,
+    54523, 54525, 54532, 54536, 54540, {f: 2, c: 54548}, 54551,
+    {f: 2, c: 54588}, 54592, 54596, {f: 2, c: 54604}, 54607, 54609,
+    {f: 2, c: 54616}, 54620, 54624, 54629, {f: 2, c: 54632}, 54635, 54637,
+    {f: 2, c: 54644}, 54648, 54652, {f: 2, c: 54660}, {f: 3, c: 54663}, 54672,
+    54693, {f: 2, c: 54728}, 54732, 54736, 54738, {f: 2, c: 54744}, 54747,
+    54749, {f: 2, c: 54756}, 54760, 54764, {f: 2, c: 54772}, 54775, 54777,
+    {f: 2, c: 54784}, 54788, 54792, {f: 2, c: 54800}, {f: 3, c: 54803}, 54812,
+    54816, 54820, 54829, {f: 2, c: 54840}, 54844, 54848, 54853,
+    {f: 2, c: 54856}, 54859, 54861, 54865, {f: 2, c: 54868}, 54872, 54876,
+    54887, 54889, {f: 2, c: 54896}, 54900, 54915, 54917, {f: 2, c: 54924},
+    54928, 54932, 54941, 54943, 54945, 54952, 54956, 54960, 54969, 54971,
+    {f: 2, c: 54980}, 54984, 54988, 54993, 54996, 54999, 55001, 55008, 55012,
+    55016, 55024, 55029, {f: 2, c: 55036}, 55040, 55044, 55057,
+    {f: 2, c: 55064}, 55068, 55072, {f: 2, c: 55080}, 55083, 55085,
+    {f: 2, c: 55092}, 55096, 55100, 55108, 55111, 55113, {f: 2, c: 55120},
+    55124, {f: 4, c: 55126}, {f: 2, c: 55136}, 55139, 55141, 55145, 55148,
+    55152, 55156, {f: 2, c: 55164}, 55169, {f: 2, c: 55176}, 55180, 55184,
+    {f: 2, c: 55192}, 55195, 55197, 20285, 20339, 20551, 20729, 21152, 21487,
+    21621, 21733, 22025, 23233, 23478, 26247, {f: 2, c: 26550}, 26607, 27468,
+    29634, 30146, 31292, 33499, 33540, 34903, 34952, 35382, [36040, 63747],
+    36303, 36603, 36838, 39381, 21051, 21364, 21508, 24682, 24932, 27580,
+    29647, 33050, 35258, [12179, 35282], 38307, 20355, 21002, 22718, 22904,
+    23014, [12082, 24178], 24185, 25031, 25536, 26438, 26604, 26751, 28567,
+    30286, 30475, 30965, 31240, 31487, 31777, 32925, [12169, 33390], 33393,
+    35563, 38291, 20075, 21917, 26359, 28212, 30883, 31469, 33883, 35088,
+    34638, 38824, 21208, 22350, 22570, 23884, 24863, 25022, 25121, 25954,
+    26577, 27204, 28187, [12130, 29976], 30131, 30435, 30640, 32058, 37039,
+    {f: 2, c: 37969}, 40853, 21283, 23724, 30002, 32987, 37440, 38296, 21083,
+    22536, 23004, 23713, 23831, 24247, 24378, 24394, 24951, 27743, 30074,
+    30086, 31968, 32115, 32177, 32652, 33108, 33313, 34193, 35137, 35611,
+    37628, [38477, 64009], 40007, 20171, 20215, 20491, 20977, 22607, 24887,
+    24894, 24936, 25913, 27114, 28433, 30117, 30342, 30422, 31623, 33445,
+    33995, 37799, 38283, 21888, 23458, 22353, 31923, 32697, 37301, 20520,
+    21435, 23621, 24040, 25298, 25454, 25818, 25831, 28192, 28844, 31067,
+    36317, 36382, 36989, 37445, 37624, 20094, 20214, 20581, [12081, 24062],
+    24314, 24838, 26967, 33137, 34388, 36423, 37749, 39467, 20062, 20625,
+    26480, 26688, 20745, 21133, 21138, 27298, 30652, 37392, 40660, 21163,
+    24623, 36850, 20552, 25001, 25581, 25802, 26684, 27268, 28608, 33160,
+    35233, 38548, 22533, 29309, [12125, 29356], 29956, 32121, 32365, 32937,
+    [12178, 35211, 64010], 35700, 36963, 40273, 25225, 27770, 28500, 32080,
+    32570, 35363, 20860, 24906, 31645, 35609, 37463, 37772, 20140, 20435,
+    20510, 20670, 20742, 21185, 21197, 21375, 22384, 22659, 24218, 24465,
+    24950, 25004, 25806, 25964, 26223, 26299, [26356, 63745], 26775, 28039,
+    28805, 28913, 29855, 29861, 29898, 30169, 30828, 30956, 31455, 31478,
+    32069, 32147, 32789, 32831, 33051, 33686, 35686, 36629, 36885, 37857,
+    38915, 38968, 39514, 39912, 20418, 21843, 22586, [22865, 63753], 23395,
+    23622, 24760, 25106, 26690, 26800, 26856, 28330, 30028, 30328, 30926,
+    31293, 31995, 32363, 32380, 35336, 35489, 35903, 38542, 40388, 21476,
+    21481, 21578, 21617, 22266, 22993, 23396, 23611, 24235, 25335, 25911,
+    25925, 25970, 26272, 26543, 27073, 27837, 30204, 30352, 30590, 31295,
+    32660, 32771, 32929, 33167, 33510, 33533, 33776, 34241, 34865, 34996,
+    35493, 36764, 37678, 38599, 39015, [12220, 39640], [12238, 40723], 21741,
+    26011, 26354, 26767, 31296, [12181, 35895], 40288, 22256, 22372, 23825,
+    26118, 26801, 26829, 28414, 29736, 34974, 39908, 27752, [12219, 39592],
+    20379, 20844, 20849, 21151, 23380, [12079, 24037], 24656, 24685, 25329,
+    25511, 25915, 29657, 31354, 34467, 36002, 38799, [20018, 63749], 23521,
+    [12093, 25096], 26524, [12128, 29916], 31185, 33747, 35463, 35506, 36328,
+    36942, 37707, 38982, [24275, 64011], 27112, 34303, 37101, 20896, 23448,
+    23532, 24931, 26874, 27454, 28748, 29743, 29912, 31649, 32592, 33733,
+    35264, 36011, 38364, 39208, 21038, 24669, 25324, 36866, 20362, 20809,
+    21281, 22745, 24291, 26336, 27960, 28826, 29378, 29654, 31568, 33009,
+    37979, 21350, 25499, 32619, 20054, 20608, 22602, 22750, 24618, 24871,
+    25296, 27088, 39745, 23439, 32024, 32945, 36703, 20132, 20689, 21676,
+    21932, 23308, 23968, 24039, 25898, 25934, 26657, 27211, 29409, 30350,
+    30703, 32094, 32761, 33184, 34126, 34527, 36611, 36686, 37066, 39171,
+    39509, 39851, 19992, 20037, 20061, 20167, 20465, 20855, 21246, 21312,
+    [12061, 21475], [21477, 63750], 21646, 22036, 22389, 22434, 23495, 23943,
+    24272, 25084, 25304, 25937, 26552, 26601, 27083, 27472, 27590, 27628,
+    27714, 28317, 28792, 29399, 29590, 29699, 30655, 30697, 31350, 32127,
+    32777, [12165, 33276], 33285, 33290, 33503, 34914, 35635, 36092, 36544,
+    36881, 37041, 37476, 37558, 39378, 39493, 40169, 40407,
+    [12244, 40860, 63751, 63752], 22283, 23616, 33738, 38816, 38827, 40628,
+    21531, 31384, 32676, 35033, 36557, 37089, 22528, 23624, 25496, 31391,
+    23470, [12088, 24339], 31353, 31406, 33422, 36524, 20518, 21048, 21240,
+    21367, 22280, 25331, 25458, 27402, 28099, 30519, 21413, 29527, 34152,
+    36470, 38357, 26426, 27331, 28528, 35437, 36556, 39243, 26231, 27512,
+    36020, [12225, 39740], 21483, 22317, 22862, 25542, 27131, 29674, 30789,
+    31418, 31429, 31998, 33909, 35215, 36211, 36917, 38312, 21243, 22343,
+    30023, 31584, 33740, 37406, 27224, 20811, 21067, 21127, 25119, 26840,
+    26997, 38553, 20677, 21156, 21220, 25027, [12100, 26020], 26681, 27135,
+    29822, 31563, 33465, 33771, 35250, 35641, 36817, 39241, 20170, 22935,
+    25810, 26129, 27278, 29748, 31105, 31165, 33449, {f: 2, c: 34942}, 35167,
+    37670, 20235, 21450, 24613, 25201, 27762, 32026, 32102, 20120, 20834,
+    30684, 32943, 20225, 20238, 20854, 20864, 21980, 22120, 22331, 22522,
+    22524, 22804, 22855, 22931, 23492, 23696, 23822, [12080, 24049], 24190,
+    24524, 25216, 26071, 26083, {f: 2, c: 26398}, 26462, 26827, 26820, 27231,
+    27450, 27683, 27773, 27778, 28103, 29592, 29734, 29738, 29826, 29859,
+    30072, 30079, 30849, 30959, 31041, {f: 2, c: 31047}, 31098, 31637, 32000,
+    32186, 32648, 32774, 32813, 32908, 35352, 35663, [35912, 63744], 36215,
+    37665, 37668, 39138, 39249, {f: 2, c: 39438}, 39525, 40594, 32202, 20342,
+    21513, 25326, 26708, [12198, 37329, 63754], 21931, 20794, 23068, 25062,
+    [25295, 63835], 25343, 37027, [35582, 63837], 26262, 29014, 38627, 25423,
+    25466, 21335, 26511, 26976, 28275, 30007, 32013, 34930, 22218, 23064,
+    20035, 20839, [22856, 63756], 26608, 32784, [12069, 22899, 63873],
+    [24180, 63886], [25754, 63889], [31178, 63893], [24565, 63907], 24684,
+    25288, [25467, 63908], [23527, 63839, 63914], 23511, 21162, 22900, 24361,
+    [24594, 63840], 29785, 39377, 28611, 33215, 36786, 24817, 33126,
+    [23615, 63933], 23273, 35365, [26491, 63944], [32016, 63951], 33021, 23612,
+    [27877, 63971], [21311, 63979], [28346, 63980], 22810, [33590, 63998],
+    [20025, 63838], 20150, 20294, 21934, 22296, 22727, 24406, 26039, 26086,
+    27264, 27573, 28237, 30701, 31471, 31774, 32222, 34507, 34962, 37170,
+    37723, 25787, 28606, 29562, 30136, 36948, 21846, 22349, 25018, 25812,
+    26311, 28129, 28251, 28525, 28601, 30192, 32835, 33213, 34113, 35203,
+    35527, 35674, 37663, 27795, 30035, 31572, 36367, 36957, 21776, 22530,
+    22616, 24162, 25095, 25758, 26848, 30070, [31958, 64003], 34739, 40680,
+    20195, 22408, 22382, [12068, 22823], 23565, 23729, 24118, 24453, 25140,
+    25825, 29619, 33274, 34955, 36024, 38538, 40667, [23429, 64004], 24503,
+    24755, 20498, [12049, 20992], 21040, 22294, 22581, 22615, 23566, 23648,
+    23798, 23947, [24230, 64001], 24466, 24764, 25361, 25481, 25623, 26691,
+    26873, 27330, 28120, 28193, 28372, 28644, 29182, 30428, 30585, 31153,
+    31291, 33796, 35241, 36077, 36339, 36424, 36867, 36884, 36947, 37117,
+    37709, 38518, 38876, 27602, 28678, 29272, 29346, 29544, 30563, 31167,
+    31716, 32411, [35712, 63834], 22697, 24775, 25958, 26109, 26302, 27788,
+    28958, 29129, 35930, 38931, 20077, 31361, 20189, 20908, 20941, 21205,
+    21516, 24999, 26481, 26704, 26847, [27934, 64005], 28540, 30140, 30643,
+    31461, 33012, 33891, 37509, 20828, [12099, 26007], 26460, 26515, 30168,
+    31431, 33651, [12182, 35910], 36887, 38957, 23663, 33216, 33434, 36929,
+    36975, 37389, 24471, 23965, 27225, 29128, 30331, 31561, 34276, 35588,
+    37159, 39472, [21895, 63755], [25078, 63757], [30313, 63758],
+    [32645, 63759], [34367, 63760], [34746, 63761], [35064, 63762],
+    [37007, 63763], [27931, 63765], [28889, 63766], [29662, 63767], 32097,
+    [33853, 63768], [37226, 63769], [39409, 63770], [20098, 63771],
+    [21365, 63772], [27396, 63773], 27410, 28734, [29211, 63774],
+    [34349, 63775], [40478, 63776], 21068, 36771, [23888, 63777], 25829, 25900,
+    27414, [28651, 63778], 31811, 32412, [34253, 63779], [35172, 63780], 35261,
+    [25289, 63781], [33240, 63782], [34847, 63783], [24266, 63784],
+    [26391, 63785], [28010, 63786], [29436, 63787], 29701, 29807, 34690,
+    [37086, 63788], [20358, 63789], 23821, 24480, 33802, [20919, 63790],
+    [25504, 63861], [30053, 63862], [20142, 63863], 20486, [20841, 63864],
+    [20937, 63865], [26753, 63866], 27153, 31918, 31921, [31975, 63867],
+    [33391, 63868], [35538, 63869], 36635, [37327, 63870], 20406, 20791,
+    [21237, 63871], [21570, 63872], [24300, 63874], 24942, 25150,
+    [26053, 63875], 27354, [28670, 63876], [31018, 63877], 34268, 34851,
+    [38317, 63878], 39522, [39530, 63879], [40599, 63880], [40654, 63881],
+    [12050, 21147, 63882], [26310, 63883], [27511, 63884], 28701, 31019,
+    [36706, 63885], 38722, [24976, 63887], [25088, 63888], 25891,
+    [28451, 63890], [29001, 63891], [29833, 63892], [32244, 63894],
+    [32879, 63895], [34030, 63897], [36646, 63896], [36899, 63898],
+    [37706, 63899], 20925, [21015, 63900], [21155, 63901], 27916,
+    [28872, 63903], [35010, 63904], [24265, 63906], 25986, [27566, 63909],
+    28610, [31806, 63910], [29557, 63911], [20196, 63912], 20278,
+    [22265, 63913], 23738, [23994, 63915], [24604, 63916], [29618, 63917],
+    31533, [32666, 63919], 32718, [32838, 63920], 36894, [37428, 63921],
+    [38646, 63922], [38728, 63923], [38936, 63924], 40801, [20363, 63925],
+    28583, [31150, 63926], [37300, 63927], [38583, 63928], [21214, 63791],
+    25736, [25796, 63792], [27347, 63793], 28510, 28696, [29200, 63794],
+    [30439, 63795], [12156, 32769, 63796], [34310, 63797], [34396, 63798],
+    [36335, 63799], 36613, [38706, 63800], [39791, 63801], [40442, 63802],
+    [12228, 40565], [30860, 63803], [31103, 63804], [32160, 63805],
+    [33737, 63806], [37636, 63807], [12229, 40575, 63808], 40595,
+    [35542, 63809], [22751, 63810], [24324, 63811], 26407, 28711, 29903,
+    [31840, 63812], [32894, 63813], 20769, 28712, [29282, 63814],
+    [30922, 63815], [36034, 63816], 36058, 36084, [38647, 63817],
+    [20102, 63930], [20698, 63931], [23534, 63932], 24278, [26009, 63934],
+    [29134, 63936], [30274, 63937], 30637, 32842, [34044, 63938],
+    [36988, 63939], 39719, [12243, 40845, 63940], [22744, 63818], 23105,
+    [23650, 63819], [27155, 63820], [28122, 63821], [28431, 63822], 30267,
+    [32047, 63823], [32311, 63824], 34078, 35128, 37860, [38475, 63825],
+    [21129, 63943], 26066, [26611, 63945], 27060, [27969, 63946],
+    [28316, 63947], 28687, [29705, 63948], 29792, [30041, 63949], 30244,
+    [30827, 63950], 35628, [39006, 63952], [20845, 63953], [25134, 63954],
+    [38520, 63955], 20374, [20523, 63956], [23833, 63957], [28138, 63958],
+    32184, [36650, 63959], [24459, 63960], [24900, 63961], [26647, 63962],
+    [38534, 63964], [21202, 63826], [32907, 63827], [20956, 63828],
+    [20940, 63829], 26974, [31260, 63830], [32190, 63831], [33777, 63832],
+    [38517, 63833], 20442, [21033, 63965], 21400, [21519, 63966], 21774,
+    [23653, 63967], 24743, [26446, 63969], [26792, 63970], 28012, 29313, 29432,
+    [29702, 63972], 29827, [30178, 63973], 31852, [32633, 63974], 32696, 33673,
+    [35023, 63975], [35041, 63976], [12197, 37324, 63977], 37328,
+    [38626, 63978], 39881, [21533, 63981], 28542, [29136, 63982],
+    [29848, 63983], [34298, 63984], 36522, [38563, 63985], [40023, 63986],
+    [40607, 63987], [26519, 63988], [28107, 63989], 29747, [33256, 63990],
+    38678, 30764, [12148, 31435, 63991], [31520, 63992], [31890, 63993], 25705,
+    29802, 30194, 30908, 30952, [12218, 39340], 39764, [12231, 40635], 23518,
+    24149, 28448, 33180, 33707, 37000, 19975, 21325, 23081, 24018, 24398,
+    24930, 25405, 26217, 26364, 28415, 28459, 28771, 30622, 33836, 34067,
+    34875, 36627, 39237, 39995, 21788, 25273, 26411, 27819, 33545, 35178,
+    38778, 20129, 22916, {f: 2, c: 24536}, 26395, 32178, 32596, 33426, 33579,
+    33725, 36638, 37017, 22475, 22969, 23186, 23504, 26151, 26522, 26757,
+    27599, 29028, 32629, 36023, 36067, 36993, 39749, 33032, 35978, 38476,
+    39488, [12230, 40613], 23391, 27667, 29467, 30450, 30431, 33804, 20906,
+    35219, 20813, 20885, 21193, 26825, 27796, 30468, 30496, 32191, 32236,
+    [12207, 38754], 40629, 28357, 34065, 20901, 21517, 21629, 26126, 26269,
+    26919, 28319, [12139, 30399], 30609, 33559, 33986, 34719, 37225, 37528,
+    40180, 34946, 20398, 20882, 21215, 22982, 24125, 24917, {f: 2, c: 25720},
+    26286, 26576, 27169, 27597, [12113, 27611], 29279, 29281, 29761, 30520,
+    [12141, 30683], 32791, 33468, 33541, 35584, 35624, 35980, [12106, 26408],
+    27792, 29287, [12140, 30446], 30566, 31302, 40361, 27519, 27794, 22818,
+    26406, 33945, 21359, 22675, 22937, 24287, 25551, 26164, 26483, 28218,
+    29483, 31447, 33495, 37672, 21209, 24043, 25006, 25035, 25098, 25287,
+    25771, [12102, 26080], 26969, 27494, [12111, 27595], 28961, 29687, 30045,
+    32326, 33310, 33538, 34154, 35491, 36031, 38695, 40289, 22696, 40664,
+    20497, 21006, 21563, 21839, [12098, 25991], 27766, {f: 2, c: 32010}, 32862,
+    34442, [12200, 38272], 38639, 21247, 27797, 29289, 21619, 23194, 23614,
+    23883, 24396, 24494, 26410, 26806, 26979, 28220, 28228, 30473,
+    [12150, 31859], 32654, 34183, 35598, 36855, 38753, 40692, 23735, 24758,
+    24845, 25003, 25935, {f: 2, c: 26107}, 27665, 27887, 29599, 29641, 32225,
+    38292, 23494, 34588, 35600, 21085, 21338, 25293, 25615, 25778, 26420,
+    27192, 27850, 29632, 29854, 31636, 31893, 32283, 33162, 33334, 34180,
+    36843, 38649, 39361, 20276, 21322, 21453, 21467, 25292, 25644, 25856,
+    26001, 27075, 27886, 28504, 29677, 30036, 30242, 30436, 30460, 30928,
+    [30971, 63844], 31020, 32070, 33324, 34784, 36820, 38930, 39151, 21187,
+    25300, 25765, 28196, 28497, 30332, 36299, 37297, 37474, 39662, 39747,
+    20515, 20621, 22346, 22952, 23592, 24135, 24439, 25151, 25918,
+    [12101, 26041], 26049, 26121, 26507, 27036, 28354, 30917, 32033, 32938,
+    33152, 33323, 33459, 33953, 34444, 35370, 35607, 37030, 38450, 40848,
+    20493, 20467, 22521, 24472, 25308, 25490, 26479, 28227, 28953, 30403,
+    32972, 32986, {f: 2, c: 35060}, 35097, 36064, 36649, 37197, 38506, 20271,
+    20336, 24091, 26575, 26658, [12137, 30333], 30334, 39748, 24161, 27146,
+    29033, 29140, 30058, 32321, 34115, 34281, 39132, 20240, 31567, 32624,
+    38309, 20961, 24070, 26805, 27710, 27726, 27867, 29359, 31684, 33539,
+    27861, 29754, 20731, 21128, 22721, 25816, 27287, 29863, 30294, 30887,
+    34327, 38370, 38713, 21342, 24321, 35722, 36776, 36783, 37002, 21029,
+    30629, 40009, 40712, 19993, 20482, 20853, 23643, 24183, 26142, 26170,
+    26564, 26821, 28851, 29953, 30149, 31177, 31453, 36647, 39200, 39432,
+    20445, 22561, 22577, 23542, 26222, 27493, 27921, 28282, 28541, 29668,
+    29995, 33769, 35036, 35091, 35676, 36628, 20239, 20693, 21264,
+    [12056, 21340], 23443, [24489, 63846], 26381, 31119, 33145, 33583, 34068,
+    35079, 35206, 36665, [36667, 64007], 39333, 39954, 26412, 20086, 20472,
+    22857, 23553, {f: 2, c: 23791}, 25447, 26834, 28925, 29090, 29739, 32299,
+    34028, 34562, 36898, 37586, 40179, [19981, 63847], 20184, 20463, 20613,
+    21078, 21103, 21542, 21648, 22496, 22827, 23142, 23386, 23413, 23500,
+    24220, 25206, 25975, 26023, 28014, 28325, [12119, 29238], 31526, 31807,
+    [12152, 32566], {f: 2, c: 33104}, 33178, 33344, 33433, 33705, 35331, 36000,
+    36070, 36091, 36212, 36282, 37096, 37340, [12201, 38428], 38468, 39385,
+    40167, [21271, 63843], 20998, 21545, 22132, 22707, 22868, 22894, 24575,
+    24996, 25198, 26128, 27774, 28954, 30406, 31881, 31966, 32027, 33452,
+    36033, 38640, 20315, 24343, 24447, 25282, 23849, 26379, 26842, 30844,
+    32323, 40300, 19989, 20633, [12052, 21269], 21290, 21329, 22915, 23138,
+    24199, 24754, 24970, 25161, 25209, 26000, 26503, 27047, [12112, 27604],
+    {f: 3, c: 27606}, 27832, 29749, 30202, 30738, 30865, 31189, 31192, 31875,
+    32203, 32737, 32933, 33086, 33218, 33778, 34586, 35048, 35513, 35692,
+    36027, 37145, [12206, 38750], [12214, 39131], [12240, 40763], 22188, 23338,
+    24428, 25996, 27315, 27567, 27996, 28657, 28693, 29277, 29613, 36007,
+    36051, 38971, 24977, 27703, 32856, 39425, 20045, 20107, 20123, 20181,
+    20282, 20284, 20351, 20447, 20735, 21490, 21496, 21766, 21987, 22235,
+    [12064, 22763], 22882, 23057, 23531, 23546, 23556, 24051, 24107, 24473,
+    24605, 25448, 26012, 26031, 26614, 26619, 26797, 27515, 27801, 27863,
+    28195, 28681, 29509, 30722, 31038, 31040, 31072, 31169, 31721, 32023,
+    32114, 32902, 33293, 33678, 34001, 34503, 35039, 35408, 35422, 35613,
+    36060, 36198, 36781, 37034, 39164, 39391, 40605, 21066, 26388, 20632,
+    21034, [12077, 23665], 25955, 27733, 29642, 29987, 30109, 31639, 33948,
+    37240, 38704, 20087, 25746, [27578, 63856], 29022, 34217, 19977, 26441,
+    26862, 28183, 33439, 34072, 34923, 25591, 28545, 37394, 39087, 19978,
+    20663, 20687, 20767, 21830, 21930, 22039, 23360, 23577, 23776, 24120,
+    24202, 24224, 24258, 24819, 26705, 27233, 28248, 29245, 29248,
+    [29376, 63994], 30456, 31077, 31665, 32724, 35059, 35316, 35443, 35937,
+    36062, 38684, [22622, 63852], 29885, 36093, 21959, 31329, [32034, 63850],
+    [12170, 33394], 29298, [12131, 29983], 29989, 31513, 22661, 22779, 23996,
+    24207, 24246, 24464, 24661, 25234, 25471, 25933, 26257, 26329, 26360,
+    26646, 26866, 29312, 29790, 31598, 32110, 32214, 32626, 32997, 33298,
+    34223, 35199, 35475, 36893, 37604, [12233, 40653], [12239, 40736],
+    [12067, 22805], 22893, 24109, 24796, 26132, 26227, 26512, 27728, 28101,
+    28511, [12143, 30707], 30889, 33990, 37323, 37675, 20185, 20682, 20808,
+    21892, 23307, 23459, 25159, 25982, 26059, 28210, 29053, 29697, 29764,
+    29831, 29887, 30316, 31146, 32218, 32341, 32680, 33146, 33203, 33337,
+    34330, 34796, 35445, 36323, 36984, 37521, 37925, 39245, 39854, 21352,
+    23633, 26964, 27844, 27945, 28203, [12166, 33292], 34203, 35131, 35373,
+    [35498, 63855, 63905], 38634, 40807, 21089, 26297, 27570, 32406, 34814,
+    36109, 38275, 38493, 25885, 28041, 29166, 22478, 22995, 23468, 24615,
+    24826, 25104, 26143, 26207, 29481, 29689, 30427, [30465, 63853], 31596,
+    32854, 32882, 33125, 35488, 37266, 19990, 21218, 27506, 27927, 31237,
+    31545, 32048, 36016, 21484, 22063, 22609, 23477, [12073, 23567], 23569,
+    24034, 25152, 25475, 25620, 26157, 26803, 27836, 28040, 28335, 28703,
+    28836, 29138, 29990, 30095, 30094, 30233, 31505, 31712, 31787, 32032,
+    32057, 34092, 34157, 34311, 35380, 36877, 36961, 37045, 37559, 38902,
+    39479, 20439, 23660, 26463, 28049, 31903, 32396, 35606, 36118, 36895,
+    23403, 24061, 25613, 33984, 36956, 39137, [29575, 63841, 63963], 23435,
+    24730, 26494, 28126, 35359, 35494, 36865, 38924, 21047, 28753, 30862,
+    37782, 34928, 37335, 20462, 21463, 22013, 22234, 22402, 22781, 23234,
+    23432, 23723, 23744, 24101, 24833, 25101, [12095, 25163], 25480, 25628,
+    25910, [25976, 63849], 27193, 27530, [12116, 27700], 27929, 28465, 29159,
+    29417, 29560, 29703, 29874, 30246, 30561, 31168, 31319, 31466, 31929,
+    32143, 32172, 32353, 32670, 33065, 33585, 33936, 34010, 34282, 34966,
+    35504, 35728, 36664, 36930, 36995, 37228, 37526, 37561, 38539,
+    {f: 2, c: 38567}, 38614, 38656, 38920, [12216, 39318], 39635, 39706, 21460,
+    22654, 22809, 23408, 23487, 28113, 28506, 29087, 29729, 29881, 32901,
+    33789, 24033, 24455, 24490, 24642, 26092, 26642, 26991, 27219, 27529,
+    27957, 28147, 29667, 30462, 30636, 31565, 32020, 33059, 33308, 33600,
+    34036, 34147, 35426, 35524, 37255, 37662, 38918, 39348, 25100, 34899,
+    36848, 37477, 23815, 23847, 23913, 29791, 33181, 34664, 28629,
+    [25342, 63859], 32722, 35126, 35186, 19998, 20056, 20711, 21213, 21319,
+    25215, 26119, 32361, 34821, 38494, 20365, 21273, 22070, 22987, 23204,
+    [12075, 23608], 23630, 23629, 24066, 24337, 24643, 26045, 26159, 26178,
+    26558, 26612, 29468, [12142, 30690], [12144, 31034], 32709, 33940, 33997,
+    35222, 35430, 35433, 35553, [12183, 35925], 35962, 22516, 23508, 24335,
+    24687, 25325, 26893, 27542, 28252, 29060, 31698, 34645, [35672, 63996],
+    36606, [12215, 39135], 39166, 20280, 20353, 20449, 21627, 23072, 23480,
+    24892, 26032, 26216, 29180, 30003, 31070, 32051, 33102, [12162, 33251],
+    33688, 34218, 34254, 34563, 35338, [12189, 36523], [12191, 36763], 36805,
+    22833, 23460, 23526, 24713, 23529, 23563, [12092, 24515], 27777, 28145,
+    28683, 29978, 33455, 35574, [20160, 63997], [12055, 21313], 38617,
+    [12114, 27663], 20126, 20420, 20818, 21854, 23077, 23784, 25105,
+    [12123, 29273], 33469, 33706, 34558, 34905, 35357, 38463, 38597, 39187,
+    40201, 40285, 22538, 23731, 23997, 24132, [24801, 63929], 24853, 25569,
+    [27138, 63764, 63836, 63935], 28197, 37122, 37716, 38990, 39952, 40823,
+    23433, 23736, 25353, 26191, 26696, 30524, 38593, 38797, 38996, 39839,
+    26017, 35585, 36555, 38332, 21813, 23721, 24022, 24245, 26263, 30284,
+    33780, 38343, 22739, 25276, 29390, 40232, 20208, 22830, 24591, 26171,
+    27523, 31207, 40230, 21395, 21696, 22467, 23830, 24859, 26326, 28079,
+    30861, 33406, 38552, 38724, 21380, 25212, 25494, 28082, 32266, 33099,
+    38989, 27387, 32588, 40367, 40474, 20063, 20539, 20918, 22812, 24825,
+    25590, 26928, 29242, 32822, 37326, 24369, 32004, [33509, 63860], 33903,
+    33979, 34277, 36493, 20335, 22756, 23363, 24665, 25562, 25880, 25965,
+    26264, 26954, 27171, 27915, 28673, 29036, 30162, 30221, 31155, 31344,
+    [12154, 32650], 35140, 35731, 37312, 38525, 39178, 22276, 24481, 26044,
+    28417, 30208, 31142, 35486, 39341, [12226, 39770], 40812, 20740, 25014,
+    25233, 27277, 33222, 20547, 22576, 24422, 28937, [12180, 35328], 35578,
+    23420, 34326, 20474, 20796, 22196, 22852, 25513, 28153, 23978, 26989,
+    20870, 20104, 20313, 22914, 27487, 27741, 29877, 30998, 33287, 33349,
+    33593, 36671, 36701, 39192, 20134, 22495, 24441, [26131, 63968], 30123,
+    32377, 35695, 36870, 39515, 22181, 22567, 23032, 23071, 23476, 24310,
+    25424, 25403, 26941, 27783, 27839, 28046, 28051, 28149, 28436, 28895,
+    28982, 29017, 29123, 29141, 30799, 30831, 31605, 32227, 32303, 34893,
+    36575, 37467, 40182, 24709, 28037, 29105, 38321, 21421, 26579, 28814,
+    28976, 29744, 33398, 33490, 38331, 39653, 40573, 26308, 29121,
+    [33865, 63854], 22603, 23992, 24433, 26144, 26254, 27001, 27054, 27704,
+    27891, 28214, 28481, 28634, 28699, 28719, 29008, 29151, 29552, 29787,
+    29908, 30408, 31310, 32403, 33521, 35424, 36814, 37704, 38681, 20034,
+    20522, 21000, 21473, 26355, 27757, 28618, 29450, 30591, 31330, 33454,
+    34269, 34306, 35028, 35427, 35709, 35947, 37555, 38675, 38928, 20116,
+    20237, 20425, 20658, 21320, 21566, 21555, 21978, 22626, 22714, 22887,
+    23067, 23524, 24735, 25034, 25942, 26111, 26212, 26791, 27738, 28595,
+    28879, 29100, 29522, 31613, 34568, 35492, 39986, 40711, 23627, 27779,
+    29508, [12127, 29577], 37434, 28331, 29797, 30239, 31337, 32277, 34314,
+    20800, 22725, 25793, 29934, 29973, 30320, 32705, 37013, 38605, 39252,
+    28198, [12129, 29926], {f: 2, c: 31401}, 33253, 34521, 34680, 35355, 23113,
+    23436, 23451, 26785, 26880, 28003, 29609, 29715, 29740, 30871, 32233,
+    32747, 33048, 33109, 33694, 35916, [38446, 63942], 38929, [12104, 26352],
+    24448, 26106, 26505, 27754, 29579, 20525, 23043, 27498, 30702, 22806,
+    23916, 24013, 29477, 30031, 20709, 20985, 22575, 22829, 22934, 23002,
+    23525, 23970, 25303, 25622, 25747, 25854, 26332, 27208, 29183, 29796,
+    31368, 31407, 32327, 32350, 32768, 33136, 34799, 35201, 35616, 36953,
+    36992, 39250, 24958, 27442, 28020, 32287, 35109, 36785, 20433, 20653,
+    20887, 21191, 22471, 22665, 23481, 24248, 24898, 27029, 28044, 28263,
+    28342, 29076, 29794, [12132, 29992], 29996, 32883, 33592, 33993, 36362,
+    37780, 37854, 20110, 20305, 20598, 20778, [12060, 21448], 21451, 21491,
+    23431, 23507, 23588, 24858, 24962, 26100, [12124, 29275], 29591, 29760,
+    30402, 31056, 31121, 31161, 32006, [12155, 32701], 33419, 34261, 34398,
+    36802, 36935, 37109, 37354, 38533, [12204, 38632], 38633, 21206, 24423,
+    26093, 26161, 26671, 29020, 31286, 37057, 38922, 20113, 27218, 27550,
+    28560, 29065, 32792, 33464, 34131, 36939, 38549, 38642, 38907, 34074,
+    39729, 20112, 29066, 38596, 20803, 21407, 21729, 22291, 22290, 22435,
+    23195, 23236, 23491, 24616, 24895, 25588, 27781, 27961, 28274, 28304,
+    29232, 29503, 29783, 33489, 34945, 36677, 36960, 38498, 39000, 40219,
+    [12105, 26376], 36234, 37470, 20301, 20553, 20702, 21361, 22285, 22996,
+    23041, 23561, 24944, 26256, 28205, 29234, 29771, 32239, 32963, 33806,
+    33894, 34111, 34655, 34907, 35096, 35586, 36949, [12209, 38859], 39759,
+    20083, 20369, 20754, 20842, 21807, 21929, 23418, 23461, {f: 2, c: 24188},
+    24254, 24736, 24799, {f: 2, c: 24840}, 25540, 25912, 26377, 26580, 26586,
+    {f: 2, c: 26977}, 27833, 27943, 28216, 28641, {f: 2, c: 29494}, 29788,
+    30001, 30290, 32173, 33278, 33848, 35029, 35480, 35547, 35565, 36400,
+    36418, 36938, 36926, 36986, [12195, 37193], 37321, 37742, 22537, 27603,
+    [12161, 32905], 32946, 20801, 22891, 23609, 28516, 29607, 32996, 36103,
+    37399, 38287, [12160, 32895], 25102, 28700, 32104, 34701, 22432, 24681,
+    24903, 27575, 35518, 37504, 38577, [12036, 20057], 21535, 28139, 34093,
+    38512, [12211, 38899], 39150, 25558, 27875, [12194, 37009], 20957, 25033,
+    33210, 40441, 20381, 20506, 20736, 23452, 24847, 25087, 25836, 26885,
+    27589, 30097, 30691, 32681, 33380, 34191, 34811, [12176, 34915], 35516,
+    35696, 37291, [12038, 20108], 20197, 20234, 22839, 23016, 24050, 24347,
+    24411, 24609, 29246, 29669, [30064, 63842], 30157, 31227, [12157, 32780],
+    [12159, 32819], 32900, 33505, 33617, 36029, 36019, 36999, 39156, 39180,
+    28727, 30410, 32714, 32716, 32764, 35610, [12040, 20154], 20161, 20995,
+    21360, [21693, 63902], 22240, 23035, 23493, 24341, 24525, 28270, 32106,
+    33589, 34451, 35469, 38765, 38775, [12032, 19968], 20314, 20350, 22777,
+    [12103, 26085], 28322, 36920, 37808, 39353, 20219, 22764, 22922, 23001,
+    24641, 31252, 33615, 36035, [12042, 20837], 21316, 20173, 21097, 23381,
+    33471, 20180, [21050, 63999], 21672, 22985, 23039, [12070, 23376], 23383,
+    23388, 24675, 24904, 28363, [28825, 63995], 29038, 29574, 29943, 30133,
+    30913, 32043, 32773, [12163, 33258], 33576, 34071, 34249, 35566, 36039,
+    38604, 20316, 21242, 22204, 26027, 26152, 28796, 28856, 29237, 32189,
+    33421, 37196, 38592, 40306, 23409, 26855, 27544, 28538, 30430, 23697,
+    26283, 28507, 31668, 31786, 34870, 38620, 19976, 20183, 21280, 22580,
+    22715, 22767, 22892, 23559, 24115, 24196, 24373, 25484, 26290, 26454,
+    27167, 27299, 27404, 28479, 29254, 29520, 29835, 31456, 31911, 33144,
+    33247, 33255, 33674, 33900, 34083, 34196, 34255, 35037, 36115, 37292,
+    [12199, 38263], 38556, 20877, 21705, 22312, 23472, 25165, 26448, 26685,
+    26771, 28221, 28371, 28797, 32289, 35009, 36001, 36617, 40779, 40782,
+    29229, 31631, 35533, 37658, 20295, 20302, 20786, 21632, 22992, 24213,
+    25269, 26485, 26990, 27159, 27822, 28186, 29401, 29482, 30141, 31672,
+    32053, 33511, 33785, 33879, 34295, 35419, 36015, 36487, 36889, 37048,
+    38606, 40799, 21219, 21514, 23265, 23490, 25688, 25973, 28404, 29380,
+    30340, 31309, 31515, 31821, 32318, 32735, 33659, 35627, 36042,
+    [12186, 36196], 36321, 36447, 36842, 36857, 36969, 37841, 20291, 20346,
+    20659, 20840, 20856, 21069, 21098, 22625, 22652, 22880, 23560, 23637,
+    24283, 24731, 25136, 26643, 27583, 27656, 28593, 29006, 29728,
+    [12133, 30000], 30008, 30033, 30322, 31564, 31627, 31661, 31686, 32399,
+    35438, 36670, 36681, 37439, 37523, 37666, 37931, 38651, 39002, 39019,
+    39198, [20999, 64000], 25130, 25240, 27993, 30308, 31434, 31680, 32118,
+    21344, 23742, 24215, 28472, 28857, 31896, 38673, 39822, 40670, 25509,
+    25722, 34678, 19969, 20117, 20141, 20572, 20597, 21576, 22979, 23450,
+    24128, 24237, 24311, 24449, 24773, 25402, 25919, 25972, 26060, 26230,
+    26232, 26622, 26984, 27273, 27491, 27712, 28096, 28136, 28191, 28254,
+    28702, 28833, 29582, 29693, 30010, 30555, 30855, 31118, 31243, 31357,
+    31934, 32142, 33351, 35330, 35562, 35998, 37165, 37194, 37336, 37478,
+    37580, 37664, 38662, 38742, 38748, 38914, [12237, 40718], 21046, 21137,
+    21884, 22564, 24093, 24351, 24716, 25552, 26799, 28639, 31085, 31532,
+    33229, 34234, 35069, 35576, 36420, 37261, 38500, 38555, 38717, 38988,
+    [12241, 40778], 20430, 20806, 20939, 21161, 22066, 24340, 24427, 25514,
+    25805, 26089, 26177, 26362, 26361, 26397, 26781, 26839, 27133, 28437,
+    28526, 29031, 29157, [12118, 29226], 29866, 30522, 31062, 31066, 31199,
+    31264, 31381, 31895, 31967, 32068, 32368, 32903, 34299, 34468, 35412,
+    35519, 36249, 36481, 36896, 36973, 37347, 38459, 38613, [12227, 40165],
+    26063, 31751, [12188, 36275], 37827, 23384, 23562, 21330, 25305, 29469,
+    20519, 23447, 24478, 24752, 24939, 26837, 28121, 29742, 31278, 32066,
+    32156, 32305, 33131, 36394, 36405, 37758, 37912, 20304, 22352, 24038,
+    24231, 25387, 32618, 20027, 20303, 20367, 20570, 23005, 32964, 21610,
+    21608, 22014, 22863, 23449, 24030, 24282, 26205, 26417, 26609, 26666,
+    27880, 27954, 28234, 28557, 28855, 29664, 30087, 31820, 32002, 32044,
+    32162, [12168, 33311], 34523, 35387, 35461, [12187, 36208], 36490, 36659,
+    36913, 37198, 37202, 37956, 39376, [12149, 31481], 31909, 20426, 20737,
+    20934, 22472, 23535, 23803, 26201, 27197, 27994, 28310, 28652, 28940,
+    30063, 31459, 34850, 36897, 36981, 38603, 39423, 33537, 20013, 20210,
+    34886, 37325, 21373, 27355, 26987, 27713, 33914, 22686, 24974, 26366,
+    25327, 28893, 29969, 30151, 32338, 33976, 35657, 36104, 20043, 21482,
+    21675, 22320, 22336, 24535, 25345, 25351, 25711, [12096, 25903], 26088,
+    26234, 26525, 26547, [12108, 27490], 27744, 27802, 28460, 30693, 30757,
+    31049, 31063, 32025, 32930, 33026, [12164, 33267], 33437, 33463, 34584,
+    35468, 36100, 36286, 36978, 30452, 31257, 31287, 32340, 32887, 21767,
+    21972, 22645, 25391, 25634, 26185, 26187, 26733, 27035, 27524, 27941,
+    28337, 29645, 29800, 29857, 30043, 30137, 30433, 30494, 30603, 31206,
+    32265, 32285, 33275, 34095, 34967, 35386, 36049, 36587,
+    [12192, 36784, 63857], 36914, 37805, 38499, 38515, 38663, 20356, 21489,
+    23018, 23241, 24089, 26702, 29894, 30142, 31209, 31378, 33187, 34541,
+    36074, 36300, 36845, 26015, 26389, 22519, 28503, 32221, 36655, 37878,
+    38598, 24501, 25074, 28548, 19988, 20376, 20511, 21449, 21983, 23919,
+    24046, 27425, 27492, 30923, 31642, 36425, [12190, 36554, 63746], 36974,
+    25417, 25662, 30528, 31364, 37679, 38015, 40810, 25776, 28591, 29158,
+    29864, 29914, 31428, 31762, 32386, 31922, 32408, 35738, 36106, 38013,
+    39184, 39244, 21049, 23519, 25830, 26413, 32046, 20717, [21443, 63851],
+    22649, {f: 2, c: 24920}, 25082, 26028, 31449, 35730, 35734, 20489, 20513,
+    21109, 21809, 23100, 24288, 24432, 24884, 25950, 26124, 26166, 26274,
+    27085, 28356, 28466, 29462, 30241, 31379, 33081, 33369, 33750, 33980,
+    20661, 22512, 23488, 23528, 24425, 25505, 30758, 32181, 33756, 34081,
+    37319, 37365, 20874, 26613, 31574, 36012, 20932, 22971, 24765, 34389,
+    20508, 21076, 23610, 24957, 25114, [25299, 64002], 25842, 26021, 28364,
+    30240, 33034, 36448, 38495, 38587, 20191, 21315, 21912, 22825, 24029,
+    25797, 27849, 28154, 29588, 31359, [12167, 33307], 34214, 36068, 36368,
+    36983, 37351, 38369, 38433, 38854, 20984, 21746, 21894, 24505, 25764,
+    28552, 32180, 36639, 36685, 37941, 20681, 23574, 27838, 28155, 29979,
+    30651, 31805, 31844, 35449, 35522, 22558, 22974, 24086, 25463, 29266,
+    30090, 30571, 35548, 36028, 36626, 24307, 26228, 28152, 32893, 33729,
+    35531, [12205, 38737], 39894, 21059, 26367, 28053, 28399, 32224, 35558,
+    36910, 36958, 39636, 21021, 21119, 21736, 24980, 25220, 25307, 26786,
+    26898, 26970, 27189, 28818, 28966, 30813, 30977, 30990, 31186, 31245,
+    32918, [12171, 33400], 33493, 33609, 34121, 35970, 36229, 37218, 37259,
+    37294, 20419, 22225, 29165, 30679, 34560, 35320, [12072, 23544], 24534,
+    26449, 37032, 21474, 22618, 23541, 24740, 24961, 25696, 32317, 32880,
+    34085, 37507, 25774, 20652, 23828, 26368, 22684, 25277, 25512, 26894,
+    27000, 27166, 28267, 30394, 31179, 33467, 33833, 35535, 36264, 36861,
+    37138, 37195, 37276, 37648, 37656, 37786, 38619, 39478, 39949, 19985,
+    30044, 31069, 31482, 31569, 31689, 32302, 33988, 36441, 36468, 36600,
+    36880, 26149, 26943, 29763, 20986, 26414, 40668, 20805, 24544, 27798,
+    34802, 34909, 34935, 24756, 33205, 33795, 36101, 21462, 21561, 22068,
+    23094, 23601, 28810, 32736, 32858, 33030, 33261, 36259, 37257, 39519,
+    40434, 20596, 20164, 21408, 24827, 28204, 23652, 20360, 20516, 21988,
+    23769, 24159, 24677, 26772, 27835, 28100, 29118, 30164, 30196, 30305,
+    31258, 31305, 32199, 32251, 32622, 33268, 34473, 36636, 38601, 39347,
+    [12242, 40786], 21063, 21189, 39149, 35242, 19971, 26578, 28422, 20405,
+    23522, 26517, [27784, 63858], 28024, 29723, 30759, 37341, 37756, 34756,
+    31204, 31281, 24555, 20182, 21668, 21822, 22702, 22949, 24816, 25171,
+    25302, 26422, 26965, 33333, 38464, 39345, 39389, 20524, 21331, 21828,
+    22396, 25176, 25826, 26219, 26589, 28609, 28655, 29730, 29752, 35351,
+    37944, 21585, 22022, 22374, 24392, 24986, 27470, 28760, 28845, 32187,
+    35477, 22890, 33067, 25506, 30472, 32829, 36010, 22612, 25645, 27067,
+    23445, 24081, 28271, 34153, 20812, 21488, 22826, 24608, 24907, 27526,
+    27760, 27888, 31518, 32974, 33492, 36294, 37040, 39089, 25799, 28580,
+    25745, 25860, 20814, 21520, [12063, 22303], 35342, 24927, 26742, 30171,
+    31570, 32113, 36890, 22534, 27084, 33151, 35114, 36864, 38969, 20600,
+    22871, 22956, 25237, 36879, 39722, 24925, 29305, 38358, 22369, 23110,
+    24052, 25226, 25773, 25850, 26487, 27874, 27966, 29228, 29750, 30772,
+    32631, 33453, 36315, 38935, 21028, 22338, 26495, 29256, 29923, 36009,
+    36774, 37393, 38442, [12043, 20843], 21485, 25420, 20329, 21764, 24726,
+    25943, 27803, 28031, 29260, 29437, 31255, 35207, [12185, 35997], 24429,
+    28558, 28921, 33192, 24846, [20415, 63845], 20559, 25153, [12122, 29255],
+    31687, 32232, 32745, 36941, 38829, 39449, 36022, 22378, 24179, 26544,
+    33805, 35413, 21536, 23318, 24163, 24290, 24330, 25987, 32954, 34109,
+    38281, 38491, 20296, 21253, 21261, 21263, 21638, 21754, 22275, 24067,
+    24598, 25243, 25265, 25429, 27873, 28006, 30129, 30770, 32990, 33071,
+    33502, 33889, 33970, 34957, 35090, 36875, 37610, 39165, 39825, 24133,
+    [26292, 64006], 26333, 28689, 29190, 20469, 21117, 24426, 24915, 26451,
+    27161, 28418, 29922, 31080, 34920, 35961, 39111, 39108, 39491, 21697,
+    31263, 26963, 35575, 35914, [12213, 39080], 39342, 24444, 25259, 30130,
+    [12138, 30382], 34987, 36991, 38466, 21305, 24380, 24517, [27852, 63848],
+    29644, 30050, [12134, 30091], 31558, 33534, 39325, 20047, 36924, 19979,
+    20309, 21414, 22799, 24264, 26160, 27827, 29781, 33655, 34662, 36032,
+    36944, 38686, 39957, 22737, 23416, 34384, 35604, 40372, 23506, 24680,
+    24717, 26097, 27735, 28450, 28579, 28698, 32597, 32752, {f: 2, c: 38289},
+    38480, 38867, 21106, 36676, 20989, 21547, 21688, 21859, 21898, 27323,
+    28085, 32216, 33382, 37532, 38519, 40569, 21512, 21704, 30418, 34532,
+    38308, 38356, 38492, 20130, 20233, 23022, 23270, 24055, 24658, 25239,
+    26477, 26689, 27782, 28207, 32568, 32923, 33322, 38917, 20133, 20565,
+    21683, 22419, 22874, 23401, 23475, 25032, 26999, 28023, 28707, 34809,
+    35299, 35442, 35559, 36994, 39405, 39608, 21182, 26680, 20502, 24184,
+    26447, 33607, [12175, 34892, 64008], 20139, 21521, 22190, 29670, 37141,
+    38911, 39177, 39255, [12217, 39321], 22099, 22687, 34395, 35377, 25010,
+    27382, 29563, 36562, 27463, 38570, 39511, 22869, 29184, 36203,
+    [12208, 38761], 20436, 23796, 24358, 25080, 26203, 27883, 28843,
+    [12126, 29572], 29625, 29694, 30505, 30541, 32067, 32098, 32291, 33335,
+    34898, 36066, 37449, 39023, 23377, [12147, 31348], [12174, 34880],
+    [12212, 38913], 23244, 20448, 21332, 22846, 23805, 25406, 28025, 29433,
+    33029, 33031, 33698, 37583, 38960, 20136, 20804, 21009, 22411, 24418,
+    27842, 28366, 28677, 28752, 28847, 29074, 29673, [29801, 63918], 33610,
+    34722, 34913, 36872, 37026, 37795, 39336, 20846, 24407, 24800, 24935,
+    26291, 34137, 36426, 37295, 38795, 20046, 20114, 21628, 22741, 22778,
+    22909, 23733, 24359, [12094, 25142], 25160, 26122, 26215, 27627, 28009,
+    28111, 28246, 28408, 28564, 28640, 28649, 28765, 29392, 29733, 29786,
+    29920, 30355, 31068, 31946, 32286, 32993, 33446, 33899, 33983, 34382,
+    34399, 34676, 35703, 35946, 37804, 38912, 39013, 24785, 25110, 37239,
+    23130, 26127, 28151, 28222, 29759, 39746, 24573, 24794, 31503, 21700,
+    24344, 27742, 27859, 27946, 28888, 32005, 34425, 35340, 40251, 21270,
+    21644, 23301, 27194, [12117, 28779], 30069, 31117, [12146, 31166], 33457,
+    33775, 35441, 35649, 36008, 38772, 25844, 25899, {f: 2, c: 30906}, 31339,
+    20024, 21914, 22864, 23462, 24187, 24739, 25563, 27489, 26213, 26707,
+    28185, 29029, 29872, 32008, 36996, 39529, 39973, 27963, [28369, 63748],
+    29502, 35905, 38346, 20976, 24140, 24488, 24653, 24822, 24880, 24908,
+    {f: 2, c: 26179}, 27045, 27841, 28255, 28361, 28514, 29004, 29852, 30343,
+    31681, 31783, 33618, 34647, 36945, 38541, [12232, 40643], 21295, 22238,
+    24315, 24458, 24674, 24724, 25079, 26214, 26371, 27292, 28142, 28590,
+    28784, 29546, 32362, 33214, 33588, 34516, 35496, 36036, 21123, 29554,
+    23446, 27243, 37892, 21742, 22150, 23389, 25928, 25989, 26313, 26783,
+    28045, 28102, [12120, 29243], 32948, 37237, 39501, 20399, 20505, 21402,
+    21518, 21564, 21897, 21957, 24127, 24460, 26429, 29030, 29661, 36869,
+    21211, 21235, 22628, 22734, 28932, 29071, 29179, 34224, 35347,
+    [26248, 63941], 34216, 21927, 26244, 29002, 33841, 21321, 21913, 27585,
+    24409, 24509, 25582, 26249, 28999, 35569, 36637, 40638, 20241, 25658,
+    28875, 30054, 34407, 24676, 35662, 40440, 20807, 20982, 21256, 27958,
+    33016, [12234, 40657], 26133, 27427, 28824, 30165, 21507, 23673, 32007,
+    35350, [12107, 27424], 27453, 27462, 21560, 24688, 27965, 32725, 33288,
+    20694, 20958, 21916, 22123, 22221, 23020, 23305, 24076, 24985, 24984,
+    25137, 26206, 26342, 29081, {f: 2, c: 29113}, 29351, 31143, 31232, 32690,
+    35440, {s: 163}, {f: 4, c: 12310}, {s: 14}, 8223, 8219, {f: 2, c: 8314},
+    {s: 7}, 8316, 0, {f: 2, c: 8317}, {s: 23}, 700, {s: 44}, 8942, 8759,
+    {s: 20}, {f: 10, c: 10122}, {s: 36}, {f: 26, c: 9398}, {s: 61},
+    {f: 2, c: 8826}, {f: 2, c: 8910}, {f: 2, c: 8832}, {f: 4, c: 8816}, 0,
+    8842, 0, 8843, {f: 2, c: 8822}, 8825, {f: 2, c: 8922}, {s: 5}, 8773, 8771,
+    8776, 0, 8868, {s: 78}, 8244, {s: 11}, 9839, {s: 4}, 8258, {s: 4}, 10045,
+    0, 0, 8226, {s: 4}, {f: 2, c: 8249}, {s: 16}, 10010, 10006, 0, 9711,
+    {s: 3}, 10070, 0, 9676, {s: 24}, 9775, {s: 6}, 12320, 0, {f: 10, c: 10102},
+    {s: 17}, 12306, 12342, {s: 13}, 8710, 0, 8735, 0, {f: 2, c: 8741}, 0, 8787,
+    8785, {f: 2, c: 8806}, 8723, {f: 3, c: 8853}, 0, 8980, 0, 0, 8802, 0, 9649,
+    0, 8738, 8784, 0, 0, 8867, 0, 0, {f: 2, c: 8814}, 8837, 8836, 8713, 8716,
+    {f: 2, c: 8891}, 8794, 8966, {s: 6}, 12958, 0, 8252, {s: 11}, 9702, {s: 3},
+    9663, 9653, 9657, 9667, {s: 4}, 9674, 12849, 12857, 13259, {f: 5, c: 9327},
+    {s: 18}, 8656, 8655, 8653, {s: 37}, 8657, 8659, {s: 8}, 8626, 8625, 0,
+    8628, 8624, 8627, {s: 14}, 8636, 8640, {s: 10}, {f: 2, c: 8644}, {s: 144},
+    {f: 5, c: 9347}, {s: 33}, 12948, {s: 15}, 12965, {s: 93}, 8672, 8674, 8673,
+    8675, {s: 4}, 8678, 8680, 8679, 8681, {s: 20}, 9757, 9759, {s: 76}, 12944,
+    {f: 6, c: 12938}, {s: 15}, {f: 2, c: 12318}, 8246, 0, 8245, {s: 3}, 12540,
+    0, 0, {f: 2, c: 44034}, {f: 2, c: 44037}, {f: 5, c: 44043}, 44056,
+    {f: 2, c: 44062}, {f: 3, c: 44065}, {f: 7, c: 44069}, 44078,
+    {f: 6, c: 44082}, {f: 2, c: 44090}, {f: 3, c: 44093}, {f: 10, c: 44097},
+    44108, {f: 6, c: 44110}, {f: 3, c: 44117}, {f: 3, c: 44121},
+    {f: 19, c: 44125}, {f: 2, c: 44146}, {f: 2, c: 44149}, 44153,
+    {f: 5, c: 44155}, 44162, {f: 2, c: 44167}, {f: 3, c: 44173},
+    {f: 3, c: 44177}, {f: 7, c: 44181}, 44190, {f: 6, c: 44194}, 44203,
+    {f: 2, c: 44205}, {f: 7, c: 44209}, 44218, {f: 3, c: 44222},
+    {f: 2, c: 44226}, {f: 3, c: 44229}, {f: 3, c: 44233}, {f: 8, c: 44237},
+    44246, {f: 8, c: 44248}, {f: 2, c: 44258}, {f: 2, c: 44261}, 44265, 44267,
+    {f: 2, c: 44269}, 44274, 44276, {f: 5, c: 44279}, {f: 2, c: 44286},
+    {f: 3, c: 44289}, 44293, {f: 5, c: 44295}, 44302, 44304, {f: 6, c: 44306},
+    {f: 3, c: 44313}, {f: 3, c: 44317}, {f: 8, c: 44321}, {f: 2, c: 44330},
+    {f: 6, c: 44334}, {f: 2, c: 44342}, {f: 3, c: 44345}, {f: 7, c: 44349},
+    44358, 44360, {f: 6, c: 44362}, {f: 3, c: 44369}, {f: 3, c: 44373},
+    {f: 8, c: 44377}, 44386, {f: 8, c: 44388}, {f: 2, c: 44398},
+    {f: 2, c: 44401}, {f: 4, c: 44407}, 44414, 44416, {f: 5, c: 44419},
+    {f: 2, c: 44426}, {f: 3, c: 44429}, {f: 11, c: 44433}, {f: 6, c: 44446},
+    {f: 18, c: 44453}, {f: 8, c: 44472}, {f: 2, c: 44482}, {f: 3, c: 44485},
+    {f: 7, c: 44489}, 44498, {f: 8, c: 44500}, {f: 3, c: 44509},
+    {f: 3, c: 44513}, {f: 19, c: 44517}, {f: 2, c: 44538}, {f: 2, c: 44541},
+    {f: 6, c: 44546}, 44554, 44556, {f: 6, c: 44558}, {f: 27, c: 44565},
+    {f: 2, c: 44594}, {f: 2, c: 44597}, 44601, {f: 5, c: 44603}, 44610, 44612,
+    {f: 3, c: 44615}, 44619, 44623, {f: 3, c: 44625}, 44629, {f: 5, c: 44631},
+    44638, {f: 3, c: 44642}, {f: 2, c: 44646}, {f: 2, c: 44650},
+    {f: 3, c: 44653}, {f: 7, c: 44657}, 44666, {f: 6, c: 44670},
+    {f: 6, c: 44678}, {f: 47, c: 44685}, 44735, {f: 3, c: 44737},
+    {f: 7, c: 44741}, 44750, {f: 6, c: 44754}, {f: 2, c: 44762},
+    {f: 11, c: 44765}, {f: 2, c: 44777}, 44780, {f: 6, c: 44782},
+    {f: 3, c: 44789}, {f: 3, c: 44793}, {f: 10, c: 44797}, {f: 4, c: 44809},
+    {f: 2, c: 44814}, {f: 27, c: 44817}, {f: 2, c: 44846}, 44849, 44851,
+    {f: 7, c: 44853}, 44862, 44864, {f: 4, c: 44868}, {f: 6, c: 44874},
+    {f: 11, c: 44881}, {f: 6, c: 44894}, {f: 19, c: 44902}, {f: 6, c: 44922},
+    {f: 3, c: 44929}, {f: 3, c: 44933}, {f: 7, c: 44937}, {f: 3, c: 44946},
+    {f: 6, c: 44950}, {f: 27, c: 44957}, {f: 2, c: 44986}, {f: 3, c: 44989},
+    {f: 6, c: 44993}, 45002, 45004, {f: 5, c: 45007}, {f: 7, c: 45013},
+    {f: 11, c: 45021}, {f: 6, c: 45034}, {f: 2, c: 45042}, {f: 3, c: 45045},
+    {f: 7, c: 45049}, {f: 2, c: 45058}, {f: 7, c: 45061}, {f: 3, c: 45069},
+    {f: 3, c: 45073}, {f: 7, c: 45077}, {f: 10, c: 45086}, {f: 27, c: 45097},
+    {f: 2, c: 45126}, 45129, 45131, 45133, {f: 4, c: 45135}, 45142, 45144,
+    {f: 3, c: 45146}, {f: 30, c: 45150}, {f: 2, c: 45182}, {f: 3, c: 45185},
+    {f: 7, c: 45189}, 45198, 45200, {f: 6, c: 45202}, 45211, {f: 2, c: 45213},
+    {f: 5, c: 45219}, 45226, 45232, 45234, {f: 2, c: 45238}, {f: 3, c: 45241},
+    {f: 7, c: 45245}, 45254, {f: 6, c: 45258}, {f: 2, c: 45266},
+    {f: 3, c: 45269}, {f: 7, c: 45273}, {f: 4, c: 45281}, {f: 34, c: 45286},
+    45322, {f: 3, c: 45325}, 45329, {f: 4, c: 45332}, 45338, {f: 5, c: 45342},
+    {f: 2, c: 45350}, {f: 3, c: 45353}, {f: 7, c: 45357}, 45366,
+    {f: 6, c: 45370}, {f: 2, c: 45378}, {f: 3, c: 45381}, {f: 7, c: 45385},
+    {f: 2, c: 45394}, {f: 2, c: 45398}, {f: 3, c: 45401}, {f: 3, c: 45405},
+    {f: 23, c: 45409}, {f: 2, c: 45434}, {f: 3, c: 45437}, 45441,
+    {f: 5, c: 45443}, 45450, 45452, {f: 4, c: 45454}, {f: 3, c: 45461},
+    {f: 3, c: 45465}, {f: 11, c: 45469}, {f: 35, c: 45481}, {f: 3, c: 45517},
+    {f: 3, c: 45521}, {f: 7, c: 45525}, 45534, {f: 8, c: 45536},
+    {f: 2, c: 45546}, {f: 3, c: 45549}, {f: 8, c: 45553}, 45562, 45564,
+    {f: 6, c: 45566}, {f: 2, c: 45574}, {f: 2, c: 45577}, {f: 7, c: 45581},
+    45590, 45592, {f: 6, c: 45594}, {f: 19, c: 45601}, {f: 7, c: 45621},
+    {f: 27, c: 45629}, {f: 3, c: 45657}, {f: 3, c: 45661}, {f: 7, c: 45665},
+    {f: 10, c: 45674}, {f: 6, c: 45686}, {f: 7, c: 45693}, {f: 3, c: 45702},
+    {f: 6, c: 45706}, {f: 2, c: 45714}, {f: 3, c: 45717}, {f: 5, c: 45723},
+    45730, 45732, {f: 3, c: 45735}, 45739, {f: 3, c: 45741}, {f: 3, c: 45745},
+    {f: 19, c: 45749}, {f: 2, c: 45770}, {f: 3, c: 45773}, 45777,
+    {f: 5, c: 45779}, 45786, 45788, {f: 4, c: 45790}, 45795, 45799,
+    {f: 2, c: 45801}, {f: 3, c: 45808}, 45814, {f: 3, c: 45820},
+    {f: 2, c: 45826}, {f: 3, c: 45829}, {f: 7, c: 45833}, 45842,
+    {f: 6, c: 45846}, {f: 55, c: 45853}, 45911, {f: 2, c: 45913}, 45917,
+    {f: 4, c: 45920}, 45926, 45928, 45930, {f: 2, c: 45932}, 45935,
+    {f: 2, c: 45938}, {f: 3, c: 45941}, {f: 7, c: 45945}, 45954,
+    {f: 6, c: 45958}, {f: 3, c: 45965}, {f: 3, c: 45969}, {f: 11, c: 45973},
+    {f: 6, c: 45986}, {f: 3, c: 45993}, {f: 23, c: 45997}, {f: 2, c: 46022},
+    {f: 2, c: 46025}, 46029, 46031, {f: 3, c: 46033}, 46038, 46040, 46042,
+    46044, {f: 2, c: 46046}, {f: 3, c: 46049}, {f: 3, c: 46053},
+    {f: 19, c: 46057}, {f: 19, c: 46077}, {f: 7, c: 46097}, {f: 3, c: 46105},
+    {f: 3, c: 46109}, {f: 7, c: 46113}, 46122, {f: 8, c: 46124},
+    {f: 27, c: 46133}, {f: 2, c: 46162}, {f: 3, c: 46165}, {f: 7, c: 46169},
+    46178, 46180, {f: 6, c: 46182}, {f: 19, c: 46189}, {f: 7, c: 46209},
+    {f: 20, c: 46217}, {f: 6, c: 46238}, {f: 3, c: 46245}, {f: 3, c: 46249},
+    {f: 8, c: 46253}, 46262, 46264, {f: 6, c: 46266}, {f: 3, c: 46273},
+    {f: 3, c: 46277}, {f: 7, c: 46281}, {f: 4, c: 46289}, {f: 6, c: 46294},
+    {f: 2, c: 46302}, {f: 2, c: 46305}, 46309, {f: 5, c: 46311}, 46318, 46320,
+    {f: 6, c: 46322}, {f: 27, c: 46329}, {f: 2, c: 46358}, {f: 2, c: 46361},
+    {f: 7, c: 46365}, 46374, {f: 5, c: 46379}, {f: 2, c: 46386},
+    {f: 3, c: 46389}, {f: 7, c: 46393}, 46402, {f: 5, c: 46406},
+    {f: 2, c: 46414}, {f: 3, c: 46417}, {f: 7, c: 46421}, 46430,
+    {f: 62, c: 46434}, {f: 2, c: 46498}, {f: 3, c: 46501}, 46505,
+    {f: 4, c: 46508}, 46514, {f: 5, c: 46518}, {f: 2, c: 46526},
+    {f: 3, c: 46529}, {f: 7, c: 46533}, 46542, {f: 6, c: 46546},
+    {f: 19, c: 46553}, {f: 35, c: 46573}, {f: 2, c: 46610}, {f: 3, c: 46613},
+    {f: 12, c: 46617}, {f: 6, c: 46630}, {f: 7, c: 46637}, {f: 19, c: 46645},
+    {f: 27, c: 46665}, {f: 3, c: 46693}, {f: 51, c: 46697}, {f: 2, c: 46750},
+    {f: 3, c: 46753}, {f: 6, c: 46757}, {f: 4, c: 46765}, {f: 34, c: 46770},
+    {f: 27, c: 46805}, {f: 3, c: 46833}, {f: 3, c: 46837}, {f: 7, c: 46841},
+    {f: 3, c: 46850}, {f: 34, c: 46854}, {f: 2, c: 46890}, {f: 2, c: 46893},
+    {f: 7, c: 46897}, 46906, {f: 8, c: 46908}, {f: 3, c: 46917},
+    {f: 3, c: 46921}, {f: 7, c: 46925}, {f: 10, c: 46934}, {f: 3, c: 46945},
+    {f: 3, c: 46949}, {f: 7, c: 46953}, 46962, 46964, {f: 6, c: 46966},
+    {f: 2, c: 46974}, {f: 3, c: 46977}, {f: 7, c: 46981}, 46990,
+    {f: 3, c: 46995}, {f: 2, c: 47002}, {f: 3, c: 47005}, {f: 7, c: 47009},
+    47018, {f: 6, c: 47022}, {f: 2, c: 47030}, {f: 14, c: 47033}, 47048,
+    {f: 34, c: 47050}, {f: 2, c: 47086}, {f: 3, c: 47089}, {f: 7, c: 47093},
+    47102, {f: 5, c: 47106}, {f: 2, c: 47114}, {f: 3, c: 47117},
+    {f: 7, c: 47121}, 47130, 47132, {f: 6, c: 47134}, {f: 2, c: 47142},
+    {f: 3, c: 47145}, {f: 7, c: 47149}, 47158, {f: 6, c: 47162},
+    {f: 3, c: 47169}, {f: 12, c: 47173}, 47186, {f: 8, c: 47188},
+    {f: 2, c: 47198}, {f: 3, c: 47201}, {f: 7, c: 47205}, 47214, 47216,
+    {f: 6, c: 47218}, {f: 3, c: 47225}, {f: 16, c: 47229}, {f: 26, c: 47246},
+    {f: 7, c: 47273}, {f: 3, c: 47281}, {f: 3, c: 47285}, {f: 7, c: 47289},
+    47298, 47300, {f: 6, c: 47302}, {f: 3, c: 47309}, {f: 3, c: 47313},
+    {f: 8, c: 47317}, 47326, 47328, {f: 6, c: 47330}, {f: 2, c: 47338},
+    {f: 3, c: 47341}, {f: 7, c: 47345}, 47354, 47356, {f: 6, c: 47358},
+    {f: 19, c: 47365}, {f: 7, c: 47385}, {f: 27, c: 47393}, {f: 2, c: 47422},
+    {f: 3, c: 47425}, {f: 7, c: 47429}, {f: 2, c: 47437}, 47440,
+    {f: 6, c: 47442}, {f: 2, c: 47450}, {f: 3, c: 47453}, {f: 7, c: 47457},
+    47466, 47468, {f: 6, c: 47470}, {f: 2, c: 47478}, {f: 3, c: 47481},
+    {f: 7, c: 47485}, 47494, 47496, {f: 2, c: 47499}, {f: 29, c: 47503},
+    {f: 2, c: 47534}, {f: 3, c: 47537}, {f: 7, c: 47541}, 47550, 47552,
+    {f: 6, c: 47554}, {f: 2, c: 47562}, 47565, {f: 5, c: 47571}, 47578, 47580,
+    {f: 2, c: 47583}, 47586, {f: 2, c: 47590}, {f: 3, c: 47593},
+    {f: 7, c: 47597}, 47606, {f: 5, c: 47611}, {f: 6, c: 47618},
+    {f: 12, c: 47625}, {f: 34, c: 47638}, {f: 2, c: 47674}, {f: 3, c: 47677},
+    47681, {f: 5, c: 47683}, 47690, 47692, {f: 4, c: 47695}, {f: 2, c: 47702},
+    {f: 3, c: 47705}, {f: 7, c: 47709}, 47718, {f: 6, c: 47722},
+    {f: 2, c: 47730}, {f: 3, c: 47733}, {f: 10, c: 47737}, 47750,
+    {f: 4, c: 47752}, {f: 27, c: 47757}, 47786, {f: 3, c: 47789}, 47793,
+    {f: 5, c: 47795}, 47802, 47804, {f: 6, c: 47806}, {f: 3, c: 47813},
+    {f: 15, c: 47817}, {f: 34, c: 47834}, {f: 3, c: 47869}, {f: 3, c: 47873},
+    {f: 8, c: 47877}, 47886, 47888, {f: 6, c: 47890}, {f: 3, c: 47897},
+    {f: 3, c: 47901}, {f: 8, c: 47905}, 47914, {f: 8, c: 47916}, 47927,
+    {f: 2, c: 47929}, {f: 5, c: 47935}, 47942, 47944, {f: 3, c: 47946}, 47950,
+    {f: 3, c: 47953}, {f: 3, c: 47957}, {f: 8, c: 47961}, 47970,
+    {f: 8, c: 47972}, {f: 27, c: 47981}, {f: 3, c: 48009}, {f: 3, c: 48013},
+    {f: 19, c: 48017}, {f: 3, c: 48037}, {f: 3, c: 48041}, {f: 7, c: 48045},
+    {f: 2, c: 48053}, {f: 8, c: 48056}, {f: 3, c: 48065}, {f: 3, c: 48069},
+    {f: 7, c: 48073}, {f: 2, c: 48081}, {f: 36, c: 48084}, {f: 2, c: 48122},
+    {f: 2, c: 48125}, 48129, {f: 5, c: 48131}, 48138, 48142, 48144,
+    {f: 2, c: 48146}, {f: 2, c: 48153}, {f: 4, c: 48160}, 48166, 48168,
+    {f: 3, c: 48170}, {f: 2, c: 48174}, {f: 2, c: 48178}, {f: 3, c: 48181},
+    {f: 7, c: 48185}, 48194, {f: 3, c: 48198}, {f: 2, c: 48202},
+    {f: 2, c: 48206}, {f: 12, c: 48209}, {f: 38, c: 48222}, {f: 2, c: 48262},
+    {f: 2, c: 48265}, 48269, {f: 5, c: 48271}, 48278, 48280, {f: 5, c: 48283},
+    {f: 2, c: 48290}, {f: 2, c: 48293}, {f: 7, c: 48297}, 48306,
+    {f: 6, c: 48310}, {f: 2, c: 48318}, {f: 3, c: 48321}, {f: 8, c: 48325},
+    48334, {f: 3, c: 48338}, {f: 2, c: 48342}, {f: 3, c: 48345},
+    {f: 23, c: 48349}, 48375, {f: 3, c: 48377}, {f: 7, c: 48381}, 48390, 48392,
+    {f: 6, c: 48394}, {f: 3, c: 48401}, {f: 15, c: 48405}, {f: 7, c: 48421},
+    {f: 19, c: 48429}, {f: 7, c: 48449}, {f: 2, c: 48458}, {f: 3, c: 48461},
+    {f: 7, c: 48465}, {f: 10, c: 48474}, {f: 3, c: 48485}, {f: 23, c: 48489},
+    {f: 2, c: 48514}, {f: 2, c: 48517}, {f: 5, c: 48523}, 48530, 48532,
+    {f: 3, c: 48534}, 48539, {f: 7, c: 48541}, {f: 11, c: 48549},
+    {f: 7, c: 48561}, {f: 27, c: 48569}, {f: 2, c: 48598}, {f: 3, c: 48601},
+    {f: 12, c: 48605}, {f: 6, c: 48618}, {f: 3, c: 48625}, {f: 3, c: 48629},
+    {f: 7, c: 48633}, {f: 2, c: 48641}, 48644, {f: 6, c: 48646},
+    {f: 2, c: 48654}, {f: 3, c: 48657}, {f: 7, c: 48661}, 48670,
+    {f: 36, c: 48672}, {f: 2, c: 48710}, {f: 3, c: 48713}, 48717,
+    {f: 5, c: 48719}, 48726, 48728, {f: 4, c: 48732}, {f: 2, c: 48738},
+    {f: 3, c: 48741}, 48745, {f: 5, c: 48747}, 48754, {f: 5, c: 48758},
+    {f: 2, c: 48766}, {f: 3, c: 48769}, {f: 7, c: 48773}, 48782,
+    {f: 6, c: 48786}, {f: 14, c: 48794}, {f: 39, c: 48809}, {f: 2, c: 48850},
+    {f: 2, c: 48853}, {f: 7, c: 48857}, {f: 2, c: 48865}, {f: 6, c: 48870},
+    {f: 20, c: 48877}, {f: 6, c: 48898}, {f: 14, c: 48906}, 48922,
+    {f: 34, c: 48926}, {f: 2, c: 48962}, {f: 3, c: 48965}, {f: 7, c: 48969},
+    {f: 3, c: 48978}, {f: 62, c: 48982}, {f: 27, c: 49045}, {f: 20, c: 49073},
+    {f: 6, c: 49094}, {f: 2, c: 49102}, {f: 3, c: 49105}, {f: 7, c: 49109},
+    {f: 2, c: 49117}, 49120, {f: 90, c: 49122}, {f: 20, c: 49213},
+    {f: 6, c: 49234}, {f: 3, c: 49241}, {f: 3, c: 49245}, {f: 7, c: 49249},
+    {f: 38, c: 49258}, {f: 2, c: 49298}, {f: 3, c: 49301}, {f: 7, c: 49305},
+    49314, 49316, {f: 6, c: 49318}, 49326, {f: 2, c: 49329}, {f: 5, c: 49335},
+    49342, {f: 3, c: 49346}, {f: 2, c: 49350}, {f: 2, c: 49354},
+    {f: 3, c: 49357}, {f: 7, c: 49361}, 49370, {f: 6, c: 49374},
+    {f: 2, c: 49382}, {f: 3, c: 49385}, {f: 7, c: 49389}, 49398, 49400,
+    {f: 6, c: 49402}, {f: 3, c: 49409}, {f: 3, c: 49413}, {f: 7, c: 49417},
+    {f: 4, c: 49425}, {f: 6, c: 49430}, {f: 2, c: 49441}, 49445,
+    {f: 4, c: 49448}, 49454, {f: 4, c: 49458}, 49463, {f: 2, c: 49466},
+    {f: 3, c: 49469}, {f: 7, c: 49473}, 49482, {f: 6, c: 49486},
+    {f: 2, c: 49494}, {f: 3, c: 49497}, {f: 7, c: 49501}, 49510,
+    {f: 6, c: 49514}, {f: 3, c: 49521}, {f: 3, c: 49525}, {f: 12, c: 49529},
+    {f: 6, c: 49542}, 49551, {f: 3, c: 49553}, 49557, {f: 5, c: 49559}, 49566,
+    49568, {f: 3, c: 49570}, {f: 2, c: 49574}, {f: 2, c: 49578},
+    {f: 3, c: 49581}, {f: 12, c: 49585}, {f: 6, c: 49598}, {f: 3, c: 49605},
+    {f: 3, c: 49609}, {f: 7, c: 49613}, {f: 2, c: 49621}, {f: 7, c: 49625},
+    {f: 3, c: 49633}, {f: 3, c: 49637}, {f: 7, c: 49641}, 49650,
+    {f: 8, c: 49652}, {f: 2, c: 49662}, {f: 3, c: 49665}, {f: 7, c: 49669},
+    49678, 49680, {f: 6, c: 49682}, {f: 2, c: 49690}, {f: 2, c: 49693},
+    {f: 7, c: 49697}, 49706, 49708, 49710, 49712, 49715, {f: 19, c: 49717},
+    {f: 7, c: 49737}, {f: 2, c: 49746}, {f: 3, c: 49749}, {f: 7, c: 49753},
+    {f: 4, c: 49761}, {f: 6, c: 49766}, {f: 2, c: 49774}, {f: 3, c: 49777},
+    {f: 7, c: 49781}, 49790, 49792, {f: 6, c: 49794}, {f: 6, c: 49802},
+    {f: 7, c: 49809}, {f: 2, c: 49817}, 49820, {f: 6, c: 49822},
+    {f: 2, c: 49830}, {f: 3, c: 49833}, {f: 6, c: 49838}, 49846, 49848,
+    {f: 34, c: 49850}, {f: 2, c: 49886}, {f: 2, c: 49889}, {f: 6, c: 49893},
+    49902, 49904, {f: 4, c: 49906}, 49911, 49914, {f: 3, c: 49917},
+    {f: 7, c: 49921}, {f: 2, c: 49930}, {f: 5, c: 49934}, {f: 2, c: 49942},
+    {f: 3, c: 49945}, {f: 7, c: 49949}, {f: 2, c: 49958}, {f: 27, c: 49962},
+    {f: 34, c: 49990}, {f: 2, c: 50026}, {f: 3, c: 50029}, 50033,
+    {f: 5, c: 50035}, {f: 2, c: 50042}, {f: 6, c: 50046}, {f: 3, c: 50053},
+    {f: 3, c: 50057}, {f: 51, c: 50061}, {f: 23, c: 50113}, {f: 2, c: 50138},
+    {f: 2, c: 50141}, 50145, {f: 5, c: 50147}, {f: 3, c: 50154},
+    {f: 6, c: 50158}, {f: 2, c: 50166}, {f: 15, c: 50169}, {f: 7, c: 50185},
+    {f: 19, c: 50193}, {f: 7, c: 50213}, {f: 3, c: 50221}, {f: 3, c: 50225},
+    {f: 7, c: 50229}, {f: 10, c: 50238}, {f: 27, c: 50249}, {f: 2, c: 50278},
+    {f: 3, c: 50281}, {f: 7, c: 50285}, {f: 3, c: 50294}, {f: 6, c: 50298},
+    {f: 19, c: 50305}, {f: 7, c: 50325}, {f: 27, c: 50333}, {f: 3, c: 50361},
+    {f: 44, c: 50365}, {f: 6, c: 50410}, {f: 2, c: 50418}, {f: 3, c: 50421},
+    50425, {f: 4, c: 50427}, {f: 10, c: 50434}, {f: 3, c: 50445},
+    {f: 3, c: 50449}, {f: 7, c: 50453}, {f: 11, c: 50461}, {f: 2, c: 50474},
+    {f: 3, c: 50477}, {f: 7, c: 50481}, 50490, 50492, {f: 6, c: 50494},
+    {f: 2, c: 50502}, 50507, {f: 4, c: 50511}, 50518, {f: 3, c: 50522}, 50527,
+    {f: 2, c: 50530}, {f: 3, c: 50533}, {f: 7, c: 50537}, 50546,
+    {f: 6, c: 50550}, {f: 2, c: 50558}, {f: 3, c: 50561}, {f: 2, c: 50565},
+    {f: 4, c: 50568}, 50574, 50576, {f: 3, c: 50578}, 50582, {f: 3, c: 50585},
+    {f: 3, c: 50589}, {f: 8, c: 50593}, {f: 10, c: 50602}, {f: 2, c: 50614},
+    50618, {f: 5, c: 50623}, 50635, 50637, 50639, {f: 2, c: 50642},
+    {f: 3, c: 50645}, {f: 7, c: 50649}, 50658, 50660, {f: 6, c: 50662}, 50671,
+    {f: 3, c: 50673}, 50677, {f: 4, c: 50680}, {f: 3, c: 50690},
+    {f: 3, c: 50697}, {f: 3, c: 50701}, {f: 7, c: 50705}, 50714,
+    {f: 7, c: 50717}, {f: 2, c: 50726}, {f: 3, c: 50729}, 50735,
+    {f: 2, c: 50737}, 50742, 50744, 50746, {f: 4, c: 50748}, {f: 2, c: 50754},
+    {f: 3, c: 50757}, {f: 7, c: 50761}, 50770, {f: 6, c: 50774},
+    {f: 2, c: 50782}, {f: 11, c: 50785}, {f: 2, c: 50797}, 50800,
+    {f: 6, c: 50802}, {f: 2, c: 50810}, {f: 3, c: 50813}, {f: 7, c: 50817},
+    50826, 50828, {f: 6, c: 50830}, {f: 2, c: 50838}, {f: 3, c: 50841},
+    {f: 7, c: 50845}, 50854, 50856, {f: 6, c: 50858}, {f: 2, c: 50866},
+    {f: 3, c: 50869}, {f: 5, c: 50875}, 50882, 50884, {f: 6, c: 50886},
+    {f: 2, c: 50894}, {f: 3, c: 50897}, {f: 7, c: 50901}, {f: 2, c: 50910},
+    {f: 6, c: 50914}, {f: 2, c: 50922}, {f: 3, c: 50925}, {f: 7, c: 50929},
+    {f: 3, c: 50938}, {f: 6, c: 50942}, {f: 2, c: 50950}, {f: 3, c: 50953},
+    {f: 7, c: 50957}, 50966, 50968, {f: 6, c: 50970}, {f: 2, c: 50978},
+    {f: 3, c: 50981}, {f: 7, c: 50985}, 50994, 50996, 50998, {f: 4, c: 51000},
+    {f: 2, c: 51006}, {f: 3, c: 51009}, {f: 5, c: 51013}, 51019, 51022, 51024,
+    {f: 3, c: 51033}, {f: 3, c: 51037}, {f: 7, c: 51041}, {f: 2, c: 51049},
+    {f: 8, c: 51052}, {f: 2, c: 51062}, {f: 3, c: 51065}, {f: 4, c: 51071},
+    51078, {f: 3, c: 51083}, 51087, {f: 2, c: 51090}, 51093, 51097,
+    {f: 5, c: 51099}, 51106, {f: 5, c: 51111}, {f: 2, c: 51118},
+    {f: 3, c: 51121}, {f: 7, c: 51125}, 51134, {f: 6, c: 51138},
+    {f: 2, c: 51146}, 51149, 51151, {f: 7, c: 51153}, {f: 4, c: 51161},
+    {f: 6, c: 51166}, {f: 3, c: 51173}, {f: 3, c: 51177}, {f: 19, c: 51181},
+    {f: 2, c: 51202}, {f: 3, c: 51205}, 51209, {f: 5, c: 51211}, 51218, 51220,
+    {f: 5, c: 51223}, {f: 2, c: 51230}, {f: 3, c: 51233}, {f: 7, c: 51237},
+    51246, 51248, {f: 6, c: 51250}, {f: 3, c: 51257}, {f: 3, c: 51261},
+    {f: 7, c: 51265}, {f: 2, c: 51274}, {f: 6, c: 51278}, {f: 27, c: 51285},
+    {f: 2, c: 51314}, {f: 3, c: 51317}, 51321, {f: 5, c: 51323}, 51330, 51332,
+    {f: 3, c: 51336}, {f: 6, c: 51342}, {f: 8, c: 51349}, 51358, 51360,
+    {f: 6, c: 51362}, {f: 19, c: 51369}, {f: 6, c: 51390}, {f: 3, c: 51397},
+    {f: 3, c: 51401}, {f: 7, c: 51405}, 51414, 51416, {f: 6, c: 51418},
+    {f: 2, c: 51426}, {f: 16, c: 51429}, {f: 6, c: 51446}, {f: 2, c: 51454},
+    {f: 3, c: 51457}, {f: 5, c: 51463}, 51470, 51472, {f: 6, c: 51474},
+    {f: 19, c: 51481}, {f: 7, c: 51501}, {f: 27, c: 51509}, {f: 2, c: 51538},
+    {f: 3, c: 51541}, {f: 7, c: 51545}, 51554, {f: 8, c: 51556},
+    {f: 3, c: 51565}, {f: 3, c: 51569}, {f: 7, c: 51573}, {f: 11, c: 51581},
+    {f: 2, c: 51594}, {f: 3, c: 51597}, {f: 7, c: 51601}, 51610, 51612,
+    {f: 34, c: 51614}, {f: 2, c: 51650}, {f: 2, c: 51653}, 51657,
+    {f: 5, c: 51659}, 51666, 51668, {f: 2, c: 51671}, 51675, {f: 2, c: 51678},
+    51681, 51683, {f: 2, c: 51685}, {f: 4, c: 51688}, 51694, {f: 6, c: 51698},
+    {f: 2, c: 51706}, {f: 3, c: 51709}, {f: 7, c: 51713}, 51722,
+    {f: 6, c: 51726}, {f: 3, c: 51733}, {f: 16, c: 51737}, {f: 34, c: 51754},
+    {f: 2, c: 51790}, {f: 3, c: 51793}, {f: 7, c: 51797}, 51806,
+    {f: 6, c: 51810}, {f: 20, c: 51817}, {f: 6, c: 51838}, {f: 19, c: 51845},
+    {f: 35, c: 51865}, {f: 2, c: 51902}, {f: 3, c: 51905}, {f: 7, c: 51909},
+    51918, 51920, 51922, {f: 4, c: 51924}, {f: 6, c: 51930}, {f: 11, c: 51937},
+    {f: 7, c: 51949}, {f: 19, c: 51957}, {f: 7, c: 51977}, {f: 3, c: 51985},
+    {f: 3, c: 51989}, {f: 7, c: 51993}, {f: 31, c: 52002}, {f: 6, c: 52034},
+    {f: 2, c: 52042}, {f: 3, c: 52045}, {f: 7, c: 52049}, {f: 3, c: 52058},
+    {f: 6, c: 52062}, {f: 19, c: 52069}, {f: 34, c: 52090}, {f: 27, c: 52125},
+    {f: 27, c: 52153}, {f: 15, c: 52181}, {f: 2, c: 52197}, 52200,
+    {f: 34, c: 52202}, {f: 2, c: 52238}, {f: 3, c: 52241}, {f: 7, c: 52245},
+    {f: 3, c: 52254}, {f: 4, c: 52259}, {f: 2, c: 52266}, 52269, 52271,
+    {f: 7, c: 52273}, 52282, {f: 5, c: 52287}, {f: 2, c: 52294},
+    {f: 3, c: 52297}, {f: 7, c: 52301}, 52310, {f: 6, c: 52314},
+    {f: 3, c: 52321}, 52325, 52327, {f: 7, c: 52329}, {f: 4, c: 52337},
+    {f: 34, c: 52342}, {f: 2, c: 52378}, {f: 3, c: 52381}, {f: 7, c: 52385},
+    52394, {f: 6, c: 52398}, {f: 2, c: 52406}, {f: 3, c: 52409},
+    {f: 7, c: 52413}, 52422, 52424, {f: 6, c: 52426}, {f: 3, c: 52433},
+    {f: 15, c: 52437}, {f: 7, c: 52453}, {f: 3, c: 52461}, {f: 16, c: 52465},
+    {f: 6, c: 52482}, {f: 2, c: 52490}, {f: 3, c: 52493}, {f: 7, c: 52497},
+    52506, 52508, {f: 6, c: 52510}, {f: 3, c: 52517}, {f: 3, c: 52521},
+    {f: 12, c: 52525}, {f: 34, c: 52538}, {f: 3, c: 52573}, {f: 3, c: 52577},
+    {f: 7, c: 52581}, 52590, 52592, {f: 6, c: 52594}, {f: 15, c: 52601},
+    {f: 11, c: 52617}, {f: 2, c: 52630}, {f: 3, c: 52633}, {f: 7, c: 52637},
+    52646, 52648, {f: 6, c: 52650}, {f: 19, c: 52657}, {f: 7, c: 52677},
+    {f: 3, c: 52685}, {f: 23, c: 52689}, {f: 3, c: 52713}, {f: 3, c: 52717},
+    {f: 7, c: 52721}, 52730, 52732, {f: 6, c: 52734}, {f: 3, c: 52741},
+    {f: 3, c: 52745}, {f: 7, c: 52749}, {f: 4, c: 52757}, {f: 6, c: 52762},
+    {f: 2, c: 52770}, {f: 3, c: 52773}, {f: 7, c: 52777}, 52786, 52788,
+    {f: 34, c: 52790}, {f: 2, c: 52826}, {f: 2, c: 52829}, {f: 6, c: 52834},
+    52842, 52844, {f: 6, c: 52846}, {f: 2, c: 52854}, {f: 3, c: 52857},
+    {f: 7, c: 52861}, 52870, 52872, {f: 6, c: 52874}, {f: 2, c: 52882},
+    {f: 3, c: 52885}, {f: 7, c: 52889}, 52898, {f: 6, c: 52902},
+    {f: 19, c: 52910}, {f: 34, c: 52930}, {f: 2, c: 52966}, {f: 2, c: 52969},
+    {f: 7, c: 52973}, 52982, {f: 6, c: 52986}, {f: 2, c: 52994},
+    {f: 3, c: 52997}, {f: 7, c: 53001}, 53010, 53012, {f: 6, c: 53014},
+    {f: 3, c: 53021}, {f: 3, c: 53025}, {f: 7, c: 53029}, 53038,
+    {f: 6, c: 53042}, {f: 27, c: 53049}, {f: 2, c: 53078}, {f: 3, c: 53081},
+    {f: 7, c: 53085}, 53094, 53096, {f: 6, c: 53098}, {f: 2, c: 53106},
+    {f: 3, c: 53109}, {f: 7, c: 53113}, {f: 4, c: 53121}, {f: 6, c: 53126},
+    {f: 20, c: 53133}, {f: 6, c: 53154}, {f: 7, c: 53161}, {f: 19, c: 53169},
+    {f: 27, c: 53189}, {f: 2, c: 53218}, {f: 3, c: 53221}, {f: 7, c: 53225},
+    53234, 53236, {f: 6, c: 53238}, {f: 3, c: 53245}, {f: 3, c: 53249},
+    {f: 12, c: 53253}, {f: 6, c: 53266}, {f: 20, c: 53273}, {f: 6, c: 53294},
+    {f: 2, c: 53302}, {f: 3, c: 53305}, {f: 7, c: 53309}, 53318, 53320,
+    {f: 6, c: 53322}, {f: 3, c: 53329}, {f: 3, c: 53333}, {f: 7, c: 53337},
+    {f: 11, c: 53345}, {f: 2, c: 53358}, {f: 3, c: 53361}, {f: 7, c: 53365},
+    {f: 3, c: 53374}, {f: 34, c: 53378}, {f: 2, c: 53414}, {f: 3, c: 53417},
+    {f: 7, c: 53421}, 53430, 53432, {f: 6, c: 53434}, {f: 2, c: 53442},
+    {f: 3, c: 53445}, {f: 6, c: 53450}, 53458, {f: 6, c: 53462},
+    {f: 2, c: 53470}, {f: 3, c: 53473}, {f: 7, c: 53477}, 53486,
+    {f: 6, c: 53490}, {f: 20, c: 53497}, {f: 34, c: 53518}, {f: 2, c: 53554},
+    {f: 3, c: 53557}, 53561, {f: 5, c: 53563}, 53570, {f: 6, c: 53574},
+    {f: 2, c: 53582}, {f: 3, c: 53585}, {f: 7, c: 53589}, 53598, 53600,
+    {f: 6, c: 53602}, {f: 3, c: 53609}, {f: 15, c: 53613}, {f: 7, c: 53629},
+    {f: 3, c: 53637}, {f: 23, c: 53641}, {f: 2, c: 53666}, {f: 3, c: 53669},
+    {f: 7, c: 53673}, 53682, 53684, {f: 4, c: 53686}, 53691, {f: 3, c: 53693},
+    {f: 23, c: 53697}, {f: 27, c: 53721}, {f: 3, c: 53749}, {f: 14, c: 53753},
+    53768, {f: 6, c: 53770}, {f: 27, c: 53777}, {f: 2, c: 53806},
+    {f: 3, c: 53809}, {f: 7, c: 53813}, 53822, 53824, {f: 6, c: 53826},
+    {f: 19, c: 53833}, {f: 7, c: 53853}, {f: 27, c: 53861}, {f: 2, c: 53890},
+    {f: 3, c: 53893}, {f: 7, c: 53897}, {f: 3, c: 53906}, {f: 6, c: 53910},
+    {f: 3, c: 53917}, {f: 3, c: 53921}, {f: 7, c: 53925}, {f: 4, c: 53933},
+    {f: 6, c: 53938}, {f: 2, c: 53946}, {f: 2, c: 53949}, 53953,
+    {f: 5, c: 53955}, 53962, {f: 8, c: 53964}, {f: 3, c: 53973},
+    {f: 3, c: 53977}, {f: 7, c: 53981}, {f: 10, c: 53990}, {f: 2, c: 54002},
+    {f: 3, c: 54005}, {f: 7, c: 54009}, 54018, 54020, {f: 6, c: 54022}, 54031,
+    {f: 3, c: 54033}, 54037, {f: 5, c: 54039}, 54046, {f: 3, c: 54050},
+    {f: 2, c: 54054}, {f: 2, c: 54058}, {f: 3, c: 54061}, {f: 7, c: 54065},
+    54074, {f: 6, c: 54078}, {f: 54, c: 54086}, {f: 2, c: 54142},
+    {f: 3, c: 54145}, {f: 7, c: 54149}, 54158, {f: 6, c: 54162},
+    {f: 2, c: 54170}, {f: 3, c: 54173}, {f: 7, c: 54177}, 54186, 54188,
+    {f: 6, c: 54190}, {f: 3, c: 54197}, {f: 3, c: 54201}, {f: 7, c: 54205},
+    {f: 2, c: 54214}, {f: 6, c: 54218}, {f: 7, c: 54225}, {f: 8, c: 54233},
+    54242, {f: 8, c: 54244}, {f: 2, c: 54254}, {f: 3, c: 54257},
+    {f: 7, c: 54261}, 54270, 54272, {f: 6, c: 54274}, {f: 20, c: 54281},
+    {f: 34, c: 54302}, {f: 3, c: 54337}, {f: 23, c: 54341}, {f: 3, c: 54365},
+    {f: 3, c: 54369}, {f: 8, c: 54373}, 54382, {f: 8, c: 54384},
+    {f: 2, c: 54394}, {f: 2, c: 54397}, 54401, {f: 5, c: 54403}, 54410, 54412,
+    {f: 6, c: 54414}, {f: 20, c: 54421}, {f: 34, c: 54442}, {f: 3, c: 54477},
+    {f: 3, c: 54481}, {f: 7, c: 54485}, {f: 2, c: 54493}, {f: 8, c: 54496},
+    {f: 3, c: 54505}, {f: 3, c: 54509}, {f: 7, c: 54513}, {f: 2, c: 54521},
+    54524, {f: 6, c: 54526}, {f: 3, c: 54533}, {f: 3, c: 54537},
+    {f: 7, c: 54541}, 54550, {f: 36, c: 54552}, {f: 2, c: 54590},
+    {f: 3, c: 54593}, {f: 7, c: 54597}, 54606, 54608, {f: 6, c: 54610},
+    {f: 2, c: 54618}, {f: 3, c: 54621}, {f: 4, c: 54625}, {f: 2, c: 54630},
+    54634, 54636, {f: 6, c: 54638}, {f: 2, c: 54646}, {f: 3, c: 54649},
+    {f: 7, c: 54653}, 54662, {f: 6, c: 54666}, {f: 20, c: 54673},
+    {f: 34, c: 54694}, {f: 2, c: 54730}, {f: 3, c: 54733}, 54737,
+    {f: 5, c: 54739}, 54746, 54748, {f: 6, c: 54750}, {f: 2, c: 54758},
+    {f: 3, c: 54761}, {f: 7, c: 54765}, 54774, 54776, {f: 6, c: 54778},
+    {f: 2, c: 54786}, {f: 3, c: 54789}, {f: 7, c: 54793}, 54802,
+    {f: 6, c: 54806}, {f: 3, c: 54813}, {f: 3, c: 54817}, {f: 8, c: 54821},
+    {f: 10, c: 54830}, {f: 2, c: 54842}, {f: 3, c: 54845}, {f: 4, c: 54849},
+    {f: 2, c: 54854}, 54858, 54860, {f: 3, c: 54862}, {f: 2, c: 54866},
+    {f: 2, c: 54870}, {f: 3, c: 54873}, {f: 10, c: 54877}, 54888,
+    {f: 6, c: 54890}, {f: 2, c: 54898}, {f: 14, c: 54901}, 54916,
+    {f: 6, c: 54918}, {f: 2, c: 54926}, {f: 3, c: 54929}, {f: 8, c: 54933},
+    54942, 54944, {f: 6, c: 54946}, {f: 3, c: 54953}, {f: 3, c: 54957},
+    {f: 8, c: 54961}, 54970, {f: 8, c: 54972}, {f: 2, c: 54982},
+    {f: 3, c: 54985}, {f: 4, c: 54989}, {f: 2, c: 54994}, {f: 2, c: 54997},
+    55000, {f: 6, c: 55002}, {f: 3, c: 55009}, {f: 3, c: 55013},
+    {f: 7, c: 55017}, {f: 4, c: 55025}, {f: 6, c: 55030}, {f: 2, c: 55038},
+    {f: 3, c: 55041}, {f: 12, c: 55045}, {f: 6, c: 55058}, {f: 2, c: 55066},
+    {f: 3, c: 55069}, {f: 7, c: 55073}, 55082, 55084, {f: 6, c: 55086},
+    {f: 2, c: 55094}, {f: 3, c: 55097}, {f: 7, c: 55101}, {f: 2, c: 55109},
+    55112, {f: 6, c: 55114}, {f: 2, c: 55122}, 55125, {f: 6, c: 55130}, 55138,
+    55140, {f: 3, c: 55142}, {f: 2, c: 55146}, {f: 3, c: 55149},
+    {f: 3, c: 55153}, {f: 7, c: 55157}, {f: 3, c: 55166}, {f: 6, c: 55170},
+    {f: 2, c: 55178}, {f: 3, c: 55181}, {f: 7, c: 55185}, 55194, 55196,
+    {f: 6, c: 55198}],
+  'Adobe-CNS1': [{f: 95, c: 32}, {s: 3}, 12288, 65292, {f: 2, c: 12289}, 65294,
+    8226, 65307, 65306, 65311, 65281, 65072, 8230, 8229, 65104, 65380, 65106,
+    183, {f: 4, c: 65108}, 65372, 8211, 65073, 8212, {s: 4}, {f: 2, c: 65288},
+    {f: 2, c: 65077}, 65371, 65373, {f: 2, c: 65079}, {f: 2, c: 12308},
+    {f: 2, c: 65081}, {f: 2, c: 12304}, {f: 2, c: 65083}, {f: 2, c: 12298},
+    {f: 2, c: 65085}, {f: 2, c: 12296}, {f: 2, c: 65087}, {f: 2, c: 12300},
+    {f: 2, c: 65089}, {f: 2, c: 12302}, {f: 2, c: 65091}, {f: 6, c: 65113},
+    {f: 2, c: 8216}, {f: 2, c: 8220}, {f: 2, c: 12317}, 8245, 8242, 65283,
+    65286, 65290, 8251, 167, 12291, 9675, 9679, 9651, 9650, 9678, 9734, 9733,
+    9671, 9670, 9633, 9632, 9661, 9660, 12963, 8453, 8254, 0, 65343, 0,
+    {f: 2, c: 65097}, {f: 2, c: 65101}, {f: 2, c: 65099}, {f: 3, c: 65119},
+    65291, 65293, 215, 247, 177, 8730, 65308, 65310, 65309, {f: 2, c: 8806},
+    8800, 8734, 8786, 8801, {f: 5, c: 65122}, 8764, {f: 2, c: 8745}, 8869,
+    8736, 8735, 8895, 13266, 13265, 8747, 8750, 8757, 8756, 9792, 9794, 9793,
+    9737, 8593, 8595, 8594, 8592, {f: 2, c: 8598}, 8601, 8600, 8741, 8739, 0,
+    0, 65295, 65340, 65284, 165, 12306, {f: 2, c: 162}, 65285, 65312, 8451,
+    8457, {f: 3, c: 65129}, 13269, {f: 3, c: 13212}, 13262, 13217,
+    {f: 2, c: 13198}, 13252, 176, [20825, 58834], [20827, 58835],
+    [20830, 58837], [20829, 58836], 20833, 20835, 21991, [29929, 58044],
+    [31950, 58191], {f: 8, c: 9601}, 9615, 9614, 9613, 9612, 9611, 9610, 9609,
+    9532, 9524, 9516, 9508, 9500, 9620, 9472, 9474, 9621, 9484, 9488, 9492,
+    9496, {f: 2, c: 9581}, 9584, 9583, 9552, 9566, 9578, 9569, {f: 2, c: 9698},
+    9701, 9700, {f: 3, c: 9585}, {f: 10, c: 65296}, {f: 10, c: 8544},
+    {f: 9, c: 12321}, 0, [21316, 57443], 0, {f: 26, c: 65313},
+    {f: 26, c: 65345}, {f: 17, c: 913}, {f: 7, c: 931}, {f: 17, c: 945},
+    {f: 7, c: 963}, {f: 37, c: 12549}, 729, 714, 711, 715, [9312, 63153],
+    [9313, 63154], [9314, 63155], [9315, 63156], [9316, 63157], [9317, 63158],
+    [9318, 63159], [9319, 63160], [9320, 63161], [9321, 63162], [9332, 63163],
+    [9333, 63164], [9334, 63165], [9335, 63166], [9336, 63167], [9337, 63168],
+    [9338, 63169], [9339, 63170], [9340, 63171], [9341, 63172], [8560, 63173],
+    [8561, 63174], [8562, 63175], [8563, 63176], [8564, 63177], [8565, 63178],
+    [8566, 63179], [8567, 63180], [8568, 63181], [8569, 63182], [12033, 20008],
+    [12034, 20022, 63183], [12035, 20031, 63184], [12037, 20101, 63185],
+    [12039, 20128, 63186], [12044, 20866, 63187], [12045, 20886, 63188],
+    [12046, 20907, 63189], [12051, 21241, 63190], [12054, 21304, 63191],
+    [12057, 21353, 63192], [12059, 21430, 63193],
+    [12065, 12066, 22786, 22794, 63194], [12071, 23424, 63195],
+    [12078, 24027, 63196], [12083, 24186, 63197], [12084, 24191, 63198],
+    [12085, 24308], [12089, 24400, 63200], [12090, 24417, 63201],
+    [12097, 25908, 63202], [12102, 26080], [12135, 30098, 63204],
+    [12136, 30326], [12193, 36789, 63206], [12202, 38582], {f: 32, c: 9216},
+    9249, [12032, 19968], [12036, 20057], 19969, 19971, 20035, 20061, 20102,
+    [12038, 20108], [12040, 20154], [12041, 20799], [12042, 20837],
+    [12043, 20843], [12047, 20960], [12049, 20992], 20993, [12050, 21147],
+    [12052, 21269], [12055, 21313], [12056, 21340], [12060, 21448], 19977,
+    19979, 19976, 19978, 20011, 20024, 20961, 20037, 20040, 20063, 20062,
+    20110, 20129, [20800, 64012], 20995, 21242, 21315, 21449, [12061, 21475],
+    [12063, 22303], [12064, 22763], [12067, 22805], [12068, 22823],
+    [12069, 22899], [12070, 23376], 23377, 23379, [12072, 23544],
+    [12073, 23567], [12074, 23586], [12075, 23608], [12077, 23665], 24029,
+    [12079, 24037], [12080, 24049], {f: 2, c: 24050}, [12081, 24062],
+    [12082, 24178], [12086, 24318], [12087, 24331], [12088, 24339], 25165,
+    19985, 19984, 19981, 20013, 20016, 20025, 20043, 23609, 20104, 20113,
+    20117, 20114, 20116, 20130, 20161, 20160, 20163, {f: 2, c: 20166}, 20173,
+    {f: 2, c: 20170}, 20164, 20803, 20801, 20839, {f: 2, c: 20845}, 20844,
+    20887, 20982, {f: 3, c: 20998}, 21243, {f: 2, c: 21246}, 21270, 21305,
+    21320, 21319, 21317, 21342, 21380, 21451, 21450, 21453, 22764, 22825,
+    22827, 22826, 22829, 23380, 23569, 23588, 23610, 23663, 24052, 24187,
+    24319, {f: 2, c: 24340}, [12092, 24515], [12093, 25096], [12094, 25142],
+    [12095, 25163], 25166, [12096, 25903], [12098, 25991], [12099, 26007],
+    [12100, 26020], [12101, 26041], [12103, 26085], [12104, 26352],
+    [12105, 26376], [12106, 26408], [12107, 27424], [12108, 27490],
+    [12109, 27513], [12111, 27595], [12112, 27604], [12113, 27611],
+    [12114, 27663], [12116, 27700], [12117, 28779], [12118, 29226],
+    [12119, 29238], [12120, 29243], [12122, 29255], [12123, 29273],
+    [12124, 29275], [12125, 29356], 29579, 19993, 19990, 19989, 19988, 19992,
+    20027, 20045, 20047, 20046, 20197, 20184, {f: 4, c: 20180},
+    {f: 2, c: 20195}, 20185, 20190, 20805, 20804, {f: 2, c: 20873}, 20908,
+    {f: 2, c: 20985}, 20984, 21002, 21152, 21151, [21253, 57435], 21254, 21271,
+    21277, 20191, 21322, 21321, 21345, 21344, 21359, 21358, 21435, 21487,
+    21476, 21491, 21484, 21486, 21481, 21480, 21500, 21496, 21493, 21483,
+    21478, 21482, 21490, 21489, 21488, 21477, 21485, 21499, 22235, 22234,
+    22806, 22830, 22833, 22900, 22902, 23381, 23427, 23612, 24040, 24039,
+    24038, {f: 2, c: 24066}, 24179, 24188, 24321, 24344, 24343, 24517, 25098,
+    {f: 2, c: 25171}, 25170, 25169, 26021, 26086, 26414, 26412,
+    {f: 2, c: 26410}, 26413, 27491, 27597, 27665, 27664, 27704, 27713, 27712,
+    27710, 29359, [12126, 29572], [12127, 29577], [12128, 29916],
+    [12129, 29926], [12130, 29976], [12131, 29983], [12132, 29992], 29993,
+    [12133, 30000], {f: 3, c: 30001}, [12134, 30091], [12137, 30333],
+    [12138, 30382], [12139, 30399], [12140, 30446], [12141, 30683],
+    [12142, 30690], [12143, 30707], [12144, 31034], [12146, 31166],
+    [12147, 31348], [12148, 31435], {f: 2, c: 19998}, {f: 2, c: 20050}, 20073,
+    20121, 20132, 20134, 20133, 20223, 20233, 20249, 20234, 20245, 20237,
+    {f: 2, c: 20240}, 20239, 20210, 20214, 20219, 20208, 20211, 20221, 20225,
+    20235, 20809, 20807, 20806, 20808, 20840, 20849, 20877, 20912, 21015,
+    {f: 2, c: 21009}, 21006, 21014, 21155, 21256, 21281, 21280,
+    {f: 2, c: 21360}, 21513, 21519, 21516, 21514, 21520, 21505, 21515, 21508,
+    21521, 21517, 21512, 21507, 21518, 21510, 21522, 22240, 22238, 22237,
+    22323, 22320, 22312, 22317, 22316, 22319, 22313, {f: 2, c: 22809},
+    {f: 2, c: 22839}, 22916, 22904, 22915, 22909, 22905, 22914, 22913,
+    {f: 2, c: 23383}, {f: 2, c: 23431}, 23429, 23433, 23546, 23574, 23673,
+    24030, 24070, 24182, 24180, 24335, 24347, 24537, 24534, 25102,
+    {f: 2, c: 25100}, 25104, 25187, 25179, 25176, 25910, 26089, 26088,
+    {f: 2, c: 26092}, {f: 2, c: 26354}, 26377, 26429, 26420, 26417, 26421,
+    27425, 27492, 27515, 27670, 27741, 27735, 27737, {f: 2, c: 27743}, 27728,
+    27733, 27745, 27739, {f: 2, c: 27725}, 28784, 29279, 29277, 30334,
+    [12149, 31481], [12150, 31859], [12151, 31992], [12152, 32566],
+    [12154, 32650], [12155, 32701], [12156, 32769], 32771, [12157, 32780],
+    [12158, 32786], [12159, 32819], [12160, 32895], [12161, 32905],
+    {f: 2, c: 32907}, [12162, 33251], [12163, 33258], [12164, 33267],
+    [12165, 33276], [12166, 33292], [12167, 33307], [12168, 33311],
+    [12169, 33390], [12170, 33394], 33406, [12173, 34411], [12174, 34880],
+    [12175, 34892], [12176, 34915], 35199, 38433, 20018, 20136, 20301, 20303,
+    20295, 20311, 20318, 20276, 20315, 20309, 20272, {f: 2, c: 20304}, 20285,
+    20282, 20280, 20291, 20308, 20284, 20294, 20323, 20316, 20320, 20271,
+    20302, 20278, 20313, 20317, 20296, 20314, 20812, 20811, 20813, 20853,
+    {f: 2, c: 20918}, 21029, 21028, {f: 2, c: 21033}, 21032, 21163,
+    {f: 2, c: 21161}, 21164, 21283, 21363, 21365, 21533, 21549, 21534, 21566,
+    21542, 21582, 21543, 21574, 21571, 21555, 21576, 21570, 21531, 21545,
+    21578, 21561, 21563, 21560, 21550, {f: 2, c: 21557}, 21536, 21564, 21568,
+    21553, 21547, 21535, 21548, 22250, 22256, 22244, 22251, 22346, 22353,
+    22336, 22349, 22343, 22350, 22334, 22352, 22351, 22331, 22767, 22846,
+    22941, 22930, 22952, 22942, 22947, 22937, 22934, 22925, 22948, 22931,
+    22922, 22949, 23389, 23388, {f: 2, c: 23386}, 23436, 23435, 23439, 23596,
+    {f: 2, c: 23616}, 23615, 23614, {f: 2, c: 23696}, 23700, 23692, 24043,
+    24076, 24207, 24199, 24202, 24311, 24324, 24351, 24420, 24418, 24439,
+    24441, 24536, 24524, 24535, 24525, 24561, 24555, 24568, 24554, 25106,
+    25105, 25220, 25239, 25238, 25216, 25206, 25225, 25197, 25226, 25212,
+    25214, 25209, 25203, 25234, 25199, 25240, 25198, 25237, 25235, 25233,
+    25222, 25913, 25915, 25912, 26097, 26356, 26463, {f: 4, c: 26446}, 26460,
+    26454, [26462, 57801], 26441, 26438, 26464, 26451, 26455, 27493, 27599,
+    27714, 27742, 27801, 27777, {f: 2, c: 27784}, 27781, 27803, 27754, 27770,
+    27792, 27760, 27788, 27752, 27798, 27794, 27773, 27779, 27762, 27774,
+    27764, 27782, 27766, 27789, 27796, 27800, 27778, 28790, {f: 2, c: 28796},
+    28792, 29282, 29281, 29280, 29380, 29378, 29590, 29996, 29995,
+    {f: 2, c: 30007}, 30338, 30447, 30691, 31169, 31168, 31167, 31350, 31995,
+    32597, 32918, 32915, 32925, 32920, 32923, 32922, 32946, 33391, 33426,
+    33419, 33421, [12178, 35211], [12179, 35282], [12180, 35328],
+    [12181, 35895], [12182, 35910], [12183, 35925], [12185, 35997],
+    [12186, 36196], [12187, 36208], [12188, 36275], [12189, 36523],
+    [12190, 36554], [12191, 36763], [12192, 36784], 36802, 36806, 36805, 36804,
+    24033, [12194, 37009], 37026, 37034, 37030, 37027, [12195, 37193],
+    [12196, 37318], [12197, 37324], 38450, 38446, 38449, 38442, 38444, 20006,
+    20054, 20083, 20107, 20123, 20126, {f: 2, c: 20139}, 20335, 20381, 20365,
+    20339, 20351, 20332, 20379, 20363, 20358, 20355, 20336, 20341, 20360,
+    20329, 20347, 20374, 20350, 20367, 20369, 20346, 20820, 20818, 20821,
+    20841, 20855, 20854, 20856, 20925, 20989, 21051, 21048, 21047, 21050,
+    21040, 21038, 21046, 21057, 21182, 21179, 21330, 21332, 21331, 21329,
+    21350, {f: 3, c: 21367}, 21462, 21460, 21463, 21619, 21621, 21654, 21624,
+    21653, 21632, 21627, 21623, 21636, 21650, 21638, 21628, 21648, 21617,
+    21622, 21644, 21658, 21602, 21608, 21643, 21629, 21646, 22266, 22403,
+    22391, 22378, 22377, 22369, 22374, 22372, 22396, 22812, 22857,
+    {f: 2, c: 22855}, 22852, 22868, 22974, 22971, 22996, 22969, 22958, 22993,
+    22982, 22992, 22989, 22987, 22995, 22986, 22959, 22963, 22994, 22981,
+    23391, 23396, 23395, 23447, 23450, 23448, 23452, 23449, 23451, 23578,
+    23624, {f: 2, c: 23621}, 23735, 23713, 23736, 23721, 23723, 23729, 23731,
+    24088, 24090, 24086, 24085, 24091, 24081, 24184, 24218, 24215, 24220,
+    {f: 2, c: 24213}, 24310, {f: 2, c: 24358}, 24361, {f: 2, c: 24448}, 24447,
+    24444, 24541, 24544, 24573, 24565, 24575, 24591, 24596, 24623, 24629,
+    24598, 24618, 24597, 24609, 24615, 24617, 24619, 24603, 25110, 25109,
+    25151, 25150, 25152, 25215, 25289, 25292, 25284, 25279, 25282, 25273,
+    25298, 25307, 25259, {f: 2, c: 25299}, 25291, 25288, 25256, 25277, 25276,
+    [25296, 60582], 25305, 25287, 25293, 25269, 25306, 25265, 25304,
+    {f: 2, c: 25302}, 25286, 25260, [25294, 61010], 25918, 26023, 26044, 26106,
+    26132, 26131, 26124, 26118, 26114, 26126, 26112, 26127, 26133, 26122,
+    26119, 26381, 26379, 26477, 26507, 26517, 26481, 26524, 26483, 26487,
+    26503, 26525, 26519, {f: 2, c: 26479}, 26495, 26505, 26494, 26512, 26485,
+    26522, 26515, 26492, 26474, 26482, 27427, {f: 2, c: 27494}, 27519, 27667,
+    27675, 27875, 27880, 27891, 27825, 27852, 27877, 27827, {f: 2, c: 27837},
+    27836, 27874, 27819, 27861, 27859, 27832, 27844, 27833, 27841, 27822,
+    27863, 27845, 27889, 27839, 27835, 27873, 27867, 27850, 27820, 27887,
+    27868, 27862, 27872, 28821, 28814, 28818, 28810, 28825, {f: 2, c: 29228},
+    29240, 29256, 29287, 29289, 29376, 29390, 29401, 29399, 29392, 29609,
+    29608, 29599, 29611, 29605, 30013, 30109, {f: 2, c: 30105}, 30340, 30402,
+    30450, 30452, 30693, 30717, 31038, {f: 2, c: 31040}, 31177, 31176, 31354,
+    31353, 31482, 31998, 32596, 32652, 32651, [32773, 58236], 32954, 32933,
+    32930, 32945, 32929, 32939, 32937, 32948, 32938, 32943, 33253, 33278,
+    33293, 33459, 33437, 33433, 33453, 33469, 33439, 33465, 33457, 33452,
+    33445, 33455, 33464, 33443, 33456, 33470, 33463, 34382, 34417, 21021,
+    34920, 36555, 36814, 36820, 36817, 37045, 37048, 37041, 37046, 37319,
+    [12198, 37329], [12199, 38263], [12200, 38272], [12201, 38428], 38464,
+    38463, 38459, 38468, 38466, [12203, 38585], [12204, 38632], 38738,
+    [12206, 38750], 20127, {f: 2, c: 20141}, 20449, 20405, 20399, 20415, 20448,
+    20433, 20431, 20445, 20419, 20406, 20440, 20447, 20426, 20439, 20398,
+    20432, 20420, 20418, 20442, 20430, 20446, 20407, 20823, 20882, 20881,
+    20896, 21070, 21059, 21066, 21069, 21068, 21067, 21063, 21191, 21193,
+    21187, 21185, 21261, 21335, 21371, 21402, 21467, 21676, 21696, 21672,
+    21710, 21705, 21688, 21670, 21683, 21703, 21698, 21693, 21674, 21697,
+    21700, 21704, 21679, 21675, 21681, 21691, 21673, 21671, 21695, 22271,
+    22402, 22411, 22432, 22435, 22434, 22478, 22446, 22419, 22869, 22865,
+    22863, 22862, 22864, 23004, 23000, 23039, 23011, 23016, 23043, 23013,
+    23018, 23002, 23014, 23041, 23035, 23401, 23459, 23462, 23460, 23458,
+    23461, 23553, {f: 2, c: 23630}, 23629, 23627, 23769, 23762, 24055, 24093,
+    24101, 24095, 24189, 24224, 24230, 24314, 24328, 24365, 24421, 24456,
+    24453, {f: 2, c: 24458}, 24455, 24460, 24457, 24594, 24605, 24608, 24613,
+    24590, 24616, 24653, 24688, 24680, [24674, 60712], 24646, 24643, 24684,
+    24683, 24682, 24676, 25153, 25308, 25366, 25353, 25340, 25325, 25345,
+    25326, 25341, 25351, 25329, 25335, 25327, 25324, 25342, 25332, 25361,
+    25346, 25919, 25925, 26027, 26045, 26082, 26149, 26157, 26144, 26151,
+    26159, 26143, 26152, 26161, 26148, 26359, 26623, 26579, 26609, 26580,
+    26576, 26604, 26550, 26543, 26613, 26601, 26607, 26564, 26577, 26548,
+    26586, 26597, 26552, 26575, 26590, 26611, 26544, 26585, 26594, 26589,
+    26578, 27498, 27523, 27526, 27573, 27602, 27607, 27679, 27849, 27915,
+    27954, 27946, 27969, 27941, 27916, 27953, 27934, 27927, 27963,
+    {f: 2, c: 27965}, 27958, 27931, 27893, 27961, 27943, 27960, 27945, 27950,
+    27957, 27918, 27947, 28843, 28858, 28851, 28844, 28847, 28845, 28856,
+    28846, 28836, 29232, 29298, 29295, 29300, 29417, {f: 2, c: 29408}, 29623,
+    29642, 29627, 29618, 29645, 29632, 29619, 29978, 29997, 30031, 30028,
+    30030, 30027, 30123, {f: 2, c: 30116}, {f: 2, c: 30114}, 30328,
+    {f: 3, c: 30342}, 30408, 30406, 30403, 30405, 30465, 30457, 30456, 30473,
+    30475, 30462, 30460, 30471, 30684, 30722, 30740, {f: 2, c: 30732}, 31046,
+    31049, 31048, 31047, {f: 2, c: 31161}, {f: 2, c: 31185}, 31179, 31359,
+    31361, 31487, 31485, 31869, 32002, 32005, 32000, 32009, 32007, 32004,
+    32006, 32568, 32654, 32703, 32784, 32781, 32785, 32822, 32982, 32997,
+    32986, {f: 2, c: 32963}, 32972, 32993, 32987, 32974, 32990, 32996, 32989,
+    33268, 33314, 33511, 33539, 33541, 33507, 33499, 33510, 33540, 33509,
+    33538, 33545, 33490, 33495, 33521, 33537, 33500, 33492, 33489, 33502,
+    33491, 33503, 33519, 33542, 34384, 34425, 34427, 34426, 34893, 34923,
+    35201, 35284, 35336, {f: 2, c: 35330}, 35998, 36000, 36212, 36211, 36276,
+    36557, 36556, 36848, 36838, 36834, 36842, 36837, 36845, 36843, 36836,
+    36840, 37066, 37070, 37057, 37059, 37195, 37194, 37325, 38274, 38480,
+    {f: 3, c: 38475}, [12207, 38754], [12208, 38761], [12209, 38859],
+    [12210, 38893], [12211, 38899], [12212, 38913], [12213, 39080],
+    [12214, 39131], [12215, 39135], [12216, 39318], [12217, 39321], 20056,
+    20147, {f: 2, c: 20492}, 20515, 20463, 20518, 20517, 20472, [20521, 57375],
+    20502, 20486, 20540, 20511, 20506, 20498, 20497, 20474, 20480, 20500,
+    20520, 20465, 20513, 20491, 20505, 20504, 20467, 20462, 20525, 20522,
+    20478, 20523, 20489, 20860, {f: 2, c: 20900}, 20898, 20941, 20940, 20934,
+    20939, 21078, 21084, 21076, 21083, 21085, 21290, [21375, 57459], 21407,
+    21405, 21471, 21736, 21776, 21761, 21815, 21756, 21733, 21746, 21766,
+    21754, 21780, 21737, 21741, 21729, 21769, 21742, 21738, 21734, 21799,
+    21767, 21757, 21775, {f: 2, c: 22275}, 22466, 22484, 22475, 22467, 22537,
+    22799, {f: 2, c: 22871}, 22874, 23057, 23064, 23068, 23071, 23067, 23059,
+    23020, 23072, 23075, 23081, 23077, 23052, 23049, 23403, 23640, 23472,
+    23475, 23478, 23476, 23470, 23477, 23481, 23480, 23556, 23633, 23637,
+    23632, 23789, 23805, 23803, 23786, 23784, 23792, 23798, 23809, 23796,
+    24046, 24109, 24107, 24235, 24237, 24231, 24369, 24466, 24465, 24464,
+    24665, 24675, 24677, 24656, 24661, 24685, 24681, 24687, 24708, 24735,
+    24730, 24717, 24724, 24716, 24709, 24726, 25159, 25331, 25352, 25343,
+    25422, 25406, 25391, 25429, 25410, 25414, 25423, 25417, 25402, 25424,
+    25405, {f: 2, c: 25386}, 25384, 25421, 25420, {f: 2, c: 25928}, 26009,
+    26049, 26053, 26178, 26185, 26191, 26179, 26194, 26188, 26181, 26177,
+    26360, {f: 2, c: 26388}, 26391, 26657, 26680, 26696, 26694, 26707, 26681,
+    26690, 26708, 26665, 26803, 26647, 26700, 26705, 26685, 26612, 26704,
+    26688, 26684, 26691, 26666, 26693, 26643, 26648, 26689, 27530, 27529,
+    27575, 27683, {f: 2, c: 27687}, 27686, 27684, 27888, 28010, 28053, 28040,
+    28039, 28006, 28024, 28023, 27993, 28051, 28012, 28041, 28014, 27994,
+    28020, 28009, 28044, 28042, 28025, 28037, 28005, 28052, 28874, 28888,
+    28900, 28889, 28872, 28879, 29241, 29305, 29436, 29433, 29437, 29432,
+    29431, 29574, 29677, 29705, 29678, 29664, 29674, 29662, 30036, 30045,
+    30044, 30042, 30041, 30142, 30149, 30151, {f: 2, c: 30130}, 30141, 30140,
+    30137, 30146, 30136, 30347, 30384, 30410, {f: 2, c: 30413}, 30505,
+    {f: 2, c: 30495}, 30504, 30697, 30768, 30759, 30776, 30749, 30772, 30775,
+    30757, 30765, 30752, 30751, 30770, 31061, 31056, 31072, 31071, 31062,
+    31070, 31069, 31063, 31066, 31204, [31203, 60418], 31207, 31199, 31206,
+    31209, 31192, 31364, 31368, 31449, 31494, 31505, 31881, 32033, 32023,
+    32011, 32010, 32032, 32034, 32020, 32016, 32021, 32026, 32028, 32013,
+    32025, 32027, 32570, 32607, 32660, 32709, 32705, 32774, 32772, 32792,
+    32789, 32793, 32791, 32829, 32831, 33009, 33026, 33008, 33029, 33005,
+    33012, 33030, 33016, 33011, 33032, 33021, 33034, 33020, 33007, 33261,
+    33260, 33280, 33296, {f: 2, c: 33322}, 33320, 33324, 33467, 33579, 33618,
+    33620, 33610, 33592, 33616, 33609, 33589, 33588, 33615, 33586, 33593,
+    33590, 33559, 33600, 33585, 33576, 33603, 34388, 34442, 34474, 34451,
+    34468, 34473, 34444, 34467, 34460, 34928, 34935, {f: 2, c: 34945}, 34941,
+    34937, 35352, 35344, 35342, 35340, 35349, 35338, 35351, 35347, 35350,
+    35343, 35345, 35912, 35962, 35961, {f: 2, c: 36001}, [36215, 58442], 36524,
+    36562, 36564, 36559, 36785, 36865, 36870, 36855, 36864, 36858, 36852,
+    36867, 36861, 36869, 36856, 37013, 37089, 37085, 37090, 37202, 37197,
+    37196, 37336, 37341, 37335, 37340, 37337, 38275, {f: 2, c: 38498}, 38497,
+    38491, 38493, 38500, 38488, 38494, 38587, 39138, [12218, 39340],
+    [12219, 39592], [12220, 39640], [12222, 39717], [12224, 39730],
+    [12225, 39740], 20094, 20602, [20605, 57382], 20572, 20551, 20547, 20556,
+    20570, 20553, 20581, 20598, 20558, 20565, 20597, 20596, 20599, 20559,
+    20495, 20591, 20589, 20828, 20885, 20976, 21098, 21103, 21202, 21209,
+    21208, 21205, 21264, 21263, 21273, {f: 2, c: 21311}, 21310, 21443, 26364,
+    21830, 21866, 21862, 21828, 21854, 21857, 21827, 21834, 21809, 21846,
+    21839, 21845, 21807, 21860, 21816, 21806, 21852, 21804, 21859, 21811,
+    21825, 21847, 22280, 22283, 22281, 22495, 22533, 22538, 22534, 22496,
+    22500, 22522, 22530, 22581, 22519, 22521, 22816, 22882, 23094, 23105,
+    23113, 23142, 23146, 23104, 23100, 23138, 23130, 23110, 23114, 23408,
+    23495, 23493, 23492, 23490, 23487, 23494, 23561, 23560, 23559, 23648,
+    {f: 2, c: 23644}, 23815, 23814, 23822, 23835, 23830, 23842, 23825, 23849,
+    23828, 23833, 23844, 23847, 23831, 24034, 24120, 24118, 24115, 24119,
+    {f: 2, c: 24247}, 24246, 24245, 24254, 24373, 24375, 24407, 24428, 24425,
+    24427, 24471, 24473, 24478, 24472, 24481, 24480, 24476, 24703, 24739,
+    24713, 24736, 24744, 24779, 24756, 24806, 24765, 24773, 24763, 24757,
+    24796, 24764, 24792, 24789, 24774, 24799, 24760, 24794, 24775,
+    {f: 2, c: 25114}, 25160, 25504, 25511, 25458, 25494, 25506, 25509, 25463,
+    25447, 25496, 25514, 25457, 25513, 25481, 25475, 25499, 25451, 25512,
+    25476, 25480, 25497, 25505, 25516, 25490, 25487, 25472, 25467, 25449,
+    25448, 25466, 25949, 25942, 25937, 25945, 25943, 21855, 25935, 25944,
+    25941, 25940, 26012, 26011, 26028, 26063, {f: 2, c: 26059}, 26062, 26205,
+    26202, 26212, 26216, 26214, 26206, 26361, 21207, 26395, 26753, 26799,
+    26786, 26771, 26805, 26751, 26742, 26801, 26791, 26775, 26800, 26755,
+    26820, 26797, 26758, 26757, 26772, 26781, 26792, 26783, 26785, 26754,
+    27442, 27578, {f: 2, c: 27627}, 27691, 28046, 28092, 28147, 28121, 28082,
+    28129, 28108, 28132, 28155, 28154, 28165, 28103, 28107, 28079, 28113,
+    28078, 28126, 28153, 28088, 28151, 28149, 28101, 28114, 28186, 28085,
+    28122, 28139, 28120, 28138, 28145, 28142, 28136, 28102, 28100, 28074,
+    28140, 28095, 28134, 28921, {f: 2, c: 28937}, 28925, 28911, 29245, 29309,
+    29313, 29468, 29467, 29462, 29459, 29465, 29575, 29701, 29706, 29699,
+    29702, 29694, 29709, 29920, {f: 2, c: 29942}, 29980, 29986,
+    {f: 2, c: 30053}, 30050, 30064, 30095, {f: 2, c: 30164}, 30133, 30154,
+    30157, 30350, 30420, 30418, 30427, 30519, 30526, 30524, 30518, 30520,
+    30522, 30827, 30787, 30798, 31077, 31080, 31085, 31227, 31378, 31381,
+    31520, 31528, 31515, 31532, 31526, 31513, 31518, 31534, 31890, 31895,
+    31893, 32070, 32067, 32113, 32046, 32057, 32060, 32064, 32048, 32051,
+    32068, 32047, 32066, 32050, 32049, 32573, 32670, 32666, 32716, 32718,
+    32722, 32796, 32842, 32838, 33071, 33046, 33059, 33067, 33065, 33072,
+    33060, 33282, 33333, 33335, 33334, 33337, 33678, 33694, 33688, 33656,
+    33698, 33686, 33725, 33707, 33682, 33674, 33683, 33673, 33696, 33655,
+    {f: 2, c: 33659}, 33670, 33703, 34389, 24426, 34503, 34496, 34486, 34500,
+    34485, 34502, 34507, 34481, 34479, 34505, 34899, 34974, 34952, 34987,
+    34962, 34966, 34957, 34955, 35219, 35215, 35370, 35357, 35363, 35365,
+    35377, 35373, 35359, 35355, 35362, 35913, 35930, 36009, 36012, 36011,
+    36008, 36010, 36007, 36199, 36198, 36286, 36282, 36571, 36575, 36889,
+    36877, 36890, 36887, 36899, 36895, 36893, 36880, 36885, 36894, 36896,
+    36879, 36898, 36886, 36891, 36884, 37096, 37101, [37117, 58488], 37207,
+    37326, 37365, 37350, 37347, 37351, 37357, 37353, 38281, 38506, 38517,
+    38515, 38520, 38512, 38516, {f: 2, c: 38518}, 38508, 38592, 38634, 38633,
+    31456, 31455, {f: 2, c: 38914}, [12226, 39770], [12227, 40165],
+    [12228, 40565], [12229, 40575], [12230, 40613], [12231, 40635], 20642,
+    20621, 20613, 20633, 20625, 20608, 20630, 20632, 20634, 26368, 20977,
+    21106, {f: 2, c: 21108}, 21097, 21214, 21213, 21211, 21338, 21413, 21883,
+    21888, 21927, 21884, 21898, 21917, 21912, 21890, 21916, 21930, 21908,
+    21895, 21899, 21891, 21939, 21934, 21919, 21822, 21938, 21914, 21947,
+    21932, 21937, 21886, 21897, 21931, 21913, 22285, 22575, 22570, 22580,
+    22564, {f: 2, c: 22576}, 22561, 22557, 22560, {f: 2, c: 22777}, 22880,
+    [23159, 57587], 23194, 23167, 23186, 23195, 23207, 23411, 23409, 23506,
+    23500, 23507, 23504, {f: 2, c: 23562}, 23601, 23884, 23888, 23860, 23879,
+    24061, 24133, 24125, 24128, 24131, 24190, 24266, {f: 2, c: 24257}, 24260,
+    24380, 24429, {f: 2, c: 24489}, 24488, 24785, 24801, 24754, 24758, 24800,
+    24860, 24867, 24826, 24853, 24816, 24827, 24820, 24936, 24817, 24846,
+    24822, 24841, 24832, 24850, 25119, 25161, 25507, 25484, 25551, 25536,
+    25577, 25545, 25542, 25549, 25554, 25571, 25552, 25569, 25558,
+    {f: 2, c: 25581}, 25462, 25588, 25578, 25563, 25682, 25562, 25593, 25950,
+    25958, {f: 2, c: 25954}, 26001, 26000, 26031, 26222, 26224, [26228, 57786],
+    26230, 26223, 26257, 26234, 26238, 26231, {f: 2, c: 26366}, 26399, 26397,
+    26874, 26837, 26848, 26840, 26839, 26885, 26847, 26869, 26862, 26855,
+    26873, 26834, 26866, 26851, 26827, 26829, 26893, 26898, 26894, 26825,
+    26842, 26990, 26875, 27454, 27450, 27453, 27544, 27542, 27580, 27631,
+    {f: 2, c: 27694}, 27692, [28207, 57904], 28216, 28244, 28193, 28210, 28263,
+    28234, 28192, 28197, 28195, 28187, 28251, 28248, 28196, 28246, 28270,
+    28205, 28198, 28271, 28212, 28237, 28218, 28204, 28227, [28189, 57901],
+    28222, 28363, 28297, 28185, 28238, 28259, 28228, 28274, 28265, 28255,
+    {f: 2, c: 28953}, 28966, 28976, 28961, 28982, [29038, 57958], 28956, 29260,
+    29316, 29312, 29494, 29477, 29492, 29481, 29754, 29738, 29747, 29730,
+    29733, {f: 2, c: 29749}, 29748, 29743, 29723, 29734, 29736,
+    {f: 2, c: 29989}, 30059, 30058, 30178, 30171, 30179, 30169, 30168, 30174,
+    30176, {f: 2, c: 30331}, 30358, 30355, 30388, 30428, 30543, 30701, 30813,
+    30828, 30831, 31245, 31240, 31243, 31237, 31232, 31384, 31383, 31382,
+    31461, 31459, 31561, 31574, 31558, 31568, 31570, 31572, 31565, 31563,
+    31567, [31569, 60510], 31903, 31909, 32094, 32080, 32104, 32085, 32043,
+    32110, 32114, 32097, 32102, 32098, 32112, 32115, 21892, {f: 2, c: 32724},
+    32779, 32850, 32901, 33109, 33108, 33099, 33105, 33102, 33081, 33094,
+    33086, 33100, 33107, 33140, 33298, 33308, 33769, 33795, 33784, 33805,
+    33760, 33733, 33803, [33729, 58309], 33775, 33777, 33780, 33879, 33802,
+    33776, 33804, 33740, 33789, 33778, 33738, 33848, 33806, 33796, 33756,
+    33799, 33748, 33759, 34395, 34527, 34521, 34541, 34516, 34523, 34532,
+    34512, 34526, 34903, {f: 2, c: 35009}, 34993, 35203, 35222, 35387, 35424,
+    35413, 35422, 35388, 35393, 35412, 35419, 35408, 35398, 35380, 35386,
+    35382, 35414, 35937, 35970, 36015, 36028, 36019, 36029, 36033, 36027,
+    36032, 36020, 36023, 36022, 36031, 36024, 36234, 36229, 36225, 36302,
+    36317, 36299, 36314, 36305, 36300, 36315, 36294, 36603, 36600, 36604,
+    36764, 36910, 36917, 36913, 36920, 36914, 36918, 37122, 37109, 37129,
+    37118, 37219, 37221, 37327, {f: 2, c: 37396}, 37411, 37385, 37406, 37389,
+    37392, 37383, 37393, 38292, 38287, 38283, 38289, 38291, 38290, 38286,
+    38538, 38542, 38539, 38525, {f: 2, c: 38533}, 38541, 38514, 38532, 38593,
+    38597, 38596, {f: 2, c: 38598}, 38639, 38642, 38860, {f: 2, c: 38917},
+    38920, 39143, 39146, 39151, 39145, 39154, 39149, 39342, 39341,
+    [12232, 40643], [12233, 40653], [12234, 40657], 20098, 20653, 20661,
+    {f: 2, c: 20658}, 20677, 20670, 20652, 20663, 20667, 20655, 20679, 21119,
+    21111, 21117, 21215, 21222, 21220, {f: 2, c: 21218}, 21295, 21983, 21992,
+    21971, 21990, 21966, 21980, 21959, 21969, {f: 2, c: 21987}, 21999, 21978,
+    21985, {f: 2, c: 21957}, 21989, 21961, {f: 2, c: 22290}, 22622, 22609,
+    22616, 22615, 22618, 22612, 22635, 22604, 22637, 22602, 22626, 22610,
+    22603, 22887, 23233, 23241, 23244, 23230, 23229, 23228, 23219, 23234,
+    23218, 23913, 23919, 24140, 24185, 24265, 24264, 24338, 24409, 24492,
+    24494, 24858, 24847, 24904, 24863, 24819, 24859, 24825, 24833, 24840,
+    24910, 24908, 24900, 24909, 24894, 24884, 24871, 24845, 24838, 24887,
+    {f: 2, c: 25121}, 25619, 25662, 25630, 25642, 25645, 25661, 25644, 25615,
+    25628, 25620, 25613, 25654, {f: 2, c: 25622}, 25606, 25964, 26015, 26032,
+    26263, 26249, {f: 2, c: 26247}, 26262, 26244, 26264, 26253, 26371, 27028,
+    26989, 26970, 26999, 26976, 26964, 26997, 26928, 27010, 26954, 26984,
+    26987, 26974, 26963, 27001, 27014, 26973, 26979, 26971, 27463, 27506,
+    27584, 27583, 27603, 27645, 28322, 28335, 28371, 28342, 28354, 28304,
+    28317, 28359, 28357, 28325, 28312, 28348, 28346, 28331, 28369, 28310,
+    28316, 28356, 28372, 28330, 28327, 28340, 29006, 29017, 29033, 29028,
+    29001, 29031, 29020, 29036, 29030, 29004, 29029, 29022, 28998, 29032,
+    29014, 29242, 29266, 29495, 29509, 29503, 29502, 29807, 29786, 29781,
+    29791, 29790, 29761, 29759, 29785, 29787, [29788, 58019], 30070, 30072,
+    30208, 30192, 30209, 30194, 30193, 30202, 30207, 30196, 30195,
+    {f: 2, c: 30430}, 30555, 30571, 30566, 30558, 30563, 30585, 30570, 30572,
+    30556, 30565, 30568, 30562, 30702, 30862, 30896, {f: 2, c: 30871}, 30860,
+    30857, 30844, 30865, 30867, 30847, 31098, 31103, 31105, 33836, 31165,
+    31260, 31258, 31264, 31252, 31263, 31262, {f: 2, c: 31391}, 31607, 31680,
+    31584, 31598, 31591, 31921, 31923, 31925, 32147, 32121, 32145, 32129,
+    32143, 32091, 32622, {f: 2, c: 32617}, 32626, 32681, 32680, 32676, 32854,
+    32856, 32902, 32900, 33137, 33136, 33144, 33125, 33134, 33139, 33131,
+    {f: 2, c: 33145}, 33126, 33285, 33351, 33922, 33911, 33853, 33841, 33909,
+    33894, 33899, 33865, 33900, 33883, 33852, 33845, 33889, 33891, 33897,
+    33901, 33862, 34398, 34396, 34399, 34553, 34579, 34568, 34567, 34560,
+    34558, 34555, {f: 2, c: 34562}, 34566, 34570, 34905, 35039, 35028, 35033,
+    35036, 35032, 35037, 35041, 35018, 35029, 35026, 35228, 35299, 35435,
+    {f: 2, c: 35442}, 35430, 35433, 35440, 35463, 35452, 35427, 35488, 35441,
+    35461, 35437, 35426, 35438, 35436, 35449, 35451, 35390, 35432, 35938,
+    35978, 35977, 36042, {f: 2, c: 36039}, 36036, 36018, 36035, 36034, 36037,
+    36321, 36319, 36328, 36335, 36339, 36346, 36330, 36324, 36326, 36530,
+    36611, 36617, 36606, 36618, 36767, 36786, 36939, 36938, 36947, 36930,
+    36948, 36924, 36949, 36944, 36935, 36943, 36942, 36941, 36945, 36926,
+    36929, 37138, 37143, 37228, 37226, 37225, 37321, 37431, 37463, 37432,
+    37437, 37440, 37438, 37467, 37451, 37476, 37457, 37428, 37449, 37453,
+    37445, 37433, 37439, 37466, 38296, 38552, {f: 2, c: 38548}, 38605, 38603,
+    {f: 2, c: 38601}, 38647, 38651, 38649, 38646, 38742, 38772, 38774,
+    {f: 2, c: 38928}, 38931, 38922, 38930, 38924, 39164, 39156,
+    {f: 2, c: 39165}, 39347, 39345, 39348, 39649, 40169, 40578, [12237, 40718],
+    [12238, 40723], [12239, 40736], 20711, 20718, 20709, 20694, [20717, 60903],
+    20698, 20693, 20687, 20689, 20721, 20686, 20713, 20834, 20979, 21123,
+    21122, 21297, 21421, 22014, 22016, 22043, 22039, 22013, 22036, 22022,
+    22025, {f: 2, c: 22029}, 22007, 22038, 22047, 22024, 22032, 22006, 22296,
+    22294, 22645, 22654, 22659, 22675, 22666, 22649, 22661, 22653, 22781,
+    22821, 22818, 22820, 22890, 22889, 23265, 23270, 23273, 23255, 23254,
+    23256, 23267, 23413, 23518, 23527, 23521, {f: 2, c: 23525}, 23528, 23522,
+    23524, 23519, 23565, 23650, 23940, 23943, 24155, 24163, 24149, 24151,
+    24148, 24275, 24278, 24330, 24390, 24432, 24505, 24903, 24895, 24907,
+    24951, {f: 2, c: 24930}, 24927, 24922, 24920, 24949, 25130, 25735, 25688,
+    25684, 25764, 25720, 25695, 25722, 25681, 25703, 25652, 25709, 25723,
+    25970, 26017, 26071, 26070, 26274, 26280, 26269, 27036, 27048, 27029,
+    27073, 27054, 27091, 27083, 27035, 27063, 27067, 27051, 27060, 27088,
+    27085, 27053, 27084, 27046, 27075, 27043, 27465, 27468, 27699, 28467,
+    28436, 28414, 28435, 28404, 28457, 28478, 28448, 28460, 28431, 28418,
+    28450, 28415, 28399, 28422, 28465, 28472, 28466, 28451, 28437, 28459,
+    28463, 28552, 28458, 28396, 28417, 28402, 28364, 28407, 29076, 29081,
+    29053, 29066, 29060, 29074, 29246, 29330, 29334, 29508, 29520, 29796,
+    29795, 29802, 29808, 29805, 29956, 30097, 30247, 30221, 30219, 30217,
+    30227, 30433, 30435, 30596, 30589, 30591, 30561, 30913, 30879, 30887,
+    30899, 30889, 30883, {f: 2, c: 31118}, 31117, 31278, 31281, 31402, 31401,
+    31469, 31471, 31649, 31637, 31627, 31605, 31639, 31645, 31636, 31631,
+    [31672, 58170], 31623, 31620, 31929, {f: 2, c: 31933}, 32187, 32176, 32156,
+    {f: 2, c: 32189}, 32160, 32202, 32180, 32178, 32177, 32186, 32162, 32191,
+    32181, 32184, 32173, [32210, 58202], 32199, 32172, 32624, {f: 2, c: 32736},
+    32735, 32862, 32858, 32903, 33104, 33152, 33167, 33160, 33162, 33151,
+    33154, 33255, 33274, 33287, 33300, 33310, 33355, 33993, 33983, 33990,
+    33988, 33945, 33950, 33970, 33948, 33995, 33976, 33984, 34003, 33936,
+    33980, 34001, 33994, 34623, 34588, 34619, 34594, 34597, 34612, 34584,
+    34645, 34615, 34601, 35059, 35074, 35060, 35065, 35064, 35069, 35048,
+    35098, 35055, 35494, 35468, 35486, 35491, 35469, 35489, 35475, 35492,
+    35498, 35493, 35496, 35480, 35473, 35482, 35495, 35946, 35981, 35980,
+    36051, {f: 2, c: 36049}, 36203, 36249, 36245, 36348, 36628, 36626, 36629,
+    36627, 36771, 36960, 36952, 36956, 36963, 36953, 36958, 36962, 36957,
+    36955, 37145, 37144, 37150, 37237, 37240, 37239, 37236, 37496, 37548,
+    37504, 37509, 37528, 37526, 37499, 37523, 37532, 37544, 37500, 37521,
+    38305, {f: 2, c: 38312}, 38307, 38309, 38308, 38553, 38556, 38555, 38604,
+    38610, 38656, 38780, 38789, 38902, {f: 2, c: 38935}, 39087, 39089, 39171,
+    39173, 39180, 39177, 39361, {f: 2, c: 39599}, 39654, {f: 2, c: 39745},
+    40180, 40182, 40179, 40636, [12240, 40763], [12241, 40778], 20740, 20736,
+    20731, 20725, 20729, 20738, {f: 2, c: 20744}, 20741, 20956,
+    {f: 3, c: 21127}, 21133, 21130, 21232, 21426, 22062, 22075, 22073, 22066,
+    22079, 22068, 22057, 22099, 22094, 22103, 22132, 22070, {f: 2, c: 22063},
+    22656, 22687, 22686, 22707, 22684, 22702, 22697, 22694, 22893, 23305,
+    23291, 23307, 23285, 23308, 23304, 23534, 23532, 23529, 23531,
+    {f: 2, c: 23652}, 23965, 23956, 24162, 24159, 24161, 24290, 24282, 24287,
+    24285, 24291, 24288, 24392, 24433, 24503, 24501, 24950, 24935, 24942,
+    24925, 24917, 24962, 24956, 24944, 24939, 24958, 24999, 24976, 25003,
+    24974, 25004, 24986, 24996, 24980, 25006, 25134, 25705, 25711, 25721,
+    25758, 25778, 25736, [25744, 57745], 25776, 25765, 25747, 25749, 25769,
+    25746, 25774, 25773, 25771, 25754, 25772, 25753, 25762, 25779, 25973,
+    {f: 2, c: 25975}, 26286, 26283, 26292, 26289, 27171, 27167, 27112, 27137,
+    27166, 27161, 27133, 27169, 27155, 27146, 27123, 27138, 27141, 27117,
+    27153, 27472, 27470, 27556, {f: 2, c: 27589}, 28479, 28540, 28548, 28497,
+    28518, 28500, 28550, 28525, 28507, 28536, 28526, 28558, 28538, 28528,
+    28516, 28567, 28504, 28373, 28527, 28512, 28511, 29087, 29100, 29105,
+    29096, 29270, 29339, 29518, 29527, 29801, 29835, 29827, 29822, 29824,
+    30079, 30240, 30249, 30239, 30244, 30246, {f: 2, c: 30241}, 30362, 30394,
+    30436, 30606, 30599, 30604, 30609, 30603, 30923, 30917, 30906, 30922,
+    30910, 30933, 30908, 30928, 31295, 31292, 31296, 31293, 31287, 31291,
+    31407, 31406, 31661, 31665, 31684, 31668, {f: 2, c: 31686}, 31681, 31648,
+    31692, 31946, 32224, 32244, 32239, 32251, 32216, 32236, 32221, 32232,
+    32227, 32218, 32222, 32233, 32158, 32217, 32242, 32249, 32629, 32631,
+    32687, 32745, 32806, {f: 3, c: 33179}, 33184, 33178, 33176, 34071, 34109,
+    34074, 34030, {f: 2, c: 34092}, 34067, 34065, 34083, 34081, 34068, 34028,
+    34085, 34047, 34054, 34690, 34676, 34678, 34656, 34662, 34680, 34664,
+    34649, 34647, 34636, 34643, 34907, 34909, 35088, 35079, {f: 2, c: 35090},
+    35093, 35082, 35516, 35538, 35527, 35524, 35477, 35531, 35576, 35506,
+    35529, 35522, 35519, 35504, 35542, 35533, 35510, 35513, 35547, 35916,
+    35918, 35948, 36064, 36062, 36070, 36068, {f: 2, c: 36076},
+    {f: 2, c: 36066}, 36060, 36074, 36065, 36205, 36255, 36259, 36395, 36368,
+    36381, 36386, 36367, 36393, 36383, 36385, 36382, 36538, 36637, 36635,
+    36639, 36649, 36646, 36650, 36636, 36638, 36645, 36969, 36974, 36968,
+    36973, 36983, 37168, 37165, 37159, 37169, 37255, 37257, 37259, 37251,
+    37573, 37563, 37559, 37610, 37604, 37569, 37555, 37564, 37586, 37575,
+    37616, 37554, 38317, 38321, 38660, {f: 2, c: 38662}, 38665, 38752, 38797,
+    38795, 38799, 38945, 38955, 38940, 39091, 39178, 39187, 39186, 39192,
+    39389, 39376, 39391, 39387, 39377, 39381, 39378, 39385, 39607,
+    {f: 2, c: 39662}, 39719, 39749, 39748, 39799, 39791, 40198, 40201, 40195,
+    40617, 40638, 40654, 22696, [12242, 40786], 20754, 20760, 20756, 20752,
+    20757, 20864, 20906, 20957, 21137, 21139, 21235, 22105, 22123, 22137,
+    22121, 22116, 22136, 22122, 22120, 22117, 22129, 22127, 22124, 22114,
+    22134, 22721, 22718, 22727, 22725, 22894, 23325, 23348, 23416, 23536,
+    23566, 24394, 25010, 24977, 25001, 24970, 25037, 25014, 25022, 25034,
+    25032, 25136, 25797, 25793, 25803, {f: 2, c: 25787}, 25818, 25796, 25799,
+    25794, 25805, 25791, 25810, 25812, 25790, 25972, 26310, 26313, 26297,
+    26308, 26311, 26296, 27197, 27192, 27194, 27225, 27243, 27224, 27193,
+    27204, 27234, 27233, 27211, 27207, 27189, 27231, 27208, 27481, 27511,
+    27653, 28610, 28593, 28577, 28611, 28580, 28609, 28583, 28595, 28608,
+    28601, [28598, 60318], 28582, 28576, 28596, 29118, 29129, 29136, 29138,
+    29128, 29141, 29113, 29134, 29145, 29148, {f: 2, c: 29123}, 29544, 29852,
+    29859, 29848, 29855, 29854, 29922, {f: 2, c: 29964}, 30260, 30264, 30266,
+    30439, 30437, 30624, {f: 2, c: 30622}, 30629, 30952, 30938, 30956, 30951,
+    31142, {f: 2, c: 31309}, 31302, 31308, 31307, 31418, 31705, 31761, 31689,
+    31716, 31707, 31713, 31721, 31718, {f: 2, c: 31957}, 32266, 32273, 32264,
+    32283, 32291, 32286, [32285, 58211], 32265, 32272, 32633, 32690,
+    {f: 2, c: 32752}, 32750, [32808, 58239], 33203, 33193, 33192, 33275, 33288,
+    {f: 2, c: 33368}, 34122, 34137, 34120, {f: 2, c: 34152}, 34115, 34121,
+    34157, 34154, 34142, 34691, 34719, 34718, 34722, 34701, 34913, 35114,
+    35122, 35109, 35115, 35105, 35242, [35238, 58391], 35558, 35578, 35563,
+    35569, 35584, 35548, 35559, 35566, 35582, {f: 2, c: 35585}, 35575, 35565,
+    35571, 35574, 35580, 35947, 35949, 35987, 36084, 36420, 36401, 36404,
+    36418, 36409, 36405, 36667, 36655, 36664, 36659, 36776, 36774, 36981,
+    36980, 36984, 36978, 36988, 36986, 37172, 37266, 37664, 37686, 37624,
+    37683, 37679, 37666, 37628, 37675, 37636, 37658, 37648, 37670, 37665,
+    37653, 37678, 37657, 38331, {f: 2, c: 38567}, 38570, 38613, 38670, 38673,
+    38678, 38669, 38675, 38671, 38747, [38748, 58565], 38758, 38808, 38960,
+    38968, 38971, 38967, 38957, 38969, 38948, 39184, 39208, 39198, 39195,
+    39201, 39194, 39405, 39394, 39409, 39608, 39612, 39675, 39661, 39720,
+    39825, 40213, 40227, 40230, 40232, 40210, 40219, 40664, 40660,
+    [12243, 40845], [12244, 40860], 20778, 20767, 20769, 20786, 21237, 22158,
+    22144, 22160, 22149, 22151, 22159, 22741, 22739, 22737, 22734, 23344,
+    23338, 23332, 23418, 23607, 23656, 23996, 23994, 23997, 23992, 24171,
+    24396, 24509, 25033, 25026, 25031, 25062, 25035, 25138, 25140, 25806,
+    25802, 25816, 25824, 25840, 25830, 25836, 25841, 25826, 25837,
+    {f: 2, c: 25986}, 26329, 26326, 27264, 27284, 27268, 27298, 27292, 27355,
+    27299, 27262, 27287, 27280, 27296, 27484, 27566, 27610, 27656, 28632,
+    28657, {f: 2, c: 28639}, 28635, 28644, 28651, 28655, 28544, 28652, 28641,
+    28649, 28629, 28654, 28656, 29159, [29151, 60361], 29166, 29158, 29157,
+    29165, 29164, 29172, 29152, 29237, 29254, 29552, 29554, 29865, 29872,
+    29862, 29864, 30278, 30274, 30284, 30442, 30643, 30634, 30640, 30636,
+    30631, 30637, 30703, 30967, 30970, 30964, 30959, 30977, 31143, 31146,
+    31319, 31423, 31751, 31757, 31742, 31735, 31756, 31712, 31968, 31964,
+    31966, 31970, 31967, 31961, 31965, 32302, 32318, 32326, 32311, 32306,
+    32323, 32299, 32317, 32305, 32325, 32321, 32308, 32313, 32328, 32309,
+    32319, 32303, 32580, 32755, 32764, {f: 2, c: 32881}, 32880, 32879, 32883,
+    33222, 33219, 33210, 33218, 33216, 33215, 33213, 33225, 33214, 33256,
+    33289, 33393, 34218, 34180, 34174, 34204, 34193, 34196, 34223, 34203,
+    34183, 34216, 34186, 34214, 34407, 34752, 34769, 34739, 34770, 34758,
+    34731, 34747, 34746, 34760, 34763, 35131, 35126, 35140, 35128, 35133,
+    35244, 35598, 35607, 35609, 35611, 35594, 35616, 35613, 35588, 35600,
+    35905, 35903, 35955, 36090, 36093, 36092, 36088, 36091, 36264, 36425,
+    36427, 36424, 36426, 36676, 36670, 36674, 36677, 36671, 36991, 36989,
+    36996, {f: 2, c: 36993}, 36992, 37177, 37283, 37278, 37276, 37709, 37762,
+    37672, 37749, 37706, 37733, 37707, 37656, 37758, 37740, 37723, 37744,
+    37722, 37716, {f: 3, c: 38346}, 38344, 38342, 38577, 38584, 38614, 38684,
+    38686, 38816, 38867, 38982, 39094, 39221, 39425, 39423, 39854, 39851,
+    39850, 39853, 40251, 40255, 40587, 40655, 40670, {f: 2, c: 40668}, 40667,
+    40766, 40779, 21474, 22165, 22190, 22745, 22744, 23352, 24413, 25059,
+    25139, 25844, 25842, 25854, 25862, {f: 2, c: 25850}, 25847, 26039, 26332,
+    26406, 27315, 27308, 27331, 27323, 27320, 27330, {f: 2, c: 27310}, 27487,
+    27512, 27567, 28681, 28683, 28670, 28678, 28666, 28689, 28687,
+    {f: 2, c: 29179}, 29182, 29176, 29559, 29557, 29863, 29887, 29973, 30294,
+    30296, 30290, 30653, 30655, {f: 2, c: 30651}, 30990, 31150,
+    {f: 2, c: 31329}, 31328, {f: 2, c: 31428}, 31787, 31783, 31786, 31774,
+    31779, 31777, 31975, {f: 2, c: 32340}, 32350, 32346, 32353, 32338, 32345,
+    32584, 32761, 32763, 32887, 32886, 33229, 33231, 33290, 34255, 34217,
+    34253, 34256, 34249, 34224, 34234, 34233, 34799, 34796, 34802, 34784,
+    35206, 35250, 35316, 35624, 35641, 35628, 35627, 35920, 36101, 36441,
+    36451, 36454, 36452, 36447, 36437, 36544, 36681, 36685, 36999, 36995,
+    37000, {f: 2, c: 37291}, 37328, 37780, 37770, 37782, 37794, 37811, 37806,
+    37804, 37808, 37784, 37786, 37783, 38356, 38358, 38352, 38357, 38626,
+    38620, 38617, 38619, 38622, 38692, 38819, 38822, 38829, 38905, 38989,
+    38991, 38988, 38990, 38995, 39098, {f: 2, c: 39230}, 39229, 39214, 39333,
+    39438, 39617, 39683, 39686, 39759, 39758, 39757, 39882, 39881, 39933,
+    39880, 39872, 40273, 40285, 40288, 40672, 40725, 40748, 20787, 22181,
+    22184, {f: 2, c: 22750}, 22754, 23541, 40848, 24300, 25074, 25079, 25078,
+    25077, 25856, 25871, 26336, 26333, 27365, 27357, 27354, 27347, 28699,
+    28703, 28712, 28698, 28701, 28693, 28696, 29190, 29197, 29272, 29346,
+    29560, 29562, 29885, 29898, 29923, 30087, 30086, 30303, 30305, 30663,
+    31001, 31153, 31339, 31337, {f: 2, c: 31806}, 31800, 31805, 31799, 31808,
+    32363, 32365, 32377, {f: 2, c: 32361}, 32371, 32645, 32694, 32697, 32696,
+    33240, 34281, 34269, 34282, 34261, {f: 2, c: 34276}, 34295, 34811, 34821,
+    34829, 34809, 34814, 35168, 35167, 35158, 35166, 35649, 35676, 35672,
+    35657, 35674, {f: 2, c: 35662}, 35654, 35673, 36104, 36106, 36476, 36466,
+    36487, 36470, 36460, 36474, 36468, 36692, 36686, 36781, {f: 2, c: 37002},
+    37297, 37294, 37857, 37841, 37855, 37827, 37832, {f: 2, c: 37852}, 37846,
+    37858, 37837, 37848, 37860, 37847, 37864, 38364, 38580, 38627, 38698,
+    38695, 38753, 38876, 38907, 39006, 39000, 39003, 39100, 39237, 39241,
+    39446, 39449, 39693, 39912, 39911, 39894, 39899, 40329, 40289, 40306,
+    40298, 40300, 40594, 40599, 40595, 40628, 21240, 22199, 22198, 22196,
+    22204, 22756, 23360, 23363, 23421, 23542, 24009, 25080, 25082, 25880,
+    25876, 25881, 26342, 26407, 27372, 28734, 28720, 28722, 29200, 29563,
+    29903, 30306, 30309, 31014, 31018, 31020, 31019, 31431, 31478, 31820,
+    31811, 31821, {f: 2, c: 31983}, 36782, 32381, 32380, 32386, 32588, 32768,
+    33242, 33382, 34299, 34297, 34321, 34298, 34310, 34315, 34311, 34314,
+    {f: 2, c: 34836}, 35172, 35258, 35320, 35696, 35692, 35686, 35695, 35679,
+    35691, 36111, 36109, 36489, 36481, 36485, 36482, 37300, 37323, 37912,
+    37891, 37885, 38369, 38704, 39108, 39250, 39249, 39336, 39467, 39472,
+    39479, 39477, 39955, 39949, 40569, 40629, 40680, 40751, 40799, 40803,
+    40801, {f: 2, c: 20791}, 22209, 22208, 22210, 22804, 23660, 24013, 25084,
+    25086, 25885, 25884, 26005, 26345, 27387, 27396, 27386, 27570, 28748,
+    29211, 29351, 29910, 29908, 30313, 30675, 31824, 32399, 32396, 32700,
+    34327, 34349, 34330, 34851, 34850, 34849, 34847, 35178, 35180, 35261,
+    35700, 35703, 35709, 36115, 36490, 36493, 36491, 36703, 36783, 37306,
+    37934, 37939, 37941, 37946, 37944, 37938, 37931, 38370, {f: 2, c: 38712},
+    38706, [38911, 58586], 39015, 39013, 39255, 39493, 39491, 39488, 39486,
+    39631, 39764, 39761, 39981, 39973, 40367, 40372, 40386, 40376, 40605,
+    40687, 40729, 40796, {f: 2, c: 40806}, 20796, 20795, 22216, 22218, 22217,
+    23423, 24020, 24018, 24398, 25087, 25892, 27402, 27489, 28753, 28760,
+    29568, 29924, 30090, 30318, 30316, 31155, 31840, 31839, 32894, 32893,
+    33247, 35186, 35183, 35324, 35712, {f: 2, c: 36118}, 36497, 36499, 36705,
+    37192, 37956, {f: 2, c: 37969}, {f: 2, c: 38717}, 38851, 38849, 39019,
+    39253, 39509, 39501, 39634, 39706, 40009, 39985, 39998, 39995, 40403,
+    40407, 40756, 40812, 40810, 40852, 22220, 24022, 25088, 25891, 25899,
+    25898, 26348, 27408, 29914, 31434, 31844, 31843, 31845, 32403, 32406,
+    32404, 33250, 34360, 34367, 34865, 35722, 37008, 37007, 37987, 37984,
+    37988, 38760, 39023, 39260, {f: 2, c: 39514}, 39511, {f: 2, c: 39635},
+    39633, 40020, 40023, 40022, 40421, 40607, 40692, 22225, 22761, 25900,
+    28766, {f: 2, c: 30321}, [30679, 60226], 32592, 32648, 34870, 34873, 34914,
+    35731, 35730, 35734, 33399, 36123, 37312, 37994, 38722, 38728, 38724,
+    38854, 39024, 39519, 39714, 39768, 40031, {f: 2, c: 40441},
+    {f: 2, c: 40572}, 40711, 40823, 40818, 24307, 27414, 28771, 31852, 31854,
+    34875, 35264, 36513, 37313, 38002, 38000, 39025, 39262, 39638, 39715,
+    40652, 28772, 30682, 35738, 38007, 38857, 39522, 39525, 32412, 35740,
+    36522, 37317, {f: 2, c: 38013}, 38012, {f: 2, c: 40055}, 40695, 35924,
+    38015, 40474, 29224, 39530, 39729, 40475, 40478, 31858, 20034, 20060,
+    [12048, 20981], [12053, 21274], [12058, 21378], 19975, 19980, 20039, 20109,
+    [12062, 22231], [12076, 23662], [12091, 24435], 19983, 20871, 19982, 20014,
+    20115, 20162, 20169, 20168, 20888, 21244, 21356, 21433, 22304, 22787,
+    22828, [23568, 60417], 24063, 26081, [12110, 27571], 27596, [12115, 27668],
+    [12121, 29247], 20017, 20028, 20200, 20188, 20201, 20193, 20189, 20186,
+    21004, 21001, 21276, 21324, {f: 2, c: 22306}, 22807, 22831, 23425, 23428,
+    23570, 23611, 23668, 23667, 24068, 24192, 24194, 24521, 25097, 25168,
+    27669, 27702, 27715, 27711, 27707, 29358, 29360, 29578, [12145, 31160],
+    32906, 38430, 20238, 20248, 20268, 20213, 20244, 20209, 20224, 20215,
+    20232, 20253, 20226, 20229, 20258, 20243, 20228, 20212, 20242, 20913,
+    21011, 21008, 21158, 21282, 21279, 21325, 21386, 21511, 22241, 22239,
+    22318, 22314, 22324, 22844, 22912, 22908, 22917, 22907, 22910, 22903,
+    22911, 23382, 23573, 23589, 23676, {f: 2, c: 23674}, 23678, 24031,
+    [24181, 57646], 24196, 24322, 24346, 24436, 24533, 24532, 24527, 25180,
+    25182, 25188, 25185, 25190, 25186, 25177, 25184, 25178, 25189, 25911,
+    26095, 26094, 26430, 26425, 26424, 26427, 26426, 26431, 26428, 26419,
+    27672, 27718, 27730, 27740, 27727, [27722, 60796], 27732, {f: 2, c: 27723},
+    28785, 29278, {f: 2, c: 29364}, 29582, 29994, 30335, 31349, [12153, 32593],
+    [12171, 33400], 33404, 33408, 33405, 33407, [12172, 34381], [12177, 35198],
+    37017, [37015, 59347], 37016, 37019, 37012, 38434, 38436, 38432, 38435,
+    20310, 20283, 20322, 20297, 20307, 20324, 20286, 20327, 20306, 20319,
+    20289, 20312, 20269, 20275, 20287, 20321, 20879, 20921, 21020, 21022,
+    21025, {f: 2, c: 21165}, 21257, 21347, 21362, {f: 2, c: 21390}, 21552,
+    21559, 21546, 21588, 21573, 21529, 21532, 21541, 21528, 21565, 21583,
+    21569, 21544, 21540, 21575, 22254, 22247, 22245, 22337, 22341, 22348,
+    22345, 22347, 22354, 22790, 22848, 22950, 22936, 22944, 22935, 22926,
+    22946, 22928, 22927, 22951, 22945, 23438, 23442, 23592, 23594, 23693,
+    23695, 23688, 23691, 23689, 23698, 23690, 23686, 23699, 23701, 24032,
+    24074, 24078, 24203, 24201, 24204, 24200, 24205, 24325, 24349, 24440,
+    24438, 24530, 24529, 24528, 24557, 24552, 24558, 24563, 24545, 24548,
+    24547, 24570, 24559, 24567, 24571, 24576, 24564, 25146, 25219, 25228,
+    {f: 2, c: 25230}, 25236, 25223, 25201, 25211, 25210, 25200, 25217, 25224,
+    25207, 25213, 25202, 25204, 26096, 26100, 26099, 26098, 26101, 26437,
+    26439, 26457, 26453, 26444, 26440, 26461, 26445, 26458, 26443, 27600,
+    {f: 2, c: 27673}, 27768, 27751, 27755, 27780, 27787, 27791, 27761, 27759,
+    27753, 27802, 27757, 27783, 27797, [27804, 57900], 27750, 27763, 27749,
+    27771, 27790, 28788, 28794, 29283, 29375, 29373, 29379, 29382, 29377,
+    29370, 29381, 29589, 29591, {f: 2, c: 29587}, 29586, 30010, 30009,
+    {f: 2, c: 30100}, 30337, 31037, 32820, 32917, 32921, 32912, 32914, 32924,
+    33424, 33423, 33413, 33422, 33425, 33427, 33418, {f: 2, c: 33411},
+    [12184, 35960], 36809, 36799, 37023, 37025, 37029, 37022, 37031, 37024,
+    38448, 38440, 38447, 38445, 20019, 20376, 20348, 20357, 20349, 20352,
+    20359, 20342, 20340, 20361, 20356, 20343, 20300, 20375, 20330, 20378,
+    20345, 20353, 20344, 20368, 20380, 20372, 20382, 20370, 20354, 20373,
+    20331, 20334, 20894, 20924, 20926, 21045, {f: 2, c: 21042}, 21062, 21041,
+    21180, {f: 2, c: 21258}, 21308, 21394, 21396, 21639, 21631, 21633, 21649,
+    21634, 21640, 21611, 21626, 21630, 21605, 21612, 21620, 21606, 21645,
+    21615, 21601, 21600, 21656, 21603, 21607, 21604, 22263, 22265, 22383,
+    22386, 22381, 22379, 22385, 22384, 22390, 22400, 22389, 22395,
+    {f: 2, c: 22387}, 22370, 22376, 22397, 22796, 22853, 22965, 22970, 22991,
+    22990, 22962, 22988, 22977, 22966, 22972, 22979, 22998, 22961, 22973,
+    22976, 22984, 22964, 22983, 23394, 23397, 23443, 23445, 23620, 23623,
+    23726, 23716, 23712, 23733, 23727, 23720, 23724, 23711, 23715, 23725,
+    23714, 23722, 23719, 23709, 23717, 23734, 23728, 23718, 24087, 24084,
+    24089, 24360, {f: 3, c: 24354}, 24404, 24450, 24446, 24445, 24542, 24549,
+    24621, 24614, 24601, 24626, 24587, 24628, 24586, 24599, 24627, 24602,
+    24606, 24620, 24610, 24589, 24592, 24622, 24595, 24593, 24588, 24585,
+    24604, 25108, 25149, 25261, 25268, 25297, 25278, 25258, 25270, 25290,
+    25262, 25267, 25263, 25275, 25257, 25264, 25272, 25917, 26024, 26043,
+    26121, 26108, 26116, 26130, 26120, 26107, 26115, 26123, 26125, 26117,
+    26109, 26129, 26128, 26358, 26378, 26501, 26476, 26510, 26514, 26486,
+    26491, 26520, 26502, 26500, 26484, 26509, 26508, 26490, 26527, 26513,
+    26521, 26499, 26493, 26497, {f: 2, c: 26488}, 26516, 27429, 27520, 27518,
+    27614, 27677, 27795, 27884, 27883, 27886, 27865, 27830, 27860, 27821,
+    27879, 27831, 27856, 27842, 27834, 27843, 27846, 27885, 27890, 27858,
+    27869, 27828, 27786, 27805, 27776, 27870, 27840, 27952, 27853, 27847,
+    27824, 27897, 27855, 27881, 27857, 28820, 28824, 28805, 28819, 28806,
+    28804, 28817, 28822, 28802, 28826, 28803, 29290, 29398, 29387, 29400,
+    29385, 29404, 29394, 29396, 29402, 29388, 29393, 29604, 29601, 29613,
+    29606, 29602, 29600, 29612, 29597, 29917, 29928, {f: 2, c: 30015}, 30014,
+    30092, 30104, 30383, 30451, 30449, 30448, 30453, 30712, 30716, 30713,
+    30715, 30714, 30711, 31042, 31039, 31173, 31352, 31355, 31483, 31861,
+    31997, 32821, 32911, 32942, 32931, 32952, 32949, 32941, 33312, 33440,
+    33472, 33451, 33434, 33432, 33435, 33461, 33447, 33454, 33468, 33438,
+    33466, 33460, 33448, 33441, 33449, 33474, 33444, 33475, 33462, 33442,
+    34416, 34415, {f: 2, c: 34413}, 35926, 36818, 36811, 36819, 36813, 36822,
+    36821, 36823, 37042, 37044, 37039, 37043, 37040, 38457, 38461, 38460,
+    38458, 38467, 20429, 20421, 20435, 20402, 20425, 20427, 20417, 20436,
+    20444, 20441, [20411, 60346], 20403, 20443, 20423, 20438, 20410, 20416,
+    20409, 20460, 21060, 21065, 21184, 21186, 21309, 21372, 21399, 21398,
+    21401, 21400, 21690, 21665, 21677, 21669, 21711, 21699, 33549, 21687,
+    21678, 21718, 21686, {f: 2, c: 21701}, 21664, 21616, 21692, 21666, 21694,
+    21618, 21726, 21680, 22453, {f: 2, c: 22430}, 22436, 22412, 22423, 22429,
+    22427, 22420, 22424, 22415, 22425, 22437, 22426, 22421, 22772, 22797,
+    22867, 23009, 23006, 23022, 23040, 23025, 23005, 23034, 23037, 23036,
+    23030, 23012, 23026, 23031, 23003, 23017, 23027, 23029, 23008, 23038,
+    23028, 23021, 23464, 23628, 23760, 23768, 23756, 23767, 23755, 23771,
+    23774, 23770, 23753, 23751, 23754, 23766, {f: 2, c: 23763}, 23759, 23752,
+    23750, 23758, 23775, 23800, 24057, {f: 3, c: 24097}, 24096, 24100, 24240,
+    24228, 24226, 24219, 24227, 24229, 24327, 24366, 24406, 24454, 24631,
+    24633, 24660, 24690, 24670, 24645, 24659, 24647, 24649, 24667, 24652,
+    24640, 24642, 24671, 24612, 24644, 24664, 24678, 24686, {f: 2, c: 25154},
+    25295, 25357, 25355, 25333, 25358, 25347, 25323, 25337, 25359, 25356,
+    25336, 25334, 25344, {f: 2, c: 25363}, 25338, 25365, 25339, 25328, 25921,
+    25923, 26026, 26047, 26166, 26145, 26162, 26165, 26140, 26150, 26146,
+    26163, 26155, 26170, 26141, 26164, 26169, 26158, {f: 2, c: 26383}, 26561,
+    26610, 26568, 26554, 26588, 26555, 26616, 26584, 26560, 26551, 26565,
+    26603, 26596, 26591, 26549, 26573, 26547, 26615, 26614, 26606, 26595,
+    26562, 26553, 26574, 26599, 26608, 26546, 26620, 26566, 26605, 26572,
+    26542, 26598, 26587, 26618, {f: 2, c: 26569}, 26563, 26602, 26571, 27432,
+    27522, 27524, 27574, 27606, 27608, 27616, {f: 2, c: 27680}, 27944, 27956,
+    27949, 27935, 27964, 27967, 27922, 27914, 27866, 27955, 27908, 27929,
+    27962, 27930, 27921, 27904, 27933, 27970, 27905, 27928, 27959, 27907,
+    27919, 27968, 27911, 27936, 27948, 27912, 27938, 27913, 27920, 28855,
+    28831, 28862, 28849, 28848, 28833, {f: 2, c: 28852}, 28841, 29249,
+    {f: 2, c: 29257}, 29292, 29296, 29299, 29294, 29386, 29412, 29416, 29419,
+    29407, 29418, 29414, 29411, 29573, 29644, 29634, 29640, 29637, 29625,
+    29622, 29621, 29620, 29675, 29631, 29639, 29630, 29635, 29638, 29624,
+    29643, 29932, 29934, 29998, {f: 2, c: 30023}, 30119, 30122, 30329, 30404,
+    30472, {f: 3, c: 30467}, 30474, 30455, 30459, 30458, {f: 2, c: 30695},
+    30726, {f: 2, c: 30737}, 30725, 30736, 30735, 30734, [30729, 58095], 30723,
+    30739, 31050, 31052, 31051, 31045, 31044, 31189, 31181, 31183, 31190,
+    31182, 31360, 31358, 31441, {f: 2, c: 31488}, 31866, {f: 2, c: 31864},
+    {f: 3, c: 31871}, 32003, 32008, 32001, 32600, 32657, 32653, 32702, 32775,
+    {f: 2, c: 32782}, 32788, 32823, 32984, 32967, 32992, 32977, 32968, 32962,
+    32976, 32965, 32995, 32985, 32988, 32970, 32981, 32969, 32975, 32983,
+    32998, 32973, 33279, 33313, 33428, 33497, 33534, 33529, 33543, 33512,
+    33536, 33493, 33594, 33515, 33494, 33524, 33516, 33505, 33522, 33525,
+    33548, 33531, 33526, 33520, 33514, 33508, 33504, 33530, 33523, 33517,
+    34423, 34420, 34428, 34419, 34881, 34894, 34919, 34922, 34921, 35283,
+    35332, 35335, 36210, 36835, 36833, 36846, 36832, 37105, 37053, 37055,
+    37077, 37061, 37054, 37063, 37067, 37064, [37332, 60294], 37331, 38484,
+    38479, 38481, 38483, 38474, 38478, 20510, 20485, 20487, 20499, 20514,
+    20528, 20507, 20469, 20468, 20531, 20535, 20524, {f: 2, c: 20470}, 20503,
+    20508, 20512, 20519, 20533, 20527, 20529, 20494, 20826, 20884, 20883,
+    20938, {f: 2, c: 20932}, 20936, 20942, 21089, 21082, 21074,
+    {f: 2, c: 21086}, 21077, 21090, 21197, 21262, 21406, 21798, 21730, 21783,
+    21778, 21735, 21747, 21732, 21786, 21759, 21764, 21768, 21739, 21777,
+    21765, 21745, 21770, 21755, {f: 2, c: 21751}, 21728, 21774, 21763, 21771,
+    {f: 2, c: 22273}, 22476, 22578, 22485, 22482, 22458, 22470, 22461, 22460,
+    22456, 22454, 22463, 22471, 22480, 22457, 22465, 22798, 22858, 23065,
+    23062, {f: 2, c: 23085}, 23061, 23055, 23063, 23050, 23070, 23091, 23404,
+    23463, 23469, 23468, 23555, 23638, 23636, 23788, 23807, 23790, 23793,
+    23799, 23808, 23801, 24105, 24104, 24232, 24238, 24234, 24236, 24371,
+    24368, 24423, 24669, 24666, 24679, 24641, 24738, 24712, 24704, 24722,
+    24705, 24733, 24707, 24725, 24731, 24727, 24711, 24732, 24718, 25113,
+    25158, 25330, 25360, 25430, 25388, {f: 2, c: 25412}, 25398, 25411, 25572,
+    25401, 25419, 25418, 25404, 25385, 25409, 25396, 25432, 25428, 25433,
+    25389, 25415, 25395, 25434, 25425, 25400, 25431, 25408, 25416, 25930,
+    25926, 26054, {f: 2, c: 26051}, 26050, 26186, 26207, 26183, 26193,
+    {f: 2, c: 26386}, 26655, 26650, 26697, {f: 2, c: 26674}, 26683, 26699,
+    26703, 26646, 26673, 26652, 26677, 26667, 26669, 26671, 26702, 26692,
+    26676, 26653, 26642, 26644, 26662, 26664, 26670, 26701, 26682, 26661,
+    26656, 27436, 27439, 27437, 27441, 27444, 27501, 32898, 27528, 27622,
+    27620, 27624, 27619, 27618, 27623, 27685, 28026, {f: 2, c: 28003}, 28022,
+    27917, 28001, 28050, 27992, 28002, 28013, 28015, 28049, 28045, 28143,
+    28031, 28038, 27998, [28007, 59078], 28000, 28055, 28016, 28028, 27999,
+    28034, 28056, 27951, 28008, 28043, 28030, 28032, 28036, 27926, 28035,
+    28027, 28029, 28021, 28048, 28892, 28883, 28881, 28893, 28875, 32569,
+    28898, 28887, 28882, 28894, 28896, 28884, 28877, {f: 3, c: 28869}, 28890,
+    28878, 28897, 29250, 29304, 29303, 29302, 29440, 29434, 29428, 29438,
+    29430, 29427, 29435, 29441, 29651, 29657, 29669, 29654, 29628, 29671,
+    29667, 29673, 29660, 29650, 29659, 29652, 29661, 29658, {f: 2, c: 29655},
+    29672, {f: 2, c: 29918}, {f: 2, c: 29940}, 29985, 30043, 30047, 30128,
+    30145, 30139, 30148, 30144, 30143, 30134, 30138, 30346, 30409, 30493,
+    30491, 30480, 30483, 30482, 30499, 30481, 30485, {f: 2, c: 30489}, 30498,
+    30503, 30755, 30764, 30754, 30773, 30767, 30760, 30766, 30763, 30753,
+    30761, 30771, 30762, 30769, 31060, 31067, 31055, 31068, 31059, 31058,
+    31057, {f: 2, c: 31211}, 31200, 31214, 31213, 31210, 31196, 31198, 31197,
+    31366, 31369, 31365, {f: 2, c: 31371}, 31370, 31367, 31448, 31504, 31492,
+    31507, 31493, 31503, 31496, 31498, 31502, 31497, 31506, 31876, 31889,
+    31882, 31884, 31880, 31885, 31877, 32030, 32029, 32017, 32014, 32024,
+    32022, 32019, 32031, 32018, 32015, 32012, 32604, 32609, 32606, 32608,
+    32605, 32603, 32662, 32658, 32707, 32706, 32704, 32790, 32830, 32825,
+    33018, 33010, 33017, 33013, 33025, 33019, 33024, 33281, 33327, 33317,
+    33587, 33581, 33604, 33561, 33617, 33573, 33622, 33599, 33601, 33574,
+    33564, 33570, 33602, 33614, 33563, 33578, 33544, 33596, 33613, 33558,
+    33572, 33568, 33591, 33583, 33577, 33607, 33605, 33612, 33619, 33566,
+    33580, 33611, 33575, 33608, 34387, 34386, 34466, 34472, 34454, 34445,
+    34449, 34462, 34439, 34455, 34438, 34443, 34458, 34437, 34469, 34457,
+    34465, 34471, 34453, 34456, 34446, 34461, 34448, 34452, {f: 2, c: 34883},
+    34925, {f: 2, c: 34933}, 34930, 34944, 34929, 34943, 34927, 34947, 34942,
+    34932, 34940, 35346, 35911, 35927, 35963, 36004, 36003, 36214, 36216,
+    36277, 36279, 36278, 36561, 36563, 36862, 36853, 36866, 36863, 36859,
+    36868, 36860, 36854, 37078, 37088, {f: 2, c: 37081}, 37091, 37087, 37093,
+    37080, 37083, 37079, 37084, 37092, 37200, {f: 2, c: 37198}, 37333, 37346,
+    37338, 38492, 38495, 38588, 39139, [12221, 39647], [12223, 39727], 20095,
+    20592, 20586, 20577, 20574, 20576, 20563, 20555, 20573, 20594, 20552,
+    20557, 20545, 20571, 20554, 20578, 20501, 20549, 20575, 20585, 20587,
+    {f: 2, c: 20579}, 20550, 20544, 20590, 20595, 20567, 20561, 20944, 21099,
+    21101, 21100, 21102, 21206, 21203, 21293, 21404, {f: 2, c: 21877}, 21820,
+    21837, 21840, 21812, 21802, 21841, 21858, 21814, 21813, 21808, 21842,
+    21829, 21772, 21810, 21861, 21838, 21817, 21832, 21805, 21819, 21824,
+    21835, 22282, 22279, 22523, 22548, 22498, 22518, 22492, 22516, 22528,
+    22509, 22525, 22536, 22520, 22539, 22515, 22479, 22535, 22510, 22499,
+    22514, 22501, 22508, 22497, 22542, 22524, 22544, 22503, 22529, 22540,
+    22513, 22505, 22512, 22541, 22532, 22876, 23136, 23128, 23125,
+    [23143, 60437], 23134, 23096, 23093, 23149, 23120, 23135, 23141, 23148,
+    23123, 23140, 23127, 23107, 23133, 23122, 23108, 23131, 23112, 23182,
+    23102, 23117, 23097, 23116, 23152, 23145, 23111, 23121, 23126, 23106,
+    23132, 23410, 23406, 23489, 23488, 23641, 23838, 23819, 23837, 23834,
+    23840, 23820, 23848, 23821, 23846, 23845, 23823, 23856, 23826, 23843,
+    23839, 23854, 24126, 24116, 24241, 24244, 24249, {f: 2, c: 24242}, 24374,
+    24376, 24475, 24470, 24479, 24714, 24720, 24710, 24766, 24752, 24762,
+    {f: 2, c: 24787}, 24783, 24804, 24793, 24797, 24776, 24753, 24795, 24759,
+    24778, 24767, 24771, 24781, 24768, 25394, 25445, 25482, 25474, 25469,
+    25533, 25502, 25517, 25501, 25495, 25515, 25486, 25455, 25479, 25488,
+    25454, 25519, 25461, 25500, 25453, 25518, 25468, 25508, 25403, 25503,
+    25464, 25477, 25473, 25489, 25485, 25456, 25939, 26061, 26213, 26209,
+    26203, 26201, 26204, 26210, 26392, 26745, 26759, 26768, 26780,
+    {f: 2, c: 26733}, 26798, 26795, 26966, 26735, 26787, 26796, 26793, 26741,
+    26740, 26802, 26767, 26743, 26770, 26748, 26731, 26738, 26794, 26752,
+    26737, 26750, 26779, 26774, 26763, 26784, 26761, 26788, 26744, 26747,
+    26769, 26764, 26762, 26749, 27446, 27443, {f: 2, c: 27447}, 27537, 27535,
+    {f: 2, c: 27533}, 27532, 27690, 28096, 28075, 28084, 28083, 28276, 28076,
+    28137, 28130, 28087, 28150, 28116, 28160, 28104, 28128, 28127, 28118,
+    28094, 28133, {f: 2, c: 28124}, 28123, 28148, 28106, 28093, 28141, 28144,
+    28090, 28117, 28098, 28111, 28105, 28112, 28146, 28115, 28157, 28119,
+    28109, 28131, 28091, 28922, 28941, 28919, 28951, 28916, 28940, 28912,
+    28932, 28915, 28944, 28924, 28927, 28934, 28947, 28928, 28920, 28918,
+    28939, 28930, 28942, 29310, {f: 2, c: 29307}, 29311, 29469, 29463, 29447,
+    29457, 29464, 29450, 29448, 29439, 29455, 29470, 29576, 29686, 29688,
+    29685, 29700, 29697, 29693, 29703, 29696, 29690, 29692, 29695, 29708,
+    29707, 29684, 29704, 30052, 30051, 30158, 30162, 30159, {f: 2, c: 30155},
+    30161, 30160, 30351, 30345, 30419, 30521, 30511, 30509, {f: 2, c: 30513},
+    30516, 30515, 30525, 30501, 30523, 30517, 30792, 30802, 30793, 30797,
+    30794, 30796, 30758, 30789, 30800, 31076, 31079, {f: 2, c: 31081}, 31075,
+    31083, 31073, 31163, 31226, 31224, {f: 2, c: 31222}, 31375, 31380, 31376,
+    31541, 31547, 31540, 31525, 31536, 31522, 31524, 31539, 31512, 31530,
+    31517, 31537, 31531, 31533, 31535, 31538, 31544, 31514, 31523, 31892,
+    31896, 31894, 31907, 32053, 32061, 32056, 32054, 32058, 32069, 32044,
+    32041, 32065, 32071, {f: 2, c: 32062}, 32074, 32059, 32040, 32611, 32661,
+    {f: 2, c: 32668}, 32667, {f: 2, c: 32714}, 32717, {f: 2, c: 32720}, 32711,
+    32719, 32713, 32799, 32798, 32795, 32839, 32835, 32840, 33048, 33061,
+    33049, 33051, 33069, 33055, 33068, 33054, 33057, 33045, 33063, 33053,
+    33058, 33297, 33336, 33331, 33338, 33332, 33330, 33396, 33680, 33699,
+    33704, 33677, 33658, 33651, 33700, 33652, 33679, 33665, 33685, 33689,
+    33653, 33684, 33705, 33661, 33667, 33676, 33693, 33691, 33706, 33675,
+    33662, 33701, 33711, 33672, 33687, 33712, 33663, 33702, 33671, 33710,
+    33654, 34393, 34390, 34495, 34487, 34498, 34497, 34501, 34490, 34480,
+    34504, 34489, 34483, 34488, 34508, 34484, {f: 2, c: 34491}, 34499,
+    {f: 2, c: 34493}, 34898, 34953, 34965, 34984, 34978, 34986, 34970, 34961,
+    34977, 34975, 34968, 34983, 34969, 34971, 34967, 34980, 34988, 34956,
+    34963, 34958, 35202, 35286, 35289, 35285, 35376, 35367, 35372, 35358,
+    35897, 35899, {f: 2, c: 35932}, 35965, 36005, 36221, 36219, 36217, 36284,
+    36290, 36281, 36287, 36289, 36568, 36574, 36573, 36572, 36567,
+    {f: 2, c: 36576}, 36900, 36875, 36881, 36892, 36876, 36897, 37103, 37098,
+    37104, 37108, {f: 2, c: 37106}, 37076, {f: 2, c: 37099}, 37097, 37206,
+    37208, 37210, 37203, 37205, 37356, 37364, 37361, 37363, 37368, 37348,
+    37369, {f: 2, c: 37354}, 37367, 37352, 37358, 38266, 38278, 38280, 38524,
+    38509, 38507, 38513, 38511, 38591, 38762, 38916, 39141, 39319, 20635,
+    20629, 20628, 20638, 20619, 20643, 20611, 20620, 20622, 20637, 20584,
+    20636, 20626, 20610, 20615, 20831, 20948, 21266, 21265, 21412, 21415,
+    21905, 21928, 21925, 21933, 21879, 22085, 21922, 21907, 21896, 21903,
+    21941, 21889, 21923, 21906, 21924, 21885, 21900, 21926, 21887, 21909,
+    21921, 21902, 22284, 22569, 22583, 22553, 22558, 22567, 22563, 22568,
+    22517, 22600, 22565, 22556, 22555, 22579, 22591, 22582, 22574, 22585,
+    22584, 22573, 22572, 22587, 22881, 23215, 23188, 23199, 23162, 23202,
+    23198, 23160, 23206, 23164, 23205, 23212, 23189, 23214, 23095, 23172,
+    23178, 23191, 23171, 23179, 23209, 23163, 23165, 23180, 23196, 23183,
+    23187, 23197, 23530, 23501, 23499, 23508, 23505, 23498, 23502, 23564,
+    23600, 23863, 23875, 23915, 23873, 23883, 23871, 23861, 23889, 23886,
+    23893, 23859, 23866, 23890, 23869, 23857, 23897, 23874, 23865, 23881,
+    23864, 23868, 23858, 23862, 23872, 23877, 24132, 24129, [24408, 57673],
+    24486, 24485, 24491, 24777, 24761, 24780, 24802, 24782, 24772, 24852,
+    24818, 24842, 24854, 24837, 24821, 24851, 24824, 24828, 24830, 24769,
+    24835, 24856, 24861, 24848, 24831, 24836, 24843, 25162, 25492, 25521,
+    25520, 25550, 25573, 25576, 25583, 25539, 25757, 25587, 25546, 25568,
+    25590, 25557, 25586, 25589, 25697, 25567, 25534, 25565, 25564, 25540,
+    25560, 25555, 25538, 25543, 25548, 25547, 25544, 25584, 25559, 25561,
+    25906, 25959, 25962, 25956, 25948, 25960, 25957, 25996, {f: 2, c: 26013},
+    26030, 26064, 26066, 26236, 26220, 26235, 26240, 26225, 26233, 26218,
+    26226, 26369, 26892, 26835, 26884, 26844, 26922, 26860, 26858, 26865,
+    26895, 26838, 26871, 26859, 26852, 26870, 26899, 26896, 26867, 26849,
+    26887, 26828, 26888, 26992, 26804, 26897, 26863, 26822, 26900, 26872,
+    26832, 26877, 26876, 26856, 26891, 26890, 26903, 26830, 26824,
+    {f: 2, c: 26845}, 26854, 26868, 26833, 26886, 26836, 26857, 26901, 26917,
+    26823, 27449, 27451, 27455, 27452, 27540, 27543, 27545, 27541, 27581,
+    27632, {f: 2, c: 27634}, 27696, 28156, {f: 2, c: 28230}, 28191, 28233,
+    28296, {f: 2, c: 28220}, 28229, 28258, 28203, 28223, 28225, 28253, 28275,
+    28188, 28211, 28235, 28224, 28241, 28219, 28163, 28206, 28254, 28264,
+    28252, 28257, 28209, 28200, 28256, 28273, 28267, 28217, 28194, 28208,
+    28243, 28261, 28199, 28280, 28260, 28279, 28245, 28281, 28242, 28262,
+    {f: 2, c: 28213}, 28250, 28960, 28958, 28975, 28923, 28974, 28977, 28963,
+    28965, 28962, 28978, 28959, 28968, 28986, 28955, 29259, 29274,
+    {f: 2, c: 29320}, 29318, 29317, 29323, 29458, 29451, 29488, 29474, 29489,
+    29491, 29479, 29490, 29485, 29478, 29475, 29493, 29452, 29742, 29740,
+    29744, 29739, 29718, 29722, 29729, 29741, 29745, 29732, 29731, 29725,
+    29737, 29728, 29746, 29947, 29999, 30063, 30060, 30183, 30170, 30177,
+    30182, 30173, 30175, 30180, 30167, 30357, 30354, 30426, {f: 2, c: 30534},
+    30532, 30541, 30533, 30538, 30542, {f: 2, c: 30539}, 30686, 30700, 30816,
+    {f: 2, c: 30820}, 30812, 30829, 30833, 30826, 30830, 30832, 30825, 30824,
+    30814, 30818, 31092, 31091, 31090, 31088, 31234, 31242, 31235, 31244,
+    31236, 31385, 31462, 31460, 31562, 31559, 31556, 31560, 31564, 31566,
+    31552, 31576, 31557, 31906, 31902, 31912, 31905, 32088, 32111, 32099,
+    32083, 32086, 32103, 32106, 32079, 32109, 32092, 32107, 32082, 32084,
+    32105, 32081, 32095, 32078, {f: 2, c: 32574}, {f: 2, c: 32613}, 32674,
+    {f: 2, c: 32672}, 32727, 32849, {f: 2, c: 32847}, 33022, 32980, 33091,
+    33098, 33106, 33103, 33095, 33085, 33101, 33082, 33254, 33262,
+    {f: 3, c: 33271}, 33284, {f: 2, c: 33340}, 33343, 33397, 33595,
+    [33743, 60382], 33785, 33827, 33728, 33768, 33810, 33767, 33764, 33788,
+    33782, 33808, 33734, 33736, 33771, 33763, 33727, 33793, 33757, 33765,
+    33752, 33791, 33761, 33739, 33742, 33750, 33781, 33737, 33801,
+    [33807, 58332], 33758, 33809, 33798, 33730, 33779, 33749, 33786, 33735,
+    33745, 33770, 33811, 33690, 33731, 33772, 33774, 33732, 33787, 33751,
+    33762, 33819, 33755, 33790, 34520, 34530, 34534, 34515, 34531, 34522,
+    34538, 34525, 34539, 34524, 34540, 34537, 34519, 34536, 34513, 34888,
+    34902, 34901, 35002, 35031, 35001, 35000, 35008, 35006, 34998, 35004,
+    34999, 35005, 34994, 35073, 35017, 35221, 35224, 35223, 35293,
+    {f: 2, c: 35290}, 35406, 35405, 35385, 35417, 35392, {f: 2, c: 35415},
+    {f: 2, c: 35396}, 35410, 35400, 35409, 35402, 35404, 35407, 35935, 35969,
+    35968, 36026, 36030, 36016, 36025, 36021, 36228, 36224, 36233, 36312,
+    36307, 36301, 36295, 36310, 36316, 36303, 36309, 36313, 36296, 36311,
+    36293, 36591, 36599, 36602, 36601, 36582, 36590, 36581, 36597,
+    {f: 2, c: 36583}, 36598, 36587, 36593, 36588, 36596, 36585, 36909, 36916,
+    36911, 37126, 37164, [37124, 60367], 37119, 37116, 37128, 37113, 37115,
+    37121, 37120, 37127, 37125, 37123, 37217, 37220, 37215, 37218, 37216,
+    37377, 37386, 37413, 37379, 37402, 37414, 37391, 37388, 37376, 37394,
+    37375, 37373, 37382, 37380, 37415, 37378, 37404, 37412, 37401, 37399,
+    37381, 37398, 38267, 38285, 38284, 38288, 38535, 38526, {f: 2, c: 38536},
+    38531, 38528, 38594, 38600, 38595, 38641, 38640, 38764, 38768, 38766,
+    38919, 39081, 39147, 40166, [12235, 40697], {f: 2, c: 20099}, 20150, 20669,
+    20671, 20678, 20654, 20676, 20682, 20660, 20680, 20674, 20656, 20673,
+    20666, 20657, 20683, 20681, 20662, 20664, 20951, 21114, 21112,
+    {f: 2, c: 21115}, 21955, 21979, 21964, 21968, 21963, 21962, 21981,
+    [21952, 64013], 21972, 21956, 21993, 21951, 21970, 21901, 21967, 21973,
+    21986, 21974, 21960, 22002, 21965, 21977, 21954, 22292, 22611, 22632,
+    22628, 22607, 22605, 22601, 22639, 22613, 22606, 22621, 22617, 22629,
+    22619, 22589, 22627, 22641, 22780, 23239, 23236, 23243, 23226, 23224,
+    23217, 23221, 23216, 23231, 23240, 23227, 23238, 23223, 23232, 23242,
+    23220, 23222, 23245, 23225, 23184, 23510, {f: 2, c: 23512}, 23583, 23603,
+    23921, 23907, 23882, 23909, 23922, 23916, 23902, 23912, 23911, 23906,
+    24048, 24143, 24142, 24138, 24141, 24139, 24261, 24268, 24262, 24267,
+    24263, 24384, 24495, 24493, 24823, {f: 2, c: 24905}, 24875, 24901, 24886,
+    24882, 24878, 24902, 24879, 24911, 24873, 24896, 25120, 37224, 25123,
+    25125, 25124, 25541, 25585, 25579, 25616, 25618, 25609, 25632, 25636,
+    25651, 25667, 25631, 25621, 25624, 25657, 25655, {f: 2, c: 25634}, 25612,
+    25638, 25648, 25640, 25665, 25653, 25647, 25610, 25626, 25664, 25637,
+    25639, 25611, 25575, 25627, 25646, 25633, 25614, 25967, 26002, 26067,
+    26246, 26252, 26261, 26256, 26251, 26250, 26265, 26260, 26232, 26400,
+    26982, 26975, 26936, 26958, 26978, 26993, 26943, 26949, 26986, 26937,
+    26946, 26967, 26969, 27002, {f: 2, c: 26952}, 26933, 26988, 26931, 26941,
+    26981, 26864, 27000, 26932, 26985, 26944, 26991, 26948, 26998, 26968,
+    26945, 26996, 26956, 26939, 26955, 26935, 26972, 26959, 26961, 26930,
+    26962, 26927, 27003, 26940, 27462, 27461, 27459, 27458, 27464, 27457,
+    27547, {f: 2, c: 27643}, 27641, {f: 2, c: 27639}, 28315, 28374, 28360,
+    28303, 28352, 28319, {f: 2, c: 28307}, 28320, 28337, 28345, 28358, 28370,
+    28349, 28353, 28318, 28361, 28343, 28336, 28365, 28326, 28367, 28338,
+    28350, 28355, 28380, 28376, 28313, 28306, 28302, 28301, 28324, 28321,
+    28351, 28339, 28368, 28362, 28311, 28334, 28323, 28999, 29012, 29010,
+    29027, 29024, 28993, 29021, [29026, 61080], 29042, 29048, 29034, 29025,
+    28994, 29016, 28995, 29003, 29040, 29023, 29008, 29011, 28996, 29005,
+    29018, 29263, 29325, 29324, 29329, 29328, 29326, 29500, 29506, 29499,
+    29498, 29504, 29514, 29513, 29764, {f: 2, c: 29770}, 29778, 29777, 29783,
+    29760, {f: 2, c: 29775}, 29774, 29762, 29766, 29773, 29780, 29921, 29951,
+    29950, 29949, 29981, 30073, 30071, 27011, 30191, 30223, 30211, 30199,
+    30206, 30204, [30201, 60782], 30200, 30224, 30203, 30198, 30189, 30197,
+    30205, 30361, 30389, 30429, 30549, {f: 2, c: 30559}, 30546, 30550, 30554,
+    30569, 30567, 30548, 30553, 30573, 30688, 30855, 30874, 30868, 30863,
+    30852, 30869, {f: 2, c: 30853}, 30881, 30851, 30841, 30873, 30848, 30870,
+    30843, 31100, 31106, 31101, 31097, 31249, {f: 2, c: 31256}, 31250, 31255,
+    31253, 31266, 31251, 31259, 31248, 31395, 31394, 31390, 31467, 31590,
+    31588, 31597, 31604, 31593, 31602, 31589, 31603, 31601, 31600, 31585,
+    31608, 31606, 31587, 31922, 31924, 31919, 32136, 32134, 32128, 32141,
+    32127, 32133, 32122, 32142, 32123, 32131, 32124, 32140, 32148, 32132,
+    32125, 32146, 32621, 32619, {f: 2, c: 32615}, 32620, 32678, 32677, 32679,
+    {f: 2, c: 32731}, 32801, 33124, 33120, 33143, 33116, 33129, 33115, 33122,
+    33138, 26401, 33118, 33142, 33127, 33135, 33092, 33121, 33309, 33353,
+    33348, 33344, 33346, 33349, 34033, 33855, 33878, 33910, 33913, 33935,
+    33933, 33893, 33873, 33856, 33926, 33895, 33840, 33869, 33917, 33882,
+    33881, 33908, 33907, 33885, 34055, 33886, 33847, 33850, 33844, 33914,
+    33859, 33912, 33842, 33861, 33833, 33753, 33867, 33839, 33858, 33837,
+    33887, 33904, 33849, 33870, 33868, 33874, 33903, 33989, 33934, 33851,
+    33863, 33846, 33843, 33896, 33918, 33860, 33835, 33888, 33876, 33902,
+    33872, 34571, 34564, 34551, 34572, 34554, 34518, 34549, 34637, 34552,
+    34574, 34569, 34561, 34550, 34573, 34565, 35030, 35019, {f: 2, c: 35021},
+    35038, 35035, 35034, 35020, 35024, 35205, 35227, 35295, 35301, 35300,
+    35297, 35296, 35298, 35292, 35302, 35446, 35462, 35455, 35425, 35391,
+    35447, 35458, 35460, 35445, 35459, 35457, 35444, 35450, 35900, 35915,
+    35914, 35941, 35940, 35942, 35974, {f: 2, c: 35972}, 36044,
+    {f: 2, c: 36200}, 36241, 36236, {f: 2, c: 36238}, 36237, {f: 2, c: 36243},
+    36240, 36242, 36336, 36320, 36332, 36337, 36334, 36304, 36329, 36323,
+    36322, 36327, 36338, 36331, 36340, 36614, 36607, 36609, 36608, 36613,
+    {f: 2, c: 36615}, 36610, [36619, 60507], 36946, 36927, 36932, 36937, 36925,
+    37136, 37133, 37135, 37137, 37142, 37140, 37131, 37134, {f: 2, c: 37230},
+    37448, 37458, 37424, 37434, 37478, 37427, 37477, 37470, 37507, 37422,
+    37450, 37446, 37485, 37484, 37455, 37472, 37479, 37487, 37430, 37473,
+    37488, 37425, 37460, 37475, 37456, 37490, 37454, 37459, 37452, 37462,
+    37426, 38303, 38300, 38302, 38299, {f: 2, c: 38546}, 38545, 38551, 38606,
+    38650, 38653, 38648, 38645, 38771, {f: 2, c: 38775}, 38770, 38927,
+    {f: 2, c: 38925}, 39084, 39158, 39161, 39343, 39346, 39344, 39349, 39597,
+    39595, 39771, 40170, 40173, 40167, 40576, [12236, 40701], 20710, 20692,
+    20695, 20712, 20723, 20699, 20714, 20701, 20708, 20691, 20716, 20720,
+    20719, 20707, 20704, 20952, {f: 2, c: 21120}, 21225, 21227, 21296, 21420,
+    22055, 22037, 22028, 22034, 22012, 22031, 22044, 22017, 22035, 22018,
+    22010, 22045, 22020, 22015, 22009, 22665, 22652, 22672, 22680, 22662,
+    22657, 22655, 22644, 22667, 22650, 22663, 22673, 22670, 22646, 22658,
+    22664, 22651, 22676, 22671, 22782, 22891, 23260, 23278, 23269, 23253,
+    23274, 23258, 23277, 23275, 23283, 23266, 23264, 23259, 23276, 23262,
+    23261, 23257, 23272, 23263, 23415, 23520, 23523, 23651, 23938, 23936,
+    23933, 23942, 23930, 23937, 23927, 23946, 23945, 23944, 23934, 23932,
+    23949, 23929, 23935, {f: 2, c: 24152}, 24147, 24280, 24273, 24279, 24270,
+    24284, 24277, 24281, 24274, 24276, 24388, 24387, 24431, 24502, 24876,
+    24872, 24897, 24926, 24945, 24947, {f: 2, c: 24914}, 24946, 24940, 24960,
+    24948, 24916, 24954, 24923, 24933, 24891, 24938, 24929, 24918, 25129,
+    25127, 25131, 25643, 25677, 25691, 25693, 25716, 25718, {f: 2, c: 25714},
+    25725, 25717, 25702, 25766, 25678, 25730, 25694, 25692, 25675, 25683,
+    25696, 25680, 25727, 25663, 25708, 25707, 25689, 25701, 25719, 25971,
+    26016, 26273, 26272, 26271, 26373, 26372, 26402, 27057, 27062, 27081,
+    27040, 27086, 27030, 27056, 27052, 27068, 27025, 27033, 27022, 27047,
+    27021, 27049, 27070, 27055, 27071, 27076, 27069, 27044, 27092, 27065,
+    27082, 27034, 27087, 27059, 27027, 27050, 27041, 27038, 27097, 27031,
+    27024, 27074, 27061, 27045, 27078, 27466, 27469, 27467, {f: 3, c: 27550},
+    {f: 2, c: 27587}, 27646, 28366, 28405, 28401, 28419, 28453, 28408, 28471,
+    28411, 28462, 28425, 28494, {f: 2, c: 28441}, 28455, 28440, 28475, 28434,
+    28397, 28426, 28470, 28531, 28409, 28398, 28461, 28480, 28464, 28476,
+    28469, 28395, 28423, 28430, 28483, 28421, 28413, 28406, 28473, 28444,
+    28412, 28474, 28447, 28429, 28446, 28424, 28449, 29063, 29072, 29065,
+    29056, 29061, 29058, 29071, 29051, 29062, 29057, 29079, 29252, 29267,
+    29335, 29333, 29331, 29507, 29517, 29521, 29516, 29794, 29811, 29809,
+    29813, 29810, 29799, 29806, 29952, {f: 2, c: 29954}, 30077, 30096, 30230,
+    30216, 30220, 30229, 30225, 30218, 30228, 30392, 30593, 30588, 30597,
+    30594, 30574, 30592, 30575, 30590, 30595, 30898, 30890, 30900, 30893,
+    30888, 30846, 30891, 30878, 30885, 30880, 30892, 30882, 30884, 31128,
+    {f: 2, c: 31114}, 31126, 31125, 31124, 31123, 31127, 31112, 31122, 31120,
+    31275, 31306, 31280, 31279, 31272, 31270, 31400, {f: 2, c: 31403}, 31470,
+    31624, 31644, 31626, 31633, 31632, 31638, 31629, 31628, 31643, 31630,
+    31621, 31640, 21124, 31641, 31652, 31618, 31931, 31935, 31932, 31930,
+    32167, 32183, 32194, 32163, 32170, 32193, 32192, 32197, 32157, 32206,
+    32196, 32198, {f: 2, c: 32203}, 32175, 32185, 32150, 32188, 32159, 32166,
+    32174, 32169, 32161, 32201, 32627, {f: 2, c: 32738}, 32741, 32734, 32804,
+    32861, 32860, 33161, 33158, 33155, 33159, 33165, 33164, 33163, 33301,
+    33943, 33956, 33953, 33951, 33978, 33998, 33986, 33964, 33966, 33963,
+    33977, 33972, 33985, 33997, 33962, 33946, 33969, 34000, 33949, 33959,
+    33979, 33954, 33940, 33991, 33996, 33947, 33961, 33967, [33960, 58327],
+    34006, 33944, 33974, 33999, 33952, 34007, 34004, 34002, 34011, 33968,
+    33937, 34401, 34611, 34595, 34600, 34667, 34624, 34606, 34590, 34593,
+    34585, 34587, 34627, 34604, 34625, 34622, 34630, 34592, 34610, 34602,
+    34605, 34620, 34578, 34618, 34609, 34613, 34626, {f: 2, c: 34598}, 34616,
+    34596, 34586, 34608, 34577, 35063, 35047, {f: 2, c: 35057}, 35066, 35070,
+    35054, 35068, 35062, 35067, 35056, 35052, 35051, 35229, 35233, 35231,
+    35230, 35305, 35307, 35304, 35499, 35481, 35467, 35474, 35471, 35478,
+    35901, {f: 2, c: 35944}, 36053, 36047, 36055, 36246, 36361, 36354, 36351,
+    36365, 36349, 36362, 36355, 36359, 36358, 36357, 36350, 36352, 36356,
+    {f: 2, c: 36624}, 36622, 36621, 37155, 37148, 37152, 37154, 37151, 37149,
+    37146, 37156, 37153, 37147, 37242, 37234, 37241, 37235, 37541, 37540,
+    37494, 37531, 37498, 37536, 37524, 37546, 37517, 37542, 37530, 37547,
+    37497, 37527, 37503, 37539, 37614, 37518, 37506, 37525, 37538, 37501,
+    37512, 37537, 37514, 37510, 37516, 37529, 37543, 37502, 37511, 37545,
+    37533, 37515, 37421, 38558, 38561, 38655, 38744, 38781, 38778, 38782,
+    38787, 38784, 38786, 38779, 38788, 38785, 38783, 38862, 38861, 38934,
+    {f: 2, c: 39085}, 39170, 39168, 39175, 39325, 39324, 39363, 39353, 39355,
+    39354, 39362, 39357, 39367, 39601, 39651, 39655, {f: 2, c: 39742},
+    {f: 2, c: 39776}, 39775, {f: 2, c: 40177}, 40181, 40615, 20735, 20739,
+    20784, 20728, {f: 2, c: 20742}, 20726, 20734, {f: 2, c: 20747}, 20733,
+    20746, {f: 2, c: 21131}, 21233, 21231, 22088, 22082, 22092, 22069, 22081,
+    22090, 22089, 22086, 22104, 22106, 22080, 22067, 22077, 22060, 22078,
+    22072, 22058, 22074, 22298, 22699, 22685, 22705, 22688, 22691, 22703,
+    22700, 22693, 22689, 22783, 23295, 23284, 23293, 23287, 23286, 23299,
+    23288, 23298, 23289, 23297, 23303, 23301, 23311, 23655, 23961, 23959,
+    23967, 23954, 23970, 23955, 23957, 23968, 23964, 23969, 23962, 23966,
+    24169, 24157, 24160, 24156, 32243, 24283, 24286, 24289, 24393, 24498,
+    24971, 24963, 24953, 25009, 25008, 24994, 24969, 24987, 24979, 25007,
+    25005, 24991, 24978, 25002, 24993, 24973, 24934, 25011, 25133, 25710,
+    25712, 25750, 25760, 25733, 25751, 25756, 25743, 25739, 25738, 25740,
+    25763, 25759, 25704, 25777, 25752, 25974, 25978, 25977, 25979,
+    {f: 2, c: 26034}, 26293, 26288, 26281, 26290, 26295, 26282, 26287, 27136,
+    27142, 27159, 27109, 27128, 27157, 27121, 27108, 27168, 27135, 27116,
+    27106, 27163, 27165, 27134, 27175, 27122, 27118, 27156, 27127, 27111,
+    27200, 27144, 27110, 27131, 27149, 27132, 27115, 27145, 27140, 27160,
+    27173, 27151, 27126, 27174, 27143, 27124, 27158, 27473, 27557, 27555,
+    27554, 27558, 27649, 27648, 27647, 27650, 28481, 28454, 28542, 28551,
+    28614, 28562, 28557, 28553, 28556, 28514, 28495, 28549, 28506, 28566,
+    28534, 28524, 28546, 28501, 28530, 28498, 28496, 28503, 28564, 28563,
+    28509, 28416, 28513, 28523, 28541, 28519, 28560, 28499, 28555, 28521,
+    28543, 28565, 28515, 28535, 28522, 28539, 29106, 29103, 29083, 29104,
+    29088, 29082, 29097, 29109, 29085, 29093, 29086, 29092, 29089, 29098,
+    29084, 29095, 29107, 29336, 29338, 29528, 29522, {f: 3, c: 29534}, 29533,
+    29531, 29537, 29530, 29529, 29538, 29831, {f: 2, c: 29833}, 29830, 29825,
+    29821, 29829, 29832, 29820, [29817, 58868], 29960, 29959, 30078, 30245,
+    30238, 30233, 30237, 30236, 30243, 30234, 30248, 30235, {f: 3, c: 30364},
+    30363, 30605, 30607, 30601, 30600, 30925, 30907, 30927, 30924, 30929,
+    30926, 30932, 30920, {f: 2, c: 30915}, 30921, 31130, 31137, 31136, 31132,
+    31138, [31131, 59175], 27510, 31289, 31410, 31412, 31411, 31671, 31691,
+    31678, 31660, 31694, 31663, 31673, 31690, 31669, 31941, 31944, 31948,
+    31947, 32247, 32219, 32234, 32231, 32215, 32225, 32259, 32250, 32230,
+    32246, 32241, 32240, 32238, 32223, 32630, 32684, 32688, 32685, 32749,
+    32747, 32746, 32748, 32742, 32744, 32868, 32871, 33187, 33183, 33182,
+    33173, 33186, 33177, 33175, 33302, 33359, 33363, 33362, 33360, 33358,
+    33361, 34084, 34107, 34063, 34048, 34089, 34062, 34057, 34061, 34079,
+    34058, 34087, 34076, 34043, 34091, 34042, 34056, 34060, 34036, 34090,
+    34034, 34069, 34039, 34027, 34035, 34044, 34066, 34026, 34025, 34070,
+    34046, 34088, 34077, 34094, 34050, 34045, 34078, 34038, 34097, 34086,
+    {f: 2, c: 34023}, 34032, 34031, 34041, 34072, 34080, 34096, 34059, 34073,
+    34095, 34402, 34646, {f: 2, c: 34659}, 34679, 34785, 34675, 34648, 34644,
+    34651, 34642, 34657, 34650, 34641, 34654, 34669, 34666, 34640, 34638,
+    34655, 34653, 34671, 34668, 34682, 34670, 34652, 34661, 34639, 34683,
+    34677, 34658, 34663, 34665, 34906, 35077, 35084, 35092, 35083,
+    {f: 3, c: 35095}, 35078, 35094, 35089, 35086, 35081, 35234, 35236, 35235,
+    35309, 35312, 35308, 35535, 35526, 35512, 35539, 35537, {f: 2, c: 35540},
+    35515, 35543, 35518, 35520, 35525, 35544, 35523, 35514, 35517, 35545,
+    35902, 35917, 35983, 36069, 36063, 36057, 36072, 36058, 36061, 36071,
+    36256, 36252, 36257, 36251, 36384, 36387, 36389, 36388, 36398, 36373,
+    36379, 36374, 36369, 36377, {f: 2, c: 36390}, 36372, 36370, 36376, 36371,
+    36380, 36375, 36378, 36652, 36644, 36632, 36634, 36640, 36643,
+    {f: 2, c: 36630}, 36979, 36976, 36975, 36967, 36971, 37167, 37163,
+    {f: 2, c: 37161}, 37170, 37158, 37166, {f: 2, c: 37253}, 37258,
+    {f: 2, c: 37249}, 37252, 37248, 37584, {f: 2, c: 37571}, 37568, 37593,
+    37558, 37583, 37617, 37599, 37592, 37609, 37591, 37597, 37580, 37615,
+    37570, 37608, 37578, 37576, 37582, 37606, 37581, 37589, 37577, 37600,
+    37598, 37607, 37585, 37587, 37557, 37601, 37669, 37574, 37556, 38268,
+    38316, 38315, 38318, 38320, 38564, 38562, 38611, 38661, 38664, 38658,
+    38746, 38794, 38798, 38792, 38864, 38863, 38942, 38941, 38950, 38953,
+    38952, 38944, 38939, 38951, 39090, 39176, 39162, 39185, 39188,
+    {f: 2, c: 39190}, 39189, 39388, 39373, 39375, {f: 2, c: 39379}, 39374,
+    39369, [39382, 60270], 39384, 39371, 39383, 39372, 39603, 39660, 39659,
+    39667, 39666, 39665, 39750, 39747, 39783, 39796, 39793, 39782, 39798,
+    39797, 39792, 39784, 39780, 39788, 40188, 40186, 40189, 40191, 40183,
+    40199, 40192, 40185, 40187, 40200, 40197, 40196, 40579, 40659,
+    {f: 2, c: 40719}, 20764, 20755, 20759, 20762, 20753, 20958, 21300, 21473,
+    22128, 22112, 22126, 22131, 22118, 22115, 22125, 22130, 22110, 22135,
+    22300, 22299, 22728, 22717, 22729, 22719, 22714, 22722, 22716, 22726,
+    23319, 23321, 23323, 23329, 23316, 23315, 23312, 23318, [23336, 59539],
+    23322, 23328, 23326, 23535, 23980, 23985, 23977, 23975, 23989, 23984,
+    23982, 23978, 23976, 23986, 23981, 23983, 23988, {f: 2, c: 24167}, 24166,
+    24175, 24297, 24295, 24294, 24296, 24293, 24395, 24508, 24507, 24989,
+    25000, 24982, 25029, 25012, 25030, 25025, 25036, 25018, 25023, 25016,
+    24972, 25815, 25814, 25808, 25807, 25801, 25789, 25737, 25795, 25819,
+    25843, 25817, 25907, 25983, 25980, 26018, 26312, 26302, 26304,
+    {f: 2, c: 26314}, 26319, 26301, 26299, 26298, 26316, 26403, 27188, 27238,
+    27209, 27239, 27186, 27240, 27198, 27229, 27245, 27254, 27227, 27217,
+    27176, 27226, 27195, 27199, 27201, 27242, 27236, 27216, 27215, 27220,
+    27247, 27241, 27232, 27196, 27230, 27222, 27221, {f: 2, c: 27213}, 27206,
+    27477, 27476, 27478, 27559, {f: 2, c: 27562}, 27592, 27591, 27652, 27651,
+    27654, 28589, 28619, 28579, 28615, 28604, 28622, 28616, 28510, 28612,
+    28605, 28574, 28618, 28584, 28676, 28581, 28590, 28602, 28588, 28586,
+    28623, 28607, 28600, 28578, 28617, 28587, 28621, 28591, 28594, 28592,
+    29125, 29122, 29119, 29112, 29142, {f: 2, c: 29120}, 29131, 29140, 29130,
+    29127, 29135, 29117, 29144, 29116, 29126, {f: 2, c: 29146},
+    {f: 2, c: 29341}, 29545, {f: 2, c: 29542}, 29548, 29541, 29547, 29546,
+    29823, 29850, 29856, 29844, 29842, 29845, 29857, 29963, 30080, 30255,
+    30253, 30257, 30269, 30259, 30268, 30261, 30258, 30256, 30395, 30438,
+    30618, 30621, 30625, 30620, 30619, {f: 2, c: 30626}, 30613, 30617, 30615,
+    30941, 30953, 30949, 30954, 30942, 30947, 30939, {f: 2, c: 30945}, 30957,
+    {f: 2, c: 30943}, 31140, 31300, 31304, 31303, 31414, 31416, 31413, 31409,
+    31415, 31710, 31715, 31719, 31709, 31701, 31717, 31706, 31720, 31737,
+    31700, 31722, 31714, 31708, 31723, 31704, 31711, 31954, 31956, 31959,
+    {f: 2, c: 31952}, 32274, 32289, 32279, 32268, {f: 2, c: 32287}, 32275,
+    32270, 32284, 32277, 32282, 32290, 32267, 32271, 32278, 32269, 32276,
+    32293, 32292, 32579, {f: 2, c: 32635}, 32634, 32689, 32751, 32810, 32809,
+    32876, 33201, 33190, 33198, 33209, 33205, 33195, 33200, 33196, 33204,
+    33202, 33207, 33191, 33266, {f: 3, c: 33365}, 34134, 34117, 34155, 34125,
+    34131, 34145, 34136, 34112, 34118, 34148, 34113, 34146, 34116, 34129,
+    34119, 34147, 34110, 34139, 34161, 34126, 34158, 34165, 34133, 34151,
+    34144, 34188, 34150, 34141, 34132, 34149, 34156, 34403, 34405, 34404,
+    34724, 34715, 34703, 34711, 34707, 34706, 34696, 34689, 34710, 34712,
+    34681, 34695, 34723, 34693, {f: 2, c: 34704}, 34717, 34692, 34708, 34716,
+    34714, 34697, 35102, 35110, 35120, {f: 2, c: 35117}, 35111, 35121, 35106,
+    35113, 35107, 35119, 35116, 35103, 35313, 35552, 35554, 35570,
+    {f: 2, c: 35572}, 35549, 35604, 35556, 35551, 35568, 35528, 35550, 35553,
+    35560, 35583, 35567, 35579, {f: 2, c: 35985}, 35984, 36085, 36078, 36081,
+    36080, 36083, 36204, 36206, 36261, 36263, 36403, 36414, 36408, 36416,
+    36421, 36406, {f: 2, c: 36412}, 36417, 36400, 36415, 36541, [36662, 60329],
+    36654, 36661, 36658, 36665, 36663, 36660, 36982, 36985, 36987, 36998,
+    37114, 37171, {f: 2, c: 37173}, 37267, {f: 2, c: 37264}, 37261, 37263,
+    37671, 37662, 37640, 37663, 37638, 37647, 37754, 37688, 37692, 37659,
+    37667, 37650, 37633, 37702, 37677, 37646, 37645, 37579, 37661, 37626,
+    37651, 37625, 37623, 37684, 37634, 37668, 37631, 37673, 37689, 37685,
+    37674, 37652, 37644, 37643, 37630, 37641, 37632, 37627, 37654, 38332,
+    38349, 38334, {f: 2, c: 38329}, 38326, 38335, 38325, 38333, 38569, 38612,
+    38667, 38674, 38672, 38809, 38807, 38804, 38896, 38904, 38965, 38959,
+    38962, 39204, 39199, 39207, 39209, 39326, 39406, 39404, 39397, 39396,
+    39408, 39395, 39402, 39401, 39399, 39609, 39615, 39604, 39611, 39670,
+    39674, 39673, 39671, 39731, 39808, 39813, 39815, 39804, 39806, 39803,
+    39810, 39827, 39826, 39824, 39802, 39829, 39805, 39816, 40229, 40215,
+    40224, 40222, 40212, 40233, 40221, 40216, 40226, 40208, 40217, 40223,
+    40584, {f: 2, c: 40582}, 40622, 40621, {f: 2, c: 40661}, 40698, 40722,
+    40765, 20774, 20773, 20770, 20772, 20768, 20777, 21236, 22163,
+    {f: 2, c: 22156}, 22150, 22148, 22147, 22142, 22146, 22143, 22145, 22742,
+    22740, 22735, 22738, 23341, 23333, 23346, 23331, 23340, 23335, 23334,
+    23343, 23342, 23419, {f: 2, c: 23537}, 23991, 24172, 24170, 24510, 25027,
+    25013, 25020, 25063, 25056, 25061, 25060, 25064, 25054, 25839, 25833,
+    25827, 25835, 25828, 25832, 25985, 25984, 26038, 26074, 26322, 27277,
+    27286, 27265, 27301, 27273, 27295, 27291, 27297, 27294, 27271, 27283,
+    27278, 27285, 27267, 27304, 27300, 27281, 27263, 27302, 27290, 27269,
+    27276, 27282, 27483, 27565, 27657, 28620, 28585, 28660, 28628, 28643,
+    28636, 28653, 28647, 28646, 28638, 28658, 28637, 28642, 28648, 29153,
+    29169, 29160, 29170, 29156, 29168, 29154, 29555, {f: 2, c: 29550}, 29847,
+    29874, 29867, 29840, 29866, 29869, 29873, 29861, 29871, {f: 3, c: 29968},
+    29967, 30084, 30275, {f: 2, c: 30280}, 30279, 30372, 30441, 30645, 30635,
+    30642, 30647, 30646, 30644, 30641, 30632, 30704, 30963, 30973, 30978,
+    {f: 2, c: 30971}, 30975, 30962, 30981, 30969, 30974, 30980, 31147, 31144,
+    31324, 31323, 31318, 31320, 31316, 31322, 31422, {f: 2, c: 31424}, 31749,
+    31759, 31730, 31744, 31743, 31739, 31758, 31732, 31755, 31731, 31746,
+    31753, 31747, 31745, 31736, 31741, [31750, 58176], {f: 2, c: 31728}, 31760,
+    31754, 31976, 32301, 32316, 32322, 32307, 38984, 32312, 32298, 32329,
+    32320, 32327, 32297, 32332, 32304, 32315, 32310, 32324, 32314, 32581,
+    32639, 32638, 32637, 32756, 32754, 32812, 33211, 33220, 33228, 33226,
+    33221, 33223, 33212, 33257, 33371, 33370, 33372, 34179, 34176, 34191,
+    34215, 34197, 34208, 34187, 34211, 34171, 34212, 34202, 34206, 34167,
+    34172, 34185, 34209, 34170, 34168, 34135, 34190, 34198, 34182, 34189,
+    34201, 34205, 34177, 34210, 34178, 34184, 34181, 34169, 34166, 34200,
+    34192, 34207, 34408, 34750, 34730, 34733, 34757, 34736, 34732, 34745,
+    34741, 34748, 34734, 34761, 34755, 34754, 34764, 34743, 34735, 34756,
+    34762, 34740, 34742, 34751, 34744, 34749, 34782, 34738, 35125, 35123,
+    35132, 35134, 35137, 35154, 35127, 35138, 35245, 35247, 35246,
+    {f: 2, c: 35314}, 35614, 35608, 35606, 35601, 35589, 35595, 35618, 35599,
+    35602, 35605, 35591, 35597, 35592, 35590, 35612, 35603, 35610, 35919,
+    35952, 35954, 35953, 35951, 35989, 35988, 36089, 36207, 36430, 36429,
+    36435, 36432, 36428, 36423, 36675, 36672, 36997, 36990, 37176, 37274,
+    37282, 37275, 37273, 37279, 37281, 37277, 37280, 37793, 37763, 37807,
+    37732, 37718, 37703, 37756, 37720, 37724, 37750, 37705, {f: 2, c: 37712},
+    37728, 37741, 37775, 37708, 37738, 37753, 37719, 37717, 37714, 37711,
+    37745, 37751, 37755, 37729, 37726, 37731, 37735, 37710, 37721, 38343,
+    38336, 38345, 38339, 38341, 38327, 38574, 38576, 38572, 38688, 38687,
+    38680, 38685, 38681, 38810, 38817, 38812, 38814, 38813, 38869, 38868,
+    38897, 38977, 38980, 38986, 38985, 38981, 38979, 39205, {f: 2, c: 39211},
+    39210, 39219, 39218, 39215, 39213, 39217, 39216, 39320, 39331, 39329,
+    39426, 39418, 39412, 39415, 39417, 39416, 39414, 39419, {f: 2, c: 39421},
+    39420, 39427, 39614, 39678, 39677, 39681, 39676, 39752, 39834, 39848,
+    39838, 39835, 39846, 39841, 39845, 39844, 39814, 39842, 39840, 39855,
+    40243, 40257, 40295, 40246, {f: 2, c: 40238}, 40241, 40248, 40240, 40261,
+    {f: 2, c: 40258}, 40254, 40247, 40256, 40253, 32757, 40237, 40586, 40585,
+    40589, 40624, 40648, 40666, 40699, 40703, 40740, 40739, 40738, 40788,
+    [12245, 40864], 20785, {f: 2, c: 20781}, 22168, 22172, 22167, 22170, 22173,
+    22169, 22896, 23356, {f: 2, c: 23657}, 24000, {f: 2, c: 24173}, 25048,
+    25055, {f: 2, c: 25069}, 25073, 25066, 25072, 25067, 25046, 25065, 25855,
+    25860, 25853, 25848, 25857, 25859, 25852, 26004, 26075, {f: 2, c: 26330},
+    26328, 27333, 27321, 27325, 27361, 27334, 27322, {f: 2, c: 27318}, 27335,
+    27316, 27309, 27486, 27593, 27659, 28679, {f: 2, c: 28684}, 28673, 28677,
+    28692, 28686, {f: 2, c: 28671}, 28667, 28710, 28668, 28663, 28682,
+    [29185, 60224], 29183, 29177, 29187, 29181, 29558, 29880, 29888, 29877,
+    29889, 29886, 29878, 29883, 29890, 29972, 29971, 30300, 30308, 30297,
+    30288, 30291, 30295, 30298, 30374, 30397, 30444, 30658, 30650, 30988,
+    {f: 2, c: 30995}, 30985, 30992, 30994, 30993, 31149, 31148, 31327, 31772,
+    31785, 31769, 31776, 31775, 31789, 31773, 31782, 31784, 31778, 31781,
+    31792, 32348, 32336, 32342, 32355, 32344, 32354, 32351, 32337, 32352,
+    32343, 32339, 32693, 32691, {f: 2, c: 32759}, 32885, {f: 2, c: 33233},
+    33232, 33375, 33374, 34228, 34246, 34240, 34243, 34242, 34227, 34229,
+    34237, 34247, 34244, 34239, 34251, 34254, 34248, 34245, 34225, 34230,
+    34258, 34340, 34232, 34231, 34238, 34409, 34791, 34790, 34786, 34779,
+    34795, 34794, 34789, 34783, 34803, 34788, 34772, 34780, 34771, 34797,
+    34776, 34787, 34775, 34777, 34817, 34804, 34792, 34781, 35155, 35147,
+    35151, 35148, 35142, {f: 2, c: 35152}, 35145, 35626, 35623, 35619, 35635,
+    35632, 35637, 35655, 35631, 35644, 35646, 35633, 35621, 35639, 35622,
+    35638, 35630, 35620, 35643, 35645, 35642, 35906, 35957, 35993, 35992,
+    35991, 36094, 36100, 36098, 36096, 36444, 36450, 36448, 36439, 36438,
+    36446, 36453, 36455, 36443, 36442, 36449, 36445, 36457, 36436,
+    {f: 3, c: 36678}, 36683, 37160, {f: 2, c: 37178}, 37182, 37288, 37285,
+    37287, 37295, 37290, 37813, 37772, 37778, 37815, 37787, 37789, 37769,
+    37799, 37774, 37802, 37790, 37798, 37781, 37768, 37785, 37791, 37760,
+    37773, 37809, 37777, 37810, 37796, 37800, 37812, 37795, {f: 2, c: 38354},
+    38353, 38579, 38615, 38618, 24002, 38623, 38616, 38621, 38691, 38690,
+    38693, 38828, 38830, 38824, 38827, 38820, 38826, 38818, 38821, 38871,
+    38873, 38870, 38872, 38906, {f: 3, c: 38992}, 39096, 39233, 39228, 39226,
+    39439, 39435, 39433, 39437, 39428, 39441, 39434, 39429, 39431, 39430,
+    39616, 39644, 39688, {f: 2, c: 39684}, 39721, 39733, 39754, 39756, 39755,
+    39879, 39878, 39875, 39871, 39873, 39861, 39864, 39891, 39862, 39876,
+    39865, 39869, 40284, 40275, 40271, 40266, 40283, 40267, 40281, 40278,
+    40268, 40279, 40274, 40276, 40287, 40280, 40282, 40590, 40588, 40671,
+    40705, 40704, [40726, 58693], 40741, 40747, 40746, 40745, 40744, 40780,
+    40789, {f: 2, c: 20788}, 21142, 21239, 21428, 22187, 22189,
+    {f: 2, c: 22182}, 22186, 22188, 22746, 22749, 22747, 22802,
+    {f: 3, c: 23357}, 24003, 24176, 24511, 25083, 25863, 25872, 25869, 25865,
+    25868, 25870, 25988, 26078, 26077, 26334, 27367, 27360, 27340, 27345,
+    27353, 27339, 27359, 27356, 27344, 27371, 27343, 27341, 27358, 27488,
+    27568, 27660, 28697, 28711, 28704, 28694, 28715, {f: 3, c: 28705}, 28713,
+    28695, 28708, 28700, 29196, 29194, 29191, 29186, 29189, {f: 2, c: 29349},
+    29348, 29347, 29345, 29899, 29893, 29879, 29891, 29974, 30304,
+    {f: 2, c: 30665}, 30660, 30705, 31005, 31003, 31009, 31004, 30999, 31006,
+    31152, {f: 2, c: 31335}, 31795, 31804, 31801, 31788, 31803, 31980, 31978,
+    32374, 32373, 32376, 32368, 32375, 32367, 32378, 32370, 32372, 32360,
+    32587, 32586, 32643, 32646, 32695, {f: 2, c: 32765}, 32888, 33239, 33237,
+    33291, 33380, 33377, 33379, 34283, 34289, 34285, 34265, 34273, 34280,
+    34266, 34263, 34284, 34290, 34296, 34264, 34271, 34275, 34268, 34257,
+    34288, 34278, 34287, 34270, 34274, 34816, 34810, 34819, {f: 2, c: 34806},
+    34825, 34828, 34827, 34822, 34812, 34824, 34815, 34826, 34818, 35170,
+    {f: 2, c: 35162}, 35159, 35169, 35164, 35160, 35165, 35161, 35208, 35255,
+    35254, 35318, 35664, 35656, 35658, 35648, 35667, 35670, 35668, 35659,
+    35669, 35665, 35650, 35666, 35671, 35907, 35959, 35958, 35994,
+    {f: 2, c: 36102}, 36105, 36268, 36266, 36269, 36267, 36461, 36472, 36467,
+    36458, 36463, 36475, 36546, 36690, 36689, {f: 2, c: 36687}, 36691, 36788,
+    37184, 37183, 37296, 37293, 37854, 37831, 37839, 37826, 37850, 37840,
+    37881, 37868, 37836, 37849, 37801, 37862, 37834, 37844, 37870, 37859,
+    37845, 37828, 37838, 37824, 37842, 37797, 37863, 38269, {f: 2, c: 38362},
+    38625, 38697, {f: 2, c: 38699}, 38696, 38694, 38835, 38839, 38838,
+    {f: 3, c: 38877}, 39004, 39001, 39005, 38999, 39103, 39101, 39099, 39102,
+    39240, 39239, 39235, {f: 2, c: 39334}, 39450, 39445, 39461, 39453, 39460,
+    39451, 39458, 39456, 39463, 39459, 39454, 39452, 39444, 39618, 39691,
+    39690, 39694, 39692, 39735, {f: 2, c: 39914}, 39904, 39902, 39908, 39910,
+    39906, 39920, 39892, 39895, 39916, 39900, 39897, 39909, 39893, 39905,
+    39898, 40311, 40321, 40330, 40324, 40328, 40305, 40320, 40312, 40326,
+    {f: 2, c: 40331}, 40317, 40299, {f: 2, c: 40308}, 40304, 40297, 40325,
+    40307, 40315, 40322, 40303, 40313, 40319, 40327, 40296, 40596, 40593,
+    40640, 40700, 40749, {f: 2, c: 40768}, 40781, {f: 3, c: 40790}, 21303,
+    22194, 22197, 22195, 22755, 23365, {f: 2, c: 24006}, {f: 2, c: 24302},
+    {f: 2, c: 24512}, 25081, 25879, 25878, 25877, 25875, 26079, 26344,
+    {f: 2, c: 26339}, 27379, 27376, 27370, 27368, 27385, 27377,
+    {f: 2, c: 27374}, 28732, 28725, 28719, 28727, 28724, 28721, 28738, 28728,
+    28735, 28730, 28729, 28714, 28736, 28731, 28723, 28737, {f: 2, c: 29203},
+    29352, 29565, 29564, 29882, 30379, 30378, 30398, 30445, 30668,
+    {f: 2, c: 30670}, 30669, 30706, 31013, 31011, {f: 2, c: 31015}, 31012,
+    31017, 31154, 31342, {f: 2, c: 31340}, 31479, 31817, 31816, 31818, 31815,
+    31813, 31982, 32379, 32382, 32385, 32384, 32698, 32767, 32889, 33243,
+    33241, {f: 2, c: 33384}, 34338, 34303, 34305, 34302, 34331, 34304, 34294,
+    34308, 34313, 34309, 34316, 34301, 34841, {f: 2, c: 34832}, 34839, 34835,
+    34838, 35171, 35174, 35257, 35319, 35680, 35690, 35677, 35688, 35683,
+    35685, 35687, 35693, 36270, 36486, 36488, 36484, 36697, {f: 2, c: 36694},
+    36693, 36696, 36698, 37005, 37187, 37185, 37303, 37301, {f: 2, c: 37298},
+    37899, 37907, 37883, 37920, 37903, 37908, 37886, 37909, 37904, 37928,
+    37913, 37901, 37877, 37888, 37879, 37895, 37902, 37910, 37906, 37882,
+    37897, 37880, 37948, 37898, 37887, 37884, 37900, 37878, 37905, 37894,
+    38366, 38368, 38367, {f: 2, c: 38702}, 38841, 38843, {f: 2, c: 38909},
+    39008, {f: 2, c: 39010}, 39007, {f: 2, c: 39105}, 39248, 39246, 39257,
+    39244, 39243, 39251, 39474, 39476, 39473, 39468, 39466, 39478, 39465,
+    39470, 39480, 39469, 39623, 39626, 39622, 39696, 39698, 39697, 39947,
+    39944, 39927, 39941, 39954, 39928, 40000, 39943, 39950, 39942, 39959,
+    39956, 39945, 40351, 40345, 40356, 40349, 40338, 40344, 40336, 40347,
+    40352, 40340, 40348, 40362, 40343, 40353, 40346, 40354, 40360, 40350,
+    40355, 40383, 40361, 40342, {f: 2, c: 40358}, 40601, 40603, 40602, 40677,
+    40676, 40679, 40678, 40752, 40750, 40795, 40800, 40798, 40797, 40793,
+    40849, 20794, 20793, 21144, 21143, 22211, {f: 2, c: 22205}, 23368, 23367,
+    24011, 24015, 24305, 25085, 25883, 27394, 27388, 27395, 27384, 27392,
+    {f: 2, c: 28739}, 28746, {f: 2, c: 28744}, {f: 2, c: 28741}, 29213, 29210,
+    29209, 29566, 29975, 30314, 30672, 31021, 31025, 31023, 31828, 31827,
+    31986, 32394, [32391, 60229], 32392, 32395, 32390, 32397, 32589, 32699,
+    32816, 33245, 34328, 34346, 34342, 34335, 34339, 34332, 34329, 34343,
+    34350, 34337, 34336, 34345, 34334, 34341, 34857, 34845, 34843, 34848,
+    34852, 34844, 34859, 34890, 35181, 35177, 35182, 35179, 35322, 35705,
+    35704, 35653, {f: 2, c: 35706}, 36112, 36116, 36271, 36494, 36492, 36702,
+    36699, 36701, 37190, {f: 2, c: 37188}, 37305, 37951, 37947, 37942, 37929,
+    37949, 37936, 37945, 37930, 37943, 37932, 37952, 37937, 38373, 38372,
+    38371, 38709, 38714, 38847, 38881, 39012, 39113, 39110, 39104, 39256,
+    39254, 39481, 39485, 39494, 39492, 39490, 39489, 39482, 39487, 39629,
+    39701, {f: 2, c: 39703}, 39702, 39738, 39762, 39979, 39965, 39964, 39980,
+    39971, {f: 2, c: 39976}, 39972, 39969, 40375, 40374, 40380, 40385, 40391,
+    40394, 40399, 40382, 40389, 40387, 40379, 40373, 40398, {f: 2, c: 40377},
+    40364, 40392, 40369, 40365, 40396, 40371, 40397, 40370, 40570, 40604,
+    40683, 40686, 40685, 40731, 40728, 40730, 40753, 40782, 40805, 40804,
+    40850, 20153, 22214, 22213, 22219, 22897, {f: 2, c: 23371}, 24021, 24017,
+    24306, 25889, 25888, 25894, 25890, 27403, {f: 2, c: 27400}, 27661,
+    {f: 3, c: 28757}, 28754, {f: 2, c: 29214}, 29353, 29567, 29912, 29909,
+    29913, 29911, 30317, 30381, 31029, 31156, {f: 2, c: 31344}, 31831, 31836,
+    31833, 31835, 31834, 31988, 31985, 32401, 32591, 32647, 33246, 33387,
+    {f: 2, c: 34356}, 34355, 34348, 34354, 34358, 34860, 34856, 34854, 34858,
+    34853, 35185, 35263, 35262, 35323, 35710, 35716, 35714, 35718, 35717,
+    35711, 36117, 36501, 36500, 36506, 36498, 36496, {f: 2, c: 36502}, 36704,
+    36706, 37191, 37964, 37968, {f: 2, c: 37962}, 37967, 37959, 37957,
+    {f: 2, c: 37960}, 37958, 38719, 38883, 39018, 39017, 39115, 39252, 39259,
+    39502, {f: 2, c: 39507}, 39500, 39503, 39496, 39498, 39497, 39506, 39504,
+    39632, 39705, 39723, 39739, 39766, 39765, 40006, 40008, 39999, 40004,
+    39993, 39987, 40001, 39996, 39991, 39988, 39986, 39997, 39990, 40411,
+    40402, 40414, 40410, 40395, 40400, 40412, 40401, 40415, 40425, 40409,
+    40408, 40406, 40437, 40405, 40413, 40630, 40688, 40757, 40755, 40754,
+    40770, 40811, 40853, 40866, 20797, 21145, 22760, 22759, 22898, 23373,
+    24024, 34863, 24399, 25089, {f: 2, c: 25091}, 25897, 25893, 26006, 26347,
+    {f: 2, c: 27409}, 27407, 27594, 28763, 28762, 29218, 29570, 29569, 29571,
+    30320, 30676, 31847, 31846, 32405, 33388, 34362, 34368, 34361, 34364,
+    34353, 34363, 34366, 34864, 34866, 34862, 34867, 35190, 35188, 35187,
+    35326, 35724, 35726, 35723, 35720, 35909, 36121, 36504, 36708, 36707,
+    37308, 37986, 37973, 37981, 37975, 37982, {f: 2, c: 38852}, 38912, 39510,
+    39513, {f: 3, c: 39710}, 40018, 40024, 40016, 40010, 40013, 40011, 40021,
+    40025, 40012, 40014, 40443, 40439, 40431, 40419, 40427, 40440, 40420,
+    40438, 40417, 40430, 40422, 40434, [40432, 60370], 40418, 40428, 40436,
+    40435, 40424, 40429, 40642, 40656, {f: 2, c: 40690}, 40710, 40732, 40760,
+    40759, 40758, 40771, 40783, 40817, 40816, {f: 2, c: 40814}, 22227, 22221,
+    23374, 23661, 25901, {f: 2, c: 26349}, 27411, 28767, 28769, 28765, 28768,
+    29219, 29915, 29925, 30677, 31032, 31159, 31158, 31850, 32407, 32649,
+    33389, 34371, 34872, 34871, 34869, 34891, {f: 2, c: 35732},
+    {f: 3, c: 36510}, 36509, 37310, 37309, 37314, 37995, {f: 2, c: 37992},
+    38629, 38726, 38723, 38727, 38855, 38885, 39518, 39637, 39769, 40035,
+    40039, 40038, 40034, 40030, 40032, 40450, 40446, 40455, 40451, 40454,
+    40453, {f: 2, c: 40448}, 40457, 40447, 40445, 40452, 40608, 40734, 40774,
+    {f: 3, c: 40820}, 22228, 25902, 26040, {f: 2, c: 27416}, 27415, 27418,
+    28770, 29222, 29354, {f: 2, c: 30680}, 31033, 31849, 31851, 31990, 32410,
+    32408, 32411, 32409, {f: 2, c: 33248}, {f: 3, c: 34374}, {f: 2, c: 35193},
+    35196, 35195, 35327, {f: 2, c: 35736}, 36517, 36516, 36515, 37998, 37997,
+    37999, 38001, 38003, 38729, 39026, 39263, 40040, 40046, 40045, 40459,
+    40461, 40464, 40463, 40466, 40465, 40609, 40693, 40713, 40775, 40824,
+    40827, 40826, 40825, 22302, 28774, 31855, 34876, 36274, 36518, 37315,
+    38004, 38008, 38006, 38005, 39520, [39726, 60830], 40052, 40051, 40049,
+    40053, 40468, 40467, 40694, 40714, 40868, 28776, 28773, 31991, 34410,
+    34878, 34877, 34879, 35742, 35996, 36521, 36553, 38731, {f: 2, c: 39027},
+    39116, 39265, 39339, 39524, {f: 2, c: 39526}, 39716, 40469, 40471, 40776,
+    25095, 27422, 29223, 34380, 36520, 38018, {f: 2, c: 38016}, 39529, 39528,
+    40473, 34379, 35743, 38019, 40057, 40631, 30325, 39531, 40058, 40477,
+    {f: 2, c: 28777}, 29225, 40612, 40830, 40777, 40856, {s: 97}, 65075, 0,
+    65076, 65103, [168, 776, 63208], [710, 63209, 65342], [12541, 63210],
+    [12542, 63211], [12445, 63212], [12446, 63213], 0, [12293, 63216],
+    [12294, 63217], [12295, 63218], [12540, 63219], [63220, 65339],
+    [63221, 65341], [10045, 63222], [12353, 63223], [12354, 63224],
+    [12355, 63225], [12356, 63226], [12357, 63227], [12358, 63228],
+    [12359, 63229], [12360, 63230], [12361, 63231], [12362, 63232],
+    [12363, 63233], [12364, 63234], [12365, 63235], [12366, 63236],
+    [12367, 63237], [12368, 63238], [12369, 63239], [12370, 63240],
+    [12371, 63241], [12372, 63242], [12373, 63243], [12374, 63244],
+    [12375, 63245], [12376, 63246], [12377, 63247], [12378, 63248],
+    [12379, 63249], [12380, 63250], [12381, 63251], [12382, 63252],
+    [12383, 63253], [12384, 63254], [12385, 63255], [12386, 63256],
+    [12387, 63257], [12388, 63258], [12389, 63259], [12390, 63260],
+    [12391, 63261], [12392, 63262], [12393, 63263], [12394, 63264],
+    [12395, 63265], [12396, 63266], [12397, 63267], [12398, 63268],
+    [12399, 63269], [12400, 63270], [12401, 63271], [12402, 63272],
+    [12403, 63273], [12404, 63274], [12405, 63275], [12406, 63276],
+    [12407, 63277], [12408, 63278], [12409, 63279], [12410, 63280],
+    [12411, 63281], [12412, 63282], [12413, 63283], [12414, 63284],
+    [12415, 63285], [12416, 63286], [12417, 63287], [12418, 63288],
+    [12419, 63289], [12420, 63290], [12421, 63291], [12422, 63292],
+    [12423, 63293], [12424, 63294], [12425, 63295], [12426, 63296],
+    [12427, 63297], [12428, 63298], [12429, 63299], [12430, 63300],
+    [12431, 63301], [12432, 63302], [12433, 63303], [12434, 63304],
+    [12435, 63305], [12449, 63306], [12450, 63307], [12451, 63308],
+    [12452, 63309], [12453, 63310], [12454, 63311], [12455, 63312],
+    [12456, 63313], [12457, 63314], [12458, 63315], [12459, 63316],
+    [12460, 63317], [12461, 63318], [12462, 63319], [12463, 63320],
+    [12464, 63321], [12465, 63322], [12466, 63323], [12467, 63324],
+    [12468, 63325], [12469, 63326], [12470, 63327], [12471, 63328],
+    [12472, 63329], [12473, 63330], [12474, 63331], [12475, 63332],
+    [12476, 63333], [12477, 63334], [12478, 63335], [12479, 63336],
+    [12480, 63337], [12481, 63338], [12482, 63339], [12483, 63340],
+    [12484, 63341], [12485, 63342], [12486, 63343], [12487, 63344],
+    [12488, 63345], [12489, 63346], [12490, 63347], [12491, 63348],
+    [12492, 63349], [12493, 63350], [12494, 63351], [12495, 63352],
+    [12496, 63353], [12497, 63354], [12498, 63355], [12499, 63356],
+    [12500, 63357], [12501, 63358], [12502, 63359], [12503, 63360],
+    [12504, 63361], [12505, 63362], [12506, 63363], [12507, 63364],
+    [12508, 63365], [12509, 63366], [12510, 63367], [12511, 63368],
+    [12512, 63369], [12513, 63370], [12514, 63371], [12515, 63372],
+    [12516, 63373], [12517, 63374], [12518, 63375], [12519, 63376],
+    [12520, 63377], [12521, 63378], [12522, 63379], [12523, 63380],
+    [12524, 63381], [12525, 63382], [12526, 63383], [12527, 63384],
+    [12528, 63385], [12529, 63386], [12530, 63387], [12531, 63388],
+    [12532, 63389], [12533, 63390], [12534, 63391], [1040, 63392],
+    [1041, 63393], [1042, 63394], [1043, 63395], [1044, 63396], [1045, 63397],
+    [1025, 63398], [1046, 63399], [1047, 63400], [1048, 63401], [1049, 63402],
+    [1050, 63403], [1051, 63404], [1052, 63405], [1053, 63406], [1054, 63407],
+    [1055, 63408], [1056, 63409], [1057, 63410], [1058, 63411], [1059, 63412],
+    [1060, 63413], [1061, 63414], [1062, 63415], [1063, 63416], [1064, 63417],
+    [1065, 63418], [1066, 63419], [1067, 63420], [1068, 63421], [1069, 63422],
+    [1070, 63423], [1071, 63424], [1072, 63425], [1073, 63426], [1074, 63427],
+    [1075, 63428], [1076, 63429], [1077, 63430], [1105, 63431], [1078, 63432],
+    [1079, 63433], [1080, 63434], [1081, 63435], [1082, 63436], [1083, 63437],
+    [1084, 63438], [1085, 63439], [1086, 63440], [1087, 63441], [1088, 63442],
+    [1089, 63443], [1090, 63444], [1091, 63445], [1092, 63446], [1093, 63447],
+    [1094, 63448], [1095, 63449], [1096, 63450], [1097, 63451], [1098, 63452],
+    [1099, 63453], [1100, 63454], [1101, 63455], [1102, 63456], [1103, 63457],
+    [8679, 63458], [8632, 63459], [8633, 63460], [20033, 63461],
+    [63462, 131276], [20058, 63463], [63464, 131210], [20994, 63465],
+    [17553, 63466], 63467, [20872, 63468], [13853, 63469], [63470, 161287],
+    {s: 40}, [172, 63511, 65506], [63512, 65508], [63513, 65287],
+    [63514, 65282], [12849, 63515], [8470, 63516], [8481, 63517], 30849,
+    [37561, 58501], 35023, 22715, 24658, 31911, 23290, 9556, 9574, 9559, 9568,
+    9580, 9571, 9562, 9577, 9565, 9554, 9572, 9557, {s: 3}, 9560, 9575, 9563,
+    9555, 9573, 9558, 9567, 9579, 9570, 9561, 9576, 9564, 9553, {s: 5}, 9619,
+    {s: 26}, [58129, 147159], [22462, 58130], [58131, 159443], [28990, 58132],
+    [58133, 153568], [27042, 58135], [58136, 166889], [23412, 58137],
+    [31305, 58138], [58139, 153825], [58140, 169177], [31333, 58141],
+    [31357, 58142], [58143, 154028], [31419, 58144], [31408, 58145],
+    [31426, 58146], [31427, 58147], [29137, 58148], [58149, 156813],
+    [16842, 58150], [31450, 58151], [31453, 58152], [31466, 58153],
+    [16879, 58154], [21682, 58155], [58156, 154625], [31499, 58157],
+    [31573, 58158], [31529, 58159], [58160, 152334], [58161, 154878],
+    [31650, 58162], [31599, 58163], [33692, 58164], [58165, 154548],
+    [58166, 158847], [31696, 58167], [33825, 58168], [31634, 58169], 0,
+    [58171, 154912], 0, [33938, 58174], [31738, 58175], 0, [31797, 58177],
+    [58178, 154817], [31812, 58179], [31875, 58180], [58181, 149634],
+    [31910, 58182], [58184, 148856], [31945, 58185], [31943, 58186],
+    [31974, 58187], 0, [31987, 58189], [31989, 58190], [32359, 58192],
+    [17693, 58193], [58194, 159300], [32093, 58195], [58196, 159446],
+    [32137, 58198], [32171, 58199], [28981, 58200], [32179, 58201], 32214,
+    [58203, 147543], [58204, 155689], [32228, 58205], [15635, 58206],
+    [32245, 58207], [58208, 137209], [32229, 58209], [58210, 164717], 0,
+    [58212, 155937], [58213, 155994], [32366, 58214], 0, [17195, 58216],
+    [37996, 58217], [32295, 58218], [32576, 58219], [32577, 58220],
+    [32583, 58221], [31030, 58222], [58223, 156368], [39393, 58224],
+    [32663, 58225], [58226, 156497], [32675, 58227], [58228, 136801],
+    [58229, 131176], [17756, 58230], [58231, 145254], [58233, 164666],
+    [32762, 58234], [58235, 156809], 0, [32776, 58237], [32797, 58238], 0,
+    [32815, 58240], [58241, 172167], [58242, 158915], [32827, 58243],
+    [32828, 58244], [32865, 58245], [58246, 141076], [18825, 58247],
+    [58248, 157222], [58249, 146915], [58250, 157416], [26405, 58251],
+    [32935, 58252], [58253, 166472], [33031, 58254], [33050, 58255],
+    [22704, 58256], [58257, 141046], [27775, 58258], [58259, 156824],
+    [25831, 58261], [58262, 136330], [33304, 58263], [58264, 137310],
+    [27219, 58265], [58266, 150117], [58267, 150165], [17530, 58268],
+    [33321, 58269], [58271, 158290], [58272, 146814], [20473, 58273],
+    [58274, 136445], [34018, 58275], [33634, 58276], 0, [58278, 149927],
+    [58279, 144688], [58280, 137075], [58281, 146936], [33450, 58282],
+    [26907, 58283], [58284, 194964], [16859, 58285], [34123, 58286],
+    [33488, 58287], [33562, 58288], [58289, 134678], [58290, 137140],
+    [14017, 58291], [58292, 143741], [58293, 144730], [33403, 58294],
+    [33506, 58295], [33560, 58296], [58297, 147083], [58298, 159139],
+    [58299, 158469], [58300, 158615], [58301, 144846], [15807, 58302],
+    [33565, 58303], [21996, 58304], [33669, 58305], [17675, 58306],
+    [58307, 159141], [33708, 58308], 0, [33747, 58310], [58312, 159444],
+    [27223, 58313], [34138, 58314], [13462, 58315], [58316, 159298],
+    [33880, 58318], [58319, 154596], [33905, 58320], [15827, 58321],
+    [17636, 58322], [27303, 58323], [33866, 58324], [31064, 58326], 0,
+    [58328, 158614], [58329, 159351], [58330, 159299], [34014, 58331], 0,
+    [33681, 58333], [17568, 58334], [33939, 58335], [34020, 58336],
+    [58337, 154769], [16960, 58338], [58339, 154816], [17731, 58340],
+    [34100, 58341], [23282, 58342], 0, [17703, 58344], [34163, 58345],
+    [17686, 58346], [26559, 58347], [34326, 58348], [58349, 165413],
+    [58350, 165435], [34241, 58351], [58352, 159880], [34306, 58353],
+    [58354, 136578], [58355, 159949], [58356, 194994], [17770, 58357],
+    [34344, 58358], [13896, 58359], [58360, 137378], [21495, 58361],
+    [58362, 160666], [34430, 58363], 0, [58365, 172280], [34798, 58366],
+    [58367, 142375], [34737, 58368], [34778, 58369], [34831, 58370, 60990],
+    [22113, 58371], [34412, 58372], [26710, 58373], [17935, 58374],
+    [34885, 58375], [34886, 58376], [58377, 161248], [58378, 146873],
+    [58379, 161252], [34910, 58380], [34972, 58381], [18011, 58382],
+    [34996, 58383], [34997, 58384], [35013, 58386], [58388, 161551],
+    [35207, 58389], {s: 3}, [35239, 58393], [35260, 58394], [58395, 166437],
+    [35303, 58396], [58397, 162084], [58398, 162493], [35484, 58399],
+    [30611, 58400], [37374, 58401], [35472, 58402], [58403, 162393],
+    [31465, 58404], [58405, 162618], [18195, 58407], [58408, 162616],
+    [29052, 58409], [35596, 58410], [35615, 58411], [58412, 152624],
+    [58413, 152933], [35647, 58414], 0, [35661, 58416], [35497, 58417],
+    [58418, 150138], [35728, 58419], [35739, 58420], [35503, 58421],
+    [58422, 136927], [17941, 58423], [34895, 58424], [35995, 58425],
+    [58426, 163156], [58427, 163215], [58428, 195028], [14117, 58429],
+    [58430, 163155], [36054, 58431], [58432, 163224], [58433, 163261],
+    [36114, 58434], [36099, 58435], [58436, 137488], [36059, 58437],
+    [28764, 58438], [36113, 58439], [16080, 58441], 0, [36265, 58443],
+    [58444, 163842], [58445, 135188], [58446, 149898], [15228, 58447],
+    [58448, 164284], [58449, 160012], [31463, 58450], [36525, 58451],
+    [36534, 58452], [36547, 58453], [37588, 58454], [36633, 58455],
+    [36653, 58456], [58457, 164709], [58458, 164882], [36773, 58459],
+    [37635, 58460], [58461, 172703], [58462, 133712], [36787, 58463], 0,
+    [58465, 166366], [58466, 165181], [58467, 146875], [24312, 58468],
+    [58469, 143970], [36857, 58470], 0, [58474, 140069], [14720, 58475],
+    [58476, 159447], [36919, 58477], [58478, 165180], [58479, 162494],
+    [36961, 58480], [58481, 165228], [58482, 165387], [37032, 58483],
+    [58484, 165651], [37060, 58485], [58486, 165606], [37038, 58487], 0,
+    [37223, 58489], [37289, 58491], [37316, 58492], [31916, 58493],
+    [58494, 166195], [58495, 138889], [37390, 58496], [27807, 58497],
+    [37441, 58498], [37474, 58499], [58500, 153017], [58502, 166598],
+    [58503, 146587], [58504, 166668], [58505, 153051], [58506, 134449],
+    [37676, 58507], [37739, 58508], [58509, 166625], [58510, 166891],
+    [23235, 58512], [58513, 166626], [58514, 166629], [18789, 58515],
+    [37444, 58516], [58517, 166892], [58518, 166969], [58519, 166911],
+    [37747, 58520], [37979, 58521], [36540, 58522], [38277, 58523],
+    [38310, 58524], [37926, 58525], [38304, 58526], [28662, 58527],
+    [17081, 58528], [58530, 165592], [58531, 135804], [58532, 146990],
+    [18911, 58533], [27676, 58534], [38523, 58535], [38550, 58536],
+    [16748, 58537], [38563, 58538], [58539, 159445], [25050, 58540], 58541,
+    [30965, 58542], [58543, 166624], [38589, 58544], [21452, 58545],
+    [18849, 58546], [58547, 158904], [58548, 131700], [58549, 156688],
+    [58550, 168111], [58551, 168165], [58552, 150225], [58553, 137493],
+    [58554, 144138], [38705, 58555], [34370, 58556], [38710, 58557],
+    [18959, 58558], [17725, 58559], [17797, 58560], [58561, 150249],
+    [28789, 58562], [23361, 58563], [38683, 58564], 0, [58566, 168405],
+    [38743, 58567], [23370, 58568], [58569, 168427], [38751, 58570],
+    [37925, 58571], [20688, 58572], [58573, 143543], [58574, 143548],
+    [38793, 58575], [38815, 58576], [38833, 58577], [38846, 58578],
+    [38848, 58579], [38866, 58580], [38880, 58581], [58582, 152684],
+    [38894, 58583], [29724, 58584], [58585, 169011], 0, [38901, 58587],
+    [58588, 168989], [58589, 162170], [19153, 58590], [38964, 58591],
+    [38963, 58592], [38987, 58593], [39014, 58594], [15118, 58595],
+    [58596, 160117], [15697, 58597], [58598, 132656], [58599, 147804],
+    [58600, 153350], [39114, 58601], [39095, 58602], [39112, 58603],
+    [39111, 58604], [19199, 58605], [58606, 159015], [58607, 136915],
+    [21936, 58608], [39137, 58609], [39142, 58610], [39148, 58611],
+    [37752, 58612], [39225, 58613], [58614, 150057], [19314, 58615],
+    [58616, 170071], [58617, 170245], [39413, 58618], [39436, 58619],
+    [39483, 58620], [39440, 58621], [39512, 58622], [58623, 153381],
+    [14020, 58624], [58625, 168113], [58626, 170965], [39648, 58627],
+    [39650, 58628], [58629, 170757], [39668, 58630], [19470, 58631],
+    [39700, 58632], [39725, 58633], [58634, 165376], [20532, 58635],
+    [39732, 58636], [14531, 58638], [58639, 143485], [39760, 58640],
+    [39744, 58641], [58642, 171326], [23109, 58643], [58644, 137315],
+    [39822, 58645], [39938, 58647], [39935, 58648], [39948, 58649],
+    [58650, 171624], [40404, 58651], [58652, 171959], [58653, 172434],
+    [58654, 172459], [58655, 172257], [58656, 172323], [58657, 172511],
+    [40318, 58658], [40323, 58659], [58660, 172340], [40462, 58661],
+    [40388, 58663], [58665, 172435], [58666, 172576], [58667, 137531],
+    [58668, 172595], [40249, 58669], [58670, 172217], [58671, 172724],
+    [40592, 58672], [40597, 58673], [40606, 58674], [40610, 58675],
+    [19764, 58676], [40618, 58677], [40623, 58678], [58679, 148324],
+    [40641, 58680], [15200, 58681], [14821, 58682], [15645, 58683],
+    [20274, 58684], [14270, 58685], [58686, 166955], [40706, 58687],
+    [40712, 58688], [19350, 58689], [37924, 58690], [58691, 159138],
+    [40727, 58692, 60836], 0, [40761, 58694], [22175, 58695], [22154, 58696],
+    [40773, 58697], [39352, 58698], [58699, 168075], [38898, 58700],
+    [33919, 58701], 0, [40809, 58703], [31452, 58704], [40846, 58705],
+    [29206, 58706], [19390, 58707], [58708, 149877], [58709, 149947],
+    [29047, 58710], [58711, 150008], [58712, 148296], [58713, 150097],
+    [29598, 58714], [58715, 166874], [58716, 137466], [31135, 58717],
+    [58718, 166270], [58719, 167478], [37737, 58720], [37875, 58721],
+    [58722, 166468], [37612, 58723], [37761, 58724], [37835, 58725],
+    [58726, 166252], [58727, 148665], [29207, 58728], [16107, 58729],
+    [30578, 58730], [31299, 58731], [28880, 58732], [58733, 148595],
+    [58734, 148472], [29054, 58735], [58736, 137199], [28835, 58737],
+    [58738, 137406], [58739, 144793], [16071, 58740], [58741, 137349],
+    [58742, 152623], [58743, 137208], [14114, 58744], [58745, 136955],
+    [58746, 137273], [14049, 58747], [58748, 137076], [58749, 137425],
+    [58750, 155467], [14115, 58751], [58752, 136896], [22363, 58753],
+    [58754, 150053], [58755, 136190], [58756, 135848], [58757, 136134],
+    [58758, 136374], [34051, 58759, 58761], [58760, 145062], 0, [33877, 58762],
+    [58763, 149908], [58764, 160101], [58765, 146993], [58766, 152924],
+    [58767, 147195], [58768, 159826], [17652, 58769], [58770, 145134],
+    [58771, 170397], [58772, 159526], [26617, 58773], [14131, 58774],
+    [15381, 58775], [15847, 58776], [22636, 58777], [58778, 137506],
+    [26640, 58779], [16471, 58780], [58781, 145215], [58782, 147681],
+    [58783, 147595], [58784, 147727], [58785, 158753], [21707, 58786],
+    [22174, 58787], [58788, 157361], [22162, 58789], [58790, 135135],
+    [58791, 134056], [58792, 134669], 0, [58794, 166675], [37788, 58795],
+    [20216, 58796], [20779, 58797], [14361, 58798], [58799, 148534],
+    [20156, 58800], [58801, 132197], 0, [20299, 58803], [20362, 58804],
+    [58805, 153169], [23144, 58806], [58807, 131499], [58808, 132043],
+    [14745, 58809], [58810, 131850], [58811, 132116], [13365, 58812],
+    [20265, 58813], [58814, 131776], [58815, 167603], [58816, 131701],
+    [35546, 58817], [58818, 131596], [20120, 58819], [20685, 58820],
+    [20749, 58821], [20386, 58822], [20227, 58823], [58824, 150030],
+    [58825, 147082], [20290, 58826], [20526, 58827], [20588, 58828],
+    [20609, 58829], [20428, 58830], [20453, 58831], [20568, 58832],
+    [20732, 58833], [28278, 58838], [58839, 144789], [58840, 147001],
+    [58841, 147135], [28018, 58842], [58843, 137348], [58844, 147081],
+    [20904, 58845], [20931, 58846], [58847, 132576], [17629, 58848],
+    [58849, 132259], [58850, 132242], [58851, 132241], [36218, 58852],
+    [58853, 166556], [58854, 132878], [21081, 58855], [21156, 58856],
+    [58857, 133235], [21217, 58858], 0, [18042, 58860], [29068, 58861],
+    [58862, 148364], [58863, 134176], [58864, 149932], [58865, 135396],
+    [27089, 58866], [58867, 134685], 0, [16094, 58869], [29849, 58870],
+    [29716, 58871], [29782, 58872], [29592, 58873], [19342, 58874],
+    [58875, 150204], [58876, 147597], [21456, 58877], [13700, 58878],
+    [29199, 58879], [58880, 147657], [21940, 58881], [58882, 131909],
+    [21709, 58883], [58884, 134086], [22301, 58885], [37469, 58886],
+    [38644, 58887], [22493, 58889], [22413, 58890], [22399, 58891],
+    [13886, 58892], [22731, 58893], [23193, 58894], [58895, 166470],
+    [58896, 136954], [58897, 137071], [58898, 136976], [23084, 58899],
+    [22968, 58900], [23166, 58902], [23247, 58903], [23058, 58904],
+    [58905, 153926], [58906, 137715], [58907, 137313], [58908, 148117],
+    [14069, 58909], [27909, 58910], [29763, 58911], [23073, 58912],
+    [58913, 155267], [23169, 58914], [58915, 166871], [58916, 132115],
+    [37856, 58917], [29836, 58918], [58919, 135939], [28933, 58920],
+    [18802, 58921], [37896, 58922], [58923, 166395], [37821, 58924],
+    [14240, 58925], [23582, 58926], [23710, 58927], [24158, 58928],
+    [24136, 58929], [58930, 137622], [58931, 137596], [58932, 146158],
+    [24269, 58933], [23375, 58934], [58935, 137475], [58936, 137476],
+    [14081, 58937], [58938, 137376], [14045, 58939], [58940, 136958],
+    [14035, 58941], [33066, 58942], [58943, 166471], [58944, 138682],
+    [58945, 144498], [58946, 166312], [24332, 58947, 60916], [24334, 58948],
+    [58949, 137511], [58950, 137131], [23147, 58951], [58952, 137019],
+    [23364, 58953], [58955, 161277], [34912, 58956], [24702, 58957],
+    [58958, 141408], [58959, 140843], [24539, 58960], [16056, 58961],
+    [58962, 140719], [58963, 140734], [58964, 168072], [58965, 159603],
+    [25024, 58966], [58967, 131134], [58968, 131142], [58969, 140827],
+    [24985, 58970], [24984, 58971], [24693, 58972], [58973, 142491],
+    [58974, 142599], [58975, 149204], [58976, 168269], [25713, 58977],
+    [58978, 149093], [58979, 142186], [14889, 58980], [58981, 142114],
+    [58982, 144464], [58983, 170218], [58984, 142968], [25399, 58985],
+    [25782, 58987], [25393, 58988], [25553, 58989], [58990, 149987],
+    [58991, 142695], [25252, 58992], [58993, 142497], [25659, 58994],
+    [25963, 58995], [26994, 58996], [15348, 58997], [58998, 143502],
+    [58999, 144045], [59000, 149897], [59001, 144043], [21773, 59002],
+    [59003, 144096], [59004, 137433], [59005, 169023], [26318, 59006],
+    [59007, 144009], [59008, 143795], [15072, 59009], [59011, 152964],
+    [59012, 166690], [59013, 152975], [59014, 136956], [59015, 152923],
+    [59016, 152613], [30958, 59017], [59018, 143619], [59019, 137258],
+    [59020, 143924], [13412, 59021], [59022, 143887], [59023, 143746],
+    [59024, 148169], [26254, 59025], [59026, 159012], [26219, 59027],
+    [19347, 59028], [26160, 59029], [59030, 161904], [59031, 138731],
+    [26211, 59032], [59033, 144082], [59034, 144097], [26142, 59035],
+    [59036, 153714], [14545, 59037], [59038, 145466], [59039, 145340],
+    [15257, 59040], [59041, 145314], [59042, 144382], [29904, 59043],
+    [15254, 59044], [59046, 149034], [26806, 59047], 0, [15300, 59049],
+    [27326, 59050], [59052, 145365], [59053, 148615], [27187, 59054],
+    [27218, 59055], [27337, 59056], [27397, 59057], [59058, 137490],
+    [25873, 59059], [26776, 59060], [27212, 59061], [15319, 59062],
+    [27258, 59063], [27479, 59064], [59065, 147392], [59066, 146586],
+    [37792, 59067], [37618, 59068], [59069, 166890], [59070, 166603],
+    [37513, 59071], [59072, 163870], [59073, 166364], [37991, 59074],
+    [28069, 59075], [28427, 59076], 0, [59079, 147327], [15759, 59080],
+    [28164, 59081], [59082, 147516], [23101, 59083], [28170, 59084],
+    [22599, 59085], [27940, 59086], [30786, 59087], [28987, 59088],
+    [59089, 148250], [59090, 148086], [28913, 59091], [29264, 59092, 61085],
+    [29319, 59093], [29332, 59094], [59095, 149391], [59096, 149285],
+    [20857, 59097], [59098, 150180], [59099, 132587], [29818, 59100],
+    [59101, 147192], [59102, 144991], [59103, 150090], [59104, 149783],
+    [59105, 155617], [16134, 59106], [16049, 59107], [59108, 150239],
+    [59109, 166947], [59110, 147253], [24743, 59111], [16115, 59112],
+    [29900, 59113], [29756, 59114], [37767, 59115], [29751, 59116],
+    [17567, 59117], [59118, 159210], [17745, 59119], [30083, 59120],
+    [16227, 59121], [59122, 150745], [59123, 150790], [16216, 59124],
+    [30037, 59125], [30323, 59126], [59127, 173510], 0, [29800, 59129, 61070],
+    [59130, 166604], [59131, 149931], [59132, 149902], [15099, 59133],
+    [15821, 59134], [59135, 150094], [16127, 59136], [59137, 149957],
+    [59138, 149747], [37370, 59139], [22322, 59140], [37698, 59141],
+    [59142, 166627], [59143, 137316], [20703, 59144], [59145, 152097],
+    [59146, 152039], [30584, 59147], [59148, 143922], [30478, 59149],
+    [30479, 59150], [30587, 59151], [59152, 149143], [59153, 145281],
+    [14942, 59154], [59155, 149744], [29752, 59156], [29851, 59157],
+    [16063, 59158], [59159, 150202], [59160, 150215], [16584, 59161],
+    [59162, 150166], [59163, 156078], [37639, 59164], [59165, 152961],
+    [30750, 59166], [30861, 59167], [30856, 59168], [30930, 59169],
+    [29648, 59170], [31065, 59171], [59172, 161601], [59173, 153315],
+    [16654, 59174], 0, 0, [31141, 59177], [27181, 59178], [59179, 147194],
+    [31290, 59180], [31220, 59181], [16750, 59182], [59183, 136934],
+    [16690, 59184], [37429, 59185], [31217, 59186], [59187, 134476],
+    [59188, 149900], [59189, 131737], [59190, 146874], [59191, 137070],
+    [13719, 59192], [21867, 59193], [13680, 59194], [13994, 59195],
+    [59196, 131540], [59197, 134157], [31458, 59198], [23129, 59199],
+    [59200, 141045], [59201, 154287], [59202, 154268], [23053, 59203],
+    [59204, 131675], [30960, 59205], [23082, 59206], [59207, 154566],
+    [31486, 59208], [16889, 59209], [31837, 59210], [31853, 59211],
+    [16913, 59212], [59213, 154547], [59214, 155324], [59215, 155302],
+    [31949, 59216], [59217, 150009], [59218, 137136], [31886, 59219],
+    [31868, 59220], [31918, 59221], [27314, 59222], [32220, 59223],
+    [32263, 59224], [32211, 59225], [32590, 59226], [59227, 156257],
+    [59228, 155996], [59229, 162632], [32151, 59230], [59231, 155266],
+    [17002, 59232], [59233, 158581], [59234, 133398], [26582, 59235],
+    [59236, 131150], [59237, 144847], [22468, 59238], [59239, 156690],
+    [59240, 156664], [32733, 59242], [31527, 59243], [59244, 133164],
+    [59245, 154345], [59246, 154947], [31500, 59247], [59248, 155150],
+    [39398, 59249], [34373, 59250], [39523, 59251], [27164, 59252],
+    [59253, 144447], [59255, 150007], [59256, 157101], [39455, 59257],
+    [59258, 157088], 0, [59260, 160039], [59261, 158929], [17642, 59262],
+    [33079, 59263], [17410, 59264], [32966, 59265], [33033, 59266],
+    [33090, 59267], [59268, 157620], [39107, 59269], [59270, 158274],
+    [33378, 59271], [33381, 59272], [59273, 158289], [33875, 59274],
+    [59275, 159143], [34320, 59276], [59277, 160283], [23174, 59278],
+    [16767, 59279], [59280, 137280], [23339, 59281], [59282, 137377],
+    [23268, 59283], [59284, 137432], [34464, 59285], [59286, 195004],
+    [59287, 146831], [34861, 59288], [59289, 160802], [23042, 59290],
+    [34926, 59291], [20293, 59292], [34951, 59293], [35007, 59294],
+    [35046, 59295], [35173, 59296], [35149, 59297], [59298, 153219],
+    [35156, 59299], [59300, 161669], [59301, 161668], [59302, 166901],
+    [59303, 166873], [59304, 166812], [59305, 166393], [16045, 59306],
+    [33955, 59307], [18165, 59308], [18127, 59309], [14322, 59310],
+    [35389, 59311], [35356, 59312], [59313, 169032], [24397, 59314],
+    [37419, 59315], [59316, 148100], [26068, 59317], [28969, 59318],
+    [28868, 59319], [59320, 137285], [40301, 59321], [35999, 59322],
+    [36073, 59323], [59324, 163292], [22938, 59325], [30659, 59326],
+    [23024, 59327], [14036, 59329], [36394, 59330], [36519, 59331],
+    [59332, 150537], [36656, 59333], [36682, 59334], [17140, 59335],
+    [27736, 59336], [28603, 59337], [59338, 140065], [18587, 59339],
+    [28537, 59340], [28299, 59341], [59342, 137178], [39913, 59343],
+    [14005, 59344], [59345, 149807], [37051, 59346], 0, [21873, 59348],
+    [18694, 59349], [37307, 59350], [37892, 59351], [59352, 166475],
+    [16482, 59353], [59354, 166652], [37927, 59355], [59356, 166941],
+    [59357, 166971], [34021, 59358], [35371, 59359], [38297, 59360],
+    [38311, 59361], [38295, 59362], [38294, 59363], [59364, 167220],
+    [29765, 59365], [16066, 59366], [59367, 149759], [59368, 150082],
+    [59369, 148458], [16103, 59370], [59371, 143909], [38543, 59372],
+    [59373, 167655], [59374, 167526], [59375, 167525], [16076, 59376],
+    [59377, 149997], [59378, 150136], [59379, 147438], [29714, 59380],
+    [29803, 59381], [16124, 59382], [38721, 59383], [59384, 168112],
+    [26695, 59385], [18973, 59386], [59387, 168083], [59388, 153567], 0,
+    [37736, 59390], [59391, 166281], [59392, 166950], [59393, 166703],
+    [59394, 156606], [37562, 59395], [23313, 59396], [35689, 59397],
+    [18748, 59398], [29689, 59399], [59400, 147995], [38811, 59401], 0,
+    [39224, 59403], [59404, 134950], [24001, 59405], [59406, 166853],
+    [59407, 150194], [38943, 59408], [59409, 169178], [37622, 59410],
+    [59411, 169431], [37349, 59412], [17600, 59413], [59414, 166736],
+    [59415, 150119], [59416, 166756], [39132, 59417], [59418, 166469],
+    [16128, 59419], [37418, 59420], [18725, 59421], [33812, 59422],
+    [39227, 59423], [39245, 59424], [59425, 162566], [15869, 59426], 0,
+    [19311, 59428], [39338, 59429], [39516, 59430], [59431, 166757],
+    [59432, 153800], [27279, 59433], [39457, 59434], [23294, 59435],
+    [39471, 59436], [59437, 170225], [19344, 59438], [59439, 170312],
+    [39356, 59440], [19389, 59441], [19351, 59442], [37757, 59443],
+    [22642, 59444], [59445, 135938], [22562, 59446], [59447, 149944],
+    [59448, 136424], [30788, 59449], [59450, 141087], [59451, 146872],
+    [26821, 59452], [15741, 59453], [37976, 59454], [14631, 59455],
+    [24912, 59456], [59457, 141185], [59458, 141675], [24839, 59459],
+    [40015, 59460], [40019, 59461], [40059, 59462], [39989, 59463],
+    [39952, 59464], [39807, 59465], [39887, 59466], [59467, 171565],
+    [39839, 59468], [59469, 172533], [59470, 172286], [40225, 59471],
+    [19630, 59472], [59473, 147716], [40472, 59474], [19632, 59475],
+    [40204, 59476], [59477, 172468], [59478, 172269], [59479, 172275],
+    [59480, 170287], [40357, 59481], [33981, 59482], [59483, 159250],
+    [59484, 159711], [59485, 158594], [34300, 59486], [17715, 59487],
+    [59488, 159140], [59489, 159364], [59490, 159216], [33824, 59491],
+    [34286, 59492], [59493, 159232], [59494, 145367], [59495, 155748],
+    [31202, 59496], [59497, 144796], [59498, 144960], [59500, 149982],
+    [15714, 59501], [37851, 59502], [37566, 59503], [37704, 59504],
+    [59505, 131775], [30905, 59506], [37495, 59507], [37965, 59508],
+    [20452, 59509], [13376, 59510], [36964, 59511], [59512, 152925],
+    [30781, 59513], [30804, 59514], [30902, 59515], [30795, 59516],
+    [59517, 137047], [59518, 143817], [59519, 149825], [13978, 59520],
+    [20338, 59521], [28634, 59522], [28633, 59523], 0, [28702, 59524, 59525],
+    [21524, 59526], [59527, 147893], [22459, 59528], [22771, 59529],
+    [22410, 59530], [40214, 59531], [22487, 59532], [28980, 59533],
+    [13487, 59534], [59535, 147884], [29163, 59536], [59537, 158784],
+    [59538, 151447], 0, [59540, 137141], [59541, 166473], [24844, 59542],
+    [23246, 59543], [23051, 59544], [17084, 59545], [59546, 148616],
+    [14124, 59547], [19323, 59548], [59549, 166396], [37819, 59550],
+    [37816, 59551], [59552, 137430], [59553, 134941], [33906, 59554],
+    [59555, 158912], [59556, 136211], [59557, 148218], [59558, 142374],
+    [59559, 148417], [22932, 59560], [59561, 146871], [59562, 157505],
+    [32168, 59563], [59564, 155995], [59565, 155812], [59566, 149945],
+    [59567, 149899], [59568, 166394], [37605, 59569], [29666, 59570],
+    [16105, 59571], [29876, 59572], [59573, 166755], [59574, 137375],
+    [16097, 59575], [59576, 150195], [27352, 59577], [29683, 59578],
+    [29691, 59579], [16086, 59580], [59581, 150078], [59582, 150164],
+    [59583, 137177], [59584, 150118], [59585, 132007], [59586, 136228],
+    [59587, 149989], [29768, 59588], [59589, 149782], [28837, 59590],
+    [59591, 149878], [37508, 59592], [29670, 59593], [37727, 59594],
+    [59595, 132350], [37681, 59596], [59597, 166606], [59598, 166422],
+    [37766, 59599], [59600, 166887], [59601, 153045], [18741, 59602],
+    [59603, 166530], [29035, 59604], [59605, 149827], [59606, 134399],
+    [22180, 59607], [59608, 132634], [59609, 134123], [59610, 134328],
+    [21762, 59611], [31172, 59612], [59613, 137210], [32254, 59614],
+    [59615, 136898], [59616, 150096], [59617, 137298], [17710, 59618],
+    [37889, 59619], [14090, 59620], [59621, 166592], [59622, 149933],
+    [22960, 59623], [59624, 137407], [59625, 137347], [59626, 160900],
+    [23201, 59627], [14050, 59628], [59629, 146779], [14000, 59630],
+    [37471, 59631], [23161, 59632], [59633, 166529], [59634, 137314],
+    [37748, 59635], [15565, 59636], [59637, 133812], [19094, 59638],
+    [14730, 59639], [20724, 59640], [15721, 59641], [15692, 59642],
+    [59643, 136092], [29045, 59644], [17147, 59645], [59646, 164376],
+    [28175, 59647], [59648, 168164], [17643, 59649], [27991, 59650],
+    [59651, 163407], [28775, 59652], [27823, 59653], [15574, 59654],
+    [59655, 147437], [59656, 146989], [28162, 59657], [28428, 59658],
+    [15727, 59659], [59660, 132085], [30033, 59661], [14012, 59662],
+    [13512, 59663], [18048, 59664], [16090, 59665], [18545, 59666],
+    [22980, 59667], [37486, 59668], [18750, 59669], [36673, 59670],
+    [59671, 166940], [59672, 158656], [22546, 59673], [22472, 59674],
+    [14038, 59675], [59676, 136274], [28926, 59677], [59678, 148322],
+    [59679, 150129], [59680, 143331], [59681, 135856], [59682, 140221],
+    [26809, 59683], [26983, 59684], [59685, 136088], [59686, 144613],
+    [59687, 162804], [59688, 145119], [59689, 166531], [59690, 145366],
+    [59691, 144378], [59692, 150687], [27162, 59693], [59694, 145069],
+    [59695, 158903], [33854, 59696], [17631, 59697], [17614, 59698],
+    [59699, 159014], [59700, 159057], [59701, 158850], [59702, 159710], 0, 0,
+    [33597, 59705], [59706, 137018], [33773, 59707], [59708, 158848],
+    [59709, 159827], [59710, 137179], [22921, 59711], [23170, 59712],
+    [59713, 137139], [23137, 59714], [23153, 59715], [59716, 137477],
+    [59717, 147964], [14125, 59718], [23023, 59719], [59720, 137020],
+    [14023, 59721], [29070, 59722], [37776, 59723], [26266, 59724],
+    [59725, 148133], [23150, 59726], [23083, 59727], [59728, 148115],
+    [27179, 59729], [59730, 147193], [59731, 161590], [59732, 148571],
+    [59733, 148170], [28957, 59734], [59735, 148057], [59736, 166369],
+    [20400, 59737], [59738, 159016], [23746, 59739], [59740, 148686],
+    [59741, 163405], [59742, 148413], [27148, 59743], [59744, 148054],
+    [59745, 135940], 0, [28979, 59747], [59748, 148457], [15781, 59749],
+    [27871, 59750], [59751, 194597], [23019, 59754], [24412, 59757],
+    [59764, 144128], [31955, 59776], [59783, 162548], [59786, 153334],
+    [59790, 162584], [36972, 59791], [33270, 59795], [30476, 59797],
+    [27810, 59799], [22269, 59800], [22633, 59828], [26465, 59832],
+    [23646, 59838], [22770, 59841], [28857, 59843], [26627, 59853],
+    [36795, 59859], [36796, 59861], [20001, 59871], [31545, 59898],
+    [15820, 59902], [29482, 57990, 59909], [30048, 59912], [22586, 59920],
+    [33446, 59932], [27018, 59940], [24803, 59944], [20206, 59984],
+    [39364, 60002], [40639, 60023], [21249, 60025], [26528, 60038],
+    [24808, 60046], [20916, 60053], [31363, 60064], [39994, 60075],
+    [31432, 60093], [26906, 60098], [22956, 60100], [22592, 60102],
+    [21610, 60114], [24807, 60123], [22138, 60125], [26965, 60132],
+    [39983, 60133], [34725, 60134], [23584, 60141], [24075, 60143],
+    [26398, 60147], [33965, 60157], [35713, 60161], [20088, 60166],
+    [25283, 60176], [26709, 60180], 0, [33533, 60190], [35237, 60194],
+    [36768, 60196], [38840, 60198], [38983, 60200], [39613, 60201],
+    [24497, 60218], [26184, 60219], [26303, 60220], [60221, 162425], 0,
+    [60225, 149946], 0, 0, [60230, 131910], [26382, 60232], [26904, 60233],
+    [60235, 161367], [60236, 155618], [60239, 161278], [60240, 139418],
+    [18640, 60241], [19128, 60242], [60244, 166554], [60247, 147515],
+    [60250, 150085], [60251, 132554], [20946, 60252], [60253, 132625],
+    [22943, 60254], [60255, 138920], [15294, 60256], [60257, 146687],
+    [14747, 60262], [60264, 165352], [60265, 170441], [14178, 60266],
+    [60267, 139715], [35678, 60268], [60269, 166734], 0, [29193, 60274],
+    [60276, 134264], [60280, 132985], [36570, 60281], [21135, 60283],
+    [29041, 60285], [60288, 147274], [60289, 150183], [21948, 60290],
+    [60293, 158546], [13427, 60295], [60297, 161330], [18200, 60299],
+    [60303, 149823], [20582, 60305], [13563, 60306], [60307, 144332], 0,
+    [18300, 60310], [60311, 166216], [60315, 138640], 0, [60320, 162834],
+    [36950, 60321], [60323, 151450], [35682, 60324], [23899, 60327],
+    [60328, 158711], 0, [60331, 137500], [35562, 60332], [60333, 150006],
+    [60335, 147439], [19392, 60337], [60340, 141083], [37989, 60341],
+    [60342, 153569], [24981, 60343], [23079, 60344], [60345, 194765], 0,
+    [60348, 148769], [20074, 60350], [60351, 149812], [38486, 60352],
+    [28047, 60353], [60354, 158909], [35191, 60356], [60359, 156689], 0,
+    [31554, 60363], [60364, 168128], [60365, 133649], 0, [31301, 60369],
+    [39462, 60372], [13919, 60374], [60375, 156777], [60376, 131105],
+    [31107, 60377], [23852, 60380], [60381, 144665], 0, [18128, 60384],
+    [30011, 60386], [34917, 60387], [22710, 60389], [14108, 60390],
+    [60391, 140685], [15444, 60394], [37505, 60397], [60398, 139642],
+    [37680, 60400], [60402, 149968], [27705, 60403], [60406, 134904],
+    [34855, 60407], [35061, 60408], [60409, 141606], [60410, 164979],
+    [60411, 137137], [28344, 60412], [60413, 150058], [60414, 137248],
+    [14756, 60415], 0, 0, [17727, 60419], [26294, 60420], [60421, 171181],
+    [60422, 170148], [35139, 60423], [16607, 60427], [60428, 136714],
+    [14753, 60429], [60430, 145199], [60431, 164072], [60432, 136133],
+    [29101, 60433], [33638, 60434], [60436, 168360], 0, [19639, 60438],
+    [60439, 159919], [60440, 166315], [60445, 147834], [31555, 60446],
+    [31102, 60447], [28597, 60449], [60450, 172767], [27139, 60451],
+    [60452, 164632], [21410, 60453], [60454, 159239], [37823, 60455],
+    [26678, 60456], [38749, 59389, 60457], [60458, 164207], [60460, 158133],
+    [60461, 136173], [60462, 143919], [23941, 60464], [60465, 166960],
+    [22293, 60467], [38947, 60468], [60469, 166217], [23979, 60470],
+    [60471, 149896], [26046, 60472], [27093, 60473], [21458, 60474],
+    [60475, 150181], [60476, 147329], [15377, 60477], [26422, 60478],
+    [60482, 139169], [13770, 60490], [18682, 60493], 0, [30728, 60496],
+    [37461, 60497], [17394, 60499], [17375, 60501], [23032, 60505], 0,
+    [22155, 60518], [60520, 169449], [36882, 60541], [21953, 60546],
+    [17673, 60551], [32383, 60552], [28502, 60553], [27313, 60554],
+    [13540, 60556], [60558, 161949], [14138, 60559], 0, [60562, 163876],
+    [60565, 162366], [15851, 60567], [60569, 146615], [60574, 156248],
+    [22207, 60575], [36366, 60577], [23405, 60578], [25566, 60581], 0,
+    [25904, 60585], [22061, 60586], [21530, 60588], [60591, 171416],
+    [19581, 60592], [22050, 60593], [22046, 60594], [32585, 60595],
+    [22901, 60597], [60598, 146752], [34672, 60599], [33047, 60604],
+    [40286, 60605], [36120, 60606], [30267, 60607], [40005, 60608],
+    [30286, 60609], [30649, 60610], [37701, 60611], [21554, 60612],
+    [33096, 60613], [33527, 60614], [22053, 60615], [33074, 60616],
+    [33816, 60617], [32957, 60618], [21994, 60619], [31074, 60620],
+    [22083, 60621], [21526, 60622], [60623, 134813], [13774, 60624],
+    [22021, 57509, 60625], [22001, 60626], [26353, 60627], [60628, 164578],
+    [13869, 60629], [30004, 60630], [22000, 60631], [21946, 60632],
+    [21655, 60633], [21874, 60634], [60635, 134209], [60636, 134294],
+    [24272, 57652, 60637], [60639, 134774], [60640, 142434], [60641, 134818],
+    [40619, 60642], [32090, 60643], 0, [60645, 135285], [25245, 60646],
+    [38765, 60647], [21652, 60648], [36045, 60649], [29174, 60650],
+    [37238, 60651], [25596, 60652], [25529, 60653], [25598, 60654],
+    [21865, 60655], [60656, 142147], [40050, 60657], [60658, 143027],
+    [20890, 60659], [13535, 60660], [60661, 134567], [20903, 60662],
+    [21581, 60663], [21790, 60664], [21779, 60665], [30310, 60666],
+    [36397, 60667], [60668, 157834], [30129, 60669], [32950, 60670],
+    [34820, 60671], 0, [35015, 60673], [33206, 60674], [33820, 60675],
+    [17644, 60677], [29444, 60678], [33547, 60681], [22139, 60683],
+    [37232, 60690], [37384, 60692], [60696, 134905], [29286, 60697],
+    [18254, 60699], [60701, 163833], [16634, 60703], [40029, 60704],
+    [25887, 60705], [18675, 60707], [60708, 149472], [60709, 171388], 0,
+    [60713, 161187], 60715, [60716, 155720], [29091, 60718], [32398, 60719],
+    [40272, 60720], [13687, 60723], [27826, 60725], [21351, 60726],
+    [14812, 60728], [60731, 149016], [33325, 60734], [21579, 60735], 60739,
+    [14930, 60740], [29556, 60742], [60743, 171692], [19721, 60744],
+    [39917, 60745], 0, [19547, 60748], [60751, 171998], [33884, 60752],
+    [60754, 160434], [25390, 60757], [32037, 60758], [14890, 60761],
+    [36872, 60762], [21196, 60763], [15988, 60764], [13946, 60765],
+    [17897, 60766], [60767, 132238], [30272, 60768], [23280, 60769],
+    [60770, 134838], [30842, 60771], [18358, 60772], [22695, 60773],
+    [16575, 60774], [22140, 60775], [39819, 60776], [23924, 60777],
+    [30292, 60778], [60779, 173108], [40581, 60780], [19681, 60781], 0,
+    [14331, 60783], [24857, 60784], [60786, 148466], 60787, [22109, 60788],
+    [60792, 171526], [21044, 60793], [13741, 60795], 0, [40316, 60797],
+    [31830, 60798], [39737, 60799], [22494, 60800], [23635, 60802],
+    [25811, 60803], [60804, 169168], [60805, 156469], [34477, 60807],
+    [60808, 134440], [60811, 134513], 60812, [20990, 60813], [60814, 139023],
+    [23950, 60815], [38659, 60816], [60817, 138705], [40577, 60818],
+    [36940, 60819], [31519, 60820], [39682, 60821], [23761, 60822],
+    [31651, 60823], [25192, 60824], [25397, 60825], [39679, 60826],
+    [31695, 60827], [39722, 60828], [31870, 60829], 0, [31810, 60831],
+    [31878, 60832], [39957, 60833], [31740, 60834], [39689, 60835], 0, 39982,
+    [40794, 60839], [21875, 60840], [23491, 60841], [20477, 60842],
+    [40600, 60843], [20466, 60844], [21088, 60845], [21201, 60847],
+    [22375, 60848], [20566, 60849], [22967, 60850], [24082, 60851],
+    [38856, 60852], [40363, 60853], [36700, 60854], [21609, 60855],
+    [38836, 60856], [39232, 60857], [38842, 60858], [21292, 60859],
+    [24880, 60860], [26924, 60861], [21466, 60862], [39946, 60863],
+    [40194, 60864], [19515, 60865], [38465, 60866], [27008, 60867],
+    [20646, 60868], [30022, 60869], [60870, 137069], [39386, 60871],
+    [21107, 60872], 60873, [37209, 60874], [38529, 60875], [37212, 60876],
+    60877, [37201, 60878], [60879, 167575], [25471, 60880], [27338, 60882],
+    [22033, 60883], [37262, 60884], [30074, 60885], [25221, 60886],
+    [29519, 60888], [31856, 60889], [60890, 154657], 60892, [30422, 60894],
+    [39837, 60895], [20010, 60896], [60897, 134356], [33726, 60898],
+    [34882, 60899], 60900, [23626, 60901], [27072, 60902], 0, 0,
+    [21023, 60905], [24053, 60906], [20174, 60907], [27697, 60908],
+    [60909, 131570], [20281, 60910], [21660, 60911], 0, [21146, 60913],
+    [36226, 60914], [13822, 60915], 0, [13811, 60917], 60918, [27474, 60919],
+    [37244, 60920], [40869, 60921], [39831, 60922], [38958, 60923],
+    [39092, 60924], [39610, 60925], [40616, 60926], [40580, 60927],
+    [31508, 60929], 60930, [27642, 60931], [34840, 60932], [32632, 60933],
+    60934, [22048, 60935], [60936, 173642], [36471, 60937], [40787, 60938],
+    60939, [36308, 60940], [36431, 60941], [40476, 60942], [36353, 60943],
+    [25218, 60944], [60945, 164733], [36392, 60946], [36469, 60947],
+    [31443, 60948], [31294, 60950], [30936, 60951], [27882, 60952],
+    [35431, 60953], [30215, 60954], [40742, 60956], [27854, 60957],
+    [34774, 60958], [30147, 60959], [60960, 172722], [30803, 60961],
+    [36108, 60963], [29410, 60964], [29553, 60965], [35629, 60966],
+    [29442, 60967], [29937, 60968], [36075, 60969], [60970, 150203],
+    [34351, 60971], [24506, 60972], [34976, 60973], [17591, 60974], 60975,
+    [60977, 159237], 60978, [35454, 60979], [60980, 140571], 60981,
+    [24829, 60982], [30311, 60983], [39639, 60984], [40260, 60985],
+    [37742, 58859, 60986], [39823, 60987], [34805, 60988], 60989, 0,
+    [36087, 60991], [29484, 60992], [38689, 60993], [39856, 60994],
+    [13782, 60995], [29362, 60996], [19463, 60997], [31825, 60998],
+    [39242, 60999], [24921, 61001], [19460, 61002], [40598, 61003],
+    [24957, 61004], 61005, [22367, 61006], [24943, 61007], [25254, 61008],
+    [25145, 61009], 0, [14940, 61011], [25058, 61012], [21418, 61013],
+    [25444, 61015], [26626, 61016], [13778, 61017], [23895, 61018],
+    [36826, 61020], [61021, 167481], 61022, [20697, 61023], [30982, 61025],
+    [21298, 61026], [38456, 61027], [61028, 134971], [16485, 61029], 61030,
+    [30718, 61031], 61032, [31938, 61033], [61034, 155418], [31962, 61035],
+    [31277, 61036], [32870, 61037], [32867, 61038], [32077, 61039],
+    [29957, 61040], [29938, 61041], [35220, 61042], [33306, 61043],
+    [26380, 61044], [32866, 61045], [61046, 160902], [32859, 61047],
+    [29936, 61048], [33027, 61049], [30500, 61050], [35209, 61051],
+    [61052, 157644], [30035, 61053], [34729, 61055], [34766, 61056],
+    [33224, 61057], [34700, 61058], [35401, 61059], [36013, 61060],
+    [35651, 61061], [30507, 61062], [29944, 61063], [34010, 61064],
+    [27058, 61066], [36262, 61067], 61068, [35241, 58392, 61069], 0,
+    [28089, 61071], [34753, 61072], [61073, 147473], [29927, 61074],
+    [15835, 61075], [29046, 61076], [24740, 57702, 61077], [24988, 61078],
+    [15569, 61079], 0, [24695, 61081], 61082, [32625, 61083], 0,
+    [24809, 61086], [19326, 61087], [57344, 132423], [37595, 57345],
+    [57346, 132575], [57347, 147397], [34124, 57348], [17077, 57349],
+    [29679, 57350], [20917, 57351], [13897, 57352], [57353, 149826],
+    [57354, 166372], [37700, 57355], [57356, 137691], [33518, 57357],
+    [57358, 146632], [30780, 57359], [26436, 57360], [25311, 57361],
+    [57362, 149811], [57363, 166314], [57364, 131744], [57365, 158643],
+    [57366, 135941], [20395, 57367], [57368, 140525], [20488, 57369],
+    [57370, 159017], [57371, 162436], [57372, 144896], [57373, 150193],
+    [57374, 140563], 0, [57376, 131966], [24484, 57377], [57378, 131968],
+    [57379, 131911], [28379, 57380], [57381, 132127], 20702, [20737, 57383],
+    [13434, 57384], [20750, 57385], [39020, 57386], [14147, 57387],
+    [33814, 57388], [57389, 149924], [57390, 132231], [20832, 57391],
+    [57392, 144308], [20842, 57393], [57394, 134143], [57395, 139516],
+    [57396, 131813], [57397, 140592], [57398, 132494], [57399, 143923],
+    [57400, 137603], [23426, 57401], [34685, 57402], [57403, 132531],
+    [57404, 146585], [20914, 57405], [20920, 57406], [40244, 57407],
+    [20937, 57408], [20943, 57409], [20945, 57410], [15580, 57411],
+    [20947, 57412], [57413, 150182], [20915, 57414], 0, 0, [20973, 57417],
+    [33741, 57418], [26942, 57419], [57420, 145197], [24443, 57421],
+    [21003, 57422], [21030, 57423], [21052, 57424], [21173, 57425],
+    [21079, 57426], [21140, 57427], [21177, 57428], [21189, 57429],
+    [31765, 57430], [34114, 57431], [21216, 57432], [34317, 57433],
+    [57434, 158483], 0, [57436, 166622], [21833, 57437], [28377, 57438],
+    [57439, 147328], [57440, 133460], [57441, 147436], [21299, 57442], 0,
+    [57444, 134114], [27851, 57445], [57446, 136998], [26651, 57447],
+    [29653, 57448], [24650, 57449], [16042, 57450], [14540, 57451],
+    [57452, 136936], [29149, 57453], [17570, 57454], [21357, 57455],
+    [21364, 57456], [57457, 165547], [21374, 57458], 0, [57460, 136598],
+    [57461, 136723], [30694, 57462], [21395, 57463], [57464, 166555],
+    [21408, 57465], [21419, 57466], [21422, 57467], [29607, 57468],
+    [57469, 153458], [16217, 57470], [29596, 57471], [21441, 57472],
+    [21445, 57473], [27721, 57474], [20041, 57475], [22526, 57476],
+    [21465, 57477], [15019, 57478], [57479, 134031], [21472, 57480],
+    [57481, 147435], [57482, 142755], [21494, 57483], [57484, 134263],
+    [21523, 57485], [28793, 57486], [21803, 57487], [26199, 57488],
+    [27995, 57489], [21613, 57490], [57491, 158547], [57492, 134516],
+    [21853, 57493], [21647, 57494], [21668, 57495], [18342, 57496],
+    [57497, 136973], [57498, 134877], [15796, 57499], [57500, 134477],
+    [57501, 166332], [57502, 140952], [21831, 57503], [19693, 57504],
+    [21551, 57505], [29719, 57506], [21894, 57507], [21929, 57508], 0,
+    [57510, 137431], [57511, 147514], [17746, 57512], [57513, 148533],
+    [26291, 57514], [57515, 135348], [22071, 57516], [26317, 57517],
+    [57518, 144010], [26276, 57519], 0, [22093, 57521], [22095, 57522],
+    [30961, 57523], [22257, 57524], [38791, 57525], [21502, 57526],
+    [22272, 57527], [22255, 57528], [22253, 57529], [57530, 166758],
+    [13859, 57531], [57532, 135759], [22342, 57533], [57534, 147877],
+    [27758, 57535], [28811, 57536], [22338, 57537], [14001, 57538],
+    [57539, 158846], [22502, 57540], [57541, 136214], [22531, 57542],
+    [57543, 136276], [57544, 148323], [22566, 57545], [57546, 150517], 0,
+    [22698, 57548], [13665, 57549], [22752, 57550], [22748, 57551],
+    [57552, 135740], [22779, 57553], [23551, 57554], [22339, 57555],
+    [57556, 172368], [57557, 148088], [37843, 57558], [13729, 57559],
+    [22815, 57560], [26790, 57561], [14019, 57562], [28249, 57563],
+    [57564, 136766], [23076, 57565], 0, [57567, 136850], [34053, 57568],
+    [22985, 57569], [57570, 134478], [57571, 158849], [57572, 159018],
+    [57573, 137180], [23001, 57574], [57575, 137211], [57576, 137138],
+    [57577, 159142], [28017, 57578], [57579, 137256], [57580, 136917],
+    [23033, 57581], [57582, 159301], [23211, 57583], [23139, 57584],
+    [14054, 57585], [57586, 149929], 0, [14088, 57588], [23190, 57589],
+    [29797, 57590], [23251, 57591], [57592, 159649], [57593, 140628],
+    [57595, 137489], [14130, 57596], [57597, 136888], [24195, 57598],
+    [21200, 57599], [23414, 57600], [25992, 57601], [23420, 57602],
+    [57603, 162318], [16388, 57604], [18525, 57605], [57606, 131588],
+    [23509, 57607], [57609, 137780], [57610, 154060], [57611, 132517],
+    [23539, 57612], [23453, 57613], [19728, 57614], [23557, 57615],
+    [57616, 138052], [23571, 57617], [29646, 57618], [23572, 57619],
+    [57620, 138405], [57621, 158504], [23625, 57622], [18653, 57623],
+    [23685, 57624], [23785, 57625], [23791, 57626], [23947, 57627],
+    [57628, 138745], [57629, 138807], [23824, 57630], [23832, 57631],
+    [23878, 57632], [57633, 138916], [23738, 57634], [24023, 57635],
+    [33532, 57636], [14381, 57637], [57638, 149761], [57639, 139337],
+    [57640, 139635], [33415, 57641], [14390, 57642], [15298, 57643],
+    [24110, 57644], [27274, 57645], 0, 57647, [57648, 148668], [57649, 134355],
+    [21414, 57650], [20151, 57651], 0, [21416, 57653], [57654, 137073],
+    [24073, 57655], 57656, [57657, 164994], [24313, 57658], [24315, 57659],
+    [14496, 57660], [24316, 57661], [26686, 57662], [37915, 57663],
+    [24333, 57664], [57665, 131521], [57666, 194708], [15070, 57667],
+    [57669, 135994], [24378, 57670], [57671, 157832], [57672, 140240],
+    [57674, 140401], [24419, 57675], [57677, 159342], [24434, 57678],
+    [37696, 57679], [57680, 166454], [24487, 57681], [23990, 57682],
+    [15711, 57683], [57684, 152144], [57685, 139114], [57686, 159992],
+    [57687, 140904], [37334, 57688], [57689, 131742], [57690, 166441],
+    [24625, 57691], [26245, 57692], [14691, 57694], [15815, 57695],
+    [13881, 57696], [22416, 57697], [57698, 141236], [31089, 57699],
+    [15936, 57700], [24734, 57701], 0, 0, [57704, 149890], [57705, 149903],
+    [57706, 162387], [29860, 57707], [20705, 57708], [23200, 57709],
+    [24932, 57710], [24898, 57712], [57713, 194726], [57714, 159442],
+    [24961, 57715], [20980, 57716], [57717, 132694], [24967, 57718],
+    [23466, 57719], [57720, 147383], [57721, 141407], [25043, 57722],
+    [57723, 166813], [57724, 170333], [25040, 57725], [14642, 57726],
+    [57727, 141696], [57728, 141505], [24611, 57729], [24924, 57730],
+    [25886, 57731], [25483, 57732], [57733, 131352], [25285, 57734],
+    [57735, 137072], [25301, 57736], [57737, 142861], [25452, 57738],
+    [57739, 149983], [14871, 57740], [25656, 57741], [25592, 57742],
+    [57743, 136078], [57744, 137212], [28554, 57746], [57747, 142902], 0,
+    [57750, 153373], [25825, 57751], [25829, 57752], [38011, 57753],
+    [14950, 57754], [25658, 57755], [14935, 57756], [25933, 57757],
+    [28438, 57758], [57759, 150056], [57760, 150051], [25989, 57761],
+    [25965, 57762], [25951, 57763], 0, [26037, 57765], [57766, 149824],
+    [19255, 57767], [26065, 57768], [16600, 57769], [57770, 137257], 57771,
+    [26083, 57772], [24543, 57773], [57774, 144384], [26136, 57775],
+    [57776, 143863], [57777, 143864], [26180, 57778], [57779, 143780],
+    [57780, 143781], [26187, 57781], [57782, 134773], [26215, 57783],
+    [57784, 152038], [26227, 57785], 0, [57788, 143921], [57789, 165364],
+    [57790, 143816], [57791, 152339], [30661, 57792], [57793, 141559],
+    [39332, 57794], [26370, 57795], [57796, 148380], [57797, 150049],
+    [27130, 57799], [57800, 145346], 0, [26471, 57802], [26466, 57803],
+    [57804, 147917], [57805, 168173], [26583, 57806], [17641, 57807],
+    [26658, 57808], [28240, 57809], [37436, 57810], [26625, 57811],
+    [57812, 144358], [57813, 159136], [26717, 57814], [57815, 144495],
+    [27105, 57816], [27147, 57817], [57818, 166623], [26995, 57819],
+    [26819, 57820], [57821, 144845], [26881, 57822], [26880, 57823],
+    [14849, 57825], [57826, 144956], [15232, 57827], [26540, 57828],
+    [26977, 57829], [57830, 166474], [17148, 57831], [26934, 57832],
+    [27032, 57833], [15265, 57834], [57835, 132041], [33635, 57836],
+    [20624, 57837], [27129, 57838], [57839, 144985], [57840, 139562],
+    [27205, 57841], [57842, 145155], [27293, 57843], [15347, 57844],
+    [26545, 57845], [27336, 57846], [57847, 168348], [15373, 57848],
+    [27421, 57849], [57850, 133411], [24798, 57851, 60308], [27445, 57852],
+    [27508, 57853], [57854, 141261], [28341, 57855], [57856, 146139], 0,
+    [57858, 137560], [14144, 57859], [21537, 57860], [57861, 146266],
+    [27617, 57862], [57863, 147196], [27612, 57864], [27703, 57865],
+    [57866, 140427], [57867, 149745], [57868, 158545], [27738, 57869],
+    [33318, 57870], [27769, 57871], [57872, 146876], [17605, 57873],
+    [57874, 146877], [57875, 147876], [57876, 149772], [57877, 149760],
+    [57878, 146633], [14053, 57879], [15595, 57880], [57881, 134450],
+    [39811, 57882], [57883, 143865], [57884, 140433], [32655, 57885],
+    [26679, 57886], [57887, 159013], [57888, 159137], [57889, 159211],
+    [28054, 57890], [27996, 57891], [28284, 57892], [28420, 57893],
+    [57894, 149887], [57895, 147589], [57896, 159346], [34099, 57897],
+    [57898, 159604], [20935, 57899], 0, 0, [33838, 57902], [57903, 166689], 0,
+    [57905, 146991], [29779, 57906], [57907, 147330], [31180, 57908],
+    [28239, 57909], [23185, 57910], [57911, 143435], [28664, 57912],
+    [14093, 57913], [28573, 57914], [57915, 146992], [28410, 57916],
+    [57917, 136343], [57918, 147517], [17749, 57919], [37872, 57920],
+    [28484, 57921], [28508, 57922], [15694, 57923], [28532, 57924],
+    [57925, 168304], [15675, 57926], [28575, 57927], [57928, 147780],
+    [28627, 57929], [57930, 147601], [57931, 147797], [57932, 147513],
+    [57933, 147440], [57934, 147380], [57935, 147775], [20959, 57936],
+    [57937, 147798], [57938, 147799], [57939, 147776], [57940, 156125],
+    [28747, 57941], [28798, 57942], [28839, 57943], 0, [28876, 57945],
+    [28885, 57946], [28886, 57947], [28895, 57948], [16644, 57949],
+    [15848, 57950], [29108, 57951], [29078, 57952], [57953, 148087],
+    [28971, 57954], [28997, 57955], [23176, 57956], [29002, 57957], 0,
+    [57960, 148325], [29007, 57961], [37730, 57962], [57963, 148161],
+    [28972, 57964], [57965, 148570], [57966, 150055], [57967, 150050],
+    [29114, 57968], [57969, 166888], [28861, 57970], [29198, 57971],
+    [37954, 57972], [29205, 57973], [22801, 57974], [37955, 57975],
+    [29220, 57976], [37697, 57977], [57978, 153093], [29230, 57979],
+    [29248, 57980], [57981, 149876], [26813, 57982], [29269, 57983],
+    [29271, 57984], [15957, 57985], [57986, 143428], [26637, 57987],
+    [28477, 57988], [29314, 57989], 0, [29483, 57991], [57992, 149539],
+    [57993, 165931], [18669, 57994], [57995, 165892], [29480, 57996],
+    [29486, 57997], [29647, 57998], [29610, 57999], [58000, 134202],
+    [58001, 158254], [29641, 58002], [29769, 58003], [58004, 147938],
+    [58005, 136935], [58006, 150052], [26147, 58007], [14021, 58008],
+    [58009, 149943], [58010, 149901], [58011, 150011], [29687, 58012],
+    [29717, 58013], [26883, 58014], [58015, 150054], [29753, 58016],
+    [16087, 58018], 0, [58020, 141485], [29792, 58021], [58022, 167602],
+    [29767, 58023], [29668, 58024], [29814, 58025], [33721, 58026],
+    [29804, 58027], [29812, 58029], [37873, 58030], [27180, 58031],
+    [29826, 58032], [18771, 58033], [58034, 150156], [58035, 147807],
+    [58036, 150137], [58037, 166799], [23366, 58038], [58039, 166915],
+    [58040, 137374], [29896, 58041], [58042, 137608], [29966, 58043],
+    [29982, 58045], [58046, 167641], [58047, 137803], [23511, 58048],
+    [58049, 167596], [37765, 58050], [30029, 58051], [30026, 58052],
+    [30055, 58053], [30062, 58054], [58055, 151426], [16132, 58056],
+    [58057, 150803], [30094, 58058], [29789, 58059], [30110, 58060],
+    [30132, 58061], [30210, 58062], [30252, 58063], [30289, 58064],
+    [30287, 58065], [30319, 58066], 58067, [58068, 156661], [30352, 58069],
+    [33263, 58070], [14328, 58071], [58072, 157969], [58073, 157966],
+    [30369, 58074], [30373, 58075], [30391, 58076], [30412, 58077],
+    [58078, 159647], [33890, 58079], [58080, 151709], [58081, 151933],
+    [58082, 138780], [30494, 58083], [30502, 58084], [30528, 58085],
+    [25775, 58086], [58087, 152096], [30552, 58088], [58089, 144044],
+    [30639, 58090], [58091, 166244], [58092, 166248], [58093, 136897],
+    [30708, 58094], 0, [26826, 58098], [30895, 58099], [30919, 58100],
+    [30931, 58101], [38565, 58102], [31022, 58103], [58104, 153056],
+    [30935, 58105], [31028, 58106], [30897, 58107], [58108, 161292],
+    [36792, 58109], [34948, 58110], [58113, 140828], [31110, 58114],
+    [35072, 58115], [26882, 58116], [31104, 58117], [58118, 153687],
+    [31133, 58119], [58120, 162617], [31036, 58121], [31145, 58122],
+    [28202, 58123], [58124, 160038], [16040, 58125], [31174, 58126],
+    [58127, 168205], [31188, 58128], 0, [21797, 62526], 0, [62528, 134210],
+    [62529, 134421], [62530, 151851], [21904, 62531], [62532, 142534],
+    [14828, 62533], [62534, 131905], [36422, 62535], [62536, 150968],
+    [62537, 169189], 0, [62539, 164030], [30586, 62540], [62541, 142392],
+    [14900, 62542], [18389, 62543], [62544, 164189], [62545, 158194],
+    [62546, 151018], [25821, 62547], [62548, 134524], [62549, 135092],
+    [62550, 134357], 0, [25741, 62552], [36478, 62553], [62554, 134806], 0,
+    [62556, 135012], [62557, 142505], [62558, 164438], [62559, 148691], 0,
+    [62561, 134470], [62562, 170573], [62563, 164073], [18420, 62564],
+    [62565, 151207], [62566, 142530], [39602, 62567], [14951, 62568],
+    [62569, 169460], [16365, 62570], [13574, 62571], [62572, 152263],
+    [62573, 169940], 0, [62575, 142660], [40302, 62576], [38933, 62577], 0,
+    [17369, 62579], 0, [25780, 62581], [21731, 62582], 0, [62584, 142282], 0,
+    [14843, 62586], 0, [62588, 157402], [62589, 157462], [62590, 162208],
+    [25834, 62591], [62592, 151634], [62593, 134211], [36456, 62594], 0,
+    [62596, 166732], [62597, 132913], 0, [18443, 62599], [62600, 131497],
+    [16378, 62601], [22643, 62602], [62603, 142733], 0, [62605, 148936],
+    [62606, 132348], [62607, 155799], [62608, 134988], 0, [21881, 62610], 0,
+    [17338, 62612], 0, [19124, 62614], [62615, 141926], [62616, 135325],
+    [33194, 62617], [39157, 62618], [62619, 134556], [25465, 62620],
+    [14846, 62621], [62622, 141173], [36288, 62623], [22177, 62624],
+    [25724, 62625], [15939, 62626], 0, [62628, 173569], [62629, 134665],
+    [62630, 142031], 0, 0, [62633, 135368], [62634, 145858], [14738, 62635],
+    [14854, 62636], [62637, 164507], [13688, 62638], [62639, 155209],
+    [62640, 139463], 0, 0, [62643, 142514], [62644, 169760], [13500, 62645],
+    [27709, 62646], [62647, 151099], 0, 0, [62650, 161140], [62651, 142987],
+    [62652, 139784], [62653, 173659], [62654, 167117], [62655, 134778],
+    [62656, 134196], [62683, 161337], [62684, 142286], [62687, 142417],
+    [14872, 62689], [62691, 135367], [62693, 173618], [62695, 167122],
+    [62696, 167321], [62697, 167114], [38314, 62698], 0, [62706, 161630],
+    [28992, 62708], 0, [20822, 62385], 0, [20616, 62487], 0, [13459, 62489],
+    [20870, 62491], [24130, 63037], [20997, 62495], [21031, 62436],
+    [21113, 62497], 0, [13651, 62504], [21442, 62505], [21343, 62715], 0,
+    [21823, 62520], 0, [21976, 59986], [13789, 62722], [22049, 63067], 0,
+    [22100, 60044], [60148, 135291], 0, [60153, 135379], 0, [61095, 135934], 0,
+    0, [14265, 60104], [23745, 61099], [23829, 63066], [23894, 63030],
+    [14392, 63036], [20097, 62477], [24253, 63038], [14612, 63042],
+    [25017, 63050], [25232, 63054], [25368, 63056], [25690, 63063],
+    [25745, 62381], [33133, 62709], [33156, 59922], [33171, 59924],
+    [26624, 63080], [15292, 63093], [29327, 60517], [29389, 59781], 0,
+    [29497, 59785], [30018, 59811], [30172, 59817], [16320, 59818],
+    [60278, 151205], [16343, 59820], 0, 30336, [30348, 59824, 151388],
+    [16552, 59845], [30777, 59846], [16643, 59855], [31377, 59863],
+    [31771, 59876], [31981, 59884], [32659, 62658], [32686, 59892], 0,
+    [33535, 59936], [22623, 59981], [34482, 59960], 0, [34699, 59963],
+    [35143, 59969], 0, [35369, 59972], 0, [36465, 59988], [60484, 164233],
+    [36528, 59990], 0, [37214, 62443], [37260, 62441], [39182, 60051],
+    [39196, 60054], 0, 0, [39809, 60066], [40384, 60080], [40339, 60078],
+    [40620, 60085], [19857, 60540], 0, 37818, [40571, 60084], [28809, 63148],
+    [29512, 59788], 0, [31129, 59858], [36791, 59997], 0, [39234, 60056],
+    {s: 193}, 8364, {s: 4}, [12443, 63518], [12444, 63519], [11904, 63520],
+    {f: 5, c: 62211}, [62216, 131340], 62217, [62218, 131281], [62219, 131277],
+    {f: 2, c: 62220}, [62222, 131275], [62223, 139240], 62224, [62225, 131274],
+    {f: 4, c: 62226}, [62230, 131342], {f: 2, c: 62231}, {f: 2, c: 62776},
+    [62778, 138177], [62779, 194680], [12205, 38737, 62780], [62781, 131206],
+    [20059, 62782], [20155, 62783], [13630, 62784], [23587, 62785],
+    [24401, 62786], [24516, 62787], [14586, 62788], [25164, 62789],
+    [25909, 62790], [27514, 62791], [27701, 62792], [27706, 62793],
+    [28780, 62794], [29227, 62795], [20012, 62796], [29357, 62797],
+    [62798, 149737], [32594, 62799], [31035, 62800], [31993, 62801],
+    [32595, 62802], [62803, 156266], [13505, 62804], [62806, 156491],
+    [32770, 62807], [32896, 62808], [62809, 157202], [62810, 158033],
+    [21341, 62811], [34916, 62812], [35265, 62813], [62814, 161970],
+    [35744, 62815], [36125, 62816], [38021, 62817], [38264, 62818],
+    [38271, 62819], [38376, 62820], [62821, 167439], [38886, 62822],
+    [39029, 62823], [39118, 62824], [39134, 62825], [39267, 62826],
+    [62827, 170000], [40060, 62828], [40479, 62829], [40644, 62830],
+    [27503, 62831], [62832, 63751], [20023, 62833], [62834, 131207],
+    [38429, 62835], [25143, 62836], [38050, 62837], [11908, 63521],
+    [11910, 63522], [11911, 63523], [11912, 63524], [11914, 63525],
+    [11916, 63526], [11917, 63527], [11925, 63528], [11932, 63529],
+    [11941, 63531], [11943, 63532], [11946, 63533], [11948, 63534],
+    [11950, 63535], [11958, 63536], [11964, 63537], [11966, 63538],
+    [11978, 63540], [11980, 63541], [11981, 63542], [11983, 63543],
+    [11990, 63544], [11991, 63545], [11998, 63546], [62368, 172969],
+    [62369, 135493], [25866, 62371], [20029, 62374], [28381, 62375],
+    [40270, 62376], [37343, 62377], [62380, 161589], [20250, 62382],
+    [20264, 62383], [20392, 62384], [20852, 62386], [20892, 62387],
+    [20964, 62388], [21153, 62389], [21160, 62390], [21307, 62391],
+    [21326, 62392], [21457, 62393], [21464, 62394], [22242, 62395],
+    [22768, 62396], [22788, 62397], [22791, 62398], [22834, 62399],
+    [22836, 62400], [23398, 62401], [23454, 62402], [23455, 62403],
+    [23706, 62404], [24198, 62405], [24635, 62406], [25993, 62407],
+    [26622, 62408], [26628, 62409], [26725, 62410], [27982, 62411],
+    [28860, 62412], [30005, 62413], [32420, 62414], [32428, 62415],
+    [32442, 62416], [32455, 62417], [32463, 62418], [32479, 62419],
+    [32518, 62420], [32567, 62421], [33402, 62422], [33487, 62423],
+    [33647, 62424], [35270, 62425], [35774, 62426], [35810, 62427],
+    [36710, 62428], [36711, 62429], [36718, 62430], [29713, 62431],
+    [31996, 62432], [32205, 62433], [26950, 62434], [31433, 62435],
+    [30904, 62442], [32956, 62444], [36107, 62446], [33014, 62447],
+    [62448, 133607], [32927, 62451], [40647, 62452], [19661, 62453],
+    [40393, 62454], [40460, 62455], [19518, 62456], [62457, 171510],
+    [62458, 159758], [40458, 62459], [62460, 172339], [13761, 62461],
+    [28314, 62463], [33342, 62464], [29977, 62465], [18705, 62467],
+    [39532, 62468], [39567, 62469], [40857, 62470], [31111, 62471],
+    [62472, 164972], [62473, 138698], [62474, 132560], [62475, 142054],
+    [20004, 62476], [20096, 62478], [20103, 62479], [20159, 62480],
+    [20203, 62481], [20279, 62482], [13388, 62483], [20413, 62484],
+    [15944, 62485], [20483, 62486], [13437, 62488], [13477, 62490],
+    [22789, 62492], [20955, 62493], [20988, 62494], [20105, 62496],
+    [21136, 62498], [21287, 62499], [13767, 62500], [21417, 62501],
+    [13649, 62502], [21424, 62503], [21539, 62506], [13677, 62507],
+    [13682, 62508], [13953, 62509], [21651, 62510], [21667, 62511],
+    [21684, 62512], [21689, 62513], [21712, 62514], [21743, 62515],
+    [21784, 62516], [21795, 62517], [21800, 62518], [13720, 62519],
+    [13733, 62521], [13759, 62522], [21975, 62523], [13765, 62524],
+    [62525, 163204], [16467, 62538], [62551, 135412], [62555, 134155],
+    [62574, 161992], [62580, 155813], [62583, 142668], [62585, 135287],
+    [62587, 135279], [62595, 139681], [62609, 134550], [16571, 62611],
+    [62631, 142537], [22098, 62641], [62642, 134961], [62657, 157724],
+    [62659, 135375], [62660, 141315], [62661, 141625], [13819, 62662],
+    [62663, 152035], [62664, 134796], [62665, 135053], [62666, 134826],
+    [16275, 62667], [62668, 134960], [62669, 134471], [62670, 135503],
+    [62671, 134732], [62673, 134827], [62674, 134057], [62675, 134472],
+    [62676, 135360], [62677, 135485], [16377, 62678], [62679, 140950],
+    [25650, 62680], [62681, 135085], [62682, 144372], [62685, 134526],
+    [62686, 134527], [62688, 142421], [62690, 134808], [62692, 134958],
+    [62694, 158544], [21708, 62699], [33476, 62700], [21945, 62701],
+    [62703, 171715], [39974, 62704], [39606, 62705], [62707, 142830],
+    [33004, 62710], [23580, 62711], [62712, 157042], [33076, 62713],
+    [14231, 62714], [62716, 164029], [37302, 62717], [62718, 134906],
+    [62719, 134671], [62720, 134775], [62721, 134907], [62723, 151019],
+    [13833, 62724], [62725, 134358], [22191, 62726], [62727, 141237],
+    [62728, 135369], [62729, 134672], [62730, 134776], [62731, 135288],
+    [62732, 135496], [62733, 164359], [62734, 136277], [62735, 134777],
+    [62736, 151120], [62737, 142756], [23124, 62738], [62739, 135197],
+    [62740, 135198], [62741, 135413], [62742, 135414], [22428, 62743],
+    [62744, 134673], [62745, 161428], [62746, 164557], [62747, 135093],
+    [62748, 134779], [62749, 151934], [14083, 62750], [62751, 135094],
+    [62752, 135552], [62753, 152280], [62754, 172733], [62755, 149978],
+    [62756, 137274], [62757, 147831], [62758, 164476], [22681, 62759],
+    [21096, 62760], [13850, 62761], [62762, 153405], [31666, 62763],
+    [23400, 62764], [18432, 62765], [19244, 62766], [40743, 62767],
+    [18919, 62768], [39967, 62769], [39821, 62770], [62771, 154484],
+    [62772, 143677], [22011, 62773], [13810, 62774], [22153, 62775],
+    [23870, 63028], [23880, 63029], [15868, 63031], [14351, 63032],
+    [23972, 63033], [23993, 63034], [14368, 63035], [24357, 63039],
+    [24451, 63040], [14600, 63041], [14655, 63043], [14669, 63044],
+    [24791, 63045], [24893, 63046], [23781, 63047], [14729, 63048],
+    [25015, 63049], [25039, 63051], [14776, 63052], [25132, 63053],
+    [25317, 63055], [14840, 63057], [22193, 63058], [14851, 63059],
+    [25570, 63060], [25595, 63061], [25607, 63062], [14923, 63064],
+    [25792, 63065], [40863, 63068], [14999, 63069], [25990, 63070],
+    [15037, 63071], [26111, 63072], [26195, 63073], [15090, 63074],
+    [26258, 63075], [15138, 63076], [26390, 63077], [15170, 63078],
+    [26532, 63079], [15192, 63081], [26698, 63082], [26756, 63083],
+    [15218, 63084], [15217, 63085], [15227, 63086], [26889, 63087],
+    [26947, 63088], [29276, 63089], [26980, 63090], [27039, 63091],
+    [27013, 63092], [27094, 63094], [15325, 63095], [27237, 63096],
+    [27252, 63097], [27249, 63098], [27266, 63099], [15340, 63100],
+    [27289, 63101], [15346, 63102], [27307, 63103], [27317, 63104],
+    [27348, 63105], [27382, 63106], [27521, 63107], [27585, 63108],
+    [27626, 63109], [27765, 63110], [27818, 63111], [15563, 63112],
+    [27906, 63113], [27910, 63114], [27942, 63115], [28033, 63116],
+    [15599, 63117], [28068, 63118], [28081, 63119], [28181, 63120],
+    [28184, 63121], [28201, 63122], [28294, 63123], [63124, 166336],
+    [28347, 63125], [28386, 63126], [28378, 63127], [40831, 63128],
+    [28392, 63129], [28393, 63130], [28452, 63131], [28468, 63132],
+    [15686, 63133], [63134, 147265], [28545, 63135], [28606, 63136],
+    [15722, 63137], [15733, 63138], [29111, 63139], [23705, 63140],
+    [15754, 63141], [28716, 63142], [15761, 63143], [28752, 63144],
+    [28756, 63145], [28783, 63146], [28799, 63147], [63149, 131877],
+    [17345, 63150], [13809, 63151], [63152, 134872], [13902, 58134],
+    [15789, 58172], [58173, 154725], [26237, 58183], [31860, 58188],
+    [29837, 58197], [32402, 58215], [17667, 58232], [58260, 151480],
+    [58270, 133901], [58277, 158474], [13438, 58311], [58317, 143087],
+    [58325, 146613], [58343, 159385], [34673, 58364], [25537, 58385],
+    [30583, 58387], [35210, 58390], [58406, 147343], [35660, 58415],
+    [58440, 150729], [18730, 58464], [58471, 172052], [58472, 165564],
+    [58473, 165121], [15088, 58490], [28815, 58511], [58529, 140922],
+    [58637, 158120], [58646, 148043], [26760, 58662], [58664, 139611],
+    [40802, 58702], [37830, 58793], [58802, 131967], [37734, 58888],
+    [37519, 58901], [34324, 58954], [58986, 173147], [16784, 59010],
+    [26511, 59045], [26654, 59048], [14435, 59051], [59077, 149996],
+    [15129, 59128], [33942, 59176], [59241, 149858], [14818, 59254],
+    [33920, 59259], [17262, 59328], [38769, 59402], [39323, 59427],
+    [18733, 59499], [28439, 59703], [59704, 160009], [28838, 59746],
+    [59752, 150095], [32357, 59753], [23855, 59755], [15859, 59756],
+    [59758, 150109], [59759, 137183], [32164, 59760], [33830, 59761],
+    [21637, 59762], [59763, 146170], [59765, 131604], [22398, 59766],
+    [59767, 133333], [59768, 132633], [16357, 59769], [59770, 139166],
+    [59771, 172726], [28675, 59772], [59773, 168283], [23920, 59774],
+    [29583, 59775], [59777, 166489], [59778, 168992], [20424, 59779],
+    [32743, 59780], [29456, 59782], [29496, 59784], [29505, 59787],
+    [16041, 59789], [29173, 59792], [59793, 149746], [29665, 59794],
+    [16074, 59796], [16081, 59798], [29721, 59801], [29726, 59802],
+    [29727, 59803], [16098, 59804], [16112, 59805], [16116, 59806],
+    [16122, 59807], [29907, 59808], [16142, 59809], [16211, 59810],
+    [30061, 59812], [30066, 59813], [30093, 59814], [16252, 59815],
+    [30152, 59816], [30285, 59819], [30324, 59821], [16348, 59822],
+    [30330, 59823], [29064, 59825], [22051, 59826], [35200, 59827],
+    [16413, 59829], [30531, 59830], [16441, 59831], [16453, 59833],
+    [13787, 59834], [30616, 59835], [16490, 59836], [16495, 59837],
+    [30654, 59839], [30667, 59840], [30744, 59842], [30748, 59844],
+    [30791, 59847], [30801, 59848], [30822, 59849], [33864, 59850],
+    [59851, 152885], [31027, 59852], [31026, 59854], [16649, 59856],
+    [31121, 59857], [31238, 59860], [16743, 59862], [16818, 59864],
+    [31420, 59865], [33401, 59866], [16836, 59867], [31439, 59868],
+    [31451, 59869], [16847, 59870], [31586, 59872], [31596, 59873],
+    [31611, 59874], [31762, 59875], [16992, 59877], [17018, 59878],
+    [31867, 59879], [31900, 59880], [17036, 59881], [31928, 59882],
+    [17044, 59883], [36755, 59885], [28864, 59886], [59887, 134351],
+    [32207, 59888], [32212, 59889], [32208, 59890], [32253, 59891],
+    [32692, 59893], [29343, 59894], [17303, 59895], [32800, 59896],
+    [32805, 59897], [32814, 59899], [32817, 59900], [32852, 59901],
+    [22452, 59903], [28832, 59904], [32951, 59905], [33001, 59906],
+    [17389, 59907], [33036, 59908], [33038, 59910], [33042, 59911],
+    [33044, 59913], [17409, 59914], [15161, 59915], [33110, 59916],
+    [33113, 59917], [33114, 59918], [17427, 59919], [33148, 59921],
+    [17445, 59923], [17453, 59925], [33189, 59926], [22511, 59927],
+    [33217, 59928], [33252, 59929], [33364, 59930], [17551, 59931],
+    [33398, 59933], [33482, 59934], [33496, 59935], [17584, 59937],
+    [33623, 59938], [38505, 59939], [33797, 59941], [28917, 59942],
+    [33892, 59943], [33928, 59945], [17668, 59946], [33982, 59947],
+    [34017, 59948], [34040, 59949], [34064, 59950], [34104, 59951],
+    [34130, 59952], [17723, 59953], [34159, 59954], [34160, 59955],
+    [34272, 59956], [17783, 59957], [34418, 59958], [34450, 59959],
+    [34543, 59961], [38469, 59962], [17926, 59964], [17943, 59965],
+    [34990, 59966], [35071, 59967], [35108, 59968], [35217, 59970],
+    [59971, 162151], [35384, 59973], [35476, 59974], [35508, 59975],
+    [35921, 59976], [36052, 59977], [36082, 59978], [36124, 59979],
+    [18328, 59980], [36291, 59982], [18413, 59983], [36410, 59985],
+    [22356, 59987], [22005, 59989], [18487, 59991], [36558, 59992],
+    [36578, 59993], [36580, 59994], [36589, 59995], [36594, 59996],
+    [36801, 59998], [36810, 59999], [36812, 60000], [36915, 60001],
+    [18605, 60003], [39136, 60004], [37395, 60005], [18718, 60006],
+    [37416, 60007], [37464, 60008], [37483, 60009], [37553, 60010],
+    [37550, 60011], [37567, 60012], [37603, 60013], [37611, 60014],
+    [37619, 60015], [37620, 60016], [37629, 60017], [37699, 60018],
+    [37764, 60019], [37805, 60020], [18757, 60021], [18769, 60022],
+    [37911, 60024], [37917, 60026], [37933, 60027], [37950, 60028],
+    [18794, 60029], [37972, 60030], [38009, 60031], [38189, 60032],
+    [38306, 60033], [18855, 60034], [38388, 60035], [38451, 60036],
+    [18917, 60037], [18980, 60039], [38720, 60040], [18997, 60041],
+    [38834, 60042], [38850, 60043], [19172, 60045], [39097, 60047],
+    [19225, 60048], [39153, 60049], [22596, 60050], [39193, 60052],
+    [39223, 60055], [39261, 60057], [39266, 60058], [19312, 60059],
+    [39365, 60060], [19357, 60061], [39484, 60062], [39695, 60063],
+    [39785, 60065], [39901, 60067], [39921, 60068], [39924, 60069],
+    [19565, 60070], [39968, 60071], [14191, 60072], [60073, 138178],
+    [40265, 60074], [40702, 60076], [22096, 60077], [40381, 60079],
+    [40444, 60081], [38134, 60082], [36790, 60083], [40625, 60086],
+    [40637, 60087], [40646, 60088], [38108, 60089], [40674, 60090],
+    [40689, 60091], [40696, 60092], [40772, 60094], [60095, 131220],
+    [60096, 131767], [60097, 132000], [38083, 60099], [60101, 132311],
+    [38081, 60103], [60105, 132565], [60106, 132629], [60107, 132726],
+    [60108, 136890], [22359, 60109], [29043, 60110], [60111, 133826],
+    [60112, 133837], [60113, 134079], [60115, 194619], [60116, 134091],
+    [21662, 60117], [60118, 134139], [60119, 134203], [60120, 134227],
+    [60121, 134245], [60122, 134268], [60124, 134285], [60126, 134325],
+    [60127, 134365], [60128, 134381], [60129, 134511], [60130, 134578],
+    [60131, 134600], [60135, 134660], [60136, 134670], [60137, 134871],
+    [60138, 135056], [60139, 134957], [60140, 134771], [60142, 135100],
+    [60144, 135260], [60145, 135247], [60146, 135286], [60149, 135304],
+    [60150, 135318], [13895, 60151], [60152, 135359], [60154, 135471],
+    [60155, 135483], [21348, 60156], [60158, 135907], [60159, 136053],
+    [60160, 135990], [60162, 136567], [60163, 136729], [60164, 137155],
+    [60165, 137159], [28859, 60167], [60168, 137261], [60169, 137578],
+    [60170, 137773], [60171, 137797], [60172, 138282], [60173, 138352],
+    [60174, 138412], [60175, 138952], [60177, 138965], [60178, 139029],
+    [29080, 60179], [60181, 139333], [27113, 60182], [14024, 60183],
+    [60184, 139900], [60185, 140247], [60186, 140282], [60187, 141098],
+    [60188, 141425], [60189, 141647], [60191, 141671], [60192, 141715],
+    [60193, 142037], [60195, 142056], [60197, 142094], [60199, 142143],
+    [60202, 142412], [60204, 142472], [60205, 142519], [60206, 154600],
+    [60207, 142600], [60208, 142610], [60209, 142775], [60210, 142741],
+    [60211, 142914], [60212, 143220], [60213, 143308], [60214, 143411],
+    [60215, 143462], [60216, 144159], [60217, 144350], [60222, 144743],
+    [60223, 144883], [60227, 144922], [60228, 145174], [22709, 60231],
+    [60234, 146087], [60237, 146961], [60238, 147129], [60243, 147737],
+    [60245, 148206], [60246, 148237], [60248, 148276], [60249, 148374],
+    [60258, 148484], [60259, 148694], [22408, 60260], [60261, 149108],
+    [60263, 149295], [60271, 149522], [60272, 149755], [60273, 150037],
+    [60275, 150208], [22885, 60277], [60279, 151430], [60282, 151596],
+    [22335, 60284], [60286, 152217], [60287, 152601], [60291, 152646],
+    [60292, 152686], [60296, 152895], [60298, 152926], [60300, 152930],
+    [60301, 152934], [60302, 153543], [60304, 153693], [60309, 153859],
+    [60312, 154286], [60313, 154505], [60314, 154630], [22433, 60316],
+    [29009, 60317], [60319, 155906], [60322, 156082], [60325, 156674],
+    [60326, 156746], [60330, 156804], [60334, 156808], [60336, 156946],
+    [60338, 157119], [60339, 157365], [22201, 60347], [60349, 157436],
+    [13848, 60355], [60357, 157593], [60358, 157806], [60360, 157790],
+    [60362, 157895], [60366, 157990], [60368, 158009], [60371, 158202],
+    [60373, 158253], [60378, 158260], [60379, 158555], [60383, 158621],
+    [60385, 158884], [60388, 159150], [60392, 159819], [60393, 160205],
+    [60395, 160384], [60396, 160389], [60399, 160395], [60401, 160486],
+    [38047, 60404], [60405, 160848], [14009, 60416], [60424, 161740],
+    [60425, 161880], [22230, 60426], [60435, 162269], [60441, 162301],
+    [60442, 162314], [60443, 162571], [60444, 163174], [60448, 163849],
+    [60459, 163875], [60463, 163912], [60466, 163971], [60479, 163984],
+    [60480, 164084], [60481, 164142], [60483, 164175], [60485, 164271],
+    [60486, 164378], [60487, 164614], [60488, 164655], [60489, 164746],
+    [60491, 164968], [60492, 165546], [25574, 60494], [60495, 166230],
+    [60498, 166328], [60500, 166375], [60502, 166376], [60503, 166726],
+    [60504, 166868], [60506, 166921], [60508, 167877], [60509, 168172],
+    [60511, 168208], [60512, 168252], [15863, 60513], [60514, 168286],
+    [60515, 150218], [36816, 60516], [60519, 169191], [60521, 169392],
+    [60522, 169400], [60523, 169778], [60524, 170193], [60525, 170313],
+    [60526, 170346], [60527, 170435], [60528, 170536], [60529, 170766],
+    [60530, 171354], [60531, 171419], [32415, 60532], [60533, 171768],
+    [60534, 171811], [19620, 60535], [38215, 60536], [60537, 172691],
+    [29090, 60538], [60539, 172799], [60542, 173515], [19868, 60543],
+    [60544, 134300], [36798, 60545], [36794, 60547], [60548, 140464],
+    [36793, 60549], [60550, 150163], [20202, 60555], [60557, 166700],
+    [36480, 60560], [60561, 137205], [60563, 166764], [60564, 166809],
+    [60566, 157359], [60568, 161365], [60570, 153141], [60571, 153942],
+    [20122, 60572], [60573, 155265], [60576, 134765], [60579, 147080],
+    [60580, 150686], [60583, 137206], [60584, 137339], [60587, 154698],
+    [60589, 152337], [15814, 60590], [60596, 155352], [19996, 60600],
+    [60601, 135146], [60602, 134473], [60603, 145082], [60638, 151880],
+    [21982, 60644], [34694, 60672], [60676, 135361], [60679, 149254],
+    [23440, 60680], [60682, 157843], [60684, 141044], [60685, 163119],
+    [60686, 147875], [60687, 163187], [60688, 159440], [60689, 160438],
+    [60691, 135641], [60693, 146684], [60694, 173737], [60695, 134828],
+    [60698, 138402], [60700, 151490], [60702, 135147], [60706, 142752],
+    [60710, 135148], [60711, 134666], [60714, 135149], [60717, 135559],
+    [19994, 60721], [19972, 60722], [23309, 60724], [13996, 60727],
+    [21373, 60729], [13989, 60730], [22682, 60732], [60733, 150382],
+    [22442, 60736], [60737, 154261], [60738, 133497], [60741, 140389],
+    [60746, 146686], [60747, 171824], [60749, 151465], [60750, 169374],
+    [60753, 146870], [60755, 157619], [60756, 145184], [60759, 147191],
+    [60760, 146988], [60785, 143578], [60789, 135849], [22439, 60790],
+    [60791, 149859], [60794, 159918], [60801, 137068], [60806, 160100],
+    [60809, 159010], [60810, 150242], [39963, 60837], [60838, 149822],
+    [15878, 60846], [60881, 159011], [60887, 132092], [60891, 146685],
+    [60893, 149785], [22394, 60904], [21722, 60912], [29050, 60928],
+    [60949, 150135], [60955, 166490], [60962, 194624], [60976, 137275],
+    [61000, 155993], [61014, 144373], [61019, 166850], [61024, 138566],
+    [61054, 159441], [13877, 61065], [61084, 166701], [21024, 61088],
+    [15384, 61089], [61090, 146631], [61091, 155351], [61092, 161366],
+    [61093, 152881], [61094, 137540], [61096, 170243], [61097, 159196],
+    [61098, 159917], [61100, 156077], [61101, 166415], [61102, 145015],
+    [61103, 131310], [61104, 157766], [61105, 151310], [17762, 61106],
+    [23327, 61107], [61108, 156492], [40784, 61109], [40614, 61110],
+    [61111, 156267], [20962, 57415], [21314, 57416], [26285, 57520],
+    [22620, 57547], [21843, 57566], [15749, 57594], [24928, 57608],
+    [18606, 57668], [38845, 57676], [57693, 137335], [24755, 57703],
+    [33828, 57711], [38932, 57748], [57749, 147596], [57764, 143486],
+    [57787, 138813], [15147, 57798], [15666, 57824], [57857, 132021],
+    [28801, 57944], [23708, 57959], [58017, 132547], [14128, 58028],
+    [58096, 136054], [58097, 150034], [58111, 166699], [58112, 155779],
+    [256, 62233], [193, 62234], [461, 62235], [192, 62236], [274, 62237],
+    [201, 62238], [282, 62239], [200, 62240], [332, 62241], [211, 62242],
+    [465, 62243], [210, 62244], 62245, [7870, 62246], 62247, [7872, 62248],
+    [202, 62249], [257, 62250], [225, 62251], [462, 62252], [224, 62253],
+    [593, 62254], [275, 62255], [233, 62256], [283, 62257], [232, 62258],
+    [299, 62259], [237, 62260], [464, 62261], [236, 62262], [333, 62263],
+    [243, 62264], [466, 62265], [242, 62266], [363, 62267], [250, 62268],
+    [468, 62269], [249, 62270], [470, 62271], [472, 62272], [474, 62273],
+    [476, 62274], [252, 62275], 62276, [7871, 62277], 62278, [7873, 62279],
+    [234, 62280], [609, 62281], [643, 63551], [592, 63552], [603, 63553],
+    [596, 63554], [629, 63555], [339, 63556], [248, 63557], [331, 63558],
+    [650, 63559], [618, 63560], {f: 2, c: 62282}, [11933, 63530],
+    [11974, 63539], [12003, 63547], 20539, 28158, [62841, 171123], 62842,
+    [15817, 62843], 34959, [62845, 147790], 28791, 23797, [19232, 62848],
+    [62849, 152013], [13657, 62850], [62851, 154928], 24866, [62853, 166450],
+    36775, 37366, 29073, 26393, 29626, [62859, 144001], [62860, 172295],
+    [15499, 62861], [62862, 137600], [19216, 62863], 30948, 29698, 20910,
+    [62867, 165647], [16393, 62868], 27235, [62870, 172730], [16931, 62871],
+    34319, 31274, [62875, 170311], [62876, 166634], 38741, 28749, 21284,
+    [62880, 139390], 37876, 30425, [62883, 166371], 62884, 30685, 20131, 20464,
+    20668, 20015, 20247, 62891, 21556, 32139, 22674, 22736, [62896, 138678],
+    24210, 24217, 24514, [62900, 141074], 25995, [62902, 144377], 26905, 27203,
+    [62905, 146531], 27903, 29184, [62909, 148741], 29580, [16091, 62911],
+    [62912, 150035], 23317, 29881, 35715, [62916, 154788], [62917, 153237],
+    31379, 31724, 31939, 32364, 33528, 34199, 62924, 34960, 62926, 36537,
+    62928, 36815, 34143, 39392, 37409, 62933, [62934, 167353], [62935, 136255],
+    [16497, 62936], [17058, 62937], 23066, 39016, 26475, [17014, 62944], 22333,
+    34262, [62948, 149883], 33471, [62950, 160013], [19585, 62951],
+    [62952, 159092], 23931, [62954, 158485], [62955, 159678], {f: 2, c: 62956},
+    23446, 62959, 32347],
+  'Adobe-GB1': [{f: 95, c: 32}, {f: 3, c: 12288}, [183, 12539], 713, 711, 168,
+    12291, 12293, 8212, 65374, 8214, [8230, 8943], {f: 2, c: 8216},
+    {f: 2, c: 8220}, {f: 2, c: 12308}, {f: 8, c: 12296}, {f: 2, c: 12310},
+    {f: 2, c: 12304}, 177, 215, 247, 8758, {f: 2, c: 8743}, 8721, 8719, 8746,
+    8745, 8712, 8759, 8730, 8869, 8741, 8736, 8978, 8857, 8747, 8750, 8801,
+    8780, 8776, 8765, 8733, 8800, {f: 2, c: 8814}, {f: 2, c: 8804}, 8734, 8757,
+    8756, 9794, 9792, 176, {f: 2, c: 8242}, 8451, 65284, 164, {f: 2, c: 65504},
+    8240, 167, 8470, 9734, 9733, 9675, 9679, 9678, 9671, 9670, 9633, 9632,
+    9651, 9650, 8251, 8594, {f: 2, c: 8592}, 8595, 12307, {f: 20, c: 9352},
+    {f: 20, c: 9332}, {f: 10, c: 9312}, {f: 10, c: 12832}, {f: 12, c: 8544},
+    {f: 3, c: 65281}, 65509, {f: 89, c: 65285}, 65507, {f: 83, c: 12353},
+    {f: 86, c: 12449}, {f: 17, c: 913}, {f: 7, c: 931}, {f: 17, c: 945},
+    {f: 7, c: 963}, {f: 7, c: 59277}, {f: 2, c: 65077}, {f: 2, c: 65081},
+    {f: 2, c: 65087}, {f: 2, c: 65085}, {f: 4, c: 65089}, {f: 2, c: 59284},
+    {f: 2, c: 65083}, {f: 2, c: 65079}, 65073, 59286, {f: 2, c: 65075},
+    {f: 6, c: 1040}, 1025, {f: 32, c: 1046}, 1105, {f: 26, c: 1078}, 257, 225,
+    462, 224, 275, 233, 283, 232, 299, 237, 464, 236, 333, 243, 466, 242, 363,
+    250, 468, 249, 470, 472, 474, 476, 252, 234, 593, 7743, 324, 328, 505, 609,
+    {f: 37, c: 12549}, 0, {f: 76, c: 9472}, {s: 126}, 21834, 38463, 22467,
+    25384, 21710, 21769, 21696, 30353, 30284, 34108, 30702, 33406, 30861,
+    29233, 38552, 38797, 27688, 23433, 20474, 25353, 26263, 23736, 33018,
+    26696, 32942, 26114, 30414, 20985, 25942, 29100, 32753, 34948, 20658,
+    22885, 25034, 28595, 33453, 25420, 25170, 21485, 21543, 31494,
+    [12043, 20843], 30116, 24052, 25300, 36299, 38774, 25226, 32793, 22365,
+    38712, 32610, 29240, [12137, 30333], 26575, 30334, 25670, 20336, 36133,
+    25308, 31255, 26001, 29677, 25644, 25203, 33324, 39041, 26495, 29256,
+    25198, 25292, 20276, 29923, 21322, 21150, 32458, 37030, 24110, 26758,
+    27036, 33152, 32465, 26834, 30917, 34444, 38225, 20621, 35876, 33502,
+    32990, 21253, 35090, 21093, 34180, 38649, 20445, 22561, 39281, 23453,
+    25265, 25253, 26292, 35961, 40077, 29190, 26479, 30865, 24754, 21329,
+    21271, 36744, 32972, 36125, 38049, 20493, 29384, 22791, 24811, 28953,
+    34987, 22868, 33519, 26412, 31528, 23849, 32503, 29997, 27893, 36454,
+    36856, 36924, [12240, 40763], [12112, 27604], 37145, 31508, 24444, 30887,
+    34006, 34109, 27605, 27609, 27606, 24065, 24199, 30201, 38381, 25949,
+    24330, 24517, 36767, 22721, 33218, 36991, 38491, 38829, 36793, 32534,
+    36140, 25153, 20415, 21464, 21342, {f: 2, c: 36776}, 36779, 36941, 26631,
+    24426, 33176, 34920, 40150, 24971, 21035, 30250, 24428, 25996, 28626,
+    28392, 23486, 25672, 20853, 20912, 26564, 19993, 31177, 39292, 28851,
+    30149, 24182, 29627, 33760, 25773, 25320, 38069, 27874, 21338, 21187,
+    25615, 38082, 31636, 20271, 24091, 33334, 33046, 33162, 28196, 27850,
+    39539, 25429, [12056, 21340], 21754, 34917, 22496, 19981, 24067, 27493,
+    31807, 37096, 24598, 25830, 29468, 35009, 26448, 25165, 36130, 30572,
+    36393, 37319, 24425, 33756, 34081, 39184, 21442, 34453, 27531, 24813,
+    24808, 28799, 33485, 33329, 20179, 27815, 34255, 25805, 31961, 27133,
+    26361, 33609, 21397, 31574, 20391, 20876, 27979, 23618, 36461, 25554,
+    21449, 33580, 33590, 26597, 30900, 25661, 23519, 23700, 24046, 35815,
+    25286, 26612, 35962, 25600, 25530, 34633, 39307, 35863, 32544, 38130,
+    20135, 38416, 39076, 26124, 29462, 22330, 23581, 24120, 38271, 20607,
+    32928, [12058, 21378], 25950, 30021, 21809, 20513, 36229, 25220, 38046,
+    26397, 22066, 28526, 24034, 21557, 28818, 36710, 25199, 25764, 25507,
+    24443, 28552, 37108, [12162, 33251], [12192, 36784], 23576, 26216, 24561,
+    27785, 38472, 36225, 34924, 25745, 31216, 22478, 27225, 25104, 21576,
+    20056, 31243, 24809, 28548, 35802, 25215, 36894, 39563, 31204, 21507,
+    30196, 25345, 21273, 27744, 36831, 24347, 39536, 32827, 40831, 20360,
+    23610, [12186, 36196], 32709, 26021, 28861, 20805, 20914, [12173, 34411],
+    23815, 23456, 25277, 37228, 30068, 36364, 31264, 24833, 31609, 20167,
+    32504, 30597, 19985, 33261, 21021, 20986, 27249, 21416, 36487, 38148,
+    38607, 28353, 38500, 26970, 30784, 20648, 30679, 25616, 35302, 22788,
+    25571, 24029, 31359, 26941, 20256, 33337, 21912, 20018, 30126, 31383,
+    24162, 24202, 38383, 21019, 21561, 28810, 25462, 38180, 22402, 26149,
+    26943, 37255, 21767, 28147, 32431, 34850, 25139, 32496, 30133, 33576,
+    30913, 38604, 36766, 24904, 29943, 35789, 27492, 21050, 36176, 27425,
+    32874, 33905, 22257, 21254, 20174, 19995, 20945, 31895, 37259, 31751,
+    20419, 36479, 31713, 31388, 25703, 23828, 20652, 33030, 30209, 31929,
+    28140, 32736, 26449, 23384, [12072, 23544], 30923, 25774, 25619, 25514,
+    25387, 38169, 25645, 36798, 31572, 30249, 25171, [12068, 22823], 21574,
+    [12109, 27513], 20643, 25140, 24102, 27526, 20195, 36151, 34955, 24453,
+    36910, 24608, 32829, 25285, 20025, 21333, 37112, 25528, 32966, 26086,
+    27694, 20294, 24814, 28129, 35806, 24377, 34507, 24403, 25377, 20826,
+    33633, 26723, [12049, 20992], 25443, 36424, 20498, 23707, 31095, 23548,
+    21040, 31291, 24764, 36947, 30423, 24503, 24471, 30340, 36460, 28783,
+    30331, 31561, 30634, 20979, 37011, 22564, 20302, 28404, 36842, 25932,
+    31515, 29380, 28068, 32735, 23265, 25269, 24213, 22320, 33922, 31532,
+    24093, 24351, 36882, 32532, 39072, 25474, 28359, 30872, 28857, 20856,
+    38747, 22443, 30005, 20291, 30008, 24215, 24806, 22880, 28096, 27583,
+    30857, 21500, 38613, 20939, 20993, 25481, 21514, 38035, 35843, 36300,
+    29241, 30879, 34678, 36845, 35853, 21472, 19969, 30447, 21486, 38025,
+    39030, [12237, 40718], 38189, 23450, 35746, 20002, 19996, 20908, 33891,
+    25026, 21160, 26635, 20375, 24683, 20923, 27934, 20828, 25238,
+    [12099, 26007], 38497, [12182, 35910], 36887, 30168, 37117, 30563, 27602,
+    29322, 29420, 35835, 22581, 30585, 36172, 26460, 38208, 32922, 24230,
+    28193, 22930, 31471, 30701, 38203, 27573, 26029, 32526, 22534, 20817,
+    38431, 23545, 22697, 21544, 36466, 25958, 39039, 22244, 38045, 30462,
+    36929, 25479, 21702, 22810, 22842, 22427, 36530, 26421, 36346, 33333,
+    21057, 24816, 22549, 34558, 23784, 40517, 20420, 39069, 35769, 23077,
+    24694, 21380, 25212, 36943, 37122, 39295, 24681, [12157, 32780],
+    [12041, 20799], [12159, 32819], 23572, 39285, 27953, [12038, 20108], 36144,
+    21457, 32602, 31567, 20240, 20047, 38400, 27861, 29648, 34281, 24070,
+    30058, 32763, 27146, 30718, 38034, 32321, 20961, 28902, 21453, 36820,
+    33539, 36137, 29359, 39277, 27867, 22346, 33459, [12101, 26041], 32938,
+    25151, 38450, 22952, 20223, 35775, 32442, 25918, 33778, [12206, 38750],
+    21857, 39134, 32933, 21290, 35837, 21536, 32954, 24223, 27832, 36153,
+    33452, 37210, 21545, 27675, 20998, 32439, 22367, 28954, 27774, 31881,
+    22859, 20221, 24575, 24868, 31914, 20016, 23553, 26539, 34562, 23792,
+    38155, 39118, 30127, 28925, 36898, 20911, 32541, 35773, 22857, 20964,
+    20315, 21542, 22827, 25975, 32932, 23413, 25206, 25282, 36752, 24133,
+    27679, 31526, 20239, 20440, 26381, 28014, 28074, 31119, 34993, 24343,
+    29995, 25242, 36741, 20463, 37340, 26023, 33071, 33105, 24220, 33104,
+    36212, 21103, 35206, 36171, 22797, 20613, 20184, [12201, 38428],
+    [12119, 29238], 33145, 36127, 23500, 35747, 38468, 22919, 32538, 21648,
+    22134, 22030, 35813, 25913, 27010, 38041, 30422, 28297, [12082, 24178],
+    [12130, 29976], 26438, 26577, 31487, 32925, 36214, 24863, 31174, 25954,
+    36195, 20872, 21018, 38050, 32568, 32923, 32434, 23703, 28207, 26464,
+    31705, 30347, [12220, 39640], 33167, 32660, 31957, 25630, 38224, 31295,
+    21578, 21733, 27468, 25601, [12093, 25096], 40509, 33011, 30105, 21106,
+    [12208, 38761], 33883, 26684, 34532, 38401, 38548, 38124, 20010, 21508,
+    32473, 26681, 36319, 32789, 26356, 24218, 32697, 22466, 32831, 26775,
+    [12079, 24037], 25915, 21151, 24685, 40858, 20379, 36524, 20844, 23467,
+    [12088, 24339], 24041, 27742, 25329, 36129, 20849, 38057, 21246, 27807,
+    33503, 29399, 22434, 26500, 36141, 22815, 36764, 33735, 21653, 31629,
+    20272, 27837, 23396, 22993, [12238, 40723], 21476, 34506, [12219, 39592],
+    [12181, 35895], 32929, 25925, 39038, 22266, 38599, 21038, [12128, 29916],
+    21072, 23521, 25346, 35074, 20054, 25296, 24618, 26874, 20851, 23448,
+    20896, 35266, 31649, 39302, 32592, 24815, 28748, 36143, 20809,
+    [12084, 24191], 36891, 29808, 35268, 22317, 30789, 24402, 40863, 38394,
+    36712, [12225, 39740], 35809, 30328, 26690, 26588, 36330, 36149, 21053,
+    36746, 28378, 26829, 38149, 37101, 22269, 26524, 35065, 36807, 21704,
+    39608, 23401, 28023, 27686, 20133, 23475, 39559, 37219, 25000, 37039,
+    38889, 21547, 28085, 23506, 20989, 21898, 32597, 32752, 25788, 25421,
+    26097, 25022, 24717, 28938, 27735, 27721, 22831, 26477, 33322, 22741,
+    22158, 35946, 27627, 37085, 22909, 32791, 21495, 28009, 21621, 21917,
+    33655, 33743, 26680, [12146, 31166], 21644, 20309, 21512, 30418, 35977,
+    38402, 27827, 28088, 36203, 35088, 40548, 36154, 22079, [12234, 40657],
+    30165, 24456, 29408, 24680, 21756, 20136, 27178, 34913, 24658, 36720,
+    21700, 28888, 34425, 40511, 27946, 23439, 24344, 32418, 21897, 20399,
+    29492, 21564, 21402, 20505, 21518, 21628, 20046, 24573, 29786, 22774,
+    33899, 32993, 34676, 29392, 31946, 28246, 24359, 34382, 21804, 25252,
+    20114, 27818, 25143, 33457, 21719, 21326, 29502, 28369, 30011, 21010,
+    21270, 35805, 27088, 24458, 24576, 28142, 22351, 27426, 29615, 26707,
+    36824, 32531, 25442, 24739, 21796, 30186, 35938, 28949, 28067, 23462,
+    24187, 33618, 24908, 40644, 30970, 34647, 31783, 30343, 20976, 24822,
+    29004, 26179, 24140, 24653, 35854, 28784, 25381, 36745, 24509, 24674,
+    34516, 22238, 27585, 24724, 24935, 21321, 24800, 26214, 36159, 31229,
+    20250, 28905, 27719, 35763, 35826, 32472, 33636, 26127, 23130, 39746,
+    27985, 28151, 35905, 27963, 20249, [12117, 28779], 33719, 25110, 24785,
+    38669, 36135, 31096, 20987, 22334, 22522, 26426, 30072, 31293, 31215,
+    31637, 32908, 39269, 36857, 28608, 35749, 40481, 23020, 32489, 32521,
+    21513, 26497, 26840, 36753, 31821, 38598, 21450, 24613, 30142, 27762,
+    21363, 23241, 32423, 25380, [12047, 20960], 33034, [12080, 24049], 34015,
+    25216, 20864, 23395, 20238, 31085, 21058, 24760, 27982, 23492, 23490,
+    35745, 35760, 26082, 24524, 38469, 22931, 32487, 32426, 22025, 26551,
+    22841, 20339, 23478, 21152, 33626, 39050, 36158, 30002, 38078, 20551,
+    31292, 20215, 26550, 39550, 23233, 27516, 30417, 22362, 23574, 31546,
+    38388, 29006, 20860, 32937, 33392, 22904, 32516, 33575, 26816, 26604,
+    30897, 30839, 25315, 25441, 31616, 20461, 21098, 20943, 33616, 27099,
+    37492, 36341, 36145, 35265, 38190, 31661, 20214, 20581, 33328, 21073,
+    39279, 28176, 28293, 28071, 24314, 20725, 23004, 23558, 27974, 27743,
+    30086, 33931, 26728, 22870, 35762, 21280, 37233, 38477, 34121, 26898,
+    30977, 28966, 33014, 20132, 37066, 27975, 39556, 23047, 22204, 25605,
+    38128, 30699, 20389, 33050, 29409, [12179, 35282], 39290, 32564, 32478,
+    21119, 25945, 37237, 36735, 36739, 21483, 31382, 25581, 25509, 30342,
+    31224, 34903, 38454, 25130, 21163, 33410, 26708, 26480, 25463, 30571,
+    31469, 27905, 32467, 35299, 22992, 25106, 34249, 33445, 30028, 20511,
+    20171, 30117, 35819, 23626, [12081, 24062], 31563, [12100, 26020],
+    [12198, 37329], 20170, 27941, 35167, 32039, 38182, 20165, 35880, 36827,
+    38771, 26187, 31105, 36817, 28908, 28024, 23613, 21170, 33606, 20834,
+    33550, 30555, 26230, 40120, 20140, 24778, 31934, 31923, 32463, 20117,
+    35686, 26223, 39048, 38745, 22659, 25964, 38236, 24452, 30153, 38742,
+    31455, 31454, 20928, 28847, 31384, 25578, 31350, 32416, 29590,
+    [12210, 38893], 20037, 28792, 20061, 37202, 21417, 25937, 26087,
+    [12165, 33276], 33285, 21646, 23601, 30106, 38816, 25304, 29401, 30141,
+    23621, 39545, 33738, 23616, 21632, 30697, 20030, 27822, 32858, 25298,
+    25454, 24040, 20855, 36317, 36382, 38191, 20465, 21477, 24807, 28844,
+    21095, 25424, 40515, 23071, 20518, 30519, 21367, 32482, 25733, 25899,
+    25225, 25496, 20500, 29237, 35273, 20915, 35776, 32477, 22343, 33740,
+    38055, 20891, 21531, 23803, 20426, 31459, 27994, 37089, 39567, 21888,
+    21654, 21345, 21679, 24320, 25577, 26999, 20975, 24936, 21002, 22570,
+    21208, 22350, 30733, 30475, 24247, 24951, 31968, 25179, 25239, 20130,
+    28821, 32771, 25335, 28900, 38752, 22391, 33499, 26607, 26869, 30933,
+    39063, 31185, 22771, 21683, 21487, 28212, 20811, 21051, 23458, 35838,
+    32943, 21827, 22438, 24691, 22353, 21549, 31354, 24656, 23380, 25511,
+    25248, [12061, 21475], 25187, 23495, 26543, 21741, 31391, 33510, 37239,
+    24211, 35044, 22840, 22446, 25358, 36328, 33007, 22359, 31607, 20393,
+    24555, 23485, 27454, 21281, 31568, 29378, 26694, 30719, 30518, 26103,
+    20917, 20111, 30420, 23743, 31397, 33909, 22862, 39745, 20608, 39304,
+    24871, 28291, 22372, 26118, 25414, 22256, 25324, 25193, 24275, 38420,
+    22403, 25289, 21895, 34593, 33098, 36771, 21862, 33713, 26469, 36182,
+    34013, 23146, 26639, 25318, 31726, 38417, 20848, 28572, 35888, 25597,
+    35272, 25042, 32518, 28866, 28389, 29701, 27028, 29436, 24266, 37070,
+    26391, 28010, 25438, 21171, 29282, [12156, 32769], 20332, 23013, 37226,
+    28889, 28061, 21202, 20048, 38647, 38253, 34174, 30922, 32047, 20769,
+    22418, 25794, 32907, 31867, 27882, 26865, 26974, 20919, 21400, 26792,
+    29313, 40654, 31729, 29432, 31163, 28435, 29702, 26446, [12197, 37324],
+    40100, 31036, 33673, 33620, 21519, 26647, 20029, 21385, 21169, 30782,
+    21382, 21033, 20616, 20363, 20432, 30178, [12148, 31435], 31890, 27813,
+    [12202, 38582], [12050, 21147], 29827, 21737, 20457, 32852, 33714, 36830,
+    38256, 24265, 24604, 28063, 24088, 25947, 33080, 38142, 24651, 28860,
+    32451, 31918, 20937, 26753, 31921, 33391, 20004, 36742, 37327, 26238,
+    20142, 35845, 25769, 32842, 20698, 30103, 29134, 23525, 36797, 28518,
+    20102, 25730, 38243, 24278, 26009, 21015, 35010, 28872, 21155, 29454,
+    29747, 26519, 30967, 38678, 20020, 37051, 40158, 28107, 20955, 36161,
+    21533, 25294, 29618, 33777, 38646, 40836, 38083, 20278, 32666, 20940,
+    28789, 38517, 23725, 39046, 21478, 20196, 28316, 29705, 27060, 30827,
+    39311, 30041, 21016, 30244, 27969, 26611, 20845, 40857, 32843, 21657,
+    31548, 31423, 38534, 22404, 25314, 38471, 27004, 23044, 25602, 31699,
+    28431, 38475, 33446, 21346, 39045, 24208, 28809, 25523, 21348, 34383,
+    40065, 40595, 30860, 38706, 36335, 36162, [12229, 40575], 28510, 31108,
+    24405, 38470, 25134, 39540, 21525, 38109, 20387, 26053, 23653, 23649,
+    32533, 34385, 27695, 24459, 29575, 28388, 32511, 23782, 25371, 23402,
+    28390, 21365, 20081, 25504, 30053, 25249, 36718, 20262, 20177, 27814,
+    32438, 35770, 33821, 34746, 32599, 36923, 38179, 31657, 39585, 35064,
+    33853, 27931, 39558, 32476, 22920, [12231, 40635], 29595, 30721, 34434,
+    39532, 39554, 22043, 21527, 22475, 20080, 40614, 21334, 36808, 33033,
+    30610, 39314, 34542, 28385, 34067, 26364, 24930, 28459, 35881, 33426,
+    33579, 30450, 27667, 24537, 33725, 29483, 33541, 38170, [12113, 27611],
+    [12141, 30683], 38086, 21359, 33538, 20882, 24125, 35980, 36152, 20040,
+    29611, 26522, 26757, 37238, 38665, 29028, 27809, 30473, 23186, 38209,
+    27599, 32654, 26151, 23504, 22969, 23194, 38376, 38391, 20204, 33804,
+    33945, 27308, 30431, 38192, 29467, 26790, 23391, 30511, 37274, 38753,
+    31964, 36855, 35868, 24357, [12150, 31859], 31192, 35269, 27852, 34588,
+    23494, 24130, 26825, 30496, 32501, 20885, 20813, 21193, 23081, 32517,
+    [12207, 38754], 33495, 25551, 30596, 34256, 31186, 28218, 24217, 22937,
+    34065, 28781, 27665, 25279, [12139, 30399], 25935, 24751, 38397, 26126,
+    34719, 40483, 38125, 21517, 21629, 35884, {f: 2, c: 25720}, 34321, 27169,
+    33180, 30952, 25705, 39764, 25273, 26411, 33707, 22696, 40664, 27819,
+    28448, 23518, 38476, 35851, 29279, 26576, 25287, 29281, 20137, 22982,
+    27597, 22675, 26286, 24149, 21215, 24917, [12106, 26408], [12140, 30446],
+    30566, 29287, 31302, 25343, 21738, 21584, 38048, 37027, 23068, 32435,
+    27670, 20035, 22902, 32784, 22856, 21335, 30007, 38590, 22218, 25376,
+    33041, 24700, 38393, 28118, 21602, 39297, 20869, 23273, 33021, 22958,
+    38675, 20522, 27877, 23612, 25311, 20320, 21311, 33147, 36870, 28346,
+    34091, 25288, 24180, 30910, 25781, 25467, 24565, 23064, 37247, 40479,
+    23615, 25423, 32834, 23421, 21870, 38218, 38221, 28037, 24744, 26592,
+    29406, 20957, 23425, 25319, 27870, [12124, 29275], 25197, 38062, 32445,
+    33043, 27987, 20892, 24324, 22900, 21162, 24594, [12069, 22899], 26262,
+    34384, 30111, 25386, 25062, 31983, 35834, 21734, 27431, 40485, 27572,
+    34261, 21589, 20598, 27812, 21866, 36276, 29228, 24085, 24597, 29750,
+    25293, 25490, 29260, 24472, 28227, 27966, 25856, 28504, 30424, 30928,
+    30460, 30036, 21028, 21467, 20051, 24222, 26049, 32810, 32982, 25243,
+    21638, 21032, 28846, 34957, 36305, 27873, 21624, 32986, 22521, 35060,
+    36180, 38506, 37197, 20329, 27803, 21943, 30406, 30768, 25256, 28921,
+    28558, 24429, 34028, 26842, 30844, 31735, 33192, 26379, 40527, 25447,
+    30896, 22383, 30738, 38713, 25209, 25259, 21128, 29749, 27607, 21860,
+    33086, 30130, [12138, 30382], 21305, 30174, 20731, 23617, 35692, 31687,
+    20559, [12122, 29255], 39575, 39128, 28418, 29922, 31080, 25735, 30629,
+    25340, 39057, 36139, 21697, 32856, 20050, 22378, 33529, 33805, 24179,
+    20973, 29942, 35780, 23631, 22369, 27900, 39047, 23110, 30772, 39748,
+    36843, 31893, 21078, 25169, 38138, 20166, 33670, 33889, 33769, 33970,
+    22484, 26420, 22275, 26222, 28006, 35889, 26333, 28689, 26399, 27450,
+    26646, 25114, 22971, 19971, 20932, 28422, 26578, 27791, 20854, 26827,
+    22855, 27495, 30054, 23822, 33040, 40784, 26071, 31048, 31041, 39569,
+    36215, 23682, 20062, 20225, 21551, 22865, 30732, 22120, [12115, 27668],
+    36804, 24323, 27773, 27875, 35755, 25488, 24688, 27965, 29301, 25190,
+    38030, 38085, 21315, 36801, 31614, 20191, 35878, 20094, 40660, 38065,
+    38067, 21069, 28508, 36963, 27973, 35892, 22545, 23884, [12107, 27424],
+    27465, 26538, 21595, 33108, 32652, 22681, 34103, 24378, 25250, 27207,
+    38201, 25970, 24708, 26725, 30631, 20052, 20392, 24039, 38808, 25772,
+    32728, 23789, 20431, 31373, 20999, 33540, 19988, 24623, 31363, 38054,
+    20405, 20146, 31206, 29748, 21220, 33465, 25810, 31165, 23517, 27777,
+    38738, 36731, 27682, 20542, 21375, 28165, 25806, 26228, 27696, 24773,
+    39031, 35831, 24198, 29756, 31351, 31179, 19992, 37041, 29699, 27714,
+    22234, 37195, 27845, 36235, 21306, 34502, 26354, 36527, 23624, 39537,
+    28192, 21462, 23094, 40843, 36259, 21435, 22280, 39079, 26435, 37275,
+    27849, 20840, 30154, 25331, [12125, 29356], 21048, 21149, 32570, 28820,
+    30264, 21364, 40522, 27063, 30830, 38592, 35033, 32676, 28982, 29123,
+    20873, 26579, 29924, 22756, 25880, 22199, 35753, 39286, 25200, 32469,
+    24825, 28909, 22764, 20161, [12040, 20154], 24525, 38887, 20219, 35748,
+    20995, 22922, 32427, 25172, 20173, [12103, 26085], 25102, 33592, 33993,
+    33635, 34701, 29076, 28342, 23481, 32466, 20887, 25545, 26580,
+    [12161, 32905], 33593, 34837, 20754, 23418, 22914, 36785, 20083, 27741,
+    [12042, 20837], 35109, 36719, 38446, 34122, 29790, 38160, 38384, 28070,
+    33509, 24369, 25746, 27922, 33832, 33134, 40131, 22622, 36187, 19977,
+    21441, 20254, 25955, 26705, 21971, 20007, 25620, 39578, 25195, 23234,
+    29791, [12170, 33394], 28073, 26862, 20711, 33678, 30722, 26432, 21049,
+    27801, 32433, 20667, 21861, 29022, 31579, 26194, 29642, 33515, 26441,
+    [12077, 23665], 21024, 29053, 34923, 38378, 38485, 25797, 36193, 33203,
+    21892, 27733, 25159, 32558, 22674, 20260, 21830, 36175, 26188, 19978,
+    23578, 35059, 26786, 25422, 31245, 28903, 33421, 21242, 38902, 23569,
+    21736, 37045, 32461, 22882, 36170, 34503, [12166, 33292], 33293, 36198,
+    25668, 23556, 24913, 28041, 31038, 35774, 30775, 30003, 21627, 20280,
+    [12189, 36523], 28145, 23072, 32453, 31070, 27784, 23457, 23158, 29978,
+    32958, 24910, 28183, 22768, [12131, 29983], 29989, 29298, 21319, 32499,
+    30465, 30427, 21097, 32988, 22307, 24072, 22833, 29422, 26045, 28287,
+    35799, [12075, 23608], 34417, [12055, 21313], [12143, 30707], 25342, 26102,
+    20160, [12215, 39135], 34432, 23454, 35782, 21490, [12142, 30690], 20351,
+    23630, 39542, 22987, 24335, [12144, 31034], [12064, 22763], 19990, 26623,
+    20107, 25325, 35475, 36893, 21183, 26159, 21980, 22124, 36866, 20181,
+    20365, 37322, 39280, [12114, 27663], 24066, 24643, 23460, 35270, 35797,
+    25910, [12095, 25163], [12216, 39318], 23432, 23551, 25480, 21806, 21463,
+    30246, 20861, 34092, 26530, 26803, 27530, 25234, 36755, 21460, 33298,
+    28113, 30095, 20070, 36174, 23408, 29087, 34223, 26257, 26329, 32626,
+    34560, [12233, 40653], [12239, 40736], 23646, 26415, 36848, 26641, 26463,
+    25101, 31446, 22661, 24246, 25968, 28465, 24661, 21047, 32781, 25684,
+    34928, 29993, 24069, 26643, 25332, 38684, 21452, 29245, 35841,
+    [12116, 27700], 30561, 31246, 21550, 30636, 39034, 33308, 35828, 30805,
+    26388, 28865, 26031, 25749, 22070, 24605, 31169, 21496, 19997, 27515,
+    32902, 23546, 21987, 22235, 20282, 20284, 39282, 24051, 26494, 32824,
+    24578, 39042, 36865, 23435, 35772, 35829, 25628, 33368, 25822, 22013,
+    33487, 37221, 20439, 32032, 36895, 31903, 20723, 22609, 28335, 23487,
+    35785, 32899, 37240, 33948, 31639, 34429, 38539, 38543, 32485, 39635,
+    30862, 23681, 31319, 36930, 38567, 31071, 23385, 25439, 31499, 34001,
+    26797, 21766, 32553, 29712, 32034, 38145, 25152, 22604, 20182, 23427,
+    22905, 22612, 29549, 25374, 36427, 36367, 32974, 33492, 25260, 21488,
+    27888, 37214, 22826, 24577, 27760, 22349, 25674, 36138, 30251, 28393,
+    22363, 27264, 30192, 28525, 35885, 35848, 22374, 27631, 34962, 30899,
+    25506, 21497, 28845, 27748, 22616, 25642, 22530, 26848, 33179, 21776,
+    31958, 20504, 36538, 28108, 36255, 28907, 25487, 28059, 28372, 32486,
+    33796, 26691, 36867, 28120, 38518, 35752, 22871, 29305, 34276, 33150,
+    30140, 35466, 26799, 21076, 36386, 38161, 25552, 39064, 36420, 21884,
+    20307, 26367, 22159, 24789, 28053, 21059, 23625, 22825, 28155, 22635,
+    [12133, 30000], 29980, 24684, 33300, 33094, 25361, 26465, 36834, 30522,
+    36339, 36148, 38081, 24086, 21381, 21548, 28867, 27712, 24311, 20572,
+    20141, 24237, 25402, 33351, 36890, 26704, 37230, 30643, 21516, 38108,
+    24420, 31461, 26742, 25413, 31570, 32479, 30171, 20599, 25237, 22836,
+    36879, 20984, 31171, 31361, 22270, 24466, 36884, 28034, 23648,
+    [12063, 22303], 21520, 20820, 28237, 22242, 25512, 39059, 33151, 34581,
+    35114, 36864, 21534, 23663, 33216, 25302, 25176, 33073, 40501, 38464,
+    39534, 39548, 26925, 22949, 25299, 21822, 25366, 21703, 34521, 27964,
+    23043, [12129, 29926], 34972, 27498, 22806, 35916, 24367, 28286, 29609,
+    39037, 20024, 28919, 23436, 30871, 25405, 26202, 30358, 24779, 23451,
+    23113, 19975, 33109, 27754, 29579, 20129, 26505, [12153, 32593], 24448,
+    26106, 26395, 24536, 22916, 23041, 24013, 24494, 21361, 38886, 36829,
+    26693, 22260, 21807, 24799, 20026, 28493, 32500, 33479, 33806, 22996,
+    20255, 20266, 23614, 32428, 26410, 34074, 21619, 30031, 32963, 21890,
+    39759, 20301, 28205, 35859, 23561, 24944, 21355, 30239, 28201, 34442,
+    [12098, 25991], 38395, 32441, 21563, 31283, 32010, 38382, 21985, 32705,
+    29934, 25373, 34583, 28065, 31389, 25105, 26017, 21351, 25569, 27779,
+    24043, 21596, 38056, 20044, 27745, 35820, 23627, [12102, 26080], 33436,
+    26791, 21566, 21556, [12111, 27595], 27494, 20116, 25410, 21320, 33310,
+    20237, 20398, 22366, 25098, 38654, 26212, 29289, 21247, 21153, 24735,
+    35823, 26132, 29081, 26512, 35199, 30802, 30717, 26224, 22075, 21560,
+    38177, 29306, 31232, 24687, 24076, 24713, 33181, [12067, 22805], 24796,
+    29060, 28911, 28330, 27728, 29312, 27268, 34989, 24109, 20064, 23219,
+    21916, 38115, 27927, 31995, 38553, 25103, 32454, 30606, 34430, 21283,
+    38686, 36758, 26247, 23777, 20384, 29421, 19979, 21414, 22799, 21523,
+    25472, 38184, 20808, 20185, 40092, 32420, 21688, 36132, 34900, 33335,
+    38386, 28046, 24358, 23244, 26174, 38505, 29616, 29486, 21439, 33146,
+    39301, 32673, 23466, 38519, 38480, 32447, 30456, 21410, 38262,
+    [12217, 39321], 31665, 35140, 28248, 20065, 32724, 31077, 35814, 24819,
+    21709, 20139, 39033, 24055, 27233, 20687, 21521, 35937, 33831, 30813,
+    38660, 21066, 21742, 22179, 38144, 28040, 23477, 28102, 26195,
+    [12073, 23567], 23389, 26657, 32918, 21880, 31505, 25928, 26964, 20123,
+    27463, 34638, 38795, 21327, 25375, 25658, 37034, 26012, 32961, 35856,
+    20889, 26800, 21368, 34809, 25032, 27844, 27899, 35874, 23633, 34218,
+    33455, 38156, 27427, [12191, 36763], 26032, 24571, [12092, 24515], 20449,
+    34885, 26143, 33125, 29481, 24826, 20852, 21009, 22411, 24418, 37026,
+    [12175, 34892], 37266, 24184, 26447, 24615, 22995, 20804, 20982, 33016,
+    21256, 27769, 38596, 29066, 20241, 20462, 32670, 26429, 21957, 38152,
+    31168, 34966, 32483, 22687, 25100, 38656, 34394, 22040, 39035, 24464,
+    35768, 33988, 37207, 21465, 26093, 24207, 30044, 24676, 32110, 23167,
+    32490, 32493, 36713, 21927, 23459, 24748, 26059, [12126, 29572], 36873,
+    30307, 30505, 32474, 38772, 34203, 23398, [12147, 31348], 38634,
+    [12174, 34880], 21195, 29071, 24490, 26092, 35810, 23547, 39535, 24033,
+    27529, 27739, 35757, 35759, 36874, 36805, 21387, 25276, 40486, 40493,
+    21568, 20011, 33469, [12123, 29273], 34460, 23830, 34905, 28079, 38597,
+    21713, 20122, 35766, 28937, 21693, 38409, 28895, 28153, 30416, 20005,
+    30740, 34578, 23721, 24310, [12180, 35328], 39068, 38414, 28814, 27839,
+    22852, 25513, 30524, 34893, 28436, 33395, 22576, 29141, 21388, 30746,
+    38593, 21761, 24422, 28976, 23476, 35866, 39564, 27523, 22830, 40495,
+    31207, 26472, 25196, 20335, 30113, [12154, 32650], 27915, 38451, 27687,
+    20208, 30162, 20859, 26679, 28478, 36992, 33136, 22934, 29814, 25671,
+    23591, 36965, 31377, 35875, 23002, 21676, 33280, 33647, 35201, 32768,
+    26928, 22094, 32822, 29239, 37326, 20918, 20063, 39029, 25494, 19994,
+    21494, 26355, 33099, 22812, 28082, [12032, 19968], 22777, 21307, 25558,
+    38129, 20381, 20234, [12176, 34915], 39056, 22839, 36951, 31227, 20202,
+    33008, 30097, 27778, 23452, 23016, 24413, 26885, 34433, 20506, 24050,
+    [12036, 20057], 30691, 20197, 33402, 25233, 26131, [12194, 37009], 23673,
+    20159, 24441, 33222, 36920, 32900, 30123, 20134, 35028, 24847, 27589,
+    24518, 20041, 30410, 28322, 35811, 35758, 35850, 35793, 24322, 32764,
+    32716, 32462, 33589, 33643, 22240, 27575, [12211, 38899], 38452, 23035,
+    21535, 38134, 28139, 23493, 39278, 23609, 24341, 38544, 21360, 33521,
+    27185, 23156, 40560, 24212, 32552, 33721, {f: 2, c: 33828}, 33639, 34631,
+    36814, 36194, 30408, 24433, 39062, 30828, 26144, 21727, 25317, 20323,
+    33219, 30152, 24248, 38605, 36362, 34553, 21647, 27891, 28044, 27704,
+    24703, 21191, [12132, 29992], 24189, 20248, 24736, 24551, 23588, 30001,
+    37038, 38080, 29369, 27833, 28216, [12195, 37193], 26377, 21451, 21491,
+    20305, 37321, 35825, [12060, 21448], 24188, 36802, 28132, 20110, 30402,
+    27014, 34398, 24858, 33286, 20313, 20446, 36926, 40060, 24841, 28189,
+    28180, 38533, 20104, 23089, [12204, 38632], 19982, 23679, 31161, 23431,
+    35821, [12155, 32701], [12127, 29577], 22495, 33419, 37057, 21505, 36935,
+    21947, 23786, 24481, 24840, 27442, 29425, 32946, 35465, 28020, 23507,
+    35029, 39044, 35947, 39533, 40499, 28170, 20900, 20803, 22435, 34945,
+    21407, 25588, 36757, 22253, 21592, 22278, 29503, 28304, 32536, 36828,
+    33489, 24895, 24616, 38498, [12104, 26352], 32422, 36234, 36291, 38053,
+    23731, 31908, [12105, 26376], 24742, 38405, 32792, 20113, 37095, 21248,
+    38504, 20801, 36816, 34164, 37213, 26197, 38901, 23381, 21277, 30776,
+    26434, 26685, 21705, 28798, 23472, 36733, 20877, 22312, 21681, 25874,
+    26242, 36190, 36163, 33039, 33900, 36973, 31967, 20991, 34299, 26531,
+    26089, 28577, 34468, 36481, 22122, 36896, 30338, 28790, 29157, 36131,
+    25321, 21017, 27901, 36156, 24590, 22686, 24974, 26366, 36192, 25166,
+    21939, 28195, 26413, 36711, 38113, 38392, 30504, 26629, 27048, 21643,
+    20045, 28856, 35784, 25688, 25995, 23429, 31364, 20538, 23528, 30651,
+    27617, 35449, 31896, 27838, 30415, 26025, 36759, 23853, 23637, 34360,
+    26632, 21344, 25112, 31449, 28251, 32509, 27167, 31456, 24432, 28467,
+    24352, 25484, 28072, 26454, 19976, 24080, 36134, 20183, 32960, 30260,
+    38556, 25307, 26157, 25214, 27836, 36213, 29031, 32617, 20806, 32903,
+    21484, 36974, 25240, 21746, 34544, 36761, 32773, 38167, 34071, 36825,
+    27993, 29645, 26015, 30495, 29956, 30759, 33275, 36126, 38024, 20390,
+    26517, 30137, 35786, 38663, 25391, 38215, 38453, 33976, 25379, 30529,
+    24449, 29424, 20105, 24596, 25972, 25327, 27491, 25919, 24103, 30151,
+    37073, 35777, 33437, 26525, [12096, 25903], 21553, 34584, 30693, 32930,
+    33026, 27713, 20043, 32455, 32844, 30452, 26893, 27542, 25191, 20540,
+    20356, 22336, 25351, [12108, 27490], 36286, 21482, 26088, 32440, 24535,
+    25370, 25527, [12164, 33267], 33268, 32622, 24092, 23769, 21046, 26234,
+    31209, 31258, 36136, 28825, 30164, 28382, 27835, 31378, 20013, 30405,
+    24544, 38047, 34935, 32456, 31181, 32959, 37325, 20210, 20247,
+    [12168, 33311], 21608, 24030, 27954, 35788, 31909, 36724, 32920, 24090,
+    21650, 30385, 23449, 26172, 39588, 29664, 26666, 34523, 26417, 29482,
+    35832, 35803, 36880, [12149, 31481], 28891, 29038, 25284, 30633, 22065,
+    20027, 33879, 26609, 21161, 34496, 36142, 38136, 31569, 20303, 27880,
+    31069, 39547, 25235, [12118, 29226], 25341, 19987, 30742, 36716, 25776,
+    36186, 31686, 26729, 24196, 35013, 22918, 25758, 22766, 29366, 26894,
+    38181, 36861, 36184, 22368, 32512, 35846, 20934, 25417, 25305, 21331,
+    26700, 29730, 33537, 37196, 21828, 30528, 28796, 27978, 20857, 21672,
+    36164, 23039, 28363, 28100, 23388, 32043, 20180, 31869, 28371,
+    [12070, 23376], [12163, 33258], 28173, 23383, 39683, 26837, 36394, 23447,
+    32508, 24635, 32437, 37049, [12187, 36208], 22863, 25549, 31199,
+    [12188, 36275], 21330, 26063, 31062, 35781, 38459, 32452, 38075, 32386,
+    22068, 37257, 26368, 32618, 23562, 36981, 26152, 24038, 20304, 26590,
+    20570, 20316, 22352, 24231, 20109, 19980, 20800, 19984, 24319, 21317,
+    19989, 20120, 19998, [12224, 39730], 23404, 22121, [12033, 20008], 31162,
+    [12035, 20031], [12052, 21269], 20039, 22829, [12120, 29243], 21358, 27664,
+    22239, 32996, 39319, 27603, 30590, 40727, [12034, 20022], 20127, 40720,
+    20060, 20073, 20115, 33416, 23387, 21868, 22031, 20164, 21389, 21405,
+    21411, 21413, 21422, 38757, 36189, [12053, 21274], 21493, 21286, 21294,
+    21310, 36188, 21350, 21347, 20994, 21000, 21006, 21037, 21043,
+    {f: 2, c: 21055}, 21068, 21086, 21089, 21084, 33967, 21117, 21122, 21121,
+    21136, 21139, [12044, 20866], 32596, 20155, 20163, 20169, 20162, 20200,
+    20193, 20203, 20190, 20251, 20211, 20258, 20324, 20213, 20261, 20263,
+    20233, 20267, 20318, 20327, 25912, 20314, 20317, 20319, 20311, 20274,
+    20285, 20342, 20340, 20369, 20361, 20355, 20367, 20350, 20347, 20394,
+    20348, 20396, 20372, 20454, 20456, 20458, 20421, 20442, 20451, 20444,
+    20433, 20447, 20472, 20521, 20556, 20467, 20524, 20495, 20526, 20525,
+    20478, 20508, 20492, 20517, 20520, 20606, 20547, 20565, 20552, 20558,
+    20588, 20603, 20645, 20647, 20649, 20666, 20694, 20742, 20717, 20716,
+    20710, 20718, 20743, 20747, 20189, 27709, 20312, 20325, 20430,
+    [12245, 40864], 27718, 31860, 20846, 24061, 40649, 39320, 20865, 22804,
+    [12051, 21241], 21261, 35335, 21264, 20971, 22809, 20821, [12039, 20128],
+    20822, 20147, 34926, 34980, 20149, 33044, 35026, 31104, 23348, 34819,
+    32696, [12046, 20907], 20913, 20925, 20924, 20935, [12045, 20886], 20898,
+    20901, 35744, {f: 2, c: 35750}, 35754, {f: 2, c: 35764}, 35767,
+    {f: 2, c: 35778}, 35787, 35791, 35790, {f: 3, c: 35794}, 35798,
+    {f: 2, c: 35800}, 35804, {f: 2, c: 35807}, 35812, {f: 2, c: 35816}, 35822,
+    35824, 35827, 35830, 35833, 35836, {f: 2, c: 35839}, 35842, 35844, 35847,
+    35852, 35855, {f: 2, c: 35857}, {f: 3, c: 35860}, 35865, 35867, 35864,
+    35869, {f: 3, c: 35871}, 35877, 35879, {f: 2, c: 35882}, {f: 2, c: 35886},
+    {f: 2, c: 35890}, {f: 2, c: 35893}, [12057, 21353], 21370, 38429, 38434,
+    38433, 38449, 38442, 38461, 38460, 38466, 38473, 38484, 38495, 38503,
+    38508, 38514, 38516, 38536, 38541, 38551, 38576, 37015, 37019, 37021,
+    37017, 37036, 37025, 37044, 37043, 37046, 37050, 37048, 37040, 37071,
+    37061, 37054, 37072, 37060, 37063, 37075, 37094, 37090, 37084, 37079,
+    37083, 37099, 37103, 37118, 37124, 37154, 37150, 37155, 37169, 37167,
+    37177, 37187, 37190, 21005, 22850, 21154, {f: 2, c: 21164}, 21182, 21759,
+    21200, 21206, 21232, 21471, 29166, 30669, [12085, 24308], [12048, 20981],
+    20988, [12223, 39727], [12059, 21430], 24321, 30042, 24047, 22348, 22441,
+    22433, 22654, 22716, 22725, 22737, 22313, 22316, 22314, 22323, 22329,
+    {f: 2, c: 22318}, 22364, 22331, 22338, 22377, 22405, 22379, 22406, 22396,
+    22395, 22376, 22381, 22390, 22387, 22445, 22436, 22412, 22450, 22479,
+    22439, 22452, 22419, 22432, 22485, 22488, 22490, 22489, 22482, 22456,
+    22516, 22511, 22520, 22500, 22493, 22539, 22541, 22525, 22509, 22528,
+    22558, 22553, 22596, 22560, 22629, 22636, 22657, 22665, 22682, 22656,
+    39336, 40729, 25087, 33401, 33405, 33407, 33423, 33418, 33448, 33412,
+    33422, 33425, 33431, 33433, 33451, 33464, 33470, 33456, 33480, 33482,
+    33507, 33432, 33463, 33454, {f: 2, c: 33483}, 33473, 33449, 33460, 33441,
+    33450, 33439, 33476, 33486, 33444, 33505, 33545, 33527, 33508, 33551,
+    33543, 33500, 33524, 33490, 33496, 33548, 33531, 33491, 33553, 33562,
+    33542, {f: 2, c: 33556}, 33504, 33493, 33564, 33617, {f: 2, c: 33627},
+    33544, 33682, 33596, 33588, 33585, 33691, 33630, 33583, 33615, 33607,
+    33603, 33631, 33600, 33559, 33632, 33581, 33594, 33587, 33638, 33637,
+    33640, 33563, 33641, 33644, 33642, {f: 2, c: 33645}, 33712, 33656,
+    {f: 2, c: 33715}, 33696, 33706, 33683, 33692, 33669, 33660, 33718, 33705,
+    33661, 33720, 33659, 33688, 33694, 33704, 33722, 33724, 33729, 33793,
+    33765, 33752, 22535, 33816, 33803, 33757, 33789, 33750, 33820, 33848,
+    33809, 33798, 33748, 33759, 33807, 33795, {f: 2, c: 33784}, 33770, 33733,
+    33728, 33830, 33776, 33761, 33884, 33873, 33882, 33881, 33907,
+    {f: 2, c: 33927}, 33914, 33929, 33912, 33852, 33862, 33897, 33910, 33932,
+    33934, 33841, 33901, 33985, 33997, 34000, 34022, 33981, 34003, 33994,
+    33983, 33978, 34016, 33953, 33977, 33972, 33943, 34021, 34019, 34060,
+    29965, 34104, 34032, 34105, 34079, 34106, 34134, 34107, 34047, 34044,
+    34137, 34120, 34152, 34148, 34142, 34170, 30626, 34115, 34162, 34171,
+    34212, 34216, 34183, 34191, 34169, 34222, 34204, 34181, 34233, 34231,
+    34224, 34259, 34241, 34268, 34303, 34343, 34309, 34345, 34326, 34364,
+    [12086, 24318], 24328, 22844, 22849, 32823, 22869, 22874, 22872, 21263,
+    [12074, 23586], 23589, 23596, 23604, 25164, 25194, 25247, 25275, 25290,
+    25306, 25303, 25326, 25378, 25334, 25401, 25419, 25411, 25517, 25590,
+    25457, 25466, 25486, 25524, 25453, 25516, 25482, 25449, 25518, 25532,
+    25586, 25592, 25568, 25599, 25540, 25566, 25550, 25682, 25542, 25534,
+    25669, 25665, 25611, 25627, 25632, 25612, 25638, 25633, 25694, 25732,
+    25709, 25750, 25722, {f: 2, c: 25783}, 25753, 25786, 25792, 25808, 25815,
+    25828, 25826, 25865, 25893, 25902, [12087, 24331], 24530, 29977, 24337,
+    21343, 21489, 21501, 21481, 21480, 21499, 21522, 21526, 21510, 21579,
+    {f: 3, c: 21586}, 21590, 21571, 21537, 21591, 21593, 21539, 21554, 21634,
+    21652, 21623, 21617, 21604, {f: 2, c: 21658}, 21636, 21622, 21606, 21661,
+    21712, 21677, 21698, 21684, 21714, 21671, 21670, {f: 2, c: 21715}, 21618,
+    21667, 21717, 21691, 21695, 21708, {f: 2, c: 21721}, 21724,
+    {f: 2, c: 21673}, 21668, 21725, 21711, 21726, 21787, 21735, 21792, 21757,
+    21780, 21747, {f: 2, c: 21794}, 21775, 21777, 21799, 21802, 21863, 21903,
+    21941, 21833, 21869, 21825, 21845, 21823, 21840, 21820, 21815, 21846,
+    {f: 3, c: 21877}, 21811, 21808, 21852, 21899, 21970, 21891, 21937, 21945,
+    21896, 21889, 21919, 21886, 21974, 21905, 21883, 21983, {f: 2, c: 21949},
+    21908, 21913, 21994, 22007, 21961, 22047, 21969, {f: 2, c: 21995}, 21972,
+    21990, 21981, 21956, 21999, 21989, {f: 2, c: 22002}, {f: 2, c: 21964},
+    21992, 22005, 21988, 36756, 22046, 22024, 22028, 22017, 22052, 22051,
+    22014, 22016, 22055, 22061, 22104, 22073, 22103, 22060, 22093, 22114,
+    22105, 22108, 22092, 22100, 22150, 22116, 22129, 22123, {f: 2, c: 22139},
+    22149, 22163, 22191, 22228, [12062, 22231], 22237, 22241, 22261, 22251,
+    22265, 22271, 22276, 22282, 22281, 22300, 24079, 24089, 24084, 24081,
+    24113, {f: 2, c: 24123}, 24119, 24132, 24148, 24155, 24158, 24161, 23692,
+    23674, 23693, 23696, 23702, 23688, {f: 2, c: 23704}, 23697, 23706, 23708,
+    23733, 23714, 23741, 23724, 23723, 23729, 23715, 23745, 23735, 23748,
+    23762, 23780, 23755, 23781, {f: 2, c: 23810}, 23847, 23846, 23854, 23844,
+    23838, 23814, 23835, 23896, 23870, 23860, 23869, 23916, 23899, 23919,
+    23901, 23915, 23883, 23882, 23913, 23924, 23938, 23961, 23965, 35955,
+    23991, 24005, [12091, 24435], 24439, 24450, 24455, 24457, 24460, 24469,
+    24473, 24476, 24488, 24493, 24501, 24508, 34914, [12090, 24417], 29357,
+    29360, 29364, {f: 2, c: 29367}, 29379, 29377, 29390, 29389, 29394, 29416,
+    29423, 29417, 29426, 29428, 29431, 29441, 29427, 29443, {f: 2, c: 29434},
+    29463, 29459, 29473, 29450, 29470, 29469, 29461, 29474, 29497, 29477,
+    29484, 29496, 29489, 29520, 29517, 29527, 29536, 29548, 29551, 29566,
+    [12167, 33307], 22821, 39143, 22820, [12065, 22786], 39267,
+    {f: 6, c: 39271}, 39284, 39287, 39293, 39296, 39300, 39303, 39306, 39309,
+    {f: 2, c: 39312}, {f: 3, c: 39315}, 24192, 24209, 24203, 24214, 24229,
+    24224, 24249, 24245, 24254, 24243, 36179, 24274, 24273, 24283, 24296,
+    24298, 33210, 24516, 24521, 24534, 24527, 24579, 24558, 24580, 24545,
+    24548, 24574, {f: 2, c: 24581}, 24554, 24557, 24568, 24601, 24629, 24614,
+    24603, 24591, 24589, 24617, 24619, 24586, 24639, 24609, {f: 2, c: 24696},
+    24699, 24698, 24642, 24682, 24701, 24726, 24730, 24749, 24733, 24707,
+    24722, 24716, 24731, 24812, 24763, 24753, 24797, 24792, 24774, 24794,
+    24756, 24864, 24870, 24853, 24867, 24820, 24832, 24846, 24875, 24906,
+    24949, 25004, 24980, 24999, 25015, 25044, 25077, 24541, 38579, 38377,
+    38379, 38385, 38387, {f: 2, c: 38389}, 38396, 38398, {f: 2, c: 38403},
+    38406, 38408, {f: 4, c: 38410}, 38415, 38418, {f: 3, c: 38421},
+    {f: 2, c: 38425}, 20012, [12121, 29247], 25109, 27701, 27732, 27740, 27722,
+    27811, 27781, 27792, 27796, 27788, {f: 2, c: 27752}, 27764, 27766, 27782,
+    27817, 27856, 27860, 27821, {f: 2, c: 27895}, 27889, 27863, 27826, 27872,
+    27862, 27898, 27883, 27886, 27825, 27859, 27887, 27902, 27961, 27943,
+    27916, 27971, 27976, 27911, 27908, 27929, 27918, 27947, 27981, 27950,
+    27957, 27930, 27983, 27986, 27988, 27955, 28049, 28015, 28062, 28064,
+    27998, {f: 2, c: 28051}, 27996, 28000, 28028, 28003, 28186, 28103, 28101,
+    28126, 28174, 28095, 28128, 28177, 28134, 28125, 28121, 28182, 28075,
+    28172, 28078, 28203, 28270, 28238, 28267, 28338, 28255, 28294,
+    {f: 2, c: 28243}, 28210, 28197, 28228, 28383, 28337, 28312, 28384, 28461,
+    28386, 28325, 28327, 28349, 28347, 28343, 28375, 28340, 28367, 28303,
+    28354, 28319, 28514, {f: 2, c: 28486}, 28452, 28437, 28409, 28463, 28470,
+    28491, 28532, 28458, 28425, 28457, 28553, 28557, 28556, 28536, 28530,
+    28540, 28538, 28625, 28617, 28583, 28601, 28598, 28610, 28641, 28654,
+    28638, 28640, 28655, 28698, 28707, 28699, 28729, 28725, 28751, 28766,
+    [12071, 23424], 23428, 23445, 23443, 23461, 23480, 29999, 39582, 25652,
+    23524, 23534, 35120, 23536, 36423, 35591, 36790, 36819, 36821, 36837,
+    36846, 36836, 36841, 36838, 36851, 36840, 36869, 36868, 36875, 36902,
+    36881, 36877, 36886, 36897, {f: 2, c: 36917}, 36909, 36911, 36932,
+    {f: 2, c: 36945}, 36944, 36968, 36952, 36962, 36955, 26297, 36980, 36989,
+    36994, 37000, 36995, 37003, [12089, 24400], 24407, 24406, 24408, 23611,
+    21675, 23632, 23641, 23409, 23651, 23654, 32700, 24362, 24361, 24365,
+    33396, 24380, 39739, [12076, 23662], 22913, 22915, 22925, {f: 2, c: 22953},
+    22947, 22935, 22986, 22955, 22942, 22948, 22994, 22962, 22959, 22999,
+    22974, {f: 2, c: 23045}, 23005, 23048, 23011, 23000, 23033, 23052, 23049,
+    23090, 23092, 23057, 23075, 23059, 23104, 23143, 23114, 23125, 23100,
+    23138, 23157, 33004, 23210, 23195, 23159, 23162, 23230, 23275, 23218,
+    23250, 23252, 23224, 23264, 23267, 23281, 23254, 23270, 23256, 23260,
+    23305, 23319, 23318, 23346, 23351, 23360, 23573, 23580, 23386, 23397,
+    23411, 23377, 23379, 23394, 39541, {f: 2, c: 39543}, 39546, 39551, 39549,
+    {f: 2, c: 39552}, 39557, 39560, 39562, 39568, {f: 2, c: 39570}, 39574,
+    39576, {f: 3, c: 39579}, {f: 2, c: 39583}, {f: 2, c: 39586}, 39589, 39591,
+    32415, 32417, 32419, 32421, {f: 2, c: 32424}, 32429, 32432, 32446,
+    {f: 3, c: 32448}, 32457, {f: 2, c: 32459}, 32464, 32468, 32471, 32475,
+    {f: 2, c: 32480}, 32488, 32491, {f: 2, c: 32494}, {f: 2, c: 32497}, 32525,
+    32502, {f: 2, c: 32506}, 32510, {f: 3, c: 32513}, {f: 2, c: 32519},
+    {f: 2, c: 32523}, 32527, {f: 2, c: 32529}, 32535, 32537, 32540, 32539,
+    32543, {f: 7, c: 32545}, {f: 4, c: 32554}, {f: 5, c: 32559}, 32565,
+    [12083, 24186], 30079, [12078, 24027], 30014, 37013, 29582, 29585, 29614,
+    29602, 29599, 29647, 29634, 29649, 29623, 29619, 29632, 29641, 29640,
+    29669, 29657, 39036, 29706, 29673, 29671, 29662, 29626, 29682, 29711,
+    29738, 29787, 29734, 29733, 29736, 29744, 29742, 29740, 29723, 29722,
+    29761, 29788, 29783, 29781, 29785, 29815, 29805, 29822, 29852, 29838,
+    {f: 2, c: 29824}, 29831, 29835, 29854, {f: 2, c: 29864}, 29840, 29863,
+    29906, 29882, {f: 3, c: 38890}, 26444, 26451, 26462, 26440, 26473, 26533,
+    26503, 26474, 26483, 26520, 26535, 26485, 26536, 26526, 26541, 26507,
+    26487, 26492, 26608, 26633, 26584, 26634, 26601, 26544, 26636, 26585,
+    26549, 26586, 26547, 26589, 26624, 26563, 26552, 26594, 26638, 26561,
+    26621, {f: 2, c: 26674}, {f: 2, c: 26720}, 26702, 26722, 26692, 26724,
+    26755, 26653, 26709, 26726, 26689, 26727, 26688, 26686, 26698, 26697,
+    26665, 26805, 26767, 26740, 26743, 26771, 26731, 26818, 26990, 26876,
+    {f: 2, c: 26911}, 26873, 26916, 26864, 26891, 26881, 26967, 26851, 26896,
+    26993, 26937, 26976, 26946, 26973, 27012, 26987, 27008, 27032, 27000,
+    26932, 27084, {f: 2, c: 27015}, 27086, 27017, 26982, 26979, 27001, 27035,
+    27047, 27067, 27051, 27053, 27092, 27057, 27073, 27082, 27103, 27029,
+    27104, 27021, 27135, 27183, 27117, {f: 2, c: 27159}, 27237, 27122, 27204,
+    27198, 27296, 27216, 27227, 27189, 27278, 27257, 27197, 27176, 27224,
+    27260, 27281, 27280, 27305, 27287, 27307, 29495, 29522, {f: 2, c: 27521},
+    27527, 27524, {f: 2, c: 27538}, 27533, {f: 2, c: 27546}, 27553, 27562,
+    36715, 36717, {f: 3, c: 36721}, {f: 2, c: 36725}, 36728, 36727,
+    {f: 2, c: 36729}, 36732, 36734, {f: 2, c: 36737}, 36740, 36743, 36747,
+    {f: 3, c: 36749}, 36760, 36762, 36558, 25099, 25111, 25115, 25119, 25122,
+    25121, 25125, 25124, 25132, 33255, 29935, 29940, 29951, 29967, 29969,
+    29971, [12097, 25908], {f: 3, c: 26094}, 26122, 26137, 26482, 26115, 26133,
+    26112, 28805, 26359, 26141, 26164, 26161, 26166, 26165, 32774, 26207,
+    26196, 26177, 26191, 26198, 26209, 26199, 26231, 26244, 26252, 26279,
+    26269, 26302, {f: 2, c: 26331}, 26342, 26345, {f: 2, c: 36146}, 36150,
+    36155, 36157, 36160, {f: 2, c: 36165}, {f: 2, c: 36168}, 36167, 36173,
+    36181, 36185, 35271, {f: 3, c: 35274}, {f: 4, c: 35278}, 29294, 29343,
+    29277, 29286, 29295, {f: 2, c: 29310}, 29316, 29323, 29325, 29327, 29330,
+    25352, 25394, 25520, 25663, 25816, 32772, 27626, 27635, 27645, 27637,
+    27641, 27653, 27655, 27654, 27661, 27669, {f: 3, c: 27672}, 27681, 27689,
+    27684, 27690, 27698, 25909, 25941, 25963, 29261, 29266, 29270, 29232,
+    34402, 21014, 32927, 32924, 32915, 32956, 26378, 32957, 32945, 32939,
+    32941, 32948, 32951, {f: 4, c: 32999}, 32987, 32962, 32964, 32985, 32973,
+    32983, 26384, 32989, 33003, 33009, 33012, 33005, {f: 2, c: 33037}, 33010,
+    33020, 26389, 33042, 35930, 33078, 33054, 33068, 33048, 33074, 33096,
+    33100, 33107, 33140, {f: 2, c: 33113}, 33137, 33120, 33129,
+    {f: 2, c: 33148}, 33133, 33127, 22605, 23221, 33160, 33154, 33169, 28373,
+    33187, 33194, 33228, 26406, 33226, 33211, 33217, 33190, 27428, 27447,
+    27449, 27459, 27462, 27481, {f: 3, c: 39121}, 39125, {f: 2, c: 39129},
+    [12110, 27571], 24384, 27586, 35315, 26000, 40785, 26003, 26044, 26054,
+    26052, 26051, 26060, 26062, 26066, 26070, 28800, 28828, 28822, 28829,
+    28859, 28864, 28855, 28843, 28849, 28904, 28874, 28944, 28947, 28950,
+    28975, 28977, 29043, 29020, 29032, 28997, 29042, 29002, 29048, 29050,
+    29080, 29107, 29109, 29096, 29088, 29152, 29140, 29159, 29177, 29213,
+    29224, 28780, 28952, 29030, 29113, 25150, 25149, 25155, {f: 2, c: 25160},
+    31035, 31040, 31046, 31049, {f: 2, c: 31067}, 31059, 31066, 31074, 31063,
+    31072, 31087, 31079, 31098, 31109, 31114, 31130, 31143, 31155, 24529,
+    24528, 24636, 24669, 24666, 24679, 24641, 24665, 24675, 24747, 24838,
+    24845, 24925, 25001, 24989, 25035, 25041, 25094, 32896, [12160, 32895],
+    27795, 27894, 28156, 30710, 30712, 30720, 30729, {f: 2, c: 30743}, 30737,
+    26027, 30765, {f: 2, c: 30748}, {f: 3, c: 30777}, 30751, 30780, 30757,
+    30764, 30755, 30761, 30798, 30829, {f: 2, c: 30806}, 30758, 30800, 30791,
+    30796, 30826, 30875, 30867, 30874, 30855, 30876, 30881, 30883, 30898,
+    30905, 30885, 30932, 30937, 30921, 30956, 30962, 30981, 30964, 30995,
+    31012, 31006, 31028, 40859, [12235, 40697], {f: 2, c: 40699}, 30449, 30468,
+    30477, 30457, {f: 2, c: 30471}, 30490, 30498, 30489, 30509, 30502, 30517,
+    30520, {f: 2, c: 30544}, 30535, 30531, 30554, 30568, 30562, 30565, 30591,
+    30605, 30589, 30592, 30604, 30609, {f: 2, c: 30623}, 30640, 30645, 30653,
+    30010, 30016, 30030, 30027, 30024, 30043, 30066, 30073, 30083, 32600,
+    32609, 32607, 35400, 32616, 32628, 32625, 32633, 32641, 32638, 30413,
+    30437, 34866, {f: 3, c: 38021}, 38027, 38026, {f: 2, c: 38028},
+    {f: 2, c: 38031}, 38036, 38039, 38037, {f: 3, c: 38042}, {f: 2, c: 38051},
+    38059, 38058, 38061, 38060, {f: 2, c: 38063}, 38066, 38068,
+    {f: 5, c: 38070}, {f: 2, c: 38076}, 38079, 38084, {f: 7, c: 38088},
+    {f: 3, c: 38096}, {f: 3, c: 38101}, 38105, 38104, 38107, {f: 3, c: 38110},
+    38114, {f: 2, c: 38116}, {f: 2, c: 38119}, 38122, 38121, 38123,
+    {f: 2, c: 38126}, {f: 3, c: 38131}, 38135, 38137, {f: 2, c: 38140}, 38143,
+    38147, 38146, {f: 2, c: 38150}, {f: 2, c: 38153}, {f: 3, c: 38157},
+    {f: 5, c: 38162}, 38168, 38171, {f: 3, c: 38173}, 38178, {f: 2, c: 38186},
+    38185, 38188, {f: 2, c: 38193}, 38196, {f: 3, c: 38198}, 38204,
+    {f: 2, c: 38206}, 38210, 38197, {f: 3, c: 38212}, 38217, 38220,
+    {f: 2, c: 38222}, {f: 3, c: 38226}, {f: 4, c: 38230}, 38235,
+    {f: 2, c: 38238}, 38237, {f: 2, c: 38241}, {f: 9, c: 38244}, 38255,
+    {f: 3, c: 38257}, 38202, 30695, 30700, 38601, 31189, 31213, 31203, 31211,
+    31238, 23879, 31235, 31234, 31262, 31252, 31289, 31287, 31313, 40655,
+    39333, 31344, 30344, 30350, 30355, 30361, 30372, 29918, 29920, 29996,
+    40480, 40482, {f: 5, c: 40488}, 40498, 40497, 40502, 40504, 40503,
+    {f: 2, c: 40505}, 40510, {f: 2, c: 40513}, 40516, {f: 4, c: 40518},
+    {f: 2, c: 40523}, 40526, 40529, 40533, 40535, {f: 3, c: 40538}, 40542,
+    40547, {f: 7, c: 40550}, 40561, 40557, 40563, [12135, 30098], 30100, 30102,
+    30112, 30109, 30124, 30115, {f: 2, c: 30131}, 30136, 30148, 30129, 30128,
+    30147, 30146, 30166, 30157, 30179, 30184, 30182, 30180, 30187, 30183,
+    30211, 30193, 30204, 30207, 30224, 30208, 30213, 30220, 30231, 30218,
+    30245, 30232, 30229, 30233, 30235, 30268, 30242, 30240, 30272, 30253,
+    30256, 30271, 30261, 30275, 30270, 30259, 30285, 30302, 30292, 30300,
+    30294, 30315, 30319, 32714, 31462, {f: 2, c: 31352}, 31360, 31366, 31368,
+    31381, 31398, 31392, 31404, 31400, 31405, 31411, 34916, 34921, 34930,
+    34941, 34943, 34946, 34978, 35014, 34999, 35004, 35017, 35042, 35022,
+    35043, 35045, 35057, 35098, 35068, 35048, 35070, 35056, 35105, 35097,
+    35091, 35099, 35082, 35124, 35115, 35126, 35137, 35174, 35195,
+    [12134, 30091], 32997, 30386, 30388, 30684, [12158, 32786], 32788, 32790,
+    32796, 32800, 32802, {f: 3, c: 32805}, 32809, 32808, 32817, 32779, 32821,
+    32835, 32838, 32845, 32850, 32873, 32881, 35203, 39032, 39040, 39043,
+    39049, {f: 2, c: 39052}, 39055, 39060, {f: 2, c: 39066}, {f: 2, c: 39070},
+    {f: 2, c: 39073}, {f: 2, c: 39077}, [12172, 34381], 34388, 34412, 34414,
+    34431, 34426, 34428, 34427, 34472, 34445, 34443, 34476, 34461, 34471,
+    34467, 34474, 34451, 34473, 34486, 34500, 34485, 34510, 34480, 34490,
+    34481, 34479, 34505, 34511, 34484, 34537, {f: 2, c: 34545}, 34541, 34547,
+    34512, 34579, 34526, 34548, 34527, 34520, 34513, 34563, 34567, 34552,
+    34568, 34570, 34573, 34569, 34595, 34619, 34590, 34597, 34606, 34586,
+    34622, 34632, 34612, 34609, 34601, 34615, 34623, 34690, 34594,
+    {f: 2, c: 34685}, 34683, 34656, 34672, 34636, 34670, 34699, 34643, 34659,
+    34684, 34660, 34649, 34661, 34707, 34735, 34728, 34770, 34758, 34696,
+    34693, 34733, 34711, 34691, 34731, 34789, 34732, 34741, 34739, 34763,
+    34771, 34749, 34769, 34752, 34762, 34779, 34794, 34784, 34798, 34838,
+    34835, 34814, 34826, 34843, 34849, 34873, 34876, [12152, 32566], 32578,
+    {f: 2, c: 32580}, 33296, 31482, 31485, 31496, {f: 2, c: 31491}, 31509,
+    31498, 31531, 31503, 31559, 31544, 31530, 31513, 31534, 31537, 31520,
+    31525, 31524, 31539, 31550, 31518, 31576, 31578, 31557, 31605, 31564,
+    31581, 31584, 31598, 31611, 31586, 31602, 31601, 31632, {f: 2, c: 31654},
+    31672, 31660, 31645, 31656, 31621, 31658, 31644, 31650, 31659, 31668,
+    31697, 31681, 31692, 31709, 31706, {f: 2, c: 31717}, 31722, 31756, 31742,
+    31740, 31759, 31766, 31755, 31775, 31786, 31782, 31800, 31809, 31808,
+    33278, {f: 2, c: 33281}, 33284, 33260, 34884, {f: 3, c: 33313}, 33325,
+    33327, 33320, 33323, 33336, 33339, {f: 2, c: 33331}, 33342, 33348, 33353,
+    33355, 33359, 33370, 33375, 33384, 34942, 34949, 34952, 35032, 35039,
+    35166, 32669, 32671, 32679, {f: 2, c: 32687}, 32690, 31868, 25929, 31889,
+    31901, 31900, 31902, 31906, 31922, {f: 2, c: 31932}, 31937, 31943,
+    {f: 2, c: 31948}, 31944, 31941, 31959, 31976, [12169, 33390], 26280, 32703,
+    32718, 32725, 32741, 32737, 32742, 32745, 32750, 32755, [12151, 31992],
+    32119, 32166, 32174, 32327, 32411, 40632, 40628, 36211, 36228, 36244,
+    36241, 36273, 36199, 36205, 35911, 35913, 37194, 37200, {f: 2, c: 37198},
+    37220, 37218, 37217, 37232, 37225, 37231, {f: 2, c: 37245}, 37234, 37236,
+    37241, 37260, 37253, 37264, 37261, 37265, {f: 2, c: 37282}, 37290,
+    {f: 3, c: 37293}, 37301, 37300, 37306, [12183, 35925], 40574, 36280, 36331,
+    36357, 36441, 36457, 36277, 36287, 36284, 36282, 36292, {f: 2, c: 36310},
+    36314, 36318, {f: 2, c: 36302}, 36315, 36294, 36332, {f: 2, c: 36343},
+    36323, 36345, 36347, 36324, 36361, 36349, 36372, 36381, 36383, 36396,
+    36398, 36387, 36399, 36410, 36416, 36409, 36405, 36413, 36401, 36425,
+    {f: 2, c: 36417}, {f: 2, c: 36433}, 36426, 36464, 36470, 36476, 36463,
+    36468, 36485, 36495, 36500, 36496, 36508, 36510, [12184, 35960], 35970,
+    35978, 35973, 35992, 35988, 26011, 35286, 35294, 35290, 35292, 35301,
+    35307, 35311, 35390, 35622, 38739, 38633, 38643, 38639, 38662, 38657,
+    38664, 38671, 38670, 38698, 38701, 38704, 38718, 40832, 40835,
+    {f: 6, c: 40837}, 40844, 40702, 40715, 40717, [12203, 38585],
+    {f: 2, c: 38588}, 38606, 38610, 30655, 38624, 37518, 37550, 37576, 37694,
+    37738, 37834, 37775, 37950, 37995, 40063, 40066, {f: 4, c: 40069}, 31267,
+    40075, 40078, {f: 3, c: 40080}, {f: 2, c: 40084}, {f: 2, c: 40090},
+    {f: 6, c: 40094}, {f: 5, c: 40101}, 40107, {f: 2, c: 40109},
+    {f: 8, c: 40112}, {f: 4, c: 40122}, {f: 4, c: 40132}, {f: 7, c: 40138},
+    {f: 3, c: 40147}, {f: 3, c: 40151}, {f: 2, c: 40156}, 40159, 40162, 38780,
+    38789, {f: 2, c: 38801}, 38804, 38831, 38827, 38819, 38834, 38836, 39601,
+    39600, 39607, 40536, 39606, 39610, 39612, 39617, 39616, 39621, 39618,
+    {f: 2, c: 39627}, 39633, 39749, 39747, 39751, 39753, 39752, 39757, 39761,
+    39144, 39181, 39214, 39253, 39252, [12221, 39647], 39649, 39654, 39663,
+    39659, 39675, 39661, 39673, 39688, 39695, 39699, 39711, 39715,
+    {f: 2, c: 40637}, 32315, 40578, {f: 2, c: 40583}, 40587, 40594, 37846,
+    40605, 40607, {f: 3, c: 40667}, 40672, 40671, 40674, 40681, 40679, 40677,
+    40682, 40687, 40738, 40748, 40751, 40761, 40759, {f: 2, c: 40765}, 40772,
+    12295, {s: 13}, 30362, 34297, 31001, 24859, 39599, 35158, 22761, 32631,
+    25850, 25943, 38930, 36774, 32070, 24171, 32129, 37770, 35607, 39165,
+    23542, 22577, 39825, 36649, [12185, 35997], 37575, 29437, 20633, 24970,
+    32179, 31558, 30050, 25987, 24163, 38281, 37002, 32232, 36022, 35722,
+    36783, 36782, 27161, 40009, 30303, 28693, 28657, 36051, 25839, 39173,
+    25765, 37474, 37457, 39361, 35036, 36001, 21443, 34870, 27544, 24922,
+    24920, 29158, 33980, 33369, 20489, 28356, 21408, 20596, 28204, 23652,
+    35435, 25881, 25723, 34796, 39262, 35730, 32399, 37855, 29987, 38369,
+    39019, 22580, 22039, [12199, 38263], 20767, 33144, 24288, 26274, 37396,
+    [12190, 36554], 24505, 22645, 38515, 35183, 31281, 25074, 35488, 39425,
+    36978, 39347, [12242, 40786], 29118, 34909, 34802, 23541, 30087, 36490,
+    31820, 32162, 37276, 37604, 38619, 30990, 20786, 35320, 34389, 20659,
+    30241, 38358, 21109, 37656, 32020, 32189, 36781, 35422, 36060, 32880,
+    24478, 21474, 36517, 31428, 37679, 36948, 24118, 36024, 25812, 21934,
+    37170, 25763, 33213, 24986, 35477, 24392, 30070, 25803, 40680, 34153,
+    27284, 25623, 23798, 31153, 23566, 29128, 37159, 25973, 28364, 36958,
+    32224, 39003, 40670, 22666, 38651, 28593, 37347, 35519, 35548, 37336,
+    38914, 37664, 35330, 26481, 21205, 26847, 20941, [12222, 39717], 29346,
+    29544, 35712, 36077, 37709, 37723, 26039, 32222, 38538, 23565, 22136,
+    38931, 37389, 22890, 22702, 40285, 38989, 35355, 24801, 39187, 20818,
+    29246, 39180, 36019, 30332, 32624, 38309, 31020, 37353, 29033, 31684,
+    36009, 39151, 35370, 32033, [12214, 39131], 35513, 24290, 36027, 32027,
+    22707, 22894, 24996, 31966, 35920, 26963, 37586, [12213, 39080], 30219,
+    39342, 32299, 35575, 40179, 33178, 36667, 25771, 36628, 36070, 24489,
+    36000, 35331, 23142, 32283, 35442, 37411, 33995, 24185, 36245, 36123,
+    23713, 21083, 37628, 32177, 23831, 37804, 25841, 40255, 38307, 37499,
+    20491, 32102, 40852, 38799, 36002, 37390, 28317, 27083, 36092, 34865,
+    39015, 21102, 38364, 35264, 39208, 24931, 36011, 24291, 35215, 27512,
+    [12244, 40860], 38312, 36556, 35437, 27331, 36020, 21130, 36645, 37707,
+    22283, 36942, 39405, 38867, 28450, 34399, 38305, 40372, 36032, 36703,
+    40251, 32005, 22778, 35703, 28396, 22057, 33775, 30059, 21123, 35441,
+    25079, 22750, 27489, 29872, 36996, 32233, 35594, 25582, 36637, 36036,
+    31330, 26371, 29172, 21295, 35569, 35496, 32362, 33911, 28222, 29554,
+    36008, 31117, 25802, 27231, 31309, 39249, 35663, 40388, 32318, 32221,
+    26997, 36655, 32026, 25824, 24190, 34186, 21137, 28639, 35336, 35352,
+    38555, 32380, 32000, 22846, 33698, 38960, 36040, 37440, 20729, 39381,
+    27570, 30435, 22533, 31627, 38291, 33393, 32216, 32365, 27298, 40572,
+    25536, 25791, 31777, 20745, 34214, 27323, 37970, 36368, 36068,
+    [12178, 35211], 37749, 33382, 21133, 39198, 28472, 28666, 28567, 23559,
+    28479, 34083, 27123, 22892, 35611, 37292, 33184, 28550, 39509, 23308,
+    25898, 37496, 30703, 20709, 39171, 32371, 32094, 36686, 36611, 38542,
+    31680, 28500, 32080, 35489, 32202, 37670, 20677, 35641, 36914, 29180,
+    30433, 21185, 33686, 39912, 39514, 32147, 38968, 37857, 24465, 30169,
+    31478, 31998, 33290, 39378, 33289, 25818, 37624, 25084, 21127, 40273,
+    32121, 35258, 35363, 32118, 37406, 36557, 39423, 38283, 20977, 38982,
+    27579, 35506, 22718, 25031, 25715, 24235, 35122, 35463, 22602, 20744,
+    23532, 31014, 26336, 34407, 24011, 31418, 39243, 28528, 25844, 38346,
+    34847, 33240, 33802, 20358, 36084, 34253, 27396, 25876, 31811, 38348,
+    34349, 28734, 35733, 25900, 35261, 25078, 32412, 29211, 28651, 25736,
+    21214, 28551, 27138, 37939, 22744, 39006, 31852, 38626, 28757, 35023,
+    39881, 31150, 40599, 21426, 21237, 31019, 27511, 28701, 38584, 20486,
+    32879, 34030, 36899, 37934, 24976, 28451, 31806, 25986, 33225, 37832,
+    25088, 29001, 32244, 31975, 20841, 36635, 35538, 30274, 36988, 37904,
+    29557, 33256, 37168, 40023, 36035, 40801, 37428, 38728, 23994, 38936,
+    39230, 21129, [12243, 40845], 32894, 22184, 31840, 22751, 25871, 38580,
+    27155, 23105, 25695, 31757, 34310, 30439, 39025, 24300, 29200, 25796,
+    28407, 34396, 39791, 36034, 37682, 38520, 39522, 37569, 23650, 32311,
+    24942, 28670, 32209, 24018, 25891, 23423, 28772, 20098, 25476, 36650,
+    20523, 20374, 28138, 32184, 35542, 34367, 32645, 37007, 38012, 31854,
+    39486, 39409, 32097, 23229, 29802, 30908, 34718, [12218, 39340], 39393,
+    21966, 36023, [12230, 40613], 36067, 36993, 30622, 39237, 34875, 28415,
+    35646, 37672, 37466, 36031, 37762, [12200, 38272], 24758, 20497, 37683,
+    22818, 35598, 24396, 35219, 32191, 32236, 24287, 28357, 25003, 38313,
+    40180, 37528, 35628, 35584, 30045, 37385, 32013, 38627, 25747, 33126,
+    24817, 39719, 39186, 25836, 33193, 25862, 37312, [12227, 40165], 32886,
+    22169, 38007, 37811, 27320, 29552, 23527, 25840, 28632, 37397, 32016,
+    33215, 28611, 36786, 30247, 35582, 27472, 40407, 27590, 22036, 28442,
+    30436, 40848, 36064, 22132, 40300, 39449, 39108, 38971, 36007, 34315,
+    24977, 35413, 28497, 38935, 25778, 37610, 20693, 27192, 35676, 33229,
+    [12241, 40778], 39438, 35912, 21843, 27683, 35350, 29309, 37370, 37467,
+    36983, 31805, 35609, 37666, 37463, 28154, 35700, 22649, 27085, 21958,
+    22715, 34196, 25654, 37740, 27211, 21932, 20689, 32761, 31429, 31434,
+    27453, 35242, 23522, 36629, 27691, 20670, 38915, 35531, 24950, 29898,
+    31406, 36264, 21312, 36544, 39493, 40818, 39028, 27402, 21240, 40306,
+    30906, 35731, 39250, 25854, 32350, 29105, 38860, 35469, 32009, 27054,
+    32104, 36575, 37613, 38287, 28516, 28753, 34217, 39955, 36093, 20632,
+    21930, 39479, 25475, 28544, 27578, 32023, 31721, 26348, 38275, 38493,
+    36109, 32341, 20663, 36062, 29138, 32057, 36050, 25448, 25885, 25086,
+    35373, 32051, 23529, 23352, 33102, 28402, 32882, 32361, 21213, 32854,
+    24107, 29509, 28629, 35433, 26178, 34645, 23526, 35672, 39387, 21218,
+    36969, 37323, 39166, 35222, 35430, 22781, 29560, 27166, 36664, 26360,
+    36118, 23660, 34899, 27193, 31466, 25976, 24101, 38617, 35504, 38918,
+    35500, 30889, 29197, 32114, 39164, 39686, 32883, 24939, 38924, 35359,
+    35494, 25851, 34311, 35380, 32901, 38614, 38568, 32143, 27506, 23403,
+    25613, 32302, 29795, 37782, 29562, 25787, 33274, 24907, 25892, 36010,
+    30321, 28760, 22727, 35674, 35527, 22022, 28271, 29145, 28644, 32295,
+    35342, 39472, 35588, 37563, 38988, 39636, 26781, 36028, 37941, 24307,
+    32893, 28916, 37509, 32113, 38957, 22294, 22615, 22296, 38973, 40213,
+    39345, 39389, 27234, 31402, 35178, 24398, 28771, 38929, 33836, 32178,
+    [12209, 38859], 36949, 22285, 29234, 28656, 32173, 33894, 20553, 20702,
+    32239, 35586, 34907, 32862, 32011, 31337, 21839, 25790, 34680, 28198,
+    31401, 21978, 37794, 28879, 35491, 28961, 34154, 22626, 38695, 21209,
+    35492, 37675, 29351, 35186, 32722, 37521, 25138, 32048, 34662, 36676,
+    23805, 20448, 29433, 22151, 37697, 39854, 32406, 36066, 37532, 38289,
+    39023, 38570, 29694, 29563, 32291, 39201, 25010, 32171, 38002, 37129,
+    35443, 38911, 38917, 34157, 22210, 37559, 26313, 22063, 21332, 25406,
+    33029, 35559, 23531, 28681, 35613, 37573, 37313, 33288, 37561, 32137,
+    38920, 35377, 32210, 32396, 36562, 25080, 36984, 30316, 32098, 23416,
+    21211, 35426, 23563, 39348, 35347, 35338, 36956, 22739, 40201, 40232,
+    21854, 20126, 35357, 38329, 40573, 22196, 38996, 38331, 33399, 21421,
+    30831, 35578, 39511, 40230, 26954, 25562, 30221, 38525, 30306, 39178,
+    27171, 22575, 35617, 34277, 29242, [12212, 38913], 26989, 33865, 37291,
+    37541, 38948, 36986, 20736, 34811, 34269, 20740, 25014, 32681, 35427,
+    35696, 35516, 35695, 32377, 34093, 38512, 37504, 39154, 38577, 27387,
+    23344, 40441, 25033, 32403, 29801, 34722, 29151, 29074, 34821, 36111,
+    31310, 21938, 25793, 20653, 30320, 36404, 20778, 24962, 37109, 37438,
+    29494, 35480, 36671, 39192, [12226, 39770], 28417, 33287, 23996, 35486,
+    39729, 29508, 35709, 38928, 39341, 40219, 28149, 36677, 22290, 21729,
+    22291, 32227, 36960, 39000, 32004, 36493, 38000, 38322, 38642, 37142,
+    38549, 36939, 34292, 37270, 26248, 38620, 36617, 25890, 26283, 36106,
+    36124, 33247, 38015, 26839, 31432, 36012, 25799, 21063, 28580, 36042,
+    36104, 36555, 37720, 38296, 35408, 40779, 20661, 27656, 30430, 26028,
+    36670, 23940, 26855, 25136, 32187, 24373, 28466, 24115, 36076, 33081,
+    36249, 34756, 36685, 37754, 36889, 35998, 37341, 20597, 35386, 37806,
+    38499, 24128, 30309, 37165, 35657, 32340, 32887, 22519, 34937, 32025,
+    25711, 25842, 24159, 36074, 28399, 37912, 32066, 31278, 33131, 34886,
+    35589, 36600, 30394, 26205, 39519, 35576, 35461, 29165, 30682, 22225,
+    36015, 37956, 31689, 39376, 23560, 30938, 36681, 36090, 27137, 33674,
+    35037, 22941, 22767, 29376, 37648, 36101, 22684, 32180, 35524, 28310,
+    28609, 36039, 28460, 32156, 32317, 32305, 37138, 35419, 32068, 38013,
+    21959, 21401, 21428, 38760, 36107, 21293, 21297, 36094, 21060, 21132,
+    21108, 20660, 20480, 20630, 20757, 20738, 20756, 20796, 20791, 20712,
+    20674, 20795, 20752, 20794, 20681, 31988, 40652, 22213, 40172, 35131,
+    33248, 35329, 35344, 35340, 35349, 35635, 35406, 35365, 35393, 35382,
+    35398, 35412, 35416, 35410, 35462, 35460, 35455, 35440, 35452, 35445,
+    35436, 35438, 35533, 35554, 35425, 35482, 35493, {f: 2, c: 35473}, 35535,
+    35537, 35529, 35547, 35543, 35522, 35510, 35574, 35563, 35604, 35585,
+    35556, 35565, 35580, 35571, 35558, 35566, 35550, 35624, 35740, 35606,
+    35610, 35600, 35627, 35629, 35670, 35673, 35662, 35742, 35691, 35734,
+    38488, 37178, 37140, 37172, 37087, 37174, 37126, 37192, 33467, 21233,
+    24048, 22538, 22745, 22754, 22752, 22746, 22497, 22607, 22550, 22610,
+    22557, 22628, 34188, 34131, 34294, 33703, 33799, 34031, 33511, 34338,
+    34086, 22603, 29026, 34136, 34045, 34126, 34184, 34234, 29334, 28366,
+    34113, 34254, 34130, 33984, 33874, 33892, 33940, 33845, 34207, 34133,
+    40367, 33939, 32264, 34118, 34146, 34078, 39488, 34362, 37795, 34167,
+    34334, 34298, 34308, 34282, 34330, 22889, 23607, 25451, 25718, 25759,
+    25681, 25692, 25779, 25860, 25878, 25847, 25852, 25883, 22064, 22072,
+    22216, 22182, 21764, 21692, 22144, 22109, 22112, 22069, 22006, 22118,
+    22130, 22156, 22117, 22044, 22062, 21993, 22038, 22208, 22029, 22195,
+    22209, 22127, 36705, 22198, 22165, 22279, 24131, 24172, 24152, 24151,
+    23943, 23796, 23888, 23852, 23975, 23968, 23959, 23821, 23992, 23937,
+    24020, 24480, 29559, 29505, 29546, 29499, 29547, 29568, 29564, 39136,
+    39219, 39145, 39228, {f: 2, c: 39146}, 39149, 39156, 39177, 39185, 39195,
+    39223, 39231, 39235, {f: 3, c: 39240}, 39244, 39266, 24289, 36065, 25082,
+    25006, 24938, 24894, 24757, 24884, 25036, 24927, 25064, 24827, 24887,
+    24818, 24947, 24860, 24978, 38274, 38278, 38344, 38286, 38292, 38284,
+    38373, 38317, 38315, 39726, 38316, 38334, 38326, 39721, 38335, 38333,
+    38332, 38339, 38347, 38356, 38352, 38357, 38366, 28739, 28505, 28711,
+    28696, 28668, 28039, 28025, 28254, 28590, 28687, 28408, 28527, 28150,
+    28543, 28678, 28576, 28683, 28775, 28740, 28677, 28535, 28704, 28703,
+    28722, 28712, 28765, 39467, 36999, 36885, 37008, 23656, 24371, 23285,
+    23255, 23296, 23149, 23304, 23372, 23207, 23291, 23307, 23329, 23338,
+    23321, 39380, 39391, 39385, 39478, 39515, 39377, 39384, 39501, 39498,
+    39394, 39530, 39439, 39437, 39429, 39490, 39469, 39446, 39489, 39470,
+    39480, {f: 2, c: 39491}, 39503, 39525, 39524, 31993, 32006, 32002,
+    {f: 2, c: 32007}, 32394, 32028, 32021, 32019, 32058, 32050, 32049, 32272,
+    32060, 32064, 32063, 32093, 32078, 32115, 32134, 32131, 32136, 32190,
+    32186, 32203, 32212, 32196, 32158, 32172, 32185, 32163, 32176, 32199,
+    32217, 32215, 32249, 32242, 32354, 32230, 32246, 32241, 32267, 32225,
+    32265, 32285, 32287, 32286, 32301, 32266, 32273, 32381, 32313, 32309,
+    32306, 32326, 32325, 32392, 32346, 32338, 32366, 32382, 32368, 32367,
+    32408, 29859, 29771, 29903, 38922, 29885, 29759, 29833, 29862, 29908,
+    29914, 38873, 38878, 38876, 27050, 27370, 26776, 26838, 27141, 26783,
+    27355, 27379, 27368, 27359, 27273, 26895, 27208, 26984, 27071, 27194,
+    27292, 27410, 27422, 27357, 27111, 27407, 27414, 27372, 27354, 27384,
+    27315, 27367, 27299, 27347, 27358, 27556, 27550, 27566, 27563, 27567,
+    36564, 36571, 36594, 36603, 36708, 36601, 36604, 36587, 36580, 36706,
+    36602, 36606, 36618, 36615, 36613, 36626, 36646, {f: 2, c: 36638}, 36636,
+    36659, 36678, 36692, 25108, 25127, 29964, 26311, 26308, 26249, 26326,
+    36033, 36016, 36026, 36029, 36100, 36018, 36037, 36112, 36049, 36058,
+    36053, 36075, 36071, 36091, 35224, 35244, 35233, 35263, 35238, 35247,
+    35250, 35255, 27647, 27660, 27692, 29272, 26407, 33110, 33242, 33051,
+    33214, 33121, 33231, 27487, {f: 2, c: 39086}, 39094, 39100, 39110, 39112,
+    36674, 40783, 26005, 29036, 29010, 29079, 29121, 29148, 29182, 31152,
+    31118, 31146, 25055, 24932, 25059, 25095, 28585, 30959, 30893, 30824,
+    30904, 31018, 31025, 30820, 30973, 30951, 30947, 40853, 30616, 30558,
+    30652, 32646, 32648, {f: 3, c: 37330}, 37337, 37335, 37333, 37367, 37351,
+    37348, 37702, 37365, 37369, 37384, 37414, 37445, 37393, 37392, 37377,
+    37415, 37380, 37413, 37376, 37434, 37478, 37431, 37427, 37461, 37437,
+    37432, 37470, {f: 2, c: 37484}, 37439, 37984, 37424, 37449, 37448, 37453,
+    37422, 37433, 37944, 37548, 37536, 37498, 37546, 37614, 37583, 37891,
+    37603, 37946, 37553, 37542, 37799, 37526, 37580, 37545, 37877, 37523,
+    37503, 37801, 37530, 37658, 37547, 37507, 37899, 37544, 37539, 37906,
+    37688, 37617, 37847, 37605, 37616, 37615, 37608, 37564, 37597, 37622,
+    {f: 2, c: 37926}, 37571, 37599, 37606, 37650, 37638, 37737, 37659, 37696,
+    37633, 37653, 37678, 37699, {f: 2, c: 37639}, 37663, 37657, 37733, 37703,
+    37750, 37716, 37732, 37802, 37744, 37764, 37860, 37848, 37928, 37767,
+    37836, 37784, 37816, 37823, 37798, 37808, 37813, 37964, 37858,
+    {f: 2, c: 37852}, 37837, 37854, 37827, 37831, 37841, 37908, 37917, 37879,
+    37989, 37907, 37997, 37920, 38009, 37881, 37913, 37962, 37938, 37951,
+    37972, 37987, 37758, 31329, 40169, 40182, 40199, 40198, 40227, 40327,
+    40469, 40221, 40223, 40421, 40239, 40409, 40240, 40258, 40478, 40275,
+    40477, 40288, 40274, 40435, 40284, 40289, 40339, 40298, 40303, 40329,
+    40344, 40346, 40384, 40357, 40361, 40386, 40380, 40474, 40403, 40410,
+    40431, 40422, 40434, 40440, 40460, 40442, 40475, 30308, 30296, 30311,
+    30210, {f: 2, c: 30278}, 30281, 30238, 30267, {f: 2, c: 30317}, 30313,
+    30322, 31431, 31414, 35168, 35123, 35165, 35143, 35128, 35172, 30392,
+    32814, 32812, 32889, 32885, 38919, {f: 2, c: 38926}, 38945, 38940, 28481,
+    38950, 38967, 38990, 38995, 39027, 39010, 39001, 39013, 39020, 39024,
+    34787, 34822, 34566, 34851, 34806, 34554, 34799, 34692, 34832, 34760,
+    34833, 34747, 34766, 32588, 31716, 31591, 31849, 31731, 31744, 31691,
+    31836, 31774, 31787, 31779, 31850, 31839, 33380, 33387, 35018, 32677,
+    31986, 31990, 31965, 32310, 40617, 36274, 37317, 37315, 40570, 36489,
+    36428, 36498, 36474, 36437, 36506, 36491, 36499, 36497, 36513, 36451,
+    36522, 36518, 35316, 35318, 38746, 38722, 38717, 38724, 40788, 40799,
+    40793, 40800, 40796, 40806, 40812, 40810, 40823, [12236, 40701], 40703,
+    40713, 35726, 38014, 37864, 39799, 39796, 39809, 39811, 39822, 40056,
+    31308, 39826, 40031, 39824, 39853, 39834, 39850, 39838, 40045, 39851,
+    39837, 40024, 39873, 40058, 39985, 39993, 39971, 39991, 39872, 39882,
+    39879, 39933, 39894, {f: 2, c: 39914}, 39905, 39908, 39911, 39901, 39906,
+    39920, 39899, 39924, 39892, 40029, 39944, 39952, 39949, 39954, 39945,
+    39935, 39968, 39986, 39981, 39976, 39973, 39977, 39987, 39998, 40008,
+    39995, 39989, 40005, 40022, 40020, 40018, 40039, 38851, 38845, 38857,
+    40379, 39631, 39638, 39637, 39768, 39758, 39255, 39260, 39714, 40695,
+    40690, 35180, 38342, 37686, 24390, 34068, 32404, 40803, 22137, 40725,
+    22081, 39662, 35079, 31296, 39091, 38308, 39693, 36852, 24409, 31339,
+    39138, 20642, 34193, 20760, 25458, 21067, 30543, 32397, 26310, 30637,
+    [12228, 40565], 22217, 40692, 28635, 25054, 30663, 28720, 40629, 34890,
+    38370, 38854, 31844, 32308, 38822, 40623, 22220, 39089, 27311, 32590,
+    31984, 20418, 32363, 40569, 22190, 39706, 33903, 31142, 31858, 39634,
+    38587, 32251, 35069, 30787, {f: 10, c: 8560}, {f: 2, c: 714}, 729, 8211,
+    8213, 8229, 8245, 8453, 8457, {f: 4, c: 8598}, 8725, 8735, 8739, 8786,
+    {f: 2, c: 8806}, 8895, {f: 36, c: 9552}, {f: 15, c: 9601}, {f: 3, c: 9619},
+    {f: 2, c: 9660}, {f: 4, c: 9698}, 9737, 8853, 12306, {f: 2, c: 12317},
+    {f: 9, c: 12321}, 12963, {f: 2, c: 13198}, {f: 3, c: 13212}, 13217, 13252,
+    13262, {f: 2, c: 13265}, 13269, 65072, 65506, 65508, 8481, 12849, 8208,
+    12540, {f: 2, c: 12443}, {f: 2, c: 12541}, 12294, {f: 2, c: 12445},
+    {f: 10, c: 65097}, {f: 4, c: 65108}, {f: 14, c: 65113}, {f: 4, c: 65128},
+    12350, {f: 12, c: 12272}, 19970, {f: 3, c: 19972}, 19983, 19986, 19991,
+    {f: 3, c: 19999}, 20003, 20006, 20009, {f: 2, c: 20014}, 20017, 20019,
+    20021, 20023, 20028, {f: 3, c: 20032}, 20036, 20038, 20042, 20049, 20053,
+    20055, {f: 2, c: 20058}, {f: 4, c: 20066}, {f: 2, c: 20071},
+    {f: 6, c: 20074}, 20082, {f: 10, c: 20084}, {f: 3, c: 20095},
+    {f: 2, c: 20099}, [12037, 20101], 20103, 20106, 20112, {f: 2, c: 20118},
+    20121, {f: 2, c: 20124}, 20131, 20138, {f: 3, c: 20143}, 20148,
+    {f: 4, c: 20150}, {f: 3, c: 20156}, 20168, 20172, {f: 2, c: 20175}, 20178,
+    {f: 3, c: 20186}, 20192, 20194, {f: 2, c: 20198}, 20201, {f: 3, c: 20205},
+    20209, 20212, {f: 3, c: 20216}, 20220, 20222, 20224, {f: 7, c: 20226},
+    {f: 2, c: 20235}, {f: 5, c: 20242}, {f: 2, c: 20252}, 20257, 20259,
+    {f: 2, c: 20264}, {f: 3, c: 20268}, 20273, 20275, 20277, 20279, 20281,
+    20283, {f: 5, c: 20286}, {f: 2, c: 20292}, {f: 6, c: 20295}, 20306, 20308,
+    20310, {f: 2, c: 20321}, 20326, 20328, {f: 2, c: 20330}, {f: 2, c: 20333},
+    {f: 2, c: 20337}, 20341, {f: 4, c: 20343}, 20349, {f: 3, c: 20352}, 20357,
+    20359, 20362, 20364, 20366, 20368, {f: 2, c: 20370}, 20373,
+    {f: 3, c: 20376}, 20380, {f: 2, c: 20382}, {f: 2, c: 20385}, 20388, 20395,
+    20397, {f: 5, c: 20400}, {f: 9, c: 20406}, {f: 2, c: 20416},
+    {f: 4, c: 20422}, {f: 3, c: 20427}, {f: 5, c: 20434}, 20441, 20443, 20450,
+    {f: 2, c: 20452}, 20455, {f: 2, c: 20459}, 20464, 20466, {f: 4, c: 20468},
+    20473, {f: 3, c: 20475}, 20479, {f: 5, c: 20481}, {f: 2, c: 20487}, 20490,
+    20494, 20496, 20499, {f: 3, c: 20501}, 20507, {f: 2, c: 20509}, 20512,
+    {f: 3, c: 20514}, 20519, {f: 11, c: 20527}, 20539, 20541, {f: 4, c: 20543},
+    {f: 3, c: 20548}, {f: 2, c: 20554}, 20557, {f: 5, c: 20560},
+    {f: 4, c: 20566}, 20571, {f: 8, c: 20573}, {f: 6, c: 20582},
+    {f: 7, c: 20589}, {f: 3, c: 20600}, {f: 2, c: 20604}, {f: 4, c: 20609},
+    {f: 2, c: 20614}, {f: 4, c: 20617}, {f: 8, c: 20622}, 20631,
+    {f: 8, c: 20634}, 20644, 20646, {f: 2, c: 20650}, {f: 4, c: 20654}, 20662,
+    {f: 2, c: 20664}, {f: 2, c: 20668}, {f: 3, c: 20671}, {f: 2, c: 20675},
+    {f: 3, c: 20678}, {f: 5, c: 20682}, 20688, {f: 3, c: 20690},
+    {f: 3, c: 20695}, {f: 3, c: 20699}, {f: 6, c: 20703}, {f: 3, c: 20713},
+    {f: 4, c: 20719}, 20724, {f: 3, c: 20726}, 20730, {f: 4, c: 20732}, 20737,
+    20739, 20741, 20746, {f: 4, c: 20748}, 20753, 20755, {f: 2, c: 20758},
+    {f: 6, c: 20761}, 20768, {f: 8, c: 20770}, {f: 7, c: 20779},
+    {f: 4, c: 20787}, {f: 2, c: 20792}, {f: 2, c: 20797}, 20802, 20807, 20810,
+    20812, {f: 3, c: 20814}, 20819, {f: 3, c: 20823}, 20827, {f: 5, c: 20829},
+    {f: 2, c: 20835}, {f: 2, c: 20838}, 20842, 20847, 20850, 20858,
+    {f: 2, c: 20862}, {f: 2, c: 20867}, {f: 2, c: 20870}, {f: 2, c: 20874},
+    {f: 4, c: 20878}, {f: 2, c: 20883}, 20888, 20890, {f: 3, c: 20893}, 20897,
+    20899, {f: 5, c: 20902}, {f: 2, c: 20909}, 20916, {f: 3, c: 20920},
+    {f: 2, c: 20926}, {f: 3, c: 20929}, 20933, 20936, 20938, 20942, 20944,
+    {f: 9, c: 20946}, 20956, {f: 2, c: 20958}, {f: 2, c: 20962},
+    {f: 6, c: 20965}, 20972, 20974, 20978, 20980, 20983, 20990,
+    {f: 2, c: 20996}, 21001, {f: 2, c: 21003}, {f: 2, c: 21007},
+    {f: 3, c: 21011}, 21020, {f: 2, c: 21022}, {f: 3, c: 21025},
+    {f: 3, c: 21029}, 21034, 21036, 21039, {f: 2, c: 21041}, {f: 2, c: 21044},
+    21052, 21054, {f: 2, c: 21061}, {f: 2, c: 21064}, {f: 2, c: 21070},
+    {f: 2, c: 21074}, 21077, {f: 4, c: 21079}, 21085, {f: 2, c: 21087},
+    {f: 3, c: 21090}, 21094, 21096, {f: 3, c: 21099}, {f: 2, c: 21104}, 21107,
+    {f: 7, c: 21110}, 21118, 21120, {f: 3, c: 21124}, 21131, {f: 2, c: 21134},
+    21138, {f: 7, c: 21140}, 21148, {f: 4, c: 21156}, {f: 3, c: 21166},
+    {f: 10, c: 21172}, 21184, 21186, {f: 3, c: 21188}, 21192, 21194,
+    {f: 4, c: 21196}, 21201, {f: 2, c: 21203}, 21207, 21210, 21212,
+    {f: 2, c: 21216}, 21219, {f: 11, c: 21221}, {f: 3, c: 21234},
+    {f: 2, c: 21238}, {f: 3, c: 21243}, {f: 4, c: 21249}, 21255,
+    {f: 4, c: 21257}, 21262, {f: 4, c: 21265}, 21272, {f: 2, c: 21275},
+    {f: 2, c: 21278}, 21282, {f: 2, c: 21284}, {f: 3, c: 21287},
+    {f: 2, c: 21291}, 21296, {f: 6, c: 21298}, [12054, 21304],
+    {f: 2, c: 21308}, 21314, 21316, 21318, {f: 3, c: 21323}, 21328,
+    {f: 2, c: 21336}, 21339, 21341, 21349, 21352, 21354, {f: 2, c: 21356},
+    21362, 21366, 21369, {f: 4, c: 21371}, {f: 2, c: 21376}, 21379,
+    {f: 2, c: 21383}, 21386, {f: 7, c: 21390}, {f: 2, c: 21398},
+    {f: 2, c: 21403}, 21406, 21409, 21412, 21415, {f: 3, c: 21418},
+    {f: 3, c: 21423}, 21427, 21429, {f: 4, c: 21431}, {f: 3, c: 21436}, 21440,
+    {f: 4, c: 21444}, {f: 3, c: 21454}, {f: 2, c: 21458}, 21461, 21466,
+    {f: 3, c: 21468}, 21473, 21479, 21492, 21498, {f: 3, c: 21502}, 21506,
+    21509, 21511, 21515, 21524, {f: 3, c: 21528}, 21532, 21538,
+    {f: 2, c: 21540}, 21546, 21552, 21555, {f: 2, c: 21558}, 21562, 21565,
+    21567, {f: 2, c: 21569}, {f: 2, c: 21572}, 21575, 21577, {f: 4, c: 21580},
+    21585, 21594, {f: 5, c: 21597}, 21603, 21605, 21607, {f: 8, c: 21609},
+    21620, {f: 2, c: 21625}, {f: 2, c: 21630}, 21633, 21635, 21637,
+    {f: 4, c: 21639}, 21645, 21649, 21651, {f: 2, c: 21655}, 21660,
+    {f: 5, c: 21662}, 21669, 21678, 21680, 21682, {f: 3, c: 21685},
+    {f: 2, c: 21689}, 21694, 21699, 21701, {f: 2, c: 21706}, 21718, 21720,
+    21723, 21728, {f: 3, c: 21730}, {f: 2, c: 21739}, {f: 3, c: 21743},
+    {f: 6, c: 21748}, 21755, 21758, 21760, {f: 2, c: 21762}, 21765, 21768,
+    {f: 5, c: 21770}, {f: 2, c: 21778}, {f: 6, c: 21781}, {f: 4, c: 21788},
+    21793, {f: 2, c: 21797}, {f: 2, c: 21800}, 21803, 21805, 21810,
+    {f: 3, c: 21812}, {f: 4, c: 21816}, 21821, 21824, 21826, 21829,
+    {f: 2, c: 21831}, {f: 4, c: 21835}, {f: 2, c: 21841}, 21844,
+    {f: 5, c: 21847}, 21853, {f: 2, c: 21855}, {f: 2, c: 21858},
+    {f: 2, c: 21864}, 21867, {f: 6, c: 21871}, {f: 2, c: 21881}, 21885, 21887,
+    {f: 2, c: 21893}, {f: 3, c: 21900}, 21904, {f: 2, c: 21906},
+    {f: 3, c: 21909}, {f: 2, c: 21914}, 21918, {f: 7, c: 21920},
+    {f: 2, c: 21928}, 21931, 21933, {f: 2, c: 21935}, 21940, 21942, 21944,
+    21946, 21948, {f: 5, c: 21951}, 21960, {f: 2, c: 21962}, {f: 2, c: 21967},
+    21973, {f: 3, c: 21975}, 21979, 21982, 21984, 21986, 21991,
+    {f: 2, c: 21997}, {f: 2, c: 22000}, 22004, {f: 5, c: 22008}, 22015,
+    {f: 4, c: 22018}, 22023, {f: 2, c: 22026}, {f: 4, c: 22032}, 22037,
+    {f: 2, c: 22041}, 22045, {f: 3, c: 22048}, {f: 2, c: 22053}, 22056,
+    {f: 2, c: 22058}, 22067, 22071, 22074, {f: 3, c: 22076}, 22080,
+    {f: 10, c: 22082}, {f: 5, c: 22095}, {f: 2, c: 22101}, {f: 2, c: 22106},
+    {f: 2, c: 22110}, 22113, 22115, 22119, {f: 2, c: 22125}, 22128, 22131,
+    22133, 22135, 22138, {f: 3, c: 22141}, {f: 4, c: 22145}, {f: 4, c: 22152},
+    22157, {f: 3, c: 22160}, 22164, {f: 3, c: 22166}, {f: 9, c: 22170},
+    {f: 2, c: 22180}, 22183, {f: 5, c: 22185}, {f: 3, c: 22192}, 22197,
+    {f: 4, c: 22200}, {f: 3, c: 22205}, {f: 2, c: 22211}, {f: 2, c: 22214},
+    22219, {f: 4, c: 22221}, {f: 2, c: 22226}, {f: 2, c: 22229},
+    {f: 2, c: 22232}, 22236, 22243, {f: 6, c: 22245}, 22252, {f: 2, c: 22254},
+    {f: 2, c: 22258}, {f: 3, c: 22262}, {f: 2, c: 22267}, {f: 3, c: 22272},
+    22277, 22284, {f: 4, c: 22286}, {f: 2, c: 22292}, 22295, {f: 3, c: 22297},
+    {f: 2, c: 22301}, {f: 3, c: 22304}, {f: 4, c: 22308}, 22315,
+    {f: 2, c: 22321}, {f: 5, c: 22324}, {f: 2, c: 22332}, 22335, 22337,
+    {f: 4, c: 22339}, {f: 2, c: 22344}, 22347, {f: 5, c: 22354},
+    {f: 2, c: 22360}, {f: 2, c: 22370}, 22373, 22375, 22380, 22382,
+    {f: 3, c: 22384}, {f: 2, c: 22388}, {f: 3, c: 22392}, {f: 5, c: 22397},
+    {f: 4, c: 22407}, {f: 5, c: 22413}, {f: 7, c: 22420}, {f: 4, c: 22428},
+    22437, 22440, 22442, 22444, {f: 3, c: 22447}, 22451, {f: 3, c: 22453},
+    {f: 9, c: 22457}, {f: 7, c: 22468}, {f: 2, c: 22476}, {f: 2, c: 22480},
+    22483, {f: 2, c: 22486}, {f: 2, c: 22491}, 22494, {f: 2, c: 22498},
+    {f: 8, c: 22501}, 22510, {f: 4, c: 22512}, {f: 2, c: 22517},
+    {f: 2, c: 22523}, {f: 2, c: 22526}, 22529, {f: 2, c: 22531},
+    {f: 2, c: 22536}, 22540, {f: 3, c: 22542}, {f: 3, c: 22546},
+    {f: 2, c: 22551}, {f: 3, c: 22554}, 22559, {f: 2, c: 22562},
+    {f: 5, c: 22565}, {f: 4, c: 22571}, {f: 2, c: 22578}, {f: 14, c: 22582},
+    {f: 5, c: 22597}, 22606, 22608, 22611, {f: 2, c: 22613}, {f: 5, c: 22617},
+    {f: 3, c: 22623}, 22627, {f: 5, c: 22630}, {f: 8, c: 22637},
+    {f: 3, c: 22646}, {f: 4, c: 22650}, 22655, 22658, 22660, {f: 3, c: 22662},
+    {f: 7, c: 22667}, {f: 5, c: 22676}, 22683, 22685, {f: 8, c: 22688},
+    {f: 4, c: 22698}, {f: 4, c: 22703}, {f: 7, c: 22708}, 22717,
+    {f: 2, c: 22719}, {f: 3, c: 22722}, 22726, {f: 9, c: 22728}, 22738, 22740,
+    {f: 2, c: 22742}, {f: 3, c: 22747}, 22753, 22755, {f: 4, c: 22757}, 22762,
+    22765, {f: 2, c: 22769}, {f: 2, c: 22772}, {f: 2, c: 22775},
+    {f: 2, c: 22779}, {f: 4, c: 22782}, 22787, {f: 2, c: 22789},
+    {f: 2, c: 22792}, [12066, 22794], {f: 2, c: 22795}, 22798,
+    {f: 4, c: 22800}, {f: 2, c: 22807}, 22811, {f: 2, c: 22813},
+    {f: 2, c: 22816}, 22819, 22822, 22824, 22828, 22832, {f: 2, c: 22834},
+    {f: 2, c: 22837}, 22843, 22845, {f: 2, c: 22847}, 22851, {f: 2, c: 22853},
+    22858, {f: 2, c: 22860}, 22864, {f: 2, c: 22866}, 22873, {f: 5, c: 22875},
+    22881, {f: 2, c: 22883}, {f: 3, c: 22886}, 22891, 22893, {f: 4, c: 22895},
+    22901, 22903, {f: 3, c: 22906}, {f: 3, c: 22910}, 22917, 22921,
+    {f: 2, c: 22923}, {f: 4, c: 22926}, {f: 2, c: 22932}, 22936,
+    {f: 3, c: 22938}, {f: 4, c: 22943}, {f: 2, c: 22950}, {f: 2, c: 22956},
+    {f: 2, c: 22960}, {f: 6, c: 22963}, 22970, {f: 2, c: 22972},
+    {f: 7, c: 22975}, {f: 3, c: 22983}, {f: 4, c: 22988}, {f: 2, c: 22997},
+    23001, 23003, {f: 5, c: 23006}, 23012, {f: 2, c: 23014}, {f: 3, c: 23017},
+    {f: 12, c: 23021}, 23034, {f: 3, c: 23036}, 23040, 23042, {f: 2, c: 23050},
+    {f: 4, c: 23053}, 23058, {f: 4, c: 23060}, {f: 3, c: 23065},
+    {f: 2, c: 23069}, {f: 2, c: 23073}, 23076, {f: 3, c: 23078},
+    {f: 7, c: 23082}, 23091, 23093, {f: 5, c: 23095}, {f: 3, c: 23101},
+    {f: 4, c: 23106}, {f: 2, c: 23111}, {f: 10, c: 23115}, {f: 4, c: 23126},
+    {f: 7, c: 23131}, {f: 3, c: 23139}, {f: 2, c: 23144}, {f: 2, c: 23147},
+    {f: 6, c: 23150}, {f: 2, c: 23160}, {f: 4, c: 23163}, {f: 18, c: 23168},
+    {f: 7, c: 23187}, {f: 11, c: 23196}, {f: 2, c: 23208}, {f: 7, c: 23211},
+    23220, {f: 2, c: 23222}, {f: 4, c: 23225}, {f: 2, c: 23231},
+    {f: 6, c: 23235}, {f: 2, c: 23242}, {f: 5, c: 23245}, 23251, 23253,
+    {f: 3, c: 23257}, {f: 3, c: 23261}, 23266, {f: 2, c: 23268},
+    {f: 2, c: 23271}, 23274, {f: 5, c: 23276}, {f: 3, c: 23282},
+    {f: 5, c: 23286}, {f: 4, c: 23292}, {f: 7, c: 23297}, 23306,
+    {f: 9, c: 23309}, 23320, {f: 7, c: 23322}, {f: 8, c: 23330},
+    {f: 5, c: 23339}, 23345, 23347, {f: 2, c: 23349}, {f: 7, c: 23353},
+    {f: 11, c: 23361}, {f: 3, c: 23373}, 23378, 23382, 23390, {f: 2, c: 23392},
+    {f: 2, c: 23399}, {f: 3, c: 23405}, 23410, 23412, {f: 2, c: 23414}, 23417,
+    {f: 2, c: 23419}, 23422, 23426, 23430, 23434, {f: 2, c: 23437},
+    {f: 3, c: 23440}, 23444, 23446, 23455, {f: 3, c: 23463}, {f: 4, c: 23468},
+    {f: 2, c: 23473}, 23479, {f: 3, c: 23482}, {f: 2, c: 23488}, 23491,
+    {f: 4, c: 23496}, {f: 3, c: 23501}, 23505, {f: 9, c: 23508}, 23520, 23523,
+    23530, 23533, 23535, {f: 4, c: 23537}, 23543, {f: 2, c: 23549}, 23552,
+    {f: 2, c: 23554}, 23557, 23564, 23568, {f: 2, c: 23570}, 23575, 23577,
+    23579, {f: 4, c: 23582}, 23587, 23590, {f: 4, c: 23592}, {f: 4, c: 23597},
+    {f: 2, c: 23602}, {f: 2, c: 23605}, {f: 2, c: 23619}, {f: 2, c: 23622},
+    {f: 2, c: 23628}, {f: 3, c: 23634}, {f: 3, c: 23638}, {f: 4, c: 23642},
+    23647, 23655, {f: 3, c: 23657}, 23661, 23664, {f: 7, c: 23666},
+    {f: 4, c: 23675}, 23680, {f: 5, c: 23683}, {f: 3, c: 23689},
+    {f: 2, c: 23694}, {f: 2, c: 23698}, 23701, {f: 4, c: 23709},
+    {f: 5, c: 23716}, 23722, {f: 3, c: 23726}, 23730, 23732, 23734,
+    {f: 4, c: 23737}, 23742, 23744, {f: 2, c: 23746}, {f: 6, c: 23749},
+    {f: 6, c: 23756}, {f: 6, c: 23763}, {f: 7, c: 23770}, {f: 2, c: 23778},
+    23783, 23785, {f: 2, c: 23787}, {f: 2, c: 23790}, {f: 3, c: 23793}, 23797,
+    {f: 4, c: 23799}, 23804, {f: 4, c: 23806}, {f: 2, c: 23812},
+    {f: 5, c: 23816}, {f: 5, c: 23823}, 23829, {f: 3, c: 23832},
+    {f: 2, c: 23836}, {f: 5, c: 23839}, 23845, 23848, {f: 2, c: 23850},
+    {f: 5, c: 23855}, {f: 8, c: 23861}, {f: 8, c: 23871}, {f: 2, c: 23880},
+    {f: 3, c: 23885}, {f: 7, c: 23889}, {f: 2, c: 23897}, 23900,
+    {f: 11, c: 23902}, 23914, {f: 2, c: 23917}, {f: 4, c: 23920},
+    {f: 12, c: 23925}, 23939, {f: 2, c: 23941}, {f: 15, c: 23944}, 23960,
+    {f: 3, c: 23962}, {f: 2, c: 23966}, {f: 6, c: 23969}, {f: 15, c: 23976},
+    23993, 23995, {f: 8, c: 23997}, {f: 5, c: 24006}, 24012, {f: 4, c: 24014},
+    24019, {f: 6, c: 24021}, 24028, {f: 2, c: 24031}, {f: 2, c: 24035}, 24042,
+    {f: 2, c: 24044}, {f: 2, c: 24053}, {f: 5, c: 24056}, {f: 2, c: 24063},
+    24068, 24071, {f: 3, c: 24073}, {f: 2, c: 24077}, {f: 2, c: 24082}, 24087,
+    {f: 7, c: 24094}, {f: 3, c: 24104}, 24108, {f: 2, c: 24111}, 24114,
+    {f: 2, c: 24116}, {f: 2, c: 24121}, {f: 2, c: 24126}, 24129,
+    {f: 6, c: 24134}, {f: 7, c: 24141}, 24150, {f: 2, c: 24153},
+    {f: 2, c: 24156}, 24160, {f: 7, c: 24164}, {f: 5, c: 24173}, 24181, 24183,
+    {f: 3, c: 24193}, 24197, {f: 2, c: 24200}, {f: 3, c: 24204}, 24210, 24216,
+    24219, 24221, {f: 4, c: 24225}, {f: 3, c: 24232}, 24236, {f: 5, c: 24238},
+    24244, {f: 4, c: 24250}, {f: 10, c: 24255}, {f: 6, c: 24267},
+    {f: 2, c: 24276}, {f: 4, c: 24279}, {f: 3, c: 24284}, {f: 4, c: 24292},
+    24297, 24299, {f: 6, c: 24301}, 24309, {f: 2, c: 24312}, {f: 3, c: 24315},
+    {f: 3, c: 24325}, 24329, {f: 3, c: 24332}, 24336, 24338, 24340, 24342,
+    {f: 2, c: 24345}, {f: 3, c: 24348}, {f: 4, c: 24353}, 24360,
+    {f: 2, c: 24363}, 24366, 24368, 24370, 24372, {f: 3, c: 24374}, 24379,
+    {f: 3, c: 24381}, {f: 5, c: 24385}, 24391, {f: 3, c: 24393}, 24397, 24399,
+    24401, 24404, {f: 3, c: 24410}, {f: 3, c: 24414}, 24419, 24421,
+    {f: 2, c: 24423}, 24427, {f: 2, c: 24430}, 24434, {f: 3, c: 24436}, 24440,
+    24442, {f: 3, c: 24445}, 24451, 24454, {f: 3, c: 24461}, {f: 2, c: 24467},
+    24470, {f: 2, c: 24474}, 24477, 24479, {f: 6, c: 24482}, {f: 2, c: 24491},
+    {f: 6, c: 24495}, 24502, 24504, {f: 2, c: 24506}, {f: 5, c: 24510},
+    {f: 2, c: 24519}, {f: 2, c: 24522}, 24526, {f: 3, c: 24531},
+    {f: 3, c: 24538}, {f: 2, c: 24542}, {f: 2, c: 24546}, {f: 2, c: 24549},
+    {f: 2, c: 24552}, 24556, {f: 2, c: 24559}, {f: 3, c: 24562},
+    {f: 2, c: 24566}, {f: 2, c: 24569}, 24572, {f: 3, c: 24583},
+    {f: 2, c: 24587}, {f: 2, c: 24592}, 24595, {f: 2, c: 24599}, 24602,
+    {f: 2, c: 24606}, {f: 3, c: 24610}, {f: 3, c: 24620}, {f: 5, c: 24624},
+    {f: 5, c: 24630}, {f: 2, c: 24637}, 24640, {f: 7, c: 24644}, 24652,
+    {f: 2, c: 24654}, 24657, {f: 2, c: 24659}, {f: 3, c: 24662},
+    {f: 2, c: 24667}, {f: 4, c: 24670}, {f: 2, c: 24677}, 24686,
+    {f: 2, c: 24689}, {f: 2, c: 24692}, 24695, 24702, {f: 3, c: 24704},
+    {f: 4, c: 24709}, {f: 2, c: 24714}, {f: 4, c: 24718}, 24723, 24725,
+    {f: 3, c: 24727}, 24732, 24734, {f: 2, c: 24737}, {f: 2, c: 24740}, 24743,
+    {f: 2, c: 24745}, 24750, 24752, 24755, 24759, {f: 2, c: 24761},
+    {f: 8, c: 24765}, {f: 3, c: 24775}, {f: 5, c: 24780}, {f: 3, c: 24786},
+    {f: 2, c: 24790}, 24793, 24795, 24798, {f: 4, c: 24802}, 24810, 24821,
+    {f: 2, c: 24823}, {f: 4, c: 24828}, {f: 4, c: 24834}, 24839,
+    {f: 3, c: 24842}, {f: 5, c: 24848}, {f: 4, c: 24854}, {f: 2, c: 24861},
+    {f: 2, c: 24865}, 24869, {f: 3, c: 24872}, {f: 8, c: 24876},
+    {f: 2, c: 24885}, {f: 6, c: 24888}, {f: 8, c: 24896}, 24905, 24909,
+    {f: 2, c: 24911}, {f: 3, c: 24914}, {f: 2, c: 24918}, 24921,
+    {f: 2, c: 24923}, 24926, {f: 2, c: 24928}, {f: 2, c: 24933}, 24937,
+    {f: 2, c: 24940}, 24943, {f: 2, c: 24945}, 24948, {f: 10, c: 24952},
+    {f: 7, c: 24963}, {f: 2, c: 24972}, 24975, 24979, {f: 5, c: 24981},
+    {f: 2, c: 24987}, {f: 6, c: 24990}, {f: 2, c: 24997}, 25002, 25005,
+    {f: 3, c: 25007}, {f: 3, c: 25011}, {f: 6, c: 25016}, {f: 3, c: 25023},
+    {f: 4, c: 25027}, {f: 4, c: 25037}, 25043, {f: 9, c: 25045},
+    {f: 3, c: 25056}, {f: 2, c: 25060}, 25063, {f: 9, c: 25065},
+    {f: 2, c: 25075}, 25081, 25083, 25085, {f: 5, c: 25089}, 25097, 25107,
+    25113, {f: 3, c: 25116}, 25120, 25123, 25126, {f: 2, c: 25128}, 25131,
+    25133, 25135, 25137, 25141, [12094, 25142], {f: 5, c: 25144}, 25154,
+    {f: 3, c: 25156}, 25162, {f: 2, c: 25167}, {f: 3, c: 25173},
+    {f: 2, c: 25177}, {f: 7, c: 25180}, {f: 2, c: 25188}, 25192,
+    {f: 2, c: 25201}, {f: 2, c: 25204}, {f: 2, c: 25207}, {f: 2, c: 25210},
+    25213, {f: 3, c: 25217}, {f: 4, c: 25221}, {f: 6, c: 25227}, 25236, 25241,
+    {f: 3, c: 25244}, 25251, {f: 2, c: 25254}, {f: 2, c: 25257},
+    {f: 4, c: 25261}, {f: 3, c: 25266}, {f: 3, c: 25270}, 25274, 25278,
+    {f: 2, c: 25280}, 25283, 25291, 25295, 25297, 25301, {f: 2, c: 25309},
+    {f: 2, c: 25312}, 25316, {f: 2, c: 25322}, 25328, 25330, 25333,
+    {f: 4, c: 25336}, 25344, {f: 4, c: 25347}, {f: 4, c: 25354},
+    {f: 2, c: 25359}, {f: 4, c: 25362}, {f: 3, c: 25367}, 25372,
+    {f: 2, c: 25382}, 25385, {f: 3, c: 25388}, {f: 2, c: 25392},
+    {f: 6, c: 25395}, {f: 2, c: 25403}, {f: 3, c: 25407}, 25412,
+    {f: 2, c: 25415}, 25418, {f: 4, c: 25425}, {f: 8, c: 25430}, 25440,
+    {f: 3, c: 25444}, 25450, 25452, {f: 2, c: 25455}, {f: 3, c: 25459},
+    {f: 2, c: 25464}, {f: 4, c: 25468}, 25473, {f: 2, c: 25477}, 25483, 25485,
+    25489, {f: 3, c: 25491}, 25495, {f: 7, c: 25497}, 25505, 25508, 25510,
+    25515, 25519, {f: 2, c: 25521}, {f: 2, c: 25525}, 25529, 25531, 25533,
+    25535, {f: 3, c: 25537}, 25541, {f: 2, c: 25543}, {f: 3, c: 25546}, 25553,
+    {f: 3, c: 25555}, {f: 3, c: 25559}, {f: 3, c: 25563}, 25567, 25570,
+    {f: 5, c: 25572}, {f: 2, c: 25579}, {f: 3, c: 25583}, 25587, 25589, 25591,
+    {f: 4, c: 25593}, 25598, {f: 2, c: 25603}, {f: 5, c: 25606}, 25614,
+    {f: 2, c: 25617}, {f: 2, c: 25621}, {f: 3, c: 25624}, 25629, 25631,
+    {f: 4, c: 25634}, {f: 3, c: 25639}, 25643, {f: 6, c: 25646}, 25653,
+    {f: 3, c: 25655}, {f: 2, c: 25659}, 25662, 25664, {f: 2, c: 25666}, 25673,
+    {f: 6, c: 25675}, 25683, {f: 3, c: 25685}, {f: 3, c: 25689}, 25693,
+    {f: 7, c: 25696}, 25704, {f: 3, c: 25706}, 25710, {f: 3, c: 25712},
+    {f: 2, c: 25716}, 25719, {f: 6, c: 25724}, 25731, 25734, {f: 8, c: 25737},
+    25748, {f: 2, c: 25751}, {f: 4, c: 25754}, {f: 3, c: 25760},
+    {f: 3, c: 25766}, 25770, 25775, 25777, 25780, 25782, 25785, 25789, 25795,
+    25798, {f: 2, c: 25800}, 25804, 25807, 25809, 25811, {f: 2, c: 25813},
+    25817, {f: 3, c: 25819}, 25823, 25825, 25827, 25829, {f: 5, c: 25831},
+    {f: 2, c: 25837}, 25843, {f: 2, c: 25845}, {f: 2, c: 25848}, 25853, 25855,
+    {f: 3, c: 25857}, 25861, {f: 2, c: 25863}, {f: 5, c: 25866},
+    {f: 2, c: 25872}, 25875, 25877, 25879, 25882, 25884, {f: 4, c: 25886},
+    {f: 4, c: 25894}, 25901, {f: 4, c: 25904}, 25911, 25914, {f: 2, c: 25916},
+    {f: 5, c: 25920}, {f: 2, c: 25926}, {f: 2, c: 25930}, {f: 2, c: 25933},
+    25936, {f: 3, c: 25938}, 25944, 25946, 25948, {f: 3, c: 25951},
+    {f: 2, c: 25956}, {f: 4, c: 25959}, {f: 3, c: 25965}, 25969, 25971, 25974,
+    {f: 9, c: 25977}, {f: 3, c: 25988}, {f: 3, c: 25992}, {f: 3, c: 25997},
+    26002, 26004, 26006, 26008, 26010, {f: 2, c: 26013}, 26016,
+    {f: 2, c: 26018}, 26022, 26024, 26026, 26030, {f: 6, c: 26033}, 26040,
+    {f: 2, c: 26042}, {f: 3, c: 26046}, 26050, {f: 4, c: 26055}, 26061,
+    {f: 2, c: 26064}, {f: 3, c: 26067}, {f: 8, c: 26072}, 26081,
+    {f: 2, c: 26083}, {f: 2, c: 26090}, {f: 4, c: 26098}, {f: 2, c: 26104},
+    {f: 5, c: 26107}, 26113, {f: 2, c: 26116}, {f: 3, c: 26119}, 26123, 26125,
+    {f: 3, c: 26128}, {f: 3, c: 26134}, {f: 3, c: 26138}, 26142,
+    {f: 4, c: 26145}, 26150, {f: 4, c: 26153}, 26158, 26160, {f: 2, c: 26162},
+    {f: 5, c: 26167}, 26173, {f: 2, c: 26175}, {f: 7, c: 26180},
+    {f: 2, c: 26189}, {f: 2, c: 26192}, {f: 2, c: 26200}, {f: 2, c: 26203},
+    26206, 26208, {f: 2, c: 26210}, 26213, 26215, {f: 5, c: 26217},
+    {f: 3, c: 26225}, 26229, {f: 2, c: 26232}, {f: 3, c: 26235},
+    {f: 3, c: 26239}, 26243, {f: 2, c: 26245}, {f: 2, c: 26250},
+    {f: 4, c: 26253}, {f: 4, c: 26258}, {f: 5, c: 26264}, {f: 4, c: 26270},
+    {f: 4, c: 26275}, {f: 2, c: 26281}, {f: 2, c: 26284}, {f: 5, c: 26287},
+    {f: 4, c: 26293}, {f: 4, c: 26298}, {f: 5, c: 26303}, 26309, 26312,
+    {f: 12, c: 26314}, {f: 2, c: 26327}, 26330, {f: 2, c: 26334},
+    {f: 5, c: 26337}, {f: 2, c: 26343}, {f: 2, c: 26346}, {f: 3, c: 26349},
+    26353, {f: 2, c: 26357}, {f: 2, c: 26362}, 26365, {f: 2, c: 26369},
+    {f: 4, c: 26372}, 26380, {f: 2, c: 26382}, {f: 3, c: 26385}, 26390,
+    {f: 3, c: 26392}, 26396, 26398, {f: 6, c: 26400}, 26409, 26414, 26416,
+    {f: 2, c: 26418}, {f: 4, c: 26422}, {f: 2, c: 26427}, {f: 2, c: 26430},
+    26433, {f: 2, c: 26436}, 26439, {f: 2, c: 26442}, 26445, 26450,
+    {f: 2, c: 26452}, {f: 5, c: 26455}, 26461, {f: 3, c: 26466},
+    {f: 2, c: 26470}, {f: 2, c: 26475}, 26478, 26484, 26486, {f: 4, c: 26488},
+    26493, 26496, {f: 2, c: 26498}, {f: 2, c: 26501}, 26504, 26506,
+    {f: 4, c: 26508}, {f: 4, c: 26513}, 26518, 26521, 26523, {f: 3, c: 26527},
+    26532, 26534, 26537, 26540, 26542, {f: 2, c: 26545}, 26548,
+    {f: 8, c: 26553}, 26562, {f: 10, c: 26565}, {f: 3, c: 26581}, 26587, 26591,
+    26593, {f: 2, c: 26595}, {f: 3, c: 26598}, {f: 2, c: 26602},
+    {f: 2, c: 26605}, 26610, {f: 8, c: 26613}, 26622, {f: 4, c: 26625}, 26630,
+    26637, 26640, 26642, {f: 2, c: 26644}, {f: 5, c: 26648}, {f: 3, c: 26654},
+    {f: 7, c: 26658}, {f: 7, c: 26667}, {f: 3, c: 26676}, {f: 2, c: 26682},
+    26687, 26695, 26699, 26701, 26703, 26706, {f: 10, c: 26710}, 26730,
+    {f: 8, c: 26732}, 26741, {f: 9, c: 26744}, 26754, 26756, {f: 8, c: 26759},
+    {f: 3, c: 26768}, {f: 3, c: 26772}, {f: 4, c: 26777}, 26782,
+    {f: 2, c: 26784}, {f: 3, c: 26787}, {f: 4, c: 26793}, 26798,
+    {f: 2, c: 26801}, 26804, {f: 10, c: 26806}, 26817, {f: 6, c: 26819}, 26826,
+    26828, {f: 4, c: 26830}, {f: 2, c: 26835}, 26841, {f: 4, c: 26843},
+    {f: 2, c: 26849}, {f: 3, c: 26852}, {f: 6, c: 26856}, 26863,
+    {f: 3, c: 26866}, {f: 3, c: 26870}, 26875, {f: 4, c: 26877},
+    {f: 3, c: 26882}, {f: 5, c: 26886}, 26892, 26897, {f: 12, c: 26899},
+    {f: 3, c: 26913}, {f: 8, c: 26917}, {f: 2, c: 26926}, {f: 3, c: 26929},
+    {f: 4, c: 26933}, {f: 3, c: 26938}, 26942, {f: 2, c: 26944},
+    {f: 7, c: 26947}, {f: 8, c: 26955}, {f: 2, c: 26965}, {f: 2, c: 26968},
+    {f: 2, c: 26971}, 26975, {f: 2, c: 26977}, {f: 2, c: 26980}, 26983,
+    {f: 2, c: 26985}, 26988, {f: 2, c: 26991}, {f: 3, c: 26994}, 26998,
+    {f: 2, c: 27002}, {f: 3, c: 27005}, 27009, 27011, 27013, {f: 3, c: 27018},
+    {f: 6, c: 27022}, {f: 2, c: 27030}, {f: 2, c: 27033}, {f: 10, c: 27037},
+    27049, 27052, {f: 2, c: 27055}, {f: 2, c: 27058}, {f: 2, c: 27061},
+    {f: 3, c: 27064}, {f: 3, c: 27068}, 27072, {f: 8, c: 27074}, 27087,
+    {f: 3, c: 27089}, {f: 6, c: 27093}, {f: 3, c: 27100}, {f: 6, c: 27105},
+    {f: 5, c: 27112}, {f: 4, c: 27118}, {f: 9, c: 27124}, 27134, 27136,
+    {f: 2, c: 27139}, {f: 4, c: 27142}, {f: 8, c: 27147}, {f: 3, c: 27156},
+    {f: 4, c: 27162}, 27168, 27170, {f: 4, c: 27172}, 27177, {f: 4, c: 27179},
+    27184, {f: 3, c: 27186}, {f: 2, c: 27190}, {f: 2, c: 27195},
+    {f: 5, c: 27199}, {f: 2, c: 27205}, {f: 2, c: 27209}, {f: 4, c: 27212},
+    {f: 7, c: 27217}, 27226, {f: 3, c: 27228}, 27232, {f: 2, c: 27235},
+    {f: 11, c: 27238}, {f: 7, c: 27250}, {f: 2, c: 27258}, {f: 3, c: 27261},
+    {f: 3, c: 27265}, {f: 4, c: 27269}, {f: 4, c: 27274}, 27279,
+    {f: 2, c: 27282}, {f: 2, c: 27285}, {f: 4, c: 27288}, {f: 3, c: 27293},
+    27297, {f: 5, c: 27300}, 27306, {f: 2, c: 27309}, {f: 3, c: 27312},
+    {f: 4, c: 27316}, {f: 2, c: 27321}, {f: 7, c: 27324}, {f: 15, c: 27332},
+    {f: 6, c: 27348}, 27356, {f: 7, c: 27360}, 27369, 27371, {f: 6, c: 27373},
+    {f: 4, c: 27380}, {f: 2, c: 27385}, {f: 8, c: 27388}, {f: 5, c: 27397},
+    {f: 4, c: 27403}, {f: 2, c: 27408}, {f: 3, c: 27411}, {f: 7, c: 27415},
+    27423, {f: 2, c: 27429}, {f: 10, c: 27432}, {f: 4, c: 27443}, 27448,
+    {f: 2, c: 27451}, {f: 4, c: 27455}, {f: 2, c: 27460}, 27464,
+    {f: 2, c: 27466}, {f: 3, c: 27469}, {f: 8, c: 27473}, {f: 5, c: 27482},
+    27488, {f: 2, c: 27496}, {f: 7, c: 27499}, {f: 4, c: 27507}, 27514,
+    {f: 4, c: 27517}, 27525, 27528, 27532, {f: 4, c: 27534}, {f: 2, c: 27540},
+    27543, 27545, {f: 2, c: 27548}, {f: 2, c: 27551}, {f: 2, c: 27554},
+    {f: 5, c: 27557}, {f: 2, c: 27564}, {f: 2, c: 27568}, 27574,
+    {f: 2, c: 27576}, {f: 3, c: 27580}, 27584, {f: 2, c: 27587},
+    {f: 4, c: 27591}, 27596, 27598, {f: 2, c: 27600}, 27608, 27610,
+    {f: 5, c: 27612}, {f: 8, c: 27618}, {f: 3, c: 27628}, {f: 3, c: 27632},
+    27636, {f: 3, c: 27638}, {f: 3, c: 27642}, 27646, {f: 5, c: 27648},
+    {f: 3, c: 27657}, 27662, 27666, 27671, {f: 3, c: 27676}, 27680, 27685,
+    27693, 27697, 27699, {f: 2, c: 27702}, {f: 4, c: 27705}, {f: 2, c: 27710},
+    {f: 3, c: 27715}, 27720, {f: 5, c: 27723}, {f: 3, c: 27729}, 27734,
+    {f: 3, c: 27736}, {f: 2, c: 27746}, {f: 3, c: 27749}, {f: 5, c: 27755},
+    27761, 27763, 27765, {f: 2, c: 27767}, {f: 3, c: 27770}, {f: 2, c: 27775},
+    27780, 27783, {f: 2, c: 27786}, {f: 2, c: 27789}, {f: 2, c: 27793},
+    {f: 4, c: 27797}, 27802, {f: 3, c: 27804}, 27808, 27810, 27816, 27820,
+    {f: 2, c: 27823}, {f: 4, c: 27828}, 27834, {f: 4, c: 27840},
+    {f: 3, c: 27846}, 27851, {f: 3, c: 27853}, {f: 2, c: 27857},
+    {f: 3, c: 27864}, {f: 2, c: 27868}, 27871, 27876, {f: 2, c: 27878}, 27881,
+    {f: 2, c: 27884}, 27890, 27892, 27897, {f: 2, c: 27903}, {f: 2, c: 27906},
+    {f: 2, c: 27909}, {f: 3, c: 27912}, 27917, {f: 3, c: 27919},
+    {f: 4, c: 27923}, 27928, {f: 2, c: 27932}, {f: 6, c: 27935}, 27942,
+    {f: 2, c: 27944}, {f: 2, c: 27948}, {f: 2, c: 27951}, 27956,
+    {f: 3, c: 27958}, 27962, {f: 2, c: 27967}, 27970, 27972, 27977, 27980,
+    27984, {f: 4, c: 27989}, 27995, 27997, 27999, {f: 2, c: 28001},
+    {f: 2, c: 28004}, {f: 2, c: 28007}, {f: 3, c: 28011}, {f: 4, c: 28016},
+    {f: 2, c: 28021}, {f: 2, c: 28026}, {f: 5, c: 28029}, {f: 2, c: 28035},
+    28038, {f: 2, c: 28042}, 28045, {f: 2, c: 28047}, 28050, {f: 5, c: 28054},
+    28060, 28066, 28069, {f: 2, c: 28076}, {f: 2, c: 28080}, {f: 2, c: 28083},
+    {f: 2, c: 28086}, {f: 6, c: 28089}, {f: 3, c: 28097}, {f: 3, c: 28104},
+    {f: 4, c: 28109}, {f: 4, c: 28114}, 28119, {f: 3, c: 28122}, 28127,
+    {f: 2, c: 28130}, 28133, {f: 3, c: 28135}, 28141, {f: 2, c: 28143}, 28146,
+    28148, 28152, {f: 8, c: 28157}, {f: 4, c: 28166}, 28171, 28175,
+    {f: 2, c: 28178}, 28181, {f: 2, c: 28184}, {f: 2, c: 28187},
+    {f: 2, c: 28190}, 28194, {f: 2, c: 28199}, 28202, 28206, {f: 2, c: 28208},
+    28211, {f: 3, c: 28213}, 28217, {f: 3, c: 28219}, {f: 4, c: 28223},
+    {f: 8, c: 28229}, {f: 4, c: 28239}, 28245, 28247, {f: 2, c: 28249},
+    {f: 2, c: 28252}, {f: 11, c: 28256}, {f: 2, c: 28268}, {f: 14, c: 28272},
+    {f: 3, c: 28288}, 28292, {f: 2, c: 28295}, {f: 5, c: 28298},
+    {f: 5, c: 28305}, 28311, {f: 3, c: 28313}, 28318, {f: 2, c: 28320},
+    {f: 2, c: 28323}, 28326, {f: 2, c: 28328}, {f: 4, c: 28331}, 28336, 28339,
+    28341, {f: 2, c: 28344}, 28348, {f: 3, c: 28350}, 28355, 28358,
+    {f: 3, c: 28360}, 28365, 28368, 28370, 28374, {f: 2, c: 28376},
+    {f: 3, c: 28379}, 28387, 28391, {f: 2, c: 28394}, {f: 2, c: 28397},
+    {f: 2, c: 28400}, 28403, {f: 2, c: 28405}, {f: 5, c: 28410}, 28416,
+    {f: 3, c: 28419}, {f: 2, c: 28423}, {f: 5, c: 28426}, {f: 3, c: 28432},
+    {f: 4, c: 28438}, {f: 5, c: 28443}, 28449, {f: 4, c: 28453}, 28462, 28464,
+    {f: 2, c: 28468}, 28471, {f: 5, c: 28473}, 28480, {f: 4, c: 28482},
+    {f: 3, c: 28488}, 28492, {f: 3, c: 28494}, {f: 2, c: 28498},
+    {f: 3, c: 28501}, {f: 2, c: 28506}, 28509, {f: 3, c: 28511}, 28515, 28517,
+    {f: 6, c: 28519}, 28529, 28531, {f: 2, c: 28533}, 28537, 28539,
+    {f: 2, c: 28541}, {f: 3, c: 28545}, 28549, {f: 2, c: 28554},
+    {f: 8, c: 28559}, {f: 4, c: 28568}, {f: 3, c: 28573}, {f: 2, c: 28578},
+    {f: 2, c: 28581}, 28584, {f: 4, c: 28586}, {f: 2, c: 28591}, 28594,
+    {f: 2, c: 28596}, {f: 2, c: 28599}, {f: 6, c: 28602}, {f: 5, c: 28612},
+    {f: 7, c: 28618}, {f: 2, c: 28627}, {f: 2, c: 28630}, {f: 2, c: 28633},
+    {f: 2, c: 28636}, {f: 2, c: 28642}, {f: 6, c: 28645}, {f: 2, c: 28652},
+    {f: 8, c: 28658}, 28667, 28669, {f: 6, c: 28671}, {f: 2, c: 28679}, 28682,
+    {f: 3, c: 28684}, 28688, {f: 3, c: 28690}, {f: 2, c: 28694}, 28697, 28700,
+    28702, {f: 2, c: 28705}, {f: 3, c: 28708}, {f: 7, c: 28713}, 28721,
+    {f: 2, c: 28723}, {f: 3, c: 28726}, {f: 4, c: 28730}, {f: 4, c: 28735},
+    {f: 7, c: 28741}, {f: 2, c: 28749}, 28752, {f: 3, c: 28754},
+    {f: 2, c: 28758}, {f: 4, c: 28761}, {f: 4, c: 28767}, {f: 2, c: 28773},
+    {f: 3, c: 28776}, 28782, {f: 4, c: 28785}, 28791, {f: 3, c: 28793}, 28797,
+    {f: 4, c: 28801}, {f: 3, c: 28806}, {f: 3, c: 28811}, {f: 3, c: 28815},
+    28819, {f: 2, c: 28823}, {f: 2, c: 28826}, {f: 13, c: 28830}, 28848, 28850,
+    {f: 3, c: 28852}, 28858, {f: 2, c: 28862}, {f: 4, c: 28868}, 28873,
+    {f: 4, c: 28875}, {f: 8, c: 28880}, 28890, {f: 3, c: 28892},
+    {f: 4, c: 28896}, 28901, 28906, 28910, {f: 4, c: 28912}, {f: 2, c: 28917},
+    28920, {f: 3, c: 28922}, {f: 11, c: 28926}, {f: 5, c: 28939},
+    {f: 2, c: 28945}, 28948, 28951, {f: 6, c: 28955}, {f: 4, c: 28962},
+    {f: 8, c: 28967}, {f: 4, c: 28978}, {f: 14, c: 28983}, {f: 3, c: 28998},
+    29003, 29005, {f: 3, c: 29007}, {f: 9, c: 29011}, 29021, {f: 3, c: 29023},
+    29027, 29029, {f: 2, c: 29034}, 29037, {f: 3, c: 29039}, {f: 4, c: 29044},
+    29049, {f: 2, c: 29051}, {f: 6, c: 29054}, {f: 5, c: 29061},
+    {f: 4, c: 29067}, {f: 2, c: 29072}, 29075, {f: 2, c: 29077},
+    {f: 5, c: 29082}, {f: 7, c: 29089}, {f: 3, c: 29097}, {f: 4, c: 29101},
+    29106, 29108, {f: 3, c: 29110}, {f: 4, c: 29114}, {f: 2, c: 29119}, 29122,
+    {f: 4, c: 29124}, {f: 5, c: 29129}, {f: 3, c: 29135}, 29139,
+    {f: 3, c: 29142}, {f: 2, c: 29146}, {f: 2, c: 29149}, {f: 4, c: 29153},
+    {f: 5, c: 29160}, {f: 5, c: 29167}, {f: 4, c: 29173}, {f: 2, c: 29178},
+    29181, {f: 7, c: 29183}, {f: 6, c: 29191}, {f: 2, c: 29198},
+    {f: 10, c: 29201}, 29212, {f: 10, c: 29214}, 29225, 29227,
+    {f: 3, c: 29229}, {f: 2, c: 29235}, 29244, {f: 7, c: 29248},
+    {f: 3, c: 29257}, {f: 4, c: 29262}, {f: 3, c: 29267}, 29271, 29274, 29276,
+    29278, 29280, {f: 3, c: 29283}, 29288, {f: 4, c: 29290}, {f: 2, c: 29296},
+    {f: 2, c: 29299}, {f: 3, c: 29302}, {f: 2, c: 29307}, {f: 2, c: 29314},
+    {f: 5, c: 29317}, 29324, 29326, {f: 2, c: 29328}, {f: 3, c: 29331},
+    {f: 8, c: 29335}, {f: 2, c: 29344}, {f: 4, c: 29347}, {f: 4, c: 29352},
+    29358, {f: 3, c: 29361}, 29365, {f: 6, c: 29370}, {f: 3, c: 29381},
+    {f: 4, c: 29385}, 29391, 29393, {f: 4, c: 29395}, 29400, {f: 4, c: 29402},
+    29407, {f: 6, c: 29410}, {f: 2, c: 29418}, {f: 2, c: 29429},
+    {f: 3, c: 29438}, 29442, {f: 6, c: 29444}, {f: 3, c: 29451},
+    {f: 4, c: 29455}, 29460, {f: 3, c: 29464}, {f: 2, c: 29471},
+    {f: 2, c: 29475}, {f: 3, c: 29478}, 29485, {f: 2, c: 29487},
+    {f: 2, c: 29490}, 29493, 29498, {f: 2, c: 29500}, 29504, {f: 2, c: 29506},
+    {f: 7, c: 29510}, {f: 2, c: 29518}, 29521, {f: 4, c: 29523},
+    {f: 8, c: 29528}, {f: 7, c: 29537}, 29545, 29550, 29553, {f: 2, c: 29555},
+    29558, 29561, 29565, 29567, {f: 3, c: 29569}, {f: 2, c: 29573}, 29576,
+    29578, {f: 2, c: 29580}, {f: 2, c: 29583}, {f: 4, c: 29586},
+    {f: 4, c: 29591}, {f: 3, c: 29596}, {f: 2, c: 29600}, {f: 6, c: 29603},
+    29610, {f: 2, c: 29612}, 29617, {f: 3, c: 29620}, {f: 2, c: 29624},
+    {f: 4, c: 29628}, 29633, {f: 5, c: 29635}, {f: 2, c: 29643}, 29646,
+    {f: 7, c: 29650}, {f: 4, c: 29658}, 29663, {f: 4, c: 29665}, 29670, 29672,
+    {f: 3, c: 29674}, {f: 4, c: 29678}, {f: 11, c: 29683}, {f: 4, c: 29695},
+    29700, {f: 2, c: 29703}, {f: 4, c: 29707}, {f: 9, c: 29713},
+    {f: 6, c: 29724}, {f: 2, c: 29731}, 29735, 29737, 29739, 29741, 29743,
+    {f: 2, c: 29745}, {f: 5, c: 29751}, {f: 2, c: 29757}, 29760,
+    {f: 9, c: 29762}, {f: 9, c: 29772}, 29782, 29784, 29789, {f: 3, c: 29792},
+    {f: 5, c: 29796}, {f: 2, c: 29803}, {f: 2, c: 29806}, {f: 5, c: 29809},
+    {f: 6, c: 29816}, 29823, 29826, {f: 3, c: 29828}, 29832, 29834,
+    {f: 2, c: 29836}, 29839, {f: 11, c: 29841}, 29853, {f: 4, c: 29855},
+    {f: 2, c: 29860}, {f: 6, c: 29866}, {f: 9, c: 29873}, {f: 2, c: 29883},
+    {f: 12, c: 29886}, {f: 4, c: 29899}, {f: 2, c: 29904}, 29907,
+    {f: 5, c: 29909}, 29915, 29917, 29919, 29921, 29925, {f: 7, c: 29927},
+    {f: 4, c: 29936}, 29941, {f: 7, c: 29944}, {f: 4, c: 29952},
+    {f: 7, c: 29957}, 29966, 29968, 29970, {f: 4, c: 29972}, 29979,
+    {f: 2, c: 29981}, {f: 3, c: 29984}, 29988, {f: 2, c: 29990}, 29994, 29998,
+    30004, 30006, 30009, {f: 2, c: 30012}, 30015, {f: 4, c: 30017},
+    {f: 2, c: 30022}, {f: 2, c: 30025}, 30029, {f: 4, c: 30032},
+    {f: 4, c: 30037}, {f: 4, c: 30046}, {f: 2, c: 30051}, {f: 3, c: 30055},
+    {f: 6, c: 30060}, 30067, 30069, 30071, {f: 5, c: 30074}, {f: 3, c: 30080},
+    {f: 2, c: 30084}, {f: 3, c: 30088}, {f: 3, c: 30092}, 30096, 30099, 30101,
+    30104, {f: 2, c: 30107}, 30110, 30114, {f: 5, c: 30118}, 30125,
+    {f: 2, c: 30134}, {f: 2, c: 30138}, {f: 3, c: 30143}, 30150,
+    {f: 2, c: 30155}, {f: 4, c: 30158}, 30163, 30167, 30170, {f: 2, c: 30172},
+    {f: 3, c: 30175}, 30181, 30185, {f: 4, c: 30188}, {f: 2, c: 30194},
+    {f: 4, c: 30197}, {f: 2, c: 30202}, {f: 2, c: 30205}, 30212,
+    {f: 4, c: 30214}, {f: 2, c: 30222}, {f: 4, c: 30225}, 30230, 30234,
+    {f: 2, c: 30236}, 30243, 30248, 30252, {f: 2, c: 30254}, {f: 2, c: 30257},
+    {f: 2, c: 30262}, {f: 2, c: 30265}, 30269, 30273, {f: 2, c: 30276}, 30280,
+    {f: 2, c: 30282}, {f: 6, c: 30286}, 30293, 30295, {f: 3, c: 30297}, 30301,
+    {f: 2, c: 30304}, 30310, 30312, 30314, {f: 3, c: 30323}, [12136, 30326],
+    30327, {f: 2, c: 30329}, {f: 3, c: 30335}, 30339, 30341, {f: 2, c: 30345},
+    {f: 2, c: 30348}, {f: 2, c: 30351}, 30354, {f: 2, c: 30356},
+    {f: 2, c: 30359}, {f: 9, c: 30363}, {f: 9, c: 30373}, {f: 2, c: 30383},
+    30387, {f: 3, c: 30389}, 30393, {f: 4, c: 30395}, {f: 2, c: 30400},
+    {f: 2, c: 30403}, 30407, 30409, {f: 2, c: 30411}, 30419, 30421,
+    {f: 2, c: 30425}, {f: 2, c: 30428}, 30432, 30434, 30438, {f: 6, c: 30440},
+    30448, 30451, {f: 3, c: 30453}, {f: 2, c: 30458}, 30461, {f: 2, c: 30463},
+    {f: 2, c: 30466}, {f: 2, c: 30469}, 30474, 30476, {f: 11, c: 30478},
+    {f: 4, c: 30491}, 30497, {f: 3, c: 30499}, 30503, {f: 3, c: 30506}, 30510,
+    {f: 5, c: 30512}, 30521, 30523, {f: 3, c: 30525}, 30530, {f: 3, c: 30532},
+    {f: 7, c: 30536}, {f: 8, c: 30546}, {f: 2, c: 30556}, {f: 2, c: 30559},
+    30564, 30567, {f: 2, c: 30569}, {f: 12, c: 30573}, {f: 3, c: 30586},
+    {f: 3, c: 30593}, {f: 6, c: 30598}, {f: 2, c: 30607}, {f: 5, c: 30611},
+    {f: 5, c: 30617}, 30625, {f: 2, c: 30627}, 30630, 30632, 30635,
+    {f: 2, c: 30638}, {f: 2, c: 30641}, 30644, {f: 5, c: 30646}, 30654,
+    {f: 7, c: 30656}, {f: 5, c: 30664}, {f: 9, c: 30670}, {f: 2, c: 30680},
+    {f: 5, c: 30685}, 30692, 30694, 30696, 30698, {f: 3, c: 30704},
+    {f: 2, c: 30708}, 30711, {f: 4, c: 30713}, {f: 6, c: 30723},
+    {f: 2, c: 30730}, {f: 3, c: 30734}, 30739, 30741, 30745, 30747, 30750,
+    {f: 3, c: 30752}, 30756, 30760, {f: 2, c: 30762}, {f: 2, c: 30766},
+    {f: 3, c: 30769}, {f: 2, c: 30773}, 30781, 30783, {f: 2, c: 30785}, 30788,
+    30790, {f: 4, c: 30792}, 30797, 30799, 30801, {f: 2, c: 30803},
+    {f: 5, c: 30808}, {f: 6, c: 30814}, {f: 3, c: 30821}, 30825,
+    {f: 7, c: 30832}, {f: 4, c: 30840}, {f: 10, c: 30845}, 30856,
+    {f: 2, c: 30858}, {f: 2, c: 30863}, 30866, {f: 3, c: 30868}, 30873,
+    {f: 2, c: 30877}, 30880, 30882, 30884, 30886, 30888, {f: 3, c: 30890},
+    {f: 2, c: 30894}, {f: 3, c: 30901}, 30907, 30909, {f: 2, c: 30911},
+    {f: 3, c: 30914}, {f: 3, c: 30918}, {f: 4, c: 30924}, {f: 3, c: 30929},
+    {f: 3, c: 30934}, {f: 8, c: 30939}, {f: 3, c: 30948}, {f: 3, c: 30953},
+    {f: 2, c: 30957}, {f: 2, c: 30960}, 30963, {f: 2, c: 30965},
+    {f: 2, c: 30968}, {f: 2, c: 30971}, {f: 3, c: 30974}, {f: 3, c: 30978},
+    {f: 8, c: 30982}, {f: 4, c: 30991}, {f: 5, c: 30996}, {f: 4, c: 31002},
+    {f: 5, c: 31007}, 31013, {f: 3, c: 31015}, {f: 4, c: 31021},
+    {f: 2, c: 31026}, {f: 5, c: 31029}, 31037, 31039, {f: 4, c: 31042}, 31047,
+    {f: 9, c: 31050}, {f: 2, c: 31060}, {f: 2, c: 31064}, 31073,
+    {f: 2, c: 31075}, 31078, {f: 4, c: 31081}, 31086, {f: 7, c: 31088}, 31097,
+    {f: 5, c: 31099}, {f: 2, c: 31106}, {f: 4, c: 31110}, {f: 2, c: 31115},
+    {f: 10, c: 31120}, {f: 11, c: 31131}, {f: 2, c: 31144}, {f: 3, c: 31147},
+    31151, 31154, {f: 4, c: 31156}, [12145, 31160], 31164, 31167, 31170,
+    {f: 2, c: 31172}, {f: 2, c: 31175}, 31178, 31180, {f: 3, c: 31182},
+    {f: 2, c: 31187}, {f: 2, c: 31190}, {f: 6, c: 31193}, {f: 3, c: 31200},
+    31205, 31208, 31210, 31212, 31214, {f: 7, c: 31217}, {f: 2, c: 31225},
+    31228, {f: 2, c: 31230}, 31233, {f: 2, c: 31236}, {f: 4, c: 31239}, 31244,
+    {f: 5, c: 31247}, {f: 2, c: 31253}, {f: 2, c: 31256}, {f: 3, c: 31259},
+    31263, {f: 2, c: 31265}, {f: 10, c: 31268}, {f: 2, c: 31279}, 31282,
+    {f: 3, c: 31284}, 31288, 31290, 31294, {f: 5, c: 31297}, {f: 5, c: 31303},
+    {f: 2, c: 31311}, {f: 5, c: 31314}, {f: 9, c: 31320}, {f: 6, c: 31331},
+    31338, {f: 4, c: 31340}, {f: 3, c: 31345}, 31349, {f: 4, c: 31355}, 31362,
+    31365, 31367, {f: 4, c: 31369}, {f: 3, c: 31374}, {f: 2, c: 31379},
+    {f: 3, c: 31385}, 31390, {f: 4, c: 31393}, 31399, 31403, {f: 4, c: 31407},
+    {f: 2, c: 31412}, {f: 3, c: 31415}, {f: 4, c: 31419}, {f: 4, c: 31424},
+    31430, 31433, {f: 10, c: 31436}, {f: 2, c: 31447}, {f: 4, c: 31450},
+    {f: 2, c: 31457}, 31460, {f: 3, c: 31463}, {f: 2, c: 31467}, 31470,
+    {f: 6, c: 31472}, {f: 2, c: 31479}, {f: 2, c: 31483}, 31486,
+    {f: 3, c: 31488}, 31493, 31495, 31497, {f: 3, c: 31500}, 31504,
+    {f: 2, c: 31506}, {f: 3, c: 31510}, 31514, {f: 2, c: 31516}, 31519,
+    {f: 3, c: 31521}, 31527, 31529, 31533, {f: 2, c: 31535}, 31538,
+    {f: 4, c: 31540}, 31545, 31547, 31549, {f: 6, c: 31551}, 31560, 31562,
+    {f: 2, c: 31565}, 31571, 31573, 31575, 31577, 31580, {f: 2, c: 31582},
+    31585, {f: 4, c: 31587}, {f: 6, c: 31592}, {f: 2, c: 31599},
+    {f: 2, c: 31603}, 31606, 31608, 31610, {f: 2, c: 31612}, 31615,
+    {f: 4, c: 31617}, {f: 5, c: 31622}, 31628, {f: 2, c: 31630},
+    {f: 3, c: 31633}, 31638, {f: 4, c: 31640}, {f: 3, c: 31646},
+    {f: 3, c: 31651}, {f: 3, c: 31662}, {f: 2, c: 31666}, {f: 3, c: 31669},
+    {f: 7, c: 31673}, {f: 2, c: 31682}, 31685, 31688, 31690, {f: 4, c: 31693},
+    31698, {f: 5, c: 31700}, {f: 2, c: 31707}, {f: 3, c: 31710},
+    {f: 2, c: 31714}, {f: 2, c: 31719}, {f: 3, c: 31723}, {f: 2, c: 31727},
+    31730, {f: 3, c: 31732}, {f: 4, c: 31736}, 31741, 31743, {f: 6, c: 31745},
+    {f: 3, c: 31752}, 31758, {f: 6, c: 31760}, {f: 7, c: 31767}, 31776, 31778,
+    {f: 2, c: 31780}, {f: 2, c: 31784}, {f: 12, c: 31788}, {f: 4, c: 31801},
+    31810, {f: 8, c: 31812}, {f: 14, c: 31822}, {f: 2, c: 31837},
+    {f: 3, c: 31841}, {f: 4, c: 31845}, 31851, 31853, {f: 3, c: 31855},
+    {f: 6, c: 31861}, {f: 11, c: 31870}, {f: 7, c: 31882}, {f: 2, c: 31891},
+    31894, {f: 3, c: 31897}, {f: 2, c: 31904}, 31907, {f: 4, c: 31910},
+    {f: 3, c: 31915}, {f: 2, c: 31919}, {f: 5, c: 31924}, {f: 2, c: 31930},
+    {f: 2, c: 31935}, {f: 3, c: 31938}, 31942, 31945, 31947, {f: 7, c: 31950},
+    31960, {f: 2, c: 31962}, {f: 6, c: 31969}, {f: 6, c: 31977}, 31985, 31987,
+    31989, 31991, 31994, {f: 2, c: 31996}, 31999, 32001, 32003, 32012,
+    {f: 2, c: 32014}, {f: 2, c: 32017}, 32022, 32024, {f: 3, c: 32029},
+    {f: 4, c: 32035}, {f: 3, c: 32040}, {f: 3, c: 32044}, {f: 5, c: 32052},
+    32059, {f: 2, c: 32061}, 32065, 32067, 32069, {f: 7, c: 32071}, 32079,
+    {f: 12, c: 32081}, {f: 2, c: 32095}, {f: 3, c: 32099}, 32103,
+    {f: 5, c: 32105}, {f: 2, c: 32111}, {f: 2, c: 32116}, 32120,
+    {f: 7, c: 32122}, 32130, {f: 2, c: 32132}, 32135, {f: 5, c: 32138},
+    {f: 3, c: 32144}, {f: 8, c: 32148}, 32157, {f: 3, c: 32159},
+    {f: 2, c: 32164}, {f: 4, c: 32167}, 32175, {f: 3, c: 32181}, 32188,
+    {f: 4, c: 32192}, {f: 2, c: 32197}, {f: 2, c: 32200}, {f: 5, c: 32204},
+    32211, {f: 2, c: 32213}, {f: 3, c: 32218}, 32223, 32226, {f: 2, c: 32228},
+    32231, {f: 2, c: 32234}, {f: 2, c: 32237}, 32240, 32243, 32245,
+    {f: 2, c: 32247}, 32250, {f: 12, c: 32252}, {f: 4, c: 32268},
+    {f: 9, c: 32274}, 32284, {f: 3, c: 32288}, {f: 3, c: 32292},
+    {f: 3, c: 32296}, 32300, {f: 2, c: 32303}, 32307, 32312, 32314, 32316,
+    {f: 2, c: 32319}, {f: 3, c: 32322}, {f: 10, c: 32328}, 32339,
+    {f: 4, c: 32342}, {f: 3, c: 32347}, {f: 3, c: 32351}, {f: 6, c: 32355},
+    32364, {f: 2, c: 32369}, {f: 5, c: 32372}, {f: 2, c: 32378},
+    {f: 3, c: 32383}, {f: 5, c: 32387}, 32393, 32395, 32398, {f: 3, c: 32400},
+    32405, 32407, {f: 2, c: 32409}, {f: 2, c: 32413}, 32430, 32436,
+    {f: 2, c: 32443}, 32470, 32484, 32492, 32505, 32522, 32528, 32542, 32567,
+    32569, {f: 7, c: 32571}, 32579, {f: 6, c: 32582}, 32589, 32591,
+    {f: 2, c: 32594}, 32598, 32601, {f: 4, c: 32603}, 32608, {f: 5, c: 32611},
+    {f: 3, c: 32619}, 32623, 32627, {f: 2, c: 32629}, 32632, {f: 4, c: 32634},
+    {f: 2, c: 32639}, {f: 3, c: 32642}, 32647, 32649, 32651, 32653,
+    {f: 5, c: 32655}, {f: 5, c: 32661}, {f: 2, c: 32667}, 32672,
+    {f: 2, c: 32674}, 32678, 32680, {f: 5, c: 32682}, 32689, {f: 5, c: 32691},
+    {f: 2, c: 32698}, 32702, 32704, {f: 3, c: 32706}, {f: 4, c: 32710}, 32715,
+    32717, {f: 3, c: 32719}, 32723, {f: 2, c: 32726}, {f: 6, c: 32729},
+    {f: 3, c: 32738}, {f: 2, c: 32743}, {f: 4, c: 32746}, 32751, 32754,
+    {f: 5, c: 32756}, 32762, {f: 3, c: 32765}, 32770, {f: 4, c: 32775},
+    {f: 2, c: 32782}, 32785, 32787, {f: 2, c: 32794}, {f: 3, c: 32797}, 32801,
+    {f: 2, c: 32803}, 32811, 32813, {f: 2, c: 32815}, 32818, 32820,
+    {f: 2, c: 32825}, 32828, 32830, {f: 2, c: 32832}, {f: 2, c: 32836},
+    {f: 3, c: 32839}, {f: 4, c: 32846}, 32851, 32853, 32855, 32857,
+    {f: 3, c: 32859}, {f: 10, c: 32863}, {f: 4, c: 32875}, 32884, 32888,
+    {f: 3, c: 32890}, {f: 2, c: 32897}, 32904, 32906, {f: 6, c: 32909},
+    {f: 2, c: 32916}, 32919, 32921, 32926, 32931, {f: 3, c: 32934}, 32940,
+    32944, 32947, {f: 2, c: 32949}, {f: 2, c: 32952}, 32955, 32965,
+    {f: 5, c: 32967}, {f: 7, c: 32975}, 32984, {f: 2, c: 32991},
+    {f: 2, c: 32994}, 32998, 33006, 33013, 33015, 33017, 33019,
+    {f: 4, c: 33022}, {f: 2, c: 33027}, {f: 2, c: 33031}, {f: 2, c: 33035},
+    33045, 33047, 33049, {f: 2, c: 33052}, {f: 13, c: 33055}, {f: 2, c: 33069},
+    33072, {f: 3, c: 33075}, 33079, {f: 4, c: 33082}, {f: 7, c: 33087}, 33095,
+    33097, 33101, 33103, 33106, {f: 2, c: 33111}, {f: 5, c: 33115},
+    {f: 3, c: 33122}, 33128, 33130, 33132, 33135, {f: 2, c: 33138},
+    {f: 3, c: 33141}, 33153, {f: 5, c: 33155}, 33161, {f: 4, c: 33163}, 33168,
+    {f: 6, c: 33170}, 33177, {f: 2, c: 33182}, {f: 2, c: 33185},
+    {f: 2, c: 33188}, 33191, {f: 8, c: 33195}, {f: 6, c: 33204}, 33212,
+    {f: 2, c: 33220}, {f: 2, c: 33223}, 33227, 33230, {f: 8, c: 33232}, 33241,
+    {f: 4, c: 33243}, {f: 2, c: 33249}, {f: 3, c: 33252}, 33257, 33259,
+    {f: 5, c: 33262}, {f: 5, c: 33269}, 33277, 33279, 33283, 33291,
+    {f: 2, c: 33294}, 33297, 33299, {f: 6, c: 33301}, 33309, 33312,
+    {f: 4, c: 33316}, 33321, 33326, 33330, 33338, {f: 2, c: 33340},
+    {f: 5, c: 33343}, {f: 2, c: 33349}, 33352, 33354, {f: 3, c: 33356},
+    {f: 8, c: 33360}, {f: 4, c: 33371}, {f: 4, c: 33376}, 33381, 33383,
+    {f: 2, c: 33385}, {f: 2, c: 33388}, {f: 2, c: 33397}, [12171, 33400],
+    {f: 2, c: 33403}, {f: 2, c: 33408}, 33411, {f: 3, c: 33413}, 33417, 33420,
+    33424, {f: 4, c: 33427}, {f: 2, c: 33434}, 33438, 33440, {f: 2, c: 33442},
+    33447, 33458, {f: 2, c: 33461}, 33466, 33468, {f: 2, c: 33471},
+    {f: 2, c: 33474}, {f: 2, c: 33477}, 33481, 33488, 33494, {f: 2, c: 33497},
+    33501, 33506, {f: 3, c: 33512}, {f: 3, c: 33516}, 33520, {f: 2, c: 33522},
+    {f: 2, c: 33525}, 33528, 33530, {f: 5, c: 33532}, {f: 2, c: 33546}, 33549,
+    33552, {f: 2, c: 33554}, 33558, {f: 2, c: 33560}, {f: 10, c: 33565},
+    {f: 2, c: 33577}, 33582, 33584, 33586, 33591, 33595, {f: 3, c: 33597},
+    {f: 2, c: 33601}, {f: 2, c: 33604}, 33608, {f: 5, c: 33610}, 33619,
+    {f: 5, c: 33621}, 33629, 33634, {f: 7, c: 33648}, {f: 2, c: 33657},
+    {f: 7, c: 33662}, {f: 2, c: 33671}, {f: 3, c: 33675}, {f: 3, c: 33679},
+    {f: 2, c: 33684}, 33687, {f: 2, c: 33689}, 33693, 33695, 33697,
+    {f: 4, c: 33699}, {f: 4, c: 33708}, 33717, 33723, {f: 2, c: 33726},
+    {f: 3, c: 33730}, 33734, {f: 2, c: 33736}, 33739, {f: 2, c: 33741},
+    {f: 4, c: 33744}, 33749, 33751, {f: 3, c: 33753}, 33758, {f: 3, c: 33762},
+    {f: 3, c: 33766}, {f: 4, c: 33771}, {f: 5, c: 33779}, {f: 3, c: 33786},
+    {f: 3, c: 33790}, 33794, 33797, {f: 2, c: 33800}, 33808, {f: 6, c: 33810},
+    {f: 3, c: 33817}, {f: 6, c: 33822}, {f: 3, c: 33833}, {f: 4, c: 33837},
+    {f: 3, c: 33842}, {f: 2, c: 33846}, {f: 3, c: 33849}, {f: 8, c: 33854},
+    {f: 2, c: 33863}, {f: 7, c: 33866}, {f: 4, c: 33875}, 33880,
+    {f: 4, c: 33885}, 33890, 33893, {f: 2, c: 33895}, 33898, 33902, 33904,
+    33906, 33908, 33913, {f: 7, c: 33915}, {f: 4, c: 33923}, 33930, 33933,
+    {f: 4, c: 33935}, {f: 2, c: 33941}, 33944, {f: 2, c: 33946},
+    {f: 4, c: 33949}, {f: 13, c: 33954}, {f: 2, c: 33968}, 33971,
+    {f: 3, c: 33973}, 33979, 33982, {f: 2, c: 33986}, {f: 4, c: 33989}, 33996,
+    {f: 2, c: 33998}, 34002, {f: 2, c: 34004}, {f: 6, c: 34007}, 34014,
+    {f: 2, c: 34017}, 34020, {f: 5, c: 34023}, 34029, {f: 11, c: 34033}, 34046,
+    {f: 12, c: 34048}, {f: 4, c: 34061}, 34066, {f: 2, c: 34069},
+    {f: 2, c: 34072}, {f: 3, c: 34075}, 34080, 34082, {f: 2, c: 34084},
+    {f: 4, c: 34087}, {f: 9, c: 34094}, {f: 3, c: 34110}, 34114,
+    {f: 2, c: 34116}, 34119, {f: 3, c: 34123}, {f: 3, c: 34127}, 34132, 34135,
+    {f: 4, c: 34138}, {f: 3, c: 34143}, 34147, {f: 3, c: 34149},
+    {f: 2, c: 34155}, {f: 4, c: 34158}, 34163, {f: 2, c: 34165}, 34168,
+    {f: 2, c: 34172}, {f: 5, c: 34175}, 34182, 34185, 34187, {f: 2, c: 34189},
+    34192, {f: 2, c: 34194}, {f: 6, c: 34197}, {f: 2, c: 34205},
+    {f: 4, c: 34208}, 34213, 34215, {f: 3, c: 34219}, {f: 6, c: 34225}, 34232,
+    {f: 6, c: 34235}, {f: 7, c: 34242}, {f: 3, c: 34250}, {f: 2, c: 34257},
+    34260, {f: 6, c: 34262}, {f: 6, c: 34270}, {f: 3, c: 34278},
+    {f: 9, c: 34283}, 34293, {f: 2, c: 34295}, {f: 3, c: 34300},
+    {f: 4, c: 34304}, {f: 3, c: 34312}, {f: 5, c: 34316}, {f: 4, c: 34322},
+    {f: 3, c: 34327}, {f: 3, c: 34331}, {f: 3, c: 34335}, {f: 4, c: 34339},
+    34344, {f: 3, c: 34346}, {f: 10, c: 34350}, 34361, 34363, {f: 2, c: 34365},
+    {f: 13, c: 34368}, {f: 2, c: 34386}, {f: 4, c: 34390}, 34395, 34397,
+    {f: 2, c: 34400}, {f: 4, c: 34403}, {f: 3, c: 34408}, 34413,
+    {f: 2, c: 34415}, {f: 7, c: 34418}, {f: 7, c: 34435}, {f: 5, c: 34446},
+    34452, {f: 6, c: 34454}, {f: 5, c: 34462}, {f: 2, c: 34469}, 34475,
+    {f: 2, c: 34477}, {f: 2, c: 34482}, {f: 3, c: 34487}, {f: 5, c: 34491},
+    {f: 3, c: 34497}, 34501, 34504, {f: 2, c: 34508}, {f: 2, c: 34514},
+    {f: 3, c: 34517}, 34522, {f: 2, c: 34524}, {f: 4, c: 34528},
+    {f: 4, c: 34533}, {f: 3, c: 34538}, 34543, {f: 3, c: 34549},
+    {f: 3, c: 34555}, 34559, 34561, {f: 2, c: 34564}, {f: 2, c: 34571},
+    {f: 4, c: 34574}, 34580, 34582, 34585, 34587, 34589, {f: 2, c: 34591},
+    34596, {f: 3, c: 34598}, {f: 4, c: 34602}, {f: 2, c: 34607},
+    {f: 2, c: 34610}, {f: 2, c: 34613}, {f: 3, c: 34616}, {f: 2, c: 34620},
+    {f: 7, c: 34624}, {f: 2, c: 34634}, 34637, {f: 4, c: 34639}, 34644, 34646,
+    34648, {f: 6, c: 34650}, {f: 2, c: 34657}, {f: 7, c: 34663}, 34671,
+    {f: 3, c: 34673}, 34677, 34679, {f: 2, c: 34681}, {f: 3, c: 34687},
+    {f: 2, c: 34694}, {f: 2, c: 34697}, 34700, {f: 5, c: 34702},
+    {f: 3, c: 34708}, {f: 6, c: 34712}, {f: 2, c: 34720}, {f: 5, c: 34723},
+    {f: 2, c: 34729}, 34734, {f: 3, c: 34736}, 34740, {f: 4, c: 34742}, 34748,
+    {f: 2, c: 34750}, {f: 3, c: 34753}, 34757, 34759, 34761, {f: 2, c: 34764},
+    {f: 2, c: 34767}, {f: 7, c: 34772}, {f: 4, c: 34780}, {f: 2, c: 34785},
+    34788, {f: 4, c: 34790}, 34795, 34797, {f: 2, c: 34800}, {f: 3, c: 34803},
+    {f: 2, c: 34807}, 34810, {f: 2, c: 34812}, {f: 4, c: 34815}, 34820,
+    {f: 3, c: 34823}, {f: 5, c: 34827}, 34834, 34836, {f: 4, c: 34839},
+    {f: 3, c: 34844}, 34848, {f: 13, c: 34852}, {f: 3, c: 34867},
+    {f: 2, c: 34871}, 34874, {f: 3, c: 34877}, {f: 3, c: 34881},
+    {f: 3, c: 34887}, 34891, {f: 5, c: 34894}, {f: 2, c: 34901}, 34904, 34906,
+    34908, {f: 3, c: 34910}, {f: 2, c: 34918}, 34922, 34925, 34927, 34929,
+    {f: 4, c: 34931}, 34936, {f: 3, c: 34938}, 34944, 34947, {f: 2, c: 34950},
+    {f: 2, c: 34953}, 34956, {f: 4, c: 34958}, {f: 3, c: 34963},
+    {f: 5, c: 34967}, {f: 5, c: 34973}, 34979, {f: 6, c: 34981}, 34988,
+    {f: 3, c: 34990}, {f: 5, c: 34994}, {f: 4, c: 35000}, {f: 4, c: 35005},
+    {f: 2, c: 35011}, {f: 2, c: 35015}, {f: 3, c: 35019}, {f: 2, c: 35024},
+    35027, {f: 2, c: 35030}, {f: 2, c: 35034}, 35038, {f: 2, c: 35040},
+    {f: 2, c: 35046}, {f: 7, c: 35049}, 35058, {f: 3, c: 35061},
+    {f: 2, c: 35066}, {f: 3, c: 35071}, {f: 4, c: 35075}, {f: 2, c: 35080},
+    {f: 5, c: 35083}, 35089, {f: 5, c: 35092}, {f: 5, c: 35100},
+    {f: 3, c: 35106}, {f: 4, c: 35110}, {f: 4, c: 35116}, 35121, 35125, 35127,
+    {f: 2, c: 35129}, {f: 5, c: 35132}, {f: 2, c: 35138}, {f: 2, c: 35141},
+    {f: 14, c: 35144}, {f: 6, c: 35159}, {f: 3, c: 35169}, 35173,
+    {f: 3, c: 35175}, 35179, {f: 2, c: 35181}, {f: 2, c: 35184},
+    {f: 8, c: 35187}, {f: 2, c: 35196}, [12177, 35198], 35200, 35202,
+    {f: 2, c: 35204}, {f: 4, c: 35207}, {f: 3, c: 35212}, {f: 3, c: 35216},
+    {f: 2, c: 35220}, 35223, {f: 8, c: 35225}, {f: 4, c: 35234},
+    {f: 3, c: 35239}, 35243, {f: 2, c: 35245}, {f: 2, c: 35248},
+    {f: 4, c: 35251}, {f: 2, c: 35256}, {f: 2, c: 35259}, 35262, 35267, 35277,
+    {f: 3, c: 35283}, {f: 3, c: 35287}, 35291, 35293, {f: 4, c: 35295}, 35300,
+    {f: 4, c: 35303}, {f: 3, c: 35308}, {f: 3, c: 35312}, 35317, 35319,
+    {f: 7, c: 35321}, {f: 3, c: 35332}, 35337, 35339, 35341, 35343,
+    {f: 2, c: 35345}, 35348, 35351, {f: 2, c: 35353}, 35356, 35358,
+    {f: 3, c: 35360}, 35364, {f: 4, c: 35366}, {f: 2, c: 35371},
+    {f: 3, c: 35374}, {f: 2, c: 35378}, 35381, {f: 3, c: 35383},
+    {f: 3, c: 35387}, {f: 2, c: 35391}, {f: 4, c: 35394}, 35399,
+    {f: 5, c: 35401}, 35407, 35409, 35411, {f: 2, c: 35414}, {f: 2, c: 35417},
+    {f: 2, c: 35420}, {f: 2, c: 35423}, {f: 2, c: 35428}, {f: 2, c: 35431},
+    35434, 35439, 35444, {f: 3, c: 35446}, {f: 2, c: 35450}, {f: 2, c: 35453},
+    {f: 4, c: 35456}, 35464, {f: 2, c: 35467}, {f: 3, c: 35470}, 35476,
+    {f: 2, c: 35478}, 35481, {f: 3, c: 35483}, 35487, 35490, 35495,
+    {f: 3, c: 35497}, {f: 3, c: 35501}, 35505, {f: 3, c: 35507},
+    {f: 2, c: 35511}, {f: 2, c: 35514}, {f: 2, c: 35517}, {f: 2, c: 35520},
+    35523, {f: 2, c: 35525}, 35528, 35530, 35532, 35534, 35536,
+    {f: 3, c: 35539}, {f: 3, c: 35544}, 35549, {f: 3, c: 35551}, 35555, 35557,
+    {f: 3, c: 35560}, 35564, {f: 2, c: 35567}, 35570, {f: 2, c: 35572}, 35577,
+    35579, 35581, 35583, 35587, 35590, {f: 2, c: 35592}, {f: 3, c: 35595},
+    35599, {f: 3, c: 35601}, 35605, 35608, 35612, {f: 3, c: 35614},
+    {f: 4, c: 35618}, 35623, {f: 2, c: 35625}, {f: 5, c: 35630},
+    {f: 5, c: 35636}, {f: 4, c: 35642}, {f: 10, c: 35647}, {f: 4, c: 35658},
+    {f: 6, c: 35664}, 35671, 35675, {f: 9, c: 35677}, {f: 4, c: 35687},
+    {f: 2, c: 35693}, {f: 3, c: 35697}, {f: 2, c: 35701}, {f: 5, c: 35704},
+    {f: 2, c: 35710}, {f: 9, c: 35713}, {f: 3, c: 35723}, {f: 3, c: 35727},
+    35732, {f: 5, c: 35735}, 35741, 35743, 35756, 35761, 35771, 35783, 35792,
+    35818, 35849, 35870, {f: 9, c: 35896}, {f: 4, c: 35906}, {f: 2, c: 35914},
+    {f: 3, c: 35917}, {f: 4, c: 35921}, {f: 4, c: 35926}, {f: 6, c: 35931},
+    {f: 7, c: 35939}, {f: 7, c: 35948}, {f: 4, c: 35956}, {f: 7, c: 35963},
+    {f: 2, c: 35971}, {f: 3, c: 35974}, 35979, {f: 7, c: 35981},
+    {f: 3, c: 35989}, {f: 4, c: 35993}, 35999, {f: 4, c: 36003},
+    {f: 2, c: 36013}, 36017, 36021, 36025, 36030, 36038, 36041,
+    {f: 6, c: 36043}, 36052, {f: 4, c: 36054}, 36059, 36061, 36063, 36069,
+    {f: 2, c: 36072}, {f: 6, c: 36078}, {f: 5, c: 36085}, {f: 5, c: 36095},
+    {f: 2, c: 36102}, 36105, 36108, 36110, {f: 5, c: 36113}, {f: 4, c: 36119},
+    36128, {f: 2, c: 36177}, 36183, 36191, 36197, {f: 3, c: 36200}, 36204,
+    {f: 2, c: 36206}, {f: 2, c: 36209}, {f: 9, c: 36216}, {f: 2, c: 36226},
+    {f: 4, c: 36230}, {f: 5, c: 36236}, {f: 2, c: 36242}, {f: 3, c: 36246},
+    {f: 5, c: 36250}, {f: 3, c: 36256}, {f: 4, c: 36260}, {f: 8, c: 36265},
+    {f: 2, c: 36278}, 36281, 36283, 36285, {f: 3, c: 36288}, 36293,
+    {f: 4, c: 36295}, 36301, 36304, {f: 4, c: 36306}, {f: 2, c: 36312}, 36316,
+    {f: 3, c: 36320}, {f: 3, c: 36325}, 36329, {f: 2, c: 36333},
+    {f: 3, c: 36336}, 36340, 36342, 36348, {f: 7, c: 36350}, {f: 3, c: 36358},
+    36363, {f: 2, c: 36365}, {f: 3, c: 36369}, {f: 8, c: 36373},
+    {f: 2, c: 36384}, {f: 5, c: 36388}, 36395, 36397, 36400, {f: 2, c: 36402},
+    {f: 3, c: 36406}, {f: 2, c: 36411}, {f: 2, c: 36414}, 36419,
+    {f: 2, c: 36421}, {f: 4, c: 36429}, {f: 2, c: 36435}, {f: 3, c: 36438},
+    {f: 9, c: 36442}, {f: 2, c: 36452}, {f: 2, c: 36455}, {f: 2, c: 36458},
+    36462, 36465, 36467, 36469, {f: 3, c: 36471}, 36475, {f: 2, c: 36477},
+    36480, {f: 3, c: 36482}, 36486, 36488, 36492, 36494, {f: 5, c: 36501},
+    36507, 36509, {f: 2, c: 36511}, {f: 3, c: 36514}, {f: 3, c: 36519},
+    {f: 2, c: 36525}, {f: 2, c: 36528}, {f: 7, c: 36531}, {f: 5, c: 36539},
+    {f: 9, c: 36545}, {f: 3, c: 36559}, 36563, {f: 6, c: 36565},
+    {f: 3, c: 36572}, {f: 4, c: 36576}, {f: 6, c: 36581}, {f: 6, c: 36588},
+    {f: 5, c: 36595}, 36605, {f: 4, c: 36607}, 36612, 36614, 36616,
+    {f: 7, c: 36619}, 36627, {f: 5, c: 36630}, {f: 5, c: 36640},
+    {f: 2, c: 36647}, {f: 4, c: 36651}, {f: 3, c: 36656}, {f: 4, c: 36660},
+    {f: 2, c: 36665}, {f: 2, c: 36668}, {f: 2, c: 36672}, 36675,
+    {f: 2, c: 36679}, {f: 3, c: 36682}, {f: 5, c: 36687}, {f: 10, c: 36693},
+    36704, 36707, 36709, 36714, 36736, 36748, 36754, 36765, {f: 3, c: 36768},
+    {f: 2, c: 36772}, 36775, 36778, 36780, {f: 2, c: 36787}, [12193, 36789],
+    {f: 2, c: 36791}, {f: 3, c: 36794}, {f: 2, c: 36799}, 36803, 36806,
+    {f: 5, c: 36809}, 36815, 36818, {f: 2, c: 36822}, 36826, {f: 2, c: 36832},
+    36835, 36839, 36844, 36847, {f: 2, c: 36849}, {f: 2, c: 36853},
+    {f: 3, c: 36858}, {f: 2, c: 36862}, {f: 2, c: 36871}, 36876, 36878, 36883,
+    36888, 36892, {f: 2, c: 36900}, {f: 6, c: 36903}, {f: 2, c: 36912},
+    {f: 2, c: 36915}, 36919, {f: 2, c: 36921}, 36925, {f: 2, c: 36927}, 36931,
+    {f: 2, c: 36933}, {f: 3, c: 36936}, 36940, 36950, {f: 2, c: 36953}, 36957,
+    36959, 36961, 36964, {f: 2, c: 36966}, {f: 3, c: 36970}, {f: 3, c: 36975},
+    36979, 36982, 36985, 36987, 36990, {f: 2, c: 36997}, 37001,
+    {f: 3, c: 37004}, 37010, 37012, 37014, 37016, 37018, 37020,
+    {f: 3, c: 37022}, {f: 2, c: 37028}, {f: 3, c: 37031}, 37035, 37037, 37042,
+    37047, {f: 2, c: 37052}, {f: 2, c: 37055}, {f: 2, c: 37058}, 37062,
+    {f: 2, c: 37064}, {f: 3, c: 37067}, 37074, {f: 3, c: 37076},
+    {f: 3, c: 37080}, 37086, 37088, {f: 3, c: 37091}, {f: 2, c: 37097}, 37100,
+    37102, {f: 4, c: 37104}, {f: 2, c: 37110}, {f: 4, c: 37113},
+    {f: 3, c: 37119}, 37123, 37125, {f: 2, c: 37127}, {f: 8, c: 37130}, 37139,
+    37141, {f: 2, c: 37143}, {f: 4, c: 37146}, {f: 3, c: 37151},
+    {f: 3, c: 37156}, {f: 5, c: 37160}, 37166, 37171, 37173, {f: 2, c: 37175},
+    {f: 8, c: 37179}, {f: 2, c: 37188}, 37191, 37201, {f: 4, c: 37203},
+    {f: 2, c: 37208}, {f: 2, c: 37211}, {f: 2, c: 37215}, {f: 3, c: 37222},
+    37227, 37229, 37235, {f: 3, c: 37242}, {f: 5, c: 37248}, 37254, 37256,
+    37258, {f: 2, c: 37262}, {f: 3, c: 37267}, {f: 3, c: 37271},
+    {f: 5, c: 37277}, {f: 6, c: 37284}, {f: 4, c: 37296}, {f: 4, c: 37302},
+    {f: 5, c: 37307}, 37314, 37316, [12196, 37318], 37320, 37328, 37334,
+    {f: 2, c: 37338}, {f: 5, c: 37342}, {f: 2, c: 37349}, 37352,
+    {f: 11, c: 37354}, 37366, 37368, {f: 5, c: 37371}, {f: 2, c: 37378},
+    {f: 3, c: 37381}, {f: 3, c: 37386}, 37391, {f: 2, c: 37394},
+    {f: 8, c: 37398}, {f: 4, c: 37407}, 37412, {f: 6, c: 37416}, 37423,
+    {f: 2, c: 37425}, {f: 2, c: 37429}, {f: 2, c: 37435}, {f: 4, c: 37441},
+    {f: 2, c: 37446}, {f: 3, c: 37450}, {f: 3, c: 37454}, {f: 3, c: 37458},
+    37462, {f: 2, c: 37464}, {f: 2, c: 37468}, {f: 3, c: 37471},
+    {f: 3, c: 37475}, {f: 5, c: 37479}, {f: 6, c: 37486}, {f: 3, c: 37493},
+    37497, {f: 3, c: 37500}, {f: 2, c: 37505}, 37508, {f: 8, c: 37510},
+    {f: 2, c: 37519}, 37522, {f: 2, c: 37524}, 37527, 37529, 37531,
+    {f: 3, c: 37533}, {f: 2, c: 37537}, 37540, 37543, 37549, {f: 2, c: 37551},
+    {f: 5, c: 37554}, 37560, 37562, {f: 4, c: 37565}, 37570, 37572, 37574,
+    {f: 3, c: 37577}, {f: 2, c: 37581}, {f: 2, c: 37584}, {f: 10, c: 37587},
+    37598, {f: 3, c: 37600}, 37607, 37609, {f: 2, c: 37611}, {f: 4, c: 37618},
+    37623, {f: 3, c: 37625}, {f: 4, c: 37629}, {f: 4, c: 37634},
+    {f: 7, c: 37641}, 37649, {f: 2, c: 37651}, {f: 2, c: 37654},
+    {f: 3, c: 37660}, 37665, {f: 3, c: 37667}, 37671, {f: 2, c: 37673},
+    {f: 2, c: 37676}, {f: 2, c: 37680}, {f: 2, c: 37684}, 37687,
+    {f: 5, c: 37689}, 37695, 37698, {f: 2, c: 37700}, {f: 3, c: 37704}, 37708,
+    {f: 6, c: 37710}, {f: 3, c: 37717}, {f: 2, c: 37721}, {f: 8, c: 37724},
+    {f: 3, c: 37734}, 37739, {f: 3, c: 37741}, {f: 4, c: 37745},
+    {f: 3, c: 37751}, {f: 3, c: 37755}, {f: 3, c: 37759}, 37763,
+    {f: 2, c: 37765}, {f: 2, c: 37768}, {f: 4, c: 37771}, {f: 6, c: 37776},
+    37783, {f: 9, c: 37785}, {f: 2, c: 37796}, 37800, 37803, 37805, 37807,
+    {f: 2, c: 37809}, 37812, {f: 2, c: 37814}, {f: 6, c: 37817},
+    {f: 3, c: 37824}, {f: 3, c: 37828}, 37833, 37835, {f: 3, c: 37838},
+    {f: 4, c: 37842}, {f: 3, c: 37849}, 37856, 37859, {f: 3, c: 37861},
+    {f: 12, c: 37865}, 37878, 37880, {f: 9, c: 37882}, {f: 7, c: 37892},
+    {f: 4, c: 37900}, 37905, {f: 3, c: 37909}, {f: 3, c: 37914},
+    {f: 2, c: 37918}, {f: 5, c: 37921}, {f: 5, c: 37929}, {f: 3, c: 37935},
+    37940, {f: 2, c: 37942}, 37945, {f: 3, c: 37947}, {f: 4, c: 37952},
+    {f: 5, c: 37957}, 37963, {f: 5, c: 37965}, 37971, {f: 11, c: 37973},
+    {f: 2, c: 37985}, 37988, {f: 5, c: 37990}, 37996, {f: 2, c: 37998}, 38001,
+    {f: 4, c: 38003}, 38008, {f: 2, c: 38010}, {f: 5, c: 38016}, 38033, 38038,
+    38040, 38087, 38095, {f: 2, c: 38099}, 38106, 38118, 38139, 38172, 38176,
+    38183, 38195, 38205, 38211, 38216, 38219, 38229, 38234, 38240, 38254,
+    {f: 2, c: 38260}, {f: 7, c: 38264}, 38273, {f: 2, c: 38276},
+    {f: 2, c: 38279}, 38282, 38285, 38288, 38290, {f: 3, c: 38293},
+    {f: 8, c: 38297}, 38306, {f: 2, c: 38310}, 38314, {f: 4, c: 38318},
+    {f: 3, c: 38323}, {f: 2, c: 38327}, 38330, {f: 3, c: 38336},
+    {f: 2, c: 38340}, 38343, 38345, {f: 3, c: 38349}, {f: 3, c: 38353},
+    {f: 5, c: 38359}, 38365, {f: 2, c: 38367}, {f: 2, c: 38371},
+    {f: 2, c: 38374}, 38380, 38399, 38407, 38419, 38424, 38427, 38430, 38432,
+    {f: 7, c: 38435}, {f: 3, c: 38443}, {f: 2, c: 38447}, {f: 4, c: 38455},
+    38462, 38465, 38467, 38474, {f: 2, c: 38478}, {f: 3, c: 38481},
+    {f: 2, c: 38486}, {f: 2, c: 38489}, 38492, 38494, 38496, {f: 2, c: 38501},
+    38507, {f: 3, c: 38509}, 38513, {f: 4, c: 38521}, {f: 7, c: 38526}, 38535,
+    38537, 38540, {f: 3, c: 38545}, 38550, 38554, {f: 10, c: 38557}, 38569,
+    {f: 5, c: 38571}, 38578, 38581, 38583, 38586, 38591, {f: 2, c: 38594},
+    38600, {f: 2, c: 38602}, {f: 2, c: 38608}, {f: 2, c: 38611},
+    {f: 2, c: 38615}, 38618, {f: 3, c: 38621}, 38625, {f: 4, c: 38628},
+    {f: 4, c: 38635}, {f: 2, c: 38640}, {f: 2, c: 38644}, 38648, 38650,
+    {f: 2, c: 38652}, 38655, {f: 2, c: 38658}, 38661, {f: 3, c: 38666},
+    {f: 3, c: 38672}, {f: 2, c: 38676}, {f: 5, c: 38679}, 38685,
+    {f: 8, c: 38687}, {f: 2, c: 38696}, {f: 2, c: 38699}, {f: 2, c: 38702},
+    38705, {f: 5, c: 38707}, {f: 3, c: 38714}, {f: 3, c: 38719}, 38723,
+    {f: 3, c: 38725}, {f: 8, c: 38729}, [12205, 38737], {f: 2, c: 38740},
+    {f: 2, c: 38743}, {f: 2, c: 38748}, 38751, {f: 2, c: 38755},
+    {f: 2, c: 38758}, {f: 9, c: 38762}, 38773, {f: 5, c: 38775},
+    {f: 8, c: 38781}, {f: 5, c: 38790}, 38796, 38798, 38800, 38803,
+    {f: 3, c: 38805}, {f: 7, c: 38809}, {f: 2, c: 38817}, {f: 2, c: 38820},
+    {f: 4, c: 38823}, 38828, 38830, {f: 2, c: 38832}, 38835, {f: 8, c: 38837},
+    {f: 5, c: 38846}, {f: 2, c: 38852}, {f: 2, c: 38855}, 38858,
+    {f: 6, c: 38861}, {f: 5, c: 38868}, {f: 2, c: 38874}, 38877,
+    {f: 7, c: 38879}, 38888, {f: 5, c: 38894}, 38900, {f: 8, c: 38903}, 38912,
+    38916, 38921, 38923, 38925, {f: 3, c: 38932}, {f: 3, c: 38937},
+    {f: 4, c: 38941}, {f: 2, c: 38946}, 38949, {f: 6, c: 38951},
+    {f: 2, c: 38958}, {f: 6, c: 38961}, {f: 2, c: 38969}, 38972,
+    {f: 8, c: 38974}, {f: 5, c: 38983}, {f: 4, c: 38991}, {f: 3, c: 38997},
+    39002, {f: 2, c: 39004}, {f: 3, c: 39007}, {f: 2, c: 39011}, 39014,
+    {f: 3, c: 39016}, {f: 2, c: 39021}, 39026, 39051, 39054, 39058, 39061,
+    39065, 39075, {f: 5, c: 39081}, 39088, 39090, {f: 2, c: 39092},
+    {f: 5, c: 39095}, {f: 7, c: 39101}, 39109, 39111, {f: 5, c: 39113},
+    {f: 2, c: 39119}, 39124, {f: 2, c: 39126}, {f: 2, c: 39132}, 39137,
+    {f: 4, c: 39139}, 39148, 39150, {f: 2, c: 39152}, 39155, {f: 7, c: 39157},
+    {f: 4, c: 39167}, 39172, {f: 3, c: 39174}, 39179, {f: 2, c: 39182},
+    {f: 4, c: 39188}, {f: 2, c: 39193}, {f: 2, c: 39196}, {f: 2, c: 39199},
+    {f: 6, c: 39202}, {f: 5, c: 39209}, {f: 4, c: 39215}, {f: 3, c: 39220},
+    {f: 4, c: 39224}, 39229, {f: 3, c: 39232}, 39236, {f: 2, c: 39238},
+    {f: 4, c: 39245}, 39251, 39254, {f: 4, c: 39256}, 39261, {f: 3, c: 39263},
+    39268, 39270, 39283, {f: 2, c: 39288}, 39291, 39294, {f: 2, c: 39298},
+    39305, 39308, 39310, {f: 11, c: 39322}, {f: 2, c: 39334}, {f: 3, c: 39337},
+    {f: 2, c: 39343}, 39346, {f: 12, c: 39349}, {f: 14, c: 39362}, 39379,
+    {f: 2, c: 39382}, 39386, 39388, 39390, 39392, {f: 10, c: 39395},
+    {f: 3, c: 39406}, {f: 13, c: 39410}, 39424, {f: 3, c: 39426},
+    {f: 7, c: 39430}, {f: 6, c: 39440}, {f: 2, c: 39447}, {f: 17, c: 39450},
+    39468, 39471, {f: 5, c: 39473}, {f: 5, c: 39481}, 39487, {f: 4, c: 39494},
+    {f: 2, c: 39499}, 39502, {f: 5, c: 39504}, 39510, {f: 2, c: 39512},
+    {f: 3, c: 39516}, {f: 2, c: 39520}, 39523, {f: 4, c: 39526}, 39531, 39538,
+    39555, 39561, {f: 2, c: 39565}, {f: 2, c: 39572}, 39577, 39590,
+    {f: 6, c: 39593}, {f: 4, c: 39602}, 39609, 39611, {f: 3, c: 39613},
+    {f: 2, c: 39619}, {f: 5, c: 39622}, {f: 2, c: 39629}, 39632, 39639,
+    {f: 6, c: 39641}, 39648, {f: 4, c: 39650}, {f: 4, c: 39655}, 39660,
+    {f: 9, c: 39664}, 39674, {f: 7, c: 39676}, {f: 2, c: 39684}, 39687,
+    {f: 4, c: 39689}, 39694, {f: 3, c: 39696}, {f: 6, c: 39700},
+    {f: 4, c: 39707}, {f: 2, c: 39712}, 39716, 39718, 39720, {f: 4, c: 39722},
+    39728, {f: 8, c: 39731}, {f: 4, c: 39741}, 39750, {f: 3, c: 39754}, 39760,
+    {f: 2, c: 39762}, {f: 3, c: 39765}, 39769, {f: 20, c: 39771},
+    {f: 4, c: 39792}, {f: 2, c: 39797}, {f: 9, c: 39800}, 39810,
+    {f: 10, c: 39812}, 39823, {f: 7, c: 39827}, {f: 2, c: 39835},
+    {f: 11, c: 39839}, 39852, {f: 17, c: 39855}, {f: 5, c: 39874}, 39880,
+    {f: 9, c: 39883}, 39893, {f: 4, c: 39895}, 39900, {f: 3, c: 39902}, 39907,
+    {f: 2, c: 39909}, 39913, {f: 4, c: 39916}, {f: 3, c: 39921},
+    {f: 8, c: 39925}, 39934, {f: 8, c: 39936}, {f: 3, c: 39946},
+    {f: 2, c: 39950}, 39953, {f: 12, c: 39956}, {f: 2, c: 39969}, 39972,
+    {f: 2, c: 39974}, {f: 3, c: 39978}, {f: 3, c: 39982}, 39988, 39990, 39992,
+    39994, {f: 2, c: 39996}, {f: 6, c: 39999}, {f: 2, c: 40006},
+    {f: 8, c: 40010}, 40019, 40021, {f: 4, c: 40025}, 40030, {f: 7, c: 40032},
+    {f: 5, c: 40040}, {f: 10, c: 40046}, 40057, 40059, {f: 2, c: 40061}, 40064,
+    {f: 2, c: 40067}, {f: 2, c: 40073}, 40076, 40079, 40083, {f: 4, c: 40086},
+    40093, 40106, 40108, 40111, 40121, {f: 5, c: 40126}, {f: 2, c: 40136},
+    {f: 2, c: 40145}, {f: 2, c: 40154}, {f: 2, c: 40160}, {f: 2, c: 40163},
+    {f: 3, c: 40166}, {f: 2, c: 40170}, {f: 6, c: 40173}, 40181,
+    {f: 15, c: 40183}, 40200, {f: 11, c: 40202}, {f: 5, c: 40214}, 40220,
+    40222, {f: 3, c: 40224}, {f: 2, c: 40228}, 40231, {f: 6, c: 40233},
+    {f: 10, c: 40241}, {f: 3, c: 40252}, {f: 2, c: 40256}, {f: 14, c: 40259},
+    {f: 8, c: 40276}, {f: 2, c: 40286}, {f: 8, c: 40290}, 40299,
+    {f: 2, c: 40301}, {f: 2, c: 40304}, {f: 20, c: 40307}, 40328,
+    {f: 9, c: 40330}, {f: 4, c: 40340}, 40345, {f: 10, c: 40347},
+    {f: 3, c: 40358}, {f: 5, c: 40362}, {f: 4, c: 40368}, {f: 6, c: 40373},
+    {f: 3, c: 40381}, 40385, 40387, {f: 14, c: 40389}, {f: 3, c: 40404}, 40408,
+    {f: 10, c: 40411}, {f: 8, c: 40423}, {f: 2, c: 40432}, {f: 4, c: 40436},
+    {f: 17, c: 40443}, {f: 8, c: 40461}, {f: 4, c: 40470}, 40476, 40484, 40487,
+    40494, 40496, 40500, {f: 2, c: 40507}, 40512, 40525, 40528,
+    {f: 3, c: 40530}, 40534, 40537, 40541, {f: 4, c: 40543}, 40549,
+    {f: 2, c: 40558}, 40562, 40564, {f: 3, c: 40566}, 40571, {f: 2, c: 40576},
+    {f: 4, c: 40579}, {f: 2, c: 40585}, {f: 6, c: 40588}, {f: 3, c: 40596},
+    {f: 5, c: 40600}, 40606, {f: 5, c: 40608}, {f: 2, c: 40615},
+    {f: 5, c: 40618}, {f: 4, c: 40624}, {f: 2, c: 40630}, {f: 2, c: 40633},
+    40636, {f: 4, c: 40639}, [12232, 40643], {f: 4, c: 40645},
+    {f: 2, c: 40650}, 40656, {f: 2, c: 40658}, {f: 3, c: 40661},
+    {f: 2, c: 40665}, 40673, {f: 2, c: 40675}, 40678, {f: 4, c: 40683},
+    {f: 2, c: 40688}, 40691, {f: 2, c: 40693}, 40696, 40698, {f: 9, c: 40704},
+    40714, 40716, 40719, {f: 2, c: 40721}, 40724, 40726, 40728,
+    {f: 6, c: 40730}, 40737, {f: 9, c: 40739}, {f: 2, c: 40749},
+    {f: 7, c: 40752}, 40760, 40762, 40764, {f: 5, c: 40767}, {f: 5, c: 40773},
+    {f: 3, c: 40780}, 40787, {f: 4, c: 40789}, {f: 2, c: 40794},
+    {f: 2, c: 40797}, 40802, {f: 2, c: 40804}, {f: 3, c: 40807}, 40811,
+    {f: 5, c: 40813}, {f: 4, c: 40819}, {f: 7, c: 40824}, {f: 2, c: 40833},
+    {f: 2, c: 40846}, {f: 3, c: 40849}, {f: 3, c: 40854}, {f: 2, c: 40861},
+    {f: 5, c: 40865}, 63788, {f: 3, c: 64013}, 64017, {f: 2, c: 64019}, 64024,
+    {f: 3, c: 64031}, {f: 2, c: 64035}, {f: 3, c: 64039}, 11905,
+    [59414, 131207], [59415, 131209], [59416, 131276], 11908, 13427, 13383,
+    11912, 11915, 59422, 13726, 13850, 13838, 11916, 11927, 14702, 14616,
+    59430, 14799, 14815, 14963, 14800, {f: 2, c: 59435}, 15182, 15470, 15584,
+    11943, [59441, 136663], 59442, 11946, 16470, 16735, 11950, 17207, 11955,
+    {f: 2, c: 11958}, [59451, 141711], 17329, 17324, 11963, 17373, 17622,
+    18017, 17996, [59459, 132361], 18211, 18217, 18300, 18317, 11978, 18759,
+    18810, 18813, {f: 2, c: 18818}, {f: 2, c: 18821}, 18847, 18843, 18871,
+    18870, [59476, 133533], [59477, 147966], 19619, {f: 3, c: 19615}, 19575,
+    19618, {f: 7, c: 19731}, 19886, 59492, {s: 226}, 8364, 165, 0, 0, 12351,
+    {s: 17}, 12436, {s: 14}, 12535, 12537, 12536, 12538, 0, {f: 3, c: 12339},
+    {f: 3, c: 12344}, {f: 3, c: 12586}, {f: 24, c: 12704}, 11904,
+    {f: 2, c: 11906}, {f: 3, c: 11909}, {f: 2, c: 11913}, {f: 10, c: 11917},
+    {f: 2, c: 11928}, {f: 12, c: 11931}, {f: 2, c: 11944}, {f: 3, c: 11947},
+    {f: 4, c: 11951}, {f: 2, c: 11956}, {f: 3, c: 11960}, {f: 14, c: 11964},
+    {f: 41, c: 11979}, {f: 71, c: 13312}, {f: 43, c: 13384},
+    {f: 298, c: 13428}, {f: 111, c: 13727}, {f: 11, c: 13839},
+    {f: 765, c: 13851}, {f: 85, c: 14617}, {f: 96, c: 14703},
+    {f: 14, c: 14801}, {f: 147, c: 14816}, {f: 218, c: 14964},
+    {f: 287, c: 15183}, {f: 113, c: 15471}, {f: 885, c: 15585},
+    {f: 264, c: 16471}, {f: 471, c: 16736}, {f: 116, c: 17208},
+    {f: 4, c: 17325}, {f: 43, c: 17330}, {f: 248, c: 17374},
+    {f: 373, c: 17623}, {f: 20, c: 17997}, {f: 193, c: 18018},
+    {f: 5, c: 18212}, {f: 82, c: 18218}, {f: 16, c: 18301}, {f: 441, c: 18318},
+    {f: 50, c: 18760}, {f: 2, c: 18811}, {f: 4, c: 18814}, 18820,
+    {f: 20, c: 18823}, {f: 3, c: 18844}, {f: 22, c: 18848}, {f: 703, c: 18872},
+    {f: 39, c: 19576}, {f: 111, c: 19620}, {f: 148, c: 19738},
+    {f: 7, c: 19887}]
+};
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var ColorSpace = (function colorSpaceColorSpace() {
+  // Constructor should define this.numComps, this.defaultColor, this.name
+  function constructor() {
+    error('should not call ColorSpace constructor');
+  }
+
+  constructor.prototype = {
+    // Input: array of size numComps representing color component values
+    // Output: array of rgb values, each value ranging from [0.1]
+    getRgb: function colorSpaceGetRgb(color) {
+      error('Should not call ColorSpace.getRgb: ' + color);
+    },
+    // Input: Uint8Array of component values, each value scaled to [0,255]
+    // Output: Uint8Array of rgb values, each value scaled to [0,255]
+    getRgbBuffer: function colorSpaceGetRgbBuffer(input) {
+      error('Should not call ColorSpace.getRgbBuffer: ' + input);
+    }
+  };
+
+  constructor.parse = function colorSpaceParse(cs, xref, res) {
+    var IR = constructor.parseToIR(cs, xref, res);
+    if (IR instanceof AlternateCS)
+      return IR;
+
+    return constructor.fromIR(IR);
+  };
+
+  constructor.fromIR = function colorSpaceFromIR(IR) {
+    var name = isArray(IR) ? IR[0] : IR;
+
+    switch (name) {
+      case 'DeviceGrayCS':
+        return new DeviceGrayCS();
+      case 'DeviceRgbCS':
+        return new DeviceRgbCS();
+      case 'DeviceCmykCS':
+        return new DeviceCmykCS();
+      case 'PatternCS':
+        var basePatternCS = IR[1];
+        if (basePatternCS)
+          basePatternCS = ColorSpace.fromIR(basePatternCS);
+        return new PatternCS(basePatternCS);
+      case 'IndexedCS':
+        var baseIndexedCS = IR[1];
+        var hiVal = IR[2];
+        var lookup = IR[3];
+        return new IndexedCS(ColorSpace.fromIR(baseIndexedCS), hiVal, lookup);
+      case 'AlternateCS':
+        var numComps = IR[1];
+        var alt = IR[2];
+        var tintFnIR = IR[3];
+
+        return new AlternateCS(numComps, ColorSpace.fromIR(alt),
+                                PDFFunction.fromIR(tintFnIR));
+      default:
+        error('Unkown name ' + name);
+    }
+    return null;
+  };
+
+  constructor.parseToIR = function colorSpaceParseToIR(cs, xref, res) {
+    if (isName(cs)) {
+      var colorSpaces = xref.fetchIfRef(res.get('ColorSpace'));
+      if (isDict(colorSpaces)) {
+        var refcs = colorSpaces.get(cs.name);
+        if (refcs)
+          cs = refcs;
+      }
+    }
+
+    cs = xref.fetchIfRef(cs);
+    var mode;
+
+    if (isName(cs)) {
+      mode = cs.name;
+      this.mode = mode;
+
+      switch (mode) {
+        case 'DeviceGray':
+        case 'G':
+          return 'DeviceGrayCS';
+        case 'DeviceRGB':
+        case 'RGB':
+          return 'DeviceRgbCS';
+        case 'DeviceCMYK':
+        case 'CMYK':
+          return 'DeviceCmykCS';
+        case 'Pattern':
+          return ['PatternCS', null];
+        default:
+          error('unrecognized colorspace ' + mode);
+      }
+    } else if (isArray(cs)) {
+      mode = cs[0].name;
+      this.mode = mode;
+
+      switch (mode) {
+        case 'DeviceGray':
+        case 'G':
+          return 'DeviceGrayCS';
+        case 'DeviceRGB':
+        case 'RGB':
+          return 'DeviceRgbCS';
+        case 'DeviceCMYK':
+        case 'CMYK':
+          return 'DeviceCmykCS';
+        case 'CalGray':
+          return 'DeviceGrayCS';
+        case 'CalRGB':
+          return 'DeviceRgbCS';
+        case 'ICCBased':
+          var stream = xref.fetchIfRef(cs[1]);
+          var dict = stream.dict;
+          var numComps = dict.get('N');
+          if (numComps == 1)
+            return 'DeviceGrayCS';
+          if (numComps == 3)
+            return 'DeviceRgbCS';
+          if (numComps == 4)
+            return 'DeviceCmykCS';
+          break;
+        case 'Pattern':
+          var basePatternCS = cs[1];
+          if (basePatternCS)
+            basePatternCS = ColorSpace.parseToIR(basePatternCS, xref, res);
+          return ['PatternCS', basePatternCS];
+        case 'Indexed':
+          var baseIndexedCS = ColorSpace.parseToIR(cs[1], xref, res);
+          var hiVal = cs[2] + 1;
+          var lookup = xref.fetchIfRef(cs[3]);
+          return ['IndexedCS', baseIndexedCS, hiVal, lookup];
+        case 'Separation':
+        case 'DeviceN':
+          var name = cs[1];
+          var numComps = 1;
+          if (isName(name))
+            numComps = 1;
+          else if (isArray(name))
+            numComps = name.length;
+          var alt = ColorSpace.parseToIR(cs[2], xref, res);
+          var tintFnIR = PDFFunction.getIR(xref, xref.fetchIfRef(cs[3]));
+          return ['AlternateCS', numComps, alt, tintFnIR];
+        case 'Lab':
+        default:
+          error('unimplemented color space object "' + mode + '"');
+      }
+    } else {
+      error('unrecognized color space object: "' + cs + '"');
+    }
+    return null;
+  };
+
+  return constructor;
+})();
+
+/**
+ * Alternate color space handles both Separation and DeviceN color spaces.  A
+ * Separation color space is actually just a DeviceN with one color component.
+ * Both color spaces use a tinting function to convert colors to a base color
+ * space.
+ */
+var AlternateCS = (function alternateCS() {
+  function constructor(numComps, base, tintFn) {
+    this.name = 'Alternate';
+    this.numComps = numComps;
+    this.defaultColor = [];
+    for (var i = 0; i < numComps; ++i)
+      this.defaultColor.push(1);
+    this.base = base;
+    this.tintFn = tintFn;
+  }
+
+  constructor.prototype = {
+    getRgb: function altcs_getRgb(color) {
+      var tinted = this.tintFn(color);
+      return this.base.getRgb(tinted);
+    },
+    getRgbBuffer: function altcs_getRgbBuffer(input, bits) {
+      var tintFn = this.tintFn;
+      var base = this.base;
+      var scale = 1 / ((1 << bits) - 1);
+      var length = input.length;
+      var pos = 0;
+      var baseNumComps = base.numComps;
+      var baseBuf = new Uint8Array(baseNumComps * length);
+      var numComps = this.numComps;
+      var scaled = new Array(numComps);
+
+      for (var i = 0; i < length; i += numComps) {
+        for (var z = 0; z < numComps; ++z)
+          scaled[z] = input[i + z] * scale;
+
+        var tinted = tintFn(scaled);
+        for (var j = 0; j < baseNumComps; ++j)
+          baseBuf[pos++] = 255 * tinted[j];
+      }
+      return base.getRgbBuffer(baseBuf, 8);
+    }
+  };
+
+  return constructor;
+})();
+
+var PatternCS = (function patternCS() {
+  function constructor(baseCS) {
+    this.name = 'Pattern';
+    this.base = baseCS;
+  }
+  constructor.prototype = {};
+
+  return constructor;
+})();
+
+var IndexedCS = (function indexedCS() {
+  function constructor(base, highVal, lookup) {
+    this.name = 'Indexed';
+    this.numComps = 1;
+    this.defaultColor = [0];
+    this.base = base;
+    this.highVal = highVal;
+
+    var baseNumComps = base.numComps;
+    var length = baseNumComps * highVal;
+    var lookupArray = new Uint8Array(length);
+
+    if (isStream(lookup)) {
+      var bytes = lookup.getBytes(length);
+      lookupArray.set(bytes);
+    } else if (isString(lookup)) {
+      for (var i = 0; i < length; ++i)
+        lookupArray[i] = lookup.charCodeAt(i);
+    } else {
+      error('Unrecognized lookup table: ' + lookup);
+    }
+    this.lookup = lookupArray;
+  }
+
+  constructor.prototype = {
+    getRgb: function indexcs_getRgb(color) {
+      var numComps = this.base.numComps;
+      var start = color[0] * numComps;
+      var c = [];
+
+      for (var i = start, ii = start + numComps; i < ii; ++i)
+        c.push(this.lookup[i]);
+
+      return this.base.getRgb(c);
+    },
+    getRgbBuffer: function indexcs_getRgbBuffer(input) {
+      var base = this.base;
+      var numComps = base.numComps;
+      var lookup = this.lookup;
+      var length = input.length;
+      var baseBuf = new Uint8Array(length * numComps);
+      var baseBufPos = 0;
+
+      for (var i = 0; i < length; ++i) {
+        var lookupPos = input[i] * numComps;
+        for (var j = 0; j < numComps; ++j) {
+          baseBuf[baseBufPos++] = lookup[lookupPos + j];
+        }
+      }
+
+      return base.getRgbBuffer(baseBuf, 8);
+    }
+  };
+  return constructor;
+})();
+
+var DeviceGrayCS = (function deviceGrayCS() {
+  function constructor() {
+    this.name = 'DeviceGray';
+    this.numComps = 1;
+    this.defaultColor = [0];
+  }
+
+  constructor.prototype = {
+    getRgb: function graycs_getRgb(color) {
+      var c = color[0];
+      return [c, c, c];
+    },
+    getRgbBuffer: function graycs_getRgbBuffer(input, bits) {
+      var scale = 255 / ((1 << bits) - 1);
+      var length = input.length;
+      var rgbBuf = new Uint8Array(length * 3);
+      for (var i = 0, j = 0; i < length; ++i) {
+        var c = (scale * input[i]) | 0;
+        rgbBuf[j++] = c;
+        rgbBuf[j++] = c;
+        rgbBuf[j++] = c;
+      }
+      return rgbBuf;
+    }
+  };
+  return constructor;
+})();
+
+var DeviceRgbCS = (function deviceRgbCS() {
+  function constructor() {
+    this.name = 'DeviceRGB';
+    this.numComps = 3;
+    this.defaultColor = [0, 0, 0];
+  }
+  constructor.prototype = {
+    getRgb: function rgbcs_getRgb(color) {
+      return color;
+    },
+    getRgbBuffer: function rgbcs_getRgbBuffer(input, bits) {
+      if (bits == 8)
+        return input;
+      var scale = 255 / ((1 << bits) - 1);
+      var i, length = input.length;
+      var rgbBuf = new Uint8Array(length);
+      for (i = 0; i < length; ++i)
+        rgbBuf[i] = (scale * input[i]) | 0;
+      return rgbBuf;
+    }
+  };
+  return constructor;
+})();
+
+var DeviceCmykCS = (function deviceCmykCS() {
+  function constructor() {
+    this.name = 'DeviceCMYK';
+    this.numComps = 4;
+    this.defaultColor = [0, 0, 0, 1];
+  }
+  constructor.prototype = {
+    getRgb: function cmykcs_getRgb(color) {
+      var c = color[0], m = color[1], y = color[2], k = color[3];
+      var c1 = 1 - c, m1 = 1 - m, y1 = 1 - y, k1 = 1 - k;
+
+      var x, r, g, b;
+      // this is a matrix multiplication, unrolled for performance
+      // code is taken from the poppler implementation
+      x = c1 * m1 * y1 * k1; // 0 0 0 0
+      r = g = b = x;
+      x = c1 * m1 * y1 * k;  // 0 0 0 1
+      r += 0.1373 * x;
+      g += 0.1216 * x;
+      b += 0.1255 * x;
+      x = c1 * m1 * y * k1;  // 0 0 1 0
+      r += x;
+      g += 0.9490 * x;
+      x = c1 * m1 * y * k;   // 0 0 1 1
+      r += 0.1098 * x;
+      g += 0.1020 * x;
+      x = c1 * m * y1 * k1;  // 0 1 0 0
+      r += 0.9255 * x;
+      b += 0.5490 * x;
+      x = c1 * m * y1 * k;   // 0 1 0 1
+      r += 0.1412 * x;
+      x = c1 * m * y * k1;   // 0 1 1 0
+      r += 0.9294 * x;
+      g += 0.1098 * x;
+      b += 0.1412 * x;
+      x = c1 * m * y * k;    // 0 1 1 1
+      r += 0.1333 * x;
+      x = c * m1 * y1 * k1;  // 1 0 0 0
+      g += 0.6784 * x;
+      b += 0.9373 * x;
+      x = c * m1 * y1 * k;   // 1 0 0 1
+      g += 0.0588 * x;
+      b += 0.1412 * x;
+      x = c * m1 * y * k1;   // 1 0 1 0
+      g += 0.6510 * x;
+      b += 0.3137 * x;
+      x = c * m1 * y * k;    // 1 0 1 1
+      g += 0.0745 * x;
+      x = c * m * y1 * k1;   // 1 1 0 0
+      r += 0.1804 * x;
+      g += 0.1922 * x;
+      b += 0.5725 * x;
+      x = c * m * y1 * k;    // 1 1 0 1
+      b += 0.0078 * x;
+      x = c * m * y * k1;    // 1 1 1 0
+      r += 0.2118 * x;
+      g += 0.2119 * x;
+      b += 0.2235 * x;
+
+      return [r, g, b];
+    },
+    getRgbBuffer: function cmykcs_getRgbBuffer(colorBuf, bits) {
+      var scale = 1 / ((1 << bits) - 1);
+      var length = colorBuf.length / 4;
+      var rgbBuf = new Uint8Array(length * 3);
+      var rgbBufPos = 0;
+      var colorBufPos = 0;
+
+      for (var i = 0; i < length; i++) {
+        var cmyk = [];
+        for (var j = 0; j < 4; ++j)
+          cmyk.push(scale * colorBuf[colorBufPos++]);
+
+        var rgb = this.getRgb(cmyk);
+        for (var j = 0; j < 3; ++j)
+          rgbBuf[rgbBufPos++] = Math.round(rgb[j] * 255);
+      }
+
+      return rgbBuf;
+    }
+  };
+
+  return constructor;
+})();
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var ARCFourCipher = (function arcFourCipher() {
+  function constructor(key) {
+    this.a = 0;
+    this.b = 0;
+    var s = new Uint8Array(256);
+    var i, j = 0, tmp, keyLength = key.length;
+    for (i = 0; i < 256; ++i)
+      s[i] = i;
+    for (i = 0; i < 256; ++i) {
+      tmp = s[i];
+      j = (j + tmp + key[i % keyLength]) & 0xFF;
+      s[i] = s[j];
+      s[j] = tmp;
+    }
+    this.s = s;
+  }
+
+  constructor.prototype = {
+    encryptBlock: function arcFourCipherEncryptBlock(data) {
+      var i, n = data.length, tmp, tmp2;
+      var a = this.a, b = this.b, s = this.s;
+      var output = new Uint8Array(n);
+      for (i = 0; i < n; ++i) {
+        a = (a + 1) & 0xFF;
+        tmp = s[a];
+        b = (b + tmp) & 0xFF;
+        tmp2 = s[b];
+        s[a] = tmp2;
+        s[b] = tmp;
+        output[i] = data[i] ^ s[(tmp + tmp2) & 0xFF];
+      }
+      this.a = a;
+      this.b = b;
+      return output;
+    }
+  };
+  constructor.prototype.decryptBlock = constructor.prototype.encryptBlock;
+
+  return constructor;
+})();
+
+var calculateMD5 = (function calculateMD5() {
+  var r = new Uint8Array([
+    7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22,
+    5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20,
+    4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23,
+    6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21]);
+
+  var k = new Int32Array([
+    -680876936, -389564586, 606105819, -1044525330, -176418897, 1200080426,
+    -1473231341, -45705983, 1770035416, -1958414417, -42063, -1990404162,
+    1804603682, -40341101, -1502002290, 1236535329, -165796510, -1069501632,
+    643717713, -373897302, -701558691, 38016083, -660478335, -405537848,
+    568446438, -1019803690, -187363961, 1163531501, -1444681467, -51403784,
+    1735328473, -1926607734, -378558, -2022574463, 1839030562, -35309556,
+    -1530992060, 1272893353, -155497632, -1094730640, 681279174, -358537222,
+    -722521979, 76029189, -640364487, -421815835, 530742520, -995338651,
+    -198630844, 1126891415, -1416354905, -57434055, 1700485571, -1894986606,
+    -1051523, -2054922799, 1873313359, -30611744, -1560198380, 1309151649,
+    -145523070, -1120210379, 718787259, -343485551]);
+
+  function hash(data, offset, length) {
+    var h0 = 1732584193, h1 = -271733879, h2 = -1732584194, h3 = 271733878;
+    // pre-processing
+    var paddedLength = (length + 72) & ~63; // data + 9 extra bytes
+    var padded = new Uint8Array(paddedLength);
+    var i, j, n;
+    for (i = 0; i < length; ++i)
+      padded[i] = data[offset++];
+    padded[i++] = 0x80;
+    n = paddedLength - 8;
+    while (i < n)
+      padded[i++] = 0;
+    padded[i++] = (length << 3) & 0xFF;
+    padded[i++] = (length >> 5) & 0xFF;
+    padded[i++] = (length >> 13) & 0xFF;
+    padded[i++] = (length >> 21) & 0xFF;
+    padded[i++] = (length >>> 29) & 0xFF;
+    padded[i++] = 0;
+    padded[i++] = 0;
+    padded[i++] = 0;
+    // chunking
+    // TODO ArrayBuffer ?
+    var w = new Int32Array(16);
+    for (i = 0; i < paddedLength;) {
+      for (j = 0; j < 16; ++j, i += 4) {
+        w[j] = (padded[i] | (padded[i + 1] << 8) |
+                (padded[i + 2] << 16) | (padded[i + 3] << 24));
+      }
+      var a = h0, b = h1, c = h2, d = h3, f, g;
+      for (j = 0; j < 64; ++j) {
+        if (j < 16) {
+          f = (b & c) | ((~b) & d);
+          g = j;
+        } else if (j < 32) {
+          f = (d & b) | ((~d) & c);
+          g = (5 * j + 1) & 15;
+        } else if (j < 48) {
+          f = b ^ c ^ d;
+          g = (3 * j + 5) & 15;
+        } else {
+          f = c ^ (b | (~d));
+          g = (7 * j) & 15;
+        }
+        var tmp = d, rotateArg = (a + f + k[j] + w[g]) | 0, rotate = r[j];
+        d = c;
+        c = b;
+        b = (b + ((rotateArg << rotate) | (rotateArg >>> (32 - rotate)))) | 0;
+        a = tmp;
+      }
+      h0 = (h0 + a) | 0;
+      h1 = (h1 + b) | 0;
+      h2 = (h2 + c) | 0;
+      h3 = (h3 + d) | 0;
+    }
+    return new Uint8Array([
+        h0 & 0xFF, (h0 >> 8) & 0xFF, (h0 >> 16) & 0xFF, (h0 >>> 24) & 0xFF,
+        h1 & 0xFF, (h1 >> 8) & 0xFF, (h1 >> 16) & 0xFF, (h1 >>> 24) & 0xFF,
+        h2 & 0xFF, (h2 >> 8) & 0xFF, (h2 >> 16) & 0xFF, (h2 >>> 24) & 0xFF,
+        h3 & 0xFF, (h3 >> 8) & 0xFF, (h3 >> 16) & 0xFF, (h3 >>> 24) & 0xFF
+    ]);
+  }
+  return hash;
+})();
+
+var NullCipher = (function nullCipher() {
+  function constructor() {
+  }
+
+  constructor.prototype = {
+    decryptBlock: function nullCipherDecryptBlock(data) {
+      return data;
+    }
+  };
+
+  return constructor;
+})();
+
+var AES128Cipher = (function aes128Cipher() {
+  var rcon = new Uint8Array([
+    0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c,
+    0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a,
+    0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd,
+    0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a,
+    0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
+    0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6,
+    0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72,
+    0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc,
+    0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10,
+    0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e,
+    0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5,
+    0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94,
+    0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02,
+    0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d,
+    0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d,
+    0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f,
+    0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb,
+    0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c,
+    0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a,
+    0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd,
+    0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a,
+    0x74, 0xe8, 0xcb, 0x8d]);
+
+  var s = new Uint8Array([
+    0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b,
+    0xfe, 0xd7, 0xab, 0x76, 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
+    0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, 0xb7, 0xfd, 0x93, 0x26,
+    0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+    0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2,
+    0xeb, 0x27, 0xb2, 0x75, 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
+    0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, 0x53, 0xd1, 0x00, 0xed,
+    0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+    0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f,
+    0x50, 0x3c, 0x9f, 0xa8, 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
+    0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, 0xcd, 0x0c, 0x13, 0xec,
+    0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+    0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14,
+    0xde, 0x5e, 0x0b, 0xdb, 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
+    0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, 0xe7, 0xc8, 0x37, 0x6d,
+    0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+    0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f,
+    0x4b, 0xbd, 0x8b, 0x8a, 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
+    0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, 0xe1, 0xf8, 0x98, 0x11,
+    0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+    0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f,
+    0xb0, 0x54, 0xbb, 0x16]);
+
+  var inv_s = new Uint8Array([
+    0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e,
+    0x81, 0xf3, 0xd7, 0xfb, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87,
+    0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, 0x54, 0x7b, 0x94, 0x32,
+    0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
+    0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49,
+    0x6d, 0x8b, 0xd1, 0x25, 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16,
+    0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, 0x6c, 0x70, 0x48, 0x50,
+    0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
+    0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05,
+    0xb8, 0xb3, 0x45, 0x06, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02,
+    0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, 0x3a, 0x91, 0x11, 0x41,
+    0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
+    0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8,
+    0x1c, 0x75, 0xdf, 0x6e, 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89,
+    0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, 0xfc, 0x56, 0x3e, 0x4b,
+    0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
+    0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59,
+    0x27, 0x80, 0xec, 0x5f, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d,
+    0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, 0xa0, 0xe0, 0x3b, 0x4d,
+    0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
+    0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63,
+    0x55, 0x21, 0x0c, 0x7d]);
+
+  var mix = new Uint32Array([
+    0x00000000, 0x0e090d0b, 0x1c121a16, 0x121b171d, 0x3824342c, 0x362d3927,
+    0x24362e3a, 0x2a3f2331, 0x70486858, 0x7e416553, 0x6c5a724e, 0x62537f45,
+    0x486c5c74, 0x4665517f, 0x547e4662, 0x5a774b69, 0xe090d0b0, 0xee99ddbb,
+    0xfc82caa6, 0xf28bc7ad, 0xd8b4e49c, 0xd6bde997, 0xc4a6fe8a, 0xcaaff381,
+    0x90d8b8e8, 0x9ed1b5e3, 0x8ccaa2fe, 0x82c3aff5, 0xa8fc8cc4, 0xa6f581cf,
+    0xb4ee96d2, 0xbae79bd9, 0xdb3bbb7b, 0xd532b670, 0xc729a16d, 0xc920ac66,
+    0xe31f8f57, 0xed16825c, 0xff0d9541, 0xf104984a, 0xab73d323, 0xa57ade28,
+    0xb761c935, 0xb968c43e, 0x9357e70f, 0x9d5eea04, 0x8f45fd19, 0x814cf012,
+    0x3bab6bcb, 0x35a266c0, 0x27b971dd, 0x29b07cd6, 0x038f5fe7, 0x0d8652ec,
+    0x1f9d45f1, 0x119448fa, 0x4be30393, 0x45ea0e98, 0x57f11985, 0x59f8148e,
+    0x73c737bf, 0x7dce3ab4, 0x6fd52da9, 0x61dc20a2, 0xad766df6, 0xa37f60fd,
+    0xb16477e0, 0xbf6d7aeb, 0x955259da, 0x9b5b54d1, 0x894043cc, 0x87494ec7,
+    0xdd3e05ae, 0xd33708a5, 0xc12c1fb8, 0xcf2512b3, 0xe51a3182, 0xeb133c89,
+    0xf9082b94, 0xf701269f, 0x4de6bd46, 0x43efb04d, 0x51f4a750, 0x5ffdaa5b,
+    0x75c2896a, 0x7bcb8461, 0x69d0937c, 0x67d99e77, 0x3daed51e, 0x33a7d815,
+    0x21bccf08, 0x2fb5c203, 0x058ae132, 0x0b83ec39, 0x1998fb24, 0x1791f62f,
+    0x764dd68d, 0x7844db86, 0x6a5fcc9b, 0x6456c190, 0x4e69e2a1, 0x4060efaa,
+    0x527bf8b7, 0x5c72f5bc, 0x0605bed5, 0x080cb3de, 0x1a17a4c3, 0x141ea9c8,
+    0x3e218af9, 0x302887f2, 0x223390ef, 0x2c3a9de4, 0x96dd063d, 0x98d40b36,
+    0x8acf1c2b, 0x84c61120, 0xaef93211, 0xa0f03f1a, 0xb2eb2807, 0xbce2250c,
+    0xe6956e65, 0xe89c636e, 0xfa877473, 0xf48e7978, 0xdeb15a49, 0xd0b85742,
+    0xc2a3405f, 0xccaa4d54, 0x41ecdaf7, 0x4fe5d7fc, 0x5dfec0e1, 0x53f7cdea,
+    0x79c8eedb, 0x77c1e3d0, 0x65daf4cd, 0x6bd3f9c6, 0x31a4b2af, 0x3fadbfa4,
+    0x2db6a8b9, 0x23bfa5b2, 0x09808683, 0x07898b88, 0x15929c95, 0x1b9b919e,
+    0xa17c0a47, 0xaf75074c, 0xbd6e1051, 0xb3671d5a, 0x99583e6b, 0x97513360,
+    0x854a247d, 0x8b432976, 0xd134621f, 0xdf3d6f14, 0xcd267809, 0xc32f7502,
+    0xe9105633, 0xe7195b38, 0xf5024c25, 0xfb0b412e, 0x9ad7618c, 0x94de6c87,
+    0x86c57b9a, 0x88cc7691, 0xa2f355a0, 0xacfa58ab, 0xbee14fb6, 0xb0e842bd,
+    0xea9f09d4, 0xe49604df, 0xf68d13c2, 0xf8841ec9, 0xd2bb3df8, 0xdcb230f3,
+    0xcea927ee, 0xc0a02ae5, 0x7a47b13c, 0x744ebc37, 0x6655ab2a, 0x685ca621,
+    0x42638510, 0x4c6a881b, 0x5e719f06, 0x5078920d, 0x0a0fd964, 0x0406d46f,
+    0x161dc372, 0x1814ce79, 0x322bed48, 0x3c22e043, 0x2e39f75e, 0x2030fa55,
+    0xec9ab701, 0xe293ba0a, 0xf088ad17, 0xfe81a01c, 0xd4be832d, 0xdab78e26,
+    0xc8ac993b, 0xc6a59430, 0x9cd2df59, 0x92dbd252, 0x80c0c54f, 0x8ec9c844,
+    0xa4f6eb75, 0xaaffe67e, 0xb8e4f163, 0xb6edfc68, 0x0c0a67b1, 0x02036aba,
+    0x10187da7, 0x1e1170ac, 0x342e539d, 0x3a275e96, 0x283c498b, 0x26354480,
+    0x7c420fe9, 0x724b02e2, 0x605015ff, 0x6e5918f4, 0x44663bc5, 0x4a6f36ce,
+    0x587421d3, 0x567d2cd8, 0x37a10c7a, 0x39a80171, 0x2bb3166c, 0x25ba1b67,
+    0x0f853856, 0x018c355d, 0x13972240, 0x1d9e2f4b, 0x47e96422, 0x49e06929,
+    0x5bfb7e34, 0x55f2733f, 0x7fcd500e, 0x71c45d05, 0x63df4a18, 0x6dd64713,
+    0xd731dcca, 0xd938d1c1, 0xcb23c6dc, 0xc52acbd7, 0xef15e8e6, 0xe11ce5ed,
+    0xf307f2f0, 0xfd0efffb, 0xa779b492, 0xa970b999, 0xbb6bae84, 0xb562a38f,
+    0x9f5d80be, 0x91548db5, 0x834f9aa8, 0x8d4697a3]);
+
+  function expandKey128(cipherKey) {
+    var b = 176, result = new Uint8Array(b);
+    result.set(cipherKey);
+    for (var j = 16, i = 1; j < b; ++i) {
+      // RotWord
+      var t1 = result[j - 3], t2 = result[j - 2],
+          t3 = result[j - 1], t4 = result[j - 4];
+      // SubWord
+      t1 = s[t1]; t2 = s[t2]; t3 = s[t3]; t4 = s[t4];
+      // Rcon
+      t1 = t1 ^ rcon[i];
+      for (var n = 0; n < 4; ++n) {
+        result[j] = (t1 ^= result[j - 16]); j++;
+        result[j] = (t2 ^= result[j - 16]); j++;
+        result[j] = (t3 ^= result[j - 16]); j++;
+        result[j] = (t4 ^= result[j - 16]); j++;
+      }
+    }
+    return result;
+  }
+
+  function decrypt128(input, key) {
+    var state = new Uint8Array(16);
+    state.set(input);
+    var i, j, k;
+    var t, u, v;
+    // AddRoundKey
+    for (j = 0, k = 160; j < 16; ++j, ++k)
+      state[j] ^= key[k];
+    for (i = 9; i >= 1; --i) {
+      // InvShiftRows
+      t = state[13]; state[13] = state[9]; state[9] = state[5];
+      state[5] = state[1]; state[1] = t;
+      t = state[14]; u = state[10]; state[14] = state[6];
+      state[10] = state[2]; state[6] = t; state[2] = u;
+      t = state[15]; u = state[11]; v = state[7]; state[15] = state[3];
+      state[11] = t; state[7] = u; state[3] = v;
+      // InvSubBytes
+      for (j = 0; j < 16; ++j)
+        state[j] = inv_s[state[j]];
+      // AddRoundKey
+      for (j = 0, k = i * 16; j < 16; ++j, ++k)
+        state[j] ^= key[k];
+      // InvMixColumns
+      for (j = 0; j < 16; j += 4) {
+        var s0 = mix[state[j]], s1 = mix[state[j + 1]],
+            s2 = mix[state[j + 2]], s3 = mix[state[j + 3]];
+        t = (s0 ^ (s1 >>> 8) ^ (s1 << 24) ^ (s2 >>> 16) ^ (s2 << 16) ^
+            (s3 >>> 24) ^ (s3 << 8));
+        state[j] = (t >>> 24) & 0xFF;
+        state[j + 1] = (t >> 16) & 0xFF;
+        state[j + 2] = (t >> 8) & 0xFF;
+        state[j + 3] = t & 0xFF;
+      }
+    }
+    // InvShiftRows
+    t = state[13]; state[13] = state[9]; state[9] = state[5];
+    state[5] = state[1]; state[1] = t;
+    t = state[14]; u = state[10]; state[14] = state[6];
+    state[10] = state[2]; state[6] = t; state[2] = u;
+    t = state[15]; u = state[11]; v = state[7]; state[15] = state[3];
+    state[11] = t; state[7] = u; state[3] = v;
+    for (j = 0; j < 16; ++j) {
+      // InvSubBytes
+      state[j] = inv_s[state[j]];
+      // AddRoundKey
+      state[j] ^= key[j];
+    }
+    return state;
+  }
+
+  function constructor(key) {
+    this.key = expandKey128(key);
+    this.buffer = new Uint8Array(16);
+    this.bufferPosition = 0;
+  }
+
+  function decryptBlock2(data) {
+    var i, j, ii, sourceLength = data.length,
+        buffer = this.buffer, bufferLength = this.bufferPosition,
+        result = [], iv = this.iv;
+    for (i = 0; i < sourceLength; ++i) {
+      buffer[bufferLength] = data[i];
+      ++bufferLength;
+      if (bufferLength < 16)
+        continue;
+      // buffer is full, decrypting
+      var plain = decrypt128(buffer, this.key);
+      // xor-ing the IV vector to get plain text
+      for (j = 0; j < 16; ++j)
+        plain[j] ^= iv[j];
+      iv = buffer;
+      result.push(plain);
+      buffer = new Uint8Array(16);
+      bufferLength = 0;
+    }
+    // saving incomplete buffer
+    this.buffer = buffer;
+    this.bufferLength = bufferLength;
+    this.iv = iv;
+    if (result.length == 0)
+      return new Uint8Array([]);
+    if (result.length == 1)
+      return result[0];
+    // combining plain text blocks into one
+    var output = new Uint8Array(16 * result.length);
+    for (i = 0, j = 0, ii = result.length; i < ii; ++i, j += 16)
+      output.set(result[i], j);
+    return output;
+  }
+
+  constructor.prototype = {
+    decryptBlock: function aes128CipherDecryptBlock(data) {
+      var i, sourceLength = data.length;
+      var buffer = this.buffer, bufferLength = this.bufferPosition;
+      // waiting for IV values -- they are at the start of the stream
+      for (i = 0; bufferLength < 16 && i < sourceLength; ++i, ++bufferLength)
+        buffer[bufferLength] = data[i];
+      if (bufferLength < 16) {
+        // need more data
+        this.bufferLength = bufferLength;
+        return new Uint8Array([]);
+      }
+      this.iv = buffer;
+      this.buffer = new Uint8Array(16);
+      this.bufferLength = 0;
+      // starting decryption
+      this.decryptBlock = decryptBlock2;
+      return this.decryptBlock(data.subarray(16));
+    }
+  };
+
+  return constructor;
+})();
+
+var CipherTransform = (function cipherTransform() {
+  function constructor(stringCipherConstructor, streamCipherConstructor) {
+    this.stringCipherConstructor = stringCipherConstructor;
+    this.streamCipherConstructor = streamCipherConstructor;
+  }
+  constructor.prototype = {
+    createStream: function cipherTransformCreateStream(stream) {
+      var cipher = new this.streamCipherConstructor();
+      return new DecryptStream(stream,
+        function cipherTransformDecryptStream(data) {
+          return cipher.decryptBlock(data);
+        }
+      );
+    },
+    decryptString: function cipherTransformDecryptString(s) {
+      var cipher = new this.stringCipherConstructor();
+      var data = stringToBytes(s);
+      data = cipher.decryptBlock(data);
+      return bytesToString(data);
+    }
+  };
+  return constructor;
+})();
+
+var CipherTransformFactory = (function cipherTransformFactory() {
+  function prepareKeyData(fileId, password, ownerPassword, userPassword,
+                          flags, revision, keyLength, encryptMetadata) {
+    var defaultPasswordBytes = new Uint8Array([
+      0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41,
+      0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08,
+      0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80,
+      0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A]);
+    var hashData = new Uint8Array(100), i = 0, j, n;
+    if (password) {
+      n = Math.min(32, password.length);
+      for (; i < n; ++i)
+        hashData[i] = password[i];
+    }
+    j = 0;
+    while (i < 32) {
+      hashData[i++] = defaultPasswordBytes[j++];
+    }
+    // as now the padded password in the hashData[0..i]
+    for (j = 0, n = ownerPassword.length; j < n; ++j)
+      hashData[i++] = ownerPassword[j];
+    hashData[i++] = flags & 0xFF;
+    hashData[i++] = (flags >> 8) & 0xFF;
+    hashData[i++] = (flags >> 16) & 0xFF;
+    hashData[i++] = (flags >>> 24) & 0xFF;
+    for (j = 0, n = fileId.length; j < n; ++j)
+      hashData[i++] = fileId[j];
+    if (revision >= 4 && !encryptMetadata) {
+      hashData[i++] = 0xFF;
+      hashData[i++] = 0xFF;
+      hashData[i++] = 0xFF;
+      hashData[i++] = 0xFF;
+    }
+    var hash = calculateMD5(hashData, 0, i);
+    var keyLengthInBytes = keyLength >> 3;
+    if (revision >= 3) {
+      for (j = 0; j < 50; ++j) {
+         hash = calculateMD5(hash, 0, keyLengthInBytes);
+      }
+    }
+    var encryptionKey = hash.subarray(0, keyLengthInBytes);
+    var cipher, checkData;
+
+    if (revision >= 3) {
+      // padded password in hashData, we can use this array for user
+      // password check
+      i = 32;
+      for (j = 0, n = fileId.length; j < n; ++j)
+        hashData[i++] = fileId[j];
+      cipher = new ARCFourCipher(encryptionKey);
+      var checkData = cipher.encryptBlock(calculateMD5(hashData, 0, i));
+      n = encryptionKey.length;
+      var derivedKey = new Uint8Array(n), k;
+      for (j = 1; j <= 19; ++j) {
+        for (k = 0; k < n; ++k)
+          derivedKey[k] = encryptionKey[k] ^ j;
+        cipher = new ARCFourCipher(derivedKey);
+        checkData = cipher.encryptBlock(checkData);
+      }
+    } else {
+      cipher = new ARCFourCipher(encryptionKey);
+      checkData = cipher.encryptBlock(hashData.subarray(0, 32));
+    }
+    for (j = 0, n = checkData.length; j < n; ++j) {
+      if (userPassword[j] != checkData[j])
+        error('incorrect password');
+    }
+    return encryptionKey;
+  }
+
+  var identityName = new Name('Identity');
+
+  function constructor(dict, fileId, password) {
+    var filter = dict.get('Filter');
+    if (!isName(filter) || filter.name != 'Standard')
+      error('unknown encryption method');
+    this.dict = dict;
+    var algorithm = dict.get('V');
+    if (!isInt(algorithm) ||
+      (algorithm != 1 && algorithm != 2 && algorithm != 4))
+      error('unsupported encryption algorithm');
+    this.algorithm = algorithm;
+    var keyLength = dict.get('Length') || 40;
+    if (!isInt(keyLength) ||
+      keyLength < 40 || (keyLength % 8) != 0)
+      error('invalid key length');
+    // prepare keys
+    var ownerPassword = stringToBytes(dict.get('O'));
+    var userPassword = stringToBytes(dict.get('U'));
+    var flags = dict.get('P');
+    var revision = dict.get('R');
+    var encryptMetadata =
+      dict.get('EncryptMetadata') !== false; // makes true as default value
+    var fileIdBytes = stringToBytes(fileId);
+    var passwordBytes;
+    if (password)
+      passwordBytes = stringToBytes(password);
+
+    this.encryptionKey = prepareKeyData(fileIdBytes, passwordBytes,
+                                        ownerPassword, userPassword,
+                                        flags, revision,
+                                        keyLength, encryptMetadata);
+    if (algorithm == 4) {
+      this.cf = dict.get('CF');
+      this.stmf = dict.get('StmF') || identityName;
+      this.strf = dict.get('StrF') || identityName;
+      this.eff = dict.get('EFF') || this.strf;
+    }
+  }
+
+  function buildObjectKey(num, gen, encryptionKey, isAes) {
+    var key = new Uint8Array(encryptionKey.length + 9), i, n;
+    for (i = 0, n = encryptionKey.length; i < n; ++i)
+      key[i] = encryptionKey[i];
+    key[i++] = num & 0xFF;
+    key[i++] = (num >> 8) & 0xFF;
+    key[i++] = (num >> 16) & 0xFF;
+    key[i++] = gen & 0xFF;
+    key[i++] = (gen >> 8) & 0xFF;
+    if (isAes) {
+      key[i++] = 0x73;
+      key[i++] = 0x41;
+      key[i++] = 0x6C;
+      key[i++] = 0x54;
+    }
+    var hash = calculateMD5(key, 0, i);
+    return hash.subarray(0, Math.min(encryptionKey.length + 5, 16));
+  }
+
+  function buildCipherConstructor(cf, name, num, gen, key) {
+    var cryptFilter = cf.get(name.name);
+    var cfm;
+    if (cryptFilter != null)
+      cfm = cryptFilter.get('CFM');
+    if (!cfm || cfm.name == 'None') {
+      return function cipherTransformFactoryBuildCipherConstructorNone() {
+        return new NullCipher();
+      };
+    }
+    if ('V2' == cfm.name) {
+      return function cipherTransformFactoryBuildCipherConstructorV2() {
+        return new ARCFourCipher(
+          buildObjectKey(num, gen, key, false));
+      };
+    }
+    if ('AESV2' == cfm.name) {
+      return function cipherTransformFactoryBuildCipherConstructorAESV2() {
+        return new AES128Cipher(
+          buildObjectKey(num, gen, key, true));
+      };
+    }
+    error('Unknown crypto method');
+    return null;
+  }
+
+  constructor.prototype = {
+    createCipherTransform: function buildCipherCreateCipherTransform(num,
+                                                                     gen) {
+      if (this.algorithm == 4) {
+        return new CipherTransform(
+          buildCipherConstructor(this.cf, this.stmf,
+            num, gen, this.encryptionKey),
+          buildCipherConstructor(this.cf, this.strf,
+            num, gen, this.encryptionKey));
+      }
+      // algorithms 1 and 2
+      var key = buildObjectKey(num, gen, this.encryptionKey, false);
+      var cipherConstructor = function buildCipherCipherConstructor() {
+        return new ARCFourCipher(key);
+      };
+      return new CipherTransform(cipherConstructor, cipherConstructor);
+    }
+  };
+
+  return constructor;
+})();
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var PartialEvaluator = (function partialEvaluator() {
+  function constructor(xref, handler, uniquePrefix) {
+    this.state = new EvalState();
+    this.stateStack = [];
+
+    this.xref = xref;
+    this.handler = handler;
+    this.uniquePrefix = uniquePrefix;
+    this.objIdCounter = 0;
+  }
+
+  var OP_MAP = {
+    // Graphics state
+    w: 'setLineWidth',
+    J: 'setLineCap',
+    j: 'setLineJoin',
+    M: 'setMiterLimit',
+    d: 'setDash',
+    ri: 'setRenderingIntent',
+    i: 'setFlatness',
+    gs: 'setGState',
+    q: 'save',
+    Q: 'restore',
+    cm: 'transform',
+
+    // Path
+    m: 'moveTo',
+    l: 'lineTo',
+    c: 'curveTo',
+    v: 'curveTo2',
+    y: 'curveTo3',
+    h: 'closePath',
+    re: 'rectangle',
+    S: 'stroke',
+    s: 'closeStroke',
+    f: 'fill',
+    F: 'fill',
+    'f*': 'eoFill',
+    B: 'fillStroke',
+    'B*': 'eoFillStroke',
+    b: 'closeFillStroke',
+    'b*': 'closeEOFillStroke',
+    n: 'endPath',
+
+    // Clipping
+    W: 'clip',
+    'W*': 'eoClip',
+
+    // Text
+    BT: 'beginText',
+    ET: 'endText',
+    Tc: 'setCharSpacing',
+    Tw: 'setWordSpacing',
+    Tz: 'setHScale',
+    TL: 'setLeading',
+    Tf: 'setFont',
+    Tr: 'setTextRenderingMode',
+    Ts: 'setTextRise',
+    Td: 'moveText',
+    TD: 'setLeadingMoveText',
+    Tm: 'setTextMatrix',
+    'T*': 'nextLine',
+    Tj: 'showText',
+    TJ: 'showSpacedText',
+    "'": 'nextLineShowText',
+    '"': 'nextLineSetSpacingShowText',
+
+    // Type3 fonts
+    d0: 'setCharWidth',
+    d1: 'setCharWidthAndBounds',
+
+    // Color
+    CS: 'setStrokeColorSpace',
+    cs: 'setFillColorSpace',
+    SC: 'setStrokeColor',
+    SCN: 'setStrokeColorN',
+    sc: 'setFillColor',
+    scn: 'setFillColorN',
+    G: 'setStrokeGray',
+    g: 'setFillGray',
+    RG: 'setStrokeRGBColor',
+    rg: 'setFillRGBColor',
+    K: 'setStrokeCMYKColor',
+    k: 'setFillCMYKColor',
+
+    // Shading
+    sh: 'shadingFill',
+
+    // Images
+    BI: 'beginInlineImage',
+    ID: 'beginImageData',
+    EI: 'endInlineImage',
+
+    // XObjects
+    Do: 'paintXObject',
+
+    // Marked content
+    MP: 'markPoint',
+    DP: 'markPointProps',
+    BMC: 'beginMarkedContent',
+    BDC: 'beginMarkedContentProps',
+    EMC: 'endMarkedContent',
+
+    // Compatibility
+    BX: 'beginCompat',
+    EX: 'endCompat'
+  };
+
+  constructor.prototype = {
+    getIRQueue: function partialEvaluatorGetIRQueue(stream, resources,
+                                    queue, dependency) {
+
+      var self = this;
+      var xref = this.xref;
+      var handler = this.handler;
+      var uniquePrefix = this.uniquePrefix;
+
+      function insertDependency(depList) {
+        fnArray.push('dependency');
+        argsArray.push(depList);
+        for (var i = 0, ii = depList.length; i < ii; i++) {
+          var dep = depList[i];
+          if (dependency.indexOf(dep) == -1) {
+            dependency.push(depList[i]);
+          }
+        }
+      }
+
+      function handleSetFont(fontName, fontRef) {
+        var loadedName = null;
+
+        var fontRes = resources.get('Font');
+
+        // TODO: TOASK: Is it possible to get here? If so, what does
+        // args[0].name should be like???
+        assert(fontRes, 'fontRes not available');
+
+        fontRes = xref.fetchIfRef(fontRes);
+        fontRef = fontRef || fontRes.get(fontName);
+        var font = xref.fetchIfRef(fontRef);
+        assertWellFormed(isDict(font));
+        if (!font.translated) {
+          font.translated = self.translateFont(font, xref, resources,
+                                               dependency);
+          if (font.translated) {
+            // keep track of each font we translated so the caller can
+            // load them asynchronously before calling display on a page
+            loadedName = 'font_' + uniquePrefix + (++self.objIdCounter);
+            font.translated.properties.loadedName = loadedName;
+            font.loadedName = loadedName;
+
+            var translated = font.translated;
+            handler.send('obj', [
+                loadedName,
+                'Font',
+                translated.name,
+                translated.file,
+                translated.properties
+            ]);
+          }
+        }
+        loadedName = loadedName || font.loadedName;
+
+        // Ensure the font is ready before the font is set
+        // and later on used for drawing.
+        // TODO: This should get insert to the IRQueue only once per
+        // page.
+        insertDependency([loadedName]);
+        return loadedName;
+      }
+
+      function buildPaintImageXObject(image, inline) {
+        var dict = image.dict;
+        var w = dict.get('Width', 'W');
+        var h = dict.get('Height', 'H');
+
+        if (image instanceof JpegStream && image.isNative) {
+          var objId = 'img_' + uniquePrefix + (++self.objIdCounter);
+          handler.send('obj', [objId, 'JpegStream', image.getIR()]);
+
+          // Add the dependency on the image object.
+          insertDependency([objId]);
+
+          // The normal fn.
+          fn = 'paintJpegXObject';
+          args = [objId, w, h];
+
+          return;
+        }
+
+        // Needs to be rendered ourself.
+
+        // Figure out if the image has an imageMask.
+        var imageMask = dict.get('ImageMask', 'IM') || false;
+
+        // If there is no imageMask, create the PDFImage and a lot
+        // of image processing can be done here.
+        if (!imageMask) {
+          var imageObj = new PDFImage(xref, resources, image, inline);
+
+          if (imageObj.imageMask) {
+            throw 'Can\'t handle this in the web worker :/';
+          }
+
+          var imgData = {
+            width: w,
+            height: h,
+            data: new Uint8Array(w * h * 4)
+          };
+          var pixels = imgData.data;
+          imageObj.fillRgbaBuffer(pixels, imageObj.decode);
+
+          fn = 'paintImageXObject';
+          args = [imgData];
+          return;
+        }
+
+        // This depends on a tmpCanvas beeing filled with the
+        // current fillStyle, such that processing the pixel
+        // data can't be done here. Instead of creating a
+        // complete PDFImage, only read the information needed
+        // for later.
+        fn = 'paintImageMaskXObject';
+
+        var width = dict.get('Width', 'W');
+        var height = dict.get('Height', 'H');
+        var bitStrideLength = (width + 7) >> 3;
+        var imgArray = image.getBytes(bitStrideLength * height);
+        var decode = dict.get('Decode', 'D');
+        var inverseDecode = !!decode && decode[0] > 0;
+
+        args = [imgArray, inverseDecode, width, height];
+      }
+
+      uniquePrefix = uniquePrefix || '';
+      if (!queue.argsArray) {
+        queue.argsArray = [];
+      }
+      if (!queue.fnArray) {
+        queue.fnArray = [];
+      }
+
+      var fnArray = queue.fnArray, argsArray = queue.argsArray;
+      var dependencyArray = dependency || [];
+
+      resources = xref.fetchIfRef(resources) || new Dict();
+      var xobjs = xref.fetchIfRef(resources.get('XObject')) || new Dict();
+      var patterns = xref.fetchIfRef(resources.get('Pattern')) || new Dict();
+      var parser = new Parser(new Lexer(stream), false);
+      var res = resources;
+      var args = [], obj;
+      var getObjBt = function getObjBt() {
+        parser = this.oldParser;
+        return { name: 'BT' };
+      };
+      var TILING_PATTERN = 1, SHADING_PATTERN = 2;
+
+      while (!isEOF(obj = parser.getObj())) {
+        if (isCmd(obj)) {
+          var cmd = obj.cmd;
+          var fn = OP_MAP[cmd];
+          if (!fn) {
+            // invalid content command, trying to recover
+            if (cmd.substr(-2) == 'BT') {
+              fn = OP_MAP[cmd.substr(0, cmd.length - 2)];
+              // feeding 'BT' on next interation
+              parser = {
+                getObj: getObjBt,
+                oldParser: parser
+              };
+            }
+          }
+          assertWellFormed(fn, 'Unknown command "' + cmd + '"');
+          // TODO figure out how to type-check vararg functions
+
+          if ((cmd == 'SCN' || cmd == 'scn') && !args[args.length - 1].code) {
+            // Use the IR version for setStroke/FillColorN.
+            fn += '_IR';
+
+            // compile tiling patterns
+            var patternName = args[args.length - 1];
+            // SCN/scn applies patterns along with normal colors
+            if (isName(patternName)) {
+              var pattern = xref.fetchIfRef(patterns.get(patternName.name));
+              if (pattern) {
+                var dict = isStream(pattern) ? pattern.dict : pattern;
+                var typeNum = dict.get('PatternType');
+
+                if (typeNum == TILING_PATTERN) {
+                  // Create an IR of the pattern code.
+                  var depIdx = dependencyArray.length;
+                  var queueObj = {};
+                  var codeIR = this.getIRQueue(pattern, dict.get('Resources'),
+                                               queueObj, dependencyArray);
+
+                  // Add the dependencies that are required to execute the
+                  // codeIR.
+                  insertDependency(dependencyArray.slice(depIdx));
+
+                  args = TilingPattern.getIR(codeIR, dict, args);
+                }
+                else if (typeNum == SHADING_PATTERN) {
+                  var shading = xref.fetchIfRef(dict.get('Shading'));
+                  var matrix = dict.get('Matrix');
+                  var pattern = Pattern.parseShading(shading, matrix, xref, res,
+                                                                  null /*ctx*/);
+                  args = pattern.getIR();
+                } else {
+                  error('Unkown PatternType ' + typeNum);
+                }
+              }
+            }
+          } else if (cmd == 'Do' && !args[0].code) {
+            // eagerly compile XForm objects
+            var name = args[0].name;
+            var xobj = xobjs.get(name);
+            if (xobj) {
+              xobj = xref.fetchIfRef(xobj);
+              assertWellFormed(isStream(xobj), 'XObject should be a stream');
+
+              var type = xobj.dict.get('Subtype');
+              assertWellFormed(
+                isName(type),
+                'XObject should have a Name subtype'
+              );
+
+              if ('Form' == type.name) {
+                var matrix = xobj.dict.get('Matrix');
+                var bbox = xobj.dict.get('BBox');
+
+                fnArray.push('paintFormXObjectBegin');
+                argsArray.push([matrix, bbox]);
+
+                // This adds the IRQueue of the xObj to the current queue.
+                var depIdx = dependencyArray.length;
+
+                this.getIRQueue(xobj, xobj.dict.get('Resources'), queue,
+                                dependencyArray);
+
+               // Add the dependencies that are required to execute the
+               // codeIR.
+               insertDependency(dependencyArray.slice(depIdx));
+
+                fn = 'paintFormXObjectEnd';
+                args = [];
+              } else if ('Image' == type.name) {
+                buildPaintImageXObject(xobj, false);
+              } else {
+                error('Unhandled XObject subtype ' + type.name);
+              }
+            }
+          } else if (cmd == 'Tf') { // eagerly collect all fonts
+            args[0] = handleSetFont(args[0].name);
+          } else if (cmd == 'EI') {
+            buildPaintImageXObject(args[0], true);
+          }
+
+          switch (fn) {
+            // Parse the ColorSpace data to a raw format.
+            case 'setFillColorSpace':
+            case 'setStrokeColorSpace':
+              args = [ColorSpace.parseToIR(args[0], xref, resources)];
+              break;
+            case 'shadingFill':
+              var shadingRes = xref.fetchIfRef(res.get('Shading'));
+              if (!shadingRes)
+                error('No shading resource found');
+
+              var shading = xref.fetchIfRef(shadingRes.get(args[0].name));
+              if (!shading)
+                error('No shading object found');
+
+              var shadingFill = Pattern.parseShading(shading, null, xref, res,
+                                                      null);
+              var patternIR = shadingFill.getIR();
+              args = [patternIR];
+              fn = 'shadingFill';
+              break;
+            case 'setGState':
+              var dictName = args[0];
+              var extGState = xref.fetchIfRef(resources.get('ExtGState'));
+
+              if (!isDict(extGState) || !extGState.has(dictName.name))
+                break;
+
+              var gsState = xref.fetchIfRef(extGState.get(dictName.name));
+
+              // This array holds the converted/processed state data.
+              var gsStateObj = [];
+
+              gsState.forEach(
+                function canvasGraphicsSetGStateForEach(key, value) {
+                  switch (key) {
+                    case 'Type':
+                      break;
+                    case 'LW':
+                    case 'LC':
+                    case 'LJ':
+                    case 'ML':
+                    case 'D':
+                    case 'RI':
+                    case 'FL':
+                    case 'CA':
+                    case 'ca':
+                      gsStateObj.push([key, value]);
+                      break;
+                    case 'Font':
+                      gsStateObj.push([
+                        'Font',
+                        handleSetFont(null, value[0]),
+                        value[1]
+                      ]);
+                      break;
+                    case 'OP':
+                    case 'op':
+                    case 'OPM':
+                    case 'BG':
+                    case 'BG2':
+                    case 'UCR':
+                    case 'UCR2':
+                    case 'TR':
+                    case 'TR2':
+                    case 'HT':
+                    case 'SM':
+                    case 'SA':
+                    case 'BM':
+                    case 'SMask':
+                    case 'AIS':
+                    case 'TK':
+                      TODO('graphic state operator ' + key);
+                      break;
+                    default:
+                      warn('Unknown graphic state operator ' + key);
+                      break;
+                  }
+                }
+              );
+              args = [gsStateObj];
+              break;
+          } // switch
+
+          fnArray.push(fn);
+          argsArray.push(args);
+          args = [];
+        } else if (obj != null) {
+          assertWellFormed(args.length <= 33, 'Too many arguments');
+          args.push(obj);
+        }
+      }
+
+      return {
+        fnArray: fnArray,
+        argsArray: argsArray
+      };
+    },
+
+    extractDataStructures: function
+      partialEvaluatorExtractDataStructures(dict, baseDict,
+                                            xref, properties) {
+      // 9.10.2
+      var toUnicode = dict.get('ToUnicode') ||
+        baseDict.get('ToUnicode');
+      if (toUnicode)
+        properties.toUnicode = this.readToUnicode(toUnicode, xref);
+
+      if (properties.composite) {
+        // CIDSystemInfo helps to match CID to glyphs
+        var cidSystemInfo = xref.fetchIfRef(dict.get('CIDSystemInfo'));
+        if (isDict(cidSystemInfo)) {
+          properties.cidSystemInfo = {
+            registry: cidSystemInfo.get('Registry'),
+            ordering: cidSystemInfo.get('Ordering'),
+            supplement: cidSystemInfo.get('Supplement')
+          };
+        }
+
+        var cidToGidMap = xref.fetchIfRef(dict.get('CIDToGIDMap'));
+        if (isStream(cidToGidMap))
+          properties.cidToGidMap = this.readCidToGidMap(cidToGidMap);
+      }
+
+      var differences = [];
+      var baseEncoding = Encodings.StandardEncoding;
+      var hasEncoding = dict.has('Encoding');
+      if (hasEncoding) {
+        var encoding = xref.fetchIfRef(dict.get('Encoding'));
+        if (isDict(encoding)) {
+          var baseName = encoding.get('BaseEncoding');
+          if (baseName)
+            baseEncoding = Encodings[baseName.name];
+
+          // Load the differences between the base and original
+          if (encoding.has('Differences')) {
+            var diffEncoding = encoding.get('Differences');
+            var index = 0;
+            for (var j = 0, jj = diffEncoding.length; j < jj; j++) {
+              var data = diffEncoding[j];
+              if (isNum(data))
+                index = data;
+              else
+                differences[index++] = data.name;
+            }
+          }
+        } else if (isName(encoding)) {
+          baseEncoding = Encodings[encoding.name];
+        } else {
+          error('Encoding is not a Name nor a Dict');
+        }
+      }
+      properties.differences = differences;
+      properties.baseEncoding = baseEncoding;
+      properties.hasEncoding = hasEncoding;
+    },
+
+    readToUnicode:
+      function partialEvaluatorReadToUnicode(toUnicode, xref) {
+      var cmapObj = xref.fetchIfRef(toUnicode);
+      var charToUnicode = [];
+      if (isName(cmapObj)) {
+        var isIdentityMap = cmapObj.name.substr(0, 9) == 'Identity-';
+        if (!isIdentityMap)
+          error('ToUnicode file cmap translation not implemented');
+      } else if (isStream(cmapObj)) {
+        var tokens = [];
+        var token = '';
+        var beginArrayToken = {};
+
+        var cmap = cmapObj.getBytes(cmapObj.length);
+        for (var i = 0, ii = cmap.length; i < ii; i++) {
+          var byte = cmap[i];
+          if (byte == 0x20 || byte == 0x0D || byte == 0x0A ||
+              byte == 0x3C || byte == 0x5B || byte == 0x5D) {
+            switch (token) {
+              case 'usecmap':
+                error('usecmap is not implemented');
+                break;
+
+              case 'beginbfchar':
+              case 'beginbfrange':
+              case 'begincidchar':
+              case 'begincidrange':
+                token = '';
+                tokens = [];
+                break;
+
+              case 'endcidrange':
+              case 'endbfrange':
+                for (var j = 0, jj = tokens.length; j < jj; j += 3) {
+                  var startRange = tokens[j];
+                  var endRange = tokens[j + 1];
+                  var code = tokens[j + 2];
+                  while (startRange <= endRange) {
+                    charToUnicode[startRange] = code++;
+                    ++startRange;
+                  }
+                }
+                break;
+
+              case 'endcidchar':
+              case 'endbfchar':
+                for (var j = 0, jj = tokens.length; j < jj; j += 2) {
+                  var index = tokens[j];
+                  var code = tokens[j + 1];
+                  charToUnicode[index] = code;
+                }
+                break;
+
+              case '':
+                break;
+
+              default:
+                if (token[0] >= '0' && token[0] <= '9')
+                  token = parseInt(token, 10); // a number
+                tokens.push(token);
+                token = '';
+            }
+            switch (byte) {
+              case 0x5B:
+                // begin list parsing
+                tokens.push(beginArrayToken);
+                break;
+              case 0x5D:
+                // collect array items
+                var items = [], item;
+                while (tokens.length &&
+                       (item = tokens.pop()) != beginArrayToken)
+                  items.unshift(item);
+                tokens.push(items);
+                break;
+            }
+          } else if (byte == 0x3E) {
+            if (token.length) {
+              // parsing hex number
+              tokens.push(parseInt(token, 16));
+              token = '';
+            }
+          } else {
+            token += String.fromCharCode(byte);
+          }
+        }
+      }
+      return charToUnicode;
+    },
+    readCidToGidMap:
+      function partialEvaluatorReadCidToGidMap(cidToGidStream) {
+      // Extract the encoding from the CIDToGIDMap
+      var glyphsData = cidToGidStream.getBytes();
+
+      // Set encoding 0 to later verify the font has an encoding
+      var result = [];
+      for (var j = 0, jj = glyphsData.length; j < jj; j++) {
+        var glyphID = (glyphsData[j++] << 8) | glyphsData[j];
+        if (glyphID == 0)
+          continue;
+
+        var code = j >> 1;
+        result[code] = glyphID;
+      }
+      return result;
+    },
+
+    extractWidths: function partialEvaluatorWidths(dict,
+                                                   xref,
+                                                   descriptor,
+                                                   properties) {
+      var glyphsWidths = [];
+      var defaultWidth = 0;
+      if (properties.composite) {
+        defaultWidth = xref.fetchIfRef(dict.get('DW')) || 1000;
+
+        var widths = xref.fetchIfRef(dict.get('W'));
+        if (widths) {
+          var start = 0, end = 0;
+          for (var i = 0, ii = widths.length; i < ii; i++) {
+            var code = widths[i];
+            if (isArray(code)) {
+              for (var j = 0, jj = code.length; j < jj; j++)
+                glyphsWidths[start++] = code[j];
+              start = 0;
+            } else if (start) {
+              var width = widths[++i];
+              for (var j = start; j <= code; j++)
+                glyphsWidths[j] = width;
+              start = 0;
+            } else {
+              start = code;
+            }
+          }
+        }
+      } else {
+        var firstChar = properties.firstChar;
+        var widths = xref.fetchIfRef(dict.get('Widths'));
+        if (widths) {
+          var j = firstChar;
+          for (var i = 0, ii = widths.length; i < ii; i++)
+            glyphsWidths[j++] = widths[i];
+          defaultWidth = parseFloat(descriptor.get('MissingWidth')) || 0;
+        } else {
+          // Trying get the BaseFont metrics (see comment above).
+          var baseFontName = dict.get('BaseFont');
+          if (isName(baseFontName)) {
+            var metrics = this.getBaseFontMetrics(baseFontName.name);
+
+            glyphsWidths = metrics.widths;
+            defaultWidth = metrics.defaultWidth;
+          }
+        }
+      }
+
+      properties.defaultWidth = defaultWidth;
+      properties.widths = glyphsWidths;
+    },
+
+    getBaseFontMetrics: function getBaseFontMetrics(name) {
+      var defaultWidth = 0, widths = [];
+      var glyphWidths = Metrics[stdFontMap[name] || name];
+      if (isNum(glyphWidths)) {
+        defaultWidth = glyphWidths;
+      } else {
+        widths = glyphWidths;
+      }
+
+      return {
+        defaultWidth: defaultWidth,
+        widths: widths
+      };
+    },
+
+    translateFont: function partialEvaluatorTranslateFont(dict, xref, resources,
+                                                          dependency) {
+      var baseDict = dict;
+      var type = dict.get('Subtype');
+      assertWellFormed(isName(type), 'invalid font Subtype');
+
+      var composite = false;
+      if (type.name == 'Type0') {
+        // If font is a composite
+        //  - get the descendant font
+        //  - set the type according to the descendant font
+        //  - get the FontDescriptor from the descendant font
+        var df = dict.get('DescendantFonts');
+        if (!df)
+          return null;
+
+        if (isRef(df))
+          df = xref.fetch(df);
+
+        dict = xref.fetchIfRef(isRef(df) ? df : df[0]);
+
+        type = dict.get('Subtype');
+        assertWellFormed(isName(type), 'invalid font Subtype');
+        composite = true;
+      }
+      var maxCharIndex = composite ? 0xFFFF : 0xFF;
+
+      var descriptor = xref.fetchIfRef(dict.get('FontDescriptor'));
+      if (!descriptor) {
+        if (type.name == 'Type3') {
+          // FontDescriptor is only required for Type3 fonts when the document
+          // is a tagged pdf. Create a barbebones one to get by.
+          descriptor = new Dict();
+          descriptor.set('FontName', new Name(type.name));
+        } else {
+          // Before PDF 1.5 if the font was one of the base 14 fonts, having a
+          // FontDescriptor was not required.
+          // This case is here for compatibility.
+          var baseFontName = dict.get('BaseFont');
+          if (!isName(baseFontName))
+            return null;
+
+          // Using base font name as a font name.
+          baseFontName = baseFontName.name.replace(/[,_]/g, '-');
+          var metrics = this.getBaseFontMetrics(baseFontName);
+
+          var properties = {
+            type: type.name,
+            widths: metrics.widths,
+            defaultWidth: metrics.defaultWidth,
+            firstChar: 0,
+            lastChar: maxCharIndex
+          };
+          this.extractDataStructures(dict, dict, xref, properties);
+
+          return {
+            name: baseFontName,
+            dict: baseDict,
+            properties: properties
+          };
+        }
+
+      }
+
+      // According to the spec if 'FontDescriptor' is declared, 'FirstChar',
+      // 'LastChar' and 'Widths' should exists too, but some PDF encoders seems
+      // to ignore this rule when a variant of a standart font is used.
+      // TODO Fill the width array depending on which of the base font this is
+      // a variant.
+      var firstChar = xref.fetchIfRef(dict.get('FirstChar')) || 0;
+      var lastChar = xref.fetchIfRef(dict.get('LastChar')) || maxCharIndex;
+      var fontName = xref.fetchIfRef(descriptor.get('FontName'));
+      assertWellFormed(isName(fontName), 'invalid font name');
+
+      var fontFile = descriptor.get('FontFile', 'FontFile2', 'FontFile3');
+      if (fontFile) {
+        fontFile = xref.fetchIfRef(fontFile);
+        if (fontFile.dict) {
+          var subtype = fontFile.dict.get('Subtype');
+          if (subtype)
+            subtype = subtype.name;
+
+          var length1 = fontFile.dict.get('Length1');
+          if (!isInt(length1))
+            length1 = xref.fetchIfRef(length1);
+
+          var length2 = fontFile.dict.get('Length2');
+          if (!isInt(length2))
+            length2 = xref.fetchIfRef(length2);
+        }
+      }
+
+      var properties = {
+        type: type.name,
+        subtype: subtype,
+        file: fontFile,
+        length1: length1,
+        length2: length2,
+        composite: composite,
+        fixedPitch: false,
+        fontMatrix: dict.get('FontMatrix') || IDENTITY_MATRIX,
+        firstChar: firstChar || 0,
+        lastChar: lastChar || maxCharIndex,
+        bbox: descriptor.get('FontBBox'),
+        ascent: descriptor.get('Ascent'),
+        descent: descriptor.get('Descent'),
+        xHeight: descriptor.get('XHeight'),
+        capHeight: descriptor.get('CapHeight'),
+        flags: descriptor.get('Flags'),
+        italicAngle: descriptor.get('ItalicAngle'),
+        coded: false
+      };
+      this.extractWidths(dict, xref, descriptor, properties);
+      this.extractDataStructures(dict, baseDict, xref, properties);
+
+      if (type.name === 'Type3') {
+        properties.coded = true;
+        var charProcs = xref.fetchIfRef(dict.get('CharProcs'));
+        var fontResources = xref.fetchIfRef(dict.get('Resources')) || resources;
+        properties.resources = fontResources;
+        properties.charProcIRQueues = {};
+        for (var key in charProcs.map) {
+          var glyphStream = xref.fetchIfRef(charProcs.map[key]);
+          var queueObj = {};
+          properties.charProcIRQueues[key] =
+            this.getIRQueue(glyphStream, fontResources, queueObj, dependency);
+        }
+      }
+
+      return {
+        name: fontName.name,
+        dict: baseDict,
+        file: fontFile,
+        properties: properties
+      };
+    }
+  };
+
+  return constructor;
+})();
+
+var EvalState = (function evalState() {
+  function constructor() {
+    // Are soft masks and alpha values shapes or opacities?
+    this.alphaIsShape = false;
+    this.fontSize = 0;
+    this.textMatrix = IDENTITY_MATRIX;
+    this.leading = 0;
+    // Start of text line (in text coordinates)
+    this.lineX = 0;
+    this.lineY = 0;
+    // Character and word spacing
+    this.charSpacing = 0;
+    this.wordSpacing = 0;
+    this.textHScale = 1;
+    // Color spaces
+    this.fillColorSpace = null;
+    this.strokeColorSpace = null;
+  }
+  constructor.prototype = {
+  };
+  return constructor;
+})();
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var isWorker = (typeof window == 'undefined');
+
+/**
+ * Maximum time to wait for a font to be loaded by font-face rules.
+ */
+var kMaxWaitForFontFace = 1000;
+
+// Unicode Private Use Area
+var kCmapGlyphOffset = 0xE000;
+var kSizeOfGlyphArea = 0x1900;
+
+// PDF Glyph Space Units are one Thousandth of a TextSpace Unit
+// except for Type 3 fonts
+var kPDFGlyphSpaceUnits = 1000;
+
+// Until hinting is fully supported this constant can be used
+var kHintingEnabled = false;
+
+var Encodings = {
+  get ExpertEncoding() {
+    return shadow(this, 'ExpertEncoding', ['', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', 'space', 'exclamsmall', 'Hungarumlautsmall', '',
+      'dollaroldstyle', 'dollarsuperior', 'ampersandsmall', 'Acutesmall',
+      'parenleftsuperior', 'parenrightsuperior', 'twodotenleader',
+      'onedotenleader', 'comma', 'hyphen', 'period', 'fraction',
+      'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle',
+      'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle',
+      'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon', 'commasuperior',
+      'threequartersemdash', 'periodsuperior', 'questionsmall', '',
+      'asuperior', 'bsuperior', 'centsuperior', 'dsuperior', 'esuperior', '',
+      '', 'isuperior', '', '', 'lsuperior', 'msuperior', 'nsuperior',
+      'osuperior', '', '', 'rsuperior', 'ssuperior', 'tsuperior', '', 'ff',
+      'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior', '', 'parenrightinferior',
+      'Circumflexsmall', 'hyphensuperior', 'Gravesmall', 'Asmall', 'Bsmall',
+      'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall',
+      'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall',
+      'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall',
+      'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah',
+      'Tildesmall', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall', '', '',
+      'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall',
+      'Caronsmall', '', 'Dotaccentsmall', '', '', 'Macronsmall', '', '',
+      'figuredash', 'hypheninferior', '', '', 'Ogoneksmall', 'Ringsmall',
+      'Cedillasmall', '', '', '', 'onequarter', 'onehalf', 'threequarters',
+      'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths',
+      'seveneighths', 'onethird', 'twothirds', '', '', 'zerosuperior',
+      'onesuperior', 'twosuperior', 'threesuperior', 'foursuperior',
+      'fivesuperior', 'sixsuperior', 'sevensuperior', 'eightsuperior',
+      'ninesuperior', 'zeroinferior', 'oneinferior', 'twoinferior',
+      'threeinferior', 'fourinferior', 'fiveinferior', 'sixinferior',
+      'seveninferior', 'eightinferior', 'nineinferior', 'centinferior',
+      'dollarinferior', 'periodinferior', 'commainferior', 'Agravesmall',
+      'Aacutesmall', 'Acircumflexsmall', 'Atildesmall', 'Adieresissmall',
+      'Aringsmall', 'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall',
+      'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall',
+      'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall',
+      'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall',
+      'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall',
+      'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall',
+      'Ydieresissmall'
+    ]);
+  },
+  get MacExpertEncoding() {
+    return shadow(this, 'MacExpertEncoding', ['', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', 'space', 'exclamsmall', 'Hungarumlautsmall',
+      'centoldstyle', 'dollaroldstyle', 'dollarsuperior', 'ampersandsmall',
+      'Acutesmall', 'parenleftsuperior', 'parenrightsuperior',
+      'twodotenleader', 'onedotenleader', 'comma', 'hyphen', 'period',
+      'fraction', 'zerooldstyle', 'oneoldstyle', 'twooldstyle',
+      'threeoldstyle', 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle',
+      'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon',
+      '', 'threequartersemdash', '', 'questionsmall', '', '', '', '',
+      'Ethsmall', '', '', 'onequarter', 'onehalf', 'threequarters',
+      'oneeighth', 'threeeighths', 'fiveeighths', 'seveneighths', 'onethird',
+      'twothirds', '', '', '', '', '', '', 'ff', 'fi', 'fl', 'ffi', 'ffl',
+      'parenleftinferior', '', 'parenrightinferior', 'Circumflexsmall',
+      'hypheninferior', 'Gravesmall', 'Asmall', 'Bsmall', 'Csmall', 'Dsmall',
+      'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall', 'Jsmall', 'Ksmall',
+      'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall', 'Qsmall', 'Rsmall',
+      'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall',
+      'Zsmall', 'colonmonetary', 'onefitted', 'rupiah', 'Tildesmall', '', '',
+      'asuperior', 'centsuperior', '', '', '', '', 'Aacutesmall',
+      'Agravesmall', 'Acircumflexsmall', 'Adieresissmall', 'Atildesmall',
+      'Aringsmall', 'Ccedillasmall', 'Eacutesmall', 'Egravesmall',
+      'Ecircumflexsmall', 'Edieresissmall', 'Iacutesmall', 'Igravesmall',
+      'Icircumflexsmall', 'Idieresissmall', 'Ntildesmall', 'Oacutesmall',
+      'Ogravesmall', 'Ocircumflexsmall', 'Odieresissmall', 'Otildesmall',
+      'Uacutesmall', 'Ugravesmall', 'Ucircumflexsmall', 'Udieresissmall', '',
+      'eightsuperior', 'fourinferior', 'threeinferior', 'sixinferior',
+      'eightinferior', 'seveninferior', 'Scaronsmall', '', 'centinferior',
+      'twoinferior', '', 'Dieresissmall', '', 'Caronsmall', 'osuperior',
+      'fiveinferior', '', 'commainferior', 'periodinferior', 'Yacutesmall', '',
+      'dollarinferior', '', 'Thornsmall', '', 'nineinferior', 'zeroinferior',
+      'Zcaronsmall', 'AEsmall', 'Oslashsmall', 'questiondownsmall',
+      'oneinferior', 'Lslashsmall', '', '', '', '', '', '', 'Cedillasmall', '',
+      '', '', '', '', 'OEsmall', 'figuredash', 'hyphensuperior', '', '', '',
+      '', 'exclamdownsmall', '', 'Ydieresissmall', '', 'onesuperior',
+      'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior',
+      'sixsuperior', 'sevensuperior', 'ninesuperior', 'zerosuperior', '',
+      'esuperior', 'rsuperior', 'tsuperior', '', '', 'isuperior', 'ssuperior',
+      'dsuperior', '', '', '', '', '', 'lsuperior', 'Ogoneksmall',
+      'Brevesmall', 'Macronsmall', 'bsuperior', 'nsuperior', 'msuperior',
+      'commasuperior', 'periodsuperior', 'Dotaccentsmall', 'Ringsmall'
+    ]);
+  },
+  get MacRomanEncoding() {
+    return shadow(this, 'MacRomanEncoding', ['', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', 'space', 'exclam', 'quotedbl', 'numbersign',
+      'dollar', 'percent', 'ampersand', 'quotesingle', 'parenleft',
+      'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash',
+      'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
+      'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question',
+      'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+      'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+      'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore',
+      'grave', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+      'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+      'braceleft', 'bar', 'braceright', 'asciitilde', '', 'Adieresis', 'Aring',
+      'Ccedilla', 'Eacute', 'Ntilde', 'Odieresis', 'Udieresis', 'aacute',
+      'agrave', 'acircumflex', 'adieresis', 'atilde', 'aring', 'ccedilla',
+      'eacute', 'egrave', 'ecircumflex', 'edieresis', 'iacute', 'igrave',
+      'icircumflex', 'idieresis', 'ntilde', 'oacute', 'ograve', 'ocircumflex',
+      'odieresis', 'otilde', 'uacute', 'ugrave', 'ucircumflex', 'udieresis',
+      'dagger', 'degree', 'cent', 'sterling', 'section', 'bullet', 'paragraph',
+      'germandbls', 'registered', 'copyright', 'trademark', 'acute',
+      'dieresis', 'notequal', 'AE', 'Oslash', 'infinity', 'plusminus',
+      'lessequal', 'greaterequal', 'yen', 'mu', 'partialdiff', 'summation',
+      'product', 'pi', 'integral', 'ordfeminine', 'ordmasculine', 'Omega',
+      'ae', 'oslash', 'questiondown', 'exclamdown', 'logicalnot', 'radical',
+      'florin', 'approxequal', 'Delta', 'guillemotleft', 'guillemotright',
+      'ellipsis', 'space', 'Agrave', 'Atilde', 'Otilde', 'OE', 'oe', 'endash',
+      'emdash', 'quotedblleft', 'quotedblright', 'quoteleft', 'quoteright',
+      'divide', 'lozenge', 'ydieresis', 'Ydieresis', 'fraction', 'currency',
+      'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'daggerdbl',
+      'periodcentered', 'quotesinglbase', 'quotedblbase', 'perthousand',
+      'Acircumflex', 'Ecircumflex', 'Aacute', 'Edieresis', 'Egrave', 'Iacute',
+      'Icircumflex', 'Idieresis', 'Igrave', 'Oacute', 'Ocircumflex', 'apple',
+      'Ograve', 'Uacute', 'Ucircumflex', 'Ugrave', 'dotlessi', 'circumflex',
+      'tilde', 'macron', 'breve', 'dotaccent', 'ring', 'cedilla',
+      'hungarumlaut', 'ogonek', 'caron'
+    ]);
+  },
+  get StandardEncoding() {
+    return shadow(this, 'StandardEncoding', ['', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', 'space', 'exclam', 'quotedbl', 'numbersign',
+      'dollar', 'percent', 'ampersand', 'quoteright', 'parenleft',
+      'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash',
+      'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
+      'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question',
+      'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+      'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+      'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore',
+      'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+      'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+      'braceleft', 'bar', 'braceright', 'asciitilde', '', '', 'exclamdown',
+      'cent', 'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
+      'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
+      'guilsinglright', 'fi', 'fl', '', 'endash', 'dagger', 'daggerdbl',
+      'periodcentered', '', 'paragraph', 'bullet', 'quotesinglbase',
+      'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis',
+      'perthousand', '', 'questiondown', '', 'grave', 'acute', 'circumflex',
+      'tilde', 'macron', 'breve', 'dotaccent', 'dieresis', '', 'ring',
+      'cedilla', '', 'hungarumlaut', 'ogonek', 'caron', 'emdash', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', 'AE', '',
+      'ordfeminine', '', '', '', '', 'Lslash', 'Oslash', 'OE', 'ordmasculine',
+      '', '', '', '', '', 'ae', '', '', '', 'dotlessi', '', '', 'lslash',
+      'oslash', 'oe', 'germandbls'
+    ]);
+  },
+  get WinAnsiEncoding() {
+    return shadow(this, 'WinAnsiEncoding', ['', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', 'space', 'exclam', 'quotedbl', 'numbersign',
+      'dollar', 'percent', 'ampersand', 'quotesingle', 'parenleft',
+      'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash',
+      'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
+      'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question',
+      'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+      'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+      'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore',
+      'grave', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+      'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+      'braceleft', 'bar', 'braceright', 'asciitilde', 'bullet', 'Euro',
+      'bullet', 'quotesinglbase', 'florin', 'quotedblbase', 'ellipsis',
+      'dagger', 'daggerdbl', 'circumflex', 'perthousand', 'Scaron',
+      'guilsinglleft', 'OE', 'bullet', 'Zcaron', 'bullet', 'bullet',
+      'quoteleft', 'quoteright', 'quotedblleft', 'quotedblright', 'bullet',
+      'endash', 'emdash', 'tilde', 'trademark', 'scaron', 'guilsinglright',
+      'oe', 'bullet', 'zcaron', 'Ydieresis', 'space', 'exclamdown', 'cent',
+      'sterling', 'currency', 'yen', 'brokenbar', 'section', 'dieresis',
+      'copyright', 'ordfeminine', 'guillemotleft', 'logicalnot', 'hyphen',
+      'registered', 'macron', 'degree', 'plusminus', 'twosuperior',
+      'threesuperior', 'acute', 'mu', 'paragraph', 'periodcentered',
+      'cedilla', 'onesuperior', 'ordmasculine', 'guillemotright', 'onequarter',
+      'onehalf', 'threequarters', 'questiondown', 'Agrave', 'Aacute',
+      'Acircumflex', 'Atilde', 'Adieresis', 'Aring', 'AE', 'Ccedilla',
+      'Egrave', 'Eacute', 'Ecircumflex', 'Edieresis', 'Igrave', 'Iacute',
+      'Icircumflex', 'Idieresis', 'Eth', 'Ntilde', 'Ograve', 'Oacute',
+      'Ocircumflex', 'Otilde', 'Odieresis', 'multiply', 'Oslash', 'Ugrave',
+      'Uacute', 'Ucircumflex', 'Udieresis', 'Yacute', 'Thorn', 'germandbls',
+      'agrave', 'aacute', 'acircumflex', 'atilde', 'adieresis', 'aring', 'ae',
+      'ccedilla', 'egrave', 'eacute', 'ecircumflex', 'edieresis', 'igrave',
+      'iacute', 'icircumflex', 'idieresis', 'eth', 'ntilde', 'ograve',
+      'oacute', 'ocircumflex', 'otilde', 'odieresis', 'divide', 'oslash',
+      'ugrave', 'uacute', 'ucircumflex', 'udieresis', 'yacute', 'thorn',
+      'ydieresis'
+    ]);
+  },
+  get symbolsEncoding() {
+    return shadow(this, 'symbolsEncoding', ['', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', 'space', 'exclam', 'universal', 'numbersign',
+      'existential', 'percent', 'ampersand', 'suchthat', 'parenleft',
+      'parenright', 'asteriskmath', 'plus', 'comma', 'minus', 'period',
+      'slash', 'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven',
+      'eight', 'nine', 'colon', 'semicolon', 'less', 'equal', 'greater',
+      'question', 'congruent', 'Alpha', 'Beta', 'Chi', 'Delta', 'Epsilon',
+      'Phi', 'Gamma', 'Eta', 'Iota', 'theta1', 'Kappa', 'Lambda', 'Mu', 'Nu',
+      'Omicron', 'Pi', 'Theta', 'Rho', 'Sigma', 'Tau', 'Upsilon', 'sigma1',
+      'Omega', 'Xi', 'Psi', 'Zeta', 'bracketleft', 'therefore', 'bracketright',
+      'perpendicular', 'underscore', 'radicalex', 'alpha', 'beta', 'chi',
+      'delta', 'epsilon', 'phi', 'gamma', 'eta', 'iota', 'phi1', 'kappa',
+      'lambda', 'mu', 'nu', 'omicron', 'pi', 'theta', 'rho', 'sigma', 'tau',
+      'upsilon', 'omega1', 'omega', 'xi', 'psi', 'zeta', 'braceleft', 'bar',
+      'braceright', 'similar', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', 'Euro', 'Upsilon1', 'minute', 'lessequal', 'fraction',
+      'infinity', 'florin', 'club', 'diamond', 'heart', 'spade', 'arrowboth',
+      'arrowleft', 'arrowup', 'arrowright', 'arrowdown', 'degree', 'plusminus',
+      'second', 'greaterequal', 'multiply', 'proportional', 'partialdiff',
+      'bullet', 'divide', 'notequal', 'equivalence', 'approxequal', 'ellipsis',
+      'arrowvertex', 'arrowhorizex', 'carriagereturn', 'aleph', 'Ifraktur',
+      'Rfraktur', 'weierstrass', 'circlemultiply', 'circleplus', 'emptyset',
+      'intersection', 'union', 'propersuperset', 'reflexsuperset', 'notsubset',
+      'propersubset', 'reflexsubset', 'element', 'notelement', 'angle',
+      'gradient', 'registerserif', 'copyrightserif', 'trademarkserif',
+      'product', 'radical', 'dotmath', 'logicalnot', 'logicaland', 'logicalor',
+      'arrowdblboth', 'arrowdblleft', 'arrowdblup', 'arrowdblright',
+      'arrowdbldown', 'lozenge', 'angleleft', 'registersans', 'copyrightsans',
+      'trademarksans', 'summation', 'parenlefttp', 'parenleftex',
+      'parenleftbt', 'bracketlefttp', 'bracketleftex', 'bracketleftbt',
+      'bracelefttp', 'braceleftmid', 'braceleftbt', 'braceex', '',
+      'angleright', 'integral', 'integraltp', 'integralex', 'integralbt',
+      'parenrighttp', 'parenrightex', 'parenrightbt', 'bracketrighttp',
+      'bracketrightex', 'bracketrightbt', 'bracerighttp', 'bracerightmid',
+      'bracerightbt'
+    ]);
+  },
+  get zapfDingbatsEncoding() {
+    return shadow(this, 'zapfDingbatsEncoding', ['', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', 'space', 'a1', 'a2', 'a202', 'a3', 'a4',
+      'a5', 'a119', 'a118', 'a117', 'a11', 'a12', 'a13', 'a14', 'a15', 'a16',
+      'a105', 'a17', 'a18', 'a19', 'a20', 'a21', 'a22', 'a23', 'a24', 'a25',
+      'a26', 'a27', 'a28', 'a6', 'a7', 'a8', 'a9', 'a10', 'a29', 'a30', 'a31',
+      'a32', 'a33', 'a34', 'a35', 'a36', 'a37', 'a38', 'a39', 'a40', 'a41',
+      'a42', 'a43', 'a44', 'a45', 'a46', 'a47', 'a48', 'a49', 'a50', 'a51',
+      'a52', 'a53', 'a54', 'a55', 'a56', 'a57', 'a58', 'a59', 'a60', 'a61',
+      'a62', 'a63', 'a64', 'a65', 'a66', 'a67', 'a68', 'a69', 'a70', 'a71',
+      'a72', 'a73', 'a74', 'a203', 'a75', 'a204', 'a76', 'a77', 'a78', 'a79',
+      'a81', 'a82', 'a83', 'a84', 'a97', 'a98', 'a99', 'a100', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', 'a101', 'a102', 'a103',
+      'a104', 'a106', 'a107', 'a108', 'a112', 'a111', 'a110', 'a109', 'a120',
+      'a121', 'a122', 'a123', 'a124', 'a125', 'a126', 'a127', 'a128', 'a129',
+      'a130', 'a131', 'a132', 'a133', 'a134', 'a135', 'a136', 'a137', 'a138',
+      'a139', 'a140', 'a141', 'a142', 'a143', 'a144', 'a145', 'a146', 'a147',
+      'a148', 'a149', 'a150', 'a151', 'a152', 'a153', 'a154', 'a155', 'a156',
+      'a157', 'a158', 'a159', 'a160', 'a161', 'a163', 'a164', 'a196', 'a165',
+      'a192', 'a166', 'a167', 'a168', 'a169', 'a170', 'a171', 'a172', 'a173',
+      'a162', 'a174', 'a175', 'a176', 'a177', 'a178', 'a179', 'a193', 'a180',
+      'a199', 'a181', 'a200', 'a182', '', 'a201', 'a183', 'a184', 'a197',
+      'a185', 'a194', 'a198', 'a186', 'a195', 'a187', 'a188', 'a189', 'a190',
+      'a191'
+    ]);
+  }
+};
+
+/**
+ * Hold a map of decoded fonts and of the standard fourteen Type1
+ * fonts and their acronyms.
+ */
+var stdFontMap = {
+  'ArialNarrow': 'Helvetica',
+  'ArialNarrow-Bold': 'Helvetica-Bold',
+  'ArialNarrow-BoldItalic': 'Helvetica-BoldOblique',
+  'ArialNarrow-Italic': 'Helvetica-Oblique',
+  'ArialBlack': 'Helvetica',
+  'ArialBlack-Bold': 'Helvetica-Bold',
+  'ArialBlack-BoldItalic': 'Helvetica-BoldOblique',
+  'ArialBlack-Italic': 'Helvetica-Oblique',
+  'Arial': 'Helvetica',
+  'Arial-Bold': 'Helvetica-Bold',
+  'Arial-BoldItalic': 'Helvetica-BoldOblique',
+  'Arial-Italic': 'Helvetica-Oblique',
+  'Arial-BoldItalicMT': 'Helvetica-BoldOblique',
+  'Arial-BoldMT': 'Helvetica-Bold',
+  'Arial-ItalicMT': 'Helvetica-Oblique',
+  'ArialMT': 'Helvetica',
+  'Courier-Bold': 'Courier-Bold',
+  'Courier-BoldItalic': 'Courier-BoldOblique',
+  'Courier-Italic': 'Courier-Oblique',
+  'CourierNew': 'Courier',
+  'CourierNew-Bold': 'Courier-Bold',
+  'CourierNew-BoldItalic': 'Courier-BoldOblique',
+  'CourierNew-Italic': 'Courier-Oblique',
+  'CourierNewPS-BoldItalicMT': 'Courier-BoldOblique',
+  'CourierNewPS-BoldMT': 'Courier-Bold',
+  'CourierNewPS-ItalicMT': 'Courier-Oblique',
+  'CourierNewPSMT': 'Courier',
+  'Helvetica-Bold': 'Helvetica-Bold',
+  'Helvetica-BoldItalic': 'Helvetica-BoldOblique',
+  'Helvetica-Italic': 'Helvetica-Oblique',
+  'Symbol-Bold': 'Symbol',
+  'Symbol-BoldItalic': 'Symbol',
+  'Symbol-Italic': 'Symbol',
+  'TimesNewRoman': 'Times-Roman',
+  'TimesNewRoman-Bold': 'Times-Bold',
+  'TimesNewRoman-BoldItalic': 'Times-BoldItalic',
+  'TimesNewRoman-Italic': 'Times-Italic',
+  'TimesNewRomanPS': 'Times-Roman',
+  'TimesNewRomanPS-Bold': 'Times-Bold',
+  'TimesNewRomanPS-BoldItalic': 'Times-BoldItalic',
+  'TimesNewRomanPS-BoldItalicMT': 'Times-BoldItalic',
+  'TimesNewRomanPS-BoldMT': 'Times-Bold',
+  'TimesNewRomanPS-Italic': 'Times-Italic',
+  'TimesNewRomanPS-ItalicMT': 'Times-Italic',
+  'TimesNewRomanPSMT': 'Times-Roman',
+  'TimesNewRomanPSMT-Bold': 'Times-Bold',
+  'TimesNewRomanPSMT-BoldItalic': 'Times-BoldItalic',
+  'TimesNewRomanPSMT-Italic': 'Times-Italic'
+};
+
+var serifFonts = {
+  'Adobe Jenson': true, 'Adobe Text': true, 'Albertus': true,
+  'Aldus': true, 'Alexandria': true, 'Algerian': true,
+  'American Typewriter': true, 'Antiqua': true, 'Apex': true,
+  'Arno': true, 'Aster': true, 'Aurora': true,
+  'Baskerville': true, 'Bell': true, 'Bembo': true,
+  'Bembo Schoolbook': true, 'Benguiat': true, 'Berkeley Old Style': true,
+  'Bernhard Modern': true, 'Berthold City': true, 'Bodoni': true,
+  'Bauer Bodoni': true, 'Book Antiqua': true, 'Bookman': true,
+  'Bordeaux Roman': true, 'Californian FB': true, 'Calisto': true,
+  'Calvert': true, 'Capitals': true, 'Cambria': true,
+  'Cartier': true, 'Caslon': true, 'Catull': true,
+  'Centaur': true, 'Century Old Style': true, 'Century Schoolbook': true,
+  'Chaparral': true, 'Charis SIL': true, 'Cheltenham': true,
+  'Cholla Slab': true, 'Clarendon': true, 'Clearface': true,
+  'Cochin': true, 'Colonna': true, 'Computer Modern': true,
+  'Concrete Roman': true, 'Constantia': true, 'Cooper Black': true,
+  'Corona': true, 'Ecotype': true, 'Egyptienne': true,
+  'Elephant': true, 'Excelsior': true, 'Fairfield': true,
+  'FF Scala': true, 'Folkard': true, 'Footlight': true,
+  'FreeSerif': true, 'Friz Quadrata': true, 'Garamond': true,
+  'Gentium': true, 'Georgia': true, 'Gloucester': true,
+  'Goudy Old Style': true, 'Goudy Schoolbook': true, 'Goudy Pro Font': true,
+  'Granjon': true, 'Guardian Egyptian': true, 'Heather': true,
+  'Hercules': true, 'High Tower Text': true, 'Hiroshige': true,
+  'Hoefler Text': true, 'Humana Serif': true, 'Imprint': true,
+  'Ionic No. 5': true, 'Janson': true, 'Joanna': true,
+  'Korinna': true, 'Lexicon': true, 'Liberation Serif': true,
+  'Linux Libertine': true, 'Literaturnaya': true, 'Lucida': true,
+  'Lucida Bright': true, 'Melior': true, 'Memphis': true,
+  'Miller': true, 'Minion': true, 'Modern': true,
+  'Mona Lisa': true, 'Mrs Eaves': true, 'MS Serif': true,
+  'Museo Slab': true, 'New York': true, 'Nimbus Roman': true,
+  'NPS Rawlinson Roadway': true, 'Palatino': true, 'Perpetua': true,
+  'Plantin': true, 'Plantin Schoolbook': true, 'Playbill': true,
+  'Poor Richard': true, 'Rawlinson Roadway': true, 'Renault': true,
+  'Requiem': true, 'Rockwell': true, 'Roman': true,
+  'Rotis Serif': true, 'Sabon': true, 'Scala': true,
+  'Seagull': true, 'Sistina': true, 'Souvenir': true,
+  'STIX': true, 'Stone Informal': true, 'Stone Serif': true,
+  'Sylfaen': true, 'Times': true, 'Trajan': true,
+  'Trinité': true, 'Trump Mediaeval': true, 'Utopia': true,
+  'Vale Type': true, 'Bitstream Vera': true, 'Vera Serif': true,
+  'Versailles': true, 'Wanted': true, 'Weiss': true,
+  'Wide Latin': true, 'Windsor': true, 'XITS': true
+};
+
+var FontLoader = {
+  listeningForFontLoad: false,
+
+  bind: function fontLoaderBind(fonts, callback) {
+    function checkFontsLoaded() {
+      for (var i = 0, ii = objs.length; i < ii; i++) {
+        var fontObj = objs[i];
+        if (fontObj.loading) {
+          return false;
+        }
+      }
+
+      document.documentElement.removeEventListener(
+        'pdfjsFontLoad', checkFontsLoaded, false);
+
+      callback();
+      return true;
+    }
+
+    var rules = [], names = [], objs = [];
+
+    for (var i = 0, ii = fonts.length; i < ii; i++) {
+      var font = fonts[i];
+
+      // If there is already a fontObj on the font, then it was loaded/attached
+      // to the page already and we don't have to do anything for this font
+      // here future.
+      if (font.fontObj) {
+        continue;
+      }
+
+      var obj = new Font(font.name, font.file, font.properties);
+
+      // Store the fontObj on the font such that `setFont` in CanvasGraphics
+      // can reuse it later again.
+      font.fontObj = obj;
+
+      objs.push(obj);
+
+      var str = '';
+      var data = obj.data;
+      if (data) {
+        var length = data.length;
+        for (var j = 0; j < length; j++)
+          str += String.fromCharCode(data[j]);
+
+        var rule = isWorker ? obj.bindWorker(str) : obj.bindDOM(str);
+        if (rule) {
+          rules.push(rule);
+          names.push(obj.loadedName);
+        }
+      }
+    }
+
+    this.listeningForFontLoad = false;
+    if (!isWorker && rules.length) {
+      FontLoader.prepareFontLoadEvent(rules, names, objs);
+    }
+
+    if (!checkFontsLoaded()) {
+      document.documentElement.addEventListener(
+        'pdfjsFontLoad', checkFontsLoaded, false);
+    }
+
+    return objs;
+  },
+  // Set things up so that at least one pdfjsFontLoad event is
+  // dispatched when all the @font-face |rules| for |names| have been
+  // loaded in a subdocument.  It's expected that the load of |rules|
+  // has already started in this (outer) document, so that they should
+  // be ordered before the load in the subdocument.
+  prepareFontLoadEvent: function fontLoaderPrepareFontLoadEvent(rules, names,
+                                                                objs) {
+      /** Hack begin */
+      // There's no event when a font has finished downloading so the
+      // following code is a dirty hack to 'guess' when a font is
+      // ready.  This code will be obsoleted by Mozilla bug 471915.
+      //
+      // The only reliable way to know if a font is loaded in Gecko
+      // (at the moment) is document.onload in a document with
+      // a @font-face rule defined in a "static" stylesheet.  We use a
+      // subdocument in an <iframe>, set up properly, to know when
+      // our @font-face rule was loaded.  However, the subdocument and
+      // outer document can't share CSS rules, so the inner document
+      // is only part of the puzzle.  The second piece is an invisible
+      // div created in order to force loading of the @font-face in
+      // the *outer* document.  (The font still needs to be loaded for
+      // its metrics, for reflow).  We create the div first for the
+      // outer document, then create the iframe.  Unless something
+      // goes really wonkily, we expect the @font-face for the outer
+      // document to be processed before the inner.  That's still
+      // fragile, but seems to work in practice.
+      //
+      // The postMessage() hackery was added to work around chrome bug
+      // 82402.
+
+      var div = document.createElement('div');
+      div.setAttribute('style',
+                       'visibility: hidden;' +
+                       'width: 10px; height: 10px;' +
+                       'position: absolute; top: 0px; left: 0px;');
+      var html = '';
+      for (var i = 0, ii = names.length; i < ii; ++i) {
+        html += '<span style="font-family:' + names[i] + '">Hi</span>';
+      }
+      div.innerHTML = html;
+      document.body.appendChild(div);
+
+      if (!this.listeningForFontLoad) {
+        window.addEventListener(
+          'message',
+          function fontLoaderMessage(e) {
+            var fontNames = JSON.parse(e.data);
+            for (var i = 0, ii = objs.length; i < ii; ++i) {
+              var font = objs[i];
+              font.loading = false;
+            }
+            var evt = document.createEvent('Events');
+            evt.initEvent('pdfjsFontLoad', true, false);
+            document.documentElement.dispatchEvent(evt);
+          },
+          false);
+        this.listeningForFontLoad = true;
+      }
+
+      // XXX we should have a time-out here too, and maybe fire
+      // pdfjsFontLoadFailed?
+      var src = '<!DOCTYPE HTML><html><head>';
+      src += '<style type="text/css">';
+      for (var i = 0, ii = rules.length; i < ii; ++i) {
+        src += rules[i];
+      }
+      src += '</style>';
+      src += '<script type="application/javascript">';
+      var fontNamesArray = '';
+      for (var i = 0, ii = names.length; i < ii; ++i) {
+        fontNamesArray += '"' + names[i] + '", ';
+      }
+      src += '  var fontNames=[' + fontNamesArray + '];\n';
+      src += '  window.onload = function fontLoaderOnload() {\n';
+      src += '    parent.postMessage(JSON.stringify(fontNames), "*");\n';
+      src += '  }';
+      src += '</script></head><body>';
+      for (var i = 0, ii = names.length; i < ii; ++i) {
+        src += '<p style="font-family:\'' + names[i] + '\'">Hi</p>';
+      }
+      src += '</body></html>';
+      var frame = document.createElement('iframe');
+      frame.src = 'data:text/html,' + src;
+      frame.setAttribute('style',
+                         'visibility: hidden;' +
+                         'width: 10px; height: 10px;' +
+                         'position: absolute; top: 0px; left: 0px;');
+      document.body.appendChild(frame);
+      /** Hack end */
+  }
+};
+
+var UnicodeRanges = [
+  { 'begin': 0x0000, 'end': 0x007F }, // Basic Latin
+  { 'begin': 0x0080, 'end': 0x00FF }, // Latin-1 Supplement
+  { 'begin': 0x0100, 'end': 0x017F }, // Latin Extended-A
+  { 'begin': 0x0180, 'end': 0x024F }, // Latin Extended-B
+  { 'begin': 0x0250, 'end': 0x02AF }, // IPA Extensions
+  { 'begin': 0x02B0, 'end': 0x02FF }, // Spacing Modifier Letters
+  { 'begin': 0x0300, 'end': 0x036F }, // Combining Diacritical Marks
+  { 'begin': 0x0370, 'end': 0x03FF }, // Greek and Coptic
+  { 'begin': 0x2C80, 'end': 0x2CFF }, // Coptic
+  { 'begin': 0x0400, 'end': 0x04FF }, // Cyrillic
+  { 'begin': 0x0530, 'end': 0x058F }, // Armenian
+  { 'begin': 0x0590, 'end': 0x05FF }, // Hebrew
+  { 'begin': 0xA500, 'end': 0xA63F }, // Vai
+  { 'begin': 0x0600, 'end': 0x06FF }, // Arabic
+  { 'begin': 0x07C0, 'end': 0x07FF }, // NKo
+  { 'begin': 0x0900, 'end': 0x097F }, // Devanagari
+  { 'begin': 0x0980, 'end': 0x09FF }, // Bengali
+  { 'begin': 0x0A00, 'end': 0x0A7F }, // Gurmukhi
+  { 'begin': 0x0A80, 'end': 0x0AFF }, // Gujarati
+  { 'begin': 0x0B00, 'end': 0x0B7F }, // Oriya
+  { 'begin': 0x0B80, 'end': 0x0BFF }, // Tamil
+  { 'begin': 0x0C00, 'end': 0x0C7F }, // Telugu
+  { 'begin': 0x0C80, 'end': 0x0CFF }, // Kannada
+  { 'begin': 0x0D00, 'end': 0x0D7F }, // Malayalam
+  { 'begin': 0x0E00, 'end': 0x0E7F }, // Thai
+  { 'begin': 0x0E80, 'end': 0x0EFF }, // Lao
+  { 'begin': 0x10A0, 'end': 0x10FF }, // Georgian
+  { 'begin': 0x1B00, 'end': 0x1B7F }, // Balinese
+  { 'begin': 0x1100, 'end': 0x11FF }, // Hangul Jamo
+  { 'begin': 0x1E00, 'end': 0x1EFF }, // Latin Extended Additional
+  { 'begin': 0x1F00, 'end': 0x1FFF }, // Greek Extended
+  { 'begin': 0x2000, 'end': 0x206F }, // General Punctuation
+  { 'begin': 0x2070, 'end': 0x209F }, // Superscripts And Subscripts
+  { 'begin': 0x20A0, 'end': 0x20CF }, // Currency Symbol
+  { 'begin': 0x20D0, 'end': 0x20FF }, // Combining Diacritical Marks For Symbols
+  { 'begin': 0x2100, 'end': 0x214F }, // Letterlike Symbols
+  { 'begin': 0x2150, 'end': 0x218F }, // Number Forms
+  { 'begin': 0x2190, 'end': 0x21FF }, // Arrows
+  { 'begin': 0x2200, 'end': 0x22FF }, // Mathematical Operators
+  { 'begin': 0x2300, 'end': 0x23FF }, // Miscellaneous Technical
+  { 'begin': 0x2400, 'end': 0x243F }, // Control Pictures
+  { 'begin': 0x2440, 'end': 0x245F }, // Optical Character Recognition
+  { 'begin': 0x2460, 'end': 0x24FF }, // Enclosed Alphanumerics
+  { 'begin': 0x2500, 'end': 0x257F }, // Box Drawing
+  { 'begin': 0x2580, 'end': 0x259F }, // Block Elements
+  { 'begin': 0x25A0, 'end': 0x25FF }, // Geometric Shapes
+  { 'begin': 0x2600, 'end': 0x26FF }, // Miscellaneous Symbols
+  { 'begin': 0x2700, 'end': 0x27BF }, // Dingbats
+  { 'begin': 0x3000, 'end': 0x303F }, // CJK Symbols And Punctuation
+  { 'begin': 0x3040, 'end': 0x309F }, // Hiragana
+  { 'begin': 0x30A0, 'end': 0x30FF }, // Katakana
+  { 'begin': 0x3100, 'end': 0x312F }, // Bopomofo
+  { 'begin': 0x3130, 'end': 0x318F }, // Hangul Compatibility Jamo
+  { 'begin': 0xA840, 'end': 0xA87F }, // Phags-pa
+  { 'begin': 0x3200, 'end': 0x32FF }, // Enclosed CJK Letters And Months
+  { 'begin': 0x3300, 'end': 0x33FF }, // CJK Compatibility
+  { 'begin': 0xAC00, 'end': 0xD7AF }, // Hangul Syllables
+  { 'begin': 0xD800, 'end': 0xDFFF }, // Non-Plane 0 *
+  { 'begin': 0x10900, 'end': 0x1091F }, // Phoenicia
+  { 'begin': 0x4E00, 'end': 0x9FFF }, // CJK Unified Ideographs
+  { 'begin': 0xE000, 'end': 0xF8FF }, // Private Use Area (plane 0)
+  { 'begin': 0x31C0, 'end': 0x31EF }, // CJK Strokes
+  { 'begin': 0xFB00, 'end': 0xFB4F }, // Alphabetic Presentation Forms
+  { 'begin': 0xFB50, 'end': 0xFDFF }, // Arabic Presentation Forms-A
+  { 'begin': 0xFE20, 'end': 0xFE2F }, // Combining Half Marks
+  { 'begin': 0xFE10, 'end': 0xFE1F }, // Vertical Forms
+  { 'begin': 0xFE50, 'end': 0xFE6F }, // Small Form Variants
+  { 'begin': 0xFE70, 'end': 0xFEFF }, // Arabic Presentation Forms-B
+  { 'begin': 0xFF00, 'end': 0xFFEF }, // Halfwidth And Fullwidth Forms
+  { 'begin': 0xFFF0, 'end': 0xFFFF }, // Specials
+  { 'begin': 0x0F00, 'end': 0x0FFF }, // Tibetan
+  { 'begin': 0x0700, 'end': 0x074F }, // Syriac
+  { 'begin': 0x0780, 'end': 0x07BF }, // Thaana
+  { 'begin': 0x0D80, 'end': 0x0DFF }, // Sinhala
+  { 'begin': 0x1000, 'end': 0x109F }, // Myanmar
+  { 'begin': 0x1200, 'end': 0x137F }, // Ethiopic
+  { 'begin': 0x13A0, 'end': 0x13FF }, // Cherokee
+  { 'begin': 0x1400, 'end': 0x167F }, // Unified Canadian Aboriginal Syllabics
+  { 'begin': 0x1680, 'end': 0x169F }, // Ogham
+  { 'begin': 0x16A0, 'end': 0x16FF }, // Runic
+  { 'begin': 0x1780, 'end': 0x17FF }, // Khmer
+  { 'begin': 0x1800, 'end': 0x18AF }, // Mongolian
+  { 'begin': 0x2800, 'end': 0x28FF }, // Braille Patterns
+  { 'begin': 0xA000, 'end': 0xA48F }, // Yi Syllables
+  { 'begin': 0x1700, 'end': 0x171F }, // Tagalog
+  { 'begin': 0x10300, 'end': 0x1032F }, // Old Italic
+  { 'begin': 0x10330, 'end': 0x1034F }, // Gothic
+  { 'begin': 0x10400, 'end': 0x1044F }, // Deseret
+  { 'begin': 0x1D000, 'end': 0x1D0FF }, // Byzantine Musical Symbols
+  { 'begin': 0x1D400, 'end': 0x1D7FF }, // Mathematical Alphanumeric Symbols
+  { 'begin': 0xFF000, 'end': 0xFFFFD }, // Private Use (plane 15)
+  { 'begin': 0xFE00, 'end': 0xFE0F }, // Variation Selectors
+  { 'begin': 0xE0000, 'end': 0xE007F }, // Tags
+  { 'begin': 0x1900, 'end': 0x194F }, // Limbu
+  { 'begin': 0x1950, 'end': 0x197F }, // Tai Le
+  { 'begin': 0x1980, 'end': 0x19DF }, // New Tai Lue
+  { 'begin': 0x1A00, 'end': 0x1A1F }, // Buginese
+  { 'begin': 0x2C00, 'end': 0x2C5F }, // Glagolitic
+  { 'begin': 0x2D30, 'end': 0x2D7F }, // Tifinagh
+  { 'begin': 0x4DC0, 'end': 0x4DFF }, // Yijing Hexagram Symbols
+  { 'begin': 0xA800, 'end': 0xA82F }, // Syloti Nagri
+  { 'begin': 0x10000, 'end': 0x1007F }, // Linear B Syllabary
+  { 'begin': 0x10140, 'end': 0x1018F }, // Ancient Greek Numbers
+  { 'begin': 0x10380, 'end': 0x1039F }, // Ugaritic
+  { 'begin': 0x103A0, 'end': 0x103DF }, // Old Persian
+  { 'begin': 0x10450, 'end': 0x1047F }, // Shavian
+  { 'begin': 0x10480, 'end': 0x104AF }, // Osmanya
+  { 'begin': 0x10800, 'end': 0x1083F }, // Cypriot Syllabary
+  { 'begin': 0x10A00, 'end': 0x10A5F }, // Kharoshthi
+  { 'begin': 0x1D300, 'end': 0x1D35F }, // Tai Xuan Jing Symbols
+  { 'begin': 0x12000, 'end': 0x123FF }, // Cuneiform
+  { 'begin': 0x1D360, 'end': 0x1D37F }, // Counting Rod Numerals
+  { 'begin': 0x1B80, 'end': 0x1BBF }, // Sundanese
+  { 'begin': 0x1C00, 'end': 0x1C4F }, // Lepcha
+  { 'begin': 0x1C50, 'end': 0x1C7F }, // Ol Chiki
+  { 'begin': 0xA880, 'end': 0xA8DF }, // Saurashtra
+  { 'begin': 0xA900, 'end': 0xA92F }, // Kayah Li
+  { 'begin': 0xA930, 'end': 0xA95F }, // Rejang
+  { 'begin': 0xAA00, 'end': 0xAA5F }, // Cham
+  { 'begin': 0x10190, 'end': 0x101CF }, // Ancient Symbols
+  { 'begin': 0x101D0, 'end': 0x101FF }, // Phaistos Disc
+  { 'begin': 0x102A0, 'end': 0x102DF }, // Carian
+  { 'begin': 0x1F030, 'end': 0x1F09F }  // Domino Tiles
+];
+
+var MacStandardGlyphOrdering = [
+  '.notdef', '.null', 'nonmarkingreturn', 'space', 'exclam', 'quotedbl',
+  'numbersign', 'dollar', 'percent', 'ampersand', 'quotesingle', 'parenleft',
+  'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash',
+  'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
+  'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question', 'at',
+  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+  'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'bracketleft',
+  'backslash', 'bracketright', 'asciicircum', 'underscore', 'grave', 'a', 'b',
+  'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q',
+  'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright',
+  'asciitilde', 'Adieresis', 'Aring', 'Ccedilla', 'Eacute', 'Ntilde',
+  'Odieresis', 'Udieresis', 'aacute', 'agrave', 'acircumflex', 'adieresis',
+  'atilde', 'aring', 'ccedilla', 'eacute', 'egrave', 'ecircumflex', 'edieresis',
+  'iacute', 'igrave', 'icircumflex', 'idieresis', 'ntilde', 'oacute', 'ograve',
+  'ocircumflex', 'odieresis', 'otilde', 'uacute', 'ugrave', 'ucircumflex',
+  'udieresis', 'dagger', 'degree', 'cent', 'sterling', 'section', 'bullet',
+  'paragraph', 'germandbls', 'registered', 'copyright', 'trademark', 'acute',
+  'dieresis', 'notequal', 'AE', 'Oslash', 'infinity', 'plusminus', 'lessequal',
+  'greaterequal', 'yen', 'mu', 'partialdiff', 'summation', 'product', 'pi',
+  'integral', 'ordfeminine', 'ordmasculine', 'Omega', 'ae', 'oslash',
+  'questiondown', 'exclamdown', 'logicalnot', 'radical', 'florin',
+  'approxequal', 'Delta', 'guillemotleft', 'guillemotright', 'ellipsis',
+  'nonbreakingspace', 'Agrave', 'Atilde', 'Otilde', 'OE', 'oe', 'endash',
+  'emdash', 'quotedblleft', 'quotedblright', 'quoteleft', 'quoteright',
+  'divide', 'lozenge', 'ydieresis', 'Ydieresis', 'fraction', 'currency',
+  'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'daggerdbl', 'periodcentered',
+  'quotesinglbase', 'quotedblbase', 'perthousand', 'Acircumflex',
+  'Ecircumflex', 'Aacute', 'Edieresis', 'Egrave', 'Iacute', 'Icircumflex',
+  'Idieresis', 'Igrave', 'Oacute', 'Ocircumflex', 'apple', 'Ograve', 'Uacute',
+  'Ucircumflex', 'Ugrave', 'dotlessi', 'circumflex', 'tilde', 'macron',
+  'breve', 'dotaccent', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron',
+  'Lslash', 'lslash', 'Scaron', 'scaron', 'Zcaron', 'zcaron', 'brokenbar',
+  'Eth', 'eth', 'Yacute', 'yacute', 'Thorn', 'thorn', 'minus', 'multiply',
+  'onesuperior', 'twosuperior', 'threesuperior', 'onehalf', 'onequarter',
+  'threequarters', 'franc', 'Gbreve', 'gbreve', 'Idotaccent', 'Scedilla',
+  'scedilla', 'Cacute', 'cacute', 'Ccaron', 'ccaron', 'dcroat'];
+
+function getUnicodeRangeFor(value) {
+  for (var i = 0, ii = UnicodeRanges.length; i < ii; i++) {
+    var range = UnicodeRanges[i];
+    if (value >= range.begin && value < range.end)
+      return i;
+  }
+  return -1;
+}
+
+function adaptUnicode(unicode) {
+  return (unicode <= 0x1F || (unicode >= 127 && unicode < kSizeOfGlyphArea)) ?
+    unicode + kCmapGlyphOffset : unicode;
+}
+
+function isAdaptedUnicode(unicode) {
+  return unicode >= kCmapGlyphOffset &&
+    unicode < kCmapGlyphOffset + kSizeOfGlyphArea;
+}
+
+function isSpecialUnicode(unicode) {
+  return (unicode <= 0x1F || (unicode >= 127 && unicode < kSizeOfGlyphArea)) ||
+    unicode >= kCmapGlyphOffset &&
+    unicode < kCmapGlyphOffset + kSizeOfGlyphArea;
+}
+
+/**
+ * 'Font' is the class the outside world should use, it encapsulate all the font
+ * decoding logics whatever type it is (assuming the font type is supported).
+ *
+ * For example to read a Type1 font and to attach it to the document:
+ *   var type1Font = new Font("MyFontName", binaryFile, propertiesObject);
+ *   type1Font.bind();
+ */
+var Font = (function Font() {
+  var constructor = function font_constructor(name, file, properties) {
+    this.name = name;
+    this.coded = properties.coded;
+    this.charProcIRQueues = properties.charProcIRQueues;
+    this.resources = properties.resources;
+    this.sizes = [];
+
+    var names = name.split('+');
+    names = names.length > 1 ? names[1] : names[0];
+    names = names.split(/[-,_]/g)[0];
+    this.serif = serifFonts[names] || (name.search(/serif/gi) != -1);
+
+    var type = properties.type;
+    this.type = type;
+
+    // If the font is to be ignored, register it like an already loaded font
+    // to avoid the cost of waiting for it be be loaded by the platform.
+    if (properties.ignore) {
+      this.loadedName = this.serif ? 'serif' : 'sans-serif';
+      this.loading = false;
+      return;
+    }
+
+    this.differences = properties.differences;
+    this.widths = properties.widths;
+    this.defaultWidth = properties.defaultWidth;
+    this.composite = properties.composite;
+    this.toUnicode = properties.toUnicode;
+    this.hasEncoding = properties.hasEncoding;
+
+    this.fontMatrix = properties.fontMatrix;
+    if (properties.type == 'Type3')
+      return;
+
+    // Trying to fix encoding using glyph CIDSystemInfo.
+    this.loadCidToUnicode(properties);
+
+    if (!file) {
+      // The file data is not specified. Trying to fix the font name
+      // to be used with the canvas.font.
+      var fontName = name.replace(/[,_]/g, '-');
+      fontName = stdFontMap[fontName] || fontName;
+
+      this.bold = (fontName.search(/bold/gi) != -1);
+      this.italic = (fontName.search(/oblique/gi) != -1) ||
+                    (fontName.search(/italic/gi) != -1);
+
+      // Use 'name' instead of 'fontName' here because the original
+      // name ArialBlack for example will be replaced by Helvetica.
+      this.black = (name.search(/Black/g) != -1);
+
+      this.encoding = properties.baseEncoding;
+      this.noUnicodeAdaptation = true;
+      this.loadedName = fontName.split('-')[0];
+      this.loading = false;
+      return;
+    }
+
+    var data;
+    switch (type) {
+      case 'Type1':
+      case 'CIDFontType0':
+        this.mimetype = 'font/opentype';
+
+        var subtype = properties.subtype;
+        var cff = (subtype == 'Type1C' || subtype == 'CIDFontType0C') ?
+          new Type2CFF(file, properties) : new CFF(name, file, properties);
+
+        // Wrap the CFF data inside an OTF font file
+        data = this.convert(name, cff, properties);
+        break;
+
+      case 'TrueType':
+      case 'CIDFontType2':
+        this.mimetype = 'font/opentype';
+
+        // Repair the TrueType file. It is can be damaged in the point of
+        // view of the sanitizer
+        data = this.checkAndRepair(name, file, properties);
+        break;
+
+      default:
+        warn('Font ' + properties.type + ' is not supported');
+        break;
+    }
+
+    this.data = data;
+    this.fontMatrix = properties.fontMatrix;
+    this.encoding = properties.baseEncoding;
+    this.hasShortCmap = properties.hasShortCmap;
+    this.loadedName = getUniqueName();
+    this.loading = true;
+  };
+
+  var numFonts = 0;
+  function getUniqueName() {
+    return 'pdfFont' + numFonts++;
+  }
+
+  function stringToArray(str) {
+    var array = [];
+    for (var i = 0, ii = str.length; i < ii; ++i)
+      array[i] = str.charCodeAt(i);
+
+    return array;
+  };
+
+  function arrayToString(arr) {
+    var str = '';
+    for (var i = 0, ii = arr.length; i < ii; ++i)
+      str += String.fromCharCode(arr[i]);
+
+    return str;
+  };
+
+  function int16(bytes) {
+    return (bytes[0] << 8) + (bytes[1] & 0xff);
+  };
+
+  function int32(bytes) {
+    return (bytes[0] << 24) + (bytes[1] << 16) +
+           (bytes[2] << 8) + (bytes[3] & 0xff);
+  };
+
+  function getMaxPower2(number) {
+    var maxPower = 0;
+    var value = number;
+    while (value >= 2) {
+      value /= 2;
+      maxPower++;
+    }
+
+    value = 2;
+    for (var i = 1; i < maxPower; i++)
+      value *= 2;
+    return value;
+  };
+
+  function string16(value) {
+    return String.fromCharCode((value >> 8) & 0xff) +
+           String.fromCharCode(value & 0xff);
+  };
+
+  function string32(value) {
+    return String.fromCharCode((value >> 24) & 0xff) +
+           String.fromCharCode((value >> 16) & 0xff) +
+           String.fromCharCode((value >> 8) & 0xff) +
+           String.fromCharCode(value & 0xff);
+  };
+
+  function createOpenTypeHeader(sfnt, file, numTables) {
+    // Windows hates the Mac TrueType sfnt version number
+    if (sfnt == 'true')
+      sfnt = string32(0x00010000);
+
+    // sfnt version (4 bytes)
+    var header = sfnt;
+
+    // numTables (2 bytes)
+    header += string16(numTables);
+
+    // searchRange (2 bytes)
+    var tablesMaxPower2 = getMaxPower2(numTables);
+    var searchRange = tablesMaxPower2 * 16;
+    header += string16(searchRange);
+
+    // entrySelector (2 bytes)
+    header += string16(Math.log(tablesMaxPower2) / Math.log(2));
+
+    // rangeShift (2 bytes)
+    header += string16(numTables * 16 - searchRange);
+
+    file.file += header;
+    file.virtualOffset += header.length;
+  };
+
+  function createTableEntry(file, tag, data) {
+    // offset
+    var offset = file.virtualOffset;
+
+    // length
+    var length = data.length;
+
+    // Per spec tables must be 4-bytes align so add padding as needed
+    while (data.length & 3)
+      data.push(0x00);
+
+    while (file.virtualOffset & 3)
+      file.virtualOffset++;
+
+    // checksum
+    var checksum = 0, n = data.length;
+    for (var i = 0; i < n; i += 4)
+      checksum = (checksum + int32([data[i], data[i + 1], data[i + 2],
+                                    data[i + 3]])) | 0;
+
+    var tableEntry = (tag + string32(checksum) +
+                      string32(offset) + string32(length));
+    file.file += tableEntry;
+    file.virtualOffset += data.length;
+  };
+
+  function getRanges(glyphs) {
+    // Array.sort() sorts by characters, not numerically, so convert to an
+    // array of characters.
+    var codes = [];
+    var length = glyphs.length;
+    for (var n = 0; n < length; ++n)
+      codes.push({ unicode: glyphs[n].unicode, code: n });
+    codes.sort(function fontGetRangesSort(a, b) {
+      return a.unicode - b.unicode;
+    });
+
+    // Split the sorted codes into ranges.
+    var ranges = [];
+    for (var n = 0; n < length; ) {
+      var start = codes[n].unicode;
+      var startCode = codes[n].code;
+      ++n;
+      var end = start;
+      while (n < length && end + 1 == codes[n].unicode) {
+        ++end;
+        ++n;
+      }
+      var endCode = codes[n - 1].code;
+      ranges.push([start, end, startCode, endCode]);
+    }
+
+    return ranges;
+  };
+
+  function createCMapTable(glyphs, deltas) {
+    var ranges = getRanges(glyphs);
+
+    var numTables = 1;
+    var cmap = '\x00\x00' + // version
+               string16(numTables) +  // numTables
+               '\x00\x03' + // platformID
+               '\x00\x01' + // encodingID
+               string32(4 + numTables * 8); // start of the table record
+
+    var segCount = ranges.length + 1;
+    var segCount2 = segCount * 2;
+    var searchRange = getMaxPower2(segCount) * 2;
+    var searchEntry = Math.log(segCount) / Math.log(2);
+    var rangeShift = 2 * segCount - searchRange;
+
+    // Fill up the 4 parallel arrays describing the segments.
+    var startCount = '';
+    var endCount = '';
+    var idDeltas = '';
+    var idRangeOffsets = '';
+    var glyphsIds = '';
+    var bias = 0;
+
+    if (deltas) {
+      for (var i = 0; i < segCount - 1; i++) {
+        var range = ranges[i];
+        var start = range[0];
+        var end = range[1];
+        var offset = (segCount - i) * 2 + bias * 2;
+        bias += (end - start + 1);
+
+        startCount += string16(start);
+        endCount += string16(end);
+        idDeltas += string16(0);
+        idRangeOffsets += string16(offset);
+
+        var startCode = range[2];
+        var endCode = range[3];
+        for (var j = startCode; j <= endCode; ++j)
+          glyphsIds += string16(deltas[j]);
+      }
+    } else {
+      for (var i = 0; i < segCount - 1; i++) {
+        var range = ranges[i];
+        var start = range[0];
+        var end = range[1];
+        var startCode = range[2];
+
+        startCount += string16(start);
+        endCount += string16(end);
+        idDeltas += string16((startCode - start + 1) & 0xFFFF);
+        idRangeOffsets += string16(0);
+      }
+    }
+
+    endCount += '\xFF\xFF';
+    startCount += '\xFF\xFF';
+    idDeltas += '\x00\x01';
+    idRangeOffsets += '\x00\x00';
+
+    var format314 = '\x00\x00' + // language
+                    string16(segCount2) +
+                    string16(searchRange) +
+                    string16(searchEntry) +
+                    string16(rangeShift) +
+                    endCount + '\x00\x00' + startCount +
+                    idDeltas + idRangeOffsets + glyphsIds;
+
+    return stringToArray(cmap +
+                         '\x00\x04' + // format
+                         string16(format314.length + 4) + // length
+                         format314);
+  };
+
+  function createOS2Table(properties, charstrings, override) {
+    override = override || {
+      unitsPerEm: 0,
+      yMax: 0,
+      yMin: 0,
+      ascent: 0,
+      descent: 0
+    };
+
+    var ulUnicodeRange1 = 0;
+    var ulUnicodeRange2 = 0;
+    var ulUnicodeRange3 = 0;
+    var ulUnicodeRange4 = 0;
+
+    var firstCharIndex = null;
+    var lastCharIndex = 0;
+
+    if (charstrings) {
+      for (var i = 0; i < charstrings.length; ++i) {
+        var code = charstrings[i].unicode;
+        if (firstCharIndex > code || !firstCharIndex)
+          firstCharIndex = code;
+        if (lastCharIndex < code)
+          lastCharIndex = code;
+
+        var position = getUnicodeRangeFor(code);
+        if (position < 32) {
+          ulUnicodeRange1 |= 1 << position;
+        } else if (position < 64) {
+          ulUnicodeRange2 |= 1 << position - 32;
+        } else if (position < 96) {
+          ulUnicodeRange3 |= 1 << position - 64;
+        } else if (position < 123) {
+          ulUnicodeRange4 |= 1 << position - 96;
+        } else {
+          error('Unicode ranges Bits > 123 are reserved for internal usage');
+        }
+      }
+    } else {
+      // TODO
+      firstCharIndex = 0;
+      lastCharIndex = 255;
+    }
+
+    var unitsPerEm = override.unitsPerEm || kPDFGlyphSpaceUnits;
+    var typoAscent = override.ascent || properties.ascent;
+    var typoDescent = override.descent || properties.descent;
+    var winAscent = override.yMax || typoAscent;
+    var winDescent = -override.yMin || -typoDescent;
+
+    // if there is a units per em value but no other override
+    // then scale the calculated ascent
+    if (unitsPerEm != kPDFGlyphSpaceUnits &&
+        'undefined' == typeof(override.ascent)) {
+      // if the font units differ to the PDF glyph space units
+      // then scale up the values
+      typoAscent = Math.round(typoAscent * unitsPerEm / kPDFGlyphSpaceUnits);
+      typoDescent = Math.round(typoDescent * unitsPerEm / kPDFGlyphSpaceUnits);
+      winAscent = typoAscent;
+      winDescent = -typoDescent;
+    }
+
+    return '\x00\x03' + // version
+           '\x02\x24' + // xAvgCharWidth
+           '\x01\xF4' + // usWeightClass
+           '\x00\x05' + // usWidthClass
+           '\x00\x00' + // fstype (0 to let the font loads via font-face on IE)
+           '\x02\x8A' + // ySubscriptXSize
+           '\x02\xBB' + // ySubscriptYSize
+           '\x00\x00' + // ySubscriptXOffset
+           '\x00\x8C' + // ySubscriptYOffset
+           '\x02\x8A' + // ySuperScriptXSize
+           '\x02\xBB' + // ySuperScriptYSize
+           '\x00\x00' + // ySuperScriptXOffset
+           '\x01\xDF' + // ySuperScriptYOffset
+           '\x00\x31' + // yStrikeOutSize
+           '\x01\x02' + // yStrikeOutPosition
+           '\x00\x00' + // sFamilyClass
+           '\x00\x00\x06' +
+           String.fromCharCode(properties.fixedPitch ? 0x09 : 0x00) +
+           '\x00\x00\x00\x00\x00\x00' + // Panose
+           string32(ulUnicodeRange1) + // ulUnicodeRange1 (Bits 0-31)
+           string32(ulUnicodeRange2) + // ulUnicodeRange2 (Bits 32-63)
+           string32(ulUnicodeRange3) + // ulUnicodeRange3 (Bits 64-95)
+           string32(ulUnicodeRange4) + // ulUnicodeRange4 (Bits 96-127)
+           '\x2A\x32\x31\x2A' + // achVendID
+           string16(properties.italicAngle ? 1 : 0) + // fsSelection
+           string16(firstCharIndex ||
+                    properties.firstChar) + // usFirstCharIndex
+           string16(lastCharIndex || properties.lastChar) +  // usLastCharIndex
+           string16(typoAscent) + // sTypoAscender
+           string16(typoDescent) + // sTypoDescender
+           '\x00\x64' + // sTypoLineGap (7%-10% of the unitsPerEM value)
+           string16(winAscent) + // usWinAscent
+           string16(winDescent) + // usWinDescent
+           '\x00\x00\x00\x00' + // ulCodePageRange1 (Bits 0-31)
+           '\x00\x00\x00\x00' + // ulCodePageRange2 (Bits 32-63)
+           string16(properties.xHeight) + // sxHeight
+           string16(properties.capHeight) + // sCapHeight
+           string16(0) + // usDefaultChar
+           string16(firstCharIndex || properties.firstChar) + // usBreakChar
+           '\x00\x03';  // usMaxContext
+  };
+
+  function createPostTable(properties) {
+    var angle = Math.floor(properties.italicAngle * (Math.pow(2, 16)));
+    return '\x00\x03\x00\x00' + // Version number
+           string32(angle) + // italicAngle
+           '\x00\x00' + // underlinePosition
+           '\x00\x00' + // underlineThickness
+           string32(properties.fixedPitch) + // isFixedPitch
+           '\x00\x00\x00\x00' + // minMemType42
+           '\x00\x00\x00\x00' + // maxMemType42
+           '\x00\x00\x00\x00' + // minMemType1
+           '\x00\x00\x00\x00';  // maxMemType1
+  };
+
+  function createNameTable(name) {
+    var strings = [
+      'Original licence',  // 0.Copyright
+      name,                // 1.Font family
+      'Unknown',           // 2.Font subfamily (font weight)
+      'uniqueID',          // 3.Unique ID
+      name,                // 4.Full font name
+      'Version 0.11',      // 5.Version
+      '',                  // 6.Postscript name
+      'Unknown',           // 7.Trademark
+      'Unknown',           // 8.Manufacturer
+      'Unknown'            // 9.Designer
+    ];
+
+    // Mac want 1-byte per character strings while Windows want
+    // 2-bytes per character, so duplicate the names table
+    var stringsUnicode = [];
+    for (var i = 0, ii = strings.length; i < ii; i++) {
+      var str = strings[i];
+
+      var strUnicode = '';
+      for (var j = 0, jj = str.length; j < jj; j++)
+        strUnicode += string16(str.charCodeAt(j));
+      stringsUnicode.push(strUnicode);
+    }
+
+    var names = [strings, stringsUnicode];
+    var platforms = ['\x00\x01', '\x00\x03'];
+    var encodings = ['\x00\x00', '\x00\x01'];
+    var languages = ['\x00\x00', '\x04\x09'];
+
+    var namesRecordCount = strings.length * platforms.length;
+    var nameTable =
+      '\x00\x00' +                           // format
+      string16(namesRecordCount) +           // Number of names Record
+      string16(namesRecordCount * 12 + 6);   // Storage
+
+    // Build the name records field
+    var strOffset = 0;
+    for (var i = 0, ii = platforms.length; i < ii; i++) {
+      var strs = names[i];
+      for (var j = 0, jj = strs.length; j < jj; j++) {
+        var str = strs[j];
+        var nameRecord =
+          platforms[i] + // platform ID
+          encodings[i] + // encoding ID
+          languages[i] + // language ID
+          string16(j) + // name ID
+          string16(str.length) +
+          string16(strOffset);
+        nameTable += nameRecord;
+        strOffset += str.length;
+      }
+    }
+
+    nameTable += strings.join('') + stringsUnicode.join('');
+    return nameTable;
+  }
+
+  constructor.prototype = {
+    name: null,
+    font: null,
+    mimetype: null,
+    encoding: null,
+
+    checkAndRepair: function font_checkAndRepair(name, font, properties) {
+      function readTableEntry(file) {
+        var tag = file.getBytes(4);
+        tag = String.fromCharCode(tag[0]) +
+              String.fromCharCode(tag[1]) +
+              String.fromCharCode(tag[2]) +
+              String.fromCharCode(tag[3]);
+
+        var checksum = int32(file.getBytes(4));
+        var offset = int32(file.getBytes(4));
+        var length = int32(file.getBytes(4));
+
+        // Read the table associated data
+        var previousPosition = file.pos;
+        file.pos = file.start ? file.start : 0;
+        file.skip(offset);
+        var data = file.getBytes(length);
+        file.pos = previousPosition;
+
+        if (tag == 'head') {
+          // clearing checksum adjustment
+          data[8] = data[9] = data[10] = data[11] = 0;
+          data[17] |= 0x20; //Set font optimized for cleartype flag
+        }
+
+        return {
+          tag: tag,
+          checksum: checksum,
+          length: length,
+          offset: offset,
+          data: data
+        };
+      };
+
+      function readOpenTypeHeader(ttf) {
+        return {
+          version: arrayToString(ttf.getBytes(4)),
+          numTables: int16(ttf.getBytes(2)),
+          searchRange: int16(ttf.getBytes(2)),
+          entrySelector: int16(ttf.getBytes(2)),
+          rangeShift: int16(ttf.getBytes(2))
+        };
+      };
+
+      function createGlyphNameMap(glyphs, ids, properties) {
+        var glyphNames = properties.glyphNames;
+        if (!glyphNames) {
+          properties.glyphNameMap = {};
+          return;
+        }
+        var glyphsLength = glyphs.length;
+        var glyphNameMap = {};
+        var encoding = [];
+        for (var i = 0; i < glyphsLength; ++i) {
+          var glyphName = glyphNames[ids[i]];
+          if (!glyphName)
+            continue;
+          var unicode = glyphs[i].unicode;
+          glyphNameMap[glyphName] = unicode;
+          var code = glyphs[i].code;
+          encoding[code] = glyphName;
+        }
+        properties.glyphNameMap = glyphNameMap;
+        if (!properties.hasEncoding)
+          properties.baseEncoding = encoding;
+      }
+
+      function replaceCMapTable(cmap, font, properties) {
+        var start = (font.start ? font.start : 0) + cmap.offset;
+        font.pos = start;
+
+        var version = int16(font.getBytes(2));
+        var numRecords = int16(font.getBytes(2));
+
+        var records = [];
+        for (var i = 0; i < numRecords; i++) {
+          records.push({
+            platformID: int16(font.getBytes(2)),
+            encodingID: int16(font.getBytes(2)),
+            offset: int32(font.getBytes(4))
+          });
+        }
+
+        // Check that table are sorted by platformID then encodingID,
+        records.sort(function fontReplaceCMapTableSort(a, b) {
+          return ((a.platformID << 16) + a.encodingID) -
+                 ((b.platformID << 16) + b.encodingID);
+        });
+
+        var tables = [records[0]];
+        for (var i = 1; i < numRecords; i++) {
+          // The sanitizer will drop the font if 2 tables have the same
+          // platformID and the same encodingID, this will be correct for
+          // most cases but if the font has been made for Mac it could
+          // exist a few platformID: 1, encodingID: 0 but with a different
+          // language field and that's correct. But the sanitizer does not
+          // seem to support this case.
+          var current = records[i];
+          var previous = records[i - 1];
+          if (((current.platformID << 16) + current.encodingID) <=
+             ((previous.platformID << 16) + previous.encodingID))
+                continue;
+          tables.push(current);
+        }
+
+        var missing = numRecords - tables.length;
+        if (missing) {
+          numRecords = tables.length;
+          var data = string16(version) + string16(numRecords);
+
+          for (var i = 0; i < numRecords; i++) {
+            var table = tables[i];
+            data += string16(table.platformID) +
+                    string16(table.encodingID) +
+                    string32(table.offset);
+          }
+
+          for (var i = 0, ii = data.length; i < ii; i++)
+            cmap.data[i] = data.charCodeAt(i);
+        }
+
+        for (var i = 0; i < numRecords; i++) {
+          var table = tables[i];
+          font.pos = start + table.offset;
+
+          var format = int16(font.getBytes(2));
+          var length = int16(font.getBytes(2));
+          var language = int16(font.getBytes(2));
+
+          if (format == 0) {
+            // Characters below 0x20 are controls characters that are hardcoded
+            // into the platform so if some characters in the font are assigned
+            // under this limit they will not be displayed so let's rewrite the
+            // CMap.
+            var glyphs = [];
+            var ids = [];
+            for (var j = 0; j < 256; j++) {
+              var index = font.getByte();
+              if (index) {
+                var unicode = adaptUnicode(j);
+                glyphs.push({ unicode: unicode, code: j });
+                ids.push(index);
+              }
+            }
+
+            properties.hasShortCmap = true;
+
+            createGlyphNameMap(glyphs, ids, properties);
+            return cmap.data = createCMapTable(glyphs, ids);
+          } else if (format == 4) {
+            // re-creating the table in format 4 since the encoding
+            // might be changed
+            var segCount = (int16(font.getBytes(2)) >> 1);
+            font.getBytes(6); // skipping range fields
+            var segIndex, segments = [];
+            for (segIndex = 0; segIndex < segCount; segIndex++) {
+              segments.push({ end: int16(font.getBytes(2)) });
+            }
+            font.getBytes(2);
+            for (segIndex = 0; segIndex < segCount; segIndex++) {
+              segments[segIndex].start = int16(font.getBytes(2));
+            }
+
+            for (segIndex = 0; segIndex < segCount; segIndex++) {
+              segments[segIndex].delta = int16(font.getBytes(2));
+            }
+
+            var offsetsCount = 0;
+            for (segIndex = 0; segIndex < segCount; segIndex++) {
+              var segment = segments[segIndex];
+              var rangeOffset = int16(font.getBytes(2));
+              if (!rangeOffset) {
+                segment.offsetIndex = -1;
+                continue;
+              }
+
+              var offsetIndex = (rangeOffset >> 1) - (segCount - segIndex);
+              segment.offsetIndex = offsetIndex;
+              offsetsCount = Math.max(offsetsCount, offsetIndex +
+                segment.end - segment.start + 1);
+            }
+
+            var offsets = [];
+            for (var j = 0; j < offsetsCount; j++)
+              offsets.push(int16(font.getBytes(2)));
+
+            var glyphs = [], ids = [];
+
+            for (segIndex = 0; segIndex < segCount; segIndex++) {
+              var segment = segments[segIndex];
+              var start = segment.start, end = segment.end;
+              var delta = segment.delta, offsetIndex = segment.offsetIndex;
+
+              for (var j = start; j <= end; j++) {
+                if (j == 0xFFFF)
+                  continue;
+
+                var glyphCode = offsetIndex < 0 ? j :
+                  offsets[offsetIndex + j - start];
+                glyphCode = (glyphCode + delta) & 0xFFFF;
+                if (glyphCode == 0 || isAdaptedUnicode(j))
+                  continue;
+
+                var unicode = adaptUnicode(j);
+                glyphs.push({ unicode: unicode, code: j });
+                ids.push(glyphCode);
+              }
+            }
+
+            createGlyphNameMap(glyphs, ids, properties);
+            return cmap.data = createCMapTable(glyphs, ids);
+          } else if (format == 6) {
+            // Format 6 is a 2-bytes dense mapping, which means the font data
+            // lives glue together even if they are pretty far in the unicode
+            // table. (This looks weird, so I can have missed something), this
+            // works on Linux but seems to fails on Mac so let's rewrite the
+            // cmap table to a 3-1-4 style
+            var firstCode = int16(font.getBytes(2));
+            var entryCount = int16(font.getBytes(2));
+
+            var glyphs = [];
+            var ids = [];
+            for (var j = 0; j < entryCount; j++) {
+              var glyphCode = int16(font.getBytes(2));
+              var code = firstCode + j;
+              if (isAdaptedUnicode(glyphCode))
+                continue;
+
+              var unicode = adaptUnicode(code);
+              glyphs.push({ unicode: unicode, code: code });
+              ids.push(glyphCode);
+            }
+
+            createGlyphNameMap(glyphs, ids, properties);
+            return cmap.data = createCMapTable(glyphs, ids);
+          }
+        }
+        return cmap.data;
+      };
+
+      function sanitizeMetrics(font, header, metrics, numGlyphs) {
+        if (!header && !metrics)
+          return;
+
+        // The vhea/vmtx tables are not required, so it happens that
+        // some fonts embed a vmtx table without a vhea table. In this
+        // situation the sanitizer assume numOfLongVerMetrics = 1. As
+        // a result it tries to read numGlyphs - 1 SHORT from the vmtx
+        // table, and if it is not possible, the font is rejected.
+        // So remove the vmtx table if there is no vhea table.
+        if (!header && metrics) {
+          metrics.data = null;
+          return;
+        }
+
+        font.pos = (font.start ? font.start : 0) + header.offset;
+        font.pos += header.length - 2;
+        var numOfMetrics = int16(font.getBytes(2));
+
+        var numOfSidebearings = numGlyphs - numOfMetrics;
+        var numMissing = numOfSidebearings -
+          ((hmtx.length - numOfMetrics * 4) >> 1);
+        if (numMissing > 0) {
+          font.pos = (font.start ? font.start : 0) + metrics.offset;
+          var entries = '';
+          for (var i = 0, ii = hmtx.length; i < ii; i++)
+            entries += String.fromCharCode(font.getByte());
+          for (var i = 0; i < numMissing; i++)
+            entries += '\x00\x00';
+          metrics.data = stringToArray(entries);
+        }
+      };
+
+      function sanitizeGlyphLocations(loca, glyf, numGlyphs,
+                                      isGlyphLocationsLong) {
+        var itemSize, itemDecode, itemEncode;
+        if (isGlyphLocationsLong) {
+          itemSize = 4;
+          itemDecode = function fontItemDecodeLong(data, offset) {
+            return (data[offset] << 24) | (data[offset + 1] << 16) |
+                   (data[offset + 2] << 8) | data[offset + 3];
+          };
+          itemEncode = function fontItemEncodeLong(data, offset, value) {
+            data[offset] = (value >>> 24) & 0xFF;
+            data[offset + 1] = (value >> 16) & 0xFF;
+            data[offset + 2] = (value >> 8) & 0xFF;
+            data[offset + 3] = value & 0xFF;
+          };
+        } else {
+          itemSize = 2;
+          itemDecode = function fontItemDecode(data, offset) {
+            return (data[offset] << 9) | (data[offset + 1] << 1);
+          };
+          itemEncode = function fontItemEncode(data, offset, value) {
+            data[offset] = (value >> 9) & 0xFF;
+            data[offset + 1] = (value >> 1) & 0xFF;
+          };
+        }
+        var locaData = loca.data;
+        var startOffset = itemDecode(locaData, 0);
+        var firstOffset = itemDecode(locaData, itemSize);
+        if (firstOffset - startOffset < 12 || startOffset > 0) {
+          // removing first glyph
+          glyf.data = glyf.data.subarray(firstOffset);
+          glyf.length -= firstOffset;
+
+          itemEncode(locaData, 0, 0);
+          var i, pos = itemSize;
+          for (i = 1; i <= numGlyphs; ++i) {
+            itemEncode(locaData, pos,
+              itemDecode(locaData, pos) - firstOffset);
+            pos += itemSize;
+          }
+        }
+      }
+
+      function readGlyphNameMap(post, properties) {
+        var start = (font.start ? font.start : 0) + post.offset;
+        font.pos = start;
+
+        var length = post.length, end = start + length;
+        var version = int32(font.getBytes(4));
+        // skip rest to the tables
+        font.getBytes(28);
+
+        var glyphNames;
+        switch (version) {
+          case 0x00010000:
+            glyphNames = MacStandardGlyphOrdering;
+            break;
+          case 0x00020000:
+            var numGlyphs = int16(font.getBytes(2));
+            var glyphNameIndexes = [];
+            for (var i = 0; i < numGlyphs; ++i)
+              glyphNameIndexes.push(int16(font.getBytes(2)));
+            var customNames = [];
+            while (font.pos < end) {
+              var stringLength = font.getByte();
+              var string = '';
+              for (var i = 0; i < stringLength; ++i)
+                string += font.getChar();
+              customNames.push(string);
+            }
+            glyphNames = [];
+            for (var i = 0; i < numGlyphs; ++i) {
+              var j = glyphNameIndexes[i];
+              if (j < 258) {
+                glyphNames.push(MacStandardGlyphOrdering[j]);
+                continue;
+              }
+              glyphNames.push(customNames[j - 258]);
+            }
+            break;
+          case 0x00030000:
+            break;
+          default:
+            warn('Unknown/unsupported post table version ' + version);
+            break;
+        }
+        properties.glyphNames = glyphNames;
+      }
+
+      // Check that required tables are present
+      var requiredTables = ['OS/2', 'cmap', 'head', 'hhea',
+                             'hmtx', 'maxp', 'name', 'post'];
+
+      var header = readOpenTypeHeader(font);
+      var numTables = header.numTables;
+
+      var cmap, post, maxp, hhea, hmtx, vhea, vmtx, head, loca, glyf;
+      var tables = [];
+      for (var i = 0; i < numTables; i++) {
+        var table = readTableEntry(font);
+        var index = requiredTables.indexOf(table.tag);
+        if (index != -1) {
+          if (table.tag == 'cmap')
+            cmap = table;
+          else if (table.tag == 'post')
+            post = table;
+          else if (table.tag == 'maxp')
+            maxp = table;
+          else if (table.tag == 'hhea')
+            hhea = table;
+          else if (table.tag == 'hmtx')
+            hmtx = table;
+          else if (table.tag == 'head')
+            head = table;
+
+          requiredTables.splice(index, 1);
+        } else {
+          if (table.tag == 'vmtx')
+            vmtx = table;
+          else if (table.tag == 'vhea')
+            vhea = table;
+          else if (table.tag == 'loca')
+            loca = table;
+          else if (table.tag == 'glyf')
+            glyf = table;
+        }
+        tables.push(table);
+      }
+
+      var numTables = header.numTables + requiredTables.length;
+
+      // header and new offsets. Table entry information is appended to the
+      // end of file. The virtualOffset represents where to put the actual
+      // data of a particular table;
+      var ttf = {
+        file: '',
+        virtualOffset: numTables * (4 * 4)
+      };
+
+      // The new numbers of tables will be the last one plus the num
+      // of missing tables
+      createOpenTypeHeader(header.version, ttf, numTables);
+
+      if (requiredTables.indexOf('OS/2') != -1) {
+        // extract some more font properties from the OpenType head and
+        // hhea tables; yMin and descent value are always negative
+        var override = {
+          unitsPerEm: int16([head.data[18], head.data[19]]),
+          yMax: int16([head.data[42], head.data[43]]),
+          yMin: int16([head.data[38], head.data[39]]) - 0x10000,
+          ascent: int16([hhea.data[4], hhea.data[5]]),
+          descent: int16([hhea.data[6], hhea.data[7]]) - 0x10000
+        };
+
+        tables.push({
+          tag: 'OS/2',
+          data: stringToArray(createOS2Table(properties, null, override))
+        });
+      }
+
+      // Ensure the [h/v]mtx tables contains the advance width and
+      // sidebearings information for numGlyphs in the maxp table
+      font.pos = (font.start || 0) + maxp.offset;
+      var version = int16(font.getBytes(4));
+      var numGlyphs = int16(font.getBytes(2));
+
+      sanitizeMetrics(font, hhea, hmtx, numGlyphs);
+      sanitizeMetrics(font, vhea, vmtx, numGlyphs);
+
+      if (head && loca && glyf) {
+        var isGlyphLocationsLong = int16([head.data[50], head.data[51]]);
+        sanitizeGlyphLocations(loca, glyf, numGlyphs, isGlyphLocationsLong);
+      }
+
+      // Sanitizer reduces the glyph advanceWidth to the maxAdvanceWidth
+      // Sometimes it's 0. That needs to be fixed
+      if (hhea.data[10] == 0 && hhea.data[11] == 0) {
+        hhea.data[10] = 0xFF;
+        hhea.data[11] = 0xFF;
+      }
+
+      // The 'post' table has glyphs names.
+      if (post) {
+        readGlyphNameMap(post, properties);
+      }
+
+      // Replace the old CMAP table with a shiny new one
+      if (properties.type == 'CIDFontType2') {
+        // Type2 composite fonts map characters directly to glyphs so the cmap
+        // table must be replaced.
+        // canvas fillText will reencode some characters even if the font has a
+        // glyph at that position - e.g. newline is converted to a space and
+        // U+00AD (soft hyphen) is not drawn.
+        // So, offset all the glyphs by 0xFF to avoid these cases and use
+        // the encoding to map incoming characters to the new glyph positions
+        if (!cmap) {
+          cmap = {
+            tag: 'cmap',
+            data: null
+          };
+          tables.push(cmap);
+        }
+
+        var glyphs = [];
+        for (i = 1; i < numGlyphs; i++) {
+          if (isAdaptedUnicode(i))
+            continue;
+
+          glyphs.push({ unicode: adaptUnicode(i) });
+        }
+        cmap.data = createCMapTable(glyphs);
+      } else {
+        replaceCMapTable(cmap, font, properties);
+        this.glyphNameMap = properties.glyphNameMap;
+      }
+
+      // Rewrite the 'post' table if needed
+      if (requiredTables.indexOf('post') != -1) {
+        tables.push({
+          tag: 'post',
+          data: stringToArray(createPostTable(properties))
+        });
+      }
+
+      // Rewrite the 'name' table if needed
+      if (requiredTables.indexOf('name') != -1) {
+        tables.push({
+          tag: 'name',
+          data: stringToArray(createNameTable(this.name))
+        });
+      }
+
+      // Tables needs to be written by ascendant alphabetic order
+      tables.sort(function tables_sort(a, b) {
+        return (a.tag > b.tag) - (a.tag < b.tag);
+      });
+
+      // rewrite the tables but tweak offsets
+      for (var i = 0, ii = tables.length; i < ii; i++) {
+        var table = tables[i];
+        var data = [];
+
+        var tableData = table.data;
+        for (var j = 0, jj = tableData.length; j < jj; j++)
+          data.push(tableData[j]);
+        createTableEntry(ttf, table.tag, data);
+      }
+
+      // Add the table datas
+      for (var i = 0, ii = tables.length; i < ii; i++) {
+        var table = tables[i];
+        var tableData = table.data;
+        ttf.file += arrayToString(tableData);
+
+        // 4-byte aligned data
+        while (ttf.file.length & 3)
+          ttf.file += String.fromCharCode(0);
+      }
+
+      return stringToArray(ttf.file);
+    },
+
+    convert: function font_convert(fontName, font, properties) {
+      function isFixedPitch(glyphs) {
+        for (var i = 0, ii = glyphs.length - 1; i < ii; i++) {
+          if (glyphs[i] != glyphs[i + 1])
+            return false;
+        }
+        return true;
+      }
+
+      // The offsets object holds at the same time a representation of where
+      // to write the table entry information about a table and another offset
+      // representing the offset where to draw the actual data of a particular
+      // table
+      var kRequiredTablesCount = 9;
+
+      var otf = {
+        file: '',
+        virtualOffset: 9 * (4 * 4)
+      };
+
+      createOpenTypeHeader('\x4F\x54\x54\x4F', otf, 9);
+
+      var charstrings = font.charstrings;
+      properties.fixedPitch = isFixedPitch(charstrings);
+
+      var glyphNameMap = {};
+      for (var i = 0; i < charstrings.length; ++i) {
+        var charstring = charstrings[i];
+        glyphNameMap[charstring.glyph] = charstring.unicode;
+      }
+      this.glyphNameMap = glyphNameMap;
+
+      if (!properties.hasEncoding && (properties.subtype == 'Type1C' ||
+          properties.subtype == 'CIDFontType0C')) {
+        var encoding = [];
+        for (var i = 0; i < charstrings.length; ++i) {
+          var charstring = charstrings[i];
+          encoding[charstring.code] = charstring.glyph;
+        }
+        properties.baseEncoding = encoding;
+      }
+
+      var fields = {
+        // PostScript Font Program
+        'CFF ': font.data,
+
+        // OS/2 and Windows Specific metrics
+        'OS/2': stringToArray(createOS2Table(properties, charstrings)),
+
+        // Character to glyphs mapping
+        'cmap': createCMapTable(charstrings.slice(),
+                                ('glyphIds' in font) ? font.glyphIds : null),
+
+        // Font header
+        'head': (function fontFieldsHead() {
+          return stringToArray(
+              '\x00\x01\x00\x00' + // Version number
+              '\x00\x00\x10\x00' + // fontRevision
+              '\x00\x00\x00\x00' + // checksumAdjustement
+              '\x5F\x0F\x3C\xF5' + // magicNumber
+              '\x00\x00' + // Flags
+              '\x03\xE8' + // unitsPerEM (defaulting to 1000)
+              '\x00\x00\x00\x00\x9e\x0b\x7e\x27' + // creation date
+              '\x00\x00\x00\x00\x9e\x0b\x7e\x27' + // modifification date
+              '\x00\x00' + // xMin
+              string16(properties.descent) + // yMin
+              '\x0F\xFF' + // xMax
+              string16(properties.ascent) + // yMax
+              string16(properties.italicAngle ? 2 : 0) + // macStyle
+              '\x00\x11' + // lowestRecPPEM
+              '\x00\x00' + // fontDirectionHint
+              '\x00\x00' + // indexToLocFormat
+              '\x00\x00');  // glyphDataFormat
+        })(),
+
+        // Horizontal header
+        'hhea': (function fontFieldsHhea() {
+          return stringToArray(
+              '\x00\x01\x00\x00' + // Version number
+              string16(properties.ascent) + // Typographic Ascent
+              string16(properties.descent) + // Typographic Descent
+              '\x00\x00' + // Line Gap
+              '\xFF\xFF' + // advanceWidthMax
+              '\x00\x00' + // minLeftSidebearing
+              '\x00\x00' + // minRightSidebearing
+              '\x00\x00' + // xMaxExtent
+              string16(properties.capHeight) + // caretSlopeRise
+              string16(Math.tan(properties.italicAngle) *
+                       properties.xHeight) + // caretSlopeRun
+              '\x00\x00' + // caretOffset
+              '\x00\x00' + // -reserved-
+              '\x00\x00' + // -reserved-
+              '\x00\x00' + // -reserved-
+              '\x00\x00' + // -reserved-
+              '\x00\x00' + // metricDataFormat
+              string16(charstrings.length + 1)); // Number of HMetrics
+        })(),
+
+        // Horizontal metrics
+        'hmtx': (function fontFieldsHmtx() {
+          var hmtx = '\x00\x00\x00\x00'; // Fake .notdef
+          for (var i = 0, ii = charstrings.length; i < ii; i++)
+            hmtx += string16(charstrings[i].width) + string16(0);
+          return stringToArray(hmtx);
+        })(),
+
+        // Maximum profile
+        'maxp': (function fontFieldsMaxp() {
+          return stringToArray(
+              '\x00\x00\x50\x00' + // Version number
+             string16(charstrings.length + 1)); // Num of glyphs
+        })(),
+
+        // Naming tables
+        'name': stringToArray(createNameTable(fontName)),
+
+        // PostScript informations
+        'post': stringToArray(createPostTable(properties))
+      };
+
+      for (var field in fields)
+        createTableEntry(otf, field, fields[field]);
+
+      for (var field in fields) {
+        var table = fields[field];
+        otf.file += arrayToString(table);
+      }
+
+      return stringToArray(otf.file);
+    },
+
+    loadCidToUnicode: function font_loadCidToUnicode(properties) {
+      if (properties.cidToGidMap) {
+        this.cidToUnicode = properties.cidToGidMap;
+        return;
+      }
+
+      if (!properties.cidSystemInfo)
+        return;
+
+      var cidToUnicodeMap = [];
+      this.cidToUnicode = cidToUnicodeMap;
+
+      var cidSystemInfo = properties.cidSystemInfo;
+      var cidToUnicode;
+      if (cidSystemInfo) {
+        cidToUnicode = CIDToUnicodeMaps[
+          cidSystemInfo.registry + '-' + cidSystemInfo.ordering];
+      }
+
+      if (!cidToUnicode)
+        return; // identity encoding
+
+      var glyph = 1, i, j, k, ii;
+      for (i = 0, ii = cidToUnicode.length; i < ii; ++i) {
+        var unicode = cidToUnicode[i];
+        if (isArray(unicode)) {
+          var length = unicode.length;
+          for (j = 0; j < length; j++)
+            cidToUnicodeMap[unicode[j]] = glyph;
+          glyph++;
+        } else if (typeof unicode === 'object') {
+          var fillLength = unicode.f;
+          if (fillLength) {
+            k = unicode.c;
+            for (j = 0; j < fillLength; ++j) {
+              cidToUnicodeMap[k] = glyph++;
+              k++;
+            }
+          } else
+            glyph += unicode.s;
+        } else if (unicode) {
+          cidToUnicodeMap[unicode] = glyph++;
+        } else
+          glyph++;
+      }
+    },
+
+    bindWorker: function font_bindWorker(data) {
+      postMessage({
+        action: 'font',
+        data: {
+          raw: data,
+          fontName: this.loadedName,
+          mimetype: this.mimetype
+        }
+      });
+    },
+
+    bindDOM: function font_bindDom(data) {
+      var fontName = this.loadedName;
+
+      // Add the font-face rule to the document
+      var url = ('url(data:' + this.mimetype + ';base64,' +
+                 window.btoa(data) + ');');
+      var rule = "@font-face { font-family:'" + fontName + "';src:" + url + '}';
+
+      document.documentElement.firstChild.appendChild(
+        document.createElement('style'));
+
+      var styleSheet = document.styleSheets[document.styleSheets.length - 1];
+      styleSheet.insertRule(rule, styleSheet.cssRules.length);
+
+      return rule;
+    },
+
+    charToGlyph: function fonts_charToGlyph(charcode) {
+      var unicode, width, codeIRQueue;
+
+      var width = this.widths[charcode];
+
+      switch (this.type) {
+        case 'CIDFontType0':
+          if (this.noUnicodeAdaptation) {
+            width = this.widths[this.cidToUnicode[charcode]];
+            unicode = charcode;
+            break;
+          }
+          unicode = adaptUnicode(this.cidToUnicode[charcode] || charcode);
+          break;
+        case 'CIDFontType2':
+          if (this.noUnicodeAdaptation) {
+            width = this.widths[this.cidToUnicode[charcode]];
+            unicode = charcode;
+            break;
+          }
+          unicode = adaptUnicode(this.cidToUnicode[charcode] || charcode);
+          break;
+        case 'Type1':
+          var glyphName = this.differences[charcode] || this.encoding[charcode];
+          if (this.noUnicodeAdaptation) {
+            if (!isNum(width))
+              width = this.widths[glyphName];
+            unicode = GlyphsUnicode[glyphName] || charcode;
+            break;
+          }
+          unicode = this.glyphNameMap[glyphName] ||
+            adaptUnicode(GlyphsUnicode[glyphName] || charcode);
+          break;
+        case 'Type3':
+          var glyphName = this.differences[charcode] || this.encoding[charcode];
+          codeIRQueue = this.charProcIRQueues[glyphName];
+          unicode = charcode;
+          break;
+        case 'TrueType':
+          var glyphName = this.differences[charcode] || this.encoding[charcode];
+          if (!glyphName)
+            glyphName = Encodings.StandardEncoding[charcode];
+          if (!isNum(width))
+            width = this.widths[glyphName];
+          if (this.noUnicodeAdaptation) {
+            unicode = GlyphsUnicode[glyphName] || charcode;
+            break;
+          }
+          if (!this.hasEncoding) {
+            unicode = adaptUnicode(charcode);
+            break;
+          }
+          if (this.hasShortCmap) {
+            var j = Encodings.MacRomanEncoding.indexOf(glyphName);
+            unicode = j >= 0 && !isSpecialUnicode(j) ? j :
+              this.glyphNameMap[glyphName];
+          } else {
+            unicode = glyphName in GlyphsUnicode ?
+              adaptUnicode(GlyphsUnicode[glyphName]) :
+              this.glyphNameMap[glyphName];
+          }
+          break;
+        default:
+          warn('Unsupported font type: ' + this.type);
+          break;
+      }
+      return {
+        unicode: unicode,
+        width: isNum(width) ? width : this.defaultWidth,
+        codeIRQueue: codeIRQueue
+      };
+    },
+
+    charsToGlyphs: function fonts_chars2Glyphs(chars) {
+      var charsCache = this.charsCache;
+      var glyphs;
+
+      // if we translated this string before, just grab it from the cache
+      if (charsCache) {
+        glyphs = charsCache[chars];
+        if (glyphs)
+          return glyphs;
+      }
+
+      // lazily create the translation cache
+      if (!charsCache)
+        charsCache = this.charsCache = Object.create(null);
+
+      glyphs = [];
+
+      if (this.composite) {
+        // composite fonts have multi-byte strings convert the string from
+        // single-byte to multi-byte
+        // XXX assuming CIDFonts are two-byte - later need to extract the
+        // correct byte encoding according to the PDF spec
+        var length = chars.length - 1; // looping over two bytes at a time so
+                                       // loop should never end on the last byte
+        for (var i = 0; i < length; i++) {
+          var charcode = int16([chars.charCodeAt(i++), chars.charCodeAt(i)]);
+          var glyph = this.charToGlyph(charcode);
+          glyphs.push(glyph);
+          // placing null after each word break charcode (ASCII SPACE)
+          if (charcode == 0x20)
+            glyphs.push(null);
+        }
+      }
+      else {
+        for (var i = 0, ii = chars.length; i < ii; ++i) {
+          var charcode = chars.charCodeAt(i);
+          var glyph = this.charToGlyph(charcode);
+          glyphs.push(glyph);
+          if (charcode == 0x20)
+            glyphs.push(null);
+        }
+      }
+
+      // Enter the translated string into the cache
+      return (charsCache[chars] = glyphs);
+    }
+  };
+
+  return constructor;
+})();
+
+/*
+ * Type1Parser encapsulate the needed code for parsing a Type1 font
+ * program. Some of its logic depends on the Type2 charstrings
+ * structure.
+ */
+var Type1Parser = function type1Parser() {
+  /*
+   * Decrypt a Sequence of Ciphertext Bytes to Produce the Original Sequence
+   * of Plaintext Bytes. The function took a key as a parameter which can be
+   * for decrypting the eexec block of for decoding charStrings.
+   */
+  var kEexecEncryptionKey = 55665;
+  var kCharStringsEncryptionKey = 4330;
+
+  function decrypt(stream, key, discardNumber) {
+    var r = key, c1 = 52845, c2 = 22719;
+    var decryptedString = [];
+
+    var value = '';
+    var count = stream.length;
+    for (var i = 0; i < count; i++) {
+      value = stream[i];
+      decryptedString[i] = value ^ (r >> 8);
+      r = ((value + r) * c1 + c2) & ((1 << 16) - 1);
+    }
+    return decryptedString.slice(discardNumber);
+  }
+
+  /*
+   * CharStrings are encoded following the the CharString Encoding sequence
+   * describe in Chapter 6 of the "Adobe Type1 Font Format" specification.
+   * The value in a byte indicates a command, a number, or subsequent bytes
+   * that are to be interpreted in a special way.
+   *
+   * CharString Number Encoding:
+   *  A CharString byte containing the values from 32 through 255 inclusive
+   *  indicate an integer. These values are decoded in four ranges.
+   *
+   * 1. A CharString byte containing a value, v, between 32 and 246 inclusive,
+   * indicate the integer v - 139. Thus, the integer values from -107 through
+   * 107 inclusive may be encoded in single byte.
+   *
+   * 2. A CharString byte containing a value, v, between 247 and 250 inclusive,
+   * indicates an integer involving the next byte, w, according to the formula:
+   * [(v - 247) x 256] + w + 108
+   *
+   * 3. A CharString byte containing a value, v, between 251 and 254 inclusive,
+   * indicates an integer involving the next byte, w, according to the formula:
+   * -[(v - 251) * 256] - w - 108
+   *
+   * 4. A CharString containing the value 255 indicates that the next 4 bytes
+   * are a two complement signed integer. The first of these bytes contains the
+   * highest order bits, the second byte contains the next higher order bits
+   * and the fourth byte contain the lowest order bits.
+   *
+   *
+   * CharString Command Encoding:
+   *  CharStrings commands are encoded in 1 or 2 bytes.
+   *
+   *  Single byte commands are encoded in 1 byte that contains a value between
+   *  0 and 31 inclusive.
+   *  If a command byte contains the value 12, then the value in the next byte
+   *  indicates a command. This "escape" mechanism allows many extra commands
+   * to be encoded and this encoding technique helps to minimize the length of
+   * the charStrings.
+   */
+  var charStringDictionary = {
+    '1': 'hstem',
+    '3': 'vstem',
+    '4': 'vmoveto',
+    '5': 'rlineto',
+    '6': 'hlineto',
+    '7': 'vlineto',
+    '8': 'rrcurveto',
+
+    // closepath is a Type1 command that do not take argument and is useless
+    // in Type2 and it can simply be ignored.
+    '9': null, // closepath
+
+    '10': 'callsubr',
+
+    // return is normally used inside sub-routines to tells to the execution
+    // flow that it can be back to normal.
+    // During the translation process Type1 charstrings will be flattened and
+    // sub-routines will be embedded directly into the charstring directly, so
+    // this can be ignored safely.
+    '11': 'return',
+
+    '12': {
+      // dotsection is a Type1 command to specify some hinting feature for dots
+      // that do not take a parameter and it can safely be ignored for Type2.
+      '0': null, // dotsection
+
+      // [vh]stem3 are Type1 only and Type2 supports [vh]stem with multiple
+      // parameters, so instead of returning [vh]stem3 take a shortcut and
+      // return [vhstem] instead.
+      '1': 'vstem',
+      '2': 'hstem',
+
+      // Type1 only command with command not (yet) built-in ,throw an error
+      '6': -1, // seac
+      '7': -1, // sbw
+
+      '11': 'sub',
+      '12': 'div',
+
+      // callothersubr is a mechanism to make calls on the postscript
+      // interpreter, this is not supported by Type2 charstring but hopefully
+      // most of the default commands can be ignored safely.
+      '16': 'callothersubr',
+
+      '17': 'pop',
+
+      // setcurrentpoint sets the current point to x, y without performing a
+      // moveto (this is a one shot positionning command). This is used only
+      // with the return of an OtherSubrs call.
+      // TODO Implement the OtherSubrs charstring embedding and replace this
+      // call by a no-op, like 2 'pop' commands for example.
+      '33': null // setcurrentpoint
+    },
+    '13': 'hsbw',
+    '14': 'endchar',
+    '21': 'rmoveto',
+    '22': 'hmoveto',
+    '30': 'vhcurveto',
+    '31': 'hvcurveto'
+  };
+
+  var kEscapeCommand = 12;
+
+  function decodeCharString(array) {
+    var charstring = [];
+    var lsb = 0;
+    var width = 0;
+    var flexState = 0;
+
+    var value = '';
+    var count = array.length;
+    for (var i = 0; i < count; i++) {
+      value = array[i];
+
+      if (value < 32) {
+        var command = null;
+        if (value == kEscapeCommand) {
+          var escape = array[++i];
+
+          // TODO Clean this code
+          if (escape == 16) {
+            var index = charstring.pop();
+            var argc = charstring.pop();
+            for (var j = 0; j < argc; j++)
+              charstring.push('drop');
+
+            // If the flex mechanism is not used in a font program, Adobe
+            // states that entries 0, 1 and 2 can simply be replaced by
+            // {}, which means that we can simply ignore them.
+            if (index < 3) {
+              continue;
+            }
+
+            // This is the same things about hint replacement, if it is not used
+            // entry 3 can be replaced by {3}
+            // TODO support hint replacment
+            if (index == 3) {
+              charstring.push(3);
+              i++;
+              continue;
+            }
+          } else if (escape == 17 || escape == 33) {
+            // pop or setcurrentpoint commands can be ignored
+            // since we are not doing callothersubr
+            continue;
+          } else if (!kHintingEnabled && (escape == 1 || escape == 2)) {
+            charstring.push('drop', 'drop', 'drop', 'drop', 'drop', 'drop');
+            continue;
+          }
+
+          command = charStringDictionary['12'][escape];
+        } else {
+          // TODO Clean this code
+          if (value == 13) { // hsbw
+            if (charstring.length == 2) {
+              lsb = charstring[0];
+              width = charstring[1];
+              charstring.splice(0, 1);
+            } else if (charstring.length == 4 && charstring[3] == 'div') {
+              lsb = charstring[0];
+              width = charstring[1] / charstring[2];
+              charstring.splice(0, 1);
+            } else if (charstring.length == 4 && charstring[2] == 'div') {
+              lsb = charstring[0] / charstring[1];
+              width = charstring[3];
+              charstring.splice(0, 3);
+            } else {
+              error('Unsupported hsbw format: ' + charstring);
+            }
+
+            charstring.push(lsb, 'hmoveto');
+            continue;
+          } else if (value == 10) { // callsubr
+            if (charstring[charstring.length - 1] < 3) { // subr #0..2
+              var subrNumber = charstring.pop();
+              switch (subrNumber) {
+                case 1:
+                  flexState = 1; // prepare for flex coordinates
+                  break;
+                case 2:
+                  flexState = 2; // flex in progress
+                  break;
+                case 0:
+                  // type2 flex command does not need final coords
+                  charstring.push('exch', 'drop', 'exch', 'drop');
+                  charstring.push('flex');
+                  flexState = 0;
+                  break;
+              }
+              continue;
+            }
+          } else if (value == 21 && flexState > 0) {
+            if (flexState > 1)
+              continue; // ignoring rmoveto
+            value = 5; // first segment replacing with rlineto
+          } else if (!kHintingEnabled && (value == 1 || value == 3)) {
+            charstring.push('drop', 'drop');
+            continue;
+          }
+          command = charStringDictionary[value];
+        }
+
+        // Some charstring commands are meaningless in Type2 and will return
+        // a null, let's just ignored them
+        if (!command && i < count) {
+          continue;
+        } else if (!command) {
+          break;
+        } else if (command == -1) {
+          warn('Support for Type1 command ' + value +
+                ' (' + escape + ') is not implemented in charstring: ' +
+                charstring);
+          if (value == 12) {
+            // we know how to ignore only some the Type1 commands
+            switch (escape) {
+              case 7:
+                charstring.push('drop', 'drop', 'drop', 'drop');
+                continue;
+              case 8:
+                charstring.push('drop');
+                continue;
+            }
+          }
+        }
+
+        value = command;
+      } else if (value <= 246) {
+        value = value - 139;
+      } else if (value <= 250) {
+        value = ((value - 247) * 256) + array[++i] + 108;
+      } else if (value <= 254) {
+        value = -((value - 251) * 256) - array[++i] - 108;
+      } else {
+        value = (array[++i] & 0xff) << 24 | (array[++i] & 0xff) << 16 |
+                (array[++i] & 0xff) << 8 | (array[++i] & 0xff) << 0;
+      }
+
+      charstring.push(value);
+    }
+
+    return { charstring: charstring, width: width, lsb: lsb };
+  }
+
+  /*
+   * Returns an object containing a Subrs array and a CharStrings
+   * array extracted from and eexec encrypted block of data
+   */
+  function readNumberArray(str, index) {
+    var start = index;
+    while (str[index++] != '[')
+      start++;
+    start++;
+
+    var count = 0;
+    while (str[index++] != ']')
+      count++;
+
+    var array = str.substr(start, count).split(' ');
+    for (var i = 0, ii = array.length; i < ii; i++)
+      array[i] = parseFloat(array[i] || 0);
+    return array;
+  }
+
+  function readNumber(str, index) {
+    while (str[index] == ' ')
+      index++;
+
+    var start = index;
+
+    var count = 0;
+    while (str[index++] != ' ')
+      count++;
+
+    return parseFloat(str.substr(start, count) || 0);
+  }
+
+  function isSeparator(c) {
+    return c == ' ' || c == '\n' || c == '\x0d';
+  }
+
+  this.extractFontProgram = function t1_extractFontProgram(stream) {
+    var eexec = decrypt(stream, kEexecEncryptionKey, 4);
+    var eexecStr = '';
+    for (var i = 0, ii = eexec.length; i < ii; i++)
+      eexecStr += String.fromCharCode(eexec[i]);
+
+    var glyphsSection = false, subrsSection = false;
+    var program = {
+      subrs: [],
+      charstrings: [],
+      properties: {
+        'private': {
+          'lenIV': 4
+        }
+      }
+    };
+
+    var glyph = '';
+    var token = '';
+    var length = 0;
+
+    var c = '';
+    var count = eexecStr.length;
+    for (var i = 0; i < count; i++) {
+      var getToken = function getToken() {
+        while (i < count && isSeparator(eexecStr[i]))
+          ++i;
+
+        var token = '';
+        while (i < count && !isSeparator(eexecStr[i]))
+          token += eexecStr[i++];
+
+        return token;
+      };
+      var c = eexecStr[i];
+
+      if ((glyphsSection || subrsSection) &&
+          (token == 'RD' || token == '-|')) {
+        i++;
+        var data = eexec.slice(i, i + length);
+        var lenIV = program.properties.private['lenIV'];
+        var encoded = decrypt(data, kCharStringsEncryptionKey, lenIV);
+        var str = decodeCharString(encoded);
+
+        if (glyphsSection) {
+          program.charstrings.push({
+            glyph: glyph,
+            data: str.charstring,
+            lsb: str.lsb,
+            width: str.width
+          });
+        } else {
+          program.subrs.push(str.charstring);
+        }
+        i += length;
+        token = '';
+      } else if (isSeparator(c)) {
+        length = parseInt(token, 10);
+        token = '';
+      } else {
+        token += c;
+        if (!glyphsSection) {
+          switch (token) {
+            case '/CharString':
+              glyphsSection = true;
+              break;
+            case '/Subrs':
+              ++i;
+              var num = parseInt(getToken(), 10);
+              getToken(); // read in 'array'
+              for (var j = 0; j < num; ++j) {
+                var t = getToken(); // read in 'dup'
+                if (t == 'ND' || t == '|-' || t == 'noaccess')
+                  break;
+                var index = parseInt(getToken(), 10);
+                if (index > j)
+                  j = index;
+                var length = parseInt(getToken(), 10);
+                getToken(); // read in 'RD'
+                var data = eexec.slice(i + 1, i + 1 + length);
+                var lenIV = program.properties.private['lenIV'];
+                var encoded = decrypt(data, kCharStringsEncryptionKey, lenIV);
+                var str = decodeCharString(encoded);
+                i = i + 1 + length;
+                t = getToken(); // read in 'NP'
+                if (t == 'noaccess')
+                  getToken(); // read in 'put'
+                program.subrs[index] = str.charstring;
+              }
+              break;
+            case '/BlueValues':
+            case '/OtherBlues':
+            case '/FamilyBlues':
+            case '/FamilyOtherBlues':
+            case '/StemSnapH':
+            case '/StemSnapV':
+              program.properties.private[token.substring(1)] =
+                readNumberArray(eexecStr, i + 1);
+              break;
+            case '/StdHW':
+            case '/StdVW':
+              program.properties.private[token.substring(1)] =
+                readNumberArray(eexecStr, i + 2)[0];
+              break;
+            case '/BlueShift':
+            case '/lenIV':
+            case '/BlueFuzz':
+            case '/BlueScale':
+            case '/LanguageGroup':
+            case '/ExpansionFactor':
+              program.properties.private[token.substring(1)] =
+                readNumber(eexecStr, i + 1);
+              break;
+          }
+        } else if (c == '/') {
+          token = glyph = '';
+          while ((c = eexecStr[++i]) != ' ')
+            glyph += c;
+        }
+      }
+    }
+
+    return program;
+  };
+
+  this.extractFontHeader = function t1_extractFontHeader(stream, properties) {
+    var headerString = '';
+    for (var i = 0, ii = stream.length; i < ii; i++)
+      headerString += String.fromCharCode(stream[i]);
+
+    var token = '';
+    var count = headerString.length;
+    for (var i = 0; i < count; i++) {
+      var getToken = function getToken() {
+        var char = headerString[i];
+        while (i < count && (isSeparator(char) || char == '/'))
+          char = headerString[++i];
+
+        var token = '';
+        while (i < count && !(isSeparator(char) || char == '/')) {
+          token += char;
+          char = headerString[++i];
+        }
+
+        return token;
+      };
+
+      var c = headerString[i];
+      if (isSeparator(c)) {
+        switch (token) {
+          case '/FontMatrix':
+            var matrix = readNumberArray(headerString, i + 1);
+
+            // The FontMatrix is in unitPerEm, so make it pixels
+            for (var j = 0, jj = matrix.length; j < jj; j++)
+              matrix[j] *= 1000;
+
+            // Make the angle into the right direction
+            matrix[2] *= -1;
+
+            properties.fontMatrix = matrix;
+            break;
+          case '/Encoding':
+            var encodingArg = getToken();
+            var encoding;
+            if (!/^\d+$/.test(encodingArg)) {
+              // encoding name is specified
+              encoding = Encodings[encodingArg];
+            } else {
+              encoding = [];
+              var size = parseInt(encodingArg, 10);
+              getToken(); // read in 'array'
+
+              for (var j = 0; j < size; j++) {
+                var token = getToken();
+                if (token == 'dup') {
+                  var index = parseInt(getToken(), 10);
+                  var glyph = getToken();
+                  encoding[index] = glyph;
+                  getToken(); // read the in 'put'
+                }
+              }
+            }
+            if (!properties.hasEncoding && encoding) {
+              properties.baseEncoding = encoding;
+              break;
+            }
+            break;
+        }
+        token = '';
+      } else {
+        token += c;
+      }
+    }
+  };
+};
+
+/**
+ * The CFF class takes a Type1 file and wrap it into a
+ * 'Compact Font Format' which itself embed Type2 charstrings.
+ */
+var CFFStrings = [
+  '.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
+  'ampersand', 'quoteright', 'parenleft', 'parenright', 'asterisk', 'plus',
+  'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four',
+  'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less',
+  'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+  'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+  'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright', 'asciicircum',
+  'underscore', 'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
+  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y',
+  'z', 'braceleft', 'bar', 'braceright', 'asciitilde', 'exclamdown', 'cent',
+  'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
+  'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
+  'guilsinglright', 'fi', 'fl', 'endash', 'dagger', 'daggerdbl',
+  'periodcentered', 'paragraph', 'bullet', 'quotesinglbase', 'quotedblbase',
+  'quotedblright', 'guillemotright', 'ellipsis', 'perthousand', 'questiondown',
+  'grave', 'acute', 'circumflex', 'tilde', 'macron', 'breve', 'dotaccent',
+  'dieresis', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron', 'emdash',
+  'AE', 'ordfeminine', 'Lslash', 'Oslash', 'OE', 'ordmasculine', 'ae',
+  'dotlessi', 'lslash', 'oslash', 'oe', 'germandbls', 'onesuperior',
+  'logicalnot', 'mu', 'trademark', 'Eth', 'onehalf', 'plusminus', 'Thorn',
+  'onequarter', 'divide', 'brokenbar', 'degree', 'thorn', 'threequarters',
+  'twosuperior', 'registered', 'minus', 'eth', 'multiply', 'threesuperior',
+  'copyright', 'Aacute', 'Acircumflex', 'Adieresis', 'Agrave', 'Aring',
+  'Atilde', 'Ccedilla', 'Eacute', 'Ecircumflex', 'Edieresis', 'Egrave',
+  'Iacute', 'Icircumflex', 'Idieresis', 'Igrave', 'Ntilde', 'Oacute',
+  'Ocircumflex', 'Odieresis', 'Ograve', 'Otilde', 'Scaron', 'Uacute',
+  'Ucircumflex', 'Udieresis', 'Ugrave', 'Yacute', 'Ydieresis', 'Zcaron',
+  'aacute', 'acircumflex', 'adieresis', 'agrave', 'aring', 'atilde',
+  'ccedilla', 'eacute', 'ecircumflex', 'edieresis', 'egrave', 'iacute',
+  'icircumflex', 'idieresis', 'igrave', 'ntilde', 'oacute', 'ocircumflex',
+  'odieresis', 'ograve', 'otilde', 'scaron', 'uacute', 'ucircumflex',
+  'udieresis', 'ugrave', 'yacute', 'ydieresis', 'zcaron', 'exclamsmall',
+  'Hungarumlautsmall', 'dollaroldstyle', 'dollarsuperior', 'ampersandsmall',
+  'Acutesmall', 'parenleftsuperior', 'parenrightsuperior', '266 ff',
+  'onedotenleader', 'zerooldstyle', 'oneoldstyle', 'twooldstyle',
+  'threeoldstyle', 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle',
+  'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'commasuperior',
+  'threequartersemdash', 'periodsuperior', 'questionsmall', 'asuperior',
+  'bsuperior', 'centsuperior', 'dsuperior', 'esuperior', 'isuperior',
+  'lsuperior', 'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
+  'tsuperior', 'ff', 'ffi', 'ffl', 'parenleftinferior', 'parenrightinferior',
+  'Circumflexsmall', 'hyphensuperior', 'Gravesmall', 'Asmall', 'Bsmall',
+  'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall',
+  'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall',
+  'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall',
+  'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah',
+  'Tildesmall', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall',
+  'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall', 'Caronsmall',
+  'Dotaccentsmall', 'Macronsmall', 'figuredash', 'hypheninferior',
+  'Ogoneksmall', 'Ringsmall', 'Cedillasmall', 'questiondownsmall', 'oneeighth',
+  'threeeighths', 'fiveeighths', 'seveneighths', 'onethird', 'twothirds',
+  'zerosuperior', 'foursuperior', 'fivesuperior', 'sixsuperior',
+  'sevensuperior', 'eightsuperior', 'ninesuperior', 'zeroinferior',
+  'oneinferior', 'twoinferior', 'threeinferior', 'fourinferior',
+  'fiveinferior', 'sixinferior', 'seveninferior', 'eightinferior',
+  'nineinferior', 'centinferior', 'dollarinferior', 'periodinferior',
+  'commainferior', 'Agravesmall', 'Aacutesmall', 'Acircumflexsmall',
+  'Atildesmall', 'Adieresissmall', 'Aringsmall', 'AEsmall', 'Ccedillasmall',
+  'Egravesmall', 'Eacutesmall', 'Ecircumflexsmall', 'Edieresissmall',
+  'Igravesmall', 'Iacutesmall', 'Icircumflexsmall', 'Idieresissmall',
+  'Ethsmall', 'Ntildesmall', 'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall',
+  'Otildesmall', 'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall',
+  'Uacutesmall', 'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall',
+  'Thornsmall', 'Ydieresissmall', '001.000', '001.001', '001.002', '001.003',
+  'Black', 'Bold', 'Book', 'Light', 'Medium', 'Regular', 'Roman', 'Semibold'
+];
+
+var type1Parser = new Type1Parser();
+
+var CFF = function cffCFF(name, file, properties) {
+  // Get the data block containing glyphs and subrs informations
+  var headerBlock = file.getBytes(properties.length1);
+  type1Parser.extractFontHeader(headerBlock, properties);
+
+  // Decrypt the data blocks and retrieve it's content
+  var eexecBlock = file.getBytes(properties.length2);
+  var data = type1Parser.extractFontProgram(eexecBlock);
+  for (var info in data.properties)
+    properties[info] = data.properties[info];
+
+  var charstrings = this.getOrderedCharStrings(data.charstrings, properties);
+  var type2Charstrings = this.getType2Charstrings(charstrings);
+  var subrs = this.getType2Subrs(data.subrs);
+
+  this.charstrings = charstrings;
+  this.data = this.wrap(name, type2Charstrings, this.charstrings,
+                        subrs, properties);
+};
+
+CFF.prototype = {
+  createCFFIndexHeader: function cff_createCFFIndexHeader(objects, isByte) {
+    // First 2 bytes contains the number of objects contained into this index
+    var count = objects.length;
+
+    // If there is no object, just create an array saying that with another
+    // offset byte.
+    if (count == 0)
+      return '\x00\x00\x00';
+
+    var data = String.fromCharCode((count >> 8) & 0xFF, count & 0xff);
+
+    // Next byte contains the offset size use to reference object in the file
+    // Actually we're using 0x04 to be sure to be able to store everything
+    // without thinking of it while coding.
+    data += '\x04';
+
+    // Add another offset after this one because we need a new offset
+    var relativeOffset = 1;
+    for (var i = 0; i < count + 1; i++) {
+      data += String.fromCharCode((relativeOffset >>> 24) & 0xFF,
+                                  (relativeOffset >> 16) & 0xFF,
+                                  (relativeOffset >> 8) & 0xFF,
+                                  relativeOffset & 0xFF);
+
+      if (objects[i])
+        relativeOffset += objects[i].length;
+    }
+
+    for (var i = 0; i < count; i++) {
+      for (var j = 0, jj = objects[i].length; j < jj; j++)
+        data += isByte ? String.fromCharCode(objects[i][j] & 0xFF) :
+                objects[i][j];
+    }
+    return data;
+  },
+
+  encodeNumber: function cff_encodeNumber(value) {
+    // some of the fonts has ouf-of-range values
+    // they are just arithmetic overflows
+    // make sanitizer happy
+    value |= 0;
+    if (value >= -32768 && value <= 32767) {
+      return '\x1c' +
+             String.fromCharCode((value >> 8) & 0xFF) +
+             String.fromCharCode(value & 0xFF);
+    } else {
+      return '\x1d' +
+             String.fromCharCode((value >> 24) & 0xFF) +
+             String.fromCharCode((value >> 16) & 0xFF) +
+             String.fromCharCode((value >> 8) & 0xFF) +
+             String.fromCharCode(value & 0xFF);
+    }
+  },
+
+  getOrderedCharStrings: function cff_getOrderedCharStrings(glyphs,
+                                                            properties) {
+    var charstrings = [];
+    var reverseMapping = {};
+    var encoding = properties.baseEncoding;
+    var i, length, glyphName;
+    for (i = 0, length = encoding.length; i < length; ++i) {
+      glyphName = encoding[i];
+      if (!glyphName || isSpecialUnicode(i))
+        continue;
+      reverseMapping[glyphName] = i;
+    }
+    reverseMapping['.notdef'] = 0;
+    var unusedUnicode = kCmapGlyphOffset;
+    for (i = 0, length = glyphs.length; i < length; i++) {
+      var item = glyphs[i];
+      var glyphName = item.glyph;
+      var unicode = glyphName in reverseMapping ?
+        reverseMapping[glyphName] : unusedUnicode++;
+      charstrings.push({
+        glyph: glyphName,
+        unicode: unicode,
+        gid: i,
+        charstring: item.data,
+        width: item.width,
+        lsb: item.lsb
+      });
+    }
+
+    charstrings.sort(function charstrings_sort(a, b) {
+      return a.unicode - b.unicode;
+    });
+    return charstrings;
+  },
+
+  getType2Charstrings: function cff_getType2Charstrings(type1Charstrings) {
+    var type2Charstrings = [];
+    var count = type1Charstrings.length;
+    for (var i = 0; i < count; i++) {
+      var charstring = type1Charstrings[i].charstring;
+      type2Charstrings.push(this.flattenCharstring(charstring.slice(),
+                                                   this.commandsMap));
+    }
+    return type2Charstrings;
+  },
+
+  getType2Subrs: function cff_getType2Subrs(type1Subrs) {
+    var bias = 0;
+    var count = type1Subrs.length;
+    if (count < 1240)
+      bias = 107;
+    else if (count < 33900)
+      bias = 1131;
+    else
+      bias = 32768;
+
+    // Add a bunch of empty subrs to deal with the Type2 bias
+    var type2Subrs = [];
+    for (var i = 0; i < bias; i++)
+      type2Subrs.push([0x0B]);
+
+    for (var i = 0; i < count; i++) {
+      var subr = type1Subrs[i];
+      if (!subr)
+        subr = [0x0B];
+
+      type2Subrs.push(this.flattenCharstring(subr, this.commandsMap));
+    }
+
+    return type2Subrs;
+  },
+
+  /*
+   * Flatten the commands by interpreting the postscript code and replacing
+   * every 'callsubr', 'callothersubr' by the real commands.
+   */
+  commandsMap: {
+    'hstem': 1,
+    'vstem': 3,
+    'vmoveto': 4,
+    'rlineto': 5,
+    'hlineto': 6,
+    'vlineto': 7,
+    'rrcurveto': 8,
+    'callsubr': 10,
+    'return': 11,
+    'sub': [12, 11],
+    'div': [12, 12],
+    'exch': [12, 28],
+    'flex': [12, 35],
+    'drop' : [12, 18],
+    'endchar': 14,
+    'rmoveto': 21,
+    'hmoveto': 22,
+    'vhcurveto': 30,
+    'hvcurveto': 31
+  },
+
+  flattenCharstring: function flattenCharstring(charstring, map) {
+    // charstring changes size - can't cache .length in loop
+    for (var i = 0; i < charstring.length; i++) {
+      var command = charstring[i];
+      if (command.charAt) {
+        var cmd = map[command];
+        assert(cmd, 'Unknow command: ' + command);
+
+        if (isArray(cmd))
+          charstring.splice(i++, 1, cmd[0], cmd[1]);
+        else
+          charstring[i] = cmd;
+      } else {
+        // Type1 charstring use a division for number above 32000
+        if (command > 32000) {
+          var divisor = charstring[i + 1];
+          command /= divisor;
+          charstring.splice(i, 3, 28, command >> 8, command & 0xff);
+        } else {
+          charstring.splice(i, 1, 28, command >> 8, command & 0xff);
+        }
+        i += 2;
+      }
+    }
+    return charstring;
+  },
+
+  wrap: function wrap(name, glyphs, charstrings, subrs, properties) {
+    var fields = {
+      // major version, minor version, header size, offset size
+      'header': '\x01\x00\x04\x04',
+
+      'names': this.createCFFIndexHeader([name]),
+
+      'topDict': (function topDict(self) {
+        return function cffWrapTopDict() {
+          var header = '\x00\x01\x01\x01';
+          var dict =
+              '\xf8\x1b\x00' + // version
+              '\xf8\x1c\x01' + // Notice
+              '\xf8\x1d\x02' + // FullName
+              '\xf8\x1e\x03' + // FamilyName
+              '\xf8\x1f\x04' +  // Weight
+              '\x1c\x00\x00\x10'; // Encoding
+
+          var boundingBox = properties.bbox;
+          for (var i = 0, ii = boundingBox.length; i < ii; i++)
+            dict += self.encodeNumber(boundingBox[i]);
+          dict += '\x05'; // FontBBox;
+
+          var offset = fields.header.length +
+                       fields.names.length +
+                       (header.length + 1) +
+                       (dict.length + (4 + 4)) +
+                       fields.strings.length +
+                       fields.globalSubrs.length;
+
+          // If the offset if over 32767, encodeNumber is going to return
+          // 5 bytes to encode the position instead of 3.
+          if ((offset + fields.charstrings.length) > 32767) {
+            offset += 9;
+          } else {
+            offset += 7;
+          }
+
+          dict += self.encodeNumber(offset) + '\x0f'; // Charset
+
+          offset = offset + (glyphs.length * 2) + 1;
+          dict += self.encodeNumber(offset) + '\x11'; // Charstrings
+
+          offset = offset + fields.charstrings.length;
+          dict += self.encodeNumber(fields.private.length);
+          dict += self.encodeNumber(offset) + '\x12'; // Private
+
+          return header + String.fromCharCode(dict.length + 1) + dict;
+        };
+      })(this),
+
+      'strings': (function strings(self) {
+        var strings = [
+          'Version 0.11',         // Version
+          'See original notice',  // Notice
+          name,                   // FullName
+          name,                   // FamilyName
+          'Medium'                // Weight
+        ];
+        return self.createCFFIndexHeader(strings);
+      })(this),
+
+      'globalSubrs': this.createCFFIndexHeader([]),
+
+      'charset': (function charset(self) {
+        var charsetString = '\x00'; // Encoding
+
+        var count = glyphs.length;
+        for (var i = 0; i < count; i++) {
+          var index = CFFStrings.indexOf(charstrings[i].glyph);
+          // Some characters like asterikmath && circlecopyrt are
+          // missing from the original strings, for the moment let's
+          // map them to .notdef and see later if it cause any
+          // problems
+          if (index == -1)
+            index = 0;
+
+          charsetString += String.fromCharCode(index >> 8, index & 0xff);
+        }
+        return charsetString;
+      })(this),
+
+      'charstrings': this.createCFFIndexHeader([[0x8B, 0x0E]].concat(glyphs),
+                                               true),
+
+      'private': (function cffWrapPrivate(self) {
+        var data =
+            '\x8b\x14' + // defaultWidth
+            '\x8b\x15';  // nominalWidth
+        var fieldMap = {
+          BlueValues: '\x06',
+          OtherBlues: '\x07',
+          FamilyBlues: '\x08',
+          FamilyOtherBlues: '\x09',
+          StemSnapH: '\x0c\x0c',
+          StemSnapV: '\x0c\x0d',
+          BlueShift: '\x0c\x0a',
+          BlueFuzz: '\x0c\x0b',
+          BlueScale: '\x0c\x09',
+          LanguageGroup: '\x0c\x11',
+          ExpansionFactor: '\x0c\x18'
+        };
+        for (var field in fieldMap) {
+          if (!properties.private.hasOwnProperty(field))
+            continue;
+          var value = properties.private[field];
+
+          if (isArray(value)) {
+            data += self.encodeNumber(value[0]);
+            for (var i = 1, ii = value.length; i < ii; i++)
+              data += self.encodeNumber(value[i] - value[i - 1]);
+          } else {
+            data += self.encodeNumber(value);
+          }
+          data += fieldMap[field];
+        }
+
+        data += self.encodeNumber(data.length + 4) + '\x13'; // Subrs offset
+
+        return data;
+      })(this),
+
+      'localSubrs': this.createCFFIndexHeader(subrs, true)
+    };
+    fields.topDict = fields.topDict();
+
+
+    var cff = [];
+    for (var index in fields) {
+      var field = fields[index];
+      for (var i = 0, ii = field.length; i < ii; i++)
+        cff.push(field.charCodeAt(i));
+    }
+
+    return cff;
+  }
+};
+
+var Type2CFF = (function type2CFF() {
+  // TODO: replace parsing code with the Type2Parser in font_utils.js
+  function constructor(file, properties) {
+    var bytes = file.getBytes();
+    this.bytes = bytes;
+    this.properties = properties;
+
+    this.data = this.parse();
+  }
+
+  constructor.prototype = {
+    parse: function cff_parse() {
+      var header = this.parseHeader();
+      var properties = this.properties;
+      var nameIndex = this.parseIndex(header.endPos);
+
+      var dictIndex = this.parseIndex(nameIndex.endPos);
+      if (dictIndex.length != 1)
+        error('CFF contains more than 1 font');
+
+      var stringIndex = this.parseIndex(dictIndex.endPos);
+      var gsubrIndex = this.parseIndex(stringIndex.endPos);
+
+      var strings = this.getStrings(stringIndex);
+
+      var baseDict = this.parseDict(dictIndex.get(0).data);
+      var topDict = this.getTopDict(baseDict, strings);
+
+      var bytes = this.bytes;
+
+      var privateDict = {};
+      var privateInfo = topDict.Private;
+      if (privateInfo) {
+        var privOffset = privateInfo[1], privLength = privateInfo[0];
+        var privBytes = bytes.subarray(privOffset, privOffset + privLength);
+        baseDict = this.parseDict(privBytes);
+        privateDict = this.getPrivDict(baseDict, strings);
+      } else {
+        privateDict.defaultWidthX = properties.defaultWidth;
+      }
+
+      var charStrings = this.parseIndex(topDict.CharStrings);
+      var charset = this.parseCharsets(topDict.charset,
+                                       charStrings.length, strings);
+      var encoding = this.parseEncoding(topDict.Encoding, properties,
+                                             strings, charset);
+
+      var charset, encoding;
+      var isCIDFont = properties.subtype == 'CIDFontType0C';
+      if (isCIDFont) {
+        charset = [];
+        charset.length = charStrings.length;
+        encoding = this.parseCidMap(topDict.charset,
+                                    charStrings.length);
+      } else {
+        charset = this.parseCharsets(topDict.charset,
+                                     charStrings.length, strings);
+        encoding = this.parseEncoding(topDict.Encoding, properties,
+                                      strings, charset);
+      }
+
+      // The font sanitizer does not support CFF encoding with a
+      // supplement, since the encoding is not really use to map
+      // between gid to glyph, let's overwrite what is declared in
+      // the top dictionary to let the sanitizer think the font use
+      // StandardEncoding, that's a lie but that's ok.
+      if (encoding.hasSupplement)
+        bytes[topDict.Encoding] &= 0x7F;
+
+      // The CFF specification state that the 'dotsection' command
+      // (12, 0) is deprecated and treated as a no-op, but all Type2
+      // charstrings processors should support them. Unfortunately
+      // the font sanitizer don't. As a workaround the sequence (12, 0)
+      // is replaced by a useless (0, hmoveto).
+      var count = charStrings.length;
+      for (var i = 0; i < count; i++) {
+        var charstring = charStrings.get(i);
+
+        var start = charstring.start;
+        var data = charstring.data;
+        var length = data.length;
+        for (var j = 0; j <= length; j) {
+          var value = data[j++];
+          if (value == 12 && data[j++] == 0) {
+              bytes[start + j - 2] = 139;
+              bytes[start + j - 1] = 22;
+          } else if (value === 28) {
+            j += 2;
+          } else if (value >= 247 && value <= 254) {
+            j++;
+          } else if (value == 255) {
+            j += 4;
+          }
+        }
+      }
+
+      // charstrings contains info about glyphs (one element per glyph
+      // containing mappings for {unicode, width})
+      var charstrings = this.getCharStrings(charset, encoding.encoding,
+                                            privateDict, this.properties);
+
+      // create the mapping between charstring and glyph id
+      var glyphIds = [];
+      for (var i = 0, ii = charstrings.length; i < ii; i++)
+        glyphIds.push(charstrings[i].gid);
+
+      this.charstrings = charstrings;
+      this.glyphIds = glyphIds;
+
+      var data = [];
+      for (var i = 0, ii = bytes.length; i < ii; ++i)
+        data.push(bytes[i]);
+      return data;
+    },
+
+    getCharStrings: function cff_charstrings(charsets, encoding,
+                                             privateDict, properties) {
+      var charstrings = [];
+      var unicodeUsed = [];
+      var unassignedUnicodeItems = [];
+      for (var i = 0, ii = charsets.length; i < ii; i++) {
+        var glyph = charsets[i];
+        var encodingFound = false;
+        for (var charcode in encoding) {
+          if (encoding[charcode] == i) {
+            var code = charcode | 0;
+            charstrings.push({
+              unicode: adaptUnicode(code),
+              code: code,
+              gid: i,
+              glyph: glyph
+            });
+            unicodeUsed[code] = true;
+            encodingFound = true;
+            break;
+          }
+        }
+        if (!encodingFound) {
+          unassignedUnicodeItems.push(i);
+        }
+      }
+
+      var nextUnusedUnicode = 0x21;
+      for (var j = 0, jj = unassignedUnicodeItems.length; j < jj; ++j) {
+        var i = unassignedUnicodeItems[j];
+        // giving unicode value anyway
+        while (unicodeUsed[nextUnusedUnicode])
+          nextUnusedUnicode++;
+        var code = nextUnusedUnicode++;
+        charstrings.push({
+          unicode: adaptUnicode(code),
+          code: code,
+          gid: i,
+          glyph: charsets[i]
+        });
+      }
+
+      // sort the array by the unicode value (again)
+      charstrings.sort(function type2CFFGetCharStringsSort(a, b) {
+        return a.unicode - b.unicode;
+      });
+      return charstrings;
+    },
+
+    parseEncoding: function cff_parseencoding(pos, properties, strings,
+                                              charset) {
+      var encoding = {};
+      var bytes = this.bytes;
+      var result = {
+        encoding: encoding,
+        hasSupplement: false
+      };
+
+      function readSupplement() {
+        var supplementsCount = bytes[pos++];
+        for (var i = 0; i < supplementsCount; i++) {
+          var code = bytes[pos++];
+          var sid = (bytes[pos++] << 8) + (bytes[pos++] & 0xff);
+          encoding[code] = properties.differences.indexOf(strings[sid]);
+        }
+      }
+
+      if (pos == 0 || pos == 1) {
+        var gid = 1;
+        var baseEncoding = pos ? Encodings.ExpertEncoding :
+                                 Encodings.StandardEncoding;
+        for (var i = 0, ii = charset.length; i < ii; i++) {
+          var index = baseEncoding.indexOf(charset[i]);
+          if (index != -1)
+            encoding[index] = gid++;
+        }
+      } else {
+        var format = bytes[pos++];
+        switch (format & 0x7f) {
+          case 0:
+            var glyphsCount = bytes[pos++];
+            for (var i = 1; i <= glyphsCount; i++)
+              encoding[bytes[pos++]] = i;
+            break;
+
+          case 1:
+            var rangesCount = bytes[pos++];
+            var gid = 1;
+            for (var i = 0; i < rangesCount; i++) {
+              var start = bytes[pos++];
+              var left = bytes[pos++];
+              for (var j = start; j <= start + left; j++)
+                encoding[j] = gid++;
+            }
+            break;
+
+          default:
+            error('Unknow encoding format: ' + format + ' in CFF');
+            break;
+        }
+        if (format & 0x80) {
+          readSupplement();
+          result.hasSupplement = true;
+        }
+      }
+      return result;
+    },
+
+    parseCharsets: function cff_parsecharsets(pos, length, strings) {
+      if (pos == 0) {
+        return ISOAdobeCharset.slice();
+      } else if (pos == 1) {
+        return ExpertCharset.slice();
+      } else if (pos == 2) {
+        return ExpertSubsetCharset.slice();
+      }
+
+      var bytes = this.bytes;
+      var format = bytes[pos++];
+      var charset = ['.notdef'];
+
+      // subtract 1 for the .notdef glyph
+      length -= 1;
+
+      switch (format) {
+        case 0:
+          for (var i = 0; i < length; i++) {
+            var sid = (bytes[pos++] << 8) | bytes[pos++];
+            charset.push(strings[sid]);
+          }
+          break;
+        case 1:
+          while (charset.length <= length) {
+            var sid = (bytes[pos++] << 8) | bytes[pos++];
+            var count = bytes[pos++];
+            for (var i = 0; i <= count; i++)
+              charset.push(strings[sid++]);
+          }
+          break;
+        case 2:
+          while (charset.length <= length) {
+            var sid = (bytes[pos++] << 8) | bytes[pos++];
+            var count = (bytes[pos++] << 8) | bytes[pos++];
+            for (var i = 0; i <= count; i++)
+              charset.push(strings[sid++]);
+          }
+          break;
+        default:
+          error('Unknown charset format');
+      }
+      return charset;
+    },
+
+    parseCidMap: function cff_parsecharsets(pos, length) {
+      var bytes = this.bytes;
+      var format = bytes[pos++];
+
+      var encoding = {};
+      var map = {encoding: encoding};
+
+      encoding[0] = 0;
+
+      var gid = 1;
+      switch (format) {
+        case 0:
+          while (gid < length) {
+            var cid = (bytes[pos++] << 8) | bytes[pos++];
+            encoding[cid] = gid++;
+          }
+          break;
+        case 1:
+          while (gid < length) {
+            var cid = (bytes[pos++] << 8) | bytes[pos++];
+            var count = bytes[pos++];
+            for (var i = 0; i <= count; i++)
+              encoding[cid++] = gid++;
+          }
+          break;
+        case 2:
+          while (gid < length) {
+            var cid = (bytes[pos++] << 8) | bytes[pos++];
+            var count = (bytes[pos++] << 8) | bytes[pos++];
+            for (var i = 0; i <= count; i++)
+              encoding[cid++] = gid++;
+          }
+          break;
+        default:
+          error('Unknown charset format');
+      }
+      return map;
+    },
+
+    getPrivDict: function cff_getprivdict(baseDict, strings) {
+      var dict = {};
+
+      // default values
+      dict['defaultWidthX'] = 0;
+      dict['nominalWidthX'] = 0;
+
+      for (var i = 0, ii = baseDict.length; i < ii; ++i) {
+        var pair = baseDict[i];
+        var key = pair[0];
+        var value = pair[1];
+        switch (key) {
+          case 20:
+            dict['defaultWidthX'] = value[0];
+          case 21:
+            dict['nominalWidthX'] = value[0];
+          default:
+            TODO('interpret top dict key: ' + key);
+        }
+      }
+      return dict;
+    },
+    getTopDict: function cff_gettopdict(baseDict, strings) {
+      var dict = {};
+
+      // default values
+      dict['Encoding'] = 0;
+      dict['charset'] = 0;
+
+      for (var i = 0, ii = baseDict.length; i < ii; ++i) {
+        var pair = baseDict[i];
+        var key = pair[0];
+        var value = pair[1];
+        switch (key) {
+          case 1:
+            dict['Notice'] = strings[value[0]];
+            break;
+          case 4:
+            dict['Weight'] = strings[value[0]];
+            break;
+          case 3094:
+            dict['BaseFontName'] = strings[value[0]];
+            break;
+          case 5:
+            dict['FontBBox'] = value;
+            break;
+          case 13:
+            dict['UniqueID'] = value[0];
+            break;
+          case 15:
+            dict['charset'] = value[0];
+            break;
+          case 16:
+            dict['Encoding'] = value[0];
+            break;
+          case 17:
+            dict['CharStrings'] = value[0];
+            break;
+          case 18:
+            dict['Private'] = value;
+            break;
+          case 3102:
+          case 3103:
+          case 3104:
+          case 3105:
+          case 3106:
+          case 3107:
+          case 3108:
+          case 3109:
+          case 3110:
+            dict['cidOperatorPresent'] = true;
+            break;
+          default:
+            TODO('interpret top dict key');
+        }
+      }
+      return dict;
+    },
+    getStrings: function cff_getStrings(stringIndex) {
+      function bytesToString(bytesArray) {
+        var str = '';
+        for (var i = 0, ii = bytesArray.length; i < ii; i++)
+          str += String.fromCharCode(bytesArray[i]);
+        return str;
+      }
+
+      var stringArray = [];
+      for (var i = 0, ii = CFFStrings.length; i < ii; i++)
+        stringArray.push(CFFStrings[i]);
+
+      for (var i = 0, ii = stringIndex.length; i < ii; i++)
+        stringArray.push(bytesToString(stringIndex.get(i).data));
+
+      return stringArray;
+    },
+    parseHeader: function cff_parseHeader() {
+      var bytes = this.bytes;
+      var offset = 0;
+
+      while (bytes[offset] != 1)
+        ++offset;
+
+      if (offset != 0) {
+        warning('cff data is shifted');
+        bytes = bytes.subarray(offset);
+        this.bytes = bytes;
+      }
+
+      return {
+        endPos: bytes[2],
+        offsetSize: bytes[3]
+      };
+    },
+    parseDict: function cff_parseDict(dict) {
+      var pos = 0;
+
+      function parseOperand() {
+        var value = dict[pos++];
+        if (value === 30) {
+          return parseFloatOperand(pos);
+        } else if (value === 28) {
+          value = dict[pos++];
+          value = (value << 8) | dict[pos++];
+          return value;
+        } else if (value === 29) {
+          value = dict[pos++];
+          value = (value << 8) | dict[pos++];
+          value = (value << 8) | dict[pos++];
+          value = (value << 8) | dict[pos++];
+          return value;
+        } else if (value <= 246) {
+          return value - 139;
+        } else if (value <= 250) {
+          return ((value - 247) * 256) + dict[pos++] + 108;
+        } else if (value <= 254) {
+          return -((value - 251) * 256) - dict[pos++] - 108;
+        } else {
+          error('255 is not a valid DICT command');
+        }
+        return -1;
+      }
+
+      function parseFloatOperand() {
+        var str = '';
+        var eof = 15;
+        var lookup = ['0', '1', '2', '3', '4', '5', '6', '7', '8',
+            '9', '.', 'E', 'E-', null, '-'];
+        var length = dict.length;
+        while (pos < length) {
+          var b = dict[pos++];
+          var b1 = b >> 4;
+          var b2 = b & 15;
+
+          if (b1 == eof)
+            break;
+          str += lookup[b1];
+
+          if (b2 == eof)
+            break;
+          str += lookup[b2];
+        }
+        return parseFloat(str);
+      }
+
+      var operands = [];
+      var entries = [];
+
+      var pos = 0;
+      var end = dict.length;
+      while (pos < end) {
+        var b = dict[pos];
+        if (b <= 21) {
+          if (b === 12) {
+            ++pos;
+            var op = dict[pos];
+            if ((op > 14 && op < 17) ||
+                (op > 23 && op < 30) || op > 38) {
+              warn('Invalid CFF dictionary key: ' + op);
+              // trying to replace it with initialRandomSeed
+              // to pass sanitizer
+              dict[pos] = 19;
+            }
+            var b = (b << 8) | op;
+          }
+          if (!operands.length && b == 8 &&
+              dict[pos + 1] == 9) {
+            // no operands for FamilyBlues, removing the key
+            // and next one is FamilyOtherBlues - skipping them
+            // also replacing FamilyBlues to pass sanitizer
+            dict[pos] = 139;
+            pos += 2;
+            continue;
+          }
+          entries.push([b, operands]);
+          operands = [];
+          ++pos;
+        } else {
+          operands.push(parseOperand());
+        }
+      }
+      return entries;
+    },
+    parseIndex: function cff_parseIndex(pos) {
+      var bytes = this.bytes;
+      var count = bytes[pos++] << 8 | bytes[pos++];
+      var offsets = [];
+      var end = pos;
+
+      if (count != 0) {
+        var offsetSize = bytes[pos++];
+        // add 1 for offset to determine size of last object
+        var startPos = pos + ((count + 1) * offsetSize) - 1;
+
+        for (var i = 0, ii = count + 1; i < ii; ++i) {
+          var offset = 0;
+          for (var j = 0; j < offsetSize; ++j) {
+            offset <<= 8;
+            offset += bytes[pos++];
+          }
+          offsets.push(startPos + offset);
+        }
+        end = offsets[count];
+      }
+
+      return {
+        get: function index_get(index) {
+          if (index >= count)
+            return null;
+
+          var start = offsets[index];
+          var end = offsets[index + 1];
+          return {
+            start: start,
+            end: end,
+            data: bytes.subarray(start, end)
+          };
+        },
+        length: count,
+        endPos: end
+      };
+    }
+  };
+
+  return constructor;
+})();
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var GlyphsUnicode = {
+  A: 0x0041,
+  AE: 0x00C6,
+  AEacute: 0x01FC,
+  AEmacron: 0x01E2,
+  AEsmall: 0xF7E6,
+  Aacute: 0x00C1,
+  Aacutesmall: 0xF7E1,
+  Abreve: 0x0102,
+  Abreveacute: 0x1EAE,
+  Abrevecyrillic: 0x04D0,
+  Abrevedotbelow: 0x1EB6,
+  Abrevegrave: 0x1EB0,
+  Abrevehookabove: 0x1EB2,
+  Abrevetilde: 0x1EB4,
+  Acaron: 0x01CD,
+  Acircle: 0x24B6,
+  Acircumflex: 0x00C2,
+  Acircumflexacute: 0x1EA4,
+  Acircumflexdotbelow: 0x1EAC,
+  Acircumflexgrave: 0x1EA6,
+  Acircumflexhookabove: 0x1EA8,
+  Acircumflexsmall: 0xF7E2,
+  Acircumflextilde: 0x1EAA,
+  Acute: 0xF6C9,
+  Acutesmall: 0xF7B4,
+  Acyrillic: 0x0410,
+  Adblgrave: 0x0200,
+  Adieresis: 0x00C4,
+  Adieresiscyrillic: 0x04D2,
+  Adieresismacron: 0x01DE,
+  Adieresissmall: 0xF7E4,
+  Adotbelow: 0x1EA0,
+  Adotmacron: 0x01E0,
+  Agrave: 0x00C0,
+  Agravesmall: 0xF7E0,
+  Ahookabove: 0x1EA2,
+  Aiecyrillic: 0x04D4,
+  Ainvertedbreve: 0x0202,
+  Alpha: 0x0391,
+  Alphatonos: 0x0386,
+  Amacron: 0x0100,
+  Amonospace: 0xFF21,
+  Aogonek: 0x0104,
+  Aring: 0x00C5,
+  Aringacute: 0x01FA,
+  Aringbelow: 0x1E00,
+  Aringsmall: 0xF7E5,
+  Asmall: 0xF761,
+  Atilde: 0x00C3,
+  Atildesmall: 0xF7E3,
+  Aybarmenian: 0x0531,
+  B: 0x0042,
+  Bcircle: 0x24B7,
+  Bdotaccent: 0x1E02,
+  Bdotbelow: 0x1E04,
+  Becyrillic: 0x0411,
+  Benarmenian: 0x0532,
+  Beta: 0x0392,
+  Bhook: 0x0181,
+  Blinebelow: 0x1E06,
+  Bmonospace: 0xFF22,
+  Brevesmall: 0xF6F4,
+  Bsmall: 0xF762,
+  Btopbar: 0x0182,
+  C: 0x0043,
+  Caarmenian: 0x053E,
+  Cacute: 0x0106,
+  Caron: 0xF6CA,
+  Caronsmall: 0xF6F5,
+  Ccaron: 0x010C,
+  Ccedilla: 0x00C7,
+  Ccedillaacute: 0x1E08,
+  Ccedillasmall: 0xF7E7,
+  Ccircle: 0x24B8,
+  Ccircumflex: 0x0108,
+  Cdot: 0x010A,
+  Cdotaccent: 0x010A,
+  Cedillasmall: 0xF7B8,
+  Chaarmenian: 0x0549,
+  Cheabkhasiancyrillic: 0x04BC,
+  Checyrillic: 0x0427,
+  Chedescenderabkhasiancyrillic: 0x04BE,
+  Chedescendercyrillic: 0x04B6,
+  Chedieresiscyrillic: 0x04F4,
+  Cheharmenian: 0x0543,
+  Chekhakassiancyrillic: 0x04CB,
+  Cheverticalstrokecyrillic: 0x04B8,
+  Chi: 0x03A7,
+  Chook: 0x0187,
+  Circumflexsmall: 0xF6F6,
+  Cmonospace: 0xFF23,
+  Coarmenian: 0x0551,
+  Csmall: 0xF763,
+  D: 0x0044,
+  DZ: 0x01F1,
+  DZcaron: 0x01C4,
+  Daarmenian: 0x0534,
+  Dafrican: 0x0189,
+  Dcaron: 0x010E,
+  Dcedilla: 0x1E10,
+  Dcircle: 0x24B9,
+  Dcircumflexbelow: 0x1E12,
+  Dcroat: 0x0110,
+  Ddotaccent: 0x1E0A,
+  Ddotbelow: 0x1E0C,
+  Decyrillic: 0x0414,
+  Deicoptic: 0x03EE,
+  Delta: 0x2206,
+  Deltagreek: 0x0394,
+  Dhook: 0x018A,
+  Dieresis: 0xF6CB,
+  DieresisAcute: 0xF6CC,
+  DieresisGrave: 0xF6CD,
+  Dieresissmall: 0xF7A8,
+  Digammagreek: 0x03DC,
+  Djecyrillic: 0x0402,
+  Dlinebelow: 0x1E0E,
+  Dmonospace: 0xFF24,
+  Dotaccentsmall: 0xF6F7,
+  Dslash: 0x0110,
+  Dsmall: 0xF764,
+  Dtopbar: 0x018B,
+  Dz: 0x01F2,
+  Dzcaron: 0x01C5,
+  Dzeabkhasiancyrillic: 0x04E0,
+  Dzecyrillic: 0x0405,
+  Dzhecyrillic: 0x040F,
+  E: 0x0045,
+  Eacute: 0x00C9,
+  Eacutesmall: 0xF7E9,
+  Ebreve: 0x0114,
+  Ecaron: 0x011A,
+  Ecedillabreve: 0x1E1C,
+  Echarmenian: 0x0535,
+  Ecircle: 0x24BA,
+  Ecircumflex: 0x00CA,
+  Ecircumflexacute: 0x1EBE,
+  Ecircumflexbelow: 0x1E18,
+  Ecircumflexdotbelow: 0x1EC6,
+  Ecircumflexgrave: 0x1EC0,
+  Ecircumflexhookabove: 0x1EC2,
+  Ecircumflexsmall: 0xF7EA,
+  Ecircumflextilde: 0x1EC4,
+  Ecyrillic: 0x0404,
+  Edblgrave: 0x0204,
+  Edieresis: 0x00CB,
+  Edieresissmall: 0xF7EB,
+  Edot: 0x0116,
+  Edotaccent: 0x0116,
+  Edotbelow: 0x1EB8,
+  Efcyrillic: 0x0424,
+  Egrave: 0x00C8,
+  Egravesmall: 0xF7E8,
+  Eharmenian: 0x0537,
+  Ehookabove: 0x1EBA,
+  Eightroman: 0x2167,
+  Einvertedbreve: 0x0206,
+  Eiotifiedcyrillic: 0x0464,
+  Elcyrillic: 0x041B,
+  Elevenroman: 0x216A,
+  Emacron: 0x0112,
+  Emacronacute: 0x1E16,
+  Emacrongrave: 0x1E14,
+  Emcyrillic: 0x041C,
+  Emonospace: 0xFF25,
+  Encyrillic: 0x041D,
+  Endescendercyrillic: 0x04A2,
+  Eng: 0x014A,
+  Enghecyrillic: 0x04A4,
+  Enhookcyrillic: 0x04C7,
+  Eogonek: 0x0118,
+  Eopen: 0x0190,
+  Epsilon: 0x0395,
+  Epsilontonos: 0x0388,
+  Ercyrillic: 0x0420,
+  Ereversed: 0x018E,
+  Ereversedcyrillic: 0x042D,
+  Escyrillic: 0x0421,
+  Esdescendercyrillic: 0x04AA,
+  Esh: 0x01A9,
+  Esmall: 0xF765,
+  Eta: 0x0397,
+  Etarmenian: 0x0538,
+  Etatonos: 0x0389,
+  Eth: 0x00D0,
+  Ethsmall: 0xF7F0,
+  Etilde: 0x1EBC,
+  Etildebelow: 0x1E1A,
+  Euro: 0x20AC,
+  Ezh: 0x01B7,
+  Ezhcaron: 0x01EE,
+  Ezhreversed: 0x01B8,
+  F: 0x0046,
+  Fcircle: 0x24BB,
+  Fdotaccent: 0x1E1E,
+  Feharmenian: 0x0556,
+  Feicoptic: 0x03E4,
+  Fhook: 0x0191,
+  Fitacyrillic: 0x0472,
+  Fiveroman: 0x2164,
+  Fmonospace: 0xFF26,
+  Fourroman: 0x2163,
+  Fsmall: 0xF766,
+  G: 0x0047,
+  GBsquare: 0x3387,
+  Gacute: 0x01F4,
+  Gamma: 0x0393,
+  Gammaafrican: 0x0194,
+  Gangiacoptic: 0x03EA,
+  Gbreve: 0x011E,
+  Gcaron: 0x01E6,
+  Gcedilla: 0x0122,
+  Gcircle: 0x24BC,
+  Gcircumflex: 0x011C,
+  Gcommaaccent: 0x0122,
+  Gdot: 0x0120,
+  Gdotaccent: 0x0120,
+  Gecyrillic: 0x0413,
+  Ghadarmenian: 0x0542,
+  Ghemiddlehookcyrillic: 0x0494,
+  Ghestrokecyrillic: 0x0492,
+  Gheupturncyrillic: 0x0490,
+  Ghook: 0x0193,
+  Gimarmenian: 0x0533,
+  Gjecyrillic: 0x0403,
+  Gmacron: 0x1E20,
+  Gmonospace: 0xFF27,
+  Grave: 0xF6CE,
+  Gravesmall: 0xF760,
+  Gsmall: 0xF767,
+  Gsmallhook: 0x029B,
+  Gstroke: 0x01E4,
+  H: 0x0048,
+  H18533: 0x25CF,
+  H18543: 0x25AA,
+  H18551: 0x25AB,
+  H22073: 0x25A1,
+  HPsquare: 0x33CB,
+  Haabkhasiancyrillic: 0x04A8,
+  Hadescendercyrillic: 0x04B2,
+  Hardsigncyrillic: 0x042A,
+  Hbar: 0x0126,
+  Hbrevebelow: 0x1E2A,
+  Hcedilla: 0x1E28,
+  Hcircle: 0x24BD,
+  Hcircumflex: 0x0124,
+  Hdieresis: 0x1E26,
+  Hdotaccent: 0x1E22,
+  Hdotbelow: 0x1E24,
+  Hmonospace: 0xFF28,
+  Hoarmenian: 0x0540,
+  Horicoptic: 0x03E8,
+  Hsmall: 0xF768,
+  Hungarumlaut: 0xF6CF,
+  Hungarumlautsmall: 0xF6F8,
+  Hzsquare: 0x3390,
+  I: 0x0049,
+  IAcyrillic: 0x042F,
+  IJ: 0x0132,
+  IUcyrillic: 0x042E,
+  Iacute: 0x00CD,
+  Iacutesmall: 0xF7ED,
+  Ibreve: 0x012C,
+  Icaron: 0x01CF,
+  Icircle: 0x24BE,
+  Icircumflex: 0x00CE,
+  Icircumflexsmall: 0xF7EE,
+  Icyrillic: 0x0406,
+  Idblgrave: 0x0208,
+  Idieresis: 0x00CF,
+  Idieresisacute: 0x1E2E,
+  Idieresiscyrillic: 0x04E4,
+  Idieresissmall: 0xF7EF,
+  Idot: 0x0130,
+  Idotaccent: 0x0130,
+  Idotbelow: 0x1ECA,
+  Iebrevecyrillic: 0x04D6,
+  Iecyrillic: 0x0415,
+  Ifraktur: 0x2111,
+  Igrave: 0x00CC,
+  Igravesmall: 0xF7EC,
+  Ihookabove: 0x1EC8,
+  Iicyrillic: 0x0418,
+  Iinvertedbreve: 0x020A,
+  Iishortcyrillic: 0x0419,
+  Imacron: 0x012A,
+  Imacroncyrillic: 0x04E2,
+  Imonospace: 0xFF29,
+  Iniarmenian: 0x053B,
+  Iocyrillic: 0x0401,
+  Iogonek: 0x012E,
+  Iota: 0x0399,
+  Iotaafrican: 0x0196,
+  Iotadieresis: 0x03AA,
+  Iotatonos: 0x038A,
+  Ismall: 0xF769,
+  Istroke: 0x0197,
+  Itilde: 0x0128,
+  Itildebelow: 0x1E2C,
+  Izhitsacyrillic: 0x0474,
+  Izhitsadblgravecyrillic: 0x0476,
+  J: 0x004A,
+  Jaarmenian: 0x0541,
+  Jcircle: 0x24BF,
+  Jcircumflex: 0x0134,
+  Jecyrillic: 0x0408,
+  Jheharmenian: 0x054B,
+  Jmonospace: 0xFF2A,
+  Jsmall: 0xF76A,
+  K: 0x004B,
+  KBsquare: 0x3385,
+  KKsquare: 0x33CD,
+  Kabashkircyrillic: 0x04A0,
+  Kacute: 0x1E30,
+  Kacyrillic: 0x041A,
+  Kadescendercyrillic: 0x049A,
+  Kahookcyrillic: 0x04C3,
+  Kappa: 0x039A,
+  Kastrokecyrillic: 0x049E,
+  Kaverticalstrokecyrillic: 0x049C,
+  Kcaron: 0x01E8,
+  Kcedilla: 0x0136,
+  Kcircle: 0x24C0,
+  Kcommaaccent: 0x0136,
+  Kdotbelow: 0x1E32,
+  Keharmenian: 0x0554,
+  Kenarmenian: 0x053F,
+  Khacyrillic: 0x0425,
+  Kheicoptic: 0x03E6,
+  Khook: 0x0198,
+  Kjecyrillic: 0x040C,
+  Klinebelow: 0x1E34,
+  Kmonospace: 0xFF2B,
+  Koppacyrillic: 0x0480,
+  Koppagreek: 0x03DE,
+  Ksicyrillic: 0x046E,
+  Ksmall: 0xF76B,
+  L: 0x004C,
+  LJ: 0x01C7,
+  LL: 0xF6BF,
+  Lacute: 0x0139,
+  Lambda: 0x039B,
+  Lcaron: 0x013D,
+  Lcedilla: 0x013B,
+  Lcircle: 0x24C1,
+  Lcircumflexbelow: 0x1E3C,
+  Lcommaaccent: 0x013B,
+  Ldot: 0x013F,
+  Ldotaccent: 0x013F,
+  Ldotbelow: 0x1E36,
+  Ldotbelowmacron: 0x1E38,
+  Liwnarmenian: 0x053C,
+  Lj: 0x01C8,
+  Ljecyrillic: 0x0409,
+  Llinebelow: 0x1E3A,
+  Lmonospace: 0xFF2C,
+  Lslash: 0x0141,
+  Lslashsmall: 0xF6F9,
+  Lsmall: 0xF76C,
+  M: 0x004D,
+  MBsquare: 0x3386,
+  Macron: 0xF6D0,
+  Macronsmall: 0xF7AF,
+  Macute: 0x1E3E,
+  Mcircle: 0x24C2,
+  Mdotaccent: 0x1E40,
+  Mdotbelow: 0x1E42,
+  Menarmenian: 0x0544,
+  Mmonospace: 0xFF2D,
+  Msmall: 0xF76D,
+  Mturned: 0x019C,
+  Mu: 0x039C,
+  N: 0x004E,
+  NJ: 0x01CA,
+  Nacute: 0x0143,
+  Ncaron: 0x0147,
+  Ncedilla: 0x0145,
+  Ncircle: 0x24C3,
+  Ncircumflexbelow: 0x1E4A,
+  Ncommaaccent: 0x0145,
+  Ndotaccent: 0x1E44,
+  Ndotbelow: 0x1E46,
+  Nhookleft: 0x019D,
+  Nineroman: 0x2168,
+  Nj: 0x01CB,
+  Njecyrillic: 0x040A,
+  Nlinebelow: 0x1E48,
+  Nmonospace: 0xFF2E,
+  Nowarmenian: 0x0546,
+  Nsmall: 0xF76E,
+  Ntilde: 0x00D1,
+  Ntildesmall: 0xF7F1,
+  Nu: 0x039D,
+  O: 0x004F,
+  OE: 0x0152,
+  OEsmall: 0xF6FA,
+  Oacute: 0x00D3,
+  Oacutesmall: 0xF7F3,
+  Obarredcyrillic: 0x04E8,
+  Obarreddieresiscyrillic: 0x04EA,
+  Obreve: 0x014E,
+  Ocaron: 0x01D1,
+  Ocenteredtilde: 0x019F,
+  Ocircle: 0x24C4,
+  Ocircumflex: 0x00D4,
+  Ocircumflexacute: 0x1ED0,
+  Ocircumflexdotbelow: 0x1ED8,
+  Ocircumflexgrave: 0x1ED2,
+  Ocircumflexhookabove: 0x1ED4,
+  Ocircumflexsmall: 0xF7F4,
+  Ocircumflextilde: 0x1ED6,
+  Ocyrillic: 0x041E,
+  Odblacute: 0x0150,
+  Odblgrave: 0x020C,
+  Odieresis: 0x00D6,
+  Odieresiscyrillic: 0x04E6,
+  Odieresissmall: 0xF7F6,
+  Odotbelow: 0x1ECC,
+  Ogoneksmall: 0xF6FB,
+  Ograve: 0x00D2,
+  Ogravesmall: 0xF7F2,
+  Oharmenian: 0x0555,
+  Ohm: 0x2126,
+  Ohookabove: 0x1ECE,
+  Ohorn: 0x01A0,
+  Ohornacute: 0x1EDA,
+  Ohorndotbelow: 0x1EE2,
+  Ohorngrave: 0x1EDC,
+  Ohornhookabove: 0x1EDE,
+  Ohorntilde: 0x1EE0,
+  Ohungarumlaut: 0x0150,
+  Oi: 0x01A2,
+  Oinvertedbreve: 0x020E,
+  Omacron: 0x014C,
+  Omacronacute: 0x1E52,
+  Omacrongrave: 0x1E50,
+  Omega: 0x2126,
+  Omegacyrillic: 0x0460,
+  Omegagreek: 0x03A9,
+  Omegaroundcyrillic: 0x047A,
+  Omegatitlocyrillic: 0x047C,
+  Omegatonos: 0x038F,
+  Omicron: 0x039F,
+  Omicrontonos: 0x038C,
+  Omonospace: 0xFF2F,
+  Oneroman: 0x2160,
+  Oogonek: 0x01EA,
+  Oogonekmacron: 0x01EC,
+  Oopen: 0x0186,
+  Oslash: 0x00D8,
+  Oslashacute: 0x01FE,
+  Oslashsmall: 0xF7F8,
+  Osmall: 0xF76F,
+  Ostrokeacute: 0x01FE,
+  Otcyrillic: 0x047E,
+  Otilde: 0x00D5,
+  Otildeacute: 0x1E4C,
+  Otildedieresis: 0x1E4E,
+  Otildesmall: 0xF7F5,
+  P: 0x0050,
+  Pacute: 0x1E54,
+  Pcircle: 0x24C5,
+  Pdotaccent: 0x1E56,
+  Pecyrillic: 0x041F,
+  Peharmenian: 0x054A,
+  Pemiddlehookcyrillic: 0x04A6,
+  Phi: 0x03A6,
+  Phook: 0x01A4,
+  Pi: 0x03A0,
+  Piwrarmenian: 0x0553,
+  Pmonospace: 0xFF30,
+  Psi: 0x03A8,
+  Psicyrillic: 0x0470,
+  Psmall: 0xF770,
+  Q: 0x0051,
+  Qcircle: 0x24C6,
+  Qmonospace: 0xFF31,
+  Qsmall: 0xF771,
+  R: 0x0052,
+  Raarmenian: 0x054C,
+  Racute: 0x0154,
+  Rcaron: 0x0158,
+  Rcedilla: 0x0156,
+  Rcircle: 0x24C7,
+  Rcommaaccent: 0x0156,
+  Rdblgrave: 0x0210,
+  Rdotaccent: 0x1E58,
+  Rdotbelow: 0x1E5A,
+  Rdotbelowmacron: 0x1E5C,
+  Reharmenian: 0x0550,
+  Rfraktur: 0x211C,
+  Rho: 0x03A1,
+  Ringsmall: 0xF6FC,
+  Rinvertedbreve: 0x0212,
+  Rlinebelow: 0x1E5E,
+  Rmonospace: 0xFF32,
+  Rsmall: 0xF772,
+  Rsmallinverted: 0x0281,
+  Rsmallinvertedsuperior: 0x02B6,
+  S: 0x0053,
+  SF010000: 0x250C,
+  SF020000: 0x2514,
+  SF030000: 0x2510,
+  SF040000: 0x2518,
+  SF050000: 0x253C,
+  SF060000: 0x252C,
+  SF070000: 0x2534,
+  SF080000: 0x251C,
+  SF090000: 0x2524,
+  SF100000: 0x2500,
+  SF110000: 0x2502,
+  SF190000: 0x2561,
+  SF200000: 0x2562,
+  SF210000: 0x2556,
+  SF220000: 0x2555,
+  SF230000: 0x2563,
+  SF240000: 0x2551,
+  SF250000: 0x2557,
+  SF260000: 0x255D,
+  SF270000: 0x255C,
+  SF280000: 0x255B,
+  SF360000: 0x255E,
+  SF370000: 0x255F,
+  SF380000: 0x255A,
+  SF390000: 0x2554,
+  SF400000: 0x2569,
+  SF410000: 0x2566,
+  SF420000: 0x2560,
+  SF430000: 0x2550,
+  SF440000: 0x256C,
+  SF450000: 0x2567,
+  SF460000: 0x2568,
+  SF470000: 0x2564,
+  SF480000: 0x2565,
+  SF490000: 0x2559,
+  SF500000: 0x2558,
+  SF510000: 0x2552,
+  SF520000: 0x2553,
+  SF530000: 0x256B,
+  SF540000: 0x256A,
+  Sacute: 0x015A,
+  Sacutedotaccent: 0x1E64,
+  Sampigreek: 0x03E0,
+  Scaron: 0x0160,
+  Scarondotaccent: 0x1E66,
+  Scaronsmall: 0xF6FD,
+  Scedilla: 0x015E,
+  Schwa: 0x018F,
+  Schwacyrillic: 0x04D8,
+  Schwadieresiscyrillic: 0x04DA,
+  Scircle: 0x24C8,
+  Scircumflex: 0x015C,
+  Scommaaccent: 0x0218,
+  Sdotaccent: 0x1E60,
+  Sdotbelow: 0x1E62,
+  Sdotbelowdotaccent: 0x1E68,
+  Seharmenian: 0x054D,
+  Sevenroman: 0x2166,
+  Shaarmenian: 0x0547,
+  Shacyrillic: 0x0428,
+  Shchacyrillic: 0x0429,
+  Sheicoptic: 0x03E2,
+  Shhacyrillic: 0x04BA,
+  Shimacoptic: 0x03EC,
+  Sigma: 0x03A3,
+  Sixroman: 0x2165,
+  Smonospace: 0xFF33,
+  Softsigncyrillic: 0x042C,
+  Ssmall: 0xF773,
+  Stigmagreek: 0x03DA,
+  T: 0x0054,
+  Tau: 0x03A4,
+  Tbar: 0x0166,
+  Tcaron: 0x0164,
+  Tcedilla: 0x0162,
+  Tcircle: 0x24C9,
+  Tcircumflexbelow: 0x1E70,
+  Tcommaaccent: 0x0162,
+  Tdotaccent: 0x1E6A,
+  Tdotbelow: 0x1E6C,
+  Tecyrillic: 0x0422,
+  Tedescendercyrillic: 0x04AC,
+  Tenroman: 0x2169,
+  Tetsecyrillic: 0x04B4,
+  Theta: 0x0398,
+  Thook: 0x01AC,
+  Thorn: 0x00DE,
+  Thornsmall: 0xF7FE,
+  Threeroman: 0x2162,
+  Tildesmall: 0xF6FE,
+  Tiwnarmenian: 0x054F,
+  Tlinebelow: 0x1E6E,
+  Tmonospace: 0xFF34,
+  Toarmenian: 0x0539,
+  Tonefive: 0x01BC,
+  Tonesix: 0x0184,
+  Tonetwo: 0x01A7,
+  Tretroflexhook: 0x01AE,
+  Tsecyrillic: 0x0426,
+  Tshecyrillic: 0x040B,
+  Tsmall: 0xF774,
+  Twelveroman: 0x216B,
+  Tworoman: 0x2161,
+  U: 0x0055,
+  Uacute: 0x00DA,
+  Uacutesmall: 0xF7FA,
+  Ubreve: 0x016C,
+  Ucaron: 0x01D3,
+  Ucircle: 0x24CA,
+  Ucircumflex: 0x00DB,
+  Ucircumflexbelow: 0x1E76,
+  Ucircumflexsmall: 0xF7FB,
+  Ucyrillic: 0x0423,
+  Udblacute: 0x0170,
+  Udblgrave: 0x0214,
+  Udieresis: 0x00DC,
+  Udieresisacute: 0x01D7,
+  Udieresisbelow: 0x1E72,
+  Udieresiscaron: 0x01D9,
+  Udieresiscyrillic: 0x04F0,
+  Udieresisgrave: 0x01DB,
+  Udieresismacron: 0x01D5,
+  Udieresissmall: 0xF7FC,
+  Udotbelow: 0x1EE4,
+  Ugrave: 0x00D9,
+  Ugravesmall: 0xF7F9,
+  Uhookabove: 0x1EE6,
+  Uhorn: 0x01AF,
+  Uhornacute: 0x1EE8,
+  Uhorndotbelow: 0x1EF0,
+  Uhorngrave: 0x1EEA,
+  Uhornhookabove: 0x1EEC,
+  Uhorntilde: 0x1EEE,
+  Uhungarumlaut: 0x0170,
+  Uhungarumlautcyrillic: 0x04F2,
+  Uinvertedbreve: 0x0216,
+  Ukcyrillic: 0x0478,
+  Umacron: 0x016A,
+  Umacroncyrillic: 0x04EE,
+  Umacrondieresis: 0x1E7A,
+  Umonospace: 0xFF35,
+  Uogonek: 0x0172,
+  Upsilon: 0x03A5,
+  Upsilon1: 0x03D2,
+  Upsilonacutehooksymbolgreek: 0x03D3,
+  Upsilonafrican: 0x01B1,
+  Upsilondieresis: 0x03AB,
+  Upsilondieresishooksymbolgreek: 0x03D4,
+  Upsilonhooksymbol: 0x03D2,
+  Upsilontonos: 0x038E,
+  Uring: 0x016E,
+  Ushortcyrillic: 0x040E,
+  Usmall: 0xF775,
+  Ustraightcyrillic: 0x04AE,
+  Ustraightstrokecyrillic: 0x04B0,
+  Utilde: 0x0168,
+  Utildeacute: 0x1E78,
+  Utildebelow: 0x1E74,
+  V: 0x0056,
+  Vcircle: 0x24CB,
+  Vdotbelow: 0x1E7E,
+  Vecyrillic: 0x0412,
+  Vewarmenian: 0x054E,
+  Vhook: 0x01B2,
+  Vmonospace: 0xFF36,
+  Voarmenian: 0x0548,
+  Vsmall: 0xF776,
+  Vtilde: 0x1E7C,
+  W: 0x0057,
+  Wacute: 0x1E82,
+  Wcircle: 0x24CC,
+  Wcircumflex: 0x0174,
+  Wdieresis: 0x1E84,
+  Wdotaccent: 0x1E86,
+  Wdotbelow: 0x1E88,
+  Wgrave: 0x1E80,
+  Wmonospace: 0xFF37,
+  Wsmall: 0xF777,
+  X: 0x0058,
+  Xcircle: 0x24CD,
+  Xdieresis: 0x1E8C,
+  Xdotaccent: 0x1E8A,
+  Xeharmenian: 0x053D,
+  Xi: 0x039E,
+  Xmonospace: 0xFF38,
+  Xsmall: 0xF778,
+  Y: 0x0059,
+  Yacute: 0x00DD,
+  Yacutesmall: 0xF7FD,
+  Yatcyrillic: 0x0462,
+  Ycircle: 0x24CE,
+  Ycircumflex: 0x0176,
+  Ydieresis: 0x0178,
+  Ydieresissmall: 0xF7FF,
+  Ydotaccent: 0x1E8E,
+  Ydotbelow: 0x1EF4,
+  Yericyrillic: 0x042B,
+  Yerudieresiscyrillic: 0x04F8,
+  Ygrave: 0x1EF2,
+  Yhook: 0x01B3,
+  Yhookabove: 0x1EF6,
+  Yiarmenian: 0x0545,
+  Yicyrillic: 0x0407,
+  Yiwnarmenian: 0x0552,
+  Ymonospace: 0xFF39,
+  Ysmall: 0xF779,
+  Ytilde: 0x1EF8,
+  Yusbigcyrillic: 0x046A,
+  Yusbigiotifiedcyrillic: 0x046C,
+  Yuslittlecyrillic: 0x0466,
+  Yuslittleiotifiedcyrillic: 0x0468,
+  Z: 0x005A,
+  Zaarmenian: 0x0536,
+  Zacute: 0x0179,
+  Zcaron: 0x017D,
+  Zcaronsmall: 0xF6FF,
+  Zcircle: 0x24CF,
+  Zcircumflex: 0x1E90,
+  Zdot: 0x017B,
+  Zdotaccent: 0x017B,
+  Zdotbelow: 0x1E92,
+  Zecyrillic: 0x0417,
+  Zedescendercyrillic: 0x0498,
+  Zedieresiscyrillic: 0x04DE,
+  Zeta: 0x0396,
+  Zhearmenian: 0x053A,
+  Zhebrevecyrillic: 0x04C1,
+  Zhecyrillic: 0x0416,
+  Zhedescendercyrillic: 0x0496,
+  Zhedieresiscyrillic: 0x04DC,
+  Zlinebelow: 0x1E94,
+  Zmonospace: 0xFF3A,
+  Zsmall: 0xF77A,
+  Zstroke: 0x01B5,
+  a: 0x0061,
+  aabengali: 0x0986,
+  aacute: 0x00E1,
+  aadeva: 0x0906,
+  aagujarati: 0x0A86,
+  aagurmukhi: 0x0A06,
+  aamatragurmukhi: 0x0A3E,
+  aarusquare: 0x3303,
+  aavowelsignbengali: 0x09BE,
+  aavowelsigndeva: 0x093E,
+  aavowelsigngujarati: 0x0ABE,
+  abbreviationmarkarmenian: 0x055F,
+  abbreviationsigndeva: 0x0970,
+  abengali: 0x0985,
+  abopomofo: 0x311A,
+  abreve: 0x0103,
+  abreveacute: 0x1EAF,
+  abrevecyrillic: 0x04D1,
+  abrevedotbelow: 0x1EB7,
+  abrevegrave: 0x1EB1,
+  abrevehookabove: 0x1EB3,
+  abrevetilde: 0x1EB5,
+  acaron: 0x01CE,
+  acircle: 0x24D0,
+  acircumflex: 0x00E2,
+  acircumflexacute: 0x1EA5,
+  acircumflexdotbelow: 0x1EAD,
+  acircumflexgrave: 0x1EA7,
+  acircumflexhookabove: 0x1EA9,
+  acircumflextilde: 0x1EAB,
+  acute: 0x00B4,
+  acutebelowcmb: 0x0317,
+  acutecmb: 0x0301,
+  acutecomb: 0x0301,
+  acutedeva: 0x0954,
+  acutelowmod: 0x02CF,
+  acutetonecmb: 0x0341,
+  acyrillic: 0x0430,
+  adblgrave: 0x0201,
+  addakgurmukhi: 0x0A71,
+  adeva: 0x0905,
+  adieresis: 0x00E4,
+  adieresiscyrillic: 0x04D3,
+  adieresismacron: 0x01DF,
+  adotbelow: 0x1EA1,
+  adotmacron: 0x01E1,
+  ae: 0x00E6,
+  aeacute: 0x01FD,
+  aekorean: 0x3150,
+  aemacron: 0x01E3,
+  afii00208: 0x2015,
+  afii08941: 0x20A4,
+  afii10017: 0x0410,
+  afii10018: 0x0411,
+  afii10019: 0x0412,
+  afii10020: 0x0413,
+  afii10021: 0x0414,
+  afii10022: 0x0415,
+  afii10023: 0x0401,
+  afii10024: 0x0416,
+  afii10025: 0x0417,
+  afii10026: 0x0418,
+  afii10027: 0x0419,
+  afii10028: 0x041A,
+  afii10029: 0x041B,
+  afii10030: 0x041C,
+  afii10031: 0x041D,
+  afii10032: 0x041E,
+  afii10033: 0x041F,
+  afii10034: 0x0420,
+  afii10035: 0x0421,
+  afii10036: 0x0422,
+  afii10037: 0x0423,
+  afii10038: 0x0424,
+  afii10039: 0x0425,
+  afii10040: 0x0426,
+  afii10041: 0x0427,
+  afii10042: 0x0428,
+  afii10043: 0x0429,
+  afii10044: 0x042A,
+  afii10045: 0x042B,
+  afii10046: 0x042C,
+  afii10047: 0x042D,
+  afii10048: 0x042E,
+  afii10049: 0x042F,
+  afii10050: 0x0490,
+  afii10051: 0x0402,
+  afii10052: 0x0403,
+  afii10053: 0x0404,
+  afii10054: 0x0405,
+  afii10055: 0x0406,
+  afii10056: 0x0407,
+  afii10057: 0x0408,
+  afii10058: 0x0409,
+  afii10059: 0x040A,
+  afii10060: 0x040B,
+  afii10061: 0x040C,
+  afii10062: 0x040E,
+  afii10063: 0xF6C4,
+  afii10064: 0xF6C5,
+  afii10065: 0x0430,
+  afii10066: 0x0431,
+  afii10067: 0x0432,
+  afii10068: 0x0433,
+  afii10069: 0x0434,
+  afii10070: 0x0435,
+  afii10071: 0x0451,
+  afii10072: 0x0436,
+  afii10073: 0x0437,
+  afii10074: 0x0438,
+  afii10075: 0x0439,
+  afii10076: 0x043A,
+  afii10077: 0x043B,
+  afii10078: 0x043C,
+  afii10079: 0x043D,
+  afii10080: 0x043E,
+  afii10081: 0x043F,
+  afii10082: 0x0440,
+  afii10083: 0x0441,
+  afii10084: 0x0442,
+  afii10085: 0x0443,
+  afii10086: 0x0444,
+  afii10087: 0x0445,
+  afii10088: 0x0446,
+  afii10089: 0x0447,
+  afii10090: 0x0448,
+  afii10091: 0x0449,
+  afii10092: 0x044A,
+  afii10093: 0x044B,
+  afii10094: 0x044C,
+  afii10095: 0x044D,
+  afii10096: 0x044E,
+  afii10097: 0x044F,
+  afii10098: 0x0491,
+  afii10099: 0x0452,
+  afii10100: 0x0453,
+  afii10101: 0x0454,
+  afii10102: 0x0455,
+  afii10103: 0x0456,
+  afii10104: 0x0457,
+  afii10105: 0x0458,
+  afii10106: 0x0459,
+  afii10107: 0x045A,
+  afii10108: 0x045B,
+  afii10109: 0x045C,
+  afii10110: 0x045E,
+  afii10145: 0x040F,
+  afii10146: 0x0462,
+  afii10147: 0x0472,
+  afii10148: 0x0474,
+  afii10192: 0xF6C6,
+  afii10193: 0x045F,
+  afii10194: 0x0463,
+  afii10195: 0x0473,
+  afii10196: 0x0475,
+  afii10831: 0xF6C7,
+  afii10832: 0xF6C8,
+  afii10846: 0x04D9,
+  afii299: 0x200E,
+  afii300: 0x200F,
+  afii301: 0x200D,
+  afii57381: 0x066A,
+  afii57388: 0x060C,
+  afii57392: 0x0660,
+  afii57393: 0x0661,
+  afii57394: 0x0662,
+  afii57395: 0x0663,
+  afii57396: 0x0664,
+  afii57397: 0x0665,
+  afii57398: 0x0666,
+  afii57399: 0x0667,
+  afii57400: 0x0668,
+  afii57401: 0x0669,
+  afii57403: 0x061B,
+  afii57407: 0x061F,
+  afii57409: 0x0621,
+  afii57410: 0x0622,
+  afii57411: 0x0623,
+  afii57412: 0x0624,
+  afii57413: 0x0625,
+  afii57414: 0x0626,
+  afii57415: 0x0627,
+  afii57416: 0x0628,
+  afii57417: 0x0629,
+  afii57418: 0x062A,
+  afii57419: 0x062B,
+  afii57420: 0x062C,
+  afii57421: 0x062D,
+  afii57422: 0x062E,
+  afii57423: 0x062F,
+  afii57424: 0x0630,
+  afii57425: 0x0631,
+  afii57426: 0x0632,
+  afii57427: 0x0633,
+  afii57428: 0x0634,
+  afii57429: 0x0635,
+  afii57430: 0x0636,
+  afii57431: 0x0637,
+  afii57432: 0x0638,
+  afii57433: 0x0639,
+  afii57434: 0x063A,
+  afii57440: 0x0640,
+  afii57441: 0x0641,
+  afii57442: 0x0642,
+  afii57443: 0x0643,
+  afii57444: 0x0644,
+  afii57445: 0x0645,
+  afii57446: 0x0646,
+  afii57448: 0x0648,
+  afii57449: 0x0649,
+  afii57450: 0x064A,
+  afii57451: 0x064B,
+  afii57452: 0x064C,
+  afii57453: 0x064D,
+  afii57454: 0x064E,
+  afii57455: 0x064F,
+  afii57456: 0x0650,
+  afii57457: 0x0651,
+  afii57458: 0x0652,
+  afii57470: 0x0647,
+  afii57505: 0x06A4,
+  afii57506: 0x067E,
+  afii57507: 0x0686,
+  afii57508: 0x0698,
+  afii57509: 0x06AF,
+  afii57511: 0x0679,
+  afii57512: 0x0688,
+  afii57513: 0x0691,
+  afii57514: 0x06BA,
+  afii57519: 0x06D2,
+  afii57534: 0x06D5,
+  afii57636: 0x20AA,
+  afii57645: 0x05BE,
+  afii57658: 0x05C3,
+  afii57664: 0x05D0,
+  afii57665: 0x05D1,
+  afii57666: 0x05D2,
+  afii57667: 0x05D3,
+  afii57668: 0x05D4,
+  afii57669: 0x05D5,
+  afii57670: 0x05D6,
+  afii57671: 0x05D7,
+  afii57672: 0x05D8,
+  afii57673: 0x05D9,
+  afii57674: 0x05DA,
+  afii57675: 0x05DB,
+  afii57676: 0x05DC,
+  afii57677: 0x05DD,
+  afii57678: 0x05DE,
+  afii57679: 0x05DF,
+  afii57680: 0x05E0,
+  afii57681: 0x05E1,
+  afii57682: 0x05E2,
+  afii57683: 0x05E3,
+  afii57684: 0x05E4,
+  afii57685: 0x05E5,
+  afii57686: 0x05E6,
+  afii57687: 0x05E7,
+  afii57688: 0x05E8,
+  afii57689: 0x05E9,
+  afii57690: 0x05EA,
+  afii57694: 0xFB2A,
+  afii57695: 0xFB2B,
+  afii57700: 0xFB4B,
+  afii57705: 0xFB1F,
+  afii57716: 0x05F0,
+  afii57717: 0x05F1,
+  afii57718: 0x05F2,
+  afii57723: 0xFB35,
+  afii57793: 0x05B4,
+  afii57794: 0x05B5,
+  afii57795: 0x05B6,
+  afii57796: 0x05BB,
+  afii57797: 0x05B8,
+  afii57798: 0x05B7,
+  afii57799: 0x05B0,
+  afii57800: 0x05B2,
+  afii57801: 0x05B1,
+  afii57802: 0x05B3,
+  afii57803: 0x05C2,
+  afii57804: 0x05C1,
+  afii57806: 0x05B9,
+  afii57807: 0x05BC,
+  afii57839: 0x05BD,
+  afii57841: 0x05BF,
+  afii57842: 0x05C0,
+  afii57929: 0x02BC,
+  afii61248: 0x2105,
+  afii61289: 0x2113,
+  afii61352: 0x2116,
+  afii61573: 0x202C,
+  afii61574: 0x202D,
+  afii61575: 0x202E,
+  afii61664: 0x200C,
+  afii63167: 0x066D,
+  afii64937: 0x02BD,
+  agrave: 0x00E0,
+  agujarati: 0x0A85,
+  agurmukhi: 0x0A05,
+  ahiragana: 0x3042,
+  ahookabove: 0x1EA3,
+  aibengali: 0x0990,
+  aibopomofo: 0x311E,
+  aideva: 0x0910,
+  aiecyrillic: 0x04D5,
+  aigujarati: 0x0A90,
+  aigurmukhi: 0x0A10,
+  aimatragurmukhi: 0x0A48,
+  ainarabic: 0x0639,
+  ainfinalarabic: 0xFECA,
+  aininitialarabic: 0xFECB,
+  ainmedialarabic: 0xFECC,
+  ainvertedbreve: 0x0203,
+  aivowelsignbengali: 0x09C8,
+  aivowelsigndeva: 0x0948,
+  aivowelsigngujarati: 0x0AC8,
+  akatakana: 0x30A2,
+  akatakanahalfwidth: 0xFF71,
+  akorean: 0x314F,
+  alef: 0x05D0,
+  alefarabic: 0x0627,
+  alefdageshhebrew: 0xFB30,
+  aleffinalarabic: 0xFE8E,
+  alefhamzaabovearabic: 0x0623,
+  alefhamzaabovefinalarabic: 0xFE84,
+  alefhamzabelowarabic: 0x0625,
+  alefhamzabelowfinalarabic: 0xFE88,
+  alefhebrew: 0x05D0,
+  aleflamedhebrew: 0xFB4F,
+  alefmaddaabovearabic: 0x0622,
+  alefmaddaabovefinalarabic: 0xFE82,
+  alefmaksuraarabic: 0x0649,
+  alefmaksurafinalarabic: 0xFEF0,
+  alefmaksurainitialarabic: 0xFEF3,
+  alefmaksuramedialarabic: 0xFEF4,
+  alefpatahhebrew: 0xFB2E,
+  alefqamatshebrew: 0xFB2F,
+  aleph: 0x2135,
+  allequal: 0x224C,
+  alpha: 0x03B1,
+  alphatonos: 0x03AC,
+  amacron: 0x0101,
+  amonospace: 0xFF41,
+  ampersand: 0x0026,
+  ampersandmonospace: 0xFF06,
+  ampersandsmall: 0xF726,
+  amsquare: 0x33C2,
+  anbopomofo: 0x3122,
+  angbopomofo: 0x3124,
+  angbracketleft: 0x3008, // This glyph is missing from Adobe's original list.
+  angbracketright: 0x3009, // This glyph is missing from Adobe's original list.
+  angkhankhuthai: 0x0E5A,
+  angle: 0x2220,
+  anglebracketleft: 0x3008,
+  anglebracketleftvertical: 0xFE3F,
+  anglebracketright: 0x3009,
+  anglebracketrightvertical: 0xFE40,
+  angleleft: 0x2329,
+  angleright: 0x232A,
+  angstrom: 0x212B,
+  anoteleia: 0x0387,
+  anudattadeva: 0x0952,
+  anusvarabengali: 0x0982,
+  anusvaradeva: 0x0902,
+  anusvaragujarati: 0x0A82,
+  aogonek: 0x0105,
+  apaatosquare: 0x3300,
+  aparen: 0x249C,
+  apostrophearmenian: 0x055A,
+  apostrophemod: 0x02BC,
+  apple: 0xF8FF,
+  approaches: 0x2250,
+  approxequal: 0x2248,
+  approxequalorimage: 0x2252,
+  approximatelyequal: 0x2245,
+  araeaekorean: 0x318E,
+  araeakorean: 0x318D,
+  arc: 0x2312,
+  arighthalfring: 0x1E9A,
+  aring: 0x00E5,
+  aringacute: 0x01FB,
+  aringbelow: 0x1E01,
+  arrowboth: 0x2194,
+  arrowdashdown: 0x21E3,
+  arrowdashleft: 0x21E0,
+  arrowdashright: 0x21E2,
+  arrowdashup: 0x21E1,
+  arrowdblboth: 0x21D4,
+  arrowdbldown: 0x21D3,
+  arrowdblleft: 0x21D0,
+  arrowdblright: 0x21D2,
+  arrowdblup: 0x21D1,
+  arrowdown: 0x2193,
+  arrowdownleft: 0x2199,
+  arrowdownright: 0x2198,
+  arrowdownwhite: 0x21E9,
+  arrowheaddownmod: 0x02C5,
+  arrowheadleftmod: 0x02C2,
+  arrowheadrightmod: 0x02C3,
+  arrowheadupmod: 0x02C4,
+  arrowhorizex: 0xF8E7,
+  arrowleft: 0x2190,
+  arrowleftdbl: 0x21D0,
+  arrowleftdblstroke: 0x21CD,
+  arrowleftoverright: 0x21C6,
+  arrowleftwhite: 0x21E6,
+  arrowright: 0x2192,
+  arrowrightdblstroke: 0x21CF,
+  arrowrightheavy: 0x279E,
+  arrowrightoverleft: 0x21C4,
+  arrowrightwhite: 0x21E8,
+  arrowtableft: 0x21E4,
+  arrowtabright: 0x21E5,
+  arrowup: 0x2191,
+  arrowupdn: 0x2195,
+  arrowupdnbse: 0x21A8,
+  arrowupdownbase: 0x21A8,
+  arrowupleft: 0x2196,
+  arrowupleftofdown: 0x21C5,
+  arrowupright: 0x2197,
+  arrowupwhite: 0x21E7,
+  arrowvertex: 0xF8E6,
+  asciicircum: 0x005E,
+  asciicircummonospace: 0xFF3E,
+  asciitilde: 0x007E,
+  asciitildemonospace: 0xFF5E,
+  ascript: 0x0251,
+  ascriptturned: 0x0252,
+  asmallhiragana: 0x3041,
+  asmallkatakana: 0x30A1,
+  asmallkatakanahalfwidth: 0xFF67,
+  asterisk: 0x002A,
+  asteriskaltonearabic: 0x066D,
+  asteriskarabic: 0x066D,
+  asteriskmath: 0x2217,
+  asteriskmonospace: 0xFF0A,
+  asterisksmall: 0xFE61,
+  asterism: 0x2042,
+  asuperior: 0xF6E9,
+  asymptoticallyequal: 0x2243,
+  at: 0x0040,
+  atilde: 0x00E3,
+  atmonospace: 0xFF20,
+  atsmall: 0xFE6B,
+  aturned: 0x0250,
+  aubengali: 0x0994,
+  aubopomofo: 0x3120,
+  audeva: 0x0914,
+  augujarati: 0x0A94,
+  augurmukhi: 0x0A14,
+  aulengthmarkbengali: 0x09D7,
+  aumatragurmukhi: 0x0A4C,
+  auvowelsignbengali: 0x09CC,
+  auvowelsigndeva: 0x094C,
+  auvowelsigngujarati: 0x0ACC,
+  avagrahadeva: 0x093D,
+  aybarmenian: 0x0561,
+  ayin: 0x05E2,
+  ayinaltonehebrew: 0xFB20,
+  ayinhebrew: 0x05E2,
+  b: 0x0062,
+  babengali: 0x09AC,
+  backslash: 0x005C,
+  backslashmonospace: 0xFF3C,
+  badeva: 0x092C,
+  bagujarati: 0x0AAC,
+  bagurmukhi: 0x0A2C,
+  bahiragana: 0x3070,
+  bahtthai: 0x0E3F,
+  bakatakana: 0x30D0,
+  bar: 0x007C,
+  barmonospace: 0xFF5C,
+  bbopomofo: 0x3105,
+  bcircle: 0x24D1,
+  bdotaccent: 0x1E03,
+  bdotbelow: 0x1E05,
+  beamedsixteenthnotes: 0x266C,
+  because: 0x2235,
+  becyrillic: 0x0431,
+  beharabic: 0x0628,
+  behfinalarabic: 0xFE90,
+  behinitialarabic: 0xFE91,
+  behiragana: 0x3079,
+  behmedialarabic: 0xFE92,
+  behmeeminitialarabic: 0xFC9F,
+  behmeemisolatedarabic: 0xFC08,
+  behnoonfinalarabic: 0xFC6D,
+  bekatakana: 0x30D9,
+  benarmenian: 0x0562,
+  bet: 0x05D1,
+  beta: 0x03B2,
+  betasymbolgreek: 0x03D0,
+  betdagesh: 0xFB31,
+  betdageshhebrew: 0xFB31,
+  bethebrew: 0x05D1,
+  betrafehebrew: 0xFB4C,
+  bhabengali: 0x09AD,
+  bhadeva: 0x092D,
+  bhagujarati: 0x0AAD,
+  bhagurmukhi: 0x0A2D,
+  bhook: 0x0253,
+  bihiragana: 0x3073,
+  bikatakana: 0x30D3,
+  bilabialclick: 0x0298,
+  bindigurmukhi: 0x0A02,
+  birusquare: 0x3331,
+  blackcircle: 0x25CF,
+  blackdiamond: 0x25C6,
+  blackdownpointingtriangle: 0x25BC,
+  blackleftpointingpointer: 0x25C4,
+  blackleftpointingtriangle: 0x25C0,
+  blacklenticularbracketleft: 0x3010,
+  blacklenticularbracketleftvertical: 0xFE3B,
+  blacklenticularbracketright: 0x3011,
+  blacklenticularbracketrightvertical: 0xFE3C,
+  blacklowerlefttriangle: 0x25E3,
+  blacklowerrighttriangle: 0x25E2,
+  blackrectangle: 0x25AC,
+  blackrightpointingpointer: 0x25BA,
+  blackrightpointingtriangle: 0x25B6,
+  blacksmallsquare: 0x25AA,
+  blacksmilingface: 0x263B,
+  blacksquare: 0x25A0,
+  blackstar: 0x2605,
+  blackupperlefttriangle: 0x25E4,
+  blackupperrighttriangle: 0x25E5,
+  blackuppointingsmalltriangle: 0x25B4,
+  blackuppointingtriangle: 0x25B2,
+  blank: 0x2423,
+  blinebelow: 0x1E07,
+  block: 0x2588,
+  bmonospace: 0xFF42,
+  bobaimaithai: 0x0E1A,
+  bohiragana: 0x307C,
+  bokatakana: 0x30DC,
+  bparen: 0x249D,
+  bqsquare: 0x33C3,
+  braceex: 0xF8F4,
+  braceleft: 0x007B,
+  braceleftbt: 0xF8F3,
+  braceleftmid: 0xF8F2,
+  braceleftmonospace: 0xFF5B,
+  braceleftsmall: 0xFE5B,
+  bracelefttp: 0xF8F1,
+  braceleftvertical: 0xFE37,
+  braceright: 0x007D,
+  bracerightbt: 0xF8FE,
+  bracerightmid: 0xF8FD,
+  bracerightmonospace: 0xFF5D,
+  bracerightsmall: 0xFE5C,
+  bracerighttp: 0xF8FC,
+  bracerightvertical: 0xFE38,
+  bracketleft: 0x005B,
+  bracketleftbt: 0xF8F0,
+  bracketleftex: 0xF8EF,
+  bracketleftmonospace: 0xFF3B,
+  bracketlefttp: 0xF8EE,
+  bracketright: 0x005D,
+  bracketrightbt: 0xF8FB,
+  bracketrightex: 0xF8FA,
+  bracketrightmonospace: 0xFF3D,
+  bracketrighttp: 0xF8F9,
+  breve: 0x02D8,
+  brevebelowcmb: 0x032E,
+  brevecmb: 0x0306,
+  breveinvertedbelowcmb: 0x032F,
+  breveinvertedcmb: 0x0311,
+  breveinverteddoublecmb: 0x0361,
+  bridgebelowcmb: 0x032A,
+  bridgeinvertedbelowcmb: 0x033A,
+  brokenbar: 0x00A6,
+  bstroke: 0x0180,
+  bsuperior: 0xF6EA,
+  btopbar: 0x0183,
+  buhiragana: 0x3076,
+  bukatakana: 0x30D6,
+  bullet: 0x2022,
+  bulletinverse: 0x25D8,
+  bulletoperator: 0x2219,
+  bullseye: 0x25CE,
+  c: 0x0063,
+  caarmenian: 0x056E,
+  cabengali: 0x099A,
+  cacute: 0x0107,
+  cadeva: 0x091A,
+  cagujarati: 0x0A9A,
+  cagurmukhi: 0x0A1A,
+  calsquare: 0x3388,
+  candrabindubengali: 0x0981,
+  candrabinducmb: 0x0310,
+  candrabindudeva: 0x0901,
+  candrabindugujarati: 0x0A81,
+  capslock: 0x21EA,
+  careof: 0x2105,
+  caron: 0x02C7,
+  caronbelowcmb: 0x032C,
+  caroncmb: 0x030C,
+  carriagereturn: 0x21B5,
+  cbopomofo: 0x3118,
+  ccaron: 0x010D,
+  ccedilla: 0x00E7,
+  ccedillaacute: 0x1E09,
+  ccircle: 0x24D2,
+  ccircumflex: 0x0109,
+  ccurl: 0x0255,
+  cdot: 0x010B,
+  cdotaccent: 0x010B,
+  cdsquare: 0x33C5,
+  cedilla: 0x00B8,
+  cedillacmb: 0x0327,
+  cent: 0x00A2,
+  centigrade: 0x2103,
+  centinferior: 0xF6DF,
+  centmonospace: 0xFFE0,
+  centoldstyle: 0xF7A2,
+  centsuperior: 0xF6E0,
+  chaarmenian: 0x0579,
+  chabengali: 0x099B,
+  chadeva: 0x091B,
+  chagujarati: 0x0A9B,
+  chagurmukhi: 0x0A1B,
+  chbopomofo: 0x3114,
+  cheabkhasiancyrillic: 0x04BD,
+  checkmark: 0x2713,
+  checyrillic: 0x0447,
+  chedescenderabkhasiancyrillic: 0x04BF,
+  chedescendercyrillic: 0x04B7,
+  chedieresiscyrillic: 0x04F5,
+  cheharmenian: 0x0573,
+  chekhakassiancyrillic: 0x04CC,
+  cheverticalstrokecyrillic: 0x04B9,
+  chi: 0x03C7,
+  chieuchacirclekorean: 0x3277,
+  chieuchaparenkorean: 0x3217,
+  chieuchcirclekorean: 0x3269,
+  chieuchkorean: 0x314A,
+  chieuchparenkorean: 0x3209,
+  chochangthai: 0x0E0A,
+  chochanthai: 0x0E08,
+  chochingthai: 0x0E09,
+  chochoethai: 0x0E0C,
+  chook: 0x0188,
+  cieucacirclekorean: 0x3276,
+  cieucaparenkorean: 0x3216,
+  cieuccirclekorean: 0x3268,
+  cieuckorean: 0x3148,
+  cieucparenkorean: 0x3208,
+  cieucuparenkorean: 0x321C,
+  circle: 0x25CB,
+  circlecopyrt: 0x00A9, // This glyph is missing from Adobe's original list.
+  circlemultiply: 0x2297,
+  circleot: 0x2299,
+  circleplus: 0x2295,
+  circlepostalmark: 0x3036,
+  circlewithlefthalfblack: 0x25D0,
+  circlewithrighthalfblack: 0x25D1,
+  circumflex: 0x02C6,
+  circumflexbelowcmb: 0x032D,
+  circumflexcmb: 0x0302,
+  clear: 0x2327,
+  clickalveolar: 0x01C2,
+  clickdental: 0x01C0,
+  clicklateral: 0x01C1,
+  clickretroflex: 0x01C3,
+  club: 0x2663,
+  clubsuitblack: 0x2663,
+  clubsuitwhite: 0x2667,
+  cmcubedsquare: 0x33A4,
+  cmonospace: 0xFF43,
+  cmsquaredsquare: 0x33A0,
+  coarmenian: 0x0581,
+  colon: 0x003A,
+  colonmonetary: 0x20A1,
+  colonmonospace: 0xFF1A,
+  colonsign: 0x20A1,
+  colonsmall: 0xFE55,
+  colontriangularhalfmod: 0x02D1,
+  colontriangularmod: 0x02D0,
+  comma: 0x002C,
+  commaabovecmb: 0x0313,
+  commaaboverightcmb: 0x0315,
+  commaaccent: 0xF6C3,
+  commaarabic: 0x060C,
+  commaarmenian: 0x055D,
+  commainferior: 0xF6E1,
+  commamonospace: 0xFF0C,
+  commareversedabovecmb: 0x0314,
+  commareversedmod: 0x02BD,
+  commasmall: 0xFE50,
+  commasuperior: 0xF6E2,
+  commaturnedabovecmb: 0x0312,
+  commaturnedmod: 0x02BB,
+  compass: 0x263C,
+  congruent: 0x2245,
+  contourintegral: 0x222E,
+  control: 0x2303,
+  controlACK: 0x0006,
+  controlBEL: 0x0007,
+  controlBS: 0x0008,
+  controlCAN: 0x0018,
+  controlCR: 0x000D,
+  controlDC1: 0x0011,
+  controlDC2: 0x0012,
+  controlDC3: 0x0013,
+  controlDC4: 0x0014,
+  controlDEL: 0x007F,
+  controlDLE: 0x0010,
+  controlEM: 0x0019,
+  controlENQ: 0x0005,
+  controlEOT: 0x0004,
+  controlESC: 0x001B,
+  controlETB: 0x0017,
+  controlETX: 0x0003,
+  controlFF: 0x000C,
+  controlFS: 0x001C,
+  controlGS: 0x001D,
+  controlHT: 0x0009,
+  controlLF: 0x000A,
+  controlNAK: 0x0015,
+  controlRS: 0x001E,
+  controlSI: 0x000F,
+  controlSO: 0x000E,
+  controlSOT: 0x0002,
+  controlSTX: 0x0001,
+  controlSUB: 0x001A,
+  controlSYN: 0x0016,
+  controlUS: 0x001F,
+  controlVT: 0x000B,
+  copyright: 0x00A9,
+  copyrightsans: 0xF8E9,
+  copyrightserif: 0xF6D9,
+  cornerbracketleft: 0x300C,
+  cornerbracketlefthalfwidth: 0xFF62,
+  cornerbracketleftvertical: 0xFE41,
+  cornerbracketright: 0x300D,
+  cornerbracketrighthalfwidth: 0xFF63,
+  cornerbracketrightvertical: 0xFE42,
+  corporationsquare: 0x337F,
+  cosquare: 0x33C7,
+  coverkgsquare: 0x33C6,
+  cparen: 0x249E,
+  cruzeiro: 0x20A2,
+  cstretched: 0x0297,
+  curlyand: 0x22CF,
+  curlyor: 0x22CE,
+  currency: 0x00A4,
+  cyrBreve: 0xF6D1,
+  cyrFlex: 0xF6D2,
+  cyrbreve: 0xF6D4,
+  cyrflex: 0xF6D5,
+  d: 0x0064,
+  daarmenian: 0x0564,
+  dabengali: 0x09A6,
+  dadarabic: 0x0636,
+  dadeva: 0x0926,
+  dadfinalarabic: 0xFEBE,
+  dadinitialarabic: 0xFEBF,
+  dadmedialarabic: 0xFEC0,
+  dagesh: 0x05BC,
+  dageshhebrew: 0x05BC,
+  dagger: 0x2020,
+  daggerdbl: 0x2021,
+  dagujarati: 0x0AA6,
+  dagurmukhi: 0x0A26,
+  dahiragana: 0x3060,
+  dakatakana: 0x30C0,
+  dalarabic: 0x062F,
+  dalet: 0x05D3,
+  daletdagesh: 0xFB33,
+  daletdageshhebrew: 0xFB33,
+  dalethatafpatah: 0x05D305B2,
+  dalethatafpatahhebrew: 0x05D305B2,
+  dalethatafsegol: 0x05D305B1,
+  dalethatafsegolhebrew: 0x05D305B1,
+  dalethebrew: 0x05D3,
+  dalethiriq: 0x05D305B4,
+  dalethiriqhebrew: 0x05D305B4,
+  daletholam: 0x05D305B9,
+  daletholamhebrew: 0x05D305B9,
+  daletpatah: 0x05D305B7,
+  daletpatahhebrew: 0x05D305B7,
+  daletqamats: 0x05D305B8,
+  daletqamatshebrew: 0x05D305B8,
+  daletqubuts: 0x05D305BB,
+  daletqubutshebrew: 0x05D305BB,
+  daletsegol: 0x05D305B6,
+  daletsegolhebrew: 0x05D305B6,
+  daletsheva: 0x05D305B0,
+  daletshevahebrew: 0x05D305B0,
+  dalettsere: 0x05D305B5,
+  dalettserehebrew: 0x05D305B5,
+  dalfinalarabic: 0xFEAA,
+  dammaarabic: 0x064F,
+  dammalowarabic: 0x064F,
+  dammatanaltonearabic: 0x064C,
+  dammatanarabic: 0x064C,
+  danda: 0x0964,
+  dargahebrew: 0x05A7,
+  dargalefthebrew: 0x05A7,
+  dasiapneumatacyrilliccmb: 0x0485,
+  dblGrave: 0xF6D3,
+  dblanglebracketleft: 0x300A,
+  dblanglebracketleftvertical: 0xFE3D,
+  dblanglebracketright: 0x300B,
+  dblanglebracketrightvertical: 0xFE3E,
+  dblarchinvertedbelowcmb: 0x032B,
+  dblarrowleft: 0x21D4,
+  dblarrowright: 0x21D2,
+  dbldanda: 0x0965,
+  dblgrave: 0xF6D6,
+  dblgravecmb: 0x030F,
+  dblintegral: 0x222C,
+  dbllowline: 0x2017,
+  dbllowlinecmb: 0x0333,
+  dbloverlinecmb: 0x033F,
+  dblprimemod: 0x02BA,
+  dblverticalbar: 0x2016,
+  dblverticallineabovecmb: 0x030E,
+  dbopomofo: 0x3109,
+  dbsquare: 0x33C8,
+  dcaron: 0x010F,
+  dcedilla: 0x1E11,
+  dcircle: 0x24D3,
+  dcircumflexbelow: 0x1E13,
+  dcroat: 0x0111,
+  ddabengali: 0x09A1,
+  ddadeva: 0x0921,
+  ddagujarati: 0x0AA1,
+  ddagurmukhi: 0x0A21,
+  ddalarabic: 0x0688,
+  ddalfinalarabic: 0xFB89,
+  dddhadeva: 0x095C,
+  ddhabengali: 0x09A2,
+  ddhadeva: 0x0922,
+  ddhagujarati: 0x0AA2,
+  ddhagurmukhi: 0x0A22,
+  ddotaccent: 0x1E0B,
+  ddotbelow: 0x1E0D,
+  decimalseparatorarabic: 0x066B,
+  decimalseparatorpersian: 0x066B,
+  decyrillic: 0x0434,
+  degree: 0x00B0,
+  dehihebrew: 0x05AD,
+  dehiragana: 0x3067,
+  deicoptic: 0x03EF,
+  dekatakana: 0x30C7,
+  deleteleft: 0x232B,
+  deleteright: 0x2326,
+  delta: 0x03B4,
+  deltaturned: 0x018D,
+  denominatorminusonenumeratorbengali: 0x09F8,
+  dezh: 0x02A4,
+  dhabengali: 0x09A7,
+  dhadeva: 0x0927,
+  dhagujarati: 0x0AA7,
+  dhagurmukhi: 0x0A27,
+  dhook: 0x0257,
+  dialytikatonos: 0x0385,
+  dialytikatonoscmb: 0x0344,
+  diamond: 0x2666,
+  diamondsuitwhite: 0x2662,
+  dieresis: 0x00A8,
+  dieresisacute: 0xF6D7,
+  dieresisbelowcmb: 0x0324,
+  dieresiscmb: 0x0308,
+  dieresisgrave: 0xF6D8,
+  dieresistonos: 0x0385,
+  dihiragana: 0x3062,
+  dikatakana: 0x30C2,
+  dittomark: 0x3003,
+  divide: 0x00F7,
+  divides: 0x2223,
+  divisionslash: 0x2215,
+  djecyrillic: 0x0452,
+  dkshade: 0x2593,
+  dlinebelow: 0x1E0F,
+  dlsquare: 0x3397,
+  dmacron: 0x0111,
+  dmonospace: 0xFF44,
+  dnblock: 0x2584,
+  dochadathai: 0x0E0E,
+  dodekthai: 0x0E14,
+  dohiragana: 0x3069,
+  dokatakana: 0x30C9,
+  dollar: 0x0024,
+  dollarinferior: 0xF6E3,
+  dollarmonospace: 0xFF04,
+  dollaroldstyle: 0xF724,
+  dollarsmall: 0xFE69,
+  dollarsuperior: 0xF6E4,
+  dong: 0x20AB,
+  dorusquare: 0x3326,
+  dotaccent: 0x02D9,
+  dotaccentcmb: 0x0307,
+  dotbelowcmb: 0x0323,
+  dotbelowcomb: 0x0323,
+  dotkatakana: 0x30FB,
+  dotlessi: 0x0131,
+  dotlessj: 0xF6BE,
+  dotlessjstrokehook: 0x0284,
+  dotmath: 0x22C5,
+  dottedcircle: 0x25CC,
+  doubleyodpatah: 0xFB1F,
+  doubleyodpatahhebrew: 0xFB1F,
+  downtackbelowcmb: 0x031E,
+  downtackmod: 0x02D5,
+  dparen: 0x249F,
+  dsuperior: 0xF6EB,
+  dtail: 0x0256,
+  dtopbar: 0x018C,
+  duhiragana: 0x3065,
+  dukatakana: 0x30C5,
+  dz: 0x01F3,
+  dzaltone: 0x02A3,
+  dzcaron: 0x01C6,
+  dzcurl: 0x02A5,
+  dzeabkhasiancyrillic: 0x04E1,
+  dzecyrillic: 0x0455,
+  dzhecyrillic: 0x045F,
+  e: 0x0065,
+  eacute: 0x00E9,
+  earth: 0x2641,
+  ebengali: 0x098F,
+  ebopomofo: 0x311C,
+  ebreve: 0x0115,
+  ecandradeva: 0x090D,
+  ecandragujarati: 0x0A8D,
+  ecandravowelsigndeva: 0x0945,
+  ecandravowelsigngujarati: 0x0AC5,
+  ecaron: 0x011B,
+  ecedillabreve: 0x1E1D,
+  echarmenian: 0x0565,
+  echyiwnarmenian: 0x0587,
+  ecircle: 0x24D4,
+  ecircumflex: 0x00EA,
+  ecircumflexacute: 0x1EBF,
+  ecircumflexbelow: 0x1E19,
+  ecircumflexdotbelow: 0x1EC7,
+  ecircumflexgrave: 0x1EC1,
+  ecircumflexhookabove: 0x1EC3,
+  ecircumflextilde: 0x1EC5,
+  ecyrillic: 0x0454,
+  edblgrave: 0x0205,
+  edeva: 0x090F,
+  edieresis: 0x00EB,
+  edot: 0x0117,
+  edotaccent: 0x0117,
+  edotbelow: 0x1EB9,
+  eegurmukhi: 0x0A0F,
+  eematragurmukhi: 0x0A47,
+  efcyrillic: 0x0444,
+  egrave: 0x00E8,
+  egujarati: 0x0A8F,
+  eharmenian: 0x0567,
+  ehbopomofo: 0x311D,
+  ehiragana: 0x3048,
+  ehookabove: 0x1EBB,
+  eibopomofo: 0x311F,
+  eight: 0x0038,
+  eightarabic: 0x0668,
+  eightbengali: 0x09EE,
+  eightcircle: 0x2467,
+  eightcircleinversesansserif: 0x2791,
+  eightdeva: 0x096E,
+  eighteencircle: 0x2471,
+  eighteenparen: 0x2485,
+  eighteenperiod: 0x2499,
+  eightgujarati: 0x0AEE,
+  eightgurmukhi: 0x0A6E,
+  eighthackarabic: 0x0668,
+  eighthangzhou: 0x3028,
+  eighthnotebeamed: 0x266B,
+  eightideographicparen: 0x3227,
+  eightinferior: 0x2088,
+  eightmonospace: 0xFF18,
+  eightoldstyle: 0xF738,
+  eightparen: 0x247B,
+  eightperiod: 0x248F,
+  eightpersian: 0x06F8,
+  eightroman: 0x2177,
+  eightsuperior: 0x2078,
+  eightthai: 0x0E58,
+  einvertedbreve: 0x0207,
+  eiotifiedcyrillic: 0x0465,
+  ekatakana: 0x30A8,
+  ekatakanahalfwidth: 0xFF74,
+  ekonkargurmukhi: 0x0A74,
+  ekorean: 0x3154,
+  elcyrillic: 0x043B,
+  element: 0x2208,
+  elevencircle: 0x246A,
+  elevenparen: 0x247E,
+  elevenperiod: 0x2492,
+  elevenroman: 0x217A,
+  ellipsis: 0x2026,
+  ellipsisvertical: 0x22EE,
+  emacron: 0x0113,
+  emacronacute: 0x1E17,
+  emacrongrave: 0x1E15,
+  emcyrillic: 0x043C,
+  emdash: 0x2014,
+  emdashvertical: 0xFE31,
+  emonospace: 0xFF45,
+  emphasismarkarmenian: 0x055B,
+  emptyset: 0x2205,
+  enbopomofo: 0x3123,
+  encyrillic: 0x043D,
+  endash: 0x2013,
+  endashvertical: 0xFE32,
+  endescendercyrillic: 0x04A3,
+  eng: 0x014B,
+  engbopomofo: 0x3125,
+  enghecyrillic: 0x04A5,
+  enhookcyrillic: 0x04C8,
+  enspace: 0x2002,
+  eogonek: 0x0119,
+  eokorean: 0x3153,
+  eopen: 0x025B,
+  eopenclosed: 0x029A,
+  eopenreversed: 0x025C,
+  eopenreversedclosed: 0x025E,
+  eopenreversedhook: 0x025D,
+  eparen: 0x24A0,
+  epsilon: 0x03B5,
+  epsilontonos: 0x03AD,
+  equal: 0x003D,
+  equalmonospace: 0xFF1D,
+  equalsmall: 0xFE66,
+  equalsuperior: 0x207C,
+  equivalence: 0x2261,
+  erbopomofo: 0x3126,
+  ercyrillic: 0x0440,
+  ereversed: 0x0258,
+  ereversedcyrillic: 0x044D,
+  escyrillic: 0x0441,
+  esdescendercyrillic: 0x04AB,
+  esh: 0x0283,
+  eshcurl: 0x0286,
+  eshortdeva: 0x090E,
+  eshortvowelsigndeva: 0x0946,
+  eshreversedloop: 0x01AA,
+  eshsquatreversed: 0x0285,
+  esmallhiragana: 0x3047,
+  esmallkatakana: 0x30A7,
+  esmallkatakanahalfwidth: 0xFF6A,
+  estimated: 0x212E,
+  esuperior: 0xF6EC,
+  eta: 0x03B7,
+  etarmenian: 0x0568,
+  etatonos: 0x03AE,
+  eth: 0x00F0,
+  etilde: 0x1EBD,
+  etildebelow: 0x1E1B,
+  etnahtafoukhhebrew: 0x0591,
+  etnahtafoukhlefthebrew: 0x0591,
+  etnahtahebrew: 0x0591,
+  etnahtalefthebrew: 0x0591,
+  eturned: 0x01DD,
+  eukorean: 0x3161,
+  euro: 0x20AC,
+  evowelsignbengali: 0x09C7,
+  evowelsigndeva: 0x0947,
+  evowelsigngujarati: 0x0AC7,
+  exclam: 0x0021,
+  exclamarmenian: 0x055C,
+  exclamdbl: 0x203C,
+  exclamdown: 0x00A1,
+  exclamdownsmall: 0xF7A1,
+  exclammonospace: 0xFF01,
+  exclamsmall: 0xF721,
+  existential: 0x2203,
+  ezh: 0x0292,
+  ezhcaron: 0x01EF,
+  ezhcurl: 0x0293,
+  ezhreversed: 0x01B9,
+  ezhtail: 0x01BA,
+  f: 0x0066,
+  fadeva: 0x095E,
+  fagurmukhi: 0x0A5E,
+  fahrenheit: 0x2109,
+  fathaarabic: 0x064E,
+  fathalowarabic: 0x064E,
+  fathatanarabic: 0x064B,
+  fbopomofo: 0x3108,
+  fcircle: 0x24D5,
+  fdotaccent: 0x1E1F,
+  feharabic: 0x0641,
+  feharmenian: 0x0586,
+  fehfinalarabic: 0xFED2,
+  fehinitialarabic: 0xFED3,
+  fehmedialarabic: 0xFED4,
+  feicoptic: 0x03E5,
+  female: 0x2640,
+  ff: 0xFB00,
+  ffi: 0xFB03,
+  ffl: 0xFB04,
+  fi: 0xFB01,
+  fifteencircle: 0x246E,
+  fifteenparen: 0x2482,
+  fifteenperiod: 0x2496,
+  figuredash: 0x2012,
+  filledbox: 0x25A0,
+  filledrect: 0x25AC,
+  finalkaf: 0x05DA,
+  finalkafdagesh: 0xFB3A,
+  finalkafdageshhebrew: 0xFB3A,
+  finalkafhebrew: 0x05DA,
+  finalkafqamats: 0x05DA05B8,
+  finalkafqamatshebrew: 0x05DA05B8,
+  finalkafsheva: 0x05DA05B0,
+  finalkafshevahebrew: 0x05DA05B0,
+  finalmem: 0x05DD,
+  finalmemhebrew: 0x05DD,
+  finalnun: 0x05DF,
+  finalnunhebrew: 0x05DF,
+  finalpe: 0x05E3,
+  finalpehebrew: 0x05E3,
+  finaltsadi: 0x05E5,
+  finaltsadihebrew: 0x05E5,
+  firsttonechinese: 0x02C9,
+  fisheye: 0x25C9,
+  fitacyrillic: 0x0473,
+  five: 0x0035,
+  fivearabic: 0x0665,
+  fivebengali: 0x09EB,
+  fivecircle: 0x2464,
+  fivecircleinversesansserif: 0x278E,
+  fivedeva: 0x096B,
+  fiveeighths: 0x215D,
+  fivegujarati: 0x0AEB,
+  fivegurmukhi: 0x0A6B,
+  fivehackarabic: 0x0665,
+  fivehangzhou: 0x3025,
+  fiveideographicparen: 0x3224,
+  fiveinferior: 0x2085,
+  fivemonospace: 0xFF15,
+  fiveoldstyle: 0xF735,
+  fiveparen: 0x2478,
+  fiveperiod: 0x248C,
+  fivepersian: 0x06F5,
+  fiveroman: 0x2174,
+  fivesuperior: 0x2075,
+  fivethai: 0x0E55,
+  fl: 0xFB02,
+  florin: 0x0192,
+  fmonospace: 0xFF46,
+  fmsquare: 0x3399,
+  fofanthai: 0x0E1F,
+  fofathai: 0x0E1D,
+  fongmanthai: 0x0E4F,
+  forall: 0x2200,
+  four: 0x0034,
+  fourarabic: 0x0664,
+  fourbengali: 0x09EA,
+  fourcircle: 0x2463,
+  fourcircleinversesansserif: 0x278D,
+  fourdeva: 0x096A,
+  fourgujarati: 0x0AEA,
+  fourgurmukhi: 0x0A6A,
+  fourhackarabic: 0x0664,
+  fourhangzhou: 0x3024,
+  fourideographicparen: 0x3223,
+  fourinferior: 0x2084,
+  fourmonospace: 0xFF14,
+  fournumeratorbengali: 0x09F7,
+  fouroldstyle: 0xF734,
+  fourparen: 0x2477,
+  fourperiod: 0x248B,
+  fourpersian: 0x06F4,
+  fourroman: 0x2173,
+  foursuperior: 0x2074,
+  fourteencircle: 0x246D,
+  fourteenparen: 0x2481,
+  fourteenperiod: 0x2495,
+  fourthai: 0x0E54,
+  fourthtonechinese: 0x02CB,
+  fparen: 0x24A1,
+  fraction: 0x2044,
+  franc: 0x20A3,
+  g: 0x0067,
+  gabengali: 0x0997,
+  gacute: 0x01F5,
+  gadeva: 0x0917,
+  gafarabic: 0x06AF,
+  gaffinalarabic: 0xFB93,
+  gafinitialarabic: 0xFB94,
+  gafmedialarabic: 0xFB95,
+  gagujarati: 0x0A97,
+  gagurmukhi: 0x0A17,
+  gahiragana: 0x304C,
+  gakatakana: 0x30AC,
+  gamma: 0x03B3,
+  gammalatinsmall: 0x0263,
+  gammasuperior: 0x02E0,
+  gangiacoptic: 0x03EB,
+  gbopomofo: 0x310D,
+  gbreve: 0x011F,
+  gcaron: 0x01E7,
+  gcedilla: 0x0123,
+  gcircle: 0x24D6,
+  gcircumflex: 0x011D,
+  gcommaaccent: 0x0123,
+  gdot: 0x0121,
+  gdotaccent: 0x0121,
+  gecyrillic: 0x0433,
+  gehiragana: 0x3052,
+  gekatakana: 0x30B2,
+  geometricallyequal: 0x2251,
+  gereshaccenthebrew: 0x059C,
+  gereshhebrew: 0x05F3,
+  gereshmuqdamhebrew: 0x059D,
+  germandbls: 0x00DF,
+  gershayimaccenthebrew: 0x059E,
+  gershayimhebrew: 0x05F4,
+  getamark: 0x3013,
+  ghabengali: 0x0998,
+  ghadarmenian: 0x0572,
+  ghadeva: 0x0918,
+  ghagujarati: 0x0A98,
+  ghagurmukhi: 0x0A18,
+  ghainarabic: 0x063A,
+  ghainfinalarabic: 0xFECE,
+  ghaininitialarabic: 0xFECF,
+  ghainmedialarabic: 0xFED0,
+  ghemiddlehookcyrillic: 0x0495,
+  ghestrokecyrillic: 0x0493,
+  gheupturncyrillic: 0x0491,
+  ghhadeva: 0x095A,
+  ghhagurmukhi: 0x0A5A,
+  ghook: 0x0260,
+  ghzsquare: 0x3393,
+  gihiragana: 0x304E,
+  gikatakana: 0x30AE,
+  gimarmenian: 0x0563,
+  gimel: 0x05D2,
+  gimeldagesh: 0xFB32,
+  gimeldageshhebrew: 0xFB32,
+  gimelhebrew: 0x05D2,
+  gjecyrillic: 0x0453,
+  glottalinvertedstroke: 0x01BE,
+  glottalstop: 0x0294,
+  glottalstopinverted: 0x0296,
+  glottalstopmod: 0x02C0,
+  glottalstopreversed: 0x0295,
+  glottalstopreversedmod: 0x02C1,
+  glottalstopreversedsuperior: 0x02E4,
+  glottalstopstroke: 0x02A1,
+  glottalstopstrokereversed: 0x02A2,
+  gmacron: 0x1E21,
+  gmonospace: 0xFF47,
+  gohiragana: 0x3054,
+  gokatakana: 0x30B4,
+  gparen: 0x24A2,
+  gpasquare: 0x33AC,
+  gradient: 0x2207,
+  grave: 0x0060,
+  gravebelowcmb: 0x0316,
+  gravecmb: 0x0300,
+  gravecomb: 0x0300,
+  gravedeva: 0x0953,
+  gravelowmod: 0x02CE,
+  gravemonospace: 0xFF40,
+  gravetonecmb: 0x0340,
+  greater: 0x003E,
+  greaterequal: 0x2265,
+  greaterequalorless: 0x22DB,
+  greatermonospace: 0xFF1E,
+  greaterorequivalent: 0x2273,
+  greaterorless: 0x2277,
+  greateroverequal: 0x2267,
+  greatersmall: 0xFE65,
+  gscript: 0x0261,
+  gstroke: 0x01E5,
+  guhiragana: 0x3050,
+  guillemotleft: 0x00AB,
+  guillemotright: 0x00BB,
+  guilsinglleft: 0x2039,
+  guilsinglright: 0x203A,
+  gukatakana: 0x30B0,
+  guramusquare: 0x3318,
+  gysquare: 0x33C9,
+  h: 0x0068,
+  haabkhasiancyrillic: 0x04A9,
+  haaltonearabic: 0x06C1,
+  habengali: 0x09B9,
+  hadescendercyrillic: 0x04B3,
+  hadeva: 0x0939,
+  hagujarati: 0x0AB9,
+  hagurmukhi: 0x0A39,
+  haharabic: 0x062D,
+  hahfinalarabic: 0xFEA2,
+  hahinitialarabic: 0xFEA3,
+  hahiragana: 0x306F,
+  hahmedialarabic: 0xFEA4,
+  haitusquare: 0x332A,
+  hakatakana: 0x30CF,
+  hakatakanahalfwidth: 0xFF8A,
+  halantgurmukhi: 0x0A4D,
+  hamzaarabic: 0x0621,
+  hamzadammaarabic: 0x0621064F,
+  hamzadammatanarabic: 0x0621064C,
+  hamzafathaarabic: 0x0621064E,
+  hamzafathatanarabic: 0x0621064B,
+  hamzalowarabic: 0x0621,
+  hamzalowkasraarabic: 0x06210650,
+  hamzalowkasratanarabic: 0x0621064D,
+  hamzasukunarabic: 0x06210652,
+  hangulfiller: 0x3164,
+  hardsigncyrillic: 0x044A,
+  harpoonleftbarbup: 0x21BC,
+  harpoonrightbarbup: 0x21C0,
+  hasquare: 0x33CA,
+  hatafpatah: 0x05B2,
+  hatafpatah16: 0x05B2,
+  hatafpatah23: 0x05B2,
+  hatafpatah2f: 0x05B2,
+  hatafpatahhebrew: 0x05B2,
+  hatafpatahnarrowhebrew: 0x05B2,
+  hatafpatahquarterhebrew: 0x05B2,
+  hatafpatahwidehebrew: 0x05B2,
+  hatafqamats: 0x05B3,
+  hatafqamats1b: 0x05B3,
+  hatafqamats28: 0x05B3,
+  hatafqamats34: 0x05B3,
+  hatafqamatshebrew: 0x05B3,
+  hatafqamatsnarrowhebrew: 0x05B3,
+  hatafqamatsquarterhebrew: 0x05B3,
+  hatafqamatswidehebrew: 0x05B3,
+  hatafsegol: 0x05B1,
+  hatafsegol17: 0x05B1,
+  hatafsegol24: 0x05B1,
+  hatafsegol30: 0x05B1,
+  hatafsegolhebrew: 0x05B1,
+  hatafsegolnarrowhebrew: 0x05B1,
+  hatafsegolquarterhebrew: 0x05B1,
+  hatafsegolwidehebrew: 0x05B1,
+  hbar: 0x0127,
+  hbopomofo: 0x310F,
+  hbrevebelow: 0x1E2B,
+  hcedilla: 0x1E29,
+  hcircle: 0x24D7,
+  hcircumflex: 0x0125,
+  hdieresis: 0x1E27,
+  hdotaccent: 0x1E23,
+  hdotbelow: 0x1E25,
+  he: 0x05D4,
+  heart: 0x2665,
+  heartsuitblack: 0x2665,
+  heartsuitwhite: 0x2661,
+  hedagesh: 0xFB34,
+  hedageshhebrew: 0xFB34,
+  hehaltonearabic: 0x06C1,
+  heharabic: 0x0647,
+  hehebrew: 0x05D4,
+  hehfinalaltonearabic: 0xFBA7,
+  hehfinalalttwoarabic: 0xFEEA,
+  hehfinalarabic: 0xFEEA,
+  hehhamzaabovefinalarabic: 0xFBA5,
+  hehhamzaaboveisolatedarabic: 0xFBA4,
+  hehinitialaltonearabic: 0xFBA8,
+  hehinitialarabic: 0xFEEB,
+  hehiragana: 0x3078,
+  hehmedialaltonearabic: 0xFBA9,
+  hehmedialarabic: 0xFEEC,
+  heiseierasquare: 0x337B,
+  hekatakana: 0x30D8,
+  hekatakanahalfwidth: 0xFF8D,
+  hekutaarusquare: 0x3336,
+  henghook: 0x0267,
+  herutusquare: 0x3339,
+  het: 0x05D7,
+  hethebrew: 0x05D7,
+  hhook: 0x0266,
+  hhooksuperior: 0x02B1,
+  hieuhacirclekorean: 0x327B,
+  hieuhaparenkorean: 0x321B,
+  hieuhcirclekorean: 0x326D,
+  hieuhkorean: 0x314E,
+  hieuhparenkorean: 0x320D,
+  hihiragana: 0x3072,
+  hikatakana: 0x30D2,
+  hikatakanahalfwidth: 0xFF8B,
+  hiriq: 0x05B4,
+  hiriq14: 0x05B4,
+  hiriq21: 0x05B4,
+  hiriq2d: 0x05B4,
+  hiriqhebrew: 0x05B4,
+  hiriqnarrowhebrew: 0x05B4,
+  hiriqquarterhebrew: 0x05B4,
+  hiriqwidehebrew: 0x05B4,
+  hlinebelow: 0x1E96,
+  hmonospace: 0xFF48,
+  hoarmenian: 0x0570,
+  hohipthai: 0x0E2B,
+  hohiragana: 0x307B,
+  hokatakana: 0x30DB,
+  hokatakanahalfwidth: 0xFF8E,
+  holam: 0x05B9,
+  holam19: 0x05B9,
+  holam26: 0x05B9,
+  holam32: 0x05B9,
+  holamhebrew: 0x05B9,
+  holamnarrowhebrew: 0x05B9,
+  holamquarterhebrew: 0x05B9,
+  holamwidehebrew: 0x05B9,
+  honokhukthai: 0x0E2E,
+  hookabovecomb: 0x0309,
+  hookcmb: 0x0309,
+  hookpalatalizedbelowcmb: 0x0321,
+  hookretroflexbelowcmb: 0x0322,
+  hoonsquare: 0x3342,
+  horicoptic: 0x03E9,
+  horizontalbar: 0x2015,
+  horncmb: 0x031B,
+  hotsprings: 0x2668,
+  house: 0x2302,
+  hparen: 0x24A3,
+  hsuperior: 0x02B0,
+  hturned: 0x0265,
+  huhiragana: 0x3075,
+  huiitosquare: 0x3333,
+  hukatakana: 0x30D5,
+  hukatakanahalfwidth: 0xFF8C,
+  hungarumlaut: 0x02DD,
+  hungarumlautcmb: 0x030B,
+  hv: 0x0195,
+  hyphen: 0x002D,
+  hypheninferior: 0xF6E5,
+  hyphenmonospace: 0xFF0D,
+  hyphensmall: 0xFE63,
+  hyphensuperior: 0xF6E6,
+  hyphentwo: 0x2010,
+  i: 0x0069,
+  iacute: 0x00ED,
+  iacyrillic: 0x044F,
+  ibengali: 0x0987,
+  ibopomofo: 0x3127,
+  ibreve: 0x012D,
+  icaron: 0x01D0,
+  icircle: 0x24D8,
+  icircumflex: 0x00EE,
+  icyrillic: 0x0456,
+  idblgrave: 0x0209,
+  ideographearthcircle: 0x328F,
+  ideographfirecircle: 0x328B,
+  ideographicallianceparen: 0x323F,
+  ideographiccallparen: 0x323A,
+  ideographiccentrecircle: 0x32A5,
+  ideographicclose: 0x3006,
+  ideographiccomma: 0x3001,
+  ideographiccommaleft: 0xFF64,
+  ideographiccongratulationparen: 0x3237,
+  ideographiccorrectcircle: 0x32A3,
+  ideographicearthparen: 0x322F,
+  ideographicenterpriseparen: 0x323D,
+  ideographicexcellentcircle: 0x329D,
+  ideographicfestivalparen: 0x3240,
+  ideographicfinancialcircle: 0x3296,
+  ideographicfinancialparen: 0x3236,
+  ideographicfireparen: 0x322B,
+  ideographichaveparen: 0x3232,
+  ideographichighcircle: 0x32A4,
+  ideographiciterationmark: 0x3005,
+  ideographiclaborcircle: 0x3298,
+  ideographiclaborparen: 0x3238,
+  ideographicleftcircle: 0x32A7,
+  ideographiclowcircle: 0x32A6,
+  ideographicmedicinecircle: 0x32A9,
+  ideographicmetalparen: 0x322E,
+  ideographicmoonparen: 0x322A,
+  ideographicnameparen: 0x3234,
+  ideographicperiod: 0x3002,
+  ideographicprintcircle: 0x329E,
+  ideographicreachparen: 0x3243,
+  ideographicrepresentparen: 0x3239,
+  ideographicresourceparen: 0x323E,
+  ideographicrightcircle: 0x32A8,
+  ideographicsecretcircle: 0x3299,
+  ideographicselfparen: 0x3242,
+  ideographicsocietyparen: 0x3233,
+  ideographicspace: 0x3000,
+  ideographicspecialparen: 0x3235,
+  ideographicstockparen: 0x3231,
+  ideographicstudyparen: 0x323B,
+  ideographicsunparen: 0x3230,
+  ideographicsuperviseparen: 0x323C,
+  ideographicwaterparen: 0x322C,
+  ideographicwoodparen: 0x322D,
+  ideographiczero: 0x3007,
+  ideographmetalcircle: 0x328E,
+  ideographmooncircle: 0x328A,
+  ideographnamecircle: 0x3294,
+  ideographsuncircle: 0x3290,
+  ideographwatercircle: 0x328C,
+  ideographwoodcircle: 0x328D,
+  ideva: 0x0907,
+  idieresis: 0x00EF,
+  idieresisacute: 0x1E2F,
+  idieresiscyrillic: 0x04E5,
+  idotbelow: 0x1ECB,
+  iebrevecyrillic: 0x04D7,
+  iecyrillic: 0x0435,
+  ieungacirclekorean: 0x3275,
+  ieungaparenkorean: 0x3215,
+  ieungcirclekorean: 0x3267,
+  ieungkorean: 0x3147,
+  ieungparenkorean: 0x3207,
+  igrave: 0x00EC,
+  igujarati: 0x0A87,
+  igurmukhi: 0x0A07,
+  ihiragana: 0x3044,
+  ihookabove: 0x1EC9,
+  iibengali: 0x0988,
+  iicyrillic: 0x0438,
+  iideva: 0x0908,
+  iigujarati: 0x0A88,
+  iigurmukhi: 0x0A08,
+  iimatragurmukhi: 0x0A40,
+  iinvertedbreve: 0x020B,
+  iishortcyrillic: 0x0439,
+  iivowelsignbengali: 0x09C0,
+  iivowelsigndeva: 0x0940,
+  iivowelsigngujarati: 0x0AC0,
+  ij: 0x0133,
+  ikatakana: 0x30A4,
+  ikatakanahalfwidth: 0xFF72,
+  ikorean: 0x3163,
+  ilde: 0x02DC,
+  iluyhebrew: 0x05AC,
+  imacron: 0x012B,
+  imacroncyrillic: 0x04E3,
+  imageorapproximatelyequal: 0x2253,
+  imatragurmukhi: 0x0A3F,
+  imonospace: 0xFF49,
+  increment: 0x2206,
+  infinity: 0x221E,
+  iniarmenian: 0x056B,
+  integral: 0x222B,
+  integralbottom: 0x2321,
+  integralbt: 0x2321,
+  integralex: 0xF8F5,
+  integraltop: 0x2320,
+  integraltp: 0x2320,
+  intersection: 0x2229,
+  intisquare: 0x3305,
+  invbullet: 0x25D8,
+  invcircle: 0x25D9,
+  invsmileface: 0x263B,
+  iocyrillic: 0x0451,
+  iogonek: 0x012F,
+  iota: 0x03B9,
+  iotadieresis: 0x03CA,
+  iotadieresistonos: 0x0390,
+  iotalatin: 0x0269,
+  iotatonos: 0x03AF,
+  iparen: 0x24A4,
+  irigurmukhi: 0x0A72,
+  ismallhiragana: 0x3043,
+  ismallkatakana: 0x30A3,
+  ismallkatakanahalfwidth: 0xFF68,
+  issharbengali: 0x09FA,
+  istroke: 0x0268,
+  isuperior: 0xF6ED,
+  iterationhiragana: 0x309D,
+  iterationkatakana: 0x30FD,
+  itilde: 0x0129,
+  itildebelow: 0x1E2D,
+  iubopomofo: 0x3129,
+  iucyrillic: 0x044E,
+  ivowelsignbengali: 0x09BF,
+  ivowelsigndeva: 0x093F,
+  ivowelsigngujarati: 0x0ABF,
+  izhitsacyrillic: 0x0475,
+  izhitsadblgravecyrillic: 0x0477,
+  j: 0x006A,
+  jaarmenian: 0x0571,
+  jabengali: 0x099C,
+  jadeva: 0x091C,
+  jagujarati: 0x0A9C,
+  jagurmukhi: 0x0A1C,
+  jbopomofo: 0x3110,
+  jcaron: 0x01F0,
+  jcircle: 0x24D9,
+  jcircumflex: 0x0135,
+  jcrossedtail: 0x029D,
+  jdotlessstroke: 0x025F,
+  jecyrillic: 0x0458,
+  jeemarabic: 0x062C,
+  jeemfinalarabic: 0xFE9E,
+  jeeminitialarabic: 0xFE9F,
+  jeemmedialarabic: 0xFEA0,
+  jeharabic: 0x0698,
+  jehfinalarabic: 0xFB8B,
+  jhabengali: 0x099D,
+  jhadeva: 0x091D,
+  jhagujarati: 0x0A9D,
+  jhagurmukhi: 0x0A1D,
+  jheharmenian: 0x057B,
+  jis: 0x3004,
+  jmonospace: 0xFF4A,
+  jparen: 0x24A5,
+  jsuperior: 0x02B2,
+  k: 0x006B,
+  kabashkircyrillic: 0x04A1,
+  kabengali: 0x0995,
+  kacute: 0x1E31,
+  kacyrillic: 0x043A,
+  kadescendercyrillic: 0x049B,
+  kadeva: 0x0915,
+  kaf: 0x05DB,
+  kafarabic: 0x0643,
+  kafdagesh: 0xFB3B,
+  kafdageshhebrew: 0xFB3B,
+  kaffinalarabic: 0xFEDA,
+  kafhebrew: 0x05DB,
+  kafinitialarabic: 0xFEDB,
+  kafmedialarabic: 0xFEDC,
+  kafrafehebrew: 0xFB4D,
+  kagujarati: 0x0A95,
+  kagurmukhi: 0x0A15,
+  kahiragana: 0x304B,
+  kahookcyrillic: 0x04C4,
+  kakatakana: 0x30AB,
+  kakatakanahalfwidth: 0xFF76,
+  kappa: 0x03BA,
+  kappasymbolgreek: 0x03F0,
+  kapyeounmieumkorean: 0x3171,
+  kapyeounphieuphkorean: 0x3184,
+  kapyeounpieupkorean: 0x3178,
+  kapyeounssangpieupkorean: 0x3179,
+  karoriisquare: 0x330D,
+  kashidaautoarabic: 0x0640,
+  kashidaautonosidebearingarabic: 0x0640,
+  kasmallkatakana: 0x30F5,
+  kasquare: 0x3384,
+  kasraarabic: 0x0650,
+  kasratanarabic: 0x064D,
+  kastrokecyrillic: 0x049F,
+  katahiraprolongmarkhalfwidth: 0xFF70,
+  kaverticalstrokecyrillic: 0x049D,
+  kbopomofo: 0x310E,
+  kcalsquare: 0x3389,
+  kcaron: 0x01E9,
+  kcedilla: 0x0137,
+  kcircle: 0x24DA,
+  kcommaaccent: 0x0137,
+  kdotbelow: 0x1E33,
+  keharmenian: 0x0584,
+  kehiragana: 0x3051,
+  kekatakana: 0x30B1,
+  kekatakanahalfwidth: 0xFF79,
+  kenarmenian: 0x056F,
+  kesmallkatakana: 0x30F6,
+  kgreenlandic: 0x0138,
+  khabengali: 0x0996,
+  khacyrillic: 0x0445,
+  khadeva: 0x0916,
+  khagujarati: 0x0A96,
+  khagurmukhi: 0x0A16,
+  khaharabic: 0x062E,
+  khahfinalarabic: 0xFEA6,
+  khahinitialarabic: 0xFEA7,
+  khahmedialarabic: 0xFEA8,
+  kheicoptic: 0x03E7,
+  khhadeva: 0x0959,
+  khhagurmukhi: 0x0A59,
+  khieukhacirclekorean: 0x3278,
+  khieukhaparenkorean: 0x3218,
+  khieukhcirclekorean: 0x326A,
+  khieukhkorean: 0x314B,
+  khieukhparenkorean: 0x320A,
+  khokhaithai: 0x0E02,
+  khokhonthai: 0x0E05,
+  khokhuatthai: 0x0E03,
+  khokhwaithai: 0x0E04,
+  khomutthai: 0x0E5B,
+  khook: 0x0199,
+  khorakhangthai: 0x0E06,
+  khzsquare: 0x3391,
+  kihiragana: 0x304D,
+  kikatakana: 0x30AD,
+  kikatakanahalfwidth: 0xFF77,
+  kiroguramusquare: 0x3315,
+  kiromeetorusquare: 0x3316,
+  kirosquare: 0x3314,
+  kiyeokacirclekorean: 0x326E,
+  kiyeokaparenkorean: 0x320E,
+  kiyeokcirclekorean: 0x3260,
+  kiyeokkorean: 0x3131,
+  kiyeokparenkorean: 0x3200,
+  kiyeoksioskorean: 0x3133,
+  kjecyrillic: 0x045C,
+  klinebelow: 0x1E35,
+  klsquare: 0x3398,
+  kmcubedsquare: 0x33A6,
+  kmonospace: 0xFF4B,
+  kmsquaredsquare: 0x33A2,
+  kohiragana: 0x3053,
+  kohmsquare: 0x33C0,
+  kokaithai: 0x0E01,
+  kokatakana: 0x30B3,
+  kokatakanahalfwidth: 0xFF7A,
+  kooposquare: 0x331E,
+  koppacyrillic: 0x0481,
+  koreanstandardsymbol: 0x327F,
+  koroniscmb: 0x0343,
+  kparen: 0x24A6,
+  kpasquare: 0x33AA,
+  ksicyrillic: 0x046F,
+  ktsquare: 0x33CF,
+  kturned: 0x029E,
+  kuhiragana: 0x304F,
+  kukatakana: 0x30AF,
+  kukatakanahalfwidth: 0xFF78,
+  kvsquare: 0x33B8,
+  kwsquare: 0x33BE,
+  l: 0x006C,
+  labengali: 0x09B2,
+  lacute: 0x013A,
+  ladeva: 0x0932,
+  lagujarati: 0x0AB2,
+  lagurmukhi: 0x0A32,
+  lakkhangyaothai: 0x0E45,
+  lamaleffinalarabic: 0xFEFC,
+  lamalefhamzaabovefinalarabic: 0xFEF8,
+  lamalefhamzaaboveisolatedarabic: 0xFEF7,
+  lamalefhamzabelowfinalarabic: 0xFEFA,
+  lamalefhamzabelowisolatedarabic: 0xFEF9,
+  lamalefisolatedarabic: 0xFEFB,
+  lamalefmaddaabovefinalarabic: 0xFEF6,
+  lamalefmaddaaboveisolatedarabic: 0xFEF5,
+  lamarabic: 0x0644,
+  lambda: 0x03BB,
+  lambdastroke: 0x019B,
+  lamed: 0x05DC,
+  lameddagesh: 0xFB3C,
+  lameddageshhebrew: 0xFB3C,
+  lamedhebrew: 0x05DC,
+  lamedholam: 0x05DC05B9,
+  lamedholamdagesh: '05DC 05B9 05BC',
+  lamedholamdageshhebrew: '05DC 05B9 05BC',
+  lamedholamhebrew: 0x05DC05B9,
+  lamfinalarabic: 0xFEDE,
+  lamhahinitialarabic: 0xFCCA,
+  laminitialarabic: 0xFEDF,
+  lamjeeminitialarabic: 0xFCC9,
+  lamkhahinitialarabic: 0xFCCB,
+  lamlamhehisolatedarabic: 0xFDF2,
+  lammedialarabic: 0xFEE0,
+  lammeemhahinitialarabic: 0xFD88,
+  lammeeminitialarabic: 0xFCCC,
+  lammeemjeeminitialarabic: 'FEDF FEE4 FEA0',
+  lammeemkhahinitialarabic: 'FEDF FEE4 FEA8',
+  largecircle: 0x25EF,
+  lbar: 0x019A,
+  lbelt: 0x026C,
+  lbopomofo: 0x310C,
+  lcaron: 0x013E,
+  lcedilla: 0x013C,
+  lcircle: 0x24DB,
+  lcircumflexbelow: 0x1E3D,
+  lcommaaccent: 0x013C,
+  ldot: 0x0140,
+  ldotaccent: 0x0140,
+  ldotbelow: 0x1E37,
+  ldotbelowmacron: 0x1E39,
+  leftangleabovecmb: 0x031A,
+  lefttackbelowcmb: 0x0318,
+  less: 0x003C,
+  lessequal: 0x2264,
+  lessequalorgreater: 0x22DA,
+  lessmonospace: 0xFF1C,
+  lessorequivalent: 0x2272,
+  lessorgreater: 0x2276,
+  lessoverequal: 0x2266,
+  lesssmall: 0xFE64,
+  lezh: 0x026E,
+  lfblock: 0x258C,
+  lhookretroflex: 0x026D,
+  lira: 0x20A4,
+  liwnarmenian: 0x056C,
+  lj: 0x01C9,
+  ljecyrillic: 0x0459,
+  ll: 0xF6C0,
+  lladeva: 0x0933,
+  llagujarati: 0x0AB3,
+  llinebelow: 0x1E3B,
+  llladeva: 0x0934,
+  llvocalicbengali: 0x09E1,
+  llvocalicdeva: 0x0961,
+  llvocalicvowelsignbengali: 0x09E3,
+  llvocalicvowelsigndeva: 0x0963,
+  lmiddletilde: 0x026B,
+  lmonospace: 0xFF4C,
+  lmsquare: 0x33D0,
+  lochulathai: 0x0E2C,
+  logicaland: 0x2227,
+  logicalnot: 0x00AC,
+  logicalnotreversed: 0x2310,
+  logicalor: 0x2228,
+  lolingthai: 0x0E25,
+  longs: 0x017F,
+  lowlinecenterline: 0xFE4E,
+  lowlinecmb: 0x0332,
+  lowlinedashed: 0xFE4D,
+  lozenge: 0x25CA,
+  lparen: 0x24A7,
+  lslash: 0x0142,
+  lsquare: 0x2113,
+  lsuperior: 0xF6EE,
+  ltshade: 0x2591,
+  luthai: 0x0E26,
+  lvocalicbengali: 0x098C,
+  lvocalicdeva: 0x090C,
+  lvocalicvowelsignbengali: 0x09E2,
+  lvocalicvowelsigndeva: 0x0962,
+  lxsquare: 0x33D3,
+  m: 0x006D,
+  mabengali: 0x09AE,
+  macron: 0x00AF,
+  macronbelowcmb: 0x0331,
+  macroncmb: 0x0304,
+  macronlowmod: 0x02CD,
+  macronmonospace: 0xFFE3,
+  macute: 0x1E3F,
+  madeva: 0x092E,
+  magujarati: 0x0AAE,
+  magurmukhi: 0x0A2E,
+  mahapakhhebrew: 0x05A4,
+  mahapakhlefthebrew: 0x05A4,
+  mahiragana: 0x307E,
+  maichattawalowleftthai: 0xF895,
+  maichattawalowrightthai: 0xF894,
+  maichattawathai: 0x0E4B,
+  maichattawaupperleftthai: 0xF893,
+  maieklowleftthai: 0xF88C,
+  maieklowrightthai: 0xF88B,
+  maiekthai: 0x0E48,
+  maiekupperleftthai: 0xF88A,
+  maihanakatleftthai: 0xF884,
+  maihanakatthai: 0x0E31,
+  maitaikhuleftthai: 0xF889,
+  maitaikhuthai: 0x0E47,
+  maitholowleftthai: 0xF88F,
+  maitholowrightthai: 0xF88E,
+  maithothai: 0x0E49,
+  maithoupperleftthai: 0xF88D,
+  maitrilowleftthai: 0xF892,
+  maitrilowrightthai: 0xF891,
+  maitrithai: 0x0E4A,
+  maitriupperleftthai: 0xF890,
+  maiyamokthai: 0x0E46,
+  makatakana: 0x30DE,
+  makatakanahalfwidth: 0xFF8F,
+  male: 0x2642,
+  mansyonsquare: 0x3347,
+  maqafhebrew: 0x05BE,
+  mars: 0x2642,
+  masoracirclehebrew: 0x05AF,
+  masquare: 0x3383,
+  mbopomofo: 0x3107,
+  mbsquare: 0x33D4,
+  mcircle: 0x24DC,
+  mcubedsquare: 0x33A5,
+  mdotaccent: 0x1E41,
+  mdotbelow: 0x1E43,
+  meemarabic: 0x0645,
+  meemfinalarabic: 0xFEE2,
+  meeminitialarabic: 0xFEE3,
+  meemmedialarabic: 0xFEE4,
+  meemmeeminitialarabic: 0xFCD1,
+  meemmeemisolatedarabic: 0xFC48,
+  meetorusquare: 0x334D,
+  mehiragana: 0x3081,
+  meizierasquare: 0x337E,
+  mekatakana: 0x30E1,
+  mekatakanahalfwidth: 0xFF92,
+  mem: 0x05DE,
+  memdagesh: 0xFB3E,
+  memdageshhebrew: 0xFB3E,
+  memhebrew: 0x05DE,
+  menarmenian: 0x0574,
+  merkhahebrew: 0x05A5,
+  merkhakefulahebrew: 0x05A6,
+  merkhakefulalefthebrew: 0x05A6,
+  merkhalefthebrew: 0x05A5,
+  mhook: 0x0271,
+  mhzsquare: 0x3392,
+  middledotkatakanahalfwidth: 0xFF65,
+  middot: 0x00B7,
+  mieumacirclekorean: 0x3272,
+  mieumaparenkorean: 0x3212,
+  mieumcirclekorean: 0x3264,
+  mieumkorean: 0x3141,
+  mieumpansioskorean: 0x3170,
+  mieumparenkorean: 0x3204,
+  mieumpieupkorean: 0x316E,
+  mieumsioskorean: 0x316F,
+  mihiragana: 0x307F,
+  mikatakana: 0x30DF,
+  mikatakanahalfwidth: 0xFF90,
+  minus: 0x2212,
+  minusbelowcmb: 0x0320,
+  minuscircle: 0x2296,
+  minusmod: 0x02D7,
+  minusplus: 0x2213,
+  minute: 0x2032,
+  miribaarusquare: 0x334A,
+  mirisquare: 0x3349,
+  mlonglegturned: 0x0270,
+  mlsquare: 0x3396,
+  mmcubedsquare: 0x33A3,
+  mmonospace: 0xFF4D,
+  mmsquaredsquare: 0x339F,
+  mohiragana: 0x3082,
+  mohmsquare: 0x33C1,
+  mokatakana: 0x30E2,
+  mokatakanahalfwidth: 0xFF93,
+  molsquare: 0x33D6,
+  momathai: 0x0E21,
+  moverssquare: 0x33A7,
+  moverssquaredsquare: 0x33A8,
+  mparen: 0x24A8,
+  mpasquare: 0x33AB,
+  mssquare: 0x33B3,
+  msuperior: 0xF6EF,
+  mturned: 0x026F,
+  mu: 0x00B5,
+  mu1: 0x00B5,
+  muasquare: 0x3382,
+  muchgreater: 0x226B,
+  muchless: 0x226A,
+  mufsquare: 0x338C,
+  mugreek: 0x03BC,
+  mugsquare: 0x338D,
+  muhiragana: 0x3080,
+  mukatakana: 0x30E0,
+  mukatakanahalfwidth: 0xFF91,
+  mulsquare: 0x3395,
+  multiply: 0x00D7,
+  mumsquare: 0x339B,
+  munahhebrew: 0x05A3,
+  munahlefthebrew: 0x05A3,
+  musicalnote: 0x266A,
+  musicalnotedbl: 0x266B,
+  musicflatsign: 0x266D,
+  musicsharpsign: 0x266F,
+  mussquare: 0x33B2,
+  muvsquare: 0x33B6,
+  muwsquare: 0x33BC,
+  mvmegasquare: 0x33B9,
+  mvsquare: 0x33B7,
+  mwmegasquare: 0x33BF,
+  mwsquare: 0x33BD,
+  n: 0x006E,
+  nabengali: 0x09A8,
+  nabla: 0x2207,
+  nacute: 0x0144,
+  nadeva: 0x0928,
+  nagujarati: 0x0AA8,
+  nagurmukhi: 0x0A28,
+  nahiragana: 0x306A,
+  nakatakana: 0x30CA,
+  nakatakanahalfwidth: 0xFF85,
+  napostrophe: 0x0149,
+  nasquare: 0x3381,
+  nbopomofo: 0x310B,
+  nbspace: 0x00A0,
+  ncaron: 0x0148,
+  ncedilla: 0x0146,
+  ncircle: 0x24DD,
+  ncircumflexbelow: 0x1E4B,
+  ncommaaccent: 0x0146,
+  ndotaccent: 0x1E45,
+  ndotbelow: 0x1E47,
+  nehiragana: 0x306D,
+  nekatakana: 0x30CD,
+  nekatakanahalfwidth: 0xFF88,
+  newsheqelsign: 0x20AA,
+  nfsquare: 0x338B,
+  ngabengali: 0x0999,
+  ngadeva: 0x0919,
+  ngagujarati: 0x0A99,
+  ngagurmukhi: 0x0A19,
+  ngonguthai: 0x0E07,
+  nhiragana: 0x3093,
+  nhookleft: 0x0272,
+  nhookretroflex: 0x0273,
+  nieunacirclekorean: 0x326F,
+  nieunaparenkorean: 0x320F,
+  nieuncieuckorean: 0x3135,
+  nieuncirclekorean: 0x3261,
+  nieunhieuhkorean: 0x3136,
+  nieunkorean: 0x3134,
+  nieunpansioskorean: 0x3168,
+  nieunparenkorean: 0x3201,
+  nieunsioskorean: 0x3167,
+  nieuntikeutkorean: 0x3166,
+  nihiragana: 0x306B,
+  nikatakana: 0x30CB,
+  nikatakanahalfwidth: 0xFF86,
+  nikhahitleftthai: 0xF899,
+  nikhahitthai: 0x0E4D,
+  nine: 0x0039,
+  ninearabic: 0x0669,
+  ninebengali: 0x09EF,
+  ninecircle: 0x2468,
+  ninecircleinversesansserif: 0x2792,
+  ninedeva: 0x096F,
+  ninegujarati: 0x0AEF,
+  ninegurmukhi: 0x0A6F,
+  ninehackarabic: 0x0669,
+  ninehangzhou: 0x3029,
+  nineideographicparen: 0x3228,
+  nineinferior: 0x2089,
+  ninemonospace: 0xFF19,
+  nineoldstyle: 0xF739,
+  nineparen: 0x247C,
+  nineperiod: 0x2490,
+  ninepersian: 0x06F9,
+  nineroman: 0x2178,
+  ninesuperior: 0x2079,
+  nineteencircle: 0x2472,
+  nineteenparen: 0x2486,
+  nineteenperiod: 0x249A,
+  ninethai: 0x0E59,
+  nj: 0x01CC,
+  njecyrillic: 0x045A,
+  nkatakana: 0x30F3,
+  nkatakanahalfwidth: 0xFF9D,
+  nlegrightlong: 0x019E,
+  nlinebelow: 0x1E49,
+  nmonospace: 0xFF4E,
+  nmsquare: 0x339A,
+  nnabengali: 0x09A3,
+  nnadeva: 0x0923,
+  nnagujarati: 0x0AA3,
+  nnagurmukhi: 0x0A23,
+  nnnadeva: 0x0929,
+  nohiragana: 0x306E,
+  nokatakana: 0x30CE,
+  nokatakanahalfwidth: 0xFF89,
+  nonbreakingspace: 0x00A0,
+  nonenthai: 0x0E13,
+  nonuthai: 0x0E19,
+  noonarabic: 0x0646,
+  noonfinalarabic: 0xFEE6,
+  noonghunnaarabic: 0x06BA,
+  noonghunnafinalarabic: 0xFB9F,
+  noonhehinitialarabic: 0xFEE7FEEC,
+  nooninitialarabic: 0xFEE7,
+  noonjeeminitialarabic: 0xFCD2,
+  noonjeemisolatedarabic: 0xFC4B,
+  noonmedialarabic: 0xFEE8,
+  noonmeeminitialarabic: 0xFCD5,
+  noonmeemisolatedarabic: 0xFC4E,
+  noonnoonfinalarabic: 0xFC8D,
+  notcontains: 0x220C,
+  notelement: 0x2209,
+  notelementof: 0x2209,
+  notequal: 0x2260,
+  notgreater: 0x226F,
+  notgreaternorequal: 0x2271,
+  notgreaternorless: 0x2279,
+  notidentical: 0x2262,
+  notless: 0x226E,
+  notlessnorequal: 0x2270,
+  notparallel: 0x2226,
+  notprecedes: 0x2280,
+  notsubset: 0x2284,
+  notsucceeds: 0x2281,
+  notsuperset: 0x2285,
+  nowarmenian: 0x0576,
+  nparen: 0x24A9,
+  nssquare: 0x33B1,
+  nsuperior: 0x207F,
+  ntilde: 0x00F1,
+  nu: 0x03BD,
+  nuhiragana: 0x306C,
+  nukatakana: 0x30CC,
+  nukatakanahalfwidth: 0xFF87,
+  nuktabengali: 0x09BC,
+  nuktadeva: 0x093C,
+  nuktagujarati: 0x0ABC,
+  nuktagurmukhi: 0x0A3C,
+  numbersign: 0x0023,
+  numbersignmonospace: 0xFF03,
+  numbersignsmall: 0xFE5F,
+  numeralsigngreek: 0x0374,
+  numeralsignlowergreek: 0x0375,
+  numero: 0x2116,
+  nun: 0x05E0,
+  nundagesh: 0xFB40,
+  nundageshhebrew: 0xFB40,
+  nunhebrew: 0x05E0,
+  nvsquare: 0x33B5,
+  nwsquare: 0x33BB,
+  nyabengali: 0x099E,
+  nyadeva: 0x091E,
+  nyagujarati: 0x0A9E,
+  nyagurmukhi: 0x0A1E,
+  o: 0x006F,
+  oacute: 0x00F3,
+  oangthai: 0x0E2D,
+  obarred: 0x0275,
+  obarredcyrillic: 0x04E9,
+  obarreddieresiscyrillic: 0x04EB,
+  obengali: 0x0993,
+  obopomofo: 0x311B,
+  obreve: 0x014F,
+  ocandradeva: 0x0911,
+  ocandragujarati: 0x0A91,
+  ocandravowelsigndeva: 0x0949,
+  ocandravowelsigngujarati: 0x0AC9,
+  ocaron: 0x01D2,
+  ocircle: 0x24DE,
+  ocircumflex: 0x00F4,
+  ocircumflexacute: 0x1ED1,
+  ocircumflexdotbelow: 0x1ED9,
+  ocircumflexgrave: 0x1ED3,
+  ocircumflexhookabove: 0x1ED5,
+  ocircumflextilde: 0x1ED7,
+  ocyrillic: 0x043E,
+  odblacute: 0x0151,
+  odblgrave: 0x020D,
+  odeva: 0x0913,
+  odieresis: 0x00F6,
+  odieresiscyrillic: 0x04E7,
+  odotbelow: 0x1ECD,
+  oe: 0x0153,
+  oekorean: 0x315A,
+  ogonek: 0x02DB,
+  ogonekcmb: 0x0328,
+  ograve: 0x00F2,
+  ogujarati: 0x0A93,
+  oharmenian: 0x0585,
+  ohiragana: 0x304A,
+  ohookabove: 0x1ECF,
+  ohorn: 0x01A1,
+  ohornacute: 0x1EDB,
+  ohorndotbelow: 0x1EE3,
+  ohorngrave: 0x1EDD,
+  ohornhookabove: 0x1EDF,
+  ohorntilde: 0x1EE1,
+  ohungarumlaut: 0x0151,
+  oi: 0x01A3,
+  oinvertedbreve: 0x020F,
+  okatakana: 0x30AA,
+  okatakanahalfwidth: 0xFF75,
+  okorean: 0x3157,
+  olehebrew: 0x05AB,
+  omacron: 0x014D,
+  omacronacute: 0x1E53,
+  omacrongrave: 0x1E51,
+  omdeva: 0x0950,
+  omega: 0x03C9,
+  omega1: 0x03D6,
+  omegacyrillic: 0x0461,
+  omegalatinclosed: 0x0277,
+  omegaroundcyrillic: 0x047B,
+  omegatitlocyrillic: 0x047D,
+  omegatonos: 0x03CE,
+  omgujarati: 0x0AD0,
+  omicron: 0x03BF,
+  omicrontonos: 0x03CC,
+  omonospace: 0xFF4F,
+  one: 0x0031,
+  onearabic: 0x0661,
+  onebengali: 0x09E7,
+  onecircle: 0x2460,
+  onecircleinversesansserif: 0x278A,
+  onedeva: 0x0967,
+  onedotenleader: 0x2024,
+  oneeighth: 0x215B,
+  onefitted: 0xF6DC,
+  onegujarati: 0x0AE7,
+  onegurmukhi: 0x0A67,
+  onehackarabic: 0x0661,
+  onehalf: 0x00BD,
+  onehangzhou: 0x3021,
+  oneideographicparen: 0x3220,
+  oneinferior: 0x2081,
+  onemonospace: 0xFF11,
+  onenumeratorbengali: 0x09F4,
+  oneoldstyle: 0xF731,
+  oneparen: 0x2474,
+  oneperiod: 0x2488,
+  onepersian: 0x06F1,
+  onequarter: 0x00BC,
+  oneroman: 0x2170,
+  onesuperior: 0x00B9,
+  onethai: 0x0E51,
+  onethird: 0x2153,
+  oogonek: 0x01EB,
+  oogonekmacron: 0x01ED,
+  oogurmukhi: 0x0A13,
+  oomatragurmukhi: 0x0A4B,
+  oopen: 0x0254,
+  oparen: 0x24AA,
+  openbullet: 0x25E6,
+  option: 0x2325,
+  ordfeminine: 0x00AA,
+  ordmasculine: 0x00BA,
+  orthogonal: 0x221F,
+  oshortdeva: 0x0912,
+  oshortvowelsigndeva: 0x094A,
+  oslash: 0x00F8,
+  oslashacute: 0x01FF,
+  osmallhiragana: 0x3049,
+  osmallkatakana: 0x30A9,
+  osmallkatakanahalfwidth: 0xFF6B,
+  ostrokeacute: 0x01FF,
+  osuperior: 0xF6F0,
+  otcyrillic: 0x047F,
+  otilde: 0x00F5,
+  otildeacute: 0x1E4D,
+  otildedieresis: 0x1E4F,
+  oubopomofo: 0x3121,
+  overline: 0x203E,
+  overlinecenterline: 0xFE4A,
+  overlinecmb: 0x0305,
+  overlinedashed: 0xFE49,
+  overlinedblwavy: 0xFE4C,
+  overlinewavy: 0xFE4B,
+  overscore: 0x00AF,
+  ovowelsignbengali: 0x09CB,
+  ovowelsigndeva: 0x094B,
+  ovowelsigngujarati: 0x0ACB,
+  p: 0x0070,
+  paampssquare: 0x3380,
+  paasentosquare: 0x332B,
+  pabengali: 0x09AA,
+  pacute: 0x1E55,
+  padeva: 0x092A,
+  pagedown: 0x21DF,
+  pageup: 0x21DE,
+  pagujarati: 0x0AAA,
+  pagurmukhi: 0x0A2A,
+  pahiragana: 0x3071,
+  paiyannoithai: 0x0E2F,
+  pakatakana: 0x30D1,
+  palatalizationcyrilliccmb: 0x0484,
+  palochkacyrillic: 0x04C0,
+  pansioskorean: 0x317F,
+  paragraph: 0x00B6,
+  parallel: 0x2225,
+  parenleft: 0x0028,
+  parenleftaltonearabic: 0xFD3E,
+  parenleftbt: 0xF8ED,
+  parenleftex: 0xF8EC,
+  parenleftinferior: 0x208D,
+  parenleftmonospace: 0xFF08,
+  parenleftsmall: 0xFE59,
+  parenleftsuperior: 0x207D,
+  parenlefttp: 0xF8EB,
+  parenleftvertical: 0xFE35,
+  parenright: 0x0029,
+  parenrightaltonearabic: 0xFD3F,
+  parenrightbt: 0xF8F8,
+  parenrightex: 0xF8F7,
+  parenrightinferior: 0x208E,
+  parenrightmonospace: 0xFF09,
+  parenrightsmall: 0xFE5A,
+  parenrightsuperior: 0x207E,
+  parenrighttp: 0xF8F6,
+  parenrightvertical: 0xFE36,
+  partialdiff: 0x2202,
+  paseqhebrew: 0x05C0,
+  pashtahebrew: 0x0599,
+  pasquare: 0x33A9,
+  patah: 0x05B7,
+  patah11: 0x05B7,
+  patah1d: 0x05B7,
+  patah2a: 0x05B7,
+  patahhebrew: 0x05B7,
+  patahnarrowhebrew: 0x05B7,
+  patahquarterhebrew: 0x05B7,
+  patahwidehebrew: 0x05B7,
+  pazerhebrew: 0x05A1,
+  pbopomofo: 0x3106,
+  pcircle: 0x24DF,
+  pdotaccent: 0x1E57,
+  pe: 0x05E4,
+  pecyrillic: 0x043F,
+  pedagesh: 0xFB44,
+  pedageshhebrew: 0xFB44,
+  peezisquare: 0x333B,
+  pefinaldageshhebrew: 0xFB43,
+  peharabic: 0x067E,
+  peharmenian: 0x057A,
+  pehebrew: 0x05E4,
+  pehfinalarabic: 0xFB57,
+  pehinitialarabic: 0xFB58,
+  pehiragana: 0x307A,
+  pehmedialarabic: 0xFB59,
+  pekatakana: 0x30DA,
+  pemiddlehookcyrillic: 0x04A7,
+  perafehebrew: 0xFB4E,
+  percent: 0x0025,
+  percentarabic: 0x066A,
+  percentmonospace: 0xFF05,
+  percentsmall: 0xFE6A,
+  period: 0x002E,
+  periodarmenian: 0x0589,
+  periodcentered: 0x00B7,
+  periodhalfwidth: 0xFF61,
+  periodinferior: 0xF6E7,
+  periodmonospace: 0xFF0E,
+  periodsmall: 0xFE52,
+  periodsuperior: 0xF6E8,
+  perispomenigreekcmb: 0x0342,
+  perpendicular: 0x22A5,
+  perthousand: 0x2030,
+  peseta: 0x20A7,
+  pfsquare: 0x338A,
+  phabengali: 0x09AB,
+  phadeva: 0x092B,
+  phagujarati: 0x0AAB,
+  phagurmukhi: 0x0A2B,
+  phi: 0x03C6,
+  phi1: 0x03D5,
+  phieuphacirclekorean: 0x327A,
+  phieuphaparenkorean: 0x321A,
+  phieuphcirclekorean: 0x326C,
+  phieuphkorean: 0x314D,
+  phieuphparenkorean: 0x320C,
+  philatin: 0x0278,
+  phinthuthai: 0x0E3A,
+  phisymbolgreek: 0x03D5,
+  phook: 0x01A5,
+  phophanthai: 0x0E1E,
+  phophungthai: 0x0E1C,
+  phosamphaothai: 0x0E20,
+  pi: 0x03C0,
+  pieupacirclekorean: 0x3273,
+  pieupaparenkorean: 0x3213,
+  pieupcieuckorean: 0x3176,
+  pieupcirclekorean: 0x3265,
+  pieupkiyeokkorean: 0x3172,
+  pieupkorean: 0x3142,
+  pieupparenkorean: 0x3205,
+  pieupsioskiyeokkorean: 0x3174,
+  pieupsioskorean: 0x3144,
+  pieupsiostikeutkorean: 0x3175,
+  pieupthieuthkorean: 0x3177,
+  pieuptikeutkorean: 0x3173,
+  pihiragana: 0x3074,
+  pikatakana: 0x30D4,
+  pisymbolgreek: 0x03D6,
+  piwrarmenian: 0x0583,
+  plus: 0x002B,
+  plusbelowcmb: 0x031F,
+  pluscircle: 0x2295,
+  plusminus: 0x00B1,
+  plusmod: 0x02D6,
+  plusmonospace: 0xFF0B,
+  plussmall: 0xFE62,
+  plussuperior: 0x207A,
+  pmonospace: 0xFF50,
+  pmsquare: 0x33D8,
+  pohiragana: 0x307D,
+  pointingindexdownwhite: 0x261F,
+  pointingindexleftwhite: 0x261C,
+  pointingindexrightwhite: 0x261E,
+  pointingindexupwhite: 0x261D,
+  pokatakana: 0x30DD,
+  poplathai: 0x0E1B,
+  postalmark: 0x3012,
+  postalmarkface: 0x3020,
+  pparen: 0x24AB,
+  precedes: 0x227A,
+  prescription: 0x211E,
+  primemod: 0x02B9,
+  primereversed: 0x2035,
+  product: 0x220F,
+  projective: 0x2305,
+  prolongedkana: 0x30FC,
+  propellor: 0x2318,
+  propersubset: 0x2282,
+  propersuperset: 0x2283,
+  proportion: 0x2237,
+  proportional: 0x221D,
+  psi: 0x03C8,
+  psicyrillic: 0x0471,
+  psilipneumatacyrilliccmb: 0x0486,
+  pssquare: 0x33B0,
+  puhiragana: 0x3077,
+  pukatakana: 0x30D7,
+  pvsquare: 0x33B4,
+  pwsquare: 0x33BA,
+  q: 0x0071,
+  qadeva: 0x0958,
+  qadmahebrew: 0x05A8,
+  qafarabic: 0x0642,
+  qaffinalarabic: 0xFED6,
+  qafinitialarabic: 0xFED7,
+  qafmedialarabic: 0xFED8,
+  qamats: 0x05B8,
+  qamats10: 0x05B8,
+  qamats1a: 0x05B8,
+  qamats1c: 0x05B8,
+  qamats27: 0x05B8,
+  qamats29: 0x05B8,
+  qamats33: 0x05B8,
+  qamatsde: 0x05B8,
+  qamatshebrew: 0x05B8,
+  qamatsnarrowhebrew: 0x05B8,
+  qamatsqatanhebrew: 0x05B8,
+  qamatsqatannarrowhebrew: 0x05B8,
+  qamatsqatanquarterhebrew: 0x05B8,
+  qamatsqatanwidehebrew: 0x05B8,
+  qamatsquarterhebrew: 0x05B8,
+  qamatswidehebrew: 0x05B8,
+  qarneyparahebrew: 0x059F,
+  qbopomofo: 0x3111,
+  qcircle: 0x24E0,
+  qhook: 0x02A0,
+  qmonospace: 0xFF51,
+  qof: 0x05E7,
+  qofdagesh: 0xFB47,
+  qofdageshhebrew: 0xFB47,
+  qofhatafpatah: 0x05E705B2,
+  qofhatafpatahhebrew: 0x05E705B2,
+  qofhatafsegol: 0x05E705B1,
+  qofhatafsegolhebrew: 0x05E705B1,
+  qofhebrew: 0x05E7,
+  qofhiriq: 0x05E705B4,
+  qofhiriqhebrew: 0x05E705B4,
+  qofholam: 0x05E705B9,
+  qofholamhebrew: 0x05E705B9,
+  qofpatah: 0x05E705B7,
+  qofpatahhebrew: 0x05E705B7,
+  qofqamats: 0x05E705B8,
+  qofqamatshebrew: 0x05E705B8,
+  qofqubuts: 0x05E705BB,
+  qofqubutshebrew: 0x05E705BB,
+  qofsegol: 0x05E705B6,
+  qofsegolhebrew: 0x05E705B6,
+  qofsheva: 0x05E705B0,
+  qofshevahebrew: 0x05E705B0,
+  qoftsere: 0x05E705B5,
+  qoftserehebrew: 0x05E705B5,
+  qparen: 0x24AC,
+  quarternote: 0x2669,
+  qubuts: 0x05BB,
+  qubuts18: 0x05BB,
+  qubuts25: 0x05BB,
+  qubuts31: 0x05BB,
+  qubutshebrew: 0x05BB,
+  qubutsnarrowhebrew: 0x05BB,
+  qubutsquarterhebrew: 0x05BB,
+  qubutswidehebrew: 0x05BB,
+  question: 0x003F,
+  questionarabic: 0x061F,
+  questionarmenian: 0x055E,
+  questiondown: 0x00BF,
+  questiondownsmall: 0xF7BF,
+  questiongreek: 0x037E,
+  questionmonospace: 0xFF1F,
+  questionsmall: 0xF73F,
+  quotedbl: 0x0022,
+  quotedblbase: 0x201E,
+  quotedblleft: 0x201C,
+  quotedblmonospace: 0xFF02,
+  quotedblprime: 0x301E,
+  quotedblprimereversed: 0x301D,
+  quotedblright: 0x201D,
+  quoteleft: 0x2018,
+  quoteleftreversed: 0x201B,
+  quotereversed: 0x201B,
+  quoteright: 0x2019,
+  quoterightn: 0x0149,
+  quotesinglbase: 0x201A,
+  quotesingle: 0x0027,
+  quotesinglemonospace: 0xFF07,
+  r: 0x0072,
+  raarmenian: 0x057C,
+  rabengali: 0x09B0,
+  racute: 0x0155,
+  radeva: 0x0930,
+  radical: 0x221A,
+  radicalex: 0xF8E5,
+  radoverssquare: 0x33AE,
+  radoverssquaredsquare: 0x33AF,
+  radsquare: 0x33AD,
+  rafe: 0x05BF,
+  rafehebrew: 0x05BF,
+  ragujarati: 0x0AB0,
+  ragurmukhi: 0x0A30,
+  rahiragana: 0x3089,
+  rakatakana: 0x30E9,
+  rakatakanahalfwidth: 0xFF97,
+  ralowerdiagonalbengali: 0x09F1,
+  ramiddlediagonalbengali: 0x09F0,
+  ramshorn: 0x0264,
+  ratio: 0x2236,
+  rbopomofo: 0x3116,
+  rcaron: 0x0159,
+  rcedilla: 0x0157,
+  rcircle: 0x24E1,
+  rcommaaccent: 0x0157,
+  rdblgrave: 0x0211,
+  rdotaccent: 0x1E59,
+  rdotbelow: 0x1E5B,
+  rdotbelowmacron: 0x1E5D,
+  referencemark: 0x203B,
+  reflexsubset: 0x2286,
+  reflexsuperset: 0x2287,
+  registered: 0x00AE,
+  registersans: 0xF8E8,
+  registerserif: 0xF6DA,
+  reharabic: 0x0631,
+  reharmenian: 0x0580,
+  rehfinalarabic: 0xFEAE,
+  rehiragana: 0x308C,
+  rehyehaleflamarabic: '0631 FEF3 FE8E 0644',
+  rekatakana: 0x30EC,
+  rekatakanahalfwidth: 0xFF9A,
+  resh: 0x05E8,
+  reshdageshhebrew: 0xFB48,
+  reshhatafpatah: 0x05E805B2,
+  reshhatafpatahhebrew: 0x05E805B2,
+  reshhatafsegol: 0x05E805B1,
+  reshhatafsegolhebrew: 0x05E805B1,
+  reshhebrew: 0x05E8,
+  reshhiriq: 0x05E805B4,
+  reshhiriqhebrew: 0x05E805B4,
+  reshholam: 0x05E805B9,
+  reshholamhebrew: 0x05E805B9,
+  reshpatah: 0x05E805B7,
+  reshpatahhebrew: 0x05E805B7,
+  reshqamats: 0x05E805B8,
+  reshqamatshebrew: 0x05E805B8,
+  reshqubuts: 0x05E805BB,
+  reshqubutshebrew: 0x05E805BB,
+  reshsegol: 0x05E805B6,
+  reshsegolhebrew: 0x05E805B6,
+  reshsheva: 0x05E805B0,
+  reshshevahebrew: 0x05E805B0,
+  reshtsere: 0x05E805B5,
+  reshtserehebrew: 0x05E805B5,
+  reversedtilde: 0x223D,
+  reviahebrew: 0x0597,
+  reviamugrashhebrew: 0x0597,
+  revlogicalnot: 0x2310,
+  rfishhook: 0x027E,
+  rfishhookreversed: 0x027F,
+  rhabengali: 0x09DD,
+  rhadeva: 0x095D,
+  rho: 0x03C1,
+  rhook: 0x027D,
+  rhookturned: 0x027B,
+  rhookturnedsuperior: 0x02B5,
+  rhosymbolgreek: 0x03F1,
+  rhotichookmod: 0x02DE,
+  rieulacirclekorean: 0x3271,
+  rieulaparenkorean: 0x3211,
+  rieulcirclekorean: 0x3263,
+  rieulhieuhkorean: 0x3140,
+  rieulkiyeokkorean: 0x313A,
+  rieulkiyeoksioskorean: 0x3169,
+  rieulkorean: 0x3139,
+  rieulmieumkorean: 0x313B,
+  rieulpansioskorean: 0x316C,
+  rieulparenkorean: 0x3203,
+  rieulphieuphkorean: 0x313F,
+  rieulpieupkorean: 0x313C,
+  rieulpieupsioskorean: 0x316B,
+  rieulsioskorean: 0x313D,
+  rieulthieuthkorean: 0x313E,
+  rieultikeutkorean: 0x316A,
+  rieulyeorinhieuhkorean: 0x316D,
+  rightangle: 0x221F,
+  righttackbelowcmb: 0x0319,
+  righttriangle: 0x22BF,
+  rihiragana: 0x308A,
+  rikatakana: 0x30EA,
+  rikatakanahalfwidth: 0xFF98,
+  ring: 0x02DA,
+  ringbelowcmb: 0x0325,
+  ringcmb: 0x030A,
+  ringhalfleft: 0x02BF,
+  ringhalfleftarmenian: 0x0559,
+  ringhalfleftbelowcmb: 0x031C,
+  ringhalfleftcentered: 0x02D3,
+  ringhalfright: 0x02BE,
+  ringhalfrightbelowcmb: 0x0339,
+  ringhalfrightcentered: 0x02D2,
+  rinvertedbreve: 0x0213,
+  rittorusquare: 0x3351,
+  rlinebelow: 0x1E5F,
+  rlongleg: 0x027C,
+  rlonglegturned: 0x027A,
+  rmonospace: 0xFF52,
+  rohiragana: 0x308D,
+  rokatakana: 0x30ED,
+  rokatakanahalfwidth: 0xFF9B,
+  roruathai: 0x0E23,
+  rparen: 0x24AD,
+  rrabengali: 0x09DC,
+  rradeva: 0x0931,
+  rragurmukhi: 0x0A5C,
+  rreharabic: 0x0691,
+  rrehfinalarabic: 0xFB8D,
+  rrvocalicbengali: 0x09E0,
+  rrvocalicdeva: 0x0960,
+  rrvocalicgujarati: 0x0AE0,
+  rrvocalicvowelsignbengali: 0x09C4,
+  rrvocalicvowelsigndeva: 0x0944,
+  rrvocalicvowelsigngujarati: 0x0AC4,
+  rsuperior: 0xF6F1,
+  rtblock: 0x2590,
+  rturned: 0x0279,
+  rturnedsuperior: 0x02B4,
+  ruhiragana: 0x308B,
+  rukatakana: 0x30EB,
+  rukatakanahalfwidth: 0xFF99,
+  rupeemarkbengali: 0x09F2,
+  rupeesignbengali: 0x09F3,
+  rupiah: 0xF6DD,
+  ruthai: 0x0E24,
+  rvocalicbengali: 0x098B,
+  rvocalicdeva: 0x090B,
+  rvocalicgujarati: 0x0A8B,
+  rvocalicvowelsignbengali: 0x09C3,
+  rvocalicvowelsigndeva: 0x0943,
+  rvocalicvowelsigngujarati: 0x0AC3,
+  s: 0x0073,
+  sabengali: 0x09B8,
+  sacute: 0x015B,
+  sacutedotaccent: 0x1E65,
+  sadarabic: 0x0635,
+  sadeva: 0x0938,
+  sadfinalarabic: 0xFEBA,
+  sadinitialarabic: 0xFEBB,
+  sadmedialarabic: 0xFEBC,
+  sagujarati: 0x0AB8,
+  sagurmukhi: 0x0A38,
+  sahiragana: 0x3055,
+  sakatakana: 0x30B5,
+  sakatakanahalfwidth: 0xFF7B,
+  sallallahoualayhewasallamarabic: 0xFDFA,
+  samekh: 0x05E1,
+  samekhdagesh: 0xFB41,
+  samekhdageshhebrew: 0xFB41,
+  samekhhebrew: 0x05E1,
+  saraaathai: 0x0E32,
+  saraaethai: 0x0E41,
+  saraaimaimalaithai: 0x0E44,
+  saraaimaimuanthai: 0x0E43,
+  saraamthai: 0x0E33,
+  saraathai: 0x0E30,
+  saraethai: 0x0E40,
+  saraiileftthai: 0xF886,
+  saraiithai: 0x0E35,
+  saraileftthai: 0xF885,
+  saraithai: 0x0E34,
+  saraothai: 0x0E42,
+  saraueeleftthai: 0xF888,
+  saraueethai: 0x0E37,
+  saraueleftthai: 0xF887,
+  sarauethai: 0x0E36,
+  sarauthai: 0x0E38,
+  sarauuthai: 0x0E39,
+  sbopomofo: 0x3119,
+  scaron: 0x0161,
+  scarondotaccent: 0x1E67,
+  scedilla: 0x015F,
+  schwa: 0x0259,
+  schwacyrillic: 0x04D9,
+  schwadieresiscyrillic: 0x04DB,
+  schwahook: 0x025A,
+  scircle: 0x24E2,
+  scircumflex: 0x015D,
+  scommaaccent: 0x0219,
+  sdotaccent: 0x1E61,
+  sdotbelow: 0x1E63,
+  sdotbelowdotaccent: 0x1E69,
+  seagullbelowcmb: 0x033C,
+  second: 0x2033,
+  secondtonechinese: 0x02CA,
+  section: 0x00A7,
+  seenarabic: 0x0633,
+  seenfinalarabic: 0xFEB2,
+  seeninitialarabic: 0xFEB3,
+  seenmedialarabic: 0xFEB4,
+  segol: 0x05B6,
+  segol13: 0x05B6,
+  segol1f: 0x05B6,
+  segol2c: 0x05B6,
+  segolhebrew: 0x05B6,
+  segolnarrowhebrew: 0x05B6,
+  segolquarterhebrew: 0x05B6,
+  segoltahebrew: 0x0592,
+  segolwidehebrew: 0x05B6,
+  seharmenian: 0x057D,
+  sehiragana: 0x305B,
+  sekatakana: 0x30BB,
+  sekatakanahalfwidth: 0xFF7E,
+  semicolon: 0x003B,
+  semicolonarabic: 0x061B,
+  semicolonmonospace: 0xFF1B,
+  semicolonsmall: 0xFE54,
+  semivoicedmarkkana: 0x309C,
+  semivoicedmarkkanahalfwidth: 0xFF9F,
+  sentisquare: 0x3322,
+  sentosquare: 0x3323,
+  seven: 0x0037,
+  sevenarabic: 0x0667,
+  sevenbengali: 0x09ED,
+  sevencircle: 0x2466,
+  sevencircleinversesansserif: 0x2790,
+  sevendeva: 0x096D,
+  seveneighths: 0x215E,
+  sevengujarati: 0x0AED,
+  sevengurmukhi: 0x0A6D,
+  sevenhackarabic: 0x0667,
+  sevenhangzhou: 0x3027,
+  sevenideographicparen: 0x3226,
+  seveninferior: 0x2087,
+  sevenmonospace: 0xFF17,
+  sevenoldstyle: 0xF737,
+  sevenparen: 0x247A,
+  sevenperiod: 0x248E,
+  sevenpersian: 0x06F7,
+  sevenroman: 0x2176,
+  sevensuperior: 0x2077,
+  seventeencircle: 0x2470,
+  seventeenparen: 0x2484,
+  seventeenperiod: 0x2498,
+  seventhai: 0x0E57,
+  sfthyphen: 0x00AD,
+  shaarmenian: 0x0577,
+  shabengali: 0x09B6,
+  shacyrillic: 0x0448,
+  shaddaarabic: 0x0651,
+  shaddadammaarabic: 0xFC61,
+  shaddadammatanarabic: 0xFC5E,
+  shaddafathaarabic: 0xFC60,
+  shaddafathatanarabic: 0x0651064B,
+  shaddakasraarabic: 0xFC62,
+  shaddakasratanarabic: 0xFC5F,
+  shade: 0x2592,
+  shadedark: 0x2593,
+  shadelight: 0x2591,
+  shademedium: 0x2592,
+  shadeva: 0x0936,
+  shagujarati: 0x0AB6,
+  shagurmukhi: 0x0A36,
+  shalshelethebrew: 0x0593,
+  shbopomofo: 0x3115,
+  shchacyrillic: 0x0449,
+  sheenarabic: 0x0634,
+  sheenfinalarabic: 0xFEB6,
+  sheeninitialarabic: 0xFEB7,
+  sheenmedialarabic: 0xFEB8,
+  sheicoptic: 0x03E3,
+  sheqel: 0x20AA,
+  sheqelhebrew: 0x20AA,
+  sheva: 0x05B0,
+  sheva115: 0x05B0,
+  sheva15: 0x05B0,
+  sheva22: 0x05B0,
+  sheva2e: 0x05B0,
+  shevahebrew: 0x05B0,
+  shevanarrowhebrew: 0x05B0,
+  shevaquarterhebrew: 0x05B0,
+  shevawidehebrew: 0x05B0,
+  shhacyrillic: 0x04BB,
+  shimacoptic: 0x03ED,
+  shin: 0x05E9,
+  shindagesh: 0xFB49,
+  shindageshhebrew: 0xFB49,
+  shindageshshindot: 0xFB2C,
+  shindageshshindothebrew: 0xFB2C,
+  shindageshsindot: 0xFB2D,
+  shindageshsindothebrew: 0xFB2D,
+  shindothebrew: 0x05C1,
+  shinhebrew: 0x05E9,
+  shinshindot: 0xFB2A,
+  shinshindothebrew: 0xFB2A,
+  shinsindot: 0xFB2B,
+  shinsindothebrew: 0xFB2B,
+  shook: 0x0282,
+  sigma: 0x03C3,
+  sigma1: 0x03C2,
+  sigmafinal: 0x03C2,
+  sigmalunatesymbolgreek: 0x03F2,
+  sihiragana: 0x3057,
+  sikatakana: 0x30B7,
+  sikatakanahalfwidth: 0xFF7C,
+  siluqhebrew: 0x05BD,
+  siluqlefthebrew: 0x05BD,
+  similar: 0x223C,
+  sindothebrew: 0x05C2,
+  siosacirclekorean: 0x3274,
+  siosaparenkorean: 0x3214,
+  sioscieuckorean: 0x317E,
+  sioscirclekorean: 0x3266,
+  sioskiyeokkorean: 0x317A,
+  sioskorean: 0x3145,
+  siosnieunkorean: 0x317B,
+  siosparenkorean: 0x3206,
+  siospieupkorean: 0x317D,
+  siostikeutkorean: 0x317C,
+  six: 0x0036,
+  sixarabic: 0x0666,
+  sixbengali: 0x09EC,
+  sixcircle: 0x2465,
+  sixcircleinversesansserif: 0x278F,
+  sixdeva: 0x096C,
+  sixgujarati: 0x0AEC,
+  sixgurmukhi: 0x0A6C,
+  sixhackarabic: 0x0666,
+  sixhangzhou: 0x3026,
+  sixideographicparen: 0x3225,
+  sixinferior: 0x2086,
+  sixmonospace: 0xFF16,
+  sixoldstyle: 0xF736,
+  sixparen: 0x2479,
+  sixperiod: 0x248D,
+  sixpersian: 0x06F6,
+  sixroman: 0x2175,
+  sixsuperior: 0x2076,
+  sixteencircle: 0x246F,
+  sixteencurrencydenominatorbengali: 0x09F9,
+  sixteenparen: 0x2483,
+  sixteenperiod: 0x2497,
+  sixthai: 0x0E56,
+  slash: 0x002F,
+  slashmonospace: 0xFF0F,
+  slong: 0x017F,
+  slongdotaccent: 0x1E9B,
+  smileface: 0x263A,
+  smonospace: 0xFF53,
+  sofpasuqhebrew: 0x05C3,
+  softhyphen: 0x00AD,
+  softsigncyrillic: 0x044C,
+  sohiragana: 0x305D,
+  sokatakana: 0x30BD,
+  sokatakanahalfwidth: 0xFF7F,
+  soliduslongoverlaycmb: 0x0338,
+  solidusshortoverlaycmb: 0x0337,
+  sorusithai: 0x0E29,
+  sosalathai: 0x0E28,
+  sosothai: 0x0E0B,
+  sosuathai: 0x0E2A,
+  space: 0x0020,
+  spacehackarabic: 0x0020,
+  spade: 0x2660,
+  spadesuitblack: 0x2660,
+  spadesuitwhite: 0x2664,
+  sparen: 0x24AE,
+  squarebelowcmb: 0x033B,
+  squarecc: 0x33C4,
+  squarecm: 0x339D,
+  squarediagonalcrosshatchfill: 0x25A9,
+  squarehorizontalfill: 0x25A4,
+  squarekg: 0x338F,
+  squarekm: 0x339E,
+  squarekmcapital: 0x33CE,
+  squareln: 0x33D1,
+  squarelog: 0x33D2,
+  squaremg: 0x338E,
+  squaremil: 0x33D5,
+  squaremm: 0x339C,
+  squaremsquared: 0x33A1,
+  squareorthogonalcrosshatchfill: 0x25A6,
+  squareupperlefttolowerrightfill: 0x25A7,
+  squareupperrighttolowerleftfill: 0x25A8,
+  squareverticalfill: 0x25A5,
+  squarewhitewithsmallblack: 0x25A3,
+  srsquare: 0x33DB,
+  ssabengali: 0x09B7,
+  ssadeva: 0x0937,
+  ssagujarati: 0x0AB7,
+  ssangcieuckorean: 0x3149,
+  ssanghieuhkorean: 0x3185,
+  ssangieungkorean: 0x3180,
+  ssangkiyeokkorean: 0x3132,
+  ssangnieunkorean: 0x3165,
+  ssangpieupkorean: 0x3143,
+  ssangsioskorean: 0x3146,
+  ssangtikeutkorean: 0x3138,
+  ssuperior: 0xF6F2,
+  sterling: 0x00A3,
+  sterlingmonospace: 0xFFE1,
+  strokelongoverlaycmb: 0x0336,
+  strokeshortoverlaycmb: 0x0335,
+  subset: 0x2282,
+  subsetnotequal: 0x228A,
+  subsetorequal: 0x2286,
+  succeeds: 0x227B,
+  suchthat: 0x220B,
+  suhiragana: 0x3059,
+  sukatakana: 0x30B9,
+  sukatakanahalfwidth: 0xFF7D,
+  sukunarabic: 0x0652,
+  summation: 0x2211,
+  sun: 0x263C,
+  superset: 0x2283,
+  supersetnotequal: 0x228B,
+  supersetorequal: 0x2287,
+  svsquare: 0x33DC,
+  syouwaerasquare: 0x337C,
+  t: 0x0074,
+  tabengali: 0x09A4,
+  tackdown: 0x22A4,
+  tackleft: 0x22A3,
+  tadeva: 0x0924,
+  tagujarati: 0x0AA4,
+  tagurmukhi: 0x0A24,
+  taharabic: 0x0637,
+  tahfinalarabic: 0xFEC2,
+  tahinitialarabic: 0xFEC3,
+  tahiragana: 0x305F,
+  tahmedialarabic: 0xFEC4,
+  taisyouerasquare: 0x337D,
+  takatakana: 0x30BF,
+  takatakanahalfwidth: 0xFF80,
+  tatweelarabic: 0x0640,
+  tau: 0x03C4,
+  tav: 0x05EA,
+  tavdages: 0xFB4A,
+  tavdagesh: 0xFB4A,
+  tavdageshhebrew: 0xFB4A,
+  tavhebrew: 0x05EA,
+  tbar: 0x0167,
+  tbopomofo: 0x310A,
+  tcaron: 0x0165,
+  tccurl: 0x02A8,
+  tcedilla: 0x0163,
+  tcheharabic: 0x0686,
+  tchehfinalarabic: 0xFB7B,
+  tchehinitialarabic: 0xFB7C,
+  tchehmedialarabic: 0xFB7D,
+  tchehmeeminitialarabic: 0xFB7CFEE4,
+  tcircle: 0x24E3,
+  tcircumflexbelow: 0x1E71,
+  tcommaaccent: 0x0163,
+  tdieresis: 0x1E97,
+  tdotaccent: 0x1E6B,
+  tdotbelow: 0x1E6D,
+  tecyrillic: 0x0442,
+  tedescendercyrillic: 0x04AD,
+  teharabic: 0x062A,
+  tehfinalarabic: 0xFE96,
+  tehhahinitialarabic: 0xFCA2,
+  tehhahisolatedarabic: 0xFC0C,
+  tehinitialarabic: 0xFE97,
+  tehiragana: 0x3066,
+  tehjeeminitialarabic: 0xFCA1,
+  tehjeemisolatedarabic: 0xFC0B,
+  tehmarbutaarabic: 0x0629,
+  tehmarbutafinalarabic: 0xFE94,
+  tehmedialarabic: 0xFE98,
+  tehmeeminitialarabic: 0xFCA4,
+  tehmeemisolatedarabic: 0xFC0E,
+  tehnoonfinalarabic: 0xFC73,
+  tekatakana: 0x30C6,
+  tekatakanahalfwidth: 0xFF83,
+  telephone: 0x2121,
+  telephoneblack: 0x260E,
+  telishagedolahebrew: 0x05A0,
+  telishaqetanahebrew: 0x05A9,
+  tencircle: 0x2469,
+  tenideographicparen: 0x3229,
+  tenparen: 0x247D,
+  tenperiod: 0x2491,
+  tenroman: 0x2179,
+  tesh: 0x02A7,
+  tet: 0x05D8,
+  tetdagesh: 0xFB38,
+  tetdageshhebrew: 0xFB38,
+  tethebrew: 0x05D8,
+  tetsecyrillic: 0x04B5,
+  tevirhebrew: 0x059B,
+  tevirlefthebrew: 0x059B,
+  thabengali: 0x09A5,
+  thadeva: 0x0925,
+  thagujarati: 0x0AA5,
+  thagurmukhi: 0x0A25,
+  thalarabic: 0x0630,
+  thalfinalarabic: 0xFEAC,
+  thanthakhatlowleftthai: 0xF898,
+  thanthakhatlowrightthai: 0xF897,
+  thanthakhatthai: 0x0E4C,
+  thanthakhatupperleftthai: 0xF896,
+  theharabic: 0x062B,
+  thehfinalarabic: 0xFE9A,
+  thehinitialarabic: 0xFE9B,
+  thehmedialarabic: 0xFE9C,
+  thereexists: 0x2203,
+  therefore: 0x2234,
+  theta: 0x03B8,
+  theta1: 0x03D1,
+  thetasymbolgreek: 0x03D1,
+  thieuthacirclekorean: 0x3279,
+  thieuthaparenkorean: 0x3219,
+  thieuthcirclekorean: 0x326B,
+  thieuthkorean: 0x314C,
+  thieuthparenkorean: 0x320B,
+  thirteencircle: 0x246C,
+  thirteenparen: 0x2480,
+  thirteenperiod: 0x2494,
+  thonangmonthothai: 0x0E11,
+  thook: 0x01AD,
+  thophuthaothai: 0x0E12,
+  thorn: 0x00FE,
+  thothahanthai: 0x0E17,
+  thothanthai: 0x0E10,
+  thothongthai: 0x0E18,
+  thothungthai: 0x0E16,
+  thousandcyrillic: 0x0482,
+  thousandsseparatorarabic: 0x066C,
+  thousandsseparatorpersian: 0x066C,
+  three: 0x0033,
+  threearabic: 0x0663,
+  threebengali: 0x09E9,
+  threecircle: 0x2462,
+  threecircleinversesansserif: 0x278C,
+  threedeva: 0x0969,
+  threeeighths: 0x215C,
+  threegujarati: 0x0AE9,
+  threegurmukhi: 0x0A69,
+  threehackarabic: 0x0663,
+  threehangzhou: 0x3023,
+  threeideographicparen: 0x3222,
+  threeinferior: 0x2083,
+  threemonospace: 0xFF13,
+  threenumeratorbengali: 0x09F6,
+  threeoldstyle: 0xF733,
+  threeparen: 0x2476,
+  threeperiod: 0x248A,
+  threepersian: 0x06F3,
+  threequarters: 0x00BE,
+  threequartersemdash: 0xF6DE,
+  threeroman: 0x2172,
+  threesuperior: 0x00B3,
+  threethai: 0x0E53,
+  thzsquare: 0x3394,
+  tihiragana: 0x3061,
+  tikatakana: 0x30C1,
+  tikatakanahalfwidth: 0xFF81,
+  tikeutacirclekorean: 0x3270,
+  tikeutaparenkorean: 0x3210,
+  tikeutcirclekorean: 0x3262,
+  tikeutkorean: 0x3137,
+  tikeutparenkorean: 0x3202,
+  tilde: 0x02DC,
+  tildebelowcmb: 0x0330,
+  tildecmb: 0x0303,
+  tildecomb: 0x0303,
+  tildedoublecmb: 0x0360,
+  tildeoperator: 0x223C,
+  tildeoverlaycmb: 0x0334,
+  tildeverticalcmb: 0x033E,
+  timescircle: 0x2297,
+  tipehahebrew: 0x0596,
+  tipehalefthebrew: 0x0596,
+  tippigurmukhi: 0x0A70,
+  titlocyrilliccmb: 0x0483,
+  tiwnarmenian: 0x057F,
+  tlinebelow: 0x1E6F,
+  tmonospace: 0xFF54,
+  toarmenian: 0x0569,
+  tohiragana: 0x3068,
+  tokatakana: 0x30C8,
+  tokatakanahalfwidth: 0xFF84,
+  tonebarextrahighmod: 0x02E5,
+  tonebarextralowmod: 0x02E9,
+  tonebarhighmod: 0x02E6,
+  tonebarlowmod: 0x02E8,
+  tonebarmidmod: 0x02E7,
+  tonefive: 0x01BD,
+  tonesix: 0x0185,
+  tonetwo: 0x01A8,
+  tonos: 0x0384,
+  tonsquare: 0x3327,
+  topatakthai: 0x0E0F,
+  tortoiseshellbracketleft: 0x3014,
+  tortoiseshellbracketleftsmall: 0xFE5D,
+  tortoiseshellbracketleftvertical: 0xFE39,
+  tortoiseshellbracketright: 0x3015,
+  tortoiseshellbracketrightsmall: 0xFE5E,
+  tortoiseshellbracketrightvertical: 0xFE3A,
+  totaothai: 0x0E15,
+  tpalatalhook: 0x01AB,
+  tparen: 0x24AF,
+  trademark: 0x2122,
+  trademarksans: 0xF8EA,
+  trademarkserif: 0xF6DB,
+  tretroflexhook: 0x0288,
+  triagdn: 0x25BC,
+  triaglf: 0x25C4,
+  triagrt: 0x25BA,
+  triagup: 0x25B2,
+  ts: 0x02A6,
+  tsadi: 0x05E6,
+  tsadidagesh: 0xFB46,
+  tsadidageshhebrew: 0xFB46,
+  tsadihebrew: 0x05E6,
+  tsecyrillic: 0x0446,
+  tsere: 0x05B5,
+  tsere12: 0x05B5,
+  tsere1e: 0x05B5,
+  tsere2b: 0x05B5,
+  tserehebrew: 0x05B5,
+  tserenarrowhebrew: 0x05B5,
+  tserequarterhebrew: 0x05B5,
+  tserewidehebrew: 0x05B5,
+  tshecyrillic: 0x045B,
+  tsuperior: 0xF6F3,
+  ttabengali: 0x099F,
+  ttadeva: 0x091F,
+  ttagujarati: 0x0A9F,
+  ttagurmukhi: 0x0A1F,
+  tteharabic: 0x0679,
+  ttehfinalarabic: 0xFB67,
+  ttehinitialarabic: 0xFB68,
+  ttehmedialarabic: 0xFB69,
+  tthabengali: 0x09A0,
+  tthadeva: 0x0920,
+  tthagujarati: 0x0AA0,
+  tthagurmukhi: 0x0A20,
+  tturned: 0x0287,
+  tuhiragana: 0x3064,
+  tukatakana: 0x30C4,
+  tukatakanahalfwidth: 0xFF82,
+  tusmallhiragana: 0x3063,
+  tusmallkatakana: 0x30C3,
+  tusmallkatakanahalfwidth: 0xFF6F,
+  twelvecircle: 0x246B,
+  twelveparen: 0x247F,
+  twelveperiod: 0x2493,
+  twelveroman: 0x217B,
+  twentycircle: 0x2473,
+  twentyhangzhou: 0x5344,
+  twentyparen: 0x2487,
+  twentyperiod: 0x249B,
+  two: 0x0032,
+  twoarabic: 0x0662,
+  twobengali: 0x09E8,
+  twocircle: 0x2461,
+  twocircleinversesansserif: 0x278B,
+  twodeva: 0x0968,
+  twodotenleader: 0x2025,
+  twodotleader: 0x2025,
+  twodotleadervertical: 0xFE30,
+  twogujarati: 0x0AE8,
+  twogurmukhi: 0x0A68,
+  twohackarabic: 0x0662,
+  twohangzhou: 0x3022,
+  twoideographicparen: 0x3221,
+  twoinferior: 0x2082,
+  twomonospace: 0xFF12,
+  twonumeratorbengali: 0x09F5,
+  twooldstyle: 0xF732,
+  twoparen: 0x2475,
+  twoperiod: 0x2489,
+  twopersian: 0x06F2,
+  tworoman: 0x2171,
+  twostroke: 0x01BB,
+  twosuperior: 0x00B2,
+  twothai: 0x0E52,
+  twothirds: 0x2154,
+  u: 0x0075,
+  uacute: 0x00FA,
+  ubar: 0x0289,
+  ubengali: 0x0989,
+  ubopomofo: 0x3128,
+  ubreve: 0x016D,
+  ucaron: 0x01D4,
+  ucircle: 0x24E4,
+  ucircumflex: 0x00FB,
+  ucircumflexbelow: 0x1E77,
+  ucyrillic: 0x0443,
+  udattadeva: 0x0951,
+  udblacute: 0x0171,
+  udblgrave: 0x0215,
+  udeva: 0x0909,
+  udieresis: 0x00FC,
+  udieresisacute: 0x01D8,
+  udieresisbelow: 0x1E73,
+  udieresiscaron: 0x01DA,
+  udieresiscyrillic: 0x04F1,
+  udieresisgrave: 0x01DC,
+  udieresismacron: 0x01D6,
+  udotbelow: 0x1EE5,
+  ugrave: 0x00F9,
+  ugujarati: 0x0A89,
+  ugurmukhi: 0x0A09,
+  uhiragana: 0x3046,
+  uhookabove: 0x1EE7,
+  uhorn: 0x01B0,
+  uhornacute: 0x1EE9,
+  uhorndotbelow: 0x1EF1,
+  uhorngrave: 0x1EEB,
+  uhornhookabove: 0x1EED,
+  uhorntilde: 0x1EEF,
+  uhungarumlaut: 0x0171,
+  uhungarumlautcyrillic: 0x04F3,
+  uinvertedbreve: 0x0217,
+  ukatakana: 0x30A6,
+  ukatakanahalfwidth: 0xFF73,
+  ukcyrillic: 0x0479,
+  ukorean: 0x315C,
+  umacron: 0x016B,
+  umacroncyrillic: 0x04EF,
+  umacrondieresis: 0x1E7B,
+  umatragurmukhi: 0x0A41,
+  umonospace: 0xFF55,
+  underscore: 0x005F,
+  underscoredbl: 0x2017,
+  underscoremonospace: 0xFF3F,
+  underscorevertical: 0xFE33,
+  underscorewavy: 0xFE4F,
+  union: 0x222A,
+  universal: 0x2200,
+  uogonek: 0x0173,
+  uparen: 0x24B0,
+  upblock: 0x2580,
+  upperdothebrew: 0x05C4,
+  upsilon: 0x03C5,
+  upsilondieresis: 0x03CB,
+  upsilondieresistonos: 0x03B0,
+  upsilonlatin: 0x028A,
+  upsilontonos: 0x03CD,
+  uptackbelowcmb: 0x031D,
+  uptackmod: 0x02D4,
+  uragurmukhi: 0x0A73,
+  uring: 0x016F,
+  ushortcyrillic: 0x045E,
+  usmallhiragana: 0x3045,
+  usmallkatakana: 0x30A5,
+  usmallkatakanahalfwidth: 0xFF69,
+  ustraightcyrillic: 0x04AF,
+  ustraightstrokecyrillic: 0x04B1,
+  utilde: 0x0169,
+  utildeacute: 0x1E79,
+  utildebelow: 0x1E75,
+  uubengali: 0x098A,
+  uudeva: 0x090A,
+  uugujarati: 0x0A8A,
+  uugurmukhi: 0x0A0A,
+  uumatragurmukhi: 0x0A42,
+  uuvowelsignbengali: 0x09C2,
+  uuvowelsigndeva: 0x0942,
+  uuvowelsigngujarati: 0x0AC2,
+  uvowelsignbengali: 0x09C1,
+  uvowelsigndeva: 0x0941,
+  uvowelsigngujarati: 0x0AC1,
+  v: 0x0076,
+  vadeva: 0x0935,
+  vagujarati: 0x0AB5,
+  vagurmukhi: 0x0A35,
+  vakatakana: 0x30F7,
+  vav: 0x05D5,
+  vavdagesh: 0xFB35,
+  vavdagesh65: 0xFB35,
+  vavdageshhebrew: 0xFB35,
+  vavhebrew: 0x05D5,
+  vavholam: 0xFB4B,
+  vavholamhebrew: 0xFB4B,
+  vavvavhebrew: 0x05F0,
+  vavyodhebrew: 0x05F1,
+  vcircle: 0x24E5,
+  vdotbelow: 0x1E7F,
+  vecyrillic: 0x0432,
+  veharabic: 0x06A4,
+  vehfinalarabic: 0xFB6B,
+  vehinitialarabic: 0xFB6C,
+  vehmedialarabic: 0xFB6D,
+  vekatakana: 0x30F9,
+  venus: 0x2640,
+  verticalbar: 0x007C,
+  verticallineabovecmb: 0x030D,
+  verticallinebelowcmb: 0x0329,
+  verticallinelowmod: 0x02CC,
+  verticallinemod: 0x02C8,
+  vewarmenian: 0x057E,
+  vhook: 0x028B,
+  vikatakana: 0x30F8,
+  viramabengali: 0x09CD,
+  viramadeva: 0x094D,
+  viramagujarati: 0x0ACD,
+  visargabengali: 0x0983,
+  visargadeva: 0x0903,
+  visargagujarati: 0x0A83,
+  vmonospace: 0xFF56,
+  voarmenian: 0x0578,
+  voicediterationhiragana: 0x309E,
+  voicediterationkatakana: 0x30FE,
+  voicedmarkkana: 0x309B,
+  voicedmarkkanahalfwidth: 0xFF9E,
+  vokatakana: 0x30FA,
+  vparen: 0x24B1,
+  vtilde: 0x1E7D,
+  vturned: 0x028C,
+  vuhiragana: 0x3094,
+  vukatakana: 0x30F4,
+  w: 0x0077,
+  wacute: 0x1E83,
+  waekorean: 0x3159,
+  wahiragana: 0x308F,
+  wakatakana: 0x30EF,
+  wakatakanahalfwidth: 0xFF9C,
+  wakorean: 0x3158,
+  wasmallhiragana: 0x308E,
+  wasmallkatakana: 0x30EE,
+  wattosquare: 0x3357,
+  wavedash: 0x301C,
+  wavyunderscorevertical: 0xFE34,
+  wawarabic: 0x0648,
+  wawfinalarabic: 0xFEEE,
+  wawhamzaabovearabic: 0x0624,
+  wawhamzaabovefinalarabic: 0xFE86,
+  wbsquare: 0x33DD,
+  wcircle: 0x24E6,
+  wcircumflex: 0x0175,
+  wdieresis: 0x1E85,
+  wdotaccent: 0x1E87,
+  wdotbelow: 0x1E89,
+  wehiragana: 0x3091,
+  weierstrass: 0x2118,
+  wekatakana: 0x30F1,
+  wekorean: 0x315E,
+  weokorean: 0x315D,
+  wgrave: 0x1E81,
+  whitebullet: 0x25E6,
+  whitecircle: 0x25CB,
+  whitecircleinverse: 0x25D9,
+  whitecornerbracketleft: 0x300E,
+  whitecornerbracketleftvertical: 0xFE43,
+  whitecornerbracketright: 0x300F,
+  whitecornerbracketrightvertical: 0xFE44,
+  whitediamond: 0x25C7,
+  whitediamondcontainingblacksmalldiamond: 0x25C8,
+  whitedownpointingsmalltriangle: 0x25BF,
+  whitedownpointingtriangle: 0x25BD,
+  whiteleftpointingsmalltriangle: 0x25C3,
+  whiteleftpointingtriangle: 0x25C1,
+  whitelenticularbracketleft: 0x3016,
+  whitelenticularbracketright: 0x3017,
+  whiterightpointingsmalltriangle: 0x25B9,
+  whiterightpointingtriangle: 0x25B7,
+  whitesmallsquare: 0x25AB,
+  whitesmilingface: 0x263A,
+  whitesquare: 0x25A1,
+  whitestar: 0x2606,
+  whitetelephone: 0x260F,
+  whitetortoiseshellbracketleft: 0x3018,
+  whitetortoiseshellbracketright: 0x3019,
+  whiteuppointingsmalltriangle: 0x25B5,
+  whiteuppointingtriangle: 0x25B3,
+  wihiragana: 0x3090,
+  wikatakana: 0x30F0,
+  wikorean: 0x315F,
+  wmonospace: 0xFF57,
+  wohiragana: 0x3092,
+  wokatakana: 0x30F2,
+  wokatakanahalfwidth: 0xFF66,
+  won: 0x20A9,
+  wonmonospace: 0xFFE6,
+  wowaenthai: 0x0E27,
+  wparen: 0x24B2,
+  wring: 0x1E98,
+  wsuperior: 0x02B7,
+  wturned: 0x028D,
+  wynn: 0x01BF,
+  x: 0x0078,
+  xabovecmb: 0x033D,
+  xbopomofo: 0x3112,
+  xcircle: 0x24E7,
+  xdieresis: 0x1E8D,
+  xdotaccent: 0x1E8B,
+  xeharmenian: 0x056D,
+  xi: 0x03BE,
+  xmonospace: 0xFF58,
+  xparen: 0x24B3,
+  xsuperior: 0x02E3,
+  y: 0x0079,
+  yaadosquare: 0x334E,
+  yabengali: 0x09AF,
+  yacute: 0x00FD,
+  yadeva: 0x092F,
+  yaekorean: 0x3152,
+  yagujarati: 0x0AAF,
+  yagurmukhi: 0x0A2F,
+  yahiragana: 0x3084,
+  yakatakana: 0x30E4,
+  yakatakanahalfwidth: 0xFF94,
+  yakorean: 0x3151,
+  yamakkanthai: 0x0E4E,
+  yasmallhiragana: 0x3083,
+  yasmallkatakana: 0x30E3,
+  yasmallkatakanahalfwidth: 0xFF6C,
+  yatcyrillic: 0x0463,
+  ycircle: 0x24E8,
+  ycircumflex: 0x0177,
+  ydieresis: 0x00FF,
+  ydotaccent: 0x1E8F,
+  ydotbelow: 0x1EF5,
+  yeharabic: 0x064A,
+  yehbarreearabic: 0x06D2,
+  yehbarreefinalarabic: 0xFBAF,
+  yehfinalarabic: 0xFEF2,
+  yehhamzaabovearabic: 0x0626,
+  yehhamzaabovefinalarabic: 0xFE8A,
+  yehhamzaaboveinitialarabic: 0xFE8B,
+  yehhamzaabovemedialarabic: 0xFE8C,
+  yehinitialarabic: 0xFEF3,
+  yehmedialarabic: 0xFEF4,
+  yehmeeminitialarabic: 0xFCDD,
+  yehmeemisolatedarabic: 0xFC58,
+  yehnoonfinalarabic: 0xFC94,
+  yehthreedotsbelowarabic: 0x06D1,
+  yekorean: 0x3156,
+  yen: 0x00A5,
+  yenmonospace: 0xFFE5,
+  yeokorean: 0x3155,
+  yeorinhieuhkorean: 0x3186,
+  yerahbenyomohebrew: 0x05AA,
+  yerahbenyomolefthebrew: 0x05AA,
+  yericyrillic: 0x044B,
+  yerudieresiscyrillic: 0x04F9,
+  yesieungkorean: 0x3181,
+  yesieungpansioskorean: 0x3183,
+  yesieungsioskorean: 0x3182,
+  yetivhebrew: 0x059A,
+  ygrave: 0x1EF3,
+  yhook: 0x01B4,
+  yhookabove: 0x1EF7,
+  yiarmenian: 0x0575,
+  yicyrillic: 0x0457,
+  yikorean: 0x3162,
+  yinyang: 0x262F,
+  yiwnarmenian: 0x0582,
+  ymonospace: 0xFF59,
+  yod: 0x05D9,
+  yoddagesh: 0xFB39,
+  yoddageshhebrew: 0xFB39,
+  yodhebrew: 0x05D9,
+  yodyodhebrew: 0x05F2,
+  yodyodpatahhebrew: 0xFB1F,
+  yohiragana: 0x3088,
+  yoikorean: 0x3189,
+  yokatakana: 0x30E8,
+  yokatakanahalfwidth: 0xFF96,
+  yokorean: 0x315B,
+  yosmallhiragana: 0x3087,
+  yosmallkatakana: 0x30E7,
+  yosmallkatakanahalfwidth: 0xFF6E,
+  yotgreek: 0x03F3,
+  yoyaekorean: 0x3188,
+  yoyakorean: 0x3187,
+  yoyakthai: 0x0E22,
+  yoyingthai: 0x0E0D,
+  yparen: 0x24B4,
+  ypogegrammeni: 0x037A,
+  ypogegrammenigreekcmb: 0x0345,
+  yr: 0x01A6,
+  yring: 0x1E99,
+  ysuperior: 0x02B8,
+  ytilde: 0x1EF9,
+  yturned: 0x028E,
+  yuhiragana: 0x3086,
+  yuikorean: 0x318C,
+  yukatakana: 0x30E6,
+  yukatakanahalfwidth: 0xFF95,
+  yukorean: 0x3160,
+  yusbigcyrillic: 0x046B,
+  yusbigiotifiedcyrillic: 0x046D,
+  yuslittlecyrillic: 0x0467,
+  yuslittleiotifiedcyrillic: 0x0469,
+  yusmallhiragana: 0x3085,
+  yusmallkatakana: 0x30E5,
+  yusmallkatakanahalfwidth: 0xFF6D,
+  yuyekorean: 0x318B,
+  yuyeokorean: 0x318A,
+  yyabengali: 0x09DF,
+  yyadeva: 0x095F,
+  z: 0x007A,
+  zaarmenian: 0x0566,
+  zacute: 0x017A,
+  zadeva: 0x095B,
+  zagurmukhi: 0x0A5B,
+  zaharabic: 0x0638,
+  zahfinalarabic: 0xFEC6,
+  zahinitialarabic: 0xFEC7,
+  zahiragana: 0x3056,
+  zahmedialarabic: 0xFEC8,
+  zainarabic: 0x0632,
+  zainfinalarabic: 0xFEB0,
+  zakatakana: 0x30B6,
+  zaqefgadolhebrew: 0x0595,
+  zaqefqatanhebrew: 0x0594,
+  zarqahebrew: 0x0598,
+  zayin: 0x05D6,
+  zayindagesh: 0xFB36,
+  zayindageshhebrew: 0xFB36,
+  zayinhebrew: 0x05D6,
+  zbopomofo: 0x3117,
+  zcaron: 0x017E,
+  zcircle: 0x24E9,
+  zcircumflex: 0x1E91,
+  zcurl: 0x0291,
+  zdot: 0x017C,
+  zdotaccent: 0x017C,
+  zdotbelow: 0x1E93,
+  zecyrillic: 0x0437,
+  zedescendercyrillic: 0x0499,
+  zedieresiscyrillic: 0x04DF,
+  zehiragana: 0x305C,
+  zekatakana: 0x30BC,
+  zero: 0x0030,
+  zeroarabic: 0x0660,
+  zerobengali: 0x09E6,
+  zerodeva: 0x0966,
+  zerogujarati: 0x0AE6,
+  zerogurmukhi: 0x0A66,
+  zerohackarabic: 0x0660,
+  zeroinferior: 0x2080,
+  zeromonospace: 0xFF10,
+  zerooldstyle: 0xF730,
+  zeropersian: 0x06F0,
+  zerosuperior: 0x2070,
+  zerothai: 0x0E50,
+  zerowidthjoiner: 0xFEFF,
+  zerowidthnonjoiner: 0x200C,
+  zerowidthspace: 0x200B,
+  zeta: 0x03B6,
+  zhbopomofo: 0x3113,
+  zhearmenian: 0x056A,
+  zhebrevecyrillic: 0x04C2,
+  zhecyrillic: 0x0436,
+  zhedescendercyrillic: 0x0497,
+  zhedieresiscyrillic: 0x04DD,
+  zihiragana: 0x3058,
+  zikatakana: 0x30B8,
+  zinorhebrew: 0x05AE,
+  zlinebelow: 0x1E95,
+  zmonospace: 0xFF5A,
+  zohiragana: 0x305E,
+  zokatakana: 0x30BE,
+  zparen: 0x24B5,
+  zretroflexhook: 0x0290,
+  zstroke: 0x01B6,
+  zuhiragana: 0x305A,
+  zukatakana: 0x30BA
+};
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var PDFImage = (function pdfImage() {
+  function constructor(xref, res, image, inline) {
+    this.image = image;
+    if (image.getParams) {
+      // JPX/JPEG2000 streams directly contain bits per component
+      // and color space mode information.
+      TODO('get params from actual stream');
+      // var bits = ...
+      // var colorspace = ...
+    }
+    // TODO cache rendered images?
+
+    var dict = image.dict;
+    this.width = dict.get('Width', 'W');
+    this.height = dict.get('Height', 'H');
+
+    if (this.width < 1 || this.height < 1)
+      error('Invalid image width: ' + this.width + ' or height: ' +
+            this.height);
+
+    this.interpolate = dict.get('Interpolate', 'I') || false;
+    this.imageMask = dict.get('ImageMask', 'IM') || false;
+
+    var bitsPerComponent = image.bitsPerComponent;
+    if (!bitsPerComponent) {
+      bitsPerComponent = dict.get('BitsPerComponent', 'BPC');
+      if (!bitsPerComponent) {
+        if (this.imageMask)
+          bitsPerComponent = 1;
+        else
+          error('Bits per component missing in image: ' + this.imageMask);
+      }
+    }
+    this.bpc = bitsPerComponent;
+
+    if (!this.imageMask) {
+      var colorSpace = dict.get('ColorSpace', 'CS');
+      if (!colorSpace) {
+        TODO('JPX images (which don"t require color spaces');
+        colorSpace = new Name('DeviceRGB');
+      }
+      this.colorSpace = ColorSpace.parse(colorSpace, xref, res);
+      this.numComps = this.colorSpace.numComps;
+    }
+
+    this.decode = dict.get('Decode', 'D');
+
+    var mask = xref.fetchIfRef(dict.get('Mask'));
+    var smask = xref.fetchIfRef(dict.get('SMask'));
+
+    if (mask) {
+      TODO('masked images');
+    } else if (smask) {
+      this.smask = new PDFImage(xref, res, smask);
+    }
+  }
+
+  constructor.prototype = {
+    getComponents: function getComponents(buffer, decodeMap) {
+      var bpc = this.bpc;
+      if (bpc == 8)
+        return buffer;
+
+      var width = this.width;
+      var height = this.height;
+      var numComps = this.numComps;
+
+      var length = width * height;
+      var bufferPos = 0;
+      var output = bpc <= 8 ? new Uint8Array(length) :
+        bpc <= 16 ? new Uint16Array(length) : new Uint32Array(length);
+      var rowComps = width * numComps;
+
+      if (bpc == 1) {
+        var valueZero = 0, valueOne = 1;
+        if (decodeMap) {
+          valueZero = decodeMap[0] ? 1 : 0;
+          valueOne = decodeMap[1] ? 1 : 0;
+        }
+        var mask = 0;
+        var buf = 0;
+
+        for (var i = 0, ii = length; i < ii; ++i) {
+          if (i % rowComps == 0) {
+            mask = 0;
+            buf = 0;
+          } else {
+            mask >>= 1;
+          }
+
+          if (mask <= 0) {
+            buf = buffer[bufferPos++];
+            mask = 128;
+          }
+
+          output[i] = !(buf & mask) ? valueZero : valueOne;
+        }
+      } else {
+        if (decodeMap != null)
+          TODO('interpolate component values');
+        var bits = 0, buf = 0;
+        for (var i = 0, ii = length; i < ii; ++i) {
+          if (i % rowComps == 0) {
+            buf = 0;
+            bits = 0;
+          }
+
+          while (bits < bpc) {
+            buf = (buf << 8) | buffer[bufferPos++];
+            bits += 8;
+          }
+
+          var remainingBits = bits - bpc;
+          output[i] = buf >> remainingBits;
+          buf = buf & ((1 << remainingBits) - 1);
+          bits = remainingBits;
+        }
+      }
+      return output;
+    },
+    getOpacity: function getOpacity() {
+      var smask = this.smask;
+      var width = this.width;
+      var height = this.height;
+      var buf = new Uint8Array(width * height);
+
+      if (smask) {
+        if (smask.image.getImage) {
+          // smask is a DOM image
+          var tempCanvas = new ScratchCanvas(width, height);
+          var tempCtx = tempCanvas.getContext('2d');
+          var domImage = smask.image.getImage();
+          tempCtx.drawImage(domImage, 0, 0, domImage.width, domImage.height,
+            0, 0, width, height);
+          var data = tempCtx.getImageData(0, 0, width, height).data;
+          for (var i = 0, j = 0, ii = width * height; i < ii; ++i, j += 4)
+            buf[i] = data[j]; // getting first component value
+          return buf;
+        }
+        var sw = smask.width;
+        var sh = smask.height;
+        if (sw != this.width || sh != this.height)
+          error('smask dimensions do not match image dimensions: ' + sw +
+                ' != ' + this.width + ', ' + sh + ' != ' + this.height);
+
+        smask.fillGrayBuffer(buf);
+        return buf;
+      } else {
+        for (var i = 0, ii = width * height; i < ii; ++i)
+          buf[i] = 255;
+      }
+      return buf;
+    },
+    applyStencilMask: function applyStencilMask(buffer, inverseDecode) {
+      var width = this.width, height = this.height;
+      var bitStrideLength = (width + 7) >> 3;
+      this.image.reset();
+      var imgArray = this.image.getBytes(bitStrideLength * height);
+      var imgArrayPos = 0;
+      var i, j, mask, buf;
+      // removing making non-masked pixels transparent
+      var bufferPos = 3; // alpha component offset
+      for (i = 0; i < height; i++) {
+        mask = 0;
+        for (j = 0; j < width; j++) {
+          if (!mask) {
+            buf = imgArray[imgArrayPos++];
+            mask = 128;
+          }
+          if (!(buf & mask) == inverseDecode) {
+            buffer[bufferPos] = 0;
+          }
+          bufferPos += 4;
+          mask >>= 1;
+        }
+      }
+    },
+    fillRgbaBuffer: function fillRgbaBuffer(buffer, decodeMap) {
+      var numComps = this.numComps;
+      var width = this.width;
+      var height = this.height;
+      var bpc = this.bpc;
+
+      // rows start at byte boundary;
+      var rowBytes = (width * numComps * bpc + 7) >> 3;
+      this.image.reset();
+      var imgArray = this.image.getBytes(height * rowBytes);
+
+      var comps = this.colorSpace.getRgbBuffer(
+        this.getComponents(imgArray, decodeMap), bpc);
+      var compsPos = 0;
+      var opacity = this.getOpacity();
+      var opacityPos = 0;
+      var length = width * height * 4;
+
+      for (var i = 0; i < length; i += 4) {
+        buffer[i] = comps[compsPos++];
+        buffer[i + 1] = comps[compsPos++];
+        buffer[i + 2] = comps[compsPos++];
+        buffer[i + 3] = opacity[opacityPos++];
+      }
+    },
+    fillGrayBuffer: function fillGrayBuffer(buffer) {
+      var numComps = this.numComps;
+      if (numComps != 1)
+        error('Reading gray scale from a color image: ' + numComps);
+
+      var width = this.width;
+      var height = this.height;
+      var bpc = this.bpc;
+
+      // rows start at byte boundary;
+      var rowBytes = (width * numComps * bpc + 7) >> 3;
+      this.image.reset();
+      var imgArray = this.image.getBytes(height * rowBytes);
+
+      var comps = this.getComponents(imgArray);
+      var length = width * height;
+
+      for (var i = 0; i < length; ++i)
+        buffer[i] = comps[i];
+    }
+  };
+  return constructor;
+})();
+
+var JpegImageLoader = (function jpegImage() {
+  function JpegImageLoader(objId, imageData, objs) {
+    var src = 'data:image/jpeg;base64,' + window.btoa(imageData);
+
+    var img = new Image();
+    img.onload = (function jpegImageLoaderOnload() {
+      this.loaded = true;
+
+      objs.resolve(objId, this);
+
+      if (this.onLoad)
+        this.onLoad();
+    }).bind(this);
+    img.src = src;
+    this.domImage = img;
+  }
+
+  JpegImageLoader.prototype = {
+    getImage: function jpegImageLoaderGetImage() {
+      return this.domImage;
+    }
+  };
+
+  return JpegImageLoader;
+})();
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var Metrics = {
+  'Courier': 600,
+  'Courier-Bold': 600,
+  'Courier-BoldOblique': 600,
+  'Courier-Oblique': 600,
+  'Helvetica' : {
+    'space': 278,
+    'exclam': 278,
+    'quotedbl': 355,
+    'numbersign': 556,
+    'dollar': 556,
+    'percent': 889,
+    'ampersand': 667,
+    'quoteright': 222,
+    'parenleft': 333,
+    'parenright': 333,
+    'asterisk': 389,
+    'plus': 584,
+    'comma': 278,
+    'hyphen': 333,
+    'period': 278,
+    'slash': 278,
+    'zero': 556,
+    'one': 556,
+    'two': 556,
+    'three': 556,
+    'four': 556,
+    'five': 556,
+    'six': 556,
+    'seven': 556,
+    'eight': 556,
+    'nine': 556,
+    'colon': 278,
+    'semicolon': 278,
+    'less': 584,
+    'equal': 584,
+    'greater': 584,
+    'question': 556,
+    'at': 1015,
+    'A': 667,
+    'B': 667,
+    'C': 722,
+    'D': 722,
+    'E': 667,
+    'F': 611,
+    'G': 778,
+    'H': 722,
+    'I': 278,
+    'J': 500,
+    'K': 667,
+    'L': 556,
+    'M': 833,
+    'N': 722,
+    'O': 778,
+    'P': 667,
+    'Q': 778,
+    'R': 722,
+    'S': 667,
+    'T': 611,
+    'U': 722,
+    'V': 667,
+    'W': 944,
+    'X': 667,
+    'Y': 667,
+    'Z': 611,
+    'bracketleft': 278,
+    'backslash': 278,
+    'bracketright': 278,
+    'asciicircum': 469,
+    'underscore': 556,
+    'quoteleft': 222,
+    'a': 556,
+    'b': 556,
+    'c': 500,
+    'd': 556,
+    'e': 556,
+    'f': 278,
+    'g': 556,
+    'h': 556,
+    'i': 222,
+    'j': 222,
+    'k': 500,
+    'l': 222,
+    'm': 833,
+    'n': 556,
+    'o': 556,
+    'p': 556,
+    'q': 556,
+    'r': 333,
+    's': 500,
+    't': 278,
+    'u': 556,
+    'v': 500,
+    'w': 722,
+    'x': 500,
+    'y': 500,
+    'z': 500,
+    'braceleft': 334,
+    'bar': 260,
+    'braceright': 334,
+    'asciitilde': 584,
+    'exclamdown': 333,
+    'cent': 556,
+    'sterling': 556,
+    'fraction': 167,
+    'yen': 556,
+    'florin': 556,
+    'section': 556,
+    'currency': 556,
+    'quotesingle': 191,
+    'quotedblleft': 333,
+    'guillemotleft': 556,
+    'guilsinglleft': 333,
+    'guilsinglright': 333,
+    'fi': 500,
+    'fl': 500,
+    'endash': 556,
+    'dagger': 556,
+    'daggerdbl': 556,
+    'periodcentered': 278,
+    'paragraph': 537,
+    'bullet': 350,
+    'quotesinglbase': 222,
+    'quotedblbase': 333,
+    'quotedblright': 333,
+    'guillemotright': 556,
+    'ellipsis': 1000,
+    'perthousand': 1000,
+    'questiondown': 611,
+    'grave': 333,
+    'acute': 333,
+    'circumflex': 333,
+    'tilde': 333,
+    'macron': 333,
+    'breve': 333,
+    'dotaccent': 333,
+    'dieresis': 333,
+    'ring': 333,
+    'cedilla': 333,
+    'hungarumlaut': 333,
+    'ogonek': 333,
+    'caron': 333,
+    'emdash': 1000,
+    'AE': 1000,
+    'ordfeminine': 370,
+    'Lslash': 556,
+    'Oslash': 778,
+    'OE': 1000,
+    'ordmasculine': 365,
+    'ae': 889,
+    'dotlessi': 278,
+    'lslash': 222,
+    'oslash': 611,
+    'oe': 944,
+    'germandbls': 611,
+    'Idieresis': 278,
+    'eacute': 556,
+    'abreve': 556,
+    'uhungarumlaut': 556,
+    'ecaron': 556,
+    'Ydieresis': 667,
+    'divide': 584,
+    'Yacute': 667,
+    'Acircumflex': 667,
+    'aacute': 556,
+    'Ucircumflex': 722,
+    'yacute': 500,
+    'scommaaccent': 500,
+    'ecircumflex': 556,
+    'Uring': 722,
+    'Udieresis': 722,
+    'aogonek': 556,
+    'Uacute': 722,
+    'uogonek': 556,
+    'Edieresis': 667,
+    'Dcroat': 722,
+    'commaaccent': 250,
+    'copyright': 737,
+    'Emacron': 667,
+    'ccaron': 500,
+    'aring': 556,
+    'Ncommaaccent': 722,
+    'lacute': 222,
+    'agrave': 556,
+    'Tcommaaccent': 611,
+    'Cacute': 722,
+    'atilde': 556,
+    'Edotaccent': 667,
+    'scaron': 500,
+    'scedilla': 500,
+    'iacute': 278,
+    'lozenge': 471,
+    'Rcaron': 722,
+    'Gcommaaccent': 778,
+    'ucircumflex': 556,
+    'acircumflex': 556,
+    'Amacron': 667,
+    'rcaron': 333,
+    'ccedilla': 500,
+    'Zdotaccent': 611,
+    'Thorn': 667,
+    'Omacron': 778,
+    'Racute': 722,
+    'Sacute': 667,
+    'dcaron': 643,
+    'Umacron': 722,
+    'uring': 556,
+    'threesuperior': 333,
+    'Ograve': 778,
+    'Agrave': 667,
+    'Abreve': 667,
+    'multiply': 584,
+    'uacute': 556,
+    'Tcaron': 611,
+    'partialdiff': 476,
+    'ydieresis': 500,
+    'Nacute': 722,
+    'icircumflex': 278,
+    'Ecircumflex': 667,
+    'adieresis': 556,
+    'edieresis': 556,
+    'cacute': 500,
+    'nacute': 556,
+    'umacron': 556,
+    'Ncaron': 722,
+    'Iacute': 278,
+    'plusminus': 584,
+    'brokenbar': 260,
+    'registered': 737,
+    'Gbreve': 778,
+    'Idotaccent': 278,
+    'summation': 600,
+    'Egrave': 667,
+    'racute': 333,
+    'omacron': 556,
+    'Zacute': 611,
+    'Zcaron': 611,
+    'greaterequal': 549,
+    'Eth': 722,
+    'Ccedilla': 722,
+    'lcommaaccent': 222,
+    'tcaron': 317,
+    'eogonek': 556,
+    'Uogonek': 722,
+    'Aacute': 667,
+    'Adieresis': 667,
+    'egrave': 556,
+    'zacute': 500,
+    'iogonek': 222,
+    'Oacute': 778,
+    'oacute': 556,
+    'amacron': 556,
+    'sacute': 500,
+    'idieresis': 278,
+    'Ocircumflex': 778,
+    'Ugrave': 722,
+    'Delta': 612,
+    'thorn': 556,
+    'twosuperior': 333,
+    'Odieresis': 778,
+    'mu': 556,
+    'igrave': 278,
+    'ohungarumlaut': 556,
+    'Eogonek': 667,
+    'dcroat': 556,
+    'threequarters': 834,
+    'Scedilla': 667,
+    'lcaron': 299,
+    'Kcommaaccent': 667,
+    'Lacute': 556,
+    'trademark': 1000,
+    'edotaccent': 556,
+    'Igrave': 278,
+    'Imacron': 278,
+    'Lcaron': 556,
+    'onehalf': 834,
+    'lessequal': 549,
+    'ocircumflex': 556,
+    'ntilde': 556,
+    'Uhungarumlaut': 722,
+    'Eacute': 667,
+    'emacron': 556,
+    'gbreve': 556,
+    'onequarter': 834,
+    'Scaron': 667,
+    'Scommaaccent': 667,
+    'Ohungarumlaut': 778,
+    'degree': 400,
+    'ograve': 556,
+    'Ccaron': 722,
+    'ugrave': 556,
+    'radical': 453,
+    'Dcaron': 722,
+    'rcommaaccent': 333,
+    'Ntilde': 722,
+    'otilde': 556,
+    'Rcommaaccent': 722,
+    'Lcommaaccent': 556,
+    'Atilde': 667,
+    'Aogonek': 667,
+    'Aring': 667,
+    'Otilde': 778,
+    'zdotaccent': 500,
+    'Ecaron': 667,
+    'Iogonek': 278,
+    'kcommaaccent': 500,
+    'minus': 584,
+    'Icircumflex': 278,
+    'ncaron': 556,
+    'tcommaaccent': 278,
+    'logicalnot': 584,
+    'odieresis': 556,
+    'udieresis': 556,
+    'notequal': 549,
+    'gcommaaccent': 556,
+    'eth': 556,
+    'zcaron': 500,
+    'ncommaaccent': 556,
+    'onesuperior': 333,
+    'imacron': 278,
+    'Euro': 556
+  },
+  'Helvetica-Bold': {
+    'space': 278,
+    'exclam': 333,
+    'quotedbl': 474,
+    'numbersign': 556,
+    'dollar': 556,
+    'percent': 889,
+    'ampersand': 722,
+    'quoteright': 278,
+    'parenleft': 333,
+    'parenright': 333,
+    'asterisk': 389,
+    'plus': 584,
+    'comma': 278,
+    'hyphen': 333,
+    'period': 278,
+    'slash': 278,
+    'zero': 556,
+    'one': 556,
+    'two': 556,
+    'three': 556,
+    'four': 556,
+    'five': 556,
+    'six': 556,
+    'seven': 556,
+    'eight': 556,
+    'nine': 556,
+    'colon': 333,
+    'semicolon': 333,
+    'less': 584,
+    'equal': 584,
+    'greater': 584,
+    'question': 611,
+    'at': 975,
+    'A': 722,
+    'B': 722,
+    'C': 722,
+    'D': 722,
+    'E': 667,
+    'F': 611,
+    'G': 778,
+    'H': 722,
+    'I': 278,
+    'J': 556,
+    'K': 722,
+    'L': 611,
+    'M': 833,
+    'N': 722,
+    'O': 778,
+    'P': 667,
+    'Q': 778,
+    'R': 722,
+    'S': 667,
+    'T': 611,
+    'U': 722,
+    'V': 667,
+    'W': 944,
+    'X': 667,
+    'Y': 667,
+    'Z': 611,
+    'bracketleft': 333,
+    'backslash': 278,
+    'bracketright': 333,
+    'asciicircum': 584,
+    'underscore': 556,
+    'quoteleft': 278,
+    'a': 556,
+    'b': 611,
+    'c': 556,
+    'd': 611,
+    'e': 556,
+    'f': 333,
+    'g': 611,
+    'h': 611,
+    'i': 278,
+    'j': 278,
+    'k': 556,
+    'l': 278,
+    'm': 889,
+    'n': 611,
+    'o': 611,
+    'p': 611,
+    'q': 611,
+    'r': 389,
+    's': 556,
+    't': 333,
+    'u': 611,
+    'v': 556,
+    'w': 778,
+    'x': 556,
+    'y': 556,
+    'z': 500,
+    'braceleft': 389,
+    'bar': 280,
+    'braceright': 389,
+    'asciitilde': 584,
+    'exclamdown': 333,
+    'cent': 556,
+    'sterling': 556,
+    'fraction': 167,
+    'yen': 556,
+    'florin': 556,
+    'section': 556,
+    'currency': 556,
+    'quotesingle': 238,
+    'quotedblleft': 500,
+    'guillemotleft': 556,
+    'guilsinglleft': 333,
+    'guilsinglright': 333,
+    'fi': 611,
+    'fl': 611,
+    'endash': 556,
+    'dagger': 556,
+    'daggerdbl': 556,
+    'periodcentered': 278,
+    'paragraph': 556,
+    'bullet': 350,
+    'quotesinglbase': 278,
+    'quotedblbase': 500,
+    'quotedblright': 500,
+    'guillemotright': 556,
+    'ellipsis': 1000,
+    'perthousand': 1000,
+    'questiondown': 611,
+    'grave': 333,
+    'acute': 333,
+    'circumflex': 333,
+    'tilde': 333,
+    'macron': 333,
+    'breve': 333,
+    'dotaccent': 333,
+    'dieresis': 333,
+    'ring': 333,
+    'cedilla': 333,
+    'hungarumlaut': 333,
+    'ogonek': 333,
+    'caron': 333,
+    'emdash': 1000,
+    'AE': 1000,
+    'ordfeminine': 370,
+    'Lslash': 611,
+    'Oslash': 778,
+    'OE': 1000,
+    'ordmasculine': 365,
+    'ae': 889,
+    'dotlessi': 278,
+    'lslash': 278,
+    'oslash': 611,
+    'oe': 944,
+    'germandbls': 611,
+    'Idieresis': 278,
+    'eacute': 556,
+    'abreve': 556,
+    'uhungarumlaut': 611,
+    'ecaron': 556,
+    'Ydieresis': 667,
+    'divide': 584,
+    'Yacute': 667,
+    'Acircumflex': 722,
+    'aacute': 556,
+    'Ucircumflex': 722,
+    'yacute': 556,
+    'scommaaccent': 556,
+    'ecircumflex': 556,
+    'Uring': 722,
+    'Udieresis': 722,
+    'aogonek': 556,
+    'Uacute': 722,
+    'uogonek': 611,
+    'Edieresis': 667,
+    'Dcroat': 722,
+    'commaaccent': 250,
+    'copyright': 737,
+    'Emacron': 667,
+    'ccaron': 556,
+    'aring': 556,
+    'Ncommaaccent': 722,
+    'lacute': 278,
+    'agrave': 556,
+    'Tcommaaccent': 611,
+    'Cacute': 722,
+    'atilde': 556,
+    'Edotaccent': 667,
+    'scaron': 556,
+    'scedilla': 556,
+    'iacute': 278,
+    'lozenge': 494,
+    'Rcaron': 722,
+    'Gcommaaccent': 778,
+    'ucircumflex': 611,
+    'acircumflex': 556,
+    'Amacron': 722,
+    'rcaron': 389,
+    'ccedilla': 556,
+    'Zdotaccent': 611,
+    'Thorn': 667,
+    'Omacron': 778,
+    'Racute': 722,
+    'Sacute': 667,
+    'dcaron': 743,
+    'Umacron': 722,
+    'uring': 611,
+    'threesuperior': 333,
+    'Ograve': 778,
+    'Agrave': 722,
+    'Abreve': 722,
+    'multiply': 584,
+    'uacute': 611,
+    'Tcaron': 611,
+    'partialdiff': 494,
+    'ydieresis': 556,
+    'Nacute': 722,
+    'icircumflex': 278,
+    'Ecircumflex': 667,
+    'adieresis': 556,
+    'edieresis': 556,
+    'cacute': 556,
+    'nacute': 611,
+    'umacron': 611,
+    'Ncaron': 722,
+    'Iacute': 278,
+    'plusminus': 584,
+    'brokenbar': 280,
+    'registered': 737,
+    'Gbreve': 778,
+    'Idotaccent': 278,
+    'summation': 600,
+    'Egrave': 667,
+    'racute': 389,
+    'omacron': 611,
+    'Zacute': 611,
+    'Zcaron': 611,
+    'greaterequal': 549,
+    'Eth': 722,
+    'Ccedilla': 722,
+    'lcommaaccent': 278,
+    'tcaron': 389,
+    'eogonek': 556,
+    'Uogonek': 722,
+    'Aacute': 722,
+    'Adieresis': 722,
+    'egrave': 556,
+    'zacute': 500,
+    'iogonek': 278,
+    'Oacute': 778,
+    'oacute': 611,
+    'amacron': 556,
+    'sacute': 556,
+    'idieresis': 278,
+    'Ocircumflex': 778,
+    'Ugrave': 722,
+    'Delta': 612,
+    'thorn': 611,
+    'twosuperior': 333,
+    'Odieresis': 778,
+    'mu': 611,
+    'igrave': 278,
+    'ohungarumlaut': 611,
+    'Eogonek': 667,
+    'dcroat': 611,
+    'threequarters': 834,
+    'Scedilla': 667,
+    'lcaron': 400,
+    'Kcommaaccent': 722,
+    'Lacute': 611,
+    'trademark': 1000,
+    'edotaccent': 556,
+    'Igrave': 278,
+    'Imacron': 278,
+    'Lcaron': 611,
+    'onehalf': 834,
+    'lessequal': 549,
+    'ocircumflex': 611,
+    'ntilde': 611,
+    'Uhungarumlaut': 722,
+    'Eacute': 667,
+    'emacron': 556,
+    'gbreve': 611,
+    'onequarter': 834,
+    'Scaron': 667,
+    'Scommaaccent': 667,
+    'Ohungarumlaut': 778,
+    'degree': 400,
+    'ograve': 611,
+    'Ccaron': 722,
+    'ugrave': 611,
+    'radical': 549,
+    'Dcaron': 722,
+    'rcommaaccent': 389,
+    'Ntilde': 722,
+    'otilde': 611,
+    'Rcommaaccent': 722,
+    'Lcommaaccent': 611,
+    'Atilde': 722,
+    'Aogonek': 722,
+    'Aring': 722,
+    'Otilde': 778,
+    'zdotaccent': 500,
+    'Ecaron': 667,
+    'Iogonek': 278,
+    'kcommaaccent': 556,
+    'minus': 584,
+    'Icircumflex': 278,
+    'ncaron': 611,
+    'tcommaaccent': 333,
+    'logicalnot': 584,
+    'odieresis': 611,
+    'udieresis': 611,
+    'notequal': 549,
+    'gcommaaccent': 611,
+    'eth': 611,
+    'zcaron': 500,
+    'ncommaaccent': 611,
+    'onesuperior': 333,
+    'imacron': 278,
+    'Euro': 556
+  },
+  'Helvetica-BoldOblique': {
+    'space': 278,
+    'exclam': 333,
+    'quotedbl': 474,
+    'numbersign': 556,
+    'dollar': 556,
+    'percent': 889,
+    'ampersand': 722,
+    'quoteright': 278,
+    'parenleft': 333,
+    'parenright': 333,
+    'asterisk': 389,
+    'plus': 584,
+    'comma': 278,
+    'hyphen': 333,
+    'period': 278,
+    'slash': 278,
+    'zero': 556,
+    'one': 556,
+    'two': 556,
+    'three': 556,
+    'four': 556,
+    'five': 556,
+    'six': 556,
+    'seven': 556,
+    'eight': 556,
+    'nine': 556,
+    'colon': 333,
+    'semicolon': 333,
+    'less': 584,
+    'equal': 584,
+    'greater': 584,
+    'question': 611,
+    'at': 975,
+    'A': 722,
+    'B': 722,
+    'C': 722,
+    'D': 722,
+    'E': 667,
+    'F': 611,
+    'G': 778,
+    'H': 722,
+    'I': 278,
+    'J': 556,
+    'K': 722,
+    'L': 611,
+    'M': 833,
+    'N': 722,
+    'O': 778,
+    'P': 667,
+    'Q': 778,
+    'R': 722,
+    'S': 667,
+    'T': 611,
+    'U': 722,
+    'V': 667,
+    'W': 944,
+    'X': 667,
+    'Y': 667,
+    'Z': 611,
+    'bracketleft': 333,
+    'backslash': 278,
+    'bracketright': 333,
+    'asciicircum': 584,
+    'underscore': 556,
+    'quoteleft': 278,
+    'a': 556,
+    'b': 611,
+    'c': 556,
+    'd': 611,
+    'e': 556,
+    'f': 333,
+    'g': 611,
+    'h': 611,
+    'i': 278,
+    'j': 278,
+    'k': 556,
+    'l': 278,
+    'm': 889,
+    'n': 611,
+    'o': 611,
+    'p': 611,
+    'q': 611,
+    'r': 389,
+    's': 556,
+    't': 333,
+    'u': 611,
+    'v': 556,
+    'w': 778,
+    'x': 556,
+    'y': 556,
+    'z': 500,
+    'braceleft': 389,
+    'bar': 280,
+    'braceright': 389,
+    'asciitilde': 584,
+    'exclamdown': 333,
+    'cent': 556,
+    'sterling': 556,
+    'fraction': 167,
+    'yen': 556,
+    'florin': 556,
+    'section': 556,
+    'currency': 556,
+    'quotesingle': 238,
+    'quotedblleft': 500,
+    'guillemotleft': 556,
+    'guilsinglleft': 333,
+    'guilsinglright': 333,
+    'fi': 611,
+    'fl': 611,
+    'endash': 556,
+    'dagger': 556,
+    'daggerdbl': 556,
+    'periodcentered': 278,
+    'paragraph': 556,
+    'bullet': 350,
+    'quotesinglbase': 278,
+    'quotedblbase': 500,
+    'quotedblright': 500,
+    'guillemotright': 556,
+    'ellipsis': 1000,
+    'perthousand': 1000,
+    'questiondown': 611,
+    'grave': 333,
+    'acute': 333,
+    'circumflex': 333,
+    'tilde': 333,
+    'macron': 333,
+    'breve': 333,
+    'dotaccent': 333,
+    'dieresis': 333,
+    'ring': 333,
+    'cedilla': 333,
+    'hungarumlaut': 333,
+    'ogonek': 333,
+    'caron': 333,
+    'emdash': 1000,
+    'AE': 1000,
+    'ordfeminine': 370,
+    'Lslash': 611,
+    'Oslash': 778,
+    'OE': 1000,
+    'ordmasculine': 365,
+    'ae': 889,
+    'dotlessi': 278,
+    'lslash': 278,
+    'oslash': 611,
+    'oe': 944,
+    'germandbls': 611,
+    'Idieresis': 278,
+    'eacute': 556,
+    'abreve': 556,
+    'uhungarumlaut': 611,
+    'ecaron': 556,
+    'Ydieresis': 667,
+    'divide': 584,
+    'Yacute': 667,
+    'Acircumflex': 722,
+    'aacute': 556,
+    'Ucircumflex': 722,
+    'yacute': 556,
+    'scommaaccent': 556,
+    'ecircumflex': 556,
+    'Uring': 722,
+    'Udieresis': 722,
+    'aogonek': 556,
+    'Uacute': 722,
+    'uogonek': 611,
+    'Edieresis': 667,
+    'Dcroat': 722,
+    'commaaccent': 250,
+    'copyright': 737,
+    'Emacron': 667,
+    'ccaron': 556,
+    'aring': 556,
+    'Ncommaaccent': 722,
+    'lacute': 278,
+    'agrave': 556,
+    'Tcommaaccent': 611,
+    'Cacute': 722,
+    'atilde': 556,
+    'Edotaccent': 667,
+    'scaron': 556,
+    'scedilla': 556,
+    'iacute': 278,
+    'lozenge': 494,
+    'Rcaron': 722,
+    'Gcommaaccent': 778,
+    'ucircumflex': 611,
+    'acircumflex': 556,
+    'Amacron': 722,
+    'rcaron': 389,
+    'ccedilla': 556,
+    'Zdotaccent': 611,
+    'Thorn': 667,
+    'Omacron': 778,
+    'Racute': 722,
+    'Sacute': 667,
+    'dcaron': 743,
+    'Umacron': 722,
+    'uring': 611,
+    'threesuperior': 333,
+    'Ograve': 778,
+    'Agrave': 722,
+    'Abreve': 722,
+    'multiply': 584,
+    'uacute': 611,
+    'Tcaron': 611,
+    'partialdiff': 494,
+    'ydieresis': 556,
+    'Nacute': 722,
+    'icircumflex': 278,
+    'Ecircumflex': 667,
+    'adieresis': 556,
+    'edieresis': 556,
+    'cacute': 556,
+    'nacute': 611,
+    'umacron': 611,
+    'Ncaron': 722,
+    'Iacute': 278,
+    'plusminus': 584,
+    'brokenbar': 280,
+    'registered': 737,
+    'Gbreve': 778,
+    'Idotaccent': 278,
+    'summation': 600,
+    'Egrave': 667,
+    'racute': 389,
+    'omacron': 611,
+    'Zacute': 611,
+    'Zcaron': 611,
+    'greaterequal': 549,
+    'Eth': 722,
+    'Ccedilla': 722,
+    'lcommaaccent': 278,
+    'tcaron': 389,
+    'eogonek': 556,
+    'Uogonek': 722,
+    'Aacute': 722,
+    'Adieresis': 722,
+    'egrave': 556,
+    'zacute': 500,
+    'iogonek': 278,
+    'Oacute': 778,
+    'oacute': 611,
+    'amacron': 556,
+    'sacute': 556,
+    'idieresis': 278,
+    'Ocircumflex': 778,
+    'Ugrave': 722,
+    'Delta': 612,
+    'thorn': 611,
+    'twosuperior': 333,
+    'Odieresis': 778,
+    'mu': 611,
+    'igrave': 278,
+    'ohungarumlaut': 611,
+    'Eogonek': 667,
+    'dcroat': 611,
+    'threequarters': 834,
+    'Scedilla': 667,
+    'lcaron': 400,
+    'Kcommaaccent': 722,
+    'Lacute': 611,
+    'trademark': 1000,
+    'edotaccent': 556,
+    'Igrave': 278,
+    'Imacron': 278,
+    'Lcaron': 611,
+    'onehalf': 834,
+    'lessequal': 549,
+    'ocircumflex': 611,
+    'ntilde': 611,
+    'Uhungarumlaut': 722,
+    'Eacute': 667,
+    'emacron': 556,
+    'gbreve': 611,
+    'onequarter': 834,
+    'Scaron': 667,
+    'Scommaaccent': 667,
+    'Ohungarumlaut': 778,
+    'degree': 400,
+    'ograve': 611,
+    'Ccaron': 722,
+    'ugrave': 611,
+    'radical': 549,
+    'Dcaron': 722,
+    'rcommaaccent': 389,
+    'Ntilde': 722,
+    'otilde': 611,
+    'Rcommaaccent': 722,
+    'Lcommaaccent': 611,
+    'Atilde': 722,
+    'Aogonek': 722,
+    'Aring': 722,
+    'Otilde': 778,
+    'zdotaccent': 500,
+    'Ecaron': 667,
+    'Iogonek': 278,
+    'kcommaaccent': 556,
+    'minus': 584,
+    'Icircumflex': 278,
+    'ncaron': 611,
+    'tcommaaccent': 333,
+    'logicalnot': 584,
+    'odieresis': 611,
+    'udieresis': 611,
+    'notequal': 549,
+    'gcommaaccent': 611,
+    'eth': 611,
+    'zcaron': 500,
+    'ncommaaccent': 611,
+    'onesuperior': 333,
+    'imacron': 278,
+    'Euro': 556
+  },
+  'Helvetica-Oblique' : {
+    'space': 278,
+    'exclam': 278,
+    'quotedbl': 355,
+    'numbersign': 556,
+    'dollar': 556,
+    'percent': 889,
+    'ampersand': 667,
+    'quoteright': 222,
+    'parenleft': 333,
+    'parenright': 333,
+    'asterisk': 389,
+    'plus': 584,
+    'comma': 278,
+    'hyphen': 333,
+    'period': 278,
+    'slash': 278,
+    'zero': 556,
+    'one': 556,
+    'two': 556,
+    'three': 556,
+    'four': 556,
+    'five': 556,
+    'six': 556,
+    'seven': 556,
+    'eight': 556,
+    'nine': 556,
+    'colon': 278,
+    'semicolon': 278,
+    'less': 584,
+    'equal': 584,
+    'greater': 584,
+    'question': 556,
+    'at': 1015,
+    'A': 667,
+    'B': 667,
+    'C': 722,
+    'D': 722,
+    'E': 667,
+    'F': 611,
+    'G': 778,
+    'H': 722,
+    'I': 278,
+    'J': 500,
+    'K': 667,
+    'L': 556,
+    'M': 833,
+    'N': 722,
+    'O': 778,
+    'P': 667,
+    'Q': 778,
+    'R': 722,
+    'S': 667,
+    'T': 611,
+    'U': 722,
+    'V': 667,
+    'W': 944,
+    'X': 667,
+    'Y': 667,
+    'Z': 611,
+    'bracketleft': 278,
+    'backslash': 278,
+    'bracketright': 278,
+    'asciicircum': 469,
+    'underscore': 556,
+    'quoteleft': 222,
+    'a': 556,
+    'b': 556,
+    'c': 500,
+    'd': 556,
+    'e': 556,
+    'f': 278,
+    'g': 556,
+    'h': 556,
+    'i': 222,
+    'j': 222,
+    'k': 500,
+    'l': 222,
+    'm': 833,
+    'n': 556,
+    'o': 556,
+    'p': 556,
+    'q': 556,
+    'r': 333,
+    's': 500,
+    't': 278,
+    'u': 556,
+    'v': 500,
+    'w': 722,
+    'x': 500,
+    'y': 500,
+    'z': 500,
+    'braceleft': 334,
+    'bar': 260,
+    'braceright': 334,
+    'asciitilde': 584,
+    'exclamdown': 333,
+    'cent': 556,
+    'sterling': 556,
+    'fraction': 167,
+    'yen': 556,
+    'florin': 556,
+    'section': 556,
+    'currency': 556,
+    'quotesingle': 191,
+    'quotedblleft': 333,
+    'guillemotleft': 556,
+    'guilsinglleft': 333,
+    'guilsinglright': 333,
+    'fi': 500,
+    'fl': 500,
+    'endash': 556,
+    'dagger': 556,
+    'daggerdbl': 556,
+    'periodcentered': 278,
+    'paragraph': 537,
+    'bullet': 350,
+    'quotesinglbase': 222,
+    'quotedblbase': 333,
+    'quotedblright': 333,
+    'guillemotright': 556,
+    'ellipsis': 1000,
+    'perthousand': 1000,
+    'questiondown': 611,
+    'grave': 333,
+    'acute': 333,
+    'circumflex': 333,
+    'tilde': 333,
+    'macron': 333,
+    'breve': 333,
+    'dotaccent': 333,
+    'dieresis': 333,
+    'ring': 333,
+    'cedilla': 333,
+    'hungarumlaut': 333,
+    'ogonek': 333,
+    'caron': 333,
+    'emdash': 1000,
+    'AE': 1000,
+    'ordfeminine': 370,
+    'Lslash': 556,
+    'Oslash': 778,
+    'OE': 1000,
+    'ordmasculine': 365,
+    'ae': 889,
+    'dotlessi': 278,
+    'lslash': 222,
+    'oslash': 611,
+    'oe': 944,
+    'germandbls': 611,
+    'Idieresis': 278,
+    'eacute': 556,
+    'abreve': 556,
+    'uhungarumlaut': 556,
+    'ecaron': 556,
+    'Ydieresis': 667,
+    'divide': 584,
+    'Yacute': 667,
+    'Acircumflex': 667,
+    'aacute': 556,
+    'Ucircumflex': 722,
+    'yacute': 500,
+    'scommaaccent': 500,
+    'ecircumflex': 556,
+    'Uring': 722,
+    'Udieresis': 722,
+    'aogonek': 556,
+    'Uacute': 722,
+    'uogonek': 556,
+    'Edieresis': 667,
+    'Dcroat': 722,
+    'commaaccent': 250,
+    'copyright': 737,
+    'Emacron': 667,
+    'ccaron': 500,
+    'aring': 556,
+    'Ncommaaccent': 722,
+    'lacute': 222,
+    'agrave': 556,
+    'Tcommaaccent': 611,
+    'Cacute': 722,
+    'atilde': 556,
+    'Edotaccent': 667,
+    'scaron': 500,
+    'scedilla': 500,
+    'iacute': 278,
+    'lozenge': 471,
+    'Rcaron': 722,
+    'Gcommaaccent': 778,
+    'ucircumflex': 556,
+    'acircumflex': 556,
+    'Amacron': 667,
+    'rcaron': 333,
+    'ccedilla': 500,
+    'Zdotaccent': 611,
+    'Thorn': 667,
+    'Omacron': 778,
+    'Racute': 722,
+    'Sacute': 667,
+    'dcaron': 643,
+    'Umacron': 722,
+    'uring': 556,
+    'threesuperior': 333,
+    'Ograve': 778,
+    'Agrave': 667,
+    'Abreve': 667,
+    'multiply': 584,
+    'uacute': 556,
+    'Tcaron': 611,
+    'partialdiff': 476,
+    'ydieresis': 500,
+    'Nacute': 722,
+    'icircumflex': 278,
+    'Ecircumflex': 667,
+    'adieresis': 556,
+    'edieresis': 556,
+    'cacute': 500,
+    'nacute': 556,
+    'umacron': 556,
+    'Ncaron': 722,
+    'Iacute': 278,
+    'plusminus': 584,
+    'brokenbar': 260,
+    'registered': 737,
+    'Gbreve': 778,
+    'Idotaccent': 278,
+    'summation': 600,
+    'Egrave': 667,
+    'racute': 333,
+    'omacron': 556,
+    'Zacute': 611,
+    'Zcaron': 611,
+    'greaterequal': 549,
+    'Eth': 722,
+    'Ccedilla': 722,
+    'lcommaaccent': 222,
+    'tcaron': 317,
+    'eogonek': 556,
+    'Uogonek': 722,
+    'Aacute': 667,
+    'Adieresis': 667,
+    'egrave': 556,
+    'zacute': 500,
+    'iogonek': 222,
+    'Oacute': 778,
+    'oacute': 556,
+    'amacron': 556,
+    'sacute': 500,
+    'idieresis': 278,
+    'Ocircumflex': 778,
+    'Ugrave': 722,
+    'Delta': 612,
+    'thorn': 556,
+    'twosuperior': 333,
+    'Odieresis': 778,
+    'mu': 556,
+    'igrave': 278,
+    'ohungarumlaut': 556,
+    'Eogonek': 667,
+    'dcroat': 556,
+    'threequarters': 834,
+    'Scedilla': 667,
+    'lcaron': 299,
+    'Kcommaaccent': 667,
+    'Lacute': 556,
+    'trademark': 1000,
+    'edotaccent': 556,
+    'Igrave': 278,
+    'Imacron': 278,
+    'Lcaron': 556,
+    'onehalf': 834,
+    'lessequal': 549,
+    'ocircumflex': 556,
+    'ntilde': 556,
+    'Uhungarumlaut': 722,
+    'Eacute': 667,
+    'emacron': 556,
+    'gbreve': 556,
+    'onequarter': 834,
+    'Scaron': 667,
+    'Scommaaccent': 667,
+    'Ohungarumlaut': 778,
+    'degree': 400,
+    'ograve': 556,
+    'Ccaron': 722,
+    'ugrave': 556,
+    'radical': 453,
+    'Dcaron': 722,
+    'rcommaaccent': 333,
+    'Ntilde': 722,
+    'otilde': 556,
+    'Rcommaaccent': 722,
+    'Lcommaaccent': 556,
+    'Atilde': 667,
+    'Aogonek': 667,
+    'Aring': 667,
+    'Otilde': 778,
+    'zdotaccent': 500,
+    'Ecaron': 667,
+    'Iogonek': 278,
+    'kcommaaccent': 500,
+    'minus': 584,
+    'Icircumflex': 278,
+    'ncaron': 556,
+    'tcommaaccent': 278,
+    'logicalnot': 584,
+    'odieresis': 556,
+    'udieresis': 556,
+    'notequal': 549,
+    'gcommaaccent': 556,
+    'eth': 556,
+    'zcaron': 500,
+    'ncommaaccent': 556,
+    'onesuperior': 333,
+    'imacron': 278,
+    'Euro': 556
+  },
+  'Symbol': {
+    'space': 250,
+    'exclam': 333,
+    'universal': 713,
+    'numbersign': 500,
+    'existential': 549,
+    'percent': 833,
+    'ampersand': 778,
+    'suchthat': 439,
+    'parenleft': 333,
+    'parenright': 333,
+    'asteriskmath': 500,
+    'plus': 549,
+    'comma': 250,
+    'minus': 549,
+    'period': 250,
+    'slash': 278,
+    'zero': 500,
+    'one': 500,
+    'two': 500,
+    'three': 500,
+    'four': 500,
+    'five': 500,
+    'six': 500,
+    'seven': 500,
+    'eight': 500,
+    'nine': 500,
+    'colon': 278,
+    'semicolon': 278,
+    'less': 549,
+    'equal': 549,
+    'greater': 549,
+    'question': 444,
+    'congruent': 549,
+    'Alpha': 722,
+    'Beta': 667,
+    'Chi': 722,
+    'Delta': 612,
+    'Epsilon': 611,
+    'Phi': 763,
+    'Gamma': 603,
+    'Eta': 722,
+    'Iota': 333,
+    'theta1': 631,
+    'Kappa': 722,
+    'Lambda': 686,
+    'Mu': 889,
+    'Nu': 722,
+    'Omicron': 722,
+    'Pi': 768,
+    'Theta': 741,
+    'Rho': 556,
+    'Sigma': 592,
+    'Tau': 611,
+    'Upsilon': 690,
+    'sigma1': 439,
+    'Omega': 768,
+    'Xi': 645,
+    'Psi': 795,
+    'Zeta': 611,
+    'bracketleft': 333,
+    'therefore': 863,
+    'bracketright': 333,
+    'perpendicular': 658,
+    'underscore': 500,
+    'radicalex': 500,
+    'alpha': 631,
+    'beta': 549,
+    'chi': 549,
+    'delta': 494,
+    'epsilon': 439,
+    'phi': 521,
+    'gamma': 411,
+    'eta': 603,
+    'iota': 329,
+    'phi1': 603,
+    'kappa': 549,
+    'lambda': 549,
+    'mu': 576,
+    'nu': 521,
+    'omicron': 549,
+    'pi': 549,
+    'theta': 521,
+    'rho': 549,
+    'sigma': 603,
+    'tau': 439,
+    'upsilon': 576,
+    'omega1': 713,
+    'omega': 686,
+    'xi': 493,
+    'psi': 686,
+    'zeta': 494,
+    'braceleft': 480,
+    'bar': 200,
+    'braceright': 480,
+    'similar': 549,
+    'Euro': 750,
+    'Upsilon1': 620,
+    'minute': 247,
+    'lessequal': 549,
+    'fraction': 167,
+    'infinity': 713,
+    'florin': 500,
+    'club': 753,
+    'diamond': 753,
+    'heart': 753,
+    'spade': 753,
+    'arrowboth': 1042,
+    'arrowleft': 987,
+    'arrowup': 603,
+    'arrowright': 987,
+    'arrowdown': 603,
+    'degree': 400,
+    'plusminus': 549,
+    'second': 411,
+    'greaterequal': 549,
+    'multiply': 549,
+    'proportional': 713,
+    'partialdiff': 494,
+    'bullet': 460,
+    'divide': 549,
+    'notequal': 549,
+    'equivalence': 549,
+    'approxequal': 549,
+    'ellipsis': 1000,
+    'arrowvertex': 603,
+    'arrowhorizex': 1000,
+    'carriagereturn': 658,
+    'aleph': 823,
+    'Ifraktur': 686,
+    'Rfraktur': 795,
+    'weierstrass': 987,
+    'circlemultiply': 768,
+    'circleplus': 768,
+    'emptyset': 823,
+    'intersection': 768,
+    'union': 768,
+    'propersuperset': 713,
+    'reflexsuperset': 713,
+    'notsubset': 713,
+    'propersubset': 713,
+    'reflexsubset': 713,
+    'element': 713,
+    'notelement': 713,
+    'angle': 768,
+    'gradient': 713,
+    'registerserif': 790,
+    'copyrightserif': 790,
+    'trademarkserif': 890,
+    'product': 823,
+    'radical': 549,
+    'dotmath': 250,
+    'logicalnot': 713,
+    'logicaland': 603,
+    'logicalor': 603,
+    'arrowdblboth': 1042,
+    'arrowdblleft': 987,
+    'arrowdblup': 603,
+    'arrowdblright': 987,
+    'arrowdbldown': 603,
+    'lozenge': 494,
+    'angleleft': 329,
+    'registersans': 790,
+    'copyrightsans': 790,
+    'trademarksans': 786,
+    'summation': 713,
+    'parenlefttp': 384,
+    'parenleftex': 384,
+    'parenleftbt': 384,
+    'bracketlefttp': 384,
+    'bracketleftex': 384,
+    'bracketleftbt': 384,
+    'bracelefttp': 494,
+    'braceleftmid': 494,
+    'braceleftbt': 494,
+    'braceex': 494,
+    'angleright': 329,
+    'integral': 274,
+    'integraltp': 686,
+    'integralex': 686,
+    'integralbt': 686,
+    'parenrighttp': 384,
+    'parenrightex': 384,
+    'parenrightbt': 384,
+    'bracketrighttp': 384,
+    'bracketrightex': 384,
+    'bracketrightbt': 384,
+    'bracerighttp': 494,
+    'bracerightmid': 494,
+    'bracerightbt': 494,
+    'apple': 790
+  },
+  'Times-Roman': {
+    'space': 250,
+    'exclam': 333,
+    'quotedbl': 408,
+    'numbersign': 500,
+    'dollar': 500,
+    'percent': 833,
+    'ampersand': 778,
+    'quoteright': 333,
+    'parenleft': 333,
+    'parenright': 333,
+    'asterisk': 500,
+    'plus': 564,
+    'comma': 250,
+    'hyphen': 333,
+    'period': 250,
+    'slash': 278,
+    'zero': 500,
+    'one': 500,
+    'two': 500,
+    'three': 500,
+    'four': 500,
+    'five': 500,
+    'six': 500,
+    'seven': 500,
+    'eight': 500,
+    'nine': 500,
+    'colon': 278,
+    'semicolon': 278,
+    'less': 564,
+    'equal': 564,
+    'greater': 564,
+    'question': 444,
+    'at': 921,
+    'A': 722,
+    'B': 667,
+    'C': 667,
+    'D': 722,
+    'E': 611,
+    'F': 556,
+    'G': 722,
+    'H': 722,
+    'I': 333,
+    'J': 389,
+    'K': 722,
+    'L': 611,
+    'M': 889,
+    'N': 722,
+    'O': 722,
+    'P': 556,
+    'Q': 722,
+    'R': 667,
+    'S': 556,
+    'T': 611,
+    'U': 722,
+    'V': 722,
+    'W': 944,
+    'X': 722,
+    'Y': 722,
+    'Z': 611,
+    'bracketleft': 333,
+    'backslash': 278,
+    'bracketright': 333,
+    'asciicircum': 469,
+    'underscore': 500,
+    'quoteleft': 333,
+    'a': 444,
+    'b': 500,
+    'c': 444,
+    'd': 500,
+    'e': 444,
+    'f': 333,
+    'g': 500,
+    'h': 500,
+    'i': 278,
+    'j': 278,
+    'k': 500,
+    'l': 278,
+    'm': 778,
+    'n': 500,
+    'o': 500,
+    'p': 500,
+    'q': 500,
+    'r': 333,
+    's': 389,
+    't': 278,
+    'u': 500,
+    'v': 500,
+    'w': 722,
+    'x': 500,
+    'y': 500,
+    'z': 444,
+    'braceleft': 480,
+    'bar': 200,
+    'braceright': 480,
+    'asciitilde': 541,
+    'exclamdown': 333,
+    'cent': 500,
+    'sterling': 500,
+    'fraction': 167,
+    'yen': 500,
+    'florin': 500,
+    'section': 500,
+    'currency': 500,
+    'quotesingle': 180,
+    'quotedblleft': 444,
+    'guillemotleft': 500,
+    'guilsinglleft': 333,
+    'guilsinglright': 333,
+    'fi': 556,
+    'fl': 556,
+    'endash': 500,
+    'dagger': 500,
+    'daggerdbl': 500,
+    'periodcentered': 250,
+    'paragraph': 453,
+    'bullet': 350,
+    'quotesinglbase': 333,
+    'quotedblbase': 444,
+    'quotedblright': 444,
+    'guillemotright': 500,
+    'ellipsis': 1000,
+    'perthousand': 1000,
+    'questiondown': 444,
+    'grave': 333,
+    'acute': 333,
+    'circumflex': 333,
+    'tilde': 333,
+    'macron': 333,
+    'breve': 333,
+    'dotaccent': 333,
+    'dieresis': 333,
+    'ring': 333,
+    'cedilla': 333,
+    'hungarumlaut': 333,
+    'ogonek': 333,
+    'caron': 333,
+    'emdash': 1000,
+    'AE': 889,
+    'ordfeminine': 276,
+    'Lslash': 611,
+    'Oslash': 722,
+    'OE': 889,
+    'ordmasculine': 310,
+    'ae': 667,
+    'dotlessi': 278,
+    'lslash': 278,
+    'oslash': 500,
+    'oe': 722,
+    'germandbls': 500,
+    'Idieresis': 333,
+    'eacute': 444,
+    'abreve': 444,
+    'uhungarumlaut': 500,
+    'ecaron': 444,
+    'Ydieresis': 722,
+    'divide': 564,
+    'Yacute': 722,
+    'Acircumflex': 722,
+    'aacute': 444,
+    'Ucircumflex': 722,
+    'yacute': 500,
+    'scommaaccent': 389,
+    'ecircumflex': 444,
+    'Uring': 722,
+    'Udieresis': 722,
+    'aogonek': 444,
+    'Uacute': 722,
+    'uogonek': 500,
+    'Edieresis': 611,
+    'Dcroat': 722,
+    'commaaccent': 250,
+    'copyright': 760,
+    'Emacron': 611,
+    'ccaron': 444,
+    'aring': 444,
+    'Ncommaaccent': 722,
+    'lacute': 278,
+    'agrave': 444,
+    'Tcommaaccent': 611,
+    'Cacute': 667,
+    'atilde': 444,
+    'Edotaccent': 611,
+    'scaron': 389,
+    'scedilla': 389,
+    'iacute': 278,
+    'lozenge': 471,
+    'Rcaron': 667,
+    'Gcommaaccent': 722,
+    'ucircumflex': 500,
+    'acircumflex': 444,
+    'Amacron': 722,
+    'rcaron': 333,
+    'ccedilla': 444,
+    'Zdotaccent': 611,
+    'Thorn': 556,
+    'Omacron': 722,
+    'Racute': 667,
+    'Sacute': 556,
+    'dcaron': 588,
+    'Umacron': 722,
+    'uring': 500,
+    'threesuperior': 300,
+    'Ograve': 722,
+    'Agrave': 722,
+    'Abreve': 722,
+    'multiply': 564,
+    'uacute': 500,
+    'Tcaron': 611,
+    'partialdiff': 476,
+    'ydieresis': 500,
+    'Nacute': 722,
+    'icircumflex': 278,
+    'Ecircumflex': 611,
+    'adieresis': 444,
+    'edieresis': 444,
+    'cacute': 444,
+    'nacute': 500,
+    'umacron': 500,
+    'Ncaron': 722,
+    'Iacute': 333,
+    'plusminus': 564,
+    'brokenbar': 200,
+    'registered': 760,
+    'Gbreve': 722,
+    'Idotaccent': 333,
+    'summation': 600,
+    'Egrave': 611,
+    'racute': 333,
+    'omacron': 500,
+    'Zacute': 611,
+    'Zcaron': 611,
+    'greaterequal': 549,
+    'Eth': 722,
+    'Ccedilla': 667,
+    'lcommaaccent': 278,
+    'tcaron': 326,
+    'eogonek': 444,
+    'Uogonek': 722,
+    'Aacute': 722,
+    'Adieresis': 722,
+    'egrave': 444,
+    'zacute': 444,
+    'iogonek': 278,
+    'Oacute': 722,
+    'oacute': 500,
+    'amacron': 444,
+    'sacute': 389,
+    'idieresis': 278,
+    'Ocircumflex': 722,
+    'Ugrave': 722,
+    'Delta': 612,
+    'thorn': 500,
+    'twosuperior': 300,
+    'Odieresis': 722,
+    'mu': 500,
+    'igrave': 278,
+    'ohungarumlaut': 500,
+    'Eogonek': 611,
+    'dcroat': 500,
+    'threequarters': 750,
+    'Scedilla': 556,
+    'lcaron': 344,
+    'Kcommaaccent': 722,
+    'Lacute': 611,
+    'trademark': 980,
+    'edotaccent': 444,
+    'Igrave': 333,
+    'Imacron': 333,
+    'Lcaron': 611,
+    'onehalf': 750,
+    'lessequal': 549,
+    'ocircumflex': 500,
+    'ntilde': 500,
+    'Uhungarumlaut': 722,
+    'Eacute': 611,
+    'emacron': 444,
+    'gbreve': 500,
+    'onequarter': 750,
+    'Scaron': 556,
+    'Scommaaccent': 556,
+    'Ohungarumlaut': 722,
+    'degree': 400,
+    'ograve': 500,
+    'Ccaron': 667,
+    'ugrave': 500,
+    'radical': 453,
+    'Dcaron': 722,
+    'rcommaaccent': 333,
+    'Ntilde': 722,
+    'otilde': 500,
+    'Rcommaaccent': 667,
+    'Lcommaaccent': 611,
+    'Atilde': 722,
+    'Aogonek': 722,
+    'Aring': 722,
+    'Otilde': 722,
+    'zdotaccent': 444,
+    'Ecaron': 611,
+    'Iogonek': 333,
+    'kcommaaccent': 500,
+    'minus': 564,
+    'Icircumflex': 333,
+    'ncaron': 500,
+    'tcommaaccent': 278,
+    'logicalnot': 564,
+    'odieresis': 500,
+    'udieresis': 500,
+    'notequal': 549,
+    'gcommaaccent': 500,
+    'eth': 500,
+    'zcaron': 444,
+    'ncommaaccent': 500,
+    'onesuperior': 300,
+    'imacron': 278,
+    'Euro': 500
+  },
+  'Times-Bold': {
+    'space': 250,
+    'exclam': 333,
+    'quotedbl': 555,
+    'numbersign': 500,
+    'dollar': 500,
+    'percent': 1000,
+    'ampersand': 833,
+    'quoteright': 333,
+    'parenleft': 333,
+    'parenright': 333,
+    'asterisk': 500,
+    'plus': 570,
+    'comma': 250,
+    'hyphen': 333,
+    'period': 250,
+    'slash': 278,
+    'zero': 500,
+    'one': 500,
+    'two': 500,
+    'three': 500,
+    'four': 500,
+    'five': 500,
+    'six': 500,
+    'seven': 500,
+    'eight': 500,
+    'nine': 500,
+    'colon': 333,
+    'semicolon': 333,
+    'less': 570,
+    'equal': 570,
+    'greater': 570,
+    'question': 500,
+    'at': 930,
+    'A': 722,
+    'B': 667,
+    'C': 722,
+    'D': 722,
+    'E': 667,
+    'F': 611,
+    'G': 778,
+    'H': 778,
+    'I': 389,
+    'J': 500,
+    'K': 778,
+    'L': 667,
+    'M': 944,
+    'N': 722,
+    'O': 778,
+    'P': 611,
+    'Q': 778,
+    'R': 722,
+    'S': 556,
+    'T': 667,
+    'U': 722,
+    'V': 722,
+    'W': 1000,
+    'X': 722,
+    'Y': 722,
+    'Z': 667,
+    'bracketleft': 333,
+    'backslash': 278,
+    'bracketright': 333,
+    'asciicircum': 581,
+    'underscore': 500,
+    'quoteleft': 333,
+    'a': 500,
+    'b': 556,
+    'c': 444,
+    'd': 556,
+    'e': 444,
+    'f': 333,
+    'g': 500,
+    'h': 556,
+    'i': 278,
+    'j': 333,
+    'k': 556,
+    'l': 278,
+    'm': 833,
+    'n': 556,
+    'o': 500,
+    'p': 556,
+    'q': 556,
+    'r': 444,
+    's': 389,
+    't': 333,
+    'u': 556,
+    'v': 500,
+    'w': 722,
+    'x': 500,
+    'y': 500,
+    'z': 444,
+    'braceleft': 394,
+    'bar': 220,
+    'braceright': 394,
+    'asciitilde': 520,
+    'exclamdown': 333,
+    'cent': 500,
+    'sterling': 500,
+    'fraction': 167,
+    'yen': 500,
+    'florin': 500,
+    'section': 500,
+    'currency': 500,
+    'quotesingle': 278,
+    'quotedblleft': 500,
+    'guillemotleft': 500,
+    'guilsinglleft': 333,
+    'guilsinglright': 333,
+    'fi': 556,
+    'fl': 556,
+    'endash': 500,
+    'dagger': 500,
+    'daggerdbl': 500,
+    'periodcentered': 250,
+    'paragraph': 540,
+    'bullet': 350,
+    'quotesinglbase': 333,
+    'quotedblbase': 500,
+    'quotedblright': 500,
+    'guillemotright': 500,
+    'ellipsis': 1000,
+    'perthousand': 1000,
+    'questiondown': 500,
+    'grave': 333,
+    'acute': 333,
+    'circumflex': 333,
+    'tilde': 333,
+    'macron': 333,
+    'breve': 333,
+    'dotaccent': 333,
+    'dieresis': 333,
+    'ring': 333,
+    'cedilla': 333,
+    'hungarumlaut': 333,
+    'ogonek': 333,
+    'caron': 333,
+    'emdash': 1000,
+    'AE': 1000,
+    'ordfeminine': 300,
+    'Lslash': 667,
+    'Oslash': 778,
+    'OE': 1000,
+    'ordmasculine': 330,
+    'ae': 722,
+    'dotlessi': 278,
+    'lslash': 278,
+    'oslash': 500,
+    'oe': 722,
+    'germandbls': 556,
+    'Idieresis': 389,
+    'eacute': 444,
+    'abreve': 500,
+    'uhungarumlaut': 556,
+    'ecaron': 444,
+    'Ydieresis': 722,
+    'divide': 570,
+    'Yacute': 722,
+    'Acircumflex': 722,
+    'aacute': 500,
+    'Ucircumflex': 722,
+    'yacute': 500,
+    'scommaaccent': 389,
+    'ecircumflex': 444,
+    'Uring': 722,
+    'Udieresis': 722,
+    'aogonek': 500,
+    'Uacute': 722,
+    'uogonek': 556,
+    'Edieresis': 667,
+    'Dcroat': 722,
+    'commaaccent': 250,
+    'copyright': 747,
+    'Emacron': 667,
+    'ccaron': 444,
+    'aring': 500,
+    'Ncommaaccent': 722,
+    'lacute': 278,
+    'agrave': 500,
+    'Tcommaaccent': 667,
+    'Cacute': 722,
+    'atilde': 500,
+    'Edotaccent': 667,
+    'scaron': 389,
+    'scedilla': 389,
+    'iacute': 278,
+    'lozenge': 494,
+    'Rcaron': 722,
+    'Gcommaaccent': 778,
+    'ucircumflex': 556,
+    'acircumflex': 500,
+    'Amacron': 722,
+    'rcaron': 444,
+    'ccedilla': 444,
+    'Zdotaccent': 667,
+    'Thorn': 611,
+    'Omacron': 778,
+    'Racute': 722,
+    'Sacute': 556,
+    'dcaron': 672,
+    'Umacron': 722,
+    'uring': 556,
+    'threesuperior': 300,
+    'Ograve': 778,
+    'Agrave': 722,
+    'Abreve': 722,
+    'multiply': 570,
+    'uacute': 556,
+    'Tcaron': 667,
+    'partialdiff': 494,
+    'ydieresis': 500,
+    'Nacute': 722,
+    'icircumflex': 278,
+    'Ecircumflex': 667,
+    'adieresis': 500,
+    'edieresis': 444,
+    'cacute': 444,
+    'nacute': 556,
+    'umacron': 556,
+    'Ncaron': 722,
+    'Iacute': 389,
+    'plusminus': 570,
+    'brokenbar': 220,
+    'registered': 747,
+    'Gbreve': 778,
+    'Idotaccent': 389,
+    'summation': 600,
+    'Egrave': 667,
+    'racute': 444,
+    'omacron': 500,
+    'Zacute': 667,
+    'Zcaron': 667,
+    'greaterequal': 549,
+    'Eth': 722,
+    'Ccedilla': 722,
+    'lcommaaccent': 278,
+    'tcaron': 416,
+    'eogonek': 444,
+    'Uogonek': 722,
+    'Aacute': 722,
+    'Adieresis': 722,
+    'egrave': 444,
+    'zacute': 444,
+    'iogonek': 278,
+    'Oacute': 778,
+    'oacute': 500,
+    'amacron': 500,
+    'sacute': 389,
+    'idieresis': 278,
+    'Ocircumflex': 778,
+    'Ugrave': 722,
+    'Delta': 612,
+    'thorn': 556,
+    'twosuperior': 300,
+    'Odieresis': 778,
+    'mu': 556,
+    'igrave': 278,
+    'ohungarumlaut': 500,
+    'Eogonek': 667,
+    'dcroat': 556,
+    'threequarters': 750,
+    'Scedilla': 556,
+    'lcaron': 394,
+    'Kcommaaccent': 778,
+    'Lacute': 667,
+    'trademark': 1000,
+    'edotaccent': 444,
+    'Igrave': 389,
+    'Imacron': 389,
+    'Lcaron': 667,
+    'onehalf': 750,
+    'lessequal': 549,
+    'ocircumflex': 500,
+    'ntilde': 556,
+    'Uhungarumlaut': 722,
+    'Eacute': 667,
+    'emacron': 444,
+    'gbreve': 500,
+    'onequarter': 750,
+    'Scaron': 556,
+    'Scommaaccent': 556,
+    'Ohungarumlaut': 778,
+    'degree': 400,
+    'ograve': 500,
+    'Ccaron': 722,
+    'ugrave': 556,
+    'radical': 549,
+    'Dcaron': 722,
+    'rcommaaccent': 444,
+    'Ntilde': 722,
+    'otilde': 500,
+    'Rcommaaccent': 722,
+    'Lcommaaccent': 667,
+    'Atilde': 722,
+    'Aogonek': 722,
+    'Aring': 722,
+    'Otilde': 778,
+    'zdotaccent': 444,
+    'Ecaron': 667,
+    'Iogonek': 389,
+    'kcommaaccent': 556,
+    'minus': 570,
+    'Icircumflex': 389,
+    'ncaron': 556,
+    'tcommaaccent': 333,
+    'logicalnot': 570,
+    'odieresis': 500,
+    'udieresis': 556,
+    'notequal': 549,
+    'gcommaaccent': 500,
+    'eth': 500,
+    'zcaron': 444,
+    'ncommaaccent': 556,
+    'onesuperior': 300,
+    'imacron': 278,
+    'Euro': 500
+  },
+  'Times-BoldItalic': {
+    'space': 250,
+    'exclam': 389,
+    'quotedbl': 555,
+    'numbersign': 500,
+    'dollar': 500,
+    'percent': 833,
+    'ampersand': 778,
+    'quoteright': 333,
+    'parenleft': 333,
+    'parenright': 333,
+    'asterisk': 500,
+    'plus': 570,
+    'comma': 250,
+    'hyphen': 333,
+    'period': 250,
+    'slash': 278,
+    'zero': 500,
+    'one': 500,
+    'two': 500,
+    'three': 500,
+    'four': 500,
+    'five': 500,
+    'six': 500,
+    'seven': 500,
+    'eight': 500,
+    'nine': 500,
+    'colon': 333,
+    'semicolon': 333,
+    'less': 570,
+    'equal': 570,
+    'greater': 570,
+    'question': 500,
+    'at': 832,
+    'A': 667,
+    'B': 667,
+    'C': 667,
+    'D': 722,
+    'E': 667,
+    'F': 667,
+    'G': 722,
+    'H': 778,
+    'I': 389,
+    'J': 500,
+    'K': 667,
+    'L': 611,
+    'M': 889,
+    'N': 722,
+    'O': 722,
+    'P': 611,
+    'Q': 722,
+    'R': 667,
+    'S': 556,
+    'T': 611,
+    'U': 722,
+    'V': 667,
+    'W': 889,
+    'X': 667,
+    'Y': 611,
+    'Z': 611,
+    'bracketleft': 333,
+    'backslash': 278,
+    'bracketright': 333,
+    'asciicircum': 570,
+    'underscore': 500,
+    'quoteleft': 333,
+    'a': 500,
+    'b': 500,
+    'c': 444,
+    'd': 500,
+    'e': 444,
+    'f': 333,
+    'g': 500,
+    'h': 556,
+    'i': 278,
+    'j': 278,
+    'k': 500,
+    'l': 278,
+    'm': 778,
+    'n': 556,
+    'o': 500,
+    'p': 500,
+    'q': 500,
+    'r': 389,
+    's': 389,
+    't': 278,
+    'u': 556,
+    'v': 444,
+    'w': 667,
+    'x': 500,
+    'y': 444,
+    'z': 389,
+    'braceleft': 348,
+    'bar': 220,
+    'braceright': 348,
+    'asciitilde': 570,
+    'exclamdown': 389,
+    'cent': 500,
+    'sterling': 500,
+    'fraction': 167,
+    'yen': 500,
+    'florin': 500,
+    'section': 500,
+    'currency': 500,
+    'quotesingle': 278,
+    'quotedblleft': 500,
+    'guillemotleft': 500,
+    'guilsinglleft': 333,
+    'guilsinglright': 333,
+    'fi': 556,
+    'fl': 556,
+    'endash': 500,
+    'dagger': 500,
+    'daggerdbl': 500,
+    'periodcentered': 250,
+    'paragraph': 500,
+    'bullet': 350,
+    'quotesinglbase': 333,
+    'quotedblbase': 500,
+    'quotedblright': 500,
+    'guillemotright': 500,
+    'ellipsis': 1000,
+    'perthousand': 1000,
+    'questiondown': 500,
+    'grave': 333,
+    'acute': 333,
+    'circumflex': 333,
+    'tilde': 333,
+    'macron': 333,
+    'breve': 333,
+    'dotaccent': 333,
+    'dieresis': 333,
+    'ring': 333,
+    'cedilla': 333,
+    'hungarumlaut': 333,
+    'ogonek': 333,
+    'caron': 333,
+    'emdash': 1000,
+    'AE': 944,
+    'ordfeminine': 266,
+    'Lslash': 611,
+    'Oslash': 722,
+    'OE': 944,
+    'ordmasculine': 300,
+    'ae': 722,
+    'dotlessi': 278,
+    'lslash': 278,
+    'oslash': 500,
+    'oe': 722,
+    'germandbls': 500,
+    'Idieresis': 389,
+    'eacute': 444,
+    'abreve': 500,
+    'uhungarumlaut': 556,
+    'ecaron': 444,
+    'Ydieresis': 611,
+    'divide': 570,
+    'Yacute': 611,
+    'Acircumflex': 667,
+    'aacute': 500,
+    'Ucircumflex': 722,
+    'yacute': 444,
+    'scommaaccent': 389,
+    'ecircumflex': 444,
+    'Uring': 722,
+    'Udieresis': 722,
+    'aogonek': 500,
+    'Uacute': 722,
+    'uogonek': 556,
+    'Edieresis': 667,
+    'Dcroat': 722,
+    'commaaccent': 250,
+    'copyright': 747,
+    'Emacron': 667,
+    'ccaron': 444,
+    'aring': 500,
+    'Ncommaaccent': 722,
+    'lacute': 278,
+    'agrave': 500,
+    'Tcommaaccent': 611,
+    'Cacute': 667,
+    'atilde': 500,
+    'Edotaccent': 667,
+    'scaron': 389,
+    'scedilla': 389,
+    'iacute': 278,
+    'lozenge': 494,
+    'Rcaron': 667,
+    'Gcommaaccent': 722,
+    'ucircumflex': 556,
+    'acircumflex': 500,
+    'Amacron': 667,
+    'rcaron': 389,
+    'ccedilla': 444,
+    'Zdotaccent': 611,
+    'Thorn': 611,
+    'Omacron': 722,
+    'Racute': 667,
+    'Sacute': 556,
+    'dcaron': 608,
+    'Umacron': 722,
+    'uring': 556,
+    'threesuperior': 300,
+    'Ograve': 722,
+    'Agrave': 667,
+    'Abreve': 667,
+    'multiply': 570,
+    'uacute': 556,
+    'Tcaron': 611,
+    'partialdiff': 494,
+    'ydieresis': 444,
+    'Nacute': 722,
+    'icircumflex': 278,
+    'Ecircumflex': 667,
+    'adieresis': 500,
+    'edieresis': 444,
+    'cacute': 444,
+    'nacute': 556,
+    'umacron': 556,
+    'Ncaron': 722,
+    'Iacute': 389,
+    'plusminus': 570,
+    'brokenbar': 220,
+    'registered': 747,
+    'Gbreve': 722,
+    'Idotaccent': 389,
+    'summation': 600,
+    'Egrave': 667,
+    'racute': 389,
+    'omacron': 500,
+    'Zacute': 611,
+    'Zcaron': 611,
+    'greaterequal': 549,
+    'Eth': 722,
+    'Ccedilla': 667,
+    'lcommaaccent': 278,
+    'tcaron': 366,
+    'eogonek': 444,
+    'Uogonek': 722,
+    'Aacute': 667,
+    'Adieresis': 667,
+    'egrave': 444,
+    'zacute': 389,
+    'iogonek': 278,
+    'Oacute': 722,
+    'oacute': 500,
+    'amacron': 500,
+    'sacute': 389,
+    'idieresis': 278,
+    'Ocircumflex': 722,
+    'Ugrave': 722,
+    'Delta': 612,
+    'thorn': 500,
+    'twosuperior': 300,
+    'Odieresis': 722,
+    'mu': 576,
+    'igrave': 278,
+    'ohungarumlaut': 500,
+    'Eogonek': 667,
+    'dcroat': 500,
+    'threequarters': 750,
+    'Scedilla': 556,
+    'lcaron': 382,
+    'Kcommaaccent': 667,
+    'Lacute': 611,
+    'trademark': 1000,
+    'edotaccent': 444,
+    'Igrave': 389,
+    'Imacron': 389,
+    'Lcaron': 611,
+    'onehalf': 750,
+    'lessequal': 549,
+    'ocircumflex': 500,
+    'ntilde': 556,
+    'Uhungarumlaut': 722,
+    'Eacute': 667,
+    'emacron': 444,
+    'gbreve': 500,
+    'onequarter': 750,
+    'Scaron': 556,
+    'Scommaaccent': 556,
+    'Ohungarumlaut': 722,
+    'degree': 400,
+    'ograve': 500,
+    'Ccaron': 667,
+    'ugrave': 556,
+    'radical': 549,
+    'Dcaron': 722,
+    'rcommaaccent': 389,
+    'Ntilde': 722,
+    'otilde': 500,
+    'Rcommaaccent': 667,
+    'Lcommaaccent': 611,
+    'Atilde': 667,
+    'Aogonek': 667,
+    'Aring': 667,
+    'Otilde': 722,
+    'zdotaccent': 389,
+    'Ecaron': 667,
+    'Iogonek': 389,
+    'kcommaaccent': 500,
+    'minus': 606,
+    'Icircumflex': 389,
+    'ncaron': 556,
+    'tcommaaccent': 278,
+    'logicalnot': 606,
+    'odieresis': 500,
+    'udieresis': 556,
+    'notequal': 549,
+    'gcommaaccent': 500,
+    'eth': 500,
+    'zcaron': 389,
+    'ncommaaccent': 556,
+    'onesuperior': 300,
+    'imacron': 278,
+    'Euro': 500
+  },
+  'Times-Italic': {
+    'space': 250,
+    'exclam': 333,
+    'quotedbl': 420,
+    'numbersign': 500,
+    'dollar': 500,
+    'percent': 833,
+    'ampersand': 778,
+    'quoteright': 333,
+    'parenleft': 333,
+    'parenright': 333,
+    'asterisk': 500,
+    'plus': 675,
+    'comma': 250,
+    'hyphen': 333,
+    'period': 250,
+    'slash': 278,
+    'zero': 500,
+    'one': 500,
+    'two': 500,
+    'three': 500,
+    'four': 500,
+    'five': 500,
+    'six': 500,
+    'seven': 500,
+    'eight': 500,
+    'nine': 500,
+    'colon': 333,
+    'semicolon': 333,
+    'less': 675,
+    'equal': 675,
+    'greater': 675,
+    'question': 500,
+    'at': 920,
+    'A': 611,
+    'B': 611,
+    'C': 667,
+    'D': 722,
+    'E': 611,
+    'F': 611,
+    'G': 722,
+    'H': 722,
+    'I': 333,
+    'J': 444,
+    'K': 667,
+    'L': 556,
+    'M': 833,
+    'N': 667,
+    'O': 722,
+    'P': 611,
+    'Q': 722,
+    'R': 611,
+    'S': 500,
+    'T': 556,
+    'U': 722,
+    'V': 611,
+    'W': 833,
+    'X': 611,
+    'Y': 556,
+    'Z': 556,
+    'bracketleft': 389,
+    'backslash': 278,
+    'bracketright': 389,
+    'asciicircum': 422,
+    'underscore': 500,
+    'quoteleft': 333,
+    'a': 500,
+    'b': 500,
+    'c': 444,
+    'd': 500,
+    'e': 444,
+    'f': 278,
+    'g': 500,
+    'h': 500,
+    'i': 278,
+    'j': 278,
+    'k': 444,
+    'l': 278,
+    'm': 722,
+    'n': 500,
+    'o': 500,
+    'p': 500,
+    'q': 500,
+    'r': 389,
+    's': 389,
+    't': 278,
+    'u': 500,
+    'v': 444,
+    'w': 667,
+    'x': 444,
+    'y': 444,
+    'z': 389,
+    'braceleft': 400,
+    'bar': 275,
+    'braceright': 400,
+    'asciitilde': 541,
+    'exclamdown': 389,
+    'cent': 500,
+    'sterling': 500,
+    'fraction': 167,
+    'yen': 500,
+    'florin': 500,
+    'section': 500,
+    'currency': 500,
+    'quotesingle': 214,
+    'quotedblleft': 556,
+    'guillemotleft': 500,
+    'guilsinglleft': 333,
+    'guilsinglright': 333,
+    'fi': 500,
+    'fl': 500,
+    'endash': 500,
+    'dagger': 500,
+    'daggerdbl': 500,
+    'periodcentered': 250,
+    'paragraph': 523,
+    'bullet': 350,
+    'quotesinglbase': 333,
+    'quotedblbase': 556,
+    'quotedblright': 556,
+    'guillemotright': 500,
+    'ellipsis': 889,
+    'perthousand': 1000,
+    'questiondown': 500,
+    'grave': 333,
+    'acute': 333,
+    'circumflex': 333,
+    'tilde': 333,
+    'macron': 333,
+    'breve': 333,
+    'dotaccent': 333,
+    'dieresis': 333,
+    'ring': 333,
+    'cedilla': 333,
+    'hungarumlaut': 333,
+    'ogonek': 333,
+    'caron': 333,
+    'emdash': 889,
+    'AE': 889,
+    'ordfeminine': 276,
+    'Lslash': 556,
+    'Oslash': 722,
+    'OE': 944,
+    'ordmasculine': 310,
+    'ae': 667,
+    'dotlessi': 278,
+    'lslash': 278,
+    'oslash': 500,
+    'oe': 667,
+    'germandbls': 500,
+    'Idieresis': 333,
+    'eacute': 444,
+    'abreve': 500,
+    'uhungarumlaut': 500,
+    'ecaron': 444,
+    'Ydieresis': 556,
+    'divide': 675,
+    'Yacute': 556,
+    'Acircumflex': 611,
+    'aacute': 500,
+    'Ucircumflex': 722,
+    'yacute': 444,
+    'scommaaccent': 389,
+    'ecircumflex': 444,
+    'Uring': 722,
+    'Udieresis': 722,
+    'aogonek': 500,
+    'Uacute': 722,
+    'uogonek': 500,
+    'Edieresis': 611,
+    'Dcroat': 722,
+    'commaaccent': 250,
+    'copyright': 760,
+    'Emacron': 611,
+    'ccaron': 444,
+    'aring': 500,
+    'Ncommaaccent': 667,
+    'lacute': 278,
+    'agrave': 500,
+    'Tcommaaccent': 556,
+    'Cacute': 667,
+    'atilde': 500,
+    'Edotaccent': 611,
+    'scaron': 389,
+    'scedilla': 389,
+    'iacute': 278,
+    'lozenge': 471,
+    'Rcaron': 611,
+    'Gcommaaccent': 722,
+    'ucircumflex': 500,
+    'acircumflex': 500,
+    'Amacron': 611,
+    'rcaron': 389,
+    'ccedilla': 444,
+    'Zdotaccent': 556,
+    'Thorn': 611,
+    'Omacron': 722,
+    'Racute': 611,
+    'Sacute': 500,
+    'dcaron': 544,
+    'Umacron': 722,
+    'uring': 500,
+    'threesuperior': 300,
+    'Ograve': 722,
+    'Agrave': 611,
+    'Abreve': 611,
+    'multiply': 675,
+    'uacute': 500,
+    'Tcaron': 556,
+    'partialdiff': 476,
+    'ydieresis': 444,
+    'Nacute': 667,
+    'icircumflex': 278,
+    'Ecircumflex': 611,
+    'adieresis': 500,
+    'edieresis': 444,
+    'cacute': 444,
+    'nacute': 500,
+    'umacron': 500,
+    'Ncaron': 667,
+    'Iacute': 333,
+    'plusminus': 675,
+    'brokenbar': 275,
+    'registered': 760,
+    'Gbreve': 722,
+    'Idotaccent': 333,
+    'summation': 600,
+    'Egrave': 611,
+    'racute': 389,
+    'omacron': 500,
+    'Zacute': 556,
+    'Zcaron': 556,
+    'greaterequal': 549,
+    'Eth': 722,
+    'Ccedilla': 667,
+    'lcommaaccent': 278,
+    'tcaron': 300,
+    'eogonek': 444,
+    'Uogonek': 722,
+    'Aacute': 611,
+    'Adieresis': 611,
+    'egrave': 444,
+    'zacute': 389,
+    'iogonek': 278,
+    'Oacute': 722,
+    'oacute': 500,
+    'amacron': 500,
+    'sacute': 389,
+    'idieresis': 278,
+    'Ocircumflex': 722,
+    'Ugrave': 722,
+    'Delta': 612,
+    'thorn': 500,
+    'twosuperior': 300,
+    'Odieresis': 722,
+    'mu': 500,
+    'igrave': 278,
+    'ohungarumlaut': 500,
+    'Eogonek': 611,
+    'dcroat': 500,
+    'threequarters': 750,
+    'Scedilla': 500,
+    'lcaron': 300,
+    'Kcommaaccent': 667,
+    'Lacute': 556,
+    'trademark': 980,
+    'edotaccent': 444,
+    'Igrave': 333,
+    'Imacron': 333,
+    'Lcaron': 611,
+    'onehalf': 750,
+    'lessequal': 549,
+    'ocircumflex': 500,
+    'ntilde': 500,
+    'Uhungarumlaut': 722,
+    'Eacute': 611,
+    'emacron': 444,
+    'gbreve': 500,
+    'onequarter': 750,
+    'Scaron': 500,
+    'Scommaaccent': 500,
+    'Ohungarumlaut': 722,
+    'degree': 400,
+    'ograve': 500,
+    'Ccaron': 667,
+    'ugrave': 500,
+    'radical': 453,
+    'Dcaron': 722,
+    'rcommaaccent': 389,
+    'Ntilde': 667,
+    'otilde': 500,
+    'Rcommaaccent': 611,
+    'Lcommaaccent': 556,
+    'Atilde': 611,
+    'Aogonek': 611,
+    'Aring': 611,
+    'Otilde': 722,
+    'zdotaccent': 389,
+    'Ecaron': 611,
+    'Iogonek': 333,
+    'kcommaaccent': 444,
+    'minus': 675,
+    'Icircumflex': 333,
+    'ncaron': 500,
+    'tcommaaccent': 278,
+    'logicalnot': 675,
+    'odieresis': 500,
+    'udieresis': 500,
+    'notequal': 549,
+    'gcommaaccent': 500,
+    'eth': 500,
+    'zcaron': 389,
+    'ncommaaccent': 500,
+    'onesuperior': 300,
+    'imacron': 278,
+    'Euro': 500
+  },
+  'ZapfDingbats': {
+    'space': 278,
+    'a1': 974,
+    'a2': 961,
+    'a202': 974,
+    'a3': 980,
+    'a4': 719,
+    'a5': 789,
+    'a119': 790,
+    'a118': 791,
+    'a117': 690,
+    'a11': 960,
+    'a12': 939,
+    'a13': 549,
+    'a14': 855,
+    'a15': 911,
+    'a16': 933,
+    'a105': 911,
+    'a17': 945,
+    'a18': 974,
+    'a19': 755,
+    'a20': 846,
+    'a21': 762,
+    'a22': 761,
+    'a23': 571,
+    'a24': 677,
+    'a25': 763,
+    'a26': 760,
+    'a27': 759,
+    'a28': 754,
+    'a6': 494,
+    'a7': 552,
+    'a8': 537,
+    'a9': 577,
+    'a10': 692,
+    'a29': 786,
+    'a30': 788,
+    'a31': 788,
+    'a32': 790,
+    'a33': 793,
+    'a34': 794,
+    'a35': 816,
+    'a36': 823,
+    'a37': 789,
+    'a38': 841,
+    'a39': 823,
+    'a40': 833,
+    'a41': 816,
+    'a42': 831,
+    'a43': 923,
+    'a44': 744,
+    'a45': 723,
+    'a46': 749,
+    'a47': 790,
+    'a48': 792,
+    'a49': 695,
+    'a50': 776,
+    'a51': 768,
+    'a52': 792,
+    'a53': 759,
+    'a54': 707,
+    'a55': 708,
+    'a56': 682,
+    'a57': 701,
+    'a58': 826,
+    'a59': 815,
+    'a60': 789,
+    'a61': 789,
+    'a62': 707,
+    'a63': 687,
+    'a64': 696,
+    'a65': 689,
+    'a66': 786,
+    'a67': 787,
+    'a68': 713,
+    'a69': 791,
+    'a70': 785,
+    'a71': 791,
+    'a72': 873,
+    'a73': 761,
+    'a74': 762,
+    'a203': 762,
+    'a75': 759,
+    'a204': 759,
+    'a76': 892,
+    'a77': 892,
+    'a78': 788,
+    'a79': 784,
+    'a81': 438,
+    'a82': 138,
+    'a83': 277,
+    'a84': 415,
+    'a97': 392,
+    'a98': 392,
+    'a99': 668,
+    'a100': 668,
+    'a89': 390,
+    'a90': 390,
+    'a93': 317,
+    'a94': 317,
+    'a91': 276,
+    'a92': 276,
+    'a205': 509,
+    'a85': 509,
+    'a206': 410,
+    'a86': 410,
+    'a87': 234,
+    'a88': 234,
+    'a95': 334,
+    'a96': 334,
+    'a101': 732,
+    'a102': 544,
+    'a103': 544,
+    'a104': 910,
+    'a106': 667,
+    'a107': 760,
+    'a108': 760,
+    'a112': 776,
+    'a111': 595,
+    'a110': 694,
+    'a109': 626,
+    'a120': 788,
+    'a121': 788,
+    'a122': 788,
+    'a123': 788,
+    'a124': 788,
+    'a125': 788,
+    'a126': 788,
+    'a127': 788,
+    'a128': 788,
+    'a129': 788,
+    'a130': 788,
+    'a131': 788,
+    'a132': 788,
+    'a133': 788,
+    'a134': 788,
+    'a135': 788,
+    'a136': 788,
+    'a137': 788,
+    'a138': 788,
+    'a139': 788,
+    'a140': 788,
+    'a141': 788,
+    'a142': 788,
+    'a143': 788,
+    'a144': 788,
+    'a145': 788,
+    'a146': 788,
+    'a147': 788,
+    'a148': 788,
+    'a149': 788,
+    'a150': 788,
+    'a151': 788,
+    'a152': 788,
+    'a153': 788,
+    'a154': 788,
+    'a155': 788,
+    'a156': 788,
+    'a157': 788,
+    'a158': 788,
+    'a159': 788,
+    'a160': 894,
+    'a161': 838,
+    'a163': 1016,
+    'a164': 458,
+    'a196': 748,
+    'a165': 924,
+    'a192': 748,
+    'a166': 918,
+    'a167': 927,
+    'a168': 928,
+    'a169': 928,
+    'a170': 834,
+    'a171': 873,
+    'a172': 828,
+    'a173': 924,
+    'a162': 924,
+    'a174': 917,
+    'a175': 930,
+    'a176': 931,
+    'a177': 463,
+    'a178': 883,
+    'a179': 836,
+    'a193': 836,
+    'a180': 867,
+    'a199': 867,
+    'a181': 696,
+    'a200': 696,
+    'a182': 874,
+    'a201': 874,
+    'a183': 760,
+    'a184': 946,
+    'a197': 771,
+    'a185': 865,
+    'a194': 771,
+    'a198': 888,
+    'a186': 967,
+    'a195': 888,
+    'a187': 831,
+    'a188': 873,
+    'a189': 927,
+    'a190': 970,
+    'a191': 918
+  }
+};
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var EOF = {};
+
+function isEOF(v) {
+  return v == EOF;
+}
+
+var Parser = (function parserParser() {
+  function constructor(lexer, allowStreams, xref) {
+    this.lexer = lexer;
+    this.allowStreams = allowStreams;
+    this.xref = xref;
+    this.inlineImg = 0;
+    this.refill();
+  }
+
+  constructor.prototype = {
+    refill: function parserRefill() {
+      this.buf1 = this.lexer.getObj();
+      this.buf2 = this.lexer.getObj();
+    },
+    shift: function parserShift() {
+      if (isCmd(this.buf2, 'ID')) {
+        this.buf1 = this.buf2;
+        this.buf2 = null;
+        // skip byte after ID
+        this.lexer.skip();
+      } else {
+        this.buf1 = this.buf2;
+        this.buf2 = this.lexer.getObj();
+      }
+    },
+    getObj: function parserGetObj(cipherTransform) {
+      if (isCmd(this.buf1, 'BI')) { // inline image
+        this.shift();
+        return this.makeInlineImage(cipherTransform);
+      }
+      if (isCmd(this.buf1, '[')) { // array
+        this.shift();
+        var array = [];
+        while (!isCmd(this.buf1, ']') && !isEOF(this.buf1))
+          array.push(this.getObj());
+        if (isEOF(this.buf1))
+          error('End of file inside array');
+        this.shift();
+        return array;
+      }
+      if (isCmd(this.buf1, '<<')) { // dictionary or stream
+        this.shift();
+        var dict = new Dict();
+        while (!isCmd(this.buf1, '>>') && !isEOF(this.buf1)) {
+          if (!isName(this.buf1)) {
+            error('Dictionary key must be a name object');
+          } else {
+            var key = this.buf1.name;
+            this.shift();
+            if (isEOF(this.buf1))
+              break;
+            dict.set(key, this.getObj(cipherTransform));
+          }
+        }
+        if (isEOF(this.buf1))
+          error('End of file inside dictionary');
+
+        // stream objects are not allowed inside content streams or
+        // object streams
+        if (isCmd(this.buf2, 'stream')) {
+          return this.allowStreams ?
+            this.makeStream(dict, cipherTransform) : dict;
+        }
+        this.shift();
+        return dict;
+      }
+      if (isInt(this.buf1)) { // indirect reference or integer
+        var num = this.buf1;
+        this.shift();
+        if (isInt(this.buf1) && isCmd(this.buf2, 'R')) {
+          var ref = new Ref(num, this.buf1);
+          this.shift();
+          this.shift();
+          return ref;
+        }
+        return num;
+      }
+      if (isString(this.buf1)) { // string
+        var str = this.buf1;
+        this.shift();
+        if (cipherTransform)
+          str = cipherTransform.decryptString(str);
+        return str;
+      }
+
+      // simple object
+      var obj = this.buf1;
+      this.shift();
+      return obj;
+    },
+    makeInlineImage: function parserMakeInlineImage(cipherTransform) {
+      var lexer = this.lexer;
+      var stream = lexer.stream;
+
+      // parse dictionary
+      var dict = new Dict();
+      while (!isCmd(this.buf1, 'ID') && !isEOF(this.buf1)) {
+        if (!isName(this.buf1)) {
+          error('Dictionary key must be a name object');
+        } else {
+          var key = this.buf1.name;
+          this.shift();
+          if (isEOF(this.buf1))
+            break;
+          dict.set(key, this.getObj(cipherTransform));
+        }
+      }
+
+      // parse image stream
+      var startPos = stream.pos;
+
+      // searching for the /\sEI\s/
+      var state = 0, ch;
+      while (state != 4 && (ch = stream.getByte()) != null) {
+        switch (ch) {
+          case 0x20:
+          case 0x0D:
+          case 0x0A:
+            state = state === 3 ? 4 : 1;
+            break;
+          case 0x45:
+            state = state === 1 ? 2 : 0;
+            break;
+          case 0x49:
+            state = state === 2 ? 3 : 0;
+            break;
+          default:
+            state = 0;
+            break;
+        }
+      }
+
+      // TODO improve the small images performance to remove the limit
+      var inlineImgLimit = 500;
+      if (++this.inlineImg >= inlineImgLimit) {
+        if (this.inlineImg === inlineImgLimit)
+          warn('Too many inline images');
+        this.shift();
+        return null;
+      }
+
+      var length = (stream.pos - 4) - startPos;
+      var imageStream = stream.makeSubStream(startPos, length, dict);
+      if (cipherTransform)
+        imageStream = cipherTransform.createStream(imageStream);
+      imageStream = this.filter(imageStream, dict, length);
+      imageStream.parameters = dict;
+
+      this.buf2 = new Cmd('EI');
+      this.shift();
+
+      return imageStream;
+    },
+    makeStream: function parserMakeStream(dict, cipherTransform) {
+      var lexer = this.lexer;
+      var stream = lexer.stream;
+
+      // get stream start position
+      lexer.skipToNextLine();
+      var pos = stream.pos;
+
+      // get length
+      var length = dict.get('Length');
+      var xref = this.xref;
+      if (xref)
+        length = xref.fetchIfRef(length);
+      if (!isInt(length)) {
+        error('Bad ' + length + ' attribute in stream');
+        length = 0;
+      }
+
+      // skip over the stream data
+      stream.pos = pos + length;
+      this.shift(); // '>>'
+      this.shift(); // 'stream'
+      if (!isCmd(this.buf1, 'endstream'))
+        error('Missing endstream');
+      this.shift();
+
+      stream = stream.makeSubStream(pos, length, dict);
+      if (cipherTransform)
+        stream = cipherTransform.createStream(stream);
+      stream = this.filter(stream, dict, length);
+      stream.parameters = dict;
+      return stream;
+    },
+    filter: function parserFilter(stream, dict, length) {
+      var filter = dict.get('Filter', 'F');
+      var params = dict.get('DecodeParms', 'DP');
+      if (isName(filter))
+        return this.makeFilter(stream, filter.name, length, params);
+      if (isArray(filter)) {
+        var filterArray = filter;
+        var paramsArray = params;
+        for (var i = 0, ii = filterArray.length; i < ii; ++i) {
+          filter = filterArray[i];
+          if (!isName(filter))
+            error('Bad filter name: ' + filter);
+          else {
+            params = null;
+            if (isArray(paramsArray) && (i in paramsArray))
+              params = paramsArray[i];
+            stream = this.makeFilter(stream, filter.name, length, params);
+            // after the first stream the length variable is invalid
+            length = null;
+          }
+        }
+      }
+      return stream;
+    },
+    makeFilter: function parserMakeFilter(stream, name, length, params) {
+      if (name == 'FlateDecode' || name == 'Fl') {
+        if (params) {
+          return new PredictorStream(new FlateStream(stream), params);
+        }
+        return new FlateStream(stream);
+      } else if (name == 'LZWDecode' || name == 'LZW') {
+        var earlyChange = 1;
+        if (params) {
+          if (params.has('EarlyChange'))
+            earlyChange = params.get('EarlyChange');
+          return new PredictorStream(
+            new LZWStream(stream, earlyChange), params);
+        }
+        return new LZWStream(stream, earlyChange);
+      } else if (name == 'DCTDecode' || name == 'DCT') {
+        var bytes = stream.getBytes(length);
+        return new JpegStream(bytes, stream.dict, this.xref);
+      } else if (name == 'ASCII85Decode' || name == 'A85') {
+        return new Ascii85Stream(stream);
+      } else if (name == 'ASCIIHexDecode' || name == 'AHx') {
+        return new AsciiHexStream(stream);
+      } else if (name == 'CCITTFaxDecode' || name == 'CCF') {
+        return new CCITTFaxStream(stream, params);
+      } else {
+        TODO('filter "' + name + '" not supported yet');
+      }
+      return stream;
+    }
+  };
+
+  return constructor;
+})();
+
+var Lexer = (function lexer() {
+  function constructor(stream) {
+    this.stream = stream;
+  }
+
+  constructor.isSpace = function lexerIsSpace(ch) {
+    return ch == ' ' || ch == '\t' || ch == '\x0d' || ch == '\x0a';
+  };
+
+  // A '1' in this array means the character is white space.  A '1' or
+  // '2' means the character ends a name or command.
+  var specialChars = [
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0,   // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 1x
+    1, 0, 0, 0, 0, 2, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2,   // 2x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0,   // 3x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 4x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0,   // 5x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 6x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0,   // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0    // fx
+  ];
+
+  function toHexDigit(ch) {
+    if (ch >= '0' && ch <= '9')
+      return ch.charCodeAt(0) - 48;
+    ch = ch.toUpperCase();
+    if (ch >= 'A' && ch <= 'F')
+      return ch.charCodeAt(0) - 55;
+    return -1;
+  }
+
+  constructor.prototype = {
+    getNumber: function lexerGetNumber(ch) {
+      var floating = false;
+      var str = ch;
+      var stream = this.stream;
+      for (;;) {
+        ch = stream.lookChar();
+        if (ch == '.' && !floating) {
+          str += ch;
+          floating = true;
+        } else if (ch == '-') {
+          // ignore minus signs in the middle of numbers to match
+          // Adobe's behavior
+          warn('Badly formated number');
+        } else if (ch >= '0' && ch <= '9') {
+          str += ch;
+        } else if (ch == 'e' || ch == 'E') {
+          floating = true;
+        } else {
+          // the last character doesn't belong to us
+          break;
+        }
+        stream.skip();
+      }
+      var value = parseFloat(str);
+      if (isNaN(value))
+        error('Invalid floating point number: ' + value);
+      return value;
+    },
+    getString: function lexerGetString() {
+      var numParen = 1;
+      var done = false;
+      var str = '';
+      var stream = this.stream;
+      var ch;
+      do {
+        ch = stream.getChar();
+        switch (ch) {
+          case undefined:
+            warn('Unterminated string');
+            done = true;
+            break;
+          case '(':
+            ++numParen;
+            str += ch;
+            break;
+          case ')':
+            if (--numParen == 0) {
+              done = true;
+            } else {
+              str += ch;
+            }
+            break;
+          case '\\':
+            ch = stream.getChar();
+            switch (ch) {
+              case undefined:
+                warn('Unterminated string');
+                done = true;
+                break;
+              case 'n':
+                str += '\n';
+                break;
+              case 'r':
+                str += '\r';
+                break;
+              case 't':
+                str += '\t';
+                break;
+              case 'b':
+                str += '\b';
+                break;
+              case 'f':
+                str += '\f';
+                break;
+              case '\\':
+              case '(':
+              case ')':
+                str += ch;
+                break;
+              case '0': case '1': case '2': case '3':
+              case '4': case '5': case '6': case '7':
+                var x = ch - '0';
+                ch = stream.lookChar();
+                if (ch >= '0' && ch <= '7') {
+                  stream.skip();
+                  x = (x << 3) + (ch - '0');
+                  ch = stream.lookChar();
+                  if (ch >= '0' && ch <= '7') {
+                    stream.skip();
+                    x = (x << 3) + (ch - '0');
+                  }
+                }
+
+                str += String.fromCharCode(x);
+                break;
+              case '\r':
+                ch = stream.lookChar();
+                if (ch == '\n')
+                  stream.skip();
+                break;
+              case '\n':
+                break;
+              default:
+                str += ch;
+            }
+            break;
+          default:
+            str += ch;
+        }
+      } while (!done);
+      return str;
+    },
+    getName: function lexerGetName(ch) {
+      var str = '';
+      var stream = this.stream;
+      while (!!(ch = stream.lookChar()) && !specialChars[ch.charCodeAt(0)]) {
+        stream.skip();
+        if (ch == '#') {
+          ch = stream.lookChar();
+          var x = toHexDigit(ch);
+          if (x != -1) {
+            stream.skip();
+            var x2 = toHexDigit(stream.getChar());
+            if (x2 == -1)
+              error('Illegal digit in hex char in name: ' + x2);
+            str += String.fromCharCode((x << 4) | x2);
+          } else {
+            str += '#';
+            str += ch;
+          }
+        } else {
+          str += ch;
+        }
+      }
+      if (str.length > 128)
+        error('Warning: name token is longer than allowed by the spec: ' +
+              str.length);
+      return new Name(str);
+    },
+    getHexString: function lexerGetHexString(ch) {
+      var str = '';
+      var stream = this.stream;
+      for (;;) {
+        ch = stream.getChar();
+        if (ch == '>') {
+          break;
+        }
+        if (!ch) {
+          warn('Unterminated hex string');
+          break;
+        }
+        if (specialChars[ch.charCodeAt(0)] != 1) {
+          var x, x2;
+          if ((x = toHexDigit(ch)) == -1)
+            error('Illegal character in hex string: ' + ch);
+
+          ch = stream.getChar();
+          while (specialChars[ch.charCodeAt(0)] == 1)
+            ch = stream.getChar();
+
+          if ((x2 = toHexDigit(ch)) == -1)
+            error('Illegal character in hex string: ' + ch);
+
+          str += String.fromCharCode((x << 4) | x2);
+        }
+      }
+      return str;
+    },
+    getObj: function lexerGetObj() {
+      // skip whitespace and comments
+      var comment = false;
+      var stream = this.stream;
+      var ch;
+      while (true) {
+        if (!(ch = stream.getChar()))
+          return EOF;
+        if (comment) {
+          if (ch == '\r' || ch == '\n')
+            comment = false;
+        } else if (ch == '%') {
+          comment = true;
+        } else if (specialChars[ch.charCodeAt(0)] != 1) {
+          break;
+        }
+      }
+
+      // start reading token
+      switch (ch) {
+        case '0': case '1': case '2': case '3': case '4':
+        case '5': case '6': case '7': case '8': case '9':
+        case '+': case '-': case '.':
+          return this.getNumber(ch);
+        case '(':
+          return this.getString();
+        case '/':
+          return this.getName(ch);
+        // array punctuation
+        case '[':
+        case ']':
+          return new Cmd(ch);
+        // hex string or dict punctuation
+        case '<':
+          ch = stream.lookChar();
+          if (ch == '<') {
+            // dict punctuation
+            stream.skip();
+            return new Cmd('<<');
+          }
+          return this.getHexString(ch);
+        // dict punctuation
+        case '>':
+          ch = stream.lookChar();
+          if (ch == '>') {
+            stream.skip();
+            return new Cmd('>>');
+          }
+        case '{':
+        case '}':
+          return new Cmd(ch);
+        // fall through
+        case ')':
+          error('Illegal character: ' + ch);
+          return Error;
+      }
+
+      // command
+      var str = ch;
+      while (!!(ch = stream.lookChar()) && !specialChars[ch.charCodeAt(0)]) {
+        stream.skip();
+        if (str.length == 128) {
+          error('Command token too long: ' + str.length);
+          break;
+        }
+        str += ch;
+      }
+      if (str == 'true')
+        return true;
+      if (str == 'false')
+        return false;
+      if (str == 'null')
+        return null;
+      return new Cmd(str);
+    },
+    skipToNextLine: function lexerSkipToNextLine() {
+      var stream = this.stream;
+      while (true) {
+        var ch = stream.getChar();
+        if (!ch || ch == '\n')
+          return;
+        if (ch == '\r') {
+          if ((ch = stream.lookChar()) == '\n')
+            stream.skip();
+          return;
+        }
+      }
+    },
+    skip: function lexerSkip() {
+      this.stream.skip();
+    }
+  };
+
+  return constructor;
+})();
+
+var Linearization = (function linearizationLinearization() {
+  function constructor(stream) {
+    this.parser = new Parser(new Lexer(stream), false);
+    var obj1 = this.parser.getObj();
+    var obj2 = this.parser.getObj();
+    var obj3 = this.parser.getObj();
+    this.linDict = this.parser.getObj();
+    if (isInt(obj1) && isInt(obj2) && isCmd(obj3, 'obj') &&
+        isDict(this.linDict)) {
+      var obj = this.linDict.get('Linearized');
+      if (!(isNum(obj) && obj > 0))
+        this.linDict = null;
+    }
+  }
+
+  constructor.prototype = {
+    getInt: function linearizationGetInt(name) {
+      var linDict = this.linDict;
+      var obj;
+      if (isDict(linDict) &&
+          isInt(obj = linDict.get(name)) &&
+          obj > 0) {
+        return obj;
+      }
+      error('"' + name + '" field in linearization table is invalid');
+      return 0;
+    },
+    getHint: function linearizationGetHint(index) {
+      var linDict = this.linDict;
+      var obj1, obj2;
+      if (isDict(linDict) &&
+          isArray(obj1 = linDict.get('H')) &&
+          obj1.length >= 2 &&
+          isInt(obj2 = obj1[index]) &&
+          obj2 > 0) {
+        return obj2;
+      }
+      error('Hints table in linearization table is invalid: ' + index);
+      return 0;
+    },
+    get length() {
+      if (!isDict(this.linDict))
+        return 0;
+      return this.getInt('L');
+    },
+    get hintsOffset() {
+      return this.getHint(0);
+    },
+    get hintsLength() {
+      return this.getHint(1);
+    },
+    get hintsOffset2() {
+      return this.getHint(2);
+    },
+    get hintsLenth2() {
+      return this.getHint(3);
+    },
+    get objectNumberFirst() {
+      return this.getInt('O');
+    },
+    get endFirst() {
+      return this.getInt('E');
+    },
+    get numPages() {
+      return this.getInt('N');
+    },
+    get mainXRefEntriesOffset() {
+      return this.getInt('T');
+    },
+    get pageFirst() {
+      return this.getInt('P');
+    }
+  };
+
+  return constructor;
+})();
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var Pattern = (function patternPattern() {
+  // Constructor should define this.getPattern
+  function constructor() {
+    error('should not call Pattern constructor');
+  }
+
+  constructor.prototype = {
+    // Input: current Canvas context
+    // Output: the appropriate fillStyle or strokeStyle
+    getPattern: function pattern_getStyle(ctx) {
+      error('Should not call Pattern.getStyle: ' + ctx);
+    }
+  };
+
+  constructor.shadingFromIR = function pattern_shadingFromIR(ctx, raw) {
+    return Shadings[raw[0]].fromIR(ctx, raw);
+  };
+
+  constructor.parseShading = function pattern_shading(shading, matrix, xref,
+                                                      res, ctx) {
+
+    var dict = isStream(shading) ? shading.dict : shading;
+    var type = dict.get('ShadingType');
+
+    switch (type) {
+      case 2:
+      case 3:
+        // both radial and axial shadings are handled by RadialAxial shading
+        return new Shadings.RadialAxial(dict, matrix, xref, res, ctx);
+      default:
+        return new Shadings.Dummy();
+    }
+  };
+  return constructor;
+})();
+
+var Shadings = {};
+
+// Radial and axial shading have very similar implementations
+// If needed, the implementations can be broken into two classes
+Shadings.RadialAxial = (function radialAxialShading() {
+  function constructor(dict, matrix, xref, res, ctx) {
+    this.matrix = matrix;
+    this.coordsArr = dict.get('Coords');
+    this.shadingType = dict.get('ShadingType');
+    this.type = 'Pattern';
+
+    this.ctx = ctx;
+    var cs = dict.get('ColorSpace', 'CS');
+    cs = ColorSpace.parse(cs, xref, res);
+    this.cs = cs;
+
+    var t0 = 0.0, t1 = 1.0;
+    if (dict.has('Domain')) {
+      var domainArr = dict.get('Domain');
+      t0 = domainArr[0];
+      t1 = domainArr[1];
+    }
+
+    var extendStart = false, extendEnd = false;
+    if (dict.has('Extend')) {
+      var extendArr = dict.get('Extend');
+      extendStart = extendArr[0];
+      extendEnd = extendArr[1];
+      TODO('Support extend');
+    }
+
+    this.extendStart = extendStart;
+    this.extendEnd = extendEnd;
+
+    var fnObj = dict.get('Function');
+    fnObj = xref.fetchIfRef(fnObj);
+    if (isArray(fnObj))
+      error('No support for array of functions');
+    else if (!isPDFFunction(fnObj))
+      error('Invalid function');
+    var fn = PDFFunction.parse(xref, fnObj);
+
+    // 10 samples seems good enough for now, but probably won't work
+    // if there are sharp color changes. Ideally, we would implement
+    // the spec faithfully and add lossless optimizations.
+    var step = (t1 - t0) / 10;
+    var diff = t1 - t0;
+
+    var colorStops = [];
+    for (var i = t0; i <= t1; i += step) {
+      var color = fn([i]);
+      var rgbColor = Util.makeCssRgb.apply(this, cs.getRgb(color));
+      colorStops.push([(i - t0) / diff, rgbColor]);
+    }
+
+    this.colorStops = colorStops;
+  }
+
+  constructor.fromIR = function radialAxialShadingGetIR(ctx, raw) {
+    var type = raw[1];
+    var colorStops = raw[2];
+    var p0 = raw[3];
+    var p1 = raw[4];
+    var r0 = raw[5];
+    var r1 = raw[6];
+
+    var curMatrix = ctx.mozCurrentTransform;
+    if (curMatrix) {
+      var userMatrix = ctx.mozCurrentTransformInverse;
+
+      p0 = Util.applyTransform(p0, curMatrix);
+      p0 = Util.applyTransform(p0, userMatrix);
+
+      p1 = Util.applyTransform(p1, curMatrix);
+      p1 = Util.applyTransform(p1, userMatrix);
+    }
+
+    var grad;
+    if (type == 2)
+      grad = ctx.createLinearGradient(p0[0], p0[1], p1[0], p1[1]);
+    else if (type == 3)
+      grad = ctx.createRadialGradient(p0[0], p0[1], r0, p1[0], p1[1], r1);
+
+    for (var i = 0, ii = colorStops.length; i < ii; ++i) {
+      var c = colorStops[i];
+      grad.addColorStop(c[0], c[1]);
+    }
+    return grad;
+  };
+
+  constructor.prototype = {
+    getIR: function radialAxialShadingGetIR() {
+      var coordsArr = this.coordsArr;
+      var type = this.shadingType;
+      if (type == 2) {
+        var p0 = [coordsArr[0], coordsArr[1]];
+        var p1 = [coordsArr[2], coordsArr[3]];
+        var r0 = null;
+        var r1 = null;
+      } else if (type == 3) {
+        var p0 = [coordsArr[0], coordsArr[1]];
+        var p1 = [coordsArr[3], coordsArr[4]];
+        var r0 = coordsArr[2];
+        var r1 = coordsArr[5];
+      } else {
+        error('getPattern type unknown: ' + type);
+      }
+
+      var matrix = this.matrix;
+      if (matrix) {
+        p0 = Util.applyTransform(p0, matrix);
+        p1 = Util.applyTransform(p1, matrix);
+      }
+
+      return ['RadialAxial', type, this.colorStops, p0, p1, r0, r1];
+    }
+  };
+
+  return constructor;
+})();
+
+Shadings.Dummy = (function dummyShading() {
+  function constructor() {
+    this.type = 'Pattern';
+  }
+
+  constructor.fromIR = function dummyShadingFromIR() {
+    return 'hotpink';
+  };
+
+  constructor.prototype = {
+    getIR: function dummyShadingGetIR() {
+      return ['Dummy'];
+    }
+  };
+  return constructor;
+})();
+
+var TilingPattern = (function tilingPattern() {
+  var PAINT_TYPE_COLORED = 1, PAINT_TYPE_UNCOLORED = 2;
+
+  function TilingPattern(IR, color, ctx, objs) {
+    var IRQueue = IR[2];
+    this.matrix = IR[3];
+    var bbox = IR[4];
+    var xstep = IR[5];
+    var ystep = IR[6];
+    var paintType = IR[7];
+
+    TODO('TilingType');
+
+    this.curMatrix = ctx.mozCurrentTransform;
+    this.invMatrix = ctx.mozCurrentTransformInverse;
+    this.ctx = ctx;
+    this.type = 'Pattern';
+
+    var x0 = bbox[0], y0 = bbox[1], x1 = bbox[2], y1 = bbox[3];
+
+    var topLeft = [x0, y0];
+    // we want the canvas to be as large as the step size
+    var botRight = [x0 + xstep, y0 + ystep];
+
+    var width = botRight[0] - topLeft[0];
+    var height = botRight[1] - topLeft[1];
+
+    // TODO: hack to avoid OOM, we would idealy compute the tiling
+    // pattern to be only as large as the acual size in device space
+    // This could be computed with .mozCurrentTransform, but still
+    // needs to be implemented
+    while (Math.abs(width) > 512 || Math.abs(height) > 512) {
+      width = 512;
+      height = 512;
+    }
+
+    var tmpCanvas = new ScratchCanvas(width, height);
+
+    // set the new canvas element context as the graphics context
+    var tmpCtx = tmpCanvas.getContext('2d');
+    var graphics = new CanvasGraphics(tmpCtx, objs);
+
+    switch (paintType) {
+      case PAINT_TYPE_COLORED:
+        tmpCtx.fillStyle = ctx.fillStyle;
+        tmpCtx.strokeStyle = ctx.strokeStyle;
+        break;
+      case PAINT_TYPE_UNCOLORED:
+        color = Util.makeCssRgb.apply(this, color);
+        tmpCtx.fillStyle = color;
+        tmpCtx.strokeStyle = color;
+        break;
+      default:
+        error('Unsupported paint type: ' + paintType);
+    }
+
+    var scale = [width / xstep, height / ystep];
+    this.scale = scale;
+
+    // transform coordinates to pattern space
+    var tmpTranslate = [1, 0, 0, 1, -topLeft[0], -topLeft[1]];
+    var tmpScale = [scale[0], 0, 0, scale[1], 0, 0];
+    graphics.transform.apply(graphics, tmpScale);
+    graphics.transform.apply(graphics, tmpTranslate);
+
+    if (bbox && isArray(bbox) && 4 == bbox.length) {
+      var bboxWidth = x1 - x0;
+      var bboxHeight = y1 - y0;
+      graphics.rectangle(x0, y0, bboxWidth, bboxHeight);
+      graphics.clip();
+      graphics.endPath();
+    }
+
+    graphics.executeIRQueue(IRQueue);
+
+    this.canvas = tmpCanvas;
+  }
+
+  TilingPattern.getIR = function tiling_getIR(codeIR, dict, args) {
+    var matrix = dict.get('Matrix');
+    var bbox = dict.get('BBox');
+    var xstep = dict.get('XStep');
+    var ystep = dict.get('YStep');
+    var paintType = dict.get('PaintType');
+
+    return [
+      'TilingPattern', args, codeIR, matrix, bbox, xstep, ystep, paintType
+    ];
+  };
+
+  TilingPattern.prototype = {
+    getPattern: function tiling_getPattern() {
+      var matrix = this.matrix;
+      var curMatrix = this.curMatrix;
+      var ctx = this.ctx;
+
+      if (curMatrix)
+        ctx.setTransform.apply(ctx, curMatrix);
+
+      if (matrix)
+        ctx.transform.apply(ctx, matrix);
+
+      var scale = this.scale;
+      ctx.scale(1 / scale[0], 1 / scale[1]);
+
+      return ctx.createPattern(this.canvas, 'repeat');
+    }
+  };
+
+  return TilingPattern;
+})();
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var Stream = (function streamStream() {
+  function constructor(arrayBuffer, start, length, dict) {
+    this.bytes = new Uint8Array(arrayBuffer);
+    this.start = start || 0;
+    this.pos = this.start;
+    this.end = (start + length) || this.bytes.length;
+    this.dict = dict;
+  }
+
+  // required methods for a stream. if a particular stream does not
+  // implement these, an error should be thrown
+  constructor.prototype = {
+    get length() {
+      return this.end - this.start;
+    },
+    getByte: function stream_getByte() {
+      if (this.pos >= this.end)
+        return null;
+      return this.bytes[this.pos++];
+    },
+    // returns subarray of original buffer
+    // should only be read
+    getBytes: function stream_getBytes(length) {
+      var bytes = this.bytes;
+      var pos = this.pos;
+      var strEnd = this.end;
+
+      if (!length)
+        return bytes.subarray(pos, strEnd);
+
+      var end = pos + length;
+      if (end > strEnd)
+        end = strEnd;
+
+      this.pos = end;
+      return bytes.subarray(pos, end);
+    },
+    lookChar: function stream_lookChar() {
+      if (this.pos >= this.end)
+        return null;
+      return String.fromCharCode(this.bytes[this.pos]);
+    },
+    getChar: function stream_getChar() {
+      if (this.pos >= this.end)
+        return null;
+      return String.fromCharCode(this.bytes[this.pos++]);
+    },
+    skip: function stream_skip(n) {
+      if (!n)
+        n = 1;
+      this.pos += n;
+    },
+    reset: function stream_reset() {
+      this.pos = this.start;
+    },
+    moveStart: function stream_moveStart() {
+      this.start = this.pos;
+    },
+    makeSubStream: function stream_makeSubstream(start, length, dict) {
+      return new Stream(this.bytes.buffer, start, length, dict);
+    },
+    isStream: true
+  };
+
+  return constructor;
+})();
+
+var StringStream = (function stringStream() {
+  function constructor(str) {
+    var length = str.length;
+    var bytes = new Uint8Array(length);
+    for (var n = 0; n < length; ++n)
+      bytes[n] = str.charCodeAt(n);
+    Stream.call(this, bytes);
+  }
+
+  constructor.prototype = Stream.prototype;
+
+  return constructor;
+})();
+
+// super class for the decoding streams
+var DecodeStream = (function decodeStream() {
+  function constructor() {
+    this.pos = 0;
+    this.bufferLength = 0;
+    this.eof = false;
+    this.buffer = null;
+  }
+
+  constructor.prototype = {
+    ensureBuffer: function decodestream_ensureBuffer(requested) {
+      var buffer = this.buffer;
+      var current = buffer ? buffer.byteLength : 0;
+      if (requested < current)
+        return buffer;
+      var size = 512;
+      while (size < requested)
+        size <<= 1;
+      var buffer2 = new Uint8Array(size);
+      for (var i = 0; i < current; ++i)
+        buffer2[i] = buffer[i];
+      return (this.buffer = buffer2);
+    },
+    getByte: function decodestream_getByte() {
+      var pos = this.pos;
+      while (this.bufferLength <= pos) {
+        if (this.eof)
+          return null;
+        this.readBlock();
+      }
+      return this.buffer[this.pos++];
+    },
+    getBytes: function decodestream_getBytes(length) {
+      var end, pos = this.pos;
+
+      if (length) {
+        this.ensureBuffer(pos + length);
+        end = pos + length;
+
+        while (!this.eof && this.bufferLength < end)
+          this.readBlock();
+
+        var bufEnd = this.bufferLength;
+        if (end > bufEnd)
+          end = bufEnd;
+      } else {
+        while (!this.eof)
+          this.readBlock();
+
+        end = this.bufferLength;
+
+        // checking if bufferLength is still 0 then
+        // the buffer has to be initialized
+        if (!end)
+          this.buffer = new Uint8Array(0);
+      }
+
+      this.pos = end;
+      return this.buffer.subarray(pos, end);
+    },
+    lookChar: function decodestream_lookChar() {
+      var pos = this.pos;
+      while (this.bufferLength <= pos) {
+        if (this.eof)
+          return null;
+        this.readBlock();
+      }
+      return String.fromCharCode(this.buffer[this.pos]);
+    },
+    getChar: function decodestream_getChar() {
+      var pos = this.pos;
+      while (this.bufferLength <= pos) {
+        if (this.eof)
+          return null;
+        this.readBlock();
+      }
+      return String.fromCharCode(this.buffer[this.pos++]);
+    },
+    makeSubStream: function decodestream_makeSubstream(start, length, dict) {
+      var end = start + length;
+      while (this.bufferLength <= end && !this.eof)
+        this.readBlock();
+      return new Stream(this.buffer, start, length, dict);
+    },
+    skip: function decodestream_skip(n) {
+      if (!n)
+        n = 1;
+      this.pos += n;
+    },
+    reset: function decodestream_reset() {
+      this.pos = 0;
+    }
+  };
+
+  return constructor;
+})();
+
+var FakeStream = (function fakeStream() {
+  function constructor(stream) {
+    this.dict = stream.dict;
+    DecodeStream.call(this);
+  }
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+  constructor.prototype.readBlock = function fakeStreamReadBlock() {
+    var bufferLength = this.bufferLength;
+    bufferLength += 1024;
+    var buffer = this.ensureBuffer(bufferLength);
+    this.bufferLength = bufferLength;
+  };
+
+  constructor.prototype.getBytes = function fakeStreamGetBytes(length) {
+    var end, pos = this.pos;
+
+    if (length) {
+      this.ensureBuffer(pos + length);
+      end = pos + length;
+
+      while (!this.eof && this.bufferLength < end)
+        this.readBlock();
+
+      var bufEnd = this.bufferLength;
+      if (end > bufEnd)
+        end = bufEnd;
+    } else {
+      this.eof = true;
+      end = this.bufferLength;
+    }
+
+    this.pos = end;
+    return this.buffer.subarray(pos, end);
+  };
+
+  return constructor;
+})();
+
+var StreamsSequenceStream = (function streamSequenceStream() {
+  function constructor(streams) {
+    this.streams = streams;
+    DecodeStream.call(this);
+  }
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.readBlock = function streamSequenceStreamReadBlock() {
+    var streams = this.streams;
+    if (streams.length == 0) {
+      this.eof = true;
+      return;
+    }
+    var stream = streams.shift();
+    var chunk = stream.getBytes();
+    var bufferLength = this.bufferLength;
+    var newLength = bufferLength + chunk.length;
+    var buffer = this.ensureBuffer(newLength);
+    buffer.set(chunk, bufferLength);
+    this.bufferLength = newLength;
+  };
+
+  return constructor;
+})();
+
+var FlateStream = (function flateStream() {
+  var codeLenCodeMap = new Uint32Array([
+    16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
+  ]);
+
+  var lengthDecode = new Uint32Array([
+    0x00003, 0x00004, 0x00005, 0x00006, 0x00007, 0x00008, 0x00009, 0x0000a,
+    0x1000b, 0x1000d, 0x1000f, 0x10011, 0x20013, 0x20017, 0x2001b, 0x2001f,
+    0x30023, 0x3002b, 0x30033, 0x3003b, 0x40043, 0x40053, 0x40063, 0x40073,
+    0x50083, 0x500a3, 0x500c3, 0x500e3, 0x00102, 0x00102, 0x00102
+  ]);
+
+  var distDecode = new Uint32Array([
+    0x00001, 0x00002, 0x00003, 0x00004, 0x10005, 0x10007, 0x20009, 0x2000d,
+    0x30011, 0x30019, 0x40021, 0x40031, 0x50041, 0x50061, 0x60081, 0x600c1,
+    0x70101, 0x70181, 0x80201, 0x80301, 0x90401, 0x90601, 0xa0801, 0xa0c01,
+    0xb1001, 0xb1801, 0xc2001, 0xc3001, 0xd4001, 0xd6001
+  ]);
+
+  var fixedLitCodeTab = [new Uint32Array([
+    0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c0,
+    0x70108, 0x80060, 0x80020, 0x900a0, 0x80000, 0x80080, 0x80040, 0x900e0,
+    0x70104, 0x80058, 0x80018, 0x90090, 0x70114, 0x80078, 0x80038, 0x900d0,
+    0x7010c, 0x80068, 0x80028, 0x900b0, 0x80008, 0x80088, 0x80048, 0x900f0,
+    0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c8,
+    0x7010a, 0x80064, 0x80024, 0x900a8, 0x80004, 0x80084, 0x80044, 0x900e8,
+    0x70106, 0x8005c, 0x8001c, 0x90098, 0x70116, 0x8007c, 0x8003c, 0x900d8,
+    0x7010e, 0x8006c, 0x8002c, 0x900b8, 0x8000c, 0x8008c, 0x8004c, 0x900f8,
+    0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c4,
+    0x70109, 0x80062, 0x80022, 0x900a4, 0x80002, 0x80082, 0x80042, 0x900e4,
+    0x70105, 0x8005a, 0x8001a, 0x90094, 0x70115, 0x8007a, 0x8003a, 0x900d4,
+    0x7010d, 0x8006a, 0x8002a, 0x900b4, 0x8000a, 0x8008a, 0x8004a, 0x900f4,
+    0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cc,
+    0x7010b, 0x80066, 0x80026, 0x900ac, 0x80006, 0x80086, 0x80046, 0x900ec,
+    0x70107, 0x8005e, 0x8001e, 0x9009c, 0x70117, 0x8007e, 0x8003e, 0x900dc,
+    0x7010f, 0x8006e, 0x8002e, 0x900bc, 0x8000e, 0x8008e, 0x8004e, 0x900fc,
+    0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c2,
+    0x70108, 0x80061, 0x80021, 0x900a2, 0x80001, 0x80081, 0x80041, 0x900e2,
+    0x70104, 0x80059, 0x80019, 0x90092, 0x70114, 0x80079, 0x80039, 0x900d2,
+    0x7010c, 0x80069, 0x80029, 0x900b2, 0x80009, 0x80089, 0x80049, 0x900f2,
+    0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900ca,
+    0x7010a, 0x80065, 0x80025, 0x900aa, 0x80005, 0x80085, 0x80045, 0x900ea,
+    0x70106, 0x8005d, 0x8001d, 0x9009a, 0x70116, 0x8007d, 0x8003d, 0x900da,
+    0x7010e, 0x8006d, 0x8002d, 0x900ba, 0x8000d, 0x8008d, 0x8004d, 0x900fa,
+    0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c6,
+    0x70109, 0x80063, 0x80023, 0x900a6, 0x80003, 0x80083, 0x80043, 0x900e6,
+    0x70105, 0x8005b, 0x8001b, 0x90096, 0x70115, 0x8007b, 0x8003b, 0x900d6,
+    0x7010d, 0x8006b, 0x8002b, 0x900b6, 0x8000b, 0x8008b, 0x8004b, 0x900f6,
+    0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900ce,
+    0x7010b, 0x80067, 0x80027, 0x900ae, 0x80007, 0x80087, 0x80047, 0x900ee,
+    0x70107, 0x8005f, 0x8001f, 0x9009e, 0x70117, 0x8007f, 0x8003f, 0x900de,
+    0x7010f, 0x8006f, 0x8002f, 0x900be, 0x8000f, 0x8008f, 0x8004f, 0x900fe,
+    0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c1,
+    0x70108, 0x80060, 0x80020, 0x900a1, 0x80000, 0x80080, 0x80040, 0x900e1,
+    0x70104, 0x80058, 0x80018, 0x90091, 0x70114, 0x80078, 0x80038, 0x900d1,
+    0x7010c, 0x80068, 0x80028, 0x900b1, 0x80008, 0x80088, 0x80048, 0x900f1,
+    0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c9,
+    0x7010a, 0x80064, 0x80024, 0x900a9, 0x80004, 0x80084, 0x80044, 0x900e9,
+    0x70106, 0x8005c, 0x8001c, 0x90099, 0x70116, 0x8007c, 0x8003c, 0x900d9,
+    0x7010e, 0x8006c, 0x8002c, 0x900b9, 0x8000c, 0x8008c, 0x8004c, 0x900f9,
+    0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c5,
+    0x70109, 0x80062, 0x80022, 0x900a5, 0x80002, 0x80082, 0x80042, 0x900e5,
+    0x70105, 0x8005a, 0x8001a, 0x90095, 0x70115, 0x8007a, 0x8003a, 0x900d5,
+    0x7010d, 0x8006a, 0x8002a, 0x900b5, 0x8000a, 0x8008a, 0x8004a, 0x900f5,
+    0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cd,
+    0x7010b, 0x80066, 0x80026, 0x900ad, 0x80006, 0x80086, 0x80046, 0x900ed,
+    0x70107, 0x8005e, 0x8001e, 0x9009d, 0x70117, 0x8007e, 0x8003e, 0x900dd,
+    0x7010f, 0x8006e, 0x8002e, 0x900bd, 0x8000e, 0x8008e, 0x8004e, 0x900fd,
+    0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c3,
+    0x70108, 0x80061, 0x80021, 0x900a3, 0x80001, 0x80081, 0x80041, 0x900e3,
+    0x70104, 0x80059, 0x80019, 0x90093, 0x70114, 0x80079, 0x80039, 0x900d3,
+    0x7010c, 0x80069, 0x80029, 0x900b3, 0x80009, 0x80089, 0x80049, 0x900f3,
+    0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900cb,
+    0x7010a, 0x80065, 0x80025, 0x900ab, 0x80005, 0x80085, 0x80045, 0x900eb,
+    0x70106, 0x8005d, 0x8001d, 0x9009b, 0x70116, 0x8007d, 0x8003d, 0x900db,
+    0x7010e, 0x8006d, 0x8002d, 0x900bb, 0x8000d, 0x8008d, 0x8004d, 0x900fb,
+    0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c7,
+    0x70109, 0x80063, 0x80023, 0x900a7, 0x80003, 0x80083, 0x80043, 0x900e7,
+    0x70105, 0x8005b, 0x8001b, 0x90097, 0x70115, 0x8007b, 0x8003b, 0x900d7,
+    0x7010d, 0x8006b, 0x8002b, 0x900b7, 0x8000b, 0x8008b, 0x8004b, 0x900f7,
+    0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900cf,
+    0x7010b, 0x80067, 0x80027, 0x900af, 0x80007, 0x80087, 0x80047, 0x900ef,
+    0x70107, 0x8005f, 0x8001f, 0x9009f, 0x70117, 0x8007f, 0x8003f, 0x900df,
+    0x7010f, 0x8006f, 0x8002f, 0x900bf, 0x8000f, 0x8008f, 0x8004f, 0x900ff
+  ]), 9];
+
+  var fixedDistCodeTab = [new Uint32Array([
+    0x50000, 0x50010, 0x50008, 0x50018, 0x50004, 0x50014, 0x5000c, 0x5001c,
+    0x50002, 0x50012, 0x5000a, 0x5001a, 0x50006, 0x50016, 0x5000e, 0x00000,
+    0x50001, 0x50011, 0x50009, 0x50019, 0x50005, 0x50015, 0x5000d, 0x5001d,
+    0x50003, 0x50013, 0x5000b, 0x5001b, 0x50007, 0x50017, 0x5000f, 0x00000
+  ]), 5];
+
+  function constructor(stream) {
+    var bytes = stream.getBytes();
+    var bytesPos = 0;
+
+    this.dict = stream.dict;
+    var cmf = bytes[bytesPos++];
+    var flg = bytes[bytesPos++];
+    if (cmf == -1 || flg == -1)
+      error('Invalid header in flate stream: ' + cmf + ', ' + flg);
+    if ((cmf & 0x0f) != 0x08)
+      error('Unknown compression method in flate stream: ' + cmf + ', ' + flg);
+    if ((((cmf << 8) + flg) % 31) != 0)
+      error('Bad FCHECK in flate stream: ' + cmf + ', ' + flg);
+    if (flg & 0x20)
+      error('FDICT bit set in flate stream: ' + cmf + ', ' + flg);
+
+    this.bytes = bytes;
+    this.bytesPos = bytesPos;
+
+    this.codeSize = 0;
+    this.codeBuf = 0;
+
+    DecodeStream.call(this);
+  }
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.getBits = function flateStreamGetBits(bits) {
+    var codeSize = this.codeSize;
+    var codeBuf = this.codeBuf;
+    var bytes = this.bytes;
+    var bytesPos = this.bytesPos;
+
+    var b;
+    while (codeSize < bits) {
+      if (typeof (b = bytes[bytesPos++]) == 'undefined')
+        error('Bad encoding in flate stream');
+      codeBuf |= b << codeSize;
+      codeSize += 8;
+    }
+    b = codeBuf & ((1 << bits) - 1);
+    this.codeBuf = codeBuf >> bits;
+    this.codeSize = codeSize -= bits;
+    this.bytesPos = bytesPos;
+    return b;
+  };
+
+  constructor.prototype.getCode = function flateStreamGetCode(table) {
+    var codes = table[0];
+    var maxLen = table[1];
+    var codeSize = this.codeSize;
+    var codeBuf = this.codeBuf;
+    var bytes = this.bytes;
+    var bytesPos = this.bytesPos;
+
+    while (codeSize < maxLen) {
+      var b;
+      if (typeof (b = bytes[bytesPos++]) == 'undefined')
+        error('Bad encoding in flate stream');
+      codeBuf |= (b << codeSize);
+      codeSize += 8;
+    }
+    var code = codes[codeBuf & ((1 << maxLen) - 1)];
+    var codeLen = code >> 16;
+    var codeVal = code & 0xffff;
+    if (codeSize == 0 || codeSize < codeLen || codeLen == 0)
+      error('Bad encoding in flate stream');
+    this.codeBuf = (codeBuf >> codeLen);
+    this.codeSize = (codeSize - codeLen);
+    this.bytesPos = bytesPos;
+    return codeVal;
+  };
+
+  constructor.prototype.generateHuffmanTable =
+    function flateStreamGenerateHuffmanTable(lengths) {
+    var n = lengths.length;
+
+    // find max code length
+    var maxLen = 0;
+    for (var i = 0; i < n; ++i) {
+      if (lengths[i] > maxLen)
+        maxLen = lengths[i];
+    }
+
+    // build the table
+    var size = 1 << maxLen;
+    var codes = new Uint32Array(size);
+    for (var len = 1, code = 0, skip = 2;
+         len <= maxLen;
+         ++len, code <<= 1, skip <<= 1) {
+      for (var val = 0; val < n; ++val) {
+        if (lengths[val] == len) {
+          // bit-reverse the code
+          var code2 = 0;
+          var t = code;
+          for (var i = 0; i < len; ++i) {
+            code2 = (code2 << 1) | (t & 1);
+            t >>= 1;
+          }
+
+          // fill the table entries
+          for (var i = code2; i < size; i += skip)
+            codes[i] = (len << 16) | val;
+
+          ++code;
+        }
+      }
+    }
+
+    return [codes, maxLen];
+  };
+
+  constructor.prototype.readBlock = function flateStreamReadBlock() {
+    // read block header
+    var hdr = this.getBits(3);
+    if (hdr & 1)
+      this.eof = true;
+    hdr >>= 1;
+
+    if (hdr == 0) { // uncompressed block
+      var bytes = this.bytes;
+      var bytesPos = this.bytesPos;
+      var b;
+
+      if (typeof (b = bytes[bytesPos++]) == 'undefined')
+        error('Bad block header in flate stream');
+      var blockLen = b;
+      if (typeof (b = bytes[bytesPos++]) == 'undefined')
+        error('Bad block header in flate stream');
+      blockLen |= (b << 8);
+      if (typeof (b = bytes[bytesPos++]) == 'undefined')
+        error('Bad block header in flate stream');
+      var check = b;
+      if (typeof (b = bytes[bytesPos++]) == 'undefined')
+        error('Bad block header in flate stream');
+      check |= (b << 8);
+      if (check != (~blockLen & 0xffff))
+        error('Bad uncompressed block length in flate stream');
+
+      this.codeBuf = 0;
+      this.codeSize = 0;
+
+      var bufferLength = this.bufferLength;
+      var buffer = this.ensureBuffer(bufferLength + blockLen);
+      var end = bufferLength + blockLen;
+      this.bufferLength = end;
+      for (var n = bufferLength; n < end; ++n) {
+        if (typeof (b = bytes[bytesPos++]) == 'undefined') {
+          this.eof = true;
+          break;
+        }
+        buffer[n] = b;
+      }
+      this.bytesPos = bytesPos;
+      return;
+    }
+
+    var litCodeTable;
+    var distCodeTable;
+    if (hdr == 1) { // compressed block, fixed codes
+      litCodeTable = fixedLitCodeTab;
+      distCodeTable = fixedDistCodeTab;
+    } else if (hdr == 2) { // compressed block, dynamic codes
+      var numLitCodes = this.getBits(5) + 257;
+      var numDistCodes = this.getBits(5) + 1;
+      var numCodeLenCodes = this.getBits(4) + 4;
+
+      // build the code lengths code table
+      var codeLenCodeLengths = new Uint8Array(codeLenCodeMap.length);
+
+      for (var i = 0; i < numCodeLenCodes; ++i)
+        codeLenCodeLengths[codeLenCodeMap[i]] = this.getBits(3);
+      var codeLenCodeTab = this.generateHuffmanTable(codeLenCodeLengths);
+
+      // build the literal and distance code tables
+      var len = 0;
+      var i = 0;
+      var codes = numLitCodes + numDistCodes;
+      var codeLengths = new Uint8Array(codes);
+      while (i < codes) {
+        var code = this.getCode(codeLenCodeTab);
+        if (code == 16) {
+          var bitsLength = 2, bitsOffset = 3, what = len;
+        } else if (code == 17) {
+          var bitsLength = 3, bitsOffset = 3, what = (len = 0);
+        } else if (code == 18) {
+          var bitsLength = 7, bitsOffset = 11, what = (len = 0);
+        } else {
+          codeLengths[i++] = len = code;
+          continue;
+        }
+
+        var repeatLength = this.getBits(bitsLength) + bitsOffset;
+        while (repeatLength-- > 0)
+          codeLengths[i++] = what;
+      }
+
+      litCodeTable =
+        this.generateHuffmanTable(codeLengths.subarray(0, numLitCodes));
+      distCodeTable =
+        this.generateHuffmanTable(codeLengths.subarray(numLitCodes, codes));
+    } else {
+      error('Unknown block type in flate stream');
+    }
+
+    var buffer = this.buffer;
+    var limit = buffer ? buffer.length : 0;
+    var pos = this.bufferLength;
+    while (true) {
+      var code1 = this.getCode(litCodeTable);
+      if (code1 < 256) {
+        if (pos + 1 >= limit) {
+          buffer = this.ensureBuffer(pos + 1);
+          limit = buffer.length;
+        }
+        buffer[pos++] = code1;
+        continue;
+      }
+      if (code1 == 256) {
+        this.bufferLength = pos;
+        return;
+      }
+      code1 -= 257;
+      code1 = lengthDecode[code1];
+      var code2 = code1 >> 16;
+      if (code2 > 0)
+        code2 = this.getBits(code2);
+      var len = (code1 & 0xffff) + code2;
+      code1 = this.getCode(distCodeTable);
+      code1 = distDecode[code1];
+      code2 = code1 >> 16;
+      if (code2 > 0)
+        code2 = this.getBits(code2);
+      var dist = (code1 & 0xffff) + code2;
+      if (pos + len >= limit) {
+        buffer = this.ensureBuffer(pos + len);
+        limit = buffer.length;
+      }
+      for (var k = 0; k < len; ++k, ++pos)
+        buffer[pos] = buffer[pos - dist];
+    }
+  };
+
+  return constructor;
+})();
+
+var PredictorStream = (function predictorStream() {
+  function constructor(stream, params) {
+    var predictor = this.predictor = params.get('Predictor') || 1;
+
+    if (predictor <= 1)
+      return stream; // no prediction
+    if (predictor !== 2 && (predictor < 10 || predictor > 15))
+      error('Unsupported predictor: ' + predictor);
+
+    if (predictor === 2)
+      this.readBlock = this.readBlockTiff;
+    else
+      this.readBlock = this.readBlockPng;
+
+    this.stream = stream;
+    this.dict = stream.dict;
+
+    var colors = this.colors = params.get('Colors') || 1;
+    var bits = this.bits = params.get('BitsPerComponent') || 8;
+    var columns = this.columns = params.get('Columns') || 1;
+
+    this.pixBytes = (colors * bits + 7) >> 3;
+    this.rowBytes = (columns * colors * bits + 7) >> 3;
+
+    DecodeStream.call(this);
+    return this;
+  }
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.readBlockTiff =
+    function predictorStreamReadBlockTiff() {
+    var rowBytes = this.rowBytes;
+
+    var bufferLength = this.bufferLength;
+    var buffer = this.ensureBuffer(bufferLength + rowBytes);
+    var currentRow = buffer.subarray(bufferLength, bufferLength + rowBytes);
+
+    var bits = this.bits;
+    var colors = this.colors;
+
+    var rawBytes = this.stream.getBytes(rowBytes);
+
+    var inbuf = 0, outbuf = 0;
+    var inbits = 0, outbits = 0;
+
+    if (bits === 1) {
+      for (var i = 0; i < rowBytes; ++i) {
+        var c = rawBytes[i];
+        inbuf = (inbuf << 8) | c;
+        // bitwise addition is exclusive or
+        // first shift inbuf and then add
+        currentRow[i] = (c ^ (inbuf >> colors)) & 0xFF;
+        // truncate inbuf (assumes colors < 16)
+        inbuf &= 0xFFFF;
+      }
+    } else if (bits === 8) {
+      for (var i = 0; i < colors; ++i)
+        currentRow[i] = rawBytes[i];
+      for (; i < rowBytes; ++i)
+        currentRow[i] = currentRow[i - colors] + rawBytes[i];
+    } else {
+      var compArray = new Uint8Array(colors + 1);
+      var bitMask = (1 << bits) - 1;
+      var j = 0, k = 0;
+      var columns = this.columns;
+      for (var i = 0; i < columns; ++i) {
+        for (var kk = 0; kk < colors; ++kk) {
+          if (inbits < bits) {
+            inbuf = (inbuf << 8) | (rawBytes[j++] & 0xFF);
+            inbits += 8;
+          }
+          compArray[kk] = (compArray[kk] +
+                           (inbuf >> (inbits - bits))) & bitMask;
+          inbits -= bits;
+          outbuf = (outbuf << bits) | compArray[kk];
+          outbits += bits;
+          if (outbits >= 8) {
+            currentRow[k++] = (outbuf >> (outbits - 8)) & 0xFF;
+            outbits -= 8;
+          }
+        }
+      }
+      if (outbits > 0) {
+        currentRow[k++] = (outbuf << (8 - outbits)) +
+        (inbuf & ((1 << (8 - outbits)) - 1));
+      }
+    }
+    this.bufferLength += rowBytes;
+  };
+
+  constructor.prototype.readBlockPng = function predictorStreamReadBlockPng() {
+    var rowBytes = this.rowBytes;
+    var pixBytes = this.pixBytes;
+
+    var predictor = this.stream.getByte();
+    var rawBytes = this.stream.getBytes(rowBytes);
+
+    var bufferLength = this.bufferLength;
+    var buffer = this.ensureBuffer(bufferLength + rowBytes);
+
+    var currentRow = buffer.subarray(bufferLength, bufferLength + rowBytes);
+    var prevRow = buffer.subarray(bufferLength - rowBytes, bufferLength);
+    if (prevRow.length == 0)
+      prevRow = new Uint8Array(rowBytes);
+
+    switch (predictor) {
+      case 0:
+        for (var i = 0; i < rowBytes; ++i)
+          currentRow[i] = rawBytes[i];
+        break;
+      case 1:
+        for (var i = 0; i < pixBytes; ++i)
+          currentRow[i] = rawBytes[i];
+        for (; i < rowBytes; ++i)
+          currentRow[i] = (currentRow[i - pixBytes] + rawBytes[i]) & 0xFF;
+        break;
+      case 2:
+        for (var i = 0; i < rowBytes; ++i)
+          currentRow[i] = (prevRow[i] + rawBytes[i]) & 0xFF;
+        break;
+      case 3:
+        for (var i = 0; i < pixBytes; ++i)
+          currentRow[i] = (prevRow[i] >> 1) + rawBytes[i];
+        for (; i < rowBytes; ++i) {
+          currentRow[i] = (((prevRow[i] + currentRow[i - pixBytes]) >> 1) +
+                           rawBytes[i]) & 0xFF;
+        }
+        break;
+      case 4:
+        // we need to save the up left pixels values. the simplest way
+        // is to create a new buffer
+        for (var i = 0; i < pixBytes; ++i) {
+          var up = prevRow[i];
+          var c = rawBytes[i];
+          currentRow[i] = up + c;
+        }
+        for (; i < rowBytes; ++i) {
+          var up = prevRow[i];
+          var upLeft = prevRow[i - pixBytes];
+          var left = currentRow[i - pixBytes];
+          var p = left + up - upLeft;
+
+          var pa = p - left;
+          if (pa < 0)
+            pa = -pa;
+          var pb = p - up;
+          if (pb < 0)
+            pb = -pb;
+          var pc = p - upLeft;
+          if (pc < 0)
+            pc = -pc;
+
+          var c = rawBytes[i];
+          if (pa <= pb && pa <= pc)
+            currentRow[i] = left + c;
+          else if (pb <= pc)
+            currentRow[i] = up + c;
+          else
+            currentRow[i] = upLeft + c;
+        }
+        break;
+      default:
+        error('Unsupported predictor: ' + predictor);
+    }
+    this.bufferLength += rowBytes;
+  };
+
+  return constructor;
+})();
+
+/**
+ * Depending on the type of JPEG a JpegStream is handled in different ways. For
+ * JPEG's that are supported natively such as DeviceGray and DeviceRGB the image
+ * data is stored and then loaded by the browser.  For unsupported JPEG's we use
+ * a library to decode these images and the stream behaves like all the other
+ * DecodeStreams.
+ */
+var JpegStream = (function jpegStream() {
+  function isAdobeImage(bytes) {
+    var maxBytesScanned = Math.max(bytes.length - 16, 1024);
+    // Looking for APP14, 'Adobe'
+    for (var i = 0; i < maxBytesScanned; ++i) {
+      if (bytes[i] == 0xFF && bytes[i + 1] == 0xEE &&
+          bytes[i + 2] == 0x00 && bytes[i + 3] == 0x0E &&
+          bytes[i + 4] == 0x41 && bytes[i + 5] == 0x64 &&
+          bytes[i + 6] == 0x6F && bytes[i + 7] == 0x62 &&
+          bytes[i + 8] == 0x65 && bytes[i + 9] == 0x00)
+          return true;
+      // scanning until frame tag
+      if (bytes[i] == 0xFF && bytes[i + 1] == 0xC0)
+        break;
+    }
+    return false;
+  }
+
+  function fixAdobeImage(bytes) {
+    // Inserting 'EMBED' marker after JPEG signature
+    var embedMarker = new Uint8Array([0xFF, 0xEC, 0, 8, 0x45, 0x4D, 0x42, 0x45,
+                                      0x44, 0]);
+    var newBytes = new Uint8Array(bytes.length + embedMarker.length);
+    newBytes.set(bytes, embedMarker.length);
+    // copy JPEG header
+    newBytes[0] = bytes[0];
+    newBytes[1] = bytes[1];
+    newBytes.set(embedMarker, 2);
+    return newBytes;
+  }
+
+  function constructor(bytes, dict, xref) {
+    // TODO: per poppler, some images may have 'junk' before that
+    // need to be removed
+    this.dict = dict;
+
+    // Flag indicating wether the image can be natively loaded.
+    this.isNative = true;
+
+    this.colorTransform = -1;
+
+    if (isAdobeImage(bytes)) {
+      // when bug 674619 land, let's check if browser can do
+      // normal cmyk and then we won't have to the following
+      var cs = xref.fetchIfRef(dict.get('ColorSpace'));
+
+      // DeviceRGB and DeviceGray are the only Adobe images that work natively
+      if (isName(cs) && (cs.name === 'DeviceRGB' || cs.name === 'DeviceGray')) {
+        bytes = fixAdobeImage(bytes);
+        this.src = bytesToString(bytes);
+      } else {
+        this.colorTransform = dict.get('ColorTransform');
+        this.isNative = false;
+        this.bytes = bytes;
+      }
+    } else {
+      this.src = bytesToString(bytes);
+    }
+
+    DecodeStream.call(this);
+  }
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.ensureBuffer = function jpegStreamEnsureBuffer(req) {
+    if (this.bufferLength)
+      return;
+    var jpegImage = new JpegImage();
+    jpegImage.colorTransform = this.colorTransform;
+    jpegImage.parse(this.bytes);
+    var width = jpegImage.width;
+    var height = jpegImage.height;
+    var data = jpegImage.getData(width, height);
+    this.buffer = data;
+    this.bufferLength = data.length;
+  };
+  constructor.prototype.getIR = function jpegStreamGetIR() {
+    return this.src;
+  };
+  constructor.prototype.getChar = function jpegStreamGetChar() {
+      error('internal error: getChar is not valid on JpegStream');
+  };
+
+  return constructor;
+})();
+
+var DecryptStream = (function decryptStream() {
+  function constructor(str, decrypt) {
+    this.str = str;
+    this.dict = str.dict;
+    this.decrypt = decrypt;
+
+    DecodeStream.call(this);
+  }
+
+  var chunkSize = 512;
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.readBlock = function decryptStreamReadBlock() {
+    var chunk = this.str.getBytes(chunkSize);
+    if (!chunk || chunk.length == 0) {
+      this.eof = true;
+      return;
+    }
+    var decrypt = this.decrypt;
+    chunk = decrypt(chunk);
+
+    var bufferLength = this.bufferLength;
+    var i, n = chunk.length;
+    var buffer = this.ensureBuffer(bufferLength + n);
+    for (i = 0; i < n; i++)
+      buffer[bufferLength++] = chunk[i];
+    this.bufferLength = bufferLength;
+  };
+
+  return constructor;
+})();
+
+var Ascii85Stream = (function ascii85Stream() {
+  function constructor(str) {
+    this.str = str;
+    this.dict = str.dict;
+    this.input = new Uint8Array(5);
+
+    DecodeStream.call(this);
+  }
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.readBlock = function ascii85StreamReadBlock() {
+    var tildaCode = '~'.charCodeAt(0);
+    var zCode = 'z'.charCodeAt(0);
+    var str = this.str;
+
+    var c = str.getByte();
+    while (Lexer.isSpace(String.fromCharCode(c)))
+      c = str.getByte();
+
+    if (!c || c === tildaCode) {
+      this.eof = true;
+      return;
+    }
+
+    var bufferLength = this.bufferLength, buffer;
+
+    // special code for z
+    if (c == zCode) {
+      buffer = this.ensureBuffer(bufferLength + 4);
+      for (var i = 0; i < 4; ++i)
+        buffer[bufferLength + i] = 0;
+      this.bufferLength += 4;
+    } else {
+      var input = this.input;
+      input[0] = c;
+      for (var i = 1; i < 5; ++i) {
+        c = str.getByte();
+        while (Lexer.isSpace(String.fromCharCode(c)))
+          c = str.getByte();
+
+        input[i] = c;
+
+        if (!c || c == tildaCode)
+          break;
+      }
+      buffer = this.ensureBuffer(bufferLength + i - 1);
+      this.bufferLength += i - 1;
+
+      // partial ending;
+      if (i < 5) {
+        for (; i < 5; ++i)
+          input[i] = 0x21 + 84;
+        this.eof = true;
+      }
+      var t = 0;
+      for (var i = 0; i < 5; ++i)
+        t = t * 85 + (input[i] - 0x21);
+
+      for (var i = 3; i >= 0; --i) {
+        buffer[bufferLength + i] = t & 0xFF;
+        t >>= 8;
+      }
+    }
+  };
+
+  return constructor;
+})();
+
+var AsciiHexStream = (function asciiHexStream() {
+  function constructor(str) {
+    this.str = str;
+    this.dict = str.dict;
+
+    DecodeStream.call(this);
+  }
+
+  var hexvalueMap = {
+      9: -1, // \t
+      32: -1, // space
+      48: 0,
+      49: 1,
+      50: 2,
+      51: 3,
+      52: 4,
+      53: 5,
+      54: 6,
+      55: 7,
+      56: 8,
+      57: 9,
+      65: 10,
+      66: 11,
+      67: 12,
+      68: 13,
+      69: 14,
+      70: 15,
+      97: 10,
+      98: 11,
+      99: 12,
+      100: 13,
+      101: 14,
+      102: 15
+  };
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.readBlock = function asciiHexStreamReadBlock() {
+    var gtCode = '>'.charCodeAt(0), bytes = this.str.getBytes(), c, n,
+        decodeLength, buffer, bufferLength, i, length;
+
+    decodeLength = (bytes.length + 1) >> 1;
+    buffer = this.ensureBuffer(this.bufferLength + decodeLength);
+    bufferLength = this.bufferLength;
+
+    for (i = 0, length = bytes.length; i < length; i++) {
+      c = hexvalueMap[bytes[i]];
+      while (c == -1 && (i + 1) < length) {
+        c = hexvalueMap[bytes[++i]];
+      }
+
+      if ((i + 1) < length && (bytes[i + 1] !== gtCode)) {
+        n = hexvalueMap[bytes[++i]];
+        buffer[bufferLength++] = c * 16 + n;
+      } else {
+        // EOD marker at an odd number, behave as if a 0 followed the last
+        // digit.
+        if (bytes[i] !== gtCode) {
+          buffer[bufferLength++] = c * 16;
+        }
+      }
+    }
+
+    this.bufferLength = bufferLength;
+    this.eof = true;
+  };
+
+  return constructor;
+})();
+
+var CCITTFaxStream = (function ccittFaxStream() {
+
+  var ccittEOL = -2;
+  var twoDimPass = 0;
+  var twoDimHoriz = 1;
+  var twoDimVert0 = 2;
+  var twoDimVertR1 = 3;
+  var twoDimVertL1 = 4;
+  var twoDimVertR2 = 5;
+  var twoDimVertL2 = 6;
+  var twoDimVertR3 = 7;
+  var twoDimVertL3 = 8;
+
+  var twoDimTable = [
+    [-1, -1], [-1, -1],                   // 000000x
+    [7, twoDimVertL3],                    // 0000010
+    [7, twoDimVertR3],                    // 0000011
+    [6, twoDimVertL2], [6, twoDimVertL2], // 000010x
+    [6, twoDimVertR2], [6, twoDimVertR2], // 000011x
+    [4, twoDimPass], [4, twoDimPass],     // 0001xxx
+    [4, twoDimPass], [4, twoDimPass],
+    [4, twoDimPass], [4, twoDimPass],
+    [4, twoDimPass], [4, twoDimPass],
+    [3, twoDimHoriz], [3, twoDimHoriz],   // 001xxxx
+    [3, twoDimHoriz], [3, twoDimHoriz],
+    [3, twoDimHoriz], [3, twoDimHoriz],
+    [3, twoDimHoriz], [3, twoDimHoriz],
+    [3, twoDimHoriz], [3, twoDimHoriz],
+    [3, twoDimHoriz], [3, twoDimHoriz],
+    [3, twoDimHoriz], [3, twoDimHoriz],
+    [3, twoDimHoriz], [3, twoDimHoriz],
+    [3, twoDimVertL1], [3, twoDimVertL1], // 010xxxx
+    [3, twoDimVertL1], [3, twoDimVertL1],
+    [3, twoDimVertL1], [3, twoDimVertL1],
+    [3, twoDimVertL1], [3, twoDimVertL1],
+    [3, twoDimVertL1], [3, twoDimVertL1],
+    [3, twoDimVertL1], [3, twoDimVertL1],
+    [3, twoDimVertL1], [3, twoDimVertL1],
+    [3, twoDimVertL1], [3, twoDimVertL1],
+    [3, twoDimVertR1], [3, twoDimVertR1], // 011xxxx
+    [3, twoDimVertR1], [3, twoDimVertR1],
+    [3, twoDimVertR1], [3, twoDimVertR1],
+    [3, twoDimVertR1], [3, twoDimVertR1],
+    [3, twoDimVertR1], [3, twoDimVertR1],
+    [3, twoDimVertR1], [3, twoDimVertR1],
+    [3, twoDimVertR1], [3, twoDimVertR1],
+    [3, twoDimVertR1], [3, twoDimVertR1],
+    [1, twoDimVert0], [1, twoDimVert0],   // 1xxxxxx
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0]
+  ];
+
+  var whiteTable1 = [
+    [-1, -1],                               // 00000
+    [12, ccittEOL],                         // 00001
+    [-1, -1], [-1, -1],                     // 0001x
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 001xx
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 010xx
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 011xx
+    [11, 1792], [11, 1792],                 // 1000x
+    [12, 1984],                             // 10010
+    [12, 2048],                             // 10011
+    [12, 2112],                             // 10100
+    [12, 2176],                             // 10101
+    [12, 2240],                             // 10110
+    [12, 2304],                             // 10111
+    [11, 1856], [11, 1856],                 // 1100x
+    [11, 1920], [11, 1920],                 // 1101x
+    [12, 2368],                             // 11100
+    [12, 2432],                             // 11101
+    [12, 2496],                             // 11110
+    [12, 2560]                              // 11111
+  ];
+
+  var whiteTable2 = [
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1],     // 0000000xx
+    [8, 29], [8, 29],                           // 00000010x
+    [8, 30], [8, 30],                           // 00000011x
+    [8, 45], [8, 45],                           // 00000100x
+    [8, 46], [8, 46],                           // 00000101x
+    [7, 22], [7, 22], [7, 22], [7, 22],         // 0000011xx
+    [7, 23], [7, 23], [7, 23], [7, 23],         // 0000100xx
+    [8, 47], [8, 47],                           // 00001010x
+    [8, 48], [8, 48],                           // 00001011x
+    [6, 13], [6, 13], [6, 13], [6, 13],         // 000011xxx
+    [6, 13], [6, 13], [6, 13], [6, 13],
+    [7, 20], [7, 20], [7, 20], [7, 20],         // 0001000xx
+    [8, 33], [8, 33],                           // 00010010x
+    [8, 34], [8, 34],                           // 00010011x
+    [8, 35], [8, 35],                           // 00010100x
+    [8, 36], [8, 36],                           // 00010101x
+    [8, 37], [8, 37],                           // 00010110x
+    [8, 38], [8, 38],                           // 00010111x
+    [7, 19], [7, 19], [7, 19], [7, 19],         // 0001100xx
+    [8, 31], [8, 31],                           // 00011010x
+    [8, 32], [8, 32],                           // 00011011x
+    [6, 1], [6, 1], [6, 1], [6, 1],             // 000111xxx
+    [6, 1], [6, 1], [6, 1], [6, 1],
+    [6, 12], [6, 12], [6, 12], [6, 12],         // 001000xxx
+    [6, 12], [6, 12], [6, 12], [6, 12],
+    [8, 53], [8, 53],                           // 00100100x
+    [8, 54], [8, 54],                           // 00100101x
+    [7, 26], [7, 26], [7, 26], [7, 26],         // 0010011xx
+    [8, 39], [8, 39],                           // 00101000x
+    [8, 40], [8, 40],                           // 00101001x
+    [8, 41], [8, 41],                           // 00101010x
+    [8, 42], [8, 42],                           // 00101011x
+    [8, 43], [8, 43],                           // 00101100x
+    [8, 44], [8, 44],                           // 00101101x
+    [7, 21], [7, 21], [7, 21], [7, 21],         // 0010111xx
+    [7, 28], [7, 28], [7, 28], [7, 28],         // 0011000xx
+    [8, 61], [8, 61],                           // 00110010x
+    [8, 62], [8, 62],                           // 00110011x
+    [8, 63], [8, 63],                           // 00110100x
+    [8, 0], [8, 0],                             // 00110101x
+    [8, 320], [8, 320],                         // 00110110x
+    [8, 384], [8, 384],                         // 00110111x
+    [5, 10], [5, 10], [5, 10], [5, 10],         // 00111xxxx
+    [5, 10], [5, 10], [5, 10], [5, 10],
+    [5, 10], [5, 10], [5, 10], [5, 10],
+    [5, 10], [5, 10], [5, 10], [5, 10],
+    [5, 11], [5, 11], [5, 11], [5, 11],         // 01000xxxx
+    [5, 11], [5, 11], [5, 11], [5, 11],
+    [5, 11], [5, 11], [5, 11], [5, 11],
+    [5, 11], [5, 11], [5, 11], [5, 11],
+    [7, 27], [7, 27], [7, 27], [7, 27],         // 0100100xx
+    [8, 59], [8, 59],                           // 01001010x
+    [8, 60], [8, 60],                           // 01001011x
+    [9, 1472],                                  // 010011000
+    [9, 1536],                                  // 010011001
+    [9, 1600],                                  // 010011010
+    [9, 1728],                                  // 010011011
+    [7, 18], [7, 18], [7, 18], [7, 18],         // 0100111xx
+    [7, 24], [7, 24], [7, 24], [7, 24],         // 0101000xx
+    [8, 49], [8, 49],                           // 01010010x
+    [8, 50], [8, 50],                           // 01010011x
+    [8, 51], [8, 51],                           // 01010100x
+    [8, 52], [8, 52],                           // 01010101x
+    [7, 25], [7, 25], [7, 25], [7, 25],         // 0101011xx
+    [8, 55], [8, 55],                           // 01011000x
+    [8, 56], [8, 56],                           // 01011001x
+    [8, 57], [8, 57],                           // 01011010x
+    [8, 58], [8, 58],                           // 01011011x
+    [6, 192], [6, 192], [6, 192], [6, 192],     // 010111xxx
+    [6, 192], [6, 192], [6, 192], [6, 192],
+    [6, 1664], [6, 1664], [6, 1664], [6, 1664], // 011000xxx
+    [6, 1664], [6, 1664], [6, 1664], [6, 1664],
+    [8, 448], [8, 448],                         // 01100100x
+    [8, 512], [8, 512],                         // 01100101x
+    [9, 704],                                   // 011001100
+    [9, 768],                                   // 011001101
+    [8, 640], [8, 640],                         // 01100111x
+    [8, 576], [8, 576],                         // 01101000x
+    [9, 832],                                   // 011010010
+    [9, 896],                                   // 011010011
+    [9, 960],                                   // 011010100
+    [9, 1024],                                  // 011010101
+    [9, 1088],                                  // 011010110
+    [9, 1152],                                  // 011010111
+    [9, 1216],                                  // 011011000
+    [9, 1280],                                  // 011011001
+    [9, 1344],                                  // 011011010
+    [9, 1408],                                  // 011011011
+    [7, 256], [7, 256], [7, 256], [7, 256],     // 0110111xx
+    [4, 2], [4, 2], [4, 2], [4, 2],             // 0111xxxxx
+    [4, 2], [4, 2], [4, 2], [4, 2],
+    [4, 2], [4, 2], [4, 2], [4, 2],
+    [4, 2], [4, 2], [4, 2], [4, 2],
+    [4, 2], [4, 2], [4, 2], [4, 2],
+    [4, 2], [4, 2], [4, 2], [4, 2],
+    [4, 2], [4, 2], [4, 2], [4, 2],
+    [4, 2], [4, 2], [4, 2], [4, 2],
+    [4, 3], [4, 3], [4, 3], [4, 3],             // 1000xxxxx
+    [4, 3], [4, 3], [4, 3], [4, 3],
+    [4, 3], [4, 3], [4, 3], [4, 3],
+    [4, 3], [4, 3], [4, 3], [4, 3],
+    [4, 3], [4, 3], [4, 3], [4, 3],
+    [4, 3], [4, 3], [4, 3], [4, 3],
+    [4, 3], [4, 3], [4, 3], [4, 3],
+    [4, 3], [4, 3], [4, 3], [4, 3],
+    [5, 128], [5, 128], [5, 128], [5, 128],     // 10010xxxx
+    [5, 128], [5, 128], [5, 128], [5, 128],
+    [5, 128], [5, 128], [5, 128], [5, 128],
+    [5, 128], [5, 128], [5, 128], [5, 128],
+    [5, 8], [5, 8], [5, 8], [5, 8],             // 10011xxxx
+    [5, 8], [5, 8], [5, 8], [5, 8],
+    [5, 8], [5, 8], [5, 8], [5, 8],
+    [5, 8], [5, 8], [5, 8], [5, 8],
+    [5, 9], [5, 9], [5, 9], [5, 9],             // 10100xxxx
+    [5, 9], [5, 9], [5, 9], [5, 9],
+    [5, 9], [5, 9], [5, 9], [5, 9],
+    [5, 9], [5, 9], [5, 9], [5, 9],
+    [6, 16], [6, 16], [6, 16], [6, 16],         // 101010xxx
+    [6, 16], [6, 16], [6, 16], [6, 16],
+    [6, 17], [6, 17], [6, 17], [6, 17],         // 101011xxx
+    [6, 17], [6, 17], [6, 17], [6, 17],
+    [4, 4], [4, 4], [4, 4], [4, 4],             // 1011xxxxx
+    [4, 4], [4, 4], [4, 4], [4, 4],
+    [4, 4], [4, 4], [4, 4], [4, 4],
+    [4, 4], [4, 4], [4, 4], [4, 4],
+    [4, 4], [4, 4], [4, 4], [4, 4],
+    [4, 4], [4, 4], [4, 4], [4, 4],
+    [4, 4], [4, 4], [4, 4], [4, 4],
+    [4, 4], [4, 4], [4, 4], [4, 4],
+    [4, 5], [4, 5], [4, 5], [4, 5],             // 1100xxxxx
+    [4, 5], [4, 5], [4, 5], [4, 5],
+    [4, 5], [4, 5], [4, 5], [4, 5],
+    [4, 5], [4, 5], [4, 5], [4, 5],
+    [4, 5], [4, 5], [4, 5], [4, 5],
+    [4, 5], [4, 5], [4, 5], [4, 5],
+    [4, 5], [4, 5], [4, 5], [4, 5],
+    [4, 5], [4, 5], [4, 5], [4, 5],
+    [6, 14], [6, 14], [6, 14], [6, 14],         // 110100xxx
+    [6, 14], [6, 14], [6, 14], [6, 14],
+    [6, 15], [6, 15], [6, 15], [6, 15],         // 110101xxx
+    [6, 15], [6, 15], [6, 15], [6, 15],
+    [5, 64], [5, 64], [5, 64], [5, 64],         // 11011xxxx
+    [5, 64], [5, 64], [5, 64], [5, 64],
+    [5, 64], [5, 64], [5, 64], [5, 64],
+    [5, 64], [5, 64], [5, 64], [5, 64],
+    [4, 6], [4, 6], [4, 6], [4, 6],             // 1110xxxxx
+    [4, 6], [4, 6], [4, 6], [4, 6],
+    [4, 6], [4, 6], [4, 6], [4, 6],
+    [4, 6], [4, 6], [4, 6], [4, 6],
+    [4, 6], [4, 6], [4, 6], [4, 6],
+    [4, 6], [4, 6], [4, 6], [4, 6],
+    [4, 6], [4, 6], [4, 6], [4, 6],
+    [4, 6], [4, 6], [4, 6], [4, 6],
+    [4, 7], [4, 7], [4, 7], [4, 7],             // 1111xxxxx
+    [4, 7], [4, 7], [4, 7], [4, 7],
+    [4, 7], [4, 7], [4, 7], [4, 7],
+    [4, 7], [4, 7], [4, 7], [4, 7],
+    [4, 7], [4, 7], [4, 7], [4, 7],
+    [4, 7], [4, 7], [4, 7], [4, 7],
+    [4, 7], [4, 7], [4, 7], [4, 7],
+    [4, 7], [4, 7], [4, 7], [4, 7]
+  ];
+
+  var blackTable1 = [
+    [-1, -1], [-1, -1],                             // 000000000000x
+    [12, ccittEOL], [12, ccittEOL],                 // 000000000001x
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000001xx
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000010xx
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000011xx
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000100xx
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000101xx
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000110xx
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000111xx
+    [11, 1792], [11, 1792], [11, 1792], [11, 1792], // 00000001000xx
+    [12, 1984], [12, 1984],                         // 000000010010x
+    [12, 2048], [12, 2048],                         // 000000010011x
+    [12, 2112], [12, 2112],                         // 000000010100x
+    [12, 2176], [12, 2176],                         // 000000010101x
+    [12, 2240], [12, 2240],                         // 000000010110x
+    [12, 2304], [12, 2304],                         // 000000010111x
+    [11, 1856], [11, 1856], [11, 1856], [11, 1856], // 00000001100xx
+    [11, 1920], [11, 1920], [11, 1920], [11, 1920], // 00000001101xx
+    [12, 2368], [12, 2368],                         // 000000011100x
+    [12, 2432], [12, 2432],                         // 000000011101x
+    [12, 2496], [12, 2496],                         // 000000011110x
+    [12, 2560], [12, 2560],                         // 000000011111x
+    [10, 18], [10, 18], [10, 18], [10, 18],         // 0000001000xxx
+    [10, 18], [10, 18], [10, 18], [10, 18],
+    [12, 52], [12, 52],                             // 000000100100x
+    [13, 640],                                      // 0000001001010
+    [13, 704],                                      // 0000001001011
+    [13, 768],                                      // 0000001001100
+    [13, 832],                                      // 0000001001101
+    [12, 55], [12, 55],                             // 000000100111x
+    [12, 56], [12, 56],                             // 000000101000x
+    [13, 1280],                                     // 0000001010010
+    [13, 1344],                                     // 0000001010011
+    [13, 1408],                                     // 0000001010100
+    [13, 1472],                                     // 0000001010101
+    [12, 59], [12, 59],                             // 000000101011x
+    [12, 60], [12, 60],                             // 000000101100x
+    [13, 1536],                                     // 0000001011010
+    [13, 1600],                                     // 0000001011011
+    [11, 24], [11, 24], [11, 24], [11, 24],         // 00000010111xx
+    [11, 25], [11, 25], [11, 25], [11, 25],         // 00000011000xx
+    [13, 1664],                                     // 0000001100100
+    [13, 1728],                                     // 0000001100101
+    [12, 320], [12, 320],                           // 000000110011x
+    [12, 384], [12, 384],                           // 000000110100x
+    [12, 448], [12, 448],                           // 000000110101x
+    [13, 512],                                      // 0000001101100
+    [13, 576],                                      // 0000001101101
+    [12, 53], [12, 53],                             // 000000110111x
+    [12, 54], [12, 54],                             // 000000111000x
+    [13, 896],                                      // 0000001110010
+    [13, 960],                                      // 0000001110011
+    [13, 1024],                                     // 0000001110100
+    [13, 1088],                                     // 0000001110101
+    [13, 1152],                                     // 0000001110110
+    [13, 1216],                                     // 0000001110111
+    [10, 64], [10, 64], [10, 64], [10, 64],         // 0000001111xxx
+    [10, 64], [10, 64], [10, 64], [10, 64]
+  ];
+
+  var blackTable2 = [
+    [8, 13], [8, 13], [8, 13], [8, 13],     // 00000100xxxx
+    [8, 13], [8, 13], [8, 13], [8, 13],
+    [8, 13], [8, 13], [8, 13], [8, 13],
+    [8, 13], [8, 13], [8, 13], [8, 13],
+    [11, 23], [11, 23],                     // 00000101000x
+    [12, 50],                               // 000001010010
+    [12, 51],                               // 000001010011
+    [12, 44],                               // 000001010100
+    [12, 45],                               // 000001010101
+    [12, 46],                               // 000001010110
+    [12, 47],                               // 000001010111
+    [12, 57],                               // 000001011000
+    [12, 58],                               // 000001011001
+    [12, 61],                               // 000001011010
+    [12, 256],                              // 000001011011
+    [10, 16], [10, 16], [10, 16], [10, 16], // 0000010111xx
+    [10, 17], [10, 17], [10, 17], [10, 17], // 0000011000xx
+    [12, 48],                               // 000001100100
+    [12, 49],                               // 000001100101
+    [12, 62],                               // 000001100110
+    [12, 63],                               // 000001100111
+    [12, 30],                               // 000001101000
+    [12, 31],                               // 000001101001
+    [12, 32],                               // 000001101010
+    [12, 33],                               // 000001101011
+    [12, 40],                               // 000001101100
+    [12, 41],                               // 000001101101
+    [11, 22], [11, 22],                     // 00000110111x
+    [8, 14], [8, 14], [8, 14], [8, 14],     // 00000111xxxx
+    [8, 14], [8, 14], [8, 14], [8, 14],
+    [8, 14], [8, 14], [8, 14], [8, 14],
+    [8, 14], [8, 14], [8, 14], [8, 14],
+    [7, 10], [7, 10], [7, 10], [7, 10],     // 0000100xxxxx
+    [7, 10], [7, 10], [7, 10], [7, 10],
+    [7, 10], [7, 10], [7, 10], [7, 10],
+    [7, 10], [7, 10], [7, 10], [7, 10],
+    [7, 10], [7, 10], [7, 10], [7, 10],
+    [7, 10], [7, 10], [7, 10], [7, 10],
+    [7, 10], [7, 10], [7, 10], [7, 10],
+    [7, 10], [7, 10], [7, 10], [7, 10],
+    [7, 11], [7, 11], [7, 11], [7, 11],     // 0000101xxxxx
+    [7, 11], [7, 11], [7, 11], [7, 11],
+    [7, 11], [7, 11], [7, 11], [7, 11],
+    [7, 11], [7, 11], [7, 11], [7, 11],
+    [7, 11], [7, 11], [7, 11], [7, 11],
+    [7, 11], [7, 11], [7, 11], [7, 11],
+    [7, 11], [7, 11], [7, 11], [7, 11],
+    [7, 11], [7, 11], [7, 11], [7, 11],
+    [9, 15], [9, 15], [9, 15], [9, 15],     // 000011000xxx
+    [9, 15], [9, 15], [9, 15], [9, 15],
+    [12, 128],                              // 000011001000
+    [12, 192],                              // 000011001001
+    [12, 26],                               // 000011001010
+    [12, 27],                               // 000011001011
+    [12, 28],                               // 000011001100
+    [12, 29],                               // 000011001101
+    [11, 19], [11, 19],                     // 00001100111x
+    [11, 20], [11, 20],                     // 00001101000x
+    [12, 34],                               // 000011010010
+    [12, 35],                               // 000011010011
+    [12, 36],                               // 000011010100
+    [12, 37],                               // 000011010101
+    [12, 38],                               // 000011010110
+    [12, 39],                               // 000011010111
+    [11, 21], [11, 21],                     // 00001101100x
+    [12, 42],                               // 000011011010
+    [12, 43],                               // 000011011011
+    [10, 0], [10, 0], [10, 0], [10, 0],     // 0000110111xx
+    [7, 12], [7, 12], [7, 12], [7, 12],     // 0000111xxxxx
+    [7, 12], [7, 12], [7, 12], [7, 12],
+    [7, 12], [7, 12], [7, 12], [7, 12],
+    [7, 12], [7, 12], [7, 12], [7, 12],
+    [7, 12], [7, 12], [7, 12], [7, 12],
+    [7, 12], [7, 12], [7, 12], [7, 12],
+    [7, 12], [7, 12], [7, 12], [7, 12],
+    [7, 12], [7, 12], [7, 12], [7, 12]
+  ];
+
+  var blackTable3 = [
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 0000xx
+    [6, 9],                                 // 000100
+    [6, 8],                                 // 000101
+    [5, 7], [5, 7],                         // 00011x
+    [4, 6], [4, 6], [4, 6], [4, 6],         // 0010xx
+    [4, 5], [4, 5], [4, 5], [4, 5],         // 0011xx
+    [3, 1], [3, 1], [3, 1], [3, 1],         // 010xxx
+    [3, 1], [3, 1], [3, 1], [3, 1],
+    [3, 4], [3, 4], [3, 4], [3, 4],         // 011xxx
+    [3, 4], [3, 4], [3, 4], [3, 4],
+    [2, 3], [2, 3], [2, 3], [2, 3],         // 10xxxx
+    [2, 3], [2, 3], [2, 3], [2, 3],
+    [2, 3], [2, 3], [2, 3], [2, 3],
+    [2, 3], [2, 3], [2, 3], [2, 3],
+    [2, 2], [2, 2], [2, 2], [2, 2],         // 11xxxx
+    [2, 2], [2, 2], [2, 2], [2, 2],
+    [2, 2], [2, 2], [2, 2], [2, 2],
+    [2, 2], [2, 2], [2, 2], [2, 2]
+  ];
+
+  function constructor(str, params) {
+    this.str = str;
+    this.dict = str.dict;
+
+    params = params || new Dict();
+
+    this.encoding = params.get('K') || 0;
+    this.eoline = params.get('EndOfLine') || false;
+    this.byteAlign = params.get('EncodedByteAlign') || false;
+    this.columns = params.get('Columns') || 1728;
+    this.rows = params.get('Rows') || 0;
+    var eoblock = params.get('EndOfBlock');
+    if (eoblock == null)
+      eoblock = true;
+    this.eoblock = eoblock;
+    this.black = params.get('BlackIs1') || false;
+
+    this.codingLine = new Uint32Array(this.columns + 1);
+    this.refLine = new Uint32Array(this.columns + 2);
+
+    this.codingLine[0] = this.columns;
+    this.codingPos = 0;
+
+    this.row = 0;
+    this.nextLine2D = this.encoding < 0;
+    this.inputBits = 0;
+    this.inputBuf = 0;
+    this.outputBits = 0;
+    this.buf = EOF;
+
+    var code1;
+    while ((code1 = this.lookBits(12)) == 0) {
+      this.eatBits(1);
+    }
+    if (code1 == 1) {
+      this.eatBits(12);
+    }
+    if (this.encoding > 0) {
+      this.nextLine2D = !this.lookBits(1);
+      this.eatBits(1);
+    }
+
+    DecodeStream.call(this);
+  }
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.readBlock = function ccittFaxStreamReadBlock() {
+    while (!this.eof) {
+      var c = this.lookChar();
+      this.buf = EOF;
+      this.ensureBuffer(this.bufferLength + 1);
+      this.buffer[this.bufferLength++] = c;
+    }
+  };
+
+  constructor.prototype.addPixels =
+    function ccittFaxStreamAddPixels(a1, blackPixels) {
+    var codingLine = this.codingLine;
+    var codingPos = this.codingPos;
+
+    if (a1 > codingLine[codingPos]) {
+      if (a1 > this.columns) {
+        warn('row is wrong length');
+        this.err = true;
+        a1 = this.columns;
+      }
+      if ((codingPos & 1) ^ blackPixels) {
+        ++codingPos;
+      }
+
+      codingLine[codingPos] = a1;
+    }
+    this.codingPos = codingPos;
+  };
+
+  constructor.prototype.addPixelsNeg =
+    function ccittFaxStreamAddPixelsNeg(a1, blackPixels) {
+    var codingLine = this.codingLine;
+    var codingPos = this.codingPos;
+
+    if (a1 > codingLine[codingPos]) {
+      if (a1 > this.columns) {
+        warn('row is wrong length');
+        this.err = true;
+        a1 = this.columns;
+      }
+      if ((codingPos & 1) ^ blackPixels)
+        ++codingPos;
+
+      codingLine[codingPos] = a1;
+    } else if (a1 < codingLine[codingPos]) {
+      if (a1 < 0) {
+        warn('invalid code');
+        this.err = true;
+        a1 = 0;
+      }
+      while (codingPos > 0 && a1 < codingLine[codingPos - 1])
+        --codingPos;
+      codingLine[codingPos] = a1;
+    }
+
+    this.codingPos = codingPos;
+  };
+
+  constructor.prototype.lookChar = function ccittFaxStreamLookChar() {
+    if (this.buf != EOF)
+      return this.buf;
+
+    var refLine = this.refLine;
+    var codingLine = this.codingLine;
+    var columns = this.columns;
+
+    var refPos, blackPixels, bits;
+
+    if (this.outputBits == 0) {
+      if (this.eof)
+        return null;
+
+      this.err = false;
+
+      var code1, code2, code3;
+      if (this.nextLine2D) {
+        for (var i = 0; codingLine[i] < columns; ++i)
+          refLine[i] = codingLine[i];
+
+        refLine[i++] = columns;
+        refLine[i] = columns;
+        codingLine[0] = 0;
+        this.codingPos = 0;
+        refPos = 0;
+        blackPixels = 0;
+
+        while (codingLine[this.codingPos] < columns) {
+          code1 = this.getTwoDimCode();
+          switch (code1) {
+            case twoDimPass:
+              this.addPixels(refLine[refPos + 1], blackPixels);
+              if (refLine[refPos + 1] < columns)
+                refPos += 2;
+              break;
+            case twoDimHoriz:
+              code1 = code2 = 0;
+              if (blackPixels) {
+                do {
+                  code1 += (code3 = this.getBlackCode());
+                } while (code3 >= 64);
+                do {
+                  code2 += (code3 = this.getWhiteCode());
+                } while (code3 >= 64);
+              } else {
+                do {
+                  code1 += (code3 = this.getWhiteCode());
+                } while (code3 >= 64);
+                do {
+                  code2 += (code3 = this.getBlackCode());
+                } while (code3 >= 64);
+              }
+              this.addPixels(codingLine[this.codingPos] +
+                             code1, blackPixels);
+              if (codingLine[this.codingPos] < columns) {
+                this.addPixels(codingLine[this.codingPos] + code2,
+                               blackPixels ^ 1);
+              }
+              while (refLine[refPos] <= codingLine[this.codingPos] &&
+                     refLine[refPos] < columns) {
+                refPos += 2;
+              }
+              break;
+            case twoDimVertR3:
+              this.addPixels(refLine[refPos] + 3, blackPixels);
+              blackPixels ^= 1;
+              if (codingLine[this.codingPos] < columns) {
+                ++refPos;
+                while (refLine[refPos] <= codingLine[this.codingPos] &&
+                       refLine[refPos] < columns)
+                  refPos += 2;
+              }
+              break;
+            case twoDimVertR2:
+              this.addPixels(refLine[refPos] + 2, blackPixels);
+              blackPixels ^= 1;
+              if (codingLine[this.codingPos] < columns) {
+                ++refPos;
+                while (refLine[refPos] <= codingLine[this.codingPos] &&
+                       refLine[refPos] < columns) {
+                  refPos += 2;
+                }
+              }
+              break;
+            case twoDimVertR1:
+              this.addPixels(refLine[refPos] + 1, blackPixels);
+              blackPixels ^= 1;
+              if (codingLine[this.codingPos] < columns) {
+                ++refPos;
+                while (refLine[refPos] <= codingLine[this.codingPos] &&
+                       refLine[refPos] < columns)
+                  refPos += 2;
+              }
+              break;
+            case twoDimVert0:
+              this.addPixels(refLine[refPos], blackPixels);
+              blackPixels ^= 1;
+              if (codingLine[this.codingPos] < columns) {
+                ++refPos;
+                while (refLine[refPos] <= codingLine[this.codingPos] &&
+                       refLine[refPos] < columns)
+                  refPos += 2;
+              }
+              break;
+            case twoDimVertL3:
+              this.addPixelsNeg(refLine[refPos] - 3, blackPixels);
+              blackPixels ^= 1;
+              if (codingLine[this.codingPos] < columns) {
+                if (refPos > 0)
+                  --refPos;
+                else
+                  ++refPos;
+                while (refLine[refPos] <= codingLine[this.codingPos] &&
+                       refLine[refPos] < columns)
+                  refPos += 2;
+              }
+              break;
+            case twoDimVertL2:
+              this.addPixelsNeg(refLine[refPos] - 2, blackPixels);
+              blackPixels ^= 1;
+              if (codingLine[this.codingPos] < columns) {
+                if (refPos > 0)
+                  --refPos;
+                else
+                  ++refPos;
+                while (refLine[refPos] <= codingLine[this.codingPos] &&
+                       refLine[refPos] < columns)
+                  refPos += 2;
+              }
+              break;
+            case twoDimVertL1:
+              this.addPixelsNeg(refLine[refPos] - 1, blackPixels);
+              blackPixels ^= 1;
+              if (codingLine[this.codingPos] < columns) {
+                if (refPos > 0)
+                  --refPos;
+                else
+                  ++refPos;
+
+                while (refLine[refPos] <= codingLine[this.codingPos] &&
+                       refLine[refPos] < columns)
+                  refPos += 2;
+              }
+              break;
+            case EOF:
+              this.addPixels(columns, 0);
+              this.eof = true;
+              break;
+            default:
+              warn('bad 2d code');
+              this.addPixels(columns, 0);
+              this.err = true;
+          }
+        }
+      } else {
+        codingLine[0] = 0;
+        this.codingPos = 0;
+        blackPixels = 0;
+        while (codingLine[this.codingPos] < columns) {
+          code1 = 0;
+          if (blackPixels) {
+            do {
+              code1 += (code3 = this.getBlackCode());
+            } while (code3 >= 64);
+          } else {
+            do {
+              code1 += (code3 = this.getWhiteCode());
+            } while (code3 >= 64);
+          }
+          this.addPixels(codingLine[this.codingPos] + code1, blackPixels);
+          blackPixels ^= 1;
+        }
+      }
+
+      if (this.byteAlign)
+        this.inputBits &= ~7;
+
+      var gotEOL = false;
+
+      if (!this.eoblock && this.row == this.rows - 1) {
+        this.eof = true;
+      } else {
+        code1 = this.lookBits(12);
+        while (code1 == 0) {
+          this.eatBits(1);
+          code1 = this.lookBits(12);
+        }
+        if (code1 == 1) {
+          this.eatBits(12);
+          gotEOL = true;
+        } else if (code1 == EOF) {
+          this.eof = true;
+        }
+      }
+
+      if (!this.eof && this.encoding > 0) {
+        this.nextLine2D = !this.lookBits(1);
+        this.eatBits(1);
+      }
+
+      if (this.eoblock && gotEOL) {
+        code1 = this.lookBits(12);
+        if (code1 == 1) {
+          this.eatBits(12);
+          if (this.encoding > 0) {
+            this.lookBits(1);
+            this.eatBits(1);
+          }
+          if (this.encoding >= 0) {
+            for (var i = 0; i < 4; ++i) {
+              code1 = this.lookBits(12);
+              if (code1 != 1)
+                warn('bad rtc code: ' + code1);
+              this.eatBits(12);
+              if (this.encoding > 0) {
+                this.lookBits(1);
+                this.eatBits(1);
+              }
+            }
+          }
+          this.eof = true;
+        }
+      } else if (this.err && this.eoline) {
+        while (true) {
+          code1 = this.lookBits(13);
+          if (code1 == EOF) {
+            this.eof = true;
+            return null;
+          }
+          if ((code1 >> 1) == 1) {
+            break;
+          }
+          this.eatBits(1);
+        }
+        this.eatBits(12);
+        if (this.encoding > 0) {
+          this.eatBits(1);
+          this.nextLine2D = !(code1 & 1);
+        }
+      }
+
+      if (codingLine[0] > 0)
+        this.outputBits = codingLine[this.codingPos = 0];
+      else
+        this.outputBits = codingLine[this.codingPos = 1];
+      this.row++;
+    }
+
+    if (this.outputBits >= 8) {
+      this.buf = (this.codingPos & 1) ? 0 : 0xFF;
+      this.outputBits -= 8;
+      if (this.outputBits == 0 && codingLine[this.codingPos] < columns) {
+        this.codingPos++;
+        this.outputBits = (codingLine[this.codingPos] -
+                           codingLine[this.codingPos - 1]);
+      }
+    } else {
+      var bits = 8;
+      this.buf = 0;
+      do {
+        if (this.outputBits > bits) {
+          this.buf <<= bits;
+          if (!(this.codingPos & 1)) {
+            this.buf |= 0xFF >> (8 - bits);
+          }
+          this.outputBits -= bits;
+          bits = 0;
+        } else {
+          this.buf <<= this.outputBits;
+          if (!(this.codingPos & 1)) {
+            this.buf |= 0xFF >> (8 - this.outputBits);
+          }
+          bits -= this.outputBits;
+          this.outputBits = 0;
+          if (codingLine[this.codingPos] < columns) {
+            this.codingPos++;
+            this.outputBits = (codingLine[this.codingPos] -
+                               codingLine[this.codingPos - 1]);
+          } else if (bits > 0) {
+            this.buf <<= bits;
+            bits = 0;
+          }
+        }
+      } while (bits);
+    }
+    if (this.black) {
+      this.buf ^= 0xFF;
+    }
+    return this.buf;
+  };
+
+  // This functions returns the code found from the table.
+  // The start and end parameters set the boundaries for searching the table.
+  // The limit parameter is optional. Function returns an array with three
+  // values. The first array element indicates whether a valid code is being
+  // returned. The second array element is the actual code. The third array
+  // element indicates whether EOF was reached.
+  var findTableCode = function ccittFaxStreamFindTableCode(start, end, table,
+                                                           limit) {
+    var limitValue = limit || 0;
+
+    for (var i = start; i <= end; ++i) {
+      var code = this.lookBits(i);
+      if (code == EOF)
+        return [true, 1, false];
+      if (i < end)
+        code <<= end - i;
+      if (!limitValue || code >= limitValue) {
+        var p = table[code - limitValue];
+        if (p[0] == i) {
+          this.eatBits(i);
+          return [true, p[1], true];
+        }
+      }
+    }
+    return [false, 0, false];
+  };
+
+  constructor.prototype.getTwoDimCode = function ccittFaxStreamGetTwoDimCode() {
+    var code = 0;
+    var p;
+    if (this.eoblock) {
+      code = this.lookBits(7);
+      p = twoDimTable[code];
+      if (p[0] > 0) {
+        this.eatBits(p[0]);
+        return p[1];
+      }
+    } else {
+      var result = findTableCode(1, 7, twoDimTable);
+      if (result[0] && result[2])
+        return result[1];
+    }
+    warn('Bad two dim code');
+    return EOF;
+  };
+
+  constructor.prototype.getWhiteCode = function ccittFaxStreamGetWhiteCode() {
+    var code = 0;
+    var p;
+    var n;
+    if (this.eoblock) {
+      code = this.lookBits(12);
+      if (code == EOF)
+        return 1;
+
+      if ((code >> 5) == 0)
+        p = whiteTable1[code];
+      else
+        p = whiteTable2[code >> 3];
+
+      if (p[0] > 0) {
+        this.eatBits(p[0]);
+        return p[1];
+      }
+    } else {
+      var result = findTableCode(1, 9, whiteTable2);
+      if (result[0])
+        return result[1];
+
+      result = findTableCode(11, 12, whiteTable1);
+      if (result[0])
+        return result[1];
+    }
+    warn('bad white code');
+    this.eatBits(1);
+    return 1;
+  };
+
+  constructor.prototype.getBlackCode = function ccittFaxStreamGetBlackCode() {
+    var code, p;
+    if (this.eoblock) {
+      code = this.lookBits(13);
+      if (code == EOF)
+        return 1;
+      if ((code >> 7) == 0)
+        p = blackTable1[code];
+      else if ((code >> 9) == 0 && (code >> 7) != 0)
+        p = blackTable2[(code >> 1) - 64];
+      else
+        p = blackTable3[code >> 7];
+
+      if (p[0] > 0) {
+        this.eatBits(p[0]);
+        return p[1];
+      }
+    } else {
+      var result = findTableCode(2, 6, blackTable3);
+      if (result[0])
+        return result[1];
+
+      result = findTableCode(7, 12, blackTable2, 64);
+      if (result[0])
+        return result[1];
+
+      result = findTableCode(10, 13, blackTable1);
+      if (result[0])
+        return result[1];
+    }
+    warn('bad black code');
+    this.eatBits(1);
+    return 1;
+  };
+
+  constructor.prototype.lookBits = function ccittFaxStreamLookBits(n) {
+    var c;
+    while (this.inputBits < n) {
+      if ((c = this.str.getByte()) == null) {
+        if (this.inputBits == 0)
+          return EOF;
+        return ((this.inputBuf << (n - this.inputBits)) &
+                (0xFFFF >> (16 - n)));
+      }
+      this.inputBuf = (this.inputBuf << 8) + c;
+      this.inputBits += 8;
+    }
+    return (this.inputBuf >> (this.inputBits - n)) & (0xFFFF >> (16 - n));
+  };
+
+  constructor.prototype.eatBits = function ccittFaxStreamEatBits(n) {
+    if ((this.inputBits -= n) < 0)
+      this.inputBits = 0;
+  };
+
+  return constructor;
+})();
+
+var LZWStream = (function lzwStream() {
+  function constructor(str, earlyChange) {
+    this.str = str;
+    this.dict = str.dict;
+    this.cachedData = 0;
+    this.bitsCached = 0;
+
+    var maxLzwDictionarySize = 4096;
+    var lzwState = {
+      earlyChange: earlyChange,
+      codeLength: 9,
+      nextCode: 258,
+      dictionaryValues: new Uint8Array(maxLzwDictionarySize),
+      dictionaryLengths: new Uint16Array(maxLzwDictionarySize),
+      dictionaryPrevCodes: new Uint16Array(maxLzwDictionarySize),
+      currentSequence: new Uint8Array(maxLzwDictionarySize),
+      currentSequenceLength: 0
+    };
+    for (var i = 0; i < 256; ++i) {
+      lzwState.dictionaryValues[i] = i;
+      lzwState.dictionaryLengths[i] = 1;
+    }
+    this.lzwState = lzwState;
+
+    DecodeStream.call(this);
+  }
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.readBits = function lzwStreamReadBits(n) {
+    var bitsCached = this.bitsCached;
+    var cachedData = this.cachedData;
+    while (bitsCached < n) {
+      var c = this.str.getByte();
+      if (c == null) {
+        this.eof = true;
+        return null;
+      }
+      cachedData = (cachedData << 8) | c;
+      bitsCached += 8;
+    }
+    this.bitsCached = (bitsCached -= n);
+    this.cachedData = cachedData;
+    this.lastCode = null;
+    return (cachedData >>> bitsCached) & ((1 << n) - 1);
+  };
+
+  constructor.prototype.readBlock = function lzwStreamReadBlock() {
+    var blockSize = 512;
+    var estimatedDecodedSize = blockSize * 2, decodedSizeDelta = blockSize;
+    var i, j, q;
+
+    var lzwState = this.lzwState;
+    if (!lzwState)
+      return; // eof was found
+
+    var earlyChange = lzwState.earlyChange;
+    var nextCode = lzwState.nextCode;
+    var dictionaryValues = lzwState.dictionaryValues;
+    var dictionaryLengths = lzwState.dictionaryLengths;
+    var dictionaryPrevCodes = lzwState.dictionaryPrevCodes;
+    var codeLength = lzwState.codeLength;
+    var prevCode = lzwState.prevCode;
+    var currentSequence = lzwState.currentSequence;
+    var currentSequenceLength = lzwState.currentSequenceLength;
+
+    var decodedLength = 0;
+    var currentBufferLength = this.bufferLength;
+    var buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
+
+    for (i = 0; i < blockSize; i++) {
+      var code = this.readBits(codeLength);
+      var hasPrev = currentSequenceLength > 0;
+      if (code < 256) {
+        currentSequence[0] = code;
+        currentSequenceLength = 1;
+      } else if (code >= 258) {
+        if (code < nextCode) {
+          currentSequenceLength = dictionaryLengths[code];
+          for (j = currentSequenceLength - 1, q = code; j >= 0; j--) {
+            currentSequence[j] = dictionaryValues[q];
+            q = dictionaryPrevCodes[q];
+          }
+        } else {
+          currentSequence[currentSequenceLength++] = currentSequence[0];
+        }
+      } else if (code == 256) {
+        codeLength = 9;
+        nextCode = 258;
+        currentSequenceLength = 0;
+        continue;
+      } else {
+        this.eof = true;
+        delete this.lzwState;
+        break;
+      }
+
+      if (hasPrev) {
+        dictionaryPrevCodes[nextCode] = prevCode;
+        dictionaryLengths[nextCode] = dictionaryLengths[prevCode] + 1;
+        dictionaryValues[nextCode] = currentSequence[0];
+        nextCode++;
+        codeLength = (nextCode + earlyChange) & (nextCode + earlyChange - 1) ?
+          codeLength : Math.min(Math.log(nextCode + earlyChange) /
+          0.6931471805599453 + 1, 12) | 0;
+      }
+      prevCode = code;
+
+      decodedLength += currentSequenceLength;
+      if (estimatedDecodedSize < decodedLength) {
+        do {
+          estimatedDecodedSize += decodedSizeDelta;
+        } while (estimatedDecodedSize < decodedLength);
+        buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
+      }
+      for (j = 0; j < currentSequenceLength; j++)
+        buffer[currentBufferLength++] = currentSequence[j];
+    }
+    lzwState.nextCode = nextCode;
+    lzwState.codeLength = codeLength;
+    lzwState.prevCode = prevCode;
+    lzwState.currentSequenceLength = currentSequenceLength;
+
+    this.bufferLength = currentBufferLength;
+  };
+
+  return constructor;
+})();
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+function MessageHandler(name, comObj) {
+  this.name = name;
+  this.comObj = comObj;
+  var ah = this.actionHandler = {};
+
+  ah['console_log'] = [function ahConsoleLog(data) {
+      console.log.apply(console, data);
+  }];
+  ah['console_error'] = [function ahConsoleError(data) {
+      console.error.apply(console, data);
+  }];
+
+  comObj.onmessage = function messageHandlerComObjOnMessage(event) {
+    var data = event.data;
+    if (data.action in ah) {
+      var action = ah[data.action];
+      action[0].call(action[1], data.data);
+    } else {
+      throw 'Unkown action from worker: ' + data.action;
+    }
+  };
+}
+
+MessageHandler.prototype = {
+  on: function messageHandlerOn(actionName, handler, scope) {
+    var ah = this.actionHandler;
+    if (ah[actionName]) {
+      throw 'There is already an actionName called "' + actionName + '"';
+    }
+    ah[actionName] = [handler, scope];
+  },
+
+  send: function messageHandlerSend(actionName, data) {
+    this.comObj.postMessage({
+      action: actionName,
+      data: data
+    });
+  }
+};
+
+var WorkerMessageHandler = {
+  setup: function wphSetup(handler) {
+    var pdfDoc = null;
+
+    handler.on('test', function wphSetupTest(data) {
+      handler.send('test', data instanceof Uint8Array);
+    });
+
+    handler.on('workerSrc', function wphSetupWorkerSrc(data) {
+      // In development, the `workerSrc` message is handled in the
+      // `worker_loader.js` file. In production the workerProcessHandler is
+      // called for this. This servers as a dummy to prevent calling an
+      // undefined action `workerSrc`.
+    });
+
+    handler.on('doc', function wphSetupDoc(data) {
+      // Create only the model of the PDFDoc, which is enough for
+      // processing the content of the pdf.
+      pdfDoc = new PDFDocModel(new Stream(data));
+    });
+
+    handler.on('page_request', function wphSetupPageRequest(pageNum) {
+      pageNum = parseInt(pageNum);
+
+      var page = pdfDoc.getPage(pageNum);
+
+      // The following code does quite the same as
+      // Page.prototype.startRendering, but stops at one point and sends the
+      // result back to the main thread.
+      var gfx = new CanvasGraphics(null);
+
+      var start = Date.now();
+
+      var dependency = [];
+
+      // Pre compile the pdf page and fetch the fonts/images.
+      var IRQueue = page.getIRQueue(handler, dependency);
+
+      console.log('page=%d - getIRQueue: time=%dms, len=%d', pageNum,
+                                  Date.now() - start, IRQueue.fnArray.length);
+
+      // Filter the dependecies for fonts.
+      var fonts = {};
+      for (var i = 0, ii = dependency.length; i < ii; i++) {
+        var dep = dependency[i];
+        if (dep.indexOf('font_') == 0) {
+          fonts[dep] = true;
+        }
+      }
+
+      handler.send('page', {
+        pageNum: pageNum,
+        IRQueue: IRQueue,
+        depFonts: Object.keys(fonts)
+      });
+    }, this);
+
+    handler.on('font', function wphSetupFont(data) {
+      var objId = data[0];
+      var name = data[1];
+      var file = data[2];
+      var properties = data[3];
+
+      var font = {
+        name: name,
+        file: file,
+        properties: properties
+      };
+
+      // Some fonts don't have a file, e.g. the build in ones like Arial.
+      if (file) {
+        var fontFileDict = new Dict();
+        fontFileDict.map = file.dict.map;
+
+        var fontFile = new Stream(file.bytes, file.start,
+                                  file.end - file.start, fontFileDict);
+
+        // Check if this is a FlateStream. Otherwise just use the created
+        // Stream one. This makes complex_ttf_font.pdf work.
+        var cmf = file.bytes[0];
+        if ((cmf & 0x0f) == 0x08) {
+          font.file = new FlateStream(fontFile);
+        } else {
+          font.file = fontFile;
+        }
+      }
+
+      var obj = new Font(font.name, font.file, font.properties);
+
+      var str = '';
+      var objData = obj.data;
+      if (objData) {
+        var length = objData.length;
+        for (var j = 0; j < length; ++j)
+          str += String.fromCharCode(objData[j]);
+      }
+
+      obj.str = str;
+
+      // Remove the data array form the font object, as it's not needed
+      // anymore as we sent over the ready str.
+      delete obj.data;
+
+      handler.send('font_ready', [objId, obj]);
+    });
+  }
+};
+
+var consoleTimer = {};
+
+var workerConsole = {
+  log: function log() {
+    var args = Array.prototype.slice.call(arguments);
+    postMessage({
+      action: 'console_log',
+      data: args
+    });
+  },
+
+  error: function error() {
+    var args = Array.prototype.slice.call(arguments);
+    postMessage({
+      action: 'console_error',
+      data: args
+    });
+  },
+
+  time: function time(name) {
+    consoleTimer[name] = Date.now();
+  },
+
+  timeEnd: function timeEnd(name) {
+    var time = consoleTimer[name];
+    if (time == null) {
+      throw 'Unkown timer name ' + name;
+    }
+    this.log('Timer:', name, Date.now() - time);
+  }
+};
+
+// Worker thread?
+if (typeof window === 'undefined') {
+  globalScope.console = workerConsole;
+
+  var handler = new MessageHandler('worker_processor', this);
+  WorkerMessageHandler.setup(handler);
+}
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+// - The JPEG specification can be found in the ITU CCITT Recommendation T.81
+//   (www.w3.org/Graphics/JPEG/itu-t81.pdf)
+// - The JFIF specification can be found in the JPEG File Interchange Format
+//   (www.w3.org/Graphics/JPEG/jfif3.pdf)
+// - The Adobe Application-Specific JPEG markers in the Supporting the DCT Filters
+//   in PostScript Level 2, Technical Note #5116
+//   (partners.adobe.com/public/developer/en/ps/sdk/5116.DCT_Filter.pdf)
+
+var JpegImage = (function jpegImage() {
+  "use strict";
+  var dctZigZag = new Int32Array([
+     0,
+     1,  8,
+    16,  9,  2,
+     3, 10, 17, 24,
+    32, 25, 18, 11, 4,
+     5, 12, 19, 26, 33, 40,
+    48, 41, 34, 27, 20, 13,  6,
+     7, 14, 21, 28, 35, 42, 49, 56,
+    57, 50, 43, 36, 29, 22, 15,
+    23, 30, 37, 44, 51, 58,
+    59, 52, 45, 38, 31,
+    39, 46, 53, 60,
+    61, 54, 47,
+    55, 62,
+    63
+  ]);
+
+  var dctCos1  =  4017   // cos(pi/16)
+  var dctSin1  =   799   // sin(pi/16)
+  var dctCos3  =  3406   // cos(3*pi/16)
+  var dctSin3  =  2276   // sin(3*pi/16)
+  var dctCos6  =  1567   // cos(6*pi/16)
+  var dctSin6  =  3784   // sin(6*pi/16)
+  var dctSqrt2 =  5793   // sqrt(2)
+  var dctSqrt1d2 = 2896  // sqrt(2) / 2
+
+  function constructor() {
+  }
+
+  function buildHuffmanTable(codeLengths, values) {
+    var k = 0, code = [], i, j, length = 16;
+    while (length > 0 && !codeLengths[length - 1])
+      length--;
+    code.push({children: [], index: 0});
+    var p = code[0], q;
+    for (i = 0; i < length; i++) {
+      for (j = 0; j < codeLengths[i]; j++) {
+        p = code.pop();
+        p.children[p.index] = values[k];
+        while (p.index > 0) {
+          p = code.pop();
+        }
+        p.index++;
+        code.push(p);
+        while (code.length <= i) {
+          code.push(q = {children: [], index: 0});
+          p.children[p.index] = q.children;
+          p = q;
+        }
+        k++;
+      }
+      if (i + 1 < length) {
+        // p here points to last code
+        code.push(q = {children: [], index: 0});
+        p.children[p.index] = q.children;
+        p = q;
+      }
+    }
+    return code[0].children;
+  }
+
+  function decodeScan(data, offset,
+                      frame, components, resetInterval,
+                      spectralStart, spectralEnd,
+                      successivePrev, successive) {
+    var precision = frame.precision;
+    var samplesPerLine = frame.samplesPerLine;
+    var scanLines = frame.scanLines;
+    var mcusPerLine = frame.mcusPerLine;
+    var progressive = frame.progressive;
+    var maxH = frame.maxH, maxV = frame.maxV;
+
+    var startOffset = offset, bitsData = 0, bitsCount = 0;
+    function readBit() {
+      if (bitsCount > 0) {
+        bitsCount--;
+        return (bitsData >> bitsCount) & 1;
+      }
+      bitsData = data[offset++];
+      if (bitsData == 0xFF) {
+        var nextByte = data[offset++];
+        if (nextByte) {
+          throw "unexpected marker: " + ((bitsData << 8) | nextByte).toString(16);
+        }
+        // unstuff 0
+      }
+      bitsCount = 7;
+      return bitsData >>> 7;
+    }
+    function decodeHuffman(tree) {
+      var node = tree, bit;
+      while ((bit = readBit()) !== null) {
+        node = node[bit];
+        if (typeof node === 'number')
+          return node;
+        if (typeof node !== 'object')
+          throw "invalid huffman sequence";
+      }
+      return null;
+    }
+    function receive(length) {
+      var n = 0;
+      while (length > 0) {
+        var bit = readBit();
+        if (bit === null) return;
+        n = (n << 1) | bit;
+        length--;
+      }
+      return n;
+    }
+    function receiveAndExtend(length) {
+      var n = receive(length);
+      if (n >= 1 << (length - 1))
+        return n;
+      return n + (-1 << length) + 1;
+    }
+    function decodeBaseline(component, zz) {
+      var t = decodeHuffman(component.huffmanTableDC);
+      var diff = t === 0 ? 0 : receiveAndExtend(t);
+      zz[0]= (component.pred += diff);
+      var k = 1;
+      while (k < 64) {
+        var rs = decodeHuffman(component.huffmanTableAC);
+        var s = rs & 15, r = rs >> 4;
+        if (s === 0) {
+          if (r < 15)
+            break;
+          k += 16;
+          continue;
+        }
+        k += r;
+        var z = dctZigZag[k];
+        zz[z] = receiveAndExtend(s);
+        k++;
+      }
+    }
+    function decodeDCFirst(component, zz) {
+      var t = decodeHuffman(component.huffmanTableDC);
+      var diff = t === 0 ? 0 : (receiveAndExtend(t) << successive);
+      zz[0] = (component.pred += diff);
+    }
+    function decodeDCSuccessive(component, zz) {
+      zz[0] |= readBit() << successive;
+    }
+    var eobrun = 0;
+    function decodeACFirst(component, zz) {
+      if (eobrun > 0) {
+        eobrun--;
+        return;
+      }
+      var k = spectralStart, e = spectralEnd;
+      while (k <= e) {
+        var rs = decodeHuffman(component.huffmanTableAC);
+        var s = rs & 15, r = rs >> 4;
+        if (s === 0) {
+          if (r < 15) {
+            eobrun = receive(r) + (1 << r) - 1;
+            break;
+          }
+          k += 16;
+          continue;
+        }
+        k += r;
+        var z = dctZigZag[k];
+        zz[z] = receiveAndExtend(s) * (1 << successive);
+        k++;
+      }
+    }
+    var successiveACState = 0, successiveACNextValue;
+    function decodeACSuccessive(component, zz) {
+      var k = spectralStart, e = spectralEnd, r = 0;
+      while (k <= e) {
+        var z = dctZigZag[k];
+        switch (successiveACState) {
+        case 0: // initial state
+          var rs = decodeHuffman(component.huffmanTableAC);
+          var s = rs & 15, r = rs >> 4;
+          if (s === 0) {
+            if (r < 15) {
+              eobrun = receive(r) + (1 << r);
+              successiveACState = 4;
+            } else {
+              r = 16;
+              successiveACState = 1;
+            }
+          } else {
+            if (s !== 1)
+              throw "invalid ACn encoding";
+            successiveACNextValue = receiveAndExtend(s);
+            successiveACState = r ? 2 : 3;
+          }
+          continue;
+        case 1: // skipping r zero items
+        case 2:
+          if (zz[z])
+            zz[z] += (readBit() << successive);
+          else {
+            r--;
+            if (r === 0)
+              successiveACState = successiveACState == 2 ? 3 : 0;
+          }
+          break;
+        case 3: // set value for a zero item
+          if (zz[z])
+            zz[z] += (readBit() << successive);
+          else {
+            zz[z] = successiveACNextValue << successive;
+            successiveACState = 0;
+          }
+          break;
+        case 4: // eob
+          if (zz[z])
+            zz[z] += (readBit() << successive);
+          break;
+        }
+        k++;
+      }
+      if (successiveACState === 4) {
+        eobrun--;
+        if (eobrun === 0)
+          successiveACState = 0;
+      }
+    }
+    function decodeMcu(component, decode, mcu, row, col) {
+      var mcuRow = (mcu / mcusPerLine) | 0;
+      var mcuCol = mcu % mcusPerLine;
+      var blockRow = mcuRow * component.v + row;
+      var blockCol = mcuCol * component.h + col;
+      decode(component, component.blocks[blockRow][blockCol]);
+    }
+    function decodeBlock(component, decode, mcu) {
+      var blockRow = (mcu / component.blocksPerLine) | 0;
+      var blockCol = mcu % component.blocksPerLine;
+      decode(component, component.blocks[blockRow][blockCol]);
+    }
+
+    var componentsLength = components.length;
+    var component, i, j, k, n;
+    var decodeFn;
+    if (progressive) {
+      if (spectralStart === 0)
+        decodeFn = successivePrev === 0 ? decodeDCFirst : decodeDCSuccessive;
+      else
+        decodeFn = successivePrev === 0 ? decodeACFirst : decodeACSuccessive;
+    } else {
+      decodeFn = decodeBaseline;
+    }
+
+    var mcu = 0, marker;
+    var mcuExpected;
+    if (componentsLength == 1) {
+      mcuExpected = components[0].blocksPerLine * components[0].blocksPerColumn;
+    } else {
+      mcuExpected = mcusPerLine * frame.mcusPerColumn;
+    }
+    if (!resetInterval) resetInterval = mcuExpected;
+
+    var h, v;
+    while (mcu < mcuExpected) {
+      // reset interval stuff
+      for (i = 0; i < componentsLength; i++)
+        components[i].pred = 0;
+      eobrun = 0;
+
+      if (componentsLength == 1) {
+        component = components[0];
+        for (n = 0; n < resetInterval; n++) {
+          decodeBlock(component, decodeFn, mcu);
+          mcu++;
+        }
+      } else {
+        for (n = 0; n < resetInterval; n++) {
+          for (i = 0; i < componentsLength; i++) {
+            component = components[i];
+            h = component.h;
+            v = component.v;
+            for (j = 0; j < v; j++) {
+              for (k = 0; k < h; k++) {
+                decodeMcu(component, decodeFn, mcu, j, k);
+              }
+            }
+          }
+          mcu++;
+        }
+      }
+
+      // find marker
+      bitsCount = 0;
+      marker = (data[offset] << 8) | data[offset + 1];
+      if (marker <= 0xFF00) {
+        throw "marker was not found";
+      }
+
+      if (marker >= 0xFFD0 && marker <= 0xFFD7) { // RSTx
+        offset += 2;
+      }
+      else
+        break;
+    }
+
+    return offset - startOffset;
+  }
+
+  function buildComponentData(frame, component) {
+    var lines = [];
+    var blocksPerLine = component.blocksPerLine;
+    var blocksPerColumn = component.blocksPerColumn;
+    var samplesPerLine = blocksPerLine << 3;
+    var R = new Int32Array(64), r = new Uint8Array(64);
+
+    // A port of poppler's IDCT method which in turn is taken from:
+    //   Christoph Loeffler, Adriaan Ligtenberg, George S. Moschytz,
+    //   "Practical Fast 1-D DCT Algorithms with 11 Multiplications",
+    //   IEEE Intl. Conf. on Acoustics, Speech & Signal Processing, 1989,
+    //   988-991.
+    function quantizeAndInverse(zz, dataOut, dataIn) {
+      var qt = component.quantizationTable;
+      var v0, v1, v2, v3, v4, v5, v6, v7, t;
+      var p = dataIn;
+      var i;
+
+      // dequant
+      for (i = 0; i < 64; i++)
+        p[i] = zz[i] * qt[i];
+
+      // inverse DCT on rows
+      for (i = 0; i < 8; ++i) {
+        var row = 8 * i;
+
+        // check for all-zero AC coefficients
+        if (p[1 + row] == 0 && p[2 + row] == 0 && p[3 + row] == 0 &&
+            p[4 + row] == 0 && p[5 + row] == 0 && p[6 + row] == 0 &&
+            p[7 + row] == 0) {
+          t = (dctSqrt2 * p[0 + row] + 512) >> 10;
+          p[0 + row] = t;
+          p[1 + row] = t;
+          p[2 + row] = t;
+          p[3 + row] = t;
+          p[4 + row] = t;
+          p[5 + row] = t;
+          p[6 + row] = t;
+          p[7 + row] = t;
+          continue;
+        }
+
+        // stage 4
+        v0 = (dctSqrt2 * p[0 + row] + 128) >> 8;
+        v1 = (dctSqrt2 * p[4 + row] + 128) >> 8;
+        v2 = p[2 + row];
+        v3 = p[6 + row];
+        v4 = (dctSqrt1d2 * (p[1 + row] - p[7 + row]) + 128) >> 8;
+        v7 = (dctSqrt1d2 * (p[1 + row] + p[7 + row]) + 128) >> 8;
+        v5 = p[3 + row] << 4;
+        v6 = p[5 + row] << 4;
+
+        // stage 3
+        t = (v0 - v1+ 1) >> 1;
+        v0 = (v0 + v1 + 1) >> 1;
+        v1 = t;
+        t = (v2 * dctSin6 + v3 * dctCos6 + 128) >> 8;
+        v2 = (v2 * dctCos6 - v3 * dctSin6 + 128) >> 8;
+        v3 = t;
+        t = (v4 - v6 + 1) >> 1;
+        v4 = (v4 + v6 + 1) >> 1;
+        v6 = t;
+        t = (v7 + v5 + 1) >> 1;
+        v5 = (v7 - v5 + 1) >> 1;
+        v7 = t;
+
+        // stage 2
+        t = (v0 - v3 + 1) >> 1;
+        v0 = (v0 + v3 + 1) >> 1;
+        v3 = t;
+        t = (v1 - v2 + 1) >> 1;
+        v1 = (v1 + v2 + 1) >> 1;
+        v2 = t;
+        t = (v4 * dctSin3 + v7 * dctCos3 + 2048) >> 12;
+        v4 = (v4 * dctCos3 - v7 * dctSin3 + 2048) >> 12;
+        v7 = t;
+        t = (v5 * dctSin1 + v6 * dctCos1 + 2048) >> 12;
+        v5 = (v5 * dctCos1 - v6 * dctSin1 + 2048) >> 12;
+        v6 = t;
+
+        // stage 1
+        p[0 + row] = v0 + v7;
+        p[7 + row] = v0 - v7;
+        p[1 + row] = v1 + v6;
+        p[6 + row] = v1 - v6;
+        p[2 + row] = v2 + v5;
+        p[5 + row] = v2 - v5;
+        p[3 + row] = v3 + v4;
+        p[4 + row] = v3 - v4;
+      }
+
+      // inverse DCT on columns
+      for (i = 0; i < 8; ++i) {
+        var col = i;
+
+        // check for all-zero AC coefficients
+        if (p[1*8 + col] == 0 && p[2*8 + col] == 0 && p[3*8 + col] == 0 &&
+            p[4*8 + col] == 0 && p[5*8 + col] == 0 && p[6*8 + col] == 0 &&
+            p[7*8 + col] == 0) {
+          t = (dctSqrt2 * dataIn[i+0] + 8192) >> 14;
+          p[0*8 + col] = t;
+          p[1*8 + col] = t;
+          p[2*8 + col] = t;
+          p[3*8 + col] = t;
+          p[4*8 + col] = t;
+          p[5*8 + col] = t;
+          p[6*8 + col] = t;
+          p[7*8 + col] = t;
+          continue;
+        }
+
+        // stage 4
+        v0 = (dctSqrt2 * p[0*8 + col] + 2048) >> 12;
+        v1 = (dctSqrt2 * p[4*8 + col] + 2048) >> 12;
+        v2 = p[2*8 + col];
+        v3 = p[6*8 + col];
+        v4 = (dctSqrt1d2 * (p[1*8 + col] - p[7*8 + col]) + 2048) >> 12;
+        v7 = (dctSqrt1d2 * (p[1*8 + col] + p[7*8 + col]) + 2048) >> 12;
+        v5 = p[3*8 + col];
+        v6 = p[5*8 + col];
+
+        // stage 3
+        t = (v0 - v1 + 1) >> 1;
+        v0 = (v0 + v1 + 1) >> 1;
+        v1 = t;
+        t = (v2 * dctSin6 + v3 * dctCos6 + 2048) >> 12;
+        v2 = (v2 * dctCos6 - v3 * dctSin6 + 2048) >> 12;
+        v3 = t;
+        t = (v4 - v6 + 1) >> 1;
+        v4 = (v4 + v6 + 1) >> 1;
+        v6 = t;
+        t = (v7 + v5 + 1) >> 1;
+        v5 = (v7 - v5 + 1) >> 1;
+        v7 = t;
+
+        // stage 2
+        t = (v0 - v3 + 1) >> 1;
+        v0 = (v0 + v3 + 1) >> 1;
+        v3 = t;
+        t = (v1 - v2 + 1) >> 1;
+        v1 = (v1 + v2 + 1) >> 1;
+        v2 = t;
+        t = (v4 * dctSin3 + v7 * dctCos3 + 2048) >> 12;
+        v4 = (v4 * dctCos3 - v7 * dctSin3 + 2048) >> 12;
+        v7 = t;
+        t = (v5 * dctSin1 + v6 * dctCos1 + 2048) >> 12;
+        v5 = (v5 * dctCos1 - v6 * dctSin1 + 2048) >> 12;
+        v6 = t;
+
+        // stage 1
+        p[0*8 + col] = v0 + v7;
+        p[7*8 + col] = v0 - v7;
+        p[1*8 + col] = v1 + v6;
+        p[6*8 + col] = v1 - v6;
+        p[2*8 + col] = v2 + v5;
+        p[5*8 + col] = v2 - v5;
+        p[3*8 + col] = v3 + v4;
+        p[4*8 + col] = v3 - v4;
+      }
+
+      // convert to 8-bit integers
+      for (i = 0; i < 64; ++i) {
+        var sample = 128 + ((p[i] + 8) >> 4);
+        dataOut[i] = sample < 0 ? 0 : sample > 0xFF ? 0xFF : sample;
+      }
+    }
+
+    var i, j;
+    for (var blockRow = 0; blockRow < blocksPerColumn; blockRow++) {
+      var scanLine = blockRow << 3;
+      for (i = 0; i < 8; i++)
+        lines.push(new Uint8Array(samplesPerLine));
+      for (var blockCol = 0; blockCol < blocksPerLine; blockCol++) {
+        quantizeAndInverse(component.blocks[blockRow][blockCol], r, R);
+
+        var offset = 0, sample = blockCol << 3;
+        for (j = 0; j < 8; j++) {
+          var line = lines[scanLine + j];
+          for (i = 0; i < 8; i++)
+            line[sample + i] = r[offset++];
+        }
+      }
+    }
+    return lines;
+  }
+
+  constructor.prototype = {
+    load: function load(path) {
+      var xhr = new XMLHttpRequest();
+      xhr.open("GET", path, true);
+      xhr.responseType = "arraybuffer";
+      xhr.onload = (function() {
+        // TODO catch parse error
+        var data = new Uint8Array(xhr.response || xhr.mozResponseArrayBuffer);
+        this.parse(data);
+        if (this.onload)
+          this.onload();
+      }).bind(this);
+      xhr.send(null);
+    },
+    parse: function parse(data) {
+      var offset = 0, length = data.length;
+      function readUint16() {
+        var value = (data[offset] << 8) | data[offset + 1];
+        offset += 2;
+        return value;
+      }
+      function readDataBlock() {
+        var length = readUint16();
+        var array = data.subarray(offset, offset + length - 2);
+        offset += array.length;
+        return array;
+      }
+      function prepareComponents(frame) {
+        var maxH = 0, maxV = 0;
+        var component, componentId;
+        for (componentId in frame.components) {
+          if (frame.components.hasOwnProperty(componentId)) {
+            component = frame.components[componentId];
+            if (maxH < component.h) maxH = component.h;
+            if (maxV < component.v) maxV = component.v;
+          }
+        }
+        var mcusPerLine = Math.ceil(frame.samplesPerLine / 8 / maxH);
+        var mcusPerColumn = Math.ceil(frame.scanLines / 8 / maxV);
+        for (componentId in frame.components) {
+          if (frame.components.hasOwnProperty(componentId)) {
+            component = frame.components[componentId];
+            var blocksPerLine = Math.ceil(Math.ceil(frame.samplesPerLine / 8) * component.h / maxH);
+            var blocksPerColumn = Math.ceil(Math.ceil(frame.scanLines  / 8) * component.v / maxV);
+            var blocksPerLineForMcu = mcusPerLine * component.h;
+            var blocksPerColumnForMcu = mcusPerColumn * component.v;
+            var blocks = [];
+            for (var i = 0; i < blocksPerColumnForMcu; i++) {
+              var row = [];
+              for (var j = 0; j < blocksPerLineForMcu; j++)
+                row.push(new Int32Array(64));
+              blocks.push(row);
+            }
+            component.blocksPerLine = blocksPerLine;
+            component.blocksPerColumn = blocksPerColumn;
+            component.blocks = blocks;
+          }
+        }
+        frame.maxH = maxH;
+        frame.maxV = maxV;
+        frame.mcusPerLine = mcusPerLine;
+        frame.mcusPerColumn = mcusPerColumn;
+      }
+      var jfif = null;
+      var adobe = null;
+      var pixels = null;
+      var frame, resetInterval;
+      var quantizationTables = [], frames = [];
+      var huffmanTablesAC = [], huffmanTablesDC = [];
+      var fileMarker = readUint16();
+      if (fileMarker != 0xFFD8) { // SOI (Start of Image)
+        throw "SOI not found";
+      }
+
+      fileMarker = readUint16();
+      while (fileMarker != 0xFFD9) { // EOI (End of image)
+        var i, j, l;
+        switch(fileMarker) {
+          case 0xFFE0: // APP0 (Application Specific)
+          case 0xFFE1: // APP1
+          case 0xFFE2: // APP2
+          case 0xFFE3: // APP3
+          case 0xFFE4: // APP4
+          case 0xFFE5: // APP5
+          case 0xFFE6: // APP6
+          case 0xFFE7: // APP7
+          case 0xFFE8: // APP8
+          case 0xFFE9: // APP9
+          case 0xFFEA: // APP10
+          case 0xFFEB: // APP11
+          case 0xFFEC: // APP12
+          case 0xFFED: // APP13
+          case 0xFFEE: // APP14
+          case 0xFFEF: // APP15
+          case 0xFFFE: // COM (Comment)
+            var appData = readDataBlock();
+
+            if (fileMarker === 0xFFE0) {
+              if (appData[0] === 0x4A && appData[1] === 0x46 && appData[2] === 0x49 &&
+                appData[3] === 0x46 && appData[4] === 0) { // 'JFIF\x00'
+                jfif = {
+                  version: { major: appData[5], minor: appData[6] },
+                  densityUnits: appData[7],
+                  xDensity: (appData[8] << 8) | appData[9],
+                  yDensity: (appData[10] << 8) | appData[11],
+                  thumbWidth: appData[12],
+                  thumbHeight: appData[13],
+                  thumbData: appData.subarray(14, 14 + 3 * appData[12] * appData[13])
+                };
+              }
+            }
+            // TODO APP1 - Exif
+            if (fileMarker === 0xFFEE) {
+              if (appData[0] === 0x41 && appData[1] === 0x64 && appData[2] === 0x6F &&
+                appData[3] === 0x62 && appData[4] === 0x65 && appData[5] === 0) { // 'Adobe\x00'
+                adobe = {
+                  version: appData[6],
+                  flags0: (appData[7] << 8) | appData[8],
+                  flags1: (appData[9] << 8) | appData[10],
+                  transformCode: appData[11]
+                };
+              }
+            }
+            break;
+
+          case 0xFFDB: // DQT (Define Quantization Tables)
+            var quantizationTableCount = Math.floor((readUint16() - 2) / 65);
+            for (i = 0; i < quantizationTableCount; i++) {
+              var quantizationTableSpec = data[offset++];
+              var tableData = new Int32Array(64);
+              if ((quantizationTableSpec >> 4) === 0) { // 8 bit values
+                for (j = 0; j < 64; j++) {
+                  var z = dctZigZag[j];
+                  tableData[z] = data[offset++];
+                }
+              } else if ((quantizationTableSpec >> 4) === 1) { //16 bit
+                  tableData[j] = readUint16();
+              } else
+                throw "DQT: invalid table spec";
+              quantizationTables[quantizationTableSpec & 15] = tableData;
+            }
+            break;
+
+          case 0xFFC0: // SOF0 (Start of Frame, Baseline DCT)
+          case 0xFFC2: // SOF2 (Start of Frame, Progressive DCT)
+            readUint16(); // skip data length
+            frame = {};
+            frame.progressive = (fileMarker === 0xFFC2);
+            frame.precision = data[offset++];
+            frame.scanLines = readUint16();
+            frame.samplesPerLine = readUint16();
+            frame.components = [];
+            var componentsCount = data[offset++], componentId;
+            var maxH = 0, maxV = 0;
+            for (i = 0; i < componentsCount; i++) {
+              componentId = data[offset];
+              var h = data[offset + 1] >> 4;
+              var v = data[offset + 1] & 15;
+              var qId = data[offset + 2];
+              frame.components[componentId] = {
+                h: h,
+                v: v,
+                quantizationTable: quantizationTables[qId]
+              };
+              offset += 3;
+            }
+            prepareComponents(frame);
+            frames.push(frame);
+            break;
+
+          case 0xFFC4: // DHT (Define Huffman Tables)
+            var huffmanLength = readUint16();
+            for (i = 2; i < huffmanLength;) {
+              var huffmanTableSpec = data[offset++];
+              var codeLengths = new Uint8Array(16);
+              var codeLengthSum = 0;
+              for (j = 0; j < 16; j++, offset++)
+                codeLengthSum += (codeLengths[j] = data[offset]);
+              var huffmanValues = new Uint8Array(codeLengthSum);
+              for (j = 0; j < codeLengthSum; j++, offset++)
+                huffmanValues[j] = data[offset];
+              i += 17 + codeLengthSum;
+
+              ((huffmanTableSpec >> 4) === 0 ? 
+                huffmanTablesDC : huffmanTablesAC)[huffmanTableSpec & 15] =
+                buildHuffmanTable(codeLengths, huffmanValues);
+            }
+            break;
+
+          case 0xFFDD: // DRI (Define Restart Interval)
+            readUint16(); // skip data length
+            resetInterval = readUint16();
+            break;
+
+          case 0xFFDA: // SOS (Start of Scan)
+            var scanLength = readUint16();
+            var selectorsCount = data[offset++];
+            var components = [], component;
+            for (i = 0; i < selectorsCount; i++) {
+              component = frame.components[data[offset++]];
+              var tableSpec = data[offset++];
+              component.huffmanTableDC = huffmanTablesDC[tableSpec >> 4];
+              component.huffmanTableAC = huffmanTablesAC[tableSpec & 15];
+              components.push(component);
+            }
+            var spectralStart = data[offset++];
+            var spectralEnd = data[offset++];
+            var successiveApproximation = data[offset++];
+            var processed = decodeScan(data, offset,
+              frame, components, resetInterval,
+              spectralStart, spectralEnd,
+              successiveApproximation >> 4, successiveApproximation & 15);
+            offset += processed;
+            break;
+          default:
+            throw "unknown JPEG marker " + fileMarker.toString(16);
+        }
+        fileMarker = readUint16();
+      }
+      if (frames.length != 1)
+        throw "only single frame JPEGs supported";
+
+      this.width = frame.samplesPerLine;
+      this.height = frame.scanLines;
+      this.jfif = jfif;
+      this.adobe = adobe;
+      this.components = [];
+      for (var id in frame.components) {
+        if (frame.components.hasOwnProperty(id)) {
+          this.components.push({
+            lines: buildComponentData(frame, frame.components[id]),
+            scaleX: frame.components[id].h / frame.maxH,
+            scaleY: frame.components[id].v / frame.maxV
+          });
+        }
+      }
+    },
+    getData: function getData(width, height) {
+      function clampTo8bit(a) {
+        return a < 0 ? 0 : a > 255 ? 255 : a;
+      }
+      var scaleX = this.width / width, scaleY = this.height / height;
+
+      var component1, component2, component3, component4;
+      var component1Line, component2Line, component3Line, component4Line;
+      var x, y;
+      var offset = 0;
+      var Y, Cb, Cr, K, C, M, Ye, R, G, B;
+      var colorTransform;
+      var dataLength = width * height * this.components.length;
+      var data = new Uint8Array(dataLength);
+      switch (this.components.length) {
+        case 1:
+          component1 = this.components[0];
+          for (y = 0; y < height; y++) {
+            component1Line = component1.lines[0 | (y * component1.scaleY * scaleY)];
+            for (x = 0; x < width; x++) {
+              Y = component1Line[0 | (x * component1.scaleX * scaleX)];
+
+              data[offset++] = Y;
+            }
+          }
+          break;
+        case 3:
+          // The default transform for three components is true
+          colorTransform = true;
+          // The adobe transform marker overrides any previous setting
+          if (this.adobe && this.adobe.transformCode)
+            colorTransform = true;
+          else if (typeof this.colorTransform !== 'undefined')
+            colorTransform = !!this.colorTransform;
+
+          component1 = this.components[0];
+          component2 = this.components[1];
+          component3 = this.components[2];
+          for (y = 0; y < height; y++) {
+            component1Line = component1.lines[0 | (y * component1.scaleY * scaleY)];
+            component2Line = component2.lines[0 | (y * component2.scaleY * scaleY)];
+            component3Line = component3.lines[0 | (y * component3.scaleY * scaleY)];
+            for (x = 0; x < width; x++) {
+              if (!colorTransform) {
+                R = component1Line[0 | (x * component1.scaleX * scaleX)];
+                G = component2Line[0 | (x * component2.scaleX * scaleX)];
+                B = component3Line[0 | (x * component3.scaleX * scaleX)];
+              } else {
+                Y = component1Line[0 | (x * component1.scaleX * scaleX)];
+                Cb = component2Line[0 | (x * component2.scaleX * scaleX)];
+                Cr = component3Line[0 | (x * component3.scaleX * scaleX)];
+
+                R = clampTo8bit(Y + 1.402 * (Cr - 128));
+                G = clampTo8bit(Y - 0.3441363 * (Cb - 128) - 0.71413636 * (Cr - 128));
+                B = clampTo8bit(Y + 1.772 * (Cb - 128));
+              }
+
+              data[offset++] = R;
+              data[offset++] = G;
+              data[offset++] = B;
+            }
+          }
+          break;
+        case 4:
+          if (!this.adobe)
+            throw 'Unsupported color mode (4 components)';
+          // The default transform for four components is false
+          colorTransform = false;
+          // The adobe transform marker overrides any previous setting
+          if (this.adobe && this.adobe.transformCode)
+            colorTransform = true;
+          else if (typeof this.colorTransform !== 'undefined')
+            colorTransform = !!this.colorTransform;
+
+          component1 = this.components[0];
+          component2 = this.components[1];
+          component3 = this.components[2];
+          component4 = this.components[3];
+          for (y = 0; y < height; y++) {
+            component1Line = component1.lines[0 | (y * component1.scaleY * scaleY)];
+            component2Line = component2.lines[0 | (y * component2.scaleY * scaleY)];
+            component3Line = component3.lines[0 | (y * component3.scaleY * scaleY)];
+            component4Line = component4.lines[0 | (y * component4.scaleY * scaleY)];
+            for (x = 0; x < width; x++) {
+              if (!colorTransform) {
+                C = component1Line[0 | (x * component1.scaleX * scaleX)];
+                M = component2Line[0 | (x * component2.scaleX * scaleX)];
+                Ye = component3Line[0 | (x * component3.scaleX * scaleX)];
+                K = component4Line[0 | (x * component4.scaleX * scaleX)];
+              } else {
+                Y = component1Line[0 | (x * component1.scaleX * scaleX)];
+                Cb = component2Line[0 | (x * component2.scaleX * scaleX)];
+                Cr = component3Line[0 | (x * component3.scaleX * scaleX)];
+                K = component4Line[0 | (x * component4.scaleX * scaleX)];
+
+                C = 255 - clampTo8bit(Y + 1.402 * (Cr - 128));
+                M = 255 - clampTo8bit(Y - 0.3441363 * (Cb - 128) - 0.71413636 * (Cr - 128));
+                Ye = 255 - clampTo8bit(Y + 1.772 * (Cb - 128));
+              }
+              data[offset++] = C;
+              data[offset++] = M;
+              data[offset++] = Ye;
+              data[offset++] = K;
+            }
+          }
+          break;
+        default:
+          throw 'Unsupported color mode';
+      }
+      return data;
+    },
+    copyToImageData: function copyToImageData(imageData) {
+      var width = imageData.width, height = imageData.height;
+      var imageDataArray = imageData.data;
+      var data = this.getData(width, height);
+      var i = 0, j = 0, x, y;
+      var Y, K, C, M, R, G, B;
+      switch (this.components.length) {
+        case 1:
+          for (y = 0; y < height; y++) {
+            for (x = 0; x < width; x++) {
+              Y = data[i++];
+
+              imageDataArray[j++] = Y;
+              imageDataArray[j++] = Y;
+              imageDataArray[j++] = Y;
+              imageDataArray[j++] = 255;
+            }
+          }
+          break;
+        case 3:
+          for (y = 0; y < height; y++) {
+            for (x = 0; x < width; x++) {
+              R = data[i++];
+              G = data[i++];
+              B = data[i++];
+
+              imageDataArray[j++] = R;
+              imageDataArray[j++] = G;
+              imageDataArray[j++] = B;
+              imageDataArray[j++] = 255;
+            }
+          }
+          break;
+        case 4:
+          for (y = 0; y < height; y++) {
+            for (x = 0; x < width; x++) {
+              C = data[i++];
+              M = data[i++];
+              Y = data[i++];
+              K = data[i++];
+
+              R = 255 - clampTo8bit(C * (1 - K / 255) + K);
+              G = 255 - clampTo8bit(M * (1 - K / 255) + K);
+              B = 255 - clampTo8bit(Y * (1 - K / 255) + K);
+
+              imageDataArray[j++] = R;
+              imageDataArray[j++] = G;
+              imageDataArray[j++] = B;
+              imageDataArray[j++] = 255;
+            }
+          }
+          break;
+        default:
+          throw 'Unsupported color mode';
+      }
+    }
+  };
+
+  return constructor;
+})();
+}).call((typeof window === 'undefined') ? this : window);
diff --git a/apps/files_pdfviewer/js/pdfjs/src/canvas.js b/apps/files_pdfviewer/js/pdfjs/src/canvas.js
new file mode 100755
index 00000000000..9b3ed0ba9ad
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/canvas.js
@@ -0,0 +1,869 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+// <canvas> contexts store most of the state we need natively.
+// However, PDF needs a bit more state, which we store here.
+
+var CanvasExtraState = (function canvasExtraState() {
+  function constructor(old) {
+    // Are soft masks and alpha values shapes or opacities?
+    this.alphaIsShape = false;
+    this.fontSize = 0;
+    this.textMatrix = IDENTITY_MATRIX;
+    this.leading = 0;
+    // Current point (in user coordinates)
+    this.x = 0;
+    this.y = 0;
+    // Start of text line (in text coordinates)
+    this.lineX = 0;
+    this.lineY = 0;
+    // Character and word spacing
+    this.charSpacing = 0;
+    this.wordSpacing = 0;
+    this.textHScale = 1;
+    // Color spaces
+    this.fillColorSpace = new DeviceGrayCS();
+    this.fillColorSpaceObj = null;
+    this.strokeColorSpace = new DeviceGrayCS();
+    this.strokeColorSpaceObj = null;
+    this.fillColorObj = null;
+    this.strokeColorObj = null;
+    // Default fore and background colors
+    this.fillColor = '#000000';
+    this.strokeColor = '#000000';
+    // Note: fill alpha applies to all non-stroking operations
+    this.fillAlpha = 1;
+    this.strokeAlpha = 1;
+
+    this.old = old;
+  }
+
+  constructor.prototype = {
+    clone: function canvasextra_clone() {
+      return Object.create(this);
+    },
+    setCurrentPoint: function canvasextra_setCurrentPoint(x, y) {
+      this.x = x;
+      this.y = y;
+    }
+  };
+  return constructor;
+})();
+
+function ScratchCanvas(width, height) {
+  var canvas = document.createElement('canvas');
+  canvas.width = width;
+  canvas.height = height;
+  return canvas;
+}
+
+var CanvasGraphics = (function canvasGraphics() {
+  // Defines the time the executeIRQueue is going to be executing
+  // before it stops and shedules a continue of execution.
+  var kExecutionTime = 50;
+
+  // Number of IR commands to execute before checking
+  // if we execute longer then `kExecutionTime`.
+  var kExecutionTimeCheck = 500;
+
+  function constructor(canvasCtx, objs) {
+    this.ctx = canvasCtx;
+    this.current = new CanvasExtraState();
+    this.stateStack = [];
+    this.pendingClip = null;
+    this.res = null;
+    this.xobjs = null;
+    this.ScratchCanvas = ScratchCanvas;
+    this.objs = objs;
+  }
+
+  var LINE_CAP_STYLES = ['butt', 'round', 'square'];
+  var LINE_JOIN_STYLES = ['miter', 'round', 'bevel'];
+  var NORMAL_CLIP = {};
+  var EO_CLIP = {};
+
+  constructor.prototype = {
+    beginDrawing: function canvasGraphicsBeginDrawing(mediaBox) {
+      var cw = this.ctx.canvas.width, ch = this.ctx.canvas.height;
+      this.ctx.save();
+      switch (mediaBox.rotate) {
+        case 0:
+          this.ctx.transform(1, 0, 0, -1, 0, ch);
+          break;
+        case 90:
+          this.ctx.transform(0, 1, 1, 0, 0, 0);
+          break;
+        case 180:
+          this.ctx.transform(-1, 0, 0, 1, cw, 0);
+          break;
+        case 270:
+          this.ctx.transform(0, -1, -1, 0, cw, ch);
+          break;
+      }
+      this.ctx.scale(cw / mediaBox.width, ch / mediaBox.height);
+    },
+
+    executeIRQueue: function canvasGraphicsExecuteIRQueue(codeIR,
+                                  executionStartIdx, continueCallback) {
+      var argsArray = codeIR.argsArray;
+      var fnArray = codeIR.fnArray;
+      var i = executionStartIdx || 0;
+      var argsArrayLen = argsArray.length;
+
+      var executionEndIdx;
+      var startTime = Date.now();
+
+      var objs = this.objs;
+
+      do {
+        executionEndIdx = Math.min(argsArrayLen, i + kExecutionTimeCheck);
+
+        for (i; i < executionEndIdx; i++) {
+          if (fnArray[i] !== 'dependency') {
+            this[fnArray[i]].apply(this, argsArray[i]);
+          } else {
+            var deps = argsArray[i];
+            for (var n = 0, nn = deps.length; n < nn; n++) {
+              var depObjId = deps[n];
+
+              // If the promise isn't resolved yet, add the continueCallback
+              // to the promise and bail out.
+              if (!objs.isResolved(depObjId)) {
+                objs.get(depObjId, continueCallback);
+                return i;
+              }
+            }
+          }
+        }
+
+        // If the entire IRQueue was executed, stop as were done.
+        if (i == argsArrayLen) {
+          return i;
+        }
+
+        // If the execution took longer then a certain amount of time, shedule
+        // to continue exeution after a short delay.
+        // However, this is only possible if a 'continueCallback' is passed in.
+        if (continueCallback && (Date.now() - startTime) > kExecutionTime) {
+          setTimeout(continueCallback, 0);
+          return i;
+        }
+
+        // If the IRQueue isn't executed completly yet OR the execution time
+        // was short enough, do another execution round.
+      } while (true);
+    },
+
+    endDrawing: function canvasGraphicsEndDrawing() {
+      this.ctx.restore();
+    },
+
+    // Graphics state
+    setLineWidth: function canvasGraphicsSetLineWidth(width) {
+      this.ctx.lineWidth = width;
+    },
+    setLineCap: function canvasGraphicsSetLineCap(style) {
+      this.ctx.lineCap = LINE_CAP_STYLES[style];
+    },
+    setLineJoin: function canvasGraphicsSetLineJoin(style) {
+      this.ctx.lineJoin = LINE_JOIN_STYLES[style];
+    },
+    setMiterLimit: function canvasGraphicsSetMiterLimit(limit) {
+      this.ctx.miterLimit = limit;
+    },
+    setDash: function canvasGraphicsSetDash(dashArray, dashPhase) {
+      this.ctx.mozDash = dashArray;
+      this.ctx.mozDashOffset = dashPhase;
+    },
+    setRenderingIntent: function canvasGraphicsSetRenderingIntent(intent) {
+      TODO('set rendering intent: ' + intent);
+    },
+    setFlatness: function canvasGraphicsSetFlatness(flatness) {
+      TODO('set flatness: ' + flatness);
+    },
+    setGState: function canvasGraphicsSetGState(states) {
+      for (var i = 0, ii = states.length; i < ii; i++) {
+        var state = states[i];
+        var key = state[0];
+        var value = state[1];
+
+        switch (key) {
+          case 'LW':
+            this.setLineWidth(value);
+            break;
+          case 'LC':
+            this.setLineCap(value);
+            break;
+          case 'LJ':
+            this.setLineJoin(value);
+            break;
+          case 'ML':
+            this.setMiterLimit(value);
+            break;
+          case 'D':
+            this.setDash(value[0], value[1]);
+            break;
+          case 'RI':
+            this.setRenderingIntent(value);
+            break;
+          case 'FL':
+            this.setFlatness(value);
+            break;
+          case 'Font':
+            this.setFont(state[1], state[2]);
+            break;
+          case 'CA':
+            this.current.strokeAlpha = state[1];
+            break;
+          case 'ca':
+            this.current.fillAlpha = state[1];
+            this.ctx.globalAlpha = state[1];
+            break;
+        }
+      }
+    },
+    save: function canvasGraphicsSave() {
+      this.ctx.save();
+      var old = this.current;
+      this.stateStack.push(old);
+      this.current = old.clone();
+    },
+    restore: function canvasGraphicsRestore() {
+      var prev = this.stateStack.pop();
+      if (prev) {
+        this.current = prev;
+        this.ctx.restore();
+      }
+    },
+    transform: function canvasGraphicsTransform(a, b, c, d, e, f) {
+      this.ctx.transform(a, b, c, d, e, f);
+    },
+
+    // Path
+    moveTo: function canvasGraphicsMoveTo(x, y) {
+      this.ctx.moveTo(x, y);
+      this.current.setCurrentPoint(x, y);
+    },
+    lineTo: function canvasGraphicsLineTo(x, y) {
+      this.ctx.lineTo(x, y);
+      this.current.setCurrentPoint(x, y);
+    },
+    curveTo: function canvasGraphicsCurveTo(x1, y1, x2, y2, x3, y3) {
+      this.ctx.bezierCurveTo(x1, y1, x2, y2, x3, y3);
+      this.current.setCurrentPoint(x3, y3);
+    },
+    curveTo2: function canvasGraphicsCurveTo2(x2, y2, x3, y3) {
+      var current = this.current;
+      this.ctx.bezierCurveTo(current.x, current.y, x2, y2, x3, y3);
+      current.setCurrentPoint(x3, y3);
+    },
+    curveTo3: function canvasGraphicsCurveTo3(x1, y1, x3, y3) {
+      this.curveTo(x1, y1, x3, y3, x3, y3);
+      this.current.setCurrentPoint(x3, y3);
+    },
+    closePath: function canvasGraphicsClosePath() {
+      this.ctx.closePath();
+    },
+    rectangle: function canvasGraphicsRectangle(x, y, width, height) {
+      this.ctx.rect(x, y, width, height);
+    },
+    stroke: function canvasGraphicsStroke(consumePath) {
+      consumePath = typeof consumePath !== 'undefined' ? consumePath : true;
+      var ctx = this.ctx;
+      var strokeColor = this.current.strokeColor;
+      // For stroke we want to temporarily change the global alpha to the
+      // stroking alpha.
+      ctx.globalAlpha = this.current.strokeAlpha;
+      if (strokeColor && strokeColor.hasOwnProperty('type') &&
+          strokeColor.type === 'Pattern') {
+        // for patterns, we transform to pattern space, calculate
+        // the pattern, call stroke, and restore to user space
+        ctx.save();
+        ctx.strokeStyle = strokeColor.getPattern(ctx);
+        ctx.stroke();
+        ctx.restore();
+      } else {
+        ctx.stroke();
+      }
+      if (consumePath)
+        this.consumePath();
+      // Restore the global alpha to the fill alpha
+      ctx.globalAlpha = this.current.fillAlpha;
+    },
+    closeStroke: function canvasGraphicsCloseStroke() {
+      this.closePath();
+      this.stroke();
+    },
+    fill: function canvasGraphicsFill(consumePath) {
+      consumePath = typeof consumePath !== 'undefined' ? consumePath : true;
+      var ctx = this.ctx;
+      var fillColor = this.current.fillColor;
+
+      if (fillColor && fillColor.hasOwnProperty('type') &&
+          fillColor.type === 'Pattern') {
+        ctx.save();
+        ctx.fillStyle = fillColor.getPattern(ctx);
+        ctx.fill();
+        ctx.restore();
+      } else {
+        ctx.fill();
+      }
+      if (consumePath)
+        this.consumePath();
+    },
+    eoFill: function canvasGraphicsEoFill() {
+      var savedFillRule = this.setEOFillRule();
+      this.fill();
+      this.restoreFillRule(savedFillRule);
+    },
+    fillStroke: function canvasGraphicsFillStroke() {
+      this.fill(false);
+      this.stroke(false);
+
+      this.consumePath();
+    },
+    eoFillStroke: function canvasGraphicsEoFillStroke() {
+      var savedFillRule = this.setEOFillRule();
+      this.fillStroke();
+      this.restoreFillRule(savedFillRule);
+    },
+    closeFillStroke: function canvasGraphicsCloseFillStroke() {
+      this.closePath();
+      this.fillStroke();
+    },
+    closeEOFillStroke: function canvasGraphicsCloseEOFillStroke() {
+      var savedFillRule = this.setEOFillRule();
+      this.closePath();
+      this.fillStroke();
+      this.restoreFillRule(savedFillRule);
+    },
+    endPath: function canvasGraphicsEndPath() {
+      this.consumePath();
+    },
+
+    // Clipping
+    clip: function canvasGraphicsClip() {
+      this.pendingClip = NORMAL_CLIP;
+    },
+    eoClip: function canvasGraphicsEoClip() {
+      this.pendingClip = EO_CLIP;
+    },
+
+    // Text
+    beginText: function canvasGraphicsBeginText() {
+      this.current.textMatrix = IDENTITY_MATRIX;
+      this.current.x = this.current.lineX = 0;
+      this.current.y = this.current.lineY = 0;
+    },
+    endText: function canvasGraphicsEndText() {
+    },
+    setCharSpacing: function canvasGraphicsSetCharSpacing(spacing) {
+      this.current.charSpacing = spacing;
+    },
+    setWordSpacing: function canvasGraphicsSetWordSpacing(spacing) {
+      this.current.wordSpacing = spacing;
+    },
+    setHScale: function canvasGraphicsSetHScale(scale) {
+      this.current.textHScale = scale / 100;
+    },
+    setLeading: function canvasGraphicsSetLeading(leading) {
+      this.current.leading = -leading;
+    },
+    setFont: function canvasGraphicsSetFont(fontRefName, size) {
+      var fontObj = this.objs.get(fontRefName).fontObj;
+
+      if (!fontObj) {
+        throw 'Can\'t find font for ' + fontRefName;
+      }
+
+      var name = fontObj.loadedName || 'sans-serif';
+
+      this.current.font = fontObj;
+      this.current.fontSize = size;
+
+      var name = fontObj.loadedName || 'sans-serif';
+      var bold = fontObj.black ? (fontObj.bold ? 'bolder' : 'bold') :
+                                 (fontObj.bold ? 'bold' : 'normal');
+
+      var italic = fontObj.italic ? 'italic' : 'normal';
+      var serif = fontObj.serif ? 'serif' : 'sans-serif';
+      var typeface = '"' + name + '", ' + serif;
+      var rule = italic + ' ' + bold + ' ' + size + 'px ' + typeface;
+      this.ctx.font = rule;
+    },
+    setTextRenderingMode: function canvasGraphicsSetTextRenderingMode(mode) {
+      TODO('text rendering mode: ' + mode);
+    },
+    setTextRise: function canvasGraphicsSetTextRise(rise) {
+      TODO('text rise: ' + rise);
+    },
+    moveText: function canvasGraphicsMoveText(x, y) {
+      this.current.x = this.current.lineX += x;
+      this.current.y = this.current.lineY += y;
+    },
+    setLeadingMoveText: function canvasGraphicsSetLeadingMoveText(x, y) {
+      this.setLeading(-y);
+      this.moveText(x, y);
+    },
+    setTextMatrix: function canvasGraphicsSetTextMatrix(a, b, c, d, e, f) {
+      this.current.textMatrix = [a, b, c, d, e, f];
+
+      this.current.x = this.current.lineX = 0;
+      this.current.y = this.current.lineY = 0;
+    },
+    nextLine: function canvasGraphicsNextLine() {
+      this.moveText(0, this.current.leading);
+    },
+    showText: function canvasGraphicsShowText(text) {
+      var ctx = this.ctx;
+      var current = this.current;
+      var font = current.font;
+      var glyphs = font.charsToGlyphs(text);
+      var fontSize = current.fontSize;
+      var charSpacing = current.charSpacing;
+      var wordSpacing = current.wordSpacing;
+      var textHScale = current.textHScale;
+      var glyphsLength = glyphs.length;
+      if (font.coded) {
+        ctx.save();
+        ctx.transform.apply(ctx, current.textMatrix);
+        ctx.translate(current.x, current.y);
+
+        var fontMatrix = font.fontMatrix || IDENTITY_MATRIX;
+        ctx.scale(1 / textHScale, 1);
+        for (var i = 0; i < glyphsLength; ++i) {
+
+          var glyph = glyphs[i];
+          if (glyph === null) {
+            // word break
+            this.ctx.translate(wordSpacing, 0);
+            continue;
+          }
+
+          this.save();
+          ctx.scale(fontSize, fontSize);
+          ctx.transform.apply(ctx, fontMatrix);
+          this.executeIRQueue(glyph.codeIRQueue);
+          this.restore();
+
+          var transformed = Util.applyTransform([glyph.width, 0], fontMatrix);
+          var width = transformed[0] * fontSize + charSpacing;
+
+          ctx.translate(width, 0);
+          current.x += width;
+
+        }
+        ctx.restore();
+      } else {
+        ctx.save();
+        ctx.transform.apply(ctx, current.textMatrix);
+        ctx.scale(1, -1);
+        ctx.translate(current.x, -1 * current.y);
+        ctx.transform.apply(ctx, font.fontMatrix || IDENTITY_MATRIX);
+
+        ctx.scale(1 / textHScale, 1);
+
+        var width = 0;
+        for (var i = 0; i < glyphsLength; ++i) {
+          var glyph = glyphs[i];
+          if (glyph === null) {
+            // word break
+            width += wordSpacing;
+            continue;
+          }
+
+          var unicode = glyph.unicode;
+          var char = (unicode >= 0x10000) ?
+            String.fromCharCode(0xD800 | ((unicode - 0x10000) >> 10),
+            0xDC00 | (unicode & 0x3FF)) : String.fromCharCode(unicode);
+
+          ctx.fillText(char, width, 0);
+          width += glyph.width * fontSize * 0.001 + charSpacing;
+        }
+        current.x += width;
+
+        ctx.restore();
+      }
+    },
+
+    showSpacedText: function canvasGraphicsShowSpacedText(arr) {
+      var ctx = this.ctx;
+      var current = this.current;
+      var fontSize = current.fontSize;
+      var textHScale = current.textHScale;
+      var arrLength = arr.length;
+      for (var i = 0; i < arrLength; ++i) {
+        var e = arr[i];
+        if (isNum(e)) {
+          current.x -= e * 0.001 * fontSize * textHScale;
+        } else if (isString(e)) {
+          this.showText(e);
+        } else {
+          malformed('TJ array element ' + e + ' is not string or num');
+        }
+      }
+    },
+    nextLineShowText: function canvasGraphicsNextLineShowText(text) {
+      this.nextLine();
+      this.showText(text);
+    },
+    nextLineSetSpacingShowText:
+      function canvasGraphicsNextLineSetSpacingShowText(wordSpacing,
+                                                        charSpacing,
+                                                        text) {
+      this.setWordSpacing(wordSpacing);
+      this.setCharSpacing(charSpacing);
+      this.nextLineShowText(text);
+    },
+
+    // Type3 fonts
+    setCharWidth: function canvasGraphicsSetCharWidth(xWidth, yWidth) {
+      // We can safely ignore this since the width should be the same
+      // as the width in the Widths array.
+    },
+    setCharWidthAndBounds: function canvasGraphicsSetCharWidthAndBounds(xWidth,
+                                                                        yWidth,
+                                                                        llx,
+                                                                        lly,
+                                                                        urx,
+                                                                        ury) {
+      // TODO According to the spec we're also suppose to ignore any operators
+      // that set color or include images while processing this type3 font.
+      this.rectangle(llx, lly, urx - llx, ury - lly);
+      this.clip();
+      this.endPath();
+    },
+
+    // Color
+    setStrokeColorSpace: function canvasGraphicsSetStrokeColorSpace(raw) {
+      this.current.strokeColorSpace = ColorSpace.fromIR(raw);
+    },
+    setFillColorSpace: function canvasGraphicsSetFillColorSpace(raw) {
+      this.current.fillColorSpace = ColorSpace.fromIR(raw);
+    },
+    setStrokeColor: function canvasGraphicsSetStrokeColor(/*...*/) {
+      var cs = this.current.strokeColorSpace;
+      var color = cs.getRgb(arguments);
+      var color = Util.makeCssRgb.apply(null, cs.getRgb(arguments));
+      this.ctx.strokeStyle = color;
+      this.current.strokeColor = color;
+    },
+    getColorN_IR_Pattern: function canvasGraphicsGetColorN_IR_Pattern(IR, cs) {
+      if (IR[0] == 'TilingPattern') {
+        var args = IR[1];
+        var base = cs.base;
+        var color;
+        if (base) {
+          var baseComps = base.numComps;
+
+          color = [];
+          for (var i = 0; i < baseComps; ++i)
+            color.push(args[i]);
+
+          color = base.getRgb(color);
+        }
+        var pattern = new TilingPattern(IR, color, this.ctx, this.objs);
+      } else if (IR[0] == 'RadialAxial' || IR[0] == 'Dummy') {
+        var pattern = Pattern.shadingFromIR(this.ctx, IR);
+      } else {
+        throw 'Unkown IR type';
+      }
+      return pattern;
+    },
+    setStrokeColorN_IR: function canvasGraphicsSetStrokeColorN(/*...*/) {
+      var cs = this.current.strokeColorSpace;
+
+      if (cs.name == 'Pattern') {
+        this.current.strokeColor = this.getColorN_IR_Pattern(arguments, cs);
+      } else {
+        this.setStrokeColor.apply(this, arguments);
+      }
+    },
+    setFillColor: function canvasGraphicsSetFillColor(/*...*/) {
+      var cs = this.current.fillColorSpace;
+      var color = Util.makeCssRgb.apply(null, cs.getRgb(arguments));
+      this.ctx.fillStyle = color;
+      this.current.fillColor = color;
+    },
+    setFillColorN_IR: function canvasGraphicsSetFillColorN(/*...*/) {
+      var cs = this.current.fillColorSpace;
+
+      if (cs.name == 'Pattern') {
+        this.current.fillColor = this.getColorN_IR_Pattern(arguments, cs);
+      } else {
+        this.setFillColor.apply(this, arguments);
+      }
+    },
+    setStrokeGray: function canvasGraphicsSetStrokeGray(gray) {
+      if (!(this.current.strokeColorSpace instanceof DeviceGrayCS))
+        this.current.strokeColorSpace = new DeviceGrayCS();
+
+      var color = Util.makeCssRgb(gray, gray, gray);
+      this.ctx.strokeStyle = color;
+      this.current.strokeColor = color;
+    },
+    setFillGray: function canvasGraphicsSetFillGray(gray) {
+      if (!(this.current.fillColorSpace instanceof DeviceGrayCS))
+        this.current.fillColorSpace = new DeviceGrayCS();
+
+      var color = Util.makeCssRgb(gray, gray, gray);
+      this.ctx.fillStyle = color;
+      this.current.fillColor = color;
+    },
+    setStrokeRGBColor: function canvasGraphicsSetStrokeRGBColor(r, g, b) {
+      if (!(this.current.strokeColorSpace instanceof DeviceRgbCS))
+        this.current.strokeColorSpace = new DeviceRgbCS();
+
+      var color = Util.makeCssRgb(r, g, b);
+      this.ctx.strokeStyle = color;
+      this.current.strokeColor = color;
+    },
+    setFillRGBColor: function canvasGraphicsSetFillRGBColor(r, g, b) {
+      if (!(this.current.fillColorSpace instanceof DeviceRgbCS))
+        this.current.fillColorSpace = new DeviceRgbCS();
+
+      var color = Util.makeCssRgb(r, g, b);
+      this.ctx.fillStyle = color;
+      this.current.fillColor = color;
+    },
+    setStrokeCMYKColor: function canvasGraphicsSetStrokeCMYKColor(c, m, y, k) {
+      if (!(this.current.strokeColorSpace instanceof DeviceCmykCS))
+        this.current.strokeColorSpace = new DeviceCmykCS();
+
+      var color = Util.makeCssCmyk(c, m, y, k);
+      this.ctx.strokeStyle = color;
+      this.current.strokeColor = color;
+    },
+    setFillCMYKColor: function canvasGraphicsSetFillCMYKColor(c, m, y, k) {
+      if (!(this.current.fillColorSpace instanceof DeviceCmykCS))
+        this.current.fillColorSpace = new DeviceCmykCS();
+
+      var color = Util.makeCssCmyk(c, m, y, k);
+      this.ctx.fillStyle = color;
+      this.current.fillColor = color;
+    },
+
+    shadingFill: function canvasGraphicsShadingFill(patternIR) {
+      var ctx = this.ctx;
+
+      this.save();
+      ctx.fillStyle = Pattern.shadingFromIR(ctx, patternIR);
+
+      var inv = ctx.mozCurrentTransformInverse;
+      if (inv) {
+        var canvas = ctx.canvas;
+        var width = canvas.width;
+        var height = canvas.height;
+
+        var bl = Util.applyTransform([0, 0], inv);
+        var br = Util.applyTransform([0, width], inv);
+        var ul = Util.applyTransform([height, 0], inv);
+        var ur = Util.applyTransform([height, width], inv);
+
+        var x0 = Math.min(bl[0], br[0], ul[0], ur[0]);
+        var y0 = Math.min(bl[1], br[1], ul[1], ur[1]);
+        var x1 = Math.max(bl[0], br[0], ul[0], ur[0]);
+        var y1 = Math.max(bl[1], br[1], ul[1], ur[1]);
+
+        this.ctx.fillRect(x0, y0, x1 - x0, y1 - y0);
+      } else {
+        // HACK to draw the gradient onto an infinite rectangle.
+        // PDF gradients are drawn across the entire image while
+        // Canvas only allows gradients to be drawn in a rectangle
+        // The following bug should allow us to remove this.
+        // https://bugzilla.mozilla.org/show_bug.cgi?id=664884
+
+        this.ctx.fillRect(-1e10, -1e10, 2e10, 2e10);
+      }
+
+      this.restore();
+    },
+
+    // Images
+    beginInlineImage: function canvasGraphicsBeginInlineImage() {
+      error('Should not call beginInlineImage');
+    },
+    beginImageData: function canvasGraphicsBeginImageData() {
+      error('Should not call beginImageData');
+    },
+
+    paintFormXObjectBegin: function canvasGraphicsPaintFormXObjectBegin(matrix,
+                                                                        bbox) {
+      this.save();
+
+      if (matrix && isArray(matrix) && 6 == matrix.length)
+        this.transform.apply(this, matrix);
+
+      if (bbox && isArray(bbox) && 4 == bbox.length) {
+        var width = bbox[2] - bbox[0];
+        var height = bbox[3] - bbox[1];
+        this.rectangle(bbox[0], bbox[1], width, height);
+        this.clip();
+        this.endPath();
+      }
+    },
+
+    paintFormXObjectEnd: function canvasGraphicsPaintFormXObjectEnd() {
+      this.restore();
+    },
+
+    paintJpegXObject: function canvasGraphicsPaintJpegXObject(objId, w, h) {
+      var image = this.objs.get(objId);
+      if (!image) {
+        error('Dependent image isn\'t ready yet');
+      }
+
+      this.save();
+
+      var ctx = this.ctx;
+      // scale the image to the unit square
+      ctx.scale(1 / w, -1 / h);
+
+      var domImage = image.getImage();
+      ctx.drawImage(domImage, 0, 0, domImage.width, domImage.height,
+                    0, -h, w, h);
+
+      this.restore();
+    },
+
+    paintImageMaskXObject: function canvasGraphicsPaintImageMaskXObject(
+                             imgArray, inverseDecode, width, height) {
+      function applyStencilMask(buffer, inverseDecode) {
+        var imgArrayPos = 0;
+        var i, j, mask, buf;
+        // removing making non-masked pixels transparent
+        var bufferPos = 3; // alpha component offset
+        for (i = 0; i < height; i++) {
+          mask = 0;
+          for (j = 0; j < width; j++) {
+            if (!mask) {
+              buf = imgArray[imgArrayPos++];
+              mask = 128;
+            }
+            if (!(buf & mask) == inverseDecode) {
+              buffer[bufferPos] = 0;
+            }
+            bufferPos += 4;
+            mask >>= 1;
+          }
+        }
+      }
+
+      this.save();
+
+      var ctx = this.ctx;
+      var w = width, h = height;
+      // scale the image to the unit square
+      ctx.scale(1 / w, -1 / h);
+
+      var tmpCanvas = new this.ScratchCanvas(w, h);
+      var tmpCtx = tmpCanvas.getContext('2d');
+
+      var fillColor = this.current.fillColor;
+      tmpCtx.fillStyle = (fillColor && fillColor.hasOwnProperty('type') &&
+                          fillColor.type === 'Pattern') ?
+                          fillColor.getPattern(tmpCtx) : fillColor;
+      tmpCtx.fillRect(0, 0, w, h);
+
+      var imgData = tmpCtx.getImageData(0, 0, w, h);
+      var pixels = imgData.data;
+
+      applyStencilMask(pixels, inverseDecode);
+
+      tmpCtx.putImageData(imgData, 0, 0);
+      ctx.drawImage(tmpCanvas, 0, -h);
+      this.restore();
+    },
+
+    paintImageXObject: function canvasGraphicsPaintImageXObject(imgData) {
+      this.save();
+      var ctx = this.ctx;
+      var w = imgData.width;
+      var h = imgData.height;
+      // scale the image to the unit square
+      ctx.scale(1 / w, -1 / h);
+
+      var tmpCanvas = new this.ScratchCanvas(w, h);
+      var tmpCtx = tmpCanvas.getContext('2d');
+      var tmpImgData;
+
+      // Some browsers can set an UInt8Array directly as imageData, some
+      // can't. As long as we don't have proper feature detection, just
+      // copy over each pixel and set the imageData that way.
+      tmpImgData = tmpCtx.getImageData(0, 0, w, h);
+
+      // Copy over the imageData.
+      var tmpImgDataPixels = tmpImgData.data;
+      var len = tmpImgDataPixels.length;
+
+      while (len--) {
+        tmpImgDataPixels[len] = imgData.data[len];
+      }
+
+      tmpCtx.putImageData(tmpImgData, 0, 0);
+      ctx.drawImage(tmpCanvas, 0, -h);
+      this.restore();
+    },
+
+    // Marked content
+
+    markPoint: function canvasGraphicsMarkPoint(tag) {
+      TODO('Marked content');
+    },
+    markPointProps: function canvasGraphicsMarkPointProps(tag, properties) {
+      TODO('Marked content');
+    },
+    beginMarkedContent: function canvasGraphicsBeginMarkedContent(tag) {
+      TODO('Marked content');
+    },
+    beginMarkedContentProps:
+      function canvasGraphicsBeginMarkedContentProps(tag, properties) {
+      TODO('Marked content');
+    },
+    endMarkedContent: function canvasGraphicsEndMarkedContent() {
+      TODO('Marked content');
+    },
+
+    // Compatibility
+
+    beginCompat: function canvasGraphicsBeginCompat() {
+      TODO('ignore undefined operators (should we do that anyway?)');
+    },
+    endCompat: function canvasGraphicsEndCompat() {
+      TODO('stop ignoring undefined operators');
+    },
+
+    // Helper functions
+
+    consumePath: function canvasGraphicsConsumePath() {
+      if (this.pendingClip) {
+        var savedFillRule = null;
+        if (this.pendingClip == EO_CLIP)
+          savedFillRule = this.setEOFillRule();
+
+        this.ctx.clip();
+
+        this.pendingClip = null;
+        if (savedFillRule !== null)
+          this.restoreFillRule(savedFillRule);
+      }
+      this.ctx.beginPath();
+    },
+    // We generally keep the canvas context set for
+    // nonzero-winding, and just set evenodd for the operations
+    // that need them.
+    setEOFillRule: function canvasGraphicsSetEOFillRule() {
+      var savedFillRule = this.ctx.mozFillRule;
+      this.ctx.mozFillRule = 'evenodd';
+      return savedFillRule;
+    },
+    restoreFillRule: function canvasGraphicsRestoreFillRule(rule) {
+      this.ctx.mozFillRule = rule;
+    }
+  };
+
+  return constructor;
+})();
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/charsets.js b/apps/files_pdfviewer/js/pdfjs/src/charsets.js
new file mode 100755
index 00000000000..7f54ab32753
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/charsets.js
@@ -0,0 +1,105 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var ISOAdobeCharset = [
+  '.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar',
+  'percent', 'ampersand', 'quoteright', 'parenleft', 'parenright',
+  'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash', 'zero',
+  'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
+  'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question',
+  'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+  'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+  'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore',
+  'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+  'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+  'braceleft', 'bar', 'braceright', 'asciitilde', 'exclamdown', 'cent',
+  'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
+  'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
+  'guilsinglright', 'fi', 'fl', 'endash', 'dagger', 'daggerdbl',
+  'periodcentered', 'paragraph', 'bullet', 'quotesinglbase',
+  'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis',
+  'perthousand', 'questiondown', 'grave', 'acute', 'circumflex', 'tilde',
+  'macron', 'breve', 'dotaccent', 'dieresis', 'ring', 'cedilla',
+  'hungarumlaut', 'ogonek', 'caron', 'emdash', 'AE', 'ordfeminine',
+  'Lslash', 'Oslash', 'OE', 'ordmasculine', 'ae', 'dotlessi', 'lslash',
+  'oslash', 'oe', 'germandbls', 'onesuperior', 'logicalnot', 'mu',
+  'trademark', 'Eth', 'onehalf', 'plusminus', 'Thorn', 'onequarter',
+  'divide', 'brokenbar', 'degree', 'thorn', 'threequarters', 'twosuperior',
+  'registered', 'minus', 'eth', 'multiply', 'threesuperior', 'copyright',
+  'Aacute', 'Acircumflex', 'Adieresis', 'Agrave', 'Aring', 'Atilde',
+  'Ccedilla', 'Eacute', 'Ecircumflex', 'Edieresis', 'Egrave', 'Iacute',
+  'Icircumflex', 'Idieresis', 'Igrave', 'Ntilde', 'Oacute', 'Ocircumflex',
+  'Odieresis', 'Ograve', 'Otilde', 'Scaron', 'Uacute', 'Ucircumflex',
+  'Udieresis', 'Ugrave', 'Yacute', 'Ydieresis', 'Zcaron', 'aacute',
+  'acircumflex', 'adieresis', 'agrave', 'aring', 'atilde', 'ccedilla',
+  'eacute', 'ecircumflex', 'edieresis', 'egrave', 'iacute', 'icircumflex',
+  'idieresis', 'igrave', 'ntilde', 'oacute', 'ocircumflex', 'odieresis',
+  'ograve', 'otilde', 'scaron', 'uacute', 'ucircumflex', 'udieresis',
+  'ugrave', 'yacute', 'ydieresis', 'zcaron'
+];
+
+var ExpertCharset = [
+  '.notdef', 'space', 'exclamsmall', 'Hungarumlautsmall', 'dollaroldstyle',
+  'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior',
+  'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma',
+  'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle',
+  'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle',
+  'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle',
+  'colon', 'semicolon', 'commasuperior', 'threequartersemdash',
+  'periodsuperior', 'questionsmall', 'asuperior', 'bsuperior',
+  'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior',
+  'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
+  'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior',
+  'parenrightinferior', 'Circumflexsmall', 'hyphensuperior', 'Gravesmall',
+  'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall',
+  'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall',
+  'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall',
+  'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary',
+  'onefitted', 'rupiah', 'Tildesmall', 'exclamdownsmall', 'centoldstyle',
+  'Lslashsmall', 'Scaronsmall', 'Zcaronsmall', 'Dieresissmall',
+  'Brevesmall', 'Caronsmall', 'Dotaccentsmall', 'Macronsmall',
+  'figuredash', 'hypheninferior', 'Ogoneksmall', 'Ringsmall',
+  'Cedillasmall', 'onequarter', 'onehalf', 'threequarters',
+  'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths',
+  'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'onesuperior',
+  'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior',
+  'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior',
+  'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior',
+  'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior',
+  'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior',
+  'periodinferior', 'commainferior', 'Agravesmall', 'Aacutesmall',
+  'Acircumflexsmall', 'Atildesmall', 'Adieresissmall', 'Aringsmall',
+  'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall',
+  'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall',
+  'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall',
+  'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall',
+  'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall',
+  'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall',
+  'Ydieresissmall'
+];
+
+var ExpertSubsetCharset = [
+  '.notdef', 'space', 'dollaroldstyle', 'dollarsuperior',
+  'parenleftsuperior', 'parenrightsuperior', 'twodotenleader',
+  'onedotenleader', 'comma', 'hyphen', 'period', 'fraction',
+  'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle',
+  'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle',
+  'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon', 'commasuperior',
+  'threequartersemdash', 'periodsuperior', 'asuperior', 'bsuperior',
+  'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior',
+  'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
+  'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior',
+  'parenrightinferior', 'hyphensuperior', 'colonmonetary', 'onefitted',
+  'rupiah', 'centoldstyle', 'figuredash', 'hypheninferior', 'onequarter',
+  'onehalf', 'threequarters', 'oneeighth', 'threeeighths', 'fiveeighths',
+  'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'onesuperior',
+  'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior',
+  'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior',
+  'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior',
+  'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior',
+  'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior',
+  'periodinferior', 'commainferior'
+];
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/cidmaps.js b/apps/files_pdfviewer/js/pdfjs/src/cidmaps.js
new file mode 100755
index 00000000000..226843b7135
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/cidmaps.js
@@ -0,0 +1,6933 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var CIDToUnicodeMaps = {
+  'Adobe-Japan1': [[32, 160], {f: 12, c: 33}, [45, 8209], {f: 46, c: 46}, 165,
+    {f: 2, c: 93}, [95, 818], [96, 768], {f: 27, c: 97}, 166, 125, [732, 771],
+    [700, 8217], 92, [699, 8216], 124, [126, 8764], {f: 3, c: 161}, 8260, 402,
+    0, 164, 8220, 171, {f: 2, c: 8249}, {f: 2, c: 64257}, [8210, 8211], 0, 0,
+    [183, 8729], 0, 8226, 8218, 8222, 8221, 187, 0, 0, 191, {f: 2, c: 769},
+    [175, 772], {f: 3, c: 774}, 778, [184, 807], 779, 808, 780, [822, 8212],
+    198, 170, 321, 216, 338, 186, 230, 305, 322, 248, 339, 223, 173, 169, 172,
+    174, 0, 0, {f: 2, c: 178}, 181, 185, {f: 3, c: 188}, {f: 6, c: 192},
+    {f: 16, c: 199}, 0, {f: 6, c: 217}, {f: 6, c: 224}, {f: 16, c: 231}, 0,
+    {f: 7, c: 249}, 352, 376, 381, [773, 8254], 353, 8482, 382, 0, 8194,
+    {s: 91}, 65512, {s: 3}, {f: 63, c: 65377}, {s: 243}, [8195, 12288],
+    {f: 2, c: 12289}, 65292, 65294, 12539, {f: 2, c: 65306}, 65311, 65281,
+    {f: 2, c: 12443}, 180, 65344, 168, 65342, 65507, 65343, {f: 2, c: 12541},
+    {f: 2, c: 12445}, 12291, 20189, {f: 3, c: 12293}, 12540, 8213, 8208, 65295,
+    65340, [12316, 65374], 8214, 65372, 8230, 8229, {s: 4}, {f: 2, c: 65288},
+    {f: 2, c: 12308}, 65339, 65341, 65371, 65373, {f: 10, c: 12296}, 65291,
+    [8722, 65293], 177, 215, 247, 65309, 8800, 65308, 65310, {f: 2, c: 8806},
+    8734, 8756, 9794, 9792, 176, {f: 2, c: 8242}, 8451, 65509, 65284,
+    {f: 2, c: 65504}, 65285, 65283, 65286, 65290, 65312, 167, 9734, 9733, 9675,
+    9679, 9678, 9671, 9670, 9633, 9632, 9651, 9650, 9661, 9660, 8251, 12306,
+    8594, {f: 2, c: 8592}, 8595, 12307, 8712, 8715, {f: 2, c: 8838},
+    {f: 2, c: 8834}, 8746, 8745, {f: 2, c: 8743}, 65506, 8658, 8660, 8704,
+    8707, 8736, 8869, 8978, 8706, 8711, 8801, 8786, {f: 2, c: 8810}, 8730,
+    8765, 8733, 8757, {f: 2, c: 8747}, 8491, 8240, 9839, 9837, 9834,
+    {f: 2, c: 8224}, 182, 9711, {f: 10, c: 65296}, {f: 26, c: 65313},
+    {f: 26, c: 65345}, {f: 83, c: 12353}, {f: 86, c: 12449}, {f: 17, c: 913},
+    {f: 7, c: 931}, {f: 17, c: 945}, {f: 7, c: 963}, {f: 6, c: 1040}, 1025,
+    {f: 32, c: 1046}, 1105, {f: 26, c: 1078}, 20124, 21782, 23043, 38463,
+    21696, 24859, 25384, 23030, 36898, 33909, 33564, 31312, 24746, 25569,
+    28197, 26093, 33894, 33446, 39925, 26771, 22311, 26017, 25201, 23451,
+    22992, 34427, 39156, 32098, 32190, 39822, 25110, 31903, 34999, 23433,
+    24245, 25353, 26263, 26696, 38343, 38797, 26447, 20197, 20234, 20301,
+    20381, 20553, 22258, 22839, 22996, 23041, 23561, 24799, 24847, 24944,
+    26131, 26885, 28858, 30031, 30064, 31227, 32173, 32239, 32963, 33806,
+    [12176, 34915], 35586, 36949, 36986, 21307, 20117, 20133, 22495, 32946,
+    37057, 30959, [12032, 19968], 22769, 28322, 36920, 31282, 33576, 33419,
+    39983, 20801, 21360, 21693, 21729, 22240, 23035, 24341, 39154, 28139,
+    32996, 34093, 38498, 38512, 38560, 38907, 21515, 21491, 23431, 28879,
+    [12155, 32701], 36802, [12204, 38632], 21359, 40284, 31418, 19985, 30867,
+    [12165, 33276], 28198, 22040, 21764, 27421, 34074, 39995, 23013, 21417,
+    28006, [12128, 29916], 38287, 22082, 20113, 36939, 38642, 33615, 39180,
+    21473, 21942, 23344, 24433, 26144, 26355, 26628, 27704, 27891, 27945,
+    29787, 30408, 31310, 38964, 33521, 34907, 35424, 37613, 28082, 30123,
+    30410, 39365, 24742, 35585, 36234, 38322, 27022, 21421, 20870, 22290,
+    22576, 22852, 23476, 24310, 24616, 25513, 25588, 27839, 28436, 28814,
+    28948, 29017, 29141, 29503, 32257, 33398, 33489, 34199, 36960, 37467,
+    40219, 22633, 26044, 27738, 29989, 20985, 22830, 22885, 24448, 24540,
+    25276, 26106, 27178, 27431, 27572, 29579, 32705, 35158, 40236, 40206,
+    [12009, 40644], 23713, 27798, 33659, 20740, 23627, 25014, 33222, 26742,
+    29281, [12036, 20057], 20474, 21368, 24681, 28201, 31311, [12211, 38899],
+    19979, 21270, 20206, 20309, 20285, 20385, 20339, 21152, 21487, 22025,
+    22799, 23233, 23478, 23521, 31185, 26247, 26524, 26550, 27468, 27827,
+    [12117, 28779], 29634, 31117, [12146, 31166], 31292, 31623, 33457, 33499,
+    33540, 33655, 33775, 33747, 34662, 35506, 22057, 36008, 36838, 36942,
+    38686, 34442, 20420, 23784, 25105, [12123, 29273], 30011, 33253, 33469,
+    34558, 36032, 38597, 39187, 39381, 20171, 20250, 35299, 22238, 22602,
+    22730, 24315, 24555, 24618, 24724, 24674, 25040, 25106, 25296, 25913,
+    39745, 26214, 26800, 28023, 28784, 30028, 30342, 32117, 33445, 34809,
+    38283, 38542, [12185, 35997], 20977, 21182, 22806, 21683, 23475, 23830,
+    24936, 27010, 28079, 30861, 33995, 34903, 35442, 37799, 39608, 28012,
+    39336, 34521, 22435, 26623, 34510, 37390, 21123, 22151, 21508, 24275,
+    25313, 25785, 26684, 26680, 27579, 29554, 30906, 31339, 35226,
+    [12179, 35282], 36203, 36611, 37101, 38307, 38548, [12208, 38761], 23398,
+    23731, 27005, {f: 2, c: 38989}, 25499, 31520, 27179, 27263, 26806, 39949,
+    28511, 21106, 21917, 24688, 25324, 27963, 28167, 28369, 33883, 35088,
+    36676, 19988, 39993, 21494, 26907, 27194, 38788, 26666, 20828, 31427,
+    33970, 37340, 37772, 22107, 40232, 26658, 33541, 33841, 31909, 21000,
+    33477, [12129, 29926], 20094, 20355, 20896, 23506, 21002, 21208, 21223,
+    24059, 21914, 22570, 23014, 23436, 23448, 23515, [12082, 24178], 24185,
+    24739, 24863, 24931, 25022, 25563, 25954, 26577, 26707, 26874, 27454,
+    27475, 27735, 28450, 28567, 28485, 29872, [12130, 29976], 30435, 30475,
+    31487, 31649, 31777, 32233, [12152, 32566], 32752, 32925, 33382, 33694,
+    35251, 35532, 36011, 36996, 37969, 38291, 38289, 38306, 38501, 38867,
+    39208, 33304, 20024, 21547, 23736, 24012, 29609, 30284, 30524, 23721,
+    32747, 36107, 38593, 38929, 38996, 39000, 20225, 20238, 21361, 21916,
+    22120, 22522, 22855, 23305, 23492, 23696, 24076, 24190, 24524, 25582,
+    26426, 26071, 26082, 26399, 26827, 26820, 27231, 24112, 27589, 27671,
+    27773, 30079, 31048, 23395, 31232, 32000, 24509, 35215, 35352, 36020,
+    36215, 36556, 36637, 39138, 39438, [12004, 12225, 39740], [12018, 20096],
+    20605, 20736, 22931, 23452, 25135, 25216, 25836, 27450, 29344, 30097,
+    31047, 32681, 34811, 35516, 35696, 25516, 33738, 38816, 21513, 21507,
+    21931, 26708, 27224, 35440, 30759, 26485, [12233, 40653], 21364, 23458,
+    33050, 34384, 36870, 19992, 20037, 20167, 20241, 21450, 21560, 23470,
+    [12088, 24339], 24613, 25937, 26429, 27714, 27762, 27875, 28792, 29699,
+    31350, 31406, 31496, 32026, 31998, 32102, 26087, [12124, 29275], 21435,
+    23621, 24040, 25298, 25312, 25369, 28192, 34394, 35377, 36317, 37624,
+    28417, 31142, [12226, 39770], 20136, {f: 2, c: 20139}, 20379, 20384, 20689,
+    20807, 31478, 20849, 20982, 21332, 21281, 21375, 21483, 21932, 22659,
+    23777, 24375, 24394, 24623, 24656, 24685, 25375, 25945, 27211, 27841,
+    29378, 29421, 30703, 33016, 33029, 33288, 34126, 37111, 37857, 38911,
+    39255, 39514, 20208, 20957, 23597, 26241, 26989, 23616, 26354, 26997,
+    [12127, 29577], 26704, 31873, 20677, 21220, 22343, [12081, 24062], 37670,
+    [12100, 26020], 27427, 27453, 29748, 31105, 31165, 31563, 32202, 33465,
+    33740, 34943, 35167, 35641, 36817, [12198, 37329], 21535, 37504, 20061,
+    20534, 21477, 21306, 29399, 29590, 30697, 33510, 36527, 39366, 39368,
+    39378, 20855, 24858, 34398, 21936, 31354, 20598, 23507, 36935, 38533,
+    20018, 27355, 37351, 23633, 23624, 25496, 31391, 27795, 38772, 36705,
+    31402, 29066, 38536, 31874, 26647, 32368, 26705, 37740, 21234, 21531,
+    34219, 35347, 32676, 36557, 37089, 21350, 34952, 31041, 20418, 20670,
+    21009, 20804, 21843, 22317, 29674, 22411, 22865, 24418, 24452, 24693,
+    24950, 24935, 25001, 25522, 25658, 25964, 26223, 26690, 28179, 30054,
+    31293, 31995, 32076, 32153, 32331, 32619, 33550, 33610, 34509, 35336,
+    35427, 35686, 36605, 38938, 40335, 33464, 36814, 39912, 21127, 25119,
+    25731, 28608, 38553, 26689, 20625, [12107, 27424], 27770, 28500,
+    [12147, 31348], 32080, [12174, 34880], 35363, [12105, 26376], 20214, 20537,
+    20518, 20581, 20860, 21048, 21091, 21927, 22287, 22533, 23244, 24314,
+    25010, 25080, 25331, 25458, 26908, 27177, 29309, [12125, 29356], 29486,
+    30740, 30831, 32121, 30476, 32937, [12178, 35211], 35609, 36066, 36562,
+    36963, 37749, 38522, 38997, 39443, 40568, 20803, 21407, 21427, 24187,
+    24358, 28187, 28304, [12126, 29572], 29694, 32067, 33335, [12180, 35328],
+    35578, 38480, 20046, 20491, 21476, 21628, 22266, 22993, 23396,
+    [12080, 24049], 24235, 24359, [12094, 25144], 25925, 26543, 28246, 29392,
+    31946, 34996, 32929, 32993, 33776, [11969, 34382], 35463, 36328, 37431,
+    38599, 39015, [12238, 40723], 20116, 20114, 20237, 21320, 21577, 21566,
+    23087, 24460, 24481, 24735, 26791, 27278, 29786, 30849, 35486, 35492,
+    35703, 37264, 20062, 39881, 20132, 20348, 20399, 20505, 20502, 20809,
+    20844, 21151, 21177, 21246, 21402, [12061, 21475], 21521, 21518, 21897,
+    22353, 22434, 22909, 23380, 23389, 23439, [12079, 24037], 24039, 24055,
+    24184, 24195, 24218, 24247, 24344, 24658, 24908, 25239, 25304, 25511,
+    25915, 26114, 26179, 26356, 26477, 26657, 26775, 27083, 27743, 27946,
+    28009, 28207, 28317, 30002, 30343, 30828, 31295, 31968, 32005, 32024,
+    32094, 32177, 32789, 32771, 32943, 32945, 33108, 33167, 33322, 33618,
+    [12175, 34892], 34913, 35611, 36002, 36092, 37066, 37237, 37489, 30783,
+    37628, 38308, 38477, 38917, [12217, 39321], [12220, 39640], 40251, 21083,
+    21163, 21495, 21512, 22741, 25335, 28640, 35946, 36703, 40633, 20811,
+    21051, 21578, 22269, 31296, 37239, 40288, [12234, 40658], 29508, 28425,
+    33136, 29969, 24573, 24794, [12219, 39592], 29403, 36796, 27492, 38915,
+    20170, 22256, 22372, 22718, 23130, 24680, 25031, 26127, 26118, 26681,
+    26801, 28151, 30165, 32058, [12169, 33390], 39746, 20123, 20304, 21449,
+    21766, 23919, 24038, 24046, 26619, 27801, 29811, 30722, 35408, 37782,
+    35039, 22352, 24231, 25387, 20661, 20652, 20877, 26368, 21705, 22622,
+    22971, 23472, 24425, 25165, 25505, 26685, 27507, 28168, 28797, 37319,
+    29312, 30741, 30758, 31085, 25998, 32048, 33756, 35009, 36617, 38555,
+    21092, 22312, 26448, 32618, 36001, 20916, 22338, 38442, 22586, 27018,
+    32948, 21682, 23822, 22524, 30869, 40442, 20316, 21066, 21643, 25662,
+    26152, 26388, 26613, 31364, 31574, 32034, 37679, 26716, 39853, 31545,
+    21273, 20874, 21047, 23519, 25334, 25774, 25830, 26413, 27578, 34217,
+    38609, 30352, 39894, 25420, 37638, 39851, [12139, 30399], 26194, 19977,
+    20632, 21442, [12077, 23665], 24808, 25746, 25955, 26719, 29158, 29642,
+    29987, 31639, 32386, 34453, 35715, 36059, 37240, 39184, 26028, 26283,
+    27531, 20181, 20180, 20282, 20351, 21050, 21496, 21490, 21987, 22235,
+    [12064, 22763], 22987, 22985, 23039, [12070, 23376], 23629, 24066, 24107,
+    24535, 24605, 25351, [12096, 25903], 23388, 26031, 26045, 26088, 26525,
+    [12108, 27490], 27515, [12114, 27663], 29509, 31049, 31169, [12151, 31992],
+    32025, 32043, 32930, 33026, [12164, 33267], 35222, 35422, 35433, 35430,
+    35468, 35566, 36039, 36060, 38604, 39164, [12013, 27503], 20107, 20284,
+    20365, 20816, 23383, 23546, 24904, 25345, 26178, 27425, 28363, 27835,
+    29246, 29885, 30164, 30913, [12144, 31034], [12157, 32780], [12159, 32819],
+    [12163, 33258], 33940, 36766, 27728, [12229, 40575], 24335, 35672, 40235,
+    31482, 36600, 23437, 38635, 19971, 21489, 22519, 22833, 23241, 23460,
+    24713, 28287, 28422, 30142, 36074, 23455, 34048, 31712, 20594, 26612,
+    33437, 23649, 34122, 32286, 33294, 20889, 23556, 25448, 36198, 26012,
+    29038, 31038, 32023, 32773, 35613, [12190, 36554], 36974, 34503, 37034,
+    20511, 21242, 23610, 26451, 28796, 29237, 37196, 37320, 37675, 33509,
+    23490, 24369, 24825, 20027, 21462, 23432, [12095, 25163], 26417, 27530,
+    29417, 29664, 31278, 33131, 36259, 37202, [12216, 39318], 20754, 21463,
+    21610, 23551, 25480, 27193, 32172, 38656, 22234, 21454, 21608, 23447,
+    23601, 24030, 20462, 24833, 25342, 27954, 31168, 31179, 32066, 32333,
+    32722, 33261, [12168, 33311], 33936, 34886, 35186, 35728, 36468, 36655,
+    36913, 37195, 37228, 38598, 37276, 20160, 20303, 20805, [12055, 21313],
+    24467, 25102, 26580, 27713, 28171, 29539, 32294, 37325, 37507, 21460,
+    22809, 23487, 28113, 31069, 32302, 31899, 22654, 29087, 20986, 34899,
+    36848, 20426, 23803, 26149, 30636, 31459, 33308, 39423, 20934, 24490,
+    26092, 26991, 27529, 28147, 28310, 28516, 30462, 32020, 24033, 36981,
+    37255, 38918, 20966, 21021, 25152, 26257, 26329, 28186, 24246, 32210,
+    32626, 26360, 34223, 34295, 35576, 21161, 21465, [12069, 22899], 24207,
+    24464, 24661, 37604, 38500, 20663, 20767, 21213, 21280, 21319, 21484,
+    21736, 21830, 21809, 22039, 22888, 22974, 23100, 23477, 23558,
+    [12073, 23567], 23569, 23578, 24196, 24202, 24288, 24432, 25215, 25220,
+    25307, 25484, 25463, 26119, 26124, 26157, 26230, 26494, 26786, 27167,
+    27189, 27836, 28040, 28169, 28248, 28988, 28966, 29031, 30151, 30465,
+    30813, 30977, 31077, 31216, 31456, 31505, 31911, 32057, 32918, 33750,
+    33931, 34121, 34909, 35059, 35359, 35388, 35412, 35443, 35937, 36062,
+    37284, 37478, 37758, 37912, 38556, 38808, 19978, 19976, 19998, 20055,
+    20887, 21104, 22478, 22580, 22732, 23330, 24120, 24773, 25854, 26465,
+    26454, 27972, 29366, 30067, 31331, 33976, 35698, 37304, 37664, 22065,
+    22516, 39166, 25325, 26893, 27542, 29165, 32340, 32887, [12170, 33394],
+    35302, [12215, 39135], 34645, 36785, 23611, 20280, 20449, 20405, 21767,
+    23072, 23517, 23529, [12092, 24515], 24910, 25391, 26032, 26187, 26862,
+    27035, 28024, 28145, 30003, 30137, 30495, 31070, 31206, 32051,
+    [12162, 33251], 33455, 34218, 35242, 35386, [12189, 36523], [12191, 36763],
+    36914, 37341, 38663, [12040, 20154], 20161, 20995, 22645, 22764, 23563,
+    29978, 23613, 33102, 35338, 36805, 38499, 38765, 31525, 35535, 38920,
+    37218, 22259, 21416, 36887, 21561, 22402, 24101, 25512, [12116, 27700],
+    28810, 30561, 31883, 32736, 34928, 36930, 37204, 37648, 37656, 38543,
+    29790, 39620, 23815, 23913, 25968, 26530, 36264, 38619, 25454, 26441,
+    26905, 33733, 38935, 38592, 35070, 28548, 25722, [12072, 23544], 19990,
+    28716, 30045, 26159, 20932, 21046, 21218, 22995, 24449, 24615, 25104,
+    25919, 25972, 26143, 26228, 26866, 26646, 27491, 28165, 29298,
+    [12131, 29983], 30427, 31934, 32854, 22768, 35069, [11972, 35199], 35488,
+    35475, 35531, 36893, 37266, [11992, 38738], 38745, [12011, 25993], 31246,
+    33030, 38587, 24109, 24796, 25114, 26021, 26132, 26512, [12143, 30707],
+    31309, 31821, 32318, 33034, 36012, [12186, 36196], 36321, 36447, 30889,
+    20999, 25305, 25509, 25666, 25240, 35373, 31363, 31680, 35500, 38634,
+    32118, [12166, 33292], 34633, 20185, 20808, 21315, 21344, 23459, 23554,
+    23574, 24029, 25126, 25159, 25776, 26643, 26676, 27849, 27973, 27927,
+    26579, 28508, 29006, 29053, 26059, 31359, 31661, 32218, 32330, 32680,
+    33146, [12167, 33307], 33337, 34214, 35438, 36046, 36341, 36984, 36983,
+    37549, 37521, 38275, 39854, 21069, 21892, 28472, 28982, 20840, 31109,
+    32341, 33203, 31950, 22092, 22609, 23720, 25514, 26366, 26365, 26970,
+    29401, 30095, 30094, 30990, 31062, 31199, 31895, 32032, 32068, 34311,
+    35380, 38459, 36961, [12239, 40736], 20711, 21109, 21452, 21474, 20489,
+    21930, 22766, 22863, 29245, 23435, 23652, 21277, 24803, 24819, 25436,
+    25475, 25407, 25531, 25805, 26089, 26361, 24035, 27085, 27133, 28437,
+    29157, 20105, 30185, 30456, 31379, 31967, 32207, 32156, 32865, 33609,
+    33624, 33900, 33980, 34299, 35013, [12187, 36208], 36865, 36973, 37783,
+    38684, 39442, 20687, 22679, 24974, 33235, 34101, 36104, 36896, 20419,
+    20596, 21063, 21363, 24687, 25417, 26463, 28204, [12188, 36275], 36895,
+    20439, 23646, 36042, 26063, 32154, 21330, 34966, 20854, 25539, 23384,
+    23403, 23562, 25613, 26449, 36956, 20182, 22810, 22826, 27760, 35409,
+    21822, 22549, 22949, 24816, 25171, 26561, 33333, 26965, 38464, 39364,
+    39464, 20307, 22534, 23550, 32784, 23729, 24111, 24453, 24608, 24907,
+    25140, 26367, 27888, 28382, 32974, 33151, 33492, 34955, 36024, 36864,
+    36910, 38538, 40667, 39899, 20195, 21488, [12068, 22823], 31532, 37261,
+    38988, 40441, 28381, 28711, 21331, 21828, 23429, 25176, 25246, 25299,
+    27810, 28655, 29730, 35351, 37944, 28609, 35582, 33592, 20967, 34552,
+    21482, 21481, 20294, 36948, [12192, 36784], 22890, 33073, 24061, 31466,
+    36799, 26842, [12181, 35895], 29432, 40008, 27197, 35504, 20025, 21336,
+    22022, 22374, 25285, 25506, 26086, 27470, 28129, 28251, 28845, 30701,
+    31471, 31658, 32187, 32829, 32966, 34507, 35477, 37723, 22243, 22727,
+    24382, 26029, 26262, 27264, 27573, 30007, 35527, 20516, 30693, 22320,
+    24347, 24677, 26234, 27744, 30196, 31258, 32622, 33268, 34584, 36933,
+    39347, 31689, 30044, [12149, 31481], 31569, 33988, 36880, 31209, 31378,
+    33590, 23265, 30528, 20013, 20210, 23449, 24544, 25277, 26172, 26609,
+    27880, [12173, 34411], 34935, 35387, 37198, 37619, 39376, 27159, 28710,
+    29482, 33511, 33879, 36015, 19969, 20806, 20939, 21899, 23541, 24086,
+    24115, 24193, 24340, 24373, 24427, 24500, 25074, 25361, 26274, 26397,
+    28526, 29266, 30010, 30522, 32884, 33081, 33144, 34678, 35519, 35548,
+    36229, 36339, 37530, [11985, 12199, 38263], 38914, [12227, 40165], 21189,
+    25431, 30452, 26389, 27784, 29645, 36035, 37806, 38515, 27941, 22684,
+    26894, 27084, 36861, 37786, 30171, 36890, 22618, 26626, 25524, 27131,
+    20291, 28460, 26584, 36795, 34086, 32180, 37716, 26943, 28528, 22378,
+    22775, 23340, 32044, [12118, 29226], 21514, 37347, 40372, 20141, 20302,
+    20572, 20597, 21059, 35998, 21576, 22564, 23450, 24093, 24213, 24237,
+    24311, 24351, 24716, 25269, 25402, 25552, 26799, 27712, 30855, 31118,
+    31243, 32224, 33351, 35330, 35558, 36420, 36883, 37048, 37165, 37336,
+    [12237, 40718], 27877, 25688, 25826, 25973, 28404, 30340, 31515, 36969,
+    37841, 28346, 21746, 24505, 25764, 36685, 36845, 37444, 20856, 22635,
+    22825, 23637, 24215, 28155, 32399, 29980, 36028, 36578, 39003, 28857,
+    20253, 27583, 28593, [12133, 30000], 38651, 20814, 21520, 22581, 22615,
+    22956, 23648, 24466, [12099, 26007], 26460, 28193, 30331, 33759, 36077,
+    36884, 37117, 37709, 30757, 30778, 21162, 24230, [12063, 22303], 22900,
+    24594, 20498, 20826, 20908, 20941, [12049, 20992], 21776, 22612, 22616,
+    22871, 23445, 23798, 23947, 24764, 25237, 25645, 26481, 26691, 26812,
+    26847, 30423, 28120, 28271, 28059, 28783, 29128, 24403, 30168, 31095,
+    31561, 31572, 31570, 31958, 32113, 21040, 33891, 34153, 34276, 35342,
+    35588, [12182, 35910], 36367, 36867, 36879, 37913, 38518, 38957, 39472,
+    38360, 20685, 21205, 21516, 22530, 23566, 24999, 25758, 27934, 30643,
+    31461, 33012, 33796, 36947, 37509, 23776, 40199, 21311, 24471, 24499,
+    28060, 29305, 30563, 31167, 31716, 27602, 29420, 35501, 26627, 27233,
+    20984, 31361, 26932, 23626, 40182, 33515, 23493, [12195, 37193], 28702,
+    22136, 23663, 24775, 25958, 27788, 35930, 36929, 38931, 21585, 26311,
+    37389, 22856, 37027, 20869, 20045, 20970, 34201, 35598, 28760, 25466,
+    37707, 26978, 39348, 32260, 30071, 21335, 26976, 36575, 38627, 27741,
+    [12038, 20108], 23612, 24336, 36841, 21250, 36049, [12161, 32905], 34425,
+    24319, [12103, 26085], 20083, [12042, 20837], 22914, 23615, 38894, 20219,
+    22922, 24525, 35469, 28641, 31152, 31074, 23527, 33905, 29483, 29105,
+    24180, 24565, 25467, 25754, 29123, 31896, 20035, 24316, 20043, 22492,
+    22178, 24745, 28611, 32013, 33021, 33075, 33215, 36786, 35223, 34468,
+    24052, 25226, 25773, 35207, 26487, 27874, 27966, 29750, 30772, 23110,
+    32629, 33453, [12218, 39340], 20467, 24259, 25309, 25490, 25943, 26479,
+    30403, 29260, 32972, 32954, 36649, 37197, 20493, 22521, 23186, 26757,
+    26995, 29028, 29437, 36023, 22770, 36064, 38506, 36889, 34687, 31204,
+    30695, 33833, 20271, 21093, 21338, 25293, 26575, 27850, [12137, 30333],
+    31636, 31893, 33334, 34180, 36843, 26333, 28448, 29190, 32283, 33707,
+    39361, [12008, 40614], 20989, 31665, 30834, 31672, 32903, 31560, 27368,
+    24161, 32908, 30033, 30048, [12043, 20843], 37474, 28300, 30330, 37271,
+    39658, 20240, 32624, 25244, 31567, 38309, 40169, 22138, 22617, 34532,
+    38588, 20276, 21028, 21322, 21453, 21467, 24070, 25644, 26001, 26495,
+    27710, 27726, 29256, 29359, 29677, 30036, 32321, 33324, 34281, 36009,
+    31684, [12196, 37318], 29033, 38930, 39151, 25405, 26217, 30058, 30436,
+    30928, 34115, 34542, 21290, 21329, 21542, 22915, 24199, 24444, 24754,
+    25161, 25209, 25259, 26000, [12112, 27604], 27852, 30130, [12138, 30382],
+    30865, 31192, 32203, 32631, 32933, 34987, 35513, 36027, 36991,
+    [12206, 38750], [12214, 39131], 27147, 31800, 20633, 23614, 24494, 26503,
+    27608, 29749, 30473, 32654, [12240, 40763], 26570, 31255, 21305,
+    [12134, 30091], 39661, 24422, 33181, 33777, 32920, 24380, 24517, 30050,
+    31558, 36924, 26727, 23019, 23195, 32016, 30334, 35628, 20469, 24426,
+    27161, 27703, 28418, 29922, 31080, 34920, 35413, 35961, 24287, 25551,
+    30149, 31186, 33495, 37672, 37618, 33948, 34541, 39981, 21697, 24428,
+    25996, 27996, 28693, 36007, 36051, 38971, 25935, 29942, 19981, 20184,
+    22496, 22827, 23142, 23500, 20904, 24067, 24220, 24598, 25206, 25975,
+    26023, 26222, 28014, [12119, 29238], 31526, 33104, 33178, 33433, 35676,
+    36000, 36070, 36212, [12201, 38428], 38468, 20398, 25771, 27494, 33310,
+    33889, 34154, 37096, 23553, 26963, [12213, 39080], 33914, 34135, 20239,
+    21103, 24489, 24133, 26381, 31119, 33145, 35079, 35206, 28149, 24343,
+    25173, 27832, 20175, 29289, 39826, 20998, 21563, 22132, 22707, 24996,
+    25198, 28954, 22894, 31881, 31966, 32027, 38640, [12098, 25991], 32862,
+    19993, 20341, 20853, 22592, 24163, 24179, 24330, 26564, 20006, 34109,
+    38281, 38491, [12150, 31859], [12212, 38913], 20731, 22721, 30294, 30887,
+    21029, 30629, 34065, 31622, 20559, 22793, [12122, 29255], 31687, 32232,
+    36794, 36820, 36941, 20415, 21193, 23081, 24321, 38829, 20445, 33303,
+    37610, 22275, 25429, 27497, 29995, 35036, 36628, 31298, 21215, 22675,
+    24917, 25098, 26286, [11935, 27597], 31807, 33769, 20515, 20472, 21253,
+    21574, 22577, 22857, 23453, 23792, 23791, 23849, 24214, 25265, 25447,
+    25918, [12101, 26041], 26379, 27861, 27873, 28921, 30770, 32299, 32990,
+    33459, 33804, 34028, 34562, 35090, 35370, 35914, 37030, 37586, 39165,
+    40179, 40300, 20047, 20129, 20621, 21078, 22346, 22952, 24125,
+    {f: 2, c: 24536}, 25151, 26292, 26395, 26576, 26834, 20882, 32033, 32938,
+    33192, 35584, 35980, 36031, 37502, 38450, 21536, 38956, 21271, 20693,
+    [12056, 21340], 22696, 25778, 26420, 29287, 30566, 31302, 37350, 21187,
+    27809, 27526, 22528, 24140, 22868, 26412, 32763, 20961, 30406, 25705,
+    30952, 39764, [12231, 40635], 22475, 22969, 26151, 26522, 27598, 21737,
+    27097, 24149, 33180, 26517, 39850, 26622, 40018, 26717, 20134, 20451,
+    [12060, 21448], 25273, 26411, 27819, 36804, 20397, 32365, 40639, 19975,
+    24930, 28288, 28459, 34067, 21619, 26410, 39749, [11922, 24051], 31637,
+    23724, 23494, 34588, 28234, 34001, 31252, 33032, 22937, 31885,
+    [11936, 27665], 30496, 21209, 22818, 28961, 29279, [12141, 30683], 38695,
+    40289, 26891, 23167, 23064, 20901, 21517, 21629, 26126, 30431, 36855,
+    37528, 40180, 23018, 29277, 28357, 20813, 26825, 32191, 32236,
+    [12207, 38754], 40634, 25720, 27169, 33538, 22916, 23391, [12113, 27611],
+    29467, 30450, 32178, 32791, 33945, 20786, [12106, 26408], 40665,
+    [12140, 30446], 26466, 21247, 39173, 23588, 25147, 31870, 36016, 21839,
+    24758, 32011, [12200, 38272], 21249, 20063, 20918, 22812, 29242, 32822,
+    37326, 24357, [12142, 30690], 21380, 24441, 32004, 34220, 35379, 36493,
+    38742, 26611, 34222, 37971, 24841, 24840, 27833, 30290, 35565, 36664,
+    21807, 20305, 20778, 21191, 21451, 23461, 24189, 24736, 24962, 25558,
+    26377, 26586, 28263, 28044, {f: 2, c: 29494}, 30001, 31056, 35029, 35480,
+    36938, [12194, 37009], 37109, 38596, 34701, [12067, 22805], 20104, 20313,
+    19982, 35465, 36671, 38928, 20653, 24188, 22934, 23481, 24248, 25562,
+    25594, 25793, 26332, 26954, 27096, 27915, 28342, 29076, [12132, 29992],
+    31407, [12154, 32650], 32768, 33865, 33993, 35201, 35617, 36362, 36965,
+    38525, 39178, 24958, 25233, 27442, 27779, 28020, 32716, 32764, 28096,
+    32645, 34746, 35064, 26469, 33713, 38972, 38647, 27931, 32097, 33853,
+    37226, 20081, 21365, 23888, 27396, 28651, 34253, 34349, 35239, 21033,
+    21519, 23653, 26446, 26792, 29702, 29827, 30178, 35023, 35041,
+    [12197, 37324], 38626, 38520, 24459, 29575, [12148, 31435], 33870, 25504,
+    30053, 21129, 27969, 28316, 29705, 30041, 30827, 31890, 38534,
+    [12015, 31452], [12243, 40845], 20406, 24942, 26053, 34396, 20102, 20142,
+    20698, 20001, 20940, 23534, 26009, 26753, 28092, 29471, 30274, 30637,
+    31260, 31975, 33391, 35538, 36988, 37327, 38517, 38936, [12050, 21147],
+    32209, 20523, 21400, 26519, 28107, 29136, 29747, 33256, 36650, 38563,
+    40023, 40607, 29792, 22593, 28057, 32047, 39006, 20196, 20278, 20363,
+    20919, 21169, 23994, 24604, 29618, 31036, 33491, 37428, 38583, 38646,
+    38666, 40599, 40802, 26278, 27508, 21015, 21155, 28872, 35010, 24265,
+    24651, 24976, 28451, 29001, 31806, 32244, 32879, 34030, 36899, 37676,
+    21570, 39791, 27347, 28809, 36034, 36335, 38706, 21172, 23105, 24266,
+    24324, 26391, 27004, 27028, 28010, 28431, 29282, 29436, 31725,
+    [12156, 32769], 32894, 34635, 37070, 20845, 40595, 31108, 32907, 37682,
+    35542, 20525, 21644, 35441, 27498, 36036, 33031, 24785, 26528, 40434,
+    20121, 20120, 39952, 35435, 34241, 34152, 26880, 28286, 30871, 33109,
+    24332, 19984, 19989, 20010, 20017, [12034, 20022], 20028, [12035, 20031],
+    20034, 20054, 20056, 20098, [12037, 20101], 35947, 20106, 33298, 24333,
+    20110, {f: 2, c: 20126}, [12039, 20128], 20130, 20144, 20147, 20150, 20174,
+    20173, 20164, 20166, 20162, 20183, 20190, 20205, 20191, 20215, 20233,
+    20314, 20272, 20315, 20317, 20311, 20295, 20342, 20360, 20367, 20376,
+    20347, 20329, 20336, 20369, 20335, 20358, 20374, 20760, 20436, 20447,
+    20430, 20440, 20443, 20433, 20442, 20432, {f: 2, c: 20452}, 20506, 20520,
+    20500, 20522, 20517, 20485, 20252, 20470, 20513, 20521, 20524, 20478,
+    20463, 20497, 20486, 20547, 20551, 26371, 20565, 20560, 20552, 20570,
+    20566, 20588, 20600, 20608, 20634, 20613, 20660, 20658, {f: 2, c: 20681},
+    20659, 20674, 20694, 20702, 20709, 20717, 20707, 20718, 20729, 20725,
+    20745, {f: 2, c: 20737}, 20758, 20757, 20756, 20762, 20769, 20794, 20791,
+    20796, 20795, [12041, 20799], [11918, 20800], 20818, 20812, 20820, 20834,
+    31480, {f: 2, c: 20841}, 20846, 20864, [12044, 20866], 22232, 20876, 20873,
+    20879, 20881, 20883, 20885, [12045, 20886], 20900, 20902, 20898,
+    {f: 2, c: 20905}, [12046, 20907], 20915, {f: 2, c: 20913}, 20912, 20917,
+    20925, 20933, 20937, 20955, [12047, 20960], 34389, 20969, 20973, 20976,
+    [12048, 20981], 20990, 20996, 21003, 21012, 21006, 21031, 21034, 21038,
+    21043, 21049, 21071, 21060, {f: 2, c: 21067}, 21086, 21076, 21098, 21108,
+    21097, 21107, 21119, 21117, 21133, 21140, 21138, 21105, 21128, 21137,
+    36776, 36775, {f: 2, c: 21164}, 21180, 21173, 21185, 21197, 21207, 21214,
+    21219, 21222, 39149, 21216, 21235, 21237, 21240, [12051, 21241], 21254,
+    21256, 30008, 21261, 21264, 21263, [12052, 21269], [12053, 21274], 21283,
+    21295, 21297, 21299, [12054, 21304], 21312, 21318, 21317, 19991, 21321,
+    21325, 20950, 21342, [12057, 21353], 21358, 22808, 21371, 21367,
+    [12058, 21378], 21398, 21408, 21414, 21413, 21422, 21424, [12059, 21430],
+    21443, 31762, 38617, 21471, 26364, 29166, 21486, 21480, 21485, 21498,
+    21505, 21565, 21568, {f: 2, c: 21548}, 21564, 21550, 21558, 21545, 21533,
+    21582, 21647, 21621, 21646, 21599, 21617, 21623, 21616, 21650, 21627,
+    21632, 21622, 21636, 21648, 21638, 21703, 21666, 21688, 21669, 21676,
+    21700, 21704, 21672, 21675, 21698, 21668, 21694, 21692, 21720,
+    {f: 2, c: 21733}, 21775, 21780, 21757, 21742, 21741, 21754, 21730, 21817,
+    21824, 21859, 21836, 21806, 21852, 21829, {f: 2, c: 21846}, 21816, 21811,
+    21853, 21913, 21888, 21679, 21898, 21919, 21883, 21886, 21912, 21918,
+    21934, 21884, 21891, 21929, 21895, 21928, 21978, 21957, 21983, 21956,
+    21980, 21988, 21972, 22036, 22007, 22038, 22014, 22013, 22043, 22009,
+    22094, 22096, 29151, 22068, 22070, 22066, 22072, 22123, 22116, 22063,
+    22124, 22122, 22150, 22144, 22154, 22176, 22164, 22159, 22181, 22190,
+    22198, 22196, 22210, 22204, 22209, 22211, 22208, 22216, 22222, 22225,
+    22227, [12062, 22231], 22254, 22265, 22272, 22271, 22276, 22281, 22280,
+    22283, 22285, 22291, 22296, 22294, 21959, 22300, 22310, {f: 2, c: 22327},
+    22350, 22331, 22336, 22351, 22377, 22464, 22408, 22369, 22399, 22409,
+    22419, 22432, 22451, 22436, 22442, 22448, 22467, 22470, 22484,
+    {f: 2, c: 22482}, 22538, 22486, 22499, 22539, 22553, 22557, 22642, 22561,
+    22626, 22603, 22640, 27584, 22610, 22589, 22649, 22661, 22713, 22687,
+    22699, 22714, 22750, 22715, 22712, 22702, 22725, 22739, 22737, 22743,
+    22745, 22744, 22757, 22748, 22756, 22751, 22767, 22778, 22777,
+    {f: 3, c: 22779}, [12065, 22786], [12066, 22794], 22800, 22811, 26790,
+    22821, {f: 2, c: 22828}, 22834, 22840, 22846, 31442, 22869, 22864, 22862,
+    22874, 22872, 22882, 22880, 22887, 22892, 22889, 22904, 22913, 22941,
+    20318, 20395, 22947, 22962, 22982, 23016, 23004, 22925, {f: 2, c: 23001},
+    23077, 23071, 23057, 23068, 23049, 23066, 23104, 23148, 23113,
+    {f: 2, c: 23093}, 23138, 23146, 23194, 23228, 23230, 23243, 23234, 23229,
+    23267, 23255, 23270, 23273, 23254, {f: 2, c: 23290}, 23308, 23307, 23318,
+    23346, 23248, 23338, 23350, 23358, 23363, 23365, 23360, 23377, 23381,
+    {f: 2, c: 23386}, 23397, 23401, 23408, 23411, 23413, 23416, 25992, 23418,
+    [12071, 23424], 23427, 23462, 23480, 23491, 23495, 23497, 23508, 23504,
+    23524, 23526, 23522, 23518, 23525, 23531, 23536, 23542, 23539, 23557,
+    {f: 2, c: 23559}, 23565, 23571, 23584, [11920, 12074, 23586], 23592,
+    [12075, 23608], 23609, 23617, 23622, 23630, 23635, 23632, 23631, 23409,
+    23660, [12076, 23662], 20066, 23670, 23673, 23692, 23697, 23700, 22939,
+    23723, 23739, 23734, 23740, 23735, 23749, 23742, 23751, 23769, 23785,
+    23805, 23802, 23789, 23948, 23786, 23819, 23829, 23831, 23900, 23839,
+    23835, 23825, 23828, 23842, 23834, 23833, 23832, 23884, 23890, 23886,
+    23883, 23916, 23923, 23926, 23943, 23940, 23938, 23970, 23965, 23980,
+    23982, 23997, 23952, 23991, 23996, 24009, 24013, 24019, 24018, 24022,
+    [12078, 24027], 24043, 24050, 24053, 24075, 24090, 24089, 24081, 24091,
+    {f: 2, c: 24118}, 24132, 24131, 24128, 24142, 24151, 24148, 24159, 24162,
+    24164, 24135, {f: 2, c: 24181}, [11923, 12083, 24186], 40636,
+    [12084, 24191], 24224, {f: 2, c: 24257}, 24264, 24272, 24271, 24278, 24291,
+    24285, {f: 2, c: 24282}, 24290, 24289, {f: 2, c: 24296}, 24300, 24305,
+    24307, 24304, [12085, 24308], 24312, [12086, 24318], 24323, 24329, 24413,
+    24412, [12087, 24331], 24337, 24342, 24361, 24365, 24376, 24385, 24392,
+    24396, 24398, 24367, [11924, 24401], {f: 2, c: 24406}, 24409,
+    [12090, 24417], 24429, [12091, 24435], 24439, 24451, 24450, 24447, 24458,
+    24456, 24465, 24455, 24478, 24473, 24472, 24480, 24488, 24493, 24508,
+    24534, 24571, 24548, 24568, 24561, 24541, 24755, 24575, 24609, 24672,
+    24601, 24592, 24617, 24590, 24625, 24603, 24597, 24619, 24614, 24591,
+    24634, 24666, 24641, 24682, 24695, 24671, 24650, 24646, 24653, 24675,
+    24643, 24676, 24642, 24684, 24683, 24665, 24705, 24717, 24807, 24707,
+    24730, 24708, 24731, {f: 2, c: 24726}, 24722, 24743, 24715, 24801, 24760,
+    24800, 24787, 24756, 24560, 24765, 24774, 24757, 24792, 24909, 24853,
+    24838, {f: 2, c: 24822}, 24832, 24820, 24826, 24835, 24865, 24827, 24817,
+    {f: 2, c: 24845}, 24903, 24894, 24872, 24871, 24906, 24895, 24892, 24876,
+    24884, 24893, 24898, 24900, 24947, 24951, {f: 3, c: 24920}, 24939, 24948,
+    24943, 24933, 24945, 24927, 24925, 24915, 24949, 24985, 24982, 24967,
+    25004, 24980, 24986, 24970, 24977, 25003, 25006, 25036, 25034, 25033,
+    25079, 25032, 25027, 25030, 25018, 25035, 32633, 25037, 25062, 25059,
+    25078, 25082, 25076, 25087, 25085, 25084, 25086, 25088, [12093, 25096],
+    25097, 25101, 25100, 25108, 25115, 25118, 25121, 25130, 25134, 25136,
+    {f: 2, c: 25138}, 25153, 25166, 25182, 25187, 25179, 25184, 25192, 25212,
+    25218, 25225, 25214, {f: 2, c: 25234}, 25238, 25300, 25219, 25236, 25303,
+    25297, 25275, 25295, 25343, 25286, 25812, 25288, 25308, 25292, 25290,
+    25282, 25287, 25243, 25289, 25356, 25326, 25329, 25383, 25346, 25352,
+    25327, 25333, 25424, 25406, 25421, 25628, 25423, 25494, 25486, 25472,
+    25515, 25462, 25507, 25487, 25481, 25503, 25525, 25451, 25449, 25534,
+    25577, 25536, 25542, 25571, 25545, 25554, 25590, 25540, 25622, 25652,
+    25606, 25619, 25638, 25654, 25885, 25623, 25640, 25615, 25703, 25711,
+    25718, 25678, 25898, 25749, 25747, 25765, 25769, 25736, 25788, 25818,
+    25810, 25797, 25799, 25787, 25816, 25794, 25841, 25831, 33289,
+    {f: 2, c: 25824}, 25260, 25827, 25839, 25900, 25846, 25844, 25842, 25850,
+    25856, 25853, 25880, 25884, 25861, 25892, 25891, 25899, [12097, 25908],
+    [11929, 25909], 25911, 25910, 25912, 30027, 25928, 25942, 25941, 25933,
+    25944, 25950, 25949, 25970, 25976, {f: 2, c: 25986}, 35722, 26011, 26015,
+    26027, 26039, 26051, 26054, 26049, 26052, 26060, 26066, 26075, 26073,
+    [12102, 26080], [11931, 26081], 26097, 26482, 26122, 26115, 26107, 26483,
+    {f: 2, c: 26165}, 26164, 26140, 26191, 26180, 26185, 26177, 26206, 26205,
+    26212, {f: 2, c: 26215}, 26207, 26210, 26224, 26243, 26248, 26254, 26249,
+    26244, 26264, 26269, 26305, 26297, 26313, 26302, 26300, 26308, 26296,
+    26326, 26330, 26336, 26175, 26342, 26345, [12104, 26352], 26357, 26359,
+    26383, 26390, 26398, {f: 2, c: 26406}, 38712, 26414, 26431, 26422, 26433,
+    26424, 26423, 26438, 26462, 26464, 26457, {f: 2, c: 26467}, 26505, 26480,
+    26537, 26492, 26474, 26508, 26507, 26534, 26529, 26501, 26551, 26607,
+    26548, 26604, 26547, 26601, 26552, 26596, 26590, 26589, 26594, 26606,
+    26553, 26574, 26566, 26599, 27292, 26654, 26694, 26665, 26688, 26701,
+    26674, 26702, 26803, 26667, 26713, 26723, 26743, 26751, 26783, 26767,
+    26797, 26772, 26781, 26779, 26755, 27310, 26809, 26740, 26805, 26784,
+    26810, 26895, 26765, 26750, 26881, 26826, 26888, 26840, 26914, 26918,
+    26849, 26892, 26829, 26836, 26855, 26837, 26934, 26898, 26884, 26839,
+    26851, 26917, 26873, 26848, 26863, 26920, 26922, 26906, 26915, 26913,
+    26822, 27001, 26999, 26972, 27000, 26987, 26964, 27006, 26990, 26937,
+    26996, 26941, 26969, 26928, 26977, 26974, 26973, 27009, 26986, 27058,
+    27054, 27088, 27071, 27073, 27091, 27070, 27086, 23528, 27082, 27101,
+    27067, 27075, 27047, 27182, 27025, 27040, 27036, 27029, 27060, 27102,
+    27112, 27138, 27163, 27135, 27402, 27129, 27122, 27111, 27141, 27057,
+    27166, 27117, 27156, 27115, 27146, 27154, 27329, 27171, 27155, 27204,
+    27148, 27250, 27190, 27256, 27207, 27234, 27225, 27238, 27208, 27192,
+    27170, 27280, 27277, 27296, 27268, {f: 2, c: 27298}, 27287, 34327, 27323,
+    27331, 27330, 27320, 27315, 27308, 27358, 27345, 27359, 27306, 27354,
+    27370, 27387, 27397, 34326, 27386, 27410, 27414, 39729, 27423, 27448,
+    27447, 30428, 27449, 39150, 27463, 27459, 27465, 27472, 27481, 27476,
+    27483, 27487, 27489, 27512, [12109, 27513], {f: 2, c: 27519}, 27524, 27523,
+    27533, 27544, 27541, 27550, 27556, {f: 2, c: 27562}, 27567, 27570, 27569,
+    [12110, 27571], 27575, 27580, 27590, [12111, 27595], 27603, 27615, 27628,
+    27627, 27635, 27631, 40638, 27656, 27667, [12115, 27668], 27675, 27684,
+    27683, 27742, 27733, 27746, 27754, 27778, 27789, 27802, 27777, 27803,
+    27774, 27752, 27763, 27794, 27792, 27844, 27889, 27859, 27837, 27863,
+    27845, 27869, 27822, 27825, 27838, 27834, 27867, 27887, 27865, 27882,
+    27935, 34893, 27958, 27947, 27965, 27960, 27929, 27957, 27955, 27922,
+    27916, 28003, 28051, 28004, 27994, 28025, 27993, 28046, 28053, 28644,
+    28037, 28153, 28181, 28170, 28085, 28103, 28134, 28088, 28102, 28140,
+    28126, 28108, 28136, 28114, 28101, 28154, 28121, 28132, 28117, 28138,
+    28142, 28205, 28270, 28206, 28185, 28274, 28255, 28222, 28195, 28267,
+    28203, 28278, 28237, 28191, 28227, 28218, 28238, 28196, 28415, 28189,
+    28216, 28290, 28330, 28312, 28361, 28343, 28371, 28349, 28335, 28356,
+    28338, {f: 2, c: 28372}, 28303, 28325, 28354, 28319, 28481, 28433, 28748,
+    28396, 28408, 28414, 28479, 28402, 28465, 28399, 28466, 28364, 28478,
+    28435, 28407, 28550, 28538, 28536, 28545, 28544, 28527, 28507, 28659,
+    28525, 28546, 28540, 28504, 28558, 28561, 28610, 28518, 28595, 28579,
+    28577, 28580, 28601, 28614, 28586, 28639, 28629, 28652, 28628, 28632,
+    28657, 28654, 28635, 28681, 28683, 28666, 28689, 28673, 28687, 28670,
+    28699, 28698, 28532, 28701, 28696, 28703, 28720, 28734, 28722, 28753,
+    28771, 28825, 28818, 28847, 28913, 28844, 28856, 28851, 28846, 28895,
+    28875, 28893, 28889, 28937, 28925, 28956, 28953, 29029, 29013, 29064,
+    29030, 29026, 29004, 29014, 29036, 29071, 29179, 29060, 29077, 29096,
+    29100, 29143, 29113, 29118, 29138, 29129, 29140, 29134, 29152, 29164,
+    29159, 29173, 29180, 29177, 29183, 29197, 29200, 29211, 29224, 29229,
+    29228, 29232, 29234, [12120, 29243], 29244, [12121, 29247], 29248, 29254,
+    29259, 29272, 29300, 29310, 29314, 29313, 29319, 29330, 29334, 29346,
+    29351, 29369, 29362, 29379, 29382, 29380, 29390, 29394, 29410,
+    {f: 2, c: 29408}, 29433, 29431, 20495, 29463, 29450, 29468, 29462, 29469,
+    29492, 29487, 29481, 29477, 29502, {f: 2, c: 29518}, 40664, 29527, 29546,
+    29544, 29552, 29560, 29557, 29563, 29562, 29640, 29619, 29646, 29627,
+    29632, 29669, 29678, 29662, 29858, 29701, 29807, 29733, 29688, 29746,
+    29754, 29781, 29759, 29791, 29785, 29761, 29788, 29801, 29808, 29795,
+    29802, 29814, 29822, 29835, 29854, 29863, 29898, 29903, 29908, 29681,
+    29920, 29923, 29927, 29929, 29934, 29938, {f: 2, c: 29936}, 29944, 29943,
+    29956, 29955, 29957, 29964, 29966, 29965, 29973, 29971, 29982, 29990,
+    29996, 30012, 30020, 30029, 30026, 30025, 30043, 30022, 30042, 30057,
+    30052, 30055, 30059, 30061, 30072, 30070, {f: 2, c: 30086}, 30068, 30090,
+    30089, 30082, 30100, 30106, 30109, 30117, 30115, 30146, 30131, 30147,
+    30133, 30141, 30136, 30140, 30129, 30157, 30154, 30162, 30169, 30179,
+    30174, {f: 2, c: 30206}, 30204, 30209, 30192, 30202, {f: 2, c: 30194},
+    30219, 30221, 30217, 30239, 30247, {f: 3, c: 30240}, 30244, 30260, 30256,
+    30267, {f: 2, c: 30279}, 30278, 30300, 30296, {f: 2, c: 30305},
+    {f: 3, c: 30312}, 30311, 30316, 30320, 30322, [12136, 30326], 30328, 30332,
+    30336, 30339, 30344, 30347, 30350, 30358, 30355, {f: 2, c: 30361}, 30384,
+    30388, {f: 3, c: 30392}, 30402, 30413, 30422, 30418, 30430, 30433, 30437,
+    30439, 30442, 34351, 30459, 30472, 30471, 30468, 30505, 30500, 30494,
+    {f: 2, c: 30501}, 30491, {f: 2, c: 30519}, 30535, 30554, 30568, 30571,
+    30555, 30565, 30591, 30590, 30585, 30606, 30603, 30609, 30624, 30622,
+    30640, 30646, 30649, 30655, {f: 2, c: 30652}, 30651, 30663, 30669, 30679,
+    30682, 30684, 30691, 30702, 30716, 30732, 30738, 31014, 30752, 31018,
+    30789, 30862, 30836, 30854, 30844, 30874, 30860, 30883, 30901, 30890,
+    30895, 30929, 30918, 30923, 30932, 30910, 30908, 30917, 30922, 30956,
+    30951, 30938, 30973, 30964, 30983, 30994, 30993, 31001, 31020, 31019,
+    31040, 31072, 31063, 31071, 31066, 31061, 31059, 31098, 31103, 31114,
+    31133, 31143, 40779, 31146, 31150, 31155, {f: 2, c: 31161}, 31177, 31189,
+    31207, 31212, 31201, 31203, 31240, 31245, {f: 2, c: 31256}, 31264, 31263,
+    31104, 31281, 31291, 31294, 31287, 31299, 31319, 31305, {f: 2, c: 31329},
+    31337, 40861, 31344, 31353, 31357, 31368, 31383, 31381, 31384, 31382,
+    31401, 31432, 31408, 31414, 31429, 31428, 31423, 36995, 31431, 31434,
+    31437, 31439, 31445, 31443, {f: 2, c: 31449}, 31453, {f: 2, c: 31457},
+    31462, 31469, 31472, 31490, 31503, 31498, 31494, 31539, {f: 2, c: 31512},
+    31518, 31541, 31528, 31542, 31568, 31610, 31492, 31565, 31499, 31564,
+    31557, 31605, 31589, 31604, 31591, {f: 2, c: 31600}, 31596, 31598, 31645,
+    31640, 31647, 31629, 31644, 31642, 31627, 31634, 31631, 31581, 31641,
+    31691, 31681, 31692, 31695, 31668, 31686, 31709, 31721, 31761, 31764,
+    31718, 31717, 31840, 31744, 31751, 31763, 31731, 31735, 31767, 31757,
+    31734, 31779, 31783, 31786, 31775, 31799, 31787, 31805, 31820, 31811,
+    31828, 31823, 31808, 31824, 31832, 31839, 31844, 31830, 31845, 31852,
+    31861, 31875, 31888, 31908, 31917, 31906, 31915, 31905, 31912, 31923,
+    31922, 31921, 31918, 31929, 31933, 31936, 31941, 31938, 31960, 31954,
+    31964, 31970, 39739, 31983, 31986, 31988, 31990, 31994, 32006, 32002,
+    32028, 32021, 32010, 32069, 32075, 32046, 32050, 32063, 32053, 32070,
+    32115, 32086, 32078, 32114, 32104, 32110, 32079, 32099, 32147, 32137,
+    32091, 32143, 32125, 32155, 32186, 32174, 32163, 32181, 32199, 32189,
+    32171, 32317, 32162, 32175, 32220, 32184, 32159, 32176, 32216, 32221,
+    32228, 32222, 32251, 32242, 32225, 32261, 32266, 32291, 32289, 32274,
+    32305, 32287, 32265, 32267, 32290, 32326, 32358, 32315, 32309, 32313,
+    32323, 32311, 32306, 32314, 32359, 32349, 32342, 32350, {f: 2, c: 32345},
+    32377, 32362, 32361, 32380, 32379, 32387, 32213, 32381, 36782, 32383,
+    {f: 2, c: 32392}, 32396, 32402, 32400, {f: 2, c: 32403}, 32406, 32398,
+    {f: 2, c: 32411}, 32568, 32570, 32581, {f: 3, c: 32588}, 32592,
+    [12153, 32593], 32597, 32596, 32600, {f: 2, c: 32607}, {f: 2, c: 32616},
+    32615, 32632, 32642, 32646, 32643, 32648, 32647, 32652, 32660, 32670,
+    32669, 32666, 32675, 32687, 32690, 32697, 32686, 32694, 32696, 35697,
+    {f: 2, c: 32709}, 32714, 32725, 32724, 32737, 32742, 32745, 32755, 32761,
+    39132, 32774, 32772, 32779, [12158, 32786], {f: 2, c: 32792}, 32796, 32801,
+    32808, 32831, 32827, 32842, 32838, 32850, 32856, 32858, 32863, 32866,
+    32872, 32883, 32882, 32880, 32886, 32889, 32893, [12160, 32895], 32900,
+    32902, 32901, 32923, 32915, 32922, 32941, 20880, 32940, 32987, 32997,
+    32985, 32989, 32964, 32986, 32982, 33033, 33007, 33009, 33051, 33065,
+    33059, 33071, 33099, 38539, 33094, 33086, 33107, 33105, 33020, 33137,
+    33134, {f: 2, c: 33125}, 33140, 33155, 33160, 33162, 33152, 33154, 33184,
+    33173, 33188, 33187, 33119, 33171, 33193, 33200, 33205, 33214, 33208,
+    33213, 33216, 33218, 33210, 33225, 33229, 33233, 33241, 33240, 33224,
+    33242, {f: 2, c: 33247}, 33255, {f: 2, c: 33274}, 33278, {f: 2, c: 33281},
+    33285, 33287, 33290, 33293, 33296, 33302, 33321, 33323, 33336, 33331,
+    33344, 33369, 33368, 33373, 33370, 33375, 33380, 33378, 33384,
+    {f: 2, c: 33386}, 33326, 33393, 33399, [12171, 33400], 33406, 33421, 33426,
+    33451, 33439, 33467, 33452, 33505, 33507, 33503, 33490, 33524, 33523,
+    33530, 33683, 33539, 33531, 33529, 33502, 33542, 33500, 33545, 33497,
+    33589, 33588, 33558, 33586, 33585, 33600, 33593, 33616, 33605, 33583,
+    33579, {f: 2, c: 33559}, 33669, 33690, 33706, 33695, 33698, 33686, 33571,
+    33678, 33671, 33674, 33660, 33717, 33651, 33653, 33696, 33673, 33704,
+    33780, 33811, 33771, 33742, 33789, 33795, 33752, 33803, 33729, 33783,
+    33799, 33760, 33778, 33805, 33826, 33824, 33725, 33848, 34054, 33787,
+    33901, 33834, 33852, 34138, 33924, 33911, 33899, 33965, 33902, 33922,
+    33897, 33862, 33836, 33903, 33913, 33845, 33994, 33890, 33977, 33983,
+    33951, 34009, 33997, 33979, 34010, 34000, 33985, 33990, 34006, 33953,
+    34081, 34047, 34036, {f: 2, c: 34071}, 34092, 34079, 34069, 34068, 34044,
+    34112, 34147, 34136, 34120, 34113, 34306, 34123, 34133, 34176, 34212,
+    34184, 34193, 34186, 34216, 34157, 34196, 34203, 34282, 34183, 34204,
+    34167, 34174, 34192, 34249, 34234, 34255, 34233, 34256, 34261, 34269,
+    34277, 34268, 34297, 34314, 34323, 34315, 34302, 34298, 34310, 34338,
+    34330, 34352, 34367, [12172, 34381], 20053, 34388, 34399, 34407, 34417,
+    34451, 34467, {f: 2, c: 34473}, {f: 2, c: 34443}, 34486, 34479, 34500,
+    34502, 34480, 34505, 34851, 34475, 34516, 34526, 34537, 34540, 34527,
+    34523, 34543, 34578, 34566, 34568, 34560, 34563, 34555, 34577, 34569,
+    34573, 34553, 34570, 34612, 34623, 34615, 34619, 34597, 34601, 34586,
+    34656, 34655, 34680, 34636, 34638, 34676, 34647, 34664, 34670, 34649,
+    34643, 34659, 34666, 34821, 34722, 34719, 34690, 34735, 34763, 34749,
+    34752, 34768, 38614, 34731, 34756, 34739, 34759, 34758, 34747, 34799,
+    34802, 34784, 34831, 34829, 34814, {f: 2, c: 34806}, 34830, 34770, 34833,
+    34838, 34837, 34850, 34849, 34865, 34870, 34873, 34855, 34875, 34884,
+    34882, 34898, 34905, 34910, 34914, 34923, 34945, 34942, 34974, 34933,
+    34941, 34997, 34930, 34946, 34967, 34962, 34990, 34969, 34978, 34957,
+    34980, 34992, 35007, 34993, {f: 2, c: 35011}, 35028, {f: 2, c: 35032},
+    35037, 35065, 35074, 35068, 35060, 35048, 35058, 35076, 35084, 35082,
+    35091, 35139, 35102, 35109, {f: 2, c: 35114}, 35137, 35140, 35131, 35126,
+    35128, 35148, 35101, 35168, 35166, 35174, 35172, 35181, 35178, 35183,
+    35188, 35191, [12177, 35198], 35203, 35208, 35210, 35219, 35224, 35233,
+    35241, 35238, 35244, 35247, 35250, 35258, 35261, {f: 2, c: 35263}, 35290,
+    {f: 2, c: 35292}, 35303, 35316, 35320, 35331, 35350, 35344, 35340, 35355,
+    35357, 35365, 35382, 35393, 35419, 35410, 35398, 35400, 35452, 35437,
+    35436, 35426, 35461, 35458, 35460, 35496, 35489, 35473, {f: 2, c: 35493},
+    35482, 35491, 35524, 35533, 35522, 35546, 35563, 35571, 35559, 35556,
+    35569, 35604, 35552, 35554, 35575, 35550, 35547, 35596, 35591, 35610,
+    35553, 35606, 35600, 35607, 35616, 35635, 38827, 35622, 35627, 35646,
+    35624, 35649, 35660, 35663, 35662, 35657, 35670, 35675, 35674, 35691,
+    35679, 35692, 35695, 35700, 35709, 35712, 35724, 35726, {f: 2, c: 35730},
+    35734, {f: 2, c: 35737}, 35898, 35905, 35903, 35912, 35916, 35918, 35920,
+    [12183, 35925], 35938, 35948, [12184, 35960], 35962, 35970, 35977, 35973,
+    35978, {f: 2, c: 35981}, 35988, 35964, 35992, 25117, 36013, 36010, 36029,
+    {f: 2, c: 36018}, 36014, 36022, 36040, 36033, 36068, 36067, 36058, 36093,
+    {f: 2, c: 36090}, {f: 2, c: 36100}, 36106, 36103, 36111, 36109, 36112,
+    40782, 36115, 36045, 36116, 36118, 36199, 36205, 36209, 36211, 36225,
+    36249, 36290, 36286, 36282, 36303, 36314, 36310, 36300, 36315, 36299,
+    {f: 2, c: 36330}, 36319, 36323, 36348, {f: 2, c: 36360}, 36351,
+    {f: 2, c: 36381}, 36368, 36383, 36418, 36405, 36400, 36404, 36426, 36423,
+    36425, 36428, 36432, 36424, 36441, 36452, 36448, 36394, 36451, 36437,
+    36470, 36466, 36476, 36481, 36487, 36485, 36484, 36491, 36490, 36499,
+    36497, 36500, 36505, 36522, 36513, 36524, 36528, 36550, 36529, 36542,
+    36549, 36552, 36555, 36571, 36579, 36604, 36603, 36587, 36606, 36618,
+    36613, 36629, 36626, 36633, 36627, 36636, 36639, 36635, 36620, 36646,
+    36659, 36667, 36665, 36677, 36674, 36670, 36684, 36681, 36678, 36686,
+    36695, 36700, {f: 3, c: 36706}, 36764, 36767, 36771, 36781, 36783, 36791,
+    36826, 36837, 36834, 36842, 36847, 36999, 36852, 36869, {f: 2, c: 36857},
+    36881, 36885, 36897, 36877, 36894, 36886, 36875, 36903, 36918, 36917,
+    36921, 36856, {f: 4, c: 36943}, 36878, 36937, 36926, 36950, 36952, 36958,
+    36968, 36975, 36982, 38568, 36978, 36994, 36989, 36993, 36992, 37002,
+    37001, 37007, 37032, 37039, 37041, 37045, 37090, 37092, 25160, 37083,
+    37122, 37138, 37145, 37170, 37168, 37194, 37206, 37208, 37219, 37221,
+    37225, 37235, 37234, 37259, 37257, 37250, 37282, 37291, 37295, 37290,
+    37301, 37300, 37306, {f: 2, c: 37312}, 37321, 37323, 37328, 37334, 37343,
+    37345, 37339, 37372, {f: 2, c: 37365}, 37406, 37375, 37396, 37420, 37397,
+    37393, 37470, 37463, 37445, 37449, 37476, 37448, 37525, 37439, 37451,
+    37456, 37532, 37526, 37523, 37531, 37466, 37583, 37561, 37559, 37609,
+    37647, 37626, 37700, 37678, 37657, 37666, 37658, 37667, 37690, 37685,
+    37691, 37724, 37728, 37756, 37742, 37718, 37808, {f: 2, c: 37804}, 37780,
+    37817, {f: 2, c: 37846}, 37864, 37861, 37848, 37827, 37853, 37840, 37832,
+    37860, 37914, 37908, 37907, 37891, 37895, 37904, 37942, 37931, 37941,
+    37921, 37946, 37953, 37970, 37956, 37979, 37984, 37986, 37982, 37994,
+    37417, 38000, 38005, 38007, 38013, 37978, 38012, 38014, 38017, 38015,
+    38274, 38279, 38282, 38292, 38294, {f: 2, c: 38296}, 38304, 38312, 38311,
+    38317, 38332, 38331, 38329, 38334, 38346, 28662, 38339, 38349, 38348,
+    38357, 38356, 38358, 38364, 38369, 38373, 38370, 38433, 38440,
+    {f: 2, c: 38446}, 38466, 38476, 38479, 38475, 38519, 38492, 38494, 38493,
+    38495, 38502, 38514, 38508, 38541, 38552, 38549, 38551, 38570, 38567,
+    {f: 2, c: 38577}, 38576, 38580, [12202, 38582], 38584, [12203, 38585],
+    38606, 38603, 38601, 38605, 35149, 38620, 38669, 38613, 38649, 38660,
+    38662, 38664, 38675, 38670, 38673, 38671, 38678, 38681, 38692, 38698,
+    38704, 38713, {f: 2, c: 38717}, 38724, 38726, 38728, 38722, 38729, 38748,
+    38752, 38756, 38758, 38760, 21202, 38763, 38769, 38777, 38789, 38780,
+    38785, 38778, 38790, 38795, {f: 2, c: 38799}, 38812, 38824, 38822, 38819,
+    {f: 2, c: 38835}, 38851, 38854, 38856, [12209, 38859], 38876,
+    [12210, 38893], 40783, 38898, 31455, 38902, 38901, 38927, 38924, 38968,
+    38948, 38945, 38967, 38973, 38982, 38991, 38987, 39019, {f: 3, c: 39023},
+    39028, 39027, 39082, 39087, 39089, 39094, 39108, 39107, 39110, 39145,
+    39147, 39171, 39177, 39186, 39188, 39192, 39201, {f: 2, c: 39197}, 39204,
+    39200, 39212, 39214, {f: 2, c: 39229}, 39234, 39241, 39237, 39248, 39243,
+    {f: 2, c: 39249}, 39244, 39253, {f: 2, c: 39319}, 39333, {f: 2, c: 39341},
+    39356, 39391, 39387, 39389, 39384, 39377, {f: 2, c: 39405},
+    {f: 2, c: 39409}, 39419, 39416, 39425, 39439, 39429, 39394, 39449, 39467,
+    39479, 39493, 39490, 39488, 39491, 39486, 39509, 39501, 39515, 39511,
+    39519, 39522, 39525, 39524, 39529, 39531, 39530, 39597, 39600, 39612,
+    39616, 39631, 39633, {f: 2, c: 39635}, 39646, [12221, 39647],
+    {f: 2, c: 39650}, 39654, 39663, 39659, 39662, 39668, 39665, 39671, 39675,
+    39686, 39704, 39706, 39711, {f: 2, c: 39714}, [12222, 39717],
+    {f: 4, c: 39719}, 39726, [12223, 39727], [12224, 39730], 39748, 39747,
+    39759, {f: 2, c: 39757}, 39761, 39768, 39796, 39827, 39811, 39825,
+    {f: 2, c: 39830}, {f: 2, c: 39839}, 39848, 39860, 39872, 39882, 39865,
+    39878, 39887, {f: 2, c: 39889}, 39907, 39906, 39908, 39892, 39905, 39994,
+    39922, 39921, 39920, 39957, 39956, 39945, 39955, 39948, 39942, 39944,
+    39954, 39946, 39940, 39982, 39963, 39973, 39972, 39969, 39984, 40007,
+    39986, 40006, 39998, 40026, 40032, 40039, 40054, 40056, 40167, 40172,
+    40176, 40201, 40200, 40171, 40195, 40198, 40234, 40230, 40367, 40227,
+    40223, 40260, 40213, 40210, 40257, 40255, 40254, 40262, 40264,
+    {f: 2, c: 40285}, 40292, 40273, 40272, 40281, 40306, 40329, 40327, 40363,
+    40303, 40314, 40346, 40356, 40361, 40370, 40388, 40385, 40379, 40376,
+    40378, 40390, 40399, 40386, 40409, 40403, 40440, 40422, 40429, 40431,
+    40445, {f: 2, c: 40474}, 40478, [12228, 40565], 40569, 40573, 40577, 40584,
+    {f: 2, c: 40587}, 40594, 40597, 40593, 40605, [12230, 40613], 40617, 40632,
+    40618, 40621, 38753, 40652, {f: 3, c: 40654}, 40660, 40668, 40670, 40669,
+    40672, 40677, 40680, 40687, 40692, {f: 2, c: 40694}, [12235, 40697],
+    {f: 2, c: 40699}, [12236, 40701], {f: 2, c: 40711}, 30391, 40725, 40737,
+    40748, 40766, [12241, 40778], [12242, 40786], 40788, 40803,
+    {f: 3, c: 40799}, {f: 2, c: 40806}, 40812, 40810, 40823, 40818, 40822,
+    40853, [12244, 40860], [12245, 40864], 22575, 27079, 36953, 29796, 0,
+    {f: 76, c: 9472}, {f: 20, c: 9312}, {f: 10, c: 8544}, 13129, 13076, 0,
+    13133, 0, 13095, 0, 13110, 13137, 0, 13069, 13094, 0, 13099, 13130, 0,
+    {f: 3, c: 13212}, {f: 2, c: 13198}, 13252, 13217, 12317, 12319, 8470,
+    13261, 0, {f: 5, c: 12964}, {f: 2, c: 12849}, 12857, 13182, 13181, 13180,
+    8750, 8721, {s: 3}, 8735, 8895, 0, 0, 21854, {s: 7}, 167133, 0, 0, 28976,
+    0, 40407, {s: 4}, 64054, 0, 0, 22169, 15694, {s: 4}, 20448, 0, 0, 36544, 0,
+    194797, {s: 4}, 153716, 32363, 33606, 167670, {s: 3}, 40572, 0, 0, 26171,
+    0, 40628, {s: 4}, 26629, {s: 5}, 23650, 0, 194780, 0, 32353, 0, 0, 64070,
+    {s: 5}, 34083, 37292, {s: 7}, 34796, {s: 8}, 25620, 0, 0, 39506, {s: 4},
+    64074, 0, 194692, {s: 4}, 31774, {s: 6}, 64016, 25681, 0, 0, 63980, 22625,
+    39002, 0, 194679, {s: 3}, 31153, 0, 28678, {s: 9}, 22218, {s: 3}, 21085, 0,
+    28497, 37297, {s: 10}, 64106, {s: 6}, 38960, 0, 40629, {s: 9}, 33802,
+    63939, {f: 2, c: 63890}, 63897, 0, 34847, 194575, 0, 194771, 194584,
+    {s: 7}, 137754, 23643, {s: 4}, 25890, 0, 0, 26618, 0, 26766, 0, 148432,
+    194848, {s: 21}, 34110, {s: 15}, 30562, {s: 12}, 65075, 0,
+    {f: 2, c: 65073}, {s: 4}, 65072, {f: 2, c: 65077}, {f: 2, c: 65081}, 0, 0,
+    {f: 2, c: 65079}, {f: 2, c: 65087}, {f: 2, c: 65085}, {f: 4, c: 65089},
+    {f: 2, c: 65083}, {s: 41}, {f: 3, c: 12436}, 0, 0, 22099, {s: 41}, 65508,
+    65287, 65282, 0, 9665, 9655, 8681, 8679, 8678, 8680, 9634, 9831, 9825,
+    9828, 9826, 13216, 13218, {f: 2, c: 13220}, 13207, 8467, 13208, 13235,
+    13234, 13233, 13232, {f: 3, c: 13189}, 13259, 13200, 13268, 13206, 13090,
+    13078, 13080, 13077, 13059, 13091, 13143, 13122, 13113, 13115, 13056,
+    13105, 13127, 13086, 13098, 0, 13183, 8481, 9742, 12342, 12320, {s: 3},
+    {f: 9, c: 9352}, {f: 20, c: 9332}, 12881, {f: 10, c: 8560},
+    {f: 10, c: 12882}, {f: 26, c: 9372}, 12867, 12861, 12863, 12852, 12856,
+    12851, 12860, 12866, 12862, 12854, 12853, 12859, 12864, 12858, 12976,
+    12973, 12969, 12975, 12948, 12970, 12952, 12971, 12946, 12945, 12947,
+    12972, 12974, 12950, {s: 8}, {f: 3, c: 9131}, 0, {f: 3, c: 9127}, 0, 13260,
+    13061, 0, 0, 13215, 13219, 13222, 0, 0, 12958, {f: 2, c: 13192}, 13256,
+    8749, 0, 12848, {f: 6, c: 12842}, 12855, 12865, 10145, {s: 3}, 9673, 9824,
+    9829, 9827, 9830, {f: 4, c: 9728}, 9758, {f: 2, c: 9756}, 9759, 12953,
+    9450, {f: 2, c: 8554}, {s: 3}, {f: 8, c: 9601}, 9615, 9614, 9613, 9612,
+    9611, 9610, 9609, {f: 2, c: 9620}, {f: 2, c: 9581}, 9584, 9583, 9552, 9566,
+    9578, 9569, {f: 2, c: 9698}, 9701, 9700, 0, 0, {f: 3, c: 9585}, {s: 20},
+    20956, 29081, {f: 9, c: 10102}, {s: 3}, {f: 2, c: 8570}, {s: 3}, 8575,
+    8458, 8457, 0, 0, 12292, 8646, {f: 2, c: 8644}, 0, {f: 4, c: 12535}, 0, 0,
+    12957, {s: 3}, 13179, {s: 3}, 13107, 13134, {s: 30}, 32394, 35100, 37704,
+    37512, 34012, 20425, 28859, 26161, 26824, 37625, 26363, 24389,
+    [12033, 20008], 20193, 20220, 20224, 20227, 20281, 20310, 20370, 20362,
+    20378, 20372, 20429, 20544, 20514, 20479, 20510, 20550, 20592, 20546,
+    20628, 20724, 20696, 20810, 20836, 20893, 20926, 20972, 21013, 21148,
+    21158, 21184, 21211, 21248, 0, 21284, 21362, 21395, 21426, 21469, 64014,
+    21660, 21642, 21673, 21759, 21894, 22361, 22373, 22444, 22472, 22471,
+    64015, 0, 22686, 22706, 22795, 22867, 22875, 22877, 22883, 22948, 22970,
+    23382, 23488, 29999, 23512, 0, 23582, 23718, 23738, 23797, 23847, 23891, 0,
+    23874, 23917, {f: 2, c: 23992}, 24016, 24353, 24372, 24423, 24503, 24542,
+    24669, 24709, 24714, 24798, 24789, 24864, 24818, 24849, 24887, 24880,
+    24984, 25107, 25254, 25589, 25696, 25757, 25806, 25934, 26112, 26133,
+    26121, 26158, 0, 26148, 26213, 26199, 26201, 64018, 26227, 26265, 26272,
+    26290, 26303, 26362, 26382, 0, 26470, 26555, 26706, 26560, 0, 26692, 26831,
+    64019, 26984, 64020, 27032, 27106, 27184, 27243, 27206, 27251, 27262,
+    27362, 27364, 27606, 27711, 27740, 27782, 27759, 27866, 27908, 28039,
+    28015, 28054, 28076, 28111, 28152, 28146, 28156, 28217, 28252, 28199,
+    28220, 28351, 28552, 28597, 28661, 28677, 28679, 28712, 28805, 28843,
+    28943, 28932, 29020, {f: 2, c: 28998}, 0, 29121, 29182, 29361, 29374,
+    29476, 64022, 29559, 29629, 29641, 29654, 29667, 29650, 29703, 29685,
+    29734, 29738, 29737, 29742, 0, 29833, 29855, 29953, 30063, 30338, 30364,
+    30366, 30363, 30374, 64023, 30534, 21167, 30753, 30798, 30820, 30842,
+    31024, {f: 3, c: 64024}, 31124, 64027, 31131, 31441, 31463, 64028, 31467,
+    31646, 64029, 32072, 0, 32183, 32160, 32214, 32338, 32583, 32673, 64030,
+    33537, 33634, 33663, 33735, 33782, 33864, 33972, 34131, 34137, 34155,
+    64031, 34224, {f: 2, c: 64032}, 34823, 35061, 35346, 35383, 35449, 35495,
+    35518, 35551, 64034, 35574, 35667, 35711, 36080, 36084, 36114, 36214,
+    64035, 36559, 0, 64037, 36967, 37086, 64038, 37141, 37159, 37338, 37335,
+    37342, {f: 2, c: 37357}, {f: 2, c: 37348}, 37382, 37392, 37386, 37434,
+    37440, 37436, 37454, 37465, 37457, 37433, 37479, 37543, {f: 2, c: 37495},
+    37607, 37591, 37593, 37584, 64039, 37589, 37600, 37587, 37669, 37665,
+    37627, 64040, 37662, 37631, 37661, 37634, 37744, 37719, 37796, 37830,
+    37854, 37880, 37937, 37957, 37960, 38290, 0, 64041, 38557, 38575, 38707,
+    38715, 38723, 38733, 38735, [12205, 38737], 0, 38999, 39013,
+    {f: 2, c: 64042}, 39207, 64044, 39326, 39502, 39641, 39644, 39797, 39794,
+    39823, 39857, 39867, 39936, 40304, 40299, 64045, 40473, 40657, {s: 636},
+    8364, 8486, 0, 0, 64256, {f: 2, c: 64259}, 257, 299, 363, 275, 333, 256,
+    298, 362, 274, 332, {f: 4, c: 8539}, {f: 2, c: 8531}, 8304,
+    {f: 6, c: 8308}, {f: 10, c: 8320}, 461, 282, 0, 7868, 463, 0, 296, 465, 0,
+    467, 366, 360, 462, 283, 0, 7869, 464, 0, 297, 466, 0, 468, 367, 361, 593,
+    8049, 8048, 509, 0, 596, 0, 0, 601, 0, 0, 602, 0, 0, 603, 8051, 8050, 0,
+    331, 629, 652, 0, 0, 658, 643, 720, {s: 682}, {f: 10, c: 12832}, {s: 108},
+    {f: 4, c: 12892}, {f: 15, c: 12977}, {s: 50}, {f: 26, c: 9424},
+    {f: 26, c: 9398}, {s: 48}, {f: 47, c: 13008}, 0, {f: 10, c: 12928}, 12944,
+    {f: 6, c: 12938}, 0, 12959, {s: 6}, {f: 2, c: 12960}, 12955, 12954, 12963,
+    12962, 12951, 0, 12956, 12949, {s: 6}, 9676, {s: 11}, 10111,
+    {f: 10, c: 9451}, {s: 510}, 8414, {s: 815}, 13274, {s: 3}, 8448, 13250, 0,
+    0, 8453, 0, 13169, 0, 0, 13197, 13211, {s: 3}, {f: 2, c: 13271}, {s: 3},
+    {f: 2, c: 13057}, 13060, 13062, 0, 13064, 0, 13063, 13066, 0, 13065, 0,
+    13067, 0, 13068, {f: 6, c: 13070}, 0, 13079, 0, 13081, 0, {f: 4, c: 13082},
+    {f: 3, c: 13087}, 13092, 0, 13093, 0, 0, {f: 2, c: 13096}, 0, 13101, 0, 0,
+    {f: 3, c: 13102}, 13106, 0, 0, {f: 2, c: 13108}, 13116, {s: 3}, 13111, 0,
+    13112, 13114, 13117, 13121, {f: 3, c: 13118}, {f: 4, c: 13123}, 13128,
+    {f: 2, c: 13131}, {f: 2, c: 13135}, 0, 0, 13138, 13140, 0, 0, 13139,
+    {f: 2, c: 13141}, {s: 132}, 8501, 976, 8714, 8463, 0, 981, 987, 977, 0,
+    {f: 2, c: 9832}, 9836, {s: 5}, 12347, 0, {f: 3, c: 12339}, 8252, 8265,
+    {s: 5}, 8723, 0, 8771, {f: 2, c: 8818}, {s: 6}, {f: 2, c: 12312},
+    {f: 2, c: 65375}, {s: 10}, 9115, {f: 2, c: 9117}, 9120, {s: 4}, 9121,
+    {f: 2, c: 9123}, 9126, {s: 12}, [9116, 9119, 9122, 9125, 9130], {s: 8},
+    9986, 0, 0, 12349, 0, 12447, 0, 0, 8709, 8864, 8854, 8856, 8853, 8855,
+    {s: 4}, 9664, 9654, {s: 4}, 8656, 8596, {f: 2, c: 8600}, {f: 2, c: 8598},
+    8652, 8651, {s: 10}, 12336, 8967, {s: 8}, 10048, 10047, {s: 7}, 9643, 0,
+    9642, 0, 10010, {s: 12}, 9702, {s: 4}, 10070, {s: 379}, {f: 2, c: 65093},
+    {s: 679}, 64103, 64098, 32227, [12232, 40643], 28331, 64082, 64061, 64069,
+    64062, 27114, 28212, 64096, 64071, 64056, 64066, 64078, 34395, 64105,
+    64052, 64099, 25581, 25802, 30799, 64084, 63856, 64077, 64097, 64072,
+    64076, {f: 2, c: 64091}, 64081, 64067, 64090, 28041, 29376, 0, 194885,
+    64086, 64080, 64049, 64059, 24034, 64063, 64101, 21373, 64055, 64095,
+    24501, 64064, 0, 64083, 0, 64085, 64104, 64068, 64089, 26202, 64053, 64075,
+    64100, 64065, 64048, 0, 64057, 64051, 27493, 64058, 27599, 64050, 25150,
+    64079, 63773, 63964, 63798, 28122, 63952, 26310, 27511, 64087, 37706, 0,
+    37636, {s: 120}, 133390, {s: 120}, 35999, 11991, [11965, 158033], {s: 5},
+    37555, 38321, 0, 0, 194812, {s: 13}, 194965, {s: 8}, 194794, 0, 26478,
+    11974, 0, 194594, {s: 13}, 13314, 0, 0, 26083, {s: 4}, 134071, {s: 10},
+    171339, 0, 194611, 24378, {s: 8}, 11945, 0, 20465, {s: 7}, 63753, {s: 7},
+    11964, 0, 0, 194732, 26435, {s: 3}, 133732, 35329, 25142, 0, 0, 21555,
+    23067, {s: 3}, 25221, 0, 0, 194819, {s: 6}, 21567, {s: 9}, 27506, {s: 4},
+    29986, 19256, 0, 0, 24063, {s: 6}, 194827, 29626, 134047, {s: 3}, 194600,
+    0, 194849, {s: 5}, 194623, {s: 16}, 194675, {f: 2, c: 11916}, 23577,
+    {s: 3}, 131083, 23426, 194642, {s: 5}, 11997, [11999, 39136],
+    [11998, 169599], 14221, 0, [11927, 14586], 0, 194887, 0, [11909, 20155],
+    131490, {s: 7}, 13599, 0, 194738, 0, 0, [11971, 35200], {s: 4}, 31237,
+    {s: 4}, 35498, 0, 32085, 0, 28568, {s: 7}, 25591, 30246, {s: 4},
+    [11978, 163767], {s: 5}, 146686, {s: 5}, 13351, 0, 0, 33067, 0, 0, 194842,
+    {s: 5}, 11950, {s: 5}, 194714, {s: 3}, 194831, {s: 19}, 22305, 135741,
+    194586, 0, 64003, {s: 7}, 21534, 15240, 20839, {s: 4}, 63839, {s: 9},
+    20023, {s: 13}, [11946, 150804], 24421, 23020, 194658, 0, 24217, {s: 46},
+    13416, {s: 8}, 21200, {s: 9}, 26625, 0, 195024, 195039, {s: 5}, 153215, 0,
+    0, 11959, {s: 4}, 36534, 63775, {s: 3}, 63875, {s: 5}, 31867, 63906, 0,
+    63898, 0, [11961, 32770], 157360, {s: 4}, [11911, 132648], 0, 0, 131210,
+    194604, [11915, 13630], {s: 4}, 21589, 0, 22841, 0, 0, 23414, 194669,
+    23572, 14306, 23782, 0, 20040, 0, 0, 194742, {s: 4}, 158105, 25371, 0, 0,
+    26211, 0, 194779, 0, 0, 27126, 27014, {s: 3}, 27596, 0, 28183, 0, 0, 27818,
+    {s: 3}, [11942, 20012], 0, 0, 29935, 30069, 30188, 30286, 16305, 30570,
+    30633, {s: 6}, 31571, 0, 0, 16996, {s: 3}, 194924, 0, 0, 32328, {s: 5},
+    11955, {s: 4}, 33089, 17491, 0, [11966, 33401], [11967, 64094],
+    [11968, 64093], 0, 20857, 33626, {s: 3}, 17701, 0, 34292, 131248, {s: 4},
+    34429, 0, 13358, 35014, {s: 6}, 18406, {s: 8}, 36808, {s: 19}, 166279, 0,
+    0, 167447, 0, 0, 38969, {s: 6}, 39432, {s: 4}, 39903, {s: 10}, 148206,
+    {s: 5}, 21385, 0, 64017, 194785, 0, 146622, 132625, 0, {f: 2, c: 19972},
+    19999, 20011, {f: 2, c: 20015}, {f: 2, c: 20032}, 20036, [11907, 20058],
+    20095, 20109, 20118, 20153, 20176, 20192, 20221, 20223, 20235, 20245,
+    20320, 20283, 20297, 20308, 20346, {f: 2, c: 20349}, 20375, 20414, 20431,
+    20477, {f: 2, c: 20480}, 20496, 20507, 20519, 20526, 20567, 20582, 20586,
+    20539, 20623, 20630, 20636, 20684, 20710, 20713, 20719, 20744, 20747,
+    20752, 20763, 20766, 20831, 20897, 20924, 0, 20974, 20980, 20993,
+    [11913, 20994], 21011, 21065, 21089, 21094, 21139, 21192, 21232,
+    {f: 2, c: 21258}, 21310, 21324, 21323, 21345, 21356, 21419, 21466, 21478,
+    21493, 21543, 21581, 21606, 21611, 21620, 21645, 21654, 21665, 21677,
+    21689, 21695, 21702, 21709, 21774, 21803, 21813, 21834, 21856, 0, 21896,
+    21902, 22024, {f: 2, c: 22030}, 22071, 22079, 22089, 22091, 22095, 22118,
+    22121, 22127, {f: 2, c: 22129}, 22165, 22170, {f: 2, c: 22188}, 22193,
+    22217, 22237, 22244, 22282, 22293, 22307, 22319, {f: 2, c: 22323}, 22348,
+    22384, 22412, 22428, 22456, 22502, 22509, {f: 2, c: 22517}, 22527, 22537,
+    22560, 22578, 22652, 22656, 22697, 22734, 22736, 22740, 22746, 22761,
+    22796, 22820, 22831, 22881, 22893, 22986, 22994, 23005, {f: 2, c: 23011},
+    23044, 23052, 23075, 23111, 23125, 23139, 23149, 23166, 23198, 23207,
+    23212, 23219, 23264, 23296, 23321, 23333, 23341, 23361, 23420,
+    {f: 2, c: 23422}, 23434, [11919, 23587], 23595, 23600, 23651, 23657, 23676,
+    23755, 23762, 23796, 23844, 23846, 23875, 23878, 23882, 23954, 23956,
+    23961, 23968, 24024, 24032, 24056, 24064, 24082, {f: 2, c: 24084}, 24088,
+    24110, 24152, {f: 2, c: 24171}, 24232, 24234, {f: 2, c: 24254}, 0, 24274,
+    24327, 24334, {f: 2, c: 24348}, 24354, 24360, 24374, 24379, 24384,
+    [12089, 24400], 24408, 24420, 24457, 24476, 24487, 24484, 24495, 24504,
+    [11926, 24516], 24521, 24545, 24553, 24557, 24572, 24599, 24602, 24627,
+    24673, 24703, 24734, 24740, 24752, 24779, 24795, 24824, {f: 3, c: 24850},
+    24860, 24956, 24973, 24991, 25000, 25026, 25055, 25109, 25129, 25155,
+    25158, [11928, 25164], 25169, 25174, 25284, 25340, 25354, 25357, 25368,
+    25401, {f: 2, c: 25410}, 25445, 25460, 25469, 25476, 25479, 25488, 25502,
+    25553, 25564, 25609, 25616, 25634, 25684, 25691, 25709, 25723,
+    {f: 2, c: 25790}, 25829, 25847, 25851, 25860, 25878, 25881, 25927, 25959,
+    25985, 25989, 26050, 26096, 26098, 26156, 26188, {f: 2, c: 26203}, 26209,
+    26219, 0, 26276, 26312, 26348, 26373, 26387, 26419, 26440, 26444, 26486,
+    26491, 26544, 26546, 26617, 26583, 26585, 26608, 26668, {f: 2, c: 26672},
+    26715, 26738, 26741, 26746, 26756, 26789, 26802, 26832, 26838, 26856,
+    26861, {f: 2, c: 26864}, 26876, 26897, 26899, 26933, 26939, 26967, 26979,
+    26994, {f: 2, c: 27007}, 27046, 27053, 27063, {f: 2, c: 27094}, 27137,
+    27151, 27157, 27176, 27188, 27198, 27205, {f: 2, c: 27216}, 27222, 27227,
+    27267, 27273, 27281, {f: 3, c: 27293}, 27356, 27367, 27372, 27422, 27428,
+    27445, 27462, 27478, 27488, 27522, 27582, 27617, 27633, 27664, 27699,
+    [11937, 27701], 11938, 27737, 27766, 27771, 27781, 27797, 27804, 27856,
+    27860, 27862, 27872, {f: 2, c: 27883}, 27886, 27914, 27918, 27921, 27950,
+    27991, 27998, 28005, 28034, 28095, 28100, 28106, 28118, 28137, 28194,
+    28241, 28359, 28362, 28366, 28413, 28442, 28458, 28463, 28467, 28506,
+    28510, 28514, 28541, 28555, 28557, 28562, 28564, 28570, {f: 2, c: 28583},
+    28598, 28634, 28638, 0, 28729, 28732, 0, 28756, {f: 2, c: 28765}, 28772,
+    [11939, 28780], 28798, 28801, 28821, 28855, {f: 2, c: 28883}, 28888, 28892,
+    28935, 28960, 28977, 29002, 29010, 29024, 29049, 29074, 0, 29131, 29139,
+    29142, 29184, 29213, 29227, 29240, 29249, 29267, {f: 2, c: 29269}, 29276,
+    29325, [11944, 29357], 29364, 29383, 29435, {f: 2, c: 29444}, 29480, 29489,
+    29507, 29548, 29564, 29571, {f: 2, c: 29573}, 29589, {f: 3, c: 29598},
+    29606, 29611, 29621, 29623, 29628, 29647, 29657, 29673, 29684, 29693,
+    29700, 29706, {f: 2, c: 29722}, 29732, 29736, 29740, {f: 3, c: 29743},
+    29753, 29764, 29767, 29771, 29773, 29777, 29783, 29798, 29803, 29809,
+    29824, {f: 3, c: 29829}, 29840, 29848, 29852, 29856, 29859, 29864, 29867,
+    29877, 29887, 29896, 29914, 29918, 30030, 30073, 30081, 30096,
+    [12135, 30098], 30099, 30132, 30180, 30201, 30208, 30218, {f: 2, c: 30229},
+    30233, 30238, 30253, 30261, 30275, 30283, 30309, 30317, 30319, 30321,
+    30324, {f: 2, c: 30372}, 30405, 30412, 30444, 30460, 30516, 30518, 30556,
+    {f: 2, c: 30559}, 30578, 30589, 30613, 30634, 30694, 30704, 30708, 30726,
+    30754, {f: 2, c: 30765}, 30768, 30773, 30824, 30878, 30920, 30924, 30926,
+    30948, {f: 2, c: 30944}, 30962, 30967, 30971, 31025, 0, [11949, 31035],
+    31037, 31045, {f: 2, c: 31067}, 31115, 31126, 31128, [12145, 31160], 31163,
+    31178, 31194, 31235, 31241, 31249, 31262, 31277, 31289, 31301, 31308,
+    31325, 0, 31341, 31352, 31392, 31395, 31411, {f: 2, c: 31419}, 31430,
+    31495, 31508, 31527, 31537, 31559, 31566, 31584, 31593, 31597, 31602,
+    31633, 31663, 31703, 31705, 31755, 31759, 31776, 31782, 31793, 31798,
+    31825, 31833, 31847, 31854, 31856, 31932, 31935, {f: 2, c: 31944}, 31959,
+    31961, 31965, 31979, {f: 3, c: 32007}, 32019, 32029, 32035, 32065, 32083,
+    32089, 32093, 32122, 32134, {f: 2, c: 32139}, 32204, 32235, 32241, 32249,
+    32264, 32273, 32277, 32288, 32327, 32354, 32366, 32371, 32397, 32401,
+    32408, 32580, 32591, [11947, 11954, 32594], [11953, 32595], 32609, 32657,
+    32703, 32718, 32735, 32741, 32748, {f: 2, c: 32750}, 32762, 32782, 32785,
+    32788, 32804, 32806, 32826, 32828, 32864, 32881, 32885, 32926, 32934,
+    32939, {f: 2, c: 32983}, 33046, 33048, 33082, 33098, 33100, 33153, 33156,
+    33204, 33231, 33273, 33283, 33313, 33330, 33332, 33350, 33355, 33359,
+    33422, 33454, 33463, 33470, 33478, 33534, 33603, 33617, 33621, 33670,
+    33677, 33682, 33688, 33705, {f: 2, c: 33727}, 33770, 33807, 33809, 33866,
+    33910, 33960, 33967, 33984, 33986, 34032, 34045, 34060, 34100, 34142,
+    34191, 34231, 34254, 34221, 34322, 34345, 34386, 34403, 34412, 34415,
+    34426, 34445, 34449, 34456, {f: 2, c: 34471}, 34554, 34557, 34571, 34579,
+    34585, 34590, 34600, 34622, 34673, 34696, 34713, {f: 2, c: 34732}, 34741,
+    34774, 34795, 34797, 34817, 0, 34822, 34827, 34836, 34844, 34902, 34911,
+    [11970, 34916], 34968, 34986, {f: 2, c: 35005}, 35018, 35026, 35035,
+    {f: 2, c: 35056}, 35078, {f: 3, c: 35096}, 35111, 35120, 35134, 35195,
+    35284, 35286, 35301, 35313, 35335, 35343, 35349, 35362, 35406, 35455,
+    35572, 35615, 35639, {f: 2, c: 35651}, 35668, 35740, 35742, 35911, 35924,
+    35955, 36004, 36057, 36065, 36088, 36094, 36123, 36201, 36204, 36228,
+    36237, 36245, 36262, 36294, 36302, 36324, 36332, 36384, 36427, 36460,
+    36464, 36474, 36498, 36526, 36531, 36561, 36564, 36601, 36631, 36662,
+    36774, [12193, 36789], [11981, 36790], 0, 36832, 36836, 36854, 36866,
+    36908, 36932, 37000, 37013, 37017, 37019, 37026, 37044, 37079, 37085,
+    37108, 37143, 37148, 37169, 37178, 37181, 37192, 37211, 37217, 37220,
+    37262, 37278, 37288, {f: 2, c: 37293}, 37298, 37308, 37360, 37367, 37371,
+    37383, 37416, 37427, 37432, 37443, 37447, 37455, 37472, 37570,
+    {f: 2, c: 37579}, 37599, 37645, 37653, 37663, 37671, 37703, 37714, 0,
+    37738, 37741, 37787, 37818, 37801, 37825, 37834, 37858, 37882, 37885,
+    37903, 37940, 37951, 37973, 37995, 38002, [11986, 38264], 38310, 38313, 0,
+    38324, 38333, 38362, [11983, 11990, 38429], 38465, 38488, 38532, 38564,
+    38569, 38610, 195060, 38622, 38633, 38641, 38658, 38665, 38746, 38755,
+    38766, 38771, 38810, 38818, {f: 2, c: 38837}, 38873, 38878, 38900, 38922,
+    38926, 38942, 38947, 38955, 38974, {f: 2, c: 38994}, 39001, 39020, 39096,
+    39098, 39103, 39112, 39141, {f: 2, c: 39218}, 39232, 39245, 39260, 39263,
+    39345, {f: 2, c: 39353}, 39369, 39426, 39446, 39460, 39463,
+    {f: 2, c: 39469}, 39478, 39480, 39498, 39510, {f: 2, c: 39605}, 39673,
+    39683, 39712, {f: 2, c: 39731}, 39795, 39801, 39847, 39873, 39879, 39895,
+    39911, 39915, 39927, 39930, 39933, 39947, 39975, 39978, 39990, 40001,
+    40019, 40035, 40048, 40055, 40194, 40258, 40263, 40291, 40297, 40316,
+    40318, 40333, 40369, 40387, 40391, 40406, 40415, 40427, 40436, 40469,
+    40477, 40612, 40616, 40620, 40679, 40686, 40720, 40722, 40727, 40729,
+    40751, 40759, 40761, 40769, 40773, 40791, 40808, 40817, 40821, 40848,
+    40852, 40866, 0, 13317, 194564, 22048, 24267, 11925, 0, 144954, 0, 28665,
+    28390, 29107, [11940, 64073], {s: 4}, [11980, 64102], 0, 23986, 0, 20435,
+    20697, 20720, 20931, 22134, 27220, 27905, 28112, 28226, 28377, 29668,
+    29729, 30060, 30801, 34805, 144382, 29608, 15091, 13531, 17420, 16010, 0,
+    0, 19432, 0, 16090, 15138, 0, 17786, 16531, 0, 18021, 16643, 17043, 18094,
+    13448, 140809, {f: 3, c: 63584}, 63610, 63615, {s: 23}, {f: 2, c: 8836},
+    {f: 2, c: 8842}, 8713, 0, {f: 2, c: 8965}, {s: 9}, {f: 2, c: 8741},
+    {s: 14}, 8802, 0, 8773, 8776, {f: 2, c: 8822}, {s: 4}, 8487, {s: 209},
+    {f: 2, c: 8922}, 8533, 8984, {f: 2, c: 7742}, {f: 2, c: 504}, 470, 472,
+    474, 476, 260, 728, 317, 346, 350, 356, 377, 379, 261, 731, 318, 347, 711,
+    351, 357, 378, 733, 380, 340, 258, 313, 262, 268, 280, 270, 323, 327, 336,
+    344, 368, 354, 341, 259, 314, 263, 269, 281, 271, 273, 324, 328, 337, 345,
+    369, 355, 729, 264, 284, 292, 308, 348, 364, 265, 285, 293, 309, 349, 365,
+    625, 651, 638, 620, 622, 633, 648, 598, 627, 637, 642, 656, 635, 621, 607,
+    626, 669, 654, 609, 624, 641, 295, 661, 660, 614, 664, 450, 595, 599, 644,
+    608, 403, 616, 649, 600, 604, 606, 592, 623, 650, 612, 594, 653, 613, 674,
+    673, 597, 657, 634, 615, 865, 712, 716, 721, 8255, 783, {f: 5, c: 741}, 0,
+    0, 805, 812, 825, 796, {f: 2, c: 799}, 829, 809, 815, 734, 804, 816, 828,
+    820, {f: 2, c: 797}, {f: 2, c: 792}, 810, {f: 2, c: 826}, 794, {s: 3},
+    {f: 2, c: 610}, 618, 628, 630, 632, 640, 655, 665, 668, 671, 688, 690, 695,
+    704, {f: 2, c: 736}, {s: 6}, 8862, {s: 287}, 12348, 12543, 0,
+    {f: 2, c: 12310}, 9838, 9835, {f: 2, c: 10548}, 10687, 0, 12448, 0,
+    {f: 2, c: 10746}, {s: 13}, 962, {f: 10, c: 9461}, {f: 2, c: 9750}, 9649,
+    {f: 10, c: 12784}, 0, {f: 6, c: 12794}, {f: 15, c: 9150}, 0, 0, 10003, 0,
+    9251, 9166, {f: 4, c: 9680}, {f: 2, c: 8263}, 0, 8273, 8258,
+    {f: 16, c: 12688}, {s: 13}, {f: 2, c: 9136}, {f: 12, c: 9842},
+    {f: 2, c: 12441}, 8413, {s: 450}, 20296, 20319, 20330, 20332, 20494, 20504,
+    20545, 20722, 20688, 20742, 20739, 20789, 20821, 20823, 13493, 20938,
+    20962, 21079, 21196, 21206, 21243, 21276, 21347, 21405, 21522, 21631,
+    21640, 21840, 21889, 21933, 21966, 22075, 22174, 22185, 22195, 22391,
+    22396, 135963, 22479, 22500, 22628, 22665, 136302, 22738, 22752, 34369,
+    22923, 22930, 22979, 23059, 23143, 23159, 23172, 23236, 137405, 23421,
+    23443, 23570, 64060, 136884, 23674, 23695, 23711, 23715, 23722, 23760,
+    138804, 23821, 23879, 23937, 23972, 23975, 24011, 24158, 24313, 24320,
+    24322, 24355, 24381, 24404, 24445, 24589, 24596, 24600, 24629, 24647,
+    24733, 24788, 24797, 24875, 25020, 25017, 25122, 25178, 25199, 25302,
+    25468, 25573, 25721, 25796, 25808, 25897, 26013, 26170, 26146, 26155,
+    26160, 26163, 26184, 143812, {f: 2, c: 26231}, 26253, 26299, 26331, 26344,
+    26439, 26497, 26515, 26520, 26523, 26620, 26653, 26787, 26890, 26953,
+    144836, 26946, 26980, 27045, 27087, 15286, 15299, 27113, 27125, 145215,
+    27195, 145251, 27284, 27301, 15375, 27419, 27436, 27495, 27561, 27565,
+    27607, 27647, 27653, 27764, 27800, 27899, 27846, 27953, 27961, 27967,
+    27992, 28052, 28074, 28123, 28125, 28228, 28254, 28337, 28353, 28432,
+    28505, 28513, 28542, 28556, 28576, 28604, 28615, 28618, 28656, 28750,
+    28789, 28836, 28900, 28971, 28958, 28974, 29009, 29032, 29061, 29063,
+    29114, 29124, 29205, 15935, 29339, 149489, 29479, 29520, 29542, 29602,
+    29739, 29766, 29794, 29805, 29862, 29865, 29897, 29951, 29975, 16242,
+    30158, 30210, 30216, 30308, 30337, 30365, 30378, 30390, 30414, 30420,
+    30438, 30449, 30474, 30489, {f: 2, c: 30541}, 30586, 30592, 30612, 30688,
+    152718, 30787, 30830, 30896, 152846, 30893, 30976, 31004, 31022, 31028,
+    31046, 31097, 31176, 153457, 31188, 31198, 31211, 31213, 31365, 154052,
+    31438, 31485, 31506, 31533, 31547, 31599, 31745, 31795, 155041, 31853,
+    31865, 31887, 31892, 31904, 31957, 32049, 32092, 32131, 32166, 32194,
+    32296, 32663, 32731, 32821, 32823, 32970, 32992, 33011, 33120,
+    {f: 2, c: 33127}, 33133, 33211, 33226, 33239, 17499, 33376, 33396, 158463,
+    33441, {f: 2, c: 33443}, 33449, 33471, 33493, 33533, 33536, 33570, 33581,
+    33594, 33607, 33661, 33703, 33743, 33745, 33761, 33793, 33798, 33887,
+    33904, 33907, 33925, 33950, 33978, 159296, 34098, 34078, 34095, 34148,
+    34170, 34188, 34210, 34251, 34285, 34303, {f: 2, c: 34308}, 34320, 159988,
+    34328, 34360, 34391, 34402, 17821, 34421, 34488, 34556, 34695, 17898,
+    34826, 34832, 35022, 161412, 35122, 35129, 35136, 35220, 35318, 35399,
+    35421, 35425, 35445, 35536, 35654, 35673, 35689, 35741, 35913, 35944,
+    36271, 36305, 36311, 36387, 36413, 36475, 164471, 18500, 36602, 36638,
+    36653, 36692, 164813, 36840, 36846, 36872, 36909, 37015, 37043, 37054,
+    {f: 2, c: 37060}, 37063, 37103, 37140, 37142, {f: 2, c: 37154}, 37167,
+    37172, 37251, 37361, 37705, {f: 2, c: 37732}, 37795, 37855, 37892, 37939,
+    37962, 37987, 38001, 38286, 38303, 38316, 38326, 38347, 38352, 38355,
+    18864, 38366, 38565, 38639, 38734, 38805, 38830, 38842, 38849, 38857,
+    38875, 38998, 39143, 39256, 39427, 39617, 39619, 39630, 39638, 39682,
+    39688, 19479, 39725, 39774, 39782, 39812, 39818, 39838, 39886, 39909,
+    39928, 39971, {f: 2, c: 40015}, 40037, {f: 2, c: 40221}, 40259, 40274,
+    40330, 40342, 40384, 40364, 40380, 172432, 40423, 40455, 40606, 40623,
+    40855, 131209, 19970, 19983, 19986, 20009, 20014, 20039, 131234, 20049,
+    13318, 131236, 20073, 20125, 13356, 20156, 20163, 20168, 20203, 20186,
+    20209, 20213, 20246, 20324, 20279, 20286, 20312, 131603, {f: 2, c: 20343},
+    20354, 20357, 20454, 20402, 20421, 20427, 20434, 13418, 20466, 20499,
+    20508, 20558, 20563, 20579, 20643, 20616, {f: 2, c: 20626}, 20629, 20650,
+    131883, 20657, {f: 2, c: 20666}, 20676, 20679, 20723, 131969, 20686,
+    131953, 20692, 20705, 13458, 132089, 20759, 132170, 20832, 132361, 20851,
+    20867, 20875, 13500, 20888, 20899, 20909, 13511, 132566, 20979, 21010,
+    21014, 132943, 21077, 21084, 21100, 21111, 21124, 21122, 133127, 21144,
+    133178, 21156, {f: 2, c: 21178}, 21194, 21201, 133305, 21239, 21301, 21314,
+    133500, 133533, 21351, 21370, 21412, 21428, 133843, 21431, 21440, 133917,
+    {f: 2, c: 13661}, 21461, 13667, 21492, 21540, 21544, 13678, 21571, 21602,
+    21612, 21653, 21664, 21670, 21678, 21687, 21690, 21699, 134469, 21740,
+    21743, 21745, 21747, {f: 2, c: 21760}, 21769, 21820, 21825, 13734, 21831,
+    13736, 21860, 134625, 21885, 21890, 21905, 13765, 21970, 134805, 134765,
+    21951, 21961, 21964, 21969, 21981, 13786, 21986, 134756, 21993, 22056,
+    135007, 22023, 22032, 22064, 13812, 22077, 22080, 22087, 22110, 22112,
+    22125, 13829, 22152, 22156, 22173, 22184, 22194, 22213, 22221, 22239,
+    22248, {f: 2, c: 22262}, 135681, 135765, 22313, 135803, {f: 2, c: 22341},
+    22349, 135796, 22376, 22383, {f: 3, c: 22387}, 22395, 135908, 135895,
+    22426, {f: 2, c: 22429}, 22440, 22487, 135933, 22476, 135990, 136004,
+    22494, 22512, 13898, 22520, 22523, 22525, 22532, 22558, 22567, 22585,
+    136132, 22601, 22604, 22631, {f: 2, c: 22666}, 22669, {f: 2, c: 22671},
+    22676, 22685, 22698, 22705, 136301, 22723, 22733, 22754, {f: 2, c: 22771},
+    {f: 2, c: 22789}, 22797, 22804, 136663, 13969, 22845, 13977, 22854, 13974,
+    158761, 22879, 136775, {f: 2, c: 22901}, 22908, 22943, 22958, 22972, 22984,
+    22989, 23006, 23015, 23022, 136966, 137026, 14031, 23053, 23063, 23079,
+    23085, 23141, 23162, 23179, 23196, {f: 2, c: 23199}, 23202, 23217, 23221,
+    23226, 23231, 23258, 23260, 23269, 23280, 23278, 23285, 23304, 23319,
+    23348, 23372, 23378, 23400, 23407, 23425, 23428, 137667, 23446, 23468,
+    {f: 2, c: 14177}, 23502, 23510, 14188, 14187, 23537, 23549, 14197, 23555,
+    23593, 138326, 23647, {f: 2, c: 23655}, 23664, 138541, 138565, 138616,
+    138594, 23688, 23690, 14273, 138657, 138652, 23712, 23714, 23719, 138642,
+    23725, 23733, 138679, 23753, 138720, 138803, 23814, 23824, 23851, 23837,
+    23840, 23857, 23865, 14312, 23905, 23914, 14324, 23920, 139038, 14333,
+    23944, 14336, 23959, 23984, 23988, 139126, 24017, 24023, 139258, 24036,
+    24041, 14383, 14390, 14400, 24095, 24126, 24137, 14428, 24150, 14433,
+    {f: 2, c: 24173}, 139643, 24229, 24236, 24249, 24262, 24281, 140062, 24317,
+    24328, 140205, 24350, 24391, 24419, 24434, 24446, 24463, 24482, 24519,
+    24523, {f: 3, c: 24530}, 24546, {f: 2, c: 24558}, 24563, 14615, 24610,
+    24612, 14618, 24652, 24725, 24744, 141043, 24753, 24766, 24776, 24793,
+    24814, 24821, 24848, 24857, 24862, 24890, 14703, 24897, 24902, 24928,
+    141403, {f: 2, c: 24978}, 24983, 24997, 25005, 141483, 25045, 25053, 25077,
+    141711, 25123, 25170, 25185, 25188, 25211, 25197, 25203, 25241, 25301,
+    142008, 25341, 25347, 25360, {f: 2, c: 142159}, 25394, 25397,
+    {f: 2, c: 25403}, 25409, 25412, 25422, 142150, 25433, 142365, 142246,
+    25452, 25497, 142372, 25492, 25533, {f: 2, c: 25556}, 25568,
+    {f: 2, c: 25579}, 25586, 25630, 25637, 25641, 25647, 25690, 25693, 25715,
+    25725, 25735, 25745, 25759, {f: 2, c: 25803}, 25813, 25815, 142817, 25828,
+    25855, 14958, 25871, 25876, 14963, 25886, 25906, 25924, 25940, 25963,
+    25978, 25988, 25994, 26034, 26037, 26040, 26047, 26057, 26068, 15062,
+    26105, 26108, 26116, 26120, 26145, 26154, 26181, 26193, 26190, 15082,
+    143811, 143861, 143798, 26218, {f: 2, c: 26220}, 26235, 26240, 26256,
+    26258, 15118, 26285, 26289, 26293, 15130, 15132, 15063, 26369, 26386,
+    144242, 26393, 144339, 144338, 26445, 26452, 26461, 144336, 144356, 144341,
+    26484, 144346, 26514, 144351, 33635, 26640, 26563, 26568, 26578, 26587,
+    26615, 144458, 144465, 144459, 26648, 26655, 26669, 144485, 26675, 26683,
+    26686, 26693, 26697, 26700, 26709, 26711, 15223, 26731, 26734, 26748,
+    26754, 26768, 26774, 15213, {f: 3, c: 26776}, 26780, {f: 2, c: 26794},
+    26804, 26811, 26875, 144612, 144730, 26819, 26821, 26828, 26841,
+    {f: 2, c: 26852}, 26860, 26871, 26883, 26887, 15239, 144788, 15245, 26950,
+    26985, 26988, 27002, 27026, 15268, 27030, 27056, 27066, 27068, 27072,
+    27089, 144953, 144967, 144952, 27107, {f: 2, c: 27118}, 27123, 15309,
+    27124, 27134, 27153, 27162, 27165, 145180, {f: 2, c: 27186}, 27199, 27209,
+    27258, 27214, 27218, 27236, 145164, 27275, 15344, 27297, 145252, 27307,
+    27325, 27334, 27348, 27344, 27357, 145407, 145383, {f: 3, c: 27377}, 27389,
+    145444, 27403, {f: 3, c: 27407}, 145469, 27415, 15398, 27439, 27466, 27480,
+    27500, 27509, [11934, 27514], 27521, 27547, 27566, 146072, 27581,
+    {f: 3, c: 27591}, 27610, {f: 2, c: 27622}, 27630, 27650, 27658, 27662,
+    27702, 146559, 27725, 27739, 27757, 27780, 27785, 15555, 27796, 27799,
+    27821, 27842, 15570, 27868, 27881, 27885, 146688, 27904, 27940,
+    {f: 2, c: 27942}, 27751, 27951, 27964, 27995, 28000, 28016,
+    {f: 2, c: 28032}, 28042, 28045, 28049, 28056, 146752, 146938, 146937,
+    146899, 28075, 28078, 28084, 28098, 27956, 28104, 28110, 28127, 28150,
+    28214, 28190, 15633, 28210, {f: 2, c: 28232}, {f: 2, c: 28235}, 28239,
+    {f: 2, c: 28243}, 28247, 28259, 15646, 28307, 28327, 28340, 28355, 28469,
+    28395, 28409, 28411, 28426, 28428, 28440, 28453, 28470, 28476, 147326,
+    28498, 28503, 28512, 28520, 28560, 28566, 28606, 28575, 28581, 28591,
+    15716, {f: 2, c: 28616}, 28649, 147606, 28668, 28672, 28682, 28707, 147715,
+    28730, 28739, 28743, 28747, 15770, 28773, 28777, 28782, 28790, 28806,
+    28823, 147910, 28831, 28849, 147966, 28908, 28874, 28881, 28931, 28934,
+    28936, 28940, 15808, 28975, 29008, 29011, 29022, 15828, 29078, 29056,
+    29083, 29088, 29090, {f: 2, c: 29102}, 148412, 29145, 29148, 29191, 15877,
+    29236, 29241, 29250, 29271, 29283, 149033, {f: 2, c: 29294}, 29304, 29311,
+    29326, 149157, 29358, 29360, 29377, 15968, 29388, 15974, 15976, 29427,
+    29434, 29447, 29458, {f: 2, c: 29464}, 16003, 29497, 29484, 29491, 29501,
+    29522, 16020, 29547, 149654, {f: 2, c: 29550}, 29553, 29569, 29578, 29588,
+    29592, 29596, 29605, 29625, 29631, 29637, 29643, 29665, 29671, 29689,
+    29715, 29690, 29697, 29779, 29760, 29763, 29778, 29789, 29825, 29832,
+    150093, 29842, 29847, 29849, 29857, 29861, 29866, 29881, 29883, 29882,
+    29910, 29912, 29931, 150358, 29946, 150383, 29984, 29988, 29994, 16215,
+    150550, {f: 2, c: 30013}, 30016, 30024, 30032, 30034, 30066, 30065, 30074,
+    {f: 2, c: 30077}, 30092, 16245, 30114, 16247, 30128, 30135,
+    {f: 2, c: 30143}, 30150, 30159, 30163, 30173, {f: 2, c: 30175}, 30183,
+    30190, 30193, 30211, 30232, 30215, 30223, 16302, 151054, 30227,
+    {f: 2, c: 30235}, 151095, 30245, 30248, 30268, 30259, 151146, 16329, 30273,
+    151179, 30281, 30293, 16343, 30318, 30357, 30369, 30368, {f: 2, c: 30375},
+    30383, 151626, 30409, 151637, 30440, 151842, 30487, 30490, 30509, 30517,
+    151977, 16441, 152037, 152013, 30552, 152094, 30588, 152140, 16472, 30618,
+    30623, 30626, 30628, {f: 2, c: 30686}, 30692, 30698, 30700, 30715, 152622,
+    30725, 30729, 30733, 30745, 30764, 30791, 30826, 152793, 30858, 30868,
+    30884, 30877, 30879, 30907, 30933, 30950, {f: 2, c: 30969}, 30974, 152999,
+    30992, 31003, 31013, 31050, 31064, 16645, 31079, 31090, 31125, 31137,
+    31145, 31156, 31170, 31175, {f: 2, c: 31180}, 31190, 16712, 153513, 153524,
+    16719, 31242, 31253, 31259, 16739, 31288, 31303, 31318, 31321, 31324,
+    31327, 31335, 31338, 31349, 31362, 31370, 31376, 31404, 154068, 16820,
+    31417, 31422, 16831, 31436, 31464, 31476, 154340, 154339, 154353, 31549,
+    31530, {f: 2, c: 31534}, 16870, 16883, 31615, 31553, 16878, 31573, 31609,
+    31588, 31590, 31603, 154546, 16903, 31632, 31643, 16910, 31669, 31676,
+    31685, 31690, 154699, 154724, 31700, 31702, 31706, 31722, 31728, 31747,
+    31758, 31813, 31818, 31831, 31838, 31841, 31849, 31855, 155182, 155222,
+    155237, 31910, 155234, {f: 2, c: 31926}, 155352, 31940, 155330, 31949,
+    155368, 155427, 31974, 155484, 31989, 32003, 17094, 32018, 32030, 155616,
+    155604, {f: 2, c: 32061}, 32064, 32071, 155660, 155643, 17110, 32090,
+    32106, 32112, 17117, 32127, 155671, 32136, 32151, 155744, 32157, 32167,
+    32170, 32182, 32192, 32215, 32217, 32230, 17154, 155885, 64088, 32272,
+    32279, 32285, 32295, 32300, 32325, 32373, 32382, {f: 2, c: 32390}, 17195,
+    32410, 17219, 32572, 32571, 32574, 32579, 13505, 156272, 156294,
+    {f: 2, c: 32611}, 32621, {f: 2, c: 32637}, 32656, 20859, 146702, 32662,
+    32668, 32685, 156674, 32707, 32719, 32739, 32754, 32778, 32776, 32790,
+    32812, 32816, 32835, 32870, 32891, 32921, 32924, 32932, 32935, 32952,
+    157310, 32965, 32981, 32998, 33037, 33013, 33019, 17390, 33077, 33054,
+    17392, 33060, 33063, 33068, 157469, 33085, 17416, 33129, 17431, 17436,
+    33157, 17442, 33176, 33202, 33217, 33219, 33238, 33243, 157917, 33252,
+    157930, 33260, 33277, 33279, 158063, 33284, 158173, 33305, 33314, 158238,
+    33340, 33353, 33349, 158296, 17526, 17530, 33367, 158348, 33372, 33379,
+    158391, 17553, 33405, 33407, 33411, 33418, 33427, {f: 2, c: 33447}, 33458,
+    33460, 33466, 33468, 33506, 33512, 33527, {f: 2, c: 33543}, 33548, 33620,
+    33563, 33565, 33584, 33596, 33604, 33623, 17598, 17620, 17587,
+    {f: 2, c: 33684}, 33691, 33693, 33737, 33744, 33748, 33757, 33765, 33785,
+    33813, 158835, 33815, 33849, 33871, {f: 2, c: 33873}, {f: 2, c: 33881},
+    33884, 158941, 33893, 33912, 33916, 33921, 17677, 33943, 33958, 33982,
+    17672, {f: 2, c: 33998}, 34003, 159333, 34023, 34026, 34031, 34033, 34042,
+    34075, {f: 2, c: 34084}, 34091, 34127, 34159, 17731, 34129,
+    {f: 2, c: 34145}, 159636, 34171, 34173, 34175, 34177, 34182, 34195, 34205,
+    34207, 159736, {f: 2, c: 159734}, 34236, 34247, 34250, {f: 2, c: 34264},
+    34271, 34273, 34278, 34294, 34304, 34321, 34334, 34337, 34340, 34343,
+    160013, 34361, 34364, 160057, 34368, 34387, 34390, 34423, 34439, 34441,
+    {f: 2, c: 34460}, 34481, 34483, 34497, 34499, 34513, 34517, 34519, 34531,
+    34534, 17848, 34565, 34567, 34574, 34576, 34591, 34593, 34595, 34609,
+    34618, 34624, 34627, 34641, 34648, {f: 2, c: 34660}, 34674, 34684, 160731,
+    160730, 34727, 34697, 34699, 34707, 34720, 160766, 17893, 34750, 160784,
+    34753, 34766, 34783, 160841, 34787, {f: 2, c: 34789}, 34794, 34835, 34856,
+    34862, 34866, 34876, 17935, 34890, 34904, 161301, 161300, 34921, 161329,
+    34927, 34976, 35004, 35008, 161427, 35025, 35027, 17985, 35073, 161550,
+    35127, 161571, 35138, 35141, 35145, 161618, 35170, 35209, 35216, 35231,
+    35248, 35255, 35288, 35307, 18081, 35315, 35325, 35327, 18095, 35345,
+    35348, 162181, 35361, 35381, 35390, 35397, 35405, 35416, 35502, 35472,
+    35511, 35543, 35580, 162436, 35594, 35589, 35597, 35612, 35629, 18188,
+    35665, 35678, 35702, 35713, 35723, {f: 2, c: 35732}, 35897, 162739, 35901,
+    162750, 162759, 35909, 35919, 35927, 35945, 35949, 163000, 35987, 35986,
+    35993, 18276, 35995, 36054, 36053, 163232, 36081, 163344, 36105, 36110,
+    36296, 36313, 36364, 18429, 36349, 36358, 163978, 36372, 36374,
+    {f: 2, c: 36385}, 36391, 164027, 18454, 36406, 36409, 36436, 36450, 36461,
+    36463, 36504, 36510, 36533, 36539, 164482, 18510, 164595, 36608, 36616,
+    36651, 36672, 36682, 36696, 164876, 36772, 36788, 164949, 36801, 36806,
+    64036, 36810, 36813, 36819, 36821, 36849, 36853, 36859, 36876, 36919,
+    165227, 36931, 36957, {f: 2, c: 165320}, 36997, 37004, 37008, 37025, 18613,
+    37040, 37046, 37059, 37064, 165591, 37084, 37087, 165626, 37110, 37106,
+    37120, 37099, {f: 2, c: 37118}, 37124, 37126, 37144, 37150, 37175, 37177,
+    {f: 2, c: 37190}, 37207, 37209, 37236, 37241, 37253, 37299, 37302,
+    {f: 2, c: 37315}, 166217, 166214, 37356, 37377, {f: 2, c: 37398}, 166251,
+    37442, 37450, 37462, 37473, 37477, 37480, 166280, {f: 2, c: 37500}, 37503,
+    37513, 37517, 37527, 37529, 37535, 37547, {f: 2, c: 166330}, 37554,
+    {f: 2, c: 37567}, 37574, 37582, 37605, 37649, 166430, 166441, 37623, 37673,
+    166513, 166467, 37713, 37722, 37739, 37745, 37747, 37793, 166553, 166605,
+    37768, 37771, 37775, 37790, 37877, 166628, 166621, 37873, 37831, 37852,
+    37863, 37897, {f: 2, c: 37910}, 37883, 37938, 37947, 166849, 166895, 37997,
+    37999, 38265, 38278, {f: 2, c: 38284}, 167184, 167281, 38344, 167419,
+    167455, 38444, {f: 2, c: 38451}, 167478, 38460, 38497, 167561, 38530,
+    167659, 38554, 167730, 18919, 38579, 38586, 38589, 18938, 167928, 38616,
+    38618, 38621, 18948, 38676, 38691, 18985, 38710, 38721, 38727, 38743,
+    38747, 38762, 168608, 168625, 38806, 38814, {f: 2, c: 38833}, 38846, 38860,
+    38865, 38868, 38872, 38881, 38897, 38916, 38925, 38932, 38934, 19132,
+    169104, {f: 2, c: 38962}, 38949, 38983, 39014, 39083, 39085, 39088, 169423,
+    39095, {f: 2, c: 39099}, 39106, 39111, 39115, 39137, 39139, 39146,
+    {f: 2, c: 39152}, 39155, 39176, 19259, 169712, {f: 2, c: 39190}, 169753,
+    {f: 3, c: 39194}, 169808, 39217, {f: 3, c: 39226}, 39233, 39238, 39246,
+    39264, 39331, 39334, 39357, 39359, 39363, 39380, 39385, 39390, 170182,
+    39408, 39417, 39420, 39434, 39441, 39450, 39456, 39473, 39492, 39500,
+    39512, 19394, 39599, 19402, 39607, 19410, 39609, 170610, 39622, 39632,
+    39634, 39637, 39648, 39653, 39657, 39692, 39696, 39698, 39702, 39708,
+    39723, 39741, 19488, 39755, 39779, 39781, {f: 2, c: 39787},
+    {f: 2, c: 39798}, 39846, 39852, 171483, 39858, 39864, 39870, 39923, 39896,
+    39901, 39914, 39919, 39918, 171541, 171658, 171593, 39958,
+    {f: 3, c: 39960}, 39965, 39970, 39977, 171716, 39985, 39991, 40005, 40028,
+    171753, {f: 2, c: 40009}, 171739, 40020, 40024, 40027, 40029, 40031,
+    {f: 3, c: 40041}, {f: 2, c: 40045}, 40050, 40053, 40058, 40166, 40178,
+    40203, [171982, 171991], 40209, {f: 2, c: 40215}, 172079, 19652, 172058,
+    40242, 19665, 40266, 40287, 40290, 172281, 172162, 40307, {f: 2, c: 40310},
+    40324, 40345, 40353, 40383, 40373, 40377, 40381, 40393, 40410, 40416,
+    40419, 19719, 40458, 40450, 40461, 40476, 40571, 139800, 40576, 40581,
+    40603, 172940, 40637, 173111, 40671, 40703, 40706, 19831, 40707, 40762,
+    40765, 40774, 40787, 40789, 40792, 173553, 40797, 173570, 40809, 40813,
+    40816, 173746, 11948, 13844, 14509, 15820, 16348, 17854, 17936, 19326,
+    19512, 19681, 19980, {f: 2, c: 20003}, 20089, 20211, 20236, 20249, 20267,
+    20270, 20273, 20356, 20382, 20407, 20484, 20492, 20556, 20575, 20578,
+    20599, 20622, 20638, 20642, 20675, 20712, 20721, 20734, 20743,
+    {f: 3, c: 20748}, 20787, 20792, 20852, 20868, 20920, 20922, 20936, 20943,
+    20945, {f: 2, c: 20947}, 20952, 20959, 20997, 21030, 21032, 21035,
+    {f: 2, c: 21041}, 21045, 21052, 21082, 21088, 21102, {f: 2, c: 21112},
+    21130, 21132, 21217, 21225, 21233, 21251, 21265, 21279, 21293, 21298,
+    21309, 21349, 21357, 21369, 21374, 21396, 21401, 21418, 21423, 21434,
+    21441, {f: 2, c: 21444}, 21472, 21523, 21546, 21553, {f: 2, c: 21556},
+    21580, 21671, 21674, 21681, 21691, 21710, 21738, 21756, 21765, 21768,
+    21781, 21799, 21802, 21814, 21841, 21862, 21903, 21906, 21908, 21924,
+    21938, 21955, 21958, 21971, 21979, 21996, 21998, 22001, 22006, 22008,
+    22021, 22029, {f: 2, c: 22033}, 22060, 22069, 22073, 22093, 22100, 22149,
+    22175, 22182, 22199, 22220, 22223, 22233, 22241, 22251, 22253, 22257,
+    22279, 22284, {f: 2, c: 22298}, 22301, 22316, 22318, {f: 2, c: 22333},
+    22367, 22379, 22381, 22394, 22403, 22423, 22446, 22485, 22503, 22541,
+    22566, 22605, 22607, 22623, 22637, 22655, 22657, 22680, 22716, 22815,
+    22819, 22873, 22905, 22935, 22959, 22963, 23007, 23025, 23032, 23218,
+    23224, 23274, 23286, 23323, 23325, 23329, 23352, 23479, 23511, 23520,
+    23583, 23594, 23596, 23606, 23641, 23644, 23661, 23773, 23809, 23860,
+    23869, 23897, 23934, 23939, 24007, 24057, 24104, 24114, 24117, 24155,
+    24168, 24170, 24183, 24192, 24203, 24243, 24253, 24273, {f: 2, c: 24276},
+    24397, 24492, 24554, 24583, 24649, 24660, 24679, 24763, 24772, 24829,
+    24842, 24854, 24874, 24886, 24926, 24932, 24955, 24957, 24959, 24989,
+    25016, 25052, 25058, 25061, 25064, 25092, 25095, 25137, 25145, 25149,
+    25210, 25232, 25256, 25306, 25332, 25366, 25386, 25398, 25414, 25419,
+    25427, 25457, 25461, 25471, 25474, 25482, {f: 2, c: 25518}, 25578,
+    {f: 2, c: 25592}, 25618, 25624, 25632, 25636, 25642, 25653, 25661, 25663,
+    25682, 25695, 25716, 25744, {f: 2, c: 25752}, 25772, 25779, 25837, 25840,
+    25883, 25887, 25902, 25929, 25952, 26002, 26005, 26036, 26046, 26056,
+    26062, 26064, 26079, 26238, {f: 2, c: 26251}, 26291, 26304, 26319, 26405,
+    26421, 26453, 26496, 26511, 26513, 26532, 26545, 26549, 26558, 26664,
+    26758, 26859, 26869, 26903, 26931, 26936, 26971, 26981, 27048, 27051,
+    27055, 27109, 27121, 27210, 27221, 27239, 27249, 27311, {f: 2, c: 27336},
+    27395, 27451, 27455, {f: 2, c: 27517}, 27568, 27639, 27641, 27652, 27657,
+    27661, 27692, 27722, 27730, 27732, 27769, 27820, 27828, 27858, 28001,
+    28028, 28089, 28144, 28229, 28275, 28283, 28285, 28297, 28348,
+    {f: 2, c: 28378}, 28454, 28457, 28464, 28551, 28573, 28590, 28599, 28685,
+    28704, 28745, 28824, 28848, {f: 2, c: 28885}, 28997, 29106, 29172, 29207,
+    29215, 29251, {f: 2, c: 29263}, 29274, 29280, 29288, 29303, 29316, 29385,
+    29413, 29428, 29442, 29451, 29470, 29474, {f: 2, c: 29498}, 29517, 29528,
+    29543, 29810, 29871, 29919, 29924, 29940, 29947, 29974, 29985, 30015,
+    30046, 30105, 30116, 30145, 30148, 30156, 30167, 30172, 30177, 30191,
+    30212, 30220, 30237, 30258, 30264, 30277, 30282, 30303, 30381, 30397,
+    30425, 30443, 30448, 30457, 30464, 30478, 30498, 30504, 30511, 30521,
+    30526, 30533, 30538, 30543, 30558, 30564, 30567, 30572, 30596,
+    {f: 2, c: 30604}, 30614, 30631, 30639, 30647, 30654, 30665, 30673, 30681,
+    30705, 30775, 30812, 30846, 30872, 30881, 30897, 30899, 30921, 30931,
+    30988, 31007, {f: 2, c: 31015}, 31039, 31042, 31060, 31083, 31100, 31147,
+    31172, 31210, 31234, 31244, 31280, 31290, 31300, 31360, 31366, 31380,
+    31413, 31421, 31486, 31531, 31607, 31648, 31660, 31664, 31720, 31730,
+    31736, 31740, 31742, 31753, 31784, 31791, 31810, {f: 2, c: 31826},
+    {f: 3, c: 31835}, 31858, 31869, 31879, 31902, 31930, 31943, 31955, 31962,
+    32060, 32077, 32130, 32133, 32141, 32145, 32158, 32179, 32185, 32208,
+    32229, {f: 2, c: 32245}, 32303, 32310, 32324, 32367, 32376, 32385, 32573,
+    32603, 32605, 32613, 32625, {f: 2, c: 32639}, 32651, 32674,
+    {f: 3, c: 32765}, 32775, 32781, 32798, 32825, 32904, 32910, 32975, 32980,
+    33005, 33008, 33015, 33018, 33022, 33027, 33047, 33072, 33111, 33135,
+    33139, 33163, 33168, 33179, 33182, 33227, 33237, {f: 2, c: 33245}, 33249,
+    33263, 33270, 33280, 33291, {f: 2, c: 33299}, 33306, 33338, 33348, 33389,
+    33412, 33417, 33425, 33450, 33456, 33488, 33514, 33519, 33526, 33622,
+    33656, 33784, 33788, 33880, 33939, 33969, 33981, 34043, 34118, 34134,
+    34141, 34181, 34200, 34370, 34374, 34496, 34580, 34594, 34606, 34617,
+    34653, 34683, 34700, 34702, {f: 2, c: 34711}, 34718, 34723, 34734, 34751,
+    34761, 34778, 34840, 34843, 34861, 34874, 34885, 34891, 34894, 34901,
+    34906, 34926, {f: 3, c: 34970}, 35021, 35040, 35055, {f: 2, c: 35086},
+    35110, 35125, 35162, 35164, 35179, 35184, 35196, 35237, 35253, 35260,
+    35285, 35401, 35415, 35431, 35454, 35462, 35478, 35510, 35529, 35537,
+    35549, 35564, 35573, 35590, 35599, 35601, 35653, 35666, 35693, 35704,
+    35708, 35710, 35717, 35743, 35915, 35923, 35963, 36026, 36037, 36041,
+    36050, 36076, 36085, 36087, 36097, 36099, 36119, 36124, 36206, 36241,
+    36255, 36267, 36274, 36309, 36327, {f: 2, c: 36337}, 36340, 36353, 36363,
+    36390, 36401, {f: 2, c: 36416}, 36429, 36431, 36444, 36449, 36457, 36465,
+    36469, 36471, 36489, 36496, 36501, 36506, 36519, 36521, 36525, 36584,
+    36592, 36615, 36632, 36645, 36647, 36652, 36661, 36666, 36675, 36679,
+    36689, 36693, {f: 3, c: 36768}, 36773, 36868, 36891, 36911, 36940, 36955,
+    36976, 36980, 36985, 37003, 37016, 37024, 37042, 37053, 37065, 37104,
+    37125, 37157, 37210, 37223, 37242, 37258, 37265, 37269, 37296, 37307,
+    37309, 37314, 37317, 37376, 37385, 37411, 37494, 37518, 37551,
+    {f: 2, c: 37563}, 37569, 37571, 37573, 37576, 37652, 37683, 37686, 37720,
+    37759, 37762, 37770, 37819, 37836, 37862, 37881, 37890, {f: 2, c: 37901},
+    37934, 37964, 38280, 38305, 38335, 38342, 38345, {f: 2, c: 38353}, 38368,
+    38372, 38374, 38436, 38449, 38456, 38461, 38484, 38516, 38523, 38527,
+    38529, 38531, 38537, 38550, 38574, 38659, 38683, {f: 2, c: 38689}, 38696,
+    38705, 38759, 38774, 38781, 38783, 38809, 38815, 38828, 38841, 38861,
+    38880, 38895, 38919, 38950, 38958, {f: 2, c: 39010}, 39092, 39109, 39170,
+    39185, 39189, 39221, 39240, 39252, 39262, 39393, 39436, 39440, 39459,
+    39489, 39505, {f: 2, c: 39613}, 39681, 39689, 39691, {f: 2, c: 39693},
+    39705, 39733, 39752, 39765, 39784, 39808, 39814, 39824, 39837, 39856,
+    39871, 39880, 39935, 39938, 39964, 39989, 40004, 40022, 40033, 40040,
+    40240, 40253, 40298, 40315, 40421, 40425, 40435, 40570, {f: 3, c: 40578},
+    40624, 40676, 40688, 40690, 40713, 40719, 40724, 40731, 40738, 40742,
+    {f: 2, c: 40746}, 40756, 40794, 40815, 40862, 40869, 131317, 151044,
+    151538, 163187, 194581, 194630, 194713, 194726, 194789, 195038, 13790,
+    {s: 4}, 172722, 0, 0, 131416, {s: 4}, 132529, 0, 0, 132844, {s: 6}, 134488,
+    {s: 21}, 154060, {s: 9}, 14756, 14776, 142914, 0, 0, 14940, 0, 0, 143339,
+    0, 0, 162228, 0, 15044, 15051, {s: 5}, 14981, {s: 8}, 15347, 27384, {s: 5},
+    15665, {s: 9}, 147531, 0, 15936, 14497, {s: 34}, 158878, {s: 12}, 18207,
+    162876, {s: 4}, 18462, {s: 71}, 39709, 39724, 20482, 20958, 21255, 23532,
+    63784, 26142, 63785, 28746, 64021, 21857, 27706, 31328, 156492, 34819,
+    38315, 38741, 171581, 173594],
+  'Adobe-Korea1': [{f: 95, c: 32}, 8361, 8208, 169, 0, 0, [12288, 12644],
+    {f: 2, c: 12289}, 12539, 8229, [8230, 8943], 168, 12291, {f: 2, c: 8211},
+    8214, 65340, 65374, {f: 2, c: 8216}, {f: 2, c: 8220}, {f: 2, c: 12308},
+    {f: 10, c: 12296}, 177, 215, 247, 8800, {f: 2, c: 8804}, 8734, 8756, 176,
+    {f: 2, c: 8242}, 8451, 8491, {f: 2, c: 65504}, 65509, 9794, 9792, 8736,
+    8869, 8978, 8706, 8711, 8801, 8786, 167, 8251, 9734, 9733, 9675, 9679,
+    9678, 9671, 9670, 9633, 9632, 9651, 9650, 9661, 9660, 8594,
+    {f: 2, c: 8592}, {f: 2, c: 8595}, 12307, 171, 187, 8730, 8765, 8733, 8757,
+    {f: 2, c: 8747}, 8712, 8715, {f: 2, c: 8838}, {f: 2, c: 8834}, 8746, 8745,
+    {f: 2, c: 8743}, 65506, 8658, 8660, 8704, 8707, 180, 732, 711, 728, 733,
+    730, 729, 184, 731, 161, 191, 8758, 8750, 8721, 8719, 164, 8457, 8240,
+    9665, 9664, 9655, 9654, 9828, {f: 2, c: 9824}, 9829, 9831, 9827, 9673,
+    9672, 9635, {f: 2, c: 9680}, 9618, {f: 2, c: 9636}, 9640, 9639, 9638, 9641,
+    9832, 9743, 9742, 9756, 9758, 182, {f: 2, c: 8224}, 8597, 8599, 8601, 8598,
+    8600, 9837, {f: 2, c: 9833}, 9836, 12927, 12828, 8470, 13255, 8482, 13250,
+    13272, 8481, {f: 59, c: 65281}, 65510, {f: 33, c: 65341}, 65507,
+    {f: 51, c: 12593}, {f: 42, c: 12645}, {f: 10, c: 8560}, {f: 10, c: 8544},
+    {f: 17, c: 913}, {f: 7, c: 931}, {f: 17, c: 945}, {f: 7, c: 963}, 9472,
+    9474, 9484, 9488, 9496, 9492, 9500, 9516, 9508, 9524, 9532, 9473, 9475,
+    9487, 9491, 9499, 9495, 9507, 9523, 9515, 9531, 9547, 9504, 9519, 9512,
+    9527, 9535, 9501, 9520, 9509, 9528, 9538, 9490, 9489, 9498, 9497, 9494,
+    9493, 9486, 9485, {f: 2, c: 9502}, {f: 2, c: 9505}, {f: 2, c: 9510},
+    {f: 2, c: 9513}, {f: 2, c: 9517}, {f: 2, c: 9521}, {f: 2, c: 9525},
+    {f: 2, c: 9529}, {f: 2, c: 9533}, {f: 2, c: 9536}, {f: 8, c: 9539},
+    {f: 3, c: 13205}, 8467, 13208, 13252, {f: 4, c: 13219}, {f: 10, c: 13209},
+    13258, {f: 3, c: 13197}, 13263, {f: 2, c: 13192}, 13256, {f: 2, c: 13223},
+    {f: 10, c: 13232}, {f: 5, c: 13184}, {f: 6, c: 13242}, {f: 5, c: 13200},
+    8486, {f: 2, c: 13248}, {f: 3, c: 13194}, 13270, 13253, {f: 3, c: 13229},
+    13275, {f: 4, c: 13225}, 13277, 13264, 13267, 13251, 13257, 13276, 13254,
+    198, 208, 170, 294, 306, 319, 321, 216, 338, 186, 222, 358, 330,
+    {f: 28, c: 12896}, {f: 26, c: 9424}, {f: 15, c: 9312}, 189,
+    {f: 2, c: 8531}, 188, 190, {f: 4, c: 8539}, 230, 273, 240, 295, 305, 307,
+    312, 320, 322, 248, 339, 223, 254, 359, 331, 329, {f: 28, c: 12800},
+    {f: 26, c: 9372}, {f: 15, c: 9332}, 185, {f: 2, c: 178}, 8308, 8319,
+    {f: 4, c: 8321}, {f: 83, c: 12353}, {f: 86, c: 12449}, {f: 6, c: 1040},
+    1025, {f: 32, c: 1046}, 1105, {f: 26, c: 1078}, {f: 2, c: 44032}, 44036,
+    {f: 4, c: 44039}, {f: 8, c: 44048}, {f: 5, c: 44057}, 44064, 44068,
+    {f: 2, c: 44076}, {f: 3, c: 44079}, {f: 2, c: 44088}, 44092, 44096, 44107,
+    44109, 44116, 44120, 44124, {f: 2, c: 44144}, 44148, {f: 2, c: 44151},
+    44154, {f: 2, c: 44160}, {f: 4, c: 44163}, {f: 4, c: 44169}, 44176, 44180,
+    {f: 2, c: 44188}, {f: 3, c: 44191}, {f: 3, c: 44200}, 44204,
+    {f: 2, c: 44207}, {f: 2, c: 44216}, {f: 3, c: 44219}, 44225, 44228, 44232,
+    44236, 44245, 44247, {f: 2, c: 44256}, 44260, {f: 2, c: 44263}, 44266,
+    44268, {f: 3, c: 44271}, 44275, {f: 2, c: 44277}, {f: 2, c: 44284}, 44288,
+    44292, 44294, {f: 2, c: 44300}, 44303, 44305, 44312, 44316, 44320, 44329,
+    {f: 2, c: 44332}, {f: 2, c: 44340}, 44344, 44348, {f: 2, c: 44356}, 44359,
+    44361, 44368, 44372, 44376, 44385, 44387, {f: 2, c: 44396}, 44400,
+    {f: 4, c: 44403}, {f: 3, c: 44411}, 44415, {f: 2, c: 44417},
+    {f: 2, c: 44424}, 44428, 44432, {f: 2, c: 44444}, 44452, 44471,
+    {f: 2, c: 44480}, 44484, 44488, {f: 2, c: 44496}, 44499, 44508, 44512,
+    44516, {f: 2, c: 44536}, 44540, {f: 3, c: 44543}, {f: 2, c: 44552}, 44555,
+    44557, 44564, {f: 2, c: 44592}, 44596, {f: 2, c: 44599}, 44602,
+    {f: 2, c: 44608}, 44611, {f: 2, c: 44613}, 44618, {f: 3, c: 44620}, 44624,
+    44628, 44630, {f: 2, c: 44636}, {f: 3, c: 44639}, 44645, {f: 2, c: 44648},
+    44652, 44656, {f: 2, c: 44664}, {f: 3, c: 44667}, {f: 2, c: 44676}, 44684,
+    {f: 3, c: 44732}, 44736, 44740, {f: 2, c: 44748}, {f: 3, c: 44751},
+    {f: 2, c: 44760}, 44764, 44776, 44779, 44781, 44788, 44792, 44796,
+    {f: 2, c: 44807}, 44813, 44816, {f: 2, c: 44844}, 44848, 44850, 44852,
+    {f: 2, c: 44860}, 44863, {f: 3, c: 44865}, {f: 2, c: 44872}, 44880,
+    {f: 2, c: 44892}, {f: 2, c: 44900}, 44921, 44928, 44932, 44936,
+    {f: 2, c: 44944}, 44949, 44956, {f: 2, c: 44984}, 44988, 44992,
+    {f: 3, c: 44999}, 45003, {f: 2, c: 45005}, 45012, 45020, {f: 2, c: 45032},
+    {f: 2, c: 45040}, 45044, 45048, {f: 2, c: 45056}, 45060, 45068, 45072,
+    45076, {f: 2, c: 45084}, 45096, {f: 2, c: 45124}, 45128, 45130, 45132,
+    45134, {f: 3, c: 45139}, 45143, 45145, 45149, {f: 2, c: 45180}, 45184,
+    45188, {f: 2, c: 45196}, 45199, 45201, {f: 3, c: 45208}, 45212,
+    {f: 4, c: 45215}, {f: 2, c: 45224}, {f: 5, c: 45227}, 45233,
+    {f: 3, c: 45235}, 45240, 45244, {f: 2, c: 45252}, {f: 3, c: 45255},
+    {f: 2, c: 45264}, 45268, 45272, 45280, 45285, {f: 2, c: 45320},
+    {f: 2, c: 45323}, 45328, {f: 2, c: 45330}, {f: 2, c: 45336},
+    {f: 3, c: 45339}, {f: 3, c: 45347}, 45352, 45356, {f: 2, c: 45364},
+    {f: 3, c: 45367}, {f: 2, c: 45376}, 45380, 45384, {f: 2, c: 45392},
+    {f: 2, c: 45396}, 45400, 45404, 45408, {f: 2, c: 45432}, 45436, 45440,
+    45442, {f: 2, c: 45448}, 45451, 45453, {f: 3, c: 45458}, 45464, 45468,
+    45480, 45516, 45520, 45524, {f: 2, c: 45532}, 45535, {f: 2, c: 45544},
+    45548, 45552, 45561, 45563, 45565, {f: 2, c: 45572}, 45576,
+    {f: 2, c: 45579}, {f: 2, c: 45588}, 45591, 45593, 45600, 45620, 45628,
+    45656, 45660, 45664, {f: 2, c: 45672}, {f: 2, c: 45684}, 45692,
+    {f: 2, c: 45700}, 45705, {f: 2, c: 45712}, 45716, {f: 3, c: 45720},
+    {f: 2, c: 45728}, 45731, {f: 2, c: 45733}, 45738, 45740, 45744, 45748,
+    {f: 2, c: 45768}, 45772, 45776, 45778, {f: 2, c: 45784}, 45787, 45789,
+    45794, {f: 3, c: 45796}, 45800, {f: 5, c: 45803}, {f: 3, c: 45811},
+    {f: 5, c: 45815}, {f: 3, c: 45823}, 45828, 45832, {f: 2, c: 45840},
+    {f: 3, c: 45843}, 45852, {f: 3, c: 45908}, 45912, {f: 2, c: 45915},
+    {f: 2, c: 45918}, {f: 2, c: 45924}, 45927, 45929, 45931, 45934,
+    {f: 2, c: 45936}, 45940, 45944, {f: 2, c: 45952}, {f: 3, c: 45955}, 45964,
+    45968, 45972, {f: 2, c: 45984}, 45992, 45996, {f: 2, c: 46020}, 46024,
+    {f: 2, c: 46027}, 46030, 46032, {f: 2, c: 46036}, 46039, 46041, 46043,
+    46045, 46048, 46052, 46056, 46076, 46096, 46104, 46108, 46112,
+    {f: 2, c: 46120}, 46123, 46132, {f: 2, c: 46160}, 46164, 46168,
+    {f: 2, c: 46176}, 46179, 46181, 46188, 46208, 46216, 46237, 46244, 46248,
+    46252, 46261, 46263, 46265, 46272, 46276, 46280, 46288, 46293,
+    {f: 2, c: 46300}, 46304, {f: 2, c: 46307}, 46310, {f: 2, c: 46316}, 46319,
+    46321, 46328, {f: 2, c: 46356}, 46360, {f: 2, c: 46363}, {f: 2, c: 46372},
+    {f: 4, c: 46375}, {f: 2, c: 46384}, 46388, 46392, {f: 2, c: 46400},
+    {f: 3, c: 46403}, {f: 3, c: 46411}, 46416, 46420, {f: 2, c: 46428},
+    {f: 3, c: 46431}, {f: 2, c: 46496}, 46500, 46504, {f: 2, c: 46506},
+    {f: 2, c: 46512}, {f: 3, c: 46515}, {f: 3, c: 46523}, 46528, 46532,
+    {f: 2, c: 46540}, {f: 3, c: 46543}, 46552, 46572, {f: 2, c: 46608}, 46612,
+    46616, 46629, 46636, 46644, 46664, 46692, 46696, {f: 2, c: 46748}, 46752,
+    46756, {f: 2, c: 46763}, 46769, 46804, 46832, 46836, 46840,
+    {f: 2, c: 46848}, 46853, {f: 2, c: 46888}, 46892, {f: 2, c: 46895},
+    {f: 2, c: 46904}, 46907, 46916, 46920, 46924, {f: 2, c: 46932}, 46944,
+    46948, 46952, {f: 2, c: 46960}, 46963, 46965, {f: 2, c: 46972}, 46976,
+    46980, {f: 2, c: 46988}, {f: 4, c: 46991}, {f: 4, c: 46998}, 47004, 47008,
+    {f: 2, c: 47016}, {f: 3, c: 47019}, {f: 2, c: 47028}, 47032, 47047, 47049,
+    {f: 2, c: 47084}, 47088, 47092, {f: 2, c: 47100}, {f: 3, c: 47103},
+    {f: 3, c: 47111}, 47116, 47120, {f: 2, c: 47128}, 47131, 47133,
+    {f: 2, c: 47140}, 47144, 47148, {f: 2, c: 47156}, {f: 3, c: 47159}, 47168,
+    47172, 47185, 47187, {f: 2, c: 47196}, 47200, 47204, {f: 2, c: 47212},
+    47215, 47217, 47224, 47228, 47245, 47272, 47280, 47284, 47288,
+    {f: 2, c: 47296}, 47299, 47301, 47308, 47312, 47316, 47325, 47327, 47329,
+    {f: 2, c: 47336}, 47340, 47344, {f: 2, c: 47352}, 47355, 47357, 47364,
+    47384, 47392, {f: 2, c: 47420}, 47424, 47428, 47436, 47439, 47441,
+    {f: 2, c: 47448}, 47452, 47456, {f: 2, c: 47464}, 47467, 47469,
+    {f: 2, c: 47476}, 47480, 47484, {f: 2, c: 47492}, 47495, {f: 2, c: 47497},
+    {f: 2, c: 47501}, {f: 2, c: 47532}, 47536, 47540, {f: 2, c: 47548}, 47551,
+    47553, {f: 2, c: 47560}, 47564, {f: 5, c: 47566}, {f: 2, c: 47576}, 47579,
+    {f: 2, c: 47581}, 47585, {f: 3, c: 47587}, 47592, 47596, {f: 2, c: 47604},
+    {f: 4, c: 47607}, {f: 2, c: 47616}, 47624, 47637, {f: 2, c: 47672}, 47676,
+    47680, 47682, {f: 2, c: 47688}, 47691, {f: 2, c: 47693}, {f: 3, c: 47699},
+    47704, 47708, {f: 2, c: 47716}, {f: 3, c: 47719}, {f: 2, c: 47728}, 47732,
+    47736, {f: 3, c: 47747}, 47751, 47756, {f: 2, c: 47784}, {f: 2, c: 47787},
+    47792, 47794, {f: 2, c: 47800}, 47803, 47805, 47812, 47816,
+    {f: 2, c: 47832}, 47868, 47872, 47876, 47885, 47887, 47889, 47896, 47900,
+    47904, 47913, 47915, {f: 3, c: 47924}, 47928, {f: 4, c: 47931},
+    {f: 2, c: 47940}, 47943, 47945, 47949, {f: 2, c: 47951}, 47956, 47960,
+    47969, 47971, 47980, 48008, 48012, 48016, 48036, 48040, 48044, 48052,
+    48055, 48064, 48068, 48072, 48080, 48083, {f: 2, c: 48120}, 48124,
+    {f: 2, c: 48127}, 48130, {f: 2, c: 48136}, {f: 3, c: 48139}, 48143, 48145,
+    {f: 5, c: 48148}, {f: 5, c: 48155}, {f: 2, c: 48164}, 48167, 48169, 48173,
+    {f: 2, c: 48176}, 48180, 48184, {f: 2, c: 48192}, {f: 3, c: 48195}, 48201,
+    {f: 2, c: 48204}, 48208, 48221, {f: 2, c: 48260}, 48264, {f: 2, c: 48267},
+    48270, {f: 2, c: 48276}, 48279, {f: 2, c: 48281}, {f: 2, c: 48288}, 48292,
+    {f: 2, c: 48295}, {f: 2, c: 48304}, {f: 3, c: 48307}, {f: 2, c: 48316},
+    48320, 48324, 48333, {f: 3, c: 48335}, 48341, 48344, 48348,
+    {f: 3, c: 48372}, 48376, 48380, {f: 2, c: 48388}, 48391, 48393, 48400,
+    48404, 48420, 48428, 48448, {f: 2, c: 48456}, 48460, 48464,
+    {f: 2, c: 48472}, 48484, 48488, {f: 2, c: 48512}, 48516, {f: 4, c: 48519},
+    {f: 2, c: 48528}, 48531, 48533, {f: 2, c: 48537}, 48540, 48548, 48560,
+    48568, {f: 2, c: 48596}, 48600, 48604, 48617, 48624, 48628, 48632, 48640,
+    48643, 48645, {f: 2, c: 48652}, 48656, 48660, {f: 2, c: 48668}, 48671,
+    {f: 2, c: 48708}, 48712, 48716, 48718, {f: 2, c: 48724}, 48727,
+    {f: 3, c: 48729}, {f: 2, c: 48736}, 48740, 48744, 48746, {f: 2, c: 48752},
+    {f: 3, c: 48755}, {f: 3, c: 48763}, 48768, 48772, {f: 2, c: 48780},
+    {f: 3, c: 48783}, {f: 2, c: 48792}, 48808, {f: 2, c: 48848}, 48852,
+    {f: 2, c: 48855}, 48864, {f: 3, c: 48867}, 48876, 48897, {f: 2, c: 48904},
+    {f: 2, c: 48920}, {f: 3, c: 48923}, {f: 2, c: 48960}, 48964, 48968,
+    {f: 2, c: 48976}, 48981, 49044, 49072, 49093, {f: 2, c: 49100}, 49104,
+    49108, 49116, 49119, 49121, 49212, 49233, 49240, 49244, 49248,
+    {f: 2, c: 49256}, {f: 2, c: 49296}, 49300, 49304, {f: 2, c: 49312}, 49315,
+    49317, {f: 2, c: 49324}, {f: 2, c: 49327}, {f: 4, c: 49331},
+    {f: 2, c: 49340}, {f: 3, c: 49343}, 49349, {f: 2, c: 49352}, 49356, 49360,
+    {f: 2, c: 49368}, {f: 3, c: 49371}, {f: 2, c: 49380}, 49384, 49388,
+    {f: 2, c: 49396}, 49399, 49401, 49408, 49412, 49416, 49424, 49429,
+    {f: 5, c: 49436}, {f: 2, c: 49443}, {f: 2, c: 49446}, {f: 2, c: 49452},
+    {f: 3, c: 49455}, 49462, {f: 2, c: 49464}, 49468, 49472, {f: 2, c: 49480},
+    {f: 3, c: 49483}, {f: 2, c: 49492}, 49496, 49500, {f: 2, c: 49508},
+    {f: 3, c: 49511}, 49520, 49524, 49528, 49541, {f: 3, c: 49548}, 49552,
+    49556, 49558, {f: 2, c: 49564}, 49567, 49569, 49573, {f: 2, c: 49576},
+    49580, 49584, 49597, 49604, 49608, 49612, 49620, {f: 2, c: 49623}, 49632,
+    49636, 49640, {f: 2, c: 49648}, 49651, {f: 2, c: 49660}, 49664, 49668,
+    {f: 2, c: 49676}, 49679, 49681, {f: 2, c: 49688}, 49692, {f: 2, c: 49695},
+    {f: 2, c: 49704}, 49707, 49709, 49711, {f: 2, c: 49713}, 49716, 49736,
+    {f: 2, c: 49744}, 49748, 49752, 49760, 49765, {f: 2, c: 49772}, 49776,
+    49780, {f: 2, c: 49788}, 49791, 49793, {f: 2, c: 49800}, 49808, 49816,
+    49819, 49821, {f: 2, c: 49828}, 49832, {f: 2, c: 49836}, {f: 2, c: 49844},
+    49847, 49849, {f: 2, c: 49884}, 49888, {f: 2, c: 49891}, {f: 3, c: 49899},
+    49903, 49905, 49910, {f: 2, c: 49912}, {f: 2, c: 49915}, 49920,
+    {f: 2, c: 49928}, {f: 2, c: 49932}, {f: 3, c: 49939}, 49944, 49948,
+    {f: 2, c: 49956}, {f: 2, c: 49960}, 49989, {f: 2, c: 50024}, 50028, 50032,
+    50034, {f: 2, c: 50040}, {f: 2, c: 50044}, 50052, 50056, 50060, 50112,
+    {f: 2, c: 50136}, 50140, {f: 2, c: 50143}, 50146, {f: 2, c: 50152}, 50157,
+    {f: 2, c: 50164}, 50168, 50184, 50192, 50212, 50220, 50224, 50228,
+    {f: 2, c: 50236}, 50248, {f: 2, c: 50276}, 50280, 50284, {f: 2, c: 50292},
+    50297, 50304, 50324, 50332, 50360, 50364, 50409, {f: 2, c: 50416}, 50420,
+    50424, 50426, {f: 3, c: 50431}, 50444, 50448, 50452, 50460,
+    {f: 2, c: 50472}, 50476, 50480, {f: 2, c: 50488}, 50491, 50493,
+    {f: 2, c: 50500}, {f: 3, c: 50504}, {f: 3, c: 50508}, {f: 3, c: 50515},
+    {f: 3, c: 50519}, {f: 2, c: 50525}, {f: 2, c: 50528}, 50532, 50536,
+    {f: 2, c: 50544}, {f: 3, c: 50547}, {f: 2, c: 50556}, 50560, 50564, 50567,
+    {f: 2, c: 50572}, 50575, 50577, 50581, {f: 2, c: 50583}, 50588, 50592,
+    50601, {f: 2, c: 50612}, {f: 2, c: 50616}, {f: 4, c: 50619},
+    {f: 7, c: 50628}, 50636, 50638, {f: 2, c: 50640}, 50644, 50648,
+    {f: 2, c: 50656}, 50659, 50661, {f: 3, c: 50668}, 50672, 50676,
+    {f: 2, c: 50678}, {f: 6, c: 50684}, {f: 4, c: 50693}, 50700, 50704,
+    {f: 2, c: 50712}, {f: 2, c: 50715}, {f: 2, c: 50724}, 50728,
+    {f: 3, c: 50732}, 50736, {f: 3, c: 50739}, 50743, 50745, 50747,
+    {f: 2, c: 50752}, 50756, 50760, {f: 2, c: 50768}, {f: 3, c: 50771},
+    {f: 2, c: 50780}, 50784, 50796, 50799, 50801, {f: 2, c: 50808}, 50812,
+    50816, {f: 2, c: 50824}, 50827, 50829, {f: 2, c: 50836}, 50840, 50844,
+    {f: 2, c: 50852}, 50855, 50857, {f: 2, c: 50864}, 50868, {f: 3, c: 50872},
+    {f: 2, c: 50880}, 50883, 50885, {f: 2, c: 50892}, 50896, 50900,
+    {f: 2, c: 50908}, {f: 2, c: 50912}, {f: 2, c: 50920}, 50924, 50928,
+    {f: 2, c: 50936}, 50941, {f: 2, c: 50948}, 50952, 50956, {f: 2, c: 50964},
+    50967, 50969, {f: 2, c: 50976}, 50980, 50984, {f: 2, c: 50992}, 50995,
+    50997, 50999, {f: 2, c: 51004}, 51008, 51012, 51018, {f: 2, c: 51020},
+    51023, {f: 8, c: 51025}, 51036, 51040, 51048, 51051, {f: 2, c: 51060},
+    51064, {f: 3, c: 51068}, {f: 3, c: 51075}, {f: 4, c: 51079}, 51086,
+    {f: 2, c: 51088}, 51092, {f: 3, c: 51094}, 51098, {f: 2, c: 51104},
+    {f: 4, c: 51107}, {f: 2, c: 51116}, 51120, 51124, {f: 2, c: 51132},
+    {f: 3, c: 51135}, {f: 2, c: 51144}, 51148, 51150, 51152, 51160, 51165,
+    51172, 51176, 51180, {f: 2, c: 51200}, 51204, 51208, 51210,
+    {f: 2, c: 51216}, 51219, {f: 2, c: 51221}, {f: 2, c: 51228}, 51232, 51236,
+    {f: 2, c: 51244}, 51247, 51249, 51256, 51260, 51264, {f: 2, c: 51272},
+    {f: 2, c: 51276}, 51284, {f: 2, c: 51312}, 51316, 51320, 51322,
+    {f: 2, c: 51328}, 51331, {f: 3, c: 51333}, {f: 3, c: 51339}, 51348, 51357,
+    51359, 51361, 51368, {f: 2, c: 51388}, 51396, 51400, 51404,
+    {f: 2, c: 51412}, 51415, 51417, {f: 2, c: 51424}, 51428, 51445,
+    {f: 2, c: 51452}, 51456, {f: 3, c: 51460}, {f: 2, c: 51468}, 51471, 51473,
+    51480, 51500, 51508, {f: 2, c: 51536}, 51540, 51544, {f: 2, c: 51552},
+    51555, 51564, 51568, 51572, 51580, {f: 2, c: 51592}, 51596, 51600,
+    {f: 2, c: 51608}, 51611, 51613, {f: 2, c: 51648}, 51652, {f: 2, c: 51655},
+    51658, {f: 2, c: 51664}, 51667, {f: 2, c: 51669}, {f: 2, c: 51673},
+    {f: 2, c: 51676}, 51680, 51682, 51684, 51687, {f: 2, c: 51692},
+    {f: 3, c: 51695}, {f: 2, c: 51704}, 51708, 51712, {f: 2, c: 51720},
+    {f: 3, c: 51723}, 51732, 51736, 51753, {f: 2, c: 51788}, 51792, 51796,
+    {f: 2, c: 51804}, {f: 3, c: 51807}, 51816, 51837, 51844, 51864,
+    {f: 2, c: 51900}, 51904, 51908, {f: 2, c: 51916}, 51919, 51921, 51923,
+    {f: 2, c: 51928}, 51936, 51948, 51956, 51976, 51984, 51988, 51992,
+    {f: 2, c: 52000}, 52033, {f: 2, c: 52040}, 52044, 52048, {f: 2, c: 52056},
+    52061, 52068, {f: 2, c: 52088}, 52124, 52152, 52180, 52196, 52199, 52201,
+    {f: 2, c: 52236}, 52240, 52244, {f: 2, c: 52252}, {f: 2, c: 52257},
+    {f: 3, c: 52263}, 52268, 52270, 52272, {f: 2, c: 52280}, {f: 4, c: 52283},
+    {f: 2, c: 52292}, 52296, 52300, {f: 2, c: 52308}, {f: 3, c: 52311}, 52320,
+    52324, 52326, 52328, 52336, 52341, {f: 2, c: 52376}, 52380, 52384,
+    {f: 2, c: 52392}, {f: 3, c: 52395}, {f: 2, c: 52404}, 52408, 52412,
+    {f: 2, c: 52420}, 52423, 52425, 52432, 52436, 52452, 52460, 52464, 52481,
+    {f: 2, c: 52488}, 52492, 52496, {f: 2, c: 52504}, 52507, 52509, 52516,
+    52520, 52524, 52537, 52572, 52576, 52580, {f: 2, c: 52588}, 52591, 52593,
+    52600, 52616, {f: 2, c: 52628}, 52632, 52636, {f: 2, c: 52644}, 52647,
+    52649, 52656, 52676, 52684, 52688, 52712, 52716, 52720, {f: 2, c: 52728},
+    52731, 52733, 52740, 52744, 52748, 52756, 52761, {f: 2, c: 52768}, 52772,
+    52776, {f: 2, c: 52784}, 52787, 52789, {f: 2, c: 52824}, 52828,
+    {f: 3, c: 52831}, {f: 2, c: 52840}, 52843, 52845, {f: 2, c: 52852}, 52856,
+    52860, {f: 2, c: 52868}, 52871, 52873, {f: 2, c: 52880}, 52884, 52888,
+    {f: 2, c: 52896}, {f: 3, c: 52899}, {f: 2, c: 52908}, 52929,
+    {f: 2, c: 52964}, 52968, {f: 2, c: 52971}, {f: 2, c: 52980},
+    {f: 3, c: 52983}, {f: 2, c: 52992}, 52996, 53000, {f: 2, c: 53008}, 53011,
+    53013, 53020, 53024, 53028, {f: 2, c: 53036}, {f: 3, c: 53039}, 53048,
+    {f: 2, c: 53076}, 53080, 53084, {f: 2, c: 53092}, 53095, 53097,
+    {f: 2, c: 53104}, 53108, 53112, 53120, 53125, 53132, 53153, 53160, 53168,
+    53188, {f: 2, c: 53216}, 53220, 53224, {f: 2, c: 53232}, 53235, 53237,
+    53244, 53248, 53252, 53265, 53272, 53293, {f: 2, c: 53300}, 53304, 53308,
+    {f: 2, c: 53316}, 53319, 53321, 53328, 53332, 53336, 53344,
+    {f: 2, c: 53356}, 53360, 53364, {f: 2, c: 53372}, 53377, {f: 2, c: 53412},
+    53416, 53420, {f: 2, c: 53428}, 53431, 53433, {f: 2, c: 53440}, 53444,
+    {f: 2, c: 53448}, {f: 2, c: 53456}, {f: 3, c: 53459}, {f: 2, c: 53468},
+    53472, 53476, {f: 2, c: 53484}, {f: 3, c: 53487}, 53496, 53517,
+    {f: 2, c: 53552}, 53556, 53560, 53562, {f: 2, c: 53568}, {f: 3, c: 53571},
+    {f: 2, c: 53580}, 53584, 53588, {f: 2, c: 53596}, 53599, 53601, 53608,
+    53612, 53628, 53636, 53640, {f: 2, c: 53664}, 53668, 53672,
+    {f: 2, c: 53680}, 53683, 53685, 53690, 53692, 53696, 53720, 53748, 53752,
+    53767, 53769, 53776, {f: 2, c: 53804}, 53808, 53812, {f: 2, c: 53820},
+    53823, 53825, 53832, 53852, 53860, {f: 2, c: 53888}, 53892, 53896,
+    {f: 2, c: 53904}, 53909, 53916, 53920, 53924, 53932, 53937,
+    {f: 2, c: 53944}, 53948, {f: 2, c: 53951}, 53954, {f: 2, c: 53960}, 53963,
+    53972, 53976, 53980, {f: 2, c: 53988}, {f: 2, c: 54000}, 54004, 54008,
+    {f: 2, c: 54016}, 54019, 54021, {f: 3, c: 54028}, 54032, 54036, 54038,
+    {f: 2, c: 54044}, {f: 3, c: 54047}, 54053, {f: 2, c: 54056}, 54060, 54064,
+    {f: 2, c: 54072}, {f: 3, c: 54075}, {f: 2, c: 54084}, {f: 2, c: 54140},
+    54144, 54148, {f: 2, c: 54156}, {f: 3, c: 54159}, {f: 2, c: 54168}, 54172,
+    54176, {f: 2, c: 54184}, 54187, 54189, 54196, 54200, 54204,
+    {f: 2, c: 54212}, {f: 2, c: 54216}, 54224, 54232, 54241, 54243,
+    {f: 2, c: 54252}, 54256, 54260, {f: 2, c: 54268}, 54271, 54273, 54280,
+    54301, 54336, 54340, 54364, 54368, 54372, 54381, 54383, {f: 2, c: 54392},
+    54396, {f: 2, c: 54399}, 54402, {f: 2, c: 54408}, 54411, 54413, 54420,
+    54441, 54476, 54480, 54484, 54492, 54495, 54504, 54508, 54512, 54520,
+    54523, 54525, 54532, 54536, 54540, {f: 2, c: 54548}, 54551,
+    {f: 2, c: 54588}, 54592, 54596, {f: 2, c: 54604}, 54607, 54609,
+    {f: 2, c: 54616}, 54620, 54624, 54629, {f: 2, c: 54632}, 54635, 54637,
+    {f: 2, c: 54644}, 54648, 54652, {f: 2, c: 54660}, {f: 3, c: 54663}, 54672,
+    54693, {f: 2, c: 54728}, 54732, 54736, 54738, {f: 2, c: 54744}, 54747,
+    54749, {f: 2, c: 54756}, 54760, 54764, {f: 2, c: 54772}, 54775, 54777,
+    {f: 2, c: 54784}, 54788, 54792, {f: 2, c: 54800}, {f: 3, c: 54803}, 54812,
+    54816, 54820, 54829, {f: 2, c: 54840}, 54844, 54848, 54853,
+    {f: 2, c: 54856}, 54859, 54861, 54865, {f: 2, c: 54868}, 54872, 54876,
+    54887, 54889, {f: 2, c: 54896}, 54900, 54915, 54917, {f: 2, c: 54924},
+    54928, 54932, 54941, 54943, 54945, 54952, 54956, 54960, 54969, 54971,
+    {f: 2, c: 54980}, 54984, 54988, 54993, 54996, 54999, 55001, 55008, 55012,
+    55016, 55024, 55029, {f: 2, c: 55036}, 55040, 55044, 55057,
+    {f: 2, c: 55064}, 55068, 55072, {f: 2, c: 55080}, 55083, 55085,
+    {f: 2, c: 55092}, 55096, 55100, 55108, 55111, 55113, {f: 2, c: 55120},
+    55124, {f: 4, c: 55126}, {f: 2, c: 55136}, 55139, 55141, 55145, 55148,
+    55152, 55156, {f: 2, c: 55164}, 55169, {f: 2, c: 55176}, 55180, 55184,
+    {f: 2, c: 55192}, 55195, 55197, 20285, 20339, 20551, 20729, 21152, 21487,
+    21621, 21733, 22025, 23233, 23478, 26247, {f: 2, c: 26550}, 26607, 27468,
+    29634, 30146, 31292, 33499, 33540, 34903, 34952, 35382, [36040, 63747],
+    36303, 36603, 36838, 39381, 21051, 21364, 21508, 24682, 24932, 27580,
+    29647, 33050, 35258, [12179, 35282], 38307, 20355, 21002, 22718, 22904,
+    23014, [12082, 24178], 24185, 25031, 25536, 26438, 26604, 26751, 28567,
+    30286, 30475, 30965, 31240, 31487, 31777, 32925, [12169, 33390], 33393,
+    35563, 38291, 20075, 21917, 26359, 28212, 30883, 31469, 33883, 35088,
+    34638, 38824, 21208, 22350, 22570, 23884, 24863, 25022, 25121, 25954,
+    26577, 27204, 28187, [12130, 29976], 30131, 30435, 30640, 32058, 37039,
+    {f: 2, c: 37969}, 40853, 21283, 23724, 30002, 32987, 37440, 38296, 21083,
+    22536, 23004, 23713, 23831, 24247, 24378, 24394, 24951, 27743, 30074,
+    30086, 31968, 32115, 32177, 32652, 33108, 33313, 34193, 35137, 35611,
+    37628, [38477, 64009], 40007, 20171, 20215, 20491, 20977, 22607, 24887,
+    24894, 24936, 25913, 27114, 28433, 30117, 30342, 30422, 31623, 33445,
+    33995, 37799, 38283, 21888, 23458, 22353, 31923, 32697, 37301, 20520,
+    21435, 23621, 24040, 25298, 25454, 25818, 25831, 28192, 28844, 31067,
+    36317, 36382, 36989, 37445, 37624, 20094, 20214, 20581, [12081, 24062],
+    24314, 24838, 26967, 33137, 34388, 36423, 37749, 39467, 20062, 20625,
+    26480, 26688, 20745, 21133, 21138, 27298, 30652, 37392, 40660, 21163,
+    24623, 36850, 20552, 25001, 25581, 25802, 26684, 27268, 28608, 33160,
+    35233, 38548, 22533, 29309, [12125, 29356], 29956, 32121, 32365, 32937,
+    [12178, 35211, 64010], 35700, 36963, 40273, 25225, 27770, 28500, 32080,
+    32570, 35363, 20860, 24906, 31645, 35609, 37463, 37772, 20140, 20435,
+    20510, 20670, 20742, 21185, 21197, 21375, 22384, 22659, 24218, 24465,
+    24950, 25004, 25806, 25964, 26223, 26299, [26356, 63745], 26775, 28039,
+    28805, 28913, 29855, 29861, 29898, 30169, 30828, 30956, 31455, 31478,
+    32069, 32147, 32789, 32831, 33051, 33686, 35686, 36629, 36885, 37857,
+    38915, 38968, 39514, 39912, 20418, 21843, 22586, [22865, 63753], 23395,
+    23622, 24760, 25106, 26690, 26800, 26856, 28330, 30028, 30328, 30926,
+    31293, 31995, 32363, 32380, 35336, 35489, 35903, 38542, 40388, 21476,
+    21481, 21578, 21617, 22266, 22993, 23396, 23611, 24235, 25335, 25911,
+    25925, 25970, 26272, 26543, 27073, 27837, 30204, 30352, 30590, 31295,
+    32660, 32771, 32929, 33167, 33510, 33533, 33776, 34241, 34865, 34996,
+    35493, 36764, 37678, 38599, 39015, [12220, 39640], [12238, 40723], 21741,
+    26011, 26354, 26767, 31296, [12181, 35895], 40288, 22256, 22372, 23825,
+    26118, 26801, 26829, 28414, 29736, 34974, 39908, 27752, [12219, 39592],
+    20379, 20844, 20849, 21151, 23380, [12079, 24037], 24656, 24685, 25329,
+    25511, 25915, 29657, 31354, 34467, 36002, 38799, [20018, 63749], 23521,
+    [12093, 25096], 26524, [12128, 29916], 31185, 33747, 35463, 35506, 36328,
+    36942, 37707, 38982, [24275, 64011], 27112, 34303, 37101, 20896, 23448,
+    23532, 24931, 26874, 27454, 28748, 29743, 29912, 31649, 32592, 33733,
+    35264, 36011, 38364, 39208, 21038, 24669, 25324, 36866, 20362, 20809,
+    21281, 22745, 24291, 26336, 27960, 28826, 29378, 29654, 31568, 33009,
+    37979, 21350, 25499, 32619, 20054, 20608, 22602, 22750, 24618, 24871,
+    25296, 27088, 39745, 23439, 32024, 32945, 36703, 20132, 20689, 21676,
+    21932, 23308, 23968, 24039, 25898, 25934, 26657, 27211, 29409, 30350,
+    30703, 32094, 32761, 33184, 34126, 34527, 36611, 36686, 37066, 39171,
+    39509, 39851, 19992, 20037, 20061, 20167, 20465, 20855, 21246, 21312,
+    [12061, 21475], [21477, 63750], 21646, 22036, 22389, 22434, 23495, 23943,
+    24272, 25084, 25304, 25937, 26552, 26601, 27083, 27472, 27590, 27628,
+    27714, 28317, 28792, 29399, 29590, 29699, 30655, 30697, 31350, 32127,
+    32777, [12165, 33276], 33285, 33290, 33503, 34914, 35635, 36092, 36544,
+    36881, 37041, 37476, 37558, 39378, 39493, 40169, 40407,
+    [12244, 40860, 63751, 63752], 22283, 23616, 33738, 38816, 38827, 40628,
+    21531, 31384, 32676, 35033, 36557, 37089, 22528, 23624, 25496, 31391,
+    23470, [12088, 24339], 31353, 31406, 33422, 36524, 20518, 21048, 21240,
+    21367, 22280, 25331, 25458, 27402, 28099, 30519, 21413, 29527, 34152,
+    36470, 38357, 26426, 27331, 28528, 35437, 36556, 39243, 26231, 27512,
+    36020, [12225, 39740], 21483, 22317, 22862, 25542, 27131, 29674, 30789,
+    31418, 31429, 31998, 33909, 35215, 36211, 36917, 38312, 21243, 22343,
+    30023, 31584, 33740, 37406, 27224, 20811, 21067, 21127, 25119, 26840,
+    26997, 38553, 20677, 21156, 21220, 25027, [12100, 26020], 26681, 27135,
+    29822, 31563, 33465, 33771, 35250, 35641, 36817, 39241, 20170, 22935,
+    25810, 26129, 27278, 29748, 31105, 31165, 33449, {f: 2, c: 34942}, 35167,
+    37670, 20235, 21450, 24613, 25201, 27762, 32026, 32102, 20120, 20834,
+    30684, 32943, 20225, 20238, 20854, 20864, 21980, 22120, 22331, 22522,
+    22524, 22804, 22855, 22931, 23492, 23696, 23822, [12080, 24049], 24190,
+    24524, 25216, 26071, 26083, {f: 2, c: 26398}, 26462, 26827, 26820, 27231,
+    27450, 27683, 27773, 27778, 28103, 29592, 29734, 29738, 29826, 29859,
+    30072, 30079, 30849, 30959, 31041, {f: 2, c: 31047}, 31098, 31637, 32000,
+    32186, 32648, 32774, 32813, 32908, 35352, 35663, [35912, 63744], 36215,
+    37665, 37668, 39138, 39249, {f: 2, c: 39438}, 39525, 40594, 32202, 20342,
+    21513, 25326, 26708, [12198, 37329, 63754], 21931, 20794, 23068, 25062,
+    [25295, 63835], 25343, 37027, [35582, 63837], 26262, 29014, 38627, 25423,
+    25466, 21335, 26511, 26976, 28275, 30007, 32013, 34930, 22218, 23064,
+    20035, 20839, [22856, 63756], 26608, 32784, [12069, 22899, 63873],
+    [24180, 63886], [25754, 63889], [31178, 63893], [24565, 63907], 24684,
+    25288, [25467, 63908], [23527, 63839, 63914], 23511, 21162, 22900, 24361,
+    [24594, 63840], 29785, 39377, 28611, 33215, 36786, 24817, 33126,
+    [23615, 63933], 23273, 35365, [26491, 63944], [32016, 63951], 33021, 23612,
+    [27877, 63971], [21311, 63979], [28346, 63980], 22810, [33590, 63998],
+    [20025, 63838], 20150, 20294, 21934, 22296, 22727, 24406, 26039, 26086,
+    27264, 27573, 28237, 30701, 31471, 31774, 32222, 34507, 34962, 37170,
+    37723, 25787, 28606, 29562, 30136, 36948, 21846, 22349, 25018, 25812,
+    26311, 28129, 28251, 28525, 28601, 30192, 32835, 33213, 34113, 35203,
+    35527, 35674, 37663, 27795, 30035, 31572, 36367, 36957, 21776, 22530,
+    22616, 24162, 25095, 25758, 26848, 30070, [31958, 64003], 34739, 40680,
+    20195, 22408, 22382, [12068, 22823], 23565, 23729, 24118, 24453, 25140,
+    25825, 29619, 33274, 34955, 36024, 38538, 40667, [23429, 64004], 24503,
+    24755, 20498, [12049, 20992], 21040, 22294, 22581, 22615, 23566, 23648,
+    23798, 23947, [24230, 64001], 24466, 24764, 25361, 25481, 25623, 26691,
+    26873, 27330, 28120, 28193, 28372, 28644, 29182, 30428, 30585, 31153,
+    31291, 33796, 35241, 36077, 36339, 36424, 36867, 36884, 36947, 37117,
+    37709, 38518, 38876, 27602, 28678, 29272, 29346, 29544, 30563, 31167,
+    31716, 32411, [35712, 63834], 22697, 24775, 25958, 26109, 26302, 27788,
+    28958, 29129, 35930, 38931, 20077, 31361, 20189, 20908, 20941, 21205,
+    21516, 24999, 26481, 26704, 26847, [27934, 64005], 28540, 30140, 30643,
+    31461, 33012, 33891, 37509, 20828, [12099, 26007], 26460, 26515, 30168,
+    31431, 33651, [12182, 35910], 36887, 38957, 23663, 33216, 33434, 36929,
+    36975, 37389, 24471, 23965, 27225, 29128, 30331, 31561, 34276, 35588,
+    37159, 39472, [21895, 63755], [25078, 63757], [30313, 63758],
+    [32645, 63759], [34367, 63760], [34746, 63761], [35064, 63762],
+    [37007, 63763], [27931, 63765], [28889, 63766], [29662, 63767], 32097,
+    [33853, 63768], [37226, 63769], [39409, 63770], [20098, 63771],
+    [21365, 63772], [27396, 63773], 27410, 28734, [29211, 63774],
+    [34349, 63775], [40478, 63776], 21068, 36771, [23888, 63777], 25829, 25900,
+    27414, [28651, 63778], 31811, 32412, [34253, 63779], [35172, 63780], 35261,
+    [25289, 63781], [33240, 63782], [34847, 63783], [24266, 63784],
+    [26391, 63785], [28010, 63786], [29436, 63787], 29701, 29807, 34690,
+    [37086, 63788], [20358, 63789], 23821, 24480, 33802, [20919, 63790],
+    [25504, 63861], [30053, 63862], [20142, 63863], 20486, [20841, 63864],
+    [20937, 63865], [26753, 63866], 27153, 31918, 31921, [31975, 63867],
+    [33391, 63868], [35538, 63869], 36635, [37327, 63870], 20406, 20791,
+    [21237, 63871], [21570, 63872], [24300, 63874], 24942, 25150,
+    [26053, 63875], 27354, [28670, 63876], [31018, 63877], 34268, 34851,
+    [38317, 63878], 39522, [39530, 63879], [40599, 63880], [40654, 63881],
+    [12050, 21147, 63882], [26310, 63883], [27511, 63884], 28701, 31019,
+    [36706, 63885], 38722, [24976, 63887], [25088, 63888], 25891,
+    [28451, 63890], [29001, 63891], [29833, 63892], [32244, 63894],
+    [32879, 63895], [34030, 63897], [36646, 63896], [36899, 63898],
+    [37706, 63899], 20925, [21015, 63900], [21155, 63901], 27916,
+    [28872, 63903], [35010, 63904], [24265, 63906], 25986, [27566, 63909],
+    28610, [31806, 63910], [29557, 63911], [20196, 63912], 20278,
+    [22265, 63913], 23738, [23994, 63915], [24604, 63916], [29618, 63917],
+    31533, [32666, 63919], 32718, [32838, 63920], 36894, [37428, 63921],
+    [38646, 63922], [38728, 63923], [38936, 63924], 40801, [20363, 63925],
+    28583, [31150, 63926], [37300, 63927], [38583, 63928], [21214, 63791],
+    25736, [25796, 63792], [27347, 63793], 28510, 28696, [29200, 63794],
+    [30439, 63795], [12156, 32769, 63796], [34310, 63797], [34396, 63798],
+    [36335, 63799], 36613, [38706, 63800], [39791, 63801], [40442, 63802],
+    [12228, 40565], [30860, 63803], [31103, 63804], [32160, 63805],
+    [33737, 63806], [37636, 63807], [12229, 40575, 63808], 40595,
+    [35542, 63809], [22751, 63810], [24324, 63811], 26407, 28711, 29903,
+    [31840, 63812], [32894, 63813], 20769, 28712, [29282, 63814],
+    [30922, 63815], [36034, 63816], 36058, 36084, [38647, 63817],
+    [20102, 63930], [20698, 63931], [23534, 63932], 24278, [26009, 63934],
+    [29134, 63936], [30274, 63937], 30637, 32842, [34044, 63938],
+    [36988, 63939], 39719, [12243, 40845, 63940], [22744, 63818], 23105,
+    [23650, 63819], [27155, 63820], [28122, 63821], [28431, 63822], 30267,
+    [32047, 63823], [32311, 63824], 34078, 35128, 37860, [38475, 63825],
+    [21129, 63943], 26066, [26611, 63945], 27060, [27969, 63946],
+    [28316, 63947], 28687, [29705, 63948], 29792, [30041, 63949], 30244,
+    [30827, 63950], 35628, [39006, 63952], [20845, 63953], [25134, 63954],
+    [38520, 63955], 20374, [20523, 63956], [23833, 63957], [28138, 63958],
+    32184, [36650, 63959], [24459, 63960], [24900, 63961], [26647, 63962],
+    [38534, 63964], [21202, 63826], [32907, 63827], [20956, 63828],
+    [20940, 63829], 26974, [31260, 63830], [32190, 63831], [33777, 63832],
+    [38517, 63833], 20442, [21033, 63965], 21400, [21519, 63966], 21774,
+    [23653, 63967], 24743, [26446, 63969], [26792, 63970], 28012, 29313, 29432,
+    [29702, 63972], 29827, [30178, 63973], 31852, [32633, 63974], 32696, 33673,
+    [35023, 63975], [35041, 63976], [12197, 37324, 63977], 37328,
+    [38626, 63978], 39881, [21533, 63981], 28542, [29136, 63982],
+    [29848, 63983], [34298, 63984], 36522, [38563, 63985], [40023, 63986],
+    [40607, 63987], [26519, 63988], [28107, 63989], 29747, [33256, 63990],
+    38678, 30764, [12148, 31435, 63991], [31520, 63992], [31890, 63993], 25705,
+    29802, 30194, 30908, 30952, [12218, 39340], 39764, [12231, 40635], 23518,
+    24149, 28448, 33180, 33707, 37000, 19975, 21325, 23081, 24018, 24398,
+    24930, 25405, 26217, 26364, 28415, 28459, 28771, 30622, 33836, 34067,
+    34875, 36627, 39237, 39995, 21788, 25273, 26411, 27819, 33545, 35178,
+    38778, 20129, 22916, {f: 2, c: 24536}, 26395, 32178, 32596, 33426, 33579,
+    33725, 36638, 37017, 22475, 22969, 23186, 23504, 26151, 26522, 26757,
+    27599, 29028, 32629, 36023, 36067, 36993, 39749, 33032, 35978, 38476,
+    39488, [12230, 40613], 23391, 27667, 29467, 30450, 30431, 33804, 20906,
+    35219, 20813, 20885, 21193, 26825, 27796, 30468, 30496, 32191, 32236,
+    [12207, 38754], 40629, 28357, 34065, 20901, 21517, 21629, 26126, 26269,
+    26919, 28319, [12139, 30399], 30609, 33559, 33986, 34719, 37225, 37528,
+    40180, 34946, 20398, 20882, 21215, 22982, 24125, 24917, {f: 2, c: 25720},
+    26286, 26576, 27169, 27597, [12113, 27611], 29279, 29281, 29761, 30520,
+    [12141, 30683], 32791, 33468, 33541, 35584, 35624, 35980, [12106, 26408],
+    27792, 29287, [12140, 30446], 30566, 31302, 40361, 27519, 27794, 22818,
+    26406, 33945, 21359, 22675, 22937, 24287, 25551, 26164, 26483, 28218,
+    29483, 31447, 33495, 37672, 21209, 24043, 25006, 25035, 25098, 25287,
+    25771, [12102, 26080], 26969, 27494, [12111, 27595], 28961, 29687, 30045,
+    32326, 33310, 33538, 34154, 35491, 36031, 38695, 40289, 22696, 40664,
+    20497, 21006, 21563, 21839, [12098, 25991], 27766, {f: 2, c: 32010}, 32862,
+    34442, [12200, 38272], 38639, 21247, 27797, 29289, 21619, 23194, 23614,
+    23883, 24396, 24494, 26410, 26806, 26979, 28220, 28228, 30473,
+    [12150, 31859], 32654, 34183, 35598, 36855, 38753, 40692, 23735, 24758,
+    24845, 25003, 25935, {f: 2, c: 26107}, 27665, 27887, 29599, 29641, 32225,
+    38292, 23494, 34588, 35600, 21085, 21338, 25293, 25615, 25778, 26420,
+    27192, 27850, 29632, 29854, 31636, 31893, 32283, 33162, 33334, 34180,
+    36843, 38649, 39361, 20276, 21322, 21453, 21467, 25292, 25644, 25856,
+    26001, 27075, 27886, 28504, 29677, 30036, 30242, 30436, 30460, 30928,
+    [30971, 63844], 31020, 32070, 33324, 34784, 36820, 38930, 39151, 21187,
+    25300, 25765, 28196, 28497, 30332, 36299, 37297, 37474, 39662, 39747,
+    20515, 20621, 22346, 22952, 23592, 24135, 24439, 25151, 25918,
+    [12101, 26041], 26049, 26121, 26507, 27036, 28354, 30917, 32033, 32938,
+    33152, 33323, 33459, 33953, 34444, 35370, 35607, 37030, 38450, 40848,
+    20493, 20467, 22521, 24472, 25308, 25490, 26479, 28227, 28953, 30403,
+    32972, 32986, {f: 2, c: 35060}, 35097, 36064, 36649, 37197, 38506, 20271,
+    20336, 24091, 26575, 26658, [12137, 30333], 30334, 39748, 24161, 27146,
+    29033, 29140, 30058, 32321, 34115, 34281, 39132, 20240, 31567, 32624,
+    38309, 20961, 24070, 26805, 27710, 27726, 27867, 29359, 31684, 33539,
+    27861, 29754, 20731, 21128, 22721, 25816, 27287, 29863, 30294, 30887,
+    34327, 38370, 38713, 21342, 24321, 35722, 36776, 36783, 37002, 21029,
+    30629, 40009, 40712, 19993, 20482, 20853, 23643, 24183, 26142, 26170,
+    26564, 26821, 28851, 29953, 30149, 31177, 31453, 36647, 39200, 39432,
+    20445, 22561, 22577, 23542, 26222, 27493, 27921, 28282, 28541, 29668,
+    29995, 33769, 35036, 35091, 35676, 36628, 20239, 20693, 21264,
+    [12056, 21340], 23443, [24489, 63846], 26381, 31119, 33145, 33583, 34068,
+    35079, 35206, 36665, [36667, 64007], 39333, 39954, 26412, 20086, 20472,
+    22857, 23553, {f: 2, c: 23791}, 25447, 26834, 28925, 29090, 29739, 32299,
+    34028, 34562, 36898, 37586, 40179, [19981, 63847], 20184, 20463, 20613,
+    21078, 21103, 21542, 21648, 22496, 22827, 23142, 23386, 23413, 23500,
+    24220, 25206, 25975, 26023, 28014, 28325, [12119, 29238], 31526, 31807,
+    [12152, 32566], {f: 2, c: 33104}, 33178, 33344, 33433, 33705, 35331, 36000,
+    36070, 36091, 36212, 36282, 37096, 37340, [12201, 38428], 38468, 39385,
+    40167, [21271, 63843], 20998, 21545, 22132, 22707, 22868, 22894, 24575,
+    24996, 25198, 26128, 27774, 28954, 30406, 31881, 31966, 32027, 33452,
+    36033, 38640, 20315, 24343, 24447, 25282, 23849, 26379, 26842, 30844,
+    32323, 40300, 19989, 20633, [12052, 21269], 21290, 21329, 22915, 23138,
+    24199, 24754, 24970, 25161, 25209, 26000, 26503, 27047, [12112, 27604],
+    {f: 3, c: 27606}, 27832, 29749, 30202, 30738, 30865, 31189, 31192, 31875,
+    32203, 32737, 32933, 33086, 33218, 33778, 34586, 35048, 35513, 35692,
+    36027, 37145, [12206, 38750], [12214, 39131], [12240, 40763], 22188, 23338,
+    24428, 25996, 27315, 27567, 27996, 28657, 28693, 29277, 29613, 36007,
+    36051, 38971, 24977, 27703, 32856, 39425, 20045, 20107, 20123, 20181,
+    20282, 20284, 20351, 20447, 20735, 21490, 21496, 21766, 21987, 22235,
+    [12064, 22763], 22882, 23057, 23531, 23546, 23556, 24051, 24107, 24473,
+    24605, 25448, 26012, 26031, 26614, 26619, 26797, 27515, 27801, 27863,
+    28195, 28681, 29509, 30722, 31038, 31040, 31072, 31169, 31721, 32023,
+    32114, 32902, 33293, 33678, 34001, 34503, 35039, 35408, 35422, 35613,
+    36060, 36198, 36781, 37034, 39164, 39391, 40605, 21066, 26388, 20632,
+    21034, [12077, 23665], 25955, 27733, 29642, 29987, 30109, 31639, 33948,
+    37240, 38704, 20087, 25746, [27578, 63856], 29022, 34217, 19977, 26441,
+    26862, 28183, 33439, 34072, 34923, 25591, 28545, 37394, 39087, 19978,
+    20663, 20687, 20767, 21830, 21930, 22039, 23360, 23577, 23776, 24120,
+    24202, 24224, 24258, 24819, 26705, 27233, 28248, 29245, 29248,
+    [29376, 63994], 30456, 31077, 31665, 32724, 35059, 35316, 35443, 35937,
+    36062, 38684, [22622, 63852], 29885, 36093, 21959, 31329, [32034, 63850],
+    [12170, 33394], 29298, [12131, 29983], 29989, 31513, 22661, 22779, 23996,
+    24207, 24246, 24464, 24661, 25234, 25471, 25933, 26257, 26329, 26360,
+    26646, 26866, 29312, 29790, 31598, 32110, 32214, 32626, 32997, 33298,
+    34223, 35199, 35475, 36893, 37604, [12233, 40653], [12239, 40736],
+    [12067, 22805], 22893, 24109, 24796, 26132, 26227, 26512, 27728, 28101,
+    28511, [12143, 30707], 30889, 33990, 37323, 37675, 20185, 20682, 20808,
+    21892, 23307, 23459, 25159, 25982, 26059, 28210, 29053, 29697, 29764,
+    29831, 29887, 30316, 31146, 32218, 32341, 32680, 33146, 33203, 33337,
+    34330, 34796, 35445, 36323, 36984, 37521, 37925, 39245, 39854, 21352,
+    23633, 26964, 27844, 27945, 28203, [12166, 33292], 34203, 35131, 35373,
+    [35498, 63855, 63905], 38634, 40807, 21089, 26297, 27570, 32406, 34814,
+    36109, 38275, 38493, 25885, 28041, 29166, 22478, 22995, 23468, 24615,
+    24826, 25104, 26143, 26207, 29481, 29689, 30427, [30465, 63853], 31596,
+    32854, 32882, 33125, 35488, 37266, 19990, 21218, 27506, 27927, 31237,
+    31545, 32048, 36016, 21484, 22063, 22609, 23477, [12073, 23567], 23569,
+    24034, 25152, 25475, 25620, 26157, 26803, 27836, 28040, 28335, 28703,
+    28836, 29138, 29990, 30095, 30094, 30233, 31505, 31712, 31787, 32032,
+    32057, 34092, 34157, 34311, 35380, 36877, 36961, 37045, 37559, 38902,
+    39479, 20439, 23660, 26463, 28049, 31903, 32396, 35606, 36118, 36895,
+    23403, 24061, 25613, 33984, 36956, 39137, [29575, 63841, 63963], 23435,
+    24730, 26494, 28126, 35359, 35494, 36865, 38924, 21047, 28753, 30862,
+    37782, 34928, 37335, 20462, 21463, 22013, 22234, 22402, 22781, 23234,
+    23432, 23723, 23744, 24101, 24833, 25101, [12095, 25163], 25480, 25628,
+    25910, [25976, 63849], 27193, 27530, [12116, 27700], 27929, 28465, 29159,
+    29417, 29560, 29703, 29874, 30246, 30561, 31168, 31319, 31466, 31929,
+    32143, 32172, 32353, 32670, 33065, 33585, 33936, 34010, 34282, 34966,
+    35504, 35728, 36664, 36930, 36995, 37228, 37526, 37561, 38539,
+    {f: 2, c: 38567}, 38614, 38656, 38920, [12216, 39318], 39635, 39706, 21460,
+    22654, 22809, 23408, 23487, 28113, 28506, 29087, 29729, 29881, 32901,
+    33789, 24033, 24455, 24490, 24642, 26092, 26642, 26991, 27219, 27529,
+    27957, 28147, 29667, 30462, 30636, 31565, 32020, 33059, 33308, 33600,
+    34036, 34147, 35426, 35524, 37255, 37662, 38918, 39348, 25100, 34899,
+    36848, 37477, 23815, 23847, 23913, 29791, 33181, 34664, 28629,
+    [25342, 63859], 32722, 35126, 35186, 19998, 20056, 20711, 21213, 21319,
+    25215, 26119, 32361, 34821, 38494, 20365, 21273, 22070, 22987, 23204,
+    [12075, 23608], 23630, 23629, 24066, 24337, 24643, 26045, 26159, 26178,
+    26558, 26612, 29468, [12142, 30690], [12144, 31034], 32709, 33940, 33997,
+    35222, 35430, 35433, 35553, [12183, 35925], 35962, 22516, 23508, 24335,
+    24687, 25325, 26893, 27542, 28252, 29060, 31698, 34645, [35672, 63996],
+    36606, [12215, 39135], 39166, 20280, 20353, 20449, 21627, 23072, 23480,
+    24892, 26032, 26216, 29180, 30003, 31070, 32051, 33102, [12162, 33251],
+    33688, 34218, 34254, 34563, 35338, [12189, 36523], [12191, 36763], 36805,
+    22833, 23460, 23526, 24713, 23529, 23563, [12092, 24515], 27777, 28145,
+    28683, 29978, 33455, 35574, [20160, 63997], [12055, 21313], 38617,
+    [12114, 27663], 20126, 20420, 20818, 21854, 23077, 23784, 25105,
+    [12123, 29273], 33469, 33706, 34558, 34905, 35357, 38463, 38597, 39187,
+    40201, 40285, 22538, 23731, 23997, 24132, [24801, 63929], 24853, 25569,
+    [27138, 63764, 63836, 63935], 28197, 37122, 37716, 38990, 39952, 40823,
+    23433, 23736, 25353, 26191, 26696, 30524, 38593, 38797, 38996, 39839,
+    26017, 35585, 36555, 38332, 21813, 23721, 24022, 24245, 26263, 30284,
+    33780, 38343, 22739, 25276, 29390, 40232, 20208, 22830, 24591, 26171,
+    27523, 31207, 40230, 21395, 21696, 22467, 23830, 24859, 26326, 28079,
+    30861, 33406, 38552, 38724, 21380, 25212, 25494, 28082, 32266, 33099,
+    38989, 27387, 32588, 40367, 40474, 20063, 20539, 20918, 22812, 24825,
+    25590, 26928, 29242, 32822, 37326, 24369, 32004, [33509, 63860], 33903,
+    33979, 34277, 36493, 20335, 22756, 23363, 24665, 25562, 25880, 25965,
+    26264, 26954, 27171, 27915, 28673, 29036, 30162, 30221, 31155, 31344,
+    [12154, 32650], 35140, 35731, 37312, 38525, 39178, 22276, 24481, 26044,
+    28417, 30208, 31142, 35486, 39341, [12226, 39770], 40812, 20740, 25014,
+    25233, 27277, 33222, 20547, 22576, 24422, 28937, [12180, 35328], 35578,
+    23420, 34326, 20474, 20796, 22196, 22852, 25513, 28153, 23978, 26989,
+    20870, 20104, 20313, 22914, 27487, 27741, 29877, 30998, 33287, 33349,
+    33593, 36671, 36701, 39192, 20134, 22495, 24441, [26131, 63968], 30123,
+    32377, 35695, 36870, 39515, 22181, 22567, 23032, 23071, 23476, 24310,
+    25424, 25403, 26941, 27783, 27839, 28046, 28051, 28149, 28436, 28895,
+    28982, 29017, 29123, 29141, 30799, 30831, 31605, 32227, 32303, 34893,
+    36575, 37467, 40182, 24709, 28037, 29105, 38321, 21421, 26579, 28814,
+    28976, 29744, 33398, 33490, 38331, 39653, 40573, 26308, 29121,
+    [33865, 63854], 22603, 23992, 24433, 26144, 26254, 27001, 27054, 27704,
+    27891, 28214, 28481, 28634, 28699, 28719, 29008, 29151, 29552, 29787,
+    29908, 30408, 31310, 32403, 33521, 35424, 36814, 37704, 38681, 20034,
+    20522, 21000, 21473, 26355, 27757, 28618, 29450, 30591, 31330, 33454,
+    34269, 34306, 35028, 35427, 35709, 35947, 37555, 38675, 38928, 20116,
+    20237, 20425, 20658, 21320, 21566, 21555, 21978, 22626, 22714, 22887,
+    23067, 23524, 24735, 25034, 25942, 26111, 26212, 26791, 27738, 28595,
+    28879, 29100, 29522, 31613, 34568, 35492, 39986, 40711, 23627, 27779,
+    29508, [12127, 29577], 37434, 28331, 29797, 30239, 31337, 32277, 34314,
+    20800, 22725, 25793, 29934, 29973, 30320, 32705, 37013, 38605, 39252,
+    28198, [12129, 29926], {f: 2, c: 31401}, 33253, 34521, 34680, 35355, 23113,
+    23436, 23451, 26785, 26880, 28003, 29609, 29715, 29740, 30871, 32233,
+    32747, 33048, 33109, 33694, 35916, [38446, 63942], 38929, [12104, 26352],
+    24448, 26106, 26505, 27754, 29579, 20525, 23043, 27498, 30702, 22806,
+    23916, 24013, 29477, 30031, 20709, 20985, 22575, 22829, 22934, 23002,
+    23525, 23970, 25303, 25622, 25747, 25854, 26332, 27208, 29183, 29796,
+    31368, 31407, 32327, 32350, 32768, 33136, 34799, 35201, 35616, 36953,
+    36992, 39250, 24958, 27442, 28020, 32287, 35109, 36785, 20433, 20653,
+    20887, 21191, 22471, 22665, 23481, 24248, 24898, 27029, 28044, 28263,
+    28342, 29076, 29794, [12132, 29992], 29996, 32883, 33592, 33993, 36362,
+    37780, 37854, 20110, 20305, 20598, 20778, [12060, 21448], 21451, 21491,
+    23431, 23507, 23588, 24858, 24962, 26100, [12124, 29275], 29591, 29760,
+    30402, 31056, 31121, 31161, 32006, [12155, 32701], 33419, 34261, 34398,
+    36802, 36935, 37109, 37354, 38533, [12204, 38632], 38633, 21206, 24423,
+    26093, 26161, 26671, 29020, 31286, 37057, 38922, 20113, 27218, 27550,
+    28560, 29065, 32792, 33464, 34131, 36939, 38549, 38642, 38907, 34074,
+    39729, 20112, 29066, 38596, 20803, 21407, 21729, 22291, 22290, 22435,
+    23195, 23236, 23491, 24616, 24895, 25588, 27781, 27961, 28274, 28304,
+    29232, 29503, 29783, 33489, 34945, 36677, 36960, 38498, 39000, 40219,
+    [12105, 26376], 36234, 37470, 20301, 20553, 20702, 21361, 22285, 22996,
+    23041, 23561, 24944, 26256, 28205, 29234, 29771, 32239, 32963, 33806,
+    33894, 34111, 34655, 34907, 35096, 35586, 36949, [12209, 38859], 39759,
+    20083, 20369, 20754, 20842, 21807, 21929, 23418, 23461, {f: 2, c: 24188},
+    24254, 24736, 24799, {f: 2, c: 24840}, 25540, 25912, 26377, 26580, 26586,
+    {f: 2, c: 26977}, 27833, 27943, 28216, 28641, {f: 2, c: 29494}, 29788,
+    30001, 30290, 32173, 33278, 33848, 35029, 35480, 35547, 35565, 36400,
+    36418, 36938, 36926, 36986, [12195, 37193], 37321, 37742, 22537, 27603,
+    [12161, 32905], 32946, 20801, 22891, 23609, 28516, 29607, 32996, 36103,
+    37399, 38287, [12160, 32895], 25102, 28700, 32104, 34701, 22432, 24681,
+    24903, 27575, 35518, 37504, 38577, [12036, 20057], 21535, 28139, 34093,
+    38512, [12211, 38899], 39150, 25558, 27875, [12194, 37009], 20957, 25033,
+    33210, 40441, 20381, 20506, 20736, 23452, 24847, 25087, 25836, 26885,
+    27589, 30097, 30691, 32681, 33380, 34191, 34811, [12176, 34915], 35516,
+    35696, 37291, [12038, 20108], 20197, 20234, 22839, 23016, 24050, 24347,
+    24411, 24609, 29246, 29669, [30064, 63842], 30157, 31227, [12157, 32780],
+    [12159, 32819], 32900, 33505, 33617, 36029, 36019, 36999, 39156, 39180,
+    28727, 30410, 32714, 32716, 32764, 35610, [12040, 20154], 20161, 20995,
+    21360, [21693, 63902], 22240, 23035, 23493, 24341, 24525, 28270, 32106,
+    33589, 34451, 35469, 38765, 38775, [12032, 19968], 20314, 20350, 22777,
+    [12103, 26085], 28322, 36920, 37808, 39353, 20219, 22764, 22922, 23001,
+    24641, 31252, 33615, 36035, [12042, 20837], 21316, 20173, 21097, 23381,
+    33471, 20180, [21050, 63999], 21672, 22985, 23039, [12070, 23376], 23383,
+    23388, 24675, 24904, 28363, [28825, 63995], 29038, 29574, 29943, 30133,
+    30913, 32043, 32773, [12163, 33258], 33576, 34071, 34249, 35566, 36039,
+    38604, 20316, 21242, 22204, 26027, 26152, 28796, 28856, 29237, 32189,
+    33421, 37196, 38592, 40306, 23409, 26855, 27544, 28538, 30430, 23697,
+    26283, 28507, 31668, 31786, 34870, 38620, 19976, 20183, 21280, 22580,
+    22715, 22767, 22892, 23559, 24115, 24196, 24373, 25484, 26290, 26454,
+    27167, 27299, 27404, 28479, 29254, 29520, 29835, 31456, 31911, 33144,
+    33247, 33255, 33674, 33900, 34083, 34196, 34255, 35037, 36115, 37292,
+    [12199, 38263], 38556, 20877, 21705, 22312, 23472, 25165, 26448, 26685,
+    26771, 28221, 28371, 28797, 32289, 35009, 36001, 36617, 40779, 40782,
+    29229, 31631, 35533, 37658, 20295, 20302, 20786, 21632, 22992, 24213,
+    25269, 26485, 26990, 27159, 27822, 28186, 29401, 29482, 30141, 31672,
+    32053, 33511, 33785, 33879, 34295, 35419, 36015, 36487, 36889, 37048,
+    38606, 40799, 21219, 21514, 23265, 23490, 25688, 25973, 28404, 29380,
+    30340, 31309, 31515, 31821, 32318, 32735, 33659, 35627, 36042,
+    [12186, 36196], 36321, 36447, 36842, 36857, 36969, 37841, 20291, 20346,
+    20659, 20840, 20856, 21069, 21098, 22625, 22652, 22880, 23560, 23637,
+    24283, 24731, 25136, 26643, 27583, 27656, 28593, 29006, 29728,
+    [12133, 30000], 30008, 30033, 30322, 31564, 31627, 31661, 31686, 32399,
+    35438, 36670, 36681, 37439, 37523, 37666, 37931, 38651, 39002, 39019,
+    39198, [20999, 64000], 25130, 25240, 27993, 30308, 31434, 31680, 32118,
+    21344, 23742, 24215, 28472, 28857, 31896, 38673, 39822, 40670, 25509,
+    25722, 34678, 19969, 20117, 20141, 20572, 20597, 21576, 22979, 23450,
+    24128, 24237, 24311, 24449, 24773, 25402, 25919, 25972, 26060, 26230,
+    26232, 26622, 26984, 27273, 27491, 27712, 28096, 28136, 28191, 28254,
+    28702, 28833, 29582, 29693, 30010, 30555, 30855, 31118, 31243, 31357,
+    31934, 32142, 33351, 35330, 35562, 35998, 37165, 37194, 37336, 37478,
+    37580, 37664, 38662, 38742, 38748, 38914, [12237, 40718], 21046, 21137,
+    21884, 22564, 24093, 24351, 24716, 25552, 26799, 28639, 31085, 31532,
+    33229, 34234, 35069, 35576, 36420, 37261, 38500, 38555, 38717, 38988,
+    [12241, 40778], 20430, 20806, 20939, 21161, 22066, 24340, 24427, 25514,
+    25805, 26089, 26177, 26362, 26361, 26397, 26781, 26839, 27133, 28437,
+    28526, 29031, 29157, [12118, 29226], 29866, 30522, 31062, 31066, 31199,
+    31264, 31381, 31895, 31967, 32068, 32368, 32903, 34299, 34468, 35412,
+    35519, 36249, 36481, 36896, 36973, 37347, 38459, 38613, [12227, 40165],
+    26063, 31751, [12188, 36275], 37827, 23384, 23562, 21330, 25305, 29469,
+    20519, 23447, 24478, 24752, 24939, 26837, 28121, 29742, 31278, 32066,
+    32156, 32305, 33131, 36394, 36405, 37758, 37912, 20304, 22352, 24038,
+    24231, 25387, 32618, 20027, 20303, 20367, 20570, 23005, 32964, 21610,
+    21608, 22014, 22863, 23449, 24030, 24282, 26205, 26417, 26609, 26666,
+    27880, 27954, 28234, 28557, 28855, 29664, 30087, 31820, 32002, 32044,
+    32162, [12168, 33311], 34523, 35387, 35461, [12187, 36208], 36490, 36659,
+    36913, 37198, 37202, 37956, 39376, [12149, 31481], 31909, 20426, 20737,
+    20934, 22472, 23535, 23803, 26201, 27197, 27994, 28310, 28652, 28940,
+    30063, 31459, 34850, 36897, 36981, 38603, 39423, 33537, 20013, 20210,
+    34886, 37325, 21373, 27355, 26987, 27713, 33914, 22686, 24974, 26366,
+    25327, 28893, 29969, 30151, 32338, 33976, 35657, 36104, 20043, 21482,
+    21675, 22320, 22336, 24535, 25345, 25351, 25711, [12096, 25903], 26088,
+    26234, 26525, 26547, [12108, 27490], 27744, 27802, 28460, 30693, 30757,
+    31049, 31063, 32025, 32930, 33026, [12164, 33267], 33437, 33463, 34584,
+    35468, 36100, 36286, 36978, 30452, 31257, 31287, 32340, 32887, 21767,
+    21972, 22645, 25391, 25634, 26185, 26187, 26733, 27035, 27524, 27941,
+    28337, 29645, 29800, 29857, 30043, 30137, 30433, 30494, 30603, 31206,
+    32265, 32285, 33275, 34095, 34967, 35386, 36049, 36587,
+    [12192, 36784, 63857], 36914, 37805, 38499, 38515, 38663, 20356, 21489,
+    23018, 23241, 24089, 26702, 29894, 30142, 31209, 31378, 33187, 34541,
+    36074, 36300, 36845, 26015, 26389, 22519, 28503, 32221, 36655, 37878,
+    38598, 24501, 25074, 28548, 19988, 20376, 20511, 21449, 21983, 23919,
+    24046, 27425, 27492, 30923, 31642, 36425, [12190, 36554, 63746], 36974,
+    25417, 25662, 30528, 31364, 37679, 38015, 40810, 25776, 28591, 29158,
+    29864, 29914, 31428, 31762, 32386, 31922, 32408, 35738, 36106, 38013,
+    39184, 39244, 21049, 23519, 25830, 26413, 32046, 20717, [21443, 63851],
+    22649, {f: 2, c: 24920}, 25082, 26028, 31449, 35730, 35734, 20489, 20513,
+    21109, 21809, 23100, 24288, 24432, 24884, 25950, 26124, 26166, 26274,
+    27085, 28356, 28466, 29462, 30241, 31379, 33081, 33369, 33750, 33980,
+    20661, 22512, 23488, 23528, 24425, 25505, 30758, 32181, 33756, 34081,
+    37319, 37365, 20874, 26613, 31574, 36012, 20932, 22971, 24765, 34389,
+    20508, 21076, 23610, 24957, 25114, [25299, 64002], 25842, 26021, 28364,
+    30240, 33034, 36448, 38495, 38587, 20191, 21315, 21912, 22825, 24029,
+    25797, 27849, 28154, 29588, 31359, [12167, 33307], 34214, 36068, 36368,
+    36983, 37351, 38369, 38433, 38854, 20984, 21746, 21894, 24505, 25764,
+    28552, 32180, 36639, 36685, 37941, 20681, 23574, 27838, 28155, 29979,
+    30651, 31805, 31844, 35449, 35522, 22558, 22974, 24086, 25463, 29266,
+    30090, 30571, 35548, 36028, 36626, 24307, 26228, 28152, 32893, 33729,
+    35531, [12205, 38737], 39894, 21059, 26367, 28053, 28399, 32224, 35558,
+    36910, 36958, 39636, 21021, 21119, 21736, 24980, 25220, 25307, 26786,
+    26898, 26970, 27189, 28818, 28966, 30813, 30977, 30990, 31186, 31245,
+    32918, [12171, 33400], 33493, 33609, 34121, 35970, 36229, 37218, 37259,
+    37294, 20419, 22225, 29165, 30679, 34560, 35320, [12072, 23544], 24534,
+    26449, 37032, 21474, 22618, 23541, 24740, 24961, 25696, 32317, 32880,
+    34085, 37507, 25774, 20652, 23828, 26368, 22684, 25277, 25512, 26894,
+    27000, 27166, 28267, 30394, 31179, 33467, 33833, 35535, 36264, 36861,
+    37138, 37195, 37276, 37648, 37656, 37786, 38619, 39478, 39949, 19985,
+    30044, 31069, 31482, 31569, 31689, 32302, 33988, 36441, 36468, 36600,
+    36880, 26149, 26943, 29763, 20986, 26414, 40668, 20805, 24544, 27798,
+    34802, 34909, 34935, 24756, 33205, 33795, 36101, 21462, 21561, 22068,
+    23094, 23601, 28810, 32736, 32858, 33030, 33261, 36259, 37257, 39519,
+    40434, 20596, 20164, 21408, 24827, 28204, 23652, 20360, 20516, 21988,
+    23769, 24159, 24677, 26772, 27835, 28100, 29118, 30164, 30196, 30305,
+    31258, 31305, 32199, 32251, 32622, 33268, 34473, 36636, 38601, 39347,
+    [12242, 40786], 21063, 21189, 39149, 35242, 19971, 26578, 28422, 20405,
+    23522, 26517, [27784, 63858], 28024, 29723, 30759, 37341, 37756, 34756,
+    31204, 31281, 24555, 20182, 21668, 21822, 22702, 22949, 24816, 25171,
+    25302, 26422, 26965, 33333, 38464, 39345, 39389, 20524, 21331, 21828,
+    22396, 25176, 25826, 26219, 26589, 28609, 28655, 29730, 29752, 35351,
+    37944, 21585, 22022, 22374, 24392, 24986, 27470, 28760, 28845, 32187,
+    35477, 22890, 33067, 25506, 30472, 32829, 36010, 22612, 25645, 27067,
+    23445, 24081, 28271, 34153, 20812, 21488, 22826, 24608, 24907, 27526,
+    27760, 27888, 31518, 32974, 33492, 36294, 37040, 39089, 25799, 28580,
+    25745, 25860, 20814, 21520, [12063, 22303], 35342, 24927, 26742, 30171,
+    31570, 32113, 36890, 22534, 27084, 33151, 35114, 36864, 38969, 20600,
+    22871, 22956, 25237, 36879, 39722, 24925, 29305, 38358, 22369, 23110,
+    24052, 25226, 25773, 25850, 26487, 27874, 27966, 29228, 29750, 30772,
+    32631, 33453, 36315, 38935, 21028, 22338, 26495, 29256, 29923, 36009,
+    36774, 37393, 38442, [12043, 20843], 21485, 25420, 20329, 21764, 24726,
+    25943, 27803, 28031, 29260, 29437, 31255, 35207, [12185, 35997], 24429,
+    28558, 28921, 33192, 24846, [20415, 63845], 20559, 25153, [12122, 29255],
+    31687, 32232, 32745, 36941, 38829, 39449, 36022, 22378, 24179, 26544,
+    33805, 35413, 21536, 23318, 24163, 24290, 24330, 25987, 32954, 34109,
+    38281, 38491, 20296, 21253, 21261, 21263, 21638, 21754, 22275, 24067,
+    24598, 25243, 25265, 25429, 27873, 28006, 30129, 30770, 32990, 33071,
+    33502, 33889, 33970, 34957, 35090, 36875, 37610, 39165, 39825, 24133,
+    [26292, 64006], 26333, 28689, 29190, 20469, 21117, 24426, 24915, 26451,
+    27161, 28418, 29922, 31080, 34920, 35961, 39111, 39108, 39491, 21697,
+    31263, 26963, 35575, 35914, [12213, 39080], 39342, 24444, 25259, 30130,
+    [12138, 30382], 34987, 36991, 38466, 21305, 24380, 24517, [27852, 63848],
+    29644, 30050, [12134, 30091], 31558, 33534, 39325, 20047, 36924, 19979,
+    20309, 21414, 22799, 24264, 26160, 27827, 29781, 33655, 34662, 36032,
+    36944, 38686, 39957, 22737, 23416, 34384, 35604, 40372, 23506, 24680,
+    24717, 26097, 27735, 28450, 28579, 28698, 32597, 32752, {f: 2, c: 38289},
+    38480, 38867, 21106, 36676, 20989, 21547, 21688, 21859, 21898, 27323,
+    28085, 32216, 33382, 37532, 38519, 40569, 21512, 21704, 30418, 34532,
+    38308, 38356, 38492, 20130, 20233, 23022, 23270, 24055, 24658, 25239,
+    26477, 26689, 27782, 28207, 32568, 32923, 33322, 38917, 20133, 20565,
+    21683, 22419, 22874, 23401, 23475, 25032, 26999, 28023, 28707, 34809,
+    35299, 35442, 35559, 36994, 39405, 39608, 21182, 26680, 20502, 24184,
+    26447, 33607, [12175, 34892, 64008], 20139, 21521, 22190, 29670, 37141,
+    38911, 39177, 39255, [12217, 39321], 22099, 22687, 34395, 35377, 25010,
+    27382, 29563, 36562, 27463, 38570, 39511, 22869, 29184, 36203,
+    [12208, 38761], 20436, 23796, 24358, 25080, 26203, 27883, 28843,
+    [12126, 29572], 29625, 29694, 30505, 30541, 32067, 32098, 32291, 33335,
+    34898, 36066, 37449, 39023, 23377, [12147, 31348], [12174, 34880],
+    [12212, 38913], 23244, 20448, 21332, 22846, 23805, 25406, 28025, 29433,
+    33029, 33031, 33698, 37583, 38960, 20136, 20804, 21009, 22411, 24418,
+    27842, 28366, 28677, 28752, 28847, 29074, 29673, [29801, 63918], 33610,
+    34722, 34913, 36872, 37026, 37795, 39336, 20846, 24407, 24800, 24935,
+    26291, 34137, 36426, 37295, 38795, 20046, 20114, 21628, 22741, 22778,
+    22909, 23733, 24359, [12094, 25142], 25160, 26122, 26215, 27627, 28009,
+    28111, 28246, 28408, 28564, 28640, 28649, 28765, 29392, 29733, 29786,
+    29920, 30355, 31068, 31946, 32286, 32993, 33446, 33899, 33983, 34382,
+    34399, 34676, 35703, 35946, 37804, 38912, 39013, 24785, 25110, 37239,
+    23130, 26127, 28151, 28222, 29759, 39746, 24573, 24794, 31503, 21700,
+    24344, 27742, 27859, 27946, 28888, 32005, 34425, 35340, 40251, 21270,
+    21644, 23301, 27194, [12117, 28779], 30069, 31117, [12146, 31166], 33457,
+    33775, 35441, 35649, 36008, 38772, 25844, 25899, {f: 2, c: 30906}, 31339,
+    20024, 21914, 22864, 23462, 24187, 24739, 25563, 27489, 26213, 26707,
+    28185, 29029, 29872, 32008, 36996, 39529, 39973, 27963, [28369, 63748],
+    29502, 35905, 38346, 20976, 24140, 24488, 24653, 24822, 24880, 24908,
+    {f: 2, c: 26179}, 27045, 27841, 28255, 28361, 28514, 29004, 29852, 30343,
+    31681, 31783, 33618, 34647, 36945, 38541, [12232, 40643], 21295, 22238,
+    24315, 24458, 24674, 24724, 25079, 26214, 26371, 27292, 28142, 28590,
+    28784, 29546, 32362, 33214, 33588, 34516, 35496, 36036, 21123, 29554,
+    23446, 27243, 37892, 21742, 22150, 23389, 25928, 25989, 26313, 26783,
+    28045, 28102, [12120, 29243], 32948, 37237, 39501, 20399, 20505, 21402,
+    21518, 21564, 21897, 21957, 24127, 24460, 26429, 29030, 29661, 36869,
+    21211, 21235, 22628, 22734, 28932, 29071, 29179, 34224, 35347,
+    [26248, 63941], 34216, 21927, 26244, 29002, 33841, 21321, 21913, 27585,
+    24409, 24509, 25582, 26249, 28999, 35569, 36637, 40638, 20241, 25658,
+    28875, 30054, 34407, 24676, 35662, 40440, 20807, 20982, 21256, 27958,
+    33016, [12234, 40657], 26133, 27427, 28824, 30165, 21507, 23673, 32007,
+    35350, [12107, 27424], 27453, 27462, 21560, 24688, 27965, 32725, 33288,
+    20694, 20958, 21916, 22123, 22221, 23020, 23305, 24076, 24985, 24984,
+    25137, 26206, 26342, 29081, {f: 2, c: 29113}, 29351, 31143, 31232, 32690,
+    35440, {s: 163}, {f: 4, c: 12310}, {s: 14}, 8223, 8219, {f: 2, c: 8314},
+    {s: 7}, 8316, 0, {f: 2, c: 8317}, {s: 23}, 700, {s: 44}, 8942, 8759,
+    {s: 20}, {f: 10, c: 10122}, {s: 36}, {f: 26, c: 9398}, {s: 61},
+    {f: 2, c: 8826}, {f: 2, c: 8910}, {f: 2, c: 8832}, {f: 4, c: 8816}, 0,
+    8842, 0, 8843, {f: 2, c: 8822}, 8825, {f: 2, c: 8922}, {s: 5}, 8773, 8771,
+    8776, 0, 8868, {s: 78}, 8244, {s: 11}, 9839, {s: 4}, 8258, {s: 4}, 10045,
+    0, 0, 8226, {s: 4}, {f: 2, c: 8249}, {s: 16}, 10010, 10006, 0, 9711,
+    {s: 3}, 10070, 0, 9676, {s: 24}, 9775, {s: 6}, 12320, 0, {f: 10, c: 10102},
+    {s: 17}, 12306, 12342, {s: 13}, 8710, 0, 8735, 0, {f: 2, c: 8741}, 0, 8787,
+    8785, {f: 2, c: 8806}, 8723, {f: 3, c: 8853}, 0, 8980, 0, 0, 8802, 0, 9649,
+    0, 8738, 8784, 0, 0, 8867, 0, 0, {f: 2, c: 8814}, 8837, 8836, 8713, 8716,
+    {f: 2, c: 8891}, 8794, 8966, {s: 6}, 12958, 0, 8252, {s: 11}, 9702, {s: 3},
+    9663, 9653, 9657, 9667, {s: 4}, 9674, 12849, 12857, 13259, {f: 5, c: 9327},
+    {s: 18}, 8656, 8655, 8653, {s: 37}, 8657, 8659, {s: 8}, 8626, 8625, 0,
+    8628, 8624, 8627, {s: 14}, 8636, 8640, {s: 10}, {f: 2, c: 8644}, {s: 144},
+    {f: 5, c: 9347}, {s: 33}, 12948, {s: 15}, 12965, {s: 93}, 8672, 8674, 8673,
+    8675, {s: 4}, 8678, 8680, 8679, 8681, {s: 20}, 9757, 9759, {s: 76}, 12944,
+    {f: 6, c: 12938}, {s: 15}, {f: 2, c: 12318}, 8246, 0, 8245, {s: 3}, 12540,
+    0, 0, {f: 2, c: 44034}, {f: 2, c: 44037}, {f: 5, c: 44043}, 44056,
+    {f: 2, c: 44062}, {f: 3, c: 44065}, {f: 7, c: 44069}, 44078,
+    {f: 6, c: 44082}, {f: 2, c: 44090}, {f: 3, c: 44093}, {f: 10, c: 44097},
+    44108, {f: 6, c: 44110}, {f: 3, c: 44117}, {f: 3, c: 44121},
+    {f: 19, c: 44125}, {f: 2, c: 44146}, {f: 2, c: 44149}, 44153,
+    {f: 5, c: 44155}, 44162, {f: 2, c: 44167}, {f: 3, c: 44173},
+    {f: 3, c: 44177}, {f: 7, c: 44181}, 44190, {f: 6, c: 44194}, 44203,
+    {f: 2, c: 44205}, {f: 7, c: 44209}, 44218, {f: 3, c: 44222},
+    {f: 2, c: 44226}, {f: 3, c: 44229}, {f: 3, c: 44233}, {f: 8, c: 44237},
+    44246, {f: 8, c: 44248}, {f: 2, c: 44258}, {f: 2, c: 44261}, 44265, 44267,
+    {f: 2, c: 44269}, 44274, 44276, {f: 5, c: 44279}, {f: 2, c: 44286},
+    {f: 3, c: 44289}, 44293, {f: 5, c: 44295}, 44302, 44304, {f: 6, c: 44306},
+    {f: 3, c: 44313}, {f: 3, c: 44317}, {f: 8, c: 44321}, {f: 2, c: 44330},
+    {f: 6, c: 44334}, {f: 2, c: 44342}, {f: 3, c: 44345}, {f: 7, c: 44349},
+    44358, 44360, {f: 6, c: 44362}, {f: 3, c: 44369}, {f: 3, c: 44373},
+    {f: 8, c: 44377}, 44386, {f: 8, c: 44388}, {f: 2, c: 44398},
+    {f: 2, c: 44401}, {f: 4, c: 44407}, 44414, 44416, {f: 5, c: 44419},
+    {f: 2, c: 44426}, {f: 3, c: 44429}, {f: 11, c: 44433}, {f: 6, c: 44446},
+    {f: 18, c: 44453}, {f: 8, c: 44472}, {f: 2, c: 44482}, {f: 3, c: 44485},
+    {f: 7, c: 44489}, 44498, {f: 8, c: 44500}, {f: 3, c: 44509},
+    {f: 3, c: 44513}, {f: 19, c: 44517}, {f: 2, c: 44538}, {f: 2, c: 44541},
+    {f: 6, c: 44546}, 44554, 44556, {f: 6, c: 44558}, {f: 27, c: 44565},
+    {f: 2, c: 44594}, {f: 2, c: 44597}, 44601, {f: 5, c: 44603}, 44610, 44612,
+    {f: 3, c: 44615}, 44619, 44623, {f: 3, c: 44625}, 44629, {f: 5, c: 44631},
+    44638, {f: 3, c: 44642}, {f: 2, c: 44646}, {f: 2, c: 44650},
+    {f: 3, c: 44653}, {f: 7, c: 44657}, 44666, {f: 6, c: 44670},
+    {f: 6, c: 44678}, {f: 47, c: 44685}, 44735, {f: 3, c: 44737},
+    {f: 7, c: 44741}, 44750, {f: 6, c: 44754}, {f: 2, c: 44762},
+    {f: 11, c: 44765}, {f: 2, c: 44777}, 44780, {f: 6, c: 44782},
+    {f: 3, c: 44789}, {f: 3, c: 44793}, {f: 10, c: 44797}, {f: 4, c: 44809},
+    {f: 2, c: 44814}, {f: 27, c: 44817}, {f: 2, c: 44846}, 44849, 44851,
+    {f: 7, c: 44853}, 44862, 44864, {f: 4, c: 44868}, {f: 6, c: 44874},
+    {f: 11, c: 44881}, {f: 6, c: 44894}, {f: 19, c: 44902}, {f: 6, c: 44922},
+    {f: 3, c: 44929}, {f: 3, c: 44933}, {f: 7, c: 44937}, {f: 3, c: 44946},
+    {f: 6, c: 44950}, {f: 27, c: 44957}, {f: 2, c: 44986}, {f: 3, c: 44989},
+    {f: 6, c: 44993}, 45002, 45004, {f: 5, c: 45007}, {f: 7, c: 45013},
+    {f: 11, c: 45021}, {f: 6, c: 45034}, {f: 2, c: 45042}, {f: 3, c: 45045},
+    {f: 7, c: 45049}, {f: 2, c: 45058}, {f: 7, c: 45061}, {f: 3, c: 45069},
+    {f: 3, c: 45073}, {f: 7, c: 45077}, {f: 10, c: 45086}, {f: 27, c: 45097},
+    {f: 2, c: 45126}, 45129, 45131, 45133, {f: 4, c: 45135}, 45142, 45144,
+    {f: 3, c: 45146}, {f: 30, c: 45150}, {f: 2, c: 45182}, {f: 3, c: 45185},
+    {f: 7, c: 45189}, 45198, 45200, {f: 6, c: 45202}, 45211, {f: 2, c: 45213},
+    {f: 5, c: 45219}, 45226, 45232, 45234, {f: 2, c: 45238}, {f: 3, c: 45241},
+    {f: 7, c: 45245}, 45254, {f: 6, c: 45258}, {f: 2, c: 45266},
+    {f: 3, c: 45269}, {f: 7, c: 45273}, {f: 4, c: 45281}, {f: 34, c: 45286},
+    45322, {f: 3, c: 45325}, 45329, {f: 4, c: 45332}, 45338, {f: 5, c: 45342},
+    {f: 2, c: 45350}, {f: 3, c: 45353}, {f: 7, c: 45357}, 45366,
+    {f: 6, c: 45370}, {f: 2, c: 45378}, {f: 3, c: 45381}, {f: 7, c: 45385},
+    {f: 2, c: 45394}, {f: 2, c: 45398}, {f: 3, c: 45401}, {f: 3, c: 45405},
+    {f: 23, c: 45409}, {f: 2, c: 45434}, {f: 3, c: 45437}, 45441,
+    {f: 5, c: 45443}, 45450, 45452, {f: 4, c: 45454}, {f: 3, c: 45461},
+    {f: 3, c: 45465}, {f: 11, c: 45469}, {f: 35, c: 45481}, {f: 3, c: 45517},
+    {f: 3, c: 45521}, {f: 7, c: 45525}, 45534, {f: 8, c: 45536},
+    {f: 2, c: 45546}, {f: 3, c: 45549}, {f: 8, c: 45553}, 45562, 45564,
+    {f: 6, c: 45566}, {f: 2, c: 45574}, {f: 2, c: 45577}, {f: 7, c: 45581},
+    45590, 45592, {f: 6, c: 45594}, {f: 19, c: 45601}, {f: 7, c: 45621},
+    {f: 27, c: 45629}, {f: 3, c: 45657}, {f: 3, c: 45661}, {f: 7, c: 45665},
+    {f: 10, c: 45674}, {f: 6, c: 45686}, {f: 7, c: 45693}, {f: 3, c: 45702},
+    {f: 6, c: 45706}, {f: 2, c: 45714}, {f: 3, c: 45717}, {f: 5, c: 45723},
+    45730, 45732, {f: 3, c: 45735}, 45739, {f: 3, c: 45741}, {f: 3, c: 45745},
+    {f: 19, c: 45749}, {f: 2, c: 45770}, {f: 3, c: 45773}, 45777,
+    {f: 5, c: 45779}, 45786, 45788, {f: 4, c: 45790}, 45795, 45799,
+    {f: 2, c: 45801}, {f: 3, c: 45808}, 45814, {f: 3, c: 45820},
+    {f: 2, c: 45826}, {f: 3, c: 45829}, {f: 7, c: 45833}, 45842,
+    {f: 6, c: 45846}, {f: 55, c: 45853}, 45911, {f: 2, c: 45913}, 45917,
+    {f: 4, c: 45920}, 45926, 45928, 45930, {f: 2, c: 45932}, 45935,
+    {f: 2, c: 45938}, {f: 3, c: 45941}, {f: 7, c: 45945}, 45954,
+    {f: 6, c: 45958}, {f: 3, c: 45965}, {f: 3, c: 45969}, {f: 11, c: 45973},
+    {f: 6, c: 45986}, {f: 3, c: 45993}, {f: 23, c: 45997}, {f: 2, c: 46022},
+    {f: 2, c: 46025}, 46029, 46031, {f: 3, c: 46033}, 46038, 46040, 46042,
+    46044, {f: 2, c: 46046}, {f: 3, c: 46049}, {f: 3, c: 46053},
+    {f: 19, c: 46057}, {f: 19, c: 46077}, {f: 7, c: 46097}, {f: 3, c: 46105},
+    {f: 3, c: 46109}, {f: 7, c: 46113}, 46122, {f: 8, c: 46124},
+    {f: 27, c: 46133}, {f: 2, c: 46162}, {f: 3, c: 46165}, {f: 7, c: 46169},
+    46178, 46180, {f: 6, c: 46182}, {f: 19, c: 46189}, {f: 7, c: 46209},
+    {f: 20, c: 46217}, {f: 6, c: 46238}, {f: 3, c: 46245}, {f: 3, c: 46249},
+    {f: 8, c: 46253}, 46262, 46264, {f: 6, c: 46266}, {f: 3, c: 46273},
+    {f: 3, c: 46277}, {f: 7, c: 46281}, {f: 4, c: 46289}, {f: 6, c: 46294},
+    {f: 2, c: 46302}, {f: 2, c: 46305}, 46309, {f: 5, c: 46311}, 46318, 46320,
+    {f: 6, c: 46322}, {f: 27, c: 46329}, {f: 2, c: 46358}, {f: 2, c: 46361},
+    {f: 7, c: 46365}, 46374, {f: 5, c: 46379}, {f: 2, c: 46386},
+    {f: 3, c: 46389}, {f: 7, c: 46393}, 46402, {f: 5, c: 46406},
+    {f: 2, c: 46414}, {f: 3, c: 46417}, {f: 7, c: 46421}, 46430,
+    {f: 62, c: 46434}, {f: 2, c: 46498}, {f: 3, c: 46501}, 46505,
+    {f: 4, c: 46508}, 46514, {f: 5, c: 46518}, {f: 2, c: 46526},
+    {f: 3, c: 46529}, {f: 7, c: 46533}, 46542, {f: 6, c: 46546},
+    {f: 19, c: 46553}, {f: 35, c: 46573}, {f: 2, c: 46610}, {f: 3, c: 46613},
+    {f: 12, c: 46617}, {f: 6, c: 46630}, {f: 7, c: 46637}, {f: 19, c: 46645},
+    {f: 27, c: 46665}, {f: 3, c: 46693}, {f: 51, c: 46697}, {f: 2, c: 46750},
+    {f: 3, c: 46753}, {f: 6, c: 46757}, {f: 4, c: 46765}, {f: 34, c: 46770},
+    {f: 27, c: 46805}, {f: 3, c: 46833}, {f: 3, c: 46837}, {f: 7, c: 46841},
+    {f: 3, c: 46850}, {f: 34, c: 46854}, {f: 2, c: 46890}, {f: 2, c: 46893},
+    {f: 7, c: 46897}, 46906, {f: 8, c: 46908}, {f: 3, c: 46917},
+    {f: 3, c: 46921}, {f: 7, c: 46925}, {f: 10, c: 46934}, {f: 3, c: 46945},
+    {f: 3, c: 46949}, {f: 7, c: 46953}, 46962, 46964, {f: 6, c: 46966},
+    {f: 2, c: 46974}, {f: 3, c: 46977}, {f: 7, c: 46981}, 46990,
+    {f: 3, c: 46995}, {f: 2, c: 47002}, {f: 3, c: 47005}, {f: 7, c: 47009},
+    47018, {f: 6, c: 47022}, {f: 2, c: 47030}, {f: 14, c: 47033}, 47048,
+    {f: 34, c: 47050}, {f: 2, c: 47086}, {f: 3, c: 47089}, {f: 7, c: 47093},
+    47102, {f: 5, c: 47106}, {f: 2, c: 47114}, {f: 3, c: 47117},
+    {f: 7, c: 47121}, 47130, 47132, {f: 6, c: 47134}, {f: 2, c: 47142},
+    {f: 3, c: 47145}, {f: 7, c: 47149}, 47158, {f: 6, c: 47162},
+    {f: 3, c: 47169}, {f: 12, c: 47173}, 47186, {f: 8, c: 47188},
+    {f: 2, c: 47198}, {f: 3, c: 47201}, {f: 7, c: 47205}, 47214, 47216,
+    {f: 6, c: 47218}, {f: 3, c: 47225}, {f: 16, c: 47229}, {f: 26, c: 47246},
+    {f: 7, c: 47273}, {f: 3, c: 47281}, {f: 3, c: 47285}, {f: 7, c: 47289},
+    47298, 47300, {f: 6, c: 47302}, {f: 3, c: 47309}, {f: 3, c: 47313},
+    {f: 8, c: 47317}, 47326, 47328, {f: 6, c: 47330}, {f: 2, c: 47338},
+    {f: 3, c: 47341}, {f: 7, c: 47345}, 47354, 47356, {f: 6, c: 47358},
+    {f: 19, c: 47365}, {f: 7, c: 47385}, {f: 27, c: 47393}, {f: 2, c: 47422},
+    {f: 3, c: 47425}, {f: 7, c: 47429}, {f: 2, c: 47437}, 47440,
+    {f: 6, c: 47442}, {f: 2, c: 47450}, {f: 3, c: 47453}, {f: 7, c: 47457},
+    47466, 47468, {f: 6, c: 47470}, {f: 2, c: 47478}, {f: 3, c: 47481},
+    {f: 7, c: 47485}, 47494, 47496, {f: 2, c: 47499}, {f: 29, c: 47503},
+    {f: 2, c: 47534}, {f: 3, c: 47537}, {f: 7, c: 47541}, 47550, 47552,
+    {f: 6, c: 47554}, {f: 2, c: 47562}, 47565, {f: 5, c: 47571}, 47578, 47580,
+    {f: 2, c: 47583}, 47586, {f: 2, c: 47590}, {f: 3, c: 47593},
+    {f: 7, c: 47597}, 47606, {f: 5, c: 47611}, {f: 6, c: 47618},
+    {f: 12, c: 47625}, {f: 34, c: 47638}, {f: 2, c: 47674}, {f: 3, c: 47677},
+    47681, {f: 5, c: 47683}, 47690, 47692, {f: 4, c: 47695}, {f: 2, c: 47702},
+    {f: 3, c: 47705}, {f: 7, c: 47709}, 47718, {f: 6, c: 47722},
+    {f: 2, c: 47730}, {f: 3, c: 47733}, {f: 10, c: 47737}, 47750,
+    {f: 4, c: 47752}, {f: 27, c: 47757}, 47786, {f: 3, c: 47789}, 47793,
+    {f: 5, c: 47795}, 47802, 47804, {f: 6, c: 47806}, {f: 3, c: 47813},
+    {f: 15, c: 47817}, {f: 34, c: 47834}, {f: 3, c: 47869}, {f: 3, c: 47873},
+    {f: 8, c: 47877}, 47886, 47888, {f: 6, c: 47890}, {f: 3, c: 47897},
+    {f: 3, c: 47901}, {f: 8, c: 47905}, 47914, {f: 8, c: 47916}, 47927,
+    {f: 2, c: 47929}, {f: 5, c: 47935}, 47942, 47944, {f: 3, c: 47946}, 47950,
+    {f: 3, c: 47953}, {f: 3, c: 47957}, {f: 8, c: 47961}, 47970,
+    {f: 8, c: 47972}, {f: 27, c: 47981}, {f: 3, c: 48009}, {f: 3, c: 48013},
+    {f: 19, c: 48017}, {f: 3, c: 48037}, {f: 3, c: 48041}, {f: 7, c: 48045},
+    {f: 2, c: 48053}, {f: 8, c: 48056}, {f: 3, c: 48065}, {f: 3, c: 48069},
+    {f: 7, c: 48073}, {f: 2, c: 48081}, {f: 36, c: 48084}, {f: 2, c: 48122},
+    {f: 2, c: 48125}, 48129, {f: 5, c: 48131}, 48138, 48142, 48144,
+    {f: 2, c: 48146}, {f: 2, c: 48153}, {f: 4, c: 48160}, 48166, 48168,
+    {f: 3, c: 48170}, {f: 2, c: 48174}, {f: 2, c: 48178}, {f: 3, c: 48181},
+    {f: 7, c: 48185}, 48194, {f: 3, c: 48198}, {f: 2, c: 48202},
+    {f: 2, c: 48206}, {f: 12, c: 48209}, {f: 38, c: 48222}, {f: 2, c: 48262},
+    {f: 2, c: 48265}, 48269, {f: 5, c: 48271}, 48278, 48280, {f: 5, c: 48283},
+    {f: 2, c: 48290}, {f: 2, c: 48293}, {f: 7, c: 48297}, 48306,
+    {f: 6, c: 48310}, {f: 2, c: 48318}, {f: 3, c: 48321}, {f: 8, c: 48325},
+    48334, {f: 3, c: 48338}, {f: 2, c: 48342}, {f: 3, c: 48345},
+    {f: 23, c: 48349}, 48375, {f: 3, c: 48377}, {f: 7, c: 48381}, 48390, 48392,
+    {f: 6, c: 48394}, {f: 3, c: 48401}, {f: 15, c: 48405}, {f: 7, c: 48421},
+    {f: 19, c: 48429}, {f: 7, c: 48449}, {f: 2, c: 48458}, {f: 3, c: 48461},
+    {f: 7, c: 48465}, {f: 10, c: 48474}, {f: 3, c: 48485}, {f: 23, c: 48489},
+    {f: 2, c: 48514}, {f: 2, c: 48517}, {f: 5, c: 48523}, 48530, 48532,
+    {f: 3, c: 48534}, 48539, {f: 7, c: 48541}, {f: 11, c: 48549},
+    {f: 7, c: 48561}, {f: 27, c: 48569}, {f: 2, c: 48598}, {f: 3, c: 48601},
+    {f: 12, c: 48605}, {f: 6, c: 48618}, {f: 3, c: 48625}, {f: 3, c: 48629},
+    {f: 7, c: 48633}, {f: 2, c: 48641}, 48644, {f: 6, c: 48646},
+    {f: 2, c: 48654}, {f: 3, c: 48657}, {f: 7, c: 48661}, 48670,
+    {f: 36, c: 48672}, {f: 2, c: 48710}, {f: 3, c: 48713}, 48717,
+    {f: 5, c: 48719}, 48726, 48728, {f: 4, c: 48732}, {f: 2, c: 48738},
+    {f: 3, c: 48741}, 48745, {f: 5, c: 48747}, 48754, {f: 5, c: 48758},
+    {f: 2, c: 48766}, {f: 3, c: 48769}, {f: 7, c: 48773}, 48782,
+    {f: 6, c: 48786}, {f: 14, c: 48794}, {f: 39, c: 48809}, {f: 2, c: 48850},
+    {f: 2, c: 48853}, {f: 7, c: 48857}, {f: 2, c: 48865}, {f: 6, c: 48870},
+    {f: 20, c: 48877}, {f: 6, c: 48898}, {f: 14, c: 48906}, 48922,
+    {f: 34, c: 48926}, {f: 2, c: 48962}, {f: 3, c: 48965}, {f: 7, c: 48969},
+    {f: 3, c: 48978}, {f: 62, c: 48982}, {f: 27, c: 49045}, {f: 20, c: 49073},
+    {f: 6, c: 49094}, {f: 2, c: 49102}, {f: 3, c: 49105}, {f: 7, c: 49109},
+    {f: 2, c: 49117}, 49120, {f: 90, c: 49122}, {f: 20, c: 49213},
+    {f: 6, c: 49234}, {f: 3, c: 49241}, {f: 3, c: 49245}, {f: 7, c: 49249},
+    {f: 38, c: 49258}, {f: 2, c: 49298}, {f: 3, c: 49301}, {f: 7, c: 49305},
+    49314, 49316, {f: 6, c: 49318}, 49326, {f: 2, c: 49329}, {f: 5, c: 49335},
+    49342, {f: 3, c: 49346}, {f: 2, c: 49350}, {f: 2, c: 49354},
+    {f: 3, c: 49357}, {f: 7, c: 49361}, 49370, {f: 6, c: 49374},
+    {f: 2, c: 49382}, {f: 3, c: 49385}, {f: 7, c: 49389}, 49398, 49400,
+    {f: 6, c: 49402}, {f: 3, c: 49409}, {f: 3, c: 49413}, {f: 7, c: 49417},
+    {f: 4, c: 49425}, {f: 6, c: 49430}, {f: 2, c: 49441}, 49445,
+    {f: 4, c: 49448}, 49454, {f: 4, c: 49458}, 49463, {f: 2, c: 49466},
+    {f: 3, c: 49469}, {f: 7, c: 49473}, 49482, {f: 6, c: 49486},
+    {f: 2, c: 49494}, {f: 3, c: 49497}, {f: 7, c: 49501}, 49510,
+    {f: 6, c: 49514}, {f: 3, c: 49521}, {f: 3, c: 49525}, {f: 12, c: 49529},
+    {f: 6, c: 49542}, 49551, {f: 3, c: 49553}, 49557, {f: 5, c: 49559}, 49566,
+    49568, {f: 3, c: 49570}, {f: 2, c: 49574}, {f: 2, c: 49578},
+    {f: 3, c: 49581}, {f: 12, c: 49585}, {f: 6, c: 49598}, {f: 3, c: 49605},
+    {f: 3, c: 49609}, {f: 7, c: 49613}, {f: 2, c: 49621}, {f: 7, c: 49625},
+    {f: 3, c: 49633}, {f: 3, c: 49637}, {f: 7, c: 49641}, 49650,
+    {f: 8, c: 49652}, {f: 2, c: 49662}, {f: 3, c: 49665}, {f: 7, c: 49669},
+    49678, 49680, {f: 6, c: 49682}, {f: 2, c: 49690}, {f: 2, c: 49693},
+    {f: 7, c: 49697}, 49706, 49708, 49710, 49712, 49715, {f: 19, c: 49717},
+    {f: 7, c: 49737}, {f: 2, c: 49746}, {f: 3, c: 49749}, {f: 7, c: 49753},
+    {f: 4, c: 49761}, {f: 6, c: 49766}, {f: 2, c: 49774}, {f: 3, c: 49777},
+    {f: 7, c: 49781}, 49790, 49792, {f: 6, c: 49794}, {f: 6, c: 49802},
+    {f: 7, c: 49809}, {f: 2, c: 49817}, 49820, {f: 6, c: 49822},
+    {f: 2, c: 49830}, {f: 3, c: 49833}, {f: 6, c: 49838}, 49846, 49848,
+    {f: 34, c: 49850}, {f: 2, c: 49886}, {f: 2, c: 49889}, {f: 6, c: 49893},
+    49902, 49904, {f: 4, c: 49906}, 49911, 49914, {f: 3, c: 49917},
+    {f: 7, c: 49921}, {f: 2, c: 49930}, {f: 5, c: 49934}, {f: 2, c: 49942},
+    {f: 3, c: 49945}, {f: 7, c: 49949}, {f: 2, c: 49958}, {f: 27, c: 49962},
+    {f: 34, c: 49990}, {f: 2, c: 50026}, {f: 3, c: 50029}, 50033,
+    {f: 5, c: 50035}, {f: 2, c: 50042}, {f: 6, c: 50046}, {f: 3, c: 50053},
+    {f: 3, c: 50057}, {f: 51, c: 50061}, {f: 23, c: 50113}, {f: 2, c: 50138},
+    {f: 2, c: 50141}, 50145, {f: 5, c: 50147}, {f: 3, c: 50154},
+    {f: 6, c: 50158}, {f: 2, c: 50166}, {f: 15, c: 50169}, {f: 7, c: 50185},
+    {f: 19, c: 50193}, {f: 7, c: 50213}, {f: 3, c: 50221}, {f: 3, c: 50225},
+    {f: 7, c: 50229}, {f: 10, c: 50238}, {f: 27, c: 50249}, {f: 2, c: 50278},
+    {f: 3, c: 50281}, {f: 7, c: 50285}, {f: 3, c: 50294}, {f: 6, c: 50298},
+    {f: 19, c: 50305}, {f: 7, c: 50325}, {f: 27, c: 50333}, {f: 3, c: 50361},
+    {f: 44, c: 50365}, {f: 6, c: 50410}, {f: 2, c: 50418}, {f: 3, c: 50421},
+    50425, {f: 4, c: 50427}, {f: 10, c: 50434}, {f: 3, c: 50445},
+    {f: 3, c: 50449}, {f: 7, c: 50453}, {f: 11, c: 50461}, {f: 2, c: 50474},
+    {f: 3, c: 50477}, {f: 7, c: 50481}, 50490, 50492, {f: 6, c: 50494},
+    {f: 2, c: 50502}, 50507, {f: 4, c: 50511}, 50518, {f: 3, c: 50522}, 50527,
+    {f: 2, c: 50530}, {f: 3, c: 50533}, {f: 7, c: 50537}, 50546,
+    {f: 6, c: 50550}, {f: 2, c: 50558}, {f: 3, c: 50561}, {f: 2, c: 50565},
+    {f: 4, c: 50568}, 50574, 50576, {f: 3, c: 50578}, 50582, {f: 3, c: 50585},
+    {f: 3, c: 50589}, {f: 8, c: 50593}, {f: 10, c: 50602}, {f: 2, c: 50614},
+    50618, {f: 5, c: 50623}, 50635, 50637, 50639, {f: 2, c: 50642},
+    {f: 3, c: 50645}, {f: 7, c: 50649}, 50658, 50660, {f: 6, c: 50662}, 50671,
+    {f: 3, c: 50673}, 50677, {f: 4, c: 50680}, {f: 3, c: 50690},
+    {f: 3, c: 50697}, {f: 3, c: 50701}, {f: 7, c: 50705}, 50714,
+    {f: 7, c: 50717}, {f: 2, c: 50726}, {f: 3, c: 50729}, 50735,
+    {f: 2, c: 50737}, 50742, 50744, 50746, {f: 4, c: 50748}, {f: 2, c: 50754},
+    {f: 3, c: 50757}, {f: 7, c: 50761}, 50770, {f: 6, c: 50774},
+    {f: 2, c: 50782}, {f: 11, c: 50785}, {f: 2, c: 50797}, 50800,
+    {f: 6, c: 50802}, {f: 2, c: 50810}, {f: 3, c: 50813}, {f: 7, c: 50817},
+    50826, 50828, {f: 6, c: 50830}, {f: 2, c: 50838}, {f: 3, c: 50841},
+    {f: 7, c: 50845}, 50854, 50856, {f: 6, c: 50858}, {f: 2, c: 50866},
+    {f: 3, c: 50869}, {f: 5, c: 50875}, 50882, 50884, {f: 6, c: 50886},
+    {f: 2, c: 50894}, {f: 3, c: 50897}, {f: 7, c: 50901}, {f: 2, c: 50910},
+    {f: 6, c: 50914}, {f: 2, c: 50922}, {f: 3, c: 50925}, {f: 7, c: 50929},
+    {f: 3, c: 50938}, {f: 6, c: 50942}, {f: 2, c: 50950}, {f: 3, c: 50953},
+    {f: 7, c: 50957}, 50966, 50968, {f: 6, c: 50970}, {f: 2, c: 50978},
+    {f: 3, c: 50981}, {f: 7, c: 50985}, 50994, 50996, 50998, {f: 4, c: 51000},
+    {f: 2, c: 51006}, {f: 3, c: 51009}, {f: 5, c: 51013}, 51019, 51022, 51024,
+    {f: 3, c: 51033}, {f: 3, c: 51037}, {f: 7, c: 51041}, {f: 2, c: 51049},
+    {f: 8, c: 51052}, {f: 2, c: 51062}, {f: 3, c: 51065}, {f: 4, c: 51071},
+    51078, {f: 3, c: 51083}, 51087, {f: 2, c: 51090}, 51093, 51097,
+    {f: 5, c: 51099}, 51106, {f: 5, c: 51111}, {f: 2, c: 51118},
+    {f: 3, c: 51121}, {f: 7, c: 51125}, 51134, {f: 6, c: 51138},
+    {f: 2, c: 51146}, 51149, 51151, {f: 7, c: 51153}, {f: 4, c: 51161},
+    {f: 6, c: 51166}, {f: 3, c: 51173}, {f: 3, c: 51177}, {f: 19, c: 51181},
+    {f: 2, c: 51202}, {f: 3, c: 51205}, 51209, {f: 5, c: 51211}, 51218, 51220,
+    {f: 5, c: 51223}, {f: 2, c: 51230}, {f: 3, c: 51233}, {f: 7, c: 51237},
+    51246, 51248, {f: 6, c: 51250}, {f: 3, c: 51257}, {f: 3, c: 51261},
+    {f: 7, c: 51265}, {f: 2, c: 51274}, {f: 6, c: 51278}, {f: 27, c: 51285},
+    {f: 2, c: 51314}, {f: 3, c: 51317}, 51321, {f: 5, c: 51323}, 51330, 51332,
+    {f: 3, c: 51336}, {f: 6, c: 51342}, {f: 8, c: 51349}, 51358, 51360,
+    {f: 6, c: 51362}, {f: 19, c: 51369}, {f: 6, c: 51390}, {f: 3, c: 51397},
+    {f: 3, c: 51401}, {f: 7, c: 51405}, 51414, 51416, {f: 6, c: 51418},
+    {f: 2, c: 51426}, {f: 16, c: 51429}, {f: 6, c: 51446}, {f: 2, c: 51454},
+    {f: 3, c: 51457}, {f: 5, c: 51463}, 51470, 51472, {f: 6, c: 51474},
+    {f: 19, c: 51481}, {f: 7, c: 51501}, {f: 27, c: 51509}, {f: 2, c: 51538},
+    {f: 3, c: 51541}, {f: 7, c: 51545}, 51554, {f: 8, c: 51556},
+    {f: 3, c: 51565}, {f: 3, c: 51569}, {f: 7, c: 51573}, {f: 11, c: 51581},
+    {f: 2, c: 51594}, {f: 3, c: 51597}, {f: 7, c: 51601}, 51610, 51612,
+    {f: 34, c: 51614}, {f: 2, c: 51650}, {f: 2, c: 51653}, 51657,
+    {f: 5, c: 51659}, 51666, 51668, {f: 2, c: 51671}, 51675, {f: 2, c: 51678},
+    51681, 51683, {f: 2, c: 51685}, {f: 4, c: 51688}, 51694, {f: 6, c: 51698},
+    {f: 2, c: 51706}, {f: 3, c: 51709}, {f: 7, c: 51713}, 51722,
+    {f: 6, c: 51726}, {f: 3, c: 51733}, {f: 16, c: 51737}, {f: 34, c: 51754},
+    {f: 2, c: 51790}, {f: 3, c: 51793}, {f: 7, c: 51797}, 51806,
+    {f: 6, c: 51810}, {f: 20, c: 51817}, {f: 6, c: 51838}, {f: 19, c: 51845},
+    {f: 35, c: 51865}, {f: 2, c: 51902}, {f: 3, c: 51905}, {f: 7, c: 51909},
+    51918, 51920, 51922, {f: 4, c: 51924}, {f: 6, c: 51930}, {f: 11, c: 51937},
+    {f: 7, c: 51949}, {f: 19, c: 51957}, {f: 7, c: 51977}, {f: 3, c: 51985},
+    {f: 3, c: 51989}, {f: 7, c: 51993}, {f: 31, c: 52002}, {f: 6, c: 52034},
+    {f: 2, c: 52042}, {f: 3, c: 52045}, {f: 7, c: 52049}, {f: 3, c: 52058},
+    {f: 6, c: 52062}, {f: 19, c: 52069}, {f: 34, c: 52090}, {f: 27, c: 52125},
+    {f: 27, c: 52153}, {f: 15, c: 52181}, {f: 2, c: 52197}, 52200,
+    {f: 34, c: 52202}, {f: 2, c: 52238}, {f: 3, c: 52241}, {f: 7, c: 52245},
+    {f: 3, c: 52254}, {f: 4, c: 52259}, {f: 2, c: 52266}, 52269, 52271,
+    {f: 7, c: 52273}, 52282, {f: 5, c: 52287}, {f: 2, c: 52294},
+    {f: 3, c: 52297}, {f: 7, c: 52301}, 52310, {f: 6, c: 52314},
+    {f: 3, c: 52321}, 52325, 52327, {f: 7, c: 52329}, {f: 4, c: 52337},
+    {f: 34, c: 52342}, {f: 2, c: 52378}, {f: 3, c: 52381}, {f: 7, c: 52385},
+    52394, {f: 6, c: 52398}, {f: 2, c: 52406}, {f: 3, c: 52409},
+    {f: 7, c: 52413}, 52422, 52424, {f: 6, c: 52426}, {f: 3, c: 52433},
+    {f: 15, c: 52437}, {f: 7, c: 52453}, {f: 3, c: 52461}, {f: 16, c: 52465},
+    {f: 6, c: 52482}, {f: 2, c: 52490}, {f: 3, c: 52493}, {f: 7, c: 52497},
+    52506, 52508, {f: 6, c: 52510}, {f: 3, c: 52517}, {f: 3, c: 52521},
+    {f: 12, c: 52525}, {f: 34, c: 52538}, {f: 3, c: 52573}, {f: 3, c: 52577},
+    {f: 7, c: 52581}, 52590, 52592, {f: 6, c: 52594}, {f: 15, c: 52601},
+    {f: 11, c: 52617}, {f: 2, c: 52630}, {f: 3, c: 52633}, {f: 7, c: 52637},
+    52646, 52648, {f: 6, c: 52650}, {f: 19, c: 52657}, {f: 7, c: 52677},
+    {f: 3, c: 52685}, {f: 23, c: 52689}, {f: 3, c: 52713}, {f: 3, c: 52717},
+    {f: 7, c: 52721}, 52730, 52732, {f: 6, c: 52734}, {f: 3, c: 52741},
+    {f: 3, c: 52745}, {f: 7, c: 52749}, {f: 4, c: 52757}, {f: 6, c: 52762},
+    {f: 2, c: 52770}, {f: 3, c: 52773}, {f: 7, c: 52777}, 52786, 52788,
+    {f: 34, c: 52790}, {f: 2, c: 52826}, {f: 2, c: 52829}, {f: 6, c: 52834},
+    52842, 52844, {f: 6, c: 52846}, {f: 2, c: 52854}, {f: 3, c: 52857},
+    {f: 7, c: 52861}, 52870, 52872, {f: 6, c: 52874}, {f: 2, c: 52882},
+    {f: 3, c: 52885}, {f: 7, c: 52889}, 52898, {f: 6, c: 52902},
+    {f: 19, c: 52910}, {f: 34, c: 52930}, {f: 2, c: 52966}, {f: 2, c: 52969},
+    {f: 7, c: 52973}, 52982, {f: 6, c: 52986}, {f: 2, c: 52994},
+    {f: 3, c: 52997}, {f: 7, c: 53001}, 53010, 53012, {f: 6, c: 53014},
+    {f: 3, c: 53021}, {f: 3, c: 53025}, {f: 7, c: 53029}, 53038,
+    {f: 6, c: 53042}, {f: 27, c: 53049}, {f: 2, c: 53078}, {f: 3, c: 53081},
+    {f: 7, c: 53085}, 53094, 53096, {f: 6, c: 53098}, {f: 2, c: 53106},
+    {f: 3, c: 53109}, {f: 7, c: 53113}, {f: 4, c: 53121}, {f: 6, c: 53126},
+    {f: 20, c: 53133}, {f: 6, c: 53154}, {f: 7, c: 53161}, {f: 19, c: 53169},
+    {f: 27, c: 53189}, {f: 2, c: 53218}, {f: 3, c: 53221}, {f: 7, c: 53225},
+    53234, 53236, {f: 6, c: 53238}, {f: 3, c: 53245}, {f: 3, c: 53249},
+    {f: 12, c: 53253}, {f: 6, c: 53266}, {f: 20, c: 53273}, {f: 6, c: 53294},
+    {f: 2, c: 53302}, {f: 3, c: 53305}, {f: 7, c: 53309}, 53318, 53320,
+    {f: 6, c: 53322}, {f: 3, c: 53329}, {f: 3, c: 53333}, {f: 7, c: 53337},
+    {f: 11, c: 53345}, {f: 2, c: 53358}, {f: 3, c: 53361}, {f: 7, c: 53365},
+    {f: 3, c: 53374}, {f: 34, c: 53378}, {f: 2, c: 53414}, {f: 3, c: 53417},
+    {f: 7, c: 53421}, 53430, 53432, {f: 6, c: 53434}, {f: 2, c: 53442},
+    {f: 3, c: 53445}, {f: 6, c: 53450}, 53458, {f: 6, c: 53462},
+    {f: 2, c: 53470}, {f: 3, c: 53473}, {f: 7, c: 53477}, 53486,
+    {f: 6, c: 53490}, {f: 20, c: 53497}, {f: 34, c: 53518}, {f: 2, c: 53554},
+    {f: 3, c: 53557}, 53561, {f: 5, c: 53563}, 53570, {f: 6, c: 53574},
+    {f: 2, c: 53582}, {f: 3, c: 53585}, {f: 7, c: 53589}, 53598, 53600,
+    {f: 6, c: 53602}, {f: 3, c: 53609}, {f: 15, c: 53613}, {f: 7, c: 53629},
+    {f: 3, c: 53637}, {f: 23, c: 53641}, {f: 2, c: 53666}, {f: 3, c: 53669},
+    {f: 7, c: 53673}, 53682, 53684, {f: 4, c: 53686}, 53691, {f: 3, c: 53693},
+    {f: 23, c: 53697}, {f: 27, c: 53721}, {f: 3, c: 53749}, {f: 14, c: 53753},
+    53768, {f: 6, c: 53770}, {f: 27, c: 53777}, {f: 2, c: 53806},
+    {f: 3, c: 53809}, {f: 7, c: 53813}, 53822, 53824, {f: 6, c: 53826},
+    {f: 19, c: 53833}, {f: 7, c: 53853}, {f: 27, c: 53861}, {f: 2, c: 53890},
+    {f: 3, c: 53893}, {f: 7, c: 53897}, {f: 3, c: 53906}, {f: 6, c: 53910},
+    {f: 3, c: 53917}, {f: 3, c: 53921}, {f: 7, c: 53925}, {f: 4, c: 53933},
+    {f: 6, c: 53938}, {f: 2, c: 53946}, {f: 2, c: 53949}, 53953,
+    {f: 5, c: 53955}, 53962, {f: 8, c: 53964}, {f: 3, c: 53973},
+    {f: 3, c: 53977}, {f: 7, c: 53981}, {f: 10, c: 53990}, {f: 2, c: 54002},
+    {f: 3, c: 54005}, {f: 7, c: 54009}, 54018, 54020, {f: 6, c: 54022}, 54031,
+    {f: 3, c: 54033}, 54037, {f: 5, c: 54039}, 54046, {f: 3, c: 54050},
+    {f: 2, c: 54054}, {f: 2, c: 54058}, {f: 3, c: 54061}, {f: 7, c: 54065},
+    54074, {f: 6, c: 54078}, {f: 54, c: 54086}, {f: 2, c: 54142},
+    {f: 3, c: 54145}, {f: 7, c: 54149}, 54158, {f: 6, c: 54162},
+    {f: 2, c: 54170}, {f: 3, c: 54173}, {f: 7, c: 54177}, 54186, 54188,
+    {f: 6, c: 54190}, {f: 3, c: 54197}, {f: 3, c: 54201}, {f: 7, c: 54205},
+    {f: 2, c: 54214}, {f: 6, c: 54218}, {f: 7, c: 54225}, {f: 8, c: 54233},
+    54242, {f: 8, c: 54244}, {f: 2, c: 54254}, {f: 3, c: 54257},
+    {f: 7, c: 54261}, 54270, 54272, {f: 6, c: 54274}, {f: 20, c: 54281},
+    {f: 34, c: 54302}, {f: 3, c: 54337}, {f: 23, c: 54341}, {f: 3, c: 54365},
+    {f: 3, c: 54369}, {f: 8, c: 54373}, 54382, {f: 8, c: 54384},
+    {f: 2, c: 54394}, {f: 2, c: 54397}, 54401, {f: 5, c: 54403}, 54410, 54412,
+    {f: 6, c: 54414}, {f: 20, c: 54421}, {f: 34, c: 54442}, {f: 3, c: 54477},
+    {f: 3, c: 54481}, {f: 7, c: 54485}, {f: 2, c: 54493}, {f: 8, c: 54496},
+    {f: 3, c: 54505}, {f: 3, c: 54509}, {f: 7, c: 54513}, {f: 2, c: 54521},
+    54524, {f: 6, c: 54526}, {f: 3, c: 54533}, {f: 3, c: 54537},
+    {f: 7, c: 54541}, 54550, {f: 36, c: 54552}, {f: 2, c: 54590},
+    {f: 3, c: 54593}, {f: 7, c: 54597}, 54606, 54608, {f: 6, c: 54610},
+    {f: 2, c: 54618}, {f: 3, c: 54621}, {f: 4, c: 54625}, {f: 2, c: 54630},
+    54634, 54636, {f: 6, c: 54638}, {f: 2, c: 54646}, {f: 3, c: 54649},
+    {f: 7, c: 54653}, 54662, {f: 6, c: 54666}, {f: 20, c: 54673},
+    {f: 34, c: 54694}, {f: 2, c: 54730}, {f: 3, c: 54733}, 54737,
+    {f: 5, c: 54739}, 54746, 54748, {f: 6, c: 54750}, {f: 2, c: 54758},
+    {f: 3, c: 54761}, {f: 7, c: 54765}, 54774, 54776, {f: 6, c: 54778},
+    {f: 2, c: 54786}, {f: 3, c: 54789}, {f: 7, c: 54793}, 54802,
+    {f: 6, c: 54806}, {f: 3, c: 54813}, {f: 3, c: 54817}, {f: 8, c: 54821},
+    {f: 10, c: 54830}, {f: 2, c: 54842}, {f: 3, c: 54845}, {f: 4, c: 54849},
+    {f: 2, c: 54854}, 54858, 54860, {f: 3, c: 54862}, {f: 2, c: 54866},
+    {f: 2, c: 54870}, {f: 3, c: 54873}, {f: 10, c: 54877}, 54888,
+    {f: 6, c: 54890}, {f: 2, c: 54898}, {f: 14, c: 54901}, 54916,
+    {f: 6, c: 54918}, {f: 2, c: 54926}, {f: 3, c: 54929}, {f: 8, c: 54933},
+    54942, 54944, {f: 6, c: 54946}, {f: 3, c: 54953}, {f: 3, c: 54957},
+    {f: 8, c: 54961}, 54970, {f: 8, c: 54972}, {f: 2, c: 54982},
+    {f: 3, c: 54985}, {f: 4, c: 54989}, {f: 2, c: 54994}, {f: 2, c: 54997},
+    55000, {f: 6, c: 55002}, {f: 3, c: 55009}, {f: 3, c: 55013},
+    {f: 7, c: 55017}, {f: 4, c: 55025}, {f: 6, c: 55030}, {f: 2, c: 55038},
+    {f: 3, c: 55041}, {f: 12, c: 55045}, {f: 6, c: 55058}, {f: 2, c: 55066},
+    {f: 3, c: 55069}, {f: 7, c: 55073}, 55082, 55084, {f: 6, c: 55086},
+    {f: 2, c: 55094}, {f: 3, c: 55097}, {f: 7, c: 55101}, {f: 2, c: 55109},
+    55112, {f: 6, c: 55114}, {f: 2, c: 55122}, 55125, {f: 6, c: 55130}, 55138,
+    55140, {f: 3, c: 55142}, {f: 2, c: 55146}, {f: 3, c: 55149},
+    {f: 3, c: 55153}, {f: 7, c: 55157}, {f: 3, c: 55166}, {f: 6, c: 55170},
+    {f: 2, c: 55178}, {f: 3, c: 55181}, {f: 7, c: 55185}, 55194, 55196,
+    {f: 6, c: 55198}],
+  'Adobe-CNS1': [{f: 95, c: 32}, {s: 3}, 12288, 65292, {f: 2, c: 12289}, 65294,
+    8226, 65307, 65306, 65311, 65281, 65072, 8230, 8229, 65104, 65380, 65106,
+    183, {f: 4, c: 65108}, 65372, 8211, 65073, 8212, {s: 4}, {f: 2, c: 65288},
+    {f: 2, c: 65077}, 65371, 65373, {f: 2, c: 65079}, {f: 2, c: 12308},
+    {f: 2, c: 65081}, {f: 2, c: 12304}, {f: 2, c: 65083}, {f: 2, c: 12298},
+    {f: 2, c: 65085}, {f: 2, c: 12296}, {f: 2, c: 65087}, {f: 2, c: 12300},
+    {f: 2, c: 65089}, {f: 2, c: 12302}, {f: 2, c: 65091}, {f: 6, c: 65113},
+    {f: 2, c: 8216}, {f: 2, c: 8220}, {f: 2, c: 12317}, 8245, 8242, 65283,
+    65286, 65290, 8251, 167, 12291, 9675, 9679, 9651, 9650, 9678, 9734, 9733,
+    9671, 9670, 9633, 9632, 9661, 9660, 12963, 8453, 8254, 0, 65343, 0,
+    {f: 2, c: 65097}, {f: 2, c: 65101}, {f: 2, c: 65099}, {f: 3, c: 65119},
+    65291, 65293, 215, 247, 177, 8730, 65308, 65310, 65309, {f: 2, c: 8806},
+    8800, 8734, 8786, 8801, {f: 5, c: 65122}, 8764, {f: 2, c: 8745}, 8869,
+    8736, 8735, 8895, 13266, 13265, 8747, 8750, 8757, 8756, 9792, 9794, 9793,
+    9737, 8593, 8595, 8594, 8592, {f: 2, c: 8598}, 8601, 8600, 8741, 8739, 0,
+    0, 65295, 65340, 65284, 165, 12306, {f: 2, c: 162}, 65285, 65312, 8451,
+    8457, {f: 3, c: 65129}, 13269, {f: 3, c: 13212}, 13262, 13217,
+    {f: 2, c: 13198}, 13252, 176, [20825, 58834], [20827, 58835],
+    [20830, 58837], [20829, 58836], 20833, 20835, 21991, [29929, 58044],
+    [31950, 58191], {f: 8, c: 9601}, 9615, 9614, 9613, 9612, 9611, 9610, 9609,
+    9532, 9524, 9516, 9508, 9500, 9620, 9472, 9474, 9621, 9484, 9488, 9492,
+    9496, {f: 2, c: 9581}, 9584, 9583, 9552, 9566, 9578, 9569, {f: 2, c: 9698},
+    9701, 9700, {f: 3, c: 9585}, {f: 10, c: 65296}, {f: 10, c: 8544},
+    {f: 9, c: 12321}, 0, [21316, 57443], 0, {f: 26, c: 65313},
+    {f: 26, c: 65345}, {f: 17, c: 913}, {f: 7, c: 931}, {f: 17, c: 945},
+    {f: 7, c: 963}, {f: 37, c: 12549}, 729, 714, 711, 715, [9312, 63153],
+    [9313, 63154], [9314, 63155], [9315, 63156], [9316, 63157], [9317, 63158],
+    [9318, 63159], [9319, 63160], [9320, 63161], [9321, 63162], [9332, 63163],
+    [9333, 63164], [9334, 63165], [9335, 63166], [9336, 63167], [9337, 63168],
+    [9338, 63169], [9339, 63170], [9340, 63171], [9341, 63172], [8560, 63173],
+    [8561, 63174], [8562, 63175], [8563, 63176], [8564, 63177], [8565, 63178],
+    [8566, 63179], [8567, 63180], [8568, 63181], [8569, 63182], [12033, 20008],
+    [12034, 20022, 63183], [12035, 20031, 63184], [12037, 20101, 63185],
+    [12039, 20128, 63186], [12044, 20866, 63187], [12045, 20886, 63188],
+    [12046, 20907, 63189], [12051, 21241, 63190], [12054, 21304, 63191],
+    [12057, 21353, 63192], [12059, 21430, 63193],
+    [12065, 12066, 22786, 22794, 63194], [12071, 23424, 63195],
+    [12078, 24027, 63196], [12083, 24186, 63197], [12084, 24191, 63198],
+    [12085, 24308], [12089, 24400, 63200], [12090, 24417, 63201],
+    [12097, 25908, 63202], [12102, 26080], [12135, 30098, 63204],
+    [12136, 30326], [12193, 36789, 63206], [12202, 38582], {f: 32, c: 9216},
+    9249, [12032, 19968], [12036, 20057], 19969, 19971, 20035, 20061, 20102,
+    [12038, 20108], [12040, 20154], [12041, 20799], [12042, 20837],
+    [12043, 20843], [12047, 20960], [12049, 20992], 20993, [12050, 21147],
+    [12052, 21269], [12055, 21313], [12056, 21340], [12060, 21448], 19977,
+    19979, 19976, 19978, 20011, 20024, 20961, 20037, 20040, 20063, 20062,
+    20110, 20129, [20800, 64012], 20995, 21242, 21315, 21449, [12061, 21475],
+    [12063, 22303], [12064, 22763], [12067, 22805], [12068, 22823],
+    [12069, 22899], [12070, 23376], 23377, 23379, [12072, 23544],
+    [12073, 23567], [12074, 23586], [12075, 23608], [12077, 23665], 24029,
+    [12079, 24037], [12080, 24049], {f: 2, c: 24050}, [12081, 24062],
+    [12082, 24178], [12086, 24318], [12087, 24331], [12088, 24339], 25165,
+    19985, 19984, 19981, 20013, 20016, 20025, 20043, 23609, 20104, 20113,
+    20117, 20114, 20116, 20130, 20161, 20160, 20163, {f: 2, c: 20166}, 20173,
+    {f: 2, c: 20170}, 20164, 20803, 20801, 20839, {f: 2, c: 20845}, 20844,
+    20887, 20982, {f: 3, c: 20998}, 21243, {f: 2, c: 21246}, 21270, 21305,
+    21320, 21319, 21317, 21342, 21380, 21451, 21450, 21453, 22764, 22825,
+    22827, 22826, 22829, 23380, 23569, 23588, 23610, 23663, 24052, 24187,
+    24319, {f: 2, c: 24340}, [12092, 24515], [12093, 25096], [12094, 25142],
+    [12095, 25163], 25166, [12096, 25903], [12098, 25991], [12099, 26007],
+    [12100, 26020], [12101, 26041], [12103, 26085], [12104, 26352],
+    [12105, 26376], [12106, 26408], [12107, 27424], [12108, 27490],
+    [12109, 27513], [12111, 27595], [12112, 27604], [12113, 27611],
+    [12114, 27663], [12116, 27700], [12117, 28779], [12118, 29226],
+    [12119, 29238], [12120, 29243], [12122, 29255], [12123, 29273],
+    [12124, 29275], [12125, 29356], 29579, 19993, 19990, 19989, 19988, 19992,
+    20027, 20045, 20047, 20046, 20197, 20184, {f: 4, c: 20180},
+    {f: 2, c: 20195}, 20185, 20190, 20805, 20804, {f: 2, c: 20873}, 20908,
+    {f: 2, c: 20985}, 20984, 21002, 21152, 21151, [21253, 57435], 21254, 21271,
+    21277, 20191, 21322, 21321, 21345, 21344, 21359, 21358, 21435, 21487,
+    21476, 21491, 21484, 21486, 21481, 21480, 21500, 21496, 21493, 21483,
+    21478, 21482, 21490, 21489, 21488, 21477, 21485, 21499, 22235, 22234,
+    22806, 22830, 22833, 22900, 22902, 23381, 23427, 23612, 24040, 24039,
+    24038, {f: 2, c: 24066}, 24179, 24188, 24321, 24344, 24343, 24517, 25098,
+    {f: 2, c: 25171}, 25170, 25169, 26021, 26086, 26414, 26412,
+    {f: 2, c: 26410}, 26413, 27491, 27597, 27665, 27664, 27704, 27713, 27712,
+    27710, 29359, [12126, 29572], [12127, 29577], [12128, 29916],
+    [12129, 29926], [12130, 29976], [12131, 29983], [12132, 29992], 29993,
+    [12133, 30000], {f: 3, c: 30001}, [12134, 30091], [12137, 30333],
+    [12138, 30382], [12139, 30399], [12140, 30446], [12141, 30683],
+    [12142, 30690], [12143, 30707], [12144, 31034], [12146, 31166],
+    [12147, 31348], [12148, 31435], {f: 2, c: 19998}, {f: 2, c: 20050}, 20073,
+    20121, 20132, 20134, 20133, 20223, 20233, 20249, 20234, 20245, 20237,
+    {f: 2, c: 20240}, 20239, 20210, 20214, 20219, 20208, 20211, 20221, 20225,
+    20235, 20809, 20807, 20806, 20808, 20840, 20849, 20877, 20912, 21015,
+    {f: 2, c: 21009}, 21006, 21014, 21155, 21256, 21281, 21280,
+    {f: 2, c: 21360}, 21513, 21519, 21516, 21514, 21520, 21505, 21515, 21508,
+    21521, 21517, 21512, 21507, 21518, 21510, 21522, 22240, 22238, 22237,
+    22323, 22320, 22312, 22317, 22316, 22319, 22313, {f: 2, c: 22809},
+    {f: 2, c: 22839}, 22916, 22904, 22915, 22909, 22905, 22914, 22913,
+    {f: 2, c: 23383}, {f: 2, c: 23431}, 23429, 23433, 23546, 23574, 23673,
+    24030, 24070, 24182, 24180, 24335, 24347, 24537, 24534, 25102,
+    {f: 2, c: 25100}, 25104, 25187, 25179, 25176, 25910, 26089, 26088,
+    {f: 2, c: 26092}, {f: 2, c: 26354}, 26377, 26429, 26420, 26417, 26421,
+    27425, 27492, 27515, 27670, 27741, 27735, 27737, {f: 2, c: 27743}, 27728,
+    27733, 27745, 27739, {f: 2, c: 27725}, 28784, 29279, 29277, 30334,
+    [12149, 31481], [12150, 31859], [12151, 31992], [12152, 32566],
+    [12154, 32650], [12155, 32701], [12156, 32769], 32771, [12157, 32780],
+    [12158, 32786], [12159, 32819], [12160, 32895], [12161, 32905],
+    {f: 2, c: 32907}, [12162, 33251], [12163, 33258], [12164, 33267],
+    [12165, 33276], [12166, 33292], [12167, 33307], [12168, 33311],
+    [12169, 33390], [12170, 33394], 33406, [12173, 34411], [12174, 34880],
+    [12175, 34892], [12176, 34915], 35199, 38433, 20018, 20136, 20301, 20303,
+    20295, 20311, 20318, 20276, 20315, 20309, 20272, {f: 2, c: 20304}, 20285,
+    20282, 20280, 20291, 20308, 20284, 20294, 20323, 20316, 20320, 20271,
+    20302, 20278, 20313, 20317, 20296, 20314, 20812, 20811, 20813, 20853,
+    {f: 2, c: 20918}, 21029, 21028, {f: 2, c: 21033}, 21032, 21163,
+    {f: 2, c: 21161}, 21164, 21283, 21363, 21365, 21533, 21549, 21534, 21566,
+    21542, 21582, 21543, 21574, 21571, 21555, 21576, 21570, 21531, 21545,
+    21578, 21561, 21563, 21560, 21550, {f: 2, c: 21557}, 21536, 21564, 21568,
+    21553, 21547, 21535, 21548, 22250, 22256, 22244, 22251, 22346, 22353,
+    22336, 22349, 22343, 22350, 22334, 22352, 22351, 22331, 22767, 22846,
+    22941, 22930, 22952, 22942, 22947, 22937, 22934, 22925, 22948, 22931,
+    22922, 22949, 23389, 23388, {f: 2, c: 23386}, 23436, 23435, 23439, 23596,
+    {f: 2, c: 23616}, 23615, 23614, {f: 2, c: 23696}, 23700, 23692, 24043,
+    24076, 24207, 24199, 24202, 24311, 24324, 24351, 24420, 24418, 24439,
+    24441, 24536, 24524, 24535, 24525, 24561, 24555, 24568, 24554, 25106,
+    25105, 25220, 25239, 25238, 25216, 25206, 25225, 25197, 25226, 25212,
+    25214, 25209, 25203, 25234, 25199, 25240, 25198, 25237, 25235, 25233,
+    25222, 25913, 25915, 25912, 26097, 26356, 26463, {f: 4, c: 26446}, 26460,
+    26454, [26462, 57801], 26441, 26438, 26464, 26451, 26455, 27493, 27599,
+    27714, 27742, 27801, 27777, {f: 2, c: 27784}, 27781, 27803, 27754, 27770,
+    27792, 27760, 27788, 27752, 27798, 27794, 27773, 27779, 27762, 27774,
+    27764, 27782, 27766, 27789, 27796, 27800, 27778, 28790, {f: 2, c: 28796},
+    28792, 29282, 29281, 29280, 29380, 29378, 29590, 29996, 29995,
+    {f: 2, c: 30007}, 30338, 30447, 30691, 31169, 31168, 31167, 31350, 31995,
+    32597, 32918, 32915, 32925, 32920, 32923, 32922, 32946, 33391, 33426,
+    33419, 33421, [12178, 35211], [12179, 35282], [12180, 35328],
+    [12181, 35895], [12182, 35910], [12183, 35925], [12185, 35997],
+    [12186, 36196], [12187, 36208], [12188, 36275], [12189, 36523],
+    [12190, 36554], [12191, 36763], [12192, 36784], 36802, 36806, 36805, 36804,
+    24033, [12194, 37009], 37026, 37034, 37030, 37027, [12195, 37193],
+    [12196, 37318], [12197, 37324], 38450, 38446, 38449, 38442, 38444, 20006,
+    20054, 20083, 20107, 20123, 20126, {f: 2, c: 20139}, 20335, 20381, 20365,
+    20339, 20351, 20332, 20379, 20363, 20358, 20355, 20336, 20341, 20360,
+    20329, 20347, 20374, 20350, 20367, 20369, 20346, 20820, 20818, 20821,
+    20841, 20855, 20854, 20856, 20925, 20989, 21051, 21048, 21047, 21050,
+    21040, 21038, 21046, 21057, 21182, 21179, 21330, 21332, 21331, 21329,
+    21350, {f: 3, c: 21367}, 21462, 21460, 21463, 21619, 21621, 21654, 21624,
+    21653, 21632, 21627, 21623, 21636, 21650, 21638, 21628, 21648, 21617,
+    21622, 21644, 21658, 21602, 21608, 21643, 21629, 21646, 22266, 22403,
+    22391, 22378, 22377, 22369, 22374, 22372, 22396, 22812, 22857,
+    {f: 2, c: 22855}, 22852, 22868, 22974, 22971, 22996, 22969, 22958, 22993,
+    22982, 22992, 22989, 22987, 22995, 22986, 22959, 22963, 22994, 22981,
+    23391, 23396, 23395, 23447, 23450, 23448, 23452, 23449, 23451, 23578,
+    23624, {f: 2, c: 23621}, 23735, 23713, 23736, 23721, 23723, 23729, 23731,
+    24088, 24090, 24086, 24085, 24091, 24081, 24184, 24218, 24215, 24220,
+    {f: 2, c: 24213}, 24310, {f: 2, c: 24358}, 24361, {f: 2, c: 24448}, 24447,
+    24444, 24541, 24544, 24573, 24565, 24575, 24591, 24596, 24623, 24629,
+    24598, 24618, 24597, 24609, 24615, 24617, 24619, 24603, 25110, 25109,
+    25151, 25150, 25152, 25215, 25289, 25292, 25284, 25279, 25282, 25273,
+    25298, 25307, 25259, {f: 2, c: 25299}, 25291, 25288, 25256, 25277, 25276,
+    [25296, 60582], 25305, 25287, 25293, 25269, 25306, 25265, 25304,
+    {f: 2, c: 25302}, 25286, 25260, [25294, 61010], 25918, 26023, 26044, 26106,
+    26132, 26131, 26124, 26118, 26114, 26126, 26112, 26127, 26133, 26122,
+    26119, 26381, 26379, 26477, 26507, 26517, 26481, 26524, 26483, 26487,
+    26503, 26525, 26519, {f: 2, c: 26479}, 26495, 26505, 26494, 26512, 26485,
+    26522, 26515, 26492, 26474, 26482, 27427, {f: 2, c: 27494}, 27519, 27667,
+    27675, 27875, 27880, 27891, 27825, 27852, 27877, 27827, {f: 2, c: 27837},
+    27836, 27874, 27819, 27861, 27859, 27832, 27844, 27833, 27841, 27822,
+    27863, 27845, 27889, 27839, 27835, 27873, 27867, 27850, 27820, 27887,
+    27868, 27862, 27872, 28821, 28814, 28818, 28810, 28825, {f: 2, c: 29228},
+    29240, 29256, 29287, 29289, 29376, 29390, 29401, 29399, 29392, 29609,
+    29608, 29599, 29611, 29605, 30013, 30109, {f: 2, c: 30105}, 30340, 30402,
+    30450, 30452, 30693, 30717, 31038, {f: 2, c: 31040}, 31177, 31176, 31354,
+    31353, 31482, 31998, 32596, 32652, 32651, [32773, 58236], 32954, 32933,
+    32930, 32945, 32929, 32939, 32937, 32948, 32938, 32943, 33253, 33278,
+    33293, 33459, 33437, 33433, 33453, 33469, 33439, 33465, 33457, 33452,
+    33445, 33455, 33464, 33443, 33456, 33470, 33463, 34382, 34417, 21021,
+    34920, 36555, 36814, 36820, 36817, 37045, 37048, 37041, 37046, 37319,
+    [12198, 37329], [12199, 38263], [12200, 38272], [12201, 38428], 38464,
+    38463, 38459, 38468, 38466, [12203, 38585], [12204, 38632], 38738,
+    [12206, 38750], 20127, {f: 2, c: 20141}, 20449, 20405, 20399, 20415, 20448,
+    20433, 20431, 20445, 20419, 20406, 20440, 20447, 20426, 20439, 20398,
+    20432, 20420, 20418, 20442, 20430, 20446, 20407, 20823, 20882, 20881,
+    20896, 21070, 21059, 21066, 21069, 21068, 21067, 21063, 21191, 21193,
+    21187, 21185, 21261, 21335, 21371, 21402, 21467, 21676, 21696, 21672,
+    21710, 21705, 21688, 21670, 21683, 21703, 21698, 21693, 21674, 21697,
+    21700, 21704, 21679, 21675, 21681, 21691, 21673, 21671, 21695, 22271,
+    22402, 22411, 22432, 22435, 22434, 22478, 22446, 22419, 22869, 22865,
+    22863, 22862, 22864, 23004, 23000, 23039, 23011, 23016, 23043, 23013,
+    23018, 23002, 23014, 23041, 23035, 23401, 23459, 23462, 23460, 23458,
+    23461, 23553, {f: 2, c: 23630}, 23629, 23627, 23769, 23762, 24055, 24093,
+    24101, 24095, 24189, 24224, 24230, 24314, 24328, 24365, 24421, 24456,
+    24453, {f: 2, c: 24458}, 24455, 24460, 24457, 24594, 24605, 24608, 24613,
+    24590, 24616, 24653, 24688, 24680, [24674, 60712], 24646, 24643, 24684,
+    24683, 24682, 24676, 25153, 25308, 25366, 25353, 25340, 25325, 25345,
+    25326, 25341, 25351, 25329, 25335, 25327, 25324, 25342, 25332, 25361,
+    25346, 25919, 25925, 26027, 26045, 26082, 26149, 26157, 26144, 26151,
+    26159, 26143, 26152, 26161, 26148, 26359, 26623, 26579, 26609, 26580,
+    26576, 26604, 26550, 26543, 26613, 26601, 26607, 26564, 26577, 26548,
+    26586, 26597, 26552, 26575, 26590, 26611, 26544, 26585, 26594, 26589,
+    26578, 27498, 27523, 27526, 27573, 27602, 27607, 27679, 27849, 27915,
+    27954, 27946, 27969, 27941, 27916, 27953, 27934, 27927, 27963,
+    {f: 2, c: 27965}, 27958, 27931, 27893, 27961, 27943, 27960, 27945, 27950,
+    27957, 27918, 27947, 28843, 28858, 28851, 28844, 28847, 28845, 28856,
+    28846, 28836, 29232, 29298, 29295, 29300, 29417, {f: 2, c: 29408}, 29623,
+    29642, 29627, 29618, 29645, 29632, 29619, 29978, 29997, 30031, 30028,
+    30030, 30027, 30123, {f: 2, c: 30116}, {f: 2, c: 30114}, 30328,
+    {f: 3, c: 30342}, 30408, 30406, 30403, 30405, 30465, 30457, 30456, 30473,
+    30475, 30462, 30460, 30471, 30684, 30722, 30740, {f: 2, c: 30732}, 31046,
+    31049, 31048, 31047, {f: 2, c: 31161}, {f: 2, c: 31185}, 31179, 31359,
+    31361, 31487, 31485, 31869, 32002, 32005, 32000, 32009, 32007, 32004,
+    32006, 32568, 32654, 32703, 32784, 32781, 32785, 32822, 32982, 32997,
+    32986, {f: 2, c: 32963}, 32972, 32993, 32987, 32974, 32990, 32996, 32989,
+    33268, 33314, 33511, 33539, 33541, 33507, 33499, 33510, 33540, 33509,
+    33538, 33545, 33490, 33495, 33521, 33537, 33500, 33492, 33489, 33502,
+    33491, 33503, 33519, 33542, 34384, 34425, 34427, 34426, 34893, 34923,
+    35201, 35284, 35336, {f: 2, c: 35330}, 35998, 36000, 36212, 36211, 36276,
+    36557, 36556, 36848, 36838, 36834, 36842, 36837, 36845, 36843, 36836,
+    36840, 37066, 37070, 37057, 37059, 37195, 37194, 37325, 38274, 38480,
+    {f: 3, c: 38475}, [12207, 38754], [12208, 38761], [12209, 38859],
+    [12210, 38893], [12211, 38899], [12212, 38913], [12213, 39080],
+    [12214, 39131], [12215, 39135], [12216, 39318], [12217, 39321], 20056,
+    20147, {f: 2, c: 20492}, 20515, 20463, 20518, 20517, 20472, [20521, 57375],
+    20502, 20486, 20540, 20511, 20506, 20498, 20497, 20474, 20480, 20500,
+    20520, 20465, 20513, 20491, 20505, 20504, 20467, 20462, 20525, 20522,
+    20478, 20523, 20489, 20860, {f: 2, c: 20900}, 20898, 20941, 20940, 20934,
+    20939, 21078, 21084, 21076, 21083, 21085, 21290, [21375, 57459], 21407,
+    21405, 21471, 21736, 21776, 21761, 21815, 21756, 21733, 21746, 21766,
+    21754, 21780, 21737, 21741, 21729, 21769, 21742, 21738, 21734, 21799,
+    21767, 21757, 21775, {f: 2, c: 22275}, 22466, 22484, 22475, 22467, 22537,
+    22799, {f: 2, c: 22871}, 22874, 23057, 23064, 23068, 23071, 23067, 23059,
+    23020, 23072, 23075, 23081, 23077, 23052, 23049, 23403, 23640, 23472,
+    23475, 23478, 23476, 23470, 23477, 23481, 23480, 23556, 23633, 23637,
+    23632, 23789, 23805, 23803, 23786, 23784, 23792, 23798, 23809, 23796,
+    24046, 24109, 24107, 24235, 24237, 24231, 24369, 24466, 24465, 24464,
+    24665, 24675, 24677, 24656, 24661, 24685, 24681, 24687, 24708, 24735,
+    24730, 24717, 24724, 24716, 24709, 24726, 25159, 25331, 25352, 25343,
+    25422, 25406, 25391, 25429, 25410, 25414, 25423, 25417, 25402, 25424,
+    25405, {f: 2, c: 25386}, 25384, 25421, 25420, {f: 2, c: 25928}, 26009,
+    26049, 26053, 26178, 26185, 26191, 26179, 26194, 26188, 26181, 26177,
+    26360, {f: 2, c: 26388}, 26391, 26657, 26680, 26696, 26694, 26707, 26681,
+    26690, 26708, 26665, 26803, 26647, 26700, 26705, 26685, 26612, 26704,
+    26688, 26684, 26691, 26666, 26693, 26643, 26648, 26689, 27530, 27529,
+    27575, 27683, {f: 2, c: 27687}, 27686, 27684, 27888, 28010, 28053, 28040,
+    28039, 28006, 28024, 28023, 27993, 28051, 28012, 28041, 28014, 27994,
+    28020, 28009, 28044, 28042, 28025, 28037, 28005, 28052, 28874, 28888,
+    28900, 28889, 28872, 28879, 29241, 29305, 29436, 29433, 29437, 29432,
+    29431, 29574, 29677, 29705, 29678, 29664, 29674, 29662, 30036, 30045,
+    30044, 30042, 30041, 30142, 30149, 30151, {f: 2, c: 30130}, 30141, 30140,
+    30137, 30146, 30136, 30347, 30384, 30410, {f: 2, c: 30413}, 30505,
+    {f: 2, c: 30495}, 30504, 30697, 30768, 30759, 30776, 30749, 30772, 30775,
+    30757, 30765, 30752, 30751, 30770, 31061, 31056, 31072, 31071, 31062,
+    31070, 31069, 31063, 31066, 31204, [31203, 60418], 31207, 31199, 31206,
+    31209, 31192, 31364, 31368, 31449, 31494, 31505, 31881, 32033, 32023,
+    32011, 32010, 32032, 32034, 32020, 32016, 32021, 32026, 32028, 32013,
+    32025, 32027, 32570, 32607, 32660, 32709, 32705, 32774, 32772, 32792,
+    32789, 32793, 32791, 32829, 32831, 33009, 33026, 33008, 33029, 33005,
+    33012, 33030, 33016, 33011, 33032, 33021, 33034, 33020, 33007, 33261,
+    33260, 33280, 33296, {f: 2, c: 33322}, 33320, 33324, 33467, 33579, 33618,
+    33620, 33610, 33592, 33616, 33609, 33589, 33588, 33615, 33586, 33593,
+    33590, 33559, 33600, 33585, 33576, 33603, 34388, 34442, 34474, 34451,
+    34468, 34473, 34444, 34467, 34460, 34928, 34935, {f: 2, c: 34945}, 34941,
+    34937, 35352, 35344, 35342, 35340, 35349, 35338, 35351, 35347, 35350,
+    35343, 35345, 35912, 35962, 35961, {f: 2, c: 36001}, [36215, 58442], 36524,
+    36562, 36564, 36559, 36785, 36865, 36870, 36855, 36864, 36858, 36852,
+    36867, 36861, 36869, 36856, 37013, 37089, 37085, 37090, 37202, 37197,
+    37196, 37336, 37341, 37335, 37340, 37337, 38275, {f: 2, c: 38498}, 38497,
+    38491, 38493, 38500, 38488, 38494, 38587, 39138, [12218, 39340],
+    [12219, 39592], [12220, 39640], [12222, 39717], [12224, 39730],
+    [12225, 39740], 20094, 20602, [20605, 57382], 20572, 20551, 20547, 20556,
+    20570, 20553, 20581, 20598, 20558, 20565, 20597, 20596, 20599, 20559,
+    20495, 20591, 20589, 20828, 20885, 20976, 21098, 21103, 21202, 21209,
+    21208, 21205, 21264, 21263, 21273, {f: 2, c: 21311}, 21310, 21443, 26364,
+    21830, 21866, 21862, 21828, 21854, 21857, 21827, 21834, 21809, 21846,
+    21839, 21845, 21807, 21860, 21816, 21806, 21852, 21804, 21859, 21811,
+    21825, 21847, 22280, 22283, 22281, 22495, 22533, 22538, 22534, 22496,
+    22500, 22522, 22530, 22581, 22519, 22521, 22816, 22882, 23094, 23105,
+    23113, 23142, 23146, 23104, 23100, 23138, 23130, 23110, 23114, 23408,
+    23495, 23493, 23492, 23490, 23487, 23494, 23561, 23560, 23559, 23648,
+    {f: 2, c: 23644}, 23815, 23814, 23822, 23835, 23830, 23842, 23825, 23849,
+    23828, 23833, 23844, 23847, 23831, 24034, 24120, 24118, 24115, 24119,
+    {f: 2, c: 24247}, 24246, 24245, 24254, 24373, 24375, 24407, 24428, 24425,
+    24427, 24471, 24473, 24478, 24472, 24481, 24480, 24476, 24703, 24739,
+    24713, 24736, 24744, 24779, 24756, 24806, 24765, 24773, 24763, 24757,
+    24796, 24764, 24792, 24789, 24774, 24799, 24760, 24794, 24775,
+    {f: 2, c: 25114}, 25160, 25504, 25511, 25458, 25494, 25506, 25509, 25463,
+    25447, 25496, 25514, 25457, 25513, 25481, 25475, 25499, 25451, 25512,
+    25476, 25480, 25497, 25505, 25516, 25490, 25487, 25472, 25467, 25449,
+    25448, 25466, 25949, 25942, 25937, 25945, 25943, 21855, 25935, 25944,
+    25941, 25940, 26012, 26011, 26028, 26063, {f: 2, c: 26059}, 26062, 26205,
+    26202, 26212, 26216, 26214, 26206, 26361, 21207, 26395, 26753, 26799,
+    26786, 26771, 26805, 26751, 26742, 26801, 26791, 26775, 26800, 26755,
+    26820, 26797, 26758, 26757, 26772, 26781, 26792, 26783, 26785, 26754,
+    27442, 27578, {f: 2, c: 27627}, 27691, 28046, 28092, 28147, 28121, 28082,
+    28129, 28108, 28132, 28155, 28154, 28165, 28103, 28107, 28079, 28113,
+    28078, 28126, 28153, 28088, 28151, 28149, 28101, 28114, 28186, 28085,
+    28122, 28139, 28120, 28138, 28145, 28142, 28136, 28102, 28100, 28074,
+    28140, 28095, 28134, 28921, {f: 2, c: 28937}, 28925, 28911, 29245, 29309,
+    29313, 29468, 29467, 29462, 29459, 29465, 29575, 29701, 29706, 29699,
+    29702, 29694, 29709, 29920, {f: 2, c: 29942}, 29980, 29986,
+    {f: 2, c: 30053}, 30050, 30064, 30095, {f: 2, c: 30164}, 30133, 30154,
+    30157, 30350, 30420, 30418, 30427, 30519, 30526, 30524, 30518, 30520,
+    30522, 30827, 30787, 30798, 31077, 31080, 31085, 31227, 31378, 31381,
+    31520, 31528, 31515, 31532, 31526, 31513, 31518, 31534, 31890, 31895,
+    31893, 32070, 32067, 32113, 32046, 32057, 32060, 32064, 32048, 32051,
+    32068, 32047, 32066, 32050, 32049, 32573, 32670, 32666, 32716, 32718,
+    32722, 32796, 32842, 32838, 33071, 33046, 33059, 33067, 33065, 33072,
+    33060, 33282, 33333, 33335, 33334, 33337, 33678, 33694, 33688, 33656,
+    33698, 33686, 33725, 33707, 33682, 33674, 33683, 33673, 33696, 33655,
+    {f: 2, c: 33659}, 33670, 33703, 34389, 24426, 34503, 34496, 34486, 34500,
+    34485, 34502, 34507, 34481, 34479, 34505, 34899, 34974, 34952, 34987,
+    34962, 34966, 34957, 34955, 35219, 35215, 35370, 35357, 35363, 35365,
+    35377, 35373, 35359, 35355, 35362, 35913, 35930, 36009, 36012, 36011,
+    36008, 36010, 36007, 36199, 36198, 36286, 36282, 36571, 36575, 36889,
+    36877, 36890, 36887, 36899, 36895, 36893, 36880, 36885, 36894, 36896,
+    36879, 36898, 36886, 36891, 36884, 37096, 37101, [37117, 58488], 37207,
+    37326, 37365, 37350, 37347, 37351, 37357, 37353, 38281, 38506, 38517,
+    38515, 38520, 38512, 38516, {f: 2, c: 38518}, 38508, 38592, 38634, 38633,
+    31456, 31455, {f: 2, c: 38914}, [12226, 39770], [12227, 40165],
+    [12228, 40565], [12229, 40575], [12230, 40613], [12231, 40635], 20642,
+    20621, 20613, 20633, 20625, 20608, 20630, 20632, 20634, 26368, 20977,
+    21106, {f: 2, c: 21108}, 21097, 21214, 21213, 21211, 21338, 21413, 21883,
+    21888, 21927, 21884, 21898, 21917, 21912, 21890, 21916, 21930, 21908,
+    21895, 21899, 21891, 21939, 21934, 21919, 21822, 21938, 21914, 21947,
+    21932, 21937, 21886, 21897, 21931, 21913, 22285, 22575, 22570, 22580,
+    22564, {f: 2, c: 22576}, 22561, 22557, 22560, {f: 2, c: 22777}, 22880,
+    [23159, 57587], 23194, 23167, 23186, 23195, 23207, 23411, 23409, 23506,
+    23500, 23507, 23504, {f: 2, c: 23562}, 23601, 23884, 23888, 23860, 23879,
+    24061, 24133, 24125, 24128, 24131, 24190, 24266, {f: 2, c: 24257}, 24260,
+    24380, 24429, {f: 2, c: 24489}, 24488, 24785, 24801, 24754, 24758, 24800,
+    24860, 24867, 24826, 24853, 24816, 24827, 24820, 24936, 24817, 24846,
+    24822, 24841, 24832, 24850, 25119, 25161, 25507, 25484, 25551, 25536,
+    25577, 25545, 25542, 25549, 25554, 25571, 25552, 25569, 25558,
+    {f: 2, c: 25581}, 25462, 25588, 25578, 25563, 25682, 25562, 25593, 25950,
+    25958, {f: 2, c: 25954}, 26001, 26000, 26031, 26222, 26224, [26228, 57786],
+    26230, 26223, 26257, 26234, 26238, 26231, {f: 2, c: 26366}, 26399, 26397,
+    26874, 26837, 26848, 26840, 26839, 26885, 26847, 26869, 26862, 26855,
+    26873, 26834, 26866, 26851, 26827, 26829, 26893, 26898, 26894, 26825,
+    26842, 26990, 26875, 27454, 27450, 27453, 27544, 27542, 27580, 27631,
+    {f: 2, c: 27694}, 27692, [28207, 57904], 28216, 28244, 28193, 28210, 28263,
+    28234, 28192, 28197, 28195, 28187, 28251, 28248, 28196, 28246, 28270,
+    28205, 28198, 28271, 28212, 28237, 28218, 28204, 28227, [28189, 57901],
+    28222, 28363, 28297, 28185, 28238, 28259, 28228, 28274, 28265, 28255,
+    {f: 2, c: 28953}, 28966, 28976, 28961, 28982, [29038, 57958], 28956, 29260,
+    29316, 29312, 29494, 29477, 29492, 29481, 29754, 29738, 29747, 29730,
+    29733, {f: 2, c: 29749}, 29748, 29743, 29723, 29734, 29736,
+    {f: 2, c: 29989}, 30059, 30058, 30178, 30171, 30179, 30169, 30168, 30174,
+    30176, {f: 2, c: 30331}, 30358, 30355, 30388, 30428, 30543, 30701, 30813,
+    30828, 30831, 31245, 31240, 31243, 31237, 31232, 31384, 31383, 31382,
+    31461, 31459, 31561, 31574, 31558, 31568, 31570, 31572, 31565, 31563,
+    31567, [31569, 60510], 31903, 31909, 32094, 32080, 32104, 32085, 32043,
+    32110, 32114, 32097, 32102, 32098, 32112, 32115, 21892, {f: 2, c: 32724},
+    32779, 32850, 32901, 33109, 33108, 33099, 33105, 33102, 33081, 33094,
+    33086, 33100, 33107, 33140, 33298, 33308, 33769, 33795, 33784, 33805,
+    33760, 33733, 33803, [33729, 58309], 33775, 33777, 33780, 33879, 33802,
+    33776, 33804, 33740, 33789, 33778, 33738, 33848, 33806, 33796, 33756,
+    33799, 33748, 33759, 34395, 34527, 34521, 34541, 34516, 34523, 34532,
+    34512, 34526, 34903, {f: 2, c: 35009}, 34993, 35203, 35222, 35387, 35424,
+    35413, 35422, 35388, 35393, 35412, 35419, 35408, 35398, 35380, 35386,
+    35382, 35414, 35937, 35970, 36015, 36028, 36019, 36029, 36033, 36027,
+    36032, 36020, 36023, 36022, 36031, 36024, 36234, 36229, 36225, 36302,
+    36317, 36299, 36314, 36305, 36300, 36315, 36294, 36603, 36600, 36604,
+    36764, 36910, 36917, 36913, 36920, 36914, 36918, 37122, 37109, 37129,
+    37118, 37219, 37221, 37327, {f: 2, c: 37396}, 37411, 37385, 37406, 37389,
+    37392, 37383, 37393, 38292, 38287, 38283, 38289, 38291, 38290, 38286,
+    38538, 38542, 38539, 38525, {f: 2, c: 38533}, 38541, 38514, 38532, 38593,
+    38597, 38596, {f: 2, c: 38598}, 38639, 38642, 38860, {f: 2, c: 38917},
+    38920, 39143, 39146, 39151, 39145, 39154, 39149, 39342, 39341,
+    [12232, 40643], [12233, 40653], [12234, 40657], 20098, 20653, 20661,
+    {f: 2, c: 20658}, 20677, 20670, 20652, 20663, 20667, 20655, 20679, 21119,
+    21111, 21117, 21215, 21222, 21220, {f: 2, c: 21218}, 21295, 21983, 21992,
+    21971, 21990, 21966, 21980, 21959, 21969, {f: 2, c: 21987}, 21999, 21978,
+    21985, {f: 2, c: 21957}, 21989, 21961, {f: 2, c: 22290}, 22622, 22609,
+    22616, 22615, 22618, 22612, 22635, 22604, 22637, 22602, 22626, 22610,
+    22603, 22887, 23233, 23241, 23244, 23230, 23229, 23228, 23219, 23234,
+    23218, 23913, 23919, 24140, 24185, 24265, 24264, 24338, 24409, 24492,
+    24494, 24858, 24847, 24904, 24863, 24819, 24859, 24825, 24833, 24840,
+    24910, 24908, 24900, 24909, 24894, 24884, 24871, 24845, 24838, 24887,
+    {f: 2, c: 25121}, 25619, 25662, 25630, 25642, 25645, 25661, 25644, 25615,
+    25628, 25620, 25613, 25654, {f: 2, c: 25622}, 25606, 25964, 26015, 26032,
+    26263, 26249, {f: 2, c: 26247}, 26262, 26244, 26264, 26253, 26371, 27028,
+    26989, 26970, 26999, 26976, 26964, 26997, 26928, 27010, 26954, 26984,
+    26987, 26974, 26963, 27001, 27014, 26973, 26979, 26971, 27463, 27506,
+    27584, 27583, 27603, 27645, 28322, 28335, 28371, 28342, 28354, 28304,
+    28317, 28359, 28357, 28325, 28312, 28348, 28346, 28331, 28369, 28310,
+    28316, 28356, 28372, 28330, 28327, 28340, 29006, 29017, 29033, 29028,
+    29001, 29031, 29020, 29036, 29030, 29004, 29029, 29022, 28998, 29032,
+    29014, 29242, 29266, 29495, 29509, 29503, 29502, 29807, 29786, 29781,
+    29791, 29790, 29761, 29759, 29785, 29787, [29788, 58019], 30070, 30072,
+    30208, 30192, 30209, 30194, 30193, 30202, 30207, 30196, 30195,
+    {f: 2, c: 30430}, 30555, 30571, 30566, 30558, 30563, 30585, 30570, 30572,
+    30556, 30565, 30568, 30562, 30702, 30862, 30896, {f: 2, c: 30871}, 30860,
+    30857, 30844, 30865, 30867, 30847, 31098, 31103, 31105, 33836, 31165,
+    31260, 31258, 31264, 31252, 31263, 31262, {f: 2, c: 31391}, 31607, 31680,
+    31584, 31598, 31591, 31921, 31923, 31925, 32147, 32121, 32145, 32129,
+    32143, 32091, 32622, {f: 2, c: 32617}, 32626, 32681, 32680, 32676, 32854,
+    32856, 32902, 32900, 33137, 33136, 33144, 33125, 33134, 33139, 33131,
+    {f: 2, c: 33145}, 33126, 33285, 33351, 33922, 33911, 33853, 33841, 33909,
+    33894, 33899, 33865, 33900, 33883, 33852, 33845, 33889, 33891, 33897,
+    33901, 33862, 34398, 34396, 34399, 34553, 34579, 34568, 34567, 34560,
+    34558, 34555, {f: 2, c: 34562}, 34566, 34570, 34905, 35039, 35028, 35033,
+    35036, 35032, 35037, 35041, 35018, 35029, 35026, 35228, 35299, 35435,
+    {f: 2, c: 35442}, 35430, 35433, 35440, 35463, 35452, 35427, 35488, 35441,
+    35461, 35437, 35426, 35438, 35436, 35449, 35451, 35390, 35432, 35938,
+    35978, 35977, 36042, {f: 2, c: 36039}, 36036, 36018, 36035, 36034, 36037,
+    36321, 36319, 36328, 36335, 36339, 36346, 36330, 36324, 36326, 36530,
+    36611, 36617, 36606, 36618, 36767, 36786, 36939, 36938, 36947, 36930,
+    36948, 36924, 36949, 36944, 36935, 36943, 36942, 36941, 36945, 36926,
+    36929, 37138, 37143, 37228, 37226, 37225, 37321, 37431, 37463, 37432,
+    37437, 37440, 37438, 37467, 37451, 37476, 37457, 37428, 37449, 37453,
+    37445, 37433, 37439, 37466, 38296, 38552, {f: 2, c: 38548}, 38605, 38603,
+    {f: 2, c: 38601}, 38647, 38651, 38649, 38646, 38742, 38772, 38774,
+    {f: 2, c: 38928}, 38931, 38922, 38930, 38924, 39164, 39156,
+    {f: 2, c: 39165}, 39347, 39345, 39348, 39649, 40169, 40578, [12237, 40718],
+    [12238, 40723], [12239, 40736], 20711, 20718, 20709, 20694, [20717, 60903],
+    20698, 20693, 20687, 20689, 20721, 20686, 20713, 20834, 20979, 21123,
+    21122, 21297, 21421, 22014, 22016, 22043, 22039, 22013, 22036, 22022,
+    22025, {f: 2, c: 22029}, 22007, 22038, 22047, 22024, 22032, 22006, 22296,
+    22294, 22645, 22654, 22659, 22675, 22666, 22649, 22661, 22653, 22781,
+    22821, 22818, 22820, 22890, 22889, 23265, 23270, 23273, 23255, 23254,
+    23256, 23267, 23413, 23518, 23527, 23521, {f: 2, c: 23525}, 23528, 23522,
+    23524, 23519, 23565, 23650, 23940, 23943, 24155, 24163, 24149, 24151,
+    24148, 24275, 24278, 24330, 24390, 24432, 24505, 24903, 24895, 24907,
+    24951, {f: 2, c: 24930}, 24927, 24922, 24920, 24949, 25130, 25735, 25688,
+    25684, 25764, 25720, 25695, 25722, 25681, 25703, 25652, 25709, 25723,
+    25970, 26017, 26071, 26070, 26274, 26280, 26269, 27036, 27048, 27029,
+    27073, 27054, 27091, 27083, 27035, 27063, 27067, 27051, 27060, 27088,
+    27085, 27053, 27084, 27046, 27075, 27043, 27465, 27468, 27699, 28467,
+    28436, 28414, 28435, 28404, 28457, 28478, 28448, 28460, 28431, 28418,
+    28450, 28415, 28399, 28422, 28465, 28472, 28466, 28451, 28437, 28459,
+    28463, 28552, 28458, 28396, 28417, 28402, 28364, 28407, 29076, 29081,
+    29053, 29066, 29060, 29074, 29246, 29330, 29334, 29508, 29520, 29796,
+    29795, 29802, 29808, 29805, 29956, 30097, 30247, 30221, 30219, 30217,
+    30227, 30433, 30435, 30596, 30589, 30591, 30561, 30913, 30879, 30887,
+    30899, 30889, 30883, {f: 2, c: 31118}, 31117, 31278, 31281, 31402, 31401,
+    31469, 31471, 31649, 31637, 31627, 31605, 31639, 31645, 31636, 31631,
+    [31672, 58170], 31623, 31620, 31929, {f: 2, c: 31933}, 32187, 32176, 32156,
+    {f: 2, c: 32189}, 32160, 32202, 32180, 32178, 32177, 32186, 32162, 32191,
+    32181, 32184, 32173, [32210, 58202], 32199, 32172, 32624, {f: 2, c: 32736},
+    32735, 32862, 32858, 32903, 33104, 33152, 33167, 33160, 33162, 33151,
+    33154, 33255, 33274, 33287, 33300, 33310, 33355, 33993, 33983, 33990,
+    33988, 33945, 33950, 33970, 33948, 33995, 33976, 33984, 34003, 33936,
+    33980, 34001, 33994, 34623, 34588, 34619, 34594, 34597, 34612, 34584,
+    34645, 34615, 34601, 35059, 35074, 35060, 35065, 35064, 35069, 35048,
+    35098, 35055, 35494, 35468, 35486, 35491, 35469, 35489, 35475, 35492,
+    35498, 35493, 35496, 35480, 35473, 35482, 35495, 35946, 35981, 35980,
+    36051, {f: 2, c: 36049}, 36203, 36249, 36245, 36348, 36628, 36626, 36629,
+    36627, 36771, 36960, 36952, 36956, 36963, 36953, 36958, 36962, 36957,
+    36955, 37145, 37144, 37150, 37237, 37240, 37239, 37236, 37496, 37548,
+    37504, 37509, 37528, 37526, 37499, 37523, 37532, 37544, 37500, 37521,
+    38305, {f: 2, c: 38312}, 38307, 38309, 38308, 38553, 38556, 38555, 38604,
+    38610, 38656, 38780, 38789, 38902, {f: 2, c: 38935}, 39087, 39089, 39171,
+    39173, 39180, 39177, 39361, {f: 2, c: 39599}, 39654, {f: 2, c: 39745},
+    40180, 40182, 40179, 40636, [12240, 40763], [12241, 40778], 20740, 20736,
+    20731, 20725, 20729, 20738, {f: 2, c: 20744}, 20741, 20956,
+    {f: 3, c: 21127}, 21133, 21130, 21232, 21426, 22062, 22075, 22073, 22066,
+    22079, 22068, 22057, 22099, 22094, 22103, 22132, 22070, {f: 2, c: 22063},
+    22656, 22687, 22686, 22707, 22684, 22702, 22697, 22694, 22893, 23305,
+    23291, 23307, 23285, 23308, 23304, 23534, 23532, 23529, 23531,
+    {f: 2, c: 23652}, 23965, 23956, 24162, 24159, 24161, 24290, 24282, 24287,
+    24285, 24291, 24288, 24392, 24433, 24503, 24501, 24950, 24935, 24942,
+    24925, 24917, 24962, 24956, 24944, 24939, 24958, 24999, 24976, 25003,
+    24974, 25004, 24986, 24996, 24980, 25006, 25134, 25705, 25711, 25721,
+    25758, 25778, 25736, [25744, 57745], 25776, 25765, 25747, 25749, 25769,
+    25746, 25774, 25773, 25771, 25754, 25772, 25753, 25762, 25779, 25973,
+    {f: 2, c: 25975}, 26286, 26283, 26292, 26289, 27171, 27167, 27112, 27137,
+    27166, 27161, 27133, 27169, 27155, 27146, 27123, 27138, 27141, 27117,
+    27153, 27472, 27470, 27556, {f: 2, c: 27589}, 28479, 28540, 28548, 28497,
+    28518, 28500, 28550, 28525, 28507, 28536, 28526, 28558, 28538, 28528,
+    28516, 28567, 28504, 28373, 28527, 28512, 28511, 29087, 29100, 29105,
+    29096, 29270, 29339, 29518, 29527, 29801, 29835, 29827, 29822, 29824,
+    30079, 30240, 30249, 30239, 30244, 30246, {f: 2, c: 30241}, 30362, 30394,
+    30436, 30606, 30599, 30604, 30609, 30603, 30923, 30917, 30906, 30922,
+    30910, 30933, 30908, 30928, 31295, 31292, 31296, 31293, 31287, 31291,
+    31407, 31406, 31661, 31665, 31684, 31668, {f: 2, c: 31686}, 31681, 31648,
+    31692, 31946, 32224, 32244, 32239, 32251, 32216, 32236, 32221, 32232,
+    32227, 32218, 32222, 32233, 32158, 32217, 32242, 32249, 32629, 32631,
+    32687, 32745, 32806, {f: 3, c: 33179}, 33184, 33178, 33176, 34071, 34109,
+    34074, 34030, {f: 2, c: 34092}, 34067, 34065, 34083, 34081, 34068, 34028,
+    34085, 34047, 34054, 34690, 34676, 34678, 34656, 34662, 34680, 34664,
+    34649, 34647, 34636, 34643, 34907, 34909, 35088, 35079, {f: 2, c: 35090},
+    35093, 35082, 35516, 35538, 35527, 35524, 35477, 35531, 35576, 35506,
+    35529, 35522, 35519, 35504, 35542, 35533, 35510, 35513, 35547, 35916,
+    35918, 35948, 36064, 36062, 36070, 36068, {f: 2, c: 36076},
+    {f: 2, c: 36066}, 36060, 36074, 36065, 36205, 36255, 36259, 36395, 36368,
+    36381, 36386, 36367, 36393, 36383, 36385, 36382, 36538, 36637, 36635,
+    36639, 36649, 36646, 36650, 36636, 36638, 36645, 36969, 36974, 36968,
+    36973, 36983, 37168, 37165, 37159, 37169, 37255, 37257, 37259, 37251,
+    37573, 37563, 37559, 37610, 37604, 37569, 37555, 37564, 37586, 37575,
+    37616, 37554, 38317, 38321, 38660, {f: 2, c: 38662}, 38665, 38752, 38797,
+    38795, 38799, 38945, 38955, 38940, 39091, 39178, 39187, 39186, 39192,
+    39389, 39376, 39391, 39387, 39377, 39381, 39378, 39385, 39607,
+    {f: 2, c: 39662}, 39719, 39749, 39748, 39799, 39791, 40198, 40201, 40195,
+    40617, 40638, 40654, 22696, [12242, 40786], 20754, 20760, 20756, 20752,
+    20757, 20864, 20906, 20957, 21137, 21139, 21235, 22105, 22123, 22137,
+    22121, 22116, 22136, 22122, 22120, 22117, 22129, 22127, 22124, 22114,
+    22134, 22721, 22718, 22727, 22725, 22894, 23325, 23348, 23416, 23536,
+    23566, 24394, 25010, 24977, 25001, 24970, 25037, 25014, 25022, 25034,
+    25032, 25136, 25797, 25793, 25803, {f: 2, c: 25787}, 25818, 25796, 25799,
+    25794, 25805, 25791, 25810, 25812, 25790, 25972, 26310, 26313, 26297,
+    26308, 26311, 26296, 27197, 27192, 27194, 27225, 27243, 27224, 27193,
+    27204, 27234, 27233, 27211, 27207, 27189, 27231, 27208, 27481, 27511,
+    27653, 28610, 28593, 28577, 28611, 28580, 28609, 28583, 28595, 28608,
+    28601, [28598, 60318], 28582, 28576, 28596, 29118, 29129, 29136, 29138,
+    29128, 29141, 29113, 29134, 29145, 29148, {f: 2, c: 29123}, 29544, 29852,
+    29859, 29848, 29855, 29854, 29922, {f: 2, c: 29964}, 30260, 30264, 30266,
+    30439, 30437, 30624, {f: 2, c: 30622}, 30629, 30952, 30938, 30956, 30951,
+    31142, {f: 2, c: 31309}, 31302, 31308, 31307, 31418, 31705, 31761, 31689,
+    31716, 31707, 31713, 31721, 31718, {f: 2, c: 31957}, 32266, 32273, 32264,
+    32283, 32291, 32286, [32285, 58211], 32265, 32272, 32633, 32690,
+    {f: 2, c: 32752}, 32750, [32808, 58239], 33203, 33193, 33192, 33275, 33288,
+    {f: 2, c: 33368}, 34122, 34137, 34120, {f: 2, c: 34152}, 34115, 34121,
+    34157, 34154, 34142, 34691, 34719, 34718, 34722, 34701, 34913, 35114,
+    35122, 35109, 35115, 35105, 35242, [35238, 58391], 35558, 35578, 35563,
+    35569, 35584, 35548, 35559, 35566, 35582, {f: 2, c: 35585}, 35575, 35565,
+    35571, 35574, 35580, 35947, 35949, 35987, 36084, 36420, 36401, 36404,
+    36418, 36409, 36405, 36667, 36655, 36664, 36659, 36776, 36774, 36981,
+    36980, 36984, 36978, 36988, 36986, 37172, 37266, 37664, 37686, 37624,
+    37683, 37679, 37666, 37628, 37675, 37636, 37658, 37648, 37670, 37665,
+    37653, 37678, 37657, 38331, {f: 2, c: 38567}, 38570, 38613, 38670, 38673,
+    38678, 38669, 38675, 38671, 38747, [38748, 58565], 38758, 38808, 38960,
+    38968, 38971, 38967, 38957, 38969, 38948, 39184, 39208, 39198, 39195,
+    39201, 39194, 39405, 39394, 39409, 39608, 39612, 39675, 39661, 39720,
+    39825, 40213, 40227, 40230, 40232, 40210, 40219, 40664, 40660,
+    [12243, 40845], [12244, 40860], 20778, 20767, 20769, 20786, 21237, 22158,
+    22144, 22160, 22149, 22151, 22159, 22741, 22739, 22737, 22734, 23344,
+    23338, 23332, 23418, 23607, 23656, 23996, 23994, 23997, 23992, 24171,
+    24396, 24509, 25033, 25026, 25031, 25062, 25035, 25138, 25140, 25806,
+    25802, 25816, 25824, 25840, 25830, 25836, 25841, 25826, 25837,
+    {f: 2, c: 25986}, 26329, 26326, 27264, 27284, 27268, 27298, 27292, 27355,
+    27299, 27262, 27287, 27280, 27296, 27484, 27566, 27610, 27656, 28632,
+    28657, {f: 2, c: 28639}, 28635, 28644, 28651, 28655, 28544, 28652, 28641,
+    28649, 28629, 28654, 28656, 29159, [29151, 60361], 29166, 29158, 29157,
+    29165, 29164, 29172, 29152, 29237, 29254, 29552, 29554, 29865, 29872,
+    29862, 29864, 30278, 30274, 30284, 30442, 30643, 30634, 30640, 30636,
+    30631, 30637, 30703, 30967, 30970, 30964, 30959, 30977, 31143, 31146,
+    31319, 31423, 31751, 31757, 31742, 31735, 31756, 31712, 31968, 31964,
+    31966, 31970, 31967, 31961, 31965, 32302, 32318, 32326, 32311, 32306,
+    32323, 32299, 32317, 32305, 32325, 32321, 32308, 32313, 32328, 32309,
+    32319, 32303, 32580, 32755, 32764, {f: 2, c: 32881}, 32880, 32879, 32883,
+    33222, 33219, 33210, 33218, 33216, 33215, 33213, 33225, 33214, 33256,
+    33289, 33393, 34218, 34180, 34174, 34204, 34193, 34196, 34223, 34203,
+    34183, 34216, 34186, 34214, 34407, 34752, 34769, 34739, 34770, 34758,
+    34731, 34747, 34746, 34760, 34763, 35131, 35126, 35140, 35128, 35133,
+    35244, 35598, 35607, 35609, 35611, 35594, 35616, 35613, 35588, 35600,
+    35905, 35903, 35955, 36090, 36093, 36092, 36088, 36091, 36264, 36425,
+    36427, 36424, 36426, 36676, 36670, 36674, 36677, 36671, 36991, 36989,
+    36996, {f: 2, c: 36993}, 36992, 37177, 37283, 37278, 37276, 37709, 37762,
+    37672, 37749, 37706, 37733, 37707, 37656, 37758, 37740, 37723, 37744,
+    37722, 37716, {f: 3, c: 38346}, 38344, 38342, 38577, 38584, 38614, 38684,
+    38686, 38816, 38867, 38982, 39094, 39221, 39425, 39423, 39854, 39851,
+    39850, 39853, 40251, 40255, 40587, 40655, 40670, {f: 2, c: 40668}, 40667,
+    40766, 40779, 21474, 22165, 22190, 22745, 22744, 23352, 24413, 25059,
+    25139, 25844, 25842, 25854, 25862, {f: 2, c: 25850}, 25847, 26039, 26332,
+    26406, 27315, 27308, 27331, 27323, 27320, 27330, {f: 2, c: 27310}, 27487,
+    27512, 27567, 28681, 28683, 28670, 28678, 28666, 28689, 28687,
+    {f: 2, c: 29179}, 29182, 29176, 29559, 29557, 29863, 29887, 29973, 30294,
+    30296, 30290, 30653, 30655, {f: 2, c: 30651}, 30990, 31150,
+    {f: 2, c: 31329}, 31328, {f: 2, c: 31428}, 31787, 31783, 31786, 31774,
+    31779, 31777, 31975, {f: 2, c: 32340}, 32350, 32346, 32353, 32338, 32345,
+    32584, 32761, 32763, 32887, 32886, 33229, 33231, 33290, 34255, 34217,
+    34253, 34256, 34249, 34224, 34234, 34233, 34799, 34796, 34802, 34784,
+    35206, 35250, 35316, 35624, 35641, 35628, 35627, 35920, 36101, 36441,
+    36451, 36454, 36452, 36447, 36437, 36544, 36681, 36685, 36999, 36995,
+    37000, {f: 2, c: 37291}, 37328, 37780, 37770, 37782, 37794, 37811, 37806,
+    37804, 37808, 37784, 37786, 37783, 38356, 38358, 38352, 38357, 38626,
+    38620, 38617, 38619, 38622, 38692, 38819, 38822, 38829, 38905, 38989,
+    38991, 38988, 38990, 38995, 39098, {f: 2, c: 39230}, 39229, 39214, 39333,
+    39438, 39617, 39683, 39686, 39759, 39758, 39757, 39882, 39881, 39933,
+    39880, 39872, 40273, 40285, 40288, 40672, 40725, 40748, 20787, 22181,
+    22184, {f: 2, c: 22750}, 22754, 23541, 40848, 24300, 25074, 25079, 25078,
+    25077, 25856, 25871, 26336, 26333, 27365, 27357, 27354, 27347, 28699,
+    28703, 28712, 28698, 28701, 28693, 28696, 29190, 29197, 29272, 29346,
+    29560, 29562, 29885, 29898, 29923, 30087, 30086, 30303, 30305, 30663,
+    31001, 31153, 31339, 31337, {f: 2, c: 31806}, 31800, 31805, 31799, 31808,
+    32363, 32365, 32377, {f: 2, c: 32361}, 32371, 32645, 32694, 32697, 32696,
+    33240, 34281, 34269, 34282, 34261, {f: 2, c: 34276}, 34295, 34811, 34821,
+    34829, 34809, 34814, 35168, 35167, 35158, 35166, 35649, 35676, 35672,
+    35657, 35674, {f: 2, c: 35662}, 35654, 35673, 36104, 36106, 36476, 36466,
+    36487, 36470, 36460, 36474, 36468, 36692, 36686, 36781, {f: 2, c: 37002},
+    37297, 37294, 37857, 37841, 37855, 37827, 37832, {f: 2, c: 37852}, 37846,
+    37858, 37837, 37848, 37860, 37847, 37864, 38364, 38580, 38627, 38698,
+    38695, 38753, 38876, 38907, 39006, 39000, 39003, 39100, 39237, 39241,
+    39446, 39449, 39693, 39912, 39911, 39894, 39899, 40329, 40289, 40306,
+    40298, 40300, 40594, 40599, 40595, 40628, 21240, 22199, 22198, 22196,
+    22204, 22756, 23360, 23363, 23421, 23542, 24009, 25080, 25082, 25880,
+    25876, 25881, 26342, 26407, 27372, 28734, 28720, 28722, 29200, 29563,
+    29903, 30306, 30309, 31014, 31018, 31020, 31019, 31431, 31478, 31820,
+    31811, 31821, {f: 2, c: 31983}, 36782, 32381, 32380, 32386, 32588, 32768,
+    33242, 33382, 34299, 34297, 34321, 34298, 34310, 34315, 34311, 34314,
+    {f: 2, c: 34836}, 35172, 35258, 35320, 35696, 35692, 35686, 35695, 35679,
+    35691, 36111, 36109, 36489, 36481, 36485, 36482, 37300, 37323, 37912,
+    37891, 37885, 38369, 38704, 39108, 39250, 39249, 39336, 39467, 39472,
+    39479, 39477, 39955, 39949, 40569, 40629, 40680, 40751, 40799, 40803,
+    40801, {f: 2, c: 20791}, 22209, 22208, 22210, 22804, 23660, 24013, 25084,
+    25086, 25885, 25884, 26005, 26345, 27387, 27396, 27386, 27570, 28748,
+    29211, 29351, 29910, 29908, 30313, 30675, 31824, 32399, 32396, 32700,
+    34327, 34349, 34330, 34851, 34850, 34849, 34847, 35178, 35180, 35261,
+    35700, 35703, 35709, 36115, 36490, 36493, 36491, 36703, 36783, 37306,
+    37934, 37939, 37941, 37946, 37944, 37938, 37931, 38370, {f: 2, c: 38712},
+    38706, [38911, 58586], 39015, 39013, 39255, 39493, 39491, 39488, 39486,
+    39631, 39764, 39761, 39981, 39973, 40367, 40372, 40386, 40376, 40605,
+    40687, 40729, 40796, {f: 2, c: 40806}, 20796, 20795, 22216, 22218, 22217,
+    23423, 24020, 24018, 24398, 25087, 25892, 27402, 27489, 28753, 28760,
+    29568, 29924, 30090, 30318, 30316, 31155, 31840, 31839, 32894, 32893,
+    33247, 35186, 35183, 35324, 35712, {f: 2, c: 36118}, 36497, 36499, 36705,
+    37192, 37956, {f: 2, c: 37969}, {f: 2, c: 38717}, 38851, 38849, 39019,
+    39253, 39509, 39501, 39634, 39706, 40009, 39985, 39998, 39995, 40403,
+    40407, 40756, 40812, 40810, 40852, 22220, 24022, 25088, 25891, 25899,
+    25898, 26348, 27408, 29914, 31434, 31844, 31843, 31845, 32403, 32406,
+    32404, 33250, 34360, 34367, 34865, 35722, 37008, 37007, 37987, 37984,
+    37988, 38760, 39023, 39260, {f: 2, c: 39514}, 39511, {f: 2, c: 39635},
+    39633, 40020, 40023, 40022, 40421, 40607, 40692, 22225, 22761, 25900,
+    28766, {f: 2, c: 30321}, [30679, 60226], 32592, 32648, 34870, 34873, 34914,
+    35731, 35730, 35734, 33399, 36123, 37312, 37994, 38722, 38728, 38724,
+    38854, 39024, 39519, 39714, 39768, 40031, {f: 2, c: 40441},
+    {f: 2, c: 40572}, 40711, 40823, 40818, 24307, 27414, 28771, 31852, 31854,
+    34875, 35264, 36513, 37313, 38002, 38000, 39025, 39262, 39638, 39715,
+    40652, 28772, 30682, 35738, 38007, 38857, 39522, 39525, 32412, 35740,
+    36522, 37317, {f: 2, c: 38013}, 38012, {f: 2, c: 40055}, 40695, 35924,
+    38015, 40474, 29224, 39530, 39729, 40475, 40478, 31858, 20034, 20060,
+    [12048, 20981], [12053, 21274], [12058, 21378], 19975, 19980, 20039, 20109,
+    [12062, 22231], [12076, 23662], [12091, 24435], 19983, 20871, 19982, 20014,
+    20115, 20162, 20169, 20168, 20888, 21244, 21356, 21433, 22304, 22787,
+    22828, [23568, 60417], 24063, 26081, [12110, 27571], 27596, [12115, 27668],
+    [12121, 29247], 20017, 20028, 20200, 20188, 20201, 20193, 20189, 20186,
+    21004, 21001, 21276, 21324, {f: 2, c: 22306}, 22807, 22831, 23425, 23428,
+    23570, 23611, 23668, 23667, 24068, 24192, 24194, 24521, 25097, 25168,
+    27669, 27702, 27715, 27711, 27707, 29358, 29360, 29578, [12145, 31160],
+    32906, 38430, 20238, 20248, 20268, 20213, 20244, 20209, 20224, 20215,
+    20232, 20253, 20226, 20229, 20258, 20243, 20228, 20212, 20242, 20913,
+    21011, 21008, 21158, 21282, 21279, 21325, 21386, 21511, 22241, 22239,
+    22318, 22314, 22324, 22844, 22912, 22908, 22917, 22907, 22910, 22903,
+    22911, 23382, 23573, 23589, 23676, {f: 2, c: 23674}, 23678, 24031,
+    [24181, 57646], 24196, 24322, 24346, 24436, 24533, 24532, 24527, 25180,
+    25182, 25188, 25185, 25190, 25186, 25177, 25184, 25178, 25189, 25911,
+    26095, 26094, 26430, 26425, 26424, 26427, 26426, 26431, 26428, 26419,
+    27672, 27718, 27730, 27740, 27727, [27722, 60796], 27732, {f: 2, c: 27723},
+    28785, 29278, {f: 2, c: 29364}, 29582, 29994, 30335, 31349, [12153, 32593],
+    [12171, 33400], 33404, 33408, 33405, 33407, [12172, 34381], [12177, 35198],
+    37017, [37015, 59347], 37016, 37019, 37012, 38434, 38436, 38432, 38435,
+    20310, 20283, 20322, 20297, 20307, 20324, 20286, 20327, 20306, 20319,
+    20289, 20312, 20269, 20275, 20287, 20321, 20879, 20921, 21020, 21022,
+    21025, {f: 2, c: 21165}, 21257, 21347, 21362, {f: 2, c: 21390}, 21552,
+    21559, 21546, 21588, 21573, 21529, 21532, 21541, 21528, 21565, 21583,
+    21569, 21544, 21540, 21575, 22254, 22247, 22245, 22337, 22341, 22348,
+    22345, 22347, 22354, 22790, 22848, 22950, 22936, 22944, 22935, 22926,
+    22946, 22928, 22927, 22951, 22945, 23438, 23442, 23592, 23594, 23693,
+    23695, 23688, 23691, 23689, 23698, 23690, 23686, 23699, 23701, 24032,
+    24074, 24078, 24203, 24201, 24204, 24200, 24205, 24325, 24349, 24440,
+    24438, 24530, 24529, 24528, 24557, 24552, 24558, 24563, 24545, 24548,
+    24547, 24570, 24559, 24567, 24571, 24576, 24564, 25146, 25219, 25228,
+    {f: 2, c: 25230}, 25236, 25223, 25201, 25211, 25210, 25200, 25217, 25224,
+    25207, 25213, 25202, 25204, 26096, 26100, 26099, 26098, 26101, 26437,
+    26439, 26457, 26453, 26444, 26440, 26461, 26445, 26458, 26443, 27600,
+    {f: 2, c: 27673}, 27768, 27751, 27755, 27780, 27787, 27791, 27761, 27759,
+    27753, 27802, 27757, 27783, 27797, [27804, 57900], 27750, 27763, 27749,
+    27771, 27790, 28788, 28794, 29283, 29375, 29373, 29379, 29382, 29377,
+    29370, 29381, 29589, 29591, {f: 2, c: 29587}, 29586, 30010, 30009,
+    {f: 2, c: 30100}, 30337, 31037, 32820, 32917, 32921, 32912, 32914, 32924,
+    33424, 33423, 33413, 33422, 33425, 33427, 33418, {f: 2, c: 33411},
+    [12184, 35960], 36809, 36799, 37023, 37025, 37029, 37022, 37031, 37024,
+    38448, 38440, 38447, 38445, 20019, 20376, 20348, 20357, 20349, 20352,
+    20359, 20342, 20340, 20361, 20356, 20343, 20300, 20375, 20330, 20378,
+    20345, 20353, 20344, 20368, 20380, 20372, 20382, 20370, 20354, 20373,
+    20331, 20334, 20894, 20924, 20926, 21045, {f: 2, c: 21042}, 21062, 21041,
+    21180, {f: 2, c: 21258}, 21308, 21394, 21396, 21639, 21631, 21633, 21649,
+    21634, 21640, 21611, 21626, 21630, 21605, 21612, 21620, 21606, 21645,
+    21615, 21601, 21600, 21656, 21603, 21607, 21604, 22263, 22265, 22383,
+    22386, 22381, 22379, 22385, 22384, 22390, 22400, 22389, 22395,
+    {f: 2, c: 22387}, 22370, 22376, 22397, 22796, 22853, 22965, 22970, 22991,
+    22990, 22962, 22988, 22977, 22966, 22972, 22979, 22998, 22961, 22973,
+    22976, 22984, 22964, 22983, 23394, 23397, 23443, 23445, 23620, 23623,
+    23726, 23716, 23712, 23733, 23727, 23720, 23724, 23711, 23715, 23725,
+    23714, 23722, 23719, 23709, 23717, 23734, 23728, 23718, 24087, 24084,
+    24089, 24360, {f: 3, c: 24354}, 24404, 24450, 24446, 24445, 24542, 24549,
+    24621, 24614, 24601, 24626, 24587, 24628, 24586, 24599, 24627, 24602,
+    24606, 24620, 24610, 24589, 24592, 24622, 24595, 24593, 24588, 24585,
+    24604, 25108, 25149, 25261, 25268, 25297, 25278, 25258, 25270, 25290,
+    25262, 25267, 25263, 25275, 25257, 25264, 25272, 25917, 26024, 26043,
+    26121, 26108, 26116, 26130, 26120, 26107, 26115, 26123, 26125, 26117,
+    26109, 26129, 26128, 26358, 26378, 26501, 26476, 26510, 26514, 26486,
+    26491, 26520, 26502, 26500, 26484, 26509, 26508, 26490, 26527, 26513,
+    26521, 26499, 26493, 26497, {f: 2, c: 26488}, 26516, 27429, 27520, 27518,
+    27614, 27677, 27795, 27884, 27883, 27886, 27865, 27830, 27860, 27821,
+    27879, 27831, 27856, 27842, 27834, 27843, 27846, 27885, 27890, 27858,
+    27869, 27828, 27786, 27805, 27776, 27870, 27840, 27952, 27853, 27847,
+    27824, 27897, 27855, 27881, 27857, 28820, 28824, 28805, 28819, 28806,
+    28804, 28817, 28822, 28802, 28826, 28803, 29290, 29398, 29387, 29400,
+    29385, 29404, 29394, 29396, 29402, 29388, 29393, 29604, 29601, 29613,
+    29606, 29602, 29600, 29612, 29597, 29917, 29928, {f: 2, c: 30015}, 30014,
+    30092, 30104, 30383, 30451, 30449, 30448, 30453, 30712, 30716, 30713,
+    30715, 30714, 30711, 31042, 31039, 31173, 31352, 31355, 31483, 31861,
+    31997, 32821, 32911, 32942, 32931, 32952, 32949, 32941, 33312, 33440,
+    33472, 33451, 33434, 33432, 33435, 33461, 33447, 33454, 33468, 33438,
+    33466, 33460, 33448, 33441, 33449, 33474, 33444, 33475, 33462, 33442,
+    34416, 34415, {f: 2, c: 34413}, 35926, 36818, 36811, 36819, 36813, 36822,
+    36821, 36823, 37042, 37044, 37039, 37043, 37040, 38457, 38461, 38460,
+    38458, 38467, 20429, 20421, 20435, 20402, 20425, 20427, 20417, 20436,
+    20444, 20441, [20411, 60346], 20403, 20443, 20423, 20438, 20410, 20416,
+    20409, 20460, 21060, 21065, 21184, 21186, 21309, 21372, 21399, 21398,
+    21401, 21400, 21690, 21665, 21677, 21669, 21711, 21699, 33549, 21687,
+    21678, 21718, 21686, {f: 2, c: 21701}, 21664, 21616, 21692, 21666, 21694,
+    21618, 21726, 21680, 22453, {f: 2, c: 22430}, 22436, 22412, 22423, 22429,
+    22427, 22420, 22424, 22415, 22425, 22437, 22426, 22421, 22772, 22797,
+    22867, 23009, 23006, 23022, 23040, 23025, 23005, 23034, 23037, 23036,
+    23030, 23012, 23026, 23031, 23003, 23017, 23027, 23029, 23008, 23038,
+    23028, 23021, 23464, 23628, 23760, 23768, 23756, 23767, 23755, 23771,
+    23774, 23770, 23753, 23751, 23754, 23766, {f: 2, c: 23763}, 23759, 23752,
+    23750, 23758, 23775, 23800, 24057, {f: 3, c: 24097}, 24096, 24100, 24240,
+    24228, 24226, 24219, 24227, 24229, 24327, 24366, 24406, 24454, 24631,
+    24633, 24660, 24690, 24670, 24645, 24659, 24647, 24649, 24667, 24652,
+    24640, 24642, 24671, 24612, 24644, 24664, 24678, 24686, {f: 2, c: 25154},
+    25295, 25357, 25355, 25333, 25358, 25347, 25323, 25337, 25359, 25356,
+    25336, 25334, 25344, {f: 2, c: 25363}, 25338, 25365, 25339, 25328, 25921,
+    25923, 26026, 26047, 26166, 26145, 26162, 26165, 26140, 26150, 26146,
+    26163, 26155, 26170, 26141, 26164, 26169, 26158, {f: 2, c: 26383}, 26561,
+    26610, 26568, 26554, 26588, 26555, 26616, 26584, 26560, 26551, 26565,
+    26603, 26596, 26591, 26549, 26573, 26547, 26615, 26614, 26606, 26595,
+    26562, 26553, 26574, 26599, 26608, 26546, 26620, 26566, 26605, 26572,
+    26542, 26598, 26587, 26618, {f: 2, c: 26569}, 26563, 26602, 26571, 27432,
+    27522, 27524, 27574, 27606, 27608, 27616, {f: 2, c: 27680}, 27944, 27956,
+    27949, 27935, 27964, 27967, 27922, 27914, 27866, 27955, 27908, 27929,
+    27962, 27930, 27921, 27904, 27933, 27970, 27905, 27928, 27959, 27907,
+    27919, 27968, 27911, 27936, 27948, 27912, 27938, 27913, 27920, 28855,
+    28831, 28862, 28849, 28848, 28833, {f: 2, c: 28852}, 28841, 29249,
+    {f: 2, c: 29257}, 29292, 29296, 29299, 29294, 29386, 29412, 29416, 29419,
+    29407, 29418, 29414, 29411, 29573, 29644, 29634, 29640, 29637, 29625,
+    29622, 29621, 29620, 29675, 29631, 29639, 29630, 29635, 29638, 29624,
+    29643, 29932, 29934, 29998, {f: 2, c: 30023}, 30119, 30122, 30329, 30404,
+    30472, {f: 3, c: 30467}, 30474, 30455, 30459, 30458, {f: 2, c: 30695},
+    30726, {f: 2, c: 30737}, 30725, 30736, 30735, 30734, [30729, 58095], 30723,
+    30739, 31050, 31052, 31051, 31045, 31044, 31189, 31181, 31183, 31190,
+    31182, 31360, 31358, 31441, {f: 2, c: 31488}, 31866, {f: 2, c: 31864},
+    {f: 3, c: 31871}, 32003, 32008, 32001, 32600, 32657, 32653, 32702, 32775,
+    {f: 2, c: 32782}, 32788, 32823, 32984, 32967, 32992, 32977, 32968, 32962,
+    32976, 32965, 32995, 32985, 32988, 32970, 32981, 32969, 32975, 32983,
+    32998, 32973, 33279, 33313, 33428, 33497, 33534, 33529, 33543, 33512,
+    33536, 33493, 33594, 33515, 33494, 33524, 33516, 33505, 33522, 33525,
+    33548, 33531, 33526, 33520, 33514, 33508, 33504, 33530, 33523, 33517,
+    34423, 34420, 34428, 34419, 34881, 34894, 34919, 34922, 34921, 35283,
+    35332, 35335, 36210, 36835, 36833, 36846, 36832, 37105, 37053, 37055,
+    37077, 37061, 37054, 37063, 37067, 37064, [37332, 60294], 37331, 38484,
+    38479, 38481, 38483, 38474, 38478, 20510, 20485, 20487, 20499, 20514,
+    20528, 20507, 20469, 20468, 20531, 20535, 20524, {f: 2, c: 20470}, 20503,
+    20508, 20512, 20519, 20533, 20527, 20529, 20494, 20826, 20884, 20883,
+    20938, {f: 2, c: 20932}, 20936, 20942, 21089, 21082, 21074,
+    {f: 2, c: 21086}, 21077, 21090, 21197, 21262, 21406, 21798, 21730, 21783,
+    21778, 21735, 21747, 21732, 21786, 21759, 21764, 21768, 21739, 21777,
+    21765, 21745, 21770, 21755, {f: 2, c: 21751}, 21728, 21774, 21763, 21771,
+    {f: 2, c: 22273}, 22476, 22578, 22485, 22482, 22458, 22470, 22461, 22460,
+    22456, 22454, 22463, 22471, 22480, 22457, 22465, 22798, 22858, 23065,
+    23062, {f: 2, c: 23085}, 23061, 23055, 23063, 23050, 23070, 23091, 23404,
+    23463, 23469, 23468, 23555, 23638, 23636, 23788, 23807, 23790, 23793,
+    23799, 23808, 23801, 24105, 24104, 24232, 24238, 24234, 24236, 24371,
+    24368, 24423, 24669, 24666, 24679, 24641, 24738, 24712, 24704, 24722,
+    24705, 24733, 24707, 24725, 24731, 24727, 24711, 24732, 24718, 25113,
+    25158, 25330, 25360, 25430, 25388, {f: 2, c: 25412}, 25398, 25411, 25572,
+    25401, 25419, 25418, 25404, 25385, 25409, 25396, 25432, 25428, 25433,
+    25389, 25415, 25395, 25434, 25425, 25400, 25431, 25408, 25416, 25930,
+    25926, 26054, {f: 2, c: 26051}, 26050, 26186, 26207, 26183, 26193,
+    {f: 2, c: 26386}, 26655, 26650, 26697, {f: 2, c: 26674}, 26683, 26699,
+    26703, 26646, 26673, 26652, 26677, 26667, 26669, 26671, 26702, 26692,
+    26676, 26653, 26642, 26644, 26662, 26664, 26670, 26701, 26682, 26661,
+    26656, 27436, 27439, 27437, 27441, 27444, 27501, 32898, 27528, 27622,
+    27620, 27624, 27619, 27618, 27623, 27685, 28026, {f: 2, c: 28003}, 28022,
+    27917, 28001, 28050, 27992, 28002, 28013, 28015, 28049, 28045, 28143,
+    28031, 28038, 27998, [28007, 59078], 28000, 28055, 28016, 28028, 27999,
+    28034, 28056, 27951, 28008, 28043, 28030, 28032, 28036, 27926, 28035,
+    28027, 28029, 28021, 28048, 28892, 28883, 28881, 28893, 28875, 32569,
+    28898, 28887, 28882, 28894, 28896, 28884, 28877, {f: 3, c: 28869}, 28890,
+    28878, 28897, 29250, 29304, 29303, 29302, 29440, 29434, 29428, 29438,
+    29430, 29427, 29435, 29441, 29651, 29657, 29669, 29654, 29628, 29671,
+    29667, 29673, 29660, 29650, 29659, 29652, 29661, 29658, {f: 2, c: 29655},
+    29672, {f: 2, c: 29918}, {f: 2, c: 29940}, 29985, 30043, 30047, 30128,
+    30145, 30139, 30148, 30144, 30143, 30134, 30138, 30346, 30409, 30493,
+    30491, 30480, 30483, 30482, 30499, 30481, 30485, {f: 2, c: 30489}, 30498,
+    30503, 30755, 30764, 30754, 30773, 30767, 30760, 30766, 30763, 30753,
+    30761, 30771, 30762, 30769, 31060, 31067, 31055, 31068, 31059, 31058,
+    31057, {f: 2, c: 31211}, 31200, 31214, 31213, 31210, 31196, 31198, 31197,
+    31366, 31369, 31365, {f: 2, c: 31371}, 31370, 31367, 31448, 31504, 31492,
+    31507, 31493, 31503, 31496, 31498, 31502, 31497, 31506, 31876, 31889,
+    31882, 31884, 31880, 31885, 31877, 32030, 32029, 32017, 32014, 32024,
+    32022, 32019, 32031, 32018, 32015, 32012, 32604, 32609, 32606, 32608,
+    32605, 32603, 32662, 32658, 32707, 32706, 32704, 32790, 32830, 32825,
+    33018, 33010, 33017, 33013, 33025, 33019, 33024, 33281, 33327, 33317,
+    33587, 33581, 33604, 33561, 33617, 33573, 33622, 33599, 33601, 33574,
+    33564, 33570, 33602, 33614, 33563, 33578, 33544, 33596, 33613, 33558,
+    33572, 33568, 33591, 33583, 33577, 33607, 33605, 33612, 33619, 33566,
+    33580, 33611, 33575, 33608, 34387, 34386, 34466, 34472, 34454, 34445,
+    34449, 34462, 34439, 34455, 34438, 34443, 34458, 34437, 34469, 34457,
+    34465, 34471, 34453, 34456, 34446, 34461, 34448, 34452, {f: 2, c: 34883},
+    34925, {f: 2, c: 34933}, 34930, 34944, 34929, 34943, 34927, 34947, 34942,
+    34932, 34940, 35346, 35911, 35927, 35963, 36004, 36003, 36214, 36216,
+    36277, 36279, 36278, 36561, 36563, 36862, 36853, 36866, 36863, 36859,
+    36868, 36860, 36854, 37078, 37088, {f: 2, c: 37081}, 37091, 37087, 37093,
+    37080, 37083, 37079, 37084, 37092, 37200, {f: 2, c: 37198}, 37333, 37346,
+    37338, 38492, 38495, 38588, 39139, [12221, 39647], [12223, 39727], 20095,
+    20592, 20586, 20577, 20574, 20576, 20563, 20555, 20573, 20594, 20552,
+    20557, 20545, 20571, 20554, 20578, 20501, 20549, 20575, 20585, 20587,
+    {f: 2, c: 20579}, 20550, 20544, 20590, 20595, 20567, 20561, 20944, 21099,
+    21101, 21100, 21102, 21206, 21203, 21293, 21404, {f: 2, c: 21877}, 21820,
+    21837, 21840, 21812, 21802, 21841, 21858, 21814, 21813, 21808, 21842,
+    21829, 21772, 21810, 21861, 21838, 21817, 21832, 21805, 21819, 21824,
+    21835, 22282, 22279, 22523, 22548, 22498, 22518, 22492, 22516, 22528,
+    22509, 22525, 22536, 22520, 22539, 22515, 22479, 22535, 22510, 22499,
+    22514, 22501, 22508, 22497, 22542, 22524, 22544, 22503, 22529, 22540,
+    22513, 22505, 22512, 22541, 22532, 22876, 23136, 23128, 23125,
+    [23143, 60437], 23134, 23096, 23093, 23149, 23120, 23135, 23141, 23148,
+    23123, 23140, 23127, 23107, 23133, 23122, 23108, 23131, 23112, 23182,
+    23102, 23117, 23097, 23116, 23152, 23145, 23111, 23121, 23126, 23106,
+    23132, 23410, 23406, 23489, 23488, 23641, 23838, 23819, 23837, 23834,
+    23840, 23820, 23848, 23821, 23846, 23845, 23823, 23856, 23826, 23843,
+    23839, 23854, 24126, 24116, 24241, 24244, 24249, {f: 2, c: 24242}, 24374,
+    24376, 24475, 24470, 24479, 24714, 24720, 24710, 24766, 24752, 24762,
+    {f: 2, c: 24787}, 24783, 24804, 24793, 24797, 24776, 24753, 24795, 24759,
+    24778, 24767, 24771, 24781, 24768, 25394, 25445, 25482, 25474, 25469,
+    25533, 25502, 25517, 25501, 25495, 25515, 25486, 25455, 25479, 25488,
+    25454, 25519, 25461, 25500, 25453, 25518, 25468, 25508, 25403, 25503,
+    25464, 25477, 25473, 25489, 25485, 25456, 25939, 26061, 26213, 26209,
+    26203, 26201, 26204, 26210, 26392, 26745, 26759, 26768, 26780,
+    {f: 2, c: 26733}, 26798, 26795, 26966, 26735, 26787, 26796, 26793, 26741,
+    26740, 26802, 26767, 26743, 26770, 26748, 26731, 26738, 26794, 26752,
+    26737, 26750, 26779, 26774, 26763, 26784, 26761, 26788, 26744, 26747,
+    26769, 26764, 26762, 26749, 27446, 27443, {f: 2, c: 27447}, 27537, 27535,
+    {f: 2, c: 27533}, 27532, 27690, 28096, 28075, 28084, 28083, 28276, 28076,
+    28137, 28130, 28087, 28150, 28116, 28160, 28104, 28128, 28127, 28118,
+    28094, 28133, {f: 2, c: 28124}, 28123, 28148, 28106, 28093, 28141, 28144,
+    28090, 28117, 28098, 28111, 28105, 28112, 28146, 28115, 28157, 28119,
+    28109, 28131, 28091, 28922, 28941, 28919, 28951, 28916, 28940, 28912,
+    28932, 28915, 28944, 28924, 28927, 28934, 28947, 28928, 28920, 28918,
+    28939, 28930, 28942, 29310, {f: 2, c: 29307}, 29311, 29469, 29463, 29447,
+    29457, 29464, 29450, 29448, 29439, 29455, 29470, 29576, 29686, 29688,
+    29685, 29700, 29697, 29693, 29703, 29696, 29690, 29692, 29695, 29708,
+    29707, 29684, 29704, 30052, 30051, 30158, 30162, 30159, {f: 2, c: 30155},
+    30161, 30160, 30351, 30345, 30419, 30521, 30511, 30509, {f: 2, c: 30513},
+    30516, 30515, 30525, 30501, 30523, 30517, 30792, 30802, 30793, 30797,
+    30794, 30796, 30758, 30789, 30800, 31076, 31079, {f: 2, c: 31081}, 31075,
+    31083, 31073, 31163, 31226, 31224, {f: 2, c: 31222}, 31375, 31380, 31376,
+    31541, 31547, 31540, 31525, 31536, 31522, 31524, 31539, 31512, 31530,
+    31517, 31537, 31531, 31533, 31535, 31538, 31544, 31514, 31523, 31892,
+    31896, 31894, 31907, 32053, 32061, 32056, 32054, 32058, 32069, 32044,
+    32041, 32065, 32071, {f: 2, c: 32062}, 32074, 32059, 32040, 32611, 32661,
+    {f: 2, c: 32668}, 32667, {f: 2, c: 32714}, 32717, {f: 2, c: 32720}, 32711,
+    32719, 32713, 32799, 32798, 32795, 32839, 32835, 32840, 33048, 33061,
+    33049, 33051, 33069, 33055, 33068, 33054, 33057, 33045, 33063, 33053,
+    33058, 33297, 33336, 33331, 33338, 33332, 33330, 33396, 33680, 33699,
+    33704, 33677, 33658, 33651, 33700, 33652, 33679, 33665, 33685, 33689,
+    33653, 33684, 33705, 33661, 33667, 33676, 33693, 33691, 33706, 33675,
+    33662, 33701, 33711, 33672, 33687, 33712, 33663, 33702, 33671, 33710,
+    33654, 34393, 34390, 34495, 34487, 34498, 34497, 34501, 34490, 34480,
+    34504, 34489, 34483, 34488, 34508, 34484, {f: 2, c: 34491}, 34499,
+    {f: 2, c: 34493}, 34898, 34953, 34965, 34984, 34978, 34986, 34970, 34961,
+    34977, 34975, 34968, 34983, 34969, 34971, 34967, 34980, 34988, 34956,
+    34963, 34958, 35202, 35286, 35289, 35285, 35376, 35367, 35372, 35358,
+    35897, 35899, {f: 2, c: 35932}, 35965, 36005, 36221, 36219, 36217, 36284,
+    36290, 36281, 36287, 36289, 36568, 36574, 36573, 36572, 36567,
+    {f: 2, c: 36576}, 36900, 36875, 36881, 36892, 36876, 36897, 37103, 37098,
+    37104, 37108, {f: 2, c: 37106}, 37076, {f: 2, c: 37099}, 37097, 37206,
+    37208, 37210, 37203, 37205, 37356, 37364, 37361, 37363, 37368, 37348,
+    37369, {f: 2, c: 37354}, 37367, 37352, 37358, 38266, 38278, 38280, 38524,
+    38509, 38507, 38513, 38511, 38591, 38762, 38916, 39141, 39319, 20635,
+    20629, 20628, 20638, 20619, 20643, 20611, 20620, 20622, 20637, 20584,
+    20636, 20626, 20610, 20615, 20831, 20948, 21266, 21265, 21412, 21415,
+    21905, 21928, 21925, 21933, 21879, 22085, 21922, 21907, 21896, 21903,
+    21941, 21889, 21923, 21906, 21924, 21885, 21900, 21926, 21887, 21909,
+    21921, 21902, 22284, 22569, 22583, 22553, 22558, 22567, 22563, 22568,
+    22517, 22600, 22565, 22556, 22555, 22579, 22591, 22582, 22574, 22585,
+    22584, 22573, 22572, 22587, 22881, 23215, 23188, 23199, 23162, 23202,
+    23198, 23160, 23206, 23164, 23205, 23212, 23189, 23214, 23095, 23172,
+    23178, 23191, 23171, 23179, 23209, 23163, 23165, 23180, 23196, 23183,
+    23187, 23197, 23530, 23501, 23499, 23508, 23505, 23498, 23502, 23564,
+    23600, 23863, 23875, 23915, 23873, 23883, 23871, 23861, 23889, 23886,
+    23893, 23859, 23866, 23890, 23869, 23857, 23897, 23874, 23865, 23881,
+    23864, 23868, 23858, 23862, 23872, 23877, 24132, 24129, [24408, 57673],
+    24486, 24485, 24491, 24777, 24761, 24780, 24802, 24782, 24772, 24852,
+    24818, 24842, 24854, 24837, 24821, 24851, 24824, 24828, 24830, 24769,
+    24835, 24856, 24861, 24848, 24831, 24836, 24843, 25162, 25492, 25521,
+    25520, 25550, 25573, 25576, 25583, 25539, 25757, 25587, 25546, 25568,
+    25590, 25557, 25586, 25589, 25697, 25567, 25534, 25565, 25564, 25540,
+    25560, 25555, 25538, 25543, 25548, 25547, 25544, 25584, 25559, 25561,
+    25906, 25959, 25962, 25956, 25948, 25960, 25957, 25996, {f: 2, c: 26013},
+    26030, 26064, 26066, 26236, 26220, 26235, 26240, 26225, 26233, 26218,
+    26226, 26369, 26892, 26835, 26884, 26844, 26922, 26860, 26858, 26865,
+    26895, 26838, 26871, 26859, 26852, 26870, 26899, 26896, 26867, 26849,
+    26887, 26828, 26888, 26992, 26804, 26897, 26863, 26822, 26900, 26872,
+    26832, 26877, 26876, 26856, 26891, 26890, 26903, 26830, 26824,
+    {f: 2, c: 26845}, 26854, 26868, 26833, 26886, 26836, 26857, 26901, 26917,
+    26823, 27449, 27451, 27455, 27452, 27540, 27543, 27545, 27541, 27581,
+    27632, {f: 2, c: 27634}, 27696, 28156, {f: 2, c: 28230}, 28191, 28233,
+    28296, {f: 2, c: 28220}, 28229, 28258, 28203, 28223, 28225, 28253, 28275,
+    28188, 28211, 28235, 28224, 28241, 28219, 28163, 28206, 28254, 28264,
+    28252, 28257, 28209, 28200, 28256, 28273, 28267, 28217, 28194, 28208,
+    28243, 28261, 28199, 28280, 28260, 28279, 28245, 28281, 28242, 28262,
+    {f: 2, c: 28213}, 28250, 28960, 28958, 28975, 28923, 28974, 28977, 28963,
+    28965, 28962, 28978, 28959, 28968, 28986, 28955, 29259, 29274,
+    {f: 2, c: 29320}, 29318, 29317, 29323, 29458, 29451, 29488, 29474, 29489,
+    29491, 29479, 29490, 29485, 29478, 29475, 29493, 29452, 29742, 29740,
+    29744, 29739, 29718, 29722, 29729, 29741, 29745, 29732, 29731, 29725,
+    29737, 29728, 29746, 29947, 29999, 30063, 30060, 30183, 30170, 30177,
+    30182, 30173, 30175, 30180, 30167, 30357, 30354, 30426, {f: 2, c: 30534},
+    30532, 30541, 30533, 30538, 30542, {f: 2, c: 30539}, 30686, 30700, 30816,
+    {f: 2, c: 30820}, 30812, 30829, 30833, 30826, 30830, 30832, 30825, 30824,
+    30814, 30818, 31092, 31091, 31090, 31088, 31234, 31242, 31235, 31244,
+    31236, 31385, 31462, 31460, 31562, 31559, 31556, 31560, 31564, 31566,
+    31552, 31576, 31557, 31906, 31902, 31912, 31905, 32088, 32111, 32099,
+    32083, 32086, 32103, 32106, 32079, 32109, 32092, 32107, 32082, 32084,
+    32105, 32081, 32095, 32078, {f: 2, c: 32574}, {f: 2, c: 32613}, 32674,
+    {f: 2, c: 32672}, 32727, 32849, {f: 2, c: 32847}, 33022, 32980, 33091,
+    33098, 33106, 33103, 33095, 33085, 33101, 33082, 33254, 33262,
+    {f: 3, c: 33271}, 33284, {f: 2, c: 33340}, 33343, 33397, 33595,
+    [33743, 60382], 33785, 33827, 33728, 33768, 33810, 33767, 33764, 33788,
+    33782, 33808, 33734, 33736, 33771, 33763, 33727, 33793, 33757, 33765,
+    33752, 33791, 33761, 33739, 33742, 33750, 33781, 33737, 33801,
+    [33807, 58332], 33758, 33809, 33798, 33730, 33779, 33749, 33786, 33735,
+    33745, 33770, 33811, 33690, 33731, 33772, 33774, 33732, 33787, 33751,
+    33762, 33819, 33755, 33790, 34520, 34530, 34534, 34515, 34531, 34522,
+    34538, 34525, 34539, 34524, 34540, 34537, 34519, 34536, 34513, 34888,
+    34902, 34901, 35002, 35031, 35001, 35000, 35008, 35006, 34998, 35004,
+    34999, 35005, 34994, 35073, 35017, 35221, 35224, 35223, 35293,
+    {f: 2, c: 35290}, 35406, 35405, 35385, 35417, 35392, {f: 2, c: 35415},
+    {f: 2, c: 35396}, 35410, 35400, 35409, 35402, 35404, 35407, 35935, 35969,
+    35968, 36026, 36030, 36016, 36025, 36021, 36228, 36224, 36233, 36312,
+    36307, 36301, 36295, 36310, 36316, 36303, 36309, 36313, 36296, 36311,
+    36293, 36591, 36599, 36602, 36601, 36582, 36590, 36581, 36597,
+    {f: 2, c: 36583}, 36598, 36587, 36593, 36588, 36596, 36585, 36909, 36916,
+    36911, 37126, 37164, [37124, 60367], 37119, 37116, 37128, 37113, 37115,
+    37121, 37120, 37127, 37125, 37123, 37217, 37220, 37215, 37218, 37216,
+    37377, 37386, 37413, 37379, 37402, 37414, 37391, 37388, 37376, 37394,
+    37375, 37373, 37382, 37380, 37415, 37378, 37404, 37412, 37401, 37399,
+    37381, 37398, 38267, 38285, 38284, 38288, 38535, 38526, {f: 2, c: 38536},
+    38531, 38528, 38594, 38600, 38595, 38641, 38640, 38764, 38768, 38766,
+    38919, 39081, 39147, 40166, [12235, 40697], {f: 2, c: 20099}, 20150, 20669,
+    20671, 20678, 20654, 20676, 20682, 20660, 20680, 20674, 20656, 20673,
+    20666, 20657, 20683, 20681, 20662, 20664, 20951, 21114, 21112,
+    {f: 2, c: 21115}, 21955, 21979, 21964, 21968, 21963, 21962, 21981,
+    [21952, 64013], 21972, 21956, 21993, 21951, 21970, 21901, 21967, 21973,
+    21986, 21974, 21960, 22002, 21965, 21977, 21954, 22292, 22611, 22632,
+    22628, 22607, 22605, 22601, 22639, 22613, 22606, 22621, 22617, 22629,
+    22619, 22589, 22627, 22641, 22780, 23239, 23236, 23243, 23226, 23224,
+    23217, 23221, 23216, 23231, 23240, 23227, 23238, 23223, 23232, 23242,
+    23220, 23222, 23245, 23225, 23184, 23510, {f: 2, c: 23512}, 23583, 23603,
+    23921, 23907, 23882, 23909, 23922, 23916, 23902, 23912, 23911, 23906,
+    24048, 24143, 24142, 24138, 24141, 24139, 24261, 24268, 24262, 24267,
+    24263, 24384, 24495, 24493, 24823, {f: 2, c: 24905}, 24875, 24901, 24886,
+    24882, 24878, 24902, 24879, 24911, 24873, 24896, 25120, 37224, 25123,
+    25125, 25124, 25541, 25585, 25579, 25616, 25618, 25609, 25632, 25636,
+    25651, 25667, 25631, 25621, 25624, 25657, 25655, {f: 2, c: 25634}, 25612,
+    25638, 25648, 25640, 25665, 25653, 25647, 25610, 25626, 25664, 25637,
+    25639, 25611, 25575, 25627, 25646, 25633, 25614, 25967, 26002, 26067,
+    26246, 26252, 26261, 26256, 26251, 26250, 26265, 26260, 26232, 26400,
+    26982, 26975, 26936, 26958, 26978, 26993, 26943, 26949, 26986, 26937,
+    26946, 26967, 26969, 27002, {f: 2, c: 26952}, 26933, 26988, 26931, 26941,
+    26981, 26864, 27000, 26932, 26985, 26944, 26991, 26948, 26998, 26968,
+    26945, 26996, 26956, 26939, 26955, 26935, 26972, 26959, 26961, 26930,
+    26962, 26927, 27003, 26940, 27462, 27461, 27459, 27458, 27464, 27457,
+    27547, {f: 2, c: 27643}, 27641, {f: 2, c: 27639}, 28315, 28374, 28360,
+    28303, 28352, 28319, {f: 2, c: 28307}, 28320, 28337, 28345, 28358, 28370,
+    28349, 28353, 28318, 28361, 28343, 28336, 28365, 28326, 28367, 28338,
+    28350, 28355, 28380, 28376, 28313, 28306, 28302, 28301, 28324, 28321,
+    28351, 28339, 28368, 28362, 28311, 28334, 28323, 28999, 29012, 29010,
+    29027, 29024, 28993, 29021, [29026, 61080], 29042, 29048, 29034, 29025,
+    28994, 29016, 28995, 29003, 29040, 29023, 29008, 29011, 28996, 29005,
+    29018, 29263, 29325, 29324, 29329, 29328, 29326, 29500, 29506, 29499,
+    29498, 29504, 29514, 29513, 29764, {f: 2, c: 29770}, 29778, 29777, 29783,
+    29760, {f: 2, c: 29775}, 29774, 29762, 29766, 29773, 29780, 29921, 29951,
+    29950, 29949, 29981, 30073, 30071, 27011, 30191, 30223, 30211, 30199,
+    30206, 30204, [30201, 60782], 30200, 30224, 30203, 30198, 30189, 30197,
+    30205, 30361, 30389, 30429, 30549, {f: 2, c: 30559}, 30546, 30550, 30554,
+    30569, 30567, 30548, 30553, 30573, 30688, 30855, 30874, 30868, 30863,
+    30852, 30869, {f: 2, c: 30853}, 30881, 30851, 30841, 30873, 30848, 30870,
+    30843, 31100, 31106, 31101, 31097, 31249, {f: 2, c: 31256}, 31250, 31255,
+    31253, 31266, 31251, 31259, 31248, 31395, 31394, 31390, 31467, 31590,
+    31588, 31597, 31604, 31593, 31602, 31589, 31603, 31601, 31600, 31585,
+    31608, 31606, 31587, 31922, 31924, 31919, 32136, 32134, 32128, 32141,
+    32127, 32133, 32122, 32142, 32123, 32131, 32124, 32140, 32148, 32132,
+    32125, 32146, 32621, 32619, {f: 2, c: 32615}, 32620, 32678, 32677, 32679,
+    {f: 2, c: 32731}, 32801, 33124, 33120, 33143, 33116, 33129, 33115, 33122,
+    33138, 26401, 33118, 33142, 33127, 33135, 33092, 33121, 33309, 33353,
+    33348, 33344, 33346, 33349, 34033, 33855, 33878, 33910, 33913, 33935,
+    33933, 33893, 33873, 33856, 33926, 33895, 33840, 33869, 33917, 33882,
+    33881, 33908, 33907, 33885, 34055, 33886, 33847, 33850, 33844, 33914,
+    33859, 33912, 33842, 33861, 33833, 33753, 33867, 33839, 33858, 33837,
+    33887, 33904, 33849, 33870, 33868, 33874, 33903, 33989, 33934, 33851,
+    33863, 33846, 33843, 33896, 33918, 33860, 33835, 33888, 33876, 33902,
+    33872, 34571, 34564, 34551, 34572, 34554, 34518, 34549, 34637, 34552,
+    34574, 34569, 34561, 34550, 34573, 34565, 35030, 35019, {f: 2, c: 35021},
+    35038, 35035, 35034, 35020, 35024, 35205, 35227, 35295, 35301, 35300,
+    35297, 35296, 35298, 35292, 35302, 35446, 35462, 35455, 35425, 35391,
+    35447, 35458, 35460, 35445, 35459, 35457, 35444, 35450, 35900, 35915,
+    35914, 35941, 35940, 35942, 35974, {f: 2, c: 35972}, 36044,
+    {f: 2, c: 36200}, 36241, 36236, {f: 2, c: 36238}, 36237, {f: 2, c: 36243},
+    36240, 36242, 36336, 36320, 36332, 36337, 36334, 36304, 36329, 36323,
+    36322, 36327, 36338, 36331, 36340, 36614, 36607, 36609, 36608, 36613,
+    {f: 2, c: 36615}, 36610, [36619, 60507], 36946, 36927, 36932, 36937, 36925,
+    37136, 37133, 37135, 37137, 37142, 37140, 37131, 37134, {f: 2, c: 37230},
+    37448, 37458, 37424, 37434, 37478, 37427, 37477, 37470, 37507, 37422,
+    37450, 37446, 37485, 37484, 37455, 37472, 37479, 37487, 37430, 37473,
+    37488, 37425, 37460, 37475, 37456, 37490, 37454, 37459, 37452, 37462,
+    37426, 38303, 38300, 38302, 38299, {f: 2, c: 38546}, 38545, 38551, 38606,
+    38650, 38653, 38648, 38645, 38771, {f: 2, c: 38775}, 38770, 38927,
+    {f: 2, c: 38925}, 39084, 39158, 39161, 39343, 39346, 39344, 39349, 39597,
+    39595, 39771, 40170, 40173, 40167, 40576, [12236, 40701], 20710, 20692,
+    20695, 20712, 20723, 20699, 20714, 20701, 20708, 20691, 20716, 20720,
+    20719, 20707, 20704, 20952, {f: 2, c: 21120}, 21225, 21227, 21296, 21420,
+    22055, 22037, 22028, 22034, 22012, 22031, 22044, 22017, 22035, 22018,
+    22010, 22045, 22020, 22015, 22009, 22665, 22652, 22672, 22680, 22662,
+    22657, 22655, 22644, 22667, 22650, 22663, 22673, 22670, 22646, 22658,
+    22664, 22651, 22676, 22671, 22782, 22891, 23260, 23278, 23269, 23253,
+    23274, 23258, 23277, 23275, 23283, 23266, 23264, 23259, 23276, 23262,
+    23261, 23257, 23272, 23263, 23415, 23520, 23523, 23651, 23938, 23936,
+    23933, 23942, 23930, 23937, 23927, 23946, 23945, 23944, 23934, 23932,
+    23949, 23929, 23935, {f: 2, c: 24152}, 24147, 24280, 24273, 24279, 24270,
+    24284, 24277, 24281, 24274, 24276, 24388, 24387, 24431, 24502, 24876,
+    24872, 24897, 24926, 24945, 24947, {f: 2, c: 24914}, 24946, 24940, 24960,
+    24948, 24916, 24954, 24923, 24933, 24891, 24938, 24929, 24918, 25129,
+    25127, 25131, 25643, 25677, 25691, 25693, 25716, 25718, {f: 2, c: 25714},
+    25725, 25717, 25702, 25766, 25678, 25730, 25694, 25692, 25675, 25683,
+    25696, 25680, 25727, 25663, 25708, 25707, 25689, 25701, 25719, 25971,
+    26016, 26273, 26272, 26271, 26373, 26372, 26402, 27057, 27062, 27081,
+    27040, 27086, 27030, 27056, 27052, 27068, 27025, 27033, 27022, 27047,
+    27021, 27049, 27070, 27055, 27071, 27076, 27069, 27044, 27092, 27065,
+    27082, 27034, 27087, 27059, 27027, 27050, 27041, 27038, 27097, 27031,
+    27024, 27074, 27061, 27045, 27078, 27466, 27469, 27467, {f: 3, c: 27550},
+    {f: 2, c: 27587}, 27646, 28366, 28405, 28401, 28419, 28453, 28408, 28471,
+    28411, 28462, 28425, 28494, {f: 2, c: 28441}, 28455, 28440, 28475, 28434,
+    28397, 28426, 28470, 28531, 28409, 28398, 28461, 28480, 28464, 28476,
+    28469, 28395, 28423, 28430, 28483, 28421, 28413, 28406, 28473, 28444,
+    28412, 28474, 28447, 28429, 28446, 28424, 28449, 29063, 29072, 29065,
+    29056, 29061, 29058, 29071, 29051, 29062, 29057, 29079, 29252, 29267,
+    29335, 29333, 29331, 29507, 29517, 29521, 29516, 29794, 29811, 29809,
+    29813, 29810, 29799, 29806, 29952, {f: 2, c: 29954}, 30077, 30096, 30230,
+    30216, 30220, 30229, 30225, 30218, 30228, 30392, 30593, 30588, 30597,
+    30594, 30574, 30592, 30575, 30590, 30595, 30898, 30890, 30900, 30893,
+    30888, 30846, 30891, 30878, 30885, 30880, 30892, 30882, 30884, 31128,
+    {f: 2, c: 31114}, 31126, 31125, 31124, 31123, 31127, 31112, 31122, 31120,
+    31275, 31306, 31280, 31279, 31272, 31270, 31400, {f: 2, c: 31403}, 31470,
+    31624, 31644, 31626, 31633, 31632, 31638, 31629, 31628, 31643, 31630,
+    31621, 31640, 21124, 31641, 31652, 31618, 31931, 31935, 31932, 31930,
+    32167, 32183, 32194, 32163, 32170, 32193, 32192, 32197, 32157, 32206,
+    32196, 32198, {f: 2, c: 32203}, 32175, 32185, 32150, 32188, 32159, 32166,
+    32174, 32169, 32161, 32201, 32627, {f: 2, c: 32738}, 32741, 32734, 32804,
+    32861, 32860, 33161, 33158, 33155, 33159, 33165, 33164, 33163, 33301,
+    33943, 33956, 33953, 33951, 33978, 33998, 33986, 33964, 33966, 33963,
+    33977, 33972, 33985, 33997, 33962, 33946, 33969, 34000, 33949, 33959,
+    33979, 33954, 33940, 33991, 33996, 33947, 33961, 33967, [33960, 58327],
+    34006, 33944, 33974, 33999, 33952, 34007, 34004, 34002, 34011, 33968,
+    33937, 34401, 34611, 34595, 34600, 34667, 34624, 34606, 34590, 34593,
+    34585, 34587, 34627, 34604, 34625, 34622, 34630, 34592, 34610, 34602,
+    34605, 34620, 34578, 34618, 34609, 34613, 34626, {f: 2, c: 34598}, 34616,
+    34596, 34586, 34608, 34577, 35063, 35047, {f: 2, c: 35057}, 35066, 35070,
+    35054, 35068, 35062, 35067, 35056, 35052, 35051, 35229, 35233, 35231,
+    35230, 35305, 35307, 35304, 35499, 35481, 35467, 35474, 35471, 35478,
+    35901, {f: 2, c: 35944}, 36053, 36047, 36055, 36246, 36361, 36354, 36351,
+    36365, 36349, 36362, 36355, 36359, 36358, 36357, 36350, 36352, 36356,
+    {f: 2, c: 36624}, 36622, 36621, 37155, 37148, 37152, 37154, 37151, 37149,
+    37146, 37156, 37153, 37147, 37242, 37234, 37241, 37235, 37541, 37540,
+    37494, 37531, 37498, 37536, 37524, 37546, 37517, 37542, 37530, 37547,
+    37497, 37527, 37503, 37539, 37614, 37518, 37506, 37525, 37538, 37501,
+    37512, 37537, 37514, 37510, 37516, 37529, 37543, 37502, 37511, 37545,
+    37533, 37515, 37421, 38558, 38561, 38655, 38744, 38781, 38778, 38782,
+    38787, 38784, 38786, 38779, 38788, 38785, 38783, 38862, 38861, 38934,
+    {f: 2, c: 39085}, 39170, 39168, 39175, 39325, 39324, 39363, 39353, 39355,
+    39354, 39362, 39357, 39367, 39601, 39651, 39655, {f: 2, c: 39742},
+    {f: 2, c: 39776}, 39775, {f: 2, c: 40177}, 40181, 40615, 20735, 20739,
+    20784, 20728, {f: 2, c: 20742}, 20726, 20734, {f: 2, c: 20747}, 20733,
+    20746, {f: 2, c: 21131}, 21233, 21231, 22088, 22082, 22092, 22069, 22081,
+    22090, 22089, 22086, 22104, 22106, 22080, 22067, 22077, 22060, 22078,
+    22072, 22058, 22074, 22298, 22699, 22685, 22705, 22688, 22691, 22703,
+    22700, 22693, 22689, 22783, 23295, 23284, 23293, 23287, 23286, 23299,
+    23288, 23298, 23289, 23297, 23303, 23301, 23311, 23655, 23961, 23959,
+    23967, 23954, 23970, 23955, 23957, 23968, 23964, 23969, 23962, 23966,
+    24169, 24157, 24160, 24156, 32243, 24283, 24286, 24289, 24393, 24498,
+    24971, 24963, 24953, 25009, 25008, 24994, 24969, 24987, 24979, 25007,
+    25005, 24991, 24978, 25002, 24993, 24973, 24934, 25011, 25133, 25710,
+    25712, 25750, 25760, 25733, 25751, 25756, 25743, 25739, 25738, 25740,
+    25763, 25759, 25704, 25777, 25752, 25974, 25978, 25977, 25979,
+    {f: 2, c: 26034}, 26293, 26288, 26281, 26290, 26295, 26282, 26287, 27136,
+    27142, 27159, 27109, 27128, 27157, 27121, 27108, 27168, 27135, 27116,
+    27106, 27163, 27165, 27134, 27175, 27122, 27118, 27156, 27127, 27111,
+    27200, 27144, 27110, 27131, 27149, 27132, 27115, 27145, 27140, 27160,
+    27173, 27151, 27126, 27174, 27143, 27124, 27158, 27473, 27557, 27555,
+    27554, 27558, 27649, 27648, 27647, 27650, 28481, 28454, 28542, 28551,
+    28614, 28562, 28557, 28553, 28556, 28514, 28495, 28549, 28506, 28566,
+    28534, 28524, 28546, 28501, 28530, 28498, 28496, 28503, 28564, 28563,
+    28509, 28416, 28513, 28523, 28541, 28519, 28560, 28499, 28555, 28521,
+    28543, 28565, 28515, 28535, 28522, 28539, 29106, 29103, 29083, 29104,
+    29088, 29082, 29097, 29109, 29085, 29093, 29086, 29092, 29089, 29098,
+    29084, 29095, 29107, 29336, 29338, 29528, 29522, {f: 3, c: 29534}, 29533,
+    29531, 29537, 29530, 29529, 29538, 29831, {f: 2, c: 29833}, 29830, 29825,
+    29821, 29829, 29832, 29820, [29817, 58868], 29960, 29959, 30078, 30245,
+    30238, 30233, 30237, 30236, 30243, 30234, 30248, 30235, {f: 3, c: 30364},
+    30363, 30605, 30607, 30601, 30600, 30925, 30907, 30927, 30924, 30929,
+    30926, 30932, 30920, {f: 2, c: 30915}, 30921, 31130, 31137, 31136, 31132,
+    31138, [31131, 59175], 27510, 31289, 31410, 31412, 31411, 31671, 31691,
+    31678, 31660, 31694, 31663, 31673, 31690, 31669, 31941, 31944, 31948,
+    31947, 32247, 32219, 32234, 32231, 32215, 32225, 32259, 32250, 32230,
+    32246, 32241, 32240, 32238, 32223, 32630, 32684, 32688, 32685, 32749,
+    32747, 32746, 32748, 32742, 32744, 32868, 32871, 33187, 33183, 33182,
+    33173, 33186, 33177, 33175, 33302, 33359, 33363, 33362, 33360, 33358,
+    33361, 34084, 34107, 34063, 34048, 34089, 34062, 34057, 34061, 34079,
+    34058, 34087, 34076, 34043, 34091, 34042, 34056, 34060, 34036, 34090,
+    34034, 34069, 34039, 34027, 34035, 34044, 34066, 34026, 34025, 34070,
+    34046, 34088, 34077, 34094, 34050, 34045, 34078, 34038, 34097, 34086,
+    {f: 2, c: 34023}, 34032, 34031, 34041, 34072, 34080, 34096, 34059, 34073,
+    34095, 34402, 34646, {f: 2, c: 34659}, 34679, 34785, 34675, 34648, 34644,
+    34651, 34642, 34657, 34650, 34641, 34654, 34669, 34666, 34640, 34638,
+    34655, 34653, 34671, 34668, 34682, 34670, 34652, 34661, 34639, 34683,
+    34677, 34658, 34663, 34665, 34906, 35077, 35084, 35092, 35083,
+    {f: 3, c: 35095}, 35078, 35094, 35089, 35086, 35081, 35234, 35236, 35235,
+    35309, 35312, 35308, 35535, 35526, 35512, 35539, 35537, {f: 2, c: 35540},
+    35515, 35543, 35518, 35520, 35525, 35544, 35523, 35514, 35517, 35545,
+    35902, 35917, 35983, 36069, 36063, 36057, 36072, 36058, 36061, 36071,
+    36256, 36252, 36257, 36251, 36384, 36387, 36389, 36388, 36398, 36373,
+    36379, 36374, 36369, 36377, {f: 2, c: 36390}, 36372, 36370, 36376, 36371,
+    36380, 36375, 36378, 36652, 36644, 36632, 36634, 36640, 36643,
+    {f: 2, c: 36630}, 36979, 36976, 36975, 36967, 36971, 37167, 37163,
+    {f: 2, c: 37161}, 37170, 37158, 37166, {f: 2, c: 37253}, 37258,
+    {f: 2, c: 37249}, 37252, 37248, 37584, {f: 2, c: 37571}, 37568, 37593,
+    37558, 37583, 37617, 37599, 37592, 37609, 37591, 37597, 37580, 37615,
+    37570, 37608, 37578, 37576, 37582, 37606, 37581, 37589, 37577, 37600,
+    37598, 37607, 37585, 37587, 37557, 37601, 37669, 37574, 37556, 38268,
+    38316, 38315, 38318, 38320, 38564, 38562, 38611, 38661, 38664, 38658,
+    38746, 38794, 38798, 38792, 38864, 38863, 38942, 38941, 38950, 38953,
+    38952, 38944, 38939, 38951, 39090, 39176, 39162, 39185, 39188,
+    {f: 2, c: 39190}, 39189, 39388, 39373, 39375, {f: 2, c: 39379}, 39374,
+    39369, [39382, 60270], 39384, 39371, 39383, 39372, 39603, 39660, 39659,
+    39667, 39666, 39665, 39750, 39747, 39783, 39796, 39793, 39782, 39798,
+    39797, 39792, 39784, 39780, 39788, 40188, 40186, 40189, 40191, 40183,
+    40199, 40192, 40185, 40187, 40200, 40197, 40196, 40579, 40659,
+    {f: 2, c: 40719}, 20764, 20755, 20759, 20762, 20753, 20958, 21300, 21473,
+    22128, 22112, 22126, 22131, 22118, 22115, 22125, 22130, 22110, 22135,
+    22300, 22299, 22728, 22717, 22729, 22719, 22714, 22722, 22716, 22726,
+    23319, 23321, 23323, 23329, 23316, 23315, 23312, 23318, [23336, 59539],
+    23322, 23328, 23326, 23535, 23980, 23985, 23977, 23975, 23989, 23984,
+    23982, 23978, 23976, 23986, 23981, 23983, 23988, {f: 2, c: 24167}, 24166,
+    24175, 24297, 24295, 24294, 24296, 24293, 24395, 24508, 24507, 24989,
+    25000, 24982, 25029, 25012, 25030, 25025, 25036, 25018, 25023, 25016,
+    24972, 25815, 25814, 25808, 25807, 25801, 25789, 25737, 25795, 25819,
+    25843, 25817, 25907, 25983, 25980, 26018, 26312, 26302, 26304,
+    {f: 2, c: 26314}, 26319, 26301, 26299, 26298, 26316, 26403, 27188, 27238,
+    27209, 27239, 27186, 27240, 27198, 27229, 27245, 27254, 27227, 27217,
+    27176, 27226, 27195, 27199, 27201, 27242, 27236, 27216, 27215, 27220,
+    27247, 27241, 27232, 27196, 27230, 27222, 27221, {f: 2, c: 27213}, 27206,
+    27477, 27476, 27478, 27559, {f: 2, c: 27562}, 27592, 27591, 27652, 27651,
+    27654, 28589, 28619, 28579, 28615, 28604, 28622, 28616, 28510, 28612,
+    28605, 28574, 28618, 28584, 28676, 28581, 28590, 28602, 28588, 28586,
+    28623, 28607, 28600, 28578, 28617, 28587, 28621, 28591, 28594, 28592,
+    29125, 29122, 29119, 29112, 29142, {f: 2, c: 29120}, 29131, 29140, 29130,
+    29127, 29135, 29117, 29144, 29116, 29126, {f: 2, c: 29146},
+    {f: 2, c: 29341}, 29545, {f: 2, c: 29542}, 29548, 29541, 29547, 29546,
+    29823, 29850, 29856, 29844, 29842, 29845, 29857, 29963, 30080, 30255,
+    30253, 30257, 30269, 30259, 30268, 30261, 30258, 30256, 30395, 30438,
+    30618, 30621, 30625, 30620, 30619, {f: 2, c: 30626}, 30613, 30617, 30615,
+    30941, 30953, 30949, 30954, 30942, 30947, 30939, {f: 2, c: 30945}, 30957,
+    {f: 2, c: 30943}, 31140, 31300, 31304, 31303, 31414, 31416, 31413, 31409,
+    31415, 31710, 31715, 31719, 31709, 31701, 31717, 31706, 31720, 31737,
+    31700, 31722, 31714, 31708, 31723, 31704, 31711, 31954, 31956, 31959,
+    {f: 2, c: 31952}, 32274, 32289, 32279, 32268, {f: 2, c: 32287}, 32275,
+    32270, 32284, 32277, 32282, 32290, 32267, 32271, 32278, 32269, 32276,
+    32293, 32292, 32579, {f: 2, c: 32635}, 32634, 32689, 32751, 32810, 32809,
+    32876, 33201, 33190, 33198, 33209, 33205, 33195, 33200, 33196, 33204,
+    33202, 33207, 33191, 33266, {f: 3, c: 33365}, 34134, 34117, 34155, 34125,
+    34131, 34145, 34136, 34112, 34118, 34148, 34113, 34146, 34116, 34129,
+    34119, 34147, 34110, 34139, 34161, 34126, 34158, 34165, 34133, 34151,
+    34144, 34188, 34150, 34141, 34132, 34149, 34156, 34403, 34405, 34404,
+    34724, 34715, 34703, 34711, 34707, 34706, 34696, 34689, 34710, 34712,
+    34681, 34695, 34723, 34693, {f: 2, c: 34704}, 34717, 34692, 34708, 34716,
+    34714, 34697, 35102, 35110, 35120, {f: 2, c: 35117}, 35111, 35121, 35106,
+    35113, 35107, 35119, 35116, 35103, 35313, 35552, 35554, 35570,
+    {f: 2, c: 35572}, 35549, 35604, 35556, 35551, 35568, 35528, 35550, 35553,
+    35560, 35583, 35567, 35579, {f: 2, c: 35985}, 35984, 36085, 36078, 36081,
+    36080, 36083, 36204, 36206, 36261, 36263, 36403, 36414, 36408, 36416,
+    36421, 36406, {f: 2, c: 36412}, 36417, 36400, 36415, 36541, [36662, 60329],
+    36654, 36661, 36658, 36665, 36663, 36660, 36982, 36985, 36987, 36998,
+    37114, 37171, {f: 2, c: 37173}, 37267, {f: 2, c: 37264}, 37261, 37263,
+    37671, 37662, 37640, 37663, 37638, 37647, 37754, 37688, 37692, 37659,
+    37667, 37650, 37633, 37702, 37677, 37646, 37645, 37579, 37661, 37626,
+    37651, 37625, 37623, 37684, 37634, 37668, 37631, 37673, 37689, 37685,
+    37674, 37652, 37644, 37643, 37630, 37641, 37632, 37627, 37654, 38332,
+    38349, 38334, {f: 2, c: 38329}, 38326, 38335, 38325, 38333, 38569, 38612,
+    38667, 38674, 38672, 38809, 38807, 38804, 38896, 38904, 38965, 38959,
+    38962, 39204, 39199, 39207, 39209, 39326, 39406, 39404, 39397, 39396,
+    39408, 39395, 39402, 39401, 39399, 39609, 39615, 39604, 39611, 39670,
+    39674, 39673, 39671, 39731, 39808, 39813, 39815, 39804, 39806, 39803,
+    39810, 39827, 39826, 39824, 39802, 39829, 39805, 39816, 40229, 40215,
+    40224, 40222, 40212, 40233, 40221, 40216, 40226, 40208, 40217, 40223,
+    40584, {f: 2, c: 40582}, 40622, 40621, {f: 2, c: 40661}, 40698, 40722,
+    40765, 20774, 20773, 20770, 20772, 20768, 20777, 21236, 22163,
+    {f: 2, c: 22156}, 22150, 22148, 22147, 22142, 22146, 22143, 22145, 22742,
+    22740, 22735, 22738, 23341, 23333, 23346, 23331, 23340, 23335, 23334,
+    23343, 23342, 23419, {f: 2, c: 23537}, 23991, 24172, 24170, 24510, 25027,
+    25013, 25020, 25063, 25056, 25061, 25060, 25064, 25054, 25839, 25833,
+    25827, 25835, 25828, 25832, 25985, 25984, 26038, 26074, 26322, 27277,
+    27286, 27265, 27301, 27273, 27295, 27291, 27297, 27294, 27271, 27283,
+    27278, 27285, 27267, 27304, 27300, 27281, 27263, 27302, 27290, 27269,
+    27276, 27282, 27483, 27565, 27657, 28620, 28585, 28660, 28628, 28643,
+    28636, 28653, 28647, 28646, 28638, 28658, 28637, 28642, 28648, 29153,
+    29169, 29160, 29170, 29156, 29168, 29154, 29555, {f: 2, c: 29550}, 29847,
+    29874, 29867, 29840, 29866, 29869, 29873, 29861, 29871, {f: 3, c: 29968},
+    29967, 30084, 30275, {f: 2, c: 30280}, 30279, 30372, 30441, 30645, 30635,
+    30642, 30647, 30646, 30644, 30641, 30632, 30704, 30963, 30973, 30978,
+    {f: 2, c: 30971}, 30975, 30962, 30981, 30969, 30974, 30980, 31147, 31144,
+    31324, 31323, 31318, 31320, 31316, 31322, 31422, {f: 2, c: 31424}, 31749,
+    31759, 31730, 31744, 31743, 31739, 31758, 31732, 31755, 31731, 31746,
+    31753, 31747, 31745, 31736, 31741, [31750, 58176], {f: 2, c: 31728}, 31760,
+    31754, 31976, 32301, 32316, 32322, 32307, 38984, 32312, 32298, 32329,
+    32320, 32327, 32297, 32332, 32304, 32315, 32310, 32324, 32314, 32581,
+    32639, 32638, 32637, 32756, 32754, 32812, 33211, 33220, 33228, 33226,
+    33221, 33223, 33212, 33257, 33371, 33370, 33372, 34179, 34176, 34191,
+    34215, 34197, 34208, 34187, 34211, 34171, 34212, 34202, 34206, 34167,
+    34172, 34185, 34209, 34170, 34168, 34135, 34190, 34198, 34182, 34189,
+    34201, 34205, 34177, 34210, 34178, 34184, 34181, 34169, 34166, 34200,
+    34192, 34207, 34408, 34750, 34730, 34733, 34757, 34736, 34732, 34745,
+    34741, 34748, 34734, 34761, 34755, 34754, 34764, 34743, 34735, 34756,
+    34762, 34740, 34742, 34751, 34744, 34749, 34782, 34738, 35125, 35123,
+    35132, 35134, 35137, 35154, 35127, 35138, 35245, 35247, 35246,
+    {f: 2, c: 35314}, 35614, 35608, 35606, 35601, 35589, 35595, 35618, 35599,
+    35602, 35605, 35591, 35597, 35592, 35590, 35612, 35603, 35610, 35919,
+    35952, 35954, 35953, 35951, 35989, 35988, 36089, 36207, 36430, 36429,
+    36435, 36432, 36428, 36423, 36675, 36672, 36997, 36990, 37176, 37274,
+    37282, 37275, 37273, 37279, 37281, 37277, 37280, 37793, 37763, 37807,
+    37732, 37718, 37703, 37756, 37720, 37724, 37750, 37705, {f: 2, c: 37712},
+    37728, 37741, 37775, 37708, 37738, 37753, 37719, 37717, 37714, 37711,
+    37745, 37751, 37755, 37729, 37726, 37731, 37735, 37710, 37721, 38343,
+    38336, 38345, 38339, 38341, 38327, 38574, 38576, 38572, 38688, 38687,
+    38680, 38685, 38681, 38810, 38817, 38812, 38814, 38813, 38869, 38868,
+    38897, 38977, 38980, 38986, 38985, 38981, 38979, 39205, {f: 2, c: 39211},
+    39210, 39219, 39218, 39215, 39213, 39217, 39216, 39320, 39331, 39329,
+    39426, 39418, 39412, 39415, 39417, 39416, 39414, 39419, {f: 2, c: 39421},
+    39420, 39427, 39614, 39678, 39677, 39681, 39676, 39752, 39834, 39848,
+    39838, 39835, 39846, 39841, 39845, 39844, 39814, 39842, 39840, 39855,
+    40243, 40257, 40295, 40246, {f: 2, c: 40238}, 40241, 40248, 40240, 40261,
+    {f: 2, c: 40258}, 40254, 40247, 40256, 40253, 32757, 40237, 40586, 40585,
+    40589, 40624, 40648, 40666, 40699, 40703, 40740, 40739, 40738, 40788,
+    [12245, 40864], 20785, {f: 2, c: 20781}, 22168, 22172, 22167, 22170, 22173,
+    22169, 22896, 23356, {f: 2, c: 23657}, 24000, {f: 2, c: 24173}, 25048,
+    25055, {f: 2, c: 25069}, 25073, 25066, 25072, 25067, 25046, 25065, 25855,
+    25860, 25853, 25848, 25857, 25859, 25852, 26004, 26075, {f: 2, c: 26330},
+    26328, 27333, 27321, 27325, 27361, 27334, 27322, {f: 2, c: 27318}, 27335,
+    27316, 27309, 27486, 27593, 27659, 28679, {f: 2, c: 28684}, 28673, 28677,
+    28692, 28686, {f: 2, c: 28671}, 28667, 28710, 28668, 28663, 28682,
+    [29185, 60224], 29183, 29177, 29187, 29181, 29558, 29880, 29888, 29877,
+    29889, 29886, 29878, 29883, 29890, 29972, 29971, 30300, 30308, 30297,
+    30288, 30291, 30295, 30298, 30374, 30397, 30444, 30658, 30650, 30988,
+    {f: 2, c: 30995}, 30985, 30992, 30994, 30993, 31149, 31148, 31327, 31772,
+    31785, 31769, 31776, 31775, 31789, 31773, 31782, 31784, 31778, 31781,
+    31792, 32348, 32336, 32342, 32355, 32344, 32354, 32351, 32337, 32352,
+    32343, 32339, 32693, 32691, {f: 2, c: 32759}, 32885, {f: 2, c: 33233},
+    33232, 33375, 33374, 34228, 34246, 34240, 34243, 34242, 34227, 34229,
+    34237, 34247, 34244, 34239, 34251, 34254, 34248, 34245, 34225, 34230,
+    34258, 34340, 34232, 34231, 34238, 34409, 34791, 34790, 34786, 34779,
+    34795, 34794, 34789, 34783, 34803, 34788, 34772, 34780, 34771, 34797,
+    34776, 34787, 34775, 34777, 34817, 34804, 34792, 34781, 35155, 35147,
+    35151, 35148, 35142, {f: 2, c: 35152}, 35145, 35626, 35623, 35619, 35635,
+    35632, 35637, 35655, 35631, 35644, 35646, 35633, 35621, 35639, 35622,
+    35638, 35630, 35620, 35643, 35645, 35642, 35906, 35957, 35993, 35992,
+    35991, 36094, 36100, 36098, 36096, 36444, 36450, 36448, 36439, 36438,
+    36446, 36453, 36455, 36443, 36442, 36449, 36445, 36457, 36436,
+    {f: 3, c: 36678}, 36683, 37160, {f: 2, c: 37178}, 37182, 37288, 37285,
+    37287, 37295, 37290, 37813, 37772, 37778, 37815, 37787, 37789, 37769,
+    37799, 37774, 37802, 37790, 37798, 37781, 37768, 37785, 37791, 37760,
+    37773, 37809, 37777, 37810, 37796, 37800, 37812, 37795, {f: 2, c: 38354},
+    38353, 38579, 38615, 38618, 24002, 38623, 38616, 38621, 38691, 38690,
+    38693, 38828, 38830, 38824, 38827, 38820, 38826, 38818, 38821, 38871,
+    38873, 38870, 38872, 38906, {f: 3, c: 38992}, 39096, 39233, 39228, 39226,
+    39439, 39435, 39433, 39437, 39428, 39441, 39434, 39429, 39431, 39430,
+    39616, 39644, 39688, {f: 2, c: 39684}, 39721, 39733, 39754, 39756, 39755,
+    39879, 39878, 39875, 39871, 39873, 39861, 39864, 39891, 39862, 39876,
+    39865, 39869, 40284, 40275, 40271, 40266, 40283, 40267, 40281, 40278,
+    40268, 40279, 40274, 40276, 40287, 40280, 40282, 40590, 40588, 40671,
+    40705, 40704, [40726, 58693], 40741, 40747, 40746, 40745, 40744, 40780,
+    40789, {f: 2, c: 20788}, 21142, 21239, 21428, 22187, 22189,
+    {f: 2, c: 22182}, 22186, 22188, 22746, 22749, 22747, 22802,
+    {f: 3, c: 23357}, 24003, 24176, 24511, 25083, 25863, 25872, 25869, 25865,
+    25868, 25870, 25988, 26078, 26077, 26334, 27367, 27360, 27340, 27345,
+    27353, 27339, 27359, 27356, 27344, 27371, 27343, 27341, 27358, 27488,
+    27568, 27660, 28697, 28711, 28704, 28694, 28715, {f: 3, c: 28705}, 28713,
+    28695, 28708, 28700, 29196, 29194, 29191, 29186, 29189, {f: 2, c: 29349},
+    29348, 29347, 29345, 29899, 29893, 29879, 29891, 29974, 30304,
+    {f: 2, c: 30665}, 30660, 30705, 31005, 31003, 31009, 31004, 30999, 31006,
+    31152, {f: 2, c: 31335}, 31795, 31804, 31801, 31788, 31803, 31980, 31978,
+    32374, 32373, 32376, 32368, 32375, 32367, 32378, 32370, 32372, 32360,
+    32587, 32586, 32643, 32646, 32695, {f: 2, c: 32765}, 32888, 33239, 33237,
+    33291, 33380, 33377, 33379, 34283, 34289, 34285, 34265, 34273, 34280,
+    34266, 34263, 34284, 34290, 34296, 34264, 34271, 34275, 34268, 34257,
+    34288, 34278, 34287, 34270, 34274, 34816, 34810, 34819, {f: 2, c: 34806},
+    34825, 34828, 34827, 34822, 34812, 34824, 34815, 34826, 34818, 35170,
+    {f: 2, c: 35162}, 35159, 35169, 35164, 35160, 35165, 35161, 35208, 35255,
+    35254, 35318, 35664, 35656, 35658, 35648, 35667, 35670, 35668, 35659,
+    35669, 35665, 35650, 35666, 35671, 35907, 35959, 35958, 35994,
+    {f: 2, c: 36102}, 36105, 36268, 36266, 36269, 36267, 36461, 36472, 36467,
+    36458, 36463, 36475, 36546, 36690, 36689, {f: 2, c: 36687}, 36691, 36788,
+    37184, 37183, 37296, 37293, 37854, 37831, 37839, 37826, 37850, 37840,
+    37881, 37868, 37836, 37849, 37801, 37862, 37834, 37844, 37870, 37859,
+    37845, 37828, 37838, 37824, 37842, 37797, 37863, 38269, {f: 2, c: 38362},
+    38625, 38697, {f: 2, c: 38699}, 38696, 38694, 38835, 38839, 38838,
+    {f: 3, c: 38877}, 39004, 39001, 39005, 38999, 39103, 39101, 39099, 39102,
+    39240, 39239, 39235, {f: 2, c: 39334}, 39450, 39445, 39461, 39453, 39460,
+    39451, 39458, 39456, 39463, 39459, 39454, 39452, 39444, 39618, 39691,
+    39690, 39694, 39692, 39735, {f: 2, c: 39914}, 39904, 39902, 39908, 39910,
+    39906, 39920, 39892, 39895, 39916, 39900, 39897, 39909, 39893, 39905,
+    39898, 40311, 40321, 40330, 40324, 40328, 40305, 40320, 40312, 40326,
+    {f: 2, c: 40331}, 40317, 40299, {f: 2, c: 40308}, 40304, 40297, 40325,
+    40307, 40315, 40322, 40303, 40313, 40319, 40327, 40296, 40596, 40593,
+    40640, 40700, 40749, {f: 2, c: 40768}, 40781, {f: 3, c: 40790}, 21303,
+    22194, 22197, 22195, 22755, 23365, {f: 2, c: 24006}, {f: 2, c: 24302},
+    {f: 2, c: 24512}, 25081, 25879, 25878, 25877, 25875, 26079, 26344,
+    {f: 2, c: 26339}, 27379, 27376, 27370, 27368, 27385, 27377,
+    {f: 2, c: 27374}, 28732, 28725, 28719, 28727, 28724, 28721, 28738, 28728,
+    28735, 28730, 28729, 28714, 28736, 28731, 28723, 28737, {f: 2, c: 29203},
+    29352, 29565, 29564, 29882, 30379, 30378, 30398, 30445, 30668,
+    {f: 2, c: 30670}, 30669, 30706, 31013, 31011, {f: 2, c: 31015}, 31012,
+    31017, 31154, 31342, {f: 2, c: 31340}, 31479, 31817, 31816, 31818, 31815,
+    31813, 31982, 32379, 32382, 32385, 32384, 32698, 32767, 32889, 33243,
+    33241, {f: 2, c: 33384}, 34338, 34303, 34305, 34302, 34331, 34304, 34294,
+    34308, 34313, 34309, 34316, 34301, 34841, {f: 2, c: 34832}, 34839, 34835,
+    34838, 35171, 35174, 35257, 35319, 35680, 35690, 35677, 35688, 35683,
+    35685, 35687, 35693, 36270, 36486, 36488, 36484, 36697, {f: 2, c: 36694},
+    36693, 36696, 36698, 37005, 37187, 37185, 37303, 37301, {f: 2, c: 37298},
+    37899, 37907, 37883, 37920, 37903, 37908, 37886, 37909, 37904, 37928,
+    37913, 37901, 37877, 37888, 37879, 37895, 37902, 37910, 37906, 37882,
+    37897, 37880, 37948, 37898, 37887, 37884, 37900, 37878, 37905, 37894,
+    38366, 38368, 38367, {f: 2, c: 38702}, 38841, 38843, {f: 2, c: 38909},
+    39008, {f: 2, c: 39010}, 39007, {f: 2, c: 39105}, 39248, 39246, 39257,
+    39244, 39243, 39251, 39474, 39476, 39473, 39468, 39466, 39478, 39465,
+    39470, 39480, 39469, 39623, 39626, 39622, 39696, 39698, 39697, 39947,
+    39944, 39927, 39941, 39954, 39928, 40000, 39943, 39950, 39942, 39959,
+    39956, 39945, 40351, 40345, 40356, 40349, 40338, 40344, 40336, 40347,
+    40352, 40340, 40348, 40362, 40343, 40353, 40346, 40354, 40360, 40350,
+    40355, 40383, 40361, 40342, {f: 2, c: 40358}, 40601, 40603, 40602, 40677,
+    40676, 40679, 40678, 40752, 40750, 40795, 40800, 40798, 40797, 40793,
+    40849, 20794, 20793, 21144, 21143, 22211, {f: 2, c: 22205}, 23368, 23367,
+    24011, 24015, 24305, 25085, 25883, 27394, 27388, 27395, 27384, 27392,
+    {f: 2, c: 28739}, 28746, {f: 2, c: 28744}, {f: 2, c: 28741}, 29213, 29210,
+    29209, 29566, 29975, 30314, 30672, 31021, 31025, 31023, 31828, 31827,
+    31986, 32394, [32391, 60229], 32392, 32395, 32390, 32397, 32589, 32699,
+    32816, 33245, 34328, 34346, 34342, 34335, 34339, 34332, 34329, 34343,
+    34350, 34337, 34336, 34345, 34334, 34341, 34857, 34845, 34843, 34848,
+    34852, 34844, 34859, 34890, 35181, 35177, 35182, 35179, 35322, 35705,
+    35704, 35653, {f: 2, c: 35706}, 36112, 36116, 36271, 36494, 36492, 36702,
+    36699, 36701, 37190, {f: 2, c: 37188}, 37305, 37951, 37947, 37942, 37929,
+    37949, 37936, 37945, 37930, 37943, 37932, 37952, 37937, 38373, 38372,
+    38371, 38709, 38714, 38847, 38881, 39012, 39113, 39110, 39104, 39256,
+    39254, 39481, 39485, 39494, 39492, 39490, 39489, 39482, 39487, 39629,
+    39701, {f: 2, c: 39703}, 39702, 39738, 39762, 39979, 39965, 39964, 39980,
+    39971, {f: 2, c: 39976}, 39972, 39969, 40375, 40374, 40380, 40385, 40391,
+    40394, 40399, 40382, 40389, 40387, 40379, 40373, 40398, {f: 2, c: 40377},
+    40364, 40392, 40369, 40365, 40396, 40371, 40397, 40370, 40570, 40604,
+    40683, 40686, 40685, 40731, 40728, 40730, 40753, 40782, 40805, 40804,
+    40850, 20153, 22214, 22213, 22219, 22897, {f: 2, c: 23371}, 24021, 24017,
+    24306, 25889, 25888, 25894, 25890, 27403, {f: 2, c: 27400}, 27661,
+    {f: 3, c: 28757}, 28754, {f: 2, c: 29214}, 29353, 29567, 29912, 29909,
+    29913, 29911, 30317, 30381, 31029, 31156, {f: 2, c: 31344}, 31831, 31836,
+    31833, 31835, 31834, 31988, 31985, 32401, 32591, 32647, 33246, 33387,
+    {f: 2, c: 34356}, 34355, 34348, 34354, 34358, 34860, 34856, 34854, 34858,
+    34853, 35185, 35263, 35262, 35323, 35710, 35716, 35714, 35718, 35717,
+    35711, 36117, 36501, 36500, 36506, 36498, 36496, {f: 2, c: 36502}, 36704,
+    36706, 37191, 37964, 37968, {f: 2, c: 37962}, 37967, 37959, 37957,
+    {f: 2, c: 37960}, 37958, 38719, 38883, 39018, 39017, 39115, 39252, 39259,
+    39502, {f: 2, c: 39507}, 39500, 39503, 39496, 39498, 39497, 39506, 39504,
+    39632, 39705, 39723, 39739, 39766, 39765, 40006, 40008, 39999, 40004,
+    39993, 39987, 40001, 39996, 39991, 39988, 39986, 39997, 39990, 40411,
+    40402, 40414, 40410, 40395, 40400, 40412, 40401, 40415, 40425, 40409,
+    40408, 40406, 40437, 40405, 40413, 40630, 40688, 40757, 40755, 40754,
+    40770, 40811, 40853, 40866, 20797, 21145, 22760, 22759, 22898, 23373,
+    24024, 34863, 24399, 25089, {f: 2, c: 25091}, 25897, 25893, 26006, 26347,
+    {f: 2, c: 27409}, 27407, 27594, 28763, 28762, 29218, 29570, 29569, 29571,
+    30320, 30676, 31847, 31846, 32405, 33388, 34362, 34368, 34361, 34364,
+    34353, 34363, 34366, 34864, 34866, 34862, 34867, 35190, 35188, 35187,
+    35326, 35724, 35726, 35723, 35720, 35909, 36121, 36504, 36708, 36707,
+    37308, 37986, 37973, 37981, 37975, 37982, {f: 2, c: 38852}, 38912, 39510,
+    39513, {f: 3, c: 39710}, 40018, 40024, 40016, 40010, 40013, 40011, 40021,
+    40025, 40012, 40014, 40443, 40439, 40431, 40419, 40427, 40440, 40420,
+    40438, 40417, 40430, 40422, 40434, [40432, 60370], 40418, 40428, 40436,
+    40435, 40424, 40429, 40642, 40656, {f: 2, c: 40690}, 40710, 40732, 40760,
+    40759, 40758, 40771, 40783, 40817, 40816, {f: 2, c: 40814}, 22227, 22221,
+    23374, 23661, 25901, {f: 2, c: 26349}, 27411, 28767, 28769, 28765, 28768,
+    29219, 29915, 29925, 30677, 31032, 31159, 31158, 31850, 32407, 32649,
+    33389, 34371, 34872, 34871, 34869, 34891, {f: 2, c: 35732},
+    {f: 3, c: 36510}, 36509, 37310, 37309, 37314, 37995, {f: 2, c: 37992},
+    38629, 38726, 38723, 38727, 38855, 38885, 39518, 39637, 39769, 40035,
+    40039, 40038, 40034, 40030, 40032, 40450, 40446, 40455, 40451, 40454,
+    40453, {f: 2, c: 40448}, 40457, 40447, 40445, 40452, 40608, 40734, 40774,
+    {f: 3, c: 40820}, 22228, 25902, 26040, {f: 2, c: 27416}, 27415, 27418,
+    28770, 29222, 29354, {f: 2, c: 30680}, 31033, 31849, 31851, 31990, 32410,
+    32408, 32411, 32409, {f: 2, c: 33248}, {f: 3, c: 34374}, {f: 2, c: 35193},
+    35196, 35195, 35327, {f: 2, c: 35736}, 36517, 36516, 36515, 37998, 37997,
+    37999, 38001, 38003, 38729, 39026, 39263, 40040, 40046, 40045, 40459,
+    40461, 40464, 40463, 40466, 40465, 40609, 40693, 40713, 40775, 40824,
+    40827, 40826, 40825, 22302, 28774, 31855, 34876, 36274, 36518, 37315,
+    38004, 38008, 38006, 38005, 39520, [39726, 60830], 40052, 40051, 40049,
+    40053, 40468, 40467, 40694, 40714, 40868, 28776, 28773, 31991, 34410,
+    34878, 34877, 34879, 35742, 35996, 36521, 36553, 38731, {f: 2, c: 39027},
+    39116, 39265, 39339, 39524, {f: 2, c: 39526}, 39716, 40469, 40471, 40776,
+    25095, 27422, 29223, 34380, 36520, 38018, {f: 2, c: 38016}, 39529, 39528,
+    40473, 34379, 35743, 38019, 40057, 40631, 30325, 39531, 40058, 40477,
+    {f: 2, c: 28777}, 29225, 40612, 40830, 40777, 40856, {s: 97}, 65075, 0,
+    65076, 65103, [168, 776, 63208], [710, 63209, 65342], [12541, 63210],
+    [12542, 63211], [12445, 63212], [12446, 63213], 0, [12293, 63216],
+    [12294, 63217], [12295, 63218], [12540, 63219], [63220, 65339],
+    [63221, 65341], [10045, 63222], [12353, 63223], [12354, 63224],
+    [12355, 63225], [12356, 63226], [12357, 63227], [12358, 63228],
+    [12359, 63229], [12360, 63230], [12361, 63231], [12362, 63232],
+    [12363, 63233], [12364, 63234], [12365, 63235], [12366, 63236],
+    [12367, 63237], [12368, 63238], [12369, 63239], [12370, 63240],
+    [12371, 63241], [12372, 63242], [12373, 63243], [12374, 63244],
+    [12375, 63245], [12376, 63246], [12377, 63247], [12378, 63248],
+    [12379, 63249], [12380, 63250], [12381, 63251], [12382, 63252],
+    [12383, 63253], [12384, 63254], [12385, 63255], [12386, 63256],
+    [12387, 63257], [12388, 63258], [12389, 63259], [12390, 63260],
+    [12391, 63261], [12392, 63262], [12393, 63263], [12394, 63264],
+    [12395, 63265], [12396, 63266], [12397, 63267], [12398, 63268],
+    [12399, 63269], [12400, 63270], [12401, 63271], [12402, 63272],
+    [12403, 63273], [12404, 63274], [12405, 63275], [12406, 63276],
+    [12407, 63277], [12408, 63278], [12409, 63279], [12410, 63280],
+    [12411, 63281], [12412, 63282], [12413, 63283], [12414, 63284],
+    [12415, 63285], [12416, 63286], [12417, 63287], [12418, 63288],
+    [12419, 63289], [12420, 63290], [12421, 63291], [12422, 63292],
+    [12423, 63293], [12424, 63294], [12425, 63295], [12426, 63296],
+    [12427, 63297], [12428, 63298], [12429, 63299], [12430, 63300],
+    [12431, 63301], [12432, 63302], [12433, 63303], [12434, 63304],
+    [12435, 63305], [12449, 63306], [12450, 63307], [12451, 63308],
+    [12452, 63309], [12453, 63310], [12454, 63311], [12455, 63312],
+    [12456, 63313], [12457, 63314], [12458, 63315], [12459, 63316],
+    [12460, 63317], [12461, 63318], [12462, 63319], [12463, 63320],
+    [12464, 63321], [12465, 63322], [12466, 63323], [12467, 63324],
+    [12468, 63325], [12469, 63326], [12470, 63327], [12471, 63328],
+    [12472, 63329], [12473, 63330], [12474, 63331], [12475, 63332],
+    [12476, 63333], [12477, 63334], [12478, 63335], [12479, 63336],
+    [12480, 63337], [12481, 63338], [12482, 63339], [12483, 63340],
+    [12484, 63341], [12485, 63342], [12486, 63343], [12487, 63344],
+    [12488, 63345], [12489, 63346], [12490, 63347], [12491, 63348],
+    [12492, 63349], [12493, 63350], [12494, 63351], [12495, 63352],
+    [12496, 63353], [12497, 63354], [12498, 63355], [12499, 63356],
+    [12500, 63357], [12501, 63358], [12502, 63359], [12503, 63360],
+    [12504, 63361], [12505, 63362], [12506, 63363], [12507, 63364],
+    [12508, 63365], [12509, 63366], [12510, 63367], [12511, 63368],
+    [12512, 63369], [12513, 63370], [12514, 63371], [12515, 63372],
+    [12516, 63373], [12517, 63374], [12518, 63375], [12519, 63376],
+    [12520, 63377], [12521, 63378], [12522, 63379], [12523, 63380],
+    [12524, 63381], [12525, 63382], [12526, 63383], [12527, 63384],
+    [12528, 63385], [12529, 63386], [12530, 63387], [12531, 63388],
+    [12532, 63389], [12533, 63390], [12534, 63391], [1040, 63392],
+    [1041, 63393], [1042, 63394], [1043, 63395], [1044, 63396], [1045, 63397],
+    [1025, 63398], [1046, 63399], [1047, 63400], [1048, 63401], [1049, 63402],
+    [1050, 63403], [1051, 63404], [1052, 63405], [1053, 63406], [1054, 63407],
+    [1055, 63408], [1056, 63409], [1057, 63410], [1058, 63411], [1059, 63412],
+    [1060, 63413], [1061, 63414], [1062, 63415], [1063, 63416], [1064, 63417],
+    [1065, 63418], [1066, 63419], [1067, 63420], [1068, 63421], [1069, 63422],
+    [1070, 63423], [1071, 63424], [1072, 63425], [1073, 63426], [1074, 63427],
+    [1075, 63428], [1076, 63429], [1077, 63430], [1105, 63431], [1078, 63432],
+    [1079, 63433], [1080, 63434], [1081, 63435], [1082, 63436], [1083, 63437],
+    [1084, 63438], [1085, 63439], [1086, 63440], [1087, 63441], [1088, 63442],
+    [1089, 63443], [1090, 63444], [1091, 63445], [1092, 63446], [1093, 63447],
+    [1094, 63448], [1095, 63449], [1096, 63450], [1097, 63451], [1098, 63452],
+    [1099, 63453], [1100, 63454], [1101, 63455], [1102, 63456], [1103, 63457],
+    [8679, 63458], [8632, 63459], [8633, 63460], [20033, 63461],
+    [63462, 131276], [20058, 63463], [63464, 131210], [20994, 63465],
+    [17553, 63466], 63467, [20872, 63468], [13853, 63469], [63470, 161287],
+    {s: 40}, [172, 63511, 65506], [63512, 65508], [63513, 65287],
+    [63514, 65282], [12849, 63515], [8470, 63516], [8481, 63517], 30849,
+    [37561, 58501], 35023, 22715, 24658, 31911, 23290, 9556, 9574, 9559, 9568,
+    9580, 9571, 9562, 9577, 9565, 9554, 9572, 9557, {s: 3}, 9560, 9575, 9563,
+    9555, 9573, 9558, 9567, 9579, 9570, 9561, 9576, 9564, 9553, {s: 5}, 9619,
+    {s: 26}, [58129, 147159], [22462, 58130], [58131, 159443], [28990, 58132],
+    [58133, 153568], [27042, 58135], [58136, 166889], [23412, 58137],
+    [31305, 58138], [58139, 153825], [58140, 169177], [31333, 58141],
+    [31357, 58142], [58143, 154028], [31419, 58144], [31408, 58145],
+    [31426, 58146], [31427, 58147], [29137, 58148], [58149, 156813],
+    [16842, 58150], [31450, 58151], [31453, 58152], [31466, 58153],
+    [16879, 58154], [21682, 58155], [58156, 154625], [31499, 58157],
+    [31573, 58158], [31529, 58159], [58160, 152334], [58161, 154878],
+    [31650, 58162], [31599, 58163], [33692, 58164], [58165, 154548],
+    [58166, 158847], [31696, 58167], [33825, 58168], [31634, 58169], 0,
+    [58171, 154912], 0, [33938, 58174], [31738, 58175], 0, [31797, 58177],
+    [58178, 154817], [31812, 58179], [31875, 58180], [58181, 149634],
+    [31910, 58182], [58184, 148856], [31945, 58185], [31943, 58186],
+    [31974, 58187], 0, [31987, 58189], [31989, 58190], [32359, 58192],
+    [17693, 58193], [58194, 159300], [32093, 58195], [58196, 159446],
+    [32137, 58198], [32171, 58199], [28981, 58200], [32179, 58201], 32214,
+    [58203, 147543], [58204, 155689], [32228, 58205], [15635, 58206],
+    [32245, 58207], [58208, 137209], [32229, 58209], [58210, 164717], 0,
+    [58212, 155937], [58213, 155994], [32366, 58214], 0, [17195, 58216],
+    [37996, 58217], [32295, 58218], [32576, 58219], [32577, 58220],
+    [32583, 58221], [31030, 58222], [58223, 156368], [39393, 58224],
+    [32663, 58225], [58226, 156497], [32675, 58227], [58228, 136801],
+    [58229, 131176], [17756, 58230], [58231, 145254], [58233, 164666],
+    [32762, 58234], [58235, 156809], 0, [32776, 58237], [32797, 58238], 0,
+    [32815, 58240], [58241, 172167], [58242, 158915], [32827, 58243],
+    [32828, 58244], [32865, 58245], [58246, 141076], [18825, 58247],
+    [58248, 157222], [58249, 146915], [58250, 157416], [26405, 58251],
+    [32935, 58252], [58253, 166472], [33031, 58254], [33050, 58255],
+    [22704, 58256], [58257, 141046], [27775, 58258], [58259, 156824],
+    [25831, 58261], [58262, 136330], [33304, 58263], [58264, 137310],
+    [27219, 58265], [58266, 150117], [58267, 150165], [17530, 58268],
+    [33321, 58269], [58271, 158290], [58272, 146814], [20473, 58273],
+    [58274, 136445], [34018, 58275], [33634, 58276], 0, [58278, 149927],
+    [58279, 144688], [58280, 137075], [58281, 146936], [33450, 58282],
+    [26907, 58283], [58284, 194964], [16859, 58285], [34123, 58286],
+    [33488, 58287], [33562, 58288], [58289, 134678], [58290, 137140],
+    [14017, 58291], [58292, 143741], [58293, 144730], [33403, 58294],
+    [33506, 58295], [33560, 58296], [58297, 147083], [58298, 159139],
+    [58299, 158469], [58300, 158615], [58301, 144846], [15807, 58302],
+    [33565, 58303], [21996, 58304], [33669, 58305], [17675, 58306],
+    [58307, 159141], [33708, 58308], 0, [33747, 58310], [58312, 159444],
+    [27223, 58313], [34138, 58314], [13462, 58315], [58316, 159298],
+    [33880, 58318], [58319, 154596], [33905, 58320], [15827, 58321],
+    [17636, 58322], [27303, 58323], [33866, 58324], [31064, 58326], 0,
+    [58328, 158614], [58329, 159351], [58330, 159299], [34014, 58331], 0,
+    [33681, 58333], [17568, 58334], [33939, 58335], [34020, 58336],
+    [58337, 154769], [16960, 58338], [58339, 154816], [17731, 58340],
+    [34100, 58341], [23282, 58342], 0, [17703, 58344], [34163, 58345],
+    [17686, 58346], [26559, 58347], [34326, 58348], [58349, 165413],
+    [58350, 165435], [34241, 58351], [58352, 159880], [34306, 58353],
+    [58354, 136578], [58355, 159949], [58356, 194994], [17770, 58357],
+    [34344, 58358], [13896, 58359], [58360, 137378], [21495, 58361],
+    [58362, 160666], [34430, 58363], 0, [58365, 172280], [34798, 58366],
+    [58367, 142375], [34737, 58368], [34778, 58369], [34831, 58370, 60990],
+    [22113, 58371], [34412, 58372], [26710, 58373], [17935, 58374],
+    [34885, 58375], [34886, 58376], [58377, 161248], [58378, 146873],
+    [58379, 161252], [34910, 58380], [34972, 58381], [18011, 58382],
+    [34996, 58383], [34997, 58384], [35013, 58386], [58388, 161551],
+    [35207, 58389], {s: 3}, [35239, 58393], [35260, 58394], [58395, 166437],
+    [35303, 58396], [58397, 162084], [58398, 162493], [35484, 58399],
+    [30611, 58400], [37374, 58401], [35472, 58402], [58403, 162393],
+    [31465, 58404], [58405, 162618], [18195, 58407], [58408, 162616],
+    [29052, 58409], [35596, 58410], [35615, 58411], [58412, 152624],
+    [58413, 152933], [35647, 58414], 0, [35661, 58416], [35497, 58417],
+    [58418, 150138], [35728, 58419], [35739, 58420], [35503, 58421],
+    [58422, 136927], [17941, 58423], [34895, 58424], [35995, 58425],
+    [58426, 163156], [58427, 163215], [58428, 195028], [14117, 58429],
+    [58430, 163155], [36054, 58431], [58432, 163224], [58433, 163261],
+    [36114, 58434], [36099, 58435], [58436, 137488], [36059, 58437],
+    [28764, 58438], [36113, 58439], [16080, 58441], 0, [36265, 58443],
+    [58444, 163842], [58445, 135188], [58446, 149898], [15228, 58447],
+    [58448, 164284], [58449, 160012], [31463, 58450], [36525, 58451],
+    [36534, 58452], [36547, 58453], [37588, 58454], [36633, 58455],
+    [36653, 58456], [58457, 164709], [58458, 164882], [36773, 58459],
+    [37635, 58460], [58461, 172703], [58462, 133712], [36787, 58463], 0,
+    [58465, 166366], [58466, 165181], [58467, 146875], [24312, 58468],
+    [58469, 143970], [36857, 58470], 0, [58474, 140069], [14720, 58475],
+    [58476, 159447], [36919, 58477], [58478, 165180], [58479, 162494],
+    [36961, 58480], [58481, 165228], [58482, 165387], [37032, 58483],
+    [58484, 165651], [37060, 58485], [58486, 165606], [37038, 58487], 0,
+    [37223, 58489], [37289, 58491], [37316, 58492], [31916, 58493],
+    [58494, 166195], [58495, 138889], [37390, 58496], [27807, 58497],
+    [37441, 58498], [37474, 58499], [58500, 153017], [58502, 166598],
+    [58503, 146587], [58504, 166668], [58505, 153051], [58506, 134449],
+    [37676, 58507], [37739, 58508], [58509, 166625], [58510, 166891],
+    [23235, 58512], [58513, 166626], [58514, 166629], [18789, 58515],
+    [37444, 58516], [58517, 166892], [58518, 166969], [58519, 166911],
+    [37747, 58520], [37979, 58521], [36540, 58522], [38277, 58523],
+    [38310, 58524], [37926, 58525], [38304, 58526], [28662, 58527],
+    [17081, 58528], [58530, 165592], [58531, 135804], [58532, 146990],
+    [18911, 58533], [27676, 58534], [38523, 58535], [38550, 58536],
+    [16748, 58537], [38563, 58538], [58539, 159445], [25050, 58540], 58541,
+    [30965, 58542], [58543, 166624], [38589, 58544], [21452, 58545],
+    [18849, 58546], [58547, 158904], [58548, 131700], [58549, 156688],
+    [58550, 168111], [58551, 168165], [58552, 150225], [58553, 137493],
+    [58554, 144138], [38705, 58555], [34370, 58556], [38710, 58557],
+    [18959, 58558], [17725, 58559], [17797, 58560], [58561, 150249],
+    [28789, 58562], [23361, 58563], [38683, 58564], 0, [58566, 168405],
+    [38743, 58567], [23370, 58568], [58569, 168427], [38751, 58570],
+    [37925, 58571], [20688, 58572], [58573, 143543], [58574, 143548],
+    [38793, 58575], [38815, 58576], [38833, 58577], [38846, 58578],
+    [38848, 58579], [38866, 58580], [38880, 58581], [58582, 152684],
+    [38894, 58583], [29724, 58584], [58585, 169011], 0, [38901, 58587],
+    [58588, 168989], [58589, 162170], [19153, 58590], [38964, 58591],
+    [38963, 58592], [38987, 58593], [39014, 58594], [15118, 58595],
+    [58596, 160117], [15697, 58597], [58598, 132656], [58599, 147804],
+    [58600, 153350], [39114, 58601], [39095, 58602], [39112, 58603],
+    [39111, 58604], [19199, 58605], [58606, 159015], [58607, 136915],
+    [21936, 58608], [39137, 58609], [39142, 58610], [39148, 58611],
+    [37752, 58612], [39225, 58613], [58614, 150057], [19314, 58615],
+    [58616, 170071], [58617, 170245], [39413, 58618], [39436, 58619],
+    [39483, 58620], [39440, 58621], [39512, 58622], [58623, 153381],
+    [14020, 58624], [58625, 168113], [58626, 170965], [39648, 58627],
+    [39650, 58628], [58629, 170757], [39668, 58630], [19470, 58631],
+    [39700, 58632], [39725, 58633], [58634, 165376], [20532, 58635],
+    [39732, 58636], [14531, 58638], [58639, 143485], [39760, 58640],
+    [39744, 58641], [58642, 171326], [23109, 58643], [58644, 137315],
+    [39822, 58645], [39938, 58647], [39935, 58648], [39948, 58649],
+    [58650, 171624], [40404, 58651], [58652, 171959], [58653, 172434],
+    [58654, 172459], [58655, 172257], [58656, 172323], [58657, 172511],
+    [40318, 58658], [40323, 58659], [58660, 172340], [40462, 58661],
+    [40388, 58663], [58665, 172435], [58666, 172576], [58667, 137531],
+    [58668, 172595], [40249, 58669], [58670, 172217], [58671, 172724],
+    [40592, 58672], [40597, 58673], [40606, 58674], [40610, 58675],
+    [19764, 58676], [40618, 58677], [40623, 58678], [58679, 148324],
+    [40641, 58680], [15200, 58681], [14821, 58682], [15645, 58683],
+    [20274, 58684], [14270, 58685], [58686, 166955], [40706, 58687],
+    [40712, 58688], [19350, 58689], [37924, 58690], [58691, 159138],
+    [40727, 58692, 60836], 0, [40761, 58694], [22175, 58695], [22154, 58696],
+    [40773, 58697], [39352, 58698], [58699, 168075], [38898, 58700],
+    [33919, 58701], 0, [40809, 58703], [31452, 58704], [40846, 58705],
+    [29206, 58706], [19390, 58707], [58708, 149877], [58709, 149947],
+    [29047, 58710], [58711, 150008], [58712, 148296], [58713, 150097],
+    [29598, 58714], [58715, 166874], [58716, 137466], [31135, 58717],
+    [58718, 166270], [58719, 167478], [37737, 58720], [37875, 58721],
+    [58722, 166468], [37612, 58723], [37761, 58724], [37835, 58725],
+    [58726, 166252], [58727, 148665], [29207, 58728], [16107, 58729],
+    [30578, 58730], [31299, 58731], [28880, 58732], [58733, 148595],
+    [58734, 148472], [29054, 58735], [58736, 137199], [28835, 58737],
+    [58738, 137406], [58739, 144793], [16071, 58740], [58741, 137349],
+    [58742, 152623], [58743, 137208], [14114, 58744], [58745, 136955],
+    [58746, 137273], [14049, 58747], [58748, 137076], [58749, 137425],
+    [58750, 155467], [14115, 58751], [58752, 136896], [22363, 58753],
+    [58754, 150053], [58755, 136190], [58756, 135848], [58757, 136134],
+    [58758, 136374], [34051, 58759, 58761], [58760, 145062], 0, [33877, 58762],
+    [58763, 149908], [58764, 160101], [58765, 146993], [58766, 152924],
+    [58767, 147195], [58768, 159826], [17652, 58769], [58770, 145134],
+    [58771, 170397], [58772, 159526], [26617, 58773], [14131, 58774],
+    [15381, 58775], [15847, 58776], [22636, 58777], [58778, 137506],
+    [26640, 58779], [16471, 58780], [58781, 145215], [58782, 147681],
+    [58783, 147595], [58784, 147727], [58785, 158753], [21707, 58786],
+    [22174, 58787], [58788, 157361], [22162, 58789], [58790, 135135],
+    [58791, 134056], [58792, 134669], 0, [58794, 166675], [37788, 58795],
+    [20216, 58796], [20779, 58797], [14361, 58798], [58799, 148534],
+    [20156, 58800], [58801, 132197], 0, [20299, 58803], [20362, 58804],
+    [58805, 153169], [23144, 58806], [58807, 131499], [58808, 132043],
+    [14745, 58809], [58810, 131850], [58811, 132116], [13365, 58812],
+    [20265, 58813], [58814, 131776], [58815, 167603], [58816, 131701],
+    [35546, 58817], [58818, 131596], [20120, 58819], [20685, 58820],
+    [20749, 58821], [20386, 58822], [20227, 58823], [58824, 150030],
+    [58825, 147082], [20290, 58826], [20526, 58827], [20588, 58828],
+    [20609, 58829], [20428, 58830], [20453, 58831], [20568, 58832],
+    [20732, 58833], [28278, 58838], [58839, 144789], [58840, 147001],
+    [58841, 147135], [28018, 58842], [58843, 137348], [58844, 147081],
+    [20904, 58845], [20931, 58846], [58847, 132576], [17629, 58848],
+    [58849, 132259], [58850, 132242], [58851, 132241], [36218, 58852],
+    [58853, 166556], [58854, 132878], [21081, 58855], [21156, 58856],
+    [58857, 133235], [21217, 58858], 0, [18042, 58860], [29068, 58861],
+    [58862, 148364], [58863, 134176], [58864, 149932], [58865, 135396],
+    [27089, 58866], [58867, 134685], 0, [16094, 58869], [29849, 58870],
+    [29716, 58871], [29782, 58872], [29592, 58873], [19342, 58874],
+    [58875, 150204], [58876, 147597], [21456, 58877], [13700, 58878],
+    [29199, 58879], [58880, 147657], [21940, 58881], [58882, 131909],
+    [21709, 58883], [58884, 134086], [22301, 58885], [37469, 58886],
+    [38644, 58887], [22493, 58889], [22413, 58890], [22399, 58891],
+    [13886, 58892], [22731, 58893], [23193, 58894], [58895, 166470],
+    [58896, 136954], [58897, 137071], [58898, 136976], [23084, 58899],
+    [22968, 58900], [23166, 58902], [23247, 58903], [23058, 58904],
+    [58905, 153926], [58906, 137715], [58907, 137313], [58908, 148117],
+    [14069, 58909], [27909, 58910], [29763, 58911], [23073, 58912],
+    [58913, 155267], [23169, 58914], [58915, 166871], [58916, 132115],
+    [37856, 58917], [29836, 58918], [58919, 135939], [28933, 58920],
+    [18802, 58921], [37896, 58922], [58923, 166395], [37821, 58924],
+    [14240, 58925], [23582, 58926], [23710, 58927], [24158, 58928],
+    [24136, 58929], [58930, 137622], [58931, 137596], [58932, 146158],
+    [24269, 58933], [23375, 58934], [58935, 137475], [58936, 137476],
+    [14081, 58937], [58938, 137376], [14045, 58939], [58940, 136958],
+    [14035, 58941], [33066, 58942], [58943, 166471], [58944, 138682],
+    [58945, 144498], [58946, 166312], [24332, 58947, 60916], [24334, 58948],
+    [58949, 137511], [58950, 137131], [23147, 58951], [58952, 137019],
+    [23364, 58953], [58955, 161277], [34912, 58956], [24702, 58957],
+    [58958, 141408], [58959, 140843], [24539, 58960], [16056, 58961],
+    [58962, 140719], [58963, 140734], [58964, 168072], [58965, 159603],
+    [25024, 58966], [58967, 131134], [58968, 131142], [58969, 140827],
+    [24985, 58970], [24984, 58971], [24693, 58972], [58973, 142491],
+    [58974, 142599], [58975, 149204], [58976, 168269], [25713, 58977],
+    [58978, 149093], [58979, 142186], [14889, 58980], [58981, 142114],
+    [58982, 144464], [58983, 170218], [58984, 142968], [25399, 58985],
+    [25782, 58987], [25393, 58988], [25553, 58989], [58990, 149987],
+    [58991, 142695], [25252, 58992], [58993, 142497], [25659, 58994],
+    [25963, 58995], [26994, 58996], [15348, 58997], [58998, 143502],
+    [58999, 144045], [59000, 149897], [59001, 144043], [21773, 59002],
+    [59003, 144096], [59004, 137433], [59005, 169023], [26318, 59006],
+    [59007, 144009], [59008, 143795], [15072, 59009], [59011, 152964],
+    [59012, 166690], [59013, 152975], [59014, 136956], [59015, 152923],
+    [59016, 152613], [30958, 59017], [59018, 143619], [59019, 137258],
+    [59020, 143924], [13412, 59021], [59022, 143887], [59023, 143746],
+    [59024, 148169], [26254, 59025], [59026, 159012], [26219, 59027],
+    [19347, 59028], [26160, 59029], [59030, 161904], [59031, 138731],
+    [26211, 59032], [59033, 144082], [59034, 144097], [26142, 59035],
+    [59036, 153714], [14545, 59037], [59038, 145466], [59039, 145340],
+    [15257, 59040], [59041, 145314], [59042, 144382], [29904, 59043],
+    [15254, 59044], [59046, 149034], [26806, 59047], 0, [15300, 59049],
+    [27326, 59050], [59052, 145365], [59053, 148615], [27187, 59054],
+    [27218, 59055], [27337, 59056], [27397, 59057], [59058, 137490],
+    [25873, 59059], [26776, 59060], [27212, 59061], [15319, 59062],
+    [27258, 59063], [27479, 59064], [59065, 147392], [59066, 146586],
+    [37792, 59067], [37618, 59068], [59069, 166890], [59070, 166603],
+    [37513, 59071], [59072, 163870], [59073, 166364], [37991, 59074],
+    [28069, 59075], [28427, 59076], 0, [59079, 147327], [15759, 59080],
+    [28164, 59081], [59082, 147516], [23101, 59083], [28170, 59084],
+    [22599, 59085], [27940, 59086], [30786, 59087], [28987, 59088],
+    [59089, 148250], [59090, 148086], [28913, 59091], [29264, 59092, 61085],
+    [29319, 59093], [29332, 59094], [59095, 149391], [59096, 149285],
+    [20857, 59097], [59098, 150180], [59099, 132587], [29818, 59100],
+    [59101, 147192], [59102, 144991], [59103, 150090], [59104, 149783],
+    [59105, 155617], [16134, 59106], [16049, 59107], [59108, 150239],
+    [59109, 166947], [59110, 147253], [24743, 59111], [16115, 59112],
+    [29900, 59113], [29756, 59114], [37767, 59115], [29751, 59116],
+    [17567, 59117], [59118, 159210], [17745, 59119], [30083, 59120],
+    [16227, 59121], [59122, 150745], [59123, 150790], [16216, 59124],
+    [30037, 59125], [30323, 59126], [59127, 173510], 0, [29800, 59129, 61070],
+    [59130, 166604], [59131, 149931], [59132, 149902], [15099, 59133],
+    [15821, 59134], [59135, 150094], [16127, 59136], [59137, 149957],
+    [59138, 149747], [37370, 59139], [22322, 59140], [37698, 59141],
+    [59142, 166627], [59143, 137316], [20703, 59144], [59145, 152097],
+    [59146, 152039], [30584, 59147], [59148, 143922], [30478, 59149],
+    [30479, 59150], [30587, 59151], [59152, 149143], [59153, 145281],
+    [14942, 59154], [59155, 149744], [29752, 59156], [29851, 59157],
+    [16063, 59158], [59159, 150202], [59160, 150215], [16584, 59161],
+    [59162, 150166], [59163, 156078], [37639, 59164], [59165, 152961],
+    [30750, 59166], [30861, 59167], [30856, 59168], [30930, 59169],
+    [29648, 59170], [31065, 59171], [59172, 161601], [59173, 153315],
+    [16654, 59174], 0, 0, [31141, 59177], [27181, 59178], [59179, 147194],
+    [31290, 59180], [31220, 59181], [16750, 59182], [59183, 136934],
+    [16690, 59184], [37429, 59185], [31217, 59186], [59187, 134476],
+    [59188, 149900], [59189, 131737], [59190, 146874], [59191, 137070],
+    [13719, 59192], [21867, 59193], [13680, 59194], [13994, 59195],
+    [59196, 131540], [59197, 134157], [31458, 59198], [23129, 59199],
+    [59200, 141045], [59201, 154287], [59202, 154268], [23053, 59203],
+    [59204, 131675], [30960, 59205], [23082, 59206], [59207, 154566],
+    [31486, 59208], [16889, 59209], [31837, 59210], [31853, 59211],
+    [16913, 59212], [59213, 154547], [59214, 155324], [59215, 155302],
+    [31949, 59216], [59217, 150009], [59218, 137136], [31886, 59219],
+    [31868, 59220], [31918, 59221], [27314, 59222], [32220, 59223],
+    [32263, 59224], [32211, 59225], [32590, 59226], [59227, 156257],
+    [59228, 155996], [59229, 162632], [32151, 59230], [59231, 155266],
+    [17002, 59232], [59233, 158581], [59234, 133398], [26582, 59235],
+    [59236, 131150], [59237, 144847], [22468, 59238], [59239, 156690],
+    [59240, 156664], [32733, 59242], [31527, 59243], [59244, 133164],
+    [59245, 154345], [59246, 154947], [31500, 59247], [59248, 155150],
+    [39398, 59249], [34373, 59250], [39523, 59251], [27164, 59252],
+    [59253, 144447], [59255, 150007], [59256, 157101], [39455, 59257],
+    [59258, 157088], 0, [59260, 160039], [59261, 158929], [17642, 59262],
+    [33079, 59263], [17410, 59264], [32966, 59265], [33033, 59266],
+    [33090, 59267], [59268, 157620], [39107, 59269], [59270, 158274],
+    [33378, 59271], [33381, 59272], [59273, 158289], [33875, 59274],
+    [59275, 159143], [34320, 59276], [59277, 160283], [23174, 59278],
+    [16767, 59279], [59280, 137280], [23339, 59281], [59282, 137377],
+    [23268, 59283], [59284, 137432], [34464, 59285], [59286, 195004],
+    [59287, 146831], [34861, 59288], [59289, 160802], [23042, 59290],
+    [34926, 59291], [20293, 59292], [34951, 59293], [35007, 59294],
+    [35046, 59295], [35173, 59296], [35149, 59297], [59298, 153219],
+    [35156, 59299], [59300, 161669], [59301, 161668], [59302, 166901],
+    [59303, 166873], [59304, 166812], [59305, 166393], [16045, 59306],
+    [33955, 59307], [18165, 59308], [18127, 59309], [14322, 59310],
+    [35389, 59311], [35356, 59312], [59313, 169032], [24397, 59314],
+    [37419, 59315], [59316, 148100], [26068, 59317], [28969, 59318],
+    [28868, 59319], [59320, 137285], [40301, 59321], [35999, 59322],
+    [36073, 59323], [59324, 163292], [22938, 59325], [30659, 59326],
+    [23024, 59327], [14036, 59329], [36394, 59330], [36519, 59331],
+    [59332, 150537], [36656, 59333], [36682, 59334], [17140, 59335],
+    [27736, 59336], [28603, 59337], [59338, 140065], [18587, 59339],
+    [28537, 59340], [28299, 59341], [59342, 137178], [39913, 59343],
+    [14005, 59344], [59345, 149807], [37051, 59346], 0, [21873, 59348],
+    [18694, 59349], [37307, 59350], [37892, 59351], [59352, 166475],
+    [16482, 59353], [59354, 166652], [37927, 59355], [59356, 166941],
+    [59357, 166971], [34021, 59358], [35371, 59359], [38297, 59360],
+    [38311, 59361], [38295, 59362], [38294, 59363], [59364, 167220],
+    [29765, 59365], [16066, 59366], [59367, 149759], [59368, 150082],
+    [59369, 148458], [16103, 59370], [59371, 143909], [38543, 59372],
+    [59373, 167655], [59374, 167526], [59375, 167525], [16076, 59376],
+    [59377, 149997], [59378, 150136], [59379, 147438], [29714, 59380],
+    [29803, 59381], [16124, 59382], [38721, 59383], [59384, 168112],
+    [26695, 59385], [18973, 59386], [59387, 168083], [59388, 153567], 0,
+    [37736, 59390], [59391, 166281], [59392, 166950], [59393, 166703],
+    [59394, 156606], [37562, 59395], [23313, 59396], [35689, 59397],
+    [18748, 59398], [29689, 59399], [59400, 147995], [38811, 59401], 0,
+    [39224, 59403], [59404, 134950], [24001, 59405], [59406, 166853],
+    [59407, 150194], [38943, 59408], [59409, 169178], [37622, 59410],
+    [59411, 169431], [37349, 59412], [17600, 59413], [59414, 166736],
+    [59415, 150119], [59416, 166756], [39132, 59417], [59418, 166469],
+    [16128, 59419], [37418, 59420], [18725, 59421], [33812, 59422],
+    [39227, 59423], [39245, 59424], [59425, 162566], [15869, 59426], 0,
+    [19311, 59428], [39338, 59429], [39516, 59430], [59431, 166757],
+    [59432, 153800], [27279, 59433], [39457, 59434], [23294, 59435],
+    [39471, 59436], [59437, 170225], [19344, 59438], [59439, 170312],
+    [39356, 59440], [19389, 59441], [19351, 59442], [37757, 59443],
+    [22642, 59444], [59445, 135938], [22562, 59446], [59447, 149944],
+    [59448, 136424], [30788, 59449], [59450, 141087], [59451, 146872],
+    [26821, 59452], [15741, 59453], [37976, 59454], [14631, 59455],
+    [24912, 59456], [59457, 141185], [59458, 141675], [24839, 59459],
+    [40015, 59460], [40019, 59461], [40059, 59462], [39989, 59463],
+    [39952, 59464], [39807, 59465], [39887, 59466], [59467, 171565],
+    [39839, 59468], [59469, 172533], [59470, 172286], [40225, 59471],
+    [19630, 59472], [59473, 147716], [40472, 59474], [19632, 59475],
+    [40204, 59476], [59477, 172468], [59478, 172269], [59479, 172275],
+    [59480, 170287], [40357, 59481], [33981, 59482], [59483, 159250],
+    [59484, 159711], [59485, 158594], [34300, 59486], [17715, 59487],
+    [59488, 159140], [59489, 159364], [59490, 159216], [33824, 59491],
+    [34286, 59492], [59493, 159232], [59494, 145367], [59495, 155748],
+    [31202, 59496], [59497, 144796], [59498, 144960], [59500, 149982],
+    [15714, 59501], [37851, 59502], [37566, 59503], [37704, 59504],
+    [59505, 131775], [30905, 59506], [37495, 59507], [37965, 59508],
+    [20452, 59509], [13376, 59510], [36964, 59511], [59512, 152925],
+    [30781, 59513], [30804, 59514], [30902, 59515], [30795, 59516],
+    [59517, 137047], [59518, 143817], [59519, 149825], [13978, 59520],
+    [20338, 59521], [28634, 59522], [28633, 59523], 0, [28702, 59524, 59525],
+    [21524, 59526], [59527, 147893], [22459, 59528], [22771, 59529],
+    [22410, 59530], [40214, 59531], [22487, 59532], [28980, 59533],
+    [13487, 59534], [59535, 147884], [29163, 59536], [59537, 158784],
+    [59538, 151447], 0, [59540, 137141], [59541, 166473], [24844, 59542],
+    [23246, 59543], [23051, 59544], [17084, 59545], [59546, 148616],
+    [14124, 59547], [19323, 59548], [59549, 166396], [37819, 59550],
+    [37816, 59551], [59552, 137430], [59553, 134941], [33906, 59554],
+    [59555, 158912], [59556, 136211], [59557, 148218], [59558, 142374],
+    [59559, 148417], [22932, 59560], [59561, 146871], [59562, 157505],
+    [32168, 59563], [59564, 155995], [59565, 155812], [59566, 149945],
+    [59567, 149899], [59568, 166394], [37605, 59569], [29666, 59570],
+    [16105, 59571], [29876, 59572], [59573, 166755], [59574, 137375],
+    [16097, 59575], [59576, 150195], [27352, 59577], [29683, 59578],
+    [29691, 59579], [16086, 59580], [59581, 150078], [59582, 150164],
+    [59583, 137177], [59584, 150118], [59585, 132007], [59586, 136228],
+    [59587, 149989], [29768, 59588], [59589, 149782], [28837, 59590],
+    [59591, 149878], [37508, 59592], [29670, 59593], [37727, 59594],
+    [59595, 132350], [37681, 59596], [59597, 166606], [59598, 166422],
+    [37766, 59599], [59600, 166887], [59601, 153045], [18741, 59602],
+    [59603, 166530], [29035, 59604], [59605, 149827], [59606, 134399],
+    [22180, 59607], [59608, 132634], [59609, 134123], [59610, 134328],
+    [21762, 59611], [31172, 59612], [59613, 137210], [32254, 59614],
+    [59615, 136898], [59616, 150096], [59617, 137298], [17710, 59618],
+    [37889, 59619], [14090, 59620], [59621, 166592], [59622, 149933],
+    [22960, 59623], [59624, 137407], [59625, 137347], [59626, 160900],
+    [23201, 59627], [14050, 59628], [59629, 146779], [14000, 59630],
+    [37471, 59631], [23161, 59632], [59633, 166529], [59634, 137314],
+    [37748, 59635], [15565, 59636], [59637, 133812], [19094, 59638],
+    [14730, 59639], [20724, 59640], [15721, 59641], [15692, 59642],
+    [59643, 136092], [29045, 59644], [17147, 59645], [59646, 164376],
+    [28175, 59647], [59648, 168164], [17643, 59649], [27991, 59650],
+    [59651, 163407], [28775, 59652], [27823, 59653], [15574, 59654],
+    [59655, 147437], [59656, 146989], [28162, 59657], [28428, 59658],
+    [15727, 59659], [59660, 132085], [30033, 59661], [14012, 59662],
+    [13512, 59663], [18048, 59664], [16090, 59665], [18545, 59666],
+    [22980, 59667], [37486, 59668], [18750, 59669], [36673, 59670],
+    [59671, 166940], [59672, 158656], [22546, 59673], [22472, 59674],
+    [14038, 59675], [59676, 136274], [28926, 59677], [59678, 148322],
+    [59679, 150129], [59680, 143331], [59681, 135856], [59682, 140221],
+    [26809, 59683], [26983, 59684], [59685, 136088], [59686, 144613],
+    [59687, 162804], [59688, 145119], [59689, 166531], [59690, 145366],
+    [59691, 144378], [59692, 150687], [27162, 59693], [59694, 145069],
+    [59695, 158903], [33854, 59696], [17631, 59697], [17614, 59698],
+    [59699, 159014], [59700, 159057], [59701, 158850], [59702, 159710], 0, 0,
+    [33597, 59705], [59706, 137018], [33773, 59707], [59708, 158848],
+    [59709, 159827], [59710, 137179], [22921, 59711], [23170, 59712],
+    [59713, 137139], [23137, 59714], [23153, 59715], [59716, 137477],
+    [59717, 147964], [14125, 59718], [23023, 59719], [59720, 137020],
+    [14023, 59721], [29070, 59722], [37776, 59723], [26266, 59724],
+    [59725, 148133], [23150, 59726], [23083, 59727], [59728, 148115],
+    [27179, 59729], [59730, 147193], [59731, 161590], [59732, 148571],
+    [59733, 148170], [28957, 59734], [59735, 148057], [59736, 166369],
+    [20400, 59737], [59738, 159016], [23746, 59739], [59740, 148686],
+    [59741, 163405], [59742, 148413], [27148, 59743], [59744, 148054],
+    [59745, 135940], 0, [28979, 59747], [59748, 148457], [15781, 59749],
+    [27871, 59750], [59751, 194597], [23019, 59754], [24412, 59757],
+    [59764, 144128], [31955, 59776], [59783, 162548], [59786, 153334],
+    [59790, 162584], [36972, 59791], [33270, 59795], [30476, 59797],
+    [27810, 59799], [22269, 59800], [22633, 59828], [26465, 59832],
+    [23646, 59838], [22770, 59841], [28857, 59843], [26627, 59853],
+    [36795, 59859], [36796, 59861], [20001, 59871], [31545, 59898],
+    [15820, 59902], [29482, 57990, 59909], [30048, 59912], [22586, 59920],
+    [33446, 59932], [27018, 59940], [24803, 59944], [20206, 59984],
+    [39364, 60002], [40639, 60023], [21249, 60025], [26528, 60038],
+    [24808, 60046], [20916, 60053], [31363, 60064], [39994, 60075],
+    [31432, 60093], [26906, 60098], [22956, 60100], [22592, 60102],
+    [21610, 60114], [24807, 60123], [22138, 60125], [26965, 60132],
+    [39983, 60133], [34725, 60134], [23584, 60141], [24075, 60143],
+    [26398, 60147], [33965, 60157], [35713, 60161], [20088, 60166],
+    [25283, 60176], [26709, 60180], 0, [33533, 60190], [35237, 60194],
+    [36768, 60196], [38840, 60198], [38983, 60200], [39613, 60201],
+    [24497, 60218], [26184, 60219], [26303, 60220], [60221, 162425], 0,
+    [60225, 149946], 0, 0, [60230, 131910], [26382, 60232], [26904, 60233],
+    [60235, 161367], [60236, 155618], [60239, 161278], [60240, 139418],
+    [18640, 60241], [19128, 60242], [60244, 166554], [60247, 147515],
+    [60250, 150085], [60251, 132554], [20946, 60252], [60253, 132625],
+    [22943, 60254], [60255, 138920], [15294, 60256], [60257, 146687],
+    [14747, 60262], [60264, 165352], [60265, 170441], [14178, 60266],
+    [60267, 139715], [35678, 60268], [60269, 166734], 0, [29193, 60274],
+    [60276, 134264], [60280, 132985], [36570, 60281], [21135, 60283],
+    [29041, 60285], [60288, 147274], [60289, 150183], [21948, 60290],
+    [60293, 158546], [13427, 60295], [60297, 161330], [18200, 60299],
+    [60303, 149823], [20582, 60305], [13563, 60306], [60307, 144332], 0,
+    [18300, 60310], [60311, 166216], [60315, 138640], 0, [60320, 162834],
+    [36950, 60321], [60323, 151450], [35682, 60324], [23899, 60327],
+    [60328, 158711], 0, [60331, 137500], [35562, 60332], [60333, 150006],
+    [60335, 147439], [19392, 60337], [60340, 141083], [37989, 60341],
+    [60342, 153569], [24981, 60343], [23079, 60344], [60345, 194765], 0,
+    [60348, 148769], [20074, 60350], [60351, 149812], [38486, 60352],
+    [28047, 60353], [60354, 158909], [35191, 60356], [60359, 156689], 0,
+    [31554, 60363], [60364, 168128], [60365, 133649], 0, [31301, 60369],
+    [39462, 60372], [13919, 60374], [60375, 156777], [60376, 131105],
+    [31107, 60377], [23852, 60380], [60381, 144665], 0, [18128, 60384],
+    [30011, 60386], [34917, 60387], [22710, 60389], [14108, 60390],
+    [60391, 140685], [15444, 60394], [37505, 60397], [60398, 139642],
+    [37680, 60400], [60402, 149968], [27705, 60403], [60406, 134904],
+    [34855, 60407], [35061, 60408], [60409, 141606], [60410, 164979],
+    [60411, 137137], [28344, 60412], [60413, 150058], [60414, 137248],
+    [14756, 60415], 0, 0, [17727, 60419], [26294, 60420], [60421, 171181],
+    [60422, 170148], [35139, 60423], [16607, 60427], [60428, 136714],
+    [14753, 60429], [60430, 145199], [60431, 164072], [60432, 136133],
+    [29101, 60433], [33638, 60434], [60436, 168360], 0, [19639, 60438],
+    [60439, 159919], [60440, 166315], [60445, 147834], [31555, 60446],
+    [31102, 60447], [28597, 60449], [60450, 172767], [27139, 60451],
+    [60452, 164632], [21410, 60453], [60454, 159239], [37823, 60455],
+    [26678, 60456], [38749, 59389, 60457], [60458, 164207], [60460, 158133],
+    [60461, 136173], [60462, 143919], [23941, 60464], [60465, 166960],
+    [22293, 60467], [38947, 60468], [60469, 166217], [23979, 60470],
+    [60471, 149896], [26046, 60472], [27093, 60473], [21458, 60474],
+    [60475, 150181], [60476, 147329], [15377, 60477], [26422, 60478],
+    [60482, 139169], [13770, 60490], [18682, 60493], 0, [30728, 60496],
+    [37461, 60497], [17394, 60499], [17375, 60501], [23032, 60505], 0,
+    [22155, 60518], [60520, 169449], [36882, 60541], [21953, 60546],
+    [17673, 60551], [32383, 60552], [28502, 60553], [27313, 60554],
+    [13540, 60556], [60558, 161949], [14138, 60559], 0, [60562, 163876],
+    [60565, 162366], [15851, 60567], [60569, 146615], [60574, 156248],
+    [22207, 60575], [36366, 60577], [23405, 60578], [25566, 60581], 0,
+    [25904, 60585], [22061, 60586], [21530, 60588], [60591, 171416],
+    [19581, 60592], [22050, 60593], [22046, 60594], [32585, 60595],
+    [22901, 60597], [60598, 146752], [34672, 60599], [33047, 60604],
+    [40286, 60605], [36120, 60606], [30267, 60607], [40005, 60608],
+    [30286, 60609], [30649, 60610], [37701, 60611], [21554, 60612],
+    [33096, 60613], [33527, 60614], [22053, 60615], [33074, 60616],
+    [33816, 60617], [32957, 60618], [21994, 60619], [31074, 60620],
+    [22083, 60621], [21526, 60622], [60623, 134813], [13774, 60624],
+    [22021, 57509, 60625], [22001, 60626], [26353, 60627], [60628, 164578],
+    [13869, 60629], [30004, 60630], [22000, 60631], [21946, 60632],
+    [21655, 60633], [21874, 60634], [60635, 134209], [60636, 134294],
+    [24272, 57652, 60637], [60639, 134774], [60640, 142434], [60641, 134818],
+    [40619, 60642], [32090, 60643], 0, [60645, 135285], [25245, 60646],
+    [38765, 60647], [21652, 60648], [36045, 60649], [29174, 60650],
+    [37238, 60651], [25596, 60652], [25529, 60653], [25598, 60654],
+    [21865, 60655], [60656, 142147], [40050, 60657], [60658, 143027],
+    [20890, 60659], [13535, 60660], [60661, 134567], [20903, 60662],
+    [21581, 60663], [21790, 60664], [21779, 60665], [30310, 60666],
+    [36397, 60667], [60668, 157834], [30129, 60669], [32950, 60670],
+    [34820, 60671], 0, [35015, 60673], [33206, 60674], [33820, 60675],
+    [17644, 60677], [29444, 60678], [33547, 60681], [22139, 60683],
+    [37232, 60690], [37384, 60692], [60696, 134905], [29286, 60697],
+    [18254, 60699], [60701, 163833], [16634, 60703], [40029, 60704],
+    [25887, 60705], [18675, 60707], [60708, 149472], [60709, 171388], 0,
+    [60713, 161187], 60715, [60716, 155720], [29091, 60718], [32398, 60719],
+    [40272, 60720], [13687, 60723], [27826, 60725], [21351, 60726],
+    [14812, 60728], [60731, 149016], [33325, 60734], [21579, 60735], 60739,
+    [14930, 60740], [29556, 60742], [60743, 171692], [19721, 60744],
+    [39917, 60745], 0, [19547, 60748], [60751, 171998], [33884, 60752],
+    [60754, 160434], [25390, 60757], [32037, 60758], [14890, 60761],
+    [36872, 60762], [21196, 60763], [15988, 60764], [13946, 60765],
+    [17897, 60766], [60767, 132238], [30272, 60768], [23280, 60769],
+    [60770, 134838], [30842, 60771], [18358, 60772], [22695, 60773],
+    [16575, 60774], [22140, 60775], [39819, 60776], [23924, 60777],
+    [30292, 60778], [60779, 173108], [40581, 60780], [19681, 60781], 0,
+    [14331, 60783], [24857, 60784], [60786, 148466], 60787, [22109, 60788],
+    [60792, 171526], [21044, 60793], [13741, 60795], 0, [40316, 60797],
+    [31830, 60798], [39737, 60799], [22494, 60800], [23635, 60802],
+    [25811, 60803], [60804, 169168], [60805, 156469], [34477, 60807],
+    [60808, 134440], [60811, 134513], 60812, [20990, 60813], [60814, 139023],
+    [23950, 60815], [38659, 60816], [60817, 138705], [40577, 60818],
+    [36940, 60819], [31519, 60820], [39682, 60821], [23761, 60822],
+    [31651, 60823], [25192, 60824], [25397, 60825], [39679, 60826],
+    [31695, 60827], [39722, 60828], [31870, 60829], 0, [31810, 60831],
+    [31878, 60832], [39957, 60833], [31740, 60834], [39689, 60835], 0, 39982,
+    [40794, 60839], [21875, 60840], [23491, 60841], [20477, 60842],
+    [40600, 60843], [20466, 60844], [21088, 60845], [21201, 60847],
+    [22375, 60848], [20566, 60849], [22967, 60850], [24082, 60851],
+    [38856, 60852], [40363, 60853], [36700, 60854], [21609, 60855],
+    [38836, 60856], [39232, 60857], [38842, 60858], [21292, 60859],
+    [24880, 60860], [26924, 60861], [21466, 60862], [39946, 60863],
+    [40194, 60864], [19515, 60865], [38465, 60866], [27008, 60867],
+    [20646, 60868], [30022, 60869], [60870, 137069], [39386, 60871],
+    [21107, 60872], 60873, [37209, 60874], [38529, 60875], [37212, 60876],
+    60877, [37201, 60878], [60879, 167575], [25471, 60880], [27338, 60882],
+    [22033, 60883], [37262, 60884], [30074, 60885], [25221, 60886],
+    [29519, 60888], [31856, 60889], [60890, 154657], 60892, [30422, 60894],
+    [39837, 60895], [20010, 60896], [60897, 134356], [33726, 60898],
+    [34882, 60899], 60900, [23626, 60901], [27072, 60902], 0, 0,
+    [21023, 60905], [24053, 60906], [20174, 60907], [27697, 60908],
+    [60909, 131570], [20281, 60910], [21660, 60911], 0, [21146, 60913],
+    [36226, 60914], [13822, 60915], 0, [13811, 60917], 60918, [27474, 60919],
+    [37244, 60920], [40869, 60921], [39831, 60922], [38958, 60923],
+    [39092, 60924], [39610, 60925], [40616, 60926], [40580, 60927],
+    [31508, 60929], 60930, [27642, 60931], [34840, 60932], [32632, 60933],
+    60934, [22048, 60935], [60936, 173642], [36471, 60937], [40787, 60938],
+    60939, [36308, 60940], [36431, 60941], [40476, 60942], [36353, 60943],
+    [25218, 60944], [60945, 164733], [36392, 60946], [36469, 60947],
+    [31443, 60948], [31294, 60950], [30936, 60951], [27882, 60952],
+    [35431, 60953], [30215, 60954], [40742, 60956], [27854, 60957],
+    [34774, 60958], [30147, 60959], [60960, 172722], [30803, 60961],
+    [36108, 60963], [29410, 60964], [29553, 60965], [35629, 60966],
+    [29442, 60967], [29937, 60968], [36075, 60969], [60970, 150203],
+    [34351, 60971], [24506, 60972], [34976, 60973], [17591, 60974], 60975,
+    [60977, 159237], 60978, [35454, 60979], [60980, 140571], 60981,
+    [24829, 60982], [30311, 60983], [39639, 60984], [40260, 60985],
+    [37742, 58859, 60986], [39823, 60987], [34805, 60988], 60989, 0,
+    [36087, 60991], [29484, 60992], [38689, 60993], [39856, 60994],
+    [13782, 60995], [29362, 60996], [19463, 60997], [31825, 60998],
+    [39242, 60999], [24921, 61001], [19460, 61002], [40598, 61003],
+    [24957, 61004], 61005, [22367, 61006], [24943, 61007], [25254, 61008],
+    [25145, 61009], 0, [14940, 61011], [25058, 61012], [21418, 61013],
+    [25444, 61015], [26626, 61016], [13778, 61017], [23895, 61018],
+    [36826, 61020], [61021, 167481], 61022, [20697, 61023], [30982, 61025],
+    [21298, 61026], [38456, 61027], [61028, 134971], [16485, 61029], 61030,
+    [30718, 61031], 61032, [31938, 61033], [61034, 155418], [31962, 61035],
+    [31277, 61036], [32870, 61037], [32867, 61038], [32077, 61039],
+    [29957, 61040], [29938, 61041], [35220, 61042], [33306, 61043],
+    [26380, 61044], [32866, 61045], [61046, 160902], [32859, 61047],
+    [29936, 61048], [33027, 61049], [30500, 61050], [35209, 61051],
+    [61052, 157644], [30035, 61053], [34729, 61055], [34766, 61056],
+    [33224, 61057], [34700, 61058], [35401, 61059], [36013, 61060],
+    [35651, 61061], [30507, 61062], [29944, 61063], [34010, 61064],
+    [27058, 61066], [36262, 61067], 61068, [35241, 58392, 61069], 0,
+    [28089, 61071], [34753, 61072], [61073, 147473], [29927, 61074],
+    [15835, 61075], [29046, 61076], [24740, 57702, 61077], [24988, 61078],
+    [15569, 61079], 0, [24695, 61081], 61082, [32625, 61083], 0,
+    [24809, 61086], [19326, 61087], [57344, 132423], [37595, 57345],
+    [57346, 132575], [57347, 147397], [34124, 57348], [17077, 57349],
+    [29679, 57350], [20917, 57351], [13897, 57352], [57353, 149826],
+    [57354, 166372], [37700, 57355], [57356, 137691], [33518, 57357],
+    [57358, 146632], [30780, 57359], [26436, 57360], [25311, 57361],
+    [57362, 149811], [57363, 166314], [57364, 131744], [57365, 158643],
+    [57366, 135941], [20395, 57367], [57368, 140525], [20488, 57369],
+    [57370, 159017], [57371, 162436], [57372, 144896], [57373, 150193],
+    [57374, 140563], 0, [57376, 131966], [24484, 57377], [57378, 131968],
+    [57379, 131911], [28379, 57380], [57381, 132127], 20702, [20737, 57383],
+    [13434, 57384], [20750, 57385], [39020, 57386], [14147, 57387],
+    [33814, 57388], [57389, 149924], [57390, 132231], [20832, 57391],
+    [57392, 144308], [20842, 57393], [57394, 134143], [57395, 139516],
+    [57396, 131813], [57397, 140592], [57398, 132494], [57399, 143923],
+    [57400, 137603], [23426, 57401], [34685, 57402], [57403, 132531],
+    [57404, 146585], [20914, 57405], [20920, 57406], [40244, 57407],
+    [20937, 57408], [20943, 57409], [20945, 57410], [15580, 57411],
+    [20947, 57412], [57413, 150182], [20915, 57414], 0, 0, [20973, 57417],
+    [33741, 57418], [26942, 57419], [57420, 145197], [24443, 57421],
+    [21003, 57422], [21030, 57423], [21052, 57424], [21173, 57425],
+    [21079, 57426], [21140, 57427], [21177, 57428], [21189, 57429],
+    [31765, 57430], [34114, 57431], [21216, 57432], [34317, 57433],
+    [57434, 158483], 0, [57436, 166622], [21833, 57437], [28377, 57438],
+    [57439, 147328], [57440, 133460], [57441, 147436], [21299, 57442], 0,
+    [57444, 134114], [27851, 57445], [57446, 136998], [26651, 57447],
+    [29653, 57448], [24650, 57449], [16042, 57450], [14540, 57451],
+    [57452, 136936], [29149, 57453], [17570, 57454], [21357, 57455],
+    [21364, 57456], [57457, 165547], [21374, 57458], 0, [57460, 136598],
+    [57461, 136723], [30694, 57462], [21395, 57463], [57464, 166555],
+    [21408, 57465], [21419, 57466], [21422, 57467], [29607, 57468],
+    [57469, 153458], [16217, 57470], [29596, 57471], [21441, 57472],
+    [21445, 57473], [27721, 57474], [20041, 57475], [22526, 57476],
+    [21465, 57477], [15019, 57478], [57479, 134031], [21472, 57480],
+    [57481, 147435], [57482, 142755], [21494, 57483], [57484, 134263],
+    [21523, 57485], [28793, 57486], [21803, 57487], [26199, 57488],
+    [27995, 57489], [21613, 57490], [57491, 158547], [57492, 134516],
+    [21853, 57493], [21647, 57494], [21668, 57495], [18342, 57496],
+    [57497, 136973], [57498, 134877], [15796, 57499], [57500, 134477],
+    [57501, 166332], [57502, 140952], [21831, 57503], [19693, 57504],
+    [21551, 57505], [29719, 57506], [21894, 57507], [21929, 57508], 0,
+    [57510, 137431], [57511, 147514], [17746, 57512], [57513, 148533],
+    [26291, 57514], [57515, 135348], [22071, 57516], [26317, 57517],
+    [57518, 144010], [26276, 57519], 0, [22093, 57521], [22095, 57522],
+    [30961, 57523], [22257, 57524], [38791, 57525], [21502, 57526],
+    [22272, 57527], [22255, 57528], [22253, 57529], [57530, 166758],
+    [13859, 57531], [57532, 135759], [22342, 57533], [57534, 147877],
+    [27758, 57535], [28811, 57536], [22338, 57537], [14001, 57538],
+    [57539, 158846], [22502, 57540], [57541, 136214], [22531, 57542],
+    [57543, 136276], [57544, 148323], [22566, 57545], [57546, 150517], 0,
+    [22698, 57548], [13665, 57549], [22752, 57550], [22748, 57551],
+    [57552, 135740], [22779, 57553], [23551, 57554], [22339, 57555],
+    [57556, 172368], [57557, 148088], [37843, 57558], [13729, 57559],
+    [22815, 57560], [26790, 57561], [14019, 57562], [28249, 57563],
+    [57564, 136766], [23076, 57565], 0, [57567, 136850], [34053, 57568],
+    [22985, 57569], [57570, 134478], [57571, 158849], [57572, 159018],
+    [57573, 137180], [23001, 57574], [57575, 137211], [57576, 137138],
+    [57577, 159142], [28017, 57578], [57579, 137256], [57580, 136917],
+    [23033, 57581], [57582, 159301], [23211, 57583], [23139, 57584],
+    [14054, 57585], [57586, 149929], 0, [14088, 57588], [23190, 57589],
+    [29797, 57590], [23251, 57591], [57592, 159649], [57593, 140628],
+    [57595, 137489], [14130, 57596], [57597, 136888], [24195, 57598],
+    [21200, 57599], [23414, 57600], [25992, 57601], [23420, 57602],
+    [57603, 162318], [16388, 57604], [18525, 57605], [57606, 131588],
+    [23509, 57607], [57609, 137780], [57610, 154060], [57611, 132517],
+    [23539, 57612], [23453, 57613], [19728, 57614], [23557, 57615],
+    [57616, 138052], [23571, 57617], [29646, 57618], [23572, 57619],
+    [57620, 138405], [57621, 158504], [23625, 57622], [18653, 57623],
+    [23685, 57624], [23785, 57625], [23791, 57626], [23947, 57627],
+    [57628, 138745], [57629, 138807], [23824, 57630], [23832, 57631],
+    [23878, 57632], [57633, 138916], [23738, 57634], [24023, 57635],
+    [33532, 57636], [14381, 57637], [57638, 149761], [57639, 139337],
+    [57640, 139635], [33415, 57641], [14390, 57642], [15298, 57643],
+    [24110, 57644], [27274, 57645], 0, 57647, [57648, 148668], [57649, 134355],
+    [21414, 57650], [20151, 57651], 0, [21416, 57653], [57654, 137073],
+    [24073, 57655], 57656, [57657, 164994], [24313, 57658], [24315, 57659],
+    [14496, 57660], [24316, 57661], [26686, 57662], [37915, 57663],
+    [24333, 57664], [57665, 131521], [57666, 194708], [15070, 57667],
+    [57669, 135994], [24378, 57670], [57671, 157832], [57672, 140240],
+    [57674, 140401], [24419, 57675], [57677, 159342], [24434, 57678],
+    [37696, 57679], [57680, 166454], [24487, 57681], [23990, 57682],
+    [15711, 57683], [57684, 152144], [57685, 139114], [57686, 159992],
+    [57687, 140904], [37334, 57688], [57689, 131742], [57690, 166441],
+    [24625, 57691], [26245, 57692], [14691, 57694], [15815, 57695],
+    [13881, 57696], [22416, 57697], [57698, 141236], [31089, 57699],
+    [15936, 57700], [24734, 57701], 0, 0, [57704, 149890], [57705, 149903],
+    [57706, 162387], [29860, 57707], [20705, 57708], [23200, 57709],
+    [24932, 57710], [24898, 57712], [57713, 194726], [57714, 159442],
+    [24961, 57715], [20980, 57716], [57717, 132694], [24967, 57718],
+    [23466, 57719], [57720, 147383], [57721, 141407], [25043, 57722],
+    [57723, 166813], [57724, 170333], [25040, 57725], [14642, 57726],
+    [57727, 141696], [57728, 141505], [24611, 57729], [24924, 57730],
+    [25886, 57731], [25483, 57732], [57733, 131352], [25285, 57734],
+    [57735, 137072], [25301, 57736], [57737, 142861], [25452, 57738],
+    [57739, 149983], [14871, 57740], [25656, 57741], [25592, 57742],
+    [57743, 136078], [57744, 137212], [28554, 57746], [57747, 142902], 0,
+    [57750, 153373], [25825, 57751], [25829, 57752], [38011, 57753],
+    [14950, 57754], [25658, 57755], [14935, 57756], [25933, 57757],
+    [28438, 57758], [57759, 150056], [57760, 150051], [25989, 57761],
+    [25965, 57762], [25951, 57763], 0, [26037, 57765], [57766, 149824],
+    [19255, 57767], [26065, 57768], [16600, 57769], [57770, 137257], 57771,
+    [26083, 57772], [24543, 57773], [57774, 144384], [26136, 57775],
+    [57776, 143863], [57777, 143864], [26180, 57778], [57779, 143780],
+    [57780, 143781], [26187, 57781], [57782, 134773], [26215, 57783],
+    [57784, 152038], [26227, 57785], 0, [57788, 143921], [57789, 165364],
+    [57790, 143816], [57791, 152339], [30661, 57792], [57793, 141559],
+    [39332, 57794], [26370, 57795], [57796, 148380], [57797, 150049],
+    [27130, 57799], [57800, 145346], 0, [26471, 57802], [26466, 57803],
+    [57804, 147917], [57805, 168173], [26583, 57806], [17641, 57807],
+    [26658, 57808], [28240, 57809], [37436, 57810], [26625, 57811],
+    [57812, 144358], [57813, 159136], [26717, 57814], [57815, 144495],
+    [27105, 57816], [27147, 57817], [57818, 166623], [26995, 57819],
+    [26819, 57820], [57821, 144845], [26881, 57822], [26880, 57823],
+    [14849, 57825], [57826, 144956], [15232, 57827], [26540, 57828],
+    [26977, 57829], [57830, 166474], [17148, 57831], [26934, 57832],
+    [27032, 57833], [15265, 57834], [57835, 132041], [33635, 57836],
+    [20624, 57837], [27129, 57838], [57839, 144985], [57840, 139562],
+    [27205, 57841], [57842, 145155], [27293, 57843], [15347, 57844],
+    [26545, 57845], [27336, 57846], [57847, 168348], [15373, 57848],
+    [27421, 57849], [57850, 133411], [24798, 57851, 60308], [27445, 57852],
+    [27508, 57853], [57854, 141261], [28341, 57855], [57856, 146139], 0,
+    [57858, 137560], [14144, 57859], [21537, 57860], [57861, 146266],
+    [27617, 57862], [57863, 147196], [27612, 57864], [27703, 57865],
+    [57866, 140427], [57867, 149745], [57868, 158545], [27738, 57869],
+    [33318, 57870], [27769, 57871], [57872, 146876], [17605, 57873],
+    [57874, 146877], [57875, 147876], [57876, 149772], [57877, 149760],
+    [57878, 146633], [14053, 57879], [15595, 57880], [57881, 134450],
+    [39811, 57882], [57883, 143865], [57884, 140433], [32655, 57885],
+    [26679, 57886], [57887, 159013], [57888, 159137], [57889, 159211],
+    [28054, 57890], [27996, 57891], [28284, 57892], [28420, 57893],
+    [57894, 149887], [57895, 147589], [57896, 159346], [34099, 57897],
+    [57898, 159604], [20935, 57899], 0, 0, [33838, 57902], [57903, 166689], 0,
+    [57905, 146991], [29779, 57906], [57907, 147330], [31180, 57908],
+    [28239, 57909], [23185, 57910], [57911, 143435], [28664, 57912],
+    [14093, 57913], [28573, 57914], [57915, 146992], [28410, 57916],
+    [57917, 136343], [57918, 147517], [17749, 57919], [37872, 57920],
+    [28484, 57921], [28508, 57922], [15694, 57923], [28532, 57924],
+    [57925, 168304], [15675, 57926], [28575, 57927], [57928, 147780],
+    [28627, 57929], [57930, 147601], [57931, 147797], [57932, 147513],
+    [57933, 147440], [57934, 147380], [57935, 147775], [20959, 57936],
+    [57937, 147798], [57938, 147799], [57939, 147776], [57940, 156125],
+    [28747, 57941], [28798, 57942], [28839, 57943], 0, [28876, 57945],
+    [28885, 57946], [28886, 57947], [28895, 57948], [16644, 57949],
+    [15848, 57950], [29108, 57951], [29078, 57952], [57953, 148087],
+    [28971, 57954], [28997, 57955], [23176, 57956], [29002, 57957], 0,
+    [57960, 148325], [29007, 57961], [37730, 57962], [57963, 148161],
+    [28972, 57964], [57965, 148570], [57966, 150055], [57967, 150050],
+    [29114, 57968], [57969, 166888], [28861, 57970], [29198, 57971],
+    [37954, 57972], [29205, 57973], [22801, 57974], [37955, 57975],
+    [29220, 57976], [37697, 57977], [57978, 153093], [29230, 57979],
+    [29248, 57980], [57981, 149876], [26813, 57982], [29269, 57983],
+    [29271, 57984], [15957, 57985], [57986, 143428], [26637, 57987],
+    [28477, 57988], [29314, 57989], 0, [29483, 57991], [57992, 149539],
+    [57993, 165931], [18669, 57994], [57995, 165892], [29480, 57996],
+    [29486, 57997], [29647, 57998], [29610, 57999], [58000, 134202],
+    [58001, 158254], [29641, 58002], [29769, 58003], [58004, 147938],
+    [58005, 136935], [58006, 150052], [26147, 58007], [14021, 58008],
+    [58009, 149943], [58010, 149901], [58011, 150011], [29687, 58012],
+    [29717, 58013], [26883, 58014], [58015, 150054], [29753, 58016],
+    [16087, 58018], 0, [58020, 141485], [29792, 58021], [58022, 167602],
+    [29767, 58023], [29668, 58024], [29814, 58025], [33721, 58026],
+    [29804, 58027], [29812, 58029], [37873, 58030], [27180, 58031],
+    [29826, 58032], [18771, 58033], [58034, 150156], [58035, 147807],
+    [58036, 150137], [58037, 166799], [23366, 58038], [58039, 166915],
+    [58040, 137374], [29896, 58041], [58042, 137608], [29966, 58043],
+    [29982, 58045], [58046, 167641], [58047, 137803], [23511, 58048],
+    [58049, 167596], [37765, 58050], [30029, 58051], [30026, 58052],
+    [30055, 58053], [30062, 58054], [58055, 151426], [16132, 58056],
+    [58057, 150803], [30094, 58058], [29789, 58059], [30110, 58060],
+    [30132, 58061], [30210, 58062], [30252, 58063], [30289, 58064],
+    [30287, 58065], [30319, 58066], 58067, [58068, 156661], [30352, 58069],
+    [33263, 58070], [14328, 58071], [58072, 157969], [58073, 157966],
+    [30369, 58074], [30373, 58075], [30391, 58076], [30412, 58077],
+    [58078, 159647], [33890, 58079], [58080, 151709], [58081, 151933],
+    [58082, 138780], [30494, 58083], [30502, 58084], [30528, 58085],
+    [25775, 58086], [58087, 152096], [30552, 58088], [58089, 144044],
+    [30639, 58090], [58091, 166244], [58092, 166248], [58093, 136897],
+    [30708, 58094], 0, [26826, 58098], [30895, 58099], [30919, 58100],
+    [30931, 58101], [38565, 58102], [31022, 58103], [58104, 153056],
+    [30935, 58105], [31028, 58106], [30897, 58107], [58108, 161292],
+    [36792, 58109], [34948, 58110], [58113, 140828], [31110, 58114],
+    [35072, 58115], [26882, 58116], [31104, 58117], [58118, 153687],
+    [31133, 58119], [58120, 162617], [31036, 58121], [31145, 58122],
+    [28202, 58123], [58124, 160038], [16040, 58125], [31174, 58126],
+    [58127, 168205], [31188, 58128], 0, [21797, 62526], 0, [62528, 134210],
+    [62529, 134421], [62530, 151851], [21904, 62531], [62532, 142534],
+    [14828, 62533], [62534, 131905], [36422, 62535], [62536, 150968],
+    [62537, 169189], 0, [62539, 164030], [30586, 62540], [62541, 142392],
+    [14900, 62542], [18389, 62543], [62544, 164189], [62545, 158194],
+    [62546, 151018], [25821, 62547], [62548, 134524], [62549, 135092],
+    [62550, 134357], 0, [25741, 62552], [36478, 62553], [62554, 134806], 0,
+    [62556, 135012], [62557, 142505], [62558, 164438], [62559, 148691], 0,
+    [62561, 134470], [62562, 170573], [62563, 164073], [18420, 62564],
+    [62565, 151207], [62566, 142530], [39602, 62567], [14951, 62568],
+    [62569, 169460], [16365, 62570], [13574, 62571], [62572, 152263],
+    [62573, 169940], 0, [62575, 142660], [40302, 62576], [38933, 62577], 0,
+    [17369, 62579], 0, [25780, 62581], [21731, 62582], 0, [62584, 142282], 0,
+    [14843, 62586], 0, [62588, 157402], [62589, 157462], [62590, 162208],
+    [25834, 62591], [62592, 151634], [62593, 134211], [36456, 62594], 0,
+    [62596, 166732], [62597, 132913], 0, [18443, 62599], [62600, 131497],
+    [16378, 62601], [22643, 62602], [62603, 142733], 0, [62605, 148936],
+    [62606, 132348], [62607, 155799], [62608, 134988], 0, [21881, 62610], 0,
+    [17338, 62612], 0, [19124, 62614], [62615, 141926], [62616, 135325],
+    [33194, 62617], [39157, 62618], [62619, 134556], [25465, 62620],
+    [14846, 62621], [62622, 141173], [36288, 62623], [22177, 62624],
+    [25724, 62625], [15939, 62626], 0, [62628, 173569], [62629, 134665],
+    [62630, 142031], 0, 0, [62633, 135368], [62634, 145858], [14738, 62635],
+    [14854, 62636], [62637, 164507], [13688, 62638], [62639, 155209],
+    [62640, 139463], 0, 0, [62643, 142514], [62644, 169760], [13500, 62645],
+    [27709, 62646], [62647, 151099], 0, 0, [62650, 161140], [62651, 142987],
+    [62652, 139784], [62653, 173659], [62654, 167117], [62655, 134778],
+    [62656, 134196], [62683, 161337], [62684, 142286], [62687, 142417],
+    [14872, 62689], [62691, 135367], [62693, 173618], [62695, 167122],
+    [62696, 167321], [62697, 167114], [38314, 62698], 0, [62706, 161630],
+    [28992, 62708], 0, [20822, 62385], 0, [20616, 62487], 0, [13459, 62489],
+    [20870, 62491], [24130, 63037], [20997, 62495], [21031, 62436],
+    [21113, 62497], 0, [13651, 62504], [21442, 62505], [21343, 62715], 0,
+    [21823, 62520], 0, [21976, 59986], [13789, 62722], [22049, 63067], 0,
+    [22100, 60044], [60148, 135291], 0, [60153, 135379], 0, [61095, 135934], 0,
+    0, [14265, 60104], [23745, 61099], [23829, 63066], [23894, 63030],
+    [14392, 63036], [20097, 62477], [24253, 63038], [14612, 63042],
+    [25017, 63050], [25232, 63054], [25368, 63056], [25690, 63063],
+    [25745, 62381], [33133, 62709], [33156, 59922], [33171, 59924],
+    [26624, 63080], [15292, 63093], [29327, 60517], [29389, 59781], 0,
+    [29497, 59785], [30018, 59811], [30172, 59817], [16320, 59818],
+    [60278, 151205], [16343, 59820], 0, 30336, [30348, 59824, 151388],
+    [16552, 59845], [30777, 59846], [16643, 59855], [31377, 59863],
+    [31771, 59876], [31981, 59884], [32659, 62658], [32686, 59892], 0,
+    [33535, 59936], [22623, 59981], [34482, 59960], 0, [34699, 59963],
+    [35143, 59969], 0, [35369, 59972], 0, [36465, 59988], [60484, 164233],
+    [36528, 59990], 0, [37214, 62443], [37260, 62441], [39182, 60051],
+    [39196, 60054], 0, 0, [39809, 60066], [40384, 60080], [40339, 60078],
+    [40620, 60085], [19857, 60540], 0, 37818, [40571, 60084], [28809, 63148],
+    [29512, 59788], 0, [31129, 59858], [36791, 59997], 0, [39234, 60056],
+    {s: 193}, 8364, {s: 4}, [12443, 63518], [12444, 63519], [11904, 63520],
+    {f: 5, c: 62211}, [62216, 131340], 62217, [62218, 131281], [62219, 131277],
+    {f: 2, c: 62220}, [62222, 131275], [62223, 139240], 62224, [62225, 131274],
+    {f: 4, c: 62226}, [62230, 131342], {f: 2, c: 62231}, {f: 2, c: 62776},
+    [62778, 138177], [62779, 194680], [12205, 38737, 62780], [62781, 131206],
+    [20059, 62782], [20155, 62783], [13630, 62784], [23587, 62785],
+    [24401, 62786], [24516, 62787], [14586, 62788], [25164, 62789],
+    [25909, 62790], [27514, 62791], [27701, 62792], [27706, 62793],
+    [28780, 62794], [29227, 62795], [20012, 62796], [29357, 62797],
+    [62798, 149737], [32594, 62799], [31035, 62800], [31993, 62801],
+    [32595, 62802], [62803, 156266], [13505, 62804], [62806, 156491],
+    [32770, 62807], [32896, 62808], [62809, 157202], [62810, 158033],
+    [21341, 62811], [34916, 62812], [35265, 62813], [62814, 161970],
+    [35744, 62815], [36125, 62816], [38021, 62817], [38264, 62818],
+    [38271, 62819], [38376, 62820], [62821, 167439], [38886, 62822],
+    [39029, 62823], [39118, 62824], [39134, 62825], [39267, 62826],
+    [62827, 170000], [40060, 62828], [40479, 62829], [40644, 62830],
+    [27503, 62831], [62832, 63751], [20023, 62833], [62834, 131207],
+    [38429, 62835], [25143, 62836], [38050, 62837], [11908, 63521],
+    [11910, 63522], [11911, 63523], [11912, 63524], [11914, 63525],
+    [11916, 63526], [11917, 63527], [11925, 63528], [11932, 63529],
+    [11941, 63531], [11943, 63532], [11946, 63533], [11948, 63534],
+    [11950, 63535], [11958, 63536], [11964, 63537], [11966, 63538],
+    [11978, 63540], [11980, 63541], [11981, 63542], [11983, 63543],
+    [11990, 63544], [11991, 63545], [11998, 63546], [62368, 172969],
+    [62369, 135493], [25866, 62371], [20029, 62374], [28381, 62375],
+    [40270, 62376], [37343, 62377], [62380, 161589], [20250, 62382],
+    [20264, 62383], [20392, 62384], [20852, 62386], [20892, 62387],
+    [20964, 62388], [21153, 62389], [21160, 62390], [21307, 62391],
+    [21326, 62392], [21457, 62393], [21464, 62394], [22242, 62395],
+    [22768, 62396], [22788, 62397], [22791, 62398], [22834, 62399],
+    [22836, 62400], [23398, 62401], [23454, 62402], [23455, 62403],
+    [23706, 62404], [24198, 62405], [24635, 62406], [25993, 62407],
+    [26622, 62408], [26628, 62409], [26725, 62410], [27982, 62411],
+    [28860, 62412], [30005, 62413], [32420, 62414], [32428, 62415],
+    [32442, 62416], [32455, 62417], [32463, 62418], [32479, 62419],
+    [32518, 62420], [32567, 62421], [33402, 62422], [33487, 62423],
+    [33647, 62424], [35270, 62425], [35774, 62426], [35810, 62427],
+    [36710, 62428], [36711, 62429], [36718, 62430], [29713, 62431],
+    [31996, 62432], [32205, 62433], [26950, 62434], [31433, 62435],
+    [30904, 62442], [32956, 62444], [36107, 62446], [33014, 62447],
+    [62448, 133607], [32927, 62451], [40647, 62452], [19661, 62453],
+    [40393, 62454], [40460, 62455], [19518, 62456], [62457, 171510],
+    [62458, 159758], [40458, 62459], [62460, 172339], [13761, 62461],
+    [28314, 62463], [33342, 62464], [29977, 62465], [18705, 62467],
+    [39532, 62468], [39567, 62469], [40857, 62470], [31111, 62471],
+    [62472, 164972], [62473, 138698], [62474, 132560], [62475, 142054],
+    [20004, 62476], [20096, 62478], [20103, 62479], [20159, 62480],
+    [20203, 62481], [20279, 62482], [13388, 62483], [20413, 62484],
+    [15944, 62485], [20483, 62486], [13437, 62488], [13477, 62490],
+    [22789, 62492], [20955, 62493], [20988, 62494], [20105, 62496],
+    [21136, 62498], [21287, 62499], [13767, 62500], [21417, 62501],
+    [13649, 62502], [21424, 62503], [21539, 62506], [13677, 62507],
+    [13682, 62508], [13953, 62509], [21651, 62510], [21667, 62511],
+    [21684, 62512], [21689, 62513], [21712, 62514], [21743, 62515],
+    [21784, 62516], [21795, 62517], [21800, 62518], [13720, 62519],
+    [13733, 62521], [13759, 62522], [21975, 62523], [13765, 62524],
+    [62525, 163204], [16467, 62538], [62551, 135412], [62555, 134155],
+    [62574, 161992], [62580, 155813], [62583, 142668], [62585, 135287],
+    [62587, 135279], [62595, 139681], [62609, 134550], [16571, 62611],
+    [62631, 142537], [22098, 62641], [62642, 134961], [62657, 157724],
+    [62659, 135375], [62660, 141315], [62661, 141625], [13819, 62662],
+    [62663, 152035], [62664, 134796], [62665, 135053], [62666, 134826],
+    [16275, 62667], [62668, 134960], [62669, 134471], [62670, 135503],
+    [62671, 134732], [62673, 134827], [62674, 134057], [62675, 134472],
+    [62676, 135360], [62677, 135485], [16377, 62678], [62679, 140950],
+    [25650, 62680], [62681, 135085], [62682, 144372], [62685, 134526],
+    [62686, 134527], [62688, 142421], [62690, 134808], [62692, 134958],
+    [62694, 158544], [21708, 62699], [33476, 62700], [21945, 62701],
+    [62703, 171715], [39974, 62704], [39606, 62705], [62707, 142830],
+    [33004, 62710], [23580, 62711], [62712, 157042], [33076, 62713],
+    [14231, 62714], [62716, 164029], [37302, 62717], [62718, 134906],
+    [62719, 134671], [62720, 134775], [62721, 134907], [62723, 151019],
+    [13833, 62724], [62725, 134358], [22191, 62726], [62727, 141237],
+    [62728, 135369], [62729, 134672], [62730, 134776], [62731, 135288],
+    [62732, 135496], [62733, 164359], [62734, 136277], [62735, 134777],
+    [62736, 151120], [62737, 142756], [23124, 62738], [62739, 135197],
+    [62740, 135198], [62741, 135413], [62742, 135414], [22428, 62743],
+    [62744, 134673], [62745, 161428], [62746, 164557], [62747, 135093],
+    [62748, 134779], [62749, 151934], [14083, 62750], [62751, 135094],
+    [62752, 135552], [62753, 152280], [62754, 172733], [62755, 149978],
+    [62756, 137274], [62757, 147831], [62758, 164476], [22681, 62759],
+    [21096, 62760], [13850, 62761], [62762, 153405], [31666, 62763],
+    [23400, 62764], [18432, 62765], [19244, 62766], [40743, 62767],
+    [18919, 62768], [39967, 62769], [39821, 62770], [62771, 154484],
+    [62772, 143677], [22011, 62773], [13810, 62774], [22153, 62775],
+    [23870, 63028], [23880, 63029], [15868, 63031], [14351, 63032],
+    [23972, 63033], [23993, 63034], [14368, 63035], [24357, 63039],
+    [24451, 63040], [14600, 63041], [14655, 63043], [14669, 63044],
+    [24791, 63045], [24893, 63046], [23781, 63047], [14729, 63048],
+    [25015, 63049], [25039, 63051], [14776, 63052], [25132, 63053],
+    [25317, 63055], [14840, 63057], [22193, 63058], [14851, 63059],
+    [25570, 63060], [25595, 63061], [25607, 63062], [14923, 63064],
+    [25792, 63065], [40863, 63068], [14999, 63069], [25990, 63070],
+    [15037, 63071], [26111, 63072], [26195, 63073], [15090, 63074],
+    [26258, 63075], [15138, 63076], [26390, 63077], [15170, 63078],
+    [26532, 63079], [15192, 63081], [26698, 63082], [26756, 63083],
+    [15218, 63084], [15217, 63085], [15227, 63086], [26889, 63087],
+    [26947, 63088], [29276, 63089], [26980, 63090], [27039, 63091],
+    [27013, 63092], [27094, 63094], [15325, 63095], [27237, 63096],
+    [27252, 63097], [27249, 63098], [27266, 63099], [15340, 63100],
+    [27289, 63101], [15346, 63102], [27307, 63103], [27317, 63104],
+    [27348, 63105], [27382, 63106], [27521, 63107], [27585, 63108],
+    [27626, 63109], [27765, 63110], [27818, 63111], [15563, 63112],
+    [27906, 63113], [27910, 63114], [27942, 63115], [28033, 63116],
+    [15599, 63117], [28068, 63118], [28081, 63119], [28181, 63120],
+    [28184, 63121], [28201, 63122], [28294, 63123], [63124, 166336],
+    [28347, 63125], [28386, 63126], [28378, 63127], [40831, 63128],
+    [28392, 63129], [28393, 63130], [28452, 63131], [28468, 63132],
+    [15686, 63133], [63134, 147265], [28545, 63135], [28606, 63136],
+    [15722, 63137], [15733, 63138], [29111, 63139], [23705, 63140],
+    [15754, 63141], [28716, 63142], [15761, 63143], [28752, 63144],
+    [28756, 63145], [28783, 63146], [28799, 63147], [63149, 131877],
+    [17345, 63150], [13809, 63151], [63152, 134872], [13902, 58134],
+    [15789, 58172], [58173, 154725], [26237, 58183], [31860, 58188],
+    [29837, 58197], [32402, 58215], [17667, 58232], [58260, 151480],
+    [58270, 133901], [58277, 158474], [13438, 58311], [58317, 143087],
+    [58325, 146613], [58343, 159385], [34673, 58364], [25537, 58385],
+    [30583, 58387], [35210, 58390], [58406, 147343], [35660, 58415],
+    [58440, 150729], [18730, 58464], [58471, 172052], [58472, 165564],
+    [58473, 165121], [15088, 58490], [28815, 58511], [58529, 140922],
+    [58637, 158120], [58646, 148043], [26760, 58662], [58664, 139611],
+    [40802, 58702], [37830, 58793], [58802, 131967], [37734, 58888],
+    [37519, 58901], [34324, 58954], [58986, 173147], [16784, 59010],
+    [26511, 59045], [26654, 59048], [14435, 59051], [59077, 149996],
+    [15129, 59128], [33942, 59176], [59241, 149858], [14818, 59254],
+    [33920, 59259], [17262, 59328], [38769, 59402], [39323, 59427],
+    [18733, 59499], [28439, 59703], [59704, 160009], [28838, 59746],
+    [59752, 150095], [32357, 59753], [23855, 59755], [15859, 59756],
+    [59758, 150109], [59759, 137183], [32164, 59760], [33830, 59761],
+    [21637, 59762], [59763, 146170], [59765, 131604], [22398, 59766],
+    [59767, 133333], [59768, 132633], [16357, 59769], [59770, 139166],
+    [59771, 172726], [28675, 59772], [59773, 168283], [23920, 59774],
+    [29583, 59775], [59777, 166489], [59778, 168992], [20424, 59779],
+    [32743, 59780], [29456, 59782], [29496, 59784], [29505, 59787],
+    [16041, 59789], [29173, 59792], [59793, 149746], [29665, 59794],
+    [16074, 59796], [16081, 59798], [29721, 59801], [29726, 59802],
+    [29727, 59803], [16098, 59804], [16112, 59805], [16116, 59806],
+    [16122, 59807], [29907, 59808], [16142, 59809], [16211, 59810],
+    [30061, 59812], [30066, 59813], [30093, 59814], [16252, 59815],
+    [30152, 59816], [30285, 59819], [30324, 59821], [16348, 59822],
+    [30330, 59823], [29064, 59825], [22051, 59826], [35200, 59827],
+    [16413, 59829], [30531, 59830], [16441, 59831], [16453, 59833],
+    [13787, 59834], [30616, 59835], [16490, 59836], [16495, 59837],
+    [30654, 59839], [30667, 59840], [30744, 59842], [30748, 59844],
+    [30791, 59847], [30801, 59848], [30822, 59849], [33864, 59850],
+    [59851, 152885], [31027, 59852], [31026, 59854], [16649, 59856],
+    [31121, 59857], [31238, 59860], [16743, 59862], [16818, 59864],
+    [31420, 59865], [33401, 59866], [16836, 59867], [31439, 59868],
+    [31451, 59869], [16847, 59870], [31586, 59872], [31596, 59873],
+    [31611, 59874], [31762, 59875], [16992, 59877], [17018, 59878],
+    [31867, 59879], [31900, 59880], [17036, 59881], [31928, 59882],
+    [17044, 59883], [36755, 59885], [28864, 59886], [59887, 134351],
+    [32207, 59888], [32212, 59889], [32208, 59890], [32253, 59891],
+    [32692, 59893], [29343, 59894], [17303, 59895], [32800, 59896],
+    [32805, 59897], [32814, 59899], [32817, 59900], [32852, 59901],
+    [22452, 59903], [28832, 59904], [32951, 59905], [33001, 59906],
+    [17389, 59907], [33036, 59908], [33038, 59910], [33042, 59911],
+    [33044, 59913], [17409, 59914], [15161, 59915], [33110, 59916],
+    [33113, 59917], [33114, 59918], [17427, 59919], [33148, 59921],
+    [17445, 59923], [17453, 59925], [33189, 59926], [22511, 59927],
+    [33217, 59928], [33252, 59929], [33364, 59930], [17551, 59931],
+    [33398, 59933], [33482, 59934], [33496, 59935], [17584, 59937],
+    [33623, 59938], [38505, 59939], [33797, 59941], [28917, 59942],
+    [33892, 59943], [33928, 59945], [17668, 59946], [33982, 59947],
+    [34017, 59948], [34040, 59949], [34064, 59950], [34104, 59951],
+    [34130, 59952], [17723, 59953], [34159, 59954], [34160, 59955],
+    [34272, 59956], [17783, 59957], [34418, 59958], [34450, 59959],
+    [34543, 59961], [38469, 59962], [17926, 59964], [17943, 59965],
+    [34990, 59966], [35071, 59967], [35108, 59968], [35217, 59970],
+    [59971, 162151], [35384, 59973], [35476, 59974], [35508, 59975],
+    [35921, 59976], [36052, 59977], [36082, 59978], [36124, 59979],
+    [18328, 59980], [36291, 59982], [18413, 59983], [36410, 59985],
+    [22356, 59987], [22005, 59989], [18487, 59991], [36558, 59992],
+    [36578, 59993], [36580, 59994], [36589, 59995], [36594, 59996],
+    [36801, 59998], [36810, 59999], [36812, 60000], [36915, 60001],
+    [18605, 60003], [39136, 60004], [37395, 60005], [18718, 60006],
+    [37416, 60007], [37464, 60008], [37483, 60009], [37553, 60010],
+    [37550, 60011], [37567, 60012], [37603, 60013], [37611, 60014],
+    [37619, 60015], [37620, 60016], [37629, 60017], [37699, 60018],
+    [37764, 60019], [37805, 60020], [18757, 60021], [18769, 60022],
+    [37911, 60024], [37917, 60026], [37933, 60027], [37950, 60028],
+    [18794, 60029], [37972, 60030], [38009, 60031], [38189, 60032],
+    [38306, 60033], [18855, 60034], [38388, 60035], [38451, 60036],
+    [18917, 60037], [18980, 60039], [38720, 60040], [18997, 60041],
+    [38834, 60042], [38850, 60043], [19172, 60045], [39097, 60047],
+    [19225, 60048], [39153, 60049], [22596, 60050], [39193, 60052],
+    [39223, 60055], [39261, 60057], [39266, 60058], [19312, 60059],
+    [39365, 60060], [19357, 60061], [39484, 60062], [39695, 60063],
+    [39785, 60065], [39901, 60067], [39921, 60068], [39924, 60069],
+    [19565, 60070], [39968, 60071], [14191, 60072], [60073, 138178],
+    [40265, 60074], [40702, 60076], [22096, 60077], [40381, 60079],
+    [40444, 60081], [38134, 60082], [36790, 60083], [40625, 60086],
+    [40637, 60087], [40646, 60088], [38108, 60089], [40674, 60090],
+    [40689, 60091], [40696, 60092], [40772, 60094], [60095, 131220],
+    [60096, 131767], [60097, 132000], [38083, 60099], [60101, 132311],
+    [38081, 60103], [60105, 132565], [60106, 132629], [60107, 132726],
+    [60108, 136890], [22359, 60109], [29043, 60110], [60111, 133826],
+    [60112, 133837], [60113, 134079], [60115, 194619], [60116, 134091],
+    [21662, 60117], [60118, 134139], [60119, 134203], [60120, 134227],
+    [60121, 134245], [60122, 134268], [60124, 134285], [60126, 134325],
+    [60127, 134365], [60128, 134381], [60129, 134511], [60130, 134578],
+    [60131, 134600], [60135, 134660], [60136, 134670], [60137, 134871],
+    [60138, 135056], [60139, 134957], [60140, 134771], [60142, 135100],
+    [60144, 135260], [60145, 135247], [60146, 135286], [60149, 135304],
+    [60150, 135318], [13895, 60151], [60152, 135359], [60154, 135471],
+    [60155, 135483], [21348, 60156], [60158, 135907], [60159, 136053],
+    [60160, 135990], [60162, 136567], [60163, 136729], [60164, 137155],
+    [60165, 137159], [28859, 60167], [60168, 137261], [60169, 137578],
+    [60170, 137773], [60171, 137797], [60172, 138282], [60173, 138352],
+    [60174, 138412], [60175, 138952], [60177, 138965], [60178, 139029],
+    [29080, 60179], [60181, 139333], [27113, 60182], [14024, 60183],
+    [60184, 139900], [60185, 140247], [60186, 140282], [60187, 141098],
+    [60188, 141425], [60189, 141647], [60191, 141671], [60192, 141715],
+    [60193, 142037], [60195, 142056], [60197, 142094], [60199, 142143],
+    [60202, 142412], [60204, 142472], [60205, 142519], [60206, 154600],
+    [60207, 142600], [60208, 142610], [60209, 142775], [60210, 142741],
+    [60211, 142914], [60212, 143220], [60213, 143308], [60214, 143411],
+    [60215, 143462], [60216, 144159], [60217, 144350], [60222, 144743],
+    [60223, 144883], [60227, 144922], [60228, 145174], [22709, 60231],
+    [60234, 146087], [60237, 146961], [60238, 147129], [60243, 147737],
+    [60245, 148206], [60246, 148237], [60248, 148276], [60249, 148374],
+    [60258, 148484], [60259, 148694], [22408, 60260], [60261, 149108],
+    [60263, 149295], [60271, 149522], [60272, 149755], [60273, 150037],
+    [60275, 150208], [22885, 60277], [60279, 151430], [60282, 151596],
+    [22335, 60284], [60286, 152217], [60287, 152601], [60291, 152646],
+    [60292, 152686], [60296, 152895], [60298, 152926], [60300, 152930],
+    [60301, 152934], [60302, 153543], [60304, 153693], [60309, 153859],
+    [60312, 154286], [60313, 154505], [60314, 154630], [22433, 60316],
+    [29009, 60317], [60319, 155906], [60322, 156082], [60325, 156674],
+    [60326, 156746], [60330, 156804], [60334, 156808], [60336, 156946],
+    [60338, 157119], [60339, 157365], [22201, 60347], [60349, 157436],
+    [13848, 60355], [60357, 157593], [60358, 157806], [60360, 157790],
+    [60362, 157895], [60366, 157990], [60368, 158009], [60371, 158202],
+    [60373, 158253], [60378, 158260], [60379, 158555], [60383, 158621],
+    [60385, 158884], [60388, 159150], [60392, 159819], [60393, 160205],
+    [60395, 160384], [60396, 160389], [60399, 160395], [60401, 160486],
+    [38047, 60404], [60405, 160848], [14009, 60416], [60424, 161740],
+    [60425, 161880], [22230, 60426], [60435, 162269], [60441, 162301],
+    [60442, 162314], [60443, 162571], [60444, 163174], [60448, 163849],
+    [60459, 163875], [60463, 163912], [60466, 163971], [60479, 163984],
+    [60480, 164084], [60481, 164142], [60483, 164175], [60485, 164271],
+    [60486, 164378], [60487, 164614], [60488, 164655], [60489, 164746],
+    [60491, 164968], [60492, 165546], [25574, 60494], [60495, 166230],
+    [60498, 166328], [60500, 166375], [60502, 166376], [60503, 166726],
+    [60504, 166868], [60506, 166921], [60508, 167877], [60509, 168172],
+    [60511, 168208], [60512, 168252], [15863, 60513], [60514, 168286],
+    [60515, 150218], [36816, 60516], [60519, 169191], [60521, 169392],
+    [60522, 169400], [60523, 169778], [60524, 170193], [60525, 170313],
+    [60526, 170346], [60527, 170435], [60528, 170536], [60529, 170766],
+    [60530, 171354], [60531, 171419], [32415, 60532], [60533, 171768],
+    [60534, 171811], [19620, 60535], [38215, 60536], [60537, 172691],
+    [29090, 60538], [60539, 172799], [60542, 173515], [19868, 60543],
+    [60544, 134300], [36798, 60545], [36794, 60547], [60548, 140464],
+    [36793, 60549], [60550, 150163], [20202, 60555], [60557, 166700],
+    [36480, 60560], [60561, 137205], [60563, 166764], [60564, 166809],
+    [60566, 157359], [60568, 161365], [60570, 153141], [60571, 153942],
+    [20122, 60572], [60573, 155265], [60576, 134765], [60579, 147080],
+    [60580, 150686], [60583, 137206], [60584, 137339], [60587, 154698],
+    [60589, 152337], [15814, 60590], [60596, 155352], [19996, 60600],
+    [60601, 135146], [60602, 134473], [60603, 145082], [60638, 151880],
+    [21982, 60644], [34694, 60672], [60676, 135361], [60679, 149254],
+    [23440, 60680], [60682, 157843], [60684, 141044], [60685, 163119],
+    [60686, 147875], [60687, 163187], [60688, 159440], [60689, 160438],
+    [60691, 135641], [60693, 146684], [60694, 173737], [60695, 134828],
+    [60698, 138402], [60700, 151490], [60702, 135147], [60706, 142752],
+    [60710, 135148], [60711, 134666], [60714, 135149], [60717, 135559],
+    [19994, 60721], [19972, 60722], [23309, 60724], [13996, 60727],
+    [21373, 60729], [13989, 60730], [22682, 60732], [60733, 150382],
+    [22442, 60736], [60737, 154261], [60738, 133497], [60741, 140389],
+    [60746, 146686], [60747, 171824], [60749, 151465], [60750, 169374],
+    [60753, 146870], [60755, 157619], [60756, 145184], [60759, 147191],
+    [60760, 146988], [60785, 143578], [60789, 135849], [22439, 60790],
+    [60791, 149859], [60794, 159918], [60801, 137068], [60806, 160100],
+    [60809, 159010], [60810, 150242], [39963, 60837], [60838, 149822],
+    [15878, 60846], [60881, 159011], [60887, 132092], [60891, 146685],
+    [60893, 149785], [22394, 60904], [21722, 60912], [29050, 60928],
+    [60949, 150135], [60955, 166490], [60962, 194624], [60976, 137275],
+    [61000, 155993], [61014, 144373], [61019, 166850], [61024, 138566],
+    [61054, 159441], [13877, 61065], [61084, 166701], [21024, 61088],
+    [15384, 61089], [61090, 146631], [61091, 155351], [61092, 161366],
+    [61093, 152881], [61094, 137540], [61096, 170243], [61097, 159196],
+    [61098, 159917], [61100, 156077], [61101, 166415], [61102, 145015],
+    [61103, 131310], [61104, 157766], [61105, 151310], [17762, 61106],
+    [23327, 61107], [61108, 156492], [40784, 61109], [40614, 61110],
+    [61111, 156267], [20962, 57415], [21314, 57416], [26285, 57520],
+    [22620, 57547], [21843, 57566], [15749, 57594], [24928, 57608],
+    [18606, 57668], [38845, 57676], [57693, 137335], [24755, 57703],
+    [33828, 57711], [38932, 57748], [57749, 147596], [57764, 143486],
+    [57787, 138813], [15147, 57798], [15666, 57824], [57857, 132021],
+    [28801, 57944], [23708, 57959], [58017, 132547], [14128, 58028],
+    [58096, 136054], [58097, 150034], [58111, 166699], [58112, 155779],
+    [256, 62233], [193, 62234], [461, 62235], [192, 62236], [274, 62237],
+    [201, 62238], [282, 62239], [200, 62240], [332, 62241], [211, 62242],
+    [465, 62243], [210, 62244], 62245, [7870, 62246], 62247, [7872, 62248],
+    [202, 62249], [257, 62250], [225, 62251], [462, 62252], [224, 62253],
+    [593, 62254], [275, 62255], [233, 62256], [283, 62257], [232, 62258],
+    [299, 62259], [237, 62260], [464, 62261], [236, 62262], [333, 62263],
+    [243, 62264], [466, 62265], [242, 62266], [363, 62267], [250, 62268],
+    [468, 62269], [249, 62270], [470, 62271], [472, 62272], [474, 62273],
+    [476, 62274], [252, 62275], 62276, [7871, 62277], 62278, [7873, 62279],
+    [234, 62280], [609, 62281], [643, 63551], [592, 63552], [603, 63553],
+    [596, 63554], [629, 63555], [339, 63556], [248, 63557], [331, 63558],
+    [650, 63559], [618, 63560], {f: 2, c: 62282}, [11933, 63530],
+    [11974, 63539], [12003, 63547], 20539, 28158, [62841, 171123], 62842,
+    [15817, 62843], 34959, [62845, 147790], 28791, 23797, [19232, 62848],
+    [62849, 152013], [13657, 62850], [62851, 154928], 24866, [62853, 166450],
+    36775, 37366, 29073, 26393, 29626, [62859, 144001], [62860, 172295],
+    [15499, 62861], [62862, 137600], [19216, 62863], 30948, 29698, 20910,
+    [62867, 165647], [16393, 62868], 27235, [62870, 172730], [16931, 62871],
+    34319, 31274, [62875, 170311], [62876, 166634], 38741, 28749, 21284,
+    [62880, 139390], 37876, 30425, [62883, 166371], 62884, 30685, 20131, 20464,
+    20668, 20015, 20247, 62891, 21556, 32139, 22674, 22736, [62896, 138678],
+    24210, 24217, 24514, [62900, 141074], 25995, [62902, 144377], 26905, 27203,
+    [62905, 146531], 27903, 29184, [62909, 148741], 29580, [16091, 62911],
+    [62912, 150035], 23317, 29881, 35715, [62916, 154788], [62917, 153237],
+    31379, 31724, 31939, 32364, 33528, 34199, 62924, 34960, 62926, 36537,
+    62928, 36815, 34143, 39392, 37409, 62933, [62934, 167353], [62935, 136255],
+    [16497, 62936], [17058, 62937], 23066, 39016, 26475, [17014, 62944], 22333,
+    34262, [62948, 149883], 33471, [62950, 160013], [19585, 62951],
+    [62952, 159092], 23931, [62954, 158485], [62955, 159678], {f: 2, c: 62956},
+    23446, 62959, 32347],
+  'Adobe-GB1': [{f: 95, c: 32}, {f: 3, c: 12288}, [183, 12539], 713, 711, 168,
+    12291, 12293, 8212, 65374, 8214, [8230, 8943], {f: 2, c: 8216},
+    {f: 2, c: 8220}, {f: 2, c: 12308}, {f: 8, c: 12296}, {f: 2, c: 12310},
+    {f: 2, c: 12304}, 177, 215, 247, 8758, {f: 2, c: 8743}, 8721, 8719, 8746,
+    8745, 8712, 8759, 8730, 8869, 8741, 8736, 8978, 8857, 8747, 8750, 8801,
+    8780, 8776, 8765, 8733, 8800, {f: 2, c: 8814}, {f: 2, c: 8804}, 8734, 8757,
+    8756, 9794, 9792, 176, {f: 2, c: 8242}, 8451, 65284, 164, {f: 2, c: 65504},
+    8240, 167, 8470, 9734, 9733, 9675, 9679, 9678, 9671, 9670, 9633, 9632,
+    9651, 9650, 8251, 8594, {f: 2, c: 8592}, 8595, 12307, {f: 20, c: 9352},
+    {f: 20, c: 9332}, {f: 10, c: 9312}, {f: 10, c: 12832}, {f: 12, c: 8544},
+    {f: 3, c: 65281}, 65509, {f: 89, c: 65285}, 65507, {f: 83, c: 12353},
+    {f: 86, c: 12449}, {f: 17, c: 913}, {f: 7, c: 931}, {f: 17, c: 945},
+    {f: 7, c: 963}, {f: 7, c: 59277}, {f: 2, c: 65077}, {f: 2, c: 65081},
+    {f: 2, c: 65087}, {f: 2, c: 65085}, {f: 4, c: 65089}, {f: 2, c: 59284},
+    {f: 2, c: 65083}, {f: 2, c: 65079}, 65073, 59286, {f: 2, c: 65075},
+    {f: 6, c: 1040}, 1025, {f: 32, c: 1046}, 1105, {f: 26, c: 1078}, 257, 225,
+    462, 224, 275, 233, 283, 232, 299, 237, 464, 236, 333, 243, 466, 242, 363,
+    250, 468, 249, 470, 472, 474, 476, 252, 234, 593, 7743, 324, 328, 505, 609,
+    {f: 37, c: 12549}, 0, {f: 76, c: 9472}, {s: 126}, 21834, 38463, 22467,
+    25384, 21710, 21769, 21696, 30353, 30284, 34108, 30702, 33406, 30861,
+    29233, 38552, 38797, 27688, 23433, 20474, 25353, 26263, 23736, 33018,
+    26696, 32942, 26114, 30414, 20985, 25942, 29100, 32753, 34948, 20658,
+    22885, 25034, 28595, 33453, 25420, 25170, 21485, 21543, 31494,
+    [12043, 20843], 30116, 24052, 25300, 36299, 38774, 25226, 32793, 22365,
+    38712, 32610, 29240, [12137, 30333], 26575, 30334, 25670, 20336, 36133,
+    25308, 31255, 26001, 29677, 25644, 25203, 33324, 39041, 26495, 29256,
+    25198, 25292, 20276, 29923, 21322, 21150, 32458, 37030, 24110, 26758,
+    27036, 33152, 32465, 26834, 30917, 34444, 38225, 20621, 35876, 33502,
+    32990, 21253, 35090, 21093, 34180, 38649, 20445, 22561, 39281, 23453,
+    25265, 25253, 26292, 35961, 40077, 29190, 26479, 30865, 24754, 21329,
+    21271, 36744, 32972, 36125, 38049, 20493, 29384, 22791, 24811, 28953,
+    34987, 22868, 33519, 26412, 31528, 23849, 32503, 29997, 27893, 36454,
+    36856, 36924, [12240, 40763], [12112, 27604], 37145, 31508, 24444, 30887,
+    34006, 34109, 27605, 27609, 27606, 24065, 24199, 30201, 38381, 25949,
+    24330, 24517, 36767, 22721, 33218, 36991, 38491, 38829, 36793, 32534,
+    36140, 25153, 20415, 21464, 21342, {f: 2, c: 36776}, 36779, 36941, 26631,
+    24426, 33176, 34920, 40150, 24971, 21035, 30250, 24428, 25996, 28626,
+    28392, 23486, 25672, 20853, 20912, 26564, 19993, 31177, 39292, 28851,
+    30149, 24182, 29627, 33760, 25773, 25320, 38069, 27874, 21338, 21187,
+    25615, 38082, 31636, 20271, 24091, 33334, 33046, 33162, 28196, 27850,
+    39539, 25429, [12056, 21340], 21754, 34917, 22496, 19981, 24067, 27493,
+    31807, 37096, 24598, 25830, 29468, 35009, 26448, 25165, 36130, 30572,
+    36393, 37319, 24425, 33756, 34081, 39184, 21442, 34453, 27531, 24813,
+    24808, 28799, 33485, 33329, 20179, 27815, 34255, 25805, 31961, 27133,
+    26361, 33609, 21397, 31574, 20391, 20876, 27979, 23618, 36461, 25554,
+    21449, 33580, 33590, 26597, 30900, 25661, 23519, 23700, 24046, 35815,
+    25286, 26612, 35962, 25600, 25530, 34633, 39307, 35863, 32544, 38130,
+    20135, 38416, 39076, 26124, 29462, 22330, 23581, 24120, 38271, 20607,
+    32928, [12058, 21378], 25950, 30021, 21809, 20513, 36229, 25220, 38046,
+    26397, 22066, 28526, 24034, 21557, 28818, 36710, 25199, 25764, 25507,
+    24443, 28552, 37108, [12162, 33251], [12192, 36784], 23576, 26216, 24561,
+    27785, 38472, 36225, 34924, 25745, 31216, 22478, 27225, 25104, 21576,
+    20056, 31243, 24809, 28548, 35802, 25215, 36894, 39563, 31204, 21507,
+    30196, 25345, 21273, 27744, 36831, 24347, 39536, 32827, 40831, 20360,
+    23610, [12186, 36196], 32709, 26021, 28861, 20805, 20914, [12173, 34411],
+    23815, 23456, 25277, 37228, 30068, 36364, 31264, 24833, 31609, 20167,
+    32504, 30597, 19985, 33261, 21021, 20986, 27249, 21416, 36487, 38148,
+    38607, 28353, 38500, 26970, 30784, 20648, 30679, 25616, 35302, 22788,
+    25571, 24029, 31359, 26941, 20256, 33337, 21912, 20018, 30126, 31383,
+    24162, 24202, 38383, 21019, 21561, 28810, 25462, 38180, 22402, 26149,
+    26943, 37255, 21767, 28147, 32431, 34850, 25139, 32496, 30133, 33576,
+    30913, 38604, 36766, 24904, 29943, 35789, 27492, 21050, 36176, 27425,
+    32874, 33905, 22257, 21254, 20174, 19995, 20945, 31895, 37259, 31751,
+    20419, 36479, 31713, 31388, 25703, 23828, 20652, 33030, 30209, 31929,
+    28140, 32736, 26449, 23384, [12072, 23544], 30923, 25774, 25619, 25514,
+    25387, 38169, 25645, 36798, 31572, 30249, 25171, [12068, 22823], 21574,
+    [12109, 27513], 20643, 25140, 24102, 27526, 20195, 36151, 34955, 24453,
+    36910, 24608, 32829, 25285, 20025, 21333, 37112, 25528, 32966, 26086,
+    27694, 20294, 24814, 28129, 35806, 24377, 34507, 24403, 25377, 20826,
+    33633, 26723, [12049, 20992], 25443, 36424, 20498, 23707, 31095, 23548,
+    21040, 31291, 24764, 36947, 30423, 24503, 24471, 30340, 36460, 28783,
+    30331, 31561, 30634, 20979, 37011, 22564, 20302, 28404, 36842, 25932,
+    31515, 29380, 28068, 32735, 23265, 25269, 24213, 22320, 33922, 31532,
+    24093, 24351, 36882, 32532, 39072, 25474, 28359, 30872, 28857, 20856,
+    38747, 22443, 30005, 20291, 30008, 24215, 24806, 22880, 28096, 27583,
+    30857, 21500, 38613, 20939, 20993, 25481, 21514, 38035, 35843, 36300,
+    29241, 30879, 34678, 36845, 35853, 21472, 19969, 30447, 21486, 38025,
+    39030, [12237, 40718], 38189, 23450, 35746, 20002, 19996, 20908, 33891,
+    25026, 21160, 26635, 20375, 24683, 20923, 27934, 20828, 25238,
+    [12099, 26007], 38497, [12182, 35910], 36887, 30168, 37117, 30563, 27602,
+    29322, 29420, 35835, 22581, 30585, 36172, 26460, 38208, 32922, 24230,
+    28193, 22930, 31471, 30701, 38203, 27573, 26029, 32526, 22534, 20817,
+    38431, 23545, 22697, 21544, 36466, 25958, 39039, 22244, 38045, 30462,
+    36929, 25479, 21702, 22810, 22842, 22427, 36530, 26421, 36346, 33333,
+    21057, 24816, 22549, 34558, 23784, 40517, 20420, 39069, 35769, 23077,
+    24694, 21380, 25212, 36943, 37122, 39295, 24681, [12157, 32780],
+    [12041, 20799], [12159, 32819], 23572, 39285, 27953, [12038, 20108], 36144,
+    21457, 32602, 31567, 20240, 20047, 38400, 27861, 29648, 34281, 24070,
+    30058, 32763, 27146, 30718, 38034, 32321, 20961, 28902, 21453, 36820,
+    33539, 36137, 29359, 39277, 27867, 22346, 33459, [12101, 26041], 32938,
+    25151, 38450, 22952, 20223, 35775, 32442, 25918, 33778, [12206, 38750],
+    21857, 39134, 32933, 21290, 35837, 21536, 32954, 24223, 27832, 36153,
+    33452, 37210, 21545, 27675, 20998, 32439, 22367, 28954, 27774, 31881,
+    22859, 20221, 24575, 24868, 31914, 20016, 23553, 26539, 34562, 23792,
+    38155, 39118, 30127, 28925, 36898, 20911, 32541, 35773, 22857, 20964,
+    20315, 21542, 22827, 25975, 32932, 23413, 25206, 25282, 36752, 24133,
+    27679, 31526, 20239, 20440, 26381, 28014, 28074, 31119, 34993, 24343,
+    29995, 25242, 36741, 20463, 37340, 26023, 33071, 33105, 24220, 33104,
+    36212, 21103, 35206, 36171, 22797, 20613, 20184, [12201, 38428],
+    [12119, 29238], 33145, 36127, 23500, 35747, 38468, 22919, 32538, 21648,
+    22134, 22030, 35813, 25913, 27010, 38041, 30422, 28297, [12082, 24178],
+    [12130, 29976], 26438, 26577, 31487, 32925, 36214, 24863, 31174, 25954,
+    36195, 20872, 21018, 38050, 32568, 32923, 32434, 23703, 28207, 26464,
+    31705, 30347, [12220, 39640], 33167, 32660, 31957, 25630, 38224, 31295,
+    21578, 21733, 27468, 25601, [12093, 25096], 40509, 33011, 30105, 21106,
+    [12208, 38761], 33883, 26684, 34532, 38401, 38548, 38124, 20010, 21508,
+    32473, 26681, 36319, 32789, 26356, 24218, 32697, 22466, 32831, 26775,
+    [12079, 24037], 25915, 21151, 24685, 40858, 20379, 36524, 20844, 23467,
+    [12088, 24339], 24041, 27742, 25329, 36129, 20849, 38057, 21246, 27807,
+    33503, 29399, 22434, 26500, 36141, 22815, 36764, 33735, 21653, 31629,
+    20272, 27837, 23396, 22993, [12238, 40723], 21476, 34506, [12219, 39592],
+    [12181, 35895], 32929, 25925, 39038, 22266, 38599, 21038, [12128, 29916],
+    21072, 23521, 25346, 35074, 20054, 25296, 24618, 26874, 20851, 23448,
+    20896, 35266, 31649, 39302, 32592, 24815, 28748, 36143, 20809,
+    [12084, 24191], 36891, 29808, 35268, 22317, 30789, 24402, 40863, 38394,
+    36712, [12225, 39740], 35809, 30328, 26690, 26588, 36330, 36149, 21053,
+    36746, 28378, 26829, 38149, 37101, 22269, 26524, 35065, 36807, 21704,
+    39608, 23401, 28023, 27686, 20133, 23475, 39559, 37219, 25000, 37039,
+    38889, 21547, 28085, 23506, 20989, 21898, 32597, 32752, 25788, 25421,
+    26097, 25022, 24717, 28938, 27735, 27721, 22831, 26477, 33322, 22741,
+    22158, 35946, 27627, 37085, 22909, 32791, 21495, 28009, 21621, 21917,
+    33655, 33743, 26680, [12146, 31166], 21644, 20309, 21512, 30418, 35977,
+    38402, 27827, 28088, 36203, 35088, 40548, 36154, 22079, [12234, 40657],
+    30165, 24456, 29408, 24680, 21756, 20136, 27178, 34913, 24658, 36720,
+    21700, 28888, 34425, 40511, 27946, 23439, 24344, 32418, 21897, 20399,
+    29492, 21564, 21402, 20505, 21518, 21628, 20046, 24573, 29786, 22774,
+    33899, 32993, 34676, 29392, 31946, 28246, 24359, 34382, 21804, 25252,
+    20114, 27818, 25143, 33457, 21719, 21326, 29502, 28369, 30011, 21010,
+    21270, 35805, 27088, 24458, 24576, 28142, 22351, 27426, 29615, 26707,
+    36824, 32531, 25442, 24739, 21796, 30186, 35938, 28949, 28067, 23462,
+    24187, 33618, 24908, 40644, 30970, 34647, 31783, 30343, 20976, 24822,
+    29004, 26179, 24140, 24653, 35854, 28784, 25381, 36745, 24509, 24674,
+    34516, 22238, 27585, 24724, 24935, 21321, 24800, 26214, 36159, 31229,
+    20250, 28905, 27719, 35763, 35826, 32472, 33636, 26127, 23130, 39746,
+    27985, 28151, 35905, 27963, 20249, [12117, 28779], 33719, 25110, 24785,
+    38669, 36135, 31096, 20987, 22334, 22522, 26426, 30072, 31293, 31215,
+    31637, 32908, 39269, 36857, 28608, 35749, 40481, 23020, 32489, 32521,
+    21513, 26497, 26840, 36753, 31821, 38598, 21450, 24613, 30142, 27762,
+    21363, 23241, 32423, 25380, [12047, 20960], 33034, [12080, 24049], 34015,
+    25216, 20864, 23395, 20238, 31085, 21058, 24760, 27982, 23492, 23490,
+    35745, 35760, 26082, 24524, 38469, 22931, 32487, 32426, 22025, 26551,
+    22841, 20339, 23478, 21152, 33626, 39050, 36158, 30002, 38078, 20551,
+    31292, 20215, 26550, 39550, 23233, 27516, 30417, 22362, 23574, 31546,
+    38388, 29006, 20860, 32937, 33392, 22904, 32516, 33575, 26816, 26604,
+    30897, 30839, 25315, 25441, 31616, 20461, 21098, 20943, 33616, 27099,
+    37492, 36341, 36145, 35265, 38190, 31661, 20214, 20581, 33328, 21073,
+    39279, 28176, 28293, 28071, 24314, 20725, 23004, 23558, 27974, 27743,
+    30086, 33931, 26728, 22870, 35762, 21280, 37233, 38477, 34121, 26898,
+    30977, 28966, 33014, 20132, 37066, 27975, 39556, 23047, 22204, 25605,
+    38128, 30699, 20389, 33050, 29409, [12179, 35282], 39290, 32564, 32478,
+    21119, 25945, 37237, 36735, 36739, 21483, 31382, 25581, 25509, 30342,
+    31224, 34903, 38454, 25130, 21163, 33410, 26708, 26480, 25463, 30571,
+    31469, 27905, 32467, 35299, 22992, 25106, 34249, 33445, 30028, 20511,
+    20171, 30117, 35819, 23626, [12081, 24062], 31563, [12100, 26020],
+    [12198, 37329], 20170, 27941, 35167, 32039, 38182, 20165, 35880, 36827,
+    38771, 26187, 31105, 36817, 28908, 28024, 23613, 21170, 33606, 20834,
+    33550, 30555, 26230, 40120, 20140, 24778, 31934, 31923, 32463, 20117,
+    35686, 26223, 39048, 38745, 22659, 25964, 38236, 24452, 30153, 38742,
+    31455, 31454, 20928, 28847, 31384, 25578, 31350, 32416, 29590,
+    [12210, 38893], 20037, 28792, 20061, 37202, 21417, 25937, 26087,
+    [12165, 33276], 33285, 21646, 23601, 30106, 38816, 25304, 29401, 30141,
+    23621, 39545, 33738, 23616, 21632, 30697, 20030, 27822, 32858, 25298,
+    25454, 24040, 20855, 36317, 36382, 38191, 20465, 21477, 24807, 28844,
+    21095, 25424, 40515, 23071, 20518, 30519, 21367, 32482, 25733, 25899,
+    25225, 25496, 20500, 29237, 35273, 20915, 35776, 32477, 22343, 33740,
+    38055, 20891, 21531, 23803, 20426, 31459, 27994, 37089, 39567, 21888,
+    21654, 21345, 21679, 24320, 25577, 26999, 20975, 24936, 21002, 22570,
+    21208, 22350, 30733, 30475, 24247, 24951, 31968, 25179, 25239, 20130,
+    28821, 32771, 25335, 28900, 38752, 22391, 33499, 26607, 26869, 30933,
+    39063, 31185, 22771, 21683, 21487, 28212, 20811, 21051, 23458, 35838,
+    32943, 21827, 22438, 24691, 22353, 21549, 31354, 24656, 23380, 25511,
+    25248, [12061, 21475], 25187, 23495, 26543, 21741, 31391, 33510, 37239,
+    24211, 35044, 22840, 22446, 25358, 36328, 33007, 22359, 31607, 20393,
+    24555, 23485, 27454, 21281, 31568, 29378, 26694, 30719, 30518, 26103,
+    20917, 20111, 30420, 23743, 31397, 33909, 22862, 39745, 20608, 39304,
+    24871, 28291, 22372, 26118, 25414, 22256, 25324, 25193, 24275, 38420,
+    22403, 25289, 21895, 34593, 33098, 36771, 21862, 33713, 26469, 36182,
+    34013, 23146, 26639, 25318, 31726, 38417, 20848, 28572, 35888, 25597,
+    35272, 25042, 32518, 28866, 28389, 29701, 27028, 29436, 24266, 37070,
+    26391, 28010, 25438, 21171, 29282, [12156, 32769], 20332, 23013, 37226,
+    28889, 28061, 21202, 20048, 38647, 38253, 34174, 30922, 32047, 20769,
+    22418, 25794, 32907, 31867, 27882, 26865, 26974, 20919, 21400, 26792,
+    29313, 40654, 31729, 29432, 31163, 28435, 29702, 26446, [12197, 37324],
+    40100, 31036, 33673, 33620, 21519, 26647, 20029, 21385, 21169, 30782,
+    21382, 21033, 20616, 20363, 20432, 30178, [12148, 31435], 31890, 27813,
+    [12202, 38582], [12050, 21147], 29827, 21737, 20457, 32852, 33714, 36830,
+    38256, 24265, 24604, 28063, 24088, 25947, 33080, 38142, 24651, 28860,
+    32451, 31918, 20937, 26753, 31921, 33391, 20004, 36742, 37327, 26238,
+    20142, 35845, 25769, 32842, 20698, 30103, 29134, 23525, 36797, 28518,
+    20102, 25730, 38243, 24278, 26009, 21015, 35010, 28872, 21155, 29454,
+    29747, 26519, 30967, 38678, 20020, 37051, 40158, 28107, 20955, 36161,
+    21533, 25294, 29618, 33777, 38646, 40836, 38083, 20278, 32666, 20940,
+    28789, 38517, 23725, 39046, 21478, 20196, 28316, 29705, 27060, 30827,
+    39311, 30041, 21016, 30244, 27969, 26611, 20845, 40857, 32843, 21657,
+    31548, 31423, 38534, 22404, 25314, 38471, 27004, 23044, 25602, 31699,
+    28431, 38475, 33446, 21346, 39045, 24208, 28809, 25523, 21348, 34383,
+    40065, 40595, 30860, 38706, 36335, 36162, [12229, 40575], 28510, 31108,
+    24405, 38470, 25134, 39540, 21525, 38109, 20387, 26053, 23653, 23649,
+    32533, 34385, 27695, 24459, 29575, 28388, 32511, 23782, 25371, 23402,
+    28390, 21365, 20081, 25504, 30053, 25249, 36718, 20262, 20177, 27814,
+    32438, 35770, 33821, 34746, 32599, 36923, 38179, 31657, 39585, 35064,
+    33853, 27931, 39558, 32476, 22920, [12231, 40635], 29595, 30721, 34434,
+    39532, 39554, 22043, 21527, 22475, 20080, 40614, 21334, 36808, 33033,
+    30610, 39314, 34542, 28385, 34067, 26364, 24930, 28459, 35881, 33426,
+    33579, 30450, 27667, 24537, 33725, 29483, 33541, 38170, [12113, 27611],
+    [12141, 30683], 38086, 21359, 33538, 20882, 24125, 35980, 36152, 20040,
+    29611, 26522, 26757, 37238, 38665, 29028, 27809, 30473, 23186, 38209,
+    27599, 32654, 26151, 23504, 22969, 23194, 38376, 38391, 20204, 33804,
+    33945, 27308, 30431, 38192, 29467, 26790, 23391, 30511, 37274, 38753,
+    31964, 36855, 35868, 24357, [12150, 31859], 31192, 35269, 27852, 34588,
+    23494, 24130, 26825, 30496, 32501, 20885, 20813, 21193, 23081, 32517,
+    [12207, 38754], 33495, 25551, 30596, 34256, 31186, 28218, 24217, 22937,
+    34065, 28781, 27665, 25279, [12139, 30399], 25935, 24751, 38397, 26126,
+    34719, 40483, 38125, 21517, 21629, 35884, {f: 2, c: 25720}, 34321, 27169,
+    33180, 30952, 25705, 39764, 25273, 26411, 33707, 22696, 40664, 27819,
+    28448, 23518, 38476, 35851, 29279, 26576, 25287, 29281, 20137, 22982,
+    27597, 22675, 26286, 24149, 21215, 24917, [12106, 26408], [12140, 30446],
+    30566, 29287, 31302, 25343, 21738, 21584, 38048, 37027, 23068, 32435,
+    27670, 20035, 22902, 32784, 22856, 21335, 30007, 38590, 22218, 25376,
+    33041, 24700, 38393, 28118, 21602, 39297, 20869, 23273, 33021, 22958,
+    38675, 20522, 27877, 23612, 25311, 20320, 21311, 33147, 36870, 28346,
+    34091, 25288, 24180, 30910, 25781, 25467, 24565, 23064, 37247, 40479,
+    23615, 25423, 32834, 23421, 21870, 38218, 38221, 28037, 24744, 26592,
+    29406, 20957, 23425, 25319, 27870, [12124, 29275], 25197, 38062, 32445,
+    33043, 27987, 20892, 24324, 22900, 21162, 24594, [12069, 22899], 26262,
+    34384, 30111, 25386, 25062, 31983, 35834, 21734, 27431, 40485, 27572,
+    34261, 21589, 20598, 27812, 21866, 36276, 29228, 24085, 24597, 29750,
+    25293, 25490, 29260, 24472, 28227, 27966, 25856, 28504, 30424, 30928,
+    30460, 30036, 21028, 21467, 20051, 24222, 26049, 32810, 32982, 25243,
+    21638, 21032, 28846, 34957, 36305, 27873, 21624, 32986, 22521, 35060,
+    36180, 38506, 37197, 20329, 27803, 21943, 30406, 30768, 25256, 28921,
+    28558, 24429, 34028, 26842, 30844, 31735, 33192, 26379, 40527, 25447,
+    30896, 22383, 30738, 38713, 25209, 25259, 21128, 29749, 27607, 21860,
+    33086, 30130, [12138, 30382], 21305, 30174, 20731, 23617, 35692, 31687,
+    20559, [12122, 29255], 39575, 39128, 28418, 29922, 31080, 25735, 30629,
+    25340, 39057, 36139, 21697, 32856, 20050, 22378, 33529, 33805, 24179,
+    20973, 29942, 35780, 23631, 22369, 27900, 39047, 23110, 30772, 39748,
+    36843, 31893, 21078, 25169, 38138, 20166, 33670, 33889, 33769, 33970,
+    22484, 26420, 22275, 26222, 28006, 35889, 26333, 28689, 26399, 27450,
+    26646, 25114, 22971, 19971, 20932, 28422, 26578, 27791, 20854, 26827,
+    22855, 27495, 30054, 23822, 33040, 40784, 26071, 31048, 31041, 39569,
+    36215, 23682, 20062, 20225, 21551, 22865, 30732, 22120, [12115, 27668],
+    36804, 24323, 27773, 27875, 35755, 25488, 24688, 27965, 29301, 25190,
+    38030, 38085, 21315, 36801, 31614, 20191, 35878, 20094, 40660, 38065,
+    38067, 21069, 28508, 36963, 27973, 35892, 22545, 23884, [12107, 27424],
+    27465, 26538, 21595, 33108, 32652, 22681, 34103, 24378, 25250, 27207,
+    38201, 25970, 24708, 26725, 30631, 20052, 20392, 24039, 38808, 25772,
+    32728, 23789, 20431, 31373, 20999, 33540, 19988, 24623, 31363, 38054,
+    20405, 20146, 31206, 29748, 21220, 33465, 25810, 31165, 23517, 27777,
+    38738, 36731, 27682, 20542, 21375, 28165, 25806, 26228, 27696, 24773,
+    39031, 35831, 24198, 29756, 31351, 31179, 19992, 37041, 29699, 27714,
+    22234, 37195, 27845, 36235, 21306, 34502, 26354, 36527, 23624, 39537,
+    28192, 21462, 23094, 40843, 36259, 21435, 22280, 39079, 26435, 37275,
+    27849, 20840, 30154, 25331, [12125, 29356], 21048, 21149, 32570, 28820,
+    30264, 21364, 40522, 27063, 30830, 38592, 35033, 32676, 28982, 29123,
+    20873, 26579, 29924, 22756, 25880, 22199, 35753, 39286, 25200, 32469,
+    24825, 28909, 22764, 20161, [12040, 20154], 24525, 38887, 20219, 35748,
+    20995, 22922, 32427, 25172, 20173, [12103, 26085], 25102, 33592, 33993,
+    33635, 34701, 29076, 28342, 23481, 32466, 20887, 25545, 26580,
+    [12161, 32905], 33593, 34837, 20754, 23418, 22914, 36785, 20083, 27741,
+    [12042, 20837], 35109, 36719, 38446, 34122, 29790, 38160, 38384, 28070,
+    33509, 24369, 25746, 27922, 33832, 33134, 40131, 22622, 36187, 19977,
+    21441, 20254, 25955, 26705, 21971, 20007, 25620, 39578, 25195, 23234,
+    29791, [12170, 33394], 28073, 26862, 20711, 33678, 30722, 26432, 21049,
+    27801, 32433, 20667, 21861, 29022, 31579, 26194, 29642, 33515, 26441,
+    [12077, 23665], 21024, 29053, 34923, 38378, 38485, 25797, 36193, 33203,
+    21892, 27733, 25159, 32558, 22674, 20260, 21830, 36175, 26188, 19978,
+    23578, 35059, 26786, 25422, 31245, 28903, 33421, 21242, 38902, 23569,
+    21736, 37045, 32461, 22882, 36170, 34503, [12166, 33292], 33293, 36198,
+    25668, 23556, 24913, 28041, 31038, 35774, 30775, 30003, 21627, 20280,
+    [12189, 36523], 28145, 23072, 32453, 31070, 27784, 23457, 23158, 29978,
+    32958, 24910, 28183, 22768, [12131, 29983], 29989, 29298, 21319, 32499,
+    30465, 30427, 21097, 32988, 22307, 24072, 22833, 29422, 26045, 28287,
+    35799, [12075, 23608], 34417, [12055, 21313], [12143, 30707], 25342, 26102,
+    20160, [12215, 39135], 34432, 23454, 35782, 21490, [12142, 30690], 20351,
+    23630, 39542, 22987, 24335, [12144, 31034], [12064, 22763], 19990, 26623,
+    20107, 25325, 35475, 36893, 21183, 26159, 21980, 22124, 36866, 20181,
+    20365, 37322, 39280, [12114, 27663], 24066, 24643, 23460, 35270, 35797,
+    25910, [12095, 25163], [12216, 39318], 23432, 23551, 25480, 21806, 21463,
+    30246, 20861, 34092, 26530, 26803, 27530, 25234, 36755, 21460, 33298,
+    28113, 30095, 20070, 36174, 23408, 29087, 34223, 26257, 26329, 32626,
+    34560, [12233, 40653], [12239, 40736], 23646, 26415, 36848, 26641, 26463,
+    25101, 31446, 22661, 24246, 25968, 28465, 24661, 21047, 32781, 25684,
+    34928, 29993, 24069, 26643, 25332, 38684, 21452, 29245, 35841,
+    [12116, 27700], 30561, 31246, 21550, 30636, 39034, 33308, 35828, 30805,
+    26388, 28865, 26031, 25749, 22070, 24605, 31169, 21496, 19997, 27515,
+    32902, 23546, 21987, 22235, 20282, 20284, 39282, 24051, 26494, 32824,
+    24578, 39042, 36865, 23435, 35772, 35829, 25628, 33368, 25822, 22013,
+    33487, 37221, 20439, 32032, 36895, 31903, 20723, 22609, 28335, 23487,
+    35785, 32899, 37240, 33948, 31639, 34429, 38539, 38543, 32485, 39635,
+    30862, 23681, 31319, 36930, 38567, 31071, 23385, 25439, 31499, 34001,
+    26797, 21766, 32553, 29712, 32034, 38145, 25152, 22604, 20182, 23427,
+    22905, 22612, 29549, 25374, 36427, 36367, 32974, 33492, 25260, 21488,
+    27888, 37214, 22826, 24577, 27760, 22349, 25674, 36138, 30251, 28393,
+    22363, 27264, 30192, 28525, 35885, 35848, 22374, 27631, 34962, 30899,
+    25506, 21497, 28845, 27748, 22616, 25642, 22530, 26848, 33179, 21776,
+    31958, 20504, 36538, 28108, 36255, 28907, 25487, 28059, 28372, 32486,
+    33796, 26691, 36867, 28120, 38518, 35752, 22871, 29305, 34276, 33150,
+    30140, 35466, 26799, 21076, 36386, 38161, 25552, 39064, 36420, 21884,
+    20307, 26367, 22159, 24789, 28053, 21059, 23625, 22825, 28155, 22635,
+    [12133, 30000], 29980, 24684, 33300, 33094, 25361, 26465, 36834, 30522,
+    36339, 36148, 38081, 24086, 21381, 21548, 28867, 27712, 24311, 20572,
+    20141, 24237, 25402, 33351, 36890, 26704, 37230, 30643, 21516, 38108,
+    24420, 31461, 26742, 25413, 31570, 32479, 30171, 20599, 25237, 22836,
+    36879, 20984, 31171, 31361, 22270, 24466, 36884, 28034, 23648,
+    [12063, 22303], 21520, 20820, 28237, 22242, 25512, 39059, 33151, 34581,
+    35114, 36864, 21534, 23663, 33216, 25302, 25176, 33073, 40501, 38464,
+    39534, 39548, 26925, 22949, 25299, 21822, 25366, 21703, 34521, 27964,
+    23043, [12129, 29926], 34972, 27498, 22806, 35916, 24367, 28286, 29609,
+    39037, 20024, 28919, 23436, 30871, 25405, 26202, 30358, 24779, 23451,
+    23113, 19975, 33109, 27754, 29579, 20129, 26505, [12153, 32593], 24448,
+    26106, 26395, 24536, 22916, 23041, 24013, 24494, 21361, 38886, 36829,
+    26693, 22260, 21807, 24799, 20026, 28493, 32500, 33479, 33806, 22996,
+    20255, 20266, 23614, 32428, 26410, 34074, 21619, 30031, 32963, 21890,
+    39759, 20301, 28205, 35859, 23561, 24944, 21355, 30239, 28201, 34442,
+    [12098, 25991], 38395, 32441, 21563, 31283, 32010, 38382, 21985, 32705,
+    29934, 25373, 34583, 28065, 31389, 25105, 26017, 21351, 25569, 27779,
+    24043, 21596, 38056, 20044, 27745, 35820, 23627, [12102, 26080], 33436,
+    26791, 21566, 21556, [12111, 27595], 27494, 20116, 25410, 21320, 33310,
+    20237, 20398, 22366, 25098, 38654, 26212, 29289, 21247, 21153, 24735,
+    35823, 26132, 29081, 26512, 35199, 30802, 30717, 26224, 22075, 21560,
+    38177, 29306, 31232, 24687, 24076, 24713, 33181, [12067, 22805], 24796,
+    29060, 28911, 28330, 27728, 29312, 27268, 34989, 24109, 20064, 23219,
+    21916, 38115, 27927, 31995, 38553, 25103, 32454, 30606, 34430, 21283,
+    38686, 36758, 26247, 23777, 20384, 29421, 19979, 21414, 22799, 21523,
+    25472, 38184, 20808, 20185, 40092, 32420, 21688, 36132, 34900, 33335,
+    38386, 28046, 24358, 23244, 26174, 38505, 29616, 29486, 21439, 33146,
+    39301, 32673, 23466, 38519, 38480, 32447, 30456, 21410, 38262,
+    [12217, 39321], 31665, 35140, 28248, 20065, 32724, 31077, 35814, 24819,
+    21709, 20139, 39033, 24055, 27233, 20687, 21521, 35937, 33831, 30813,
+    38660, 21066, 21742, 22179, 38144, 28040, 23477, 28102, 26195,
+    [12073, 23567], 23389, 26657, 32918, 21880, 31505, 25928, 26964, 20123,
+    27463, 34638, 38795, 21327, 25375, 25658, 37034, 26012, 32961, 35856,
+    20889, 26800, 21368, 34809, 25032, 27844, 27899, 35874, 23633, 34218,
+    33455, 38156, 27427, [12191, 36763], 26032, 24571, [12092, 24515], 20449,
+    34885, 26143, 33125, 29481, 24826, 20852, 21009, 22411, 24418, 37026,
+    [12175, 34892], 37266, 24184, 26447, 24615, 22995, 20804, 20982, 33016,
+    21256, 27769, 38596, 29066, 20241, 20462, 32670, 26429, 21957, 38152,
+    31168, 34966, 32483, 22687, 25100, 38656, 34394, 22040, 39035, 24464,
+    35768, 33988, 37207, 21465, 26093, 24207, 30044, 24676, 32110, 23167,
+    32490, 32493, 36713, 21927, 23459, 24748, 26059, [12126, 29572], 36873,
+    30307, 30505, 32474, 38772, 34203, 23398, [12147, 31348], 38634,
+    [12174, 34880], 21195, 29071, 24490, 26092, 35810, 23547, 39535, 24033,
+    27529, 27739, 35757, 35759, 36874, 36805, 21387, 25276, 40486, 40493,
+    21568, 20011, 33469, [12123, 29273], 34460, 23830, 34905, 28079, 38597,
+    21713, 20122, 35766, 28937, 21693, 38409, 28895, 28153, 30416, 20005,
+    30740, 34578, 23721, 24310, [12180, 35328], 39068, 38414, 28814, 27839,
+    22852, 25513, 30524, 34893, 28436, 33395, 22576, 29141, 21388, 30746,
+    38593, 21761, 24422, 28976, 23476, 35866, 39564, 27523, 22830, 40495,
+    31207, 26472, 25196, 20335, 30113, [12154, 32650], 27915, 38451, 27687,
+    20208, 30162, 20859, 26679, 28478, 36992, 33136, 22934, 29814, 25671,
+    23591, 36965, 31377, 35875, 23002, 21676, 33280, 33647, 35201, 32768,
+    26928, 22094, 32822, 29239, 37326, 20918, 20063, 39029, 25494, 19994,
+    21494, 26355, 33099, 22812, 28082, [12032, 19968], 22777, 21307, 25558,
+    38129, 20381, 20234, [12176, 34915], 39056, 22839, 36951, 31227, 20202,
+    33008, 30097, 27778, 23452, 23016, 24413, 26885, 34433, 20506, 24050,
+    [12036, 20057], 30691, 20197, 33402, 25233, 26131, [12194, 37009], 23673,
+    20159, 24441, 33222, 36920, 32900, 30123, 20134, 35028, 24847, 27589,
+    24518, 20041, 30410, 28322, 35811, 35758, 35850, 35793, 24322, 32764,
+    32716, 32462, 33589, 33643, 22240, 27575, [12211, 38899], 38452, 23035,
+    21535, 38134, 28139, 23493, 39278, 23609, 24341, 38544, 21360, 33521,
+    27185, 23156, 40560, 24212, 32552, 33721, {f: 2, c: 33828}, 33639, 34631,
+    36814, 36194, 30408, 24433, 39062, 30828, 26144, 21727, 25317, 20323,
+    33219, 30152, 24248, 38605, 36362, 34553, 21647, 27891, 28044, 27704,
+    24703, 21191, [12132, 29992], 24189, 20248, 24736, 24551, 23588, 30001,
+    37038, 38080, 29369, 27833, 28216, [12195, 37193], 26377, 21451, 21491,
+    20305, 37321, 35825, [12060, 21448], 24188, 36802, 28132, 20110, 30402,
+    27014, 34398, 24858, 33286, 20313, 20446, 36926, 40060, 24841, 28189,
+    28180, 38533, 20104, 23089, [12204, 38632], 19982, 23679, 31161, 23431,
+    35821, [12155, 32701], [12127, 29577], 22495, 33419, 37057, 21505, 36935,
+    21947, 23786, 24481, 24840, 27442, 29425, 32946, 35465, 28020, 23507,
+    35029, 39044, 35947, 39533, 40499, 28170, 20900, 20803, 22435, 34945,
+    21407, 25588, 36757, 22253, 21592, 22278, 29503, 28304, 32536, 36828,
+    33489, 24895, 24616, 38498, [12104, 26352], 32422, 36234, 36291, 38053,
+    23731, 31908, [12105, 26376], 24742, 38405, 32792, 20113, 37095, 21248,
+    38504, 20801, 36816, 34164, 37213, 26197, 38901, 23381, 21277, 30776,
+    26434, 26685, 21705, 28798, 23472, 36733, 20877, 22312, 21681, 25874,
+    26242, 36190, 36163, 33039, 33900, 36973, 31967, 20991, 34299, 26531,
+    26089, 28577, 34468, 36481, 22122, 36896, 30338, 28790, 29157, 36131,
+    25321, 21017, 27901, 36156, 24590, 22686, 24974, 26366, 36192, 25166,
+    21939, 28195, 26413, 36711, 38113, 38392, 30504, 26629, 27048, 21643,
+    20045, 28856, 35784, 25688, 25995, 23429, 31364, 20538, 23528, 30651,
+    27617, 35449, 31896, 27838, 30415, 26025, 36759, 23853, 23637, 34360,
+    26632, 21344, 25112, 31449, 28251, 32509, 27167, 31456, 24432, 28467,
+    24352, 25484, 28072, 26454, 19976, 24080, 36134, 20183, 32960, 30260,
+    38556, 25307, 26157, 25214, 27836, 36213, 29031, 32617, 20806, 32903,
+    21484, 36974, 25240, 21746, 34544, 36761, 32773, 38167, 34071, 36825,
+    27993, 29645, 26015, 30495, 29956, 30759, 33275, 36126, 38024, 20390,
+    26517, 30137, 35786, 38663, 25391, 38215, 38453, 33976, 25379, 30529,
+    24449, 29424, 20105, 24596, 25972, 25327, 27491, 25919, 24103, 30151,
+    37073, 35777, 33437, 26525, [12096, 25903], 21553, 34584, 30693, 32930,
+    33026, 27713, 20043, 32455, 32844, 30452, 26893, 27542, 25191, 20540,
+    20356, 22336, 25351, [12108, 27490], 36286, 21482, 26088, 32440, 24535,
+    25370, 25527, [12164, 33267], 33268, 32622, 24092, 23769, 21046, 26234,
+    31209, 31258, 36136, 28825, 30164, 28382, 27835, 31378, 20013, 30405,
+    24544, 38047, 34935, 32456, 31181, 32959, 37325, 20210, 20247,
+    [12168, 33311], 21608, 24030, 27954, 35788, 31909, 36724, 32920, 24090,
+    21650, 30385, 23449, 26172, 39588, 29664, 26666, 34523, 26417, 29482,
+    35832, 35803, 36880, [12149, 31481], 28891, 29038, 25284, 30633, 22065,
+    20027, 33879, 26609, 21161, 34496, 36142, 38136, 31569, 20303, 27880,
+    31069, 39547, 25235, [12118, 29226], 25341, 19987, 30742, 36716, 25776,
+    36186, 31686, 26729, 24196, 35013, 22918, 25758, 22766, 29366, 26894,
+    38181, 36861, 36184, 22368, 32512, 35846, 20934, 25417, 25305, 21331,
+    26700, 29730, 33537, 37196, 21828, 30528, 28796, 27978, 20857, 21672,
+    36164, 23039, 28363, 28100, 23388, 32043, 20180, 31869, 28371,
+    [12070, 23376], [12163, 33258], 28173, 23383, 39683, 26837, 36394, 23447,
+    32508, 24635, 32437, 37049, [12187, 36208], 22863, 25549, 31199,
+    [12188, 36275], 21330, 26063, 31062, 35781, 38459, 32452, 38075, 32386,
+    22068, 37257, 26368, 32618, 23562, 36981, 26152, 24038, 20304, 26590,
+    20570, 20316, 22352, 24231, 20109, 19980, 20800, 19984, 24319, 21317,
+    19989, 20120, 19998, [12224, 39730], 23404, 22121, [12033, 20008], 31162,
+    [12035, 20031], [12052, 21269], 20039, 22829, [12120, 29243], 21358, 27664,
+    22239, 32996, 39319, 27603, 30590, 40727, [12034, 20022], 20127, 40720,
+    20060, 20073, 20115, 33416, 23387, 21868, 22031, 20164, 21389, 21405,
+    21411, 21413, 21422, 38757, 36189, [12053, 21274], 21493, 21286, 21294,
+    21310, 36188, 21350, 21347, 20994, 21000, 21006, 21037, 21043,
+    {f: 2, c: 21055}, 21068, 21086, 21089, 21084, 33967, 21117, 21122, 21121,
+    21136, 21139, [12044, 20866], 32596, 20155, 20163, 20169, 20162, 20200,
+    20193, 20203, 20190, 20251, 20211, 20258, 20324, 20213, 20261, 20263,
+    20233, 20267, 20318, 20327, 25912, 20314, 20317, 20319, 20311, 20274,
+    20285, 20342, 20340, 20369, 20361, 20355, 20367, 20350, 20347, 20394,
+    20348, 20396, 20372, 20454, 20456, 20458, 20421, 20442, 20451, 20444,
+    20433, 20447, 20472, 20521, 20556, 20467, 20524, 20495, 20526, 20525,
+    20478, 20508, 20492, 20517, 20520, 20606, 20547, 20565, 20552, 20558,
+    20588, 20603, 20645, 20647, 20649, 20666, 20694, 20742, 20717, 20716,
+    20710, 20718, 20743, 20747, 20189, 27709, 20312, 20325, 20430,
+    [12245, 40864], 27718, 31860, 20846, 24061, 40649, 39320, 20865, 22804,
+    [12051, 21241], 21261, 35335, 21264, 20971, 22809, 20821, [12039, 20128],
+    20822, 20147, 34926, 34980, 20149, 33044, 35026, 31104, 23348, 34819,
+    32696, [12046, 20907], 20913, 20925, 20924, 20935, [12045, 20886], 20898,
+    20901, 35744, {f: 2, c: 35750}, 35754, {f: 2, c: 35764}, 35767,
+    {f: 2, c: 35778}, 35787, 35791, 35790, {f: 3, c: 35794}, 35798,
+    {f: 2, c: 35800}, 35804, {f: 2, c: 35807}, 35812, {f: 2, c: 35816}, 35822,
+    35824, 35827, 35830, 35833, 35836, {f: 2, c: 35839}, 35842, 35844, 35847,
+    35852, 35855, {f: 2, c: 35857}, {f: 3, c: 35860}, 35865, 35867, 35864,
+    35869, {f: 3, c: 35871}, 35877, 35879, {f: 2, c: 35882}, {f: 2, c: 35886},
+    {f: 2, c: 35890}, {f: 2, c: 35893}, [12057, 21353], 21370, 38429, 38434,
+    38433, 38449, 38442, 38461, 38460, 38466, 38473, 38484, 38495, 38503,
+    38508, 38514, 38516, 38536, 38541, 38551, 38576, 37015, 37019, 37021,
+    37017, 37036, 37025, 37044, 37043, 37046, 37050, 37048, 37040, 37071,
+    37061, 37054, 37072, 37060, 37063, 37075, 37094, 37090, 37084, 37079,
+    37083, 37099, 37103, 37118, 37124, 37154, 37150, 37155, 37169, 37167,
+    37177, 37187, 37190, 21005, 22850, 21154, {f: 2, c: 21164}, 21182, 21759,
+    21200, 21206, 21232, 21471, 29166, 30669, [12085, 24308], [12048, 20981],
+    20988, [12223, 39727], [12059, 21430], 24321, 30042, 24047, 22348, 22441,
+    22433, 22654, 22716, 22725, 22737, 22313, 22316, 22314, 22323, 22329,
+    {f: 2, c: 22318}, 22364, 22331, 22338, 22377, 22405, 22379, 22406, 22396,
+    22395, 22376, 22381, 22390, 22387, 22445, 22436, 22412, 22450, 22479,
+    22439, 22452, 22419, 22432, 22485, 22488, 22490, 22489, 22482, 22456,
+    22516, 22511, 22520, 22500, 22493, 22539, 22541, 22525, 22509, 22528,
+    22558, 22553, 22596, 22560, 22629, 22636, 22657, 22665, 22682, 22656,
+    39336, 40729, 25087, 33401, 33405, 33407, 33423, 33418, 33448, 33412,
+    33422, 33425, 33431, 33433, 33451, 33464, 33470, 33456, 33480, 33482,
+    33507, 33432, 33463, 33454, {f: 2, c: 33483}, 33473, 33449, 33460, 33441,
+    33450, 33439, 33476, 33486, 33444, 33505, 33545, 33527, 33508, 33551,
+    33543, 33500, 33524, 33490, 33496, 33548, 33531, 33491, 33553, 33562,
+    33542, {f: 2, c: 33556}, 33504, 33493, 33564, 33617, {f: 2, c: 33627},
+    33544, 33682, 33596, 33588, 33585, 33691, 33630, 33583, 33615, 33607,
+    33603, 33631, 33600, 33559, 33632, 33581, 33594, 33587, 33638, 33637,
+    33640, 33563, 33641, 33644, 33642, {f: 2, c: 33645}, 33712, 33656,
+    {f: 2, c: 33715}, 33696, 33706, 33683, 33692, 33669, 33660, 33718, 33705,
+    33661, 33720, 33659, 33688, 33694, 33704, 33722, 33724, 33729, 33793,
+    33765, 33752, 22535, 33816, 33803, 33757, 33789, 33750, 33820, 33848,
+    33809, 33798, 33748, 33759, 33807, 33795, {f: 2, c: 33784}, 33770, 33733,
+    33728, 33830, 33776, 33761, 33884, 33873, 33882, 33881, 33907,
+    {f: 2, c: 33927}, 33914, 33929, 33912, 33852, 33862, 33897, 33910, 33932,
+    33934, 33841, 33901, 33985, 33997, 34000, 34022, 33981, 34003, 33994,
+    33983, 33978, 34016, 33953, 33977, 33972, 33943, 34021, 34019, 34060,
+    29965, 34104, 34032, 34105, 34079, 34106, 34134, 34107, 34047, 34044,
+    34137, 34120, 34152, 34148, 34142, 34170, 30626, 34115, 34162, 34171,
+    34212, 34216, 34183, 34191, 34169, 34222, 34204, 34181, 34233, 34231,
+    34224, 34259, 34241, 34268, 34303, 34343, 34309, 34345, 34326, 34364,
+    [12086, 24318], 24328, 22844, 22849, 32823, 22869, 22874, 22872, 21263,
+    [12074, 23586], 23589, 23596, 23604, 25164, 25194, 25247, 25275, 25290,
+    25306, 25303, 25326, 25378, 25334, 25401, 25419, 25411, 25517, 25590,
+    25457, 25466, 25486, 25524, 25453, 25516, 25482, 25449, 25518, 25532,
+    25586, 25592, 25568, 25599, 25540, 25566, 25550, 25682, 25542, 25534,
+    25669, 25665, 25611, 25627, 25632, 25612, 25638, 25633, 25694, 25732,
+    25709, 25750, 25722, {f: 2, c: 25783}, 25753, 25786, 25792, 25808, 25815,
+    25828, 25826, 25865, 25893, 25902, [12087, 24331], 24530, 29977, 24337,
+    21343, 21489, 21501, 21481, 21480, 21499, 21522, 21526, 21510, 21579,
+    {f: 3, c: 21586}, 21590, 21571, 21537, 21591, 21593, 21539, 21554, 21634,
+    21652, 21623, 21617, 21604, {f: 2, c: 21658}, 21636, 21622, 21606, 21661,
+    21712, 21677, 21698, 21684, 21714, 21671, 21670, {f: 2, c: 21715}, 21618,
+    21667, 21717, 21691, 21695, 21708, {f: 2, c: 21721}, 21724,
+    {f: 2, c: 21673}, 21668, 21725, 21711, 21726, 21787, 21735, 21792, 21757,
+    21780, 21747, {f: 2, c: 21794}, 21775, 21777, 21799, 21802, 21863, 21903,
+    21941, 21833, 21869, 21825, 21845, 21823, 21840, 21820, 21815, 21846,
+    {f: 3, c: 21877}, 21811, 21808, 21852, 21899, 21970, 21891, 21937, 21945,
+    21896, 21889, 21919, 21886, 21974, 21905, 21883, 21983, {f: 2, c: 21949},
+    21908, 21913, 21994, 22007, 21961, 22047, 21969, {f: 2, c: 21995}, 21972,
+    21990, 21981, 21956, 21999, 21989, {f: 2, c: 22002}, {f: 2, c: 21964},
+    21992, 22005, 21988, 36756, 22046, 22024, 22028, 22017, 22052, 22051,
+    22014, 22016, 22055, 22061, 22104, 22073, 22103, 22060, 22093, 22114,
+    22105, 22108, 22092, 22100, 22150, 22116, 22129, 22123, {f: 2, c: 22139},
+    22149, 22163, 22191, 22228, [12062, 22231], 22237, 22241, 22261, 22251,
+    22265, 22271, 22276, 22282, 22281, 22300, 24079, 24089, 24084, 24081,
+    24113, {f: 2, c: 24123}, 24119, 24132, 24148, 24155, 24158, 24161, 23692,
+    23674, 23693, 23696, 23702, 23688, {f: 2, c: 23704}, 23697, 23706, 23708,
+    23733, 23714, 23741, 23724, 23723, 23729, 23715, 23745, 23735, 23748,
+    23762, 23780, 23755, 23781, {f: 2, c: 23810}, 23847, 23846, 23854, 23844,
+    23838, 23814, 23835, 23896, 23870, 23860, 23869, 23916, 23899, 23919,
+    23901, 23915, 23883, 23882, 23913, 23924, 23938, 23961, 23965, 35955,
+    23991, 24005, [12091, 24435], 24439, 24450, 24455, 24457, 24460, 24469,
+    24473, 24476, 24488, 24493, 24501, 24508, 34914, [12090, 24417], 29357,
+    29360, 29364, {f: 2, c: 29367}, 29379, 29377, 29390, 29389, 29394, 29416,
+    29423, 29417, 29426, 29428, 29431, 29441, 29427, 29443, {f: 2, c: 29434},
+    29463, 29459, 29473, 29450, 29470, 29469, 29461, 29474, 29497, 29477,
+    29484, 29496, 29489, 29520, 29517, 29527, 29536, 29548, 29551, 29566,
+    [12167, 33307], 22821, 39143, 22820, [12065, 22786], 39267,
+    {f: 6, c: 39271}, 39284, 39287, 39293, 39296, 39300, 39303, 39306, 39309,
+    {f: 2, c: 39312}, {f: 3, c: 39315}, 24192, 24209, 24203, 24214, 24229,
+    24224, 24249, 24245, 24254, 24243, 36179, 24274, 24273, 24283, 24296,
+    24298, 33210, 24516, 24521, 24534, 24527, 24579, 24558, 24580, 24545,
+    24548, 24574, {f: 2, c: 24581}, 24554, 24557, 24568, 24601, 24629, 24614,
+    24603, 24591, 24589, 24617, 24619, 24586, 24639, 24609, {f: 2, c: 24696},
+    24699, 24698, 24642, 24682, 24701, 24726, 24730, 24749, 24733, 24707,
+    24722, 24716, 24731, 24812, 24763, 24753, 24797, 24792, 24774, 24794,
+    24756, 24864, 24870, 24853, 24867, 24820, 24832, 24846, 24875, 24906,
+    24949, 25004, 24980, 24999, 25015, 25044, 25077, 24541, 38579, 38377,
+    38379, 38385, 38387, {f: 2, c: 38389}, 38396, 38398, {f: 2, c: 38403},
+    38406, 38408, {f: 4, c: 38410}, 38415, 38418, {f: 3, c: 38421},
+    {f: 2, c: 38425}, 20012, [12121, 29247], 25109, 27701, 27732, 27740, 27722,
+    27811, 27781, 27792, 27796, 27788, {f: 2, c: 27752}, 27764, 27766, 27782,
+    27817, 27856, 27860, 27821, {f: 2, c: 27895}, 27889, 27863, 27826, 27872,
+    27862, 27898, 27883, 27886, 27825, 27859, 27887, 27902, 27961, 27943,
+    27916, 27971, 27976, 27911, 27908, 27929, 27918, 27947, 27981, 27950,
+    27957, 27930, 27983, 27986, 27988, 27955, 28049, 28015, 28062, 28064,
+    27998, {f: 2, c: 28051}, 27996, 28000, 28028, 28003, 28186, 28103, 28101,
+    28126, 28174, 28095, 28128, 28177, 28134, 28125, 28121, 28182, 28075,
+    28172, 28078, 28203, 28270, 28238, 28267, 28338, 28255, 28294,
+    {f: 2, c: 28243}, 28210, 28197, 28228, 28383, 28337, 28312, 28384, 28461,
+    28386, 28325, 28327, 28349, 28347, 28343, 28375, 28340, 28367, 28303,
+    28354, 28319, 28514, {f: 2, c: 28486}, 28452, 28437, 28409, 28463, 28470,
+    28491, 28532, 28458, 28425, 28457, 28553, 28557, 28556, 28536, 28530,
+    28540, 28538, 28625, 28617, 28583, 28601, 28598, 28610, 28641, 28654,
+    28638, 28640, 28655, 28698, 28707, 28699, 28729, 28725, 28751, 28766,
+    [12071, 23424], 23428, 23445, 23443, 23461, 23480, 29999, 39582, 25652,
+    23524, 23534, 35120, 23536, 36423, 35591, 36790, 36819, 36821, 36837,
+    36846, 36836, 36841, 36838, 36851, 36840, 36869, 36868, 36875, 36902,
+    36881, 36877, 36886, 36897, {f: 2, c: 36917}, 36909, 36911, 36932,
+    {f: 2, c: 36945}, 36944, 36968, 36952, 36962, 36955, 26297, 36980, 36989,
+    36994, 37000, 36995, 37003, [12089, 24400], 24407, 24406, 24408, 23611,
+    21675, 23632, 23641, 23409, 23651, 23654, 32700, 24362, 24361, 24365,
+    33396, 24380, 39739, [12076, 23662], 22913, 22915, 22925, {f: 2, c: 22953},
+    22947, 22935, 22986, 22955, 22942, 22948, 22994, 22962, 22959, 22999,
+    22974, {f: 2, c: 23045}, 23005, 23048, 23011, 23000, 23033, 23052, 23049,
+    23090, 23092, 23057, 23075, 23059, 23104, 23143, 23114, 23125, 23100,
+    23138, 23157, 33004, 23210, 23195, 23159, 23162, 23230, 23275, 23218,
+    23250, 23252, 23224, 23264, 23267, 23281, 23254, 23270, 23256, 23260,
+    23305, 23319, 23318, 23346, 23351, 23360, 23573, 23580, 23386, 23397,
+    23411, 23377, 23379, 23394, 39541, {f: 2, c: 39543}, 39546, 39551, 39549,
+    {f: 2, c: 39552}, 39557, 39560, 39562, 39568, {f: 2, c: 39570}, 39574,
+    39576, {f: 3, c: 39579}, {f: 2, c: 39583}, {f: 2, c: 39586}, 39589, 39591,
+    32415, 32417, 32419, 32421, {f: 2, c: 32424}, 32429, 32432, 32446,
+    {f: 3, c: 32448}, 32457, {f: 2, c: 32459}, 32464, 32468, 32471, 32475,
+    {f: 2, c: 32480}, 32488, 32491, {f: 2, c: 32494}, {f: 2, c: 32497}, 32525,
+    32502, {f: 2, c: 32506}, 32510, {f: 3, c: 32513}, {f: 2, c: 32519},
+    {f: 2, c: 32523}, 32527, {f: 2, c: 32529}, 32535, 32537, 32540, 32539,
+    32543, {f: 7, c: 32545}, {f: 4, c: 32554}, {f: 5, c: 32559}, 32565,
+    [12083, 24186], 30079, [12078, 24027], 30014, 37013, 29582, 29585, 29614,
+    29602, 29599, 29647, 29634, 29649, 29623, 29619, 29632, 29641, 29640,
+    29669, 29657, 39036, 29706, 29673, 29671, 29662, 29626, 29682, 29711,
+    29738, 29787, 29734, 29733, 29736, 29744, 29742, 29740, 29723, 29722,
+    29761, 29788, 29783, 29781, 29785, 29815, 29805, 29822, 29852, 29838,
+    {f: 2, c: 29824}, 29831, 29835, 29854, {f: 2, c: 29864}, 29840, 29863,
+    29906, 29882, {f: 3, c: 38890}, 26444, 26451, 26462, 26440, 26473, 26533,
+    26503, 26474, 26483, 26520, 26535, 26485, 26536, 26526, 26541, 26507,
+    26487, 26492, 26608, 26633, 26584, 26634, 26601, 26544, 26636, 26585,
+    26549, 26586, 26547, 26589, 26624, 26563, 26552, 26594, 26638, 26561,
+    26621, {f: 2, c: 26674}, {f: 2, c: 26720}, 26702, 26722, 26692, 26724,
+    26755, 26653, 26709, 26726, 26689, 26727, 26688, 26686, 26698, 26697,
+    26665, 26805, 26767, 26740, 26743, 26771, 26731, 26818, 26990, 26876,
+    {f: 2, c: 26911}, 26873, 26916, 26864, 26891, 26881, 26967, 26851, 26896,
+    26993, 26937, 26976, 26946, 26973, 27012, 26987, 27008, 27032, 27000,
+    26932, 27084, {f: 2, c: 27015}, 27086, 27017, 26982, 26979, 27001, 27035,
+    27047, 27067, 27051, 27053, 27092, 27057, 27073, 27082, 27103, 27029,
+    27104, 27021, 27135, 27183, 27117, {f: 2, c: 27159}, 27237, 27122, 27204,
+    27198, 27296, 27216, 27227, 27189, 27278, 27257, 27197, 27176, 27224,
+    27260, 27281, 27280, 27305, 27287, 27307, 29495, 29522, {f: 2, c: 27521},
+    27527, 27524, {f: 2, c: 27538}, 27533, {f: 2, c: 27546}, 27553, 27562,
+    36715, 36717, {f: 3, c: 36721}, {f: 2, c: 36725}, 36728, 36727,
+    {f: 2, c: 36729}, 36732, 36734, {f: 2, c: 36737}, 36740, 36743, 36747,
+    {f: 3, c: 36749}, 36760, 36762, 36558, 25099, 25111, 25115, 25119, 25122,
+    25121, 25125, 25124, 25132, 33255, 29935, 29940, 29951, 29967, 29969,
+    29971, [12097, 25908], {f: 3, c: 26094}, 26122, 26137, 26482, 26115, 26133,
+    26112, 28805, 26359, 26141, 26164, 26161, 26166, 26165, 32774, 26207,
+    26196, 26177, 26191, 26198, 26209, 26199, 26231, 26244, 26252, 26279,
+    26269, 26302, {f: 2, c: 26331}, 26342, 26345, {f: 2, c: 36146}, 36150,
+    36155, 36157, 36160, {f: 2, c: 36165}, {f: 2, c: 36168}, 36167, 36173,
+    36181, 36185, 35271, {f: 3, c: 35274}, {f: 4, c: 35278}, 29294, 29343,
+    29277, 29286, 29295, {f: 2, c: 29310}, 29316, 29323, 29325, 29327, 29330,
+    25352, 25394, 25520, 25663, 25816, 32772, 27626, 27635, 27645, 27637,
+    27641, 27653, 27655, 27654, 27661, 27669, {f: 3, c: 27672}, 27681, 27689,
+    27684, 27690, 27698, 25909, 25941, 25963, 29261, 29266, 29270, 29232,
+    34402, 21014, 32927, 32924, 32915, 32956, 26378, 32957, 32945, 32939,
+    32941, 32948, 32951, {f: 4, c: 32999}, 32987, 32962, 32964, 32985, 32973,
+    32983, 26384, 32989, 33003, 33009, 33012, 33005, {f: 2, c: 33037}, 33010,
+    33020, 26389, 33042, 35930, 33078, 33054, 33068, 33048, 33074, 33096,
+    33100, 33107, 33140, {f: 2, c: 33113}, 33137, 33120, 33129,
+    {f: 2, c: 33148}, 33133, 33127, 22605, 23221, 33160, 33154, 33169, 28373,
+    33187, 33194, 33228, 26406, 33226, 33211, 33217, 33190, 27428, 27447,
+    27449, 27459, 27462, 27481, {f: 3, c: 39121}, 39125, {f: 2, c: 39129},
+    [12110, 27571], 24384, 27586, 35315, 26000, 40785, 26003, 26044, 26054,
+    26052, 26051, 26060, 26062, 26066, 26070, 28800, 28828, 28822, 28829,
+    28859, 28864, 28855, 28843, 28849, 28904, 28874, 28944, 28947, 28950,
+    28975, 28977, 29043, 29020, 29032, 28997, 29042, 29002, 29048, 29050,
+    29080, 29107, 29109, 29096, 29088, 29152, 29140, 29159, 29177, 29213,
+    29224, 28780, 28952, 29030, 29113, 25150, 25149, 25155, {f: 2, c: 25160},
+    31035, 31040, 31046, 31049, {f: 2, c: 31067}, 31059, 31066, 31074, 31063,
+    31072, 31087, 31079, 31098, 31109, 31114, 31130, 31143, 31155, 24529,
+    24528, 24636, 24669, 24666, 24679, 24641, 24665, 24675, 24747, 24838,
+    24845, 24925, 25001, 24989, 25035, 25041, 25094, 32896, [12160, 32895],
+    27795, 27894, 28156, 30710, 30712, 30720, 30729, {f: 2, c: 30743}, 30737,
+    26027, 30765, {f: 2, c: 30748}, {f: 3, c: 30777}, 30751, 30780, 30757,
+    30764, 30755, 30761, 30798, 30829, {f: 2, c: 30806}, 30758, 30800, 30791,
+    30796, 30826, 30875, 30867, 30874, 30855, 30876, 30881, 30883, 30898,
+    30905, 30885, 30932, 30937, 30921, 30956, 30962, 30981, 30964, 30995,
+    31012, 31006, 31028, 40859, [12235, 40697], {f: 2, c: 40699}, 30449, 30468,
+    30477, 30457, {f: 2, c: 30471}, 30490, 30498, 30489, 30509, 30502, 30517,
+    30520, {f: 2, c: 30544}, 30535, 30531, 30554, 30568, 30562, 30565, 30591,
+    30605, 30589, 30592, 30604, 30609, {f: 2, c: 30623}, 30640, 30645, 30653,
+    30010, 30016, 30030, 30027, 30024, 30043, 30066, 30073, 30083, 32600,
+    32609, 32607, 35400, 32616, 32628, 32625, 32633, 32641, 32638, 30413,
+    30437, 34866, {f: 3, c: 38021}, 38027, 38026, {f: 2, c: 38028},
+    {f: 2, c: 38031}, 38036, 38039, 38037, {f: 3, c: 38042}, {f: 2, c: 38051},
+    38059, 38058, 38061, 38060, {f: 2, c: 38063}, 38066, 38068,
+    {f: 5, c: 38070}, {f: 2, c: 38076}, 38079, 38084, {f: 7, c: 38088},
+    {f: 3, c: 38096}, {f: 3, c: 38101}, 38105, 38104, 38107, {f: 3, c: 38110},
+    38114, {f: 2, c: 38116}, {f: 2, c: 38119}, 38122, 38121, 38123,
+    {f: 2, c: 38126}, {f: 3, c: 38131}, 38135, 38137, {f: 2, c: 38140}, 38143,
+    38147, 38146, {f: 2, c: 38150}, {f: 2, c: 38153}, {f: 3, c: 38157},
+    {f: 5, c: 38162}, 38168, 38171, {f: 3, c: 38173}, 38178, {f: 2, c: 38186},
+    38185, 38188, {f: 2, c: 38193}, 38196, {f: 3, c: 38198}, 38204,
+    {f: 2, c: 38206}, 38210, 38197, {f: 3, c: 38212}, 38217, 38220,
+    {f: 2, c: 38222}, {f: 3, c: 38226}, {f: 4, c: 38230}, 38235,
+    {f: 2, c: 38238}, 38237, {f: 2, c: 38241}, {f: 9, c: 38244}, 38255,
+    {f: 3, c: 38257}, 38202, 30695, 30700, 38601, 31189, 31213, 31203, 31211,
+    31238, 23879, 31235, 31234, 31262, 31252, 31289, 31287, 31313, 40655,
+    39333, 31344, 30344, 30350, 30355, 30361, 30372, 29918, 29920, 29996,
+    40480, 40482, {f: 5, c: 40488}, 40498, 40497, 40502, 40504, 40503,
+    {f: 2, c: 40505}, 40510, {f: 2, c: 40513}, 40516, {f: 4, c: 40518},
+    {f: 2, c: 40523}, 40526, 40529, 40533, 40535, {f: 3, c: 40538}, 40542,
+    40547, {f: 7, c: 40550}, 40561, 40557, 40563, [12135, 30098], 30100, 30102,
+    30112, 30109, 30124, 30115, {f: 2, c: 30131}, 30136, 30148, 30129, 30128,
+    30147, 30146, 30166, 30157, 30179, 30184, 30182, 30180, 30187, 30183,
+    30211, 30193, 30204, 30207, 30224, 30208, 30213, 30220, 30231, 30218,
+    30245, 30232, 30229, 30233, 30235, 30268, 30242, 30240, 30272, 30253,
+    30256, 30271, 30261, 30275, 30270, 30259, 30285, 30302, 30292, 30300,
+    30294, 30315, 30319, 32714, 31462, {f: 2, c: 31352}, 31360, 31366, 31368,
+    31381, 31398, 31392, 31404, 31400, 31405, 31411, 34916, 34921, 34930,
+    34941, 34943, 34946, 34978, 35014, 34999, 35004, 35017, 35042, 35022,
+    35043, 35045, 35057, 35098, 35068, 35048, 35070, 35056, 35105, 35097,
+    35091, 35099, 35082, 35124, 35115, 35126, 35137, 35174, 35195,
+    [12134, 30091], 32997, 30386, 30388, 30684, [12158, 32786], 32788, 32790,
+    32796, 32800, 32802, {f: 3, c: 32805}, 32809, 32808, 32817, 32779, 32821,
+    32835, 32838, 32845, 32850, 32873, 32881, 35203, 39032, 39040, 39043,
+    39049, {f: 2, c: 39052}, 39055, 39060, {f: 2, c: 39066}, {f: 2, c: 39070},
+    {f: 2, c: 39073}, {f: 2, c: 39077}, [12172, 34381], 34388, 34412, 34414,
+    34431, 34426, 34428, 34427, 34472, 34445, 34443, 34476, 34461, 34471,
+    34467, 34474, 34451, 34473, 34486, 34500, 34485, 34510, 34480, 34490,
+    34481, 34479, 34505, 34511, 34484, 34537, {f: 2, c: 34545}, 34541, 34547,
+    34512, 34579, 34526, 34548, 34527, 34520, 34513, 34563, 34567, 34552,
+    34568, 34570, 34573, 34569, 34595, 34619, 34590, 34597, 34606, 34586,
+    34622, 34632, 34612, 34609, 34601, 34615, 34623, 34690, 34594,
+    {f: 2, c: 34685}, 34683, 34656, 34672, 34636, 34670, 34699, 34643, 34659,
+    34684, 34660, 34649, 34661, 34707, 34735, 34728, 34770, 34758, 34696,
+    34693, 34733, 34711, 34691, 34731, 34789, 34732, 34741, 34739, 34763,
+    34771, 34749, 34769, 34752, 34762, 34779, 34794, 34784, 34798, 34838,
+    34835, 34814, 34826, 34843, 34849, 34873, 34876, [12152, 32566], 32578,
+    {f: 2, c: 32580}, 33296, 31482, 31485, 31496, {f: 2, c: 31491}, 31509,
+    31498, 31531, 31503, 31559, 31544, 31530, 31513, 31534, 31537, 31520,
+    31525, 31524, 31539, 31550, 31518, 31576, 31578, 31557, 31605, 31564,
+    31581, 31584, 31598, 31611, 31586, 31602, 31601, 31632, {f: 2, c: 31654},
+    31672, 31660, 31645, 31656, 31621, 31658, 31644, 31650, 31659, 31668,
+    31697, 31681, 31692, 31709, 31706, {f: 2, c: 31717}, 31722, 31756, 31742,
+    31740, 31759, 31766, 31755, 31775, 31786, 31782, 31800, 31809, 31808,
+    33278, {f: 2, c: 33281}, 33284, 33260, 34884, {f: 3, c: 33313}, 33325,
+    33327, 33320, 33323, 33336, 33339, {f: 2, c: 33331}, 33342, 33348, 33353,
+    33355, 33359, 33370, 33375, 33384, 34942, 34949, 34952, 35032, 35039,
+    35166, 32669, 32671, 32679, {f: 2, c: 32687}, 32690, 31868, 25929, 31889,
+    31901, 31900, 31902, 31906, 31922, {f: 2, c: 31932}, 31937, 31943,
+    {f: 2, c: 31948}, 31944, 31941, 31959, 31976, [12169, 33390], 26280, 32703,
+    32718, 32725, 32741, 32737, 32742, 32745, 32750, 32755, [12151, 31992],
+    32119, 32166, 32174, 32327, 32411, 40632, 40628, 36211, 36228, 36244,
+    36241, 36273, 36199, 36205, 35911, 35913, 37194, 37200, {f: 2, c: 37198},
+    37220, 37218, 37217, 37232, 37225, 37231, {f: 2, c: 37245}, 37234, 37236,
+    37241, 37260, 37253, 37264, 37261, 37265, {f: 2, c: 37282}, 37290,
+    {f: 3, c: 37293}, 37301, 37300, 37306, [12183, 35925], 40574, 36280, 36331,
+    36357, 36441, 36457, 36277, 36287, 36284, 36282, 36292, {f: 2, c: 36310},
+    36314, 36318, {f: 2, c: 36302}, 36315, 36294, 36332, {f: 2, c: 36343},
+    36323, 36345, 36347, 36324, 36361, 36349, 36372, 36381, 36383, 36396,
+    36398, 36387, 36399, 36410, 36416, 36409, 36405, 36413, 36401, 36425,
+    {f: 2, c: 36417}, {f: 2, c: 36433}, 36426, 36464, 36470, 36476, 36463,
+    36468, 36485, 36495, 36500, 36496, 36508, 36510, [12184, 35960], 35970,
+    35978, 35973, 35992, 35988, 26011, 35286, 35294, 35290, 35292, 35301,
+    35307, 35311, 35390, 35622, 38739, 38633, 38643, 38639, 38662, 38657,
+    38664, 38671, 38670, 38698, 38701, 38704, 38718, 40832, 40835,
+    {f: 6, c: 40837}, 40844, 40702, 40715, 40717, [12203, 38585],
+    {f: 2, c: 38588}, 38606, 38610, 30655, 38624, 37518, 37550, 37576, 37694,
+    37738, 37834, 37775, 37950, 37995, 40063, 40066, {f: 4, c: 40069}, 31267,
+    40075, 40078, {f: 3, c: 40080}, {f: 2, c: 40084}, {f: 2, c: 40090},
+    {f: 6, c: 40094}, {f: 5, c: 40101}, 40107, {f: 2, c: 40109},
+    {f: 8, c: 40112}, {f: 4, c: 40122}, {f: 4, c: 40132}, {f: 7, c: 40138},
+    {f: 3, c: 40147}, {f: 3, c: 40151}, {f: 2, c: 40156}, 40159, 40162, 38780,
+    38789, {f: 2, c: 38801}, 38804, 38831, 38827, 38819, 38834, 38836, 39601,
+    39600, 39607, 40536, 39606, 39610, 39612, 39617, 39616, 39621, 39618,
+    {f: 2, c: 39627}, 39633, 39749, 39747, 39751, 39753, 39752, 39757, 39761,
+    39144, 39181, 39214, 39253, 39252, [12221, 39647], 39649, 39654, 39663,
+    39659, 39675, 39661, 39673, 39688, 39695, 39699, 39711, 39715,
+    {f: 2, c: 40637}, 32315, 40578, {f: 2, c: 40583}, 40587, 40594, 37846,
+    40605, 40607, {f: 3, c: 40667}, 40672, 40671, 40674, 40681, 40679, 40677,
+    40682, 40687, 40738, 40748, 40751, 40761, 40759, {f: 2, c: 40765}, 40772,
+    12295, {s: 13}, 30362, 34297, 31001, 24859, 39599, 35158, 22761, 32631,
+    25850, 25943, 38930, 36774, 32070, 24171, 32129, 37770, 35607, 39165,
+    23542, 22577, 39825, 36649, [12185, 35997], 37575, 29437, 20633, 24970,
+    32179, 31558, 30050, 25987, 24163, 38281, 37002, 32232, 36022, 35722,
+    36783, 36782, 27161, 40009, 30303, 28693, 28657, 36051, 25839, 39173,
+    25765, 37474, 37457, 39361, 35036, 36001, 21443, 34870, 27544, 24922,
+    24920, 29158, 33980, 33369, 20489, 28356, 21408, 20596, 28204, 23652,
+    35435, 25881, 25723, 34796, 39262, 35730, 32399, 37855, 29987, 38369,
+    39019, 22580, 22039, [12199, 38263], 20767, 33144, 24288, 26274, 37396,
+    [12190, 36554], 24505, 22645, 38515, 35183, 31281, 25074, 35488, 39425,
+    36978, 39347, [12242, 40786], 29118, 34909, 34802, 23541, 30087, 36490,
+    31820, 32162, 37276, 37604, 38619, 30990, 20786, 35320, 34389, 20659,
+    30241, 38358, 21109, 37656, 32020, 32189, 36781, 35422, 36060, 32880,
+    24478, 21474, 36517, 31428, 37679, 36948, 24118, 36024, 25812, 21934,
+    37170, 25763, 33213, 24986, 35477, 24392, 30070, 25803, 40680, 34153,
+    27284, 25623, 23798, 31153, 23566, 29128, 37159, 25973, 28364, 36958,
+    32224, 39003, 40670, 22666, 38651, 28593, 37347, 35519, 35548, 37336,
+    38914, 37664, 35330, 26481, 21205, 26847, 20941, [12222, 39717], 29346,
+    29544, 35712, 36077, 37709, 37723, 26039, 32222, 38538, 23565, 22136,
+    38931, 37389, 22890, 22702, 40285, 38989, 35355, 24801, 39187, 20818,
+    29246, 39180, 36019, 30332, 32624, 38309, 31020, 37353, 29033, 31684,
+    36009, 39151, 35370, 32033, [12214, 39131], 35513, 24290, 36027, 32027,
+    22707, 22894, 24996, 31966, 35920, 26963, 37586, [12213, 39080], 30219,
+    39342, 32299, 35575, 40179, 33178, 36667, 25771, 36628, 36070, 24489,
+    36000, 35331, 23142, 32283, 35442, 37411, 33995, 24185, 36245, 36123,
+    23713, 21083, 37628, 32177, 23831, 37804, 25841, 40255, 38307, 37499,
+    20491, 32102, 40852, 38799, 36002, 37390, 28317, 27083, 36092, 34865,
+    39015, 21102, 38364, 35264, 39208, 24931, 36011, 24291, 35215, 27512,
+    [12244, 40860], 38312, 36556, 35437, 27331, 36020, 21130, 36645, 37707,
+    22283, 36942, 39405, 38867, 28450, 34399, 38305, 40372, 36032, 36703,
+    40251, 32005, 22778, 35703, 28396, 22057, 33775, 30059, 21123, 35441,
+    25079, 22750, 27489, 29872, 36996, 32233, 35594, 25582, 36637, 36036,
+    31330, 26371, 29172, 21295, 35569, 35496, 32362, 33911, 28222, 29554,
+    36008, 31117, 25802, 27231, 31309, 39249, 35663, 40388, 32318, 32221,
+    26997, 36655, 32026, 25824, 24190, 34186, 21137, 28639, 35336, 35352,
+    38555, 32380, 32000, 22846, 33698, 38960, 36040, 37440, 20729, 39381,
+    27570, 30435, 22533, 31627, 38291, 33393, 32216, 32365, 27298, 40572,
+    25536, 25791, 31777, 20745, 34214, 27323, 37970, 36368, 36068,
+    [12178, 35211], 37749, 33382, 21133, 39198, 28472, 28666, 28567, 23559,
+    28479, 34083, 27123, 22892, 35611, 37292, 33184, 28550, 39509, 23308,
+    25898, 37496, 30703, 20709, 39171, 32371, 32094, 36686, 36611, 38542,
+    31680, 28500, 32080, 35489, 32202, 37670, 20677, 35641, 36914, 29180,
+    30433, 21185, 33686, 39912, 39514, 32147, 38968, 37857, 24465, 30169,
+    31478, 31998, 33290, 39378, 33289, 25818, 37624, 25084, 21127, 40273,
+    32121, 35258, 35363, 32118, 37406, 36557, 39423, 38283, 20977, 38982,
+    27579, 35506, 22718, 25031, 25715, 24235, 35122, 35463, 22602, 20744,
+    23532, 31014, 26336, 34407, 24011, 31418, 39243, 28528, 25844, 38346,
+    34847, 33240, 33802, 20358, 36084, 34253, 27396, 25876, 31811, 38348,
+    34349, 28734, 35733, 25900, 35261, 25078, 32412, 29211, 28651, 25736,
+    21214, 28551, 27138, 37939, 22744, 39006, 31852, 38626, 28757, 35023,
+    39881, 31150, 40599, 21426, 21237, 31019, 27511, 28701, 38584, 20486,
+    32879, 34030, 36899, 37934, 24976, 28451, 31806, 25986, 33225, 37832,
+    25088, 29001, 32244, 31975, 20841, 36635, 35538, 30274, 36988, 37904,
+    29557, 33256, 37168, 40023, 36035, 40801, 37428, 38728, 23994, 38936,
+    39230, 21129, [12243, 40845], 32894, 22184, 31840, 22751, 25871, 38580,
+    27155, 23105, 25695, 31757, 34310, 30439, 39025, 24300, 29200, 25796,
+    28407, 34396, 39791, 36034, 37682, 38520, 39522, 37569, 23650, 32311,
+    24942, 28670, 32209, 24018, 25891, 23423, 28772, 20098, 25476, 36650,
+    20523, 20374, 28138, 32184, 35542, 34367, 32645, 37007, 38012, 31854,
+    39486, 39409, 32097, 23229, 29802, 30908, 34718, [12218, 39340], 39393,
+    21966, 36023, [12230, 40613], 36067, 36993, 30622, 39237, 34875, 28415,
+    35646, 37672, 37466, 36031, 37762, [12200, 38272], 24758, 20497, 37683,
+    22818, 35598, 24396, 35219, 32191, 32236, 24287, 28357, 25003, 38313,
+    40180, 37528, 35628, 35584, 30045, 37385, 32013, 38627, 25747, 33126,
+    24817, 39719, 39186, 25836, 33193, 25862, 37312, [12227, 40165], 32886,
+    22169, 38007, 37811, 27320, 29552, 23527, 25840, 28632, 37397, 32016,
+    33215, 28611, 36786, 30247, 35582, 27472, 40407, 27590, 22036, 28442,
+    30436, 40848, 36064, 22132, 40300, 39449, 39108, 38971, 36007, 34315,
+    24977, 35413, 28497, 38935, 25778, 37610, 20693, 27192, 35676, 33229,
+    [12241, 40778], 39438, 35912, 21843, 27683, 35350, 29309, 37370, 37467,
+    36983, 31805, 35609, 37666, 37463, 28154, 35700, 22649, 27085, 21958,
+    22715, 34196, 25654, 37740, 27211, 21932, 20689, 32761, 31429, 31434,
+    27453, 35242, 23522, 36629, 27691, 20670, 38915, 35531, 24950, 29898,
+    31406, 36264, 21312, 36544, 39493, 40818, 39028, 27402, 21240, 40306,
+    30906, 35731, 39250, 25854, 32350, 29105, 38860, 35469, 32009, 27054,
+    32104, 36575, 37613, 38287, 28516, 28753, 34217, 39955, 36093, 20632,
+    21930, 39479, 25475, 28544, 27578, 32023, 31721, 26348, 38275, 38493,
+    36109, 32341, 20663, 36062, 29138, 32057, 36050, 25448, 25885, 25086,
+    35373, 32051, 23529, 23352, 33102, 28402, 32882, 32361, 21213, 32854,
+    24107, 29509, 28629, 35433, 26178, 34645, 23526, 35672, 39387, 21218,
+    36969, 37323, 39166, 35222, 35430, 22781, 29560, 27166, 36664, 26360,
+    36118, 23660, 34899, 27193, 31466, 25976, 24101, 38617, 35504, 38918,
+    35500, 30889, 29197, 32114, 39164, 39686, 32883, 24939, 38924, 35359,
+    35494, 25851, 34311, 35380, 32901, 38614, 38568, 32143, 27506, 23403,
+    25613, 32302, 29795, 37782, 29562, 25787, 33274, 24907, 25892, 36010,
+    30321, 28760, 22727, 35674, 35527, 22022, 28271, 29145, 28644, 32295,
+    35342, 39472, 35588, 37563, 38988, 39636, 26781, 36028, 37941, 24307,
+    32893, 28916, 37509, 32113, 38957, 22294, 22615, 22296, 38973, 40213,
+    39345, 39389, 27234, 31402, 35178, 24398, 28771, 38929, 33836, 32178,
+    [12209, 38859], 36949, 22285, 29234, 28656, 32173, 33894, 20553, 20702,
+    32239, 35586, 34907, 32862, 32011, 31337, 21839, 25790, 34680, 28198,
+    31401, 21978, 37794, 28879, 35491, 28961, 34154, 22626, 38695, 21209,
+    35492, 37675, 29351, 35186, 32722, 37521, 25138, 32048, 34662, 36676,
+    23805, 20448, 29433, 22151, 37697, 39854, 32406, 36066, 37532, 38289,
+    39023, 38570, 29694, 29563, 32291, 39201, 25010, 32171, 38002, 37129,
+    35443, 38911, 38917, 34157, 22210, 37559, 26313, 22063, 21332, 25406,
+    33029, 35559, 23531, 28681, 35613, 37573, 37313, 33288, 37561, 32137,
+    38920, 35377, 32210, 32396, 36562, 25080, 36984, 30316, 32098, 23416,
+    21211, 35426, 23563, 39348, 35347, 35338, 36956, 22739, 40201, 40232,
+    21854, 20126, 35357, 38329, 40573, 22196, 38996, 38331, 33399, 21421,
+    30831, 35578, 39511, 40230, 26954, 25562, 30221, 38525, 30306, 39178,
+    27171, 22575, 35617, 34277, 29242, [12212, 38913], 26989, 33865, 37291,
+    37541, 38948, 36986, 20736, 34811, 34269, 20740, 25014, 32681, 35427,
+    35696, 35516, 35695, 32377, 34093, 38512, 37504, 39154, 38577, 27387,
+    23344, 40441, 25033, 32403, 29801, 34722, 29151, 29074, 34821, 36111,
+    31310, 21938, 25793, 20653, 30320, 36404, 20778, 24962, 37109, 37438,
+    29494, 35480, 36671, 39192, [12226, 39770], 28417, 33287, 23996, 35486,
+    39729, 29508, 35709, 38928, 39341, 40219, 28149, 36677, 22290, 21729,
+    22291, 32227, 36960, 39000, 32004, 36493, 38000, 38322, 38642, 37142,
+    38549, 36939, 34292, 37270, 26248, 38620, 36617, 25890, 26283, 36106,
+    36124, 33247, 38015, 26839, 31432, 36012, 25799, 21063, 28580, 36042,
+    36104, 36555, 37720, 38296, 35408, 40779, 20661, 27656, 30430, 26028,
+    36670, 23940, 26855, 25136, 32187, 24373, 28466, 24115, 36076, 33081,
+    36249, 34756, 36685, 37754, 36889, 35998, 37341, 20597, 35386, 37806,
+    38499, 24128, 30309, 37165, 35657, 32340, 32887, 22519, 34937, 32025,
+    25711, 25842, 24159, 36074, 28399, 37912, 32066, 31278, 33131, 34886,
+    35589, 36600, 30394, 26205, 39519, 35576, 35461, 29165, 30682, 22225,
+    36015, 37956, 31689, 39376, 23560, 30938, 36681, 36090, 27137, 33674,
+    35037, 22941, 22767, 29376, 37648, 36101, 22684, 32180, 35524, 28310,
+    28609, 36039, 28460, 32156, 32317, 32305, 37138, 35419, 32068, 38013,
+    21959, 21401, 21428, 38760, 36107, 21293, 21297, 36094, 21060, 21132,
+    21108, 20660, 20480, 20630, 20757, 20738, 20756, 20796, 20791, 20712,
+    20674, 20795, 20752, 20794, 20681, 31988, 40652, 22213, 40172, 35131,
+    33248, 35329, 35344, 35340, 35349, 35635, 35406, 35365, 35393, 35382,
+    35398, 35412, 35416, 35410, 35462, 35460, 35455, 35440, 35452, 35445,
+    35436, 35438, 35533, 35554, 35425, 35482, 35493, {f: 2, c: 35473}, 35535,
+    35537, 35529, 35547, 35543, 35522, 35510, 35574, 35563, 35604, 35585,
+    35556, 35565, 35580, 35571, 35558, 35566, 35550, 35624, 35740, 35606,
+    35610, 35600, 35627, 35629, 35670, 35673, 35662, 35742, 35691, 35734,
+    38488, 37178, 37140, 37172, 37087, 37174, 37126, 37192, 33467, 21233,
+    24048, 22538, 22745, 22754, 22752, 22746, 22497, 22607, 22550, 22610,
+    22557, 22628, 34188, 34131, 34294, 33703, 33799, 34031, 33511, 34338,
+    34086, 22603, 29026, 34136, 34045, 34126, 34184, 34234, 29334, 28366,
+    34113, 34254, 34130, 33984, 33874, 33892, 33940, 33845, 34207, 34133,
+    40367, 33939, 32264, 34118, 34146, 34078, 39488, 34362, 37795, 34167,
+    34334, 34298, 34308, 34282, 34330, 22889, 23607, 25451, 25718, 25759,
+    25681, 25692, 25779, 25860, 25878, 25847, 25852, 25883, 22064, 22072,
+    22216, 22182, 21764, 21692, 22144, 22109, 22112, 22069, 22006, 22118,
+    22130, 22156, 22117, 22044, 22062, 21993, 22038, 22208, 22029, 22195,
+    22209, 22127, 36705, 22198, 22165, 22279, 24131, 24172, 24152, 24151,
+    23943, 23796, 23888, 23852, 23975, 23968, 23959, 23821, 23992, 23937,
+    24020, 24480, 29559, 29505, 29546, 29499, 29547, 29568, 29564, 39136,
+    39219, 39145, 39228, {f: 2, c: 39146}, 39149, 39156, 39177, 39185, 39195,
+    39223, 39231, 39235, {f: 3, c: 39240}, 39244, 39266, 24289, 36065, 25082,
+    25006, 24938, 24894, 24757, 24884, 25036, 24927, 25064, 24827, 24887,
+    24818, 24947, 24860, 24978, 38274, 38278, 38344, 38286, 38292, 38284,
+    38373, 38317, 38315, 39726, 38316, 38334, 38326, 39721, 38335, 38333,
+    38332, 38339, 38347, 38356, 38352, 38357, 38366, 28739, 28505, 28711,
+    28696, 28668, 28039, 28025, 28254, 28590, 28687, 28408, 28527, 28150,
+    28543, 28678, 28576, 28683, 28775, 28740, 28677, 28535, 28704, 28703,
+    28722, 28712, 28765, 39467, 36999, 36885, 37008, 23656, 24371, 23285,
+    23255, 23296, 23149, 23304, 23372, 23207, 23291, 23307, 23329, 23338,
+    23321, 39380, 39391, 39385, 39478, 39515, 39377, 39384, 39501, 39498,
+    39394, 39530, 39439, 39437, 39429, 39490, 39469, 39446, 39489, 39470,
+    39480, {f: 2, c: 39491}, 39503, 39525, 39524, 31993, 32006, 32002,
+    {f: 2, c: 32007}, 32394, 32028, 32021, 32019, 32058, 32050, 32049, 32272,
+    32060, 32064, 32063, 32093, 32078, 32115, 32134, 32131, 32136, 32190,
+    32186, 32203, 32212, 32196, 32158, 32172, 32185, 32163, 32176, 32199,
+    32217, 32215, 32249, 32242, 32354, 32230, 32246, 32241, 32267, 32225,
+    32265, 32285, 32287, 32286, 32301, 32266, 32273, 32381, 32313, 32309,
+    32306, 32326, 32325, 32392, 32346, 32338, 32366, 32382, 32368, 32367,
+    32408, 29859, 29771, 29903, 38922, 29885, 29759, 29833, 29862, 29908,
+    29914, 38873, 38878, 38876, 27050, 27370, 26776, 26838, 27141, 26783,
+    27355, 27379, 27368, 27359, 27273, 26895, 27208, 26984, 27071, 27194,
+    27292, 27410, 27422, 27357, 27111, 27407, 27414, 27372, 27354, 27384,
+    27315, 27367, 27299, 27347, 27358, 27556, 27550, 27566, 27563, 27567,
+    36564, 36571, 36594, 36603, 36708, 36601, 36604, 36587, 36580, 36706,
+    36602, 36606, 36618, 36615, 36613, 36626, 36646, {f: 2, c: 36638}, 36636,
+    36659, 36678, 36692, 25108, 25127, 29964, 26311, 26308, 26249, 26326,
+    36033, 36016, 36026, 36029, 36100, 36018, 36037, 36112, 36049, 36058,
+    36053, 36075, 36071, 36091, 35224, 35244, 35233, 35263, 35238, 35247,
+    35250, 35255, 27647, 27660, 27692, 29272, 26407, 33110, 33242, 33051,
+    33214, 33121, 33231, 27487, {f: 2, c: 39086}, 39094, 39100, 39110, 39112,
+    36674, 40783, 26005, 29036, 29010, 29079, 29121, 29148, 29182, 31152,
+    31118, 31146, 25055, 24932, 25059, 25095, 28585, 30959, 30893, 30824,
+    30904, 31018, 31025, 30820, 30973, 30951, 30947, 40853, 30616, 30558,
+    30652, 32646, 32648, {f: 3, c: 37330}, 37337, 37335, 37333, 37367, 37351,
+    37348, 37702, 37365, 37369, 37384, 37414, 37445, 37393, 37392, 37377,
+    37415, 37380, 37413, 37376, 37434, 37478, 37431, 37427, 37461, 37437,
+    37432, 37470, {f: 2, c: 37484}, 37439, 37984, 37424, 37449, 37448, 37453,
+    37422, 37433, 37944, 37548, 37536, 37498, 37546, 37614, 37583, 37891,
+    37603, 37946, 37553, 37542, 37799, 37526, 37580, 37545, 37877, 37523,
+    37503, 37801, 37530, 37658, 37547, 37507, 37899, 37544, 37539, 37906,
+    37688, 37617, 37847, 37605, 37616, 37615, 37608, 37564, 37597, 37622,
+    {f: 2, c: 37926}, 37571, 37599, 37606, 37650, 37638, 37737, 37659, 37696,
+    37633, 37653, 37678, 37699, {f: 2, c: 37639}, 37663, 37657, 37733, 37703,
+    37750, 37716, 37732, 37802, 37744, 37764, 37860, 37848, 37928, 37767,
+    37836, 37784, 37816, 37823, 37798, 37808, 37813, 37964, 37858,
+    {f: 2, c: 37852}, 37837, 37854, 37827, 37831, 37841, 37908, 37917, 37879,
+    37989, 37907, 37997, 37920, 38009, 37881, 37913, 37962, 37938, 37951,
+    37972, 37987, 37758, 31329, 40169, 40182, 40199, 40198, 40227, 40327,
+    40469, 40221, 40223, 40421, 40239, 40409, 40240, 40258, 40478, 40275,
+    40477, 40288, 40274, 40435, 40284, 40289, 40339, 40298, 40303, 40329,
+    40344, 40346, 40384, 40357, 40361, 40386, 40380, 40474, 40403, 40410,
+    40431, 40422, 40434, 40440, 40460, 40442, 40475, 30308, 30296, 30311,
+    30210, {f: 2, c: 30278}, 30281, 30238, 30267, {f: 2, c: 30317}, 30313,
+    30322, 31431, 31414, 35168, 35123, 35165, 35143, 35128, 35172, 30392,
+    32814, 32812, 32889, 32885, 38919, {f: 2, c: 38926}, 38945, 38940, 28481,
+    38950, 38967, 38990, 38995, 39027, 39010, 39001, 39013, 39020, 39024,
+    34787, 34822, 34566, 34851, 34806, 34554, 34799, 34692, 34832, 34760,
+    34833, 34747, 34766, 32588, 31716, 31591, 31849, 31731, 31744, 31691,
+    31836, 31774, 31787, 31779, 31850, 31839, 33380, 33387, 35018, 32677,
+    31986, 31990, 31965, 32310, 40617, 36274, 37317, 37315, 40570, 36489,
+    36428, 36498, 36474, 36437, 36506, 36491, 36499, 36497, 36513, 36451,
+    36522, 36518, 35316, 35318, 38746, 38722, 38717, 38724, 40788, 40799,
+    40793, 40800, 40796, 40806, 40812, 40810, 40823, [12236, 40701], 40703,
+    40713, 35726, 38014, 37864, 39799, 39796, 39809, 39811, 39822, 40056,
+    31308, 39826, 40031, 39824, 39853, 39834, 39850, 39838, 40045, 39851,
+    39837, 40024, 39873, 40058, 39985, 39993, 39971, 39991, 39872, 39882,
+    39879, 39933, 39894, {f: 2, c: 39914}, 39905, 39908, 39911, 39901, 39906,
+    39920, 39899, 39924, 39892, 40029, 39944, 39952, 39949, 39954, 39945,
+    39935, 39968, 39986, 39981, 39976, 39973, 39977, 39987, 39998, 40008,
+    39995, 39989, 40005, 40022, 40020, 40018, 40039, 38851, 38845, 38857,
+    40379, 39631, 39638, 39637, 39768, 39758, 39255, 39260, 39714, 40695,
+    40690, 35180, 38342, 37686, 24390, 34068, 32404, 40803, 22137, 40725,
+    22081, 39662, 35079, 31296, 39091, 38308, 39693, 36852, 24409, 31339,
+    39138, 20642, 34193, 20760, 25458, 21067, 30543, 32397, 26310, 30637,
+    [12228, 40565], 22217, 40692, 28635, 25054, 30663, 28720, 40629, 34890,
+    38370, 38854, 31844, 32308, 38822, 40623, 22220, 39089, 27311, 32590,
+    31984, 20418, 32363, 40569, 22190, 39706, 33903, 31142, 31858, 39634,
+    38587, 32251, 35069, 30787, {f: 10, c: 8560}, {f: 2, c: 714}, 729, 8211,
+    8213, 8229, 8245, 8453, 8457, {f: 4, c: 8598}, 8725, 8735, 8739, 8786,
+    {f: 2, c: 8806}, 8895, {f: 36, c: 9552}, {f: 15, c: 9601}, {f: 3, c: 9619},
+    {f: 2, c: 9660}, {f: 4, c: 9698}, 9737, 8853, 12306, {f: 2, c: 12317},
+    {f: 9, c: 12321}, 12963, {f: 2, c: 13198}, {f: 3, c: 13212}, 13217, 13252,
+    13262, {f: 2, c: 13265}, 13269, 65072, 65506, 65508, 8481, 12849, 8208,
+    12540, {f: 2, c: 12443}, {f: 2, c: 12541}, 12294, {f: 2, c: 12445},
+    {f: 10, c: 65097}, {f: 4, c: 65108}, {f: 14, c: 65113}, {f: 4, c: 65128},
+    12350, {f: 12, c: 12272}, 19970, {f: 3, c: 19972}, 19983, 19986, 19991,
+    {f: 3, c: 19999}, 20003, 20006, 20009, {f: 2, c: 20014}, 20017, 20019,
+    20021, 20023, 20028, {f: 3, c: 20032}, 20036, 20038, 20042, 20049, 20053,
+    20055, {f: 2, c: 20058}, {f: 4, c: 20066}, {f: 2, c: 20071},
+    {f: 6, c: 20074}, 20082, {f: 10, c: 20084}, {f: 3, c: 20095},
+    {f: 2, c: 20099}, [12037, 20101], 20103, 20106, 20112, {f: 2, c: 20118},
+    20121, {f: 2, c: 20124}, 20131, 20138, {f: 3, c: 20143}, 20148,
+    {f: 4, c: 20150}, {f: 3, c: 20156}, 20168, 20172, {f: 2, c: 20175}, 20178,
+    {f: 3, c: 20186}, 20192, 20194, {f: 2, c: 20198}, 20201, {f: 3, c: 20205},
+    20209, 20212, {f: 3, c: 20216}, 20220, 20222, 20224, {f: 7, c: 20226},
+    {f: 2, c: 20235}, {f: 5, c: 20242}, {f: 2, c: 20252}, 20257, 20259,
+    {f: 2, c: 20264}, {f: 3, c: 20268}, 20273, 20275, 20277, 20279, 20281,
+    20283, {f: 5, c: 20286}, {f: 2, c: 20292}, {f: 6, c: 20295}, 20306, 20308,
+    20310, {f: 2, c: 20321}, 20326, 20328, {f: 2, c: 20330}, {f: 2, c: 20333},
+    {f: 2, c: 20337}, 20341, {f: 4, c: 20343}, 20349, {f: 3, c: 20352}, 20357,
+    20359, 20362, 20364, 20366, 20368, {f: 2, c: 20370}, 20373,
+    {f: 3, c: 20376}, 20380, {f: 2, c: 20382}, {f: 2, c: 20385}, 20388, 20395,
+    20397, {f: 5, c: 20400}, {f: 9, c: 20406}, {f: 2, c: 20416},
+    {f: 4, c: 20422}, {f: 3, c: 20427}, {f: 5, c: 20434}, 20441, 20443, 20450,
+    {f: 2, c: 20452}, 20455, {f: 2, c: 20459}, 20464, 20466, {f: 4, c: 20468},
+    20473, {f: 3, c: 20475}, 20479, {f: 5, c: 20481}, {f: 2, c: 20487}, 20490,
+    20494, 20496, 20499, {f: 3, c: 20501}, 20507, {f: 2, c: 20509}, 20512,
+    {f: 3, c: 20514}, 20519, {f: 11, c: 20527}, 20539, 20541, {f: 4, c: 20543},
+    {f: 3, c: 20548}, {f: 2, c: 20554}, 20557, {f: 5, c: 20560},
+    {f: 4, c: 20566}, 20571, {f: 8, c: 20573}, {f: 6, c: 20582},
+    {f: 7, c: 20589}, {f: 3, c: 20600}, {f: 2, c: 20604}, {f: 4, c: 20609},
+    {f: 2, c: 20614}, {f: 4, c: 20617}, {f: 8, c: 20622}, 20631,
+    {f: 8, c: 20634}, 20644, 20646, {f: 2, c: 20650}, {f: 4, c: 20654}, 20662,
+    {f: 2, c: 20664}, {f: 2, c: 20668}, {f: 3, c: 20671}, {f: 2, c: 20675},
+    {f: 3, c: 20678}, {f: 5, c: 20682}, 20688, {f: 3, c: 20690},
+    {f: 3, c: 20695}, {f: 3, c: 20699}, {f: 6, c: 20703}, {f: 3, c: 20713},
+    {f: 4, c: 20719}, 20724, {f: 3, c: 20726}, 20730, {f: 4, c: 20732}, 20737,
+    20739, 20741, 20746, {f: 4, c: 20748}, 20753, 20755, {f: 2, c: 20758},
+    {f: 6, c: 20761}, 20768, {f: 8, c: 20770}, {f: 7, c: 20779},
+    {f: 4, c: 20787}, {f: 2, c: 20792}, {f: 2, c: 20797}, 20802, 20807, 20810,
+    20812, {f: 3, c: 20814}, 20819, {f: 3, c: 20823}, 20827, {f: 5, c: 20829},
+    {f: 2, c: 20835}, {f: 2, c: 20838}, 20842, 20847, 20850, 20858,
+    {f: 2, c: 20862}, {f: 2, c: 20867}, {f: 2, c: 20870}, {f: 2, c: 20874},
+    {f: 4, c: 20878}, {f: 2, c: 20883}, 20888, 20890, {f: 3, c: 20893}, 20897,
+    20899, {f: 5, c: 20902}, {f: 2, c: 20909}, 20916, {f: 3, c: 20920},
+    {f: 2, c: 20926}, {f: 3, c: 20929}, 20933, 20936, 20938, 20942, 20944,
+    {f: 9, c: 20946}, 20956, {f: 2, c: 20958}, {f: 2, c: 20962},
+    {f: 6, c: 20965}, 20972, 20974, 20978, 20980, 20983, 20990,
+    {f: 2, c: 20996}, 21001, {f: 2, c: 21003}, {f: 2, c: 21007},
+    {f: 3, c: 21011}, 21020, {f: 2, c: 21022}, {f: 3, c: 21025},
+    {f: 3, c: 21029}, 21034, 21036, 21039, {f: 2, c: 21041}, {f: 2, c: 21044},
+    21052, 21054, {f: 2, c: 21061}, {f: 2, c: 21064}, {f: 2, c: 21070},
+    {f: 2, c: 21074}, 21077, {f: 4, c: 21079}, 21085, {f: 2, c: 21087},
+    {f: 3, c: 21090}, 21094, 21096, {f: 3, c: 21099}, {f: 2, c: 21104}, 21107,
+    {f: 7, c: 21110}, 21118, 21120, {f: 3, c: 21124}, 21131, {f: 2, c: 21134},
+    21138, {f: 7, c: 21140}, 21148, {f: 4, c: 21156}, {f: 3, c: 21166},
+    {f: 10, c: 21172}, 21184, 21186, {f: 3, c: 21188}, 21192, 21194,
+    {f: 4, c: 21196}, 21201, {f: 2, c: 21203}, 21207, 21210, 21212,
+    {f: 2, c: 21216}, 21219, {f: 11, c: 21221}, {f: 3, c: 21234},
+    {f: 2, c: 21238}, {f: 3, c: 21243}, {f: 4, c: 21249}, 21255,
+    {f: 4, c: 21257}, 21262, {f: 4, c: 21265}, 21272, {f: 2, c: 21275},
+    {f: 2, c: 21278}, 21282, {f: 2, c: 21284}, {f: 3, c: 21287},
+    {f: 2, c: 21291}, 21296, {f: 6, c: 21298}, [12054, 21304],
+    {f: 2, c: 21308}, 21314, 21316, 21318, {f: 3, c: 21323}, 21328,
+    {f: 2, c: 21336}, 21339, 21341, 21349, 21352, 21354, {f: 2, c: 21356},
+    21362, 21366, 21369, {f: 4, c: 21371}, {f: 2, c: 21376}, 21379,
+    {f: 2, c: 21383}, 21386, {f: 7, c: 21390}, {f: 2, c: 21398},
+    {f: 2, c: 21403}, 21406, 21409, 21412, 21415, {f: 3, c: 21418},
+    {f: 3, c: 21423}, 21427, 21429, {f: 4, c: 21431}, {f: 3, c: 21436}, 21440,
+    {f: 4, c: 21444}, {f: 3, c: 21454}, {f: 2, c: 21458}, 21461, 21466,
+    {f: 3, c: 21468}, 21473, 21479, 21492, 21498, {f: 3, c: 21502}, 21506,
+    21509, 21511, 21515, 21524, {f: 3, c: 21528}, 21532, 21538,
+    {f: 2, c: 21540}, 21546, 21552, 21555, {f: 2, c: 21558}, 21562, 21565,
+    21567, {f: 2, c: 21569}, {f: 2, c: 21572}, 21575, 21577, {f: 4, c: 21580},
+    21585, 21594, {f: 5, c: 21597}, 21603, 21605, 21607, {f: 8, c: 21609},
+    21620, {f: 2, c: 21625}, {f: 2, c: 21630}, 21633, 21635, 21637,
+    {f: 4, c: 21639}, 21645, 21649, 21651, {f: 2, c: 21655}, 21660,
+    {f: 5, c: 21662}, 21669, 21678, 21680, 21682, {f: 3, c: 21685},
+    {f: 2, c: 21689}, 21694, 21699, 21701, {f: 2, c: 21706}, 21718, 21720,
+    21723, 21728, {f: 3, c: 21730}, {f: 2, c: 21739}, {f: 3, c: 21743},
+    {f: 6, c: 21748}, 21755, 21758, 21760, {f: 2, c: 21762}, 21765, 21768,
+    {f: 5, c: 21770}, {f: 2, c: 21778}, {f: 6, c: 21781}, {f: 4, c: 21788},
+    21793, {f: 2, c: 21797}, {f: 2, c: 21800}, 21803, 21805, 21810,
+    {f: 3, c: 21812}, {f: 4, c: 21816}, 21821, 21824, 21826, 21829,
+    {f: 2, c: 21831}, {f: 4, c: 21835}, {f: 2, c: 21841}, 21844,
+    {f: 5, c: 21847}, 21853, {f: 2, c: 21855}, {f: 2, c: 21858},
+    {f: 2, c: 21864}, 21867, {f: 6, c: 21871}, {f: 2, c: 21881}, 21885, 21887,
+    {f: 2, c: 21893}, {f: 3, c: 21900}, 21904, {f: 2, c: 21906},
+    {f: 3, c: 21909}, {f: 2, c: 21914}, 21918, {f: 7, c: 21920},
+    {f: 2, c: 21928}, 21931, 21933, {f: 2, c: 21935}, 21940, 21942, 21944,
+    21946, 21948, {f: 5, c: 21951}, 21960, {f: 2, c: 21962}, {f: 2, c: 21967},
+    21973, {f: 3, c: 21975}, 21979, 21982, 21984, 21986, 21991,
+    {f: 2, c: 21997}, {f: 2, c: 22000}, 22004, {f: 5, c: 22008}, 22015,
+    {f: 4, c: 22018}, 22023, {f: 2, c: 22026}, {f: 4, c: 22032}, 22037,
+    {f: 2, c: 22041}, 22045, {f: 3, c: 22048}, {f: 2, c: 22053}, 22056,
+    {f: 2, c: 22058}, 22067, 22071, 22074, {f: 3, c: 22076}, 22080,
+    {f: 10, c: 22082}, {f: 5, c: 22095}, {f: 2, c: 22101}, {f: 2, c: 22106},
+    {f: 2, c: 22110}, 22113, 22115, 22119, {f: 2, c: 22125}, 22128, 22131,
+    22133, 22135, 22138, {f: 3, c: 22141}, {f: 4, c: 22145}, {f: 4, c: 22152},
+    22157, {f: 3, c: 22160}, 22164, {f: 3, c: 22166}, {f: 9, c: 22170},
+    {f: 2, c: 22180}, 22183, {f: 5, c: 22185}, {f: 3, c: 22192}, 22197,
+    {f: 4, c: 22200}, {f: 3, c: 22205}, {f: 2, c: 22211}, {f: 2, c: 22214},
+    22219, {f: 4, c: 22221}, {f: 2, c: 22226}, {f: 2, c: 22229},
+    {f: 2, c: 22232}, 22236, 22243, {f: 6, c: 22245}, 22252, {f: 2, c: 22254},
+    {f: 2, c: 22258}, {f: 3, c: 22262}, {f: 2, c: 22267}, {f: 3, c: 22272},
+    22277, 22284, {f: 4, c: 22286}, {f: 2, c: 22292}, 22295, {f: 3, c: 22297},
+    {f: 2, c: 22301}, {f: 3, c: 22304}, {f: 4, c: 22308}, 22315,
+    {f: 2, c: 22321}, {f: 5, c: 22324}, {f: 2, c: 22332}, 22335, 22337,
+    {f: 4, c: 22339}, {f: 2, c: 22344}, 22347, {f: 5, c: 22354},
+    {f: 2, c: 22360}, {f: 2, c: 22370}, 22373, 22375, 22380, 22382,
+    {f: 3, c: 22384}, {f: 2, c: 22388}, {f: 3, c: 22392}, {f: 5, c: 22397},
+    {f: 4, c: 22407}, {f: 5, c: 22413}, {f: 7, c: 22420}, {f: 4, c: 22428},
+    22437, 22440, 22442, 22444, {f: 3, c: 22447}, 22451, {f: 3, c: 22453},
+    {f: 9, c: 22457}, {f: 7, c: 22468}, {f: 2, c: 22476}, {f: 2, c: 22480},
+    22483, {f: 2, c: 22486}, {f: 2, c: 22491}, 22494, {f: 2, c: 22498},
+    {f: 8, c: 22501}, 22510, {f: 4, c: 22512}, {f: 2, c: 22517},
+    {f: 2, c: 22523}, {f: 2, c: 22526}, 22529, {f: 2, c: 22531},
+    {f: 2, c: 22536}, 22540, {f: 3, c: 22542}, {f: 3, c: 22546},
+    {f: 2, c: 22551}, {f: 3, c: 22554}, 22559, {f: 2, c: 22562},
+    {f: 5, c: 22565}, {f: 4, c: 22571}, {f: 2, c: 22578}, {f: 14, c: 22582},
+    {f: 5, c: 22597}, 22606, 22608, 22611, {f: 2, c: 22613}, {f: 5, c: 22617},
+    {f: 3, c: 22623}, 22627, {f: 5, c: 22630}, {f: 8, c: 22637},
+    {f: 3, c: 22646}, {f: 4, c: 22650}, 22655, 22658, 22660, {f: 3, c: 22662},
+    {f: 7, c: 22667}, {f: 5, c: 22676}, 22683, 22685, {f: 8, c: 22688},
+    {f: 4, c: 22698}, {f: 4, c: 22703}, {f: 7, c: 22708}, 22717,
+    {f: 2, c: 22719}, {f: 3, c: 22722}, 22726, {f: 9, c: 22728}, 22738, 22740,
+    {f: 2, c: 22742}, {f: 3, c: 22747}, 22753, 22755, {f: 4, c: 22757}, 22762,
+    22765, {f: 2, c: 22769}, {f: 2, c: 22772}, {f: 2, c: 22775},
+    {f: 2, c: 22779}, {f: 4, c: 22782}, 22787, {f: 2, c: 22789},
+    {f: 2, c: 22792}, [12066, 22794], {f: 2, c: 22795}, 22798,
+    {f: 4, c: 22800}, {f: 2, c: 22807}, 22811, {f: 2, c: 22813},
+    {f: 2, c: 22816}, 22819, 22822, 22824, 22828, 22832, {f: 2, c: 22834},
+    {f: 2, c: 22837}, 22843, 22845, {f: 2, c: 22847}, 22851, {f: 2, c: 22853},
+    22858, {f: 2, c: 22860}, 22864, {f: 2, c: 22866}, 22873, {f: 5, c: 22875},
+    22881, {f: 2, c: 22883}, {f: 3, c: 22886}, 22891, 22893, {f: 4, c: 22895},
+    22901, 22903, {f: 3, c: 22906}, {f: 3, c: 22910}, 22917, 22921,
+    {f: 2, c: 22923}, {f: 4, c: 22926}, {f: 2, c: 22932}, 22936,
+    {f: 3, c: 22938}, {f: 4, c: 22943}, {f: 2, c: 22950}, {f: 2, c: 22956},
+    {f: 2, c: 22960}, {f: 6, c: 22963}, 22970, {f: 2, c: 22972},
+    {f: 7, c: 22975}, {f: 3, c: 22983}, {f: 4, c: 22988}, {f: 2, c: 22997},
+    23001, 23003, {f: 5, c: 23006}, 23012, {f: 2, c: 23014}, {f: 3, c: 23017},
+    {f: 12, c: 23021}, 23034, {f: 3, c: 23036}, 23040, 23042, {f: 2, c: 23050},
+    {f: 4, c: 23053}, 23058, {f: 4, c: 23060}, {f: 3, c: 23065},
+    {f: 2, c: 23069}, {f: 2, c: 23073}, 23076, {f: 3, c: 23078},
+    {f: 7, c: 23082}, 23091, 23093, {f: 5, c: 23095}, {f: 3, c: 23101},
+    {f: 4, c: 23106}, {f: 2, c: 23111}, {f: 10, c: 23115}, {f: 4, c: 23126},
+    {f: 7, c: 23131}, {f: 3, c: 23139}, {f: 2, c: 23144}, {f: 2, c: 23147},
+    {f: 6, c: 23150}, {f: 2, c: 23160}, {f: 4, c: 23163}, {f: 18, c: 23168},
+    {f: 7, c: 23187}, {f: 11, c: 23196}, {f: 2, c: 23208}, {f: 7, c: 23211},
+    23220, {f: 2, c: 23222}, {f: 4, c: 23225}, {f: 2, c: 23231},
+    {f: 6, c: 23235}, {f: 2, c: 23242}, {f: 5, c: 23245}, 23251, 23253,
+    {f: 3, c: 23257}, {f: 3, c: 23261}, 23266, {f: 2, c: 23268},
+    {f: 2, c: 23271}, 23274, {f: 5, c: 23276}, {f: 3, c: 23282},
+    {f: 5, c: 23286}, {f: 4, c: 23292}, {f: 7, c: 23297}, 23306,
+    {f: 9, c: 23309}, 23320, {f: 7, c: 23322}, {f: 8, c: 23330},
+    {f: 5, c: 23339}, 23345, 23347, {f: 2, c: 23349}, {f: 7, c: 23353},
+    {f: 11, c: 23361}, {f: 3, c: 23373}, 23378, 23382, 23390, {f: 2, c: 23392},
+    {f: 2, c: 23399}, {f: 3, c: 23405}, 23410, 23412, {f: 2, c: 23414}, 23417,
+    {f: 2, c: 23419}, 23422, 23426, 23430, 23434, {f: 2, c: 23437},
+    {f: 3, c: 23440}, 23444, 23446, 23455, {f: 3, c: 23463}, {f: 4, c: 23468},
+    {f: 2, c: 23473}, 23479, {f: 3, c: 23482}, {f: 2, c: 23488}, 23491,
+    {f: 4, c: 23496}, {f: 3, c: 23501}, 23505, {f: 9, c: 23508}, 23520, 23523,
+    23530, 23533, 23535, {f: 4, c: 23537}, 23543, {f: 2, c: 23549}, 23552,
+    {f: 2, c: 23554}, 23557, 23564, 23568, {f: 2, c: 23570}, 23575, 23577,
+    23579, {f: 4, c: 23582}, 23587, 23590, {f: 4, c: 23592}, {f: 4, c: 23597},
+    {f: 2, c: 23602}, {f: 2, c: 23605}, {f: 2, c: 23619}, {f: 2, c: 23622},
+    {f: 2, c: 23628}, {f: 3, c: 23634}, {f: 3, c: 23638}, {f: 4, c: 23642},
+    23647, 23655, {f: 3, c: 23657}, 23661, 23664, {f: 7, c: 23666},
+    {f: 4, c: 23675}, 23680, {f: 5, c: 23683}, {f: 3, c: 23689},
+    {f: 2, c: 23694}, {f: 2, c: 23698}, 23701, {f: 4, c: 23709},
+    {f: 5, c: 23716}, 23722, {f: 3, c: 23726}, 23730, 23732, 23734,
+    {f: 4, c: 23737}, 23742, 23744, {f: 2, c: 23746}, {f: 6, c: 23749},
+    {f: 6, c: 23756}, {f: 6, c: 23763}, {f: 7, c: 23770}, {f: 2, c: 23778},
+    23783, 23785, {f: 2, c: 23787}, {f: 2, c: 23790}, {f: 3, c: 23793}, 23797,
+    {f: 4, c: 23799}, 23804, {f: 4, c: 23806}, {f: 2, c: 23812},
+    {f: 5, c: 23816}, {f: 5, c: 23823}, 23829, {f: 3, c: 23832},
+    {f: 2, c: 23836}, {f: 5, c: 23839}, 23845, 23848, {f: 2, c: 23850},
+    {f: 5, c: 23855}, {f: 8, c: 23861}, {f: 8, c: 23871}, {f: 2, c: 23880},
+    {f: 3, c: 23885}, {f: 7, c: 23889}, {f: 2, c: 23897}, 23900,
+    {f: 11, c: 23902}, 23914, {f: 2, c: 23917}, {f: 4, c: 23920},
+    {f: 12, c: 23925}, 23939, {f: 2, c: 23941}, {f: 15, c: 23944}, 23960,
+    {f: 3, c: 23962}, {f: 2, c: 23966}, {f: 6, c: 23969}, {f: 15, c: 23976},
+    23993, 23995, {f: 8, c: 23997}, {f: 5, c: 24006}, 24012, {f: 4, c: 24014},
+    24019, {f: 6, c: 24021}, 24028, {f: 2, c: 24031}, {f: 2, c: 24035}, 24042,
+    {f: 2, c: 24044}, {f: 2, c: 24053}, {f: 5, c: 24056}, {f: 2, c: 24063},
+    24068, 24071, {f: 3, c: 24073}, {f: 2, c: 24077}, {f: 2, c: 24082}, 24087,
+    {f: 7, c: 24094}, {f: 3, c: 24104}, 24108, {f: 2, c: 24111}, 24114,
+    {f: 2, c: 24116}, {f: 2, c: 24121}, {f: 2, c: 24126}, 24129,
+    {f: 6, c: 24134}, {f: 7, c: 24141}, 24150, {f: 2, c: 24153},
+    {f: 2, c: 24156}, 24160, {f: 7, c: 24164}, {f: 5, c: 24173}, 24181, 24183,
+    {f: 3, c: 24193}, 24197, {f: 2, c: 24200}, {f: 3, c: 24204}, 24210, 24216,
+    24219, 24221, {f: 4, c: 24225}, {f: 3, c: 24232}, 24236, {f: 5, c: 24238},
+    24244, {f: 4, c: 24250}, {f: 10, c: 24255}, {f: 6, c: 24267},
+    {f: 2, c: 24276}, {f: 4, c: 24279}, {f: 3, c: 24284}, {f: 4, c: 24292},
+    24297, 24299, {f: 6, c: 24301}, 24309, {f: 2, c: 24312}, {f: 3, c: 24315},
+    {f: 3, c: 24325}, 24329, {f: 3, c: 24332}, 24336, 24338, 24340, 24342,
+    {f: 2, c: 24345}, {f: 3, c: 24348}, {f: 4, c: 24353}, 24360,
+    {f: 2, c: 24363}, 24366, 24368, 24370, 24372, {f: 3, c: 24374}, 24379,
+    {f: 3, c: 24381}, {f: 5, c: 24385}, 24391, {f: 3, c: 24393}, 24397, 24399,
+    24401, 24404, {f: 3, c: 24410}, {f: 3, c: 24414}, 24419, 24421,
+    {f: 2, c: 24423}, 24427, {f: 2, c: 24430}, 24434, {f: 3, c: 24436}, 24440,
+    24442, {f: 3, c: 24445}, 24451, 24454, {f: 3, c: 24461}, {f: 2, c: 24467},
+    24470, {f: 2, c: 24474}, 24477, 24479, {f: 6, c: 24482}, {f: 2, c: 24491},
+    {f: 6, c: 24495}, 24502, 24504, {f: 2, c: 24506}, {f: 5, c: 24510},
+    {f: 2, c: 24519}, {f: 2, c: 24522}, 24526, {f: 3, c: 24531},
+    {f: 3, c: 24538}, {f: 2, c: 24542}, {f: 2, c: 24546}, {f: 2, c: 24549},
+    {f: 2, c: 24552}, 24556, {f: 2, c: 24559}, {f: 3, c: 24562},
+    {f: 2, c: 24566}, {f: 2, c: 24569}, 24572, {f: 3, c: 24583},
+    {f: 2, c: 24587}, {f: 2, c: 24592}, 24595, {f: 2, c: 24599}, 24602,
+    {f: 2, c: 24606}, {f: 3, c: 24610}, {f: 3, c: 24620}, {f: 5, c: 24624},
+    {f: 5, c: 24630}, {f: 2, c: 24637}, 24640, {f: 7, c: 24644}, 24652,
+    {f: 2, c: 24654}, 24657, {f: 2, c: 24659}, {f: 3, c: 24662},
+    {f: 2, c: 24667}, {f: 4, c: 24670}, {f: 2, c: 24677}, 24686,
+    {f: 2, c: 24689}, {f: 2, c: 24692}, 24695, 24702, {f: 3, c: 24704},
+    {f: 4, c: 24709}, {f: 2, c: 24714}, {f: 4, c: 24718}, 24723, 24725,
+    {f: 3, c: 24727}, 24732, 24734, {f: 2, c: 24737}, {f: 2, c: 24740}, 24743,
+    {f: 2, c: 24745}, 24750, 24752, 24755, 24759, {f: 2, c: 24761},
+    {f: 8, c: 24765}, {f: 3, c: 24775}, {f: 5, c: 24780}, {f: 3, c: 24786},
+    {f: 2, c: 24790}, 24793, 24795, 24798, {f: 4, c: 24802}, 24810, 24821,
+    {f: 2, c: 24823}, {f: 4, c: 24828}, {f: 4, c: 24834}, 24839,
+    {f: 3, c: 24842}, {f: 5, c: 24848}, {f: 4, c: 24854}, {f: 2, c: 24861},
+    {f: 2, c: 24865}, 24869, {f: 3, c: 24872}, {f: 8, c: 24876},
+    {f: 2, c: 24885}, {f: 6, c: 24888}, {f: 8, c: 24896}, 24905, 24909,
+    {f: 2, c: 24911}, {f: 3, c: 24914}, {f: 2, c: 24918}, 24921,
+    {f: 2, c: 24923}, 24926, {f: 2, c: 24928}, {f: 2, c: 24933}, 24937,
+    {f: 2, c: 24940}, 24943, {f: 2, c: 24945}, 24948, {f: 10, c: 24952},
+    {f: 7, c: 24963}, {f: 2, c: 24972}, 24975, 24979, {f: 5, c: 24981},
+    {f: 2, c: 24987}, {f: 6, c: 24990}, {f: 2, c: 24997}, 25002, 25005,
+    {f: 3, c: 25007}, {f: 3, c: 25011}, {f: 6, c: 25016}, {f: 3, c: 25023},
+    {f: 4, c: 25027}, {f: 4, c: 25037}, 25043, {f: 9, c: 25045},
+    {f: 3, c: 25056}, {f: 2, c: 25060}, 25063, {f: 9, c: 25065},
+    {f: 2, c: 25075}, 25081, 25083, 25085, {f: 5, c: 25089}, 25097, 25107,
+    25113, {f: 3, c: 25116}, 25120, 25123, 25126, {f: 2, c: 25128}, 25131,
+    25133, 25135, 25137, 25141, [12094, 25142], {f: 5, c: 25144}, 25154,
+    {f: 3, c: 25156}, 25162, {f: 2, c: 25167}, {f: 3, c: 25173},
+    {f: 2, c: 25177}, {f: 7, c: 25180}, {f: 2, c: 25188}, 25192,
+    {f: 2, c: 25201}, {f: 2, c: 25204}, {f: 2, c: 25207}, {f: 2, c: 25210},
+    25213, {f: 3, c: 25217}, {f: 4, c: 25221}, {f: 6, c: 25227}, 25236, 25241,
+    {f: 3, c: 25244}, 25251, {f: 2, c: 25254}, {f: 2, c: 25257},
+    {f: 4, c: 25261}, {f: 3, c: 25266}, {f: 3, c: 25270}, 25274, 25278,
+    {f: 2, c: 25280}, 25283, 25291, 25295, 25297, 25301, {f: 2, c: 25309},
+    {f: 2, c: 25312}, 25316, {f: 2, c: 25322}, 25328, 25330, 25333,
+    {f: 4, c: 25336}, 25344, {f: 4, c: 25347}, {f: 4, c: 25354},
+    {f: 2, c: 25359}, {f: 4, c: 25362}, {f: 3, c: 25367}, 25372,
+    {f: 2, c: 25382}, 25385, {f: 3, c: 25388}, {f: 2, c: 25392},
+    {f: 6, c: 25395}, {f: 2, c: 25403}, {f: 3, c: 25407}, 25412,
+    {f: 2, c: 25415}, 25418, {f: 4, c: 25425}, {f: 8, c: 25430}, 25440,
+    {f: 3, c: 25444}, 25450, 25452, {f: 2, c: 25455}, {f: 3, c: 25459},
+    {f: 2, c: 25464}, {f: 4, c: 25468}, 25473, {f: 2, c: 25477}, 25483, 25485,
+    25489, {f: 3, c: 25491}, 25495, {f: 7, c: 25497}, 25505, 25508, 25510,
+    25515, 25519, {f: 2, c: 25521}, {f: 2, c: 25525}, 25529, 25531, 25533,
+    25535, {f: 3, c: 25537}, 25541, {f: 2, c: 25543}, {f: 3, c: 25546}, 25553,
+    {f: 3, c: 25555}, {f: 3, c: 25559}, {f: 3, c: 25563}, 25567, 25570,
+    {f: 5, c: 25572}, {f: 2, c: 25579}, {f: 3, c: 25583}, 25587, 25589, 25591,
+    {f: 4, c: 25593}, 25598, {f: 2, c: 25603}, {f: 5, c: 25606}, 25614,
+    {f: 2, c: 25617}, {f: 2, c: 25621}, {f: 3, c: 25624}, 25629, 25631,
+    {f: 4, c: 25634}, {f: 3, c: 25639}, 25643, {f: 6, c: 25646}, 25653,
+    {f: 3, c: 25655}, {f: 2, c: 25659}, 25662, 25664, {f: 2, c: 25666}, 25673,
+    {f: 6, c: 25675}, 25683, {f: 3, c: 25685}, {f: 3, c: 25689}, 25693,
+    {f: 7, c: 25696}, 25704, {f: 3, c: 25706}, 25710, {f: 3, c: 25712},
+    {f: 2, c: 25716}, 25719, {f: 6, c: 25724}, 25731, 25734, {f: 8, c: 25737},
+    25748, {f: 2, c: 25751}, {f: 4, c: 25754}, {f: 3, c: 25760},
+    {f: 3, c: 25766}, 25770, 25775, 25777, 25780, 25782, 25785, 25789, 25795,
+    25798, {f: 2, c: 25800}, 25804, 25807, 25809, 25811, {f: 2, c: 25813},
+    25817, {f: 3, c: 25819}, 25823, 25825, 25827, 25829, {f: 5, c: 25831},
+    {f: 2, c: 25837}, 25843, {f: 2, c: 25845}, {f: 2, c: 25848}, 25853, 25855,
+    {f: 3, c: 25857}, 25861, {f: 2, c: 25863}, {f: 5, c: 25866},
+    {f: 2, c: 25872}, 25875, 25877, 25879, 25882, 25884, {f: 4, c: 25886},
+    {f: 4, c: 25894}, 25901, {f: 4, c: 25904}, 25911, 25914, {f: 2, c: 25916},
+    {f: 5, c: 25920}, {f: 2, c: 25926}, {f: 2, c: 25930}, {f: 2, c: 25933},
+    25936, {f: 3, c: 25938}, 25944, 25946, 25948, {f: 3, c: 25951},
+    {f: 2, c: 25956}, {f: 4, c: 25959}, {f: 3, c: 25965}, 25969, 25971, 25974,
+    {f: 9, c: 25977}, {f: 3, c: 25988}, {f: 3, c: 25992}, {f: 3, c: 25997},
+    26002, 26004, 26006, 26008, 26010, {f: 2, c: 26013}, 26016,
+    {f: 2, c: 26018}, 26022, 26024, 26026, 26030, {f: 6, c: 26033}, 26040,
+    {f: 2, c: 26042}, {f: 3, c: 26046}, 26050, {f: 4, c: 26055}, 26061,
+    {f: 2, c: 26064}, {f: 3, c: 26067}, {f: 8, c: 26072}, 26081,
+    {f: 2, c: 26083}, {f: 2, c: 26090}, {f: 4, c: 26098}, {f: 2, c: 26104},
+    {f: 5, c: 26107}, 26113, {f: 2, c: 26116}, {f: 3, c: 26119}, 26123, 26125,
+    {f: 3, c: 26128}, {f: 3, c: 26134}, {f: 3, c: 26138}, 26142,
+    {f: 4, c: 26145}, 26150, {f: 4, c: 26153}, 26158, 26160, {f: 2, c: 26162},
+    {f: 5, c: 26167}, 26173, {f: 2, c: 26175}, {f: 7, c: 26180},
+    {f: 2, c: 26189}, {f: 2, c: 26192}, {f: 2, c: 26200}, {f: 2, c: 26203},
+    26206, 26208, {f: 2, c: 26210}, 26213, 26215, {f: 5, c: 26217},
+    {f: 3, c: 26225}, 26229, {f: 2, c: 26232}, {f: 3, c: 26235},
+    {f: 3, c: 26239}, 26243, {f: 2, c: 26245}, {f: 2, c: 26250},
+    {f: 4, c: 26253}, {f: 4, c: 26258}, {f: 5, c: 26264}, {f: 4, c: 26270},
+    {f: 4, c: 26275}, {f: 2, c: 26281}, {f: 2, c: 26284}, {f: 5, c: 26287},
+    {f: 4, c: 26293}, {f: 4, c: 26298}, {f: 5, c: 26303}, 26309, 26312,
+    {f: 12, c: 26314}, {f: 2, c: 26327}, 26330, {f: 2, c: 26334},
+    {f: 5, c: 26337}, {f: 2, c: 26343}, {f: 2, c: 26346}, {f: 3, c: 26349},
+    26353, {f: 2, c: 26357}, {f: 2, c: 26362}, 26365, {f: 2, c: 26369},
+    {f: 4, c: 26372}, 26380, {f: 2, c: 26382}, {f: 3, c: 26385}, 26390,
+    {f: 3, c: 26392}, 26396, 26398, {f: 6, c: 26400}, 26409, 26414, 26416,
+    {f: 2, c: 26418}, {f: 4, c: 26422}, {f: 2, c: 26427}, {f: 2, c: 26430},
+    26433, {f: 2, c: 26436}, 26439, {f: 2, c: 26442}, 26445, 26450,
+    {f: 2, c: 26452}, {f: 5, c: 26455}, 26461, {f: 3, c: 26466},
+    {f: 2, c: 26470}, {f: 2, c: 26475}, 26478, 26484, 26486, {f: 4, c: 26488},
+    26493, 26496, {f: 2, c: 26498}, {f: 2, c: 26501}, 26504, 26506,
+    {f: 4, c: 26508}, {f: 4, c: 26513}, 26518, 26521, 26523, {f: 3, c: 26527},
+    26532, 26534, 26537, 26540, 26542, {f: 2, c: 26545}, 26548,
+    {f: 8, c: 26553}, 26562, {f: 10, c: 26565}, {f: 3, c: 26581}, 26587, 26591,
+    26593, {f: 2, c: 26595}, {f: 3, c: 26598}, {f: 2, c: 26602},
+    {f: 2, c: 26605}, 26610, {f: 8, c: 26613}, 26622, {f: 4, c: 26625}, 26630,
+    26637, 26640, 26642, {f: 2, c: 26644}, {f: 5, c: 26648}, {f: 3, c: 26654},
+    {f: 7, c: 26658}, {f: 7, c: 26667}, {f: 3, c: 26676}, {f: 2, c: 26682},
+    26687, 26695, 26699, 26701, 26703, 26706, {f: 10, c: 26710}, 26730,
+    {f: 8, c: 26732}, 26741, {f: 9, c: 26744}, 26754, 26756, {f: 8, c: 26759},
+    {f: 3, c: 26768}, {f: 3, c: 26772}, {f: 4, c: 26777}, 26782,
+    {f: 2, c: 26784}, {f: 3, c: 26787}, {f: 4, c: 26793}, 26798,
+    {f: 2, c: 26801}, 26804, {f: 10, c: 26806}, 26817, {f: 6, c: 26819}, 26826,
+    26828, {f: 4, c: 26830}, {f: 2, c: 26835}, 26841, {f: 4, c: 26843},
+    {f: 2, c: 26849}, {f: 3, c: 26852}, {f: 6, c: 26856}, 26863,
+    {f: 3, c: 26866}, {f: 3, c: 26870}, 26875, {f: 4, c: 26877},
+    {f: 3, c: 26882}, {f: 5, c: 26886}, 26892, 26897, {f: 12, c: 26899},
+    {f: 3, c: 26913}, {f: 8, c: 26917}, {f: 2, c: 26926}, {f: 3, c: 26929},
+    {f: 4, c: 26933}, {f: 3, c: 26938}, 26942, {f: 2, c: 26944},
+    {f: 7, c: 26947}, {f: 8, c: 26955}, {f: 2, c: 26965}, {f: 2, c: 26968},
+    {f: 2, c: 26971}, 26975, {f: 2, c: 26977}, {f: 2, c: 26980}, 26983,
+    {f: 2, c: 26985}, 26988, {f: 2, c: 26991}, {f: 3, c: 26994}, 26998,
+    {f: 2, c: 27002}, {f: 3, c: 27005}, 27009, 27011, 27013, {f: 3, c: 27018},
+    {f: 6, c: 27022}, {f: 2, c: 27030}, {f: 2, c: 27033}, {f: 10, c: 27037},
+    27049, 27052, {f: 2, c: 27055}, {f: 2, c: 27058}, {f: 2, c: 27061},
+    {f: 3, c: 27064}, {f: 3, c: 27068}, 27072, {f: 8, c: 27074}, 27087,
+    {f: 3, c: 27089}, {f: 6, c: 27093}, {f: 3, c: 27100}, {f: 6, c: 27105},
+    {f: 5, c: 27112}, {f: 4, c: 27118}, {f: 9, c: 27124}, 27134, 27136,
+    {f: 2, c: 27139}, {f: 4, c: 27142}, {f: 8, c: 27147}, {f: 3, c: 27156},
+    {f: 4, c: 27162}, 27168, 27170, {f: 4, c: 27172}, 27177, {f: 4, c: 27179},
+    27184, {f: 3, c: 27186}, {f: 2, c: 27190}, {f: 2, c: 27195},
+    {f: 5, c: 27199}, {f: 2, c: 27205}, {f: 2, c: 27209}, {f: 4, c: 27212},
+    {f: 7, c: 27217}, 27226, {f: 3, c: 27228}, 27232, {f: 2, c: 27235},
+    {f: 11, c: 27238}, {f: 7, c: 27250}, {f: 2, c: 27258}, {f: 3, c: 27261},
+    {f: 3, c: 27265}, {f: 4, c: 27269}, {f: 4, c: 27274}, 27279,
+    {f: 2, c: 27282}, {f: 2, c: 27285}, {f: 4, c: 27288}, {f: 3, c: 27293},
+    27297, {f: 5, c: 27300}, 27306, {f: 2, c: 27309}, {f: 3, c: 27312},
+    {f: 4, c: 27316}, {f: 2, c: 27321}, {f: 7, c: 27324}, {f: 15, c: 27332},
+    {f: 6, c: 27348}, 27356, {f: 7, c: 27360}, 27369, 27371, {f: 6, c: 27373},
+    {f: 4, c: 27380}, {f: 2, c: 27385}, {f: 8, c: 27388}, {f: 5, c: 27397},
+    {f: 4, c: 27403}, {f: 2, c: 27408}, {f: 3, c: 27411}, {f: 7, c: 27415},
+    27423, {f: 2, c: 27429}, {f: 10, c: 27432}, {f: 4, c: 27443}, 27448,
+    {f: 2, c: 27451}, {f: 4, c: 27455}, {f: 2, c: 27460}, 27464,
+    {f: 2, c: 27466}, {f: 3, c: 27469}, {f: 8, c: 27473}, {f: 5, c: 27482},
+    27488, {f: 2, c: 27496}, {f: 7, c: 27499}, {f: 4, c: 27507}, 27514,
+    {f: 4, c: 27517}, 27525, 27528, 27532, {f: 4, c: 27534}, {f: 2, c: 27540},
+    27543, 27545, {f: 2, c: 27548}, {f: 2, c: 27551}, {f: 2, c: 27554},
+    {f: 5, c: 27557}, {f: 2, c: 27564}, {f: 2, c: 27568}, 27574,
+    {f: 2, c: 27576}, {f: 3, c: 27580}, 27584, {f: 2, c: 27587},
+    {f: 4, c: 27591}, 27596, 27598, {f: 2, c: 27600}, 27608, 27610,
+    {f: 5, c: 27612}, {f: 8, c: 27618}, {f: 3, c: 27628}, {f: 3, c: 27632},
+    27636, {f: 3, c: 27638}, {f: 3, c: 27642}, 27646, {f: 5, c: 27648},
+    {f: 3, c: 27657}, 27662, 27666, 27671, {f: 3, c: 27676}, 27680, 27685,
+    27693, 27697, 27699, {f: 2, c: 27702}, {f: 4, c: 27705}, {f: 2, c: 27710},
+    {f: 3, c: 27715}, 27720, {f: 5, c: 27723}, {f: 3, c: 27729}, 27734,
+    {f: 3, c: 27736}, {f: 2, c: 27746}, {f: 3, c: 27749}, {f: 5, c: 27755},
+    27761, 27763, 27765, {f: 2, c: 27767}, {f: 3, c: 27770}, {f: 2, c: 27775},
+    27780, 27783, {f: 2, c: 27786}, {f: 2, c: 27789}, {f: 2, c: 27793},
+    {f: 4, c: 27797}, 27802, {f: 3, c: 27804}, 27808, 27810, 27816, 27820,
+    {f: 2, c: 27823}, {f: 4, c: 27828}, 27834, {f: 4, c: 27840},
+    {f: 3, c: 27846}, 27851, {f: 3, c: 27853}, {f: 2, c: 27857},
+    {f: 3, c: 27864}, {f: 2, c: 27868}, 27871, 27876, {f: 2, c: 27878}, 27881,
+    {f: 2, c: 27884}, 27890, 27892, 27897, {f: 2, c: 27903}, {f: 2, c: 27906},
+    {f: 2, c: 27909}, {f: 3, c: 27912}, 27917, {f: 3, c: 27919},
+    {f: 4, c: 27923}, 27928, {f: 2, c: 27932}, {f: 6, c: 27935}, 27942,
+    {f: 2, c: 27944}, {f: 2, c: 27948}, {f: 2, c: 27951}, 27956,
+    {f: 3, c: 27958}, 27962, {f: 2, c: 27967}, 27970, 27972, 27977, 27980,
+    27984, {f: 4, c: 27989}, 27995, 27997, 27999, {f: 2, c: 28001},
+    {f: 2, c: 28004}, {f: 2, c: 28007}, {f: 3, c: 28011}, {f: 4, c: 28016},
+    {f: 2, c: 28021}, {f: 2, c: 28026}, {f: 5, c: 28029}, {f: 2, c: 28035},
+    28038, {f: 2, c: 28042}, 28045, {f: 2, c: 28047}, 28050, {f: 5, c: 28054},
+    28060, 28066, 28069, {f: 2, c: 28076}, {f: 2, c: 28080}, {f: 2, c: 28083},
+    {f: 2, c: 28086}, {f: 6, c: 28089}, {f: 3, c: 28097}, {f: 3, c: 28104},
+    {f: 4, c: 28109}, {f: 4, c: 28114}, 28119, {f: 3, c: 28122}, 28127,
+    {f: 2, c: 28130}, 28133, {f: 3, c: 28135}, 28141, {f: 2, c: 28143}, 28146,
+    28148, 28152, {f: 8, c: 28157}, {f: 4, c: 28166}, 28171, 28175,
+    {f: 2, c: 28178}, 28181, {f: 2, c: 28184}, {f: 2, c: 28187},
+    {f: 2, c: 28190}, 28194, {f: 2, c: 28199}, 28202, 28206, {f: 2, c: 28208},
+    28211, {f: 3, c: 28213}, 28217, {f: 3, c: 28219}, {f: 4, c: 28223},
+    {f: 8, c: 28229}, {f: 4, c: 28239}, 28245, 28247, {f: 2, c: 28249},
+    {f: 2, c: 28252}, {f: 11, c: 28256}, {f: 2, c: 28268}, {f: 14, c: 28272},
+    {f: 3, c: 28288}, 28292, {f: 2, c: 28295}, {f: 5, c: 28298},
+    {f: 5, c: 28305}, 28311, {f: 3, c: 28313}, 28318, {f: 2, c: 28320},
+    {f: 2, c: 28323}, 28326, {f: 2, c: 28328}, {f: 4, c: 28331}, 28336, 28339,
+    28341, {f: 2, c: 28344}, 28348, {f: 3, c: 28350}, 28355, 28358,
+    {f: 3, c: 28360}, 28365, 28368, 28370, 28374, {f: 2, c: 28376},
+    {f: 3, c: 28379}, 28387, 28391, {f: 2, c: 28394}, {f: 2, c: 28397},
+    {f: 2, c: 28400}, 28403, {f: 2, c: 28405}, {f: 5, c: 28410}, 28416,
+    {f: 3, c: 28419}, {f: 2, c: 28423}, {f: 5, c: 28426}, {f: 3, c: 28432},
+    {f: 4, c: 28438}, {f: 5, c: 28443}, 28449, {f: 4, c: 28453}, 28462, 28464,
+    {f: 2, c: 28468}, 28471, {f: 5, c: 28473}, 28480, {f: 4, c: 28482},
+    {f: 3, c: 28488}, 28492, {f: 3, c: 28494}, {f: 2, c: 28498},
+    {f: 3, c: 28501}, {f: 2, c: 28506}, 28509, {f: 3, c: 28511}, 28515, 28517,
+    {f: 6, c: 28519}, 28529, 28531, {f: 2, c: 28533}, 28537, 28539,
+    {f: 2, c: 28541}, {f: 3, c: 28545}, 28549, {f: 2, c: 28554},
+    {f: 8, c: 28559}, {f: 4, c: 28568}, {f: 3, c: 28573}, {f: 2, c: 28578},
+    {f: 2, c: 28581}, 28584, {f: 4, c: 28586}, {f: 2, c: 28591}, 28594,
+    {f: 2, c: 28596}, {f: 2, c: 28599}, {f: 6, c: 28602}, {f: 5, c: 28612},
+    {f: 7, c: 28618}, {f: 2, c: 28627}, {f: 2, c: 28630}, {f: 2, c: 28633},
+    {f: 2, c: 28636}, {f: 2, c: 28642}, {f: 6, c: 28645}, {f: 2, c: 28652},
+    {f: 8, c: 28658}, 28667, 28669, {f: 6, c: 28671}, {f: 2, c: 28679}, 28682,
+    {f: 3, c: 28684}, 28688, {f: 3, c: 28690}, {f: 2, c: 28694}, 28697, 28700,
+    28702, {f: 2, c: 28705}, {f: 3, c: 28708}, {f: 7, c: 28713}, 28721,
+    {f: 2, c: 28723}, {f: 3, c: 28726}, {f: 4, c: 28730}, {f: 4, c: 28735},
+    {f: 7, c: 28741}, {f: 2, c: 28749}, 28752, {f: 3, c: 28754},
+    {f: 2, c: 28758}, {f: 4, c: 28761}, {f: 4, c: 28767}, {f: 2, c: 28773},
+    {f: 3, c: 28776}, 28782, {f: 4, c: 28785}, 28791, {f: 3, c: 28793}, 28797,
+    {f: 4, c: 28801}, {f: 3, c: 28806}, {f: 3, c: 28811}, {f: 3, c: 28815},
+    28819, {f: 2, c: 28823}, {f: 2, c: 28826}, {f: 13, c: 28830}, 28848, 28850,
+    {f: 3, c: 28852}, 28858, {f: 2, c: 28862}, {f: 4, c: 28868}, 28873,
+    {f: 4, c: 28875}, {f: 8, c: 28880}, 28890, {f: 3, c: 28892},
+    {f: 4, c: 28896}, 28901, 28906, 28910, {f: 4, c: 28912}, {f: 2, c: 28917},
+    28920, {f: 3, c: 28922}, {f: 11, c: 28926}, {f: 5, c: 28939},
+    {f: 2, c: 28945}, 28948, 28951, {f: 6, c: 28955}, {f: 4, c: 28962},
+    {f: 8, c: 28967}, {f: 4, c: 28978}, {f: 14, c: 28983}, {f: 3, c: 28998},
+    29003, 29005, {f: 3, c: 29007}, {f: 9, c: 29011}, 29021, {f: 3, c: 29023},
+    29027, 29029, {f: 2, c: 29034}, 29037, {f: 3, c: 29039}, {f: 4, c: 29044},
+    29049, {f: 2, c: 29051}, {f: 6, c: 29054}, {f: 5, c: 29061},
+    {f: 4, c: 29067}, {f: 2, c: 29072}, 29075, {f: 2, c: 29077},
+    {f: 5, c: 29082}, {f: 7, c: 29089}, {f: 3, c: 29097}, {f: 4, c: 29101},
+    29106, 29108, {f: 3, c: 29110}, {f: 4, c: 29114}, {f: 2, c: 29119}, 29122,
+    {f: 4, c: 29124}, {f: 5, c: 29129}, {f: 3, c: 29135}, 29139,
+    {f: 3, c: 29142}, {f: 2, c: 29146}, {f: 2, c: 29149}, {f: 4, c: 29153},
+    {f: 5, c: 29160}, {f: 5, c: 29167}, {f: 4, c: 29173}, {f: 2, c: 29178},
+    29181, {f: 7, c: 29183}, {f: 6, c: 29191}, {f: 2, c: 29198},
+    {f: 10, c: 29201}, 29212, {f: 10, c: 29214}, 29225, 29227,
+    {f: 3, c: 29229}, {f: 2, c: 29235}, 29244, {f: 7, c: 29248},
+    {f: 3, c: 29257}, {f: 4, c: 29262}, {f: 3, c: 29267}, 29271, 29274, 29276,
+    29278, 29280, {f: 3, c: 29283}, 29288, {f: 4, c: 29290}, {f: 2, c: 29296},
+    {f: 2, c: 29299}, {f: 3, c: 29302}, {f: 2, c: 29307}, {f: 2, c: 29314},
+    {f: 5, c: 29317}, 29324, 29326, {f: 2, c: 29328}, {f: 3, c: 29331},
+    {f: 8, c: 29335}, {f: 2, c: 29344}, {f: 4, c: 29347}, {f: 4, c: 29352},
+    29358, {f: 3, c: 29361}, 29365, {f: 6, c: 29370}, {f: 3, c: 29381},
+    {f: 4, c: 29385}, 29391, 29393, {f: 4, c: 29395}, 29400, {f: 4, c: 29402},
+    29407, {f: 6, c: 29410}, {f: 2, c: 29418}, {f: 2, c: 29429},
+    {f: 3, c: 29438}, 29442, {f: 6, c: 29444}, {f: 3, c: 29451},
+    {f: 4, c: 29455}, 29460, {f: 3, c: 29464}, {f: 2, c: 29471},
+    {f: 2, c: 29475}, {f: 3, c: 29478}, 29485, {f: 2, c: 29487},
+    {f: 2, c: 29490}, 29493, 29498, {f: 2, c: 29500}, 29504, {f: 2, c: 29506},
+    {f: 7, c: 29510}, {f: 2, c: 29518}, 29521, {f: 4, c: 29523},
+    {f: 8, c: 29528}, {f: 7, c: 29537}, 29545, 29550, 29553, {f: 2, c: 29555},
+    29558, 29561, 29565, 29567, {f: 3, c: 29569}, {f: 2, c: 29573}, 29576,
+    29578, {f: 2, c: 29580}, {f: 2, c: 29583}, {f: 4, c: 29586},
+    {f: 4, c: 29591}, {f: 3, c: 29596}, {f: 2, c: 29600}, {f: 6, c: 29603},
+    29610, {f: 2, c: 29612}, 29617, {f: 3, c: 29620}, {f: 2, c: 29624},
+    {f: 4, c: 29628}, 29633, {f: 5, c: 29635}, {f: 2, c: 29643}, 29646,
+    {f: 7, c: 29650}, {f: 4, c: 29658}, 29663, {f: 4, c: 29665}, 29670, 29672,
+    {f: 3, c: 29674}, {f: 4, c: 29678}, {f: 11, c: 29683}, {f: 4, c: 29695},
+    29700, {f: 2, c: 29703}, {f: 4, c: 29707}, {f: 9, c: 29713},
+    {f: 6, c: 29724}, {f: 2, c: 29731}, 29735, 29737, 29739, 29741, 29743,
+    {f: 2, c: 29745}, {f: 5, c: 29751}, {f: 2, c: 29757}, 29760,
+    {f: 9, c: 29762}, {f: 9, c: 29772}, 29782, 29784, 29789, {f: 3, c: 29792},
+    {f: 5, c: 29796}, {f: 2, c: 29803}, {f: 2, c: 29806}, {f: 5, c: 29809},
+    {f: 6, c: 29816}, 29823, 29826, {f: 3, c: 29828}, 29832, 29834,
+    {f: 2, c: 29836}, 29839, {f: 11, c: 29841}, 29853, {f: 4, c: 29855},
+    {f: 2, c: 29860}, {f: 6, c: 29866}, {f: 9, c: 29873}, {f: 2, c: 29883},
+    {f: 12, c: 29886}, {f: 4, c: 29899}, {f: 2, c: 29904}, 29907,
+    {f: 5, c: 29909}, 29915, 29917, 29919, 29921, 29925, {f: 7, c: 29927},
+    {f: 4, c: 29936}, 29941, {f: 7, c: 29944}, {f: 4, c: 29952},
+    {f: 7, c: 29957}, 29966, 29968, 29970, {f: 4, c: 29972}, 29979,
+    {f: 2, c: 29981}, {f: 3, c: 29984}, 29988, {f: 2, c: 29990}, 29994, 29998,
+    30004, 30006, 30009, {f: 2, c: 30012}, 30015, {f: 4, c: 30017},
+    {f: 2, c: 30022}, {f: 2, c: 30025}, 30029, {f: 4, c: 30032},
+    {f: 4, c: 30037}, {f: 4, c: 30046}, {f: 2, c: 30051}, {f: 3, c: 30055},
+    {f: 6, c: 30060}, 30067, 30069, 30071, {f: 5, c: 30074}, {f: 3, c: 30080},
+    {f: 2, c: 30084}, {f: 3, c: 30088}, {f: 3, c: 30092}, 30096, 30099, 30101,
+    30104, {f: 2, c: 30107}, 30110, 30114, {f: 5, c: 30118}, 30125,
+    {f: 2, c: 30134}, {f: 2, c: 30138}, {f: 3, c: 30143}, 30150,
+    {f: 2, c: 30155}, {f: 4, c: 30158}, 30163, 30167, 30170, {f: 2, c: 30172},
+    {f: 3, c: 30175}, 30181, 30185, {f: 4, c: 30188}, {f: 2, c: 30194},
+    {f: 4, c: 30197}, {f: 2, c: 30202}, {f: 2, c: 30205}, 30212,
+    {f: 4, c: 30214}, {f: 2, c: 30222}, {f: 4, c: 30225}, 30230, 30234,
+    {f: 2, c: 30236}, 30243, 30248, 30252, {f: 2, c: 30254}, {f: 2, c: 30257},
+    {f: 2, c: 30262}, {f: 2, c: 30265}, 30269, 30273, {f: 2, c: 30276}, 30280,
+    {f: 2, c: 30282}, {f: 6, c: 30286}, 30293, 30295, {f: 3, c: 30297}, 30301,
+    {f: 2, c: 30304}, 30310, 30312, 30314, {f: 3, c: 30323}, [12136, 30326],
+    30327, {f: 2, c: 30329}, {f: 3, c: 30335}, 30339, 30341, {f: 2, c: 30345},
+    {f: 2, c: 30348}, {f: 2, c: 30351}, 30354, {f: 2, c: 30356},
+    {f: 2, c: 30359}, {f: 9, c: 30363}, {f: 9, c: 30373}, {f: 2, c: 30383},
+    30387, {f: 3, c: 30389}, 30393, {f: 4, c: 30395}, {f: 2, c: 30400},
+    {f: 2, c: 30403}, 30407, 30409, {f: 2, c: 30411}, 30419, 30421,
+    {f: 2, c: 30425}, {f: 2, c: 30428}, 30432, 30434, 30438, {f: 6, c: 30440},
+    30448, 30451, {f: 3, c: 30453}, {f: 2, c: 30458}, 30461, {f: 2, c: 30463},
+    {f: 2, c: 30466}, {f: 2, c: 30469}, 30474, 30476, {f: 11, c: 30478},
+    {f: 4, c: 30491}, 30497, {f: 3, c: 30499}, 30503, {f: 3, c: 30506}, 30510,
+    {f: 5, c: 30512}, 30521, 30523, {f: 3, c: 30525}, 30530, {f: 3, c: 30532},
+    {f: 7, c: 30536}, {f: 8, c: 30546}, {f: 2, c: 30556}, {f: 2, c: 30559},
+    30564, 30567, {f: 2, c: 30569}, {f: 12, c: 30573}, {f: 3, c: 30586},
+    {f: 3, c: 30593}, {f: 6, c: 30598}, {f: 2, c: 30607}, {f: 5, c: 30611},
+    {f: 5, c: 30617}, 30625, {f: 2, c: 30627}, 30630, 30632, 30635,
+    {f: 2, c: 30638}, {f: 2, c: 30641}, 30644, {f: 5, c: 30646}, 30654,
+    {f: 7, c: 30656}, {f: 5, c: 30664}, {f: 9, c: 30670}, {f: 2, c: 30680},
+    {f: 5, c: 30685}, 30692, 30694, 30696, 30698, {f: 3, c: 30704},
+    {f: 2, c: 30708}, 30711, {f: 4, c: 30713}, {f: 6, c: 30723},
+    {f: 2, c: 30730}, {f: 3, c: 30734}, 30739, 30741, 30745, 30747, 30750,
+    {f: 3, c: 30752}, 30756, 30760, {f: 2, c: 30762}, {f: 2, c: 30766},
+    {f: 3, c: 30769}, {f: 2, c: 30773}, 30781, 30783, {f: 2, c: 30785}, 30788,
+    30790, {f: 4, c: 30792}, 30797, 30799, 30801, {f: 2, c: 30803},
+    {f: 5, c: 30808}, {f: 6, c: 30814}, {f: 3, c: 30821}, 30825,
+    {f: 7, c: 30832}, {f: 4, c: 30840}, {f: 10, c: 30845}, 30856,
+    {f: 2, c: 30858}, {f: 2, c: 30863}, 30866, {f: 3, c: 30868}, 30873,
+    {f: 2, c: 30877}, 30880, 30882, 30884, 30886, 30888, {f: 3, c: 30890},
+    {f: 2, c: 30894}, {f: 3, c: 30901}, 30907, 30909, {f: 2, c: 30911},
+    {f: 3, c: 30914}, {f: 3, c: 30918}, {f: 4, c: 30924}, {f: 3, c: 30929},
+    {f: 3, c: 30934}, {f: 8, c: 30939}, {f: 3, c: 30948}, {f: 3, c: 30953},
+    {f: 2, c: 30957}, {f: 2, c: 30960}, 30963, {f: 2, c: 30965},
+    {f: 2, c: 30968}, {f: 2, c: 30971}, {f: 3, c: 30974}, {f: 3, c: 30978},
+    {f: 8, c: 30982}, {f: 4, c: 30991}, {f: 5, c: 30996}, {f: 4, c: 31002},
+    {f: 5, c: 31007}, 31013, {f: 3, c: 31015}, {f: 4, c: 31021},
+    {f: 2, c: 31026}, {f: 5, c: 31029}, 31037, 31039, {f: 4, c: 31042}, 31047,
+    {f: 9, c: 31050}, {f: 2, c: 31060}, {f: 2, c: 31064}, 31073,
+    {f: 2, c: 31075}, 31078, {f: 4, c: 31081}, 31086, {f: 7, c: 31088}, 31097,
+    {f: 5, c: 31099}, {f: 2, c: 31106}, {f: 4, c: 31110}, {f: 2, c: 31115},
+    {f: 10, c: 31120}, {f: 11, c: 31131}, {f: 2, c: 31144}, {f: 3, c: 31147},
+    31151, 31154, {f: 4, c: 31156}, [12145, 31160], 31164, 31167, 31170,
+    {f: 2, c: 31172}, {f: 2, c: 31175}, 31178, 31180, {f: 3, c: 31182},
+    {f: 2, c: 31187}, {f: 2, c: 31190}, {f: 6, c: 31193}, {f: 3, c: 31200},
+    31205, 31208, 31210, 31212, 31214, {f: 7, c: 31217}, {f: 2, c: 31225},
+    31228, {f: 2, c: 31230}, 31233, {f: 2, c: 31236}, {f: 4, c: 31239}, 31244,
+    {f: 5, c: 31247}, {f: 2, c: 31253}, {f: 2, c: 31256}, {f: 3, c: 31259},
+    31263, {f: 2, c: 31265}, {f: 10, c: 31268}, {f: 2, c: 31279}, 31282,
+    {f: 3, c: 31284}, 31288, 31290, 31294, {f: 5, c: 31297}, {f: 5, c: 31303},
+    {f: 2, c: 31311}, {f: 5, c: 31314}, {f: 9, c: 31320}, {f: 6, c: 31331},
+    31338, {f: 4, c: 31340}, {f: 3, c: 31345}, 31349, {f: 4, c: 31355}, 31362,
+    31365, 31367, {f: 4, c: 31369}, {f: 3, c: 31374}, {f: 2, c: 31379},
+    {f: 3, c: 31385}, 31390, {f: 4, c: 31393}, 31399, 31403, {f: 4, c: 31407},
+    {f: 2, c: 31412}, {f: 3, c: 31415}, {f: 4, c: 31419}, {f: 4, c: 31424},
+    31430, 31433, {f: 10, c: 31436}, {f: 2, c: 31447}, {f: 4, c: 31450},
+    {f: 2, c: 31457}, 31460, {f: 3, c: 31463}, {f: 2, c: 31467}, 31470,
+    {f: 6, c: 31472}, {f: 2, c: 31479}, {f: 2, c: 31483}, 31486,
+    {f: 3, c: 31488}, 31493, 31495, 31497, {f: 3, c: 31500}, 31504,
+    {f: 2, c: 31506}, {f: 3, c: 31510}, 31514, {f: 2, c: 31516}, 31519,
+    {f: 3, c: 31521}, 31527, 31529, 31533, {f: 2, c: 31535}, 31538,
+    {f: 4, c: 31540}, 31545, 31547, 31549, {f: 6, c: 31551}, 31560, 31562,
+    {f: 2, c: 31565}, 31571, 31573, 31575, 31577, 31580, {f: 2, c: 31582},
+    31585, {f: 4, c: 31587}, {f: 6, c: 31592}, {f: 2, c: 31599},
+    {f: 2, c: 31603}, 31606, 31608, 31610, {f: 2, c: 31612}, 31615,
+    {f: 4, c: 31617}, {f: 5, c: 31622}, 31628, {f: 2, c: 31630},
+    {f: 3, c: 31633}, 31638, {f: 4, c: 31640}, {f: 3, c: 31646},
+    {f: 3, c: 31651}, {f: 3, c: 31662}, {f: 2, c: 31666}, {f: 3, c: 31669},
+    {f: 7, c: 31673}, {f: 2, c: 31682}, 31685, 31688, 31690, {f: 4, c: 31693},
+    31698, {f: 5, c: 31700}, {f: 2, c: 31707}, {f: 3, c: 31710},
+    {f: 2, c: 31714}, {f: 2, c: 31719}, {f: 3, c: 31723}, {f: 2, c: 31727},
+    31730, {f: 3, c: 31732}, {f: 4, c: 31736}, 31741, 31743, {f: 6, c: 31745},
+    {f: 3, c: 31752}, 31758, {f: 6, c: 31760}, {f: 7, c: 31767}, 31776, 31778,
+    {f: 2, c: 31780}, {f: 2, c: 31784}, {f: 12, c: 31788}, {f: 4, c: 31801},
+    31810, {f: 8, c: 31812}, {f: 14, c: 31822}, {f: 2, c: 31837},
+    {f: 3, c: 31841}, {f: 4, c: 31845}, 31851, 31853, {f: 3, c: 31855},
+    {f: 6, c: 31861}, {f: 11, c: 31870}, {f: 7, c: 31882}, {f: 2, c: 31891},
+    31894, {f: 3, c: 31897}, {f: 2, c: 31904}, 31907, {f: 4, c: 31910},
+    {f: 3, c: 31915}, {f: 2, c: 31919}, {f: 5, c: 31924}, {f: 2, c: 31930},
+    {f: 2, c: 31935}, {f: 3, c: 31938}, 31942, 31945, 31947, {f: 7, c: 31950},
+    31960, {f: 2, c: 31962}, {f: 6, c: 31969}, {f: 6, c: 31977}, 31985, 31987,
+    31989, 31991, 31994, {f: 2, c: 31996}, 31999, 32001, 32003, 32012,
+    {f: 2, c: 32014}, {f: 2, c: 32017}, 32022, 32024, {f: 3, c: 32029},
+    {f: 4, c: 32035}, {f: 3, c: 32040}, {f: 3, c: 32044}, {f: 5, c: 32052},
+    32059, {f: 2, c: 32061}, 32065, 32067, 32069, {f: 7, c: 32071}, 32079,
+    {f: 12, c: 32081}, {f: 2, c: 32095}, {f: 3, c: 32099}, 32103,
+    {f: 5, c: 32105}, {f: 2, c: 32111}, {f: 2, c: 32116}, 32120,
+    {f: 7, c: 32122}, 32130, {f: 2, c: 32132}, 32135, {f: 5, c: 32138},
+    {f: 3, c: 32144}, {f: 8, c: 32148}, 32157, {f: 3, c: 32159},
+    {f: 2, c: 32164}, {f: 4, c: 32167}, 32175, {f: 3, c: 32181}, 32188,
+    {f: 4, c: 32192}, {f: 2, c: 32197}, {f: 2, c: 32200}, {f: 5, c: 32204},
+    32211, {f: 2, c: 32213}, {f: 3, c: 32218}, 32223, 32226, {f: 2, c: 32228},
+    32231, {f: 2, c: 32234}, {f: 2, c: 32237}, 32240, 32243, 32245,
+    {f: 2, c: 32247}, 32250, {f: 12, c: 32252}, {f: 4, c: 32268},
+    {f: 9, c: 32274}, 32284, {f: 3, c: 32288}, {f: 3, c: 32292},
+    {f: 3, c: 32296}, 32300, {f: 2, c: 32303}, 32307, 32312, 32314, 32316,
+    {f: 2, c: 32319}, {f: 3, c: 32322}, {f: 10, c: 32328}, 32339,
+    {f: 4, c: 32342}, {f: 3, c: 32347}, {f: 3, c: 32351}, {f: 6, c: 32355},
+    32364, {f: 2, c: 32369}, {f: 5, c: 32372}, {f: 2, c: 32378},
+    {f: 3, c: 32383}, {f: 5, c: 32387}, 32393, 32395, 32398, {f: 3, c: 32400},
+    32405, 32407, {f: 2, c: 32409}, {f: 2, c: 32413}, 32430, 32436,
+    {f: 2, c: 32443}, 32470, 32484, 32492, 32505, 32522, 32528, 32542, 32567,
+    32569, {f: 7, c: 32571}, 32579, {f: 6, c: 32582}, 32589, 32591,
+    {f: 2, c: 32594}, 32598, 32601, {f: 4, c: 32603}, 32608, {f: 5, c: 32611},
+    {f: 3, c: 32619}, 32623, 32627, {f: 2, c: 32629}, 32632, {f: 4, c: 32634},
+    {f: 2, c: 32639}, {f: 3, c: 32642}, 32647, 32649, 32651, 32653,
+    {f: 5, c: 32655}, {f: 5, c: 32661}, {f: 2, c: 32667}, 32672,
+    {f: 2, c: 32674}, 32678, 32680, {f: 5, c: 32682}, 32689, {f: 5, c: 32691},
+    {f: 2, c: 32698}, 32702, 32704, {f: 3, c: 32706}, {f: 4, c: 32710}, 32715,
+    32717, {f: 3, c: 32719}, 32723, {f: 2, c: 32726}, {f: 6, c: 32729},
+    {f: 3, c: 32738}, {f: 2, c: 32743}, {f: 4, c: 32746}, 32751, 32754,
+    {f: 5, c: 32756}, 32762, {f: 3, c: 32765}, 32770, {f: 4, c: 32775},
+    {f: 2, c: 32782}, 32785, 32787, {f: 2, c: 32794}, {f: 3, c: 32797}, 32801,
+    {f: 2, c: 32803}, 32811, 32813, {f: 2, c: 32815}, 32818, 32820,
+    {f: 2, c: 32825}, 32828, 32830, {f: 2, c: 32832}, {f: 2, c: 32836},
+    {f: 3, c: 32839}, {f: 4, c: 32846}, 32851, 32853, 32855, 32857,
+    {f: 3, c: 32859}, {f: 10, c: 32863}, {f: 4, c: 32875}, 32884, 32888,
+    {f: 3, c: 32890}, {f: 2, c: 32897}, 32904, 32906, {f: 6, c: 32909},
+    {f: 2, c: 32916}, 32919, 32921, 32926, 32931, {f: 3, c: 32934}, 32940,
+    32944, 32947, {f: 2, c: 32949}, {f: 2, c: 32952}, 32955, 32965,
+    {f: 5, c: 32967}, {f: 7, c: 32975}, 32984, {f: 2, c: 32991},
+    {f: 2, c: 32994}, 32998, 33006, 33013, 33015, 33017, 33019,
+    {f: 4, c: 33022}, {f: 2, c: 33027}, {f: 2, c: 33031}, {f: 2, c: 33035},
+    33045, 33047, 33049, {f: 2, c: 33052}, {f: 13, c: 33055}, {f: 2, c: 33069},
+    33072, {f: 3, c: 33075}, 33079, {f: 4, c: 33082}, {f: 7, c: 33087}, 33095,
+    33097, 33101, 33103, 33106, {f: 2, c: 33111}, {f: 5, c: 33115},
+    {f: 3, c: 33122}, 33128, 33130, 33132, 33135, {f: 2, c: 33138},
+    {f: 3, c: 33141}, 33153, {f: 5, c: 33155}, 33161, {f: 4, c: 33163}, 33168,
+    {f: 6, c: 33170}, 33177, {f: 2, c: 33182}, {f: 2, c: 33185},
+    {f: 2, c: 33188}, 33191, {f: 8, c: 33195}, {f: 6, c: 33204}, 33212,
+    {f: 2, c: 33220}, {f: 2, c: 33223}, 33227, 33230, {f: 8, c: 33232}, 33241,
+    {f: 4, c: 33243}, {f: 2, c: 33249}, {f: 3, c: 33252}, 33257, 33259,
+    {f: 5, c: 33262}, {f: 5, c: 33269}, 33277, 33279, 33283, 33291,
+    {f: 2, c: 33294}, 33297, 33299, {f: 6, c: 33301}, 33309, 33312,
+    {f: 4, c: 33316}, 33321, 33326, 33330, 33338, {f: 2, c: 33340},
+    {f: 5, c: 33343}, {f: 2, c: 33349}, 33352, 33354, {f: 3, c: 33356},
+    {f: 8, c: 33360}, {f: 4, c: 33371}, {f: 4, c: 33376}, 33381, 33383,
+    {f: 2, c: 33385}, {f: 2, c: 33388}, {f: 2, c: 33397}, [12171, 33400],
+    {f: 2, c: 33403}, {f: 2, c: 33408}, 33411, {f: 3, c: 33413}, 33417, 33420,
+    33424, {f: 4, c: 33427}, {f: 2, c: 33434}, 33438, 33440, {f: 2, c: 33442},
+    33447, 33458, {f: 2, c: 33461}, 33466, 33468, {f: 2, c: 33471},
+    {f: 2, c: 33474}, {f: 2, c: 33477}, 33481, 33488, 33494, {f: 2, c: 33497},
+    33501, 33506, {f: 3, c: 33512}, {f: 3, c: 33516}, 33520, {f: 2, c: 33522},
+    {f: 2, c: 33525}, 33528, 33530, {f: 5, c: 33532}, {f: 2, c: 33546}, 33549,
+    33552, {f: 2, c: 33554}, 33558, {f: 2, c: 33560}, {f: 10, c: 33565},
+    {f: 2, c: 33577}, 33582, 33584, 33586, 33591, 33595, {f: 3, c: 33597},
+    {f: 2, c: 33601}, {f: 2, c: 33604}, 33608, {f: 5, c: 33610}, 33619,
+    {f: 5, c: 33621}, 33629, 33634, {f: 7, c: 33648}, {f: 2, c: 33657},
+    {f: 7, c: 33662}, {f: 2, c: 33671}, {f: 3, c: 33675}, {f: 3, c: 33679},
+    {f: 2, c: 33684}, 33687, {f: 2, c: 33689}, 33693, 33695, 33697,
+    {f: 4, c: 33699}, {f: 4, c: 33708}, 33717, 33723, {f: 2, c: 33726},
+    {f: 3, c: 33730}, 33734, {f: 2, c: 33736}, 33739, {f: 2, c: 33741},
+    {f: 4, c: 33744}, 33749, 33751, {f: 3, c: 33753}, 33758, {f: 3, c: 33762},
+    {f: 3, c: 33766}, {f: 4, c: 33771}, {f: 5, c: 33779}, {f: 3, c: 33786},
+    {f: 3, c: 33790}, 33794, 33797, {f: 2, c: 33800}, 33808, {f: 6, c: 33810},
+    {f: 3, c: 33817}, {f: 6, c: 33822}, {f: 3, c: 33833}, {f: 4, c: 33837},
+    {f: 3, c: 33842}, {f: 2, c: 33846}, {f: 3, c: 33849}, {f: 8, c: 33854},
+    {f: 2, c: 33863}, {f: 7, c: 33866}, {f: 4, c: 33875}, 33880,
+    {f: 4, c: 33885}, 33890, 33893, {f: 2, c: 33895}, 33898, 33902, 33904,
+    33906, 33908, 33913, {f: 7, c: 33915}, {f: 4, c: 33923}, 33930, 33933,
+    {f: 4, c: 33935}, {f: 2, c: 33941}, 33944, {f: 2, c: 33946},
+    {f: 4, c: 33949}, {f: 13, c: 33954}, {f: 2, c: 33968}, 33971,
+    {f: 3, c: 33973}, 33979, 33982, {f: 2, c: 33986}, {f: 4, c: 33989}, 33996,
+    {f: 2, c: 33998}, 34002, {f: 2, c: 34004}, {f: 6, c: 34007}, 34014,
+    {f: 2, c: 34017}, 34020, {f: 5, c: 34023}, 34029, {f: 11, c: 34033}, 34046,
+    {f: 12, c: 34048}, {f: 4, c: 34061}, 34066, {f: 2, c: 34069},
+    {f: 2, c: 34072}, {f: 3, c: 34075}, 34080, 34082, {f: 2, c: 34084},
+    {f: 4, c: 34087}, {f: 9, c: 34094}, {f: 3, c: 34110}, 34114,
+    {f: 2, c: 34116}, 34119, {f: 3, c: 34123}, {f: 3, c: 34127}, 34132, 34135,
+    {f: 4, c: 34138}, {f: 3, c: 34143}, 34147, {f: 3, c: 34149},
+    {f: 2, c: 34155}, {f: 4, c: 34158}, 34163, {f: 2, c: 34165}, 34168,
+    {f: 2, c: 34172}, {f: 5, c: 34175}, 34182, 34185, 34187, {f: 2, c: 34189},
+    34192, {f: 2, c: 34194}, {f: 6, c: 34197}, {f: 2, c: 34205},
+    {f: 4, c: 34208}, 34213, 34215, {f: 3, c: 34219}, {f: 6, c: 34225}, 34232,
+    {f: 6, c: 34235}, {f: 7, c: 34242}, {f: 3, c: 34250}, {f: 2, c: 34257},
+    34260, {f: 6, c: 34262}, {f: 6, c: 34270}, {f: 3, c: 34278},
+    {f: 9, c: 34283}, 34293, {f: 2, c: 34295}, {f: 3, c: 34300},
+    {f: 4, c: 34304}, {f: 3, c: 34312}, {f: 5, c: 34316}, {f: 4, c: 34322},
+    {f: 3, c: 34327}, {f: 3, c: 34331}, {f: 3, c: 34335}, {f: 4, c: 34339},
+    34344, {f: 3, c: 34346}, {f: 10, c: 34350}, 34361, 34363, {f: 2, c: 34365},
+    {f: 13, c: 34368}, {f: 2, c: 34386}, {f: 4, c: 34390}, 34395, 34397,
+    {f: 2, c: 34400}, {f: 4, c: 34403}, {f: 3, c: 34408}, 34413,
+    {f: 2, c: 34415}, {f: 7, c: 34418}, {f: 7, c: 34435}, {f: 5, c: 34446},
+    34452, {f: 6, c: 34454}, {f: 5, c: 34462}, {f: 2, c: 34469}, 34475,
+    {f: 2, c: 34477}, {f: 2, c: 34482}, {f: 3, c: 34487}, {f: 5, c: 34491},
+    {f: 3, c: 34497}, 34501, 34504, {f: 2, c: 34508}, {f: 2, c: 34514},
+    {f: 3, c: 34517}, 34522, {f: 2, c: 34524}, {f: 4, c: 34528},
+    {f: 4, c: 34533}, {f: 3, c: 34538}, 34543, {f: 3, c: 34549},
+    {f: 3, c: 34555}, 34559, 34561, {f: 2, c: 34564}, {f: 2, c: 34571},
+    {f: 4, c: 34574}, 34580, 34582, 34585, 34587, 34589, {f: 2, c: 34591},
+    34596, {f: 3, c: 34598}, {f: 4, c: 34602}, {f: 2, c: 34607},
+    {f: 2, c: 34610}, {f: 2, c: 34613}, {f: 3, c: 34616}, {f: 2, c: 34620},
+    {f: 7, c: 34624}, {f: 2, c: 34634}, 34637, {f: 4, c: 34639}, 34644, 34646,
+    34648, {f: 6, c: 34650}, {f: 2, c: 34657}, {f: 7, c: 34663}, 34671,
+    {f: 3, c: 34673}, 34677, 34679, {f: 2, c: 34681}, {f: 3, c: 34687},
+    {f: 2, c: 34694}, {f: 2, c: 34697}, 34700, {f: 5, c: 34702},
+    {f: 3, c: 34708}, {f: 6, c: 34712}, {f: 2, c: 34720}, {f: 5, c: 34723},
+    {f: 2, c: 34729}, 34734, {f: 3, c: 34736}, 34740, {f: 4, c: 34742}, 34748,
+    {f: 2, c: 34750}, {f: 3, c: 34753}, 34757, 34759, 34761, {f: 2, c: 34764},
+    {f: 2, c: 34767}, {f: 7, c: 34772}, {f: 4, c: 34780}, {f: 2, c: 34785},
+    34788, {f: 4, c: 34790}, 34795, 34797, {f: 2, c: 34800}, {f: 3, c: 34803},
+    {f: 2, c: 34807}, 34810, {f: 2, c: 34812}, {f: 4, c: 34815}, 34820,
+    {f: 3, c: 34823}, {f: 5, c: 34827}, 34834, 34836, {f: 4, c: 34839},
+    {f: 3, c: 34844}, 34848, {f: 13, c: 34852}, {f: 3, c: 34867},
+    {f: 2, c: 34871}, 34874, {f: 3, c: 34877}, {f: 3, c: 34881},
+    {f: 3, c: 34887}, 34891, {f: 5, c: 34894}, {f: 2, c: 34901}, 34904, 34906,
+    34908, {f: 3, c: 34910}, {f: 2, c: 34918}, 34922, 34925, 34927, 34929,
+    {f: 4, c: 34931}, 34936, {f: 3, c: 34938}, 34944, 34947, {f: 2, c: 34950},
+    {f: 2, c: 34953}, 34956, {f: 4, c: 34958}, {f: 3, c: 34963},
+    {f: 5, c: 34967}, {f: 5, c: 34973}, 34979, {f: 6, c: 34981}, 34988,
+    {f: 3, c: 34990}, {f: 5, c: 34994}, {f: 4, c: 35000}, {f: 4, c: 35005},
+    {f: 2, c: 35011}, {f: 2, c: 35015}, {f: 3, c: 35019}, {f: 2, c: 35024},
+    35027, {f: 2, c: 35030}, {f: 2, c: 35034}, 35038, {f: 2, c: 35040},
+    {f: 2, c: 35046}, {f: 7, c: 35049}, 35058, {f: 3, c: 35061},
+    {f: 2, c: 35066}, {f: 3, c: 35071}, {f: 4, c: 35075}, {f: 2, c: 35080},
+    {f: 5, c: 35083}, 35089, {f: 5, c: 35092}, {f: 5, c: 35100},
+    {f: 3, c: 35106}, {f: 4, c: 35110}, {f: 4, c: 35116}, 35121, 35125, 35127,
+    {f: 2, c: 35129}, {f: 5, c: 35132}, {f: 2, c: 35138}, {f: 2, c: 35141},
+    {f: 14, c: 35144}, {f: 6, c: 35159}, {f: 3, c: 35169}, 35173,
+    {f: 3, c: 35175}, 35179, {f: 2, c: 35181}, {f: 2, c: 35184},
+    {f: 8, c: 35187}, {f: 2, c: 35196}, [12177, 35198], 35200, 35202,
+    {f: 2, c: 35204}, {f: 4, c: 35207}, {f: 3, c: 35212}, {f: 3, c: 35216},
+    {f: 2, c: 35220}, 35223, {f: 8, c: 35225}, {f: 4, c: 35234},
+    {f: 3, c: 35239}, 35243, {f: 2, c: 35245}, {f: 2, c: 35248},
+    {f: 4, c: 35251}, {f: 2, c: 35256}, {f: 2, c: 35259}, 35262, 35267, 35277,
+    {f: 3, c: 35283}, {f: 3, c: 35287}, 35291, 35293, {f: 4, c: 35295}, 35300,
+    {f: 4, c: 35303}, {f: 3, c: 35308}, {f: 3, c: 35312}, 35317, 35319,
+    {f: 7, c: 35321}, {f: 3, c: 35332}, 35337, 35339, 35341, 35343,
+    {f: 2, c: 35345}, 35348, 35351, {f: 2, c: 35353}, 35356, 35358,
+    {f: 3, c: 35360}, 35364, {f: 4, c: 35366}, {f: 2, c: 35371},
+    {f: 3, c: 35374}, {f: 2, c: 35378}, 35381, {f: 3, c: 35383},
+    {f: 3, c: 35387}, {f: 2, c: 35391}, {f: 4, c: 35394}, 35399,
+    {f: 5, c: 35401}, 35407, 35409, 35411, {f: 2, c: 35414}, {f: 2, c: 35417},
+    {f: 2, c: 35420}, {f: 2, c: 35423}, {f: 2, c: 35428}, {f: 2, c: 35431},
+    35434, 35439, 35444, {f: 3, c: 35446}, {f: 2, c: 35450}, {f: 2, c: 35453},
+    {f: 4, c: 35456}, 35464, {f: 2, c: 35467}, {f: 3, c: 35470}, 35476,
+    {f: 2, c: 35478}, 35481, {f: 3, c: 35483}, 35487, 35490, 35495,
+    {f: 3, c: 35497}, {f: 3, c: 35501}, 35505, {f: 3, c: 35507},
+    {f: 2, c: 35511}, {f: 2, c: 35514}, {f: 2, c: 35517}, {f: 2, c: 35520},
+    35523, {f: 2, c: 35525}, 35528, 35530, 35532, 35534, 35536,
+    {f: 3, c: 35539}, {f: 3, c: 35544}, 35549, {f: 3, c: 35551}, 35555, 35557,
+    {f: 3, c: 35560}, 35564, {f: 2, c: 35567}, 35570, {f: 2, c: 35572}, 35577,
+    35579, 35581, 35583, 35587, 35590, {f: 2, c: 35592}, {f: 3, c: 35595},
+    35599, {f: 3, c: 35601}, 35605, 35608, 35612, {f: 3, c: 35614},
+    {f: 4, c: 35618}, 35623, {f: 2, c: 35625}, {f: 5, c: 35630},
+    {f: 5, c: 35636}, {f: 4, c: 35642}, {f: 10, c: 35647}, {f: 4, c: 35658},
+    {f: 6, c: 35664}, 35671, 35675, {f: 9, c: 35677}, {f: 4, c: 35687},
+    {f: 2, c: 35693}, {f: 3, c: 35697}, {f: 2, c: 35701}, {f: 5, c: 35704},
+    {f: 2, c: 35710}, {f: 9, c: 35713}, {f: 3, c: 35723}, {f: 3, c: 35727},
+    35732, {f: 5, c: 35735}, 35741, 35743, 35756, 35761, 35771, 35783, 35792,
+    35818, 35849, 35870, {f: 9, c: 35896}, {f: 4, c: 35906}, {f: 2, c: 35914},
+    {f: 3, c: 35917}, {f: 4, c: 35921}, {f: 4, c: 35926}, {f: 6, c: 35931},
+    {f: 7, c: 35939}, {f: 7, c: 35948}, {f: 4, c: 35956}, {f: 7, c: 35963},
+    {f: 2, c: 35971}, {f: 3, c: 35974}, 35979, {f: 7, c: 35981},
+    {f: 3, c: 35989}, {f: 4, c: 35993}, 35999, {f: 4, c: 36003},
+    {f: 2, c: 36013}, 36017, 36021, 36025, 36030, 36038, 36041,
+    {f: 6, c: 36043}, 36052, {f: 4, c: 36054}, 36059, 36061, 36063, 36069,
+    {f: 2, c: 36072}, {f: 6, c: 36078}, {f: 5, c: 36085}, {f: 5, c: 36095},
+    {f: 2, c: 36102}, 36105, 36108, 36110, {f: 5, c: 36113}, {f: 4, c: 36119},
+    36128, {f: 2, c: 36177}, 36183, 36191, 36197, {f: 3, c: 36200}, 36204,
+    {f: 2, c: 36206}, {f: 2, c: 36209}, {f: 9, c: 36216}, {f: 2, c: 36226},
+    {f: 4, c: 36230}, {f: 5, c: 36236}, {f: 2, c: 36242}, {f: 3, c: 36246},
+    {f: 5, c: 36250}, {f: 3, c: 36256}, {f: 4, c: 36260}, {f: 8, c: 36265},
+    {f: 2, c: 36278}, 36281, 36283, 36285, {f: 3, c: 36288}, 36293,
+    {f: 4, c: 36295}, 36301, 36304, {f: 4, c: 36306}, {f: 2, c: 36312}, 36316,
+    {f: 3, c: 36320}, {f: 3, c: 36325}, 36329, {f: 2, c: 36333},
+    {f: 3, c: 36336}, 36340, 36342, 36348, {f: 7, c: 36350}, {f: 3, c: 36358},
+    36363, {f: 2, c: 36365}, {f: 3, c: 36369}, {f: 8, c: 36373},
+    {f: 2, c: 36384}, {f: 5, c: 36388}, 36395, 36397, 36400, {f: 2, c: 36402},
+    {f: 3, c: 36406}, {f: 2, c: 36411}, {f: 2, c: 36414}, 36419,
+    {f: 2, c: 36421}, {f: 4, c: 36429}, {f: 2, c: 36435}, {f: 3, c: 36438},
+    {f: 9, c: 36442}, {f: 2, c: 36452}, {f: 2, c: 36455}, {f: 2, c: 36458},
+    36462, 36465, 36467, 36469, {f: 3, c: 36471}, 36475, {f: 2, c: 36477},
+    36480, {f: 3, c: 36482}, 36486, 36488, 36492, 36494, {f: 5, c: 36501},
+    36507, 36509, {f: 2, c: 36511}, {f: 3, c: 36514}, {f: 3, c: 36519},
+    {f: 2, c: 36525}, {f: 2, c: 36528}, {f: 7, c: 36531}, {f: 5, c: 36539},
+    {f: 9, c: 36545}, {f: 3, c: 36559}, 36563, {f: 6, c: 36565},
+    {f: 3, c: 36572}, {f: 4, c: 36576}, {f: 6, c: 36581}, {f: 6, c: 36588},
+    {f: 5, c: 36595}, 36605, {f: 4, c: 36607}, 36612, 36614, 36616,
+    {f: 7, c: 36619}, 36627, {f: 5, c: 36630}, {f: 5, c: 36640},
+    {f: 2, c: 36647}, {f: 4, c: 36651}, {f: 3, c: 36656}, {f: 4, c: 36660},
+    {f: 2, c: 36665}, {f: 2, c: 36668}, {f: 2, c: 36672}, 36675,
+    {f: 2, c: 36679}, {f: 3, c: 36682}, {f: 5, c: 36687}, {f: 10, c: 36693},
+    36704, 36707, 36709, 36714, 36736, 36748, 36754, 36765, {f: 3, c: 36768},
+    {f: 2, c: 36772}, 36775, 36778, 36780, {f: 2, c: 36787}, [12193, 36789],
+    {f: 2, c: 36791}, {f: 3, c: 36794}, {f: 2, c: 36799}, 36803, 36806,
+    {f: 5, c: 36809}, 36815, 36818, {f: 2, c: 36822}, 36826, {f: 2, c: 36832},
+    36835, 36839, 36844, 36847, {f: 2, c: 36849}, {f: 2, c: 36853},
+    {f: 3, c: 36858}, {f: 2, c: 36862}, {f: 2, c: 36871}, 36876, 36878, 36883,
+    36888, 36892, {f: 2, c: 36900}, {f: 6, c: 36903}, {f: 2, c: 36912},
+    {f: 2, c: 36915}, 36919, {f: 2, c: 36921}, 36925, {f: 2, c: 36927}, 36931,
+    {f: 2, c: 36933}, {f: 3, c: 36936}, 36940, 36950, {f: 2, c: 36953}, 36957,
+    36959, 36961, 36964, {f: 2, c: 36966}, {f: 3, c: 36970}, {f: 3, c: 36975},
+    36979, 36982, 36985, 36987, 36990, {f: 2, c: 36997}, 37001,
+    {f: 3, c: 37004}, 37010, 37012, 37014, 37016, 37018, 37020,
+    {f: 3, c: 37022}, {f: 2, c: 37028}, {f: 3, c: 37031}, 37035, 37037, 37042,
+    37047, {f: 2, c: 37052}, {f: 2, c: 37055}, {f: 2, c: 37058}, 37062,
+    {f: 2, c: 37064}, {f: 3, c: 37067}, 37074, {f: 3, c: 37076},
+    {f: 3, c: 37080}, 37086, 37088, {f: 3, c: 37091}, {f: 2, c: 37097}, 37100,
+    37102, {f: 4, c: 37104}, {f: 2, c: 37110}, {f: 4, c: 37113},
+    {f: 3, c: 37119}, 37123, 37125, {f: 2, c: 37127}, {f: 8, c: 37130}, 37139,
+    37141, {f: 2, c: 37143}, {f: 4, c: 37146}, {f: 3, c: 37151},
+    {f: 3, c: 37156}, {f: 5, c: 37160}, 37166, 37171, 37173, {f: 2, c: 37175},
+    {f: 8, c: 37179}, {f: 2, c: 37188}, 37191, 37201, {f: 4, c: 37203},
+    {f: 2, c: 37208}, {f: 2, c: 37211}, {f: 2, c: 37215}, {f: 3, c: 37222},
+    37227, 37229, 37235, {f: 3, c: 37242}, {f: 5, c: 37248}, 37254, 37256,
+    37258, {f: 2, c: 37262}, {f: 3, c: 37267}, {f: 3, c: 37271},
+    {f: 5, c: 37277}, {f: 6, c: 37284}, {f: 4, c: 37296}, {f: 4, c: 37302},
+    {f: 5, c: 37307}, 37314, 37316, [12196, 37318], 37320, 37328, 37334,
+    {f: 2, c: 37338}, {f: 5, c: 37342}, {f: 2, c: 37349}, 37352,
+    {f: 11, c: 37354}, 37366, 37368, {f: 5, c: 37371}, {f: 2, c: 37378},
+    {f: 3, c: 37381}, {f: 3, c: 37386}, 37391, {f: 2, c: 37394},
+    {f: 8, c: 37398}, {f: 4, c: 37407}, 37412, {f: 6, c: 37416}, 37423,
+    {f: 2, c: 37425}, {f: 2, c: 37429}, {f: 2, c: 37435}, {f: 4, c: 37441},
+    {f: 2, c: 37446}, {f: 3, c: 37450}, {f: 3, c: 37454}, {f: 3, c: 37458},
+    37462, {f: 2, c: 37464}, {f: 2, c: 37468}, {f: 3, c: 37471},
+    {f: 3, c: 37475}, {f: 5, c: 37479}, {f: 6, c: 37486}, {f: 3, c: 37493},
+    37497, {f: 3, c: 37500}, {f: 2, c: 37505}, 37508, {f: 8, c: 37510},
+    {f: 2, c: 37519}, 37522, {f: 2, c: 37524}, 37527, 37529, 37531,
+    {f: 3, c: 37533}, {f: 2, c: 37537}, 37540, 37543, 37549, {f: 2, c: 37551},
+    {f: 5, c: 37554}, 37560, 37562, {f: 4, c: 37565}, 37570, 37572, 37574,
+    {f: 3, c: 37577}, {f: 2, c: 37581}, {f: 2, c: 37584}, {f: 10, c: 37587},
+    37598, {f: 3, c: 37600}, 37607, 37609, {f: 2, c: 37611}, {f: 4, c: 37618},
+    37623, {f: 3, c: 37625}, {f: 4, c: 37629}, {f: 4, c: 37634},
+    {f: 7, c: 37641}, 37649, {f: 2, c: 37651}, {f: 2, c: 37654},
+    {f: 3, c: 37660}, 37665, {f: 3, c: 37667}, 37671, {f: 2, c: 37673},
+    {f: 2, c: 37676}, {f: 2, c: 37680}, {f: 2, c: 37684}, 37687,
+    {f: 5, c: 37689}, 37695, 37698, {f: 2, c: 37700}, {f: 3, c: 37704}, 37708,
+    {f: 6, c: 37710}, {f: 3, c: 37717}, {f: 2, c: 37721}, {f: 8, c: 37724},
+    {f: 3, c: 37734}, 37739, {f: 3, c: 37741}, {f: 4, c: 37745},
+    {f: 3, c: 37751}, {f: 3, c: 37755}, {f: 3, c: 37759}, 37763,
+    {f: 2, c: 37765}, {f: 2, c: 37768}, {f: 4, c: 37771}, {f: 6, c: 37776},
+    37783, {f: 9, c: 37785}, {f: 2, c: 37796}, 37800, 37803, 37805, 37807,
+    {f: 2, c: 37809}, 37812, {f: 2, c: 37814}, {f: 6, c: 37817},
+    {f: 3, c: 37824}, {f: 3, c: 37828}, 37833, 37835, {f: 3, c: 37838},
+    {f: 4, c: 37842}, {f: 3, c: 37849}, 37856, 37859, {f: 3, c: 37861},
+    {f: 12, c: 37865}, 37878, 37880, {f: 9, c: 37882}, {f: 7, c: 37892},
+    {f: 4, c: 37900}, 37905, {f: 3, c: 37909}, {f: 3, c: 37914},
+    {f: 2, c: 37918}, {f: 5, c: 37921}, {f: 5, c: 37929}, {f: 3, c: 37935},
+    37940, {f: 2, c: 37942}, 37945, {f: 3, c: 37947}, {f: 4, c: 37952},
+    {f: 5, c: 37957}, 37963, {f: 5, c: 37965}, 37971, {f: 11, c: 37973},
+    {f: 2, c: 37985}, 37988, {f: 5, c: 37990}, 37996, {f: 2, c: 37998}, 38001,
+    {f: 4, c: 38003}, 38008, {f: 2, c: 38010}, {f: 5, c: 38016}, 38033, 38038,
+    38040, 38087, 38095, {f: 2, c: 38099}, 38106, 38118, 38139, 38172, 38176,
+    38183, 38195, 38205, 38211, 38216, 38219, 38229, 38234, 38240, 38254,
+    {f: 2, c: 38260}, {f: 7, c: 38264}, 38273, {f: 2, c: 38276},
+    {f: 2, c: 38279}, 38282, 38285, 38288, 38290, {f: 3, c: 38293},
+    {f: 8, c: 38297}, 38306, {f: 2, c: 38310}, 38314, {f: 4, c: 38318},
+    {f: 3, c: 38323}, {f: 2, c: 38327}, 38330, {f: 3, c: 38336},
+    {f: 2, c: 38340}, 38343, 38345, {f: 3, c: 38349}, {f: 3, c: 38353},
+    {f: 5, c: 38359}, 38365, {f: 2, c: 38367}, {f: 2, c: 38371},
+    {f: 2, c: 38374}, 38380, 38399, 38407, 38419, 38424, 38427, 38430, 38432,
+    {f: 7, c: 38435}, {f: 3, c: 38443}, {f: 2, c: 38447}, {f: 4, c: 38455},
+    38462, 38465, 38467, 38474, {f: 2, c: 38478}, {f: 3, c: 38481},
+    {f: 2, c: 38486}, {f: 2, c: 38489}, 38492, 38494, 38496, {f: 2, c: 38501},
+    38507, {f: 3, c: 38509}, 38513, {f: 4, c: 38521}, {f: 7, c: 38526}, 38535,
+    38537, 38540, {f: 3, c: 38545}, 38550, 38554, {f: 10, c: 38557}, 38569,
+    {f: 5, c: 38571}, 38578, 38581, 38583, 38586, 38591, {f: 2, c: 38594},
+    38600, {f: 2, c: 38602}, {f: 2, c: 38608}, {f: 2, c: 38611},
+    {f: 2, c: 38615}, 38618, {f: 3, c: 38621}, 38625, {f: 4, c: 38628},
+    {f: 4, c: 38635}, {f: 2, c: 38640}, {f: 2, c: 38644}, 38648, 38650,
+    {f: 2, c: 38652}, 38655, {f: 2, c: 38658}, 38661, {f: 3, c: 38666},
+    {f: 3, c: 38672}, {f: 2, c: 38676}, {f: 5, c: 38679}, 38685,
+    {f: 8, c: 38687}, {f: 2, c: 38696}, {f: 2, c: 38699}, {f: 2, c: 38702},
+    38705, {f: 5, c: 38707}, {f: 3, c: 38714}, {f: 3, c: 38719}, 38723,
+    {f: 3, c: 38725}, {f: 8, c: 38729}, [12205, 38737], {f: 2, c: 38740},
+    {f: 2, c: 38743}, {f: 2, c: 38748}, 38751, {f: 2, c: 38755},
+    {f: 2, c: 38758}, {f: 9, c: 38762}, 38773, {f: 5, c: 38775},
+    {f: 8, c: 38781}, {f: 5, c: 38790}, 38796, 38798, 38800, 38803,
+    {f: 3, c: 38805}, {f: 7, c: 38809}, {f: 2, c: 38817}, {f: 2, c: 38820},
+    {f: 4, c: 38823}, 38828, 38830, {f: 2, c: 38832}, 38835, {f: 8, c: 38837},
+    {f: 5, c: 38846}, {f: 2, c: 38852}, {f: 2, c: 38855}, 38858,
+    {f: 6, c: 38861}, {f: 5, c: 38868}, {f: 2, c: 38874}, 38877,
+    {f: 7, c: 38879}, 38888, {f: 5, c: 38894}, 38900, {f: 8, c: 38903}, 38912,
+    38916, 38921, 38923, 38925, {f: 3, c: 38932}, {f: 3, c: 38937},
+    {f: 4, c: 38941}, {f: 2, c: 38946}, 38949, {f: 6, c: 38951},
+    {f: 2, c: 38958}, {f: 6, c: 38961}, {f: 2, c: 38969}, 38972,
+    {f: 8, c: 38974}, {f: 5, c: 38983}, {f: 4, c: 38991}, {f: 3, c: 38997},
+    39002, {f: 2, c: 39004}, {f: 3, c: 39007}, {f: 2, c: 39011}, 39014,
+    {f: 3, c: 39016}, {f: 2, c: 39021}, 39026, 39051, 39054, 39058, 39061,
+    39065, 39075, {f: 5, c: 39081}, 39088, 39090, {f: 2, c: 39092},
+    {f: 5, c: 39095}, {f: 7, c: 39101}, 39109, 39111, {f: 5, c: 39113},
+    {f: 2, c: 39119}, 39124, {f: 2, c: 39126}, {f: 2, c: 39132}, 39137,
+    {f: 4, c: 39139}, 39148, 39150, {f: 2, c: 39152}, 39155, {f: 7, c: 39157},
+    {f: 4, c: 39167}, 39172, {f: 3, c: 39174}, 39179, {f: 2, c: 39182},
+    {f: 4, c: 39188}, {f: 2, c: 39193}, {f: 2, c: 39196}, {f: 2, c: 39199},
+    {f: 6, c: 39202}, {f: 5, c: 39209}, {f: 4, c: 39215}, {f: 3, c: 39220},
+    {f: 4, c: 39224}, 39229, {f: 3, c: 39232}, 39236, {f: 2, c: 39238},
+    {f: 4, c: 39245}, 39251, 39254, {f: 4, c: 39256}, 39261, {f: 3, c: 39263},
+    39268, 39270, 39283, {f: 2, c: 39288}, 39291, 39294, {f: 2, c: 39298},
+    39305, 39308, 39310, {f: 11, c: 39322}, {f: 2, c: 39334}, {f: 3, c: 39337},
+    {f: 2, c: 39343}, 39346, {f: 12, c: 39349}, {f: 14, c: 39362}, 39379,
+    {f: 2, c: 39382}, 39386, 39388, 39390, 39392, {f: 10, c: 39395},
+    {f: 3, c: 39406}, {f: 13, c: 39410}, 39424, {f: 3, c: 39426},
+    {f: 7, c: 39430}, {f: 6, c: 39440}, {f: 2, c: 39447}, {f: 17, c: 39450},
+    39468, 39471, {f: 5, c: 39473}, {f: 5, c: 39481}, 39487, {f: 4, c: 39494},
+    {f: 2, c: 39499}, 39502, {f: 5, c: 39504}, 39510, {f: 2, c: 39512},
+    {f: 3, c: 39516}, {f: 2, c: 39520}, 39523, {f: 4, c: 39526}, 39531, 39538,
+    39555, 39561, {f: 2, c: 39565}, {f: 2, c: 39572}, 39577, 39590,
+    {f: 6, c: 39593}, {f: 4, c: 39602}, 39609, 39611, {f: 3, c: 39613},
+    {f: 2, c: 39619}, {f: 5, c: 39622}, {f: 2, c: 39629}, 39632, 39639,
+    {f: 6, c: 39641}, 39648, {f: 4, c: 39650}, {f: 4, c: 39655}, 39660,
+    {f: 9, c: 39664}, 39674, {f: 7, c: 39676}, {f: 2, c: 39684}, 39687,
+    {f: 4, c: 39689}, 39694, {f: 3, c: 39696}, {f: 6, c: 39700},
+    {f: 4, c: 39707}, {f: 2, c: 39712}, 39716, 39718, 39720, {f: 4, c: 39722},
+    39728, {f: 8, c: 39731}, {f: 4, c: 39741}, 39750, {f: 3, c: 39754}, 39760,
+    {f: 2, c: 39762}, {f: 3, c: 39765}, 39769, {f: 20, c: 39771},
+    {f: 4, c: 39792}, {f: 2, c: 39797}, {f: 9, c: 39800}, 39810,
+    {f: 10, c: 39812}, 39823, {f: 7, c: 39827}, {f: 2, c: 39835},
+    {f: 11, c: 39839}, 39852, {f: 17, c: 39855}, {f: 5, c: 39874}, 39880,
+    {f: 9, c: 39883}, 39893, {f: 4, c: 39895}, 39900, {f: 3, c: 39902}, 39907,
+    {f: 2, c: 39909}, 39913, {f: 4, c: 39916}, {f: 3, c: 39921},
+    {f: 8, c: 39925}, 39934, {f: 8, c: 39936}, {f: 3, c: 39946},
+    {f: 2, c: 39950}, 39953, {f: 12, c: 39956}, {f: 2, c: 39969}, 39972,
+    {f: 2, c: 39974}, {f: 3, c: 39978}, {f: 3, c: 39982}, 39988, 39990, 39992,
+    39994, {f: 2, c: 39996}, {f: 6, c: 39999}, {f: 2, c: 40006},
+    {f: 8, c: 40010}, 40019, 40021, {f: 4, c: 40025}, 40030, {f: 7, c: 40032},
+    {f: 5, c: 40040}, {f: 10, c: 40046}, 40057, 40059, {f: 2, c: 40061}, 40064,
+    {f: 2, c: 40067}, {f: 2, c: 40073}, 40076, 40079, 40083, {f: 4, c: 40086},
+    40093, 40106, 40108, 40111, 40121, {f: 5, c: 40126}, {f: 2, c: 40136},
+    {f: 2, c: 40145}, {f: 2, c: 40154}, {f: 2, c: 40160}, {f: 2, c: 40163},
+    {f: 3, c: 40166}, {f: 2, c: 40170}, {f: 6, c: 40173}, 40181,
+    {f: 15, c: 40183}, 40200, {f: 11, c: 40202}, {f: 5, c: 40214}, 40220,
+    40222, {f: 3, c: 40224}, {f: 2, c: 40228}, 40231, {f: 6, c: 40233},
+    {f: 10, c: 40241}, {f: 3, c: 40252}, {f: 2, c: 40256}, {f: 14, c: 40259},
+    {f: 8, c: 40276}, {f: 2, c: 40286}, {f: 8, c: 40290}, 40299,
+    {f: 2, c: 40301}, {f: 2, c: 40304}, {f: 20, c: 40307}, 40328,
+    {f: 9, c: 40330}, {f: 4, c: 40340}, 40345, {f: 10, c: 40347},
+    {f: 3, c: 40358}, {f: 5, c: 40362}, {f: 4, c: 40368}, {f: 6, c: 40373},
+    {f: 3, c: 40381}, 40385, 40387, {f: 14, c: 40389}, {f: 3, c: 40404}, 40408,
+    {f: 10, c: 40411}, {f: 8, c: 40423}, {f: 2, c: 40432}, {f: 4, c: 40436},
+    {f: 17, c: 40443}, {f: 8, c: 40461}, {f: 4, c: 40470}, 40476, 40484, 40487,
+    40494, 40496, 40500, {f: 2, c: 40507}, 40512, 40525, 40528,
+    {f: 3, c: 40530}, 40534, 40537, 40541, {f: 4, c: 40543}, 40549,
+    {f: 2, c: 40558}, 40562, 40564, {f: 3, c: 40566}, 40571, {f: 2, c: 40576},
+    {f: 4, c: 40579}, {f: 2, c: 40585}, {f: 6, c: 40588}, {f: 3, c: 40596},
+    {f: 5, c: 40600}, 40606, {f: 5, c: 40608}, {f: 2, c: 40615},
+    {f: 5, c: 40618}, {f: 4, c: 40624}, {f: 2, c: 40630}, {f: 2, c: 40633},
+    40636, {f: 4, c: 40639}, [12232, 40643], {f: 4, c: 40645},
+    {f: 2, c: 40650}, 40656, {f: 2, c: 40658}, {f: 3, c: 40661},
+    {f: 2, c: 40665}, 40673, {f: 2, c: 40675}, 40678, {f: 4, c: 40683},
+    {f: 2, c: 40688}, 40691, {f: 2, c: 40693}, 40696, 40698, {f: 9, c: 40704},
+    40714, 40716, 40719, {f: 2, c: 40721}, 40724, 40726, 40728,
+    {f: 6, c: 40730}, 40737, {f: 9, c: 40739}, {f: 2, c: 40749},
+    {f: 7, c: 40752}, 40760, 40762, 40764, {f: 5, c: 40767}, {f: 5, c: 40773},
+    {f: 3, c: 40780}, 40787, {f: 4, c: 40789}, {f: 2, c: 40794},
+    {f: 2, c: 40797}, 40802, {f: 2, c: 40804}, {f: 3, c: 40807}, 40811,
+    {f: 5, c: 40813}, {f: 4, c: 40819}, {f: 7, c: 40824}, {f: 2, c: 40833},
+    {f: 2, c: 40846}, {f: 3, c: 40849}, {f: 3, c: 40854}, {f: 2, c: 40861},
+    {f: 5, c: 40865}, 63788, {f: 3, c: 64013}, 64017, {f: 2, c: 64019}, 64024,
+    {f: 3, c: 64031}, {f: 2, c: 64035}, {f: 3, c: 64039}, 11905,
+    [59414, 131207], [59415, 131209], [59416, 131276], 11908, 13427, 13383,
+    11912, 11915, 59422, 13726, 13850, 13838, 11916, 11927, 14702, 14616,
+    59430, 14799, 14815, 14963, 14800, {f: 2, c: 59435}, 15182, 15470, 15584,
+    11943, [59441, 136663], 59442, 11946, 16470, 16735, 11950, 17207, 11955,
+    {f: 2, c: 11958}, [59451, 141711], 17329, 17324, 11963, 17373, 17622,
+    18017, 17996, [59459, 132361], 18211, 18217, 18300, 18317, 11978, 18759,
+    18810, 18813, {f: 2, c: 18818}, {f: 2, c: 18821}, 18847, 18843, 18871,
+    18870, [59476, 133533], [59477, 147966], 19619, {f: 3, c: 19615}, 19575,
+    19618, {f: 7, c: 19731}, 19886, 59492, {s: 226}, 8364, 165, 0, 0, 12351,
+    {s: 17}, 12436, {s: 14}, 12535, 12537, 12536, 12538, 0, {f: 3, c: 12339},
+    {f: 3, c: 12344}, {f: 3, c: 12586}, {f: 24, c: 12704}, 11904,
+    {f: 2, c: 11906}, {f: 3, c: 11909}, {f: 2, c: 11913}, {f: 10, c: 11917},
+    {f: 2, c: 11928}, {f: 12, c: 11931}, {f: 2, c: 11944}, {f: 3, c: 11947},
+    {f: 4, c: 11951}, {f: 2, c: 11956}, {f: 3, c: 11960}, {f: 14, c: 11964},
+    {f: 41, c: 11979}, {f: 71, c: 13312}, {f: 43, c: 13384},
+    {f: 298, c: 13428}, {f: 111, c: 13727}, {f: 11, c: 13839},
+    {f: 765, c: 13851}, {f: 85, c: 14617}, {f: 96, c: 14703},
+    {f: 14, c: 14801}, {f: 147, c: 14816}, {f: 218, c: 14964},
+    {f: 287, c: 15183}, {f: 113, c: 15471}, {f: 885, c: 15585},
+    {f: 264, c: 16471}, {f: 471, c: 16736}, {f: 116, c: 17208},
+    {f: 4, c: 17325}, {f: 43, c: 17330}, {f: 248, c: 17374},
+    {f: 373, c: 17623}, {f: 20, c: 17997}, {f: 193, c: 18018},
+    {f: 5, c: 18212}, {f: 82, c: 18218}, {f: 16, c: 18301}, {f: 441, c: 18318},
+    {f: 50, c: 18760}, {f: 2, c: 18811}, {f: 4, c: 18814}, 18820,
+    {f: 20, c: 18823}, {f: 3, c: 18844}, {f: 22, c: 18848}, {f: 703, c: 18872},
+    {f: 39, c: 19576}, {f: 111, c: 19620}, {f: 148, c: 19738},
+    {f: 7, c: 19887}]
+};
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/colorspace.js b/apps/files_pdfviewer/js/pdfjs/src/colorspace.js
new file mode 100755
index 00000000000..b369d0f884f
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/colorspace.js
@@ -0,0 +1,411 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var ColorSpace = (function colorSpaceColorSpace() {
+  // Constructor should define this.numComps, this.defaultColor, this.name
+  function constructor() {
+    error('should not call ColorSpace constructor');
+  }
+
+  constructor.prototype = {
+    // Input: array of size numComps representing color component values
+    // Output: array of rgb values, each value ranging from [0.1]
+    getRgb: function colorSpaceGetRgb(color) {
+      error('Should not call ColorSpace.getRgb: ' + color);
+    },
+    // Input: Uint8Array of component values, each value scaled to [0,255]
+    // Output: Uint8Array of rgb values, each value scaled to [0,255]
+    getRgbBuffer: function colorSpaceGetRgbBuffer(input) {
+      error('Should not call ColorSpace.getRgbBuffer: ' + input);
+    }
+  };
+
+  constructor.parse = function colorSpaceParse(cs, xref, res) {
+    var IR = constructor.parseToIR(cs, xref, res);
+    if (IR instanceof AlternateCS)
+      return IR;
+
+    return constructor.fromIR(IR);
+  };
+
+  constructor.fromIR = function colorSpaceFromIR(IR) {
+    var name = isArray(IR) ? IR[0] : IR;
+
+    switch (name) {
+      case 'DeviceGrayCS':
+        return new DeviceGrayCS();
+      case 'DeviceRgbCS':
+        return new DeviceRgbCS();
+      case 'DeviceCmykCS':
+        return new DeviceCmykCS();
+      case 'PatternCS':
+        var basePatternCS = IR[1];
+        if (basePatternCS)
+          basePatternCS = ColorSpace.fromIR(basePatternCS);
+        return new PatternCS(basePatternCS);
+      case 'IndexedCS':
+        var baseIndexedCS = IR[1];
+        var hiVal = IR[2];
+        var lookup = IR[3];
+        return new IndexedCS(ColorSpace.fromIR(baseIndexedCS), hiVal, lookup);
+      case 'AlternateCS':
+        var numComps = IR[1];
+        var alt = IR[2];
+        var tintFnIR = IR[3];
+
+        return new AlternateCS(numComps, ColorSpace.fromIR(alt),
+                                PDFFunction.fromIR(tintFnIR));
+      default:
+        error('Unkown name ' + name);
+    }
+    return null;
+  };
+
+  constructor.parseToIR = function colorSpaceParseToIR(cs, xref, res) {
+    if (isName(cs)) {
+      var colorSpaces = xref.fetchIfRef(res.get('ColorSpace'));
+      if (isDict(colorSpaces)) {
+        var refcs = colorSpaces.get(cs.name);
+        if (refcs)
+          cs = refcs;
+      }
+    }
+
+    cs = xref.fetchIfRef(cs);
+    var mode;
+
+    if (isName(cs)) {
+      mode = cs.name;
+      this.mode = mode;
+
+      switch (mode) {
+        case 'DeviceGray':
+        case 'G':
+          return 'DeviceGrayCS';
+        case 'DeviceRGB':
+        case 'RGB':
+          return 'DeviceRgbCS';
+        case 'DeviceCMYK':
+        case 'CMYK':
+          return 'DeviceCmykCS';
+        case 'Pattern':
+          return ['PatternCS', null];
+        default:
+          error('unrecognized colorspace ' + mode);
+      }
+    } else if (isArray(cs)) {
+      mode = cs[0].name;
+      this.mode = mode;
+
+      switch (mode) {
+        case 'DeviceGray':
+        case 'G':
+          return 'DeviceGrayCS';
+        case 'DeviceRGB':
+        case 'RGB':
+          return 'DeviceRgbCS';
+        case 'DeviceCMYK':
+        case 'CMYK':
+          return 'DeviceCmykCS';
+        case 'CalGray':
+          return 'DeviceGrayCS';
+        case 'CalRGB':
+          return 'DeviceRgbCS';
+        case 'ICCBased':
+          var stream = xref.fetchIfRef(cs[1]);
+          var dict = stream.dict;
+          var numComps = dict.get('N');
+          if (numComps == 1)
+            return 'DeviceGrayCS';
+          if (numComps == 3)
+            return 'DeviceRgbCS';
+          if (numComps == 4)
+            return 'DeviceCmykCS';
+          break;
+        case 'Pattern':
+          var basePatternCS = cs[1];
+          if (basePatternCS)
+            basePatternCS = ColorSpace.parseToIR(basePatternCS, xref, res);
+          return ['PatternCS', basePatternCS];
+        case 'Indexed':
+          var baseIndexedCS = ColorSpace.parseToIR(cs[1], xref, res);
+          var hiVal = cs[2] + 1;
+          var lookup = xref.fetchIfRef(cs[3]);
+          return ['IndexedCS', baseIndexedCS, hiVal, lookup];
+        case 'Separation':
+        case 'DeviceN':
+          var name = cs[1];
+          var numComps = 1;
+          if (isName(name))
+            numComps = 1;
+          else if (isArray(name))
+            numComps = name.length;
+          var alt = ColorSpace.parseToIR(cs[2], xref, res);
+          var tintFnIR = PDFFunction.getIR(xref, xref.fetchIfRef(cs[3]));
+          return ['AlternateCS', numComps, alt, tintFnIR];
+        case 'Lab':
+        default:
+          error('unimplemented color space object "' + mode + '"');
+      }
+    } else {
+      error('unrecognized color space object: "' + cs + '"');
+    }
+    return null;
+  };
+
+  return constructor;
+})();
+
+/**
+ * Alternate color space handles both Separation and DeviceN color spaces.  A
+ * Separation color space is actually just a DeviceN with one color component.
+ * Both color spaces use a tinting function to convert colors to a base color
+ * space.
+ */
+var AlternateCS = (function alternateCS() {
+  function constructor(numComps, base, tintFn) {
+    this.name = 'Alternate';
+    this.numComps = numComps;
+    this.defaultColor = [];
+    for (var i = 0; i < numComps; ++i)
+      this.defaultColor.push(1);
+    this.base = base;
+    this.tintFn = tintFn;
+  }
+
+  constructor.prototype = {
+    getRgb: function altcs_getRgb(color) {
+      var tinted = this.tintFn(color);
+      return this.base.getRgb(tinted);
+    },
+    getRgbBuffer: function altcs_getRgbBuffer(input, bits) {
+      var tintFn = this.tintFn;
+      var base = this.base;
+      var scale = 1 / ((1 << bits) - 1);
+      var length = input.length;
+      var pos = 0;
+      var baseNumComps = base.numComps;
+      var baseBuf = new Uint8Array(baseNumComps * length);
+      var numComps = this.numComps;
+      var scaled = new Array(numComps);
+
+      for (var i = 0; i < length; i += numComps) {
+        for (var z = 0; z < numComps; ++z)
+          scaled[z] = input[i + z] * scale;
+
+        var tinted = tintFn(scaled);
+        for (var j = 0; j < baseNumComps; ++j)
+          baseBuf[pos++] = 255 * tinted[j];
+      }
+      return base.getRgbBuffer(baseBuf, 8);
+    }
+  };
+
+  return constructor;
+})();
+
+var PatternCS = (function patternCS() {
+  function constructor(baseCS) {
+    this.name = 'Pattern';
+    this.base = baseCS;
+  }
+  constructor.prototype = {};
+
+  return constructor;
+})();
+
+var IndexedCS = (function indexedCS() {
+  function constructor(base, highVal, lookup) {
+    this.name = 'Indexed';
+    this.numComps = 1;
+    this.defaultColor = [0];
+    this.base = base;
+    this.highVal = highVal;
+
+    var baseNumComps = base.numComps;
+    var length = baseNumComps * highVal;
+    var lookupArray = new Uint8Array(length);
+
+    if (isStream(lookup)) {
+      var bytes = lookup.getBytes(length);
+      lookupArray.set(bytes);
+    } else if (isString(lookup)) {
+      for (var i = 0; i < length; ++i)
+        lookupArray[i] = lookup.charCodeAt(i);
+    } else {
+      error('Unrecognized lookup table: ' + lookup);
+    }
+    this.lookup = lookupArray;
+  }
+
+  constructor.prototype = {
+    getRgb: function indexcs_getRgb(color) {
+      var numComps = this.base.numComps;
+      var start = color[0] * numComps;
+      var c = [];
+
+      for (var i = start, ii = start + numComps; i < ii; ++i)
+        c.push(this.lookup[i]);
+
+      return this.base.getRgb(c);
+    },
+    getRgbBuffer: function indexcs_getRgbBuffer(input) {
+      var base = this.base;
+      var numComps = base.numComps;
+      var lookup = this.lookup;
+      var length = input.length;
+      var baseBuf = new Uint8Array(length * numComps);
+      var baseBufPos = 0;
+
+      for (var i = 0; i < length; ++i) {
+        var lookupPos = input[i] * numComps;
+        for (var j = 0; j < numComps; ++j) {
+          baseBuf[baseBufPos++] = lookup[lookupPos + j];
+        }
+      }
+
+      return base.getRgbBuffer(baseBuf, 8);
+    }
+  };
+  return constructor;
+})();
+
+var DeviceGrayCS = (function deviceGrayCS() {
+  function constructor() {
+    this.name = 'DeviceGray';
+    this.numComps = 1;
+    this.defaultColor = [0];
+  }
+
+  constructor.prototype = {
+    getRgb: function graycs_getRgb(color) {
+      var c = color[0];
+      return [c, c, c];
+    },
+    getRgbBuffer: function graycs_getRgbBuffer(input, bits) {
+      var scale = 255 / ((1 << bits) - 1);
+      var length = input.length;
+      var rgbBuf = new Uint8Array(length * 3);
+      for (var i = 0, j = 0; i < length; ++i) {
+        var c = (scale * input[i]) | 0;
+        rgbBuf[j++] = c;
+        rgbBuf[j++] = c;
+        rgbBuf[j++] = c;
+      }
+      return rgbBuf;
+    }
+  };
+  return constructor;
+})();
+
+var DeviceRgbCS = (function deviceRgbCS() {
+  function constructor() {
+    this.name = 'DeviceRGB';
+    this.numComps = 3;
+    this.defaultColor = [0, 0, 0];
+  }
+  constructor.prototype = {
+    getRgb: function rgbcs_getRgb(color) {
+      return color;
+    },
+    getRgbBuffer: function rgbcs_getRgbBuffer(input, bits) {
+      if (bits == 8)
+        return input;
+      var scale = 255 / ((1 << bits) - 1);
+      var i, length = input.length;
+      var rgbBuf = new Uint8Array(length);
+      for (i = 0; i < length; ++i)
+        rgbBuf[i] = (scale * input[i]) | 0;
+      return rgbBuf;
+    }
+  };
+  return constructor;
+})();
+
+var DeviceCmykCS = (function deviceCmykCS() {
+  function constructor() {
+    this.name = 'DeviceCMYK';
+    this.numComps = 4;
+    this.defaultColor = [0, 0, 0, 1];
+  }
+  constructor.prototype = {
+    getRgb: function cmykcs_getRgb(color) {
+      var c = color[0], m = color[1], y = color[2], k = color[3];
+      var c1 = 1 - c, m1 = 1 - m, y1 = 1 - y, k1 = 1 - k;
+
+      var x, r, g, b;
+      // this is a matrix multiplication, unrolled for performance
+      // code is taken from the poppler implementation
+      x = c1 * m1 * y1 * k1; // 0 0 0 0
+      r = g = b = x;
+      x = c1 * m1 * y1 * k;  // 0 0 0 1
+      r += 0.1373 * x;
+      g += 0.1216 * x;
+      b += 0.1255 * x;
+      x = c1 * m1 * y * k1;  // 0 0 1 0
+      r += x;
+      g += 0.9490 * x;
+      x = c1 * m1 * y * k;   // 0 0 1 1
+      r += 0.1098 * x;
+      g += 0.1020 * x;
+      x = c1 * m * y1 * k1;  // 0 1 0 0
+      r += 0.9255 * x;
+      b += 0.5490 * x;
+      x = c1 * m * y1 * k;   // 0 1 0 1
+      r += 0.1412 * x;
+      x = c1 * m * y * k1;   // 0 1 1 0
+      r += 0.9294 * x;
+      g += 0.1098 * x;
+      b += 0.1412 * x;
+      x = c1 * m * y * k;    // 0 1 1 1
+      r += 0.1333 * x;
+      x = c * m1 * y1 * k1;  // 1 0 0 0
+      g += 0.6784 * x;
+      b += 0.9373 * x;
+      x = c * m1 * y1 * k;   // 1 0 0 1
+      g += 0.0588 * x;
+      b += 0.1412 * x;
+      x = c * m1 * y * k1;   // 1 0 1 0
+      g += 0.6510 * x;
+      b += 0.3137 * x;
+      x = c * m1 * y * k;    // 1 0 1 1
+      g += 0.0745 * x;
+      x = c * m * y1 * k1;   // 1 1 0 0
+      r += 0.1804 * x;
+      g += 0.1922 * x;
+      b += 0.5725 * x;
+      x = c * m * y1 * k;    // 1 1 0 1
+      b += 0.0078 * x;
+      x = c * m * y * k1;    // 1 1 1 0
+      r += 0.2118 * x;
+      g += 0.2119 * x;
+      b += 0.2235 * x;
+
+      return [r, g, b];
+    },
+    getRgbBuffer: function cmykcs_getRgbBuffer(colorBuf, bits) {
+      var scale = 1 / ((1 << bits) - 1);
+      var length = colorBuf.length / 4;
+      var rgbBuf = new Uint8Array(length * 3);
+      var rgbBufPos = 0;
+      var colorBufPos = 0;
+
+      for (var i = 0; i < length; i++) {
+        var cmyk = [];
+        for (var j = 0; j < 4; ++j)
+          cmyk.push(scale * colorBuf[colorBufPos++]);
+
+        var rgb = this.getRgb(cmyk);
+        for (var j = 0; j < 3; ++j)
+          rgbBuf[rgbBufPos++] = Math.round(rgb[j] * 255);
+      }
+
+      return rgbBuf;
+    }
+  };
+
+  return constructor;
+})();
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/core.js b/apps/files_pdfviewer/js/pdfjs/src/core.js
new file mode 100755
index 00000000000..3549eb906b6
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/core.js
@@ -0,0 +1,652 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var globalScope = (typeof window === 'undefined') ? this : window;
+
+var ERRORS = 0, WARNINGS = 1, TODOS = 5;
+var verbosity = WARNINGS;
+
+// The global PDFJS object exposes the API
+// In production, it will be declared outside a global wrapper
+// In development, it will be declared here
+if (!globalScope.PDFJS) {
+  globalScope.PDFJS = {};
+}
+
+// getPdf()
+// Convenience function to perform binary Ajax GET
+// Usage: getPdf('http://...', callback)
+//        getPdf({
+//                 url:String ,
+//                 [,progress:Function, error:Function]
+//               },
+//               callback)
+function getPdf(arg, callback) {
+  var params = arg;
+  if (typeof arg === 'string')
+    params = { url: arg };
+
+  var xhr = new XMLHttpRequest();
+  xhr.open('GET', params.url);
+  xhr.mozResponseType = xhr.responseType = 'arraybuffer';
+  xhr.expected = (document.URL.indexOf('file:') === 0) ? 0 : 200;
+
+  if ('progress' in params)
+    xhr.onprogress = params.progress || undefined;
+
+  if ('error' in params)
+    xhr.onerror = params.error || undefined;
+
+  xhr.onreadystatechange = function getPdfOnreadystatechange() {
+    if (xhr.readyState === 4 && xhr.status === xhr.expected) {
+      var data = (xhr.mozResponseArrayBuffer || xhr.mozResponse ||
+                  xhr.responseArrayBuffer || xhr.response);
+      callback(data);
+    }
+  };
+  xhr.send(null);
+}
+globalScope.PDFJS.getPdf = getPdf;
+
+var Page = (function pagePage() {
+  function constructor(xref, pageNumber, pageDict, ref) {
+    this.pageNumber = pageNumber;
+    this.pageDict = pageDict;
+    this.stats = {
+      create: Date.now(),
+      compile: 0.0,
+      fonts: 0.0,
+      images: 0.0,
+      render: 0.0
+    };
+    this.xref = xref;
+    this.ref = ref;
+  }
+
+  constructor.prototype = {
+    getPageProp: function pageGetPageProp(key) {
+      return this.xref.fetchIfRef(this.pageDict.get(key));
+    },
+    inheritPageProp: function pageInheritPageProp(key) {
+      var dict = this.pageDict;
+      var obj = dict.get(key);
+      while (obj === undefined) {
+        dict = this.xref.fetchIfRef(dict.get('Parent'));
+        if (!dict)
+          break;
+        obj = dict.get(key);
+      }
+      return obj;
+    },
+    get content() {
+      return shadow(this, 'content', this.getPageProp('Contents'));
+    },
+    get resources() {
+      return shadow(this, 'resources', this.inheritPageProp('Resources'));
+    },
+    get mediaBox() {
+      var obj = this.inheritPageProp('MediaBox');
+      // Reset invalid media box to letter size.
+      if (!isArray(obj) || obj.length !== 4)
+        obj = [0, 0, 612, 792];
+      return shadow(this, 'mediaBox', obj);
+    },
+    get view() {
+      var obj = this.inheritPageProp('CropBox');
+      var view = {
+        x: 0,
+        y: 0,
+        width: this.width,
+        height: this.height
+      };
+      if (isArray(obj) && obj.length == 4) {
+        var tl = this.rotatePoint(obj[0], obj[1]);
+        var br = this.rotatePoint(obj[2], obj[3]);
+        view.x = Math.min(tl.x, br.x);
+        view.y = Math.min(tl.y, br.y);
+        view.width = Math.abs(tl.x - br.x);
+        view.height = Math.abs(tl.y - br.y);
+      }
+
+      return shadow(this, 'cropBox', view);
+    },
+    get annotations() {
+      return shadow(this, 'annotations', this.inheritPageProp('Annots'));
+    },
+    get width() {
+      var mediaBox = this.mediaBox;
+      var rotate = this.rotate;
+      var width;
+      if (rotate == 0 || rotate == 180) {
+        width = (mediaBox[2] - mediaBox[0]);
+      } else {
+        width = (mediaBox[3] - mediaBox[1]);
+      }
+      return shadow(this, 'width', width);
+    },
+    get height() {
+      var mediaBox = this.mediaBox;
+      var rotate = this.rotate;
+      var height;
+      if (rotate == 0 || rotate == 180) {
+        height = (mediaBox[3] - mediaBox[1]);
+      } else {
+        height = (mediaBox[2] - mediaBox[0]);
+      }
+      return shadow(this, 'height', height);
+    },
+    get rotate() {
+      var rotate = this.inheritPageProp('Rotate') || 0;
+      // Normalize rotation so it's a multiple of 90 and between 0 and 270
+      if (rotate % 90 != 0) {
+        rotate = 0;
+      } else if (rotate >= 360) {
+        rotate = rotate % 360;
+      } else if (rotate < 0) {
+        // The spec doesn't cover negatives, assume its counterclockwise
+        // rotation. The following is the other implementation of modulo.
+        rotate = ((rotate % 360) + 360) % 360;
+      }
+      return shadow(this, 'rotate', rotate);
+    },
+
+    startRenderingFromIRQueue: function pageStartRenderingFromIRQueue(
+                                                IRQueue, fonts) {
+      var self = this;
+      this.IRQueue = IRQueue;
+      var gfx = new CanvasGraphics(this.ctx, this.objs);
+
+      var displayContinuation = function pageDisplayContinuation() {
+        // Always defer call to display() to work around bug in
+        // Firefox error reporting from XHR callbacks.
+        setTimeout(function pageSetTimeout() {
+          try {
+            self.display(gfx, self.callback);
+          } catch (e) {
+            if (self.callback) self.callback(e.toString());
+            throw e;
+          }
+        });
+      };
+
+      this.ensureFonts(fonts,
+                       function pageStartRenderingFromIRQueueEnsureFonts() {
+        displayContinuation();
+      });
+    },
+
+    getIRQueue: function pageGetIRQueue(handler, dependency) {
+      if (this.IRQueue) {
+        // content was compiled
+        return this.IRQueue;
+      }
+
+      var xref = this.xref;
+      var content = xref.fetchIfRef(this.content);
+      var resources = xref.fetchIfRef(this.resources);
+      if (isArray(content)) {
+        // fetching items
+        var i, n = content.length;
+        for (i = 0; i < n; ++i)
+          content[i] = xref.fetchIfRef(content[i]);
+        content = new StreamsSequenceStream(content);
+      }
+
+      var pe = this.pe = new PartialEvaluator(
+                                xref, handler, 'p' + this.pageNumber + '_');
+      var IRQueue = {};
+      return (this.IRQueue = pe.getIRQueue(content, resources, IRQueue,
+                                           dependency));
+    },
+
+    ensureFonts: function pageEnsureFonts(fonts, callback) {
+      // Convert the font names to the corresponding font obj.
+      for (var i = 0, ii = fonts.length; i < ii; i++) {
+        fonts[i] = this.objs.objs[fonts[i]].data;
+      }
+
+      // Load all the fonts
+      var fontObjs = FontLoader.bind(
+        fonts,
+        function pageEnsureFontsFontObjs(fontObjs) {
+          this.stats.fonts = Date.now();
+
+          callback.call(this);
+        }.bind(this),
+        this.objs
+      );
+    },
+
+    display: function pageDisplay(gfx, callback) {
+      var xref = this.xref;
+      var resources = xref.fetchIfRef(this.resources);
+      var mediaBox = xref.fetchIfRef(this.mediaBox);
+      assertWellFormed(isDict(resources), 'invalid page resources');
+
+      gfx.xref = xref;
+      gfx.res = resources;
+      gfx.beginDrawing({ x: mediaBox[0], y: mediaBox[1],
+            width: this.width,
+            height: this.height,
+            rotate: this.rotate });
+
+      var startIdx = 0;
+      var length = this.IRQueue.fnArray.length;
+      var IRQueue = this.IRQueue;
+
+      var self = this;
+      function next() {
+        startIdx = gfx.executeIRQueue(IRQueue, startIdx, next);
+        if (startIdx == length) {
+          self.stats.render = Date.now();
+          if (callback) callback();
+        }
+      }
+      next();
+    },
+    rotatePoint: function pageRotatePoint(x, y, reverse) {
+      var rotate = reverse ? (360 - this.rotate) : this.rotate;
+      switch (rotate) {
+        case 180:
+          return {x: this.width - x, y: y};
+        case 90:
+          return {x: this.width - y, y: this.height - x};
+        case 270:
+          return {x: y, y: x};
+        case 360:
+        case 0:
+        default:
+          return {x: x, y: this.height - y};
+      }
+    },
+    getLinks: function pageGetLinks() {
+      var xref = this.xref;
+      var annotations = xref.fetchIfRef(this.annotations) || [];
+      var i, n = annotations.length;
+      var links = [];
+      for (i = 0; i < n; ++i) {
+        var annotation = xref.fetch(annotations[i]);
+        if (!isDict(annotation))
+          continue;
+        var subtype = annotation.get('Subtype');
+        if (!isName(subtype) || subtype.name != 'Link')
+          continue;
+        var rect = annotation.get('Rect');
+        var topLeftCorner = this.rotatePoint(rect[0], rect[1]);
+        var bottomRightCorner = this.rotatePoint(rect[2], rect[3]);
+
+        var link = {};
+        link.x = Math.min(topLeftCorner.x, bottomRightCorner.x);
+        link.y = Math.min(topLeftCorner.y, bottomRightCorner.y);
+        link.width = Math.abs(topLeftCorner.x - bottomRightCorner.x);
+        link.height = Math.abs(topLeftCorner.y - bottomRightCorner.y);
+        var a = this.xref.fetchIfRef(annotation.get('A'));
+        if (a) {
+          switch (a.get('S').name) {
+            case 'URI':
+              link.url = a.get('URI');
+              break;
+            case 'GoTo':
+              link.dest = a.get('D');
+              break;
+            default:
+              TODO('other link types');
+          }
+        } else if (annotation.has('Dest')) {
+          // simple destination link
+          var dest = annotation.get('Dest');
+          link.dest = isName(dest) ? dest.name : dest;
+        }
+        links.push(link);
+      }
+      return links;
+    },
+    startRendering: function pageStartRendering(ctx, callback)  {
+      this.ctx = ctx;
+      this.callback = callback;
+
+      this.startRenderingTime = Date.now();
+      this.pdf.startRendering(this);
+    }
+  };
+
+  return constructor;
+})();
+
+/**
+ * The `PDFDocModel` holds all the data of the PDF file. Compared to the
+ * `PDFDoc`, this one doesn't have any job management code.
+ * Right now there exists one PDFDocModel on the main thread + one object
+ * for each worker. If there is no worker support enabled, there are two
+ * `PDFDocModel` objects on the main thread created.
+ * TODO: Refactor the internal object structure, such that there is no
+ * need for the `PDFDocModel` anymore and there is only one object on the
+ * main thread and not one entire copy on each worker instance.
+ */
+var PDFDocModel = (function pdfDoc() {
+  function constructor(arg, callback) {
+    if (isStream(arg))
+      init.call(this, arg);
+    else if (isArrayBuffer(arg))
+      init.call(this, new Stream(arg));
+    else
+      error('PDFDocModel: Unknown argument type');
+  }
+
+  function init(stream) {
+    assertWellFormed(stream.length > 0, 'stream must have data');
+    this.stream = stream;
+    this.setup();
+  }
+
+  function find(stream, needle, limit, backwards) {
+    var pos = stream.pos;
+    var end = stream.end;
+    var str = '';
+    if (pos + limit > end)
+      limit = end - pos;
+    for (var n = 0; n < limit; ++n)
+      str += stream.getChar();
+    stream.pos = pos;
+    var index = backwards ? str.lastIndexOf(needle) : str.indexOf(needle);
+    if (index == -1)
+      return false; /* not found */
+    stream.pos += index;
+    return true; /* found */
+  }
+
+  constructor.prototype = {
+    get linearization() {
+      var length = this.stream.length;
+      var linearization = false;
+      if (length) {
+        linearization = new Linearization(this.stream);
+        if (linearization.length != length)
+          linearization = false;
+      }
+      // shadow the prototype getter with a data property
+      return shadow(this, 'linearization', linearization);
+    },
+    get startXRef() {
+      var stream = this.stream;
+      var startXRef = 0;
+      var linearization = this.linearization;
+      if (linearization) {
+        // Find end of first obj.
+        stream.reset();
+        if (find(stream, 'endobj', 1024))
+          startXRef = stream.pos + 6;
+      } else {
+        // Find startxref at the end of the file.
+        var start = stream.end - 1024;
+        if (start < 0)
+          start = 0;
+        stream.pos = start;
+        if (find(stream, 'startxref', 1024, true)) {
+          stream.skip(9);
+          var ch;
+          do {
+            ch = stream.getChar();
+          } while (Lexer.isSpace(ch));
+          var str = '';
+          while ((ch - '0') <= 9) {
+            str += ch;
+            ch = stream.getChar();
+          }
+          startXRef = parseInt(str, 10);
+          if (isNaN(startXRef))
+            startXRef = 0;
+        }
+      }
+      // shadow the prototype getter with a data property
+      return shadow(this, 'startXRef', startXRef);
+    },
+    get mainXRefEntriesOffset() {
+      var mainXRefEntriesOffset = 0;
+      var linearization = this.linearization;
+      if (linearization)
+        mainXRefEntriesOffset = linearization.mainXRefEntriesOffset;
+      // shadow the prototype getter with a data property
+      return shadow(this, 'mainXRefEntriesOffset', mainXRefEntriesOffset);
+    },
+    // Find the header, remove leading garbage and setup the stream
+    // starting from the header.
+    checkHeader: function pdfDocCheckHeader() {
+      var stream = this.stream;
+      stream.reset();
+      if (find(stream, '%PDF-', 1024)) {
+        // Found the header, trim off any garbage before it.
+        stream.moveStart();
+        return;
+      }
+      // May not be a PDF file, continue anyway.
+    },
+    setup: function pdfDocSetup(ownerPassword, userPassword) {
+      this.checkHeader();
+      this.xref = new XRef(this.stream,
+                           this.startXRef,
+                           this.mainXRefEntriesOffset);
+      this.catalog = new Catalog(this.xref);
+    },
+    get numPages() {
+      var linearization = this.linearization;
+      var num = linearization ? linearization.numPages : this.catalog.numPages;
+      // shadow the prototype getter
+      return shadow(this, 'numPages', num);
+    },
+    getPage: function pdfDocGetPage(n) {
+      return this.catalog.getPage(n);
+    }
+  };
+
+  return constructor;
+})();
+
+var PDFDoc = (function pdfDoc() {
+  function constructor(arg, callback) {
+    var stream = null;
+    var data = null;
+
+    if (isStream(arg)) {
+      stream = arg;
+      data = arg.bytes;
+    } else if (isArrayBuffer(arg)) {
+      stream = new Stream(arg);
+      data = arg;
+    } else {
+      error('PDFDoc: Unknown argument type');
+    }
+
+    this.data = data;
+    this.stream = stream;
+    this.pdf = new PDFDocModel(stream);
+
+    this.catalog = this.pdf.catalog;
+    this.objs = new PDFObjects();
+
+    this.pageCache = [];
+    this.fontsLoading = {};
+    this.workerReadyPromise = new Promise('workerReady');
+
+    // If worker support isn't disabled explicit and the browser has worker
+    // support, create a new web worker and test if it/the browser fullfills
+    // all requirements to run parts of pdf.js in a web worker.
+    // Right now, the requirement is, that an Uint8Array is still an Uint8Array
+    // as it arrives on the worker. Chrome added this with version 15.
+    if (!globalScope.PDFJS.disableWorker && typeof Worker !== 'undefined') {
+      var workerSrc = PDFJS.workerSrc;
+      if (typeof workerSrc === 'undefined') {
+        throw 'No PDFJS.workerSrc specified';
+      }
+
+      var worker;
+      try {
+        worker = new Worker(workerSrc);
+      } catch (e) {
+        // Some versions of FF can't create a worker on localhost, see:
+        // https://bugzilla.mozilla.org/show_bug.cgi?id=683280
+        globalScope.PDFJS.disableWorker = true;
+        this.setupFakeWorker();
+        return;
+      }
+
+      var messageHandler = new MessageHandler('main', worker);
+
+      // Tell the worker the file it was created from.
+      messageHandler.send('workerSrc', workerSrc);
+
+      messageHandler.on('test', function pdfDocTest(supportTypedArray) {
+        if (supportTypedArray) {
+          this.worker = worker;
+          this.setupMessageHandler(messageHandler);
+        } else {
+          this.setupFakeWorker();
+        }
+      }.bind(this));
+
+      var testObj = new Uint8Array(1);
+      messageHandler.send('test', testObj);
+    } else {
+      this.setupFakeWorker();
+    }
+  }
+
+  constructor.prototype = {
+    setupFakeWorker: function() {
+      // If we don't use a worker, just post/sendMessage to the main thread.
+      var fakeWorker = {
+        postMessage: function pdfDocPostMessage(obj) {
+          fakeWorker.onmessage({data: obj});
+        },
+        terminate: function pdfDocTerminate() {}
+      };
+
+      var messageHandler = new MessageHandler('main', fakeWorker);
+      this.setupMessageHandler(messageHandler);
+
+      // If the main thread is our worker, setup the handling for the messages
+      // the main thread sends to it self.
+      WorkerMessageHandler.setup(messageHandler);
+    },
+
+
+    setupMessageHandler: function(messageHandler) {
+      this.messageHandler = messageHandler;
+
+      messageHandler.on('page', function pdfDocPage(data) {
+        var pageNum = data.pageNum;
+        var page = this.pageCache[pageNum];
+        var depFonts = data.depFonts;
+
+        page.startRenderingFromIRQueue(data.IRQueue, depFonts);
+      }, this);
+
+      messageHandler.on('obj', function pdfDocObj(data) {
+        var id = data[0];
+        var type = data[1];
+
+        switch (type) {
+          case 'JpegStream':
+            var IR = data[2];
+            new JpegImageLoader(id, IR, this.objs);
+            break;
+          case 'Font':
+            var name = data[2];
+            var file = data[3];
+            var properties = data[4];
+
+            if (file) {
+              var fontFileDict = new Dict();
+              fontFileDict.map = file.dict.map;
+
+              var fontFile = new Stream(file.bytes, file.start,
+                                        file.end - file.start, fontFileDict);
+
+              // Check if this is a FlateStream. Otherwise just use the created
+              // Stream one. This makes complex_ttf_font.pdf work.
+              var cmf = file.bytes[0];
+              if ((cmf & 0x0f) == 0x08) {
+                file = new FlateStream(fontFile);
+              } else {
+                file = fontFile;
+              }
+            }
+
+            // For now, resolve the font object here direclty. The real font
+            // object is then created in FontLoader.bind().
+            this.objs.resolve(id, {
+              name: name,
+              file: file,
+              properties: properties
+            });
+            break;
+          default:
+            throw 'Got unkown object type ' + type;
+        }
+      }, this);
+
+      messageHandler.on('font_ready', function pdfDocFontReady(data) {
+        var id = data[0];
+        var font = new FontShape(data[1]);
+
+        // If there is no string, then there is nothing to attach to the DOM.
+        if (!font.str) {
+          this.objs.resolve(id, font);
+        } else {
+          this.objs.setData(id, font);
+        }
+      }.bind(this));
+
+      setTimeout(function pdfDocFontReadySetTimeout() {
+        messageHandler.send('doc', this.data);
+        this.workerReadyPromise.resolve(true);
+      }.bind(this));
+    },
+
+    get numPages() {
+      return this.pdf.numPages;
+    },
+
+    startRendering: function pdfDocStartRendering(page) {
+      // The worker might not be ready to receive the page request yet.
+      this.workerReadyPromise.then(function pdfDocStartRenderingThen() {
+        this.messageHandler.send('page_request', page.pageNumber + 1);
+      }.bind(this));
+    },
+
+    getPage: function pdfDocGetPage(n) {
+      if (this.pageCache[n])
+        return this.pageCache[n];
+
+      var page = this.pdf.getPage(n);
+      // Add a reference to the objects such that Page can forward the reference
+      // to the CanvasGraphics and so on.
+      page.objs = this.objs;
+      page.pdf = this;
+      return (this.pageCache[n] = page);
+    },
+
+    destroy: function pdfDocDestroy() {
+      if (this.worker)
+        this.worker.terminate();
+
+      if (this.fontWorker)
+        this.fontWorker.terminate();
+
+      for (var n in this.pageCache)
+        delete this.pageCache[n];
+
+      delete this.data;
+      delete this.stream;
+      delete this.pdf;
+      delete this.catalog;
+    }
+  };
+
+  return constructor;
+})();
+
+globalScope.PDFJS.PDFDoc = PDFDoc;
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/crypto.js b/apps/files_pdfviewer/js/pdfjs/src/crypto.js
new file mode 100755
index 00000000000..95559864483
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/crypto.js
@@ -0,0 +1,597 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var ARCFourCipher = (function arcFourCipher() {
+  function constructor(key) {
+    this.a = 0;
+    this.b = 0;
+    var s = new Uint8Array(256);
+    var i, j = 0, tmp, keyLength = key.length;
+    for (i = 0; i < 256; ++i)
+      s[i] = i;
+    for (i = 0; i < 256; ++i) {
+      tmp = s[i];
+      j = (j + tmp + key[i % keyLength]) & 0xFF;
+      s[i] = s[j];
+      s[j] = tmp;
+    }
+    this.s = s;
+  }
+
+  constructor.prototype = {
+    encryptBlock: function arcFourCipherEncryptBlock(data) {
+      var i, n = data.length, tmp, tmp2;
+      var a = this.a, b = this.b, s = this.s;
+      var output = new Uint8Array(n);
+      for (i = 0; i < n; ++i) {
+        a = (a + 1) & 0xFF;
+        tmp = s[a];
+        b = (b + tmp) & 0xFF;
+        tmp2 = s[b];
+        s[a] = tmp2;
+        s[b] = tmp;
+        output[i] = data[i] ^ s[(tmp + tmp2) & 0xFF];
+      }
+      this.a = a;
+      this.b = b;
+      return output;
+    }
+  };
+  constructor.prototype.decryptBlock = constructor.prototype.encryptBlock;
+
+  return constructor;
+})();
+
+var calculateMD5 = (function calculateMD5() {
+  var r = new Uint8Array([
+    7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22,
+    5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20,
+    4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23,
+    6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21]);
+
+  var k = new Int32Array([
+    -680876936, -389564586, 606105819, -1044525330, -176418897, 1200080426,
+    -1473231341, -45705983, 1770035416, -1958414417, -42063, -1990404162,
+    1804603682, -40341101, -1502002290, 1236535329, -165796510, -1069501632,
+    643717713, -373897302, -701558691, 38016083, -660478335, -405537848,
+    568446438, -1019803690, -187363961, 1163531501, -1444681467, -51403784,
+    1735328473, -1926607734, -378558, -2022574463, 1839030562, -35309556,
+    -1530992060, 1272893353, -155497632, -1094730640, 681279174, -358537222,
+    -722521979, 76029189, -640364487, -421815835, 530742520, -995338651,
+    -198630844, 1126891415, -1416354905, -57434055, 1700485571, -1894986606,
+    -1051523, -2054922799, 1873313359, -30611744, -1560198380, 1309151649,
+    -145523070, -1120210379, 718787259, -343485551]);
+
+  function hash(data, offset, length) {
+    var h0 = 1732584193, h1 = -271733879, h2 = -1732584194, h3 = 271733878;
+    // pre-processing
+    var paddedLength = (length + 72) & ~63; // data + 9 extra bytes
+    var padded = new Uint8Array(paddedLength);
+    var i, j, n;
+    for (i = 0; i < length; ++i)
+      padded[i] = data[offset++];
+    padded[i++] = 0x80;
+    n = paddedLength - 8;
+    while (i < n)
+      padded[i++] = 0;
+    padded[i++] = (length << 3) & 0xFF;
+    padded[i++] = (length >> 5) & 0xFF;
+    padded[i++] = (length >> 13) & 0xFF;
+    padded[i++] = (length >> 21) & 0xFF;
+    padded[i++] = (length >>> 29) & 0xFF;
+    padded[i++] = 0;
+    padded[i++] = 0;
+    padded[i++] = 0;
+    // chunking
+    // TODO ArrayBuffer ?
+    var w = new Int32Array(16);
+    for (i = 0; i < paddedLength;) {
+      for (j = 0; j < 16; ++j, i += 4) {
+        w[j] = (padded[i] | (padded[i + 1] << 8) |
+                (padded[i + 2] << 16) | (padded[i + 3] << 24));
+      }
+      var a = h0, b = h1, c = h2, d = h3, f, g;
+      for (j = 0; j < 64; ++j) {
+        if (j < 16) {
+          f = (b & c) | ((~b) & d);
+          g = j;
+        } else if (j < 32) {
+          f = (d & b) | ((~d) & c);
+          g = (5 * j + 1) & 15;
+        } else if (j < 48) {
+          f = b ^ c ^ d;
+          g = (3 * j + 5) & 15;
+        } else {
+          f = c ^ (b | (~d));
+          g = (7 * j) & 15;
+        }
+        var tmp = d, rotateArg = (a + f + k[j] + w[g]) | 0, rotate = r[j];
+        d = c;
+        c = b;
+        b = (b + ((rotateArg << rotate) | (rotateArg >>> (32 - rotate)))) | 0;
+        a = tmp;
+      }
+      h0 = (h0 + a) | 0;
+      h1 = (h1 + b) | 0;
+      h2 = (h2 + c) | 0;
+      h3 = (h3 + d) | 0;
+    }
+    return new Uint8Array([
+        h0 & 0xFF, (h0 >> 8) & 0xFF, (h0 >> 16) & 0xFF, (h0 >>> 24) & 0xFF,
+        h1 & 0xFF, (h1 >> 8) & 0xFF, (h1 >> 16) & 0xFF, (h1 >>> 24) & 0xFF,
+        h2 & 0xFF, (h2 >> 8) & 0xFF, (h2 >> 16) & 0xFF, (h2 >>> 24) & 0xFF,
+        h3 & 0xFF, (h3 >> 8) & 0xFF, (h3 >> 16) & 0xFF, (h3 >>> 24) & 0xFF
+    ]);
+  }
+  return hash;
+})();
+
+var NullCipher = (function nullCipher() {
+  function constructor() {
+  }
+
+  constructor.prototype = {
+    decryptBlock: function nullCipherDecryptBlock(data) {
+      return data;
+    }
+  };
+
+  return constructor;
+})();
+
+var AES128Cipher = (function aes128Cipher() {
+  var rcon = new Uint8Array([
+    0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c,
+    0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a,
+    0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd,
+    0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a,
+    0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
+    0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6,
+    0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72,
+    0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc,
+    0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10,
+    0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e,
+    0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5,
+    0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94,
+    0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02,
+    0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d,
+    0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d,
+    0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f,
+    0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb,
+    0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c,
+    0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a,
+    0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd,
+    0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a,
+    0x74, 0xe8, 0xcb, 0x8d]);
+
+  var s = new Uint8Array([
+    0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b,
+    0xfe, 0xd7, 0xab, 0x76, 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
+    0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, 0xb7, 0xfd, 0x93, 0x26,
+    0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+    0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2,
+    0xeb, 0x27, 0xb2, 0x75, 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
+    0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, 0x53, 0xd1, 0x00, 0xed,
+    0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+    0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f,
+    0x50, 0x3c, 0x9f, 0xa8, 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
+    0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, 0xcd, 0x0c, 0x13, 0xec,
+    0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+    0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14,
+    0xde, 0x5e, 0x0b, 0xdb, 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
+    0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, 0xe7, 0xc8, 0x37, 0x6d,
+    0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+    0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f,
+    0x4b, 0xbd, 0x8b, 0x8a, 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
+    0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, 0xe1, 0xf8, 0x98, 0x11,
+    0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+    0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f,
+    0xb0, 0x54, 0xbb, 0x16]);
+
+  var inv_s = new Uint8Array([
+    0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e,
+    0x81, 0xf3, 0xd7, 0xfb, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87,
+    0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, 0x54, 0x7b, 0x94, 0x32,
+    0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
+    0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49,
+    0x6d, 0x8b, 0xd1, 0x25, 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16,
+    0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, 0x6c, 0x70, 0x48, 0x50,
+    0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
+    0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05,
+    0xb8, 0xb3, 0x45, 0x06, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02,
+    0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, 0x3a, 0x91, 0x11, 0x41,
+    0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
+    0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8,
+    0x1c, 0x75, 0xdf, 0x6e, 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89,
+    0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, 0xfc, 0x56, 0x3e, 0x4b,
+    0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
+    0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59,
+    0x27, 0x80, 0xec, 0x5f, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d,
+    0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, 0xa0, 0xe0, 0x3b, 0x4d,
+    0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
+    0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63,
+    0x55, 0x21, 0x0c, 0x7d]);
+
+  var mix = new Uint32Array([
+    0x00000000, 0x0e090d0b, 0x1c121a16, 0x121b171d, 0x3824342c, 0x362d3927,
+    0x24362e3a, 0x2a3f2331, 0x70486858, 0x7e416553, 0x6c5a724e, 0x62537f45,
+    0x486c5c74, 0x4665517f, 0x547e4662, 0x5a774b69, 0xe090d0b0, 0xee99ddbb,
+    0xfc82caa6, 0xf28bc7ad, 0xd8b4e49c, 0xd6bde997, 0xc4a6fe8a, 0xcaaff381,
+    0x90d8b8e8, 0x9ed1b5e3, 0x8ccaa2fe, 0x82c3aff5, 0xa8fc8cc4, 0xa6f581cf,
+    0xb4ee96d2, 0xbae79bd9, 0xdb3bbb7b, 0xd532b670, 0xc729a16d, 0xc920ac66,
+    0xe31f8f57, 0xed16825c, 0xff0d9541, 0xf104984a, 0xab73d323, 0xa57ade28,
+    0xb761c935, 0xb968c43e, 0x9357e70f, 0x9d5eea04, 0x8f45fd19, 0x814cf012,
+    0x3bab6bcb, 0x35a266c0, 0x27b971dd, 0x29b07cd6, 0x038f5fe7, 0x0d8652ec,
+    0x1f9d45f1, 0x119448fa, 0x4be30393, 0x45ea0e98, 0x57f11985, 0x59f8148e,
+    0x73c737bf, 0x7dce3ab4, 0x6fd52da9, 0x61dc20a2, 0xad766df6, 0xa37f60fd,
+    0xb16477e0, 0xbf6d7aeb, 0x955259da, 0x9b5b54d1, 0x894043cc, 0x87494ec7,
+    0xdd3e05ae, 0xd33708a5, 0xc12c1fb8, 0xcf2512b3, 0xe51a3182, 0xeb133c89,
+    0xf9082b94, 0xf701269f, 0x4de6bd46, 0x43efb04d, 0x51f4a750, 0x5ffdaa5b,
+    0x75c2896a, 0x7bcb8461, 0x69d0937c, 0x67d99e77, 0x3daed51e, 0x33a7d815,
+    0x21bccf08, 0x2fb5c203, 0x058ae132, 0x0b83ec39, 0x1998fb24, 0x1791f62f,
+    0x764dd68d, 0x7844db86, 0x6a5fcc9b, 0x6456c190, 0x4e69e2a1, 0x4060efaa,
+    0x527bf8b7, 0x5c72f5bc, 0x0605bed5, 0x080cb3de, 0x1a17a4c3, 0x141ea9c8,
+    0x3e218af9, 0x302887f2, 0x223390ef, 0x2c3a9de4, 0x96dd063d, 0x98d40b36,
+    0x8acf1c2b, 0x84c61120, 0xaef93211, 0xa0f03f1a, 0xb2eb2807, 0xbce2250c,
+    0xe6956e65, 0xe89c636e, 0xfa877473, 0xf48e7978, 0xdeb15a49, 0xd0b85742,
+    0xc2a3405f, 0xccaa4d54, 0x41ecdaf7, 0x4fe5d7fc, 0x5dfec0e1, 0x53f7cdea,
+    0x79c8eedb, 0x77c1e3d0, 0x65daf4cd, 0x6bd3f9c6, 0x31a4b2af, 0x3fadbfa4,
+    0x2db6a8b9, 0x23bfa5b2, 0x09808683, 0x07898b88, 0x15929c95, 0x1b9b919e,
+    0xa17c0a47, 0xaf75074c, 0xbd6e1051, 0xb3671d5a, 0x99583e6b, 0x97513360,
+    0x854a247d, 0x8b432976, 0xd134621f, 0xdf3d6f14, 0xcd267809, 0xc32f7502,
+    0xe9105633, 0xe7195b38, 0xf5024c25, 0xfb0b412e, 0x9ad7618c, 0x94de6c87,
+    0x86c57b9a, 0x88cc7691, 0xa2f355a0, 0xacfa58ab, 0xbee14fb6, 0xb0e842bd,
+    0xea9f09d4, 0xe49604df, 0xf68d13c2, 0xf8841ec9, 0xd2bb3df8, 0xdcb230f3,
+    0xcea927ee, 0xc0a02ae5, 0x7a47b13c, 0x744ebc37, 0x6655ab2a, 0x685ca621,
+    0x42638510, 0x4c6a881b, 0x5e719f06, 0x5078920d, 0x0a0fd964, 0x0406d46f,
+    0x161dc372, 0x1814ce79, 0x322bed48, 0x3c22e043, 0x2e39f75e, 0x2030fa55,
+    0xec9ab701, 0xe293ba0a, 0xf088ad17, 0xfe81a01c, 0xd4be832d, 0xdab78e26,
+    0xc8ac993b, 0xc6a59430, 0x9cd2df59, 0x92dbd252, 0x80c0c54f, 0x8ec9c844,
+    0xa4f6eb75, 0xaaffe67e, 0xb8e4f163, 0xb6edfc68, 0x0c0a67b1, 0x02036aba,
+    0x10187da7, 0x1e1170ac, 0x342e539d, 0x3a275e96, 0x283c498b, 0x26354480,
+    0x7c420fe9, 0x724b02e2, 0x605015ff, 0x6e5918f4, 0x44663bc5, 0x4a6f36ce,
+    0x587421d3, 0x567d2cd8, 0x37a10c7a, 0x39a80171, 0x2bb3166c, 0x25ba1b67,
+    0x0f853856, 0x018c355d, 0x13972240, 0x1d9e2f4b, 0x47e96422, 0x49e06929,
+    0x5bfb7e34, 0x55f2733f, 0x7fcd500e, 0x71c45d05, 0x63df4a18, 0x6dd64713,
+    0xd731dcca, 0xd938d1c1, 0xcb23c6dc, 0xc52acbd7, 0xef15e8e6, 0xe11ce5ed,
+    0xf307f2f0, 0xfd0efffb, 0xa779b492, 0xa970b999, 0xbb6bae84, 0xb562a38f,
+    0x9f5d80be, 0x91548db5, 0x834f9aa8, 0x8d4697a3]);
+
+  function expandKey128(cipherKey) {
+    var b = 176, result = new Uint8Array(b);
+    result.set(cipherKey);
+    for (var j = 16, i = 1; j < b; ++i) {
+      // RotWord
+      var t1 = result[j - 3], t2 = result[j - 2],
+          t3 = result[j - 1], t4 = result[j - 4];
+      // SubWord
+      t1 = s[t1]; t2 = s[t2]; t3 = s[t3]; t4 = s[t4];
+      // Rcon
+      t1 = t1 ^ rcon[i];
+      for (var n = 0; n < 4; ++n) {
+        result[j] = (t1 ^= result[j - 16]); j++;
+        result[j] = (t2 ^= result[j - 16]); j++;
+        result[j] = (t3 ^= result[j - 16]); j++;
+        result[j] = (t4 ^= result[j - 16]); j++;
+      }
+    }
+    return result;
+  }
+
+  function decrypt128(input, key) {
+    var state = new Uint8Array(16);
+    state.set(input);
+    var i, j, k;
+    var t, u, v;
+    // AddRoundKey
+    for (j = 0, k = 160; j < 16; ++j, ++k)
+      state[j] ^= key[k];
+    for (i = 9; i >= 1; --i) {
+      // InvShiftRows
+      t = state[13]; state[13] = state[9]; state[9] = state[5];
+      state[5] = state[1]; state[1] = t;
+      t = state[14]; u = state[10]; state[14] = state[6];
+      state[10] = state[2]; state[6] = t; state[2] = u;
+      t = state[15]; u = state[11]; v = state[7]; state[15] = state[3];
+      state[11] = t; state[7] = u; state[3] = v;
+      // InvSubBytes
+      for (j = 0; j < 16; ++j)
+        state[j] = inv_s[state[j]];
+      // AddRoundKey
+      for (j = 0, k = i * 16; j < 16; ++j, ++k)
+        state[j] ^= key[k];
+      // InvMixColumns
+      for (j = 0; j < 16; j += 4) {
+        var s0 = mix[state[j]], s1 = mix[state[j + 1]],
+            s2 = mix[state[j + 2]], s3 = mix[state[j + 3]];
+        t = (s0 ^ (s1 >>> 8) ^ (s1 << 24) ^ (s2 >>> 16) ^ (s2 << 16) ^
+            (s3 >>> 24) ^ (s3 << 8));
+        state[j] = (t >>> 24) & 0xFF;
+        state[j + 1] = (t >> 16) & 0xFF;
+        state[j + 2] = (t >> 8) & 0xFF;
+        state[j + 3] = t & 0xFF;
+      }
+    }
+    // InvShiftRows
+    t = state[13]; state[13] = state[9]; state[9] = state[5];
+    state[5] = state[1]; state[1] = t;
+    t = state[14]; u = state[10]; state[14] = state[6];
+    state[10] = state[2]; state[6] = t; state[2] = u;
+    t = state[15]; u = state[11]; v = state[7]; state[15] = state[3];
+    state[11] = t; state[7] = u; state[3] = v;
+    for (j = 0; j < 16; ++j) {
+      // InvSubBytes
+      state[j] = inv_s[state[j]];
+      // AddRoundKey
+      state[j] ^= key[j];
+    }
+    return state;
+  }
+
+  function constructor(key) {
+    this.key = expandKey128(key);
+    this.buffer = new Uint8Array(16);
+    this.bufferPosition = 0;
+  }
+
+  function decryptBlock2(data) {
+    var i, j, ii, sourceLength = data.length,
+        buffer = this.buffer, bufferLength = this.bufferPosition,
+        result = [], iv = this.iv;
+    for (i = 0; i < sourceLength; ++i) {
+      buffer[bufferLength] = data[i];
+      ++bufferLength;
+      if (bufferLength < 16)
+        continue;
+      // buffer is full, decrypting
+      var plain = decrypt128(buffer, this.key);
+      // xor-ing the IV vector to get plain text
+      for (j = 0; j < 16; ++j)
+        plain[j] ^= iv[j];
+      iv = buffer;
+      result.push(plain);
+      buffer = new Uint8Array(16);
+      bufferLength = 0;
+    }
+    // saving incomplete buffer
+    this.buffer = buffer;
+    this.bufferLength = bufferLength;
+    this.iv = iv;
+    if (result.length == 0)
+      return new Uint8Array([]);
+    if (result.length == 1)
+      return result[0];
+    // combining plain text blocks into one
+    var output = new Uint8Array(16 * result.length);
+    for (i = 0, j = 0, ii = result.length; i < ii; ++i, j += 16)
+      output.set(result[i], j);
+    return output;
+  }
+
+  constructor.prototype = {
+    decryptBlock: function aes128CipherDecryptBlock(data) {
+      var i, sourceLength = data.length;
+      var buffer = this.buffer, bufferLength = this.bufferPosition;
+      // waiting for IV values -- they are at the start of the stream
+      for (i = 0; bufferLength < 16 && i < sourceLength; ++i, ++bufferLength)
+        buffer[bufferLength] = data[i];
+      if (bufferLength < 16) {
+        // need more data
+        this.bufferLength = bufferLength;
+        return new Uint8Array([]);
+      }
+      this.iv = buffer;
+      this.buffer = new Uint8Array(16);
+      this.bufferLength = 0;
+      // starting decryption
+      this.decryptBlock = decryptBlock2;
+      return this.decryptBlock(data.subarray(16));
+    }
+  };
+
+  return constructor;
+})();
+
+var CipherTransform = (function cipherTransform() {
+  function constructor(stringCipherConstructor, streamCipherConstructor) {
+    this.stringCipherConstructor = stringCipherConstructor;
+    this.streamCipherConstructor = streamCipherConstructor;
+  }
+  constructor.prototype = {
+    createStream: function cipherTransformCreateStream(stream) {
+      var cipher = new this.streamCipherConstructor();
+      return new DecryptStream(stream,
+        function cipherTransformDecryptStream(data) {
+          return cipher.decryptBlock(data);
+        }
+      );
+    },
+    decryptString: function cipherTransformDecryptString(s) {
+      var cipher = new this.stringCipherConstructor();
+      var data = stringToBytes(s);
+      data = cipher.decryptBlock(data);
+      return bytesToString(data);
+    }
+  };
+  return constructor;
+})();
+
+var CipherTransformFactory = (function cipherTransformFactory() {
+  function prepareKeyData(fileId, password, ownerPassword, userPassword,
+                          flags, revision, keyLength, encryptMetadata) {
+    var defaultPasswordBytes = new Uint8Array([
+      0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41,
+      0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08,
+      0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80,
+      0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A]);
+    var hashData = new Uint8Array(100), i = 0, j, n;
+    if (password) {
+      n = Math.min(32, password.length);
+      for (; i < n; ++i)
+        hashData[i] = password[i];
+    }
+    j = 0;
+    while (i < 32) {
+      hashData[i++] = defaultPasswordBytes[j++];
+    }
+    // as now the padded password in the hashData[0..i]
+    for (j = 0, n = ownerPassword.length; j < n; ++j)
+      hashData[i++] = ownerPassword[j];
+    hashData[i++] = flags & 0xFF;
+    hashData[i++] = (flags >> 8) & 0xFF;
+    hashData[i++] = (flags >> 16) & 0xFF;
+    hashData[i++] = (flags >>> 24) & 0xFF;
+    for (j = 0, n = fileId.length; j < n; ++j)
+      hashData[i++] = fileId[j];
+    if (revision >= 4 && !encryptMetadata) {
+      hashData[i++] = 0xFF;
+      hashData[i++] = 0xFF;
+      hashData[i++] = 0xFF;
+      hashData[i++] = 0xFF;
+    }
+    var hash = calculateMD5(hashData, 0, i);
+    var keyLengthInBytes = keyLength >> 3;
+    if (revision >= 3) {
+      for (j = 0; j < 50; ++j) {
+         hash = calculateMD5(hash, 0, keyLengthInBytes);
+      }
+    }
+    var encryptionKey = hash.subarray(0, keyLengthInBytes);
+    var cipher, checkData;
+
+    if (revision >= 3) {
+      // padded password in hashData, we can use this array for user
+      // password check
+      i = 32;
+      for (j = 0, n = fileId.length; j < n; ++j)
+        hashData[i++] = fileId[j];
+      cipher = new ARCFourCipher(encryptionKey);
+      var checkData = cipher.encryptBlock(calculateMD5(hashData, 0, i));
+      n = encryptionKey.length;
+      var derivedKey = new Uint8Array(n), k;
+      for (j = 1; j <= 19; ++j) {
+        for (k = 0; k < n; ++k)
+          derivedKey[k] = encryptionKey[k] ^ j;
+        cipher = new ARCFourCipher(derivedKey);
+        checkData = cipher.encryptBlock(checkData);
+      }
+    } else {
+      cipher = new ARCFourCipher(encryptionKey);
+      checkData = cipher.encryptBlock(hashData.subarray(0, 32));
+    }
+    for (j = 0, n = checkData.length; j < n; ++j) {
+      if (userPassword[j] != checkData[j])
+        error('incorrect password');
+    }
+    return encryptionKey;
+  }
+
+  var identityName = new Name('Identity');
+
+  function constructor(dict, fileId, password) {
+    var filter = dict.get('Filter');
+    if (!isName(filter) || filter.name != 'Standard')
+      error('unknown encryption method');
+    this.dict = dict;
+    var algorithm = dict.get('V');
+    if (!isInt(algorithm) ||
+      (algorithm != 1 && algorithm != 2 && algorithm != 4))
+      error('unsupported encryption algorithm');
+    this.algorithm = algorithm;
+    var keyLength = dict.get('Length') || 40;
+    if (!isInt(keyLength) ||
+      keyLength < 40 || (keyLength % 8) != 0)
+      error('invalid key length');
+    // prepare keys
+    var ownerPassword = stringToBytes(dict.get('O'));
+    var userPassword = stringToBytes(dict.get('U'));
+    var flags = dict.get('P');
+    var revision = dict.get('R');
+    var encryptMetadata =
+      dict.get('EncryptMetadata') !== false; // makes true as default value
+    var fileIdBytes = stringToBytes(fileId);
+    var passwordBytes;
+    if (password)
+      passwordBytes = stringToBytes(password);
+
+    this.encryptionKey = prepareKeyData(fileIdBytes, passwordBytes,
+                                        ownerPassword, userPassword,
+                                        flags, revision,
+                                        keyLength, encryptMetadata);
+    if (algorithm == 4) {
+      this.cf = dict.get('CF');
+      this.stmf = dict.get('StmF') || identityName;
+      this.strf = dict.get('StrF') || identityName;
+      this.eff = dict.get('EFF') || this.strf;
+    }
+  }
+
+  function buildObjectKey(num, gen, encryptionKey, isAes) {
+    var key = new Uint8Array(encryptionKey.length + 9), i, n;
+    for (i = 0, n = encryptionKey.length; i < n; ++i)
+      key[i] = encryptionKey[i];
+    key[i++] = num & 0xFF;
+    key[i++] = (num >> 8) & 0xFF;
+    key[i++] = (num >> 16) & 0xFF;
+    key[i++] = gen & 0xFF;
+    key[i++] = (gen >> 8) & 0xFF;
+    if (isAes) {
+      key[i++] = 0x73;
+      key[i++] = 0x41;
+      key[i++] = 0x6C;
+      key[i++] = 0x54;
+    }
+    var hash = calculateMD5(key, 0, i);
+    return hash.subarray(0, Math.min(encryptionKey.length + 5, 16));
+  }
+
+  function buildCipherConstructor(cf, name, num, gen, key) {
+    var cryptFilter = cf.get(name.name);
+    var cfm;
+    if (cryptFilter != null)
+      cfm = cryptFilter.get('CFM');
+    if (!cfm || cfm.name == 'None') {
+      return function cipherTransformFactoryBuildCipherConstructorNone() {
+        return new NullCipher();
+      };
+    }
+    if ('V2' == cfm.name) {
+      return function cipherTransformFactoryBuildCipherConstructorV2() {
+        return new ARCFourCipher(
+          buildObjectKey(num, gen, key, false));
+      };
+    }
+    if ('AESV2' == cfm.name) {
+      return function cipherTransformFactoryBuildCipherConstructorAESV2() {
+        return new AES128Cipher(
+          buildObjectKey(num, gen, key, true));
+      };
+    }
+    error('Unknown crypto method');
+    return null;
+  }
+
+  constructor.prototype = {
+    createCipherTransform: function buildCipherCreateCipherTransform(num,
+                                                                     gen) {
+      if (this.algorithm == 4) {
+        return new CipherTransform(
+          buildCipherConstructor(this.cf, this.stmf,
+            num, gen, this.encryptionKey),
+          buildCipherConstructor(this.cf, this.strf,
+            num, gen, this.encryptionKey));
+      }
+      // algorithms 1 and 2
+      var key = buildObjectKey(num, gen, this.encryptionKey, false);
+      var cipherConstructor = function buildCipherCipherConstructor() {
+        return new ARCFourCipher(key);
+      };
+      return new CipherTransform(cipherConstructor, cipherConstructor);
+    }
+  };
+
+  return constructor;
+})();
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/evaluator.js b/apps/files_pdfviewer/js/pdfjs/src/evaluator.js
new file mode 100755
index 00000000000..a863a531ec5
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/evaluator.js
@@ -0,0 +1,857 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var PartialEvaluator = (function partialEvaluator() {
+  function constructor(xref, handler, uniquePrefix) {
+    this.state = new EvalState();
+    this.stateStack = [];
+
+    this.xref = xref;
+    this.handler = handler;
+    this.uniquePrefix = uniquePrefix;
+    this.objIdCounter = 0;
+  }
+
+  var OP_MAP = {
+    // Graphics state
+    w: 'setLineWidth',
+    J: 'setLineCap',
+    j: 'setLineJoin',
+    M: 'setMiterLimit',
+    d: 'setDash',
+    ri: 'setRenderingIntent',
+    i: 'setFlatness',
+    gs: 'setGState',
+    q: 'save',
+    Q: 'restore',
+    cm: 'transform',
+
+    // Path
+    m: 'moveTo',
+    l: 'lineTo',
+    c: 'curveTo',
+    v: 'curveTo2',
+    y: 'curveTo3',
+    h: 'closePath',
+    re: 'rectangle',
+    S: 'stroke',
+    s: 'closeStroke',
+    f: 'fill',
+    F: 'fill',
+    'f*': 'eoFill',
+    B: 'fillStroke',
+    'B*': 'eoFillStroke',
+    b: 'closeFillStroke',
+    'b*': 'closeEOFillStroke',
+    n: 'endPath',
+
+    // Clipping
+    W: 'clip',
+    'W*': 'eoClip',
+
+    // Text
+    BT: 'beginText',
+    ET: 'endText',
+    Tc: 'setCharSpacing',
+    Tw: 'setWordSpacing',
+    Tz: 'setHScale',
+    TL: 'setLeading',
+    Tf: 'setFont',
+    Tr: 'setTextRenderingMode',
+    Ts: 'setTextRise',
+    Td: 'moveText',
+    TD: 'setLeadingMoveText',
+    Tm: 'setTextMatrix',
+    'T*': 'nextLine',
+    Tj: 'showText',
+    TJ: 'showSpacedText',
+    "'": 'nextLineShowText',
+    '"': 'nextLineSetSpacingShowText',
+
+    // Type3 fonts
+    d0: 'setCharWidth',
+    d1: 'setCharWidthAndBounds',
+
+    // Color
+    CS: 'setStrokeColorSpace',
+    cs: 'setFillColorSpace',
+    SC: 'setStrokeColor',
+    SCN: 'setStrokeColorN',
+    sc: 'setFillColor',
+    scn: 'setFillColorN',
+    G: 'setStrokeGray',
+    g: 'setFillGray',
+    RG: 'setStrokeRGBColor',
+    rg: 'setFillRGBColor',
+    K: 'setStrokeCMYKColor',
+    k: 'setFillCMYKColor',
+
+    // Shading
+    sh: 'shadingFill',
+
+    // Images
+    BI: 'beginInlineImage',
+    ID: 'beginImageData',
+    EI: 'endInlineImage',
+
+    // XObjects
+    Do: 'paintXObject',
+
+    // Marked content
+    MP: 'markPoint',
+    DP: 'markPointProps',
+    BMC: 'beginMarkedContent',
+    BDC: 'beginMarkedContentProps',
+    EMC: 'endMarkedContent',
+
+    // Compatibility
+    BX: 'beginCompat',
+    EX: 'endCompat'
+  };
+
+  constructor.prototype = {
+    getIRQueue: function partialEvaluatorGetIRQueue(stream, resources,
+                                    queue, dependency) {
+
+      var self = this;
+      var xref = this.xref;
+      var handler = this.handler;
+      var uniquePrefix = this.uniquePrefix;
+
+      function insertDependency(depList) {
+        fnArray.push('dependency');
+        argsArray.push(depList);
+        for (var i = 0, ii = depList.length; i < ii; i++) {
+          var dep = depList[i];
+          if (dependency.indexOf(dep) == -1) {
+            dependency.push(depList[i]);
+          }
+        }
+      }
+
+      function handleSetFont(fontName, fontRef) {
+        var loadedName = null;
+
+        var fontRes = resources.get('Font');
+
+        // TODO: TOASK: Is it possible to get here? If so, what does
+        // args[0].name should be like???
+        assert(fontRes, 'fontRes not available');
+
+        fontRes = xref.fetchIfRef(fontRes);
+        fontRef = fontRef || fontRes.get(fontName);
+        var font = xref.fetchIfRef(fontRef);
+        assertWellFormed(isDict(font));
+        if (!font.translated) {
+          font.translated = self.translateFont(font, xref, resources,
+                                               dependency);
+          if (font.translated) {
+            // keep track of each font we translated so the caller can
+            // load them asynchronously before calling display on a page
+            loadedName = 'font_' + uniquePrefix + (++self.objIdCounter);
+            font.translated.properties.loadedName = loadedName;
+            font.loadedName = loadedName;
+
+            var translated = font.translated;
+            handler.send('obj', [
+                loadedName,
+                'Font',
+                translated.name,
+                translated.file,
+                translated.properties
+            ]);
+          }
+        }
+        loadedName = loadedName || font.loadedName;
+
+        // Ensure the font is ready before the font is set
+        // and later on used for drawing.
+        // TODO: This should get insert to the IRQueue only once per
+        // page.
+        insertDependency([loadedName]);
+        return loadedName;
+      }
+
+      function buildPaintImageXObject(image, inline) {
+        var dict = image.dict;
+        var w = dict.get('Width', 'W');
+        var h = dict.get('Height', 'H');
+
+        if (image instanceof JpegStream && image.isNative) {
+          var objId = 'img_' + uniquePrefix + (++self.objIdCounter);
+          handler.send('obj', [objId, 'JpegStream', image.getIR()]);
+
+          // Add the dependency on the image object.
+          insertDependency([objId]);
+
+          // The normal fn.
+          fn = 'paintJpegXObject';
+          args = [objId, w, h];
+
+          return;
+        }
+
+        // Needs to be rendered ourself.
+
+        // Figure out if the image has an imageMask.
+        var imageMask = dict.get('ImageMask', 'IM') || false;
+
+        // If there is no imageMask, create the PDFImage and a lot
+        // of image processing can be done here.
+        if (!imageMask) {
+          var imageObj = new PDFImage(xref, resources, image, inline);
+
+          if (imageObj.imageMask) {
+            throw 'Can\'t handle this in the web worker :/';
+          }
+
+          var imgData = {
+            width: w,
+            height: h,
+            data: new Uint8Array(w * h * 4)
+          };
+          var pixels = imgData.data;
+          imageObj.fillRgbaBuffer(pixels, imageObj.decode);
+
+          fn = 'paintImageXObject';
+          args = [imgData];
+          return;
+        }
+
+        // This depends on a tmpCanvas beeing filled with the
+        // current fillStyle, such that processing the pixel
+        // data can't be done here. Instead of creating a
+        // complete PDFImage, only read the information needed
+        // for later.
+        fn = 'paintImageMaskXObject';
+
+        var width = dict.get('Width', 'W');
+        var height = dict.get('Height', 'H');
+        var bitStrideLength = (width + 7) >> 3;
+        var imgArray = image.getBytes(bitStrideLength * height);
+        var decode = dict.get('Decode', 'D');
+        var inverseDecode = !!decode && decode[0] > 0;
+
+        args = [imgArray, inverseDecode, width, height];
+      }
+
+      uniquePrefix = uniquePrefix || '';
+      if (!queue.argsArray) {
+        queue.argsArray = [];
+      }
+      if (!queue.fnArray) {
+        queue.fnArray = [];
+      }
+
+      var fnArray = queue.fnArray, argsArray = queue.argsArray;
+      var dependencyArray = dependency || [];
+
+      resources = xref.fetchIfRef(resources) || new Dict();
+      var xobjs = xref.fetchIfRef(resources.get('XObject')) || new Dict();
+      var patterns = xref.fetchIfRef(resources.get('Pattern')) || new Dict();
+      var parser = new Parser(new Lexer(stream), false);
+      var res = resources;
+      var args = [], obj;
+      var getObjBt = function getObjBt() {
+        parser = this.oldParser;
+        return { name: 'BT' };
+      };
+      var TILING_PATTERN = 1, SHADING_PATTERN = 2;
+
+      while (!isEOF(obj = parser.getObj())) {
+        if (isCmd(obj)) {
+          var cmd = obj.cmd;
+          var fn = OP_MAP[cmd];
+          if (!fn) {
+            // invalid content command, trying to recover
+            if (cmd.substr(-2) == 'BT') {
+              fn = OP_MAP[cmd.substr(0, cmd.length - 2)];
+              // feeding 'BT' on next interation
+              parser = {
+                getObj: getObjBt,
+                oldParser: parser
+              };
+            }
+          }
+          assertWellFormed(fn, 'Unknown command "' + cmd + '"');
+          // TODO figure out how to type-check vararg functions
+
+          if ((cmd == 'SCN' || cmd == 'scn') && !args[args.length - 1].code) {
+            // Use the IR version for setStroke/FillColorN.
+            fn += '_IR';
+
+            // compile tiling patterns
+            var patternName = args[args.length - 1];
+            // SCN/scn applies patterns along with normal colors
+            if (isName(patternName)) {
+              var pattern = xref.fetchIfRef(patterns.get(patternName.name));
+              if (pattern) {
+                var dict = isStream(pattern) ? pattern.dict : pattern;
+                var typeNum = dict.get('PatternType');
+
+                if (typeNum == TILING_PATTERN) {
+                  // Create an IR of the pattern code.
+                  var depIdx = dependencyArray.length;
+                  var queueObj = {};
+                  var codeIR = this.getIRQueue(pattern, dict.get('Resources'),
+                                               queueObj, dependencyArray);
+
+                  // Add the dependencies that are required to execute the
+                  // codeIR.
+                  insertDependency(dependencyArray.slice(depIdx));
+
+                  args = TilingPattern.getIR(codeIR, dict, args);
+                }
+                else if (typeNum == SHADING_PATTERN) {
+                  var shading = xref.fetchIfRef(dict.get('Shading'));
+                  var matrix = dict.get('Matrix');
+                  var pattern = Pattern.parseShading(shading, matrix, xref, res,
+                                                                  null /*ctx*/);
+                  args = pattern.getIR();
+                } else {
+                  error('Unkown PatternType ' + typeNum);
+                }
+              }
+            }
+          } else if (cmd == 'Do' && !args[0].code) {
+            // eagerly compile XForm objects
+            var name = args[0].name;
+            var xobj = xobjs.get(name);
+            if (xobj) {
+              xobj = xref.fetchIfRef(xobj);
+              assertWellFormed(isStream(xobj), 'XObject should be a stream');
+
+              var type = xobj.dict.get('Subtype');
+              assertWellFormed(
+                isName(type),
+                'XObject should have a Name subtype'
+              );
+
+              if ('Form' == type.name) {
+                var matrix = xobj.dict.get('Matrix');
+                var bbox = xobj.dict.get('BBox');
+
+                fnArray.push('paintFormXObjectBegin');
+                argsArray.push([matrix, bbox]);
+
+                // This adds the IRQueue of the xObj to the current queue.
+                var depIdx = dependencyArray.length;
+
+                this.getIRQueue(xobj, xobj.dict.get('Resources'), queue,
+                                dependencyArray);
+
+               // Add the dependencies that are required to execute the
+               // codeIR.
+               insertDependency(dependencyArray.slice(depIdx));
+
+                fn = 'paintFormXObjectEnd';
+                args = [];
+              } else if ('Image' == type.name) {
+                buildPaintImageXObject(xobj, false);
+              } else {
+                error('Unhandled XObject subtype ' + type.name);
+              }
+            }
+          } else if (cmd == 'Tf') { // eagerly collect all fonts
+            args[0] = handleSetFont(args[0].name);
+          } else if (cmd == 'EI') {
+            buildPaintImageXObject(args[0], true);
+          }
+
+          switch (fn) {
+            // Parse the ColorSpace data to a raw format.
+            case 'setFillColorSpace':
+            case 'setStrokeColorSpace':
+              args = [ColorSpace.parseToIR(args[0], xref, resources)];
+              break;
+            case 'shadingFill':
+              var shadingRes = xref.fetchIfRef(res.get('Shading'));
+              if (!shadingRes)
+                error('No shading resource found');
+
+              var shading = xref.fetchIfRef(shadingRes.get(args[0].name));
+              if (!shading)
+                error('No shading object found');
+
+              var shadingFill = Pattern.parseShading(shading, null, xref, res,
+                                                      null);
+              var patternIR = shadingFill.getIR();
+              args = [patternIR];
+              fn = 'shadingFill';
+              break;
+            case 'setGState':
+              var dictName = args[0];
+              var extGState = xref.fetchIfRef(resources.get('ExtGState'));
+
+              if (!isDict(extGState) || !extGState.has(dictName.name))
+                break;
+
+              var gsState = xref.fetchIfRef(extGState.get(dictName.name));
+
+              // This array holds the converted/processed state data.
+              var gsStateObj = [];
+
+              gsState.forEach(
+                function canvasGraphicsSetGStateForEach(key, value) {
+                  switch (key) {
+                    case 'Type':
+                      break;
+                    case 'LW':
+                    case 'LC':
+                    case 'LJ':
+                    case 'ML':
+                    case 'D':
+                    case 'RI':
+                    case 'FL':
+                    case 'CA':
+                    case 'ca':
+                      gsStateObj.push([key, value]);
+                      break;
+                    case 'Font':
+                      gsStateObj.push([
+                        'Font',
+                        handleSetFont(null, value[0]),
+                        value[1]
+                      ]);
+                      break;
+                    case 'OP':
+                    case 'op':
+                    case 'OPM':
+                    case 'BG':
+                    case 'BG2':
+                    case 'UCR':
+                    case 'UCR2':
+                    case 'TR':
+                    case 'TR2':
+                    case 'HT':
+                    case 'SM':
+                    case 'SA':
+                    case 'BM':
+                    case 'SMask':
+                    case 'AIS':
+                    case 'TK':
+                      TODO('graphic state operator ' + key);
+                      break;
+                    default:
+                      warn('Unknown graphic state operator ' + key);
+                      break;
+                  }
+                }
+              );
+              args = [gsStateObj];
+              break;
+          } // switch
+
+          fnArray.push(fn);
+          argsArray.push(args);
+          args = [];
+        } else if (obj != null) {
+          assertWellFormed(args.length <= 33, 'Too many arguments');
+          args.push(obj);
+        }
+      }
+
+      return {
+        fnArray: fnArray,
+        argsArray: argsArray
+      };
+    },
+
+    extractDataStructures: function
+      partialEvaluatorExtractDataStructures(dict, baseDict,
+                                            xref, properties) {
+      // 9.10.2
+      var toUnicode = dict.get('ToUnicode') ||
+        baseDict.get('ToUnicode');
+      if (toUnicode)
+        properties.toUnicode = this.readToUnicode(toUnicode, xref);
+
+      if (properties.composite) {
+        // CIDSystemInfo helps to match CID to glyphs
+        var cidSystemInfo = xref.fetchIfRef(dict.get('CIDSystemInfo'));
+        if (isDict(cidSystemInfo)) {
+          properties.cidSystemInfo = {
+            registry: cidSystemInfo.get('Registry'),
+            ordering: cidSystemInfo.get('Ordering'),
+            supplement: cidSystemInfo.get('Supplement')
+          };
+        }
+
+        var cidToGidMap = xref.fetchIfRef(dict.get('CIDToGIDMap'));
+        if (isStream(cidToGidMap))
+          properties.cidToGidMap = this.readCidToGidMap(cidToGidMap);
+      }
+
+      var differences = [];
+      var baseEncoding = Encodings.StandardEncoding;
+      var hasEncoding = dict.has('Encoding');
+      if (hasEncoding) {
+        var encoding = xref.fetchIfRef(dict.get('Encoding'));
+        if (isDict(encoding)) {
+          var baseName = encoding.get('BaseEncoding');
+          if (baseName)
+            baseEncoding = Encodings[baseName.name];
+
+          // Load the differences between the base and original
+          if (encoding.has('Differences')) {
+            var diffEncoding = encoding.get('Differences');
+            var index = 0;
+            for (var j = 0, jj = diffEncoding.length; j < jj; j++) {
+              var data = diffEncoding[j];
+              if (isNum(data))
+                index = data;
+              else
+                differences[index++] = data.name;
+            }
+          }
+        } else if (isName(encoding)) {
+          baseEncoding = Encodings[encoding.name];
+        } else {
+          error('Encoding is not a Name nor a Dict');
+        }
+      }
+      properties.differences = differences;
+      properties.baseEncoding = baseEncoding;
+      properties.hasEncoding = hasEncoding;
+    },
+
+    readToUnicode:
+      function partialEvaluatorReadToUnicode(toUnicode, xref) {
+      var cmapObj = xref.fetchIfRef(toUnicode);
+      var charToUnicode = [];
+      if (isName(cmapObj)) {
+        var isIdentityMap = cmapObj.name.substr(0, 9) == 'Identity-';
+        if (!isIdentityMap)
+          error('ToUnicode file cmap translation not implemented');
+      } else if (isStream(cmapObj)) {
+        var tokens = [];
+        var token = '';
+        var beginArrayToken = {};
+
+        var cmap = cmapObj.getBytes(cmapObj.length);
+        for (var i = 0, ii = cmap.length; i < ii; i++) {
+          var byte = cmap[i];
+          if (byte == 0x20 || byte == 0x0D || byte == 0x0A ||
+              byte == 0x3C || byte == 0x5B || byte == 0x5D) {
+            switch (token) {
+              case 'usecmap':
+                error('usecmap is not implemented');
+                break;
+
+              case 'beginbfchar':
+              case 'beginbfrange':
+              case 'begincidchar':
+              case 'begincidrange':
+                token = '';
+                tokens = [];
+                break;
+
+              case 'endcidrange':
+              case 'endbfrange':
+                for (var j = 0, jj = tokens.length; j < jj; j += 3) {
+                  var startRange = tokens[j];
+                  var endRange = tokens[j + 1];
+                  var code = tokens[j + 2];
+                  while (startRange <= endRange) {
+                    charToUnicode[startRange] = code++;
+                    ++startRange;
+                  }
+                }
+                break;
+
+              case 'endcidchar':
+              case 'endbfchar':
+                for (var j = 0, jj = tokens.length; j < jj; j += 2) {
+                  var index = tokens[j];
+                  var code = tokens[j + 1];
+                  charToUnicode[index] = code;
+                }
+                break;
+
+              case '':
+                break;
+
+              default:
+                if (token[0] >= '0' && token[0] <= '9')
+                  token = parseInt(token, 10); // a number
+                tokens.push(token);
+                token = '';
+            }
+            switch (byte) {
+              case 0x5B:
+                // begin list parsing
+                tokens.push(beginArrayToken);
+                break;
+              case 0x5D:
+                // collect array items
+                var items = [], item;
+                while (tokens.length &&
+                       (item = tokens.pop()) != beginArrayToken)
+                  items.unshift(item);
+                tokens.push(items);
+                break;
+            }
+          } else if (byte == 0x3E) {
+            if (token.length) {
+              // parsing hex number
+              tokens.push(parseInt(token, 16));
+              token = '';
+            }
+          } else {
+            token += String.fromCharCode(byte);
+          }
+        }
+      }
+      return charToUnicode;
+    },
+    readCidToGidMap:
+      function partialEvaluatorReadCidToGidMap(cidToGidStream) {
+      // Extract the encoding from the CIDToGIDMap
+      var glyphsData = cidToGidStream.getBytes();
+
+      // Set encoding 0 to later verify the font has an encoding
+      var result = [];
+      for (var j = 0, jj = glyphsData.length; j < jj; j++) {
+        var glyphID = (glyphsData[j++] << 8) | glyphsData[j];
+        if (glyphID == 0)
+          continue;
+
+        var code = j >> 1;
+        result[code] = glyphID;
+      }
+      return result;
+    },
+
+    extractWidths: function partialEvaluatorWidths(dict,
+                                                   xref,
+                                                   descriptor,
+                                                   properties) {
+      var glyphsWidths = [];
+      var defaultWidth = 0;
+      if (properties.composite) {
+        defaultWidth = xref.fetchIfRef(dict.get('DW')) || 1000;
+
+        var widths = xref.fetchIfRef(dict.get('W'));
+        if (widths) {
+          var start = 0, end = 0;
+          for (var i = 0, ii = widths.length; i < ii; i++) {
+            var code = widths[i];
+            if (isArray(code)) {
+              for (var j = 0, jj = code.length; j < jj; j++)
+                glyphsWidths[start++] = code[j];
+              start = 0;
+            } else if (start) {
+              var width = widths[++i];
+              for (var j = start; j <= code; j++)
+                glyphsWidths[j] = width;
+              start = 0;
+            } else {
+              start = code;
+            }
+          }
+        }
+      } else {
+        var firstChar = properties.firstChar;
+        var widths = xref.fetchIfRef(dict.get('Widths'));
+        if (widths) {
+          var j = firstChar;
+          for (var i = 0, ii = widths.length; i < ii; i++)
+            glyphsWidths[j++] = widths[i];
+          defaultWidth = parseFloat(descriptor.get('MissingWidth')) || 0;
+        } else {
+          // Trying get the BaseFont metrics (see comment above).
+          var baseFontName = dict.get('BaseFont');
+          if (isName(baseFontName)) {
+            var metrics = this.getBaseFontMetrics(baseFontName.name);
+
+            glyphsWidths = metrics.widths;
+            defaultWidth = metrics.defaultWidth;
+          }
+        }
+      }
+
+      properties.defaultWidth = defaultWidth;
+      properties.widths = glyphsWidths;
+    },
+
+    getBaseFontMetrics: function getBaseFontMetrics(name) {
+      var defaultWidth = 0, widths = [];
+      var glyphWidths = Metrics[stdFontMap[name] || name];
+      if (isNum(glyphWidths)) {
+        defaultWidth = glyphWidths;
+      } else {
+        widths = glyphWidths;
+      }
+
+      return {
+        defaultWidth: defaultWidth,
+        widths: widths
+      };
+    },
+
+    translateFont: function partialEvaluatorTranslateFont(dict, xref, resources,
+                                                          dependency) {
+      var baseDict = dict;
+      var type = dict.get('Subtype');
+      assertWellFormed(isName(type), 'invalid font Subtype');
+
+      var composite = false;
+      if (type.name == 'Type0') {
+        // If font is a composite
+        //  - get the descendant font
+        //  - set the type according to the descendant font
+        //  - get the FontDescriptor from the descendant font
+        var df = dict.get('DescendantFonts');
+        if (!df)
+          return null;
+
+        if (isRef(df))
+          df = xref.fetch(df);
+
+        dict = xref.fetchIfRef(isRef(df) ? df : df[0]);
+
+        type = dict.get('Subtype');
+        assertWellFormed(isName(type), 'invalid font Subtype');
+        composite = true;
+      }
+      var maxCharIndex = composite ? 0xFFFF : 0xFF;
+
+      var descriptor = xref.fetchIfRef(dict.get('FontDescriptor'));
+      if (!descriptor) {
+        if (type.name == 'Type3') {
+          // FontDescriptor is only required for Type3 fonts when the document
+          // is a tagged pdf. Create a barbebones one to get by.
+          descriptor = new Dict();
+          descriptor.set('FontName', new Name(type.name));
+        } else {
+          // Before PDF 1.5 if the font was one of the base 14 fonts, having a
+          // FontDescriptor was not required.
+          // This case is here for compatibility.
+          var baseFontName = dict.get('BaseFont');
+          if (!isName(baseFontName))
+            return null;
+
+          // Using base font name as a font name.
+          baseFontName = baseFontName.name.replace(/[,_]/g, '-');
+          var metrics = this.getBaseFontMetrics(baseFontName);
+
+          var properties = {
+            type: type.name,
+            widths: metrics.widths,
+            defaultWidth: metrics.defaultWidth,
+            firstChar: 0,
+            lastChar: maxCharIndex
+          };
+          this.extractDataStructures(dict, dict, xref, properties);
+
+          return {
+            name: baseFontName,
+            dict: baseDict,
+            properties: properties
+          };
+        }
+
+      }
+
+      // According to the spec if 'FontDescriptor' is declared, 'FirstChar',
+      // 'LastChar' and 'Widths' should exists too, but some PDF encoders seems
+      // to ignore this rule when a variant of a standart font is used.
+      // TODO Fill the width array depending on which of the base font this is
+      // a variant.
+      var firstChar = xref.fetchIfRef(dict.get('FirstChar')) || 0;
+      var lastChar = xref.fetchIfRef(dict.get('LastChar')) || maxCharIndex;
+      var fontName = xref.fetchIfRef(descriptor.get('FontName'));
+      assertWellFormed(isName(fontName), 'invalid font name');
+
+      var fontFile = descriptor.get('FontFile', 'FontFile2', 'FontFile3');
+      if (fontFile) {
+        fontFile = xref.fetchIfRef(fontFile);
+        if (fontFile.dict) {
+          var subtype = fontFile.dict.get('Subtype');
+          if (subtype)
+            subtype = subtype.name;
+
+          var length1 = fontFile.dict.get('Length1');
+          if (!isInt(length1))
+            length1 = xref.fetchIfRef(length1);
+
+          var length2 = fontFile.dict.get('Length2');
+          if (!isInt(length2))
+            length2 = xref.fetchIfRef(length2);
+        }
+      }
+
+      var properties = {
+        type: type.name,
+        subtype: subtype,
+        file: fontFile,
+        length1: length1,
+        length2: length2,
+        composite: composite,
+        fixedPitch: false,
+        fontMatrix: dict.get('FontMatrix') || IDENTITY_MATRIX,
+        firstChar: firstChar || 0,
+        lastChar: lastChar || maxCharIndex,
+        bbox: descriptor.get('FontBBox'),
+        ascent: descriptor.get('Ascent'),
+        descent: descriptor.get('Descent'),
+        xHeight: descriptor.get('XHeight'),
+        capHeight: descriptor.get('CapHeight'),
+        flags: descriptor.get('Flags'),
+        italicAngle: descriptor.get('ItalicAngle'),
+        coded: false
+      };
+      this.extractWidths(dict, xref, descriptor, properties);
+      this.extractDataStructures(dict, baseDict, xref, properties);
+
+      if (type.name === 'Type3') {
+        properties.coded = true;
+        var charProcs = xref.fetchIfRef(dict.get('CharProcs'));
+        var fontResources = xref.fetchIfRef(dict.get('Resources')) || resources;
+        properties.resources = fontResources;
+        properties.charProcIRQueues = {};
+        for (var key in charProcs.map) {
+          var glyphStream = xref.fetchIfRef(charProcs.map[key]);
+          var queueObj = {};
+          properties.charProcIRQueues[key] =
+            this.getIRQueue(glyphStream, fontResources, queueObj, dependency);
+        }
+      }
+
+      return {
+        name: fontName.name,
+        dict: baseDict,
+        file: fontFile,
+        properties: properties
+      };
+    }
+  };
+
+  return constructor;
+})();
+
+var EvalState = (function evalState() {
+  function constructor() {
+    // Are soft masks and alpha values shapes or opacities?
+    this.alphaIsShape = false;
+    this.fontSize = 0;
+    this.textMatrix = IDENTITY_MATRIX;
+    this.leading = 0;
+    // Start of text line (in text coordinates)
+    this.lineX = 0;
+    this.lineY = 0;
+    // Character and word spacing
+    this.charSpacing = 0;
+    this.wordSpacing = 0;
+    this.textHScale = 1;
+    // Color spaces
+    this.fillColorSpace = null;
+    this.strokeColorSpace = null;
+  }
+  constructor.prototype = {
+  };
+  return constructor;
+})();
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/fonts.js b/apps/files_pdfviewer/js/pdfjs/src/fonts.js
new file mode 100755
index 00000000000..116bb4dfc71
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/fonts.js
@@ -0,0 +1,3568 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var isWorker = (typeof window == 'undefined');
+
+/**
+ * Maximum time to wait for a font to be loaded by font-face rules.
+ */
+var kMaxWaitForFontFace = 1000;
+
+// Unicode Private Use Area
+var kCmapGlyphOffset = 0xE000;
+var kSizeOfGlyphArea = 0x1900;
+
+// PDF Glyph Space Units are one Thousandth of a TextSpace Unit
+// except for Type 3 fonts
+var kPDFGlyphSpaceUnits = 1000;
+
+// Until hinting is fully supported this constant can be used
+var kHintingEnabled = false;
+
+var Encodings = {
+  get ExpertEncoding() {
+    return shadow(this, 'ExpertEncoding', ['', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', 'space', 'exclamsmall', 'Hungarumlautsmall', '',
+      'dollaroldstyle', 'dollarsuperior', 'ampersandsmall', 'Acutesmall',
+      'parenleftsuperior', 'parenrightsuperior', 'twodotenleader',
+      'onedotenleader', 'comma', 'hyphen', 'period', 'fraction',
+      'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle',
+      'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle',
+      'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon', 'commasuperior',
+      'threequartersemdash', 'periodsuperior', 'questionsmall', '',
+      'asuperior', 'bsuperior', 'centsuperior', 'dsuperior', 'esuperior', '',
+      '', 'isuperior', '', '', 'lsuperior', 'msuperior', 'nsuperior',
+      'osuperior', '', '', 'rsuperior', 'ssuperior', 'tsuperior', '', 'ff',
+      'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior', '', 'parenrightinferior',
+      'Circumflexsmall', 'hyphensuperior', 'Gravesmall', 'Asmall', 'Bsmall',
+      'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall',
+      'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall',
+      'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall',
+      'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah',
+      'Tildesmall', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall', '', '',
+      'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall',
+      'Caronsmall', '', 'Dotaccentsmall', '', '', 'Macronsmall', '', '',
+      'figuredash', 'hypheninferior', '', '', 'Ogoneksmall', 'Ringsmall',
+      'Cedillasmall', '', '', '', 'onequarter', 'onehalf', 'threequarters',
+      'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths',
+      'seveneighths', 'onethird', 'twothirds', '', '', 'zerosuperior',
+      'onesuperior', 'twosuperior', 'threesuperior', 'foursuperior',
+      'fivesuperior', 'sixsuperior', 'sevensuperior', 'eightsuperior',
+      'ninesuperior', 'zeroinferior', 'oneinferior', 'twoinferior',
+      'threeinferior', 'fourinferior', 'fiveinferior', 'sixinferior',
+      'seveninferior', 'eightinferior', 'nineinferior', 'centinferior',
+      'dollarinferior', 'periodinferior', 'commainferior', 'Agravesmall',
+      'Aacutesmall', 'Acircumflexsmall', 'Atildesmall', 'Adieresissmall',
+      'Aringsmall', 'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall',
+      'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall',
+      'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall',
+      'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall',
+      'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall',
+      'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall',
+      'Ydieresissmall'
+    ]);
+  },
+  get MacExpertEncoding() {
+    return shadow(this, 'MacExpertEncoding', ['', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', 'space', 'exclamsmall', 'Hungarumlautsmall',
+      'centoldstyle', 'dollaroldstyle', 'dollarsuperior', 'ampersandsmall',
+      'Acutesmall', 'parenleftsuperior', 'parenrightsuperior',
+      'twodotenleader', 'onedotenleader', 'comma', 'hyphen', 'period',
+      'fraction', 'zerooldstyle', 'oneoldstyle', 'twooldstyle',
+      'threeoldstyle', 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle',
+      'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon',
+      '', 'threequartersemdash', '', 'questionsmall', '', '', '', '',
+      'Ethsmall', '', '', 'onequarter', 'onehalf', 'threequarters',
+      'oneeighth', 'threeeighths', 'fiveeighths', 'seveneighths', 'onethird',
+      'twothirds', '', '', '', '', '', '', 'ff', 'fi', 'fl', 'ffi', 'ffl',
+      'parenleftinferior', '', 'parenrightinferior', 'Circumflexsmall',
+      'hypheninferior', 'Gravesmall', 'Asmall', 'Bsmall', 'Csmall', 'Dsmall',
+      'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall', 'Jsmall', 'Ksmall',
+      'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall', 'Qsmall', 'Rsmall',
+      'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall',
+      'Zsmall', 'colonmonetary', 'onefitted', 'rupiah', 'Tildesmall', '', '',
+      'asuperior', 'centsuperior', '', '', '', '', 'Aacutesmall',
+      'Agravesmall', 'Acircumflexsmall', 'Adieresissmall', 'Atildesmall',
+      'Aringsmall', 'Ccedillasmall', 'Eacutesmall', 'Egravesmall',
+      'Ecircumflexsmall', 'Edieresissmall', 'Iacutesmall', 'Igravesmall',
+      'Icircumflexsmall', 'Idieresissmall', 'Ntildesmall', 'Oacutesmall',
+      'Ogravesmall', 'Ocircumflexsmall', 'Odieresissmall', 'Otildesmall',
+      'Uacutesmall', 'Ugravesmall', 'Ucircumflexsmall', 'Udieresissmall', '',
+      'eightsuperior', 'fourinferior', 'threeinferior', 'sixinferior',
+      'eightinferior', 'seveninferior', 'Scaronsmall', '', 'centinferior',
+      'twoinferior', '', 'Dieresissmall', '', 'Caronsmall', 'osuperior',
+      'fiveinferior', '', 'commainferior', 'periodinferior', 'Yacutesmall', '',
+      'dollarinferior', '', 'Thornsmall', '', 'nineinferior', 'zeroinferior',
+      'Zcaronsmall', 'AEsmall', 'Oslashsmall', 'questiondownsmall',
+      'oneinferior', 'Lslashsmall', '', '', '', '', '', '', 'Cedillasmall', '',
+      '', '', '', '', 'OEsmall', 'figuredash', 'hyphensuperior', '', '', '',
+      '', 'exclamdownsmall', '', 'Ydieresissmall', '', 'onesuperior',
+      'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior',
+      'sixsuperior', 'sevensuperior', 'ninesuperior', 'zerosuperior', '',
+      'esuperior', 'rsuperior', 'tsuperior', '', '', 'isuperior', 'ssuperior',
+      'dsuperior', '', '', '', '', '', 'lsuperior', 'Ogoneksmall',
+      'Brevesmall', 'Macronsmall', 'bsuperior', 'nsuperior', 'msuperior',
+      'commasuperior', 'periodsuperior', 'Dotaccentsmall', 'Ringsmall'
+    ]);
+  },
+  get MacRomanEncoding() {
+    return shadow(this, 'MacRomanEncoding', ['', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', 'space', 'exclam', 'quotedbl', 'numbersign',
+      'dollar', 'percent', 'ampersand', 'quotesingle', 'parenleft',
+      'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash',
+      'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
+      'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question',
+      'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+      'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+      'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore',
+      'grave', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+      'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+      'braceleft', 'bar', 'braceright', 'asciitilde', '', 'Adieresis', 'Aring',
+      'Ccedilla', 'Eacute', 'Ntilde', 'Odieresis', 'Udieresis', 'aacute',
+      'agrave', 'acircumflex', 'adieresis', 'atilde', 'aring', 'ccedilla',
+      'eacute', 'egrave', 'ecircumflex', 'edieresis', 'iacute', 'igrave',
+      'icircumflex', 'idieresis', 'ntilde', 'oacute', 'ograve', 'ocircumflex',
+      'odieresis', 'otilde', 'uacute', 'ugrave', 'ucircumflex', 'udieresis',
+      'dagger', 'degree', 'cent', 'sterling', 'section', 'bullet', 'paragraph',
+      'germandbls', 'registered', 'copyright', 'trademark', 'acute',
+      'dieresis', 'notequal', 'AE', 'Oslash', 'infinity', 'plusminus',
+      'lessequal', 'greaterequal', 'yen', 'mu', 'partialdiff', 'summation',
+      'product', 'pi', 'integral', 'ordfeminine', 'ordmasculine', 'Omega',
+      'ae', 'oslash', 'questiondown', 'exclamdown', 'logicalnot', 'radical',
+      'florin', 'approxequal', 'Delta', 'guillemotleft', 'guillemotright',
+      'ellipsis', 'space', 'Agrave', 'Atilde', 'Otilde', 'OE', 'oe', 'endash',
+      'emdash', 'quotedblleft', 'quotedblright', 'quoteleft', 'quoteright',
+      'divide', 'lozenge', 'ydieresis', 'Ydieresis', 'fraction', 'currency',
+      'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'daggerdbl',
+      'periodcentered', 'quotesinglbase', 'quotedblbase', 'perthousand',
+      'Acircumflex', 'Ecircumflex', 'Aacute', 'Edieresis', 'Egrave', 'Iacute',
+      'Icircumflex', 'Idieresis', 'Igrave', 'Oacute', 'Ocircumflex', 'apple',
+      'Ograve', 'Uacute', 'Ucircumflex', 'Ugrave', 'dotlessi', 'circumflex',
+      'tilde', 'macron', 'breve', 'dotaccent', 'ring', 'cedilla',
+      'hungarumlaut', 'ogonek', 'caron'
+    ]);
+  },
+  get StandardEncoding() {
+    return shadow(this, 'StandardEncoding', ['', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', 'space', 'exclam', 'quotedbl', 'numbersign',
+      'dollar', 'percent', 'ampersand', 'quoteright', 'parenleft',
+      'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash',
+      'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
+      'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question',
+      'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+      'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+      'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore',
+      'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+      'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+      'braceleft', 'bar', 'braceright', 'asciitilde', '', '', 'exclamdown',
+      'cent', 'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
+      'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
+      'guilsinglright', 'fi', 'fl', '', 'endash', 'dagger', 'daggerdbl',
+      'periodcentered', '', 'paragraph', 'bullet', 'quotesinglbase',
+      'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis',
+      'perthousand', '', 'questiondown', '', 'grave', 'acute', 'circumflex',
+      'tilde', 'macron', 'breve', 'dotaccent', 'dieresis', '', 'ring',
+      'cedilla', '', 'hungarumlaut', 'ogonek', 'caron', 'emdash', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', 'AE', '',
+      'ordfeminine', '', '', '', '', 'Lslash', 'Oslash', 'OE', 'ordmasculine',
+      '', '', '', '', '', 'ae', '', '', '', 'dotlessi', '', '', 'lslash',
+      'oslash', 'oe', 'germandbls'
+    ]);
+  },
+  get WinAnsiEncoding() {
+    return shadow(this, 'WinAnsiEncoding', ['', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', 'space', 'exclam', 'quotedbl', 'numbersign',
+      'dollar', 'percent', 'ampersand', 'quotesingle', 'parenleft',
+      'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash',
+      'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
+      'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question',
+      'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+      'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+      'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore',
+      'grave', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+      'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+      'braceleft', 'bar', 'braceright', 'asciitilde', 'bullet', 'Euro',
+      'bullet', 'quotesinglbase', 'florin', 'quotedblbase', 'ellipsis',
+      'dagger', 'daggerdbl', 'circumflex', 'perthousand', 'Scaron',
+      'guilsinglleft', 'OE', 'bullet', 'Zcaron', 'bullet', 'bullet',
+      'quoteleft', 'quoteright', 'quotedblleft', 'quotedblright', 'bullet',
+      'endash', 'emdash', 'tilde', 'trademark', 'scaron', 'guilsinglright',
+      'oe', 'bullet', 'zcaron', 'Ydieresis', 'space', 'exclamdown', 'cent',
+      'sterling', 'currency', 'yen', 'brokenbar', 'section', 'dieresis',
+      'copyright', 'ordfeminine', 'guillemotleft', 'logicalnot', 'hyphen',
+      'registered', 'macron', 'degree', 'plusminus', 'twosuperior',
+      'threesuperior', 'acute', 'mu', 'paragraph', 'periodcentered',
+      'cedilla', 'onesuperior', 'ordmasculine', 'guillemotright', 'onequarter',
+      'onehalf', 'threequarters', 'questiondown', 'Agrave', 'Aacute',
+      'Acircumflex', 'Atilde', 'Adieresis', 'Aring', 'AE', 'Ccedilla',
+      'Egrave', 'Eacute', 'Ecircumflex', 'Edieresis', 'Igrave', 'Iacute',
+      'Icircumflex', 'Idieresis', 'Eth', 'Ntilde', 'Ograve', 'Oacute',
+      'Ocircumflex', 'Otilde', 'Odieresis', 'multiply', 'Oslash', 'Ugrave',
+      'Uacute', 'Ucircumflex', 'Udieresis', 'Yacute', 'Thorn', 'germandbls',
+      'agrave', 'aacute', 'acircumflex', 'atilde', 'adieresis', 'aring', 'ae',
+      'ccedilla', 'egrave', 'eacute', 'ecircumflex', 'edieresis', 'igrave',
+      'iacute', 'icircumflex', 'idieresis', 'eth', 'ntilde', 'ograve',
+      'oacute', 'ocircumflex', 'otilde', 'odieresis', 'divide', 'oslash',
+      'ugrave', 'uacute', 'ucircumflex', 'udieresis', 'yacute', 'thorn',
+      'ydieresis'
+    ]);
+  },
+  get symbolsEncoding() {
+    return shadow(this, 'symbolsEncoding', ['', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', 'space', 'exclam', 'universal', 'numbersign',
+      'existential', 'percent', 'ampersand', 'suchthat', 'parenleft',
+      'parenright', 'asteriskmath', 'plus', 'comma', 'minus', 'period',
+      'slash', 'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven',
+      'eight', 'nine', 'colon', 'semicolon', 'less', 'equal', 'greater',
+      'question', 'congruent', 'Alpha', 'Beta', 'Chi', 'Delta', 'Epsilon',
+      'Phi', 'Gamma', 'Eta', 'Iota', 'theta1', 'Kappa', 'Lambda', 'Mu', 'Nu',
+      'Omicron', 'Pi', 'Theta', 'Rho', 'Sigma', 'Tau', 'Upsilon', 'sigma1',
+      'Omega', 'Xi', 'Psi', 'Zeta', 'bracketleft', 'therefore', 'bracketright',
+      'perpendicular', 'underscore', 'radicalex', 'alpha', 'beta', 'chi',
+      'delta', 'epsilon', 'phi', 'gamma', 'eta', 'iota', 'phi1', 'kappa',
+      'lambda', 'mu', 'nu', 'omicron', 'pi', 'theta', 'rho', 'sigma', 'tau',
+      'upsilon', 'omega1', 'omega', 'xi', 'psi', 'zeta', 'braceleft', 'bar',
+      'braceright', 'similar', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', 'Euro', 'Upsilon1', 'minute', 'lessequal', 'fraction',
+      'infinity', 'florin', 'club', 'diamond', 'heart', 'spade', 'arrowboth',
+      'arrowleft', 'arrowup', 'arrowright', 'arrowdown', 'degree', 'plusminus',
+      'second', 'greaterequal', 'multiply', 'proportional', 'partialdiff',
+      'bullet', 'divide', 'notequal', 'equivalence', 'approxequal', 'ellipsis',
+      'arrowvertex', 'arrowhorizex', 'carriagereturn', 'aleph', 'Ifraktur',
+      'Rfraktur', 'weierstrass', 'circlemultiply', 'circleplus', 'emptyset',
+      'intersection', 'union', 'propersuperset', 'reflexsuperset', 'notsubset',
+      'propersubset', 'reflexsubset', 'element', 'notelement', 'angle',
+      'gradient', 'registerserif', 'copyrightserif', 'trademarkserif',
+      'product', 'radical', 'dotmath', 'logicalnot', 'logicaland', 'logicalor',
+      'arrowdblboth', 'arrowdblleft', 'arrowdblup', 'arrowdblright',
+      'arrowdbldown', 'lozenge', 'angleleft', 'registersans', 'copyrightsans',
+      'trademarksans', 'summation', 'parenlefttp', 'parenleftex',
+      'parenleftbt', 'bracketlefttp', 'bracketleftex', 'bracketleftbt',
+      'bracelefttp', 'braceleftmid', 'braceleftbt', 'braceex', '',
+      'angleright', 'integral', 'integraltp', 'integralex', 'integralbt',
+      'parenrighttp', 'parenrightex', 'parenrightbt', 'bracketrighttp',
+      'bracketrightex', 'bracketrightbt', 'bracerighttp', 'bracerightmid',
+      'bracerightbt'
+    ]);
+  },
+  get zapfDingbatsEncoding() {
+    return shadow(this, 'zapfDingbatsEncoding', ['', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', 'space', 'a1', 'a2', 'a202', 'a3', 'a4',
+      'a5', 'a119', 'a118', 'a117', 'a11', 'a12', 'a13', 'a14', 'a15', 'a16',
+      'a105', 'a17', 'a18', 'a19', 'a20', 'a21', 'a22', 'a23', 'a24', 'a25',
+      'a26', 'a27', 'a28', 'a6', 'a7', 'a8', 'a9', 'a10', 'a29', 'a30', 'a31',
+      'a32', 'a33', 'a34', 'a35', 'a36', 'a37', 'a38', 'a39', 'a40', 'a41',
+      'a42', 'a43', 'a44', 'a45', 'a46', 'a47', 'a48', 'a49', 'a50', 'a51',
+      'a52', 'a53', 'a54', 'a55', 'a56', 'a57', 'a58', 'a59', 'a60', 'a61',
+      'a62', 'a63', 'a64', 'a65', 'a66', 'a67', 'a68', 'a69', 'a70', 'a71',
+      'a72', 'a73', 'a74', 'a203', 'a75', 'a204', 'a76', 'a77', 'a78', 'a79',
+      'a81', 'a82', 'a83', 'a84', 'a97', 'a98', 'a99', 'a100', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+      '', '', '', '', '', '', '', '', '', '', '', '', 'a101', 'a102', 'a103',
+      'a104', 'a106', 'a107', 'a108', 'a112', 'a111', 'a110', 'a109', 'a120',
+      'a121', 'a122', 'a123', 'a124', 'a125', 'a126', 'a127', 'a128', 'a129',
+      'a130', 'a131', 'a132', 'a133', 'a134', 'a135', 'a136', 'a137', 'a138',
+      'a139', 'a140', 'a141', 'a142', 'a143', 'a144', 'a145', 'a146', 'a147',
+      'a148', 'a149', 'a150', 'a151', 'a152', 'a153', 'a154', 'a155', 'a156',
+      'a157', 'a158', 'a159', 'a160', 'a161', 'a163', 'a164', 'a196', 'a165',
+      'a192', 'a166', 'a167', 'a168', 'a169', 'a170', 'a171', 'a172', 'a173',
+      'a162', 'a174', 'a175', 'a176', 'a177', 'a178', 'a179', 'a193', 'a180',
+      'a199', 'a181', 'a200', 'a182', '', 'a201', 'a183', 'a184', 'a197',
+      'a185', 'a194', 'a198', 'a186', 'a195', 'a187', 'a188', 'a189', 'a190',
+      'a191'
+    ]);
+  }
+};
+
+/**
+ * Hold a map of decoded fonts and of the standard fourteen Type1
+ * fonts and their acronyms.
+ */
+var stdFontMap = {
+  'ArialNarrow': 'Helvetica',
+  'ArialNarrow-Bold': 'Helvetica-Bold',
+  'ArialNarrow-BoldItalic': 'Helvetica-BoldOblique',
+  'ArialNarrow-Italic': 'Helvetica-Oblique',
+  'ArialBlack': 'Helvetica',
+  'ArialBlack-Bold': 'Helvetica-Bold',
+  'ArialBlack-BoldItalic': 'Helvetica-BoldOblique',
+  'ArialBlack-Italic': 'Helvetica-Oblique',
+  'Arial': 'Helvetica',
+  'Arial-Bold': 'Helvetica-Bold',
+  'Arial-BoldItalic': 'Helvetica-BoldOblique',
+  'Arial-Italic': 'Helvetica-Oblique',
+  'Arial-BoldItalicMT': 'Helvetica-BoldOblique',
+  'Arial-BoldMT': 'Helvetica-Bold',
+  'Arial-ItalicMT': 'Helvetica-Oblique',
+  'ArialMT': 'Helvetica',
+  'Courier-Bold': 'Courier-Bold',
+  'Courier-BoldItalic': 'Courier-BoldOblique',
+  'Courier-Italic': 'Courier-Oblique',
+  'CourierNew': 'Courier',
+  'CourierNew-Bold': 'Courier-Bold',
+  'CourierNew-BoldItalic': 'Courier-BoldOblique',
+  'CourierNew-Italic': 'Courier-Oblique',
+  'CourierNewPS-BoldItalicMT': 'Courier-BoldOblique',
+  'CourierNewPS-BoldMT': 'Courier-Bold',
+  'CourierNewPS-ItalicMT': 'Courier-Oblique',
+  'CourierNewPSMT': 'Courier',
+  'Helvetica-Bold': 'Helvetica-Bold',
+  'Helvetica-BoldItalic': 'Helvetica-BoldOblique',
+  'Helvetica-Italic': 'Helvetica-Oblique',
+  'Symbol-Bold': 'Symbol',
+  'Symbol-BoldItalic': 'Symbol',
+  'Symbol-Italic': 'Symbol',
+  'TimesNewRoman': 'Times-Roman',
+  'TimesNewRoman-Bold': 'Times-Bold',
+  'TimesNewRoman-BoldItalic': 'Times-BoldItalic',
+  'TimesNewRoman-Italic': 'Times-Italic',
+  'TimesNewRomanPS': 'Times-Roman',
+  'TimesNewRomanPS-Bold': 'Times-Bold',
+  'TimesNewRomanPS-BoldItalic': 'Times-BoldItalic',
+  'TimesNewRomanPS-BoldItalicMT': 'Times-BoldItalic',
+  'TimesNewRomanPS-BoldMT': 'Times-Bold',
+  'TimesNewRomanPS-Italic': 'Times-Italic',
+  'TimesNewRomanPS-ItalicMT': 'Times-Italic',
+  'TimesNewRomanPSMT': 'Times-Roman',
+  'TimesNewRomanPSMT-Bold': 'Times-Bold',
+  'TimesNewRomanPSMT-BoldItalic': 'Times-BoldItalic',
+  'TimesNewRomanPSMT-Italic': 'Times-Italic'
+};
+
+var serifFonts = {
+  'Adobe Jenson': true, 'Adobe Text': true, 'Albertus': true,
+  'Aldus': true, 'Alexandria': true, 'Algerian': true,
+  'American Typewriter': true, 'Antiqua': true, 'Apex': true,
+  'Arno': true, 'Aster': true, 'Aurora': true,
+  'Baskerville': true, 'Bell': true, 'Bembo': true,
+  'Bembo Schoolbook': true, 'Benguiat': true, 'Berkeley Old Style': true,
+  'Bernhard Modern': true, 'Berthold City': true, 'Bodoni': true,
+  'Bauer Bodoni': true, 'Book Antiqua': true, 'Bookman': true,
+  'Bordeaux Roman': true, 'Californian FB': true, 'Calisto': true,
+  'Calvert': true, 'Capitals': true, 'Cambria': true,
+  'Cartier': true, 'Caslon': true, 'Catull': true,
+  'Centaur': true, 'Century Old Style': true, 'Century Schoolbook': true,
+  'Chaparral': true, 'Charis SIL': true, 'Cheltenham': true,
+  'Cholla Slab': true, 'Clarendon': true, 'Clearface': true,
+  'Cochin': true, 'Colonna': true, 'Computer Modern': true,
+  'Concrete Roman': true, 'Constantia': true, 'Cooper Black': true,
+  'Corona': true, 'Ecotype': true, 'Egyptienne': true,
+  'Elephant': true, 'Excelsior': true, 'Fairfield': true,
+  'FF Scala': true, 'Folkard': true, 'Footlight': true,
+  'FreeSerif': true, 'Friz Quadrata': true, 'Garamond': true,
+  'Gentium': true, 'Georgia': true, 'Gloucester': true,
+  'Goudy Old Style': true, 'Goudy Schoolbook': true, 'Goudy Pro Font': true,
+  'Granjon': true, 'Guardian Egyptian': true, 'Heather': true,
+  'Hercules': true, 'High Tower Text': true, 'Hiroshige': true,
+  'Hoefler Text': true, 'Humana Serif': true, 'Imprint': true,
+  'Ionic No. 5': true, 'Janson': true, 'Joanna': true,
+  'Korinna': true, 'Lexicon': true, 'Liberation Serif': true,
+  'Linux Libertine': true, 'Literaturnaya': true, 'Lucida': true,
+  'Lucida Bright': true, 'Melior': true, 'Memphis': true,
+  'Miller': true, 'Minion': true, 'Modern': true,
+  'Mona Lisa': true, 'Mrs Eaves': true, 'MS Serif': true,
+  'Museo Slab': true, 'New York': true, 'Nimbus Roman': true,
+  'NPS Rawlinson Roadway': true, 'Palatino': true, 'Perpetua': true,
+  'Plantin': true, 'Plantin Schoolbook': true, 'Playbill': true,
+  'Poor Richard': true, 'Rawlinson Roadway': true, 'Renault': true,
+  'Requiem': true, 'Rockwell': true, 'Roman': true,
+  'Rotis Serif': true, 'Sabon': true, 'Scala': true,
+  'Seagull': true, 'Sistina': true, 'Souvenir': true,
+  'STIX': true, 'Stone Informal': true, 'Stone Serif': true,
+  'Sylfaen': true, 'Times': true, 'Trajan': true,
+  'Trinité': true, 'Trump Mediaeval': true, 'Utopia': true,
+  'Vale Type': true, 'Bitstream Vera': true, 'Vera Serif': true,
+  'Versailles': true, 'Wanted': true, 'Weiss': true,
+  'Wide Latin': true, 'Windsor': true, 'XITS': true
+};
+
+var FontLoader = {
+  listeningForFontLoad: false,
+
+  bind: function fontLoaderBind(fonts, callback) {
+    function checkFontsLoaded() {
+      for (var i = 0, ii = objs.length; i < ii; i++) {
+        var fontObj = objs[i];
+        if (fontObj.loading) {
+          return false;
+        }
+      }
+
+      document.documentElement.removeEventListener(
+        'pdfjsFontLoad', checkFontsLoaded, false);
+
+      callback();
+      return true;
+    }
+
+    var rules = [], names = [], objs = [];
+
+    for (var i = 0, ii = fonts.length; i < ii; i++) {
+      var font = fonts[i];
+
+      // If there is already a fontObj on the font, then it was loaded/attached
+      // to the page already and we don't have to do anything for this font
+      // here future.
+      if (font.fontObj) {
+        continue;
+      }
+
+      var obj = new Font(font.name, font.file, font.properties);
+
+      // Store the fontObj on the font such that `setFont` in CanvasGraphics
+      // can reuse it later again.
+      font.fontObj = obj;
+
+      objs.push(obj);
+
+      var str = '';
+      var data = obj.data;
+      if (data) {
+        var length = data.length;
+        for (var j = 0; j < length; j++)
+          str += String.fromCharCode(data[j]);
+
+        var rule = isWorker ? obj.bindWorker(str) : obj.bindDOM(str);
+        if (rule) {
+          rules.push(rule);
+          names.push(obj.loadedName);
+        }
+      }
+    }
+
+    this.listeningForFontLoad = false;
+    if (!isWorker && rules.length) {
+      FontLoader.prepareFontLoadEvent(rules, names, objs);
+    }
+
+    if (!checkFontsLoaded()) {
+      document.documentElement.addEventListener(
+        'pdfjsFontLoad', checkFontsLoaded, false);
+    }
+
+    return objs;
+  },
+  // Set things up so that at least one pdfjsFontLoad event is
+  // dispatched when all the @font-face |rules| for |names| have been
+  // loaded in a subdocument.  It's expected that the load of |rules|
+  // has already started in this (outer) document, so that they should
+  // be ordered before the load in the subdocument.
+  prepareFontLoadEvent: function fontLoaderPrepareFontLoadEvent(rules, names,
+                                                                objs) {
+      /** Hack begin */
+      // There's no event when a font has finished downloading so the
+      // following code is a dirty hack to 'guess' when a font is
+      // ready.  This code will be obsoleted by Mozilla bug 471915.
+      //
+      // The only reliable way to know if a font is loaded in Gecko
+      // (at the moment) is document.onload in a document with
+      // a @font-face rule defined in a "static" stylesheet.  We use a
+      // subdocument in an <iframe>, set up properly, to know when
+      // our @font-face rule was loaded.  However, the subdocument and
+      // outer document can't share CSS rules, so the inner document
+      // is only part of the puzzle.  The second piece is an invisible
+      // div created in order to force loading of the @font-face in
+      // the *outer* document.  (The font still needs to be loaded for
+      // its metrics, for reflow).  We create the div first for the
+      // outer document, then create the iframe.  Unless something
+      // goes really wonkily, we expect the @font-face for the outer
+      // document to be processed before the inner.  That's still
+      // fragile, but seems to work in practice.
+      //
+      // The postMessage() hackery was added to work around chrome bug
+      // 82402.
+
+      var div = document.createElement('div');
+      div.setAttribute('style',
+                       'visibility: hidden;' +
+                       'width: 10px; height: 10px;' +
+                       'position: absolute; top: 0px; left: 0px;');
+      var html = '';
+      for (var i = 0, ii = names.length; i < ii; ++i) {
+        html += '<span style="font-family:' + names[i] + '">Hi</span>';
+      }
+      div.innerHTML = html;
+      document.body.appendChild(div);
+
+      if (!this.listeningForFontLoad) {
+        window.addEventListener(
+          'message',
+          function fontLoaderMessage(e) {
+            var fontNames = JSON.parse(e.data);
+            for (var i = 0, ii = objs.length; i < ii; ++i) {
+              var font = objs[i];
+              font.loading = false;
+            }
+            var evt = document.createEvent('Events');
+            evt.initEvent('pdfjsFontLoad', true, false);
+            document.documentElement.dispatchEvent(evt);
+          },
+          false);
+        this.listeningForFontLoad = true;
+      }
+
+      // XXX we should have a time-out here too, and maybe fire
+      // pdfjsFontLoadFailed?
+      var src = '<!DOCTYPE HTML><html><head>';
+      src += '<style type="text/css">';
+      for (var i = 0, ii = rules.length; i < ii; ++i) {
+        src += rules[i];
+      }
+      src += '</style>';
+      src += '<script type="application/javascript">';
+      var fontNamesArray = '';
+      for (var i = 0, ii = names.length; i < ii; ++i) {
+        fontNamesArray += '"' + names[i] + '", ';
+      }
+      src += '  var fontNames=[' + fontNamesArray + '];\n';
+      src += '  window.onload = function fontLoaderOnload() {\n';
+      src += '    parent.postMessage(JSON.stringify(fontNames), "*");\n';
+      src += '  }';
+      src += '</script></head><body>';
+      for (var i = 0, ii = names.length; i < ii; ++i) {
+        src += '<p style="font-family:\'' + names[i] + '\'">Hi</p>';
+      }
+      src += '</body></html>';
+      var frame = document.createElement('iframe');
+      frame.src = 'data:text/html,' + src;
+      frame.setAttribute('style',
+                         'visibility: hidden;' +
+                         'width: 10px; height: 10px;' +
+                         'position: absolute; top: 0px; left: 0px;');
+      document.body.appendChild(frame);
+      /** Hack end */
+  }
+};
+
+var UnicodeRanges = [
+  { 'begin': 0x0000, 'end': 0x007F }, // Basic Latin
+  { 'begin': 0x0080, 'end': 0x00FF }, // Latin-1 Supplement
+  { 'begin': 0x0100, 'end': 0x017F }, // Latin Extended-A
+  { 'begin': 0x0180, 'end': 0x024F }, // Latin Extended-B
+  { 'begin': 0x0250, 'end': 0x02AF }, // IPA Extensions
+  { 'begin': 0x02B0, 'end': 0x02FF }, // Spacing Modifier Letters
+  { 'begin': 0x0300, 'end': 0x036F }, // Combining Diacritical Marks
+  { 'begin': 0x0370, 'end': 0x03FF }, // Greek and Coptic
+  { 'begin': 0x2C80, 'end': 0x2CFF }, // Coptic
+  { 'begin': 0x0400, 'end': 0x04FF }, // Cyrillic
+  { 'begin': 0x0530, 'end': 0x058F }, // Armenian
+  { 'begin': 0x0590, 'end': 0x05FF }, // Hebrew
+  { 'begin': 0xA500, 'end': 0xA63F }, // Vai
+  { 'begin': 0x0600, 'end': 0x06FF }, // Arabic
+  { 'begin': 0x07C0, 'end': 0x07FF }, // NKo
+  { 'begin': 0x0900, 'end': 0x097F }, // Devanagari
+  { 'begin': 0x0980, 'end': 0x09FF }, // Bengali
+  { 'begin': 0x0A00, 'end': 0x0A7F }, // Gurmukhi
+  { 'begin': 0x0A80, 'end': 0x0AFF }, // Gujarati
+  { 'begin': 0x0B00, 'end': 0x0B7F }, // Oriya
+  { 'begin': 0x0B80, 'end': 0x0BFF }, // Tamil
+  { 'begin': 0x0C00, 'end': 0x0C7F }, // Telugu
+  { 'begin': 0x0C80, 'end': 0x0CFF }, // Kannada
+  { 'begin': 0x0D00, 'end': 0x0D7F }, // Malayalam
+  { 'begin': 0x0E00, 'end': 0x0E7F }, // Thai
+  { 'begin': 0x0E80, 'end': 0x0EFF }, // Lao
+  { 'begin': 0x10A0, 'end': 0x10FF }, // Georgian
+  { 'begin': 0x1B00, 'end': 0x1B7F }, // Balinese
+  { 'begin': 0x1100, 'end': 0x11FF }, // Hangul Jamo
+  { 'begin': 0x1E00, 'end': 0x1EFF }, // Latin Extended Additional
+  { 'begin': 0x1F00, 'end': 0x1FFF }, // Greek Extended
+  { 'begin': 0x2000, 'end': 0x206F }, // General Punctuation
+  { 'begin': 0x2070, 'end': 0x209F }, // Superscripts And Subscripts
+  { 'begin': 0x20A0, 'end': 0x20CF }, // Currency Symbol
+  { 'begin': 0x20D0, 'end': 0x20FF }, // Combining Diacritical Marks For Symbols
+  { 'begin': 0x2100, 'end': 0x214F }, // Letterlike Symbols
+  { 'begin': 0x2150, 'end': 0x218F }, // Number Forms
+  { 'begin': 0x2190, 'end': 0x21FF }, // Arrows
+  { 'begin': 0x2200, 'end': 0x22FF }, // Mathematical Operators
+  { 'begin': 0x2300, 'end': 0x23FF }, // Miscellaneous Technical
+  { 'begin': 0x2400, 'end': 0x243F }, // Control Pictures
+  { 'begin': 0x2440, 'end': 0x245F }, // Optical Character Recognition
+  { 'begin': 0x2460, 'end': 0x24FF }, // Enclosed Alphanumerics
+  { 'begin': 0x2500, 'end': 0x257F }, // Box Drawing
+  { 'begin': 0x2580, 'end': 0x259F }, // Block Elements
+  { 'begin': 0x25A0, 'end': 0x25FF }, // Geometric Shapes
+  { 'begin': 0x2600, 'end': 0x26FF }, // Miscellaneous Symbols
+  { 'begin': 0x2700, 'end': 0x27BF }, // Dingbats
+  { 'begin': 0x3000, 'end': 0x303F }, // CJK Symbols And Punctuation
+  { 'begin': 0x3040, 'end': 0x309F }, // Hiragana
+  { 'begin': 0x30A0, 'end': 0x30FF }, // Katakana
+  { 'begin': 0x3100, 'end': 0x312F }, // Bopomofo
+  { 'begin': 0x3130, 'end': 0x318F }, // Hangul Compatibility Jamo
+  { 'begin': 0xA840, 'end': 0xA87F }, // Phags-pa
+  { 'begin': 0x3200, 'end': 0x32FF }, // Enclosed CJK Letters And Months
+  { 'begin': 0x3300, 'end': 0x33FF }, // CJK Compatibility
+  { 'begin': 0xAC00, 'end': 0xD7AF }, // Hangul Syllables
+  { 'begin': 0xD800, 'end': 0xDFFF }, // Non-Plane 0 *
+  { 'begin': 0x10900, 'end': 0x1091F }, // Phoenicia
+  { 'begin': 0x4E00, 'end': 0x9FFF }, // CJK Unified Ideographs
+  { 'begin': 0xE000, 'end': 0xF8FF }, // Private Use Area (plane 0)
+  { 'begin': 0x31C0, 'end': 0x31EF }, // CJK Strokes
+  { 'begin': 0xFB00, 'end': 0xFB4F }, // Alphabetic Presentation Forms
+  { 'begin': 0xFB50, 'end': 0xFDFF }, // Arabic Presentation Forms-A
+  { 'begin': 0xFE20, 'end': 0xFE2F }, // Combining Half Marks
+  { 'begin': 0xFE10, 'end': 0xFE1F }, // Vertical Forms
+  { 'begin': 0xFE50, 'end': 0xFE6F }, // Small Form Variants
+  { 'begin': 0xFE70, 'end': 0xFEFF }, // Arabic Presentation Forms-B
+  { 'begin': 0xFF00, 'end': 0xFFEF }, // Halfwidth And Fullwidth Forms
+  { 'begin': 0xFFF0, 'end': 0xFFFF }, // Specials
+  { 'begin': 0x0F00, 'end': 0x0FFF }, // Tibetan
+  { 'begin': 0x0700, 'end': 0x074F }, // Syriac
+  { 'begin': 0x0780, 'end': 0x07BF }, // Thaana
+  { 'begin': 0x0D80, 'end': 0x0DFF }, // Sinhala
+  { 'begin': 0x1000, 'end': 0x109F }, // Myanmar
+  { 'begin': 0x1200, 'end': 0x137F }, // Ethiopic
+  { 'begin': 0x13A0, 'end': 0x13FF }, // Cherokee
+  { 'begin': 0x1400, 'end': 0x167F }, // Unified Canadian Aboriginal Syllabics
+  { 'begin': 0x1680, 'end': 0x169F }, // Ogham
+  { 'begin': 0x16A0, 'end': 0x16FF }, // Runic
+  { 'begin': 0x1780, 'end': 0x17FF }, // Khmer
+  { 'begin': 0x1800, 'end': 0x18AF }, // Mongolian
+  { 'begin': 0x2800, 'end': 0x28FF }, // Braille Patterns
+  { 'begin': 0xA000, 'end': 0xA48F }, // Yi Syllables
+  { 'begin': 0x1700, 'end': 0x171F }, // Tagalog
+  { 'begin': 0x10300, 'end': 0x1032F }, // Old Italic
+  { 'begin': 0x10330, 'end': 0x1034F }, // Gothic
+  { 'begin': 0x10400, 'end': 0x1044F }, // Deseret
+  { 'begin': 0x1D000, 'end': 0x1D0FF }, // Byzantine Musical Symbols
+  { 'begin': 0x1D400, 'end': 0x1D7FF }, // Mathematical Alphanumeric Symbols
+  { 'begin': 0xFF000, 'end': 0xFFFFD }, // Private Use (plane 15)
+  { 'begin': 0xFE00, 'end': 0xFE0F }, // Variation Selectors
+  { 'begin': 0xE0000, 'end': 0xE007F }, // Tags
+  { 'begin': 0x1900, 'end': 0x194F }, // Limbu
+  { 'begin': 0x1950, 'end': 0x197F }, // Tai Le
+  { 'begin': 0x1980, 'end': 0x19DF }, // New Tai Lue
+  { 'begin': 0x1A00, 'end': 0x1A1F }, // Buginese
+  { 'begin': 0x2C00, 'end': 0x2C5F }, // Glagolitic
+  { 'begin': 0x2D30, 'end': 0x2D7F }, // Tifinagh
+  { 'begin': 0x4DC0, 'end': 0x4DFF }, // Yijing Hexagram Symbols
+  { 'begin': 0xA800, 'end': 0xA82F }, // Syloti Nagri
+  { 'begin': 0x10000, 'end': 0x1007F }, // Linear B Syllabary
+  { 'begin': 0x10140, 'end': 0x1018F }, // Ancient Greek Numbers
+  { 'begin': 0x10380, 'end': 0x1039F }, // Ugaritic
+  { 'begin': 0x103A0, 'end': 0x103DF }, // Old Persian
+  { 'begin': 0x10450, 'end': 0x1047F }, // Shavian
+  { 'begin': 0x10480, 'end': 0x104AF }, // Osmanya
+  { 'begin': 0x10800, 'end': 0x1083F }, // Cypriot Syllabary
+  { 'begin': 0x10A00, 'end': 0x10A5F }, // Kharoshthi
+  { 'begin': 0x1D300, 'end': 0x1D35F }, // Tai Xuan Jing Symbols
+  { 'begin': 0x12000, 'end': 0x123FF }, // Cuneiform
+  { 'begin': 0x1D360, 'end': 0x1D37F }, // Counting Rod Numerals
+  { 'begin': 0x1B80, 'end': 0x1BBF }, // Sundanese
+  { 'begin': 0x1C00, 'end': 0x1C4F }, // Lepcha
+  { 'begin': 0x1C50, 'end': 0x1C7F }, // Ol Chiki
+  { 'begin': 0xA880, 'end': 0xA8DF }, // Saurashtra
+  { 'begin': 0xA900, 'end': 0xA92F }, // Kayah Li
+  { 'begin': 0xA930, 'end': 0xA95F }, // Rejang
+  { 'begin': 0xAA00, 'end': 0xAA5F }, // Cham
+  { 'begin': 0x10190, 'end': 0x101CF }, // Ancient Symbols
+  { 'begin': 0x101D0, 'end': 0x101FF }, // Phaistos Disc
+  { 'begin': 0x102A0, 'end': 0x102DF }, // Carian
+  { 'begin': 0x1F030, 'end': 0x1F09F }  // Domino Tiles
+];
+
+var MacStandardGlyphOrdering = [
+  '.notdef', '.null', 'nonmarkingreturn', 'space', 'exclam', 'quotedbl',
+  'numbersign', 'dollar', 'percent', 'ampersand', 'quotesingle', 'parenleft',
+  'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash',
+  'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
+  'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question', 'at',
+  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+  'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'bracketleft',
+  'backslash', 'bracketright', 'asciicircum', 'underscore', 'grave', 'a', 'b',
+  'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q',
+  'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright',
+  'asciitilde', 'Adieresis', 'Aring', 'Ccedilla', 'Eacute', 'Ntilde',
+  'Odieresis', 'Udieresis', 'aacute', 'agrave', 'acircumflex', 'adieresis',
+  'atilde', 'aring', 'ccedilla', 'eacute', 'egrave', 'ecircumflex', 'edieresis',
+  'iacute', 'igrave', 'icircumflex', 'idieresis', 'ntilde', 'oacute', 'ograve',
+  'ocircumflex', 'odieresis', 'otilde', 'uacute', 'ugrave', 'ucircumflex',
+  'udieresis', 'dagger', 'degree', 'cent', 'sterling', 'section', 'bullet',
+  'paragraph', 'germandbls', 'registered', 'copyright', 'trademark', 'acute',
+  'dieresis', 'notequal', 'AE', 'Oslash', 'infinity', 'plusminus', 'lessequal',
+  'greaterequal', 'yen', 'mu', 'partialdiff', 'summation', 'product', 'pi',
+  'integral', 'ordfeminine', 'ordmasculine', 'Omega', 'ae', 'oslash',
+  'questiondown', 'exclamdown', 'logicalnot', 'radical', 'florin',
+  'approxequal', 'Delta', 'guillemotleft', 'guillemotright', 'ellipsis',
+  'nonbreakingspace', 'Agrave', 'Atilde', 'Otilde', 'OE', 'oe', 'endash',
+  'emdash', 'quotedblleft', 'quotedblright', 'quoteleft', 'quoteright',
+  'divide', 'lozenge', 'ydieresis', 'Ydieresis', 'fraction', 'currency',
+  'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'daggerdbl', 'periodcentered',
+  'quotesinglbase', 'quotedblbase', 'perthousand', 'Acircumflex',
+  'Ecircumflex', 'Aacute', 'Edieresis', 'Egrave', 'Iacute', 'Icircumflex',
+  'Idieresis', 'Igrave', 'Oacute', 'Ocircumflex', 'apple', 'Ograve', 'Uacute',
+  'Ucircumflex', 'Ugrave', 'dotlessi', 'circumflex', 'tilde', 'macron',
+  'breve', 'dotaccent', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron',
+  'Lslash', 'lslash', 'Scaron', 'scaron', 'Zcaron', 'zcaron', 'brokenbar',
+  'Eth', 'eth', 'Yacute', 'yacute', 'Thorn', 'thorn', 'minus', 'multiply',
+  'onesuperior', 'twosuperior', 'threesuperior', 'onehalf', 'onequarter',
+  'threequarters', 'franc', 'Gbreve', 'gbreve', 'Idotaccent', 'Scedilla',
+  'scedilla', 'Cacute', 'cacute', 'Ccaron', 'ccaron', 'dcroat'];
+
+function getUnicodeRangeFor(value) {
+  for (var i = 0, ii = UnicodeRanges.length; i < ii; i++) {
+    var range = UnicodeRanges[i];
+    if (value >= range.begin && value < range.end)
+      return i;
+  }
+  return -1;
+}
+
+function adaptUnicode(unicode) {
+  return (unicode <= 0x1F || (unicode >= 127 && unicode < kSizeOfGlyphArea)) ?
+    unicode + kCmapGlyphOffset : unicode;
+}
+
+function isAdaptedUnicode(unicode) {
+  return unicode >= kCmapGlyphOffset &&
+    unicode < kCmapGlyphOffset + kSizeOfGlyphArea;
+}
+
+function isSpecialUnicode(unicode) {
+  return (unicode <= 0x1F || (unicode >= 127 && unicode < kSizeOfGlyphArea)) ||
+    unicode >= kCmapGlyphOffset &&
+    unicode < kCmapGlyphOffset + kSizeOfGlyphArea;
+}
+
+/**
+ * 'Font' is the class the outside world should use, it encapsulate all the font
+ * decoding logics whatever type it is (assuming the font type is supported).
+ *
+ * For example to read a Type1 font and to attach it to the document:
+ *   var type1Font = new Font("MyFontName", binaryFile, propertiesObject);
+ *   type1Font.bind();
+ */
+var Font = (function Font() {
+  var constructor = function font_constructor(name, file, properties) {
+    this.name = name;
+    this.coded = properties.coded;
+    this.charProcIRQueues = properties.charProcIRQueues;
+    this.resources = properties.resources;
+    this.sizes = [];
+
+    var names = name.split('+');
+    names = names.length > 1 ? names[1] : names[0];
+    names = names.split(/[-,_]/g)[0];
+    this.serif = serifFonts[names] || (name.search(/serif/gi) != -1);
+
+    var type = properties.type;
+    this.type = type;
+
+    // If the font is to be ignored, register it like an already loaded font
+    // to avoid the cost of waiting for it be be loaded by the platform.
+    if (properties.ignore) {
+      this.loadedName = this.serif ? 'serif' : 'sans-serif';
+      this.loading = false;
+      return;
+    }
+
+    this.differences = properties.differences;
+    this.widths = properties.widths;
+    this.defaultWidth = properties.defaultWidth;
+    this.composite = properties.composite;
+    this.toUnicode = properties.toUnicode;
+    this.hasEncoding = properties.hasEncoding;
+
+    this.fontMatrix = properties.fontMatrix;
+    if (properties.type == 'Type3')
+      return;
+
+    // Trying to fix encoding using glyph CIDSystemInfo.
+    this.loadCidToUnicode(properties);
+
+    if (!file) {
+      // The file data is not specified. Trying to fix the font name
+      // to be used with the canvas.font.
+      var fontName = name.replace(/[,_]/g, '-');
+      fontName = stdFontMap[fontName] || fontName;
+
+      this.bold = (fontName.search(/bold/gi) != -1);
+      this.italic = (fontName.search(/oblique/gi) != -1) ||
+                    (fontName.search(/italic/gi) != -1);
+
+      // Use 'name' instead of 'fontName' here because the original
+      // name ArialBlack for example will be replaced by Helvetica.
+      this.black = (name.search(/Black/g) != -1);
+
+      this.encoding = properties.baseEncoding;
+      this.noUnicodeAdaptation = true;
+      this.loadedName = fontName.split('-')[0];
+      this.loading = false;
+      return;
+    }
+
+    var data;
+    switch (type) {
+      case 'Type1':
+      case 'CIDFontType0':
+        this.mimetype = 'font/opentype';
+
+        var subtype = properties.subtype;
+        var cff = (subtype == 'Type1C' || subtype == 'CIDFontType0C') ?
+          new Type2CFF(file, properties) : new CFF(name, file, properties);
+
+        // Wrap the CFF data inside an OTF font file
+        data = this.convert(name, cff, properties);
+        break;
+
+      case 'TrueType':
+      case 'CIDFontType2':
+        this.mimetype = 'font/opentype';
+
+        // Repair the TrueType file. It is can be damaged in the point of
+        // view of the sanitizer
+        data = this.checkAndRepair(name, file, properties);
+        break;
+
+      default:
+        warn('Font ' + properties.type + ' is not supported');
+        break;
+    }
+
+    this.data = data;
+    this.fontMatrix = properties.fontMatrix;
+    this.encoding = properties.baseEncoding;
+    this.hasShortCmap = properties.hasShortCmap;
+    this.loadedName = getUniqueName();
+    this.loading = true;
+  };
+
+  var numFonts = 0;
+  function getUniqueName() {
+    return 'pdfFont' + numFonts++;
+  }
+
+  function stringToArray(str) {
+    var array = [];
+    for (var i = 0, ii = str.length; i < ii; ++i)
+      array[i] = str.charCodeAt(i);
+
+    return array;
+  };
+
+  function arrayToString(arr) {
+    var str = '';
+    for (var i = 0, ii = arr.length; i < ii; ++i)
+      str += String.fromCharCode(arr[i]);
+
+    return str;
+  };
+
+  function int16(bytes) {
+    return (bytes[0] << 8) + (bytes[1] & 0xff);
+  };
+
+  function int32(bytes) {
+    return (bytes[0] << 24) + (bytes[1] << 16) +
+           (bytes[2] << 8) + (bytes[3] & 0xff);
+  };
+
+  function getMaxPower2(number) {
+    var maxPower = 0;
+    var value = number;
+    while (value >= 2) {
+      value /= 2;
+      maxPower++;
+    }
+
+    value = 2;
+    for (var i = 1; i < maxPower; i++)
+      value *= 2;
+    return value;
+  };
+
+  function string16(value) {
+    return String.fromCharCode((value >> 8) & 0xff) +
+           String.fromCharCode(value & 0xff);
+  };
+
+  function string32(value) {
+    return String.fromCharCode((value >> 24) & 0xff) +
+           String.fromCharCode((value >> 16) & 0xff) +
+           String.fromCharCode((value >> 8) & 0xff) +
+           String.fromCharCode(value & 0xff);
+  };
+
+  function createOpenTypeHeader(sfnt, file, numTables) {
+    // Windows hates the Mac TrueType sfnt version number
+    if (sfnt == 'true')
+      sfnt = string32(0x00010000);
+
+    // sfnt version (4 bytes)
+    var header = sfnt;
+
+    // numTables (2 bytes)
+    header += string16(numTables);
+
+    // searchRange (2 bytes)
+    var tablesMaxPower2 = getMaxPower2(numTables);
+    var searchRange = tablesMaxPower2 * 16;
+    header += string16(searchRange);
+
+    // entrySelector (2 bytes)
+    header += string16(Math.log(tablesMaxPower2) / Math.log(2));
+
+    // rangeShift (2 bytes)
+    header += string16(numTables * 16 - searchRange);
+
+    file.file += header;
+    file.virtualOffset += header.length;
+  };
+
+  function createTableEntry(file, tag, data) {
+    // offset
+    var offset = file.virtualOffset;
+
+    // length
+    var length = data.length;
+
+    // Per spec tables must be 4-bytes align so add padding as needed
+    while (data.length & 3)
+      data.push(0x00);
+
+    while (file.virtualOffset & 3)
+      file.virtualOffset++;
+
+    // checksum
+    var checksum = 0, n = data.length;
+    for (var i = 0; i < n; i += 4)
+      checksum = (checksum + int32([data[i], data[i + 1], data[i + 2],
+                                    data[i + 3]])) | 0;
+
+    var tableEntry = (tag + string32(checksum) +
+                      string32(offset) + string32(length));
+    file.file += tableEntry;
+    file.virtualOffset += data.length;
+  };
+
+  function getRanges(glyphs) {
+    // Array.sort() sorts by characters, not numerically, so convert to an
+    // array of characters.
+    var codes = [];
+    var length = glyphs.length;
+    for (var n = 0; n < length; ++n)
+      codes.push({ unicode: glyphs[n].unicode, code: n });
+    codes.sort(function fontGetRangesSort(a, b) {
+      return a.unicode - b.unicode;
+    });
+
+    // Split the sorted codes into ranges.
+    var ranges = [];
+    for (var n = 0; n < length; ) {
+      var start = codes[n].unicode;
+      var startCode = codes[n].code;
+      ++n;
+      var end = start;
+      while (n < length && end + 1 == codes[n].unicode) {
+        ++end;
+        ++n;
+      }
+      var endCode = codes[n - 1].code;
+      ranges.push([start, end, startCode, endCode]);
+    }
+
+    return ranges;
+  };
+
+  function createCMapTable(glyphs, deltas) {
+    var ranges = getRanges(glyphs);
+
+    var numTables = 1;
+    var cmap = '\x00\x00' + // version
+               string16(numTables) +  // numTables
+               '\x00\x03' + // platformID
+               '\x00\x01' + // encodingID
+               string32(4 + numTables * 8); // start of the table record
+
+    var segCount = ranges.length + 1;
+    var segCount2 = segCount * 2;
+    var searchRange = getMaxPower2(segCount) * 2;
+    var searchEntry = Math.log(segCount) / Math.log(2);
+    var rangeShift = 2 * segCount - searchRange;
+
+    // Fill up the 4 parallel arrays describing the segments.
+    var startCount = '';
+    var endCount = '';
+    var idDeltas = '';
+    var idRangeOffsets = '';
+    var glyphsIds = '';
+    var bias = 0;
+
+    if (deltas) {
+      for (var i = 0; i < segCount - 1; i++) {
+        var range = ranges[i];
+        var start = range[0];
+        var end = range[1];
+        var offset = (segCount - i) * 2 + bias * 2;
+        bias += (end - start + 1);
+
+        startCount += string16(start);
+        endCount += string16(end);
+        idDeltas += string16(0);
+        idRangeOffsets += string16(offset);
+
+        var startCode = range[2];
+        var endCode = range[3];
+        for (var j = startCode; j <= endCode; ++j)
+          glyphsIds += string16(deltas[j]);
+      }
+    } else {
+      for (var i = 0; i < segCount - 1; i++) {
+        var range = ranges[i];
+        var start = range[0];
+        var end = range[1];
+        var startCode = range[2];
+
+        startCount += string16(start);
+        endCount += string16(end);
+        idDeltas += string16((startCode - start + 1) & 0xFFFF);
+        idRangeOffsets += string16(0);
+      }
+    }
+
+    endCount += '\xFF\xFF';
+    startCount += '\xFF\xFF';
+    idDeltas += '\x00\x01';
+    idRangeOffsets += '\x00\x00';
+
+    var format314 = '\x00\x00' + // language
+                    string16(segCount2) +
+                    string16(searchRange) +
+                    string16(searchEntry) +
+                    string16(rangeShift) +
+                    endCount + '\x00\x00' + startCount +
+                    idDeltas + idRangeOffsets + glyphsIds;
+
+    return stringToArray(cmap +
+                         '\x00\x04' + // format
+                         string16(format314.length + 4) + // length
+                         format314);
+  };
+
+  function createOS2Table(properties, charstrings, override) {
+    override = override || {
+      unitsPerEm: 0,
+      yMax: 0,
+      yMin: 0,
+      ascent: 0,
+      descent: 0
+    };
+
+    var ulUnicodeRange1 = 0;
+    var ulUnicodeRange2 = 0;
+    var ulUnicodeRange3 = 0;
+    var ulUnicodeRange4 = 0;
+
+    var firstCharIndex = null;
+    var lastCharIndex = 0;
+
+    if (charstrings) {
+      for (var i = 0; i < charstrings.length; ++i) {
+        var code = charstrings[i].unicode;
+        if (firstCharIndex > code || !firstCharIndex)
+          firstCharIndex = code;
+        if (lastCharIndex < code)
+          lastCharIndex = code;
+
+        var position = getUnicodeRangeFor(code);
+        if (position < 32) {
+          ulUnicodeRange1 |= 1 << position;
+        } else if (position < 64) {
+          ulUnicodeRange2 |= 1 << position - 32;
+        } else if (position < 96) {
+          ulUnicodeRange3 |= 1 << position - 64;
+        } else if (position < 123) {
+          ulUnicodeRange4 |= 1 << position - 96;
+        } else {
+          error('Unicode ranges Bits > 123 are reserved for internal usage');
+        }
+      }
+    } else {
+      // TODO
+      firstCharIndex = 0;
+      lastCharIndex = 255;
+    }
+
+    var unitsPerEm = override.unitsPerEm || kPDFGlyphSpaceUnits;
+    var typoAscent = override.ascent || properties.ascent;
+    var typoDescent = override.descent || properties.descent;
+    var winAscent = override.yMax || typoAscent;
+    var winDescent = -override.yMin || -typoDescent;
+
+    // if there is a units per em value but no other override
+    // then scale the calculated ascent
+    if (unitsPerEm != kPDFGlyphSpaceUnits &&
+        'undefined' == typeof(override.ascent)) {
+      // if the font units differ to the PDF glyph space units
+      // then scale up the values
+      typoAscent = Math.round(typoAscent * unitsPerEm / kPDFGlyphSpaceUnits);
+      typoDescent = Math.round(typoDescent * unitsPerEm / kPDFGlyphSpaceUnits);
+      winAscent = typoAscent;
+      winDescent = -typoDescent;
+    }
+
+    return '\x00\x03' + // version
+           '\x02\x24' + // xAvgCharWidth
+           '\x01\xF4' + // usWeightClass
+           '\x00\x05' + // usWidthClass
+           '\x00\x00' + // fstype (0 to let the font loads via font-face on IE)
+           '\x02\x8A' + // ySubscriptXSize
+           '\x02\xBB' + // ySubscriptYSize
+           '\x00\x00' + // ySubscriptXOffset
+           '\x00\x8C' + // ySubscriptYOffset
+           '\x02\x8A' + // ySuperScriptXSize
+           '\x02\xBB' + // ySuperScriptYSize
+           '\x00\x00' + // ySuperScriptXOffset
+           '\x01\xDF' + // ySuperScriptYOffset
+           '\x00\x31' + // yStrikeOutSize
+           '\x01\x02' + // yStrikeOutPosition
+           '\x00\x00' + // sFamilyClass
+           '\x00\x00\x06' +
+           String.fromCharCode(properties.fixedPitch ? 0x09 : 0x00) +
+           '\x00\x00\x00\x00\x00\x00' + // Panose
+           string32(ulUnicodeRange1) + // ulUnicodeRange1 (Bits 0-31)
+           string32(ulUnicodeRange2) + // ulUnicodeRange2 (Bits 32-63)
+           string32(ulUnicodeRange3) + // ulUnicodeRange3 (Bits 64-95)
+           string32(ulUnicodeRange4) + // ulUnicodeRange4 (Bits 96-127)
+           '\x2A\x32\x31\x2A' + // achVendID
+           string16(properties.italicAngle ? 1 : 0) + // fsSelection
+           string16(firstCharIndex ||
+                    properties.firstChar) + // usFirstCharIndex
+           string16(lastCharIndex || properties.lastChar) +  // usLastCharIndex
+           string16(typoAscent) + // sTypoAscender
+           string16(typoDescent) + // sTypoDescender
+           '\x00\x64' + // sTypoLineGap (7%-10% of the unitsPerEM value)
+           string16(winAscent) + // usWinAscent
+           string16(winDescent) + // usWinDescent
+           '\x00\x00\x00\x00' + // ulCodePageRange1 (Bits 0-31)
+           '\x00\x00\x00\x00' + // ulCodePageRange2 (Bits 32-63)
+           string16(properties.xHeight) + // sxHeight
+           string16(properties.capHeight) + // sCapHeight
+           string16(0) + // usDefaultChar
+           string16(firstCharIndex || properties.firstChar) + // usBreakChar
+           '\x00\x03';  // usMaxContext
+  };
+
+  function createPostTable(properties) {
+    var angle = Math.floor(properties.italicAngle * (Math.pow(2, 16)));
+    return '\x00\x03\x00\x00' + // Version number
+           string32(angle) + // italicAngle
+           '\x00\x00' + // underlinePosition
+           '\x00\x00' + // underlineThickness
+           string32(properties.fixedPitch) + // isFixedPitch
+           '\x00\x00\x00\x00' + // minMemType42
+           '\x00\x00\x00\x00' + // maxMemType42
+           '\x00\x00\x00\x00' + // minMemType1
+           '\x00\x00\x00\x00';  // maxMemType1
+  };
+
+  function createNameTable(name) {
+    var strings = [
+      'Original licence',  // 0.Copyright
+      name,                // 1.Font family
+      'Unknown',           // 2.Font subfamily (font weight)
+      'uniqueID',          // 3.Unique ID
+      name,                // 4.Full font name
+      'Version 0.11',      // 5.Version
+      '',                  // 6.Postscript name
+      'Unknown',           // 7.Trademark
+      'Unknown',           // 8.Manufacturer
+      'Unknown'            // 9.Designer
+    ];
+
+    // Mac want 1-byte per character strings while Windows want
+    // 2-bytes per character, so duplicate the names table
+    var stringsUnicode = [];
+    for (var i = 0, ii = strings.length; i < ii; i++) {
+      var str = strings[i];
+
+      var strUnicode = '';
+      for (var j = 0, jj = str.length; j < jj; j++)
+        strUnicode += string16(str.charCodeAt(j));
+      stringsUnicode.push(strUnicode);
+    }
+
+    var names = [strings, stringsUnicode];
+    var platforms = ['\x00\x01', '\x00\x03'];
+    var encodings = ['\x00\x00', '\x00\x01'];
+    var languages = ['\x00\x00', '\x04\x09'];
+
+    var namesRecordCount = strings.length * platforms.length;
+    var nameTable =
+      '\x00\x00' +                           // format
+      string16(namesRecordCount) +           // Number of names Record
+      string16(namesRecordCount * 12 + 6);   // Storage
+
+    // Build the name records field
+    var strOffset = 0;
+    for (var i = 0, ii = platforms.length; i < ii; i++) {
+      var strs = names[i];
+      for (var j = 0, jj = strs.length; j < jj; j++) {
+        var str = strs[j];
+        var nameRecord =
+          platforms[i] + // platform ID
+          encodings[i] + // encoding ID
+          languages[i] + // language ID
+          string16(j) + // name ID
+          string16(str.length) +
+          string16(strOffset);
+        nameTable += nameRecord;
+        strOffset += str.length;
+      }
+    }
+
+    nameTable += strings.join('') + stringsUnicode.join('');
+    return nameTable;
+  }
+
+  constructor.prototype = {
+    name: null,
+    font: null,
+    mimetype: null,
+    encoding: null,
+
+    checkAndRepair: function font_checkAndRepair(name, font, properties) {
+      function readTableEntry(file) {
+        var tag = file.getBytes(4);
+        tag = String.fromCharCode(tag[0]) +
+              String.fromCharCode(tag[1]) +
+              String.fromCharCode(tag[2]) +
+              String.fromCharCode(tag[3]);
+
+        var checksum = int32(file.getBytes(4));
+        var offset = int32(file.getBytes(4));
+        var length = int32(file.getBytes(4));
+
+        // Read the table associated data
+        var previousPosition = file.pos;
+        file.pos = file.start ? file.start : 0;
+        file.skip(offset);
+        var data = file.getBytes(length);
+        file.pos = previousPosition;
+
+        if (tag == 'head') {
+          // clearing checksum adjustment
+          data[8] = data[9] = data[10] = data[11] = 0;
+          data[17] |= 0x20; //Set font optimized for cleartype flag
+        }
+
+        return {
+          tag: tag,
+          checksum: checksum,
+          length: length,
+          offset: offset,
+          data: data
+        };
+      };
+
+      function readOpenTypeHeader(ttf) {
+        return {
+          version: arrayToString(ttf.getBytes(4)),
+          numTables: int16(ttf.getBytes(2)),
+          searchRange: int16(ttf.getBytes(2)),
+          entrySelector: int16(ttf.getBytes(2)),
+          rangeShift: int16(ttf.getBytes(2))
+        };
+      };
+
+      function createGlyphNameMap(glyphs, ids, properties) {
+        var glyphNames = properties.glyphNames;
+        if (!glyphNames) {
+          properties.glyphNameMap = {};
+          return;
+        }
+        var glyphsLength = glyphs.length;
+        var glyphNameMap = {};
+        var encoding = [];
+        for (var i = 0; i < glyphsLength; ++i) {
+          var glyphName = glyphNames[ids[i]];
+          if (!glyphName)
+            continue;
+          var unicode = glyphs[i].unicode;
+          glyphNameMap[glyphName] = unicode;
+          var code = glyphs[i].code;
+          encoding[code] = glyphName;
+        }
+        properties.glyphNameMap = glyphNameMap;
+        if (!properties.hasEncoding)
+          properties.baseEncoding = encoding;
+      }
+
+      function replaceCMapTable(cmap, font, properties) {
+        var start = (font.start ? font.start : 0) + cmap.offset;
+        font.pos = start;
+
+        var version = int16(font.getBytes(2));
+        var numRecords = int16(font.getBytes(2));
+
+        var records = [];
+        for (var i = 0; i < numRecords; i++) {
+          records.push({
+            platformID: int16(font.getBytes(2)),
+            encodingID: int16(font.getBytes(2)),
+            offset: int32(font.getBytes(4))
+          });
+        }
+
+        // Check that table are sorted by platformID then encodingID,
+        records.sort(function fontReplaceCMapTableSort(a, b) {
+          return ((a.platformID << 16) + a.encodingID) -
+                 ((b.platformID << 16) + b.encodingID);
+        });
+
+        var tables = [records[0]];
+        for (var i = 1; i < numRecords; i++) {
+          // The sanitizer will drop the font if 2 tables have the same
+          // platformID and the same encodingID, this will be correct for
+          // most cases but if the font has been made for Mac it could
+          // exist a few platformID: 1, encodingID: 0 but with a different
+          // language field and that's correct. But the sanitizer does not
+          // seem to support this case.
+          var current = records[i];
+          var previous = records[i - 1];
+          if (((current.platformID << 16) + current.encodingID) <=
+             ((previous.platformID << 16) + previous.encodingID))
+                continue;
+          tables.push(current);
+        }
+
+        var missing = numRecords - tables.length;
+        if (missing) {
+          numRecords = tables.length;
+          var data = string16(version) + string16(numRecords);
+
+          for (var i = 0; i < numRecords; i++) {
+            var table = tables[i];
+            data += string16(table.platformID) +
+                    string16(table.encodingID) +
+                    string32(table.offset);
+          }
+
+          for (var i = 0, ii = data.length; i < ii; i++)
+            cmap.data[i] = data.charCodeAt(i);
+        }
+
+        for (var i = 0; i < numRecords; i++) {
+          var table = tables[i];
+          font.pos = start + table.offset;
+
+          var format = int16(font.getBytes(2));
+          var length = int16(font.getBytes(2));
+          var language = int16(font.getBytes(2));
+
+          if (format == 0) {
+            // Characters below 0x20 are controls characters that are hardcoded
+            // into the platform so if some characters in the font are assigned
+            // under this limit they will not be displayed so let's rewrite the
+            // CMap.
+            var glyphs = [];
+            var ids = [];
+            for (var j = 0; j < 256; j++) {
+              var index = font.getByte();
+              if (index) {
+                var unicode = adaptUnicode(j);
+                glyphs.push({ unicode: unicode, code: j });
+                ids.push(index);
+              }
+            }
+
+            properties.hasShortCmap = true;
+
+            createGlyphNameMap(glyphs, ids, properties);
+            return cmap.data = createCMapTable(glyphs, ids);
+          } else if (format == 4) {
+            // re-creating the table in format 4 since the encoding
+            // might be changed
+            var segCount = (int16(font.getBytes(2)) >> 1);
+            font.getBytes(6); // skipping range fields
+            var segIndex, segments = [];
+            for (segIndex = 0; segIndex < segCount; segIndex++) {
+              segments.push({ end: int16(font.getBytes(2)) });
+            }
+            font.getBytes(2);
+            for (segIndex = 0; segIndex < segCount; segIndex++) {
+              segments[segIndex].start = int16(font.getBytes(2));
+            }
+
+            for (segIndex = 0; segIndex < segCount; segIndex++) {
+              segments[segIndex].delta = int16(font.getBytes(2));
+            }
+
+            var offsetsCount = 0;
+            for (segIndex = 0; segIndex < segCount; segIndex++) {
+              var segment = segments[segIndex];
+              var rangeOffset = int16(font.getBytes(2));
+              if (!rangeOffset) {
+                segment.offsetIndex = -1;
+                continue;
+              }
+
+              var offsetIndex = (rangeOffset >> 1) - (segCount - segIndex);
+              segment.offsetIndex = offsetIndex;
+              offsetsCount = Math.max(offsetsCount, offsetIndex +
+                segment.end - segment.start + 1);
+            }
+
+            var offsets = [];
+            for (var j = 0; j < offsetsCount; j++)
+              offsets.push(int16(font.getBytes(2)));
+
+            var glyphs = [], ids = [];
+
+            for (segIndex = 0; segIndex < segCount; segIndex++) {
+              var segment = segments[segIndex];
+              var start = segment.start, end = segment.end;
+              var delta = segment.delta, offsetIndex = segment.offsetIndex;
+
+              for (var j = start; j <= end; j++) {
+                if (j == 0xFFFF)
+                  continue;
+
+                var glyphCode = offsetIndex < 0 ? j :
+                  offsets[offsetIndex + j - start];
+                glyphCode = (glyphCode + delta) & 0xFFFF;
+                if (glyphCode == 0 || isAdaptedUnicode(j))
+                  continue;
+
+                var unicode = adaptUnicode(j);
+                glyphs.push({ unicode: unicode, code: j });
+                ids.push(glyphCode);
+              }
+            }
+
+            createGlyphNameMap(glyphs, ids, properties);
+            return cmap.data = createCMapTable(glyphs, ids);
+          } else if (format == 6) {
+            // Format 6 is a 2-bytes dense mapping, which means the font data
+            // lives glue together even if they are pretty far in the unicode
+            // table. (This looks weird, so I can have missed something), this
+            // works on Linux but seems to fails on Mac so let's rewrite the
+            // cmap table to a 3-1-4 style
+            var firstCode = int16(font.getBytes(2));
+            var entryCount = int16(font.getBytes(2));
+
+            var glyphs = [];
+            var ids = [];
+            for (var j = 0; j < entryCount; j++) {
+              var glyphCode = int16(font.getBytes(2));
+              var code = firstCode + j;
+              if (isAdaptedUnicode(glyphCode))
+                continue;
+
+              var unicode = adaptUnicode(code);
+              glyphs.push({ unicode: unicode, code: code });
+              ids.push(glyphCode);
+            }
+
+            createGlyphNameMap(glyphs, ids, properties);
+            return cmap.data = createCMapTable(glyphs, ids);
+          }
+        }
+        return cmap.data;
+      };
+
+      function sanitizeMetrics(font, header, metrics, numGlyphs) {
+        if (!header && !metrics)
+          return;
+
+        // The vhea/vmtx tables are not required, so it happens that
+        // some fonts embed a vmtx table without a vhea table. In this
+        // situation the sanitizer assume numOfLongVerMetrics = 1. As
+        // a result it tries to read numGlyphs - 1 SHORT from the vmtx
+        // table, and if it is not possible, the font is rejected.
+        // So remove the vmtx table if there is no vhea table.
+        if (!header && metrics) {
+          metrics.data = null;
+          return;
+        }
+
+        font.pos = (font.start ? font.start : 0) + header.offset;
+        font.pos += header.length - 2;
+        var numOfMetrics = int16(font.getBytes(2));
+
+        var numOfSidebearings = numGlyphs - numOfMetrics;
+        var numMissing = numOfSidebearings -
+          ((hmtx.length - numOfMetrics * 4) >> 1);
+        if (numMissing > 0) {
+          font.pos = (font.start ? font.start : 0) + metrics.offset;
+          var entries = '';
+          for (var i = 0, ii = hmtx.length; i < ii; i++)
+            entries += String.fromCharCode(font.getByte());
+          for (var i = 0; i < numMissing; i++)
+            entries += '\x00\x00';
+          metrics.data = stringToArray(entries);
+        }
+      };
+
+      function sanitizeGlyphLocations(loca, glyf, numGlyphs,
+                                      isGlyphLocationsLong) {
+        var itemSize, itemDecode, itemEncode;
+        if (isGlyphLocationsLong) {
+          itemSize = 4;
+          itemDecode = function fontItemDecodeLong(data, offset) {
+            return (data[offset] << 24) | (data[offset + 1] << 16) |
+                   (data[offset + 2] << 8) | data[offset + 3];
+          };
+          itemEncode = function fontItemEncodeLong(data, offset, value) {
+            data[offset] = (value >>> 24) & 0xFF;
+            data[offset + 1] = (value >> 16) & 0xFF;
+            data[offset + 2] = (value >> 8) & 0xFF;
+            data[offset + 3] = value & 0xFF;
+          };
+        } else {
+          itemSize = 2;
+          itemDecode = function fontItemDecode(data, offset) {
+            return (data[offset] << 9) | (data[offset + 1] << 1);
+          };
+          itemEncode = function fontItemEncode(data, offset, value) {
+            data[offset] = (value >> 9) & 0xFF;
+            data[offset + 1] = (value >> 1) & 0xFF;
+          };
+        }
+        var locaData = loca.data;
+        var startOffset = itemDecode(locaData, 0);
+        var firstOffset = itemDecode(locaData, itemSize);
+        if (firstOffset - startOffset < 12 || startOffset > 0) {
+          // removing first glyph
+          glyf.data = glyf.data.subarray(firstOffset);
+          glyf.length -= firstOffset;
+
+          itemEncode(locaData, 0, 0);
+          var i, pos = itemSize;
+          for (i = 1; i <= numGlyphs; ++i) {
+            itemEncode(locaData, pos,
+              itemDecode(locaData, pos) - firstOffset);
+            pos += itemSize;
+          }
+        }
+      }
+
+      function readGlyphNameMap(post, properties) {
+        var start = (font.start ? font.start : 0) + post.offset;
+        font.pos = start;
+
+        var length = post.length, end = start + length;
+        var version = int32(font.getBytes(4));
+        // skip rest to the tables
+        font.getBytes(28);
+
+        var glyphNames;
+        switch (version) {
+          case 0x00010000:
+            glyphNames = MacStandardGlyphOrdering;
+            break;
+          case 0x00020000:
+            var numGlyphs = int16(font.getBytes(2));
+            var glyphNameIndexes = [];
+            for (var i = 0; i < numGlyphs; ++i)
+              glyphNameIndexes.push(int16(font.getBytes(2)));
+            var customNames = [];
+            while (font.pos < end) {
+              var stringLength = font.getByte();
+              var string = '';
+              for (var i = 0; i < stringLength; ++i)
+                string += font.getChar();
+              customNames.push(string);
+            }
+            glyphNames = [];
+            for (var i = 0; i < numGlyphs; ++i) {
+              var j = glyphNameIndexes[i];
+              if (j < 258) {
+                glyphNames.push(MacStandardGlyphOrdering[j]);
+                continue;
+              }
+              glyphNames.push(customNames[j - 258]);
+            }
+            break;
+          case 0x00030000:
+            break;
+          default:
+            warn('Unknown/unsupported post table version ' + version);
+            break;
+        }
+        properties.glyphNames = glyphNames;
+      }
+
+      // Check that required tables are present
+      var requiredTables = ['OS/2', 'cmap', 'head', 'hhea',
+                             'hmtx', 'maxp', 'name', 'post'];
+
+      var header = readOpenTypeHeader(font);
+      var numTables = header.numTables;
+
+      var cmap, post, maxp, hhea, hmtx, vhea, vmtx, head, loca, glyf;
+      var tables = [];
+      for (var i = 0; i < numTables; i++) {
+        var table = readTableEntry(font);
+        var index = requiredTables.indexOf(table.tag);
+        if (index != -1) {
+          if (table.tag == 'cmap')
+            cmap = table;
+          else if (table.tag == 'post')
+            post = table;
+          else if (table.tag == 'maxp')
+            maxp = table;
+          else if (table.tag == 'hhea')
+            hhea = table;
+          else if (table.tag == 'hmtx')
+            hmtx = table;
+          else if (table.tag == 'head')
+            head = table;
+
+          requiredTables.splice(index, 1);
+        } else {
+          if (table.tag == 'vmtx')
+            vmtx = table;
+          else if (table.tag == 'vhea')
+            vhea = table;
+          else if (table.tag == 'loca')
+            loca = table;
+          else if (table.tag == 'glyf')
+            glyf = table;
+        }
+        tables.push(table);
+      }
+
+      var numTables = header.numTables + requiredTables.length;
+
+      // header and new offsets. Table entry information is appended to the
+      // end of file. The virtualOffset represents where to put the actual
+      // data of a particular table;
+      var ttf = {
+        file: '',
+        virtualOffset: numTables * (4 * 4)
+      };
+
+      // The new numbers of tables will be the last one plus the num
+      // of missing tables
+      createOpenTypeHeader(header.version, ttf, numTables);
+
+      if (requiredTables.indexOf('OS/2') != -1) {
+        // extract some more font properties from the OpenType head and
+        // hhea tables; yMin and descent value are always negative
+        var override = {
+          unitsPerEm: int16([head.data[18], head.data[19]]),
+          yMax: int16([head.data[42], head.data[43]]),
+          yMin: int16([head.data[38], head.data[39]]) - 0x10000,
+          ascent: int16([hhea.data[4], hhea.data[5]]),
+          descent: int16([hhea.data[6], hhea.data[7]]) - 0x10000
+        };
+
+        tables.push({
+          tag: 'OS/2',
+          data: stringToArray(createOS2Table(properties, null, override))
+        });
+      }
+
+      // Ensure the [h/v]mtx tables contains the advance width and
+      // sidebearings information for numGlyphs in the maxp table
+      font.pos = (font.start || 0) + maxp.offset;
+      var version = int16(font.getBytes(4));
+      var numGlyphs = int16(font.getBytes(2));
+
+      sanitizeMetrics(font, hhea, hmtx, numGlyphs);
+      sanitizeMetrics(font, vhea, vmtx, numGlyphs);
+
+      if (head && loca && glyf) {
+        var isGlyphLocationsLong = int16([head.data[50], head.data[51]]);
+        sanitizeGlyphLocations(loca, glyf, numGlyphs, isGlyphLocationsLong);
+      }
+
+      // Sanitizer reduces the glyph advanceWidth to the maxAdvanceWidth
+      // Sometimes it's 0. That needs to be fixed
+      if (hhea.data[10] == 0 && hhea.data[11] == 0) {
+        hhea.data[10] = 0xFF;
+        hhea.data[11] = 0xFF;
+      }
+
+      // The 'post' table has glyphs names.
+      if (post) {
+        readGlyphNameMap(post, properties);
+      }
+
+      // Replace the old CMAP table with a shiny new one
+      if (properties.type == 'CIDFontType2') {
+        // Type2 composite fonts map characters directly to glyphs so the cmap
+        // table must be replaced.
+        // canvas fillText will reencode some characters even if the font has a
+        // glyph at that position - e.g. newline is converted to a space and
+        // U+00AD (soft hyphen) is not drawn.
+        // So, offset all the glyphs by 0xFF to avoid these cases and use
+        // the encoding to map incoming characters to the new glyph positions
+        if (!cmap) {
+          cmap = {
+            tag: 'cmap',
+            data: null
+          };
+          tables.push(cmap);
+        }
+
+        var glyphs = [];
+        for (i = 1; i < numGlyphs; i++) {
+          if (isAdaptedUnicode(i))
+            continue;
+
+          glyphs.push({ unicode: adaptUnicode(i) });
+        }
+        cmap.data = createCMapTable(glyphs);
+      } else {
+        replaceCMapTable(cmap, font, properties);
+        this.glyphNameMap = properties.glyphNameMap;
+      }
+
+      // Rewrite the 'post' table if needed
+      if (requiredTables.indexOf('post') != -1) {
+        tables.push({
+          tag: 'post',
+          data: stringToArray(createPostTable(properties))
+        });
+      }
+
+      // Rewrite the 'name' table if needed
+      if (requiredTables.indexOf('name') != -1) {
+        tables.push({
+          tag: 'name',
+          data: stringToArray(createNameTable(this.name))
+        });
+      }
+
+      // Tables needs to be written by ascendant alphabetic order
+      tables.sort(function tables_sort(a, b) {
+        return (a.tag > b.tag) - (a.tag < b.tag);
+      });
+
+      // rewrite the tables but tweak offsets
+      for (var i = 0, ii = tables.length; i < ii; i++) {
+        var table = tables[i];
+        var data = [];
+
+        var tableData = table.data;
+        for (var j = 0, jj = tableData.length; j < jj; j++)
+          data.push(tableData[j]);
+        createTableEntry(ttf, table.tag, data);
+      }
+
+      // Add the table datas
+      for (var i = 0, ii = tables.length; i < ii; i++) {
+        var table = tables[i];
+        var tableData = table.data;
+        ttf.file += arrayToString(tableData);
+
+        // 4-byte aligned data
+        while (ttf.file.length & 3)
+          ttf.file += String.fromCharCode(0);
+      }
+
+      return stringToArray(ttf.file);
+    },
+
+    convert: function font_convert(fontName, font, properties) {
+      function isFixedPitch(glyphs) {
+        for (var i = 0, ii = glyphs.length - 1; i < ii; i++) {
+          if (glyphs[i] != glyphs[i + 1])
+            return false;
+        }
+        return true;
+      }
+
+      // The offsets object holds at the same time a representation of where
+      // to write the table entry information about a table and another offset
+      // representing the offset where to draw the actual data of a particular
+      // table
+      var kRequiredTablesCount = 9;
+
+      var otf = {
+        file: '',
+        virtualOffset: 9 * (4 * 4)
+      };
+
+      createOpenTypeHeader('\x4F\x54\x54\x4F', otf, 9);
+
+      var charstrings = font.charstrings;
+      properties.fixedPitch = isFixedPitch(charstrings);
+
+      var glyphNameMap = {};
+      for (var i = 0; i < charstrings.length; ++i) {
+        var charstring = charstrings[i];
+        glyphNameMap[charstring.glyph] = charstring.unicode;
+      }
+      this.glyphNameMap = glyphNameMap;
+
+      if (!properties.hasEncoding && (properties.subtype == 'Type1C' ||
+          properties.subtype == 'CIDFontType0C')) {
+        var encoding = [];
+        for (var i = 0; i < charstrings.length; ++i) {
+          var charstring = charstrings[i];
+          encoding[charstring.code] = charstring.glyph;
+        }
+        properties.baseEncoding = encoding;
+      }
+
+      var fields = {
+        // PostScript Font Program
+        'CFF ': font.data,
+
+        // OS/2 and Windows Specific metrics
+        'OS/2': stringToArray(createOS2Table(properties, charstrings)),
+
+        // Character to glyphs mapping
+        'cmap': createCMapTable(charstrings.slice(),
+                                ('glyphIds' in font) ? font.glyphIds : null),
+
+        // Font header
+        'head': (function fontFieldsHead() {
+          return stringToArray(
+              '\x00\x01\x00\x00' + // Version number
+              '\x00\x00\x10\x00' + // fontRevision
+              '\x00\x00\x00\x00' + // checksumAdjustement
+              '\x5F\x0F\x3C\xF5' + // magicNumber
+              '\x00\x00' + // Flags
+              '\x03\xE8' + // unitsPerEM (defaulting to 1000)
+              '\x00\x00\x00\x00\x9e\x0b\x7e\x27' + // creation date
+              '\x00\x00\x00\x00\x9e\x0b\x7e\x27' + // modifification date
+              '\x00\x00' + // xMin
+              string16(properties.descent) + // yMin
+              '\x0F\xFF' + // xMax
+              string16(properties.ascent) + // yMax
+              string16(properties.italicAngle ? 2 : 0) + // macStyle
+              '\x00\x11' + // lowestRecPPEM
+              '\x00\x00' + // fontDirectionHint
+              '\x00\x00' + // indexToLocFormat
+              '\x00\x00');  // glyphDataFormat
+        })(),
+
+        // Horizontal header
+        'hhea': (function fontFieldsHhea() {
+          return stringToArray(
+              '\x00\x01\x00\x00' + // Version number
+              string16(properties.ascent) + // Typographic Ascent
+              string16(properties.descent) + // Typographic Descent
+              '\x00\x00' + // Line Gap
+              '\xFF\xFF' + // advanceWidthMax
+              '\x00\x00' + // minLeftSidebearing
+              '\x00\x00' + // minRightSidebearing
+              '\x00\x00' + // xMaxExtent
+              string16(properties.capHeight) + // caretSlopeRise
+              string16(Math.tan(properties.italicAngle) *
+                       properties.xHeight) + // caretSlopeRun
+              '\x00\x00' + // caretOffset
+              '\x00\x00' + // -reserved-
+              '\x00\x00' + // -reserved-
+              '\x00\x00' + // -reserved-
+              '\x00\x00' + // -reserved-
+              '\x00\x00' + // metricDataFormat
+              string16(charstrings.length + 1)); // Number of HMetrics
+        })(),
+
+        // Horizontal metrics
+        'hmtx': (function fontFieldsHmtx() {
+          var hmtx = '\x00\x00\x00\x00'; // Fake .notdef
+          for (var i = 0, ii = charstrings.length; i < ii; i++)
+            hmtx += string16(charstrings[i].width) + string16(0);
+          return stringToArray(hmtx);
+        })(),
+
+        // Maximum profile
+        'maxp': (function fontFieldsMaxp() {
+          return stringToArray(
+              '\x00\x00\x50\x00' + // Version number
+             string16(charstrings.length + 1)); // Num of glyphs
+        })(),
+
+        // Naming tables
+        'name': stringToArray(createNameTable(fontName)),
+
+        // PostScript informations
+        'post': stringToArray(createPostTable(properties))
+      };
+
+      for (var field in fields)
+        createTableEntry(otf, field, fields[field]);
+
+      for (var field in fields) {
+        var table = fields[field];
+        otf.file += arrayToString(table);
+      }
+
+      return stringToArray(otf.file);
+    },
+
+    loadCidToUnicode: function font_loadCidToUnicode(properties) {
+      if (properties.cidToGidMap) {
+        this.cidToUnicode = properties.cidToGidMap;
+        return;
+      }
+
+      if (!properties.cidSystemInfo)
+        return;
+
+      var cidToUnicodeMap = [];
+      this.cidToUnicode = cidToUnicodeMap;
+
+      var cidSystemInfo = properties.cidSystemInfo;
+      var cidToUnicode;
+      if (cidSystemInfo) {
+        cidToUnicode = CIDToUnicodeMaps[
+          cidSystemInfo.registry + '-' + cidSystemInfo.ordering];
+      }
+
+      if (!cidToUnicode)
+        return; // identity encoding
+
+      var glyph = 1, i, j, k, ii;
+      for (i = 0, ii = cidToUnicode.length; i < ii; ++i) {
+        var unicode = cidToUnicode[i];
+        if (isArray(unicode)) {
+          var length = unicode.length;
+          for (j = 0; j < length; j++)
+            cidToUnicodeMap[unicode[j]] = glyph;
+          glyph++;
+        } else if (typeof unicode === 'object') {
+          var fillLength = unicode.f;
+          if (fillLength) {
+            k = unicode.c;
+            for (j = 0; j < fillLength; ++j) {
+              cidToUnicodeMap[k] = glyph++;
+              k++;
+            }
+          } else
+            glyph += unicode.s;
+        } else if (unicode) {
+          cidToUnicodeMap[unicode] = glyph++;
+        } else
+          glyph++;
+      }
+    },
+
+    bindWorker: function font_bindWorker(data) {
+      postMessage({
+        action: 'font',
+        data: {
+          raw: data,
+          fontName: this.loadedName,
+          mimetype: this.mimetype
+        }
+      });
+    },
+
+    bindDOM: function font_bindDom(data) {
+      var fontName = this.loadedName;
+
+      // Add the font-face rule to the document
+      var url = ('url(data:' + this.mimetype + ';base64,' +
+                 window.btoa(data) + ');');
+      var rule = "@font-face { font-family:'" + fontName + "';src:" + url + '}';
+
+      document.documentElement.firstChild.appendChild(
+        document.createElement('style'));
+
+      var styleSheet = document.styleSheets[document.styleSheets.length - 1];
+      styleSheet.insertRule(rule, styleSheet.cssRules.length);
+
+      return rule;
+    },
+
+    charToGlyph: function fonts_charToGlyph(charcode) {
+      var unicode, width, codeIRQueue;
+
+      var width = this.widths[charcode];
+
+      switch (this.type) {
+        case 'CIDFontType0':
+          if (this.noUnicodeAdaptation) {
+            width = this.widths[this.cidToUnicode[charcode]];
+            unicode = charcode;
+            break;
+          }
+          unicode = adaptUnicode(this.cidToUnicode[charcode] || charcode);
+          break;
+        case 'CIDFontType2':
+          if (this.noUnicodeAdaptation) {
+            width = this.widths[this.cidToUnicode[charcode]];
+            unicode = charcode;
+            break;
+          }
+          unicode = adaptUnicode(this.cidToUnicode[charcode] || charcode);
+          break;
+        case 'Type1':
+          var glyphName = this.differences[charcode] || this.encoding[charcode];
+          if (this.noUnicodeAdaptation) {
+            if (!isNum(width))
+              width = this.widths[glyphName];
+            unicode = GlyphsUnicode[glyphName] || charcode;
+            break;
+          }
+          unicode = this.glyphNameMap[glyphName] ||
+            adaptUnicode(GlyphsUnicode[glyphName] || charcode);
+          break;
+        case 'Type3':
+          var glyphName = this.differences[charcode] || this.encoding[charcode];
+          codeIRQueue = this.charProcIRQueues[glyphName];
+          unicode = charcode;
+          break;
+        case 'TrueType':
+          var glyphName = this.differences[charcode] || this.encoding[charcode];
+          if (!glyphName)
+            glyphName = Encodings.StandardEncoding[charcode];
+          if (!isNum(width))
+            width = this.widths[glyphName];
+          if (this.noUnicodeAdaptation) {
+            unicode = GlyphsUnicode[glyphName] || charcode;
+            break;
+          }
+          if (!this.hasEncoding) {
+            unicode = adaptUnicode(charcode);
+            break;
+          }
+          if (this.hasShortCmap) {
+            var j = Encodings.MacRomanEncoding.indexOf(glyphName);
+            unicode = j >= 0 && !isSpecialUnicode(j) ? j :
+              this.glyphNameMap[glyphName];
+          } else {
+            unicode = glyphName in GlyphsUnicode ?
+              adaptUnicode(GlyphsUnicode[glyphName]) :
+              this.glyphNameMap[glyphName];
+          }
+          break;
+        default:
+          warn('Unsupported font type: ' + this.type);
+          break;
+      }
+      return {
+        unicode: unicode,
+        width: isNum(width) ? width : this.defaultWidth,
+        codeIRQueue: codeIRQueue
+      };
+    },
+
+    charsToGlyphs: function fonts_chars2Glyphs(chars) {
+      var charsCache = this.charsCache;
+      var glyphs;
+
+      // if we translated this string before, just grab it from the cache
+      if (charsCache) {
+        glyphs = charsCache[chars];
+        if (glyphs)
+          return glyphs;
+      }
+
+      // lazily create the translation cache
+      if (!charsCache)
+        charsCache = this.charsCache = Object.create(null);
+
+      glyphs = [];
+
+      if (this.composite) {
+        // composite fonts have multi-byte strings convert the string from
+        // single-byte to multi-byte
+        // XXX assuming CIDFonts are two-byte - later need to extract the
+        // correct byte encoding according to the PDF spec
+        var length = chars.length - 1; // looping over two bytes at a time so
+                                       // loop should never end on the last byte
+        for (var i = 0; i < length; i++) {
+          var charcode = int16([chars.charCodeAt(i++), chars.charCodeAt(i)]);
+          var glyph = this.charToGlyph(charcode);
+          glyphs.push(glyph);
+          // placing null after each word break charcode (ASCII SPACE)
+          if (charcode == 0x20)
+            glyphs.push(null);
+        }
+      }
+      else {
+        for (var i = 0, ii = chars.length; i < ii; ++i) {
+          var charcode = chars.charCodeAt(i);
+          var glyph = this.charToGlyph(charcode);
+          glyphs.push(glyph);
+          if (charcode == 0x20)
+            glyphs.push(null);
+        }
+      }
+
+      // Enter the translated string into the cache
+      return (charsCache[chars] = glyphs);
+    }
+  };
+
+  return constructor;
+})();
+
+/*
+ * Type1Parser encapsulate the needed code for parsing a Type1 font
+ * program. Some of its logic depends on the Type2 charstrings
+ * structure.
+ */
+var Type1Parser = function type1Parser() {
+  /*
+   * Decrypt a Sequence of Ciphertext Bytes to Produce the Original Sequence
+   * of Plaintext Bytes. The function took a key as a parameter which can be
+   * for decrypting the eexec block of for decoding charStrings.
+   */
+  var kEexecEncryptionKey = 55665;
+  var kCharStringsEncryptionKey = 4330;
+
+  function decrypt(stream, key, discardNumber) {
+    var r = key, c1 = 52845, c2 = 22719;
+    var decryptedString = [];
+
+    var value = '';
+    var count = stream.length;
+    for (var i = 0; i < count; i++) {
+      value = stream[i];
+      decryptedString[i] = value ^ (r >> 8);
+      r = ((value + r) * c1 + c2) & ((1 << 16) - 1);
+    }
+    return decryptedString.slice(discardNumber);
+  }
+
+  /*
+   * CharStrings are encoded following the the CharString Encoding sequence
+   * describe in Chapter 6 of the "Adobe Type1 Font Format" specification.
+   * The value in a byte indicates a command, a number, or subsequent bytes
+   * that are to be interpreted in a special way.
+   *
+   * CharString Number Encoding:
+   *  A CharString byte containing the values from 32 through 255 inclusive
+   *  indicate an integer. These values are decoded in four ranges.
+   *
+   * 1. A CharString byte containing a value, v, between 32 and 246 inclusive,
+   * indicate the integer v - 139. Thus, the integer values from -107 through
+   * 107 inclusive may be encoded in single byte.
+   *
+   * 2. A CharString byte containing a value, v, between 247 and 250 inclusive,
+   * indicates an integer involving the next byte, w, according to the formula:
+   * [(v - 247) x 256] + w + 108
+   *
+   * 3. A CharString byte containing a value, v, between 251 and 254 inclusive,
+   * indicates an integer involving the next byte, w, according to the formula:
+   * -[(v - 251) * 256] - w - 108
+   *
+   * 4. A CharString containing the value 255 indicates that the next 4 bytes
+   * are a two complement signed integer. The first of these bytes contains the
+   * highest order bits, the second byte contains the next higher order bits
+   * and the fourth byte contain the lowest order bits.
+   *
+   *
+   * CharString Command Encoding:
+   *  CharStrings commands are encoded in 1 or 2 bytes.
+   *
+   *  Single byte commands are encoded in 1 byte that contains a value between
+   *  0 and 31 inclusive.
+   *  If a command byte contains the value 12, then the value in the next byte
+   *  indicates a command. This "escape" mechanism allows many extra commands
+   * to be encoded and this encoding technique helps to minimize the length of
+   * the charStrings.
+   */
+  var charStringDictionary = {
+    '1': 'hstem',
+    '3': 'vstem',
+    '4': 'vmoveto',
+    '5': 'rlineto',
+    '6': 'hlineto',
+    '7': 'vlineto',
+    '8': 'rrcurveto',
+
+    // closepath is a Type1 command that do not take argument and is useless
+    // in Type2 and it can simply be ignored.
+    '9': null, // closepath
+
+    '10': 'callsubr',
+
+    // return is normally used inside sub-routines to tells to the execution
+    // flow that it can be back to normal.
+    // During the translation process Type1 charstrings will be flattened and
+    // sub-routines will be embedded directly into the charstring directly, so
+    // this can be ignored safely.
+    '11': 'return',
+
+    '12': {
+      // dotsection is a Type1 command to specify some hinting feature for dots
+      // that do not take a parameter and it can safely be ignored for Type2.
+      '0': null, // dotsection
+
+      // [vh]stem3 are Type1 only and Type2 supports [vh]stem with multiple
+      // parameters, so instead of returning [vh]stem3 take a shortcut and
+      // return [vhstem] instead.
+      '1': 'vstem',
+      '2': 'hstem',
+
+      // Type1 only command with command not (yet) built-in ,throw an error
+      '6': -1, // seac
+      '7': -1, // sbw
+
+      '11': 'sub',
+      '12': 'div',
+
+      // callothersubr is a mechanism to make calls on the postscript
+      // interpreter, this is not supported by Type2 charstring but hopefully
+      // most of the default commands can be ignored safely.
+      '16': 'callothersubr',
+
+      '17': 'pop',
+
+      // setcurrentpoint sets the current point to x, y without performing a
+      // moveto (this is a one shot positionning command). This is used only
+      // with the return of an OtherSubrs call.
+      // TODO Implement the OtherSubrs charstring embedding and replace this
+      // call by a no-op, like 2 'pop' commands for example.
+      '33': null // setcurrentpoint
+    },
+    '13': 'hsbw',
+    '14': 'endchar',
+    '21': 'rmoveto',
+    '22': 'hmoveto',
+    '30': 'vhcurveto',
+    '31': 'hvcurveto'
+  };
+
+  var kEscapeCommand = 12;
+
+  function decodeCharString(array) {
+    var charstring = [];
+    var lsb = 0;
+    var width = 0;
+    var flexState = 0;
+
+    var value = '';
+    var count = array.length;
+    for (var i = 0; i < count; i++) {
+      value = array[i];
+
+      if (value < 32) {
+        var command = null;
+        if (value == kEscapeCommand) {
+          var escape = array[++i];
+
+          // TODO Clean this code
+          if (escape == 16) {
+            var index = charstring.pop();
+            var argc = charstring.pop();
+            for (var j = 0; j < argc; j++)
+              charstring.push('drop');
+
+            // If the flex mechanism is not used in a font program, Adobe
+            // states that entries 0, 1 and 2 can simply be replaced by
+            // {}, which means that we can simply ignore them.
+            if (index < 3) {
+              continue;
+            }
+
+            // This is the same things about hint replacement, if it is not used
+            // entry 3 can be replaced by {3}
+            // TODO support hint replacment
+            if (index == 3) {
+              charstring.push(3);
+              i++;
+              continue;
+            }
+          } else if (escape == 17 || escape == 33) {
+            // pop or setcurrentpoint commands can be ignored
+            // since we are not doing callothersubr
+            continue;
+          } else if (!kHintingEnabled && (escape == 1 || escape == 2)) {
+            charstring.push('drop', 'drop', 'drop', 'drop', 'drop', 'drop');
+            continue;
+          }
+
+          command = charStringDictionary['12'][escape];
+        } else {
+          // TODO Clean this code
+          if (value == 13) { // hsbw
+            if (charstring.length == 2) {
+              lsb = charstring[0];
+              width = charstring[1];
+              charstring.splice(0, 1);
+            } else if (charstring.length == 4 && charstring[3] == 'div') {
+              lsb = charstring[0];
+              width = charstring[1] / charstring[2];
+              charstring.splice(0, 1);
+            } else if (charstring.length == 4 && charstring[2] == 'div') {
+              lsb = charstring[0] / charstring[1];
+              width = charstring[3];
+              charstring.splice(0, 3);
+            } else {
+              error('Unsupported hsbw format: ' + charstring);
+            }
+
+            charstring.push(lsb, 'hmoveto');
+            continue;
+          } else if (value == 10) { // callsubr
+            if (charstring[charstring.length - 1] < 3) { // subr #0..2
+              var subrNumber = charstring.pop();
+              switch (subrNumber) {
+                case 1:
+                  flexState = 1; // prepare for flex coordinates
+                  break;
+                case 2:
+                  flexState = 2; // flex in progress
+                  break;
+                case 0:
+                  // type2 flex command does not need final coords
+                  charstring.push('exch', 'drop', 'exch', 'drop');
+                  charstring.push('flex');
+                  flexState = 0;
+                  break;
+              }
+              continue;
+            }
+          } else if (value == 21 && flexState > 0) {
+            if (flexState > 1)
+              continue; // ignoring rmoveto
+            value = 5; // first segment replacing with rlineto
+          } else if (!kHintingEnabled && (value == 1 || value == 3)) {
+            charstring.push('drop', 'drop');
+            continue;
+          }
+          command = charStringDictionary[value];
+        }
+
+        // Some charstring commands are meaningless in Type2 and will return
+        // a null, let's just ignored them
+        if (!command && i < count) {
+          continue;
+        } else if (!command) {
+          break;
+        } else if (command == -1) {
+          warn('Support for Type1 command ' + value +
+                ' (' + escape + ') is not implemented in charstring: ' +
+                charstring);
+          if (value == 12) {
+            // we know how to ignore only some the Type1 commands
+            switch (escape) {
+              case 7:
+                charstring.push('drop', 'drop', 'drop', 'drop');
+                continue;
+              case 8:
+                charstring.push('drop');
+                continue;
+            }
+          }
+        }
+
+        value = command;
+      } else if (value <= 246) {
+        value = value - 139;
+      } else if (value <= 250) {
+        value = ((value - 247) * 256) + array[++i] + 108;
+      } else if (value <= 254) {
+        value = -((value - 251) * 256) - array[++i] - 108;
+      } else {
+        value = (array[++i] & 0xff) << 24 | (array[++i] & 0xff) << 16 |
+                (array[++i] & 0xff) << 8 | (array[++i] & 0xff) << 0;
+      }
+
+      charstring.push(value);
+    }
+
+    return { charstring: charstring, width: width, lsb: lsb };
+  }
+
+  /*
+   * Returns an object containing a Subrs array and a CharStrings
+   * array extracted from and eexec encrypted block of data
+   */
+  function readNumberArray(str, index) {
+    var start = index;
+    while (str[index++] != '[')
+      start++;
+    start++;
+
+    var count = 0;
+    while (str[index++] != ']')
+      count++;
+
+    var array = str.substr(start, count).split(' ');
+    for (var i = 0, ii = array.length; i < ii; i++)
+      array[i] = parseFloat(array[i] || 0);
+    return array;
+  }
+
+  function readNumber(str, index) {
+    while (str[index] == ' ')
+      index++;
+
+    var start = index;
+
+    var count = 0;
+    while (str[index++] != ' ')
+      count++;
+
+    return parseFloat(str.substr(start, count) || 0);
+  }
+
+  function isSeparator(c) {
+    return c == ' ' || c == '\n' || c == '\x0d';
+  }
+
+  this.extractFontProgram = function t1_extractFontProgram(stream) {
+    var eexec = decrypt(stream, kEexecEncryptionKey, 4);
+    var eexecStr = '';
+    for (var i = 0, ii = eexec.length; i < ii; i++)
+      eexecStr += String.fromCharCode(eexec[i]);
+
+    var glyphsSection = false, subrsSection = false;
+    var program = {
+      subrs: [],
+      charstrings: [],
+      properties: {
+        'private': {
+          'lenIV': 4
+        }
+      }
+    };
+
+    var glyph = '';
+    var token = '';
+    var length = 0;
+
+    var c = '';
+    var count = eexecStr.length;
+    for (var i = 0; i < count; i++) {
+      var getToken = function getToken() {
+        while (i < count && isSeparator(eexecStr[i]))
+          ++i;
+
+        var token = '';
+        while (i < count && !isSeparator(eexecStr[i]))
+          token += eexecStr[i++];
+
+        return token;
+      };
+      var c = eexecStr[i];
+
+      if ((glyphsSection || subrsSection) &&
+          (token == 'RD' || token == '-|')) {
+        i++;
+        var data = eexec.slice(i, i + length);
+        var lenIV = program.properties.private['lenIV'];
+        var encoded = decrypt(data, kCharStringsEncryptionKey, lenIV);
+        var str = decodeCharString(encoded);
+
+        if (glyphsSection) {
+          program.charstrings.push({
+            glyph: glyph,
+            data: str.charstring,
+            lsb: str.lsb,
+            width: str.width
+          });
+        } else {
+          program.subrs.push(str.charstring);
+        }
+        i += length;
+        token = '';
+      } else if (isSeparator(c)) {
+        length = parseInt(token, 10);
+        token = '';
+      } else {
+        token += c;
+        if (!glyphsSection) {
+          switch (token) {
+            case '/CharString':
+              glyphsSection = true;
+              break;
+            case '/Subrs':
+              ++i;
+              var num = parseInt(getToken(), 10);
+              getToken(); // read in 'array'
+              for (var j = 0; j < num; ++j) {
+                var t = getToken(); // read in 'dup'
+                if (t == 'ND' || t == '|-' || t == 'noaccess')
+                  break;
+                var index = parseInt(getToken(), 10);
+                if (index > j)
+                  j = index;
+                var length = parseInt(getToken(), 10);
+                getToken(); // read in 'RD'
+                var data = eexec.slice(i + 1, i + 1 + length);
+                var lenIV = program.properties.private['lenIV'];
+                var encoded = decrypt(data, kCharStringsEncryptionKey, lenIV);
+                var str = decodeCharString(encoded);
+                i = i + 1 + length;
+                t = getToken(); // read in 'NP'
+                if (t == 'noaccess')
+                  getToken(); // read in 'put'
+                program.subrs[index] = str.charstring;
+              }
+              break;
+            case '/BlueValues':
+            case '/OtherBlues':
+            case '/FamilyBlues':
+            case '/FamilyOtherBlues':
+            case '/StemSnapH':
+            case '/StemSnapV':
+              program.properties.private[token.substring(1)] =
+                readNumberArray(eexecStr, i + 1);
+              break;
+            case '/StdHW':
+            case '/StdVW':
+              program.properties.private[token.substring(1)] =
+                readNumberArray(eexecStr, i + 2)[0];
+              break;
+            case '/BlueShift':
+            case '/lenIV':
+            case '/BlueFuzz':
+            case '/BlueScale':
+            case '/LanguageGroup':
+            case '/ExpansionFactor':
+              program.properties.private[token.substring(1)] =
+                readNumber(eexecStr, i + 1);
+              break;
+          }
+        } else if (c == '/') {
+          token = glyph = '';
+          while ((c = eexecStr[++i]) != ' ')
+            glyph += c;
+        }
+      }
+    }
+
+    return program;
+  };
+
+  this.extractFontHeader = function t1_extractFontHeader(stream, properties) {
+    var headerString = '';
+    for (var i = 0, ii = stream.length; i < ii; i++)
+      headerString += String.fromCharCode(stream[i]);
+
+    var token = '';
+    var count = headerString.length;
+    for (var i = 0; i < count; i++) {
+      var getToken = function getToken() {
+        var char = headerString[i];
+        while (i < count && (isSeparator(char) || char == '/'))
+          char = headerString[++i];
+
+        var token = '';
+        while (i < count && !(isSeparator(char) || char == '/')) {
+          token += char;
+          char = headerString[++i];
+        }
+
+        return token;
+      };
+
+      var c = headerString[i];
+      if (isSeparator(c)) {
+        switch (token) {
+          case '/FontMatrix':
+            var matrix = readNumberArray(headerString, i + 1);
+
+            // The FontMatrix is in unitPerEm, so make it pixels
+            for (var j = 0, jj = matrix.length; j < jj; j++)
+              matrix[j] *= 1000;
+
+            // Make the angle into the right direction
+            matrix[2] *= -1;
+
+            properties.fontMatrix = matrix;
+            break;
+          case '/Encoding':
+            var encodingArg = getToken();
+            var encoding;
+            if (!/^\d+$/.test(encodingArg)) {
+              // encoding name is specified
+              encoding = Encodings[encodingArg];
+            } else {
+              encoding = [];
+              var size = parseInt(encodingArg, 10);
+              getToken(); // read in 'array'
+
+              for (var j = 0; j < size; j++) {
+                var token = getToken();
+                if (token == 'dup') {
+                  var index = parseInt(getToken(), 10);
+                  var glyph = getToken();
+                  encoding[index] = glyph;
+                  getToken(); // read the in 'put'
+                }
+              }
+            }
+            if (!properties.hasEncoding && encoding) {
+              properties.baseEncoding = encoding;
+              break;
+            }
+            break;
+        }
+        token = '';
+      } else {
+        token += c;
+      }
+    }
+  };
+};
+
+/**
+ * The CFF class takes a Type1 file and wrap it into a
+ * 'Compact Font Format' which itself embed Type2 charstrings.
+ */
+var CFFStrings = [
+  '.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
+  'ampersand', 'quoteright', 'parenleft', 'parenright', 'asterisk', 'plus',
+  'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four',
+  'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less',
+  'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+  'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+  'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright', 'asciicircum',
+  'underscore', 'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
+  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y',
+  'z', 'braceleft', 'bar', 'braceright', 'asciitilde', 'exclamdown', 'cent',
+  'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
+  'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
+  'guilsinglright', 'fi', 'fl', 'endash', 'dagger', 'daggerdbl',
+  'periodcentered', 'paragraph', 'bullet', 'quotesinglbase', 'quotedblbase',
+  'quotedblright', 'guillemotright', 'ellipsis', 'perthousand', 'questiondown',
+  'grave', 'acute', 'circumflex', 'tilde', 'macron', 'breve', 'dotaccent',
+  'dieresis', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron', 'emdash',
+  'AE', 'ordfeminine', 'Lslash', 'Oslash', 'OE', 'ordmasculine', 'ae',
+  'dotlessi', 'lslash', 'oslash', 'oe', 'germandbls', 'onesuperior',
+  'logicalnot', 'mu', 'trademark', 'Eth', 'onehalf', 'plusminus', 'Thorn',
+  'onequarter', 'divide', 'brokenbar', 'degree', 'thorn', 'threequarters',
+  'twosuperior', 'registered', 'minus', 'eth', 'multiply', 'threesuperior',
+  'copyright', 'Aacute', 'Acircumflex', 'Adieresis', 'Agrave', 'Aring',
+  'Atilde', 'Ccedilla', 'Eacute', 'Ecircumflex', 'Edieresis', 'Egrave',
+  'Iacute', 'Icircumflex', 'Idieresis', 'Igrave', 'Ntilde', 'Oacute',
+  'Ocircumflex', 'Odieresis', 'Ograve', 'Otilde', 'Scaron', 'Uacute',
+  'Ucircumflex', 'Udieresis', 'Ugrave', 'Yacute', 'Ydieresis', 'Zcaron',
+  'aacute', 'acircumflex', 'adieresis', 'agrave', 'aring', 'atilde',
+  'ccedilla', 'eacute', 'ecircumflex', 'edieresis', 'egrave', 'iacute',
+  'icircumflex', 'idieresis', 'igrave', 'ntilde', 'oacute', 'ocircumflex',
+  'odieresis', 'ograve', 'otilde', 'scaron', 'uacute', 'ucircumflex',
+  'udieresis', 'ugrave', 'yacute', 'ydieresis', 'zcaron', 'exclamsmall',
+  'Hungarumlautsmall', 'dollaroldstyle', 'dollarsuperior', 'ampersandsmall',
+  'Acutesmall', 'parenleftsuperior', 'parenrightsuperior', '266 ff',
+  'onedotenleader', 'zerooldstyle', 'oneoldstyle', 'twooldstyle',
+  'threeoldstyle', 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle',
+  'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'commasuperior',
+  'threequartersemdash', 'periodsuperior', 'questionsmall', 'asuperior',
+  'bsuperior', 'centsuperior', 'dsuperior', 'esuperior', 'isuperior',
+  'lsuperior', 'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
+  'tsuperior', 'ff', 'ffi', 'ffl', 'parenleftinferior', 'parenrightinferior',
+  'Circumflexsmall', 'hyphensuperior', 'Gravesmall', 'Asmall', 'Bsmall',
+  'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall',
+  'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall',
+  'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall',
+  'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah',
+  'Tildesmall', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall',
+  'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall', 'Caronsmall',
+  'Dotaccentsmall', 'Macronsmall', 'figuredash', 'hypheninferior',
+  'Ogoneksmall', 'Ringsmall', 'Cedillasmall', 'questiondownsmall', 'oneeighth',
+  'threeeighths', 'fiveeighths', 'seveneighths', 'onethird', 'twothirds',
+  'zerosuperior', 'foursuperior', 'fivesuperior', 'sixsuperior',
+  'sevensuperior', 'eightsuperior', 'ninesuperior', 'zeroinferior',
+  'oneinferior', 'twoinferior', 'threeinferior', 'fourinferior',
+  'fiveinferior', 'sixinferior', 'seveninferior', 'eightinferior',
+  'nineinferior', 'centinferior', 'dollarinferior', 'periodinferior',
+  'commainferior', 'Agravesmall', 'Aacutesmall', 'Acircumflexsmall',
+  'Atildesmall', 'Adieresissmall', 'Aringsmall', 'AEsmall', 'Ccedillasmall',
+  'Egravesmall', 'Eacutesmall', 'Ecircumflexsmall', 'Edieresissmall',
+  'Igravesmall', 'Iacutesmall', 'Icircumflexsmall', 'Idieresissmall',
+  'Ethsmall', 'Ntildesmall', 'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall',
+  'Otildesmall', 'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall',
+  'Uacutesmall', 'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall',
+  'Thornsmall', 'Ydieresissmall', '001.000', '001.001', '001.002', '001.003',
+  'Black', 'Bold', 'Book', 'Light', 'Medium', 'Regular', 'Roman', 'Semibold'
+];
+
+var type1Parser = new Type1Parser();
+
+var CFF = function cffCFF(name, file, properties) {
+  // Get the data block containing glyphs and subrs informations
+  var headerBlock = file.getBytes(properties.length1);
+  type1Parser.extractFontHeader(headerBlock, properties);
+
+  // Decrypt the data blocks and retrieve it's content
+  var eexecBlock = file.getBytes(properties.length2);
+  var data = type1Parser.extractFontProgram(eexecBlock);
+  for (var info in data.properties)
+    properties[info] = data.properties[info];
+
+  var charstrings = this.getOrderedCharStrings(data.charstrings, properties);
+  var type2Charstrings = this.getType2Charstrings(charstrings);
+  var subrs = this.getType2Subrs(data.subrs);
+
+  this.charstrings = charstrings;
+  this.data = this.wrap(name, type2Charstrings, this.charstrings,
+                        subrs, properties);
+};
+
+CFF.prototype = {
+  createCFFIndexHeader: function cff_createCFFIndexHeader(objects, isByte) {
+    // First 2 bytes contains the number of objects contained into this index
+    var count = objects.length;
+
+    // If there is no object, just create an array saying that with another
+    // offset byte.
+    if (count == 0)
+      return '\x00\x00\x00';
+
+    var data = String.fromCharCode((count >> 8) & 0xFF, count & 0xff);
+
+    // Next byte contains the offset size use to reference object in the file
+    // Actually we're using 0x04 to be sure to be able to store everything
+    // without thinking of it while coding.
+    data += '\x04';
+
+    // Add another offset after this one because we need a new offset
+    var relativeOffset = 1;
+    for (var i = 0; i < count + 1; i++) {
+      data += String.fromCharCode((relativeOffset >>> 24) & 0xFF,
+                                  (relativeOffset >> 16) & 0xFF,
+                                  (relativeOffset >> 8) & 0xFF,
+                                  relativeOffset & 0xFF);
+
+      if (objects[i])
+        relativeOffset += objects[i].length;
+    }
+
+    for (var i = 0; i < count; i++) {
+      for (var j = 0, jj = objects[i].length; j < jj; j++)
+        data += isByte ? String.fromCharCode(objects[i][j] & 0xFF) :
+                objects[i][j];
+    }
+    return data;
+  },
+
+  encodeNumber: function cff_encodeNumber(value) {
+    // some of the fonts has ouf-of-range values
+    // they are just arithmetic overflows
+    // make sanitizer happy
+    value |= 0;
+    if (value >= -32768 && value <= 32767) {
+      return '\x1c' +
+             String.fromCharCode((value >> 8) & 0xFF) +
+             String.fromCharCode(value & 0xFF);
+    } else {
+      return '\x1d' +
+             String.fromCharCode((value >> 24) & 0xFF) +
+             String.fromCharCode((value >> 16) & 0xFF) +
+             String.fromCharCode((value >> 8) & 0xFF) +
+             String.fromCharCode(value & 0xFF);
+    }
+  },
+
+  getOrderedCharStrings: function cff_getOrderedCharStrings(glyphs,
+                                                            properties) {
+    var charstrings = [];
+    var reverseMapping = {};
+    var encoding = properties.baseEncoding;
+    var i, length, glyphName;
+    for (i = 0, length = encoding.length; i < length; ++i) {
+      glyphName = encoding[i];
+      if (!glyphName || isSpecialUnicode(i))
+        continue;
+      reverseMapping[glyphName] = i;
+    }
+    reverseMapping['.notdef'] = 0;
+    var unusedUnicode = kCmapGlyphOffset;
+    for (i = 0, length = glyphs.length; i < length; i++) {
+      var item = glyphs[i];
+      var glyphName = item.glyph;
+      var unicode = glyphName in reverseMapping ?
+        reverseMapping[glyphName] : unusedUnicode++;
+      charstrings.push({
+        glyph: glyphName,
+        unicode: unicode,
+        gid: i,
+        charstring: item.data,
+        width: item.width,
+        lsb: item.lsb
+      });
+    }
+
+    charstrings.sort(function charstrings_sort(a, b) {
+      return a.unicode - b.unicode;
+    });
+    return charstrings;
+  },
+
+  getType2Charstrings: function cff_getType2Charstrings(type1Charstrings) {
+    var type2Charstrings = [];
+    var count = type1Charstrings.length;
+    for (var i = 0; i < count; i++) {
+      var charstring = type1Charstrings[i].charstring;
+      type2Charstrings.push(this.flattenCharstring(charstring.slice(),
+                                                   this.commandsMap));
+    }
+    return type2Charstrings;
+  },
+
+  getType2Subrs: function cff_getType2Subrs(type1Subrs) {
+    var bias = 0;
+    var count = type1Subrs.length;
+    if (count < 1240)
+      bias = 107;
+    else if (count < 33900)
+      bias = 1131;
+    else
+      bias = 32768;
+
+    // Add a bunch of empty subrs to deal with the Type2 bias
+    var type2Subrs = [];
+    for (var i = 0; i < bias; i++)
+      type2Subrs.push([0x0B]);
+
+    for (var i = 0; i < count; i++) {
+      var subr = type1Subrs[i];
+      if (!subr)
+        subr = [0x0B];
+
+      type2Subrs.push(this.flattenCharstring(subr, this.commandsMap));
+    }
+
+    return type2Subrs;
+  },
+
+  /*
+   * Flatten the commands by interpreting the postscript code and replacing
+   * every 'callsubr', 'callothersubr' by the real commands.
+   */
+  commandsMap: {
+    'hstem': 1,
+    'vstem': 3,
+    'vmoveto': 4,
+    'rlineto': 5,
+    'hlineto': 6,
+    'vlineto': 7,
+    'rrcurveto': 8,
+    'callsubr': 10,
+    'return': 11,
+    'sub': [12, 11],
+    'div': [12, 12],
+    'exch': [12, 28],
+    'flex': [12, 35],
+    'drop' : [12, 18],
+    'endchar': 14,
+    'rmoveto': 21,
+    'hmoveto': 22,
+    'vhcurveto': 30,
+    'hvcurveto': 31
+  },
+
+  flattenCharstring: function flattenCharstring(charstring, map) {
+    // charstring changes size - can't cache .length in loop
+    for (var i = 0; i < charstring.length; i++) {
+      var command = charstring[i];
+      if (command.charAt) {
+        var cmd = map[command];
+        assert(cmd, 'Unknow command: ' + command);
+
+        if (isArray(cmd))
+          charstring.splice(i++, 1, cmd[0], cmd[1]);
+        else
+          charstring[i] = cmd;
+      } else {
+        // Type1 charstring use a division for number above 32000
+        if (command > 32000) {
+          var divisor = charstring[i + 1];
+          command /= divisor;
+          charstring.splice(i, 3, 28, command >> 8, command & 0xff);
+        } else {
+          charstring.splice(i, 1, 28, command >> 8, command & 0xff);
+        }
+        i += 2;
+      }
+    }
+    return charstring;
+  },
+
+  wrap: function wrap(name, glyphs, charstrings, subrs, properties) {
+    var fields = {
+      // major version, minor version, header size, offset size
+      'header': '\x01\x00\x04\x04',
+
+      'names': this.createCFFIndexHeader([name]),
+
+      'topDict': (function topDict(self) {
+        return function cffWrapTopDict() {
+          var header = '\x00\x01\x01\x01';
+          var dict =
+              '\xf8\x1b\x00' + // version
+              '\xf8\x1c\x01' + // Notice
+              '\xf8\x1d\x02' + // FullName
+              '\xf8\x1e\x03' + // FamilyName
+              '\xf8\x1f\x04' +  // Weight
+              '\x1c\x00\x00\x10'; // Encoding
+
+          var boundingBox = properties.bbox;
+          for (var i = 0, ii = boundingBox.length; i < ii; i++)
+            dict += self.encodeNumber(boundingBox[i]);
+          dict += '\x05'; // FontBBox;
+
+          var offset = fields.header.length +
+                       fields.names.length +
+                       (header.length + 1) +
+                       (dict.length + (4 + 4)) +
+                       fields.strings.length +
+                       fields.globalSubrs.length;
+
+          // If the offset if over 32767, encodeNumber is going to return
+          // 5 bytes to encode the position instead of 3.
+          if ((offset + fields.charstrings.length) > 32767) {
+            offset += 9;
+          } else {
+            offset += 7;
+          }
+
+          dict += self.encodeNumber(offset) + '\x0f'; // Charset
+
+          offset = offset + (glyphs.length * 2) + 1;
+          dict += self.encodeNumber(offset) + '\x11'; // Charstrings
+
+          offset = offset + fields.charstrings.length;
+          dict += self.encodeNumber(fields.private.length);
+          dict += self.encodeNumber(offset) + '\x12'; // Private
+
+          return header + String.fromCharCode(dict.length + 1) + dict;
+        };
+      })(this),
+
+      'strings': (function strings(self) {
+        var strings = [
+          'Version 0.11',         // Version
+          'See original notice',  // Notice
+          name,                   // FullName
+          name,                   // FamilyName
+          'Medium'                // Weight
+        ];
+        return self.createCFFIndexHeader(strings);
+      })(this),
+
+      'globalSubrs': this.createCFFIndexHeader([]),
+
+      'charset': (function charset(self) {
+        var charsetString = '\x00'; // Encoding
+
+        var count = glyphs.length;
+        for (var i = 0; i < count; i++) {
+          var index = CFFStrings.indexOf(charstrings[i].glyph);
+          // Some characters like asterikmath && circlecopyrt are
+          // missing from the original strings, for the moment let's
+          // map them to .notdef and see later if it cause any
+          // problems
+          if (index == -1)
+            index = 0;
+
+          charsetString += String.fromCharCode(index >> 8, index & 0xff);
+        }
+        return charsetString;
+      })(this),
+
+      'charstrings': this.createCFFIndexHeader([[0x8B, 0x0E]].concat(glyphs),
+                                               true),
+
+      'private': (function cffWrapPrivate(self) {
+        var data =
+            '\x8b\x14' + // defaultWidth
+            '\x8b\x15';  // nominalWidth
+        var fieldMap = {
+          BlueValues: '\x06',
+          OtherBlues: '\x07',
+          FamilyBlues: '\x08',
+          FamilyOtherBlues: '\x09',
+          StemSnapH: '\x0c\x0c',
+          StemSnapV: '\x0c\x0d',
+          BlueShift: '\x0c\x0a',
+          BlueFuzz: '\x0c\x0b',
+          BlueScale: '\x0c\x09',
+          LanguageGroup: '\x0c\x11',
+          ExpansionFactor: '\x0c\x18'
+        };
+        for (var field in fieldMap) {
+          if (!properties.private.hasOwnProperty(field))
+            continue;
+          var value = properties.private[field];
+
+          if (isArray(value)) {
+            data += self.encodeNumber(value[0]);
+            for (var i = 1, ii = value.length; i < ii; i++)
+              data += self.encodeNumber(value[i] - value[i - 1]);
+          } else {
+            data += self.encodeNumber(value);
+          }
+          data += fieldMap[field];
+        }
+
+        data += self.encodeNumber(data.length + 4) + '\x13'; // Subrs offset
+
+        return data;
+      })(this),
+
+      'localSubrs': this.createCFFIndexHeader(subrs, true)
+    };
+    fields.topDict = fields.topDict();
+
+
+    var cff = [];
+    for (var index in fields) {
+      var field = fields[index];
+      for (var i = 0, ii = field.length; i < ii; i++)
+        cff.push(field.charCodeAt(i));
+    }
+
+    return cff;
+  }
+};
+
+var Type2CFF = (function type2CFF() {
+  // TODO: replace parsing code with the Type2Parser in font_utils.js
+  function constructor(file, properties) {
+    var bytes = file.getBytes();
+    this.bytes = bytes;
+    this.properties = properties;
+
+    this.data = this.parse();
+  }
+
+  constructor.prototype = {
+    parse: function cff_parse() {
+      var header = this.parseHeader();
+      var properties = this.properties;
+      var nameIndex = this.parseIndex(header.endPos);
+
+      var dictIndex = this.parseIndex(nameIndex.endPos);
+      if (dictIndex.length != 1)
+        error('CFF contains more than 1 font');
+
+      var stringIndex = this.parseIndex(dictIndex.endPos);
+      var gsubrIndex = this.parseIndex(stringIndex.endPos);
+
+      var strings = this.getStrings(stringIndex);
+
+      var baseDict = this.parseDict(dictIndex.get(0).data);
+      var topDict = this.getTopDict(baseDict, strings);
+
+      var bytes = this.bytes;
+
+      var privateDict = {};
+      var privateInfo = topDict.Private;
+      if (privateInfo) {
+        var privOffset = privateInfo[1], privLength = privateInfo[0];
+        var privBytes = bytes.subarray(privOffset, privOffset + privLength);
+        baseDict = this.parseDict(privBytes);
+        privateDict = this.getPrivDict(baseDict, strings);
+      } else {
+        privateDict.defaultWidthX = properties.defaultWidth;
+      }
+
+      var charStrings = this.parseIndex(topDict.CharStrings);
+      var charset = this.parseCharsets(topDict.charset,
+                                       charStrings.length, strings);
+      var encoding = this.parseEncoding(topDict.Encoding, properties,
+                                             strings, charset);
+
+      var charset, encoding;
+      var isCIDFont = properties.subtype == 'CIDFontType0C';
+      if (isCIDFont) {
+        charset = [];
+        charset.length = charStrings.length;
+        encoding = this.parseCidMap(topDict.charset,
+                                    charStrings.length);
+      } else {
+        charset = this.parseCharsets(topDict.charset,
+                                     charStrings.length, strings);
+        encoding = this.parseEncoding(topDict.Encoding, properties,
+                                      strings, charset);
+      }
+
+      // The font sanitizer does not support CFF encoding with a
+      // supplement, since the encoding is not really use to map
+      // between gid to glyph, let's overwrite what is declared in
+      // the top dictionary to let the sanitizer think the font use
+      // StandardEncoding, that's a lie but that's ok.
+      if (encoding.hasSupplement)
+        bytes[topDict.Encoding] &= 0x7F;
+
+      // The CFF specification state that the 'dotsection' command
+      // (12, 0) is deprecated and treated as a no-op, but all Type2
+      // charstrings processors should support them. Unfortunately
+      // the font sanitizer don't. As a workaround the sequence (12, 0)
+      // is replaced by a useless (0, hmoveto).
+      var count = charStrings.length;
+      for (var i = 0; i < count; i++) {
+        var charstring = charStrings.get(i);
+
+        var start = charstring.start;
+        var data = charstring.data;
+        var length = data.length;
+        for (var j = 0; j <= length; j) {
+          var value = data[j++];
+          if (value == 12 && data[j++] == 0) {
+              bytes[start + j - 2] = 139;
+              bytes[start + j - 1] = 22;
+          } else if (value === 28) {
+            j += 2;
+          } else if (value >= 247 && value <= 254) {
+            j++;
+          } else if (value == 255) {
+            j += 4;
+          }
+        }
+      }
+
+      // charstrings contains info about glyphs (one element per glyph
+      // containing mappings for {unicode, width})
+      var charstrings = this.getCharStrings(charset, encoding.encoding,
+                                            privateDict, this.properties);
+
+      // create the mapping between charstring and glyph id
+      var glyphIds = [];
+      for (var i = 0, ii = charstrings.length; i < ii; i++)
+        glyphIds.push(charstrings[i].gid);
+
+      this.charstrings = charstrings;
+      this.glyphIds = glyphIds;
+
+      var data = [];
+      for (var i = 0, ii = bytes.length; i < ii; ++i)
+        data.push(bytes[i]);
+      return data;
+    },
+
+    getCharStrings: function cff_charstrings(charsets, encoding,
+                                             privateDict, properties) {
+      var charstrings = [];
+      var unicodeUsed = [];
+      var unassignedUnicodeItems = [];
+      for (var i = 0, ii = charsets.length; i < ii; i++) {
+        var glyph = charsets[i];
+        var encodingFound = false;
+        for (var charcode in encoding) {
+          if (encoding[charcode] == i) {
+            var code = charcode | 0;
+            charstrings.push({
+              unicode: adaptUnicode(code),
+              code: code,
+              gid: i,
+              glyph: glyph
+            });
+            unicodeUsed[code] = true;
+            encodingFound = true;
+            break;
+          }
+        }
+        if (!encodingFound) {
+          unassignedUnicodeItems.push(i);
+        }
+      }
+
+      var nextUnusedUnicode = 0x21;
+      for (var j = 0, jj = unassignedUnicodeItems.length; j < jj; ++j) {
+        var i = unassignedUnicodeItems[j];
+        // giving unicode value anyway
+        while (unicodeUsed[nextUnusedUnicode])
+          nextUnusedUnicode++;
+        var code = nextUnusedUnicode++;
+        charstrings.push({
+          unicode: adaptUnicode(code),
+          code: code,
+          gid: i,
+          glyph: charsets[i]
+        });
+      }
+
+      // sort the array by the unicode value (again)
+      charstrings.sort(function type2CFFGetCharStringsSort(a, b) {
+        return a.unicode - b.unicode;
+      });
+      return charstrings;
+    },
+
+    parseEncoding: function cff_parseencoding(pos, properties, strings,
+                                              charset) {
+      var encoding = {};
+      var bytes = this.bytes;
+      var result = {
+        encoding: encoding,
+        hasSupplement: false
+      };
+
+      function readSupplement() {
+        var supplementsCount = bytes[pos++];
+        for (var i = 0; i < supplementsCount; i++) {
+          var code = bytes[pos++];
+          var sid = (bytes[pos++] << 8) + (bytes[pos++] & 0xff);
+          encoding[code] = properties.differences.indexOf(strings[sid]);
+        }
+      }
+
+      if (pos == 0 || pos == 1) {
+        var gid = 1;
+        var baseEncoding = pos ? Encodings.ExpertEncoding :
+                                 Encodings.StandardEncoding;
+        for (var i = 0, ii = charset.length; i < ii; i++) {
+          var index = baseEncoding.indexOf(charset[i]);
+          if (index != -1)
+            encoding[index] = gid++;
+        }
+      } else {
+        var format = bytes[pos++];
+        switch (format & 0x7f) {
+          case 0:
+            var glyphsCount = bytes[pos++];
+            for (var i = 1; i <= glyphsCount; i++)
+              encoding[bytes[pos++]] = i;
+            break;
+
+          case 1:
+            var rangesCount = bytes[pos++];
+            var gid = 1;
+            for (var i = 0; i < rangesCount; i++) {
+              var start = bytes[pos++];
+              var left = bytes[pos++];
+              for (var j = start; j <= start + left; j++)
+                encoding[j] = gid++;
+            }
+            break;
+
+          default:
+            error('Unknow encoding format: ' + format + ' in CFF');
+            break;
+        }
+        if (format & 0x80) {
+          readSupplement();
+          result.hasSupplement = true;
+        }
+      }
+      return result;
+    },
+
+    parseCharsets: function cff_parsecharsets(pos, length, strings) {
+      if (pos == 0) {
+        return ISOAdobeCharset.slice();
+      } else if (pos == 1) {
+        return ExpertCharset.slice();
+      } else if (pos == 2) {
+        return ExpertSubsetCharset.slice();
+      }
+
+      var bytes = this.bytes;
+      var format = bytes[pos++];
+      var charset = ['.notdef'];
+
+      // subtract 1 for the .notdef glyph
+      length -= 1;
+
+      switch (format) {
+        case 0:
+          for (var i = 0; i < length; i++) {
+            var sid = (bytes[pos++] << 8) | bytes[pos++];
+            charset.push(strings[sid]);
+          }
+          break;
+        case 1:
+          while (charset.length <= length) {
+            var sid = (bytes[pos++] << 8) | bytes[pos++];
+            var count = bytes[pos++];
+            for (var i = 0; i <= count; i++)
+              charset.push(strings[sid++]);
+          }
+          break;
+        case 2:
+          while (charset.length <= length) {
+            var sid = (bytes[pos++] << 8) | bytes[pos++];
+            var count = (bytes[pos++] << 8) | bytes[pos++];
+            for (var i = 0; i <= count; i++)
+              charset.push(strings[sid++]);
+          }
+          break;
+        default:
+          error('Unknown charset format');
+      }
+      return charset;
+    },
+
+    parseCidMap: function cff_parsecharsets(pos, length) {
+      var bytes = this.bytes;
+      var format = bytes[pos++];
+
+      var encoding = {};
+      var map = {encoding: encoding};
+
+      encoding[0] = 0;
+
+      var gid = 1;
+      switch (format) {
+        case 0:
+          while (gid < length) {
+            var cid = (bytes[pos++] << 8) | bytes[pos++];
+            encoding[cid] = gid++;
+          }
+          break;
+        case 1:
+          while (gid < length) {
+            var cid = (bytes[pos++] << 8) | bytes[pos++];
+            var count = bytes[pos++];
+            for (var i = 0; i <= count; i++)
+              encoding[cid++] = gid++;
+          }
+          break;
+        case 2:
+          while (gid < length) {
+            var cid = (bytes[pos++] << 8) | bytes[pos++];
+            var count = (bytes[pos++] << 8) | bytes[pos++];
+            for (var i = 0; i <= count; i++)
+              encoding[cid++] = gid++;
+          }
+          break;
+        default:
+          error('Unknown charset format');
+      }
+      return map;
+    },
+
+    getPrivDict: function cff_getprivdict(baseDict, strings) {
+      var dict = {};
+
+      // default values
+      dict['defaultWidthX'] = 0;
+      dict['nominalWidthX'] = 0;
+
+      for (var i = 0, ii = baseDict.length; i < ii; ++i) {
+        var pair = baseDict[i];
+        var key = pair[0];
+        var value = pair[1];
+        switch (key) {
+          case 20:
+            dict['defaultWidthX'] = value[0];
+          case 21:
+            dict['nominalWidthX'] = value[0];
+          default:
+            TODO('interpret top dict key: ' + key);
+        }
+      }
+      return dict;
+    },
+    getTopDict: function cff_gettopdict(baseDict, strings) {
+      var dict = {};
+
+      // default values
+      dict['Encoding'] = 0;
+      dict['charset'] = 0;
+
+      for (var i = 0, ii = baseDict.length; i < ii; ++i) {
+        var pair = baseDict[i];
+        var key = pair[0];
+        var value = pair[1];
+        switch (key) {
+          case 1:
+            dict['Notice'] = strings[value[0]];
+            break;
+          case 4:
+            dict['Weight'] = strings[value[0]];
+            break;
+          case 3094:
+            dict['BaseFontName'] = strings[value[0]];
+            break;
+          case 5:
+            dict['FontBBox'] = value;
+            break;
+          case 13:
+            dict['UniqueID'] = value[0];
+            break;
+          case 15:
+            dict['charset'] = value[0];
+            break;
+          case 16:
+            dict['Encoding'] = value[0];
+            break;
+          case 17:
+            dict['CharStrings'] = value[0];
+            break;
+          case 18:
+            dict['Private'] = value;
+            break;
+          case 3102:
+          case 3103:
+          case 3104:
+          case 3105:
+          case 3106:
+          case 3107:
+          case 3108:
+          case 3109:
+          case 3110:
+            dict['cidOperatorPresent'] = true;
+            break;
+          default:
+            TODO('interpret top dict key');
+        }
+      }
+      return dict;
+    },
+    getStrings: function cff_getStrings(stringIndex) {
+      function bytesToString(bytesArray) {
+        var str = '';
+        for (var i = 0, ii = bytesArray.length; i < ii; i++)
+          str += String.fromCharCode(bytesArray[i]);
+        return str;
+      }
+
+      var stringArray = [];
+      for (var i = 0, ii = CFFStrings.length; i < ii; i++)
+        stringArray.push(CFFStrings[i]);
+
+      for (var i = 0, ii = stringIndex.length; i < ii; i++)
+        stringArray.push(bytesToString(stringIndex.get(i).data));
+
+      return stringArray;
+    },
+    parseHeader: function cff_parseHeader() {
+      var bytes = this.bytes;
+      var offset = 0;
+
+      while (bytes[offset] != 1)
+        ++offset;
+
+      if (offset != 0) {
+        warning('cff data is shifted');
+        bytes = bytes.subarray(offset);
+        this.bytes = bytes;
+      }
+
+      return {
+        endPos: bytes[2],
+        offsetSize: bytes[3]
+      };
+    },
+    parseDict: function cff_parseDict(dict) {
+      var pos = 0;
+
+      function parseOperand() {
+        var value = dict[pos++];
+        if (value === 30) {
+          return parseFloatOperand(pos);
+        } else if (value === 28) {
+          value = dict[pos++];
+          value = (value << 8) | dict[pos++];
+          return value;
+        } else if (value === 29) {
+          value = dict[pos++];
+          value = (value << 8) | dict[pos++];
+          value = (value << 8) | dict[pos++];
+          value = (value << 8) | dict[pos++];
+          return value;
+        } else if (value <= 246) {
+          return value - 139;
+        } else if (value <= 250) {
+          return ((value - 247) * 256) + dict[pos++] + 108;
+        } else if (value <= 254) {
+          return -((value - 251) * 256) - dict[pos++] - 108;
+        } else {
+          error('255 is not a valid DICT command');
+        }
+        return -1;
+      }
+
+      function parseFloatOperand() {
+        var str = '';
+        var eof = 15;
+        var lookup = ['0', '1', '2', '3', '4', '5', '6', '7', '8',
+            '9', '.', 'E', 'E-', null, '-'];
+        var length = dict.length;
+        while (pos < length) {
+          var b = dict[pos++];
+          var b1 = b >> 4;
+          var b2 = b & 15;
+
+          if (b1 == eof)
+            break;
+          str += lookup[b1];
+
+          if (b2 == eof)
+            break;
+          str += lookup[b2];
+        }
+        return parseFloat(str);
+      }
+
+      var operands = [];
+      var entries = [];
+
+      var pos = 0;
+      var end = dict.length;
+      while (pos < end) {
+        var b = dict[pos];
+        if (b <= 21) {
+          if (b === 12) {
+            ++pos;
+            var op = dict[pos];
+            if ((op > 14 && op < 17) ||
+                (op > 23 && op < 30) || op > 38) {
+              warn('Invalid CFF dictionary key: ' + op);
+              // trying to replace it with initialRandomSeed
+              // to pass sanitizer
+              dict[pos] = 19;
+            }
+            var b = (b << 8) | op;
+          }
+          if (!operands.length && b == 8 &&
+              dict[pos + 1] == 9) {
+            // no operands for FamilyBlues, removing the key
+            // and next one is FamilyOtherBlues - skipping them
+            // also replacing FamilyBlues to pass sanitizer
+            dict[pos] = 139;
+            pos += 2;
+            continue;
+          }
+          entries.push([b, operands]);
+          operands = [];
+          ++pos;
+        } else {
+          operands.push(parseOperand());
+        }
+      }
+      return entries;
+    },
+    parseIndex: function cff_parseIndex(pos) {
+      var bytes = this.bytes;
+      var count = bytes[pos++] << 8 | bytes[pos++];
+      var offsets = [];
+      var end = pos;
+
+      if (count != 0) {
+        var offsetSize = bytes[pos++];
+        // add 1 for offset to determine size of last object
+        var startPos = pos + ((count + 1) * offsetSize) - 1;
+
+        for (var i = 0, ii = count + 1; i < ii; ++i) {
+          var offset = 0;
+          for (var j = 0; j < offsetSize; ++j) {
+            offset <<= 8;
+            offset += bytes[pos++];
+          }
+          offsets.push(startPos + offset);
+        }
+        end = offsets[count];
+      }
+
+      return {
+        get: function index_get(index) {
+          if (index >= count)
+            return null;
+
+          var start = offsets[index];
+          var end = offsets[index + 1];
+          return {
+            start: start,
+            end: end,
+            data: bytes.subarray(start, end)
+          };
+        },
+        length: count,
+        endPos: end
+      };
+    }
+  };
+
+  return constructor;
+})();
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/function.js b/apps/files_pdfviewer/js/pdfjs/src/function.js
new file mode 100755
index 00000000000..ef24736c135
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/function.js
@@ -0,0 +1,351 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var PDFFunction = (function pdfFunction() {
+  var CONSTRUCT_SAMPLED = 0;
+  var CONSTRUCT_INTERPOLATED = 2;
+  var CONSTRUCT_STICHED = 3;
+  var CONSTRUCT_POSTSCRIPT = 4;
+
+  return {
+    getSampleArray: function pdfFunctionGetSampleArray(size, outputSize, bps,
+                                                       str) {
+      var length = 1;
+      for (var i = 0, ii = size.length; i < ii; i++)
+        length *= size[i];
+      length *= outputSize;
+
+      var array = [];
+      var codeSize = 0;
+      var codeBuf = 0;
+      // 32 is a valid bps so shifting won't work
+      var sampleMul = 1.0 / (Math.pow(2.0, bps) - 1);
+
+      var strBytes = str.getBytes((length * bps + 7) / 8);
+      var strIdx = 0;
+      for (var i = 0; i < length; i++) {
+        while (codeSize < bps) {
+          codeBuf <<= 8;
+          codeBuf |= strBytes[strIdx++];
+          codeSize += 8;
+        }
+        codeSize -= bps;
+        array.push((codeBuf >> codeSize) * sampleMul);
+        codeBuf &= (1 << codeSize) - 1;
+      }
+      return array;
+    },
+
+    getIR: function pdfFunctionGetIR(xref, fn) {
+      var dict = fn.dict;
+      if (!dict)
+        dict = fn;
+
+      var types = [this.constructSampled,
+                   null,
+                   this.constructInterpolated,
+                   this.constructStiched,
+                   this.constructPostScript];
+
+      var typeNum = dict.get('FunctionType');
+      var typeFn = types[typeNum];
+      if (!typeFn)
+        error('Unknown type of function');
+
+      return typeFn.call(this, fn, dict, xref);
+    },
+
+    fromIR: function pdfFunctionFromIR(IR) {
+      var type = IR[0];
+      switch (type) {
+        case CONSTRUCT_SAMPLED:
+          return this.constructSampledFromIR(IR);
+        case CONSTRUCT_INTERPOLATED:
+          return this.constructInterpolatedFromIR(IR);
+        case CONSTRUCT_STICHED:
+          return this.constructStichedFromIR(IR);
+        case CONSTRUCT_POSTSCRIPT:
+        default:
+          return this.constructPostScriptFromIR(IR);
+      }
+    },
+
+    parse: function pdfFunctionParse(xref, fn) {
+      var IR = this.getIR(xref, fn);
+      return this.fromIR(IR);
+    },
+
+    constructSampled: function pdfFunctionConstructSampled(str, dict) {
+      function toMultiArray(arr) {
+        var inputLength = arr.length;
+        var outputLength = arr.length / 2;
+        var out = new Array(outputLength);
+        var index = 0;
+        for (var i = 0; i < inputLength; i += 2) {
+          out[index] = [arr[i], arr[i + 1]];
+          ++index;
+        }
+        return out;
+      }
+      var domain = dict.get('Domain');
+      var range = dict.get('Range');
+
+      if (!domain || !range)
+        error('No domain or range');
+
+      var inputSize = domain.length / 2;
+      var outputSize = range.length / 2;
+
+      domain = toMultiArray(domain);
+      range = toMultiArray(range);
+
+      var size = dict.get('Size');
+      var bps = dict.get('BitsPerSample');
+      var order = dict.get('Order');
+      if (!order)
+        order = 1;
+      if (order !== 1)
+        error('No support for cubic spline interpolation: ' + order);
+
+      var encode = dict.get('Encode');
+      if (!encode) {
+        encode = [];
+        for (var i = 0; i < inputSize; ++i) {
+          encode.push(0);
+          encode.push(size[i] - 1);
+        }
+      }
+      encode = toMultiArray(encode);
+
+      var decode = dict.get('Decode');
+      if (!decode)
+        decode = range;
+      else
+        decode = toMultiArray(decode);
+
+      // Precalc the multipliers
+      var inputMul = new Float64Array(inputSize);
+      for (var i = 0; i < inputSize; ++i) {
+        inputMul[i] = (encode[i][1] - encode[i][0]) /
+                  (domain[i][1] - domain[i][0]);
+      }
+
+      var idxMul = new Int32Array(inputSize);
+      idxMul[0] = outputSize;
+      for (i = 1; i < inputSize; ++i) {
+        idxMul[i] = idxMul[i - 1] * size[i - 1];
+      }
+
+      var nSamples = outputSize;
+      for (i = 0; i < inputSize; ++i)
+          nSamples *= size[i];
+
+      var samples = this.getSampleArray(size, outputSize, bps, str);
+
+      return [
+        CONSTRUCT_SAMPLED, inputSize, domain, encode, decode, samples, size,
+        outputSize, bps, range, inputMul, idxMul, nSamples
+      ];
+    },
+
+    constructSampledFromIR: function pdfFunctionConstructSampledFromIR(IR) {
+      var inputSize = IR[1];
+      var domain = IR[2];
+      var encode = IR[3];
+      var decode = IR[4];
+      var samples = IR[5];
+      var size = IR[6];
+      var outputSize = IR[7];
+      var bps = IR[8];
+      var range = IR[9];
+      var inputMul = IR[10];
+      var idxMul = IR[11];
+      var nSamples = IR[12];
+
+      return function constructSampledFromIRResult(args) {
+        if (inputSize != args.length)
+          error('Incorrect number of arguments: ' + inputSize + ' != ' +
+                args.length);
+        // Most of the below is a port of Poppler's implementation.
+        // TODO: There's a few other ways to do multilinear interpolation such
+        // as piecewise, which is much faster but an approximation.
+        var out = new Float64Array(outputSize);
+        var x;
+        var e = new Array(inputSize);
+        var efrac0 = new Float64Array(inputSize);
+        var efrac1 = new Float64Array(inputSize);
+        var sBuf = new Float64Array(1 << inputSize);
+        var i, j, k, idx, t;
+
+        // map input values into sample array
+        for (i = 0; i < inputSize; ++i) {
+          x = (args[i] - domain[i][0]) * inputMul[i] + encode[i][0];
+          if (x < 0) {
+            x = 0;
+          } else if (x > size[i] - 1) {
+            x = size[i] - 1;
+          }
+          e[i] = [Math.floor(x), 0];
+          if ((e[i][1] = e[i][0] + 1) >= size[i]) {
+            // this happens if in[i] = domain[i][1]
+            e[i][1] = e[i][0];
+          }
+          efrac1[i] = x - e[i][0];
+          efrac0[i] = 1 - efrac1[i];
+        }
+
+        // for each output, do m-linear interpolation
+        for (i = 0; i < outputSize; ++i) {
+
+          // pull 2^m values out of the sample array
+          for (j = 0; j < (1 << inputSize); ++j) {
+            idx = i;
+            for (k = 0, t = j; k < inputSize; ++k, t >>= 1) {
+              idx += idxMul[k] * (e[k][t & 1]);
+            }
+            if (idx >= 0 && idx < nSamples) {
+              sBuf[j] = samples[idx];
+            } else {
+              sBuf[j] = 0; // TODO Investigate if this is what Adobe does
+            }
+          }
+
+          // do m sets of interpolations
+          for (j = 0, t = (1 << inputSize); j < inputSize; ++j, t >>= 1) {
+            for (k = 0; k < t; k += 2) {
+              sBuf[k >> 1] = efrac0[j] * sBuf[k] + efrac1[j] * sBuf[k + 1];
+            }
+          }
+
+          // map output value to range
+          out[i] = (sBuf[0] * (decode[i][1] - decode[i][0]) + decode[i][0]);
+          if (out[i] < range[i][0]) {
+            out[i] = range[i][0];
+          } else if (out[i] > range[i][1]) {
+            out[i] = range[i][1];
+          }
+        }
+        return out;
+      }
+    },
+
+    constructInterpolated:
+    function pdfFunctionConstructInterpolated(str, dict) {
+      var c0 = dict.get('C0') || [0];
+      var c1 = dict.get('C1') || [1];
+      var n = dict.get('N');
+
+      if (!isArray(c0) || !isArray(c1))
+        error('Illegal dictionary for interpolated function');
+
+      var length = c0.length;
+      var diff = [];
+      for (var i = 0; i < length; ++i)
+        diff.push(c1[i] - c0[i]);
+
+      return [CONSTRUCT_INTERPOLATED, c0, diff, n];
+    },
+
+    constructInterpolatedFromIR:
+    function pdfFunctionconstructInterpolatedFromIR(IR) {
+      var c0 = IR[1];
+      var diff = IR[2];
+      var n = IR[3];
+
+      var length = diff.length;
+
+      return function constructInterpolatedFromIRResult(args) {
+        var x = n == 1 ? args[0] : Math.pow(args[0], n);
+
+        var out = [];
+        for (var j = 0; j < length; ++j)
+          out.push(c0[j] + (x * diff[j]));
+
+        return out;
+
+      }
+    },
+
+    constructStiched: function pdfFunctionConstructStiched(fn, dict, xref) {
+      var domain = dict.get('Domain');
+      var range = dict.get('Range');
+
+      if (!domain)
+        error('No domain');
+
+      var inputSize = domain.length / 2;
+      if (inputSize != 1)
+        error('Bad domain for stiched function');
+
+      var fnRefs = dict.get('Functions');
+      var fns = [];
+      for (var i = 0, ii = fnRefs.length; i < ii; ++i)
+        fns.push(PDFFunction.getIR(xref, xref.fetchIfRef(fnRefs[i])));
+
+      var bounds = dict.get('Bounds');
+      var encode = dict.get('Encode');
+
+      return [CONSTRUCT_STICHED, domain, bounds, encode, fns];
+    },
+
+    constructStichedFromIR: function pdfFunctionConstructStichedFromIR(IR) {
+      var domain = IR[1];
+      var bounds = IR[2];
+      var encode = IR[3];
+      var fnsIR = IR[4];
+      var fns = [];
+
+      for (var i = 0, ii = fnsIR.length; i < ii; i++) {
+        fns.push(PDFFunction.fromIR(fnsIR[i]));
+      }
+
+      return function constructStichedFromIRResult(args) {
+        var clip = function constructStichedFromIRClip(v, min, max) {
+          if (v > max)
+            v = max;
+          else if (v < min)
+            v = min;
+          return v;
+        };
+
+        // clip to domain
+        var v = clip(args[0], domain[0], domain[1]);
+        // calulate which bound the value is in
+        for (var i = 0, ii = bounds.length; i < ii; ++i) {
+          if (v < bounds[i])
+            break;
+        }
+
+        // encode value into domain of function
+        var dmin = domain[0];
+        if (i > 0)
+          dmin = bounds[i - 1];
+        var dmax = domain[1];
+        if (i < bounds.length)
+          dmax = bounds[i];
+
+        var rmin = encode[2 * i];
+        var rmax = encode[2 * i + 1];
+
+        var v2 = rmin + (v - dmin) * (rmax - rmin) / (dmax - dmin);
+
+        // call the appropropriate function
+        return fns[i]([v2]);
+      };
+    },
+
+    constructPostScript: function pdfFunctionConstructPostScript() {
+      return [CONSTRUCT_POSTSCRIPT];
+    },
+
+    constructPostScriptFromIR: function pdfFunctionConstructPostScriptFromIR() {
+      TODO('unhandled type of function');
+      return function constructPostScriptFromIRResult() {
+        return [255, 105, 180];
+      };
+    }
+  };
+})();
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/glyphlist.js b/apps/files_pdfviewer/js/pdfjs/src/glyphlist.js
new file mode 100755
index 00000000000..5691f85461e
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/glyphlist.js
@@ -0,0 +1,4292 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var GlyphsUnicode = {
+  A: 0x0041,
+  AE: 0x00C6,
+  AEacute: 0x01FC,
+  AEmacron: 0x01E2,
+  AEsmall: 0xF7E6,
+  Aacute: 0x00C1,
+  Aacutesmall: 0xF7E1,
+  Abreve: 0x0102,
+  Abreveacute: 0x1EAE,
+  Abrevecyrillic: 0x04D0,
+  Abrevedotbelow: 0x1EB6,
+  Abrevegrave: 0x1EB0,
+  Abrevehookabove: 0x1EB2,
+  Abrevetilde: 0x1EB4,
+  Acaron: 0x01CD,
+  Acircle: 0x24B6,
+  Acircumflex: 0x00C2,
+  Acircumflexacute: 0x1EA4,
+  Acircumflexdotbelow: 0x1EAC,
+  Acircumflexgrave: 0x1EA6,
+  Acircumflexhookabove: 0x1EA8,
+  Acircumflexsmall: 0xF7E2,
+  Acircumflextilde: 0x1EAA,
+  Acute: 0xF6C9,
+  Acutesmall: 0xF7B4,
+  Acyrillic: 0x0410,
+  Adblgrave: 0x0200,
+  Adieresis: 0x00C4,
+  Adieresiscyrillic: 0x04D2,
+  Adieresismacron: 0x01DE,
+  Adieresissmall: 0xF7E4,
+  Adotbelow: 0x1EA0,
+  Adotmacron: 0x01E0,
+  Agrave: 0x00C0,
+  Agravesmall: 0xF7E0,
+  Ahookabove: 0x1EA2,
+  Aiecyrillic: 0x04D4,
+  Ainvertedbreve: 0x0202,
+  Alpha: 0x0391,
+  Alphatonos: 0x0386,
+  Amacron: 0x0100,
+  Amonospace: 0xFF21,
+  Aogonek: 0x0104,
+  Aring: 0x00C5,
+  Aringacute: 0x01FA,
+  Aringbelow: 0x1E00,
+  Aringsmall: 0xF7E5,
+  Asmall: 0xF761,
+  Atilde: 0x00C3,
+  Atildesmall: 0xF7E3,
+  Aybarmenian: 0x0531,
+  B: 0x0042,
+  Bcircle: 0x24B7,
+  Bdotaccent: 0x1E02,
+  Bdotbelow: 0x1E04,
+  Becyrillic: 0x0411,
+  Benarmenian: 0x0532,
+  Beta: 0x0392,
+  Bhook: 0x0181,
+  Blinebelow: 0x1E06,
+  Bmonospace: 0xFF22,
+  Brevesmall: 0xF6F4,
+  Bsmall: 0xF762,
+  Btopbar: 0x0182,
+  C: 0x0043,
+  Caarmenian: 0x053E,
+  Cacute: 0x0106,
+  Caron: 0xF6CA,
+  Caronsmall: 0xF6F5,
+  Ccaron: 0x010C,
+  Ccedilla: 0x00C7,
+  Ccedillaacute: 0x1E08,
+  Ccedillasmall: 0xF7E7,
+  Ccircle: 0x24B8,
+  Ccircumflex: 0x0108,
+  Cdot: 0x010A,
+  Cdotaccent: 0x010A,
+  Cedillasmall: 0xF7B8,
+  Chaarmenian: 0x0549,
+  Cheabkhasiancyrillic: 0x04BC,
+  Checyrillic: 0x0427,
+  Chedescenderabkhasiancyrillic: 0x04BE,
+  Chedescendercyrillic: 0x04B6,
+  Chedieresiscyrillic: 0x04F4,
+  Cheharmenian: 0x0543,
+  Chekhakassiancyrillic: 0x04CB,
+  Cheverticalstrokecyrillic: 0x04B8,
+  Chi: 0x03A7,
+  Chook: 0x0187,
+  Circumflexsmall: 0xF6F6,
+  Cmonospace: 0xFF23,
+  Coarmenian: 0x0551,
+  Csmall: 0xF763,
+  D: 0x0044,
+  DZ: 0x01F1,
+  DZcaron: 0x01C4,
+  Daarmenian: 0x0534,
+  Dafrican: 0x0189,
+  Dcaron: 0x010E,
+  Dcedilla: 0x1E10,
+  Dcircle: 0x24B9,
+  Dcircumflexbelow: 0x1E12,
+  Dcroat: 0x0110,
+  Ddotaccent: 0x1E0A,
+  Ddotbelow: 0x1E0C,
+  Decyrillic: 0x0414,
+  Deicoptic: 0x03EE,
+  Delta: 0x2206,
+  Deltagreek: 0x0394,
+  Dhook: 0x018A,
+  Dieresis: 0xF6CB,
+  DieresisAcute: 0xF6CC,
+  DieresisGrave: 0xF6CD,
+  Dieresissmall: 0xF7A8,
+  Digammagreek: 0x03DC,
+  Djecyrillic: 0x0402,
+  Dlinebelow: 0x1E0E,
+  Dmonospace: 0xFF24,
+  Dotaccentsmall: 0xF6F7,
+  Dslash: 0x0110,
+  Dsmall: 0xF764,
+  Dtopbar: 0x018B,
+  Dz: 0x01F2,
+  Dzcaron: 0x01C5,
+  Dzeabkhasiancyrillic: 0x04E0,
+  Dzecyrillic: 0x0405,
+  Dzhecyrillic: 0x040F,
+  E: 0x0045,
+  Eacute: 0x00C9,
+  Eacutesmall: 0xF7E9,
+  Ebreve: 0x0114,
+  Ecaron: 0x011A,
+  Ecedillabreve: 0x1E1C,
+  Echarmenian: 0x0535,
+  Ecircle: 0x24BA,
+  Ecircumflex: 0x00CA,
+  Ecircumflexacute: 0x1EBE,
+  Ecircumflexbelow: 0x1E18,
+  Ecircumflexdotbelow: 0x1EC6,
+  Ecircumflexgrave: 0x1EC0,
+  Ecircumflexhookabove: 0x1EC2,
+  Ecircumflexsmall: 0xF7EA,
+  Ecircumflextilde: 0x1EC4,
+  Ecyrillic: 0x0404,
+  Edblgrave: 0x0204,
+  Edieresis: 0x00CB,
+  Edieresissmall: 0xF7EB,
+  Edot: 0x0116,
+  Edotaccent: 0x0116,
+  Edotbelow: 0x1EB8,
+  Efcyrillic: 0x0424,
+  Egrave: 0x00C8,
+  Egravesmall: 0xF7E8,
+  Eharmenian: 0x0537,
+  Ehookabove: 0x1EBA,
+  Eightroman: 0x2167,
+  Einvertedbreve: 0x0206,
+  Eiotifiedcyrillic: 0x0464,
+  Elcyrillic: 0x041B,
+  Elevenroman: 0x216A,
+  Emacron: 0x0112,
+  Emacronacute: 0x1E16,
+  Emacrongrave: 0x1E14,
+  Emcyrillic: 0x041C,
+  Emonospace: 0xFF25,
+  Encyrillic: 0x041D,
+  Endescendercyrillic: 0x04A2,
+  Eng: 0x014A,
+  Enghecyrillic: 0x04A4,
+  Enhookcyrillic: 0x04C7,
+  Eogonek: 0x0118,
+  Eopen: 0x0190,
+  Epsilon: 0x0395,
+  Epsilontonos: 0x0388,
+  Ercyrillic: 0x0420,
+  Ereversed: 0x018E,
+  Ereversedcyrillic: 0x042D,
+  Escyrillic: 0x0421,
+  Esdescendercyrillic: 0x04AA,
+  Esh: 0x01A9,
+  Esmall: 0xF765,
+  Eta: 0x0397,
+  Etarmenian: 0x0538,
+  Etatonos: 0x0389,
+  Eth: 0x00D0,
+  Ethsmall: 0xF7F0,
+  Etilde: 0x1EBC,
+  Etildebelow: 0x1E1A,
+  Euro: 0x20AC,
+  Ezh: 0x01B7,
+  Ezhcaron: 0x01EE,
+  Ezhreversed: 0x01B8,
+  F: 0x0046,
+  Fcircle: 0x24BB,
+  Fdotaccent: 0x1E1E,
+  Feharmenian: 0x0556,
+  Feicoptic: 0x03E4,
+  Fhook: 0x0191,
+  Fitacyrillic: 0x0472,
+  Fiveroman: 0x2164,
+  Fmonospace: 0xFF26,
+  Fourroman: 0x2163,
+  Fsmall: 0xF766,
+  G: 0x0047,
+  GBsquare: 0x3387,
+  Gacute: 0x01F4,
+  Gamma: 0x0393,
+  Gammaafrican: 0x0194,
+  Gangiacoptic: 0x03EA,
+  Gbreve: 0x011E,
+  Gcaron: 0x01E6,
+  Gcedilla: 0x0122,
+  Gcircle: 0x24BC,
+  Gcircumflex: 0x011C,
+  Gcommaaccent: 0x0122,
+  Gdot: 0x0120,
+  Gdotaccent: 0x0120,
+  Gecyrillic: 0x0413,
+  Ghadarmenian: 0x0542,
+  Ghemiddlehookcyrillic: 0x0494,
+  Ghestrokecyrillic: 0x0492,
+  Gheupturncyrillic: 0x0490,
+  Ghook: 0x0193,
+  Gimarmenian: 0x0533,
+  Gjecyrillic: 0x0403,
+  Gmacron: 0x1E20,
+  Gmonospace: 0xFF27,
+  Grave: 0xF6CE,
+  Gravesmall: 0xF760,
+  Gsmall: 0xF767,
+  Gsmallhook: 0x029B,
+  Gstroke: 0x01E4,
+  H: 0x0048,
+  H18533: 0x25CF,
+  H18543: 0x25AA,
+  H18551: 0x25AB,
+  H22073: 0x25A1,
+  HPsquare: 0x33CB,
+  Haabkhasiancyrillic: 0x04A8,
+  Hadescendercyrillic: 0x04B2,
+  Hardsigncyrillic: 0x042A,
+  Hbar: 0x0126,
+  Hbrevebelow: 0x1E2A,
+  Hcedilla: 0x1E28,
+  Hcircle: 0x24BD,
+  Hcircumflex: 0x0124,
+  Hdieresis: 0x1E26,
+  Hdotaccent: 0x1E22,
+  Hdotbelow: 0x1E24,
+  Hmonospace: 0xFF28,
+  Hoarmenian: 0x0540,
+  Horicoptic: 0x03E8,
+  Hsmall: 0xF768,
+  Hungarumlaut: 0xF6CF,
+  Hungarumlautsmall: 0xF6F8,
+  Hzsquare: 0x3390,
+  I: 0x0049,
+  IAcyrillic: 0x042F,
+  IJ: 0x0132,
+  IUcyrillic: 0x042E,
+  Iacute: 0x00CD,
+  Iacutesmall: 0xF7ED,
+  Ibreve: 0x012C,
+  Icaron: 0x01CF,
+  Icircle: 0x24BE,
+  Icircumflex: 0x00CE,
+  Icircumflexsmall: 0xF7EE,
+  Icyrillic: 0x0406,
+  Idblgrave: 0x0208,
+  Idieresis: 0x00CF,
+  Idieresisacute: 0x1E2E,
+  Idieresiscyrillic: 0x04E4,
+  Idieresissmall: 0xF7EF,
+  Idot: 0x0130,
+  Idotaccent: 0x0130,
+  Idotbelow: 0x1ECA,
+  Iebrevecyrillic: 0x04D6,
+  Iecyrillic: 0x0415,
+  Ifraktur: 0x2111,
+  Igrave: 0x00CC,
+  Igravesmall: 0xF7EC,
+  Ihookabove: 0x1EC8,
+  Iicyrillic: 0x0418,
+  Iinvertedbreve: 0x020A,
+  Iishortcyrillic: 0x0419,
+  Imacron: 0x012A,
+  Imacroncyrillic: 0x04E2,
+  Imonospace: 0xFF29,
+  Iniarmenian: 0x053B,
+  Iocyrillic: 0x0401,
+  Iogonek: 0x012E,
+  Iota: 0x0399,
+  Iotaafrican: 0x0196,
+  Iotadieresis: 0x03AA,
+  Iotatonos: 0x038A,
+  Ismall: 0xF769,
+  Istroke: 0x0197,
+  Itilde: 0x0128,
+  Itildebelow: 0x1E2C,
+  Izhitsacyrillic: 0x0474,
+  Izhitsadblgravecyrillic: 0x0476,
+  J: 0x004A,
+  Jaarmenian: 0x0541,
+  Jcircle: 0x24BF,
+  Jcircumflex: 0x0134,
+  Jecyrillic: 0x0408,
+  Jheharmenian: 0x054B,
+  Jmonospace: 0xFF2A,
+  Jsmall: 0xF76A,
+  K: 0x004B,
+  KBsquare: 0x3385,
+  KKsquare: 0x33CD,
+  Kabashkircyrillic: 0x04A0,
+  Kacute: 0x1E30,
+  Kacyrillic: 0x041A,
+  Kadescendercyrillic: 0x049A,
+  Kahookcyrillic: 0x04C3,
+  Kappa: 0x039A,
+  Kastrokecyrillic: 0x049E,
+  Kaverticalstrokecyrillic: 0x049C,
+  Kcaron: 0x01E8,
+  Kcedilla: 0x0136,
+  Kcircle: 0x24C0,
+  Kcommaaccent: 0x0136,
+  Kdotbelow: 0x1E32,
+  Keharmenian: 0x0554,
+  Kenarmenian: 0x053F,
+  Khacyrillic: 0x0425,
+  Kheicoptic: 0x03E6,
+  Khook: 0x0198,
+  Kjecyrillic: 0x040C,
+  Klinebelow: 0x1E34,
+  Kmonospace: 0xFF2B,
+  Koppacyrillic: 0x0480,
+  Koppagreek: 0x03DE,
+  Ksicyrillic: 0x046E,
+  Ksmall: 0xF76B,
+  L: 0x004C,
+  LJ: 0x01C7,
+  LL: 0xF6BF,
+  Lacute: 0x0139,
+  Lambda: 0x039B,
+  Lcaron: 0x013D,
+  Lcedilla: 0x013B,
+  Lcircle: 0x24C1,
+  Lcircumflexbelow: 0x1E3C,
+  Lcommaaccent: 0x013B,
+  Ldot: 0x013F,
+  Ldotaccent: 0x013F,
+  Ldotbelow: 0x1E36,
+  Ldotbelowmacron: 0x1E38,
+  Liwnarmenian: 0x053C,
+  Lj: 0x01C8,
+  Ljecyrillic: 0x0409,
+  Llinebelow: 0x1E3A,
+  Lmonospace: 0xFF2C,
+  Lslash: 0x0141,
+  Lslashsmall: 0xF6F9,
+  Lsmall: 0xF76C,
+  M: 0x004D,
+  MBsquare: 0x3386,
+  Macron: 0xF6D0,
+  Macronsmall: 0xF7AF,
+  Macute: 0x1E3E,
+  Mcircle: 0x24C2,
+  Mdotaccent: 0x1E40,
+  Mdotbelow: 0x1E42,
+  Menarmenian: 0x0544,
+  Mmonospace: 0xFF2D,
+  Msmall: 0xF76D,
+  Mturned: 0x019C,
+  Mu: 0x039C,
+  N: 0x004E,
+  NJ: 0x01CA,
+  Nacute: 0x0143,
+  Ncaron: 0x0147,
+  Ncedilla: 0x0145,
+  Ncircle: 0x24C3,
+  Ncircumflexbelow: 0x1E4A,
+  Ncommaaccent: 0x0145,
+  Ndotaccent: 0x1E44,
+  Ndotbelow: 0x1E46,
+  Nhookleft: 0x019D,
+  Nineroman: 0x2168,
+  Nj: 0x01CB,
+  Njecyrillic: 0x040A,
+  Nlinebelow: 0x1E48,
+  Nmonospace: 0xFF2E,
+  Nowarmenian: 0x0546,
+  Nsmall: 0xF76E,
+  Ntilde: 0x00D1,
+  Ntildesmall: 0xF7F1,
+  Nu: 0x039D,
+  O: 0x004F,
+  OE: 0x0152,
+  OEsmall: 0xF6FA,
+  Oacute: 0x00D3,
+  Oacutesmall: 0xF7F3,
+  Obarredcyrillic: 0x04E8,
+  Obarreddieresiscyrillic: 0x04EA,
+  Obreve: 0x014E,
+  Ocaron: 0x01D1,
+  Ocenteredtilde: 0x019F,
+  Ocircle: 0x24C4,
+  Ocircumflex: 0x00D4,
+  Ocircumflexacute: 0x1ED0,
+  Ocircumflexdotbelow: 0x1ED8,
+  Ocircumflexgrave: 0x1ED2,
+  Ocircumflexhookabove: 0x1ED4,
+  Ocircumflexsmall: 0xF7F4,
+  Ocircumflextilde: 0x1ED6,
+  Ocyrillic: 0x041E,
+  Odblacute: 0x0150,
+  Odblgrave: 0x020C,
+  Odieresis: 0x00D6,
+  Odieresiscyrillic: 0x04E6,
+  Odieresissmall: 0xF7F6,
+  Odotbelow: 0x1ECC,
+  Ogoneksmall: 0xF6FB,
+  Ograve: 0x00D2,
+  Ogravesmall: 0xF7F2,
+  Oharmenian: 0x0555,
+  Ohm: 0x2126,
+  Ohookabove: 0x1ECE,
+  Ohorn: 0x01A0,
+  Ohornacute: 0x1EDA,
+  Ohorndotbelow: 0x1EE2,
+  Ohorngrave: 0x1EDC,
+  Ohornhookabove: 0x1EDE,
+  Ohorntilde: 0x1EE0,
+  Ohungarumlaut: 0x0150,
+  Oi: 0x01A2,
+  Oinvertedbreve: 0x020E,
+  Omacron: 0x014C,
+  Omacronacute: 0x1E52,
+  Omacrongrave: 0x1E50,
+  Omega: 0x2126,
+  Omegacyrillic: 0x0460,
+  Omegagreek: 0x03A9,
+  Omegaroundcyrillic: 0x047A,
+  Omegatitlocyrillic: 0x047C,
+  Omegatonos: 0x038F,
+  Omicron: 0x039F,
+  Omicrontonos: 0x038C,
+  Omonospace: 0xFF2F,
+  Oneroman: 0x2160,
+  Oogonek: 0x01EA,
+  Oogonekmacron: 0x01EC,
+  Oopen: 0x0186,
+  Oslash: 0x00D8,
+  Oslashacute: 0x01FE,
+  Oslashsmall: 0xF7F8,
+  Osmall: 0xF76F,
+  Ostrokeacute: 0x01FE,
+  Otcyrillic: 0x047E,
+  Otilde: 0x00D5,
+  Otildeacute: 0x1E4C,
+  Otildedieresis: 0x1E4E,
+  Otildesmall: 0xF7F5,
+  P: 0x0050,
+  Pacute: 0x1E54,
+  Pcircle: 0x24C5,
+  Pdotaccent: 0x1E56,
+  Pecyrillic: 0x041F,
+  Peharmenian: 0x054A,
+  Pemiddlehookcyrillic: 0x04A6,
+  Phi: 0x03A6,
+  Phook: 0x01A4,
+  Pi: 0x03A0,
+  Piwrarmenian: 0x0553,
+  Pmonospace: 0xFF30,
+  Psi: 0x03A8,
+  Psicyrillic: 0x0470,
+  Psmall: 0xF770,
+  Q: 0x0051,
+  Qcircle: 0x24C6,
+  Qmonospace: 0xFF31,
+  Qsmall: 0xF771,
+  R: 0x0052,
+  Raarmenian: 0x054C,
+  Racute: 0x0154,
+  Rcaron: 0x0158,
+  Rcedilla: 0x0156,
+  Rcircle: 0x24C7,
+  Rcommaaccent: 0x0156,
+  Rdblgrave: 0x0210,
+  Rdotaccent: 0x1E58,
+  Rdotbelow: 0x1E5A,
+  Rdotbelowmacron: 0x1E5C,
+  Reharmenian: 0x0550,
+  Rfraktur: 0x211C,
+  Rho: 0x03A1,
+  Ringsmall: 0xF6FC,
+  Rinvertedbreve: 0x0212,
+  Rlinebelow: 0x1E5E,
+  Rmonospace: 0xFF32,
+  Rsmall: 0xF772,
+  Rsmallinverted: 0x0281,
+  Rsmallinvertedsuperior: 0x02B6,
+  S: 0x0053,
+  SF010000: 0x250C,
+  SF020000: 0x2514,
+  SF030000: 0x2510,
+  SF040000: 0x2518,
+  SF050000: 0x253C,
+  SF060000: 0x252C,
+  SF070000: 0x2534,
+  SF080000: 0x251C,
+  SF090000: 0x2524,
+  SF100000: 0x2500,
+  SF110000: 0x2502,
+  SF190000: 0x2561,
+  SF200000: 0x2562,
+  SF210000: 0x2556,
+  SF220000: 0x2555,
+  SF230000: 0x2563,
+  SF240000: 0x2551,
+  SF250000: 0x2557,
+  SF260000: 0x255D,
+  SF270000: 0x255C,
+  SF280000: 0x255B,
+  SF360000: 0x255E,
+  SF370000: 0x255F,
+  SF380000: 0x255A,
+  SF390000: 0x2554,
+  SF400000: 0x2569,
+  SF410000: 0x2566,
+  SF420000: 0x2560,
+  SF430000: 0x2550,
+  SF440000: 0x256C,
+  SF450000: 0x2567,
+  SF460000: 0x2568,
+  SF470000: 0x2564,
+  SF480000: 0x2565,
+  SF490000: 0x2559,
+  SF500000: 0x2558,
+  SF510000: 0x2552,
+  SF520000: 0x2553,
+  SF530000: 0x256B,
+  SF540000: 0x256A,
+  Sacute: 0x015A,
+  Sacutedotaccent: 0x1E64,
+  Sampigreek: 0x03E0,
+  Scaron: 0x0160,
+  Scarondotaccent: 0x1E66,
+  Scaronsmall: 0xF6FD,
+  Scedilla: 0x015E,
+  Schwa: 0x018F,
+  Schwacyrillic: 0x04D8,
+  Schwadieresiscyrillic: 0x04DA,
+  Scircle: 0x24C8,
+  Scircumflex: 0x015C,
+  Scommaaccent: 0x0218,
+  Sdotaccent: 0x1E60,
+  Sdotbelow: 0x1E62,
+  Sdotbelowdotaccent: 0x1E68,
+  Seharmenian: 0x054D,
+  Sevenroman: 0x2166,
+  Shaarmenian: 0x0547,
+  Shacyrillic: 0x0428,
+  Shchacyrillic: 0x0429,
+  Sheicoptic: 0x03E2,
+  Shhacyrillic: 0x04BA,
+  Shimacoptic: 0x03EC,
+  Sigma: 0x03A3,
+  Sixroman: 0x2165,
+  Smonospace: 0xFF33,
+  Softsigncyrillic: 0x042C,
+  Ssmall: 0xF773,
+  Stigmagreek: 0x03DA,
+  T: 0x0054,
+  Tau: 0x03A4,
+  Tbar: 0x0166,
+  Tcaron: 0x0164,
+  Tcedilla: 0x0162,
+  Tcircle: 0x24C9,
+  Tcircumflexbelow: 0x1E70,
+  Tcommaaccent: 0x0162,
+  Tdotaccent: 0x1E6A,
+  Tdotbelow: 0x1E6C,
+  Tecyrillic: 0x0422,
+  Tedescendercyrillic: 0x04AC,
+  Tenroman: 0x2169,
+  Tetsecyrillic: 0x04B4,
+  Theta: 0x0398,
+  Thook: 0x01AC,
+  Thorn: 0x00DE,
+  Thornsmall: 0xF7FE,
+  Threeroman: 0x2162,
+  Tildesmall: 0xF6FE,
+  Tiwnarmenian: 0x054F,
+  Tlinebelow: 0x1E6E,
+  Tmonospace: 0xFF34,
+  Toarmenian: 0x0539,
+  Tonefive: 0x01BC,
+  Tonesix: 0x0184,
+  Tonetwo: 0x01A7,
+  Tretroflexhook: 0x01AE,
+  Tsecyrillic: 0x0426,
+  Tshecyrillic: 0x040B,
+  Tsmall: 0xF774,
+  Twelveroman: 0x216B,
+  Tworoman: 0x2161,
+  U: 0x0055,
+  Uacute: 0x00DA,
+  Uacutesmall: 0xF7FA,
+  Ubreve: 0x016C,
+  Ucaron: 0x01D3,
+  Ucircle: 0x24CA,
+  Ucircumflex: 0x00DB,
+  Ucircumflexbelow: 0x1E76,
+  Ucircumflexsmall: 0xF7FB,
+  Ucyrillic: 0x0423,
+  Udblacute: 0x0170,
+  Udblgrave: 0x0214,
+  Udieresis: 0x00DC,
+  Udieresisacute: 0x01D7,
+  Udieresisbelow: 0x1E72,
+  Udieresiscaron: 0x01D9,
+  Udieresiscyrillic: 0x04F0,
+  Udieresisgrave: 0x01DB,
+  Udieresismacron: 0x01D5,
+  Udieresissmall: 0xF7FC,
+  Udotbelow: 0x1EE4,
+  Ugrave: 0x00D9,
+  Ugravesmall: 0xF7F9,
+  Uhookabove: 0x1EE6,
+  Uhorn: 0x01AF,
+  Uhornacute: 0x1EE8,
+  Uhorndotbelow: 0x1EF0,
+  Uhorngrave: 0x1EEA,
+  Uhornhookabove: 0x1EEC,
+  Uhorntilde: 0x1EEE,
+  Uhungarumlaut: 0x0170,
+  Uhungarumlautcyrillic: 0x04F2,
+  Uinvertedbreve: 0x0216,
+  Ukcyrillic: 0x0478,
+  Umacron: 0x016A,
+  Umacroncyrillic: 0x04EE,
+  Umacrondieresis: 0x1E7A,
+  Umonospace: 0xFF35,
+  Uogonek: 0x0172,
+  Upsilon: 0x03A5,
+  Upsilon1: 0x03D2,
+  Upsilonacutehooksymbolgreek: 0x03D3,
+  Upsilonafrican: 0x01B1,
+  Upsilondieresis: 0x03AB,
+  Upsilondieresishooksymbolgreek: 0x03D4,
+  Upsilonhooksymbol: 0x03D2,
+  Upsilontonos: 0x038E,
+  Uring: 0x016E,
+  Ushortcyrillic: 0x040E,
+  Usmall: 0xF775,
+  Ustraightcyrillic: 0x04AE,
+  Ustraightstrokecyrillic: 0x04B0,
+  Utilde: 0x0168,
+  Utildeacute: 0x1E78,
+  Utildebelow: 0x1E74,
+  V: 0x0056,
+  Vcircle: 0x24CB,
+  Vdotbelow: 0x1E7E,
+  Vecyrillic: 0x0412,
+  Vewarmenian: 0x054E,
+  Vhook: 0x01B2,
+  Vmonospace: 0xFF36,
+  Voarmenian: 0x0548,
+  Vsmall: 0xF776,
+  Vtilde: 0x1E7C,
+  W: 0x0057,
+  Wacute: 0x1E82,
+  Wcircle: 0x24CC,
+  Wcircumflex: 0x0174,
+  Wdieresis: 0x1E84,
+  Wdotaccent: 0x1E86,
+  Wdotbelow: 0x1E88,
+  Wgrave: 0x1E80,
+  Wmonospace: 0xFF37,
+  Wsmall: 0xF777,
+  X: 0x0058,
+  Xcircle: 0x24CD,
+  Xdieresis: 0x1E8C,
+  Xdotaccent: 0x1E8A,
+  Xeharmenian: 0x053D,
+  Xi: 0x039E,
+  Xmonospace: 0xFF38,
+  Xsmall: 0xF778,
+  Y: 0x0059,
+  Yacute: 0x00DD,
+  Yacutesmall: 0xF7FD,
+  Yatcyrillic: 0x0462,
+  Ycircle: 0x24CE,
+  Ycircumflex: 0x0176,
+  Ydieresis: 0x0178,
+  Ydieresissmall: 0xF7FF,
+  Ydotaccent: 0x1E8E,
+  Ydotbelow: 0x1EF4,
+  Yericyrillic: 0x042B,
+  Yerudieresiscyrillic: 0x04F8,
+  Ygrave: 0x1EF2,
+  Yhook: 0x01B3,
+  Yhookabove: 0x1EF6,
+  Yiarmenian: 0x0545,
+  Yicyrillic: 0x0407,
+  Yiwnarmenian: 0x0552,
+  Ymonospace: 0xFF39,
+  Ysmall: 0xF779,
+  Ytilde: 0x1EF8,
+  Yusbigcyrillic: 0x046A,
+  Yusbigiotifiedcyrillic: 0x046C,
+  Yuslittlecyrillic: 0x0466,
+  Yuslittleiotifiedcyrillic: 0x0468,
+  Z: 0x005A,
+  Zaarmenian: 0x0536,
+  Zacute: 0x0179,
+  Zcaron: 0x017D,
+  Zcaronsmall: 0xF6FF,
+  Zcircle: 0x24CF,
+  Zcircumflex: 0x1E90,
+  Zdot: 0x017B,
+  Zdotaccent: 0x017B,
+  Zdotbelow: 0x1E92,
+  Zecyrillic: 0x0417,
+  Zedescendercyrillic: 0x0498,
+  Zedieresiscyrillic: 0x04DE,
+  Zeta: 0x0396,
+  Zhearmenian: 0x053A,
+  Zhebrevecyrillic: 0x04C1,
+  Zhecyrillic: 0x0416,
+  Zhedescendercyrillic: 0x0496,
+  Zhedieresiscyrillic: 0x04DC,
+  Zlinebelow: 0x1E94,
+  Zmonospace: 0xFF3A,
+  Zsmall: 0xF77A,
+  Zstroke: 0x01B5,
+  a: 0x0061,
+  aabengali: 0x0986,
+  aacute: 0x00E1,
+  aadeva: 0x0906,
+  aagujarati: 0x0A86,
+  aagurmukhi: 0x0A06,
+  aamatragurmukhi: 0x0A3E,
+  aarusquare: 0x3303,
+  aavowelsignbengali: 0x09BE,
+  aavowelsigndeva: 0x093E,
+  aavowelsigngujarati: 0x0ABE,
+  abbreviationmarkarmenian: 0x055F,
+  abbreviationsigndeva: 0x0970,
+  abengali: 0x0985,
+  abopomofo: 0x311A,
+  abreve: 0x0103,
+  abreveacute: 0x1EAF,
+  abrevecyrillic: 0x04D1,
+  abrevedotbelow: 0x1EB7,
+  abrevegrave: 0x1EB1,
+  abrevehookabove: 0x1EB3,
+  abrevetilde: 0x1EB5,
+  acaron: 0x01CE,
+  acircle: 0x24D0,
+  acircumflex: 0x00E2,
+  acircumflexacute: 0x1EA5,
+  acircumflexdotbelow: 0x1EAD,
+  acircumflexgrave: 0x1EA7,
+  acircumflexhookabove: 0x1EA9,
+  acircumflextilde: 0x1EAB,
+  acute: 0x00B4,
+  acutebelowcmb: 0x0317,
+  acutecmb: 0x0301,
+  acutecomb: 0x0301,
+  acutedeva: 0x0954,
+  acutelowmod: 0x02CF,
+  acutetonecmb: 0x0341,
+  acyrillic: 0x0430,
+  adblgrave: 0x0201,
+  addakgurmukhi: 0x0A71,
+  adeva: 0x0905,
+  adieresis: 0x00E4,
+  adieresiscyrillic: 0x04D3,
+  adieresismacron: 0x01DF,
+  adotbelow: 0x1EA1,
+  adotmacron: 0x01E1,
+  ae: 0x00E6,
+  aeacute: 0x01FD,
+  aekorean: 0x3150,
+  aemacron: 0x01E3,
+  afii00208: 0x2015,
+  afii08941: 0x20A4,
+  afii10017: 0x0410,
+  afii10018: 0x0411,
+  afii10019: 0x0412,
+  afii10020: 0x0413,
+  afii10021: 0x0414,
+  afii10022: 0x0415,
+  afii10023: 0x0401,
+  afii10024: 0x0416,
+  afii10025: 0x0417,
+  afii10026: 0x0418,
+  afii10027: 0x0419,
+  afii10028: 0x041A,
+  afii10029: 0x041B,
+  afii10030: 0x041C,
+  afii10031: 0x041D,
+  afii10032: 0x041E,
+  afii10033: 0x041F,
+  afii10034: 0x0420,
+  afii10035: 0x0421,
+  afii10036: 0x0422,
+  afii10037: 0x0423,
+  afii10038: 0x0424,
+  afii10039: 0x0425,
+  afii10040: 0x0426,
+  afii10041: 0x0427,
+  afii10042: 0x0428,
+  afii10043: 0x0429,
+  afii10044: 0x042A,
+  afii10045: 0x042B,
+  afii10046: 0x042C,
+  afii10047: 0x042D,
+  afii10048: 0x042E,
+  afii10049: 0x042F,
+  afii10050: 0x0490,
+  afii10051: 0x0402,
+  afii10052: 0x0403,
+  afii10053: 0x0404,
+  afii10054: 0x0405,
+  afii10055: 0x0406,
+  afii10056: 0x0407,
+  afii10057: 0x0408,
+  afii10058: 0x0409,
+  afii10059: 0x040A,
+  afii10060: 0x040B,
+  afii10061: 0x040C,
+  afii10062: 0x040E,
+  afii10063: 0xF6C4,
+  afii10064: 0xF6C5,
+  afii10065: 0x0430,
+  afii10066: 0x0431,
+  afii10067: 0x0432,
+  afii10068: 0x0433,
+  afii10069: 0x0434,
+  afii10070: 0x0435,
+  afii10071: 0x0451,
+  afii10072: 0x0436,
+  afii10073: 0x0437,
+  afii10074: 0x0438,
+  afii10075: 0x0439,
+  afii10076: 0x043A,
+  afii10077: 0x043B,
+  afii10078: 0x043C,
+  afii10079: 0x043D,
+  afii10080: 0x043E,
+  afii10081: 0x043F,
+  afii10082: 0x0440,
+  afii10083: 0x0441,
+  afii10084: 0x0442,
+  afii10085: 0x0443,
+  afii10086: 0x0444,
+  afii10087: 0x0445,
+  afii10088: 0x0446,
+  afii10089: 0x0447,
+  afii10090: 0x0448,
+  afii10091: 0x0449,
+  afii10092: 0x044A,
+  afii10093: 0x044B,
+  afii10094: 0x044C,
+  afii10095: 0x044D,
+  afii10096: 0x044E,
+  afii10097: 0x044F,
+  afii10098: 0x0491,
+  afii10099: 0x0452,
+  afii10100: 0x0453,
+  afii10101: 0x0454,
+  afii10102: 0x0455,
+  afii10103: 0x0456,
+  afii10104: 0x0457,
+  afii10105: 0x0458,
+  afii10106: 0x0459,
+  afii10107: 0x045A,
+  afii10108: 0x045B,
+  afii10109: 0x045C,
+  afii10110: 0x045E,
+  afii10145: 0x040F,
+  afii10146: 0x0462,
+  afii10147: 0x0472,
+  afii10148: 0x0474,
+  afii10192: 0xF6C6,
+  afii10193: 0x045F,
+  afii10194: 0x0463,
+  afii10195: 0x0473,
+  afii10196: 0x0475,
+  afii10831: 0xF6C7,
+  afii10832: 0xF6C8,
+  afii10846: 0x04D9,
+  afii299: 0x200E,
+  afii300: 0x200F,
+  afii301: 0x200D,
+  afii57381: 0x066A,
+  afii57388: 0x060C,
+  afii57392: 0x0660,
+  afii57393: 0x0661,
+  afii57394: 0x0662,
+  afii57395: 0x0663,
+  afii57396: 0x0664,
+  afii57397: 0x0665,
+  afii57398: 0x0666,
+  afii57399: 0x0667,
+  afii57400: 0x0668,
+  afii57401: 0x0669,
+  afii57403: 0x061B,
+  afii57407: 0x061F,
+  afii57409: 0x0621,
+  afii57410: 0x0622,
+  afii57411: 0x0623,
+  afii57412: 0x0624,
+  afii57413: 0x0625,
+  afii57414: 0x0626,
+  afii57415: 0x0627,
+  afii57416: 0x0628,
+  afii57417: 0x0629,
+  afii57418: 0x062A,
+  afii57419: 0x062B,
+  afii57420: 0x062C,
+  afii57421: 0x062D,
+  afii57422: 0x062E,
+  afii57423: 0x062F,
+  afii57424: 0x0630,
+  afii57425: 0x0631,
+  afii57426: 0x0632,
+  afii57427: 0x0633,
+  afii57428: 0x0634,
+  afii57429: 0x0635,
+  afii57430: 0x0636,
+  afii57431: 0x0637,
+  afii57432: 0x0638,
+  afii57433: 0x0639,
+  afii57434: 0x063A,
+  afii57440: 0x0640,
+  afii57441: 0x0641,
+  afii57442: 0x0642,
+  afii57443: 0x0643,
+  afii57444: 0x0644,
+  afii57445: 0x0645,
+  afii57446: 0x0646,
+  afii57448: 0x0648,
+  afii57449: 0x0649,
+  afii57450: 0x064A,
+  afii57451: 0x064B,
+  afii57452: 0x064C,
+  afii57453: 0x064D,
+  afii57454: 0x064E,
+  afii57455: 0x064F,
+  afii57456: 0x0650,
+  afii57457: 0x0651,
+  afii57458: 0x0652,
+  afii57470: 0x0647,
+  afii57505: 0x06A4,
+  afii57506: 0x067E,
+  afii57507: 0x0686,
+  afii57508: 0x0698,
+  afii57509: 0x06AF,
+  afii57511: 0x0679,
+  afii57512: 0x0688,
+  afii57513: 0x0691,
+  afii57514: 0x06BA,
+  afii57519: 0x06D2,
+  afii57534: 0x06D5,
+  afii57636: 0x20AA,
+  afii57645: 0x05BE,
+  afii57658: 0x05C3,
+  afii57664: 0x05D0,
+  afii57665: 0x05D1,
+  afii57666: 0x05D2,
+  afii57667: 0x05D3,
+  afii57668: 0x05D4,
+  afii57669: 0x05D5,
+  afii57670: 0x05D6,
+  afii57671: 0x05D7,
+  afii57672: 0x05D8,
+  afii57673: 0x05D9,
+  afii57674: 0x05DA,
+  afii57675: 0x05DB,
+  afii57676: 0x05DC,
+  afii57677: 0x05DD,
+  afii57678: 0x05DE,
+  afii57679: 0x05DF,
+  afii57680: 0x05E0,
+  afii57681: 0x05E1,
+  afii57682: 0x05E2,
+  afii57683: 0x05E3,
+  afii57684: 0x05E4,
+  afii57685: 0x05E5,
+  afii57686: 0x05E6,
+  afii57687: 0x05E7,
+  afii57688: 0x05E8,
+  afii57689: 0x05E9,
+  afii57690: 0x05EA,
+  afii57694: 0xFB2A,
+  afii57695: 0xFB2B,
+  afii57700: 0xFB4B,
+  afii57705: 0xFB1F,
+  afii57716: 0x05F0,
+  afii57717: 0x05F1,
+  afii57718: 0x05F2,
+  afii57723: 0xFB35,
+  afii57793: 0x05B4,
+  afii57794: 0x05B5,
+  afii57795: 0x05B6,
+  afii57796: 0x05BB,
+  afii57797: 0x05B8,
+  afii57798: 0x05B7,
+  afii57799: 0x05B0,
+  afii57800: 0x05B2,
+  afii57801: 0x05B1,
+  afii57802: 0x05B3,
+  afii57803: 0x05C2,
+  afii57804: 0x05C1,
+  afii57806: 0x05B9,
+  afii57807: 0x05BC,
+  afii57839: 0x05BD,
+  afii57841: 0x05BF,
+  afii57842: 0x05C0,
+  afii57929: 0x02BC,
+  afii61248: 0x2105,
+  afii61289: 0x2113,
+  afii61352: 0x2116,
+  afii61573: 0x202C,
+  afii61574: 0x202D,
+  afii61575: 0x202E,
+  afii61664: 0x200C,
+  afii63167: 0x066D,
+  afii64937: 0x02BD,
+  agrave: 0x00E0,
+  agujarati: 0x0A85,
+  agurmukhi: 0x0A05,
+  ahiragana: 0x3042,
+  ahookabove: 0x1EA3,
+  aibengali: 0x0990,
+  aibopomofo: 0x311E,
+  aideva: 0x0910,
+  aiecyrillic: 0x04D5,
+  aigujarati: 0x0A90,
+  aigurmukhi: 0x0A10,
+  aimatragurmukhi: 0x0A48,
+  ainarabic: 0x0639,
+  ainfinalarabic: 0xFECA,
+  aininitialarabic: 0xFECB,
+  ainmedialarabic: 0xFECC,
+  ainvertedbreve: 0x0203,
+  aivowelsignbengali: 0x09C8,
+  aivowelsigndeva: 0x0948,
+  aivowelsigngujarati: 0x0AC8,
+  akatakana: 0x30A2,
+  akatakanahalfwidth: 0xFF71,
+  akorean: 0x314F,
+  alef: 0x05D0,
+  alefarabic: 0x0627,
+  alefdageshhebrew: 0xFB30,
+  aleffinalarabic: 0xFE8E,
+  alefhamzaabovearabic: 0x0623,
+  alefhamzaabovefinalarabic: 0xFE84,
+  alefhamzabelowarabic: 0x0625,
+  alefhamzabelowfinalarabic: 0xFE88,
+  alefhebrew: 0x05D0,
+  aleflamedhebrew: 0xFB4F,
+  alefmaddaabovearabic: 0x0622,
+  alefmaddaabovefinalarabic: 0xFE82,
+  alefmaksuraarabic: 0x0649,
+  alefmaksurafinalarabic: 0xFEF0,
+  alefmaksurainitialarabic: 0xFEF3,
+  alefmaksuramedialarabic: 0xFEF4,
+  alefpatahhebrew: 0xFB2E,
+  alefqamatshebrew: 0xFB2F,
+  aleph: 0x2135,
+  allequal: 0x224C,
+  alpha: 0x03B1,
+  alphatonos: 0x03AC,
+  amacron: 0x0101,
+  amonospace: 0xFF41,
+  ampersand: 0x0026,
+  ampersandmonospace: 0xFF06,
+  ampersandsmall: 0xF726,
+  amsquare: 0x33C2,
+  anbopomofo: 0x3122,
+  angbopomofo: 0x3124,
+  angbracketleft: 0x3008, // This glyph is missing from Adobe's original list.
+  angbracketright: 0x3009, // This glyph is missing from Adobe's original list.
+  angkhankhuthai: 0x0E5A,
+  angle: 0x2220,
+  anglebracketleft: 0x3008,
+  anglebracketleftvertical: 0xFE3F,
+  anglebracketright: 0x3009,
+  anglebracketrightvertical: 0xFE40,
+  angleleft: 0x2329,
+  angleright: 0x232A,
+  angstrom: 0x212B,
+  anoteleia: 0x0387,
+  anudattadeva: 0x0952,
+  anusvarabengali: 0x0982,
+  anusvaradeva: 0x0902,
+  anusvaragujarati: 0x0A82,
+  aogonek: 0x0105,
+  apaatosquare: 0x3300,
+  aparen: 0x249C,
+  apostrophearmenian: 0x055A,
+  apostrophemod: 0x02BC,
+  apple: 0xF8FF,
+  approaches: 0x2250,
+  approxequal: 0x2248,
+  approxequalorimage: 0x2252,
+  approximatelyequal: 0x2245,
+  araeaekorean: 0x318E,
+  araeakorean: 0x318D,
+  arc: 0x2312,
+  arighthalfring: 0x1E9A,
+  aring: 0x00E5,
+  aringacute: 0x01FB,
+  aringbelow: 0x1E01,
+  arrowboth: 0x2194,
+  arrowdashdown: 0x21E3,
+  arrowdashleft: 0x21E0,
+  arrowdashright: 0x21E2,
+  arrowdashup: 0x21E1,
+  arrowdblboth: 0x21D4,
+  arrowdbldown: 0x21D3,
+  arrowdblleft: 0x21D0,
+  arrowdblright: 0x21D2,
+  arrowdblup: 0x21D1,
+  arrowdown: 0x2193,
+  arrowdownleft: 0x2199,
+  arrowdownright: 0x2198,
+  arrowdownwhite: 0x21E9,
+  arrowheaddownmod: 0x02C5,
+  arrowheadleftmod: 0x02C2,
+  arrowheadrightmod: 0x02C3,
+  arrowheadupmod: 0x02C4,
+  arrowhorizex: 0xF8E7,
+  arrowleft: 0x2190,
+  arrowleftdbl: 0x21D0,
+  arrowleftdblstroke: 0x21CD,
+  arrowleftoverright: 0x21C6,
+  arrowleftwhite: 0x21E6,
+  arrowright: 0x2192,
+  arrowrightdblstroke: 0x21CF,
+  arrowrightheavy: 0x279E,
+  arrowrightoverleft: 0x21C4,
+  arrowrightwhite: 0x21E8,
+  arrowtableft: 0x21E4,
+  arrowtabright: 0x21E5,
+  arrowup: 0x2191,
+  arrowupdn: 0x2195,
+  arrowupdnbse: 0x21A8,
+  arrowupdownbase: 0x21A8,
+  arrowupleft: 0x2196,
+  arrowupleftofdown: 0x21C5,
+  arrowupright: 0x2197,
+  arrowupwhite: 0x21E7,
+  arrowvertex: 0xF8E6,
+  asciicircum: 0x005E,
+  asciicircummonospace: 0xFF3E,
+  asciitilde: 0x007E,
+  asciitildemonospace: 0xFF5E,
+  ascript: 0x0251,
+  ascriptturned: 0x0252,
+  asmallhiragana: 0x3041,
+  asmallkatakana: 0x30A1,
+  asmallkatakanahalfwidth: 0xFF67,
+  asterisk: 0x002A,
+  asteriskaltonearabic: 0x066D,
+  asteriskarabic: 0x066D,
+  asteriskmath: 0x2217,
+  asteriskmonospace: 0xFF0A,
+  asterisksmall: 0xFE61,
+  asterism: 0x2042,
+  asuperior: 0xF6E9,
+  asymptoticallyequal: 0x2243,
+  at: 0x0040,
+  atilde: 0x00E3,
+  atmonospace: 0xFF20,
+  atsmall: 0xFE6B,
+  aturned: 0x0250,
+  aubengali: 0x0994,
+  aubopomofo: 0x3120,
+  audeva: 0x0914,
+  augujarati: 0x0A94,
+  augurmukhi: 0x0A14,
+  aulengthmarkbengali: 0x09D7,
+  aumatragurmukhi: 0x0A4C,
+  auvowelsignbengali: 0x09CC,
+  auvowelsigndeva: 0x094C,
+  auvowelsigngujarati: 0x0ACC,
+  avagrahadeva: 0x093D,
+  aybarmenian: 0x0561,
+  ayin: 0x05E2,
+  ayinaltonehebrew: 0xFB20,
+  ayinhebrew: 0x05E2,
+  b: 0x0062,
+  babengali: 0x09AC,
+  backslash: 0x005C,
+  backslashmonospace: 0xFF3C,
+  badeva: 0x092C,
+  bagujarati: 0x0AAC,
+  bagurmukhi: 0x0A2C,
+  bahiragana: 0x3070,
+  bahtthai: 0x0E3F,
+  bakatakana: 0x30D0,
+  bar: 0x007C,
+  barmonospace: 0xFF5C,
+  bbopomofo: 0x3105,
+  bcircle: 0x24D1,
+  bdotaccent: 0x1E03,
+  bdotbelow: 0x1E05,
+  beamedsixteenthnotes: 0x266C,
+  because: 0x2235,
+  becyrillic: 0x0431,
+  beharabic: 0x0628,
+  behfinalarabic: 0xFE90,
+  behinitialarabic: 0xFE91,
+  behiragana: 0x3079,
+  behmedialarabic: 0xFE92,
+  behmeeminitialarabic: 0xFC9F,
+  behmeemisolatedarabic: 0xFC08,
+  behnoonfinalarabic: 0xFC6D,
+  bekatakana: 0x30D9,
+  benarmenian: 0x0562,
+  bet: 0x05D1,
+  beta: 0x03B2,
+  betasymbolgreek: 0x03D0,
+  betdagesh: 0xFB31,
+  betdageshhebrew: 0xFB31,
+  bethebrew: 0x05D1,
+  betrafehebrew: 0xFB4C,
+  bhabengali: 0x09AD,
+  bhadeva: 0x092D,
+  bhagujarati: 0x0AAD,
+  bhagurmukhi: 0x0A2D,
+  bhook: 0x0253,
+  bihiragana: 0x3073,
+  bikatakana: 0x30D3,
+  bilabialclick: 0x0298,
+  bindigurmukhi: 0x0A02,
+  birusquare: 0x3331,
+  blackcircle: 0x25CF,
+  blackdiamond: 0x25C6,
+  blackdownpointingtriangle: 0x25BC,
+  blackleftpointingpointer: 0x25C4,
+  blackleftpointingtriangle: 0x25C0,
+  blacklenticularbracketleft: 0x3010,
+  blacklenticularbracketleftvertical: 0xFE3B,
+  blacklenticularbracketright: 0x3011,
+  blacklenticularbracketrightvertical: 0xFE3C,
+  blacklowerlefttriangle: 0x25E3,
+  blacklowerrighttriangle: 0x25E2,
+  blackrectangle: 0x25AC,
+  blackrightpointingpointer: 0x25BA,
+  blackrightpointingtriangle: 0x25B6,
+  blacksmallsquare: 0x25AA,
+  blacksmilingface: 0x263B,
+  blacksquare: 0x25A0,
+  blackstar: 0x2605,
+  blackupperlefttriangle: 0x25E4,
+  blackupperrighttriangle: 0x25E5,
+  blackuppointingsmalltriangle: 0x25B4,
+  blackuppointingtriangle: 0x25B2,
+  blank: 0x2423,
+  blinebelow: 0x1E07,
+  block: 0x2588,
+  bmonospace: 0xFF42,
+  bobaimaithai: 0x0E1A,
+  bohiragana: 0x307C,
+  bokatakana: 0x30DC,
+  bparen: 0x249D,
+  bqsquare: 0x33C3,
+  braceex: 0xF8F4,
+  braceleft: 0x007B,
+  braceleftbt: 0xF8F3,
+  braceleftmid: 0xF8F2,
+  braceleftmonospace: 0xFF5B,
+  braceleftsmall: 0xFE5B,
+  bracelefttp: 0xF8F1,
+  braceleftvertical: 0xFE37,
+  braceright: 0x007D,
+  bracerightbt: 0xF8FE,
+  bracerightmid: 0xF8FD,
+  bracerightmonospace: 0xFF5D,
+  bracerightsmall: 0xFE5C,
+  bracerighttp: 0xF8FC,
+  bracerightvertical: 0xFE38,
+  bracketleft: 0x005B,
+  bracketleftbt: 0xF8F0,
+  bracketleftex: 0xF8EF,
+  bracketleftmonospace: 0xFF3B,
+  bracketlefttp: 0xF8EE,
+  bracketright: 0x005D,
+  bracketrightbt: 0xF8FB,
+  bracketrightex: 0xF8FA,
+  bracketrightmonospace: 0xFF3D,
+  bracketrighttp: 0xF8F9,
+  breve: 0x02D8,
+  brevebelowcmb: 0x032E,
+  brevecmb: 0x0306,
+  breveinvertedbelowcmb: 0x032F,
+  breveinvertedcmb: 0x0311,
+  breveinverteddoublecmb: 0x0361,
+  bridgebelowcmb: 0x032A,
+  bridgeinvertedbelowcmb: 0x033A,
+  brokenbar: 0x00A6,
+  bstroke: 0x0180,
+  bsuperior: 0xF6EA,
+  btopbar: 0x0183,
+  buhiragana: 0x3076,
+  bukatakana: 0x30D6,
+  bullet: 0x2022,
+  bulletinverse: 0x25D8,
+  bulletoperator: 0x2219,
+  bullseye: 0x25CE,
+  c: 0x0063,
+  caarmenian: 0x056E,
+  cabengali: 0x099A,
+  cacute: 0x0107,
+  cadeva: 0x091A,
+  cagujarati: 0x0A9A,
+  cagurmukhi: 0x0A1A,
+  calsquare: 0x3388,
+  candrabindubengali: 0x0981,
+  candrabinducmb: 0x0310,
+  candrabindudeva: 0x0901,
+  candrabindugujarati: 0x0A81,
+  capslock: 0x21EA,
+  careof: 0x2105,
+  caron: 0x02C7,
+  caronbelowcmb: 0x032C,
+  caroncmb: 0x030C,
+  carriagereturn: 0x21B5,
+  cbopomofo: 0x3118,
+  ccaron: 0x010D,
+  ccedilla: 0x00E7,
+  ccedillaacute: 0x1E09,
+  ccircle: 0x24D2,
+  ccircumflex: 0x0109,
+  ccurl: 0x0255,
+  cdot: 0x010B,
+  cdotaccent: 0x010B,
+  cdsquare: 0x33C5,
+  cedilla: 0x00B8,
+  cedillacmb: 0x0327,
+  cent: 0x00A2,
+  centigrade: 0x2103,
+  centinferior: 0xF6DF,
+  centmonospace: 0xFFE0,
+  centoldstyle: 0xF7A2,
+  centsuperior: 0xF6E0,
+  chaarmenian: 0x0579,
+  chabengali: 0x099B,
+  chadeva: 0x091B,
+  chagujarati: 0x0A9B,
+  chagurmukhi: 0x0A1B,
+  chbopomofo: 0x3114,
+  cheabkhasiancyrillic: 0x04BD,
+  checkmark: 0x2713,
+  checyrillic: 0x0447,
+  chedescenderabkhasiancyrillic: 0x04BF,
+  chedescendercyrillic: 0x04B7,
+  chedieresiscyrillic: 0x04F5,
+  cheharmenian: 0x0573,
+  chekhakassiancyrillic: 0x04CC,
+  cheverticalstrokecyrillic: 0x04B9,
+  chi: 0x03C7,
+  chieuchacirclekorean: 0x3277,
+  chieuchaparenkorean: 0x3217,
+  chieuchcirclekorean: 0x3269,
+  chieuchkorean: 0x314A,
+  chieuchparenkorean: 0x3209,
+  chochangthai: 0x0E0A,
+  chochanthai: 0x0E08,
+  chochingthai: 0x0E09,
+  chochoethai: 0x0E0C,
+  chook: 0x0188,
+  cieucacirclekorean: 0x3276,
+  cieucaparenkorean: 0x3216,
+  cieuccirclekorean: 0x3268,
+  cieuckorean: 0x3148,
+  cieucparenkorean: 0x3208,
+  cieucuparenkorean: 0x321C,
+  circle: 0x25CB,
+  circlecopyrt: 0x00A9, // This glyph is missing from Adobe's original list.
+  circlemultiply: 0x2297,
+  circleot: 0x2299,
+  circleplus: 0x2295,
+  circlepostalmark: 0x3036,
+  circlewithlefthalfblack: 0x25D0,
+  circlewithrighthalfblack: 0x25D1,
+  circumflex: 0x02C6,
+  circumflexbelowcmb: 0x032D,
+  circumflexcmb: 0x0302,
+  clear: 0x2327,
+  clickalveolar: 0x01C2,
+  clickdental: 0x01C0,
+  clicklateral: 0x01C1,
+  clickretroflex: 0x01C3,
+  club: 0x2663,
+  clubsuitblack: 0x2663,
+  clubsuitwhite: 0x2667,
+  cmcubedsquare: 0x33A4,
+  cmonospace: 0xFF43,
+  cmsquaredsquare: 0x33A0,
+  coarmenian: 0x0581,
+  colon: 0x003A,
+  colonmonetary: 0x20A1,
+  colonmonospace: 0xFF1A,
+  colonsign: 0x20A1,
+  colonsmall: 0xFE55,
+  colontriangularhalfmod: 0x02D1,
+  colontriangularmod: 0x02D0,
+  comma: 0x002C,
+  commaabovecmb: 0x0313,
+  commaaboverightcmb: 0x0315,
+  commaaccent: 0xF6C3,
+  commaarabic: 0x060C,
+  commaarmenian: 0x055D,
+  commainferior: 0xF6E1,
+  commamonospace: 0xFF0C,
+  commareversedabovecmb: 0x0314,
+  commareversedmod: 0x02BD,
+  commasmall: 0xFE50,
+  commasuperior: 0xF6E2,
+  commaturnedabovecmb: 0x0312,
+  commaturnedmod: 0x02BB,
+  compass: 0x263C,
+  congruent: 0x2245,
+  contourintegral: 0x222E,
+  control: 0x2303,
+  controlACK: 0x0006,
+  controlBEL: 0x0007,
+  controlBS: 0x0008,
+  controlCAN: 0x0018,
+  controlCR: 0x000D,
+  controlDC1: 0x0011,
+  controlDC2: 0x0012,
+  controlDC3: 0x0013,
+  controlDC4: 0x0014,
+  controlDEL: 0x007F,
+  controlDLE: 0x0010,
+  controlEM: 0x0019,
+  controlENQ: 0x0005,
+  controlEOT: 0x0004,
+  controlESC: 0x001B,
+  controlETB: 0x0017,
+  controlETX: 0x0003,
+  controlFF: 0x000C,
+  controlFS: 0x001C,
+  controlGS: 0x001D,
+  controlHT: 0x0009,
+  controlLF: 0x000A,
+  controlNAK: 0x0015,
+  controlRS: 0x001E,
+  controlSI: 0x000F,
+  controlSO: 0x000E,
+  controlSOT: 0x0002,
+  controlSTX: 0x0001,
+  controlSUB: 0x001A,
+  controlSYN: 0x0016,
+  controlUS: 0x001F,
+  controlVT: 0x000B,
+  copyright: 0x00A9,
+  copyrightsans: 0xF8E9,
+  copyrightserif: 0xF6D9,
+  cornerbracketleft: 0x300C,
+  cornerbracketlefthalfwidth: 0xFF62,
+  cornerbracketleftvertical: 0xFE41,
+  cornerbracketright: 0x300D,
+  cornerbracketrighthalfwidth: 0xFF63,
+  cornerbracketrightvertical: 0xFE42,
+  corporationsquare: 0x337F,
+  cosquare: 0x33C7,
+  coverkgsquare: 0x33C6,
+  cparen: 0x249E,
+  cruzeiro: 0x20A2,
+  cstretched: 0x0297,
+  curlyand: 0x22CF,
+  curlyor: 0x22CE,
+  currency: 0x00A4,
+  cyrBreve: 0xF6D1,
+  cyrFlex: 0xF6D2,
+  cyrbreve: 0xF6D4,
+  cyrflex: 0xF6D5,
+  d: 0x0064,
+  daarmenian: 0x0564,
+  dabengali: 0x09A6,
+  dadarabic: 0x0636,
+  dadeva: 0x0926,
+  dadfinalarabic: 0xFEBE,
+  dadinitialarabic: 0xFEBF,
+  dadmedialarabic: 0xFEC0,
+  dagesh: 0x05BC,
+  dageshhebrew: 0x05BC,
+  dagger: 0x2020,
+  daggerdbl: 0x2021,
+  dagujarati: 0x0AA6,
+  dagurmukhi: 0x0A26,
+  dahiragana: 0x3060,
+  dakatakana: 0x30C0,
+  dalarabic: 0x062F,
+  dalet: 0x05D3,
+  daletdagesh: 0xFB33,
+  daletdageshhebrew: 0xFB33,
+  dalethatafpatah: 0x05D305B2,
+  dalethatafpatahhebrew: 0x05D305B2,
+  dalethatafsegol: 0x05D305B1,
+  dalethatafsegolhebrew: 0x05D305B1,
+  dalethebrew: 0x05D3,
+  dalethiriq: 0x05D305B4,
+  dalethiriqhebrew: 0x05D305B4,
+  daletholam: 0x05D305B9,
+  daletholamhebrew: 0x05D305B9,
+  daletpatah: 0x05D305B7,
+  daletpatahhebrew: 0x05D305B7,
+  daletqamats: 0x05D305B8,
+  daletqamatshebrew: 0x05D305B8,
+  daletqubuts: 0x05D305BB,
+  daletqubutshebrew: 0x05D305BB,
+  daletsegol: 0x05D305B6,
+  daletsegolhebrew: 0x05D305B6,
+  daletsheva: 0x05D305B0,
+  daletshevahebrew: 0x05D305B0,
+  dalettsere: 0x05D305B5,
+  dalettserehebrew: 0x05D305B5,
+  dalfinalarabic: 0xFEAA,
+  dammaarabic: 0x064F,
+  dammalowarabic: 0x064F,
+  dammatanaltonearabic: 0x064C,
+  dammatanarabic: 0x064C,
+  danda: 0x0964,
+  dargahebrew: 0x05A7,
+  dargalefthebrew: 0x05A7,
+  dasiapneumatacyrilliccmb: 0x0485,
+  dblGrave: 0xF6D3,
+  dblanglebracketleft: 0x300A,
+  dblanglebracketleftvertical: 0xFE3D,
+  dblanglebracketright: 0x300B,
+  dblanglebracketrightvertical: 0xFE3E,
+  dblarchinvertedbelowcmb: 0x032B,
+  dblarrowleft: 0x21D4,
+  dblarrowright: 0x21D2,
+  dbldanda: 0x0965,
+  dblgrave: 0xF6D6,
+  dblgravecmb: 0x030F,
+  dblintegral: 0x222C,
+  dbllowline: 0x2017,
+  dbllowlinecmb: 0x0333,
+  dbloverlinecmb: 0x033F,
+  dblprimemod: 0x02BA,
+  dblverticalbar: 0x2016,
+  dblverticallineabovecmb: 0x030E,
+  dbopomofo: 0x3109,
+  dbsquare: 0x33C8,
+  dcaron: 0x010F,
+  dcedilla: 0x1E11,
+  dcircle: 0x24D3,
+  dcircumflexbelow: 0x1E13,
+  dcroat: 0x0111,
+  ddabengali: 0x09A1,
+  ddadeva: 0x0921,
+  ddagujarati: 0x0AA1,
+  ddagurmukhi: 0x0A21,
+  ddalarabic: 0x0688,
+  ddalfinalarabic: 0xFB89,
+  dddhadeva: 0x095C,
+  ddhabengali: 0x09A2,
+  ddhadeva: 0x0922,
+  ddhagujarati: 0x0AA2,
+  ddhagurmukhi: 0x0A22,
+  ddotaccent: 0x1E0B,
+  ddotbelow: 0x1E0D,
+  decimalseparatorarabic: 0x066B,
+  decimalseparatorpersian: 0x066B,
+  decyrillic: 0x0434,
+  degree: 0x00B0,
+  dehihebrew: 0x05AD,
+  dehiragana: 0x3067,
+  deicoptic: 0x03EF,
+  dekatakana: 0x30C7,
+  deleteleft: 0x232B,
+  deleteright: 0x2326,
+  delta: 0x03B4,
+  deltaturned: 0x018D,
+  denominatorminusonenumeratorbengali: 0x09F8,
+  dezh: 0x02A4,
+  dhabengali: 0x09A7,
+  dhadeva: 0x0927,
+  dhagujarati: 0x0AA7,
+  dhagurmukhi: 0x0A27,
+  dhook: 0x0257,
+  dialytikatonos: 0x0385,
+  dialytikatonoscmb: 0x0344,
+  diamond: 0x2666,
+  diamondsuitwhite: 0x2662,
+  dieresis: 0x00A8,
+  dieresisacute: 0xF6D7,
+  dieresisbelowcmb: 0x0324,
+  dieresiscmb: 0x0308,
+  dieresisgrave: 0xF6D8,
+  dieresistonos: 0x0385,
+  dihiragana: 0x3062,
+  dikatakana: 0x30C2,
+  dittomark: 0x3003,
+  divide: 0x00F7,
+  divides: 0x2223,
+  divisionslash: 0x2215,
+  djecyrillic: 0x0452,
+  dkshade: 0x2593,
+  dlinebelow: 0x1E0F,
+  dlsquare: 0x3397,
+  dmacron: 0x0111,
+  dmonospace: 0xFF44,
+  dnblock: 0x2584,
+  dochadathai: 0x0E0E,
+  dodekthai: 0x0E14,
+  dohiragana: 0x3069,
+  dokatakana: 0x30C9,
+  dollar: 0x0024,
+  dollarinferior: 0xF6E3,
+  dollarmonospace: 0xFF04,
+  dollaroldstyle: 0xF724,
+  dollarsmall: 0xFE69,
+  dollarsuperior: 0xF6E4,
+  dong: 0x20AB,
+  dorusquare: 0x3326,
+  dotaccent: 0x02D9,
+  dotaccentcmb: 0x0307,
+  dotbelowcmb: 0x0323,
+  dotbelowcomb: 0x0323,
+  dotkatakana: 0x30FB,
+  dotlessi: 0x0131,
+  dotlessj: 0xF6BE,
+  dotlessjstrokehook: 0x0284,
+  dotmath: 0x22C5,
+  dottedcircle: 0x25CC,
+  doubleyodpatah: 0xFB1F,
+  doubleyodpatahhebrew: 0xFB1F,
+  downtackbelowcmb: 0x031E,
+  downtackmod: 0x02D5,
+  dparen: 0x249F,
+  dsuperior: 0xF6EB,
+  dtail: 0x0256,
+  dtopbar: 0x018C,
+  duhiragana: 0x3065,
+  dukatakana: 0x30C5,
+  dz: 0x01F3,
+  dzaltone: 0x02A3,
+  dzcaron: 0x01C6,
+  dzcurl: 0x02A5,
+  dzeabkhasiancyrillic: 0x04E1,
+  dzecyrillic: 0x0455,
+  dzhecyrillic: 0x045F,
+  e: 0x0065,
+  eacute: 0x00E9,
+  earth: 0x2641,
+  ebengali: 0x098F,
+  ebopomofo: 0x311C,
+  ebreve: 0x0115,
+  ecandradeva: 0x090D,
+  ecandragujarati: 0x0A8D,
+  ecandravowelsigndeva: 0x0945,
+  ecandravowelsigngujarati: 0x0AC5,
+  ecaron: 0x011B,
+  ecedillabreve: 0x1E1D,
+  echarmenian: 0x0565,
+  echyiwnarmenian: 0x0587,
+  ecircle: 0x24D4,
+  ecircumflex: 0x00EA,
+  ecircumflexacute: 0x1EBF,
+  ecircumflexbelow: 0x1E19,
+  ecircumflexdotbelow: 0x1EC7,
+  ecircumflexgrave: 0x1EC1,
+  ecircumflexhookabove: 0x1EC3,
+  ecircumflextilde: 0x1EC5,
+  ecyrillic: 0x0454,
+  edblgrave: 0x0205,
+  edeva: 0x090F,
+  edieresis: 0x00EB,
+  edot: 0x0117,
+  edotaccent: 0x0117,
+  edotbelow: 0x1EB9,
+  eegurmukhi: 0x0A0F,
+  eematragurmukhi: 0x0A47,
+  efcyrillic: 0x0444,
+  egrave: 0x00E8,
+  egujarati: 0x0A8F,
+  eharmenian: 0x0567,
+  ehbopomofo: 0x311D,
+  ehiragana: 0x3048,
+  ehookabove: 0x1EBB,
+  eibopomofo: 0x311F,
+  eight: 0x0038,
+  eightarabic: 0x0668,
+  eightbengali: 0x09EE,
+  eightcircle: 0x2467,
+  eightcircleinversesansserif: 0x2791,
+  eightdeva: 0x096E,
+  eighteencircle: 0x2471,
+  eighteenparen: 0x2485,
+  eighteenperiod: 0x2499,
+  eightgujarati: 0x0AEE,
+  eightgurmukhi: 0x0A6E,
+  eighthackarabic: 0x0668,
+  eighthangzhou: 0x3028,
+  eighthnotebeamed: 0x266B,
+  eightideographicparen: 0x3227,
+  eightinferior: 0x2088,
+  eightmonospace: 0xFF18,
+  eightoldstyle: 0xF738,
+  eightparen: 0x247B,
+  eightperiod: 0x248F,
+  eightpersian: 0x06F8,
+  eightroman: 0x2177,
+  eightsuperior: 0x2078,
+  eightthai: 0x0E58,
+  einvertedbreve: 0x0207,
+  eiotifiedcyrillic: 0x0465,
+  ekatakana: 0x30A8,
+  ekatakanahalfwidth: 0xFF74,
+  ekonkargurmukhi: 0x0A74,
+  ekorean: 0x3154,
+  elcyrillic: 0x043B,
+  element: 0x2208,
+  elevencircle: 0x246A,
+  elevenparen: 0x247E,
+  elevenperiod: 0x2492,
+  elevenroman: 0x217A,
+  ellipsis: 0x2026,
+  ellipsisvertical: 0x22EE,
+  emacron: 0x0113,
+  emacronacute: 0x1E17,
+  emacrongrave: 0x1E15,
+  emcyrillic: 0x043C,
+  emdash: 0x2014,
+  emdashvertical: 0xFE31,
+  emonospace: 0xFF45,
+  emphasismarkarmenian: 0x055B,
+  emptyset: 0x2205,
+  enbopomofo: 0x3123,
+  encyrillic: 0x043D,
+  endash: 0x2013,
+  endashvertical: 0xFE32,
+  endescendercyrillic: 0x04A3,
+  eng: 0x014B,
+  engbopomofo: 0x3125,
+  enghecyrillic: 0x04A5,
+  enhookcyrillic: 0x04C8,
+  enspace: 0x2002,
+  eogonek: 0x0119,
+  eokorean: 0x3153,
+  eopen: 0x025B,
+  eopenclosed: 0x029A,
+  eopenreversed: 0x025C,
+  eopenreversedclosed: 0x025E,
+  eopenreversedhook: 0x025D,
+  eparen: 0x24A0,
+  epsilon: 0x03B5,
+  epsilontonos: 0x03AD,
+  equal: 0x003D,
+  equalmonospace: 0xFF1D,
+  equalsmall: 0xFE66,
+  equalsuperior: 0x207C,
+  equivalence: 0x2261,
+  erbopomofo: 0x3126,
+  ercyrillic: 0x0440,
+  ereversed: 0x0258,
+  ereversedcyrillic: 0x044D,
+  escyrillic: 0x0441,
+  esdescendercyrillic: 0x04AB,
+  esh: 0x0283,
+  eshcurl: 0x0286,
+  eshortdeva: 0x090E,
+  eshortvowelsigndeva: 0x0946,
+  eshreversedloop: 0x01AA,
+  eshsquatreversed: 0x0285,
+  esmallhiragana: 0x3047,
+  esmallkatakana: 0x30A7,
+  esmallkatakanahalfwidth: 0xFF6A,
+  estimated: 0x212E,
+  esuperior: 0xF6EC,
+  eta: 0x03B7,
+  etarmenian: 0x0568,
+  etatonos: 0x03AE,
+  eth: 0x00F0,
+  etilde: 0x1EBD,
+  etildebelow: 0x1E1B,
+  etnahtafoukhhebrew: 0x0591,
+  etnahtafoukhlefthebrew: 0x0591,
+  etnahtahebrew: 0x0591,
+  etnahtalefthebrew: 0x0591,
+  eturned: 0x01DD,
+  eukorean: 0x3161,
+  euro: 0x20AC,
+  evowelsignbengali: 0x09C7,
+  evowelsigndeva: 0x0947,
+  evowelsigngujarati: 0x0AC7,
+  exclam: 0x0021,
+  exclamarmenian: 0x055C,
+  exclamdbl: 0x203C,
+  exclamdown: 0x00A1,
+  exclamdownsmall: 0xF7A1,
+  exclammonospace: 0xFF01,
+  exclamsmall: 0xF721,
+  existential: 0x2203,
+  ezh: 0x0292,
+  ezhcaron: 0x01EF,
+  ezhcurl: 0x0293,
+  ezhreversed: 0x01B9,
+  ezhtail: 0x01BA,
+  f: 0x0066,
+  fadeva: 0x095E,
+  fagurmukhi: 0x0A5E,
+  fahrenheit: 0x2109,
+  fathaarabic: 0x064E,
+  fathalowarabic: 0x064E,
+  fathatanarabic: 0x064B,
+  fbopomofo: 0x3108,
+  fcircle: 0x24D5,
+  fdotaccent: 0x1E1F,
+  feharabic: 0x0641,
+  feharmenian: 0x0586,
+  fehfinalarabic: 0xFED2,
+  fehinitialarabic: 0xFED3,
+  fehmedialarabic: 0xFED4,
+  feicoptic: 0x03E5,
+  female: 0x2640,
+  ff: 0xFB00,
+  ffi: 0xFB03,
+  ffl: 0xFB04,
+  fi: 0xFB01,
+  fifteencircle: 0x246E,
+  fifteenparen: 0x2482,
+  fifteenperiod: 0x2496,
+  figuredash: 0x2012,
+  filledbox: 0x25A0,
+  filledrect: 0x25AC,
+  finalkaf: 0x05DA,
+  finalkafdagesh: 0xFB3A,
+  finalkafdageshhebrew: 0xFB3A,
+  finalkafhebrew: 0x05DA,
+  finalkafqamats: 0x05DA05B8,
+  finalkafqamatshebrew: 0x05DA05B8,
+  finalkafsheva: 0x05DA05B0,
+  finalkafshevahebrew: 0x05DA05B0,
+  finalmem: 0x05DD,
+  finalmemhebrew: 0x05DD,
+  finalnun: 0x05DF,
+  finalnunhebrew: 0x05DF,
+  finalpe: 0x05E3,
+  finalpehebrew: 0x05E3,
+  finaltsadi: 0x05E5,
+  finaltsadihebrew: 0x05E5,
+  firsttonechinese: 0x02C9,
+  fisheye: 0x25C9,
+  fitacyrillic: 0x0473,
+  five: 0x0035,
+  fivearabic: 0x0665,
+  fivebengali: 0x09EB,
+  fivecircle: 0x2464,
+  fivecircleinversesansserif: 0x278E,
+  fivedeva: 0x096B,
+  fiveeighths: 0x215D,
+  fivegujarati: 0x0AEB,
+  fivegurmukhi: 0x0A6B,
+  fivehackarabic: 0x0665,
+  fivehangzhou: 0x3025,
+  fiveideographicparen: 0x3224,
+  fiveinferior: 0x2085,
+  fivemonospace: 0xFF15,
+  fiveoldstyle: 0xF735,
+  fiveparen: 0x2478,
+  fiveperiod: 0x248C,
+  fivepersian: 0x06F5,
+  fiveroman: 0x2174,
+  fivesuperior: 0x2075,
+  fivethai: 0x0E55,
+  fl: 0xFB02,
+  florin: 0x0192,
+  fmonospace: 0xFF46,
+  fmsquare: 0x3399,
+  fofanthai: 0x0E1F,
+  fofathai: 0x0E1D,
+  fongmanthai: 0x0E4F,
+  forall: 0x2200,
+  four: 0x0034,
+  fourarabic: 0x0664,
+  fourbengali: 0x09EA,
+  fourcircle: 0x2463,
+  fourcircleinversesansserif: 0x278D,
+  fourdeva: 0x096A,
+  fourgujarati: 0x0AEA,
+  fourgurmukhi: 0x0A6A,
+  fourhackarabic: 0x0664,
+  fourhangzhou: 0x3024,
+  fourideographicparen: 0x3223,
+  fourinferior: 0x2084,
+  fourmonospace: 0xFF14,
+  fournumeratorbengali: 0x09F7,
+  fouroldstyle: 0xF734,
+  fourparen: 0x2477,
+  fourperiod: 0x248B,
+  fourpersian: 0x06F4,
+  fourroman: 0x2173,
+  foursuperior: 0x2074,
+  fourteencircle: 0x246D,
+  fourteenparen: 0x2481,
+  fourteenperiod: 0x2495,
+  fourthai: 0x0E54,
+  fourthtonechinese: 0x02CB,
+  fparen: 0x24A1,
+  fraction: 0x2044,
+  franc: 0x20A3,
+  g: 0x0067,
+  gabengali: 0x0997,
+  gacute: 0x01F5,
+  gadeva: 0x0917,
+  gafarabic: 0x06AF,
+  gaffinalarabic: 0xFB93,
+  gafinitialarabic: 0xFB94,
+  gafmedialarabic: 0xFB95,
+  gagujarati: 0x0A97,
+  gagurmukhi: 0x0A17,
+  gahiragana: 0x304C,
+  gakatakana: 0x30AC,
+  gamma: 0x03B3,
+  gammalatinsmall: 0x0263,
+  gammasuperior: 0x02E0,
+  gangiacoptic: 0x03EB,
+  gbopomofo: 0x310D,
+  gbreve: 0x011F,
+  gcaron: 0x01E7,
+  gcedilla: 0x0123,
+  gcircle: 0x24D6,
+  gcircumflex: 0x011D,
+  gcommaaccent: 0x0123,
+  gdot: 0x0121,
+  gdotaccent: 0x0121,
+  gecyrillic: 0x0433,
+  gehiragana: 0x3052,
+  gekatakana: 0x30B2,
+  geometricallyequal: 0x2251,
+  gereshaccenthebrew: 0x059C,
+  gereshhebrew: 0x05F3,
+  gereshmuqdamhebrew: 0x059D,
+  germandbls: 0x00DF,
+  gershayimaccenthebrew: 0x059E,
+  gershayimhebrew: 0x05F4,
+  getamark: 0x3013,
+  ghabengali: 0x0998,
+  ghadarmenian: 0x0572,
+  ghadeva: 0x0918,
+  ghagujarati: 0x0A98,
+  ghagurmukhi: 0x0A18,
+  ghainarabic: 0x063A,
+  ghainfinalarabic: 0xFECE,
+  ghaininitialarabic: 0xFECF,
+  ghainmedialarabic: 0xFED0,
+  ghemiddlehookcyrillic: 0x0495,
+  ghestrokecyrillic: 0x0493,
+  gheupturncyrillic: 0x0491,
+  ghhadeva: 0x095A,
+  ghhagurmukhi: 0x0A5A,
+  ghook: 0x0260,
+  ghzsquare: 0x3393,
+  gihiragana: 0x304E,
+  gikatakana: 0x30AE,
+  gimarmenian: 0x0563,
+  gimel: 0x05D2,
+  gimeldagesh: 0xFB32,
+  gimeldageshhebrew: 0xFB32,
+  gimelhebrew: 0x05D2,
+  gjecyrillic: 0x0453,
+  glottalinvertedstroke: 0x01BE,
+  glottalstop: 0x0294,
+  glottalstopinverted: 0x0296,
+  glottalstopmod: 0x02C0,
+  glottalstopreversed: 0x0295,
+  glottalstopreversedmod: 0x02C1,
+  glottalstopreversedsuperior: 0x02E4,
+  glottalstopstroke: 0x02A1,
+  glottalstopstrokereversed: 0x02A2,
+  gmacron: 0x1E21,
+  gmonospace: 0xFF47,
+  gohiragana: 0x3054,
+  gokatakana: 0x30B4,
+  gparen: 0x24A2,
+  gpasquare: 0x33AC,
+  gradient: 0x2207,
+  grave: 0x0060,
+  gravebelowcmb: 0x0316,
+  gravecmb: 0x0300,
+  gravecomb: 0x0300,
+  gravedeva: 0x0953,
+  gravelowmod: 0x02CE,
+  gravemonospace: 0xFF40,
+  gravetonecmb: 0x0340,
+  greater: 0x003E,
+  greaterequal: 0x2265,
+  greaterequalorless: 0x22DB,
+  greatermonospace: 0xFF1E,
+  greaterorequivalent: 0x2273,
+  greaterorless: 0x2277,
+  greateroverequal: 0x2267,
+  greatersmall: 0xFE65,
+  gscript: 0x0261,
+  gstroke: 0x01E5,
+  guhiragana: 0x3050,
+  guillemotleft: 0x00AB,
+  guillemotright: 0x00BB,
+  guilsinglleft: 0x2039,
+  guilsinglright: 0x203A,
+  gukatakana: 0x30B0,
+  guramusquare: 0x3318,
+  gysquare: 0x33C9,
+  h: 0x0068,
+  haabkhasiancyrillic: 0x04A9,
+  haaltonearabic: 0x06C1,
+  habengali: 0x09B9,
+  hadescendercyrillic: 0x04B3,
+  hadeva: 0x0939,
+  hagujarati: 0x0AB9,
+  hagurmukhi: 0x0A39,
+  haharabic: 0x062D,
+  hahfinalarabic: 0xFEA2,
+  hahinitialarabic: 0xFEA3,
+  hahiragana: 0x306F,
+  hahmedialarabic: 0xFEA4,
+  haitusquare: 0x332A,
+  hakatakana: 0x30CF,
+  hakatakanahalfwidth: 0xFF8A,
+  halantgurmukhi: 0x0A4D,
+  hamzaarabic: 0x0621,
+  hamzadammaarabic: 0x0621064F,
+  hamzadammatanarabic: 0x0621064C,
+  hamzafathaarabic: 0x0621064E,
+  hamzafathatanarabic: 0x0621064B,
+  hamzalowarabic: 0x0621,
+  hamzalowkasraarabic: 0x06210650,
+  hamzalowkasratanarabic: 0x0621064D,
+  hamzasukunarabic: 0x06210652,
+  hangulfiller: 0x3164,
+  hardsigncyrillic: 0x044A,
+  harpoonleftbarbup: 0x21BC,
+  harpoonrightbarbup: 0x21C0,
+  hasquare: 0x33CA,
+  hatafpatah: 0x05B2,
+  hatafpatah16: 0x05B2,
+  hatafpatah23: 0x05B2,
+  hatafpatah2f: 0x05B2,
+  hatafpatahhebrew: 0x05B2,
+  hatafpatahnarrowhebrew: 0x05B2,
+  hatafpatahquarterhebrew: 0x05B2,
+  hatafpatahwidehebrew: 0x05B2,
+  hatafqamats: 0x05B3,
+  hatafqamats1b: 0x05B3,
+  hatafqamats28: 0x05B3,
+  hatafqamats34: 0x05B3,
+  hatafqamatshebrew: 0x05B3,
+  hatafqamatsnarrowhebrew: 0x05B3,
+  hatafqamatsquarterhebrew: 0x05B3,
+  hatafqamatswidehebrew: 0x05B3,
+  hatafsegol: 0x05B1,
+  hatafsegol17: 0x05B1,
+  hatafsegol24: 0x05B1,
+  hatafsegol30: 0x05B1,
+  hatafsegolhebrew: 0x05B1,
+  hatafsegolnarrowhebrew: 0x05B1,
+  hatafsegolquarterhebrew: 0x05B1,
+  hatafsegolwidehebrew: 0x05B1,
+  hbar: 0x0127,
+  hbopomofo: 0x310F,
+  hbrevebelow: 0x1E2B,
+  hcedilla: 0x1E29,
+  hcircle: 0x24D7,
+  hcircumflex: 0x0125,
+  hdieresis: 0x1E27,
+  hdotaccent: 0x1E23,
+  hdotbelow: 0x1E25,
+  he: 0x05D4,
+  heart: 0x2665,
+  heartsuitblack: 0x2665,
+  heartsuitwhite: 0x2661,
+  hedagesh: 0xFB34,
+  hedageshhebrew: 0xFB34,
+  hehaltonearabic: 0x06C1,
+  heharabic: 0x0647,
+  hehebrew: 0x05D4,
+  hehfinalaltonearabic: 0xFBA7,
+  hehfinalalttwoarabic: 0xFEEA,
+  hehfinalarabic: 0xFEEA,
+  hehhamzaabovefinalarabic: 0xFBA5,
+  hehhamzaaboveisolatedarabic: 0xFBA4,
+  hehinitialaltonearabic: 0xFBA8,
+  hehinitialarabic: 0xFEEB,
+  hehiragana: 0x3078,
+  hehmedialaltonearabic: 0xFBA9,
+  hehmedialarabic: 0xFEEC,
+  heiseierasquare: 0x337B,
+  hekatakana: 0x30D8,
+  hekatakanahalfwidth: 0xFF8D,
+  hekutaarusquare: 0x3336,
+  henghook: 0x0267,
+  herutusquare: 0x3339,
+  het: 0x05D7,
+  hethebrew: 0x05D7,
+  hhook: 0x0266,
+  hhooksuperior: 0x02B1,
+  hieuhacirclekorean: 0x327B,
+  hieuhaparenkorean: 0x321B,
+  hieuhcirclekorean: 0x326D,
+  hieuhkorean: 0x314E,
+  hieuhparenkorean: 0x320D,
+  hihiragana: 0x3072,
+  hikatakana: 0x30D2,
+  hikatakanahalfwidth: 0xFF8B,
+  hiriq: 0x05B4,
+  hiriq14: 0x05B4,
+  hiriq21: 0x05B4,
+  hiriq2d: 0x05B4,
+  hiriqhebrew: 0x05B4,
+  hiriqnarrowhebrew: 0x05B4,
+  hiriqquarterhebrew: 0x05B4,
+  hiriqwidehebrew: 0x05B4,
+  hlinebelow: 0x1E96,
+  hmonospace: 0xFF48,
+  hoarmenian: 0x0570,
+  hohipthai: 0x0E2B,
+  hohiragana: 0x307B,
+  hokatakana: 0x30DB,
+  hokatakanahalfwidth: 0xFF8E,
+  holam: 0x05B9,
+  holam19: 0x05B9,
+  holam26: 0x05B9,
+  holam32: 0x05B9,
+  holamhebrew: 0x05B9,
+  holamnarrowhebrew: 0x05B9,
+  holamquarterhebrew: 0x05B9,
+  holamwidehebrew: 0x05B9,
+  honokhukthai: 0x0E2E,
+  hookabovecomb: 0x0309,
+  hookcmb: 0x0309,
+  hookpalatalizedbelowcmb: 0x0321,
+  hookretroflexbelowcmb: 0x0322,
+  hoonsquare: 0x3342,
+  horicoptic: 0x03E9,
+  horizontalbar: 0x2015,
+  horncmb: 0x031B,
+  hotsprings: 0x2668,
+  house: 0x2302,
+  hparen: 0x24A3,
+  hsuperior: 0x02B0,
+  hturned: 0x0265,
+  huhiragana: 0x3075,
+  huiitosquare: 0x3333,
+  hukatakana: 0x30D5,
+  hukatakanahalfwidth: 0xFF8C,
+  hungarumlaut: 0x02DD,
+  hungarumlautcmb: 0x030B,
+  hv: 0x0195,
+  hyphen: 0x002D,
+  hypheninferior: 0xF6E5,
+  hyphenmonospace: 0xFF0D,
+  hyphensmall: 0xFE63,
+  hyphensuperior: 0xF6E6,
+  hyphentwo: 0x2010,
+  i: 0x0069,
+  iacute: 0x00ED,
+  iacyrillic: 0x044F,
+  ibengali: 0x0987,
+  ibopomofo: 0x3127,
+  ibreve: 0x012D,
+  icaron: 0x01D0,
+  icircle: 0x24D8,
+  icircumflex: 0x00EE,
+  icyrillic: 0x0456,
+  idblgrave: 0x0209,
+  ideographearthcircle: 0x328F,
+  ideographfirecircle: 0x328B,
+  ideographicallianceparen: 0x323F,
+  ideographiccallparen: 0x323A,
+  ideographiccentrecircle: 0x32A5,
+  ideographicclose: 0x3006,
+  ideographiccomma: 0x3001,
+  ideographiccommaleft: 0xFF64,
+  ideographiccongratulationparen: 0x3237,
+  ideographiccorrectcircle: 0x32A3,
+  ideographicearthparen: 0x322F,
+  ideographicenterpriseparen: 0x323D,
+  ideographicexcellentcircle: 0x329D,
+  ideographicfestivalparen: 0x3240,
+  ideographicfinancialcircle: 0x3296,
+  ideographicfinancialparen: 0x3236,
+  ideographicfireparen: 0x322B,
+  ideographichaveparen: 0x3232,
+  ideographichighcircle: 0x32A4,
+  ideographiciterationmark: 0x3005,
+  ideographiclaborcircle: 0x3298,
+  ideographiclaborparen: 0x3238,
+  ideographicleftcircle: 0x32A7,
+  ideographiclowcircle: 0x32A6,
+  ideographicmedicinecircle: 0x32A9,
+  ideographicmetalparen: 0x322E,
+  ideographicmoonparen: 0x322A,
+  ideographicnameparen: 0x3234,
+  ideographicperiod: 0x3002,
+  ideographicprintcircle: 0x329E,
+  ideographicreachparen: 0x3243,
+  ideographicrepresentparen: 0x3239,
+  ideographicresourceparen: 0x323E,
+  ideographicrightcircle: 0x32A8,
+  ideographicsecretcircle: 0x3299,
+  ideographicselfparen: 0x3242,
+  ideographicsocietyparen: 0x3233,
+  ideographicspace: 0x3000,
+  ideographicspecialparen: 0x3235,
+  ideographicstockparen: 0x3231,
+  ideographicstudyparen: 0x323B,
+  ideographicsunparen: 0x3230,
+  ideographicsuperviseparen: 0x323C,
+  ideographicwaterparen: 0x322C,
+  ideographicwoodparen: 0x322D,
+  ideographiczero: 0x3007,
+  ideographmetalcircle: 0x328E,
+  ideographmooncircle: 0x328A,
+  ideographnamecircle: 0x3294,
+  ideographsuncircle: 0x3290,
+  ideographwatercircle: 0x328C,
+  ideographwoodcircle: 0x328D,
+  ideva: 0x0907,
+  idieresis: 0x00EF,
+  idieresisacute: 0x1E2F,
+  idieresiscyrillic: 0x04E5,
+  idotbelow: 0x1ECB,
+  iebrevecyrillic: 0x04D7,
+  iecyrillic: 0x0435,
+  ieungacirclekorean: 0x3275,
+  ieungaparenkorean: 0x3215,
+  ieungcirclekorean: 0x3267,
+  ieungkorean: 0x3147,
+  ieungparenkorean: 0x3207,
+  igrave: 0x00EC,
+  igujarati: 0x0A87,
+  igurmukhi: 0x0A07,
+  ihiragana: 0x3044,
+  ihookabove: 0x1EC9,
+  iibengali: 0x0988,
+  iicyrillic: 0x0438,
+  iideva: 0x0908,
+  iigujarati: 0x0A88,
+  iigurmukhi: 0x0A08,
+  iimatragurmukhi: 0x0A40,
+  iinvertedbreve: 0x020B,
+  iishortcyrillic: 0x0439,
+  iivowelsignbengali: 0x09C0,
+  iivowelsigndeva: 0x0940,
+  iivowelsigngujarati: 0x0AC0,
+  ij: 0x0133,
+  ikatakana: 0x30A4,
+  ikatakanahalfwidth: 0xFF72,
+  ikorean: 0x3163,
+  ilde: 0x02DC,
+  iluyhebrew: 0x05AC,
+  imacron: 0x012B,
+  imacroncyrillic: 0x04E3,
+  imageorapproximatelyequal: 0x2253,
+  imatragurmukhi: 0x0A3F,
+  imonospace: 0xFF49,
+  increment: 0x2206,
+  infinity: 0x221E,
+  iniarmenian: 0x056B,
+  integral: 0x222B,
+  integralbottom: 0x2321,
+  integralbt: 0x2321,
+  integralex: 0xF8F5,
+  integraltop: 0x2320,
+  integraltp: 0x2320,
+  intersection: 0x2229,
+  intisquare: 0x3305,
+  invbullet: 0x25D8,
+  invcircle: 0x25D9,
+  invsmileface: 0x263B,
+  iocyrillic: 0x0451,
+  iogonek: 0x012F,
+  iota: 0x03B9,
+  iotadieresis: 0x03CA,
+  iotadieresistonos: 0x0390,
+  iotalatin: 0x0269,
+  iotatonos: 0x03AF,
+  iparen: 0x24A4,
+  irigurmukhi: 0x0A72,
+  ismallhiragana: 0x3043,
+  ismallkatakana: 0x30A3,
+  ismallkatakanahalfwidth: 0xFF68,
+  issharbengali: 0x09FA,
+  istroke: 0x0268,
+  isuperior: 0xF6ED,
+  iterationhiragana: 0x309D,
+  iterationkatakana: 0x30FD,
+  itilde: 0x0129,
+  itildebelow: 0x1E2D,
+  iubopomofo: 0x3129,
+  iucyrillic: 0x044E,
+  ivowelsignbengali: 0x09BF,
+  ivowelsigndeva: 0x093F,
+  ivowelsigngujarati: 0x0ABF,
+  izhitsacyrillic: 0x0475,
+  izhitsadblgravecyrillic: 0x0477,
+  j: 0x006A,
+  jaarmenian: 0x0571,
+  jabengali: 0x099C,
+  jadeva: 0x091C,
+  jagujarati: 0x0A9C,
+  jagurmukhi: 0x0A1C,
+  jbopomofo: 0x3110,
+  jcaron: 0x01F0,
+  jcircle: 0x24D9,
+  jcircumflex: 0x0135,
+  jcrossedtail: 0x029D,
+  jdotlessstroke: 0x025F,
+  jecyrillic: 0x0458,
+  jeemarabic: 0x062C,
+  jeemfinalarabic: 0xFE9E,
+  jeeminitialarabic: 0xFE9F,
+  jeemmedialarabic: 0xFEA0,
+  jeharabic: 0x0698,
+  jehfinalarabic: 0xFB8B,
+  jhabengali: 0x099D,
+  jhadeva: 0x091D,
+  jhagujarati: 0x0A9D,
+  jhagurmukhi: 0x0A1D,
+  jheharmenian: 0x057B,
+  jis: 0x3004,
+  jmonospace: 0xFF4A,
+  jparen: 0x24A5,
+  jsuperior: 0x02B2,
+  k: 0x006B,
+  kabashkircyrillic: 0x04A1,
+  kabengali: 0x0995,
+  kacute: 0x1E31,
+  kacyrillic: 0x043A,
+  kadescendercyrillic: 0x049B,
+  kadeva: 0x0915,
+  kaf: 0x05DB,
+  kafarabic: 0x0643,
+  kafdagesh: 0xFB3B,
+  kafdageshhebrew: 0xFB3B,
+  kaffinalarabic: 0xFEDA,
+  kafhebrew: 0x05DB,
+  kafinitialarabic: 0xFEDB,
+  kafmedialarabic: 0xFEDC,
+  kafrafehebrew: 0xFB4D,
+  kagujarati: 0x0A95,
+  kagurmukhi: 0x0A15,
+  kahiragana: 0x304B,
+  kahookcyrillic: 0x04C4,
+  kakatakana: 0x30AB,
+  kakatakanahalfwidth: 0xFF76,
+  kappa: 0x03BA,
+  kappasymbolgreek: 0x03F0,
+  kapyeounmieumkorean: 0x3171,
+  kapyeounphieuphkorean: 0x3184,
+  kapyeounpieupkorean: 0x3178,
+  kapyeounssangpieupkorean: 0x3179,
+  karoriisquare: 0x330D,
+  kashidaautoarabic: 0x0640,
+  kashidaautonosidebearingarabic: 0x0640,
+  kasmallkatakana: 0x30F5,
+  kasquare: 0x3384,
+  kasraarabic: 0x0650,
+  kasratanarabic: 0x064D,
+  kastrokecyrillic: 0x049F,
+  katahiraprolongmarkhalfwidth: 0xFF70,
+  kaverticalstrokecyrillic: 0x049D,
+  kbopomofo: 0x310E,
+  kcalsquare: 0x3389,
+  kcaron: 0x01E9,
+  kcedilla: 0x0137,
+  kcircle: 0x24DA,
+  kcommaaccent: 0x0137,
+  kdotbelow: 0x1E33,
+  keharmenian: 0x0584,
+  kehiragana: 0x3051,
+  kekatakana: 0x30B1,
+  kekatakanahalfwidth: 0xFF79,
+  kenarmenian: 0x056F,
+  kesmallkatakana: 0x30F6,
+  kgreenlandic: 0x0138,
+  khabengali: 0x0996,
+  khacyrillic: 0x0445,
+  khadeva: 0x0916,
+  khagujarati: 0x0A96,
+  khagurmukhi: 0x0A16,
+  khaharabic: 0x062E,
+  khahfinalarabic: 0xFEA6,
+  khahinitialarabic: 0xFEA7,
+  khahmedialarabic: 0xFEA8,
+  kheicoptic: 0x03E7,
+  khhadeva: 0x0959,
+  khhagurmukhi: 0x0A59,
+  khieukhacirclekorean: 0x3278,
+  khieukhaparenkorean: 0x3218,
+  khieukhcirclekorean: 0x326A,
+  khieukhkorean: 0x314B,
+  khieukhparenkorean: 0x320A,
+  khokhaithai: 0x0E02,
+  khokhonthai: 0x0E05,
+  khokhuatthai: 0x0E03,
+  khokhwaithai: 0x0E04,
+  khomutthai: 0x0E5B,
+  khook: 0x0199,
+  khorakhangthai: 0x0E06,
+  khzsquare: 0x3391,
+  kihiragana: 0x304D,
+  kikatakana: 0x30AD,
+  kikatakanahalfwidth: 0xFF77,
+  kiroguramusquare: 0x3315,
+  kiromeetorusquare: 0x3316,
+  kirosquare: 0x3314,
+  kiyeokacirclekorean: 0x326E,
+  kiyeokaparenkorean: 0x320E,
+  kiyeokcirclekorean: 0x3260,
+  kiyeokkorean: 0x3131,
+  kiyeokparenkorean: 0x3200,
+  kiyeoksioskorean: 0x3133,
+  kjecyrillic: 0x045C,
+  klinebelow: 0x1E35,
+  klsquare: 0x3398,
+  kmcubedsquare: 0x33A6,
+  kmonospace: 0xFF4B,
+  kmsquaredsquare: 0x33A2,
+  kohiragana: 0x3053,
+  kohmsquare: 0x33C0,
+  kokaithai: 0x0E01,
+  kokatakana: 0x30B3,
+  kokatakanahalfwidth: 0xFF7A,
+  kooposquare: 0x331E,
+  koppacyrillic: 0x0481,
+  koreanstandardsymbol: 0x327F,
+  koroniscmb: 0x0343,
+  kparen: 0x24A6,
+  kpasquare: 0x33AA,
+  ksicyrillic: 0x046F,
+  ktsquare: 0x33CF,
+  kturned: 0x029E,
+  kuhiragana: 0x304F,
+  kukatakana: 0x30AF,
+  kukatakanahalfwidth: 0xFF78,
+  kvsquare: 0x33B8,
+  kwsquare: 0x33BE,
+  l: 0x006C,
+  labengali: 0x09B2,
+  lacute: 0x013A,
+  ladeva: 0x0932,
+  lagujarati: 0x0AB2,
+  lagurmukhi: 0x0A32,
+  lakkhangyaothai: 0x0E45,
+  lamaleffinalarabic: 0xFEFC,
+  lamalefhamzaabovefinalarabic: 0xFEF8,
+  lamalefhamzaaboveisolatedarabic: 0xFEF7,
+  lamalefhamzabelowfinalarabic: 0xFEFA,
+  lamalefhamzabelowisolatedarabic: 0xFEF9,
+  lamalefisolatedarabic: 0xFEFB,
+  lamalefmaddaabovefinalarabic: 0xFEF6,
+  lamalefmaddaaboveisolatedarabic: 0xFEF5,
+  lamarabic: 0x0644,
+  lambda: 0x03BB,
+  lambdastroke: 0x019B,
+  lamed: 0x05DC,
+  lameddagesh: 0xFB3C,
+  lameddageshhebrew: 0xFB3C,
+  lamedhebrew: 0x05DC,
+  lamedholam: 0x05DC05B9,
+  lamedholamdagesh: '05DC 05B9 05BC',
+  lamedholamdageshhebrew: '05DC 05B9 05BC',
+  lamedholamhebrew: 0x05DC05B9,
+  lamfinalarabic: 0xFEDE,
+  lamhahinitialarabic: 0xFCCA,
+  laminitialarabic: 0xFEDF,
+  lamjeeminitialarabic: 0xFCC9,
+  lamkhahinitialarabic: 0xFCCB,
+  lamlamhehisolatedarabic: 0xFDF2,
+  lammedialarabic: 0xFEE0,
+  lammeemhahinitialarabic: 0xFD88,
+  lammeeminitialarabic: 0xFCCC,
+  lammeemjeeminitialarabic: 'FEDF FEE4 FEA0',
+  lammeemkhahinitialarabic: 'FEDF FEE4 FEA8',
+  largecircle: 0x25EF,
+  lbar: 0x019A,
+  lbelt: 0x026C,
+  lbopomofo: 0x310C,
+  lcaron: 0x013E,
+  lcedilla: 0x013C,
+  lcircle: 0x24DB,
+  lcircumflexbelow: 0x1E3D,
+  lcommaaccent: 0x013C,
+  ldot: 0x0140,
+  ldotaccent: 0x0140,
+  ldotbelow: 0x1E37,
+  ldotbelowmacron: 0x1E39,
+  leftangleabovecmb: 0x031A,
+  lefttackbelowcmb: 0x0318,
+  less: 0x003C,
+  lessequal: 0x2264,
+  lessequalorgreater: 0x22DA,
+  lessmonospace: 0xFF1C,
+  lessorequivalent: 0x2272,
+  lessorgreater: 0x2276,
+  lessoverequal: 0x2266,
+  lesssmall: 0xFE64,
+  lezh: 0x026E,
+  lfblock: 0x258C,
+  lhookretroflex: 0x026D,
+  lira: 0x20A4,
+  liwnarmenian: 0x056C,
+  lj: 0x01C9,
+  ljecyrillic: 0x0459,
+  ll: 0xF6C0,
+  lladeva: 0x0933,
+  llagujarati: 0x0AB3,
+  llinebelow: 0x1E3B,
+  llladeva: 0x0934,
+  llvocalicbengali: 0x09E1,
+  llvocalicdeva: 0x0961,
+  llvocalicvowelsignbengali: 0x09E3,
+  llvocalicvowelsigndeva: 0x0963,
+  lmiddletilde: 0x026B,
+  lmonospace: 0xFF4C,
+  lmsquare: 0x33D0,
+  lochulathai: 0x0E2C,
+  logicaland: 0x2227,
+  logicalnot: 0x00AC,
+  logicalnotreversed: 0x2310,
+  logicalor: 0x2228,
+  lolingthai: 0x0E25,
+  longs: 0x017F,
+  lowlinecenterline: 0xFE4E,
+  lowlinecmb: 0x0332,
+  lowlinedashed: 0xFE4D,
+  lozenge: 0x25CA,
+  lparen: 0x24A7,
+  lslash: 0x0142,
+  lsquare: 0x2113,
+  lsuperior: 0xF6EE,
+  ltshade: 0x2591,
+  luthai: 0x0E26,
+  lvocalicbengali: 0x098C,
+  lvocalicdeva: 0x090C,
+  lvocalicvowelsignbengali: 0x09E2,
+  lvocalicvowelsigndeva: 0x0962,
+  lxsquare: 0x33D3,
+  m: 0x006D,
+  mabengali: 0x09AE,
+  macron: 0x00AF,
+  macronbelowcmb: 0x0331,
+  macroncmb: 0x0304,
+  macronlowmod: 0x02CD,
+  macronmonospace: 0xFFE3,
+  macute: 0x1E3F,
+  madeva: 0x092E,
+  magujarati: 0x0AAE,
+  magurmukhi: 0x0A2E,
+  mahapakhhebrew: 0x05A4,
+  mahapakhlefthebrew: 0x05A4,
+  mahiragana: 0x307E,
+  maichattawalowleftthai: 0xF895,
+  maichattawalowrightthai: 0xF894,
+  maichattawathai: 0x0E4B,
+  maichattawaupperleftthai: 0xF893,
+  maieklowleftthai: 0xF88C,
+  maieklowrightthai: 0xF88B,
+  maiekthai: 0x0E48,
+  maiekupperleftthai: 0xF88A,
+  maihanakatleftthai: 0xF884,
+  maihanakatthai: 0x0E31,
+  maitaikhuleftthai: 0xF889,
+  maitaikhuthai: 0x0E47,
+  maitholowleftthai: 0xF88F,
+  maitholowrightthai: 0xF88E,
+  maithothai: 0x0E49,
+  maithoupperleftthai: 0xF88D,
+  maitrilowleftthai: 0xF892,
+  maitrilowrightthai: 0xF891,
+  maitrithai: 0x0E4A,
+  maitriupperleftthai: 0xF890,
+  maiyamokthai: 0x0E46,
+  makatakana: 0x30DE,
+  makatakanahalfwidth: 0xFF8F,
+  male: 0x2642,
+  mansyonsquare: 0x3347,
+  maqafhebrew: 0x05BE,
+  mars: 0x2642,
+  masoracirclehebrew: 0x05AF,
+  masquare: 0x3383,
+  mbopomofo: 0x3107,
+  mbsquare: 0x33D4,
+  mcircle: 0x24DC,
+  mcubedsquare: 0x33A5,
+  mdotaccent: 0x1E41,
+  mdotbelow: 0x1E43,
+  meemarabic: 0x0645,
+  meemfinalarabic: 0xFEE2,
+  meeminitialarabic: 0xFEE3,
+  meemmedialarabic: 0xFEE4,
+  meemmeeminitialarabic: 0xFCD1,
+  meemmeemisolatedarabic: 0xFC48,
+  meetorusquare: 0x334D,
+  mehiragana: 0x3081,
+  meizierasquare: 0x337E,
+  mekatakana: 0x30E1,
+  mekatakanahalfwidth: 0xFF92,
+  mem: 0x05DE,
+  memdagesh: 0xFB3E,
+  memdageshhebrew: 0xFB3E,
+  memhebrew: 0x05DE,
+  menarmenian: 0x0574,
+  merkhahebrew: 0x05A5,
+  merkhakefulahebrew: 0x05A6,
+  merkhakefulalefthebrew: 0x05A6,
+  merkhalefthebrew: 0x05A5,
+  mhook: 0x0271,
+  mhzsquare: 0x3392,
+  middledotkatakanahalfwidth: 0xFF65,
+  middot: 0x00B7,
+  mieumacirclekorean: 0x3272,
+  mieumaparenkorean: 0x3212,
+  mieumcirclekorean: 0x3264,
+  mieumkorean: 0x3141,
+  mieumpansioskorean: 0x3170,
+  mieumparenkorean: 0x3204,
+  mieumpieupkorean: 0x316E,
+  mieumsioskorean: 0x316F,
+  mihiragana: 0x307F,
+  mikatakana: 0x30DF,
+  mikatakanahalfwidth: 0xFF90,
+  minus: 0x2212,
+  minusbelowcmb: 0x0320,
+  minuscircle: 0x2296,
+  minusmod: 0x02D7,
+  minusplus: 0x2213,
+  minute: 0x2032,
+  miribaarusquare: 0x334A,
+  mirisquare: 0x3349,
+  mlonglegturned: 0x0270,
+  mlsquare: 0x3396,
+  mmcubedsquare: 0x33A3,
+  mmonospace: 0xFF4D,
+  mmsquaredsquare: 0x339F,
+  mohiragana: 0x3082,
+  mohmsquare: 0x33C1,
+  mokatakana: 0x30E2,
+  mokatakanahalfwidth: 0xFF93,
+  molsquare: 0x33D6,
+  momathai: 0x0E21,
+  moverssquare: 0x33A7,
+  moverssquaredsquare: 0x33A8,
+  mparen: 0x24A8,
+  mpasquare: 0x33AB,
+  mssquare: 0x33B3,
+  msuperior: 0xF6EF,
+  mturned: 0x026F,
+  mu: 0x00B5,
+  mu1: 0x00B5,
+  muasquare: 0x3382,
+  muchgreater: 0x226B,
+  muchless: 0x226A,
+  mufsquare: 0x338C,
+  mugreek: 0x03BC,
+  mugsquare: 0x338D,
+  muhiragana: 0x3080,
+  mukatakana: 0x30E0,
+  mukatakanahalfwidth: 0xFF91,
+  mulsquare: 0x3395,
+  multiply: 0x00D7,
+  mumsquare: 0x339B,
+  munahhebrew: 0x05A3,
+  munahlefthebrew: 0x05A3,
+  musicalnote: 0x266A,
+  musicalnotedbl: 0x266B,
+  musicflatsign: 0x266D,
+  musicsharpsign: 0x266F,
+  mussquare: 0x33B2,
+  muvsquare: 0x33B6,
+  muwsquare: 0x33BC,
+  mvmegasquare: 0x33B9,
+  mvsquare: 0x33B7,
+  mwmegasquare: 0x33BF,
+  mwsquare: 0x33BD,
+  n: 0x006E,
+  nabengali: 0x09A8,
+  nabla: 0x2207,
+  nacute: 0x0144,
+  nadeva: 0x0928,
+  nagujarati: 0x0AA8,
+  nagurmukhi: 0x0A28,
+  nahiragana: 0x306A,
+  nakatakana: 0x30CA,
+  nakatakanahalfwidth: 0xFF85,
+  napostrophe: 0x0149,
+  nasquare: 0x3381,
+  nbopomofo: 0x310B,
+  nbspace: 0x00A0,
+  ncaron: 0x0148,
+  ncedilla: 0x0146,
+  ncircle: 0x24DD,
+  ncircumflexbelow: 0x1E4B,
+  ncommaaccent: 0x0146,
+  ndotaccent: 0x1E45,
+  ndotbelow: 0x1E47,
+  nehiragana: 0x306D,
+  nekatakana: 0x30CD,
+  nekatakanahalfwidth: 0xFF88,
+  newsheqelsign: 0x20AA,
+  nfsquare: 0x338B,
+  ngabengali: 0x0999,
+  ngadeva: 0x0919,
+  ngagujarati: 0x0A99,
+  ngagurmukhi: 0x0A19,
+  ngonguthai: 0x0E07,
+  nhiragana: 0x3093,
+  nhookleft: 0x0272,
+  nhookretroflex: 0x0273,
+  nieunacirclekorean: 0x326F,
+  nieunaparenkorean: 0x320F,
+  nieuncieuckorean: 0x3135,
+  nieuncirclekorean: 0x3261,
+  nieunhieuhkorean: 0x3136,
+  nieunkorean: 0x3134,
+  nieunpansioskorean: 0x3168,
+  nieunparenkorean: 0x3201,
+  nieunsioskorean: 0x3167,
+  nieuntikeutkorean: 0x3166,
+  nihiragana: 0x306B,
+  nikatakana: 0x30CB,
+  nikatakanahalfwidth: 0xFF86,
+  nikhahitleftthai: 0xF899,
+  nikhahitthai: 0x0E4D,
+  nine: 0x0039,
+  ninearabic: 0x0669,
+  ninebengali: 0x09EF,
+  ninecircle: 0x2468,
+  ninecircleinversesansserif: 0x2792,
+  ninedeva: 0x096F,
+  ninegujarati: 0x0AEF,
+  ninegurmukhi: 0x0A6F,
+  ninehackarabic: 0x0669,
+  ninehangzhou: 0x3029,
+  nineideographicparen: 0x3228,
+  nineinferior: 0x2089,
+  ninemonospace: 0xFF19,
+  nineoldstyle: 0xF739,
+  nineparen: 0x247C,
+  nineperiod: 0x2490,
+  ninepersian: 0x06F9,
+  nineroman: 0x2178,
+  ninesuperior: 0x2079,
+  nineteencircle: 0x2472,
+  nineteenparen: 0x2486,
+  nineteenperiod: 0x249A,
+  ninethai: 0x0E59,
+  nj: 0x01CC,
+  njecyrillic: 0x045A,
+  nkatakana: 0x30F3,
+  nkatakanahalfwidth: 0xFF9D,
+  nlegrightlong: 0x019E,
+  nlinebelow: 0x1E49,
+  nmonospace: 0xFF4E,
+  nmsquare: 0x339A,
+  nnabengali: 0x09A3,
+  nnadeva: 0x0923,
+  nnagujarati: 0x0AA3,
+  nnagurmukhi: 0x0A23,
+  nnnadeva: 0x0929,
+  nohiragana: 0x306E,
+  nokatakana: 0x30CE,
+  nokatakanahalfwidth: 0xFF89,
+  nonbreakingspace: 0x00A0,
+  nonenthai: 0x0E13,
+  nonuthai: 0x0E19,
+  noonarabic: 0x0646,
+  noonfinalarabic: 0xFEE6,
+  noonghunnaarabic: 0x06BA,
+  noonghunnafinalarabic: 0xFB9F,
+  noonhehinitialarabic: 0xFEE7FEEC,
+  nooninitialarabic: 0xFEE7,
+  noonjeeminitialarabic: 0xFCD2,
+  noonjeemisolatedarabic: 0xFC4B,
+  noonmedialarabic: 0xFEE8,
+  noonmeeminitialarabic: 0xFCD5,
+  noonmeemisolatedarabic: 0xFC4E,
+  noonnoonfinalarabic: 0xFC8D,
+  notcontains: 0x220C,
+  notelement: 0x2209,
+  notelementof: 0x2209,
+  notequal: 0x2260,
+  notgreater: 0x226F,
+  notgreaternorequal: 0x2271,
+  notgreaternorless: 0x2279,
+  notidentical: 0x2262,
+  notless: 0x226E,
+  notlessnorequal: 0x2270,
+  notparallel: 0x2226,
+  notprecedes: 0x2280,
+  notsubset: 0x2284,
+  notsucceeds: 0x2281,
+  notsuperset: 0x2285,
+  nowarmenian: 0x0576,
+  nparen: 0x24A9,
+  nssquare: 0x33B1,
+  nsuperior: 0x207F,
+  ntilde: 0x00F1,
+  nu: 0x03BD,
+  nuhiragana: 0x306C,
+  nukatakana: 0x30CC,
+  nukatakanahalfwidth: 0xFF87,
+  nuktabengali: 0x09BC,
+  nuktadeva: 0x093C,
+  nuktagujarati: 0x0ABC,
+  nuktagurmukhi: 0x0A3C,
+  numbersign: 0x0023,
+  numbersignmonospace: 0xFF03,
+  numbersignsmall: 0xFE5F,
+  numeralsigngreek: 0x0374,
+  numeralsignlowergreek: 0x0375,
+  numero: 0x2116,
+  nun: 0x05E0,
+  nundagesh: 0xFB40,
+  nundageshhebrew: 0xFB40,
+  nunhebrew: 0x05E0,
+  nvsquare: 0x33B5,
+  nwsquare: 0x33BB,
+  nyabengali: 0x099E,
+  nyadeva: 0x091E,
+  nyagujarati: 0x0A9E,
+  nyagurmukhi: 0x0A1E,
+  o: 0x006F,
+  oacute: 0x00F3,
+  oangthai: 0x0E2D,
+  obarred: 0x0275,
+  obarredcyrillic: 0x04E9,
+  obarreddieresiscyrillic: 0x04EB,
+  obengali: 0x0993,
+  obopomofo: 0x311B,
+  obreve: 0x014F,
+  ocandradeva: 0x0911,
+  ocandragujarati: 0x0A91,
+  ocandravowelsigndeva: 0x0949,
+  ocandravowelsigngujarati: 0x0AC9,
+  ocaron: 0x01D2,
+  ocircle: 0x24DE,
+  ocircumflex: 0x00F4,
+  ocircumflexacute: 0x1ED1,
+  ocircumflexdotbelow: 0x1ED9,
+  ocircumflexgrave: 0x1ED3,
+  ocircumflexhookabove: 0x1ED5,
+  ocircumflextilde: 0x1ED7,
+  ocyrillic: 0x043E,
+  odblacute: 0x0151,
+  odblgrave: 0x020D,
+  odeva: 0x0913,
+  odieresis: 0x00F6,
+  odieresiscyrillic: 0x04E7,
+  odotbelow: 0x1ECD,
+  oe: 0x0153,
+  oekorean: 0x315A,
+  ogonek: 0x02DB,
+  ogonekcmb: 0x0328,
+  ograve: 0x00F2,
+  ogujarati: 0x0A93,
+  oharmenian: 0x0585,
+  ohiragana: 0x304A,
+  ohookabove: 0x1ECF,
+  ohorn: 0x01A1,
+  ohornacute: 0x1EDB,
+  ohorndotbelow: 0x1EE3,
+  ohorngrave: 0x1EDD,
+  ohornhookabove: 0x1EDF,
+  ohorntilde: 0x1EE1,
+  ohungarumlaut: 0x0151,
+  oi: 0x01A3,
+  oinvertedbreve: 0x020F,
+  okatakana: 0x30AA,
+  okatakanahalfwidth: 0xFF75,
+  okorean: 0x3157,
+  olehebrew: 0x05AB,
+  omacron: 0x014D,
+  omacronacute: 0x1E53,
+  omacrongrave: 0x1E51,
+  omdeva: 0x0950,
+  omega: 0x03C9,
+  omega1: 0x03D6,
+  omegacyrillic: 0x0461,
+  omegalatinclosed: 0x0277,
+  omegaroundcyrillic: 0x047B,
+  omegatitlocyrillic: 0x047D,
+  omegatonos: 0x03CE,
+  omgujarati: 0x0AD0,
+  omicron: 0x03BF,
+  omicrontonos: 0x03CC,
+  omonospace: 0xFF4F,
+  one: 0x0031,
+  onearabic: 0x0661,
+  onebengali: 0x09E7,
+  onecircle: 0x2460,
+  onecircleinversesansserif: 0x278A,
+  onedeva: 0x0967,
+  onedotenleader: 0x2024,
+  oneeighth: 0x215B,
+  onefitted: 0xF6DC,
+  onegujarati: 0x0AE7,
+  onegurmukhi: 0x0A67,
+  onehackarabic: 0x0661,
+  onehalf: 0x00BD,
+  onehangzhou: 0x3021,
+  oneideographicparen: 0x3220,
+  oneinferior: 0x2081,
+  onemonospace: 0xFF11,
+  onenumeratorbengali: 0x09F4,
+  oneoldstyle: 0xF731,
+  oneparen: 0x2474,
+  oneperiod: 0x2488,
+  onepersian: 0x06F1,
+  onequarter: 0x00BC,
+  oneroman: 0x2170,
+  onesuperior: 0x00B9,
+  onethai: 0x0E51,
+  onethird: 0x2153,
+  oogonek: 0x01EB,
+  oogonekmacron: 0x01ED,
+  oogurmukhi: 0x0A13,
+  oomatragurmukhi: 0x0A4B,
+  oopen: 0x0254,
+  oparen: 0x24AA,
+  openbullet: 0x25E6,
+  option: 0x2325,
+  ordfeminine: 0x00AA,
+  ordmasculine: 0x00BA,
+  orthogonal: 0x221F,
+  oshortdeva: 0x0912,
+  oshortvowelsigndeva: 0x094A,
+  oslash: 0x00F8,
+  oslashacute: 0x01FF,
+  osmallhiragana: 0x3049,
+  osmallkatakana: 0x30A9,
+  osmallkatakanahalfwidth: 0xFF6B,
+  ostrokeacute: 0x01FF,
+  osuperior: 0xF6F0,
+  otcyrillic: 0x047F,
+  otilde: 0x00F5,
+  otildeacute: 0x1E4D,
+  otildedieresis: 0x1E4F,
+  oubopomofo: 0x3121,
+  overline: 0x203E,
+  overlinecenterline: 0xFE4A,
+  overlinecmb: 0x0305,
+  overlinedashed: 0xFE49,
+  overlinedblwavy: 0xFE4C,
+  overlinewavy: 0xFE4B,
+  overscore: 0x00AF,
+  ovowelsignbengali: 0x09CB,
+  ovowelsigndeva: 0x094B,
+  ovowelsigngujarati: 0x0ACB,
+  p: 0x0070,
+  paampssquare: 0x3380,
+  paasentosquare: 0x332B,
+  pabengali: 0x09AA,
+  pacute: 0x1E55,
+  padeva: 0x092A,
+  pagedown: 0x21DF,
+  pageup: 0x21DE,
+  pagujarati: 0x0AAA,
+  pagurmukhi: 0x0A2A,
+  pahiragana: 0x3071,
+  paiyannoithai: 0x0E2F,
+  pakatakana: 0x30D1,
+  palatalizationcyrilliccmb: 0x0484,
+  palochkacyrillic: 0x04C0,
+  pansioskorean: 0x317F,
+  paragraph: 0x00B6,
+  parallel: 0x2225,
+  parenleft: 0x0028,
+  parenleftaltonearabic: 0xFD3E,
+  parenleftbt: 0xF8ED,
+  parenleftex: 0xF8EC,
+  parenleftinferior: 0x208D,
+  parenleftmonospace: 0xFF08,
+  parenleftsmall: 0xFE59,
+  parenleftsuperior: 0x207D,
+  parenlefttp: 0xF8EB,
+  parenleftvertical: 0xFE35,
+  parenright: 0x0029,
+  parenrightaltonearabic: 0xFD3F,
+  parenrightbt: 0xF8F8,
+  parenrightex: 0xF8F7,
+  parenrightinferior: 0x208E,
+  parenrightmonospace: 0xFF09,
+  parenrightsmall: 0xFE5A,
+  parenrightsuperior: 0x207E,
+  parenrighttp: 0xF8F6,
+  parenrightvertical: 0xFE36,
+  partialdiff: 0x2202,
+  paseqhebrew: 0x05C0,
+  pashtahebrew: 0x0599,
+  pasquare: 0x33A9,
+  patah: 0x05B7,
+  patah11: 0x05B7,
+  patah1d: 0x05B7,
+  patah2a: 0x05B7,
+  patahhebrew: 0x05B7,
+  patahnarrowhebrew: 0x05B7,
+  patahquarterhebrew: 0x05B7,
+  patahwidehebrew: 0x05B7,
+  pazerhebrew: 0x05A1,
+  pbopomofo: 0x3106,
+  pcircle: 0x24DF,
+  pdotaccent: 0x1E57,
+  pe: 0x05E4,
+  pecyrillic: 0x043F,
+  pedagesh: 0xFB44,
+  pedageshhebrew: 0xFB44,
+  peezisquare: 0x333B,
+  pefinaldageshhebrew: 0xFB43,
+  peharabic: 0x067E,
+  peharmenian: 0x057A,
+  pehebrew: 0x05E4,
+  pehfinalarabic: 0xFB57,
+  pehinitialarabic: 0xFB58,
+  pehiragana: 0x307A,
+  pehmedialarabic: 0xFB59,
+  pekatakana: 0x30DA,
+  pemiddlehookcyrillic: 0x04A7,
+  perafehebrew: 0xFB4E,
+  percent: 0x0025,
+  percentarabic: 0x066A,
+  percentmonospace: 0xFF05,
+  percentsmall: 0xFE6A,
+  period: 0x002E,
+  periodarmenian: 0x0589,
+  periodcentered: 0x00B7,
+  periodhalfwidth: 0xFF61,
+  periodinferior: 0xF6E7,
+  periodmonospace: 0xFF0E,
+  periodsmall: 0xFE52,
+  periodsuperior: 0xF6E8,
+  perispomenigreekcmb: 0x0342,
+  perpendicular: 0x22A5,
+  perthousand: 0x2030,
+  peseta: 0x20A7,
+  pfsquare: 0x338A,
+  phabengali: 0x09AB,
+  phadeva: 0x092B,
+  phagujarati: 0x0AAB,
+  phagurmukhi: 0x0A2B,
+  phi: 0x03C6,
+  phi1: 0x03D5,
+  phieuphacirclekorean: 0x327A,
+  phieuphaparenkorean: 0x321A,
+  phieuphcirclekorean: 0x326C,
+  phieuphkorean: 0x314D,
+  phieuphparenkorean: 0x320C,
+  philatin: 0x0278,
+  phinthuthai: 0x0E3A,
+  phisymbolgreek: 0x03D5,
+  phook: 0x01A5,
+  phophanthai: 0x0E1E,
+  phophungthai: 0x0E1C,
+  phosamphaothai: 0x0E20,
+  pi: 0x03C0,
+  pieupacirclekorean: 0x3273,
+  pieupaparenkorean: 0x3213,
+  pieupcieuckorean: 0x3176,
+  pieupcirclekorean: 0x3265,
+  pieupkiyeokkorean: 0x3172,
+  pieupkorean: 0x3142,
+  pieupparenkorean: 0x3205,
+  pieupsioskiyeokkorean: 0x3174,
+  pieupsioskorean: 0x3144,
+  pieupsiostikeutkorean: 0x3175,
+  pieupthieuthkorean: 0x3177,
+  pieuptikeutkorean: 0x3173,
+  pihiragana: 0x3074,
+  pikatakana: 0x30D4,
+  pisymbolgreek: 0x03D6,
+  piwrarmenian: 0x0583,
+  plus: 0x002B,
+  plusbelowcmb: 0x031F,
+  pluscircle: 0x2295,
+  plusminus: 0x00B1,
+  plusmod: 0x02D6,
+  plusmonospace: 0xFF0B,
+  plussmall: 0xFE62,
+  plussuperior: 0x207A,
+  pmonospace: 0xFF50,
+  pmsquare: 0x33D8,
+  pohiragana: 0x307D,
+  pointingindexdownwhite: 0x261F,
+  pointingindexleftwhite: 0x261C,
+  pointingindexrightwhite: 0x261E,
+  pointingindexupwhite: 0x261D,
+  pokatakana: 0x30DD,
+  poplathai: 0x0E1B,
+  postalmark: 0x3012,
+  postalmarkface: 0x3020,
+  pparen: 0x24AB,
+  precedes: 0x227A,
+  prescription: 0x211E,
+  primemod: 0x02B9,
+  primereversed: 0x2035,
+  product: 0x220F,
+  projective: 0x2305,
+  prolongedkana: 0x30FC,
+  propellor: 0x2318,
+  propersubset: 0x2282,
+  propersuperset: 0x2283,
+  proportion: 0x2237,
+  proportional: 0x221D,
+  psi: 0x03C8,
+  psicyrillic: 0x0471,
+  psilipneumatacyrilliccmb: 0x0486,
+  pssquare: 0x33B0,
+  puhiragana: 0x3077,
+  pukatakana: 0x30D7,
+  pvsquare: 0x33B4,
+  pwsquare: 0x33BA,
+  q: 0x0071,
+  qadeva: 0x0958,
+  qadmahebrew: 0x05A8,
+  qafarabic: 0x0642,
+  qaffinalarabic: 0xFED6,
+  qafinitialarabic: 0xFED7,
+  qafmedialarabic: 0xFED8,
+  qamats: 0x05B8,
+  qamats10: 0x05B8,
+  qamats1a: 0x05B8,
+  qamats1c: 0x05B8,
+  qamats27: 0x05B8,
+  qamats29: 0x05B8,
+  qamats33: 0x05B8,
+  qamatsde: 0x05B8,
+  qamatshebrew: 0x05B8,
+  qamatsnarrowhebrew: 0x05B8,
+  qamatsqatanhebrew: 0x05B8,
+  qamatsqatannarrowhebrew: 0x05B8,
+  qamatsqatanquarterhebrew: 0x05B8,
+  qamatsqatanwidehebrew: 0x05B8,
+  qamatsquarterhebrew: 0x05B8,
+  qamatswidehebrew: 0x05B8,
+  qarneyparahebrew: 0x059F,
+  qbopomofo: 0x3111,
+  qcircle: 0x24E0,
+  qhook: 0x02A0,
+  qmonospace: 0xFF51,
+  qof: 0x05E7,
+  qofdagesh: 0xFB47,
+  qofdageshhebrew: 0xFB47,
+  qofhatafpatah: 0x05E705B2,
+  qofhatafpatahhebrew: 0x05E705B2,
+  qofhatafsegol: 0x05E705B1,
+  qofhatafsegolhebrew: 0x05E705B1,
+  qofhebrew: 0x05E7,
+  qofhiriq: 0x05E705B4,
+  qofhiriqhebrew: 0x05E705B4,
+  qofholam: 0x05E705B9,
+  qofholamhebrew: 0x05E705B9,
+  qofpatah: 0x05E705B7,
+  qofpatahhebrew: 0x05E705B7,
+  qofqamats: 0x05E705B8,
+  qofqamatshebrew: 0x05E705B8,
+  qofqubuts: 0x05E705BB,
+  qofqubutshebrew: 0x05E705BB,
+  qofsegol: 0x05E705B6,
+  qofsegolhebrew: 0x05E705B6,
+  qofsheva: 0x05E705B0,
+  qofshevahebrew: 0x05E705B0,
+  qoftsere: 0x05E705B5,
+  qoftserehebrew: 0x05E705B5,
+  qparen: 0x24AC,
+  quarternote: 0x2669,
+  qubuts: 0x05BB,
+  qubuts18: 0x05BB,
+  qubuts25: 0x05BB,
+  qubuts31: 0x05BB,
+  qubutshebrew: 0x05BB,
+  qubutsnarrowhebrew: 0x05BB,
+  qubutsquarterhebrew: 0x05BB,
+  qubutswidehebrew: 0x05BB,
+  question: 0x003F,
+  questionarabic: 0x061F,
+  questionarmenian: 0x055E,
+  questiondown: 0x00BF,
+  questiondownsmall: 0xF7BF,
+  questiongreek: 0x037E,
+  questionmonospace: 0xFF1F,
+  questionsmall: 0xF73F,
+  quotedbl: 0x0022,
+  quotedblbase: 0x201E,
+  quotedblleft: 0x201C,
+  quotedblmonospace: 0xFF02,
+  quotedblprime: 0x301E,
+  quotedblprimereversed: 0x301D,
+  quotedblright: 0x201D,
+  quoteleft: 0x2018,
+  quoteleftreversed: 0x201B,
+  quotereversed: 0x201B,
+  quoteright: 0x2019,
+  quoterightn: 0x0149,
+  quotesinglbase: 0x201A,
+  quotesingle: 0x0027,
+  quotesinglemonospace: 0xFF07,
+  r: 0x0072,
+  raarmenian: 0x057C,
+  rabengali: 0x09B0,
+  racute: 0x0155,
+  radeva: 0x0930,
+  radical: 0x221A,
+  radicalex: 0xF8E5,
+  radoverssquare: 0x33AE,
+  radoverssquaredsquare: 0x33AF,
+  radsquare: 0x33AD,
+  rafe: 0x05BF,
+  rafehebrew: 0x05BF,
+  ragujarati: 0x0AB0,
+  ragurmukhi: 0x0A30,
+  rahiragana: 0x3089,
+  rakatakana: 0x30E9,
+  rakatakanahalfwidth: 0xFF97,
+  ralowerdiagonalbengali: 0x09F1,
+  ramiddlediagonalbengali: 0x09F0,
+  ramshorn: 0x0264,
+  ratio: 0x2236,
+  rbopomofo: 0x3116,
+  rcaron: 0x0159,
+  rcedilla: 0x0157,
+  rcircle: 0x24E1,
+  rcommaaccent: 0x0157,
+  rdblgrave: 0x0211,
+  rdotaccent: 0x1E59,
+  rdotbelow: 0x1E5B,
+  rdotbelowmacron: 0x1E5D,
+  referencemark: 0x203B,
+  reflexsubset: 0x2286,
+  reflexsuperset: 0x2287,
+  registered: 0x00AE,
+  registersans: 0xF8E8,
+  registerserif: 0xF6DA,
+  reharabic: 0x0631,
+  reharmenian: 0x0580,
+  rehfinalarabic: 0xFEAE,
+  rehiragana: 0x308C,
+  rehyehaleflamarabic: '0631 FEF3 FE8E 0644',
+  rekatakana: 0x30EC,
+  rekatakanahalfwidth: 0xFF9A,
+  resh: 0x05E8,
+  reshdageshhebrew: 0xFB48,
+  reshhatafpatah: 0x05E805B2,
+  reshhatafpatahhebrew: 0x05E805B2,
+  reshhatafsegol: 0x05E805B1,
+  reshhatafsegolhebrew: 0x05E805B1,
+  reshhebrew: 0x05E8,
+  reshhiriq: 0x05E805B4,
+  reshhiriqhebrew: 0x05E805B4,
+  reshholam: 0x05E805B9,
+  reshholamhebrew: 0x05E805B9,
+  reshpatah: 0x05E805B7,
+  reshpatahhebrew: 0x05E805B7,
+  reshqamats: 0x05E805B8,
+  reshqamatshebrew: 0x05E805B8,
+  reshqubuts: 0x05E805BB,
+  reshqubutshebrew: 0x05E805BB,
+  reshsegol: 0x05E805B6,
+  reshsegolhebrew: 0x05E805B6,
+  reshsheva: 0x05E805B0,
+  reshshevahebrew: 0x05E805B0,
+  reshtsere: 0x05E805B5,
+  reshtserehebrew: 0x05E805B5,
+  reversedtilde: 0x223D,
+  reviahebrew: 0x0597,
+  reviamugrashhebrew: 0x0597,
+  revlogicalnot: 0x2310,
+  rfishhook: 0x027E,
+  rfishhookreversed: 0x027F,
+  rhabengali: 0x09DD,
+  rhadeva: 0x095D,
+  rho: 0x03C1,
+  rhook: 0x027D,
+  rhookturned: 0x027B,
+  rhookturnedsuperior: 0x02B5,
+  rhosymbolgreek: 0x03F1,
+  rhotichookmod: 0x02DE,
+  rieulacirclekorean: 0x3271,
+  rieulaparenkorean: 0x3211,
+  rieulcirclekorean: 0x3263,
+  rieulhieuhkorean: 0x3140,
+  rieulkiyeokkorean: 0x313A,
+  rieulkiyeoksioskorean: 0x3169,
+  rieulkorean: 0x3139,
+  rieulmieumkorean: 0x313B,
+  rieulpansioskorean: 0x316C,
+  rieulparenkorean: 0x3203,
+  rieulphieuphkorean: 0x313F,
+  rieulpieupkorean: 0x313C,
+  rieulpieupsioskorean: 0x316B,
+  rieulsioskorean: 0x313D,
+  rieulthieuthkorean: 0x313E,
+  rieultikeutkorean: 0x316A,
+  rieulyeorinhieuhkorean: 0x316D,
+  rightangle: 0x221F,
+  righttackbelowcmb: 0x0319,
+  righttriangle: 0x22BF,
+  rihiragana: 0x308A,
+  rikatakana: 0x30EA,
+  rikatakanahalfwidth: 0xFF98,
+  ring: 0x02DA,
+  ringbelowcmb: 0x0325,
+  ringcmb: 0x030A,
+  ringhalfleft: 0x02BF,
+  ringhalfleftarmenian: 0x0559,
+  ringhalfleftbelowcmb: 0x031C,
+  ringhalfleftcentered: 0x02D3,
+  ringhalfright: 0x02BE,
+  ringhalfrightbelowcmb: 0x0339,
+  ringhalfrightcentered: 0x02D2,
+  rinvertedbreve: 0x0213,
+  rittorusquare: 0x3351,
+  rlinebelow: 0x1E5F,
+  rlongleg: 0x027C,
+  rlonglegturned: 0x027A,
+  rmonospace: 0xFF52,
+  rohiragana: 0x308D,
+  rokatakana: 0x30ED,
+  rokatakanahalfwidth: 0xFF9B,
+  roruathai: 0x0E23,
+  rparen: 0x24AD,
+  rrabengali: 0x09DC,
+  rradeva: 0x0931,
+  rragurmukhi: 0x0A5C,
+  rreharabic: 0x0691,
+  rrehfinalarabic: 0xFB8D,
+  rrvocalicbengali: 0x09E0,
+  rrvocalicdeva: 0x0960,
+  rrvocalicgujarati: 0x0AE0,
+  rrvocalicvowelsignbengali: 0x09C4,
+  rrvocalicvowelsigndeva: 0x0944,
+  rrvocalicvowelsigngujarati: 0x0AC4,
+  rsuperior: 0xF6F1,
+  rtblock: 0x2590,
+  rturned: 0x0279,
+  rturnedsuperior: 0x02B4,
+  ruhiragana: 0x308B,
+  rukatakana: 0x30EB,
+  rukatakanahalfwidth: 0xFF99,
+  rupeemarkbengali: 0x09F2,
+  rupeesignbengali: 0x09F3,
+  rupiah: 0xF6DD,
+  ruthai: 0x0E24,
+  rvocalicbengali: 0x098B,
+  rvocalicdeva: 0x090B,
+  rvocalicgujarati: 0x0A8B,
+  rvocalicvowelsignbengali: 0x09C3,
+  rvocalicvowelsigndeva: 0x0943,
+  rvocalicvowelsigngujarati: 0x0AC3,
+  s: 0x0073,
+  sabengali: 0x09B8,
+  sacute: 0x015B,
+  sacutedotaccent: 0x1E65,
+  sadarabic: 0x0635,
+  sadeva: 0x0938,
+  sadfinalarabic: 0xFEBA,
+  sadinitialarabic: 0xFEBB,
+  sadmedialarabic: 0xFEBC,
+  sagujarati: 0x0AB8,
+  sagurmukhi: 0x0A38,
+  sahiragana: 0x3055,
+  sakatakana: 0x30B5,
+  sakatakanahalfwidth: 0xFF7B,
+  sallallahoualayhewasallamarabic: 0xFDFA,
+  samekh: 0x05E1,
+  samekhdagesh: 0xFB41,
+  samekhdageshhebrew: 0xFB41,
+  samekhhebrew: 0x05E1,
+  saraaathai: 0x0E32,
+  saraaethai: 0x0E41,
+  saraaimaimalaithai: 0x0E44,
+  saraaimaimuanthai: 0x0E43,
+  saraamthai: 0x0E33,
+  saraathai: 0x0E30,
+  saraethai: 0x0E40,
+  saraiileftthai: 0xF886,
+  saraiithai: 0x0E35,
+  saraileftthai: 0xF885,
+  saraithai: 0x0E34,
+  saraothai: 0x0E42,
+  saraueeleftthai: 0xF888,
+  saraueethai: 0x0E37,
+  saraueleftthai: 0xF887,
+  sarauethai: 0x0E36,
+  sarauthai: 0x0E38,
+  sarauuthai: 0x0E39,
+  sbopomofo: 0x3119,
+  scaron: 0x0161,
+  scarondotaccent: 0x1E67,
+  scedilla: 0x015F,
+  schwa: 0x0259,
+  schwacyrillic: 0x04D9,
+  schwadieresiscyrillic: 0x04DB,
+  schwahook: 0x025A,
+  scircle: 0x24E2,
+  scircumflex: 0x015D,
+  scommaaccent: 0x0219,
+  sdotaccent: 0x1E61,
+  sdotbelow: 0x1E63,
+  sdotbelowdotaccent: 0x1E69,
+  seagullbelowcmb: 0x033C,
+  second: 0x2033,
+  secondtonechinese: 0x02CA,
+  section: 0x00A7,
+  seenarabic: 0x0633,
+  seenfinalarabic: 0xFEB2,
+  seeninitialarabic: 0xFEB3,
+  seenmedialarabic: 0xFEB4,
+  segol: 0x05B6,
+  segol13: 0x05B6,
+  segol1f: 0x05B6,
+  segol2c: 0x05B6,
+  segolhebrew: 0x05B6,
+  segolnarrowhebrew: 0x05B6,
+  segolquarterhebrew: 0x05B6,
+  segoltahebrew: 0x0592,
+  segolwidehebrew: 0x05B6,
+  seharmenian: 0x057D,
+  sehiragana: 0x305B,
+  sekatakana: 0x30BB,
+  sekatakanahalfwidth: 0xFF7E,
+  semicolon: 0x003B,
+  semicolonarabic: 0x061B,
+  semicolonmonospace: 0xFF1B,
+  semicolonsmall: 0xFE54,
+  semivoicedmarkkana: 0x309C,
+  semivoicedmarkkanahalfwidth: 0xFF9F,
+  sentisquare: 0x3322,
+  sentosquare: 0x3323,
+  seven: 0x0037,
+  sevenarabic: 0x0667,
+  sevenbengali: 0x09ED,
+  sevencircle: 0x2466,
+  sevencircleinversesansserif: 0x2790,
+  sevendeva: 0x096D,
+  seveneighths: 0x215E,
+  sevengujarati: 0x0AED,
+  sevengurmukhi: 0x0A6D,
+  sevenhackarabic: 0x0667,
+  sevenhangzhou: 0x3027,
+  sevenideographicparen: 0x3226,
+  seveninferior: 0x2087,
+  sevenmonospace: 0xFF17,
+  sevenoldstyle: 0xF737,
+  sevenparen: 0x247A,
+  sevenperiod: 0x248E,
+  sevenpersian: 0x06F7,
+  sevenroman: 0x2176,
+  sevensuperior: 0x2077,
+  seventeencircle: 0x2470,
+  seventeenparen: 0x2484,
+  seventeenperiod: 0x2498,
+  seventhai: 0x0E57,
+  sfthyphen: 0x00AD,
+  shaarmenian: 0x0577,
+  shabengali: 0x09B6,
+  shacyrillic: 0x0448,
+  shaddaarabic: 0x0651,
+  shaddadammaarabic: 0xFC61,
+  shaddadammatanarabic: 0xFC5E,
+  shaddafathaarabic: 0xFC60,
+  shaddafathatanarabic: 0x0651064B,
+  shaddakasraarabic: 0xFC62,
+  shaddakasratanarabic: 0xFC5F,
+  shade: 0x2592,
+  shadedark: 0x2593,
+  shadelight: 0x2591,
+  shademedium: 0x2592,
+  shadeva: 0x0936,
+  shagujarati: 0x0AB6,
+  shagurmukhi: 0x0A36,
+  shalshelethebrew: 0x0593,
+  shbopomofo: 0x3115,
+  shchacyrillic: 0x0449,
+  sheenarabic: 0x0634,
+  sheenfinalarabic: 0xFEB6,
+  sheeninitialarabic: 0xFEB7,
+  sheenmedialarabic: 0xFEB8,
+  sheicoptic: 0x03E3,
+  sheqel: 0x20AA,
+  sheqelhebrew: 0x20AA,
+  sheva: 0x05B0,
+  sheva115: 0x05B0,
+  sheva15: 0x05B0,
+  sheva22: 0x05B0,
+  sheva2e: 0x05B0,
+  shevahebrew: 0x05B0,
+  shevanarrowhebrew: 0x05B0,
+  shevaquarterhebrew: 0x05B0,
+  shevawidehebrew: 0x05B0,
+  shhacyrillic: 0x04BB,
+  shimacoptic: 0x03ED,
+  shin: 0x05E9,
+  shindagesh: 0xFB49,
+  shindageshhebrew: 0xFB49,
+  shindageshshindot: 0xFB2C,
+  shindageshshindothebrew: 0xFB2C,
+  shindageshsindot: 0xFB2D,
+  shindageshsindothebrew: 0xFB2D,
+  shindothebrew: 0x05C1,
+  shinhebrew: 0x05E9,
+  shinshindot: 0xFB2A,
+  shinshindothebrew: 0xFB2A,
+  shinsindot: 0xFB2B,
+  shinsindothebrew: 0xFB2B,
+  shook: 0x0282,
+  sigma: 0x03C3,
+  sigma1: 0x03C2,
+  sigmafinal: 0x03C2,
+  sigmalunatesymbolgreek: 0x03F2,
+  sihiragana: 0x3057,
+  sikatakana: 0x30B7,
+  sikatakanahalfwidth: 0xFF7C,
+  siluqhebrew: 0x05BD,
+  siluqlefthebrew: 0x05BD,
+  similar: 0x223C,
+  sindothebrew: 0x05C2,
+  siosacirclekorean: 0x3274,
+  siosaparenkorean: 0x3214,
+  sioscieuckorean: 0x317E,
+  sioscirclekorean: 0x3266,
+  sioskiyeokkorean: 0x317A,
+  sioskorean: 0x3145,
+  siosnieunkorean: 0x317B,
+  siosparenkorean: 0x3206,
+  siospieupkorean: 0x317D,
+  siostikeutkorean: 0x317C,
+  six: 0x0036,
+  sixarabic: 0x0666,
+  sixbengali: 0x09EC,
+  sixcircle: 0x2465,
+  sixcircleinversesansserif: 0x278F,
+  sixdeva: 0x096C,
+  sixgujarati: 0x0AEC,
+  sixgurmukhi: 0x0A6C,
+  sixhackarabic: 0x0666,
+  sixhangzhou: 0x3026,
+  sixideographicparen: 0x3225,
+  sixinferior: 0x2086,
+  sixmonospace: 0xFF16,
+  sixoldstyle: 0xF736,
+  sixparen: 0x2479,
+  sixperiod: 0x248D,
+  sixpersian: 0x06F6,
+  sixroman: 0x2175,
+  sixsuperior: 0x2076,
+  sixteencircle: 0x246F,
+  sixteencurrencydenominatorbengali: 0x09F9,
+  sixteenparen: 0x2483,
+  sixteenperiod: 0x2497,
+  sixthai: 0x0E56,
+  slash: 0x002F,
+  slashmonospace: 0xFF0F,
+  slong: 0x017F,
+  slongdotaccent: 0x1E9B,
+  smileface: 0x263A,
+  smonospace: 0xFF53,
+  sofpasuqhebrew: 0x05C3,
+  softhyphen: 0x00AD,
+  softsigncyrillic: 0x044C,
+  sohiragana: 0x305D,
+  sokatakana: 0x30BD,
+  sokatakanahalfwidth: 0xFF7F,
+  soliduslongoverlaycmb: 0x0338,
+  solidusshortoverlaycmb: 0x0337,
+  sorusithai: 0x0E29,
+  sosalathai: 0x0E28,
+  sosothai: 0x0E0B,
+  sosuathai: 0x0E2A,
+  space: 0x0020,
+  spacehackarabic: 0x0020,
+  spade: 0x2660,
+  spadesuitblack: 0x2660,
+  spadesuitwhite: 0x2664,
+  sparen: 0x24AE,
+  squarebelowcmb: 0x033B,
+  squarecc: 0x33C4,
+  squarecm: 0x339D,
+  squarediagonalcrosshatchfill: 0x25A9,
+  squarehorizontalfill: 0x25A4,
+  squarekg: 0x338F,
+  squarekm: 0x339E,
+  squarekmcapital: 0x33CE,
+  squareln: 0x33D1,
+  squarelog: 0x33D2,
+  squaremg: 0x338E,
+  squaremil: 0x33D5,
+  squaremm: 0x339C,
+  squaremsquared: 0x33A1,
+  squareorthogonalcrosshatchfill: 0x25A6,
+  squareupperlefttolowerrightfill: 0x25A7,
+  squareupperrighttolowerleftfill: 0x25A8,
+  squareverticalfill: 0x25A5,
+  squarewhitewithsmallblack: 0x25A3,
+  srsquare: 0x33DB,
+  ssabengali: 0x09B7,
+  ssadeva: 0x0937,
+  ssagujarati: 0x0AB7,
+  ssangcieuckorean: 0x3149,
+  ssanghieuhkorean: 0x3185,
+  ssangieungkorean: 0x3180,
+  ssangkiyeokkorean: 0x3132,
+  ssangnieunkorean: 0x3165,
+  ssangpieupkorean: 0x3143,
+  ssangsioskorean: 0x3146,
+  ssangtikeutkorean: 0x3138,
+  ssuperior: 0xF6F2,
+  sterling: 0x00A3,
+  sterlingmonospace: 0xFFE1,
+  strokelongoverlaycmb: 0x0336,
+  strokeshortoverlaycmb: 0x0335,
+  subset: 0x2282,
+  subsetnotequal: 0x228A,
+  subsetorequal: 0x2286,
+  succeeds: 0x227B,
+  suchthat: 0x220B,
+  suhiragana: 0x3059,
+  sukatakana: 0x30B9,
+  sukatakanahalfwidth: 0xFF7D,
+  sukunarabic: 0x0652,
+  summation: 0x2211,
+  sun: 0x263C,
+  superset: 0x2283,
+  supersetnotequal: 0x228B,
+  supersetorequal: 0x2287,
+  svsquare: 0x33DC,
+  syouwaerasquare: 0x337C,
+  t: 0x0074,
+  tabengali: 0x09A4,
+  tackdown: 0x22A4,
+  tackleft: 0x22A3,
+  tadeva: 0x0924,
+  tagujarati: 0x0AA4,
+  tagurmukhi: 0x0A24,
+  taharabic: 0x0637,
+  tahfinalarabic: 0xFEC2,
+  tahinitialarabic: 0xFEC3,
+  tahiragana: 0x305F,
+  tahmedialarabic: 0xFEC4,
+  taisyouerasquare: 0x337D,
+  takatakana: 0x30BF,
+  takatakanahalfwidth: 0xFF80,
+  tatweelarabic: 0x0640,
+  tau: 0x03C4,
+  tav: 0x05EA,
+  tavdages: 0xFB4A,
+  tavdagesh: 0xFB4A,
+  tavdageshhebrew: 0xFB4A,
+  tavhebrew: 0x05EA,
+  tbar: 0x0167,
+  tbopomofo: 0x310A,
+  tcaron: 0x0165,
+  tccurl: 0x02A8,
+  tcedilla: 0x0163,
+  tcheharabic: 0x0686,
+  tchehfinalarabic: 0xFB7B,
+  tchehinitialarabic: 0xFB7C,
+  tchehmedialarabic: 0xFB7D,
+  tchehmeeminitialarabic: 0xFB7CFEE4,
+  tcircle: 0x24E3,
+  tcircumflexbelow: 0x1E71,
+  tcommaaccent: 0x0163,
+  tdieresis: 0x1E97,
+  tdotaccent: 0x1E6B,
+  tdotbelow: 0x1E6D,
+  tecyrillic: 0x0442,
+  tedescendercyrillic: 0x04AD,
+  teharabic: 0x062A,
+  tehfinalarabic: 0xFE96,
+  tehhahinitialarabic: 0xFCA2,
+  tehhahisolatedarabic: 0xFC0C,
+  tehinitialarabic: 0xFE97,
+  tehiragana: 0x3066,
+  tehjeeminitialarabic: 0xFCA1,
+  tehjeemisolatedarabic: 0xFC0B,
+  tehmarbutaarabic: 0x0629,
+  tehmarbutafinalarabic: 0xFE94,
+  tehmedialarabic: 0xFE98,
+  tehmeeminitialarabic: 0xFCA4,
+  tehmeemisolatedarabic: 0xFC0E,
+  tehnoonfinalarabic: 0xFC73,
+  tekatakana: 0x30C6,
+  tekatakanahalfwidth: 0xFF83,
+  telephone: 0x2121,
+  telephoneblack: 0x260E,
+  telishagedolahebrew: 0x05A0,
+  telishaqetanahebrew: 0x05A9,
+  tencircle: 0x2469,
+  tenideographicparen: 0x3229,
+  tenparen: 0x247D,
+  tenperiod: 0x2491,
+  tenroman: 0x2179,
+  tesh: 0x02A7,
+  tet: 0x05D8,
+  tetdagesh: 0xFB38,
+  tetdageshhebrew: 0xFB38,
+  tethebrew: 0x05D8,
+  tetsecyrillic: 0x04B5,
+  tevirhebrew: 0x059B,
+  tevirlefthebrew: 0x059B,
+  thabengali: 0x09A5,
+  thadeva: 0x0925,
+  thagujarati: 0x0AA5,
+  thagurmukhi: 0x0A25,
+  thalarabic: 0x0630,
+  thalfinalarabic: 0xFEAC,
+  thanthakhatlowleftthai: 0xF898,
+  thanthakhatlowrightthai: 0xF897,
+  thanthakhatthai: 0x0E4C,
+  thanthakhatupperleftthai: 0xF896,
+  theharabic: 0x062B,
+  thehfinalarabic: 0xFE9A,
+  thehinitialarabic: 0xFE9B,
+  thehmedialarabic: 0xFE9C,
+  thereexists: 0x2203,
+  therefore: 0x2234,
+  theta: 0x03B8,
+  theta1: 0x03D1,
+  thetasymbolgreek: 0x03D1,
+  thieuthacirclekorean: 0x3279,
+  thieuthaparenkorean: 0x3219,
+  thieuthcirclekorean: 0x326B,
+  thieuthkorean: 0x314C,
+  thieuthparenkorean: 0x320B,
+  thirteencircle: 0x246C,
+  thirteenparen: 0x2480,
+  thirteenperiod: 0x2494,
+  thonangmonthothai: 0x0E11,
+  thook: 0x01AD,
+  thophuthaothai: 0x0E12,
+  thorn: 0x00FE,
+  thothahanthai: 0x0E17,
+  thothanthai: 0x0E10,
+  thothongthai: 0x0E18,
+  thothungthai: 0x0E16,
+  thousandcyrillic: 0x0482,
+  thousandsseparatorarabic: 0x066C,
+  thousandsseparatorpersian: 0x066C,
+  three: 0x0033,
+  threearabic: 0x0663,
+  threebengali: 0x09E9,
+  threecircle: 0x2462,
+  threecircleinversesansserif: 0x278C,
+  threedeva: 0x0969,
+  threeeighths: 0x215C,
+  threegujarati: 0x0AE9,
+  threegurmukhi: 0x0A69,
+  threehackarabic: 0x0663,
+  threehangzhou: 0x3023,
+  threeideographicparen: 0x3222,
+  threeinferior: 0x2083,
+  threemonospace: 0xFF13,
+  threenumeratorbengali: 0x09F6,
+  threeoldstyle: 0xF733,
+  threeparen: 0x2476,
+  threeperiod: 0x248A,
+  threepersian: 0x06F3,
+  threequarters: 0x00BE,
+  threequartersemdash: 0xF6DE,
+  threeroman: 0x2172,
+  threesuperior: 0x00B3,
+  threethai: 0x0E53,
+  thzsquare: 0x3394,
+  tihiragana: 0x3061,
+  tikatakana: 0x30C1,
+  tikatakanahalfwidth: 0xFF81,
+  tikeutacirclekorean: 0x3270,
+  tikeutaparenkorean: 0x3210,
+  tikeutcirclekorean: 0x3262,
+  tikeutkorean: 0x3137,
+  tikeutparenkorean: 0x3202,
+  tilde: 0x02DC,
+  tildebelowcmb: 0x0330,
+  tildecmb: 0x0303,
+  tildecomb: 0x0303,
+  tildedoublecmb: 0x0360,
+  tildeoperator: 0x223C,
+  tildeoverlaycmb: 0x0334,
+  tildeverticalcmb: 0x033E,
+  timescircle: 0x2297,
+  tipehahebrew: 0x0596,
+  tipehalefthebrew: 0x0596,
+  tippigurmukhi: 0x0A70,
+  titlocyrilliccmb: 0x0483,
+  tiwnarmenian: 0x057F,
+  tlinebelow: 0x1E6F,
+  tmonospace: 0xFF54,
+  toarmenian: 0x0569,
+  tohiragana: 0x3068,
+  tokatakana: 0x30C8,
+  tokatakanahalfwidth: 0xFF84,
+  tonebarextrahighmod: 0x02E5,
+  tonebarextralowmod: 0x02E9,
+  tonebarhighmod: 0x02E6,
+  tonebarlowmod: 0x02E8,
+  tonebarmidmod: 0x02E7,
+  tonefive: 0x01BD,
+  tonesix: 0x0185,
+  tonetwo: 0x01A8,
+  tonos: 0x0384,
+  tonsquare: 0x3327,
+  topatakthai: 0x0E0F,
+  tortoiseshellbracketleft: 0x3014,
+  tortoiseshellbracketleftsmall: 0xFE5D,
+  tortoiseshellbracketleftvertical: 0xFE39,
+  tortoiseshellbracketright: 0x3015,
+  tortoiseshellbracketrightsmall: 0xFE5E,
+  tortoiseshellbracketrightvertical: 0xFE3A,
+  totaothai: 0x0E15,
+  tpalatalhook: 0x01AB,
+  tparen: 0x24AF,
+  trademark: 0x2122,
+  trademarksans: 0xF8EA,
+  trademarkserif: 0xF6DB,
+  tretroflexhook: 0x0288,
+  triagdn: 0x25BC,
+  triaglf: 0x25C4,
+  triagrt: 0x25BA,
+  triagup: 0x25B2,
+  ts: 0x02A6,
+  tsadi: 0x05E6,
+  tsadidagesh: 0xFB46,
+  tsadidageshhebrew: 0xFB46,
+  tsadihebrew: 0x05E6,
+  tsecyrillic: 0x0446,
+  tsere: 0x05B5,
+  tsere12: 0x05B5,
+  tsere1e: 0x05B5,
+  tsere2b: 0x05B5,
+  tserehebrew: 0x05B5,
+  tserenarrowhebrew: 0x05B5,
+  tserequarterhebrew: 0x05B5,
+  tserewidehebrew: 0x05B5,
+  tshecyrillic: 0x045B,
+  tsuperior: 0xF6F3,
+  ttabengali: 0x099F,
+  ttadeva: 0x091F,
+  ttagujarati: 0x0A9F,
+  ttagurmukhi: 0x0A1F,
+  tteharabic: 0x0679,
+  ttehfinalarabic: 0xFB67,
+  ttehinitialarabic: 0xFB68,
+  ttehmedialarabic: 0xFB69,
+  tthabengali: 0x09A0,
+  tthadeva: 0x0920,
+  tthagujarati: 0x0AA0,
+  tthagurmukhi: 0x0A20,
+  tturned: 0x0287,
+  tuhiragana: 0x3064,
+  tukatakana: 0x30C4,
+  tukatakanahalfwidth: 0xFF82,
+  tusmallhiragana: 0x3063,
+  tusmallkatakana: 0x30C3,
+  tusmallkatakanahalfwidth: 0xFF6F,
+  twelvecircle: 0x246B,
+  twelveparen: 0x247F,
+  twelveperiod: 0x2493,
+  twelveroman: 0x217B,
+  twentycircle: 0x2473,
+  twentyhangzhou: 0x5344,
+  twentyparen: 0x2487,
+  twentyperiod: 0x249B,
+  two: 0x0032,
+  twoarabic: 0x0662,
+  twobengali: 0x09E8,
+  twocircle: 0x2461,
+  twocircleinversesansserif: 0x278B,
+  twodeva: 0x0968,
+  twodotenleader: 0x2025,
+  twodotleader: 0x2025,
+  twodotleadervertical: 0xFE30,
+  twogujarati: 0x0AE8,
+  twogurmukhi: 0x0A68,
+  twohackarabic: 0x0662,
+  twohangzhou: 0x3022,
+  twoideographicparen: 0x3221,
+  twoinferior: 0x2082,
+  twomonospace: 0xFF12,
+  twonumeratorbengali: 0x09F5,
+  twooldstyle: 0xF732,
+  twoparen: 0x2475,
+  twoperiod: 0x2489,
+  twopersian: 0x06F2,
+  tworoman: 0x2171,
+  twostroke: 0x01BB,
+  twosuperior: 0x00B2,
+  twothai: 0x0E52,
+  twothirds: 0x2154,
+  u: 0x0075,
+  uacute: 0x00FA,
+  ubar: 0x0289,
+  ubengali: 0x0989,
+  ubopomofo: 0x3128,
+  ubreve: 0x016D,
+  ucaron: 0x01D4,
+  ucircle: 0x24E4,
+  ucircumflex: 0x00FB,
+  ucircumflexbelow: 0x1E77,
+  ucyrillic: 0x0443,
+  udattadeva: 0x0951,
+  udblacute: 0x0171,
+  udblgrave: 0x0215,
+  udeva: 0x0909,
+  udieresis: 0x00FC,
+  udieresisacute: 0x01D8,
+  udieresisbelow: 0x1E73,
+  udieresiscaron: 0x01DA,
+  udieresiscyrillic: 0x04F1,
+  udieresisgrave: 0x01DC,
+  udieresismacron: 0x01D6,
+  udotbelow: 0x1EE5,
+  ugrave: 0x00F9,
+  ugujarati: 0x0A89,
+  ugurmukhi: 0x0A09,
+  uhiragana: 0x3046,
+  uhookabove: 0x1EE7,
+  uhorn: 0x01B0,
+  uhornacute: 0x1EE9,
+  uhorndotbelow: 0x1EF1,
+  uhorngrave: 0x1EEB,
+  uhornhookabove: 0x1EED,
+  uhorntilde: 0x1EEF,
+  uhungarumlaut: 0x0171,
+  uhungarumlautcyrillic: 0x04F3,
+  uinvertedbreve: 0x0217,
+  ukatakana: 0x30A6,
+  ukatakanahalfwidth: 0xFF73,
+  ukcyrillic: 0x0479,
+  ukorean: 0x315C,
+  umacron: 0x016B,
+  umacroncyrillic: 0x04EF,
+  umacrondieresis: 0x1E7B,
+  umatragurmukhi: 0x0A41,
+  umonospace: 0xFF55,
+  underscore: 0x005F,
+  underscoredbl: 0x2017,
+  underscoremonospace: 0xFF3F,
+  underscorevertical: 0xFE33,
+  underscorewavy: 0xFE4F,
+  union: 0x222A,
+  universal: 0x2200,
+  uogonek: 0x0173,
+  uparen: 0x24B0,
+  upblock: 0x2580,
+  upperdothebrew: 0x05C4,
+  upsilon: 0x03C5,
+  upsilondieresis: 0x03CB,
+  upsilondieresistonos: 0x03B0,
+  upsilonlatin: 0x028A,
+  upsilontonos: 0x03CD,
+  uptackbelowcmb: 0x031D,
+  uptackmod: 0x02D4,
+  uragurmukhi: 0x0A73,
+  uring: 0x016F,
+  ushortcyrillic: 0x045E,
+  usmallhiragana: 0x3045,
+  usmallkatakana: 0x30A5,
+  usmallkatakanahalfwidth: 0xFF69,
+  ustraightcyrillic: 0x04AF,
+  ustraightstrokecyrillic: 0x04B1,
+  utilde: 0x0169,
+  utildeacute: 0x1E79,
+  utildebelow: 0x1E75,
+  uubengali: 0x098A,
+  uudeva: 0x090A,
+  uugujarati: 0x0A8A,
+  uugurmukhi: 0x0A0A,
+  uumatragurmukhi: 0x0A42,
+  uuvowelsignbengali: 0x09C2,
+  uuvowelsigndeva: 0x0942,
+  uuvowelsigngujarati: 0x0AC2,
+  uvowelsignbengali: 0x09C1,
+  uvowelsigndeva: 0x0941,
+  uvowelsigngujarati: 0x0AC1,
+  v: 0x0076,
+  vadeva: 0x0935,
+  vagujarati: 0x0AB5,
+  vagurmukhi: 0x0A35,
+  vakatakana: 0x30F7,
+  vav: 0x05D5,
+  vavdagesh: 0xFB35,
+  vavdagesh65: 0xFB35,
+  vavdageshhebrew: 0xFB35,
+  vavhebrew: 0x05D5,
+  vavholam: 0xFB4B,
+  vavholamhebrew: 0xFB4B,
+  vavvavhebrew: 0x05F0,
+  vavyodhebrew: 0x05F1,
+  vcircle: 0x24E5,
+  vdotbelow: 0x1E7F,
+  vecyrillic: 0x0432,
+  veharabic: 0x06A4,
+  vehfinalarabic: 0xFB6B,
+  vehinitialarabic: 0xFB6C,
+  vehmedialarabic: 0xFB6D,
+  vekatakana: 0x30F9,
+  venus: 0x2640,
+  verticalbar: 0x007C,
+  verticallineabovecmb: 0x030D,
+  verticallinebelowcmb: 0x0329,
+  verticallinelowmod: 0x02CC,
+  verticallinemod: 0x02C8,
+  vewarmenian: 0x057E,
+  vhook: 0x028B,
+  vikatakana: 0x30F8,
+  viramabengali: 0x09CD,
+  viramadeva: 0x094D,
+  viramagujarati: 0x0ACD,
+  visargabengali: 0x0983,
+  visargadeva: 0x0903,
+  visargagujarati: 0x0A83,
+  vmonospace: 0xFF56,
+  voarmenian: 0x0578,
+  voicediterationhiragana: 0x309E,
+  voicediterationkatakana: 0x30FE,
+  voicedmarkkana: 0x309B,
+  voicedmarkkanahalfwidth: 0xFF9E,
+  vokatakana: 0x30FA,
+  vparen: 0x24B1,
+  vtilde: 0x1E7D,
+  vturned: 0x028C,
+  vuhiragana: 0x3094,
+  vukatakana: 0x30F4,
+  w: 0x0077,
+  wacute: 0x1E83,
+  waekorean: 0x3159,
+  wahiragana: 0x308F,
+  wakatakana: 0x30EF,
+  wakatakanahalfwidth: 0xFF9C,
+  wakorean: 0x3158,
+  wasmallhiragana: 0x308E,
+  wasmallkatakana: 0x30EE,
+  wattosquare: 0x3357,
+  wavedash: 0x301C,
+  wavyunderscorevertical: 0xFE34,
+  wawarabic: 0x0648,
+  wawfinalarabic: 0xFEEE,
+  wawhamzaabovearabic: 0x0624,
+  wawhamzaabovefinalarabic: 0xFE86,
+  wbsquare: 0x33DD,
+  wcircle: 0x24E6,
+  wcircumflex: 0x0175,
+  wdieresis: 0x1E85,
+  wdotaccent: 0x1E87,
+  wdotbelow: 0x1E89,
+  wehiragana: 0x3091,
+  weierstrass: 0x2118,
+  wekatakana: 0x30F1,
+  wekorean: 0x315E,
+  weokorean: 0x315D,
+  wgrave: 0x1E81,
+  whitebullet: 0x25E6,
+  whitecircle: 0x25CB,
+  whitecircleinverse: 0x25D9,
+  whitecornerbracketleft: 0x300E,
+  whitecornerbracketleftvertical: 0xFE43,
+  whitecornerbracketright: 0x300F,
+  whitecornerbracketrightvertical: 0xFE44,
+  whitediamond: 0x25C7,
+  whitediamondcontainingblacksmalldiamond: 0x25C8,
+  whitedownpointingsmalltriangle: 0x25BF,
+  whitedownpointingtriangle: 0x25BD,
+  whiteleftpointingsmalltriangle: 0x25C3,
+  whiteleftpointingtriangle: 0x25C1,
+  whitelenticularbracketleft: 0x3016,
+  whitelenticularbracketright: 0x3017,
+  whiterightpointingsmalltriangle: 0x25B9,
+  whiterightpointingtriangle: 0x25B7,
+  whitesmallsquare: 0x25AB,
+  whitesmilingface: 0x263A,
+  whitesquare: 0x25A1,
+  whitestar: 0x2606,
+  whitetelephone: 0x260F,
+  whitetortoiseshellbracketleft: 0x3018,
+  whitetortoiseshellbracketright: 0x3019,
+  whiteuppointingsmalltriangle: 0x25B5,
+  whiteuppointingtriangle: 0x25B3,
+  wihiragana: 0x3090,
+  wikatakana: 0x30F0,
+  wikorean: 0x315F,
+  wmonospace: 0xFF57,
+  wohiragana: 0x3092,
+  wokatakana: 0x30F2,
+  wokatakanahalfwidth: 0xFF66,
+  won: 0x20A9,
+  wonmonospace: 0xFFE6,
+  wowaenthai: 0x0E27,
+  wparen: 0x24B2,
+  wring: 0x1E98,
+  wsuperior: 0x02B7,
+  wturned: 0x028D,
+  wynn: 0x01BF,
+  x: 0x0078,
+  xabovecmb: 0x033D,
+  xbopomofo: 0x3112,
+  xcircle: 0x24E7,
+  xdieresis: 0x1E8D,
+  xdotaccent: 0x1E8B,
+  xeharmenian: 0x056D,
+  xi: 0x03BE,
+  xmonospace: 0xFF58,
+  xparen: 0x24B3,
+  xsuperior: 0x02E3,
+  y: 0x0079,
+  yaadosquare: 0x334E,
+  yabengali: 0x09AF,
+  yacute: 0x00FD,
+  yadeva: 0x092F,
+  yaekorean: 0x3152,
+  yagujarati: 0x0AAF,
+  yagurmukhi: 0x0A2F,
+  yahiragana: 0x3084,
+  yakatakana: 0x30E4,
+  yakatakanahalfwidth: 0xFF94,
+  yakorean: 0x3151,
+  yamakkanthai: 0x0E4E,
+  yasmallhiragana: 0x3083,
+  yasmallkatakana: 0x30E3,
+  yasmallkatakanahalfwidth: 0xFF6C,
+  yatcyrillic: 0x0463,
+  ycircle: 0x24E8,
+  ycircumflex: 0x0177,
+  ydieresis: 0x00FF,
+  ydotaccent: 0x1E8F,
+  ydotbelow: 0x1EF5,
+  yeharabic: 0x064A,
+  yehbarreearabic: 0x06D2,
+  yehbarreefinalarabic: 0xFBAF,
+  yehfinalarabic: 0xFEF2,
+  yehhamzaabovearabic: 0x0626,
+  yehhamzaabovefinalarabic: 0xFE8A,
+  yehhamzaaboveinitialarabic: 0xFE8B,
+  yehhamzaabovemedialarabic: 0xFE8C,
+  yehinitialarabic: 0xFEF3,
+  yehmedialarabic: 0xFEF4,
+  yehmeeminitialarabic: 0xFCDD,
+  yehmeemisolatedarabic: 0xFC58,
+  yehnoonfinalarabic: 0xFC94,
+  yehthreedotsbelowarabic: 0x06D1,
+  yekorean: 0x3156,
+  yen: 0x00A5,
+  yenmonospace: 0xFFE5,
+  yeokorean: 0x3155,
+  yeorinhieuhkorean: 0x3186,
+  yerahbenyomohebrew: 0x05AA,
+  yerahbenyomolefthebrew: 0x05AA,
+  yericyrillic: 0x044B,
+  yerudieresiscyrillic: 0x04F9,
+  yesieungkorean: 0x3181,
+  yesieungpansioskorean: 0x3183,
+  yesieungsioskorean: 0x3182,
+  yetivhebrew: 0x059A,
+  ygrave: 0x1EF3,
+  yhook: 0x01B4,
+  yhookabove: 0x1EF7,
+  yiarmenian: 0x0575,
+  yicyrillic: 0x0457,
+  yikorean: 0x3162,
+  yinyang: 0x262F,
+  yiwnarmenian: 0x0582,
+  ymonospace: 0xFF59,
+  yod: 0x05D9,
+  yoddagesh: 0xFB39,
+  yoddageshhebrew: 0xFB39,
+  yodhebrew: 0x05D9,
+  yodyodhebrew: 0x05F2,
+  yodyodpatahhebrew: 0xFB1F,
+  yohiragana: 0x3088,
+  yoikorean: 0x3189,
+  yokatakana: 0x30E8,
+  yokatakanahalfwidth: 0xFF96,
+  yokorean: 0x315B,
+  yosmallhiragana: 0x3087,
+  yosmallkatakana: 0x30E7,
+  yosmallkatakanahalfwidth: 0xFF6E,
+  yotgreek: 0x03F3,
+  yoyaekorean: 0x3188,
+  yoyakorean: 0x3187,
+  yoyakthai: 0x0E22,
+  yoyingthai: 0x0E0D,
+  yparen: 0x24B4,
+  ypogegrammeni: 0x037A,
+  ypogegrammenigreekcmb: 0x0345,
+  yr: 0x01A6,
+  yring: 0x1E99,
+  ysuperior: 0x02B8,
+  ytilde: 0x1EF9,
+  yturned: 0x028E,
+  yuhiragana: 0x3086,
+  yuikorean: 0x318C,
+  yukatakana: 0x30E6,
+  yukatakanahalfwidth: 0xFF95,
+  yukorean: 0x3160,
+  yusbigcyrillic: 0x046B,
+  yusbigiotifiedcyrillic: 0x046D,
+  yuslittlecyrillic: 0x0467,
+  yuslittleiotifiedcyrillic: 0x0469,
+  yusmallhiragana: 0x3085,
+  yusmallkatakana: 0x30E5,
+  yusmallkatakanahalfwidth: 0xFF6D,
+  yuyekorean: 0x318B,
+  yuyeokorean: 0x318A,
+  yyabengali: 0x09DF,
+  yyadeva: 0x095F,
+  z: 0x007A,
+  zaarmenian: 0x0566,
+  zacute: 0x017A,
+  zadeva: 0x095B,
+  zagurmukhi: 0x0A5B,
+  zaharabic: 0x0638,
+  zahfinalarabic: 0xFEC6,
+  zahinitialarabic: 0xFEC7,
+  zahiragana: 0x3056,
+  zahmedialarabic: 0xFEC8,
+  zainarabic: 0x0632,
+  zainfinalarabic: 0xFEB0,
+  zakatakana: 0x30B6,
+  zaqefgadolhebrew: 0x0595,
+  zaqefqatanhebrew: 0x0594,
+  zarqahebrew: 0x0598,
+  zayin: 0x05D6,
+  zayindagesh: 0xFB36,
+  zayindageshhebrew: 0xFB36,
+  zayinhebrew: 0x05D6,
+  zbopomofo: 0x3117,
+  zcaron: 0x017E,
+  zcircle: 0x24E9,
+  zcircumflex: 0x1E91,
+  zcurl: 0x0291,
+  zdot: 0x017C,
+  zdotaccent: 0x017C,
+  zdotbelow: 0x1E93,
+  zecyrillic: 0x0437,
+  zedescendercyrillic: 0x0499,
+  zedieresiscyrillic: 0x04DF,
+  zehiragana: 0x305C,
+  zekatakana: 0x30BC,
+  zero: 0x0030,
+  zeroarabic: 0x0660,
+  zerobengali: 0x09E6,
+  zerodeva: 0x0966,
+  zerogujarati: 0x0AE6,
+  zerogurmukhi: 0x0A66,
+  zerohackarabic: 0x0660,
+  zeroinferior: 0x2080,
+  zeromonospace: 0xFF10,
+  zerooldstyle: 0xF730,
+  zeropersian: 0x06F0,
+  zerosuperior: 0x2070,
+  zerothai: 0x0E50,
+  zerowidthjoiner: 0xFEFF,
+  zerowidthnonjoiner: 0x200C,
+  zerowidthspace: 0x200B,
+  zeta: 0x03B6,
+  zhbopomofo: 0x3113,
+  zhearmenian: 0x056A,
+  zhebrevecyrillic: 0x04C2,
+  zhecyrillic: 0x0436,
+  zhedescendercyrillic: 0x0497,
+  zhedieresiscyrillic: 0x04DD,
+  zihiragana: 0x3058,
+  zikatakana: 0x30B8,
+  zinorhebrew: 0x05AE,
+  zlinebelow: 0x1E95,
+  zmonospace: 0xFF5A,
+  zohiragana: 0x305E,
+  zokatakana: 0x30BE,
+  zparen: 0x24B5,
+  zretroflexhook: 0x0290,
+  zstroke: 0x01B6,
+  zuhiragana: 0x305A,
+  zukatakana: 0x30BA
+};
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/image.js b/apps/files_pdfviewer/js/pdfjs/src/image.js
new file mode 100755
index 00000000000..17ef7b06d82
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/image.js
@@ -0,0 +1,257 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var PDFImage = (function pdfImage() {
+  function constructor(xref, res, image, inline) {
+    this.image = image;
+    if (image.getParams) {
+      // JPX/JPEG2000 streams directly contain bits per component
+      // and color space mode information.
+      TODO('get params from actual stream');
+      // var bits = ...
+      // var colorspace = ...
+    }
+    // TODO cache rendered images?
+
+    var dict = image.dict;
+    this.width = dict.get('Width', 'W');
+    this.height = dict.get('Height', 'H');
+
+    if (this.width < 1 || this.height < 1)
+      error('Invalid image width: ' + this.width + ' or height: ' +
+            this.height);
+
+    this.interpolate = dict.get('Interpolate', 'I') || false;
+    this.imageMask = dict.get('ImageMask', 'IM') || false;
+
+    var bitsPerComponent = image.bitsPerComponent;
+    if (!bitsPerComponent) {
+      bitsPerComponent = dict.get('BitsPerComponent', 'BPC');
+      if (!bitsPerComponent) {
+        if (this.imageMask)
+          bitsPerComponent = 1;
+        else
+          error('Bits per component missing in image: ' + this.imageMask);
+      }
+    }
+    this.bpc = bitsPerComponent;
+
+    if (!this.imageMask) {
+      var colorSpace = dict.get('ColorSpace', 'CS');
+      if (!colorSpace) {
+        TODO('JPX images (which don"t require color spaces');
+        colorSpace = new Name('DeviceRGB');
+      }
+      this.colorSpace = ColorSpace.parse(colorSpace, xref, res);
+      this.numComps = this.colorSpace.numComps;
+    }
+
+    this.decode = dict.get('Decode', 'D');
+
+    var mask = xref.fetchIfRef(dict.get('Mask'));
+    var smask = xref.fetchIfRef(dict.get('SMask'));
+
+    if (mask) {
+      TODO('masked images');
+    } else if (smask) {
+      this.smask = new PDFImage(xref, res, smask);
+    }
+  }
+
+  constructor.prototype = {
+    getComponents: function getComponents(buffer, decodeMap) {
+      var bpc = this.bpc;
+      if (bpc == 8)
+        return buffer;
+
+      var width = this.width;
+      var height = this.height;
+      var numComps = this.numComps;
+
+      var length = width * height;
+      var bufferPos = 0;
+      var output = bpc <= 8 ? new Uint8Array(length) :
+        bpc <= 16 ? new Uint16Array(length) : new Uint32Array(length);
+      var rowComps = width * numComps;
+
+      if (bpc == 1) {
+        var valueZero = 0, valueOne = 1;
+        if (decodeMap) {
+          valueZero = decodeMap[0] ? 1 : 0;
+          valueOne = decodeMap[1] ? 1 : 0;
+        }
+        var mask = 0;
+        var buf = 0;
+
+        for (var i = 0, ii = length; i < ii; ++i) {
+          if (i % rowComps == 0) {
+            mask = 0;
+            buf = 0;
+          } else {
+            mask >>= 1;
+          }
+
+          if (mask <= 0) {
+            buf = buffer[bufferPos++];
+            mask = 128;
+          }
+
+          output[i] = !(buf & mask) ? valueZero : valueOne;
+        }
+      } else {
+        if (decodeMap != null)
+          TODO('interpolate component values');
+        var bits = 0, buf = 0;
+        for (var i = 0, ii = length; i < ii; ++i) {
+          if (i % rowComps == 0) {
+            buf = 0;
+            bits = 0;
+          }
+
+          while (bits < bpc) {
+            buf = (buf << 8) | buffer[bufferPos++];
+            bits += 8;
+          }
+
+          var remainingBits = bits - bpc;
+          output[i] = buf >> remainingBits;
+          buf = buf & ((1 << remainingBits) - 1);
+          bits = remainingBits;
+        }
+      }
+      return output;
+    },
+    getOpacity: function getOpacity() {
+      var smask = this.smask;
+      var width = this.width;
+      var height = this.height;
+      var buf = new Uint8Array(width * height);
+
+      if (smask) {
+        if (smask.image.getImage) {
+          // smask is a DOM image
+          var tempCanvas = new ScratchCanvas(width, height);
+          var tempCtx = tempCanvas.getContext('2d');
+          var domImage = smask.image.getImage();
+          tempCtx.drawImage(domImage, 0, 0, domImage.width, domImage.height,
+            0, 0, width, height);
+          var data = tempCtx.getImageData(0, 0, width, height).data;
+          for (var i = 0, j = 0, ii = width * height; i < ii; ++i, j += 4)
+            buf[i] = data[j]; // getting first component value
+          return buf;
+        }
+        var sw = smask.width;
+        var sh = smask.height;
+        if (sw != this.width || sh != this.height)
+          error('smask dimensions do not match image dimensions: ' + sw +
+                ' != ' + this.width + ', ' + sh + ' != ' + this.height);
+
+        smask.fillGrayBuffer(buf);
+        return buf;
+      } else {
+        for (var i = 0, ii = width * height; i < ii; ++i)
+          buf[i] = 255;
+      }
+      return buf;
+    },
+    applyStencilMask: function applyStencilMask(buffer, inverseDecode) {
+      var width = this.width, height = this.height;
+      var bitStrideLength = (width + 7) >> 3;
+      this.image.reset();
+      var imgArray = this.image.getBytes(bitStrideLength * height);
+      var imgArrayPos = 0;
+      var i, j, mask, buf;
+      // removing making non-masked pixels transparent
+      var bufferPos = 3; // alpha component offset
+      for (i = 0; i < height; i++) {
+        mask = 0;
+        for (j = 0; j < width; j++) {
+          if (!mask) {
+            buf = imgArray[imgArrayPos++];
+            mask = 128;
+          }
+          if (!(buf & mask) == inverseDecode) {
+            buffer[bufferPos] = 0;
+          }
+          bufferPos += 4;
+          mask >>= 1;
+        }
+      }
+    },
+    fillRgbaBuffer: function fillRgbaBuffer(buffer, decodeMap) {
+      var numComps = this.numComps;
+      var width = this.width;
+      var height = this.height;
+      var bpc = this.bpc;
+
+      // rows start at byte boundary;
+      var rowBytes = (width * numComps * bpc + 7) >> 3;
+      this.image.reset();
+      var imgArray = this.image.getBytes(height * rowBytes);
+
+      var comps = this.colorSpace.getRgbBuffer(
+        this.getComponents(imgArray, decodeMap), bpc);
+      var compsPos = 0;
+      var opacity = this.getOpacity();
+      var opacityPos = 0;
+      var length = width * height * 4;
+
+      for (var i = 0; i < length; i += 4) {
+        buffer[i] = comps[compsPos++];
+        buffer[i + 1] = comps[compsPos++];
+        buffer[i + 2] = comps[compsPos++];
+        buffer[i + 3] = opacity[opacityPos++];
+      }
+    },
+    fillGrayBuffer: function fillGrayBuffer(buffer) {
+      var numComps = this.numComps;
+      if (numComps != 1)
+        error('Reading gray scale from a color image: ' + numComps);
+
+      var width = this.width;
+      var height = this.height;
+      var bpc = this.bpc;
+
+      // rows start at byte boundary;
+      var rowBytes = (width * numComps * bpc + 7) >> 3;
+      this.image.reset();
+      var imgArray = this.image.getBytes(height * rowBytes);
+
+      var comps = this.getComponents(imgArray);
+      var length = width * height;
+
+      for (var i = 0; i < length; ++i)
+        buffer[i] = comps[i];
+    }
+  };
+  return constructor;
+})();
+
+var JpegImageLoader = (function jpegImage() {
+  function JpegImageLoader(objId, imageData, objs) {
+    var src = 'data:image/jpeg;base64,' + window.btoa(imageData);
+
+    var img = new Image();
+    img.onload = (function jpegImageLoaderOnload() {
+      this.loaded = true;
+
+      objs.resolve(objId, this);
+
+      if (this.onLoad)
+        this.onLoad();
+    }).bind(this);
+    img.src = src;
+    this.domImage = img;
+  }
+
+  JpegImageLoader.prototype = {
+    getImage: function jpegImageLoaderGetImage() {
+      return this.domImage;
+    }
+  };
+
+  return JpegImageLoader;
+})();
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/metrics.js b/apps/files_pdfviewer/js/pdfjs/src/metrics.js
new file mode 100755
index 00000000000..c21b4aed1ce
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/metrics.js
@@ -0,0 +1,2944 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var Metrics = {
+  'Courier': 600,
+  'Courier-Bold': 600,
+  'Courier-BoldOblique': 600,
+  'Courier-Oblique': 600,
+  'Helvetica' : {
+    'space': 278,
+    'exclam': 278,
+    'quotedbl': 355,
+    'numbersign': 556,
+    'dollar': 556,
+    'percent': 889,
+    'ampersand': 667,
+    'quoteright': 222,
+    'parenleft': 333,
+    'parenright': 333,
+    'asterisk': 389,
+    'plus': 584,
+    'comma': 278,
+    'hyphen': 333,
+    'period': 278,
+    'slash': 278,
+    'zero': 556,
+    'one': 556,
+    'two': 556,
+    'three': 556,
+    'four': 556,
+    'five': 556,
+    'six': 556,
+    'seven': 556,
+    'eight': 556,
+    'nine': 556,
+    'colon': 278,
+    'semicolon': 278,
+    'less': 584,
+    'equal': 584,
+    'greater': 584,
+    'question': 556,
+    'at': 1015,
+    'A': 667,
+    'B': 667,
+    'C': 722,
+    'D': 722,
+    'E': 667,
+    'F': 611,
+    'G': 778,
+    'H': 722,
+    'I': 278,
+    'J': 500,
+    'K': 667,
+    'L': 556,
+    'M': 833,
+    'N': 722,
+    'O': 778,
+    'P': 667,
+    'Q': 778,
+    'R': 722,
+    'S': 667,
+    'T': 611,
+    'U': 722,
+    'V': 667,
+    'W': 944,
+    'X': 667,
+    'Y': 667,
+    'Z': 611,
+    'bracketleft': 278,
+    'backslash': 278,
+    'bracketright': 278,
+    'asciicircum': 469,
+    'underscore': 556,
+    'quoteleft': 222,
+    'a': 556,
+    'b': 556,
+    'c': 500,
+    'd': 556,
+    'e': 556,
+    'f': 278,
+    'g': 556,
+    'h': 556,
+    'i': 222,
+    'j': 222,
+    'k': 500,
+    'l': 222,
+    'm': 833,
+    'n': 556,
+    'o': 556,
+    'p': 556,
+    'q': 556,
+    'r': 333,
+    's': 500,
+    't': 278,
+    'u': 556,
+    'v': 500,
+    'w': 722,
+    'x': 500,
+    'y': 500,
+    'z': 500,
+    'braceleft': 334,
+    'bar': 260,
+    'braceright': 334,
+    'asciitilde': 584,
+    'exclamdown': 333,
+    'cent': 556,
+    'sterling': 556,
+    'fraction': 167,
+    'yen': 556,
+    'florin': 556,
+    'section': 556,
+    'currency': 556,
+    'quotesingle': 191,
+    'quotedblleft': 333,
+    'guillemotleft': 556,
+    'guilsinglleft': 333,
+    'guilsinglright': 333,
+    'fi': 500,
+    'fl': 500,
+    'endash': 556,
+    'dagger': 556,
+    'daggerdbl': 556,
+    'periodcentered': 278,
+    'paragraph': 537,
+    'bullet': 350,
+    'quotesinglbase': 222,
+    'quotedblbase': 333,
+    'quotedblright': 333,
+    'guillemotright': 556,
+    'ellipsis': 1000,
+    'perthousand': 1000,
+    'questiondown': 611,
+    'grave': 333,
+    'acute': 333,
+    'circumflex': 333,
+    'tilde': 333,
+    'macron': 333,
+    'breve': 333,
+    'dotaccent': 333,
+    'dieresis': 333,
+    'ring': 333,
+    'cedilla': 333,
+    'hungarumlaut': 333,
+    'ogonek': 333,
+    'caron': 333,
+    'emdash': 1000,
+    'AE': 1000,
+    'ordfeminine': 370,
+    'Lslash': 556,
+    'Oslash': 778,
+    'OE': 1000,
+    'ordmasculine': 365,
+    'ae': 889,
+    'dotlessi': 278,
+    'lslash': 222,
+    'oslash': 611,
+    'oe': 944,
+    'germandbls': 611,
+    'Idieresis': 278,
+    'eacute': 556,
+    'abreve': 556,
+    'uhungarumlaut': 556,
+    'ecaron': 556,
+    'Ydieresis': 667,
+    'divide': 584,
+    'Yacute': 667,
+    'Acircumflex': 667,
+    'aacute': 556,
+    'Ucircumflex': 722,
+    'yacute': 500,
+    'scommaaccent': 500,
+    'ecircumflex': 556,
+    'Uring': 722,
+    'Udieresis': 722,
+    'aogonek': 556,
+    'Uacute': 722,
+    'uogonek': 556,
+    'Edieresis': 667,
+    'Dcroat': 722,
+    'commaaccent': 250,
+    'copyright': 737,
+    'Emacron': 667,
+    'ccaron': 500,
+    'aring': 556,
+    'Ncommaaccent': 722,
+    'lacute': 222,
+    'agrave': 556,
+    'Tcommaaccent': 611,
+    'Cacute': 722,
+    'atilde': 556,
+    'Edotaccent': 667,
+    'scaron': 500,
+    'scedilla': 500,
+    'iacute': 278,
+    'lozenge': 471,
+    'Rcaron': 722,
+    'Gcommaaccent': 778,
+    'ucircumflex': 556,
+    'acircumflex': 556,
+    'Amacron': 667,
+    'rcaron': 333,
+    'ccedilla': 500,
+    'Zdotaccent': 611,
+    'Thorn': 667,
+    'Omacron': 778,
+    'Racute': 722,
+    'Sacute': 667,
+    'dcaron': 643,
+    'Umacron': 722,
+    'uring': 556,
+    'threesuperior': 333,
+    'Ograve': 778,
+    'Agrave': 667,
+    'Abreve': 667,
+    'multiply': 584,
+    'uacute': 556,
+    'Tcaron': 611,
+    'partialdiff': 476,
+    'ydieresis': 500,
+    'Nacute': 722,
+    'icircumflex': 278,
+    'Ecircumflex': 667,
+    'adieresis': 556,
+    'edieresis': 556,
+    'cacute': 500,
+    'nacute': 556,
+    'umacron': 556,
+    'Ncaron': 722,
+    'Iacute': 278,
+    'plusminus': 584,
+    'brokenbar': 260,
+    'registered': 737,
+    'Gbreve': 778,
+    'Idotaccent': 278,
+    'summation': 600,
+    'Egrave': 667,
+    'racute': 333,
+    'omacron': 556,
+    'Zacute': 611,
+    'Zcaron': 611,
+    'greaterequal': 549,
+    'Eth': 722,
+    'Ccedilla': 722,
+    'lcommaaccent': 222,
+    'tcaron': 317,
+    'eogonek': 556,
+    'Uogonek': 722,
+    'Aacute': 667,
+    'Adieresis': 667,
+    'egrave': 556,
+    'zacute': 500,
+    'iogonek': 222,
+    'Oacute': 778,
+    'oacute': 556,
+    'amacron': 556,
+    'sacute': 500,
+    'idieresis': 278,
+    'Ocircumflex': 778,
+    'Ugrave': 722,
+    'Delta': 612,
+    'thorn': 556,
+    'twosuperior': 333,
+    'Odieresis': 778,
+    'mu': 556,
+    'igrave': 278,
+    'ohungarumlaut': 556,
+    'Eogonek': 667,
+    'dcroat': 556,
+    'threequarters': 834,
+    'Scedilla': 667,
+    'lcaron': 299,
+    'Kcommaaccent': 667,
+    'Lacute': 556,
+    'trademark': 1000,
+    'edotaccent': 556,
+    'Igrave': 278,
+    'Imacron': 278,
+    'Lcaron': 556,
+    'onehalf': 834,
+    'lessequal': 549,
+    'ocircumflex': 556,
+    'ntilde': 556,
+    'Uhungarumlaut': 722,
+    'Eacute': 667,
+    'emacron': 556,
+    'gbreve': 556,
+    'onequarter': 834,
+    'Scaron': 667,
+    'Scommaaccent': 667,
+    'Ohungarumlaut': 778,
+    'degree': 400,
+    'ograve': 556,
+    'Ccaron': 722,
+    'ugrave': 556,
+    'radical': 453,
+    'Dcaron': 722,
+    'rcommaaccent': 333,
+    'Ntilde': 722,
+    'otilde': 556,
+    'Rcommaaccent': 722,
+    'Lcommaaccent': 556,
+    'Atilde': 667,
+    'Aogonek': 667,
+    'Aring': 667,
+    'Otilde': 778,
+    'zdotaccent': 500,
+    'Ecaron': 667,
+    'Iogonek': 278,
+    'kcommaaccent': 500,
+    'minus': 584,
+    'Icircumflex': 278,
+    'ncaron': 556,
+    'tcommaaccent': 278,
+    'logicalnot': 584,
+    'odieresis': 556,
+    'udieresis': 556,
+    'notequal': 549,
+    'gcommaaccent': 556,
+    'eth': 556,
+    'zcaron': 500,
+    'ncommaaccent': 556,
+    'onesuperior': 333,
+    'imacron': 278,
+    'Euro': 556
+  },
+  'Helvetica-Bold': {
+    'space': 278,
+    'exclam': 333,
+    'quotedbl': 474,
+    'numbersign': 556,
+    'dollar': 556,
+    'percent': 889,
+    'ampersand': 722,
+    'quoteright': 278,
+    'parenleft': 333,
+    'parenright': 333,
+    'asterisk': 389,
+    'plus': 584,
+    'comma': 278,
+    'hyphen': 333,
+    'period': 278,
+    'slash': 278,
+    'zero': 556,
+    'one': 556,
+    'two': 556,
+    'three': 556,
+    'four': 556,
+    'five': 556,
+    'six': 556,
+    'seven': 556,
+    'eight': 556,
+    'nine': 556,
+    'colon': 333,
+    'semicolon': 333,
+    'less': 584,
+    'equal': 584,
+    'greater': 584,
+    'question': 611,
+    'at': 975,
+    'A': 722,
+    'B': 722,
+    'C': 722,
+    'D': 722,
+    'E': 667,
+    'F': 611,
+    'G': 778,
+    'H': 722,
+    'I': 278,
+    'J': 556,
+    'K': 722,
+    'L': 611,
+    'M': 833,
+    'N': 722,
+    'O': 778,
+    'P': 667,
+    'Q': 778,
+    'R': 722,
+    'S': 667,
+    'T': 611,
+    'U': 722,
+    'V': 667,
+    'W': 944,
+    'X': 667,
+    'Y': 667,
+    'Z': 611,
+    'bracketleft': 333,
+    'backslash': 278,
+    'bracketright': 333,
+    'asciicircum': 584,
+    'underscore': 556,
+    'quoteleft': 278,
+    'a': 556,
+    'b': 611,
+    'c': 556,
+    'd': 611,
+    'e': 556,
+    'f': 333,
+    'g': 611,
+    'h': 611,
+    'i': 278,
+    'j': 278,
+    'k': 556,
+    'l': 278,
+    'm': 889,
+    'n': 611,
+    'o': 611,
+    'p': 611,
+    'q': 611,
+    'r': 389,
+    's': 556,
+    't': 333,
+    'u': 611,
+    'v': 556,
+    'w': 778,
+    'x': 556,
+    'y': 556,
+    'z': 500,
+    'braceleft': 389,
+    'bar': 280,
+    'braceright': 389,
+    'asciitilde': 584,
+    'exclamdown': 333,
+    'cent': 556,
+    'sterling': 556,
+    'fraction': 167,
+    'yen': 556,
+    'florin': 556,
+    'section': 556,
+    'currency': 556,
+    'quotesingle': 238,
+    'quotedblleft': 500,
+    'guillemotleft': 556,
+    'guilsinglleft': 333,
+    'guilsinglright': 333,
+    'fi': 611,
+    'fl': 611,
+    'endash': 556,
+    'dagger': 556,
+    'daggerdbl': 556,
+    'periodcentered': 278,
+    'paragraph': 556,
+    'bullet': 350,
+    'quotesinglbase': 278,
+    'quotedblbase': 500,
+    'quotedblright': 500,
+    'guillemotright': 556,
+    'ellipsis': 1000,
+    'perthousand': 1000,
+    'questiondown': 611,
+    'grave': 333,
+    'acute': 333,
+    'circumflex': 333,
+    'tilde': 333,
+    'macron': 333,
+    'breve': 333,
+    'dotaccent': 333,
+    'dieresis': 333,
+    'ring': 333,
+    'cedilla': 333,
+    'hungarumlaut': 333,
+    'ogonek': 333,
+    'caron': 333,
+    'emdash': 1000,
+    'AE': 1000,
+    'ordfeminine': 370,
+    'Lslash': 611,
+    'Oslash': 778,
+    'OE': 1000,
+    'ordmasculine': 365,
+    'ae': 889,
+    'dotlessi': 278,
+    'lslash': 278,
+    'oslash': 611,
+    'oe': 944,
+    'germandbls': 611,
+    'Idieresis': 278,
+    'eacute': 556,
+    'abreve': 556,
+    'uhungarumlaut': 611,
+    'ecaron': 556,
+    'Ydieresis': 667,
+    'divide': 584,
+    'Yacute': 667,
+    'Acircumflex': 722,
+    'aacute': 556,
+    'Ucircumflex': 722,
+    'yacute': 556,
+    'scommaaccent': 556,
+    'ecircumflex': 556,
+    'Uring': 722,
+    'Udieresis': 722,
+    'aogonek': 556,
+    'Uacute': 722,
+    'uogonek': 611,
+    'Edieresis': 667,
+    'Dcroat': 722,
+    'commaaccent': 250,
+    'copyright': 737,
+    'Emacron': 667,
+    'ccaron': 556,
+    'aring': 556,
+    'Ncommaaccent': 722,
+    'lacute': 278,
+    'agrave': 556,
+    'Tcommaaccent': 611,
+    'Cacute': 722,
+    'atilde': 556,
+    'Edotaccent': 667,
+    'scaron': 556,
+    'scedilla': 556,
+    'iacute': 278,
+    'lozenge': 494,
+    'Rcaron': 722,
+    'Gcommaaccent': 778,
+    'ucircumflex': 611,
+    'acircumflex': 556,
+    'Amacron': 722,
+    'rcaron': 389,
+    'ccedilla': 556,
+    'Zdotaccent': 611,
+    'Thorn': 667,
+    'Omacron': 778,
+    'Racute': 722,
+    'Sacute': 667,
+    'dcaron': 743,
+    'Umacron': 722,
+    'uring': 611,
+    'threesuperior': 333,
+    'Ograve': 778,
+    'Agrave': 722,
+    'Abreve': 722,
+    'multiply': 584,
+    'uacute': 611,
+    'Tcaron': 611,
+    'partialdiff': 494,
+    'ydieresis': 556,
+    'Nacute': 722,
+    'icircumflex': 278,
+    'Ecircumflex': 667,
+    'adieresis': 556,
+    'edieresis': 556,
+    'cacute': 556,
+    'nacute': 611,
+    'umacron': 611,
+    'Ncaron': 722,
+    'Iacute': 278,
+    'plusminus': 584,
+    'brokenbar': 280,
+    'registered': 737,
+    'Gbreve': 778,
+    'Idotaccent': 278,
+    'summation': 600,
+    'Egrave': 667,
+    'racute': 389,
+    'omacron': 611,
+    'Zacute': 611,
+    'Zcaron': 611,
+    'greaterequal': 549,
+    'Eth': 722,
+    'Ccedilla': 722,
+    'lcommaaccent': 278,
+    'tcaron': 389,
+    'eogonek': 556,
+    'Uogonek': 722,
+    'Aacute': 722,
+    'Adieresis': 722,
+    'egrave': 556,
+    'zacute': 500,
+    'iogonek': 278,
+    'Oacute': 778,
+    'oacute': 611,
+    'amacron': 556,
+    'sacute': 556,
+    'idieresis': 278,
+    'Ocircumflex': 778,
+    'Ugrave': 722,
+    'Delta': 612,
+    'thorn': 611,
+    'twosuperior': 333,
+    'Odieresis': 778,
+    'mu': 611,
+    'igrave': 278,
+    'ohungarumlaut': 611,
+    'Eogonek': 667,
+    'dcroat': 611,
+    'threequarters': 834,
+    'Scedilla': 667,
+    'lcaron': 400,
+    'Kcommaaccent': 722,
+    'Lacute': 611,
+    'trademark': 1000,
+    'edotaccent': 556,
+    'Igrave': 278,
+    'Imacron': 278,
+    'Lcaron': 611,
+    'onehalf': 834,
+    'lessequal': 549,
+    'ocircumflex': 611,
+    'ntilde': 611,
+    'Uhungarumlaut': 722,
+    'Eacute': 667,
+    'emacron': 556,
+    'gbreve': 611,
+    'onequarter': 834,
+    'Scaron': 667,
+    'Scommaaccent': 667,
+    'Ohungarumlaut': 778,
+    'degree': 400,
+    'ograve': 611,
+    'Ccaron': 722,
+    'ugrave': 611,
+    'radical': 549,
+    'Dcaron': 722,
+    'rcommaaccent': 389,
+    'Ntilde': 722,
+    'otilde': 611,
+    'Rcommaaccent': 722,
+    'Lcommaaccent': 611,
+    'Atilde': 722,
+    'Aogonek': 722,
+    'Aring': 722,
+    'Otilde': 778,
+    'zdotaccent': 500,
+    'Ecaron': 667,
+    'Iogonek': 278,
+    'kcommaaccent': 556,
+    'minus': 584,
+    'Icircumflex': 278,
+    'ncaron': 611,
+    'tcommaaccent': 333,
+    'logicalnot': 584,
+    'odieresis': 611,
+    'udieresis': 611,
+    'notequal': 549,
+    'gcommaaccent': 611,
+    'eth': 611,
+    'zcaron': 500,
+    'ncommaaccent': 611,
+    'onesuperior': 333,
+    'imacron': 278,
+    'Euro': 556
+  },
+  'Helvetica-BoldOblique': {
+    'space': 278,
+    'exclam': 333,
+    'quotedbl': 474,
+    'numbersign': 556,
+    'dollar': 556,
+    'percent': 889,
+    'ampersand': 722,
+    'quoteright': 278,
+    'parenleft': 333,
+    'parenright': 333,
+    'asterisk': 389,
+    'plus': 584,
+    'comma': 278,
+    'hyphen': 333,
+    'period': 278,
+    'slash': 278,
+    'zero': 556,
+    'one': 556,
+    'two': 556,
+    'three': 556,
+    'four': 556,
+    'five': 556,
+    'six': 556,
+    'seven': 556,
+    'eight': 556,
+    'nine': 556,
+    'colon': 333,
+    'semicolon': 333,
+    'less': 584,
+    'equal': 584,
+    'greater': 584,
+    'question': 611,
+    'at': 975,
+    'A': 722,
+    'B': 722,
+    'C': 722,
+    'D': 722,
+    'E': 667,
+    'F': 611,
+    'G': 778,
+    'H': 722,
+    'I': 278,
+    'J': 556,
+    'K': 722,
+    'L': 611,
+    'M': 833,
+    'N': 722,
+    'O': 778,
+    'P': 667,
+    'Q': 778,
+    'R': 722,
+    'S': 667,
+    'T': 611,
+    'U': 722,
+    'V': 667,
+    'W': 944,
+    'X': 667,
+    'Y': 667,
+    'Z': 611,
+    'bracketleft': 333,
+    'backslash': 278,
+    'bracketright': 333,
+    'asciicircum': 584,
+    'underscore': 556,
+    'quoteleft': 278,
+    'a': 556,
+    'b': 611,
+    'c': 556,
+    'd': 611,
+    'e': 556,
+    'f': 333,
+    'g': 611,
+    'h': 611,
+    'i': 278,
+    'j': 278,
+    'k': 556,
+    'l': 278,
+    'm': 889,
+    'n': 611,
+    'o': 611,
+    'p': 611,
+    'q': 611,
+    'r': 389,
+    's': 556,
+    't': 333,
+    'u': 611,
+    'v': 556,
+    'w': 778,
+    'x': 556,
+    'y': 556,
+    'z': 500,
+    'braceleft': 389,
+    'bar': 280,
+    'braceright': 389,
+    'asciitilde': 584,
+    'exclamdown': 333,
+    'cent': 556,
+    'sterling': 556,
+    'fraction': 167,
+    'yen': 556,
+    'florin': 556,
+    'section': 556,
+    'currency': 556,
+    'quotesingle': 238,
+    'quotedblleft': 500,
+    'guillemotleft': 556,
+    'guilsinglleft': 333,
+    'guilsinglright': 333,
+    'fi': 611,
+    'fl': 611,
+    'endash': 556,
+    'dagger': 556,
+    'daggerdbl': 556,
+    'periodcentered': 278,
+    'paragraph': 556,
+    'bullet': 350,
+    'quotesinglbase': 278,
+    'quotedblbase': 500,
+    'quotedblright': 500,
+    'guillemotright': 556,
+    'ellipsis': 1000,
+    'perthousand': 1000,
+    'questiondown': 611,
+    'grave': 333,
+    'acute': 333,
+    'circumflex': 333,
+    'tilde': 333,
+    'macron': 333,
+    'breve': 333,
+    'dotaccent': 333,
+    'dieresis': 333,
+    'ring': 333,
+    'cedilla': 333,
+    'hungarumlaut': 333,
+    'ogonek': 333,
+    'caron': 333,
+    'emdash': 1000,
+    'AE': 1000,
+    'ordfeminine': 370,
+    'Lslash': 611,
+    'Oslash': 778,
+    'OE': 1000,
+    'ordmasculine': 365,
+    'ae': 889,
+    'dotlessi': 278,
+    'lslash': 278,
+    'oslash': 611,
+    'oe': 944,
+    'germandbls': 611,
+    'Idieresis': 278,
+    'eacute': 556,
+    'abreve': 556,
+    'uhungarumlaut': 611,
+    'ecaron': 556,
+    'Ydieresis': 667,
+    'divide': 584,
+    'Yacute': 667,
+    'Acircumflex': 722,
+    'aacute': 556,
+    'Ucircumflex': 722,
+    'yacute': 556,
+    'scommaaccent': 556,
+    'ecircumflex': 556,
+    'Uring': 722,
+    'Udieresis': 722,
+    'aogonek': 556,
+    'Uacute': 722,
+    'uogonek': 611,
+    'Edieresis': 667,
+    'Dcroat': 722,
+    'commaaccent': 250,
+    'copyright': 737,
+    'Emacron': 667,
+    'ccaron': 556,
+    'aring': 556,
+    'Ncommaaccent': 722,
+    'lacute': 278,
+    'agrave': 556,
+    'Tcommaaccent': 611,
+    'Cacute': 722,
+    'atilde': 556,
+    'Edotaccent': 667,
+    'scaron': 556,
+    'scedilla': 556,
+    'iacute': 278,
+    'lozenge': 494,
+    'Rcaron': 722,
+    'Gcommaaccent': 778,
+    'ucircumflex': 611,
+    'acircumflex': 556,
+    'Amacron': 722,
+    'rcaron': 389,
+    'ccedilla': 556,
+    'Zdotaccent': 611,
+    'Thorn': 667,
+    'Omacron': 778,
+    'Racute': 722,
+    'Sacute': 667,
+    'dcaron': 743,
+    'Umacron': 722,
+    'uring': 611,
+    'threesuperior': 333,
+    'Ograve': 778,
+    'Agrave': 722,
+    'Abreve': 722,
+    'multiply': 584,
+    'uacute': 611,
+    'Tcaron': 611,
+    'partialdiff': 494,
+    'ydieresis': 556,
+    'Nacute': 722,
+    'icircumflex': 278,
+    'Ecircumflex': 667,
+    'adieresis': 556,
+    'edieresis': 556,
+    'cacute': 556,
+    'nacute': 611,
+    'umacron': 611,
+    'Ncaron': 722,
+    'Iacute': 278,
+    'plusminus': 584,
+    'brokenbar': 280,
+    'registered': 737,
+    'Gbreve': 778,
+    'Idotaccent': 278,
+    'summation': 600,
+    'Egrave': 667,
+    'racute': 389,
+    'omacron': 611,
+    'Zacute': 611,
+    'Zcaron': 611,
+    'greaterequal': 549,
+    'Eth': 722,
+    'Ccedilla': 722,
+    'lcommaaccent': 278,
+    'tcaron': 389,
+    'eogonek': 556,
+    'Uogonek': 722,
+    'Aacute': 722,
+    'Adieresis': 722,
+    'egrave': 556,
+    'zacute': 500,
+    'iogonek': 278,
+    'Oacute': 778,
+    'oacute': 611,
+    'amacron': 556,
+    'sacute': 556,
+    'idieresis': 278,
+    'Ocircumflex': 778,
+    'Ugrave': 722,
+    'Delta': 612,
+    'thorn': 611,
+    'twosuperior': 333,
+    'Odieresis': 778,
+    'mu': 611,
+    'igrave': 278,
+    'ohungarumlaut': 611,
+    'Eogonek': 667,
+    'dcroat': 611,
+    'threequarters': 834,
+    'Scedilla': 667,
+    'lcaron': 400,
+    'Kcommaaccent': 722,
+    'Lacute': 611,
+    'trademark': 1000,
+    'edotaccent': 556,
+    'Igrave': 278,
+    'Imacron': 278,
+    'Lcaron': 611,
+    'onehalf': 834,
+    'lessequal': 549,
+    'ocircumflex': 611,
+    'ntilde': 611,
+    'Uhungarumlaut': 722,
+    'Eacute': 667,
+    'emacron': 556,
+    'gbreve': 611,
+    'onequarter': 834,
+    'Scaron': 667,
+    'Scommaaccent': 667,
+    'Ohungarumlaut': 778,
+    'degree': 400,
+    'ograve': 611,
+    'Ccaron': 722,
+    'ugrave': 611,
+    'radical': 549,
+    'Dcaron': 722,
+    'rcommaaccent': 389,
+    'Ntilde': 722,
+    'otilde': 611,
+    'Rcommaaccent': 722,
+    'Lcommaaccent': 611,
+    'Atilde': 722,
+    'Aogonek': 722,
+    'Aring': 722,
+    'Otilde': 778,
+    'zdotaccent': 500,
+    'Ecaron': 667,
+    'Iogonek': 278,
+    'kcommaaccent': 556,
+    'minus': 584,
+    'Icircumflex': 278,
+    'ncaron': 611,
+    'tcommaaccent': 333,
+    'logicalnot': 584,
+    'odieresis': 611,
+    'udieresis': 611,
+    'notequal': 549,
+    'gcommaaccent': 611,
+    'eth': 611,
+    'zcaron': 500,
+    'ncommaaccent': 611,
+    'onesuperior': 333,
+    'imacron': 278,
+    'Euro': 556
+  },
+  'Helvetica-Oblique' : {
+    'space': 278,
+    'exclam': 278,
+    'quotedbl': 355,
+    'numbersign': 556,
+    'dollar': 556,
+    'percent': 889,
+    'ampersand': 667,
+    'quoteright': 222,
+    'parenleft': 333,
+    'parenright': 333,
+    'asterisk': 389,
+    'plus': 584,
+    'comma': 278,
+    'hyphen': 333,
+    'period': 278,
+    'slash': 278,
+    'zero': 556,
+    'one': 556,
+    'two': 556,
+    'three': 556,
+    'four': 556,
+    'five': 556,
+    'six': 556,
+    'seven': 556,
+    'eight': 556,
+    'nine': 556,
+    'colon': 278,
+    'semicolon': 278,
+    'less': 584,
+    'equal': 584,
+    'greater': 584,
+    'question': 556,
+    'at': 1015,
+    'A': 667,
+    'B': 667,
+    'C': 722,
+    'D': 722,
+    'E': 667,
+    'F': 611,
+    'G': 778,
+    'H': 722,
+    'I': 278,
+    'J': 500,
+    'K': 667,
+    'L': 556,
+    'M': 833,
+    'N': 722,
+    'O': 778,
+    'P': 667,
+    'Q': 778,
+    'R': 722,
+    'S': 667,
+    'T': 611,
+    'U': 722,
+    'V': 667,
+    'W': 944,
+    'X': 667,
+    'Y': 667,
+    'Z': 611,
+    'bracketleft': 278,
+    'backslash': 278,
+    'bracketright': 278,
+    'asciicircum': 469,
+    'underscore': 556,
+    'quoteleft': 222,
+    'a': 556,
+    'b': 556,
+    'c': 500,
+    'd': 556,
+    'e': 556,
+    'f': 278,
+    'g': 556,
+    'h': 556,
+    'i': 222,
+    'j': 222,
+    'k': 500,
+    'l': 222,
+    'm': 833,
+    'n': 556,
+    'o': 556,
+    'p': 556,
+    'q': 556,
+    'r': 333,
+    's': 500,
+    't': 278,
+    'u': 556,
+    'v': 500,
+    'w': 722,
+    'x': 500,
+    'y': 500,
+    'z': 500,
+    'braceleft': 334,
+    'bar': 260,
+    'braceright': 334,
+    'asciitilde': 584,
+    'exclamdown': 333,
+    'cent': 556,
+    'sterling': 556,
+    'fraction': 167,
+    'yen': 556,
+    'florin': 556,
+    'section': 556,
+    'currency': 556,
+    'quotesingle': 191,
+    'quotedblleft': 333,
+    'guillemotleft': 556,
+    'guilsinglleft': 333,
+    'guilsinglright': 333,
+    'fi': 500,
+    'fl': 500,
+    'endash': 556,
+    'dagger': 556,
+    'daggerdbl': 556,
+    'periodcentered': 278,
+    'paragraph': 537,
+    'bullet': 350,
+    'quotesinglbase': 222,
+    'quotedblbase': 333,
+    'quotedblright': 333,
+    'guillemotright': 556,
+    'ellipsis': 1000,
+    'perthousand': 1000,
+    'questiondown': 611,
+    'grave': 333,
+    'acute': 333,
+    'circumflex': 333,
+    'tilde': 333,
+    'macron': 333,
+    'breve': 333,
+    'dotaccent': 333,
+    'dieresis': 333,
+    'ring': 333,
+    'cedilla': 333,
+    'hungarumlaut': 333,
+    'ogonek': 333,
+    'caron': 333,
+    'emdash': 1000,
+    'AE': 1000,
+    'ordfeminine': 370,
+    'Lslash': 556,
+    'Oslash': 778,
+    'OE': 1000,
+    'ordmasculine': 365,
+    'ae': 889,
+    'dotlessi': 278,
+    'lslash': 222,
+    'oslash': 611,
+    'oe': 944,
+    'germandbls': 611,
+    'Idieresis': 278,
+    'eacute': 556,
+    'abreve': 556,
+    'uhungarumlaut': 556,
+    'ecaron': 556,
+    'Ydieresis': 667,
+    'divide': 584,
+    'Yacute': 667,
+    'Acircumflex': 667,
+    'aacute': 556,
+    'Ucircumflex': 722,
+    'yacute': 500,
+    'scommaaccent': 500,
+    'ecircumflex': 556,
+    'Uring': 722,
+    'Udieresis': 722,
+    'aogonek': 556,
+    'Uacute': 722,
+    'uogonek': 556,
+    'Edieresis': 667,
+    'Dcroat': 722,
+    'commaaccent': 250,
+    'copyright': 737,
+    'Emacron': 667,
+    'ccaron': 500,
+    'aring': 556,
+    'Ncommaaccent': 722,
+    'lacute': 222,
+    'agrave': 556,
+    'Tcommaaccent': 611,
+    'Cacute': 722,
+    'atilde': 556,
+    'Edotaccent': 667,
+    'scaron': 500,
+    'scedilla': 500,
+    'iacute': 278,
+    'lozenge': 471,
+    'Rcaron': 722,
+    'Gcommaaccent': 778,
+    'ucircumflex': 556,
+    'acircumflex': 556,
+    'Amacron': 667,
+    'rcaron': 333,
+    'ccedilla': 500,
+    'Zdotaccent': 611,
+    'Thorn': 667,
+    'Omacron': 778,
+    'Racute': 722,
+    'Sacute': 667,
+    'dcaron': 643,
+    'Umacron': 722,
+    'uring': 556,
+    'threesuperior': 333,
+    'Ograve': 778,
+    'Agrave': 667,
+    'Abreve': 667,
+    'multiply': 584,
+    'uacute': 556,
+    'Tcaron': 611,
+    'partialdiff': 476,
+    'ydieresis': 500,
+    'Nacute': 722,
+    'icircumflex': 278,
+    'Ecircumflex': 667,
+    'adieresis': 556,
+    'edieresis': 556,
+    'cacute': 500,
+    'nacute': 556,
+    'umacron': 556,
+    'Ncaron': 722,
+    'Iacute': 278,
+    'plusminus': 584,
+    'brokenbar': 260,
+    'registered': 737,
+    'Gbreve': 778,
+    'Idotaccent': 278,
+    'summation': 600,
+    'Egrave': 667,
+    'racute': 333,
+    'omacron': 556,
+    'Zacute': 611,
+    'Zcaron': 611,
+    'greaterequal': 549,
+    'Eth': 722,
+    'Ccedilla': 722,
+    'lcommaaccent': 222,
+    'tcaron': 317,
+    'eogonek': 556,
+    'Uogonek': 722,
+    'Aacute': 667,
+    'Adieresis': 667,
+    'egrave': 556,
+    'zacute': 500,
+    'iogonek': 222,
+    'Oacute': 778,
+    'oacute': 556,
+    'amacron': 556,
+    'sacute': 500,
+    'idieresis': 278,
+    'Ocircumflex': 778,
+    'Ugrave': 722,
+    'Delta': 612,
+    'thorn': 556,
+    'twosuperior': 333,
+    'Odieresis': 778,
+    'mu': 556,
+    'igrave': 278,
+    'ohungarumlaut': 556,
+    'Eogonek': 667,
+    'dcroat': 556,
+    'threequarters': 834,
+    'Scedilla': 667,
+    'lcaron': 299,
+    'Kcommaaccent': 667,
+    'Lacute': 556,
+    'trademark': 1000,
+    'edotaccent': 556,
+    'Igrave': 278,
+    'Imacron': 278,
+    'Lcaron': 556,
+    'onehalf': 834,
+    'lessequal': 549,
+    'ocircumflex': 556,
+    'ntilde': 556,
+    'Uhungarumlaut': 722,
+    'Eacute': 667,
+    'emacron': 556,
+    'gbreve': 556,
+    'onequarter': 834,
+    'Scaron': 667,
+    'Scommaaccent': 667,
+    'Ohungarumlaut': 778,
+    'degree': 400,
+    'ograve': 556,
+    'Ccaron': 722,
+    'ugrave': 556,
+    'radical': 453,
+    'Dcaron': 722,
+    'rcommaaccent': 333,
+    'Ntilde': 722,
+    'otilde': 556,
+    'Rcommaaccent': 722,
+    'Lcommaaccent': 556,
+    'Atilde': 667,
+    'Aogonek': 667,
+    'Aring': 667,
+    'Otilde': 778,
+    'zdotaccent': 500,
+    'Ecaron': 667,
+    'Iogonek': 278,
+    'kcommaaccent': 500,
+    'minus': 584,
+    'Icircumflex': 278,
+    'ncaron': 556,
+    'tcommaaccent': 278,
+    'logicalnot': 584,
+    'odieresis': 556,
+    'udieresis': 556,
+    'notequal': 549,
+    'gcommaaccent': 556,
+    'eth': 556,
+    'zcaron': 500,
+    'ncommaaccent': 556,
+    'onesuperior': 333,
+    'imacron': 278,
+    'Euro': 556
+  },
+  'Symbol': {
+    'space': 250,
+    'exclam': 333,
+    'universal': 713,
+    'numbersign': 500,
+    'existential': 549,
+    'percent': 833,
+    'ampersand': 778,
+    'suchthat': 439,
+    'parenleft': 333,
+    'parenright': 333,
+    'asteriskmath': 500,
+    'plus': 549,
+    'comma': 250,
+    'minus': 549,
+    'period': 250,
+    'slash': 278,
+    'zero': 500,
+    'one': 500,
+    'two': 500,
+    'three': 500,
+    'four': 500,
+    'five': 500,
+    'six': 500,
+    'seven': 500,
+    'eight': 500,
+    'nine': 500,
+    'colon': 278,
+    'semicolon': 278,
+    'less': 549,
+    'equal': 549,
+    'greater': 549,
+    'question': 444,
+    'congruent': 549,
+    'Alpha': 722,
+    'Beta': 667,
+    'Chi': 722,
+    'Delta': 612,
+    'Epsilon': 611,
+    'Phi': 763,
+    'Gamma': 603,
+    'Eta': 722,
+    'Iota': 333,
+    'theta1': 631,
+    'Kappa': 722,
+    'Lambda': 686,
+    'Mu': 889,
+    'Nu': 722,
+    'Omicron': 722,
+    'Pi': 768,
+    'Theta': 741,
+    'Rho': 556,
+    'Sigma': 592,
+    'Tau': 611,
+    'Upsilon': 690,
+    'sigma1': 439,
+    'Omega': 768,
+    'Xi': 645,
+    'Psi': 795,
+    'Zeta': 611,
+    'bracketleft': 333,
+    'therefore': 863,
+    'bracketright': 333,
+    'perpendicular': 658,
+    'underscore': 500,
+    'radicalex': 500,
+    'alpha': 631,
+    'beta': 549,
+    'chi': 549,
+    'delta': 494,
+    'epsilon': 439,
+    'phi': 521,
+    'gamma': 411,
+    'eta': 603,
+    'iota': 329,
+    'phi1': 603,
+    'kappa': 549,
+    'lambda': 549,
+    'mu': 576,
+    'nu': 521,
+    'omicron': 549,
+    'pi': 549,
+    'theta': 521,
+    'rho': 549,
+    'sigma': 603,
+    'tau': 439,
+    'upsilon': 576,
+    'omega1': 713,
+    'omega': 686,
+    'xi': 493,
+    'psi': 686,
+    'zeta': 494,
+    'braceleft': 480,
+    'bar': 200,
+    'braceright': 480,
+    'similar': 549,
+    'Euro': 750,
+    'Upsilon1': 620,
+    'minute': 247,
+    'lessequal': 549,
+    'fraction': 167,
+    'infinity': 713,
+    'florin': 500,
+    'club': 753,
+    'diamond': 753,
+    'heart': 753,
+    'spade': 753,
+    'arrowboth': 1042,
+    'arrowleft': 987,
+    'arrowup': 603,
+    'arrowright': 987,
+    'arrowdown': 603,
+    'degree': 400,
+    'plusminus': 549,
+    'second': 411,
+    'greaterequal': 549,
+    'multiply': 549,
+    'proportional': 713,
+    'partialdiff': 494,
+    'bullet': 460,
+    'divide': 549,
+    'notequal': 549,
+    'equivalence': 549,
+    'approxequal': 549,
+    'ellipsis': 1000,
+    'arrowvertex': 603,
+    'arrowhorizex': 1000,
+    'carriagereturn': 658,
+    'aleph': 823,
+    'Ifraktur': 686,
+    'Rfraktur': 795,
+    'weierstrass': 987,
+    'circlemultiply': 768,
+    'circleplus': 768,
+    'emptyset': 823,
+    'intersection': 768,
+    'union': 768,
+    'propersuperset': 713,
+    'reflexsuperset': 713,
+    'notsubset': 713,
+    'propersubset': 713,
+    'reflexsubset': 713,
+    'element': 713,
+    'notelement': 713,
+    'angle': 768,
+    'gradient': 713,
+    'registerserif': 790,
+    'copyrightserif': 790,
+    'trademarkserif': 890,
+    'product': 823,
+    'radical': 549,
+    'dotmath': 250,
+    'logicalnot': 713,
+    'logicaland': 603,
+    'logicalor': 603,
+    'arrowdblboth': 1042,
+    'arrowdblleft': 987,
+    'arrowdblup': 603,
+    'arrowdblright': 987,
+    'arrowdbldown': 603,
+    'lozenge': 494,
+    'angleleft': 329,
+    'registersans': 790,
+    'copyrightsans': 790,
+    'trademarksans': 786,
+    'summation': 713,
+    'parenlefttp': 384,
+    'parenleftex': 384,
+    'parenleftbt': 384,
+    'bracketlefttp': 384,
+    'bracketleftex': 384,
+    'bracketleftbt': 384,
+    'bracelefttp': 494,
+    'braceleftmid': 494,
+    'braceleftbt': 494,
+    'braceex': 494,
+    'angleright': 329,
+    'integral': 274,
+    'integraltp': 686,
+    'integralex': 686,
+    'integralbt': 686,
+    'parenrighttp': 384,
+    'parenrightex': 384,
+    'parenrightbt': 384,
+    'bracketrighttp': 384,
+    'bracketrightex': 384,
+    'bracketrightbt': 384,
+    'bracerighttp': 494,
+    'bracerightmid': 494,
+    'bracerightbt': 494,
+    'apple': 790
+  },
+  'Times-Roman': {
+    'space': 250,
+    'exclam': 333,
+    'quotedbl': 408,
+    'numbersign': 500,
+    'dollar': 500,
+    'percent': 833,
+    'ampersand': 778,
+    'quoteright': 333,
+    'parenleft': 333,
+    'parenright': 333,
+    'asterisk': 500,
+    'plus': 564,
+    'comma': 250,
+    'hyphen': 333,
+    'period': 250,
+    'slash': 278,
+    'zero': 500,
+    'one': 500,
+    'two': 500,
+    'three': 500,
+    'four': 500,
+    'five': 500,
+    'six': 500,
+    'seven': 500,
+    'eight': 500,
+    'nine': 500,
+    'colon': 278,
+    'semicolon': 278,
+    'less': 564,
+    'equal': 564,
+    'greater': 564,
+    'question': 444,
+    'at': 921,
+    'A': 722,
+    'B': 667,
+    'C': 667,
+    'D': 722,
+    'E': 611,
+    'F': 556,
+    'G': 722,
+    'H': 722,
+    'I': 333,
+    'J': 389,
+    'K': 722,
+    'L': 611,
+    'M': 889,
+    'N': 722,
+    'O': 722,
+    'P': 556,
+    'Q': 722,
+    'R': 667,
+    'S': 556,
+    'T': 611,
+    'U': 722,
+    'V': 722,
+    'W': 944,
+    'X': 722,
+    'Y': 722,
+    'Z': 611,
+    'bracketleft': 333,
+    'backslash': 278,
+    'bracketright': 333,
+    'asciicircum': 469,
+    'underscore': 500,
+    'quoteleft': 333,
+    'a': 444,
+    'b': 500,
+    'c': 444,
+    'd': 500,
+    'e': 444,
+    'f': 333,
+    'g': 500,
+    'h': 500,
+    'i': 278,
+    'j': 278,
+    'k': 500,
+    'l': 278,
+    'm': 778,
+    'n': 500,
+    'o': 500,
+    'p': 500,
+    'q': 500,
+    'r': 333,
+    's': 389,
+    't': 278,
+    'u': 500,
+    'v': 500,
+    'w': 722,
+    'x': 500,
+    'y': 500,
+    'z': 444,
+    'braceleft': 480,
+    'bar': 200,
+    'braceright': 480,
+    'asciitilde': 541,
+    'exclamdown': 333,
+    'cent': 500,
+    'sterling': 500,
+    'fraction': 167,
+    'yen': 500,
+    'florin': 500,
+    'section': 500,
+    'currency': 500,
+    'quotesingle': 180,
+    'quotedblleft': 444,
+    'guillemotleft': 500,
+    'guilsinglleft': 333,
+    'guilsinglright': 333,
+    'fi': 556,
+    'fl': 556,
+    'endash': 500,
+    'dagger': 500,
+    'daggerdbl': 500,
+    'periodcentered': 250,
+    'paragraph': 453,
+    'bullet': 350,
+    'quotesinglbase': 333,
+    'quotedblbase': 444,
+    'quotedblright': 444,
+    'guillemotright': 500,
+    'ellipsis': 1000,
+    'perthousand': 1000,
+    'questiondown': 444,
+    'grave': 333,
+    'acute': 333,
+    'circumflex': 333,
+    'tilde': 333,
+    'macron': 333,
+    'breve': 333,
+    'dotaccent': 333,
+    'dieresis': 333,
+    'ring': 333,
+    'cedilla': 333,
+    'hungarumlaut': 333,
+    'ogonek': 333,
+    'caron': 333,
+    'emdash': 1000,
+    'AE': 889,
+    'ordfeminine': 276,
+    'Lslash': 611,
+    'Oslash': 722,
+    'OE': 889,
+    'ordmasculine': 310,
+    'ae': 667,
+    'dotlessi': 278,
+    'lslash': 278,
+    'oslash': 500,
+    'oe': 722,
+    'germandbls': 500,
+    'Idieresis': 333,
+    'eacute': 444,
+    'abreve': 444,
+    'uhungarumlaut': 500,
+    'ecaron': 444,
+    'Ydieresis': 722,
+    'divide': 564,
+    'Yacute': 722,
+    'Acircumflex': 722,
+    'aacute': 444,
+    'Ucircumflex': 722,
+    'yacute': 500,
+    'scommaaccent': 389,
+    'ecircumflex': 444,
+    'Uring': 722,
+    'Udieresis': 722,
+    'aogonek': 444,
+    'Uacute': 722,
+    'uogonek': 500,
+    'Edieresis': 611,
+    'Dcroat': 722,
+    'commaaccent': 250,
+    'copyright': 760,
+    'Emacron': 611,
+    'ccaron': 444,
+    'aring': 444,
+    'Ncommaaccent': 722,
+    'lacute': 278,
+    'agrave': 444,
+    'Tcommaaccent': 611,
+    'Cacute': 667,
+    'atilde': 444,
+    'Edotaccent': 611,
+    'scaron': 389,
+    'scedilla': 389,
+    'iacute': 278,
+    'lozenge': 471,
+    'Rcaron': 667,
+    'Gcommaaccent': 722,
+    'ucircumflex': 500,
+    'acircumflex': 444,
+    'Amacron': 722,
+    'rcaron': 333,
+    'ccedilla': 444,
+    'Zdotaccent': 611,
+    'Thorn': 556,
+    'Omacron': 722,
+    'Racute': 667,
+    'Sacute': 556,
+    'dcaron': 588,
+    'Umacron': 722,
+    'uring': 500,
+    'threesuperior': 300,
+    'Ograve': 722,
+    'Agrave': 722,
+    'Abreve': 722,
+    'multiply': 564,
+    'uacute': 500,
+    'Tcaron': 611,
+    'partialdiff': 476,
+    'ydieresis': 500,
+    'Nacute': 722,
+    'icircumflex': 278,
+    'Ecircumflex': 611,
+    'adieresis': 444,
+    'edieresis': 444,
+    'cacute': 444,
+    'nacute': 500,
+    'umacron': 500,
+    'Ncaron': 722,
+    'Iacute': 333,
+    'plusminus': 564,
+    'brokenbar': 200,
+    'registered': 760,
+    'Gbreve': 722,
+    'Idotaccent': 333,
+    'summation': 600,
+    'Egrave': 611,
+    'racute': 333,
+    'omacron': 500,
+    'Zacute': 611,
+    'Zcaron': 611,
+    'greaterequal': 549,
+    'Eth': 722,
+    'Ccedilla': 667,
+    'lcommaaccent': 278,
+    'tcaron': 326,
+    'eogonek': 444,
+    'Uogonek': 722,
+    'Aacute': 722,
+    'Adieresis': 722,
+    'egrave': 444,
+    'zacute': 444,
+    'iogonek': 278,
+    'Oacute': 722,
+    'oacute': 500,
+    'amacron': 444,
+    'sacute': 389,
+    'idieresis': 278,
+    'Ocircumflex': 722,
+    'Ugrave': 722,
+    'Delta': 612,
+    'thorn': 500,
+    'twosuperior': 300,
+    'Odieresis': 722,
+    'mu': 500,
+    'igrave': 278,
+    'ohungarumlaut': 500,
+    'Eogonek': 611,
+    'dcroat': 500,
+    'threequarters': 750,
+    'Scedilla': 556,
+    'lcaron': 344,
+    'Kcommaaccent': 722,
+    'Lacute': 611,
+    'trademark': 980,
+    'edotaccent': 444,
+    'Igrave': 333,
+    'Imacron': 333,
+    'Lcaron': 611,
+    'onehalf': 750,
+    'lessequal': 549,
+    'ocircumflex': 500,
+    'ntilde': 500,
+    'Uhungarumlaut': 722,
+    'Eacute': 611,
+    'emacron': 444,
+    'gbreve': 500,
+    'onequarter': 750,
+    'Scaron': 556,
+    'Scommaaccent': 556,
+    'Ohungarumlaut': 722,
+    'degree': 400,
+    'ograve': 500,
+    'Ccaron': 667,
+    'ugrave': 500,
+    'radical': 453,
+    'Dcaron': 722,
+    'rcommaaccent': 333,
+    'Ntilde': 722,
+    'otilde': 500,
+    'Rcommaaccent': 667,
+    'Lcommaaccent': 611,
+    'Atilde': 722,
+    'Aogonek': 722,
+    'Aring': 722,
+    'Otilde': 722,
+    'zdotaccent': 444,
+    'Ecaron': 611,
+    'Iogonek': 333,
+    'kcommaaccent': 500,
+    'minus': 564,
+    'Icircumflex': 333,
+    'ncaron': 500,
+    'tcommaaccent': 278,
+    'logicalnot': 564,
+    'odieresis': 500,
+    'udieresis': 500,
+    'notequal': 549,
+    'gcommaaccent': 500,
+    'eth': 500,
+    'zcaron': 444,
+    'ncommaaccent': 500,
+    'onesuperior': 300,
+    'imacron': 278,
+    'Euro': 500
+  },
+  'Times-Bold': {
+    'space': 250,
+    'exclam': 333,
+    'quotedbl': 555,
+    'numbersign': 500,
+    'dollar': 500,
+    'percent': 1000,
+    'ampersand': 833,
+    'quoteright': 333,
+    'parenleft': 333,
+    'parenright': 333,
+    'asterisk': 500,
+    'plus': 570,
+    'comma': 250,
+    'hyphen': 333,
+    'period': 250,
+    'slash': 278,
+    'zero': 500,
+    'one': 500,
+    'two': 500,
+    'three': 500,
+    'four': 500,
+    'five': 500,
+    'six': 500,
+    'seven': 500,
+    'eight': 500,
+    'nine': 500,
+    'colon': 333,
+    'semicolon': 333,
+    'less': 570,
+    'equal': 570,
+    'greater': 570,
+    'question': 500,
+    'at': 930,
+    'A': 722,
+    'B': 667,
+    'C': 722,
+    'D': 722,
+    'E': 667,
+    'F': 611,
+    'G': 778,
+    'H': 778,
+    'I': 389,
+    'J': 500,
+    'K': 778,
+    'L': 667,
+    'M': 944,
+    'N': 722,
+    'O': 778,
+    'P': 611,
+    'Q': 778,
+    'R': 722,
+    'S': 556,
+    'T': 667,
+    'U': 722,
+    'V': 722,
+    'W': 1000,
+    'X': 722,
+    'Y': 722,
+    'Z': 667,
+    'bracketleft': 333,
+    'backslash': 278,
+    'bracketright': 333,
+    'asciicircum': 581,
+    'underscore': 500,
+    'quoteleft': 333,
+    'a': 500,
+    'b': 556,
+    'c': 444,
+    'd': 556,
+    'e': 444,
+    'f': 333,
+    'g': 500,
+    'h': 556,
+    'i': 278,
+    'j': 333,
+    'k': 556,
+    'l': 278,
+    'm': 833,
+    'n': 556,
+    'o': 500,
+    'p': 556,
+    'q': 556,
+    'r': 444,
+    's': 389,
+    't': 333,
+    'u': 556,
+    'v': 500,
+    'w': 722,
+    'x': 500,
+    'y': 500,
+    'z': 444,
+    'braceleft': 394,
+    'bar': 220,
+    'braceright': 394,
+    'asciitilde': 520,
+    'exclamdown': 333,
+    'cent': 500,
+    'sterling': 500,
+    'fraction': 167,
+    'yen': 500,
+    'florin': 500,
+    'section': 500,
+    'currency': 500,
+    'quotesingle': 278,
+    'quotedblleft': 500,
+    'guillemotleft': 500,
+    'guilsinglleft': 333,
+    'guilsinglright': 333,
+    'fi': 556,
+    'fl': 556,
+    'endash': 500,
+    'dagger': 500,
+    'daggerdbl': 500,
+    'periodcentered': 250,
+    'paragraph': 540,
+    'bullet': 350,
+    'quotesinglbase': 333,
+    'quotedblbase': 500,
+    'quotedblright': 500,
+    'guillemotright': 500,
+    'ellipsis': 1000,
+    'perthousand': 1000,
+    'questiondown': 500,
+    'grave': 333,
+    'acute': 333,
+    'circumflex': 333,
+    'tilde': 333,
+    'macron': 333,
+    'breve': 333,
+    'dotaccent': 333,
+    'dieresis': 333,
+    'ring': 333,
+    'cedilla': 333,
+    'hungarumlaut': 333,
+    'ogonek': 333,
+    'caron': 333,
+    'emdash': 1000,
+    'AE': 1000,
+    'ordfeminine': 300,
+    'Lslash': 667,
+    'Oslash': 778,
+    'OE': 1000,
+    'ordmasculine': 330,
+    'ae': 722,
+    'dotlessi': 278,
+    'lslash': 278,
+    'oslash': 500,
+    'oe': 722,
+    'germandbls': 556,
+    'Idieresis': 389,
+    'eacute': 444,
+    'abreve': 500,
+    'uhungarumlaut': 556,
+    'ecaron': 444,
+    'Ydieresis': 722,
+    'divide': 570,
+    'Yacute': 722,
+    'Acircumflex': 722,
+    'aacute': 500,
+    'Ucircumflex': 722,
+    'yacute': 500,
+    'scommaaccent': 389,
+    'ecircumflex': 444,
+    'Uring': 722,
+    'Udieresis': 722,
+    'aogonek': 500,
+    'Uacute': 722,
+    'uogonek': 556,
+    'Edieresis': 667,
+    'Dcroat': 722,
+    'commaaccent': 250,
+    'copyright': 747,
+    'Emacron': 667,
+    'ccaron': 444,
+    'aring': 500,
+    'Ncommaaccent': 722,
+    'lacute': 278,
+    'agrave': 500,
+    'Tcommaaccent': 667,
+    'Cacute': 722,
+    'atilde': 500,
+    'Edotaccent': 667,
+    'scaron': 389,
+    'scedilla': 389,
+    'iacute': 278,
+    'lozenge': 494,
+    'Rcaron': 722,
+    'Gcommaaccent': 778,
+    'ucircumflex': 556,
+    'acircumflex': 500,
+    'Amacron': 722,
+    'rcaron': 444,
+    'ccedilla': 444,
+    'Zdotaccent': 667,
+    'Thorn': 611,
+    'Omacron': 778,
+    'Racute': 722,
+    'Sacute': 556,
+    'dcaron': 672,
+    'Umacron': 722,
+    'uring': 556,
+    'threesuperior': 300,
+    'Ograve': 778,
+    'Agrave': 722,
+    'Abreve': 722,
+    'multiply': 570,
+    'uacute': 556,
+    'Tcaron': 667,
+    'partialdiff': 494,
+    'ydieresis': 500,
+    'Nacute': 722,
+    'icircumflex': 278,
+    'Ecircumflex': 667,
+    'adieresis': 500,
+    'edieresis': 444,
+    'cacute': 444,
+    'nacute': 556,
+    'umacron': 556,
+    'Ncaron': 722,
+    'Iacute': 389,
+    'plusminus': 570,
+    'brokenbar': 220,
+    'registered': 747,
+    'Gbreve': 778,
+    'Idotaccent': 389,
+    'summation': 600,
+    'Egrave': 667,
+    'racute': 444,
+    'omacron': 500,
+    'Zacute': 667,
+    'Zcaron': 667,
+    'greaterequal': 549,
+    'Eth': 722,
+    'Ccedilla': 722,
+    'lcommaaccent': 278,
+    'tcaron': 416,
+    'eogonek': 444,
+    'Uogonek': 722,
+    'Aacute': 722,
+    'Adieresis': 722,
+    'egrave': 444,
+    'zacute': 444,
+    'iogonek': 278,
+    'Oacute': 778,
+    'oacute': 500,
+    'amacron': 500,
+    'sacute': 389,
+    'idieresis': 278,
+    'Ocircumflex': 778,
+    'Ugrave': 722,
+    'Delta': 612,
+    'thorn': 556,
+    'twosuperior': 300,
+    'Odieresis': 778,
+    'mu': 556,
+    'igrave': 278,
+    'ohungarumlaut': 500,
+    'Eogonek': 667,
+    'dcroat': 556,
+    'threequarters': 750,
+    'Scedilla': 556,
+    'lcaron': 394,
+    'Kcommaaccent': 778,
+    'Lacute': 667,
+    'trademark': 1000,
+    'edotaccent': 444,
+    'Igrave': 389,
+    'Imacron': 389,
+    'Lcaron': 667,
+    'onehalf': 750,
+    'lessequal': 549,
+    'ocircumflex': 500,
+    'ntilde': 556,
+    'Uhungarumlaut': 722,
+    'Eacute': 667,
+    'emacron': 444,
+    'gbreve': 500,
+    'onequarter': 750,
+    'Scaron': 556,
+    'Scommaaccent': 556,
+    'Ohungarumlaut': 778,
+    'degree': 400,
+    'ograve': 500,
+    'Ccaron': 722,
+    'ugrave': 556,
+    'radical': 549,
+    'Dcaron': 722,
+    'rcommaaccent': 444,
+    'Ntilde': 722,
+    'otilde': 500,
+    'Rcommaaccent': 722,
+    'Lcommaaccent': 667,
+    'Atilde': 722,
+    'Aogonek': 722,
+    'Aring': 722,
+    'Otilde': 778,
+    'zdotaccent': 444,
+    'Ecaron': 667,
+    'Iogonek': 389,
+    'kcommaaccent': 556,
+    'minus': 570,
+    'Icircumflex': 389,
+    'ncaron': 556,
+    'tcommaaccent': 333,
+    'logicalnot': 570,
+    'odieresis': 500,
+    'udieresis': 556,
+    'notequal': 549,
+    'gcommaaccent': 500,
+    'eth': 500,
+    'zcaron': 444,
+    'ncommaaccent': 556,
+    'onesuperior': 300,
+    'imacron': 278,
+    'Euro': 500
+  },
+  'Times-BoldItalic': {
+    'space': 250,
+    'exclam': 389,
+    'quotedbl': 555,
+    'numbersign': 500,
+    'dollar': 500,
+    'percent': 833,
+    'ampersand': 778,
+    'quoteright': 333,
+    'parenleft': 333,
+    'parenright': 333,
+    'asterisk': 500,
+    'plus': 570,
+    'comma': 250,
+    'hyphen': 333,
+    'period': 250,
+    'slash': 278,
+    'zero': 500,
+    'one': 500,
+    'two': 500,
+    'three': 500,
+    'four': 500,
+    'five': 500,
+    'six': 500,
+    'seven': 500,
+    'eight': 500,
+    'nine': 500,
+    'colon': 333,
+    'semicolon': 333,
+    'less': 570,
+    'equal': 570,
+    'greater': 570,
+    'question': 500,
+    'at': 832,
+    'A': 667,
+    'B': 667,
+    'C': 667,
+    'D': 722,
+    'E': 667,
+    'F': 667,
+    'G': 722,
+    'H': 778,
+    'I': 389,
+    'J': 500,
+    'K': 667,
+    'L': 611,
+    'M': 889,
+    'N': 722,
+    'O': 722,
+    'P': 611,
+    'Q': 722,
+    'R': 667,
+    'S': 556,
+    'T': 611,
+    'U': 722,
+    'V': 667,
+    'W': 889,
+    'X': 667,
+    'Y': 611,
+    'Z': 611,
+    'bracketleft': 333,
+    'backslash': 278,
+    'bracketright': 333,
+    'asciicircum': 570,
+    'underscore': 500,
+    'quoteleft': 333,
+    'a': 500,
+    'b': 500,
+    'c': 444,
+    'd': 500,
+    'e': 444,
+    'f': 333,
+    'g': 500,
+    'h': 556,
+    'i': 278,
+    'j': 278,
+    'k': 500,
+    'l': 278,
+    'm': 778,
+    'n': 556,
+    'o': 500,
+    'p': 500,
+    'q': 500,
+    'r': 389,
+    's': 389,
+    't': 278,
+    'u': 556,
+    'v': 444,
+    'w': 667,
+    'x': 500,
+    'y': 444,
+    'z': 389,
+    'braceleft': 348,
+    'bar': 220,
+    'braceright': 348,
+    'asciitilde': 570,
+    'exclamdown': 389,
+    'cent': 500,
+    'sterling': 500,
+    'fraction': 167,
+    'yen': 500,
+    'florin': 500,
+    'section': 500,
+    'currency': 500,
+    'quotesingle': 278,
+    'quotedblleft': 500,
+    'guillemotleft': 500,
+    'guilsinglleft': 333,
+    'guilsinglright': 333,
+    'fi': 556,
+    'fl': 556,
+    'endash': 500,
+    'dagger': 500,
+    'daggerdbl': 500,
+    'periodcentered': 250,
+    'paragraph': 500,
+    'bullet': 350,
+    'quotesinglbase': 333,
+    'quotedblbase': 500,
+    'quotedblright': 500,
+    'guillemotright': 500,
+    'ellipsis': 1000,
+    'perthousand': 1000,
+    'questiondown': 500,
+    'grave': 333,
+    'acute': 333,
+    'circumflex': 333,
+    'tilde': 333,
+    'macron': 333,
+    'breve': 333,
+    'dotaccent': 333,
+    'dieresis': 333,
+    'ring': 333,
+    'cedilla': 333,
+    'hungarumlaut': 333,
+    'ogonek': 333,
+    'caron': 333,
+    'emdash': 1000,
+    'AE': 944,
+    'ordfeminine': 266,
+    'Lslash': 611,
+    'Oslash': 722,
+    'OE': 944,
+    'ordmasculine': 300,
+    'ae': 722,
+    'dotlessi': 278,
+    'lslash': 278,
+    'oslash': 500,
+    'oe': 722,
+    'germandbls': 500,
+    'Idieresis': 389,
+    'eacute': 444,
+    'abreve': 500,
+    'uhungarumlaut': 556,
+    'ecaron': 444,
+    'Ydieresis': 611,
+    'divide': 570,
+    'Yacute': 611,
+    'Acircumflex': 667,
+    'aacute': 500,
+    'Ucircumflex': 722,
+    'yacute': 444,
+    'scommaaccent': 389,
+    'ecircumflex': 444,
+    'Uring': 722,
+    'Udieresis': 722,
+    'aogonek': 500,
+    'Uacute': 722,
+    'uogonek': 556,
+    'Edieresis': 667,
+    'Dcroat': 722,
+    'commaaccent': 250,
+    'copyright': 747,
+    'Emacron': 667,
+    'ccaron': 444,
+    'aring': 500,
+    'Ncommaaccent': 722,
+    'lacute': 278,
+    'agrave': 500,
+    'Tcommaaccent': 611,
+    'Cacute': 667,
+    'atilde': 500,
+    'Edotaccent': 667,
+    'scaron': 389,
+    'scedilla': 389,
+    'iacute': 278,
+    'lozenge': 494,
+    'Rcaron': 667,
+    'Gcommaaccent': 722,
+    'ucircumflex': 556,
+    'acircumflex': 500,
+    'Amacron': 667,
+    'rcaron': 389,
+    'ccedilla': 444,
+    'Zdotaccent': 611,
+    'Thorn': 611,
+    'Omacron': 722,
+    'Racute': 667,
+    'Sacute': 556,
+    'dcaron': 608,
+    'Umacron': 722,
+    'uring': 556,
+    'threesuperior': 300,
+    'Ograve': 722,
+    'Agrave': 667,
+    'Abreve': 667,
+    'multiply': 570,
+    'uacute': 556,
+    'Tcaron': 611,
+    'partialdiff': 494,
+    'ydieresis': 444,
+    'Nacute': 722,
+    'icircumflex': 278,
+    'Ecircumflex': 667,
+    'adieresis': 500,
+    'edieresis': 444,
+    'cacute': 444,
+    'nacute': 556,
+    'umacron': 556,
+    'Ncaron': 722,
+    'Iacute': 389,
+    'plusminus': 570,
+    'brokenbar': 220,
+    'registered': 747,
+    'Gbreve': 722,
+    'Idotaccent': 389,
+    'summation': 600,
+    'Egrave': 667,
+    'racute': 389,
+    'omacron': 500,
+    'Zacute': 611,
+    'Zcaron': 611,
+    'greaterequal': 549,
+    'Eth': 722,
+    'Ccedilla': 667,
+    'lcommaaccent': 278,
+    'tcaron': 366,
+    'eogonek': 444,
+    'Uogonek': 722,
+    'Aacute': 667,
+    'Adieresis': 667,
+    'egrave': 444,
+    'zacute': 389,
+    'iogonek': 278,
+    'Oacute': 722,
+    'oacute': 500,
+    'amacron': 500,
+    'sacute': 389,
+    'idieresis': 278,
+    'Ocircumflex': 722,
+    'Ugrave': 722,
+    'Delta': 612,
+    'thorn': 500,
+    'twosuperior': 300,
+    'Odieresis': 722,
+    'mu': 576,
+    'igrave': 278,
+    'ohungarumlaut': 500,
+    'Eogonek': 667,
+    'dcroat': 500,
+    'threequarters': 750,
+    'Scedilla': 556,
+    'lcaron': 382,
+    'Kcommaaccent': 667,
+    'Lacute': 611,
+    'trademark': 1000,
+    'edotaccent': 444,
+    'Igrave': 389,
+    'Imacron': 389,
+    'Lcaron': 611,
+    'onehalf': 750,
+    'lessequal': 549,
+    'ocircumflex': 500,
+    'ntilde': 556,
+    'Uhungarumlaut': 722,
+    'Eacute': 667,
+    'emacron': 444,
+    'gbreve': 500,
+    'onequarter': 750,
+    'Scaron': 556,
+    'Scommaaccent': 556,
+    'Ohungarumlaut': 722,
+    'degree': 400,
+    'ograve': 500,
+    'Ccaron': 667,
+    'ugrave': 556,
+    'radical': 549,
+    'Dcaron': 722,
+    'rcommaaccent': 389,
+    'Ntilde': 722,
+    'otilde': 500,
+    'Rcommaaccent': 667,
+    'Lcommaaccent': 611,
+    'Atilde': 667,
+    'Aogonek': 667,
+    'Aring': 667,
+    'Otilde': 722,
+    'zdotaccent': 389,
+    'Ecaron': 667,
+    'Iogonek': 389,
+    'kcommaaccent': 500,
+    'minus': 606,
+    'Icircumflex': 389,
+    'ncaron': 556,
+    'tcommaaccent': 278,
+    'logicalnot': 606,
+    'odieresis': 500,
+    'udieresis': 556,
+    'notequal': 549,
+    'gcommaaccent': 500,
+    'eth': 500,
+    'zcaron': 389,
+    'ncommaaccent': 556,
+    'onesuperior': 300,
+    'imacron': 278,
+    'Euro': 500
+  },
+  'Times-Italic': {
+    'space': 250,
+    'exclam': 333,
+    'quotedbl': 420,
+    'numbersign': 500,
+    'dollar': 500,
+    'percent': 833,
+    'ampersand': 778,
+    'quoteright': 333,
+    'parenleft': 333,
+    'parenright': 333,
+    'asterisk': 500,
+    'plus': 675,
+    'comma': 250,
+    'hyphen': 333,
+    'period': 250,
+    'slash': 278,
+    'zero': 500,
+    'one': 500,
+    'two': 500,
+    'three': 500,
+    'four': 500,
+    'five': 500,
+    'six': 500,
+    'seven': 500,
+    'eight': 500,
+    'nine': 500,
+    'colon': 333,
+    'semicolon': 333,
+    'less': 675,
+    'equal': 675,
+    'greater': 675,
+    'question': 500,
+    'at': 920,
+    'A': 611,
+    'B': 611,
+    'C': 667,
+    'D': 722,
+    'E': 611,
+    'F': 611,
+    'G': 722,
+    'H': 722,
+    'I': 333,
+    'J': 444,
+    'K': 667,
+    'L': 556,
+    'M': 833,
+    'N': 667,
+    'O': 722,
+    'P': 611,
+    'Q': 722,
+    'R': 611,
+    'S': 500,
+    'T': 556,
+    'U': 722,
+    'V': 611,
+    'W': 833,
+    'X': 611,
+    'Y': 556,
+    'Z': 556,
+    'bracketleft': 389,
+    'backslash': 278,
+    'bracketright': 389,
+    'asciicircum': 422,
+    'underscore': 500,
+    'quoteleft': 333,
+    'a': 500,
+    'b': 500,
+    'c': 444,
+    'd': 500,
+    'e': 444,
+    'f': 278,
+    'g': 500,
+    'h': 500,
+    'i': 278,
+    'j': 278,
+    'k': 444,
+    'l': 278,
+    'm': 722,
+    'n': 500,
+    'o': 500,
+    'p': 500,
+    'q': 500,
+    'r': 389,
+    's': 389,
+    't': 278,
+    'u': 500,
+    'v': 444,
+    'w': 667,
+    'x': 444,
+    'y': 444,
+    'z': 389,
+    'braceleft': 400,
+    'bar': 275,
+    'braceright': 400,
+    'asciitilde': 541,
+    'exclamdown': 389,
+    'cent': 500,
+    'sterling': 500,
+    'fraction': 167,
+    'yen': 500,
+    'florin': 500,
+    'section': 500,
+    'currency': 500,
+    'quotesingle': 214,
+    'quotedblleft': 556,
+    'guillemotleft': 500,
+    'guilsinglleft': 333,
+    'guilsinglright': 333,
+    'fi': 500,
+    'fl': 500,
+    'endash': 500,
+    'dagger': 500,
+    'daggerdbl': 500,
+    'periodcentered': 250,
+    'paragraph': 523,
+    'bullet': 350,
+    'quotesinglbase': 333,
+    'quotedblbase': 556,
+    'quotedblright': 556,
+    'guillemotright': 500,
+    'ellipsis': 889,
+    'perthousand': 1000,
+    'questiondown': 500,
+    'grave': 333,
+    'acute': 333,
+    'circumflex': 333,
+    'tilde': 333,
+    'macron': 333,
+    'breve': 333,
+    'dotaccent': 333,
+    'dieresis': 333,
+    'ring': 333,
+    'cedilla': 333,
+    'hungarumlaut': 333,
+    'ogonek': 333,
+    'caron': 333,
+    'emdash': 889,
+    'AE': 889,
+    'ordfeminine': 276,
+    'Lslash': 556,
+    'Oslash': 722,
+    'OE': 944,
+    'ordmasculine': 310,
+    'ae': 667,
+    'dotlessi': 278,
+    'lslash': 278,
+    'oslash': 500,
+    'oe': 667,
+    'germandbls': 500,
+    'Idieresis': 333,
+    'eacute': 444,
+    'abreve': 500,
+    'uhungarumlaut': 500,
+    'ecaron': 444,
+    'Ydieresis': 556,
+    'divide': 675,
+    'Yacute': 556,
+    'Acircumflex': 611,
+    'aacute': 500,
+    'Ucircumflex': 722,
+    'yacute': 444,
+    'scommaaccent': 389,
+    'ecircumflex': 444,
+    'Uring': 722,
+    'Udieresis': 722,
+    'aogonek': 500,
+    'Uacute': 722,
+    'uogonek': 500,
+    'Edieresis': 611,
+    'Dcroat': 722,
+    'commaaccent': 250,
+    'copyright': 760,
+    'Emacron': 611,
+    'ccaron': 444,
+    'aring': 500,
+    'Ncommaaccent': 667,
+    'lacute': 278,
+    'agrave': 500,
+    'Tcommaaccent': 556,
+    'Cacute': 667,
+    'atilde': 500,
+    'Edotaccent': 611,
+    'scaron': 389,
+    'scedilla': 389,
+    'iacute': 278,
+    'lozenge': 471,
+    'Rcaron': 611,
+    'Gcommaaccent': 722,
+    'ucircumflex': 500,
+    'acircumflex': 500,
+    'Amacron': 611,
+    'rcaron': 389,
+    'ccedilla': 444,
+    'Zdotaccent': 556,
+    'Thorn': 611,
+    'Omacron': 722,
+    'Racute': 611,
+    'Sacute': 500,
+    'dcaron': 544,
+    'Umacron': 722,
+    'uring': 500,
+    'threesuperior': 300,
+    'Ograve': 722,
+    'Agrave': 611,
+    'Abreve': 611,
+    'multiply': 675,
+    'uacute': 500,
+    'Tcaron': 556,
+    'partialdiff': 476,
+    'ydieresis': 444,
+    'Nacute': 667,
+    'icircumflex': 278,
+    'Ecircumflex': 611,
+    'adieresis': 500,
+    'edieresis': 444,
+    'cacute': 444,
+    'nacute': 500,
+    'umacron': 500,
+    'Ncaron': 667,
+    'Iacute': 333,
+    'plusminus': 675,
+    'brokenbar': 275,
+    'registered': 760,
+    'Gbreve': 722,
+    'Idotaccent': 333,
+    'summation': 600,
+    'Egrave': 611,
+    'racute': 389,
+    'omacron': 500,
+    'Zacute': 556,
+    'Zcaron': 556,
+    'greaterequal': 549,
+    'Eth': 722,
+    'Ccedilla': 667,
+    'lcommaaccent': 278,
+    'tcaron': 300,
+    'eogonek': 444,
+    'Uogonek': 722,
+    'Aacute': 611,
+    'Adieresis': 611,
+    'egrave': 444,
+    'zacute': 389,
+    'iogonek': 278,
+    'Oacute': 722,
+    'oacute': 500,
+    'amacron': 500,
+    'sacute': 389,
+    'idieresis': 278,
+    'Ocircumflex': 722,
+    'Ugrave': 722,
+    'Delta': 612,
+    'thorn': 500,
+    'twosuperior': 300,
+    'Odieresis': 722,
+    'mu': 500,
+    'igrave': 278,
+    'ohungarumlaut': 500,
+    'Eogonek': 611,
+    'dcroat': 500,
+    'threequarters': 750,
+    'Scedilla': 500,
+    'lcaron': 300,
+    'Kcommaaccent': 667,
+    'Lacute': 556,
+    'trademark': 980,
+    'edotaccent': 444,
+    'Igrave': 333,
+    'Imacron': 333,
+    'Lcaron': 611,
+    'onehalf': 750,
+    'lessequal': 549,
+    'ocircumflex': 500,
+    'ntilde': 500,
+    'Uhungarumlaut': 722,
+    'Eacute': 611,
+    'emacron': 444,
+    'gbreve': 500,
+    'onequarter': 750,
+    'Scaron': 500,
+    'Scommaaccent': 500,
+    'Ohungarumlaut': 722,
+    'degree': 400,
+    'ograve': 500,
+    'Ccaron': 667,
+    'ugrave': 500,
+    'radical': 453,
+    'Dcaron': 722,
+    'rcommaaccent': 389,
+    'Ntilde': 667,
+    'otilde': 500,
+    'Rcommaaccent': 611,
+    'Lcommaaccent': 556,
+    'Atilde': 611,
+    'Aogonek': 611,
+    'Aring': 611,
+    'Otilde': 722,
+    'zdotaccent': 389,
+    'Ecaron': 611,
+    'Iogonek': 333,
+    'kcommaaccent': 444,
+    'minus': 675,
+    'Icircumflex': 333,
+    'ncaron': 500,
+    'tcommaaccent': 278,
+    'logicalnot': 675,
+    'odieresis': 500,
+    'udieresis': 500,
+    'notequal': 549,
+    'gcommaaccent': 500,
+    'eth': 500,
+    'zcaron': 389,
+    'ncommaaccent': 500,
+    'onesuperior': 300,
+    'imacron': 278,
+    'Euro': 500
+  },
+  'ZapfDingbats': {
+    'space': 278,
+    'a1': 974,
+    'a2': 961,
+    'a202': 974,
+    'a3': 980,
+    'a4': 719,
+    'a5': 789,
+    'a119': 790,
+    'a118': 791,
+    'a117': 690,
+    'a11': 960,
+    'a12': 939,
+    'a13': 549,
+    'a14': 855,
+    'a15': 911,
+    'a16': 933,
+    'a105': 911,
+    'a17': 945,
+    'a18': 974,
+    'a19': 755,
+    'a20': 846,
+    'a21': 762,
+    'a22': 761,
+    'a23': 571,
+    'a24': 677,
+    'a25': 763,
+    'a26': 760,
+    'a27': 759,
+    'a28': 754,
+    'a6': 494,
+    'a7': 552,
+    'a8': 537,
+    'a9': 577,
+    'a10': 692,
+    'a29': 786,
+    'a30': 788,
+    'a31': 788,
+    'a32': 790,
+    'a33': 793,
+    'a34': 794,
+    'a35': 816,
+    'a36': 823,
+    'a37': 789,
+    'a38': 841,
+    'a39': 823,
+    'a40': 833,
+    'a41': 816,
+    'a42': 831,
+    'a43': 923,
+    'a44': 744,
+    'a45': 723,
+    'a46': 749,
+    'a47': 790,
+    'a48': 792,
+    'a49': 695,
+    'a50': 776,
+    'a51': 768,
+    'a52': 792,
+    'a53': 759,
+    'a54': 707,
+    'a55': 708,
+    'a56': 682,
+    'a57': 701,
+    'a58': 826,
+    'a59': 815,
+    'a60': 789,
+    'a61': 789,
+    'a62': 707,
+    'a63': 687,
+    'a64': 696,
+    'a65': 689,
+    'a66': 786,
+    'a67': 787,
+    'a68': 713,
+    'a69': 791,
+    'a70': 785,
+    'a71': 791,
+    'a72': 873,
+    'a73': 761,
+    'a74': 762,
+    'a203': 762,
+    'a75': 759,
+    'a204': 759,
+    'a76': 892,
+    'a77': 892,
+    'a78': 788,
+    'a79': 784,
+    'a81': 438,
+    'a82': 138,
+    'a83': 277,
+    'a84': 415,
+    'a97': 392,
+    'a98': 392,
+    'a99': 668,
+    'a100': 668,
+    'a89': 390,
+    'a90': 390,
+    'a93': 317,
+    'a94': 317,
+    'a91': 276,
+    'a92': 276,
+    'a205': 509,
+    'a85': 509,
+    'a206': 410,
+    'a86': 410,
+    'a87': 234,
+    'a88': 234,
+    'a95': 334,
+    'a96': 334,
+    'a101': 732,
+    'a102': 544,
+    'a103': 544,
+    'a104': 910,
+    'a106': 667,
+    'a107': 760,
+    'a108': 760,
+    'a112': 776,
+    'a111': 595,
+    'a110': 694,
+    'a109': 626,
+    'a120': 788,
+    'a121': 788,
+    'a122': 788,
+    'a123': 788,
+    'a124': 788,
+    'a125': 788,
+    'a126': 788,
+    'a127': 788,
+    'a128': 788,
+    'a129': 788,
+    'a130': 788,
+    'a131': 788,
+    'a132': 788,
+    'a133': 788,
+    'a134': 788,
+    'a135': 788,
+    'a136': 788,
+    'a137': 788,
+    'a138': 788,
+    'a139': 788,
+    'a140': 788,
+    'a141': 788,
+    'a142': 788,
+    'a143': 788,
+    'a144': 788,
+    'a145': 788,
+    'a146': 788,
+    'a147': 788,
+    'a148': 788,
+    'a149': 788,
+    'a150': 788,
+    'a151': 788,
+    'a152': 788,
+    'a153': 788,
+    'a154': 788,
+    'a155': 788,
+    'a156': 788,
+    'a157': 788,
+    'a158': 788,
+    'a159': 788,
+    'a160': 894,
+    'a161': 838,
+    'a163': 1016,
+    'a164': 458,
+    'a196': 748,
+    'a165': 924,
+    'a192': 748,
+    'a166': 918,
+    'a167': 927,
+    'a168': 928,
+    'a169': 928,
+    'a170': 834,
+    'a171': 873,
+    'a172': 828,
+    'a173': 924,
+    'a162': 924,
+    'a174': 917,
+    'a175': 930,
+    'a176': 931,
+    'a177': 463,
+    'a178': 883,
+    'a179': 836,
+    'a193': 836,
+    'a180': 867,
+    'a199': 867,
+    'a181': 696,
+    'a200': 696,
+    'a182': 874,
+    'a201': 874,
+    'a183': 760,
+    'a184': 946,
+    'a197': 771,
+    'a185': 865,
+    'a194': 771,
+    'a198': 888,
+    'a186': 967,
+    'a195': 888,
+    'a187': 831,
+    'a188': 873,
+    'a189': 927,
+    'a190': 970,
+    'a191': 918
+  }
+};
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/obj.js b/apps/files_pdfviewer/js/pdfjs/src/obj.js
new file mode 100755
index 00000000000..7aebb732ad2
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/obj.js
@@ -0,0 +1,742 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var Name = (function nameName() {
+  function constructor(name) {
+    this.name = name;
+  }
+
+  constructor.prototype = {
+  };
+
+  return constructor;
+})();
+
+var Cmd = (function cmdCmd() {
+  function constructor(cmd) {
+    this.cmd = cmd;
+  }
+
+  constructor.prototype = {
+  };
+
+  return constructor;
+})();
+
+var Dict = (function dictDict() {
+  function constructor() {
+    this.map = Object.create(null);
+  }
+
+  constructor.prototype = {
+    get: function dictGet(key1, key2, key3) {
+      var value;
+      if (typeof (value = this.map[key1]) != 'undefined' || key1 in this.map ||
+          typeof key2 == 'undefined') {
+        return value;
+      }
+      if (typeof (value = this.map[key2]) != 'undefined' || key2 in this.map ||
+          typeof key3 == 'undefined') {
+        return value;
+      }
+
+      return this.map[key3] || null;
+    },
+
+    set: function dictSet(key, value) {
+      this.map[key] = value;
+    },
+
+    has: function dictHas(key) {
+      return key in this.map;
+    },
+
+    forEach: function dictForEach(callback) {
+      for (var key in this.map) {
+        callback(key, this.map[key]);
+      }
+    }
+  };
+
+  return constructor;
+})();
+
+var Ref = (function refRef() {
+  function constructor(num, gen) {
+    this.num = num;
+    this.gen = gen;
+  }
+
+  constructor.prototype = {
+  };
+
+  return constructor;
+})();
+
+// The reference is identified by number and generation,
+// this structure stores only one instance of the reference.
+var RefSet = (function refSet() {
+  function constructor() {
+    this.dict = {};
+  }
+
+  constructor.prototype = {
+    has: function refSetHas(ref) {
+      return !!this.dict['R' + ref.num + '.' + ref.gen];
+    },
+
+    put: function refSetPut(ref) {
+      this.dict['R' + ref.num + '.' + ref.gen] = ref;
+    }
+  };
+
+  return constructor;
+})();
+
+var Catalog = (function catalogCatalog() {
+  function constructor(xref) {
+    this.xref = xref;
+    var obj = xref.getCatalogObj();
+    assertWellFormed(isDict(obj), 'catalog object is not a dictionary');
+    this.catDict = obj;
+  }
+
+  constructor.prototype = {
+    get toplevelPagesDict() {
+      var pagesObj = this.catDict.get('Pages');
+      assertWellFormed(isRef(pagesObj), 'invalid top-level pages reference');
+      var xrefObj = this.xref.fetch(pagesObj);
+      assertWellFormed(isDict(xrefObj), 'invalid top-level pages dictionary');
+      // shadow the prototype getter
+      return shadow(this, 'toplevelPagesDict', xrefObj);
+    },
+    get documentOutline() {
+      var obj = this.catDict.get('Outlines');
+      var xref = this.xref;
+      var root = { items: [] };
+      if (isRef(obj)) {
+        obj = xref.fetch(obj).get('First');
+        var processed = new RefSet();
+        if (isRef(obj)) {
+          var queue = [{obj: obj, parent: root}];
+          // to avoid recursion keeping track of the items
+          // in the processed dictionary
+          processed.put(obj);
+          while (queue.length > 0) {
+            var i = queue.shift();
+            var outlineDict = xref.fetch(i.obj);
+            if (!outlineDict.has('Title'))
+              error('Invalid outline item');
+            var dest = outlineDict.get('A');
+            if (dest)
+              dest = xref.fetchIfRef(dest).get('D');
+            else if (outlineDict.has('Dest')) {
+              dest = outlineDict.get('Dest');
+              if (isName(dest))
+                dest = dest.name;
+            }
+            var title = xref.fetchIfRef(outlineDict.get('Title'));
+            var outlineItem = {
+              dest: dest,
+              title: stringToPDFString(title),
+              color: outlineDict.get('C') || [0, 0, 0],
+              count: outlineDict.get('Count'),
+              bold: !!(outlineDict.get('F') & 2),
+              italic: !!(outlineDict.get('F') & 1),
+              items: []
+            };
+            i.parent.items.push(outlineItem);
+            obj = outlineDict.get('First');
+            if (isRef(obj) && !processed.has(obj)) {
+              queue.push({obj: obj, parent: outlineItem});
+              processed.put(obj);
+            }
+            obj = outlineDict.get('Next');
+            if (isRef(obj) && !processed.has(obj)) {
+              queue.push({obj: obj, parent: i.parent});
+              processed.put(obj);
+            }
+          }
+        }
+      }
+      obj = root.items.length > 0 ? root.items : null;
+      return shadow(this, 'documentOutline', obj);
+    },
+    get numPages() {
+      var obj = this.toplevelPagesDict.get('Count');
+      assertWellFormed(
+        isInt(obj),
+        'page count in top level pages object is not an integer'
+      );
+      // shadow the prototype getter
+      return shadow(this, 'num', obj);
+    },
+    traverseKids: function catalogTraverseKids(pagesDict) {
+      var pageCache = this.pageCache;
+      var kids = pagesDict.get('Kids');
+      assertWellFormed(isArray(kids),
+                       'page dictionary kids object is not an array');
+      for (var i = 0, ii = kids.length; i < ii; ++i) {
+        var kid = kids[i];
+        assertWellFormed(isRef(kid),
+                         'page dictionary kid is not a reference');
+        var obj = this.xref.fetch(kid);
+        if (isDict(obj, 'Page') || (isDict(obj) && !obj.has('Kids'))) {
+          pageCache.push(new Page(this.xref, pageCache.length, obj, kid));
+        } else { // must be a child page dictionary
+          assertWellFormed(
+            isDict(obj),
+            'page dictionary kid reference points to wrong type of object'
+          );
+          this.traverseKids(obj);
+        }
+      }
+    },
+    get destinations() {
+      function fetchDestination(xref, ref) {
+        var dest = xref.fetchIfRef(ref);
+        return isDict(dest) ? dest.get('D') : dest;
+      }
+
+      var xref = this.xref;
+      var dests = {}, nameTreeRef, nameDictionaryRef;
+      var obj = this.catDict.get('Names');
+      if (obj)
+        nameTreeRef = xref.fetchIfRef(obj).get('Dests');
+      else if (this.catDict.has('Dests'))
+        nameDictionaryRef = this.catDict.get('Dests');
+
+      if (nameDictionaryRef) {
+        // reading simple destination dictionary
+        obj = xref.fetchIfRef(nameDictionaryRef);
+        obj.forEach(function catalogForEach(key, value) {
+          if (!value) return;
+          dests[key] = fetchDestination(xref, value);
+        });
+      }
+      if (nameTreeRef) {
+        // reading name tree
+        var processed = new RefSet();
+        processed.put(nameTreeRef);
+        var queue = [nameTreeRef];
+        while (queue.length > 0) {
+          var i, n;
+          obj = xref.fetch(queue.shift());
+          if (obj.has('Kids')) {
+            var kids = obj.get('Kids');
+            for (i = 0, n = kids.length; i < n; i++) {
+              var kid = kids[i];
+              if (processed.has(kid))
+                error('invalid destinations');
+              queue.push(kid);
+              processed.put(kid);
+            }
+            continue;
+          }
+          var names = obj.get('Names');
+          for (i = 0, n = names.length; i < n; i += 2) {
+            dests[names[i]] = fetchDestination(xref, names[i + 1]);
+          }
+        }
+      }
+      return shadow(this, 'destinations', dests);
+    },
+    getPage: function catalogGetPage(n) {
+      var pageCache = this.pageCache;
+      if (!pageCache) {
+        pageCache = this.pageCache = [];
+        this.traverseKids(this.toplevelPagesDict);
+      }
+      return this.pageCache[n - 1];
+    }
+  };
+
+  return constructor;
+})();
+
+var XRef = (function xRefXRef() {
+  function constructor(stream, startXRef, mainXRefEntriesOffset) {
+    this.stream = stream;
+    this.entries = [];
+    this.xrefstms = {};
+    var trailerDict = this.readXRef(startXRef);
+
+    // prepare the XRef cache
+    this.cache = [];
+
+    var encrypt = trailerDict.get('Encrypt');
+    if (encrypt) {
+      var fileId = trailerDict.get('ID');
+      this.encrypt = new CipherTransformFactory(this.fetch(encrypt),
+                                                fileId[0] /*, password */);
+    }
+
+    // get the root dictionary (catalog) object
+    if (!isRef(this.root = trailerDict.get('Root')))
+      error('Invalid root reference');
+  }
+
+  constructor.prototype = {
+    readXRefTable: function readXRefTable(parser) {
+      var obj;
+      while (true) {
+        if (isCmd(obj = parser.getObj(), 'trailer'))
+          break;
+        if (!isInt(obj))
+          error('Invalid XRef table');
+        var first = obj;
+        if (!isInt(obj = parser.getObj()))
+          error('Invalid XRef table');
+        var n = obj;
+        if (first < 0 || n < 0 || (first + n) != ((first + n) | 0))
+          error('Invalid XRef table: ' + first + ', ' + n);
+        for (var i = first; i < first + n; ++i) {
+          var entry = {};
+          if (!isInt(obj = parser.getObj()))
+            error('Invalid XRef table: ' + first + ', ' + n);
+          entry.offset = obj;
+          if (!isInt(obj = parser.getObj()))
+            error('Invalid XRef table: ' + first + ', ' + n);
+          entry.gen = obj;
+          obj = parser.getObj();
+          if (isCmd(obj, 'n')) {
+            entry.uncompressed = true;
+          } else if (isCmd(obj, 'f')) {
+            entry.free = true;
+          } else {
+            error('Invalid XRef table: ' + first + ', ' + n);
+          }
+          if (!this.entries[i]) {
+            // In some buggy PDF files the xref table claims to start at 1
+            // instead of 0.
+            if (i == 1 && first == 1 &&
+                entry.offset == 0 && entry.gen == 65535 && entry.free) {
+              i = first = 0;
+            }
+            this.entries[i] = entry;
+          }
+        }
+      }
+
+      // read the trailer dictionary
+      var dict;
+      if (!isDict(dict = parser.getObj()))
+        error('Invalid XRef table');
+
+      // get the 'Prev' pointer
+      var prev;
+      obj = dict.get('Prev');
+      if (isInt(obj)) {
+        prev = obj;
+      } else if (isRef(obj)) {
+        // certain buggy PDF generators generate "/Prev NNN 0 R" instead
+        // of "/Prev NNN"
+        prev = obj.num;
+      }
+      if (prev) {
+        this.readXRef(prev);
+      }
+
+      // check for 'XRefStm' key
+      if (isInt(obj = dict.get('XRefStm'))) {
+        var pos = obj;
+        // ignore previously loaded xref streams (possible infinite recursion)
+        if (!(pos in this.xrefstms)) {
+          this.xrefstms[pos] = 1;
+          this.readXRef(pos);
+        }
+      }
+
+      return dict;
+    },
+    readXRefStream: function readXRefStream(stream) {
+      var streamParameters = stream.parameters;
+      var byteWidths = streamParameters.get('W');
+      var range = streamParameters.get('Index');
+      if (!range)
+        range = [0, streamParameters.get('Size')];
+      var i, j;
+      while (range.length > 0) {
+        var first = range[0], n = range[1];
+        if (!isInt(first) || !isInt(n))
+          error('Invalid XRef range fields: ' + first + ', ' + n);
+        var typeFieldWidth = byteWidths[0];
+        var offsetFieldWidth = byteWidths[1];
+        var generationFieldWidth = byteWidths[2];
+        if (!isInt(typeFieldWidth) || !isInt(offsetFieldWidth) ||
+            !isInt(generationFieldWidth)) {
+          error('Invalid XRef entry fields length: ' + first + ', ' + n);
+        }
+        for (i = 0; i < n; ++i) {
+          var type = 0, offset = 0, generation = 0;
+          for (j = 0; j < typeFieldWidth; ++j)
+            type = (type << 8) | stream.getByte();
+          // if type field is absent, its default value = 1
+          if (typeFieldWidth == 0)
+            type = 1;
+          for (j = 0; j < offsetFieldWidth; ++j)
+            offset = (offset << 8) | stream.getByte();
+          for (j = 0; j < generationFieldWidth; ++j)
+            generation = (generation << 8) | stream.getByte();
+          var entry = {};
+          entry.offset = offset;
+          entry.gen = generation;
+          switch (type) {
+            case 0:
+              entry.free = true;
+              break;
+            case 1:
+              entry.uncompressed = true;
+              break;
+            case 2:
+              break;
+            default:
+              error('Invalid XRef entry type: ' + type);
+          }
+          if (!this.entries[first + i])
+            this.entries[first + i] = entry;
+        }
+        range.splice(0, 2);
+      }
+      var prev = streamParameters.get('Prev');
+      if (isInt(prev))
+        this.readXRef(prev);
+      return streamParameters;
+    },
+    indexObjects: function indexObjects() {
+      // Simple scan through the PDF content to find objects,
+      // trailers and XRef streams.
+      function readToken(data, offset) {
+        var token = '', ch = data[offset];
+        while (ch !== 13 && ch !== 10) {
+          if (++offset >= data.length)
+            break;
+          token += String.fromCharCode(ch);
+          ch = data[offset];
+        }
+        return token;
+      }
+      function skipUntil(data, offset, what) {
+        var length = what.length, dataLength = data.length;
+        var skipped = 0;
+        // finding byte sequence
+        while (offset < dataLength) {
+          var i = 0;
+          while (i < length && data[offset + i] == what[i])
+            ++i;
+          if (i >= length)
+            break; // sequence found
+
+          offset++;
+          skipped++;
+        }
+        return skipped;
+      }
+      var trailerBytes = new Uint8Array([116, 114, 97, 105, 108, 101, 114]);
+      var startxrefBytes = new Uint8Array([115, 116, 97, 114, 116, 120, 114,
+                                          101, 102]);
+      var endobjBytes = new Uint8Array([101, 110, 100, 111, 98, 106]);
+      var xrefBytes = new Uint8Array([47, 88, 82, 101, 102]);
+
+      var stream = this.stream;
+      stream.pos = 0;
+      var buffer = stream.getBytes();
+      var position = stream.start, length = buffer.length;
+      var trailers = [], xrefStms = [];
+      var state = 0;
+      var currentToken;
+      while (position < length) {
+        var ch = buffer[position];
+        if (ch === 32 || ch === 9 || ch === 13 || ch === 10) {
+          ++position;
+          continue;
+        }
+        if (ch === 37) { // %-comment
+          do {
+            ++position;
+            ch = buffer[position];
+          } while (ch !== 13 && ch !== 10);
+          continue;
+        }
+        var token = readToken(buffer, position);
+        var m;
+        if (token === 'xref') {
+          position += skipUntil(buffer, position, trailerBytes);
+          trailers.push(position);
+          position += skipUntil(buffer, position, startxrefBytes);
+        } else if ((m = /^(\d+)\s+(\d+)\s+obj\b/.exec(token))) {
+          this.entries[m[1]] = {
+            offset: position,
+            gen: m[2] | 0,
+            uncompressed: true
+          };
+
+          var contentLength = skipUntil(buffer, position, endobjBytes) + 7;
+          var content = buffer.subarray(position, position + contentLength);
+
+          // checking XRef stream suspect
+          // (it shall have '/XRef' and next char is not a letter)
+          var xrefTagOffset = skipUntil(content, 0, xrefBytes);
+          if (xrefTagOffset < contentLength &&
+              content[xrefTagOffset + 5] < 64) {
+            xrefStms.push(position);
+            this.xrefstms[position] = 1; // don't read it recursively
+          }
+
+          position += contentLength;
+        } else
+          position += token.length + 1;
+      }
+      // reading XRef streams
+      for (var i = 0, ii = xrefStms.length; i < ii; ++i) {
+          this.readXRef(xrefStms[i]);
+      }
+      // finding main trailer
+      var dict;
+      for (var i = 0, ii = trailers.length; i < ii; ++i) {
+        stream.pos = trailers[i];
+        var parser = new Parser(new Lexer(stream), true);
+        var obj = parser.getObj();
+        if (!isCmd(obj, 'trailer'))
+          continue;
+        // read the trailer dictionary
+        if (!isDict(dict = parser.getObj()))
+          continue;
+        // taking the first one with 'ID'
+        if (dict.has('ID'))
+          return dict;
+      }
+      // no tailer with 'ID', taking last one (if exists)
+      if (dict)
+        return dict;
+      // nothing helps
+      error('Invalid PDF structure');
+      return null;
+    },
+    readXRef: function readXref(startXRef) {
+      var stream = this.stream;
+      stream.pos = startXRef;
+      var parser = new Parser(new Lexer(stream), true);
+      var obj = parser.getObj();
+      // parse an old-style xref table
+      if (isCmd(obj, 'xref'))
+        return this.readXRefTable(parser);
+      // parse an xref stream
+      if (isInt(obj)) {
+        if (!isInt(parser.getObj()) ||
+            !isCmd(parser.getObj(), 'obj') ||
+            !isStream(obj = parser.getObj())) {
+          error('Invalid XRef stream');
+        }
+        return this.readXRefStream(obj);
+      }
+      return this.indexObjects();
+    },
+    getEntry: function xRefGetEntry(i) {
+      var e = this.entries[i];
+      if (e.free)
+        error('reading an XRef stream not implemented yet');
+      return e;
+    },
+    fetchIfRef: function xRefFetchIfRef(obj) {
+      if (!isRef(obj))
+        return obj;
+      return this.fetch(obj);
+    },
+    fetch: function xRefFetch(ref, suppressEncryption) {
+      var num = ref.num;
+      var e = this.cache[num];
+      if (e)
+        return e;
+
+      e = this.getEntry(num);
+      var gen = ref.gen;
+      var stream, parser;
+      if (e.uncompressed) {
+        if (e.gen != gen)
+          throw ('inconsistent generation in XRef');
+        stream = this.stream.makeSubStream(e.offset);
+        parser = new Parser(new Lexer(stream), true, this);
+        var obj1 = parser.getObj();
+        var obj2 = parser.getObj();
+        var obj3 = parser.getObj();
+        if (!isInt(obj1) || obj1 != num ||
+            !isInt(obj2) || obj2 != gen ||
+            !isCmd(obj3)) {
+          error('bad XRef entry');
+        }
+        if (!isCmd(obj3, 'obj')) {
+          // some bad pdfs use "obj1234" and really mean 1234
+          if (obj3.cmd.indexOf('obj') == 0) {
+            num = parseInt(obj3.cmd.substring(3), 10);
+            if (!isNaN(num))
+              return num;
+          }
+          error('bad XRef entry');
+        }
+        if (this.encrypt && !suppressEncryption) {
+          try {
+            e = parser.getObj(this.encrypt.createCipherTransform(num, gen));
+          } catch (ex) {
+            // almost all streams must be encrypted, but sometimes
+            // they are not probably due to some broken generators
+            // re-trying without encryption
+            return this.fetch(ref, true);
+          }
+        } else {
+          e = parser.getObj();
+        }
+        // Don't cache streams since they are mutable (except images).
+        if (!isStream(e) || e.getImage)
+          this.cache[num] = e;
+        return e;
+      }
+
+      // compressed entry
+      stream = this.fetch(new Ref(e.offset, 0));
+      if (!isStream(stream))
+        error('bad ObjStm stream');
+      var first = stream.parameters.get('First');
+      var n = stream.parameters.get('N');
+      if (!isInt(first) || !isInt(n)) {
+        error('invalid first and n parameters for ObjStm stream');
+      }
+      parser = new Parser(new Lexer(stream), false);
+      var i, entries = [], nums = [];
+      // read the object numbers to populate cache
+      for (i = 0; i < n; ++i) {
+        num = parser.getObj();
+        if (!isInt(num)) {
+          error('invalid object number in the ObjStm stream: ' + num);
+        }
+        nums.push(num);
+        var offset = parser.getObj();
+        if (!isInt(offset)) {
+          error('invalid object offset in the ObjStm stream: ' + offset);
+        }
+      }
+      // read stream objects for cache
+      for (i = 0; i < n; ++i) {
+        entries.push(parser.getObj());
+        this.cache[nums[i]] = entries[i];
+      }
+      e = entries[e.gen];
+      if (!e) {
+        error('bad XRef entry for compressed object');
+      }
+      return e;
+    },
+    getCatalogObj: function xRefGetCatalogObj() {
+      return this.fetch(this.root);
+    }
+  };
+
+  return constructor;
+})();
+
+/**
+ * A PDF document and page is built of many objects. E.g. there are objects
+ * for fonts, images, rendering code and such. These objects might get processed
+ * inside of a worker. The `PDFObjects` implements some basic functions to
+ * manage these objects.
+ */
+var PDFObjects = (function pdfObjects() {
+  function PDFObjects() {
+    this.objs = {};
+  }
+
+  PDFObjects.prototype = {
+    objs: null,
+
+    /**
+     * Internal function.
+     * Ensures there is an object defined for `objId`. Stores `data` on the
+     * object *if* it is created.
+     */
+    ensureObj: function pdfObjectsEnsureObj(objId, data) {
+      if (this.objs[objId])
+        return this.objs[objId];
+      return this.objs[objId] = new Promise(objId, data);
+    },
+
+    /**
+     * If called *without* callback, this returns the data of `objId` but the
+     * object needs to be resolved. If it isn't, this function throws.
+     *
+     * If called *with* a callback, the callback is called with the data of the
+     * object once the object is resolved. That means, if you call this
+     * function and the object is already resolved, the callback gets called
+     * right away.
+     */
+    get: function pdfObjectsGet(objId, callback) {
+      // If there is a callback, then the get can be async and the object is
+      // not required to be resolved right now
+      if (callback) {
+        this.ensureObj(objId).then(callback);
+        return null;
+      }
+
+      // If there isn't a callback, the user expects to get the resolved data
+      // directly.
+      var obj = this.objs[objId];
+
+      // If there isn't an object yet or the object isn't resolved, then the
+      // data isn't ready yet!
+      if (!obj || !obj.isResolved) {
+        throw 'Requesting object that isn\'t resolved yet ' + objId;
+        return null;
+      } else {
+        return obj.data;
+      }
+    },
+
+    /**
+     * Resolves the object `objId` with optional `data`.
+     */
+    resolve: function pdfObjectsResolve(objId, data) {
+      var objs = this.objs;
+
+      // In case there is a promise already on this object, just resolve it.
+      if (objs[objId]) {
+        objs[objId].resolve(data);
+      } else {
+        this.ensureObj(objId, data);
+      }
+    },
+
+    onData: function pdfObjectsOnData(objId, callback) {
+      this.ensureObj(objId).onData(callback);
+    },
+
+    isResolved: function pdfObjectsIsResolved(objId) {
+      var objs = this.objs;
+      if (!objs[objId]) {
+        return false;
+      } else {
+        return objs[objId].isResolved;
+      }
+    },
+
+    hasData: function pdfObjectsHasData(objId) {
+      var objs = this.objs;
+      if (!objs[objId]) {
+        return false;
+      } else {
+        return objs[objId].hasData;
+      }
+    },
+
+    /**
+     * Sets the data of an object but *doesn't* resolve it.
+     */
+    setData: function pdfObjectsSetData(objId, data) {
+      // Watchout! If you call `this.ensureObj(objId, data)` you're going to
+      // create a *resolved* promise which shouldn't be the case!
+      this.ensureObj(objId).data = data;
+    }
+  };
+  return PDFObjects;
+})();
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/parser.js b/apps/files_pdfviewer/js/pdfjs/src/parser.js
new file mode 100755
index 00000000000..93a3f21b52a
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/parser.js
@@ -0,0 +1,636 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var EOF = {};
+
+function isEOF(v) {
+  return v == EOF;
+}
+
+var Parser = (function parserParser() {
+  function constructor(lexer, allowStreams, xref) {
+    this.lexer = lexer;
+    this.allowStreams = allowStreams;
+    this.xref = xref;
+    this.inlineImg = 0;
+    this.refill();
+  }
+
+  constructor.prototype = {
+    refill: function parserRefill() {
+      this.buf1 = this.lexer.getObj();
+      this.buf2 = this.lexer.getObj();
+    },
+    shift: function parserShift() {
+      if (isCmd(this.buf2, 'ID')) {
+        this.buf1 = this.buf2;
+        this.buf2 = null;
+        // skip byte after ID
+        this.lexer.skip();
+      } else {
+        this.buf1 = this.buf2;
+        this.buf2 = this.lexer.getObj();
+      }
+    },
+    getObj: function parserGetObj(cipherTransform) {
+      if (isCmd(this.buf1, 'BI')) { // inline image
+        this.shift();
+        return this.makeInlineImage(cipherTransform);
+      }
+      if (isCmd(this.buf1, '[')) { // array
+        this.shift();
+        var array = [];
+        while (!isCmd(this.buf1, ']') && !isEOF(this.buf1))
+          array.push(this.getObj());
+        if (isEOF(this.buf1))
+          error('End of file inside array');
+        this.shift();
+        return array;
+      }
+      if (isCmd(this.buf1, '<<')) { // dictionary or stream
+        this.shift();
+        var dict = new Dict();
+        while (!isCmd(this.buf1, '>>') && !isEOF(this.buf1)) {
+          if (!isName(this.buf1)) {
+            error('Dictionary key must be a name object');
+          } else {
+            var key = this.buf1.name;
+            this.shift();
+            if (isEOF(this.buf1))
+              break;
+            dict.set(key, this.getObj(cipherTransform));
+          }
+        }
+        if (isEOF(this.buf1))
+          error('End of file inside dictionary');
+
+        // stream objects are not allowed inside content streams or
+        // object streams
+        if (isCmd(this.buf2, 'stream')) {
+          return this.allowStreams ?
+            this.makeStream(dict, cipherTransform) : dict;
+        }
+        this.shift();
+        return dict;
+      }
+      if (isInt(this.buf1)) { // indirect reference or integer
+        var num = this.buf1;
+        this.shift();
+        if (isInt(this.buf1) && isCmd(this.buf2, 'R')) {
+          var ref = new Ref(num, this.buf1);
+          this.shift();
+          this.shift();
+          return ref;
+        }
+        return num;
+      }
+      if (isString(this.buf1)) { // string
+        var str = this.buf1;
+        this.shift();
+        if (cipherTransform)
+          str = cipherTransform.decryptString(str);
+        return str;
+      }
+
+      // simple object
+      var obj = this.buf1;
+      this.shift();
+      return obj;
+    },
+    makeInlineImage: function parserMakeInlineImage(cipherTransform) {
+      var lexer = this.lexer;
+      var stream = lexer.stream;
+
+      // parse dictionary
+      var dict = new Dict();
+      while (!isCmd(this.buf1, 'ID') && !isEOF(this.buf1)) {
+        if (!isName(this.buf1)) {
+          error('Dictionary key must be a name object');
+        } else {
+          var key = this.buf1.name;
+          this.shift();
+          if (isEOF(this.buf1))
+            break;
+          dict.set(key, this.getObj(cipherTransform));
+        }
+      }
+
+      // parse image stream
+      var startPos = stream.pos;
+
+      // searching for the /\sEI\s/
+      var state = 0, ch;
+      while (state != 4 && (ch = stream.getByte()) != null) {
+        switch (ch) {
+          case 0x20:
+          case 0x0D:
+          case 0x0A:
+            state = state === 3 ? 4 : 1;
+            break;
+          case 0x45:
+            state = state === 1 ? 2 : 0;
+            break;
+          case 0x49:
+            state = state === 2 ? 3 : 0;
+            break;
+          default:
+            state = 0;
+            break;
+        }
+      }
+
+      // TODO improve the small images performance to remove the limit
+      var inlineImgLimit = 500;
+      if (++this.inlineImg >= inlineImgLimit) {
+        if (this.inlineImg === inlineImgLimit)
+          warn('Too many inline images');
+        this.shift();
+        return null;
+      }
+
+      var length = (stream.pos - 4) - startPos;
+      var imageStream = stream.makeSubStream(startPos, length, dict);
+      if (cipherTransform)
+        imageStream = cipherTransform.createStream(imageStream);
+      imageStream = this.filter(imageStream, dict, length);
+      imageStream.parameters = dict;
+
+      this.buf2 = new Cmd('EI');
+      this.shift();
+
+      return imageStream;
+    },
+    makeStream: function parserMakeStream(dict, cipherTransform) {
+      var lexer = this.lexer;
+      var stream = lexer.stream;
+
+      // get stream start position
+      lexer.skipToNextLine();
+      var pos = stream.pos;
+
+      // get length
+      var length = dict.get('Length');
+      var xref = this.xref;
+      if (xref)
+        length = xref.fetchIfRef(length);
+      if (!isInt(length)) {
+        error('Bad ' + length + ' attribute in stream');
+        length = 0;
+      }
+
+      // skip over the stream data
+      stream.pos = pos + length;
+      this.shift(); // '>>'
+      this.shift(); // 'stream'
+      if (!isCmd(this.buf1, 'endstream'))
+        error('Missing endstream');
+      this.shift();
+
+      stream = stream.makeSubStream(pos, length, dict);
+      if (cipherTransform)
+        stream = cipherTransform.createStream(stream);
+      stream = this.filter(stream, dict, length);
+      stream.parameters = dict;
+      return stream;
+    },
+    filter: function parserFilter(stream, dict, length) {
+      var filter = dict.get('Filter', 'F');
+      var params = dict.get('DecodeParms', 'DP');
+      if (isName(filter))
+        return this.makeFilter(stream, filter.name, length, params);
+      if (isArray(filter)) {
+        var filterArray = filter;
+        var paramsArray = params;
+        for (var i = 0, ii = filterArray.length; i < ii; ++i) {
+          filter = filterArray[i];
+          if (!isName(filter))
+            error('Bad filter name: ' + filter);
+          else {
+            params = null;
+            if (isArray(paramsArray) && (i in paramsArray))
+              params = paramsArray[i];
+            stream = this.makeFilter(stream, filter.name, length, params);
+            // after the first stream the length variable is invalid
+            length = null;
+          }
+        }
+      }
+      return stream;
+    },
+    makeFilter: function parserMakeFilter(stream, name, length, params) {
+      if (name == 'FlateDecode' || name == 'Fl') {
+        if (params) {
+          return new PredictorStream(new FlateStream(stream), params);
+        }
+        return new FlateStream(stream);
+      } else if (name == 'LZWDecode' || name == 'LZW') {
+        var earlyChange = 1;
+        if (params) {
+          if (params.has('EarlyChange'))
+            earlyChange = params.get('EarlyChange');
+          return new PredictorStream(
+            new LZWStream(stream, earlyChange), params);
+        }
+        return new LZWStream(stream, earlyChange);
+      } else if (name == 'DCTDecode' || name == 'DCT') {
+        var bytes = stream.getBytes(length);
+        return new JpegStream(bytes, stream.dict, this.xref);
+      } else if (name == 'ASCII85Decode' || name == 'A85') {
+        return new Ascii85Stream(stream);
+      } else if (name == 'ASCIIHexDecode' || name == 'AHx') {
+        return new AsciiHexStream(stream);
+      } else if (name == 'CCITTFaxDecode' || name == 'CCF') {
+        return new CCITTFaxStream(stream, params);
+      } else {
+        TODO('filter "' + name + '" not supported yet');
+      }
+      return stream;
+    }
+  };
+
+  return constructor;
+})();
+
+var Lexer = (function lexer() {
+  function constructor(stream) {
+    this.stream = stream;
+  }
+
+  constructor.isSpace = function lexerIsSpace(ch) {
+    return ch == ' ' || ch == '\t' || ch == '\x0d' || ch == '\x0a';
+  };
+
+  // A '1' in this array means the character is white space.  A '1' or
+  // '2' means the character ends a name or command.
+  var specialChars = [
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0,   // 0x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 1x
+    1, 0, 0, 0, 0, 2, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2,   // 2x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0,   // 3x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 4x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0,   // 5x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 6x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0,   // 7x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 8x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 9x
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // ax
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // bx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // cx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // dx
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // ex
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0    // fx
+  ];
+
+  function toHexDigit(ch) {
+    if (ch >= '0' && ch <= '9')
+      return ch.charCodeAt(0) - 48;
+    ch = ch.toUpperCase();
+    if (ch >= 'A' && ch <= 'F')
+      return ch.charCodeAt(0) - 55;
+    return -1;
+  }
+
+  constructor.prototype = {
+    getNumber: function lexerGetNumber(ch) {
+      var floating = false;
+      var str = ch;
+      var stream = this.stream;
+      for (;;) {
+        ch = stream.lookChar();
+        if (ch == '.' && !floating) {
+          str += ch;
+          floating = true;
+        } else if (ch == '-') {
+          // ignore minus signs in the middle of numbers to match
+          // Adobe's behavior
+          warn('Badly formated number');
+        } else if (ch >= '0' && ch <= '9') {
+          str += ch;
+        } else if (ch == 'e' || ch == 'E') {
+          floating = true;
+        } else {
+          // the last character doesn't belong to us
+          break;
+        }
+        stream.skip();
+      }
+      var value = parseFloat(str);
+      if (isNaN(value))
+        error('Invalid floating point number: ' + value);
+      return value;
+    },
+    getString: function lexerGetString() {
+      var numParen = 1;
+      var done = false;
+      var str = '';
+      var stream = this.stream;
+      var ch;
+      do {
+        ch = stream.getChar();
+        switch (ch) {
+          case undefined:
+            warn('Unterminated string');
+            done = true;
+            break;
+          case '(':
+            ++numParen;
+            str += ch;
+            break;
+          case ')':
+            if (--numParen == 0) {
+              done = true;
+            } else {
+              str += ch;
+            }
+            break;
+          case '\\':
+            ch = stream.getChar();
+            switch (ch) {
+              case undefined:
+                warn('Unterminated string');
+                done = true;
+                break;
+              case 'n':
+                str += '\n';
+                break;
+              case 'r':
+                str += '\r';
+                break;
+              case 't':
+                str += '\t';
+                break;
+              case 'b':
+                str += '\b';
+                break;
+              case 'f':
+                str += '\f';
+                break;
+              case '\\':
+              case '(':
+              case ')':
+                str += ch;
+                break;
+              case '0': case '1': case '2': case '3':
+              case '4': case '5': case '6': case '7':
+                var x = ch - '0';
+                ch = stream.lookChar();
+                if (ch >= '0' && ch <= '7') {
+                  stream.skip();
+                  x = (x << 3) + (ch - '0');
+                  ch = stream.lookChar();
+                  if (ch >= '0' && ch <= '7') {
+                    stream.skip();
+                    x = (x << 3) + (ch - '0');
+                  }
+                }
+
+                str += String.fromCharCode(x);
+                break;
+              case '\r':
+                ch = stream.lookChar();
+                if (ch == '\n')
+                  stream.skip();
+                break;
+              case '\n':
+                break;
+              default:
+                str += ch;
+            }
+            break;
+          default:
+            str += ch;
+        }
+      } while (!done);
+      return str;
+    },
+    getName: function lexerGetName(ch) {
+      var str = '';
+      var stream = this.stream;
+      while (!!(ch = stream.lookChar()) && !specialChars[ch.charCodeAt(0)]) {
+        stream.skip();
+        if (ch == '#') {
+          ch = stream.lookChar();
+          var x = toHexDigit(ch);
+          if (x != -1) {
+            stream.skip();
+            var x2 = toHexDigit(stream.getChar());
+            if (x2 == -1)
+              error('Illegal digit in hex char in name: ' + x2);
+            str += String.fromCharCode((x << 4) | x2);
+          } else {
+            str += '#';
+            str += ch;
+          }
+        } else {
+          str += ch;
+        }
+      }
+      if (str.length > 128)
+        error('Warning: name token is longer than allowed by the spec: ' +
+              str.length);
+      return new Name(str);
+    },
+    getHexString: function lexerGetHexString(ch) {
+      var str = '';
+      var stream = this.stream;
+      for (;;) {
+        ch = stream.getChar();
+        if (ch == '>') {
+          break;
+        }
+        if (!ch) {
+          warn('Unterminated hex string');
+          break;
+        }
+        if (specialChars[ch.charCodeAt(0)] != 1) {
+          var x, x2;
+          if ((x = toHexDigit(ch)) == -1)
+            error('Illegal character in hex string: ' + ch);
+
+          ch = stream.getChar();
+          while (specialChars[ch.charCodeAt(0)] == 1)
+            ch = stream.getChar();
+
+          if ((x2 = toHexDigit(ch)) == -1)
+            error('Illegal character in hex string: ' + ch);
+
+          str += String.fromCharCode((x << 4) | x2);
+        }
+      }
+      return str;
+    },
+    getObj: function lexerGetObj() {
+      // skip whitespace and comments
+      var comment = false;
+      var stream = this.stream;
+      var ch;
+      while (true) {
+        if (!(ch = stream.getChar()))
+          return EOF;
+        if (comment) {
+          if (ch == '\r' || ch == '\n')
+            comment = false;
+        } else if (ch == '%') {
+          comment = true;
+        } else if (specialChars[ch.charCodeAt(0)] != 1) {
+          break;
+        }
+      }
+
+      // start reading token
+      switch (ch) {
+        case '0': case '1': case '2': case '3': case '4':
+        case '5': case '6': case '7': case '8': case '9':
+        case '+': case '-': case '.':
+          return this.getNumber(ch);
+        case '(':
+          return this.getString();
+        case '/':
+          return this.getName(ch);
+        // array punctuation
+        case '[':
+        case ']':
+          return new Cmd(ch);
+        // hex string or dict punctuation
+        case '<':
+          ch = stream.lookChar();
+          if (ch == '<') {
+            // dict punctuation
+            stream.skip();
+            return new Cmd('<<');
+          }
+          return this.getHexString(ch);
+        // dict punctuation
+        case '>':
+          ch = stream.lookChar();
+          if (ch == '>') {
+            stream.skip();
+            return new Cmd('>>');
+          }
+        case '{':
+        case '}':
+          return new Cmd(ch);
+        // fall through
+        case ')':
+          error('Illegal character: ' + ch);
+          return Error;
+      }
+
+      // command
+      var str = ch;
+      while (!!(ch = stream.lookChar()) && !specialChars[ch.charCodeAt(0)]) {
+        stream.skip();
+        if (str.length == 128) {
+          error('Command token too long: ' + str.length);
+          break;
+        }
+        str += ch;
+      }
+      if (str == 'true')
+        return true;
+      if (str == 'false')
+        return false;
+      if (str == 'null')
+        return null;
+      return new Cmd(str);
+    },
+    skipToNextLine: function lexerSkipToNextLine() {
+      var stream = this.stream;
+      while (true) {
+        var ch = stream.getChar();
+        if (!ch || ch == '\n')
+          return;
+        if (ch == '\r') {
+          if ((ch = stream.lookChar()) == '\n')
+            stream.skip();
+          return;
+        }
+      }
+    },
+    skip: function lexerSkip() {
+      this.stream.skip();
+    }
+  };
+
+  return constructor;
+})();
+
+var Linearization = (function linearizationLinearization() {
+  function constructor(stream) {
+    this.parser = new Parser(new Lexer(stream), false);
+    var obj1 = this.parser.getObj();
+    var obj2 = this.parser.getObj();
+    var obj3 = this.parser.getObj();
+    this.linDict = this.parser.getObj();
+    if (isInt(obj1) && isInt(obj2) && isCmd(obj3, 'obj') &&
+        isDict(this.linDict)) {
+      var obj = this.linDict.get('Linearized');
+      if (!(isNum(obj) && obj > 0))
+        this.linDict = null;
+    }
+  }
+
+  constructor.prototype = {
+    getInt: function linearizationGetInt(name) {
+      var linDict = this.linDict;
+      var obj;
+      if (isDict(linDict) &&
+          isInt(obj = linDict.get(name)) &&
+          obj > 0) {
+        return obj;
+      }
+      error('"' + name + '" field in linearization table is invalid');
+      return 0;
+    },
+    getHint: function linearizationGetHint(index) {
+      var linDict = this.linDict;
+      var obj1, obj2;
+      if (isDict(linDict) &&
+          isArray(obj1 = linDict.get('H')) &&
+          obj1.length >= 2 &&
+          isInt(obj2 = obj1[index]) &&
+          obj2 > 0) {
+        return obj2;
+      }
+      error('Hints table in linearization table is invalid: ' + index);
+      return 0;
+    },
+    get length() {
+      if (!isDict(this.linDict))
+        return 0;
+      return this.getInt('L');
+    },
+    get hintsOffset() {
+      return this.getHint(0);
+    },
+    get hintsLength() {
+      return this.getHint(1);
+    },
+    get hintsOffset2() {
+      return this.getHint(2);
+    },
+    get hintsLenth2() {
+      return this.getHint(3);
+    },
+    get objectNumberFirst() {
+      return this.getInt('O');
+    },
+    get endFirst() {
+      return this.getInt('E');
+    },
+    get numPages() {
+      return this.getInt('N');
+    },
+    get mainXRefEntriesOffset() {
+      return this.getInt('T');
+    },
+    get pageFirst() {
+      return this.getInt('P');
+    }
+  };
+
+  return constructor;
+})();
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/pattern.js b/apps/files_pdfviewer/js/pdfjs/src/pattern.js
new file mode 100755
index 00000000000..72d13d896b2
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/pattern.js
@@ -0,0 +1,291 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var Pattern = (function patternPattern() {
+  // Constructor should define this.getPattern
+  function constructor() {
+    error('should not call Pattern constructor');
+  }
+
+  constructor.prototype = {
+    // Input: current Canvas context
+    // Output: the appropriate fillStyle or strokeStyle
+    getPattern: function pattern_getStyle(ctx) {
+      error('Should not call Pattern.getStyle: ' + ctx);
+    }
+  };
+
+  constructor.shadingFromIR = function pattern_shadingFromIR(ctx, raw) {
+    return Shadings[raw[0]].fromIR(ctx, raw);
+  };
+
+  constructor.parseShading = function pattern_shading(shading, matrix, xref,
+                                                      res, ctx) {
+
+    var dict = isStream(shading) ? shading.dict : shading;
+    var type = dict.get('ShadingType');
+
+    switch (type) {
+      case 2:
+      case 3:
+        // both radial and axial shadings are handled by RadialAxial shading
+        return new Shadings.RadialAxial(dict, matrix, xref, res, ctx);
+      default:
+        return new Shadings.Dummy();
+    }
+  };
+  return constructor;
+})();
+
+var Shadings = {};
+
+// Radial and axial shading have very similar implementations
+// If needed, the implementations can be broken into two classes
+Shadings.RadialAxial = (function radialAxialShading() {
+  function constructor(dict, matrix, xref, res, ctx) {
+    this.matrix = matrix;
+    this.coordsArr = dict.get('Coords');
+    this.shadingType = dict.get('ShadingType');
+    this.type = 'Pattern';
+
+    this.ctx = ctx;
+    var cs = dict.get('ColorSpace', 'CS');
+    cs = ColorSpace.parse(cs, xref, res);
+    this.cs = cs;
+
+    var t0 = 0.0, t1 = 1.0;
+    if (dict.has('Domain')) {
+      var domainArr = dict.get('Domain');
+      t0 = domainArr[0];
+      t1 = domainArr[1];
+    }
+
+    var extendStart = false, extendEnd = false;
+    if (dict.has('Extend')) {
+      var extendArr = dict.get('Extend');
+      extendStart = extendArr[0];
+      extendEnd = extendArr[1];
+      TODO('Support extend');
+    }
+
+    this.extendStart = extendStart;
+    this.extendEnd = extendEnd;
+
+    var fnObj = dict.get('Function');
+    fnObj = xref.fetchIfRef(fnObj);
+    if (isArray(fnObj))
+      error('No support for array of functions');
+    else if (!isPDFFunction(fnObj))
+      error('Invalid function');
+    var fn = PDFFunction.parse(xref, fnObj);
+
+    // 10 samples seems good enough for now, but probably won't work
+    // if there are sharp color changes. Ideally, we would implement
+    // the spec faithfully and add lossless optimizations.
+    var step = (t1 - t0) / 10;
+    var diff = t1 - t0;
+
+    var colorStops = [];
+    for (var i = t0; i <= t1; i += step) {
+      var color = fn([i]);
+      var rgbColor = Util.makeCssRgb.apply(this, cs.getRgb(color));
+      colorStops.push([(i - t0) / diff, rgbColor]);
+    }
+
+    this.colorStops = colorStops;
+  }
+
+  constructor.fromIR = function radialAxialShadingGetIR(ctx, raw) {
+    var type = raw[1];
+    var colorStops = raw[2];
+    var p0 = raw[3];
+    var p1 = raw[4];
+    var r0 = raw[5];
+    var r1 = raw[6];
+
+    var curMatrix = ctx.mozCurrentTransform;
+    if (curMatrix) {
+      var userMatrix = ctx.mozCurrentTransformInverse;
+
+      p0 = Util.applyTransform(p0, curMatrix);
+      p0 = Util.applyTransform(p0, userMatrix);
+
+      p1 = Util.applyTransform(p1, curMatrix);
+      p1 = Util.applyTransform(p1, userMatrix);
+    }
+
+    var grad;
+    if (type == 2)
+      grad = ctx.createLinearGradient(p0[0], p0[1], p1[0], p1[1]);
+    else if (type == 3)
+      grad = ctx.createRadialGradient(p0[0], p0[1], r0, p1[0], p1[1], r1);
+
+    for (var i = 0, ii = colorStops.length; i < ii; ++i) {
+      var c = colorStops[i];
+      grad.addColorStop(c[0], c[1]);
+    }
+    return grad;
+  };
+
+  constructor.prototype = {
+    getIR: function radialAxialShadingGetIR() {
+      var coordsArr = this.coordsArr;
+      var type = this.shadingType;
+      if (type == 2) {
+        var p0 = [coordsArr[0], coordsArr[1]];
+        var p1 = [coordsArr[2], coordsArr[3]];
+        var r0 = null;
+        var r1 = null;
+      } else if (type == 3) {
+        var p0 = [coordsArr[0], coordsArr[1]];
+        var p1 = [coordsArr[3], coordsArr[4]];
+        var r0 = coordsArr[2];
+        var r1 = coordsArr[5];
+      } else {
+        error('getPattern type unknown: ' + type);
+      }
+
+      var matrix = this.matrix;
+      if (matrix) {
+        p0 = Util.applyTransform(p0, matrix);
+        p1 = Util.applyTransform(p1, matrix);
+      }
+
+      return ['RadialAxial', type, this.colorStops, p0, p1, r0, r1];
+    }
+  };
+
+  return constructor;
+})();
+
+Shadings.Dummy = (function dummyShading() {
+  function constructor() {
+    this.type = 'Pattern';
+  }
+
+  constructor.fromIR = function dummyShadingFromIR() {
+    return 'hotpink';
+  };
+
+  constructor.prototype = {
+    getIR: function dummyShadingGetIR() {
+      return ['Dummy'];
+    }
+  };
+  return constructor;
+})();
+
+var TilingPattern = (function tilingPattern() {
+  var PAINT_TYPE_COLORED = 1, PAINT_TYPE_UNCOLORED = 2;
+
+  function TilingPattern(IR, color, ctx, objs) {
+    var IRQueue = IR[2];
+    this.matrix = IR[3];
+    var bbox = IR[4];
+    var xstep = IR[5];
+    var ystep = IR[6];
+    var paintType = IR[7];
+
+    TODO('TilingType');
+
+    this.curMatrix = ctx.mozCurrentTransform;
+    this.invMatrix = ctx.mozCurrentTransformInverse;
+    this.ctx = ctx;
+    this.type = 'Pattern';
+
+    var x0 = bbox[0], y0 = bbox[1], x1 = bbox[2], y1 = bbox[3];
+
+    var topLeft = [x0, y0];
+    // we want the canvas to be as large as the step size
+    var botRight = [x0 + xstep, y0 + ystep];
+
+    var width = botRight[0] - topLeft[0];
+    var height = botRight[1] - topLeft[1];
+
+    // TODO: hack to avoid OOM, we would idealy compute the tiling
+    // pattern to be only as large as the acual size in device space
+    // This could be computed with .mozCurrentTransform, but still
+    // needs to be implemented
+    while (Math.abs(width) > 512 || Math.abs(height) > 512) {
+      width = 512;
+      height = 512;
+    }
+
+    var tmpCanvas = new ScratchCanvas(width, height);
+
+    // set the new canvas element context as the graphics context
+    var tmpCtx = tmpCanvas.getContext('2d');
+    var graphics = new CanvasGraphics(tmpCtx, objs);
+
+    switch (paintType) {
+      case PAINT_TYPE_COLORED:
+        tmpCtx.fillStyle = ctx.fillStyle;
+        tmpCtx.strokeStyle = ctx.strokeStyle;
+        break;
+      case PAINT_TYPE_UNCOLORED:
+        color = Util.makeCssRgb.apply(this, color);
+        tmpCtx.fillStyle = color;
+        tmpCtx.strokeStyle = color;
+        break;
+      default:
+        error('Unsupported paint type: ' + paintType);
+    }
+
+    var scale = [width / xstep, height / ystep];
+    this.scale = scale;
+
+    // transform coordinates to pattern space
+    var tmpTranslate = [1, 0, 0, 1, -topLeft[0], -topLeft[1]];
+    var tmpScale = [scale[0], 0, 0, scale[1], 0, 0];
+    graphics.transform.apply(graphics, tmpScale);
+    graphics.transform.apply(graphics, tmpTranslate);
+
+    if (bbox && isArray(bbox) && 4 == bbox.length) {
+      var bboxWidth = x1 - x0;
+      var bboxHeight = y1 - y0;
+      graphics.rectangle(x0, y0, bboxWidth, bboxHeight);
+      graphics.clip();
+      graphics.endPath();
+    }
+
+    graphics.executeIRQueue(IRQueue);
+
+    this.canvas = tmpCanvas;
+  }
+
+  TilingPattern.getIR = function tiling_getIR(codeIR, dict, args) {
+    var matrix = dict.get('Matrix');
+    var bbox = dict.get('BBox');
+    var xstep = dict.get('XStep');
+    var ystep = dict.get('YStep');
+    var paintType = dict.get('PaintType');
+
+    return [
+      'TilingPattern', args, codeIR, matrix, bbox, xstep, ystep, paintType
+    ];
+  };
+
+  TilingPattern.prototype = {
+    getPattern: function tiling_getPattern() {
+      var matrix = this.matrix;
+      var curMatrix = this.curMatrix;
+      var ctx = this.ctx;
+
+      if (curMatrix)
+        ctx.setTransform.apply(ctx, curMatrix);
+
+      if (matrix)
+        ctx.transform.apply(ctx, matrix);
+
+      var scale = this.scale;
+      ctx.scale(1 / scale[0], 1 / scale[1]);
+
+      return ctx.createPattern(this.canvas, 'repeat');
+    }
+  };
+
+  return TilingPattern;
+})();
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/pdf.js b/apps/files_pdfviewer/js/pdfjs/src/pdf.js
new file mode 100755
index 00000000000..1042a651b8d
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/pdf.js
@@ -0,0 +1,15 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+var PDFJS = {};
+
+(function pdfjsWrapper() {
+  // Use strict in our context only - users might not want it
+  'use strict';
+
+  PDFJS.build = 'PDFJSSCRIPT_BUNDLE_VER';
+
+  // Files are inserted below - see Makefile
+  /* PDFJSSCRIPT_INCLUDE_ALL */
+
+}).call((typeof window === 'undefined') ? this : window);
diff --git a/apps/files_pdfviewer/js/pdfjs/src/stream.js b/apps/files_pdfviewer/js/pdfjs/src/stream.js
new file mode 100755
index 00000000000..559fb2ca22e
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/stream.js
@@ -0,0 +1,2113 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var Stream = (function streamStream() {
+  function constructor(arrayBuffer, start, length, dict) {
+    this.bytes = new Uint8Array(arrayBuffer);
+    this.start = start || 0;
+    this.pos = this.start;
+    this.end = (start + length) || this.bytes.length;
+    this.dict = dict;
+  }
+
+  // required methods for a stream. if a particular stream does not
+  // implement these, an error should be thrown
+  constructor.prototype = {
+    get length() {
+      return this.end - this.start;
+    },
+    getByte: function stream_getByte() {
+      if (this.pos >= this.end)
+        return null;
+      return this.bytes[this.pos++];
+    },
+    // returns subarray of original buffer
+    // should only be read
+    getBytes: function stream_getBytes(length) {
+      var bytes = this.bytes;
+      var pos = this.pos;
+      var strEnd = this.end;
+
+      if (!length)
+        return bytes.subarray(pos, strEnd);
+
+      var end = pos + length;
+      if (end > strEnd)
+        end = strEnd;
+
+      this.pos = end;
+      return bytes.subarray(pos, end);
+    },
+    lookChar: function stream_lookChar() {
+      if (this.pos >= this.end)
+        return null;
+      return String.fromCharCode(this.bytes[this.pos]);
+    },
+    getChar: function stream_getChar() {
+      if (this.pos >= this.end)
+        return null;
+      return String.fromCharCode(this.bytes[this.pos++]);
+    },
+    skip: function stream_skip(n) {
+      if (!n)
+        n = 1;
+      this.pos += n;
+    },
+    reset: function stream_reset() {
+      this.pos = this.start;
+    },
+    moveStart: function stream_moveStart() {
+      this.start = this.pos;
+    },
+    makeSubStream: function stream_makeSubstream(start, length, dict) {
+      return new Stream(this.bytes.buffer, start, length, dict);
+    },
+    isStream: true
+  };
+
+  return constructor;
+})();
+
+var StringStream = (function stringStream() {
+  function constructor(str) {
+    var length = str.length;
+    var bytes = new Uint8Array(length);
+    for (var n = 0; n < length; ++n)
+      bytes[n] = str.charCodeAt(n);
+    Stream.call(this, bytes);
+  }
+
+  constructor.prototype = Stream.prototype;
+
+  return constructor;
+})();
+
+// super class for the decoding streams
+var DecodeStream = (function decodeStream() {
+  function constructor() {
+    this.pos = 0;
+    this.bufferLength = 0;
+    this.eof = false;
+    this.buffer = null;
+  }
+
+  constructor.prototype = {
+    ensureBuffer: function decodestream_ensureBuffer(requested) {
+      var buffer = this.buffer;
+      var current = buffer ? buffer.byteLength : 0;
+      if (requested < current)
+        return buffer;
+      var size = 512;
+      while (size < requested)
+        size <<= 1;
+      var buffer2 = new Uint8Array(size);
+      for (var i = 0; i < current; ++i)
+        buffer2[i] = buffer[i];
+      return (this.buffer = buffer2);
+    },
+    getByte: function decodestream_getByte() {
+      var pos = this.pos;
+      while (this.bufferLength <= pos) {
+        if (this.eof)
+          return null;
+        this.readBlock();
+      }
+      return this.buffer[this.pos++];
+    },
+    getBytes: function decodestream_getBytes(length) {
+      var end, pos = this.pos;
+
+      if (length) {
+        this.ensureBuffer(pos + length);
+        end = pos + length;
+
+        while (!this.eof && this.bufferLength < end)
+          this.readBlock();
+
+        var bufEnd = this.bufferLength;
+        if (end > bufEnd)
+          end = bufEnd;
+      } else {
+        while (!this.eof)
+          this.readBlock();
+
+        end = this.bufferLength;
+
+        // checking if bufferLength is still 0 then
+        // the buffer has to be initialized
+        if (!end)
+          this.buffer = new Uint8Array(0);
+      }
+
+      this.pos = end;
+      return this.buffer.subarray(pos, end);
+    },
+    lookChar: function decodestream_lookChar() {
+      var pos = this.pos;
+      while (this.bufferLength <= pos) {
+        if (this.eof)
+          return null;
+        this.readBlock();
+      }
+      return String.fromCharCode(this.buffer[this.pos]);
+    },
+    getChar: function decodestream_getChar() {
+      var pos = this.pos;
+      while (this.bufferLength <= pos) {
+        if (this.eof)
+          return null;
+        this.readBlock();
+      }
+      return String.fromCharCode(this.buffer[this.pos++]);
+    },
+    makeSubStream: function decodestream_makeSubstream(start, length, dict) {
+      var end = start + length;
+      while (this.bufferLength <= end && !this.eof)
+        this.readBlock();
+      return new Stream(this.buffer, start, length, dict);
+    },
+    skip: function decodestream_skip(n) {
+      if (!n)
+        n = 1;
+      this.pos += n;
+    },
+    reset: function decodestream_reset() {
+      this.pos = 0;
+    }
+  };
+
+  return constructor;
+})();
+
+var FakeStream = (function fakeStream() {
+  function constructor(stream) {
+    this.dict = stream.dict;
+    DecodeStream.call(this);
+  }
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+  constructor.prototype.readBlock = function fakeStreamReadBlock() {
+    var bufferLength = this.bufferLength;
+    bufferLength += 1024;
+    var buffer = this.ensureBuffer(bufferLength);
+    this.bufferLength = bufferLength;
+  };
+
+  constructor.prototype.getBytes = function fakeStreamGetBytes(length) {
+    var end, pos = this.pos;
+
+    if (length) {
+      this.ensureBuffer(pos + length);
+      end = pos + length;
+
+      while (!this.eof && this.bufferLength < end)
+        this.readBlock();
+
+      var bufEnd = this.bufferLength;
+      if (end > bufEnd)
+        end = bufEnd;
+    } else {
+      this.eof = true;
+      end = this.bufferLength;
+    }
+
+    this.pos = end;
+    return this.buffer.subarray(pos, end);
+  };
+
+  return constructor;
+})();
+
+var StreamsSequenceStream = (function streamSequenceStream() {
+  function constructor(streams) {
+    this.streams = streams;
+    DecodeStream.call(this);
+  }
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.readBlock = function streamSequenceStreamReadBlock() {
+    var streams = this.streams;
+    if (streams.length == 0) {
+      this.eof = true;
+      return;
+    }
+    var stream = streams.shift();
+    var chunk = stream.getBytes();
+    var bufferLength = this.bufferLength;
+    var newLength = bufferLength + chunk.length;
+    var buffer = this.ensureBuffer(newLength);
+    buffer.set(chunk, bufferLength);
+    this.bufferLength = newLength;
+  };
+
+  return constructor;
+})();
+
+var FlateStream = (function flateStream() {
+  var codeLenCodeMap = new Uint32Array([
+    16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
+  ]);
+
+  var lengthDecode = new Uint32Array([
+    0x00003, 0x00004, 0x00005, 0x00006, 0x00007, 0x00008, 0x00009, 0x0000a,
+    0x1000b, 0x1000d, 0x1000f, 0x10011, 0x20013, 0x20017, 0x2001b, 0x2001f,
+    0x30023, 0x3002b, 0x30033, 0x3003b, 0x40043, 0x40053, 0x40063, 0x40073,
+    0x50083, 0x500a3, 0x500c3, 0x500e3, 0x00102, 0x00102, 0x00102
+  ]);
+
+  var distDecode = new Uint32Array([
+    0x00001, 0x00002, 0x00003, 0x00004, 0x10005, 0x10007, 0x20009, 0x2000d,
+    0x30011, 0x30019, 0x40021, 0x40031, 0x50041, 0x50061, 0x60081, 0x600c1,
+    0x70101, 0x70181, 0x80201, 0x80301, 0x90401, 0x90601, 0xa0801, 0xa0c01,
+    0xb1001, 0xb1801, 0xc2001, 0xc3001, 0xd4001, 0xd6001
+  ]);
+
+  var fixedLitCodeTab = [new Uint32Array([
+    0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c0,
+    0x70108, 0x80060, 0x80020, 0x900a0, 0x80000, 0x80080, 0x80040, 0x900e0,
+    0x70104, 0x80058, 0x80018, 0x90090, 0x70114, 0x80078, 0x80038, 0x900d0,
+    0x7010c, 0x80068, 0x80028, 0x900b0, 0x80008, 0x80088, 0x80048, 0x900f0,
+    0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c8,
+    0x7010a, 0x80064, 0x80024, 0x900a8, 0x80004, 0x80084, 0x80044, 0x900e8,
+    0x70106, 0x8005c, 0x8001c, 0x90098, 0x70116, 0x8007c, 0x8003c, 0x900d8,
+    0x7010e, 0x8006c, 0x8002c, 0x900b8, 0x8000c, 0x8008c, 0x8004c, 0x900f8,
+    0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c4,
+    0x70109, 0x80062, 0x80022, 0x900a4, 0x80002, 0x80082, 0x80042, 0x900e4,
+    0x70105, 0x8005a, 0x8001a, 0x90094, 0x70115, 0x8007a, 0x8003a, 0x900d4,
+    0x7010d, 0x8006a, 0x8002a, 0x900b4, 0x8000a, 0x8008a, 0x8004a, 0x900f4,
+    0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cc,
+    0x7010b, 0x80066, 0x80026, 0x900ac, 0x80006, 0x80086, 0x80046, 0x900ec,
+    0x70107, 0x8005e, 0x8001e, 0x9009c, 0x70117, 0x8007e, 0x8003e, 0x900dc,
+    0x7010f, 0x8006e, 0x8002e, 0x900bc, 0x8000e, 0x8008e, 0x8004e, 0x900fc,
+    0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c2,
+    0x70108, 0x80061, 0x80021, 0x900a2, 0x80001, 0x80081, 0x80041, 0x900e2,
+    0x70104, 0x80059, 0x80019, 0x90092, 0x70114, 0x80079, 0x80039, 0x900d2,
+    0x7010c, 0x80069, 0x80029, 0x900b2, 0x80009, 0x80089, 0x80049, 0x900f2,
+    0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900ca,
+    0x7010a, 0x80065, 0x80025, 0x900aa, 0x80005, 0x80085, 0x80045, 0x900ea,
+    0x70106, 0x8005d, 0x8001d, 0x9009a, 0x70116, 0x8007d, 0x8003d, 0x900da,
+    0x7010e, 0x8006d, 0x8002d, 0x900ba, 0x8000d, 0x8008d, 0x8004d, 0x900fa,
+    0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c6,
+    0x70109, 0x80063, 0x80023, 0x900a6, 0x80003, 0x80083, 0x80043, 0x900e6,
+    0x70105, 0x8005b, 0x8001b, 0x90096, 0x70115, 0x8007b, 0x8003b, 0x900d6,
+    0x7010d, 0x8006b, 0x8002b, 0x900b6, 0x8000b, 0x8008b, 0x8004b, 0x900f6,
+    0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900ce,
+    0x7010b, 0x80067, 0x80027, 0x900ae, 0x80007, 0x80087, 0x80047, 0x900ee,
+    0x70107, 0x8005f, 0x8001f, 0x9009e, 0x70117, 0x8007f, 0x8003f, 0x900de,
+    0x7010f, 0x8006f, 0x8002f, 0x900be, 0x8000f, 0x8008f, 0x8004f, 0x900fe,
+    0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c1,
+    0x70108, 0x80060, 0x80020, 0x900a1, 0x80000, 0x80080, 0x80040, 0x900e1,
+    0x70104, 0x80058, 0x80018, 0x90091, 0x70114, 0x80078, 0x80038, 0x900d1,
+    0x7010c, 0x80068, 0x80028, 0x900b1, 0x80008, 0x80088, 0x80048, 0x900f1,
+    0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c9,
+    0x7010a, 0x80064, 0x80024, 0x900a9, 0x80004, 0x80084, 0x80044, 0x900e9,
+    0x70106, 0x8005c, 0x8001c, 0x90099, 0x70116, 0x8007c, 0x8003c, 0x900d9,
+    0x7010e, 0x8006c, 0x8002c, 0x900b9, 0x8000c, 0x8008c, 0x8004c, 0x900f9,
+    0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c5,
+    0x70109, 0x80062, 0x80022, 0x900a5, 0x80002, 0x80082, 0x80042, 0x900e5,
+    0x70105, 0x8005a, 0x8001a, 0x90095, 0x70115, 0x8007a, 0x8003a, 0x900d5,
+    0x7010d, 0x8006a, 0x8002a, 0x900b5, 0x8000a, 0x8008a, 0x8004a, 0x900f5,
+    0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cd,
+    0x7010b, 0x80066, 0x80026, 0x900ad, 0x80006, 0x80086, 0x80046, 0x900ed,
+    0x70107, 0x8005e, 0x8001e, 0x9009d, 0x70117, 0x8007e, 0x8003e, 0x900dd,
+    0x7010f, 0x8006e, 0x8002e, 0x900bd, 0x8000e, 0x8008e, 0x8004e, 0x900fd,
+    0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c3,
+    0x70108, 0x80061, 0x80021, 0x900a3, 0x80001, 0x80081, 0x80041, 0x900e3,
+    0x70104, 0x80059, 0x80019, 0x90093, 0x70114, 0x80079, 0x80039, 0x900d3,
+    0x7010c, 0x80069, 0x80029, 0x900b3, 0x80009, 0x80089, 0x80049, 0x900f3,
+    0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900cb,
+    0x7010a, 0x80065, 0x80025, 0x900ab, 0x80005, 0x80085, 0x80045, 0x900eb,
+    0x70106, 0x8005d, 0x8001d, 0x9009b, 0x70116, 0x8007d, 0x8003d, 0x900db,
+    0x7010e, 0x8006d, 0x8002d, 0x900bb, 0x8000d, 0x8008d, 0x8004d, 0x900fb,
+    0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c7,
+    0x70109, 0x80063, 0x80023, 0x900a7, 0x80003, 0x80083, 0x80043, 0x900e7,
+    0x70105, 0x8005b, 0x8001b, 0x90097, 0x70115, 0x8007b, 0x8003b, 0x900d7,
+    0x7010d, 0x8006b, 0x8002b, 0x900b7, 0x8000b, 0x8008b, 0x8004b, 0x900f7,
+    0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900cf,
+    0x7010b, 0x80067, 0x80027, 0x900af, 0x80007, 0x80087, 0x80047, 0x900ef,
+    0x70107, 0x8005f, 0x8001f, 0x9009f, 0x70117, 0x8007f, 0x8003f, 0x900df,
+    0x7010f, 0x8006f, 0x8002f, 0x900bf, 0x8000f, 0x8008f, 0x8004f, 0x900ff
+  ]), 9];
+
+  var fixedDistCodeTab = [new Uint32Array([
+    0x50000, 0x50010, 0x50008, 0x50018, 0x50004, 0x50014, 0x5000c, 0x5001c,
+    0x50002, 0x50012, 0x5000a, 0x5001a, 0x50006, 0x50016, 0x5000e, 0x00000,
+    0x50001, 0x50011, 0x50009, 0x50019, 0x50005, 0x50015, 0x5000d, 0x5001d,
+    0x50003, 0x50013, 0x5000b, 0x5001b, 0x50007, 0x50017, 0x5000f, 0x00000
+  ]), 5];
+
+  function constructor(stream) {
+    var bytes = stream.getBytes();
+    var bytesPos = 0;
+
+    this.dict = stream.dict;
+    var cmf = bytes[bytesPos++];
+    var flg = bytes[bytesPos++];
+    if (cmf == -1 || flg == -1)
+      error('Invalid header in flate stream: ' + cmf + ', ' + flg);
+    if ((cmf & 0x0f) != 0x08)
+      error('Unknown compression method in flate stream: ' + cmf + ', ' + flg);
+    if ((((cmf << 8) + flg) % 31) != 0)
+      error('Bad FCHECK in flate stream: ' + cmf + ', ' + flg);
+    if (flg & 0x20)
+      error('FDICT bit set in flate stream: ' + cmf + ', ' + flg);
+
+    this.bytes = bytes;
+    this.bytesPos = bytesPos;
+
+    this.codeSize = 0;
+    this.codeBuf = 0;
+
+    DecodeStream.call(this);
+  }
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.getBits = function flateStreamGetBits(bits) {
+    var codeSize = this.codeSize;
+    var codeBuf = this.codeBuf;
+    var bytes = this.bytes;
+    var bytesPos = this.bytesPos;
+
+    var b;
+    while (codeSize < bits) {
+      if (typeof (b = bytes[bytesPos++]) == 'undefined')
+        error('Bad encoding in flate stream');
+      codeBuf |= b << codeSize;
+      codeSize += 8;
+    }
+    b = codeBuf & ((1 << bits) - 1);
+    this.codeBuf = codeBuf >> bits;
+    this.codeSize = codeSize -= bits;
+    this.bytesPos = bytesPos;
+    return b;
+  };
+
+  constructor.prototype.getCode = function flateStreamGetCode(table) {
+    var codes = table[0];
+    var maxLen = table[1];
+    var codeSize = this.codeSize;
+    var codeBuf = this.codeBuf;
+    var bytes = this.bytes;
+    var bytesPos = this.bytesPos;
+
+    while (codeSize < maxLen) {
+      var b;
+      if (typeof (b = bytes[bytesPos++]) == 'undefined')
+        error('Bad encoding in flate stream');
+      codeBuf |= (b << codeSize);
+      codeSize += 8;
+    }
+    var code = codes[codeBuf & ((1 << maxLen) - 1)];
+    var codeLen = code >> 16;
+    var codeVal = code & 0xffff;
+    if (codeSize == 0 || codeSize < codeLen || codeLen == 0)
+      error('Bad encoding in flate stream');
+    this.codeBuf = (codeBuf >> codeLen);
+    this.codeSize = (codeSize - codeLen);
+    this.bytesPos = bytesPos;
+    return codeVal;
+  };
+
+  constructor.prototype.generateHuffmanTable =
+    function flateStreamGenerateHuffmanTable(lengths) {
+    var n = lengths.length;
+
+    // find max code length
+    var maxLen = 0;
+    for (var i = 0; i < n; ++i) {
+      if (lengths[i] > maxLen)
+        maxLen = lengths[i];
+    }
+
+    // build the table
+    var size = 1 << maxLen;
+    var codes = new Uint32Array(size);
+    for (var len = 1, code = 0, skip = 2;
+         len <= maxLen;
+         ++len, code <<= 1, skip <<= 1) {
+      for (var val = 0; val < n; ++val) {
+        if (lengths[val] == len) {
+          // bit-reverse the code
+          var code2 = 0;
+          var t = code;
+          for (var i = 0; i < len; ++i) {
+            code2 = (code2 << 1) | (t & 1);
+            t >>= 1;
+          }
+
+          // fill the table entries
+          for (var i = code2; i < size; i += skip)
+            codes[i] = (len << 16) | val;
+
+          ++code;
+        }
+      }
+    }
+
+    return [codes, maxLen];
+  };
+
+  constructor.prototype.readBlock = function flateStreamReadBlock() {
+    // read block header
+    var hdr = this.getBits(3);
+    if (hdr & 1)
+      this.eof = true;
+    hdr >>= 1;
+
+    if (hdr == 0) { // uncompressed block
+      var bytes = this.bytes;
+      var bytesPos = this.bytesPos;
+      var b;
+
+      if (typeof (b = bytes[bytesPos++]) == 'undefined')
+        error('Bad block header in flate stream');
+      var blockLen = b;
+      if (typeof (b = bytes[bytesPos++]) == 'undefined')
+        error('Bad block header in flate stream');
+      blockLen |= (b << 8);
+      if (typeof (b = bytes[bytesPos++]) == 'undefined')
+        error('Bad block header in flate stream');
+      var check = b;
+      if (typeof (b = bytes[bytesPos++]) == 'undefined')
+        error('Bad block header in flate stream');
+      check |= (b << 8);
+      if (check != (~blockLen & 0xffff))
+        error('Bad uncompressed block length in flate stream');
+
+      this.codeBuf = 0;
+      this.codeSize = 0;
+
+      var bufferLength = this.bufferLength;
+      var buffer = this.ensureBuffer(bufferLength + blockLen);
+      var end = bufferLength + blockLen;
+      this.bufferLength = end;
+      for (var n = bufferLength; n < end; ++n) {
+        if (typeof (b = bytes[bytesPos++]) == 'undefined') {
+          this.eof = true;
+          break;
+        }
+        buffer[n] = b;
+      }
+      this.bytesPos = bytesPos;
+      return;
+    }
+
+    var litCodeTable;
+    var distCodeTable;
+    if (hdr == 1) { // compressed block, fixed codes
+      litCodeTable = fixedLitCodeTab;
+      distCodeTable = fixedDistCodeTab;
+    } else if (hdr == 2) { // compressed block, dynamic codes
+      var numLitCodes = this.getBits(5) + 257;
+      var numDistCodes = this.getBits(5) + 1;
+      var numCodeLenCodes = this.getBits(4) + 4;
+
+      // build the code lengths code table
+      var codeLenCodeLengths = new Uint8Array(codeLenCodeMap.length);
+
+      for (var i = 0; i < numCodeLenCodes; ++i)
+        codeLenCodeLengths[codeLenCodeMap[i]] = this.getBits(3);
+      var codeLenCodeTab = this.generateHuffmanTable(codeLenCodeLengths);
+
+      // build the literal and distance code tables
+      var len = 0;
+      var i = 0;
+      var codes = numLitCodes + numDistCodes;
+      var codeLengths = new Uint8Array(codes);
+      while (i < codes) {
+        var code = this.getCode(codeLenCodeTab);
+        if (code == 16) {
+          var bitsLength = 2, bitsOffset = 3, what = len;
+        } else if (code == 17) {
+          var bitsLength = 3, bitsOffset = 3, what = (len = 0);
+        } else if (code == 18) {
+          var bitsLength = 7, bitsOffset = 11, what = (len = 0);
+        } else {
+          codeLengths[i++] = len = code;
+          continue;
+        }
+
+        var repeatLength = this.getBits(bitsLength) + bitsOffset;
+        while (repeatLength-- > 0)
+          codeLengths[i++] = what;
+      }
+
+      litCodeTable =
+        this.generateHuffmanTable(codeLengths.subarray(0, numLitCodes));
+      distCodeTable =
+        this.generateHuffmanTable(codeLengths.subarray(numLitCodes, codes));
+    } else {
+      error('Unknown block type in flate stream');
+    }
+
+    var buffer = this.buffer;
+    var limit = buffer ? buffer.length : 0;
+    var pos = this.bufferLength;
+    while (true) {
+      var code1 = this.getCode(litCodeTable);
+      if (code1 < 256) {
+        if (pos + 1 >= limit) {
+          buffer = this.ensureBuffer(pos + 1);
+          limit = buffer.length;
+        }
+        buffer[pos++] = code1;
+        continue;
+      }
+      if (code1 == 256) {
+        this.bufferLength = pos;
+        return;
+      }
+      code1 -= 257;
+      code1 = lengthDecode[code1];
+      var code2 = code1 >> 16;
+      if (code2 > 0)
+        code2 = this.getBits(code2);
+      var len = (code1 & 0xffff) + code2;
+      code1 = this.getCode(distCodeTable);
+      code1 = distDecode[code1];
+      code2 = code1 >> 16;
+      if (code2 > 0)
+        code2 = this.getBits(code2);
+      var dist = (code1 & 0xffff) + code2;
+      if (pos + len >= limit) {
+        buffer = this.ensureBuffer(pos + len);
+        limit = buffer.length;
+      }
+      for (var k = 0; k < len; ++k, ++pos)
+        buffer[pos] = buffer[pos - dist];
+    }
+  };
+
+  return constructor;
+})();
+
+var PredictorStream = (function predictorStream() {
+  function constructor(stream, params) {
+    var predictor = this.predictor = params.get('Predictor') || 1;
+
+    if (predictor <= 1)
+      return stream; // no prediction
+    if (predictor !== 2 && (predictor < 10 || predictor > 15))
+      error('Unsupported predictor: ' + predictor);
+
+    if (predictor === 2)
+      this.readBlock = this.readBlockTiff;
+    else
+      this.readBlock = this.readBlockPng;
+
+    this.stream = stream;
+    this.dict = stream.dict;
+
+    var colors = this.colors = params.get('Colors') || 1;
+    var bits = this.bits = params.get('BitsPerComponent') || 8;
+    var columns = this.columns = params.get('Columns') || 1;
+
+    this.pixBytes = (colors * bits + 7) >> 3;
+    this.rowBytes = (columns * colors * bits + 7) >> 3;
+
+    DecodeStream.call(this);
+    return this;
+  }
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.readBlockTiff =
+    function predictorStreamReadBlockTiff() {
+    var rowBytes = this.rowBytes;
+
+    var bufferLength = this.bufferLength;
+    var buffer = this.ensureBuffer(bufferLength + rowBytes);
+    var currentRow = buffer.subarray(bufferLength, bufferLength + rowBytes);
+
+    var bits = this.bits;
+    var colors = this.colors;
+
+    var rawBytes = this.stream.getBytes(rowBytes);
+
+    var inbuf = 0, outbuf = 0;
+    var inbits = 0, outbits = 0;
+
+    if (bits === 1) {
+      for (var i = 0; i < rowBytes; ++i) {
+        var c = rawBytes[i];
+        inbuf = (inbuf << 8) | c;
+        // bitwise addition is exclusive or
+        // first shift inbuf and then add
+        currentRow[i] = (c ^ (inbuf >> colors)) & 0xFF;
+        // truncate inbuf (assumes colors < 16)
+        inbuf &= 0xFFFF;
+      }
+    } else if (bits === 8) {
+      for (var i = 0; i < colors; ++i)
+        currentRow[i] = rawBytes[i];
+      for (; i < rowBytes; ++i)
+        currentRow[i] = currentRow[i - colors] + rawBytes[i];
+    } else {
+      var compArray = new Uint8Array(colors + 1);
+      var bitMask = (1 << bits) - 1;
+      var j = 0, k = 0;
+      var columns = this.columns;
+      for (var i = 0; i < columns; ++i) {
+        for (var kk = 0; kk < colors; ++kk) {
+          if (inbits < bits) {
+            inbuf = (inbuf << 8) | (rawBytes[j++] & 0xFF);
+            inbits += 8;
+          }
+          compArray[kk] = (compArray[kk] +
+                           (inbuf >> (inbits - bits))) & bitMask;
+          inbits -= bits;
+          outbuf = (outbuf << bits) | compArray[kk];
+          outbits += bits;
+          if (outbits >= 8) {
+            currentRow[k++] = (outbuf >> (outbits - 8)) & 0xFF;
+            outbits -= 8;
+          }
+        }
+      }
+      if (outbits > 0) {
+        currentRow[k++] = (outbuf << (8 - outbits)) +
+        (inbuf & ((1 << (8 - outbits)) - 1));
+      }
+    }
+    this.bufferLength += rowBytes;
+  };
+
+  constructor.prototype.readBlockPng = function predictorStreamReadBlockPng() {
+    var rowBytes = this.rowBytes;
+    var pixBytes = this.pixBytes;
+
+    var predictor = this.stream.getByte();
+    var rawBytes = this.stream.getBytes(rowBytes);
+
+    var bufferLength = this.bufferLength;
+    var buffer = this.ensureBuffer(bufferLength + rowBytes);
+
+    var currentRow = buffer.subarray(bufferLength, bufferLength + rowBytes);
+    var prevRow = buffer.subarray(bufferLength - rowBytes, bufferLength);
+    if (prevRow.length == 0)
+      prevRow = new Uint8Array(rowBytes);
+
+    switch (predictor) {
+      case 0:
+        for (var i = 0; i < rowBytes; ++i)
+          currentRow[i] = rawBytes[i];
+        break;
+      case 1:
+        for (var i = 0; i < pixBytes; ++i)
+          currentRow[i] = rawBytes[i];
+        for (; i < rowBytes; ++i)
+          currentRow[i] = (currentRow[i - pixBytes] + rawBytes[i]) & 0xFF;
+        break;
+      case 2:
+        for (var i = 0; i < rowBytes; ++i)
+          currentRow[i] = (prevRow[i] + rawBytes[i]) & 0xFF;
+        break;
+      case 3:
+        for (var i = 0; i < pixBytes; ++i)
+          currentRow[i] = (prevRow[i] >> 1) + rawBytes[i];
+        for (; i < rowBytes; ++i) {
+          currentRow[i] = (((prevRow[i] + currentRow[i - pixBytes]) >> 1) +
+                           rawBytes[i]) & 0xFF;
+        }
+        break;
+      case 4:
+        // we need to save the up left pixels values. the simplest way
+        // is to create a new buffer
+        for (var i = 0; i < pixBytes; ++i) {
+          var up = prevRow[i];
+          var c = rawBytes[i];
+          currentRow[i] = up + c;
+        }
+        for (; i < rowBytes; ++i) {
+          var up = prevRow[i];
+          var upLeft = prevRow[i - pixBytes];
+          var left = currentRow[i - pixBytes];
+          var p = left + up - upLeft;
+
+          var pa = p - left;
+          if (pa < 0)
+            pa = -pa;
+          var pb = p - up;
+          if (pb < 0)
+            pb = -pb;
+          var pc = p - upLeft;
+          if (pc < 0)
+            pc = -pc;
+
+          var c = rawBytes[i];
+          if (pa <= pb && pa <= pc)
+            currentRow[i] = left + c;
+          else if (pb <= pc)
+            currentRow[i] = up + c;
+          else
+            currentRow[i] = upLeft + c;
+        }
+        break;
+      default:
+        error('Unsupported predictor: ' + predictor);
+    }
+    this.bufferLength += rowBytes;
+  };
+
+  return constructor;
+})();
+
+/**
+ * Depending on the type of JPEG a JpegStream is handled in different ways. For
+ * JPEG's that are supported natively such as DeviceGray and DeviceRGB the image
+ * data is stored and then loaded by the browser.  For unsupported JPEG's we use
+ * a library to decode these images and the stream behaves like all the other
+ * DecodeStreams.
+ */
+var JpegStream = (function jpegStream() {
+  function isAdobeImage(bytes) {
+    var maxBytesScanned = Math.max(bytes.length - 16, 1024);
+    // Looking for APP14, 'Adobe'
+    for (var i = 0; i < maxBytesScanned; ++i) {
+      if (bytes[i] == 0xFF && bytes[i + 1] == 0xEE &&
+          bytes[i + 2] == 0x00 && bytes[i + 3] == 0x0E &&
+          bytes[i + 4] == 0x41 && bytes[i + 5] == 0x64 &&
+          bytes[i + 6] == 0x6F && bytes[i + 7] == 0x62 &&
+          bytes[i + 8] == 0x65 && bytes[i + 9] == 0x00)
+          return true;
+      // scanning until frame tag
+      if (bytes[i] == 0xFF && bytes[i + 1] == 0xC0)
+        break;
+    }
+    return false;
+  }
+
+  function fixAdobeImage(bytes) {
+    // Inserting 'EMBED' marker after JPEG signature
+    var embedMarker = new Uint8Array([0xFF, 0xEC, 0, 8, 0x45, 0x4D, 0x42, 0x45,
+                                      0x44, 0]);
+    var newBytes = new Uint8Array(bytes.length + embedMarker.length);
+    newBytes.set(bytes, embedMarker.length);
+    // copy JPEG header
+    newBytes[0] = bytes[0];
+    newBytes[1] = bytes[1];
+    newBytes.set(embedMarker, 2);
+    return newBytes;
+  }
+
+  function constructor(bytes, dict, xref) {
+    // TODO: per poppler, some images may have 'junk' before that
+    // need to be removed
+    this.dict = dict;
+
+    // Flag indicating wether the image can be natively loaded.
+    this.isNative = true;
+
+    this.colorTransform = -1;
+
+    if (isAdobeImage(bytes)) {
+      // when bug 674619 land, let's check if browser can do
+      // normal cmyk and then we won't have to the following
+      var cs = xref.fetchIfRef(dict.get('ColorSpace'));
+
+      // DeviceRGB and DeviceGray are the only Adobe images that work natively
+      if (isName(cs) && (cs.name === 'DeviceRGB' || cs.name === 'DeviceGray')) {
+        bytes = fixAdobeImage(bytes);
+        this.src = bytesToString(bytes);
+      } else {
+        this.colorTransform = dict.get('ColorTransform');
+        this.isNative = false;
+        this.bytes = bytes;
+      }
+    } else {
+      this.src = bytesToString(bytes);
+    }
+
+    DecodeStream.call(this);
+  }
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.ensureBuffer = function jpegStreamEnsureBuffer(req) {
+    if (this.bufferLength)
+      return;
+    var jpegImage = new JpegImage();
+    jpegImage.colorTransform = this.colorTransform;
+    jpegImage.parse(this.bytes);
+    var width = jpegImage.width;
+    var height = jpegImage.height;
+    var data = jpegImage.getData(width, height);
+    this.buffer = data;
+    this.bufferLength = data.length;
+  };
+  constructor.prototype.getIR = function jpegStreamGetIR() {
+    return this.src;
+  };
+  constructor.prototype.getChar = function jpegStreamGetChar() {
+      error('internal error: getChar is not valid on JpegStream');
+  };
+
+  return constructor;
+})();
+
+var DecryptStream = (function decryptStream() {
+  function constructor(str, decrypt) {
+    this.str = str;
+    this.dict = str.dict;
+    this.decrypt = decrypt;
+
+    DecodeStream.call(this);
+  }
+
+  var chunkSize = 512;
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.readBlock = function decryptStreamReadBlock() {
+    var chunk = this.str.getBytes(chunkSize);
+    if (!chunk || chunk.length == 0) {
+      this.eof = true;
+      return;
+    }
+    var decrypt = this.decrypt;
+    chunk = decrypt(chunk);
+
+    var bufferLength = this.bufferLength;
+    var i, n = chunk.length;
+    var buffer = this.ensureBuffer(bufferLength + n);
+    for (i = 0; i < n; i++)
+      buffer[bufferLength++] = chunk[i];
+    this.bufferLength = bufferLength;
+  };
+
+  return constructor;
+})();
+
+var Ascii85Stream = (function ascii85Stream() {
+  function constructor(str) {
+    this.str = str;
+    this.dict = str.dict;
+    this.input = new Uint8Array(5);
+
+    DecodeStream.call(this);
+  }
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.readBlock = function ascii85StreamReadBlock() {
+    var tildaCode = '~'.charCodeAt(0);
+    var zCode = 'z'.charCodeAt(0);
+    var str = this.str;
+
+    var c = str.getByte();
+    while (Lexer.isSpace(String.fromCharCode(c)))
+      c = str.getByte();
+
+    if (!c || c === tildaCode) {
+      this.eof = true;
+      return;
+    }
+
+    var bufferLength = this.bufferLength, buffer;
+
+    // special code for z
+    if (c == zCode) {
+      buffer = this.ensureBuffer(bufferLength + 4);
+      for (var i = 0; i < 4; ++i)
+        buffer[bufferLength + i] = 0;
+      this.bufferLength += 4;
+    } else {
+      var input = this.input;
+      input[0] = c;
+      for (var i = 1; i < 5; ++i) {
+        c = str.getByte();
+        while (Lexer.isSpace(String.fromCharCode(c)))
+          c = str.getByte();
+
+        input[i] = c;
+
+        if (!c || c == tildaCode)
+          break;
+      }
+      buffer = this.ensureBuffer(bufferLength + i - 1);
+      this.bufferLength += i - 1;
+
+      // partial ending;
+      if (i < 5) {
+        for (; i < 5; ++i)
+          input[i] = 0x21 + 84;
+        this.eof = true;
+      }
+      var t = 0;
+      for (var i = 0; i < 5; ++i)
+        t = t * 85 + (input[i] - 0x21);
+
+      for (var i = 3; i >= 0; --i) {
+        buffer[bufferLength + i] = t & 0xFF;
+        t >>= 8;
+      }
+    }
+  };
+
+  return constructor;
+})();
+
+var AsciiHexStream = (function asciiHexStream() {
+  function constructor(str) {
+    this.str = str;
+    this.dict = str.dict;
+
+    DecodeStream.call(this);
+  }
+
+  var hexvalueMap = {
+      9: -1, // \t
+      32: -1, // space
+      48: 0,
+      49: 1,
+      50: 2,
+      51: 3,
+      52: 4,
+      53: 5,
+      54: 6,
+      55: 7,
+      56: 8,
+      57: 9,
+      65: 10,
+      66: 11,
+      67: 12,
+      68: 13,
+      69: 14,
+      70: 15,
+      97: 10,
+      98: 11,
+      99: 12,
+      100: 13,
+      101: 14,
+      102: 15
+  };
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.readBlock = function asciiHexStreamReadBlock() {
+    var gtCode = '>'.charCodeAt(0), bytes = this.str.getBytes(), c, n,
+        decodeLength, buffer, bufferLength, i, length;
+
+    decodeLength = (bytes.length + 1) >> 1;
+    buffer = this.ensureBuffer(this.bufferLength + decodeLength);
+    bufferLength = this.bufferLength;
+
+    for (i = 0, length = bytes.length; i < length; i++) {
+      c = hexvalueMap[bytes[i]];
+      while (c == -1 && (i + 1) < length) {
+        c = hexvalueMap[bytes[++i]];
+      }
+
+      if ((i + 1) < length && (bytes[i + 1] !== gtCode)) {
+        n = hexvalueMap[bytes[++i]];
+        buffer[bufferLength++] = c * 16 + n;
+      } else {
+        // EOD marker at an odd number, behave as if a 0 followed the last
+        // digit.
+        if (bytes[i] !== gtCode) {
+          buffer[bufferLength++] = c * 16;
+        }
+      }
+    }
+
+    this.bufferLength = bufferLength;
+    this.eof = true;
+  };
+
+  return constructor;
+})();
+
+var CCITTFaxStream = (function ccittFaxStream() {
+
+  var ccittEOL = -2;
+  var twoDimPass = 0;
+  var twoDimHoriz = 1;
+  var twoDimVert0 = 2;
+  var twoDimVertR1 = 3;
+  var twoDimVertL1 = 4;
+  var twoDimVertR2 = 5;
+  var twoDimVertL2 = 6;
+  var twoDimVertR3 = 7;
+  var twoDimVertL3 = 8;
+
+  var twoDimTable = [
+    [-1, -1], [-1, -1],                   // 000000x
+    [7, twoDimVertL3],                    // 0000010
+    [7, twoDimVertR3],                    // 0000011
+    [6, twoDimVertL2], [6, twoDimVertL2], // 000010x
+    [6, twoDimVertR2], [6, twoDimVertR2], // 000011x
+    [4, twoDimPass], [4, twoDimPass],     // 0001xxx
+    [4, twoDimPass], [4, twoDimPass],
+    [4, twoDimPass], [4, twoDimPass],
+    [4, twoDimPass], [4, twoDimPass],
+    [3, twoDimHoriz], [3, twoDimHoriz],   // 001xxxx
+    [3, twoDimHoriz], [3, twoDimHoriz],
+    [3, twoDimHoriz], [3, twoDimHoriz],
+    [3, twoDimHoriz], [3, twoDimHoriz],
+    [3, twoDimHoriz], [3, twoDimHoriz],
+    [3, twoDimHoriz], [3, twoDimHoriz],
+    [3, twoDimHoriz], [3, twoDimHoriz],
+    [3, twoDimHoriz], [3, twoDimHoriz],
+    [3, twoDimVertL1], [3, twoDimVertL1], // 010xxxx
+    [3, twoDimVertL1], [3, twoDimVertL1],
+    [3, twoDimVertL1], [3, twoDimVertL1],
+    [3, twoDimVertL1], [3, twoDimVertL1],
+    [3, twoDimVertL1], [3, twoDimVertL1],
+    [3, twoDimVertL1], [3, twoDimVertL1],
+    [3, twoDimVertL1], [3, twoDimVertL1],
+    [3, twoDimVertL1], [3, twoDimVertL1],
+    [3, twoDimVertR1], [3, twoDimVertR1], // 011xxxx
+    [3, twoDimVertR1], [3, twoDimVertR1],
+    [3, twoDimVertR1], [3, twoDimVertR1],
+    [3, twoDimVertR1], [3, twoDimVertR1],
+    [3, twoDimVertR1], [3, twoDimVertR1],
+    [3, twoDimVertR1], [3, twoDimVertR1],
+    [3, twoDimVertR1], [3, twoDimVertR1],
+    [3, twoDimVertR1], [3, twoDimVertR1],
+    [1, twoDimVert0], [1, twoDimVert0],   // 1xxxxxx
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0],
+    [1, twoDimVert0], [1, twoDimVert0]
+  ];
+
+  var whiteTable1 = [
+    [-1, -1],                               // 00000
+    [12, ccittEOL],                         // 00001
+    [-1, -1], [-1, -1],                     // 0001x
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 001xx
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 010xx
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 011xx
+    [11, 1792], [11, 1792],                 // 1000x
+    [12, 1984],                             // 10010
+    [12, 2048],                             // 10011
+    [12, 2112],                             // 10100
+    [12, 2176],                             // 10101
+    [12, 2240],                             // 10110
+    [12, 2304],                             // 10111
+    [11, 1856], [11, 1856],                 // 1100x
+    [11, 1920], [11, 1920],                 // 1101x
+    [12, 2368],                             // 11100
+    [12, 2432],                             // 11101
+    [12, 2496],                             // 11110
+    [12, 2560]                              // 11111
+  ];
+
+  var whiteTable2 = [
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1],     // 0000000xx
+    [8, 29], [8, 29],                           // 00000010x
+    [8, 30], [8, 30],                           // 00000011x
+    [8, 45], [8, 45],                           // 00000100x
+    [8, 46], [8, 46],                           // 00000101x
+    [7, 22], [7, 22], [7, 22], [7, 22],         // 0000011xx
+    [7, 23], [7, 23], [7, 23], [7, 23],         // 0000100xx
+    [8, 47], [8, 47],                           // 00001010x
+    [8, 48], [8, 48],                           // 00001011x
+    [6, 13], [6, 13], [6, 13], [6, 13],         // 000011xxx
+    [6, 13], [6, 13], [6, 13], [6, 13],
+    [7, 20], [7, 20], [7, 20], [7, 20],         // 0001000xx
+    [8, 33], [8, 33],                           // 00010010x
+    [8, 34], [8, 34],                           // 00010011x
+    [8, 35], [8, 35],                           // 00010100x
+    [8, 36], [8, 36],                           // 00010101x
+    [8, 37], [8, 37],                           // 00010110x
+    [8, 38], [8, 38],                           // 00010111x
+    [7, 19], [7, 19], [7, 19], [7, 19],         // 0001100xx
+    [8, 31], [8, 31],                           // 00011010x
+    [8, 32], [8, 32],                           // 00011011x
+    [6, 1], [6, 1], [6, 1], [6, 1],             // 000111xxx
+    [6, 1], [6, 1], [6, 1], [6, 1],
+    [6, 12], [6, 12], [6, 12], [6, 12],         // 001000xxx
+    [6, 12], [6, 12], [6, 12], [6, 12],
+    [8, 53], [8, 53],                           // 00100100x
+    [8, 54], [8, 54],                           // 00100101x
+    [7, 26], [7, 26], [7, 26], [7, 26],         // 0010011xx
+    [8, 39], [8, 39],                           // 00101000x
+    [8, 40], [8, 40],                           // 00101001x
+    [8, 41], [8, 41],                           // 00101010x
+    [8, 42], [8, 42],                           // 00101011x
+    [8, 43], [8, 43],                           // 00101100x
+    [8, 44], [8, 44],                           // 00101101x
+    [7, 21], [7, 21], [7, 21], [7, 21],         // 0010111xx
+    [7, 28], [7, 28], [7, 28], [7, 28],         // 0011000xx
+    [8, 61], [8, 61],                           // 00110010x
+    [8, 62], [8, 62],                           // 00110011x
+    [8, 63], [8, 63],                           // 00110100x
+    [8, 0], [8, 0],                             // 00110101x
+    [8, 320], [8, 320],                         // 00110110x
+    [8, 384], [8, 384],                         // 00110111x
+    [5, 10], [5, 10], [5, 10], [5, 10],         // 00111xxxx
+    [5, 10], [5, 10], [5, 10], [5, 10],
+    [5, 10], [5, 10], [5, 10], [5, 10],
+    [5, 10], [5, 10], [5, 10], [5, 10],
+    [5, 11], [5, 11], [5, 11], [5, 11],         // 01000xxxx
+    [5, 11], [5, 11], [5, 11], [5, 11],
+    [5, 11], [5, 11], [5, 11], [5, 11],
+    [5, 11], [5, 11], [5, 11], [5, 11],
+    [7, 27], [7, 27], [7, 27], [7, 27],         // 0100100xx
+    [8, 59], [8, 59],                           // 01001010x
+    [8, 60], [8, 60],                           // 01001011x
+    [9, 1472],                                  // 010011000
+    [9, 1536],                                  // 010011001
+    [9, 1600],                                  // 010011010
+    [9, 1728],                                  // 010011011
+    [7, 18], [7, 18], [7, 18], [7, 18],         // 0100111xx
+    [7, 24], [7, 24], [7, 24], [7, 24],         // 0101000xx
+    [8, 49], [8, 49],                           // 01010010x
+    [8, 50], [8, 50],                           // 01010011x
+    [8, 51], [8, 51],                           // 01010100x
+    [8, 52], [8, 52],                           // 01010101x
+    [7, 25], [7, 25], [7, 25], [7, 25],         // 0101011xx
+    [8, 55], [8, 55],                           // 01011000x
+    [8, 56], [8, 56],                           // 01011001x
+    [8, 57], [8, 57],                           // 01011010x
+    [8, 58], [8, 58],                           // 01011011x
+    [6, 192], [6, 192], [6, 192], [6, 192],     // 010111xxx
+    [6, 192], [6, 192], [6, 192], [6, 192],
+    [6, 1664], [6, 1664], [6, 1664], [6, 1664], // 011000xxx
+    [6, 1664], [6, 1664], [6, 1664], [6, 1664],
+    [8, 448], [8, 448],                         // 01100100x
+    [8, 512], [8, 512],                         // 01100101x
+    [9, 704],                                   // 011001100
+    [9, 768],                                   // 011001101
+    [8, 640], [8, 640],                         // 01100111x
+    [8, 576], [8, 576],                         // 01101000x
+    [9, 832],                                   // 011010010
+    [9, 896],                                   // 011010011
+    [9, 960],                                   // 011010100
+    [9, 1024],                                  // 011010101
+    [9, 1088],                                  // 011010110
+    [9, 1152],                                  // 011010111
+    [9, 1216],                                  // 011011000
+    [9, 1280],                                  // 011011001
+    [9, 1344],                                  // 011011010
+    [9, 1408],                                  // 011011011
+    [7, 256], [7, 256], [7, 256], [7, 256],     // 0110111xx
+    [4, 2], [4, 2], [4, 2], [4, 2],             // 0111xxxxx
+    [4, 2], [4, 2], [4, 2], [4, 2],
+    [4, 2], [4, 2], [4, 2], [4, 2],
+    [4, 2], [4, 2], [4, 2], [4, 2],
+    [4, 2], [4, 2], [4, 2], [4, 2],
+    [4, 2], [4, 2], [4, 2], [4, 2],
+    [4, 2], [4, 2], [4, 2], [4, 2],
+    [4, 2], [4, 2], [4, 2], [4, 2],
+    [4, 3], [4, 3], [4, 3], [4, 3],             // 1000xxxxx
+    [4, 3], [4, 3], [4, 3], [4, 3],
+    [4, 3], [4, 3], [4, 3], [4, 3],
+    [4, 3], [4, 3], [4, 3], [4, 3],
+    [4, 3], [4, 3], [4, 3], [4, 3],
+    [4, 3], [4, 3], [4, 3], [4, 3],
+    [4, 3], [4, 3], [4, 3], [4, 3],
+    [4, 3], [4, 3], [4, 3], [4, 3],
+    [5, 128], [5, 128], [5, 128], [5, 128],     // 10010xxxx
+    [5, 128], [5, 128], [5, 128], [5, 128],
+    [5, 128], [5, 128], [5, 128], [5, 128],
+    [5, 128], [5, 128], [5, 128], [5, 128],
+    [5, 8], [5, 8], [5, 8], [5, 8],             // 10011xxxx
+    [5, 8], [5, 8], [5, 8], [5, 8],
+    [5, 8], [5, 8], [5, 8], [5, 8],
+    [5, 8], [5, 8], [5, 8], [5, 8],
+    [5, 9], [5, 9], [5, 9], [5, 9],             // 10100xxxx
+    [5, 9], [5, 9], [5, 9], [5, 9],
+    [5, 9], [5, 9], [5, 9], [5, 9],
+    [5, 9], [5, 9], [5, 9], [5, 9],
+    [6, 16], [6, 16], [6, 16], [6, 16],         // 101010xxx
+    [6, 16], [6, 16], [6, 16], [6, 16],
+    [6, 17], [6, 17], [6, 17], [6, 17],         // 101011xxx
+    [6, 17], [6, 17], [6, 17], [6, 17],
+    [4, 4], [4, 4], [4, 4], [4, 4],             // 1011xxxxx
+    [4, 4], [4, 4], [4, 4], [4, 4],
+    [4, 4], [4, 4], [4, 4], [4, 4],
+    [4, 4], [4, 4], [4, 4], [4, 4],
+    [4, 4], [4, 4], [4, 4], [4, 4],
+    [4, 4], [4, 4], [4, 4], [4, 4],
+    [4, 4], [4, 4], [4, 4], [4, 4],
+    [4, 4], [4, 4], [4, 4], [4, 4],
+    [4, 5], [4, 5], [4, 5], [4, 5],             // 1100xxxxx
+    [4, 5], [4, 5], [4, 5], [4, 5],
+    [4, 5], [4, 5], [4, 5], [4, 5],
+    [4, 5], [4, 5], [4, 5], [4, 5],
+    [4, 5], [4, 5], [4, 5], [4, 5],
+    [4, 5], [4, 5], [4, 5], [4, 5],
+    [4, 5], [4, 5], [4, 5], [4, 5],
+    [4, 5], [4, 5], [4, 5], [4, 5],
+    [6, 14], [6, 14], [6, 14], [6, 14],         // 110100xxx
+    [6, 14], [6, 14], [6, 14], [6, 14],
+    [6, 15], [6, 15], [6, 15], [6, 15],         // 110101xxx
+    [6, 15], [6, 15], [6, 15], [6, 15],
+    [5, 64], [5, 64], [5, 64], [5, 64],         // 11011xxxx
+    [5, 64], [5, 64], [5, 64], [5, 64],
+    [5, 64], [5, 64], [5, 64], [5, 64],
+    [5, 64], [5, 64], [5, 64], [5, 64],
+    [4, 6], [4, 6], [4, 6], [4, 6],             // 1110xxxxx
+    [4, 6], [4, 6], [4, 6], [4, 6],
+    [4, 6], [4, 6], [4, 6], [4, 6],
+    [4, 6], [4, 6], [4, 6], [4, 6],
+    [4, 6], [4, 6], [4, 6], [4, 6],
+    [4, 6], [4, 6], [4, 6], [4, 6],
+    [4, 6], [4, 6], [4, 6], [4, 6],
+    [4, 6], [4, 6], [4, 6], [4, 6],
+    [4, 7], [4, 7], [4, 7], [4, 7],             // 1111xxxxx
+    [4, 7], [4, 7], [4, 7], [4, 7],
+    [4, 7], [4, 7], [4, 7], [4, 7],
+    [4, 7], [4, 7], [4, 7], [4, 7],
+    [4, 7], [4, 7], [4, 7], [4, 7],
+    [4, 7], [4, 7], [4, 7], [4, 7],
+    [4, 7], [4, 7], [4, 7], [4, 7],
+    [4, 7], [4, 7], [4, 7], [4, 7]
+  ];
+
+  var blackTable1 = [
+    [-1, -1], [-1, -1],                             // 000000000000x
+    [12, ccittEOL], [12, ccittEOL],                 // 000000000001x
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000001xx
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000010xx
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000011xx
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000100xx
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000101xx
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000110xx
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000111xx
+    [11, 1792], [11, 1792], [11, 1792], [11, 1792], // 00000001000xx
+    [12, 1984], [12, 1984],                         // 000000010010x
+    [12, 2048], [12, 2048],                         // 000000010011x
+    [12, 2112], [12, 2112],                         // 000000010100x
+    [12, 2176], [12, 2176],                         // 000000010101x
+    [12, 2240], [12, 2240],                         // 000000010110x
+    [12, 2304], [12, 2304],                         // 000000010111x
+    [11, 1856], [11, 1856], [11, 1856], [11, 1856], // 00000001100xx
+    [11, 1920], [11, 1920], [11, 1920], [11, 1920], // 00000001101xx
+    [12, 2368], [12, 2368],                         // 000000011100x
+    [12, 2432], [12, 2432],                         // 000000011101x
+    [12, 2496], [12, 2496],                         // 000000011110x
+    [12, 2560], [12, 2560],                         // 000000011111x
+    [10, 18], [10, 18], [10, 18], [10, 18],         // 0000001000xxx
+    [10, 18], [10, 18], [10, 18], [10, 18],
+    [12, 52], [12, 52],                             // 000000100100x
+    [13, 640],                                      // 0000001001010
+    [13, 704],                                      // 0000001001011
+    [13, 768],                                      // 0000001001100
+    [13, 832],                                      // 0000001001101
+    [12, 55], [12, 55],                             // 000000100111x
+    [12, 56], [12, 56],                             // 000000101000x
+    [13, 1280],                                     // 0000001010010
+    [13, 1344],                                     // 0000001010011
+    [13, 1408],                                     // 0000001010100
+    [13, 1472],                                     // 0000001010101
+    [12, 59], [12, 59],                             // 000000101011x
+    [12, 60], [12, 60],                             // 000000101100x
+    [13, 1536],                                     // 0000001011010
+    [13, 1600],                                     // 0000001011011
+    [11, 24], [11, 24], [11, 24], [11, 24],         // 00000010111xx
+    [11, 25], [11, 25], [11, 25], [11, 25],         // 00000011000xx
+    [13, 1664],                                     // 0000001100100
+    [13, 1728],                                     // 0000001100101
+    [12, 320], [12, 320],                           // 000000110011x
+    [12, 384], [12, 384],                           // 000000110100x
+    [12, 448], [12, 448],                           // 000000110101x
+    [13, 512],                                      // 0000001101100
+    [13, 576],                                      // 0000001101101
+    [12, 53], [12, 53],                             // 000000110111x
+    [12, 54], [12, 54],                             // 000000111000x
+    [13, 896],                                      // 0000001110010
+    [13, 960],                                      // 0000001110011
+    [13, 1024],                                     // 0000001110100
+    [13, 1088],                                     // 0000001110101
+    [13, 1152],                                     // 0000001110110
+    [13, 1216],                                     // 0000001110111
+    [10, 64], [10, 64], [10, 64], [10, 64],         // 0000001111xxx
+    [10, 64], [10, 64], [10, 64], [10, 64]
+  ];
+
+  var blackTable2 = [
+    [8, 13], [8, 13], [8, 13], [8, 13],     // 00000100xxxx
+    [8, 13], [8, 13], [8, 13], [8, 13],
+    [8, 13], [8, 13], [8, 13], [8, 13],
+    [8, 13], [8, 13], [8, 13], [8, 13],
+    [11, 23], [11, 23],                     // 00000101000x
+    [12, 50],                               // 000001010010
+    [12, 51],                               // 000001010011
+    [12, 44],                               // 000001010100
+    [12, 45],                               // 000001010101
+    [12, 46],                               // 000001010110
+    [12, 47],                               // 000001010111
+    [12, 57],                               // 000001011000
+    [12, 58],                               // 000001011001
+    [12, 61],                               // 000001011010
+    [12, 256],                              // 000001011011
+    [10, 16], [10, 16], [10, 16], [10, 16], // 0000010111xx
+    [10, 17], [10, 17], [10, 17], [10, 17], // 0000011000xx
+    [12, 48],                               // 000001100100
+    [12, 49],                               // 000001100101
+    [12, 62],                               // 000001100110
+    [12, 63],                               // 000001100111
+    [12, 30],                               // 000001101000
+    [12, 31],                               // 000001101001
+    [12, 32],                               // 000001101010
+    [12, 33],                               // 000001101011
+    [12, 40],                               // 000001101100
+    [12, 41],                               // 000001101101
+    [11, 22], [11, 22],                     // 00000110111x
+    [8, 14], [8, 14], [8, 14], [8, 14],     // 00000111xxxx
+    [8, 14], [8, 14], [8, 14], [8, 14],
+    [8, 14], [8, 14], [8, 14], [8, 14],
+    [8, 14], [8, 14], [8, 14], [8, 14],
+    [7, 10], [7, 10], [7, 10], [7, 10],     // 0000100xxxxx
+    [7, 10], [7, 10], [7, 10], [7, 10],
+    [7, 10], [7, 10], [7, 10], [7, 10],
+    [7, 10], [7, 10], [7, 10], [7, 10],
+    [7, 10], [7, 10], [7, 10], [7, 10],
+    [7, 10], [7, 10], [7, 10], [7, 10],
+    [7, 10], [7, 10], [7, 10], [7, 10],
+    [7, 10], [7, 10], [7, 10], [7, 10],
+    [7, 11], [7, 11], [7, 11], [7, 11],     // 0000101xxxxx
+    [7, 11], [7, 11], [7, 11], [7, 11],
+    [7, 11], [7, 11], [7, 11], [7, 11],
+    [7, 11], [7, 11], [7, 11], [7, 11],
+    [7, 11], [7, 11], [7, 11], [7, 11],
+    [7, 11], [7, 11], [7, 11], [7, 11],
+    [7, 11], [7, 11], [7, 11], [7, 11],
+    [7, 11], [7, 11], [7, 11], [7, 11],
+    [9, 15], [9, 15], [9, 15], [9, 15],     // 000011000xxx
+    [9, 15], [9, 15], [9, 15], [9, 15],
+    [12, 128],                              // 000011001000
+    [12, 192],                              // 000011001001
+    [12, 26],                               // 000011001010
+    [12, 27],                               // 000011001011
+    [12, 28],                               // 000011001100
+    [12, 29],                               // 000011001101
+    [11, 19], [11, 19],                     // 00001100111x
+    [11, 20], [11, 20],                     // 00001101000x
+    [12, 34],                               // 000011010010
+    [12, 35],                               // 000011010011
+    [12, 36],                               // 000011010100
+    [12, 37],                               // 000011010101
+    [12, 38],                               // 000011010110
+    [12, 39],                               // 000011010111
+    [11, 21], [11, 21],                     // 00001101100x
+    [12, 42],                               // 000011011010
+    [12, 43],                               // 000011011011
+    [10, 0], [10, 0], [10, 0], [10, 0],     // 0000110111xx
+    [7, 12], [7, 12], [7, 12], [7, 12],     // 0000111xxxxx
+    [7, 12], [7, 12], [7, 12], [7, 12],
+    [7, 12], [7, 12], [7, 12], [7, 12],
+    [7, 12], [7, 12], [7, 12], [7, 12],
+    [7, 12], [7, 12], [7, 12], [7, 12],
+    [7, 12], [7, 12], [7, 12], [7, 12],
+    [7, 12], [7, 12], [7, 12], [7, 12],
+    [7, 12], [7, 12], [7, 12], [7, 12]
+  ];
+
+  var blackTable3 = [
+    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 0000xx
+    [6, 9],                                 // 000100
+    [6, 8],                                 // 000101
+    [5, 7], [5, 7],                         // 00011x
+    [4, 6], [4, 6], [4, 6], [4, 6],         // 0010xx
+    [4, 5], [4, 5], [4, 5], [4, 5],         // 0011xx
+    [3, 1], [3, 1], [3, 1], [3, 1],         // 010xxx
+    [3, 1], [3, 1], [3, 1], [3, 1],
+    [3, 4], [3, 4], [3, 4], [3, 4],         // 011xxx
+    [3, 4], [3, 4], [3, 4], [3, 4],
+    [2, 3], [2, 3], [2, 3], [2, 3],         // 10xxxx
+    [2, 3], [2, 3], [2, 3], [2, 3],
+    [2, 3], [2, 3], [2, 3], [2, 3],
+    [2, 3], [2, 3], [2, 3], [2, 3],
+    [2, 2], [2, 2], [2, 2], [2, 2],         // 11xxxx
+    [2, 2], [2, 2], [2, 2], [2, 2],
+    [2, 2], [2, 2], [2, 2], [2, 2],
+    [2, 2], [2, 2], [2, 2], [2, 2]
+  ];
+
+  function constructor(str, params) {
+    this.str = str;
+    this.dict = str.dict;
+
+    params = params || new Dict();
+
+    this.encoding = params.get('K') || 0;
+    this.eoline = params.get('EndOfLine') || false;
+    this.byteAlign = params.get('EncodedByteAlign') || false;
+    this.columns = params.get('Columns') || 1728;
+    this.rows = params.get('Rows') || 0;
+    var eoblock = params.get('EndOfBlock');
+    if (eoblock == null)
+      eoblock = true;
+    this.eoblock = eoblock;
+    this.black = params.get('BlackIs1') || false;
+
+    this.codingLine = new Uint32Array(this.columns + 1);
+    this.refLine = new Uint32Array(this.columns + 2);
+
+    this.codingLine[0] = this.columns;
+    this.codingPos = 0;
+
+    this.row = 0;
+    this.nextLine2D = this.encoding < 0;
+    this.inputBits = 0;
+    this.inputBuf = 0;
+    this.outputBits = 0;
+    this.buf = EOF;
+
+    var code1;
+    while ((code1 = this.lookBits(12)) == 0) {
+      this.eatBits(1);
+    }
+    if (code1 == 1) {
+      this.eatBits(12);
+    }
+    if (this.encoding > 0) {
+      this.nextLine2D = !this.lookBits(1);
+      this.eatBits(1);
+    }
+
+    DecodeStream.call(this);
+  }
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.readBlock = function ccittFaxStreamReadBlock() {
+    while (!this.eof) {
+      var c = this.lookChar();
+      this.buf = EOF;
+      this.ensureBuffer(this.bufferLength + 1);
+      this.buffer[this.bufferLength++] = c;
+    }
+  };
+
+  constructor.prototype.addPixels =
+    function ccittFaxStreamAddPixels(a1, blackPixels) {
+    var codingLine = this.codingLine;
+    var codingPos = this.codingPos;
+
+    if (a1 > codingLine[codingPos]) {
+      if (a1 > this.columns) {
+        warn('row is wrong length');
+        this.err = true;
+        a1 = this.columns;
+      }
+      if ((codingPos & 1) ^ blackPixels) {
+        ++codingPos;
+      }
+
+      codingLine[codingPos] = a1;
+    }
+    this.codingPos = codingPos;
+  };
+
+  constructor.prototype.addPixelsNeg =
+    function ccittFaxStreamAddPixelsNeg(a1, blackPixels) {
+    var codingLine = this.codingLine;
+    var codingPos = this.codingPos;
+
+    if (a1 > codingLine[codingPos]) {
+      if (a1 > this.columns) {
+        warn('row is wrong length');
+        this.err = true;
+        a1 = this.columns;
+      }
+      if ((codingPos & 1) ^ blackPixels)
+        ++codingPos;
+
+      codingLine[codingPos] = a1;
+    } else if (a1 < codingLine[codingPos]) {
+      if (a1 < 0) {
+        warn('invalid code');
+        this.err = true;
+        a1 = 0;
+      }
+      while (codingPos > 0 && a1 < codingLine[codingPos - 1])
+        --codingPos;
+      codingLine[codingPos] = a1;
+    }
+
+    this.codingPos = codingPos;
+  };
+
+  constructor.prototype.lookChar = function ccittFaxStreamLookChar() {
+    if (this.buf != EOF)
+      return this.buf;
+
+    var refLine = this.refLine;
+    var codingLine = this.codingLine;
+    var columns = this.columns;
+
+    var refPos, blackPixels, bits;
+
+    if (this.outputBits == 0) {
+      if (this.eof)
+        return null;
+
+      this.err = false;
+
+      var code1, code2, code3;
+      if (this.nextLine2D) {
+        for (var i = 0; codingLine[i] < columns; ++i)
+          refLine[i] = codingLine[i];
+
+        refLine[i++] = columns;
+        refLine[i] = columns;
+        codingLine[0] = 0;
+        this.codingPos = 0;
+        refPos = 0;
+        blackPixels = 0;
+
+        while (codingLine[this.codingPos] < columns) {
+          code1 = this.getTwoDimCode();
+          switch (code1) {
+            case twoDimPass:
+              this.addPixels(refLine[refPos + 1], blackPixels);
+              if (refLine[refPos + 1] < columns)
+                refPos += 2;
+              break;
+            case twoDimHoriz:
+              code1 = code2 = 0;
+              if (blackPixels) {
+                do {
+                  code1 += (code3 = this.getBlackCode());
+                } while (code3 >= 64);
+                do {
+                  code2 += (code3 = this.getWhiteCode());
+                } while (code3 >= 64);
+              } else {
+                do {
+                  code1 += (code3 = this.getWhiteCode());
+                } while (code3 >= 64);
+                do {
+                  code2 += (code3 = this.getBlackCode());
+                } while (code3 >= 64);
+              }
+              this.addPixels(codingLine[this.codingPos] +
+                             code1, blackPixels);
+              if (codingLine[this.codingPos] < columns) {
+                this.addPixels(codingLine[this.codingPos] + code2,
+                               blackPixels ^ 1);
+              }
+              while (refLine[refPos] <= codingLine[this.codingPos] &&
+                     refLine[refPos] < columns) {
+                refPos += 2;
+              }
+              break;
+            case twoDimVertR3:
+              this.addPixels(refLine[refPos] + 3, blackPixels);
+              blackPixels ^= 1;
+              if (codingLine[this.codingPos] < columns) {
+                ++refPos;
+                while (refLine[refPos] <= codingLine[this.codingPos] &&
+                       refLine[refPos] < columns)
+                  refPos += 2;
+              }
+              break;
+            case twoDimVertR2:
+              this.addPixels(refLine[refPos] + 2, blackPixels);
+              blackPixels ^= 1;
+              if (codingLine[this.codingPos] < columns) {
+                ++refPos;
+                while (refLine[refPos] <= codingLine[this.codingPos] &&
+                       refLine[refPos] < columns) {
+                  refPos += 2;
+                }
+              }
+              break;
+            case twoDimVertR1:
+              this.addPixels(refLine[refPos] + 1, blackPixels);
+              blackPixels ^= 1;
+              if (codingLine[this.codingPos] < columns) {
+                ++refPos;
+                while (refLine[refPos] <= codingLine[this.codingPos] &&
+                       refLine[refPos] < columns)
+                  refPos += 2;
+              }
+              break;
+            case twoDimVert0:
+              this.addPixels(refLine[refPos], blackPixels);
+              blackPixels ^= 1;
+              if (codingLine[this.codingPos] < columns) {
+                ++refPos;
+                while (refLine[refPos] <= codingLine[this.codingPos] &&
+                       refLine[refPos] < columns)
+                  refPos += 2;
+              }
+              break;
+            case twoDimVertL3:
+              this.addPixelsNeg(refLine[refPos] - 3, blackPixels);
+              blackPixels ^= 1;
+              if (codingLine[this.codingPos] < columns) {
+                if (refPos > 0)
+                  --refPos;
+                else
+                  ++refPos;
+                while (refLine[refPos] <= codingLine[this.codingPos] &&
+                       refLine[refPos] < columns)
+                  refPos += 2;
+              }
+              break;
+            case twoDimVertL2:
+              this.addPixelsNeg(refLine[refPos] - 2, blackPixels);
+              blackPixels ^= 1;
+              if (codingLine[this.codingPos] < columns) {
+                if (refPos > 0)
+                  --refPos;
+                else
+                  ++refPos;
+                while (refLine[refPos] <= codingLine[this.codingPos] &&
+                       refLine[refPos] < columns)
+                  refPos += 2;
+              }
+              break;
+            case twoDimVertL1:
+              this.addPixelsNeg(refLine[refPos] - 1, blackPixels);
+              blackPixels ^= 1;
+              if (codingLine[this.codingPos] < columns) {
+                if (refPos > 0)
+                  --refPos;
+                else
+                  ++refPos;
+
+                while (refLine[refPos] <= codingLine[this.codingPos] &&
+                       refLine[refPos] < columns)
+                  refPos += 2;
+              }
+              break;
+            case EOF:
+              this.addPixels(columns, 0);
+              this.eof = true;
+              break;
+            default:
+              warn('bad 2d code');
+              this.addPixels(columns, 0);
+              this.err = true;
+          }
+        }
+      } else {
+        codingLine[0] = 0;
+        this.codingPos = 0;
+        blackPixels = 0;
+        while (codingLine[this.codingPos] < columns) {
+          code1 = 0;
+          if (blackPixels) {
+            do {
+              code1 += (code3 = this.getBlackCode());
+            } while (code3 >= 64);
+          } else {
+            do {
+              code1 += (code3 = this.getWhiteCode());
+            } while (code3 >= 64);
+          }
+          this.addPixels(codingLine[this.codingPos] + code1, blackPixels);
+          blackPixels ^= 1;
+        }
+      }
+
+      if (this.byteAlign)
+        this.inputBits &= ~7;
+
+      var gotEOL = false;
+
+      if (!this.eoblock && this.row == this.rows - 1) {
+        this.eof = true;
+      } else {
+        code1 = this.lookBits(12);
+        while (code1 == 0) {
+          this.eatBits(1);
+          code1 = this.lookBits(12);
+        }
+        if (code1 == 1) {
+          this.eatBits(12);
+          gotEOL = true;
+        } else if (code1 == EOF) {
+          this.eof = true;
+        }
+      }
+
+      if (!this.eof && this.encoding > 0) {
+        this.nextLine2D = !this.lookBits(1);
+        this.eatBits(1);
+      }
+
+      if (this.eoblock && gotEOL) {
+        code1 = this.lookBits(12);
+        if (code1 == 1) {
+          this.eatBits(12);
+          if (this.encoding > 0) {
+            this.lookBits(1);
+            this.eatBits(1);
+          }
+          if (this.encoding >= 0) {
+            for (var i = 0; i < 4; ++i) {
+              code1 = this.lookBits(12);
+              if (code1 != 1)
+                warn('bad rtc code: ' + code1);
+              this.eatBits(12);
+              if (this.encoding > 0) {
+                this.lookBits(1);
+                this.eatBits(1);
+              }
+            }
+          }
+          this.eof = true;
+        }
+      } else if (this.err && this.eoline) {
+        while (true) {
+          code1 = this.lookBits(13);
+          if (code1 == EOF) {
+            this.eof = true;
+            return null;
+          }
+          if ((code1 >> 1) == 1) {
+            break;
+          }
+          this.eatBits(1);
+        }
+        this.eatBits(12);
+        if (this.encoding > 0) {
+          this.eatBits(1);
+          this.nextLine2D = !(code1 & 1);
+        }
+      }
+
+      if (codingLine[0] > 0)
+        this.outputBits = codingLine[this.codingPos = 0];
+      else
+        this.outputBits = codingLine[this.codingPos = 1];
+      this.row++;
+    }
+
+    if (this.outputBits >= 8) {
+      this.buf = (this.codingPos & 1) ? 0 : 0xFF;
+      this.outputBits -= 8;
+      if (this.outputBits == 0 && codingLine[this.codingPos] < columns) {
+        this.codingPos++;
+        this.outputBits = (codingLine[this.codingPos] -
+                           codingLine[this.codingPos - 1]);
+      }
+    } else {
+      var bits = 8;
+      this.buf = 0;
+      do {
+        if (this.outputBits > bits) {
+          this.buf <<= bits;
+          if (!(this.codingPos & 1)) {
+            this.buf |= 0xFF >> (8 - bits);
+          }
+          this.outputBits -= bits;
+          bits = 0;
+        } else {
+          this.buf <<= this.outputBits;
+          if (!(this.codingPos & 1)) {
+            this.buf |= 0xFF >> (8 - this.outputBits);
+          }
+          bits -= this.outputBits;
+          this.outputBits = 0;
+          if (codingLine[this.codingPos] < columns) {
+            this.codingPos++;
+            this.outputBits = (codingLine[this.codingPos] -
+                               codingLine[this.codingPos - 1]);
+          } else if (bits > 0) {
+            this.buf <<= bits;
+            bits = 0;
+          }
+        }
+      } while (bits);
+    }
+    if (this.black) {
+      this.buf ^= 0xFF;
+    }
+    return this.buf;
+  };
+
+  // This functions returns the code found from the table.
+  // The start and end parameters set the boundaries for searching the table.
+  // The limit parameter is optional. Function returns an array with three
+  // values. The first array element indicates whether a valid code is being
+  // returned. The second array element is the actual code. The third array
+  // element indicates whether EOF was reached.
+  var findTableCode = function ccittFaxStreamFindTableCode(start, end, table,
+                                                           limit) {
+    var limitValue = limit || 0;
+
+    for (var i = start; i <= end; ++i) {
+      var code = this.lookBits(i);
+      if (code == EOF)
+        return [true, 1, false];
+      if (i < end)
+        code <<= end - i;
+      if (!limitValue || code >= limitValue) {
+        var p = table[code - limitValue];
+        if (p[0] == i) {
+          this.eatBits(i);
+          return [true, p[1], true];
+        }
+      }
+    }
+    return [false, 0, false];
+  };
+
+  constructor.prototype.getTwoDimCode = function ccittFaxStreamGetTwoDimCode() {
+    var code = 0;
+    var p;
+    if (this.eoblock) {
+      code = this.lookBits(7);
+      p = twoDimTable[code];
+      if (p[0] > 0) {
+        this.eatBits(p[0]);
+        return p[1];
+      }
+    } else {
+      var result = findTableCode(1, 7, twoDimTable);
+      if (result[0] && result[2])
+        return result[1];
+    }
+    warn('Bad two dim code');
+    return EOF;
+  };
+
+  constructor.prototype.getWhiteCode = function ccittFaxStreamGetWhiteCode() {
+    var code = 0;
+    var p;
+    var n;
+    if (this.eoblock) {
+      code = this.lookBits(12);
+      if (code == EOF)
+        return 1;
+
+      if ((code >> 5) == 0)
+        p = whiteTable1[code];
+      else
+        p = whiteTable2[code >> 3];
+
+      if (p[0] > 0) {
+        this.eatBits(p[0]);
+        return p[1];
+      }
+    } else {
+      var result = findTableCode(1, 9, whiteTable2);
+      if (result[0])
+        return result[1];
+
+      result = findTableCode(11, 12, whiteTable1);
+      if (result[0])
+        return result[1];
+    }
+    warn('bad white code');
+    this.eatBits(1);
+    return 1;
+  };
+
+  constructor.prototype.getBlackCode = function ccittFaxStreamGetBlackCode() {
+    var code, p;
+    if (this.eoblock) {
+      code = this.lookBits(13);
+      if (code == EOF)
+        return 1;
+      if ((code >> 7) == 0)
+        p = blackTable1[code];
+      else if ((code >> 9) == 0 && (code >> 7) != 0)
+        p = blackTable2[(code >> 1) - 64];
+      else
+        p = blackTable3[code >> 7];
+
+      if (p[0] > 0) {
+        this.eatBits(p[0]);
+        return p[1];
+      }
+    } else {
+      var result = findTableCode(2, 6, blackTable3);
+      if (result[0])
+        return result[1];
+
+      result = findTableCode(7, 12, blackTable2, 64);
+      if (result[0])
+        return result[1];
+
+      result = findTableCode(10, 13, blackTable1);
+      if (result[0])
+        return result[1];
+    }
+    warn('bad black code');
+    this.eatBits(1);
+    return 1;
+  };
+
+  constructor.prototype.lookBits = function ccittFaxStreamLookBits(n) {
+    var c;
+    while (this.inputBits < n) {
+      if ((c = this.str.getByte()) == null) {
+        if (this.inputBits == 0)
+          return EOF;
+        return ((this.inputBuf << (n - this.inputBits)) &
+                (0xFFFF >> (16 - n)));
+      }
+      this.inputBuf = (this.inputBuf << 8) + c;
+      this.inputBits += 8;
+    }
+    return (this.inputBuf >> (this.inputBits - n)) & (0xFFFF >> (16 - n));
+  };
+
+  constructor.prototype.eatBits = function ccittFaxStreamEatBits(n) {
+    if ((this.inputBits -= n) < 0)
+      this.inputBits = 0;
+  };
+
+  return constructor;
+})();
+
+var LZWStream = (function lzwStream() {
+  function constructor(str, earlyChange) {
+    this.str = str;
+    this.dict = str.dict;
+    this.cachedData = 0;
+    this.bitsCached = 0;
+
+    var maxLzwDictionarySize = 4096;
+    var lzwState = {
+      earlyChange: earlyChange,
+      codeLength: 9,
+      nextCode: 258,
+      dictionaryValues: new Uint8Array(maxLzwDictionarySize),
+      dictionaryLengths: new Uint16Array(maxLzwDictionarySize),
+      dictionaryPrevCodes: new Uint16Array(maxLzwDictionarySize),
+      currentSequence: new Uint8Array(maxLzwDictionarySize),
+      currentSequenceLength: 0
+    };
+    for (var i = 0; i < 256; ++i) {
+      lzwState.dictionaryValues[i] = i;
+      lzwState.dictionaryLengths[i] = 1;
+    }
+    this.lzwState = lzwState;
+
+    DecodeStream.call(this);
+  }
+
+  constructor.prototype = Object.create(DecodeStream.prototype);
+
+  constructor.prototype.readBits = function lzwStreamReadBits(n) {
+    var bitsCached = this.bitsCached;
+    var cachedData = this.cachedData;
+    while (bitsCached < n) {
+      var c = this.str.getByte();
+      if (c == null) {
+        this.eof = true;
+        return null;
+      }
+      cachedData = (cachedData << 8) | c;
+      bitsCached += 8;
+    }
+    this.bitsCached = (bitsCached -= n);
+    this.cachedData = cachedData;
+    this.lastCode = null;
+    return (cachedData >>> bitsCached) & ((1 << n) - 1);
+  };
+
+  constructor.prototype.readBlock = function lzwStreamReadBlock() {
+    var blockSize = 512;
+    var estimatedDecodedSize = blockSize * 2, decodedSizeDelta = blockSize;
+    var i, j, q;
+
+    var lzwState = this.lzwState;
+    if (!lzwState)
+      return; // eof was found
+
+    var earlyChange = lzwState.earlyChange;
+    var nextCode = lzwState.nextCode;
+    var dictionaryValues = lzwState.dictionaryValues;
+    var dictionaryLengths = lzwState.dictionaryLengths;
+    var dictionaryPrevCodes = lzwState.dictionaryPrevCodes;
+    var codeLength = lzwState.codeLength;
+    var prevCode = lzwState.prevCode;
+    var currentSequence = lzwState.currentSequence;
+    var currentSequenceLength = lzwState.currentSequenceLength;
+
+    var decodedLength = 0;
+    var currentBufferLength = this.bufferLength;
+    var buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
+
+    for (i = 0; i < blockSize; i++) {
+      var code = this.readBits(codeLength);
+      var hasPrev = currentSequenceLength > 0;
+      if (code < 256) {
+        currentSequence[0] = code;
+        currentSequenceLength = 1;
+      } else if (code >= 258) {
+        if (code < nextCode) {
+          currentSequenceLength = dictionaryLengths[code];
+          for (j = currentSequenceLength - 1, q = code; j >= 0; j--) {
+            currentSequence[j] = dictionaryValues[q];
+            q = dictionaryPrevCodes[q];
+          }
+        } else {
+          currentSequence[currentSequenceLength++] = currentSequence[0];
+        }
+      } else if (code == 256) {
+        codeLength = 9;
+        nextCode = 258;
+        currentSequenceLength = 0;
+        continue;
+      } else {
+        this.eof = true;
+        delete this.lzwState;
+        break;
+      }
+
+      if (hasPrev) {
+        dictionaryPrevCodes[nextCode] = prevCode;
+        dictionaryLengths[nextCode] = dictionaryLengths[prevCode] + 1;
+        dictionaryValues[nextCode] = currentSequence[0];
+        nextCode++;
+        codeLength = (nextCode + earlyChange) & (nextCode + earlyChange - 1) ?
+          codeLength : Math.min(Math.log(nextCode + earlyChange) /
+          0.6931471805599453 + 1, 12) | 0;
+      }
+      prevCode = code;
+
+      decodedLength += currentSequenceLength;
+      if (estimatedDecodedSize < decodedLength) {
+        do {
+          estimatedDecodedSize += decodedSizeDelta;
+        } while (estimatedDecodedSize < decodedLength);
+        buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
+      }
+      for (j = 0; j < currentSequenceLength; j++)
+        buffer[currentBufferLength++] = currentSequence[j];
+    }
+    lzwState.nextCode = nextCode;
+    lzwState.codeLength = codeLength;
+    lzwState.prevCode = prevCode;
+    lzwState.currentSequenceLength = currentSequenceLength;
+
+    this.bufferLength = currentBufferLength;
+  };
+
+  return constructor;
+})();
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/util.js b/apps/files_pdfviewer/js/pdfjs/src/util.js
new file mode 100755
index 00000000000..4fb96f062a8
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/util.js
@@ -0,0 +1,286 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+function log(msg) {
+  if (console && console.log)
+    console.log(msg);
+  else if (print)
+    print(msg);
+}
+
+function warn(msg) {
+  if (verbosity >= WARNINGS)
+    log('Warning: ' + msg);
+}
+
+function backtrace() {
+  try {
+    throw new Error();
+  } catch (e) {
+    return e.stack ? e.stack.split('\n').slice(2).join('\n') : '';
+  }
+}
+
+function error(msg) {
+  log('Error: ' + msg);
+  log(backtrace());
+  throw new Error(msg);
+}
+
+function TODO(what) {
+  if (verbosity >= TODOS)
+    log('TODO: ' + what);
+}
+
+function malformed(msg) {
+  error('Malformed PDF: ' + msg);
+}
+
+function assert(cond, msg) {
+  if (!cond)
+    error(msg);
+}
+
+// In a well-formed PDF, |cond| holds.  If it doesn't, subsequent
+// behavior is undefined.
+function assertWellFormed(cond, msg) {
+  if (!cond)
+    malformed(msg);
+}
+
+function shadow(obj, prop, value) {
+  Object.defineProperty(obj, prop, { value: value,
+                                     enumerable: true,
+                                     configurable: true,
+                                     writable: false });
+  return value;
+}
+
+function bytesToString(bytes) {
+  var str = '';
+  var length = bytes.length;
+  for (var n = 0; n < length; ++n)
+    str += String.fromCharCode(bytes[n]);
+  return str;
+}
+
+function stringToBytes(str) {
+  var length = str.length;
+  var bytes = new Uint8Array(length);
+  for (var n = 0; n < length; ++n)
+    bytes[n] = str.charCodeAt(n) & 0xFF;
+  return bytes;
+}
+
+var IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0];
+
+var Util = (function utilUtil() {
+  function constructor() {}
+  constructor.makeCssRgb = function makergb(r, g, b) {
+    var ri = (255 * r) | 0, gi = (255 * g) | 0, bi = (255 * b) | 0;
+    return 'rgb(' + ri + ',' + gi + ',' + bi + ')';
+  };
+  constructor.makeCssCmyk = function makecmyk(c, m, y, k) {
+    c = (new DeviceCmykCS()).getRgb([c, m, y, k]);
+    var ri = (255 * c[0]) | 0, gi = (255 * c[1]) | 0, bi = (255 * c[2]) | 0;
+    return 'rgb(' + ri + ',' + gi + ',' + bi + ')';
+  };
+  constructor.applyTransform = function apply(p, m) {
+    var xt = p[0] * m[0] + p[1] * m[2] + m[4];
+    var yt = p[0] * m[1] + p[1] * m[3] + m[5];
+    return [xt, yt];
+  };
+
+  return constructor;
+})();
+
+var PDFStringTranslateTable = [
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0x2D8, 0x2C7, 0x2C6, 0x2D9, 0x2DD, 0x2DB, 0x2DA, 0x2DC, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2022, 0x2020, 0x2021, 0x2026, 0x2014,
+  0x2013, 0x192, 0x2044, 0x2039, 0x203A, 0x2212, 0x2030, 0x201E, 0x201C,
+  0x201D, 0x2018, 0x2019, 0x201A, 0x2122, 0xFB01, 0xFB02, 0x141, 0x152, 0x160,
+  0x178, 0x17D, 0x131, 0x142, 0x153, 0x161, 0x17E, 0, 0x20AC
+];
+
+function stringToPDFString(str) {
+  var i, n = str.length, str2 = '';
+  if (str[0] === '\xFE' && str[1] === '\xFF') {
+    // UTF16BE BOM
+    for (i = 2; i < n; i += 2)
+      str2 += String.fromCharCode(
+        (str.charCodeAt(i) << 8) | str.charCodeAt(i + 1));
+  } else {
+    for (i = 0; i < n; ++i) {
+      var code = PDFStringTranslateTable[str.charCodeAt(i)];
+      str2 += code ? String.fromCharCode(code) : str.charAt(i);
+    }
+  }
+  return str2;
+}
+
+function isBool(v) {
+  return typeof v == 'boolean';
+}
+
+function isInt(v) {
+  return typeof v == 'number' && ((v | 0) == v);
+}
+
+function isNum(v) {
+  return typeof v == 'number';
+}
+
+function isString(v) {
+  return typeof v == 'string';
+}
+
+function isNull(v) {
+  return v === null;
+}
+
+function isName(v) {
+  return v instanceof Name;
+}
+
+function isCmd(v, cmd) {
+  return v instanceof Cmd && (!cmd || v.cmd == cmd);
+}
+
+function isDict(v, type) {
+  return v instanceof Dict && (!type || v.get('Type').name == type);
+}
+
+function isArray(v) {
+  return v instanceof Array;
+}
+
+function isStream(v) {
+  return typeof v == 'object' && v != null && ('getChar' in v);
+}
+
+function isArrayBuffer(v) {
+  return typeof v == 'object' && v != null && ('byteLength' in v);
+}
+
+function isRef(v) {
+  return v instanceof Ref;
+}
+
+function isPDFFunction(v) {
+  var fnDict;
+  if (typeof v != 'object')
+    return false;
+  else if (isDict(v))
+    fnDict = v;
+  else if (isStream(v))
+    fnDict = v.dict;
+  else
+    return false;
+  return fnDict.has('FunctionType');
+}
+
+/**
+ * 'Promise' object.
+ * Each object that is stored in PDFObjects is based on a Promise object that
+ * contains the status of the object and the data. There migth be situations,
+ * where a function want to use the value of an object, but it isn't ready at
+ * that time. To get a notification, once the object is ready to be used, s.o.
+ * can add a callback using the `then` method on the promise that then calls
+ * the callback once the object gets resolved.
+ * A promise can get resolved only once and only once the data of the promise
+ * can be set. If any of these happens twice or the data is required before
+ * it was set, an exception is throw.
+ */
+var Promise = (function promise() {
+  var EMPTY_PROMISE = {};
+
+  /**
+   * If `data` is passed in this constructor, the promise is created resolved.
+   * If there isn't data, it isn't resolved at the beginning.
+   */
+  function Promise(name, data) {
+    this.name = name;
+    // If you build a promise and pass in some data it's already resolved.
+    if (data != null) {
+      this.isResolved = true;
+      this._data = data;
+      this.hasData = true;
+    } else {
+      this.isResolved = false;
+      this._data = EMPTY_PROMISE;
+    }
+    this.callbacks = [];
+  };
+
+  Promise.prototype = {
+    hasData: false,
+
+    set data(value) {
+      if (value === undefined) {
+        return;
+      }
+      if (this._data !== EMPTY_PROMISE) {
+        throw 'Promise ' + this.name +
+                                ': Cannot set the data of a promise twice';
+      }
+      this._data = value;
+      this.hasData = true;
+
+      if (this.onDataCallback) {
+        this.onDataCallback(value);
+      }
+    },
+
+    get data() {
+      if (this._data === EMPTY_PROMISE) {
+        throw 'Promise ' + this.name + ': Cannot get data that isn\'t set';
+      }
+      return this._data;
+    },
+
+    onData: function promiseOnData(callback) {
+      if (this._data !== EMPTY_PROMISE) {
+        callback(this._data);
+      } else {
+        this.onDataCallback = callback;
+      }
+    },
+
+    resolve: function promiseResolve(data) {
+      if (this.isResolved) {
+        throw 'A Promise can be resolved only once ' + this.name;
+      }
+
+      this.isResolved = true;
+      this.data = data;
+      var callbacks = this.callbacks;
+
+      for (var i = 0, ii = callbacks.length; i < ii; i++) {
+        callbacks[i].call(null, data);
+      }
+    },
+
+    then: function promiseThen(callback) {
+      if (!callback) {
+        throw 'Requiring callback' + this.name;
+      }
+
+      // If the promise is already resolved, call the callback directly.
+      if (this.isResolved) {
+        var data = this.data;
+        callback.call(null, data);
+      } else {
+        this.callbacks.push(callback);
+      }
+    }
+  };
+
+  return Promise;
+})();
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/utils/cffStandardStrings.js b/apps/files_pdfviewer/js/pdfjs/src/utils/cffStandardStrings.js
new file mode 100755
index 00000000000..97d7e5a251f
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/utils/cffStandardStrings.js
@@ -0,0 +1,298 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+var CFFEncodingMap = {
+  '0': '-reserved-',
+  '1': 'hstem',
+  '2': '-reserved-',
+  '3': 'vstem',
+  '4': 'vmoveto',
+  '5': 'rlineto',
+  '6': 'hlineto',
+  '7': 'vlineto',
+  '8': 'rrcurveto',
+  '9': '-reserved-',
+  '10': 'callsubr',
+  '11': 'return',
+  '12': {
+    '3': 'and',
+    '4': 'or',
+    '5': 'not',
+    '9': 'abs',
+    '10': 'add',
+    '11': 'div',
+    '12': 'sub',
+    '14': 'neg',
+    '15': 'eq',
+    '18': 'drop',
+    '20': 'put',
+    '21': 'get',
+    '22': 'ifelse',
+    '23': 'random',
+    '24': 'mul',
+    '26': 'sqrt',
+    '27': 'dup',
+    '28': 'exch',
+    '29': 'index',
+    '30': 'roll',
+    '34': 'hflex',
+    '35': 'flex',
+    '36': 'hflex1',
+    '37': 'flex1'
+  },
+  '13': '-reserved-',
+  '14': 'endchar',
+  '15': '-reserved-',
+  '16': '-reserved-',
+  '17': '-reserved-',
+  '18': 'hstemhm',
+  '19': 'hintmask',
+  '20': 'cntrmask',
+  '21': 'rmoveto',
+  '22': 'hmoveto',
+  '23': 'vstemhm',
+  '24': 'rcurveline',
+  '25': 'rlivecurve',
+  '26': 'vvcurveto',
+  '27': 'hhcurveto',
+  '29': 'callgsubr',
+  '30': 'vhcurveto',
+  '31': 'hvcurveto'
+};
+
+var CFFDictDataMap = {
+  '0': {
+    name: 'version',
+    operand: 'SID'
+  },
+  '1': {
+    name: 'Notice',
+    operand: 'SID'
+  },
+  '2': {
+    name: 'FullName',
+    operand: 'SID'
+  },
+  '3': {
+    name: 'FamilyName',
+    operand: 'SID'
+  },
+  '4': {
+    name: 'Weight',
+    operand: 'SID'
+  },
+  '5': {
+    name: 'FontBBox',
+    operand: [0, 0, 0, 0]
+  },
+  '6': {
+    name: 'BlueValues'
+  },
+  '7': {
+    name: 'OtherBlues'
+  },
+  '8': {
+    name: 'FamilyBlues'
+  },
+  '9': {
+    name: 'FamilyOtherBlues'
+  },
+  '10': {
+    name: 'StdHW'
+  },
+  '11': {
+    name: 'StdVW'
+  },
+  '12': {
+    '0': {
+      name: 'Copyright',
+      operand: 'SID'
+    },
+    '1': {
+      name: 'IsFixedPitch',
+      operand: false
+    },
+    '2': {
+      name: 'ItalicAngle',
+      operand: 0
+    },
+    '3': {
+      name: 'UnderlinePosition',
+      operand: -100
+    },
+    '4': {
+      name: 'UnderlineThickness',
+      operand: 50
+    },
+    '5': {
+      name: 'PaintType',
+      operand: 0
+    },
+    '6': {
+      name: 'CharstringType',
+      operand: 2
+    },
+    '7': {
+      name: 'FontMatrix',
+      operand: [0.001, 0, 0, 0.001, 0 , 0]
+    },
+    '8': {
+      name: 'StrokeWidth',
+      operand: 0
+    },
+    '9': {
+      name: 'BlueScale'
+    },
+    '10': {
+      name: 'BlueShift'
+    },
+    '11': {
+      name: 'BlueFuzz'
+    },
+    '12': {
+      name: 'StemSnapH'
+    },
+    '13': {
+      name: 'StemSnapV'
+    },
+    '14': {
+      name: 'ForceBold'
+    },
+    '17': {
+      name: 'LanguageGroup'
+    },
+    '18': {
+      name: 'ExpansionFactor'
+    },
+    '19': {
+      name: 'initialRandomSeed'
+    },
+    '20': {
+      name: 'SyntheticBase',
+      operand: null
+    },
+    '21': {
+      name: 'PostScript',
+      operand: 'SID'
+    },
+    '22': {
+      name: 'BaseFontName',
+      operand: 'SID'
+    },
+    '23': {
+      name: 'BaseFontBlend',
+      operand: 'delta'
+    }
+  },
+  '13': {
+    name: 'UniqueID',
+    operand: null
+  },
+  '14': {
+    name: 'XUID',
+    operand: []
+  },
+  '15': {
+    name: 'charset',
+    operand: 0
+  },
+  '16': {
+    name: 'Encoding',
+    operand: 0
+  },
+  '17': {
+    name: 'CharStrings',
+    operand: null
+  },
+  '18': {
+    name: 'Private',
+    operand: 'number number'
+  },
+  '19': {
+    name: 'Subrs'
+  },
+  '20': {
+    name: 'defaultWidthX'
+  },
+  '21': {
+    name: 'nominalWidthX'
+  }
+};
+
+var CFFDictPrivateDataMap = {
+  '6': {
+    name: 'BluesValues',
+    operand: 'delta'
+  },
+  '7': {
+    name: 'OtherBlues',
+    operand: 'delta'
+  },
+  '8': {
+    name: 'FamilyBlues',
+    operand: 'delta'
+  },
+  '9': {
+    name: 'FamilyOtherBlues',
+    operand: 'delta'
+  },
+  '10': {
+    name: 'StdHW',
+    operand: null
+  },
+  '11': {
+    name: 'StdVW',
+    operand: null
+  },
+  '12': {
+    '9': {
+      name: 'BlueScale',
+      operand: 0.039625
+    },
+    '10': {
+      name: 'BlueShift',
+      operand: 7
+    },
+    '11': {
+      name: 'BlueFuzz',
+      operand: 1
+    },
+    '12': {
+      name: 'StemSnapH',
+      operand: 'delta'
+    },
+    '13': {
+      name: 'StemSnapV',
+      operand: 'delta'
+    },
+    '14': {
+      name: 'ForceBold',
+      operand: 'boolean'
+    },
+    '17': {
+      name: 'LanguageGroup',
+      operand: 0
+    },
+    '18': {
+      name: 'ExpansionFactor',
+      operand: 0.06
+    },
+    '19': {
+      name: 'initialRandomSeed',
+      operand: 0
+    }
+  },
+  '19': {
+    name: 'Subrs',
+    operand: null
+  },
+  '20': {
+    name: 'defaultWidthX',
+    operand: 0
+  },
+  '21': {
+    name: 'nominalWidthX',
+    operand: 0
+  }
+};
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/utils/fonts_utils.js b/apps/files_pdfviewer/js/pdfjs/src/utils/fonts_utils.js
new file mode 100755
index 00000000000..2a1f0ea72ae
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/utils/fonts_utils.js
@@ -0,0 +1,408 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+/*
+ * The Type2 reader code below is only used for debugging purpose since Type2
+ * is only a CharString format and is never used directly as a Font file.
+ *
+ * So the code here is useful for dumping the data content of a .cff file in
+ * order to investigate the similarity between a Type1 CharString and a Type2
+ * CharString or to understand the structure of the CFF format.
+ */
+
+/*
+ * Build a charset by assigning the glyph name and the human readable form
+ * of the glyph data.
+ */
+function readCharset(aStream, aCharstrings) {
+  var charset = {};
+
+  var format = aStream.getByte();
+  var count = aCharstrings.length - 1;
+  if (format == 0) {
+    charset['.notdef'] = readCharstringEncoding(aCharstrings[0]);
+
+    for (var i = 1; i < count + 1; i++) {
+      var sid = aStream.getByte() << 8 | aStream.getByte();
+      charset[CFFStrings[sid]] = readCharstringEncoding(aCharstrings[i]);
+      //log(CFFStrings[sid] + "::" + charset[CFFStrings[sid]]);
+    }
+  } else if (format == 1) {
+    for (var i = 1; i < count + 1; i++) {
+      var first = aStream.getByte();
+      first = (first << 8) | aStream.getByte();
+      var numLeft = aStream.getByte();
+      for (var j = 0; j <= numLeft; j++) {
+        var sid = first++;
+        if (CFFStrings[sid] == 'three')
+          log(aCharstrings[j]);
+        charset[CFFStrings[sid]] = readCharstringEncoding(aCharstrings[j]);
+      }
+    }
+  } else {
+    error('Invalid charset format');
+  }
+
+  return charset;
+}
+
+/*
+ * Take a Type2 binary charstring as input and transform it to a human
+ * readable representation as specified by the 'The Type 2 Charstring Format',
+ * chapter 3.1.
+ */
+function readCharstringEncoding(aString) {
+  if (!aString)
+    return '';
+
+  var charstringTokens = [];
+
+  var count = aString.length;
+  for (var i = 0; i < count; ) {
+    var value = aString[i++];
+    var token = null;
+
+    if (value < 0) {
+      continue;
+    } else if (value <= 11) {
+      token = CFFEncodingMap[value];
+    } else if (value == 12) {
+      token = CFFEncodingMap[value][aString[i++]];
+    } else if (value <= 18) {
+      token = CFFEncodingMap[value];
+    } else if (value <= 20) {
+      var mask = aString[i++];
+      token = CFFEncodingMap[value];
+    } else if (value <= 27) {
+      token = CFFEncodingMap[value];
+    } else if (value == 28) {
+      token = aString[i++] << 8 | aString[i++];
+    } else if (value <= 31) {
+      token = CFFEncodingMap[value];
+    } else if (value < 247) {
+      token = parseInt(value, 10) - 139;
+    } else if (value < 251) {
+      token = (value - 247) * 256 + aString[i++] + 108;
+    } else if (value < 255) {
+      token = -(value - 251) * 256 - aString[i++] - 108;
+    } else {// value == 255
+      token = aString[i++] << 24 | aString[i++] << 16 |
+              aString[i++] << 8 | aString[i];
+    }
+
+    charstringTokens.push(token);
+  }
+
+  return charstringTokens;
+}
+
+
+/*
+ * Take a binary DICT Data as input and transform it into a human readable
+ * form as specified by 'The Compact Font Format Specification', chapter 5.
+ */
+function readFontDictData(aString, aMap) {
+  var fontDictDataTokens = [];
+
+  var count = aString.length;
+  for (var i = 0; i < count; i) {
+    var value = aString[i++];
+    var token = null;
+
+    if (value == 12) {
+      token = aMap[value][aString[i++]];
+    } else if (value == 28) {
+      token = aString[i++] << 8 | aString[i++];
+    } else if (value == 29) {
+      token = aString[i++] << 24 |
+              aString[i++] << 16 |
+              aString[i++] << 8 |
+              aString[i++];
+    } else if (value == 30) {
+      token = '';
+      var parsed = false;
+      while (!parsed) {
+        var byte = aString[i++];
+
+        var nibbles = [parseInt(byte / 16, 10), parseInt(byte % 16, 10)];
+        for (var j = 0; j < nibbles.length; j++) {
+          var nibble = nibbles[j];
+          switch (nibble) {
+            case 0xA:
+              token += '.';
+              break;
+            case 0xB:
+              token += 'E';
+              break;
+            case 0xC:
+              token += 'E-';
+              break;
+            case 0xD:
+              break;
+            case 0xE:
+              token += '-';
+              break;
+            case 0xF:
+              parsed = true;
+              break;
+            default:
+              token += nibble;
+              break;
+          }
+        }
+      }
+      token = parseFloat(token);
+    } else if (value <= 31) {
+      token = aMap[value];
+    } else if (value <= 246) {
+      token = parseInt(value, 10) - 139;
+    } else if (value <= 250) {
+      token = (value - 247) * 256 + aString[i++] + 108;
+    } else if (value <= 254) {
+      token = -(value - 251) * 256 - aString[i++] - 108;
+    } else if (value == 255) {
+      error('255 is not a valid DICT command');
+    }
+
+    fontDictDataTokens.push(token);
+  }
+
+  return fontDictDataTokens;
+}
+
+/*
+ * Take a stream as input and return an array of objects.
+ * In CFF an INDEX is a structure with the following format:
+ *  {
+ *    count: 2 bytes (Number of objects stored in INDEX),
+ *    offsize: 1 byte (Offset array element size),
+ *    offset: [count + 1] bytes (Offsets array),
+ *    data: - (Objects data)
+ *  }
+ *
+ *  More explanation are given in the 'CFF Font Format Specification',
+ *  chapter 5.
+ */
+function readFontIndexData(aStream, aIsByte) {
+  var count = aStream.getByte() << 8 | aStream.getByte();
+  var offsize = aStream.getByte();
+
+  function getNextOffset() {
+    switch (offsize) {
+      case 0:
+        return 0;
+      case 1:
+        return aStream.getByte();
+      case 2:
+        return aStream.getByte() << 8 | aStream.getByte();
+      case 3:
+        return aStream.getByte() << 16 | aStream.getByte() << 8 |
+               aStream.getByte();
+      case 4:
+      return aStream.getByte() << 24 | aStream.getByte() << 16 |
+             aStream.getByte() << 8 | aStream.getByte();
+    }
+    error(offsize + ' is not a valid offset size');
+    return null;
+  }
+
+  var offsets = [];
+  for (var i = 0; i < count + 1; i++)
+    offsets.push(getNextOffset());
+
+  dump('Found ' + count + ' objects at offsets :' +
+      offsets + ' (offsize: ' + offsize + ')');
+
+  // Now extract the objects
+  var relativeOffset = aStream.pos;
+  var objects = [];
+  for (var i = 0; i < count; i++) {
+    var offset = offsets[i];
+    aStream.pos = relativeOffset + offset - 1;
+
+    var data = [];
+    var length = offsets[i + 1] - 1;
+    for (var j = offset - 1; j < length; j++)
+      data.push(aIsByte ? aStream.getByte() : aStream.getChar());
+    objects.push(data);
+  }
+
+  return objects;
+}
+
+var Type2Parser = function type2Parser(aFilePath) {
+  var font = new Dict();
+
+  var xhr = new XMLHttpRequest();
+  xhr.open('GET', aFilePath, false);
+  xhr.mozResponseType = xhr.responseType = 'arraybuffer';
+  xhr.expected = (document.URL.indexOf('file:') == 0) ? 0 : 200;
+  xhr.send(null);
+  this.data = new Stream(xhr.mozResponseArrayBuffer || xhr.mozResponse ||
+                         xhr.responseArrayBuffer || xhr.response);
+
+  // Turn on this flag for additional debugging logs
+  var debug = false;
+
+  function dump(aStr) {
+    if (debug)
+      log(aStr);
+  }
+
+  function parseAsToken(aString, aMap) {
+    var decoded = readFontDictData(aString, aMap);
+
+    var stack = [];
+    var count = decoded.length;
+    for (var i = 0; i < count; i++) {
+      var token = decoded[i];
+      if (isNum(token)) {
+        stack.push(token);
+      } else {
+        switch (token.operand) {
+          case 'SID':
+            font.set(token.name, CFFStrings[stack.pop()]);
+            break;
+          case 'number number':
+            font.set(token.name, {
+              offset: stack.pop(),
+              size: stack.pop()
+            });
+            break;
+          case 'boolean':
+            font.set(token.name, stack.pop());
+            break;
+          case 'delta':
+            font.set(token.name, stack.pop());
+            break;
+          default:
+            if (token.operand && token.operand.length) {
+              var array = [];
+              for (var j = 0; j < token.operand.length; j++)
+                array.push(stack.pop());
+              font.set(token.name, array);
+            } else {
+              font.set(token.name, stack.pop());
+            }
+            break;
+        }
+      }
+    }
+  }
+
+  this.parse = function type2ParserParse(aStream) {
+    font.set('major', aStream.getByte());
+    font.set('minor', aStream.getByte());
+    font.set('hdrSize', aStream.getByte());
+    font.set('offsize', aStream.getByte());
+
+    // Read the NAME Index
+    dump('Reading Index: Names');
+    font.set('Names', readFontIndexData(aStream));
+    dump('Names: ' + font.get('Names'));
+
+    // Read the Top Dict Index
+    dump('Reading Index: TopDict');
+    var topDict = readFontIndexData(aStream, true);
+    dump('TopDict: ' + topDict);
+
+    // Read the String Index
+    dump('Reading Index: Strings');
+    var strings = readFontIndexData(aStream);
+    dump('strings: ' + strings);
+
+    // Fill up the Strings dictionary with the new unique strings
+    for (var i = 0; i < strings.length; i++)
+      CFFStrings.push(strings[i].join(''));
+
+    // Parse the TopDict operator
+    var objects = [];
+    var count = topDict.length;
+    for (var i = 0; i < count; i++)
+      parseAsToken(topDict[i], CFFDictDataMap);
+
+    // Read the Global Subr Index that comes just after the Strings Index
+    // (cf. "The Compact Font Format Specification" Chapter 16)
+    dump('Reading Global Subr Index');
+    var subrs = readFontIndexData(aStream, true);
+    dump(subrs);
+
+    // Reading Private Dict
+    var priv = font.get('Private');
+    dump('Reading Private Dict (offset: ' + priv.offset +
+        ' size: ' + priv.size + ')');
+    aStream.pos = priv.offset;
+
+    var privateDict = [];
+    for (var i = 0; i < priv.size; i++)
+      privateDict.push(aStream.getByte());
+    dump('private:' + privateDict);
+    parseAsToken(privateDict, CFFDictPrivateDataMap);
+
+    for (var p in font.map)
+      dump(p + '::' + font.get(p));
+
+    // Read CharStrings Index
+    var charStringsOffset = font.get('CharStrings');
+    dump('Read CharStrings Index (offset: ' + charStringsOffset + ')');
+    aStream.pos = charStringsOffset;
+    var charStrings = readFontIndexData(aStream, true);
+
+    // Read Charset
+    dump('Read Charset for ' + charStrings.length + ' glyphs');
+    var charsetEntry = font.get('charset');
+    if (charsetEntry == 0) {
+      error('Need to support CFFISOAdobeCharset');
+    } else if (charsetEntry == 1) {
+      error('Need to support CFFExpert');
+    } else if (charsetEntry == 2) {
+      error('Need to support CFFExpertSubsetCharset');
+    } else {
+      aStream.pos = charsetEntry;
+      var charset = readCharset(aStream, charStrings);
+    }
+  };
+};
+
+/*
+ * To try the Type2 decoder on a local file in the current directory:
+ *
+ *  var cff = new Type2Parser("file.cff");
+ *  cff.parse(this.data);
+ *
+ * To try the Type2 decoder on a custom built CFF array:
+ *
+ *  var file = new Uint8Array(cffFileArray, 0, cffFileSize);
+ *  var parser = new Type2Parser();
+ *  parser.parse(new Stream(file));
+ *
+ */
+
+/*
+ * Write to a file to the disk (works only on Firefox in privilege mode)
+ * but this is useful for dumping a font file to the disk and check with
+ * fontforge or the ots program what's wrong with the file.
+ *
+ * writeToFile(fontData, "/tmp/pdf.js." + fontCount + ".cff");
+ */
+function writeToFile(aBytes, aFilePath) {
+  if (!('netscape' in window))
+    return;
+
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+  var Cc = Components.classes,
+      Ci = Components.interfaces;
+  var file = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsILocalFile);
+  file.initWithPath(aFilePath);
+
+  var stream = Cc['@mozilla.org/network/file-output-stream;1']
+                 .createInstance(Ci.nsIFileOutputStream);
+  stream.init(file, 0x04 | 0x08 | 0x20, 0x180, 0);
+
+  var bos = Cc['@mozilla.org/binaryoutputstream;1']
+              .createInstance(Ci.nsIBinaryOutputStream);
+  bos.setOutputStream(stream);
+  bos.writeByteArray(aBytes, aBytes.length);
+  stream.close();
+}
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/worker.js b/apps/files_pdfviewer/js/pdfjs/src/worker.js
new file mode 100755
index 00000000000..67f1bf658e1
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/worker.js
@@ -0,0 +1,193 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+function MessageHandler(name, comObj) {
+  this.name = name;
+  this.comObj = comObj;
+  var ah = this.actionHandler = {};
+
+  ah['console_log'] = [function ahConsoleLog(data) {
+      console.log.apply(console, data);
+  }];
+  ah['console_error'] = [function ahConsoleError(data) {
+      console.error.apply(console, data);
+  }];
+
+  comObj.onmessage = function messageHandlerComObjOnMessage(event) {
+    var data = event.data;
+    if (data.action in ah) {
+      var action = ah[data.action];
+      action[0].call(action[1], data.data);
+    } else {
+      throw 'Unkown action from worker: ' + data.action;
+    }
+  };
+}
+
+MessageHandler.prototype = {
+  on: function messageHandlerOn(actionName, handler, scope) {
+    var ah = this.actionHandler;
+    if (ah[actionName]) {
+      throw 'There is already an actionName called "' + actionName + '"';
+    }
+    ah[actionName] = [handler, scope];
+  },
+
+  send: function messageHandlerSend(actionName, data) {
+    this.comObj.postMessage({
+      action: actionName,
+      data: data
+    });
+  }
+};
+
+var WorkerMessageHandler = {
+  setup: function wphSetup(handler) {
+    var pdfDoc = null;
+
+    handler.on('test', function wphSetupTest(data) {
+      handler.send('test', data instanceof Uint8Array);
+    });
+
+    handler.on('workerSrc', function wphSetupWorkerSrc(data) {
+      // In development, the `workerSrc` message is handled in the
+      // `worker_loader.js` file. In production the workerProcessHandler is
+      // called for this. This servers as a dummy to prevent calling an
+      // undefined action `workerSrc`.
+    });
+
+    handler.on('doc', function wphSetupDoc(data) {
+      // Create only the model of the PDFDoc, which is enough for
+      // processing the content of the pdf.
+      pdfDoc = new PDFDocModel(new Stream(data));
+    });
+
+    handler.on('page_request', function wphSetupPageRequest(pageNum) {
+      pageNum = parseInt(pageNum);
+
+      var page = pdfDoc.getPage(pageNum);
+
+      // The following code does quite the same as
+      // Page.prototype.startRendering, but stops at one point and sends the
+      // result back to the main thread.
+      var gfx = new CanvasGraphics(null);
+
+      var start = Date.now();
+
+      var dependency = [];
+
+      // Pre compile the pdf page and fetch the fonts/images.
+      var IRQueue = page.getIRQueue(handler, dependency);
+
+      console.log('page=%d - getIRQueue: time=%dms, len=%d', pageNum,
+                                  Date.now() - start, IRQueue.fnArray.length);
+
+      // Filter the dependecies for fonts.
+      var fonts = {};
+      for (var i = 0, ii = dependency.length; i < ii; i++) {
+        var dep = dependency[i];
+        if (dep.indexOf('font_') == 0) {
+          fonts[dep] = true;
+        }
+      }
+
+      handler.send('page', {
+        pageNum: pageNum,
+        IRQueue: IRQueue,
+        depFonts: Object.keys(fonts)
+      });
+    }, this);
+
+    handler.on('font', function wphSetupFont(data) {
+      var objId = data[0];
+      var name = data[1];
+      var file = data[2];
+      var properties = data[3];
+
+      var font = {
+        name: name,
+        file: file,
+        properties: properties
+      };
+
+      // Some fonts don't have a file, e.g. the build in ones like Arial.
+      if (file) {
+        var fontFileDict = new Dict();
+        fontFileDict.map = file.dict.map;
+
+        var fontFile = new Stream(file.bytes, file.start,
+                                  file.end - file.start, fontFileDict);
+
+        // Check if this is a FlateStream. Otherwise just use the created
+        // Stream one. This makes complex_ttf_font.pdf work.
+        var cmf = file.bytes[0];
+        if ((cmf & 0x0f) == 0x08) {
+          font.file = new FlateStream(fontFile);
+        } else {
+          font.file = fontFile;
+        }
+      }
+
+      var obj = new Font(font.name, font.file, font.properties);
+
+      var str = '';
+      var objData = obj.data;
+      if (objData) {
+        var length = objData.length;
+        for (var j = 0; j < length; ++j)
+          str += String.fromCharCode(objData[j]);
+      }
+
+      obj.str = str;
+
+      // Remove the data array form the font object, as it's not needed
+      // anymore as we sent over the ready str.
+      delete obj.data;
+
+      handler.send('font_ready', [objId, obj]);
+    });
+  }
+};
+
+var consoleTimer = {};
+
+var workerConsole = {
+  log: function log() {
+    var args = Array.prototype.slice.call(arguments);
+    postMessage({
+      action: 'console_log',
+      data: args
+    });
+  },
+
+  error: function error() {
+    var args = Array.prototype.slice.call(arguments);
+    postMessage({
+      action: 'console_error',
+      data: args
+    });
+  },
+
+  time: function time(name) {
+    consoleTimer[name] = Date.now();
+  },
+
+  timeEnd: function timeEnd(name) {
+    var time = consoleTimer[name];
+    if (time == null) {
+      throw 'Unkown timer name ' + name;
+    }
+    this.log('Timer:', name, Date.now() - time);
+  }
+};
+
+// Worker thread?
+if (typeof window === 'undefined') {
+  globalScope.console = workerConsole;
+
+  var handler = new MessageHandler('worker_processor', this);
+  WorkerMessageHandler.setup(handler);
+}
+
diff --git a/apps/files_pdfviewer/js/pdfjs/src/worker_loader.js b/apps/files_pdfviewer/js/pdfjs/src/worker_loader.js
new file mode 100755
index 00000000000..7141fa3e39d
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/src/worker_loader.js
@@ -0,0 +1,53 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+function onMessageLoader(evt) {
+  // Reset the `onmessage` function as it was only set to call
+  // this function the first time a message is passed to the worker
+  // but shouldn't get called anytime afterwards.
+  this.onmessage = null;
+
+  if (evt.data.action !== 'workerSrc') {
+    throw 'Worker expects first message to be `workerSrc`';
+  }
+
+  // Content of `PDFJS.workerSrc` as defined on the main thread.
+  var workerSrc = evt.data.data;
+
+  // Extract the directory that contains the source files to load.
+  // Assuming the source files have the same relative possition as the
+  // `workerSrc` file.
+  var dir = workerSrc.substring(0, workerSrc.lastIndexOf('/') + 1);
+
+  // List of files to include;
+  var files = [
+    'core.js',
+    'util.js',
+    'canvas.js',
+    'obj.js',
+    'function.js',
+    'charsets.js',
+    'cidmaps.js',
+    'colorspace.js',
+    'crypto.js',
+    'evaluator.js',
+    'fonts.js',
+    'glyphlist.js',
+    'image.js',
+    'metrics.js',
+    'parser.js',
+    'pattern.js',
+    'stream.js',
+    'worker.js',
+    '../external/jpgjs/jpg.js'
+  ];
+
+  // Load all the files.
+  for (var i = 0; i < files.length; i++) {
+    importScripts(dir + files[i]);
+  }
+}
+
+this.onmessage = onMessageLoader;
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/bookmark.svg b/apps/files_pdfviewer/js/pdfjs/web/images/bookmark.svg
new file mode 100755
index 00000000000..2c1fa130d17
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/web/images/bookmark.svg
@@ -0,0 +1,661 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="240.00000"
+   inkscape:export-xdpi="240.00000"
+   inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png"
+   sodipodi:docname="bookmark.svg"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="48.000000px"
+   width="48.000000px"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
+  <defs
+     id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective100" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5031"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5029"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient5027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2906">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2908" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2910" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2896">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2898" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2900" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2598">
+      <stop
+         style="stop-color:#859dbc;stop-opacity:1;"
+         offset="0"
+         id="stop2600" />
+      <stop
+         style="stop-color:#547299;stop-opacity:1;"
+         offset="1"
+         id="stop2602" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2590">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2592" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2594" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5897">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.0000000;"
+         offset="0.0000000"
+         id="stop5899" />
+      <stop
+         id="stop5905"
+         offset="0.50000000"
+         style="stop-color:#000000;stop-opacity:0.56701028;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop5901" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5866">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop5868" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop5870" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4404">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4406" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4408" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4542">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4544" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4546" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1.0000000"
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient12512">
+      <stop
+         id="stop12513"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop12517"
+         offset="0.50000000"
+         style="stop-color:#fff520;stop-opacity:0.89108908;" />
+      <stop
+         id="stop12514"
+         offset="1.0000000"
+         style="stop-color:#fff300;stop-opacity:0.0000000;" />
+    </linearGradient>
+    <radialGradient
+       r="14.375000"
+       fy="125.00000"
+       fx="55.000000"
+       cy="125.00000"
+       cx="55.000000"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient278"
+       xlink:href="#linearGradient12512"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.036374,3.250000,0.489522)"
+       cx="8.8244190"
+       cy="3.7561285"
+       fx="8.8244190"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.960493,0.000000,0.000000,1.044769,-0.103553,-0.159183)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.973033,0.000000,0.000000,1.034937,3.168754,0.555277)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4542"
+       id="radialGradient4548"
+       cx="24.306795"
+       cy="42.07798"
+       fx="24.306795"
+       fy="42.07798"
+       r="15.821514"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.284916,0.000000,30.08928)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4404"
+       id="linearGradient4410"
+       x1="16.812500"
+       y1="1.8750000"
+       x2="16.812500"
+       y2="4.7187500"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.319549,0.000000,0.000000,1.362060,40.38853,-0.362057)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5866"
+       id="linearGradient5872"
+       x1="19.452349"
+       y1="13.174174"
+       x2="19.685436"
+       y2="27.095339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.224255,0.000000,0.000000,1.282176,0.371569,0.264657)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5897"
+       id="linearGradient5903"
+       x1="19.000000"
+       y1="9.7738247"
+       x2="19.000000"
+       y2="15.635596"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.319549,0.000000,0.000000,2.133926,-4.476133,-14.64845)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2590"
+       id="linearGradient2596"
+       x1="19.970377"
+       y1="6.1167107"
+       x2="19.970377"
+       y2="2.53125"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.319549,0.000000,0.000000,1.280356,-5.745298,0.249007)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2598"
+       id="linearGradient2604"
+       x1="18.431311"
+       y1="19.119474"
+       x2="18.402472"
+       y2="4.2702327"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.319549,0.000000,0.000000,1.299013,-3.106200,-1.336165)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2896"
+       id="linearGradient2902"
+       x1="14.584077"
+       y1="1.6392649"
+       x2="14.552828"
+       y2="2.4912448"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,1.594214,0.000000,-0.790249)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2906"
+       id="linearGradient2912"
+       x1="13.354311"
+       y1="1.4866425"
+       x2="14.075844"
+       y2="2.4017651"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,1.184816,0.000000,-0.727880)" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="158"
+     inkscape:window-x="433"
+     inkscape:window-height="690"
+     inkscape:window-width="872"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="false"
+     inkscape:current-layer="layer5"
+     inkscape:cy="24"
+     inkscape:cx="24"
+     inkscape:zoom="9.8333333"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.25490196"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>New Bookmark</dc:title>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>bookmark</rdf:li>
+            <rdf:li>remember</rdf:li>
+            <rdf:li>favorite</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Andreas Nilsson</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:description>create bookmark action</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow">
+    <g
+       style="display:inline"
+       id="g5022"
+       transform="matrix(2.165152e-2,0,0,1.485743e-2,43.0076,42.68539)">
+      <rect
+         y="-150.69685"
+         x="-1559.2523"
+         height="478.35718"
+         width="1339.6335"
+         id="rect4173"
+         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path5058"
+         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+         id="path5018"
+         sodipodi:nodetypes="cccc" />
+    </g>
+  </g>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <rect
+       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+       id="rect15391"
+       width="34.875000"
+       height="41.063431"
+       x="6.5000000"
+       y="3.5000000"
+       ry="1.1490481"
+       rx="1.1490486" />
+    <rect
+       style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+       id="rect15660"
+       width="32.937012"
+       height="39.028210"
+       x="7.5024552"
+       y="4.5010486"
+       ry="0.14904849"
+       rx="0.14904852" />
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.98855311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.017543854"
+       d="M 11.505723,5.4942766 L 11.505723,43.400869"
+       id="path15672"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.20467831"
+       d="M 12.500000,5.0205154 L 12.500000,43.038228"
+       id="path15674"
+       sodipodi:nodetypes="cc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <g
+       id="g2188">
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+         id="rect15686"
+         width="20.000006"
+         height="1.0000000"
+         x="15.999994"
+         y="9.0000000"
+         rx="0.13778631"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+         id="rect15688"
+         width="20.000006"
+         height="1.0000000"
+         x="15.999994"
+         y="11.000000"
+         rx="0.13778631"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+         id="rect15690"
+         width="20.000006"
+         height="1.0000000"
+         x="15.999994"
+         y="13.000000"
+         rx="0.13778631"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+         id="rect15692"
+         width="20.000006"
+         height="1.0000000"
+         x="15.999994"
+         y="15.000000"
+         rx="0.13778631"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+         id="rect15694"
+         width="20.000006"
+         height="1.0000000"
+         x="15.999994"
+         y="17.000000"
+         rx="0.13778631"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+         id="rect15696"
+         width="20.000006"
+         height="1.0000000"
+         x="15.999994"
+         y="19.000000"
+         rx="0.13778631"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+         id="rect15698"
+         width="20.000006"
+         height="1.0000000"
+         x="15.999994"
+         y="21.000000"
+         rx="0.13778631"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+         id="rect15700"
+         width="20.000006"
+         height="1.0000000"
+         x="15.999994"
+         y="23.000000"
+         rx="0.13778631"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+         id="rect15732"
+         width="9.0000057"
+         height="1.0000000"
+         x="15.999986"
+         y="25.000000"
+         rx="0.062003858"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+         id="rect15736"
+         width="20.000006"
+         height="1.0000000"
+         x="15.999986"
+         y="29.000000"
+         rx="0.13778631"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+         id="rect15738"
+         width="20.000006"
+         height="1.0000000"
+         x="15.999986"
+         y="31.000000"
+         rx="0.13778631"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+         id="rect15740"
+         width="20.000006"
+         height="1.0000000"
+         x="15.999986"
+         y="33.000000"
+         rx="0.13778631"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+         id="rect15742"
+         width="20.000006"
+         height="1.0000000"
+         x="15.999986"
+         y="35.000000"
+         rx="0.13778631"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+         id="rect15744"
+         width="14.000014"
+         height="1.0000000"
+         x="15.999986"
+         y="37.000000"
+         rx="0.096450485"
+         ry="0.065390877" />
+    </g>
+    <path
+       style="opacity:0.28021976;fill:url(#linearGradient5872);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 28.245858,31.324906 L 21.147869,27.133701 L 14.30757,30.8838 L 13.761859,3.9475667 L 28.549598,3.9475667 L 28.245858,31.324906 z "
+       id="path5138"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:url(#linearGradient2604);fill-opacity:1;fill-rule:evenodd;stroke:#364878;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+       d="M 12.427339,3.5180202 C 12.427339,3.5180202 12.240033,0.60520607 15.107867,0.54270607 L 25.119343,0.50728624 C 26.277287,0.50728624 26.581888,1.1910178 26.581888,2.1095589 L 26.581888,29.729916 L 20.545426,24.533862 L 14.674346,29.729916 L 14.591655,3.519629 L 12.427339,3.5180202 z "
+       id="path2204"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="opacity:0.4450549;fill:url(#linearGradient4410);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 13.030252,3.0117919 C 13.011046,2.225362 13.312918,1.0801307 15.375418,1.0176307 L 25.027906,1 C 25.640922,1 26.090152,1.1674319 26.090152,1.7994802 L 26.060994,10.491851 L 15.317102,10.491851 L 15.192102,2.9993251 C 15.192102,2.9993251 13.030252,3.0117919 13.030252,3.0117919 z "
+       id="path3668"
+       sodipodi:nodetypes="cccccccs" />
+    <rect
+       style="opacity:0.28021976;fill:url(#linearGradient5903);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect5895"
+       width="10.556392"
+       height="12.803556"
+       x="15.317101"
+       y="6.6907959"
+       rx="0.062003858"
+       ry="0.065390877" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2596);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.19125683;display:inline"
+       d="M 24.476832,2.2095507 L 25.575535,3.113139 L 25.547445,27.511911 L 20.497463,23.203758 L 15.704084,27.415203 L 15.699081,2.7495618 L 24.476832,2.2095507 z "
+       id="path5969"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="opacity:0.48295456;color:#000000;fill:url(#linearGradient2912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10533953;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 15.158602,3.9384083 L 15.114407,1.0335178 C 12.983906,1.0335178 12.993087,2.9680775 12.993087,3.9384083 L 15.158602,3.9384083 z "
+       id="path2894"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path2904"
+       d="M 15.158602,3.9384086 L 15.114407,1.8247593 C 12.81631,1.8426926 12.993087,3.9384086 12.993087,3.9384086 L 15.158602,3.9384086 z "
+       style="opacity:0.35795455;color:#000000;fill:url(#linearGradient2902);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10533953;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+  </g>
+</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/document-print.svg b/apps/files_pdfviewer/js/pdfjs/web/images/document-print.svg
new file mode 100755
index 00000000000..0b8837ba1df
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/web/images/document-print.svg
@@ -0,0 +1,532 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="document-print.svg"
+   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
+   inkscape:version="0.46"
+   sodipodi:version="0.32"
+   id="svg2994"
+   height="48px"
+   width="48px"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective84" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5031"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5029"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient5027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7612">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop7614" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop7616" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7612"
+       id="radialGradient7618"
+       cx="24.000000"
+       cy="41.875000"
+       fx="24.000000"
+       fy="41.875000"
+       r="19.125000"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,0.000000,27.91667)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.12371134;"
+         offset="0.0000000"
+         id="stop4764" />
+      <stop
+         id="stop4768"
+         offset="0.10344828"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4766" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4741">
+      <stop
+         id="stop4743"
+         offset="0.0000000"
+         style="stop-color:#dcdcda;stop-opacity:1.0000000;" />
+      <stop
+         id="stop4745"
+         offset="1.0000000"
+         style="stop-color:#bab9b7;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4733">
+      <stop
+         id="stop4735"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.23711340;" />
+      <stop
+         id="stop4737"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4698">
+      <stop
+         id="stop4700"
+         offset="0.0000000"
+         style="stop-color:#fffffd;stop-opacity:1.0000000;" />
+      <stop
+         style="stop-color:#bbbbb9;stop-opacity:1.0000000;"
+         offset="0.50000000"
+         id="stop4706" />
+      <stop
+         id="stop4702"
+         offset="1.0000000"
+         style="stop-color:#000000;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4688">
+      <stop
+         id="stop4690"
+         offset="0.0000000"
+         style="stop-color:#666666;stop-opacity:1.0000000;" />
+      <stop
+         id="stop4692"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4680"
+       inkscape:collect="always">
+      <stop
+         id="stop4682"
+         offset="0"
+         style="stop-color:#f7f6f5;stop-opacity:1;" />
+      <stop
+         id="stop4684"
+         offset="1"
+         style="stop-color:#f7f6f5;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4668">
+      <stop
+         id="stop4670"
+         offset="0"
+         style="stop-color:#8e8d87;stop-opacity:1;" />
+      <stop
+         style="stop-color:#cbc9c1;stop-opacity:1.0000000;"
+         offset="0.27586207"
+         id="stop4676" />
+      <stop
+         id="stop4672"
+         offset="1.0000000"
+         style="stop-color:#8e8d87;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#e0e0e0;stop-opacity:1.0000000;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.40546969"
+         id="stop4886" />
+      <stop
+         style="stop-color:#cdcdcd;stop-opacity:1.0000000;"
+         offset="0.53448278"
+         id="stop4884" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#494949;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       r="2.1227016"
+       fy="26.925594"
+       fx="9.1295490"
+       cy="26.925594"
+       cx="9.1295490"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1433"
+       xlink:href="#linearGradient4698"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="72.064316"
+       x2="9.9128132"
+       y1="57.227650"
+       x1="9.8698082"
+       gradientTransform="matrix(2.772086,0.000000,0.000000,0.360739,0.618718,2.883883)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1447"
+       xlink:href="#linearGradient4733"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="54.136139"
+       x2="10.338233"
+       y1="64.652260"
+       x1="10.338233"
+       gradientTransform="matrix(2.369844,0.000000,0.000000,0.421969,0.000000,2.000000)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1451"
+       xlink:href="#linearGradient4680"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="62.282467"
+       x2="9.7052784"
+       y1="70.724976"
+       x1="9.7316532"
+       gradientTransform="matrix(2.369844,0.000000,0.000000,0.421969,0.000000,2.000000)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1453"
+       xlink:href="#linearGradient4688"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="19.337463"
+       x2="20.717800"
+       y1="25.140253"
+       x1="20.771229"
+       gradientTransform="matrix(1.198769,0,0,0.853565,-0.143086,2.034513)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1456"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="25.247311"
+       x2="24.789707"
+       y1="3.6785457"
+       x1="25.056711"
+       gradientTransform="matrix(0.944939,0,0,1.076147,6.844577e-2,4.093177)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1459"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="58.831264"
+       x2="15.487823"
+       y1="32.539238"
+       x1="15.387969"
+       gradientTransform="matrix(1.490161,0,0,0.668741,8.895132e-2,2)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1464"
+       xlink:href="#linearGradient4762"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="88.294930"
+       x2="18.972126"
+       y1="88.294930"
+       x1="1.8456430"
+       gradientTransform="matrix(2.291824,0,0,0.434269,8.855179e-2,2)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1468"
+       xlink:href="#linearGradient4741"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="88.294933"
+       x2="18.972126"
+       y1="88.294933"
+       x1="1.8456431"
+       gradientTransform="matrix(2.30272,0,0,0.437918,0,0.584034)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1471"
+       xlink:href="#linearGradient4668"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="160"
+     inkscape:window-x="331"
+     inkscape:window-height="688"
+     inkscape:window-width="872"
+     inkscape:guide-bbox="true"
+     showguides="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:cy="-18.264187"
+     inkscape:cx="-72.591911"
+     inkscape:zoom="1"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.090196078"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     fill="#729fcf" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Print Document</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>document</rdf:li>
+            <rdf:li>lpr</rdf:li>
+            <rdf:li>print</rdf:li>
+            <rdf:li>local</rdf:li>
+            <rdf:li>laser</rdf:li>
+            <rdf:li>bubblejet</rdf:li>
+            <rdf:li>inkjet</rdf:li>
+            <rdf:li>print</rdf:li>
+            <rdf:li>output</rdf:li>
+            <rdf:li>cups</rdf:li>
+            <rdf:li>lpd</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1">
+    <g
+       style="display:inline"
+       id="g5022"
+       transform="matrix(2.411405e-2,0,0,1.929202e-2,45.48953,39.75228)">
+      <rect
+         y="-150.69685"
+         x="-1559.2523"
+         height="478.35718"
+         width="1339.6335"
+         id="rect4173"
+         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path5058"
+         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+         id="path5018"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <rect
+       ry="1.7115477"
+       rx="1.7115483"
+       y="36.004189"
+       x="4.75"
+       height="6.4915943"
+       width="38.4375"
+       id="rect4652"
+       style="fill:url(#linearGradient1471);fill-opacity:1;stroke:#595959;stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="cssssssssssss"
+       id="rect4609"
+       d="M 7.1308961,21.5 L 40.870615,21.5 C 41.255661,21.5 41.747648,21.788155 42.051049,22.223919 C 42.354451,22.659684 43.787518,24.83394 44.109448,25.297964 C 44.431378,25.761987 44.502397,26.201852 44.502397,26.774049 L 44.502397,38.850951 C 44.502397,39.764524 43.770402,40.5 42.861152,40.5 L 5.1403596,40.5 C 4.2311094,40.5 3.4991138,39.764524 3.4991138,38.850951 L 3.4991138,26.774049 C 3.4991138,26.280031 3.6002798,25.571641 3.9455202,25.120718 C 4.3811666,24.551713 5.5498664,22.57277 5.8581276,22.153118 C 6.1663887,21.733467 6.7324461,21.5 7.1308961,21.5 z "
+       style="color:#000000;fill:url(#linearGradient1468);fill-opacity:1;fill-rule:nonzero;stroke:#676767;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       sodipodi:nodetypes="cssssssss"
+       id="path4718"
+       d="M 7.705278,21.975532 C 7.20729,21.975532 6.5669691,22.107308 6.3043987,22.511224 L 4.4657443,25.339651 C 4.169761,25.794966 4.4993705,26.868141 5.3900051,26.868141 L 42.678553,26.868141 C 43.883282,26.868141 43.8868,25.858073 43.602814,25.428039 L 41.851714,22.776389 C 41.534204,22.295589 41.418956,21.975532 40.625945,21.975532 L 7.705278,21.975532 z "
+       style="fill:#fbfbfb;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1464);stroke-width:0.94696701;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 7.6002951,22.445756 L 40.374658,22.445756 C 40.739745,22.445756 41.206233,22.718629 41.493909,23.131283 C 41.781585,23.543938 42.788049,25.160945 43.093293,25.60036 C 43.398536,26.039775 43.528159,26.456312 43.528159,26.998164 L 43.528159,38.279261 C 43.528159,39.144385 43.394653,39.528356 42.532529,39.528356 L 5.530506,39.528356 C 4.6683828,39.528356 4.472593,39.144385 4.472593,38.279261 L 4.472593,26.998164 C 4.472593,26.530345 4.6930819,25.859523 5.0204282,25.432514 C 5.4334949,24.893685 6.1012112,23.461633 6.393495,23.064237 C 6.6857789,22.666841 7.222497,22.445756 7.6002951,22.445756 z "
+       id="path4750"
+       sodipodi:nodetypes="cssssssssssss" />
+    <path
+       sodipodi:nodetypes="ccccccc"
+       id="rect15391"
+       d="M 11.68177,4.4977642 L 36.313839,4.4977642 C 36.964072,4.4977642 37.487546,5.007949 37.487546,5.6416762 L 37.487546,24.348117 L 10.508063,24.348117 L 10.508063,5.6416762 C 10.508063,5.007949 11.031536,4.4977642 11.68177,4.4977642 z "
+       style="color:#000000;fill:url(#linearGradient1459);fill-opacity:1;fill-rule:nonzero;stroke:#898989;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+    <rect
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1456);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="rect15660"
+       width="25.000576"
+       height="18.836374"
+       x="11.498513"
+       y="5.4992466"
+       ry="0.17677675"
+       rx="0.17677672" />
+    <rect
+       ry="1.7115483"
+       rx="1.7115483"
+       y="27.375000"
+       x="6.8750000"
+       height="5.1875000"
+       width="33.750000"
+       id="rect4678"
+       style="fill:url(#linearGradient1451);fill-opacity:1.0000000;stroke:url(#linearGradient1453);stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
+    <path
+       transform="translate(0.000000,2.000000)"
+       d="M 10.871767 27.626486 A 1.2816310 1.2816310 0 1 1  8.3085046,27.626486 A 1.2816310 1.2816310 0 1 1  10.871767 27.626486 z"
+       sodipodi:ry="1.2816310"
+       sodipodi:rx="1.2816310"
+       sodipodi:cy="27.626486"
+       sodipodi:cx="9.5901356"
+       id="path4696"
+       style="fill:url(#radialGradient1433);fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:nodetypes="csscssssc"
+       id="path4731"
+       d="M 11.743718,25.416053 L 37.306218,25.478553 C 37.993716,25.480234 38.294038,25.107558 38.243718,24.478553 L 38.118718,22.916053 L 39.984835,22.916053 C 40.797335,22.916053 40.975035,23.108616 41.172335,23.478553 L 41.672335,24.416053 C 42.199130,25.403793 43.483508,26.390165 42.170495,26.390165 C 37.667784,26.390165 13.993718,26.041053 11.743718,25.416053 z "
+       style="fill:url(#linearGradient1447);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.36571429" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 42.9375,26.5 L 4.8125,26.5"
+       id="path4760"
+       sodipodi:nodetypes="cc" />
+    <g
+       transform="translate(0.000000,2.000000)"
+       style="opacity:0.43575415"
+       id="g4849">
+      <rect
+         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+         id="rect4831"
+         width="19.000000"
+         height="1.0000000"
+         x="14.000000"
+         y="5.0000000" />
+      <rect
+         y="7.0000000"
+         x="14.000000"
+         height="1.0000000"
+         width="19.000000"
+         id="rect4833"
+         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+         id="rect4835"
+         width="19.000000"
+         height="1.0000000"
+         x="14.000000"
+         y="9.0000000" />
+      <rect
+         y="11.000000"
+         x="14.000000"
+         height="1.0000000"
+         width="19.000000"
+         id="rect4837"
+         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+         id="rect4839"
+         width="11.000000"
+         height="1.0000000"
+         x="14.000000"
+         y="13.000000" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="arrow">
+    <path
+       sodipodi:nodetypes="cccccccc"
+       id="path8643"
+       d="M 21.02159,20.989431 L 27.989391,20.989431 L 27.989391,16.064984 L 31,16.064984 L 24.553756,8 L 17.435622,15.986875 L 21.023684,15.986875 L 21.02159,20.989431 z "
+       style="opacity:1;color:#000000;fill:#a7a7a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+  </g>
+</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/download.svg b/apps/files_pdfviewer/js/pdfjs/web/images/download.svg
new file mode 100755
index 00000000000..2922c4331a7
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/web/images/download.svg
@@ -0,0 +1,619 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="document-save.svg"
+   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
+   inkscape:version="0.46"
+   sodipodi:version="0.32"
+   id="svg2913"
+   height="48px"
+   width="48px"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective104" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5031"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5029"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient5027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6925">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="0"
+         id="stop6927" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:0;"
+         offset="1"
+         id="stop6929" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6901">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop6903" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:0;"
+         offset="1"
+         id="stop6905" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4991">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4993" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4995" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4991"
+       id="radialGradient4997"
+       cx="23.447077"
+       cy="6.4576745"
+       fx="23.447077"
+       fy="6.4576745"
+       r="19.0625"
+       gradientTransform="matrix(-1.314471,-1.006312e-2,-1.022964e-2,1.336221,46.22108,-4.909887)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2187"
+       inkscape:collect="always">
+      <stop
+         id="stop2189"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2191"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2187"
+       id="linearGradient1764"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914114,1.412791e-16,-1.412791e-16,0.914114,-3.868698,-2.706902)"
+       x1="33.059906"
+       y1="27.394117"
+       x2="12.624337"
+       y2="12.583769" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8662">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8664" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop8666" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8662"
+       id="radialGradient8668"
+       cx="24.837126"
+       cy="36.421127"
+       fx="24.837126"
+       fy="36.421127"
+       r="15.644737"
+       gradientTransform="matrix(1.000000,-7.816467e-32,-1.132409e-32,0.536723,-5.897962e-14,16.87306)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2555">
+      <stop
+         id="stop2557"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1.0000000;"
+         offset="0.50000000"
+         id="stop2561" />
+      <stop
+         id="stop2563"
+         offset="0.75000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         style="stop-color:#e1e1e1;stop-opacity:1.0000000;"
+         offset="0.84166664"
+         id="stop2565" />
+      <stop
+         id="stop2559"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4274">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.25490198;"
+         offset="0.0000000"
+         id="stop4276" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4278" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4264"
+       inkscape:collect="always">
+      <stop
+         id="stop4266"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop4268"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4254"
+       inkscape:collect="always">
+      <stop
+         id="stop4256"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4258"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4244">
+      <stop
+         id="stop4246"
+         offset="0.0000000"
+         style="stop-color:#e4e4e4;stop-opacity:1.0000000;" />
+      <stop
+         id="stop4248"
+         offset="1.0000000"
+         style="stop-color:#d3d3d3;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4236"
+       inkscape:collect="always">
+      <stop
+         id="stop4238"
+         offset="0"
+         style="stop-color:#eeeeee;stop-opacity:1;" />
+      <stop
+         id="stop4240"
+         offset="1"
+         style="stop-color:#eeeeee;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4228">
+      <stop
+         id="stop4230"
+         offset="0.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+      <stop
+         id="stop4232"
+         offset="1.0000000"
+         style="stop-color:#9f9f9f;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4184">
+      <stop
+         id="stop4186"
+         offset="0.0000000"
+         style="stop-color:#838383;stop-opacity:1.0000000;" />
+      <stop
+         id="stop4188"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:0.0000000;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(0.795493,3.799180)"
+       y2="35.281250"
+       x2="24.687500"
+       y1="35.281250"
+       x1="7.0625000"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4209"
+       xlink:href="#linearGradient4184"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="40.943935"
+       x2="36.183067"
+       y1="28.481176"
+       x1="7.6046205"
+       id="linearGradient4234"
+       xlink:href="#linearGradient4228"
+       inkscape:collect="always"
+       gradientTransform="translate(0.000000,5.125000)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="33.758667"
+       x2="12.221823"
+       y1="37.205811"
+       x1="12.277412"
+       id="linearGradient4242"
+       xlink:href="#linearGradient4236"
+       inkscape:collect="always"
+       gradientTransform="translate(0.000000,5.125000)" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.286242,0.781698,-0.710782,1.169552,-2.354348,0.248140)"
+       r="20.935817"
+       fy="2.9585190"
+       fx="15.571491"
+       cy="2.9585190"
+       cx="15.571491"
+       id="radialGradient4250"
+       xlink:href="#linearGradient4244"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="47.620636"
+       x2="44.096100"
+       y1="4.4331360"
+       x1="12.378357"
+       id="linearGradient4260"
+       xlink:href="#linearGradient4254"
+       inkscape:collect="always"
+       gradientTransform="translate(0.000000,5.125000)" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.651032,-2.885063e-16,9.455693)"
+       r="23.555494"
+       fy="27.096155"
+       fx="23.201941"
+       cy="27.096155"
+       cx="23.201941"
+       id="radialGradient4270"
+       xlink:href="#linearGradient4264"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="26.357183"
+       x2="23.688078"
+       y1="11.318835"
+       x1="23.688078"
+       id="linearGradient4272"
+       xlink:href="#linearGradient4274"
+       inkscape:collect="always"
+       gradientTransform="translate(0.000000,5.125000)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2555"
+       id="linearGradient2553"
+       x1="33.431175"
+       y1="31.964777"
+       x2="21.747974"
+       y2="11.780679"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6901"
+       id="linearGradient6907"
+       x1="14.751649"
+       y1="15.868432"
+       x2="8.8953285"
+       y2="16.743431"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6925"
+       id="linearGradient6931"
+       x1="12.25"
+       y1="18.25"
+       x2="7"
+       y2="21.118431"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="30"
+     inkscape:window-x="0"
+     inkscape:window-height="818"
+     inkscape:window-width="999"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="false"
+     inkscape:current-layer="layer2"
+     inkscape:cy="11.891468"
+     inkscape:cx="-133.68151"
+     inkscape:zoom="1"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.22745098"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     fill="#3465a4"
+     stroke="#204a87" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Save</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>hdd</rdf:li>
+            <rdf:li>hard drive</rdf:li>
+            <rdf:li>save</rdf:li>
+            <rdf:li>io</rdf:li>
+            <rdf:li>store</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:identifier />
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="pix"
+     id="layer2"
+     inkscape:groupmode="layer">
+    <g
+       style="display:inline"
+       id="g5022"
+       transform="matrix(2.411405e-2,0,0,1.929202e-2,45.48953,41.75228)">
+      <rect
+         y="-150.69685"
+         x="-1559.2523"
+         height="478.35718"
+         width="1339.6335"
+         id="rect4173"
+         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path5058"
+         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+         id="path5018"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <path
+       sodipodi:nodetypes="cccsccccccccc"
+       id="path4196"
+       d="M 11.28569,13.087628 C 10.66069,13.087628 10.254441,13.377808 10.004442,13.931381 C 10.004441,13.931381 3.5356915,31.034938 3.5356915,31.034938 C 3.5356915,31.034938 3.2856915,31.706497 3.2856915,32.816188 C 3.2856915,32.816188 3.2856915,42.466156 3.2856915,42.466156 C 3.2856915,43.548769 3.943477,44.091158 4.9419415,44.091156 L 43.50444,44.091156 C 44.489293,44.091156 45.09819,43.372976 45.09819,42.247406 L 45.09819,32.597438 C 45.09819,32.597438 45.204153,31.827015 45.00444,31.284938 L 38.28569,14.087631 C 38.101165,13.575725 37.648785,13.099533 37.16069,13.087628 L 11.28569,13.087628 z "
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#535353;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       id="path4170"
+       d="M 3.2735915,32.121812 L 4.0381936,31.429597 L 41.647883,31.492097 L 45.11029,31.809395 L 45.11029,42.247927 C 45.11029,43.373496 44.503272,44.091258 43.518419,44.091258 L 4.9354314,44.091258 C 3.9369667,44.091258 3.2735915,43.549207 3.2735915,42.466594 L 3.2735915,32.121812 z "
+       style="fill:url(#linearGradient4234);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.02044296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="csccccccs"
+       id="path3093"
+       d="M 3.5490842,31.039404 C 2.8347985,32.50369 3.5484686,33.432261 4.5847985,33.432261 C 4.5847985,33.432261 43.584797,33.432261 43.584797,33.432261 C 44.703844,33.408451 45.430035,32.420356 45.013368,31.289403 L 38.299082,14.078704 C 38.114558,13.566798 37.64432,13.090606 37.156225,13.078701 L 11.299083,13.078701 C 10.674083,13.078701 10.263369,13.382274 10.01337,13.935847 C 10.01337,13.935847 3.5490842,31.039404 3.5490842,31.039404 z "
+       style="fill:url(#radialGradient4250);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <rect
+       y="36.299183"
+       x="7.857996"
+       height="5.5625"
+       width="17.625"
+       id="rect4174"
+       style="opacity:1;color:#000000;fill:url(#linearGradient4209);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.40899992;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       sodipodi:nodetypes="cscc"
+       id="path4194"
+       d="M 7.8579947,41.86168 C 7.8579947,41.86168 7.8579947,37.850195 7.8579947,37.850195 C 9.6935221,41.029421 16.154485,41.86168 20.795492,41.86168 C 20.795492,41.86168 7.8579947,41.86168 7.8579947,41.86168 z "
+       style="opacity:0.81142853;fill:url(#linearGradient4242);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="cccccccc"
+       id="path4201"
+       d="M 44.796162,30.753688 C 44.859684,32.003662 44.382159,33.069528 43.474046,33.097438 C 43.474046,33.097438 5.3553296,33.097437 5.3553297,33.097438 C 4.0660978,33.097438 3.4875937,32.772491 3.271279,32.229382 C 3.3630404,33.173714 4.0970964,33.878688 5.3553297,33.878688 C 5.3553296,33.878687 43.474046,33.878688 43.474046,33.878688 C 44.550053,33.845617 45.226851,32.454664 44.82621,30.883897 L 44.796162,30.753688 z "
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path4211"
+       d="M 10.96875,15.28125 C 10.922675,15.481571 10.78125,15.668047 10.78125,15.875 C 10.78125,16.823605 11.37223,17.664474 12.125,18.46875 C 12.365268,18.314675 12.490117,18.114342 12.75,17.96875 C 11.809691,17.152746 11.196604,16.252168 10.96875,15.28125 z M 37.625,15.28125 C 37.396273,16.250866 36.782988,17.153676 35.84375,17.96875 C 36.117894,18.122332 36.247738,18.33699 36.5,18.5 C 37.257262,17.693344 37.8125,16.826956 37.8125,15.875 C 37.8125,15.668047 37.670906,15.481571 37.625,15.28125 z M 39.8125,23.71875 C 39.198709,27.758861 32.513887,30.96875 24.28125,30.96875 C 16.068996,30.968751 9.4211001,27.775964 8.78125,23.75 C 8.7488928,23.947132 8.65625,24.141882 8.65625,24.34375 C 8.6562503,28.661697 15.645354,32.187501 24.28125,32.1875 C 32.917146,32.1875 39.937499,28.661698 39.9375,24.34375 C 39.9375,24.130826 39.848449,23.926394 39.8125,23.71875 z "
+       style="opacity:0.69142857;color:#000000;fill:url(#linearGradient4272);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       transform="translate(8.838843e-2,5.301780)"
+       d="M 8.5736699 25.593554 A 1.3700194 1.016466 0 1 1  5.833631,25.593554 A 1.3700194 1.016466 0 1 1  8.5736699 25.593554 z"
+       sodipodi:ry="1.016466"
+       sodipodi:rx="1.3700194"
+       sodipodi:cy="25.593554"
+       sodipodi:cx="7.2036505"
+       id="path4224"
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.45762706;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.45762706;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path4226"
+       sodipodi:cx="7.2036505"
+       sodipodi:cy="25.593554"
+       sodipodi:rx="1.3700194"
+       sodipodi:ry="1.016466"
+       d="M 8.5736699 25.593554 A 1.3700194 1.016466 0 1 1  5.833631,25.593554 A 1.3700194 1.016466 0 1 1  8.5736699 25.593554 z"
+       transform="translate(33.96705,5.213390)" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4260);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 11.642515,13.540723 C 11.040823,13.540723 10.649724,13.820081 10.409049,14.35301 C 10.409048,14.35301 3.9940341,30.943732 3.9940341,30.943732 C 3.9940341,30.943732 3.7533573,31.590247 3.7533573,32.658555 C 3.7533573,32.658555 3.7533573,41.948651 3.7533573,41.948651 C 3.7533573,43.303391 4.1974134,43.57555 5.3478414,43.57555 L 43.034746,43.57555 C 44.357872,43.57555 44.569062,43.259153 44.569062,41.738058 L 44.569062,32.447962 C 44.569062,32.447962 44.671072,31.706271 44.478807,31.184409 L 37.885616,14.378434 C 37.707973,13.885617 37.334964,13.552184 36.865071,13.540723 L 11.642515,13.540723 z "
+       id="path4252"
+       sodipodi:nodetypes="cccsccccccccc" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
+       d="M 40.5,36.554166 L 40.5,41.575101"
+       id="path4282" />
+    <path
+       id="path4284"
+       d="M 38.5,36.613943 L 38.5,41.634878"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
+       d="M 36.5,36.613943 L 36.5,41.634878"
+       id="path4286" />
+    <path
+       id="path4288"
+       d="M 34.5,36.613943 L 34.5,41.634878"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
+       d="M 32.5,36.613943 L 32.5,41.634878"
+       id="path4290" />
+    <path
+       id="path4292"
+       d="M 30.5,36.613943 L 30.5,41.634878"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
+    <path
+       id="path4294"
+       d="M 39.5,36.604065 L 39.5,41.625"
+       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 37.5,36.663842 L 37.5,41.684777"
+       id="path4296" />
+    <path
+       id="path4298"
+       d="M 35.5,36.663842 L 35.5,41.684777"
+       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33.5,36.663842 L 33.5,41.684777"
+       id="path4300" />
+    <path
+       id="path4302"
+       d="M 31.5,36.663842 L 31.5,41.684777"
+       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path4572"
+       d="M 7.875,36.3125 L 7.875,41.84375 L 20.4375,41.84375 L 8.21875,41.5 L 7.875,36.3125 z "
+       style="opacity:0.43999999;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.20571427;color:#000000;fill:url(#linearGradient2553);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93365198;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.42372879;visibility:visible;display:inline;overflow:visible"
+       id="path2545"
+       sodipodi:cx="25"
+       sodipodi:cy="19.5625"
+       sodipodi:rx="14.875"
+       sodipodi:ry="6.6875"
+       d="M 39.875 19.5625 A 14.875 6.6875 0 1 1  10.125,19.5625 A 14.875 6.6875 0 1 1  39.875 19.5625 z"
+       transform="matrix(1.037815,0.000000,0.000000,1.060747,-1.632878,3.030370)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="down">
+    <path
+       transform="matrix(1.130190,1.178179e-16,7.918544e-17,-0.759601,-3.909725,53.66554)"
+       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
+       sodipodi:ry="8.3968935"
+       sodipodi:rx="15.644737"
+       sodipodi:cy="36.421127"
+       sodipodi:cx="24.837126"
+       id="path8660"
+       style="opacity:0.14117647;color:#000000;fill:url(#radialGradient8668);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+    <path
+       style="opacity:1;color:#000000;fill:url(#linearGradient6907);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient6931);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 3.2034501,25.835194 C 2.1729477,-5.3853369 28.741616,-0.4511153 28.582416,15.788689 L 35.89533,15.788689 L 24.517652,28.774671 L 12.585426,15.788689 C 12.585426,15.788689 20.126859,15.788689 20.126859,15.788689 C 20.583921,4.8193225 3.4092324,1.6100346 3.2034501,25.835194 z "
+       id="path1432"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccc"
+       id="path2177"
+       d="M 7.6642103,9.1041047 C 12.40638,-0.0400306 28.122336,2.7175443 27.761604,16.579393 L 34.078976,16.579393 C 34.078976,16.579393 24.513151,27.536769 24.513151,27.536769 L 14.41668,16.579393 C 14.41668,16.579393 20.87332,16.579393 20.87332,16.579393 C 21.144975,5.0041615 10.922265,5.5345215 7.6642103,9.1041047 z "
+       style="opacity:0.47159091;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1764);stroke-width:0.99999934;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+    <path
+       style="opacity:0.49431817;color:#000000;fill:url(#radialGradient4997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 34.767155,16.211613 L 32.782979,18.757322 C 27.372947,17.241029 24.896829,21.486664 17.109284,20.489112 L 13.247998,16.080077 L 20.434468,16.162862 C 20.483219,4.3164571 8.3443098,4.998966 5.0292663,13.627829 C 8.8372201,-1.2611216 27.893316,0.8064118 28.28332,16.114112 L 34.767155,16.211613 z "
+       id="path4989"
+       sodipodi:nodetypes="cccccccc" />
+  </g>
+</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/go-down.svg b/apps/files_pdfviewer/js/pdfjs/web/images/go-down.svg
new file mode 100755
index 00000000000..95b82afd11f
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/web/images/go-down.svg
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="go-down.svg"
+   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
+   inkscape:version="0.46"
+   sodipodi:version="0.32"
+   id="svg11300"
+   height="48px"
+   width="48px"
+   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
+   inkscape:export-xdpi="90.000000"
+   inkscape:export-ydpi="90.000000"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective24" />
+    <linearGradient
+       id="linearGradient1442">
+      <stop
+         id="stop1444"
+         offset="0"
+         style="stop-color:#73d216" />
+      <stop
+         id="stop1446"
+         offset="1.0000000"
+         style="stop-color:#4e9a06" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8662"
+       inkscape:collect="always">
+      <stop
+         id="stop8664"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop8666"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8650"
+       inkscape:collect="always">
+      <stop
+         id="stop8652"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop8654"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8662"
+       id="radialGradient1444"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,1.614716e-15,16.87306)"
+       cx="24.837126"
+       cy="36.421127"
+       fx="24.837126"
+       fy="36.421127"
+       r="15.644737" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1442"
+       id="radialGradient1469"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.871885e-16,-0.843022,1.020168,2.265228e-16,0.606436,42.58614)"
+       cx="35.292667"
+       cy="20.494493"
+       fx="35.292667"
+       fy="20.494493"
+       r="16.956199" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8650"
+       id="radialGradient1471"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.749427e-16,-2.046729,-1.557610,-2.853404e-16,44.11559,66.93275)"
+       cx="15.987216"
+       cy="1.5350308"
+       fx="15.987216"
+       fy="1.5350308"
+       r="17.171415" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="30"
+     inkscape:window-x="0"
+     inkscape:window-height="818"
+     inkscape:window-width="1280"
+     inkscape:showpageshadow="false"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:cy="23.239067"
+     inkscape:cx="15.972815"
+     inkscape:zoom="11.313708"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.25490196"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     fill="#4e9a06"
+     stroke="#4e9a06" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:title>Go Down</dc:title>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>go</rdf:li>
+            <rdf:li>lower</rdf:li>
+            <rdf:li>down</rdf:li>
+            <rdf:li>arrow</rdf:li>
+            <rdf:li>pointer</rdf:li>
+            <rdf:li>&gt;</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Andreas Nilsson</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1">
+    <path
+       transform="matrix(1.214466,0.000000,0.000000,0.595458,-6.163846,16.31275)"
+       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
+       sodipodi:ry="8.3968935"
+       sodipodi:rx="15.644737"
+       sodipodi:cy="36.421127"
+       sodipodi:cx="24.837126"
+       id="path8660"
+       style="opacity:0.20454545;color:#000000;fill:url(#radialGradient1444);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+    <g
+       id="g1464"
+       transform="matrix(-1.000000,0.000000,0.000000,-1.000000,47.02856,43.99921)">
+      <path
+         style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1469);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 14.519136,38.500000 L 32.524165,38.496094 L 32.524165,25.504468 L 40.519531,25.496656 L 23.374809,5.4992135 L 6.5285585,25.497284 L 14.524440,25.501074 L 14.519136,38.500000 z "
+         id="path8643"
+         sodipodi:nodetypes="cccccccc" />
+      <path
+         style="opacity:0.50802141;color:#000000;fill:url(#radialGradient1471);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+         d="M 39.429889,24.993467 L 32.023498,25.005186 L 32.026179,37.998023 L 16.647623,37.98887 C 17.417545,19.64788 27.370272,26.995797 32.029282,16.341991 L 39.429889,24.993467 z "
+         id="path8645"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         sodipodi:nodetypes="cccccccc"
+         id="path8658"
+         d="M 15.520704,37.496094 L 31.522109,37.500000 L 31.522109,24.507050 L 38.338920,24.491425 L 23.384644,7.0388396 L 8.6781173,24.495782 L 15.518018,24.501029 L 15.520704,37.496094 z "
+         style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
+    </g>
+  </g>
+</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/go-up.svg b/apps/files_pdfviewer/js/pdfjs/web/images/go-up.svg
new file mode 100755
index 00000000000..54263df3e53
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/web/images/go-up.svg
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="go-up.svg"
+   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
+   inkscape:version="0.46"
+   sodipodi:version="0.32"
+   id="svg11300"
+   height="48px"
+   width="48px"
+   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
+   inkscape:export-xdpi="90.000000"
+   inkscape:export-ydpi="90.000000"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective23" />
+    <linearGradient
+       id="linearGradient2304">
+      <stop
+         id="stop2306"
+         offset="0"
+         style="stop-color:#73d216" />
+      <stop
+         id="stop2308"
+         offset="1.0000000"
+         style="stop-color:#4e9a06" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8662"
+       inkscape:collect="always">
+      <stop
+         id="stop8664"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop8666"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8650"
+       inkscape:collect="always">
+      <stop
+         id="stop8652"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop8654"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8650"
+       id="radialGradient1438"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.749427e-16,-2.046729,1.557610,-2.853404e-16,2.767009,66.93275)"
+       cx="24.53788"
+       cy="0.40010813"
+       fx="24.53788"
+       fy="0.40010813"
+       r="17.171415" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2304"
+       id="radialGradient1441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.871885e-16,-0.843022,1.020168,2.265228e-16,0.606436,42.58614)"
+       cx="11.319205"
+       cy="22.454971"
+       fx="11.319205"
+       fy="22.454971"
+       r="16.956199" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8662"
+       id="radialGradient1444"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,1.614716e-15,16.87306)"
+       cx="24.837126"
+       cy="36.421127"
+       fx="24.837126"
+       fy="36.421127"
+       r="15.644737" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="30"
+     inkscape:window-x="0"
+     inkscape:window-height="818"
+     inkscape:window-width="1280"
+     inkscape:showpageshadow="false"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:cy="25.620377"
+     inkscape:cx="9.6380363"
+     inkscape:zoom="13.059378"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.25490196"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     fill="#73d216"
+     stroke="#73d216" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:title>Go Up</dc:title>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>go</rdf:li>
+            <rdf:li>higher</rdf:li>
+            <rdf:li>up</rdf:li>
+            <rdf:li>arrow</rdf:li>
+            <rdf:li>pointer</rdf:li>
+            <rdf:li>&gt;</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Andreas Nilsson</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1">
+    <path
+       transform="matrix(1.214466,0.000000,0.000000,0.595458,-6.163846,16.31275)"
+       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
+       sodipodi:ry="8.3968935"
+       sodipodi:rx="15.644737"
+       sodipodi:cy="36.421127"
+       sodipodi:cx="24.837126"
+       id="path8660"
+       style="opacity:0.29946521;color:#000000;fill:url(#radialGradient1444);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:nodetypes="cccccccc"
+       id="path8643"
+       d="M 14.491792,38.500000 L 32.469477,38.500000 L 32.469477,25.547437 L 40.500000,25.547437 L 23.374809,5.4992135 L 6.5285585,25.489471 L 14.497096,25.555762 L 14.491792,38.500000 z "
+       style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1441);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       sodipodi:nodetypes="cccscc"
+       id="path8645"
+       d="M 7.5855237,25.03253 L 14.995821,25.03253 L 15.062422,31.594339 C 20.718034,20.593878 31.055517,22.749928 31.656768,15.966674 C 31.656768,15.966674 23.366938,6.4219692 23.366938,6.4219692 L 7.5855237,25.03253 z "
+       style="opacity:0.50802141;color:#000000;fill:url(#radialGradient1438);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
+    <path
+       style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+       d="M 15.602735,37.500000 L 31.502578,37.500000 L 31.502578,24.507050 L 38.311576,24.507050 L 23.361206,7.0700896 L 8.6546798,24.550470 L 15.475049,24.528373 L 15.602735,37.500000 z "
+       id="path8658"
+       sodipodi:nodetypes="cccccccc" />
+  </g>
+</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/nav-outline.svg b/apps/files_pdfviewer/js/pdfjs/web/images/nav-outline.svg
new file mode 100755
index 00000000000..4d4323ce37e
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/web/images/nav-outline.svg
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg3007"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="nav-outline.svg">
+  <defs
+     id="defs3009">
+    <filter
+       inkscape:collect="always"
+       id="filter5333"
+       x="-0.16623206"
+       width="1.3324641"
+       y="-0.030014125"
+       height="1.0600282">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.47888561"
+         id="feGaussianBlur5335" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.945051"
+     inkscape:cx="20.614872"
+     inkscape:cy="23.423899"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="773"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3012">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill:#f0f0f0;fill-rule:evenodd;stroke:#808080;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
+       id="rect3783"
+       width="46.16272"
+       height="45.59861"
+       x="1.0341953"
+       y="0.99112236" />
+    <rect
+       style="fill:#404040;fill-opacity:1;stroke:none"
+       id="rect3787"
+       width="2.8205326"
+       height="2.7823999"
+       x="4.2307992"
+       y="4.093708" />
+    <rect
+       style="fill:#404040;fill-opacity:1;stroke:none"
+       id="rect5257"
+       width="24.68285"
+       height="1.4102663"
+       x="8.0855274"
+       y="4.657815" />
+    <rect
+       y="8.4185247"
+       x="8.4615984"
+       height="2.7823999"
+       width="2.8205326"
+       id="rect5259"
+       style="fill:#404040;fill-opacity:1;stroke:none" />
+    <rect
+       y="9.0766497"
+       x="12.410344"
+       height="1.4102663"
+       width="30.498053"
+       id="rect5261"
+       style="fill:#404040;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#404040;fill-opacity:1;stroke:none"
+       id="rect5263"
+       width="2.8205326"
+       height="2.7823999"
+       x="8.4615984"
+       y="13.307448" />
+    <rect
+       style="fill:#404040;fill-opacity:1;stroke:none"
+       id="rect5265"
+       width="24.972752"
+       height="1.4102663"
+       x="12.410344"
+       y="13.965573" />
+    <rect
+       y="17.444229"
+       x="4.3248172"
+       height="2.7823999"
+       width="2.8205326"
+       id="rect5267"
+       style="fill:#404040;fill-opacity:1;stroke:none" />
+    <rect
+       y="18.008337"
+       x="8.1795454"
+       height="1.4102663"
+       width="25.101433"
+       id="rect5269"
+       style="fill:#404040;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#404040;fill-opacity:1;stroke:none"
+       id="rect5271"
+       width="2.8205326"
+       height="2.7823999"
+       x="8.5556164"
+       y="21.769047" />
+    <rect
+       style="fill:#404040;fill-opacity:1;stroke:none"
+       id="rect5273"
+       width="28.782515"
+       height="1.4102663"
+       x="12.880433"
+       y="22.427172" />
+    <rect
+       y="26.65797"
+       x="13.475181"
+       height="2.7823999"
+       width="2.8205326"
+       id="rect5275"
+       style="fill:#404040;fill-opacity:1;stroke:none" />
+    <rect
+       y="27.316095"
+       x="17.479"
+       height="1.4102663"
+       width="23.681646"
+       id="rect5277"
+       style="fill:#404040;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#404040;fill-opacity:1;stroke:none"
+       id="rect5279"
+       width="2.8205326"
+       height="2.7823999"
+       x="8.5130949"
+       y="31.006269" />
+    <rect
+       style="fill:#404040;fill-opacity:1;stroke:none"
+       id="rect5281"
+       width="24.557148"
+       height="1.4102663"
+       x="12.592034"
+       y="31.636858" />
+    <rect
+       y="35.464046"
+       x="13.475181"
+       height="2.7823999"
+       width="2.8205326"
+       id="rect5283"
+       style="fill:#404040;fill-opacity:1;stroke:none" />
+    <rect
+       y="36.055695"
+       x="17.744923"
+       height="1.4102663"
+       width="18.577394"
+       id="rect5285"
+       style="fill:#404040;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#404040;fill-opacity:1;stroke:none"
+       id="rect5287"
+       width="2.8205326"
+       height="2.7823999"
+       x="13.54166"
+       y="40.35297" />
+    <rect
+       style="fill:#404040;fill-opacity:1;stroke:none"
+       id="rect5289"
+       width="23.080858"
+       height="1.4102663"
+       x="17.678442"
+       y="40.944618" />
+  </g>
+</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/nav-thumbs.svg b/apps/files_pdfviewer/js/pdfjs/web/images/nav-thumbs.svg
new file mode 100755
index 00000000000..8737b8cb633
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/web/images/nav-thumbs.svg
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg3007"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="nav-thumbs.svg">
+  <defs
+     id="defs3009">
+    <filter
+       inkscape:collect="always"
+       id="filter5333"
+       x="-0.16623206"
+       width="1.3324641"
+       y="-0.030014125"
+       height="1.0600282">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.47888561"
+         id="feGaussianBlur5335" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter5966">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.3570515"
+         id="feGaussianBlur5968" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.945051"
+     inkscape:cx="9.375932"
+     inkscape:cy="24.942259"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="773"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3012">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill:#484848;fill-rule:evenodd;stroke:#808080;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
+       id="rect3783"
+       width="46.16272"
+       height="45.59861"
+       x="1.0341953"
+       y="0.99112236" />
+    <rect
+       y="4.7876148"
+       x="14.359808"
+       height="12.764274"
+       width="9.7061672"
+       id="rect5960"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5966)"
+       transform="matrix(1.0465713,0,0,1.0642851,3.6426579,-2.1141417)" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect5958"
+       width="9.7061672"
+       height="12.764274"
+       x="18.897236"
+       y="3.1920807" />
+    <rect
+       transform="matrix(1.0465713,0,0,1.0642851,3.6426579,13.043433)"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5966)"
+       id="rect5970"
+       width="9.7061672"
+       height="12.764274"
+       x="14.359808"
+       y="4.7876148" />
+    <rect
+       y="18.349655"
+       x="18.897236"
+       height="12.764274"
+       width="9.7061672"
+       id="rect5972"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <rect
+       y="4.7876148"
+       x="14.359808"
+       height="12.764274"
+       width="9.7061672"
+       id="rect5974"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5966)"
+       transform="matrix(1.0465713,0,0,0.9368834,3.6426579,29.209842)" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect5976"
+       width="9.7061672"
+       height="11.833546"
+       x="18.897236"
+       y="33.906113" />
+    <rect
+       y="4.905829"
+       x="19.960924"
+       height="0.66480595"
+       width="7.7117486"
+       id="rect5995"
+       style="fill:#808080;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect6177"
+       width="3.6219761"
+       height="0.66480595"
+       x="19.960924"
+       y="6.0340419" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect6179"
+       width="7.7117486"
+       height="0.66480595"
+       x="19.960924"
+       y="7.2562728" />
+    <rect
+       y="8.3844862"
+       x="19.960924"
+       height="0.66480595"
+       width="5.6903667"
+       id="rect6181"
+       style="fill:#808080;fill-opacity:1;stroke:none" />
+    <rect
+       y="9.7007341"
+       x="19.960924"
+       height="0.66480595"
+       width="7.7117486"
+       id="rect6183"
+       style="fill:#808080;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect6185"
+       width="7.7117486"
+       height="0.66480595"
+       x="19.960924"
+       y="10.828948" />
+    <rect
+       y="12.051179"
+       x="19.960924"
+       height="0.66480595"
+       width="7.7117486"
+       id="rect6187"
+       style="fill:#808080;fill-opacity:1;stroke:none" />
+    <rect
+       y="14.213587"
+       x="23.204536"
+       height="0.66480595"
+       width="1.2245234"
+       id="rect6189"
+       style="fill:#808080;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect6209"
+       width="7.7117486"
+       height="0.66480595"
+       x="19.772888"
+       y="19.854652" />
+    <rect
+       y="39.08128"
+       x="19.913914"
+       height="0.66480595"
+       width="3.6219761"
+       id="rect6211"
+       style="fill:#808080;fill-opacity:1;stroke:none" />
+    <rect
+       y="22.205095"
+       x="19.772888"
+       height="0.66480595"
+       width="6.6305442"
+       id="rect6213"
+       style="fill:#808080;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect6215"
+       width="7.7587576"
+       height="0.66480595"
+       x="19.866905"
+       y="37.859051" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect6217"
+       width="7.7117486"
+       height="0.66480595"
+       x="19.772888"
+       y="21.029873" />
+    <rect
+       y="25.777771"
+       x="19.772888"
+       height="0.66480595"
+       width="7.7117486"
+       id="rect6219"
+       style="fill:#808080;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect6221"
+       width="7.7117486"
+       height="0.66480595"
+       x="19.772888"
+       y="27.000002" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect6223"
+       width="1.2245234"
+       height="0.66480595"
+       x="23.204536"
+       y="28.974375" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect6225"
+       width="3.6219761"
+       height="0.66480595"
+       x="19.960922"
+       y="42.983021" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect6227"
+       width="7.7117486"
+       height="0.66480595"
+       x="19.913914"
+       y="36.777847" />
+    <rect
+       y="35.602627"
+       x="19.913914"
+       height="0.66480595"
+       width="7.7117486"
+       id="rect6231"
+       style="fill:#808080;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect6233"
+       width="7.7117486"
+       height="0.66480595"
+       x="19.913914"
+       y="40.350525" />
+    <rect
+       y="41.572754"
+       x="19.913914"
+       height="0.66480595"
+       width="7.7117486"
+       id="rect6235"
+       style="fill:#808080;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#0000e6;fill-opacity:0.44444448;stroke:none"
+       id="rect6237"
+       width="3.5256658"
+       height="1.927364"
+       x="22.077036"
+       y="23.367346" />
+  </g>
+</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/zoom-in.svg b/apps/files_pdfviewer/js/pdfjs/web/images/zoom-in.svg
new file mode 100755
index 00000000000..6eaed448110
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/web/images/zoom-in.svg
@@ -0,0 +1,436 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg6431"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
+   sodipodi:docname="list-add.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs6433">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective70" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2091">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2093" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2095" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7916">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop7918" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.34020618;"
+         offset="1.0000000"
+         id="stop7920" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8662">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8664" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop8666" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8662"
+       id="radialGradient1503"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,-1.018989e-13,16.87306)"
+       cx="24.837126"
+       cy="36.421127"
+       fx="24.837126"
+       fy="36.421127"
+       r="15.644737" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2847">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2849" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:0;"
+         offset="1"
+         id="stop2851" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2847"
+       id="linearGradient1488"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,-1.242480,40.08170)"
+       x1="37.128052"
+       y1="29.729605"
+       x2="37.065414"
+       y2="26.194071" />
+    <linearGradient
+       id="linearGradient2831">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2833" />
+      <stop
+         id="stop2855"
+         offset="0.33333334"
+         style="stop-color:#5b86be;stop-opacity:1;" />
+      <stop
+         style="stop-color:#83a8d8;stop-opacity:0;"
+         offset="1"
+         id="stop2835" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2831"
+       id="linearGradient1486"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.30498,-6.043298)"
+       x1="13.478554"
+       y1="10.612206"
+       x2="15.419417"
+       y2="19.115122" />
+    <linearGradient
+       id="linearGradient2380">
+      <stop
+         style="stop-color:#b9cfe7;stop-opacity:1"
+         offset="0"
+         id="stop2382" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop2384" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2682">
+      <stop
+         style="stop-color:#3977c3;stop-opacity:1;"
+         offset="0"
+         id="stop2684" />
+      <stop
+         style="stop-color:#89aedc;stop-opacity:0;"
+         offset="1"
+         id="stop2686" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2682"
+       id="linearGradient2688"
+       x1="36.713837"
+       y1="31.455952"
+       x2="37.124462"
+       y2="24.842253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.77039,-5.765705)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2690">
+      <stop
+         style="stop-color:#c4d7eb;stop-opacity:1;"
+         offset="0"
+         id="stop2692" />
+      <stop
+         style="stop-color:#c4d7eb;stop-opacity:0;"
+         offset="1"
+         id="stop2694" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2690"
+       id="linearGradient2696"
+       x1="32.647972"
+       y1="30.748846"
+       x2="37.124462"
+       y2="24.842253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.77039,-5.765705)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2871">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2873" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop2875" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2402">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop2404" />
+      <stop
+         style="stop-color:#528ac5;stop-opacity:1;"
+         offset="1"
+         id="stop2406" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="linearGradient1493"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649176"
+       y1="26.048164"
+       x2="52.854097"
+       y2="26.048164" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2797">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2799" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2801" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="linearGradient1491"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649176"
+       y1="26.048164"
+       x2="52.854097"
+       y2="26.048164" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7179">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop7181" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop7183" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2316">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2318" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.65979379;"
+         offset="1"
+         id="stop2320" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1322">
+      <stop
+         id="stop1324"
+         offset="0.0000000"
+         style="stop-color:#729fcf" />
+      <stop
+         id="stop1326"
+         offset="1.0000000"
+         style="stop-color:#5187d6;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1322"
+       id="linearGradient4975"
+       x1="34.892849"
+       y1="36.422989"
+       x2="45.918697"
+       y2="48.547989"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-18.01785,-13.57119)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7179"
+       id="linearGradient7185"
+       x1="13.435029"
+       y1="13.604306"
+       x2="22.374878"
+       y2="23.554308"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7179"
+       id="linearGradient7189"
+       gradientUnits="userSpaceOnUse"
+       x1="13.435029"
+       y1="13.604306"
+       x2="22.374878"
+       y2="23.554308"
+       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,47.93934,50.02474)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2380"
+       id="linearGradient7180"
+       gradientUnits="userSpaceOnUse"
+       x1="62.513836"
+       y1="36.061237"
+       x2="15.984863"
+       y2="20.60858" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient7182"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2402"
+       id="linearGradient7184"
+       gradientUnits="userSpaceOnUse"
+       x1="18.935766"
+       y1="23.667896"
+       x2="53.588622"
+       y2="26.649362" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient7186"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7916"
+       id="linearGradient7922"
+       x1="16.874998"
+       y1="22.851799"
+       x2="27.900846"
+       y2="34.976799"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2091"
+       id="radialGradient2097"
+       cx="23.070683"
+       cy="35.127438"
+       fx="23.070683"
+       fy="35.127438"
+       r="10.319340"
+       gradientTransform="matrix(0.914812,1.265023e-2,-8.21502e-3,0.213562,2.253914,27.18889)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.15686275"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="-123.56934"
+     inkscape:cy="0.031886897"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="818"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:showpageshadow="false" />
+  <metadata
+     id="metadata6436">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Add</dc:title>
+        <dc:date>2006-01-04</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Andreas Nilsson</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://tango-project.org</dc:source>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>add</rdf:li>
+            <rdf:li>plus</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.10824742;fill:url(#radialGradient2097);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path1361"
+       sodipodi:cx="22.958872"
+       sodipodi:cy="34.94062"
+       sodipodi:rx="10.31934"
+       sodipodi:ry="2.320194"
+       d="M 33.278212 34.94062 A 10.31934 2.320194 0 1 1  12.639532,34.94062 A 10.31934 2.320194 0 1 1  33.278212 34.94062 z"
+       transform="matrix(1.550487,0,0,1.978714,-12.4813,-32.49103)" />
+    <path
+       style="font-size:59.901077px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;fill:#75a1d0;fill-opacity:1.0000000;stroke:#3465a4;stroke-width:1.0000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans"
+       d="M 27.514356,37.542682 L 27.514356,28.515722 L 37.492820,28.475543 L 37.492820,21.480219 L 27.523285,21.480219 L 27.514356,11.520049 L 20.498082,11.531210 L 20.502546,21.462362 L 10.512920,21.536022 L 10.477206,28.504561 L 20.511475,28.475543 L 20.518171,37.515896 L 27.514356,37.542682 z "
+       id="text1314"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="font-size:59.901077px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;opacity:0.40860215;fill:url(#linearGradient4975);fill-opacity:1.0000000;stroke:url(#linearGradient7922);stroke-width:1.0000006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans"
+       d="M 26.498702,36.533920 L 26.498702,27.499738 L 36.501304,27.499738 L 36.494607,22.475309 L 26.507630,22.475309 L 26.507630,12.480335 L 21.512796,12.498193 L 21.521725,22.475309 L 11.495536,22.493166 L 11.468750,27.466256 L 21.533143,27.475185 L 21.519750,36.502670 L 26.498702,36.533920 z "
+       id="path7076"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.31182796"
+       d="M 11.000000,25.000000 C 11.000000,26.937500 36.984375,24.031250 36.984375,24.968750 L 36.984375,21.968750 L 27.000000,22.000000 L 27.000000,12.034772 L 21.000000,12.034772 L 21.000000,22.000000 L 11.000000,22.000000 L 11.000000,25.000000 z "
+       id="path7914"
+       sodipodi:nodetypes="ccccccccc" />
+  </g>
+</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/zoom-out.svg b/apps/files_pdfviewer/js/pdfjs/web/images/zoom-out.svg
new file mode 100755
index 00000000000..5f109a05c38
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfjs/web/images/zoom-out.svg
@@ -0,0 +1,424 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg6431"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
+   sodipodi:docname="list-remove.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs6433">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective69" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2091">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2093" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2095" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2091"
+       id="radialGradient2097"
+       cx="23.070683"
+       cy="35.127438"
+       fx="23.070683"
+       fy="35.127438"
+       r="10.319340"
+       gradientTransform="matrix(0.914812,1.265023e-2,-8.21502e-3,0.213562,2.253914,27.18889)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient7916">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop7918" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.34020618;"
+         offset="1.0000000"
+         id="stop7920" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8662">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8664" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop8666" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8662"
+       id="radialGradient1503"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,-1.018989e-13,16.87306)"
+       cx="24.837126"
+       cy="36.421127"
+       fx="24.837126"
+       fy="36.421127"
+       r="15.644737" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2847">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2849" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:0;"
+         offset="1"
+         id="stop2851" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2847"
+       id="linearGradient1488"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,-1.242480,40.08170)"
+       x1="37.128052"
+       y1="29.729605"
+       x2="37.065414"
+       y2="26.194071" />
+    <linearGradient
+       id="linearGradient2831">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2833" />
+      <stop
+         id="stop2855"
+         offset="0.33333334"
+         style="stop-color:#5b86be;stop-opacity:1;" />
+      <stop
+         style="stop-color:#83a8d8;stop-opacity:0;"
+         offset="1"
+         id="stop2835" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2831"
+       id="linearGradient1486"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.30498,-6.043298)"
+       x1="13.478554"
+       y1="10.612206"
+       x2="15.419417"
+       y2="19.115122" />
+    <linearGradient
+       id="linearGradient2380">
+      <stop
+         style="stop-color:#b9cfe7;stop-opacity:1"
+         offset="0"
+         id="stop2382" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop2384" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2682">
+      <stop
+         style="stop-color:#3977c3;stop-opacity:1;"
+         offset="0"
+         id="stop2684" />
+      <stop
+         style="stop-color:#89aedc;stop-opacity:0;"
+         offset="1"
+         id="stop2686" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2682"
+       id="linearGradient2688"
+       x1="36.713837"
+       y1="31.455952"
+       x2="37.124462"
+       y2="24.842253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.77039,-5.765705)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2690">
+      <stop
+         style="stop-color:#c4d7eb;stop-opacity:1;"
+         offset="0"
+         id="stop2692" />
+      <stop
+         style="stop-color:#c4d7eb;stop-opacity:0;"
+         offset="1"
+         id="stop2694" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2690"
+       id="linearGradient2696"
+       x1="32.647972"
+       y1="30.748846"
+       x2="37.124462"
+       y2="24.842253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.77039,-5.765705)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2871">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2873" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop2875" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2402">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop2404" />
+      <stop
+         style="stop-color:#528ac5;stop-opacity:1;"
+         offset="1"
+         id="stop2406" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="linearGradient1493"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649176"
+       y1="26.048164"
+       x2="52.854097"
+       y2="26.048164" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2797">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2799" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2801" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="linearGradient1491"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649176"
+       y1="26.048164"
+       x2="52.854097"
+       y2="26.048164" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7179">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop7181" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop7183" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2316">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2318" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.65979379;"
+         offset="1"
+         id="stop2320" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1322">
+      <stop
+         id="stop1324"
+         offset="0.0000000"
+         style="stop-color:#729fcf" />
+      <stop
+         id="stop1326"
+         offset="1.0000000"
+         style="stop-color:#5187d6;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1322"
+       id="linearGradient4975"
+       x1="34.892849"
+       y1="36.422989"
+       x2="45.918697"
+       y2="48.547989"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-18.01785,-13.57119)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7179"
+       id="linearGradient7185"
+       x1="13.435029"
+       y1="13.604306"
+       x2="22.374878"
+       y2="23.554308"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7179"
+       id="linearGradient7189"
+       gradientUnits="userSpaceOnUse"
+       x1="13.435029"
+       y1="13.604306"
+       x2="22.374878"
+       y2="23.554308"
+       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,47.93934,50.02474)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2380"
+       id="linearGradient7180"
+       gradientUnits="userSpaceOnUse"
+       x1="62.513836"
+       y1="36.061237"
+       x2="15.984863"
+       y2="20.60858" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient7182"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2402"
+       id="linearGradient7184"
+       gradientUnits="userSpaceOnUse"
+       x1="18.935766"
+       y1="23.667896"
+       x2="53.588622"
+       y2="26.649362" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient7186"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7916"
+       id="linearGradient7922"
+       x1="16.874998"
+       y1="22.851799"
+       x2="27.900846"
+       y2="34.976799"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.10980392"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="-123.27226"
+     inkscape:cy="26.474252"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="818"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:showpageshadow="false" />
+  <metadata
+     id="metadata6436">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Remove</dc:title>
+        <dc:date>2006-01-04</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Andreas Nilsson</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://tango-project.org</dc:source>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>remove</rdf:li>
+            <rdf:li>delete</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="font-size:59.901077px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;fill:#75a1d0;fill-opacity:1.0000000;stroke:#3465a4;stroke-width:1.0000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans"
+       d="M 27.514356,28.359472 L 39.633445,28.475543 L 39.633445,21.480219 L 27.523285,21.480219 L 20.502546,21.462362 L 8.5441705,21.489147 L 8.5084565,28.457686 L 20.511475,28.475543 L 27.514356,28.359472 z "
+       id="text1314"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="font-size:59.901077px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;opacity:0.40860215;fill:url(#linearGradient4975);fill-opacity:1.0000000;stroke:url(#linearGradient7922);stroke-width:1.0000006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans"
+       d="M 38.579429,27.484113 L 38.588357,22.475309 L 9.5267863,22.493166 L 9.5000003,27.466256 L 38.579429,27.484113 z "
+       id="path7076"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.31182796"
+       d="M 9.0000000,25.000000 C 9.0000000,26.937500 39.125000,24.062500 39.125000,25.000000 L 39.125000,22.000000 L 9.0000000,22.000000 L 9.0000000,25.000000 z "
+       id="path7914"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
diff --git a/apps/files_pdfviewer/js/pdfview.js b/apps/files_pdfviewer/js/pdfview.js
new file mode 100755
index 00000000000..8f10b55b6f5
--- /dev/null
+++ b/apps/files_pdfviewer/js/pdfview.js
@@ -0,0 +1,738 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+/* FROM PDF.JS, ADAPTED */
+
+'use strict';
+
+var kDefaultURL = 'compressed.tracemonkey-pldi-09.pdf';
+var kDefaultScale = 1.25;
+var kDefaultScaleDelta = 1.1;
+var kCacheSize = 20;
+var kCssUnits = 96.0 / 72.0;
+var kScrollbarPadding = 40;
+var kMinScale = 0.25;
+var kMaxScale = 4.0;
+
+
+var Cache = function cacheCache(size) {
+  var data = [];
+  this.push = function cachePush(view) {
+    var i = data.indexOf(view);
+    if (i >= 0)
+      data.splice(i);
+    data.push(view);
+    if (data.length > size)
+      data.shift().update();
+  };
+};
+
+var cache = new Cache(kCacheSize);
+var currentPageNumber = 1;
+
+var PDFView = {
+  pages: [],
+  thumbnails: [],
+  currentScale: kDefaultScale,
+  initialBookmark: document.location.hash.substring(1),
+
+  setScale: function pdfViewSetScale(val, resetAutoSettings) {
+    var pages = this.pages;
+    for (var i = 0; i < pages.length; i++)
+      pages[i].update(val * kCssUnits);
+
+    if (this.currentScale != val)
+      this.pages[this.page - 1].scrollIntoView();
+    this.currentScale = val;
+
+    var event = document.createEvent('UIEvents');
+    event.initUIEvent('scalechange', false, false, window, 0);
+    event.scale = val;
+    event.resetAutoSettings = resetAutoSettings;
+    window.dispatchEvent(event);
+  },
+
+  parseScale: function pdfViewParseScale(value, resetAutoSettings) {
+    if ('custom' == value)
+      return;
+
+    var scale = parseFloat(value);
+    if (scale) {
+      this.setScale(scale, true);
+      return;
+    }
+
+    var currentPage = this.pages[this.page - 1];
+    var pageWidthScale = ($("#content").width() - kScrollbarPadding) /
+                          currentPage.width / kCssUnits;
+    var pageHeightScale = ($("#content").height() - kScrollbarPadding) /
+                           currentPage.height / kCssUnits;
+    if ('page-width' == value)
+      this.setScale(pageWidthScale, resetAutoSettings);
+    if ('page-height' == value)
+      this.setScale(pageHeightScale, resetAutoSettings);
+    if ('page-fit' == value) {
+      this.setScale(
+        Math.min(pageWidthScale, pageHeightScale), resetAutoSettings);
+    }
+  },
+
+  zoomIn: function pdfViewZoomIn() {
+    var newScale = Math.min(kMaxScale, this.currentScale * kDefaultScaleDelta);
+    this.setScale(newScale, true);
+  },
+
+  zoomOut: function pdfViewZoomOut() {
+    var newScale = Math.max(kMinScale, this.currentScale / kDefaultScaleDelta);
+    this.setScale(newScale, true);
+  },
+
+  set page(val) {
+    var pages = this.pages;
+    var input = document.getElementById('pageNumber');
+    if (!(0 < val && val <= pages.length)) {
+      var event = document.createEvent('UIEvents');
+      event.initUIEvent('pagechange', false, false, window, 0);
+      event.pageNumber = this.page;
+      window.dispatchEvent(event);
+      return;
+    }
+
+    currentPageNumber = val;
+    var event = document.createEvent('UIEvents');
+    event.initUIEvent('pagechange', false, false, window, 0);
+    event.pageNumber = val;
+    window.dispatchEvent(event);
+
+    // checking if the this.page was called from the updateViewarea function:
+    // avoiding the creation of two "set page" method (internal and public)
+    if (updateViewarea.inProgress)
+      return;
+
+    // Avoid scrolling the first page during loading
+    if (this.loading && val == 1)
+      return;
+
+    pages[val - 1].scrollIntoView();
+  },
+
+  get page() {
+    return currentPageNumber;
+  },
+
+  open: function pdfViewOpen(url, scale) {
+    document.title = PDFView.Ptitle;
+    this.url = url;
+    var self = this;
+    PDFJS.getPdf(
+      {
+        url: url,
+        progress: function getPdfProgress(evt) {
+          if (evt.lengthComputable)
+            self.progress(evt.loaded / evt.total);
+        },
+        error: self.error
+      },
+      function getPdfLoad(data) {
+        self.loading = true;
+        self.load(data, scale);
+        self.loading = false;
+      });
+  },
+
+  download: function pdfViewDownload() {
+    window.open(this.url + '#pdfjs.action=download', '_parent');
+  },
+
+  navigateTo: function pdfViewNavigateTo(dest) {
+    if (typeof dest === 'string')
+      dest = this.destinations[dest];
+    if (!(dest instanceof Array))
+      return; // invalid destination
+    // dest array looks like that: <page-ref> </XYZ|FitXXX> <args..>
+    var destRef = dest[0];
+    var pageNumber = destRef instanceof Object ?
+      this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] : (destRef + 1);
+    if (pageNumber) {
+      this.page = pageNumber;
+      var currentPage = this.pages[pageNumber - 1];
+      currentPage.scrollIntoView(dest);
+    }
+  },
+
+  getDestinationHash: function pdfViewGetDestinationHash(dest) {
+    if (typeof dest === 'string')
+      return '#' + escape(dest);
+    if (dest instanceof Array) {
+      var destRef = dest[0]; // see navigateTo method for dest format
+      var pageNumber = destRef instanceof Object ?
+        this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] :
+        (destRef + 1);
+      if (pageNumber) {
+        var pdfOpenParams = '#page=' + pageNumber;
+        if (isName(dest[1], 'XYZ')) {
+          var scale = (dest[4] || this.currentScale);
+          pdfOpenParams += '&zoom=' + (scale * 100);
+          if (dest[2] || dest[3]) {
+            pdfOpenParams += ',' + (dest[2] || 0) + ',' + (dest[3] || 0);
+          }
+        }
+        return pdfOpenParams;
+      }
+    }
+    return '';
+  },
+
+  error: function pdfViewError() {
+    var loadingIndicator = document.getElementById('loading');
+    loadingIndicator.innerHTML = 'Error';
+  },
+
+  progress: function pdfViewProgress(level) {
+    var percent = Math.round(level * 100);
+    var loadingIndicator = document.getElementById('loading');
+    loadingIndicator.innerHTML = 'Loading... ' + percent + '%';
+  },
+
+  load: function pdfViewLoad(data, scale) {
+    var loadingIndicator = document.getElementById('loading');
+    loadingIndicator.setAttribute('hidden', 'true');
+
+    var container = document.getElementById('viewer');
+    while (container.hasChildNodes())
+      container.removeChild(container.lastChild);
+
+    var pdf = new PDFJS.PDFDoc(data);
+    var pagesCount = pdf.numPages;
+    document.getElementById('numPages').innerHTML = pagesCount;
+    document.getElementById('pageNumber').max = pagesCount;
+
+    var pages = this.pages = [];
+    var pagesRefMap = {};
+    var thumbnails = this.thumbnails = [];
+    for (var i = 1; i <= pagesCount; i++) {
+      var page = pdf.getPage(i);
+      pages.push(new PageView(container, page, i, page.width, page.height,
+                              page.stats, this.navigateTo.bind(this)));
+      /*thumbnails.push(new ThumbnailView(sidebar, page, i,
+                                        page.width / page.height));*/
+      var pageRef = page.ref;
+      pagesRefMap[pageRef.num + ' ' + pageRef.gen + ' R'] = i;
+    }
+
+    this.setScale(scale || kDefaultScale, true);
+
+    /*this.pagesRefMap = pagesRefMap;
+    this.destinations = pdf.catalog.destinations;
+    if (pdf.catalog.documentOutline) {
+      this.outline = new DocumentOutlineView(pdf.catalog.documentOutline);
+      var outlineSwitchButton = document.getElementById('outlineSwitch');
+      outlineSwitchButton.removeAttribute('disabled');
+      this.switchSidebarView('outline');
+    }*/
+    this.page = 1;
+
+    /*if (this.initialBookmark) {
+      this.setHash(this.initialBookmark);
+      this.initialBookmark = null;
+    }
+    else
+      this.page = 1;*/
+  },
+
+  setHash: function pdfViewSetHash(hash) {
+    if (!hash)
+      return;
+
+    if (hash.indexOf('=') >= 0) {
+      // parsing query string
+      var paramsPairs = hash.split('&');
+      var params = {};
+      for (var i = 0; i < paramsPairs.length; ++i) {
+        var paramPair = paramsPairs[i].split('=');
+        params[paramPair[0]] = paramPair[1];
+      }
+      // borrowing syntax from "Parameters for Opening PDF Files"
+      if ('nameddest' in params) {
+        PDFView.navigateTo(params.nameddest);
+        return;
+      }
+      if ('page' in params) {
+        var pageNumber = (params.page | 0) || 1;
+        this.page = pageNumber;
+        if ('zoom' in params) {
+          var zoomArgs = params.zoom.split(','); // scale,left,top
+          // building destination array
+          var dest = [null, new Name('XYZ'), (zoomArgs[1] | 0),
+            (zoomArgs[2] | 0), (zoomArgs[0] | 0) / 100];
+          var currentPage = this.pages[pageNumber - 1];
+          currentPage.scrollIntoView(dest);
+        } else
+          this.page = params.page; // simple page
+        return;
+      }
+    } else if (/^\d+$/.test(hash)) // page number
+      this.page = hash;
+    else // named destination
+      PDFView.navigateTo(unescape(hash));
+  },
+
+  /*switchSidebarView: function pdfViewSwitchSidebarView(view) {
+    var thumbsScrollView = document.getElementById('sidebarScrollView');
+    var outlineScrollView = document.getElementById('outlineScrollView');
+    var thumbsSwitchButton = document.getElementById('thumbsSwitch');
+    var outlineSwitchButton = document.getElementById('outlineSwitch');
+    switch (view) {
+      case 'thumbs':
+        thumbsScrollView.removeAttribute('hidden');
+        outlineScrollView.setAttribute('hidden', 'true');
+        thumbsSwitchButton.setAttribute('data-selected', true);
+        outlineSwitchButton.removeAttribute('data-selected');
+        break;
+      case 'outline':
+        thumbsScrollView.setAttribute('hidden', 'true');
+        outlineScrollView.removeAttribute('hidden');
+        thumbsSwitchButton.removeAttribute('data-selected');
+        outlineSwitchButton.setAttribute('data-selected', true);
+        break;
+    }
+  },*/
+
+  getVisiblePages: function pdfViewGetVisiblePages() {
+    var pages = this.pages;
+    var kBottomMargin = 10;
+    var visiblePages = [];
+
+    var currentHeight = kBottomMargin;
+    var windowTop = window.pageYOffset;
+    for (var i = 1; i <= pages.length; ++i) {
+      var page = pages[i - 1];
+      var pageHeight = page.height * page.scale + kBottomMargin;
+      if (currentHeight + pageHeight > windowTop)
+        break;
+
+      currentHeight += pageHeight;
+    }
+
+    var windowBottom = window.pageYOffset + window.innerHeight;
+    for (; i <= pages.length && currentHeight < windowBottom; ++i) {
+      var singlePage = pages[i - 1];
+      visiblePages.push({ id: singlePage.id, y: currentHeight,
+                          view: singlePage });
+      currentHeight += singlePage.height * singlePage.scale + kBottomMargin;
+    }
+    return visiblePages;
+  }
+};
+
+var PageView = function pageView(container, content, id, pageWidth, pageHeight,
+                                 stats, navigateTo) {
+  this.id = id;
+  this.content = content;
+
+  var view = this.content.view;
+  this.x = view.x;
+  this.y = view.y;
+  this.width = view.width;
+  this.height = view.height;
+
+  var anchor = document.createElement('a');
+  anchor.name = '' + this.id;
+
+  var div = document.createElement('div');
+  div.id = 'pageContainer' + this.id;
+  div.className = 'page';
+
+  container.appendChild(anchor);
+  container.appendChild(div);
+
+  this.update = function pageViewUpdate(scale) {
+    this.scale = scale || this.scale;
+    div.style.width = (this.width * this.scale) + 'px';
+    
+    div.style.height = (this.height * this.scale) + 'px';
+
+    var container = document.getElementById('viewer');
+    container.style.left = (document.getElementById("content").offsetWidth-(this.width))/2 + 'px';
+    console.log(document.getElementById("content").offsetWidth,this.width);
+
+    while (div.hasChildNodes())
+      div.removeChild(div.lastChild);
+    div.removeAttribute('data-loaded');
+  };
+
+  function setupLinks(content, scale) {
+    function bindLink(link, dest) {
+      link.href = PDFView.getDestinationHash(dest);
+      link.onclick = function pageViewSetupLinksOnclick() {
+        if (dest)
+          PDFView.navigateTo(dest);
+        return false;
+      };
+    }
+
+    var links = content.getLinks();
+    for (var i = 0; i < links.length; i++) {
+      var link = document.createElement('a');
+      link.style.left = (Math.floor(links[i].x - view.x) * scale) + 'px';
+      link.style.top = (Math.floor(links[i].y - view.y) * scale) + 'px';
+      link.style.width = Math.ceil(links[i].width * scale) + 'px';
+      link.style.height = Math.ceil(links[i].height * scale) + 'px';
+      link.href = links[i].url || '';
+      if (!links[i].url)
+        bindLink(link, ('dest' in links[i]) ? links[i].dest : null);
+      div.appendChild(link);
+    }
+  }
+
+  this.getPagePoint = function pageViewGetPagePoint(x, y) {
+    var scale = PDFView.currentScale;
+    return this.content.rotatePoint(x / scale, y / scale);
+  };
+
+  this.scrollIntoView = function pageViewScrollIntoView(dest) {
+      if (!dest) {
+        div.scrollIntoView(true);
+        return;
+      }
+
+      var x = 0, y = 0;
+      var width = 0, height = 0, widthScale, heightScale;
+      var scale = 0;
+      switch (dest[1].name) {
+        case 'XYZ':
+          x = dest[2];
+          y = dest[3];
+          scale = dest[4];
+          break;
+        case 'Fit':
+        case 'FitB':
+          scale = 'page-fit';
+          break;
+        case 'FitH':
+        case 'FitBH':
+          y = dest[2];
+          scale = 'page-width';
+          break;
+        case 'FitV':
+        case 'FitBV':
+          x = dest[2];
+          scale = 'page-height';
+          break;
+        case 'FitR':
+          x = dest[2];
+          y = dest[3];
+          width = dest[4] - x;
+          height = dest[5] - y;
+          widthScale = (window.innerWidth - kScrollbarPadding) /
+            width / kCssUnits;
+          heightScale = (window.innerHeight - kScrollbarPadding) /
+            height / kCssUnits;
+          scale = Math.min(widthScale, heightScale);
+          break;
+        default:
+          return;
+      }
+
+      var boundingRect = [
+        this.content.rotatePoint(x, y),
+        this.content.rotatePoint(x + width, y + height)
+      ];
+
+      if (scale && scale !== PDFView.currentScale)
+        PDFView.setScale(scale, true);
+
+      setTimeout(function pageViewScrollIntoViewRelayout() {
+        // letting page to re-layout before scrolling
+        var scale = PDFView.currentScale;
+        var x = Math.min(boundingRect[0].x, boundingRect[1].x);
+        var y = Math.min(boundingRect[0].y, boundingRect[1].y);
+        var width = Math.abs(boundingRect[0].x - boundingRect[1].x);
+        var height = Math.abs(boundingRect[0].y - boundingRect[1].y);
+
+        // using temporary div to scroll it into view
+        var tempDiv = document.createElement('div');
+        tempDiv.style.position = 'absolute';
+        tempDiv.style.left = Math.floor(x * scale) + 'px';
+        tempDiv.style.top = Math.floor(y * scale) + 'px';
+        tempDiv.style.width = Math.ceil(width * scale) + 'px';
+        tempDiv.style.height = Math.ceil(height * scale) + 'px';
+        div.appendChild(tempDiv);
+        tempDiv.scrollIntoView(true);
+        div.removeChild(tempDiv);
+      }, 0);
+  };
+
+  this.draw = function pageviewDraw() {
+    if (div.hasChildNodes()) {
+      this.updateStats();
+      return false;
+    }
+
+    var canvas = document.createElement('canvas');
+    canvas.id = 'page' + this.id;
+    canvas.mozOpaque = true;
+    div.appendChild(canvas);
+
+    var scale = this.scale;
+    canvas.width = pageWidth * scale;
+    canvas.height = pageHeight * scale;
+
+    var ctx = canvas.getContext('2d');
+    ctx.save();
+    ctx.fillStyle = 'rgb(255, 255, 255)';
+    ctx.fillRect(0, 0, canvas.width, canvas.height);
+    ctx.restore();
+    ctx.translate(-this.x * scale, -this.y * scale);
+
+    stats.begin = Date.now();
+    this.content.startRendering(ctx, this.updateStats);
+
+    setupLinks(this.content, this.scale);
+    div.setAttribute('data-loaded', true);
+
+    return true;
+  };
+
+  this.updateStats = function pageViewUpdateStats() {
+    var t1 = stats.compile, t2 = stats.fonts, t3 = stats.render;
+    var str = 'Time to compile/fonts/render: ' +
+              (t1 - stats.begin) + '/' + (t2 - t1) + '/' + (t3 - t2) + ' ms';
+  };
+};
+
+var ThumbnailView = function thumbnailView(container, page, id, pageRatio) {
+  var anchor = document.createElement('a');
+  anchor.href = '#' + id;
+  anchor.onclick = function stopNivigation() {
+    PDFView.page = id;
+    return false;
+  };
+
+  var div = document.createElement('div');
+  div.id = 'thumbnailContainer' + id;
+  div.className = 'thumbnail';
+
+  anchor.appendChild(div);
+  container.appendChild(anchor);
+
+  this.draw = function thumbnailViewDraw() {
+    if (div.hasChildNodes())
+      return;
+
+    var canvas = document.createElement('canvas');
+    canvas.id = 'thumbnail' + id;
+    canvas.mozOpaque = true;
+
+    var maxThumbSize = 134;
+    canvas.width = pageRatio >= 1 ? maxThumbSize :
+      maxThumbSize * pageRatio;
+    canvas.height = pageRatio <= 1 ? maxThumbSize :
+      maxThumbSize / pageRatio;
+
+    div.setAttribute('data-loaded', true);
+    div.appendChild(canvas);
+
+    var ctx = canvas.getContext('2d');
+    ctx.save();
+    ctx.fillStyle = 'rgb(255, 255, 255)';
+    ctx.fillRect(0, 0, canvas.width, canvas.height);
+    ctx.restore();
+
+    var view = page.view;
+    var scaleX = (canvas.width / page.width);
+    var scaleY = (canvas.height / page.height);
+    ctx.translate(-view.x * scaleX, -view.y * scaleY);
+    div.style.width = (view.width * scaleX) + 'px';
+    div.style.height = (view.height * scaleY) + 'px';
+    div.style.lineHeight = (view.height * scaleY) + 'px';
+
+    page.startRendering(ctx, function thumbnailViewDrawStartRendering() {});
+  };
+};
+
+var DocumentOutlineView = function documentOutlineView(outline) {
+  var outlineView = document.getElementById('outlineView');
+
+  function bindItemLink(domObj, item) {
+    domObj.href = PDFView.getDestinationHash(item.dest);
+    domObj.onclick = function documentOutlineViewOnclick(e) {
+      PDFView.navigateTo(item.dest);
+      return false;
+    };
+  }
+
+  var queue = [{parent: outlineView, items: outline}];
+  while (queue.length > 0) {
+    var levelData = queue.shift();
+    var i, n = levelData.items.length;
+    for (i = 0; i < n; i++) {
+      var item = levelData.items[i];
+      var div = document.createElement('div');
+      div.className = 'outlineItem';
+      var a = document.createElement('a');
+      bindItemLink(a, item);
+      a.textContent = item.title;
+      div.appendChild(a);
+
+      if (item.items.length > 0) {
+        var itemsDiv = document.createElement('div');
+        itemsDiv.className = 'outlineItems';
+        div.appendChild(itemsDiv);
+        queue.push({parent: itemsDiv, items: item.items});
+      }
+
+      levelData.parent.appendChild(div);
+    }
+  }
+};
+
+function webViewerLoad(url) {
+  var scale = kDefaultScale;
+  PDFView.open(url, parseFloat(PDFView.parseScale(scale)));
+
+  if (!window.File || !window.FileReader || !window.FileList || !window.Blob)
+    document.getElementById('fileInput').setAttribute('hidden', 'true');
+  else
+    document.getElementById('fileInput').value = null;
+}
+
+window.addEventListener('unload', function webViewerUnload(evt) {
+  window.scrollTo(0, 0);
+}, true);
+
+function updateViewarea() {
+  var visiblePages = PDFView.getVisiblePages();
+  for (var i = 0; i < visiblePages.length; i++) {
+    var page = visiblePages[i];
+    if (PDFView.pages[page.id - 1].draw())
+      cache.push(page.view);
+  }
+
+  if (!visiblePages.length)
+    return;
+
+  updateViewarea.inProgress = true; // used in "set page"
+  var currentId = PDFView.page;
+  var firstPage = visiblePages[0];
+  PDFView.page = firstPage.id;
+  updateViewarea.inProgress = false;
+
+  var kViewerTopMargin = 52;
+  var pageNumber = firstPage.id;
+  var pdfOpenParams = '#page=' + pageNumber;
+  pdfOpenParams += '&zoom=' + Math.round(PDFView.currentScale * 100);
+  var currentPage = PDFView.pages[pageNumber - 1];
+  var topLeft = currentPage.getPagePoint(window.pageXOffset,
+    window.pageYOffset - firstPage.y - kViewerTopMargin);
+  pdfOpenParams += ',' + Math.round(topLeft.x) + ',' + Math.round(topLeft.y);
+}
+
+window.addEventListener('scroll', function webViewerScroll(evt) {
+  updateViewarea();
+}, true);
+
+window.addEventListener('resize', function webViewerResize(evt) {
+  if (document.getElementById('pageWidthOption').selected ||
+      document.getElementById('pageFitOption').selected)
+      PDFView.parseScale(document.getElementById('scaleSelect').value);
+  updateViewarea();
+});
+
+window.addEventListener('hashchange', function webViewerHashchange(evt) {
+  PDFView.setHash(document.location.hash.substring(1));
+});
+
+window.addEventListener('change', function webViewerChange(evt) {
+  var files = evt.target.files;
+  if (!files || files.length == 0)
+    return;
+
+  // Read the local file into a Uint8Array.
+  var fileReader = new FileReader();
+  fileReader.onload = function webViewerChangeFileReaderOnload(evt) {
+    var data = evt.target.result;
+    var buffer = new ArrayBuffer(data.length);
+    var uint8Array = new Uint8Array(buffer);
+
+    for (var i = 0; i < data.length; i++)
+      uint8Array[i] = data.charCodeAt(i);
+    PDFView.load(uint8Array);
+  };
+
+  // Read as a binary string since "readAsArrayBuffer" is not yet
+  // implemented in Firefox.
+  var file = files[0];
+  fileReader.readAsBinaryString(file);
+
+  document.title = PDFView.Ptitle;
+
+  // URL does not reflect proper document location - hiding some icons.
+  document.getElementById('download').setAttribute('hidden', 'true');
+}, true);
+
+window.addEventListener('scalechange', function scalechange(evt) {
+  var customScaleOption = document.getElementById('customScaleOption');
+  customScaleOption.selected = false;
+
+  if (!evt.resetAutoSettings &&
+       (document.getElementById('pageWidthOption').selected ||
+        document.getElementById('pageFitOption').selected)) {
+      updateViewarea();
+      return;
+  }
+
+  var options = document.getElementById('scaleSelect').options;
+  var predefinedValueFound = false;
+  var value = '' + evt.scale;
+  for (var i = 0; i < options.length; i++) {
+    var option = options[i];
+    if (option.value != value) {
+      option.selected = false;
+      continue;
+    }
+    option.selected = true;
+    predefinedValueFound = true;
+  }
+
+  if (!predefinedValueFound) {
+    customScaleOption.textContent = Math.round(evt.scale * 10000) / 100 + '%';
+    customScaleOption.selected = true;
+  }
+
+  updateViewarea();
+}, true);
+
+window.addEventListener('pagechange', function pagechange(evt) {
+  var page = evt.pageNumber;
+  if (document.getElementById('pageNumber').value != page)
+    document.getElementById('pageNumber').value = page;
+  document.getElementById('previous').disabled = (page <= 1);
+  document.getElementById('next').disabled = (page >= PDFView.pages.length);
+}, true);
+
+window.addEventListener('keydown', function keydown(evt) {
+  var curElement = document.activeElement;
+  var controlsElement = document.getElementById('controls2');
+  while (curElement) {
+    if (curElement === controlsElement)
+      return; // ignoring if the 'controls' element is focused
+    curElement = curElement.parentNode;
+  }
+  switch (evt.keyCode) {
+    case 61: // FF/Mac '='
+    case 107: // FF '+' and '='
+    case 187: // Chrome '+'
+      PDFView.zoomIn();
+      break;
+    case 109: // FF '-'
+    case 189: // Chrome '-'
+      PDFView.zoomOut();
+      break;
+    case 48: // '0'
+      PDFView.setScale(kDefaultScale, true);
+      break;
+  }
+});
+
+
diff --git a/apps/files_pdfviewer/js/viewer.js b/apps/files_pdfviewer/js/viewer.js
new file mode 100755
index 00000000000..2bdc5578588
--- /dev/null
+++ b/apps/files_pdfviewer/js/viewer.js
@@ -0,0 +1,55 @@
+viewer_is_shown = false;
+function hidePDFviewer() {
+  viewer_is_shown = false;
+  $('table').show();
+  $('#controls').html(oldcode);
+  $("#viewer").remove();
+  $("#loading").remove()
+  $("#controls").css({top:"3.5em",height:"2.8em",zIndex:200});
+  document.title = lastTitle;
+}
+function showPDFviewer(dir,filename){
+	if(!viewer_is_shown){
+                $("#editor").hide();
+                var url = OC.filePath('files','ajax','download.php')+'?files='+encodeURIComponent(filename)+"&dir="+encodeURIComponent(dir);
+                $('table').hide();
+                function im(path) { return OC.filePath('files_pdfviewer','js','pdfjs/web/images/'+path); }
+                oldcode = $("#controls").html();
+                $("#controls").empty();
+                $("#controls").html('&nbsp;&nbsp;<div id="controls2" style="display:inline;">      <button id="previous" onclick="PDFView.page--;" oncontextmenu="return false;">        <img src="'+im('go-up.svg')+'" align="top" height="10"/>        Previous      </button>      <button id="next" onclick="PDFView.page++;" oncontextmenu="return false;">        <img src="'+im('go-down.svg')+'" align="top" height="10"/>        Next      </button>      <div class="separator"></div>      <input style="width:25px;" type="number" id="pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1" />      <span>/</span>      <span id="numPages">--</span>      <div class="separator"></div>      <button id="zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" oncontextmenu="return false;">        <img src="'+im('zoom-out.svg')+'" align="top" height="10"/>      </button>      <button id="zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" oncontextmenu="return false;">        <img src="'+im('zoom-in.svg')+'" align="top" height="10"/>      </button>      <div class="separator"></div>      <select id="scaleSelect" onchange="PDFView.parseScale(this.value);" oncontextmenu="return false;">        <option id="customScaleOption" value="custom"></option>        <option value="0.5">50%</option>        <option value="0.75">75%</option>        <option value="1">100%</option>        <option value="1.25" selected="selected">125%</option>        <option value="1.5">150%</option>        <option value="2">200%</option>        <option id="pageWidthOption" value="page-width">Page Width</option>        <option id="pageFitOption" value="page-fit">Page Fit</option>      </select>      <div class="separator"></div>      <button id="print" onclick="window.print();" oncontextmenu="return false;">        <img src="'+im('document-print.svg')+'" align="top" height="10"/>        Print      </button>      <button id="download" title="Download" onclick="PDFView.download();" oncontextmenu="return false;">        <img src="'+im('download.svg')+'" align="top" height="10"/>        Download      </button><button id="close" title="Close viewer" onclick="hidePDFviewer();" oncontextmenu="return false;">x</button>       <span id="info">--</span>    </div>');
+                    oldcontent = $("#content").html();
+                    $("#content").html(oldcontent+'<div id="loading">Loading... 0%</div>    <div id="viewer"></div>');
+                    $("#controls").css({top:"0px",height:"3.5em",zIndex:200});
+                  lastTitle = document.title;
+                  PDFView.Ptitle = filename;
+                  PDFView.open(url,1.00);
+                  $("#pageWidthOption").attr("selected","selected");
+                  $("header").css({zIndex:0});
+                  viewer_is_shown = true;
+	}
+}
+
+var extrahtml = '<li id="extra" style="display:none;"><a title="" href="'+OC.webroot+"/apps/files_pdfviewer/lastopened.php"+'" style="background-image:url(/owncloud/apps/files_pdfviewer/css/history.png)">Last opened</a></li>';
+
+$(document).ready(function(){
+     if(location.href.indexOf("files")!=-1) {
+        PDFJS.workerSrc = OC.filePath('files_pdfviewer','js','pdfjs/build/pdf.js');
+	if(typeof FileActions!=='undefined'){
+		FileActions.register('application/pdf','Edit','',function(filename){
+			showPDFviewer($('#dir').val(),filename);
+		});
+		FileActions.setDefault('application/pdf','Edit');
+	}
+	OC.search.customResults.Text=function(row,item){
+		var text=item.link.substr(item.link.indexOf('file=')+5);
+		var a=row.find('a');
+		a.data('file',text);
+		a.attr('href','#');
+		a.click(function(){
+			var file=text.split('/').pop();
+			var dir=text.substr(0,text.length-file.length-1);
+			showFileEditor(dir,file);
+		});
+	}
+    }
+});
-- 
GitLab


From 1efb4a0c61427573ae3fa7c55cb9d20a157c29ea Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 27 Dec 2011 13:41:22 +0100
Subject: [PATCH 084/546] remove debug messages in console

---
 apps/files_pdfviewer/js/pdfview.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/files_pdfviewer/js/pdfview.js b/apps/files_pdfviewer/js/pdfview.js
index 8f10b55b6f5..5e546fd5580 100755
--- a/apps/files_pdfviewer/js/pdfview.js
+++ b/apps/files_pdfviewer/js/pdfview.js
@@ -354,7 +354,6 @@ var PageView = function pageView(container, content, id, pageWidth, pageHeight,
 
     var container = document.getElementById('viewer');
     container.style.left = (document.getElementById("content").offsetWidth-(this.width))/2 + 'px';
-    console.log(document.getElementById("content").offsetWidth,this.width);
 
     while (div.hasChildNodes())
       div.removeChild(div.lastChild);
-- 
GitLab


From f009ede753e53435c712517f152dfb3b69490e6f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 27 Dec 2011 14:09:22 +0100
Subject: [PATCH 085/546] some styling changes for the pdf viewer

---
 apps/files_pdfviewer/css/viewer.css | 10 +--------
 apps/files_pdfviewer/js/viewer.js   | 34 ++++++++++++++---------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/apps/files_pdfviewer/css/viewer.css b/apps/files_pdfviewer/css/viewer.css
index a4aad0addc1..cbab9e70dc2 100755
--- a/apps/files_pdfviewer/css/viewer.css
+++ b/apps/files_pdfviewer/css/viewer.css
@@ -13,14 +13,6 @@
   display: none;
 }
 
-/* === Toolbar === */
-#controls2 {
-  padding-top:2.8em;
-  width: 100%;
-  white-space:nowrap;
-  overflow: hidden;
-}
-
 .separator {
   display: inline;
   border-left: 1px solid #d3d3d3;
@@ -222,7 +214,7 @@ canvas {
 
 #viewer {
   /*overflow:auto;*/
-  margin: 44px 0px 0px 0px;
+  margin: 6.3em 0 0 0;
   margin-right:12.5em;
   padding: 8px 0px;
   position:static;
diff --git a/apps/files_pdfviewer/js/viewer.js b/apps/files_pdfviewer/js/viewer.js
index 2bdc5578588..94aae4e5ac2 100755
--- a/apps/files_pdfviewer/js/viewer.js
+++ b/apps/files_pdfviewer/js/viewer.js
@@ -5,27 +5,27 @@ function hidePDFviewer() {
   $('#controls').html(oldcode);
   $("#viewer").remove();
   $("#loading").remove()
-  $("#controls").css({top:"3.5em",height:"2.8em",zIndex:200});
   document.title = lastTitle;
 }
 function showPDFviewer(dir,filename){
 	if(!viewer_is_shown){
-                $("#editor").hide();
-                var url = OC.filePath('files','ajax','download.php')+'?files='+encodeURIComponent(filename)+"&dir="+encodeURIComponent(dir);
-                $('table').hide();
-                function im(path) { return OC.filePath('files_pdfviewer','js','pdfjs/web/images/'+path); }
-                oldcode = $("#controls").html();
-                $("#controls").empty();
-                $("#controls").html('&nbsp;&nbsp;<div id="controls2" style="display:inline;">      <button id="previous" onclick="PDFView.page--;" oncontextmenu="return false;">        <img src="'+im('go-up.svg')+'" align="top" height="10"/>        Previous      </button>      <button id="next" onclick="PDFView.page++;" oncontextmenu="return false;">        <img src="'+im('go-down.svg')+'" align="top" height="10"/>        Next      </button>      <div class="separator"></div>      <input style="width:25px;" type="number" id="pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1" />      <span>/</span>      <span id="numPages">--</span>      <div class="separator"></div>      <button id="zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" oncontextmenu="return false;">        <img src="'+im('zoom-out.svg')+'" align="top" height="10"/>      </button>      <button id="zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" oncontextmenu="return false;">        <img src="'+im('zoom-in.svg')+'" align="top" height="10"/>      </button>      <div class="separator"></div>      <select id="scaleSelect" onchange="PDFView.parseScale(this.value);" oncontextmenu="return false;">        <option id="customScaleOption" value="custom"></option>        <option value="0.5">50%</option>        <option value="0.75">75%</option>        <option value="1">100%</option>        <option value="1.25" selected="selected">125%</option>        <option value="1.5">150%</option>        <option value="2">200%</option>        <option id="pageWidthOption" value="page-width">Page Width</option>        <option id="pageFitOption" value="page-fit">Page Fit</option>      </select>      <div class="separator"></div>      <button id="print" onclick="window.print();" oncontextmenu="return false;">        <img src="'+im('document-print.svg')+'" align="top" height="10"/>        Print      </button>      <button id="download" title="Download" onclick="PDFView.download();" oncontextmenu="return false;">        <img src="'+im('download.svg')+'" align="top" height="10"/>        Download      </button><button id="close" title="Close viewer" onclick="hidePDFviewer();" oncontextmenu="return false;">x</button>       <span id="info">--</span>    </div>');
-                    oldcontent = $("#content").html();
-                    $("#content").html(oldcontent+'<div id="loading">Loading... 0%</div>    <div id="viewer"></div>');
-                    $("#controls").css({top:"0px",height:"3.5em",zIndex:200});
-                  lastTitle = document.title;
-                  PDFView.Ptitle = filename;
-                  PDFView.open(url,1.00);
-                  $("#pageWidthOption").attr("selected","selected");
-                  $("header").css({zIndex:0});
-                  viewer_is_shown = true;
+		$("#editor").hide();
+		var url = OC.filePath('files','ajax','download.php')+'?files='+encodeURIComponent(filename)+"&dir="+encodeURIComponent(dir);
+		$('table').hide();
+		function im(path) { return OC.filePath('files_pdfviewer','js','pdfjs/web/images/'+path); }
+		oldcode = $("#controls").html();
+		$("#controls").empty();
+		$("#controls").html('<button id="previous" onclick="PDFView.page--;" oncontextmenu="return false;"><img src="'+im('go-up.svg')+'" align="top" height="10"/>Previous</button><button id="next" onclick="PDFView.page++;" oncontextmenu="return false;"><img src="'+im('go-down.svg')+'" align="top" height="10"/>Next</button><div class="separator"></div><input style="width:25px;" type="number" id="pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1" /><span>/</span><span id="numPages">--</span><div class="separator"></div><button id="zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" oncontextmenu="return false;"><img src="'+im('zoom-out.svg')+'" align="top" height="10"/></button><button id="zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" oncontextmenu="return false;"><img src="'+im('zoom-in.svg')+
+			'" align="top" height="10"/></button><div class="separator"></div><select id="scaleSelect" onchange="PDFView.parseScale(this.value);" oncontextmenu="return false;"><option id="customScaleOption" value="custom"></option><option value="0.5">50%</option><option value="0.75">75%</option><option value="1">100%</option><option value="1.25" selected="selected">125%</option><option value="1.5">150%</option><option value="2">200%</option><option id="pageWidthOption" value="page-width">Page Width</option><option id="pageFitOption" value="page-fit">Page Fit</option></select><div class="separator"></div><button id="print" onclick="window.print();" oncontextmenu="return false;"><img src="'+im('document-print.svg')+'" align="top" height="10"/>Print</button><button id="download" title="Download" onclick="PDFView.download();" oncontextmenu="return false;">'+
+			'<img src="'+im('download.svg')+'" align="top" height="10"/>Download</button><button id="close" title="Close viewer" onclick="hidePDFviewer();" oncontextmenu="return false;">x</button><span id="info">--</span></div>');
+		oldcontent = $("#content").html();
+		$("#content").html(oldcontent+'<div id="loading">Loading... 0%</div>    <div id="viewer"></div>');
+		lastTitle = document.title;
+		PDFView.Ptitle = filename;
+		PDFView.open(url,1.00);
+		$("#pageWidthOption").attr("selected","selected");
+		$("header").css({zIndex:0});
+		viewer_is_shown = true;
 	}
 }
 
-- 
GitLab


From 5bff1c8ad1708cff4a61ef28a62901efc617ef01 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 27 Dec 2011 14:18:03 +0100
Subject: [PATCH 086/546] some coding style fixes for the pdf viewer

---
 apps/files_pdfviewer/js/viewer.js | 57 +++++++++++++------------------
 1 file changed, 24 insertions(+), 33 deletions(-)

diff --git a/apps/files_pdfviewer/js/viewer.js b/apps/files_pdfviewer/js/viewer.js
index 94aae4e5ac2..314a08b27e6 100755
--- a/apps/files_pdfviewer/js/viewer.js
+++ b/apps/files_pdfviewer/js/viewer.js
@@ -1,55 +1,46 @@
-viewer_is_shown = false;
 function hidePDFviewer() {
-  viewer_is_shown = false;
-  $('table').show();
-  $('#controls').html(oldcode);
-  $("#viewer").remove();
-  $("#loading").remove()
-  document.title = lastTitle;
+	showPDFviewer.shown = false;
+	$('table').show();
+	$('#controls').html(showPDFviewer.oldcode);
+	$("#viewer").remove();
+	$("#loading").remove()
+	document.title = showPDFviewer.lastTitle;
 }
+
 function showPDFviewer(dir,filename){
-	if(!viewer_is_shown){
+	if(!showPDFviewer.shown){
 		$("#editor").hide();
 		var url = OC.filePath('files','ajax','download.php')+'?files='+encodeURIComponent(filename)+"&dir="+encodeURIComponent(dir);
 		$('table').hide();
 		function im(path) { return OC.filePath('files_pdfviewer','js','pdfjs/web/images/'+path); }
-		oldcode = $("#controls").html();
+		showPDFviewer.oldcode = $("#controls").html();
 		$("#controls").empty();
 		$("#controls").html('<button id="previous" onclick="PDFView.page--;" oncontextmenu="return false;"><img src="'+im('go-up.svg')+'" align="top" height="10"/>Previous</button><button id="next" onclick="PDFView.page++;" oncontextmenu="return false;"><img src="'+im('go-down.svg')+'" align="top" height="10"/>Next</button><div class="separator"></div><input style="width:25px;" type="number" id="pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1" /><span>/</span><span id="numPages">--</span><div class="separator"></div><button id="zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" oncontextmenu="return false;"><img src="'+im('zoom-out.svg')+'" align="top" height="10"/></button><button id="zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" oncontextmenu="return false;"><img src="'+im('zoom-in.svg')+
 			'" align="top" height="10"/></button><div class="separator"></div><select id="scaleSelect" onchange="PDFView.parseScale(this.value);" oncontextmenu="return false;"><option id="customScaleOption" value="custom"></option><option value="0.5">50%</option><option value="0.75">75%</option><option value="1">100%</option><option value="1.25" selected="selected">125%</option><option value="1.5">150%</option><option value="2">200%</option><option id="pageWidthOption" value="page-width">Page Width</option><option id="pageFitOption" value="page-fit">Page Fit</option></select><div class="separator"></div><button id="print" onclick="window.print();" oncontextmenu="return false;"><img src="'+im('document-print.svg')+'" align="top" height="10"/>Print</button><button id="download" title="Download" onclick="PDFView.download();" oncontextmenu="return false;">'+
 			'<img src="'+im('download.svg')+'" align="top" height="10"/>Download</button><button id="close" title="Close viewer" onclick="hidePDFviewer();" oncontextmenu="return false;">x</button><span id="info">--</span></div>');
-		oldcontent = $("#content").html();
-		$("#content").html(oldcontent+'<div id="loading">Loading... 0%</div>    <div id="viewer"></div>');
-		lastTitle = document.title;
+		var oldcontent = $("#content").html();
+		$("#content").html(oldcontent+'<div id="loading">Loading... 0%</div><div id="viewer"></div>');
+		showPDFviewer.lastTitle = document.title;
 		PDFView.Ptitle = filename;
 		PDFView.open(url,1.00);
 		$("#pageWidthOption").attr("selected","selected");
-		$("header").css({zIndex:0});
-		viewer_is_shown = true;
+		showPDFviewer.shown = true;
 	}
 }
+showPDFviewer.shown=false;
+showPDFviewer.oldCode='';
+showPDFviewer.lastTitle='';
 
 var extrahtml = '<li id="extra" style="display:none;"><a title="" href="'+OC.webroot+"/apps/files_pdfviewer/lastopened.php"+'" style="background-image:url(/owncloud/apps/files_pdfviewer/css/history.png)">Last opened</a></li>';
 
 $(document).ready(function(){
-     if(location.href.indexOf("files")!=-1) {
-        PDFJS.workerSrc = OC.filePath('files_pdfviewer','js','pdfjs/build/pdf.js');
-	if(typeof FileActions!=='undefined'){
-		FileActions.register('application/pdf','Edit','',function(filename){
-			showPDFviewer($('#dir').val(),filename);
-		});
-		FileActions.setDefault('application/pdf','Edit');
-	}
-	OC.search.customResults.Text=function(row,item){
-		var text=item.link.substr(item.link.indexOf('file=')+5);
-		var a=row.find('a');
-		a.data('file',text);
-		a.attr('href','#');
-		a.click(function(){
-			var file=text.split('/').pop();
-			var dir=text.substr(0,text.length-file.length-1);
-			showFileEditor(dir,file);
-		});
+	if(location.href.indexOf("files")!=-1) {
+		PDFJS.workerSrc = OC.filePath('files_pdfviewer','js','pdfjs/build/pdf.js');
+		if(typeof FileActions!=='undefined'){
+			FileActions.register('application/pdf','Edit','',function(filename){
+				showPDFviewer($('#dir').val(),filename);
+			});
+			FileActions.setDefault('application/pdf','Edit');
+		}
 	}
-    }
 });
-- 
GitLab


From 95b9f4ed2325240411d4e349277c743aef06de6c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Tue, 27 Dec 2011 12:35:29 -0500
Subject: [PATCH 087/546] Fix folder names with + characters in it

---
 files/index.php               | 2 +-
 files/js/fileactions.js       | 2 +-
 files/templates/part.list.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/index.php b/files/index.php
index 7e156130d8e..189917150ad 100644
--- a/files/index.php
+++ b/files/index.php
@@ -71,7 +71,7 @@ $breadcrumb = array();
 $pathtohere = "";
 foreach( explode( "/", $dir ) as $i ){
 	if( $i != "" ){
-		$pathtohere .= "/$i";
+		$pathtohere .= "/".urlencode($i);
 		$breadcrumb[] = array( "dir" => $pathtohere, "name" => $i );
 	}
 }
diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index 9e2688e82c1..4b90ab8cf49 100644
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -137,7 +137,7 @@ FileActions.register('all','Rename',function(){return OC.imagePath('core','actio
 });
 
 FileActions.register('dir','Open','',function(filename){
-	window.location='index.php?dir='+$('#dir').val()+'/'+filename;
+	window.location='index.php?dir='+encodeURIComponent($('#dir').val())+'/'+encodeURIComponent(filename);
 });
 
 FileActions.setDefault('dir','Open');  
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index 46830ba3a37..157ec4ef42c 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -5,10 +5,10 @@
 			$relative_modified_date = relative_modified_date($file['mtime']);
 			$relative_date_color = round((time()-$file['mtime'])/60/60/24*14); // the older the file, the brighter the shade of grey; days*14
 			if($relative_date_color>200) $relative_date_color = 200; ?>
-			<tr data-file="<?php echo str_replace('+','%20',urlencode($file['name']));?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>'>
+			<tr data-file="<?php echo str_replace('+','%2B',urlencode($file['name']));?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>'>
 				<td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo mimetype_icon('dir'); else echo mimetype_icon($file['mime']); ?>)">
 					<?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" /><?php } ?>
-					<a class="name" href="<?php if($file['type'] == 'dir') echo $_['baseURL'].$file['directory'].'/'.$file['name']; else echo $_['downloadURL'].urlencode($file['directory']).'/'.urlencode($file['name']); ?>" title="">
+					<a class="name" href="<?php if($file['type'] == 'dir') echo $_['baseURL'].str_replace('%2F','/',urlencode($file['directory'])).'/'.urlencode($file['name']); else echo $_['downloadURL'].str_replace('%2F','/',urlencode($file['directory'])).'/'.urlencode($file['name']); ?>" title="">
 					<span class="nametext">
 						<?php if($file['type'] == 'dir'):?>
 							<?php echo htmlspecialchars($file['name']);?>
-- 
GitLab


From 1cddfe8820b37eeca5c814ea9a48ebd3abab23ea Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Tue, 27 Dec 2011 12:43:58 -0500
Subject: [PATCH 088/546] Keep the urls pretty, decode forward slashes

---
 files/js/fileactions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index 4b90ab8cf49..6f0729e43b6 100644
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -137,7 +137,7 @@ FileActions.register('all','Rename',function(){return OC.imagePath('core','actio
 });
 
 FileActions.register('dir','Open','',function(filename){
-	window.location='index.php?dir='+encodeURIComponent($('#dir').val())+'/'+encodeURIComponent(filename);
+	window.location='index.php?dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
 });
 
 FileActions.setDefault('dir','Open');  
-- 
GitLab


From 5fd595c0bfcd3fb8857f62aa9efb28a2669a0301 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 27 Dec 2011 21:48:04 +0100
Subject: [PATCH 089/546] Calendar: add loading indicator

---
 apps/calendar/css/style.css          |  2 ++
 apps/calendar/js/calendar.js         | 23 +++++++++++++++++++++++
 apps/calendar/templates/calendar.php |  1 +
 3 files changed, 26 insertions(+)

diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
index 0204f2fc12f..6555c25a767 100644
--- a/apps/calendar/css/style.css
+++ b/apps/calendar/css/style.css
@@ -17,6 +17,8 @@
 #editentry_dialog {display: none;}
 #parsingfail_dialog{display: none;}
 
+#loading { display: none; left: 40%; position: fixed; top: 4.4em; z-index: 100; }
+
 #calendar_holder {position: relative;bottom: 0; right: 0; left: 0; top: 3em;}
 .fc-content{padding:2px 4px;}
 #listview {margin: 0; padding: 10px; background: #EEEEEE;}
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index c3644b53704..6e0a450f6a8 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -8,7 +8,15 @@
 
 Calendar={
 	UI:{
+		loading: function(isLoading){
+			if (isLoading){
+				$('#loading').show();
+			}else{
+				$('#loading').hide();
+			}
+		},
 		startEventDialog:function(){
+			Calendar.UI.loading(false);
 			$('.tipsy').remove();
 			$('#calendar_holder').fullCalendar('unselect');
 			Calendar.UI.lockTime();
@@ -41,6 +49,7 @@ Calendar={
 				// TODO: save event
 				$('#event').dialog('destroy').remove();
 			}else{
+				Calendar.UI.loading(true);
 				$('#dialog_holder').load(OC.filePath('calendar', 'ajax', 'neweventform.php'), {start:start, end:end, allday:allday?1:0}, Calendar.UI.startEventDialog);
 			}
 		},
@@ -50,13 +59,16 @@ Calendar={
 				// TODO: save event
 				$('#event').dialog('destroy').remove();
 			}else{
+				Calendar.UI.loading(true);
 				$('#dialog_holder').load(OC.filePath('calendar', 'ajax', 'editeventform.php') + '?id=' + id, Calendar.UI.startEventDialog);
 			}
 		},
 		submitDeleteEventForm:function(url){
 			var post = $( '#event_form' ).serialize();
 			$('#errorbox').empty();
+			Calendar.UI.loading(true);
 			$.post(url, post, function(data){
+					Calendar.UI.loading(false);
 					if(data.status == 'success'){
 						$('#calendar_holder').fullCalendar('removeEvents', $('#event_form input[name=id]').val());
 						$('#event').dialog('destroy').remove();
@@ -69,8 +81,10 @@ Calendar={
 		validateEventForm:function(url){
 			var post = $( "#event_form" ).serialize();
 			$("#errorbox").empty();
+			Calendar.UI.loading(true);
 			$.post(url, post,
 				function(data){
+					Calendar.UI.loading(false);
 					if(data.status == "error"){
 						var output = missing_field + ": <br />";
 						if(data.title == "true"){
@@ -107,8 +121,10 @@ Calendar={
 		},
 		moveEvent:function(event, dayDelta, minuteDelta, allDay, revertFunc){
 			$('.tipsy').remove();
+			Calendar.UI.loading(true);
 			$.post(OC.filePath('calendar', 'ajax', 'moveevent.php'), { id: event.id, dayDelta: dayDelta, minuteDelta: minuteDelta, allDay: allDay?1:0, lastmodified: event.lastmodified},
 			function(data) {
+				Calendar.UI.loading(false);
 				if (data.status == 'success'){
 					event.lastmodified = data.lastmodified;
 					console.log("Event moved successfully");
@@ -120,8 +136,10 @@ Calendar={
 		},
 		resizeEvent:function(event, dayDelta, minuteDelta, revertFunc){
 			$('.tipsy').remove();
+			Calendar.UI.loading(true);
 			$.post(OC.filePath('calendar', 'ajax', 'resizeevent.php'), { id: event.id, dayDelta: dayDelta, minuteDelta: minuteDelta, lastmodified: event.lastmodified},
 			function(data) {
+				Calendar.UI.loading(false);
 				if (data.status == 'success'){
 					event.lastmodified = data.lastmodified;
 					console.log("Event resized successfully");
@@ -210,6 +228,7 @@ Calendar={
 				if($('#choosecalendar_dialog').dialog('isOpen') == true){
 					$('#choosecalendar_dialog').dialog('moveToTop');
 				}else{
+					Calendar.UI.loading(true);
 					$('#dialog_holder').load(OC.filePath('calendar', 'ajax', 'choosecalendar.php'), function(){
 						$('#choosecalendar_dialog').dialog({
 							width : 600,
@@ -217,13 +236,16 @@ Calendar={
 								$(this).dialog('destroy').remove();
 							}
 						});
+						Calendar.UI.loading(false);
 					});
 				}
 			},
 			activation:function(checkbox, calendarid)
 			{
+				Calendar.UI.loading(true);
 				$.post(OC.filePath('calendar', 'ajax', 'activation.php'), { calendarid: calendarid, active: checkbox.checked?1:0 },
 				  function(data) {
+					Calendar.UI.loading(false);
 					if (data.status == 'success'){
 						checkbox.checked = data.active == 1;
 						if (data.active == 1){
@@ -520,6 +542,7 @@ $(document).ready(function(){
 				}
 			});
 		},
+		loading: Calendar.UI.loading,
 		eventSources: eventSources
 	});
 	$('#oneweekview_radio').click(function(){
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 2003b7efc49..13bc8bc1bb1 100755
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -19,6 +19,7 @@
 				var missing_field_dberror = '<?php echo $l->t('There was a database fail') ?>';
 				var totalurl = '<?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?>/calendars';
 				</script>
+				<div id="loading"><img src="<?php echo OC_Helper::imagePath('core', 'loading.gif'); ?>" /></div>
 				<div id="controls">
 					<div>
 						<form>
-- 
GitLab


From 16e4e6dcc30959f733dad3b75dda3153ffcfa73f Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 27 Dec 2011 22:44:52 +0100
Subject: [PATCH 090/546] Contacts: small merge cleanups

---
 apps/contacts/README.tanghus      | 22 ----------------------
 apps/contacts/css/styles.css      |  2 +-
 apps/contacts/lib/addressbook.php |  6 ++----
 3 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 apps/contacts/README.tanghus

diff --git a/apps/contacts/README.tanghus b/apps/contacts/README.tanghus
deleted file mode 100644
index 28043063fcc..00000000000
--- a/apps/contacts/README.tanghus
+++ /dev/null
@@ -1,22 +0,0 @@
-As I like to run regular, automated backups of my PIM data I looked into an 
-easy way of getting the direct link to an address book, and noticed the 
-elegant way it was possible in the calendar, where you can click on the 
-'Calendars' button and download it directly.
-I modified the export.php script for the contacts app and can now run backups 
-with wget and http authentication. Hence the name 'tanghus_remote_backup' for
-this branch.
-Then I implemented the nice popup window function to get an UI for it and one 
-thing lead to another: 
-
-As for the Calendar app there's a js popup for address book activation, CardDAV link, export, 
-edit, delete and add address books.
-
-When making changes to the address books the contact list is updated to show the
-contacts in the active address book(s).
-
-When an address book is activated the setting is saved using OC_Preferences::setValue().
-
-Most of the code is copy/paste from the Calendar and Contacts apps ;-)
-
-Tested with fresh clone from git@gitorious.org:~tanghus/owncloud/tanghus-owncloud.git, removed
-database and config.php.
\ No newline at end of file
diff --git a/apps/contacts/css/styles.css b/apps/contacts/css/styles.css
index 048f4cf9d2d..f961767a0d6 100644
--- a/apps/contacts/css/styles.css
+++ b/apps/contacts/css/styles.css
@@ -1,4 +1,4 @@
-#chooseaddressbook {margin-right: 170px; float: right; font-size: 12px;}
+#chooseaddressbook {margin-right: 170px; float: right;}
 #contacts_details_name { font-weight:bold;font-size:1.1em;margin-left:25%;}
 #contacts_details_photo { margin:.5em 0em .5em 25%; }
 
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 7d55a00d601..6f2f34225de 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -145,7 +145,7 @@ class OC_Contacts_Addressbook{
 	 * @param integer $uid User id. If null current user will be used.
 	 * @return array
 	 */
-	public static function activeIds($uid){
+	public static function activeIds($uid = null){
 		if(is_null($uid)){
 			$uid = OC_User::getUser();
 		}
@@ -221,9 +221,7 @@ class OC_Contacts_Addressbook{
 	 * @return boolean
 	 */
 	public static function isActive($id){
-		//if(defined("DEBUG") && DEBUG) {
-			OC_Log::write('contacts','OC_Contacts_Addressbook::isActive('.$id.'):'.in_array($id, self::activeIds()),OC_Log::DEBUG);
-		//}
+		OC_Log::write('contacts','OC_Contacts_Addressbook::isActive('.$id.'):'.in_array($id, self::activeIds()), OC_Log::DEBUG);
 		return in_array($id, self::activeIds());
 	}
 
-- 
GitLab


From a70fbcea287885c1b61c5f19ea078649e02267d2 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 28 Dec 2011 10:31:45 +0100
Subject: [PATCH 091/546] More missing js.

---
 apps/contacts/js/interface.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index 8e74cc7e9ce..3190efae3cc 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -108,6 +108,18 @@ Contacts={
 				})
 				$.each(contacts, function(idx, itm) { contactlist.append(itm); });
 				*/
+				setTimeout(Contacts.UI.Contacts.lazyupdate(), 500);
+			},
+			lazyupdate:function(){
+				//alert('lazyupdate');
+				$('#contacts li').live('inview', function(){
+					if (!$(this).attr('style')) {
+						//alert($(this).data('id') + ' has background: ' + $(this).attr('style'));
+						$(this).css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
+					}/* else {
+						alert($(this).data('id') + ' has style ' + $(this).attr('style').match('url'));
+					}*/
+				});
 			}
 		}
 	}
-- 
GitLab


From 9b59bf40dff94c79cef45916c7ec6cf7d9835f14 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Wed, 28 Dec 2011 12:47:27 -0500
Subject: [PATCH 092/546] Fix encoding again and update the link after renaming
 files

---
 files/index.php               |  2 +-
 files/js/filelist.js          |  2 ++
 files/templates/part.list.php | 10 +++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/files/index.php b/files/index.php
index 189917150ad..fc69a42bec6 100644
--- a/files/index.php
+++ b/files/index.php
@@ -71,7 +71,7 @@ $breadcrumb = array();
 $pathtohere = "";
 foreach( explode( "/", $dir ) as $i ){
 	if( $i != "" ){
-		$pathtohere .= "/".urlencode($i);
+		$pathtohere .= "/".str_replace('+','%20', urlencode($i));
 		$breadcrumb[] = array( "dir" => $pathtohere, "name" => $i );
 	}
 }
diff --git a/files/js/filelist.js b/files/js/filelist.js
index 16f73ed58d6..c8720d5a435 100644
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -136,6 +136,8 @@ FileList={
 			var newname=input.val();
 			tr.attr('data-file',newname);
 			td.children('a.name').empty();
+			var path = td.children('a.name').attr('href');
+			td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
 			if(newname.indexOf('.')>0){
 				basename=newname.substr(0,newname.lastIndexOf('.'));
 			}else{
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index 157ec4ef42c..ae3f32b2e9f 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -4,11 +4,15 @@
 			if($simple_size_color<0) $simple_size_color = 0;
 			$relative_modified_date = relative_modified_date($file['mtime']);
 			$relative_date_color = round((time()-$file['mtime'])/60/60/24*14); // the older the file, the brighter the shade of grey; days*14
-			if($relative_date_color>200) $relative_date_color = 200; ?>
-			<tr data-file="<?php echo str_replace('+','%2B',urlencode($file['name']));?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>'>
+			if($relative_date_color>200) $relative_date_color = 200;
+			$name = str_replace('+','%20',urlencode($file['name']));
+			$name = str_replace('%2F','/', $name);
+			$directory = str_replace('+','%20',urlencode($file['directory']));
+			$directory = str_replace('%2F','/', $directory); ?>
+			<tr data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>'>
 				<td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo mimetype_icon('dir'); else echo mimetype_icon($file['mime']); ?>)">
 					<?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" /><?php } ?>
-					<a class="name" href="<?php if($file['type'] == 'dir') echo $_['baseURL'].str_replace('%2F','/',urlencode($file['directory'])).'/'.urlencode($file['name']); else echo $_['downloadURL'].str_replace('%2F','/',urlencode($file['directory'])).'/'.urlencode($file['name']); ?>" title="">
+					<a class="name" href="<?php if($file['type'] == 'dir') echo $_['baseURL'].$directory.'/'.$name; else echo $_['downloadURL'].$directory.'/'.$name; ?>" title="">
 					<span class="nametext">
 						<?php if($file['type'] == 'dir'):?>
 							<?php echo htmlspecialchars($file['name']);?>
-- 
GitLab


From 86b65c269a858cfba953f49d7ac86a759865fcc3 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Wed, 28 Dec 2011 13:01:36 -0500
Subject: [PATCH 093/546] Keep the urls pretty, decode forward slashes for
 newly added directories

---
 files/js/filelist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/js/filelist.js b/files/js/filelist.js
index c8720d5a435..35847e06dfe 100644
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -40,7 +40,7 @@ FileList={
 		html = $('<tr></tr>').attr({ "data-type": "dir", "data-size": size, "data-file": name});
 		td = $('<td></td>').attr({"class": "filename", "style": 'background-image:url('+OC.imagePath('core', 'filetypes/folder.png')+')' });
 		td.append('<input type="checkbox" />');
-		var link_elem = $('<a></a>').attr({ "class": "name", "href": "index.php?dir="+ encodeURIComponent($('#dir').val()+'/'+name) });
+		var link_elem = $('<a></a>').attr({ "class": "name", "href": "index.php?dir="+ encodeURIComponent($('#dir').val()+'/'+name).replace(/%2F/g, '/') });
 		link_elem.append($('<span></span>').addClass('nametext').text(name));
 		td.append(link_elem);
 		html.append(td);
-- 
GitLab


From 2ea20862fcef773d4262c78835b16fb5827ecfe2 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Fri, 30 Dec 2011 17:06:29 +0100
Subject: [PATCH 094/546] gallery fixes

---
 apps/gallery/css/styles.css  | 7 +++++++
 apps/gallery/lib/scanner.php | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index 09f9daeb6b1..53c3c0901d9 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -17,7 +17,14 @@ div#gallery_album_box {
   padding: 10px;
   border: solid 1px black;
   position: relative;
+  overflow: hidden;
+  color: #999;
 }
+
+div#gallery_album_box:hover {
+  color: black; 
+}
+
 .leftcontent div#gallery_album_box {
   margin: 5px;
 }
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index ef210327966..59c34b8e69a 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -21,7 +21,9 @@ class OC_Gallery_Scanner {
   public static function scanDir($path, &$albums) {
     $current_album = array('name'=> $path, 'imagesCount' => 0, 'images' => array());
     $current_album['name'] = str_replace('/', '.', str_replace(OC::$CONFIG_DATADIRECTORY, '', $current_album['name']));
-    $current_album['name'] = ($current_album['name']==='')?'main':$current_album['name'];
+    $current_album['name'] = ($current_album['name']==='') ?
+                             'main' :
+                             trim($current_album['name'],'.');
 
     if ($dh = OC_Filesystem::opendir($path)) {
       while (($filename = readdir($dh)) !== false) {
-- 
GitLab


From 31663cfff5c32b90bf41c6af46f3042db8699fe2 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Fri, 30 Dec 2011 17:47:14 +0100
Subject: [PATCH 095/546] contacts entry duplication fix

---
 apps/contacts/templates/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 9e63b201987..90143f25fa6 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -1,5 +1,5 @@
 <?php // Include Style and Script
-OC_Util::addScript('contacts','interface');
+//OC_Util::addScript('contacts','interface'); // this line caused entry duplication, cause contacts/index.php already inlcudes it
 OC_Util::addScript('contacts','jquery.inview');
 OC_Util::addStyle('contacts','styles');
 OC_Util::addStyle('contacts','formtastic');
-- 
GitLab


From 4793d25c577dcad3516853d05d62cf264fc54448 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 30 Dec 2011 21:07:16 +0100
Subject: [PATCH 096/546] Added license and waiver of conditions for
 jquery.inview. CSS fix on contact list. Query contacts from multiple address
 books.

---
 apps/contacts/ajax/addcard.php         |  1 +
 apps/contacts/ajax/contacts.php        |  9 +++---
 apps/contacts/css/styles.css           |  1 +
 apps/contacts/index.php                |  9 ++++--
 apps/contacts/js/LICENSE.jquery.inview | 41 ++++++++++++++++++++++++++
 apps/contacts/js/jquery.inview.txt     | 15 ++++++++++
 apps/contacts/lib/addressbook.php      | 25 ++++++++++++++--
 apps/contacts/lib/vcard.php            | 21 +++++++++++--
 8 files changed, 111 insertions(+), 11 deletions(-)
 create mode 100644 apps/contacts/js/LICENSE.jquery.inview
 create mode 100644 apps/contacts/js/jquery.inview.txt

diff --git a/apps/contacts/ajax/addcard.php b/apps/contacts/ajax/addcard.php
index 9d782246a0a..54c455e515f 100644
--- a/apps/contacts/ajax/addcard.php
+++ b/apps/contacts/ajax/addcard.php
@@ -61,5 +61,6 @@ foreach( $add as $propname){
 	$vcard->addProperty($propname, $value, $prop_parameters);
 }
 $id = OC_Contacts_VCard::add($aid,$vcard->serialize());
+OC_Log::write('contacts','ajax/addcard.php - adding id: '.$id,OC_Log::DEBUG);
 
 OC_Contacts_App::renderDetails($id, $vcard);
diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
index b34cf414249..54ad3e4c103 100644
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@@ -6,14 +6,14 @@
  * See the COPYING-README file.
  */
 
-function contacts_namesort($a,$b){
-	return strcasecmp($a['fullname'],$b['fullname']);
-}
-
 require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 
+$ids = OC_Contacts_Addressbook::activeIds(OC_User::getUser());
+$contacts = OC_Contacts_VCard::all($ids);
+//OC_Log::write('contacts','contacts.php: '.count($contacts).' contacts.',OC_Log::DEBUG);
+/*
 $addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());
 $contacts = array();
 foreach( $addressbooks as $addressbook ){
@@ -26,6 +26,7 @@ foreach( $addressbooks as $addressbook ){
 	}
 }
 usort($contacts,'contacts_namesort');
+*/
 $tmpl = new OC_TEMPLATE("contacts", "part.contacts");
 $tmpl->assign('contacts', $contacts);
 $page = $tmpl->fetchPage();
diff --git a/apps/contacts/css/styles.css b/apps/contacts/css/styles.css
index b6709c5a791..53b469e6eed 100644
--- a/apps/contacts/css/styles.css
+++ b/apps/contacts/css/styles.css
@@ -1,3 +1,4 @@
+#contacts { padding-left:5px; padding-top: 5px; background: #fff; }
 #contacts li { padding-left:25px;background:url('../img/person.svg') no-repeat; }
 #chooseaddressbook {margin-right: 170px; float: right;}
 #contacts_details_name { font-weight:bold;font-size:1.1em;margin-left:25%;}
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index a6af54c8789..5ab6f293ab4 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -32,6 +32,9 @@ OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 
 // Get active address books. This creates a default one if none exists.
+$ids = OC_Contacts_Addressbook::activeIds(OC_User::getUser());
+$contacts = OC_Contacts_VCard::all($ids);
+
 $addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());
 
 // Load the files we need
@@ -39,7 +42,7 @@ OC_App::setActiveNavigationEntry( 'contacts_index' );
 
 // Load a specific user?
 $id = isset( $_GET['id'] ) ? $_GET['id'] : null;
-
+/*
 // sort addressbooks  (use contactsort)
 usort($addressbooks,'contacts_namesort');
 
@@ -55,8 +58,10 @@ foreach( $addressbooks as $addressbook ){
 }
 
 usort($contacts,'contacts_namesort');
-
+*/
 $details = array();
+
+// FIXME: This cannot work..?
 if( !is_null($id)/* || count($contacts)*/){
 	if(is_null($id)) $id = $contacts[0]['id'];
 	$vcard = OC_Contacts_App::getContactVCard($id);
diff --git a/apps/contacts/js/LICENSE.jquery.inview b/apps/contacts/js/LICENSE.jquery.inview
new file mode 100644
index 00000000000..1ed340edbe5
--- /dev/null
+++ b/apps/contacts/js/LICENSE.jquery.inview
@@ -0,0 +1,41 @@
+Attribution-Non-Commercial-Share Alike 2.0 UK: England & Wales
+
+http://creativecommons.org/licenses/by-nc-sa/2.0/uk/
+
+You are free:
+
+    * to copy, distribute, display, and perform the work
+    * to make derivative works
+
+
+Under the following conditions:
+
+    * Attribution — You must give the original author credit.
+      Attribute this work:
+      Information
+      What does "Attribute this work" mean?
+      The page you came from contained embedded licensing metadata, 
+      including how the creator wishes to be attributed for re-use. 
+      You can use the HTML here to cite the work. Doing so will 
+      also include metadata on your page so that others can find the 
+      original work as well.
+
+    * Non-Commercial — You may not use this work for commercial 
+      purposes.
+    * Share Alike — If you alter, transform, or build upon this 
+      work, you may distribute the resulting work only under a 
+      licence identical to this one.
+
+With the understanding that:
+
+    * Waiver — Any of the above conditions can be waived if you get 
+      permission from the copyright holder.
+    * Other Rights — In no way are any of the following rights 
+      affected by the license:
+          o Your fair dealing or fair use rights;
+          o The author's moral rights;
+          o Rights other persons may have either in the work itself 
+            or in how the work is used, such as publicity or privacy rights.
+    * Notice — For any reuse or distribution, you must make clear to 
+      others the licence terms of this work.
+
diff --git a/apps/contacts/js/jquery.inview.txt b/apps/contacts/js/jquery.inview.txt
new file mode 100644
index 00000000000..c53dbd1d97c
--- /dev/null
+++ b/apps/contacts/js/jquery.inview.txt
@@ -0,0 +1,15 @@
+jQuery.inview is licensed Attribution-Non-Commercial-Share Alike 2.0 but the
+conditions has been waived by the author in the following tweet:
+
+https://twitter.com/#!/ChristopherBlum/status/148382899887013888 
+
+Saying:
+
+Thomas Tanghus @tanghus 18 Dec. 2011
+
+@ChristopherBlum Hi. Is it OK if I use https://github.com/protonet/jquery.inview in ownCloud? Preferably under an AGPL license ;-) owncloud.org
+
+
+Christopher Blum Christopher Blum @ChristopherBlum 18 Dec. 2011
+
+@tanghus Feel free to! :)
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 6f2f34225de..b3c981a541e 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -140,6 +140,25 @@ class OC_Contacts_Addressbook{
 		return true;
 	}
 
+	public static function cleanArray($array, $remove_null_number = true){
+		$new_array = array();
+
+		$null_exceptions = array();
+
+		foreach ($array as $key => $value){
+			$value = trim($value);
+
+			if($remove_null_number){
+				$null_exceptions[] = '0';
+			}
+
+			if(!in_array($value, $null_exceptions) && $value != "")	{
+				$new_array[] = $value;
+			}
+		}
+		return $new_array;
+	}
+
 	/**
 	 * @brief Get active addressbooks for a user.
 	 * @param integer $uid User id. If null current user will be used.
@@ -170,7 +189,8 @@ class OC_Contacts_Addressbook{
 	public static function active($uid){
 		$active = self::activeIds($uid);
 		$addressbooks = array();
-		/** FIXME: Is there a way to prepare a statement 'WHERE id IN ([range])'?
+		/* FIXME: Is there a way to prepare a statement 'WHERE id IN ([range])'?
+		 * See OC_Contacts_VCard:all.
 		*/
 		foreach( $active as $aid ){
 			$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id = ? ORDER BY displayname' );
@@ -208,6 +228,7 @@ class OC_Contacts_Addressbook{
 				unset($openaddressbooks[array_search($id, $openaddressbooks)]);
 			}
 		}
+		$openaddressbooks = self::cleanArray($openaddressbooks, false);
 		sort($openaddressbooks, SORT_NUMERIC);
 		// FIXME: I alway end up with a ';' prepending when imploding the array..?
 		OC_Preferences::setValue(OC_User::getUser(),'contacts','openaddressbooks',implode(';', $openaddressbooks));
@@ -221,7 +242,7 @@ class OC_Contacts_Addressbook{
 	 * @return boolean
 	 */
 	public static function isActive($id){
-		OC_Log::write('contacts','OC_Contacts_Addressbook::isActive('.$id.'):'.in_array($id, self::activeIds()), OC_Log::DEBUG);
+		//OC_Log::write('contacts','OC_Contacts_Addressbook::isActive('.$id.'):'.in_array($id, self::activeIds()), OC_Log::DEBUG);
 		return in_array($id, self::activeIds());
 	}
 
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 7285761fd58..81519b3d051 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -47,9 +47,24 @@ class OC_Contacts_VCard{
 	 * ['carddata']
 	 */
 	public static function all($id){
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? ORDER BY fullname' );
-		$result = $stmt->execute(array($id));
-
+		//$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? ORDER BY fullname' );
+		//$result = $stmt->execute(array($id));
+
+		if(is_array($id)) {
+			$id_sql = join(',', array_fill(0, count($id), '?'));
+			$prep = 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid IN ('.$id_sql.') ORDER BY fullname';
+			try {
+				$stmt = OC_DB::prepare( $prep );
+				$result = $stmt->execute($id);
+			} catch(Exception $e) {
+				OC_Log::write('contacts','OC_Contacts_VCard:all:, exception: '.$e->getMessage(),OC_Log::DEBUG);
+				OC_Log::write('contacts','OC_Contacts_VCard:all, ids: '.join(',', $id),OC_Log::DEBUG);
+				OC_Log::write('contacts','SQL:'.$prep,OC_Log::DEBUG);
+			}
+		} else {
+			$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? ORDER BY fullname' );
+			$result = $stmt->execute(array($id));
+		}
 		$cards = array();
 		while( $row = $result->fetchRow()){
 			$cards[] = $row;
-- 
GitLab


From eb4cd869107d4afa1c259751e765ca39defb9279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20K=C3=B6b?= <daniel.koeb@peony.at>
Date: Fri, 30 Dec 2011 20:38:56 +0100
Subject: [PATCH 097/546] Include PostgreSQL when checking for available
 database drivers.

Signed-off-by: Brice Maron <brice@bmaron.net>
---
 lib/util.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 0f79948bc24..9cf78da6e90 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -175,8 +175,8 @@ class OC_Util {
 		$errors=array();
 
 		//check for database drivers
-		if(!is_callable('sqlite_open') and !is_callable('mysql_connect')){
-			$errors[]=array('error'=>'No database drivers (sqlite or mysql) installed.<br/>','hint'=>'');//TODO: sane hint
+		if(!is_callable('sqlite_open') and !is_callable('mysql_connect') and !is_callable('pg_connect')){
+			$errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.<br/>','hint'=>'');//TODO: sane hint
 		}
 		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
 		$CONFIG_DBNAME = OC_Config::getValue( "dbname", "owncloud" );
-- 
GitLab


From 97471b5c2a079be34aeff099019f219135b9cb2c Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 30 Dec 2011 23:39:31 +0100
Subject: [PATCH 098/546] Thumbnails was overwriting default style so hover and
 active didn't work. Moved them to the 'a' element instead.

---
 apps/contacts/css/styles.css  | 4 ++--
 apps/contacts/js/interface.js | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/contacts/css/styles.css b/apps/contacts/css/styles.css
index 53b469e6eed..c890be85824 100644
--- a/apps/contacts/css/styles.css
+++ b/apps/contacts/css/styles.css
@@ -1,5 +1,5 @@
-#contacts { padding-left:5px; padding-top: 5px; background: #fff; }
-#contacts li { padding-left:25px;background:url('../img/person.svg') no-repeat; }
+#contacts { padding-left:2px; padding-top: 5px; background: #fff; }
+#leftcontent a { height: 23px; display: block; margin: 0 0 0 0; padding: 0 0 0 25px; }
 #chooseaddressbook {margin-right: 170px; float: right;}
 #contacts_details_name { font-weight:bold;font-size:1.1em;margin-left:25%;}
 #contacts_details_photo { margin:.5em 0em .5em 25%; }
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index 3190efae3cc..35639ef6cc7 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -113,9 +113,9 @@ Contacts={
 			lazyupdate:function(){
 				//alert('lazyupdate');
 				$('#contacts li').live('inview', function(){
-					if (!$(this).attr('style')) {
+					if (!$(this).find('a').attr('style')) {
 						//alert($(this).data('id') + ' has background: ' + $(this).attr('style'));
-						$(this).css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
+						$(this).find('a').css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
 					}/* else {
 						alert($(this).data('id') + ' has style ' + $(this).attr('style').match('url'));
 					}*/
@@ -301,9 +301,9 @@ $(document).ready(function(){
 				// bottom part of element is visible
 			} else {
 				// whole part of element is visible
-				if (!$(this).attr('style')) {
+				if (!$(this).find('a').attr('style')) {
 					//alert($(this).data('id') + ' has background: ' + $(this).attr('style'));
-					$(this).css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
+					$(this).find('a').css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
 				}/* else {
 					alert($(this).data('id') + ' has style ' + $(this).attr('style').match('url'));
 				}*/
-- 
GitLab


From 39e67707d778c4d8782b66787317e8d9c28954ac Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Fri, 30 Dec 2011 22:47:39 +0000
Subject: [PATCH 099/546] Updated jquery ui js and css. Improved color scheme.

---
 core/css/jquery-ui-1.8.16.custom.css   | 362 ++++++++++++
 core/js/jquery-ui-1.8.16.custom.min.js | 761 +++++++++++++++++++++++++
 lib/base.php                           |   4 +-
 3 files changed, 1125 insertions(+), 2 deletions(-)
 create mode 100755 core/css/jquery-ui-1.8.16.custom.css
 create mode 100755 core/js/jquery-ui-1.8.16.custom.min.js

diff --git a/core/css/jquery-ui-1.8.16.custom.css b/core/css/jquery-ui-1.8.16.custom.css
new file mode 100755
index 00000000000..add1c6af08c
--- /dev/null
+++ b/core/css/jquery-ui-1.8.16.custom.css
@@ -0,0 +1,362 @@
+/*
+ * jQuery UI CSS Framework 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault="Lucida%20Grande",%20Arial,%20Verdana,%20sans-serif&fwDefault=bold&fsDefault=1em&cornerRadius=4px&bgColorHeader=1d2d44&bgTextureHeader=01_flat.png&bgImgOpacityHeader=35&borderColorHeader=1d2d44&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f8f8f8&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=ddd&fcDefault=555&iconColorDefault=1d2d44&bgColorHover=ffffff&bgTextureHover=01_flat.png&bgImgOpacityHover=100&borderColorHover=ddd&fcHover=333&iconColorHover=1d2d44&bgColorActive=f8f8f8&bgTextureActive=02_glass.png&bgImgOpacityActive=100&borderColorActive=1d2d44&fcActive=1d2d44&iconColorActive=1d2d44&bgColorHighlight=f8f8f8&bgTextureHighlight=04_highlight_hard.png&bgImgOpacityHighlight=100&borderColorHighlight=ddd&fcHighlight=555&iconColorHighlight=ffffff&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: \\\"Lucida Grande\\\", Arial, Verdana, sans-serif; font-size: 1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: \\\"Lucida Grande\\\", Arial, Verdana, sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee; color: #333333; }
+.ui-widget-content a { color: #333333; }
+.ui-widget-header { border: 1px solid #1d2d44; background: #1d2d44; color: #ffffff; font-weight: bold; }
+.ui-widget-header a { color: #ffffff; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #ddd; background: #f8f8f8; font-weight: bold; color: #555; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #ddd; background: #ffffff; font-weight: bold; color: #333; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #333; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #1d2d44; background: #f8f8f8; font-weight: bold; color: #1d2d44; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #1d2d44; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+/* Icons
+----------------------------------*/
+	
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+	
+/* states and images */	
+.ui-icon { width: 16px; height: 16px; }	
+.ui-icon-closethick { background-image: url(../img/actions/delete.png); }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #666666; opacity: .50;filter:Alpha(Opacity=50); }
+.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/*
+ * jQuery UI Resizable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Autocomplete 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete { position: absolute; cursor: default; }	
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.16
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+	float: left;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/*
+ * jQuery UI Button 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+/*
+ * jQuery UI Dialog 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; background-color: #EEE;}
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/*
+ * jQuery UI Slider 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+ * jQuery UI Tabs 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs#theming
+ */
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/*
+ * jQuery UI Datepicker 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/*
+ * jQuery UI Progressbar 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
diff --git a/core/js/jquery-ui-1.8.16.custom.min.js b/core/js/jquery-ui-1.8.16.custom.min.js
new file mode 100755
index 00000000000..eefefa8579d
--- /dev/null
+++ b/core/js/jquery-ui-1.8.16.custom.min.js
@@ -0,0 +1,761 @@
+/*!
+ * jQuery UI 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function(c,j){function k(a,b){var d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function l(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.16",
+keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({propAttr:c.fn.prop||c.fn.attr,_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=
+this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,
+"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":
+"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,m,n){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(m)g-=parseFloat(c.curCSS(f,"border"+this+"Width",true))||0;if(n)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,
+outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){return k(a,!isNaN(c.attr(a,"tabindex")))},tabbable:function(a){var b=c.attr(a,
+"tabindex"),d=isNaN(b);return(d||b>=0)&&k(a,!d)}});c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&
+a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&
+c.ui.isOverAxis(b,e,i)}})}})(jQuery);
+;/*!
+ * jQuery UI Widget 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */
+(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)try{b(d).triggerHandler("remove")}catch(e){}k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){try{b(this).triggerHandler("remove")}catch(d){}});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=
+function(h){return!!b.data(h,a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):
+d;if(e&&d.charAt(0)==="_")return h;e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=
+b.extend(true,{},this.options,this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+
+"-disabled ui-state-disabled")},widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",
+c);return this},enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
+;/*!
+ * jQuery UI Mouse 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Mouse
+ *
+ * Depends:
+ *	jquery.ui.widget.js
+ */
+(function(b){var d=false;b(document).mouseup(function(){d=false});b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(c){return a._mouseDown(c)}).bind("click."+this.widgetName,function(c){if(true===b.data(c.target,a.widgetName+".preventClickEvent")){b.removeData(c.target,a.widgetName+".preventClickEvent");c.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+
+this.widgetName)},_mouseDown:function(a){if(!d){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var c=this,f=a.which==1,g=typeof this.options.cancel=="string"&&a.target.nodeName?b(a.target).closest(this.options.cancel).length:false;if(!f||g||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=
+this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();return true}}true===b.data(a.target,this.widgetName+".preventClickEvent")&&b.removeData(a.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(e){return c._mouseMove(e)};this._mouseUpDelegate=function(e){return c._mouseUp(e)};b(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return d=true}},_mouseMove:function(a){if(b.browser.msie&&
+!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=
+false;a.target==this._mouseDownEvent.target&&b.data(a.target,this.widgetName+".preventClickEvent",true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
+;/*
+ * jQuery UI Position 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Position
+ */
+(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY,
+left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+=
+k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-=
+m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left=
+d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+=
+a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b),
+g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
+;/*
+ * jQuery UI Draggable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Draggables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
+"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b=
+this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;if(b.iframeFix)d(b.iframeFix===true?"iframe":b.iframeFix).each(function(){d('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")});return true},_mouseStart:function(a){var b=this.options;
+this.helper=this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});
+this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions();d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);d.ui.ddmanager&&d.ui.ddmanager.dragStart(this,a);return true},
+_mouseDrag:function(a,b){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b=
+false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b=d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&&this.options.revert.call(this.element,b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,
+10),function(){c._trigger("stop",a)!==false&&c._clear()})}else this._trigger("stop",a)!==false&&this._clear();return false},_mouseUp:function(a){this.options.iframeFix===true&&d("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)});d.ui.ddmanager&&d.ui.ddmanager.dragStop(this,a);return d.ui.mouse.prototype._mouseUp.call(this,a)},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(a){var b=!this.options.handle||
+!d(this.options.handle,this.element).length?true:false;d(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==a.target)b=true});return b},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a])):b.helper=="clone"?this.element.clone().removeAttr("id"):this.element;a.parents("body").length||a.appendTo(b.appendTo=="parent"?this.element[0].parentNode:b.appendTo);a[0]!=this.element[0]&&!/(fixed|absolute)/.test(a.css("position"))&&
+a.css("position","absolute");return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=
+this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),
+10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),
+10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[a.containment=="document"?0:d(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,a.containment=="document"?0:d(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,
+(a.containment=="document"?0:d(window).scrollLeft())+d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a.containment=="document"?0:d(window).scrollTop())+(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)&&a.containment.constructor!=Array){a=d(a.containment);var b=a[0];if(b){a.offset();var c=d(b).css("overflow")!=
+"hidden";this.containment=[(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0),(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0),(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),
+10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom];this.relative_container=a}}else if(a.containment.constructor==Array)this.containment=a.containment},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName);return{top:b.top+
+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&
+!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName),e=a.pageX,h=a.pageY;if(this.originalPosition){var g;if(this.containment){if(this.relative_container){g=this.relative_container.offset();g=[this.containment[0]+g.left,this.containment[1]+g.top,this.containment[2]+g.left,this.containment[3]+g.top]}else g=this.containment;if(a.pageX-this.offset.click.left<g[0])e=g[0]+this.offset.click.left;
+if(a.pageY-this.offset.click.top<g[1])h=g[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>g[2])e=g[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>g[3])h=g[3]+this.offset.click.top}if(b.grid){h=b.grid[1]?this.originalPageY+Math.round((h-this.originalPageY)/b.grid[1])*b.grid[1]:this.originalPageY;h=g?!(h-this.offset.click.top<g[1]||h-this.offset.click.top>g[3])?h:!(h-this.offset.click.top<g[1])?h-b.grid[1]:h+b.grid[1]:h;e=b.grid[0]?this.originalPageX+Math.round((e-this.originalPageX)/
+b.grid[0])*b.grid[0]:this.originalPageX;e=g?!(e-this.offset.click.left<g[0]||e-this.offset.click.left>g[2])?e:!(e-this.offset.click.left<g[0])?e-b.grid[0]:e+b.grid[0]:e}}return{top:h-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop()),left:e-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&d.browser.version<
+526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(a,b,c){c=c||this._uiHash();d.ui.plugin.call(this,a,[b,c]);if(a=="drag")this.positionAbs=this._convertPositionTo("absolute");return d.Widget.prototype._trigger.call(this,a,b,
+c)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});d.extend(d.ui.draggable,{version:"1.8.16"});d.ui.plugin.add("draggable","connectToSortable",{start:function(a,b){var c=d(this).data("draggable"),f=c.options,e=d.extend({},b,{item:c.element});c.sortables=[];d(f.connectToSortable).each(function(){var h=d.data(this,"sortable");if(h&&!h.options.disabled){c.sortables.push({instance:h,shouldRevert:h.options.revert});
+h.refreshPositions();h._trigger("activate",a,e)}})},stop:function(a,b){var c=d(this).data("draggable"),f=d.extend({},b,{item:c.element});d.each(c.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;c.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(a);this.instance.options.helper=this.instance.options._helper;c.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=
+false;this.instance._trigger("deactivate",a,f)}})},drag:function(a,b){var c=d(this).data("draggable"),f=this;d.each(c.sortables,function(){this.instance.positionAbs=c.positionAbs;this.instance.helperProportions=c.helperProportions;this.instance.offset.click=c.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=d(f).clone().removeAttr("id").appendTo(this.instance.element).data("sortable-item",true);
+this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return b.helper[0]};a.target=this.instance.currentItem[0];this.instance._mouseCapture(a,true);this.instance._mouseStart(a,true,true);this.instance.offset.click.top=c.offset.click.top;this.instance.offset.click.left=c.offset.click.left;this.instance.offset.parent.left-=c.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=c.offset.parent.top-this.instance.offset.parent.top;
+c._trigger("toSortable",a);c.dropped=this.instance.element;c.currentItem=c.element;this.instance.fromOutside=c}this.instance.currentItem&&this.instance._mouseDrag(a)}else if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",a,this.instance._uiHash(this.instance));this.instance._mouseStop(a,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&
+this.instance.placeholder.remove();c._trigger("fromSortable",a);c.dropped=false}})}});d.ui.plugin.add("draggable","cursor",{start:function(){var a=d("body"),b=d(this).data("draggable").options;if(a.css("cursor"))b._cursor=a.css("cursor");a.css("cursor",b.cursor)},stop:function(){var a=d(this).data("draggable").options;a._cursor&&d("body").css("cursor",a._cursor)}});d.ui.plugin.add("draggable","opacity",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("opacity"))b._opacity=
+a.css("opacity");a.css("opacity",b.opacity)},stop:function(a,b){a=d(this).data("draggable").options;a._opacity&&d(b.helper).css("opacity",a._opacity)}});d.ui.plugin.add("draggable","scroll",{start:function(){var a=d(this).data("draggable");if(a.scrollParent[0]!=document&&a.scrollParent[0].tagName!="HTML")a.overflowOffset=a.scrollParent.offset()},drag:function(a){var b=d(this).data("draggable"),c=b.options,f=false;if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){if(!c.axis||c.axis!=
+"x")if(b.overflowOffset.top+b.scrollParent[0].offsetHeight-a.pageY<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop+c.scrollSpeed;else if(a.pageY-b.overflowOffset.top<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop-c.scrollSpeed;if(!c.axis||c.axis!="y")if(b.overflowOffset.left+b.scrollParent[0].offsetWidth-a.pageX<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft+c.scrollSpeed;else if(a.pageX-b.overflowOffset.left<
+c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(!c.axis||c.axis!="x")if(a.pageY-d(document).scrollTop()<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()-c.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()+c.scrollSpeed);if(!c.axis||c.axis!="y")if(a.pageX-d(document).scrollLeft()<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()-
+c.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()+c.scrollSpeed)}f!==false&&d.ui.ddmanager&&!c.dropBehaviour&&d.ui.ddmanager.prepareOffsets(b,a)}});d.ui.plugin.add("draggable","snap",{start:function(){var a=d(this).data("draggable"),b=a.options;a.snapElements=[];d(b.snap.constructor!=String?b.snap.items||":data(draggable)":b.snap).each(function(){var c=d(this),f=c.offset();this!=a.element[0]&&a.snapElements.push({item:this,
+width:c.outerWidth(),height:c.outerHeight(),top:f.top,left:f.left})})},drag:function(a,b){for(var c=d(this).data("draggable"),f=c.options,e=f.snapTolerance,h=b.offset.left,g=h+c.helperProportions.width,n=b.offset.top,o=n+c.helperProportions.height,i=c.snapElements.length-1;i>=0;i--){var j=c.snapElements[i].left,l=j+c.snapElements[i].width,k=c.snapElements[i].top,m=k+c.snapElements[i].height;if(j-e<h&&h<l+e&&k-e<n&&n<m+e||j-e<h&&h<l+e&&k-e<o&&o<m+e||j-e<g&&g<l+e&&k-e<n&&n<m+e||j-e<g&&g<l+e&&k-e<o&&
+o<m+e){if(f.snapMode!="inner"){var p=Math.abs(k-o)<=e,q=Math.abs(m-n)<=e,r=Math.abs(j-g)<=e,s=Math.abs(l-h)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:k-c.helperProportions.height,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:m,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:j-c.helperProportions.width}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:l}).left-c.margins.left}var t=
+p||q||r||s;if(f.snapMode!="outer"){p=Math.abs(k-n)<=e;q=Math.abs(m-o)<=e;r=Math.abs(j-h)<=e;s=Math.abs(l-g)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:k,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:m-c.helperProportions.height,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:j}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:l-c.helperProportions.width}).left-c.margins.left}if(!c.snapElements[i].snapping&&
+(p||q||r||s||t))c.options.snap.snap&&c.options.snap.snap.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[i].item}));c.snapElements[i].snapping=p||q||r||s||t}else{c.snapElements[i].snapping&&c.options.snap.release&&c.options.snap.release.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[i].item}));c.snapElements[i].snapping=false}}}});d.ui.plugin.add("draggable","stack",{start:function(){var a=d(this).data("draggable").options;a=d.makeArray(d(a.stack)).sort(function(c,f){return(parseInt(d(c).css("zIndex"),
+10)||0)-(parseInt(d(f).css("zIndex"),10)||0)});if(a.length){var b=parseInt(a[0].style.zIndex)||0;d(a).each(function(c){this.style.zIndex=b+c});this[0].style.zIndex=b+a.length}}});d.ui.plugin.add("draggable","zIndex",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("zIndex"))b._zIndex=a.css("zIndex");a.css("zIndex",b.zIndex)},stop:function(a,b){a=d(this).data("draggable").options;a._zIndex&&d(b.helper).css("zIndex",a._zIndex)}})})(jQuery);
+;/*
+ * jQuery UI Droppable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Droppables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.draggable.js
+ */
+(function(d){d.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var a=this.options,b=a.accept;this.isover=0;this.isout=1;this.accept=d.isFunction(b)?b:function(c){return c.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};d.ui.ddmanager.droppables[a.scope]=d.ui.ddmanager.droppables[a.scope]||[];d.ui.ddmanager.droppables[a.scope].push(this);
+a.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var a=d.ui.ddmanager.droppables[this.options.scope],b=0;b<a.length;b++)a[b]==this&&a.splice(b,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(a,b){if(a=="accept")this.accept=d.isFunction(b)?b:function(c){return c.is(b)};d.Widget.prototype._setOption.apply(this,arguments)},_activate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&
+this.element.addClass(this.options.activeClass);b&&this._trigger("activate",a,this.ui(b))},_deactivate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);b&&this._trigger("deactivate",a,this.ui(b))},_over:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);
+this._trigger("over",a,this.ui(b))}},_out:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",a,this.ui(b))}},_drop:function(a,b){var c=b||d.ui.ddmanager.current;if(!c||(c.currentItem||c.element)[0]==this.element[0])return false;var e=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=
+d.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==c.options.scope&&g.accept.call(g.element[0],c.currentItem||c.element)&&d.ui.intersect(c,d.extend(g,{offset:g.element.offset()}),g.options.tolerance)){e=true;return false}});if(e)return false;if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",
+a,this.ui(c));return this.element}return false},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}});d.extend(d.ui.droppable,{version:"1.8.16"});d.ui.intersect=function(a,b,c){if(!b.offset)return false;var e=(a.positionAbs||a.position.absolute).left,g=e+a.helperProportions.width,f=(a.positionAbs||a.position.absolute).top,h=f+a.helperProportions.height,i=b.offset.left,k=i+b.proportions.width,j=b.offset.top,l=j+b.proportions.height;
+switch(c){case "fit":return i<=e&&g<=k&&j<=f&&h<=l;case "intersect":return i<e+a.helperProportions.width/2&&g-a.helperProportions.width/2<k&&j<f+a.helperProportions.height/2&&h-a.helperProportions.height/2<l;case "pointer":return d.ui.isOver((a.positionAbs||a.position.absolute).top+(a.clickOffset||a.offset.click).top,(a.positionAbs||a.position.absolute).left+(a.clickOffset||a.offset.click).left,j,i,b.proportions.height,b.proportions.width);case "touch":return(f>=j&&f<=l||h>=j&&h<=l||f<j&&h>l)&&(e>=
+i&&e<=k||g>=i&&g<=k||e<i&&g>k);default:return false}};d.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(a,b){var c=d.ui.ddmanager.droppables[a.options.scope]||[],e=b?b.type:null,g=(a.currentItem||a.element).find(":data(droppable)").andSelf(),f=0;a:for(;f<c.length;f++)if(!(c[f].options.disabled||a&&!c[f].accept.call(c[f].element[0],a.currentItem||a.element))){for(var h=0;h<g.length;h++)if(g[h]==c[f].element[0]){c[f].proportions.height=0;continue a}c[f].visible=c[f].element.css("display")!=
+"none";if(c[f].visible){e=="mousedown"&&c[f]._activate.call(c[f],b);c[f].offset=c[f].element.offset();c[f].proportions={width:c[f].element[0].offsetWidth,height:c[f].element[0].offsetHeight}}}},drop:function(a,b){var c=false;d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&d.ui.intersect(a,this,this.options.tolerance))c=c||this._drop.call(this,b);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],a.currentItem||
+a.element)){this.isout=1;this.isover=0;this._deactivate.call(this,b)}}});return c},dragStart:function(a,b){a.element.parents(":not(body,html)").bind("scroll.droppable",function(){a.options.refreshPositions||d.ui.ddmanager.prepareOffsets(a,b)})},drag:function(a,b){a.options.refreshPositions&&d.ui.ddmanager.prepareOffsets(a,b);d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var c=d.ui.intersect(a,this,this.options.tolerance);
+if(c=!c&&this.isover==1?"isout":c&&this.isover==0?"isover":null){var e;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){e=d.data(g[0],"droppable");e.greedyChild=c=="isover"?1:0}}if(e&&c=="isover"){e.isover=0;e.isout=1;e._out.call(e,b)}this[c]=1;this[c=="isout"?"isover":"isout"]=0;this[c=="isover"?"_over":"_out"].call(this,b);if(e&&c=="isout"){e.isout=0;e.isover=1;e._over.call(e,b)}}}})},dragStop:function(a,b){a.element.parents(":not(body,html)").unbind("scroll.droppable");
+a.options.refreshPositions||d.ui.ddmanager.prepareOffsets(a,b)}}})(jQuery);
+;/*
+ * jQuery UI Resizable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element,
+_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
+top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
+this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
+nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d<c.length;d++){var f=e.trim(c[d]),g=e('<div class="ui-resizable-handle '+("ui-resizable-"+f)+'"></div>');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor==
+String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),l=0;l=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,l);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection();
+this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){if(!a.disabled){e(this).removeClass("ui-resizable-autohide");b._handles.show()}},function(){if(!a.disabled)if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();
+var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a=
+false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"});
+this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff=
+{width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis];
+if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);this._updateVirtualBoundaries(b.shiftKey);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false},
+_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;f=f?0:c.sizeDiff.width;f={width:c.helper.width()-f,height:c.helper.height()-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f,
+{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",b);this._helper&&this.helper.remove();return false},_updateVirtualBoundaries:function(b){var a=this.options,c,d,f;a={minWidth:k(a.minWidth)?a.minWidth:0,maxWidth:k(a.maxWidth)?a.maxWidth:Infinity,minHeight:k(a.minHeight)?a.minHeight:0,maxHeight:k(a.maxHeight)?a.maxHeight:
+Infinity};if(this._aspectRatio||b){b=a.minHeight*this.aspectRatio;d=a.minWidth/this.aspectRatio;c=a.maxHeight*this.aspectRatio;f=a.maxWidth/this.aspectRatio;if(b>a.minWidth)a.minWidth=b;if(d>a.minHeight)a.minHeight=d;if(c<a.maxWidth)a.maxWidth=c;if(f<a.maxHeight)a.maxHeight=f}this._vBoundaries=a},_updateCache:function(b){this.offset=this.helper.offset();if(k(b.left))this.position.left=b.left;if(k(b.top))this.position.top=b.top;if(k(b.height))this.size.height=b.height;if(k(b.width))this.size.width=
+b.width},_updateRatio:function(b){var a=this.position,c=this.size,d=this.axis;if(k(b.height))b.width=b.height*this.aspectRatio;else if(k(b.width))b.height=b.width/this.aspectRatio;if(d=="sw"){b.left=a.left+(c.width-b.width);b.top=null}if(d=="nw"){b.top=a.top+(c.height-b.height);b.left=a.left+(c.width-b.width)}return b},_respectSize:function(b){var a=this._vBoundaries,c=this.axis,d=k(b.width)&&a.maxWidth&&a.maxWidth<b.width,f=k(b.height)&&a.maxHeight&&a.maxHeight<b.height,g=k(b.width)&&a.minWidth&&
+a.minWidth>b.width,h=k(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+this.size.height,l=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&l)b.left=i-a.minWidth;if(d&&l)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left=
+null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a<this._proportionallyResizeElements.length;a++){var c=this._proportionallyResizeElements[a];if(!this.borderDif){var d=[c.css("borderTopWidth"),c.css("borderRightWidth"),c.css("borderBottomWidth"),c.css("borderLeftWidth")],f=[c.css("paddingTop"),c.css("paddingRight"),c.css("paddingBottom"),c.css("paddingLeft")];this.borderDif=e.map(d,function(g,h){g=parseInt(g,10)||
+0;h=parseInt(f[h],10)||0;return g+h})}e.browser.msie&&(e(b).is(":hidden")||e(b).parents(":hidden").length)||c.css({height:b.height()-this.borderDif[0]-this.borderDif[2]||0,width:b.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var b=this.options;this.elementOffset=this.element.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+
+a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,a){return{width:this.originalSize.width+a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+
+c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]);
+b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,{version:"1.8.16"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(),
+10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top-
+f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var l=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:l.parents(a.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(r,function(n,o){if((n=(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(l.css("position"))){c._revertToRelativePosition=true;l.css({position:"absolute",top:"auto",left:"auto"})}l.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType?
+e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};if(b._revertToRelativePosition){b._revertToRelativePosition=false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a=
+e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-g};g=parseInt(a.element.css("left"),10)+(a.position.left-a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing,
+step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,height:i.height});a._updateCache(i);a._propagate("resize",b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement=
+e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=e(a),f=[];e(["Top","Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset;
+var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,d=a.containerOffset,f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left:
+a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?d.top:0}a.offset.left=a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top-
+d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=a.size.width/a.aspectRatio}if(d+a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition,
+f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&/static/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25,
+display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");b.ghost&&b.ghost.css({position:"relative",height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b=
+e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height=
+d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},k=function(b){return!isNaN(parseInt(b,10))}})(jQuery);
+;/*
+ * jQuery UI Selectable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),
+selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX,
+c.pageY];if(!this.options.disabled){var d=this.options;this.selectees=e(d.filter,this.element[0]);this._trigger("start",c);e(d.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});d.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var b=e.data(this,"selectable-item");b.startselected=true;if(!c.metaKey){b.$element.removeClass("ui-selected");b.selected=false;b.$element.addClass("ui-unselecting");b.unselecting=true;f._trigger("unselecting",
+c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){var b=e.data(this,"selectable-item");if(b){var g=!c.metaKey||!b.$element.hasClass("ui-selected");b.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");b.unselecting=!g;b.selecting=g;(b.selected=g)?f._trigger("selecting",c,{selecting:b.element}):f._trigger("unselecting",c,{unselecting:b.element});return false}})}},_mouseDrag:function(c){var f=this;this.dragged=true;if(!this.options.disabled){var d=
+this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.right<b||a.top>i||a.bottom<g);else if(d.tolerance=="fit")k=a.left>b&&a.right<h&&a.top>g&&a.bottom<i;if(k){if(a.selected){a.$element.removeClass("ui-selected");a.selected=false}if(a.unselecting){a.$element.removeClass("ui-unselecting");
+a.unselecting=false}if(!a.selecting){a.$element.addClass("ui-selecting");a.selecting=true;f._trigger("selecting",c,{selecting:a.element})}}else{if(a.selecting)if(c.metaKey&&a.startselected){a.$element.removeClass("ui-selecting");a.selecting=false;a.$element.addClass("ui-selected");a.selected=true}else{a.$element.removeClass("ui-selecting");a.selecting=false;if(a.startselected){a.$element.addClass("ui-unselecting");a.unselecting=true}f._trigger("unselecting",c,{unselecting:a.element})}if(a.selected)if(!c.metaKey&&
+!a.startselected){a.$element.removeClass("ui-selected");a.selected=false;a.$element.addClass("ui-unselecting");a.unselecting=true;f._trigger("unselecting",c,{unselecting:a.element})}}}});return false}},_mouseStop:function(c){var f=this;this.dragged=false;e(".ui-unselecting",this.element[0]).each(function(){var d=e.data(this,"selectable-item");d.$element.removeClass("ui-unselecting");d.unselecting=false;d.startselected=false;f._trigger("unselected",c,{unselected:d.element})});e(".ui-selecting",this.element[0]).each(function(){var d=
+e.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected");d.selecting=false;d.selected=true;d.startselected=true;f._trigger("selected",c,{selected:d.element})});this._trigger("stop",c);this.helper.remove();return false}});e.extend(e.ui.selectable,{version:"1.8.16"})})(jQuery);
+;/*
+ * jQuery UI Sortable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Sortables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.sortable",d.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){var a=this.options;this.containerCache={};this.element.addClass("ui-sortable");
+this.refresh();this.floating=this.items.length?a.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a===
+"disabled"){this.options[a]=b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&&
+!b){var f=false;d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem=c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,
+left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};
+this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment();if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!=
+document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a);
+return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop+b.scrollSpeed;else if(a.pageY-this.overflowOffset.top<
+b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop-b.scrollSpeed;if(this.overflowOffset.left+this.scrollParent[0].offsetWidth-a.pageX<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft+b.scrollSpeed;else if(a.pageX-this.overflowOffset.left<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft-b.scrollSpeed}else{if(a.pageY-d(document).scrollTop()<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()-
+b.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()+b.scrollSpeed);if(a.pageX-d(document).scrollLeft()<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()-b.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()+b.scrollSpeed)}c!==false&&d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,
+a)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(b=this.items.length-1;b>=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0],
+e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a,c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset();
+c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):
+this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--){this.containers[b]._trigger("deactivate",null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null,
+dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):d(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")},
+toArray:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+j<k&&b+l>g&&b+l<h;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||
+this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?j:g<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<h&&i<e+this.helperProportions.height/2&&f-this.helperProportions.height/2<k},_intersectsWithPointer:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width);b=b&&a;a=this._getDragVerticalDirection();
+var c=this._getDragHorizontalDirection();if(!b)return false;return this.floating?c&&c=="right"||a=="down"?2:1:a&&(a=="down"?2:1)},_intersectsWithSides:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width);var c=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?e=="right"&&a||e=="left"&&!a:c&&(c=="down"&&b||c=="up"&&!b)},
+_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith();
+if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h=d.data(f[g],"sortable");if(h&&h!=this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),
+this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)});return d(b)},_removeCurrentsFromItems:function(){for(var a=this.currentItem.find(":data(sortable-item)"),b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(a){this.items=[];this.containers=[this];var b=this.items,c=[[d.isFunction(this.options.items)?this.options.items.call(this.element[0],a,{item:this.currentItem}):d(this.options.items,this.element),
+this]],e=this._connectWith();if(e)for(var f=e.length-1;f>=0;f--)for(var g=d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h<g;h++){i=d(e[h]);i.data("sortable-item",a);b.push({item:i,instance:a,width:0,height:0,left:0,top:0})}}},refreshPositions:function(a){if(this.offsetParent&&
+this.helper)this.offset.parent=this._getParentOffset();for(var b=this.items.length-1;b>=0;b--){var c=this.items[b];if(!(c.instance!=this.currentContainer&&this.currentContainer&&c.item[0]!=this.currentItem[0])){var e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b=
+this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top=e.top;this.containers[b].containerCache.width=this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f=
+d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!e)f.style.visibility="hidden";return f},update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||
+0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out",
+a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length===1){this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h-
+f)<b){b=Math.abs(h-f);e=this.items[g]}}if(e||this.options.dropOnEmpty){this.currentContainer=this.containers[c];e?this._rearrange(a,e,null,true):this._rearrange(a,null,this.containers[c].element,true);this._trigger("change",a,this._uiHash());this.containers[c]._trigger("change",a,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}}},_createHelper:function(a){var b=
+this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a,this.currentItem])):b.helper=="clone"?this.currentItem.clone():this.currentItem;a.parents("body").length||d(b.appendTo!="parent"?b.appendTo:this.currentItem[0].parentNode)[0].appendChild(a[0]);if(a[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(a[0].style.width==
+""||b.forceHelperSize)a.width(this.currentItem.width());if(a[0].style.height==""||b.forceHelperSize)a.height(this.currentItem.height());return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=
+this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a=
+{top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),
+10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"?
+document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)){var b=d(a.containment)[0];a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),
+10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(a,b){if(!b)b=
+this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&
+this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();
+var f=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])f=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-
+this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;f=this.originalPageX+Math.round((f-this.originalPageX)/b.grid[0])*b.grid[0];f=this.containment?!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:!(f-this.offset.click.left<this.containment[0])?f-b.grid[0]:f+b.grid[0]:f}}return{top:g-
+this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())}},_rearrange:function(a,b,c,e){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],
+this.direction=="down"?b.item[0]:b.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var f=this,g=this.counter;window.setTimeout(function(){g==f.counter&&f.refreshPositions(!e)},0)},_clear:function(a,b){this.reverting=false;var c=[];!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var e in this._storedCSS)if(this._storedCSS[e]=="auto"||this._storedCSS[e]=="static")this._storedCSS[e]=
+"";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!b&&c.push(function(f){this._trigger("receive",f,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!b)c.push(function(f){this._trigger("update",f,this._uiHash())});if(!d.ui.contains(this.element[0],this.currentItem[0])){b||c.push(function(f){this._trigger("remove",
+f,this._uiHash())});for(e=this.containers.length-1;e>=0;e--)if(d.ui.contains(this.containers[e].element[0],this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this,
+this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop",
+a,this._uiHash());for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}return false}b||this._trigger("beforeStop",a,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!b){for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){d.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},
+_uiHash:function(a){var b=a||this;return{helper:b.helper,placeholder:b.placeholder||d([]),position:b.position,originalPosition:b.originalPosition,offset:b.positionAbs,item:b.currentItem,sender:a?a.element:null}}});d.extend(d.ui.sortable,{version:"1.8.16"})})(jQuery);
+;/*
+ * jQuery UI Autocomplete 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.position.js
+ */
+(function(d){var e=0;d.widget("ui.autocomplete",{options:{appendTo:"body",autoFocus:false,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var a=this,b=this.element[0].ownerDocument,g;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(c){if(!(a.options.disabled||a.element.propAttr("readOnly"))){g=
+false;var f=d.ui.keyCode;switch(c.keyCode){case f.PAGE_UP:a._move("previousPage",c);break;case f.PAGE_DOWN:a._move("nextPage",c);break;case f.UP:a._move("previous",c);c.preventDefault();break;case f.DOWN:a._move("next",c);c.preventDefault();break;case f.ENTER:case f.NUMPAD_ENTER:if(a.menu.active){g=true;c.preventDefault()}case f.TAB:if(!a.menu.active)return;a.menu.select(c);break;case f.ESCAPE:a.element.val(a.term);a.close(c);break;default:clearTimeout(a.searching);a.searching=setTimeout(function(){if(a.term!=
+a.element.val()){a.selectedItem=null;a.search(null,c)}},a.options.delay);break}}}).bind("keypress.autocomplete",function(c){if(g){g=false;c.preventDefault()}}).bind("focus.autocomplete",function(){if(!a.options.disabled){a.selectedItem=null;a.previous=a.element.val()}}).bind("blur.autocomplete",function(c){if(!a.options.disabled){clearTimeout(a.searching);a.closing=setTimeout(function(){a.close(c);a._change(c)},150)}});this._initSource();this.response=function(){return a._response.apply(a,arguments)};
+this.menu=d("<ul></ul>").addClass("ui-autocomplete").appendTo(d(this.options.appendTo||"body",b)[0]).mousedown(function(c){var f=a.menu.element[0];d(c.target).closest(".ui-menu-item").length||setTimeout(function(){d(document).one("mousedown",function(h){h.target!==a.element[0]&&h.target!==f&&!d.ui.contains(f,h.target)&&a.close()})},1);setTimeout(function(){clearTimeout(a.closing)},13)}).menu({focus:function(c,f){f=f.item.data("item.autocomplete");false!==a._trigger("focus",c,{item:f})&&/^key/.test(c.originalEvent.type)&&
+a.element.val(f.value)},selected:function(c,f){var h=f.item.data("item.autocomplete"),i=a.previous;if(a.element[0]!==b.activeElement){a.element.focus();a.previous=i;setTimeout(function(){a.previous=i;a.selectedItem=h},1)}false!==a._trigger("select",c,{item:h})&&a.element.val(h.value);a.term=a.element.val();a.close(c);a.selectedItem=h},blur:function(){a.menu.element.is(":visible")&&a.element.val()!==a.term&&a.element.val(a.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu");
+d.fn.bgiframe&&this.menu.element.bgiframe()},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup");this.menu.element.remove();d.Widget.prototype.destroy.call(this)},_setOption:function(a,b){d.Widget.prototype._setOption.apply(this,arguments);a==="source"&&this._initSource();if(a==="appendTo")this.menu.element.appendTo(d(b||"body",this.element[0].ownerDocument)[0]);a==="disabled"&&
+b&&this.xhr&&this.xhr.abort()},_initSource:function(){var a=this,b,g;if(d.isArray(this.options.source)){b=this.options.source;this.source=function(c,f){f(d.ui.autocomplete.filter(b,c.term))}}else if(typeof this.options.source==="string"){g=this.options.source;this.source=function(c,f){a.xhr&&a.xhr.abort();a.xhr=d.ajax({url:g,data:c,dataType:"json",autocompleteRequest:++e,success:function(h){this.autocompleteRequest===e&&f(h)},error:function(){this.autocompleteRequest===e&&f([])}})}}else this.source=
+this.options.source},search:function(a,b){a=a!=null?a:this.element.val();this.term=this.element.val();if(a.length<this.options.minLength)return this.close(b);clearTimeout(this.closing);if(this._trigger("search",b)!==false)return this._search(a)},_search:function(a){this.pending++;this.element.addClass("ui-autocomplete-loading");this.source({term:a},this.response)},_response:function(a){if(!this.options.disabled&&a&&a.length){a=this._normalize(a);this._suggest(a);this._trigger("open")}else this.close();
+this.pending--;this.pending||this.element.removeClass("ui-autocomplete-loading")},close:function(a){clearTimeout(this.closing);if(this.menu.element.is(":visible")){this.menu.element.hide();this.menu.deactivate();this._trigger("close",a)}},_change:function(a){this.previous!==this.element.val()&&this._trigger("change",a,{item:this.selectedItem})},_normalize:function(a){if(a.length&&a[0].label&&a[0].value)return a;return d.map(a,function(b){if(typeof b==="string")return{label:b,value:b};return d.extend({label:b.label||
+b.value,value:b.value||b.label},b)})},_suggest:function(a){var b=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(b,a);this.menu.deactivate();this.menu.refresh();b.show();this._resizeMenu();b.position(d.extend({of:this.element},this.options.position));this.options.autoFocus&&this.menu.next(new d.Event("mouseover"))},_resizeMenu:function(){var a=this.menu.element;a.outerWidth(Math.max(a.width("").outerWidth(),this.element.outerWidth()))},_renderMenu:function(a,b){var g=this;
+d.each(b,function(c,f){g._renderItem(a,f)})},_renderItem:function(a,b){return d("<li></li>").data("item.autocomplete",b).append(d("<a></a>").text(b.label)).appendTo(a)},_move:function(a,b){if(this.menu.element.is(":visible"))if(this.menu.first()&&/^previous/.test(a)||this.menu.last()&&/^next/.test(a)){this.element.val(this.term);this.menu.deactivate()}else this.menu[a](b);else this.search(null,b)},widget:function(){return this.menu.element}});d.extend(d.ui.autocomplete,{escapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,
+"\\$&")},filter:function(a,b){var g=new RegExp(d.ui.autocomplete.escapeRegex(b),"i");return d.grep(a,function(c){return g.test(c.label||c.value||c)})}})})(jQuery);
+(function(d){d.widget("ui.menu",{_create:function(){var e=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(a){if(d(a.target).closest(".ui-menu-item a").length){a.preventDefault();e.select(a)}});this.refresh()},refresh:function(){var e=this;this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem").children("a").addClass("ui-corner-all").attr("tabindex",
+-1).mouseenter(function(a){e.activate(a,d(this).parent())}).mouseleave(function(){e.deactivate()})},activate:function(e,a){this.deactivate();if(this.hasScroll()){var b=a.offset().top-this.element.offset().top,g=this.element.scrollTop(),c=this.element.height();if(b<0)this.element.scrollTop(g+b);else b>=c&&this.element.scrollTop(g+b-c+a.height())}this.active=a.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",e,{item:a})},deactivate:function(){if(this.active){this.active.children("a").removeClass("ui-state-hover").removeAttr("id");
+this._trigger("blur");this.active=null}},next:function(e){this.move("next",".ui-menu-item:first",e)},previous:function(e){this.move("prev",".ui-menu-item:last",e)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(e,a,b){if(this.active){e=this.active[e+"All"](".ui-menu-item").eq(0);e.length?this.activate(b,e):this.activate(b,this.element.children(a))}else this.activate(b,
+this.element.children(a))},nextPage:function(e){if(this.hasScroll())if(!this.active||this.last())this.activate(e,this.element.children(".ui-menu-item:first"));else{var a=this.active.offset().top,b=this.element.height(),g=this.element.children(".ui-menu-item").filter(function(){var c=d(this).offset().top-a-b+d(this).height();return c<10&&c>-10});g.length||(g=this.element.children(".ui-menu-item:last"));this.activate(e,g)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active||
+this.last()?":first":":last"))},previousPage:function(e){if(this.hasScroll())if(!this.active||this.first())this.activate(e,this.element.children(".ui-menu-item:last"));else{var a=this.active.offset().top,b=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var g=d(this).offset().top-a+b-d(this).height();return g<10&&g>-10});result.length||(result=this.element.children(".ui-menu-item:first"));this.activate(e,result)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active||
+this.first()?":last":":first"))},hasScroll:function(){return this.element.height()<this.element[d.fn.prop?"prop":"attr"]("scrollHeight")},select:function(e){this._trigger("selected",e,{item:this.active})}})})(jQuery);
+;/*
+ * jQuery UI Button 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(b){var h,i,j,g,l=function(){var a=b(this).find(":ui-button");setTimeout(function(){a.button("refresh")},1)},k=function(a){var c=a.name,e=a.form,f=b([]);if(c)f=e?b(e).find("[name='"+c+"']"):b("[name='"+c+"']",a.ownerDocument).filter(function(){return!this.form});return f};b.widget("ui.button",{options:{disabled:null,text:true,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",l);if(typeof this.options.disabled!==
+"boolean")this.options.disabled=this.element.propAttr("disabled");this._determineButtonType();this.hasTitle=!!this.buttonElement.attr("title");var a=this,c=this.options,e=this.type==="checkbox"||this.type==="radio",f="ui-state-hover"+(!e?" ui-state-active":"");if(c.label===null)c.label=this.buttonElement.html();if(this.element.is(":disabled"))c.disabled=true;this.buttonElement.addClass("ui-button ui-widget ui-state-default ui-corner-all").attr("role","button").bind("mouseenter.button",function(){if(!c.disabled){b(this).addClass("ui-state-hover");
+this===h&&b(this).addClass("ui-state-active")}}).bind("mouseleave.button",function(){c.disabled||b(this).removeClass(f)}).bind("click.button",function(d){if(c.disabled){d.preventDefault();d.stopImmediatePropagation()}});this.element.bind("focus.button",function(){a.buttonElement.addClass("ui-state-focus")}).bind("blur.button",function(){a.buttonElement.removeClass("ui-state-focus")});if(e){this.element.bind("change.button",function(){g||a.refresh()});this.buttonElement.bind("mousedown.button",function(d){if(!c.disabled){g=
+false;i=d.pageX;j=d.pageY}}).bind("mouseup.button",function(d){if(!c.disabled)if(i!==d.pageX||j!==d.pageY)g=true})}if(this.type==="checkbox")this.buttonElement.bind("click.button",function(){if(c.disabled||g)return false;b(this).toggleClass("ui-state-active");a.buttonElement.attr("aria-pressed",a.element[0].checked)});else if(this.type==="radio")this.buttonElement.bind("click.button",function(){if(c.disabled||g)return false;b(this).addClass("ui-state-active");a.buttonElement.attr("aria-pressed","true");
+var d=a.element[0];k(d).not(d).map(function(){return b(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")});else{this.buttonElement.bind("mousedown.button",function(){if(c.disabled)return false;b(this).addClass("ui-state-active");h=this;b(document).one("mouseup",function(){h=null})}).bind("mouseup.button",function(){if(c.disabled)return false;b(this).removeClass("ui-state-active")}).bind("keydown.button",function(d){if(c.disabled)return false;if(d.keyCode==b.ui.keyCode.SPACE||
+d.keyCode==b.ui.keyCode.ENTER)b(this).addClass("ui-state-active")}).bind("keyup.button",function(){b(this).removeClass("ui-state-active")});this.buttonElement.is("a")&&this.buttonElement.keyup(function(d){d.keyCode===b.ui.keyCode.SPACE&&b(this).click()})}this._setOption("disabled",c.disabled);this._resetButton()},_determineButtonType:function(){this.type=this.element.is(":checkbox")?"checkbox":this.element.is(":radio")?"radio":this.element.is("input")?"input":"button";if(this.type==="checkbox"||this.type===
+"radio"){var a=this.element.parents().filter(":last"),c="label[for='"+this.element.attr("id")+"']";this.buttonElement=a.find(c);if(!this.buttonElement.length){a=a.length?a.siblings():this.element.siblings();this.buttonElement=a.filter(c);if(!this.buttonElement.length)this.buttonElement=a.find(c)}this.element.addClass("ui-helper-hidden-accessible");(a=this.element.is(":checked"))&&this.buttonElement.addClass("ui-state-active");this.buttonElement.attr("aria-pressed",a)}else this.buttonElement=this.element},
+widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible");this.buttonElement.removeClass("ui-button ui-widget ui-state-default ui-corner-all ui-state-hover ui-state-active  ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only").removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html());this.hasTitle||this.buttonElement.removeAttr("title");
+b.Widget.prototype.destroy.call(this)},_setOption:function(a,c){b.Widget.prototype._setOption.apply(this,arguments);if(a==="disabled")c?this.element.propAttr("disabled",true):this.element.propAttr("disabled",false);else this._resetButton()},refresh:function(){var a=this.element.is(":disabled");a!==this.options.disabled&&this._setOption("disabled",a);if(this.type==="radio")k(this.element[0]).each(function(){b(this).is(":checked")?b(this).button("widget").addClass("ui-state-active").attr("aria-pressed",
+"true"):b(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")});else if(this.type==="checkbox")this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false")},_resetButton:function(){if(this.type==="input")this.options.label&&this.element.val(this.options.label);else{var a=this.buttonElement.removeClass("ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only"),
+c=b("<span></span>").addClass("ui-button-text").html(this.options.label).appendTo(a.empty()).text(),e=this.options.icons,f=e.primary&&e.secondary,d=[];if(e.primary||e.secondary){if(this.options.text)d.push("ui-button-text-icon"+(f?"s":e.primary?"-primary":"-secondary"));e.primary&&a.prepend("<span class='ui-button-icon-primary ui-icon "+e.primary+"'></span>");e.secondary&&a.append("<span class='ui-button-icon-secondary ui-icon "+e.secondary+"'></span>");if(!this.options.text){d.push(f?"ui-button-icons-only":
+"ui-button-icon-only");this.hasTitle||a.attr("title",c)}}else d.push("ui-button-text-only");a.addClass(d.join(" "))}}});b.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(a,c){a==="disabled"&&this.buttons.button("option",a,c);b.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){var a=this.element.css("direction")===
+"ltr";this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return b(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(a?"ui-corner-left":"ui-corner-right").end().filter(":last").addClass(a?"ui-corner-right":"ui-corner-left").end().end()},destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return b(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy");
+b.Widget.prototype.destroy.call(this)}})})(jQuery);
+;/*
+ * jQuery UI Dialog 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *  jquery.ui.button.js
+ *	jquery.ui.draggable.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.position.js
+ *	jquery.ui.resizable.js
+ */
+(function(c,l){var m={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},n={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true},o=c.attrFn||{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true,click:true};c.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,
+position:{my:"center",at:"center",collision:"fit",using:function(a){var b=c(this).css(a).offset().top;b<0&&c(this).css("top",a.top-b)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var a=this,b=a.options,d=b.title||"&#160;",e=c.ui.dialog.getTitleId(a.element),g=(a.uiDialog=c("<div></div>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+
+b.dialogClass).css({zIndex:b.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(i){if(b.closeOnEscape&&!i.isDefaultPrevented()&&i.keyCode&&i.keyCode===c.ui.keyCode.ESCAPE){a.close(i);i.preventDefault()}}).attr({role:"dialog","aria-labelledby":e}).mousedown(function(i){a.moveToTop(false,i)});a.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g);var f=(a.uiDialogTitlebar=c("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g),
+h=c('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){h.addClass("ui-state-hover")},function(){h.removeClass("ui-state-hover")}).focus(function(){h.addClass("ui-state-focus")}).blur(function(){h.removeClass("ui-state-focus")}).click(function(i){a.close(i);return false}).appendTo(f);(a.uiDialogTitlebarCloseText=c("<span></span>")).addClass("ui-icon ui-icon-closethick").text(b.closeText).appendTo(h);c("<span></span>").addClass("ui-dialog-title").attr("id",
+e).html(d).prependTo(f);if(c.isFunction(b.beforeclose)&&!c.isFunction(b.beforeClose))b.beforeClose=b.beforeclose;f.find("*").add(f).disableSelection();b.draggable&&c.fn.draggable&&a._makeDraggable();b.resizable&&c.fn.resizable&&a._makeResizable();a._createButtons(b.buttons);a._isOpen=false;c.fn.bgiframe&&g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;a.overlay&&a.overlay.destroy();a.uiDialog.hide();a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");
+a.uiDialog.remove();a.originalTitle&&a.element.attr("title",a.originalTitle);return a},widget:function(){return this.uiDialog},close:function(a){var b=this,d,e;if(false!==b._trigger("beforeClose",a)){b.overlay&&b.overlay.destroy();b.uiDialog.unbind("keypress.ui-dialog");b._isOpen=false;if(b.options.hide)b.uiDialog.hide(b.options.hide,function(){b._trigger("close",a)});else{b.uiDialog.hide();b._trigger("close",a)}c.ui.dialog.overlay.resize();if(b.options.modal){d=0;c(".ui-dialog").each(function(){if(this!==
+b.uiDialog[0]){e=c(this).css("z-index");isNaN(e)||(d=Math.max(d,e))}});c.ui.dialog.maxZ=d}return b}},isOpen:function(){return this._isOpen},moveToTop:function(a,b){var d=this,e=d.options;if(e.modal&&!a||!e.stack&&!e.modal)return d._trigger("focus",b);if(e.zIndex>c.ui.dialog.maxZ)c.ui.dialog.maxZ=e.zIndex;if(d.overlay){c.ui.dialog.maxZ+=1;d.overlay.$el.css("z-index",c.ui.dialog.overlay.maxZ=c.ui.dialog.maxZ)}a={scrollTop:d.element.scrollTop(),scrollLeft:d.element.scrollLeft()};c.ui.dialog.maxZ+=1;
+d.uiDialog.css("z-index",c.ui.dialog.maxZ);d.element.attr(a);d._trigger("focus",b);return d},open:function(){if(!this._isOpen){var a=this,b=a.options,d=a.uiDialog;a.overlay=b.modal?new c.ui.dialog.overlay(a):null;a._size();a._position(b.position);d.show(b.show);a.moveToTop(true);b.modal&&d.bind("keypress.ui-dialog",function(e){if(e.keyCode===c.ui.keyCode.TAB){var g=c(":tabbable",this),f=g.filter(":first");g=g.filter(":last");if(e.target===g[0]&&!e.shiftKey){f.focus(1);return false}else if(e.target===
+f[0]&&e.shiftKey){g.focus(1);return false}}});c(a.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus();a._isOpen=true;a._trigger("open");return a}},_createButtons:function(a){var b=this,d=false,e=c("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=c("<div></div>").addClass("ui-dialog-buttonset").appendTo(e);b.uiDialog.find(".ui-dialog-buttonpane").remove();typeof a==="object"&&a!==null&&c.each(a,
+function(){return!(d=true)});if(d){c.each(a,function(f,h){h=c.isFunction(h)?{click:h,text:f}:h;var i=c('<button type="button"></button>').click(function(){h.click.apply(b.element[0],arguments)}).appendTo(g);c.each(h,function(j,k){if(j!=="click")j in o?i[j](k):i.attr(j,k)});c.fn.button&&i.button()});e.appendTo(b.uiDialog)}},_makeDraggable:function(){function a(f){return{position:f.position,offset:f.offset}}var b=this,d=b.options,e=c(document),g;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",
+handle:".ui-dialog-titlebar",containment:"document",start:function(f,h){g=d.height==="auto"?"auto":c(this).height();c(this).height(c(this).height()).addClass("ui-dialog-dragging");b._trigger("dragStart",f,a(h))},drag:function(f,h){b._trigger("drag",f,a(h))},stop:function(f,h){d.position=[h.position.left-e.scrollLeft(),h.position.top-e.scrollTop()];c(this).removeClass("ui-dialog-dragging").height(g);b._trigger("dragStop",f,a(h));c.ui.dialog.overlay.resize()}})},_makeResizable:function(a){function b(f){return{originalPosition:f.originalPosition,
+originalSize:f.originalSize,position:f.position,size:f.size}}a=a===l?this.options.resizable:a;var d=this,e=d.options,g=d.uiDialog.css("position");a=typeof a==="string"?a:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:d._minHeight(),handles:a,start:function(f,h){c(this).addClass("ui-dialog-resizing");d._trigger("resizeStart",f,b(h))},resize:function(f,h){d._trigger("resize",
+f,b(h))},stop:function(f,h){c(this).removeClass("ui-dialog-resizing");e.height=c(this).height();e.width=c(this).width();d._trigger("resizeStop",f,b(h));c.ui.dialog.overlay.resize()}}).css("position",g).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=this.options;return a.height==="auto"?a.minHeight:Math.min(a.minHeight,a.height)},_position:function(a){var b=[],d=[0,0],e;if(a){if(typeof a==="string"||typeof a==="object"&&"0"in a){b=a.split?a.split(" "):
+[a[0],a[1]];if(b.length===1)b[1]=b[0];c.each(["left","top"],function(g,f){if(+b[g]===b[g]){d[g]=b[g];b[g]=f}});a={my:b.join(" "),at:b.join(" "),offset:d.join(" ")}}a=c.extend({},c.ui.dialog.prototype.options.position,a)}else a=c.ui.dialog.prototype.options.position;(e=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(c.extend({of:window},a));e||this.uiDialog.hide()},_setOptions:function(a){var b=this,d={},e=false;c.each(a,function(g,f){b._setOption(g,f);
+if(g in m)e=true;if(g in n)d[g]=f});e&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",d)},_setOption:function(a,b){var d=this,e=d.uiDialog;switch(a){case "beforeclose":a="beforeClose";break;case "buttons":d._createButtons(b);break;case "closeText":d.uiDialogTitlebarCloseText.text(""+b);break;case "dialogClass":e.removeClass(d.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b);break;case "disabled":b?e.addClass("ui-dialog-disabled"):
+e.removeClass("ui-dialog-disabled");break;case "draggable":var g=e.is(":data(draggable)");g&&!b&&e.draggable("destroy");!g&&b&&d._makeDraggable();break;case "position":d._position(b);break;case "resizable":(g=e.is(":data(resizable)"))&&!b&&e.resizable("destroy");g&&typeof b==="string"&&e.resizable("option","handles",b);!g&&b!==false&&d._makeResizable(b);break;case "title":c(".ui-dialog-title",d.uiDialogTitlebar).html(""+(b||"&#160;"));break}c.Widget.prototype._setOption.apply(d,arguments)},_size:function(){var a=
+this.options,b,d,e=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(a.minWidth>a.width)a.width=a.minWidth;b=this.uiDialog.css({height:"auto",width:a.width}).height();d=Math.max(0,a.minHeight-b);if(a.height==="auto")if(c.support.minHeight)this.element.css({minHeight:d,height:"auto"});else{this.uiDialog.show();a=this.element.css("height","auto").height();e||this.uiDialog.hide();this.element.height(Math.max(a,d))}else this.element.height(Math.max(a.height-
+b,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}});c.extend(c.ui.dialog,{version:"1.8.16",uuid:0,maxZ:0,getTitleId:function(a){a=a.attr("id");if(!a){this.uuid+=1;a=this.uuid}return"ui-dialog-title-"+a},overlay:function(a){this.$el=c.ui.dialog.overlay.create(a)}});c.extend(c.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:c.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(a){return a+".dialog-overlay"}).join(" "),
+create:function(a){if(this.instances.length===0){setTimeout(function(){c.ui.dialog.overlay.instances.length&&c(document).bind(c.ui.dialog.overlay.events,function(d){if(c(d.target).zIndex()<c.ui.dialog.overlay.maxZ)return false})},1);c(document).bind("keydown.dialog-overlay",function(d){if(a.options.closeOnEscape&&!d.isDefaultPrevented()&&d.keyCode&&d.keyCode===c.ui.keyCode.ESCAPE){a.close(d);d.preventDefault()}});c(window).bind("resize.dialog-overlay",c.ui.dialog.overlay.resize)}var b=(this.oldInstances.pop()||
+c("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),height:this.height()});c.fn.bgiframe&&b.bgiframe();this.instances.push(b);return b},destroy:function(a){var b=c.inArray(a,this.instances);b!=-1&&this.oldInstances.push(this.instances.splice(b,1)[0]);this.instances.length===0&&c([document,window]).unbind(".dialog-overlay");a.remove();var d=0;c.each(this.instances,function(){d=Math.max(d,this.css("z-index"))});this.maxZ=d},height:function(){var a,b;if(c.browser.msie&&
+c.browser.version<7){a=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);b=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return a<b?c(window).height()+"px":a+"px"}else return c(document).height()+"px"},width:function(){var a,b;if(c.browser.msie){a=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);b=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return a<b?c(window).width()+"px":a+"px"}else return c(document).width()+
+"px"},resize:function(){var a=c([]);c.each(c.ui.dialog.overlay.instances,function(){a=a.add(this)});a.css({width:0,height:0}).css({width:c.ui.dialog.overlay.width(),height:c.ui.dialog.overlay.height()})}});c.extend(c.ui.dialog.overlay.prototype,{destroy:function(){c.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);
+;/*
+ * jQuery UI Slider 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.slider",d.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var a=this,b=this.options,c=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f=b.values&&b.values.length||1,e=[];this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+
+this.orientation+" ui-widget ui-widget-content ui-corner-all"+(b.disabled?" ui-slider-disabled ui-disabled":""));this.range=d([]);if(b.range){if(b.range===true){if(!b.values)b.values=[this._valueMin(),this._valueMin()];if(b.values.length&&b.values.length!==2)b.values=[b.values[0],b.values[0]]}this.range=d("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(b.range==="min"||b.range==="max"?" ui-slider-range-"+b.range:""))}for(var j=c.length;j<f;j+=1)e.push("<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>");
+this.handles=c.add(d(e.join("")).appendTo(a.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(g){g.preventDefault()}).hover(function(){b.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(b.disabled)d(this).blur();else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(g){d(this).data("index.ui-slider-handle",
+g)});this.handles.keydown(function(g){var k=true,l=d(this).data("index.ui-slider-handle"),i,h,m;if(!a.options.disabled){switch(g.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:k=false;if(!a._keySliding){a._keySliding=true;d(this).addClass("ui-state-active");i=a._start(g,l);if(i===false)return}break}m=a.options.step;i=a.options.values&&a.options.values.length?
+(h=a.values(l)):(h=a.value());switch(g.keyCode){case d.ui.keyCode.HOME:h=a._valueMin();break;case d.ui.keyCode.END:h=a._valueMax();break;case d.ui.keyCode.PAGE_UP:h=a._trimAlignValue(i+(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:h=a._trimAlignValue(i-(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(i===a._valueMax())return;h=a._trimAlignValue(i+m);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(i===a._valueMin())return;h=a._trimAlignValue(i-
+m);break}a._slide(g,l,h);return k}}).keyup(function(g){var k=d(this).data("index.ui-slider-handle");if(a._keySliding){a._keySliding=false;a._stop(g,k);a._change(g,k);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy();
+return this},_mouseCapture:function(a){var b=this.options,c,f,e,j,g;if(b.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:a.pageX,y:a.pageY});f=this._valueMax()-this._valueMin()+1;j=this;this.handles.each(function(k){var l=Math.abs(c-j.values(k));if(f>l){f=l;e=d(this);g=k}});if(b.range===true&&this.values(1)===b.min){g+=1;e=d(this.handles[g])}if(this._start(a,g)===false)return false;
+this._mouseSliding=true;j._handleIndex=g;e.addClass("ui-state-active").focus();b=e.offset();this._clickOffset=!d(a.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:a.pageX-b.left-e.width()/2,top:a.pageY-b.top-e.height()/2-(parseInt(e.css("borderTopWidth"),10)||0)-(parseInt(e.css("borderBottomWidth"),10)||0)+(parseInt(e.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(a,g,c);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(a){var b=
+this._normValueFromMouse({x:a.pageX,y:a.pageY});this._slide(a,this._handleIndex,b);return false},_mouseStop:function(a){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(a,this._handleIndex);this._change(a,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b;if(this.orientation==="horizontal"){b=
+this.elementSize.width;a=a.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{b=this.elementSize.height;a=a.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}b=a/b;if(b>1)b=1;if(b<0)b=0;if(this.orientation==="vertical")b=1-b;a=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+b*a)},_start:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);
+c.values=this.values()}return this._trigger("start",a,c)},_slide:function(a,b,c){var f;if(this.options.values&&this.options.values.length){f=this.values(b?0:1);if(this.options.values.length===2&&this.options.range===true&&(b===0&&c>f||b===1&&c<f))c=f;if(c!==this.values(b)){f=this.values();f[b]=c;a=this._trigger("slide",a,{handle:this.handles[b],value:c,values:f});this.values(b?0:1);a!==false&&this.values(b,c,true)}}else if(c!==this.value()){a=this._trigger("slide",a,{handle:this.handles[b],value:c});
+a!==false&&this.value(c)}},_stop:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("stop",a,c)},_change:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("change",a,c)}},value:function(a){if(arguments.length){this.options.value=
+this._trimAlignValue(a);this._refreshValue();this._change(null,0)}else return this._value()},values:function(a,b){var c,f,e;if(arguments.length>1){this.options.values[a]=this._trimAlignValue(b);this._refreshValue();this._change(null,a)}else if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;f=arguments[0];for(e=0;e<c.length;e+=1){c[e]=this._trimAlignValue(f[e]);this._change(null,e)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(a):
+this.value();else return this._values()},_setOption:function(a,b){var c,f=0;if(d.isArray(this.options.values))f=this.options.values.length;d.Widget.prototype._setOption.apply(this,arguments);switch(a){case "disabled":if(b){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.propAttr("disabled",true);this.element.addClass("ui-disabled")}else{this.handles.propAttr("disabled",false);this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation();
+this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(c=0;c<f;c+=1)this._change(null,c);this._animateOff=false;break}},_value:function(){var a=this.options.value;return a=this._trimAlignValue(a)},_values:function(a){var b,c;if(arguments.length){b=this.options.values[a];
+return b=this._trimAlignValue(b)}else{b=this.options.values.slice();for(c=0;c<b.length;c+=1)b[c]=this._trimAlignValue(b[c]);return b}},_trimAlignValue:function(a){if(a<=this._valueMin())return this._valueMin();if(a>=this._valueMax())return this._valueMax();var b=this.options.step>0?this.options.step:1,c=(a-this._valueMin())%b;a=a-c;if(Math.abs(c)*2>=b)a+=c>0?b:-b;return parseFloat(a.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var a=
+this.options.range,b=this.options,c=this,f=!this._animateOff?b.animate:false,e,j={},g,k,l,i;if(this.options.values&&this.options.values.length)this.handles.each(function(h){e=(c.values(h)-c._valueMin())/(c._valueMax()-c._valueMin())*100;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";d(this).stop(1,1)[f?"animate":"css"](j,b.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(h===0)c.range.stop(1,1)[f?"animate":"css"]({left:e+"%"},b.animate);if(h===1)c.range[f?"animate":"css"]({width:e-
+g+"%"},{queue:false,duration:b.animate})}else{if(h===0)c.range.stop(1,1)[f?"animate":"css"]({bottom:e+"%"},b.animate);if(h===1)c.range[f?"animate":"css"]({height:e-g+"%"},{queue:false,duration:b.animate})}g=e});else{k=this.value();l=this._valueMin();i=this._valueMax();e=i!==l?(k-l)/(i-l)*100:0;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";this.handle.stop(1,1)[f?"animate":"css"](j,b.animate);if(a==="min"&&this.orientation==="horizontal")this.range.stop(1,1)[f?"animate":"css"]({width:e+"%"},
+b.animate);if(a==="max"&&this.orientation==="horizontal")this.range[f?"animate":"css"]({width:100-e+"%"},{queue:false,duration:b.animate});if(a==="min"&&this.orientation==="vertical")this.range.stop(1,1)[f?"animate":"css"]({height:e+"%"},b.animate);if(a==="max"&&this.orientation==="vertical")this.range[f?"animate":"css"]({height:100-e+"%"},{queue:false,duration:b.animate})}}});d.extend(d.ui.slider,{version:"1.8.16"})})(jQuery);
+;/*
+ * jQuery UI Tabs 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(d,p){function u(){return++v}function w(){return++x}var v=0,x=0;d.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(b,e){if(b=="selected")this.options.collapsible&&
+e==this.options.selected||this.select(e);else{this.options[b]=e;this._tabify()}},_tabId:function(b){return b.title&&b.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+u()},_sanitizeSelector:function(b){return b.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+w());return d.cookie.apply(null,[b].concat(d.makeArray(arguments)))},_ui:function(b,e){return{tab:b,panel:e,index:this.anchors.index(b)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b=
+d(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(b){function e(g,f){g.css("display","");!d.support.opacity&&f.opacity&&g[0].style.removeAttribute("filter")}var a=this,c=this.options,h=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=d(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return d("a",this)[0]});this.panels=d([]);this.anchors.each(function(g,f){var i=d(f).attr("href"),l=i.split("#")[0],q;if(l&&(l===location.toString().split("#")[0]||
+(q=d("base")[0])&&l===q.href)){i=f.hash;f.href=i}if(h.test(i))a.panels=a.panels.add(a.element.find(a._sanitizeSelector(i)));else if(i&&i!=="#"){d.data(f,"href.tabs",i);d.data(f,"load.tabs",i.replace(/#.*$/,""));i=a._tabId(f);f.href="#"+i;f=a.element.find("#"+i);if(!f.length){f=d(c.panelTemplate).attr("id",i).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(a.panels[g-1]||a.list);f.data("destroy.tabs",true)}a.panels=a.panels.add(f)}else c.disabled.push(g)});if(b){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");
+this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(c.selected===p){location.hash&&this.anchors.each(function(g,f){if(f.hash==location.hash){c.selected=g;return false}});if(typeof c.selected!=="number"&&c.cookie)c.selected=parseInt(a._cookie(),10);if(typeof c.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)c.selected=
+this.lis.index(this.lis.filter(".ui-tabs-selected"));c.selected=c.selected||(this.lis.length?0:-1)}else if(c.selected===null)c.selected=-1;c.selected=c.selected>=0&&this.anchors[c.selected]||c.selected<0?c.selected:0;c.disabled=d.unique(c.disabled.concat(d.map(this.lis.filter(".ui-state-disabled"),function(g){return a.lis.index(g)}))).sort();d.inArray(c.selected,c.disabled)!=-1&&c.disabled.splice(d.inArray(c.selected,c.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");
+if(c.selected>=0&&this.anchors.length){a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(c.selected).addClass("ui-tabs-selected ui-state-active");a.element.queue("tabs",function(){a._trigger("show",null,a._ui(a.anchors[c.selected],a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash))[0]))});this.load(c.selected)}d(window).bind("unload",function(){a.lis.add(a.anchors).unbind(".tabs");a.lis=a.anchors=a.panels=null})}else c.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));
+this.element[c.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");c.cookie&&this._cookie(c.selected,c.cookie);b=0;for(var j;j=this.lis[b];b++)d(j)[d.inArray(b,c.disabled)!=-1&&!d(j).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");c.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(c.event!=="mouseover"){var k=function(g,f){f.is(":not(.ui-state-disabled)")&&f.addClass("ui-state-"+g)},n=function(g,f){f.removeClass("ui-state-"+
+g)};this.lis.bind("mouseover.tabs",function(){k("hover",d(this))});this.lis.bind("mouseout.tabs",function(){n("hover",d(this))});this.anchors.bind("focus.tabs",function(){k("focus",d(this).closest("li"))});this.anchors.bind("blur.tabs",function(){n("focus",d(this).closest("li"))})}var m,o;if(c.fx)if(d.isArray(c.fx)){m=c.fx[0];o=c.fx[1]}else m=o=c.fx;var r=o?function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.hide().removeClass("ui-tabs-hide").animate(o,o.duration||"normal",
+function(){e(f,o);a._trigger("show",null,a._ui(g,f[0]))})}:function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.removeClass("ui-tabs-hide");a._trigger("show",null,a._ui(g,f[0]))},s=m?function(g,f){f.animate(m,m.duration||"normal",function(){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");e(f,m);a.element.dequeue("tabs")})}:function(g,f){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");a.element.dequeue("tabs")};
+this.anchors.bind(c.event+".tabs",function(){var g=this,f=d(g).closest("li"),i=a.panels.filter(":not(.ui-tabs-hide)"),l=a.element.find(a._sanitizeSelector(g.hash));if(f.hasClass("ui-tabs-selected")&&!c.collapsible||f.hasClass("ui-state-disabled")||f.hasClass("ui-state-processing")||a.panels.filter(":animated").length||a._trigger("select",null,a._ui(this,l[0]))===false){this.blur();return false}c.selected=a.anchors.index(this);a.abort();if(c.collapsible)if(f.hasClass("ui-tabs-selected")){c.selected=
+-1;c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){s(g,i)}).dequeue("tabs");this.blur();return false}else if(!i.length){c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this));this.blur();return false}c.cookie&&a._cookie(c.selected,c.cookie);if(l.length){i.length&&a.element.queue("tabs",function(){s(g,i)});a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier.";
+d.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(b){if(typeof b=="string")b=this.anchors.index(this.anchors.filter("[href$="+b+"]"));return b},destroy:function(){var b=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var e=
+d.data(this,"href.tabs");if(e)this.href=e;var a=d(this).unbind(".tabs");d.each(["href","load","cache"],function(c,h){a.removeData(h+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){d.data(this,"destroy.tabs")?d(this).remove():d(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});b.cookie&&this._cookie(null,b.cookie);return this},add:function(b,
+e,a){if(a===p)a=this.anchors.length;var c=this,h=this.options;e=d(h.tabTemplate.replace(/#\{href\}/g,b).replace(/#\{label\}/g,e));b=!b.indexOf("#")?b.replace("#",""):this._tabId(d("a",e)[0]);e.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var j=c.element.find("#"+b);j.length||(j=d(h.panelTemplate).attr("id",b).data("destroy.tabs",true));j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(a>=this.lis.length){e.appendTo(this.list);j.appendTo(this.list[0].parentNode)}else{e.insertBefore(this.lis[a]);
+j.insertBefore(this.panels[a])}h.disabled=d.map(h.disabled,function(k){return k>=a?++k:k});this._tabify();if(this.anchors.length==1){h.selected=0;e.addClass("ui-tabs-selected ui-state-active");j.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){c._trigger("show",null,c._ui(c.anchors[0],c.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[a],this.panels[a]));return this},remove:function(b){b=this._getIndex(b);var e=this.options,a=this.lis.eq(b).remove(),c=this.panels.eq(b).remove();
+if(a.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(b+(b+1<this.anchors.length?1:-1));e.disabled=d.map(d.grep(e.disabled,function(h){return h!=b}),function(h){return h>=b?--h:h});this._tabify();this._trigger("remove",null,this._ui(a.find("a")[0],c[0]));return this},enable:function(b){b=this._getIndex(b);var e=this.options;if(d.inArray(b,e.disabled)!=-1){this.lis.eq(b).removeClass("ui-state-disabled");e.disabled=d.grep(e.disabled,function(a){return a!=b});this._trigger("enable",null,
+this._ui(this.anchors[b],this.panels[b]));return this}},disable:function(b){b=this._getIndex(b);var e=this.options;if(b!=e.selected){this.lis.eq(b).addClass("ui-state-disabled");e.disabled.push(b);e.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[b],this.panels[b]))}return this},select:function(b){b=this._getIndex(b);if(b==-1)if(this.options.collapsible&&this.options.selected!=-1)b=this.options.selected;else return this;this.anchors.eq(b).trigger(this.options.event+".tabs");return this},
+load:function(b){b=this._getIndex(b);var e=this,a=this.options,c=this.anchors.eq(b)[0],h=d.data(c,"load.tabs");this.abort();if(!h||this.element.queue("tabs").length!==0&&d.data(c,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(b).addClass("ui-state-processing");if(a.spinner){var j=d("span",c);j.data("label.tabs",j.html()).html(a.spinner)}this.xhr=d.ajax(d.extend({},a.ajaxOptions,{url:h,success:function(k,n){e.element.find(e._sanitizeSelector(c.hash)).html(k);e._cleanup();a.cache&&d.data(c,
+"cache.tabs",true);e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.success(k,n)}catch(m){}},error:function(k,n){e._cleanup();e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.error(k,n,b,c)}catch(m){}}}));e.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},
+url:function(b,e){this.anchors.eq(b).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.16"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(b,e){var a=this,c=this.options,h=a._rotate||(a._rotate=function(j){clearTimeout(a.rotation);a.rotation=setTimeout(function(){var k=c.selected;a.select(++k<a.anchors.length?k:0)},b);j&&j.stopPropagation()});e=a._unrotate||(a._unrotate=!e?function(j){j.clientX&&
+a.rotate(null)}:function(){t=c.selected;h()});if(b){this.element.bind("tabsshow",h);this.anchors.bind(c.event+".tabs",e);h()}else{clearTimeout(a.rotation);this.element.unbind("tabsshow",h);this.anchors.unbind(c.event+".tabs",e);delete this._rotate;delete this._unrotate}return this}})})(jQuery);
+;/*
+ * jQuery UI Datepicker 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ */
+(function(d,C){function M(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
+"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
+"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
+minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false,disabled:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=N(d('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}function N(a){return a.bind("mouseout",
+function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");b.length&&b.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(d.datepicker._isDisabledDatepicker(J.inline?a.parent()[0]:J.input[0])||!b.length)){b.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
+b.addClass("ui-state-hover");b.hasClass("ui-datepicker-prev")&&b.addClass("ui-datepicker-prev-hover");b.hasClass("ui-datepicker-next")&&b.addClass("ui-datepicker-next-hover")}})}function H(a,b){d.extend(a,b);for(var c in b)if(b[c]==null||b[c]==C)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.16"}});var B=(new Date).getTime(),J;d.extend(M.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},
+setDefaults:function(a){H(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,
+"\\\\$1"),input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:N(d('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}},_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",
+function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b);b.settings.disabled&&this._disableDatepicker(a)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&b.append.remove();if(c){b.append=d('<span class="'+this._appendClass+'">'+c+"</span>");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c==
+"focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c=this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("<img/>").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('<button type="button"></button>').addClass(this._triggerClass).html(f==""?c:d("<img/>").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():
+d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;g<f.length;g++)if(f[g].length>h){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,
+b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),true);this._updateDatepicker(b);this._updateAlternate(b);b.settings.disabled&&this._disableDatepicker(a);b.dpDiv.css("display","block")}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=
+1;this._dialogInput=d('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}H(a.settings,e||{});b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/
+2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b=
+d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=
+a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().removeClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a,
+"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().addClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==
+a?null:f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return true;return false},_getInst:function(a){try{return d.data(a,"datepicker")}catch(b){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(a,b,c){var e=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?d.extend({},d.datepicker._defaults):e?b=="all"?
+d.extend({},e.settings):this._get(e,b):null;var f=b||{};if(typeof b=="string"){f={};f[b]=c}if(e){this._curInst==e&&this._hideDatepicker();var h=this._getDateDatepicker(a,true),i=this._getMinMaxDate(e,"min"),g=this._getMinMaxDate(e,"max");H(e.settings,f);if(i!==null&&f.dateFormat!==C&&f.minDate===C)e.settings.minDate=this._formatDate(e,i);if(g!==null&&f.dateFormat!==C&&f.maxDate===C)e.settings.maxDate=this._formatDate(e,g);this._attachments(d(a),e);this._autoSize(e);this._setDate(e,h);this._updateAlternate(e);
+this._updateDatepicker(e)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){(a=this._getInst(a))&&this._updateDatepicker(a)},_setDateDatepicker:function(a,b){if(a=this._getInst(a)){this._setDate(a,b);this._updateDatepicker(a);this._updateAlternate(a)}},_getDateDatepicker:function(a,b){(a=this._getInst(a))&&!a.inline&&this._setDateFromField(a,b);return a?this._getDate(a):null},_doKeyDown:function(a){var b=d.datepicker._getInst(a.target),c=true,e=b.dpDiv.is(".ui-datepicker-rtl");
+b._keyEvent=true;if(d.datepicker._datepickerShowing)switch(a.keyCode){case 9:d.datepicker._hideDatepicker();c=false;break;case 13:c=d("td."+d.datepicker._dayOverClass+":not(."+d.datepicker._currentClass+")",b.dpDiv);c[0]&&d.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,c[0]);if(a=d.datepicker._get(b,"onSelect")){c=d.datepicker._formatDate(b);a.apply(b.input?b.input[0]:null,[c,b])}else d.datepicker._hideDatepicker();return false;case 27:d.datepicker._hideDatepicker();break;case 33:d.datepicker._adjustDate(a.target,
+a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 34:d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 35:if(a.ctrlKey||a.metaKey)d.datepicker._clearDate(a.target);c=a.ctrlKey||a.metaKey;break;case 36:if(a.ctrlKey||a.metaKey)d.datepicker._gotoToday(a.target);c=a.ctrlKey||a.metaKey;break;case 37:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?+1:-1,"D");c=
+a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 38:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,-7,"D");c=a.ctrlKey||a.metaKey;break;case 39:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?-1:+1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,
+"stepMonths"),"M");break;case 40:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,+7,"D");c=a.ctrlKey||a.metaKey;break;default:c=false}else if(a.keyCode==36&&a.ctrlKey)d.datepicker._showDatepicker(this);else c=false;if(c){a.preventDefault();a.stopPropagation()}},_doKeyPress:function(a){var b=d.datepicker._getInst(a.target);if(d.datepicker._get(b,"constrainInput")){b=d.datepicker._possibleChars(d.datepicker._get(b,"dateFormat"));var c=String.fromCharCode(a.charCode==C?a.keyCode:a.charCode);
+return a.ctrlKey||a.metaKey||c<" "||!b||b.indexOf(c)>-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a);d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input",
+a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);if(d.datepicker._curInst&&d.datepicker._curInst!=b){d.datepicker._datepickerShowing&&d.datepicker._triggerOnClose(d.datepicker._curInst);d.datepicker._curInst.dpDiv.stop(true,true)}var c=d.datepicker._get(b,"beforeShow");c=c?c.apply(a,[a,b]):{};if(c!==false){H(b.settings,c);b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value=
+"";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c={left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);
+c=d.datepicker._checkOffset(b,c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){var i=b.dpDiv.find("iframe.ui-datepicker-cover");if(i.length){var g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0],top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.datepicker._datepickerShowing=
+true;d.effects&&d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}}},_updateDatepicker:function(a){this.maxRows=4;var b=d.datepicker._getBorders(a.dpDiv);J=a;a.dpDiv.empty().append(this._generateHTML(a));var c=a.dpDiv.find("iframe.ui-datepicker-cover");c.length&&c.css({left:-b[0],top:-b[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()});
+a.dpDiv.find("."+this._dayOverClass+" a").mouseover();b=this._getNumberOfMonths(a);c=b[1];a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");c>1&&a.dpDiv.addClass("ui-datepicker-multi-"+c).css("width",17*c+"em");a.dpDiv[(b[0]!=1||b[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&
+!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var e=a.yearshtml;setTimeout(function(){e===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);e=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]||c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),
+h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e-g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b=
+this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1||d.expr.filters.hidden(a));)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_triggerOnClose:function(a){var b=this._get(a,"onClose");if(b)b.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a])},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);
+this._curInst=null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();d.datepicker._triggerOnClose(b);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},
+_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):
+0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e["selected"+(c=="M"?
+"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a);
+this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField");
+if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b=a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?
+b.toString():b+"";if(b=="")return null;var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;e=typeof e!="string"?e:(new Date).getFullYear()%100+parseInt(e,10);for(var f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=A+1<a.length&&a.charAt(A+1)==p)&&A++;return p},m=function(p){var D=
+o(p);p=new RegExp("^\\d{1,"+(p=="@"?14:p=="!"?20:p=="y"&&D?4:p=="o"?3:2)+"}");p=b.substring(q).match(p);if(!p)throw"Missing number at position "+q;q+=p[0].length;return parseInt(p[0],10)},n=function(p,D,K){p=d.map(o(p)?K:D,function(w,x){return[[x,w]]}).sort(function(w,x){return-(w[1].length-x[1].length)});var E=-1;d.each(p,function(w,x){w=x[1];if(b.substr(q,w.length).toLowerCase()==w.toLowerCase()){E=x[0];q+=w.length;return false}});if(E!=-1)return E+1;else throw"Unknown name at position "+q;},s=
+function(){if(b.charAt(q)!=a.charAt(A))throw"Unexpected literal at position "+q;q++},q=0,A=0;A<a.length;A++)if(k)if(a.charAt(A)=="'"&&!o("'"))k=false;else s();else switch(a.charAt(A)){case "d":l=m("d");break;case "D":n("D",f,h);break;case "o":u=m("o");break;case "m":j=m("m");break;case "M":j=n("M",i,g);break;case "y":c=m("y");break;case "@":var v=new Date(m("@"));c=v.getFullYear();j=v.getMonth()+1;l=v.getDate();break;case "!":v=new Date((m("!")-this._ticksTo1970)/1E4);c=v.getFullYear();j=v.getMonth()+
+1;l=v.getDate();break;case "'":if(o("'"))s();else k=true;break;default:s()}if(q<b.length)throw"Extra/unparsed characters found in date: "+b.substring(q);if(c==-1)c=(new Date).getFullYear();else if(c<100)c+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c<=e?0:-100);if(u>-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}v=this._daylightSavingAdjust(new Date(c,j-1,l));if(v.getFullYear()!=c||v.getMonth()+1!=j||v.getDate()!=l)throw"Invalid date";return v},ATOM:"yy-mm-dd",
+COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:
+null)||this._defaults.monthNames;var i=function(o){(o=k+1<a.length&&a.charAt(k+1)==o)&&k++;return o},g=function(o,m,n){m=""+m;if(i(o))for(;m.length<n;)m="0"+m;return m},j=function(o,m,n,s){return i(o)?s[m]:n[m]},l="",u=false;if(b)for(var k=0;k<a.length;k++)if(u)if(a.charAt(k)=="'"&&!i("'"))u=false;else l+=a.charAt(k);else switch(a.charAt(k)){case "d":l+=g("d",b.getDate(),2);break;case "D":l+=j("D",b.getDay(),e,f);break;case "o":l+=g("o",Math.round(((new Date(b.getFullYear(),b.getMonth(),b.getDate())).getTime()-
+(new Date(b.getFullYear(),0,0)).getTime())/864E5),3);break;case "m":l+=g("m",b.getMonth()+1,2);break;case "M":l+=j("M",b.getMonth(),h,c);break;case "y":l+=i("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case "@":l+=b.getTime();break;case "!":l+=b.getTime()*1E4+this._ticksTo1970;break;case "'":if(i("'"))l+="'";else u=true;break;default:l+=a.charAt(k)}return l},_possibleChars:function(a){for(var b="",c=false,e=function(h){(h=f+1<a.length&&a.charAt(f+1)==h)&&f++;return h},f=
+0;f<a.length;f++)if(c)if(a.charAt(f)=="'"&&!e("'"))c=false;else b+=a.charAt(f);else switch(a.charAt(f)){case "d":case "m":case "y":case "@":b+="0123456789";break;case "D":case "M":return null;case "'":if(e("'"))b+="'";else c=true;break;default:b+=a.charAt(f)}return b},_get:function(a,b){return a.settings[b]!==C?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var c=this._get(a,"dateFormat"),e=a.lastVal=a.input?a.input.val():null,f,h;f=h=this._getDefaultDate(a);
+var i=this._getFormatConfig(a);try{f=this.parseDate(c,e,i)||h}catch(g){this.log(g);e=b?"":e}a.selectedDay=f.getDate();a.drawMonth=a.selectedMonth=f.getMonth();a.drawYear=a.selectedYear=f.getFullYear();a.currentDay=e?f.getDate():0;a.currentMonth=e?f.getMonth():0;a.currentYear=e?f.getFullYear():0;this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var e=function(h){var i=new Date;
+i.setDate(i.getDate()+h);return i},f=function(h){try{return d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),h,d.datepicker._getFormatConfig(a))}catch(i){}var g=(h.toLowerCase().match(/^c/)?d.datepicker._getDate(a):null)||new Date,j=g.getFullYear(),l=g.getMonth();g=g.getDate();for(var u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,k=u.exec(h);k;){switch(k[2]||"d"){case "d":case "D":g+=parseInt(k[1],10);break;case "w":case "W":g+=parseInt(k[1],10)*7;break;case "m":case "M":l+=parseInt(k[1],10);g=
+Math.min(g,d.datepicker._getDaysInMonth(j,l));break;case "y":case "Y":j+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break}k=u.exec(h)}return new Date(j,l,g)};if(b=(b=b==null||b===""?c:typeof b=="string"?f(b):typeof b=="number"?isNaN(b)?c:e(b):new Date(b.getTime()))&&b.toString()=="Invalid Date"?c:b){b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0)}return this._daylightSavingAdjust(b)},_daylightSavingAdjust:function(a){if(!a)return null;a.setHours(a.getHours()>
+12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&&
+a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay?
+new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n=this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&n<k?k:n;this._daylightSavingAdjust(new Date(m,g,1))>n;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-j,1)),this._getFormatConfig(a));
+n=this._canAdjustMonth(a,-1,m,g)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+B+".datepicker._adjustDate('#"+a.id+"', -"+j+", 'M');\" title=\""+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>":f?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>";var s=this._get(a,"nextText");s=!h?s:this.formatDate(s,this._daylightSavingAdjust(new Date(m,
+g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+B+".datepicker._adjustDate('#"+a.id+"', +"+j+", 'M');\" title=\""+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>":f?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>";j=this._get(a,"currentText");s=this._get(a,"gotoCurrent")&&
+a.currentDay?u:b;j=!h?j:this.formatDate(j,s,this._getFormatConfig(a));h=!a.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+B+'.datepicker._hideDatepicker();">'+this._get(a,"closeText")+"</button>":"";e=e?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?h:"")+(this._isInRange(a,s)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+
+B+".datepicker._gotoToday('#"+a.id+"');\">"+j+"</button>":"")+(c?"":h)+"</div>":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");s=this._get(a,"dayNames");this._get(a,"dayNamesShort");var q=this._get(a,"dayNamesMin"),A=this._get(a,"monthNames"),v=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),D=this._get(a,"showOtherMonths"),K=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var E=this._getDefaultDate(a),w="",x=0;x<i[0];x++){var O=
+"";this.maxRows=4;for(var G=0;G<i[1];G++){var P=this._daylightSavingAdjust(new Date(m,g,a.selectedDay)),t=" ui-corner-all",y="";if(l){y+='<div class="ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right":"left");break;case i[1]-1:y+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:y+=" ui-datepicker-group-middle";t="";break}y+='">'}y+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+t+'">'+(/all|left/.test(t)&&
+x==0?c?f:n:"")+(/all|right/.test(t)&&x==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,x>0||G>0,A,v)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var z=j?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(t=0;t<7;t++){var r=(t+h)%7;z+="<th"+((t+h+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+s[r]+'">'+q[r]+"</span></th>"}y+=z+"</tr></thead><tbody>";z=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,
+z);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;z=Math.ceil((t+z)/7);this.maxRows=z=l?this.maxRows>z?this.maxRows:z:z;r=this._daylightSavingAdjust(new Date(m,g,1-t));for(var Q=0;Q<z;Q++){y+="<tr>";var R=!j?"":'<td class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(r)+"</td>";for(t=0;t<7;t++){var I=p?p.apply(a.input?a.input[0]:null,[r]):[true,""],F=r.getMonth()!=g,L=F&&!K||!I[0]||k&&r<k||o&&r>o;R+='<td class="'+((t+h+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(r.getTime()==
+P.getTime()&&g==a.selectedMonth&&a._keyEvent||E.getTime()==r.getTime()&&E.getTime()==P.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!D?"":" "+I[1]+(r.getTime()==u.getTime()?" "+this._currentClass:"")+(r.getTime()==b.getTime()?" ui-datepicker-today":""))+'"'+((!F||D)&&I[2]?' title="'+I[2]+'"':"")+(L?"":' onclick="DP_jQuery_'+B+".datepicker._selectDay('#"+a.id+"',"+r.getMonth()+","+r.getFullYear()+', this);return false;"')+">"+(F&&!D?"&#xa0;":L?'<span class="ui-state-default">'+
+r.getDate()+"</span>":'<a class="ui-state-default'+(r.getTime()==b.getTime()?" ui-state-highlight":"")+(r.getTime()==u.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+'" href="#">'+r.getDate()+"</a>")+"</td>";r.setDate(r.getDate()+1);r=this._daylightSavingAdjust(r)}y+=R+"</tr>"}g++;if(g>11){g=0;m++}y+="</tbody></table>"+(l?"</div>"+(i[0]>0&&G==i[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");O+=y}w+=O}w+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':
+"");a._keyEvent=false;return w},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var j=this._get(a,"changeMonth"),l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='<div class="ui-datepicker-title">',o="";if(h||!j)o+='<span class="ui-datepicker-month">'+i[b]+"</span>";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+B+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" >";for(var n=0;n<12;n++)if((!i||n>=e.getMonth())&&
+(!m||n<=f.getMonth()))o+='<option value="'+n+'"'+(n==b?' selected="selected"':"")+">"+g[n]+"</option>";o+="</select>"}u||(k+=o+(h||!(j&&l)?"&#xa0;":""));if(!a.yearshtml){a.yearshtml="";if(h||!l)k+='<span class="ui-datepicker-year">'+c+"</span>";else{g=this._get(a,"yearRange").split(":");var s=(new Date).getFullYear();i=function(q){q=q.match(/c[+-].*/)?c+parseInt(q.substring(1),10):q.match(/[+-].*/)?s+parseInt(q,10):parseInt(q,10);return isNaN(q)?s:q};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b,
+e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):g;for(a.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+B+".datepicker._selectMonthYear('#"+a.id+"', this, 'Y');\" >";b<=g;b++)a.yearshtml+='<option value="'+b+'"'+(b==c?' selected="selected"':"")+">"+b+"</option>";a.yearshtml+="</select>";k+=a.yearshtml;a.yearshtml=null}}k+=this._get(a,"yearSuffix");if(u)k+=(h||!(j&&l)?"&#xa0;":"")+o;k+="</div>";return k},_adjustInstDate:function(a,b,c){var e=a.drawYear+(c=="Y"?b:0),f=a.drawMonth+
+(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&b<c?c:b;return b=a&&b>a?a:b},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");if(b)b.apply(a.input?
+a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a);c=this._daylightSavingAdjust(new Date(c,
+e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,
+"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=function(a){if(!this.length)return this;
+if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));return this.each(function(){typeof a==
+"string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new M;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.16";window["DP_jQuery_"+B]=d})(jQuery);
+;/*
+ * jQuery UI Progressbar 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar
+ *
+ * Depends:
+ *   jquery.ui.core.js
+ *   jquery.ui.widget.js
+ */
+(function(b,d){b.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()});this.valueDiv=b("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element);this.oldValue=this._value();this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow");
+this.valueDiv.remove();b.Widget.prototype.destroy.apply(this,arguments)},value:function(a){if(a===d)return this._value();this._setOption("value",a);return this},_setOption:function(a,c){if(a==="value"){this.options.value=c;this._refreshValue();this._value()===this.options.max&&this._trigger("complete")}b.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;if(typeof a!=="number")a=0;return Math.min(this.options.max,Math.max(this.min,a))},_percentage:function(){return 100*
+this._value()/this.options.max},_refreshValue:function(){var a=this.value(),c=this._percentage();if(this.oldValue!==a){this.oldValue=a;this._trigger("change")}this.valueDiv.toggle(a>this.min).toggleClass("ui-corner-right",a===this.options.max).width(c.toFixed(0)+"%");this.element.attr("aria-valuenow",a)}});b.extend(b.ui.progressbar,{version:"1.8.16"})})(jQuery);
+;/*
+ * jQuery UI Effects 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/
+ */
+jQuery.effects||function(f,j){function m(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1],
+16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return n.transparent;return n[f.trim(c).toLowerCase()]}function s(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return m(b)}function o(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
+a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function p(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in t||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function u(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d=
+a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:b in f.fx.speeds?f.fx.speeds[b]:f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}function l(c){if(!c||typeof c==="number"||f.fx.speeds[c])return true;if(typeof c==="string"&&!f.effects[c])return true;return false}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor",
+"borderTopColor","borderColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=s(b.elem,a);b.end=m(b.end);b.colorInit=true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var n={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,
+0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,
+211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},q=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b,
+d){if(f.isFunction(b)){d=b;b=null}return this.queue(function(){var e=f(this),g=e.attr("style")||" ",h=p(o.call(this)),r,v=e.attr("class");f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});r=p(o.call(this));e.attr("class",v);e.animate(u(h,r),{queue:false,duration:a,easing:b,complete:function(){f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments);f.dequeue(this)}})})};
+f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,a):f.effects.animateClass.apply(this,
+[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.16",save:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.data("ec.storage."+a[b],c[0].style[a[b]])},restore:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.css(a[b],c.data("ec.storage."+a[b]))},setMode:function(c,a){if(a=="toggle")a=c.is(":hidden")?"show":"hide";return a},getBaseline:function(c,a){var b;switch(c[0]){case "top":b=
+0;break;case "middle":b=0.5;break;case "bottom":b=1;break;default:b=c[0]/a.height}switch(c[1]){case "left":c=0;break;case "center":c=0.5;break;case "right":c=1;break;default:c=c[1]/a.width}return{x:c,y:b}},createWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent();var a={width:c.outerWidth(true),height:c.outerHeight(true),"float":c.css("float")},b=f("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),
+d=document.activeElement;c.wrap(b);if(c[0]===d||f.contains(c[0],d))f(d).focus();b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(e,g){a[g]=c.css(g);if(isNaN(parseInt(a[g],10)))a[g]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){var a,b=document.activeElement;
+if(c.parent().is(".ui-effects-wrapper")){a=c.parent().replaceWith(c);if(c[0]===b||f.contains(c[0],b))f(b).focus();return a}return c},setTransition:function(c,a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});
+return d.call(this,b)},_show:f.fn.show,show:function(c){if(l(c))return this._show.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(l(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(l(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,
+arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),b=[];f.each(["em","px","%","pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/
+2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,a,b,d,e){return d*((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,
+d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,
+a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==e)return b+d;if((a/=e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,
+d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g))+b},easeOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*a)*Math.sin((a*e-c)*2*Math.PI/g)+d+b},easeInOutElastic:function(c,a,b,d,e){c=1.70158;var g=
+0,h=d;if(a==0)return b;if((a/=e/2)==2)return b+d;g||(g=e*0.3*1.5);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);if(a<1)return-0.5*h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)+b;return h*Math.pow(2,-10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)*0.5+d+b},easeInBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*(a/=e)*a*((g+1)*a-g)+b},easeOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*((a=a/e-1)*a*((g+1)*a+g)+1)+b},easeInOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;
+if((a/=e/2)<1)return d/2*a*a*(((g*=1.525)+1)*a-g)+b;return d/2*((a-=2)*a*(((g*=1.525)+1)*a+g)+2)+b},easeInBounce:function(c,a,b,d,e){return d-f.easing.easeOutBounce(c,e-a,0,d,e)+b},easeOutBounce:function(c,a,b,d,e){return(a/=e)<1/2.75?d*7.5625*a*a+b:a<2/2.75?d*(7.5625*(a-=1.5/2.75)*a+0.75)+b:a<2.5/2.75?d*(7.5625*(a-=2.25/2.75)*a+0.9375)+b:d*(7.5625*(a-=2.625/2.75)*a+0.984375)+b},easeInOutBounce:function(c,a,b,d,e){if(a<e/2)return f.easing.easeInBounce(c,a*2,0,d,e)*0.5+b;return f.easing.easeOutBounce(c,
+a*2-e,0,d,e)*0.5+d*0.5+b}})}(jQuery);
+;/*
+ * jQuery UI Effects Blind 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Blind
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.blind=function(c){return this.queue(function(){var a=b(this),g=["position","top","bottom","left","right"],f=b.effects.setMode(a,c.options.mode||"hide"),d=c.options.direction||"vertical";b.effects.save(a,g);a.show();var e=b.effects.createWrapper(a).css({overflow:"hidden"}),h=d=="vertical"?"height":"width";d=d=="vertical"?e.height():e.width();f=="show"&&e.css(h,0);var i={};i[h]=f=="show"?d:0;e.animate(i,c.duration,c.options.easing,function(){f=="hide"&&a.hide();b.effects.restore(a,
+g);b.effects.removeWrapper(a);c.callback&&c.callback.apply(a[0],arguments);a.dequeue()})})}})(jQuery);
+;/*
+ * jQuery UI Effects Bounce 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Bounce
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(e){e.effects.bounce=function(b){return this.queue(function(){var a=e(this),l=["position","top","bottom","left","right"],h=e.effects.setMode(a,b.options.mode||"effect"),d=b.options.direction||"up",c=b.options.distance||20,m=b.options.times||5,i=b.duration||250;/show|hide/.test(h)&&l.push("opacity");e.effects.save(a,l);a.show();e.effects.createWrapper(a);var f=d=="up"||d=="down"?"top":"left";d=d=="up"||d=="left"?"pos":"neg";c=b.options.distance||(f=="top"?a.outerHeight({margin:true})/3:a.outerWidth({margin:true})/
+3);if(h=="show")a.css("opacity",0).css(f,d=="pos"?-c:c);if(h=="hide")c/=m*2;h!="hide"&&m--;if(h=="show"){var g={opacity:1};g[f]=(d=="pos"?"+=":"-=")+c;a.animate(g,i/2,b.options.easing);c/=2;m--}for(g=0;g<m;g++){var j={},k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing);c=h=="hide"?c*2:c/2}if(h=="hide"){g={opacity:0};g[f]=(d=="pos"?"-=":"+=")+c;a.animate(g,i/2,b.options.easing,function(){a.hide();e.effects.restore(a,l);e.effects.removeWrapper(a);
+b.callback&&b.callback.apply(this,arguments)})}else{j={};k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing,function(){e.effects.restore(a,l);e.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments)})}a.queue("fx",function(){a.dequeue()});a.dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Clip 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Clip
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.clip=function(e){return this.queue(function(){var a=b(this),i=["position","top","bottom","left","right","height","width"],f=b.effects.setMode(a,e.options.mode||"hide"),c=e.options.direction||"vertical";b.effects.save(a,i);a.show();var d=b.effects.createWrapper(a).css({overflow:"hidden"});d=a[0].tagName=="IMG"?d:a;var g={size:c=="vertical"?"height":"width",position:c=="vertical"?"top":"left"};c=c=="vertical"?d.height():d.width();if(f=="show"){d.css(g.size,0);d.css(g.position,
+c/2)}var h={};h[g.size]=f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,{queue:false,duration:e.duration,easing:e.options.easing,complete:function(){f=="hide"&&a.hide();b.effects.restore(a,i);b.effects.removeWrapper(a);e.callback&&e.callback.apply(a[0],arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Drop 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Drop
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.drop=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right","opacity"],e=c.effects.setMode(a,d.options.mode||"hide"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a);var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true})/2:a.outerWidth({margin:true})/2);if(e=="show")a.css("opacity",0).css(f,b=="pos"?-g:g);var i={opacity:e==
+"show"?1:0};i[f]=(e=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Explode 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Explode
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(j){j.effects.explode=function(a){return this.queue(function(){var c=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3,d=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3;a.options.mode=a.options.mode=="toggle"?j(this).is(":visible")?"hide":"show":a.options.mode;var b=j(this).show().css("visibility","hidden"),g=b.offset();g.top-=parseInt(b.css("marginTop"),10)||0;g.left-=parseInt(b.css("marginLeft"),10)||0;for(var h=b.outerWidth(true),i=b.outerHeight(true),e=0;e<c;e++)for(var f=
+0;f<d;f++)b.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+
+e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.mode=="show"?1:0},a.duration||500);setTimeout(function(){a.options.mode=="show"?b.css({visibility:"visible"}):b.css({visibility:"visible"}).hide();a.callback&&a.callback.apply(b[0]);b.dequeue();j("div.ui-effects-explode").remove()},a.duration||500)})}})(jQuery);
+;/*
+ * jQuery UI Effects Fade 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fade
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.fade=function(a){return this.queue(function(){var c=b(this),d=b.effects.setMode(c,a.options.mode||"hide");c.animate({opacity:d},{queue:false,duration:a.duration,easing:a.options.easing,complete:function(){a.callback&&a.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Fold 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fold
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.fold=function(a){return this.queue(function(){var b=c(this),j=["position","top","bottom","left","right"],d=c.effects.setMode(b,a.options.mode||"hide"),g=a.options.size||15,h=!!a.options.horizFirst,k=a.duration?a.duration/2:c.fx.speeds._default/2;c.effects.save(b,j);b.show();var e=c.effects.createWrapper(b).css({overflow:"hidden"}),f=d=="show"!=h,l=f?["width","height"]:["height","width"];f=f?[e.width(),e.height()]:[e.height(),e.width()];var i=/([0-9]+)%/.exec(g);if(i)g=parseInt(i[1],
+10)/100*f[d=="hide"?0:1];if(d=="show")e.css(h?{height:0,width:g}:{height:g,width:0});h={};i={};h[l[0]]=d=="show"?f[0]:g;i[l[1]]=d=="show"?f[1]:0;e.animate(h,k,a.options.easing).animate(i,k,a.options.easing,function(){d=="hide"&&b.hide();c.effects.restore(b,j);c.effects.removeWrapper(b);a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery);
+;/*
+ * jQuery UI Effects Highlight 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Highlight
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&&
+this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Pulsate 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Pulsate
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(d){d.effects.pulsate=function(a){return this.queue(function(){var b=d(this),c=d.effects.setMode(b,a.options.mode||"show");times=(a.options.times||5)*2-1;duration=a.duration?a.duration/2:d.fx.speeds._default/2;isVisible=b.is(":visible");animateTo=0;if(!isVisible){b.css("opacity",0).show();animateTo=1}if(c=="hide"&&isVisible||c=="show"&&!isVisible)times--;for(c=0;c<times;c++){b.animate({opacity:animateTo},duration,a.options.easing);animateTo=(animateTo+1)%2}b.animate({opacity:animateTo},duration,
+a.options.easing,function(){animateTo==0&&b.hide();a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()}).dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Scale 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Scale
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.puff=function(b){return this.queue(function(){var a=c(this),e=c.effects.setMode(a,b.options.mode||"hide"),g=parseInt(b.options.percent,10)||150,h=g/100,i={height:a.height(),width:a.width()};c.extend(b.options,{fade:true,mode:e,percent:e=="hide"?g:100,from:e=="hide"?i:{height:i.height*h,width:i.width*h}});a.effect("scale",b.options,b.duration,b.callback);a.dequeue()})};c.effects.scale=function(b){return this.queue(function(){var a=c(this),e=c.extend(true,{},b.options),g=c.effects.setMode(a,
+b.options.mode||"effect"),h=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:g=="hide"?0:100),i=b.options.direction||"both",f=b.options.origin;if(g!="effect"){e.origin=f||["middle","center"];e.restore=true}f={height:a.height(),width:a.width()};a.from=b.options.from||(g=="show"?{height:0,width:0}:f);h={y:i!="horizontal"?h/100:1,x:i!="vertical"?h/100:1};a.to={height:f.height*h.y,width:f.width*h.x};if(b.options.fade){if(g=="show"){a.from.opacity=0;a.to.opacity=1}if(g=="hide"){a.from.opacity=
+1;a.to.opacity=0}}e.from=a.from;e.to=a.to;e.mode=g;a.effect("size",e,b.duration,b.callback);a.dequeue()})};c.effects.size=function(b){return this.queue(function(){var a=c(this),e=["position","top","bottom","left","right","width","height","overflow","opacity"],g=["position","top","bottom","left","right","overflow","opacity"],h=["width","height","overflow"],i=["fontSize"],f=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],k=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],
+p=c.effects.setMode(a,b.options.mode||"effect"),n=b.options.restore||false,m=b.options.scale||"both",l=b.options.origin,j={height:a.height(),width:a.width()};a.from=b.options.from||j;a.to=b.options.to||j;if(l){l=c.effects.getBaseline(l,j);a.from.top=(j.height-a.from.height)*l.y;a.from.left=(j.width-a.from.width)*l.x;a.to.top=(j.height-a.to.height)*l.y;a.to.left=(j.width-a.to.width)*l.x}var d={from:{y:a.from.height/j.height,x:a.from.width/j.width},to:{y:a.to.height/j.height,x:a.to.width/j.width}};
+if(m=="box"||m=="both"){if(d.from.y!=d.to.y){e=e.concat(f);a.from=c.effects.setTransition(a,f,d.from.y,a.from);a.to=c.effects.setTransition(a,f,d.to.y,a.to)}if(d.from.x!=d.to.x){e=e.concat(k);a.from=c.effects.setTransition(a,k,d.from.x,a.from);a.to=c.effects.setTransition(a,k,d.to.x,a.to)}}if(m=="content"||m=="both")if(d.from.y!=d.to.y){e=e.concat(i);a.from=c.effects.setTransition(a,i,d.from.y,a.from);a.to=c.effects.setTransition(a,i,d.to.y,a.to)}c.effects.save(a,n?e:g);a.show();c.effects.createWrapper(a);
+a.css("overflow","hidden").css(a.from);if(m=="content"||m=="both"){f=f.concat(["marginTop","marginBottom"]).concat(i);k=k.concat(["marginLeft","marginRight"]);h=e.concat(f).concat(k);a.find("*[width]").each(function(){child=c(this);n&&c.effects.save(child,h);var o={height:child.height(),width:child.width()};child.from={height:o.height*d.from.y,width:o.width*d.from.x};child.to={height:o.height*d.to.y,width:o.width*d.to.x};if(d.from.y!=d.to.y){child.from=c.effects.setTransition(child,f,d.from.y,child.from);
+child.to=c.effects.setTransition(child,f,d.to.y,child.to)}if(d.from.x!=d.to.x){child.from=c.effects.setTransition(child,k,d.from.x,child.from);child.to=c.effects.setTransition(child,k,d.to.x,child.to)}child.css(child.from);child.animate(child.to,b.duration,b.options.easing,function(){n&&c.effects.restore(child,h)})})}a.animate(a.to,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){a.to.opacity===0&&a.css("opacity",a.from.opacity);p=="hide"&&a.hide();c.effects.restore(a,
+n?e:g);c.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Shake 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Shake
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(d){d.effects.shake=function(a){return this.queue(function(){var b=d(this),j=["position","top","bottom","left","right"];d.effects.setMode(b,a.options.mode||"effect");var c=a.options.direction||"left",e=a.options.distance||20,l=a.options.times||3,f=a.duration||a.options.duration||140;d.effects.save(b,j);b.show();d.effects.createWrapper(b);var g=c=="up"||c=="down"?"top":"left",h=c=="up"||c=="left"?"pos":"neg";c={};var i={},k={};c[g]=(h=="pos"?"-=":"+=")+e;i[g]=(h=="pos"?"+=":"-=")+e*2;k[g]=
+(h=="pos"?"-=":"+=")+e*2;b.animate(c,f,a.options.easing);for(e=1;e<l;e++)b.animate(i,f,a.options.easing).animate(k,f,a.options.easing);b.animate(i,f,a.options.easing).animate(c,f/2,a.options.easing,function(){d.effects.restore(b,j);d.effects.removeWrapper(b);a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()});b.dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Slide 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Slide
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.slide=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right"],f=c.effects.setMode(a,d.options.mode||"show"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a).css({overflow:"hidden"});var g=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var e=d.options.distance||(g=="top"?a.outerHeight({margin:true}):a.outerWidth({margin:true}));if(f=="show")a.css(g,b=="pos"?isNaN(e)?"-"+e:-e:e);
+var i={};i[g]=(f=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+e;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){f=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Transfer 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Transfer
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(e){e.effects.transfer=function(a){return this.queue(function(){var b=e(this),c=e(a.options.to),d=c.offset();c={top:d.top,left:d.left,height:c.innerHeight(),width:c.innerWidth()};d=b.offset();var f=e('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(a.options.className).css({top:d.top,left:d.left,height:b.innerHeight(),width:b.innerWidth(),position:"absolute"}).animate(c,a.duration,a.options.easing,function(){f.remove();a.callback&&a.callback.apply(b[0],arguments);
+b.dequeue()})})}})(jQuery);
+;
\ No newline at end of file
diff --git a/lib/base.php b/lib/base.php
index 700236c96c6..943ab5f24dc 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -132,7 +132,7 @@ class OC{
 
 		// Add the stuff we need always
 		OC_Util::addScript( "jquery-1.6.4.min" );
-		OC_Util::addScript( "jquery-ui-1.8.14.custom.min" );
+		OC_Util::addScript( "jquery-ui-1.8.16.custom.min" );
 		OC_Util::addScript( "jquery-showpassword" );
 		OC_Util::addScript( "jquery.infieldlabel.min" );
 		OC_Util::addScript( "jquery-tipsy" );
@@ -141,7 +141,7 @@ class OC{
 		OC_Util::addScript('search','result');
 		OC_Util::addStyle( "styles" );
 		OC_Util::addStyle( "multiselect" );
-		OC_Util::addStyle( "jquery-ui-1.8.14.custom" );
+		OC_Util::addStyle( "jquery-ui-1.8.16.custom" );
 		OC_Util::addStyle( "jquery-tipsy" );
 
 		$errors=OC_Util::checkServer();
-- 
GitLab


From 5ebf8a87f2523b799a7cd3302410cbeef7cfb1db Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Fri, 30 Dec 2011 23:08:44 +0000
Subject: [PATCH 100/546] Removed old jquery-ui css and js

---
 core/css/jquery-ui-1.8.14.custom.css   | 381 ------------
 core/js/jquery-ui-1.8.14.custom.min.js | 789 -------------------------
 2 files changed, 1170 deletions(-)
 delete mode 100644 core/css/jquery-ui-1.8.14.custom.css
 delete mode 100644 core/js/jquery-ui-1.8.14.custom.min.js

diff --git a/core/css/jquery-ui-1.8.14.custom.css b/core/css/jquery-ui-1.8.14.custom.css
deleted file mode 100644
index 887e4b5e57b..00000000000
--- a/core/css/jquery-ui-1.8.14.custom.css
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * jQuery UI CSS Framework 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-.ui-helper-clearfix { display: inline-block; }
-/* required comment for clearfix to work in Opera \*/
-* html .ui-helper-clearfix { height:1%; }
-.ui-helper-clearfix { display:block; }
-/* end clearfix */
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; }
-.ui-icon-closethick { background-image: url(../img/actions/delete.png); }
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-
-/*
- * jQuery UI CSS Framework 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS,%20Tahoma,%20Verdana,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
- */
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1.1em; }
-.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee 50% top repeat-x; color: #333333; }
-.ui-widget-content a { color: #333333; }
-.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
-.ui-widget-header a { color: #ffffff; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce 50% 50% repeat-x; font-weight: bold; color: #c77405; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; }
-.ui-widget :active { outline: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fed22f; background: #ffe45c 50% top repeat-x; color: #363636; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 50% 50% repeat; color: #ffffff; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #666666 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); }
-.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/*
- * jQuery UI Resizable 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Resizable#theming
- */
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
- * jQuery UI Selectable 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Selectable#theming
- */
-.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
-/*
- * jQuery UI Accordion 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Accordion#theming
- */
-/* IE/Win - Fix animation bug - #4615 */
-.ui-accordion { width: 100%; }
-.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
-.ui-accordion .ui-accordion-li-fix { display: inline; }
-.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
-.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }
-/*
- * jQuery UI Autocomplete 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Autocomplete#theming
- */
-.ui-autocomplete { position: absolute; cursor: default; }	
-
-/* workarounds */
-* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
-
-/*
- * jQuery UI Menu 1.8.14
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Menu#theming
- */
-.ui-menu {
-	list-style:none;
-	padding: 2px;
-	margin: 0;
-	display:block;
-	float: left;
-}
-.ui-menu .ui-menu {
-	margin-top: -3px;
-}
-.ui-menu .ui-menu-item {
-	margin:0;
-	padding: 0;
-	zoom: 1;
-	float: left;
-	clear: left;
-	width: 100%;
-}
-.ui-menu .ui-menu-item a {
-	text-decoration:none;
-	display:block;
-	padding:.2em .4em;
-	line-height:1.5;
-	zoom:1;
-}
-.ui-menu .ui-menu-item a.ui-state-hover,
-.ui-menu .ui-menu-item a.ui-state-active {
-	font-weight: normal;
-	margin: -1px;
-}
-/*
- * jQuery UI Button 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Button#theming
- */
-.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
-.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
-button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
-.ui-button-icons-only { width: 3.4em; } 
-button.ui-button-icons-only { width: 3.7em; } 
-
-/*button text element */
-.ui-button .ui-button-text { display: block; line-height: 1.4;  }
-.ui-button-text-only .ui-button-text { padding: .4em 1em; }
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
-.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
-.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
-/* no icon support for input elements, provide padding by default */
-input.ui-button { padding: .4em 1em; }
-
-/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
-.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
-.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-
-/*button sets*/
-.ui-buttonset { margin-right: 7px; }
-.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
-
-/* workarounds */
-button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
-/*
- * jQuery UI Dialog 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Dialog#theming
- */
-.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
-.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-/*
- * jQuery UI Slider 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Slider#theming
- */
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
- * jQuery UI Tabs 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Tabs#theming
- */
-.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
-.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
-.ui-tabs .ui-tabs-hide { display: none !important; }
-/*
- * jQuery UI Datepicker 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker#theming
- */
-.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month, 
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
-    display: none; /*sorry for IE5*/
-    display/**/: block; /*sorry for IE5*/
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}/*
- * jQuery UI Progressbar 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Progressbar#theming
- */
-.ui-progressbar { height:2em; text-align: left; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
diff --git a/core/js/jquery-ui-1.8.14.custom.min.js b/core/js/jquery-ui-1.8.14.custom.min.js
deleted file mode 100644
index f9e4f1e8400..00000000000
--- a/core/js/jquery-ui-1.8.14.custom.min.js
+++ /dev/null
@@ -1,789 +0,0 @@
-/*!
- * jQuery UI 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI
- */
-(function(c,j){function k(a,b){var d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function l(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.14",
-keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus();
-b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,
-"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",
-function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,m,n){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(m)g-=parseFloat(c.curCSS(f,"border"+this+"Width",true))||0;if(n)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth,
-outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){return k(a,!isNaN(c.attr(a,"tabindex")))},tabbable:function(a){var b=c.attr(a,"tabindex"),d=isNaN(b);
-return(d||b>=0)&&k(a,!d)}});c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e=
-0;e<b.length;e++)a.options[b[e][0]]&&b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&c.ui.isOverAxis(b,e,i)}})}})(jQuery);
-;/*!
- * jQuery UI Widget 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Widget
- */
-(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)b(d).triggerHandler("remove");k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){b(this).triggerHandler("remove")});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h,
-a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.charAt(0)==="_")return h;
-e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options,
-this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")},
-widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this},
-enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
-;/*!
- * jQuery UI Mouse 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Mouse
- *
- * Depends:
- *	jquery.ui.widget.js
- */
-(function(b){var d=false;b(document).mousedown(function(){d=false});b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(c){return a._mouseDown(c)}).bind("click."+this.widgetName,function(c){if(true===b.data(c.target,a.widgetName+".preventClickEvent")){b.removeData(c.target,a.widgetName+".preventClickEvent");c.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+
-this.widgetName)},_mouseDown:function(a){if(!d){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var c=this,f=a.which==1,g=typeof this.options.cancel=="string"?b(a.target).closest(this.options.cancel).length:false;if(!f||g||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=this._mouseStart(a)!==
-false;if(!this._mouseStarted){a.preventDefault();return true}}true===b.data(a.target,this.widgetName+".preventClickEvent")&&b.removeData(a.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(e){return c._mouseMove(e)};this._mouseUpDelegate=function(e){return c._mouseUp(e)};b(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return d=true}},_mouseMove:function(a){if(b.browser.msie&&
-!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=
-false;a.target==this._mouseDownEvent.target&&b.data(a.target,this.widgetName+".preventClickEvent",true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
-;/*
- * jQuery UI Position 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Position
- */
-(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY,
-left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+=
-k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-=
-m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left=
-d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+=
-a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b),
-g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
-;/*
- * jQuery UI Draggable 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Draggables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
-"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b=
-this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;d(b.iframeFix===true?"iframe":b.iframeFix).each(function(){d('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")});return true},_mouseStart:function(a){var b=this.options;this.helper=
-this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});
-this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions();d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);d.ui.ddmanager&&d.ui.ddmanager.dragStart(this,a);return true},
-_mouseDrag:function(a,b){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b=
-false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b=d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&&this.options.revert.call(this.element,b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,
-10),function(){c._trigger("stop",a)!==false&&c._clear()})}else this._trigger("stop",a)!==false&&this._clear();return false},_mouseUp:function(a){this.options.iframeFix===true&&d("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)});d.ui.ddmanager&&d.ui.ddmanager.dragStop(this,a);return d.ui.mouse.prototype._mouseUp.call(this,a)},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(a){var b=!this.options.handle||
-!d(this.options.handle,this.element).length?true:false;d(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==a.target)b=true});return b},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a])):b.helper=="clone"?this.element.clone().removeAttr("id"):this.element;a.parents("body").length||a.appendTo(b.appendTo=="parent"?this.element[0].parentNode:b.appendTo);a[0]!=this.element[0]&&!/(fixed|absolute)/.test(a.css("position"))&&
-a.css("position","absolute");return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=
-this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),
-10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),
-10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[a.containment=="document"?0:d(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,a.containment=="document"?0:d(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,
-(a.containment=="document"?0:d(window).scrollLeft())+d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a.containment=="document"?0:d(window).scrollTop())+(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)&&a.containment.constructor!=Array){a=d(a.containment);var b=a[0];if(b){a.offset();var c=d(b).css("overflow")!=
-"hidden";this.containment=[(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0),(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0),(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),
-10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom];this.relative_container=a}}else if(a.containment.constructor==Array)this.containment=a.containment},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName);return{top:b.top+
-this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&
-!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName),e=a.pageX,h=a.pageY;if(this.originalPosition){var g;if(this.containment){if(this.relative_container){g=this.relative_container.offset();g=[this.containment[0]+g.left,this.containment[1]+g.top,this.containment[2]+g.left,this.containment[3]+g.top]}else g=this.containment;if(a.pageX-this.offset.click.left<g[0])e=g[0]+this.offset.click.left;
-if(a.pageY-this.offset.click.top<g[1])h=g[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>g[2])e=g[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>g[3])h=g[3]+this.offset.click.top}if(b.grid){h=b.grid[1]?this.originalPageY+Math.round((h-this.originalPageY)/b.grid[1])*b.grid[1]:this.originalPageY;h=g?!(h-this.offset.click.top<g[1]||h-this.offset.click.top>g[3])?h:!(h-this.offset.click.top<g[1])?h-b.grid[1]:h+b.grid[1]:h;e=b.grid[0]?this.originalPageX+Math.round((e-this.originalPageX)/
-b.grid[0])*b.grid[0]:this.originalPageX;e=g?!(e-this.offset.click.left<g[0]||e-this.offset.click.left>g[2])?e:!(e-this.offset.click.left<g[0])?e-b.grid[0]:e+b.grid[0]:e}}return{top:h-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop()),left:e-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&d.browser.version<
-526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(a,b,c){c=c||this._uiHash();d.ui.plugin.call(this,a,[b,c]);if(a=="drag")this.positionAbs=this._convertPositionTo("absolute");return d.Widget.prototype._trigger.call(this,a,b,
-c)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});d.extend(d.ui.draggable,{version:"1.8.14"});d.ui.plugin.add("draggable","connectToSortable",{start:function(a,b){var c=d(this).data("draggable"),f=c.options,e=d.extend({},b,{item:c.element});c.sortables=[];d(f.connectToSortable).each(function(){var h=d.data(this,"sortable");if(h&&!h.options.disabled){c.sortables.push({instance:h,shouldRevert:h.options.revert});
-h.refreshPositions();h._trigger("activate",a,e)}})},stop:function(a,b){var c=d(this).data("draggable"),f=d.extend({},b,{item:c.element});d.each(c.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;c.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(a);this.instance.options.helper=this.instance.options._helper;c.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=
-false;this.instance._trigger("deactivate",a,f)}})},drag:function(a,b){var c=d(this).data("draggable"),f=this;d.each(c.sortables,function(){this.instance.positionAbs=c.positionAbs;this.instance.helperProportions=c.helperProportions;this.instance.offset.click=c.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=d(f).clone().removeAttr("id").appendTo(this.instance.element).data("sortable-item",true);
-this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return b.helper[0]};a.target=this.instance.currentItem[0];this.instance._mouseCapture(a,true);this.instance._mouseStart(a,true,true);this.instance.offset.click.top=c.offset.click.top;this.instance.offset.click.left=c.offset.click.left;this.instance.offset.parent.left-=c.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=c.offset.parent.top-this.instance.offset.parent.top;
-c._trigger("toSortable",a);c.dropped=this.instance.element;c.currentItem=c.element;this.instance.fromOutside=c}this.instance.currentItem&&this.instance._mouseDrag(a)}else if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",a,this.instance._uiHash(this.instance));this.instance._mouseStop(a,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&
-this.instance.placeholder.remove();c._trigger("fromSortable",a);c.dropped=false}})}});d.ui.plugin.add("draggable","cursor",{start:function(){var a=d("body"),b=d(this).data("draggable").options;if(a.css("cursor"))b._cursor=a.css("cursor");a.css("cursor",b.cursor)},stop:function(){var a=d(this).data("draggable").options;a._cursor&&d("body").css("cursor",a._cursor)}});d.ui.plugin.add("draggable","opacity",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("opacity"))b._opacity=
-a.css("opacity");a.css("opacity",b.opacity)},stop:function(a,b){a=d(this).data("draggable").options;a._opacity&&d(b.helper).css("opacity",a._opacity)}});d.ui.plugin.add("draggable","scroll",{start:function(){var a=d(this).data("draggable");if(a.scrollParent[0]!=document&&a.scrollParent[0].tagName!="HTML")a.overflowOffset=a.scrollParent.offset()},drag:function(a){var b=d(this).data("draggable"),c=b.options,f=false;if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){if(!c.axis||c.axis!=
-"x")if(b.overflowOffset.top+b.scrollParent[0].offsetHeight-a.pageY<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop+c.scrollSpeed;else if(a.pageY-b.overflowOffset.top<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop-c.scrollSpeed;if(!c.axis||c.axis!="y")if(b.overflowOffset.left+b.scrollParent[0].offsetWidth-a.pageX<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft+c.scrollSpeed;else if(a.pageX-b.overflowOffset.left<
-c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(!c.axis||c.axis!="x")if(a.pageY-d(document).scrollTop()<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()-c.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()+c.scrollSpeed);if(!c.axis||c.axis!="y")if(a.pageX-d(document).scrollLeft()<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()-
-c.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()+c.scrollSpeed)}f!==false&&d.ui.ddmanager&&!c.dropBehaviour&&d.ui.ddmanager.prepareOffsets(b,a)}});d.ui.plugin.add("draggable","snap",{start:function(){var a=d(this).data("draggable"),b=a.options;a.snapElements=[];d(b.snap.constructor!=String?b.snap.items||":data(draggable)":b.snap).each(function(){var c=d(this),f=c.offset();this!=a.element[0]&&a.snapElements.push({item:this,
-width:c.outerWidth(),height:c.outerHeight(),top:f.top,left:f.left})})},drag:function(a,b){for(var c=d(this).data("draggable"),f=c.options,e=f.snapTolerance,h=b.offset.left,g=h+c.helperProportions.width,n=b.offset.top,o=n+c.helperProportions.height,i=c.snapElements.length-1;i>=0;i--){var j=c.snapElements[i].left,l=j+c.snapElements[i].width,k=c.snapElements[i].top,m=k+c.snapElements[i].height;if(j-e<h&&h<l+e&&k-e<n&&n<m+e||j-e<h&&h<l+e&&k-e<o&&o<m+e||j-e<g&&g<l+e&&k-e<n&&n<m+e||j-e<g&&g<l+e&&k-e<o&&
-o<m+e){if(f.snapMode!="inner"){var p=Math.abs(k-o)<=e,q=Math.abs(m-n)<=e,r=Math.abs(j-g)<=e,s=Math.abs(l-h)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:k-c.helperProportions.height,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:m,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:j-c.helperProportions.width}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:l}).left-c.margins.left}var t=
-p||q||r||s;if(f.snapMode!="outer"){p=Math.abs(k-n)<=e;q=Math.abs(m-o)<=e;r=Math.abs(j-h)<=e;s=Math.abs(l-g)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:k,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:m-c.helperProportions.height,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:j}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:l-c.helperProportions.width}).left-c.margins.left}if(!c.snapElements[i].snapping&&
-(p||q||r||s||t))c.options.snap.snap&&c.options.snap.snap.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[i].item}));c.snapElements[i].snapping=p||q||r||s||t}else{c.snapElements[i].snapping&&c.options.snap.release&&c.options.snap.release.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[i].item}));c.snapElements[i].snapping=false}}}});d.ui.plugin.add("draggable","stack",{start:function(){var a=d(this).data("draggable").options;a=d.makeArray(d(a.stack)).sort(function(c,f){return(parseInt(d(c).css("zIndex"),
-10)||0)-(parseInt(d(f).css("zIndex"),10)||0)});if(a.length){var b=parseInt(a[0].style.zIndex)||0;d(a).each(function(c){this.style.zIndex=b+c});this[0].style.zIndex=b+a.length}}});d.ui.plugin.add("draggable","zIndex",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("zIndex"))b._zIndex=a.css("zIndex");a.css("zIndex",b.zIndex)},stop:function(a,b){a=d(this).data("draggable").options;a._zIndex&&d(b.helper).css("zIndex",a._zIndex)}})})(jQuery);
-;/*
- * jQuery UI Droppable 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Droppables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- *	jquery.ui.mouse.js
- *	jquery.ui.draggable.js
- */
-(function(d){d.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var a=this.options,b=a.accept;this.isover=0;this.isout=1;this.accept=d.isFunction(b)?b:function(c){return c.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};d.ui.ddmanager.droppables[a.scope]=d.ui.ddmanager.droppables[a.scope]||[];d.ui.ddmanager.droppables[a.scope].push(this);
-a.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var a=d.ui.ddmanager.droppables[this.options.scope],b=0;b<a.length;b++)a[b]==this&&a.splice(b,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(a,b){if(a=="accept")this.accept=d.isFunction(b)?b:function(c){return c.is(b)};d.Widget.prototype._setOption.apply(this,arguments)},_activate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&
-this.element.addClass(this.options.activeClass);b&&this._trigger("activate",a,this.ui(b))},_deactivate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);b&&this._trigger("deactivate",a,this.ui(b))},_over:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);
-this._trigger("over",a,this.ui(b))}},_out:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",a,this.ui(b))}},_drop:function(a,b){var c=b||d.ui.ddmanager.current;if(!c||(c.currentItem||c.element)[0]==this.element[0])return false;var e=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=
-d.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==c.options.scope&&g.accept.call(g.element[0],c.currentItem||c.element)&&d.ui.intersect(c,d.extend(g,{offset:g.element.offset()}),g.options.tolerance)){e=true;return false}});if(e)return false;if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",
-a,this.ui(c));return this.element}return false},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}});d.extend(d.ui.droppable,{version:"1.8.14"});d.ui.intersect=function(a,b,c){if(!b.offset)return false;var e=(a.positionAbs||a.position.absolute).left,g=e+a.helperProportions.width,f=(a.positionAbs||a.position.absolute).top,h=f+a.helperProportions.height,i=b.offset.left,k=i+b.proportions.width,j=b.offset.top,l=j+b.proportions.height;
-switch(c){case "fit":return i<=e&&g<=k&&j<=f&&h<=l;case "intersect":return i<e+a.helperProportions.width/2&&g-a.helperProportions.width/2<k&&j<f+a.helperProportions.height/2&&h-a.helperProportions.height/2<l;case "pointer":return d.ui.isOver((a.positionAbs||a.position.absolute).top+(a.clickOffset||a.offset.click).top,(a.positionAbs||a.position.absolute).left+(a.clickOffset||a.offset.click).left,j,i,b.proportions.height,b.proportions.width);case "touch":return(f>=j&&f<=l||h>=j&&h<=l||f<j&&h>l)&&(e>=
-i&&e<=k||g>=i&&g<=k||e<i&&g>k);default:return false}};d.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(a,b){var c=d.ui.ddmanager.droppables[a.options.scope]||[],e=b?b.type:null,g=(a.currentItem||a.element).find(":data(droppable)").andSelf(),f=0;a:for(;f<c.length;f++)if(!(c[f].options.disabled||a&&!c[f].accept.call(c[f].element[0],a.currentItem||a.element))){for(var h=0;h<g.length;h++)if(g[h]==c[f].element[0]){c[f].proportions.height=0;continue a}c[f].visible=c[f].element.css("display")!=
-"none";if(c[f].visible){e=="mousedown"&&c[f]._activate.call(c[f],b);c[f].offset=c[f].element.offset();c[f].proportions={width:c[f].element[0].offsetWidth,height:c[f].element[0].offsetHeight}}}},drop:function(a,b){var c=false;d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&d.ui.intersect(a,this,this.options.tolerance))c=c||this._drop.call(this,b);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],a.currentItem||
-a.element)){this.isout=1;this.isover=0;this._deactivate.call(this,b)}}});return c},dragStart:function(a,b){a.element.parentsUntil("body").bind("scroll.droppable",function(){a.options.refreshPositions||d.ui.ddmanager.prepareOffsets(a,b)})},drag:function(a,b){a.options.refreshPositions&&d.ui.ddmanager.prepareOffsets(a,b);d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var c=d.ui.intersect(a,this,this.options.tolerance);if(c=
-!c&&this.isover==1?"isout":c&&this.isover==0?"isover":null){var e;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){e=d.data(g[0],"droppable");e.greedyChild=c=="isover"?1:0}}if(e&&c=="isover"){e.isover=0;e.isout=1;e._out.call(e,b)}this[c]=1;this[c=="isout"?"isover":"isout"]=0;this[c=="isover"?"_over":"_out"].call(this,b);if(e&&c=="isout"){e.isout=0;e.isover=1;e._over.call(e,b)}}}})},dragStop:function(a,b){a.element.parentsUntil("body").unbind("scroll.droppable");
-a.options.refreshPositions||d.ui.ddmanager.prepareOffsets(a,b)}}})(jQuery);
-;/*
- * jQuery UI Resizable 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Resizables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element,
-_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
-top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
-this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
-nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d<c.length;d++){var f=e.trim(c[d]),g=e('<div class="ui-resizable-handle '+("ui-resizable-"+f)+'"></div>');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor==
-String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),l=0;l=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,l);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection();
-this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){if(!a.disabled){e(this).removeClass("ui-resizable-autohide");b._handles.show()}},function(){if(!a.disabled)if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();
-var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a=
-false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"});
-this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff=
-{width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis];
-if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);this._updateVirtualBoundaries(b.shiftKey);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false},
-_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;f=f?0:c.sizeDiff.width;f={width:c.helper.width()-f,height:c.helper.height()-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f,
-{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",b);this._helper&&this.helper.remove();return false},_updateVirtualBoundaries:function(b){var a=this.options,c,d,f;a={minWidth:k(a.minWidth)?a.minWidth:0,maxWidth:k(a.maxWidth)?a.maxWidth:Infinity,minHeight:k(a.minHeight)?a.minHeight:0,maxHeight:k(a.maxHeight)?a.maxHeight:
-Infinity};if(this._aspectRatio||b){b=a.minHeight*this.aspectRatio;d=a.minWidth/this.aspectRatio;c=a.maxHeight*this.aspectRatio;f=a.maxWidth/this.aspectRatio;if(b>a.minWidth)a.minWidth=b;if(d>a.minHeight)a.minHeight=d;if(c<a.maxWidth)a.maxWidth=c;if(f<a.maxHeight)a.maxHeight=f}this._vBoundaries=a},_updateCache:function(b){this.offset=this.helper.offset();if(k(b.left))this.position.left=b.left;if(k(b.top))this.position.top=b.top;if(k(b.height))this.size.height=b.height;if(k(b.width))this.size.width=
-b.width},_updateRatio:function(b){var a=this.position,c=this.size,d=this.axis;if(k(b.height))b.width=b.height*this.aspectRatio;else if(k(b.width))b.height=b.width/this.aspectRatio;if(d=="sw"){b.left=a.left+(c.width-b.width);b.top=null}if(d=="nw"){b.top=a.top+(c.height-b.height);b.left=a.left+(c.width-b.width)}return b},_respectSize:function(b){var a=this._vBoundaries,c=this.axis,d=k(b.width)&&a.maxWidth&&a.maxWidth<b.width,f=k(b.height)&&a.maxHeight&&a.maxHeight<b.height,g=k(b.width)&&a.minWidth&&
-a.minWidth>b.width,h=k(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+this.size.height,l=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&l)b.left=i-a.minWidth;if(d&&l)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left=
-null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a<this._proportionallyResizeElements.length;a++){var c=this._proportionallyResizeElements[a];if(!this.borderDif){var d=[c.css("borderTopWidth"),c.css("borderRightWidth"),c.css("borderBottomWidth"),c.css("borderLeftWidth")],f=[c.css("paddingTop"),c.css("paddingRight"),c.css("paddingBottom"),c.css("paddingLeft")];this.borderDif=e.map(d,function(g,h){g=parseInt(g,10)||
-0;h=parseInt(f[h],10)||0;return g+h})}e.browser.msie&&(e(b).is(":hidden")||e(b).parents(":hidden").length)||c.css({height:b.height()-this.borderDif[0]-this.borderDif[2]||0,width:b.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var b=this.options;this.elementOffset=this.element.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+
-a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,a){return{width:this.originalSize.width+a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+
-c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]);
-b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,{version:"1.8.14"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(),
-10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top-
-f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var l=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:l.parents(a.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(r,function(n,o){if((n=(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(l.css("position"))){c._revertToRelativePosition=true;l.css({position:"absolute",top:"auto",left:"auto"})}l.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType?
-e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};if(b._revertToRelativePosition){b._revertToRelativePosition=false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a=
-e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-g};g=parseInt(a.element.css("left"),10)+(a.position.left-a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing,
-step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,height:i.height});a._updateCache(i);a._propagate("resize",b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement=
-e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=e(a),f=[];e(["Top","Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset;
-var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,d=a.containerOffset,f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left:
-a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?d.top:0}a.offset.left=a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top-
-d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=a.size.width/a.aspectRatio}if(d+a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition,
-f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&/static/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25,
-display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");b.ghost&&b.ghost.css({position:"relative",height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b=
-e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height=
-d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},k=function(b){return!isNaN(parseInt(b,10))}})(jQuery);
-;/*
- * jQuery UI Selectable 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Selectables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),
-selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX,
-c.pageY];if(!this.options.disabled){var d=this.options;this.selectees=e(d.filter,this.element[0]);this._trigger("start",c);e(d.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});d.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var b=e.data(this,"selectable-item");b.startselected=true;if(!c.metaKey){b.$element.removeClass("ui-selected");b.selected=false;b.$element.addClass("ui-unselecting");b.unselecting=true;f._trigger("unselecting",
-c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){var b=e.data(this,"selectable-item");if(b){var g=!c.metaKey||!b.$element.hasClass("ui-selected");b.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");b.unselecting=!g;b.selecting=g;(b.selected=g)?f._trigger("selecting",c,{selecting:b.element}):f._trigger("unselecting",c,{unselecting:b.element});return false}})}},_mouseDrag:function(c){var f=this;this.dragged=true;if(!this.options.disabled){var d=
-this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.right<b||a.top>i||a.bottom<g);else if(d.tolerance=="fit")k=a.left>b&&a.right<h&&a.top>g&&a.bottom<i;if(k){if(a.selected){a.$element.removeClass("ui-selected");a.selected=false}if(a.unselecting){a.$element.removeClass("ui-unselecting");
-a.unselecting=false}if(!a.selecting){a.$element.addClass("ui-selecting");a.selecting=true;f._trigger("selecting",c,{selecting:a.element})}}else{if(a.selecting)if(c.metaKey&&a.startselected){a.$element.removeClass("ui-selecting");a.selecting=false;a.$element.addClass("ui-selected");a.selected=true}else{a.$element.removeClass("ui-selecting");a.selecting=false;if(a.startselected){a.$element.addClass("ui-unselecting");a.unselecting=true}f._trigger("unselecting",c,{unselecting:a.element})}if(a.selected)if(!c.metaKey&&
-!a.startselected){a.$element.removeClass("ui-selected");a.selected=false;a.$element.addClass("ui-unselecting");a.unselecting=true;f._trigger("unselecting",c,{unselecting:a.element})}}}});return false}},_mouseStop:function(c){var f=this;this.dragged=false;e(".ui-unselecting",this.element[0]).each(function(){var d=e.data(this,"selectable-item");d.$element.removeClass("ui-unselecting");d.unselecting=false;d.startselected=false;f._trigger("unselected",c,{unselected:d.element})});e(".ui-selecting",this.element[0]).each(function(){var d=
-e.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected");d.selecting=false;d.selected=true;d.startselected=true;f._trigger("selected",c,{selected:d.element})});this._trigger("stop",c);this.helper.remove();return false}});e.extend(e.ui.selectable,{version:"1.8.14"})})(jQuery);
-;/*
- * jQuery UI Sortable 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Sortables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(d){d.widget("ui.sortable",d.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){var a=this.options;this.containerCache={};this.element.addClass("ui-sortable");
-this.refresh();this.floating=this.items.length?a.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a===
-"disabled"){this.options[a]=b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&&
-!b){var f=false;d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem=c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,
-left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};
-this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment();if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!=
-document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a);
-return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop+b.scrollSpeed;else if(a.pageY-this.overflowOffset.top<
-b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop-b.scrollSpeed;if(this.overflowOffset.left+this.scrollParent[0].offsetWidth-a.pageX<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft+b.scrollSpeed;else if(a.pageX-this.overflowOffset.left<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft-b.scrollSpeed}else{if(a.pageY-d(document).scrollTop()<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()-
-b.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()+b.scrollSpeed);if(a.pageX-d(document).scrollLeft()<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()-b.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()+b.scrollSpeed)}c!==false&&d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,
-a)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(b=this.items.length-1;b>=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0],
-e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a,c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset();
-c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):
-this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--){this.containers[b]._trigger("deactivate",null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null,
-dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):d(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")},
-toArray:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+j<k&&b+l>g&&b+l<h;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||
-this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?j:g<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<h&&i<e+this.helperProportions.height/2&&f-this.helperProportions.height/2<k},_intersectsWithPointer:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width);b=b&&a;a=this._getDragVerticalDirection();
-var c=this._getDragHorizontalDirection();if(!b)return false;return this.floating?c&&c=="right"||a=="down"?2:1:a&&(a=="down"?2:1)},_intersectsWithSides:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width);var c=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?e=="right"&&a||e=="left"&&!a:c&&(c=="down"&&b||c=="up"&&!b)},
-_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith();
-if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h=d.data(f[g],"sortable");if(h&&h!=this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),
-this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)});return d(b)},_removeCurrentsFromItems:function(){for(var a=this.currentItem.find(":data(sortable-item)"),b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(a){this.items=[];this.containers=[this];var b=this.items,c=[[d.isFunction(this.options.items)?this.options.items.call(this.element[0],a,{item:this.currentItem}):d(this.options.items,this.element),
-this]],e=this._connectWith();if(e)for(var f=e.length-1;f>=0;f--)for(var g=d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h<g;h++){i=d(e[h]);i.data("sortable-item",a);b.push({item:i,instance:a,width:0,height:0,left:0,top:0})}}},refreshPositions:function(a){if(this.offsetParent&&
-this.helper)this.offset.parent=this._getParentOffset();for(var b=this.items.length-1;b>=0;b--){var c=this.items[b];if(!(c.instance!=this.currentContainer&&this.currentContainer&&c.item[0]!=this.currentItem[0])){var e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b=
-this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top=e.top;this.containers[b].containerCache.width=this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f=
-d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!e)f.style.visibility="hidden";return f},update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||
-0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out",
-a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length===1){this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h-
-f)<b){b=Math.abs(h-f);e=this.items[g]}}if(e||this.options.dropOnEmpty){this.currentContainer=this.containers[c];e?this._rearrange(a,e,null,true):this._rearrange(a,null,this.containers[c].element,true);this._trigger("change",a,this._uiHash());this.containers[c]._trigger("change",a,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}}},_createHelper:function(a){var b=
-this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a,this.currentItem])):b.helper=="clone"?this.currentItem.clone():this.currentItem;a.parents("body").length||d(b.appendTo!="parent"?b.appendTo:this.currentItem[0].parentNode)[0].appendChild(a[0]);if(a[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(a[0].style.width==
-""||b.forceHelperSize)a.width(this.currentItem.width());if(a[0].style.height==""||b.forceHelperSize)a.height(this.currentItem.height());return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=
-this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a=
-{top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),
-10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"?
-document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)){var b=d(a.containment)[0];a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),
-10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(a,b){if(!b)b=
-this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&
-this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();
-var f=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])f=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-
-this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;f=this.originalPageX+Math.round((f-this.originalPageX)/b.grid[0])*b.grid[0];f=this.containment?!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:!(f-this.offset.click.left<this.containment[0])?f-b.grid[0]:f+b.grid[0]:f}}return{top:g-
-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())}},_rearrange:function(a,b,c,e){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],
-this.direction=="down"?b.item[0]:b.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var f=this,g=this.counter;window.setTimeout(function(){g==f.counter&&f.refreshPositions(!e)},0)},_clear:function(a,b){this.reverting=false;var c=[];!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var e in this._storedCSS)if(this._storedCSS[e]=="auto"||this._storedCSS[e]=="static")this._storedCSS[e]=
-"";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!b&&c.push(function(f){this._trigger("receive",f,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!b)c.push(function(f){this._trigger("update",f,this._uiHash())});if(!d.ui.contains(this.element[0],this.currentItem[0])){b||c.push(function(f){this._trigger("remove",
-f,this._uiHash())});for(e=this.containers.length-1;e>=0;e--)if(d.ui.contains(this.containers[e].element[0],this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this,
-this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop",
-a,this._uiHash());for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}return false}b||this._trigger("beforeStop",a,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!b){for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){d.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},
-_uiHash:function(a){var b=a||this;return{helper:b.helper,placeholder:b.placeholder||d([]),position:b.position,originalPosition:b.originalPosition,offset:b.positionAbs,item:b.currentItem,sender:a?a.element:null}}});d.extend(d.ui.sortable,{version:"1.8.14"})})(jQuery);
-;/*
- * jQuery UI Accordion 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Accordion
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- */
-(function(c){c.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:true,clearStyle:false,collapsible:false,event:"click",fillSpace:false,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var a=this,b=a.options;a.running=0;a.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix");
-a.headers=a.element.find(b.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){b.disabled||c(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){b.disabled||c(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){b.disabled||c(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){b.disabled||c(this).removeClass("ui-state-focus")});a.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");
-if(b.navigation){var d=a.element.find("a").filter(b.navigationFilter).eq(0);if(d.length){var h=d.closest(".ui-accordion-header");a.active=h.length?h:d.closest(".ui-accordion-content").prev()}}a.active=a._findActive(a.active||b.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");a.active.next().addClass("ui-accordion-content-active");a._createIcons();a.resize();a.element.attr("role","tablist");a.headers.attr("role","tab").bind("keydown.accordion",
-function(f){return a._keydown(f)}).next().attr("role","tabpanel");a.headers.not(a.active||"").attr({"aria-expanded":"false","aria-selected":"false",tabIndex:-1}).next().hide();a.active.length?a.active.attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}):a.headers.eq(0).attr("tabIndex",0);c.browser.safari||a.headers.find("a").attr("tabIndex",-1);b.event&&a.headers.bind(b.event.split(" ").join(".accordion ")+".accordion",function(f){a._clickHandler.call(a,f,this);f.preventDefault()})},_createIcons:function(){var a=
-this.options;if(a.icons){c("<span></span>").addClass("ui-icon "+a.icons.header).prependTo(this.headers);this.active.children(".ui-icon").toggleClass(a.icons.header).toggleClass(a.icons.headerSelected);this.element.addClass("ui-accordion-icons")}},_destroyIcons:function(){this.headers.children(".ui-icon").remove();this.element.removeClass("ui-accordion-icons")},destroy:function(){var a=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("tabIndex");
-this.headers.find("a").removeAttr("tabIndex");this._destroyIcons();var b=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");if(a.autoHeight||a.fillHeight)b.css("height","");return c.Widget.prototype.destroy.call(this)},_setOption:function(a,b){c.Widget.prototype._setOption.apply(this,arguments);a=="active"&&this.activate(b);if(a=="icons"){this._destroyIcons();
-b&&this._createIcons()}if(a=="disabled")this.headers.add(this.headers.next())[b?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(a){if(!(this.options.disabled||a.altKey||a.ctrlKey)){var b=c.ui.keyCode,d=this.headers.length,h=this.headers.index(a.target),f=false;switch(a.keyCode){case b.RIGHT:case b.DOWN:f=this.headers[(h+1)%d];break;case b.LEFT:case b.UP:f=this.headers[(h-1+d)%d];break;case b.SPACE:case b.ENTER:this._clickHandler({target:a.target},a.target);
-a.preventDefault()}if(f){c(a.target).attr("tabIndex",-1);c(f).attr("tabIndex",0);f.focus();return false}return true}},resize:function(){var a=this.options,b;if(a.fillSpace){if(c.browser.msie){var d=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}b=this.element.parent().height();c.browser.msie&&this.element.parent().css("overflow",d);this.headers.each(function(){b-=c(this).outerHeight(true)});this.headers.next().each(function(){c(this).height(Math.max(0,b-c(this).innerHeight()+
-c(this).height()))}).css("overflow","auto")}else if(a.autoHeight){b=0;this.headers.next().each(function(){b=Math.max(b,c(this).height("").height())}).height(b)}return this},activate:function(a){this.options.active=a;a=this._findActive(a)[0];this._clickHandler({target:a},a);return this},_findActive:function(a){return a?typeof a==="number"?this.headers.filter(":eq("+a+")"):this.headers.not(this.headers.not(a)):a===false?c([]):this.headers.filter(":eq(0)")},_clickHandler:function(a,b){var d=this.options;
-if(!d.disabled)if(a.target){a=c(a.currentTarget||b);b=a[0]===this.active[0];d.active=d.collapsible&&b?false:this.headers.index(a);if(!(this.running||!d.collapsible&&b)){var h=this.active;j=a.next();g=this.active.next();e={options:d,newHeader:b&&d.collapsible?c([]):a,oldHeader:this.active,newContent:b&&d.collapsible?c([]):j,oldContent:g};var f=this.headers.index(this.active[0])>this.headers.index(a[0]);this.active=b?c([]):a;this._toggle(j,g,e,b,f);h.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);
-if(!b){a.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(d.icons.header).addClass(d.icons.headerSelected);a.next().addClass("ui-accordion-content-active")}}}else if(d.collapsible){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);this.active.next().addClass("ui-accordion-content-active");var g=this.active.next(),
-e={options:d,newHeader:c([]),oldHeader:d.active,newContent:c([]),oldContent:g},j=this.active=c([]);this._toggle(j,g,e)}},_toggle:function(a,b,d,h,f){var g=this,e=g.options;g.toShow=a;g.toHide=b;g.data=d;var j=function(){if(g)return g._completed.apply(g,arguments)};g._trigger("changestart",null,g.data);g.running=b.size()===0?a.size():b.size();if(e.animated){d={};d=e.collapsible&&h?{toShow:c([]),toHide:b,complete:j,down:f,autoHeight:e.autoHeight||e.fillSpace}:{toShow:a,toHide:b,complete:j,down:f,autoHeight:e.autoHeight||
-e.fillSpace};if(!e.proxied)e.proxied=e.animated;if(!e.proxiedDuration)e.proxiedDuration=e.duration;e.animated=c.isFunction(e.proxied)?e.proxied(d):e.proxied;e.duration=c.isFunction(e.proxiedDuration)?e.proxiedDuration(d):e.proxiedDuration;h=c.ui.accordion.animations;var i=e.duration,k=e.animated;if(k&&!h[k]&&!c.easing[k])k="slide";h[k]||(h[k]=function(l){this.slide(l,{easing:k,duration:i||700})});h[k](d)}else{if(e.collapsible&&h)a.toggle();else{b.hide();a.show()}j(true)}b.prev().attr({"aria-expanded":"false",
-"aria-selected":"false",tabIndex:-1}).blur();a.prev().attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}).focus()},_completed:function(a){this.running=a?0:--this.running;if(!this.running){this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""});this.toHide.removeClass("ui-accordion-content-active");if(this.toHide.length)this.toHide.parent()[0].className=this.toHide.parent()[0].className;this._trigger("change",null,this.data)}}});c.extend(c.ui.accordion,{version:"1.8.14",
-animations:{slide:function(a,b){a=c.extend({easing:"swing",duration:300},a,b);if(a.toHide.size())if(a.toShow.size()){var d=a.toShow.css("overflow"),h=0,f={},g={},e;b=a.toShow;e=b[0].style.width;b.width(parseInt(b.parent().width(),10)-parseInt(b.css("paddingLeft"),10)-parseInt(b.css("paddingRight"),10)-(parseInt(b.css("borderLeftWidth"),10)||0)-(parseInt(b.css("borderRightWidth"),10)||0));c.each(["height","paddingTop","paddingBottom"],function(j,i){g[i]="hide";j=(""+c.css(a.toShow[0],i)).match(/^([\d+-.]+)(.*)$/);
-f[i]={value:j[1],unit:j[2]||"px"}});a.toShow.css({height:0,overflow:"hidden"}).show();a.toHide.filter(":hidden").each(a.complete).end().filter(":visible").animate(g,{step:function(j,i){if(i.prop=="height")h=i.end-i.start===0?0:(i.now-i.start)/(i.end-i.start);a.toShow[0].style[i.prop]=h*f[i.prop].value+f[i.prop].unit},duration:a.duration,easing:a.easing,complete:function(){a.autoHeight||a.toShow.css("height","");a.toShow.css({width:e,overflow:d});a.complete()}})}else a.toHide.animate({height:"hide",
-paddingTop:"hide",paddingBottom:"hide"},a);else a.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},a)},bounceslide:function(a){this.slide(a,{easing:a.down?"easeOutBounce":"swing",duration:a.down?1E3:200})}}})})(jQuery);
-;/*
- * jQuery UI Autocomplete 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Autocomplete
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- *	jquery.ui.position.js
- */
-(function(d){var e=0;d.widget("ui.autocomplete",{options:{appendTo:"body",autoFocus:false,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var a=this,b=this.element[0].ownerDocument,g;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(c){if(!(a.options.disabled||a.element.attr("readonly"))){g=
-false;var f=d.ui.keyCode;switch(c.keyCode){case f.PAGE_UP:a._move("previousPage",c);break;case f.PAGE_DOWN:a._move("nextPage",c);break;case f.UP:a._move("previous",c);c.preventDefault();break;case f.DOWN:a._move("next",c);c.preventDefault();break;case f.ENTER:case f.NUMPAD_ENTER:if(a.menu.active){g=true;c.preventDefault()}case f.TAB:if(!a.menu.active)return;a.menu.select(c);break;case f.ESCAPE:a.element.val(a.term);a.close(c);break;default:clearTimeout(a.searching);a.searching=setTimeout(function(){if(a.term!=
-a.element.val()){a.selectedItem=null;a.search(null,c)}},a.options.delay);break}}}).bind("keypress.autocomplete",function(c){if(g){g=false;c.preventDefault()}}).bind("focus.autocomplete",function(){if(!a.options.disabled){a.selectedItem=null;a.previous=a.element.val()}}).bind("blur.autocomplete",function(c){if(!a.options.disabled){clearTimeout(a.searching);a.closing=setTimeout(function(){a.close(c);a._change(c)},150)}});this._initSource();this.response=function(){return a._response.apply(a,arguments)};
-this.menu=d("<ul></ul>").addClass("ui-autocomplete").appendTo(d(this.options.appendTo||"body",b)[0]).mousedown(function(c){var f=a.menu.element[0];d(c.target).closest(".ui-menu-item").length||setTimeout(function(){d(document).one("mousedown",function(h){h.target!==a.element[0]&&h.target!==f&&!d.ui.contains(f,h.target)&&a.close()})},1);setTimeout(function(){clearTimeout(a.closing)},13)}).menu({focus:function(c,f){f=f.item.data("item.autocomplete");false!==a._trigger("focus",c,{item:f})&&/^key/.test(c.originalEvent.type)&&
-a.element.val(f.value)},selected:function(c,f){var h=f.item.data("item.autocomplete"),i=a.previous;if(a.element[0]!==b.activeElement){a.element.focus();a.previous=i;setTimeout(function(){a.previous=i;a.selectedItem=h},1)}false!==a._trigger("select",c,{item:h})&&a.element.val(h.value);a.term=a.element.val();a.close(c);a.selectedItem=h},blur:function(){a.menu.element.is(":visible")&&a.element.val()!==a.term&&a.element.val(a.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu");
-d.fn.bgiframe&&this.menu.element.bgiframe()},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup");this.menu.element.remove();d.Widget.prototype.destroy.call(this)},_setOption:function(a,b){d.Widget.prototype._setOption.apply(this,arguments);a==="source"&&this._initSource();if(a==="appendTo")this.menu.element.appendTo(d(b||"body",this.element[0].ownerDocument)[0]);a==="disabled"&&
-b&&this.xhr&&this.xhr.abort()},_initSource:function(){var a=this,b,g;if(d.isArray(this.options.source)){b=this.options.source;this.source=function(c,f){f(d.ui.autocomplete.filter(b,c.term))}}else if(typeof this.options.source==="string"){g=this.options.source;this.source=function(c,f){a.xhr&&a.xhr.abort();a.xhr=d.ajax({url:g,data:c,dataType:"json",autocompleteRequest:++e,success:function(h){this.autocompleteRequest===e&&f(h)},error:function(){this.autocompleteRequest===e&&f([])}})}}else this.source=
-this.options.source},search:function(a,b){a=a!=null?a:this.element.val();this.term=this.element.val();if(a.length<this.options.minLength)return this.close(b);clearTimeout(this.closing);if(this._trigger("search",b)!==false)return this._search(a)},_search:function(a){this.pending++;this.element.addClass("ui-autocomplete-loading");this.source({term:a},this.response)},_response:function(a){if(!this.options.disabled&&a&&a.length){a=this._normalize(a);this._suggest(a);this._trigger("open")}else this.close();
-this.pending--;this.pending||this.element.removeClass("ui-autocomplete-loading")},close:function(a){clearTimeout(this.closing);if(this.menu.element.is(":visible")){this.menu.element.hide();this.menu.deactivate();this._trigger("close",a)}},_change:function(a){this.previous!==this.element.val()&&this._trigger("change",a,{item:this.selectedItem})},_normalize:function(a){if(a.length&&a[0].label&&a[0].value)return a;return d.map(a,function(b){if(typeof b==="string")return{label:b,value:b};return d.extend({label:b.label||
-b.value,value:b.value||b.label},b)})},_suggest:function(a){var b=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(b,a);this.menu.deactivate();this.menu.refresh();b.show();this._resizeMenu();b.position(d.extend({of:this.element},this.options.position));this.options.autoFocus&&this.menu.next(new d.Event("mouseover"))},_resizeMenu:function(){var a=this.menu.element;a.outerWidth(Math.max(a.width("").outerWidth(),this.element.outerWidth()))},_renderMenu:function(a,b){var g=this;
-d.each(b,function(c,f){g._renderItem(a,f)})},_renderItem:function(a,b){return d("<li></li>").data("item.autocomplete",b).append(d("<a></a>").text(b.label)).appendTo(a)},_move:function(a,b){if(this.menu.element.is(":visible"))if(this.menu.first()&&/^previous/.test(a)||this.menu.last()&&/^next/.test(a)){this.element.val(this.term);this.menu.deactivate()}else this.menu[a](b);else this.search(null,b)},widget:function(){return this.menu.element}});d.extend(d.ui.autocomplete,{escapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,
-"\\$&")},filter:function(a,b){var g=new RegExp(d.ui.autocomplete.escapeRegex(b),"i");return d.grep(a,function(c){return g.test(c.label||c.value||c)})}})})(jQuery);
-(function(d){d.widget("ui.menu",{_create:function(){var e=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(a){if(d(a.target).closest(".ui-menu-item a").length){a.preventDefault();e.select(a)}});this.refresh()},refresh:function(){var e=this;this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem").children("a").addClass("ui-corner-all").attr("tabindex",
--1).mouseenter(function(a){e.activate(a,d(this).parent())}).mouseleave(function(){e.deactivate()})},activate:function(e,a){this.deactivate();if(this.hasScroll()){var b=a.offset().top-this.element.offset().top,g=this.element.scrollTop(),c=this.element.height();if(b<0)this.element.scrollTop(g+b);else b>=c&&this.element.scrollTop(g+b-c+a.height())}this.active=a.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",e,{item:a})},deactivate:function(){if(this.active){this.active.children("a").removeClass("ui-state-hover").removeAttr("id");
-this._trigger("blur");this.active=null}},next:function(e){this.move("next",".ui-menu-item:first",e)},previous:function(e){this.move("prev",".ui-menu-item:last",e)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(e,a,b){if(this.active){e=this.active[e+"All"](".ui-menu-item").eq(0);e.length?this.activate(b,e):this.activate(b,this.element.children(a))}else this.activate(b,
-this.element.children(a))},nextPage:function(e){if(this.hasScroll())if(!this.active||this.last())this.activate(e,this.element.children(".ui-menu-item:first"));else{var a=this.active.offset().top,b=this.element.height(),g=this.element.children(".ui-menu-item").filter(function(){var c=d(this).offset().top-a-b+d(this).height();return c<10&&c>-10});g.length||(g=this.element.children(".ui-menu-item:last"));this.activate(e,g)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active||
-this.last()?":first":":last"))},previousPage:function(e){if(this.hasScroll())if(!this.active||this.first())this.activate(e,this.element.children(".ui-menu-item:last"));else{var a=this.active.offset().top,b=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var g=d(this).offset().top-a+b-d(this).height();return g<10&&g>-10});result.length||(result=this.element.children(".ui-menu-item:first"));this.activate(e,result)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active||
-this.first()?":last":":first"))},hasScroll:function(){return this.element.height()<this.element[d.fn.prop?"prop":"attr"]("scrollHeight")},select:function(e){this._trigger("selected",e,{item:this.active})}})})(jQuery);
-;/*
- * jQuery UI Button 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Button
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- */
-(function(b){var h,i,j,g,l=function(){var a=b(this).find(":ui-button");setTimeout(function(){a.button("refresh")},1)},k=function(a){var c=a.name,e=a.form,f=b([]);if(c)f=e?b(e).find("[name='"+c+"']"):b("[name='"+c+"']",a.ownerDocument).filter(function(){return!this.form});return f};b.widget("ui.button",{options:{disabled:null,text:true,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",l);if(typeof this.options.disabled!==
-"boolean")this.options.disabled=this.element.attr("disabled");this._determineButtonType();this.hasTitle=!!this.buttonElement.attr("title");var a=this,c=this.options,e=this.type==="checkbox"||this.type==="radio",f="ui-state-hover"+(!e?" ui-state-active":"");if(c.label===null)c.label=this.buttonElement.html();if(this.element.is(":disabled"))c.disabled=true;this.buttonElement.addClass("ui-button ui-widget ui-state-default ui-corner-all").attr("role","button").bind("mouseenter.button",function(){if(!c.disabled){b(this).addClass("ui-state-hover");
-this===h&&b(this).addClass("ui-state-active")}}).bind("mouseleave.button",function(){c.disabled||b(this).removeClass(f)}).bind("click.button",function(d){if(c.disabled){d.preventDefault();d.stopImmediatePropagation()}});this.element.bind("focus.button",function(){a.buttonElement.addClass("ui-state-focus")}).bind("blur.button",function(){a.buttonElement.removeClass("ui-state-focus")});if(e){this.element.bind("change.button",function(){g||a.refresh()});this.buttonElement.bind("mousedown.button",function(d){if(!c.disabled){g=
-false;i=d.pageX;j=d.pageY}}).bind("mouseup.button",function(d){if(!c.disabled)if(i!==d.pageX||j!==d.pageY)g=true})}if(this.type==="checkbox")this.buttonElement.bind("click.button",function(){if(c.disabled||g)return false;b(this).toggleClass("ui-state-active");a.buttonElement.attr("aria-pressed",a.element[0].checked)});else if(this.type==="radio")this.buttonElement.bind("click.button",function(){if(c.disabled||g)return false;b(this).addClass("ui-state-active");a.buttonElement.attr("aria-pressed",true);
-var d=a.element[0];k(d).not(d).map(function(){return b(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed",false)});else{this.buttonElement.bind("mousedown.button",function(){if(c.disabled)return false;b(this).addClass("ui-state-active");h=this;b(document).one("mouseup",function(){h=null})}).bind("mouseup.button",function(){if(c.disabled)return false;b(this).removeClass("ui-state-active")}).bind("keydown.button",function(d){if(c.disabled)return false;if(d.keyCode==b.ui.keyCode.SPACE||
-d.keyCode==b.ui.keyCode.ENTER)b(this).addClass("ui-state-active")}).bind("keyup.button",function(){b(this).removeClass("ui-state-active")});this.buttonElement.is("a")&&this.buttonElement.keyup(function(d){d.keyCode===b.ui.keyCode.SPACE&&b(this).click()})}this._setOption("disabled",c.disabled);this._resetButton()},_determineButtonType:function(){this.type=this.element.is(":checkbox")?"checkbox":this.element.is(":radio")?"radio":this.element.is("input")?"input":"button";if(this.type==="checkbox"||this.type===
-"radio"){var a=this.element.parents().filter(":last"),c="label[for="+this.element.attr("id")+"]";this.buttonElement=a.find(c);if(!this.buttonElement.length){a=a.length?a.siblings():this.element.siblings();this.buttonElement=a.filter(c);if(!this.buttonElement.length)this.buttonElement=a.find(c)}this.element.addClass("ui-helper-hidden-accessible");(a=this.element.is(":checked"))&&this.buttonElement.addClass("ui-state-active");this.buttonElement.attr("aria-pressed",a)}else this.buttonElement=this.element},
-widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible");this.buttonElement.removeClass("ui-button ui-widget ui-state-default ui-corner-all ui-state-hover ui-state-active  ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only").removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html());this.hasTitle||this.buttonElement.removeAttr("title");
-b.Widget.prototype.destroy.call(this)},_setOption:function(a,c){b.Widget.prototype._setOption.apply(this,arguments);if(a==="disabled")c?this.element.attr("disabled",true):this.element.removeAttr("disabled");else this._resetButton()},refresh:function(){var a=this.element.is(":disabled");a!==this.options.disabled&&this._setOption("disabled",a);if(this.type==="radio")k(this.element[0]).each(function(){b(this).is(":checked")?b(this).button("widget").addClass("ui-state-active").attr("aria-pressed",true):
-b(this).button("widget").removeClass("ui-state-active").attr("aria-pressed",false)});else if(this.type==="checkbox")this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed",true):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed",false)},_resetButton:function(){if(this.type==="input")this.options.label&&this.element.val(this.options.label);else{var a=this.buttonElement.removeClass("ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only"),
-c=b("<span></span>").addClass("ui-button-text").html(this.options.label).appendTo(a.empty()).text(),e=this.options.icons,f=e.primary&&e.secondary,d=[];if(e.primary||e.secondary){if(this.options.text)d.push("ui-button-text-icon"+(f?"s":e.primary?"-primary":"-secondary"));e.primary&&a.prepend("<span class='ui-button-icon-primary ui-icon "+e.primary+"'></span>");e.secondary&&a.append("<span class='ui-button-icon-secondary ui-icon "+e.secondary+"'></span>");if(!this.options.text){d.push(f?"ui-button-icons-only":
-"ui-button-icon-only");this.hasTitle||a.attr("title",c)}}else d.push("ui-button-text-only");a.addClass(d.join(" "))}}});b.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(a,c){a==="disabled"&&this.buttons.button("option",a,c);b.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){var a=this.element.css("direction")===
-"ltr";this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return b(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(a?"ui-corner-left":"ui-corner-right").end().filter(":last").addClass(a?"ui-corner-right":"ui-corner-left").end().end()},destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return b(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy");
-b.Widget.prototype.destroy.call(this)}})})(jQuery);
-;/*
- * jQuery UI Dialog 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Dialog
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- *  jquery.ui.button.js
- *	jquery.ui.draggable.js
- *	jquery.ui.mouse.js
- *	jquery.ui.position.js
- *	jquery.ui.resizable.js
- */
-(function(c,l){var m={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},n={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true},o=c.attrFn||{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true,click:true};c.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,
-position:{my:"center",at:"center",collision:"fit",using:function(a){var b=c(this).css(a).offset().top;b<0&&c(this).css("top",a.top-b)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var a=this,b=a.options,d=b.title||"&#160;",e=c.ui.dialog.getTitleId(a.element),g=(a.uiDialog=c("<div></div>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+
-b.dialogClass).css({zIndex:b.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(i){if(b.closeOnEscape&&i.keyCode&&i.keyCode===c.ui.keyCode.ESCAPE){a.close(i);i.preventDefault()}}).attr({role:"dialog","aria-labelledby":e}).mousedown(function(i){a.moveToTop(false,i)});a.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g);var f=(a.uiDialogTitlebar=c("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g),
-h=c('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){h.addClass("ui-state-hover")},function(){h.removeClass("ui-state-hover")}).focus(function(){h.addClass("ui-state-focus")}).blur(function(){h.removeClass("ui-state-focus")}).click(function(i){a.close(i);return false}).appendTo(f);(a.uiDialogTitlebarCloseText=c("<span></span>")).addClass("ui-icon ui-icon-closethick").text(b.closeText).appendTo(h);c("<span></span>").addClass("ui-dialog-title").attr("id",
-e).html(d).prependTo(f);if(c.isFunction(b.beforeclose)&&!c.isFunction(b.beforeClose))b.beforeClose=b.beforeclose;f.find("*").add(f).disableSelection();b.draggable&&c.fn.draggable&&a._makeDraggable();b.resizable&&c.fn.resizable&&a._makeResizable();a._createButtons(b.buttons);a._isOpen=false;c.fn.bgiframe&&g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;a.overlay&&a.overlay.destroy();a.uiDialog.hide();a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");
-a.uiDialog.remove();a.originalTitle&&a.element.attr("title",a.originalTitle);return a},widget:function(){return this.uiDialog},close:function(a){var b=this,d,e;if(false!==b._trigger("beforeClose",a)){b.overlay&&b.overlay.destroy();b.uiDialog.unbind("keypress.ui-dialog");b._isOpen=false;if(b.options.hide)b.uiDialog.hide(b.options.hide,function(){b._trigger("close",a)});else{b.uiDialog.hide();b._trigger("close",a)}c.ui.dialog.overlay.resize();if(b.options.modal){d=0;c(".ui-dialog").each(function(){if(this!==
-b.uiDialog[0]){e=c(this).css("z-index");isNaN(e)||(d=Math.max(d,e))}});c.ui.dialog.maxZ=d}return b}},isOpen:function(){return this._isOpen},moveToTop:function(a,b){var d=this,e=d.options;if(e.modal&&!a||!e.stack&&!e.modal)return d._trigger("focus",b);if(e.zIndex>c.ui.dialog.maxZ)c.ui.dialog.maxZ=e.zIndex;if(d.overlay){c.ui.dialog.maxZ+=1;d.overlay.$el.css("z-index",c.ui.dialog.overlay.maxZ=c.ui.dialog.maxZ)}a={scrollTop:d.element.attr("scrollTop"),scrollLeft:d.element.attr("scrollLeft")};c.ui.dialog.maxZ+=
-1;d.uiDialog.css("z-index",c.ui.dialog.maxZ);d.element.attr(a);d._trigger("focus",b);return d},open:function(){if(!this._isOpen){var a=this,b=a.options,d=a.uiDialog;a.overlay=b.modal?new c.ui.dialog.overlay(a):null;a._size();a._position(b.position);d.show(b.show);a.moveToTop(true);b.modal&&d.bind("keypress.ui-dialog",function(e){if(e.keyCode===c.ui.keyCode.TAB){var g=c(":tabbable",this),f=g.filter(":first");g=g.filter(":last");if(e.target===g[0]&&!e.shiftKey){f.focus(1);return false}else if(e.target===
-f[0]&&e.shiftKey){g.focus(1);return false}}});c(a.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus();a._isOpen=true;a._trigger("open");return a}},_createButtons:function(a){var b=this,d=false,e=c("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=c("<div></div>").addClass("ui-dialog-buttonset").appendTo(e);b.uiDialog.find(".ui-dialog-buttonpane").remove();typeof a==="object"&&a!==null&&c.each(a,
-function(){return!(d=true)});if(d){c.each(a,function(f,h){h=c.isFunction(h)?{click:h,text:f}:h;var i=c('<button type="button"></button>').click(function(){h.click.apply(b.element[0],arguments)}).appendTo(g);c.each(h,function(j,k){if(j!=="click")j in o?i[j](k):i.attr(j,k)});c.fn.button&&i.button()});e.appendTo(b.uiDialog)}},_makeDraggable:function(){function a(f){return{position:f.position,offset:f.offset}}var b=this,d=b.options,e=c(document),g;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",
-handle:".ui-dialog-titlebar",containment:"document",start:function(f,h){g=d.height==="auto"?"auto":c(this).height();c(this).height(c(this).height()).addClass("ui-dialog-dragging");b._trigger("dragStart",f,a(h))},drag:function(f,h){b._trigger("drag",f,a(h))},stop:function(f,h){d.position=[h.position.left-e.scrollLeft(),h.position.top-e.scrollTop()];c(this).removeClass("ui-dialog-dragging").height(g);b._trigger("dragStop",f,a(h));c.ui.dialog.overlay.resize()}})},_makeResizable:function(a){function b(f){return{originalPosition:f.originalPosition,
-originalSize:f.originalSize,position:f.position,size:f.size}}a=a===l?this.options.resizable:a;var d=this,e=d.options,g=d.uiDialog.css("position");a=typeof a==="string"?a:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:d._minHeight(),handles:a,start:function(f,h){c(this).addClass("ui-dialog-resizing");d._trigger("resizeStart",f,b(h))},resize:function(f,h){d._trigger("resize",
-f,b(h))},stop:function(f,h){c(this).removeClass("ui-dialog-resizing");e.height=c(this).height();e.width=c(this).width();d._trigger("resizeStop",f,b(h));c.ui.dialog.overlay.resize()}}).css("position",g).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=this.options;return a.height==="auto"?a.minHeight:Math.min(a.minHeight,a.height)},_position:function(a){var b=[],d=[0,0],e;if(a){if(typeof a==="string"||typeof a==="object"&&"0"in a){b=a.split?a.split(" "):
-[a[0],a[1]];if(b.length===1)b[1]=b[0];c.each(["left","top"],function(g,f){if(+b[g]===b[g]){d[g]=b[g];b[g]=f}});a={my:b.join(" "),at:b.join(" "),offset:d.join(" ")}}a=c.extend({},c.ui.dialog.prototype.options.position,a)}else a=c.ui.dialog.prototype.options.position;(e=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(c.extend({of:window},a));e||this.uiDialog.hide()},_setOptions:function(a){var b=this,d={},e=false;c.each(a,function(g,f){b._setOption(g,f);
-if(g in m)e=true;if(g in n)d[g]=f});e&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",d)},_setOption:function(a,b){var d=this,e=d.uiDialog;switch(a){case "beforeclose":a="beforeClose";break;case "buttons":d._createButtons(b);break;case "closeText":d.uiDialogTitlebarCloseText.text(""+b);break;case "dialogClass":e.removeClass(d.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b);break;case "disabled":b?e.addClass("ui-dialog-disabled"):
-e.removeClass("ui-dialog-disabled");break;case "draggable":var g=e.is(":data(draggable)");g&&!b&&e.draggable("destroy");!g&&b&&d._makeDraggable();break;case "position":d._position(b);break;case "resizable":(g=e.is(":data(resizable)"))&&!b&&e.resizable("destroy");g&&typeof b==="string"&&e.resizable("option","handles",b);!g&&b!==false&&d._makeResizable(b);break;case "title":c(".ui-dialog-title",d.uiDialogTitlebar).html(""+(b||"&#160;"));break}c.Widget.prototype._setOption.apply(d,arguments)},_size:function(){var a=
-this.options,b,d,e=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(a.minWidth>a.width)a.width=a.minWidth;b=this.uiDialog.css({height:"auto",width:a.width}).height();d=Math.max(0,a.minHeight-b);if(a.height==="auto")if(c.support.minHeight)this.element.css({minHeight:d,height:"auto"});else{this.uiDialog.show();a=this.element.css("height","auto").height();e||this.uiDialog.hide();this.element.height(Math.max(a,d))}else this.element.height(Math.max(a.height-
-b,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}});c.extend(c.ui.dialog,{version:"1.8.14",uuid:0,maxZ:0,getTitleId:function(a){a=a.attr("id");if(!a){this.uuid+=1;a=this.uuid}return"ui-dialog-title-"+a},overlay:function(a){this.$el=c.ui.dialog.overlay.create(a)}});c.extend(c.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:c.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(a){return a+".dialog-overlay"}).join(" "),
-create:function(a){if(this.instances.length===0){setTimeout(function(){c.ui.dialog.overlay.instances.length&&c(document).bind(c.ui.dialog.overlay.events,function(d){if(c(d.target).zIndex()<c.ui.dialog.overlay.maxZ)return false})},1);c(document).bind("keydown.dialog-overlay",function(d){if(a.options.closeOnEscape&&d.keyCode&&d.keyCode===c.ui.keyCode.ESCAPE){a.close(d);d.preventDefault()}});c(window).bind("resize.dialog-overlay",c.ui.dialog.overlay.resize)}var b=(this.oldInstances.pop()||c("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),
-height:this.height()});c.fn.bgiframe&&b.bgiframe();this.instances.push(b);return b},destroy:function(a){var b=c.inArray(a,this.instances);b!=-1&&this.oldInstances.push(this.instances.splice(b,1)[0]);this.instances.length===0&&c([document,window]).unbind(".dialog-overlay");a.remove();var d=0;c.each(this.instances,function(){d=Math.max(d,this.css("z-index"))});this.maxZ=d},height:function(){var a,b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);
-b=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return a<b?c(window).height()+"px":a+"px"}else return c(document).height()+"px"},width:function(){var a,b;if(c.browser.msie){a=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);b=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return a<b?c(window).width()+"px":a+"px"}else return c(document).width()+"px"},resize:function(){var a=c([]);c.each(c.ui.dialog.overlay.instances,function(){a=
-a.add(this)});a.css({width:0,height:0}).css({width:c.ui.dialog.overlay.width(),height:c.ui.dialog.overlay.height()})}});c.extend(c.ui.dialog.overlay.prototype,{destroy:function(){c.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);
-;/*
- * jQuery UI Slider 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Slider
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(d){d.widget("ui.slider",d.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var b=this,a=this.options,c=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f=a.values&&a.values.length||1,e=[];this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+
-this.orientation+" ui-widget ui-widget-content ui-corner-all"+(a.disabled?" ui-slider-disabled ui-disabled":""));this.range=d([]);if(a.range){if(a.range===true){if(!a.values)a.values=[this._valueMin(),this._valueMin()];if(a.values.length&&a.values.length!==2)a.values=[a.values[0],a.values[0]]}this.range=d("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(a.range==="min"||a.range==="max"?" ui-slider-range-"+a.range:""))}for(var j=c.length;j<f;j+=1)e.push("<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>");
-this.handles=c.add(d(e.join("")).appendTo(b.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(g){g.preventDefault()}).hover(function(){a.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(a.disabled)d(this).blur();else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(g){d(this).data("index.ui-slider-handle",
-g)});this.handles.keydown(function(g){var k=true,l=d(this).data("index.ui-slider-handle"),i,h,m;if(!b.options.disabled){switch(g.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:k=false;if(!b._keySliding){b._keySliding=true;d(this).addClass("ui-state-active");i=b._start(g,l);if(i===false)return}break}m=b.options.step;i=b.options.values&&b.options.values.length?
-(h=b.values(l)):(h=b.value());switch(g.keyCode){case d.ui.keyCode.HOME:h=b._valueMin();break;case d.ui.keyCode.END:h=b._valueMax();break;case d.ui.keyCode.PAGE_UP:h=b._trimAlignValue(i+(b._valueMax()-b._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:h=b._trimAlignValue(i-(b._valueMax()-b._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(i===b._valueMax())return;h=b._trimAlignValue(i+m);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(i===b._valueMin())return;h=b._trimAlignValue(i-
-m);break}b._slide(g,l,h);return k}}).keyup(function(g){var k=d(this).data("index.ui-slider-handle");if(b._keySliding){b._keySliding=false;b._stop(g,k);b._change(g,k);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy();
-return this},_mouseCapture:function(b){var a=this.options,c,f,e,j,g;if(a.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:b.pageX,y:b.pageY});f=this._valueMax()-this._valueMin()+1;j=this;this.handles.each(function(k){var l=Math.abs(c-j.values(k));if(f>l){f=l;e=d(this);g=k}});if(a.range===true&&this.values(1)===a.min){g+=1;e=d(this.handles[g])}if(this._start(b,g)===false)return false;
-this._mouseSliding=true;j._handleIndex=g;e.addClass("ui-state-active").focus();a=e.offset();this._clickOffset=!d(b.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:b.pageX-a.left-e.width()/2,top:b.pageY-a.top-e.height()/2-(parseInt(e.css("borderTopWidth"),10)||0)-(parseInt(e.css("borderBottomWidth"),10)||0)+(parseInt(e.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(b,g,c);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(b){var a=
-this._normValueFromMouse({x:b.pageX,y:b.pageY});this._slide(b,this._handleIndex,a);return false},_mouseStop:function(b){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(b,this._handleIndex);this._change(b,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(b){var a;if(this.orientation==="horizontal"){a=
-this.elementSize.width;b=b.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{a=this.elementSize.height;b=b.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}a=b/a;if(a>1)a=1;if(a<0)a=0;if(this.orientation==="vertical")a=1-a;b=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+a*b)},_start:function(b,a){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(a);
-c.values=this.values()}return this._trigger("start",b,c)},_slide:function(b,a,c){var f;if(this.options.values&&this.options.values.length){f=this.values(a?0:1);if(this.options.values.length===2&&this.options.range===true&&(a===0&&c>f||a===1&&c<f))c=f;if(c!==this.values(a)){f=this.values();f[a]=c;b=this._trigger("slide",b,{handle:this.handles[a],value:c,values:f});this.values(a?0:1);b!==false&&this.values(a,c,true)}}else if(c!==this.value()){b=this._trigger("slide",b,{handle:this.handles[a],value:c});
-b!==false&&this.value(c)}},_stop:function(b,a){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(a);c.values=this.values()}this._trigger("stop",b,c)},_change:function(b,a){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(a);c.values=this.values()}this._trigger("change",b,c)}},value:function(b){if(arguments.length){this.options.value=
-this._trimAlignValue(b);this._refreshValue();this._change(null,0)}else return this._value()},values:function(b,a){var c,f,e;if(arguments.length>1){this.options.values[b]=this._trimAlignValue(a);this._refreshValue();this._change(null,b)}else if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;f=arguments[0];for(e=0;e<c.length;e+=1){c[e]=this._trimAlignValue(f[e]);this._change(null,e)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(b):
-this.value();else return this._values()},_setOption:function(b,a){var c,f=0;if(d.isArray(this.options.values))f=this.options.values.length;d.Widget.prototype._setOption.apply(this,arguments);switch(b){case "disabled":if(a){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.attr("disabled","disabled");this.element.addClass("ui-disabled")}else{this.handles.removeAttr("disabled");this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation();
-this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(c=0;c<f;c+=1)this._change(null,c);this._animateOff=false;break}},_value:function(){var b=this.options.value;return b=this._trimAlignValue(b)},_values:function(b){var a,c;if(arguments.length){a=this.options.values[b];
-return a=this._trimAlignValue(a)}else{a=this.options.values.slice();for(c=0;c<a.length;c+=1)a[c]=this._trimAlignValue(a[c]);return a}},_trimAlignValue:function(b){if(b<=this._valueMin())return this._valueMin();if(b>=this._valueMax())return this._valueMax();var a=this.options.step>0?this.options.step:1,c=(b-this._valueMin())%a;alignValue=b-c;if(Math.abs(c)*2>=a)alignValue+=c>0?a:-a;return parseFloat(alignValue.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},
-_refreshValue:function(){var b=this.options.range,a=this.options,c=this,f=!this._animateOff?a.animate:false,e,j={},g,k,l,i;if(this.options.values&&this.options.values.length)this.handles.each(function(h){e=(c.values(h)-c._valueMin())/(c._valueMax()-c._valueMin())*100;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";d(this).stop(1,1)[f?"animate":"css"](j,a.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(h===0)c.range.stop(1,1)[f?"animate":"css"]({left:e+"%"},a.animate);
-if(h===1)c.range[f?"animate":"css"]({width:e-g+"%"},{queue:false,duration:a.animate})}else{if(h===0)c.range.stop(1,1)[f?"animate":"css"]({bottom:e+"%"},a.animate);if(h===1)c.range[f?"animate":"css"]({height:e-g+"%"},{queue:false,duration:a.animate})}g=e});else{k=this.value();l=this._valueMin();i=this._valueMax();e=i!==l?(k-l)/(i-l)*100:0;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";this.handle.stop(1,1)[f?"animate":"css"](j,a.animate);if(b==="min"&&this.orientation==="horizontal")this.range.stop(1,
-1)[f?"animate":"css"]({width:e+"%"},a.animate);if(b==="max"&&this.orientation==="horizontal")this.range[f?"animate":"css"]({width:100-e+"%"},{queue:false,duration:a.animate});if(b==="min"&&this.orientation==="vertical")this.range.stop(1,1)[f?"animate":"css"]({height:e+"%"},a.animate);if(b==="max"&&this.orientation==="vertical")this.range[f?"animate":"css"]({height:100-e+"%"},{queue:false,duration:a.animate})}}});d.extend(d.ui.slider,{version:"1.8.14"})})(jQuery);
-;/*
- * jQuery UI Tabs 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Tabs
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- */
-(function(d,p){function u(){return++v}function w(){return++x}var v=0,x=0;d.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(b,e){if(b=="selected")this.options.collapsible&&
-e==this.options.selected||this.select(e);else{this.options[b]=e;this._tabify()}},_tabId:function(b){return b.title&&b.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+u()},_sanitizeSelector:function(b){return b.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+w());return d.cookie.apply(null,[b].concat(d.makeArray(arguments)))},_ui:function(b,e){return{tab:b,panel:e,index:this.anchors.index(b)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b=
-d(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(b){function e(g,f){g.css("display","");!d.support.opacity&&f.opacity&&g[0].style.removeAttribute("filter")}var a=this,c=this.options,h=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=d(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return d("a",this)[0]});this.panels=d([]);this.anchors.each(function(g,f){var i=d(f).attr("href"),l=i.split("#")[0],q;if(l&&(l===location.toString().split("#")[0]||
-(q=d("base")[0])&&l===q.href)){i=f.hash;f.href=i}if(h.test(i))a.panels=a.panels.add(a.element.find(a._sanitizeSelector(i)));else if(i&&i!=="#"){d.data(f,"href.tabs",i);d.data(f,"load.tabs",i.replace(/#.*$/,""));i=a._tabId(f);f.href="#"+i;f=a.element.find("#"+i);if(!f.length){f=d(c.panelTemplate).attr("id",i).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(a.panels[g-1]||a.list);f.data("destroy.tabs",true)}a.panels=a.panels.add(f)}else c.disabled.push(g)});if(b){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");
-this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(c.selected===p){location.hash&&this.anchors.each(function(g,f){if(f.hash==location.hash){c.selected=g;return false}});if(typeof c.selected!=="number"&&c.cookie)c.selected=parseInt(a._cookie(),10);if(typeof c.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)c.selected=
-this.lis.index(this.lis.filter(".ui-tabs-selected"));c.selected=c.selected||(this.lis.length?0:-1)}else if(c.selected===null)c.selected=-1;c.selected=c.selected>=0&&this.anchors[c.selected]||c.selected<0?c.selected:0;c.disabled=d.unique(c.disabled.concat(d.map(this.lis.filter(".ui-state-disabled"),function(g){return a.lis.index(g)}))).sort();d.inArray(c.selected,c.disabled)!=-1&&c.disabled.splice(d.inArray(c.selected,c.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");
-if(c.selected>=0&&this.anchors.length){a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(c.selected).addClass("ui-tabs-selected ui-state-active");a.element.queue("tabs",function(){a._trigger("show",null,a._ui(a.anchors[c.selected],a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash))[0]))});this.load(c.selected)}d(window).bind("unload",function(){a.lis.add(a.anchors).unbind(".tabs");a.lis=a.anchors=a.panels=null})}else c.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));
-this.element[c.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");c.cookie&&this._cookie(c.selected,c.cookie);b=0;for(var j;j=this.lis[b];b++)d(j)[d.inArray(b,c.disabled)!=-1&&!d(j).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");c.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(c.event!=="mouseover"){var k=function(g,f){f.is(":not(.ui-state-disabled)")&&f.addClass("ui-state-"+g)},n=function(g,f){f.removeClass("ui-state-"+
-g)};this.lis.bind("mouseover.tabs",function(){k("hover",d(this))});this.lis.bind("mouseout.tabs",function(){n("hover",d(this))});this.anchors.bind("focus.tabs",function(){k("focus",d(this).closest("li"))});this.anchors.bind("blur.tabs",function(){n("focus",d(this).closest("li"))})}var m,o;if(c.fx)if(d.isArray(c.fx)){m=c.fx[0];o=c.fx[1]}else m=o=c.fx;var r=o?function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.hide().removeClass("ui-tabs-hide").animate(o,o.duration||"normal",
-function(){e(f,o);a._trigger("show",null,a._ui(g,f[0]))})}:function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.removeClass("ui-tabs-hide");a._trigger("show",null,a._ui(g,f[0]))},s=m?function(g,f){f.animate(m,m.duration||"normal",function(){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");e(f,m);a.element.dequeue("tabs")})}:function(g,f){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");a.element.dequeue("tabs")};
-this.anchors.bind(c.event+".tabs",function(){var g=this,f=d(g).closest("li"),i=a.panels.filter(":not(.ui-tabs-hide)"),l=a.element.find(a._sanitizeSelector(g.hash));if(f.hasClass("ui-tabs-selected")&&!c.collapsible||f.hasClass("ui-state-disabled")||f.hasClass("ui-state-processing")||a.panels.filter(":animated").length||a._trigger("select",null,a._ui(this,l[0]))===false){this.blur();return false}c.selected=a.anchors.index(this);a.abort();if(c.collapsible)if(f.hasClass("ui-tabs-selected")){c.selected=
--1;c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){s(g,i)}).dequeue("tabs");this.blur();return false}else if(!i.length){c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this));this.blur();return false}c.cookie&&a._cookie(c.selected,c.cookie);if(l.length){i.length&&a.element.queue("tabs",function(){s(g,i)});a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier.";
-d.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(b){if(typeof b=="string")b=this.anchors.index(this.anchors.filter("[href$="+b+"]"));return b},destroy:function(){var b=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var e=
-d.data(this,"href.tabs");if(e)this.href=e;var a=d(this).unbind(".tabs");d.each(["href","load","cache"],function(c,h){a.removeData(h+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){d.data(this,"destroy.tabs")?d(this).remove():d(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});b.cookie&&this._cookie(null,b.cookie);return this},add:function(b,
-e,a){if(a===p)a=this.anchors.length;var c=this,h=this.options;e=d(h.tabTemplate.replace(/#\{href\}/g,b).replace(/#\{label\}/g,e));b=!b.indexOf("#")?b.replace("#",""):this._tabId(d("a",e)[0]);e.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var j=c.element.find("#"+b);j.length||(j=d(h.panelTemplate).attr("id",b).data("destroy.tabs",true));j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(a>=this.lis.length){e.appendTo(this.list);j.appendTo(this.list[0].parentNode)}else{e.insertBefore(this.lis[a]);
-j.insertBefore(this.panels[a])}h.disabled=d.map(h.disabled,function(k){return k>=a?++k:k});this._tabify();if(this.anchors.length==1){h.selected=0;e.addClass("ui-tabs-selected ui-state-active");j.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){c._trigger("show",null,c._ui(c.anchors[0],c.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[a],this.panels[a]));return this},remove:function(b){b=this._getIndex(b);var e=this.options,a=this.lis.eq(b).remove(),c=this.panels.eq(b).remove();
-if(a.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(b+(b+1<this.anchors.length?1:-1));e.disabled=d.map(d.grep(e.disabled,function(h){return h!=b}),function(h){return h>=b?--h:h});this._tabify();this._trigger("remove",null,this._ui(a.find("a")[0],c[0]));return this},enable:function(b){b=this._getIndex(b);var e=this.options;if(d.inArray(b,e.disabled)!=-1){this.lis.eq(b).removeClass("ui-state-disabled");e.disabled=d.grep(e.disabled,function(a){return a!=b});this._trigger("enable",null,
-this._ui(this.anchors[b],this.panels[b]));return this}},disable:function(b){b=this._getIndex(b);var e=this.options;if(b!=e.selected){this.lis.eq(b).addClass("ui-state-disabled");e.disabled.push(b);e.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[b],this.panels[b]))}return this},select:function(b){b=this._getIndex(b);if(b==-1)if(this.options.collapsible&&this.options.selected!=-1)b=this.options.selected;else return this;this.anchors.eq(b).trigger(this.options.event+".tabs");return this},
-load:function(b){b=this._getIndex(b);var e=this,a=this.options,c=this.anchors.eq(b)[0],h=d.data(c,"load.tabs");this.abort();if(!h||this.element.queue("tabs").length!==0&&d.data(c,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(b).addClass("ui-state-processing");if(a.spinner){var j=d("span",c);j.data("label.tabs",j.html()).html(a.spinner)}this.xhr=d.ajax(d.extend({},a.ajaxOptions,{url:h,success:function(k,n){e.element.find(e._sanitizeSelector(c.hash)).html(k);e._cleanup();a.cache&&d.data(c,
-"cache.tabs",true);e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.success(k,n)}catch(m){}},error:function(k,n){e._cleanup();e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.error(k,n,b,c)}catch(m){}}}));e.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},
-url:function(b,e){this.anchors.eq(b).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.14"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(b,e){var a=this,c=this.options,h=a._rotate||(a._rotate=function(j){clearTimeout(a.rotation);a.rotation=setTimeout(function(){var k=c.selected;a.select(++k<a.anchors.length?k:0)},b);j&&j.stopPropagation()});e=a._unrotate||(a._unrotate=!e?function(j){j.clientX&&
-a.rotate(null)}:function(){t=c.selected;h()});if(b){this.element.bind("tabsshow",h);this.anchors.bind(c.event+".tabs",e);h()}else{clearTimeout(a.rotation);this.element.unbind("tabsshow",h);this.anchors.unbind(c.event+".tabs",e);delete this._rotate;delete this._unrotate}return this}})})(jQuery);
-;/*
- * jQuery UI Datepicker 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker
- *
- * Depends:
- *	jquery.ui.core.js
- */
-(function(d,C){function M(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
-"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
-"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
-minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=N(d('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}function N(a){return a.bind("mouseout",function(b){b=
-d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");b.length&&b.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(d.datepicker._isDisabledDatepicker(J.inline?a.parent()[0]:J.input[0])||!b.length)){b.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");b.addClass("ui-state-hover");
-b.hasClass("ui-datepicker-prev")&&b.addClass("ui-datepicker-prev-hover");b.hasClass("ui-datepicker-next")&&b.addClass("ui-datepicker-next-hover")}})}function H(a,b){d.extend(a,b);for(var c in b)if(b[c]==null||b[c]==C)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.14"}});var A=(new Date).getTime(),J;d.extend(M.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(a){H(this._defaults,
-a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1"),input:a,selectedDay:0,
-selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:N(d('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}},_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(e,f,h){b.settings[f]=
-h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&b.append.remove();if(c){b.append=d('<span class="'+this._appendClass+'">'+c+"</span>");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c=="focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c=
-this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("<img/>").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('<button type="button"></button>').addClass(this._triggerClass).html(f==""?c:d("<img/>").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a,
-"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;g<f.length;g++)if(f[g].length>h){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",
-function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),true);this._updateDatepicker(b);this._updateAlternate(b);b.dpDiv.show()}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=1;this._dialogInput=d('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);
-a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}H(a.settings,e||{});b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",
-this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",
-this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span"){b=
-b.children("."+this._inlineClass);b.children().removeClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",
-cursor:"default"})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().addClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return true;return false},
-_getInst:function(a){try{return d.data(a,"datepicker")}catch(b){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(a,b,c){var e=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?d.extend({},d.datepicker._defaults):e?b=="all"?d.extend({},e.settings):this._get(e,b):null;var f=b||{};if(typeof b=="string"){f={};f[b]=c}if(e){this._curInst==e&&this._hideDatepicker();var h=this._getDateDatepicker(a,true),i=this._getMinMaxDate(e,"min"),g=this._getMinMaxDate(e,
-"max");H(e.settings,f);if(i!==null&&f.dateFormat!==C&&f.minDate===C)e.settings.minDate=this._formatDate(e,i);if(g!==null&&f.dateFormat!==C&&f.maxDate===C)e.settings.maxDate=this._formatDate(e,g);this._attachments(d(a),e);this._autoSize(e);this._setDate(e,h);this._updateAlternate(e);this._updateDatepicker(e)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){(a=this._getInst(a))&&this._updateDatepicker(a)},_setDateDatepicker:function(a,b){if(a=this._getInst(a)){this._setDate(a,
-b);this._updateDatepicker(a);this._updateAlternate(a)}},_getDateDatepicker:function(a,b){(a=this._getInst(a))&&!a.inline&&this._setDateFromField(a,b);return a?this._getDate(a):null},_doKeyDown:function(a){var b=d.datepicker._getInst(a.target),c=true,e=b.dpDiv.is(".ui-datepicker-rtl");b._keyEvent=true;if(d.datepicker._datepickerShowing)switch(a.keyCode){case 9:d.datepicker._hideDatepicker();c=false;break;case 13:c=d("td."+d.datepicker._dayOverClass+":not(."+d.datepicker._currentClass+")",b.dpDiv);
-c[0]?d.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,c[0]):d.datepicker._hideDatepicker();return false;case 27:d.datepicker._hideDatepicker();break;case 33:d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 34:d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 35:if(a.ctrlKey||a.metaKey)d.datepicker._clearDate(a.target);
-c=a.ctrlKey||a.metaKey;break;case 36:if(a.ctrlKey||a.metaKey)d.datepicker._gotoToday(a.target);c=a.ctrlKey||a.metaKey;break;case 37:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?+1:-1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 38:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,-7,"D");c=a.ctrlKey||a.metaKey;break;case 39:if(a.ctrlKey||
-a.metaKey)d.datepicker._adjustDate(a.target,e?-1:+1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 40:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,+7,"D");c=a.ctrlKey||a.metaKey;break;default:c=false}else if(a.keyCode==36&&a.ctrlKey)d.datepicker._showDatepicker(this);else c=false;if(c){a.preventDefault();a.stopPropagation()}},_doKeyPress:function(a){var b=
-d.datepicker._getInst(a.target);if(d.datepicker._get(b,"constrainInput")){b=d.datepicker._possibleChars(d.datepicker._get(b,"dateFormat"));var c=String.fromCharCode(a.charCode==C?a.keyCode:a.charCode);return a.ctrlKey||a.metaKey||c<" "||!b||b.indexOf(c)>-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a);
-d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input",a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);if(d.datepicker._curInst&&d.datepicker._curInst!=b){d.datepicker._datepickerShowing&&d.datepicker._triggerOnClose(d.datepicker._curInst);d.datepicker._curInst.dpDiv.stop(true,true)}var c=
-d.datepicker._get(b,"beforeShow");H(b.settings,c?c.apply(a,[a,b]):{});b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value="";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c=
-{left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);c=d.datepicker._checkOffset(b,c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){var i=b.dpDiv.find("iframe.ui-datepicker-cover");
-if(i.length){var g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0],top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.datepicker._datepickerShowing=true;d.effects&&d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}},_updateDatepicker:function(a){this.maxRows=4;var b=d.datepicker._getBorders(a.dpDiv);
-J=a;a.dpDiv.empty().append(this._generateHTML(a));var c=a.dpDiv.find("iframe.ui-datepicker-cover");c.length&&c.css({left:-b[0],top:-b[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()});a.dpDiv.find("."+this._dayOverClass+" a").mouseover();b=this._getNumberOfMonths(a);c=b[1];a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");c>1&&a.dpDiv.addClass("ui-datepicker-multi-"+c).css("width",17*c+"em");a.dpDiv[(b[0]!=1||b[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");
-a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var e=a.yearshtml;setTimeout(function(){e===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);e=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]||
-c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+
-i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e-g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b=this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1||d.expr.filters.hidden(a));)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_triggerOnClose:function(a){var b=this._get(a,"onClose");if(b)b.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a])},_hideDatepicker:function(a){var b=
-this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);this._curInst=null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();d.datepicker._triggerOnClose(b);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",
-left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&
-d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=
-b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e._selectingMonthYear=false;e["selected"+(c=="M"?"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_clickMonthYear:function(a){var b=this._getInst(d(a)[0]);b.input&&b._selectingMonthYear&&setTimeout(function(){b.input.focus()},0);b._selectingMonthYear=
-!b._selectingMonthYear},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a);this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);
-a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField");if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));
-d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b=a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?b.toString():b+"";if(b=="")return null;var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;e=typeof e!="string"?e:(new Date).getFullYear()%
-100+parseInt(e,10);for(var f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=B+1<a.length&&a.charAt(B+1)==p)&&B++;return p},m=function(p){var D=o(p);p=new RegExp("^\\d{1,"+(p=="@"?14:p=="!"?20:p=="y"&&D?4:p=="o"?3:2)+"}");p=b.substring(q).match(p);if(!p)throw"Missing number at position "+q;q+=
-p[0].length;return parseInt(p[0],10)},n=function(p,D,K){p=d.map(o(p)?K:D,function(w,x){return[[x,w]]}).sort(function(w,x){return-(w[1].length-x[1].length)});var E=-1;d.each(p,function(w,x){w=x[1];if(b.substr(q,w.length).toLowerCase()==w.toLowerCase()){E=x[0];q+=w.length;return false}});if(E!=-1)return E+1;else throw"Unknown name at position "+q;},s=function(){if(b.charAt(q)!=a.charAt(B))throw"Unexpected literal at position "+q;q++},q=0,B=0;B<a.length;B++)if(k)if(a.charAt(B)=="'"&&!o("'"))k=false;
-else s();else switch(a.charAt(B)){case "d":l=m("d");break;case "D":n("D",f,h);break;case "o":u=m("o");break;case "m":j=m("m");break;case "M":j=n("M",i,g);break;case "y":c=m("y");break;case "@":var v=new Date(m("@"));c=v.getFullYear();j=v.getMonth()+1;l=v.getDate();break;case "!":v=new Date((m("!")-this._ticksTo1970)/1E4);c=v.getFullYear();j=v.getMonth()+1;l=v.getDate();break;case "'":if(o("'"))s();else k=true;break;default:s()}if(q<b.length)throw"Extra/unparsed characters found in date: "+b.substring(q);
-if(c==-1)c=(new Date).getFullYear();else if(c<100)c+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c<=e?0:-100);if(u>-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}v=this._daylightSavingAdjust(new Date(c,j-1,l));if(v.getFullYear()!=c||v.getMonth()+1!=j||v.getDate()!=l)throw"Invalid date";return v},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",
-TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:null)||this._defaults.monthNames;var i=function(o){(o=k+1<a.length&&a.charAt(k+1)==o)&&k++;return o},g=function(o,m,n){m=""+m;if(i(o))for(;m.length<
-n;)m="0"+m;return m},j=function(o,m,n,s){return i(o)?s[m]:n[m]},l="",u=false;if(b)for(var k=0;k<a.length;k++)if(u)if(a.charAt(k)=="'"&&!i("'"))u=false;else l+=a.charAt(k);else switch(a.charAt(k)){case "d":l+=g("d",b.getDate(),2);break;case "D":l+=j("D",b.getDay(),e,f);break;case "o":l+=g("o",Math.round(((new Date(b.getFullYear(),b.getMonth(),b.getDate())).getTime()-(new Date(b.getFullYear(),0,0)).getTime())/864E5),3);break;case "m":l+=g("m",b.getMonth()+1,2);break;case "M":l+=j("M",b.getMonth(),h,
-c);break;case "y":l+=i("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case "@":l+=b.getTime();break;case "!":l+=b.getTime()*1E4+this._ticksTo1970;break;case "'":if(i("'"))l+="'";else u=true;break;default:l+=a.charAt(k)}return l},_possibleChars:function(a){for(var b="",c=false,e=function(h){(h=f+1<a.length&&a.charAt(f+1)==h)&&f++;return h},f=0;f<a.length;f++)if(c)if(a.charAt(f)=="'"&&!e("'"))c=false;else b+=a.charAt(f);else switch(a.charAt(f)){case "d":case "m":case "y":case "@":b+=
-"0123456789";break;case "D":case "M":return null;case "'":if(e("'"))b+="'";else c=true;break;default:b+=a.charAt(f)}return b},_get:function(a,b){return a.settings[b]!==C?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var c=this._get(a,"dateFormat"),e=a.lastVal=a.input?a.input.val():null,f,h;f=h=this._getDefaultDate(a);var i=this._getFormatConfig(a);try{f=this.parseDate(c,e,i)||h}catch(g){this.log(g);e=b?"":e}a.selectedDay=f.getDate();a.drawMonth=a.selectedMonth=
-f.getMonth();a.drawYear=a.selectedYear=f.getFullYear();a.currentDay=e?f.getDate():0;a.currentMonth=e?f.getMonth():0;a.currentYear=e?f.getFullYear():0;this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var e=function(h){var i=new Date;i.setDate(i.getDate()+h);return i},f=function(h){try{return d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),h,d.datepicker._getFormatConfig(a))}catch(i){}var g=
-(h.toLowerCase().match(/^c/)?d.datepicker._getDate(a):null)||new Date,j=g.getFullYear(),l=g.getMonth();g=g.getDate();for(var u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,k=u.exec(h);k;){switch(k[2]||"d"){case "d":case "D":g+=parseInt(k[1],10);break;case "w":case "W":g+=parseInt(k[1],10)*7;break;case "m":case "M":l+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break;case "y":case "Y":j+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break}k=u.exec(h)}return new Date(j,
-l,g)};if(b=(b=b==null||b===""?c:typeof b=="string"?f(b):typeof b=="number"?isNaN(b)?c:e(b):new Date(b.getTime()))&&b.toString()=="Invalid Date"?c:b){b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0)}return this._daylightSavingAdjust(b)},_daylightSavingAdjust:function(a){if(!a)return null;a.setHours(a.getHours()>12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=
-a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&&a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),
-b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay?new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n=
-this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&n<k?k:n;this._daylightSavingAdjust(new Date(m,g,1))>n;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-j,1)),this._getFormatConfig(a));n=this._canAdjustMonth(a,-1,m,g)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+A+".datepicker._adjustDate('#"+a.id+"', -"+j+", 'M');\" title=\""+n+'"><span class="ui-icon ui-icon-circle-triangle-'+
-(c?"e":"w")+'">'+n+"</span></a>":f?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>";var s=this._get(a,"nextText");s=!h?s:this.formatDate(s,this._daylightSavingAdjust(new Date(m,g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+A+".datepicker._adjustDate('#"+a.id+"', +"+j+", 'M');\" title=\""+s+'"><span class="ui-icon ui-icon-circle-triangle-'+
-(c?"w":"e")+'">'+s+"</span></a>":f?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>";j=this._get(a,"currentText");s=this._get(a,"gotoCurrent")&&a.currentDay?u:b;j=!h?j:this.formatDate(j,s,this._getFormatConfig(a));h=!a.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+A+'.datepicker._hideDatepicker();">'+this._get(a,
-"closeText")+"</button>":"";e=e?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?h:"")+(this._isInRange(a,s)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+A+".datepicker._gotoToday('#"+a.id+"');\">"+j+"</button>":"")+(c?"":h)+"</div>":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");s=this._get(a,"dayNames");this._get(a,"dayNamesShort");var q=this._get(a,"dayNamesMin"),B=
-this._get(a,"monthNames"),v=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),D=this._get(a,"showOtherMonths"),K=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var E=this._getDefaultDate(a),w="",x=0;x<i[0];x++){var O="";this.maxRows=4;for(var G=0;G<i[1];G++){var P=this._daylightSavingAdjust(new Date(m,g,a.selectedDay)),t=" ui-corner-all",y="";if(l){y+='<div class="ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right":
-"left");break;case i[1]-1:y+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:y+=" ui-datepicker-group-middle";t="";break}y+='">'}y+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+t+'">'+(/all|left/.test(t)&&x==0?c?f:n:"")+(/all|right/.test(t)&&x==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,x>0||G>0,B,v)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var z=j?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":
-"";for(t=0;t<7;t++){var r=(t+h)%7;z+="<th"+((t+h+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+s[r]+'">'+q[r]+"</span></th>"}y+=z+"</tr></thead><tbody>";z=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,z);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;z=Math.ceil((t+z)/7);this.maxRows=z=l?this.maxRows>z?this.maxRows:z:z;r=this._daylightSavingAdjust(new Date(m,g,1-t));for(var Q=0;Q<z;Q++){y+="<tr>";var R=!j?"":'<td class="ui-datepicker-week-col">'+
-this._get(a,"calculateWeek")(r)+"</td>";for(t=0;t<7;t++){var I=p?p.apply(a.input?a.input[0]:null,[r]):[true,""],F=r.getMonth()!=g,L=F&&!K||!I[0]||k&&r<k||o&&r>o;R+='<td class="'+((t+h+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(r.getTime()==P.getTime()&&g==a.selectedMonth&&a._keyEvent||E.getTime()==r.getTime()&&E.getTime()==P.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!D?"":" "+I[1]+(r.getTime()==u.getTime()?" "+
-this._currentClass:"")+(r.getTime()==b.getTime()?" ui-datepicker-today":""))+'"'+((!F||D)&&I[2]?' title="'+I[2]+'"':"")+(L?"":' onclick="DP_jQuery_'+A+".datepicker._selectDay('#"+a.id+"',"+r.getMonth()+","+r.getFullYear()+', this);return false;"')+">"+(F&&!D?"&#xa0;":L?'<span class="ui-state-default">'+r.getDate()+"</span>":'<a class="ui-state-default'+(r.getTime()==b.getTime()?" ui-state-highlight":"")+(r.getTime()==u.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+'" href="#">'+
-r.getDate()+"</a>")+"</td>";r.setDate(r.getDate()+1);r=this._daylightSavingAdjust(r)}y+=R+"</tr>"}g++;if(g>11){g=0;m++}y+="</tbody></table>"+(l?"</div>"+(i[0]>0&&G==i[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");O+=y}w+=O}w+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':"");a._keyEvent=false;return w},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var j=this._get(a,"changeMonth"),
-l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='<div class="ui-datepicker-title">',o="";if(h||!j)o+='<span class="ui-datepicker-month">'+i[b]+"</span>";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+A+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" onclick=\"DP_jQuery_"+A+".datepicker._clickMonthYear('#"+a.id+"');\">";for(var n=0;n<12;n++)if((!i||n>=e.getMonth())&&(!m||n<=f.getMonth()))o+='<option value="'+
-n+'"'+(n==b?' selected="selected"':"")+">"+g[n]+"</option>";o+="</select>"}u||(k+=o+(h||!(j&&l)?"&#xa0;":""));if(!a.yearshtml){a.yearshtml="";if(h||!l)k+='<span class="ui-datepicker-year">'+c+"</span>";else{g=this._get(a,"yearRange").split(":");var s=(new Date).getFullYear();i=function(q){q=q.match(/c[+-].*/)?c+parseInt(q.substring(1),10):q.match(/[+-].*/)?s+parseInt(q,10):parseInt(q,10);return isNaN(q)?s:q};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b,e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):
-g;for(a.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+A+".datepicker._selectMonthYear('#"+a.id+"', this, 'Y');\" onclick=\"DP_jQuery_"+A+".datepicker._clickMonthYear('#"+a.id+"');\">";b<=g;b++)a.yearshtml+='<option value="'+b+'"'+(b==c?' selected="selected"':"")+">"+b+"</option>";a.yearshtml+="</select>";k+=a.yearshtml;a.yearshtml=null}}k+=this._get(a,"yearSuffix");if(u)k+=(h||!(j&&l)?"&#xa0;":"")+o;k+="</div>";return k},_adjustInstDate:function(a,b,c){var e=a.drawYear+(c==
-"Y"?b:0),f=a.drawMonth+(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&b<c?c:b;return b=a&&b>a?a:b},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");
-if(b)b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a);
-c=this._daylightSavingAdjust(new Date(c,e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,
-"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=
-function(a){if(!this.length)return this;if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,
-[this[0]].concat(b));return this.each(function(){typeof a=="string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new M;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.14";window["DP_jQuery_"+A]=d})(jQuery);
-;/*
- * jQuery UI Progressbar 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Progressbar
- *
- * Depends:
- *   jquery.ui.core.js
- *   jquery.ui.widget.js
- */
-(function(b,d){b.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()});this.valueDiv=b("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element);this.oldValue=this._value();this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow");
-this.valueDiv.remove();b.Widget.prototype.destroy.apply(this,arguments)},value:function(a){if(a===d)return this._value();this._setOption("value",a);return this},_setOption:function(a,c){if(a==="value"){this.options.value=c;this._refreshValue();this._value()===this.options.max&&this._trigger("complete")}b.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;if(typeof a!=="number")a=0;return Math.min(this.options.max,Math.max(this.min,a))},_percentage:function(){return 100*
-this._value()/this.options.max},_refreshValue:function(){var a=this.value(),c=this._percentage();if(this.oldValue!==a){this.oldValue=a;this._trigger("change")}this.valueDiv.toggle(a>this.min).toggleClass("ui-corner-right",a===this.options.max).width(c.toFixed(0)+"%");this.element.attr("aria-valuenow",a)}});b.extend(b.ui.progressbar,{version:"1.8.14"})})(jQuery);
-;/*
- * jQuery UI Effects 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/
- */
-jQuery.effects||function(f,j){function m(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1],
-16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return n.transparent;return n[f.trim(c).toLowerCase()]}function s(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return m(b)}function o(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
-a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function p(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in t||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function u(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d=
-a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:b in f.fx.speeds?f.fx.speeds[b]:f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}function l(c){if(!c||typeof c==="number"||f.fx.speeds[c])return true;if(typeof c==="string"&&!f.effects[c])return true;return false}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor",
-"borderTopColor","borderColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=s(b.elem,a);b.end=m(b.end);b.colorInit=true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var n={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,
-0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,
-211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},q=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b,
-d){if(f.isFunction(b)){d=b;b=null}return this.queue(function(){var e=f(this),g=e.attr("style")||" ",h=p(o.call(this)),r,v=e.attr("class");f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});r=p(o.call(this));e.attr("class",v);e.animate(u(h,r),{queue:false,duration:a,easing:b,complete:function(){f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments);f.dequeue(this)}})})};
-f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,a):f.effects.animateClass.apply(this,
-[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.14",save:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.data("ec.storage."+a[b],c[0].style[a[b]])},restore:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.css(a[b],c.data("ec.storage."+a[b]))},setMode:function(c,a){if(a=="toggle")a=c.is(":hidden")?"show":"hide";return a},getBaseline:function(c,a){var b;switch(c[0]){case "top":b=
-0;break;case "middle":b=0.5;break;case "bottom":b=1;break;default:b=c[0]/a.height}switch(c[1]){case "left":c=0;break;case "center":c=0.5;break;case "right":c=1;break;default:c=c[1]/a.width}return{x:c,y:b}},createWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent();var a={width:c.outerWidth(true),height:c.outerHeight(true),"float":c.css("float")},b=f("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0});
-c.wrap(b);b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(d,e){a[e]=c.css(e);if(isNaN(parseInt(a[e],10)))a[e]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent().replaceWith(c);return c},setTransition:function(c,
-a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});return d.call(this,b)},_show:f.fn.show,show:function(c){if(l(c))return this._show.apply(this,arguments);else{var a=k.apply(this,arguments);
-a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(l(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(l(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),b=[];f.each(["em","px","%",
-"pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,a,b,d,e){return d*
-((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,a,b,d,e){if((a/=
-e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==e)return b+d;if((a/=
-e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/
-h);return-(h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g))+b},easeOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*a)*Math.sin((a*e-c)*2*Math.PI/g)+d+b},easeInOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e/2)==2)return b+d;g||(g=e*0.3*1.5);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);if(a<1)return-0.5*
-h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)+b;return h*Math.pow(2,-10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)*0.5+d+b},easeInBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*(a/=e)*a*((g+1)*a-g)+b},easeOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*((a=a/e-1)*a*((g+1)*a+g)+1)+b},easeInOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;if((a/=e/2)<1)return d/2*a*a*(((g*=1.525)+1)*a-g)+b;return d/2*((a-=2)*a*(((g*=1.525)+1)*a+g)+2)+b},easeInBounce:function(c,a,b,d,e){return d-f.easing.easeOutBounce(c,
-e-a,0,d,e)+b},easeOutBounce:function(c,a,b,d,e){return(a/=e)<1/2.75?d*7.5625*a*a+b:a<2/2.75?d*(7.5625*(a-=1.5/2.75)*a+0.75)+b:a<2.5/2.75?d*(7.5625*(a-=2.25/2.75)*a+0.9375)+b:d*(7.5625*(a-=2.625/2.75)*a+0.984375)+b},easeInOutBounce:function(c,a,b,d,e){if(a<e/2)return f.easing.easeInBounce(c,a*2,0,d,e)*0.5+b;return f.easing.easeOutBounce(c,a*2-e,0,d,e)*0.5+d*0.5+b}})}(jQuery);
-;/*
- * jQuery UI Effects Blind 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Blind
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(b){b.effects.blind=function(c){return this.queue(function(){var a=b(this),g=["position","top","bottom","left","right"],f=b.effects.setMode(a,c.options.mode||"hide"),d=c.options.direction||"vertical";b.effects.save(a,g);a.show();var e=b.effects.createWrapper(a).css({overflow:"hidden"}),h=d=="vertical"?"height":"width";d=d=="vertical"?e.height():e.width();f=="show"&&e.css(h,0);var i={};i[h]=f=="show"?d:0;e.animate(i,c.duration,c.options.easing,function(){f=="hide"&&a.hide();b.effects.restore(a,
-g);b.effects.removeWrapper(a);c.callback&&c.callback.apply(a[0],arguments);a.dequeue()})})}})(jQuery);
-;/*
- * jQuery UI Effects Bounce 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Bounce
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(e){e.effects.bounce=function(b){return this.queue(function(){var a=e(this),l=["position","top","bottom","left","right"],h=e.effects.setMode(a,b.options.mode||"effect"),d=b.options.direction||"up",c=b.options.distance||20,m=b.options.times||5,i=b.duration||250;/show|hide/.test(h)&&l.push("opacity");e.effects.save(a,l);a.show();e.effects.createWrapper(a);var f=d=="up"||d=="down"?"top":"left";d=d=="up"||d=="left"?"pos":"neg";c=b.options.distance||(f=="top"?a.outerHeight({margin:true})/3:a.outerWidth({margin:true})/
-3);if(h=="show")a.css("opacity",0).css(f,d=="pos"?-c:c);if(h=="hide")c/=m*2;h!="hide"&&m--;if(h=="show"){var g={opacity:1};g[f]=(d=="pos"?"+=":"-=")+c;a.animate(g,i/2,b.options.easing);c/=2;m--}for(g=0;g<m;g++){var j={},k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing);c=h=="hide"?c*2:c/2}if(h=="hide"){g={opacity:0};g[f]=(d=="pos"?"-=":"+=")+c;a.animate(g,i/2,b.options.easing,function(){a.hide();e.effects.restore(a,l);e.effects.removeWrapper(a);
-b.callback&&b.callback.apply(this,arguments)})}else{j={};k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing,function(){e.effects.restore(a,l);e.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments)})}a.queue("fx",function(){a.dequeue()});a.dequeue()})}})(jQuery);
-;/*
- * jQuery UI Effects Clip 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Clip
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(b){b.effects.clip=function(e){return this.queue(function(){var a=b(this),i=["position","top","bottom","left","right","height","width"],f=b.effects.setMode(a,e.options.mode||"hide"),c=e.options.direction||"vertical";b.effects.save(a,i);a.show();var d=b.effects.createWrapper(a).css({overflow:"hidden"});d=a[0].tagName=="IMG"?d:a;var g={size:c=="vertical"?"height":"width",position:c=="vertical"?"top":"left"};c=c=="vertical"?d.height():d.width();if(f=="show"){d.css(g.size,0);d.css(g.position,
-c/2)}var h={};h[g.size]=f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,{queue:false,duration:e.duration,easing:e.options.easing,complete:function(){f=="hide"&&a.hide();b.effects.restore(a,i);b.effects.removeWrapper(a);e.callback&&e.callback.apply(a[0],arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Drop 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Drop
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(c){c.effects.drop=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right","opacity"],e=c.effects.setMode(a,d.options.mode||"hide"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a);var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true})/2:a.outerWidth({margin:true})/2);if(e=="show")a.css("opacity",0).css(f,b=="pos"?-g:g);var i={opacity:e==
-"show"?1:0};i[f]=(e=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Explode 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Explode
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(j){j.effects.explode=function(a){return this.queue(function(){var c=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3,d=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3;a.options.mode=a.options.mode=="toggle"?j(this).is(":visible")?"hide":"show":a.options.mode;var b=j(this).show().css("visibility","hidden"),g=b.offset();g.top-=parseInt(b.css("marginTop"),10)||0;g.left-=parseInt(b.css("marginLeft"),10)||0;for(var h=b.outerWidth(true),i=b.outerHeight(true),e=0;e<c;e++)for(var f=
-0;f<d;f++)b.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+
-e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.mode=="show"?1:0},a.duration||500);setTimeout(function(){a.options.mode=="show"?b.css({visibility:"visible"}):b.css({visibility:"visible"}).hide();a.callback&&a.callback.apply(b[0]);b.dequeue();j("div.ui-effects-explode").remove()},a.duration||500)})}})(jQuery);
-;/*
- * jQuery UI Effects Fade 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Fade
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(b){b.effects.fade=function(a){return this.queue(function(){var c=b(this),d=b.effects.setMode(c,a.options.mode||"hide");c.animate({opacity:d},{queue:false,duration:a.duration,easing:a.options.easing,complete:function(){a.callback&&a.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Fold 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Fold
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(c){c.effects.fold=function(a){return this.queue(function(){var b=c(this),j=["position","top","bottom","left","right"],d=c.effects.setMode(b,a.options.mode||"hide"),g=a.options.size||15,h=!!a.options.horizFirst,k=a.duration?a.duration/2:c.fx.speeds._default/2;c.effects.save(b,j);b.show();var e=c.effects.createWrapper(b).css({overflow:"hidden"}),f=d=="show"!=h,l=f?["width","height"]:["height","width"];f=f?[e.width(),e.height()]:[e.height(),e.width()];var i=/([0-9]+)%/.exec(g);if(i)g=parseInt(i[1],
-10)/100*f[d=="hide"?0:1];if(d=="show")e.css(h?{height:0,width:g}:{height:g,width:0});h={};i={};h[l[0]]=d=="show"?f[0]:g;i[l[1]]=d=="show"?f[1]:0;e.animate(h,k,a.options.easing).animate(i,k,a.options.easing,function(){d=="hide"&&b.hide();c.effects.restore(b,j);c.effects.removeWrapper(b);a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery);
-;/*
- * jQuery UI Effects Highlight 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Highlight
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&&
-this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Pulsate 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Pulsate
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(d){d.effects.pulsate=function(a){return this.queue(function(){var b=d(this),c=d.effects.setMode(b,a.options.mode||"show");times=(a.options.times||5)*2-1;duration=a.duration?a.duration/2:d.fx.speeds._default/2;isVisible=b.is(":visible");animateTo=0;if(!isVisible){b.css("opacity",0).show();animateTo=1}if(c=="hide"&&isVisible||c=="show"&&!isVisible)times--;for(c=0;c<times;c++){b.animate({opacity:animateTo},duration,a.options.easing);animateTo=(animateTo+1)%2}b.animate({opacity:animateTo},duration,
-a.options.easing,function(){animateTo==0&&b.hide();a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()}).dequeue()})}})(jQuery);
-;/*
- * jQuery UI Effects Scale 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Scale
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(c){c.effects.puff=function(b){return this.queue(function(){var a=c(this),e=c.effects.setMode(a,b.options.mode||"hide"),g=parseInt(b.options.percent,10)||150,h=g/100,i={height:a.height(),width:a.width()};c.extend(b.options,{fade:true,mode:e,percent:e=="hide"?g:100,from:e=="hide"?i:{height:i.height*h,width:i.width*h}});a.effect("scale",b.options,b.duration,b.callback);a.dequeue()})};c.effects.scale=function(b){return this.queue(function(){var a=c(this),e=c.extend(true,{},b.options),g=c.effects.setMode(a,
-b.options.mode||"effect"),h=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:g=="hide"?0:100),i=b.options.direction||"both",f=b.options.origin;if(g!="effect"){e.origin=f||["middle","center"];e.restore=true}f={height:a.height(),width:a.width()};a.from=b.options.from||(g=="show"?{height:0,width:0}:f);h={y:i!="horizontal"?h/100:1,x:i!="vertical"?h/100:1};a.to={height:f.height*h.y,width:f.width*h.x};if(b.options.fade){if(g=="show"){a.from.opacity=0;a.to.opacity=1}if(g=="hide"){a.from.opacity=
-1;a.to.opacity=0}}e.from=a.from;e.to=a.to;e.mode=g;a.effect("size",e,b.duration,b.callback);a.dequeue()})};c.effects.size=function(b){return this.queue(function(){var a=c(this),e=["position","top","bottom","left","right","width","height","overflow","opacity"],g=["position","top","bottom","left","right","overflow","opacity"],h=["width","height","overflow"],i=["fontSize"],f=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],k=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],
-p=c.effects.setMode(a,b.options.mode||"effect"),n=b.options.restore||false,m=b.options.scale||"both",l=b.options.origin,j={height:a.height(),width:a.width()};a.from=b.options.from||j;a.to=b.options.to||j;if(l){l=c.effects.getBaseline(l,j);a.from.top=(j.height-a.from.height)*l.y;a.from.left=(j.width-a.from.width)*l.x;a.to.top=(j.height-a.to.height)*l.y;a.to.left=(j.width-a.to.width)*l.x}var d={from:{y:a.from.height/j.height,x:a.from.width/j.width},to:{y:a.to.height/j.height,x:a.to.width/j.width}};
-if(m=="box"||m=="both"){if(d.from.y!=d.to.y){e=e.concat(f);a.from=c.effects.setTransition(a,f,d.from.y,a.from);a.to=c.effects.setTransition(a,f,d.to.y,a.to)}if(d.from.x!=d.to.x){e=e.concat(k);a.from=c.effects.setTransition(a,k,d.from.x,a.from);a.to=c.effects.setTransition(a,k,d.to.x,a.to)}}if(m=="content"||m=="both")if(d.from.y!=d.to.y){e=e.concat(i);a.from=c.effects.setTransition(a,i,d.from.y,a.from);a.to=c.effects.setTransition(a,i,d.to.y,a.to)}c.effects.save(a,n?e:g);a.show();c.effects.createWrapper(a);
-a.css("overflow","hidden").css(a.from);if(m=="content"||m=="both"){f=f.concat(["marginTop","marginBottom"]).concat(i);k=k.concat(["marginLeft","marginRight"]);h=e.concat(f).concat(k);a.find("*[width]").each(function(){child=c(this);n&&c.effects.save(child,h);var o={height:child.height(),width:child.width()};child.from={height:o.height*d.from.y,width:o.width*d.from.x};child.to={height:o.height*d.to.y,width:o.width*d.to.x};if(d.from.y!=d.to.y){child.from=c.effects.setTransition(child,f,d.from.y,child.from);
-child.to=c.effects.setTransition(child,f,d.to.y,child.to)}if(d.from.x!=d.to.x){child.from=c.effects.setTransition(child,k,d.from.x,child.from);child.to=c.effects.setTransition(child,k,d.to.x,child.to)}child.css(child.from);child.animate(child.to,b.duration,b.options.easing,function(){n&&c.effects.restore(child,h)})})}a.animate(a.to,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){a.to.opacity===0&&a.css("opacity",a.from.opacity);p=="hide"&&a.hide();c.effects.restore(a,
-n?e:g);c.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Shake 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Shake
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(d){d.effects.shake=function(a){return this.queue(function(){var b=d(this),j=["position","top","bottom","left","right"];d.effects.setMode(b,a.options.mode||"effect");var c=a.options.direction||"left",e=a.options.distance||20,l=a.options.times||3,f=a.duration||a.options.duration||140;d.effects.save(b,j);b.show();d.effects.createWrapper(b);var g=c=="up"||c=="down"?"top":"left",h=c=="up"||c=="left"?"pos":"neg";c={};var i={},k={};c[g]=(h=="pos"?"-=":"+=")+e;i[g]=(h=="pos"?"+=":"-=")+e*2;k[g]=
-(h=="pos"?"-=":"+=")+e*2;b.animate(c,f,a.options.easing);for(e=1;e<l;e++)b.animate(i,f,a.options.easing).animate(k,f,a.options.easing);b.animate(i,f,a.options.easing).animate(c,f/2,a.options.easing,function(){d.effects.restore(b,j);d.effects.removeWrapper(b);a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()});b.dequeue()})}})(jQuery);
-;/*
- * jQuery UI Effects Slide 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Slide
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(c){c.effects.slide=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right"],f=c.effects.setMode(a,d.options.mode||"show"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a).css({overflow:"hidden"});var g=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var e=d.options.distance||(g=="top"?a.outerHeight({margin:true}):a.outerWidth({margin:true}));if(f=="show")a.css(g,b=="pos"?isNaN(e)?"-"+e:-e:e);
-var i={};i[g]=(f=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+e;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){f=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Transfer 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Transfer
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(e){e.effects.transfer=function(a){return this.queue(function(){var b=e(this),c=e(a.options.to),d=c.offset();c={top:d.top,left:d.left,height:c.innerHeight(),width:c.innerWidth()};d=b.offset();var f=e('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(a.options.className).css({top:d.top,left:d.left,height:b.innerHeight(),width:b.innerWidth(),position:"absolute"}).animate(c,a.duration,a.options.easing,function(){f.remove();a.callback&&a.callback.apply(b[0],arguments);
-b.dequeue()})})}})(jQuery);
-;
\ No newline at end of file
-- 
GitLab


From 5a5b216ba0c2d58352364b9fc908f6547989ef72 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Fri, 30 Dec 2011 23:20:44 +0000
Subject: [PATCH 101/546] Fixed error message

---
 files/ajax/move.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/ajax/move.php b/files/ajax/move.php
index 8a56a015486..c2490ecc6b3 100644
--- a/files/ajax/move.php
+++ b/files/ajax/move.php
@@ -14,7 +14,7 @@ $target = $_GET["target"];
 if(OC_Files::move($dir,$file,$target,$file)){
 	OC_JSON::success(array("data" => array( "dir" => $dir, "files" => $file )));
 }else{
-	OC_JSON::error(array("data" => array( "message" => "Could move $file" )));
+	OC_JSON::error(array("data" => array( "message" => "Couldn't move $file" )));
 }
 
 ?>
-- 
GitLab


From 1b146b85d2b645dc4ae4f16d9757ad4bd939c0e2 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 31 Dec 2011 01:34:22 +0100
Subject: [PATCH 102/546] Removed redundant DB queries.

---
 apps/contacts/lib/addressbook.php | 20 ++++++++++++++++----
 apps/contacts/lib/vcard.php       |  3 ---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index b3c981a541e..78792f5f948 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -189,9 +189,21 @@ class OC_Contacts_Addressbook{
 	public static function active($uid){
 		$active = self::activeIds($uid);
 		$addressbooks = array();
-		/* FIXME: Is there a way to prepare a statement 'WHERE id IN ([range])'?
-		 * See OC_Contacts_VCard:all.
-		*/
+		$ids_sql = join(',', array_fill(0, count($active), '?'));
+		$prep = 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id IN ('.$ids_sql.') ORDER BY displayname';
+		try {
+			$stmt = OC_DB::prepare( $prep );
+			$result = $stmt->execute($active);
+		} catch(Exception $e) {
+			OC_Log::write('contacts','OC_Contacts_Addressbook:active:, exception: '.$e->getMessage(),OC_Log::DEBUG);
+			OC_Log::write('contacts','OC_Contacts_Addressbook:active, ids: '.join(',', $active),OC_Log::DEBUG);
+			OC_Log::write('contacts','OC_Contacts_Addressbook::active, SQL:'.$prep,OC_Log::DEBUG);
+		}
+
+		while( $row = $result->fetchRow()){
+			$addressbooks[] = $row;
+		}
+		/*
 		foreach( $active as $aid ){
 			$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id = ? ORDER BY displayname' );
 			$result = $stmt->execute(array($aid,));
@@ -199,7 +211,7 @@ class OC_Contacts_Addressbook{
 			while( $row = $result->fetchRow()){
 				$addressbooks[] = $row;
 			}
-		}
+		}*/
 
 		return $addressbooks;
 	}
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 81519b3d051..beb291b481e 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -47,9 +47,6 @@ class OC_Contacts_VCard{
 	 * ['carddata']
 	 */
 	public static function all($id){
-		//$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? ORDER BY fullname' );
-		//$result = $stmt->execute(array($id));
-
 		if(is_array($id)) {
 			$id_sql = join(',', array_fill(0, count($id), '?'));
 			$prep = 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid IN ('.$id_sql.') ORDER BY fullname';
-- 
GitLab


From 8efec8e900a21fde4382f543d877ef6cb421f7ad Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sat, 31 Dec 2011 12:23:08 +0000
Subject: [PATCH 103/546] Remove repeated code

---
 files/index.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/files/index.php b/files/index.php
index fc69a42bec6..7f3c5c579e7 100644
--- a/files/index.php
+++ b/files/index.php
@@ -29,9 +29,6 @@ require_once('../lib/base.php');
 OC_Util::checkLoggedIn();
 
 // Load the files we need
-OC_Util::addStyle( 'files_texteditor', 'style' );
-OC_Util::addScript( 'files_texteditor', 'editor');
-OC_Util::addScript( 'files_texteditor', 'aceeditor/ace');
 OC_Util::addStyle( "files", "files" );
 OC_Util::addScript( "files", "files" );
 OC_Util::addScript( 'files', 'filelist' );
-- 
GitLab


From e04951f8fdc8dcbff896eb4d9cdbf3d31db24e7f Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sat, 31 Dec 2011 12:28:25 +0000
Subject: [PATCH 104/546] Fixed keyboard shortcuts

---
 apps/files_texteditor/js/editor.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 94402dd00d8..dce3a359d82 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -203,18 +203,15 @@ function hideFileEditor(){
 
 // Keyboard Shortcuts
 var ctrlBtn = false;
-
-function checkForCtrlKey(e){
-		if(e.which == 17 || e.which == 91) ctrlBtn=false;
-	}
 	
 function checkForSaveKeyPress(e){
-		if(e.which == 17 || e.which == 91) ctrlBtn=true;
-   		if(e.which == 83 && ctrlBtn == true) {
-   			e.preventDefault();
-        	$('#editor_save').trigger('click');
-			return false;
-   		}
+	if(e.which == 17 || e.which == 91) ctrlBtn=true;
+	if(e.which == 83 && ctrlBtn == true) {
+	e.preventDefault();
+	$('#editor_save').trigger('click');
+	return false;
+		
+	}
 }
 
 $(window).resize(function() {
@@ -247,5 +244,5 @@ $(document).ready(function(){
 	bindControlEvents();
 	
 	// Binds the save keyboard shortcut events
-	$(document).unbind('keyup').bind('keyup',checkForCtrlKey).unbind('keydown').bind('keydown',checkForSaveKeyPress);
+	$(document).unbind('keydown').bind('keydown',checkForSaveKeyPress);
 });
-- 
GitLab


From 2c4ab355ac3ace893cc06c645d4a8d25a63dbdc1 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 1 Jan 2012 00:47:24 +0000
Subject: [PATCH 105/546] Shared folder no longer draggable or droppable

---
 files/js/files.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/files/js/files.js b/files/js/files.js
index 53437453ff9..8df7aa35357 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -11,8 +11,8 @@ $(document).ready(function() {
 	$('#file_action_panel').attr('activeAction', false);
 
 	//drag/drop of files
-	$('#fileList tr td.filename').draggable(dragOptions);
-	$('#fileList tr[data-type="dir"] td.filename').droppable(folderDropOptions);
+	$('#fileList tr[data-file!=Shared] td.filename').draggable(dragOptions);
+	$('#fileList tr[data-type="dir"][data-file!=Shared] td.filename').droppable(folderDropOptions);
 	$('div.crumb').droppable(crumbDropOptions);
 	$('ul#apps>li:first-child').data('dir','');
 	$('ul#apps>li:first-child').droppable(crumbDropOptions);
@@ -70,7 +70,9 @@ $(document).ready(function() {
 			procesSelection();
 		} else {
 			var filename=$(this).parent().parent().attr('data-file');
-			if(!FileList.isLoading(filename)){
+			var tr=$('tr').filterAttr('data-file',filename);
+			var renaming=tr.data('renaming')
+				if(!renaming && !FileList.isLoading(filename)){
 				var mime=$(this).parent().parent().data('mime');
 				var type=$(this).parent().parent().data('type');
 				var action=FileActions.getDefault(mime,type);
-- 
GitLab


From 06d2a87ee4759f3fc26e0f6b16027080036ba34a Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 1 Jan 2012 00:52:53 +0000
Subject: [PATCH 106/546] Fix js error

---
 files/js/files.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/files/js/files.js b/files/js/files.js
index 8df7aa35357..e37eac9bf6a 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -11,8 +11,8 @@ $(document).ready(function() {
 	$('#file_action_panel').attr('activeAction', false);
 
 	//drag/drop of files
-	$('#fileList tr[data-file!=Shared] td.filename').draggable(dragOptions);
-	$('#fileList tr[data-type="dir"][data-file!=Shared] td.filename').droppable(folderDropOptions);
+	$('#fileList tr[data-file!="Shared"] td.filename').draggable(dragOptions);
+	$('#fileList tr[data-type="dir"][data-file!="Shared"] td.filename').droppable(folderDropOptions);
 	$('div.crumb').droppable(crumbDropOptions);
 	$('ul#apps>li:first-child').data('dir','');
 	$('ul#apps>li:first-child').droppable(crumbDropOptions);
@@ -70,9 +70,7 @@ $(document).ready(function() {
 			procesSelection();
 		} else {
 			var filename=$(this).parent().parent().attr('data-file');
-			var tr=$('tr').filterAttr('data-file',filename);
-			var renaming=tr.data('renaming')
-				if(!renaming && !FileList.isLoading(filename)){
+			if(!FileList.isLoading(filename)){
 				var mime=$(this).parent().parent().data('mime');
 				var type=$(this).parent().parent().data('type');
 				var action=FileActions.getDefault(mime,type);
-- 
GitLab


From e7de25434206a4849a7c7315d4d9926325c7b730 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 1 Jan 2012 01:14:00 +0000
Subject: [PATCH 107/546] Fix missing ;

---
 files/js/files.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/files/js/files.js b/files/js/files.js
index e37eac9bf6a..88a07a0776e 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -70,7 +70,9 @@ $(document).ready(function() {
 			procesSelection();
 		} else {
 			var filename=$(this).parent().parent().attr('data-file');
-			if(!FileList.isLoading(filename)){
+			var tr=$('tr').filterAttr('data-file',filename);
+			var renaming=tr.data('renaming');
+			if(!renaming && !FileList.isLoading(filename)){
 				var mime=$(this).parent().parent().data('mime');
 				var type=$(this).parent().parent().data('type');
 				var action=FileActions.getDefault(mime,type);
-- 
GitLab


From 6207c0444be7c383838beb0ddc3d684ffee0262b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 1 Jan 2012 17:57:26 +0100
Subject: [PATCH 108/546] Added class OC_Image

---
 lib/image.php | 297 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 297 insertions(+)
 create mode 100644 lib/image.php

diff --git a/lib/image.php b/lib/image.php
new file mode 100644
index 00000000000..4b63ea5ff36
--- /dev/null
+++ b/lib/image.php
@@ -0,0 +1,297 @@
+<?php
+
+/**
+* ownCloud
+*
+* @author Thomas Tanghus
+* @copyright 2011 Thomas Tanghus <thomas@tanghus.net>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/**
+ * Class for image manipulation
+ * Ideas: imagerotate, chunk_split(base64_encode())
+ *
+ */
+class OC_Image {
+	static private $resource = false; // tmp resource.
+	static private $destroy = false; // if the resource is created withing the object.
+	/**
+	* @brief Constructor.
+	* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
+	*					If a resource is passed it is the job of the caller to destroy it using imagedestroy($var)
+	* @returns bool False on error
+	*/
+	function __construct($imageref = null) {
+		OC_Log::write('core','OC_Image::__construct, start', OC_Log::DEBUG);
+		if(!function_exists('imagecreatefromjpeg')) { // FIXME: Find a better way to check for GD
+			OC_Log::write('core','OC_Image::__construct, GD module not installed', OC_Log::ERROR);
+			return false;
+		}
+		if(!is_null($imageref)) {
+			self::load($imageref);
+		}
+	}
+
+	/**
+	* @brief Destructor.
+	*/
+	function __destruct() {
+		if(self::$resource && self::$destroy) {
+			imagedestroy(self::$resource); // Why does this issue a warning.
+		}
+	}
+
+	/**
+	* @brief Prints the image.
+	*/
+	public function show() {
+		header('Content-Type: image/png');
+		imagepng(self::$resource);
+	}
+
+	/**
+	* @brief Prints the image when called as $image().
+	*/
+	public function __invoke() {
+		self::show();
+	}
+
+	/**
+	* @returns Returns the image resource in any.
+	*/
+	public function imageResource() {
+		return self::$resource;
+	}
+
+	/**
+	* @returns Returns a base64 encoded string suitable for embedding in a VCard.
+	*/
+	function __toString() {
+		ob_start();
+		$res = imagepng(self::$resource);
+		if (!$res) {
+			OC_Log::write('core','OC_Image::_string. Error writing image',OC_Log::ERROR);
+		}
+		return chunk_split(base64_encode(ob_get_clean()));
+	}
+
+	/**
+	* @brief Loads an image from a local file, a base64 encoded string or a resource created by an imagecreate* function.
+	* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
+	*					If a resource is passed it is the job of the caller to destroy it using imagedestroy($var)
+	* @returns An image resource or false on error
+	*/
+	static public function load($imageref) {
+		if(self::loadFromFile($imageref) !== false) {
+			return self::$resource;
+		} elseif(self::loadFromBase64($imageref) !== false) {
+			return self::$resource;
+		} elseif(self::loadFromData($imageref) !== false) {
+			return self::$resource;
+		} elseif(self::loadFromResource($imageref) !== false) {
+			return self::$resource;
+		} else {
+			OC_Log::write('core','OC_Image::load, couldn\'t load anything. Giving up!', OC_Log::DEBUG);
+			return false;
+		}
+	}
+
+	/**
+	* @brief Loads an image from a local file.
+	* @param $imageref The path to a local file.
+	* @returns An image resource or false on error
+	*/
+	static public function loadFromFile($imagepath=false) {
+		if(!is_string($imagepath)) {
+			return false;
+		}
+		if(!is_file($imagepath) || !file_exists($imagepath) || !is_readable($imagepath)) {
+			OC_Log::write('core','OC_Image::loadFromFile, couldn\'t load'.$imagepath, OC_Log::DEBUG);
+			return false;
+		}
+		self::$resource = imagecreatefromstring(file_get_contents($imagepath));
+		self::$destroy = true;
+		return self::$resource;
+	}
+
+	/**
+	* @brief Loads an image from a string of data.
+	* @param $str A string of image data as read from a file.
+	* @returns An image resource or false on error
+	*/
+	static public function loadFromData($str) {
+		if(is_resource($str)) {
+			return false;
+		}
+		self::$resource = imagecreatefromstring($str);
+		if(!self::$resource) {
+			OC_Log::write('core','OC_Image::loadFromData, couldn\'t load', OC_Log::DEBUG);
+			return false;
+		}
+		self::$destroy = true;
+		return self::$resource;
+	}
+
+	/**
+	* @brief Loads an image from a base64 encoded string.
+	* @param $str A string base64 encoded string of image data.
+	* @returns An image resource or false on error
+	*/
+	static public function loadFromBase64($str) {
+		if(!is_string($str)) {
+			return false;
+		}
+		$data = base64_decode($str);
+		if($data) { // try to load from string data
+			self::$resource = imagecreatefromstring($data);
+			if(!self::$resource) {
+				OC_Log::write('core','OC_Image::loadFromBase64, couldn\'t load', OC_Log::DEBUG);
+				return false;
+			}
+			self::$destroy = true;
+			return self::$resource;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	* @brief Checks if image resource is valid and assigns it to self::$resource.
+	* @param $res An image resource.
+	* @returns An image resource or false on error
+	*/
+	static public function loadFromResource($res) {
+		if(!is_resource($res)) {
+			return false;
+		}
+		self::$resource = $res;
+	}
+
+	/**
+	* @brief Resizes the image preserving ratio.
+	* @param $maxsize The maximum size of either the width or height.
+	* @returns bool
+	*/
+	public function resize($maxsize) {
+		if(!self::$resource) {
+			OC_Log::write('core','OC_Image::resize, No image loaded', OC_Log::ERROR);
+			throw new Exception('OC_Image::resize, No image loaded!', self::ERR_NO_IMAGE);
+		}
+		$width_orig=imageSX(self::$resource);
+		$height_orig=imageSY(self::$resource);
+		$ratio_orig = $width_orig/$height_orig;
+		
+		if ($ratio_orig > 1) {
+			$new_height = round($maxsize/$ratio_orig);
+			$new_width = $maxsize;
+		} else {
+			$new_width = round($maxsize*$ratio_orig);
+			$new_height = $maxsize;
+		}
+
+		$process = imagecreatetruecolor(round($new_width), round($new_height));
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::resize. Error creating true color image',OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+
+		imagecopyresampled($process, self::$resource, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::resize. Error resampling process image '.$new_width.'x'.$new_height,OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+		self::$resource = $process;
+		return true;
+	}
+
+	/**
+	* @brief Crops the image to the middle square. If the image is already square it just returns.
+	* @returns bool for success or failure
+	*/
+	public function centerCrop() {
+		if(!self::$resource) {
+			OC_Log::write('core','OC_Image::centerCrop, No image loaded', OC_Log::ERROR);
+			return false;
+		}
+		$width_orig=imageSX(self::$resource);
+		$height_orig=imageSY(self::$resource);
+		OC_Log::write('core','OC_Image::centerCrop. Original size: '.$width_orig.'x'.$height_orig, OC_Log::DEBUG);
+		if($width_orig === $height_orig) {
+			return true;
+		}
+		$ratio_orig = $width_orig/$height_orig;
+		OC_Log::write('core','OC_Image::centerCrop. Ratio: '.$ratio_orig, OC_Log::DEBUG);
+		$width = $height = min($width_orig, $height_orig);
+		OC_Log::write('core','OC_Image::centerCrop. New size: '.$width.'x'.$height, OC_Log::DEBUG);
+
+		if ($ratio_orig > 1) {
+			$x = ($width_orig/2) - ($width/2);
+			$y = 0;
+		} else {
+			$y = ($height_orig/2) - ($height/2);
+			$x = 0;
+		}
+		$process = imagecreatetruecolor($width, $height);
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::centerCrop. Error creating true color image',OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+		imagecopyresampled($process, self::$resource, 0, 0, $x, $y, $width, $height, $width, $height);
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::centerCrop. Error resampling process image '.$width.'x'.$height,OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+		self::$resource = $process;
+		return true;
+	}
+
+	/**
+	* @brief Crops the image from point $x$y with dimension $wx$h.
+	* @param $x Horizontal position
+	* @param $y Vertical position
+	* @param $w Width
+	* @param $h Hight
+	* @returns bool for success or failure
+	*/
+	public function crop($x, $y, $w, $h) {
+		if(!self::$resource) {
+			OC_Log::write('core','OC_Image::crop, No image loaded', OC_Log::ERROR);
+			return false;
+		}
+		$width_orig=imageSX(self::$resource);
+		$height_orig=imageSY(self::$resource);
+		//OC_Log::write('core','OC_Image::crop. Original size: '.$width_orig.'x'.$height_orig, OC_Log::DEBUG);
+		$process = imagecreatetruecolor($w, $h);
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::crop. Error creating true color image',OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+		imagecopyresampled($process, self::$resource, 0, 0, $x, $y, $w, $h, $w, $h);
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::crop. Error resampling process image '.$w.'x'.$h,OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+		self::$resource = $process;
+		return true;
+	}
+}
-- 
GitLab


From c500c1e9307fd10f009f19351a101083969bfed2 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 1 Jan 2012 18:07:46 +0100
Subject: [PATCH 109/546] Removed some denug statements and an exception
 thrown.

---
 lib/image.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index 4b63ea5ff36..67290d21f3a 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -189,7 +189,7 @@ class OC_Image {
 	public function resize($maxsize) {
 		if(!self::$resource) {
 			OC_Log::write('core','OC_Image::resize, No image loaded', OC_Log::ERROR);
-			throw new Exception('OC_Image::resize, No image loaded!', self::ERR_NO_IMAGE);
+			return false;
 		}
 		$width_orig=imageSX(self::$resource);
 		$height_orig=imageSY(self::$resource);
@@ -231,14 +231,11 @@ class OC_Image {
 		}
 		$width_orig=imageSX(self::$resource);
 		$height_orig=imageSY(self::$resource);
-		OC_Log::write('core','OC_Image::centerCrop. Original size: '.$width_orig.'x'.$height_orig, OC_Log::DEBUG);
 		if($width_orig === $height_orig) {
 			return true;
 		}
 		$ratio_orig = $width_orig/$height_orig;
-		OC_Log::write('core','OC_Image::centerCrop. Ratio: '.$ratio_orig, OC_Log::DEBUG);
 		$width = $height = min($width_orig, $height_orig);
-		OC_Log::write('core','OC_Image::centerCrop. New size: '.$width.'x'.$height, OC_Log::DEBUG);
 
 		if ($ratio_orig > 1) {
 			$x = ($width_orig/2) - ($width/2);
-- 
GitLab


From 64a24191a3880af5b8c574eb2482d479f9024677 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sun, 1 Jan 2012 14:04:16 -0500
Subject: [PATCH 110/546] Fix return for empty Shared folder in opendir()

---
 apps/files_sharing/sharedstorage.php | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index d78e273bf38..b0eaeecf723 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -79,20 +79,16 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		if ($path == "" || $path == "/") {
 			$path = $this->datadir.$path;
 			$sharedItems = OC_Share::getItemsInFolder($path);
-			if (empty($sharedItems)) {
-				return false;
-			} else {
-				global $FAKEDIRS;
-				$files = array();
-				foreach ($sharedItems as $item) {
-					// If item is in the root of the shared storage provider and the item exists add it to the fakedirs
-					if (dirname($item['target'])."/" == $path && $this->file_exists(basename($item['target']))) {
-						$files[] = basename($item['target']);
-					}
+			global $FAKEDIRS;
+			$files = array();
+			foreach ($sharedItems as $item) {
+				// If item is in the root of the shared storage provider and the item exists add it to the fakedirs
+				if (dirname($item['target'])."/" == $path && $this->file_exists(basename($item['target']))) {
+					$files[] = basename($item['target']);
 				}
-				$FAKEDIRS['shared'] = $files;
-				return opendir('fakedir://shared');
 			}
+			$FAKEDIRS['shared'] = $files;
+			return opendir('fakedir://shared');
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {
-- 
GitLab


From 929ce2b56621ceda47b910a0fea5452f01812554 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 1 Jan 2012 20:06:35 +0100
Subject: [PATCH 111/546] Small fixes

---
 lib/image.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index 67290d21f3a..0e1d1ee327f 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -55,6 +55,15 @@ class OC_Image {
 		}
 	}
 
+	/**
+	* @brief Determine whether the object contains an image resource.
+	* returns bool
+	*/
+	function empty() {
+		if(self::$resource && self::$destroy) {
+		}
+	}
+
 	/**
 	* @brief Prints the image.
 	*/
@@ -116,9 +125,6 @@ class OC_Image {
 	* @returns An image resource or false on error
 	*/
 	static public function loadFromFile($imagepath=false) {
-		if(!is_string($imagepath)) {
-			return false;
-		}
 		if(!is_file($imagepath) || !file_exists($imagepath) || !is_readable($imagepath)) {
 			OC_Log::write('core','OC_Image::loadFromFile, couldn\'t load'.$imagepath, OC_Log::DEBUG);
 			return false;
-- 
GitLab


From 4eb7487e61e4d018e4d75bddc79576b13d693362 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 1 Jan 2012 19:45:30 +0000
Subject: [PATCH 112/546] Updated ace-editor software

---
 .../js/aceeditor/ace-compat.js                |    1 +
 apps/files_texteditor/js/aceeditor/ace.js     |    2 +-
 .../js/aceeditor/keybinding-emacs.js          |    2 +-
 .../js/aceeditor/keybinding-vim.js            |    2 +-
 .../js/aceeditor/mode-c_cpp.js                |    2 +-
 .../js/aceeditor/mode-clojure.js              |    2 +-
 .../js/aceeditor/mode-coffee.js               |    2 +-
 .../js/aceeditor/mode-coldfusion.js           |    1 +
 .../js/aceeditor/mode-csharp.js               |    2 +-
 .../files_texteditor/js/aceeditor/mode-css.js |    2 +-
 .../js/aceeditor/mode-groovy.js               |    2 +-
 .../js/aceeditor/mode-haxe.js                 |    1 +
 .../js/aceeditor/mode-html.js                 |    2 +-
 .../js/aceeditor/mode-java.js                 |    2 +-
 .../js/aceeditor/mode-javascript.js           |    2 +-
 .../js/aceeditor/mode-json.js                 |    2 +-
 .../js/aceeditor/mode-latex.js                |    1 +
 .../files_texteditor/js/aceeditor/mode-lua.js |    1 +
 .../js/aceeditor/mode-markdown.js             |    1 +
 .../js/aceeditor/mode-ocaml.js                |    2 +-
 .../js/aceeditor/mode-perl.js                 |    2 +-
 .../files_texteditor/js/aceeditor/mode-php.js |    2 +-
 .../js/aceeditor/mode-powershell.js           |    1 +
 .../js/aceeditor/mode-python.js               |    2 +-
 .../js/aceeditor/mode-ruby.js                 |    2 +-
 .../js/aceeditor/mode-scad.js                 |    2 +-
 .../js/aceeditor/mode-scala.js                |    2 +-
 .../js/aceeditor/mode-scss.js                 |    2 +-
 .../files_texteditor/js/aceeditor/mode-sql.js |    1 +
 .../files_texteditor/js/aceeditor/mode-svg.js |    2 +-
 .../js/aceeditor/mode-textile.js              |    2 +-
 .../files_texteditor/js/aceeditor/mode-xml.js |    2 +-
 .../js/aceeditor/theme-clouds.js              |    2 +-
 .../js/aceeditor/worker-coffee.js             | 7055 +++++++++++-
 .../js/aceeditor/worker-css.js                | 9539 +++++++++++++++-
 .../js/aceeditor/worker-javascript.js         | 9753 ++++++++++++++++-
 36 files changed, 26377 insertions(+), 28 deletions(-)
 create mode 100755 apps/files_texteditor/js/aceeditor/ace-compat.js
 mode change 100644 => 100755 apps/files_texteditor/js/aceeditor/keybinding-emacs.js
 mode change 100644 => 100755 apps/files_texteditor/js/aceeditor/keybinding-vim.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-coldfusion.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-haxe.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-latex.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-lua.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-markdown.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-powershell.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-sql.js

diff --git a/apps/files_texteditor/js/aceeditor/ace-compat.js b/apps/files_texteditor/js/aceeditor/ace-compat.js
new file mode 100755
index 00000000000..5dcbb1cc38a
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/ace-compat.js
@@ -0,0 +1 @@
+define("pilot/index",["require","exports","module","pilot/browser_focus","pilot/dom","pilot/event","pilot/event_emitter","pilot/fixoldbrowsers","pilot/keys","pilot/lang","pilot/oop","pilot/useragent","pilot/canon"],function(a,b,c){a("pilot/browser_focus"),a("pilot/dom"),a("pilot/event"),a("pilot/event_emitter"),a("pilot/fixoldbrowsers"),a("pilot/keys"),a("pilot/lang"),a("pilot/oop"),a("pilot/useragent"),a("pilot/canon")}),define("pilot/browser_focus",["require","exports","module","ace/lib/browser_focus"],function(a,b,c){console.warn("DEPRECATED: 'pilot/browser_focus' is deprecated. Use 'ace/lib/browser_focus' instead"),c.exports=a("ace/lib/browser_focus")}),define("pilot/dom",["require","exports","module","ace/lib/dom"],function(a,b,c){console.warn("DEPRECATED: 'pilot/dom' is deprecated. Use 'ace/lib/dom' instead"),c.exports=a("ace/lib/dom")}),define("pilot/event",["require","exports","module","ace/lib/event"],function(a,b,c){console.warn("DEPRECATED: 'pilot/event' is deprecated. Use 'ace/lib/event' instead"),c.exports=a("ace/lib/event")}),define("pilot/event_emitter",["require","exports","module","ace/lib/event_emitter"],function(a,b,c){console.warn("DEPRECATED: 'pilot/event_emitter' is deprecated. Use 'ace/lib/event_emitter' instead"),c.exports=a("ace/lib/event_emitter")}),define("pilot/fixoldbrowsers",["require","exports","module","ace/lib/fixoldbrowsers"],function(a,b,c){console.warn("DEPRECATED: 'pilot/fixoldbrowsers' is deprecated. Use 'ace/lib/fixoldbrowsers' instead"),c.exports=a("ace/lib/fixoldbrowsers")}),define("pilot/keys",["require","exports","module","ace/lib/keys"],function(a,b,c){console.warn("DEPRECATED: 'pilot/keys' is deprecated. Use 'ace/lib/keys' instead"),c.exports=a("ace/lib/keys")}),define("pilot/lang",["require","exports","module","ace/lib/lang"],function(a,b,c){console.warn("DEPRECATED: 'pilot/lang' is deprecated. Use 'ace/lib/lang' instead"),c.exports=a("ace/lib/lang")}),define("pilot/oop",["require","exports","module","ace/lib/oop"],function(a,b,c){console.warn("DEPRECATED: 'pilot/oop' is deprecated. Use 'ace/lib/oop' instead"),c.exports=a("ace/lib/oop")}),define("pilot/useragent",["require","exports","module","ace/lib/useragent"],function(a,b,c){console.warn("DEPRECATED: 'pilot/useragent' is deprecated. Use 'ace/lib/useragent' instead"),c.exports=a("ace/lib/useragent")}),define("pilot/canon",["require","exports","module"],function(a,b,c){console.warn("DEPRECATED: 'pilot/canon' is deprecated."),b.addCommand=function(){console.warn("DEPRECATED: 'canon.addCommand()' is deprecated. Use 'editor.commands.addCommand(command)' instead."),console.trace()},b.removeCommand=function(){console.warn("DEPRECATED: 'canon.removeCommand()' is deprecated. Use 'editor.commands.removeCommand(command)' instead."),console.trace()}}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/ace.js b/apps/files_texteditor/js/aceeditor/ace.js
index d3b0ccc3f46..d8f08d58878 100644
--- a/apps/files_texteditor/js/aceeditor/ace.js
+++ b/apps/files_texteditor/js/aceeditor/ace.js
@@ -1 +1 @@
-(function(){var a=function(){return this}();if(a.require&&a.define)require.packaged=!0;else{var b=function(a,c,d){typeof a!="string"?b.original?b.original.apply(window,arguments):(console.error("dropping module because define wasn't a string."),console.trace()):(arguments.length==2&&(d=c),define.modules||(define.modules={}),define.modules[a]=d)};a.define&&(b.original=a.define),a.define=b;var c=function(a,b){if(Object.prototype.toString.call(a)==="[object Array]"){var e=[];for(var f=0,g=a.length;f<g;++f){var h=d(a[f]);if(!h&&c.original)return c.original.apply(window,arguments);e.push(h)}b&&b.apply(null,e)}else{if(typeof a=="string"){var i=d(a);if(!i&&c.original)return c.original.apply(window,arguments);b&&b();return i}if(c.original)return c.original.apply(window,arguments)}};a.require&&(c.original=a.require),a.require=c,require.packaged=!0;var d=function(a){var b=define.modules[a];if(b==null){console.error("Missing module: "+a);return null}if(typeof b=="function"){var c={};b(require,c,{id:a,uri:""}),define.modules[a]=c;return c}return b}}})(),define("pilot/fixoldbrowsers",["require","exports","module"],function(a,b,c){if(!Function.prototype.bind){var d=Array.prototype.slice;Function.prototype.bind=function(a){var b=this;if(typeof b.apply!="function"||typeof b.call!="function")return new TypeError;var c=d.call(arguments),e=function f(){if(this instanceof f){var a=Object.create(b.prototype);b.apply(a,c.concat(d.call(arguments)));return a}return b.call.apply(b,c.concat(d.call(arguments)))};e.length=typeof b=="function"?Math.max(b.length-c.length,0):0;return e}}var e=Function.prototype.call,f=Array.prototype,g=Object.prototype,h=e.bind(g.hasOwnProperty),i,j,k,l,m;if(m=h(g,"__defineGetter__"))i=e.bind(g.__defineGetter__),j=e.bind(g.__defineSetter__),k=e.bind(g.__lookupGetter__),l=e.bind(g.__lookupSetter__);Array.isArray||(Array.isArray=function(a){return Object.prototype.toString.call(a)==="[object Array]"}),Array.prototype.forEach||(Array.prototype.forEach=function(a,b){var c=+this.length;for(var d=0;d<c;d++)d in this&&a.call(b,this[d],d,this)}),Array.prototype.map||(Array.prototype.map=function(a){var b=+this.length;if(typeof a!="function")throw new TypeError;var c=Array(b),d=arguments[1];for(var e=0;e<b;e++)e in this&&(c[e]=a.call(d,this[e],e,this));return c}),Array.prototype.filter||(Array.prototype.filter=function(a){var b=[],c=arguments[1];for(var d=0;d<this.length;d++)a.call(c,this[d])&&b.push(this[d]);return b}),Array.prototype.every||(Array.prototype.every=function(a){var b=arguments[1];for(var c=0;c<this.length;c++)if(!a.call(b,this[c]))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(a){var b=arguments[1];for(var c=0;c<this.length;c++)if(a.call(b,this[c]))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(a){var b=+this.length;if(typeof a!="function")throw new TypeError;if(b===0&&arguments.length===1)throw new TypeError;var c=0;if(arguments.length>=2)var d=arguments[1];else do{if(c in this){d=this[c++];break}if(++c>=b)throw new TypeError}while(!0);for(;c<b;c++)c in this&&(d=a.call(null,d,this[c],c,this));return d}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(a){var b=+this.length;if(typeof a!="function")throw new TypeError;if(b===0&&arguments.length===1)throw new TypeError;var c=b-1;if(arguments.length>=2)var d=arguments[1];else do{if(c in this){d=this[c--];break}if(--c<0)throw new TypeError}while(!0);for(;c>=0;c--)c in this&&(d=a.call(null,d,this[c],c,this));return d}),Array.prototype.indexOf||(Array.prototype.indexOf=function(a){var b=this.length;if(!b)return-1;var c=arguments[1]||0;if(c>=b)return-1;c<0&&(c+=b);for(;c<b;c++){if(!h(this,c))continue;if(a===this[c])return c}return-1}),Array.prototype.lastIndexOf||(Array.prototype.lastIndexOf=function(a){var b=this.length;if(!b)return-1;var c=arguments[1]||b;c<0&&(c+=b),c=Math.min(c,b-1);for(;c>=0;c--){if(!h(this,c))continue;if(a===this[c])return c}return-1}),Object.getPrototypeOf||(Object.getPrototypeOf=function(a){return a.__proto__||a.constructor.prototype});if(!Object.getOwnPropertyDescriptor){var n="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(a,b){if(typeof a!="object"&&typeof a!="function"||a===null)throw new TypeError(n+a);if(!h(a,b))return undefined;var c,d,e;c={enumerable:!0,configurable:!0};if(m){var f=a.__proto__;a.__proto__=g;var d=k(a,b),e=l(a,b);a.__proto__=f;if(d||e){d&&(descriptor.get=d),e&&(descriptor.set=e);return descriptor}}descriptor.value=a[b];return descriptor}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(a){return Object.keys(a)}),Object.create||(Object.create=function(a,b){var c;if(a===null)c={"__proto__":null};else{if(typeof a!="object")throw new TypeError("typeof prototype["+typeof a+"] != 'object'");var d=function(){};d.prototype=a,c=new d,c.__proto__=a}typeof b!="undefined"&&Object.defineProperties(c,b);return c});if(!Object.defineProperty){var o="Property description must be an object: ",p="Object.defineProperty called on non-object: ",q="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(a,b,c){if(typeof a!="object"&&typeof a!="function")throw new TypeError(p+a);if(typeof a!="object"||a===null)throw new TypeError(o+c);if(h(c,"value"))if(m&&(k(a,b)||l(a,b))){var d=a.__proto__;a.__proto__=g,delete a[b],a[b]=c.value,a.prototype}else a[b]=c.value;else{if(!m)throw new TypeError(q);h(c,"get")&&i(a,b,c.get),h(c,"set")&&j(a,b,c.set)}return a}}Object.defineProperties||(Object.defineProperties=function(a,b){for(var c in b)h(b,c)&&Object.defineProperty(a,c,b[c]);return a}),Object.seal||(Object.seal=function(a){return a}),Object.freeze||(Object.freeze=function(a){return a});try{Object.freeze(function(){})}catch(r){Object.freeze=function(a){return function b(b){return typeof b=="function"?b:a(b)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(a){return a}),Object.isSealed||(Object.isSealed=function(a){return!1}),Object.isFrozen||(Object.isFrozen=function(a){return!1}),Object.isExtensible||(Object.isExtensible=function(a){return!0});if(!Object.keys){var s=!0,t=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],u=t.length;for(var v in{toString:null})s=!1;Object.keys=function W(a){if(typeof a!="object"&&typeof a!="function"||a===null)throw new TypeError("Object.keys called on a non-object");var W=[];for(var b in a)h(a,b)&&W.push(b);if(s)for(var c=0,d=u;c<d;c++){var e=t[c];h(a,e)&&W.push(e)}return W}}Date.prototype.toISOString||(Date.prototype.toISOString=function(){return this.getUTCFullYear()+"-"+(this.getUTCMonth()+1)+"-"+this.getUTCDate()+"T"+this.getUTCHours()+":"+this.getUTCMinutes()+":"+this.getUTCSeconds()+"Z"}),Date.now||(Date.now=function(){return(new Date).getTime()}),Date.prototype.toJSON||(Date.prototype.toJSON=function(a){if(typeof this.toISOString!="function")throw new TypeError;return this.toISOString()}),isNaN(Date.parse("T00:00"))&&(Date=function(a){var b=function(c,d,e,f,g,h,i){var j=arguments.length;if(this instanceof a){var k=j===1&&String(c)===c?new a(b.parse(c)):j>=7?new a(c,d,e,f,g,h,i):j>=6?new a(c,d,e,f,g,h):j>=5?new a(c,d,e,f,g):j>=4?new a(c,d,e,f):j>=3?new a(c,d,e):j>=2?new a(c,d):j>=1?new a(c):new a;k.constructor=b;return k}return a.apply(this,arguments)},c=new RegExp("^(?:((?:[+-]\\d\\d)?\\d\\d\\d\\d)(?:-(\\d\\d)(?:-(\\d\\d))?)?)?(?:T(\\d\\d):(\\d\\d)(?::(\\d\\d)(?:\\.(\\d\\d\\d))?)?)?(?:Z|([+-])(\\d\\d):(\\d\\d))?$");for(var d in a)b[d]=a[d];b.now=a.now,b.UTC=a.UTC,b.prototype=a.prototype,b.prototype.constructor=b,b.parse=function e(b){var d=c.exec(b);if(d){d.shift();var e=d[0]===undefined;for(var f=0;f<10;f++){if(f===7)continue;d[f]=+(d[f]||(f<3?1:0)),f===1&&d[f]--}if(e)return((d[3]*60+d[4])*60+d[5])*1e3+d[6];var g=(d[8]*60+d[9])*60*1e3;d[6]==="-"&&(g=-g);return a.UTC.apply(this,d.slice(0,7))+g}return a.parse.apply(this,arguments)};return b}(Date));if(!String.prototype.trim){var w=/^\s\s*/,x=/\s\s*$/;String.prototype.trim=function(){return String(this).replace(w,"").replace(x,"")}}}),define("ace/ace",["require","exports","module","pilot/index","pilot/fixoldbrowsers","pilot/plugin_manager","pilot/dom","pilot/event","ace/editor","ace/edit_session","ace/undomanager","ace/virtual_renderer","ace/theme/textmate","pilot/environment"],function(a,b,c){a("pilot/index"),a("pilot/fixoldbrowsers");var d=a("pilot/plugin_manager").catalog;d.registerPlugins(["pilot/index"]);var e=a("pilot/dom"),f=a("pilot/event"),g=a("ace/editor").Editor,h=a("ace/edit_session").EditSession,i=a("ace/undomanager").UndoManager,j=a("ace/virtual_renderer").VirtualRenderer;b.edit=function(b){typeof b=="string"&&(b=document.getElementById(b));var c=new h(e.getInnerText(b));c.setUndoManager(new i),b.innerHTML="";var k=new g(new j(b,a("ace/theme/textmate")));k.setSession(c);var l=a("pilot/environment").create();d.startupPlugins({env:l}).then(function(){l.document=c,l.editor=k,k.resize(),f.addListener(window,"resize",function(){k.resize()}),b.env=l}),k.env=l;return k}}),define("pilot/index",["require","exports","module","pilot/fixoldbrowsers","pilot/types/basic","pilot/types/command","pilot/types/settings","pilot/commands/settings","pilot/commands/basic","pilot/settings/canon","pilot/canon"],function(a,b,c){b.startup=function(b,c){a("pilot/fixoldbrowsers"),a("pilot/types/basic").startup(b,c),a("pilot/types/command").startup(b,c),a("pilot/types/settings").startup(b,c),a("pilot/commands/settings").startup(b,c),a("pilot/commands/basic").startup(b,c),a("pilot/settings/canon").startup(b,c),a("pilot/canon").startup(b,c)},b.shutdown=function(b,c){a("pilot/types/basic").shutdown(b,c),a("pilot/types/command").shutdown(b,c),a("pilot/types/settings").shutdown(b,c),a("pilot/commands/settings").shutdown(b,c),a("pilot/commands/basic").shutdown(b,c),a("pilot/settings/canon").shutdown(b,c),a("pilot/canon").shutdown(b,c)}}),define("pilot/types/basic",["require","exports","module","pilot/types"],function(a,b,c){function m(a){if(a instanceof e)this.subtype=a;else{if(typeof a!="string")throw new Error("Can' handle array subtype");this.subtype=d.getType(a);if(this.subtype==null)throw new Error("Unknown array subtype: "+a)}}function l(a){if(typeof a.defer!="function")throw new Error("Instances of DeferredType need typeSpec.defer to be a function that returns a type");Object.keys(a).forEach(function(b){this[b]=a[b]},this)}function j(a){if(!Array.isArray(a.data)&&typeof a.data!="function")throw new Error("instances of SelectionType need typeSpec.data to be an array or function that returns an array:"+JSON.stringify(a));Object.keys(a).forEach(function(b){this[b]=a[b]},this)}var d=a("pilot/types"),e=d.Type,f=d.Conversion,g=d.Status,h=new e;h.stringify=function(a){return a},h.parse=function(a){if(typeof a!="string")throw new Error("non-string passed to text.parse()");return new f(a)},h.name="text";var i=new e;i.stringify=function(a){return a?""+a:null},i.parse=function(a){if(typeof a!="string")throw new Error("non-string passed to number.parse()");if(a.replace(/\s/g,"").length===0)return new f(null,g.INCOMPLETE,"");var b=new f(parseInt(a,10));isNaN(b.value)&&(b.status=g.INVALID,b.message="Can't convert \""+a+'" to a number.');return b},i.decrement=function(a){return a-1},i.increment=function(a){return a+1},i.name="number",j.prototype=new e,j.prototype.stringify=function(a){return a},j.prototype.parse=function(a){if(typeof a!="string")throw new Error("non-string passed to parse()");if(!this.data)throw new Error("Missing data on selection type extension.");var b=typeof this.data=="function"?this.data():this.data,c=!1,d,e=[];b.forEach(function(b){a==b?(d=this.fromString(b),c=!0):b.indexOf(a)===0&&e.push(this.fromString(b))},this);if(c)return new f(d);this.noMatch&&this.noMatch();if(e.length>0){var h="Possibilities"+(a.length===0?"":" for '"+a+"'");return new f(null,g.INCOMPLETE,h,e)}var h="Can't use '"+a+"'.";return new f(null,g.INVALID,h,e)},j.prototype.fromString=function(a){return a},j.prototype.decrement=function(a){var b=typeof this.data=="function"?this.data():this.data,c;if(a==null)c=b.length-1;else{var d=this.stringify(a),c=b.indexOf(d);c=c===0?b.length-1:c-1}return this.fromString(b[c])},j.prototype.increment=function(a){var b=typeof this.data=="function"?this.data():this.data,c;if(a==null)c=0;else{var d=this.stringify(a),c=b.indexOf(d);c=c===b.length-1?0:c+1}return this.fromString(b[c])},j.prototype.name="selection",b.SelectionType=j;var k=new j({name:"bool",data:["true","false"],stringify:function(a){return""+a},fromString:function(a){return a==="true"?!0:!1}});l.prototype=new e,l.prototype.stringify=function(a){return this.defer().stringify(a)},l.prototype.parse=function(a){return this.defer().parse(a)},l.prototype.decrement=function(a){var b=this.defer();return b.decrement?b.decrement(a):undefined},l.prototype.increment=function(a){var b=this.defer();return b.increment?b.increment(a):undefined},l.prototype.name="deferred",b.DeferredType=l,m.prototype=new e,m.prototype.stringify=function(a){return a.join(" ")},m.prototype.parse=function(a){return this.defer().parse(a)},m.prototype.name="array";var n=!1;b.startup=function(){n||(n=!0,d.registerType(h),d.registerType(i),d.registerType(k),d.registerType(j),d.registerType(l),d.registerType(m))},b.shutdown=function(){n=!1,d.unregisterType(h),d.unregisterType(i),d.unregisterType(k),d.unregisterType(j),d.unregisterType(l),d.unregisterType(m)}}),define("pilot/types",["require","exports","module"],function(a,b,c){function h(a,b){if(a.substr(-2)==="[]"){var c=a.slice(0,-2);return new g.array(c)}var d=g[a];typeof d=="function"&&(d=new d(b));return d}function f(){}function e(a,b,c,e){this.value=a,this.status=b||d.VALID,this.message=c,this.predictions=e||[]}var d={VALID:{toString:function(){return"VALID"},valueOf:function(){return 0}},INCOMPLETE:{toString:function(){return"INCOMPLETE"},valueOf:function(){return 1}},INVALID:{toString:function(){return"INVALID"},valueOf:function(){return 2}},combine:function(a){var b=d.VALID;for(var c=0;c<a.length;c++)a[c].valueOf()>b.valueOf()&&(b=a[c]);return b}};b.Status=d,b.Conversion=e,f.prototype={stringify:function(a){throw new Error("not implemented")},parse:function(a){throw new Error("not implemented")},name:undefined,increment:function(a){return undefined},decrement:function(a){return undefined},getDefault:function(){return this.parse("")}},b.Type=f;var g={};b.registerType=function(a){if(typeof a=="object"){if(!(a instanceof f))throw new Error("Can't registerType using: "+a);if(!a.name)throw new Error("All registered types must have a name");g[a.name]=a}else{if(typeof a!="function")throw new Error("Unknown type: "+a);if(!a.prototype.name)throw new Error("All registered types must have a name");g[a.prototype.name]=a}},b.registerTypes=function(a){Object.keys(a).forEach(function(c){var d=a[c];d.name=c,b.registerType(d)})},b.deregisterType=function(a){delete g[a.name]},b.getType=function(a){if(typeof a=="string")return h(a);if(typeof a=="object"){if(!a.name)throw new Error("Missing 'name' member to typeSpec");return h(a.name,a)}throw new Error("Can't extract type from "+a)}}),define("pilot/types/command",["require","exports","module","pilot/canon","pilot/types/basic","pilot/types"],function(a,b,c){var d=a("pilot/canon"),e=a("pilot/types/basic").SelectionType,f=a("pilot/types"),g=new e({name:"command",data:function(){return d.getCommandNames()},stringify:function(a){return a.name},fromString:function(a){return d.getCommand(a)}});b.startup=function(){f.registerType(g)},b.shutdown=function(){f.unregisterType(g)}}),define("pilot/canon",["require","exports","module","pilot/console","pilot/stacktrace","pilot/oop","pilot/useragent","pilot/keys","pilot/event_emitter","pilot/typecheck","pilot/catalog","pilot/types","pilot/lang"],function(a,b,c){function J(a){a=a||{},this.command=a.command,this.args=a.args,this.typed=a.typed,this._begunOutput=!1,this.start=new Date,this.end=null,this.completed=!1,this.error=!1}function G(a,b,c,e,f){function h(){a.exec(b,g.args,g),!g.isAsync&&!g.isDone&&g.done()}typeof a=="string"&&(a=q[a]);if(!a)return!1;var g=new J({sender:c,command:a,args:e||{},typed:f});if(g.getStatus()==l.INVALID){d.error("Canon.exec: Invalid parameter(s) passed to "+a.name);return!1}if(g.getStatus()==l.INCOMPLETE){var i,j=b[c];if(!j||!j.getArgsProvider||!(i=j.getArgsProvider()))i=F;i(g,function(){g.getStatus()==l.VALID&&h()});return!0}h();return!0}function F(a,b){var c=a.args,d=a.command.params;for(var e=0;e<d.length;e++){var f=d[e];if(a.getParamStatus(f)!=l.VALID||f.defaultValue===null){var g=f.description;f.defaultValue===null&&(g+=" (optional)");var h=prompt(g,f.defaultValue||"");if(!h){b();return}c[f.name]=h}}b()}function E(){return z}function D(a){return q[a]}function C(a){var b=typeof a=="string"?a:a.name;a=q[b],delete q[b],n.arrayRemove(z,b);var c=r;for(var d in c)for(var e in c[d])for(var f in c[d][e])c[d][e][f]==a&&delete c[d][e][f];var g=s;for(var d in g)for(var e in g[d])g[d][e].forEach(function(b,c){b.command==a&&g[d][e].splice(c,1)})}function B(a,b){var c=b.type;b.type=m.getType(c);if(b.type==null)throw new Error("In "+a+"/"+b.name+": can't find type for: "+JSON.stringify(c))}function A(a){if(!a.name)throw new Error("All registered commands must have a name");a.params==null&&(a.params=[]);if(!Array.isArray(a.params))throw new Error("command.params must be an array in "+a.name);a.params.forEach(function(b){if(!b.name)throw new Error("In "+a.name+": all params must have a name");B(a.name,b)},this),q[a.name]=a,a.bindKey&&w(a),z.push(a.name),z.sort()}function y(a,b,c,d){var e=x(a,b,c,d);return e?G(e,a,b,{}):!1}function x(a,b,c,d){j.isNumber(d)&&(d=h.keyCodeToString(d));var e=(s[c]||{})[d]||[];for(var f=0;f<e.length;f++)if(e[f].sender(a,b,c,d))return e[f].command;var g=r[b];return g&&g[c]&&g[c][d]}function w(a){var b=a.bindKey,c=b[v],d=r,e=s;if(!b.sender)throw new Error("All key bindings must have a sender");if(!b.mac&&b.mac!==null)throw new Error("All key bindings must have a mac key binding");if(!b.win&&b.win!==null)throw new Error("All key bindings must have a windows key binding");if(!!b[v])if(typeof b.sender=="string"){var f=t(b.sender,"\\|",null,!0);f.forEach(function(b){d[b]||(d[b]={}),c.split("|").forEach(function(c){u(c,a,d[b])})})}else{if(!j.isFunction(b.sender))throw new Error("Key binding must have a sender that is a string or function");var g={command:a,sender:b.sender};keyData=u(c),e[keyData.hashId]||(e[keyData.hashId]={}),e[keyData.hashId][keyData.key]?e[keyData.hashId][keyData.key].push(g):e[keyData.hashId][keyData.key]=[g]}}function u(a,b,c){var d,e=0,f=t(a,"\\-",null,!0),g=0,i=f.length;for(;g<i;++g)h.KEY_MODS[f[g]]?e=e|h.KEY_MODS[f[g]]:d=f[g]||"-";if(c==null)return{key:d,hashId:e};(c[e]||(c[e]={}))[d]=b}function t(a,b,c,d){return(d&&a.toLowerCase()||a).replace(/(?:^\s+|\n|\s+$)/g,"").split(new RegExp("[\\s ]*"+b+"[\\s ]*","g"),c||999)}var d=a("pilot/console"),e=a("pilot/stacktrace").Trace,f=a("pilot/oop"),g=a("pilot/useragent"),h=a("pilot/keys"),i=a("pilot/event_emitter").EventEmitter,j=a("pilot/typecheck"),k=a("pilot/catalog"),l=a("pilot/types").Status,m=a("pilot/types"),n=a("pilot/lang"),o={name:"command",description:"A command is a bit of functionality with optional typed arguments which can do something small like moving the cursor around the screen, or large like cloning a project from VCS.",indexOn:"name"};b.startup=function(a,b){k.addExtensionSpec(o)},b.shutdown=function(a,b){k.removeExtensionSpec(o)};var p={name:"thing",description:"thing is an example command",params:[{name:"param1",description:"an example parameter",type:"text",defaultValue:null}],exec:function(a,b,c){thing()}},q={},r={},s={},v=g.isMac?"mac":"win",z=[];b.removeCommand=C,b.addCommand=A,b.getCommand=D,b.getCommandNames=E,b.findKeyCommand=x,b.exec=G,b.execKeyCommand=y,b.upgradeType=B,f.implement(b,i);var H=[],I=100;f.implement(J.prototype,i),J.prototype.getParamStatus=function(a){var b=this.args||{};if(a.name in b){if(b[a.name]==null)return a.defaultValue===null?l.VALID:l.INCOMPLETE;var c,d=b[a.name].toString();try{c=a.type.parse(d)}catch(e){return l.INVALID}if(c.status!=l.VALID)return c.status}else if(a.defaultValue===undefined)return l.INCOMPLETE;return l.VALID},J.prototype.getParamNameStatus=function(a){var b=this.command.params||[];for(var c=0;c<b.length;c++)if(b[c].name==a)return this.getParamStatus(b[c]);throw"Parameter '"+a+"' not defined on command '"+this.command.name+"'"},J.prototype.getStatus=function(){var a=this.args||{},b=this.command.params;if(!b||b.length==0)return l.VALID;var c=[];for(var d=0;d<b.length;d++)c.push(this.getParamStatus(b[d]));return l.combine(c)},J.prototype._beginOutput=function(){this._begunOutput=!0,this.outputs=[],H.push(this);while(H.length>I)H.shiftObject();b._dispatchEvent("output",{requests:H,request:this})},J.prototype.doneWithError=function(a){this.error=!0,this.done(a)},J.prototype.async=function(){this.isAsync=!0,this._begunOutput||this._beginOutput()},J.prototype.output=function(a){this._begunOutput||this._beginOutput(),typeof a!="string"&&!(a instanceof Node)&&(a=a.toString()),this.outputs.push(a),this.isDone=!0,this._dispatchEvent("output",{});return this},J.prototype.done=function(a){this.completed=!0,this.end=new Date,this.duration=this.end.getTime()-this.start.getTime(),a&&this.output(a),this.isDone||(this.isDone=!0,this._dispatchEvent("output",{}))},b.Request=J}),define("pilot/console",["require","exports","module"],function(a,b,c){var d=function(){},e=["assert","count","debug","dir","dirxml","error","group","groupEnd","info","log","profile","profileEnd","time","timeEnd","trace","warn"];typeof window=="undefined"?e.forEach(function(a){b[a]=function(){var b=Array.prototype.slice.call(arguments),c={op:"log",method:a,args:b};postMessage(JSON.stringify(c))}}):e.forEach(function(a){window.console&&window.console[a]?b[a]=Function.prototype.bind.call(window.console[a],window.console):b[a]=d})}),define("pilot/stacktrace",["require","exports","module","pilot/useragent","pilot/console"],function(a,b,c){function i(){}function g(a){for(var b=0;b<a.length;++b){var c=a[b];typeof c=="object"?a[b]="#object":typeof c=="function"?a[b]="#function":typeof c=="string"&&(a[b]='"'+c+'"')}return a.join(",")}var d=a("pilot/useragent"),e=a("pilot/console"),f=function(){return d.isGecko?"firefox":d.isOpera?"opera":"other"}(),h={chrome:function(a){var b=a.stack;if(!b){e.log(a);return[]}return b.replace(/^.*?\n/,"").replace(/^.*?\n/,"").replace(/^.*?\n/,"").replace(/^[^\(]+?[\n$]/gm,"").replace(/^\s+at\s+/gm,"").replace(/^Object.<anonymous>\s*\(/gm,"{anonymous}()@").split("\n")},firefox:function(a){var b=a.stack;if(!b){e.log(a);return[]}b=b.replace(/(?:\n@:0)?\s+$/m,""),b=b.replace(/^\(/gm,"{anonymous}(");return b.split("\n")},opera:function(a){var b=a.message.split("\n"),c="{anonymous}",d=/Line\s+(\d+).*?script\s+(http\S+)(?:.*?in\s+function\s+(\S+))?/i,e,f,g;for(e=4,f=0,g=b.length;e<g;e+=2)d.test(b[e])&&(b[f++]=(RegExp.$3?RegExp.$3+"()@"+RegExp.$2+RegExp.$1:c+"()@"+RegExp.$2+":"+RegExp.$1)+" -- "+b[e+1].replace(/^\s+/,""));b.splice(f,b.length-f);return b},other:function(a){var b="{anonymous}",c=/function\s*([\w\-$]+)?\s*\(/i,d=[],e=0,f,h,i=10;while(a&&d.length<i){f=c.test(a.toString())?RegExp.$1||b:b,h=Array.prototype.slice.call(a.arguments),d[e++]=f+"("+g(h)+")";if(a===a.caller&&window.opera)break;a=a.caller}return d}};i.prototype={sourceCache:{},ajax:function(a){var b=this.createXMLHTTPObject();if(!!b){b.open("GET",a,!1),b.setRequestHeader("User-Agent","XMLHTTP/1.0"),b.send("");return b.responseText}},createXMLHTTPObject:function(){var a,b=[function(){return new XMLHttpRequest},function(){return new ActiveXObject("Msxml2.XMLHTTP")},function(){return new ActiveXObject("Msxml3.XMLHTTP")},function(){return new ActiveXObject("Microsoft.XMLHTTP")}];for(var c=0;c<b.length;c++)try{a=b[c](),this.createXMLHTTPObject=b[c];return a}catch(d){}},getSource:function(a){a in this.sourceCache||(this.sourceCache[a]=this.ajax(a).split("\n"));return this.sourceCache[a]},guessFunctions:function(a){for(var b=0;b<a.length;++b){var c=/{anonymous}\(.*\)@(\w+:\/\/([-\w\.]+)+(:\d+)?[^:]+):(\d+):?(\d+)?/,d=a[b],e=c.exec(d);if(e){var f=e[1],g=e[4];if(f&&g){var h=this.guessFunctionName(f,g);a[b]=d.replace("{anonymous}",h)}}}return a},guessFunctionName:function(a,b){try{return this.guessFunctionNameFromLines(b,this.getSource(a))}catch(c){return"getSource failed with url: "+a+", exception: "+c.toString()}},guessFunctionNameFromLines:function(a,b){var c=/function ([^(]*)\(([^)]*)\)/,d=/['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*(function|eval|new Function)/,e="",f=10;for(var g=0;g<f;++g){e=b[a-g]+e;if(e!==undefined){var h=d.exec(e);if(h)return h[1];h=c.exec(e);if(h&&h[1])return h[1]}}return"(?)"}};var j=new i,k=[/http:\/\/localhost:4020\/sproutcore.js:/];b.ignoreFramesMatching=function(a){k.push(a)},b.Trace=function(a,b){this._ex=a,this._stack=h[f](a),b&&(this._stack=j.guessFunctions(this._stack))},b.Trace.prototype.log=function(a){a<=0&&(a=999999999);var b=0;for(var c=0;c<this._stack.length&&b<a;c++){var d=this._stack[c],f=!0;k.forEach(function(a){a.test(d)&&(f=!1)}),f&&(e.debug(d),b++)}}}),define("pilot/useragent",["require","exports","module"],function(a,b,c){var d=(navigator.platform.match(/mac|win|linux/i)||["other"])[0].toLowerCase(),e=navigator.userAgent,f=navigator.appVersion;b.isWin=d=="win",b.isMac=d=="mac",b.isLinux=d=="linux",b.isIE=!1,b.isGecko=b.isMozilla=window.controllers&&window.navigator.product==="Gecko",b.isOldGecko=b.isGecko&&/rv\:1/.test(navigator.userAgent),b.isOpera=window.opera&&Object.prototype.toString.call(window.opera)=="[object Opera]",b.isWebKit=parseFloat(e.split("WebKit/")[1])||undefined,b.isChrome=parseFloat(e.split(" Chrome/")[1])||undefined,b.isAIR=e.indexOf("AdobeAIR")>=0,b.isIPad=e.indexOf("iPad")>=0,b.OS={LINUX:"LINUX",MAC:"MAC",WINDOWS:"WINDOWS"},b.getOS=function(){return b.isMac?b.OS.MAC:b.isLinux?b.OS.LINUX:b.OS.WINDOWS}}),define("pilot/oop",["require","exports","module"],function(a,b,c){b.inherits=function(){var a=function(){};return function(b,c){a.prototype=c.prototype,b.super_=c.prototype,b.prototype=new a,b.prototype.constructor=b}}(),b.mixin=function(a,b){for(var c in b)a[c]=b[c]},b.implement=function(a,c){b.mixin(a,c)}}),define("pilot/keys",["require","exports","module","pilot/oop"],function(a,b,c){var d=a("pilot/oop"),e=function(){var a={MODIFIER_KEYS:{16:"Shift",17:"Ctrl",18:"Alt",224:"Meta"},KEY_MODS:{ctrl:1,alt:2,option:2,shift:4,meta:8,command:8},FUNCTION_KEYS:{8:"Backspace",9:"Tab",13:"Return",19:"Pause",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"Print",45:"Insert",46:"Delete",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"Numlock",145:"Scrolllock"},PRINTABLE_KEYS:{32:" ",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",59:";",61:"=",65:"a",66:"b",67:"c",68:"d",69:"e",70:"f",71:"g",72:"h",73:"i",74:"j",75:"k",76:"l",77:"m",78:"n",79:"o",80:"p",81:"q",82:"r",83:"s",84:"t",85:"u",86:"v",87:"w",88:"x",89:"y",90:"z",107:"+",109:"-",110:".",188:",",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:'"'}};for(i in a.FUNCTION_KEYS){var b=a.FUNCTION_KEYS[i].toUpperCase();a[b]=parseInt(i,10)}d.mixin(a,a.MODIFIER_KEYS),d.mixin(a,a.PRINTABLE_KEYS),d.mixin(a,a.FUNCTION_KEYS);return a}();d.mixin(b,e),b.keyCodeToString=function(a){return(e[a]||String.fromCharCode(a)).toLowerCase()}}),define("pilot/event_emitter",["require","exports","module"],function(a,b,c){var d={};d._emit=d._dispatchEvent=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!!c&&!!c.length){var b=b||{};b.type=a;for(var d=0;d<c.length;d++)c[d](b)}},d.on=d.addEventListener=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!c)var c=this._eventRegistry[a]=[];c.indexOf(b)==-1&&c.push(b)},d.removeListener=d.removeEventListener=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!!c){var d=c.indexOf(b);d!==-1&&c.splice(d,1)}},d.removeAllListeners=function(a){this._eventRegistry&&(this._eventRegistry[a]=[])},b.EventEmitter=d}),define("pilot/typecheck",["require","exports","module"],function(a,b,c){var d=Object.prototype.toString;b.isString=function(a){return a&&d.call(a)==="[object String]"},b.isBoolean=function(a){return a&&d.call(a)==="[object Boolean]"},b.isNumber=function(a){return a&&d.call(a)==="[object Number]"&&isFinite(a)},b.isObject=function(a){return a!==undefined&&(a===null||typeof a=="object"||Array.isArray(a)||b.isFunction(a))},b.isFunction=function(a){return a&&d.call(a)==="[object Function]"}}),define("pilot/catalog",["require","exports","module"],function(a,b,c){var d={};b.addExtensionSpec=function(a){d[a.name]=a},b.removeExtensionSpec=function(a){typeof a=="string"?delete d[a]:delete d[a.name]},b.getExtensionSpec=function(a){return d[a]},b.getExtensionSpecs=function(){return Object.keys(d)}}),define("pilot/lang",["require","exports","module"],function(a,b,c){b.stringReverse=function(a){return a.split("").reverse().join("")},b.stringRepeat=function(a,b){return Array(b+1).join(a)};var d=/^\s\s*/,e=/\s\s*$/;b.stringTrimLeft=function(a){return a.replace(d,"")},b.stringTrimRight=function(a){return a.replace(e,"")},b.copyObject=function(a){var b={};for(var c in a)b[c]=a[c];return b},b.copyArray=function(a){var b=[];for(i=0,l=a.length;i<l;i++)a[i]&&typeof a[i]=="object"?b[i]=this.copyObject(a[i]):b[i]=a[i];return b},b.deepCopy=function(a){if(typeof a!="object")return a;var b=a.constructor();for(var c in a)typeof a[c]=="object"?b[c]=this.deepCopy(a[c]):b[c]=a[c];return b},b.arrayToMap=function(a){var b={};for(var c=0;c<a.length;c++)b[a[c]]=1;return b},b.arrayRemove=function(a,b){for(var c=0;c<=a.length;c++)b===a[c]&&a.splice(c,1)},b.escapeRegExp=function(a){return a.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},b.deferredCall=function(a){var b=null,c=function(){b=null,a()},d=function(a){b||(b=setTimeout(c,a||0));return d};d.schedule=d,d.call=function(){this.cancel(),a();return d},d.cancel=function(){clearTimeout(b),b=null;return d};return d}}),define("pilot/types/settings",["require","exports","module","pilot/types/basic","pilot/types","pilot/settings"],function(a,b,c){var d=a("pilot/types/basic").SelectionType,e=a("pilot/types/basic").DeferredType,f=a("pilot/types"),g=a("pilot/settings").settings,h,i=new d({name:"setting",data:function(){return k.settings.getSettingNames()},stringify:function(a){h=a;return a.name},fromString:function(a){h=g.getSetting(a);return h},noMatch:function(){h=null}}),j=new e({name:"settingValue",defer:function(){return h?h.type:f.getType("text")},getDefault:function(){var a=this.parse("");if(h){var b=h.get();if(a.predictions.length===0)a.predictions.push(b);else{var c=!1;for(;;){var d=a.predictions.indexOf(b);if(d===-1)break;a.predictions.splice(d,1),c=!0}c&&a.predictions.push(b)}}return a}}),k;b.startup=function(a,b){k=a.env,f.registerType(i),f.registerType(j)},b.shutdown=function(a,b){f.unregisterType(i),f.unregisterType(j)}}),define("pilot/settings",["require","exports","module","pilot/console","pilot/oop","pilot/types","pilot/event_emitter","pilot/catalog"],function(a,b,c){function l(){}function k(a){this._deactivated={},this._settings={},this._settingNames=[],a&&this.setPersister(a)}function j(a,b){this._settings=b,Object.keys(a).forEach(function(b){this[b]=a[b]},this),this.type=f.getType(this.type);if(this.type==null)throw new Error("In "+this.name+": can't find type for: "+JSON.stringify(a.type));if(!this.name)throw new Error("Setting.name == undefined. Ignoring.",this);if(!this.defaultValue===undefined)throw new Error("Setting.defaultValue == undefined",this);this.onChange&&this.on("change",this.onChange.bind(this)),this.set(this.defaultValue)}var d=a("pilot/console"),e=a("pilot/oop"),f=a("pilot/types"),g=a("pilot/event_emitter").EventEmitter,h=a("pilot/catalog"),i={name:"setting",description:"A setting is something that the application offers as a way to customize how it works",register:"env.settings.addSetting",indexOn:"name"};b.startup=function(a,b){h.addExtensionSpec(i)},b.shutdown=function(a,b){h.removeExtensionSpec(i)},j.prototype={get:function(){return this.value},set:function(a){this.value!==a&&(this.value=a,this._settings.persister&&this._settings.persister.persistValue(this._settings,this.name,a),this._dispatchEvent("change",{setting:this,value:a}))},resetValue:function(){this.set(this.defaultValue)},toString:function(){return this.name}},e.implement(j.prototype,g),k.prototype={addSetting:function(a){var b=new j(a,this);this._settings[b.name]=b,this._settingNames.push(b.name),this._settingNames.sort()},addSettings:function(a){Object.keys(a).forEach(function(b){var c=a[b];"name"in c||(c.name=b),this.addSetting(c)},this)},removeSetting:function(a){var b=typeof a=="string"?a:a.name;a=this._settings[b],delete this._settings[b],util.arrayRemove(this._settingNames,b),settings.removeAllListeners("change")},removeSettings:function(a){Object.keys(a).forEach(function(b){var c=a[b];"name"in c||(c.name=b),this.removeSettings(c)},this)},getSettingNames:function(){return this._settingNames},getSetting:function(a){return this._settings[a]},setPersister:function(a){this._persister=a,a&&a.loadInitialValues(this)},resetAll:function(){this.getSettingNames().forEach(function(a){this.resetValue(a)},this)},_list:function(){var a=[];this.getSettingNames().forEach(function(b){a.push({key:b,value:this.getSetting(b).get()})},this);return a},_loadDefaultValues:function(){this._loadFromObject(this._getDefaultValues())},_loadFromObject:function(a){for(var b in a)if(a.hasOwnProperty(b)){var c=this._settings[b];if(c){var d=c.type.parse(a[b]);this.set(b,d)}else this.set(b,a[b])}},_saveToObject:function(){return this.getSettingNames().map(function(a){return this._settings[a].type.stringify(this.get(a))}.bind(this))},_getDefaultValues:function(){return this.getSettingNames().map(function(a){return this._settings[a].spec.defaultValue}.bind(this))}},b.settings=new k,l.prototype={loadInitialValues:function(a){a._loadDefaultValues();var b=cookie.get("settings");a._loadFromObject(JSON.parse(b))},persistValue:function(a,b,c){try{var e=JSON.stringify(a._saveToObject());cookie.set("settings",e)}catch(f){d.error("Unable to JSONify the settings! "+f);return}}},b.CookiePersister=l}),define("pilot/commands/settings",["require","exports","module","pilot/canon"],function(a,b,c){var d={name:"set",params:[{name:"setting",type:"setting",description:"The name of the setting to display or alter",defaultValue:null},{name:"value",type:"settingValue",description:"The new value for the chosen setting",defaultValue:null}],description:"define and show settings",exec:function(a,b,c){var d;if(!b.setting){var e=a.settings.getSettingNames();d="",e.sort(function(a,b){return a.localeCompare(b)}),e.forEach(function(b){var c=a.settings.getSetting(b),e="https://wiki.mozilla.org/Labs/Skywriter/Settings#"+c.name;d+='<a class="setting" href="'+e+'" title="View external documentation on setting: '+c.name+'" target="_blank">'+c.name+"</a> = "+c.value+"<br/>"})}else b.value===undefined?d="<strong>"+setting.name+"</strong> = "+setting.get():(b.setting.set(b.value),d="Setting: <strong>"+b.setting.name+"</strong> = "+b.setting.get());c.done(d)}},e={name:"unset",params:[{name:"setting",type:"setting",description:"The name of the setting to return to defaults"}],description:"unset a setting entirely",exec:function(a,b,c){var d=a.settings.get(b.setting);d?(d.reset(),c.done("Reset "+d.name+" to default: "+a.settings.get(b.setting))):c.doneWithError("No setting with the name <strong>"+b.setting+"</strong>.")}},f=a("pilot/canon");b.startup=function(a,b){f.addCommand(d),f.addCommand(e)},b.shutdown=function(a,b){f.removeCommand(d),f.removeCommand(e)}}),define("pilot/commands/basic",["require","exports","module","pilot/typecheck","pilot/canon"],function(require,exports,module){var checks=require("pilot/typecheck"),canon=require("pilot/canon"),helpCommandSpec={name:"help",params:[{name:"search",type:"text",description:"Search string to narrow the output.",defaultValue:null}],description:"Get help on the available commands.",exec:function(a,b,c){var d=[],e=canon.getCommand(b.search);if(e&&e.exec)d.push(e.description?e.description:"No description for "+b.search);else{var f=!1;e?(d.push("<h2>Sub-Commands of "+e.name+"</h2>"),d.push("<p>"+e.description+"</p>")):b.search?(b.search=="hidden"&&(b.search="",f=!0),d.push("<h2>Commands starting with '"+b.search+"':</h2>")):d.push("<h2>Available Commands:</h2>");var g=canon.getCommandNames();g.sort(),d.push("<table>");for(var h=0;h<g.length;h++){e=canon.getCommand(g[h]);if(!f&&e.hidden)continue;if(e.description===undefined)continue;if(b.search&&e.name.indexOf(b.search)!==0)continue;if(!b.search&&e.name.indexOf(" ")!=-1)continue;if(e&&e.name==b.search)continue;d.push("<tr>"),d.push('<th class="right">'+e.name+"</th>"),d.push("<td>"+e.description+"</td>"),d.push("</tr>")}d.push("</table>")}c.done(d.join(""))}},evalCommandSpec={name:"eval",params:[{name:"javascript",type:"text",description:"The JavaScript to evaluate"}],description:"evals given js code and show the result",hidden:!0,exec:function(env,args,request){var result,javascript=args.javascript;try{result=eval(javascript)}catch(e){result="<b>Error: "+e.message+"</b>"}var msg="",type="",x;if(checks.isFunction(result))msg=(result+"").replace(/\n/g,"<br>").replace(/ /g,"&#160"),type="function";else if(checks.isObject(result)){Array.isArray(result)?type="array":type="object";var items=[],value;for(x in result)result.hasOwnProperty(x)&&(checks.isFunction(result[x])?value="[function]":checks.isObject(result[x])?value="[object]":value=result[x],items.push({name:x,value:value}));items.sort(function(a,b){return a.name.toLowerCase()<b.name.toLowerCase()?-1:1});for(x=0;x<items.length;x++)msg+="<b>"+items[x].name+"</b>: "+items[x].value+"<br>"}else msg=result,type=typeof result;request.done("Result for eval <b>'"+javascript+"'</b>"+" (type: "+type+"): <br><br>"+msg)}},canon=require("pilot/canon");exports.startup=function(a,b){canon.addCommand(helpCommandSpec),canon.addCommand(evalCommandSpec)},exports.shutdown=function(a,b){canon.removeCommand(helpCommandSpec),canon.removeCommand(evalCommandSpec)}}),define("pilot/settings/canon",["require","exports","module"],function(a,b,c){var d={name:"historyLength",description:"How many typed commands do we recall for reference?",type:"number",defaultValue:50};b.startup=function(a,b){a.env.settings.addSetting(d)},b.shutdown=function(a,b){a.env.settings.removeSetting(d)}}),define("pilot/plugin_manager",["require","exports","module","pilot/promise"],function(a,b,c){var d=a("pilot/promise").Promise;b.REASONS={APP_STARTUP:1,APP_SHUTDOWN:2,PLUGIN_ENABLE:3,PLUGIN_DISABLE:4,PLUGIN_INSTALL:5,PLUGIN_UNINSTALL:6,PLUGIN_UPGRADE:7,PLUGIN_DOWNGRADE:8},b.Plugin=function(a){this.name=a,this.status=this.INSTALLED},b.Plugin.prototype={NEW:0,INSTALLED:1,REGISTERED:2,STARTED:3,UNREGISTERED:4,SHUTDOWN:5,install:function(b,c){var e=new d;if(this.status>this.NEW){e.resolve(this);return e}a([this.name],function(a){a.install&&a.install(b,c),this.status=this.INSTALLED,e.resolve(this)}.bind(this));return e},register:function(b,c){var e=new d;if(this.status!=this.INSTALLED){e.resolve(this);return e}a([this.name],function(a){a.register&&a.register(b,c),this.status=this.REGISTERED,e.resolve(this)}.bind(this));return e},startup:function(c,e){e=e||b.REASONS.APP_STARTUP;var f=new d;if(this.status!=this.REGISTERED){f.resolve(this);return f}a([this.name],function(a){a.startup&&a.startup(c,e),this.status=this.STARTED,f.resolve(this)}.bind(this));return f},shutdown:function(b,c){this.status==this.STARTED&&(pluginModule=a(this.name),pluginModule.shutdown&&pluginModule.shutdown(b,c))}},b.PluginCatalog=function(){this.plugins={}},b.PluginCatalog.prototype={registerPlugins:function(a,c,e){var f=[];a.forEach(function(a){var d=this.plugins[a];d===undefined&&(d=new b.Plugin(a),this.plugins[a]=d,f.push(d.register(c,e)))}.bind(this));return d.group(f)},startupPlugins:function(a,b){var c=[];for(var e in this.plugins){var f=this.plugins[e];c.push(f.startup(a,b))}return d.group(c)}},b.catalog=new b.PluginCatalog}),define("pilot/promise",["require","exports","module","pilot/console","pilot/stacktrace"],function(a,b,c){var d=a("pilot/console"),e=a("pilot/stacktrace").Trace,f=-1,g=0,h=1,i=0,j=!1,k=[],l=[];Promise=function(){this._status=g,this._value=undefined,this._onSuccessHandlers=[],this._onErrorHandlers=[],this._id=i++,k[this._id]=this},Promise.prototype.isPromise=!0,Promise.prototype.isComplete=function(){return this._status!=g},Promise.prototype.isResolved=function(){return this._status==h},Promise.prototype.isRejected=function(){return this._status==f},Promise.prototype.then=function(a,b){typeof a=="function"&&(this._status===h?a.call(null,this._value):this._status===g&&this._onSuccessHandlers.push(a)),typeof b=="function"&&(this._status===f?b.call(null,this._value):this._status===g&&this._onErrorHandlers.push(b));return this},Promise.prototype.chainPromise=function(a){var b=new Promise;b._chainedFrom=this,this.then(function(c){try{b.resolve(a(c))}catch(d){b.reject(d)}},function(a){b.reject(a)});return b},Promise.prototype.resolve=function(a){return this._complete(this._onSuccessHandlers,h,a,"resolve")},Promise.prototype.reject=function(a){return this._complete(this._onErrorHandlers,f,a,"reject")},Promise.prototype._complete=function(a,b,c,f){if(this._status!=g){d.group("Promise already closed"),d.error("Attempted "+f+"() with ",c),d.error("Previous status = ",this._status,", previous value = ",this._value),d.trace(),this._completeTrace&&(d.error("Trace of previous completion:"),this._completeTrace.log(5)),d.groupEnd();return this}j&&(this._completeTrace=new e(new Error)),this._status=b,this._value=c,a.forEach(function(a){a.call(null,this._value)},this),this._onSuccessHandlers.length=0,this._onErrorHandlers.length=0,delete k[this._id],l.push(this);while(l.length>20)l.shift();return this},Promise.group=function(a){a instanceof Array||(a=Array.prototype.slice.call(arguments));if(a.length===0)return(new Promise).resolve([]);var b=new Promise,c=[],d=0,e=function(e){return function(g){c[e]=g,d++,b._status!==f&&d===a.length&&b.resolve(c)}};a.forEach(function(a,c){var d=e(c),f=b.reject.bind(b);a.then(d,f)});return b},b.Promise=Promise,b._outstanding=k,b._recent=l}),define("pilot/dom",["require","exports","module"],function(a,b,c){var d="http://www.w3.org/1999/xhtml";b.createElement=function(a,b){return document.createElementNS?document.createElementNS(b||d,a):document.createElement(a)},b.setText=function(a,b){a.innerText!==undefined&&(a.innerText=b),a.textContent!==undefined&&(a.textContent=b)},document.documentElement.classList?(b.hasCssClass=function(a,b){return a.classList.contains(b)},b.addCssClass=function(a,b){a.classList.add(b)},b.removeCssClass=function(a,b){a.classList.remove(b)},b.toggleCssClass=function(a,b){return a.classList.toggle(b)}):(b.hasCssClass=function(a,b){var c=a.className.split(/\s+/g);return c.indexOf(b)!==-1},b.addCssClass=function(a,c){b.hasCssClass(a,c)||(a.className+=" "+c)},b.removeCssClass=function(a,b){var c=a.className.split(/\s+/g);for(;;){var d=c.indexOf(b);if(d==-1)break;c.splice(d,1)}a.className=c.join(" ")},b.toggleCssClass=function(a,b){var c=a.className.split(/\s+/g),d=!0;for(;;){var e=c.indexOf(b);if(e==-1)break;d=!1,c.splice(e,1)}d&&c.push(b),a.className=c.join(" ");return d}),b.setCssClass=function(a,c,d){d?b.addCssClass(a,c):b.removeCssClass(a,c)},b.importCssString=function(a,b){b=b||document;if(b.createStyleSheet){var c=b.createStyleSheet();c.cssText=a}else{var e=b.createElementNS?b.createElementNS(d,"style"):b.createElement("style");e.appendChild(b.createTextNode(a));var f=b.getElementsByTagName("head")[0]||b.documentElement;f.appendChild(e)}},b.getInnerWidth=function(a){return parseInt(b.computedStyle(a,"paddingLeft"))+parseInt(b.computedStyle(a,"paddingRight"))+a.clientWidth},b.getInnerHeight=function(a){return parseInt(b.computedStyle(a,"paddingTop"))+parseInt(b.computedStyle(a,"paddingBottom"))+a.clientHeight},window.pageYOffset!==undefined?(b.getPageScrollTop=function(){return window.pageYOffset},b.getPageScrollLeft=function(){return window.pageXOffset}):(b.getPageScrollTop=function(){return document.body.scrollTop},b.getPageScrollLeft=function(){return document.body.scrollLeft}),window.getComputedStyle?b.computedStyle=function(a,b){return b?(window.getComputedStyle(a,"")||{})[b]||"":window.getComputedStyle(a,"")||{}}:b.computedStyle=function(a,b){return b?a.currentStyle[b]:a.currentStyle},b.scrollbarWidth=function(){var a=b.createElement("p");a.style.width="100%",a.style.minWidth="0px",a.style.height="200px";var c=b.createElement("div"),d=c.style;d.position="absolute",d.left="-10000px",d.overflow="hidden",d.width="200px",d.minWidth="0px",d.height="150px",c.appendChild(a);var e=document.body||document.documentElement;e.appendChild(c);var f=a.offsetWidth;d.overflow="scroll";var g=a.offsetWidth;f==g&&(g=c.clientWidth),e.removeChild(c);return f-g},b.setInnerHtml=function(a,b){var c=a.cloneNode(!1);c.innerHTML=b,a.parentNode.replaceChild(c,a);return c},b.setInnerText=function(a,b){document.body&&"textContent"in document.body?a.textContent=b:a.innerText=b},b.getInnerText=function(a){return document.body&&"textContent"in document.body?a.textContent:a.innerText||a.textContent||""},b.getParentWindow=function(a){return a.defaultView||a.parentWindow},b.getSelectionStart=function(a){var b;try{b=a.selectionStart||0}catch(c){b=0}return b},b.setSelectionStart=function(a,b){return a.selectionStart=b},b.getSelectionEnd=function(a){var b;try{b=a.selectionEnd||0}catch(c){b=0}return b},b.setSelectionEnd=function(a,b){return a.selectionEnd=b}}),define("pilot/event",["require","exports","module","pilot/keys","pilot/useragent","pilot/dom"],function(a,b,c){function g(a,b,c){var f=0;e.isOpera&&e.isMac?f=0|(b.metaKey?1:0)|(b.altKey?2:0)|(b.shiftKey?4:0)|(b.ctrlKey?8:0):f=0|(b.ctrlKey?1:0)|(b.altKey?2:0)|(b.shiftKey?4:0)|(b.metaKey?8:0);if(c in d.MODIFIER_KEYS){switch(d.MODIFIER_KEYS[c]){case"Alt":f=2;break;case"Shift":f=4;break;case"Ctrl":f=1;break;default:f=8}c=0}f&8&&(c==91||c==93)&&(c=0);return f!=0||c in d.FUNCTION_KEYS?a(b,f,c):!1}var d=a("pilot/keys"),e=a("pilot/useragent"),f=a("pilot/dom");b.addListener=function(a,b,c){if(a.addEventListener)return a.addEventListener(b,c,!1);if(a.attachEvent){var d=function(){c(window.event)};c._wrapper=d,a.attachEvent("on"+b,d)}},b.removeListener=function(a,b,c){if(a.removeEventListener)return a.removeEventListener(b,c,!1);a.detachEvent&&a.detachEvent("on"+b,c._wrapper||c)},b.stopEvent=function(a){b.stopPropagation(a),b.preventDefault(a);return!1},b.stopPropagation=function(a){a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},b.preventDefault=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},b.getDocumentX=function(a){return a.clientX?a.clientX+f.getPageScrollLeft():a.pageX},b.getDocumentY=function(a){return a.clientY?a.clientY+f.getPageScrollTop():a.pageY},b.getButton=function(a){if(a.type=="dblclick")return 0;if(a.type=="contextmenu")return 2;return a.preventDefault?a.button:{1:0,2:2,4:1}[a.button]},document.documentElement.setCapture?b.capture=function(a,c,d){function f(e){c&&c(e),d&&d(),b.removeListener(a,"mousemove",c),b.removeListener(a,"mouseup",f),b.removeListener(a,"losecapture",f),a.releaseCapture()}function e(a){c(a);return b.stopPropagation(a)}b.addListener(a,"mousemove",c),b.addListener(a,"mouseup",f),b.addListener(a,"losecapture",f),a.setCapture()}:b.capture=function(a,b,c){function e(a){b&&b(a),c&&c(),document.removeEventListener("mousemove",d,!0),document.removeEventListener("mouseup",e,!0),a.stopPropagation()}function d(a){b(a),a.stopPropagation()}document.addEventListener("mousemove",d,!0),document.addEventListener("mouseup",e,!0)},b.addMouseWheelListener=function(a,c){var d=function(a){a.wheelDelta!==undefined?a.wheelDeltaX!==undefined?(a.wheelX=-a.wheelDeltaX/8,a.wheelY=-a.wheelDeltaY/8):(a.wheelX=0,a.wheelY=-a.wheelDelta/8):a.axis&&a.axis==a.HORIZONTAL_AXIS?(a.wheelX=(a.detail||0)*5,a.wheelY=0):(a.wheelX=0,a.wheelY=(a.detail||0)*5),c(a)};b.addListener(a,"DOMMouseScroll",d),b.addListener(a,"mousewheel",d)},b.addMultiMouseDownListener=function(a,c,d,f,g){var h=0,i,j,k=function(a){h+=1,h==1&&(i=a.clientX,j=a.clientY,setTimeout(function(){h=0},f||600));var e=b.getButton(a)==c;if(!e||Math.abs(a.clientX-i)>5||Math.abs(a.clientY-j)>5)h=0;h==d&&(h=0,g(a));if(e)return b.preventDefault(a)};b.addListener(a,"mousedown",k),e.isIE&&b.addListener(a,"dblclick",k)},b.addCommandKeyListener=function(a,c){var d=b.addListener;if(e.isOldGecko){var f=null;d(a,"keydown",function(a){f=a.keyCode}),d(a,"keypress",function(a){return g(c,a,f)})}else{var h=null;d(a,"keydown",function(a){h=a.keyIdentifier||a.keyCode;return g(c,a,a.keyCode)}),e.isMac&&e.isOpera&&d(a,"keypress",function(a){var b=a.keyIdentifier||a.keyCode;if(h!==b)return g(c,a,a.keyCode);h=null})}}}),define("ace/editor",["require","exports","module","pilot/fixoldbrowsers","pilot/oop","pilot/event","pilot/lang","pilot/useragent","ace/keyboard/textinput","ace/mouse_handler","ace/keyboard/keybinding","ace/edit_session","ace/search","ace/range","pilot/event_emitter"],function(a,b,c){a("pilot/fixoldbrowsers");var d=a("pilot/oop"),e=a("pilot/event"),f=a("pilot/lang"),g=a("pilot/useragent"),h=a("ace/keyboard/textinput").TextInput,i=a("ace/mouse_handler").MouseHandler,j=a("ace/keyboard/keybinding").KeyBinding,k=a("ace/edit_session").EditSession,l=a("ace/search").Search,m=a("ace/range").Range,n=a("pilot/event_emitter").EventEmitter,o=function(a,b){var c=a.getContainerElement();this.container=c,this.renderer=a,this.textInput=new h(a.getTextAreaContainer(),this),this.keyBinding=new j(this),g.isIPad||(this.$mouseHandler=new i(this)),this.$blockScrolling=0,this.$search=(new l).set({wrap:!0}),this.setSession(b||new k(""))};(function(){d.implement(this,n),this.$forwardEvents={gutterclick:1,gutterdblclick:1},this.$originalAddEventListener=this.addEventListener,this.$originalRemoveEventListener=this.removeEventListener,this.addEventListener=function(a,b){return this.$forwardEvents[a]?this.renderer.addEventListener(a,b):this.$originalAddEventListener(a,b)},this.removeEventListener=function(a,b){return this.$forwardEvents[a]?this.renderer.removeEventListener(a,b):this.$originalRemoveEventListener(a,b)},this.setKeyboardHandler=function(a){this.keyBinding.setKeyboardHandler(a)},this.getKeyboardHandler=function(){return this.keyBinding.getKeyboardHandler()},this.setSession=function(a){if(this.session!=a){if(this.session){var b=this.session;this.session.removeEventListener("change",this.$onDocumentChange),this.session.removeEventListener("changeMode",this.$onChangeMode),this.session.removeEventListener("tokenizerUpdate",this.$onTokenizerUpdate),this.session.removeEventListener("changeTabSize",this.$onChangeTabSize),this.session.removeEventListener("changeWrapLimit",this.$onChangeWrapLimit),this.session.removeEventListener("changeWrapMode",this.$onChangeWrapMode),this.session.removeEventListener("onChangeFold",this.$onChangeFold),this.session.removeEventListener("changeFrontMarker",this.$onChangeFrontMarker),this.session.removeEventListener("changeBackMarker",this.$onChangeBackMarker),this.session.removeEventListener("changeBreakpoint",this.$onChangeBreakpoint),this.session.removeEventListener("changeAnnotation",this.$onChangeAnnotation),this.session.removeEventListener("changeOverwrite",this.$onCursorChange);var c=this.session.getSelection();c.removeEventListener("changeCursor",this.$onCursorChange),c.removeEventListener("changeSelection",this.$onSelectionChange),this.session.setScrollTopRow(this.renderer.getScrollTopRow())}this.session=a,this.$onDocumentChange=this.onDocumentChange.bind(this),a.addEventListener("change",this.$onDocumentChange),this.renderer.setSession(a),this.$onChangeMode=this.onChangeMode.bind(this),a.addEventListener("changeMode",this.$onChangeMode),this.$onTokenizerUpdate=this.onTokenizerUpdate.bind(this),a.addEventListener("tokenizerUpdate",this.$onTokenizerUpdate),this.$onChangeTabSize=this.renderer.updateText.bind(this.renderer),a.addEventListener("changeTabSize",this.$onChangeTabSize),this.$onChangeWrapLimit=this.onChangeWrapLimit.bind(this),a.addEventListener("changeWrapLimit",this.$onChangeWrapLimit),this.$onChangeWrapMode=this.onChangeWrapMode.bind(this),a.addEventListener("changeWrapMode",this.$onChangeWrapMode),this.$onChangeFold=this.onChangeFold.bind(this),a.addEventListener("changeFold",this.$onChangeFold),this.$onChangeFrontMarker=this.onChangeFrontMarker.bind(this),this.session.addEventListener("changeFrontMarker",this.$onChangeFrontMarker),this.$onChangeBackMarker=this.onChangeBackMarker.bind(this),this.session.addEventListener("changeBackMarker",this.$onChangeBackMarker),this.$onChangeBreakpoint=this.onChangeBreakpoint.bind(this),this.session.addEventListener("changeBreakpoint",this.$onChangeBreakpoint),this.$onChangeAnnotation=this.onChangeAnnotation.bind(this),this.session.addEventListener("changeAnnotation",this.$onChangeAnnotation),this.$onCursorChange=this.onCursorChange.bind(this),this.session.addEventListener("changeOverwrite",this.$onCursorChange),this.selection=a.getSelection(),this.selection.addEventListener("changeCursor",this.$onCursorChange),this.$onSelectionChange=this.onSelectionChange.bind(this),this.selection.addEventListener("changeSelection",this.$onSelectionChange),this.onChangeMode(),this.onCursorChange(),this.onSelectionChange(),this.onChangeFrontMarker(),this.onChangeBackMarker(),this.onChangeBreakpoint(),this.onChangeAnnotation(),this.session.getUseWrapMode()&&this.renderer.adjustWrapLimit(),this.renderer.scrollToRow(a.getScrollTopRow()),this.renderer.updateFull(),this._dispatchEvent("changeSession",{session:a,oldSession:b})}},this.getSession=function(){return this.session},this.getSelection=function(){return this.selection},this.resize=function(){this.renderer.onResize()},this.setTheme=function(a){this.renderer.setTheme(a)},this.getTheme=function(){return this.renderer.getTheme()},this.setStyle=function(a){this.renderer.setStyle(a)},this.unsetStyle=function(a){this.renderer.unsetStyle(a)},this.setFontSize=function(a){this.container.style.fontSize=a},this.$highlightBrackets=function(){this.session.$bracketHighlight&&(this.session.removeMarker(this.session.$bracketHighlight),this.session.$bracketHighlight=null);if(!this.$highlightPending){var a=this;this.$highlightPending=!0,setTimeout(function(){a.$highlightPending=!1;var b=a.session.findMatchingBracket(a.getCursorPosition());if(b){var c=new m(b.row,b.column,b.row,b.column+1);a.session.$bracketHighlight=a.session.addMarker(c,"ace_bracket","text")}},10)}},this.focus=function(){var a=this;g.isIE||setTimeout(function(){a.textInput.focus()}),this.textInput.focus()},this.isFocused=function(){return this.textInput.isFocused()},this.blur=function(){this.textInput.blur()},this.onFocus=function(){this.renderer.showCursor(),this.renderer.visualizeFocus(),this._dispatchEvent("focus")},this.onBlur=function(){this.renderer.hideCursor(),this.renderer.visualizeBlur(),this._dispatchEvent("blur")},this.onDocumentChange=function(a){var b=a.data,c=b.range;if(c.start.row==c.end.row&&b.action!="insertLines"&&b.action!="removeLines")var d=c.end.row;else d=Infinity;this.renderer.updateLines(c.start.row,d),this.renderer.updateCursor()},this.onTokenizerUpdate=function(a){var b=a.data;this.renderer.updateLines(b.first,b.last)},this.onCursorChange=function(a){this.renderer.updateCursor(),this.$blockScrolling||this.renderer.scrollCursorIntoView(),this.renderer.moveTextAreaToCursor(this.textInput.getElement()),this.$highlightBrackets(),this.$updateHighlightActiveLine()},this.$updateHighlightActiveLine=function(){var a=this.getSession();a.$highlightLineMarker&&a.removeMarker(a.$highlightLineMarker),a.$highlightLineMarker=null;if(this.getHighlightActiveLine()&&(this.getSelectionStyle()!="line"||!this.selection.isMultiLine())){var b=this.getCursorPosition(),c=this.session.getFoldLine(b.row),d;c?d=new m(c.start.row,0,c.end.row+1,0):d=new m(b.row,0,b.row+1,0),a.$highlightLineMarker=a.addMarker(d,"ace_active_line","background")}},this.onSelectionChange=function(a){var b=this.getSession();b.$selectionMarker&&b.removeMarker(b.$selectionMarker),b.$selectionMarker=null;if(!this.selection.isEmpty()){var c=this.selection.getRange(),d=this.getSelectionStyle();b.$selectionMarker=b.addMarker(c,"ace_selection",d)}else this.$updateHighlightActiveLine();this.$highlightSelectedWord&&this.session.getMode().highlightSelection(this)},this.onChangeFrontMarker=function(){this.renderer.updateFrontMarkers()},this.onChangeBackMarker=function(){this.renderer.updateBackMarkers()},this.onChangeBreakpoint=function(){this.renderer.setBreakpoints(this.session.getBreakpoints())},this.onChangeAnnotation=function(){this.renderer.setAnnotations(this.session.getAnnotations())},this.onChangeMode=function(){this.renderer.updateText()},this.onChangeWrapLimit=function(){this.renderer.updateFull()},this.onChangeWrapMode=function(){this.renderer.onResize(!0)},this.onChangeFold=function(){this.$updateHighlightActiveLine(),this.renderer.updateFull()},this.getCopyText=function(){return this.selection.isEmpty()?"":this.session.getTextRange(this.getSelectionRange())},this.onCut=function(){this.$readOnly||this.selection.isEmpty()||(this.session.remove(this.getSelectionRange()),this.clearSelection())},this.insert=function(a){if(!this.$readOnly){var b=this.session,c=b.getMode(),d=this.getCursorPosition();if(this.getBehavioursEnabled()){var e=c.transformAction(b.getState(d.row),"insertion",this,b,a);e&&(a=e.text)}a=a.replace("\t",this.session.getTabString());if(!this.selection.isEmpty()){var d=this.session.remove(this.getSelectionRange());this.clearSelection()}else if(this.session.getOverwrite()){var f=new m.fromPoints(d,d);f.end.column+=a.length,this.session.remove(f)}this.clearSelection();var g=d.column,h=b.getState(d.row),i=c.checkOutdent(h,b.getLine(d.row),a),j=b.getLine(d.row),k=c.getNextLineIndent(h,j.slice(0,d.column),b.getTabString()),l=b.insert(d,a);e&&e.selection&&(e.selection.length==2?this.selection.setSelectionRange(new m(d.row,g+e.selection[0],d.row,g+e.selection[1])):this.selection.setSelectionRange(new m(d.row+e.selection[0],e.selection[1],d.row+e.selection[2],e.selection[3])));var h=b.getState(d.row);if(b.getDocument().isNewLine(a)){this.moveCursorTo(d.row+1,0);var n=b.getTabSize(),o=Number.MAX_VALUE;for(var p=d.row+1;p<=l.row;++p){var q=0;j=b.getLine(p);for(var r=0;r<j.length;++r)if(j.charAt(r)=="\t")q+=n;else if(j.charAt(r)==" ")q+=1;else break;/[^\s]/.test(j)&&(o=Math.min(q,o))}for(var p=d.row+1;p<=l.row;++p){var s=o;j=b.getLine(p);for(var r=0;r<j.length&&s>0;++r)j.charAt(r)=="\t"?s-=n:j.charAt(r)==" "&&(s-=1);b.remove(new m(p,0,p,r))}b.indentRows(d.row+1,l.row,k)}else i&&c.autoOutdent(h,b,d.row)}},this.onTextInput=function(a,b){if(b&&a.length==1){var c=this.keyBinding.onCommandKey({},0,null,a);c||this.insert(a)}else this.keyBinding.onTextInput(a)},this.onCommandKey=function(a,b,c){this.keyBinding.onCommandKey(a,b,c)},this.setOverwrite=function(a){this.session.setOverwrite(a)},this.getOverwrite=function(){return this.session.getOverwrite()},this.toggleOverwrite=function(){this.session.toggleOverwrite()},this.setScrollSpeed=function(a){this.$mouseHandler.setScrollSpeed(a)},this.getScrollSpeed=function(){return this.$mouseHandler.getScrollSpeed()},this.$selectionStyle="line",this.setSelectionStyle=function(a){this.$selectionStyle!=a&&(this.$selectionStyle=a,this.onSelectionChange(),this._dispatchEvent("changeSelectionStyle",{data:a}))},this.getSelectionStyle=function(){return this.$selectionStyle},this.$highlightActiveLine=!0,this.setHighlightActiveLine=function(a){this.$highlightActiveLine!=a&&(this.$highlightActiveLine=a,this.$updateHighlightActiveLine())},this.getHighlightActiveLine=function(){return this.$highlightActiveLine},this.$highlightSelectedWord=!0,this.setHighlightSelectedWord=function(a){this.$highlightSelectedWord!=a&&(this.$highlightSelectedWord=a,a?this.session.getMode().highlightSelection(this):this.session.getMode().clearSelectionHighlight(this))},this.getHighlightSelectedWord=function(){return this.$highlightSelectedWord},this.setShowInvisibles=function(a){this.getShowInvisibles()!=a&&this.renderer.setShowInvisibles(a)},this.getShowInvisibles=function(){return this.renderer.getShowInvisibles()},this.setShowPrintMargin=function(a){this.renderer.setShowPrintMargin(a)},this.getShowPrintMargin=function(){return this.renderer.getShowPrintMargin()},this.setPrintMarginColumn=function(a){this.renderer.setPrintMarginColumn(a)},this.getPrintMarginColumn=function(){return this.renderer.getPrintMarginColumn()},this.$readOnly=!1,this.setReadOnly=function(a){this.$readOnly=a},this.getReadOnly=function(){return this.$readOnly},this.$modeBehaviours=!0,this.setBehavioursEnabled=function(a){this.$modeBehaviours=a},this.getBehavioursEnabled=function(){return this.$modeBehaviours},this.removeRight=function(){this.$readOnly||(this.selection.isEmpty()&&this.selection.selectRight(),this.session.remove(this.getSelectionRange()),this.clearSelection())},this.removeLeft=function(){if(!this.$readOnly){this.selection.isEmpty()&&this.selection.selectLeft();var a=this.getSelectionRange();if(this.getBehavioursEnabled()){var b=this.session,c=b.getState(a.start.row),d=b.getMode().transformAction(c,"deletion",this,b,a);d!==!1&&(a=d)}this.session.remove(a),this.clearSelection()}},this.removeWordRight=function(){this.$readOnly||(this.selection.isEmpty()&&this.selection.selectWordRight(),this.session.remove(this.getSelectionRange()),this.clearSelection())},this.removeWordLeft=function(){this.$readOnly||(this.selection.isEmpty()&&this.selection.selectWordLeft(),this.session.remove(this.getSelectionRange()),this.clearSelection())},this.removeToLineStart=function(){this.$readOnly||(this.selection.isEmpty()&&this.selection.selectLineStart(),this.session.remove(this.getSelectionRange()),this.clearSelection())},this.removeToLineEnd=function(){if(!this.$readOnly){this.selection.isEmpty()&&this.selection.selectLineEnd();var a=this.getSelectionRange();a.start.column==a.end.column&&a.start.row==a.end.row&&(a.end.column=0,a.end.row++),this.session.remove(a),this.clearSelection()}},this.splitLine=function(){if(!this.$readOnly){this.selection.isEmpty()||(this.session.remove(this.getSelectionRange()),this.clearSelection());var a=this.getCursorPosition();this.insert("\n"),this.moveCursorToPosition(a)}},this.transposeLetters=function(){if(!this.$readOnly){if(!this.selection.isEmpty())return;var a=this.getCursorPosition(),b=a.column;if(b==0)return;var c=this.session.getLine(a.row);if(b<c.length)var d=c.charAt(b)+c.charAt(b-1),e=new m(a.row,b-1,a.row,b+1);else var d=c.charAt(b-1)+c.charAt(b-2),e=new m(a.row,b-2,a.row,b);this.session.replace(e,d)}},this.indent=function(){if(!this.$readOnly){var a=this.session,b=this.getSelectionRange();if(!(b.start.row<b.end.row||b.start.column<b.end.column)){var d;if(this.session.getUseSoftTabs()){var e=a.getTabSize(),g=this.getCursorPosition(),h=a.documentToScreenColumn(g.row,g.column),i=e-h%e;d=f.stringRepeat(" ",i)}else d="\t";return this.onTextInput(d)}var c=this.$getSelectedRows();a.indentRows(c.first,c.last,"\t")}},this.blockOutdent=function(){if(!this.$readOnly){var a=this.session.getSelection();this.session.outdentRows(a.getRange())}},this.toggleCommentLines=function(){if(!this.$readOnly){var a=this.session.getState(this.getCursorPosition().row),b=this.$getSelectedRows();this.session.getMode().toggleCommentLines(a,this.session,b.first,b.last)}},this.removeLines=function(){if(!this.$readOnly){var a=this.$getSelectedRows();if(a.last==0||a.last+1<this.session.getLength())var b=new m(a.first,0,a.last+1,0);else var b=new m(a.first-1,this.session.getLine(a.first).length,a.last,this.session.getLine(a.last).length);this.session.remove(b),this.clearSelection()}},this.moveLinesDown=function(){this.$readOnly||this.$moveLines(function(a,b){return this.session.moveLinesDown(a,b)})},this.moveLinesUp=function(){this.$readOnly||this.$moveLines(function(a,b){return this.session.moveLinesUp(a,b)})},this.moveText=function(a,b){return this.$readOnly?null:this.session.moveText(a,b)},this.copyLinesUp=function(){this.$readOnly||this.$moveLines(function(a,b){this.session.duplicateLines(a,b);return 0})},this.copyLinesDown=function(){this.$readOnly||this.$moveLines(function(a,b){return this.session.duplicateLines(a,b)})},this.$moveLines=function(a){var b=this.$getSelectedRows(),c=a.call(this,b.first,b.last),d=this.selection;d.setSelectionAnchor(b.last+c+1,0),d.$moveSelection(function(){d.moveCursorTo(b.first+c,0)})},this.$getSelectedRows=function(){var a=this.getSelectionRange().collapseRows();return{first:a.start.row,last:a.end.row}},this.onCompositionStart=function(a){this.renderer.showComposition(this.getCursorPosition())},this.onCompositionUpdate=function(a){this.renderer.setCompositionText(a)},this.onCompositionEnd=function(){this.renderer.hideComposition()},this.getFirstVisibleRow=function(){return this.renderer.getFirstVisibleRow()},this.getLastVisibleRow=function(){return this.renderer.getLastVisibleRow()},this.isRowVisible=function(a){return a>=this.getFirstVisibleRow()&&a<=this.getLastVisibleRow()},this.$getVisibleRowCount=function(){return this.renderer.getScrollBottomRow()-this.renderer.getScrollTopRow()+1},this.$getPageDownRow=function(){return this.renderer.getScrollBottomRow()},this.$getPageUpRow=function(){var a=this.renderer.getScrollTopRow(),b=this.renderer.getScrollBottomRow();return a-(b-a)},this.selectPageDown=function(){var a=this.$getPageDownRow()+Math.floor(this.$getVisibleRowCount()/2);this.scrollPageDown();var b=this.getSelection(),c=this.session.documentToScreenPosition(b.getSelectionLead()),d=this.session.screenToDocumentPosition(a,c.column);b.selectTo(d.row,d.column)},this.selectPageUp=function(){var a=this.renderer.getScrollTopRow()-this.renderer.getScrollBottomRow(),b=this.$getPageUpRow()+Math.round(a/2);this.scrollPageUp();var c=this.getSelection(),d=this.session.documentToScreenPosition(c.getSelectionLead()),e=this.session.screenToDocumentPosition(b,d.column);c.selectTo(e.row,e.column)},this.gotoPageDown=function(){var a=this.$getPageDownRow(),b=this.getCursorPositionScreen().column;this.scrollToRow(a),this.getSelection().moveCursorToScreen(a,b)},this.gotoPageUp=function(){var a=this.$getPageUpRow(),b=this.getCursorPositionScreen().column;this.scrollToRow(a),this.getSelection().moveCursorToScreen(a,b)},this.scrollPageDown=function(){this.scrollToRow(this.$getPageDownRow())},this.scrollPageUp=function(){this.renderer.scrollToRow(this.$getPageUpRow())},this.scrollToRow=function(a){this.renderer.scrollToRow(a)},this.scrollToLine=function(a,b){this.renderer.scrollToLine(a,b)},this.centerSelection=function(){var a=this.getSelectionRange(),b=Math.floor(a.start.row+(a.end.row-a.start.row)/2);this.renderer.scrollToLine(b,!0)},this.getCursorPosition=function(){return this.selection.getCursor()},this.getCursorPositionScreen=function(){return this.session.documentToScreenPosition(this.getCursorPosition())},this.getSelectionRange=function(){return this.selection.getRange()},this.selectAll=function(){this.$blockScrolling+=1,this.selection.selectAll(),this.$blockScrolling-=1},this.clearSelection=function(){this.selection.clearSelection()},this.moveCursorTo=function(a,b){this.selection.moveCursorTo(a,b)},this.moveCursorToPosition=function(a){this.selection.moveCursorToPosition(a)},this.gotoLine=function(a,b){this.selection.clearSelection(),this.$blockScrolling+=1,this.moveCursorTo(a-1,b||0),this.$blockScrolling-=1,this.isRowVisible(this.getCursorPosition().row)||this.scrollToLine(a,!0)},this.navigateTo=function(a,b){this.clearSelection(),this.moveCursorTo(a,b)},this.navigateUp=function(a){this.selection.clearSelection(),a=a||1,this.selection.moveCursorBy(-a,0)},this.navigateDown=function(a){this.selection.clearSelection(),a=a||1,this.selection.moveCursorBy(a,0)},this.navigateLeft=function(a){if(!this.selection.isEmpty()){var b=this.getSelectionRange().start;this.moveCursorToPosition(b)}else{a=a||1;while(a--)this.selection.moveCursorLeft()}this.clearSelection()},this.navigateRight=function(a){if(!this.selection.isEmpty()){var b=this.getSelectionRange().end;this.moveCursorToPosition(b)}else{a=a||1;while(a--)this.selection.moveCursorRight()}this.clearSelection()},this.navigateLineStart=function(){this.selection.moveCursorLineStart(),this.clearSelection()},this.navigateLineEnd=function(){this.selection.moveCursorLineEnd(),this.clearSelection()},this.navigateFileEnd=function(){this.selection.moveCursorFileEnd(),this.clearSelection()},this.navigateFileStart=function(){this.selection.moveCursorFileStart(),this.clearSelection()},this.navigateWordRight=function(){this.selection.moveCursorWordRight(),this.clearSelection()},this.navigateWordLeft=function(){this.selection.moveCursorWordLeft(),this.clearSelection()},this.replace=function(a,b){b&&this.$search.set(b);var c=this.$search.find(this.session);!c||(this.$tryReplace(c,a),c!==null&&this.selection.setSelectionRange(c))},this.replaceAll=function(a,b){b&&this.$search.set(b);var c=this.$search.findAll(this.session);if(!!c.length){var d=this.getSelectionRange();this.clearSelection(),this.selection.moveCursorTo(0,0),this.$blockScrolling+=1;for(var e=c.length-1;e>=0;--e)this.$tryReplace(c[e],a);this.selection.setSelectionRange(d),this.$blockScrolling-=1}},this.$tryReplace=function(a,b){var c=this.session.getTextRange(a),b=this.$search.replace(c,b);if(b!==null){a.end=this.session.replace(a,b);return a}return null},this.getLastSearchOptions=function(){return this.$search.getOptions()},this.find=function(a,b){this.clearSelection(),b=b||{},b.needle=a,this.$search.set(b),this.$find()},this.findNext=function(a){a=a||{},typeof a.backwards=="undefined"&&(a.backwards=!1),this.$search.set(a),this.$find()},this.findPrevious=function(a){a=a||{},typeof a.backwards=="undefined"&&(a.backwards=!0),this.$search.set(a),this.$find()},this.$find=function(a){this.selection.isEmpty()||this.$search.set({needle:this.session.getTextRange(this.getSelectionRange())}),typeof a!="undefined"&&this.$search.set({backwards:a});var b=this.$search.find(this.session);b&&(this.gotoLine(b.end.row+1,b.end.column),this.selection.setSelectionRange(b))},this.undo=function(){this.session.getUndoManager().undo()},this.redo=function(){this.session.getUndoManager().redo()},this.destroy=function(){this.renderer.destroy()}}).call(o.prototype),b.Editor=o}),define("ace/keyboard/textinput",["require","exports","module","pilot/event","pilot/useragent","pilot/dom"],function(a,b,c){var d=a("pilot/event"),e=a("pilot/useragent"),f=a("pilot/dom"),g=function(a,b){function u(){return document.activeElement===c}function l(a){if(!i){var d=a||c.value;if(d){d.charCodeAt(d.length-1)==g.charCodeAt(0)?(d=d.slice(0,-1),d&&b.onTextInput(d,!j)):b.onTextInput(d,!j);if(!u())return!1}}i=!1,j=!1,c.value=g,c.select()}var c=f.createElement("textarea");c.style.left="-10000px",a.appendChild(c);var g=String.fromCharCode(0);l();var h=!1,i=!1,j=!1,k="",m=function(a){setTimeout(function(){h||l(a.data)},0)},n=function(a){e.isIE&&c.value.charCodeAt(0)>128||setTimeout(function(){h||l()},0)},o=function(a){h=!0,b.onCompositionStart(),e.isGecko||setTimeout(p,0)},p=function(){!h||b.onCompositionUpdate(c.value)},q=function(a){h=!1,b.onCompositionEnd()},r=function(a){i=!0;var d=b.getCopyText();d?c.value=d:a.preventDefault(),c.select(),setTimeout(function(){l()},0)},s=function(a){i=!0;var d=b.getCopyText();d?(c.value=d,b.onCut()):a.preventDefault(),c.select(),setTimeout(function(){l()},0)};d.addCommandKeyListener(c,b.onCommandKey.bind(b));if(e.isIE){var t={13:1,27:1};d.addListener(c,"keyup",function(a){h&&(!c.value||t[a.keyCode])&&setTimeout(q,0);(c.value.charCodeAt(0)|0)<129||(h?p():o())})}c.attachEvent?d.addListener(c,"propertychange",n):e.isChrome||e.isSafari?d.addListener(c,"textInput",m):e.isIE?d.addListener(c,"textinput",m):d.addListener(c,"input",m),d.addListener(c,"paste",function(a){j=!0,a.clipboardData&&a.clipboardData.getData?(l(a.clipboardData.getData("text/plain")),a.preventDefault()):n()}),e.isIE?(d.addListener(c,"beforecopy",function(a){var c=b.getCopyText();c?clipboardData.setData("Text",c):a.preventDefault()}),d.addListener(a,"keydown",function(a){if(a.ctrlKey&&a.keyCode==88){var c=b.getCopyText();c&&(clipboardData.setData("Text",c),b.onCut()),d.preventDefault(a)}})):(d.addListener(c,"copy",r),d.addListener(c,"cut",s)),d.addListener(c,"compositionstart",o),e.isGecko&&d.addListener(c,"text",p),e.isWebKit&&d.addListener(c,"keyup",p),d.addListener(c,"compositionend",q),d.addListener(c,"blur",function(){b.onBlur()}),d.addListener(c,"focus",function(){b.onFocus(),c.select()}),this.focus=function(){b.onFocus(),c.select(),c.focus()},this.blur=function(){c.blur()},this.isFocused=u,this.getElement=function(){return c},this.onContextMenu=function(a,b){a&&(k||(k=c.style.cssText),c.style.cssText="position:fixed; z-index:1000;left:"+(a.x-2)+"px; top:"+(a.y-2)+"px;"),b&&(c.value="")},this.onContextMenuClose=function(){setTimeout(function(){k&&(c.style.cssText=k,k=""),l()},0)}};b.TextInput=g}),define("ace/mouse_handler",["require","exports","module","pilot/event","pilot/dom","pilot/browser_focus"],function(a,b,c){var d=a("pilot/event"),e=a("pilot/dom"),f=a("pilot/browser_focus").BrowserFocus,g=0,h=1,i=2,j=250,k=5,l=function(a){this.editor=a,this.browserFocus=new f,d.addListener(a.container,"mousedown",function(b){a.focus();return d.preventDefault(b)}),d.addListener(a.container,"selectstart",function(a){return d.preventDefault(a)});var b=a.renderer.getMouseEventTarget();d.addListener(b,"mousedown",this.onMouseDown.bind(this)),d.addMultiMouseDownListener(b,0,2,500,this.onMouseDoubleClick.bind(this)),d.addMultiMouseDownListener(b,0,3,600,this.onMouseTripleClick.bind(this)),d.addMultiMouseDownListener(b,0,4,600,this.onMouseQuadClick.bind(this)),d.addMouseWheelListener(b,this.onMouseWheel.bind(this))};(function(){this.$scrollSpeed=1,this.setScrollSpeed=function(a){this.$scrollSpeed=a},this.getScrollSpeed=function(){return this.$scrollSpeed},this.$getEventPosition=function(a){var b=d.getDocumentX(a),c=d.getDocumentY(a),e=this.editor.renderer.screenToTextCoordinates(b,c);e.row=Math.max(0,Math.min(e.row,this.editor.session.getLength()-1));return e},this.$distance=function(a,b,c,d){return Math.sqrt(Math.pow(c-a,2)+Math.pow(d-b,2))},this.onMouseDown=function(a){function D(b){a.shiftKey?l.selection.selectToPosition(b):m.$clickSelection||(l.moveCursorToPosition(b),l.selection.clearSelection(b.row,b.column)),p=h}if(!(!this.browserFocus.isFocused()||(new Date).getTime()-this.browserFocus.lastFocus<20||!this.editor.isFocused())){var b=d.getDocumentX(a),c=d.getDocumentY(a),f=this.$getEventPosition(a),l=this.editor,m=this,n=l.getSelectionRange(),o=n.isEmpty(),p=g,q=!1,r=d.getButton(a);if(r!==0){o&&l.moveCursorToPosition(f),r==2&&(l.textInput.onContextMenu({x:b,y:c},o),d.capture(l.container,function(){},l.textInput.onContextMenuClose));return}var s=l.session.getFoldAt(f.row,f.column,1);if(s){l.selection.setSelectionRange(s.range);return}q=!l.getReadOnly()&&!o&&n.contains(f.row,f.column),q||D(f);var t,u,v=l.getOverwrite(),w=(new Date).getTime(),x,y,z=function(a){t=d.getDocumentX(a),u=d.getDocumentY(a)},A=function(){clearInterval(G),p==g?D(f):p==i&&B(),m.$clickSelection=null,p=g},B=function(){e.removeCssClass(l.container,"ace_dragging"),l.session.removeMarker(dragSelectionMarker),m.$clickSelection||x||(l.moveCursorToPosition(f),l.selection.clearSelection(f.row,f.column));if(!!x){if(y.contains(x.row,x.column)){x=null;return}l.clearSelection();var a=l.moveText(y,x);if(!a){x=null;return}l.selection.setSelectionRange(a)}},C=function(){if(t!==undefined&&u!==undefined){if(p==g){var a=m.$distance(b,c,t,u),d=(new Date).getTime();if(a>k){p=h;var f=l.renderer.screenToTextCoordinates(t,u);f.row=Math.max(0,Math.min(f.row,l.session.getLength()-1)),D(f)}else if(d-w>j){p=i,y=l.getSelectionRange();var n=l.getSelectionStyle();dragSelectionMarker=l.session.addMarker(y,"ace_selection",n),l.clearSelection(),e.addCssClass(l.container,"ace_dragging")}}p==i?F():p==h&&E()}},E=function(){var a=l.renderer.screenToTextCoordinates(t,u);a.row=Math.max(0,Math.min(a.row,l.session.getLength()-1));if(m.$clickSelection)if(m.$clickSelection.contains(a.row,a.column))l.selection.setSelectionRange(m.$clickSelection);else{if(m.$clickSelection.compare(a.row,a.column)==-1)var b=m.$clickSelection.end;else var b=m.$clickSelection.start;l.selection.setSelectionAnchor(b.row,b.column),l.selection.selectToPosition(a)}else l.selection.selectToPosition(a);l.renderer.scrollCursorIntoView()},F=function(){x=l.renderer.screenToTextCoordinates(t,u),x.row=Math.max(0,Math.min(x.row,l.session.getLength()-1)),l.moveCursorToPosition(x)};d.capture(l.container,z,A);var G=setInterval(C,20);return d.preventDefault(a)}},this.onMouseDoubleClick=function(a){var b=this.editor,c=this.$getEventPosition(a),d=b.session.getFoldAt(c.row,c.column,1);d?b.session.expandFold(d):(b.moveCursorToPosition(c),b.selection.selectWord(),this.$clickSelection=b.getSelectionRange())},this.onMouseTripleClick=function(a){var b=this.$getEventPosition(a);this.editor.moveCursorToPosition(b),this.editor.selection.selectLine(),this.$clickSelection=this.editor.getSelectionRange()},this.onMouseQuadClick=function(a){this.editor.selectAll(),this.$clickSelection=this.editor.getSelectionRange()},this.onMouseWheel=function(a){var b=this.$scrollSpeed*2;this.editor.renderer.scrollBy(a.wheelX*b,a.wheelY*b);return d.preventDefault(a)}}).call(l.prototype),b.MouseHandler=l}),define("pilot/browser_focus",["require","exports","module","pilot/oop","pilot/event","pilot/event_emitter"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event"),f=a("pilot/event_emitter").EventEmitter,g=function(a){a=a||window,this.lastFocus=(new Date).getTime(),this._isFocused=!0;var b=this;e.addListener(a,"blur",function(a){b._setFocused(!1)}),e.addListener(a,"focus",function(a){b._setFocused(!0)})};(function(){d.implement(this,f),this.isFocused=function(){return this._isFocused},this._setFocused=function(a){this._isFocused!=a&&(a&&(this.lastFocus=(new Date).getTime()),this._isFocused=a,this._emit("changeFocus"))}}).call(g.prototype),b.BrowserFocus=g}),define("ace/keyboard/keybinding",["require","exports","module","pilot/useragent","pilot/keys","pilot/event","pilot/settings","pilot/canon","ace/commands/default_commands"],function(a,b,c){var d=a("pilot/useragent"),e=a("pilot/keys"),f=a("pilot/event"),g=a("pilot/settings").settings,h=a("pilot/canon");a("ace/commands/default_commands");var i=function(a){this.$editor=a,this.$data={},this.$keyboardHandler=null};(function(){this.setKeyboardHandler=function(a){this.$keyboardHandler!=a&&(this.$data={},this.$keyboardHandler=a)},this.getKeyboardHandler=function(){return this.$keyboardHandler},this.$callKeyboardHandler=function(a,b,c,d){var e={editor:this.$editor},g;this.$keyboardHandler&&(g=this.$keyboardHandler.handleKeyboard(this.$data,b,c,d,a));if(!g||!g.command)b!=0||d!=0?g={command:h.findKeyCommand(e,"editor",b,c)}:g={command:"inserttext",args:{text:c}};var i=!1;g&&(i=h.exec(g.command,e,"editor",g.args),i&&f.stopEvent(a));return i},this.onCommandKey=function(a,b,c,d){d||(d=e.keyCodeToString(c));return this.$callKeyboardHandler(a,b,d,c)},this.onTextInput=function(a){return this.$callKeyboardHandler({},0,a,0)}}).call(i.prototype),b.KeyBinding=i}),define("ace/commands/default_commands",["require","exports","module","pilot/lang","pilot/canon"],function(a,b,c){function f(a,b){return{win:a,mac:b,sender:"editor"}}var d=a("pilot/lang"),e=a("pilot/canon");e.addCommand({name:"null",exec:function(a,b,c){}}),e.addCommand({name:"selectall",bindKey:f("Ctrl-A","Command-A"),exec:function(a,b,c){a.editor.selectAll()}}),e.addCommand({name:"removeline",bindKey:f("Ctrl-D","Command-D"),exec:function(a,b,c){a.editor.removeLines()}}),e.addCommand({name:"gotoline",bindKey:f("Ctrl-L","Command-L"),exec:function(a,b,c){var d=parseInt(prompt("Enter line number:"));isNaN(d)||a.editor.gotoLine(d)}}),e.addCommand({name:"togglecomment",bindKey:f("Ctrl-7","Command-7"),exec:function(a,b,c){a.editor.toggleCommentLines()}}),e.addCommand({name:"findnext",bindKey:f("Ctrl-K","Command-G"),exec:function(a,b,c){a.editor.findNext()}}),e.addCommand({name:"findprevious",bindKey:f("Ctrl-Shift-K","Command-Shift-G"),exec:function(a,b,c){a.editor.findPrevious()}}),e.addCommand({name:"find",bindKey:f("Ctrl-F","Command-F"),exec:function(a,b,c){var d=prompt("Find:");a.editor.find(d)}}),e.addCommand({name:"replace",bindKey:f("Ctrl-R","Command-Option-F"),exec:function(a,b,c){var d=prompt("Find:");if(!!d){var e=prompt("Replacement:");if(!e)return;a.editor.replace(e,{needle:d})}}}),e.addCommand({name:"replaceall",bindKey:f("Ctrl-Shift-R","Command-Shift-Option-F"),exec:function(a,b,c){var d=prompt("Find:");if(!!d){var e=prompt("Replacement:");if(!e)return;a.editor.replaceAll(e,{needle:d})}}}),e.addCommand({name:"undo",bindKey:f("Ctrl-Z","Command-Z"),exec:function(a,b,c){a.editor.undo()}}),e.addCommand({name:"redo",bindKey:f("Ctrl-Shift-Z|Ctrl-Y","Command-Shift-Z|Command-Y"),exec:function(a,b,c){a.editor.redo()}}),e.addCommand({name:"overwrite",bindKey:f("Insert","Insert"),exec:function(a,b,c){a.editor.toggleOverwrite()}}),e.addCommand({name:"copylinesup",bindKey:f("Ctrl-Alt-Up","Command-Option-Up"),exec:function(a,b,c){a.editor.copyLinesUp()}}),e.addCommand({name:"movelinesup",bindKey:f("Alt-Up","Option-Up"),exec:function(a,b,c){a.editor.moveLinesUp()}}),e.addCommand({name:"selecttostart",bindKey:f("Ctrl-Shift-Home|Alt-Shift-Up","Command-Shift-Up"),exec:function(a,b,c){a.editor.getSelection().selectFileStart()}}),e.addCommand({name:"gotostart",bindKey:f("Ctrl-Home|Ctrl-Up","Command-Home|Command-Up"),exec:function(a,b,c){a.editor.navigateFileStart()}}),e.addCommand({name:"selectup",bindKey:f("Shift-Up","Shift-Up"),exec:function(a,b,c){a.editor.getSelection().selectUp()}}),e.addCommand({name:"golineup",bindKey:f("Up","Up|Ctrl-P"),exec:function(a,b,c){a.editor.navigateUp(b.times)}}),e.addCommand({name:"copylinesdown",bindKey:f("Ctrl-Alt-Down","Command-Option-Down"),exec:function(a,b,c){a.editor.copyLinesDown()}}),e.addCommand({name:"movelinesdown",bindKey:f("Alt-Down","Option-Down"),exec:function(a,b,c){a.editor.moveLinesDown()}}),e.addCommand({name:"selecttoend",bindKey:f("Ctrl-Shift-End|Alt-Shift-Down","Command-Shift-Down"),exec:function(a,b,c){a.editor.getSelection().selectFileEnd()}}),e.addCommand({name:"gotoend",bindKey:f("Ctrl-End|Ctrl-Down","Command-End|Command-Down"),exec:function(a,b,c){a.editor.navigateFileEnd()}}),e.addCommand({name:"selectdown",bindKey:f("Shift-Down","Shift-Down"),exec:function(a,b,c){a.editor.getSelection().selectDown()}}),e.addCommand({name:"golinedown",bindKey:f("Down","Down|Ctrl-N"),exec:function(a,b,c){a.editor.navigateDown(b.times)}}),e.addCommand({name:"selectwordleft",bindKey:f("Ctrl-Shift-Left","Option-Shift-Left"),exec:function(a,b,c){a.editor.getSelection().selectWordLeft()}}),e.addCommand({name:"gotowordleft",bindKey:f("Ctrl-Left","Option-Left"),exec:function(a,b,c){a.editor.navigateWordLeft()}}),e.addCommand({name:"selecttolinestart",bindKey:f("Alt-Shift-Left","Command-Shift-Left"),exec:function(a,b,c){a.editor.getSelection().selectLineStart()}}),e.addCommand({name:"gotolinestart",bindKey:f("Alt-Left|Home","Command-Left|Home|Ctrl-A"),exec:function(a,b,c){a.editor.navigateLineStart()}}),e.addCommand({name:"selectleft",bindKey:f("Shift-Left","Shift-Left"),exec:function(a,b,c){a.editor.getSelection().selectLeft()}}),e.addCommand({name:"gotoleft",bindKey:f("Left","Left|Ctrl-B"),exec:function(a,b,c){a.editor.navigateLeft(b.times)}}),e.addCommand({name:"selectwordright",bindKey:f("Ctrl-Shift-Right","Option-Shift-Right"),exec:function(a,b,c){a.editor.getSelection().selectWordRight()}}),e.addCommand({name:"gotowordright",bindKey:f("Ctrl-Right","Option-Right"),exec:function(a,b,c){a.editor.navigateWordRight()}}),e.addCommand({name:"selecttolineend",bindKey:f("Alt-Shift-Right","Command-Shift-Right"),exec:function(a,b,c){a.editor.getSelection().selectLineEnd()}}),e.addCommand({name:"gotolineend",bindKey:f("Alt-Right|End","Command-Right|End|Ctrl-E"),exec:function(a,b,c){a.editor.navigateLineEnd()}}),e.addCommand({name:"selectright",bindKey:f("Shift-Right","Shift-Right"),exec:function(a,b,c){a.editor.getSelection().selectRight()}}),e.addCommand({name:"gotoright",bindKey:f("Right","Right|Ctrl-F"),exec:function(a,b,c){a.editor.navigateRight(b.times)}}),e.addCommand({name:"selectpagedown",bindKey:f("Shift-PageDown","Shift-PageDown"),exec:function(a,b,c){a.editor.selectPageDown()}}),e.addCommand({name:"pagedown",bindKey:f(null,"PageDown"),exec:function(a,b,c){a.editor.scrollPageDown()}}),e.addCommand({name:"gotopagedown",bindKey:f("PageDown","Option-PageDown|Ctrl-V"),exec:function(a,b,c){a.editor.gotoPageDown()}}),e.addCommand({name:"selectpageup",bindKey:f("Shift-PageUp","Shift-PageUp"),exec:function(a,b,c){a.editor.selectPageUp()}}),e.addCommand({name:"pageup",bindKey:f(null,"PageUp"),exec:function(a,b,c){a.editor.scrollPageUp()}}),e.addCommand({name:"gotopageup",bindKey:f("PageUp","Option-PageUp"),exec:function(a,b,c){a.editor.gotoPageUp()}}),e.addCommand({name:"selectlinestart",bindKey:f("Shift-Home","Shift-Home"),exec:function(a,b,c){a.editor.getSelection().selectLineStart()}}),e.addCommand({name:"selectlineend",bindKey:f("Shift-End","Shift-End"),exec:function(a,b,c){a.editor.getSelection().selectLineEnd()}}),e.addCommand({name:"del",bindKey:f("Delete","Delete|Ctrl-D"),exec:function(a,b,c){a.editor.removeRight()}}),e.addCommand({name:"backspace",bindKey:f("Ctrl-Backspace|Command-Backspace|Option-Backspace|Shift-Backspace|Backspace","Ctrl-Backspace|Command-Backspace|Shift-Backspace|Backspace|Ctrl-H"),exec:function(a,b,c){a.editor.removeLeft()}}),e.addCommand({name:"removetolinestart",bindKey:f(null,"Option-Backspace"),exec:function(a,b,c){a.editor.removeToLineStart()}}),e.addCommand({name:"removetolineend",bindKey:f(null,"Ctrl-K"),exec:function(a,b,c){a.editor.removeToLineEnd()}}),e.addCommand({name:"removewordleft",bindKey:f("Ctrl-Backspace","Alt-Backspace|Ctrl-Alt-Backspace"),exec:function(a,b,c){a.editor.removeWordLeft()}}),e.addCommand({name:"removewordright",bindKey:f(null,"Alt-Delete"),exec:function(a,b,c){a.editor.removeWordRight()}}),e.addCommand({name:"outdent",bindKey:f("Shift-Tab","Shift-Tab"),exec:function(a,b,c){a.editor.blockOutdent()}}),e.addCommand({name:"indent",bindKey:f("Tab","Tab"),exec:function(a,b,c){a.editor.indent()}}),e.addCommand({name:"inserttext",exec:function(a,b,c){a.editor.insert(d.stringRepeat(b.text||"",b.times||1))}}),e.addCommand({name:"centerselection",bindKey:f(null,"Ctrl-L"),exec:function(a,b,c){a.editor.centerSelection()}}),e.addCommand({name:"splitline",bindKey:f(null,"Ctrl-O"),exec:function(a,b,c){a.editor.splitLine()}}),e.addCommand({name:"transposeletters",bindKey:f("Ctrl-T","Ctrl-T"),exec:function(a,b,c){a.editor.transposeLetters()}})}),define("ace/edit_session",["require","exports","module","pilot/oop","pilot/lang","pilot/event_emitter","ace/selection","ace/mode/text","ace/range","ace/document","ace/background_tokenizer","ace/edit_session/folding"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("pilot/event_emitter").EventEmitter,g=a("ace/selection").Selection,h=a("ace/mode/text").Mode,j=a("ace/range").Range,k=a("ace/document").Document,l=a("ace/background_tokenizer").BackgroundTokenizer,m=function(a,b){this.$modified=!0,this.$breakpoints=[],this.$frontMarkers={},this.$backMarkers={},this.$markerId=1,this.$rowCache=[],this.$wrapData=[],this.$foldData=[],this.$foldData.toString=function(){var a="";this.forEach(function(b){a+="\n"+b.toString()});return a},a instanceof k?this.setDocument(a):this.setDocument(new k(a)),this.selection=new g(this),b?this.setMode(b):this.setMode(new h)};(function(){function o(a){return a<4352?!1:a>=4352&&a<=4447||a>=4515&&a<=4519||a>=4602&&a<=4607||a>=9001&&a<=9002||a>=11904&&a<=11929||a>=11931&&a<=12019||a>=12032&&a<=12245||a>=12272&&a<=12283||a>=12288&&a<=12350||a>=12353&&a<=12438||a>=12441&&a<=12543||a>=12549&&a<=12589||a>=12593&&a<=12686||a>=12688&&a<=12730||a>=12736&&a<=12771||a>=12784&&a<=12830||a>=12832&&a<=12871||a>=12880&&a<=13054||a>=13056&&a<=19903||a>=19968&&a<=42124||a>=42128&&a<=42182||a>=43360&&a<=43388||a>=44032&&a<=55203||a>=55216&&a<=55238||a>=55243&&a<=55291||a>=63744&&a<=64255||a>=65040&&a<=65049||a>=65072&&a<=65106||a>=65108&&a<=65126||a>=65128&&a<=65131||a>=65281&&a<=65376||a>=65504&&a<=65510}d.implement(this,f),this.setDocument=function(a){if(this.doc)throw new Error("Document is already set");this.doc=a,a.on("change",this.onChange.bind(this)),this.on("changeFold",this.onChangeFold.bind(this))},this.getDocument=function(){return this.doc},this.$resetRowCache=function(a){if(a==0)this.$rowCache=[];else{var b=this.$rowCache;for(var c=0;c<b.length;c++)if(b[c].docRow>=a){b.splice(c,b.length);return}}},this.onChangeFold=function(a){var b=a.data;this.$resetRowCache(b.start.row)},this.onChange=function(a){var b=a.data;this.$modified=!0,this.$resetRowCache(b.range.start.row);var c=this.$updateInternalDataOnChange(a);!this.$fromUndo&&this.$undoManager&&!b.ignore&&(this.$deltasDoc.push(b),c&&c.length!=0&&this.$deltasFold.push({action:"removeFolds",folds:c}),this.$informUndoManager.schedule()),this.bgTokenizer.start(b.range.start.row),this._dispatchEvent("change",a)},this.setValue=function(a){this.doc.setValue(a),this.selection.moveCursorTo(0,0),this.selection.clearSelection(),this.$resetRowCache(0),this.$deltas=[],this.$deltasDoc=[],this.$deltasFold=[],this.getUndoManager().reset()},this.getValue=this.toString=function(){return this.doc.getValue()},this.getSelection=function(){return this.selection},this.getState=function(a){return this.bgTokenizer.getState(a)},this.getTokens=function(a,b){return this.bgTokenizer.getTokens(a,b)},this.setUndoManager=function(a){this.$undoManager=a,this.$resetRowCache(0),this.$deltas=[],this.$deltasDoc=[],this.$deltasFold=[],this.$informUndoManager&&this.$informUndoManager.cancel();if(a){var b=this;this.$syncInformUndoManager=function(){b.$informUndoManager.cancel(),b.$deltasFold.length&&(b.$deltas.push({group:"fold",deltas:b.$deltasFold}),b.$deltasFold=[]),b.$deltasDoc.length&&(b.$deltas.push({group:"doc",deltas:b.$deltasDoc}),b.$deltasDoc=[]),b.$deltas.length>0&&a.execute({action:"aceupdate",args:[b.$deltas,b]}),b.$deltas=[]},this.$informUndoManager=e.deferredCall(this.$syncInformUndoManager)}},this.$defaultUndoManager={undo:function(){},redo:function(){},reset:function(){}},this.getUndoManager=function(){return this.$undoManager||this.$defaultUndoManager},this.getTabString=function(){return this.getUseSoftTabs()?e.stringRepeat(" ",this.getTabSize()):"\t"},this.$useSoftTabs=!0,this.setUseSoftTabs=function(a){this.$useSoftTabs!==a&&(this.$useSoftTabs=a)},this.getUseSoftTabs=function(){return this.$useSoftTabs},this.$tabSize=4,this.setTabSize=function(a){!isNaN(a)&&this.$tabSize!==a&&(this.$modified=!0,this.$tabSize=a,this._dispatchEvent("changeTabSize"))},this.getTabSize=function(){return this.$tabSize},this.isTabStop=function(a){return this.$useSoftTabs&&a.column%this.$tabSize==0},this.$overwrite=!1,this.setOverwrite=function(a){this.$overwrite!=a&&(this.$overwrite=a,this._dispatchEvent("changeOverwrite"))},this.getOverwrite=function(){return this.$overwrite},this.toggleOverwrite=function(){this.setOverwrite(!this.$overwrite)},this.getBreakpoints=function(){return this.$breakpoints},this.setBreakpoints=function(a){this.$breakpoints=[];for(var b=0;b<a.length;b++)this.$breakpoints[a[b]]=!0;this._dispatchEvent("changeBreakpoint",{})},this.clearBreakpoints=function(){this.$breakpoints=[],this._dispatchEvent("changeBreakpoint",{})},this.setBreakpoint=function(a){this.$breakpoints[a]=!0,this._dispatchEvent("changeBreakpoint",{})},this.clearBreakpoint=function(a){delete this.$breakpoints[a],this._dispatchEvent("changeBreakpoint",{})},this.getBreakpoints=function(){return this.$breakpoints},this.addMarker=function(a,b,c,d){var e=this.$markerId++,f={range:a,type:c||"line",renderer:typeof c=="function"?c:null,clazz:b,inFront:!!d};d?(this.$frontMarkers[e]=f,this._dispatchEvent("changeFrontMarker")):(this.$backMarkers[e]=f,this._dispatchEvent("changeBackMarker"));return e},this.removeMarker=function(a){var b=this.$frontMarkers[a]||this.$backMarkers[a];if(!!b){var c=b.inFront?this.$frontMarkers:this.$backMarkers;b&&(delete c[a],this._dispatchEvent(b.inFront?"changeFrontMarker":"changeBackMarker"))}},this.getMarkers=function(a){return a?this.$frontMarkers:this.$backMarkers},this.setAnnotations=function(a){this.$annotations={};for(var b=0;b<a.length;b++){var c=a[b],d=c.row;this.$annotations[d]?this.$annotations[d].push(c):this.$annotations[d]=[c]}this._dispatchEvent("changeAnnotation",{})},this.getAnnotations=function(){return this.$annotations},this.clearAnnotations=function(){this.$annotations={},this._dispatchEvent("changeAnnotation",{})},this.$detectNewLine=function(a){var b=a.match(/^.*?(\r?\n)/m);b?this.$autoNewLine=b[1]:this.$autoNewLine="\n"},this.getWordRange=function(a,b){var c=this.getLine(a),d=!1;b>0&&(d=!!c.charAt(b-1).match(this.tokenRe)),d||(d=!!c.charAt(b).match(this.tokenRe));var e=d?this.tokenRe:this.nonTokenRe,f=b;if(f>0){do f--;while(f>=0&&c.charAt(f).match(e));f++}var g=b;while(g<c.length&&c.charAt(g).match(e))g++;return new j(a,f,a,g)},this.setNewLineMode=function(a){this.doc.setNewLineMode(a)},this.getNewLineMode=function(){return this.doc.getNewLineMode()},this.$useWorker=!0,this.setUseWorker=function(a){this.$useWorker!=a&&(this.$useWorker=a,this.$stopWorker(),a&&this.$startWorker())},this.getUseWorker=function(){return this.$useWorker},this.onReloadTokenizer=function(a){var b=a.data;this.bgTokenizer.start(b.first),this._dispatchEvent("tokenizerUpdate",a)},this.$mode=null,this.setMode=function(a){if(this.$mode!==a){this.$mode=a,this.$stopWorker(),this.$useWorker&&this.$startWorker();var b=a.getTokenizer();if(b.addEventListener!==undefined){var c=this.onReloadTokenizer.bind(this);b.addEventListener("update",c)}if(!this.bgTokenizer){this.bgTokenizer=new l(b);var d=this;this.bgTokenizer.addEventListener("update",function(a){d._dispatchEvent("tokenizerUpdate",a)})}else this.bgTokenizer.setTokenizer(b);this.bgTokenizer.setDocument(this.getDocument()),this.bgTokenizer.start(0),this.tokenRe=a.tokenRe,this.nonTokenRe=a.nonTokenRe,this._dispatchEvent("changeMode")}},this.$stopWorker=function(){this.$worker&&this.$worker.terminate(),this.$worker=null},this.$startWorker=function(){if(typeof Worker!="undefined"&&!a.noWorker)try{this.$worker=this.$mode.createWorker(this)}catch(b){console.log("Could not load worker"),console.log(b),this.$worker=null}else this.$worker=null},this.getMode=function(){return this.$mode},this.$scrollTop=0,this.setScrollTopRow=function(a){this.$scrollTop!==a&&(this.$scrollTop=a,this._dispatchEvent("changeScrollTop"))},this.getScrollTopRow=function(){return this.$scrollTop},this.getWidth=function(){this.$computeWidth();return this.width},this.getScreenWidth=function(){this.$computeWidth();return this.screenWidth},this.$computeWidth=function(a){if(this.$modified||a){this.$modified=!1;var b=this.doc.getAllLines(),c=0,d=0;for(var e=0;e<b.length;e++){var f=this.getFoldLine(e),g,h;g=b[e];if(f){var i=f.range.end;g=this.getFoldDisplayLine(f),e=i.row}h=g.length,c=Math.max(c,h),this.$useWrapMode||(d=Math.max(d,this.$getStringScreenWidth(g)[0]))}this.width=c,this.$useWrapMode?this.screenWidth=this.$wrapLimit:this.screenWidth=d}},this.getLine=function(a){return this.doc.getLine(a)},this.getLines=function(a,b){return this.doc.getLines(a,b)},this.getLength=function(){return this.doc.getLength()},this.getTextRange=function(a){return this.doc.getTextRange(a)},this.findMatchingBracket=function(a){if(a.column==0)return null;var b=this.getLine(a.row).charAt(a.column-1);if(b=="")return null;var c=b.match(/([\(\[\{])|([\)\]\}])/);return c?c[1]?this.$findClosingBracket(c[1],a):this.$findOpeningBracket(c[2],a):null},this.$brackets={")":"(","(":")","]":"[","[":"]","{":"}","}":"{"},this.$findOpeningBracket=function(a,b){var c=this.$brackets[a],d=b.column-2,e=b.row,f=1,g=this.getLine(e);for(;;){while(d>=0){var h=g.charAt(d);if(h==c){f-=1;if(f==0)return{row:e,column:d}}else h==a&&(f+=1);d-=1}e-=1;if(e<0)break;var g=this.getLine(e),d=g.length-1}return null},this.$findClosingBracket=function(a,b){var c=this.$brackets[a],d=b.column,e=b.row,f=1,g=this.getLine(e),h=this.getLength();for(;;){while(d<g.length){var i=g.charAt(d);if(i==c){f-=1;if(f==0)return{row:e,column:d}}else i==a&&(f+=1);d+=1}e+=1;if(e>=h)break;var g=this.getLine(e),d=0}return null},this.insert=function(a,b){return this.doc.insert(a,b)},this.remove=function(a){return this.doc.remove(a)},this.undoChanges=function(a,b){if(!!a.length){this.$fromUndo=!0;var c=null;for(var d=a.length-1;d!=-1;d--)delta=a[d],delta.group=="doc"?(this.doc.revertDeltas(delta.deltas),c=this.$getUndoSelection(delta.deltas,!0,c)):delta.deltas.forEach(function(a){this.addFolds(a.folds)},this);this.$fromUndo=!1,c&&!b&&this.selection.setSelectionRange(c);return c}},this.redoChanges=function(a,b){if(!!a.length){this.$fromUndo=!0;var c=null;for(var d=0;d<a.length;d++)delta=a[d],delta.group=="doc"&&(this.doc.applyDeltas(delta.deltas),c=this.$getUndoSelection(delta.deltas,!1,c));this.$fromUndo=!1,c&&!b&&this.selection.setSelectionRange(c);return c}},this.$getUndoSelection=function(a,b,c){function d(a){var c=a.action=="insertText"||a.action=="insertLines";return b?!c:c}var e=a[0],f,g,h=!1;d(e)?(f=e.range.clone(),h=!0):(f=j.fromPoints(e.range.start,e.range.start),h=!1);for(var i=1;i<a.length;i++)e=a[i],d(e)?(g=e.range.start,f.compare(g.row,g.column)==-1&&f.setStart(e.range.start),g=e.range.end,f.compare(g.row,g.column)==1&&f.setEnd(e.range.end),h=!0):(g=e.range.start,f.compare(g.row,g.column)==-1&&(f=j.fromPoints(e.range.start,e.range.start)),h=!1);if(c!=null){var k=c.compareRange(f);k==1?f.setStart(c.start):k==-1&&f.setEnd(c.end)}return f},this.replace=function(a,b){return this.doc.replace(a,b)},this.moveText=function(a,b){var c=this.getTextRange(a);this.remove(a);var d=b.row,e=b.column;!a.isMultiLine()&&a.start.row==d&&a.end.column<e&&(e-=c.length);if(a.isMultiLine()&&a.end.row<d){var f=this.doc.$split(c);d-=f.length-1}var g=d+a.end.row-a.start.row,h=a.isMultiLine()?a.end.column:e+a.end.column-a.start.column,i=new j(d,e,g,h);this.insert(i.start,c);return i},this.indentRows=function(a,b,c){c=c.replace(/\t/g,this.getTabString());for(var d=a;d<=b;d++)this.insert({row:d,column:0},c)},this.outdentRows=function(a){var b=a.collapseRows(),c=new j(0,0,0,0),d=this.getTabSize();for(var e=b.start.row;e<=b.end.row;++e){var f=this.getLine(e);c.start.row=e,c.end.row=e;for(var g=0;g<d;++g)if(f.charAt(g)!=" ")break;g<d&&f.charAt(g)=="\t"?(c.start.column=g,c.end.column=g+1):(c.start.column=0,c.end.column=g),this.remove(c)}},this.moveLinesUp=function(a,b){if(a<=0)return 0;var c=this.doc.removeLines(a,b);this.doc.insertLines(a-1,c);return-1},this.moveLinesDown=function(a,b){if(b>=this.doc.getLength()-1)return 0;var c=this.doc.removeLines(a,b);this.doc.insertLines(a+1,c);return 1},this.duplicateLines=function(a,b){var a=this.$clipRowToDocument(a),b=this.$clipRowToDocument(b),c=this.getLines(a,b);this.doc.insertLines(a,c);var d=b-a+1;return d},this.$clipRowToDocument=function(a){return Math.max(0,Math.min(a,this.doc.getLength()-1))},this.$clipPositionToDocument=function(a,b){b=Math.max(0,b);if(a<0)a=0,b=0;else{var c=this.doc.getLength();a>=c?(a=c-1,b=this.doc.getLine(c-1).length):b=Math.min(this.doc.getLine(a).length,b)}return{row:a,column:b}},this.$wrapLimit=80,this.$useWrapMode=!1,this.$wrapLimitRange={min:null,max:null},this.setUseWrapMode=function(a){if(a!=this.$useWrapMode){this.$useWrapMode=a,this.$modified=!0,this.$resetRowCache(0);if(a){var b=this.getLength();this.$wrapData=[];for(i=0;i<b;i++)this.$wrapData.push([]);this.$updateWrapData(0,b-1)}this._dispatchEvent("changeWrapMode")}},this.getUseWrapMode=function(){return this.$useWrapMode},this.setWrapLimitRange=function(a,b){if(this.$wrapLimitRange.min!==a||this.$wrapLimitRange.max!==b)this.$wrapLimitRange.min=a,this.$wrapLimitRange.max=b,this.$modified=!0,this._dispatchEvent("changeWrapMode")},this.adjustWrapLimit=function(a){var b=this.$constrainWrapLimit(a);if(b!=this.$wrapLimit&&b>0){this.$wrapLimit=b,this.$modified=!0,this.$useWrapMode&&(this.$updateWrapData(0,this.getLength()-1),this.$resetRowCache(0),this._dispatchEvent("changeWrapLimit"));return!0}return!1},this.$constrainWrapLimit=function(a){var b=this.$wrapLimitRange.min;b&&(a=Math.max(b,a));var c=this.$wrapLimitRange.max;c&&(a=Math.min(c,a));return Math.max(1,a)},this.getWrapLimit=function(){return this.$wrapLimit},this.getWrapLimitRange=function(){return{min:this.$wrapLimitRange.min,max:this.$wrapLimitRange.max}},this.$updateInternalDataOnChange=function(a){var b=this.$useWrapMode,c,d=a.data.action,e=a.data.range.start.row,f=a.data.range.end.row,g=a.data.range.start,h=a.data.range.end,i=null;d.indexOf("Lines")!=-1?(d=="insertLines"?f=e+a.data.lines.length:f=e,c=a.data.lines.length):c=f-e;if(c!=0)if(d.indexOf("remove")!=-1){b&&this.$wrapData.splice(e,c);var j=this.$foldData;i=this.getFoldsInRange(a.data.range),this.removeFolds(i);var k=this.getFoldLine(h.row),l=0;if(k){k.addRemoveChars(h.row,h.column,g.column-h.column),k.shiftRow(-c);var m=this.getFoldLine(e);m&&m!==k&&(m.merge(k),k=m),l=j.indexOf(k)+1}for(l;l<j.length;l++){var k=j[l];k.start.row>=h.row&&k.shiftRow(-c)}f=e}else{var n;if(b){n=[e,0];for(var o=0;o<c;o++)n.push([]);this.$wrapData.splice.apply(this.$wrapData,n)}var j=this.$foldData,k=this.getFoldLine(e),l=0;if(k){var p=k.range.compareInside(g.row,g.column);p==0?(k=k.split(g.row,g.column),k.shiftRow(c),k.addRemoveChars(f,0,h.column-g.column)):p==-1&&(k.addRemoveChars(e,0,h.column-g.column),k.shiftRow(c)),l=j.indexOf(k)+1}for(l;l<j.length;l++){var k=j[l];k.start.row>=e&&k.shiftRow(c)}}else{var q;c=Math.abs(a.data.range.start.column-a.data.range.end.column),d.indexOf("remove")!=-1&&(i=this.getFoldsInRange(a.data.range),this.removeFolds(i),c=-c);var k=this.getFoldLine(e);k&&k.addRemoveChars(e,g.column,c)}b&&this.$wrapData.length!=this.doc.getLength()&&console.error("doc.getLength() and $wrapData.length have to be the same!"),b&&this.$updateWrapData(e,f);return i},this.$updateWrapData=function(a,b){var c=this.doc.getAllLines(),d=this.getTabSize(),f=this.$wrapData,i=this.$wrapLimit,j,l,m=a;b=Math.min(b,c.length-1);while(m<=b){l=this.getFoldLine(m);if(!l)j=this.$getDisplayTokens(e.stringTrimRight(c[m]));else{j=[],l.walk(function(a,b,d,e){var f;if(a){f=this.$getDisplayTokens(a,j.length),f[0]=g;for(var i=1;i<f.length;i++)f[i]=h}else f=this.$getDisplayTokens(c[b].substring(e,d),j.length);j=j.concat(f)}.bind(this),l.end.row,c[l.end.row].length+1);while(j.length!=0&&j[j.length-1]>=k)j.pop()}f[m]=this.$computeWrapSplits(j,i,d),m=this.getRowFoldEnd(m)+1}};var b=1,c=2,g=3,h=4,k=10,m=11,n=12;this.$computeWrapSplits=function(a,b,c){function j(b){var c=a.slice(f,b),e=c.length;c.join("").replace(/12/g,function(a){e-=1}).replace(/2/g,function(a){e-=1}),i+=e,d.push(i),f=b}if(a.length==0)return[];var c=this.getTabSize(),d=[],e=a.length,f=0,i=0;while(e-f>b){var l=f+b;if(a[l]>=k){while(a[l]>=k)l++;j(l);continue}if(a[l]==g||a[l]==h){for(l;l!=f-1;l--)if(a[l]==g)break;if(l>f){j(l);continue}l=f+b;for(l;l<a.length;l++)if(a[l]!=h)break;if(l==a.length)break;j(l);continue}for(l;l!=f-1;l--)if(a[l]>=g){l++;break}if(l>f){j(l);continue}l=f+b,j(f+b)}return d},this.$getDisplayTokens=function(a,d){var e=[],f;d=d||0;for(var g=0;g<a.length;g++){var h=a.charCodeAt(g);if(h==9){f=this.getScreenTabSize(e.length+d),e.push(m);for(var i=1;i<f;i++)e.push(n)}else h==32?e.push(k):o(h)?e.push(b,c):e.push(b)}return e},this.$getStringScreenWidth=function(a,b,c){if(b==0)return[0,0];b==null&&(b=c+a.length*Math.max(this.getTabSize(),2)),c=c||0;var d,e;for(e=0;e<a.length;e++){d=a.charCodeAt(e),d==9?c+=this.getScreenTabSize(c):o(d)?c+=2:c+=1;if(c>b)break}return[c,e]},this.getRowLength=function(a){return!this.$useWrapMode||!this.$wrapData[a]?1:this.$wrapData[a].length+1},this.getRowHeight=function(a,b){return this.getRowLength(b)*a.lineHeight},this.getScreenLastRowColumn=function(a){return this.documentToScreenColumn(a,this.doc.getLine(a).length)},this.getDocumentLastRowColumn=function(a,b){var c=this.documentToScreenRow(a,b);return this.getScreenLastRowColumn(c)},this.getDocumentLastRowColumnPosition=function(a,b){var c=this.documentToScreenRow(a,b);return this.screenToDocumentPosition(c,Number.MAX_VALUE/10)},this.getRowSplitData=function(a){return this.$useWrapMode?this.$wrapData[a]:undefined},this.getScreenTabSize=function(a){return this.$tabSize-a%this.$tabSize},this.screenToDocumentRow=function(a,b){return this.screenToDocumentPosition(a,b).row},this.screenToDocumentColumn=function(a,b){return this.screenToDocumentPosition(a,b).column},this.screenToDocumentPosition=function(a,b){if(a<0)return{row:0,column:0};var c,d=0,e=0,f,g,h=0,i=0,j=this.$rowCache;for(var k=0;k<j.length;k++)if(j[k].screenRow<a)h=j[k].screenRow,d=j[k].docRow;else break;var l=!j.length||k==j.length,m=this.getLength()-1,n=this.getNextFold(d),o=n?n.start.row:Infinity;while(h<=a){i=this.getRowLength(d);if(h+i-1>=a||d>=m)break;h+=i,d++,d>o&&(d=n.end.row+1,n=this.getNextFold(d),o=n?n.start.row:Infinity),l&&j.push({docRow:d,screenRow:h})}n&&n.start.row<=d?c=this.getFoldDisplayLine(n):(c=this.getLine(d),n=null);var p=[];this.$useWrapMode&&(p=this.$wrapData[d],p&&(f=p[a-h],a>h&&p.length&&(e=p[a-h-1]||p[p.length-1],c=c.substring(e)))),e+=this.$getStringScreenWidth(c,b)[1],h+p.length<a&&(e=Number.MAX_VALUE),this.$useWrapMode?e>=f&&(e=f-1):e=Math.min(e,c.length);return n?n.idxToPosition(e):{row:d,column:e}},this.documentToScreenPosition=function(a,b){if(typeof b=="undefined")var c=this.$clipPositionToDocument(a.row,a.column);else c=this.$clipPositionToDocument(a,b);a=c.row,b=c.column;var d=this.$rowCache.length,e;if(this.$useWrapMode){e=this.$wrapData;if(a>e.length-1)return{row:this.getScreenLength(),column:e.length==0?0:e[e.length-1].length-1}}var f=0,g=0,h=null,i=null;i=this.getFoldAt(a,b,1),i&&(a=i.start.row,b=i.start.column);var j,k=0,l=this.$rowCache;for(var m=0;m<l.length;m++)if(l[m].docRow<a)f=l[m].screenRow,k=l[m].docRow;else break;var n=!l.length||m==l.length,o=this.getNextFold(k),p=o?o.start.row:Infinity;while(k<a){if(k>=p){j=o.end.row+1;if(j>a)break;o=this.getNextFold(j),p=o?o.start.row:Infinity}else j=k+1;f+=this.getRowLength(k),k=j,n&&l.push({docRow:k,screenRow:f})}var q="";o&&k>=p?(q=this.getFoldDisplayLine(o,a,b),h=o.start.row):(q=this.getLine(a).substring(0,b),h=a);if(this.$useWrapMode){var r=e[h],s=0;while(q.length>=r[s])f++,s++;q=q.substring(r[s-1]||0,q.length)}return{row:f,column:this.$getStringScreenWidth(q)[0]}},this.documentToScreenColumn=function(a,b){return this.documentToScreenPosition(a,b).column},this.documentToScreenRow=function(a,b){return this.documentToScreenPosition(a,b).row},this.getScreenLength=function(){var a=0,b=null,c=null;if(!this.$useWrapMode){a=this.getLength();var d=this.$foldData;for(var e=0;e<d.length;e++)c=d[e],a-=c.end.row-c.start.row}else for(var f=0;f<this.$wrapData.length;f++)(c=this.getFoldLine(f,b))?(f=c.end.row,a+=1):a+=this.$wrapData[f].length+1;return a}}).call(m.prototype),a("ace/edit_session/folding").Folding.call(m.prototype),b.EditSession=m}),define("ace/selection",["require","exports","module","pilot/oop","pilot/lang","pilot/event_emitter","ace/range"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("pilot/event_emitter").EventEmitter,g=a("ace/range").Range,h=function(a){this.session=a,this.doc=a.getDocument(),this.clearSelection(),this.selectionLead=this.doc.createAnchor(0,0),this.selectionAnchor=this.doc.createAnchor(0,0);var b=this;this.selectionLead.on("change",function(a){b._dispatchEvent("changeCursor"),b.$isEmpty||b._dispatchEvent("changeSelection"),!b.$preventUpdateDesiredColumnOnChange&&a.old.column!=a.value.column&&b.$updateDesiredColumn()}),this.selectionAnchor.on("change",function(){b.$isEmpty||b._dispatchEvent("changeSelection")})};(function(){d.implement(this,f),this.isEmpty=function(){return this.$isEmpty||this.selectionAnchor.row==this.selectionLead.row&&this.selectionAnchor.column==this.selectionLead.column},this.isMultiLine=function(){return this.isEmpty()?!1:this.getRange().isMultiLine()},this.getCursor=function(){return this.selectionLead.getPosition()},this.setSelectionAnchor=function(a,b){this.selectionAnchor.setPosition(a,b),this.$isEmpty&&(this.$isEmpty=!1,this._dispatchEvent("changeSelection"))},this.getSelectionAnchor=function(){return this.$isEmpty?this.getSelectionLead():this.selectionAnchor.getPosition()},this.getSelectionLead=function(){return this.selectionLead.getPosition()},this.shiftSelection=function(a){if(this.$isEmpty)this.moveCursorTo(this.selectionLead.row,this.selectionLead.column+a);else{var b=this.getSelectionAnchor(),c=this.getSelectionLead(),d=this.isBackwards();(!d||b.column!==0)&&this.setSelectionAnchor(b.row,b.column+a),(d||c.column!==0)&&this.$moveSelection(function(){this.moveCursorTo(c.row,c.column+a)})}},this.isBackwards=function(){var a=this.selectionAnchor,b=this.selectionLead;return a.row>b.row||a.row==b.row&&a.column>b.column},this.getRange=function(){var a=this.selectionAnchor,b=this.selectionLead;return this.isEmpty()?g.fromPoints(b,b):this.isBackwards()?g.fromPoints(b,a):g.fromPoints(a,b)},this.clearSelection=function(){this.$isEmpty||(this.$isEmpty=!0,this._dispatchEvent("changeSelection"))},this.selectAll=function(){var a=this.doc.getLength()-1;this.setSelectionAnchor(a,this.doc.getLine(a).length),this.moveCursorTo(0,0)},this.setSelectionRange=function(a,b){b?(this.setSelectionAnchor(a.end.row,a.end.column),this.selectTo(a.start.row,a.start.column)):(this.setSelectionAnchor(a.start.row,a.start.column),this.selectTo(a.end.row,a.end.column)),this.$updateDesiredColumn()},this.$updateDesiredColumn=function(){var a=this.getCursor();this.$desiredColumn=this.session.documentToScreenColumn(a.row,a.column)},this.$moveSelection=function(a){var b=this.selectionLead;this.$isEmpty&&this.setSelectionAnchor(b.row,b.column),a.call(this)},this.selectTo=function(a,b){this.$moveSelection(function(){this.moveCursorTo(a,b)})},this.selectToPosition=function(a){this.$moveSelection(function(){this.moveCursorToPosition(a)})},this.selectUp=function(){this.$moveSelection(this.moveCursorUp)},this.selectDown=function(){this.$moveSelection(this.moveCursorDown)},this.selectRight=function(){this.$moveSelection(this.moveCursorRight)},this.selectLeft=function(){this.$moveSelection(this.moveCursorLeft)},this.selectLineStart=function(){this.$moveSelection(this.moveCursorLineStart)},this.selectLineEnd=function(){this.$moveSelection(this.moveCursorLineEnd)},this.selectFileEnd=function(){this.$moveSelection(this.moveCursorFileEnd)},this.selectFileStart=function(){this.$moveSelection(this.moveCursorFileStart)},this.selectWordRight=function(){this.$moveSelection(this.moveCursorWordRight)},this.selectWordLeft=function(){this.$moveSelection(this.moveCursorWordLeft)},this.selectWord=function(){var a=this.getCursor(),b=this.session.getWordRange(a.row,a.column);this.setSelectionRange(b)},this.selectLine=function(){var a=this.selectionLead.row,b,c=this.session.getFoldLine(a);c?(a=c.start.row,b=c.end.row):b=a,this.setSelectionAnchor(a,0),this.$moveSelection(function(){this.moveCursorTo(b+1,0)})},this.moveCursorUp=function(){this.moveCursorBy(-1,0)},this.moveCursorDown=function(){this.moveCursorBy(1,0)},this.moveCursorLeft=function(){var a=this.selectionLead.getPosition(),b;if(b=this.session.getFoldAt(a.row,a.column,-1))this.moveCursorTo(b.start.row,b.start.column);else if(a.column==0)a.row>0&&this.moveCursorTo(a.row-1,this.doc.getLine(a.row-1).length);else{var c=this.session.getTabSize();this.session.isTabStop(a)&&this.doc.getLine(a.row).slice(a.column-c,a.column).split(" ").length-1==c?this.moveCursorBy(0,-c):this.moveCursorBy(0,-1)}},this.moveCursorRight=function(){var a=this.selectionLead.getPosition(),b;if(b=this.session.getFoldAt(a.row,a.column,1))this.moveCursorTo(b.end.row,b.end.column);else if(this.selectionLead.column==this.doc.getLine(this.selectionLead.row).length)this.selectionLead.row<this.doc.getLength()-1&&this.moveCursorTo(this.selectionLead.row+1,0);else{var c=this.session.getTabSize(),a=this.selectionLead;this.session.isTabStop(a)&&this.doc.getLine(a.row).slice(a.column,a.column+c).split(" ").length-1==c?this.moveCursorBy(0,c):this.moveCursorBy(0,1)}},this.moveCursorLineStart=function(){var a=this.selectionLead.row,b=this.selectionLead.column,c=this.session.documentToScreenRow(a,b),d=this.session.screenToDocumentPosition(c,0),e=this.session.getDisplayLine(a,null,d.row,d.column),f=e.match(/^\s*/);f[0].length==b?this.moveCursorTo(d.row,d.column):this.moveCursorTo(d.row,d.column+f[0].length)},this.moveCursorLineEnd=function(){var a=this.selectionLead,b=this.session.getDocumentLastRowColumnPosition(a.row,a.column);this.moveCursorTo(b.row,b.column)},this.moveCursorFileEnd=function(){var a=this.doc.getLength()-1,b=this.doc.getLine(a).length;this.moveCursorTo(a,b)},this.moveCursorFileStart=function(){this.moveCursorTo(0,0)},this.moveCursorWordRight=function(){var a=this.selectionLead.row,b=this.selectionLead.column,c=this.doc.getLine(a),d=c.substring(b),e;this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;var f;if(f=this.session.getFoldAt(a,b,1))this.moveCursorTo(f.end.row,f.end.column);else{if(b==c.length){this.moveCursorRight();return}if(e=this.session.nonTokenRe.exec(d))b+=this.session.nonTokenRe.lastIndex,this.session.nonTokenRe.lastIndex=0;else if(e=this.session.tokenRe.exec(d))b+=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0;this.moveCursorTo(a,b)}},this.moveCursorWordLeft=function(){var a=this.selectionLead.row,b=this.selectionLead.column,c;if(c=this.session.getFoldAt(a,b,-1))this.moveCursorTo(c.start.row,c.start.column);else{if(b==0){this.moveCursorLeft();return}var d=this.session.getFoldStringAt(a,b,-1);d==null&&(d=this.doc.getLine(a).substring(0,b));var f=e.stringReverse(d),g;this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;if(g=this.session.nonTokenRe.exec(f))b-=this.session.nonTokenRe.lastIndex,this.session.nonTokenRe.lastIndex=0;else if(g=this.session.tokenRe.exec(f))b-=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0;this.moveCursorTo(a,b)}},this.moveCursorBy=function(a,b){var c=this.session.documentToScreenPosition(this.selectionLead.row,this.selectionLead.column),d=b==0&&this.$desiredColumn||c.column,e=this.session.screenToDocumentPosition(c.row+a,d);this.moveCursorTo(e.row,e.column+b,b==0)},this.moveCursorToPosition=function(a){this.moveCursorTo(a.row,a.column)},this.moveCursorTo=function(a,b,c){var d=this.session.getFoldAt(a,b,1);d&&(a=d.start.row,b=d.start.column),this.$preventUpdateDesiredColumnOnChange=!0,this.selectionLead.setPosition(a,b),this.$preventUpdateDesiredColumnOnChange=!1,c||this.$updateDesiredColumn(this.selectionLead.column)},this.moveCursorToScreen=function(a,b,c){var d=this.session.screenToDocumentPosition(a,b);a=d.row,b=d.column,this.moveCursorTo(a,b,c)}}).call(h.prototype),b.Selection=h}),define("ace/range",["require","exports","module"],function(a,b,c){var d=function(a,b,c,d){this.start={row:a,column:b},this.end={row:c,column:d}};(function(){this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(a,b){return this.compare(a,b)==0},this.compareRange=function(a){var b,c=a.end,d=a.start;b=this.compare(c.row,c.column);if(b==1){b=this.compare(d.row,d.column);return b==1?2:b==0?1:0}if(b==-1)return-2;b=this.compare(d.row,d.column);return b==-1?-1:b==1?42:0},this.containsRange=function(a){var b=this.compareRange(a);return b==-1||b==0||b==1},this.isEnd=function(a,b){return this.end.row==a&&this.end.column==b},this.isStart=function(a,b){return this.start.row==a&&this.start.column==b},this.setStart=function(a,b){typeof a=="object"?(this.start.column=a.column,this.start.row=a.row):(this.start.row=a,this.start.column=b)},this.setEnd=function(a,b){typeof a=="object"?(this.end.column=a.column,this.end.row=a.row):(this.end.row=a,this.end.column=b)},this.inside=function(a,b){if(this.compare(a,b)==0)return this.isEnd(a,b)||this.isStart(a,b)?!1:!0;return!1},this.insideStart=function(a,b){if(this.compare(a,b)==0)return this.isEnd(a,b)?!1:!0;return!1},this.insideEnd=function(a,b){if(this.compare(a,b)==0)return this.isStart(a,b)?!1:!0;return!1},this.compare=function(a,b){if(!this.isMultiLine()&&a===this.start.row)return b<this.start.column?-1:b>this.end.column?1:0;return a<this.start.row?-1:a>this.end.row?1:this.start.row===a?b>=this.start.column?0:-1:this.end.row===a?b<=this.end.column?0:1:0},this.compareStart=function(a,b){return this.start.row==a&&this.start.column==b?-1:this.compare(a,b)},this.compareEnd=function(a,b){return this.end.row==a&&this.end.column==b?1:this.compare(a,b)},this.compareInside=function(a,b){return this.end.row==a&&this.end.column==b?1:this.start.row==a&&this.start.column==b?-1:this.compare(a,b)},this.clipRows=function(a,b){if(this.end.row>b)var c={row:b+1,column:0};if(this.start.row>b)var e={row:b+1,column:0};if(this.start.row<a)var e={row:a,column:0};if(this.end.row<a)var c={row:a,column:0};return d.fromPoints(e||this.start,c||this.end)},this.extend=function(a,b){var c=this.compare(a,b);if(c==0)return this;if(c==-1)var e={row:a,column:b};else var f={row:a,column:b};return d.fromPoints(e||this.start,f||this.end)},this.isEmpty=function(){return this.start.row==this.end.row&&this.start.column==this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return d.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new d(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new d(this.start.row,0,this.end.row,0)},this.toScreenRange=function(a){var b=a.documentToScreenPosition(this.start),c=a.documentToScreenPosition(this.end);return new d(b.row,b.column,c.row,c.column)}}).call(d.prototype),d.fromPoints=function(a,b){return new d(a.row,a.column,b.row,b.column)},b.Range=d}),define("ace/mode/text",["require","exports","module","ace/tokenizer","ace/mode/text_highlight_rules","ace/mode/behaviour","ace/unicode"],function(a,b,c){var d=a("ace/tokenizer").Tokenizer,e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=a("ace/mode/behaviour").Behaviour,g=a("ace/unicode"),h=function(){this.$tokenizer=new d((new e).getRules()),this.$behaviour=new f};(function(){this.tokenRe=new RegExp("^["+g.packages.L+g.packages.Mn+g.packages.Mc+g.packages.Nd+g.packages.Pc+"\\$_]+","g"),this.nonTokenRe=new RegExp("^(?:[^"+g.packages.L+g.packages.Mn+g.packages.Mc+g.packages.Nd+g.packages.Pc+"\\$_]|s])+","g"),this.getTokenizer=function(){return this.$tokenizer},this.toggleCommentLines=function(a,b,c,d){},this.getNextLineIndent=function(a,b,c){return""},this.checkOutdent=function(a,b,c){return!1},this.autoOutdent=function(a,b,c){},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""},this.createWorker=function(a){return null},this.highlightSelection=function(a){var b=a.session;b.$selectionOccurrences||(b.$selectionOccurrences=[]),b.$selectionOccurrences.length&&this.clearSelectionHighlight(a);var c=a.getSelectionRange();if(!c.isEmpty()&&!c.isMultiLine()){var d=c.start.column-1,e=c.end.column+1,f=b.getLine(c.start.row),g=f.length,h=f.substring(Math.max(d,0),Math.min(e,g));if(d>=0&&/^[\w\d]/.test(h)||e<=g&&/[\w\d]$/.test(h))return;h=f.substring(c.start.column,c.end.column);if(!/^[\w\d]+$/.test(h))return;var i=a.getCursorPosition(),j={wrap:!0,wholeWord:!0,caseSensitive:!0,needle:h},k=a.$search.getOptions();a.$search.set(j);var l=a.$search.findAll(b);l.forEach(function(a){if(!a.contains(i.row,i.column)){var c=b.addMarker(a,"ace_selected_word","text");b.$selectionOccurrences.push(c)}}),a.$search.set(k)}},this.clearSelectionHighlight=function(a){!a.session.$selectionOccurrences||(a.session.$selectionOccurrences.forEach(function(b){a.session.removeMarker(b)}),a.session.$selectionOccurrences=[])},this.createModeDelegates=function(a){if(!!this.$embeds){this.$modes={};for(var b=0;b<this.$embeds.length;b++)a[this.$embeds[b]]&&(this.$modes[this.$embeds[b]]=new a[this.$embeds[b]]);var c=["toggleCommentLines","getNextLineIndent","checkOutdent","autoOutdent","transformAction"];for(var b=0;b<c.length;b++)(function(a){var d=c[b],e=a[d];a[c[b]]=function(){return this.$delegator(d,arguments,e)}})(this)}},this.$delegator=function(a,b,c){var d=b[0];for(var e=0;e<this.$embeds.length;e++){if(!this.$modes[this.$embeds[e]])continue;var f=d.split(this.$embeds[e]);if(!f[0]&&f[1]){b[0]=f[1];var g=this.$modes[this.$embeds[e]];return g[a].apply(g,b)}}var h=c.apply(this,b);return c?h:undefined},this.transformAction=function(a,b,c,d,e){if(this.$behaviour){var f=this.$behaviour.getBehaviours();for(var g in f)if(f[g][b]){var h=f[g][b].apply(this,arguments);if(h!==!1)return h}}return!1}}).call(h.prototype),b.Mode=h}),define("ace/tokenizer",["require","exports","module"],function(a,b,c){var d=function(a){this.rules=a,this.regExps={},this.matchMappings={};for(var b in this.rules){var c=this.rules[b],d=c,e=[],f=0,g=this.matchMappings[b]={};for(var h=0;h<d.length;h++){var i=(new RegExp("(?:("+d[h].regex+")|(.))")).exec("a").length-2,j=d[h].regex.replace(/\\([0-9]+)/g,function(a,b){return"\\"+(parseInt(b,10)+f+1)});g[f]={rule:h,len:i},f+=i,e.push(j)}this.regExps[b]=new RegExp("(?:("+e.join(")|(")+")|(.))","g")}};(function(){this.getLineTokens=function(a,b){var c=b,d=this.rules[c],e=this.matchMappings[c],f=this.regExps[c];f.lastIndex=0;var g,h=[],i=0,j={type:null,value:""};while(g=f.exec(a)){var k="text",l=null,m=[g[0]];for(var n=0;n<g.length-2;n++)if(g[n+1]!==undefined){l=d[e[n].rule],e[n].len>1&&(m=g.slice(n+2,n+1+e[n].len)),typeof l.token=="function"?k=l.token.apply(this,m):k=l.token;var o=l.next;o&&o!==c&&(c=o,d=this.rules[c],e=this.matchMappings[c],i=f.lastIndex,f=this.regExps[c],f.lastIndex=i);break}if(m[0]){typeof k=="string"&&(m=[m.join("")],k=[k]);for(var n=0;n<m.length;n++)(!l||l.merge||k[n]==="text")&&j.type===k[n]?j.value+=m[n]:(j.type&&h.push(j),j={type:k[n],value:m[n]})}if(i==a.length)break;i=f.lastIndex}j.type&&h.push(j);return{tokens:h,state:c}}}).call(d.prototype),b.Tokenizer=d}),define("ace/mode/text_highlight_rules",["require","exports","module","pilot/lang"],function(a,b,c){var d=a("pilot/lang"),e=function(){this.$rules={start:[{token:"empty_line",regex:"^$"},{token:"text",regex:".+"}]}};(function(){this.addRules=function(a,b){for(var c in a){var d=a[c];for(var e=0;e<d.length;e++){var f=d[e];f.next?f.next=b+f.next:f.next=b+c}this.$rules[b+c]=d}},this.getRules=function(){return this.$rules},this.embedRules=function(a,b,c,e){var f=(new a).getRules();if(e)for(var g=0;g<e.length;g++)e[g]=b+e[g];else{e=[];for(var h in f)e.push(b+h)}this.addRules(f,b);for(var g=0;g<e.length;g++)Array.prototype.unshift.apply(this.$rules[e[g]],d.deepCopy(c));this.$embeds||(this.$embeds=[]),this.$embeds.push(b)},this.getEmbeds=function(){return this.$embeds}}).call(e.prototype),b.TextHighlightRules=e}),define("ace/mode/behaviour",["require","exports","module"],function(a,b,c){var d=function(){this.$behaviours={}};(function(){this.add=function(a,b,c){switch(undefined){case this.$behaviours:this.$behaviours={};case this.$behaviours[a]:this.$behaviours[a]={}}this.$behaviours[a][b]=c},this.addBehaviours=function(a){for(var b in a)for(var c in a[b])this.add(b,c,a[b][c])},this.remove=function(a){this.$behaviours&&this.$behaviours[a]&&delete this.$behaviours[a]},this.inherit=function(a,b){if(typeof a=="function")var c=(new a).getBehaviours(b);else var c=a.getBehaviours(b);this.addBehaviours(c)},this.getBehaviours=function(a){if(!a)return this.$behaviours;var b={};for(var c=0;c<a.length;c++)this.$behaviours[a[c]]&&(b[a[c]]=this.$behaviours[a[c]]);return b}}).call(d.prototype),b.Behaviour=d}),define("ace/unicode",["require","exports","module"],function(a,b,c){function d(a){var c=/\w{4}/g;for(var d in a)b.packages[d]=a[d].replace(c,"\\u$&")}b.packages={},d({L:"0041-005A0061-007A00AA00B500BA00C0-00D600D8-00F600F8-02C102C6-02D102E0-02E402EC02EE0370-037403760377037A-037D03860388-038A038C038E-03A103A3-03F503F7-0481048A-05250531-055605590561-058705D0-05EA05F0-05F20621-064A066E066F0671-06D306D506E506E606EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA07F407F507FA0800-0815081A082408280904-0939093D09500958-0961097109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E460E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EC60EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10A0-10C510D0-10FA10FC1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317D717DC1820-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541AA71B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C7D1CE9-1CEC1CEE-1CF11D00-1DBF1E00-1F151F18-1F1D1F20-1F451F48-1F4D1F50-1F571F591F5B1F5D1F5F-1F7D1F80-1FB41FB6-1FBC1FBE1FC2-1FC41FC6-1FCC1FD0-1FD31FD6-1FDB1FE0-1FEC1FF2-1FF41FF6-1FFC2071207F2090-209421022107210A-211321152119-211D212421262128212A-212D212F-2139213C-213F2145-2149214E218321842C00-2C2E2C30-2C5E2C60-2CE42CEB-2CEE2D00-2D252D30-2D652D6F2D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE2E2F300530063031-3035303B303C3041-3096309D-309F30A1-30FA30FC-30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A48CA4D0-A4FDA500-A60CA610-A61FA62AA62BA640-A65FA662-A66EA67F-A697A6A0-A6E5A717-A71FA722-A788A78BA78CA7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2A9CFAA00-AA28AA40-AA42AA44-AA4BAA60-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADB-AADDABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB00-FB06FB13-FB17FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF21-FF3AFF41-FF5AFF66-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",Ll:"0061-007A00AA00B500BA00DF-00F600F8-00FF01010103010501070109010B010D010F01110113011501170119011B011D011F01210123012501270129012B012D012F01310133013501370138013A013C013E014001420144014601480149014B014D014F01510153015501570159015B015D015F01610163016501670169016B016D016F0171017301750177017A017C017E-0180018301850188018C018D019201950199-019B019E01A101A301A501A801AA01AB01AD01B001B401B601B901BA01BD-01BF01C601C901CC01CE01D001D201D401D601D801DA01DC01DD01DF01E101E301E501E701E901EB01ED01EF01F001F301F501F901FB01FD01FF02010203020502070209020B020D020F02110213021502170219021B021D021F02210223022502270229022B022D022F02310233-0239023C023F0240024202470249024B024D024F-02930295-02AF037103730377037B-037D039003AC-03CE03D003D103D5-03D703D903DB03DD03DF03E103E303E503E703E903EB03ED03EF-03F303F503F803FB03FC0430-045F04610463046504670469046B046D046F04710473047504770479047B047D047F0481048B048D048F04910493049504970499049B049D049F04A104A304A504A704A904AB04AD04AF04B104B304B504B704B904BB04BD04BF04C204C404C604C804CA04CC04CE04CF04D104D304D504D704D904DB04DD04DF04E104E304E504E704E904EB04ED04EF04F104F304F504F704F904FB04FD04FF05010503050505070509050B050D050F05110513051505170519051B051D051F0521052305250561-05871D00-1D2B1D62-1D771D79-1D9A1E011E031E051E071E091E0B1E0D1E0F1E111E131E151E171E191E1B1E1D1E1F1E211E231E251E271E291E2B1E2D1E2F1E311E331E351E371E391E3B1E3D1E3F1E411E431E451E471E491E4B1E4D1E4F1E511E531E551E571E591E5B1E5D1E5F1E611E631E651E671E691E6B1E6D1E6F1E711E731E751E771E791E7B1E7D1E7F1E811E831E851E871E891E8B1E8D1E8F1E911E931E95-1E9D1E9F1EA11EA31EA51EA71EA91EAB1EAD1EAF1EB11EB31EB51EB71EB91EBB1EBD1EBF1EC11EC31EC51EC71EC91ECB1ECD1ECF1ED11ED31ED51ED71ED91EDB1EDD1EDF1EE11EE31EE51EE71EE91EEB1EED1EEF1EF11EF31EF51EF71EF91EFB1EFD1EFF-1F071F10-1F151F20-1F271F30-1F371F40-1F451F50-1F571F60-1F671F70-1F7D1F80-1F871F90-1F971FA0-1FA71FB0-1FB41FB61FB71FBE1FC2-1FC41FC61FC71FD0-1FD31FD61FD71FE0-1FE71FF2-1FF41FF61FF7210A210E210F2113212F21342139213C213D2146-2149214E21842C30-2C5E2C612C652C662C682C6A2C6C2C712C732C742C76-2C7C2C812C832C852C872C892C8B2C8D2C8F2C912C932C952C972C992C9B2C9D2C9F2CA12CA32CA52CA72CA92CAB2CAD2CAF2CB12CB32CB52CB72CB92CBB2CBD2CBF2CC12CC32CC52CC72CC92CCB2CCD2CCF2CD12CD32CD52CD72CD92CDB2CDD2CDF2CE12CE32CE42CEC2CEE2D00-2D25A641A643A645A647A649A64BA64DA64FA651A653A655A657A659A65BA65DA65FA663A665A667A669A66BA66DA681A683A685A687A689A68BA68DA68FA691A693A695A697A723A725A727A729A72BA72DA72F-A731A733A735A737A739A73BA73DA73FA741A743A745A747A749A74BA74DA74FA751A753A755A757A759A75BA75DA75FA761A763A765A767A769A76BA76DA76FA771-A778A77AA77CA77FA781A783A785A787A78CFB00-FB06FB13-FB17FF41-FF5A",Lu:"0041-005A00C0-00D600D8-00DE01000102010401060108010A010C010E01100112011401160118011A011C011E01200122012401260128012A012C012E01300132013401360139013B013D013F0141014301450147014A014C014E01500152015401560158015A015C015E01600162016401660168016A016C016E017001720174017601780179017B017D018101820184018601870189-018B018E-0191019301940196-0198019C019D019F01A001A201A401A601A701A901AC01AE01AF01B1-01B301B501B701B801BC01C401C701CA01CD01CF01D101D301D501D701D901DB01DE01E001E201E401E601E801EA01EC01EE01F101F401F6-01F801FA01FC01FE02000202020402060208020A020C020E02100212021402160218021A021C021E02200222022402260228022A022C022E02300232023A023B023D023E02410243-02460248024A024C024E03700372037603860388-038A038C038E038F0391-03A103A3-03AB03CF03D2-03D403D803DA03DC03DE03E003E203E403E603E803EA03EC03EE03F403F703F903FA03FD-042F04600462046404660468046A046C046E04700472047404760478047A047C047E0480048A048C048E04900492049404960498049A049C049E04A004A204A404A604A804AA04AC04AE04B004B204B404B604B804BA04BC04BE04C004C104C304C504C704C904CB04CD04D004D204D404D604D804DA04DC04DE04E004E204E404E604E804EA04EC04EE04F004F204F404F604F804FA04FC04FE05000502050405060508050A050C050E05100512051405160518051A051C051E0520052205240531-055610A0-10C51E001E021E041E061E081E0A1E0C1E0E1E101E121E141E161E181E1A1E1C1E1E1E201E221E241E261E281E2A1E2C1E2E1E301E321E341E361E381E3A1E3C1E3E1E401E421E441E461E481E4A1E4C1E4E1E501E521E541E561E581E5A1E5C1E5E1E601E621E641E661E681E6A1E6C1E6E1E701E721E741E761E781E7A1E7C1E7E1E801E821E841E861E881E8A1E8C1E8E1E901E921E941E9E1EA01EA21EA41EA61EA81EAA1EAC1EAE1EB01EB21EB41EB61EB81EBA1EBC1EBE1EC01EC21EC41EC61EC81ECA1ECC1ECE1ED01ED21ED41ED61ED81EDA1EDC1EDE1EE01EE21EE41EE61EE81EEA1EEC1EEE1EF01EF21EF41EF61EF81EFA1EFC1EFE1F08-1F0F1F18-1F1D1F28-1F2F1F38-1F3F1F48-1F4D1F591F5B1F5D1F5F1F68-1F6F1FB8-1FBB1FC8-1FCB1FD8-1FDB1FE8-1FEC1FF8-1FFB21022107210B-210D2110-211221152119-211D212421262128212A-212D2130-2133213E213F214521832C00-2C2E2C602C62-2C642C672C692C6B2C6D-2C702C722C752C7E-2C802C822C842C862C882C8A2C8C2C8E2C902C922C942C962C982C9A2C9C2C9E2CA02CA22CA42CA62CA82CAA2CAC2CAE2CB02CB22CB42CB62CB82CBA2CBC2CBE2CC02CC22CC42CC62CC82CCA2CCC2CCE2CD02CD22CD42CD62CD82CDA2CDC2CDE2CE02CE22CEB2CEDA640A642A644A646A648A64AA64CA64EA650A652A654A656A658A65AA65CA65EA662A664A666A668A66AA66CA680A682A684A686A688A68AA68CA68EA690A692A694A696A722A724A726A728A72AA72CA72EA732A734A736A738A73AA73CA73EA740A742A744A746A748A74AA74CA74EA750A752A754A756A758A75AA75CA75EA760A762A764A766A768A76AA76CA76EA779A77BA77DA77EA780A782A784A786A78BFF21-FF3A",Lt:"01C501C801CB01F21F88-1F8F1F98-1F9F1FA8-1FAF1FBC1FCC1FFC",Lm:"02B0-02C102C6-02D102E0-02E402EC02EE0374037A0559064006E506E607F407F507FA081A0824082809710E460EC610FC17D718431AA71C78-1C7D1D2C-1D611D781D9B-1DBF2071207F2090-20942C7D2D6F2E2F30053031-3035303B309D309E30FC-30FEA015A4F8-A4FDA60CA67FA717-A71FA770A788A9CFAA70AADDFF70FF9EFF9F",Lo:"01BB01C0-01C3029405D0-05EA05F0-05F20621-063F0641-064A066E066F0671-06D306D506EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA0800-08150904-0939093D09500958-096109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E450E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10D0-10FA1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317DC1820-18421844-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C771CE9-1CEC1CEE-1CF12135-21382D30-2D652D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE3006303C3041-3096309F30A1-30FA30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A014A016-A48CA4D0-A4F7A500-A60BA610-A61FA62AA62BA66EA6A0-A6E5A7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2AA00-AA28AA40-AA42AA44-AA4BAA60-AA6FAA71-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADBAADCABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF66-FF6FFF71-FF9DFFA0-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",M:"0300-036F0483-04890591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DE-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0903093C093E-094E0951-0955096209630981-098309BC09BE-09C409C709C809CB-09CD09D709E209E30A01-0A030A3C0A3E-0A420A470A480A4B-0A4D0A510A700A710A750A81-0A830ABC0ABE-0AC50AC7-0AC90ACB-0ACD0AE20AE30B01-0B030B3C0B3E-0B440B470B480B4B-0B4D0B560B570B620B630B820BBE-0BC20BC6-0BC80BCA-0BCD0BD70C01-0C030C3E-0C440C46-0C480C4A-0C4D0C550C560C620C630C820C830CBC0CBE-0CC40CC6-0CC80CCA-0CCD0CD50CD60CE20CE30D020D030D3E-0D440D46-0D480D4A-0D4D0D570D620D630D820D830DCA0DCF-0DD40DD60DD8-0DDF0DF20DF30E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F3E0F3F0F71-0F840F860F870F90-0F970F99-0FBC0FC6102B-103E1056-1059105E-10601062-10641067-106D1071-10741082-108D108F109A-109D135F1712-17141732-1734175217531772177317B6-17D317DD180B-180D18A91920-192B1930-193B19B0-19C019C819C91A17-1A1B1A55-1A5E1A60-1A7C1A7F1B00-1B041B34-1B441B6B-1B731B80-1B821BA1-1BAA1C24-1C371CD0-1CD21CD4-1CE81CED1CF21DC0-1DE61DFD-1DFF20D0-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66F-A672A67CA67DA6F0A6F1A802A806A80BA823-A827A880A881A8B4-A8C4A8E0-A8F1A926-A92DA947-A953A980-A983A9B3-A9C0AA29-AA36AA43AA4CAA4DAA7BAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE3-ABEAABECABEDFB1EFE00-FE0FFE20-FE26",Mn:"0300-036F0483-04870591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DF-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0902093C0941-0948094D0951-095509620963098109BC09C1-09C409CD09E209E30A010A020A3C0A410A420A470A480A4B-0A4D0A510A700A710A750A810A820ABC0AC1-0AC50AC70AC80ACD0AE20AE30B010B3C0B3F0B41-0B440B4D0B560B620B630B820BC00BCD0C3E-0C400C46-0C480C4A-0C4D0C550C560C620C630CBC0CBF0CC60CCC0CCD0CE20CE30D41-0D440D4D0D620D630DCA0DD2-0DD40DD60E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F71-0F7E0F80-0F840F860F870F90-0F970F99-0FBC0FC6102D-10301032-10371039103A103D103E10581059105E-10601071-1074108210851086108D109D135F1712-17141732-1734175217531772177317B7-17BD17C617C9-17D317DD180B-180D18A91920-19221927192819321939-193B1A171A181A561A58-1A5E1A601A621A65-1A6C1A73-1A7C1A7F1B00-1B031B341B36-1B3A1B3C1B421B6B-1B731B801B811BA2-1BA51BA81BA91C2C-1C331C361C371CD0-1CD21CD4-1CE01CE2-1CE81CED1DC0-1DE61DFD-1DFF20D0-20DC20E120E5-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66FA67CA67DA6F0A6F1A802A806A80BA825A826A8C4A8E0-A8F1A926-A92DA947-A951A980-A982A9B3A9B6-A9B9A9BCAA29-AA2EAA31AA32AA35AA36AA43AA4CAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE5ABE8ABEDFB1EFE00-FE0FFE20-FE26",Mc:"0903093E-09400949-094C094E0982098309BE-09C009C709C809CB09CC09D70A030A3E-0A400A830ABE-0AC00AC90ACB0ACC0B020B030B3E0B400B470B480B4B0B4C0B570BBE0BBF0BC10BC20BC6-0BC80BCA-0BCC0BD70C01-0C030C41-0C440C820C830CBE0CC0-0CC40CC70CC80CCA0CCB0CD50CD60D020D030D3E-0D400D46-0D480D4A-0D4C0D570D820D830DCF-0DD10DD8-0DDF0DF20DF30F3E0F3F0F7F102B102C10311038103B103C105610571062-10641067-106D108310841087-108C108F109A-109C17B617BE-17C517C717C81923-19261929-192B193019311933-193819B0-19C019C819C91A19-1A1B1A551A571A611A631A641A6D-1A721B041B351B3B1B3D-1B411B431B441B821BA11BA61BA71BAA1C24-1C2B1C341C351CE11CF2A823A824A827A880A881A8B4-A8C3A952A953A983A9B4A9B5A9BAA9BBA9BD-A9C0AA2FAA30AA33AA34AA4DAA7BABE3ABE4ABE6ABE7ABE9ABEAABEC",Me:"0488048906DE20DD-20E020E2-20E4A670-A672",N:"0030-003900B200B300B900BC-00BE0660-066906F0-06F907C0-07C90966-096F09E6-09EF09F4-09F90A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BF20C66-0C6F0C78-0C7E0CE6-0CEF0D66-0D750E50-0E590ED0-0ED90F20-0F331040-10491090-10991369-137C16EE-16F017E0-17E917F0-17F91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C5920702074-20792080-20892150-21822185-21892460-249B24EA-24FF2776-27932CFD30073021-30293038-303A3192-31953220-32293251-325F3280-328932B1-32BFA620-A629A6E6-A6EFA830-A835A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",Nd:"0030-00390660-066906F0-06F907C0-07C90966-096F09E6-09EF0A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BEF0C66-0C6F0CE6-0CEF0D66-0D6F0E50-0E590ED0-0ED90F20-0F291040-10491090-109917E0-17E91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C59A620-A629A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",Nl:"16EE-16F02160-21822185-218830073021-30293038-303AA6E6-A6EF",No:"00B200B300B900BC-00BE09F4-09F90BF0-0BF20C78-0C7E0D70-0D750F2A-0F331369-137C17F0-17F920702074-20792080-20892150-215F21892460-249B24EA-24FF2776-27932CFD3192-31953220-32293251-325F3280-328932B1-32BFA830-A835",P:"0021-00230025-002A002C-002F003A003B003F0040005B-005D005F007B007D00A100AB00B700BB00BF037E0387055A-055F0589058A05BE05C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F3A-0F3D0F850FD0-0FD4104A-104F10FB1361-13681400166D166E169B169C16EB-16ED1735173617D4-17D617D8-17DA1800-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD32010-20272030-20432045-20512053-205E207D207E208D208E2329232A2768-277527C527C627E6-27EF2983-299829D8-29DB29FC29FD2CF9-2CFC2CFE2CFF2E00-2E2E2E302E313001-30033008-30113014-301F3030303D30A030FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFD3EFD3FFE10-FE19FE30-FE52FE54-FE61FE63FE68FE6AFE6BFF01-FF03FF05-FF0AFF0C-FF0FFF1AFF1BFF1FFF20FF3B-FF3DFF3FFF5BFF5DFF5F-FF65",Pd:"002D058A05BE140018062010-20152E172E1A301C303030A0FE31FE32FE58FE63FF0D",Ps:"0028005B007B0F3A0F3C169B201A201E2045207D208D23292768276A276C276E27702772277427C527E627E827EA27EC27EE2983298529872989298B298D298F299129932995299729D829DA29FC2E222E242E262E283008300A300C300E3010301430163018301A301DFD3EFE17FE35FE37FE39FE3BFE3DFE3FFE41FE43FE47FE59FE5BFE5DFF08FF3BFF5BFF5FFF62",Pe:"0029005D007D0F3B0F3D169C2046207E208E232A2769276B276D276F27712773277527C627E727E927EB27ED27EF298429862988298A298C298E2990299229942996299829D929DB29FD2E232E252E272E293009300B300D300F3011301530173019301B301E301FFD3FFE18FE36FE38FE3AFE3CFE3EFE40FE42FE44FE48FE5AFE5CFE5EFF09FF3DFF5DFF60FF63",Pi:"00AB2018201B201C201F20392E022E042E092E0C2E1C2E20",Pf:"00BB2019201D203A2E032E052E0A2E0D2E1D2E21",Pc:"005F203F20402054FE33FE34FE4D-FE4FFF3F",Po:"0021-00230025-0027002A002C002E002F003A003B003F0040005C00A100B700BF037E0387055A-055F058905C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F850FD0-0FD4104A-104F10FB1361-1368166D166E16EB-16ED1735173617D4-17D617D8-17DA1800-18051807-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD3201620172020-20272030-2038203B-203E2041-20432047-205120532055-205E2CF9-2CFC2CFE2CFF2E002E012E06-2E082E0B2E0E-2E162E182E192E1B2E1E2E1F2E2A-2E2E2E302E313001-3003303D30FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFE10-FE16FE19FE30FE45FE46FE49-FE4CFE50-FE52FE54-FE57FE5F-FE61FE68FE6AFE6BFF01-FF03FF05-FF07FF0AFF0CFF0EFF0FFF1AFF1BFF1FFF20FF3CFF61FF64FF65",S:"0024002B003C-003E005E0060007C007E00A2-00A900AC00AE-00B100B400B600B800D700F702C2-02C502D2-02DF02E5-02EB02ED02EF-02FF03750384038503F604820606-0608060B060E060F06E906FD06FE07F609F209F309FA09FB0AF10B700BF3-0BFA0C7F0CF10CF20D790E3F0F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-139917DB194019E0-19FF1B61-1B6A1B74-1B7C1FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE20442052207A-207C208A-208C20A0-20B8210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B2140-2144214A-214D214F2190-2328232B-23E82400-24262440-244A249C-24E92500-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE27C0-27C427C7-27CA27CC27D0-27E527F0-29822999-29D729DC-29FB29FE-2B4C2B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F309B309C319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A700-A716A720A721A789A78AA828-A82BA836-A839AA77-AA79FB29FDFCFDFDFE62FE64-FE66FE69FF04FF0BFF1C-FF1EFF3EFF40FF5CFF5EFFE0-FFE6FFE8-FFEEFFFCFFFD",Sm:"002B003C-003E007C007E00AC00B100D700F703F60606-060820442052207A-207C208A-208C2140-2144214B2190-2194219A219B21A021A321A621AE21CE21CF21D221D421F4-22FF2308-230B23202321237C239B-23B323DC-23E125B725C125F8-25FF266F27C0-27C427C7-27CA27CC27D0-27E527F0-27FF2900-29822999-29D729DC-29FB29FE-2AFF2B30-2B442B47-2B4CFB29FE62FE64-FE66FF0BFF1C-FF1EFF5CFF5EFFE2FFE9-FFEC",Sc:"002400A2-00A5060B09F209F309FB0AF10BF90E3F17DB20A0-20B8A838FDFCFE69FF04FFE0FFE1FFE5FFE6",Sk:"005E006000A800AF00B400B802C2-02C502D2-02DF02E5-02EB02ED02EF-02FF0375038403851FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE309B309CA700-A716A720A721A789A78AFF3EFF40FFE3",So:"00A600A700A900AE00B000B60482060E060F06E906FD06FE07F609FA0B700BF3-0BF80BFA0C7F0CF10CF20D790F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-1399194019E0-19FF1B61-1B6A1B74-1B7C210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B214A214C214D214F2195-2199219C-219F21A121A221A421A521A7-21AD21AF-21CD21D021D121D321D5-21F32300-2307230C-231F2322-2328232B-237B237D-239A23B4-23DB23E2-23E82400-24262440-244A249C-24E92500-25B625B8-25C025C2-25F72600-266E2670-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE2800-28FF2B00-2B2F2B452B462B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A828-A82BA836A837A839AA77-AA79FDFDFFE4FFE8FFEDFFEEFFFCFFFD",Z:"002000A01680180E2000-200A20282029202F205F3000",Zs:"002000A01680180E2000-200A202F205F3000",Zl:"2028",Zp:"2029",C:"0000-001F007F-009F00AD03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-0605061C061D0620065F06DD070E070F074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17B417B517DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF200B-200F202A-202E2060-206F20722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-F8FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFD-FF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFFBFFFEFFFF",Cc:"0000-001F007F-009F",Cf:"00AD0600-060306DD070F17B417B5200B-200F202A-202E2060-2064206A-206FFEFFFFF9-FFFB",Co:"E000-F8FF",Cs:"D800-DFFF",Cn:"03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-05FF06040605061C061D0620065F070E074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF2065-206920722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-D7FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFDFEFEFF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFF8FFFEFFFF"})}),define("ace/document",["require","exports","module","pilot/oop","pilot/event_emitter","ace/range","ace/anchor"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=a("ace/range").Range,g=a("ace/anchor").Anchor,h=function(a){this.$lines=[],Array.isArray(a)?this.insertLines(0,a):a.length==0?this.$lines=[""]:this.insert({row:0,column:0},a)};(function(){d.implement(this,e),this.setValue=function(a){var b=this.getLength();this.remove(new f(0,0,b,this.getLine(b-1).length)),this.insert({row:0,column:0},a)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(a,b){return new g(this,a,b)},"aaa".split(/a/).length==0?this.$split=function(a){return a.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(a){return a.split(/\r\n|\r|\n/)},this.$detectNewLine=function(a){var b=a.match(/^.*?(\r?\n)/m);b?this.$autoNewLine=b[1]:this.$autoNewLine="\n"},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";case"auto":return this.$autoNewLine}},this.$autoNewLine="\n",this.$newLineMode="auto",this.setNewLineMode=function(a){this.$newLineMode!==a&&(this.$newLineMode=a)},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(a){return a=="\r\n"||a=="\r"||a=="\n"},this.getLine=function(a){return this.$lines[a]||""},this.getLines=function(a,b){return this.$lines.slice(a,b+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(a){if(a.start.row==a.end.row)return this.$lines[a.start.row].substring(a.start.column,a.end.column);var b=[];b.push(this.$lines[a.start.row].substring(a.start.column)),b.push.apply(b,this.getLines(a.start.row+1,a.end.row-1)),b.push(this.$lines[a.end.row].substring(0,a.end.column));return b.join(this.getNewLineCharacter())},this.$clipPosition=function(a){var b=this.getLength();a.row>=b&&(a.row=Math.max(0,b-1),a.column=this.getLine(b-1).length);return a},this.insert=function(a,b){if(b.length==0)return a;a=this.$clipPosition(a),this.getLength()<=1&&this.$detectNewLine(b);var c=this.$split(b),d=c.splice(0,1)[0],e=c.length==0?null:c.splice(c.length-1,1)[0];a=this.insertInLine(a,d),e!==null&&(a=this.insertNewLine(a),a=this.insertLines(a.row,c),a=this.insertInLine(a,e||""));return a},this.insertLines=function(a,b){if(b.length==0)return{row:a,column:0};var c=[a,0];c.push.apply(c,b),this.$lines.splice.apply(this.$lines,c);var d=new f(a,0,a+b.length,0),e={action:"insertLines",range:d,lines:b};this._dispatchEvent("change",{data:e});return d.end},this.insertNewLine=function(a){a=this.$clipPosition(a);var b=this.$lines[a.row]||"";this.$lines[a.row]=b.substring(0,a.column),this.$lines.splice(a.row+1,0,b.substring(a.column,b.length));var c={row:a.row+1,column:0},d={action:"insertText",range:f.fromPoints(a,c),text:this.getNewLineCharacter()};this._dispatchEvent("change",{data:d});return c},this.insertInLine=function(a,b){if(b.length==0)return a;var c=this.$lines[a.row]||"";this.$lines[a.row]=c.substring(0,a.column)+b+c.substring(a.column);var d={row:a.row,column:a.column+b.length},e={action:"insertText",range:f.fromPoints(a,d),text:b};this._dispatchEvent("change",{data:e});return d},this.remove=function(a){a.start=this.$clipPosition(a.start),a.end=this.$clipPosition(a.end);if(a.isEmpty())return a.start;var b=a.start.row,c=a.end.row;if(a.isMultiLine()){var d=a.start.column==0?b:b+1,e=c-1;a.end.column>0&&this.removeInLine(c,0,a.end.column),e>=d&&this.removeLines(d,e),d!=b&&(this.removeInLine(b,a.start.column,this.getLine(b).length),this.removeNewLine(a.start.row))}else this.removeInLine(b,a.start.column,a.end.column);return a.start},this.removeInLine=function(a,b,c){if(b!=c){var d=new f(a,b,a,c),e=this.getLine(a),g=e.substring(b,c),h=e.substring(0,b)+e.substring(c,e.length);this.$lines.splice(a,1,h);var i={action:"removeText",range:d,text:g};this._dispatchEvent("change",{data:i});return d.start}},this.removeLines=function(a,b){var c=new f(a,0,b+1,0),d=this.$lines.splice(a,b-a+1),e={action:"removeLines",range:c,nl:this.getNewLineCharacter(),lines:d};this._dispatchEvent("change",{data:e});return d},this.removeNewLine=function(a){var b=this.getLine(a),c=this.getLine(a+1),d=new f(a,b.length,a+1,0),e=b+c;this.$lines.splice(a,2,e);var g={action:"removeText",range:d,text:this.getNewLineCharacter()};this._dispatchEvent("change",{data:g})},this.replace=function(a,b){if(b.length==0&&a.isEmpty())return a.start;if(b==this.getTextRange(a))return a.end;this.remove(a);if(b)var c=this.insert(a.start,b);else c=a.start;return c},this.applyDeltas=function(a){for(var b=0;b<a.length;b++){var c=a[b],d=f.fromPoints(c.range.start,c.range.end);c.action=="insertLines"?this.insertLines(d.start.row,c.lines):c.action=="insertText"?this.insert(d.start,c.text):c.action=="removeLines"?this.removeLines(d.start.row,d.end.row-1):c.action=="removeText"&&this.remove(d)}},this.revertDeltas=function(a){for(var b=a.length-1;b>=0;b--){var c=a[b],d=f.fromPoints(c.range.start,c.range.end);c.action=="insertLines"?this.removeLines(d.start.row,d.end.row-1):c.action=="insertText"?this.remove(d):c.action=="removeLines"?this.insertLines(d.start.row,c.lines):c.action=="removeText"&&this.insert(d.start,c.text)}}}).call(h.prototype),b.Document=h}),define("ace/anchor",["require","exports","module","pilot/oop","pilot/event_emitter"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=b.Anchor=function(a,b,c){this.document=a,typeof c=="undefined"?this.setPosition(b.row,b.column):this.setPosition(b,c),this.$onChange=this.onChange.bind(this),a.on("change",this.$onChange)};(function(){d.implement(this,e),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.onChange=function(a){var b=a.data,c=b.range;if(c.start.row!=c.end.row||c.start.row==this.row){if(c.start.row>this.row)return;if(c.start.row==this.row&&c.start.column>this.column)return;var d=this.row,e=this.column;b.action==="insertText"?c.start.row===d&&c.start.column<=e?c.start.row===c.end.row?e+=c.end.column-c.start.column:(e-=c.start.column,d+=c.end.row-c.start.row):c.start.row!==c.end.row&&c.start.row<d&&(d+=c.end.row-c.start.row):b.action==="insertLines"?c.start.row<=d&&(d+=c.end.row-c.start.row):b.action=="removeText"?c.start.row==d&&c.start.column<e?c.end.column>=e?e=c.start.column:e=Math.max(0,e-(c.end.column-c.start.column)):c.start.row!==c.end.row&&c.start.row<d?(c.end.row==d&&(e=Math.max(0,e-c.end.column)+c.start.column),d-=c.end.row-c.start.row):c.end.row==d&&(d-=c.end.row-c.start.row,e=Math.max(0,e-c.end.column)+c.start.column):b.action=="removeLines"&&c.start.row<=d&&(c.end.row<=d?d-=c.end.row-c.start.row:(d=c.start.row,e=0)),this.setPosition(d,e,!0)}},this.setPosition=function(a,b,c){var d;c?d={row:a,column:b}:d=this.$clipPositionToDocument(a,b);if(this.row!=d.row||this.column!=d.column){var e={row:this.row,column:this.column};this.row=d.row,this.column=d.column,this._dispatchEvent("change",{old:e,value:d})}},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.$clipPositionToDocument=function(a,b){var c={};a>=this.document.getLength()?(c.row=Math.max(0,this.document.getLength()-1),c.column=this.document.getLine(c.row).length):a<0?(c.row=0,c.column=0):(c.row=a,c.column=Math.min(this.document.getLine(c.row).length,Math.max(0,b))),b<0&&(c.column=0);return c}}).call(f.prototype)}),define("ace/background_tokenizer",["require","exports","module","pilot/oop","pilot/event_emitter"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=function(a,b){this.running=!1,this.lines=[],this.currentLine=0,this.tokenizer=a;var c=this;this.$worker=function(){if(!!c.running){var a=new Date,b=c.currentLine,d=c.doc,e=0,f=d.getLength();while(c.currentLine<f){c.lines[c.currentLine]=c.$tokenizeRows(c.currentLine,c.currentLine)[0],c.currentLine++,e+=1;if(e%5==0&&new Date-a>20){c.fireUpdateEvent(b,c.currentLine-1),c.running=setTimeout(c.$worker,20);return}}c.running=!1,c.fireUpdateEvent(b,f-1)}}};(function(){d.implement(this,e),this.setTokenizer=function(a){this.tokenizer=a,this.lines=[],this.start(0)},this.setDocument=function(a){this.doc=a,this.lines=[],this.stop()},this.fireUpdateEvent=function(a,b){var c={first:a,last:b};this._dispatchEvent("update",{data:c})},this.start=function(a){this.currentLine=Math.min(a||0,this.currentLine,this.doc.getLength()),this.lines.splice(this.currentLine,this.lines.length),this.stop(),this.running=setTimeout(this.$worker,700)},this.stop=function(){this.running&&clearTimeout(this.running),this.running=!1},this.getTokens=function(a,b){return this.$tokenizeRows(a,b)},this.getState=function(a){return this.$tokenizeRows(a,a)[0].state},this.$tokenizeRows=function(a,b){if(!this.doc)return[];var c=[],d="start",e=!1;a>0&&this.lines[a-1]?(d=this.lines[a-1].state,e=!0):a==0?(d="start",e=!0):this.lines.length>0&&(d=this.lines[this.lines.length-1].state);var f=this.doc.getLines(a,b);for(var g=a;g<=b;g++)if(!this.lines[g]){var h=this.tokenizer.getLineTokens(f[g-a]||"",d),d=h.state;c.push(h),e&&(this.lines[g]=h)}else{var h=this.lines[g];d=h.state,c.push(h)}return c}}).call(f.prototype),b.BackgroundTokenizer=f}),define("ace/edit_session/folding",["require","exports","module","ace/range","ace/edit_session/fold_line","ace/edit_session/fold"],function(a,b,c){function g(){this.getFoldAt=function(a,b,c){var d=this.getFoldLine(a);if(!d)return null;var e=d.folds;for(var f=0;f<e.length;f++){var g=e[f];if(g.range.contains(a,b)){if(c==1&&g.range.isEnd(a,b))continue;if(c==-1&&g.range.isStart(a,b))continue;return g}}},this.getFoldsInRange=function(a){a=a.clone();var b=a.start,c=a.end,d=this.$foldData,e=[];b.column+=1,c.column-=1;for(var f=0;f<d.length;f++){var g=d[f].range.compareRange(a);if(g==2)continue;if(g==-2)break;var h=d[f].folds;for(var i=0;i<h.length;i++){var j=h[i];g=j.range.compareRange(a);if(g==-2)break;if(g==2)continue;if(g==42)break;e.push(j)}}return e},this.getFoldStringAt=function(a,b,c,d){var d=d||this.getFoldLine(a);if(!d)return null;var e={end:{column:0}};for(var f=0;f<d.folds.length;f++){var g=d.folds[f],h=g.range.compareEnd(a,b);if(h==-1){var i=this.getLine(g.start.row).substring(e.end.column,g.start.column);break}if(h==0)return null;e=g}i||(i=this.getLine(g.start.row).substring(e.end.column));return c==-1?i.substring(0,b-e.end.column):c==1?i.substring(b-e.end.column):i},this.getFoldLine=function(a,b){var c=this.$foldData,d=0;b&&(d=c.indexOf(b)),d==-1&&(d=0);for(d;d<c.length;d++){var e=c[d];if(e.start.row<=a&&e.end.row>=a)return e;if(e.end.row>a)return null}return null},this.getNextFold=function(a,b){var c=this.$foldData,d,e=0;b&&(e=c.indexOf(b)),e==-1&&(e=0);for(e;e<c.length;e++){var f=c[e];if(f.end.row>=a)return f}return null},this.getFoldedRowCount=function(a,b){var c=this.$foldData,d=b-a+1;for(var e=0;e<c.length;e++){var f=c[e],g=f.end.row,h=f.start.row;if(g>=b){h<b&&(h>=a?d-=b-h:d=0);break}g>=a&&(h>=a?d-=g-h:d-=g-a+1)}return d},this.$addFoldLine=function(a){this.$foldData.push(a),this.$foldData.sort(function(a,b){return a.start.row-b.start.row});return a},this.addFold=function(a,b){var c=this.$foldData,d=!1;if(a instanceof f)var g=a;else g=new f(b,a);var h=g.start.row,i=g.start.column,j=g.end.row,k=g.end.column;if(g.placeholder.length<2)throw"Placeholder has to be at least 2 characters";if(h==j&&k-i<2)throw"The range has to be at least 2 characters width";var l=this.getFoldAt(h,i,1);if(l&&l.range.isEnd(j,k)&&l.range.isStart(h,i))return g;l=this.getFoldAt(h,i,1);if(l&&!l.range.isStart(h,i))throw"A fold can't start inside of an already existing fold";l=this.getFoldAt(j,k,-1);if(l&&!l.range.isEnd(j,k))throw"A fold can't end inside of an already existing fold";if(j>=this.doc.getLength())throw"End of fold is outside of the document.";if(k>this.getLine(j).length||i>this.getLine(h).length)throw"End of fold is outside of the document.";var m=this.getFoldsInRange(g.range);m.length>0&&(this.removeFolds(m),g.subFolds=m);for(var n=0;n<c.length;n++){var o=c[n];if(j==o.start.row){o.addFold(g),d=!0;break}if(h==o.end.row){o.addFold(g),d=!0;if(!g.sameRow){foldLineNext=c[n+1];if(foldLineNext&&foldLineNext.start.row==j){o.merge(foldLineNext);break}}break}if(j<=o.start.row)break}d||(o=this.$addFoldLine(new e(this.$foldData,g))),this.$useWrapMode&&this.$updateWrapData(o.start.row,o.start.row),this.$modified=!0,this._dispatchEvent("changeFold",{data:g});return g},this.addFolds=function(a){a.forEach(function(a){this.addFold(a)},this)},this.removeFold=function(a){var b=a.foldLine,c=b.start.row,d=b.end.row,e=this.$foldData,f=b.folds;if(f.length==1)e.splice(e.indexOf(b),1);else if(b.range.isEnd(a.end.row,a.end.column))f.pop(),b.end.row=f[f.length-1].end.row,b.end.column=f[f.length-1].end.column;else if(b.range.isStart(a.start.row,a.start.column))f.shift(),b.start.row=f[0].start.row,b.start.column=f[0].start.column;else if(a.sameRow)f.splice(f.indexOf(a),1);else{var g=b.split(a.start.row,a.start.column);g.folds.shift(),b.start.row=f[0].start.row,b.start.column=f[0].start.column,this.$addFoldLine(g)}this.$useWrapMode&&this.$updateWrapData(c,d),this.$modified=!0,this._dispatchEvent("changeFold",{data:a})},this.removeFolds=function(a){var b=[];for(var c=0;c<a.length;c++)b.push(a[c]);b.forEach(function(a){this.removeFold(a)},this),this.$modified=!0},this.expandFold=function(a){this.removeFold(a),a.subFolds.forEach(function(a){this.addFold(a)},this),a.subFolds=[]},this.expandFolds=function(a){a.forEach(function(a){this.expandFold(a)},this)},this.isRowFolded=function(a,b){return!!this.getFoldLine(a,b)},this.getRowFoldEnd=function(a,b){var c=this.getFoldLine(a,b);return c?c.end.row:a},this.getFoldDisplayLine=function(a,b,c,d,e){d==null&&(d=a.start.row,e=0),b==null&&(b=a.end.row,c=this.getLine(b).length);var f="",g=this.doc,h="";a.walk(function(a,b,c,f,i){if(!(b<d)){if(b==d){if(c<e)return;f=Math.max(e,f)}a?h+=a:h+=g.getLine(b).substring(f,c)}}.bind(this),b,c);return h},this.getDisplayLine=function(a,b,c,d){var e=this.getFoldLine(a);if(!e){var f;f=this.doc.getLine(a);return f.substring(d||0,b||f.length)}return this.getFoldDisplayLine(e,a,b,c,d)},this.$cloneFoldData=function(){var a=this.$foldData,b=[];b=this.$foldData.map(function(a){var c=a.folds.map(function(a){return a.clone()});return new e(b,c)});return b}}var d=a("ace/range").Range,e=a("ace/edit_session/fold_line").FoldLine,f=a("ace/edit_session/fold").Fold;b.Folding=g}),define("ace/edit_session/fold_line",["require","exports","module","ace/range"],function(a,b,c){function e(a,b){this.foldData=a,Array.isArray(b)?this.folds=b:b=this.folds=[b];var c=b[b.length-1];this.range=new d(b[0].start.row,b[0].start.column,c.end.row,c.end.column),this.start=this.range.start,this.end=this.range.end,this.folds.forEach(function(a){a.setFoldLine(this)},this)}var d=a("ace/range").Range;(function(){this.shiftRow=function(a){this.start.row+=a,this.end.row+=a,this.folds.forEach(function(b){b.start.row+=a,b.end.row+=a})},this.addFold=function(a){if(a.sameRow){if(a.start.row<this.startRow||a.endRow>this.endRow)throw"Can't add a fold to this FoldLine as it has no connection";this.folds.push(a),this.folds.sort(function(a,b){return-a.range.compareEnd(b.start.row,b.start.column)}),this.range.compareEnd(a.start.row,a.start.column)>0?(this.end.row=a.end.row,this.end.column=a.end.column):this.range.compareStart(a.end.row,a.end.column)<0&&(this.start.row=a.start.row,this.start.column=a.start.column)}else if(a.start.row==this.end.row)this.folds.push(a),this.end.row=a.end.row,this.end.column=a.end.column;else if(a.end.row==this.start.row)this.folds.unshift(a),this.start.row=a.start.row,this.start.column=a.start.column;else throw"Trying to add fold to FoldRow that doesn't have a matching row";a.foldLine=this},this.containsRow=function(a){return a>=this.start.row&&a<=this.end.row},this.walk=function(a,b,c){var d=0,e=this.folds,f,g,h,i=!0;b==null&&(b=this.end.row,c=this.end.column);for(var j=0;j<e.length;j++){f=e[j],g=f.range.compareStart(b,c);if(g==-1){a(null,b,c,d,i);return}h=a(null,f.start.row,f.start.column,d,i),h=!h&&a(f.placeholder,f.start.row,f.start.column,d);if(h||g==0)return;i=!f.sameRow,d=f.end.column}a(null,b,c,d,i)},this.getNextFoldTo=function(a,b){var c,d;for(var e=0;e<this.folds.length;e++){c=this.folds[e],d=c.range.compareEnd(a,b);if(d==-1)return{fold:c,kind:"after"};if(d==0)return{fold:c,kind:"inside"}}return null},this.addRemoveChars=function(a,b,c){var d=this.getNextFoldTo(a,b),e,f;if(d){e=d.fold;if(d.kind=="inside"&&e.start.column!=b&&e.start.row!=a)throw"Moving characters inside of a fold should never be reached";if(e.start.row==a){f=this.folds;var g=f.indexOf(e);g==0&&(this.start.column+=c);for(g;g<f.length;g++){e=f[g],e.start.column+=c;if(!e.sameRow)return;e.end.column+=c}this.end.column+=c}}},this.split=function(a,b){var c=this.getNextFoldTo(a,b).fold,d=this.folds,f=this.foldData;if(!c)return null;var g=d.indexOf(c),h=d[g-1];this.end.row=h.end.row,this.end.column=h.end.column,d=d.splice(g,d.length-g);var i=new e(f,d);f.splice(f.indexOf(this)+1,0,i);return i},this.merge=function(a){var b=a.folds;for(var c=0;c<b.length;c++)this.addFold(b[c]);var d=this.foldData;d.splice(d.indexOf(a),1)},this.toString=function(){var a=[this.range.toString()+": ["];this.folds.forEach(function(b){a.push("  "+b.toString())}),a.push("]");return a.join("\n")},this.idxToPosition=function(a){var b=0,c;for(var d=0;d<this.folds.length;d++){var c=this.folds[d];a-=c.start.column-b;if(a<0)return{row:c.start.row,column:c.start.column+a};a-=c.placeholder.length;if(a<0)return c.start;b=c.end.column}return{row:this.end.row,column:this.end.column+a}}}).call(e.prototype),b.FoldLine=e}),define("ace/edit_session/fold",["require","exports","module"],function(a,b,c){var d=b.Fold=function(a,b){this.foldLine=null,this.placeholder=b,this.range=a,this.start=a.start,this.end=a.end,this.sameRow=a.start.row==a.end.row,this.subFolds=[]};(function(){this.toString=function(){return'"'+this.placeholder+'" '+this.range.toString()},this.setFoldLine=function(a){this.foldLine=a,this.subFolds.forEach(function(b){b.setFoldLine(a)})},this.clone=function(){var a=this.range.clone(),b=new d(a,this.placeholder);this.subFolds.forEach(function(a){b.subFolds.push(a.clone())});return b}}).call(d.prototype)}),define("ace/search",["require","exports","module","pilot/lang","pilot/oop","ace/range"],function(a,b,c){var d=a("pilot/lang"),e=a("pilot/oop"),f=a("ace/range").Range,g=function(){this.$options={needle:"",backwards:!1,wrap:!1,caseSensitive:!1,wholeWord:!1,scope:g.ALL,regExp:!1}};g.ALL=1,g.SELECTION=2,function(){this.set=function(a){e.mixin(this.$options,a);return this},this.getOptions=function(){return d.copyObject(this.$options)},this.find=function(a){if(!this.$options.needle)return null;if(this.$options.backwards)var b=this.$backwardMatchIterator(a);else b=this.$forwardMatchIterator(a);var c=null;b.forEach(function(a){c=a;return!0});return c},this.findAll=function(a){if(!this.$options.needle)return[];if(this.$options.backwards)var b=this.$backwardMatchIterator(a);else b=this.$forwardMatchIterator(a);var c=[];b.forEach(function(a){c.push(a)});return c},this.replace=function(a,b){var c=this.$assembleRegExp(),d=c.exec(a);return d&&d[0].length==a.length?this.$options.regExp?a.replace(c,b):b:null},this.$forwardMatchIterator=function(a){var b=this.$assembleRegExp(),c=this;return{forEach:function(d){c.$forwardLineIterator(a).forEach(function(a,e,f){e&&(a=a.substring(e));var g=[];a.replace(b,function(a){var b=arguments[arguments.length-2];g.push({str:a,offset:e+b});return a});for(var h=0;h<g.length;h++){var i=g[h],j=c.$rangeFromMatch(f,i.offset,i.str.length);if(d(j))return!0}})}}},this.$backwardMatchIterator=function(a){var b=this.$assembleRegExp(),c=this;return{forEach:function(d){c.$backwardLineIterator(a).forEach(function(a,e,f){e&&(a=a.substring(e));var g=[];a.replace(b,function(a,b){g.push({str:a,offset:e+b});return a});for(var h=g.length-1;h>=0;h--){var i=g[h],j=c.$rangeFromMatch(f,i.offset,i.str.length);if(d(j))return!0}})}}},this.$rangeFromMatch=function(a,b,c){return new f(a,b,a,b+c)},this.$assembleRegExp=function(){if(this.$options.regExp)var a=this.$options.needle;else a=d.escapeRegExp(this.$options.needle);this.$options.wholeWord&&(a="\\b"+a+"\\b");var b="g";this.$options.caseSensitive||(b+="i");var c=new RegExp(a,b);return c},this.$forwardLineIterator=function(a){function k(e){var f=a.getLine(e);b&&e==c.end.row&&(f=f.substring(0,c.end.column)),j&&e==d.row&&(f=f.substring(0,d.column));return f}var b=this.$options.scope==g.SELECTION,c=a.getSelection().getRange(),d=a.getSelection().getCursor(),e=b?c.start.row:0,f=b?c.start.column:0,h=b?c.end.row:a.getLength()-1,i=this.$options.wrap,j=!1;return{forEach:function(a){var b=d.row,c=k(b),g=d.column,l=!1;j=!1;while(!a(c,g,b)){if(l)return;b++,g=0;if(b>h)if(i)b=e,g=f,j=!0;else return;b==d.row&&(l=!0),c=k(b)}}}},this.$backwardLineIterator=function(a){var b=this.$options.scope==g.SELECTION,c=a.getSelection().getRange(),d=b?c.end:c.start,e=b?c.start.row:0,f=b?c.start.column:0,h=b?c.end.row:a.getLength()-1,i=this.$options.wrap;return{forEach:function(g){var j=d.row,k=a.getLine(j).substring(0,d.column),l=0,m=!1,n=!1;while(!g(k,l,j)){if(m)return;j--,l=0;if(j<e)if(i)j=h,n=!0;else return;j==d.row&&(m=!0),k=a.getLine(j),b&&(j==e?l=f:j==h&&(k=k.substring(0,c.end.column))),n&&j==d.row&&(l=d.column)}}}}}.call(g.prototype),b.Search=g}),define("ace/undomanager",["require","exports","module"],function(a,b,c){var d=function(){this.reset()};(function(){this.execute=function(a){var b=a.args[0];this.$doc=a.args[1],this.$undoStack.push(b),this.$redoStack=[]},this.undo=function(a){var b=this.$undoStack.pop(),c=null;b&&(c=this.$doc.undoChanges(b,a),this.$redoStack.push(b));return c},this.redo=function(a){var b=this.$redoStack.pop(),c=null;b&&(c=this.$doc.redoChanges(b,a),this.$undoStack.push(b));return c},this.reset=function(){this.$undoStack=[],this.$redoStack=[]},this.hasUndo=function(){return this.$undoStack.length>0},this.hasRedo=function(){return this.$redoStack.length>0}}).call(d.prototype),b.UndoManager=d}),define("ace/virtual_renderer",["require","exports","module","pilot/oop","pilot/dom","pilot/event","pilot/useragent","ace/layer/gutter","ace/layer/marker","ace/layer/text","ace/layer/cursor","ace/scrollbar","ace/renderloop","pilot/event_emitter","text/ace/css/editor.css"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/dom"),f=a("pilot/event"),g=a("pilot/useragent"),h=a("ace/layer/gutter").Gutter,i=a("ace/layer/marker").Marker,j=a("ace/layer/text").Text,k=a("ace/layer/cursor").Cursor,l=a("ace/scrollbar").ScrollBar,m=a("ace/renderloop").RenderLoop,n=a("pilot/event_emitter").EventEmitter,o=a("text/ace/css/editor.css");e.importCssString(o);var p=function(a,b){this.container=a,e.addCssClass(this.container,"ace_editor"),this.setTheme(b),this.$gutter=e.createElement("div"),this.$gutter.className="ace_gutter",this.container.appendChild(this.$gutter),this.scroller=e.createElement("div"),this.scroller.className="ace_scroller",this.container.appendChild(this.scroller),this.content=e.createElement("div"),this.content.className="ace_content",this.scroller.appendChild(this.content),this.$gutterLayer=new h(this.$gutter),this.$markerBack=new i(this.content);var c=this.$textLayer=new j(this.content);this.canvas=c.element,this.$markerFront=new i(this.content),this.characterWidth=c.getCharacterWidth(),this.lineHeight=c.getLineHeight(),this.$cursorLayer=new k(this.content),this.$cursorPadding=8,this.$horizScroll=!0,this.$horizScrollAlwaysVisible=!0,this.scrollBar=new l(a),this.scrollBar.addEventListener("scroll",this.onScroll.bind(this)),this.scrollTop=0,this.cursorPos={row:0,column:0};var d=this;this.$textLayer.addEventListener("changeCharaterSize",function(){d.characterWidth=c.getCharacterWidth(),d.lineHeight=c.getLineHeight(),d.$updatePrintMargin(),d.onResize(!0),d.$loop.schedule(d.CHANGE_FULL)}),f.addListener(this.$gutter,"click",this.$onGutterClick.bind(this)),f.addListener(this.$gutter,"dblclick",this.$onGutterClick.bind(this)),this.$size={width:0,height:0,scrollerHeight:0,scrollerWidth:0},this.layerConfig={width:1,padding:0,firstRow:0,firstRowScreen:0,lastRow:0,lineHeight:1,characterWidth:1,minHeight:1,maxHeight:1,offset:0,height:1},this.$loop=new m(this.$renderChanges.bind(this)),this.$loop.schedule(this.CHANGE_FULL),this.setPadding(4),this.$updatePrintMargin()};(function(){this.showGutter=!0,this.CHANGE_CURSOR=1,this.CHANGE_MARKER=2,this.CHANGE_GUTTER=4,this.CHANGE_SCROLL=8,this.CHANGE_LINES=16,this.CHANGE_TEXT=32,this.CHANGE_SIZE=64,this.CHANGE_MARKER_BACK=128,this.CHANGE_MARKER_FRONT=256,this.CHANGE_FULL=512,d.implement(this,n),this.setSession=function(a){this.session=a,this.$cursorLayer.setSession(a),this.$markerBack.setSession(a),this.$markerFront.setSession(a),this.$gutterLayer.setSession(a),this.$textLayer.setSession(a),this.$loop.schedule(this.CHANGE_FULL)},this.updateLines=function(a,b){b===undefined&&(b=Infinity),this.$changedLines?(this.$changedLines.firstRow>a&&(this.$changedLines.firstRow=a),this.$changedLines.lastRow<b&&(this.$changedLines.lastRow=b)):this.$changedLines={firstRow:a,lastRow:b},this.$loop.schedule(this.CHANGE_LINES)},this.updateText=function(){this.$loop.schedule(this.CHANGE_TEXT)},this.updateFull=function(){this.$loop.schedule(this.CHANGE_FULL)},this.updateFontSize=function(){this.$textLayer.checkForSizeChanges()},this.onResize=function(a){var b=this.CHANGE_SIZE,c=this.$size,d=e.getInnerHeight(this.container);if(a||c.height!=d)c.height=d,this.scroller.style.height=d+"px",c.scrollerHeight=this.scroller.clientHeight,this.scrollBar.setHeight(c.scrollerHeight),this.session&&(this.scrollToY(this.getScrollTop()),b=b|this.CHANGE_FULL);var f=e.getInnerWidth(this.container);if(a||c.width!=f){c.width=f;var g=this.showGutter?this.$gutter.offsetWidth:0;this.scroller.style.left=g+"px",c.scrollerWidth=Math.max(0,f-g-this.scrollBar.getWidth()),this.scroller.style.width=c.scrollerWidth+"px";if(this.session.getUseWrapMode()&&this.adjustWrapLimit()||a)b=b|this.CHANGE_FULL}this.$loop.schedule(b)},this.adjustWrapLimit=function(){var a=this.$size.scrollerWidth-this.$padding*2,b=Math.floor(a/this.characterWidth)-1;return this.session.adjustWrapLimit(b)},this.$onGutterClick=function(a){var b=f.getDocumentX(a),c=f.getDocumentY(a);this._dispatchEvent("gutter"+a.type,{row:this.screenToTextCoordinates(b,c).row,htmlEvent:a})},this.setShowInvisibles=function(a){this.$textLayer.setShowInvisibles(a)&&this.$loop.schedule(this.CHANGE_TEXT)},this.getShowInvisibles=function(){return this.$textLayer.showInvisibles},this.$showPrintMargin=!0,this.setShowPrintMargin=function(a){this.$showPrintMargin=a,this.$updatePrintMargin()},this.getShowPrintMargin=function(){return this.$showPrintMargin},this.$printMarginColumn=80,this.setPrintMarginColumn=function(a){this.$printMarginColumn=a,this.$updatePrintMargin()},this.getPrintMarginColumn=function(){return this.$printMarginColumn},this.getShowGutter=function(){return this.showGutter},this.setShowGutter=function(a){this.showGutter!==a&&(this.$gutter.style.display=a?"block":"none",this.showGutter=a,this.onResize(!0))},this.$updatePrintMargin=function(){var a;if(!!this.$showPrintMargin||!!this.$printMarginEl){this.$printMarginEl||(a=e.createElement("div"),a.className="ace_print_margin_layer",this.$printMarginEl=e.createElement("div"),this.$printMarginEl.className="ace_print_margin",a.appendChild(this.$printMarginEl),this.content.insertBefore(a,this.$textLayer.element));var b=this.$printMarginEl.style;b.left=this.characterWidth*this.$printMarginColumn+this.$padding*2+"px",b.visibility=this.$showPrintMargin?"visible":"hidden"}},this.getContainerElement=function(){return this.container},this.getMouseEventTarget=function(){return this.content},this.getTextAreaContainer=function(){return this.container},this.moveTextAreaToCursor=function(a){if(!g.isIE){var b=this.$cursorLayer.getPixelPosition();if(!b)return;var c=this.content.getBoundingClientRect(),d=this.layerConfig.offset;a.style.left=c.left+b.left+this.$padding+"px",a.style.top=c.top+b.top-this.scrollTop+d+"px"}},this.getFirstVisibleRow=function(){return this.layerConfig.firstRow},this.getFirstFullyVisibleRow=function(){return this.layerConfig.firstRow+(this.layerConfig.offset===0?0:1)},this.getLastFullyVisibleRow=function(){var a=Math.floor((this.layerConfig.height+this.layerConfig.offset)/this.layerConfig.lineHeight);return this.layerConfig.firstRow-1+a},this.getLastVisibleRow=function(){return this.layerConfig.lastRow},this.$padding=null,this.setPadding=function(a){this.$padding=a,this.$textLayer.setPadding(a),this.$cursorLayer.setPadding(a),this.$markerFront.setPadding(a),this.$markerBack.setPadding(a),this.$loop.schedule(this.CHANGE_FULL),this.$updatePrintMargin()},this.getHScrollBarAlwaysVisible=function(){return this.$horizScrollAlwaysVisible},this.setHScrollBarAlwaysVisible=function(a){this.$horizScrollAlwaysVisible!=a&&(this.$horizScrollAlwaysVisible=a,(!this.$horizScrollAlwaysVisible||!this.$horizScroll)&&this.$loop.schedule(this.CHANGE_SCROLL))},this.onScroll=function(a){this.scrollToY(a.data)},this.$updateScrollBar=function(){this.scrollBar.setInnerHeight(this.layerConfig.maxHeight),this.scrollBar.setScrollTop(this.scrollTop)},this.$renderChanges=function(a){if(!!a&&!!this.session){(a&this.CHANGE_FULL||a&this.CHANGE_SIZE||a&this.CHANGE_TEXT||a&this.CHANGE_LINES||a&this.CHANGE_SCROLL)&&this.$computeLayerConfig();if(a&this.CHANGE_FULL){this.$textLayer.update(this.layerConfig),this.showGutter&&this.$gutterLayer.update(this.layerConfig),this.$markerBack.update(this.layerConfig),this.$markerFront.update(this.layerConfig),this.$cursorLayer.update(this.layerConfig),this.$updateScrollBar();return}if(a&this.CHANGE_SCROLL){a&this.CHANGE_TEXT||a&this.CHANGE_LINES?this.$textLayer.update(this.layerConfig):this.$textLayer.scrollLines(this.layerConfig),this.showGutter&&this.$gutterLayer.update(this.layerConfig),this.$markerBack.update(this.layerConfig),this.$markerFront.update(this.layerConfig),this.$cursorLayer.update(this.layerConfig),this.$updateScrollBar();return}a&this.CHANGE_TEXT?(this.$textLayer.update(this.layerConfig),this.showGutter&&this.$gutterLayer.update(this.layerConfig)):a&this.CHANGE_LINES?(this.$updateLines(),this.$updateScrollBar(),this.showGutter&&this.$gutterLayer.update(this.layerConfig)):a&this.CHANGE_GUTTER&&this.showGutter&&this.$gutterLayer.update(this.layerConfig),a&this.CHANGE_CURSOR&&this.$cursorLayer.update(this.layerConfig),a&(this.CHANGE_MARKER|this.CHANGE_MARKER_FRONT)&&this.$markerFront.update(this.layerConfig),a&(this.CHANGE_MARKER|this.CHANGE_MARKER_BACK)&&this.$markerBack.update(this.layerConfig),a&this.CHANGE_SIZE&&this.$updateScrollBar()}},this.$computeLayerConfig=function(){var a=this.session,b=this.scrollTop%this.lineHeight,c=this.$size.scrollerHeight+this.lineHeight,d=this.$getLongestLine(),e=this.layerConfig.width!=d,f=this.$horizScrollAlwaysVisible||this.$size.scrollerWidth-d<0,g=this.$horizScroll!==f;this.$horizScroll=f,g&&(this.scroller.style.overflowX=f?"scroll":"hidden");var h=this.session.getScreenLength()*this.lineHeight;this.scrollTop=Math.max(0,Math.min(this.scrollTop,h-this.$size.scrollerHeight));var i=Math.ceil(c/this.lineHeight)-1,j=Math.max(0,Math.round((this.scrollTop-b)/this.lineHeight)),k=j+i,l,m,n={lineHeight:this.lineHeight};j=a.screenToDocumentRow(j,0);var o=a.getFoldLine(j);o&&(j=o.start.row),l=a.documentToScreenRow(j,0),m=a.getRowHeight(n,j),k=Math.min(a.screenToDocumentRow(k,0),a.getLength()-1),c=this.$size.scrollerHeight+a.getRowHeight(n,k)+m,b=this.scrollTop-l*this.lineHeight,this.layerConfig={width:d,padding:this.$padding,firstRow:j,firstRowScreen:l,lastRow:k,lineHeight:this.lineHeight,characterWidth:this.characterWidth,minHeight:c,maxHeight:h,offset:b,height:this.$size.scrollerHeight},this.$gutterLayer.element.style.marginTop=-b+"px",this.content.style.marginTop=-b+"px",this.content.style.width=d+"px",this.content.style.height=c+"px",this.$desiredScrollLeft&&(this.scrollToX(this.$desiredScrollLeft),this.$desiredScrollLeft=0),g&&this.onResize(!0)},this.$updateLines=function(){var a=this.$changedLines.firstRow,b=this.$changedLines.lastRow;this.$changedLines=null;var c=this.layerConfig;if(c.width!=this.$getLongestLine())return this.$textLayer.update(c);if(!(a>c.lastRow+1)){if(b<c.firstRow)return;if(b===Infinity){this.showGutter&&this.$gutterLayer.update(c),this.$textLayer.update(c);return}this.$textLayer.updateLines(c,a,b)}},this.$getLongestLine=function(){var a=this.session.getScreenWidth()+1;this.$textLayer.showInvisibles&&(a+=1);return Math.max(this.$size.scrollerWidth,Math.round(a*this.characterWidth))},this.updateFrontMarkers=function(){this.$markerFront.setMarkers(this.session.getMarkers(!0)),this.$loop.schedule(this.CHANGE_MARKER_FRONT)},this.updateBackMarkers=function(){this.$markerBack.setMarkers(this.session.getMarkers()),this.$loop.schedule(this.CHANGE_MARKER_BACK)},this.addGutterDecoration=function(a,b){this.$gutterLayer.addGutterDecoration(a,b),this.$loop.schedule(this.CHANGE_GUTTER)},this.removeGutterDecoration=function(a,b){this.$gutterLayer.removeGutterDecoration(a,b),this.$loop.schedule(this.CHANGE_GUTTER)},this.setBreakpoints=function(a){this.$gutterLayer.setBreakpoints(a),this.$loop.schedule(this.CHANGE_GUTTER)},this.setAnnotations=function(a){this.$gutterLayer.setAnnotations(a),this.$loop.schedule(this.CHANGE_GUTTER)},this.updateCursor=function(){this.$loop.schedule(this.CHANGE_CURSOR)},this.hideCursor=function(){this.$cursorLayer.hideCursor()},this.showCursor=function(){this.$cursorLayer.showCursor()},this.scrollCursorIntoView=function(){if(this.$size.scrollerHeight!==0){var a=this.$cursorLayer.getPixelPosition(),b=a.left+this.$padding,c=a.top;this.scrollTop>c&&this.scrollToY(c),this.scrollTop+this.$size.scrollerHeight<c+this.lineHeight&&this.scrollToY(c+this.lineHeight-this.$size.scrollerHeight);var d=this.scroller.scrollLeft;d>b&&this.scrollToX(b),d+this.$size.scrollerWidth<b+this.characterWidth&&(b>this.layerConfig.width?this.$desiredScrollLeft=b+2*this.characterWidth:this.scrollToX(Math.round(b+this.characterWidth-this.$size.scrollerWidth)))}},this.getScrollTop=function(){return this.scrollTop},this.getScrollLeft=function(){return this.scroller.scrollLeft},this.getScrollTopRow=function(){return this.scrollTop/this.lineHeight},this.getScrollBottomRow=function(){return Math.max(0,Math.floor((this.scrollTop+this.$size.scrollerHeight)/this.lineHeight)-1)},this.scrollToRow=function(a){this.scrollToY(a*this.lineHeight)},this.scrollToLine=function(a,b){var c={lineHeight:this.lineHeight},d=0;for(var e=1;e<a;e++)d+=this.session.getRowHeight(c,e-1);b&&(d-=this.$size.scrollerHeight/2),this.scrollToY(d)},this.scrollToY=function(a){a=Math.max(0,a),this.scrollTop!==a&&(this.$loop.schedule(this.CHANGE_SCROLL),this.scrollTop=a)},this.scrollToX=function(a){a<=this.$padding&&(a=0),this.scroller.scrollLeft=a},this.scrollBy=function(a,b){b&&this.scrollToY(this.scrollTop+b),a&&this.scrollToX(this.scroller.scrollLeft+a)},this.screenToTextCoordinates=function(a,b){var c=this.scroller.getBoundingClientRect(),d=Math.round((a+this.scroller.scrollLeft-c.left-this.$padding-e.getPageScrollLeft())/this.characterWidth),f=Math.floor((b+this.scrollTop-c.top-e.getPageScrollTop())/this.lineHeight);return this.session.screenToDocumentPosition(f,Math.max(d,0))},this.textToScreenCoordinates=function(a,b){var c=this.scroller.getBoundingClientRect(),d=this.session.documentToScreenPosition(a,b),e=this.$padding+Math.round(d.column*this.characterWidth),f=d.row*this.lineHeight;return{pageX:c.left+e-this.getScrollLeft(),pageY:c.top+f-this.getScrollTop()}},this.visualizeFocus=function(){e.addCssClass(this.container,"ace_focus")},this.visualizeBlur=function(){e.removeCssClass(this.container,"ace_focus")},this.showComposition=function(a){this.$composition||(this.$composition=e.createElement("div"),this.$composition.className="ace_composition",this.content.appendChild(this.$composition)),this.$composition.innerHTML="&#160;";var b=this.$cursorLayer.getPixelPosition(),c=this.$composition.style;c.top=b.top+"px",c.left=b.left+this.$padding+"px",c.height=this.lineHeight+"px",this.hideCursor()},this.setCompositionText=function(a){e.setInnerText(this.$composition,a)},this.hideComposition=function(){this.showCursor();if(!!this.$composition){var a=this.$composition.style;a.top="-10000px",a.left="-10000px"}},this.setTheme=function(b){function d(a){c.$theme&&e.removeCssClass(c.container,c.$theme),c.$theme=a?a.cssClass:null,c.$theme&&e.addCssClass(c.container,c.$theme),c.$size&&(c.$size.width=0,c.onResize())}var c=this;this.$themeValue=b,!b||typeof b=="string"?(b=b||"ace/theme/textmate",a([b],function(a){d(a)})):d(b)},this.getTheme=function(){return this.$themeValue},this.setStyle=function(a){e.addCssClass(this.container,a)},this.unsetStyle=function(a){e.removeCssClass(this.container,a)},this.destroy=function(){this.$textLayer.destroy(),this.$cursorLayer.destroy()}}).call(p.prototype),b.VirtualRenderer=p}),define("ace/layer/gutter",["require","exports","module","pilot/dom"],function(a,b,c){var d=a("pilot/dom"),e=function(a){this.element=d.createElement("div"),this.element.className="ace_layer ace_gutter-layer",a.appendChild(this.element),this.$breakpoints=[],this.$annotations=[],this.$decorations=[]};(function(){this.setSession=function(a){this.session=a},this.addGutterDecoration=function(a,b){this.$decorations[a]||(this.$decorations[a]=""),this.$decorations[a]+=" ace_"+b},this.removeGutterDecoration=function(a,b){this.$decorations[a]=this.$decorations[a].replace(" ace_"+b,"")},this.setBreakpoints=function(a){this.$breakpoints=a.concat()},this.setAnnotations=function(a){this.$annotations=[];for(var b in a)if(a.hasOwnProperty(b)){var c=a[b];if(!c)continue;var d=this.$annotations[b]={text:[]};for(var e=0;e<c.length;e++){var f=c[e];d.text.push(f.text.replace(/"/g,"&quot;").replace(/'/g,"&#8217;").replace(/</,"&lt;"));var g=f.type;g=="error"?d.className="ace_error":g=="warning"&&d.className!="ace_error"?d.className="ace_warning":g=="info"&&!d.className&&(d.className="ace_info")}}},this.update=function(a){this.$config=a;var b={className:"",text:[]},c=[],e=a.firstRow,f=a.lastRow,g=this.session.getNextFold(e),h=g?g.start.row:Infinity;for(;;){e>h&&(e=g.end.row+1,g=this.session.getNextFold(e),h=g?g.start.row:Infinity);if(e>f)break;var i=this.$annotations[e]||b;c.push("<div class='ace_gutter-cell",this.$decorations[e]||"",this.$breakpoints[e]?" ace_breakpoint ":" ",i.className,"' title='",i.text.join("\n"),"' style='height:",a.lineHeight,"px;'>",e+1);var j=this.session.getRowLength(e)-1;while(j--)c.push("</div><div class='ace_gutter-cell' style='height:",a.lineHeight,"px'>&brvbar;</div>");c.push("</div>"),e++}this.element=d.setInnerHtml(this.element,c.join("")),this.element.style.height=a.minHeight+"px"}}).call(e.prototype),b.Gutter=e}),define("ace/layer/marker",["require","exports","module","ace/range","pilot/dom"],function(a,b,c){var d=a("ace/range").Range,e=a("pilot/dom"),f=function(a){this.element=e.createElement("div"),this.element.className="ace_layer ace_marker-layer",a.appendChild(this.element)};(function(){this.$padding=0,this.setPadding=function(a){this.$padding=a},this.setSession=function(a){this.session=a},this.setMarkers=function(a){this.markers=a},this.update=function(a){var a=a||this.config;if(!!a){this.config=a;var b=[];for(var c in this.markers){var d=this.markers[c],f=d.range.clipRows(a.firstRow,a.lastRow);if(f.isEmpty())continue;f=f.toScreenRange(this.session);if(d.renderer){var g=this.$getTop(f.start.row,a),h=Math.round(this.$padding+f.start.column*a.characterWidth);d.renderer(b,f,h,g,a)}else f.isMultiLine()?d.type=="text"?this.drawTextMarker(b,f,d.clazz,a):this.drawMultiLineMarker(b,f,d.clazz,a,d.type):this.drawSingleLineMarker(b,f,d.clazz,a,null,d.type)}this.element=e.setInnerHtml(this.element,b.join(""))}},this.$getTop=function(a,b){return(a-b.firstRowScreen)*b.lineHeight},this.drawTextMarker=function(a,b,c,e){var f=b.start.row,g=new d(f,b.start.column,f,this.session.getScreenLastRowColumn(f));this.drawSingleLineMarker(a,g,c,e,1,"text"),f=b.end.row,g=new d(f,0,f,b.end.column),this.drawSingleLineMarker(a,g,c,e,0,"text");for(f=b.start.row+1;f<b.end.row;f++)g.start.row=f,g.end.row=f,g.end.column=this.session.getScreenLastRowColumn(f),this.drawSingleLineMarker(a,g,c,e,1,"text")},this.drawMultiLineMarker=function(a,b,c,d,e){var f=e==="background"?0:this.$padding,g=d.lineHeight,h=Math.round(d.width-b.start.column*d.characterWidth),i=this.$getTop(b.start.row,d),j=Math.round(f+b.start.column*d.characterWidth);a.push("<div class='",c,"' style='","height:",g,"px;","width:",h,"px;","top:",i,"px;","left:",j,"px;'></div>"),i=this.$getTop(b.end.row,d),h=Math.round(b.end.column*d.characterWidth),a.push("<div class='",c,"' style='","height:",g,"px;","width:",h,"px;","top:",i,"px;","left:",f,"px;'></div>"),g=(b.end.row-b.start.row-1)*d.lineHeight;g<0||(i=this.$getTop(b.start.row+1,d),h=d.width,a.push("<div class='",c,"' style='","height:",g,"px;","width:",h,"px;","top:",i,"px;","left:",f,"px;'></div>"))},this.drawSingleLineMarker=function(a,b,c,d,e,f){var g=f==="background"?0:this.$padding,h=d.lineHeight;if(f==="background")var i=d.width;else i=Math.round((b.end.column+(e||0)-b.start.column)*d.characterWidth);var j=this.$getTop(b.start.row,d),k=Math.round(g+b.start.column*d.characterWidth);a.push("<div class='",c,"' style='","height:",h,"px;","width:",i,"px;","top:",j,"px;","left:",k,"px;'></div>")}}).call(f.prototype),b.Marker=f}),define("ace/layer/text",["require","exports","module","pilot/oop","pilot/dom","pilot/lang","pilot/useragent","pilot/event_emitter"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/dom"),f=a("pilot/lang"),g=a("pilot/useragent"),h=a("pilot/event_emitter").EventEmitter,i=function(a){this.element=e.createElement("div"),this.element.className="ace_layer ace_text-layer",this.element.style.width="auto",a.appendChild(this.element),this.$characterSize=this.$measureSizes()||{width:0,height:0},this.$pollSizeChanges()};(function(){d.implement(this,h),this.EOF_CHAR="&para;",this.EOL_CHAR="&not;",this.TAB_CHAR="&rarr;",this.SPACE_CHAR="&middot;",this.$padding=0,this.setPadding=function(a){this.$padding=a,this.element.style.padding="0 "+a+"px"},this.getLineHeight=function(){return this.$characterSize.height||1},this.getCharacterWidth=function(){return this.$characterSize.width||1},this.checkForSizeChanges=function(){var a=this.$measureSizes();a&&(this.$characterSize.width!==a.width||this.$characterSize.height!==a.height)&&(this.$characterSize=a,this._dispatchEvent("changeCharaterSize",{data:a}))},this.$pollSizeChanges=function(){var a=this;this.$pollSizeChangesTimer=setInterval(function(){a.checkForSizeChanges()},500)},this.$fontStyles={fontFamily:1,fontSize:1,fontWeight:1,fontStyle:1,lineHeight:1},this.$measureSizes=function(){var a=1e3;if(!this.$measureNode){var b=this.$measureNode=e.createElement("div"),c=b.style;c.width=c.height="auto",c.left=c.top=-a*40+"px",c.visibility="hidden",c.position="absolute",c.overflow="visible",c.whiteSpace="nowrap",b.innerHTML=f.stringRepeat("Xy",a);if(document.body)document.body.appendChild(b);else{var d=this.element.parentNode;while(!e.hasCssClass(d,"ace_editor"))d=d.parentNode;d.appendChild(b)}}var c=this.$measureNode.style,g=e.computedStyle(this.element);for(var h in this.$fontStyles)c[h]=g[h];var i={height:this.$measureNode.offsetHeight,width:this.$measureNode.offsetWidth/(a*2)};return i.width==0&&i.height==0?null:i},this.setSession=function(a){this.session=a},this.showInvisibles=!1,this.setShowInvisibles=function(a){if(this.showInvisibles==a)return!1;this.showInvisibles=a;return!0},this.$tabStrings=[],this.$computeTabString=function(){var a=this.session.getTabSize(),b=this.$tabStrings=[0];for(var c=1;c<a+1;c++)this.showInvisibles?b.push("<span class='ace_invisible'>"+this.TAB_CHAR+Array(c).join("&#160;")+"</span>"):b.push(Array(c+1).join("&#160;"))},this.updateLines=function(a,b,c){this.$computeTabString(),(this.config.lastRow!=a.lastRow||this.config.firstRow!=a.firstRow)&&this.scrollLines(a),this.config=a;var d=Math.max(b,a.firstRow),f=Math.min(c,a.lastRow),g=this.element.childNodes,h=0;for(var i=a.firstRow;i<d;i++){var j=this.session.getFoldLine(i);if(j){if(j.containsRow(d))break;i=j.end.row}h++}for(var k=d;k<=f;k++){var l=g[h++];if(!l)continue;var m=[],n=this.session.getTokens(k,k);this.$renderLine(m,k,n[0].tokens,!0),l=e.setInnerHtml(l,m.join("")),k=this.session.getRowFoldEnd(k)}},this.scrollLines=function(a){this.$computeTabString();var b=this.config;this.config=a;if(!b||b.lastRow<a.firstRow)return this.update(a);if(a.lastRow<b.firstRow)return this.update(a);var c=this.element;if(b.firstRow<a.firstRow)for(var d=this.session.getFoldedRowCount(b.firstRow,a.firstRow-1);d>0;d--)c.removeChild(c.firstChild);if(b.lastRow>a.lastRow)for(var d=this.session.getFoldedRowCount(a.lastRow+1,b.lastRow);d>0;d--)c.removeChild(c.lastChild);if(a.firstRow<b.firstRow){var e=this.$renderLinesFragment(a,a.firstRow,b.firstRow-1);c.firstChild?c.insertBefore(e,c.firstChild):c.appendChild(e)}if(a.lastRow>b.lastRow){var e=this.$renderLinesFragment(a,b.lastRow+1,a.lastRow);c.appendChild(e)}},this.$renderLinesFragment=function(a,b,c){var d=document.createDocumentFragment(),f=b,g=this.session.getNextFold(f),h=g?g.start.row:Infinity;for(;;){f>h&&(f=g.end.row+1,g=this.session.getNextFold(f),h=g?g.start.row:Infinity);if(f>c)break;var i=e.createElement("div"),j=[],k=this.session.getTokens(f,f);k.length==1&&this.$renderLine(j,f,k[0].tokens,!1),i.innerHTML=j.join("");var l=i.childNodes;while(l.length)d.appendChild(l[0]);f++}return d},this.update=function(a){this.$computeTabString(),this.config=a;var b=[],c=a.firstRow,d=a.lastRow,f=c,g=this.session.getNextFold(f),h=g?g.start.row:Infinity;for(;;){f>h&&(f=g.end.row+1,g=this.session.getNextFold(f),h=g?g.start.row:Infinity);if(f>d)break;var i=this.session.getTokens(f,f);i.length==1&&this.$renderLine(b,f,i[0].tokens,!1),f++}this.element=e.setInnerHtml(this.element,b.join(""))},this.$textToken={text:!0,rparen:!0,lparen:!0},this.$renderToken=function(a,b,c,d){var e=this,f=/\t|&|<|( +)|([\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000])|[\u1100-\u115F]|[\u11A3-\u11A7]|[\u11FA-\u11FF]|[\u2329-\u232A]|[\u2E80-\u2E99]|[\u2E9B-\u2EF3]|[\u2F00-\u2FD5]|[\u2FF0-\u2FFB]|[\u3000-\u303E]|[\u3041-\u3096]|[\u3099-\u30FF]|[\u3105-\u312D]|[\u3131-\u318E]|[\u3190-\u31BA]|[\u31C0-\u31E3]|[\u31F0-\u321E]|[\u3220-\u3247]|[\u3250-\u32FE]|[\u3300-\u4DBF]|[\u4E00-\uA48C]|[\uA490-\uA4C6]|[\uA960-\uA97C]|[\uAC00-\uD7A3]|[\uD7B0-\uD7C6]|[\uD7CB-\uD7FB]|[\uF900-\uFAFF]|[\uFE10-\uFE19]|[\uFE30-\uFE52]|[\uFE54-\uFE66]|[\uFE68-\uFE6B]|[\uFF01-\uFF60]|[\uFFE0-\uFFE6]/g,h=function(a,c,d,f,h){if(a.charCodeAt(0)==32)return Array(a.length+1).join("&#160;");if(a=="\t"){var i=e.session.getScreenTabSize(b+f);b+=i-1;return e.$tabStrings[i]}if(a=="&")return g.isOldGecko?"&":"&amp;";if(a=="<")return"&lt;";if(a.match(/[\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000]/)){if(e.showInvisibles){var j=Array(a.length+1).join(e.SPACE_CHAR);return"<span class='ace_invisible'>"+j+"</span>"}return"&#160;"}b+=1;return"<span class='ace_cjk' style='width:"+e.config.characterWidth*2+"px'>"+a+"</span>"},i=d.replace(f,h);if(!this.$textToken[c.type]){var j="ace_"+c.type.replace(/\./g," ace_");a.push("<span class='",j,"'>",i,"</span>")}else a.push(i);return b+d.length},this.$renderLineCore=function(a,b,c,d,e){var f=0,g=0,h,i=this.config.characterWidth,j=0,k=this;!d||d.length==0?h=Number.MAX_VALUE:h=d[0],e||a.push("<div class='ace_line' style='height:",this.config.lineHeight,"px","'>");for(var l=0;l<c.length;l++){var m=c[l],n=m.value;if(f+n.length<h)j=k.$renderToken(a,j,m,n),f+=n.length;else{while(f+n.length>=h)j=k.$renderToken(a,j,m,n.substring(0,h-f)),n=n.substring(h-f),f=h,e||a.push("</div>","<div class='ace_line' style='height:",this.config.lineHeight,"px","'>"),g++,j=0,h=d[g]||Number.MAX_VALUE;n.length!=0&&(f+=n.length,j=k.$renderToken(a,j,m,n))}}this.showInvisibles&&(b!==this.session.getLength()-1?a.push("<span class='ace_invisible'>"+this.EOL_CHAR+"</span>"):a.push("<span class='ace_invisible'>"+this.EOF_CHAR+"</span>")),a.push("</div>")},this.$renderLine=function(a,b,c,d){if(!this.session.isRowFolded(b)){var e=this.session.getRowSplitData(b);this.$renderLineCore(a,b,c,e,d)}else this.$renderFoldLine(a,b,c,d)},this.$renderFoldLine=function(a,b,c,d){function h(a,b,c){var d=0,e=0;while(e+a[d].value.length<b){e+=a[d].value.length,d++;if(d==a.length)return}if(e!=b){var f=a[d].value.substring(b-e);f.length>c-b&&(f=f.substring(0,c-b)),g.push({type:a[d].type,value:f}),e=b+f.length,d+=1}while(e<c){var f=a[d].value;f.length+e>c&&(f=f.substring(0,c-e)),g.push({type:a[d].type,value:f}),e+=f.length,d+=1}}var e=this.session,f=e.getFoldLine(b),g=[];f.walk(function(a,b,d,e,f){a?g.push({type:"fold",value:a}):(f&&(c=this.session.getTokens(b,b)[0].tokens),c.length!=0&&h(c,e,d))}.bind(this),f.end.row,this.session.getLine(f.end.row).length);var i=this.session.$useWrapMode?this.session.$wrapData[b]:null;this.$renderLineCore(a,b,g,i,d)},this.destroy=function(){clearInterval(this.$pollSizeChangesTimer),this.$measureNode&&this.$measureNode.parentNode.removeChild(this.$measureNode),delete this.$measureNode}}).call(i.prototype),b.Text=i}),define("ace/layer/cursor",["require","exports","module","pilot/dom"],function(a,b,c){var d=a("pilot/dom"),e=function(a){this.element=d.createElement("div"),this.element.className="ace_layer ace_cursor-layer",a.appendChild(this.element),this.cursor=d.createElement("div"),this.cursor.className="ace_cursor ace_hidden",this.element.appendChild(this.cursor),this.isVisible=!1};(function(){this.$padding=0,this.setPadding=function(a){this.$padding=a},this.setSession=function(a){this.session=a},this.hideCursor=function(){this.isVisible=!1,d.addCssClass(this.cursor,"ace_hidden"),clearInterval(this.blinkId)},this.showCursor=function(){this.isVisible=!0,d.removeCssClass(this.cursor,"ace_hidden"),this.cursor.style.visibility="visible",this.restartTimer()},this.restartTimer=function(){clearInterval(this.blinkId);if(!!this.isVisible){var a=this.cursor;this.blinkId=setInterval(function(){a.style.visibility="hidden",setTimeout(function(){a.style.visibility="visible"},400)},1e3)}},this.getPixelPosition=function(a){if(!this.config||!this.session)return{left:0,top:0};var b=this.session.selection.getCursor(),c=this.session.documentToScreenPosition(b),d=Math.round(this.$padding+c.column*this.config.characterWidth),e=(c.row-(a?this.config.firstRowScreen:0))*this.config.lineHeight;return{left:d,top:e}},this.update=function(a){this.config=a,this.pixelPos=this.getPixelPosition(!0),this.cursor.style.left=this.pixelPos.left+"px",this.cursor.style.top=this.pixelPos.top+"px",this.cursor.style.width=a.characterWidth+"px",this.cursor.style.height=a.lineHeight+"px";var b=this.session.getOverwrite();b!=this.overwrite&&(this.overwrite=b,b?d.addCssClass(this.cursor,"ace_overwrite"):d.removeCssClass(this.cursor,"ace_overwrite")),this.restartTimer()},this.destroy=function(){clearInterval(this.blinkId)}}).call(e.prototype),b.Cursor=e}),define("ace/scrollbar",["require","exports","module","pilot/oop","pilot/dom","pilot/event","pilot/event_emitter"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/dom"),f=a("pilot/event"),g=a("pilot/event_emitter").EventEmitter,h=function(a){this.element=e.createElement("div"),this.element.className="ace_sb",this.inner=e.createElement("div"),this.element.appendChild(this.inner),a.appendChild(this.element),this.width=e.scrollbarWidth(),this.element.style.width=(this.width||15)+"px",f.addListener(this.element,"scroll",this.onScroll.bind(this))};(function(){d.implement(this,g),this.onScroll=function(){this._dispatchEvent("scroll",{data:this.element.scrollTop})},this.getWidth=function(){return this.width},this.setHeight=function(a){this.element.style.height=a+"px"},this.setInnerHeight=function(a){this.inner.style.height=a+"px"},this.setScrollTop=function(a){this.element.scrollTop=a}}).call(h.prototype),b.ScrollBar=h}),define("ace/renderloop",["require","exports","module","pilot/event"],function(a,b,c){var d=a("pilot/event"),e=function(a){this.onRender=a,this.pending=!1,this.changes=0};(function(){this.schedule=function(a){this.changes=this.changes|a;if(!this.pending){this.pending=!0;var b=this;this.setTimeoutZero(function(){b.pending=!1;var a=b.changes;b.changes=0,b.onRender(a)})}},this.setTimeoutZero=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame,this.setTimeoutZero?this.setTimeoutZero=this.setTimeoutZero.bind(window):window.postMessage?(this.messageName="zero-timeout-message",this.setTimeoutZero=function(a){if(!this.attached){var b=this;d.addListener(window,"message",function(a){b.callback&&a.data==b.messageName&&(d.stopPropagation(a),b.callback())}),this.attached=!0}this.callback=a,window.postMessage(this.messageName,"*")}):this.setTimeoutZero=function(a){setTimeout(a,0)}}).call(e.prototype),b.RenderLoop=e}),define("ace/theme/textmate",["require","exports","module","pilot/dom"],function(a,b,c){var d=a("pilot/dom"),e=".ace-tm .ace_editor {\n  border: 2px solid rgb(159, 159, 159);\n}\n\n.ace-tm .ace_editor.ace_focus {\n  border: 2px solid #327fbd;\n}\n\n.ace-tm .ace_gutter {\n  width: 50px;\n  background: #e8e8e8;\n  color: #333;\n  overflow : hidden;\n}\n\n.ace-tm .ace_gutter-layer {\n  width: 100%;\n  text-align: right;\n}\n\n.ace-tm .ace_gutter-layer .ace_gutter-cell {\n  padding-right: 6px;\n}\n\n.ace-tm .ace_print_margin {\n  width: 1px;\n  background: #e8e8e8;\n}\n\n.ace-tm .ace_text-layer {\n  cursor: text;\n}\n\n.ace-tm .ace_cursor {\n  border-left: 2px solid black;\n}\n\n.ace-tm .ace_cursor.ace_overwrite {\n  border-left: 0px;\n  border-bottom: 1px solid black;\n}\n        \n.ace-tm .ace_line .ace_invisible {\n  color: rgb(191, 191, 191);\n}\n\n.ace-tm .ace_line .ace_keyword {\n  color: blue;\n}\n\n.ace-tm .ace_line .ace_constant.ace_buildin {\n  color: rgb(88, 72, 246);\n}\n\n.ace-tm .ace_line .ace_constant.ace_language {\n  color: rgb(88, 92, 246);\n}\n\n.ace-tm .ace_line .ace_constant.ace_library {\n  color: rgb(6, 150, 14);\n}\n\n.ace-tm .ace_line .ace_invalid {\n  background-color: rgb(153, 0, 0);\n  color: white;\n}\n\n.ace-tm .ace_line .ace_fold {\n    background-color: #E4E4E4;\n    border-radius: 3px;\n}\n\n.ace-tm .ace_line .ace_support.ace_function {\n  color: rgb(60, 76, 114);\n}\n\n.ace-tm .ace_line .ace_support.ace_constant {\n  color: rgb(6, 150, 14);\n}\n\n.ace-tm .ace_line .ace_support.ace_type,\n.ace-tm .ace_line .ace_support.ace_class {\n  color: rgb(109, 121, 222);\n}\n\n.ace-tm .ace_line .ace_keyword.ace_operator {\n  color: rgb(104, 118, 135);\n}\n\n.ace-tm .ace_line .ace_string {\n  color: rgb(3, 106, 7);\n}\n\n.ace-tm .ace_line .ace_comment {\n  color: rgb(76, 136, 107);\n}\n\n.ace-tm .ace_line .ace_comment.ace_doc {\n  color: rgb(0, 102, 255);\n}\n\n.ace-tm .ace_line .ace_comment.ace_doc.ace_tag {\n  color: rgb(128, 159, 191);\n}\n\n.ace-tm .ace_line .ace_constant.ace_numeric {\n  color: rgb(0, 0, 205);\n}\n\n.ace-tm .ace_line .ace_variable {\n  color: rgb(49, 132, 149);\n}\n\n.ace-tm .ace_line .ace_xml_pe {\n  color: rgb(104, 104, 91);\n}\n\n.ace-tm .ace_marker-layer .ace_selection {\n  background: rgb(181, 213, 255);\n}\n\n.ace-tm .ace_marker-layer .ace_step {\n  background: rgb(252, 255, 0);\n}\n\n.ace-tm .ace_marker-layer .ace_stack {\n  background: rgb(164, 229, 101);\n}\n\n.ace-tm .ace_marker-layer .ace_bracket {\n  margin: -1px 0 0 -1px;\n  border: 1px solid rgb(192, 192, 192);\n}\n\n.ace-tm .ace_marker-layer .ace_active_line {\n  background: rgba(0, 0, 0, 0.07);\n}\n\n.ace-tm .ace_marker-layer .ace_selected_word {\n  background: rgb(250, 250, 255);\n  border: 1px solid rgb(200, 200, 250);\n}\n\n.ace-tm .ace_string.ace_regex {\n  color: rgb(255, 0, 0)\n}";d.importCssString(e),b.cssClass="ace-tm"}),define("pilot/environment",["require","exports","module","pilot/settings"],function(a,b,c){function e(){return{settings:d}}var d=a("pilot/settings").settings;b.create=e}),define("text/cockpit/ui/cli_view.css",[],"#cockpitInput { padding-left: 16px; }.cptOutput { overflow: auto; position: absolute; z-index: 999; display: none; }.cptCompletion { padding: 0; position: absolute; z-index: -1000; }.cptCompletion.VALID { background: #FFF; }.cptCompletion.INCOMPLETE { background: #DDD; }.cptCompletion.INVALID { background: #DDD; }.cptCompletion span { color: #FFF; }.cptCompletion span.INCOMPLETE { color: #DDD; border-bottom: 2px dotted #F80; }.cptCompletion span.INVALID { color: #DDD; border-bottom: 2px dotted #F00; }span.cptPrompt { color: #66F; font-weight: bold; }.cptHints {  color: #000;  position: absolute;  border: 1px solid rgba(230, 230, 230, 0.8);  background: rgba(250, 250, 250, 0.8);  -moz-border-radius-topleft: 10px;  -moz-border-radius-topright: 10px;  border-top-left-radius: 10px; border-top-right-radius: 10px;  z-index: 1000;  padding: 8px;  display: none;}.cptFocusPopup { display: block; }.cptFocusPopup.cptNoPopup { display: none; }.cptHints ul { margin: 0; padding: 0 15px; }.cptGt { font-weight: bold; font-size: 120%; }"),define("text/cockpit/ui/request_view.css",[],".cptRowIn {  display: box; display: -moz-box; display: -webkit-box;  box-orient: horizontal; -moz-box-orient: horizontal; -webkit-box-orient: horizontal;  box-align: center; -moz-box-align: center; -webkit-box-align: center;  color: #333;  background-color: #EEE;  width: 100%;  font-family: consolas, courier, monospace;}.cptRowIn > * { padding-left: 2px; padding-right: 2px; }.cptRowIn > img { cursor: pointer; }.cptHover { display: none; }.cptRowIn:hover > .cptHover { display: block; }.cptRowIn:hover > .cptHover.cptHidden { display: none; }.cptOutTyped {  box-flex: 1; -moz-box-flex: 1; -webkit-box-flex: 1;  font-weight: bold; color: #000; font-size: 120%;}.cptRowOutput { padding-left: 10px; line-height: 1.2em; }.cptRowOutput strong,.cptRowOutput b,.cptRowOutput th,.cptRowOutput h1,.cptRowOutput h2,.cptRowOutput h3 { color: #000; }.cptRowOutput a { font-weight: bold; color: #666; text-decoration: none; }.cptRowOutput a: hover { text-decoration: underline; cursor: pointer; }.cptRowOutput input[type=password],.cptRowOutput input[type=text],.cptRowOutput textarea {  color: #000; font-size: 120%;  background: transparent; padding: 3px;  border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px;}.cptRowOutput table,.cptRowOutput td,.cptRowOutput th { border: 0; padding: 0 2px; }.cptRowOutput .right { text-align: right; }"),define("text/ace/css/editor.css",[],'.ace_editor {    position: absolute;    overflow: hidden;    font-family: Monaco, "Menlo", "Courier New", monospace;    font-size: 12px;}.ace_scroller {    position: absolute;    overflow-x: scroll;    overflow-y: hidden;}.ace_content {    position: absolute;    box-sizing: border-box;    -moz-box-sizing: border-box;    -webkit-box-sizing: border-box;}.ace_composition {    position: absolute;    background: #555;    color: #DDD;    z-index: 4;}.ace_gutter {    position: absolute;    overflow-x: hidden;    overflow-y: hidden;    height: 100%;}.ace_gutter-cell.ace_error {    background-image: url("data:image/gif,GIF89a%10%00%10%00%D5%00%00%F5or%F5%87%88%F5nr%F4ns%EBmq%F5z%7F%DDJT%DEKS%DFOW%F1Yc%F2ah%CE(7%CE)8%D18E%DD%40M%F2KZ%EBU%60%F4%60m%DCir%C8%16(%C8%19*%CE%255%F1%3FR%F1%3FS%E6%AB%B5%CA%5DI%CEn%5E%F7%A2%9A%C9G%3E%E0a%5B%F7%89%85%F5yy%F6%82%80%ED%82%80%FF%BF%BF%E3%C4%C4%FF%FF%FF%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%25%00%2C%00%00%00%00%10%00%10%00%00%06p%C0%92pH%2C%1A%8F%C8%D2H%93%E1d4%23%E4%88%D3%09mB%1DN%B48%F5%90%40%60%92G%5B%94%20%3E%22%D2%87%24%FA%20%24%C5%06A%00%20%B1%07%02B%A38%89X.v%17%82%11%13q%10%0Fi%24%0F%8B%10%7BD%12%0Ei%09%92%09%0EpD%18%15%24%0A%9Ci%05%0C%18F%18%0B%07%04%01%04%06%A0H%18%12%0D%14%0D%12%A1I%B3%B4%B5IA%00%3B");    background-repeat: no-repeat;    background-position: 4px center;}.ace_gutter-cell.ace_warning {    background-image: url("data:image/gif,GIF89a%10%00%10%00%D5%00%00%FF%DBr%FF%DE%81%FF%E2%8D%FF%E2%8F%FF%E4%96%FF%E3%97%FF%E5%9D%FF%E6%9E%FF%EE%C1%FF%C8Z%FF%CDk%FF%D0s%FF%D4%81%FF%D5%82%FF%D5%83%FF%DC%97%FF%DE%9D%FF%E7%B8%FF%CCl%7BQ%13%80U%15%82W%16%81U%16%89%5B%18%87%5B%18%8C%5E%1A%94d%1D%C5%83-%C9%87%2F%C6%84.%C6%85.%CD%8B2%C9%871%CB%8A3%CD%8B5%DC%98%3F%DF%9BB%E0%9CC%E1%A5U%CB%871%CF%8B5%D1%8D6%DB%97%40%DF%9AB%DD%99B%E3%B0p%E7%CC%AE%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%2F%00%2C%00%00%00%00%10%00%10%00%00%06a%C0%97pH%2C%1A%8FH%A1%ABTr%25%87%2B%04%82%F4%7C%B9X%91%08%CB%99%1C!%26%13%84*iJ9(%15G%CA%84%14%01%1A%97%0C%03%80%3A%9A%3E%81%84%3E%11%08%B1%8B%20%02%12%0F%18%1A%0F%0A%03\'F%1C%04%0B%10%16%18%10%0B%05%1CF%1D-%06%07%9A%9A-%1EG%1B%A0%A1%A0U%A4%A5%A6BA%00%3B");    background-repeat: no-repeat;    background-position: 4px center;}.ace_editor .ace_sb {    position: absolute;    overflow-x: hidden;    overflow-y: scroll;    right: 0;}.ace_editor .ace_sb div {    position: absolute;    width: 1px;    left: 0;}.ace_editor .ace_print_margin_layer {    z-index: 0;    position: absolute;    overflow: hidden;    margin: 0;    left: 0;    height: 100%;    width: 100%;}.ace_editor .ace_print_margin {    position: absolute;    height: 100%;}.ace_editor textarea {    position: fixed;    z-index: -1;    width: 10px;    height: 30px;    opacity: 0;    background: transparent;    appearance: none;    -moz-appearance: none;    border: none;    resize: none;    outline: none;    overflow: hidden;}.ace_layer {    z-index: 1;    position: absolute;    overflow: hidden;    white-space: nowrap;    height: 100%;    width: 100%;}.ace_text-layer {    color: black;}.ace_cjk {    display: inline-block;    text-align: center;}.ace_cursor-layer {    z-index: 4;    cursor: text;    /* setting pointer-events: none; here will break mouse wheel scrolling in Safari */}.ace_cursor {    z-index: 4;    position: absolute;}.ace_cursor.ace_hidden {    opacity: 0.2;}.ace_line {    white-space: nowrap;}.ace_marker-layer {    cursor: text;    pointer-events: none;}.ace_marker-layer .ace_step {    position: absolute;    z-index: 3;}.ace_marker-layer .ace_selection {    position: absolute;    z-index: 4;}.ace_marker-layer .ace_bracket {    position: absolute;    z-index: 5;}.ace_marker-layer .ace_active_line {    position: absolute;    z-index: 2;}.ace_marker-layer .ace_selected_word {    position: absolute;    z-index: 6;    box-sizing: border-box;    -moz-box-sizing: border-box;    -webkit-box-sizing: border-box;}.ace_line .ace_fold {    cursor: pointer;}.ace_dragging .ace_marker-layer, .ace_dragging .ace_text-layer {  cursor: move;}'),define("text/build/demo/styles.css",[],"html {    height: 100%;    width: 100%;    overflow: hidden;}body {    overflow: hidden;    margin: 0;    padding: 0;    height: 100%;    width: 100%;    font-family: Arial, Helvetica, sans-serif, Tahoma, Verdana, sans-serif;    font-size: 12px;    background: rgb(14, 98, 165);    color: white;}#logo {    padding: 15px;    margin-left: 65px;}#editor {    position: absolute;    top:  0px;    left: 280px;    bottom: 0px;    right: 0px;    background: white;}#controls {    padding: 5px;}#controls td {    text-align: right;}#controls td + td {    text-align: left;}#cockpitInput {    position: absolute;    left: 280px;    right: 0px;    bottom: 0;    border: none; outline: none;    font-family: consolas, courier, monospace;    font-size: 120%;}#cockpitOutput {    padding: 10px;    margin: 0 15px;    border: 1px solid #AAA;    -moz-border-radius-topleft: 10px;    -moz-border-radius-topright: 10px;    border-top-left-radius: 4px; border-top-right-radius: 4px;    background: #DDD; color: #000;}"),define("text/build_support/style.css",[],"body {    margin:0;    padding:0;    background-color:#e6f5fc;    }H2, H3, H4 {    font-family:Trebuchet MS;    font-weight:bold;    margin:0;    padding:0;}H2 {    font-size:28px;    color:#263842;    padding-bottom:6px;}H3 {    font-family:Trebuchet MS;    font-weight:bold;    font-size:22px;    color:#253741;    margin-top:43px;    margin-bottom:8px;}H4 {    font-family:Trebuchet MS;    font-weight:bold;    font-size:21px;    color:#222222;    margin-bottom:4px;}P {    padding:13px 0;    margin:0;    line-height:22px;}UL{    line-height : 22px;}PRE{    background : #333;    color : white;    padding : 10px;}#header {    height : 227px;    position:relative;    overflow:hidden;    background: url(images/background.png) repeat-x 0 0;    border-bottom:1px solid #c9e8fa;   }#header .content .signature {    font-family:Trebuchet MS;    font-size:11px;    color:#ebe4d6;    position:absolute;    bottom:5px;    right:42px;    letter-spacing : 1px;}.content {    width:970px;    position:relative;    overflow:hidden;    margin:0 auto;}#header .content {    height:184px;    margin-top:22px;}#header .content .logo {    width  : 282px;    height : 184px;    background:url(images/logo.png) no-repeat 0 0;    position:absolute;    top:0;    left:0;}#header .content .title {    width  : 605px;    height : 58px;    background:url(images/ace.png) no-repeat 0 0;    position:absolute;    top:98px;    left:329px;}#wrapper {    background:url(images/body_background.png) repeat-x 0 0;    min-height:250px;}#wrapper .content {    font-family:Arial;    font-size:14px;    color:#222222;    width:1000px;}#wrapper .content .column1 {    position:relative;    overflow:hidden;    float:left;    width:315px;    margin-right:31px;}#wrapper .content .column2 {    position:relative;    overflow:hidden;    float:left;    width:600px;    padding-top:47px;}.fork_on_github {    width:310px;    height:80px;    background:url(images/fork_on_github.png) no-repeat 0 0;    position:relative;    overflow:hidden;    margin-top:49px;    cursor:pointer;}.fork_on_github:hover {    background-position:0 -80px;}.divider {    height:3px;    background-color:#bedaea;    margin-bottom:3px;}.menu {    padding:23px 0 0 24px;}UL.content-list {    padding:15px;    margin:0;}UL.menu-list {    padding:0;    margin:0 0 20px 0;    list-style-type:none;    line-height : 16px;}UL.menu-list LI {    color:#2557b4;    font-family:Trebuchet MS;    font-size:14px;    padding:7px 0;    border-bottom:1px dotted #d6e2e7;}UL.menu-list LI:last-child {    border-bottom:0;}A {    color:#2557b4;    text-decoration:none;}A:hover {    text-decoration:underline;}P#first{    background : rgba(255,255,255,0.5);    padding : 20px;    font-size : 16px;    line-height : 24px;    margin : 0 0 20px 0;}#footer {    height:40px;    position:relative;    overflow:hidden;    background:url(images/bottombar.png) repeat-x 0 0;    position:relative;    margin-top:40px;}UL.menu-footer {    padding:0;    margin:8px 11px 0 0;    list-style-type:none;    float:right;}UL.menu-footer LI {    color:white;    font-family:Arial;    font-size:12px;    display:inline-block;    margin:0 1px;}UL.menu-footer LI A {    color:#8dd0ff;    text-decoration:none;}UL.menu-footer LI A:hover {    text-decoration:underline;}"),define("text/demo/styles.css",[],"html {    height: 100%;    width: 100%;    overflow: hidden;}body {    overflow: hidden;    margin: 0;    padding: 0;    height: 100%;    width: 100%;    font-family: Arial, Helvetica, sans-serif, Tahoma, Verdana, sans-serif;    font-size: 12px;    background: rgb(14, 98, 165);    color: white;}#logo {    padding: 15px;    margin-left: 65px;}#editor {    position: absolute;    top:  0px;    left: 280px;    bottom: 0px;    right: 0px;    background: white;}#controls {    padding: 5px;}#controls td {    text-align: right;}#controls td + td {    text-align: left;}#cockpitInput {    position: absolute;    left: 280px;    right: 0px;    bottom: 0;    border: none; outline: none;    font-family: consolas, courier, monospace;    font-size: 120%;}#cockpitOutput {    padding: 10px;    margin: 0 15px;    border: 1px solid #AAA;    -moz-border-radius-topleft: 10px;    -moz-border-radius-topright: 10px;    border-top-left-radius: 4px; border-top-right-radius: 4px;    background: #DDD; color: #000;}"),define("text/deps/csslint/demos/demo.css",[],'@charset "UTF-8";@import url("booya.css") print,screen;@import "whatup.css" screen;@import "wicked.css";@namespace "http://www.w3.org/1999/xhtml";@namespace svg "http://www.w3.org/2000/svg";li.inline #foo {  background: url("something.png");  display: inline;  padding-left: 3px;  padding-right: 7px;  border-right: 1px dotted #066;}li.last.first {  display: inline;  padding-left: 3px !important;  padding-right: 3px;  border-right: 0px;}@media print {    li.inline {      color: black;    }@charset "UTF-8"; @page {  margin: 10%;  counter-increment: page;  @top-center {    font-family: sans-serif;    font-weight: bold;    font-size: 2em;    content: counter(page);  }}'),define("text/deps/requirejs/dist/ie.css",[],"body .sect {    display: none;}#content ul.index {    list-style: none;}"),define("text/deps/requirejs/dist/main.css",[],'@font-face {    font-family: Inconsolata;    src: url("fonts/Inconsolata.ttf");}* {    -moz-box-sizing: border-box;    -webkit-box-sizing: border-box;    box-sizing: border-box;    margin: 0;    padding: 0;}body {    font-size: 12px;    line-height: 21px;    background-color: #fff;    font-family: "Helvetica Neue", Helvetica, Arial, Verdana, sans-serif;    color: #0a0a0a;}#wrapper {    margin: 0;}#grid {    position: fixed;    top: 0;    left: 0;    width: 796px;    background-image: url("i/grid.png");    z-index: 100;}pre {    line-height: 18px;    font-size: 13px;    margin: 7px 0 21px;    padding: 5px 10px;    overflow: auto;    background-color: #fafafa;    border: 1px solid #e6e6e6;    -moz-border-radius: 5px;    -webkit-border-radius: 5px;    border-radius: 5px;    -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.05);    -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.05);    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.05);}/*    typography stuff*/.mono {    font-family: "Inconsolata", Andale Mono, Monaco, Monospace;}.sans {    font-family: "Helvetica Neue", Helvetica, Arial, Verdana, sans-serif;}.serif {    font-family: "Georgia", Times New Roman, Times, serif;}a {    color: #2e87dd;    text-decoration: none;}a:hover {    text-decoration: underline;}/*    navigation*/#navBg {    background-color: #f2f2f2;    background-image: url("i/shadow.png");    background-position: right top;    background-repeat: repeat-y;    width: 220px;    position: fixed;    top: 0;    left: 0;    z-index: 0;}#nav {    background-image: url("i/logo.png");    background-repeat: no-repeat;    background-position: center 10px;    width: 220px;    float: left;    margin: 0;    padding: 150px 20px 0;    font-size: 13px;    text-shadow: 1px 1px #fff;    position: relative;    z-index: 1;}#nav .homeImageLink {    position: absolute;    display: block;    top: 10px;    left: 0;    width: 220px;    height: 138px;}#nav ul {    list-style-type:none;    padding: 0;    margin: 21px 0 0 0;}#nav ul li {    width: 100%;}#nav ul li.version {    text-align: center;    color: #4d4d4d;}#nav h1 {    color: #4d4d4d;    text-align: center;    font-size: 15px;    font-weight: normal;    text-transform: uppercase;    letter-spacing: 3px;}span.spacer {    color: #2e87dd;    margin: 0 3px 0 5px;    background-image: url("i/dot.png");    background-repeat: repeat-x;    background-position: left 13px;}/*    icons*/span.icon {    width: 16px;    display: block;    background-image: url("i/sprite.png");    background-repeat: no-repeat;}span.icon.home {    background-position: center 5px;}span.icon.start {    background-position: center -27px;}span.icon.download {    background-position: center -59px;}span.icon.api {    background-position: center -89px;}span.icon.optimize {    background-position: center -119px;}span.icon.script {    background-position: center -150px;}span.icon.question {    background-position: center -182px;}span.icon.requirement {    background-position: center -214px;}span.icon.history {    background-position: center -247px;}span.icon.help {    background-position: center -279px;}span.icon.blog {    background-position: center -311px;}span.icon.twitter {    background-position: center -343px;}span.icon.git {    background-position: center -375px;}span.icon.fork {    background-position: center -407px;}/*    content*/#content {    margin: 0 0 0 220px;    padding: 0 20px;    background-color: #fff;    font-family: "Georgia", Times New Roman, Times, serif;    position: relative;}#content p {    padding: 7px 0;    color: #333;    font-size: 14px;}#content h1,#content h2,#content h3,#content h4,#content h5 {    font-weight: normal;    padding: 21px 0 7px;}#content h1 {    font-size: 21px;}#content h2 {    padding: 0 0 18px 0;    margin: 0 0 7px 0;    font-weight: normal;    font-size: 21px;    line-height: 24px;    text-align: center;    color: #222;    background-image: url("i/arrow.png");    background-repeat: no-repeat;    background-position: center bottom;    font-family: "Inconsolata", Andale Mono, Monaco, Monospace;    text-transform: uppercase;    letter-spacing: 2px;    text-shadow: 1px 1px 0 #fff;}#content h2 a {    color: #222;}#content h2 a:hover,#content h3 a:hover,#content h4 a:hover {    text-decoration: none;}span.sectionMark {    display: block;    color: #aaa;    text-shadow: 1px 1px 0 #fff;    font-size: 15px;    font-family: "Inconsolata", Andale Mono, Monaco, Monospace;}#content h3 {    font-size: 17px;}#content h4 {    padding-top: 0;    font-size: 15px;}#content h5 {    font-size: 10px;}#content ul {    list-style-type: disc;}#content ul,#content ol {    /* border-left: 1px solid #333; */    color: #333;    font-size: 14px;    list-style-position: outside;    margin: 7px 0 21px 0;    /* padding: 0 0 0 28px; */}#content ul {    font-style: italic;}#content ol {    border: none;    list-style-position: inside;    padding: 0;    font-family: "Georgia", Times New Roman, Times, serif;}#content ul ul,#content ol ol {    border: none;    padding: 0;    margin: 0 0 0 28px;}#content .section {    padding: 48px 0;    background-image: url("i/line.png");    background-repeat: no-repeat;    background-position: center bottom;    width: 576px;    margin: 0 auto;}#content .section .subSection {    padding: 0 0 0 48px;    margin: 28px 0 0 0;    display: block;    border-left: 2px solid #ddd;}#content .section:last-child {    background-image: none;}#content .note {    color: #222;    background-color: #ffff99;    padding: 5px 10px;    margin: 7px 0;    display: inline-block;}/*    page directory*/#content #directory.section {    background-color: #fff;    width: 576px;}#content #directory.section ul ul ul {    margin: 0 0 0 48px;}#content #directory.section ul ul li {    background-image: url("i/sprite.png");    background-repeat: no-repeat;    background-position: left -437px;    padding-left: 18px;    font-style: normal;}#content #directory h1 {    padding: 0 0 65px 0;    margin: 0 0 14px 0;    font-weight: normal;    font-size: 21px;    text-align: center;    text-transform: uppercase;    letter-spacing: 2px;    color: #222;    background-image: url("i/arrow-x.png");    background-repeat: no-repeat;    background-position: center bottom;    font-family: "Inconsolata", Andale Mono, Monaco, Monospace;}#content ul.index {    padding: 0;    background-color: transparent;    border: none;    -moz-box-shadow: none;    font-style: normal;    font-family: "Inconsolata", Andale Mono, Monaco, Monospace;}#content ul.index li {    width: 100%;    font-size: 15px;    color: #333;    padding: 0 0 7px 0;}/*    intro page specific*/#content #intro {    width: 576px;    margin: 0 auto;    padding: 21px 0;}#content #intro p,#content #intro h1 {    font-size: 19px;    line-height: 28px;    color: green;    letter-spacing: 2px;    padding: 0 0 28px 0;}#content #intro p:last-child,#content #intro h1:last-child {    padding: 0;}#content #intro p a {    color: green;    text-decoration: underline;}/*    download page*/#content h4 a.download {    -webkit-border-radius: 5px;    -moz-border-radius: 5px;    background-color: #F2F2F2;    background-image: url("i/sprite.png"), -moz-linear-gradient(center top , #FAFAFA 0%, #F2F2F2 100%);    background-image: url("i/sprite.png"), -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fafafa), color-stop(100%, #f2f2f2));    background-position: 7px -58px, center center;    background-repeat: no-repeat, no-repeat;    border: 1px solid #CCCCCC;    color: #333333;    font-size: 12px;    margin: 0 0 0 5px;    padding: 0 10px 0 25px;    text-shadow: 1px 1px 0 #FFFFFF;}/*    footer*/#footer {    color: #4d4d4d;    padding: 65px 20px 20px;    margin: 20px 0 0 220px;    text-align: center;    display: block;    font-size: 13px;    background-image: url("i/arrow-x.png");    background-repeat: no-repeat;    background-position: center top;    background-color: #fff;}#footer .line {    display: block;}#footer .line a {    color: #4d4d4d;    text-decoration: underline;}/*    Pygments manni style*/code {background-color: #fafafa; color: #333;}code .comment {color: green; font-style: italic}code .comment.preproc {color: #099; font-style: normal}code .comment.special {font-weight: bold}code .keyword {color: #069; font-weight: bold}code .keyword.pseudo {font-weight: normal}code .keyword.type {color: #078}code .operator {color: #555}code .operator.word {color: #000; font-weight: bold}code .name.builtin {color: #366}code .name.function {color: #c0f}code .name.class {color: #0a8; font-weight: bold}code .name.namespace {color: #0cf; font-weight: bold}code .name.exception {color: #c00; font-weight: bold}code .name.variable {color: #033}code .name.constant {color: #360}code .name.label {color: #99f}code .name.entity {color: #999; font-weight: bold}code .name.attribute {color: #309}code .name.tag {color: #309; font-weight: bold}code .name.decorator {color: #99f}code .string {color: #c30}code .string.doc {font-style: italic}code .string.interpol {color: #a00}code .string.escape {color: #c30; font-weight: bold}code .string.regex {color: #3aa}code .string.symbol {color: #fc3}code .string.other {color: #c30}code .number {color: #f60}/*    webkit scroll bars*/pre::-webkit-scrollbar {    width: 6px;    height: 6px;}pre::-webkit-scrollbar-button:start:decrement,pre::-webkit-scrollbar-button:end:increment {    display: block;    height: 0;    width: 0;}pre::-webkit-scrollbar-button:vertical:increment,pre::-webkit-scrollbar-button:horizontal:increment {    background-color: transparent;    display: block;    height: 0;    width: 0;}pre::-webkit-scrollbar-track-piece {    -webkit-border-radius: 3px;}pre::-webkit-scrollbar-thumb:vertical {    background-color: #aaa;    -webkit-border-radius: 3px;}pre::-webkit-scrollbar-thumb:horizontal {    background-color: #aaa;    -webkit-border-radius: 3px;}/*    hbox*/.hbox {\tdisplay: -webkit-box;\t-webkit-box-orient: horizontal;\t-webkit-box-align: stretch;\tdisplay: -moz-box;\t-moz-box-orient: horizontal;\t-moz-box-align: stretch;\tdisplay: box;\tbox-orient: horizontal;\tbox-align: stretch;\twidth: 100%;}.hbox > * {\t-webkit-box-flex: 0;\t-moz-box-flex: 0;\tbox-flex: 0;\tdisplay: block;}.vbox {\tdisplay: -webkit-box;\t-webkit-box-orient: vertical;\t-webkit-box-align: stretch;\tdisplay: -moz-box;\t-moz-box-orient: vertical;\t-moz-box-align: stretch;\tdisplay: box;\tbox-orient: vertical;\tbox-align: stretch;}.vbox > * {\t-webkit-box-flex: 0;\t-moz-box-flex: 0;\tbox-flex: 0;\tdisplay: block;}.spacer {\t-webkit-box-flex: 1;\t-moz-box-flex: 1;\tbox-flex: 1;}.reverse {\t-webkit-box-direction: reverse;\t-moz-box-direction: reverse;\tbox-direction: reverse;}.boxFlex0 {\t-webkit-box-flex: 0;\t-moz-box-flex: 0;\tbox-flex: 0;}.boxFlex1, .boxFlex {\t-webkit-box-flex: 1;\t-moz-box-flex: 1;\tbox-flex: 1;}.boxFlex2 {\t-webkit-box-flex: 2;\t-moz-box-flex: 2;\tbox-flex: 2;}.boxGroup1 {\t-webkit-box-flex-group: 1;\t-moz-box-flex-group: 1;\tbox-flex-group: 1;}.boxGroup2 {\t-webkit-box-flex-group: 2;\t-moz-box-flex-group: 2;\tbox-flex-group: 2;}.start {\t-webkit-box-pack: start;\t-moz-box-pack: start;\tbox-pack: start;}.end {\t-webkit-box-pack: end;\t-moz-box-pack: end;\tbox-pack: end;}.center {\t-webkit-box-pack: center;\t-moz-box-pack: center;\tbox-pack: center;}/*    clearfix*/.clearfix:after {\tcontent: ".";\tdisplay: block;\tclear: both;\tvisibility: hidden;\tline-height: 0;\theight: 0;}html[xmlns] .clearfix {\tdisplay: block;}* html .clearfix {\theight: 1%;}'),define("text/lib/ace/css/editor.css",[],'.ace_editor {    position: absolute;    overflow: hidden;    font-family: Monaco, "Menlo", "Courier New", monospace;    font-size: 12px;}.ace_scroller {    position: absolute;    overflow-x: scroll;    overflow-y: hidden;}.ace_content {    position: absolute;    box-sizing: border-box;    -moz-box-sizing: border-box;    -webkit-box-sizing: border-box;}.ace_composition {    position: absolute;    background: #555;    color: #DDD;    z-index: 4;}.ace_gutter {    position: absolute;    overflow-x: hidden;    overflow-y: hidden;    height: 100%;}.ace_gutter-cell.ace_error {    background-image: url("data:image/gif,GIF89a%10%00%10%00%D5%00%00%F5or%F5%87%88%F5nr%F4ns%EBmq%F5z%7F%DDJT%DEKS%DFOW%F1Yc%F2ah%CE(7%CE)8%D18E%DD%40M%F2KZ%EBU%60%F4%60m%DCir%C8%16(%C8%19*%CE%255%F1%3FR%F1%3FS%E6%AB%B5%CA%5DI%CEn%5E%F7%A2%9A%C9G%3E%E0a%5B%F7%89%85%F5yy%F6%82%80%ED%82%80%FF%BF%BF%E3%C4%C4%FF%FF%FF%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%25%00%2C%00%00%00%00%10%00%10%00%00%06p%C0%92pH%2C%1A%8F%C8%D2H%93%E1d4%23%E4%88%D3%09mB%1DN%B48%F5%90%40%60%92G%5B%94%20%3E%22%D2%87%24%FA%20%24%C5%06A%00%20%B1%07%02B%A38%89X.v%17%82%11%13q%10%0Fi%24%0F%8B%10%7BD%12%0Ei%09%92%09%0EpD%18%15%24%0A%9Ci%05%0C%18F%18%0B%07%04%01%04%06%A0H%18%12%0D%14%0D%12%A1I%B3%B4%B5IA%00%3B");    background-repeat: no-repeat;    background-position: 4px center;}.ace_gutter-cell.ace_warning {    background-image: url("data:image/gif,GIF89a%10%00%10%00%D5%00%00%FF%DBr%FF%DE%81%FF%E2%8D%FF%E2%8F%FF%E4%96%FF%E3%97%FF%E5%9D%FF%E6%9E%FF%EE%C1%FF%C8Z%FF%CDk%FF%D0s%FF%D4%81%FF%D5%82%FF%D5%83%FF%DC%97%FF%DE%9D%FF%E7%B8%FF%CCl%7BQ%13%80U%15%82W%16%81U%16%89%5B%18%87%5B%18%8C%5E%1A%94d%1D%C5%83-%C9%87%2F%C6%84.%C6%85.%CD%8B2%C9%871%CB%8A3%CD%8B5%DC%98%3F%DF%9BB%E0%9CC%E1%A5U%CB%871%CF%8B5%D1%8D6%DB%97%40%DF%9AB%DD%99B%E3%B0p%E7%CC%AE%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%2F%00%2C%00%00%00%00%10%00%10%00%00%06a%C0%97pH%2C%1A%8FH%A1%ABTr%25%87%2B%04%82%F4%7C%B9X%91%08%CB%99%1C!%26%13%84*iJ9(%15G%CA%84%14%01%1A%97%0C%03%80%3A%9A%3E%81%84%3E%11%08%B1%8B%20%02%12%0F%18%1A%0F%0A%03\'F%1C%04%0B%10%16%18%10%0B%05%1CF%1D-%06%07%9A%9A-%1EG%1B%A0%A1%A0U%A4%A5%A6BA%00%3B");    background-repeat: no-repeat;    background-position: 4px center;}.ace_editor .ace_sb {    position: absolute;    overflow-x: hidden;    overflow-y: scroll;    right: 0;}.ace_editor .ace_sb div {    position: absolute;    width: 1px;    left: 0;}.ace_editor .ace_print_margin_layer {    z-index: 0;    position: absolute;    overflow: hidden;    margin: 0;    left: 0;    height: 100%;    width: 100%;}.ace_editor .ace_print_margin {    position: absolute;    height: 100%;}.ace_editor textarea {    position: fixed;    z-index: -1;    width: 10px;    height: 30px;    opacity: 0;    background: transparent;    appearance: none;    -moz-appearance: none;    border: none;    resize: none;    outline: none;    overflow: hidden;}.ace_layer {    z-index: 1;    position: absolute;    overflow: hidden;    white-space: nowrap;    height: 100%;    width: 100%;}.ace_text-layer {    color: black;}.ace_cjk {    display: inline-block;    text-align: center;}.ace_cursor-layer {    z-index: 4;    cursor: text;    /* setting pointer-events: none; here will break mouse wheel scrolling in Safari */}.ace_cursor {    z-index: 4;    position: absolute;}.ace_cursor.ace_hidden {    opacity: 0.2;}.ace_line {    white-space: nowrap;}.ace_marker-layer {    cursor: text;    pointer-events: none;}.ace_marker-layer .ace_step {    position: absolute;    z-index: 3;}.ace_marker-layer .ace_selection {    position: absolute;    z-index: 4;}.ace_marker-layer .ace_bracket {    position: absolute;    z-index: 5;}.ace_marker-layer .ace_active_line {    position: absolute;    z-index: 2;}.ace_marker-layer .ace_selected_word {    position: absolute;    z-index: 6;    box-sizing: border-box;    -moz-box-sizing: border-box;    -webkit-box-sizing: border-box;}.ace_line .ace_fold {    cursor: pointer;}.ace_dragging .ace_marker-layer, .ace_dragging .ace_text-layer {  cursor: move;}'),define("text/node_modules/uglify-js/docstyle.css",[],'html { font-family: "Lucida Grande","Trebuchet MS",sans-serif; font-size: 12pt; }body { max-width: 60em; }.title  { text-align: center; }.todo   { color: red; }.done   { color: green; }.tag    { background-color:lightblue; font-weight:normal }.target { }.timestamp { color: grey }.timestamp-kwd { color: CadetBlue }p.verse { margin-left: 3% }pre {  border: 1pt solid #AEBDCC;  background-color: #F3F5F7;  padding: 5pt;  font-family: monospace;  font-size: 90%;  overflow:auto;}pre.src {  background-color: #eee; color: #112; border: 1px solid #000;}table { border-collapse: collapse; }td, th { vertical-align: top; }dt { font-weight: bold; }div.figure { padding: 0.5em; }div.figure p { text-align: center; }.linenr { font-size:smaller }.code-highlighted {background-color:#ffff00;}.org-info-js_info-navigation { border-style:none; }#org-info-js_console-label { font-size:10px; font-weight:bold;  white-space:nowrap; }.org-info-js_search-highlight {background-color:#ffff00; color:#000000;  font-weight:bold; }sup {  vertical-align: baseline;  position: relative;  top: -0.5em;  font-size: 80%;}sup a:link, sup a:visited {  text-decoration: none;  color: #c00;}sup a:before { content: "["; color: #999; }sup a:after { content: "]"; color: #999; }h1.title { border-bottom: 4px solid #000; padding-bottom: 5px; margin-bottom: 2em; }#postamble {  color: #777;  font-size: 90%;  padding-top: 1em; padding-bottom: 1em; border-top: 1px solid #999;  margin-top: 2em;  padding-left: 2em;  padding-right: 2em;  text-align: right;}#postamble p { margin: 0; }#footnotes { border-top: 1px solid #000; }h1 { font-size: 200% }h2 { font-size: 175% }h3 { font-size: 150% }h4 { font-size: 125% }h1, h2, h3, h4 { font-family: "Bookman",Georgia,"Times New Roman",serif; font-weight: normal; }@media print {  html { font-size: 11pt; }}'),define("text/support/cockpit/lib/cockpit/ui/cli_view.css",[],"#cockpitInput { padding-left: 16px; }.cptOutput { overflow: auto; position: absolute; z-index: 999; display: none; }.cptCompletion { padding: 0; position: absolute; z-index: -1000; }.cptCompletion.VALID { background: #FFF; }.cptCompletion.INCOMPLETE { background: #DDD; }.cptCompletion.INVALID { background: #DDD; }.cptCompletion span { color: #FFF; }.cptCompletion span.INCOMPLETE { color: #DDD; border-bottom: 2px dotted #F80; }.cptCompletion span.INVALID { color: #DDD; border-bottom: 2px dotted #F00; }span.cptPrompt { color: #66F; font-weight: bold; }.cptHints {  color: #000;  position: absolute;  border: 1px solid rgba(230, 230, 230, 0.8);  background: rgba(250, 250, 250, 0.8);  -moz-border-radius-topleft: 10px;  -moz-border-radius-topright: 10px;  border-top-left-radius: 10px; border-top-right-radius: 10px;  z-index: 1000;  padding: 8px;  display: none;}.cptFocusPopup { display: block; }.cptFocusPopup.cptNoPopup { display: none; }.cptHints ul { margin: 0; padding: 0 15px; }.cptGt { font-weight: bold; font-size: 120%; }"),define("text/support/cockpit/lib/cockpit/ui/request_view.css",[],".cptRowIn {  display: box; display: -moz-box; display: -webkit-box;  box-orient: horizontal; -moz-box-orient: horizontal; -webkit-box-orient: horizontal;  box-align: center; -moz-box-align: center; -webkit-box-align: center;  color: #333;  background-color: #EEE;  width: 100%;  font-family: consolas, courier, monospace;}.cptRowIn > * { padding-left: 2px; padding-right: 2px; }.cptRowIn > img { cursor: pointer; }.cptHover { display: none; }.cptRowIn:hover > .cptHover { display: block; }.cptRowIn:hover > .cptHover.cptHidden { display: none; }.cptOutTyped {  box-flex: 1; -moz-box-flex: 1; -webkit-box-flex: 1;  font-weight: bold; color: #000; font-size: 120%;}.cptRowOutput { padding-left: 10px; line-height: 1.2em; }.cptRowOutput strong,.cptRowOutput b,.cptRowOutput th,.cptRowOutput h1,.cptRowOutput h2,.cptRowOutput h3 { color: #000; }.cptRowOutput a { font-weight: bold; color: #666; text-decoration: none; }.cptRowOutput a: hover { text-decoration: underline; cursor: pointer; }.cptRowOutput input[type=password],.cptRowOutput input[type=text],.cptRowOutput textarea {  color: #000; font-size: 120%;  background: transparent; padding: 3px;  border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px;}.cptRowOutput table,.cptRowOutput td,.cptRowOutput th { border: 0; padding: 0 2px; }.cptRowOutput .right { text-align: right; }"),define("text/tool/Theme.tmpl.css",[],".%cssClass% .ace_editor {  border: 2px solid rgb(159, 159, 159);}.%cssClass% .ace_editor.ace_focus {  border: 2px solid #327fbd;}.%cssClass% .ace_gutter {  width: 50px;  background: #e8e8e8;  color: #333;  overflow : hidden;}.%cssClass% .ace_gutter-layer {  width: 100%;  text-align: right;}.%cssClass% .ace_gutter-layer .ace_gutter-cell {  padding-right: 6px;}.%cssClass% .ace_print_margin {  width: 1px;  background: %printMargin%;}.%cssClass% .ace_scroller {  background-color: %background%;}.%cssClass% .ace_text-layer {  cursor: text;  color: %foreground%;}.%cssClass% .ace_cursor {  border-left: 2px solid %cursor%;}.%cssClass% .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid %overwrite%;} .%cssClass% .ace_marker-layer .ace_selection {  background: %selection%;}.%cssClass% .ace_marker-layer .ace_step {  background: %step%;}.%cssClass% .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid %bracket%;}.%cssClass% .ace_marker-layer .ace_active_line {  background: %active_line%;}       .%cssClass% .ace_invisible {  %invisible%}.%cssClass% .ace_keyword {  %keyword%}.%cssClass% .ace_keyword.ace_operator {  %keyword.operator%}.%cssClass% .ace_constant {  %constant%}.%cssClass% .ace_constant.ace_language {  %constant.language%}.%cssClass% .ace_constant.ace_library {  %constant.library%}.%cssClass% .ace_constant.ace_numeric {  %constant.numeric%}.%cssClass% .ace_invalid {  %invalid%}.%cssClass% .ace_invalid.ace_illegal {  %invalid.illegal%}.%cssClass% .ace_invalid.ace_deprecated {  %invalid.deprecated%}.%cssClass% .ace_support {  %support%}.%cssClass% .ace_support.ace_function {  %support.function%}.%cssClass% .ace_function.ace_buildin {  %function.buildin%}.%cssClass% .ace_string {  %string%}.%cssClass% .ace_string.ace_regexp {  %string.regexp%}.%cssClass% .ace_comment {  %comment%}.%cssClass% .ace_comment.ace_doc {  %comment.doc%}.%cssClass% .ace_comment.ace_doc.ace_tag {  %comment.doc.tag%}.%cssClass% .ace_variable {  %variable%}.%cssClass% .ace_variable.ace_language {  %variable.language%}.%cssClass% .ace_xml_pe {  %xml_pe%}.%cssClass% .ace_collab.ace_user1 {  %collab.user1%   }"),define("text/styles.css",[],"html {    height: 100%;    width: 100%;    overflow: hidden;}body {    overflow: hidden;    margin: 0;    padding: 0;    height: 100%;    width: 100%;    font-family: Arial, Helvetica, sans-serif, Tahoma, Verdana, sans-serif;    font-size: 12px;    background: rgb(14, 98, 165);    color: white;}#logo {    padding: 15px;    margin-left: 65px;}#editor {    position: absolute;    top:  0px;    left: 280px;    bottom: 0px;    right: 0px;    background: white;}#controls {    padding: 5px;}#controls td {    text-align: right;}#controls td + td {    text-align: left;}#cockpitInput {    position: absolute;    left: 280px;    right: 0px;    bottom: 0;    border: none; outline: none;    font-family: consolas, courier, monospace;    font-size: 120%;}#cockpitOutput {    padding: 10px;    margin: 0 15px;    border: 1px solid #AAA;    -moz-border-radius-topleft: 10px;    -moz-border-radius-topright: 10px;    border-top-left-radius: 4px; border-top-right-radius: 4px;    background: #DDD; color: #000;}"),require(["ace/ace"],function(a){window.ace=a})
\ No newline at end of file
+(function(){function g(a){var e=function(a,b){return d("",a,b)};e.packaged=!0;var f=b;a&&(b[a]||(b[a]={}),f=b[a]),f.define&&(c.original=f.define),f.define=c,f.require&&(d.original=f.require),f.require=e}var a="",b=function(){return this}();if(typeof requirejs!="undefined")return;var c=function(a,b,d){if(typeof a!="string"){c.original?c.original.apply(window,arguments):(console.error("dropping module because define wasn't a string."),console.trace());return}arguments.length==2&&(d=b),c.modules||(c.modules={}),c.modules[a]=d},d=function(a,b,c){if(Object.prototype.toString.call(b)==="[object Array]"){var e=[];for(var g=0,h=b.length;g<h;++g){var i=f(a,b[g]);if(!i&&d.original)return d.original.apply(window,arguments);e.push(i)}c&&c.apply(null,e)}else{if(typeof b=="string"){var j=f(a,b);return!j&&d.original?d.original.apply(window,arguments):(c&&c(),j)}if(d.original)return d.original.apply(window,arguments)}},e=function(a,b){if(b.indexOf("!")!==-1){var c=b.split("!");return e(a,c[0])+"!"+e(a,c[1])}if(b.charAt(0)=="."){var d=a.split("/").slice(0,-1).join("/");b=d+"/"+b;while(b.indexOf(".")!==-1&&f!=b){var f=b;b=b.replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}}return b},f=function(a,b){b=e(a,b);var f=c.modules[b];if(!f)return null;if(typeof f=="function"){var g={},h={id:b,uri:"",exports:g,packaged:!0},i=function(a,c){return d(b,a,c)},j=f(i,g,h);return g=j||h.exports,c.modules[b]=g,g}return f};g(a)})(),define("ace/ace",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/dom","ace/lib/event","ace/editor","ace/edit_session","ace/undomanager","ace/virtual_renderer","ace/theme/textmate"],function(a,b,c){"use strict",a("./lib/fixoldbrowsers");var d=a("./lib/dom"),e=a("./lib/event"),f=a("./editor").Editor,g=a("./edit_session").EditSession,h=a("./undomanager").UndoManager,i=a("./virtual_renderer").VirtualRenderer;b.edit=function(b){typeof b=="string"&&(b=document.getElementById(b));var c=new g(d.getInnerText(b));c.setUndoManager(new h),b.innerHTML="";var j=new f(new i(b,a("./theme/textmate")));j.setSession(c);var k={};return k.document=c,k.editor=j,j.resize(),e.addListener(window,"resize",function(){j.resize()}),b.env=k,j.env=k,j}}),define("ace/lib/fixoldbrowsers",["require","exports","module","ace/lib/regexp","ace/lib/es5-shim"],function(a,b,c){"use strict",a("./regexp"),a("./es5-shim")}),define("ace/lib/regexp",["require","exports","module"],function(a,b,c){function g(a){return(a.global?"g":"")+(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.extended?"x":"")+(a.sticky?"y":"")}function h(a,b,c){if(Array.prototype.indexOf)return a.indexOf(b,c);for(var d=c||0;d<a.length;d++)if(a[d]===b)return d;return-1}"use strict";var d={exec:RegExp.prototype.exec,test:RegExp.prototype.test,match:String.prototype.match,replace:String.prototype.replace,split:String.prototype.split},e=d.exec.call(/()??/,"")[1]===undefined,f=function(){var a=/^/g;return d.test.call(a,""),!a.lastIndex}();RegExp.prototype.exec=function(a){var b=d.exec.apply(this,arguments),c,i;if(b){!e&&b.length>1&&h(b,"")>-1&&(i=RegExp(this.source,d.replace.call(g(this),"g","")),d.replace.call(a.slice(b.index),i,function(){for(var a=1;a<arguments.length-2;a++)arguments[a]===undefined&&(b[a]=undefined)}));if(this._xregexp&&this._xregexp.captureNames)for(var j=1;j<b.length;j++)c=this._xregexp.captureNames[j-1],c&&(b[c]=b[j]);!f&&this.global&&!b[0].length&&this.lastIndex>b.index&&this.lastIndex--}return b},f||(RegExp.prototype.test=function(a){var b=d.exec.call(this,a);return b&&this.global&&!b[0].length&&this.lastIndex>b.index&&this.lastIndex--,!!b})}),define("ace/lib/es5-shim",["require","exports","module"],function(a,b,c){function p(a){try{return Object.defineProperty(a,"sentinel",{}),"sentinel"in a}catch(b){}}Function.prototype.bind||(Function.prototype.bind=function(a){var b=this;if(typeof b!="function")throw new TypeError;var c=g.call(arguments,1),d=function(){if(this instanceof d){var e=function(){};e.prototype=b.prototype;var f=new e,h=b.apply(f,c.concat(g.call(arguments)));return h!==null&&Object(h)===h?h:f}return b.apply(a,c.concat(g.call(arguments)))};return d});var d=Function.prototype.call,e=Array.prototype,f=Object.prototype,g=e.slice,h=d.bind(f.toString),i=d.bind(f.hasOwnProperty),j,k,l,m,n;if(n=i(f,"__defineGetter__"))j=d.bind(f.__defineGetter__),k=d.bind(f.__defineSetter__),l=d.bind(f.__lookupGetter__),m=d.bind(f.__lookupSetter__);Array.isArray||(Array.isArray=function(a){return h(a)=="[object Array]"}),Array.prototype.forEach||(Array.prototype.forEach=function(a){var b=G(this),c=arguments[1],d=0,e=b.length>>>0;if(h(a)!="[object Function]")throw new TypeError;while(d<e)d in b&&a.call(c,b[d],d,b),d++}),Array.prototype.map||(Array.prototype.map=function(a){var b=G(this),c=b.length>>>0,d=Array(c),e=arguments[1];if(h(a)!="[object Function]")throw new TypeError;for(var f=0;f<c;f++)f in b&&(d[f]=a.call(e,b[f],f,b));return d}),Array.prototype.filter||(Array.prototype.filter=function(a){var b=G(this),c=b.length>>>0,d=[],e=arguments[1];if(h(a)!="[object Function]")throw new TypeError;for(var f=0;f<c;f++)f in b&&a.call(e,b[f],f,b)&&d.push(b[f]);return d}),Array.prototype.every||(Array.prototype.every=function(a){var b=G(this),c=b.length>>>0,d=arguments[1];if(h(a)!="[object Function]")throw new TypeError;for(var e=0;e<c;e++)if(e in b&&!a.call(d,b[e],e,b))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(a){var b=G(this),c=b.length>>>0,d=arguments[1];if(h(a)!="[object Function]")throw new TypeError;for(var e=0;e<c;e++)if(e in b&&a.call(d,b[e],e,b))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(a){var b=G(this),c=b.length>>>0;if(h(a)!="[object Function]")throw new TypeError;if(!c&&arguments.length==1)throw new TypeError;var d=0,e;if(arguments.length>=2)e=arguments[1];else do{if(d in b){e=b[d++];break}if(++d>=c)throw new TypeError}while(!0);for(;d<c;d++)d in b&&(e=a.call(void 0,e,b[d],d,b));return e}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(a){var b=G(this),c=b.length>>>0;if(h(a)!="[object Function]")throw new TypeError;if(!c&&arguments.length==1)throw new TypeError;var d,e=c-1;if(arguments.length>=2)d=arguments[1];else do{if(e in b){d=b[e--];break}if(--e<0)throw new TypeError}while(!0);do e in this&&(d=a.call(void 0,d,b[e],e,b));while(e--);return d}),Array.prototype.indexOf||(Array.prototype.indexOf=function(a){var b=G(this),c=b.length>>>0;if(!c)return-1;var d=0;arguments.length>1&&(d=E(arguments[1])),d=d>=0?d:Math.max(0,c+d);for(;d<c;d++)if(d in b&&b[d]===a)return d;return-1}),Array.prototype.lastIndexOf||(Array.prototype.lastIndexOf=function(a){var b=G(this),c=b.length>>>0;if(!c)return-1;var d=c-1;arguments.length>1&&(d=Math.min(d,E(arguments[1]))),d=d>=0?d:c-Math.abs(d);for(;d>=0;d--)if(d in b&&a===b[d])return d;return-1}),Object.getPrototypeOf||(Object.getPrototypeOf=function(a){return a.__proto__||(a.constructor?a.constructor.prototype:f)});if(!Object.getOwnPropertyDescriptor){var o="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(a,b){if(typeof a!="object"&&typeof a!="function"||a===null)throw new TypeError(o+a);if(!i(a,b))return;var c,d,e;c={enumerable:!0,configurable:!0};if(n){var g=a.__proto__;a.__proto__=f;var d=l(a,b),e=m(a,b);a.__proto__=g;if(d||e)return d&&(c.get=d),e&&(c.set=e),c}return c.value=a[b],c}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(a){return Object.keys(a)}),Object.create||(Object.create=function(a,b){var c;if(a===null)c={"__proto__":null};else{if(typeof a!="object")throw new TypeError("typeof prototype["+typeof a+"] != 'object'");var d=function(){};d.prototype=a,c=new d,c.__proto__=a}return b!==void 0&&Object.defineProperties(c,b),c});if(Object.defineProperty){var q=p({}),r=typeof document=="undefined"||p(document.createElement("div"));if(!q||!r)var s=Object.defineProperty}if(!Object.defineProperty||s){var t="Property description must be an object: ",u="Object.defineProperty called on non-object: ",v="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(a,b,c){if(typeof a!="object"&&typeof a!="function"||a===null)throw new TypeError(u+a);if(typeof c!="object"&&typeof c!="function"||c===null)throw new TypeError(t+c);if(s)try{return s.call(Object,a,b,c)}catch(d){}if(i(c,"value"))if(n&&(l(a,b)||m(a,b))){var e=a.__proto__;a.__proto__=f,delete a[b],a[b]=c.value,a.__proto__=e}else a[b]=c.value;else{if(!n)throw new TypeError(v);i(c,"get")&&j(a,b,c.get),i(c,"set")&&k(a,b,c.set)}return a}}Object.defineProperties||(Object.defineProperties=function(a,b){for(var c in b)i(b,c)&&Object.defineProperty(a,c,b[c]);return a}),Object.seal||(Object.seal=function(a){return a}),Object.freeze||(Object.freeze=function(a){return a});try{Object.freeze(function(){})}catch(w){Object.freeze=function(a){return function b(b){return typeof b=="function"?b:a(b)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(a){return a}),Object.isSealed||(Object.isSealed=function(a){return!1}),Object.isFrozen||(Object.isFrozen=function(a){return!1}),Object.isExtensible||(Object.isExtensible=function(a){if(Object(a)===a)throw new TypeError;var b="";while(i(a,b))b+="?";a[b]=!0;var c=i(a,b);return delete a[b],c});if(!Object.keys){var x=!0,y=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],z=y.length;for(var A in{toString:null})x=!1;Object.keys=function bd(a){if(typeof a!="object"&&typeof a!="function"||a===null)throw new TypeError("Object.keys called on a non-object");var bd=[];for(var b in a)i(a,b)&&bd.push(b);if(x)for(var c=0,d=z;c<d;c++){var e=y[c];i(a,e)&&bd.push(e)}return bd}}if(!Date.prototype.toISOString||(new Date(-621987552e5)).toISOString().indexOf("-000001")===-1)Date.prototype.toISOString=function(){var a,b,c,d;if(!isFinite(this))throw new RangeError;a=[this.getUTCMonth()+1,this.getUTCDate(),this.getUTCHours(),this.getUTCMinutes(),this.getUTCSeconds()],d=this.getUTCFullYear(),d=(d<0?"-":d>9999?"+":"")+("00000"+Math.abs(d)).slice(0<=d&&d<=9999?-4:-6),b=a.length;while(b--)c=a[b],c<10&&(a[b]="0"+c);return d+"-"+a.slice(0,2).join("-")+"T"+a.slice(2).join(":")+"."+("000"+this.getUTCMilliseconds()).slice(-3)+"Z"};Date.now||(Date.now=function(){return(new Date).getTime()}),Date.prototype.toJSON||(Date.prototype.toJSON=function(a){if(typeof this.toISOString!="function")throw new TypeError;return this.toISOString()}),Date.parse("+275760-09-13T00:00:00.000Z")!==864e13&&(Date=function(a){var b=function e(b,c,d,f,g,h,i){var j=arguments.length;if(this instanceof a){var k=j==1&&String(b)===b?new a(e.parse(b)):j>=7?new a(b,c,d,f,g,h,i):j>=6?new a(b,c,d,f,g,h):j>=5?new a(b,c,d,f,g):j>=4?new a(b,c,d,f):j>=3?new a(b,c,d):j>=2?new a(b,c):j>=1?new a(b):new a;return k.constructor=e,k}return a.apply(this,arguments)},c=new RegExp("^(\\d{4}|[+-]\\d{6})(?:-(\\d{2})(?:-(\\d{2})(?:T(\\d{2}):(\\d{2})(?::(\\d{2})(?:\\.(\\d{3}))?)?(?:Z|(?:([-+])(\\d{2}):(\\d{2})))?)?)?)?$");for(var d in a)b[d]=a[d];return b.now=a.now,b.UTC=a.UTC,b.prototype=a.prototype,b.prototype.constructor=b,b.parse=function f(b){var d=c.exec(b);if(d){d.shift();for(var e=1;e<7;e++)d[e]=+(d[e]||(e<3?1:0)),e==1&&d[e]--;var f=+d.pop(),g=+d.pop(),h=d.pop(),i=0;if(h){if(g>23||f>59)return NaN;i=(g*60+f)*6e4*(h=="+"?-1:1)}var j=+d[0];return 0<=j&&j<=99?(d[0]=j+400,a.UTC.apply(this,d)+i-126227808e5):a.UTC.apply(this,d)+i}return a.parse.apply(this,arguments)},b}(Date));var B="\t\n\f\r   ᠎ �          �　\u2028\u2029";if(!String.prototype.trim||B.trim()){B="["+B+"]";var C=new RegExp("^"+B+B+"*"),D=new RegExp(B+B+"*$");String.prototype.trim=function(){return String(this).replace(C,"").replace(D,"")}}var E=function(a){return a=+a,a!==a?a=0:a!==0&&a!==1/0&&a!==-Infinity&&(a=(a>0||-1)*Math.floor(Math.abs(a))),a},F="a"[0]!="a",G=function(a){if(a==null)throw new TypeError;return F&&typeof a=="string"&&a?a.split(""):Object(a)}}),define("ace/lib/dom",["require","exports","module"],function(a,b,c){"use strict";var d="http://www.w3.org/1999/xhtml";b.createElement=function(a,b){return document.createElementNS?document.createElementNS(b||d,a):document.createElement(a)},b.setText=function(a,b){a.innerText!==undefined&&(a.innerText=b),a.textContent!==undefined&&(a.textContent=b)},b.hasCssClass=function(a,b){var c=a.className.split(/\s+/g);return c.indexOf(b)!==-1},b.addCssClass=function(a,c){b.hasCssClass(a,c)||(a.className+=" "+c)},b.removeCssClass=function(a,b){var c=a.className.split(/\s+/g);for(;;){var d=c.indexOf(b);if(d==-1)break;c.splice(d,1)}a.className=c.join(" ")},b.toggleCssClass=function(a,b){var c=a.className.split(/\s+/g),d=!0;for(;;){var e=c.indexOf(b);if(e==-1)break;d=!1,c.splice(e,1)}return d&&c.push(b),a.className=c.join(" "),d},b.setCssClass=function(a,c,d){d?b.addCssClass(a,c):b.removeCssClass(a,c)},b.hasCssString=function(a,b){var c=0,d;b=b||document;if(b.createStyleSheet&&(d=b.styleSheets)){while(c<d.length)if(d[c++].title===a)return!0}else if(d=b.getElementsByTagName("style"))while(c<d.length)if(d[c++].id===a)return!0;return!1},b.importCssString=function e(a,c,e){e=e||document;if(c&&b.hasCssString(c,e))return null;var f;if(e.createStyleSheet)f=e.createStyleSheet(),f.cssText=a,c&&(f.title=c);else{f=e.createElementNS?e.createElementNS(d,"style"):e.createElement("style"),f.appendChild(e.createTextNode(a)),c&&(f.id=c);var g=e.getElementsByTagName("head")[0]||e.documentElement;g.appendChild(f)}},b.importCssStylsheet=function(a,c){if(c.createStyleSheet)c.createStyleSheet(a);else{var d=b.createElement("link");d.rel="stylesheet",d.href=a;var e=c.getElementsByTagName("head")[0]||c.documentElement;e.appendChild(d)}},b.getInnerWidth=function(a){return parseInt(b.computedStyle(a,"paddingLeft"),10)+parseInt(b.computedStyle(a,"paddingRight"),10)+a.clientWidth},b.getInnerHeight=function(a){return parseInt(b.computedStyle(a,"paddingTop"),10)+parseInt(b.computedStyle(a,"paddingBottom"),10)+a.clientHeight},window.pageYOffset!==undefined?(b.getPageScrollTop=function(){return window.pageYOffset},b.getPageScrollLeft=function(){return window.pageXOffset}):(b.getPageScrollTop=function(){return document.body.scrollTop},b.getPageScrollLeft=function(){return document.body.scrollLeft}),window.getComputedStyle?b.computedStyle=function(a,b){return b?(window.getComputedStyle(a,"")||{})[b]||"":window.getComputedStyle(a,"")||{}}:b.computedStyle=function(a,b){return b?a.currentStyle[b]:a.currentStyle},b.scrollbarWidth=function(a){var c=b.createElement("p");c.style.width="100%",c.style.minWidth="0px",c.style.height="200px";var d=b.createElement("div"),e=d.style;e.position="absolute",e.left="-10000px",e.overflow="hidden",e.width="200px",e.minWidth="0px",e.height="150px",d.appendChild(c);var f=a.body||a.documentElement;f.appendChild(d);var g=c.offsetWidth;e.overflow="scroll";var h=c.offsetWidth;return g==h&&(h=d.clientWidth),f.removeChild(d),g-h},b.setInnerHtml=function(a,b){var c=a.cloneNode(!1);return c.innerHTML=b,a.parentNode.replaceChild(c,a),c},b.setInnerText=function(a,b){var c=a.ownerDocument;c.body&&"textContent"in c.body?a.textContent=b:a.innerText=b},b.getInnerText=function(a){var b=a.ownerDocument;return b.body&&"textContent"in b.body?a.textContent:a.innerText||a.textContent||""},b.getParentWindow=function(a){return a.defaultView||a.parentWindow}}),define("ace/lib/event",["require","exports","module","ace/lib/keys","ace/lib/useragent","ace/lib/dom"],function(a,b,c){function g(a,b,c){var f=0;e.isOpera&&e.isMac?f=0|(b.metaKey?1:0)|(b.altKey?2:0)|(b.shiftKey?4:0)|(b.ctrlKey?8:0):f=0|(b.ctrlKey?1:0)|(b.altKey?2:0)|(b.shiftKey?4:0)|(b.metaKey?8:0);if(c in d.MODIFIER_KEYS){switch(d.MODIFIER_KEYS[c]){case"Alt":f=2;break;case"Shift":f=4;break;case"Ctrl":f=1;break;default:f=8}c=0}return f&8&&(c==91||c==93)&&(c=0),!!f||c in d.FUNCTION_KEYS||c in d.PRINTABLE_KEYS?a(b,f,c):!1}"use strict";var d=a("./keys"),e=a("./useragent"),f=a("./dom");b.addListener=function(a,b,c){if(a.addEventListener)return a.addEventListener(b,c,!1);if(a.attachEvent){var d=function(){c(window.event)};c._wrapper=d,a.attachEvent("on"+b,d)}},b.removeListener=function(a,b,c){if(a.removeEventListener)return a.removeEventListener(b,c,!1);a.detachEvent&&a.detachEvent("on"+b,c._wrapper||c)},b.stopEvent=function(a){return b.stopPropagation(a),b.preventDefault(a),!1},b.stopPropagation=function(a){a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},b.preventDefault=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},b.getDocumentX=function(a){return a.clientX?a.clientX+f.getPageScrollLeft():a.pageX},b.getDocumentY=function(a){return a.clientY?a.clientY+f.getPageScrollTop():a.pageY},b.getButton=function(a){return a.type=="dblclick"?0:a.type=="contextmenu"?2:a.preventDefault?a.button:{1:0,2:2,4:1}[a.button]},document.documentElement.setCapture?b.capture=function(a,c,d){function e(a){return c(a),b.stopPropagation(a)}function g(e){c(e),f||(f=!0,d(e)),b.removeListener(a,"mousemove",c),b.removeListener(a,"mouseup",g),b.removeListener(a,"losecapture",g),a.releaseCapture()}var f=!1;b.addListener(a,"mousemove",c),b.addListener(a,"mouseup",g),b.addListener(a,"losecapture",g),a.setCapture()}:b.capture=function(a,b,c){function d(a){b(a),a.stopPropagation()}function e(a){b&&b(a),c&&c(a),document.removeEventListener("mousemove",d,!0),document.removeEventListener("mouseup",e,!0),a.stopPropagation()}document.addEventListener("mousemove",d,!0),document.addEventListener("mouseup",e,!0)},b.addMouseWheelListener=function(a,c){var d=0,e=function(a){if(a.wheelDelta!==undefined){Math.abs(a.wheelDeltaY)>d&&(d=Math.abs(a.wheelDeltaY));if(d>5e3)var b=400;else var b=8;a.wheelDeltaX!==undefined?(a.wheelX=-a.wheelDeltaX/b,a.wheelY=-a.wheelDeltaY/b):(a.wheelX=0,a.wheelY=-a.wheelDelta/b)}else a.axis&&a.axis==a.HORIZONTAL_AXIS?(a.wheelX=(a.detail||0)*5,a.wheelY=0):(a.wheelX=0,a.wheelY=(a.detail||0)*5);c(a)};b.addListener(a,"DOMMouseScroll",e),b.addListener(a,"mousewheel",e)},b.addMultiMouseDownListener=function(a,c,d,f,g){var h=0,i,j,k=function(a){h+=1,h==1&&(i=a.clientX,j=a.clientY,setTimeout(function(){h=0},f||600));var e=b.getButton(a)==c;if(!e||Math.abs(a.clientX-i)>5||Math.abs(a.clientY-j)>5)h=0;h==d&&(h=0,g(a));if(e)return b.preventDefault(a)};b.addListener(a,"mousedown",k),e.isOldIE&&b.addListener(a,"dblclick",k)},b.addCommandKeyListener=function(a,c){var d=b.addListener;if(e.isOldGecko){var f=null;d(a,"keydown",function(a){f=a.keyCode}),d(a,"keypress",function(a){return g(c,a,f)})}else{var h=null;d(a,"keydown",function(a){return h=a.keyIdentifier||a.keyCode,g(c,a,a.keyCode)}),e.isMac&&e.isOpera&&d(a,"keypress",function(a){var b=a.keyIdentifier||a.keyCode;if(h!==b)return g(c,a,h);h=null})}};if(window.postMessage){var h=1;b.nextTick=function(a,c){c=c||window;var d="zero-timeout-message-"+h;b.addListener(c,"message",function e(f){f.data==d&&(b.stopPropagation(f),b.removeListener(c,"message",e),a())}),c.postMessage(d,"*")}}else b.nextTick=function(a,b){b=b||window,window.setTimeout(a,0)}}),define("ace/lib/keys",["require","exports","module","ace/lib/oop"],function(a,b,c){"use strict";var d=a("./oop"),e=function(){var a={MODIFIER_KEYS:{16:"Shift",17:"Ctrl",18:"Alt",224:"Meta"},KEY_MODS:{ctrl:1,alt:2,option:2,shift:4,meta:8,command:8},FUNCTION_KEYS:{8:"Backspace",9:"Tab",13:"Return",19:"Pause",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"Print",45:"Insert",46:"Delete",96:"Numpad0",97:"Numpad1",98:"Numpad2",99:"Numpad3",100:"Numpad4",101:"Numpad5",102:"Numpad6",103:"Numpad7",104:"Numpad8",105:"Numpad9",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"Numlock",145:"Scrolllock"},PRINTABLE_KEYS:{32:" ",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",59:";",61:"=",65:"a",66:"b",67:"c",68:"d",69:"e",70:"f",71:"g",72:"h",73:"i",74:"j",75:"k",76:"l",77:"m",78:"n",79:"o",80:"p",81:"q",82:"r",83:"s",84:"t",85:"u",86:"v",87:"w",88:"x",89:"y",90:"z",107:"+",109:"-",110:".",188:",",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:'"'}};for(var b in a.FUNCTION_KEYS){var c=a.FUNCTION_KEYS[b].toUpperCase();a[c]=parseInt(b,10)}return d.mixin(a,a.MODIFIER_KEYS),d.mixin(a,a.PRINTABLE_KEYS),d.mixin(a,a.FUNCTION_KEYS),a}();d.mixin(b,e),b.keyCodeToString=function(a){return(e[a]||String.fromCharCode(a)).toLowerCase()}}),define("ace/lib/oop",["require","exports","module"],function(a,b,c){"use strict",b.inherits=function(){var a=function(){};return function(b,c){a.prototype=c.prototype,b.super_=c.prototype,b.prototype=new a,b.prototype.constructor=b}}(),b.mixin=function(a,b){for(var c in b)a[c]=b[c]},b.implement=function(a,c){b.mixin(a,c)}}),define("ace/lib/useragent",["require","exports","module"],function(a,b,c){"use strict";var d=(navigator.platform.match(/mac|win|linux/i)||["other"])[0].toLowerCase(),e=navigator.userAgent;b.isWin=d=="win",b.isMac=d=="mac",b.isLinux=d=="linux",b.isIE=navigator.appName=="Microsoft Internet Explorer"&&parseFloat(navigator.userAgent.match(/MSIE ([0-9]+[\.0-9]+)/)[1]),b.isOldIE=b.isIE&&b.isIE<9,b.isGecko=b.isMozilla=window.controllers&&window.navigator.product==="Gecko",b.isOldGecko=b.isGecko&&parseInt((navigator.userAgent.match(/rv\:(\d+)/)||[])[1],10)<4,b.isOpera=window.opera&&Object.prototype.toString.call(window.opera)=="[object Opera]",b.isWebKit=parseFloat(e.split("WebKit/")[1])||undefined,b.isChrome=parseFloat(e.split(" Chrome/")[1])||undefined,b.isAIR=e.indexOf("AdobeAIR")>=0,b.isIPad=e.indexOf("iPad")>=0,b.isTouchPad=e.indexOf("TouchPad")>=0,b.OS={LINUX:"LINUX",MAC:"MAC",WINDOWS:"WINDOWS"},b.getOS=function(){return b.isMac?b.OS.MAC:b.isLinux?b.OS.LINUX:b.OS.WINDOWS}}),define("ace/editor",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/oop","ace/lib/lang","ace/lib/useragent","ace/keyboard/textinput","ace/mouse/mouse_handler","ace/mouse/fold_handler","ace/keyboard/keybinding","ace/edit_session","ace/search","ace/range","ace/lib/event_emitter","ace/commands/command_manager","ace/commands/default_commands"],function(a,b,c){"use strict",a("./lib/fixoldbrowsers");var d=a("./lib/oop"),e=a("./lib/lang"),f=a("./lib/useragent"),g=a("./keyboard/textinput").TextInput,h=a("./mouse/mouse_handler").MouseHandler,i=a("./mouse/fold_handler").FoldHandler,j=a("./keyboard/keybinding").KeyBinding,k=a("./edit_session").EditSession,l=a("./search").Search,m=a("./range").Range,n=a("./lib/event_emitter").EventEmitter,o=a("./commands/command_manager").CommandManager,p=a("./commands/default_commands").commands,q=function(a,b){var c=a.getContainerElement();this.container=c,this.renderer=a,this.textInput=new g(a.getTextAreaContainer(),this),this.keyBinding=new j(this),f.isIPad||(this.$mouseHandler=new h(this),new i(this)),this.$blockScrolling=0,this.$search=(new l).set({wrap:!0}),this.commands=new o(f.isMac?"mac":"win",p),this.setSession(b||new k(""))};((function(){d.implement(this,n),this.setKeyboardHandler=function(a){this.keyBinding.setKeyboardHandler(a)},this.getKeyboardHandler=function(){return this.keyBinding.getKeyboardHandler()},this.setSession=function(a){if(this.session==a)return;if(this.session){var b=this.session;this.session.removeEventListener("change",this.$onDocumentChange),this.session.removeEventListener("changeMode",this.$onChangeMode),this.session.removeEventListener("tokenizerUpdate",this.$onTokenizerUpdate),this.session.removeEventListener("changeTabSize",this.$onChangeTabSize),this.session.removeEventListener("changeWrapLimit",this.$onChangeWrapLimit),this.session.removeEventListener("changeWrapMode",this.$onChangeWrapMode),this.session.removeEventListener("onChangeFold",this.$onChangeFold),this.session.removeEventListener("changeFrontMarker",this.$onChangeFrontMarker),this.session.removeEventListener("changeBackMarker",this.$onChangeBackMarker),this.session.removeEventListener("changeBreakpoint",this.$onChangeBreakpoint),this.session.removeEventListener("changeAnnotation",this.$onChangeAnnotation),this.session.removeEventListener("changeOverwrite",this.$onCursorChange),this.session.removeEventListener("changeScrollTop",this.$onScrollTopChange),this.session.removeEventListener("changeLeftTop",this.$onScrollLeftChange);var c=this.session.getSelection();c.removeEventListener("changeCursor",this.$onCursorChange),c.removeEventListener("changeSelection",this.$onSelectionChange)}this.session=a,this.$onDocumentChange=this.onDocumentChange.bind(this),a.addEventListener("change",this.$onDocumentChange),this.renderer.setSession(a),this.$onChangeMode=this.onChangeMode.bind(this),a.addEventListener("changeMode",this.$onChangeMode),this.$onTokenizerUpdate=this.onTokenizerUpdate.bind(this),a.addEventListener("tokenizerUpdate",this.$onTokenizerUpdate),this.$onChangeTabSize=this.renderer.updateText.bind(this.renderer),a.addEventListener("changeTabSize",this.$onChangeTabSize),this.$onChangeWrapLimit=this.onChangeWrapLimit.bind(this),a.addEventListener("changeWrapLimit",this.$onChangeWrapLimit),this.$onChangeWrapMode=this.onChangeWrapMode.bind(this),a.addEventListener("changeWrapMode",this.$onChangeWrapMode),this.$onChangeFold=this.onChangeFold.bind(this),a.addEventListener("changeFold",this.$onChangeFold),this.$onChangeFrontMarker=this.onChangeFrontMarker.bind(this),this.session.addEventListener("changeFrontMarker",this.$onChangeFrontMarker),this.$onChangeBackMarker=this.onChangeBackMarker.bind(this),this.session.addEventListener("changeBackMarker",this.$onChangeBackMarker),this.$onChangeBreakpoint=this.onChangeBreakpoint.bind(this),this.session.addEventListener("changeBreakpoint",this.$onChangeBreakpoint),this.$onChangeAnnotation=this.onChangeAnnotation.bind(this),this.session.addEventListener("changeAnnotation",this.$onChangeAnnotation),this.$onCursorChange=this.onCursorChange.bind(this),this.session.addEventListener("changeOverwrite",this.$onCursorChange),this.$onScrollTopChange=this.onScrollTopChange.bind(this),this.session.addEventListener("changeScrollTop",this.$onScrollTopChange),this.$onScrollLeftChange=this.onScrollLeftChange.bind(this),this.session.addEventListener("changeScrollLeft",this.$onScrollLeftChange),this.selection=a.getSelection(),this.selection.addEventListener("changeCursor",this.$onCursorChange),this.$onSelectionChange=this.onSelectionChange.bind(this),this.selection.addEventListener("changeSelection",this.$onSelectionChange),this.onChangeMode(),this.onCursorChange(),this.onScrollTopChange(),this.onScrollLeftChange(),this.onSelectionChange(),this.onChangeFrontMarker(),this.onChangeBackMarker(),this.onChangeBreakpoint(),this.onChangeAnnotation(),this.session.getUseWrapMode()&&this.renderer.adjustWrapLimit(),this.renderer.updateFull(),this._emit("changeSession",{session:a,oldSession:b})},this.getSession=function(){return this.session},this.getSelection=function(){return this.selection},this.resize=function(){this.renderer.onResize()},this.setTheme=function(a){this.renderer.setTheme(a)},this.getTheme=function(){return this.renderer.getTheme()},this.setStyle=function(a){this.renderer.setStyle(a)},this.unsetStyle=function(a){this.renderer.unsetStyle(a)},this.setFontSize=function(a){this.container.style.fontSize=a},this.$highlightBrackets=function(){this.session.$bracketHighlight&&(this.session.removeMarker(this.session.$bracketHighlight),this.session.$bracketHighlight=null);if(this.$highlightPending)return;var a=this;this.$highlightPending=!0,setTimeout(function(){a.$highlightPending=!1;var b=a.session.findMatchingBracket(a.getCursorPosition());if(b){var c=new m(b.row,b.column,b.row,b.column+1);a.session.$bracketHighlight=a.session.addMarker(c,"ace_bracket","text")}},10)},this.focus=function(){var a=this;setTimeout(function(){a.textInput.focus()}),this.textInput.focus()},this.isFocused=function(){return this.textInput.isFocused()},this.blur=function(){this.textInput.blur()},this.onFocus=function(){this.renderer.showCursor(),this.renderer.visualizeFocus(),this._emit("focus")},this.onBlur=function(){this.renderer.hideCursor(),this.renderer.visualizeBlur(),this._emit("blur")},this.onDocumentChange=function(a){var b=a.data,c=b.range,d;c.start.row==c.end.row&&b.action!="insertLines"&&b.action!="removeLines"?d=c.end.row:d=Infinity,this.renderer.updateLines(c.start.row,d),this._emit("change",a),this.onCursorChange()},this.onTokenizerUpdate=function(a){var b=a.data;this.renderer.updateLines(b.first,b.last)},this.onScrollTopChange=function(){this.renderer.scrollToY(this.session.getScrollTop())},this.onScrollLeftChange=function(){this.renderer.scrollToX(this.session.getScrollLeft())},this.onCursorChange=function(){this.renderer.updateCursor(),this.$blockScrolling||this.renderer.scrollCursorIntoView(),this.renderer.moveTextAreaToCursor(this.textInput.getElement()),this.$highlightBrackets(),this.$updateHighlightActiveLine()},this.$updateHighlightActiveLine=function(){var a=this.getSession();a.$highlightLineMarker&&a.removeMarker(a.$highlightLineMarker),a.$highlightLineMarker=null;if(this.getHighlightActiveLine()&&(this.getSelectionStyle()!="line"||!this.selection.isMultiLine())){var b=this.getCursorPosition(),c=this.session.getFoldLine(b.row),d;c?d=new m(c.start.row,0,c.end.row+1,0):d=new m(b.row,0,b.row+1,0),a.$highlightLineMarker=a.addMarker(d,"ace_active_line","background")}},this.onSelectionChange=function(a){var b=this.getSession();b.$selectionMarker&&b.removeMarker(b.$selectionMarker),b.$selectionMarker=null;if(!this.selection.isEmpty()){var c=this.selection.getRange(),d=this.getSelectionStyle();b.$selectionMarker=b.addMarker(c,"ace_selection",d)}else this.$updateHighlightActiveLine();this.$highlightSelectedWord&&this.session.getMode().highlightSelection(this)},this.onChangeFrontMarker=function(){this.renderer.updateFrontMarkers()},this.onChangeBackMarker=function(){this.renderer.updateBackMarkers()},this.onChangeBreakpoint=function(){this.renderer.setBreakpoints(this.session.getBreakpoints())},this.onChangeAnnotation=function(){this.renderer.setAnnotations(this.session.getAnnotations())},this.onChangeMode=function(){this.renderer.updateText()},this.onChangeWrapLimit=function(){this.renderer.updateFull()},this.onChangeWrapMode=function(){this.renderer.onResize(!0)},this.onChangeFold=function(){this.$updateHighlightActiveLine(),this.renderer.updateFull()},this.getCopyText=function(){var a="";return this.selection.isEmpty()||(a=this.session.getTextRange(this.getSelectionRange())),this._emit("copy",a),a},this.onCut=function(){if(this.$readOnly)return;var a=this.getSelectionRange();this._emit("cut",a),this.selection.isEmpty()||(this.session.remove(a),this.clearSelection())},this.insert=function(a){var b=this.session,c=b.getMode(),d=this.getCursorPosition();if(this.getBehavioursEnabled()){var e=c.transformAction(b.getState(d.row),"insertion",this,b,a);e&&(a=e.text)}a=a.replace("\t",this.session.getTabString());if(!this.selection.isEmpty())d=this.session.remove(this.getSelectionRange()),this.clearSelection();else if(this.session.getOverwrite()){var f=new m.fromPoints(d,d);f.end.column+=a.length,this.session.remove(f)}this.clearSelection();var g=d.column,h=b.getState(d.row),i=c.checkOutdent(h,b.getLine(d.row),a),j=b.getLine(d.row),k=c.getNextLineIndent(h,j.slice(0,d.column),b.getTabString()),l=b.insert(d,a);e&&e.selection&&(e.selection.length==2?this.selection.setSelectionRange(new m(d.row,g+e.selection[0],d.row,g+e.selection[1])):this.selection.setSelectionRange(new m(d.row+e.selection[0],e.selection[1],d.row+e.selection[2],e.selection[3])));var h=b.getState(d.row);if(b.getDocument().isNewLine(a)){this.moveCursorTo(d.row+1,0);var n=b.getTabSize(),o=Number.MAX_VALUE;for(var p=d.row+1;p<=l.row;++p){var q=0;j=b.getLine(p);for(var r=0;r<j.length;++r)if(j.charAt(r)=="\t")q+=n;else if(j.charAt(r)==" ")q+=1;else break;/[^\s]/.test(j)&&(o=Math.min(q,o))}for(var p=d.row+1;p<=l.row;++p){var s=o;j=b.getLine(p);for(var r=0;r<j.length&&s>0;++r)j.charAt(r)=="\t"?s-=n:j.charAt(r)==" "&&(s-=1);b.remove(new m(p,0,p,r))}b.indentRows(d.row+1,l.row,k)}i&&c.autoOutdent(h,b,d.row)},this.onTextInput=function(a,b){b&&this._emit("paste",a),this.keyBinding.onTextInput(a,b)},this.onCommandKey=function(a,b,c){this.keyBinding.onCommandKey(a,b,c)},this.setOverwrite=function(a){this.session.setOverwrite(a)},this.getOverwrite=function(){return this.session.getOverwrite()},this.toggleOverwrite=function(){this.session.toggleOverwrite()},this.setScrollSpeed=function(a){this.$mouseHandler.setScrollSpeed(a)},this.getScrollSpeed=function(){return this.$mouseHandler.getScrollSpeed()},this.setDragDelay=function(a){this.$mouseHandler.setDragDelay(a)},this.getDragDelay=function(){return this.$mouseHandler.getDragDelay()},this.$selectionStyle="line",this.setSelectionStyle=function(a){if(this.$selectionStyle==a)return;this.$selectionStyle=a,this.onSelectionChange(),this._emit("changeSelectionStyle",{data:a})},this.getSelectionStyle=function(){return this.$selectionStyle},this.$highlightActiveLine=!0,this.setHighlightActiveLine=function(a){if(this.$highlightActiveLine==a)return;this.$highlightActiveLine=a,this.$updateHighlightActiveLine()},this.getHighlightActiveLine=function(){return this.$highlightActiveLine},this.$highlightSelectedWord=!0,this.setHighlightSelectedWord=function(a){if(this.$highlightSelectedWord==a)return;this.$highlightSelectedWord=a,a?this.session.getMode().highlightSelection(this):this.session.getMode().clearSelectionHighlight(this)},this.getHighlightSelectedWord=function(){return this.$highlightSelectedWord},this.setShowInvisibles=function(a){if(this.getShowInvisibles()==a)return;this.renderer.setShowInvisibles(a)},this.getShowInvisibles=function(){return this.renderer.getShowInvisibles()},this.setShowPrintMargin=function(a){this.renderer.setShowPrintMargin(a)},this.getShowPrintMargin=function(){return this.renderer.getShowPrintMargin()},this.setPrintMarginColumn=function(a){this.renderer.setPrintMarginColumn(a)},this.getPrintMarginColumn=function(){return this.renderer.getPrintMarginColumn()},this.$readOnly=!1,this.setReadOnly=function(a){this.$readOnly=a},this.getReadOnly=function(){return this.$readOnly},this.$modeBehaviours=!0,this.setBehavioursEnabled=function(a){this.$modeBehaviours=a},this.getBehavioursEnabled=function(){return this.$modeBehaviours},this.setShowFoldWidgets=function(a){var b=this.renderer.$gutterLayer;if(b.getShowFoldWidgets()==a)return;this.renderer.$gutterLayer.setShowFoldWidgets(a),this.$showFoldWidgets=a,this.renderer.updateFull()},this.getShowFoldWidgets=function(){return this.renderer.$gutterLayer.getShowFoldWidgets()},this.remove=function(a){this.selection.isEmpty()&&(a=="left"?this.selection.selectLeft():this.selection.selectRight());var b=this.getSelectionRange();if(this.getBehavioursEnabled()){var c=this.session,d=c.getState(b.start.row),e=c.getMode().transformAction(d,"deletion",this,c,b);e&&(b=e)}this.session.remove(b),this.clearSelection()},this.removeWordRight=function(){this.selection.isEmpty()&&this.selection.selectWordRight(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeWordLeft=function(){this.selection.isEmpty()&&this.selection.selectWordLeft(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineStart=function(){this.selection.isEmpty()&&this.selection.selectLineStart(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineEnd=function(){this.selection.isEmpty()&&this.selection.selectLineEnd();var a=this.getSelectionRange();a.start.column==a.end.column&&a.start.row==a.end.row&&(a.end.column=0,a.end.row++),this.session.remove(a),this.clearSelection()},this.splitLine=function(){this.selection.isEmpty()||(this.session.remove(this.getSelectionRange()),this.clearSelection());var a=this.getCursorPosition();this.insert("\n"),this.moveCursorToPosition(a)},this.transposeLetters=function(){if(!this.selection.isEmpty())return;var a=this.getCursorPosition(),b=a.column;if(b===0)return;var c=this.session.getLine(a.row),d,e;b<c.length?(d=c.charAt(b)+c.charAt(b-1),e=new m(a.row,b-1,a.row,b+1)):(d=c.charAt(b-1)+c.charAt(b-2),e=new m(a.row,b-2,a.row,b)),this.session.replace(e,d)},this.toLowerCase=function(){var a=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var b=this.getSelectionRange(),c=this.session.getTextRange(b);this.session.replace(b,c.toLowerCase()),this.selection.setSelectionRange(a)},this.toUpperCase=function(){var a=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var b=this.getSelectionRange(),c=this.session.getTextRange(b);this.session.replace(b,c.toUpperCase()),this.selection.setSelectionRange(a)},this.indent=function(){var a=this.session,b=this.getSelectionRange();if(!(b.start.row<b.end.row||b.start.column<b.end.column)){var d;if(this.session.getUseSoftTabs()){var f=a.getTabSize(),g=this.getCursorPosition(),h=a.documentToScreenColumn(g.row,g.column),i=f-h%f;d=e.stringRepeat(" ",i)}else d="\t";return this.insert(d)}var c=this.$getSelectedRows();a.indentRows(c.first,c.last,"\t")},this.blockOutdent=function(){var a=this.session.getSelection();this.session.outdentRows(a.getRange())},this.toggleCommentLines=function(){var a=this.session.getState(this.getCursorPosition().row),b=this.$getSelectedRows();this.session.getMode().toggleCommentLines(a,this.session,b.first,b.last)},this.removeLines=function(){var a=this.$getSelectedRows(),b;a.first===0||a.last+1<this.session.getLength()?b=new m(a.first,0,a.last+1,0):b=new m(a.first-1,this.session.getLine(a.first-1).length,a.last,this.session.getLine(a.last).length),this.session.remove(b),this.clearSelection()},this.moveLinesDown=function(){this.$moveLines(function(a,b){return this.session.moveLinesDown(a,b)})},this.moveLinesUp=function(){this.$moveLines(function(a,b){return this.session.moveLinesUp(a,b)})},this.moveText=function(a,b){return this.$readOnly?null:this.session.moveText(a,b)},this.copyLinesUp=function(){this.$moveLines(function(a,b){return this.session.duplicateLines(a,b),0})},this.copyLinesDown=function(){this.$moveLines(function(a,b){return this.session.duplicateLines(a,b)})},this.$moveLines=function(a){var b=this.$getSelectedRows(),c=this.selection;if(!c.isMultiLine())var d=c.getRange(),e=c.isBackwards();var f=a.call(this,b.first,b.last);d?(d.start.row+=f,d.end.row+=f,c.setSelectionRange(d,e)):(c.setSelectionAnchor(b.last+f+1,0),c.$moveSelection(function(){c.moveCursorTo(b.first+f,0)}))},this.$getSelectedRows=function(){var a=this.getSelectionRange().collapseRows();return{first:a.start.row,last:a.end.row}},this.onCompositionStart=function(a){this.renderer.showComposition(this.getCursorPosition())},this.onCompositionUpdate=function(a){this.renderer.setCompositionText(a)},this.onCompositionEnd=function(){this.renderer.hideComposition()},this.getFirstVisibleRow=function(){return this.renderer.getFirstVisibleRow()},this.getLastVisibleRow=function(){return this.renderer.getLastVisibleRow()},this.isRowVisible=function(a){return a>=this.getFirstVisibleRow()&&a<=this.getLastVisibleRow()},this.isRowFullyVisible=function(a){return a>=this.renderer.getFirstFullyVisibleRow()&&a<=this.renderer.getLastFullyVisibleRow()},this.$getVisibleRowCount=function(){return this.renderer.getScrollBottomRow()-this.renderer.getScrollTopRow()+1},this.$getPageDownRow=function(){return this.renderer.getScrollBottomRow()},this.$getPageUpRow=function(){var a=this.renderer.getScrollTopRow(),b=this.renderer.getScrollBottomRow();return a-(b-a)},this.selectPageDown=function(){var a=this.$getPageDownRow()+Math.floor(this.$getVisibleRowCount()/2);this.scrollPageDown();var b=this.getSelection(),c=this.session.documentToScreenPosition(b.getSelectionLead()),d=this.session.screenToDocumentPosition(a,c.column);b.selectTo(d.row,d.column)},this.selectPageUp=function(){var a=this.renderer.getScrollTopRow()-this.renderer.getScrollBottomRow(),b=this.$getPageUpRow()+Math.round(a/2);this.scrollPageUp();var c=this.getSelection(),d=this.session.documentToScreenPosition(c.getSelectionLead()),e=this.session.screenToDocumentPosition(b,d.column);c.selectTo(e.row,e.column)},this.gotoPageDown=function(){var a=this.$getPageDownRow(),b=this.getCursorPositionScreen().column;this.scrollToRow(a),this.getSelection().moveCursorToScreen(a,b)},this.gotoPageUp=function(){var a=this.$getPageUpRow(),b=this.getCursorPositionScreen().column;this.scrollToRow(a),this.getSelection().moveCursorToScreen(a,b)},this.scrollPageDown=function(){this.scrollToRow(this.$getPageDownRow())},this.scrollPageUp=function(){this.renderer.scrollToRow(this.$getPageUpRow())},this.scrollToRow=function(a){this.renderer.scrollToRow(a)},this.scrollToLine=function(a,b){this.renderer.scrollToLine(a,b)},this.centerSelection=function(){var a=this.getSelectionRange(),b=Math.floor(a.start.row+(a.end.row-a.start.row)/2);this.renderer.scrollToLine(b,!0)},this.getCursorPosition=function(){return this.selection.getCursor()},this.getCursorPositionScreen=function(){return this.session.documentToScreenPosition(this.getCursorPosition())},this.getSelectionRange=function(){return this.selection.getRange()},this.selectAll=function(){this.$blockScrolling+=1,this.selection.selectAll(),this.$blockScrolling-=1},this.clearSelection=function(){this.selection.clearSelection()},this.moveCursorTo=function(a,b){this.selection.moveCursorTo(a,b)},this.moveCursorToPosition=function(a){this.selection.moveCursorToPosition(a)},this.jumpToMatching=function(){var a=this.getCursorPosition(),b=this.session.findMatchingBracket(a);b||(a.column+=1,b=this.session.findMatchingBracket(a)),b||(a.column-=2,b=this.session.findMatchingBracket(a)),b&&(this.clearSelection(),this.moveCursorTo(b.row,b.column))},this.gotoLine=function(a,b){this.selection.clearSelection(),this.session.unfold({row:a-1,column:b||0}),this.$blockScrolling+=1,this.moveCursorTo(a-1,b||0),this.$blockScrolling-=1,this.isRowFullyVisible(this.getCursorPosition().row)||this.scrollToLine(a,!0)},this.navigateTo=function(a,b){this.clearSelection(),this.moveCursorTo(a,b)},this.navigateUp=function(a){this.selection.clearSelection(),a=a||1,this.selection.moveCursorBy(-a,0)},this.navigateDown=function(a){this.selection.clearSelection(),a=a||1,this.selection.moveCursorBy(a,0)},this.navigateLeft=function(a){if(!this.selection.isEmpty()){var b=this.getSelectionRange().start;this.moveCursorToPosition(b)}else{a=a||1;while(a--)this.selection.moveCursorLeft()}this.clearSelection()},this.navigateRight=function(a){if(!this.selection.isEmpty()){var b=this.getSelectionRange().end;this.moveCursorToPosition(b)}else{a=a||1;while(a--)this.selection.moveCursorRight()}this.clearSelection()},this.navigateLineStart=function(){this.selection.moveCursorLineStart(),this.clearSelection()},this.navigateLineEnd=function(){this.selection.moveCursorLineEnd(),this.clearSelection()},this.navigateFileEnd=function(){this.selection.moveCursorFileEnd(),this.clearSelection()},this.navigateFileStart=function(){this.selection.moveCursorFileStart(),this.clearSelection()},this.navigateWordRight=function(){this.selection.moveCursorWordRight(),this.clearSelection()},this.navigateWordLeft=function(){this.selection.moveCursorWordLeft(),this.clearSelection()},this.replace=function(a,b){b&&this.$search.set(b);var c=this.$search.find(this.session);if(!c)return;this.$tryReplace(c,a),c!==null&&this.selection.setSelectionRange(c)},this.replaceAll=function(a,b){b&&this.$search.set(b);var c=this.$search.findAll(this.session);if(!c.length)return;var d=this.getSelectionRange();this.clearSelection(),this.selection.moveCursorTo(0,0),this.$blockScrolling+=1;for(var e=c.length-1;e>=0;--e)this.$tryReplace(c[e],a);this.selection.setSelectionRange(d),this.$blockScrolling-=1},this.$tryReplace=function(a,b){var c=this.session.getTextRange(a);return b=this.$search.replace(c,b),b!==null?(a.end=this.session.replace(a,b),a):null},this.getLastSearchOptions=function(){return this.$search.getOptions()},this.find=function(a,b){this.clearSelection(),b=b||{},b.needle=a,this.$search.set(b),this.$find()},this.findNext=function(a){a=a||{},typeof a.backwards=="undefined"&&(a.backwards=!1),this.$search.set(a),this.$find()},this.findPrevious=function(a){a=a||{},typeof a.backwards=="undefined"&&(a.backwards=!0),this.$search.set(a),this.$find()},this.$find=function(a){this.selection.isEmpty()||this.$search.set({needle:this.session.getTextRange(this.getSelectionRange())}),typeof a!="undefined"&&this.$search.set({backwards:a});var b=this.$search.find(this.session);b&&(this.session.unfold(b),this.gotoLine(b.end.row+1,b.end.column),this.selection.setSelectionRange(b))},this.undo=function(){this.session.getUndoManager().undo()},this.redo=function(){this.session.getUndoManager().redo()},this.destroy=function(){this.renderer.destroy()}})).call(q.prototype),b.Editor=q}),define("ace/lib/lang",["require","exports","module"],function(a,b,c){"use strict",b.stringReverse=function(a){return a.split("").reverse().join("")},b.stringRepeat=function(a,b){return(new Array(b+1)).join(a)};var d=/^\s\s*/,e=/\s\s*$/;b.stringTrimLeft=function(a){return a.replace(d,"")},b.stringTrimRight=function(a){return a.replace(e,"")},b.copyObject=function(a){var b={};for(var c in a)b[c]=a[c];return b},b.copyArray=function(a){var b=[];for(var c=0,d=a.length;c<d;c++)a[c]&&typeof a[c]=="object"?b[c]=this.copyObject(a[c]):b[c]=a[c];return b},b.deepCopy=function(a){if(typeof a!="object")return a;var b=a.constructor();for(var c in a)typeof a[c]=="object"?b[c]=this.deepCopy(a[c]):b[c]=a[c];return b},b.arrayToMap=function(a){var b={};for(var c=0;c<a.length;c++)b[a[c]]=1;return b},b.arrayRemove=function(a,b){for(var c=0;c<=a.length;c++)b===a[c]&&a.splice(c,1)},b.escapeRegExp=function(a){return a.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},b.deferredCall=function(a){var b=null,c=function(){b=null,a()},d=function(a){return d.cancel(),b=setTimeout(c,a||0),d};return d.schedule=d,d.call=function(){return this.cancel(),a(),d},d.cancel=function(){return clearTimeout(b),b=null,d},d}}),define("ace/keyboard/textinput",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/lib/dom"],function(a,b,c){"use strict";var d=a("../lib/event"),e=a("../lib/useragent"),f=a("../lib/dom"),g=function(a,b){function l(){try{c.select()}catch(a){}}function m(a){if(!i){var d=a||c.value;if(d){d.charCodeAt(d.length-1)==g.charCodeAt(0)?(d=d.slice(0,-1),d&&b.onTextInput(d,j)):b.onTextInput(d,j);if(!v())return!1}}i=!1,j=!1,c.value=g,l()}function v(){return document.activeElement===c}var c=f.createElement("textarea");e.isTouchPad&&c.setAttribute("x-palm-disable-auto-cap",!0),c.style.left="-10000px",c.style.position="fixed",a.insertBefore(c,a.firstChild);var g=String.fromCharCode(0);m();var h=!1,i=!1,j=!1,k="",n=function(a){setTimeout(function(){h||m(a.data)},0)},o=function(a){if(e.isOldIE&&c.value.charCodeAt(0)>128)return;setTimeout(function(){h||m()},0)},p=function(a){h=!0,b.onCompositionStart(),e.isGecko||setTimeout(q,0)},q=function(){if(!h)return;b.onCompositionUpdate(c.value)},r=function(a){h=!1,b.onCompositionEnd()},s=function(a){i=!0;var d=b.getCopyText();d?c.value=d:a.preventDefault(),l(),setTimeout(function(){m()},0)},t=function(a){i=!0;var d=b.getCopyText();d?(c.value=d,b.onCut()):a.preventDefault(),l(),setTimeout(function(){m()},0)};d.addCommandKeyListener(c,b.onCommandKey.bind(b));if(e.isOldIE){var u={13:1,27:1};d.addListener(c,"keyup",function(a){h&&(!c.value||u[a.keyCode])&&setTimeout(r,0);if((c.value.charCodeAt(0)|0)<129)return;h?q():p()})}"onpropertychange"in c&&!("oninput"in c)?d.addListener(c,"propertychange",o):d.addListener(c,"input",n),d.addListener(c,"paste",function(a){j=!0,a.clipboardData&&a.clipboardData.getData?(m(a.clipboardData.getData("text/plain")),a.preventDefault()):o()}),"onbeforecopy"in c&&typeof clipboardData!="undefined"?(d.addListener(c,"beforecopy",function(a){var c=b.getCopyText();c?clipboardData.setData("Text",c):a.preventDefault()}),d.addListener(a,"keydown",function(a){if(a.ctrlKey&&a.keyCode==88){var c=b.getCopyText();c&&(clipboardData.setData("Text",c),b.onCut()),d.preventDefault(a)}})):(d.addListener(c,"copy",s),d.addListener(c,"cut",t)),d.addListener(c,"compositionstart",p),e.isGecko&&d.addListener(c,"text",q),e.isWebKit&&d.addListener(c,"keyup",q),d.addListener(c,"compositionend",r),d.addListener(c,"blur",function(){b.onBlur()}),d.addListener(c,"focus",function(){b.onFocus(),l()}),this.focus=function(){b.onFocus(),l(),c.focus()},this.blur=function(){c.blur()},this.isFocused=v,this.getElement=function(){return c},this.onContextMenu=function(a,b){a&&(k||(k=c.style.cssText),c.style.cssText="position:fixed; z-index:1000;left:"+(a.x-2)+"px; top:"+(a.y-2)+"px;"),b&&(c.value="")},this.onContextMenuClose=function(){setTimeout(function(){k&&(c.style.cssText=k,k=""),m()},0)}};b.TextInput=g}),define("ace/mouse/mouse_handler",["require","exports","module","ace/lib/event","ace/mouse/default_handlers","ace/mouse/default_gutter_handler","ace/mouse/mouse_event"],function(a,b,c){"use strict";var d=a("../lib/event"),e=a("./default_handlers").DefaultHandlers,f=a("./default_gutter_handler").GutterHandler,g=a("./mouse_event").MouseEvent,h=function(a){this.editor=a,new e(a),new f(a),d.addListener(a.container,"mousedown",function(b){return a.focus(),d.preventDefault(b)}),d.addListener(a.container,"selectstart",function(a){return d.preventDefault(a)});var b=a.renderer.getMouseEventTarget();d.addListener(b,"mousedown",this.onMouseEvent.bind(this,"mousedown")),d.addListener(b,"click",this.onMouseEvent.bind(this,"click")),d.addListener(b,"mousemove",this.onMouseMove.bind(this,"mousemove")),d.addMultiMouseDownListener(b,0,2,500,this.onMouseEvent.bind(this,"dblclick")),d.addMultiMouseDownListener(b,0,3,600,this.onMouseEvent.bind(this,"tripleclick")),d.addMultiMouseDownListener(b,0,4,600,this.onMouseEvent.bind(this,"quadclick")),d.addMouseWheelListener(a.container,this.onMouseWheel.bind(this,"mousewheel"));var c=a.renderer.$gutter;d.addListener(c,"mousedown",this.onMouseEvent.bind(this,"guttermousedown")),d.addListener(c,"click",this.onMouseEvent.bind(this,"gutterclick")),d.addListener(c,"dblclick",this.onMouseEvent.bind(this,"gutterdblclick")),d.addListener(c,"mousemove",this.onMouseMove.bind(this,"gutter"))};((function(){this.$scrollSpeed=1,this.setScrollSpeed=function(a){this.$scrollSpeed=a},this.getScrollSpeed=function(){return this.$scrollSpeed},this.onMouseEvent=function(a,b){this.editor._emit(a,new g(b,this.editor))},this.$dragDelay=250,this.setDragDelay=function(a){this.$dragDelay=a},this.getDragDelay=function(){return this.$dragDelay},this.onMouseMove=function(a,b){var c=this.editor._eventRegistry&&this.editor._eventRegistry.mousemove;if(!c||!c.length)return;this.editor._emit(a,new g(b,this.editor))},this.onMouseWheel=function(a,b){var c=new g(b,this.editor);c.speed=this.$scrollSpeed*2,c.wheelX=b.wheelX,c.wheelY=b.wheelY,this.editor._emit(a,c)}})).call(h.prototype),b.MouseHandler=h}),define("ace/mouse/default_handlers",["require","exports","module","ace/lib/event","ace/lib/dom","ace/lib/browser_focus"],function(a,b,c){function k(a){this.editor=a,this.$clickSelection=null,this.browserFocus=new f,a.setDefaultHandler("mousedown",this.onMouseDown.bind(this)),a.setDefaultHandler("dblclick",this.onDoubleClick.bind(this)),a.setDefaultHandler("tripleclick",this.onTripleClick.bind(this)),a.setDefaultHandler("quadclick",this.onQuadClick.bind(this)),a.setDefaultHandler("mousewheel",this.onScroll.bind(this))}function l(a,b,c,d){return Math.sqrt(Math.pow(c-a,2)+Math.pow(d-b,2))}"use strict";var d=a("../lib/event"),e=a("../lib/dom"),f=a("../lib/browser_focus").BrowserFocus,g=0,h=1,i=2,j=5;((function(){this.onMouseDown=function(a){function C(b){a.getShiftKey()?m.selection.selectToPosition(b):n.$clickSelection||(m.moveCursorToPosition(b),m.selection.clearSelection(b.row,b.column)),q=h}var b=a.inSelection(),c=a.pageX,f=a.pageY,k=a.getDocumentPosition(),m=this.editor,n=this,o=m.getSelectionRange(),p=o.isEmpty(),q=g;if(b&&(!this.browserFocus.isFocused()||(new Date).getTime()-this.browserFocus.lastFocus<20||!m.isFocused())){m.focus();return}var r=a.getButton();if(r!==0){p&&m.moveCursorToPosition(k),r==2&&(m.textInput.onContextMenu({x:a.clientX,y:a.clientY},p),d.capture(m.container,function(){},m.textInput.onContextMenuClose));return}b||C(k);var s=c,t=f,u=(new Date).getTime(),v,w,x,y=function(a){s=d.getDocumentX(a),t=d.getDocumentY(a)},z=function(a){clearInterval(F),q==g?C(k):q==i&&A(a),n.$clickSelection=null,q=g},A=function(a){e.removeCssClass(m.container,"ace_dragging"),m.session.removeMarker(x),m.$mouseHandler.$clickSelection||v||(m.moveCursorToPosition(k),m.selection.clearSelection(k.row,k.column));if(!v)return;if(w.contains(v.row,v.column)){v=null;return}m.clearSelection();if(a&&(a.ctrlKey||a.altKey))var b=m.session,c=b.insert(v,b.getTextRange(w));else var c=m.moveText(w,v);if(!c){v=null;return}m.selection.setSelectionRange(c)},B=function(){if(q==g){var a=l(c,f,s,t),b=(new Date).getTime();if(a>j){q=h;var d=m.renderer.screenToTextCoordinates(s,t);d.row=Math.max(0,Math.min(d.row,m.session.getLength()-1)),C(d)}else if(b-u>m.getDragDelay()){q=i,w=m.getSelectionRange();var k=m.getSelectionStyle();x=m.session.addMarker(w,"ace_selection",k),m.clearSelection(),e.addCssClass(m.container,"ace_dragging")}}q==i?E():q==h&&D()},D=function(){var a,b=m.renderer.screenToTextCoordinates(s,t);b.row=Math.max(0,Math.min(b.row,m.session.getLength()-1)),n.$clickSelection?n.$clickSelection.contains(b.row,b.column)?m.selection.setSelectionRange(n.$clickSelection):(n.$clickSelection.compare(b.row,b.column)==-1?a=n.$clickSelection.end:a=n.$clickSelection.start,m.selection.setSelectionAnchor(a.row,a.column),m.selection.selectToPosition(b)):m.selection.selectToPosition(b),m.renderer.scrollCursorIntoView()},E=function(){v=m.renderer.screenToTextCoordinates(s,t),v.row=Math.max(0,Math.min(v.row,m.session.getLength()-1)),m.moveCursorToPosition(v)};d.capture(m.container,y,z);var F=setInterval(B,20);return a.preventDefault()},this.onDoubleClick=function(a){var b=a.getDocumentPosition(),c=this.editor;c.moveCursorToPosition(b),c.selection.selectWord(),this.$clickSelection=c.getSelectionRange()},this.onTripleClick=function(a){var b=a.getDocumentPosition(),c=this.editor;c.moveCursorToPosition(b),c.selection.selectLine(),this.$clickSelection=c.getSelectionRange()},this.onQuadClick=function(a){var b=this.editor;b.selectAll(),this.$clickSelection=b.getSelectionRange()},this.onScroll=function(a){var b=this.editor;b.renderer.scrollBy(a.wheelX*a.speed,a.wheelY*a.speed);if(b.renderer.isScrollableBy(a.wheelX*a.speed,a.wheelY*a.speed))return a.preventDefault()}})).call(k.prototype),b.DefaultHandlers=k}),define("ace/lib/browser_focus",["require","exports","module","ace/lib/oop","ace/lib/event","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("./oop"),e=a("./event"),f=a("./event_emitter").EventEmitter,g=function(a){a=a||window,this.lastFocus=(new Date).getTime(),this._isFocused=!0;var b=this;"onfocusin"in a.document?(e.addListener(a.document,"focusin",function(a){b._setFocused(!0)}),e.addListener(a.document,"focusout",function(a){b._setFocused(!!a.toElement)})):(e.addListener(a,"blur",function(a){b._setFocused(!1)}),e.addListener(a,"focus",function(a){b._setFocused(!0)}))};((function(){d.implement(this,f),this.isFocused=function(){return this._isFocused},this._setFocused=function(a){if(this._isFocused==a)return;a&&(this.lastFocus=(new Date).getTime()),this._isFocused=a,this._emit("changeFocus")}})).call(g.prototype),b.BrowserFocus=g}),define("ace/lib/event_emitter",["require","exports","module"],function(a,b,c){"use strict";var d={};d._emit=d._dispatchEvent=function(a,b){this._eventRegistry=this._eventRegistry||{},this._defaultHandlers=this._defaultHandlers||{};var c=this._eventRegistry[a]||[],d=this._defaultHandlers[a];if(!c.length&&!d)return;b=b||{},b.type=a,b.stopPropagation||(b.stopPropagation=function(){this.propagationStopped=!0}),b.preventDefault||(b.preventDefault=function(){this.defaultPrevented=!0});for(var e=0;e<c.length;e++){c[e](b);if(b.propagationStopped)break}d&&!b.defaultPrevented&&d(b)},d.setDefaultHandler=function(a,b){this._defaultHandlers=this._defaultHandlers||{};if(this._defaultHandlers[a])throw new Error("The default handler for '"+a+"' is already set");this._defaultHandlers[a]=b},d.on=d.addEventListener=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!c)var c=this._eventRegistry[a]=[];c.indexOf(b)==-1&&c.push(b)},d.removeListener=d.removeEventListener=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!c)return;var d=c.indexOf(b);d!==-1&&c.splice(d,1)},d.removeAllListeners=function(a){this._eventRegistry&&(this._eventRegistry[a]=[])},b.EventEmitter=d}),define("ace/mouse/default_gutter_handler",["require","exports","module"],function(a,b,c){function d(a){a.setDefaultHandler("gutterclick",function(b){var c=b.getDocumentPosition().row,d=a.session.selection;d.moveCursorTo(c,0),d.selectLine()})}"use strict",b.GutterHandler=d}),define("ace/mouse/mouse_event",["require","exports","module","ace/lib/event"],function(a,b,c){"use strict";var d=a("../lib/event"),e=b.MouseEvent=function(a,b){this.domEvent=a,this.editor=b,this.pageX=d.getDocumentX(a),this.pageY=d.getDocumentY(a),this.clientX=a.clientX,this.clientY=a.clientY,this.$pos=null,this.$inSelection=null,this.propagationStopped=!1,this.defaultPrevented=!1};((function(){this.stopPropagation=function(){d.stopPropagation(this.domEvent),this.propagationStopped=!0},this.preventDefault=function(){d.preventDefault(this.domEvent),this.defaultPrevented=!0},this.stop=function(){this.stopPropagation(),this.preventDefault()},this.getDocumentPosition=function(){if(this.$pos)return this.$pos;var a=d.getDocumentX(this.domEvent),b=d.getDocumentY(this.domEvent);return this.$pos=this.editor.renderer.screenToTextCoordinates(a,b),this.$pos.row=Math.max(0,Math.min(this.$pos.row,this.editor.session.getLength()-1)),this.$pos},this.inSelection=function(){if(this.$inSelection!==null)return this.$inSelection;var a=this.editor;if(a.getReadOnly())this.$inSelection=!1;else{var b=a.getSelectionRange();if(b.isEmpty())this.$inSelection=!1;else{var c=this.getDocumentPosition();this.$inSelection=b.contains(c.row,c.column)}}return this.$inSelection},this.getButton=function(){return d.getButton(this.domEvent)},this.getShiftKey=function(){return this.domEvent.shiftKey},this.getAccelKey=function(){return this.domEvent.ctrlKey||this.domEvent.metaKey}})).call(e.prototype)}),define("ace/mouse/fold_handler",["require","exports","module"],function(a,b,c){function d(a){a.on("click",function(b){var c=b.getDocumentPosition(),d=a.session,e=d.getFoldAt(c.row,c.column,1);e&&(b.getAccelKey()?d.removeFold(e):d.expandFold(e),b.stop())}),a.on("gutterclick",function(b){if(b.domEvent.target.className.indexOf("ace_fold-widget")!=-1){var c=b.getDocumentPosition().row;a.session.onFoldWidgetClick(c,b.domEvent),b.stop()}})}"use strict",b.FoldHandler=d}),define("ace/keyboard/keybinding",["require","exports","module","ace/lib/keys","ace/lib/event","ace/commands/default_commands"],function(a,b,c){"use strict";var d=a("../lib/keys"),e=a("../lib/event");a("../commands/default_commands");var f=function(a){this.$editor=a,this.$data={},this.$handlers=[this]};((function(){this.setKeyboardHandler=function(a){if(this.$handlers[this.$handlers.length-1]==a)return;this.$data={},this.$handlers=a?[this,a]:[this]},this.addKeyboardHandler=function(a){this.removeKeyboardHandler(a),this.$handlers.push(a)},this.removeKeyboardHandler=function(a){var b=this.$handlers.indexOf(a);return b==-1?!1:(this.$handlers.splice(b,1),!0)},this.getKeyboardHandler=function(){return this.$handlers[this.$handlers.length-1]},this.$callKeyboardHandlers=function(a,b,c,d){var f;for(var g=this.$handlers.length;g--;){f=this.$handlers[g].handleKeyboard(this.$data,a,b,c,d);if(f&&f.command)break}if(!f||!f.command)return!1;var h=!1,i=this.$editor.commands;return f.command!="null"?h=i.exec(f.command,this.$editor,f.args):h=!0,h&&d&&e.stopEvent(d),h},this.handleKeyboard=function(a,b,c){return{command:this.$editor.commands.findKeyCommand(b,c)}},this.onCommandKey=function(a,b,c){var e=d.keyCodeToString(c);this.$callKeyboardHandlers(b,e,c,a)},this.onTextInput=function(a,b){var c=!1;!b&&a.length==1&&(c=this.$callKeyboardHandlers(0,a)),c||this.$editor.commands.exec("insertstring",this.$editor,a)}})).call(f.prototype),b.KeyBinding=f}),define("ace/commands/default_commands",["require","exports","module","ace/lib/lang"],function(a,b,c){function e(a,b){return{win:a,mac:b}}"use strict";var d=a("../lib/lang");b.commands=[{name:"selectall",bindKey:e("Ctrl-A","Command-A"),exec:function(a){a.selectAll()},readOnly:!0},{name:"centerselection",bindKey:e(null,"Ctrl-L"),exec:function(a){a.centerSelection()},readOnly:!0},{name:"gotoline",bindKey:e("Ctrl-L","Command-L"),exec:function(a){var b=parseInt(prompt("Enter line number:"),10);isNaN(b)||a.gotoLine(b)},readOnly:!0},{name:"fold",bindKey:e("Alt-L","Alt-L"),exec:function(a){a.session.toggleFold(!1)},readOnly:!0},{name:"unfold",bindKey:e("Alt-Shift-L","Alt-Shift-L"),exec:function(a){a.session.toggleFold(!0)},readOnly:!0},{name:"foldall",bindKey:e("Alt-0","Alt-0"),exec:function(a){a.session.foldAll()},readOnly:!0},{name:"unfoldall",bindKey:e("Alt-Shift-0","Alt-Shift-0"),exec:function(a){a.session.unfold()},readOnly:!0},{name:"findnext",bindKey:e("Ctrl-K","Command-G"),exec:function(a){a.findNext()},readOnly:!0},{name:"findprevious",bindKey:e("Ctrl-Shift-K","Command-Shift-G"),exec:function(a){a.findPrevious()},readOnly:!0},{name:"find",bindKey:e("Ctrl-F","Command-F"),exec:function(a){var b=prompt("Find:",a.getCopyText());a.find(b)},readOnly:!0},{name:"overwrite",bindKey:e("Insert","Insert"),exec:function(a){a.toggleOverwrite()},readOnly:!0},{name:"selecttostart",bindKey:e("Ctrl-Shift-Home|Alt-Shift-Up","Command-Shift-Up"),exec:function(a){a.getSelection().selectFileStart()},readOnly:!0},{name:"gotostart",bindKey:e("Ctrl-Home|Ctrl-Up","Command-Home|Command-Up"),exec:function(a){a.navigateFileStart()},readOnly:!0},{name:"selectup",bindKey:e("Shift-Up","Shift-Up"),exec:function(a){a.getSelection().selectUp()},readOnly:!0},{name:"golineup",bindKey:e("Up","Up|Ctrl-P"),exec:function(a,b){a.navigateUp(b.times)},readOnly:!0},{name:"selecttoend",bindKey:e("Ctrl-Shift-End|Alt-Shift-Down","Command-Shift-Down"),exec:function(a){a.getSelection().selectFileEnd()},readOnly:!0},{name:"gotoend",bindKey:e("Ctrl-End|Ctrl-Down","Command-End|Command-Down"),exec:function(a){a.navigateFileEnd()},readOnly:!0},{name:"selectdown",bindKey:e("Shift-Down","Shift-Down"),exec:function(a){a.getSelection().selectDown()},readOnly:!0},{name:"golinedown",bindKey:e("Down","Down|Ctrl-N"),exec:function(a,b){a.navigateDown(b.times)},readOnly:!0},{name:"selectwordleft",bindKey:e("Ctrl-Shift-Left","Option-Shift-Left"),exec:function(a){a.getSelection().selectWordLeft()},readOnly:!0},{name:"gotowordleft",bindKey:e("Ctrl-Left","Option-Left"),exec:function(a){a.navigateWordLeft()},readOnly:!0},{name:"selecttolinestart",bindKey:e("Alt-Shift-Left","Command-Shift-Left"),exec:function(a){a.getSelection().selectLineStart()},readOnly:!0},{name:"gotolinestart",bindKey:e("Alt-Left|Home","Command-Left|Home|Ctrl-A"),exec:function(a){a.navigateLineStart()},readOnly:!0},{name:"selectleft",bindKey:e("Shift-Left","Shift-Left"),exec:function(a){a.getSelection().selectLeft()},readOnly:!0},{name:"gotoleft",bindKey:e("Left","Left|Ctrl-B"),exec:function(a,b){a.navigateLeft(b.times)},readOnly:!0},{name:"selectwordright",bindKey:e("Ctrl-Shift-Right","Option-Shift-Right"),exec:function(a){a.getSelection().selectWordRight()},readOnly:!0},{name:"gotowordright",bindKey:e("Ctrl-Right","Option-Right"),exec:function(a){a.navigateWordRight()},readOnly:!0},{name:"selecttolineend",bindKey:e("Alt-Shift-Right","Command-Shift-Right"),exec:function(a){a.getSelection().selectLineEnd()},readOnly:!0},{name:"gotolineend",bindKey:e("Alt-Right|End","Command-Right|End|Ctrl-E"),exec:function(a){a.navigateLineEnd()},readOnly:!0},{name:"selectright",bindKey:e("Shift-Right","Shift-Right"),exec:function(a){a.getSelection().selectRight()},readOnly:!0},{name:"gotoright",bindKey:e("Right","Right|Ctrl-F"),exec:function(a,b){a.navigateRight(b.times)},readOnly:!0},{name:"selectpagedown",bindKey:e("Shift-PageDown","Shift-PageDown"),exec:function(a){a.selectPageDown()},readOnly:!0},{name:"pagedown",bindKey:e(null,"PageDown"),exec:function(a){a.scrollPageDown()},readOnly:!0},{name:"gotopagedown",bindKey:e("PageDown","Option-PageDown|Ctrl-V"),exec:function(a){a.gotoPageDown()},readOnly:!0},{name:"selectpageup",bindKey:e("Shift-PageUp","Shift-PageUp"),exec:function(a){a.selectPageUp()},readOnly:!0},{name:"pageup",bindKey:e(null,"PageUp"),exec:function(a){a.scrollPageUp()},readOnly:!0},{name:"gotopageup",bindKey:e("PageUp","Option-PageUp"),exec:function(a){a.gotoPageUp()},readOnly:!0},{name:"selectlinestart",bindKey:e("Shift-Home","Shift-Home"),exec:function(a){a.getSelection().selectLineStart()},readOnly:!0},{name:"selectlineend",bindKey:e("Shift-End","Shift-End"),exec:function(a){a.getSelection().selectLineEnd()},readOnly:!0},{name:"togglerecording",bindKey:e("Ctrl-Alt-E","Command-Option-E"),exec:function(a){a.commands.toggleRecording()},readOnly:!0},{name:"replaymacro",bindKey:e("Ctrl-Shift-E","Command-Shift-E"),exec:function(a){a.commands.replay(a)},readOnly:!0},{name:"removeline",bindKey:e("Ctrl-D","Command-D"),exec:function(a){a.removeLines()}},{name:"togglecomment",bindKey:e("Ctrl-7","Command-7"),exec:function(a){a.toggleCommentLines()}},{name:"replace",bindKey:e("Ctrl-R","Command-Option-F"),exec:function(a){var b=prompt("Find:",a.getCopyText());if(!b)return;var c=prompt("Replacement:");if(!c)return;a.replace(c,{needle:b})}},{name:"replaceall",bindKey:e("Ctrl-Shift-R","Command-Shift-Option-F"),exec:function(a){var b=prompt("Find:");if(!b)return;var c=prompt("Replacement:");if(!c)return;a.replaceAll(c,{needle:b})}},{name:"undo",bindKey:e("Ctrl-Z","Command-Z"),exec:function(a){a.undo()}},{name:"redo",bindKey:e("Ctrl-Shift-Z|Ctrl-Y","Command-Shift-Z|Command-Y"),exec:function(a){a.redo()}},{name:"copylinesup",bindKey:e("Ctrl-Alt-Up","Command-Option-Up"),exec:function(a){a.copyLinesUp()}},{name:"movelinesup",bindKey:e("Alt-Up","Option-Up"),exec:function(a){a.moveLinesUp()}},{name:"copylinesdown",bindKey:e("Ctrl-Alt-Down","Command-Option-Down"),exec:function(a){a.copyLinesDown()}},{name:"movelinesdown",bindKey:e("Alt-Down","Option-Down"),exec:function(a){a.moveLinesDown()}},{name:"del",bindKey:e("Delete","Delete|Ctrl-D"),exec:function(a){a.remove("right")}},{name:"backspace",bindKey:e("Ctrl-Backspace|Command-Backspace|Option-Backspace|Shift-Backspace|Backspace","Ctrl-Backspace|Command-Backspace|Shift-Backspace|Backspace|Ctrl-H"),exec:function(a){a.remove("left")}},{name:"removetolinestart",bindKey:e("Alt-Backspace","Option-Backspace"),exec:function(a){a.removeToLineStart()}},{name:"removetolineend",bindKey:e("Alt-Delete","Ctrl-K"),exec:function(a){a.removeToLineEnd()}},{name:"removewordleft",bindKey:e("Ctrl-Backspace","Alt-Backspace|Ctrl-Alt-Backspace"),exec:function(a){a.removeWordLeft()}},{name:"removewordright",bindKey:e("Ctrl-Delete","Alt-Delete"),exec:function(a){a.removeWordRight()}},{name:"outdent",bindKey:e("Shift-Tab","Shift-Tab"),exec:function(a){a.blockOutdent()}},{name:"indent",bindKey:e("Tab","Tab"),exec:function(a){a.indent()}},{name:"insertstring",exec:function(a,b){a.insert(b)}},{name:"inserttext",exec:function(a,b){a.insert(d.stringRepeat(b.text||"",b.times||1))}},{name:"splitline",bindKey:e(null,"Ctrl-O"),exec:function(a){a.splitLine()}},{name:"transposeletters",bindKey:e("Ctrl-T","Ctrl-T"),exec:function(a){a.transposeLetters()}},{name:"touppercase",bindKey:e("Ctrl-U","Ctrl-U"),exec:function(a){a.toUpperCase()}},{name:"tolowercase",bindKey:e("Ctrl-Shift-U","Ctrl-Shift-U"),exec:function(a){a.toLowerCase()}},{name:"jumptomatching",bindKey:e("Ctrl-Shift-P","Ctrl-Shift-P"),exec:function(a){a.jumpToMatching()}}]}),define("ace/edit_session",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/lib/event_emitter","ace/selection","ace/mode/text","ace/range","ace/document","ace/background_tokenizer","ace/edit_session/folding","ace/edit_session/bracket_match"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/lang"),f=a("./lib/event_emitter").EventEmitter,g=a("./selection").Selection,h=a("./mode/text").Mode,i=a("./range").Range,j=a("./document").Document,k=a("./background_tokenizer").BackgroundTokenizer,l=function(a,b){this.$modified=!0,this.$breakpoints=[],this.$frontMarkers={},this.$backMarkers={},this.$markerId=1,this.$rowCache=[],this.$wrapData=[],this.$foldData=[],this.$undoSelect=!0,this.$foldData.toString=function(){var a="";return this.forEach(function(b){a+="\n"+b.toString()}),a},a instanceof j?this.setDocument(a):this.setDocument(new j(a)),this.selection=new g(this),b?this.setMode(b):this.setMode(new h)};((function(){function o(a){return a<4352?!1:a>=4352&&a<=4447||a>=4515&&a<=4519||a>=4602&&a<=4607||a>=9001&&a<=9002||a>=11904&&a<=11929||a>=11931&&a<=12019||a>=12032&&a<=12245||a>=12272&&a<=12283||a>=12288&&a<=12350||a>=12353&&a<=12438||a>=12441&&a<=12543||a>=12549&&a<=12589||a>=12593&&a<=12686||a>=12688&&a<=12730||a>=12736&&a<=12771||a>=12784&&a<=12830||a>=12832&&a<=12871||a>=12880&&a<=13054||a>=13056&&a<=19903||a>=19968&&a<=42124||a>=42128&&a<=42182||a>=43360&&a<=43388||a>=44032&&a<=55203||a>=55216&&a<=55238||a>=55243&&a<=55291||a>=63744&&a<=64255||a>=65040&&a<=65049||a>=65072&&a<=65106||a>=65108&&a<=65126||a>=65128&&a<=65131||a>=65281&&a<=65376||a>=65504&&a<=65510}d.implement(this,f),this.setDocument=function(a){if(this.doc)throw new Error("Document is already set");this.doc=a,a.on("change",this.onChange.bind(this)),this.on("changeFold",this.onChangeFold.bind(this)),this.bgTokenizer&&(this.bgTokenizer.setDocument(this.getDocument()),this.bgTokenizer.start(0))},this.getDocument=function(){return this.doc},this.$resetRowCache=function(a){if(a==0){this.$rowCache=[];return}var b=this.$rowCache;for(var c=0;c<b.length;c++)if(b[c].docRow>=a){b.splice(c,b.length);return}},this.onChangeFold=function(a){var b=a.data;this.$resetRowCache(b.start.row)},this.onChange=function(a){var b=a.data;this.$modified=!0,this.$resetRowCache(b.range.start.row);var c=this.$updateInternalDataOnChange(a);!this.$fromUndo&&this.$undoManager&&!b.ignore&&(this.$deltasDoc.push(b),c&&c.length!=0&&this.$deltasFold.push({action:"removeFolds",folds:c}),this.$informUndoManager.schedule()),this.bgTokenizer.start(b.range.start.row),this._emit("change",a)},this.setValue=function(a){this.doc.setValue(a),this.selection.moveCursorTo(0,0),this.selection.clearSelection(),this.$resetRowCache(0),this.$deltas=[],this.$deltasDoc=[],this.$deltasFold=[],this.getUndoManager().reset()},this.getValue=this.toString=function(){return this.doc.getValue()},this.getSelection=function(){return this.selection},this.getState=function(a){return this.bgTokenizer.getState(a)},this.getTokens=function(a,b){return this.bgTokenizer.getTokens(a,b)},this.getTokenAt=function(a,b){var c=this.bgTokenizer.getTokens(a,a)[0].tokens,d,e=0;if(b==null)f=c.length-1,e=this.getLine(a).length;else for(var f=0;f<c.length;f++){e+=c[f].value.length;if(e>=b)break}return d=c[f],d?(d.index=f,d.start=e-d.value.length,d):null},this.setUndoManager=function(a){this.$undoManager=a,this.$resetRowCache(0),this.$deltas=[],this.$deltasDoc=[],this.$deltasFold=[],this.$informUndoManager&&this.$informUndoManager.cancel();if(a){var b=this;this.$syncInformUndoManager=function(){b.$informUndoManager.cancel(),b.$deltasFold.length&&(b.$deltas.push({group:"fold",deltas:b.$deltasFold}),b.$deltasFold=[]),b.$deltasDoc.length&&(b.$deltas.push({group:"doc",deltas:b.$deltasDoc}),b.$deltasDoc=[]),b.$deltas.length>0&&a.execute({action:"aceupdate",args:[b.$deltas,b]}),b.$deltas=[]},this.$informUndoManager=e.deferredCall(this.$syncInformUndoManager)}},this.$defaultUndoManager={undo:function(){},redo:function(){},reset:function(){}},this.getUndoManager=function(){return this.$undoManager||this.$defaultUndoManager},this.getTabString=function(){return this.getUseSoftTabs()?e.stringRepeat(" ",this.getTabSize()):"\t"},this.$useSoftTabs=!0,this.setUseSoftTabs=function(a){if(this.$useSoftTabs===a)return;this.$useSoftTabs=a},this.getUseSoftTabs=function(){return this.$useSoftTabs},this.$tabSize=4,this.setTabSize=function(a){if(isNaN(a)||this.$tabSize===a)return;this.$modified=!0,this.$tabSize=a,this._emit("changeTabSize")},this.getTabSize=function(){return this.$tabSize},this.isTabStop=function(a){return this.$useSoftTabs&&a.column%this.$tabSize==0},this.$overwrite=!1,this.setOverwrite=function(a){if(this.$overwrite==a)return;this.$overwrite=a,this._emit("changeOverwrite")},this.getOverwrite=function(){return this.$overwrite},this.toggleOverwrite=function(){this.setOverwrite(!this.$overwrite)},this.getBreakpoints=function(){return this.$breakpoints},this.setBreakpoints=function(a){this.$breakpoints=[];for(var b=0;b<a.length;b++)this.$breakpoints[a[b]]=!0;this._emit("changeBreakpoint",{})},this.clearBreakpoints=function(){this.$breakpoints=[],this._emit("changeBreakpoint",{})},this.setBreakpoint=function(a){this.$breakpoints[a]=!0,this._emit("changeBreakpoint",{})},this.clearBreakpoint=function(a){delete this.$breakpoints[a],this._emit("changeBreakpoint",{})},this.getBreakpoints=function(){return this.$breakpoints},this.addMarker=function(a,b,c,d){var e=this.$markerId++,f={range:a,type:c||"line",renderer:typeof c=="function"?c:null,clazz:b,inFront:!!d};return d?(this.$frontMarkers[e]=f,this._emit("changeFrontMarker")):(this.$backMarkers[e]=f,this._emit("changeBackMarker")),e},this.removeMarker=function(a){var b=this.$frontMarkers[a]||this.$backMarkers[a];if(!b)return;var c=b.inFront?this.$frontMarkers:this.$backMarkers;b&&(delete c[a],this._emit(b.inFront?"changeFrontMarker":"changeBackMarker"))},this.getMarkers=function(a){return a?this.$frontMarkers:this.$backMarkers},this.setAnnotations=function(a){this.$annotations={};for(var b=0;b<a.length;b++){var c=a[b],d=c.row;this.$annotations[d]?this.$annotations[d].push(c):this.$annotations[d]=[c]}this._emit("changeAnnotation",{})},this.getAnnotations=function(){return this.$annotations||{}},this.clearAnnotations=function(){this.$annotations={},this._emit("changeAnnotation",{})},this.$detectNewLine=function(a){var b=a.match(/^.*?(\r?\n)/m);b?this.$autoNewLine=b[1]:this.$autoNewLine="\n"},this.getWordRange=function(a,b){var c=this.getLine(a),d=!1;b>0&&(d=!!c.charAt(b-1).match(this.tokenRe)),d||(d=!!c.charAt(b).match(this.tokenRe));var e=d?this.tokenRe:this.nonTokenRe,f=b;if(f>0){do f--;while(f>=0&&c.charAt(f).match(e));f++}var g=b;while(g<c.length&&c.charAt(g).match(e))g++;return new i(a,f,a,g)},this.getAWordRange=function(a,b){var c=this.getWordRange(a,b),d=this.getLine(c.end.row);while(d.charAt(c.end.column).match(/[ \t]/))c.end.column+=1;return c},this.setNewLineMode=function(a){this.doc.setNewLineMode(a)},this.getNewLineMode=function(){return this.doc.getNewLineMode()},this.$useWorker=!0,this.setUseWorker=function(a){if(this.$useWorker==a)return;this.$useWorker=a,this.$stopWorker(),a&&this.$startWorker()},this.getUseWorker=function(){return this.$useWorker},this.onReloadTokenizer=function(a){var b=a.data;this.bgTokenizer.start(b.first),this._emit("tokenizerUpdate",a)},this.$mode=null,this.setMode=function(a){if(this.$mode===a)return;this.$mode=a,this.$stopWorker(),this.$useWorker&&this.$startWorker();var b=a.getTokenizer();if(b.addEventListener!==undefined){var c=this.onReloadTokenizer.bind(this);b.addEventListener("update",c)}if(!this.bgTokenizer){this.bgTokenizer=new k(b);var d=this;this.bgTokenizer.addEventListener("update",function(a){d._emit("tokenizerUpdate",a)})}else this.bgTokenizer.setTokenizer(b);this.bgTokenizer.setDocument(this.getDocument()),this.bgTokenizer.start(0),this.tokenRe=a.tokenRe,this.nonTokenRe=a.nonTokenRe,this.$setFolding(a.foldingRules),this._emit("changeMode")},this.$stopWorker=function(){this.$worker&&this.$worker.terminate(),this.$worker=null},this.$startWorker=function(){if(typeof Worker!="undefined"&&!a.noWorker)try{this.$worker=this.$mode.createWorker(this)}catch(b){console.log("Could not load worker"),console.log(b),this.$worker=null}else this.$worker=null},this.getMode=function(){return this.$mode},this.$scrollTop=0,this.setScrollTop=function(a){a=Math.round(Math.max(0,a));if(this.$scrollTop===a)return;this.$scrollTop=a,this._emit("changeScrollTop",a)},this.getScrollTop=function(){return this.$scrollTop},this.$scrollLeft=0,this.setScrollLeft=function(a){a=Math.round(Math.max(0,a));if(this.$scrollLeft===a)return;this.$scrollLeft=a,this._emit("changeScrollLeft",a)},this.getScrollLeft=function(){return this.$scrollLeft},this.getWidth=function(){return this.$computeWidth(),this.width},this.getScreenWidth=function(){return this.$computeWidth(),this.screenWidth},this.$computeWidth=function(a){if(this.$modified||a){this.$modified=!1;var b=this.doc.getAllLines(),c=0,d=0;for(var e=0;e<b.length;e++){var f=this.getFoldLine(e),g,h;g=b[e];if(f){var i=f.range.end;g=this.getFoldDisplayLine(f),e=i.row}h=g.length,c=Math.max(c,h),this.$useWrapMode||(d=Math.max(d,this.$getStringScreenWidth(g)[0]))}this.width=c,this.$useWrapMode?this.screenWidth=this.$wrapLimit:this.screenWidth=d}},this.getLine=function(a){return this.doc.getLine(a)},this.getLines=function(a,b){return this.doc.getLines(a,b)},this.getLength=function(){return this.doc.getLength()},this.getTextRange=function(a){return this.doc.getTextRange(a)},this.insert=function(a,b){return this.doc.insert(a,b)},this.remove=function(a){return this.doc.remove(a)},this.undoChanges=function(a,b){if(!a.length)return;this.$fromUndo=!0;var c=null;for(var d=a.length-1;d!=-1;d--){var e=a[d];e.group=="doc"?(this.doc.revertDeltas(e.deltas),c=this.$getUndoSelection(e.deltas,!0,c)):e.deltas.forEach(function(a){this.addFolds(a.folds)},this)}return this.$fromUndo=!1,c&&this.$undoSelect&&!b&&this.selection.setSelectionRange(c),c},this.redoChanges=function(a,b){if(!a.length)return;this.$fromUndo=!0;var c=null;for(var d=0;d<a.length;d++){var e=a[d];e.group=="doc"&&(this.doc.applyDeltas(e.deltas),c=this.$getUndoSelection(e.deltas,!1,c))}return this.$fromUndo=!1,c&&this.$undoSelect&&!b&&this.selection.setSelectionRange(c),c},this.setUndoSelect=function(a){this.$undoSelect=a},this.$getUndoSelection=function(a,b,c){function d(a){var c=a.action=="insertText"||a.action=="insertLines";return b?!c:c}var e=a[0],f,g,h=!1;d(e)?(f=e.range.clone(),h=!0):(f=i.fromPoints(e.range.start,e.range.start),h=!1);for(var j=1;j<a.length;j++)e=a[j],d(e)?(g=e.range.start,f.compare(g.row,g.column)==-1&&f.setStart(e.range.start),g=e.range.end,f.compare(g.row,g.column)==1&&f.setEnd(e.range.end),h=!0):(g=e.range.start,f.compare(g.row,g.column)==-1&&(f=i.fromPoints(e.range.start,e.range.start)),h=!1);if(c!=null){var k=c.compareRange(f);k==1?f.setStart(c.start):k==-1&&f.setEnd(c.end)}return f},this.replace=function(a,b){return this.doc.replace(a,b)},this.moveText=function(a,b){var c=this.getTextRange(a);this.remove(a);var d=b.row,e=b.column;!a.isMultiLine()&&a.start.row==d&&a.end.column<e&&(e-=c.length);if(a.isMultiLine()&&a.end.row<d){var f=this.doc.$split(c);d-=f.length-1}var g=d+a.end.row-a.start.row,h=a.isMultiLine()?a.end.column:e+a.end.column-a.start.column,j=new i(d,e,g,h);return this.insert(j.start,c),j},this.indentRows=function(a,b,c){c=c.replace(/\t/g,this.getTabString());for(var d=a;d<=b;d++)this.insert({row:d,column:0},c)},this.outdentRows=function(a){var b=a.collapseRows(),c=new i(0,0,0,0),d=this.getTabSize();for(var e=b.start.row;e<=b.end.row;++e){var f=this.getLine(e);c.start.row=e,c.end.row=e;for(var g=0;g<d;++g)if(f.charAt(g)!=" ")break;g<d&&f.charAt(g)=="\t"?(c.start.column=g,c.end.column=g+1):(c.start.column=0,c.end.column=g),this.remove(c)}},this.moveLinesUp=function(a,b){if(a<=0)return 0;var c=this.doc.removeLines(a,b);return this.doc.insertLines(a-1,c),-1},this.moveLinesDown=function(a,b){if(b>=this.doc.getLength()-1)return 0;var c=this.doc.removeLines(a,b);return this.doc.insertLines(a+1,c),1},this.duplicateLines=function(a,b){var a=this.$clipRowToDocument(a),b=this.$clipRowToDocument(b),c=this.getLines(a,b);this.doc.insertLines(a,c);var d=b-a+1;return d},this.$clipRowToDocument=function(a){return Math.max(0,Math.min(a,this.doc.getLength()-1))},this.$clipColumnToRow=function(a,b){return b<0?0:Math.min(this.doc.getLine(a).length,b)},this.$clipPositionToDocument=function(a,b){b=Math.max(0,b);if(a<0)a=0,b=0;else{var c=this.doc.getLength();a>=c?(a=c-1,b=this.doc.getLine(c-1).length):b=Math.min(this.doc.getLine(a).length,b)}return{row:a,column:b}},this.$clipRangeToDocument=function(a){a.start.row<0?(a.start.row=0,a.start.column=0):a.start.column=this.$clipColumnToRow(a.start.row,a.start.column);var b=this.doc.getLength()-1;return a.end.row>b?(a.end.row=b,a.end.column=this.doc.getLine(b).length):a.end.column=this.$clipColumnToRow(a.end.row,a.end.column),a},this.$wrapLimit=80,this.$useWrapMode=!1,this.$wrapLimitRange={min:null,max:null},this.setUseWrapMode=function(a){if(a!=this.$useWrapMode){this.$useWrapMode=a,this.$modified=!0,this.$resetRowCache(0);if(a){var b=this.getLength();this.$wrapData=[];for(var c=0;c<b;c++)this.$wrapData.push([]);this.$updateWrapData(0,b-1)}this._emit("changeWrapMode")}},this.getUseWrapMode=function(){return this.$useWrapMode},this.setWrapLimitRange=function(a,b){if(this.$wrapLimitRange.min!==a||this.$wrapLimitRange.max!==b)this.$wrapLimitRange.min=a,this.$wrapLimitRange.max=b,this.$modified=!0,this._emit("changeWrapMode")},this.adjustWrapLimit=function(a){var b=this.$constrainWrapLimit(a);return b!=this.$wrapLimit&&b>0?(this.$wrapLimit=b,this.$modified=!0,this.$useWrapMode&&(this.$updateWrapData(0,this.getLength()-1),this.$resetRowCache(0),this._emit("changeWrapLimit")),!0):!1},this.$constrainWrapLimit=function(a){var b=this.$wrapLimitRange.min;b&&(a=Math.max(b,a));var c=this.$wrapLimitRange.max;return c&&(a=Math.min(c,a)),Math.max(1,a)},this.getWrapLimit=function(){return this.$wrapLimit},this.getWrapLimitRange=function(){return{min:this.$wrapLimitRange.min,max:this.$wrapLimitRange.max}},this.$updateInternalDataOnChange=function(a){var b=this.$useWrapMode,c,d=a.data.action,e=a.data.range.start.row,f=a.data.range.end.row,g=a.data.range.start,h=a.data.range.end,i=null;d.indexOf("Lines")!=-1?(d=="insertLines"?f=e+a.data.lines.length:f=e,c=a.data.lines?a.data.lines.length:f-e):c=f-e;if(c!=0)if(d.indexOf("remove")!=-1){b&&this.$wrapData.splice(e,c);var j=this.$foldData;i=this.getFoldsInRange(a.data.range),this.removeFolds(i);var k=this.getFoldLine(h.row),l=0;if(k){k.addRemoveChars(h.row,h.column,g.column-h.column),k.shiftRow(-c);var m=this.getFoldLine(e);m&&m!==k&&(m.merge(k),k=m),l=j.indexOf(k)+1}for(l;l<j.length;l++){var k=j[l];k.start.row>=h.row&&k.shiftRow(-c)}f=e}else{var n;if(b){n=[e,0];for(var o=0;o<c;o++)n.push([]);this.$wrapData.splice.apply(this.$wrapData,n)}var j=this.$foldData,k=this.getFoldLine(e),l=0;if(k){var p=k.range.compareInside(g.row,g.column);p==0?(k=k.split(g.row,g.column),k.shiftRow(c),k.addRemoveChars(f,0,h.column-g.column)):p==-1&&(k.addRemoveChars(e,0,h.column-g.column),k.shiftRow(c)),l=j.indexOf(k)+1}for(l;l<j.length;l++){var k=j[l];k.start.row>=e&&k.shiftRow(c)}}else{c=Math.abs(a.data.range.start.column-a.data.range.end.column),d.indexOf("remove")!=-1&&(i=this.getFoldsInRange(a.data.range),this.removeFolds(i),c=-c);var k=this.getFoldLine(e);k&&k.addRemoveChars(e,g.column,c)}return b&&this.$wrapData.length!=this.doc.getLength()&&console.error("doc.getLength() and $wrapData.length have to be the same!"),b&&this.$updateWrapData(e,f),i},this.$updateWrapData=function(a,b){var c=this.doc.getAllLines(),d=this.getTabSize(),f=this.$wrapData,i=this.$wrapLimit,j,k,m=a;b=Math.min(b,c.length-1);while(m<=b){k=this.getFoldLine(m,k);if(!k)j=this.$getDisplayTokens(e.stringTrimRight(c[m])),f[m]=this.$computeWrapSplits(j,i,d),m++;else{j=[],k.walk(function(a,b,d,e){var f;if(a){f=this.$getDisplayTokens(a,j.length),f[0]=g;for(var i=1;i<f.length;i++)f[i]=h}else f=this.$getDisplayTokens(c[b].substring(e,d),j.length);j=j.concat(f)}.bind(this),k.end.row,c[k.end.row].length+1);while(j.length!=0&&j[j.length-1]>=l)j.pop();f[k.start.row]=this.$computeWrapSplits(j,i,d),m=k.end.row+1}}};var b=1,c=2,g=3,h=4,j=9,l=10,m=11,n=12;this.$computeWrapSplits=function(a,b){function i(b){var d=a.slice(e,b),g=d.length;d.join("").replace(/12/g,function(){g-=1}).replace(/2/g,function(){g-=1}),f+=g,c.push(f),e=b}if(a.length==0)return[];var c=[],d=a.length,e=0,f=0;while(d-e>b){var k=e+b;if(a[k]>=l){while(a[k]>=l)k++;i(k);continue}if(a[k]==g||a[k]==h){for(k;k!=e-1;k--)if(a[k]==g)break;if(k>e){i(k);continue}k=e+b;for(k;k<a.length;k++)if(a[k]!=h)break;if(k==a.length)break;i(k);continue}var m=Math.max(k-10,e-1);while(k>m&&a[k]<g)k--;while(k>m&&a[k]==j)k--;if(k>m){i(++k);continue}k=e+b,i(k)}return c},this.$getDisplayTokens=function(a,d){var e=[],f;d=d||0;for(var g=0;g<a.length;g++){var h=a.charCodeAt(g);if(h==9){f=this.getScreenTabSize(e.length+d),e.push(m);for(var i=1;i<f;i++)e.push(n)}else h==32?e.push(l):h>39&&h<48||h>57&&h<64?e.push(j):h>=4352&&o(h)?e.push(b,c):e.push(b)}return e},this.$getStringScreenWidth=function(a,b,c){if(b==0)return[0,0];b==null&&(b=c+a.length*Math.max(this.getTabSize(),2)),c=c||0;var d,e;for(e=0;e<a.length;e++){d=a.charCodeAt(e),d==9?c+=this.getScreenTabSize(c):d>=4352&&o(d)?c+=2:c+=1;if(c>b)break}return[c,e]},this.getRowLength=function(a){return!this.$useWrapMode||!this.$wrapData[a]?1:this.$wrapData[a].length+1},this.getRowHeight=function(a,b){return this.getRowLength(b)*a.lineHeight},this.getScreenLastRowColumn=function(a){return this.documentToScreenColumn(a,this.doc.getLine(a).length)},this.getDocumentLastRowColumn=function(a,b){var c=this.documentToScreenRow(a,b);return this.getScreenLastRowColumn(c)},this.getDocumentLastRowColumnPosition=function(a,b){var c=this.documentToScreenRow(a,b);return this.screenToDocumentPosition(c,Number.MAX_VALUE/10)},this.getRowSplitData=function(a){return this.$useWrapMode?this.$wrapData[a]:undefined},this.getScreenTabSize=function(a){return this.$tabSize-a%this.$tabSize},this.screenToDocumentRow=function(a,b){return this.screenToDocumentPosition(a,b).row},this.screenToDocumentColumn=function(a,b){return this.screenToDocumentPosition(a,b).column},this.screenToDocumentPosition=function(a,b){if(a<0)return{row:0,column:0};var c,d=0,e=0,f,g=0,h=0,i=this.$rowCache;for(var j=0;j<i.length;j++)if(i[j].screenRow<a)g=i[j].screenRow,d=i[j].docRow;else break;var k=!i.length||j==i.length,l=this.getLength()-1,m=this.getNextFoldLine(d),n=m?m.start.row:Infinity;while(g<=a){h=this.getRowLength(d);if(g+h-1>=a||d>=l)break;g+=h,d++,d>n&&(d=m.end.row+1,m=this.getNextFoldLine(d,m),n=m?m.start.row:Infinity),k&&i.push({docRow:d,screenRow:g})}if(m&&m.start.row<=d)c=this.getFoldDisplayLine(m),d=m.start.row;else{if(g+h<=a||d>l)return{row:l,column:this.getLine(l).length};c=this.getLine(d),m=null}if(this.$useWrapMode){var o=this.$wrapData[d];o&&(f=o[a-g],a>g&&o.length&&(e=o[a-g-1]||o[o.length-1],c=c.substring(e)))}return e+=this.$getStringScreenWidth(c,b)[1],this.$useWrapMode?e>=f&&(e=f-1):e=Math.min(e,c.length),m?m.idxToPosition(e):{row:d,column:e}},this.documentToScreenPosition=function(a,b){if(typeof b=="undefined")var c=this.$clipPositionToDocument(a.row,a.column);else c=this.$clipPositionToDocument(a,b);a=c.row,b=c.column;var d;if(this.$useWrapMode){d=this.$wrapData;if(a>d.length-1)return{row:this.getScreenLength(),column:d.length==0?0:d[d.length-1].length-1}}var e=0,f=null,g=null;g=this.getFoldAt(a,b,1),g&&(a=g.start.row,b=g.start.column);var h,i=0,j=this.$rowCache;for(var k=0;k<j.length;k++)if(j[k].docRow<a)e=j[k].screenRow,i=j[k].docRow;else break;var l=!j.length||k==j.length,m=this.getNextFoldLine(i),n=m?m.start.row:Infinity;while(i<a){if(i>=n){h=m.end.row+1;if(h>a)break;m=this.getNextFoldLine(h,m),n=m?m.start.row:Infinity}else h=i+1;e+=this.getRowLength(i),i=h,l&&j.push({docRow:i,screenRow:e})}var o="";m&&i>=n?(o=this.getFoldDisplayLine(m,a,b),f=m.start.row):(o=this.getLine(a).substring(0,b),f=a);if(this.$useWrapMode){var p=d[f],q=0;while(o.length>=p[q])e++,q++;o=o.substring(p[q-1]||0,o.length)}return{row:e,column:this.$getStringScreenWidth(o)[0]}},this.documentToScreenColumn=function(a,b){return this.documentToScreenPosition(a,b).column},this.documentToScreenRow=function(a,b){return this.documentToScreenPosition(a,b).row},this.getScreenLength=function(){var a=0,b=null;if(!this.$useWrapMode){a=this.getLength();var c=this.$foldData;for(var d=0;d<c.length;d++)b=c[d],a-=b.end.row-b.start.row}else{var e=this.$wrapData.length,f=0,d=0,b=this.$foldData[d++],g=b?b.start.row:Infinity;while(f<e)a+=this.$wrapData[f].length+1,f++,f>g&&(f=b.end.row+1,b=this.$foldData[d++],g=b?b.start.row:Infinity)}return a}})).call(l.prototype),a("./edit_session/folding").Folding.call(l.prototype),a("./edit_session/bracket_match").BracketMatch.call(l.prototype),b.EditSession=l}),define("ace/selection",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/lib/event_emitter","ace/range"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/lang"),f=a("./lib/event_emitter").EventEmitter,g=a("./range").Range,h=function(a){this.session=a,this.doc=a.getDocument(),this.clearSelection(),this.selectionLead=this.doc.createAnchor(0,0),this.selectionAnchor=this.doc.createAnchor(0,0);var b=this;this.selectionLead.on("change",function(a){b._emit("changeCursor"),b.$isEmpty||b._emit("changeSelection"),!b.$preventUpdateDesiredColumnOnChange&&a.old.column!=a.value.column&&b.$updateDesiredColumn()}),this.selectionAnchor.on("change",function(){b.$isEmpty||b._emit("changeSelection")})};((function(){d.implement(this,f),this.isEmpty=function(){return this.$isEmpty||this.selectionAnchor.row==this.selectionLead.row&&this.selectionAnchor.column==this.selectionLead.column},this.isMultiLine=function(){return this.isEmpty()?!1:this.getRange().isMultiLine()},this.getCursor=function(){return this.selectionLead.getPosition()},this.setSelectionAnchor=function(a,b){this.selectionAnchor.setPosition(a,b),this.$isEmpty&&(this.$isEmpty=!1,this._emit("changeSelection"))},this.getSelectionAnchor=function(){return this.$isEmpty?this.getSelectionLead():this.selectionAnchor.getPosition()},this.getSelectionLead=function(){return this.selectionLead.getPosition()},this.shiftSelection=function(a){if(this.$isEmpty){this.moveCursorTo(this.selectionLead.row,this.selectionLead.column+a);return}var b=this.getSelectionAnchor(),c=this.getSelectionLead(),d=this.isBackwards();(!d||b.column!==0)&&this.setSelectionAnchor(b.row,b.column+a),(d||c.column!==0)&&this.$moveSelection(function(){this.moveCursorTo(c.row,c.column+a)})},this.isBackwards=function(){var a=this.selectionAnchor,b=this.selectionLead;return a.row>b.row||a.row==b.row&&a.column>b.column},this.getRange=function(){var a=this.selectionAnchor,b=this.selectionLead;return this.isEmpty()?g.fromPoints(b,b):this.isBackwards()?g.fromPoints(b,a):g.fromPoints(a,b)},this.clearSelection=function(){this.$isEmpty||(this.$isEmpty=!0,this._emit("changeSelection"))},this.selectAll=function(){var a=this.doc.getLength()-1;this.setSelectionAnchor(a,this.doc.getLine(a).length),this.moveCursorTo(0,0)},this.setSelectionRange=function(a,b){b?(this.setSelectionAnchor(a.end.row,a.end.column),this.selectTo(a.start.row,a.start.column)):(this.setSelectionAnchor(a.start.row,a.start.column),this.selectTo(a.end.row,a.end.column)),this.$updateDesiredColumn()},this.$updateDesiredColumn=function(){var a=this.getCursor();this.$desiredColumn=this.session.documentToScreenColumn(a.row,a.column)},this.$moveSelection=function(a){var b=this.selectionLead;this.$isEmpty&&this.setSelectionAnchor(b.row,b.column),a.call(this)},this.selectTo=function(a,b){this.$moveSelection(function(){this.moveCursorTo(a,b)})},this.selectToPosition=function(a){this.$moveSelection(function(){this.moveCursorToPosition(a)})},this.selectUp=function(){this.$moveSelection(this.moveCursorUp)},this.selectDown=function(){this.$moveSelection(this.moveCursorDown)},this.selectRight=function(){this.$moveSelection(this.moveCursorRight)},this.selectLeft=function(){this.$moveSelection(this.moveCursorLeft)},this.selectLineStart=function(){this.$moveSelection(this.moveCursorLineStart)},this.selectLineEnd=function(){this.$moveSelection(this.moveCursorLineEnd)},this.selectFileEnd=function(){this.$moveSelection(this.moveCursorFileEnd)},this.selectFileStart=function(){this.$moveSelection(this.moveCursorFileStart)},this.selectWordRight=function(){this.$moveSelection(this.moveCursorWordRight)},this.selectWordLeft=function(){this.$moveSelection(this.moveCursorWordLeft)},this.selectWord=function(){var a=this.getCursor(),b=this.session.getWordRange(a.row,a.column);this.setSelectionRange(b)},this.selectAWord=function(){var a=this.getCursor(),b=this.session.getAWordRange(a.row,a.column);this.setSelectionRange(b)},this.selectLine=function(){var a=this.selectionLead.row,b,c=this.session.getFoldLine(a);c?(a=c.start.row,b=c.end.row):b=a,this.setSelectionAnchor(a,0),this.$moveSelection(function(){this.moveCursorTo(b+1,0)})},this.moveCursorUp=function(){this.moveCursorBy(-1,0)},this.moveCursorDown=function(){this.moveCursorBy(1,0)},this.moveCursorLeft=function(){var a=this.selectionLead.getPosition(),b;if(b=this.session.getFoldAt(a.row,a.column,-1))this.moveCursorTo(b.start.row,b.start.column);else if(a.column==0)a.row>0&&this.moveCursorTo(a.row-1,this.doc.getLine(a.row-1).length);else{var c=this.session.getTabSize();this.session.isTabStop(a)&&this.doc.getLine(a.row).slice(a.column-c,a.column).split(" ").length-1==c?this.moveCursorBy(0,-c):this.moveCursorBy(0,-1)}},this.moveCursorRight=function(){var a=this.selectionLead.getPosition(),b;if(b=this.session.getFoldAt(a.row,a.column,1))this.moveCursorTo(b.end.row,b.end.column);else if(this.selectionLead.column==this.doc.getLine(this.selectionLead.row).length)this.selectionLead.row<this.doc.getLength()-1&&this.moveCursorTo(this.selectionLead.row+1,0);else{var c=this.session.getTabSize(),a=this.selectionLead;this.session.isTabStop(a)&&this.doc.getLine(a.row).slice(a.column,a.column+c).split(" ").length-1==c?this.moveCursorBy(0,c):this.moveCursorBy(0,1)}},this.moveCursorLineStart=function(){var a=this.selectionLead.row,b=this.selectionLead.column,c=this.session.documentToScreenRow(a,b),d=this.session.screenToDocumentPosition(c,0),e=this.session.getDisplayLine(a,null,d.row,d.column),f=e.match(/^\s*/);f[0].length==b?this.moveCursorTo(d.row,d.column):this.moveCursorTo(d.row,d.column+f[0].length)},this.moveCursorLineEnd=function(){var a=this.selectionLead,b=this.session.getDocumentLastRowColumnPosition(a.row,a.column);this.moveCursorTo(b.row,b.column)},this.moveCursorFileEnd=function(){var a=this.doc.getLength()-1,b=this.doc.getLine(a).length;this.moveCursorTo(a,b)},this.moveCursorFileStart=function(){this.moveCursorTo(0,0)},this.moveCursorWordRight=function(){var a=this.selectionLead.row,b=this.selectionLead.column,c=this.doc.getLine(a),d=c.substring(b),e;this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;var f=this.session.getFoldAt(a,b,1);if(f){this.moveCursorTo(f.end.row,f.end.column);return}if(e=this.session.nonTokenRe.exec(d))b+=this.session.nonTokenRe.lastIndex,this.session.nonTokenRe.lastIndex=0,d=c.substring(b);if(b>=c.length){this.moveCursorTo(a,c.length),this.moveCursorRight(),a<this.doc.getLength()-1&&this.moveCursorWordRight();return}if(e=this.session.tokenRe.exec(d))b+=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0;this.moveCursorTo(a,b)},this.moveCursorWordLeft=function(){var a=this.selectionLead.row,b=this.selectionLead.column,c;if(c=this.session.getFoldAt(a,b,-1)){this.moveCursorTo(c.start.row,c.start.column);return}var d=this.session.getFoldStringAt(a,b,-1);d==null&&(d=this.doc.getLine(a).substring(0,b));var f=e.stringReverse(d),g;this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;if(g=this.session.nonTokenRe.exec(f))b-=this.session.nonTokenRe.lastIndex,f=f.slice(this.session.nonTokenRe.lastIndex),this.session.nonTokenRe.lastIndex=0;if(b<=0){this.moveCursorTo(a,0),this.moveCursorLeft(),a>0&&this.moveCursorWordLeft();return}if(g=this.session.tokenRe.exec(f))b-=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0;this.moveCursorTo(a,b)},this.moveCursorBy=function(a,b){var c=this.session.documentToScreenPosition(this.selectionLead.row,this.selectionLead.column),d=b===0&&this.$desiredColumn||c.column,e=this.session.screenToDocumentPosition(c.row+a,d);this.moveCursorTo(e.row,e.column+b,b===0)},this.moveCursorToPosition=function(a){this.moveCursorTo(a.row,a.column)},this.moveCursorTo=function(a,b,c){var d=this.session.getFoldAt(a,b,1);d&&(a=d.start.row,b=d.start.column),this.$preventUpdateDesiredColumnOnChange=!0,this.selectionLead.setPosition(a,b),this.$preventUpdateDesiredColumnOnChange=!1,c||this.$updateDesiredColumn(this.selectionLead.column)},this.moveCursorToScreen=function(a,b,c){var d=this.session.screenToDocumentPosition(a,b);a=d.row,b=d.column,this.moveCursorTo(a,b,c)}})).call(h.prototype),b.Selection=h}),define("ace/range",["require","exports","module"],function(a,b,c){"use strict";var d=function(a,b,c,d){this.start={row:a,column:b},this.end={row:c,column:d}};((function(){this.isEequal=function(a){return this.start.row==a.start.row&&this.end.row==a.end.row&&this.start.column==a.start.column&&this.end.column==a.end.column},this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(a,b){return this.compare(a,b)==0},this.compareRange=function(a){var b,c=a.end,d=a.start;return b=this.compare(c.row,c.column),b==1?(b=this.compare(d.row,d.column),b==1?2:b==0?1:0):b==-1?-2:(b=this.compare(d.row,d.column),b==-1?-1:b==1?42:0)},this.comparePoint=function(a){return this.compare(a.row,a.column)},this.containsRange=function(a){return this.comparePoint(a.start)==0&&this.comparePoint(a.end)==0},this.isEnd=function(a,b){return this.end.row==a&&this.end.column==b},this.isStart=function(a,b){return this.start.row==a&&this.start.column==b},this.setStart=function(a,b){typeof a=="object"?(this.start.column=a.column,this.start.row=a.row):(this.start.row=a,this.start.column=b)},this.setEnd=function(a,b){typeof a=="object"?(this.end.column=a.column,this.end.row=a.row):(this.end.row=a,this.end.column=b)},this.inside=function(a,b){return this.compare(a,b)==0?this.isEnd(a,b)||this.isStart(a,b)?!1:!0:!1},this.insideStart=function(a,b){return this.compare(a,b)==0?this.isEnd(a,b)?!1:!0:!1},this.insideEnd=function(a,b){return this.compare(a,b)==0?this.isStart(a,b)?!1:!0:!1},this.compare=function(a,b){return!this.isMultiLine()&&a===this.start.row?b<this.start.column?-1:b>this.end.column?1:0:a<this.start.row?-1:a>this.end.row?1:this.start.row===a?b>=this.start.column?0:-1:this.end.row===a?b<=this.end.column?0:1:0},this.compareStart=function(a,b){return this.start.row==a&&this.start.column==b?-1:this.compare(a,b)},this.compareEnd=function(a,b){return this.end.row==a&&this.end.column==b?1:this.compare(a,b)},this.compareInside=function(a,b){return this.end.row==a&&this.end.column==b?1:this.start.row==a&&this.start.column==b?-1:this.compare(a,b)},this.clipRows=function(a,b){if(this.end.row>b)var c={row:b+1,column:0};if(this.start.row>b)var e={row:b+1,column:0};if(this.start.row<a)var e={row:a,column:0};if(this.end.row<a)var c={row:a,column:0};return d.fromPoints(e||this.start,c||this.end)},this.extend=function(a,b){var c=this.compare(a,b);if(c==0)return this;if(c==-1)var e={row:a,column:b};else var f={row:a,column:b};return d.fromPoints(e||this.start,f||this.end)},this.isEmpty=function(){return this.start.row==this.end.row&&this.start.column==this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return d.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new d(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new d(this.start.row,0,this.end.row,0)},this.toScreenRange=function(a){var b=a.documentToScreenPosition(this.start),c=a.documentToScreenPosition(this.end);return new d(b.row,b.column,c.row,c.column)}})).call(d.prototype),d.fromPoints=function(a,b){return new d(a.row,a.column,b.row,b.column)},b.Range=d}),define("ace/mode/text",["require","exports","module","ace/tokenizer","ace/mode/text_highlight_rules","ace/mode/behaviour","ace/unicode"],function(a,b,c){"use strict";var d=a("../tokenizer").Tokenizer,e=a("./text_highlight_rules").TextHighlightRules,f=a("./behaviour").Behaviour,g=a("../unicode"),h=function(){this.$tokenizer=new d((new e).getRules()),this.$behaviour=new f};((function(){this.tokenRe=new RegExp("^["+g.packages.L+g.packages.Mn+g.packages.Mc+g.packages.Nd+g.packages.Pc+"\\$_]+","g"),this.nonTokenRe=new RegExp("^(?:[^"+g.packages.L+g.packages.Mn+g.packages.Mc+g.packages.Nd+g.packages.Pc+"\\$_]|s])+","g"),this.getTokenizer=function(){return this.$tokenizer},this.toggleCommentLines=function(a,b,c,d){},this.getNextLineIndent=function(a,b,c){return""},this.checkOutdent=function(a,b,c){return!1},this.autoOutdent=function(a,b,c){},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""},this.createWorker=function(a){return null},this.highlightSelection=function(a){var b=a.session;b.$selectionOccurrences||(b.$selectionOccurrences=[]),b.$selectionOccurrences.length&&this.clearSelectionHighlight(a);var c=a.getSelectionRange();if(c.isEmpty()||c.isMultiLine())return;var d=c.start.column-1,e=c.end.column+1,f=b.getLine(c.start.row),g=f.length,h=f.substring(Math.max(d,0),Math.min(e,g));if(d>=0&&/^[\w\d]/.test(h)||e<=g&&/[\w\d]$/.test(h))return;h=f.substring(c.start.column,c.end.column);if(!/^[\w\d]+$/.test(h))return;var i=a.getCursorPosition(),j={wrap:!0,wholeWord:!0,caseSensitive:!0,needle:h},k=a.$search.getOptions();a.$search.set(j);var l=a.$search.findAll(b);l.forEach(function(a){if(!a.contains(i.row,i.column)){var c=b.addMarker(a,"ace_selected_word","text");b.$selectionOccurrences.push(c)}}),a.$search.set(k)},this.clearSelectionHighlight=function(a){if(!a.session.$selectionOccurrences)return;a.session.$selectionOccurrences.forEach(function(b){a.session.removeMarker(b)}),a.session.$selectionOccurrences=[]},this.createModeDelegates=function(a){if(!this.$embeds)return;this.$modes={};for(var b=0;b<this.$embeds.length;b++)a[this.$embeds[b]]&&(this.$modes[this.$embeds[b]]=new a[this.$embeds[b]]);var c=["toggleCommentLines","getNextLineIndent","checkOutdent","autoOutdent","transformAction"];for(var b=0;b<c.length;b++)(function(a){var d=c[b],e=a[d];a[c[b]]=function(){return this.$delegator(d,arguments,e)}})(this)},this.$delegator=function(a,b,c){var d=b[0];for(var e=0;e<this.$embeds.length;e++){if(!this.$modes[this.$embeds[e]])continue;var f=d.split(this.$embeds[e]);if(!f[0]&&f[1]){b[0]=f[1];var g=this.$modes[this.$embeds[e]];return g[a].apply(g,b)}}var h=c.apply(this,b);return c?h:undefined},this.transformAction=function(a,b,c,d,e){if(this.$behaviour){var f=this.$behaviour.getBehaviours();for(var g in f)if(f[g][b]){var h=f[g][b].apply(this,arguments);if(h)return h}}}})).call(h.prototype),b.Mode=h}),define("ace/tokenizer",["require","exports","module"],function(a,b,c){"use strict";var d=function(a,b){b=b?"g"+b:"g",this.rules=a,this.regExps={},this.matchMappings={};for(var c in this.rules){var d=this.rules[c],e=d,f=[],g=0,h=this.matchMappings[c]={};for(var i=0;i<e.length;i++){var j=(new RegExp("(?:("+e[i].regex+")|(.))")).exec("a").length-2,k=e[i].regex.replace(/\\([0-9]+)/g,function(a,b){return"\\"+(parseInt(b,10)+g+1)});h[g]={rule:i,len:j},g+=j,f.push(k)}this.regExps[c]=new RegExp("(?:("+f.join(")|(")+")|(.))",b)}};((function(){this.getLineTokens=function(a,b){var c=b,d=this.rules[c],e=this.matchMappings[c],f=this.regExps[c];f.lastIndex=0;var g,h=[],i=0,j={type:null,value:""};while(g=f.exec(a)){var k="text",l=null,m=[g[0]];for(var n=0;n<g.length-2;n++)if(g[n+1]!==undefined){l=d[e[n].rule],e[n].len>1&&(m=g.slice(n+2,n+1+e[n].len)),typeof l.token=="function"?k=l.token.apply(this,m):k=l.token;var o=l.next;o&&o!==c&&(c=o,d=this.rules[c],e=this.matchMappings[c],i=f.lastIndex,f=this.regExps[c],f.lastIndex=i);break}if(m[0]){typeof k=="string"&&(m=[m.join("")],k=[k]);for(var n=0;n<m.length;n++)(!l||l.merge||k[n]==="text")&&j.type===k[n]?j.value+=m[n]:(j.type&&h.push(j),j={type:k[n],value:m[n]})}if(i==a.length)break;i=f.lastIndex}return j.type&&h.push(j),{tokens:h,state:c}}})).call(d.prototype),b.Tokenizer=d}),define("ace/mode/text_highlight_rules",["require","exports","module","ace/lib/lang"],function(a,b,c){"use strict";var d=a("../lib/lang"),e=function(){this.$rules={start:[{token:"empty_line",regex:"^$"},{token:"text",regex:".+"}]}};((function(){this.addRules=function(a,b){for(var c in a){var d=a[c];for(var e=0;e<d.length;e++){var f=d[e];f.next?f.next=b+f.next:f.next=b+c}this.$rules[b+c]=d}},this.getRules=function(){return this.$rules},this.embedRules=function(a,b,c,e){var f=(new a).getRules();if(e)for(var g=0;g<e.length;g++)e[g]=b+e[g];else{e=[];for(var h in f)e.push(b+h)}this.addRules(f,b);for(var g=0;g<e.length;g++)Array.prototype.unshift.apply(this.$rules[e[g]],d.deepCopy(c));this.$embeds||(this.$embeds=[]),this.$embeds.push(b)},this.getEmbeds=function(){return this.$embeds}})).call(e.prototype),b.TextHighlightRules=e}),define("ace/mode/behaviour",["require","exports","module"],function(a,b,c){"use strict";var d=function(){this.$behaviours={}};((function(){this.add=function(a,b,c){switch(undefined){case this.$behaviours:this.$behaviours={};case this.$behaviours[a]:this.$behaviours[a]={}}this.$behaviours[a][b]=c},this.addBehaviours=function(a){for(var b in a)for(var c in a[b])this.add(b,c,a[b][c])},this.remove=function(a){this.$behaviours&&this.$behaviours[a]&&delete this.$behaviours[a]},this.inherit=function(a,b){if(typeof a=="function")var c=(new a).getBehaviours(b);else var c=a.getBehaviours(b);this.addBehaviours(c)},this.getBehaviours=function(a){if(!a)return this.$behaviours;var b={};for(var c=0;c<a.length;c++)this.$behaviours[a[c]]&&(b[a[c]]=this.$behaviours[a[c]]);return b}})).call(d.prototype),b.Behaviour=d}),define("ace/unicode",["require","exports","module"],function(a,b,c){function d(a){var c=/\w{4}/g;for(var d in a)b.packages[d]=a[d].replace(c,"\\u$&")}"use strict",b.packages={},d({L:"0041-005A0061-007A00AA00B500BA00C0-00D600D8-00F600F8-02C102C6-02D102E0-02E402EC02EE0370-037403760377037A-037D03860388-038A038C038E-03A103A3-03F503F7-0481048A-05250531-055605590561-058705D0-05EA05F0-05F20621-064A066E066F0671-06D306D506E506E606EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA07F407F507FA0800-0815081A082408280904-0939093D09500958-0961097109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E460E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EC60EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10A0-10C510D0-10FA10FC1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317D717DC1820-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541AA71B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C7D1CE9-1CEC1CEE-1CF11D00-1DBF1E00-1F151F18-1F1D1F20-1F451F48-1F4D1F50-1F571F591F5B1F5D1F5F-1F7D1F80-1FB41FB6-1FBC1FBE1FC2-1FC41FC6-1FCC1FD0-1FD31FD6-1FDB1FE0-1FEC1FF2-1FF41FF6-1FFC2071207F2090-209421022107210A-211321152119-211D212421262128212A-212D212F-2139213C-213F2145-2149214E218321842C00-2C2E2C30-2C5E2C60-2CE42CEB-2CEE2D00-2D252D30-2D652D6F2D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE2E2F300530063031-3035303B303C3041-3096309D-309F30A1-30FA30FC-30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A48CA4D0-A4FDA500-A60CA610-A61FA62AA62BA640-A65FA662-A66EA67F-A697A6A0-A6E5A717-A71FA722-A788A78BA78CA7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2A9CFAA00-AA28AA40-AA42AA44-AA4BAA60-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADB-AADDABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB00-FB06FB13-FB17FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF21-FF3AFF41-FF5AFF66-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",Ll:"0061-007A00AA00B500BA00DF-00F600F8-00FF01010103010501070109010B010D010F01110113011501170119011B011D011F01210123012501270129012B012D012F01310133013501370138013A013C013E014001420144014601480149014B014D014F01510153015501570159015B015D015F01610163016501670169016B016D016F0171017301750177017A017C017E-0180018301850188018C018D019201950199-019B019E01A101A301A501A801AA01AB01AD01B001B401B601B901BA01BD-01BF01C601C901CC01CE01D001D201D401D601D801DA01DC01DD01DF01E101E301E501E701E901EB01ED01EF01F001F301F501F901FB01FD01FF02010203020502070209020B020D020F02110213021502170219021B021D021F02210223022502270229022B022D022F02310233-0239023C023F0240024202470249024B024D024F-02930295-02AF037103730377037B-037D039003AC-03CE03D003D103D5-03D703D903DB03DD03DF03E103E303E503E703E903EB03ED03EF-03F303F503F803FB03FC0430-045F04610463046504670469046B046D046F04710473047504770479047B047D047F0481048B048D048F04910493049504970499049B049D049F04A104A304A504A704A904AB04AD04AF04B104B304B504B704B904BB04BD04BF04C204C404C604C804CA04CC04CE04CF04D104D304D504D704D904DB04DD04DF04E104E304E504E704E904EB04ED04EF04F104F304F504F704F904FB04FD04FF05010503050505070509050B050D050F05110513051505170519051B051D051F0521052305250561-05871D00-1D2B1D62-1D771D79-1D9A1E011E031E051E071E091E0B1E0D1E0F1E111E131E151E171E191E1B1E1D1E1F1E211E231E251E271E291E2B1E2D1E2F1E311E331E351E371E391E3B1E3D1E3F1E411E431E451E471E491E4B1E4D1E4F1E511E531E551E571E591E5B1E5D1E5F1E611E631E651E671E691E6B1E6D1E6F1E711E731E751E771E791E7B1E7D1E7F1E811E831E851E871E891E8B1E8D1E8F1E911E931E95-1E9D1E9F1EA11EA31EA51EA71EA91EAB1EAD1EAF1EB11EB31EB51EB71EB91EBB1EBD1EBF1EC11EC31EC51EC71EC91ECB1ECD1ECF1ED11ED31ED51ED71ED91EDB1EDD1EDF1EE11EE31EE51EE71EE91EEB1EED1EEF1EF11EF31EF51EF71EF91EFB1EFD1EFF-1F071F10-1F151F20-1F271F30-1F371F40-1F451F50-1F571F60-1F671F70-1F7D1F80-1F871F90-1F971FA0-1FA71FB0-1FB41FB61FB71FBE1FC2-1FC41FC61FC71FD0-1FD31FD61FD71FE0-1FE71FF2-1FF41FF61FF7210A210E210F2113212F21342139213C213D2146-2149214E21842C30-2C5E2C612C652C662C682C6A2C6C2C712C732C742C76-2C7C2C812C832C852C872C892C8B2C8D2C8F2C912C932C952C972C992C9B2C9D2C9F2CA12CA32CA52CA72CA92CAB2CAD2CAF2CB12CB32CB52CB72CB92CBB2CBD2CBF2CC12CC32CC52CC72CC92CCB2CCD2CCF2CD12CD32CD52CD72CD92CDB2CDD2CDF2CE12CE32CE42CEC2CEE2D00-2D25A641A643A645A647A649A64BA64DA64FA651A653A655A657A659A65BA65DA65FA663A665A667A669A66BA66DA681A683A685A687A689A68BA68DA68FA691A693A695A697A723A725A727A729A72BA72DA72F-A731A733A735A737A739A73BA73DA73FA741A743A745A747A749A74BA74DA74FA751A753A755A757A759A75BA75DA75FA761A763A765A767A769A76BA76DA76FA771-A778A77AA77CA77FA781A783A785A787A78CFB00-FB06FB13-FB17FF41-FF5A",Lu:"0041-005A00C0-00D600D8-00DE01000102010401060108010A010C010E01100112011401160118011A011C011E01200122012401260128012A012C012E01300132013401360139013B013D013F0141014301450147014A014C014E01500152015401560158015A015C015E01600162016401660168016A016C016E017001720174017601780179017B017D018101820184018601870189-018B018E-0191019301940196-0198019C019D019F01A001A201A401A601A701A901AC01AE01AF01B1-01B301B501B701B801BC01C401C701CA01CD01CF01D101D301D501D701D901DB01DE01E001E201E401E601E801EA01EC01EE01F101F401F6-01F801FA01FC01FE02000202020402060208020A020C020E02100212021402160218021A021C021E02200222022402260228022A022C022E02300232023A023B023D023E02410243-02460248024A024C024E03700372037603860388-038A038C038E038F0391-03A103A3-03AB03CF03D2-03D403D803DA03DC03DE03E003E203E403E603E803EA03EC03EE03F403F703F903FA03FD-042F04600462046404660468046A046C046E04700472047404760478047A047C047E0480048A048C048E04900492049404960498049A049C049E04A004A204A404A604A804AA04AC04AE04B004B204B404B604B804BA04BC04BE04C004C104C304C504C704C904CB04CD04D004D204D404D604D804DA04DC04DE04E004E204E404E604E804EA04EC04EE04F004F204F404F604F804FA04FC04FE05000502050405060508050A050C050E05100512051405160518051A051C051E0520052205240531-055610A0-10C51E001E021E041E061E081E0A1E0C1E0E1E101E121E141E161E181E1A1E1C1E1E1E201E221E241E261E281E2A1E2C1E2E1E301E321E341E361E381E3A1E3C1E3E1E401E421E441E461E481E4A1E4C1E4E1E501E521E541E561E581E5A1E5C1E5E1E601E621E641E661E681E6A1E6C1E6E1E701E721E741E761E781E7A1E7C1E7E1E801E821E841E861E881E8A1E8C1E8E1E901E921E941E9E1EA01EA21EA41EA61EA81EAA1EAC1EAE1EB01EB21EB41EB61EB81EBA1EBC1EBE1EC01EC21EC41EC61EC81ECA1ECC1ECE1ED01ED21ED41ED61ED81EDA1EDC1EDE1EE01EE21EE41EE61EE81EEA1EEC1EEE1EF01EF21EF41EF61EF81EFA1EFC1EFE1F08-1F0F1F18-1F1D1F28-1F2F1F38-1F3F1F48-1F4D1F591F5B1F5D1F5F1F68-1F6F1FB8-1FBB1FC8-1FCB1FD8-1FDB1FE8-1FEC1FF8-1FFB21022107210B-210D2110-211221152119-211D212421262128212A-212D2130-2133213E213F214521832C00-2C2E2C602C62-2C642C672C692C6B2C6D-2C702C722C752C7E-2C802C822C842C862C882C8A2C8C2C8E2C902C922C942C962C982C9A2C9C2C9E2CA02CA22CA42CA62CA82CAA2CAC2CAE2CB02CB22CB42CB62CB82CBA2CBC2CBE2CC02CC22CC42CC62CC82CCA2CCC2CCE2CD02CD22CD42CD62CD82CDA2CDC2CDE2CE02CE22CEB2CEDA640A642A644A646A648A64AA64CA64EA650A652A654A656A658A65AA65CA65EA662A664A666A668A66AA66CA680A682A684A686A688A68AA68CA68EA690A692A694A696A722A724A726A728A72AA72CA72EA732A734A736A738A73AA73CA73EA740A742A744A746A748A74AA74CA74EA750A752A754A756A758A75AA75CA75EA760A762A764A766A768A76AA76CA76EA779A77BA77DA77EA780A782A784A786A78BFF21-FF3A",Lt:"01C501C801CB01F21F88-1F8F1F98-1F9F1FA8-1FAF1FBC1FCC1FFC",Lm:"02B0-02C102C6-02D102E0-02E402EC02EE0374037A0559064006E506E607F407F507FA081A0824082809710E460EC610FC17D718431AA71C78-1C7D1D2C-1D611D781D9B-1DBF2071207F2090-20942C7D2D6F2E2F30053031-3035303B309D309E30FC-30FEA015A4F8-A4FDA60CA67FA717-A71FA770A788A9CFAA70AADDFF70FF9EFF9F",Lo:"01BB01C0-01C3029405D0-05EA05F0-05F20621-063F0641-064A066E066F0671-06D306D506EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA0800-08150904-0939093D09500958-096109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E450E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10D0-10FA1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317DC1820-18421844-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C771CE9-1CEC1CEE-1CF12135-21382D30-2D652D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE3006303C3041-3096309F30A1-30FA30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A014A016-A48CA4D0-A4F7A500-A60BA610-A61FA62AA62BA66EA6A0-A6E5A7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2AA00-AA28AA40-AA42AA44-AA4BAA60-AA6FAA71-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADBAADCABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF66-FF6FFF71-FF9DFFA0-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",M:"0300-036F0483-04890591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DE-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0903093C093E-094E0951-0955096209630981-098309BC09BE-09C409C709C809CB-09CD09D709E209E30A01-0A030A3C0A3E-0A420A470A480A4B-0A4D0A510A700A710A750A81-0A830ABC0ABE-0AC50AC7-0AC90ACB-0ACD0AE20AE30B01-0B030B3C0B3E-0B440B470B480B4B-0B4D0B560B570B620B630B820BBE-0BC20BC6-0BC80BCA-0BCD0BD70C01-0C030C3E-0C440C46-0C480C4A-0C4D0C550C560C620C630C820C830CBC0CBE-0CC40CC6-0CC80CCA-0CCD0CD50CD60CE20CE30D020D030D3E-0D440D46-0D480D4A-0D4D0D570D620D630D820D830DCA0DCF-0DD40DD60DD8-0DDF0DF20DF30E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F3E0F3F0F71-0F840F860F870F90-0F970F99-0FBC0FC6102B-103E1056-1059105E-10601062-10641067-106D1071-10741082-108D108F109A-109D135F1712-17141732-1734175217531772177317B6-17D317DD180B-180D18A91920-192B1930-193B19B0-19C019C819C91A17-1A1B1A55-1A5E1A60-1A7C1A7F1B00-1B041B34-1B441B6B-1B731B80-1B821BA1-1BAA1C24-1C371CD0-1CD21CD4-1CE81CED1CF21DC0-1DE61DFD-1DFF20D0-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66F-A672A67CA67DA6F0A6F1A802A806A80BA823-A827A880A881A8B4-A8C4A8E0-A8F1A926-A92DA947-A953A980-A983A9B3-A9C0AA29-AA36AA43AA4CAA4DAA7BAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE3-ABEAABECABEDFB1EFE00-FE0FFE20-FE26",Mn:"0300-036F0483-04870591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DF-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0902093C0941-0948094D0951-095509620963098109BC09C1-09C409CD09E209E30A010A020A3C0A410A420A470A480A4B-0A4D0A510A700A710A750A810A820ABC0AC1-0AC50AC70AC80ACD0AE20AE30B010B3C0B3F0B41-0B440B4D0B560B620B630B820BC00BCD0C3E-0C400C46-0C480C4A-0C4D0C550C560C620C630CBC0CBF0CC60CCC0CCD0CE20CE30D41-0D440D4D0D620D630DCA0DD2-0DD40DD60E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F71-0F7E0F80-0F840F860F870F90-0F970F99-0FBC0FC6102D-10301032-10371039103A103D103E10581059105E-10601071-1074108210851086108D109D135F1712-17141732-1734175217531772177317B7-17BD17C617C9-17D317DD180B-180D18A91920-19221927192819321939-193B1A171A181A561A58-1A5E1A601A621A65-1A6C1A73-1A7C1A7F1B00-1B031B341B36-1B3A1B3C1B421B6B-1B731B801B811BA2-1BA51BA81BA91C2C-1C331C361C371CD0-1CD21CD4-1CE01CE2-1CE81CED1DC0-1DE61DFD-1DFF20D0-20DC20E120E5-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66FA67CA67DA6F0A6F1A802A806A80BA825A826A8C4A8E0-A8F1A926-A92DA947-A951A980-A982A9B3A9B6-A9B9A9BCAA29-AA2EAA31AA32AA35AA36AA43AA4CAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE5ABE8ABEDFB1EFE00-FE0FFE20-FE26",Mc:"0903093E-09400949-094C094E0982098309BE-09C009C709C809CB09CC09D70A030A3E-0A400A830ABE-0AC00AC90ACB0ACC0B020B030B3E0B400B470B480B4B0B4C0B570BBE0BBF0BC10BC20BC6-0BC80BCA-0BCC0BD70C01-0C030C41-0C440C820C830CBE0CC0-0CC40CC70CC80CCA0CCB0CD50CD60D020D030D3E-0D400D46-0D480D4A-0D4C0D570D820D830DCF-0DD10DD8-0DDF0DF20DF30F3E0F3F0F7F102B102C10311038103B103C105610571062-10641067-106D108310841087-108C108F109A-109C17B617BE-17C517C717C81923-19261929-192B193019311933-193819B0-19C019C819C91A19-1A1B1A551A571A611A631A641A6D-1A721B041B351B3B1B3D-1B411B431B441B821BA11BA61BA71BAA1C24-1C2B1C341C351CE11CF2A823A824A827A880A881A8B4-A8C3A952A953A983A9B4A9B5A9BAA9BBA9BD-A9C0AA2FAA30AA33AA34AA4DAA7BABE3ABE4ABE6ABE7ABE9ABEAABEC",Me:"0488048906DE20DD-20E020E2-20E4A670-A672",N:"0030-003900B200B300B900BC-00BE0660-066906F0-06F907C0-07C90966-096F09E6-09EF09F4-09F90A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BF20C66-0C6F0C78-0C7E0CE6-0CEF0D66-0D750E50-0E590ED0-0ED90F20-0F331040-10491090-10991369-137C16EE-16F017E0-17E917F0-17F91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C5920702074-20792080-20892150-21822185-21892460-249B24EA-24FF2776-27932CFD30073021-30293038-303A3192-31953220-32293251-325F3280-328932B1-32BFA620-A629A6E6-A6EFA830-A835A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",Nd:"0030-00390660-066906F0-06F907C0-07C90966-096F09E6-09EF0A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BEF0C66-0C6F0CE6-0CEF0D66-0D6F0E50-0E590ED0-0ED90F20-0F291040-10491090-109917E0-17E91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C59A620-A629A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",Nl:"16EE-16F02160-21822185-218830073021-30293038-303AA6E6-A6EF",No:"00B200B300B900BC-00BE09F4-09F90BF0-0BF20C78-0C7E0D70-0D750F2A-0F331369-137C17F0-17F920702074-20792080-20892150-215F21892460-249B24EA-24FF2776-27932CFD3192-31953220-32293251-325F3280-328932B1-32BFA830-A835",P:"0021-00230025-002A002C-002F003A003B003F0040005B-005D005F007B007D00A100AB00B700BB00BF037E0387055A-055F0589058A05BE05C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F3A-0F3D0F850FD0-0FD4104A-104F10FB1361-13681400166D166E169B169C16EB-16ED1735173617D4-17D617D8-17DA1800-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD32010-20272030-20432045-20512053-205E207D207E208D208E2329232A2768-277527C527C627E6-27EF2983-299829D8-29DB29FC29FD2CF9-2CFC2CFE2CFF2E00-2E2E2E302E313001-30033008-30113014-301F3030303D30A030FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFD3EFD3FFE10-FE19FE30-FE52FE54-FE61FE63FE68FE6AFE6BFF01-FF03FF05-FF0AFF0C-FF0FFF1AFF1BFF1FFF20FF3B-FF3DFF3FFF5BFF5DFF5F-FF65",Pd:"002D058A05BE140018062010-20152E172E1A301C303030A0FE31FE32FE58FE63FF0D",Ps:"0028005B007B0F3A0F3C169B201A201E2045207D208D23292768276A276C276E27702772277427C527E627E827EA27EC27EE2983298529872989298B298D298F299129932995299729D829DA29FC2E222E242E262E283008300A300C300E3010301430163018301A301DFD3EFE17FE35FE37FE39FE3BFE3DFE3FFE41FE43FE47FE59FE5BFE5DFF08FF3BFF5BFF5FFF62",Pe:"0029005D007D0F3B0F3D169C2046207E208E232A2769276B276D276F27712773277527C627E727E927EB27ED27EF298429862988298A298C298E2990299229942996299829D929DB29FD2E232E252E272E293009300B300D300F3011301530173019301B301E301FFD3FFE18FE36FE38FE3AFE3CFE3EFE40FE42FE44FE48FE5AFE5CFE5EFF09FF3DFF5DFF60FF63",Pi:"00AB2018201B201C201F20392E022E042E092E0C2E1C2E20",Pf:"00BB2019201D203A2E032E052E0A2E0D2E1D2E21",Pc:"005F203F20402054FE33FE34FE4D-FE4FFF3F",Po:"0021-00230025-0027002A002C002E002F003A003B003F0040005C00A100B700BF037E0387055A-055F058905C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F850FD0-0FD4104A-104F10FB1361-1368166D166E16EB-16ED1735173617D4-17D617D8-17DA1800-18051807-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD3201620172020-20272030-2038203B-203E2041-20432047-205120532055-205E2CF9-2CFC2CFE2CFF2E002E012E06-2E082E0B2E0E-2E162E182E192E1B2E1E2E1F2E2A-2E2E2E302E313001-3003303D30FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFE10-FE16FE19FE30FE45FE46FE49-FE4CFE50-FE52FE54-FE57FE5F-FE61FE68FE6AFE6BFF01-FF03FF05-FF07FF0AFF0CFF0EFF0FFF1AFF1BFF1FFF20FF3CFF61FF64FF65",S:"0024002B003C-003E005E0060007C007E00A2-00A900AC00AE-00B100B400B600B800D700F702C2-02C502D2-02DF02E5-02EB02ED02EF-02FF03750384038503F604820606-0608060B060E060F06E906FD06FE07F609F209F309FA09FB0AF10B700BF3-0BFA0C7F0CF10CF20D790E3F0F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-139917DB194019E0-19FF1B61-1B6A1B74-1B7C1FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE20442052207A-207C208A-208C20A0-20B8210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B2140-2144214A-214D214F2190-2328232B-23E82400-24262440-244A249C-24E92500-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE27C0-27C427C7-27CA27CC27D0-27E527F0-29822999-29D729DC-29FB29FE-2B4C2B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F309B309C319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A700-A716A720A721A789A78AA828-A82BA836-A839AA77-AA79FB29FDFCFDFDFE62FE64-FE66FE69FF04FF0BFF1C-FF1EFF3EFF40FF5CFF5EFFE0-FFE6FFE8-FFEEFFFCFFFD",Sm:"002B003C-003E007C007E00AC00B100D700F703F60606-060820442052207A-207C208A-208C2140-2144214B2190-2194219A219B21A021A321A621AE21CE21CF21D221D421F4-22FF2308-230B23202321237C239B-23B323DC-23E125B725C125F8-25FF266F27C0-27C427C7-27CA27CC27D0-27E527F0-27FF2900-29822999-29D729DC-29FB29FE-2AFF2B30-2B442B47-2B4CFB29FE62FE64-FE66FF0BFF1C-FF1EFF5CFF5EFFE2FFE9-FFEC",Sc:"002400A2-00A5060B09F209F309FB0AF10BF90E3F17DB20A0-20B8A838FDFCFE69FF04FFE0FFE1FFE5FFE6",Sk:"005E006000A800AF00B400B802C2-02C502D2-02DF02E5-02EB02ED02EF-02FF0375038403851FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE309B309CA700-A716A720A721A789A78AFF3EFF40FFE3",So:"00A600A700A900AE00B000B60482060E060F06E906FD06FE07F609FA0B700BF3-0BF80BFA0C7F0CF10CF20D790F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-1399194019E0-19FF1B61-1B6A1B74-1B7C210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B214A214C214D214F2195-2199219C-219F21A121A221A421A521A7-21AD21AF-21CD21D021D121D321D5-21F32300-2307230C-231F2322-2328232B-237B237D-239A23B4-23DB23E2-23E82400-24262440-244A249C-24E92500-25B625B8-25C025C2-25F72600-266E2670-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE2800-28FF2B00-2B2F2B452B462B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A828-A82BA836A837A839AA77-AA79FDFDFFE4FFE8FFEDFFEEFFFCFFFD",Z:"002000A01680180E2000-200A20282029202F205F3000",Zs:"002000A01680180E2000-200A202F205F3000",Zl:"2028",Zp:"2029",C:"0000-001F007F-009F00AD03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-0605061C061D0620065F06DD070E070F074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17B417B517DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF200B-200F202A-202E2060-206F20722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-F8FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFD-FF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFFBFFFEFFFF",Cc:"0000-001F007F-009F",Cf:"00AD0600-060306DD070F17B417B5200B-200F202A-202E2060-2064206A-206FFEFFFFF9-FFFB",Co:"E000-F8FF",Cs:"D800-DFFF",Cn:"03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-05FF06040605061C061D0620065F070E074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF2065-206920722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-D7FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFDFEFEFF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFF8FFFEFFFF"})}),define("ace/document",["require","exports","module","ace/lib/oop","ace/lib/event_emitter","ace/range","ace/anchor"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/event_emitter").EventEmitter,f=a("./range").Range,g=a("./anchor").Anchor,h=function(a){this.$lines=[],Array.isArray(a)?this.insertLines(0,a):a.length==0?this.$lines=[""]:this.insert({row:0,column:0},a)};((function(){d.implement(this,e),this.setValue=function(a){var b=this.getLength();this.remove(new f(0,0,b,this.getLine(b-1).length)),this.insert({row:0,column:0},a)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(a,b){return new g(this,a,b)},"aaa".split(/a/).length==0?this.$split=function(a){return a.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(a){return a.split(/\r\n|\r|\n/)},this.$detectNewLine=function(a){var b=a.match(/^.*?(\r\n|\r|\n)/m);b?this.$autoNewLine=b[1]:this.$autoNewLine="\n"},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";case"auto":return this.$autoNewLine}},this.$autoNewLine="\n",this.$newLineMode="auto",this.setNewLineMode=function(a){if(this.$newLineMode===a)return;this.$newLineMode=a},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(a){return a=="\r\n"||a=="\r"||a=="\n"},this.getLine=function(a){return this.$lines[a]||""},this.getLines=function(a,b){return this.$lines.slice(a,b+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(a){if(a.start.row==a.end.row)return this.$lines[a.start.row].substring(a.start.column,a.end.column);var b=[];return b.push(this.$lines[a.start.row].substring(a.start.column)),b.push.apply(b,this.getLines(a.start.row+1,a.end.row-1)),b.push(this.$lines[a.end.row].substring(0,a.end.column)),b.join(this.getNewLineCharacter())},this.$clipPosition=function(a){var b=this.getLength();return a.row>=b&&(a.row=Math.max(0,b-1),a.column=this.getLine(b-1).length),a},this.insert=function(a,b){if(b.length==0)return a;a=this.$clipPosition(a),this.getLength()<=1&&this.$detectNewLine(b);var c=this.$split(b),d=c.splice(0,1)[0],e=c.length==0?null:c.splice(c.length-1,1)[0];return a=this.insertInLine(a,d),e!==null&&(a=this.insertNewLine(a),a=this.insertLines(a.row,c),a=this.insertInLine(a,e||"")),a},this.insertLines=function(a,b){if(b.length==0)return{row:a,column:0};var c=[a,0];c.push.apply(c,b),this.$lines.splice.apply(this.$lines,c);var d=new f(a,0,a+b.length,0),e={action:"insertLines",range:d,lines:b};return this._emit("change",{data:e}),d.end},this.insertNewLine=function(a){a=this.$clipPosition(a);var b=this.$lines[a.row]||"";this.$lines[a.row]=b.substring(0,a.column),this.$lines.splice(a.row+1,0,b.substring(a.column,b.length));var c={row:a.row+1,column:0},d={action:"insertText",range:f.fromPoints(a,c),text:this.getNewLineCharacter()};return this._emit("change",{data:d}),c},this.insertInLine=function(a,b){if(b.length==0)return a;var c=this.$lines[a.row]||"";this.$lines[a.row]=c.substring(0,a.column)+b+c.substring(a.column);var d={row:a.row,column:a.column+b.length},e={action:"insertText",range:f.fromPoints(a,d),text:b};return this._emit("change",{data:e}),d},this.remove=function(a){a.start=this.$clipPosition(a.start),a.end=this.$clipPosition(a.end);if(a.isEmpty())return a.start;var b=a.start.row,c=a.end.row;if(a.isMultiLine()){var d=a.start.column==0?b:b+1,e=c-1;a.end.column>0&&this.removeInLine(c,0,a.end.column),e>=d&&this.removeLines(d,e),d!=b&&(this.removeInLine(b,a.start.column,this.getLine(b).length),this.removeNewLine(a.start.row))}else this.removeInLine(b,a.start.column,a.end.column);return a.start},this.removeInLine=function(a,b,c){if(b==c)return;var d=new f(a,b,a,c),e=this.getLine(a),g=e.substring(b,c),h=e.substring(0,b)+e.substring(c,e.length);this.$lines.splice(a,1,h);var i={action:"removeText",range:d,text:g};return this._emit("change",{data:i}),d.start},this.removeLines=function(a,b){var c=new f(a,0,b+1,0),d=this.$lines.splice(a,b-a+1),e={action:"removeLines",range:c,nl:this.getNewLineCharacter(),lines:d};return this._emit("change",{data:e}),d},this.removeNewLine=function(a){var b=this.getLine(a),c=this.getLine(a+1),d=new f(a,b.length,a+1,0),e=b+c;this.$lines.splice(a,2,e);var g={action:"removeText",range:d,text:this.getNewLineCharacter()};this._emit("change",{data:g})},this.replace=function(a,b){if(b.length==0&&a.isEmpty())return a.start;if(b==this.getTextRange(a))return a.end;this.remove(a);if(b)var c=this.insert(a.start,b);else c=a.start;return c},this.applyDeltas=function(a){for(var b=0;b<a.length;b++){var c=a[b],d=f.fromPoints(c.range.start,c.range.end);c.action=="insertLines"?this.insertLines(d.start.row,c.lines):c.action=="insertText"?this.insert(d.start,c.text):c.action=="removeLines"?this.removeLines(d.start.row,d.end.row-1):c.action=="removeText"&&this.remove(d)}},this.revertDeltas=function(a){for(var b=a.length-1;b>=0;b--){var c=a[b],d=f.fromPoints(c.range.start,c.range.end);c.action=="insertLines"?this.removeLines(d.start.row,d.end.row-1):c.action=="insertText"?this.remove(d):c.action=="removeLines"?this.insertLines(d.start.row,c.lines):c.action=="removeText"&&this.insert(d.start,c.text)}}})).call(h.prototype),b.Document=h}),define("ace/anchor",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/event_emitter").EventEmitter,f=b.Anchor=function(a,b,c){this.document=a,typeof c=="undefined"?this.setPosition(b.row,b.column):this.setPosition(b,c),this.$onChange=this.onChange.bind(this),a.on("change",this.$onChange)};((function(){d.implement(this,e),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.onChange=function(a){var b=a.data,c=b.range;if(c.start.row==c.end.row&&c.start.row!=this.row)return;if(c.start.row>this.row)return;if(c.start.row==this.row&&c.start.column>this.column)return;var d=this.row,e=this.column;b.action==="insertText"?c.start.row===d&&c.start.column<=e?c.start.row===c.end.row?e+=c.end.column-c.start.column:(e-=c.start.column,d+=c.end.row-c.start.row):c.start.row!==c.end.row&&c.start.row<d&&(d+=c.end.row-c.start.row):b.action==="insertLines"?c.start.row<=d&&(d+=c.end.row-c.start.row):b.action=="removeText"?c.start.row==d&&c.start.column<e?c.end.column>=e?e=c.start.column:e=Math.max(0,e-(c.end.column-c.start.column)):c.start.row!==c.end.row&&c.start.row<d?(c.end.row==d&&(e=Math.max(0,e-c.end.column)+c.start.column),d-=c.end.row-c.start.row):c.end.row==d&&(d-=c.end.row-c.start.row,e=Math.max(0,e-c.end.column)+c.start.column):b.action=="removeLines"&&c.start.row<=d&&(c.end.row<=d?d-=c.end.row-c.start.row:(d=c.start.row,e=0)),this.setPosition(d,e,!0)},this.setPosition=function(a,b,c){var d;c?d={row:a,column:b}:d=this.$clipPositionToDocument(a,b);if(this.row==d.row&&this.column==d.column)return;var e={row:this.row,column:this.column};this.row=d.row,this.column=d.column,this._emit("change",{old:e,value:d})},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.$clipPositionToDocument=function(a,b){var c={};return a>=this.document.getLength()?(c.row=Math.max(0,this.document.getLength()-1),c.column=this.document.getLine(c.row).length):a<0?(c.row=0,c.column=0):(c.row=a,c.column=Math.min(this.document.getLine(c.row).length,Math.max(0,b))),b<0&&(c.column=0),c}})).call(f.prototype)}),define("ace/background_tokenizer",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/event_emitter").EventEmitter,f=function(a,b){this.running=!1,this.lines=[],this.currentLine=0,this.tokenizer=a;var c=this;this.$worker=function(){if(!c.running)return;var a=new Date,b=c.currentLine,d=c.doc,e=0,f=d.getLength();while(c.currentLine<f){c.lines[c.currentLine]=c.$tokenizeRows(c.currentLine,c.currentLine)[0],c.currentLine++,e+=1;if(e%5==0&&new Date-a>20){c.fireUpdateEvent(b,c.currentLine-1),c.running=setTimeout(c.$worker,20);return}}c.running=!1,c.fireUpdateEvent(b,f-1)}};((function(){d.implement(this,e),this.setTokenizer=function(a){this.tokenizer=a,this.lines=[],this.start(0)},this.setDocument=function(a){this.doc=a,this.lines=[],this.stop()},this.fireUpdateEvent=function(a,b){var c={first:a,last:b};this._emit("update",{data:c})},this.start=function(a){this.currentLine=Math.min(a||0,this.currentLine,this.doc.getLength()),this.lines.splice(this.currentLine,this.lines.length),this.stop(),this.running=setTimeout(this.$worker,700)},this.stop=function(){this.running&&clearTimeout(this.running),this.running=!1},this.getTokens=function(a,b){return this.$tokenizeRows(a,b)},this.getState=function(a){return this.$tokenizeRows(a,a)[0].state},this.$tokenizeRows=function(a,b){if(!this.doc||isNaN(a)||isNaN(b))return[{state:"start",tokens:[]}];var c=[],d="start",e=!1;a>0&&this.lines[a-1]?(d=this.lines[a-1].state,e=!0):a==0?(d="start",e=!0):this.lines.length>0&&(d=this.lines[this.lines.length-1].state);var f=this.doc.getLines(a,b);for(var g=a;g<=b;g++)if(!this.lines[g]){var h=this.tokenizer.getLineTokens(f[g-a]||"",d),d=h.state;c.push(h),e&&(this.lines[g]=h)}else{var h=this.lines[g];d=h.state,c.push(h)}return c}})).call(f.prototype),b.BackgroundTokenizer=f}),define("ace/edit_session/folding",["require","exports","module","ace/range","ace/edit_session/fold_line","ace/edit_session/fold","ace/token_iterator"],function(a,b,c){function h(){this.getFoldAt=function(a,b,c){var d=this.getFoldLine(a);if(!d)return null;var e=d.folds;for(var f=0;f<e.length;f++){var g=e[f];if(g.range.contains(a,b)){if(c==1&&g.range.isEnd(a,b))continue;if(c==-1&&g.range.isStart(a,b))continue;return g}}},this.getFoldsInRange=function(a){a=a.clone();var b=a.start,c=a.end,d=this.$foldData,e=[];b.column+=1,c.column-=1;for(var f=0;f<d.length;f++){var g=d[f].range.compareRange(a);if(g==2)continue;if(g==-2)break;var h=d[f].folds;for(var i=0;i<h.length;i++){var j=h[i];g=j.range.compareRange(a);if(g==-2)break;if(g==2)continue;if(g==42)break;e.push(j)}}return e},this.getAllFolds=function(){function c(b){a.push(b);if(!b.subFolds)return;for(var d=0;d<b.subFolds.length;d++)c(b.subFolds[d])}var a=[],b=this.$foldData;for(var d=0;d<b.length;d++)for(var e=0;e<b[d].folds.length;e++)c(b[d].folds[e]);return a},this.getFoldStringAt=function(a,b,c,d){d=d||this.getFoldLine(a);if(!d)return null;var e={end:{column:0}},f,g;for(var h=0;h<d.folds.length;h++){g=d.folds[h];var i=g.range.compareEnd(a,b);if(i==-1){f=this.getLine(g.start.row).substring(e.end.column,g.start.column);break}if(i===0)return null;e=g}return f||(f=this.getLine(g.start.row).substring(e.end.column)),c==-1?f.substring(0,b-e.end.column):c==1?f.substring(b-e.end.column):f},this.getFoldLine=function(a,b){var c=this.$foldData,d=0;b&&(d=c.indexOf(b)),d==-1&&(d=0);for(d;d<c.length;d++){var e=c[d];if(e.start.row<=a&&e.end.row>=a)return e;if(e.end.row>a)return null}return null},this.getNextFoldLine=function(a,b){var c=this.$foldData,d=0;b&&(d=c.indexOf(b)),d==-1&&(d=0);for(d;d<c.length;d++){var e=c[d];if(e.end.row>=a)return e}return null},this.getFoldedRowCount=function(a,b){var c=this.$foldData,d=b-a+1;for(var e=0;e<c.length;e++){var f=c[e],g=f.end.row,h=f.start.row;if(g>=b){h<b&&(h>=a?d-=b-h:d=0);break}g>=a&&(h>=a?d-=g-h:d-=g-a+1)}return d},this.$addFoldLine=function(a){return this.$foldData.push(a),this.$foldData.sort(function(a,b){return a.start.row-b.start.row}),a},this.addFold=function(a,b){var c=this.$foldData,d=!1,g;a instanceof f?g=a:g=new f(b,a),this.$clipRangeToDocument(g.range);var h=g.start.row,i=g.start.column,j=g.end.row,k=g.end.column;if(g.placeholder.length<2)throw"Placeholder has to be at least 2 characters";if(h==j&&k-i<2)throw"The range has to be at least 2 characters width";var l=this.getFoldAt(h,i,1),m=this.getFoldAt(j,k,-1);if(l&&m==l)return l.addSubFold(g);if(l&&!l.range.isStart(h,i)||m&&!m.range.isEnd(j,k))throw"A fold can't intersect already existing fold"+g.range+l.range;var n=this.getFoldsInRange(g.range);n.length>0&&(this.removeFolds(n),g.subFolds=n);for(var o=0;o<c.length;o++){var p=c[o];if(j==p.start.row){p.addFold(g),d=!0;break}if(h==p.end.row){p.addFold(g),d=!0;if(!g.sameRow){var q=c[o+1];if(q&&q.start.row==j){p.merge(q);break}}break}if(j<=p.start.row)break}return d||(p=this.$addFoldLine(new e(this.$foldData,g))),this.$useWrapMode&&this.$updateWrapData(p.start.row,p.start.row),this.$modified=!0,this._emit("changeFold",{data:g}),g},this.addFolds=function(a){a.forEach(function(a){this.addFold(a)},this)},this.removeFold=function(a){var b=a.foldLine,c=b.start.row,d=b.end.row,e=this.$foldData,f=b.folds;if(f.length==1)e.splice(e.indexOf(b),1);else if(b.range.isEnd(a.end.row,a.end.column))f.pop(),b.end.row=f[f.length-1].end.row,b.end.column=f[f.length-1].end.column;else if(b.range.isStart(a.start.row,a.start.column))f.shift(),b.start.row=f[0].start.row,b.start.column=f[0].start.column;else if(a.sameRow)f.splice(f.indexOf(a),1);else{var g=b.split(a.start.row,a.start.column);f=g.folds,f.shift(),g.start.row=f[0].start.row,g.start.column=f[0].start.column}this.$useWrapMode&&this.$updateWrapData(c,d),this.$modified=!0,this._emit("changeFold",{data:a})},this.removeFolds=function(a){var b=[];for(var c=0;c<a.length;c++)b.push(a[c]);b.forEach(function(a){this.removeFold(a)},this),this.$modified=!0},this.expandFold=function(a){this.removeFold(a),a.subFolds.forEach(function(a){this.addFold(a)},this),a.subFolds=[]},this.expandFolds=function(a){a.forEach(function(a){this.expandFold(a)},this)},this.unfold=function(a,b){var c,e;a==null?c=new d(0,0,this.getLength(),0):typeof a=="number"?c=new d(a,0,a,this.getLine(a).length):"row"in a?c=d.fromPoints(a,a):c=a,e=this.getFoldsInRange(c);if(b)this.removeFolds(e);else while(e.length)this.expandFolds(e),e=this.getFoldsInRange(c)},this.isRowFolded=function(a,b){return!!this.getFoldLine(a,b)},this.getRowFoldEnd=function(a,b){var c=this.getFoldLine(a,b);return c?c.end.row:a},this.getFoldDisplayLine=function(a,b,c,d,e){d==null&&(d=a.start.row,e=0),b==null&&(b=a.end.row,c=this.getLine(b).length);var f=this.doc,g="";return a.walk(function(a,b,c,h){if(b<d)return;if(b==d){if(c<e)return;h=Math.max(e,h)}a?g+=a:g+=f.getLine(b).substring(h,c)}.bind(this),b,c),g},this.getDisplayLine=function(a,b,c,d){var e=this.getFoldLine(a);if(!e){var f;return f=this.doc.getLine(a),f.substring(d||0,b||f.length)}return this.getFoldDisplayLine(e,a,b,c,d)},this.$cloneFoldData=function(){var a=[];return a=this.$foldData.map(function(b){var c=b.folds.map(function(a){return a.clone()});return new e(a,c)}),a},this.toggleFold=function(a){var b=this.selection,c=b.getRange(),d,e;if(c.isEmpty()){var f=c.start;d=this.getFoldAt(f.row,f.column);if(d){this.expandFold(d);return}(e=this.findMatchingBracket(f))?c.comparePoint(e)==1?c.end=e:(c.start=e,c.start.column++,c.end.column--):(e=this.findMatchingBracket({row:f.row,column:f.column+1}))?(c.comparePoint(e)==1?c.end=e:c.start=e,c.start.column++):c=this.getCommentFoldRange(f.row,f.column)||c}else{var g=this.getFoldsInRange(c);if(a&&g.length){this.expandFolds(g);return}g.length==1&&(d=g[0])}d||(d=this.getFoldAt(c.start.row,c.start.column));if(d&&d.range.toString()==c.toString()){this.expandFold(d);return}var h="...";if(!c.isMultiLine()){h=this.getTextRange(c);if(h.length<4)return;h=h.trim().substring(0,2)+".."}this.addFold(h,c)},this.getCommentFoldRange=function(a,b){var c=new g(this,a,b),e=c.getCurrentToken();if(e&&/^comment|string/.test(e.type)){var f=new d,h=new RegExp(e.type.replace(/\..*/,"\\."));do e=c.stepBackward();while(e&&h.test(e.type));c.stepForward(),f.start.row=c.getCurrentTokenRow(),f.start.column=c.getCurrentTokenColumn()+2,c=new g(this,a,b);do e=c.stepForward();while(e&&h.test(e.type));return e=c.stepBackward(),f.end.row=c.getCurrentTokenRow(),f.end.column=c.getCurrentTokenColumn()+e.value.length,f}},this.foldAll=function(a,b){var c=this.foldWidgets;b=b||c.length;for(var d=a||0;d<b;d++){c[d]==null&&(c[d]=this.getFoldWidget(d));if(c[d]!="start")continue;var e=this.getFoldWidgetRange(d);if(e&&e.end.row<b)try{this.addFold("...",e)}catch(f){}}},this.$foldStyles={manual:1,markbegin:1,markbeginend:1},this.$foldStyle="markbegin",this.setFoldStyle=function(a){if(!this.$foldStyles[a])throw new Error("invalid fold style: "+a+"["+Object.keys(this.$foldStyles).join(", ")+"]");if(this.$foldStyle==a)return;this.$foldStyle=a,a=="manual"&&this.unfold();var b=this.$foldMode;this.$setFolding(null),this.$setFolding(b)},this.$setFolding=function(a){if(this.$foldMode==a)return;this.$foldMode=a,this.removeListener("change",this.$updateFoldWidgets),this._emit("changeAnnotation");if(!a||this.$foldStyle=="manual"){this.foldWidgets=null;return}this.foldWidgets=[],this.getFoldWidget=a.getFoldWidget.bind(a,this,this.$foldStyle),this.getFoldWidgetRange=a.getFoldWidgetRange.bind(a,this,this.$foldStyle),this.$updateFoldWidgets=this.updateFoldWidgets.bind(this),this.on("change",this.$updateFoldWidgets)},this.onFoldWidgetClick=function(a,b){var c=this.getFoldWidget(a),d=this.getLine(a),e=b.shiftKey,f=e||b.ctrlKey||b.altKey||b.metaKey,g;c=="end"?g=this.getFoldAt(a,0,-1):g=this.getFoldAt(a,d.length,1);if(g){f?this.removeFold(g):this.expandFold(g);return}var h=this.getFoldWidgetRange(a);if(h){if(!h.isMultiLine()){g=this.getFoldAt(h.start.row,h.start.column,1);if(g&&h.isEequal(g.range)){this.removeFold(g);return}}e||this.addFold("...",h),f&&this.foldAll(h.start.row+1,h.end.row)}else f&&this.foldAll(a+1,this.getLength()),b.target.className+=" invalid"},this.updateFoldWidgets=function(a){var b=a.data,c=b.range,d=c.start.row,e=c.end.row-d;if(e===0)this.foldWidgets[d]=null;else if(b.action=="removeText"||b.action=="removeLines")this.foldWidgets.splice(d,e+1,null);else{var f=Array(e+1);f.unshift(d,1),this.foldWidgets.splice.apply(this.foldWidgets,f)}}}"use strict";var d=a("../range").Range,e=a("./fold_line").FoldLine,f=a("./fold").Fold,g=a("../token_iterator").TokenIterator;b.Folding=h}),define("ace/edit_session/fold_line",["require","exports","module","ace/range"],function(a,b,c){function e(a,b){this.foldData=a,Array.isArray(b)?this.folds=b:b=this.folds=[b];var c=b[b.length-1];this.range=new d(b[0].start.row,b[0].start.column,c.end.row,c.end.column),this.start=this.range.start,this.end=this.range.end,this.folds.forEach(function(a){a.setFoldLine(this)},this)}"use strict";var d=a("../range").Range;((function(){this.shiftRow=function(a){this.start.row+=a,this.end.row+=a,this.folds.forEach(function(b){b.start.row+=a,b.end.row+=a})},this.addFold=function(a){if(a.sameRow){if(a.start.row<this.startRow||a.endRow>this.endRow)throw"Can't add a fold to this FoldLine as it has no connection";this.folds.push(a),this.folds.sort(function(a,b){return-a.range.compareEnd(b.start.row,b.start.column)}),this.range.compareEnd(a.start.row,a.start.column)>0?(this.end.row=a.end.row,this.end.column=a.end.column):this.range.compareStart(a.end.row,a.end.column)<0&&(this.start.row=a.start.row,this.start.column=a.start.column)}else if(a.start.row==this.end.row)this.folds.push(a),this.end.row=a.end.row,this.end.column=a.end.column;else if(a.end.row==this.start.row)this.folds.unshift(a),this.start.row=a.start.row,this.start.column=a.start.column;else throw"Trying to add fold to FoldRow that doesn't have a matching row";a.foldLine=this},this.containsRow=function(a){return a>=this.start.row&&a<=this.end.row},this.walk=function(a,b,c){var d=0,e=this.folds,f,g,h,i=!0;b==null&&(b=this.end.row,c=this.end.column);for(var j=0;j<e.length;j++){f=e[j],g=f.range.compareStart(b,c);if(g==-1){a(null,b,c,d,i);return}h=a(null,f.start.row,f.start.column,d,i),h=!h&&a(f.placeholder,f.start.row,f.start.column,d);if(h||g==0)return;i=!f.sameRow,d=f.end.column}a(null,b,c,d,i)},this.getNextFoldTo=function(a,b){var c,d;for(var e=0;e<this.folds.length;e++){c=this.folds[e],d=c.range.compareEnd(a,b);if(d==-1)return{fold:c,kind:"after"};if(d==0)return{fold:c,kind:"inside"}}return null},this.addRemoveChars=function(a,b,c){var d=this.getNextFoldTo(a,b),e,f;if(d){e=d.fold;if(d.kind=="inside"&&e.start.column!=b&&e.start.row!=a)throw"Moving characters inside of a fold should never be reached";if(e.start.row==a){f=this.folds;var g=f.indexOf(e);g==0&&(this.start.column+=c);for(g;g<f.length;g++){e=f[g],e.start.column+=c;if(!e.sameRow)return;e.end.column+=c}this.end.column+=c}}},this.split=function(a,b){var c=this.getNextFoldTo(a,b).fold,d=this.folds,f=this.foldData;if(!c)return null;var g=d.indexOf(c),h=d[g-1];this.end.row=h.end.row,this.end.column=h.end.column,d=d.splice(g,d.length-g);var i=new e(f,d);return f.splice(f.indexOf(this)+1,0,i),i},this.merge=function(a){var b=a.folds;for(var c=0;c<b.length;c++)this.addFold(b[c]);var d=this.foldData;d.splice(d.indexOf(a),1)},this.toString=function(){var a=[this.range.toString()+": ["];return this.folds.forEach(function(b){a.push("  "+b.toString())}),a.push("]"),a.join("\n")},this.idxToPosition=function(a){var b=0,c;for(var d=0;d<this.folds.length;d++){var c=this.folds[d];a-=c.start.column-b;if(a<0)return{row:c.start.row,column:c.start.column+a};a-=c.placeholder.length;if(a<0)return c.start;b=c.end.column}return{row:this.end.row,column:this.end.column+a}}})).call(e.prototype),b.FoldLine=e}),define("ace/edit_session/fold",["require","exports","module"],function(a,b,c){"use strict";var d=b.Fold=function(a,b){this.foldLine=null,this.placeholder=b,this.range=a,this.start=a.start,this.end=a.end,this.sameRow=a.start.row==a.end.row,this.subFolds=[]};((function(){this.toString=function(){return'"'+this.placeholder+'" '+this.range.toString()},this.setFoldLine=function(a){this.foldLine=a,this.subFolds.forEach(function(b){b.setFoldLine(a)})},this.clone=function(){var a=this.range.clone(),b=new d(a,this.placeholder);return this.subFolds.forEach(function(a){b.subFolds.push(a.clone())}),b},this.addSubFold=function(a){if(this.range.isEequal(a))return this;if(!this.range.containsRange(a))throw"A fold can't intersect already existing fold"+a.range+this.range;var b=a.range.start.row,c=a.range.start.column;for(var d=0,e=-1;d<this.subFolds.length;d++){e=this.subFolds[d].range.compare(b,c);if(e!=1)break}var f=this.subFolds[d];if(e==0)return f.addSubFold(a);var b=a.range.end.row,c=a.range.end.column;for(var g=d,e=-1;g<this.subFolds.length;g++){e=this.subFolds[g].range.compare(b,c);if(e!=1)break}var h=this.subFolds[g];if(e==0)throw"A fold can't intersect already existing fold"+a.range+this.range;var i=this.subFolds.splice(d,g-d,a);return a.setFoldLine(this.foldLine),a}})).call(d.prototype)}),define("ace/token_iterator",["require","exports","module"],function(a,b,c){"use strict";var d=function(a,b,c){this.$session=a,this.$row=b,this.$rowTokens=a.getTokens(b,b)[0].tokens;var d=a.getTokenAt(b,c);this.$tokenIndex=d?d.index:-1};((function(){this.stepBackward=function(){this.$tokenIndex-=1;while(this.$tokenIndex<0){this.$row-=1;if(this.$row<0)return this.$row=0,null;this.$rowTokens=this.$session.getTokens(this.$row,this.$row)[0].tokens,this.$tokenIndex=this.$rowTokens.length-1}return this.$rowTokens[this.$tokenIndex]},this.stepForward=function(){var a=this.$session.getLength();this.$tokenIndex+=1;while(this.$tokenIndex>=this.$rowTokens.length){this.$row+=1;if(this.$row>=a)return this.$row=a-1,null;this.$rowTokens=this.$session.getTokens(this.$row,this.$row)[0].tokens,this.$tokenIndex=0}return this.$rowTokens[this.$tokenIndex]},this.getCurrentToken=function(){return this.$rowTokens[this.$tokenIndex]},this.getCurrentTokenRow=function(){return this.$row},this.getCurrentTokenColumn=function(){var a=this.$rowTokens,b=this.$tokenIndex,c=a[b].start;if(c!==undefined)return c;c=0;while(b>0)b-=1,c+=a[b].value.length;return c}})).call(d.prototype),b.TokenIterator=d}),define("ace/edit_session/bracket_match",["require","exports","module","ace/token_iterator"],function(a,b,c){function e(){this.findMatchingBracket=function(a){if(a.column==0)return null;var b=this.getLine(a.row).charAt(a.column-1);if(b=="")return null;var c=b.match(/([\(\[\{])|([\)\]\}])/);return c?c[1]?this.$findClosingBracket(c[1],a):this.$findOpeningBracket(c[2],a):null},this.$brackets={")":"(","(":")","]":"[","[":"]","{":"}","}":"{"},this.$findOpeningBracket=function(a,b){var c=this.$brackets[a],e=1,f=new d(this,b.row,b.column),g=f.getCurrentToken();if(!g)return null;var h=new RegExp("(\\.?"+g.type.replace(".","|").replace("rparen","lparen|rparen")+")+"),i=b.column-f.getCurrentTokenColumn()-2,j=g.value;for(;;){while(i>=0){var k=j.charAt(i);if(k==c){e-=1;if(e==0)return{row:f.getCurrentTokenRow(),column:i+f.getCurrentTokenColumn()}}else k==a&&(e+=1);i-=1}do g=f.stepBackward();while(g&&!h.test(g.type));if(g==null)break;j=g.value,i=j.length-1}return null},this.$findClosingBracket=function(a,b){var c=this.$brackets[a],e=1,f=new d(this,b.row,b.column),g=f.getCurrentToken();if(!g)return null;var h=new RegExp("(\\.?"+g.type.replace(".","|").replace("lparen","lparen|rparen")+")+"),i=b.column-f.getCurrentTokenColumn();for(;;){var j=g.value,k=j.length;while(i<k){var l=j.charAt(i);if(l==c){e-=1;if(e==0)return{row:f.getCurrentTokenRow(),column:i+f.getCurrentTokenColumn()}}else l==a&&(e+=1);i+=1}do g=f.stepForward();while(g&&!h.test(g.type));if(g==null)break;i=0}return null}}"use strict";var d=a("../token_iterator").TokenIterator;b.BracketMatch=e}),define("ace/search",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/range"],function(a,b,c){"use strict";var d=a("./lib/lang"),e=a("./lib/oop"),f=a("./range").Range,g=function(){this.$options={needle:"",backwards:!1,wrap:!1,caseSensitive:!1,wholeWord:!1,scope:g.ALL,regExp:!1}};g.ALL=1,g.SELECTION=2,function(){this.set=function(a){return e.mixin(this.$options,a),this},this.getOptions=function(){return d.copyObject(this.$options)},this.find=function(a){if(!this.$options.needle)return null;if(this.$options.backwards)var b=this.$backwardMatchIterator(a);else b=this.$forwardMatchIterator(a);var c=null;return b.forEach(function(a){return c=a,!0}),c},this.findAll=function(a){var b=this.$options;if(!b.needle)return[];if(b.backwards)var c=this.$backwardMatchIterator(a);else c=this.$forwardMatchIterator(a);var d=!b.start&&b.wrap&&b.scope==g.ALL;d&&(b.start={row:0,column:0});var e=[];return c.forEach(function(a){e.push(a)}),d&&(b.start=null),e},this.replace=function(a,b){var c=this.$assembleRegExp(),d=c.exec(a);return d&&d[0].length==a.length?this.$options.regExp?a.replace(c,b):b:null},this.$forwardMatchIterator=function(a){var b=this.$assembleRegExp(),c=this;return{forEach:function(d){c.$forwardLineIterator(a).forEach(function(a,e,f){e&&(a=a.substring(e));var g=[];a.replace(b,function(a){var b=arguments[arguments.length-2];return g.push({str:a,offset:e+b}),a});for(var h=0;h<g.length;h++){var i=g[h],j=c.$rangeFromMatch(f,i.offset,i.str.length);if(d(j))return!0}})}}},this.$backwardMatchIterator=function(a){var b=this.$assembleRegExp(),c=this;return{forEach:function(d){c.$backwardLineIterator(a).forEach(function(a,e,f){e&&(a=a.substring(e));var g=[];a.replace(b,function(a,b){return g.push({str:a,offset:e+b}),a});for(var h=g.length-1;h>=0;h--){var i=g[h],j=c.$rangeFromMatch(f,i.offset,i.str.length);if(d(j))return!0}})}}},this.$rangeFromMatch=function(a,b,c){return new f(a,b,a,b+c)},this.$assembleRegExp=function(){if(this.$options.regExp)var a=this.$options.needle;else a=d.escapeRegExp(this.$options.needle);this.$options.wholeWord&&(a="\\b"+a+"\\b");var b="g";this.$options.caseSensitive||(b+="i");var c=new RegExp(a,b);return c},this.$forwardLineIterator=function(a){function k(e){var f=a.getLine(e);return b&&e==c.end.row&&(f=f.substring(0,c.end.column)),j&&e==d.row&&(f=f.substring(0,d.column)),f}var b=this.$options.scope==g.SELECTION,c=this.$options.range||a.getSelection().getRange(),d=this.$options.start||c[b?"start":"end"],e=b?c.start.row:0,f=b?c.start.column:0,h=b?c.end.row:a.getLength()-1,i=this.$options.wrap,j=!1;return{forEach:function(a){var b=d.row,c=k(b),g=d.column,l=!1;j=!1;while(!a(c,g,b)){if(l)return;b++,g=0;if(b>h)if(i)b=e,g=f,j=!0;else return;b==d.row&&(l=!0),c=k(b)}}}},this.$backwardLineIterator=function(a){var b=this.$options.scope==g.SELECTION,c=this.$options.range||a.getSelection().getRange(),d=this.$options.start||c[b?"end":"start"],e=b?c.start.row:0,f=b?c.start.column:0,h=b?c.end.row:a.getLength()-1,i=this.$options.wrap;return{forEach:function(g){var j=d.row,k=a.getLine(j).substring(0,d.column),l=0,m=!1,n=!1;while(!g(k,l,j)){if(m)return;j--,l=0;if(j<e)if(i)j=h,n=!0;else return;j==d.row&&(m=!0),k=a.getLine(j),b&&(j==e?l=f:j==h&&(k=k.substring(0,c.end.column))),n&&j==d.row&&(l=d.column)}}}}}.call(g.prototype),b.Search=g}),define("ace/commands/command_manager",["require","exports","module","ace/lib/keys"],function(a,b,c){"use strict";var d=a("../lib/keys"),e=function(a,b){if(typeof a!="string")throw new TypeError("'platform' argument must be either 'mac' or 'win'");this.platform=a,this.commands={},this.commmandKeyBinding={},b&&b.forEach(this.addCommand,this)};((function(){function a(a,c,e){var f,g=0,h=b(a);for(var i=0,j=h.length;i<j;i++)d.KEY_MODS[h[i]]?g|=d.KEY_MODS[h[i]]:f=h[i]||"-";return{key:f,hashId:g}}function b(a,b){return a.toLowerCase().trim().split(new RegExp("[\\s ]*\\-[\\s ]*","g"),999)}this.addCommand=function(a){this.commands[a.name]&&this.removeCommand(a),this.commands[a.name]=a,a.bindKey&&this._buildKeyHash(a)},this.removeCommand=function(a){var b=typeof a=="string"?a:a.name;a=this.commands[b],delete this.commands[b];var c=this.commmandKeyBinding;for(var d in c)for(var e in c[d])c[d][e]==a&&delete c[d][e]},this.addCommands=function(a){Object.keys(a).forEach(function(b){var c=a[b];if(typeof c=="string")return this.bindKey(c,b);typeof c=="function"&&(c={exec:c}),c.name||(c.name=b),this.addCommand(c)},this)},this.removeCommands=function(a){Object.keys(a).forEach(function(b){this.removeCommand(a[b])},this)},this.bindKey=function(b,c){if(!b)return;var d=this.commmandKeyBinding;b.split("|").forEach(function(b){var e=a(b,c),f=e.hashId;(d[f]||(d[f]={}))[e.key]=c})},this.bindKeys=function(a){Object.keys(a).forEach(function(b){this.bindKey(b,a[b])},this)},this._buildKeyHash=function(a){var b=a.bindKey;if(!b)return;var c=typeof b=="string"?b:b[this.platform];this.bindKey(c,a)},this.findKeyCommand=function c(a,b){typeof b=="number"&&(b=d.keyCodeToString(b));var c=this.commmandKeyBinding;return c[a]&&c[a][b.toLowerCase()]},this.exec=function(a,b,c){return typeof a=="string"&&(a=this.commands[a]),a?b&&b.$readOnly&&!a.readOnly?!1:(a.exec(b,c||{}),!0):!1},this.toggleRecording=function(){if(this.$inReplay)return;return this.recording?(this.macro.pop(),this.exec=this.normal_exec,this.macro.length||(this.macro=this.oldMacro),this.recording=!1):(this.oldMacro=this.macro,this.macro=[],this.normal_exec=this.exec,this.exec=function(a,b,c){return this.macro.push([a,c]),this.normal_exec(a,b,c)},this.recording=!0)},this.replay=function(a){if(this.$inReplay||!this.macro)return;if(this.recording)return this.toggleRecording();try{this.$inReplay=!0,this.macro.forEach(function(b){typeof b=="string"?this.exec(b,a):this.exec(b[0],a,b[1])},this)}finally{this.$inReplay=!1}},this.trimMacro=function(a){return a.map(function(a){return typeof a[0]!="string"&&(a[0]=a[0].name),a[1]||(a=a[0]),a})}})).call(e.prototype),b.CommandManager=e}),define("ace/undomanager",["require","exports","module"],function(a,b,c){"use strict";var d=function(){this.reset()};((function(){this.execute=function(a){var b=a.args[0];this.$doc=a.args[1],this.$undoStack.push(b),this.$redoStack=[]},this.undo=function(a){var b=this.$undoStack.pop(),c=null;return b&&(c=this.$doc.undoChanges(b,a),this.$redoStack.push(b)),c},this.redo=function(a){var b=this.$redoStack.pop(),c=null;return b&&(c=this.$doc.redoChanges(b,a),this.$undoStack.push(b)),c},this.reset=function(){this.$undoStack=[],this.$redoStack=[]},this.hasUndo=function(){return this.$undoStack.length>0},this.hasRedo=function(){return this.$redoStack.length>0}})).call(d.prototype),b.UndoManager=d}),define("ace/virtual_renderer",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/event","ace/lib/useragent","ace/layer/gutter","ace/layer/marker","ace/layer/text","ace/layer/cursor","ace/scrollbar","ace/renderloop","ace/lib/event_emitter","text!ace/css/editor.css"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/dom"),f=a("./lib/event"),g=a("./lib/useragent"),h=a("./layer/gutter").Gutter,i=a("./layer/marker").Marker,j=a("./layer/text").Text,k=a("./layer/cursor").Cursor,l=a("./scrollbar").ScrollBar,m=a("./renderloop").RenderLoop,n=a("./lib/event_emitter").EventEmitter,o=a("text!./css/editor.css");e.importCssString(o,"ace_editor");var p=function(a,b){var c=this;this.container=a,e.addCssClass(a,"ace_editor"),this.setTheme(b),this.$gutter=e.createElement("div"),this.$gutter.className="ace_gutter",this.container.appendChild(this.$gutter),this.scroller=e.createElement("div"),this.scroller.className="ace_scroller",this.container.appendChild(this.scroller),this.content=e.createElement("div"),this.content.className="ace_content",this.scroller.appendChild(this.content),this.$gutterLayer=new h(this.$gutter),this.$gutterLayer.on("changeGutterWidth",this.onResize.bind(this,!0)),this.$markerBack=new i(this.content);var d=this.$textLayer=new j(this.content);this.canvas=d.element,this.$markerFront=new i(this.content),this.characterWidth=d.getCharacterWidth(),this.lineHeight=d.getLineHeight(),this.$cursorLayer=new k(this.content),this.$cursorPadding=8,this.$horizScroll=!0,this.$horizScrollAlwaysVisible=!0,this.scrollBar=new l(a),this.scrollBar.addEventListener("scroll",function(a){c.session.setScrollTop(a.data)}),this.scrollTop=0,this.scrollLeft=0,f.addListener(this.scroller,"scroll",function(){c.session.setScrollLeft(c.scroller.scrollLeft)}),this.cursorPos={row:0,column:0},this.$textLayer.addEventListener("changeCharaterSize",function(){c.characterWidth=d.getCharacterWidth(),c.lineHeight=d.getLineHeight(),c.$updatePrintMargin(),c.onResize(!0),c.$loop.schedule(c.CHANGE_FULL)}),this.$size={width:0,height:0,scrollerHeight:0,scrollerWidth:0},this.layerConfig={width:1,padding:0,firstRow:0,firstRowScreen:0,lastRow:0,lineHeight:1,characterWidth:1,minHeight:1,maxHeight:1,offset:0,height:1},this.$loop=new m(this.$renderChanges.bind(this),this.container.ownerDocument.defaultView),this.$loop.schedule(this.CHANGE_FULL),this.setPadding(4),this.$updatePrintMargin()};((function(){this.showGutter=!0,this.CHANGE_CURSOR=1,this.CHANGE_MARKER=2,this.CHANGE_GUTTER=4,this.CHANGE_SCROLL=8,this.CHANGE_LINES=16,this.CHANGE_TEXT=32,this.CHANGE_SIZE=64,this.CHANGE_MARKER_BACK=128,this.CHANGE_MARKER_FRONT=256,this.CHANGE_FULL=512,d.implement(this,n),this.setSession=function(a){this.session=a,this.$cursorLayer.setSession(a),this.$markerBack.setSession(a),this.$markerFront.setSession(a),this.$gutterLayer.setSession(a),this.$textLayer.setSession(a),this.$loop.schedule(this.CHANGE_FULL)},this.updateLines=function(a,b){b===undefined&&(b=Infinity),this.$changedLines?(this.$changedLines.firstRow>a&&(this.$changedLines.firstRow=a),this.$changedLines.lastRow<b&&(this.$changedLines.lastRow=b)):this.$changedLines={firstRow:a,lastRow:b},this.$loop.schedule(this.CHANGE_LINES)},this.updateText=function(){this.$loop.schedule(this.CHANGE_TEXT)},this.updateFull=function(){this.$loop.schedule(this.CHANGE_FULL)},this.updateFontSize=function(){this.$textLayer.checkForSizeChanges()},this.onResize=function(a){var b=this.CHANGE_SIZE,c=this.$size,d=e.getInnerHeight(this.container);if(a||c.height!=d)c.height=d,this.scroller.style.height=d+"px",c.scrollerHeight=this.scroller.clientHeight,this.scrollBar.setHeight(c.scrollerHeight),this.session&&(this.session.setScrollTop(this.getScrollTop()),b|=this.CHANGE_FULL);var f=e.getInnerWidth(this.container);if(a||c.width!=f){c.width=f;var g=this.showGutter?this.$gutter.offsetWidth:0;this.scroller.style.left=g+"px",c.scrollerWidth=Math.max(0,f-g-this.scrollBar.getWidth()),this.scroller.style.width=c.scrollerWidth+"px";if(this.session.getUseWrapMode()&&this.adjustWrapLimit()||a)b|=this.CHANGE_FULL}this.$loop.schedule(b)},this.adjustWrapLimit=function(){var a=this.$size.scrollerWidth-this.$padding*2,b=Math.floor(a/this.characterWidth);return this.session.adjustWrapLimit(b)},this.setShowInvisibles=function(a){this.$textLayer.setShowInvisibles(a)&&this.$loop.schedule(this.CHANGE_TEXT)},this.getShowInvisibles=function(){return this.$textLayer.showInvisibles},this.$showPrintMargin=!0,this.setShowPrintMargin=function(a){this.$showPrintMargin=a,this.$updatePrintMargin()},this.getShowPrintMargin=function(){return this.$showPrintMargin},this.$printMarginColumn=80,this.setPrintMarginColumn=function(a){this.$printMarginColumn=a,this.$updatePrintMargin()},this.getPrintMarginColumn=function(){return this.$printMarginColumn},this.getShowGutter=function(){return this.showGutter},this.setShowGutter=function(a){if(this.showGutter===a)return;this.$gutter.style.display=a?"block":"none",this.showGutter=a,this.onResize(!0)},this.$updatePrintMargin=function(){var a;if(!this.$showPrintMargin&&!this.$printMarginEl)return;this.$printMarginEl||(a=e.createElement("div"),a.className="ace_print_margin_layer",this.$printMarginEl=e.createElement("div"),this.$printMarginEl.className="ace_print_margin",a.appendChild(this.$printMarginEl),this.content.insertBefore(a,this.$textLayer.element));var b=this.$printMarginEl.style;b.left=this.characterWidth*this.$printMarginColumn+this.$padding+"px",b.visibility=this.$showPrintMargin?"visible":"hidden"},this.getContainerElement=function(){return this.container},this.getMouseEventTarget=function(){return this.content},this.getTextAreaContainer=function(){return this.container},this.moveTextAreaToCursor=function(a){if(g.isIE)return;if(this.layerConfig.lastRow===0)return;var b=this.$cursorLayer.getPixelPosition();if(!b)return;var c=this.content.getBoundingClientRect(),d=this.layerConfig.offset;a.style.left=c.left+b.left+"px",a.style.top=c.top+b.top-this.scrollTop+d+"px"},this.getFirstVisibleRow=function(){return this.layerConfig.firstRow},this.getFirstFullyVisibleRow=function(){return this.layerConfig.firstRow+(this.layerConfig.offset===0?0:1)},this.getLastFullyVisibleRow=function(){var a=Math.floor((this.layerConfig.height+this.layerConfig.offset)/this.layerConfig.lineHeight);return this.layerConfig.firstRow-1+a},this.getLastVisibleRow=function(){return this.layerConfig.lastRow},this.$padding=null,this.setPadding=function(a){this.$padding=a,this.$textLayer.setPadding(a),this.$cursorLayer.setPadding(a),this.$markerFront.setPadding(a),this.$markerBack.setPadding(a),this.$loop.schedule(this.CHANGE_FULL),this.$updatePrintMargin()},this.getHScrollBarAlwaysVisible=function(){return this.$horizScrollAlwaysVisible},this.setHScrollBarAlwaysVisible=function(a){this.$horizScrollAlwaysVisible!=a&&(this.$horizScrollAlwaysVisible=a,(!this.$horizScrollAlwaysVisible||!this.$horizScroll)&&this.$loop.schedule(this.CHANGE_SCROLL))},this.$updateScrollBar=function(){this.scrollBar.setInnerHeight(this.layerConfig.maxHeight),this.scrollBar.setScrollTop(this.scrollTop)},this.$renderChanges=function(a){if(!a||!this.session)return;(a&this.CHANGE_FULL||a&this.CHANGE_SIZE||a&this.CHANGE_TEXT||a&this.CHANGE_LINES||a&this.CHANGE_SCROLL)&&this.$computeLayerConfig();if(a&this.CHANGE_FULL){this.$textLayer.update(this.layerConfig),this.showGutter&&this.$gutterLayer.update(this.layerConfig),this.$markerBack.update(this.layerConfig),this.$markerFront.update(this.layerConfig),this.$cursorLayer.update(this.layerConfig),this.$updateScrollBar();return}if(a&this.CHANGE_SCROLL){a&this.CHANGE_TEXT||a&this.CHANGE_LINES?this.$textLayer.update(this.layerConfig):this.$textLayer.scrollLines(this.layerConfig),this.showGutter&&this.$gutterLayer.update(this.layerConfig),this.$markerBack.update(this.layerConfig),this.$markerFront.update(this.layerConfig),this.$cursorLayer.update(this.layerConfig),this.$updateScrollBar();return}a&this.CHANGE_TEXT?(this.$textLayer.update(this.layerConfig),this.showGutter&&this.$gutterLayer.update(this.layerConfig)):a&this.CHANGE_LINES?(this.$updateLines(),this.$updateScrollBar(),this.showGutter&&this.$gutterLayer.update(this.layerConfig)):a&this.CHANGE_GUTTER&&this.showGutter&&this.$gutterLayer.update(this.layerConfig),a&this.CHANGE_CURSOR&&this.$cursorLayer.update(this.layerConfig),a&(this.CHANGE_MARKER|this.CHANGE_MARKER_FRONT)&&this.$markerFront.update(this.layerConfig),a&(this.CHANGE_MARKER|this.CHANGE_MARKER_BACK)&&this.$markerBack.update(this.layerConfig),a&this.CHANGE_SIZE&&this.$updateScrollBar()},this.$computeLayerConfig=function(){var a=this.session,b=this.scrollTop%this.lineHeight,c=this.$size.scrollerHeight+this.lineHeight,d=this.$getLongestLine(),e=this.$horizScrollAlwaysVisible||this.$size.scrollerWidth-d<0,f=this.$horizScroll!==e;this.$horizScroll=e,f&&(this.scroller.style.overflowX=e?"scroll":"hidden");var g=this.session.getScreenLength()*this.lineHeight;this.session.setScrollTop(Math.max(0,Math.min(this.scrollTop,g-this.$size.scrollerHeight)));var h=Math.ceil(c/this.lineHeight)-1,i=Math.max(0,Math.round((this.scrollTop-b)/this.lineHeight)),j=i+h,k,l,m={lineHeight:this.lineHeight};i=a.screenToDocumentRow(i,0);var n=a.getFoldLine(i);n&&(i=n.start.row),k=a.documentToScreenRow(i,0),l=a.getRowHeight(m,i),j=Math.min(a.screenToDocumentRow(j,0),a.getLength()-1),c=this.$size.scrollerHeight+a.getRowHeight(m,j)+l,b=this.scrollTop-k*this.lineHeight,this.layerConfig={width:d,padding:this.$padding,firstRow:i,firstRowScreen:k,lastRow:j,lineHeight:this.lineHeight,characterWidth:this.characterWidth,minHeight:c,maxHeight:g,offset:b,height:this.$size.scrollerHeight},this.$gutterLayer.element.style.marginTop=-b+"px",this.content.style.marginTop=-b+"px",this.content.style.width=d+2*this.$padding+"px",this.content.style.height=c+"px",this.$desiredScrollLeft&&(this.scrollToX(this.$desiredScrollLeft),this.$desiredScrollLeft=0),f&&this.onResize(!0)},this.$updateLines=function(){var a=this.$changedLines.firstRow,b=this.$changedLines.lastRow;this.$changedLines=null;var c=this.layerConfig;if(c.width!=this.$getLongestLine())return this.$textLayer.update(c);if(a>c.lastRow+1)return;if(b<c.firstRow)return;if(b===Infinity){this.showGutter&&this.$gutterLayer.update(c),this.$textLayer.update(c);return}this.$textLayer.updateLines(c,a,b)},this.$getLongestLine=function(){var a=this.session.getScreenWidth();return this.$textLayer.showInvisibles&&(a+=1),Math.max(this.$size.scrollerWidth-2*this.$padding,Math.round(a*this.characterWidth))},this.updateFrontMarkers=function(){this.$markerFront.setMarkers(this.session.getMarkers(!0)),this.$loop.schedule(this.CHANGE_MARKER_FRONT)},this.updateBackMarkers=function(){this.$markerBack.setMarkers(this.session.getMarkers()),this.$loop.schedule(this.CHANGE_MARKER_BACK)},this.addGutterDecoration=function(a,b){this.$gutterLayer.addGutterDecoration(a,b),this.$loop.schedule(this.CHANGE_GUTTER)},this.removeGutterDecoration=function(a,b){this.$gutterLayer.removeGutterDecoration(a,b),this.$loop.schedule(this.CHANGE_GUTTER)},this.setBreakpoints=function(a){this.$gutterLayer.setBreakpoints(a),this.$loop.schedule(this.CHANGE_GUTTER)},this.setAnnotations=function(a){this.$gutterLayer.setAnnotations(a),this.$loop.schedule(this.CHANGE_GUTTER)},this.updateCursor=function(){this.$loop.schedule(this.CHANGE_CURSOR)},this.hideCursor=function(){this.$cursorLayer.hideCursor()},this.showCursor=function(){this.$cursorLayer.showCursor()},this.scrollCursorIntoView=function(){if(this.$size.scrollerHeight===0)return;var a=this.$cursorLayer.getPixelPosition(),b=a.left,c=a.top;this.scrollTop>c&&this.session.setScrollTop(c),this.scrollTop+this.$size.scrollerHeight<c+this.lineHeight&&this.session.setScrollTop(c+this.lineHeight-this.$size.scrollerHeight);var d=this.scrollLeft;d>b&&(b<this.$padding+2*this.layerConfig.characterWidth&&(b=0),this.scrollToX(b)),d+this.$size.scrollerWidth<b+this.characterWidth&&(b>this.layerConfig.width+2*this.$padding?this.$desiredScrollLeft=b:this.scrollToX(Math.round(b+this.characterWidth-this.$size.scrollerWidth)))},this.getScrollTop=function(){return this.session.getScrollTop()},this.getScrollLeft=function(){return this.session.getScrollTop()},this.getScrollTopRow=function(){return this.scrollTop/this.lineHeight},this.getScrollBottomRow=function(){return Math.max(0,Math.floor((this.scrollTop+this.$size.scrollerHeight)/this.lineHeight)-1)},this.scrollToRow=function(a){this.session.setScrollTop(a*this.lineHeight)},this.scrollToLine=function(a,b){var c={lineHeight:this.lineHeight},d=0;for(var e=1;e<a;e++)d+=this.session.getRowHeight(c,e-1);b&&(d-=this.$size.scrollerHeight/2),this.session.setScrollTop(d)},this.scrollToY=function(a){this.scrollTop!==a&&(this.$loop.schedule(this.CHANGE_SCROLL),this.scrollTop=a)},this.scrollToX=function(a){a<=this.$padding&&(a=0),this.scroller.scrollLeft=a,a=this.scroller.scrollLeft},this.scrollBy=function(a,b){b&&this.session.setScrollTop(this.session.getScrollTop()+b),a&&this.session.setScrollLeft(this.session.getScrollLeft()+a)},this.isScrollableBy=function(a,b){if(b<0&&this.session.getScrollTop()>0)return!0;if(b>0&&this.session.getScrollTop()+this.$size.scrollerHeight<this.layerConfig.maxHeight)return!0},this.screenToTextCoordinates=function(a,b){var c=this.scroller.getBoundingClientRect(),d=Math.round((a+this.scrollLeft-c.left-this.$padding-e.getPageScrollLeft())/this.characterWidth),f=Math.floor((b+this.scrollTop-c.top-e.getPageScrollTop())/this.lineHeight);return this.session.screenToDocumentPosition(f,Math.max(d,0))},this.textToScreenCoordinates=function(a,b){var c=this.scroller.getBoundingClientRect(),d=this.session.documentToScreenPosition(a,b),e=this.$padding+Math.round(d.column*this.characterWidth),f=d.row*this.lineHeight;return{pageX:c.left+e-this.scrollLeft,pageY:c.top+f-this.scrollTop}},this.visualizeFocus=function(){e.addCssClass(this.container,"ace_focus")},this.visualizeBlur=function(){e.removeCssClass(this.container,"ace_focus")},this.showComposition=function(a){this.$composition||(this.$composition=e.createElement("div"),this.$composition.className="ace_composition",this.content.appendChild(this.$composition)),this.$composition.innerHTML="&#160;";var b=this.$cursorLayer.getPixelPosition(),c=this.$composition.style;c.top=b.top+"px",c.left=b.left+this.$padding+"px",c.height=this.lineHeight+"px",this.hideCursor()},this.setCompositionText=function(a){e.setInnerText(this.$composition,a)},this.hideComposition=function(){this.showCursor();if(!this.$composition)return;var a=this.$composition.style;a.top="-10000px",a.left="-10000px"},this.setTheme=function(b){function d(a){e.importCssString(a.cssText,a.cssClass,c.container.ownerDocument),c.$theme&&e.removeCssClass(c.container,c.$theme),c.$theme=a?a.cssClass:null,c.$theme&&e.addCssClass(c.container,c.$theme),a&&a.isDark?e.addCssClass(c.container,"ace_dark"):e.removeCssClass(c.container,"ace_dark"),c.$size&&(c.$size.width=0,c.onResize())}var c=this;this.$themeValue=b,!b||typeof b=="string"?(b=b||"ace/theme/textmate",a([b],function(a){d(a)})):d(b)},this.getTheme=function(){return this.$themeValue},this.setStyle=function(a){e.addCssClass(this.container,a)},this.unsetStyle=function(a){e.removeCssClass(this.container,a)},this.destroy=function(){this.$textLayer.destroy(),this.$cursorLayer.destroy()}})).call(p.prototype),b.VirtualRenderer=p}),define("ace/layer/gutter",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/dom"),e=a("../lib/oop"),f=a("../lib/event_emitter").EventEmitter,g=function(a){this.element=d.createElement("div"),this.element.className="ace_layer ace_gutter-layer",a.appendChild(this.element),this.setShowFoldWidgets(this.$showFoldWidgets),this.gutterWidth=0,this.$breakpoints=[],this.$annotations=[],this.$decorations=[]};((function(){e.implement(this,f),this.setSession=function(a){this.session=a},this.addGutterDecoration=function(a,b){this.$decorations[a]||(this.$decorations[a]=""),this.$decorations[a]+=" ace_"+b},this.removeGutterDecoration=function(a,b){this.$decorations[a]=this.$decorations[a].replace(" ace_"+b,"")},this.setBreakpoints=function(a){this.$breakpoints=a.concat()},this.setAnnotations=function(a){this.$annotations=[];for(var b in a)if(a.hasOwnProperty(b)){var c=a[b];if(!c)continue;var d=this.$annotations[b]={text:[]};for(var e=0;e<c.length;e++){var f=c[e],g=f.text.replace(/"/g,"&quot;").replace(/'/g,"&#8217;").replace(/</,"&lt;");d.text.indexOf(g)===-1&&d.text.push(g);var h=f.type;h=="error"?d.className="ace_error":h=="warning"&&d.className!="ace_error"?d.className="ace_warning":h=="info"&&!d.className&&(d.className="ace_info")}}},this.update=function(a){this.$config=a;var b={className:"",text:[]},c=[],e=a.firstRow,f=a.lastRow,g=this.session.getNextFoldLine(e),h=g?g.start.row:Infinity,i=this.$showFoldWidgets&&this.session.foldWidgets;for(;;){e>h&&(e=g.end.row+1,g=this.session.getNextFoldLine(e,g),h=g?g.start.row:Infinity);if(e>f)break;var j=this.$annotations[e]||b;c.push("<div class='ace_gutter-cell",this.$decorations[e]||"",this.$breakpoints[e]?" ace_breakpoint ":" ",j.className,"' title='",j.text.join("\n"),"' style='height:",a.lineHeight,"px;'>",e+1);if(i){var k=i[e];k==null&&(k=i[e]=this.session.getFoldWidget(e)),k&&c.push("<span class='ace_fold-widget ",k,k=="start"&&e==h&&e<g.end.row?" closed":" open","'></span>")}var l=this.session.getRowLength(e)-1;while(l--)c.push("</div><div class='ace_gutter-cell' style='height:",a.lineHeight,"px'>¦");c.push("</div>"),e++}this.element=d.setInnerHtml(this.element,c.join("")),this.element.style.height=a.minHeight+"px";var m=this.element.offsetWidth;m!==this.gutterWidth&&(this.gutterWidth=m,this._emit("changeGutterWidth",m))},this.$showFoldWidgets=!0,this.setShowFoldWidgets=function(a){a?d.addCssClass(this.element,"ace_folding-enabled"):d.removeCssClass(this.element,"ace_folding-enabled"),this.$showFoldWidgets=a},this.getShowFoldWidgets=function(){return this.$showFoldWidgets}})).call(g.prototype),b.Gutter=g}),define("ace/layer/marker",["require","exports","module","ace/range","ace/lib/dom"],function(a,b,c){"use strict";var d=a("../range").Range,e=a("../lib/dom"),f=function(a){this.element=e.createElement("div"),this.element.className="ace_layer ace_marker-layer",a.appendChild(this.element)};((function(){this.$padding=0,this.setPadding=function(a){this.$padding=a},this.setSession=function(a){this.session=a},this.setMarkers=function(a){this.markers=a},this.update=function(a){var a=a||this.config;if(!a)return;this.config=a;var b=[];for(var c in this.markers){var d=this.markers[c],f=d.range.clipRows(a.firstRow,a.lastRow);if(f.isEmpty())continue;f=f.toScreenRange(this.session);if(d.renderer){var g=this.$getTop(f.start.row,a),h=Math.round(this.$padding+f.start.column*a.characterWidth);d.renderer(b,f,h,g,a)}else f.isMultiLine()?d.type=="text"?this.drawTextMarker(b,f,d.clazz,a):this.drawMultiLineMarker(b,f,d.clazz,a,d.type):this.drawSingleLineMarker(b,f,d.clazz,a,null,d.type)}this.element=e.setInnerHtml(this.element,b.join(""))},this.$getTop=function(a,b){return(a-b.firstRowScreen)*b.lineHeight},this.drawTextMarker=function(a,b,c,e){var f=b.start.row,g=new d(f,b.start.column,f,this.session.getScreenLastRowColumn(f));this.drawSingleLineMarker(a,g,c,e,1,"text"),f=b.end.row,g=new d(f,0,f,b.end.column),this.drawSingleLineMarker(a,g,c,e,0,"text");for(f=b.start.row+1;f<b.end.row;f++)g.start.row=f,g.end.row=f,g.end.column=this.session.getScreenLastRowColumn(f),this.drawSingleLineMarker(a,g,c,e,1,"text")},this.drawMultiLineMarker=function(a,b,c,d,e){var f=e==="background"?0:this.$padding,g=d.width+2*this.$padding-f,h=d.lineHeight,i=Math.round(g-b.start.column*d.characterWidth),j=this.$getTop(b.start.row,d),k=Math.round(f+b.start.column*d.characterWidth);a.push("<div class='",c,"' style='","height:",h,"px;","width:",i,"px;","top:",j,"px;","left:",k,"px;'></div>"),j=this.$getTop(b.end.row,d),i=Math.round(b.end.column*d.characterWidth),a.push("<div class='",c,"' style='","height:",h,"px;","width:",i,"px;","top:",j,"px;","left:",f,"px;'></div>"),h=(b.end.row-b.start.row-1)*d.lineHeight;if(h<0)return;j=this.$getTop(b.start.row+1,d),a.push("<div class='",c,"' style='","height:",h,"px;","width:",g,"px;","top:",j,"px;","left:",f,"px;'></div>")},this.drawSingleLineMarker=function(a,b,c,d,e,f){var g=f==="background"?0:this.$padding,h=d.lineHeight;if(f==="background")var i=d.width;else i=Math.round((b.end.column+(e||0)-b.start.column)*d.characterWidth);var j=this.$getTop(b.start.row,d),k=Math.round(g+b.start.column*d.characterWidth);a.push("<div class='",c,"' style='","height:",h,"px;","width:",i,"px;","top:",j,"px;","left:",k,"px;'></div>")}})).call(f.prototype),b.Marker=f}),define("ace/layer/text",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/useragent","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/dom"),f=a("../lib/lang"),g=a("../lib/useragent"),h=a("../lib/event_emitter").EventEmitter,i=function(a){this.element=e.createElement("div"),this.element.className="ace_layer ace_text-layer",a.appendChild(this.element),this.$characterSize=this.$measureSizes()||{width:0,height:0},this.$pollSizeChanges()};((function(){d.implement(this,h),this.EOF_CHAR="¶",this.EOL_CHAR="¬",this.TAB_CHAR="→",this.SPACE_CHAR="·",this.$padding=0,this.setPadding=function(a){this.$padding=a,this.element.style.padding="0 "+a+"px"},this.getLineHeight=function(){return this.$characterSize.height||1},this.getCharacterWidth=function(){return this.$characterSize.width||1},this.checkForSizeChanges=function(){var a=this.$measureSizes();a&&(this.$characterSize.width!==a.width||this.$characterSize.height!==a.height)&&(this.$characterSize=a,this._emit("changeCharaterSize",{data:a}))},this.$pollSizeChanges=function(){var a=this;this.$pollSizeChangesTimer=setInterval(function(){a.checkForSizeChanges()},500)},this.$fontStyles={fontFamily:1,fontSize:1,fontWeight:1,fontStyle:1,lineHeight:1},this.$measureSizes=function(){var a=1e3;if(!this.$measureNode){var b=this.$measureNode=e.createElement("div"),c=b.style;c.width=c.height="auto",c.left=c.top=-a*40+"px",c.visibility="hidden",c.position="absolute",c.overflow="visible",c.whiteSpace="nowrap",b.innerHTML=f.stringRepeat("Xy",a);if(this.element.ownerDocument.body)this.element.ownerDocument.body.appendChild(b);else{var d=this.element.parentNode;while(!e.hasCssClass(d,"ace_editor"))d=d.parentNode;d.appendChild(b)}}var c=this.$measureNode.style,g=e.computedStyle(this.element);for(var h in this.$fontStyles)c[h]=g[h];var i={height:this.$measureNode.offsetHeight,width:this.$measureNode.offsetWidth/(a*2)};return i.width==0&&i.height==0?null:i},this.setSession=function(a){this.session=a},this.showInvisibles=!1,this.setShowInvisibles=function(a){return this.showInvisibles==a?!1:(this.showInvisibles=a,!0)},this.$tabStrings=[],this.$computeTabString=function(){var a=this.session.getTabSize(),b=this.$tabStrings=[0];for(var c=1;c<a+1;c++)this.showInvisibles?b.push("<span class='ace_invisible'>"+this.TAB_CHAR+(new Array(c)).join("&#160;")+"</span>"):b.push((new Array(c+1)).join("&#160;"))},this.updateLines=function(a,b,c){this.$computeTabString(),(this.config.lastRow!=a.lastRow||this.config.firstRow!=a.firstRow)&&this.scrollLines(a),this.config=a;var d=Math.max(b,a.firstRow),f=Math.min(c,a.lastRow),g=this.element.childNodes,h=0;for(var i=a.firstRow;i<d;i++){var j=this.session.getFoldLine(i);if(j){if(j.containsRow(d)){d=j.start.row;break}i=j.end.row}h++}for(var k=d;k<=f;k++){var l=g[h++];if(!l)continue;var m=[],n=this.session.getTokens(k,k);this.$renderLine(m,k,n[0].tokens,!this.$useLineGroups()),l=e.setInnerHtml(l,m.join("")),k=this.session.getRowFoldEnd(k)}},this.scrollLines=function(a){this.$computeTabString();var b=this.config;this.config=a;if(!b||b.lastRow<a.firstRow)return this.update(a);if(a.lastRow<b.firstRow)return this.update(a);var c=this.element;if(b.firstRow<a.firstRow)for(var d=this.session.getFoldedRowCount(b.firstRow,a.firstRow-1);d>0;d--)c.removeChild(c.firstChild);if(b.lastRow>a.lastRow)for(var d=this.session.getFoldedRowCount(a.lastRow+1,b.lastRow);d>0;d--)c.removeChild(c.lastChild);if(a.firstRow<b.firstRow){var e=this.$renderLinesFragment(a,a.firstRow,b.firstRow-1);c.firstChild?c.insertBefore(e,c.firstChild):c.appendChild(e)}if(a.lastRow>b.lastRow){var e=this.$renderLinesFragment(a,b.lastRow+1,a.lastRow);c.appendChild(e)}},this.$renderLinesFragment=function(a,b,c){var d=this.element.ownerDocument.createDocumentFragment(),f=b,g=this.session.getNextFoldLine(f),h=g?g.start.row:Infinity;for(;;){f>h&&(f=g.end.row+1,g=this.session.getNextFoldLine(f,g),h=g?g.start.row:Infinity);if(f>c)break;var i=e.createElement("div"),j=[],k=this.session.getTokens(f,f);k.length==1&&this.$renderLine(j,f,k[0].tokens,!1),i.innerHTML=j.join("");if(this.$useLineGroups())i.className="ace_line_group",d.appendChild(i);else{var l=i.childNodes;while(l.length)d.appendChild(l[0])}f++}return d},this.update=function(a){this.$computeTabString(),this.config=a;var b=[],c=a.firstRow,d=a.lastRow,f=c,g=this.session.getNextFoldLine(f),h=g?g.start.row:Infinity;for(;;){f>h&&(f=g.end.row+1,g=this.session.getNextFoldLine(f,g),h=g?g.start.row:Infinity);if(f>d)break;this.$useLineGroups()&&b.push("<div class='ace_line_group'>");var i=this.session.getTokens(f,f);i.length==1&&this.$renderLine(b,f,i[0].tokens,!1),this.$useLineGroups()&&b.push("</div>"),f++}this.element=e.setInnerHtml(this.element,b.join(""))},this.$textToken={text:!0,rparen:!0,lparen:!0},this.$renderToken=function(a,b,c,d){var e=this,f=/\t|&|<|( +)|([\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000])|[\u1100-\u115F]|[\u11A3-\u11A7]|[\u11FA-\u11FF]|[\u2329-\u232A]|[\u2E80-\u2E99]|[\u2E9B-\u2EF3]|[\u2F00-\u2FD5]|[\u2FF0-\u2FFB]|[\u3000-\u303E]|[\u3041-\u3096]|[\u3099-\u30FF]|[\u3105-\u312D]|[\u3131-\u318E]|[\u3190-\u31BA]|[\u31C0-\u31E3]|[\u31F0-\u321E]|[\u3220-\u3247]|[\u3250-\u32FE]|[\u3300-\u4DBF]|[\u4E00-\uA48C]|[\uA490-\uA4C6]|[\uA960-\uA97C]|[\uAC00-\uD7A3]|[\uD7B0-\uD7C6]|[\uD7CB-\uD7FB]|[\uF900-\uFAFF]|[\uFE10-\uFE19]|[\uFE30-\uFE52]|[\uFE54-\uFE66]|[\uFE68-\uFE6B]|[\uFF01-\uFF60]|[\uFFE0-\uFFE6]/g,h=function(a,c,d,f,h){if(a.charCodeAt(0)==32)return(new Array(a.length+1)).join("&#160;");if(a=="\t"){var i=e.session.getScreenTabSize(b+f);return b+=i-1,e.$tabStrings[i]}if(a=="&")return g.isOldGecko?"&":"&amp;";if(a=="<")return"&lt;";if(a=="　"){var j=e.showInvisibles?"ace_cjk ace_invisible":"ace_cjk",k=e.showInvisibles?e.SPACE_CHAR:"";return b+=1,"<span class='"+j+"' style='width:"+e.config.characterWidth*2+"px'>"+k+"</span>"}if(a.match(/[\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000]/)){if(e.showInvisibles){var k=(new Array(a.length+1)).join(e.SPACE_CHAR);return"<span class='ace_invisible'>"+k+"</span>"}return"&#160;"}return b+=1,"<span class='ace_cjk' style='width:"+e.config.characterWidth*2+"px'>"+a+"</span>"},i=d.replace(f,h);if(!this.$textToken[c.type]){var j="ace_"+c.type.replace(/\./g," ace_"),k="";c.type=="fold"&&(k=" style='width:"+c.value.length*this.config.characterWidth+"px;' "),a.push("<span class='",j,"'",k,">",i,"</span>")}else a.push(i);return b+d.length},this.$renderLineCore=function(a,b,c,d,e){var f=0,g=0,h,i=0,j=this;!d||d.length==0?h=Number.MAX_VALUE:h=d[0],e||a.push("<div class='ace_line' style='height:",this.config.lineHeight,"px","'>");for(var k=0;k<c.length;k++){var l=c[k],m=l.value;if(f+m.length<h)i=j.$renderToken(a,i,l,m),f+=m.length;else{while(f+m.length>=h)i=j.$renderToken(a,i,l,m.substring(0,h-f)),m=m.substring(h-f),f=h,e||a.push("</div>","<div class='ace_line' style='height:",this.config.lineHeight,"px","'>"),g++,i=0,h=d[g]||Number.MAX_VALUE;m.length!=0&&(f+=m.length,i=j.$renderToken(a,i,l,m))}}this.showInvisibles&&(b!==this.session.getLength()-1?a.push("<span class='ace_invisible'>"+this.EOL_CHAR+"</span>"):a.push("<span class='ace_invisible'>"+this.EOF_CHAR+"</span>")),e||a.push("</div>")},this.$renderLine=function(a,b,c,d){if(!this.session.isRowFolded(b)){var e=this.session.getRowSplitData(b);this.$renderLineCore(a,b,c,e,d)}else this.$renderFoldLine(a,b,c,d)},this.$renderFoldLine=function(a,b,c,d){function h(a,b,c){var d=0,e=0;while(e+a[d].value.length<b){e+=a[d].value.length,d++;if(d==a.length)return}if(e!=b){var f=a[d].value.substring(b-e);f.length>c-b&&(f=f.substring(0,c-b)),g.push({type:a[d].type,value:f}),e=b+f.length,d+=1}while(e<c){var f=a[d].value;f.length+e>c&&(f=f.substring(0,c-e)),g.push({type:a[d].type,value:f}),e+=f.length,d+=1}}var e=this.session,f=e.getFoldLine(b),g=[];f.walk(function(a,b,d,e,f){a?g.push({type:"fold",value:a}):(f&&(c=this.session.getTokens(b,b)[0].tokens),c.length!=0&&h(c,e,d))}.bind(this),f.end.row,this.session.getLine(f.end.row).length);var i=this.session.$useWrapMode?this.session.$wrapData[b]:null;this.$renderLineCore(a,b,g,i,d)},this.$useLineGroups=function(){return this.session.getUseWrapMode()},this.destroy=function(){clearInterval(this.$pollSizeChangesTimer),this.$measureNode&&this.$measureNode.parentNode.removeChild(this.$measureNode),delete this.$measureNode}})).call(i.prototype),b.Text=i}),define("ace/layer/cursor",["require","exports","module","ace/lib/dom"],function(a,b,c){"use strict";var d=a("../lib/dom"),e=function(a){this.element=d.createElement("div"),this.element.className="ace_layer ace_cursor-layer",a.appendChild(this.element),this.cursor=d.createElement("div"),this.cursor.className="ace_cursor ace_hidden",this.element.appendChild(this.cursor),this.isVisible=!1};((function(){this.$padding=0,this.setPadding=function(a){this.$padding=a},this.setSession=function(a){this.session=a},this.hideCursor=function(){this.isVisible=!1,d.addCssClass(this.cursor,"ace_hidden"),clearInterval(this.blinkId)},this.showCursor=function(){this.isVisible=!0,d.removeCssClass(this.cursor,"ace_hidden"),this.cursor.style.visibility="visible",this.restartTimer()},this.restartTimer=function(){clearInterval(this.blinkId);if(!this.isVisible)return;var a=this.cursor;this.blinkId=setInterval(function(){a.style.visibility="hidden",setTimeout(function(){a.style.visibility="visible"},400)},1e3)},this.getPixelPosition=function(a){if(!this.config||!this.session)return{left:0,top:0};var b=this.session.selection.getCursor(),c=this.session.documentToScreenPosition(b),d=Math.round(this.$padding+c.column*this.config.characterWidth),e=(c.row-(a?this.config.firstRowScreen:0))*this.config.lineHeight;return{left:d,top:e}},this.update=function(a){this.config=a,this.pixelPos=this.getPixelPosition(!0),this.cursor.style.left=this.pixelPos.left+"px",this.cursor.style.top=this.pixelPos.top+"px",this.cursor.style.width=a.characterWidth+"px",this.cursor.style.height=a.lineHeight+"px";var b=this.session.getOverwrite();b!=this.overwrite&&(this.overwrite=b,b?d.addCssClass(this.cursor,"ace_overwrite"):d.removeCssClass(this.cursor,"ace_overwrite")),this.restartTimer()},this.destroy=function(){clearInterval(this.blinkId)}})).call(e.prototype),b.Cursor=e}),define("ace/scrollbar",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/event","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("./lib/oop"),e=a("./lib/dom"),f=a("./lib/event"),g=a("./lib/event_emitter").EventEmitter,h=function(a){this.element=e.createElement("div"),this.element.className="ace_sb",this.inner=e.createElement("div"),this.element.appendChild(this.inner),a.appendChild(this.element),this.width=e.scrollbarWidth(a.ownerDocument),this.element.style.width=(this.width||15)+5+"px",f.addListener(this.element,"scroll",this.onScroll.bind(this))};((function(){d.implement(this,g),this.onScroll=function(){this._emit("scroll",{data:this.element.scrollTop})},this.getWidth=function(){return this.width},this.setHeight=function(a){this.element.style.height=a+"px"},this.setInnerHeight=function(a){this.inner.style.height=a+"px"},this.setScrollTop=function(a){this.element.scrollTop=a}})).call(h.prototype),b.ScrollBar=h}),define("ace/renderloop",["require","exports","module","ace/lib/event"],function(a,b,c){"use strict";var d=a("./lib/event"),e=function(a,b){this.onRender=a,this.pending=!1,this.changes=0,this.window=b||window};((function(){this.schedule=function(a){this.changes=this.changes|a;if(!this.pending){this.pending=!0;var b=this;d.nextTick(function(){b.pending=!1;var a;while(a=b.changes)b.changes=0,b.onRender(a)},this.window)}}})).call(e.prototype),b.RenderLoop=e}),define("text!ace/css/editor.css",[],"@import url(//fonts.googleapis.com/css?family=Droid+Sans+Mono);\n\n\n.ace_editor {\n    position: absolute;\n    overflow: hidden;\n    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Droid Sans Mono', 'Courier New', monospace;\n    font-size: 12px;\n}\n\n.ace_scroller {\n    position: absolute;\n    overflow-x: scroll;\n    overflow-y: hidden;\n}\n\n.ace_content {\n    position: absolute;\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n    cursor: text;\n}\n\n/* setting pointer-events: auto; on node under the mouse, which changes during scroll,\n  will break mouse wheel scrolling in Safari */\n.ace_content * {\n     pointer-events: none;\n}\n\n.ace_composition {\n    position: absolute;\n    background: #555;\n    color: #DDD;\n    z-index: 4;\n}\n\n.ace_gutter .ace_layer {\n    position: relative;\n    min-width: 54px;\n    text-align: right;\n}\n\n.ace_gutter {\n    position: absolute;\n    overflow : hidden;\n    height: 100%;\n    width: auto;\n    cursor: default;\n}\n\n.ace_gutter-cell {\n    padding-left: 19px;\n    padding-right: 6px;\n}\n\n.ace_gutter-cell.ace_error {\n    background-image: url(\"data:image/gif,GIF89a%10%00%10%00%D5%00%00%F5or%F5%87%88%F5nr%F4ns%EBmq%F5z%7F%DDJT%DEKS%DFOW%F1Yc%F2ah%CE(7%CE)8%D18E%DD%40M%F2KZ%EBU%60%F4%60m%DCir%C8%16(%C8%19*%CE%255%F1%3FR%F1%3FS%E6%AB%B5%CA%5DI%CEn%5E%F7%A2%9A%C9G%3E%E0a%5B%F7%89%85%F5yy%F6%82%80%ED%82%80%FF%BF%BF%E3%C4%C4%FF%FF%FF%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%25%00%2C%00%00%00%00%10%00%10%00%00%06p%C0%92pH%2C%1A%8F%C8%D2H%93%E1d4%23%E4%88%D3%09mB%1DN%B48%F5%90%40%60%92G%5B%94%20%3E%22%D2%87%24%FA%20%24%C5%06A%00%20%B1%07%02B%A38%89X.v%17%82%11%13q%10%0Fi%24%0F%8B%10%7BD%12%0Ei%09%92%09%0EpD%18%15%24%0A%9Ci%05%0C%18F%18%0B%07%04%01%04%06%A0H%18%12%0D%14%0D%12%A1I%B3%B4%B5IA%00%3B\");\n    background-repeat: no-repeat;\n    background-position: 2px center;\n}\n\n.ace_gutter-cell.ace_warning {\n    background-image: url(\"data:image/gif,GIF89a%10%00%10%00%D5%00%00%FF%DBr%FF%DE%81%FF%E2%8D%FF%E2%8F%FF%E4%96%FF%E3%97%FF%E5%9D%FF%E6%9E%FF%EE%C1%FF%C8Z%FF%CDk%FF%D0s%FF%D4%81%FF%D5%82%FF%D5%83%FF%DC%97%FF%DE%9D%FF%E7%B8%FF%CCl%7BQ%13%80U%15%82W%16%81U%16%89%5B%18%87%5B%18%8C%5E%1A%94d%1D%C5%83-%C9%87%2F%C6%84.%C6%85.%CD%8B2%C9%871%CB%8A3%CD%8B5%DC%98%3F%DF%9BB%E0%9CC%E1%A5U%CB%871%CF%8B5%D1%8D6%DB%97%40%DF%9AB%DD%99B%E3%B0p%E7%CC%AE%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%2F%00%2C%00%00%00%00%10%00%10%00%00%06a%C0%97pH%2C%1A%8FH%A1%ABTr%25%87%2B%04%82%F4%7C%B9X%91%08%CB%99%1C!%26%13%84*iJ9(%15G%CA%84%14%01%1A%97%0C%03%80%3A%9A%3E%81%84%3E%11%08%B1%8B%20%02%12%0F%18%1A%0F%0A%03'F%1C%04%0B%10%16%18%10%0B%05%1CF%1D-%06%07%9A%9A-%1EG%1B%A0%A1%A0U%A4%A5%A6BA%00%3B\");\n    background-repeat: no-repeat;\n    background-position: 2px center;\n}\n\n.ace_gutter-cell.ace_info {\n    background-image: url(\"data:image/gif;base64,R0lGODlhEAAQAMQAAAAAAEFBQVJSUl5eXmRkZGtra39/f4WFhYmJiZGRkaampry8vMPDw8zMzNXV1dzc3OTk5Orq6vDw8P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABQALAAAAAAQABAAAAUuICWOZGmeaBml5XGwFCQSBGyXRSAwtqQIiRuiwIM5BoYVbEFIyGCQoeJGrVptIQA7\");\n    background-repeat: no-repeat;\n    background-position: 2px center;\n}\n\n.ace_editor .ace_sb {\n    position: absolute;\n    overflow-x: hidden;\n    overflow-y: scroll;\n    right: 0;\n}\n\n.ace_editor .ace_sb div {\n    position: absolute;\n    width: 1px;\n    left: 0;\n}\n\n.ace_editor .ace_print_margin_layer {\n    z-index: 0;\n    position: absolute;\n    overflow: hidden;\n    margin: 0;\n    left: 0;\n    height: 100%;\n    width: 100%;\n}\n\n.ace_editor .ace_print_margin {\n    position: absolute;\n    height: 100%;\n}\n\n.ace_editor textarea {\n    position: fixed;\n    z-index: 0;\n    width: 10px;\n    height: 30px;\n    opacity: 0;\n    background: transparent;\n    appearance: none;\n    -moz-appearance: none;\n    border: none;\n    resize: none;\n    outline: none;\n    overflow: hidden;\n}\n\n.ace_layer {\n    z-index: 1;\n    position: absolute;\n    overflow: hidden;\n    white-space: nowrap;\n    height: 100%;\n    width: 100%;\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n}\n\n.ace_text-layer {\n    color: black;\n}\n\n.ace_cjk {\n    display: inline-block;\n    text-align: center;\n}\n\n.ace_cursor-layer {\n    z-index: 4;\n}\n\n.ace_cursor {\n    z-index: 4;\n    position: absolute;\n}\n\n.ace_cursor.ace_hidden {\n    opacity: 0.2;\n}\n\n.ace_line {\n    white-space: nowrap;\n}\n\n.ace_marker-layer .ace_step {\n    position: absolute;\n    z-index: 3;\n}\n\n.ace_marker-layer .ace_selection {\n    position: absolute;\n    z-index: 4;\n}\n\n.ace_marker-layer .ace_bracket {\n    position: absolute;\n    z-index: 5;\n}\n\n.ace_marker-layer .ace_active_line {\n    position: absolute;\n    z-index: 2;\n}\n\n.ace_marker-layer .ace_selected_word {\n    position: absolute;\n    z-index: 6;\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n}\n\n.ace_line .ace_fold {\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n    \n    display: inline-block;\n    height: 11px;\n    margin-top: -2px;\n    vertical-align: middle;\n\n    background-image: \n        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%11%00%00%00%09%08%06%00%00%00%D4%E8%C7%0C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%B5IDAT(%15%A5%91%3D%0E%02!%10%85ac%E1%05%D6%CE%D6%C6%CE%D2%E8%ED%CD%DE%C0%C6%D6N.%E0V%F8%3D%9Ca%891XH%C2%BE%D9y%3F%90!%E6%9C%C3%BFk%E5%011%C6-%F5%C8N%04%DF%BD%FF%89%DFt%83DN%60%3E%F3%AB%A0%DE%1A%5Dg%BE%10Q%97%1B%40%9C%A8o%10%8F%5E%828%B4%1B%60%87%F6%02%26%85%1Ch%1E%C1%2B%5Bk%FF%86%EE%B7j%09%9A%DA%9B%ACe%A3%F9%EC%DA!9%B4%D5%A6%81%86%86%98%CC%3C%5B%40%FA%81%B3%E9%CB%23%94%C16Azo%05%D4%E1%C1%95a%3B%8A'%A0%E8%CC%17%22%85%1D%BA%00%A2%FA%DC%0A%94%D1%D1%8D%8B%3A%84%17B%C7%60%1A%25Z%FC%8D%00%00%00%00IEND%AEB%60%82\"),\n        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%007%08%06%00%00%00%C4%DD%80C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%3AIDAT8%11c%FC%FF%FF%7F%18%03%1A%60%01%F2%3F%A0%891%80%04%FF%11-%F8%17%9BJ%E2%05%B1ZD%81v%26t%E7%80%F8%A3%82h%A12%1A%20%A3%01%02%0F%01%BA%25%06%00%19%C0%0D%AEF%D5%3ES%00%00%00%00IEND%AEB%60%82\");\n    background-repeat: no-repeat, repeat-x;\n    background-position: center center, top left;\n    color: transparent;\n\n    border: 1px solid black;\n    -moz-border-radius: 2px;\n    -webkit-border-radius: 2px;\n    border-radius: 2px;\n    \n    cursor: pointer;\n    pointer-events: auto;\n}\n\n.ace_dark .ace_fold {\n}\n\n.ace_fold:hover{\n    background-image: \n        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%11%00%00%00%09%08%06%00%00%00%D4%E8%C7%0C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%B5IDAT(%15%A5%91%3D%0E%02!%10%85ac%E1%05%D6%CE%D6%C6%CE%D2%E8%ED%CD%DE%C0%C6%D6N.%E0V%F8%3D%9Ca%891XH%C2%BE%D9y%3F%90!%E6%9C%C3%BFk%E5%011%C6-%F5%C8N%04%DF%BD%FF%89%DFt%83DN%60%3E%F3%AB%A0%DE%1A%5Dg%BE%10Q%97%1B%40%9C%A8o%10%8F%5E%828%B4%1B%60%87%F6%02%26%85%1Ch%1E%C1%2B%5Bk%FF%86%EE%B7j%09%9A%DA%9B%ACe%A3%F9%EC%DA!9%B4%D5%A6%81%86%86%98%CC%3C%5B%40%FA%81%B3%E9%CB%23%94%C16Azo%05%D4%E1%C1%95a%3B%8A'%A0%E8%CC%17%22%85%1D%BA%00%A2%FA%DC%0A%94%D1%D1%8D%8B%3A%84%17B%C7%60%1A%25Z%FC%8D%00%00%00%00IEND%AEB%60%82\"),\n        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%007%08%06%00%00%00%C4%DD%80C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%003IDAT8%11c%FC%FF%FF%7F%3E%03%1A%60%01%F2%3F%A3%891%80%04%FFQ%26%F8w%C0%B43%A1%DB%0C%E2%8F%0A%A2%85%CAh%80%8C%06%08%3C%04%E8%96%18%00%A3S%0D%CD%CF%D8%C1%9D%00%00%00%00IEND%AEB%60%82\");\n    background-repeat: no-repeat, repeat-x;\n    background-position: center center, top left;\n}\n\n.ace_dragging .ace_content {\n    cursor: move;\n}\n\n.ace_folding-enabled .ace_gutter-cell {\n    padding-right: 13px;\n}\n\n.ace_fold-widget {\n    box-sizing: border-box;\n    -moz-box-sizing: border-box;\n    -webkit-box-sizing: border-box;\n\n    margin: 0 -12px 1px 1px;\n    display: inline-block;\n    height: 14px;\n    width: 11px;\n    vertical-align: text-bottom;\n    \n    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAe%8A%B1%0D%000%0C%C2%F2%2CK%96%BC%D0%8F9%81%88H%E9%D0%0E%96%C0%10%92%3E%02%80%5E%82%E4%A9*-%EEsw%C8%CC%11%EE%96w%D8%DC%E9*Eh%0C%151(%00%00%00%00IEND%AEB%60%82\");\n    background-repeat: no-repeat;\n    background-position: center 5px;\n\n    border-radius: 3px;\n}\n\n.ace_fold-widget.end {\n    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAm%C7%C1%09%000%08C%D1%8C%ECE%C8E(%8E%EC%02)%1EZJ%F1%C1'%04%07I%E1%E5%EE%CAL%F5%A2%99%99%22%E2%D6%1FU%B5%FE0%D9x%A7%26Wz5%0E%D5%00%00%00%00IEND%AEB%60%82\");\n}\n\n.ace_fold-widget.closed {\n    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%03%00%00%00%06%08%06%00%00%00%06%E5%24%0C%00%00%009IDATx%DA5%CA%C1%09%000%08%03%C0%AC*(%3E%04%C1%0D%BA%B1%23%A4Uh%E0%20%81%C0%CC%F8%82%81%AA%A2%AArGfr%88%08%11%11%1C%DD%7D%E0%EE%5B%F6%F6%CB%B8%05Q%2F%E9tai%D9%00%00%00%00IEND%AEB%60%82\");\n}\n\n.ace_fold-widget:hover {\n    border: 1px solid rgba(0, 0, 0, 0.3);\n    background-color: rgba(255, 255, 255, 0.2);\n    -moz-box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n    -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n    -webkit-box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n    -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n    box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n    box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n    background-position: center 4px;\n}\n\n.ace_fold-widget:active {\n    border: 1px solid rgba(0, 0, 0, 0.4);\n    background-color: rgba(0, 0, 0, 0.05);\n    -moz-box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n    -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n    -webkit-box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n    -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n    box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n    box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n}\n\n.ace_fold-widget.invalid {\n    background-color: #FFB4B4;\n    border-color: #DE5555;\n}\n"),define("ace/theme/textmate",["require","exports","module","ace/lib/dom"],function(a,b,c){"use strict",b.isDark=!1,b.cssClass="ace-tm",b.cssText=".ace-tm .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-tm .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-tm .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-tm .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-tm .ace_fold {    background-color: #0000A2;}.ace-tm .ace_text-layer {  cursor: text;}.ace-tm .ace_cursor {  border-left: 2px solid black;}.ace-tm .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid black;}        .ace-tm .ace_line .ace_invisible {  color: rgb(191, 191, 191);}.ace-tm .ace_line .ace_keyword {  color: blue;}.ace-tm .ace_line .ace_constant.ace_buildin {  color: rgb(88, 72, 246);}.ace-tm .ace_line .ace_constant.ace_language {  color: rgb(88, 92, 246);}.ace-tm .ace_line .ace_constant.ace_library {  color: rgb(6, 150, 14);}.ace-tm .ace_line .ace_invalid {  background-color: rgb(153, 0, 0);  color: white;}.ace-tm .ace_line .ace_support.ace_function {  color: rgb(60, 76, 114);}.ace-tm .ace_line .ace_support.ace_constant {  color: rgb(6, 150, 14);}.ace-tm .ace_line .ace_support.ace_type,.ace-tm .ace_line .ace_support.ace_class {  color: rgb(109, 121, 222);}.ace-tm .ace_line .ace_keyword.ace_operator {  color: rgb(104, 118, 135);}.ace-tm .ace_line .ace_string {  color: rgb(3, 106, 7);}.ace-tm .ace_line .ace_comment {  color: rgb(76, 136, 107);}.ace-tm .ace_line .ace_comment.ace_doc {  color: rgb(0, 102, 255);}.ace-tm .ace_line .ace_comment.ace_doc.ace_tag {  color: rgb(128, 159, 191);}.ace-tm .ace_line .ace_constant.ace_numeric {  color: rgb(0, 0, 205);}.ace-tm .ace_line .ace_variable {  color: rgb(49, 132, 149);}.ace-tm .ace_line .ace_xml_pe {  color: rgb(104, 104, 91);}.ace-tm .ace_entity.ace_name.ace_function {  color: #0000A2;}.ace-tm .ace_markup.ace_markupine {    text-decoration:underline;}.ace-tm .ace_markup.ace_heading {  color: rgb(12, 7, 255);}.ace-tm .ace_markup.ace_list {  color:rgb(185, 6, 144);}.ace-tm .ace_marker-layer .ace_selection {  background: rgb(181, 213, 255);}.ace-tm .ace_marker-layer .ace_step {  background: rgb(252, 255, 0);}.ace-tm .ace_marker-layer .ace_stack {  background: rgb(164, 229, 101);}.ace-tm .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid rgb(192, 192, 192);}.ace-tm .ace_marker-layer .ace_active_line {  background: rgba(0, 0, 0, 0.07);}.ace-tm .ace_marker-layer .ace_selected_word {  background: rgb(250, 250, 255);  border: 1px solid rgb(200, 200, 250);}.ace-tm .ace_meta.ace_tag {  color:rgb(28, 2, 255);}.ace-tm .ace_string.ace_regex {  color: rgb(255, 0, 0)}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/keybinding-emacs.js b/apps/files_texteditor/js/aceeditor/keybinding-emacs.js
old mode 100644
new mode 100755
index 5c99b14f086..7ddcd7623bd
--- a/apps/files_texteditor/js/aceeditor/keybinding-emacs.js
+++ b/apps/files_texteditor/js/aceeditor/keybinding-emacs.js
@@ -1 +1 @@
-define("ace/keyboard/keybinding/emacs",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){var d=a("ace/keyboard/state_handler").StateHandler,e=a("ace/keyboard/state_handler").matchCharacterOnly,f={start:[{key:"ctrl-x",then:"c-x"},{regex:["(?:command-([0-9]*))*","(down|ctrl-n)"],exec:"golinedown",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(right|ctrl-f)"],exec:"gotoright",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(up|ctrl-p)"],exec:"golineup",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(left|ctrl-b)"],exec:"gotoleft",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{comment:"This binding matches all printable characters except numbers as long as they are no numbers and print them n times.",regex:["(?:command-([0-9]*))","([^0-9]+)*"],match:e,exec:"inserttext",params:[{name:"times",match:1,type:"number",defaultValue:"1"},{name:"text",match:2}]},{comment:"This binding matches numbers as long as there is no meta_number in the buffer.",regex:["(command-[0-9]*)*","([0-9]+)"],match:e,disallowMatches:[1],exec:"inserttext",params:[{name:"text",match:2,type:"text"}]},{regex:["command-([0-9]*)","(command-[0-9]|[0-9])"],comment:"Stops execution if the regex /meta_[0-9]+/ matches to avoid resetting the buffer."}],"c-x":[{key:"ctrl-g",then:"start"},{key:"ctrl-s",exec:"save",then:"start"}]};b.Emacs=new d(f)}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(state in a)this.$buildBindingsRegex(a[state]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?(a.key=new RegExp("^"+a.regex[1]+"$"),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c){if(a.state==null||a.buffer==null)a.state="start",a.buffer="";var d=[];b&1&&d.push("ctrl"),b&8&&d.push("command"),b&2&&d.push("option"),b&4&&d.push("shift"),c&&d.push(c);var e=d.join("-"),f=a.buffer+e;b!=2&&(a.buffer=f);return{bufferToUse:f,symbolicName:e}},$find:function(a,b,c,e,f){var g={};this.keymapping[a.state].some(function(h){var i;if(h.key&&!h.key.test(c))return!1;if(h.regex&&!(i=h.regex.exec(b)))return!1;if(h.match&&!h.match(b,e,f,c))return!1;if(h.disallowMatches)for(var j=0;j<h.disallowMatches.length;j++)if(!!i[h.disallowMatches[j]])return!1;if(h.exec){g.command=h.exec;if(h.params){var k;g.args={},h.params.forEach(function(a){a.match!=null&&i!=null?k=i[a.match]||a.defaultValue:k=a.defaultValue,a.type==="number"&&(k=parseInt(k)),g.args[a.name]=k})}a.buffer=""}h.then&&(a.state=h.then,a.buffer=""),g.command==null&&(g.command="null"),d&&console.log("KeyboardStateMapper#find",h);return!0});if(g.command)return g;a.buffer="";return!1},handleKeyboard:function(a,b,c){if(b==0||c!=""&&c!=String.fromCharCode(0)){var e=this.$composeBuffer(a,b,c),f=e.bufferToUse,g=e.symbolicName;e=this.$find(a,f,g,b,c),d&&console.log("KeyboardStateMapper#match",f,g,e);return e}return null}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e})
\ No newline at end of file
+define("ace/keyboard/keybinding/emacs",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){"use strict";var d=a("../state_handler").StateHandler,e=a("../state_handler").matchCharacterOnly,f={start:[{key:"ctrl-x",then:"c-x"},{regex:["(?:command-([0-9]*))*","(down|ctrl-n)"],exec:"golinedown",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(right|ctrl-f)"],exec:"gotoright",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(up|ctrl-p)"],exec:"golineup",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(left|ctrl-b)"],exec:"gotoleft",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{comment:"This binding matches all printable characters except numbers as long as they are no numbers and print them n times.",regex:["(?:command-([0-9]*))","([^0-9]+)*"],match:e,exec:"inserttext",params:[{name:"times",match:1,type:"number",defaultValue:"1"},{name:"text",match:2}]},{comment:"This binding matches numbers as long as there is no meta_number in the buffer.",regex:["(command-[0-9]*)*","([0-9]+)"],match:e,disallowMatches:[1],exec:"inserttext",params:[{name:"text",match:2,type:"text"}]},{regex:["command-([0-9]*)","(command-[0-9]|[0-9])"],comment:"Stops execution if the regex /meta_[0-9]+/ matches to avoid resetting the buffer."}],"c-x":[{key:"ctrl-g",then:"start"},{key:"ctrl-s",exec:"save",then:"start"}]};b.Emacs=new d(f)}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}"use strict";var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(var b in a)this.$buildBindingsRegex(a[b]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?("key"in a||(a.key=new RegExp("^"+a.regex[1]+"$")),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c,d){if(a.state==null||a.buffer==null)a.state="start",a.buffer="";var e=[];b&1&&e.push("ctrl"),b&8&&e.push("command"),b&2&&e.push("option"),b&4&&e.push("shift"),c&&e.push(c);var f=e.join("-"),g=a.buffer+f;b!=2&&(a.buffer=g);var h={bufferToUse:g,symbolicName:f};return d&&(h.keyIdentifier=d.keyIdentifier),h},$find:function(a,b,c,e,f,g){var h={};return this.keymapping[a.state].some(function(i){var j;if(i.key&&!i.key.test(c))return!1;if(i.regex&&!(j=i.regex.exec(b)))return!1;if(i.match&&!i.match(b,e,f,c,g))return!1;if(i.disallowMatches)for(var k=0;k<i.disallowMatches.length;k++)if(!!j[i.disallowMatches[k]])return!1;if(i.exec){h.command=i.exec;if(i.params){var l;h.args={},i.params.forEach(function(a){a.match!=null&&j!=null?l=j[a.match]||a.defaultValue:l=a.defaultValue,a.type==="number"&&(l=parseInt(l)),h.args[a.name]=l})}a.buffer=""}return i.then&&(a.state=i.then,a.buffer=""),h.command==null&&(h.command="null"),d&&console.log("KeyboardStateMapper#find",i),!0}),h.command?h:(a.buffer="",!1)},handleKeyboard:function(a,b,c,e,f){if(b==0||c!=""&&c!=String.fromCharCode(0)){var g=this.$composeBuffer(a,b,c,f),h=g.bufferToUse,i=g.symbolicName,j=g.keyIdentifier;return g=this.$find(a,h,i,b,c,j),d&&console.log("KeyboardStateMapper#match",h,i,g),g}return null}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/keybinding-vim.js b/apps/files_texteditor/js/aceeditor/keybinding-vim.js
old mode 100644
new mode 100755
index f49e87640aa..fa94c7955f1
--- a/apps/files_texteditor/js/aceeditor/keybinding-vim.js
+++ b/apps/files_texteditor/js/aceeditor/keybinding-vim.js
@@ -1 +1 @@
-define("ace/keyboard/keybinding/vim",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){var d=a("ace/keyboard/state_handler").StateHandler,e=a("ace/keyboard/state_handler").matchCharacterOnly,f={start:[{key:"i",then:"insertMode"},{key:"d",then:"deleteMode"},{key:"a",exec:"gotoright",then:"insertMode"},{key:"shift-i",exec:"gotolinestart",then:"insertMode"},{key:"shift-a",exec:"gotolineend",then:"insertMode"},{key:"shift-c",exec:"removetolineend",then:"insertMode"},{key:"shift-r",exec:"overwrite",then:"replaceMode"},{regex:["([0-9]*)","(k|up)"],exec:"golineup",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["([0-9]*)","(j|down|enter)"],exec:"golinedown",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["([0-9]*)","(l|right)"],exec:"gotoright",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["([0-9]*)","(h|left)"],exec:"gotoleft",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{key:"shift-g",exec:"gotoend"},{key:"b",exec:"gotowordleft"},{key:"e",exec:"gotowordright"},{key:"x",exec:"del"},{key:"shift-x",exec:"backspace"},{key:"shift-d",exec:"removetolineend"},{comment:"Catch some keyboard input to stop it here",match:e}],insertMode:[{key:"esc",then:"start"}],replaceMode:[{key:"esc",exec:"overwrite",then:"start"}],deleteMode:[{key:"d",exec:"removeline",then:"start"}]};b.Vim=new d(f)}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(state in a)this.$buildBindingsRegex(a[state]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?(a.key=new RegExp("^"+a.regex[1]+"$"),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c){if(a.state==null||a.buffer==null)a.state="start",a.buffer="";var d=[];b&1&&d.push("ctrl"),b&8&&d.push("command"),b&2&&d.push("option"),b&4&&d.push("shift"),c&&d.push(c);var e=d.join("-"),f=a.buffer+e;b!=2&&(a.buffer=f);return{bufferToUse:f,symbolicName:e}},$find:function(a,b,c,e,f){var g={};this.keymapping[a.state].some(function(h){var i;if(h.key&&!h.key.test(c))return!1;if(h.regex&&!(i=h.regex.exec(b)))return!1;if(h.match&&!h.match(b,e,f,c))return!1;if(h.disallowMatches)for(var j=0;j<h.disallowMatches.length;j++)if(!!i[h.disallowMatches[j]])return!1;if(h.exec){g.command=h.exec;if(h.params){var k;g.args={},h.params.forEach(function(a){a.match!=null&&i!=null?k=i[a.match]||a.defaultValue:k=a.defaultValue,a.type==="number"&&(k=parseInt(k)),g.args[a.name]=k})}a.buffer=""}h.then&&(a.state=h.then,a.buffer=""),g.command==null&&(g.command="null"),d&&console.log("KeyboardStateMapper#find",h);return!0});if(g.command)return g;a.buffer="";return!1},handleKeyboard:function(a,b,c){if(b==0||c!=""&&c!=String.fromCharCode(0)){var e=this.$composeBuffer(a,b,c),f=e.bufferToUse,g=e.symbolicName;e=this.$find(a,f,g,b,c),d&&console.log("KeyboardStateMapper#match",f,g,e);return e}return null}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e})
\ No newline at end of file
+define("ace/keyboard/keybinding/vim",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){"use strict";var d=a("../state_handler").StateHandler,e=a("../state_handler").matchCharacterOnly,f=function(a,b,c){return{regex:["([0-9]*)",a],exec:b,params:[{name:"times",match:1,type:"number",defaultValue:1}],then:c}},g={start:[{key:"i",then:"insertMode"},{key:"d",then:"deleteMode"},{key:"a",exec:"gotoright",then:"insertMode"},{key:"shift-i",exec:"gotolinestart",then:"insertMode"},{key:"shift-a",exec:"gotolineend",then:"insertMode"},{key:"shift-c",exec:"removetolineend",then:"insertMode"},{key:"shift-r",exec:"overwrite",then:"replaceMode"},f("(k|up)","golineup"),f("(j|down)","golinedown"),f("(l|right)","gotoright"),f("(h|left)","gotoleft"),{key:"shift-g",exec:"gotoend"},f("b","gotowordleft"),f("e","gotowordright"),f("x","del"),f("shift-x","backspace"),f("shift-d","removetolineend"),f("u","undo"),{comment:"Catch some keyboard input to stop it here",match:e}],insertMode:[{key:"esc",then:"start"}],replaceMode:[{key:"esc",exec:"overwrite",then:"start"}],deleteMode:[{key:"d",exec:"removeline",then:"start"}]};b.Vim=new d(g)}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}"use strict";var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(var b in a)this.$buildBindingsRegex(a[b]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?("key"in a||(a.key=new RegExp("^"+a.regex[1]+"$")),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c,d){if(a.state==null||a.buffer==null)a.state="start",a.buffer="";var e=[];b&1&&e.push("ctrl"),b&8&&e.push("command"),b&2&&e.push("option"),b&4&&e.push("shift"),c&&e.push(c);var f=e.join("-"),g=a.buffer+f;b!=2&&(a.buffer=g);var h={bufferToUse:g,symbolicName:f};return d&&(h.keyIdentifier=d.keyIdentifier),h},$find:function(a,b,c,e,f,g){var h={};return this.keymapping[a.state].some(function(i){var j;if(i.key&&!i.key.test(c))return!1;if(i.regex&&!(j=i.regex.exec(b)))return!1;if(i.match&&!i.match(b,e,f,c,g))return!1;if(i.disallowMatches)for(var k=0;k<i.disallowMatches.length;k++)if(!!j[i.disallowMatches[k]])return!1;if(i.exec){h.command=i.exec;if(i.params){var l;h.args={},i.params.forEach(function(a){a.match!=null&&j!=null?l=j[a.match]||a.defaultValue:l=a.defaultValue,a.type==="number"&&(l=parseInt(l)),h.args[a.name]=l})}a.buffer=""}return i.then&&(a.state=i.then,a.buffer=""),h.command==null&&(h.command="null"),d&&console.log("KeyboardStateMapper#find",i),!0}),h.command?h:(a.buffer="",!1)},handleKeyboard:function(a,b,c,e,f){if(b==0||c!=""&&c!=String.fromCharCode(0)){var g=this.$composeBuffer(a,b,c,f),h=g.bufferToUse,i=g.symbolicName,j=g.keyIdentifier;return g=this.$find(a,h,i,b,c,j),d&&console.log("KeyboardStateMapper#match",h,i,g),g}return null}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-c_cpp.js b/apps/files_texteditor/js/aceeditor/mode-c_cpp.js
index 6122ba5e902..c49e93eb937 100644
--- a/apps/files_texteditor/js/aceeditor/mode-c_cpp.js
+++ b/apps/files_texteditor/js/aceeditor/mode-c_cpp.js
@@ -1 +1 @@
-define("ace/mode/c_cpp",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/c_cpp_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/c_cpp_highlight_rules").c_cppHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=a("ace/mode/behaviour/cstyle").CstyleBehaviour,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new j};d.inherits(k,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)\/\//;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[]\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(k.prototype),b.Mode=k}),define("ace/mode/c_cpp_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules,g=a("ace/mode/text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("and|double|not_eq|throw|and_eq|dynamic_cast|operator|true|asm|else|or|try|auto|enum|or_eq|typedef|bitand|explicit|private|typeid|bitor|extern|protected|typename|bool|false|public|union|break|float|register|unsigned|case|fro|reinterpret-cast|using|catch|friend|return|virtual|char|goto|short|void|class|if|signed|volatile|compl|inline|sizeof|wchar_t|const|int|static|while|const-cast|long|static_cast|xor|continue|mutable|struct|xor_eq|default|namespace|switch|delete|new|template|do|not|this|for".split("|")),b=e.arrayToMap("NULL".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant",regex:"<[a-zA-Z0-9.]+>"},{token:"keyword",regex:"(?:#include|#pragma|#line|#define|#undef|#ifdef|#else|#elif|#endif|#ifndef)"},{token:function(c){return c=="this"?"variable.language":a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.c_cppHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","pilot/oop","ace/mode/behaviour"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return!1;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}return!1}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}"){e.end.column++;return e}}return!1}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}return!1}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")"){e.end.column++;return e}}return!1}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return!1;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}return!1}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"'){e.end.column++;return e}}return!1})};d.inherits(f,e),b.CstyleBehaviour=f})
\ No newline at end of file
+define("ace/mode/c_cpp",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/c_cpp_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./c_cpp_highlight_rules").c_cppHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("./behaviour/cstyle").CstyleBehaviour,k=a("./folding/cstyle").FoldMode,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new j,this.foldingRules=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[]\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(l.prototype),b.Mode=l}),define("ace/mode/c_cpp_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("and|double|not_eq|throw|and_eq|dynamic_cast|operator|true|asm|else|or|try|auto|enum|or_eq|typedef|bitand|explicit|private|typeid|bitor|extern|protected|typename|bool|false|public|union|break|float|register|unsigned|case|fro|reinterpret-cast|using|catch|friend|return|virtual|char|goto|short|void|class|if|signed|volatile|compl|inline|sizeof|wchar_t|const|int|static|while|const-cast|long|static_cast|xor|continue|mutable|struct|xor_eq|default|namespace|switch|delete|new|template|do|not|this|for".split("|")),b=e.arrayToMap("NULL".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant",regex:"<[a-zA-Z0-9.]+>"},{token:"keyword",regex:"(?:#include|#pragma|#line|#define|#undef|#ifdef|#else|#elif|#endif|#ifndef)"},{token:function(c){return c=="this"?"variable.language":a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\."},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.c_cppHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return null;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-clojure.js b/apps/files_texteditor/js/aceeditor/mode-clojure.js
index 726de0c2be0..74e69fb0086 100644
--- a/apps/files_texteditor/js/aceeditor/mode-clojure.js
+++ b/apps/files_texteditor/js/aceeditor/mode-clojure.js
@@ -1 +1 @@
-define("ace/mode/clojure",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/clojure_highlight_rules","ace/mode/matching_parens_outdent","ace/range"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/clojure_highlight_rules").ClojureHighlightRules,h=a("ace/mode/matching_parens_outdent").MatchingParensOutdent,i=a("ace/range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)#/;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,";")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=d,f=this.$tokenizer.getLineTokens(b,a),g=f.tokens,h=f.state;if(g.length&&g[g.length-1].type=="comment")return d;if(a=="start"){var i=b.match(/[\(\[]/);i&&(d+="  "),i=b.match(/[\)]/),i&&(d="")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/clojure_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("* *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* *compile-path* *e *err* *file* *flush-on-newline* *in* *macro-meta* *math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* *source-path* *use-context-classloader* *warn-on-reflection* + - -> -&gt; ->> -&gt;&gt; .. / < &lt; <= &lt;= = == > &gt; >= &gt;= accessor aclone add-classpath add-watch agent agent-errors aget alength alias all-ns alter alter-meta! alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* butlast byte byte-array bytes cast char char-array char-escape-string char-name-string char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement concat cond condp conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec decimal? declare definline defmacro defmethod defmulti defn defn- defonce defstruct delay delay? deliver deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? doall doc dorun doseq dosync dotimes doto double double-array doubles drop drop-last drop-while empty empty? ensure enumeration-seq eval even? every? false? ffirst file-seq filter find find-doc find-ns find-var first float float-array float? floats flush fn fn? fnext for force format future future-call future-cancel future-cancelled? future-done? future? gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator hash hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc init-proxy instance? int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array make-hierarchy map map? mapcat max max-key memfn memoize merge merge-with meta method-sig methods min min-key mod name namespace neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias ns-unmap nth nthnext num number? odd? or parents partial partition pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers primitives-classnames print print-ctor print-doc print-dup print-method print-namespace-doc print-simple print-special-doc print-str printf println println-str prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot rand rand-int range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern re-seq read read-line read-string reduce ref ref-history-count ref-max-history ref-min-history ref-set refer refer-clojure release-pending-sends rem remove remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest resultset-seq reverse reversible? rseq rsubseq second select-keys send send-off seq seq? seque sequence sequential? set set-validator! set? short short-array shorts shutdown-agents slurp some sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? special-form-anchor special-symbol? split-at split-with str stream? string? struct struct-map subs subseq subvec supers swap! symbol symbol? sync syntax-symbol-anchor take take-last take-nth take-while test the-ns time to-array to-array-2d trampoline transient tree-seq true? type unchecked-add unchecked-dec unchecked-divide unchecked-inc unchecked-multiply unchecked-negate unchecked-remainder unchecked-subtract underive unquote unquote-splicing update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector? when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context with-local-vars with-meta with-open with-out-str with-precision xml-seq zero? zipmap ".split(" ")),b=e.arrayToMap("def do fn if let loop monitor-enter monitor-exit new quote recur set! throw try var".split(" ")),c=e.arrayToMap("true false nil".split(" "));this.$rules={start:[{token:"comment",regex:";.*$"},{token:"comment",regex:"^=begin$",next:"comment"},{token:"keyword",regex:"[\\(|\\)]"},{token:"keyword",regex:"[\\'\\(]"},{token:"keyword",regex:"[\\[|\\]]"},{token:"keyword",regex:"[\\{|\\}|\\#\\{|\\#\\}]"},{token:"keyword",regex:"[\\&]"},{token:"keyword",regex:"[\\#\\^\\{]"},{token:"keyword",regex:"[\\%]"},{token:"keyword",regex:"[@]"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language",regex:"[!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+||=|!=|<=|>=|<>|<|>|!|&&]"},{token:function(d){return b.hasOwnProperty(d)?"keyword":c.hasOwnProperty(d)?"constant.language":a.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"[:](?:[a-zA-Z]|d)+"},{token:"string.regexp",regex:'/#"(?:.|(\\")|[^""\n])*"/g'}],comment:[{token:"comment",regex:"^=end$",next:"start"},{token:"comment",merge:!0,regex:".+"}]}};d.inherits(g,f),b.ClojureHighlightRules=g}),define("ace/mode/matching_parens_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\)/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\))/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingParensOutdent=e})
\ No newline at end of file
+define("ace/mode/clojure",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/clojure_highlight_rules","ace/mode/matching_parens_outdent","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./clojure_highlight_rules").ClojureHighlightRules,h=a("./matching_parens_outdent").MatchingParensOutdent,i=a("../range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,";")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/[\(\[]/);g&&(d+="  "),g=b.match(/[\)]/),g&&(d="")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/clojure_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("* *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* *compile-path* *e *err* *file* *flush-on-newline* *in* *macro-meta* *math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* *source-path* *use-context-classloader* *warn-on-reflection* + - -> -&gt; ->> -&gt;&gt; .. / < &lt; <= &lt;= = == > &gt; >= &gt;= accessor aclone add-classpath add-watch agent agent-errors aget alength alias all-ns alter alter-meta! alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* butlast byte byte-array bytes cast char char-array char-escape-string char-name-string char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement concat cond condp conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec decimal? declare definline defmacro defmethod defmulti defn defn- defonce defstruct delay delay? deliver deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? doall doc dorun doseq dosync dotimes doto double double-array doubles drop drop-last drop-while empty empty? ensure enumeration-seq eval even? every? false? ffirst file-seq filter find find-doc find-ns find-var first float float-array float? floats flush fn fn? fnext for force format future future-call future-cancel future-cancelled? future-done? future? gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator hash hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc init-proxy instance? int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array make-hierarchy map map? mapcat max max-key memfn memoize merge merge-with meta method-sig methods min min-key mod name namespace neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias ns-unmap nth nthnext num number? odd? or parents partial partition pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers primitives-classnames print print-ctor print-doc print-dup print-method print-namespace-doc print-simple print-special-doc print-str printf println println-str prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot rand rand-int range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern re-seq read read-line read-string reduce ref ref-history-count ref-max-history ref-min-history ref-set refer refer-clojure release-pending-sends rem remove remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest resultset-seq reverse reversible? rseq rsubseq second select-keys send send-off seq seq? seque sequence sequential? set set-validator! set? short short-array shorts shutdown-agents slurp some sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? special-form-anchor special-symbol? split-at split-with str stream? string? struct struct-map subs subseq subvec supers swap! symbol symbol? sync syntax-symbol-anchor take take-last take-nth take-while test the-ns time to-array to-array-2d trampoline transient tree-seq true? type unchecked-add unchecked-dec unchecked-divide unchecked-inc unchecked-multiply unchecked-negate unchecked-remainder unchecked-subtract underive unquote unquote-splicing update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector? when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context with-local-vars with-meta with-open with-out-str with-precision xml-seq zero? zipmap ".split(" ")),b=e.arrayToMap("def do fn if let loop monitor-enter monitor-exit new quote recur set! throw try var".split(" ")),c=e.arrayToMap("true false nil".split(" "));this.$rules={start:[{token:"comment",regex:";.*$"},{token:"comment",regex:"^=begin$",next:"comment"},{token:"keyword",regex:"[\\(|\\)]"},{token:"keyword",regex:"[\\'\\(]"},{token:"keyword",regex:"[\\[|\\]]"},{token:"keyword",regex:"[\\{|\\}|\\#\\{|\\#\\}]"},{token:"keyword",regex:"[\\&]"},{token:"keyword",regex:"[\\#\\^\\{]"},{token:"keyword",regex:"[\\%]"},{token:"keyword",regex:"[@]"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language",regex:"[!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+||=|!=|<=|>=|<>|<|>|!|&&]"},{token:function(d){return b.hasOwnProperty(d)?"keyword":c.hasOwnProperty(d)?"constant.language":a.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"[:](?:[a-zA-Z]|d)+"},{token:"string.regexp",regex:'/#"(?:.|(\\")|[^""\n])*"/g'}],comment:[{token:"comment",regex:"^=end$",next:"start"},{token:"comment",merge:!0,regex:".+"}]}};d.inherits(g,f),b.ClojureHighlightRules=g}),define("ace/mode/matching_parens_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\)/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\))/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingParensOutdent=e}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-coffee.js b/apps/files_texteditor/js/aceeditor/mode-coffee.js
index 14e25f2ca25..c42e1f801c0 100644
--- a/apps/files_texteditor/js/aceeditor/mode-coffee.js
+++ b/apps/files_texteditor/js/aceeditor/mode-coffee.js
@@ -1 +1 @@
-define("ace/mode/coffee",["require","exports","module","ace/tokenizer","ace/mode/coffee_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/text","ace/worker/worker_client","pilot/oop"],function(a,b,c){function k(){this.$tokenizer=new d((new e).getRules()),this.$outdent=new f}var d=a("ace/tokenizer").Tokenizer,e=a("ace/mode/coffee_highlight_rules").CoffeeHighlightRules,f=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,g=a("ace/range").Range,h=a("ace/mode/text").Mode,i=a("ace/worker/worker_client").WorkerClient,j=a("pilot/oop");j.inherits(k,h),function(){var a=/(?:[({[=:]|[-=]>|\b(?:else|switch|try|catch(?:\s*[$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*)?|finally))\s*$/,b=/^(\s*)#/,c=/^\s*###(?!#)/,d=/^\s*/;this.getNextLineIndent=function(b,c,d){var e=this.$getIndent(c),f=this.$tokenizer.getLineTokens(c,b).tokens;(!f.length||f[f.length-1].type!=="comment")&&b==="start"&&a.test(c)&&(e+=d);return e},this.toggleCommentLines=function(a,e,f,h){console.log("toggle");var i=new g(0,0,0,0);for(var j=f;j<=h;++j){var k=e.getLine(j);if(c.test(k))continue;b.test(k)?k=k.replace(b,"$1"):k=k.replace(d,"$&#"),i.end.row=i.start.row=j,i.end.column=k.length+1,e.replace(i,k)}},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=a.getDocument(),c=new i(["ace","pilot"],"worker-coffee.js","ace/mode/coffee_worker","Worker");c.call("setValue",[b.getValue()]),b.on("change",function(a){a.range={start:a.data.range.start,end:a.data.range.end},c.emit("change",a)}),c.on("error",function(b){a.setAnnotations([b.data])}),c.on("ok",function(b){a.clearAnnotations()})}}.call(k.prototype),b.Mode=k}),define("ace/mode/coffee_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){function d(){var a="[$A-Za-z_\\x7f-\\uffff][$\\w\\x7f-\\uffff]*",b="(?![$\\w]|\\s*:)",c={token:"string",merge:!0,regex:".+"};this.$rules={start:[{token:"identifier",regex:"(?:@|(?:\\.|::)\\s*)"+a},{token:"keyword",regex:"(?:t(?:h(?:is|row|en)|ry|ypeof)|s(?:uper|witch)|return|b(?:reak|y)|c(?:ontinue|atch|lass)|i(?:n(?:stanceof)?|s(?:nt)?|f)|e(?:lse|xtends)|f(?:or (?:own)?|inally|unction)|wh(?:ile|en)|n(?:ew|ot?)|d(?:e(?:lete|bugger)|o)|loop|o(?:ff?|[rn])|un(?:less|til)|and|yes)"+b},{token:"constant.language",regex:"(?:true|false|null|undefined)"+b},{token:"invalid.illegal",regex:"(?:c(?:ase|onst)|default|function|v(?:ar|oid)|with|e(?:num|xport)|i(?:mplements|nterface)|let|p(?:ackage|r(?:ivate|otected)|ublic)|static|yield|__(?:hasProp|extends|slice|bind|indexOf))"+b},{token:"language.support.class",regex:"(?:Array|Boolean|Date|Function|Number|Object|R(?:e(?:gExp|ferenceError)|angeError)|S(?:tring|yntaxError)|E(?:rror|valError)|TypeError|URIError)"+b},{token:"language.support.function",regex:"(?:Math|JSON|is(?:NaN|Finite)|parse(?:Int|Float)|encodeURI(?:Component)?|decodeURI(?:Component)?)"+b},{token:"identifier",regex:a},{token:"constant.numeric",regex:"(?:0x[\\da-fA-F]+|(?:\\d+(?:\\.\\d+)?|\\.\\d+)(?:[eE][+-]?\\d+)?)"},{token:"string",merge:!0,regex:"'''",next:"qdoc"},{token:"string",merge:!0,regex:'"""',next:"qqdoc"},{token:"string",merge:!0,regex:"'",next:"qstring"},{token:"string",merge:!0,regex:'"',next:"qqstring"},{token:"string",merge:!0,regex:"`",next:"js"},{token:"string.regex",merge:!0,regex:"///",next:"heregex"},{token:"string.regex",regex:"/(?!\\s)[^[/\\n\\\\]*(?: (?:\\\\.|\\[[^\\]\\n\\\\]*(?:\\\\.[^\\]\\n\\\\]*)*\\])[^[/\\n\\\\]*)*/[imgy]{0,4}(?!\\w)"},{token:"comment",merge:!0,regex:"###(?!#)",next:"comment"},{token:"comment",regex:"#.*"},{token:"lparen",regex:"[({[]"},{token:"rparen",regex:"[\\]})]"},{token:"keyword.operator",regex:"\\S+"},{token:"text",regex:"\\s+"}],qdoc:[{token:"string",regex:".*?'''",next:"start"},c],qqdoc:[{token:"string",regex:'.*?"""',next:"start"},c],qstring:[{token:"string",regex:"[^\\\\']*(?:\\\\.[^\\\\']*)*'",next:"start"},c],qqstring:[{token:"string",regex:'[^\\\\"]*(?:\\\\.[^\\\\"]*)*"',next:"start"},c],js:[{token:"string",merge:!0,regex:"[^\\\\`]*(?:\\\\.[^\\\\`]*)*`",next:"start"},c],heregex:[{token:"string.regex",regex:".*?///[imgy]{0,4}",next:"start"},{token:"comment.regex",regex:"\\s+(?:#.*)?"},{token:"string.regex",merge:!0,regex:"\\S+"}],comment:[{token:"comment",regex:".*?###",next:"start"},{token:"comment",merge:!0,regex:".+"}]}}a("pilot/oop").inherits(d,a("ace/mode/text_highlight_rules").TextHighlightRules),b.CoffeeHighlightRules=d}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","pilot/oop","pilot/event_emitter"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=function(b,c,d,e){this.callbacks=[];if(a.packaged)var f=this.$guessBasePath(),g=this.$worker=new Worker(f+c);else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_")),g=this.$worker=new Worker(h),i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:d,classname:e}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){window.console&&console.log&&console.log(a);throw a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._dispatchEvent(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};(function(){d.implement(this,e),this.$normalizePath=function(a){a.match(/^\w+:/)||(a=location.protocol+"//"+location.host+location.pathname+"/"+a);return a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace-uncompressed\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._dispatchEvent("terminate",{}),this.$worker.terminate()},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){this.$worker.postMessage({event:a,data:b})}}).call(f.prototype),b.WorkerClient=f})
\ No newline at end of file
+define("ace/mode/coffee",["require","exports","module","ace/tokenizer","ace/mode/coffee_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/folding/pythonic","ace/range","ace/mode/text","ace/worker/worker_client","ace/lib/oop"],function(a,b,c){function l(){this.$tokenizer=new d((new e).getRules()),this.$outdent=new f,this.foldingRules=new g("=|=>|->|\\s*class [^#]*")}"use strict";var d=a("../tokenizer").Tokenizer,e=a("./coffee_highlight_rules").CoffeeHighlightRules,f=a("./matching_brace_outdent").MatchingBraceOutdent,g=a("./folding/pythonic").FoldMode,h=a("../range").Range,i=a("./text").Mode,j=a("../worker/worker_client").WorkerClient,k=a("../lib/oop");k.inherits(l,i),function(){var a=/(?:[({[=:]|[-=]>|\b(?:else|switch|try|catch(?:\s*[$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*)?|finally))\s*$/,b=/^(\s*)#/,c=/^\s*###(?!#)/,d=/^\s*/;this.getNextLineIndent=function(b,c,d){var e=this.$getIndent(c),f=this.$tokenizer.getLineTokens(c,b).tokens;return(!f.length||f[f.length-1].type!=="comment")&&b==="start"&&a.test(c)&&(e+=d),e},this.toggleCommentLines=function(a,e,f,g){console.log("toggle");var i=new h(0,0,0,0);for(var j=f;j<=g;++j){var k=e.getLine(j);if(c.test(k))continue;b.test(k)?k=k.replace(b,"$1"):k=k.replace(d,"$&#"),i.end.row=i.start.row=j,i.end.column=k.length+1,e.replace(i,k)}},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-coffee.js","ace/mode/coffee_worker","Worker");return b.attachToDocument(a.getDocument()),b.on("error",function(b){a.setAnnotations([b.data])}),b.on("ok",function(b){a.clearAnnotations()}),b}}.call(l.prototype),b.Mode=l}),define("ace/mode/coffee_highlight_rules",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){function g(){var a="[$A-Za-z_\\x7f-\\uffff][$\\w\\x7f-\\uffff]*",b={token:"string",merge:!0,regex:".+"},c=d.arrayToMap("this|throw|then|try|typeof|super|switch|return|break|by)|continue|catch|class|in|instanceof|is|isnt|if|else|extends|for|forown|finally|function|while|when|new|no|not|delete|debugger|do|loop|of|off|or|on|unless|until|and|yes".split("|")),e=d.arrayToMap("true|false|null|undefined".split("|")),f=d.arrayToMap("case|const|default|function|var|void|with|enum|export|implements|interface|let|package|private|protected|public|static|yield|__hasProp|extends|slice|bind|indexOf".split("|")),g=d.arrayToMap("Array|Boolean|Date|Function|Number|Object|RegExp|ReferenceError|RangeError|String|SyntaxError|Error|EvalError|TypeError|URIError".split("|")),h=d.arrayToMap("Math|JSON|isNaN|isFinite|parseInt|parseFloat|encodeURI|encodeURIComponent|decodeURI|decodeURIComponent|RangeError|String|SyntaxError|Error|EvalError|TypeError|URIError".split("|"));this.$rules={start:[{token:"identifier",regex:"(?:(?:\\.|::)\\s*)"+a},{token:"variable",regex:"@(?:"+a+")?"},{token:function(a){return c.hasOwnProperty(a)?"keyword":e.hasOwnProperty(a)?"constant.language":f.hasOwnProperty(a)?"invalid.illegal":g.hasOwnProperty(a)?"language.support.class":h.hasOwnProperty(a)?"language.support.function":"identifier"},regex:a},{token:"constant.numeric",regex:"(?:0x[\\da-fA-F]+|(?:\\d+(?:\\.\\d+)?|\\.\\d+)(?:[eE][+-]?\\d+)?)"},{token:"string",merge:!0,regex:"'''",next:"qdoc"},{token:"string",merge:!0,regex:'"""',next:"qqdoc"},{token:"string",merge:!0,regex:"'",next:"qstring"},{token:"string",merge:!0,regex:'"',next:"qqstring"},{token:"string",merge:!0,regex:"`",next:"js"},{token:"string.regex",merge:!0,regex:"///",next:"heregex"},{token:"string.regex",regex:"/(?!\\s)[^[/\\n\\\\]*(?: (?:\\\\.|\\[[^\\]\\n\\\\]*(?:\\\\.[^\\]\\n\\\\]*)*\\])[^[/\\n\\\\]*)*/[imgy]{0,4}(?!\\w)"},{token:"comment",merge:!0,regex:"###(?!#)",next:"comment"},{token:"comment",regex:"#.*"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\."},{token:"keyword.operator",regex:"(?:[\\-=]>|[-+*/%<>&|^!?=]=|>>>=?|\\-\\-|\\+\\+|::|&&=|\\|\\|=|<<=|>>=|\\?\\.|\\.{2,3}|\\!)"},{token:"paren.lparen",regex:"[({[]"},{token:"paren.rparen",regex:"[\\]})]"},{token:"text",regex:"\\s+"}],qdoc:[{token:"string",regex:".*?'''",next:"start"},b],qqdoc:[{token:"string",regex:'.*?"""',next:"start"},b],qstring:[{token:"string",regex:"[^\\\\']*(?:\\\\.[^\\\\']*)*'",merge:!0,next:"start"},b],qqstring:[{token:"string",regex:'[^\\\\"]*(?:\\\\.[^\\\\"]*)*"',merge:!0,next:"start"},b],js:[{token:"string",merge:!0,regex:"[^\\\\`]*(?:\\\\.[^\\\\`]*)*`",next:"start"},b],heregex:[{token:"string.regex",regex:".*?///[imgy]{0,4}",next:"start"},{token:"comment.regex",regex:"\\s+(?:#.*)?"},{token:"string.regex",merge:!0,regex:"\\S+"}],comment:[{token:"comment",regex:".*?###",next:"start"},{token:"comment",merge:!0,regex:".+"}]}}"use strict";var d=a("../lib/lang"),e=a("../lib/oop"),f=a("./text_highlight_rules").TextHighlightRules;e.inherits(g,f),b.CoffeeHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/pythonic",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./fold_mode").FoldMode,f=b.FoldMode=function(a){this.foldingStartMarker=new RegExp("(?:([\\[{])|("+a+"))(?:\\s*)(?:#.*)?$")};d.inherits(f,e),function(){this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),e=d.match(this.foldingStartMarker);if(e)return e[1]?this.openingBracketBlock(a,e[1],c,e.index):e[2]?this.indentationBlock(a,c,e.index+e[2].length):this.indentationBlock(a,c)}}.call(f.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/event_emitter").EventEmitter,f=function(b,d,e,f){this.changeListener=this.changeListener.bind(this);if(c.packaged){var g=this.$guessBasePath();this.$worker=new Worker(g+d)}else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_"));this.$worker=new Worker(h);var i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:e,classname:f}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){throw window.console&&console.log&&console.log(a),a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._emit(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};((function(){d.implement(this,e),this.$normalizePath=function(a){return a=a.replace(/^[a-z]+:\/\/[^\/]+\//,""),a=location.protocol+"//"+location.host+(a.charAt(0)=="/"?"":location.pathname.replace(/\/[^\/]*$/,""))+"/"+a.replace(/^[\/]+/,""),a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._emit("terminate",{}),this.$worker.terminate(),this.$worker=null,this.$doc.removeEventListener("change",this.changeListener),this.$doc=null},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){try{this.$worker.postMessage({event:a,data:{data:b.data}})}catch(c){}},this.attachToDocument=function(a){this.$doc&&this.terminate(),this.$doc=a,this.call("setValue",[a.getValue()]),a.on("change",this.changeListener)},this.changeListener=function(a){a.range={start:a.data.range.start,end:a.data.range.end},this.emit("change",a)}})).call(f.prototype),b.WorkerClient=f}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-coldfusion.js b/apps/files_texteditor/js/aceeditor/mode-coldfusion.js
new file mode 100755
index 00000000000..fa8693e6d1d
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-coldfusion.js
@@ -0,0 +1 @@
+define("ace/mode/coldfusion",["require","exports","module","ace/lib/oop","ace/mode/xml","ace/mode/javascript","ace/mode/css","ace/tokenizer","ace/mode/coldfusion_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml").Mode,f=a("./javascript").Mode,g=a("./css").Mode,h=a("../tokenizer").Tokenizer,i=a("./coldfusion_highlight_rules").ColdfusionHighlightRules,j=function(){e.call(this);var a=new i;this.$tokenizer=new h(a.getRules()),this.$embeds=a.getEmbeds(),this.createModeDelegates({"js-":f,"css-":g})};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(j.prototype),b.Mode=j}),define("ace/mode/xml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/xml_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/xml"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./xml_highlight_rules").XmlHighlightRules,h=a("./behaviour/xml").XmlBehaviour,i=a("./folding/xml").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules()),this.$behaviour=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(j.prototype),b.Mode=j}),define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml_util"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},e.tag(this.$rules,"tag","start")};d.inherits(g,f),b.XmlHighlightRules=g}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"-qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"-qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:!]+",next:b+"embed-attribute-list"},{token:"empty",regex:"",next:b+"embed-attribute-list"}],a[b+"-qstring"]=h("'",b+"embed-attribute-list"),a[b+"-qqstring"]=h('"',b+"embed-attribute-list"),a[b+"embed-attribute-list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}})};d.inherits(g,e),b.XmlBehaviour=g}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return null;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../lib/lang"),f=a("../../range").Range,g=a("./fold_mode").FoldMode,h=a("../../token_iterator").TokenIterator,i=b.FoldMode=function(a){g.call(this),this.voidElements=a||{}};d.inherits(i,g),function(){this.getFoldWidget=function(a,b,c){var d=this._getFirstTagInLine(a,c);return d.closing?b=="markbeginend"?"end":"":!d.tagName||this.voidElements[d.tagName.toLowerCase()]?"":d.selfClosing?"":d.value.indexOf("/"+d.tagName)!==-1?"":"start"},this._getFirstTagInLine=function(a,b){var c=a.getTokens(b,b)[0].tokens,d="";for(var f=0;f<c.length;f++){var g=c[f];g.type.indexOf("meta.tag")===0?d+=g.value:d+=e.stringRepeat(" ",g.value.length)}return this._parseTag(d)},this.tagRe=/^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/,this._parseTag=function(a){var b=this.tagRe.exec(a),c=this.tagRe.lastIndex||0;return this.tagRe.lastIndex=0,{value:a,match:b?b[2]:"",closing:b?!!b[3]:!1,selfClosing:b?!!b[5]||b[2]=="/>":!1,tagName:b?b[4]:"",column:b[1]?c+b[1].length:c}},this._readTagForward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){if(!d)var d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()};c+=b.value;if(c.indexOf(">")!==-1){var e=this._parseTag(c);return e.start=d,e.end={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length},a.stepForward(),e}}while(b=a.stepForward());return null},this._readTagBackward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){d||(d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length}),c=b.value+c;if(c.indexOf("<")!==-1){var e=this._parseTag(c);return e.end=d,e.start={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()},a.stepBackward(),e}}while(b=a.stepBackward());return null},this._pop=function(a,b){while(a.length){var c=a[a.length-1];if(!b||c.tagName==b.tagName)return a.pop();if(this.voidElements[b.tagName])return;if(this.voidElements[c.tagName]){a.pop();continue}return null}},this.getFoldWidgetRange=function(a,b,c){var d=this._getFirstTagInLine(a,c);if(!d.match)return null;var e=d.closing||d.selfClosing,g=[],i;if(!e){var j=new h(a,c,d.column),k={row:c,column:d.column+d.tagName.length+2};while(i=this._readTagForward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(i.closing){this._pop(g,i);if(g.length==0)return f.fromPoints(k,i.start)}else g.push(i)}}else{var j=new h(a,c,d.column+d.match.length),l={row:c,column:d.column};while(i=this._readTagBackward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(!i.closing){this._pop(g,i);if(g.length==0)return i.start.column+=i.tagName.length+2,f.fromPoints(i.start,l)}else g.push(i)}}}}.call(i.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:["keyword.definition","text","entity.name.function"],regex:"(function)(\\s+)("+k+")"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"keyword.definition":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",next:"regex_allowed"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\.",next:"regex_allowed"},{token:"paren.lparen",regex:"[[({]",next:"regex_allowed"},{token:"paren.rparen",regex:"[\\])}]"},{token:"keyword.operator",regex:"\\/=?",next:"regex_allowed"},{token:"comment",regex:"^#!.*$"},{token:"text",regex:"\\s+"}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/event_emitter").EventEmitter,f=function(b,d,e,f){this.changeListener=this.changeListener.bind(this);if(c.packaged){var g=this.$guessBasePath();this.$worker=new Worker(g+d)}else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_"));this.$worker=new Worker(h);var i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:e,classname:f}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){throw window.console&&console.log&&console.log(a),a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._emit(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};((function(){d.implement(this,e),this.$normalizePath=function(a){return a=a.replace(/^[a-z]+:\/\/[^\/]+\//,""),a=location.protocol+"//"+location.host+(a.charAt(0)=="/"?"":location.pathname.replace(/\/[^\/]*$/,""))+"/"+a.replace(/^[\/]+/,""),a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._emit("terminate",{}),this.$worker.terminate(),this.$worker=null,this.$doc.removeEventListener("change",this.changeListener),this.$doc=null},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){try{this.$worker.postMessage({event:a,data:{data:b.data}})}catch(c){}},this.attachToDocument=function(a){this.$doc&&this.terminate(),this.$doc=a,this.call("setValue",[a.getValue()]),a.on("change",this.changeListener)},this.changeListener=function(a){a.range={start:a.data.range.start,end:a.data.range.end},this.emit("change",a)}})).call(f.prototype),b.WorkerClient=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./css_highlight_rules").CssHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../worker/worker_client").WorkerClient,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new j};d.inherits(k,e),function(){this.foldingRules="cStyle",this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new i(["ace"],"worker-css.js","ace/mode/css_worker","Worker");return b.attachToDocument(a.getDocument()),b.on("csslint",function(b){var c=[];b.data.forEach(function(a){c.push({row:a.line-1,column:a.col-1,text:a.message,type:a.type,lint:a})}),a.setAnnotations(c)}),b}}.call(k.prototype),b.Mode=k}),define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("-moz-appearance|-moz-box-sizing|-webkit-box-sizing|-moz-outline-radius|-moz-transform|-webkit-transform|appearance|azimuth|background-attachment|background-color|background-image|background-origin|background-position|background-repeat|background|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|-moz-border-radius|opacity|orphans|outline-color|outline-offset|outline-radius|outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|pointer-events|position|quotes|resize|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|stress|table-layout|text-align|text-decoration|text-indent|text-shadow|text-transform|top|transform|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index".split("|")),b=e.arrayToMap("rgb|rgba|url|attr|counter|counters".split("|")),c=e.arrayToMap("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",g=[{token:"comment",merge:!0,regex:"\\/\\*",next:"ruleset_comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:f+"(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":b.hasOwnProperty(e.toLowerCase())?"support.function":c.hasOwnProperty(e.toLowerCase())?"support.constant":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":"text"},regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"}],h=e.copyArray(g);h.unshift({token:"paren.rparen",regex:"\\}",next:"start"});var i=e.copyArray(g);i.unshift({token:"paren.rparen",regex:"\\}",next:"media"});var j=[{token:"comment",merge:!0,regex:".+"}],k=e.copyArray(j);k.unshift({token:"comment",regex:".*?\\*\\/",next:"start"});var l=e.copyArray(j);l.unshift({token:"comment",regex:".*?\\*\\/",next:"media"});var m=e.copyArray(j);m.unshift({token:"comment",regex:".*?\\*\\/",next:"ruleset"}),this.$rules={start:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"paren.lparen",regex:"\\{",next:"ruleset"},{token:"string",regex:"@.*?{",next:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],media:[{token:"comment",merge:!0,regex:"\\/\\*",next:"media_comment"},{token:"paren.lparen",regex:"\\{",next:"media_ruleset"},{token:"string",regex:"\\}",next:"start"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],comment:k,ruleset:h,ruleset_comment:m,media_ruleset:i,media_comment:l}};d.inherits(g,f),b.CssHighlightRules=g}),define("ace/mode/coldfusion_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/text_highlight_rules","ace/mode/xml_util"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./css_highlight_rules").CssHighlightRules,f=a("./javascript_highlight_rules").JavaScriptHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=a("./xml_util"),i=function(){this.$rules={start:[{token:"text",merge:!0,regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"meta.tag",regex:"<(?=s*script)",next:"script"},{token:"meta.tag",regex:"<(?=s*style)",next:"css"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",merge:!0,regex:"\\s+"},{token:"text",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},h.tag(this.$rules,"tag","start"),h.tag(this.$rules,"css","css-start"),h.tag(this.$rules,"script","js-start"),this.embedRules(f,"js-",[{token:"comment",regex:"\\/\\/.*(?=<\\/script>)",next:"tag"},{token:"meta.tag",regex:"<\\/(?=script)",next:"tag"}]),this.embedRules(e,"css-",[{token:"meta.tag",regex:"<\\/(?=style)",next:"tag"}])};d.inherits(i,g),b.ColdfusionHighlightRules=i}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-csharp.js b/apps/files_texteditor/js/aceeditor/mode-csharp.js
index 18082e40dac..b4c06059661 100644
--- a/apps/files_texteditor/js/aceeditor/mode-csharp.js
+++ b/apps/files_texteditor/js/aceeditor/mode-csharp.js
@@ -1 +1 @@
-define("ace/mode/csharp",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/csharp_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/csharp_highlight_rules").CSharpHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/mode/behaviour/cstyle").CstyleBehaviour,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[]\s*$/);h&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){return null}}.call(j.prototype),b.Mode=j}),define("ace/mode/csharp_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules,g=a("ace/mode/text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("abstract|event|new|struct|as|explicit|null|switch|base|extern|object|this|bool|false|operator|throw|break|finally|out|true|byte|fixed|override|try|case|float|params|typeof|catch|for|private|uint|char|foreach|protected|ulong|checked|goto|public|unchecked|class|if|readonly|unsafe|const|implicit|ref|ushort|continue|in|return|using|decimal|int|sbyte|virtual|default|interface|sealed|volatile|delegate|internal|short|void|do|is|sizeof|while|double|lock|stackalloc|else|long|static|enum|namespace|string|var|dynamic".split("|")),b=e.arrayToMap("null|true|false".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",regex:"\\/\\*",merge:!0,next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(c){return c=="this"?"variable.language":a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.CSharpHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","pilot/oop","ace/mode/behaviour"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return!1;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}return!1}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}"){e.end.column++;return e}}return!1}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}return!1}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")"){e.end.column++;return e}}return!1}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return!1;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}return!1}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"'){e.end.column++;return e}}return!1})};d.inherits(f,e),b.CstyleBehaviour=f})
\ No newline at end of file
+define("ace/mode/csharp",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/csharp_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./csharp_highlight_rules").CSharpHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./behaviour/cstyle").CstyleBehaviour,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new i,this.foldingRules=new j};d.inherits(k,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){return null}}.call(k.prototype),b.Mode=k}),define("ace/mode/csharp_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("abstract|event|new|struct|as|explicit|null|switch|base|extern|object|this|bool|false|operator|throw|break|finally|out|true|byte|fixed|override|try|case|float|params|typeof|catch|for|private|uint|char|foreach|protected|ulong|checked|goto|public|unchecked|class|if|readonly|unsafe|const|implicit|ref|ushort|continue|in|return|using|decimal|int|sbyte|virtual|default|interface|sealed|volatile|delegate|internal|short|void|do|is|sizeof|while|double|lock|stackalloc|else|long|static|enum|namespace|string|var|dynamic".split("|")),b=e.arrayToMap("null|true|false".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",regex:"\\/\\*",merge:!0,next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(c){return c=="this"?"variable.language":a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\."},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.CSharpHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return null;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-css.js b/apps/files_texteditor/js/aceeditor/mode-css.js
index e7cbfde635d..0a6f1bde58d 100644
--- a/apps/files_texteditor/js/aceeditor/mode-css.js
+++ b/apps/files_texteditor/js/aceeditor/mode-css.js
@@ -1 +1 @@
-define("ace/mode/css",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/css_highlight_rules").CssHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/worker/worker_client").WorkerClient,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);f&&(d+=c);return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=a.getDocument(),c=new i(["ace","pilot"],"worker-css.js","ace/mode/css_worker","Worker");c.call("setValue",[b.getValue()]),b.on("change",function(a){a.range={start:a.data.range.start,end:a.data.range.end},c.emit("change",a)}),c.on("csslint",function(b){var c=[];b.data.forEach(function(a){c.push({row:a.line-1,column:a.col-1,text:a.message,type:a.type,lint:a})}),a.setAnnotations(c)})}}.call(j.prototype),b.Mode=j}),define("ace/mode/css_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/text_highlight_rules").TextHighlightRules,g=function(){function g(a){var b=[],c=a.split("");for(var d=0;d<c.length;d++)b.push("[",c[d].toLowerCase(),c[d].toUpperCase(),"]");return b.join("")}var a=e.arrayToMap("-moz-box-sizing|-webkit-box-sizing|appearance|azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|-moz-border-radius|opacity|orphans|outline-color|outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|position|quotes|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|stress|table-layout|text-align|text-decoration|text-indent|text-shadow|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index".split("|")),b=e.arrayToMap("rgb|rgba|url|attr|counter|counters".split("|")),c=e.arrayToMap("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",h=[{token:"comment",merge:!0,regex:"\\/\\*",next:"ruleset_comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:f+g("em")},{token:"constant.numeric",regex:f+g("ex")},{token:"constant.numeric",regex:f+g("px")},{token:"constant.numeric",regex:f+g("cm")},{token:"constant.numeric",regex:f+g("mm")},{token:"constant.numeric",regex:f+g("in")},{token:"constant.numeric",regex:f+g("pt")},{token:"constant.numeric",regex:f+g("pc")},{token:"constant.numeric",regex:f+g("deg")},{token:"constant.numeric",regex:f+g("rad")},{token:"constant.numeric",regex:f+g("grad")},{token:"constant.numeric",regex:f+g("ms")},{token:"constant.numeric",regex:f+g("s")},{token:"constant.numeric",regex:f+g("hz")},{token:"constant.numeric",regex:f+g("khz")},{token:"constant.numeric",regex:f+"%"},{token:"constant.numeric",regex:f},{token:"constant.numeric",regex:"#[a-fA-F0-9]{6}"},{token:"constant.numeric",regex:"#[a-fA-F0-9]{3}"},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":b.hasOwnProperty(e.toLowerCase())?"support.function":c.hasOwnProperty(e.toLowerCase())?"support.constant":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":"text"},regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"}],i=e.copyArray(h);i.unshift({token:"rparen",regex:"\\}",next:"start"});var j=e.copyArray(h);j.unshift({token:"rparen",regex:"\\}",next:"media"});var k=[{token:"comment",merge:!0,regex:".+"}],l=e.copyArray(k);l.unshift({token:"comment",regex:".*?\\*\\/",next:"start"});var m=e.copyArray(k);m.unshift({token:"comment",regex:".*?\\*\\/",next:"media"});var n=e.copyArray(k);n.unshift({token:"comment",regex:".*?\\*\\/",next:"ruleset"}),this.$rules={start:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"lparen",regex:"\\{",next:"ruleset"},{token:"string",regex:"@media.*?{",next:"media"},{token:"keyword",regex:"#[a-zA-Z0-9-_]+"},{token:"variable",regex:"\\.[a-zA-Z0-9-_]+"},{token:"string",regex:":[a-zA-Z0-9-_]+"},{token:"constant",regex:"[a-zA-Z0-9-_]+"}],media:[{token:"comment",merge:!0,regex:"\\/\\*",next:"media_comment"},{token:"lparen",regex:"\\{",next:"media_ruleset"},{token:"string",regex:"\\}",next:"start"},{token:"keyword",regex:"#[a-zA-Z0-9-_]+"},{token:"variable",regex:"\\.[a-zA-Z0-9-_]+"},{token:"string",regex:":[a-zA-Z0-9-_]+"},{token:"constant",regex:"[a-zA-Z0-9-_]+"}],comment:l,ruleset:i,ruleset_comment:n,media_ruleset:j,media_comment:m}};d.inherits(g,f),b.CssHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","pilot/oop","pilot/event_emitter"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=function(b,c,d,e){this.callbacks=[];if(a.packaged)var f=this.$guessBasePath(),g=this.$worker=new Worker(f+c);else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_")),g=this.$worker=new Worker(h),i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:d,classname:e}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){window.console&&console.log&&console.log(a);throw a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._dispatchEvent(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};(function(){d.implement(this,e),this.$normalizePath=function(a){a.match(/^\w+:/)||(a=location.protocol+"//"+location.host+location.pathname+"/"+a);return a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace-uncompressed\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._dispatchEvent("terminate",{}),this.$worker.terminate()},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){this.$worker.postMessage({event:a,data:b})}}).call(f.prototype),b.WorkerClient=f})
\ No newline at end of file
+define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./css_highlight_rules").CssHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../worker/worker_client").WorkerClient,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new j};d.inherits(k,e),function(){this.foldingRules="cStyle",this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new i(["ace"],"worker-css.js","ace/mode/css_worker","Worker");return b.attachToDocument(a.getDocument()),b.on("csslint",function(b){var c=[];b.data.forEach(function(a){c.push({row:a.line-1,column:a.col-1,text:a.message,type:a.type,lint:a})}),a.setAnnotations(c)}),b}}.call(k.prototype),b.Mode=k}),define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("-moz-appearance|-moz-box-sizing|-webkit-box-sizing|-moz-outline-radius|-moz-transform|-webkit-transform|appearance|azimuth|background-attachment|background-color|background-image|background-origin|background-position|background-repeat|background|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|-moz-border-radius|opacity|orphans|outline-color|outline-offset|outline-radius|outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|pointer-events|position|quotes|resize|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|stress|table-layout|text-align|text-decoration|text-indent|text-shadow|text-transform|top|transform|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index".split("|")),b=e.arrayToMap("rgb|rgba|url|attr|counter|counters".split("|")),c=e.arrayToMap("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",g=[{token:"comment",merge:!0,regex:"\\/\\*",next:"ruleset_comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:f+"(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":b.hasOwnProperty(e.toLowerCase())?"support.function":c.hasOwnProperty(e.toLowerCase())?"support.constant":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":"text"},regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"}],h=e.copyArray(g);h.unshift({token:"paren.rparen",regex:"\\}",next:"start"});var i=e.copyArray(g);i.unshift({token:"paren.rparen",regex:"\\}",next:"media"});var j=[{token:"comment",merge:!0,regex:".+"}],k=e.copyArray(j);k.unshift({token:"comment",regex:".*?\\*\\/",next:"start"});var l=e.copyArray(j);l.unshift({token:"comment",regex:".*?\\*\\/",next:"media"});var m=e.copyArray(j);m.unshift({token:"comment",regex:".*?\\*\\/",next:"ruleset"}),this.$rules={start:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"paren.lparen",regex:"\\{",next:"ruleset"},{token:"string",regex:"@.*?{",next:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],media:[{token:"comment",merge:!0,regex:"\\/\\*",next:"media_comment"},{token:"paren.lparen",regex:"\\{",next:"media_ruleset"},{token:"string",regex:"\\}",next:"start"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],comment:k,ruleset:h,ruleset_comment:m,media_ruleset:i,media_comment:l}};d.inherits(g,f),b.CssHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/event_emitter").EventEmitter,f=function(b,d,e,f){this.changeListener=this.changeListener.bind(this);if(c.packaged){var g=this.$guessBasePath();this.$worker=new Worker(g+d)}else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_"));this.$worker=new Worker(h);var i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:e,classname:f}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){throw window.console&&console.log&&console.log(a),a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._emit(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};((function(){d.implement(this,e),this.$normalizePath=function(a){return a=a.replace(/^[a-z]+:\/\/[^\/]+\//,""),a=location.protocol+"//"+location.host+(a.charAt(0)=="/"?"":location.pathname.replace(/\/[^\/]*$/,""))+"/"+a.replace(/^[\/]+/,""),a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._emit("terminate",{}),this.$worker.terminate(),this.$worker=null,this.$doc.removeEventListener("change",this.changeListener),this.$doc=null},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){try{this.$worker.postMessage({event:a,data:{data:b.data}})}catch(c){}},this.attachToDocument=function(a){this.$doc&&this.terminate(),this.$doc=a,this.call("setValue",[a.getValue()]),a.on("change",this.changeListener)},this.changeListener=function(a){a.range={start:a.data.range.start,end:a.data.range.end},this.emit("change",a)}})).call(f.prototype),b.WorkerClient=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-groovy.js b/apps/files_texteditor/js/aceeditor/mode-groovy.js
index 29559419293..c71ada2bf84 100644
--- a/apps/files_texteditor/js/aceeditor/mode-groovy.js
+++ b/apps/files_texteditor/js/aceeditor/mode-groovy.js
@@ -1 +1 @@
-define("ace/mode/groovy",["require","exports","module","pilot/oop","ace/mode/javascript","ace/tokenizer","ace/mode/groovy_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/javascript").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/groovy_highlight_rules").GroovyHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/mode/behaviour/cstyle").CstyleBehaviour,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new i};d.inherits(j,e),function(){this.createWorker=function(a){return null}}.call(j.prototype),b.Mode=j}),define("ace/mode/javascript",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=a("ace/worker/worker_client").WorkerClient,k=a("ace/mode/behaviour/cstyle").CstyleBehaviour,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)\/\//;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[\:]\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=a.getDocument(),c=new j(["ace","pilot"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");c.call("setValue",[b.getValue()]),b.on("change",function(a){a.range={start:a.data.range.start,end:a.data.range.end},c.emit("change",a)}),c.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),c.on("narcissus",function(b){a.setAnnotations([b.data])}),c.on("terminate",function(){a.clearAnnotations()});return c}}.call(l.prototype),b.Mode=l}),define("ace/mode/javascript_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/unicode"),g=a("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules,h=a("ace/mode/text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),b=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),c=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),d="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(d){return d=="this"?"variable.language":a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"invalid.illegal":d=="debugger"?"invalid.deprecated":"identifier"},regex:d},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",next:"regex_allowed"},{token:"lparen",regex:"[[({]",next:"regex_allowed"},{token:"rparen",regex:"[\\])}]"},{token:"keyword.operator",regex:"\\/=?",next:"regex_allowed"},{token:"comment",regex:"^#!.*$"},{token:"text",regex:"\\s+"}],regex_allowed:[{token:"string.regexp",regex:"\\/(?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*",next:"start"},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","pilot/oop","pilot/event_emitter"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=function(b,c,d,e){this.callbacks=[];if(a.packaged)var f=this.$guessBasePath(),g=this.$worker=new Worker(f+c);else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_")),g=this.$worker=new Worker(h),i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:d,classname:e}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){window.console&&console.log&&console.log(a);throw a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._dispatchEvent(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};(function(){d.implement(this,e),this.$normalizePath=function(a){a.match(/^\w+:/)||(a=location.protocol+"//"+location.host+location.pathname+"/"+a);return a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace-uncompressed\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._dispatchEvent("terminate",{}),this.$worker.terminate()},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){this.$worker.postMessage({event:a,data:b})}}).call(f.prototype),b.WorkerClient=f}),define("ace/mode/behaviour/cstyle",["require","exports","module","pilot/oop","ace/mode/behaviour"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return!1;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}return!1}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}"){e.end.column++;return e}}return!1}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}return!1}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")"){e.end.column++;return e}}return!1}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return!1;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}return!1}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"'){e.end.column++;return e}}return!1})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/groovy_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules,g=a("ace/mode/text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("assert|with|abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|def|float|native|super|while".split("|")),b=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),c=e.arrayToMap("AbstractMethodError|AssertionError|ClassCircularityError|ClassFormatError|Deprecated|EnumConstantNotPresentException|ExceptionInInitializerError|IllegalAccessError|IllegalThreadStateException|InstantiationError|InternalError|NegativeArraySizeException|NoSuchFieldError|Override|Process|ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|SuppressWarnings|TypeNotPresentException|UnknownError|UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|InstantiationException|IndexOutOfBoundsException|ArrayIndexOutOfBoundsException|CloneNotSupportedException|NoSuchFieldException|IllegalArgumentException|NumberFormatException|SecurityException|Void|InheritableThreadLocal|IllegalStateException|InterruptedException|NoSuchMethodException|IllegalAccessException|UnsupportedOperationException|Enum|StrictMath|Package|Compiler|Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|Character|Boolean|StackTraceElement|Appendable|StringBuffer|Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|StackOverflowError|OutOfMemoryError|VirtualMachineError|ArrayStoreException|ClassCastException|LinkageError|NoClassDefFoundError|ClassNotFoundException|RuntimeException|Exception|ThreadDeath|Error|Throwable|System|ClassLoader|Cloneable|Class|CharSequence|Comparable|String|Object".split("|")),d=e.arrayToMap("".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return e=="this"?"variable.language":a.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e)?"support.function":b.hasOwnProperty(e)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\?:|\\?\\.|\\*\\.|<=>|=~|==~|\\.@|\\*\\.@|\\.&|as|in|is|!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.GroovyHighlightRules=h})
\ No newline at end of file
+define("ace/mode/groovy",["require","exports","module","ace/lib/oop","ace/mode/javascript","ace/tokenizer","ace/mode/groovy_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./javascript").Mode,f=a("../tokenizer").Tokenizer,g=a("./groovy_highlight_rules").GroovyHighlightRules,h=function(){e.call(this),this.$tokenizer=new f((new g).getRules())};d.inherits(h,e),function(){this.createWorker=function(a){return null}}.call(h.prototype),b.Mode=h}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:["keyword.definition","text","entity.name.function"],regex:"(function)(\\s+)("+k+")"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"keyword.definition":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",next:"regex_allowed"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\.",next:"regex_allowed"},{token:"paren.lparen",regex:"[[({]",next:"regex_allowed"},{token:"paren.rparen",regex:"[\\])}]"},{token:"keyword.operator",regex:"\\/=?",next:"regex_allowed"},{token:"comment",regex:"^#!.*$"},{token:"text",regex:"\\s+"}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/event_emitter").EventEmitter,f=function(b,d,e,f){this.changeListener=this.changeListener.bind(this);if(c.packaged){var g=this.$guessBasePath();this.$worker=new Worker(g+d)}else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_"));this.$worker=new Worker(h);var i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:e,classname:f}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){throw window.console&&console.log&&console.log(a),a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._emit(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};((function(){d.implement(this,e),this.$normalizePath=function(a){return a=a.replace(/^[a-z]+:\/\/[^\/]+\//,""),a=location.protocol+"//"+location.host+(a.charAt(0)=="/"?"":location.pathname.replace(/\/[^\/]*$/,""))+"/"+a.replace(/^[\/]+/,""),a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._emit("terminate",{}),this.$worker.terminate(),this.$worker=null,this.$doc.removeEventListener("change",this.changeListener),this.$doc=null},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){try{this.$worker.postMessage({event:a,data:{data:b.data}})}catch(c){}},this.attachToDocument=function(a){this.$doc&&this.terminate(),this.$doc=a,this.call("setValue",[a.getValue()]),a.on("change",this.changeListener)},this.changeListener=function(a){a.range={start:a.data.range.start,end:a.data.range.end},this.emit("change",a)}})).call(f.prototype),b.WorkerClient=f}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return null;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),define("ace/mode/groovy_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("assert|with|abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|def|float|native|super|while".split("|")),b=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),c=e.arrayToMap("AbstractMethodError|AssertionError|ClassCircularityError|ClassFormatError|Deprecated|EnumConstantNotPresentException|ExceptionInInitializerError|IllegalAccessError|IllegalThreadStateException|InstantiationError|InternalError|NegativeArraySizeException|NoSuchFieldError|Override|Process|ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|SuppressWarnings|TypeNotPresentException|UnknownError|UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|InstantiationException|IndexOutOfBoundsException|ArrayIndexOutOfBoundsException|CloneNotSupportedException|NoSuchFieldException|IllegalArgumentException|NumberFormatException|SecurityException|Void|InheritableThreadLocal|IllegalStateException|InterruptedException|NoSuchMethodException|IllegalAccessException|UnsupportedOperationException|Enum|StrictMath|Package|Compiler|Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|Character|Boolean|StackTraceElement|Appendable|StringBuffer|Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|StackOverflowError|OutOfMemoryError|VirtualMachineError|ArrayStoreException|ClassCastException|LinkageError|NoClassDefFoundError|ClassNotFoundException|RuntimeException|Exception|ThreadDeath|Error|Throwable|System|ClassLoader|Cloneable|Class|CharSequence|Comparable|String|Object".split("|")),d=e.arrayToMap("".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return e=="this"?"variable.language":a.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e)?"support.function":b.hasOwnProperty(e)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\?:|\\?\\.|\\*\\.|<=>|=~|==~|\\.@|\\*\\.@|\\.&|as|in|is|!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.GroovyHighlightRules=h}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-haxe.js b/apps/files_texteditor/js/aceeditor/mode-haxe.js
new file mode 100755
index 00000000000..88818b1371a
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-haxe.js
@@ -0,0 +1 @@
+define("ace/mode/haxe",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/haxe_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./haxe_highlight_rules").HaxeHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./behaviour/cstyle").CstyleBehaviour,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new i,this.foldingRules=new j};d.inherits(k,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){return null}}.call(k.prototype),b.Mode=k}),define("ace/mode/haxe_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("break|case|cast|catch|class|continue|default|else|enum|extends|for|function|if|implements|import|in|inline|interface|new|override|package|private|public|return|static|super|switch|this|throw|trace|try|typedef|untyped|var|while|Array|Void|Bool|Int|UInt|Float|Dynamic|String|List|Hash|IntHash|Error|Unknown|Type|Std".split("|")),b=e.arrayToMap("null|true|false".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",regex:"\\/\\*",merge:!0,next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(c){return c=="this"?"variable.language":a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\."},{token:"paren.lparen",regex:"[[({<]"},{token:"paren.rparen",regex:"[\\])}>]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.HaxeHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return null;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-html.js b/apps/files_texteditor/js/aceeditor/mode-html.js
index 518767d3fb6..f4f806059e4 100644
--- a/apps/files_texteditor/js/aceeditor/mode-html.js
+++ b/apps/files_texteditor/js/aceeditor/mode-html.js
@@ -1 +1 @@
-define("ace/mode/html",["require","exports","module","pilot/oop","ace/mode/text","ace/mode/javascript","ace/mode/css","ace/tokenizer","ace/mode/html_highlight_rules","ace/mode/behaviour/xml"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/mode/javascript").Mode,g=a("ace/mode/css").Mode,h=a("ace/tokenizer").Tokenizer,i=a("ace/mode/html_highlight_rules").HtmlHighlightRules,j=a("ace/mode/behaviour/xml").XmlBehaviour,k=function(){var a=new i;this.$tokenizer=new h(a.getRules()),this.$behaviour=new j,this.$embeds=a.getEmbeds(),this.createModeDelegates({"js-":f,"css-":g})};d.inherits(k,e),function(){this.toggleCommentLines=function(a,b,c,d){return 0},this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)},this.checkOutdent=function(a,b,c){return!1}}.call(k.prototype),b.Mode=k}),define("ace/mode/javascript",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=a("ace/worker/worker_client").WorkerClient,k=a("ace/mode/behaviour/cstyle").CstyleBehaviour,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)\/\//;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[\:]\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=a.getDocument(),c=new j(["ace","pilot"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");c.call("setValue",[b.getValue()]),b.on("change",function(a){a.range={start:a.data.range.start,end:a.data.range.end},c.emit("change",a)}),c.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),c.on("narcissus",function(b){a.setAnnotations([b.data])}),c.on("terminate",function(){a.clearAnnotations()});return c}}.call(l.prototype),b.Mode=l}),define("ace/mode/javascript_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/unicode"),g=a("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules,h=a("ace/mode/text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),b=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),c=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),d="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(d){return d=="this"?"variable.language":a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"invalid.illegal":d=="debugger"?"invalid.deprecated":"identifier"},regex:d},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",next:"regex_allowed"},{token:"lparen",regex:"[[({]",next:"regex_allowed"},{token:"rparen",regex:"[\\])}]"},{token:"keyword.operator",regex:"\\/=?",next:"regex_allowed"},{token:"comment",regex:"^#!.*$"},{token:"text",regex:"\\s+"}],regex_allowed:[{token:"string.regexp",regex:"\\/(?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*",next:"start"},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","pilot/oop","pilot/event_emitter"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=function(b,c,d,e){this.callbacks=[];if(a.packaged)var f=this.$guessBasePath(),g=this.$worker=new Worker(f+c);else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_")),g=this.$worker=new Worker(h),i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:d,classname:e}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){window.console&&console.log&&console.log(a);throw a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._dispatchEvent(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};(function(){d.implement(this,e),this.$normalizePath=function(a){a.match(/^\w+:/)||(a=location.protocol+"//"+location.host+location.pathname+"/"+a);return a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace-uncompressed\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._dispatchEvent("terminate",{}),this.$worker.terminate()},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){this.$worker.postMessage({event:a,data:b})}}).call(f.prototype),b.WorkerClient=f}),define("ace/mode/behaviour/cstyle",["require","exports","module","pilot/oop","ace/mode/behaviour"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return!1;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}return!1}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}"){e.end.column++;return e}}return!1}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}return!1}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")"){e.end.column++;return e}}return!1}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return!1;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}return!1}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"'){e.end.column++;return e}}return!1})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/css",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/css_highlight_rules").CssHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/worker/worker_client").WorkerClient,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);f&&(d+=c);return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=a.getDocument(),c=new i(["ace","pilot"],"worker-css.js","ace/mode/css_worker","Worker");c.call("setValue",[b.getValue()]),b.on("change",function(a){a.range={start:a.data.range.start,end:a.data.range.end},c.emit("change",a)}),c.on("csslint",function(b){var c=[];b.data.forEach(function(a){c.push({row:a.line-1,column:a.col-1,text:a.message,type:a.type,lint:a})}),a.setAnnotations(c)})}}.call(j.prototype),b.Mode=j}),define("ace/mode/css_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/text_highlight_rules").TextHighlightRules,g=function(){function g(a){var b=[],c=a.split("");for(var d=0;d<c.length;d++)b.push("[",c[d].toLowerCase(),c[d].toUpperCase(),"]");return b.join("")}var a=e.arrayToMap("-moz-box-sizing|-webkit-box-sizing|appearance|azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|-moz-border-radius|opacity|orphans|outline-color|outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|position|quotes|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|stress|table-layout|text-align|text-decoration|text-indent|text-shadow|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index".split("|")),b=e.arrayToMap("rgb|rgba|url|attr|counter|counters".split("|")),c=e.arrayToMap("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",h=[{token:"comment",merge:!0,regex:"\\/\\*",next:"ruleset_comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:f+g("em")},{token:"constant.numeric",regex:f+g("ex")},{token:"constant.numeric",regex:f+g("px")},{token:"constant.numeric",regex:f+g("cm")},{token:"constant.numeric",regex:f+g("mm")},{token:"constant.numeric",regex:f+g("in")},{token:"constant.numeric",regex:f+g("pt")},{token:"constant.numeric",regex:f+g("pc")},{token:"constant.numeric",regex:f+g("deg")},{token:"constant.numeric",regex:f+g("rad")},{token:"constant.numeric",regex:f+g("grad")},{token:"constant.numeric",regex:f+g("ms")},{token:"constant.numeric",regex:f+g("s")},{token:"constant.numeric",regex:f+g("hz")},{token:"constant.numeric",regex:f+g("khz")},{token:"constant.numeric",regex:f+"%"},{token:"constant.numeric",regex:f},{token:"constant.numeric",regex:"#[a-fA-F0-9]{6}"},{token:"constant.numeric",regex:"#[a-fA-F0-9]{3}"},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":b.hasOwnProperty(e.toLowerCase())?"support.function":c.hasOwnProperty(e.toLowerCase())?"support.constant":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":"text"},regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"}],i=e.copyArray(h);i.unshift({token:"rparen",regex:"\\}",next:"start"});var j=e.copyArray(h);j.unshift({token:"rparen",regex:"\\}",next:"media"});var k=[{token:"comment",merge:!0,regex:".+"}],l=e.copyArray(k);l.unshift({token:"comment",regex:".*?\\*\\/",next:"start"});var m=e.copyArray(k);m.unshift({token:"comment",regex:".*?\\*\\/",next:"media"});var n=e.copyArray(k);n.unshift({token:"comment",regex:".*?\\*\\/",next:"ruleset"}),this.$rules={start:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"lparen",regex:"\\{",next:"ruleset"},{token:"string",regex:"@media.*?{",next:"media"},{token:"keyword",regex:"#[a-zA-Z0-9-_]+"},{token:"variable",regex:"\\.[a-zA-Z0-9-_]+"},{token:"string",regex:":[a-zA-Z0-9-_]+"},{token:"constant",regex:"[a-zA-Z0-9-_]+"}],media:[{token:"comment",merge:!0,regex:"\\/\\*",next:"media_comment"},{token:"lparen",regex:"\\{",next:"media_ruleset"},{token:"string",regex:"\\}",next:"start"},{token:"keyword",regex:"#[a-zA-Z0-9-_]+"},{token:"variable",regex:"\\.[a-zA-Z0-9-_]+"},{token:"string",regex:":[a-zA-Z0-9-_]+"},{token:"constant",regex:"[a-zA-Z0-9-_]+"}],comment:l,ruleset:i,ruleset_comment:n,media_ruleset:j,media_comment:m}};d.inherits(g,f),b.CssHighlightRules=g}),define("ace/mode/html_highlight_rules",["require","exports","module","pilot/oop","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/css_highlight_rules").CssHighlightRules,f=a("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules,g=a("ace/mode/text_highlight_rules").TextHighlightRules,h=function(){function b(a,b){return[{token:"string",merge:!0,regex:".*"+a,next:b},{token:"string",merge:!0,regex:".+"}]}function a(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*$',next:a+"-qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*$",next:a+"-qstring"}]}this.$rules={start:[{token:"text",merge:!0,regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"text",regex:"<(?=s*script)",next:"script"},{token:"text",regex:"<(?=s*style)",next:"css"},{token:"text",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"text",regex:"[^<]+"}],script:[{token:"text",regex:">",next:"js-start"},{token:"keyword",regex:"[-_a-zA-Z0-9:]+"},{token:"text",regex:"\\s+"}].concat(a("script")),css:[{token:"text",regex:">",next:"css-start"},{token:"keyword",regex:"[-_a-zA-Z0-9:]+"},{token:"text",regex:"\\s+"}].concat(a("style")),tag:[{token:"text",regex:">",next:"start"},{token:"keyword",regex:"[-_a-zA-Z0-9:]+"},{token:"text",regex:"\\s+"}].concat(a("tag")),"style-qstring":b("'","style"),"style-qqstring":b('"',"style"),"script-qstring":b("'","script"),"script-qqstring":b('"',"script"),"tag-qstring":b("'","tag"),"tag-qqstring":b('"',"tag"),cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",merge:!0,regex:"\\s+"},{token:"text",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"js-",[{token:"comment",regex:"\\/\\/.*(?=<\\/script>)",next:"tag"},{token:"text",regex:"<\\/(?=script)",next:"tag"}]),this.embedRules(e,"css-",[{token:"text",regex:"<\\/(?=style)",next:"tag"}])};d.inherits(h,g),b.HtmlHighlightRules=h}),define("ace/mode/behaviour/xml",["require","exports","module","pilot/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/behaviour").Behaviour,f=a("ace/mode/behaviour/cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}return!1})};d.inherits(g,e),b.XmlBehaviour=g})
\ No newline at end of file
+define("ace/mode/html",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript","ace/mode/css","ace/tokenizer","ace/mode/html_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/html"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("./javascript").Mode,g=a("./css").Mode,h=a("../tokenizer").Tokenizer,i=a("./html_highlight_rules").HtmlHighlightRules,j=a("./behaviour/xml").XmlBehaviour,k=a("./folding/html").FoldMode,l=function(){var a=new i;this.$tokenizer=new h(a.getRules()),this.$behaviour=new j,this.$embeds=a.getEmbeds(),this.createModeDelegates({"js-":f,"css-":g}),this.foldingRules=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){return 0},this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)},this.checkOutdent=function(a,b,c){return!1}}.call(l.prototype),b.Mode=l}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:["keyword.definition","text","entity.name.function"],regex:"(function)(\\s+)("+k+")"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"keyword.definition":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",next:"regex_allowed"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\.",next:"regex_allowed"},{token:"paren.lparen",regex:"[[({]",next:"regex_allowed"},{token:"paren.rparen",regex:"[\\])}]"},{token:"keyword.operator",regex:"\\/=?",next:"regex_allowed"},{token:"comment",regex:"^#!.*$"},{token:"text",regex:"\\s+"}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/event_emitter").EventEmitter,f=function(b,d,e,f){this.changeListener=this.changeListener.bind(this);if(c.packaged){var g=this.$guessBasePath();this.$worker=new Worker(g+d)}else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_"));this.$worker=new Worker(h);var i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:e,classname:f}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){throw window.console&&console.log&&console.log(a),a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._emit(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};((function(){d.implement(this,e),this.$normalizePath=function(a){return a=a.replace(/^[a-z]+:\/\/[^\/]+\//,""),a=location.protocol+"//"+location.host+(a.charAt(0)=="/"?"":location.pathname.replace(/\/[^\/]*$/,""))+"/"+a.replace(/^[\/]+/,""),a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._emit("terminate",{}),this.$worker.terminate(),this.$worker=null,this.$doc.removeEventListener("change",this.changeListener),this.$doc=null},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){try{this.$worker.postMessage({event:a,data:{data:b.data}})}catch(c){}},this.attachToDocument=function(a){this.$doc&&this.terminate(),this.$doc=a,this.call("setValue",[a.getValue()]),a.on("change",this.changeListener)},this.changeListener=function(a){a.range={start:a.data.range.start,end:a.data.range.end},this.emit("change",a)}})).call(f.prototype),b.WorkerClient=f}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return null;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./css_highlight_rules").CssHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../worker/worker_client").WorkerClient,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new j};d.inherits(k,e),function(){this.foldingRules="cStyle",this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new i(["ace"],"worker-css.js","ace/mode/css_worker","Worker");return b.attachToDocument(a.getDocument()),b.on("csslint",function(b){var c=[];b.data.forEach(function(a){c.push({row:a.line-1,column:a.col-1,text:a.message,type:a.type,lint:a})}),a.setAnnotations(c)}),b}}.call(k.prototype),b.Mode=k}),define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("-moz-appearance|-moz-box-sizing|-webkit-box-sizing|-moz-outline-radius|-moz-transform|-webkit-transform|appearance|azimuth|background-attachment|background-color|background-image|background-origin|background-position|background-repeat|background|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|-moz-border-radius|opacity|orphans|outline-color|outline-offset|outline-radius|outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|pointer-events|position|quotes|resize|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|stress|table-layout|text-align|text-decoration|text-indent|text-shadow|text-transform|top|transform|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index".split("|")),b=e.arrayToMap("rgb|rgba|url|attr|counter|counters".split("|")),c=e.arrayToMap("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",g=[{token:"comment",merge:!0,regex:"\\/\\*",next:"ruleset_comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:f+"(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":b.hasOwnProperty(e.toLowerCase())?"support.function":c.hasOwnProperty(e.toLowerCase())?"support.constant":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":"text"},regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"}],h=e.copyArray(g);h.unshift({token:"paren.rparen",regex:"\\}",next:"start"});var i=e.copyArray(g);i.unshift({token:"paren.rparen",regex:"\\}",next:"media"});var j=[{token:"comment",merge:!0,regex:".+"}],k=e.copyArray(j);k.unshift({token:"comment",regex:".*?\\*\\/",next:"start"});var l=e.copyArray(j);l.unshift({token:"comment",regex:".*?\\*\\/",next:"media"});var m=e.copyArray(j);m.unshift({token:"comment",regex:".*?\\*\\/",next:"ruleset"}),this.$rules={start:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"paren.lparen",regex:"\\{",next:"ruleset"},{token:"string",regex:"@.*?{",next:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],media:[{token:"comment",merge:!0,regex:"\\/\\*",next:"media_comment"},{token:"paren.lparen",regex:"\\{",next:"media_ruleset"},{token:"string",regex:"\\}",next:"start"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],comment:k,ruleset:h,ruleset_comment:m,media_ruleset:i,media_comment:l}};d.inherits(g,f),b.CssHighlightRules=g}),define("ace/mode/html_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./css_highlight_rules").CssHighlightRules,f=a("./javascript_highlight_rules").JavaScriptHighlightRules,g=a("./xml_util"),h=a("./text_highlight_rules").TextHighlightRules,i=function(){this.$rules={start:[{token:"text",merge:!0,regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"meta.tag",regex:"<(?=s*script\\b)",next:"script"},{token:"meta.tag",regex:"<(?=s*style\\b)",next:"css"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",merge:!0,regex:"\\s+"},{token:"text",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},g.tag(this.$rules,"tag","start"),g.tag(this.$rules,"css","css-start"),g.tag(this.$rules,"script","js-start"),this.embedRules(f,"js-",[{token:"comment",regex:"\\/\\/.*(?=<\\/script>)",next:"tag"},{token:"meta.tag",regex:"<\\/(?=script)",next:"tag"}]),this.embedRules(e,"css-",[{token:"meta.tag",regex:"<\\/(?=style)",next:"tag"}])};d.inherits(i,h),b.HtmlHighlightRules=i}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"-qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"-qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:!]+",next:b+"embed-attribute-list"},{token:"empty",regex:"",next:b+"embed-attribute-list"}],a[b+"-qstring"]=h("'",b+"embed-attribute-list"),a[b+"-qqstring"]=h('"',b+"embed-attribute-list"),a[b+"embed-attribute-list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}})};d.inherits(g,e),b.XmlBehaviour=g}),define("ace/mode/folding/html",["require","exports","module","ace/lib/oop","ace/mode/folding/mixed","ace/mode/folding/xml","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./mixed").FoldMode,f=a("./xml").FoldMode,g=a("./cstyle").FoldMode,h=b.FoldMode=function(){e.call(this,new f({area:1,base:1,br:1,col:1,command:1,embed:1,hr:1,img:1,input:1,keygen:1,link:1,meta:1,param:1,source:1,track:1,wbr:1,li:1,dt:1,dd:1,p:1,rt:1,rp:1,optgroup:1,option:1,colgroup:1,td:1,th:1}),{"js-":new g,"css-":new g})};d.inherits(h,e)}),define("ace/mode/folding/mixed",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./fold_mode").FoldMode,f=b.FoldMode=function(a,b){this.defaultMode=a,this.subModes=b};d.inherits(f,e),function(){this.$getMode=function(a){for(var b in this.subModes)if(a.indexOf(b)===0)return this.subModes[b];return null},this.$tryMode=function(a,b,c,d){var e=this.$getMode(a);return e?e.getFoldWidget(b,c,d):""},this.getFoldWidget=function(a,b,c){return this.$tryMode(a.getState(c-1),a,b,c)||this.$tryMode(a.getState(c),a,b,c)||this.defaultMode.getFoldWidget(a,b,c)},this.getFoldWidgetRange=function(a,b,c){var d=this.$getMode(a.getState(c-1));if(!d||!d.getFoldWidget(a,b,c))d=this.$getMode(a.getState(c));if(!d||!d.getFoldWidget(a,b,c))d=this.defaultMode;return d.getFoldWidgetRange(a,b,c)}}.call(f.prototype)}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../lib/lang"),f=a("../../range").Range,g=a("./fold_mode").FoldMode,h=a("../../token_iterator").TokenIterator,i=b.FoldMode=function(a){g.call(this),this.voidElements=a||{}};d.inherits(i,g),function(){this.getFoldWidget=function(a,b,c){var d=this._getFirstTagInLine(a,c);return d.closing?b=="markbeginend"?"end":"":!d.tagName||this.voidElements[d.tagName.toLowerCase()]?"":d.selfClosing?"":d.value.indexOf("/"+d.tagName)!==-1?"":"start"},this._getFirstTagInLine=function(a,b){var c=a.getTokens(b,b)[0].tokens,d="";for(var f=0;f<c.length;f++){var g=c[f];g.type.indexOf("meta.tag")===0?d+=g.value:d+=e.stringRepeat(" ",g.value.length)}return this._parseTag(d)},this.tagRe=/^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/,this._parseTag=function(a){var b=this.tagRe.exec(a),c=this.tagRe.lastIndex||0;return this.tagRe.lastIndex=0,{value:a,match:b?b[2]:"",closing:b?!!b[3]:!1,selfClosing:b?!!b[5]||b[2]=="/>":!1,tagName:b?b[4]:"",column:b[1]?c+b[1].length:c}},this._readTagForward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){if(!d)var d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()};c+=b.value;if(c.indexOf(">")!==-1){var e=this._parseTag(c);return e.start=d,e.end={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length},a.stepForward(),e}}while(b=a.stepForward());return null},this._readTagBackward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){d||(d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length}),c=b.value+c;if(c.indexOf("<")!==-1){var e=this._parseTag(c);return e.end=d,e.start={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()},a.stepBackward(),e}}while(b=a.stepBackward());return null},this._pop=function(a,b){while(a.length){var c=a[a.length-1];if(!b||c.tagName==b.tagName)return a.pop();if(this.voidElements[b.tagName])return;if(this.voidElements[c.tagName]){a.pop();continue}return null}},this.getFoldWidgetRange=function(a,b,c){var d=this._getFirstTagInLine(a,c);if(!d.match)return null;var e=d.closing||d.selfClosing,g=[],i;if(!e){var j=new h(a,c,d.column),k={row:c,column:d.column+d.tagName.length+2};while(i=this._readTagForward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(i.closing){this._pop(g,i);if(g.length==0)return f.fromPoints(k,i.start)}else g.push(i)}}else{var j=new h(a,c,d.column+d.match.length),l={row:c,column:d.column};while(i=this._readTagBackward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(!i.closing){this._pop(g,i);if(g.length==0)return i.start.column+=i.tagName.length+2,f.fromPoints(i.start,l)}else g.push(i)}}}}.call(i.prototype)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-java.js b/apps/files_texteditor/js/aceeditor/mode-java.js
index 56460e36b28..84c21daba22 100644
--- a/apps/files_texteditor/js/aceeditor/mode-java.js
+++ b/apps/files_texteditor/js/aceeditor/mode-java.js
@@ -1 +1 @@
-define("ace/mode/java",["require","exports","module","pilot/oop","ace/mode/javascript","ace/tokenizer","ace/mode/java_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/javascript").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/java_highlight_rules").JavaHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/mode/behaviour/cstyle").CstyleBehaviour,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new i};d.inherits(j,e),function(){this.createWorker=function(a){return null}}.call(j.prototype),b.Mode=j}),define("ace/mode/javascript",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=a("ace/worker/worker_client").WorkerClient,k=a("ace/mode/behaviour/cstyle").CstyleBehaviour,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)\/\//;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[\:]\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=a.getDocument(),c=new j(["ace","pilot"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");c.call("setValue",[b.getValue()]),b.on("change",function(a){a.range={start:a.data.range.start,end:a.data.range.end},c.emit("change",a)}),c.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),c.on("narcissus",function(b){a.setAnnotations([b.data])}),c.on("terminate",function(){a.clearAnnotations()});return c}}.call(l.prototype),b.Mode=l}),define("ace/mode/javascript_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/unicode"),g=a("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules,h=a("ace/mode/text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),b=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),c=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),d="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(d){return d=="this"?"variable.language":a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"invalid.illegal":d=="debugger"?"invalid.deprecated":"identifier"},regex:d},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",next:"regex_allowed"},{token:"lparen",regex:"[[({]",next:"regex_allowed"},{token:"rparen",regex:"[\\])}]"},{token:"keyword.operator",regex:"\\/=?",next:"regex_allowed"},{token:"comment",regex:"^#!.*$"},{token:"text",regex:"\\s+"}],regex_allowed:[{token:"string.regexp",regex:"\\/(?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*",next:"start"},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","pilot/oop","pilot/event_emitter"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=function(b,c,d,e){this.callbacks=[];if(a.packaged)var f=this.$guessBasePath(),g=this.$worker=new Worker(f+c);else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_")),g=this.$worker=new Worker(h),i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:d,classname:e}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){window.console&&console.log&&console.log(a);throw a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._dispatchEvent(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};(function(){d.implement(this,e),this.$normalizePath=function(a){a.match(/^\w+:/)||(a=location.protocol+"//"+location.host+location.pathname+"/"+a);return a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace-uncompressed\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._dispatchEvent("terminate",{}),this.$worker.terminate()},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){this.$worker.postMessage({event:a,data:b})}}).call(f.prototype),b.WorkerClient=f}),define("ace/mode/behaviour/cstyle",["require","exports","module","pilot/oop","ace/mode/behaviour"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return!1;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}return!1}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}"){e.end.column++;return e}}return!1}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}return!1}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")"){e.end.column++;return e}}return!1}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return!1;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}return!1}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"'){e.end.column++;return e}}return!1})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/java_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules,g=a("ace/mode/text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while".split("|")),b=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),c=e.arrayToMap("AbstractMethodError|AssertionError|ClassCircularityError|ClassFormatError|Deprecated|EnumConstantNotPresentException|ExceptionInInitializerError|IllegalAccessError|IllegalThreadStateException|InstantiationError|InternalError|NegativeArraySizeException|NoSuchFieldError|Override|Process|ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|SuppressWarnings|TypeNotPresentException|UnknownError|UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|InstantiationException|IndexOutOfBoundsException|ArrayIndexOutOfBoundsException|CloneNotSupportedException|NoSuchFieldException|IllegalArgumentException|NumberFormatException|SecurityException|Void|InheritableThreadLocal|IllegalStateException|InterruptedException|NoSuchMethodException|IllegalAccessException|UnsupportedOperationException|Enum|StrictMath|Package|Compiler|Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|Character|Boolean|StackTraceElement|Appendable|StringBuffer|Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|StackOverflowError|OutOfMemoryError|VirtualMachineError|ArrayStoreException|ClassCastException|LinkageError|NoClassDefFoundError|ClassNotFoundException|RuntimeException|Exception|ThreadDeath|Error|Throwable|System|ClassLoader|Cloneable|Class|CharSequence|Comparable|String|Object".split("|")),d=e.arrayToMap("".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return e=="this"?"variable.language":a.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e)?"support.function":b.hasOwnProperty(e)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.JavaHighlightRules=h})
\ No newline at end of file
+define("ace/mode/java",["require","exports","module","ace/lib/oop","ace/mode/javascript","ace/tokenizer","ace/mode/java_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./javascript").Mode,f=a("../tokenizer").Tokenizer,g=a("./java_highlight_rules").JavaHighlightRules,h=function(){e.call(this),this.$tokenizer=new f((new g).getRules())};d.inherits(h,e),function(){this.createWorker=function(a){return null}}.call(h.prototype),b.Mode=h}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:["keyword.definition","text","entity.name.function"],regex:"(function)(\\s+)("+k+")"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"keyword.definition":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",next:"regex_allowed"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\.",next:"regex_allowed"},{token:"paren.lparen",regex:"[[({]",next:"regex_allowed"},{token:"paren.rparen",regex:"[\\])}]"},{token:"keyword.operator",regex:"\\/=?",next:"regex_allowed"},{token:"comment",regex:"^#!.*$"},{token:"text",regex:"\\s+"}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/event_emitter").EventEmitter,f=function(b,d,e,f){this.changeListener=this.changeListener.bind(this);if(c.packaged){var g=this.$guessBasePath();this.$worker=new Worker(g+d)}else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_"));this.$worker=new Worker(h);var i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:e,classname:f}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){throw window.console&&console.log&&console.log(a),a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._emit(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};((function(){d.implement(this,e),this.$normalizePath=function(a){return a=a.replace(/^[a-z]+:\/\/[^\/]+\//,""),a=location.protocol+"//"+location.host+(a.charAt(0)=="/"?"":location.pathname.replace(/\/[^\/]*$/,""))+"/"+a.replace(/^[\/]+/,""),a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._emit("terminate",{}),this.$worker.terminate(),this.$worker=null,this.$doc.removeEventListener("change",this.changeListener),this.$doc=null},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){try{this.$worker.postMessage({event:a,data:{data:b.data}})}catch(c){}},this.attachToDocument=function(a){this.$doc&&this.terminate(),this.$doc=a,this.call("setValue",[a.getValue()]),a.on("change",this.changeListener)},this.changeListener=function(a){a.range={start:a.data.range.start,end:a.data.range.end},this.emit("change",a)}})).call(f.prototype),b.WorkerClient=f}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return null;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),define("ace/mode/java_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while".split("|")),b=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),c=e.arrayToMap("AbstractMethodError|AssertionError|ClassCircularityError|ClassFormatError|Deprecated|EnumConstantNotPresentException|ExceptionInInitializerError|IllegalAccessError|IllegalThreadStateException|InstantiationError|InternalError|NegativeArraySizeException|NoSuchFieldError|Override|Process|ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|SuppressWarnings|TypeNotPresentException|UnknownError|UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|InstantiationException|IndexOutOfBoundsException|ArrayIndexOutOfBoundsException|CloneNotSupportedException|NoSuchFieldException|IllegalArgumentException|NumberFormatException|SecurityException|Void|InheritableThreadLocal|IllegalStateException|InterruptedException|NoSuchMethodException|IllegalAccessException|UnsupportedOperationException|Enum|StrictMath|Package|Compiler|Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|Character|Boolean|StackTraceElement|Appendable|StringBuffer|Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|StackOverflowError|OutOfMemoryError|VirtualMachineError|ArrayStoreException|ClassCastException|LinkageError|NoClassDefFoundError|ClassNotFoundException|RuntimeException|Exception|ThreadDeath|Error|Throwable|System|ClassLoader|Cloneable|Class|CharSequence|Comparable|String|Object".split("|")),d=e.arrayToMap("".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return e=="this"?"variable.language":a.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e)?"support.function":b.hasOwnProperty(e)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.JavaHighlightRules=h}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-javascript.js b/apps/files_texteditor/js/aceeditor/mode-javascript.js
index 40628310cdb..2f242387fff 100644
--- a/apps/files_texteditor/js/aceeditor/mode-javascript.js
+++ b/apps/files_texteditor/js/aceeditor/mode-javascript.js
@@ -1 +1 @@
-define("ace/mode/javascript",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=a("ace/worker/worker_client").WorkerClient,k=a("ace/mode/behaviour/cstyle").CstyleBehaviour,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)\/\//;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[\:]\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=a.getDocument(),c=new j(["ace","pilot"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");c.call("setValue",[b.getValue()]),b.on("change",function(a){a.range={start:a.data.range.start,end:a.data.range.end},c.emit("change",a)}),c.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),c.on("narcissus",function(b){a.setAnnotations([b.data])}),c.on("terminate",function(){a.clearAnnotations()});return c}}.call(l.prototype),b.Mode=l}),define("ace/mode/javascript_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/unicode"),g=a("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules,h=a("ace/mode/text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),b=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),c=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),d="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(d){return d=="this"?"variable.language":a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"invalid.illegal":d=="debugger"?"invalid.deprecated":"identifier"},regex:d},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",next:"regex_allowed"},{token:"lparen",regex:"[[({]",next:"regex_allowed"},{token:"rparen",regex:"[\\])}]"},{token:"keyword.operator",regex:"\\/=?",next:"regex_allowed"},{token:"comment",regex:"^#!.*$"},{token:"text",regex:"\\s+"}],regex_allowed:[{token:"string.regexp",regex:"\\/(?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*",next:"start"},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","pilot/oop","pilot/event_emitter"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=function(b,c,d,e){this.callbacks=[];if(a.packaged)var f=this.$guessBasePath(),g=this.$worker=new Worker(f+c);else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_")),g=this.$worker=new Worker(h),i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:d,classname:e}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){window.console&&console.log&&console.log(a);throw a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._dispatchEvent(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};(function(){d.implement(this,e),this.$normalizePath=function(a){a.match(/^\w+:/)||(a=location.protocol+"//"+location.host+location.pathname+"/"+a);return a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace-uncompressed\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._dispatchEvent("terminate",{}),this.$worker.terminate()},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){this.$worker.postMessage({event:a,data:b})}}).call(f.prototype),b.WorkerClient=f}),define("ace/mode/behaviour/cstyle",["require","exports","module","pilot/oop","ace/mode/behaviour"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return!1;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}return!1}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}"){e.end.column++;return e}}return!1}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}return!1}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")"){e.end.column++;return e}}return!1}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return!1;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}return!1}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"'){e.end.column++;return e}}return!1})};d.inherits(f,e),b.CstyleBehaviour=f})
\ No newline at end of file
+define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:["keyword.definition","text","entity.name.function"],regex:"(function)(\\s+)("+k+")"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"keyword.definition":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",next:"regex_allowed"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\.",next:"regex_allowed"},{token:"paren.lparen",regex:"[[({]",next:"regex_allowed"},{token:"paren.rparen",regex:"[\\])}]"},{token:"keyword.operator",regex:"\\/=?",next:"regex_allowed"},{token:"comment",regex:"^#!.*$"},{token:"text",regex:"\\s+"}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/event_emitter").EventEmitter,f=function(b,d,e,f){this.changeListener=this.changeListener.bind(this);if(c.packaged){var g=this.$guessBasePath();this.$worker=new Worker(g+d)}else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_"));this.$worker=new Worker(h);var i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:e,classname:f}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){throw window.console&&console.log&&console.log(a),a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._emit(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};((function(){d.implement(this,e),this.$normalizePath=function(a){return a=a.replace(/^[a-z]+:\/\/[^\/]+\//,""),a=location.protocol+"//"+location.host+(a.charAt(0)=="/"?"":location.pathname.replace(/\/[^\/]*$/,""))+"/"+a.replace(/^[\/]+/,""),a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._emit("terminate",{}),this.$worker.terminate(),this.$worker=null,this.$doc.removeEventListener("change",this.changeListener),this.$doc=null},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){try{this.$worker.postMessage({event:a,data:{data:b.data}})}catch(c){}},this.attachToDocument=function(a){this.$doc&&this.terminate(),this.$doc=a,this.call("setValue",[a.getValue()]),a.on("change",this.changeListener)},this.changeListener=function(a){a.range={start:a.data.range.start,end:a.data.range.end},this.emit("change",a)}})).call(f.prototype),b.WorkerClient=f}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return null;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-json.js b/apps/files_texteditor/js/aceeditor/mode-json.js
index 66df13b26d5..d0dd59fec3e 100644
--- a/apps/files_texteditor/js/aceeditor/mode-json.js
+++ b/apps/files_texteditor/js/aceeditor/mode-json.js
@@ -1 +1 @@
-define("ace/mode/json",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/json_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/json_highlight_rules").JsonHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=a("ace/mode/behaviour/cstyle").CstyleBehaviour,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new j};d.inherits(k,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(a=="start"){var h=b.match(/^.*[\{\(\[]\s*$/);h&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(k.prototype),b.Mode=k}),define("ace/mode/json_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/text_highlight_rules").TextHighlightRules,g=function(){this.$rules={start:[{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:"invalid.illegal",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"invalid.illegal",regex:"\\/\\/.*$"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}]}};d.inherits(g,f),b.JsonHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","pilot/oop","ace/mode/behaviour"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return!1;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}return!1}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}"){e.end.column++;return e}}return!1}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}return!1}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")"){e.end.column++;return e}}return!1}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return!1;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}return!1}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"'){e.end.column++;return e}}return!1})};d.inherits(f,e),b.CstyleBehaviour=f})
\ No newline at end of file
+define("ace/mode/json",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/json_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./json_highlight_rules").JsonHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./behaviour/cstyle").CstyleBehaviour,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new i,this.foldingRules=new j};d.inherits(k,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b);if(a=="start"){var e=b.match(/^.*[\{\(\[]\s*$/);e&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(k.prototype),b.Mode=k}),define("ace/mode/json_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:"invalid.illegal",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"invalid.illegal",regex:"\\/\\/.*$"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}]}};d.inherits(f,e),b.JsonHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return null;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-latex.js b/apps/files_texteditor/js/aceeditor/mode-latex.js
new file mode 100755
index 00000000000..3498213a644
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-latex.js
@@ -0,0 +1 @@
+define("ace/mode/latex",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/latex_highlight_rules","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./latex_highlight_rules").LatexHighlightRules,h=a("../range").Range,i=function(){this.$tokenizer=new f((new g).getRules())};d.inherits(i,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\%/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var i=new h(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);i.start.row=g,i.end.row=g,i.end.column=k[0].length,b.replace(i,k[1])}}else b.indentRows(c,d,"%")},this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(i.prototype),b.Mode=i}),define("ace/mode/latex_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"keyword",regex:"\\\\(?:[^a-zA-Z]|[a-zA-Z]+)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"string",regex:"\\$(?:(?:\\\\.)|(?:[^\\$\\\\]))*?\\$"},{token:"comment",regex:"%.*$"}]}};d.inherits(f,e),b.LatexHighlightRules=f}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-lua.js b/apps/files_texteditor/js/aceeditor/mode-lua.js
new file mode 100755
index 00000000000..63b812c6bd7
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-lua.js
@@ -0,0 +1 @@
+define("ace/mode/lua",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/lua_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./lua_highlight_rules").LuaHighlightRules,h=function(){this.$tokenizer=new f((new g).getRules())};d.inherits(h,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=["function","then","do","repeat"];if(a=="start"){var h=b.match(/^.*[\{\(\[]\s*$/);if(h)d+=c;else for(var i in f){var j=f[i];if(j.type!="keyword")continue;var k=g.indexOf(j.value);if(k!=-1){d+=c;break}}}return d}}.call(h.prototype),b.Mode=h}),define("ace/mode/lua_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("break|do|else|elseif|end|for|function|if|in|local|repeat|return|then|until|while|or|and|not".split("|")),b=e.arrayToMap("true|false|nil|_G|_VERSION".split("|")),c=e.arrayToMap("string|xpcall|package|tostring|print|os|unpack|require|getfenv|setmetatable|next|assert|tonumber|io|rawequal|collectgarbage|getmetatable|module|rawset|math|debug|pcall|table|newproxy|type|coroutine|_G|select|gcinfo|pairs|rawget|loadstring|ipairs|_VERSION|dofile|setfenv|load|error|loadfile|sub|upper|len|gfind|rep|find|match|char|dump|gmatch|reverse|byte|format|gsub|lower|preload|loadlib|loaded|loaders|cpath|config|path|seeall|exit|setlocale|date|getenv|difftime|remove|time|clock|tmpname|rename|execute|lines|write|close|flush|open|output|type|read|stderr|stdin|input|stdout|popen|tmpfile|log|max|acos|huge|ldexp|pi|cos|tanh|pow|deg|tan|cosh|sinh|random|randomseed|frexp|ceil|floor|rad|abs|sqrt|modf|asin|min|mod|fmod|log10|atan2|exp|sin|atan|getupvalue|debug|sethook|getmetatable|gethook|setmetatable|setlocal|traceback|setfenv|getinfo|setupvalue|getlocal|getregistry|getfenv|setn|insert|getn|foreachi|maxn|foreach|concat|sort|remove|resume|yield|status|wrap|create|running".split("|")),d=e.arrayToMap("string|package|os|io|math|debug|table|coroutine".split("|")),f=e.arrayToMap("__add|__sub|__mod|__unm|__concat|__lt|__index|__call|__gc|__metatable|__mul|__div|__pow|__len|__eq|__le|__newindex|__tostring|__mode|__tonumber".split("|")),g=e.arrayToMap("".split("|")),h=e.arrayToMap("setn|foreach|foreachi|gcinfo|log10|maxn".split("|")),i="",j="(?:(?:[1-9]\\d*)|(?:0))",k="(?:0[xX][\\dA-Fa-f]+)",l="(?:"+j+"|"+k+")",m="(?:\\.\\d+)",n="(?:\\d+)",o="(?:(?:"+n+"?"+m+")|(?:"+n+"\\.))",p="(?:"+o+")",q=[];this.$rules={start:[{token:"comment",regex:i+"\\-\\-\\[\\[.*\\]\\]"},{token:"comment",regex:i+"\\-\\-\\[\\=\\[.*\\]\\=\\]"},{token:"comment",regex:i+"\\-\\-\\[\\={2}\\[.*\\]\\={2}\\]"},{token:"comment",regex:i+"\\-\\-\\[\\={3}\\[.*\\]\\={3}\\]"},{token:"comment",regex:i+"\\-\\-\\[\\={4}\\[.*\\]\\={4}\\]"},{token:"comment",regex:i+"\\-\\-\\[\\={5}\\=*\\[.*\\]\\={5}\\=*\\]"},{token:"comment",regex:i+"\\-\\-\\[\\[.*$",merge:!0,next:"qcomment"},{token:"comment",regex:i+"\\-\\-\\[\\=\\[.*$",merge:!0,next:"qcomment1"},{token:"comment",regex:i+"\\-\\-\\[\\={2}\\[.*$",merge:!0,next:"qcomment2"},{token:"comment",regex:i+"\\-\\-\\[\\={3}\\[.*$",merge:!0,next:"qcomment3"},{token:"comment",regex:i+"\\-\\-\\[\\={4}\\[.*$",merge:!0,next:"qcomment4"},{token:function(a){var b=/\-\-\[(\=+)\[/,c;return(c=b.exec(a))!=null&&(c=c[1])!=undefined&&q.push(c.length),"comment"},regex:i+"\\-\\-\\[\\={5}\\=*\\[.*$",merge:!0,next:"qcomment5"},{token:"comment",regex:"\\-\\-.*$"},{token:"string",regex:i+"\\[\\[.*\\]\\]"},{token:"string",regex:i+"\\[\\=\\[.*\\]\\=\\]"},{token:"string",regex:i+"\\[\\={2}\\[.*\\]\\={2}\\]"},{token:"string",regex:i+"\\[\\={3}\\[.*\\]\\={3}\\]"},{token:"string",regex:i+"\\[\\={4}\\[.*\\]\\={4}\\]"},{token:"string",regex:i+"\\[\\={5}\\=*\\[.*\\]\\={5}\\=*\\]"},{token:"string",regex:i+"\\[\\[.*$",merge:!0,next:"qstring"},{token:"string",regex:i+"\\[\\=\\[.*$",merge:!0,next:"qstring1"},{token:"string",regex:i+"\\[\\={2}\\[.*$",merge:!0,next:"qstring2"},{token:"string",regex:i+"\\[\\={3}\\[.*$",merge:!0,next:"qstring3"},{token:"string",regex:i+"\\[\\={4}\\[.*$",merge:!0,next:"qstring4"},{token:function(a){var b=/\[(\=+)\[/,c;return(c=b.exec(a))!=null&&(c=c[1])!=undefined&&q.push(c.length),"string"},regex:i+"\\[\\={5}\\=*\\[.*$",merge:!0,next:"qstring5"},{token:"string",regex:i+'"(?:[^\\\\]|\\\\.)*?"'},{token:"string",regex:i+"'(?:[^\\\\]|\\\\.)*?'"},{token:"constant.numeric",regex:p},{token:"constant.numeric",regex:l+"\\b"},{token:function(e){return a.hasOwnProperty(e)?"keyword":b.hasOwnProperty(e)?"constant.language":g.hasOwnProperty(e)?"invalid.illegal":d.hasOwnProperty(e)?"constant.library":h.hasOwnProperty(e)?"invalid.deprecated":c.hasOwnProperty(e)?"support.function":f.hasOwnProperty(e)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\/|%|\\#|\\^|~|<|>|<=|=>|==|~=|=|\\:|\\.\\.\\.|\\.\\."},{token:"paren.lparen",regex:"[\\[\\(\\{]"},{token:"paren.rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}],qcomment:[{token:"comment",regex:"(?:[^\\\\]|\\\\.)*?\\]\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qcomment1:[{token:"comment",regex:"(?:[^\\\\]|\\\\.)*?\\]\\=\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qcomment2:[{token:"comment",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={2}\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qcomment3:[{token:"comment",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={3}\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qcomment4:[{token:"comment",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={4}\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qcomment5:[{token:function(a){var b=/\](\=+)\]/,c=this.rules.qcomment5[0],d;c.next="start";if((d=b.exec(a))!=null&&(d=d[1])!=undefined){var e=d.length,f;(f=q.pop())!=e&&(q.push(f),c.next="qcomment5")}return"comment"},regex:"(?:[^\\\\]|\\\\.)*?\\]\\={5}\\=*\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?\\]\\]",next:"start"},{token:"string",merge:!0,regex:".+"}],qstring1:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?\\]\\=\\]",next:"start"},{token:"string",merge:!0,regex:".+"}],qstring2:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={2}\\]",next:"start"},{token:"string",merge:!0,regex:".+"}],qstring3:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={3}\\]",next:"start"},{token:"string",merge:!0,regex:".+"}],qstring4:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={4}\\]",next:"start"},{token:"string",merge:!0,regex:".+"}],qstring5:[{token:function(a){var b=/\](\=+)\]/,c=this.rules.qstring5[0],d;c.next="start";if((d=b.exec(a))!=null&&(d=d[1])!=undefined){var e=d.length,f;(f=q.pop())!=e&&(q.push(f),c.next="qstring5")}return"string"},regex:"(?:[^\\\\]|\\\\.)*?\\]\\={5}\\=*\\]",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.LuaHighlightRules=g}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-markdown.js b/apps/files_texteditor/js/aceeditor/mode-markdown.js
new file mode 100755
index 00000000000..4cf7a4a82b4
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-markdown.js
@@ -0,0 +1 @@
+define("ace/mode/markdown",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript","ace/mode/xml","ace/mode/html","ace/tokenizer","ace/mode/markdown_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("./javascript").Mode,g=a("./xml").Mode,h=a("./html").Mode,i=a("../tokenizer").Tokenizer,j=a("./markdown_highlight_rules").MarkdownHighlightRules,k=function(){var a=new j;this.$tokenizer=new i(a.getRules()),this.$embeds=a.getEmbeds(),this.createModeDelegates({"js-":f,"xml-":g,"html-":h})};d.inherits(k,e),function(){this.getNextLineIndent=function(a,b,c){if(a=="listblock"){var d=/^((?:.+)?)([-+*][ ]+)/.exec(b);return d?(new Array(d[1].length+1)).join(" ")+d[2]:""}return this.$getIndent(b)}}.call(k.prototype),b.Mode=k}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:["keyword.definition","text","entity.name.function"],regex:"(function)(\\s+)("+k+")"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"keyword.definition":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",next:"regex_allowed"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\.",next:"regex_allowed"},{token:"paren.lparen",regex:"[[({]",next:"regex_allowed"},{token:"paren.rparen",regex:"[\\])}]"},{token:"keyword.operator",regex:"\\/=?",next:"regex_allowed"},{token:"comment",regex:"^#!.*$"},{token:"text",regex:"\\s+"}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/event_emitter").EventEmitter,f=function(b,d,e,f){this.changeListener=this.changeListener.bind(this);if(c.packaged){var g=this.$guessBasePath();this.$worker=new Worker(g+d)}else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_"));this.$worker=new Worker(h);var i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:e,classname:f}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){throw window.console&&console.log&&console.log(a),a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._emit(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};((function(){d.implement(this,e),this.$normalizePath=function(a){return a=a.replace(/^[a-z]+:\/\/[^\/]+\//,""),a=location.protocol+"//"+location.host+(a.charAt(0)=="/"?"":location.pathname.replace(/\/[^\/]*$/,""))+"/"+a.replace(/^[\/]+/,""),a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._emit("terminate",{}),this.$worker.terminate(),this.$worker=null,this.$doc.removeEventListener("change",this.changeListener),this.$doc=null},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){try{this.$worker.postMessage({event:a,data:{data:b.data}})}catch(c){}},this.attachToDocument=function(a){this.$doc&&this.terminate(),this.$doc=a,this.call("setValue",[a.getValue()]),a.on("change",this.changeListener)},this.changeListener=function(a){a.range={start:a.data.range.start,end:a.data.range.end},this.emit("change",a)}})).call(f.prototype),b.WorkerClient=f}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return null;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),define("ace/mode/xml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/xml_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/xml"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./xml_highlight_rules").XmlHighlightRules,h=a("./behaviour/xml").XmlBehaviour,i=a("./folding/xml").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules()),this.$behaviour=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(j.prototype),b.Mode=j}),define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml_util"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},e.tag(this.$rules,"tag","start")};d.inherits(g,f),b.XmlHighlightRules=g}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"-qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"-qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:!]+",next:b+"embed-attribute-list"},{token:"empty",regex:"",next:b+"embed-attribute-list"}],a[b+"-qstring"]=h("'",b+"embed-attribute-list"),a[b+"-qqstring"]=h('"',b+"embed-attribute-list"),a[b+"embed-attribute-list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}})};d.inherits(g,e),b.XmlBehaviour=g}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../lib/lang"),f=a("../../range").Range,g=a("./fold_mode").FoldMode,h=a("../../token_iterator").TokenIterator,i=b.FoldMode=function(a){g.call(this),this.voidElements=a||{}};d.inherits(i,g),function(){this.getFoldWidget=function(a,b,c){var d=this._getFirstTagInLine(a,c);return d.closing?b=="markbeginend"?"end":"":!d.tagName||this.voidElements[d.tagName.toLowerCase()]?"":d.selfClosing?"":d.value.indexOf("/"+d.tagName)!==-1?"":"start"},this._getFirstTagInLine=function(a,b){var c=a.getTokens(b,b)[0].tokens,d="";for(var f=0;f<c.length;f++){var g=c[f];g.type.indexOf("meta.tag")===0?d+=g.value:d+=e.stringRepeat(" ",g.value.length)}return this._parseTag(d)},this.tagRe=/^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/,this._parseTag=function(a){var b=this.tagRe.exec(a),c=this.tagRe.lastIndex||0;return this.tagRe.lastIndex=0,{value:a,match:b?b[2]:"",closing:b?!!b[3]:!1,selfClosing:b?!!b[5]||b[2]=="/>":!1,tagName:b?b[4]:"",column:b[1]?c+b[1].length:c}},this._readTagForward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){if(!d)var d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()};c+=b.value;if(c.indexOf(">")!==-1){var e=this._parseTag(c);return e.start=d,e.end={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length},a.stepForward(),e}}while(b=a.stepForward());return null},this._readTagBackward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){d||(d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length}),c=b.value+c;if(c.indexOf("<")!==-1){var e=this._parseTag(c);return e.end=d,e.start={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()},a.stepBackward(),e}}while(b=a.stepBackward());return null},this._pop=function(a,b){while(a.length){var c=a[a.length-1];if(!b||c.tagName==b.tagName)return a.pop();if(this.voidElements[b.tagName])return;if(this.voidElements[c.tagName]){a.pop();continue}return null}},this.getFoldWidgetRange=function(a,b,c){var d=this._getFirstTagInLine(a,c);if(!d.match)return null;var e=d.closing||d.selfClosing,g=[],i;if(!e){var j=new h(a,c,d.column),k={row:c,column:d.column+d.tagName.length+2};while(i=this._readTagForward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(i.closing){this._pop(g,i);if(g.length==0)return f.fromPoints(k,i.start)}else g.push(i)}}else{var j=new h(a,c,d.column+d.match.length),l={row:c,column:d.column};while(i=this._readTagBackward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(!i.closing){this._pop(g,i);if(g.length==0)return i.start.column+=i.tagName.length+2,f.fromPoints(i.start,l)}else g.push(i)}}}}.call(i.prototype)}),define("ace/mode/html",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript","ace/mode/css","ace/tokenizer","ace/mode/html_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/html"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("./javascript").Mode,g=a("./css").Mode,h=a("../tokenizer").Tokenizer,i=a("./html_highlight_rules").HtmlHighlightRules,j=a("./behaviour/xml").XmlBehaviour,k=a("./folding/html").FoldMode,l=function(){var a=new i;this.$tokenizer=new h(a.getRules()),this.$behaviour=new j,this.$embeds=a.getEmbeds(),this.createModeDelegates({"js-":f,"css-":g}),this.foldingRules=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){return 0},this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)},this.checkOutdent=function(a,b,c){return!1}}.call(l.prototype),b.Mode=l}),define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./css_highlight_rules").CssHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../worker/worker_client").WorkerClient,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new j};d.inherits(k,e),function(){this.foldingRules="cStyle",this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new i(["ace"],"worker-css.js","ace/mode/css_worker","Worker");return b.attachToDocument(a.getDocument()),b.on("csslint",function(b){var c=[];b.data.forEach(function(a){c.push({row:a.line-1,column:a.col-1,text:a.message,type:a.type,lint:a})}),a.setAnnotations(c)}),b}}.call(k.prototype),b.Mode=k}),define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("-moz-appearance|-moz-box-sizing|-webkit-box-sizing|-moz-outline-radius|-moz-transform|-webkit-transform|appearance|azimuth|background-attachment|background-color|background-image|background-origin|background-position|background-repeat|background|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|-moz-border-radius|opacity|orphans|outline-color|outline-offset|outline-radius|outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|pointer-events|position|quotes|resize|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|stress|table-layout|text-align|text-decoration|text-indent|text-shadow|text-transform|top|transform|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index".split("|")),b=e.arrayToMap("rgb|rgba|url|attr|counter|counters".split("|")),c=e.arrayToMap("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",g=[{token:"comment",merge:!0,regex:"\\/\\*",next:"ruleset_comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:f+"(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":b.hasOwnProperty(e.toLowerCase())?"support.function":c.hasOwnProperty(e.toLowerCase())?"support.constant":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":"text"},regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"}],h=e.copyArray(g);h.unshift({token:"paren.rparen",regex:"\\}",next:"start"});var i=e.copyArray(g);i.unshift({token:"paren.rparen",regex:"\\}",next:"media"});var j=[{token:"comment",merge:!0,regex:".+"}],k=e.copyArray(j);k.unshift({token:"comment",regex:".*?\\*\\/",next:"start"});var l=e.copyArray(j);l.unshift({token:"comment",regex:".*?\\*\\/",next:"media"});var m=e.copyArray(j);m.unshift({token:"comment",regex:".*?\\*\\/",next:"ruleset"}),this.$rules={start:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"paren.lparen",regex:"\\{",next:"ruleset"},{token:"string",regex:"@.*?{",next:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],media:[{token:"comment",merge:!0,regex:"\\/\\*",next:"media_comment"},{token:"paren.lparen",regex:"\\{",next:"media_ruleset"},{token:"string",regex:"\\}",next:"start"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],comment:k,ruleset:h,ruleset_comment:m,media_ruleset:i,media_comment:l}};d.inherits(g,f),b.CssHighlightRules=g}),define("ace/mode/html_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./css_highlight_rules").CssHighlightRules,f=a("./javascript_highlight_rules").JavaScriptHighlightRules,g=a("./xml_util"),h=a("./text_highlight_rules").TextHighlightRules,i=function(){this.$rules={start:[{token:"text",merge:!0,regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"meta.tag",regex:"<(?=s*script\\b)",next:"script"},{token:"meta.tag",regex:"<(?=s*style\\b)",next:"css"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",merge:!0,regex:"\\s+"},{token:"text",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},g.tag(this.$rules,"tag","start"),g.tag(this.$rules,"css","css-start"),g.tag(this.$rules,"script","js-start"),this.embedRules(f,"js-",[{token:"comment",regex:"\\/\\/.*(?=<\\/script>)",next:"tag"},{token:"meta.tag",regex:"<\\/(?=script)",next:"tag"}]),this.embedRules(e,"css-",[{token:"meta.tag",regex:"<\\/(?=style)",next:"tag"}])};d.inherits(i,h),b.HtmlHighlightRules=i}),define("ace/mode/folding/html",["require","exports","module","ace/lib/oop","ace/mode/folding/mixed","ace/mode/folding/xml","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./mixed").FoldMode,f=a("./xml").FoldMode,g=a("./cstyle").FoldMode,h=b.FoldMode=function(){e.call(this,new f({area:1,base:1,br:1,col:1,command:1,embed:1,hr:1,img:1,input:1,keygen:1,link:1,meta:1,param:1,source:1,track:1,wbr:1,li:1,dt:1,dd:1,p:1,rt:1,rp:1,optgroup:1,option:1,colgroup:1,td:1,th:1}),{"js-":new g,"css-":new g})};d.inherits(h,e)}),define("ace/mode/folding/mixed",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./fold_mode").FoldMode,f=b.FoldMode=function(a,b){this.defaultMode=a,this.subModes=b};d.inherits(f,e),function(){this.$getMode=function(a){for(var b in this.subModes)if(a.indexOf(b)===0)return this.subModes[b];return null},this.$tryMode=function(a,b,c,d){var e=this.$getMode(a);return e?e.getFoldWidget(b,c,d):""},this.getFoldWidget=function(a,b,c){return this.$tryMode(a.getState(c-1),a,b,c)||this.$tryMode(a.getState(c),a,b,c)||this.defaultMode.getFoldWidget(a,b,c)},this.getFoldWidgetRange=function(a,b,c){var d=this.$getMode(a.getState(c-1));if(!d||!d.getFoldWidget(a,b,c))d=this.$getMode(a.getState(c));if(!d||!d.getFoldWidget(a,b,c))d=this.defaultMode;return d.getFoldWidgetRange(a,b,c)}}.call(f.prototype)}),define("ace/mode/markdown_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/xml_highlight_rules","ace/mode/html_highlight_rules","ace/mode/css_highlight_rules"],function(a,b,c){function j(a,b){return{token:"support.function",regex:"^```"+a+"\\s*$",next:b+"start"}}"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=a("./javascript_highlight_rules").JavaScriptHighlightRules,g=a("./xml_highlight_rules").XmlHighlightRules,h=a("./html_highlight_rules").HtmlHighlightRules,i=a("./css_highlight_rules").CssHighlightRules,k=function(){this.$rules={start:[{token:"empty_line",regex:"^$"},{token:"support.function",regex:"(`+)([^\\r]*?[^`])(\\1)"},{token:"support.function",regex:"^[ ]{4}.+"},{token:"markup.heading.1",regex:"^=+(?=\\s*$)"},{token:"markup.heading.1",regex:"^\\-+(?=\\s*$)"},{token:function(a){return"markup.heading."+a.length},regex:"^#{1,6}"},j("javascript","js-"),j("xml","xml-"),j("html","html-"),j("css","css-"),{token:"support.function",regex:"^```[a-zA-Z]+\\s*$",next:"githubblock"},{token:"string",regex:"^>[ ].+$",next:"blockquote"},{token:["text","constant","text","url","string","text"],regex:'^([ ]{0,3}\\[)([^\\]]+)(\\]:\\s*)([^ ]+)(\\s*(?:["][^"]+["])?\\s*)$'},{token:["text","string","text","constant","text"],regex:"(\\[)((?:[[^\\]]*\\]|[^\\[\\]])*)(\\][ ]?(?:\\n[ ]*)?\\[)(.*?)(\\])"},{token:["text","string","text","markup.underline","string","text"],regex:'(\\[)(\\[[^\\]]*\\]|[^\\[\\]]*)(\\]\\([ \\t]*)(<?(?:(?:[^\\(]*?\\([^\\)]*?\\)\\S*?)|(?:.*?))>?)((?:[ \t]*"(?:.*?)"[ \\t]*)?)(\\))'},{token:"constant",regex:"^[ ]{0,2}(?:[ ]?\\*[ ]?){3,}\\s*$"},{token:"constant",regex:"^[ ]{0,2}(?:[ ]?\\-[ ]?){3,}\\s*$"},{token:"constant",regex:"^[ ]{0,2}(?:[ ]?\\_[ ]?){3,}\\s*$"},{token:"markup.list",regex:"^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+",next:"listblock"},{token:"string",regex:"([*]{2}|[_]{2}(?=\\S))([^\\r]*?\\S[*_]*)(\\1)"},{token:"string",regex:"([*]|[_](?=\\S))([^\\r]*?\\S[*_]*)(\\1)"},{token:["text","url","text"],regex:"(<)((?:https?|ftp|dict):[^'\">\\s]+|(?:mailto:)?[-.\\w]+\\@[-a-z0-9]+(?:\\.[-a-z0-9]+)*\\.[a-z]+)(>)"},{token:"text",regex:"[^\\*_%$`\\[#<>]+"}],listblock:[{token:"empty_line",regex:"^$",next:"start"},{token:"markup.list",regex:".+"}],blockquote:[{token:"empty_line",regex:"^\\s*$",next:"start"},{token:"string",regex:".+"}],githubblock:[{token:"support.function",regex:"^```",next:"start"},{token:"support.function",regex:".+"}]},this.embedRules(f,"js-",[{token:"support.function",regex:"^```",next:"start"}]),this.embedRules(h,"html-",[{token:"support.function",regex:"^```",next:"start"}]),this.embedRules(i,"css-",[{token:"support.function",regex:"^```",next:"start"}]),this.embedRules(g,"xml-",[{token:"support.function",regex:"^```",next:"start"}])};d.inherits(k,e),b.MarkdownHighlightRules=k}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-ocaml.js b/apps/files_texteditor/js/aceeditor/mode-ocaml.js
index 56585c0ee61..0e3e15f225c 100644
--- a/apps/files_texteditor/js/aceeditor/mode-ocaml.js
+++ b/apps/files_texteditor/js/aceeditor/mode-ocaml.js
@@ -1 +1 @@
-define("ace/mode/ocaml",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/ocaml_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/ocaml_highlight_rules").OcamlHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e);var k=/(?:[({[=:]|[-=]>|\b(?:else|try|with))\s*$/;(function(){this.toggleCommentLines=function(a,b,c,d){var e,f,g=!0,h=/^\s*\(\*(.*)\*\)/;for(e=c;e<=d;e++)if(!h.test(b.getLine(e))){g=!1;break}var j=new i(0,0,0,0);for(e=c;e<=d;e++)f=b.getLine(e),j.start.row=e,j.end.row=e,j.end.column=f.length,b.replace(j,g?f.match(h)[1]:"(*"+f+"*)")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;(!e.length||e[e.length-1].type!=="comment")&&a==="start"&&k.test(b)&&(d+=c);return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}).call(j.prototype),b.Mode=j}),define("ace/mode/ocaml_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("and|as|assert|begin|class|constraint|do|done|downto|else|end|exception|external|for|fun|function|functor|if|in|include|inherit|initializer|lazy|let|match|method|module|mutable|new|object|of|open|or|private|rec|sig|struct|then|to|try|type|val|virtual|when|while|with".split("|")),b=e.arrayToMap("true|false".split("|")),c=e.arrayToMap("abs|abs_big_int|abs_float|abs_num|abstract_tag|accept|access|acos|add|add_available_units|add_big_int|add_buffer|add_channel|add_char|add_initializer|add_int_big_int|add_interfaces|add_num|add_string|add_substitute|add_substring|alarm|allocated_bytes|allow_only|allow_unsafe_modules|always|append|appname_get|appname_set|approx_num_exp|approx_num_fix|arg|argv|arith_status|array|array1_of_genarray|array2_of_genarray|array3_of_genarray|asin|asr|assoc|assq|at_exit|atan|atan2|auto_synchronize|background|basename|beginning_of_input|big_int_of_int|big_int_of_num|big_int_of_string|bind|bind_class|bind_tag|bits|bits_of_float|black|blit|blit_image|blue|bool|bool_of_string|bounded_full_split|bounded_split|bounded_split_delim|bprintf|break|broadcast|bscanf|button_down|c_layout|capitalize|cardinal|cardinal|catch|catch_break|ceil|ceiling_num|channel|char|char_of_int|chdir|check|check_suffix|chmod|choose|chop_extension|chop_suffix|chown|chown|chr|chroot|classify_float|clear|clear_available_units|clear_close_on_exec|clear_graph|clear_nonblock|clear_parser|close|close|closeTk|close_box|close_graph|close_in|close_in_noerr|close_out|close_out_noerr|close_process|close_process|close_process_full|close_process_in|close_process_out|close_subwindow|close_tag|close_tbox|closedir|closedir|closure_tag|code|combine|combine|combine|command|compact|compare|compare_big_int|compare_num|complex32|complex64|concat|conj|connect|contains|contains_from|contents|copy|cos|cosh|count|count|counters|create|create_alarm|create_image|create_matrix|create_matrix|create_matrix|create_object|create_object_and_run_initializers|create_object_opt|create_process|create_process|create_process_env|create_process_env|create_table|current|current_dir_name|current_point|current_x|current_y|curveto|custom_tag|cyan|data_size|decr|decr_num|default_available_units|delay|delete_alarm|descr_of_in_channel|descr_of_out_channel|destroy|diff|dim|dim1|dim2|dim3|dims|dirname|display_mode|div|div_big_int|div_num|double_array_tag|double_tag|draw_arc|draw_char|draw_circle|draw_ellipse|draw_image|draw_poly|draw_poly_line|draw_rect|draw_segments|draw_string|dummy_pos|dummy_table|dump_image|dup|dup2|elements|empty|end_of_input|environment|eprintf|epsilon_float|eq_big_int|eq_num|equal|err_formatter|error_message|escaped|establish_server|executable_name|execv|execve|execvp|execvpe|exists|exists2|exit|exp|failwith|fast_sort|fchmod|fchown|field|file|file_exists|fill|fill_arc|fill_circle|fill_ellipse|fill_poly|fill_rect|filter|final_tag|finalise|find|find_all|first_chars|firstkey|flatten|float|float32|float64|float_of_big_int|float_of_bits|float_of_int|float_of_num|float_of_string|floor|floor_num|flush|flush_all|flush_input|flush_str_formatter|fold|fold_left|fold_left2|fold_right|fold_right2|for_all|for_all2|force|force_newline|force_val|foreground|fork|format_of_string|formatter_of_buffer|formatter_of_out_channel|fortran_layout|forward_tag|fprintf|frexp|from|from_channel|from_file|from_file_bin|from_function|from_string|fscanf|fst|fstat|ftruncate|full_init|full_major|full_split|gcd_big_int|ge_big_int|ge_num|genarray_of_array1|genarray_of_array2|genarray_of_array3|get|get_all_formatter_output_functions|get_approx_printing|get_copy|get_ellipsis_text|get_error_when_null_denominator|get_floating_precision|get_formatter_output_functions|get_formatter_tag_functions|get_image|get_margin|get_mark_tags|get_max_boxes|get_max_indent|get_method|get_method_label|get_normalize_ratio|get_normalize_ratio_when_printing|get_print_tags|get_state|get_variable|getcwd|getegid|getegid|getenv|getenv|getenv|geteuid|geteuid|getgid|getgid|getgrgid|getgrgid|getgrnam|getgrnam|getgroups|gethostbyaddr|gethostbyname|gethostname|getitimer|getlogin|getpeername|getpid|getppid|getprotobyname|getprotobynumber|getpwnam|getpwuid|getservbyname|getservbyport|getsockname|getsockopt|getsockopt_float|getsockopt_int|getsockopt_optint|gettimeofday|getuid|global_replace|global_substitute|gmtime|green|grid|group_beginning|group_end|gt_big_int|gt_num|guard|handle_unix_error|hash|hash_param|hd|header_size|i|id|ignore|in_channel_length|in_channel_of_descr|incr|incr_num|index|index_from|inet_addr_any|inet_addr_of_string|infinity|infix_tag|init|init_class|input|input_binary_int|input_byte|input_char|input_line|input_value|int|int16_signed|int16_unsigned|int32|int64|int8_signed|int8_unsigned|int_of_big_int|int_of_char|int_of_float|int_of_num|int_of_string|integer_num|inter|interactive|inv|invalid_arg|is_block|is_empty|is_implicit|is_int|is_int_big_int|is_integer_num|is_relative|iter|iter2|iteri|join|junk|key_pressed|kill|kind|kprintf|kscanf|land|last_chars|layout|lazy_from_fun|lazy_from_val|lazy_is_val|lazy_tag|ldexp|le_big_int|le_num|length|lexeme|lexeme_char|lexeme_end|lexeme_end_p|lexeme_start|lexeme_start_p|lineto|link|list|listen|lnot|loadfile|loadfile_private|localtime|lock|lockf|log|log10|logand|lognot|logor|logxor|lor|lower_window|lowercase|lseek|lsl|lsr|lstat|lt_big_int|lt_num|lxor|magenta|magic|mainLoop|major|major_slice|make|make_formatter|make_image|make_lexer|make_matrix|make_self_init|map|map2|map_file|mapi|marshal|match_beginning|match_end|matched_group|matched_string|max|max_array_length|max_big_int|max_elt|max_float|max_int|max_num|max_string_length|mem|mem_assoc|mem_assq|memq|merge|min|min_big_int|min_elt|min_float|min_int|min_num|minor|minus_big_int|minus_num|minus_one|mkdir|mkfifo|mktime|mod|mod_big_int|mod_float|mod_num|modf|mouse_pos|moveto|mul|mult_big_int|mult_int_big_int|mult_num|nan|narrow|nat_of_num|nativeint|neg|neg_infinity|new_block|new_channel|new_method|new_variable|next|nextkey|nice|nice|no_scan_tag|norm|norm2|not|npeek|nth|nth_dim|num_digits_big_int|num_dims|num_of_big_int|num_of_int|num_of_nat|num_of_ratio|num_of_string|O|obj|object_tag|ocaml_version|of_array|of_channel|of_float|of_int|of_int32|of_list|of_nativeint|of_string|one|openTk|open_box|open_connection|open_graph|open_hbox|open_hovbox|open_hvbox|open_in|open_in_bin|open_in_gen|open_out|open_out_bin|open_out_gen|open_process|open_process_full|open_process_in|open_process_out|open_subwindow|open_tag|open_tbox|open_temp_file|open_vbox|opendbm|opendir|openfile|or|os_type|out_channel_length|out_channel_of_descr|output|output_binary_int|output_buffer|output_byte|output_char|output_string|output_value|over_max_boxes|pack|params|parent_dir_name|parse|parse_argv|partition|pause|peek|pipe|pixels|place|plot|plots|point_color|polar|poll|pop|pos_in|pos_out|pow|power_big_int_positive_big_int|power_big_int_positive_int|power_int_positive_big_int|power_int_positive_int|power_num|pp_close_box|pp_close_tag|pp_close_tbox|pp_force_newline|pp_get_all_formatter_output_functions|pp_get_ellipsis_text|pp_get_formatter_output_functions|pp_get_formatter_tag_functions|pp_get_margin|pp_get_mark_tags|pp_get_max_boxes|pp_get_max_indent|pp_get_print_tags|pp_open_box|pp_open_hbox|pp_open_hovbox|pp_open_hvbox|pp_open_tag|pp_open_tbox|pp_open_vbox|pp_over_max_boxes|pp_print_as|pp_print_bool|pp_print_break|pp_print_char|pp_print_cut|pp_print_float|pp_print_flush|pp_print_if_newline|pp_print_int|pp_print_newline|pp_print_space|pp_print_string|pp_print_tab|pp_print_tbreak|pp_set_all_formatter_output_functions|pp_set_ellipsis_text|pp_set_formatter_out_channel|pp_set_formatter_output_functions|pp_set_formatter_tag_functions|pp_set_margin|pp_set_mark_tags|pp_set_max_boxes|pp_set_max_indent|pp_set_print_tags|pp_set_tab|pp_set_tags|pred|pred_big_int|pred_num|prerr_char|prerr_endline|prerr_float|prerr_int|prerr_newline|prerr_string|print|print_as|print_bool|print_break|print_char|print_cut|print_endline|print_float|print_flush|print_if_newline|print_int|print_newline|print_space|print_stat|print_string|print_tab|print_tbreak|printf|prohibit|public_method_label|push|putenv|quo_num|quomod_big_int|quote|raise|raise_window|ratio_of_num|rcontains_from|read|read_float|read_int|read_key|read_line|readdir|readdir|readlink|really_input|receive|recv|recvfrom|red|ref|regexp|regexp_case_fold|regexp_string|regexp_string_case_fold|register|register_exception|rem|remember_mode|remove|remove_assoc|remove_assq|rename|replace|replace_first|replace_matched|repr|reset|reshape|reshape_1|reshape_2|reshape_3|rev|rev_append|rev_map|rev_map2|rewinddir|rgb|rhs_end|rhs_end_pos|rhs_start|rhs_start_pos|rindex|rindex_from|rlineto|rmdir|rmoveto|round_num|run_initializers|run_initializers_opt|scanf|search_backward|search_forward|seek_in|seek_out|select|self|self_init|send|sendto|set|set_all_formatter_output_functions|set_approx_printing|set_binary_mode_in|set_binary_mode_out|set_close_on_exec|set_close_on_exec|set_color|set_ellipsis_text|set_error_when_null_denominator|set_field|set_floating_precision|set_font|set_formatter_out_channel|set_formatter_output_functions|set_formatter_tag_functions|set_line_width|set_margin|set_mark_tags|set_max_boxes|set_max_indent|set_method|set_nonblock|set_nonblock|set_normalize_ratio|set_normalize_ratio_when_printing|set_print_tags|set_signal|set_state|set_tab|set_tag|set_tags|set_text_size|set_window_title|setgid|setgid|setitimer|setitimer|setsid|setsid|setsockopt|setsockopt|setsockopt_float|setsockopt_float|setsockopt_int|setsockopt_int|setsockopt_optint|setsockopt_optint|setuid|setuid|shift_left|shift_left|shift_left|shift_right|shift_right|shift_right|shift_right_logical|shift_right_logical|shift_right_logical|show_buckets|shutdown|shutdown|shutdown_connection|shutdown_connection|sigabrt|sigalrm|sigchld|sigcont|sigfpe|sighup|sigill|sigint|sigkill|sign_big_int|sign_num|signal|signal|sigpending|sigpending|sigpipe|sigprocmask|sigprocmask|sigprof|sigquit|sigsegv|sigstop|sigsuspend|sigsuspend|sigterm|sigtstp|sigttin|sigttou|sigusr1|sigusr2|sigvtalrm|sin|singleton|sinh|size|size|size_x|size_y|sleep|sleep|sleep|slice_left|slice_left|slice_left_1|slice_left_2|slice_right|slice_right|slice_right_1|slice_right_2|snd|socket|socket|socket|socketpair|socketpair|sort|sound|split|split_delim|sprintf|sprintf|sqrt|sqrt|sqrt_big_int|square_big_int|square_num|sscanf|stable_sort|stable_sort|stable_sort|stable_sort|stable_sort|stable_sort|stat|stat|stat|stat|stat|stats|stats|std_formatter|stdbuf|stderr|stderr|stderr|stdib|stdin|stdin|stdin|stdout|stdout|stdout|str_formatter|string|string_after|string_before|string_match|string_of_big_int|string_of_bool|string_of_float|string_of_format|string_of_inet_addr|string_of_inet_addr|string_of_int|string_of_num|string_partial_match|string_tag|sub|sub|sub_big_int|sub_left|sub_num|sub_right|subset|subset|substitute_first|substring|succ|succ|succ|succ|succ_big_int|succ_num|symbol_end|symbol_end_pos|symbol_start|symbol_start_pos|symlink|symlink|sync|synchronize|system|system|system|tag|take|tan|tanh|tcdrain|tcdrain|tcflow|tcflow|tcflush|tcflush|tcgetattr|tcgetattr|tcsendbreak|tcsendbreak|tcsetattr|tcsetattr|temp_file|text_size|time|time|time|timed_read|timed_write|times|times|tl|tl|tl|to_buffer|to_channel|to_float|to_hex|to_int|to_int32|to_list|to_list|to_list|to_nativeint|to_string|to_string|to_string|to_string|to_string|top|top|total_size|transfer|transp|truncate|truncate|truncate|truncate|truncate|truncate|try_lock|umask|umask|uncapitalize|uncapitalize|uncapitalize|union|union|unit_big_int|unlink|unlink|unlock|unmarshal|unsafe_blit|unsafe_fill|unsafe_get|unsafe_get|unsafe_set|unsafe_set|update|uppercase|uppercase|uppercase|uppercase|usage|utimes|utimes|wait|wait|wait|wait|wait_next_event|wait_pid|wait_read|wait_signal|wait_timed_read|wait_timed_write|wait_write|waitpid|white|widen|window_id|word_size|wrap|wrap_abort|write|yellow|yield|zero|zero_big_int|Arg|Arith_status|Array|Array1|Array2|Array3|ArrayLabels|Big_int|Bigarray|Buffer|Callback|CamlinternalOO|Char|Complex|Condition|Dbm|Digest|Dynlink|Event|Filename|Format|Gc|Genarray|Genlex|Graphics|GraphicsX11|Hashtbl|Int32|Int64|LargeFile|Lazy|Lexing|List|ListLabels|Make|Map|Marshal|MoreLabels|Mutex|Nativeint|Num|Obj|Oo|Parsing|Pervasives|Printexc|Printf|Queue|Random|Scanf|Scanning|Set|Sort|Stack|State|StdLabels|Str|Stream|String|StringLabels|Sys|Thread|ThreadUnix|Tk|Unix|UnixLabels|Weak".split("|")),d="(?:(?:[1-9]\\d*)|(?:0))",f="(?:0[oO]?[0-7]+)",g="(?:0[xX][\\dA-Fa-f]+)",h="(?:0[bB][01]+)",i="(?:"+d+"|"+f+"|"+g+"|"+h+")",j="(?:[eE][+-]?\\d+)",k="(?:\\.\\d+)",l="(?:\\d+)",m="(?:(?:"+l+"?"+k+")|(?:"+l+"\\.))",n="(?:(?:"+m+"|"+l+")"+j+")",o="(?:"+n+"|"+m+")";this.$rules={start:[{token:"comment",regex:"\\(\\*.*?\\*\\)\\s*?$"},{token:"comment",merge:!0,regex:"\\(\\*.*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"'.'"},{token:"string",merge:!0,regex:'"',next:"qstring"},{token:"constant.numeric",regex:"(?:"+o+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:o},{token:"constant.numeric",regex:i+"\\b"},{token:function(d){return a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+\\.|\\-\\.|\\*\\.|\\/\\.|#|;;|\\+|\\-|\\*|\\*\\*\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|<-|="},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\)",next:"start"},{token:"comment",merge:!0,regex:".+"}],qstring:[{token:"string",regex:'"',next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.OcamlHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})
\ No newline at end of file
+define("ace/mode/ocaml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/ocaml_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./ocaml_highlight_rules").OcamlHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e);var k=/(?:[({[=:]|[-=]>|\b(?:else|try|with))\s*$/;((function(){this.toggleCommentLines=function(a,b,c,d){var e,f,g=!0,h=/^\s*\(\*(.*)\*\)/;for(e=c;e<=d;e++)if(!h.test(b.getLine(e))){g=!1;break}var j=new i(0,0,0,0);for(e=c;e<=d;e++)f=b.getLine(e),j.start.row=e,j.end.row=e,j.end.column=f.length,b.replace(j,g?f.match(h)[1]:"(*"+f+"*)")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;return(!e.length||e[e.length-1].type!=="comment")&&a==="start"&&k.test(b)&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}})).call(j.prototype),b.Mode=j}),define("ace/mode/ocaml_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("and|as|assert|begin|class|constraint|do|done|downto|else|end|exception|external|for|fun|function|functor|if|in|include|inherit|initializer|lazy|let|match|method|module|mutable|new|object|of|open|or|private|rec|sig|struct|then|to|try|type|val|virtual|when|while|with".split("|")),b=e.arrayToMap("true|false".split("|")),c=e.arrayToMap("abs|abs_big_int|abs_float|abs_num|abstract_tag|accept|access|acos|add|add_available_units|add_big_int|add_buffer|add_channel|add_char|add_initializer|add_int_big_int|add_interfaces|add_num|add_string|add_substitute|add_substring|alarm|allocated_bytes|allow_only|allow_unsafe_modules|always|append|appname_get|appname_set|approx_num_exp|approx_num_fix|arg|argv|arith_status|array|array1_of_genarray|array2_of_genarray|array3_of_genarray|asin|asr|assoc|assq|at_exit|atan|atan2|auto_synchronize|background|basename|beginning_of_input|big_int_of_int|big_int_of_num|big_int_of_string|bind|bind_class|bind_tag|bits|bits_of_float|black|blit|blit_image|blue|bool|bool_of_string|bounded_full_split|bounded_split|bounded_split_delim|bprintf|break|broadcast|bscanf|button_down|c_layout|capitalize|cardinal|cardinal|catch|catch_break|ceil|ceiling_num|channel|char|char_of_int|chdir|check|check_suffix|chmod|choose|chop_extension|chop_suffix|chown|chown|chr|chroot|classify_float|clear|clear_available_units|clear_close_on_exec|clear_graph|clear_nonblock|clear_parser|close|close|closeTk|close_box|close_graph|close_in|close_in_noerr|close_out|close_out_noerr|close_process|close_process|close_process_full|close_process_in|close_process_out|close_subwindow|close_tag|close_tbox|closedir|closedir|closure_tag|code|combine|combine|combine|command|compact|compare|compare_big_int|compare_num|complex32|complex64|concat|conj|connect|contains|contains_from|contents|copy|cos|cosh|count|count|counters|create|create_alarm|create_image|create_matrix|create_matrix|create_matrix|create_object|create_object_and_run_initializers|create_object_opt|create_process|create_process|create_process_env|create_process_env|create_table|current|current_dir_name|current_point|current_x|current_y|curveto|custom_tag|cyan|data_size|decr|decr_num|default_available_units|delay|delete_alarm|descr_of_in_channel|descr_of_out_channel|destroy|diff|dim|dim1|dim2|dim3|dims|dirname|display_mode|div|div_big_int|div_num|double_array_tag|double_tag|draw_arc|draw_char|draw_circle|draw_ellipse|draw_image|draw_poly|draw_poly_line|draw_rect|draw_segments|draw_string|dummy_pos|dummy_table|dump_image|dup|dup2|elements|empty|end_of_input|environment|eprintf|epsilon_float|eq_big_int|eq_num|equal|err_formatter|error_message|escaped|establish_server|executable_name|execv|execve|execvp|execvpe|exists|exists2|exit|exp|failwith|fast_sort|fchmod|fchown|field|file|file_exists|fill|fill_arc|fill_circle|fill_ellipse|fill_poly|fill_rect|filter|final_tag|finalise|find|find_all|first_chars|firstkey|flatten|float|float32|float64|float_of_big_int|float_of_bits|float_of_int|float_of_num|float_of_string|floor|floor_num|flush|flush_all|flush_input|flush_str_formatter|fold|fold_left|fold_left2|fold_right|fold_right2|for_all|for_all2|force|force_newline|force_val|foreground|fork|format_of_string|formatter_of_buffer|formatter_of_out_channel|fortran_layout|forward_tag|fprintf|frexp|from|from_channel|from_file|from_file_bin|from_function|from_string|fscanf|fst|fstat|ftruncate|full_init|full_major|full_split|gcd_big_int|ge_big_int|ge_num|genarray_of_array1|genarray_of_array2|genarray_of_array3|get|get_all_formatter_output_functions|get_approx_printing|get_copy|get_ellipsis_text|get_error_when_null_denominator|get_floating_precision|get_formatter_output_functions|get_formatter_tag_functions|get_image|get_margin|get_mark_tags|get_max_boxes|get_max_indent|get_method|get_method_label|get_normalize_ratio|get_normalize_ratio_when_printing|get_print_tags|get_state|get_variable|getcwd|getegid|getegid|getenv|getenv|getenv|geteuid|geteuid|getgid|getgid|getgrgid|getgrgid|getgrnam|getgrnam|getgroups|gethostbyaddr|gethostbyname|gethostname|getitimer|getlogin|getpeername|getpid|getppid|getprotobyname|getprotobynumber|getpwnam|getpwuid|getservbyname|getservbyport|getsockname|getsockopt|getsockopt_float|getsockopt_int|getsockopt_optint|gettimeofday|getuid|global_replace|global_substitute|gmtime|green|grid|group_beginning|group_end|gt_big_int|gt_num|guard|handle_unix_error|hash|hash_param|hd|header_size|i|id|ignore|in_channel_length|in_channel_of_descr|incr|incr_num|index|index_from|inet_addr_any|inet_addr_of_string|infinity|infix_tag|init|init_class|input|input_binary_int|input_byte|input_char|input_line|input_value|int|int16_signed|int16_unsigned|int32|int64|int8_signed|int8_unsigned|int_of_big_int|int_of_char|int_of_float|int_of_num|int_of_string|integer_num|inter|interactive|inv|invalid_arg|is_block|is_empty|is_implicit|is_int|is_int_big_int|is_integer_num|is_relative|iter|iter2|iteri|join|junk|key_pressed|kill|kind|kprintf|kscanf|land|last_chars|layout|lazy_from_fun|lazy_from_val|lazy_is_val|lazy_tag|ldexp|le_big_int|le_num|length|lexeme|lexeme_char|lexeme_end|lexeme_end_p|lexeme_start|lexeme_start_p|lineto|link|list|listen|lnot|loadfile|loadfile_private|localtime|lock|lockf|log|log10|logand|lognot|logor|logxor|lor|lower_window|lowercase|lseek|lsl|lsr|lstat|lt_big_int|lt_num|lxor|magenta|magic|mainLoop|major|major_slice|make|make_formatter|make_image|make_lexer|make_matrix|make_self_init|map|map2|map_file|mapi|marshal|match_beginning|match_end|matched_group|matched_string|max|max_array_length|max_big_int|max_elt|max_float|max_int|max_num|max_string_length|mem|mem_assoc|mem_assq|memq|merge|min|min_big_int|min_elt|min_float|min_int|min_num|minor|minus_big_int|minus_num|minus_one|mkdir|mkfifo|mktime|mod|mod_big_int|mod_float|mod_num|modf|mouse_pos|moveto|mul|mult_big_int|mult_int_big_int|mult_num|nan|narrow|nat_of_num|nativeint|neg|neg_infinity|new_block|new_channel|new_method|new_variable|next|nextkey|nice|nice|no_scan_tag|norm|norm2|not|npeek|nth|nth_dim|num_digits_big_int|num_dims|num_of_big_int|num_of_int|num_of_nat|num_of_ratio|num_of_string|O|obj|object_tag|ocaml_version|of_array|of_channel|of_float|of_int|of_int32|of_list|of_nativeint|of_string|one|openTk|open_box|open_connection|open_graph|open_hbox|open_hovbox|open_hvbox|open_in|open_in_bin|open_in_gen|open_out|open_out_bin|open_out_gen|open_process|open_process_full|open_process_in|open_process_out|open_subwindow|open_tag|open_tbox|open_temp_file|open_vbox|opendbm|opendir|openfile|or|os_type|out_channel_length|out_channel_of_descr|output|output_binary_int|output_buffer|output_byte|output_char|output_string|output_value|over_max_boxes|pack|params|parent_dir_name|parse|parse_argv|partition|pause|peek|pipe|pixels|place|plot|plots|point_color|polar|poll|pop|pos_in|pos_out|pow|power_big_int_positive_big_int|power_big_int_positive_int|power_int_positive_big_int|power_int_positive_int|power_num|pp_close_box|pp_close_tag|pp_close_tbox|pp_force_newline|pp_get_all_formatter_output_functions|pp_get_ellipsis_text|pp_get_formatter_output_functions|pp_get_formatter_tag_functions|pp_get_margin|pp_get_mark_tags|pp_get_max_boxes|pp_get_max_indent|pp_get_print_tags|pp_open_box|pp_open_hbox|pp_open_hovbox|pp_open_hvbox|pp_open_tag|pp_open_tbox|pp_open_vbox|pp_over_max_boxes|pp_print_as|pp_print_bool|pp_print_break|pp_print_char|pp_print_cut|pp_print_float|pp_print_flush|pp_print_if_newline|pp_print_int|pp_print_newline|pp_print_space|pp_print_string|pp_print_tab|pp_print_tbreak|pp_set_all_formatter_output_functions|pp_set_ellipsis_text|pp_set_formatter_out_channel|pp_set_formatter_output_functions|pp_set_formatter_tag_functions|pp_set_margin|pp_set_mark_tags|pp_set_max_boxes|pp_set_max_indent|pp_set_print_tags|pp_set_tab|pp_set_tags|pred|pred_big_int|pred_num|prerr_char|prerr_endline|prerr_float|prerr_int|prerr_newline|prerr_string|print|print_as|print_bool|print_break|print_char|print_cut|print_endline|print_float|print_flush|print_if_newline|print_int|print_newline|print_space|print_stat|print_string|print_tab|print_tbreak|printf|prohibit|public_method_label|push|putenv|quo_num|quomod_big_int|quote|raise|raise_window|ratio_of_num|rcontains_from|read|read_float|read_int|read_key|read_line|readdir|readdir|readlink|really_input|receive|recv|recvfrom|red|ref|regexp|regexp_case_fold|regexp_string|regexp_string_case_fold|register|register_exception|rem|remember_mode|remove|remove_assoc|remove_assq|rename|replace|replace_first|replace_matched|repr|reset|reshape|reshape_1|reshape_2|reshape_3|rev|rev_append|rev_map|rev_map2|rewinddir|rgb|rhs_end|rhs_end_pos|rhs_start|rhs_start_pos|rindex|rindex_from|rlineto|rmdir|rmoveto|round_num|run_initializers|run_initializers_opt|scanf|search_backward|search_forward|seek_in|seek_out|select|self|self_init|send|sendto|set|set_all_formatter_output_functions|set_approx_printing|set_binary_mode_in|set_binary_mode_out|set_close_on_exec|set_close_on_exec|set_color|set_ellipsis_text|set_error_when_null_denominator|set_field|set_floating_precision|set_font|set_formatter_out_channel|set_formatter_output_functions|set_formatter_tag_functions|set_line_width|set_margin|set_mark_tags|set_max_boxes|set_max_indent|set_method|set_nonblock|set_nonblock|set_normalize_ratio|set_normalize_ratio_when_printing|set_print_tags|set_signal|set_state|set_tab|set_tag|set_tags|set_text_size|set_window_title|setgid|setgid|setitimer|setitimer|setsid|setsid|setsockopt|setsockopt|setsockopt_float|setsockopt_float|setsockopt_int|setsockopt_int|setsockopt_optint|setsockopt_optint|setuid|setuid|shift_left|shift_left|shift_left|shift_right|shift_right|shift_right|shift_right_logical|shift_right_logical|shift_right_logical|show_buckets|shutdown|shutdown|shutdown_connection|shutdown_connection|sigabrt|sigalrm|sigchld|sigcont|sigfpe|sighup|sigill|sigint|sigkill|sign_big_int|sign_num|signal|signal|sigpending|sigpending|sigpipe|sigprocmask|sigprocmask|sigprof|sigquit|sigsegv|sigstop|sigsuspend|sigsuspend|sigterm|sigtstp|sigttin|sigttou|sigusr1|sigusr2|sigvtalrm|sin|singleton|sinh|size|size|size_x|size_y|sleep|sleep|sleep|slice_left|slice_left|slice_left_1|slice_left_2|slice_right|slice_right|slice_right_1|slice_right_2|snd|socket|socket|socket|socketpair|socketpair|sort|sound|split|split_delim|sprintf|sprintf|sqrt|sqrt|sqrt_big_int|square_big_int|square_num|sscanf|stable_sort|stable_sort|stable_sort|stable_sort|stable_sort|stable_sort|stat|stat|stat|stat|stat|stats|stats|std_formatter|stdbuf|stderr|stderr|stderr|stdib|stdin|stdin|stdin|stdout|stdout|stdout|str_formatter|string|string_after|string_before|string_match|string_of_big_int|string_of_bool|string_of_float|string_of_format|string_of_inet_addr|string_of_inet_addr|string_of_int|string_of_num|string_partial_match|string_tag|sub|sub|sub_big_int|sub_left|sub_num|sub_right|subset|subset|substitute_first|substring|succ|succ|succ|succ|succ_big_int|succ_num|symbol_end|symbol_end_pos|symbol_start|symbol_start_pos|symlink|symlink|sync|synchronize|system|system|system|tag|take|tan|tanh|tcdrain|tcdrain|tcflow|tcflow|tcflush|tcflush|tcgetattr|tcgetattr|tcsendbreak|tcsendbreak|tcsetattr|tcsetattr|temp_file|text_size|time|time|time|timed_read|timed_write|times|times|tl|tl|tl|to_buffer|to_channel|to_float|to_hex|to_int|to_int32|to_list|to_list|to_list|to_nativeint|to_string|to_string|to_string|to_string|to_string|top|top|total_size|transfer|transp|truncate|truncate|truncate|truncate|truncate|truncate|try_lock|umask|umask|uncapitalize|uncapitalize|uncapitalize|union|union|unit_big_int|unlink|unlink|unlock|unmarshal|unsafe_blit|unsafe_fill|unsafe_get|unsafe_get|unsafe_set|unsafe_set|update|uppercase|uppercase|uppercase|uppercase|usage|utimes|utimes|wait|wait|wait|wait|wait_next_event|wait_pid|wait_read|wait_signal|wait_timed_read|wait_timed_write|wait_write|waitpid|white|widen|window_id|word_size|wrap|wrap_abort|write|yellow|yield|zero|zero_big_int|Arg|Arith_status|Array|Array1|Array2|Array3|ArrayLabels|Big_int|Bigarray|Buffer|Callback|CamlinternalOO|Char|Complex|Condition|Dbm|Digest|Dynlink|Event|Filename|Format|Gc|Genarray|Genlex|Graphics|GraphicsX11|Hashtbl|Int32|Int64|LargeFile|Lazy|Lexing|List|ListLabels|Make|Map|Marshal|MoreLabels|Mutex|Nativeint|Num|Obj|Oo|Parsing|Pervasives|Printexc|Printf|Queue|Random|Scanf|Scanning|Set|Sort|Stack|State|StdLabels|Str|Stream|String|StringLabels|Sys|Thread|ThreadUnix|Tk|Unix|UnixLabels|Weak".split("|")),d="(?:(?:[1-9]\\d*)|(?:0))",f="(?:0[oO]?[0-7]+)",g="(?:0[xX][\\dA-Fa-f]+)",h="(?:0[bB][01]+)",i="(?:"+d+"|"+f+"|"+g+"|"+h+")",j="(?:[eE][+-]?\\d+)",k="(?:\\.\\d+)",l="(?:\\d+)",m="(?:(?:"+l+"?"+k+")|(?:"+l+"\\.))",n="(?:(?:"+m+"|"+l+")"+j+")",o="(?:"+n+"|"+m+")";this.$rules={start:[{token:"comment",regex:"\\(\\*.*?\\*\\)\\s*?$"},{token:"comment",merge:!0,regex:"\\(\\*.*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"'.'"},{token:"string",merge:!0,regex:'"',next:"qstring"},{token:"constant.numeric",regex:"(?:"+o+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:o},{token:"constant.numeric",regex:i+"\\b"},{token:function(d){return a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+\\.|\\-\\.|\\*\\.|\\/\\.|#|;;|\\+|\\-|\\*|\\*\\*\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|<-|="},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\)",next:"start"},{token:"comment",merge:!0,regex:".+"}],qstring:[{token:"string",regex:'"',next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.OcamlHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-perl.js b/apps/files_texteditor/js/aceeditor/mode-perl.js
index 521280f402c..706bb9362c3 100644
--- a/apps/files_texteditor/js/aceeditor/mode-perl.js
+++ b/apps/files_texteditor/js/aceeditor/mode-perl.js
@@ -1 +1 @@
-define("ace/mode/perl",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/perl_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/perl_highlight_rules").PerlHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)#/;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[\:]\s*$/);h&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/perl_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("base|constant|continue|else|elsif|for|foreach|format|goto|if|last|local|my|next|no|package|parent|redo|require|scalar|sub|unless|until|while|use|vars".split("|")),b=e.arrayToMap("ARGV|ENV|INC|SIG".split("|")),c=e.arrayToMap("getprotobynumber|getprotobyname|getservbyname|gethostbyaddr|gethostbyname|getservbyport|getnetbyaddr|getnetbyname|getsockname|getpeername|setpriority|getprotoent|setprotoent|getpriority|endprotoent|getservent|setservent|endservent|sethostent|socketpair|getsockopt|gethostent|endhostent|setsockopt|setnetent|quotemeta|localtime|prototype|getnetent|endnetent|rewinddir|wantarray|getpwuid|closedir|getlogin|readlink|endgrent|getgrgid|getgrnam|shmwrite|shutdown|readline|endpwent|setgrent|readpipe|formline|truncate|dbmclose|syswrite|setpwent|getpwnam|getgrent|getpwent|ucfirst|sysread|setpgrp|shmread|sysseek|sysopen|telldir|defined|opendir|connect|lcfirst|getppid|binmode|syscall|sprintf|getpgrp|readdir|seekdir|waitpid|reverse|unshift|symlink|dbmopen|semget|msgrcv|rename|listen|chroot|msgsnd|shmctl|accept|unpack|exists|fileno|shmget|system|unlink|printf|gmtime|msgctl|semctl|values|rindex|substr|splice|length|msgget|select|socket|return|caller|delete|alarm|ioctl|index|undef|lstat|times|srand|chown|fcntl|close|write|umask|rmdir|study|sleep|chomp|untie|print|utime|mkdir|atan2|split|crypt|flock|chmod|BEGIN|bless|chdir|semop|shift|reset|link|stat|chop|grep|fork|dump|join|open|tell|pipe|exit|glob|warn|each|bind|sort|pack|eval|push|keys|getc|kill|seek|sqrt|send|wait|rand|tied|read|time|exec|recv|eof|chr|int|ord|exp|pos|pop|sin|log|abs|oct|hex|tie|cos|vec|END|ref|map|die|uc|lc|do".split("|"));this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0x[0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:function(d){return a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\.\\.\\.|\\|\\|=|>>=|<<=|<=>|&&=|=>|!~|\\^=|&=|\\|=|\\.=|x=|%=|\\/=|\\*=|\\-=|\\+=|=~|\\*\\*|\\-\\-|\\.\\.|\\|\\||&&|\\+\\+|\\->|!=|==|>=|<=|>>|<<|,|=|\\?\\:|\\^|\\||x|%|\\/|\\*|<|&|\\\\|~|!|>|\\.|\\-|\\+|\\-C|\\-b|\\-S|\\-u|\\-t|\\-p|\\-l|\\-d|\\-f|\\-g|\\-s|\\-z|\\-k|\\-e|\\-O|\\-T|\\-B|\\-M|\\-A|\\-X|\\-W|\\-c|\\-R|\\-o|\\-x|\\-w|\\-r|\\b(?:and|cmp|eq|ge|gt|le|lt|ne|not|or|xor)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PerlHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})
\ No newline at end of file
+define("ace/mode/perl",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/perl_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./perl_highlight_rules").PerlHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.foldingRules=new j};d.inherits(k,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[\:]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(k.prototype),b.Mode=k}),define("ace/mode/perl_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("base|constant|continue|else|elsif|for|foreach|format|goto|if|last|local|my|next|no|package|parent|redo|require|scalar|sub|unless|until|while|use|vars".split("|")),b=e.arrayToMap("ARGV|ENV|INC|SIG".split("|")),c=e.arrayToMap("getprotobynumber|getprotobyname|getservbyname|gethostbyaddr|gethostbyname|getservbyport|getnetbyaddr|getnetbyname|getsockname|getpeername|setpriority|getprotoent|setprotoent|getpriority|endprotoent|getservent|setservent|endservent|sethostent|socketpair|getsockopt|gethostent|endhostent|setsockopt|setnetent|quotemeta|localtime|prototype|getnetent|endnetent|rewinddir|wantarray|getpwuid|closedir|getlogin|readlink|endgrent|getgrgid|getgrnam|shmwrite|shutdown|readline|endpwent|setgrent|readpipe|formline|truncate|dbmclose|syswrite|setpwent|getpwnam|getgrent|getpwent|ucfirst|sysread|setpgrp|shmread|sysseek|sysopen|telldir|defined|opendir|connect|lcfirst|getppid|binmode|syscall|sprintf|getpgrp|readdir|seekdir|waitpid|reverse|unshift|symlink|dbmopen|semget|msgrcv|rename|listen|chroot|msgsnd|shmctl|accept|unpack|exists|fileno|shmget|system|unlink|printf|gmtime|msgctl|semctl|values|rindex|substr|splice|length|msgget|select|socket|return|caller|delete|alarm|ioctl|index|undef|lstat|times|srand|chown|fcntl|close|write|umask|rmdir|study|sleep|chomp|untie|print|utime|mkdir|atan2|split|crypt|flock|chmod|BEGIN|bless|chdir|semop|shift|reset|link|stat|chop|grep|fork|dump|join|open|tell|pipe|exit|glob|warn|each|bind|sort|pack|eval|push|keys|getc|kill|seek|sqrt|send|wait|rand|tied|read|time|exec|recv|eof|chr|int|ord|exp|pos|pop|sin|log|abs|oct|hex|tie|cos|vec|END|ref|map|die|uc|lc|do".split("|"));this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0x[0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:function(d){return a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\.\\.\\.|\\|\\|=|>>=|<<=|<=>|&&=|=>|!~|\\^=|&=|\\|=|\\.=|x=|%=|\\/=|\\*=|\\-=|\\+=|=~|\\*\\*|\\-\\-|\\.\\.|\\|\\||&&|\\+\\+|\\->|!=|==|>=|<=|>>|<<|,|=|\\?\\:|\\^|\\||x|%|\\/|\\*|<|&|\\\\|~|!|>|\\.|\\-|\\+|\\-C|\\-b|\\-S|\\-u|\\-t|\\-p|\\-l|\\-d|\\-f|\\-g|\\-s|\\-z|\\-k|\\-e|\\-O|\\-T|\\-B|\\-M|\\-A|\\-X|\\-W|\\-c|\\-R|\\-o|\\-x|\\-w|\\-r|\\b(?:and|cmp|eq|ge|gt|le|lt|ne|not|or|xor)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PerlHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-php.js b/apps/files_texteditor/js/aceeditor/mode-php.js
index 20b056b16db..a60c8df7269 100644
--- a/apps/files_texteditor/js/aceeditor/mode-php.js
+++ b/apps/files_texteditor/js/aceeditor/mode-php.js
@@ -1 +1 @@
-define("ace/mode/php",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/php_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/php_highlight_rules").PhpHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=a("ace/mode/behaviour/cstyle").CstyleBehaviour,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new j};d.inherits(k,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)#/;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[\:]\s*$/);h&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(k.prototype),b.Mode=k}),define("ace/mode/php_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules,g=a("ace/mode/text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("abs|acos|acosh|addcslashes|addslashes|aggregate|aggregate_info|aggregate_methods|aggregate_methods_by_list|aggregate_methods_by_regexp|aggregate_properties|aggregate_properties_by_list|aggregate_properties_by_regexp|aggregation_info|amqpconnection|amqpexchange|amqpqueue|apache_child_terminate|apache_get_modules|apache_get_version|apache_getenv|apache_lookup_uri|apache_note|apache_request_headers|apache_reset_timeout|apache_response_headers|apache_setenv|apc_add|apc_bin_dump|apc_bin_dumpfile|apc_bin_load|apc_bin_loadfile|apc_cache_info|apc_cas|apc_clear_cache|apc_compile_file|apc_dec|apc_define_constants|apc_delete|apc_delete_file|apc_exists|apc_fetch|apc_inc|apc_load_constants|apc_sma_info|apc_store|apciterator|apd_breakpoint|apd_callstack|apd_clunk|apd_continue|apd_croak|apd_dump_function_table|apd_dump_persistent_resources|apd_dump_regular_resources|apd_echo|apd_get_active_symbols|apd_set_pprof_trace|apd_set_session|apd_set_session_trace|apd_set_session_trace_socket|appenditerator|array|array_change_key_case|array_chunk|array_combine|array_count_values|array_diff|array_diff_assoc|array_diff_key|array_diff_uassoc|array_diff_ukey|array_fill|array_fill_keys|array_filter|array_flip|array_intersect|array_intersect_assoc|array_intersect_key|array_intersect_uassoc|array_intersect_ukey|array_key_exists|array_keys|array_map|array_merge|array_merge_recursive|array_multisort|array_pad|array_pop|array_product|array_push|array_rand|array_reduce|array_replace|array_replace_recursive|array_reverse|array_search|array_shift|array_slice|array_splice|array_sum|array_udiff|array_udiff_assoc|array_udiff_uassoc|array_uintersect|array_uintersect_assoc|array_uintersect_uassoc|array_unique|array_unshift|array_values|array_walk|array_walk_recursive|arrayaccess|arrayiterator|arrayobject|arsort|asin|asinh|asort|assert|assert_options|atan|atan2|atanh|audioproperties|badfunctioncallexception|badmethodcallexception|base64_decode|base64_encode|base_convert|basename|bbcode_add_element|bbcode_add_smiley|bbcode_create|bbcode_destroy|bbcode_parse|bbcode_set_arg_parser|bbcode_set_flags|bcadd|bccomp|bcdiv|bcmod|bcmul|bcompiler_load|bcompiler_load_exe|bcompiler_parse_class|bcompiler_read|bcompiler_write_class|bcompiler_write_constant|bcompiler_write_exe_footer|bcompiler_write_file|bcompiler_write_footer|bcompiler_write_function|bcompiler_write_functions_from_file|bcompiler_write_header|bcompiler_write_included_filename|bcpow|bcpowmod|bcscale|bcsqrt|bcsub|bin2hex|bind_textdomain_codeset|bindec|bindtextdomain|bson_decode|bson_encode|bumpValue|bzclose|bzcompress|bzdecompress|bzerrno|bzerror|bzerrstr|bzflush|bzopen|bzread|bzwrite|cachingiterator|cairo|cairo_create|cairo_font_face_get_type|cairo_font_face_status|cairo_font_options_create|cairo_font_options_equal|cairo_font_options_get_antialias|cairo_font_options_get_hint_metrics|cairo_font_options_get_hint_style|cairo_font_options_get_subpixel_order|cairo_font_options_hash|cairo_font_options_merge|cairo_font_options_set_antialias|cairo_font_options_set_hint_metrics|cairo_font_options_set_hint_style|cairo_font_options_set_subpixel_order|cairo_font_options_status|cairo_format_stride_for_width|cairo_image_surface_create|cairo_image_surface_create_for_data|cairo_image_surface_create_from_png|cairo_image_surface_get_data|cairo_image_surface_get_format|cairo_image_surface_get_height|cairo_image_surface_get_stride|cairo_image_surface_get_width|cairo_matrix_create_scale|cairo_matrix_create_translate|cairo_matrix_invert|cairo_matrix_multiply|cairo_matrix_rotate|cairo_matrix_transform_distance|cairo_matrix_transform_point|cairo_matrix_translate|cairo_pattern_add_color_stop_rgb|cairo_pattern_add_color_stop_rgba|cairo_pattern_create_for_surface|cairo_pattern_create_linear|cairo_pattern_create_radial|cairo_pattern_create_rgb|cairo_pattern_create_rgba|cairo_pattern_get_color_stop_count|cairo_pattern_get_color_stop_rgba|cairo_pattern_get_extend|cairo_pattern_get_filter|cairo_pattern_get_linear_points|cairo_pattern_get_matrix|cairo_pattern_get_radial_circles|cairo_pattern_get_rgba|cairo_pattern_get_surface|cairo_pattern_get_type|cairo_pattern_set_extend|cairo_pattern_set_filter|cairo_pattern_set_matrix|cairo_pattern_status|cairo_pdf_surface_create|cairo_pdf_surface_set_size|cairo_ps_get_levels|cairo_ps_level_to_string|cairo_ps_surface_create|cairo_ps_surface_dsc_begin_page_setup|cairo_ps_surface_dsc_begin_setup|cairo_ps_surface_dsc_comment|cairo_ps_surface_get_eps|cairo_ps_surface_restrict_to_level|cairo_ps_surface_set_eps|cairo_ps_surface_set_size|cairo_scaled_font_create|cairo_scaled_font_extents|cairo_scaled_font_get_ctm|cairo_scaled_font_get_font_face|cairo_scaled_font_get_font_matrix|cairo_scaled_font_get_font_options|cairo_scaled_font_get_scale_matrix|cairo_scaled_font_get_type|cairo_scaled_font_glyph_extents|cairo_scaled_font_status|cairo_scaled_font_text_extents|cairo_surface_copy_page|cairo_surface_create_similar|cairo_surface_finish|cairo_surface_flush|cairo_surface_get_content|cairo_surface_get_device_offset|cairo_surface_get_font_options|cairo_surface_get_type|cairo_surface_mark_dirty|cairo_surface_mark_dirty_rectangle|cairo_surface_set_device_offset|cairo_surface_set_fallback_resolution|cairo_surface_show_page|cairo_surface_status|cairo_surface_write_to_png|cairo_svg_surface_create|cairo_svg_surface_restrict_to_version|cairo_svg_version_to_string|cairoantialias|cairocontent|cairocontext|cairoexception|cairoextend|cairofillrule|cairofilter|cairofontface|cairofontoptions|cairofontslant|cairofonttype|cairofontweight|cairoformat|cairogradientpattern|cairohintmetrics|cairohintstyle|cairoimagesurface|cairolineargradient|cairolinecap|cairolinejoin|cairomatrix|cairooperator|cairopath|cairopattern|cairopatterntype|cairopdfsurface|cairopslevel|cairopssurface|cairoradialgradient|cairoscaledfont|cairosolidpattern|cairostatus|cairosubpixelorder|cairosurface|cairosurfacepattern|cairosurfacetype|cairosvgsurface|cairosvgversion|cairotoyfontface|cal_days_in_month|cal_from_jd|cal_info|cal_to_jd|calcul_hmac|calculhmac|call_user_func|call_user_func_array|call_user_method|call_user_method_array|callbackfilteriterator|ceil|chdb|chdb_create|chdir|checkdate|checkdnsrr|chgrp|chmod|chop|chown|chr|chroot|chunk_split|class_alias|class_exists|class_implements|class_parents|classkit_import|classkit_method_add|classkit_method_copy|classkit_method_redefine|classkit_method_remove|classkit_method_rename|clearstatcache|clone|closedir|closelog|collator|com|com_addref|com_create_guid|com_event_sink|com_get|com_get_active_object|com_invoke|com_isenum|com_load|com_load_typelib|com_message_pump|com_print_typeinfo|com_propget|com_propput|com_propset|com_release|com_set|compact|connection_aborted|connection_status|connection_timeout|constant|construct|construct|construct|convert_cyr_string|convert_uudecode|convert_uuencode|copy|cos|cosh|count|count_chars|countable|counter_bump|counter_bump_value|counter_create|counter_get|counter_get_meta|counter_get_named|counter_get_value|counter_reset|counter_reset_value|crack_check|crack_closedict|crack_getlastmessage|crack_opendict|crc32|create_function|crypt|ctype_alnum|ctype_alpha|ctype_cntrl|ctype_digit|ctype_graph|ctype_lower|ctype_print|ctype_punct|ctype_space|ctype_upper|ctype_xdigit|cubrid_affected_rows|cubrid_bind|cubrid_client_encoding|cubrid_close|cubrid_close_prepare|cubrid_close_request|cubrid_col_get|cubrid_col_size|cubrid_column_names|cubrid_column_types|cubrid_commit|cubrid_connect|cubrid_connect_with_url|cubrid_current_oid|cubrid_data_seek|cubrid_db_name|cubrid_disconnect|cubrid_drop|cubrid_errno|cubrid_error|cubrid_error_code|cubrid_error_code_facility|cubrid_error_msg|cubrid_execute|cubrid_fetch|cubrid_fetch_array|cubrid_fetch_assoc|cubrid_fetch_field|cubrid_fetch_lengths|cubrid_fetch_object|cubrid_fetch_row|cubrid_field_flags|cubrid_field_len|cubrid_field_name|cubrid_field_seek|cubrid_field_table|cubrid_field_type|cubrid_free_result|cubrid_get|cubrid_get_autocommit|cubrid_get_charset|cubrid_get_class_name|cubrid_get_client_info|cubrid_get_db_parameter|cubrid_get_server_info|cubrid_insert_id|cubrid_is_instance|cubrid_list_dbs|cubrid_load_from_glo|cubrid_lob_close|cubrid_lob_export|cubrid_lob_get|cubrid_lob_send|cubrid_lob_size|cubrid_lock_read|cubrid_lock_write|cubrid_move_cursor|cubrid_new_glo|cubrid_next_result|cubrid_num_cols|cubrid_num_fields|cubrid_num_rows|cubrid_ping|cubrid_prepare|cubrid_put|cubrid_query|cubrid_real_escape_string|cubrid_result|cubrid_rollback|cubrid_save_to_glo|cubrid_schema|cubrid_send_glo|cubrid_seq_drop|cubrid_seq_insert|cubrid_seq_put|cubrid_set_add|cubrid_set_autocommit|cubrid_set_db_parameter|cubrid_set_drop|cubrid_unbuffered_query|cubrid_version|curl_close|curl_copy_handle|curl_errno|curl_error|curl_exec|curl_getinfo|curl_init|curl_multi_add_handle|curl_multi_close|curl_multi_exec|curl_multi_getcontent|curl_multi_info_read|curl_multi_init|curl_multi_remove_handle|curl_multi_select|curl_setopt|curl_setopt_array|curl_version|current|cyrus_authenticate|cyrus_bind|cyrus_close|cyrus_connect|cyrus_query|cyrus_unbind|date|date_add|date_create|date_create_from_format|date_date_set|date_default_timezone_get|date_default_timezone_set|date_diff|date_format|date_get_last_errors|date_interval_create_from_date_string|date_interval_format|date_isodate_set|date_modify|date_offset_get|date_parse|date_parse_from_format|date_sub|date_sun_info|date_sunrise|date_sunset|date_time_set|date_timestamp_get|date_timestamp_set|date_timezone_get|date_timezone_set|dateinterval|dateperiod|datetime|datetimezone|db2_autocommit|db2_bind_param|db2_client_info|db2_close|db2_column_privileges|db2_columns|db2_commit|db2_conn_error|db2_conn_errormsg|db2_connect|db2_cursor_type|db2_escape_string|db2_exec|db2_execute|db2_fetch_array|db2_fetch_assoc|db2_fetch_both|db2_fetch_object|db2_fetch_row|db2_field_display_size|db2_field_name|db2_field_num|db2_field_precision|db2_field_scale|db2_field_type|db2_field_width|db2_foreign_keys|db2_free_result|db2_free_stmt|db2_get_option|db2_last_insert_id|db2_lob_read|db2_next_result|db2_num_fields|db2_num_rows|db2_pclose|db2_pconnect|db2_prepare|db2_primary_keys|db2_procedure_columns|db2_procedures|db2_result|db2_rollback|db2_server_info|db2_set_option|db2_special_columns|db2_statistics|db2_stmt_error|db2_stmt_errormsg|db2_table_privileges|db2_tables|dba_close|dba_delete|dba_exists|dba_fetch|dba_firstkey|dba_handlers|dba_insert|dba_key_split|dba_list|dba_nextkey|dba_open|dba_optimize|dba_popen|dba_replace|dba_sync|dbase_add_record|dbase_close|dbase_create|dbase_delete_record|dbase_get_header_info|dbase_get_record|dbase_get_record_with_names|dbase_numfields|dbase_numrecords|dbase_open|dbase_pack|dbase_replace_record|dbplus_add|dbplus_aql|dbplus_chdir|dbplus_close|dbplus_curr|dbplus_errcode|dbplus_errno|dbplus_find|dbplus_first|dbplus_flush|dbplus_freealllocks|dbplus_freelock|dbplus_freerlocks|dbplus_getlock|dbplus_getunique|dbplus_info|dbplus_last|dbplus_lockrel|dbplus_next|dbplus_open|dbplus_prev|dbplus_rchperm|dbplus_rcreate|dbplus_rcrtexact|dbplus_rcrtlike|dbplus_resolve|dbplus_restorepos|dbplus_rkeys|dbplus_ropen|dbplus_rquery|dbplus_rrename|dbplus_rsecindex|dbplus_runlink|dbplus_rzap|dbplus_savepos|dbplus_setindex|dbplus_setindexbynumber|dbplus_sql|dbplus_tcl|dbplus_tremove|dbplus_undo|dbplus_undoprepare|dbplus_unlockrel|dbplus_unselect|dbplus_update|dbplus_xlockrel|dbplus_xunlockrel|dbx_close|dbx_compare|dbx_connect|dbx_error|dbx_escape_string|dbx_fetch_row|dbx_query|dbx_sort|dcgettext|dcngettext|deaggregate|debug_backtrace|debug_print_backtrace|debug_zval_dump|decbin|dechex|decoct|define|define_syslog_variables|defined|deg2rad|delete|dgettext|die|dio_close|dio_fcntl|dio_open|dio_read|dio_seek|dio_stat|dio_tcsetattr|dio_truncate|dio_write|dir|directoryiterator|dirname|disk_free_space|disk_total_space|diskfreespace|dl|dngettext|dns_check_record|dns_get_mx|dns_get_record|dom_import_simplexml|domainexception|domattr|domattribute_name|domattribute_set_value|domattribute_specified|domattribute_value|domcharacterdata|domcomment|domdocument|domdocument_add_root|domdocument_create_attribute|domdocument_create_cdata_section|domdocument_create_comment|domdocument_create_element|domdocument_create_element_ns|domdocument_create_entity_reference|domdocument_create_processing_instruction|domdocument_create_text_node|domdocument_doctype|domdocument_document_element|domdocument_dump_file|domdocument_dump_mem|domdocument_get_element_by_id|domdocument_get_elements_by_tagname|domdocument_html_dump_mem|domdocument_xinclude|domdocumentfragment|domdocumenttype|domdocumenttype_entities|domdocumenttype_internal_subset|domdocumenttype_name|domdocumenttype_notations|domdocumenttype_public_id|domdocumenttype_system_id|domelement|domelement_get_attribute|domelement_get_attribute_node|domelement_get_elements_by_tagname|domelement_has_attribute|domelement_remove_attribute|domelement_set_attribute|domelement_set_attribute_node|domelement_tagname|domentity|domentityreference|domexception|domimplementation|domnamednodemap|domnode|domnode_add_namespace|domnode_append_child|domnode_append_sibling|domnode_attributes|domnode_child_nodes|domnode_clone_node|domnode_dump_node|domnode_first_child|domnode_get_content|domnode_has_attributes|domnode_has_child_nodes|domnode_insert_before|domnode_is_blank_node|domnode_last_child|domnode_next_sibling|domnode_node_name|domnode_node_type|domnode_node_value|domnode_owner_document|domnode_parent_node|domnode_prefix|domnode_previous_sibling|domnode_remove_child|domnode_replace_child|domnode_replace_node|domnode_set_content|domnode_set_name|domnode_set_namespace|domnode_unlink_node|domnodelist|domnotation|domprocessinginstruction|domprocessinginstruction_data|domprocessinginstruction_target|domtext|domxml_new_doc|domxml_open_file|domxml_open_mem|domxml_version|domxml_xmltree|domxml_xslt_stylesheet|domxml_xslt_stylesheet_doc|domxml_xslt_stylesheet_file|domxml_xslt_version|domxpath|domxsltstylesheet_process|domxsltstylesheet_result_dump_file|domxsltstylesheet_result_dump_mem|dotnet|dotnet_load|doubleval|each|easter_date|easter_days|echo|empty|emptyiterator|enchant_broker_describe|enchant_broker_dict_exists|enchant_broker_free|enchant_broker_free_dict|enchant_broker_get_error|enchant_broker_init|enchant_broker_list_dicts|enchant_broker_request_dict|enchant_broker_request_pwl_dict|enchant_broker_set_ordering|enchant_dict_add_to_personal|enchant_dict_add_to_session|enchant_dict_check|enchant_dict_describe|enchant_dict_get_error|enchant_dict_is_in_session|enchant_dict_quick_check|enchant_dict_store_replacement|enchant_dict_suggest|end|ereg|ereg_replace|eregi|eregi_replace|error_get_last|error_log|error_reporting|errorexception|escapeshellarg|escapeshellcmd|eval|event_add|event_base_free|event_base_loop|event_base_loopbreak|event_base_loopexit|event_base_new|event_base_priority_init|event_base_set|event_buffer_base_set|event_buffer_disable|event_buffer_enable|event_buffer_fd_set|event_buffer_free|event_buffer_new|event_buffer_priority_set|event_buffer_read|event_buffer_set_callback|event_buffer_timeout_set|event_buffer_watermark_set|event_buffer_write|event_del|event_free|event_new|event_set|exception|exec|exif_imagetype|exif_read_data|exif_tagname|exif_thumbnail|exit|exp|expect_expectl|expect_popen|explode|expm1|export|export|extension_loaded|extract|ezmlm_hash|fam_cancel_monitor|fam_close|fam_monitor_collection|fam_monitor_directory|fam_monitor_file|fam_next_event|fam_open|fam_pending|fam_resume_monitor|fam_suspend_monitor|fbsql_affected_rows|fbsql_autocommit|fbsql_blob_size|fbsql_change_user|fbsql_clob_size|fbsql_close|fbsql_commit|fbsql_connect|fbsql_create_blob|fbsql_create_clob|fbsql_create_db|fbsql_data_seek|fbsql_database|fbsql_database_password|fbsql_db_query|fbsql_db_status|fbsql_drop_db|fbsql_errno|fbsql_error|fbsql_fetch_array|fbsql_fetch_assoc|fbsql_fetch_field|fbsql_fetch_lengths|fbsql_fetch_object|fbsql_fetch_row|fbsql_field_flags|fbsql_field_len|fbsql_field_name|fbsql_field_seek|fbsql_field_table|fbsql_field_type|fbsql_free_result|fbsql_get_autostart_info|fbsql_hostname|fbsql_insert_id|fbsql_list_dbs|fbsql_list_fields|fbsql_list_tables|fbsql_next_result|fbsql_num_fields|fbsql_num_rows|fbsql_password|fbsql_pconnect|fbsql_query|fbsql_read_blob|fbsql_read_clob|fbsql_result|fbsql_rollback|fbsql_rows_fetched|fbsql_select_db|fbsql_set_characterset|fbsql_set_lob_mode|fbsql_set_password|fbsql_set_transaction|fbsql_start_db|fbsql_stop_db|fbsql_table_name|fbsql_tablename|fbsql_username|fbsql_warnings|fclose|fdf_add_doc_javascript|fdf_add_template|fdf_close|fdf_create|fdf_enum_values|fdf_errno|fdf_error|fdf_get_ap|fdf_get_attachment|fdf_get_encoding|fdf_get_file|fdf_get_flags|fdf_get_opt|fdf_get_status|fdf_get_value|fdf_get_version|fdf_header|fdf_next_field_name|fdf_open|fdf_open_string|fdf_remove_item|fdf_save|fdf_save_string|fdf_set_ap|fdf_set_encoding|fdf_set_file|fdf_set_flags|fdf_set_javascript_action|fdf_set_on_import_javascript|fdf_set_opt|fdf_set_status|fdf_set_submit_form_action|fdf_set_target_frame|fdf_set_value|fdf_set_version|feof|fflush|fgetc|fgetcsv|fgets|fgetss|file|file_exists|file_get_contents|file_put_contents|fileatime|filectime|filegroup|fileinode|filemtime|fileowner|fileperms|filepro|filepro_fieldcount|filepro_fieldname|filepro_fieldtype|filepro_fieldwidth|filepro_retrieve|filepro_rowcount|filesize|filesystemiterator|filetype|filter_has_var|filter_id|filter_input|filter_input_array|filter_list|filter_var|filter_var_array|filteriterator|finfo_buffer|finfo_close|finfo_file|finfo_open|finfo_set_flags|floatval|flock|floor|flush|fmod|fnmatch|fopen|forward_static_call|forward_static_call_array|fpassthru|fprintf|fputcsv|fputs|fread|frenchtojd|fribidi_log2vis|fscanf|fseek|fsockopen|fstat|ftell|ftok|ftp_alloc|ftp_cdup|ftp_chdir|ftp_chmod|ftp_close|ftp_connect|ftp_delete|ftp_exec|ftp_fget|ftp_fput|ftp_get|ftp_get_option|ftp_login|ftp_mdtm|ftp_mkdir|ftp_nb_continue|ftp_nb_fget|ftp_nb_fput|ftp_nb_get|ftp_nb_put|ftp_nlist|ftp_pasv|ftp_put|ftp_pwd|ftp_quit|ftp_raw|ftp_rawlist|ftp_rename|ftp_rmdir|ftp_set_option|ftp_site|ftp_size|ftp_ssl_connect|ftp_systype|ftruncate|func_get_arg|func_get_args|func_num_args|function_exists|fwrite|gc_collect_cycles|gc_disable|gc_enable|gc_enabled|gd_info|gearmanclient|gearmanjob|gearmantask|gearmanworker|geoip_continent_code_by_name|geoip_country_code3_by_name|geoip_country_code_by_name|geoip_country_name_by_name|geoip_database_info|geoip_db_avail|geoip_db_filename|geoip_db_get_all_info|geoip_id_by_name|geoip_isp_by_name|geoip_org_by_name|geoip_record_by_name|geoip_region_by_name|geoip_region_name_by_code|geoip_time_zone_by_country_and_region|getMeta|getNamed|getValue|get_browser|get_called_class|get_cfg_var|get_class|get_class_methods|get_class_vars|get_current_user|get_declared_classes|get_declared_interfaces|get_defined_constants|get_defined_functions|get_defined_vars|get_extension_funcs|get_headers|get_html_translation_table|get_include_path|get_included_files|get_loaded_extensions|get_magic_quotes_gpc|get_magic_quotes_runtime|get_meta_tags|get_object_vars|get_parent_class|get_required_files|get_resource_type|getallheaders|getconstant|getconstants|getconstructor|getcwd|getdate|getdefaultproperties|getdoccomment|getendline|getenv|getextension|getextensionname|getfilename|gethostbyaddr|gethostbyname|gethostbynamel|gethostname|getimagesize|getinterfacenames|getinterfaces|getlastmod|getmethod|getmethods|getmodifiers|getmxrr|getmygid|getmyinode|getmypid|getmyuid|getname|getnamespacename|getopt|getparentclass|getproperties|getproperty|getprotobyname|getprotobynumber|getrandmax|getrusage|getservbyname|getservbyport|getshortname|getstartline|getstaticproperties|getstaticpropertyvalue|gettext|gettimeofday|gettype|glob|globiterator|gmagick|gmagickdraw|gmagickpixel|gmdate|gmmktime|gmp_abs|gmp_add|gmp_and|gmp_clrbit|gmp_cmp|gmp_com|gmp_div|gmp_div_q|gmp_div_qr|gmp_div_r|gmp_divexact|gmp_fact|gmp_gcd|gmp_gcdext|gmp_hamdist|gmp_init|gmp_intval|gmp_invert|gmp_jacobi|gmp_legendre|gmp_mod|gmp_mul|gmp_neg|gmp_nextprime|gmp_or|gmp_perfect_square|gmp_popcount|gmp_pow|gmp_powm|gmp_prob_prime|gmp_random|gmp_scan0|gmp_scan1|gmp_setbit|gmp_sign|gmp_sqrt|gmp_sqrtrem|gmp_strval|gmp_sub|gmp_testbit|gmp_xor|gmstrftime|gnupg_adddecryptkey|gnupg_addencryptkey|gnupg_addsignkey|gnupg_cleardecryptkeys|gnupg_clearencryptkeys|gnupg_clearsignkeys|gnupg_decrypt|gnupg_decryptverify|gnupg_encrypt|gnupg_encryptsign|gnupg_export|gnupg_geterror|gnupg_getprotocol|gnupg_import|gnupg_init|gnupg_keyinfo|gnupg_setarmor|gnupg_seterrormode|gnupg_setsignmode|gnupg_sign|gnupg_verify|gopher_parsedir|grapheme_extract|grapheme_stripos|grapheme_stristr|grapheme_strlen|grapheme_strpos|grapheme_strripos|grapheme_strrpos|grapheme_strstr|grapheme_substr|gregoriantojd|gupnp_context_get_host_ip|gupnp_context_get_port|gupnp_context_get_subscription_timeout|gupnp_context_host_path|gupnp_context_new|gupnp_context_set_subscription_timeout|gupnp_context_timeout_add|gupnp_context_unhost_path|gupnp_control_point_browse_start|gupnp_control_point_browse_stop|gupnp_control_point_callback_set|gupnp_control_point_new|gupnp_device_action_callback_set|gupnp_device_info_get|gupnp_device_info_get_service|gupnp_root_device_get_available|gupnp_root_device_get_relative_location|gupnp_root_device_new|gupnp_root_device_set_available|gupnp_root_device_start|gupnp_root_device_stop|gupnp_service_action_get|gupnp_service_action_return|gupnp_service_action_return_error|gupnp_service_action_set|gupnp_service_freeze_notify|gupnp_service_info_get|gupnp_service_info_get_introspection|gupnp_service_introspection_get_state_variable|gupnp_service_notify|gupnp_service_proxy_action_get|gupnp_service_proxy_action_set|gupnp_service_proxy_add_notify|gupnp_service_proxy_callback_set|gupnp_service_proxy_get_subscribed|gupnp_service_proxy_remove_notify|gupnp_service_proxy_set_subscribed|gupnp_service_thaw_notify|gzclose|gzcompress|gzdecode|gzdeflate|gzencode|gzeof|gzfile|gzgetc|gzgets|gzgetss|gzinflate|gzopen|gzpassthru|gzputs|gzread|gzrewind|gzseek|gztell|gzuncompress|gzwrite|halt_compiler|haruannotation|haruannotation_setborderstyle|haruannotation_sethighlightmode|haruannotation_seticon|haruannotation_setopened|harudestination|harudestination_setfit|harudestination_setfitb|harudestination_setfitbh|harudestination_setfitbv|harudestination_setfith|harudestination_setfitr|harudestination_setfitv|harudestination_setxyz|harudoc|harudoc_addpage|harudoc_addpagelabel|harudoc_construct|harudoc_createoutline|harudoc_getcurrentencoder|harudoc_getcurrentpage|harudoc_getencoder|harudoc_getfont|harudoc_getinfoattr|harudoc_getpagelayout|harudoc_getpagemode|harudoc_getstreamsize|harudoc_insertpage|harudoc_loadjpeg|harudoc_loadpng|harudoc_loadraw|harudoc_loadttc|harudoc_loadttf|harudoc_loadtype1|harudoc_output|harudoc_readfromstream|harudoc_reseterror|harudoc_resetstream|harudoc_save|harudoc_savetostream|harudoc_setcompressionmode|harudoc_setcurrentencoder|harudoc_setencryptionmode|harudoc_setinfoattr|harudoc_setinfodateattr|harudoc_setopenaction|harudoc_setpagelayout|harudoc_setpagemode|harudoc_setpagesconfiguration|harudoc_setpassword|harudoc_setpermission|harudoc_usecnsencodings|harudoc_usecnsfonts|harudoc_usecntencodings|harudoc_usecntfonts|harudoc_usejpencodings|harudoc_usejpfonts|harudoc_usekrencodings|harudoc_usekrfonts|haruencoder|haruencoder_getbytetype|haruencoder_gettype|haruencoder_getunicode|haruencoder_getwritingmode|haruexception|harufont|harufont_getascent|harufont_getcapheight|harufont_getdescent|harufont_getencodingname|harufont_getfontname|harufont_gettextwidth|harufont_getunicodewidth|harufont_getxheight|harufont_measuretext|haruimage|haruimage_getbitspercomponent|haruimage_getcolorspace|haruimage_getheight|haruimage_getsize|haruimage_getwidth|haruimage_setcolormask|haruimage_setmaskimage|haruoutline|haruoutline_setdestination|haruoutline_setopened|harupage|harupage_arc|harupage_begintext|harupage_circle|harupage_closepath|harupage_concat|harupage_createdestination|harupage_createlinkannotation|harupage_createtextannotation|harupage_createurlannotation|harupage_curveto|harupage_curveto2|harupage_curveto3|harupage_drawimage|harupage_ellipse|harupage_endpath|harupage_endtext|harupage_eofill|harupage_eofillstroke|harupage_fill|harupage_fillstroke|harupage_getcharspace|harupage_getcmykfill|harupage_getcmykstroke|harupage_getcurrentfont|harupage_getcurrentfontsize|harupage_getcurrentpos|harupage_getcurrenttextpos|harupage_getdash|harupage_getfillingcolorspace|harupage_getflatness|harupage_getgmode|harupage_getgrayfill|harupage_getgraystroke|harupage_getheight|harupage_gethorizontalscaling|harupage_getlinecap|harupage_getlinejoin|harupage_getlinewidth|harupage_getmiterlimit|harupage_getrgbfill|harupage_getrgbstroke|harupage_getstrokingcolorspace|harupage_gettextleading|harupage_gettextmatrix|harupage_gettextrenderingmode|harupage_gettextrise|harupage_gettextwidth|harupage_gettransmatrix|harupage_getwidth|harupage_getwordspace|harupage_lineto|harupage_measuretext|harupage_movetextpos|harupage_moveto|harupage_movetonextline|harupage_rectangle|harupage_setcharspace|harupage_setcmykfill|harupage_setcmykstroke|harupage_setdash|harupage_setflatness|harupage_setfontandsize|harupage_setgrayfill|harupage_setgraystroke|harupage_setheight|harupage_sethorizontalscaling|harupage_setlinecap|harupage_setlinejoin|harupage_setlinewidth|harupage_setmiterlimit|harupage_setrgbfill|harupage_setrgbstroke|harupage_setrotate|harupage_setsize|harupage_setslideshow|harupage_settextleading|harupage_settextmatrix|harupage_settextrenderingmode|harupage_settextrise|harupage_setwidth|harupage_setwordspace|harupage_showtext|harupage_showtextnextline|harupage_stroke|harupage_textout|harupage_textrect|hasconstant|hash|hash_algos|hash_copy|hash_file|hash_final|hash_hmac|hash_hmac_file|hash_init|hash_update|hash_update_file|hash_update_stream|hasmethod|hasproperty|header|header_register_callback|header_remove|headers_list|headers_sent|hebrev|hebrevc|hex2bin|hexdec|highlight_file|highlight_string|html_entity_decode|htmlentities|htmlspecialchars|htmlspecialchars_decode|http_build_cookie|http_build_query|http_build_str|http_build_url|http_cache_etag|http_cache_last_modified|http_chunked_decode|http_date|http_deflate|http_get|http_get_request_body|http_get_request_body_stream|http_get_request_headers|http_head|http_inflate|http_match_etag|http_match_modified|http_match_request_header|http_negotiate_charset|http_negotiate_content_type|http_negotiate_language|http_parse_cookie|http_parse_headers|http_parse_message|http_parse_params|http_persistent_handles_clean|http_persistent_handles_count|http_persistent_handles_ident|http_post_data|http_post_fields|http_put_data|http_put_file|http_put_stream|http_redirect|http_request|http_request_body_encode|http_request_method_exists|http_request_method_name|http_request_method_register|http_request_method_unregister|http_response_code|http_send_content_disposition|http_send_content_type|http_send_data|http_send_file|http_send_last_modified|http_send_status|http_send_stream|http_support|http_throttle|httpdeflatestream|httpdeflatestream_construct|httpdeflatestream_factory|httpdeflatestream_finish|httpdeflatestream_flush|httpdeflatestream_update|httpinflatestream|httpinflatestream_construct|httpinflatestream_factory|httpinflatestream_finish|httpinflatestream_flush|httpinflatestream_update|httpmessage|httpmessage_addheaders|httpmessage_construct|httpmessage_detach|httpmessage_factory|httpmessage_fromenv|httpmessage_fromstring|httpmessage_getbody|httpmessage_getheader|httpmessage_getheaders|httpmessage_gethttpversion|httpmessage_getparentmessage|httpmessage_getrequestmethod|httpmessage_getrequesturl|httpmessage_getresponsecode|httpmessage_getresponsestatus|httpmessage_gettype|httpmessage_guesscontenttype|httpmessage_prepend|httpmessage_reverse|httpmessage_send|httpmessage_setbody|httpmessage_setheaders|httpmessage_sethttpversion|httpmessage_setrequestmethod|httpmessage_setrequesturl|httpmessage_setresponsecode|httpmessage_setresponsestatus|httpmessage_settype|httpmessage_tomessagetypeobject|httpmessage_tostring|httpquerystring|httpquerystring_construct|httpquerystring_get|httpquerystring_mod|httpquerystring_set|httpquerystring_singleton|httpquerystring_toarray|httpquerystring_tostring|httpquerystring_xlate|httprequest|httprequest_addcookies|httprequest_addheaders|httprequest_addpostfields|httprequest_addpostfile|httprequest_addputdata|httprequest_addquerydata|httprequest_addrawpostdata|httprequest_addssloptions|httprequest_clearhistory|httprequest_construct|httprequest_enablecookies|httprequest_getcontenttype|httprequest_getcookies|httprequest_getheaders|httprequest_gethistory|httprequest_getmethod|httprequest_getoptions|httprequest_getpostfields|httprequest_getpostfiles|httprequest_getputdata|httprequest_getputfile|httprequest_getquerydata|httprequest_getrawpostdata|httprequest_getrawrequestmessage|httprequest_getrawresponsemessage|httprequest_getrequestmessage|httprequest_getresponsebody|httprequest_getresponsecode|httprequest_getresponsecookies|httprequest_getresponsedata|httprequest_getresponseheader|httprequest_getresponseinfo|httprequest_getresponsemessage|httprequest_getresponsestatus|httprequest_getssloptions|httprequest_geturl|httprequest_resetcookies|httprequest_send|httprequest_setcontenttype|httprequest_setcookies|httprequest_setheaders|httprequest_setmethod|httprequest_setoptions|httprequest_setpostfields|httprequest_setpostfiles|httprequest_setputdata|httprequest_setputfile|httprequest_setquerydata|httprequest_setrawpostdata|httprequest_setssloptions|httprequest_seturl|httprequestpool|httprequestpool_attach|httprequestpool_construct|httprequestpool_destruct|httprequestpool_detach|httprequestpool_getattachedrequests|httprequestpool_getfinishedrequests|httprequestpool_reset|httprequestpool_send|httprequestpool_socketperform|httprequestpool_socketselect|httpresponse|httpresponse_capture|httpresponse_getbuffersize|httpresponse_getcache|httpresponse_getcachecontrol|httpresponse_getcontentdisposition|httpresponse_getcontenttype|httpresponse_getdata|httpresponse_getetag|httpresponse_getfile|httpresponse_getgzip|httpresponse_getheader|httpresponse_getlastmodified|httpresponse_getrequestbody|httpresponse_getrequestbodystream|httpresponse_getrequestheaders|httpresponse_getstream|httpresponse_getthrottledelay|httpresponse_guesscontenttype|httpresponse_redirect|httpresponse_send|httpresponse_setbuffersize|httpresponse_setcache|httpresponse_setcachecontrol|httpresponse_setcontentdisposition|httpresponse_setcontenttype|httpresponse_setdata|httpresponse_setetag|httpresponse_setfile|httpresponse_setgzip|httpresponse_setheader|httpresponse_setlastmodified|httpresponse_setstream|httpresponse_setthrottledelay|httpresponse_status|hw_array2objrec|hw_changeobject|hw_children|hw_childrenobj|hw_close|hw_connect|hw_connection_info|hw_cp|hw_deleteobject|hw_docbyanchor|hw_docbyanchorobj|hw_document_attributes|hw_document_bodytag|hw_document_content|hw_document_setcontent|hw_document_size|hw_dummy|hw_edittext|hw_error|hw_errormsg|hw_free_document|hw_getanchors|hw_getanchorsobj|hw_getandlock|hw_getchildcoll|hw_getchildcollobj|hw_getchilddoccoll|hw_getchilddoccollobj|hw_getobject|hw_getobjectbyquery|hw_getobjectbyquerycoll|hw_getobjectbyquerycollobj|hw_getobjectbyqueryobj|hw_getparents|hw_getparentsobj|hw_getrellink|hw_getremote|hw_getremotechildren|hw_getsrcbydestobj|hw_gettext|hw_getusername|hw_identify|hw_incollections|hw_info|hw_inscoll|hw_insdoc|hw_insertanchors|hw_insertdocument|hw_insertobject|hw_mapid|hw_modifyobject|hw_mv|hw_new_document|hw_objrec2array|hw_output_document|hw_pconnect|hw_pipedocument|hw_root|hw_setlinkroot|hw_stat|hw_unlock|hw_who|hwapi_attribute|hwapi_attribute_key|hwapi_attribute_langdepvalue|hwapi_attribute_value|hwapi_attribute_values|hwapi_checkin|hwapi_checkout|hwapi_children|hwapi_content|hwapi_content_mimetype|hwapi_content_read|hwapi_copy|hwapi_dbstat|hwapi_dcstat|hwapi_dstanchors|hwapi_dstofsrcanchor|hwapi_error_count|hwapi_error_reason|hwapi_find|hwapi_ftstat|hwapi_hgcsp|hwapi_hwstat|hwapi_identify|hwapi_info|hwapi_insert|hwapi_insertanchor|hwapi_insertcollection|hwapi_insertdocument|hwapi_link|hwapi_lock|hwapi_move|hwapi_new_content|hwapi_object|hwapi_object_assign|hwapi_object_attreditable|hwapi_object_count|hwapi_object_insert|hwapi_object_new|hwapi_object_remove|hwapi_object_title|hwapi_object_value|hwapi_objectbyanchor|hwapi_parents|hwapi_reason_description|hwapi_reason_type|hwapi_remove|hwapi_replace|hwapi_setcommittedversion|hwapi_srcanchors|hwapi_srcsofdst|hwapi_unlock|hwapi_user|hwapi_userlist|hypot|ibase_add_user|ibase_affected_rows|ibase_backup|ibase_blob_add|ibase_blob_cancel|ibase_blob_close|ibase_blob_create|ibase_blob_echo|ibase_blob_get|ibase_blob_import|ibase_blob_info|ibase_blob_open|ibase_close|ibase_commit|ibase_commit_ret|ibase_connect|ibase_db_info|ibase_delete_user|ibase_drop_db|ibase_errcode|ibase_errmsg|ibase_execute|ibase_fetch_assoc|ibase_fetch_object|ibase_fetch_row|ibase_field_info|ibase_free_event_handler|ibase_free_query|ibase_free_result|ibase_gen_id|ibase_maintain_db|ibase_modify_user|ibase_name_result|ibase_num_fields|ibase_num_params|ibase_param_info|ibase_pconnect|ibase_prepare|ibase_query|ibase_restore|ibase_rollback|ibase_rollback_ret|ibase_server_info|ibase_service_attach|ibase_service_detach|ibase_set_event_handler|ibase_timefmt|ibase_trans|ibase_wait_event|iconv|iconv_get_encoding|iconv_mime_decode|iconv_mime_decode_headers|iconv_mime_encode|iconv_set_encoding|iconv_strlen|iconv_strpos|iconv_strrpos|iconv_substr|id3_get_frame_long_name|id3_get_frame_short_name|id3_get_genre_id|id3_get_genre_list|id3_get_genre_name|id3_get_tag|id3_get_version|id3_remove_tag|id3_set_tag|id3v2attachedpictureframe|id3v2frame|id3v2tag|idate|idn_to_ascii|idn_to_unicode|idn_to_utf8|ifx_affected_rows|ifx_blobinfile_mode|ifx_byteasvarchar|ifx_close|ifx_connect|ifx_copy_blob|ifx_create_blob|ifx_create_char|ifx_do|ifx_error|ifx_errormsg|ifx_fetch_row|ifx_fieldproperties|ifx_fieldtypes|ifx_free_blob|ifx_free_char|ifx_free_result|ifx_get_blob|ifx_get_char|ifx_getsqlca|ifx_htmltbl_result|ifx_nullformat|ifx_num_fields|ifx_num_rows|ifx_pconnect|ifx_prepare|ifx_query|ifx_textasvarchar|ifx_update_blob|ifx_update_char|ifxus_close_slob|ifxus_create_slob|ifxus_free_slob|ifxus_open_slob|ifxus_read_slob|ifxus_seek_slob|ifxus_tell_slob|ifxus_write_slob|ignore_user_abort|iis_add_server|iis_get_dir_security|iis_get_script_map|iis_get_server_by_comment|iis_get_server_by_path|iis_get_server_rights|iis_get_service_state|iis_remove_server|iis_set_app_settings|iis_set_dir_security|iis_set_script_map|iis_set_server_rights|iis_start_server|iis_start_service|iis_stop_server|iis_stop_service|image2wbmp|image_type_to_extension|image_type_to_mime_type|imagealphablending|imageantialias|imagearc|imagechar|imagecharup|imagecolorallocate|imagecolorallocatealpha|imagecolorat|imagecolorclosest|imagecolorclosestalpha|imagecolorclosesthwb|imagecolordeallocate|imagecolorexact|imagecolorexactalpha|imagecolormatch|imagecolorresolve|imagecolorresolvealpha|imagecolorset|imagecolorsforindex|imagecolorstotal|imagecolortransparent|imageconvolution|imagecopy|imagecopymerge|imagecopymergegray|imagecopyresampled|imagecopyresized|imagecreate|imagecreatefromgd|imagecreatefromgd2|imagecreatefromgd2part|imagecreatefromgif|imagecreatefromjpeg|imagecreatefrompng|imagecreatefromstring|imagecreatefromwbmp|imagecreatefromxbm|imagecreatefromxpm|imagecreatetruecolor|imagedashedline|imagedestroy|imageellipse|imagefill|imagefilledarc|imagefilledellipse|imagefilledpolygon|imagefilledrectangle|imagefilltoborder|imagefilter|imagefontheight|imagefontwidth|imageftbbox|imagefttext|imagegammacorrect|imagegd|imagegd2|imagegif|imagegrabscreen|imagegrabwindow|imageinterlace|imageistruecolor|imagejpeg|imagelayereffect|imageline|imageloadfont|imagepalettecopy|imagepng|imagepolygon|imagepsbbox|imagepsencodefont|imagepsextendfont|imagepsfreefont|imagepsloadfont|imagepsslantfont|imagepstext|imagerectangle|imagerotate|imagesavealpha|imagesetbrush|imagesetpixel|imagesetstyle|imagesetthickness|imagesettile|imagestring|imagestringup|imagesx|imagesy|imagetruecolortopalette|imagettfbbox|imagettftext|imagetypes|imagewbmp|imagexbm|imagick|imagick_adaptiveblurimage|imagick_adaptiveresizeimage|imagick_adaptivesharpenimage|imagick_adaptivethresholdimage|imagick_addimage|imagick_addnoiseimage|imagick_affinetransformimage|imagick_animateimages|imagick_annotateimage|imagick_appendimages|imagick_averageimages|imagick_blackthresholdimage|imagick_blurimage|imagick_borderimage|imagick_charcoalimage|imagick_chopimage|imagick_clear|imagick_clipimage|imagick_clippathimage|imagick_clone|imagick_clutimage|imagick_coalesceimages|imagick_colorfloodfillimage|imagick_colorizeimage|imagick_combineimages|imagick_commentimage|imagick_compareimagechannels|imagick_compareimagelayers|imagick_compareimages|imagick_compositeimage|imagick_construct|imagick_contrastimage|imagick_contraststretchimage|imagick_convolveimage|imagick_cropimage|imagick_cropthumbnailimage|imagick_current|imagick_cyclecolormapimage|imagick_decipherimage|imagick_deconstructimages|imagick_deleteimageartifact|imagick_despeckleimage|imagick_destroy|imagick_displayimage|imagick_displayimages|imagick_distortimage|imagick_drawimage|imagick_edgeimage|imagick_embossimage|imagick_encipherimage|imagick_enhanceimage|imagick_equalizeimage|imagick_evaluateimage|imagick_extentimage|imagick_flattenimages|imagick_flipimage|imagick_floodfillpaintimage|imagick_flopimage|imagick_frameimage|imagick_fximage|imagick_gammaimage|imagick_gaussianblurimage|imagick_getcolorspace|imagick_getcompression|imagick_getcompressionquality|imagick_getcopyright|imagick_getfilename|imagick_getfont|imagick_getformat|imagick_getgravity|imagick_gethomeurl|imagick_getimage|imagick_getimagealphachannel|imagick_getimageartifact|imagick_getimagebackgroundcolor|imagick_getimageblob|imagick_getimageblueprimary|imagick_getimagebordercolor|imagick_getimagechanneldepth|imagick_getimagechanneldistortion|imagick_getimagechanneldistortions|imagick_getimagechannelextrema|imagick_getimagechannelmean|imagick_getimagechannelrange|imagick_getimagechannelstatistics|imagick_getimageclipmask|imagick_getimagecolormapcolor|imagick_getimagecolors|imagick_getimagecolorspace|imagick_getimagecompose|imagick_getimagecompression|imagick_getimagecompressionquality|imagick_getimagedelay|imagick_getimagedepth|imagick_getimagedispose|imagick_getimagedistortion|imagick_getimageextrema|imagick_getimagefilename|imagick_getimageformat|imagick_getimagegamma|imagick_getimagegeometry|imagick_getimagegravity|imagick_getimagegreenprimary|imagick_getimageheight|imagick_getimagehistogram|imagick_getimageindex|imagick_getimageinterlacescheme|imagick_getimageinterpolatemethod|imagick_getimageiterations|imagick_getimagelength|imagick_getimagemagicklicense|imagick_getimagematte|imagick_getimagemattecolor|imagick_getimageorientation|imagick_getimagepage|imagick_getimagepixelcolor|imagick_getimageprofile|imagick_getimageprofiles|imagick_getimageproperties|imagick_getimageproperty|imagick_getimageredprimary|imagick_getimageregion|imagick_getimagerenderingintent|imagick_getimageresolution|imagick_getimagesblob|imagick_getimagescene|imagick_getimagesignature|imagick_getimagesize|imagick_getimagetickspersecond|imagick_getimagetotalinkdensity|imagick_getimagetype|imagick_getimageunits|imagick_getimagevirtualpixelmethod|imagick_getimagewhitepoint|imagick_getimagewidth|imagick_getinterlacescheme|imagick_getiteratorindex|imagick_getnumberimages|imagick_getoption|imagick_getpackagename|imagick_getpage|imagick_getpixeliterator|imagick_getpixelregioniterator|imagick_getpointsize|imagick_getquantumdepth|imagick_getquantumrange|imagick_getreleasedate|imagick_getresource|imagick_getresourcelimit|imagick_getsamplingfactors|imagick_getsize|imagick_getsizeoffset|imagick_getversion|imagick_hasnextimage|imagick_haspreviousimage|imagick_identifyimage|imagick_implodeimage|imagick_labelimage|imagick_levelimage|imagick_linearstretchimage|imagick_liquidrescaleimage|imagick_magnifyimage|imagick_mapimage|imagick_mattefloodfillimage|imagick_medianfilterimage|imagick_mergeimagelayers|imagick_minifyimage|imagick_modulateimage|imagick_montageimage|imagick_morphimages|imagick_mosaicimages|imagick_motionblurimage|imagick_negateimage|imagick_newimage|imagick_newpseudoimage|imagick_nextimage|imagick_normalizeimage|imagick_oilpaintimage|imagick_opaquepaintimage|imagick_optimizeimagelayers|imagick_orderedposterizeimage|imagick_paintfloodfillimage|imagick_paintopaqueimage|imagick_painttransparentimage|imagick_pingimage|imagick_pingimageblob|imagick_pingimagefile|imagick_polaroidimage|imagick_posterizeimage|imagick_previewimages|imagick_previousimage|imagick_profileimage|imagick_quantizeimage|imagick_quantizeimages|imagick_queryfontmetrics|imagick_queryfonts|imagick_queryformats|imagick_radialblurimage|imagick_raiseimage|imagick_randomthresholdimage|imagick_readimage|imagick_readimageblob|imagick_readimagefile|imagick_recolorimage|imagick_reducenoiseimage|imagick_removeimage|imagick_removeimageprofile|imagick_render|imagick_resampleimage|imagick_resetimagepage|imagick_resizeimage|imagick_rollimage|imagick_rotateimage|imagick_roundcorners|imagick_sampleimage|imagick_scaleimage|imagick_separateimagechannel|imagick_sepiatoneimage|imagick_setbackgroundcolor|imagick_setcolorspace|imagick_setcompression|imagick_setcompressionquality|imagick_setfilename|imagick_setfirstiterator|imagick_setfont|imagick_setformat|imagick_setgravity|imagick_setimage|imagick_setimagealphachannel|imagick_setimageartifact|imagick_setimagebackgroundcolor|imagick_setimagebias|imagick_setimageblueprimary|imagick_setimagebordercolor|imagick_setimagechanneldepth|imagick_setimageclipmask|imagick_setimagecolormapcolor|imagick_setimagecolorspace|imagick_setimagecompose|imagick_setimagecompression|imagick_setimagecompressionquality|imagick_setimagedelay|imagick_setimagedepth|imagick_setimagedispose|imagick_setimageextent|imagick_setimagefilename|imagick_setimageformat|imagick_setimagegamma|imagick_setimagegravity|imagick_setimagegreenprimary|imagick_setimageindex|imagick_setimageinterlacescheme|imagick_setimageinterpolatemethod|imagick_setimageiterations|imagick_setimagematte|imagick_setimagemattecolor|imagick_setimageopacity|imagick_setimageorientation|imagick_setimagepage|imagick_setimageprofile|imagick_setimageproperty|imagick_setimageredprimary|imagick_setimagerenderingintent|imagick_setimageresolution|imagick_setimagescene|imagick_setimagetickspersecond|imagick_setimagetype|imagick_setimageunits|imagick_setimagevirtualpixelmethod|imagick_setimagewhitepoint|imagick_setinterlacescheme|imagick_setiteratorindex|imagick_setlastiterator|imagick_setoption|imagick_setpage|imagick_setpointsize|imagick_setresolution|imagick_setresourcelimit|imagick_setsamplingfactors|imagick_setsize|imagick_setsizeoffset|imagick_settype|imagick_shadeimage|imagick_shadowimage|imagick_sharpenimage|imagick_shaveimage|imagick_shearimage|imagick_sigmoidalcontrastimage|imagick_sketchimage|imagick_solarizeimage|imagick_spliceimage|imagick_spreadimage|imagick_steganoimage|imagick_stereoimage|imagick_stripimage|imagick_swirlimage|imagick_textureimage|imagick_thresholdimage|imagick_thumbnailimage|imagick_tintimage|imagick_transformimage|imagick_transparentpaintimage|imagick_transposeimage|imagick_transverseimage|imagick_trimimage|imagick_uniqueimagecolors|imagick_unsharpmaskimage|imagick_valid|imagick_vignetteimage|imagick_waveimage|imagick_whitethresholdimage|imagick_writeimage|imagick_writeimagefile|imagick_writeimages|imagick_writeimagesfile|imagickdraw|imagickdraw_affine|imagickdraw_annotation|imagickdraw_arc|imagickdraw_bezier|imagickdraw_circle|imagickdraw_clear|imagickdraw_clone|imagickdraw_color|imagickdraw_comment|imagickdraw_composite|imagickdraw_construct|imagickdraw_destroy|imagickdraw_ellipse|imagickdraw_getclippath|imagickdraw_getcliprule|imagickdraw_getclipunits|imagickdraw_getfillcolor|imagickdraw_getfillopacity|imagickdraw_getfillrule|imagickdraw_getfont|imagickdraw_getfontfamily|imagickdraw_getfontsize|imagickdraw_getfontstyle|imagickdraw_getfontweight|imagickdraw_getgravity|imagickdraw_getstrokeantialias|imagickdraw_getstrokecolor|imagickdraw_getstrokedasharray|imagickdraw_getstrokedashoffset|imagickdraw_getstrokelinecap|imagickdraw_getstrokelinejoin|imagickdraw_getstrokemiterlimit|imagickdraw_getstrokeopacity|imagickdraw_getstrokewidth|imagickdraw_gettextalignment|imagickdraw_gettextantialias|imagickdraw_gettextdecoration|imagickdraw_gettextencoding|imagickdraw_gettextundercolor|imagickdraw_getvectorgraphics|imagickdraw_line|imagickdraw_matte|imagickdraw_pathclose|imagickdraw_pathcurvetoabsolute|imagickdraw_pathcurvetoquadraticbezierabsolute|imagickdraw_pathcurvetoquadraticbezierrelative|imagickdraw_pathcurvetoquadraticbeziersmoothabsolute|imagickdraw_pathcurvetoquadraticbeziersmoothrelative|imagickdraw_pathcurvetorelative|imagickdraw_pathcurvetosmoothabsolute|imagickdraw_pathcurvetosmoothrelative|imagickdraw_pathellipticarcabsolute|imagickdraw_pathellipticarcrelative|imagickdraw_pathfinish|imagickdraw_pathlinetoabsolute|imagickdraw_pathlinetohorizontalabsolute|imagickdraw_pathlinetohorizontalrelative|imagickdraw_pathlinetorelative|imagickdraw_pathlinetoverticalabsolute|imagickdraw_pathlinetoverticalrelative|imagickdraw_pathmovetoabsolute|imagickdraw_pathmovetorelative|imagickdraw_pathstart|imagickdraw_point|imagickdraw_polygon|imagickdraw_polyline|imagickdraw_pop|imagickdraw_popclippath|imagickdraw_popdefs|imagickdraw_poppattern|imagickdraw_push|imagickdraw_pushclippath|imagickdraw_pushdefs|imagickdraw_pushpattern|imagickdraw_rectangle|imagickdraw_render|imagickdraw_rotate|imagickdraw_roundrectangle|imagickdraw_scale|imagickdraw_setclippath|imagickdraw_setcliprule|imagickdraw_setclipunits|imagickdraw_setfillalpha|imagickdraw_setfillcolor|imagickdraw_setfillopacity|imagickdraw_setfillpatternurl|imagickdraw_setfillrule|imagickdraw_setfont|imagickdraw_setfontfamily|imagickdraw_setfontsize|imagickdraw_setfontstretch|imagickdraw_setfontstyle|imagickdraw_setfontweight|imagickdraw_setgravity|imagickdraw_setstrokealpha|imagickdraw_setstrokeantialias|imagickdraw_setstrokecolor|imagickdraw_setstrokedasharray|imagickdraw_setstrokedashoffset|imagickdraw_setstrokelinecap|imagickdraw_setstrokelinejoin|imagickdraw_setstrokemiterlimit|imagickdraw_setstrokeopacity|imagickdraw_setstrokepatternurl|imagickdraw_setstrokewidth|imagickdraw_settextalignment|imagickdraw_settextantialias|imagickdraw_settextdecoration|imagickdraw_settextencoding|imagickdraw_settextundercolor|imagickdraw_setvectorgraphics|imagickdraw_setviewbox|imagickdraw_skewx|imagickdraw_skewy|imagickdraw_translate|imagickpixel|imagickpixel_clear|imagickpixel_construct|imagickpixel_destroy|imagickpixel_getcolor|imagickpixel_getcolorasstring|imagickpixel_getcolorcount|imagickpixel_getcolorvalue|imagickpixel_gethsl|imagickpixel_issimilar|imagickpixel_setcolor|imagickpixel_setcolorvalue|imagickpixel_sethsl|imagickpixeliterator|imagickpixeliterator_clear|imagickpixeliterator_construct|imagickpixeliterator_destroy|imagickpixeliterator_getcurrentiteratorrow|imagickpixeliterator_getiteratorrow|imagickpixeliterator_getnextiteratorrow|imagickpixeliterator_getpreviousiteratorrow|imagickpixeliterator_newpixeliterator|imagickpixeliterator_newpixelregioniterator|imagickpixeliterator_resetiterator|imagickpixeliterator_setiteratorfirstrow|imagickpixeliterator_setiteratorlastrow|imagickpixeliterator_setiteratorrow|imagickpixeliterator_synciterator|imap_8bit|imap_alerts|imap_append|imap_base64|imap_binary|imap_body|imap_bodystruct|imap_check|imap_clearflag_full|imap_close|imap_create|imap_createmailbox|imap_delete|imap_deletemailbox|imap_errors|imap_expunge|imap_fetch_overview|imap_fetchbody|imap_fetchheader|imap_fetchmime|imap_fetchstructure|imap_fetchtext|imap_gc|imap_get_quota|imap_get_quotaroot|imap_getacl|imap_getmailboxes|imap_getsubscribed|imap_header|imap_headerinfo|imap_headers|imap_last_error|imap_list|imap_listmailbox|imap_listscan|imap_listsubscribed|imap_lsub|imap_mail|imap_mail_compose|imap_mail_copy|imap_mail_move|imap_mailboxmsginfo|imap_mime_header_decode|imap_msgno|imap_num_msg|imap_num_recent|imap_open|imap_ping|imap_qprint|imap_rename|imap_renamemailbox|imap_reopen|imap_rfc822_parse_adrlist|imap_rfc822_parse_headers|imap_rfc822_write_address|imap_savebody|imap_scan|imap_scanmailbox|imap_search|imap_set_quota|imap_setacl|imap_setflag_full|imap_sort|imap_status|imap_subscribe|imap_thread|imap_timeout|imap_uid|imap_undelete|imap_unsubscribe|imap_utf7_decode|imap_utf7_encode|imap_utf8|implementsinterface|implode|import_request_variables|in_array|include|include_once|inclued_get_data|inet_ntop|inet_pton|infiniteiterator|ingres_autocommit|ingres_autocommit_state|ingres_charset|ingres_close|ingres_commit|ingres_connect|ingres_cursor|ingres_errno|ingres_error|ingres_errsqlstate|ingres_escape_string|ingres_execute|ingres_fetch_array|ingres_fetch_assoc|ingres_fetch_object|ingres_fetch_proc_return|ingres_fetch_row|ingres_field_length|ingres_field_name|ingres_field_nullable|ingres_field_precision|ingres_field_scale|ingres_field_type|ingres_free_result|ingres_next_error|ingres_num_fields|ingres_num_rows|ingres_pconnect|ingres_prepare|ingres_query|ingres_result_seek|ingres_rollback|ingres_set_environment|ingres_unbuffered_query|ini_alter|ini_get|ini_get_all|ini_restore|ini_set|innamespace|inotify_add_watch|inotify_init|inotify_queue_len|inotify_read|inotify_rm_watch|interface_exists|intl_error_name|intl_get_error_code|intl_get_error_message|intl_is_failure|intldateformatter|intval|invalidargumentexception|invoke|invokeargs|ip2long|iptcembed|iptcparse|is_a|is_array|is_bool|is_callable|is_dir|is_double|is_executable|is_file|is_finite|is_float|is_infinite|is_int|is_integer|is_link|is_long|is_nan|is_null|is_numeric|is_object|is_readable|is_real|is_resource|is_scalar|is_soap_fault|is_string|is_subclass_of|is_uploaded_file|is_writable|is_writeable|isabstract|iscloneable|isdisabled|isfinal|isinstance|isinstantiable|isinterface|isinternal|isiterateable|isset|issubclassof|isuserdefined|iterator|iterator_apply|iterator_count|iterator_to_array|iteratoraggregate|iteratoriterator|java_last_exception_clear|java_last_exception_get|jddayofweek|jdmonthname|jdtofrench|jdtogregorian|jdtojewish|jdtojulian|jdtounix|jewishtojd|join|jpeg2wbmp|json_decode|json_encode|json_last_error|jsonserializable|judy|judy_type|judy_version|juliantojd|kadm5_chpass_principal|kadm5_create_principal|kadm5_delete_principal|kadm5_destroy|kadm5_flush|kadm5_get_policies|kadm5_get_principal|kadm5_get_principals|kadm5_init_with_password|kadm5_modify_principal|key|krsort|ksort|lcfirst|lcg_value|lchgrp|lchown|ldap_8859_to_t61|ldap_add|ldap_bind|ldap_close|ldap_compare|ldap_connect|ldap_count_entries|ldap_delete|ldap_dn2ufn|ldap_err2str|ldap_errno|ldap_error|ldap_explode_dn|ldap_first_attribute|ldap_first_entry|ldap_first_reference|ldap_free_result|ldap_get_attributes|ldap_get_dn|ldap_get_entries|ldap_get_option|ldap_get_values|ldap_get_values_len|ldap_list|ldap_mod_add|ldap_mod_del|ldap_mod_replace|ldap_modify|ldap_next_attribute|ldap_next_entry|ldap_next_reference|ldap_parse_reference|ldap_parse_result|ldap_read|ldap_rename|ldap_sasl_bind|ldap_search|ldap_set_option|ldap_set_rebind_proc|ldap_sort|ldap_start_tls|ldap_t61_to_8859|ldap_unbind|lengthexception|levenshtein|libxml_clear_errors|libxml_disable_entity_loader|libxml_get_errors|libxml_get_last_error|libxml_set_streams_context|libxml_use_internal_errors|libxmlerror|limititerator|link|linkinfo|list|locale|localeconv|localtime|log|log10|log1p|logicexception|long2ip|lstat|ltrim|lzf_compress|lzf_decompress|lzf_optimized_for|m_checkstatus|m_completeauthorizations|m_connect|m_connectionerror|m_deletetrans|m_destroyconn|m_destroyengine|m_getcell|m_getcellbynum|m_getcommadelimited|m_getheader|m_initconn|m_initengine|m_iscommadelimited|m_maxconntimeout|m_monitor|m_numcolumns|m_numrows|m_parsecommadelimited|m_responsekeys|m_responseparam|m_returnstatus|m_setblocking|m_setdropfile|m_setip|m_setssl|m_setssl_cafile|m_setssl_files|m_settimeout|m_sslcert_gen_hash|m_transactionssent|m_transinqueue|m_transkeyval|m_transnew|m_transsend|m_uwait|m_validateidentifier|m_verifyconnection|m_verifysslcert|magic_quotes_runtime|mail|mailparse_determine_best_xfer_encoding|mailparse_msg_create|mailparse_msg_extract_part|mailparse_msg_extract_part_file|mailparse_msg_extract_whole_part_file|mailparse_msg_free|mailparse_msg_get_part|mailparse_msg_get_part_data|mailparse_msg_get_structure|mailparse_msg_parse|mailparse_msg_parse_file|mailparse_rfc822_parse_addresses|mailparse_stream_encode|mailparse_uudecode_all|main|max|maxdb_affected_rows|maxdb_autocommit|maxdb_bind_param|maxdb_bind_result|maxdb_change_user|maxdb_character_set_name|maxdb_client_encoding|maxdb_close|maxdb_close_long_data|maxdb_commit|maxdb_connect|maxdb_connect_errno|maxdb_connect_error|maxdb_data_seek|maxdb_debug|maxdb_disable_reads_from_master|maxdb_disable_rpl_parse|maxdb_dump_debug_info|maxdb_embedded_connect|maxdb_enable_reads_from_master|maxdb_enable_rpl_parse|maxdb_errno|maxdb_error|maxdb_escape_string|maxdb_execute|maxdb_fetch|maxdb_fetch_array|maxdb_fetch_assoc|maxdb_fetch_field|maxdb_fetch_field_direct|maxdb_fetch_fields|maxdb_fetch_lengths|maxdb_fetch_object|maxdb_fetch_row|maxdb_field_count|maxdb_field_seek|maxdb_field_tell|maxdb_free_result|maxdb_get_client_info|maxdb_get_client_version|maxdb_get_host_info|maxdb_get_metadata|maxdb_get_proto_info|maxdb_get_server_info|maxdb_get_server_version|maxdb_info|maxdb_init|maxdb_insert_id|maxdb_kill|maxdb_master_query|maxdb_more_results|maxdb_multi_query|maxdb_next_result|maxdb_num_fields|maxdb_num_rows|maxdb_options|maxdb_param_count|maxdb_ping|maxdb_prepare|maxdb_query|maxdb_real_connect|maxdb_real_escape_string|maxdb_real_query|maxdb_report|maxdb_rollback|maxdb_rpl_parse_enabled|maxdb_rpl_probe|maxdb_rpl_query_type|maxdb_select_db|maxdb_send_long_data|maxdb_send_query|maxdb_server_end|maxdb_server_init|maxdb_set_opt|maxdb_sqlstate|maxdb_ssl_set|maxdb_stat|maxdb_stmt_affected_rows|maxdb_stmt_bind_param|maxdb_stmt_bind_result|maxdb_stmt_close|maxdb_stmt_close_long_data|maxdb_stmt_data_seek|maxdb_stmt_errno|maxdb_stmt_error|maxdb_stmt_execute|maxdb_stmt_fetch|maxdb_stmt_free_result|maxdb_stmt_init|maxdb_stmt_num_rows|maxdb_stmt_param_count|maxdb_stmt_prepare|maxdb_stmt_reset|maxdb_stmt_result_metadata|maxdb_stmt_send_long_data|maxdb_stmt_sqlstate|maxdb_stmt_store_result|maxdb_store_result|maxdb_thread_id|maxdb_thread_safe|maxdb_use_result|maxdb_warning_count|mb_check_encoding|mb_convert_case|mb_convert_encoding|mb_convert_kana|mb_convert_variables|mb_decode_mimeheader|mb_decode_numericentity|mb_detect_encoding|mb_detect_order|mb_encode_mimeheader|mb_encode_numericentity|mb_encoding_aliases|mb_ereg|mb_ereg_match|mb_ereg_replace|mb_ereg_search|mb_ereg_search_getpos|mb_ereg_search_getregs|mb_ereg_search_init|mb_ereg_search_pos|mb_ereg_search_regs|mb_ereg_search_setpos|mb_eregi|mb_eregi_replace|mb_get_info|mb_http_input|mb_http_output|mb_internal_encoding|mb_language|mb_list_encodings|mb_output_handler|mb_parse_str|mb_preferred_mime_name|mb_regex_encoding|mb_regex_set_options|mb_send_mail|mb_split|mb_strcut|mb_strimwidth|mb_stripos|mb_stristr|mb_strlen|mb_strpos|mb_strrchr|mb_strrichr|mb_strripos|mb_strrpos|mb_strstr|mb_strtolower|mb_strtoupper|mb_strwidth|mb_substitute_character|mb_substr|mb_substr_count|mcrypt_cbc|mcrypt_cfb|mcrypt_create_iv|mcrypt_decrypt|mcrypt_ecb|mcrypt_enc_get_algorithms_name|mcrypt_enc_get_block_size|mcrypt_enc_get_iv_size|mcrypt_enc_get_key_size|mcrypt_enc_get_modes_name|mcrypt_enc_get_supported_key_sizes|mcrypt_enc_is_block_algorithm|mcrypt_enc_is_block_algorithm_mode|mcrypt_enc_is_block_mode|mcrypt_enc_self_test|mcrypt_encrypt|mcrypt_generic|mcrypt_generic_deinit|mcrypt_generic_end|mcrypt_generic_init|mcrypt_get_block_size|mcrypt_get_cipher_name|mcrypt_get_iv_size|mcrypt_get_key_size|mcrypt_list_algorithms|mcrypt_list_modes|mcrypt_module_close|mcrypt_module_get_algo_block_size|mcrypt_module_get_algo_key_size|mcrypt_module_get_supported_key_sizes|mcrypt_module_is_block_algorithm|mcrypt_module_is_block_algorithm_mode|mcrypt_module_is_block_mode|mcrypt_module_open|mcrypt_module_self_test|mcrypt_ofb|md5|md5_file|mdecrypt_generic|memcache|memcache_debug|memcached|memory_get_peak_usage|memory_get_usage|messageformatter|metaphone|method_exists|mhash|mhash_count|mhash_get_block_size|mhash_get_hash_name|mhash_keygen_s2k|microtime|mime_content_type|min|ming_keypress|ming_setcubicthreshold|ming_setscale|ming_setswfcompression|ming_useconstants|ming_useswfversion|mkdir|mktime|money_format|mongo|mongobindata|mongocode|mongocollection|mongoconnectionexception|mongocursor|mongocursorexception|mongocursortimeoutexception|mongodate|mongodb|mongodbref|mongoexception|mongogridfs|mongogridfscursor|mongogridfsexception|mongogridfsfile|mongoid|mongoint32|mongoint64|mongomaxkey|mongominkey|mongoregex|mongotimestamp|move_uploaded_file|mpegfile|mqseries_back|mqseries_begin|mqseries_close|mqseries_cmit|mqseries_conn|mqseries_connx|mqseries_disc|mqseries_get|mqseries_inq|mqseries_open|mqseries_put|mqseries_put1|mqseries_set|mqseries_strerror|msession_connect|msession_count|msession_create|msession_destroy|msession_disconnect|msession_find|msession_get|msession_get_array|msession_get_data|msession_inc|msession_list|msession_listvar|msession_lock|msession_plugin|msession_randstr|msession_set|msession_set_array|msession_set_data|msession_timeout|msession_uniq|msession_unlock|msg_get_queue|msg_queue_exists|msg_receive|msg_remove_queue|msg_send|msg_set_queue|msg_stat_queue|msql|msql_affected_rows|msql_close|msql_connect|msql_create_db|msql_createdb|msql_data_seek|msql_db_query|msql_dbname|msql_drop_db|msql_error|msql_fetch_array|msql_fetch_field|msql_fetch_object|msql_fetch_row|msql_field_flags|msql_field_len|msql_field_name|msql_field_seek|msql_field_table|msql_field_type|msql_fieldflags|msql_fieldlen|msql_fieldname|msql_fieldtable|msql_fieldtype|msql_free_result|msql_list_dbs|msql_list_fields|msql_list_tables|msql_num_fields|msql_num_rows|msql_numfields|msql_numrows|msql_pconnect|msql_query|msql_regcase|msql_result|msql_select_db|msql_tablename|mssql_bind|mssql_close|mssql_connect|mssql_data_seek|mssql_execute|mssql_fetch_array|mssql_fetch_assoc|mssql_fetch_batch|mssql_fetch_field|mssql_fetch_object|mssql_fetch_row|mssql_field_length|mssql_field_name|mssql_field_seek|mssql_field_type|mssql_free_result|mssql_free_statement|mssql_get_last_message|mssql_guid_string|mssql_init|mssql_min_error_severity|mssql_min_message_severity|mssql_next_result|mssql_num_fields|mssql_num_rows|mssql_pconnect|mssql_query|mssql_result|mssql_rows_affected|mssql_select_db|mt_getrandmax|mt_rand|mt_srand|multipleiterator|mysql_affected_rows|mysql_client_encoding|mysql_close|mysql_connect|mysql_create_db|mysql_data_seek|mysql_db_name|mysql_db_query|mysql_drop_db|mysql_errno|mysql_error|mysql_escape_string|mysql_fetch_array|mysql_fetch_assoc|mysql_fetch_field|mysql_fetch_lengths|mysql_fetch_object|mysql_fetch_row|mysql_field_flags|mysql_field_len|mysql_field_name|mysql_field_seek|mysql_field_table|mysql_field_type|mysql_free_result|mysql_get_client_info|mysql_get_host_info|mysql_get_proto_info|mysql_get_server_info|mysql_info|mysql_insert_id|mysql_list_dbs|mysql_list_fields|mysql_list_processes|mysql_list_tables|mysql_num_fields|mysql_num_rows|mysql_pconnect|mysql_ping|mysql_query|mysql_real_escape_string|mysql_result|mysql_select_db|mysql_set_charset|mysql_stat|mysql_tablename|mysql_thread_id|mysql_unbuffered_query|mysqli|mysqli_bind_param|mysqli_bind_result|mysqli_client_encoding|mysqli_connect|mysqli_disable_reads_from_master|mysqli_disable_rpl_parse|mysqli_driver|mysqli_enable_reads_from_master|mysqli_enable_rpl_parse|mysqli_escape_string|mysqli_execute|mysqli_fetch|mysqli_get_metadata|mysqli_master_query|mysqli_param_count|mysqli_report|mysqli_result|mysqli_rpl_parse_enabled|mysqli_rpl_probe|mysqli_rpl_query_type|mysqli_send_long_data|mysqli_send_query|mysqli_set_opt|mysqli_slave_query|mysqli_stmt|mysqli_warning|mysqlnd_ms_get_stats|mysqlnd_ms_query_is_select|mysqlnd_ms_set_user_pick_server|mysqlnd_qc_change_handler|mysqlnd_qc_clear_cache|mysqlnd_qc_get_cache_info|mysqlnd_qc_get_core_stats|mysqlnd_qc_get_handler|mysqlnd_qc_get_query_trace_log|mysqlnd_qc_set_user_handlers|natcasesort|natsort|ncurses_addch|ncurses_addchnstr|ncurses_addchstr|ncurses_addnstr|ncurses_addstr|ncurses_assume_default_colors|ncurses_attroff|ncurses_attron|ncurses_attrset|ncurses_baudrate|ncurses_beep|ncurses_bkgd|ncurses_bkgdset|ncurses_border|ncurses_bottom_panel|ncurses_can_change_color|ncurses_cbreak|ncurses_clear|ncurses_clrtobot|ncurses_clrtoeol|ncurses_color_content|ncurses_color_set|ncurses_curs_set|ncurses_def_prog_mode|ncurses_def_shell_mode|ncurses_define_key|ncurses_del_panel|ncurses_delay_output|ncurses_delch|ncurses_deleteln|ncurses_delwin|ncurses_doupdate|ncurses_echo|ncurses_echochar|ncurses_end|ncurses_erase|ncurses_erasechar|ncurses_filter|ncurses_flash|ncurses_flushinp|ncurses_getch|ncurses_getmaxyx|ncurses_getmouse|ncurses_getyx|ncurses_halfdelay|ncurses_has_colors|ncurses_has_ic|ncurses_has_il|ncurses_has_key|ncurses_hide_panel|ncurses_hline|ncurses_inch|ncurses_init|ncurses_init_color|ncurses_init_pair|ncurses_insch|ncurses_insdelln|ncurses_insertln|ncurses_insstr|ncurses_instr|ncurses_isendwin|ncurses_keyok|ncurses_keypad|ncurses_killchar|ncurses_longname|ncurses_meta|ncurses_mouse_trafo|ncurses_mouseinterval|ncurses_mousemask|ncurses_move|ncurses_move_panel|ncurses_mvaddch|ncurses_mvaddchnstr|ncurses_mvaddchstr|ncurses_mvaddnstr|ncurses_mvaddstr|ncurses_mvcur|ncurses_mvdelch|ncurses_mvgetch|ncurses_mvhline|ncurses_mvinch|ncurses_mvvline|ncurses_mvwaddstr|ncurses_napms|ncurses_new_panel|ncurses_newpad|ncurses_newwin|ncurses_nl|ncurses_nocbreak|ncurses_noecho|ncurses_nonl|ncurses_noqiflush|ncurses_noraw|ncurses_pair_content|ncurses_panel_above|ncurses_panel_below|ncurses_panel_window|ncurses_pnoutrefresh|ncurses_prefresh|ncurses_putp|ncurses_qiflush|ncurses_raw|ncurses_refresh|ncurses_replace_panel|ncurses_reset_prog_mode|ncurses_reset_shell_mode|ncurses_resetty|ncurses_savetty|ncurses_scr_dump|ncurses_scr_init|ncurses_scr_restore|ncurses_scr_set|ncurses_scrl|ncurses_show_panel|ncurses_slk_attr|ncurses_slk_attroff|ncurses_slk_attron|ncurses_slk_attrset|ncurses_slk_clear|ncurses_slk_color|ncurses_slk_init|ncurses_slk_noutrefresh|ncurses_slk_refresh|ncurses_slk_restore|ncurses_slk_set|ncurses_slk_touch|ncurses_standend|ncurses_standout|ncurses_start_color|ncurses_termattrs|ncurses_termname|ncurses_timeout|ncurses_top_panel|ncurses_typeahead|ncurses_ungetch|ncurses_ungetmouse|ncurses_update_panels|ncurses_use_default_colors|ncurses_use_env|ncurses_use_extended_names|ncurses_vidattr|ncurses_vline|ncurses_waddch|ncurses_waddstr|ncurses_wattroff|ncurses_wattron|ncurses_wattrset|ncurses_wborder|ncurses_wclear|ncurses_wcolor_set|ncurses_werase|ncurses_wgetch|ncurses_whline|ncurses_wmouse_trafo|ncurses_wmove|ncurses_wnoutrefresh|ncurses_wrefresh|ncurses_wstandend|ncurses_wstandout|ncurses_wvline|newinstance|newinstanceargs|newt_bell|newt_button|newt_button_bar|newt_centered_window|newt_checkbox|newt_checkbox_get_value|newt_checkbox_set_flags|newt_checkbox_set_value|newt_checkbox_tree|newt_checkbox_tree_add_item|newt_checkbox_tree_find_item|newt_checkbox_tree_get_current|newt_checkbox_tree_get_entry_value|newt_checkbox_tree_get_multi_selection|newt_checkbox_tree_get_selection|newt_checkbox_tree_multi|newt_checkbox_tree_set_current|newt_checkbox_tree_set_entry|newt_checkbox_tree_set_entry_value|newt_checkbox_tree_set_width|newt_clear_key_buffer|newt_cls|newt_compact_button|newt_component_add_callback|newt_component_takes_focus|newt_create_grid|newt_cursor_off|newt_cursor_on|newt_delay|newt_draw_form|newt_draw_root_text|newt_entry|newt_entry_get_value|newt_entry_set|newt_entry_set_filter|newt_entry_set_flags|newt_finished|newt_form|newt_form_add_component|newt_form_add_components|newt_form_add_hot_key|newt_form_destroy|newt_form_get_current|newt_form_run|newt_form_set_background|newt_form_set_height|newt_form_set_size|newt_form_set_timer|newt_form_set_width|newt_form_watch_fd|newt_get_screen_size|newt_grid_add_components_to_form|newt_grid_basic_window|newt_grid_free|newt_grid_get_size|newt_grid_h_close_stacked|newt_grid_h_stacked|newt_grid_place|newt_grid_set_field|newt_grid_simple_window|newt_grid_v_close_stacked|newt_grid_v_stacked|newt_grid_wrapped_window|newt_grid_wrapped_window_at|newt_init|newt_label|newt_label_set_text|newt_listbox|newt_listbox_append_entry|newt_listbox_clear|newt_listbox_clear_selection|newt_listbox_delete_entry|newt_listbox_get_current|newt_listbox_get_selection|newt_listbox_insert_entry|newt_listbox_item_count|newt_listbox_select_item|newt_listbox_set_current|newt_listbox_set_current_by_key|newt_listbox_set_data|newt_listbox_set_entry|newt_listbox_set_width|newt_listitem|newt_listitem_get_data|newt_listitem_set|newt_open_window|newt_pop_help_line|newt_pop_window|newt_push_help_line|newt_radio_get_current|newt_radiobutton|newt_redraw_help_line|newt_reflow_text|newt_refresh|newt_resize_screen|newt_resume|newt_run_form|newt_scale|newt_scale_set|newt_scrollbar_set|newt_set_help_callback|newt_set_suspend_callback|newt_suspend|newt_textbox|newt_textbox_get_num_lines|newt_textbox_reflowed|newt_textbox_set_height|newt_textbox_set_text|newt_vertical_scrollbar|newt_wait_for_key|newt_win_choice|newt_win_entries|newt_win_menu|newt_win_message|newt_win_messagev|newt_win_ternary|next|ngettext|nl2br|nl_langinfo|norewinditerator|normalizer|notes_body|notes_copy_db|notes_create_db|notes_create_note|notes_drop_db|notes_find_note|notes_header_info|notes_list_msgs|notes_mark_read|notes_mark_unread|notes_nav_create|notes_search|notes_unread|notes_version|nsapi_request_headers|nsapi_response_headers|nsapi_virtual|nthmac|number_format|numberformatter|oauth|oauth_get_sbs|oauth_urlencode|oauthexception|oauthprovider|ob_clean|ob_deflatehandler|ob_end_clean|ob_end_flush|ob_etaghandler|ob_flush|ob_get_clean|ob_get_contents|ob_get_flush|ob_get_length|ob_get_level|ob_get_status|ob_gzhandler|ob_iconv_handler|ob_implicit_flush|ob_inflatehandler|ob_list_handlers|ob_start|ob_tidyhandler|oci_bind_array_by_name|oci_bind_by_name|oci_cancel|oci_client_version|oci_close|oci_collection_append|oci_collection_assign|oci_collection_element_assign|oci_collection_element_get|oci_collection_free|oci_collection_max|oci_collection_size|oci_collection_trim|oci_commit|oci_connect|oci_define_by_name|oci_error|oci_execute|oci_fetch|oci_fetch_all|oci_fetch_array|oci_fetch_assoc|oci_fetch_object|oci_fetch_row|oci_field_is_null|oci_field_name|oci_field_precision|oci_field_scale|oci_field_size|oci_field_type|oci_field_type_raw|oci_free_statement|oci_internal_debug|oci_lob_append|oci_lob_close|oci_lob_copy|oci_lob_eof|oci_lob_erase|oci_lob_export|oci_lob_flush|oci_lob_free|oci_lob_getbuffering|oci_lob_import|oci_lob_is_equal|oci_lob_load|oci_lob_read|oci_lob_rewind|oci_lob_save|oci_lob_savefile|oci_lob_seek|oci_lob_setbuffering|oci_lob_size|oci_lob_tell|oci_lob_truncate|oci_lob_write|oci_lob_writetemporary|oci_lob_writetofile|oci_new_collection|oci_new_connect|oci_new_cursor|oci_new_descriptor|oci_num_fields|oci_num_rows|oci_parse|oci_password_change|oci_pconnect|oci_result|oci_rollback|oci_server_version|oci_set_action|oci_set_client_identifier|oci_set_client_info|oci_set_edition|oci_set_module_name|oci_set_prefetch|oci_statement_type|ocibindbyname|ocicancel|ocicloselob|ocicollappend|ocicollassign|ocicollassignelem|ocicollgetelem|ocicollmax|ocicollsize|ocicolltrim|ocicolumnisnull|ocicolumnname|ocicolumnprecision|ocicolumnscale|ocicolumnsize|ocicolumntype|ocicolumntyperaw|ocicommit|ocidefinebyname|ocierror|ociexecute|ocifetch|ocifetchinto|ocifetchstatement|ocifreecollection|ocifreecursor|ocifreedesc|ocifreestatement|ociinternaldebug|ociloadlob|ocilogoff|ocilogon|ocinewcollection|ocinewcursor|ocinewdescriptor|ocinlogon|ocinumcols|ociparse|ociplogon|ociresult|ocirollback|ocirowcount|ocisavelob|ocisavelobfile|ociserverversion|ocisetprefetch|ocistatementtype|ociwritelobtofile|ociwritetemporarylob|octdec|odbc_autocommit|odbc_binmode|odbc_close|odbc_close_all|odbc_columnprivileges|odbc_columns|odbc_commit|odbc_connect|odbc_cursor|odbc_data_source|odbc_do|odbc_error|odbc_errormsg|odbc_exec|odbc_execute|odbc_fetch_array|odbc_fetch_into|odbc_fetch_object|odbc_fetch_row|odbc_field_len|odbc_field_name|odbc_field_num|odbc_field_precision|odbc_field_scale|odbc_field_type|odbc_foreignkeys|odbc_free_result|odbc_gettypeinfo|odbc_longreadlen|odbc_next_result|odbc_num_fields|odbc_num_rows|odbc_pconnect|odbc_prepare|odbc_primarykeys|odbc_procedurecolumns|odbc_procedures|odbc_result|odbc_result_all|odbc_rollback|odbc_setoption|odbc_specialcolumns|odbc_statistics|odbc_tableprivileges|odbc_tables|openal_buffer_create|openal_buffer_data|openal_buffer_destroy|openal_buffer_get|openal_buffer_loadwav|openal_context_create|openal_context_current|openal_context_destroy|openal_context_process|openal_context_suspend|openal_device_close|openal_device_open|openal_listener_get|openal_listener_set|openal_source_create|openal_source_destroy|openal_source_get|openal_source_pause|openal_source_play|openal_source_rewind|openal_source_set|openal_source_stop|openal_stream|opendir|openlog|openssl_cipher_iv_length|openssl_csr_export|openssl_csr_export_to_file|openssl_csr_get_public_key|openssl_csr_get_subject|openssl_csr_new|openssl_csr_sign|openssl_decrypt|openssl_dh_compute_key|openssl_digest|openssl_encrypt|openssl_error_string|openssl_free_key|openssl_get_cipher_methods|openssl_get_md_methods|openssl_get_privatekey|openssl_get_publickey|openssl_open|openssl_pkcs12_export|openssl_pkcs12_export_to_file|openssl_pkcs12_read|openssl_pkcs7_decrypt|openssl_pkcs7_encrypt|openssl_pkcs7_sign|openssl_pkcs7_verify|openssl_pkey_export|openssl_pkey_export_to_file|openssl_pkey_free|openssl_pkey_get_details|openssl_pkey_get_private|openssl_pkey_get_public|openssl_pkey_new|openssl_private_decrypt|openssl_private_encrypt|openssl_public_decrypt|openssl_public_encrypt|openssl_random_pseudo_bytes|openssl_seal|openssl_sign|openssl_verify|openssl_x509_check_private_key|openssl_x509_checkpurpose|openssl_x509_export|openssl_x509_export_to_file|openssl_x509_free|openssl_x509_parse|openssl_x509_read|ord|outeriterator|outofboundsexception|outofrangeexception|output_add_rewrite_var|output_reset_rewrite_vars|overflowexception|overload|override_function|ovrimos_close|ovrimos_commit|ovrimos_connect|ovrimos_cursor|ovrimos_exec|ovrimos_execute|ovrimos_fetch_into|ovrimos_fetch_row|ovrimos_field_len|ovrimos_field_name|ovrimos_field_num|ovrimos_field_type|ovrimos_free_result|ovrimos_longreadlen|ovrimos_num_fields|ovrimos_num_rows|ovrimos_prepare|ovrimos_result|ovrimos_result_all|ovrimos_rollback|pack|parentiterator|parse_ini_file|parse_ini_string|parse_str|parse_url|parsekit_compile_file|parsekit_compile_string|parsekit_func_arginfo|passthru|pathinfo|pclose|pcntl_alarm|pcntl_exec|pcntl_fork|pcntl_getpriority|pcntl_setpriority|pcntl_signal|pcntl_signal_dispatch|pcntl_sigprocmask|pcntl_sigtimedwait|pcntl_sigwaitinfo|pcntl_wait|pcntl_waitpid|pcntl_wexitstatus|pcntl_wifexited|pcntl_wifsignaled|pcntl_wifstopped|pcntl_wstopsig|pcntl_wtermsig|pdf_activate_item|pdf_add_annotation|pdf_add_bookmark|pdf_add_launchlink|pdf_add_locallink|pdf_add_nameddest|pdf_add_note|pdf_add_outline|pdf_add_pdflink|pdf_add_table_cell|pdf_add_textflow|pdf_add_thumbnail|pdf_add_weblink|pdf_arc|pdf_arcn|pdf_attach_file|pdf_begin_document|pdf_begin_font|pdf_begin_glyph|pdf_begin_item|pdf_begin_layer|pdf_begin_page|pdf_begin_page_ext|pdf_begin_pattern|pdf_begin_template|pdf_begin_template_ext|pdf_circle|pdf_clip|pdf_close|pdf_close_image|pdf_close_pdi|pdf_close_pdi_page|pdf_closepath|pdf_closepath_fill_stroke|pdf_closepath_stroke|pdf_concat|pdf_continue_text|pdf_create_3dview|pdf_create_action|pdf_create_annotation|pdf_create_bookmark|pdf_create_field|pdf_create_fieldgroup|pdf_create_gstate|pdf_create_pvf|pdf_create_textflow|pdf_curveto|pdf_define_layer|pdf_delete|pdf_delete_pvf|pdf_delete_table|pdf_delete_textflow|pdf_encoding_set_char|pdf_end_document|pdf_end_font|pdf_end_glyph|pdf_end_item|pdf_end_layer|pdf_end_page|pdf_end_page_ext|pdf_end_pattern|pdf_end_template|pdf_endpath|pdf_fill|pdf_fill_imageblock|pdf_fill_pdfblock|pdf_fill_stroke|pdf_fill_textblock|pdf_findfont|pdf_fit_image|pdf_fit_pdi_page|pdf_fit_table|pdf_fit_textflow|pdf_fit_textline|pdf_get_apiname|pdf_get_buffer|pdf_get_errmsg|pdf_get_errnum|pdf_get_font|pdf_get_fontname|pdf_get_fontsize|pdf_get_image_height|pdf_get_image_width|pdf_get_majorversion|pdf_get_minorversion|pdf_get_parameter|pdf_get_pdi_parameter|pdf_get_pdi_value|pdf_get_value|pdf_info_font|pdf_info_matchbox|pdf_info_table|pdf_info_textflow|pdf_info_textline|pdf_initgraphics|pdf_lineto|pdf_load_3ddata|pdf_load_font|pdf_load_iccprofile|pdf_load_image|pdf_makespotcolor|pdf_moveto|pdf_new|pdf_open_ccitt|pdf_open_file|pdf_open_gif|pdf_open_image|pdf_open_image_file|pdf_open_jpeg|pdf_open_memory_image|pdf_open_pdi|pdf_open_pdi_document|pdf_open_pdi_page|pdf_open_tiff|pdf_pcos_get_number|pdf_pcos_get_stream|pdf_pcos_get_string|pdf_place_image|pdf_place_pdi_page|pdf_process_pdi|pdf_rect|pdf_restore|pdf_resume_page|pdf_rotate|pdf_save|pdf_scale|pdf_set_border_color|pdf_set_border_dash|pdf_set_border_style|pdf_set_char_spacing|pdf_set_duration|pdf_set_gstate|pdf_set_horiz_scaling|pdf_set_info|pdf_set_info_author|pdf_set_info_creator|pdf_set_info_keywords|pdf_set_info_subject|pdf_set_info_title|pdf_set_layer_dependency|pdf_set_leading|pdf_set_parameter|pdf_set_text_matrix|pdf_set_text_pos|pdf_set_text_rendering|pdf_set_text_rise|pdf_set_value|pdf_set_word_spacing|pdf_setcolor|pdf_setdash|pdf_setdashpattern|pdf_setflat|pdf_setfont|pdf_setgray|pdf_setgray_fill|pdf_setgray_stroke|pdf_setlinecap|pdf_setlinejoin|pdf_setlinewidth|pdf_setmatrix|pdf_setmiterlimit|pdf_setpolydash|pdf_setrgbcolor|pdf_setrgbcolor_fill|pdf_setrgbcolor_stroke|pdf_shading|pdf_shading_pattern|pdf_shfill|pdf_show|pdf_show_boxed|pdf_show_xy|pdf_skew|pdf_stringwidth|pdf_stroke|pdf_suspend_page|pdf_translate|pdf_utf16_to_utf8|pdf_utf32_to_utf16|pdf_utf8_to_utf16|pdo|pdo_cubrid_schema|pdo_pgsqllobcreate|pdo_pgsqllobopen|pdo_pgsqllobunlink|pdo_sqlitecreateaggregate|pdo_sqlitecreatefunction|pdoexception|pdostatement|pfsockopen|pg_affected_rows|pg_cancel_query|pg_client_encoding|pg_close|pg_connect|pg_connection_busy|pg_connection_reset|pg_connection_status|pg_convert|pg_copy_from|pg_copy_to|pg_dbname|pg_delete|pg_end_copy|pg_escape_bytea|pg_escape_string|pg_execute|pg_fetch_all|pg_fetch_all_columns|pg_fetch_array|pg_fetch_assoc|pg_fetch_object|pg_fetch_result|pg_fetch_row|pg_field_is_null|pg_field_name|pg_field_num|pg_field_prtlen|pg_field_size|pg_field_table|pg_field_type|pg_field_type_oid|pg_free_result|pg_get_notify|pg_get_pid|pg_get_result|pg_host|pg_insert|pg_last_error|pg_last_notice|pg_last_oid|pg_lo_close|pg_lo_create|pg_lo_export|pg_lo_import|pg_lo_open|pg_lo_read|pg_lo_read_all|pg_lo_seek|pg_lo_tell|pg_lo_unlink|pg_lo_write|pg_meta_data|pg_num_fields|pg_num_rows|pg_options|pg_parameter_status|pg_pconnect|pg_ping|pg_port|pg_prepare|pg_put_line|pg_query|pg_query_params|pg_result_error|pg_result_error_field|pg_result_seek|pg_result_status|pg_select|pg_send_execute|pg_send_prepare|pg_send_query|pg_send_query_params|pg_set_client_encoding|pg_set_error_verbosity|pg_trace|pg_transaction_status|pg_tty|pg_unescape_bytea|pg_untrace|pg_update|pg_version|php_check_syntax|php_ini_loaded_file|php_ini_scanned_files|php_logo_guid|php_sapi_name|php_strip_whitespace|php_uname|phpcredits|phpinfo|phpversion|pi|png2wbmp|popen|pos|posix_access|posix_ctermid|posix_errno|posix_get_last_error|posix_getcwd|posix_getegid|posix_geteuid|posix_getgid|posix_getgrgid|posix_getgrnam|posix_getgroups|posix_getlogin|posix_getpgid|posix_getpgrp|posix_getpid|posix_getppid|posix_getpwnam|posix_getpwuid|posix_getrlimit|posix_getsid|posix_getuid|posix_initgroups|posix_isatty|posix_kill|posix_mkfifo|posix_mknod|posix_setegid|posix_seteuid|posix_setgid|posix_setpgid|posix_setsid|posix_setuid|posix_strerror|posix_times|posix_ttyname|posix_uname|pow|preg_filter|preg_grep|preg_last_error|preg_match|preg_match_all|preg_quote|preg_replace|preg_replace_callback|preg_split|prev|print|print_r|printer_abort|printer_close|printer_create_brush|printer_create_dc|printer_create_font|printer_create_pen|printer_delete_brush|printer_delete_dc|printer_delete_font|printer_delete_pen|printer_draw_bmp|printer_draw_chord|printer_draw_elipse|printer_draw_line|printer_draw_pie|printer_draw_rectangle|printer_draw_roundrect|printer_draw_text|printer_end_doc|printer_end_page|printer_get_option|printer_list|printer_logical_fontheight|printer_open|printer_select_brush|printer_select_font|printer_select_pen|printer_set_option|printer_start_doc|printer_start_page|printer_write|printf|proc_close|proc_get_status|proc_nice|proc_open|proc_terminate|property_exists|ps_add_bookmark|ps_add_launchlink|ps_add_locallink|ps_add_note|ps_add_pdflink|ps_add_weblink|ps_arc|ps_arcn|ps_begin_page|ps_begin_pattern|ps_begin_template|ps_circle|ps_clip|ps_close|ps_close_image|ps_closepath|ps_closepath_stroke|ps_continue_text|ps_curveto|ps_delete|ps_end_page|ps_end_pattern|ps_end_template|ps_fill|ps_fill_stroke|ps_findfont|ps_get_buffer|ps_get_parameter|ps_get_value|ps_hyphenate|ps_include_file|ps_lineto|ps_makespotcolor|ps_moveto|ps_new|ps_open_file|ps_open_image|ps_open_image_file|ps_open_memory_image|ps_place_image|ps_rect|ps_restore|ps_rotate|ps_save|ps_scale|ps_set_border_color|ps_set_border_dash|ps_set_border_style|ps_set_info|ps_set_parameter|ps_set_text_pos|ps_set_value|ps_setcolor|ps_setdash|ps_setflat|ps_setfont|ps_setgray|ps_setlinecap|ps_setlinejoin|ps_setlinewidth|ps_setmiterlimit|ps_setoverprintmode|ps_setpolydash|ps_shading|ps_shading_pattern|ps_shfill|ps_show|ps_show2|ps_show_boxed|ps_show_xy|ps_show_xy2|ps_string_geometry|ps_stringwidth|ps_stroke|ps_symbol|ps_symbol_name|ps_symbol_width|ps_translate|pspell_add_to_personal|pspell_add_to_session|pspell_check|pspell_clear_session|pspell_config_create|pspell_config_data_dir|pspell_config_dict_dir|pspell_config_ignore|pspell_config_mode|pspell_config_personal|pspell_config_repl|pspell_config_runtogether|pspell_config_save_repl|pspell_new|pspell_new_config|pspell_new_personal|pspell_save_wordlist|pspell_store_replacement|pspell_suggest|putenv|px_close|px_create_fp|px_date2string|px_delete|px_delete_record|px_get_field|px_get_info|px_get_parameter|px_get_record|px_get_schema|px_get_value|px_insert_record|px_new|px_numfields|px_numrecords|px_open_fp|px_put_record|px_retrieve_record|px_set_blob_file|px_set_parameter|px_set_tablename|px_set_targetencoding|px_set_value|px_timestamp2string|px_update_record|qdom_error|qdom_tree|quoted_printable_decode|quoted_printable_encode|quotemeta|rad2deg|radius_acct_open|radius_add_server|radius_auth_open|radius_close|radius_config|radius_create_request|radius_cvt_addr|radius_cvt_int|radius_cvt_string|radius_demangle|radius_demangle_mppe_key|radius_get_attr|radius_get_vendor_attr|radius_put_addr|radius_put_attr|radius_put_int|radius_put_string|radius_put_vendor_addr|radius_put_vendor_attr|radius_put_vendor_int|radius_put_vendor_string|radius_request_authenticator|radius_send_request|radius_server_secret|radius_strerror|rand|range|rangeexception|rar_wrapper_cache_stats|rararchive|rarentry|rarexception|rawurldecode|rawurlencode|read_exif_data|readdir|readfile|readgzfile|readline|readline_add_history|readline_callback_handler_install|readline_callback_handler_remove|readline_callback_read_char|readline_clear_history|readline_completion_function|readline_info|readline_list_history|readline_on_new_line|readline_read_history|readline_redisplay|readline_write_history|readlink|realpath|realpath_cache_get|realpath_cache_size|recode|recode_file|recode_string|recursivearrayiterator|recursivecachingiterator|recursivecallbackfilteriterator|recursivedirectoryiterator|recursivefilteriterator|recursiveiterator|recursiveiteratoriterator|recursiveregexiterator|recursivetreeiterator|reflection|reflectionclass|reflectionexception|reflectionextension|reflectionfunction|reflectionfunctionabstract|reflectionmethod|reflectionobject|reflectionparameter|reflectionproperty|reflector|regexiterator|register_shutdown_function|register_tick_function|rename|rename_function|require|require_once|reset|resetValue|resourcebundle|restore_error_handler|restore_exception_handler|restore_include_path|return|rewind|rewinddir|rmdir|round|rpm_close|rpm_get_tag|rpm_is_valid|rpm_open|rpm_version|rrd_create|rrd_error|rrd_fetch|rrd_first|rrd_graph|rrd_info|rrd_last|rrd_lastupdate|rrd_restore|rrd_tune|rrd_update|rrd_xport|rrdcreator|rrdgraph|rrdupdater|rsort|rtrim|runkit_class_adopt|runkit_class_emancipate|runkit_constant_add|runkit_constant_redefine|runkit_constant_remove|runkit_function_add|runkit_function_copy|runkit_function_redefine|runkit_function_remove|runkit_function_rename|runkit_import|runkit_lint|runkit_lint_file|runkit_method_add|runkit_method_copy|runkit_method_redefine|runkit_method_remove|runkit_method_rename|runkit_return_value_used|runkit_sandbox_output_handler|runkit_superglobals|runtimeexception|samconnection_commit|samconnection_connect|samconnection_constructor|samconnection_disconnect|samconnection_errno|samconnection_error|samconnection_isconnected|samconnection_peek|samconnection_peekall|samconnection_receive|samconnection_remove|samconnection_rollback|samconnection_send|samconnection_setDebug|samconnection_subscribe|samconnection_unsubscribe|sammessage_body|sammessage_constructor|sammessage_header|sca_createdataobject|sca_getservice|sca_localproxy_createdataobject|sca_soapproxy_createdataobject|scandir|sdo_das_changesummary_beginlogging|sdo_das_changesummary_endlogging|sdo_das_changesummary_getchangeddataobjects|sdo_das_changesummary_getchangetype|sdo_das_changesummary_getoldcontainer|sdo_das_changesummary_getoldvalues|sdo_das_changesummary_islogging|sdo_das_datafactory_addpropertytotype|sdo_das_datafactory_addtype|sdo_das_datafactory_getdatafactory|sdo_das_dataobject_getchangesummary|sdo_das_relational_applychanges|sdo_das_relational_construct|sdo_das_relational_createrootdataobject|sdo_das_relational_executepreparedquery|sdo_das_relational_executequery|sdo_das_setting_getlistindex|sdo_das_setting_getpropertyindex|sdo_das_setting_getpropertyname|sdo_das_setting_getvalue|sdo_das_setting_isset|sdo_das_xml_addtypes|sdo_das_xml_create|sdo_das_xml_createdataobject|sdo_das_xml_createdocument|sdo_das_xml_document_getrootdataobject|sdo_das_xml_document_getrootelementname|sdo_das_xml_document_getrootelementuri|sdo_das_xml_document_setencoding|sdo_das_xml_document_setxmldeclaration|sdo_das_xml_document_setxmlversion|sdo_das_xml_loadfile|sdo_das_xml_loadstring|sdo_das_xml_savefile|sdo_das_xml_savestring|sdo_datafactory_create|sdo_dataobject_clear|sdo_dataobject_createdataobject|sdo_dataobject_getcontainer|sdo_dataobject_getsequence|sdo_dataobject_gettypename|sdo_dataobject_gettypenamespaceuri|sdo_exception_getcause|sdo_list_insert|sdo_model_property_getcontainingtype|sdo_model_property_getdefault|sdo_model_property_getname|sdo_model_property_gettype|sdo_model_property_iscontainment|sdo_model_property_ismany|sdo_model_reflectiondataobject_construct|sdo_model_reflectiondataobject_export|sdo_model_reflectiondataobject_getcontainmentproperty|sdo_model_reflectiondataobject_getinstanceproperties|sdo_model_reflectiondataobject_gettype|sdo_model_type_getbasetype|sdo_model_type_getname|sdo_model_type_getnamespaceuri|sdo_model_type_getproperties|sdo_model_type_getproperty|sdo_model_type_isabstracttype|sdo_model_type_isdatatype|sdo_model_type_isinstance|sdo_model_type_isopentype|sdo_model_type_issequencedtype|sdo_sequence_getproperty|sdo_sequence_insert|sdo_sequence_move|seekableiterator|sem_acquire|sem_get|sem_release|sem_remove|serializable|serialize|session_cache_expire|session_cache_limiter|session_commit|session_decode|session_destroy|session_encode|session_get_cookie_params|session_id|session_is_registered|session_module_name|session_name|session_pgsql_add_error|session_pgsql_get_error|session_pgsql_get_field|session_pgsql_reset|session_pgsql_set_field|session_pgsql_status|session_regenerate_id|session_register|session_save_path|session_set_cookie_params|session_set_save_handler|session_start|session_unregister|session_unset|session_write_close|setCounterClass|set_error_handler|set_exception_handler|set_file_buffer|set_include_path|set_magic_quotes_runtime|set_socket_blocking|set_time_limit|setcookie|setlocale|setproctitle|setrawcookie|setstaticpropertyvalue|setthreadtitle|settype|sha1|sha1_file|shell_exec|shm_attach|shm_detach|shm_get_var|shm_has_var|shm_put_var|shm_remove|shm_remove_var|shmop_close|shmop_delete|shmop_open|shmop_read|shmop_size|shmop_write|show_source|shuffle|signeurlpaiement|similar_text|simplexml_import_dom|simplexml_load_file|simplexml_load_string|simplexmlelement|simplexmliterator|sin|sinh|sizeof|sleep|snmp|snmp2_get|snmp2_getnext|snmp2_real_walk|snmp2_set|snmp2_walk|snmp3_get|snmp3_getnext|snmp3_real_walk|snmp3_set|snmp3_walk|snmp_get_quick_print|snmp_get_valueretrieval|snmp_read_mib|snmp_set_enum_print|snmp_set_oid_numeric_print|snmp_set_oid_output_format|snmp_set_quick_print|snmp_set_valueretrieval|snmpget|snmpgetnext|snmprealwalk|snmpset|snmpwalk|snmpwalkoid|soapclient|soapfault|soapheader|soapparam|soapserver|soapvar|socket_accept|socket_bind|socket_clear_error|socket_close|socket_connect|socket_create|socket_create_listen|socket_create_pair|socket_get_option|socket_get_status|socket_getpeername|socket_getsockname|socket_last_error|socket_listen|socket_read|socket_recv|socket_recvfrom|socket_select|socket_send|socket_sendto|socket_set_block|socket_set_blocking|socket_set_nonblock|socket_set_option|socket_set_timeout|socket_shutdown|socket_strerror|socket_write|solr_get_version|solrclient|solrclientexception|solrdocument|solrdocumentfield|solrexception|solrgenericresponse|solrillegalargumentexception|solrillegaloperationexception|solrinputdocument|solrmodifiableparams|solrobject|solrparams|solrpingresponse|solrquery|solrqueryresponse|solrresponse|solrupdateresponse|solrutils|sort|soundex|sphinxclient|spl_autoload|spl_autoload_call|spl_autoload_extensions|spl_autoload_functions|spl_autoload_register|spl_autoload_unregister|spl_classes|spl_object_hash|splbool|spldoublylinkedlist|splenum|splfileinfo|splfileobject|splfixedarray|splfloat|splheap|splint|split|spliti|splmaxheap|splminheap|splobjectstorage|splobserver|splpriorityqueue|splqueue|splstack|splstring|splsubject|spltempfileobject|spoofchecker|sprintf|sql_regcase|sqlite3|sqlite3result|sqlite3stmt|sqlite_array_query|sqlite_busy_timeout|sqlite_changes|sqlite_close|sqlite_column|sqlite_create_aggregate|sqlite_create_function|sqlite_current|sqlite_error_string|sqlite_escape_string|sqlite_exec|sqlite_factory|sqlite_fetch_all|sqlite_fetch_array|sqlite_fetch_column_types|sqlite_fetch_object|sqlite_fetch_single|sqlite_fetch_string|sqlite_field_name|sqlite_has_more|sqlite_has_prev|sqlite_key|sqlite_last_error|sqlite_last_insert_rowid|sqlite_libencoding|sqlite_libversion|sqlite_next|sqlite_num_fields|sqlite_num_rows|sqlite_open|sqlite_popen|sqlite_prev|sqlite_query|sqlite_rewind|sqlite_seek|sqlite_single_query|sqlite_udf_decode_binary|sqlite_udf_encode_binary|sqlite_unbuffered_query|sqlite_valid|sqrt|srand|sscanf|ssdeep_fuzzy_compare|ssdeep_fuzzy_hash|ssdeep_fuzzy_hash_filename|ssh2_auth_hostbased_file|ssh2_auth_none|ssh2_auth_password|ssh2_auth_pubkey_file|ssh2_connect|ssh2_exec|ssh2_fetch_stream|ssh2_fingerprint|ssh2_methods_negotiated|ssh2_publickey_add|ssh2_publickey_init|ssh2_publickey_list|ssh2_publickey_remove|ssh2_scp_recv|ssh2_scp_send|ssh2_sftp|ssh2_sftp_lstat|ssh2_sftp_mkdir|ssh2_sftp_readlink|ssh2_sftp_realpath|ssh2_sftp_rename|ssh2_sftp_rmdir|ssh2_sftp_stat|ssh2_sftp_symlink|ssh2_sftp_unlink|ssh2_shell|ssh2_tunnel|stat|stats_absolute_deviation|stats_cdf_beta|stats_cdf_binomial|stats_cdf_cauchy|stats_cdf_chisquare|stats_cdf_exponential|stats_cdf_f|stats_cdf_gamma|stats_cdf_laplace|stats_cdf_logistic|stats_cdf_negative_binomial|stats_cdf_noncentral_chisquare|stats_cdf_noncentral_f|stats_cdf_poisson|stats_cdf_t|stats_cdf_uniform|stats_cdf_weibull|stats_covariance|stats_den_uniform|stats_dens_beta|stats_dens_cauchy|stats_dens_chisquare|stats_dens_exponential|stats_dens_f|stats_dens_gamma|stats_dens_laplace|stats_dens_logistic|stats_dens_negative_binomial|stats_dens_normal|stats_dens_pmf_binomial|stats_dens_pmf_hypergeometric|stats_dens_pmf_poisson|stats_dens_t|stats_dens_weibull|stats_harmonic_mean|stats_kurtosis|stats_rand_gen_beta|stats_rand_gen_chisquare|stats_rand_gen_exponential|stats_rand_gen_f|stats_rand_gen_funiform|stats_rand_gen_gamma|stats_rand_gen_ibinomial|stats_rand_gen_ibinomial_negative|stats_rand_gen_int|stats_rand_gen_ipoisson|stats_rand_gen_iuniform|stats_rand_gen_noncenral_chisquare|stats_rand_gen_noncentral_f|stats_rand_gen_noncentral_t|stats_rand_gen_normal|stats_rand_gen_t|stats_rand_get_seeds|stats_rand_phrase_to_seeds|stats_rand_ranf|stats_rand_setall|stats_skew|stats_standard_deviation|stats_stat_binomial_coef|stats_stat_correlation|stats_stat_gennch|stats_stat_independent_t|stats_stat_innerproduct|stats_stat_noncentral_t|stats_stat_paired_t|stats_stat_percentile|stats_stat_powersum|stats_variance|stomp|stomp_connect_error|stomp_version|stompexception|stompframe|str_getcsv|str_ireplace|str_pad|str_repeat|str_replace|str_rot13|str_shuffle|str_split|str_word_count|strcasecmp|strchr|strcmp|strcoll|strcspn|stream_bucket_append|stream_bucket_make_writeable|stream_bucket_new|stream_bucket_prepend|stream_context_create|stream_context_get_default|stream_context_get_options|stream_context_get_params|stream_context_set_default|stream_context_set_option|stream_context_set_params|stream_copy_to_stream|stream_encoding|stream_filter_append|stream_filter_prepend|stream_filter_register|stream_filter_remove|stream_get_contents|stream_get_filters|stream_get_line|stream_get_meta_data|stream_get_transports|stream_get_wrappers|stream_is_local|stream_notification_callback|stream_register_wrapper|stream_resolve_include_path|stream_select|stream_set_blocking|stream_set_read_buffer|stream_set_timeout|stream_set_write_buffer|stream_socket_accept|stream_socket_client|stream_socket_enable_crypto|stream_socket_get_name|stream_socket_pair|stream_socket_recvfrom|stream_socket_sendto|stream_socket_server|stream_socket_shutdown|stream_supports_lock|stream_wrapper_register|stream_wrapper_restore|stream_wrapper_unregister|streamwrapper|strftime|strip_tags|stripcslashes|stripos|stripslashes|stristr|strlen|strnatcasecmp|strnatcmp|strncasecmp|strncmp|strpbrk|strpos|strptime|strrchr|strrev|strripos|strrpos|strspn|strstr|strtok|strtolower|strtotime|strtoupper|strtr|strval|substr|substr_compare|substr_count|substr_replace|svm|svmmodel|svn_add|svn_auth_get_parameter|svn_auth_set_parameter|svn_blame|svn_cat|svn_checkout|svn_cleanup|svn_client_version|svn_commit|svn_delete|svn_diff|svn_export|svn_fs_abort_txn|svn_fs_apply_text|svn_fs_begin_txn2|svn_fs_change_node_prop|svn_fs_check_path|svn_fs_contents_changed|svn_fs_copy|svn_fs_delete|svn_fs_dir_entries|svn_fs_file_contents|svn_fs_file_length|svn_fs_is_dir|svn_fs_is_file|svn_fs_make_dir|svn_fs_make_file|svn_fs_node_created_rev|svn_fs_node_prop|svn_fs_props_changed|svn_fs_revision_prop|svn_fs_revision_root|svn_fs_txn_root|svn_fs_youngest_rev|svn_import|svn_log|svn_ls|svn_mkdir|svn_repos_create|svn_repos_fs|svn_repos_fs_begin_txn_for_commit|svn_repos_fs_commit_txn|svn_repos_hotcopy|svn_repos_open|svn_repos_recover|svn_revert|svn_status|svn_update|swf_actiongeturl|swf_actiongotoframe|swf_actiongotolabel|swf_actionnextframe|swf_actionplay|swf_actionprevframe|swf_actionsettarget|swf_actionstop|swf_actiontogglequality|swf_actionwaitforframe|swf_addbuttonrecord|swf_addcolor|swf_closefile|swf_definebitmap|swf_definefont|swf_defineline|swf_definepoly|swf_definerect|swf_definetext|swf_endbutton|swf_enddoaction|swf_endshape|swf_endsymbol|swf_fontsize|swf_fontslant|swf_fonttracking|swf_getbitmapinfo|swf_getfontinfo|swf_getframe|swf_labelframe|swf_lookat|swf_modifyobject|swf_mulcolor|swf_nextid|swf_oncondition|swf_openfile|swf_ortho|swf_ortho2|swf_perspective|swf_placeobject|swf_polarview|swf_popmatrix|swf_posround|swf_pushmatrix|swf_removeobject|swf_rotate|swf_scale|swf_setfont|swf_setframe|swf_shapearc|swf_shapecurveto|swf_shapecurveto3|swf_shapefillbitmapclip|swf_shapefillbitmaptile|swf_shapefilloff|swf_shapefillsolid|swf_shapelinesolid|swf_shapelineto|swf_shapemoveto|swf_showframe|swf_startbutton|swf_startdoaction|swf_startshape|swf_startsymbol|swf_textwidth|swf_translate|swf_viewport|swfaction|swfbitmap|swfbutton|swfdisplayitem|swffill|swffont|swffontchar|swfgradient|swfmorph|swfmovie|swfprebuiltclip|swfshape|swfsound|swfsoundinstance|swfsprite|swftext|swftextfield|swfvideostream|swish_construct|swish_getmetalist|swish_getpropertylist|swish_prepare|swish_query|swishresult_getmetalist|swishresult_stem|swishresults_getparsedwords|swishresults_getremovedstopwords|swishresults_nextresult|swishresults_seekresult|swishsearch_execute|swishsearch_resetlimit|swishsearch_setlimit|swishsearch_setphrasedelimiter|swishsearch_setsort|swishsearch_setstructure|sybase_affected_rows|sybase_close|sybase_connect|sybase_data_seek|sybase_deadlock_retry_count|sybase_fetch_array|sybase_fetch_assoc|sybase_fetch_field|sybase_fetch_object|sybase_fetch_row|sybase_field_seek|sybase_free_result|sybase_get_last_message|sybase_min_client_severity|sybase_min_error_severity|sybase_min_message_severity|sybase_min_server_severity|sybase_num_fields|sybase_num_rows|sybase_pconnect|sybase_query|sybase_result|sybase_select_db|sybase_set_message_handler|sybase_unbuffered_query|symlink|sys_get_temp_dir|sys_getloadavg|syslog|system|tag|tan|tanh|tcpwrap_check|tempnam|textdomain|tidy|tidy_access_count|tidy_config_count|tidy_diagnose|tidy_error_count|tidy_get_error_buffer|tidy_get_output|tidy_load_config|tidy_reset_config|tidy_save_config|tidy_set_encoding|tidy_setopt|tidy_warning_count|tidynode|time|time_nanosleep|time_sleep_until|timezone_abbreviations_list|timezone_identifiers_list|timezone_location_get|timezone_name_from_abbr|timezone_name_get|timezone_offset_get|timezone_open|timezone_transitions_get|timezone_version_get|tmpfile|token_get_all|token_name|tokyotyrant|tokyotyrantquery|tokyotyranttable|tostring|tostring|touch|transliterator|traversable|trigger_error|trim|uasort|ucfirst|ucwords|udm_add_search_limit|udm_alloc_agent|udm_alloc_agent_array|udm_api_version|udm_cat_list|udm_cat_path|udm_check_charset|udm_check_stored|udm_clear_search_limits|udm_close_stored|udm_crc32|udm_errno|udm_error|udm_find|udm_free_agent|udm_free_ispell_data|udm_free_res|udm_get_doc_count|udm_get_res_field|udm_get_res_param|udm_hash32|udm_load_ispell_data|udm_open_stored|udm_set_agent_param|uksort|umask|underflowexception|unexpectedvalueexception|uniqid|unixtojd|unlink|unpack|unregister_tick_function|unserialize|unset|urldecode|urlencode|use_soap_error_handler|user_error|usleep|usort|utf8_decode|utf8_encode|v8js|v8jsexception|var_dump|var_export|variant|variant_abs|variant_add|variant_and|variant_cast|variant_cat|variant_cmp|variant_date_from_timestamp|variant_date_to_timestamp|variant_div|variant_eqv|variant_fix|variant_get_type|variant_idiv|variant_imp|variant_int|variant_mod|variant_mul|variant_neg|variant_not|variant_or|variant_pow|variant_round|variant_set|variant_set_type|variant_sub|variant_xor|version_compare|vfprintf|virtual|vpopmail_add_alias_domain|vpopmail_add_alias_domain_ex|vpopmail_add_domain|vpopmail_add_domain_ex|vpopmail_add_user|vpopmail_alias_add|vpopmail_alias_del|vpopmail_alias_del_domain|vpopmail_alias_get|vpopmail_alias_get_all|vpopmail_auth_user|vpopmail_del_domain|vpopmail_del_domain_ex|vpopmail_del_user|vpopmail_error|vpopmail_passwd|vpopmail_set_user_quota|vprintf|vsprintf|w32api_deftype|w32api_init_dtype|w32api_invoke_function|w32api_register_function|w32api_set_call_method|wddx_add_vars|wddx_deserialize|wddx_packet_end|wddx_packet_start|wddx_serialize_value|wddx_serialize_vars|win32_continue_service|win32_create_service|win32_delete_service|win32_get_last_control_message|win32_pause_service|win32_ps_list_procs|win32_ps_stat_mem|win32_ps_stat_proc|win32_query_service_status|win32_set_service_status|win32_start_service|win32_start_service_ctrl_dispatcher|win32_stop_service|wincache_fcache_fileinfo|wincache_fcache_meminfo|wincache_lock|wincache_ocache_fileinfo|wincache_ocache_meminfo|wincache_refresh_if_changed|wincache_rplist_fileinfo|wincache_rplist_meminfo|wincache_scache_info|wincache_scache_meminfo|wincache_ucache_add|wincache_ucache_cas|wincache_ucache_clear|wincache_ucache_dec|wincache_ucache_delete|wincache_ucache_exists|wincache_ucache_get|wincache_ucache_inc|wincache_ucache_info|wincache_ucache_meminfo|wincache_ucache_set|wincache_unlock|wordwrap|xattr_get|xattr_list|xattr_remove|xattr_set|xattr_supported|xdiff_file_bdiff|xdiff_file_bdiff_size|xdiff_file_bpatch|xdiff_file_diff|xdiff_file_diff_binary|xdiff_file_merge3|xdiff_file_patch|xdiff_file_patch_binary|xdiff_file_rabdiff|xdiff_string_bdiff|xdiff_string_bdiff_size|xdiff_string_bpatch|xdiff_string_diff|xdiff_string_diff_binary|xdiff_string_merge3|xdiff_string_patch|xdiff_string_patch_binary|xdiff_string_rabdiff|xhprof_disable|xhprof_enable|xhprof_sample_disable|xhprof_sample_enable|xml_error_string|xml_get_current_byte_index|xml_get_current_column_number|xml_get_current_line_number|xml_get_error_code|xml_parse|xml_parse_into_struct|xml_parser_create|xml_parser_create_ns|xml_parser_free|xml_parser_get_option|xml_parser_set_option|xml_set_character_data_handler|xml_set_default_handler|xml_set_element_handler|xml_set_end_namespace_decl_handler|xml_set_external_entity_ref_handler|xml_set_notation_decl_handler|xml_set_object|xml_set_processing_instruction_handler|xml_set_start_namespace_decl_handler|xml_set_unparsed_entity_decl_handler|xmlreader|xmlrpc_decode|xmlrpc_decode_request|xmlrpc_encode|xmlrpc_encode_request|xmlrpc_get_type|xmlrpc_is_fault|xmlrpc_parse_method_descriptions|xmlrpc_server_add_introspection_data|xmlrpc_server_call_method|xmlrpc_server_create|xmlrpc_server_destroy|xmlrpc_server_register_introspection_callback|xmlrpc_server_register_method|xmlrpc_set_type|xmlwriter_end_attribute|xmlwriter_end_cdata|xmlwriter_end_comment|xmlwriter_end_document|xmlwriter_end_dtd|xmlwriter_end_dtd_attlist|xmlwriter_end_dtd_element|xmlwriter_end_dtd_entity|xmlwriter_end_element|xmlwriter_end_pi|xmlwriter_flush|xmlwriter_full_end_element|xmlwriter_open_memory|xmlwriter_open_uri|xmlwriter_output_memory|xmlwriter_set_indent|xmlwriter_set_indent_string|xmlwriter_start_attribute|xmlwriter_start_attribute_ns|xmlwriter_start_cdata|xmlwriter_start_comment|xmlwriter_start_document|xmlwriter_start_dtd|xmlwriter_start_dtd_attlist|xmlwriter_start_dtd_element|xmlwriter_start_dtd_entity|xmlwriter_start_element|xmlwriter_start_element_ns|xmlwriter_start_pi|xmlwriter_text|xmlwriter_write_attribute|xmlwriter_write_attribute_ns|xmlwriter_write_cdata|xmlwriter_write_comment|xmlwriter_write_dtd|xmlwriter_write_dtd_attlist|xmlwriter_write_dtd_element|xmlwriter_write_dtd_entity|xmlwriter_write_element|xmlwriter_write_element_ns|xmlwriter_write_pi|xmlwriter_write_raw|xpath_eval|xpath_eval_expression|xpath_new_context|xpath_register_ns|xpath_register_ns_auto|xptr_eval|xptr_new_context|xslt_backend_info|xslt_backend_name|xslt_backend_version|xslt_create|xslt_errno|xslt_error|xslt_free|xslt_getopt|xslt_process|xslt_set_base|xslt_set_encoding|xslt_set_error_handler|xslt_set_log|xslt_set_object|xslt_set_sax_handler|xslt_set_sax_handlers|xslt_set_scheme_handler|xslt_set_scheme_handlers|xslt_setopt|xsltprocessor|yaml_emit|yaml_emit_file|yaml_parse|yaml_parse_file|yaml_parse_url|yaz_addinfo|yaz_ccl_conf|yaz_ccl_parse|yaz_close|yaz_connect|yaz_database|yaz_element|yaz_errno|yaz_error|yaz_es|yaz_es_result|yaz_get_option|yaz_hits|yaz_itemorder|yaz_present|yaz_range|yaz_record|yaz_scan|yaz_scan_result|yaz_schema|yaz_search|yaz_set_option|yaz_sort|yaz_syntax|yaz_wait|yp_all|yp_cat|yp_err_string|yp_errno|yp_first|yp_get_default_domain|yp_master|yp_match|yp_next|yp_order|zend_logo_guid|zend_thread_id|zend_version|zip_close|zip_entry_close|zip_entry_compressedsize|zip_entry_compressionmethod|zip_entry_filesize|zip_entry_name|zip_entry_open|zip_entry_read|zip_open|zip_read|ziparchive|ziparchive_addemptydir|ziparchive_addfile|ziparchive_addfromstring|ziparchive_close|ziparchive_deleteindex|ziparchive_deletename|ziparchive_extractto|ziparchive_getarchivecomment|ziparchive_getcommentindex|ziparchive_getcommentname|ziparchive_getfromindex|ziparchive_getfromname|ziparchive_getnameindex|ziparchive_getstatusstring|ziparchive_getstream|ziparchive_locatename|ziparchive_open|ziparchive_renameindex|ziparchive_renamename|ziparchive_setCommentName|ziparchive_setarchivecomment|ziparchive_setcommentindex|ziparchive_statindex|ziparchive_statname|ziparchive_unchangeall|ziparchive_unchangearchive|ziparchive_unchangeindex|ziparchive_unchangename|zlib_get_coding_type".split("|")),b=e.arrayToMap("abstract|and|array|as|break|case|catch|class|clone|const|continue|declare|default|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|final|for|foreach|function|global|goto|if|implements|interface|instanceof|namespace|new|or|private|protected|public|static|switch|throw|try|use|var|while|xor".split("|")),c=e.arrayToMap("die|echo|empty|exit|eval|include|include_once|isset|list|require|require_once|return|print|unset".split("|")),d=e.arrayToMap("true|false|null|__CLASS__|__DIR__|__FILE__|__LINE__|__METHOD__|__FUNCTION__|__NAMESPACE__".split("|")),g=e.arrayToMap("$GLOBALS|$_SERVER|$_GET|$_POST|$_FILES|$_REQUEST|$_SESSION|$_ENV|$_COOKIE|$php_errormsg|$HTTP_RAW_POST_DATA|$http_response_header|$argc|$argv".split("|")),h=e.arrayToMap("key_exists|cairo_matrix_create_scale|cairo_matrix_create_translate|call_user_method|call_user_method_array|com_addref|com_get|com_invoke|com_isenum|com_load|com_release|com_set|connection_timeout|cubrid_load_from_glo|cubrid_new_glo|cubrid_save_to_glo|cubrid_send_glo|define_syslog_variables|dl|ereg|ereg_replace|eregi|eregi_replace|hw_documentattributes|hw_documentbodytag|hw_documentsize|hw_outputdocument|imagedashedline|maxdb_bind_param|maxdb_bind_result|maxdb_client_encoding|maxdb_close_long_data|maxdb_execute|maxdb_fetch|maxdb_get_metadata|maxdb_param_count|maxdb_send_long_data|mcrypt_ecb|mcrypt_generic_end|mime_content_type|mysql_createdb|mysql_dbname|mysql_db_query|mysql_drop_db|mysql_dropdb|mysql_escape_string|mysql_fieldflags|mysql_fieldflags|mysql_fieldname|mysql_fieldtable|mysql_fieldtype|mysql_freeresult|mysql_listdbs|mysql_list_fields|mysql_listfields|mysql_list_tables|mysql_listtables|mysql_numfields|mysql_numrows|mysql_selectdb|mysql_tablename|mysqli_bind_param|mysqli_bind_result|mysqli_disable_reads_from_master|mysqli_disable_rpl_parse|mysqli_enable_reads_from_master|mysqli_enable_rpl_parse|mysqli_execute|mysqli_fetch|mysqli_get_metadata|mysqli_master_query|mysqli_param_count|mysqli_rpl_parse_enabled|mysqli_rpl_probe|mysqli_rpl_query_type|mysqli_send_long_data|mysqli_send_query|mysqli_slave_query|ocibindbyname|ocicancel|ocicloselob|ocicollappend|ocicollassign|ocicollassignelem|ocicollgetelem|ocicollmax|ocicollsize|ocicolltrim|ocicolumnisnull|ocicolumnname|ocicolumnprecision|ocicolumnscale|ocicolumnsize|ocicolumntype|ocicolumntyperaw|ocicommit|ocidefinebyname|ocierror|ociexecute|ocifetch|ocifetchinto|ocifetchstatement|ocifreecollection|ocifreecursor|ocifreedesc|ocifreestatement|ociinternaldebug|ociloadlob|ocilogoff|ocilogon|ocinewcollection|ocinewcursor|ocinewdescriptor|ocinlogon|ocinumcols|ociparse|ociplogon|ociresult|ocirollback|ocirowcount|ocisavelob|ocisavelobfile|ociserverversion|ocisetprefetch|ocistatementtype|ociwritelobtofile|ociwritetemporarylob|PDF_add_annotation|PDF_add_bookmark|PDF_add_launchlink|PDF_add_locallink|PDF_add_note|PDF_add_outline|PDF_add_pdflink|PDF_add_weblink|PDF_attach_file|PDF_begin_page|PDF_begin_template|PDF_close_pdi|PDF_close|PDF_findfont|PDF_get_font|PDF_get_fontname|PDF_get_fontsize|PDF_get_image_height|PDF_get_image_width|PDF_get_majorversion|PDF_get_minorversion|PDF_get_pdi_parameter|PDF_get_pdi_value|PDF_open_ccitt|PDF_open_file|PDF_open_gif|PDF_open_image_file|PDF_open_image|PDF_open_jpeg|PDF_open_pdi|PDF_open_tiff|PDF_place_image|PDF_place_pdi_page|PDF_set_border_color|PDF_set_border_dash|PDF_set_border_style|PDF_set_char_spacing|PDF_set_duration|PDF_set_horiz_scaling|PDF_set_info_author|PDF_set_info_creator|PDF_set_info_keywords|PDF_set_info_subject|PDF_set_info_title|PDF_set_leading|PDF_set_text_matrix|PDF_set_text_rendering|PDF_set_text_rise|PDF_set_word_spacing|PDF_setgray_fill|PDF_setgray_stroke|PDF_setgray|PDF_setpolydash|PDF_setrgbcolor_fill|PDF_setrgbcolor_stroke|PDF_setrgbcolor|PDF_show_boxed|php_check_syntax|px_set_tablename|px_set_targetencoding|runkit_sandbox_output_handler|session_is_registered|session_register|session_unregisterset_magic_quotes_runtime|magic_quotes_runtime|set_socket_blocking|socket_set_blocking|set_socket_timeout|socket_set_timeout|split|spliti|sql_regcase".split("|")),i=e.arrayToMap("cfunction|old_function".split("|")),j=e.arrayToMap([]);this.$rules={start:[{token:"support",regex:"<\\?(?:php|\\=)"},{token:"support",regex:"\\?>"},{token:"comment",regex:"\\/\\/.*$"},{token:"comment",regex:"#.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/][gimy]*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language",regex:"\\b(?:DEFAULT_INCLUDE_PATH|E_(?:ALL|CO(?:MPILE_(?:ERROR|WARNING)|RE_(?:ERROR|WARNING))|ERROR|NOTICE|PARSE|STRICT|USER_(?:ERROR|NOTICE|WARNING)|WARNING)|P(?:EAR_(?:EXTENSION_DIR|INSTALL_DIR)|HP_(?:BINDIR|CONFIG_FILE_(?:PATH|SCAN_DIR)|DATADIR|E(?:OL|XTENSION_DIR)|INT_(?:MAX|SIZE)|L(?:IBDIR|OCALSTATEDIR)|O(?:S|UTPUT_HANDLER_(?:CONT|END|START))|PREFIX|S(?:API|HLIB_SUFFIX|YSCONFDIR)|VERSION))|__COMPILER_HALT_OFFSET__)\\b"},{token:"constant.language",regex:"\\b(?:A(?:B(?:DAY_(?:1|2|3|4|5|6|7)|MON_(?:1(?:0|1|2|)|2|3|4|5|6|7|8|9))|LT_DIGITS|M_STR|SSERT_(?:ACTIVE|BAIL|CALLBACK|QUIET_EVAL|WARNING))|C(?:ASE_(?:LOWER|UPPER)|HAR_MAX|O(?:DESET|NNECTION_(?:ABORTED|NORMAL|TIMEOUT)|UNT_(?:NORMAL|RECURSIVE))|R(?:EDITS_(?:ALL|DOCS|FULLPAGE|G(?:ENERAL|ROUP)|MODULES|QA|SAPI)|NCYSTR|YPT_(?:BLOWFISH|EXT_DES|MD5|S(?:ALT_LENGTH|TD_DES)))|URRENCY_SYMBOL)|D(?:AY_(?:1|2|3|4|5|6|7)|ECIMAL_POINT|IRECTORY_SEPARATOR|_(?:FMT|T_FMT))|E(?:NT_(?:COMPAT|NOQUOTES|QUOTES)|RA(?:_(?:D_(?:FMT|T_FMT)|T_FMT|YEAR)|)|XTR_(?:IF_EXISTS|OVERWRITE|PREFIX_(?:ALL|I(?:F_EXISTS|NVALID)|SAME)|SKIP))|FRAC_DIGITS|GROUPING|HTML_(?:ENTITIES|SPECIALCHARS)|IN(?:FO_(?:ALL|C(?:ONFIGURATION|REDITS)|ENVIRONMENT|GENERAL|LICENSE|MODULES|VARIABLES)|I_(?:ALL|PERDIR|SYSTEM|USER)|T_(?:CURR_SYMBOL|FRAC_DIGITS))|L(?:C_(?:ALL|C(?:OLLATE|TYPE)|M(?:ESSAGES|ONETARY)|NUMERIC|TIME)|O(?:CK_(?:EX|NB|SH|UN)|G_(?:A(?:LERT|UTH(?:PRIV|))|C(?:ONS|R(?:IT|ON))|D(?:AEMON|EBUG)|E(?:MERG|RR)|INFO|KERN|L(?:OCAL(?:0|1|2|3|4|5|6|7)|PR)|MAIL|N(?:DELAY|EWS|O(?:TICE|WAIT))|ODELAY|P(?:ERROR|ID)|SYSLOG|U(?:SER|UCP)|WARNING)))|M(?:ON_(?:1(?:0|1|2|)|2|3|4|5|6|7|8|9|DECIMAL_POINT|GROUPING|THOUSANDS_SEP)|_(?:1_PI|2_(?:PI|SQRTPI)|E|L(?:N(?:10|2)|OG(?:10E|2E))|PI(?:_(?:2|4)|)|SQRT(?:1_2|2)))|N(?:EGATIVE_SIGN|O(?:EXPR|STR)|_(?:CS_PRECEDES|S(?:EP_BY_SPACE|IGN_POSN)))|P(?:ATH(?:INFO_(?:BASENAME|DIRNAME|EXTENSION)|_SEPARATOR)|M_STR|OSITIVE_SIGN|_(?:CS_PRECEDES|S(?:EP_BY_SPACE|IGN_POSN)))|RADIXCHAR|S(?:EEK_(?:CUR|END|SET)|ORT_(?:ASC|DESC|NUMERIC|REGULAR|STRING)|TR_PAD_(?:BOTH|LEFT|RIGHT))|T(?:HOUS(?:ANDS_SEP|EP)|_FMT(?:_AMPM|))|YES(?:EXPR|STR)|STD(?:IN|OUT|ERR))\\b"},{token:function(e){if(i.hasOwnProperty(e))return"invalid.deprecated";if(b.hasOwnProperty(e))return"keyword";if(c.hasOwnProperty(e))return"keyword";if(d.hasOwnProperty(e))return"constant.language";if(g.hasOwnProperty(e))return"variable.language";if(j.hasOwnProperty(e))return"invalid.illegal";if(h.hasOwnProperty(e))return"invalid.deprecated";if(a.hasOwnProperty(e))return"support.function";if(e.match(/^(\$[a-zA-Z_][a-zA-Z0-9_]*|self|parent)$/))return"variable";return"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.PhpHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","pilot/oop","ace/mode/behaviour"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return!1;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}return!1}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}"){e.end.column++;return e}}return!1}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}return!1}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")"){e.end.column++;return e}}return!1}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return!1;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}return!1}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"'){e.end.column++;return e}}return!1})};d.inherits(f,e),b.CstyleBehaviour=f})
\ No newline at end of file
+define("ace/mode/php",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/php_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./php_highlight_rules").PhpHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("./behaviour/cstyle").CstyleBehaviour,k=a("./folding/cstyle").FoldMode,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new j,this.foldingRules=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[\:]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(l.prototype),b.Mode=l}),define("ace/mode/php_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=new f,b=e.arrayToMap("abs|acos|acosh|addcslashes|addslashes|aggregate|aggregate_info|aggregate_methods|aggregate_methods_by_list|aggregate_methods_by_regexp|aggregate_properties|aggregate_properties_by_list|aggregate_properties_by_regexp|aggregation_info|amqpconnection|amqpexchange|amqpqueue|apache_child_terminate|apache_get_modules|apache_get_version|apache_getenv|apache_lookup_uri|apache_note|apache_request_headers|apache_reset_timeout|apache_response_headers|apache_setenv|apc_add|apc_bin_dump|apc_bin_dumpfile|apc_bin_load|apc_bin_loadfile|apc_cache_info|apc_cas|apc_clear_cache|apc_compile_file|apc_dec|apc_define_constants|apc_delete|apc_delete_file|apc_exists|apc_fetch|apc_inc|apc_load_constants|apc_sma_info|apc_store|apciterator|apd_breakpoint|apd_callstack|apd_clunk|apd_continue|apd_croak|apd_dump_function_table|apd_dump_persistent_resources|apd_dump_regular_resources|apd_echo|apd_get_active_symbols|apd_set_pprof_trace|apd_set_session|apd_set_session_trace|apd_set_session_trace_socket|appenditerator|array|array_change_key_case|array_chunk|array_combine|array_count_values|array_diff|array_diff_assoc|array_diff_key|array_diff_uassoc|array_diff_ukey|array_fill|array_fill_keys|array_filter|array_flip|array_intersect|array_intersect_assoc|array_intersect_key|array_intersect_uassoc|array_intersect_ukey|array_key_exists|array_keys|array_map|array_merge|array_merge_recursive|array_multisort|array_pad|array_pop|array_product|array_push|array_rand|array_reduce|array_replace|array_replace_recursive|array_reverse|array_search|array_shift|array_slice|array_splice|array_sum|array_udiff|array_udiff_assoc|array_udiff_uassoc|array_uintersect|array_uintersect_assoc|array_uintersect_uassoc|array_unique|array_unshift|array_values|array_walk|array_walk_recursive|arrayaccess|arrayiterator|arrayobject|arsort|asin|asinh|asort|assert|assert_options|atan|atan2|atanh|audioproperties|badfunctioncallexception|badmethodcallexception|base64_decode|base64_encode|base_convert|basename|bbcode_add_element|bbcode_add_smiley|bbcode_create|bbcode_destroy|bbcode_parse|bbcode_set_arg_parser|bbcode_set_flags|bcadd|bccomp|bcdiv|bcmod|bcmul|bcompiler_load|bcompiler_load_exe|bcompiler_parse_class|bcompiler_read|bcompiler_write_class|bcompiler_write_constant|bcompiler_write_exe_footer|bcompiler_write_file|bcompiler_write_footer|bcompiler_write_function|bcompiler_write_functions_from_file|bcompiler_write_header|bcompiler_write_included_filename|bcpow|bcpowmod|bcscale|bcsqrt|bcsub|bin2hex|bind_textdomain_codeset|bindec|bindtextdomain|bson_decode|bson_encode|bumpValue|bzclose|bzcompress|bzdecompress|bzerrno|bzerror|bzerrstr|bzflush|bzopen|bzread|bzwrite|cachingiterator|cairo|cairo_create|cairo_font_face_get_type|cairo_font_face_status|cairo_font_options_create|cairo_font_options_equal|cairo_font_options_get_antialias|cairo_font_options_get_hint_metrics|cairo_font_options_get_hint_style|cairo_font_options_get_subpixel_order|cairo_font_options_hash|cairo_font_options_merge|cairo_font_options_set_antialias|cairo_font_options_set_hint_metrics|cairo_font_options_set_hint_style|cairo_font_options_set_subpixel_order|cairo_font_options_status|cairo_format_stride_for_width|cairo_image_surface_create|cairo_image_surface_create_for_data|cairo_image_surface_create_from_png|cairo_image_surface_get_data|cairo_image_surface_get_format|cairo_image_surface_get_height|cairo_image_surface_get_stride|cairo_image_surface_get_width|cairo_matrix_create_scale|cairo_matrix_create_translate|cairo_matrix_invert|cairo_matrix_multiply|cairo_matrix_rotate|cairo_matrix_transform_distance|cairo_matrix_transform_point|cairo_matrix_translate|cairo_pattern_add_color_stop_rgb|cairo_pattern_add_color_stop_rgba|cairo_pattern_create_for_surface|cairo_pattern_create_linear|cairo_pattern_create_radial|cairo_pattern_create_rgb|cairo_pattern_create_rgba|cairo_pattern_get_color_stop_count|cairo_pattern_get_color_stop_rgba|cairo_pattern_get_extend|cairo_pattern_get_filter|cairo_pattern_get_linear_points|cairo_pattern_get_matrix|cairo_pattern_get_radial_circles|cairo_pattern_get_rgba|cairo_pattern_get_surface|cairo_pattern_get_type|cairo_pattern_set_extend|cairo_pattern_set_filter|cairo_pattern_set_matrix|cairo_pattern_status|cairo_pdf_surface_create|cairo_pdf_surface_set_size|cairo_ps_get_levels|cairo_ps_level_to_string|cairo_ps_surface_create|cairo_ps_surface_dsc_begin_page_setup|cairo_ps_surface_dsc_begin_setup|cairo_ps_surface_dsc_comment|cairo_ps_surface_get_eps|cairo_ps_surface_restrict_to_level|cairo_ps_surface_set_eps|cairo_ps_surface_set_size|cairo_scaled_font_create|cairo_scaled_font_extents|cairo_scaled_font_get_ctm|cairo_scaled_font_get_font_face|cairo_scaled_font_get_font_matrix|cairo_scaled_font_get_font_options|cairo_scaled_font_get_scale_matrix|cairo_scaled_font_get_type|cairo_scaled_font_glyph_extents|cairo_scaled_font_status|cairo_scaled_font_text_extents|cairo_surface_copy_page|cairo_surface_create_similar|cairo_surface_finish|cairo_surface_flush|cairo_surface_get_content|cairo_surface_get_device_offset|cairo_surface_get_font_options|cairo_surface_get_type|cairo_surface_mark_dirty|cairo_surface_mark_dirty_rectangle|cairo_surface_set_device_offset|cairo_surface_set_fallback_resolution|cairo_surface_show_page|cairo_surface_status|cairo_surface_write_to_png|cairo_svg_surface_create|cairo_svg_surface_restrict_to_version|cairo_svg_version_to_string|cairoantialias|cairocontent|cairocontext|cairoexception|cairoextend|cairofillrule|cairofilter|cairofontface|cairofontoptions|cairofontslant|cairofonttype|cairofontweight|cairoformat|cairogradientpattern|cairohintmetrics|cairohintstyle|cairoimagesurface|cairolineargradient|cairolinecap|cairolinejoin|cairomatrix|cairooperator|cairopath|cairopattern|cairopatterntype|cairopdfsurface|cairopslevel|cairopssurface|cairoradialgradient|cairoscaledfont|cairosolidpattern|cairostatus|cairosubpixelorder|cairosurface|cairosurfacepattern|cairosurfacetype|cairosvgsurface|cairosvgversion|cairotoyfontface|cal_days_in_month|cal_from_jd|cal_info|cal_to_jd|calcul_hmac|calculhmac|call_user_func|call_user_func_array|call_user_method|call_user_method_array|callbackfilteriterator|ceil|chdb|chdb_create|chdir|checkdate|checkdnsrr|chgrp|chmod|chop|chown|chr|chroot|chunk_split|class_alias|class_exists|class_implements|class_parents|classkit_import|classkit_method_add|classkit_method_copy|classkit_method_redefine|classkit_method_remove|classkit_method_rename|clearstatcache|clone|closedir|closelog|collator|com|com_addref|com_create_guid|com_event_sink|com_get|com_get_active_object|com_invoke|com_isenum|com_load|com_load_typelib|com_message_pump|com_print_typeinfo|com_propget|com_propput|com_propset|com_release|com_set|compact|connection_aborted|connection_status|connection_timeout|constant|construct|construct|construct|convert_cyr_string|convert_uudecode|convert_uuencode|copy|cos|cosh|count|count_chars|countable|counter_bump|counter_bump_value|counter_create|counter_get|counter_get_meta|counter_get_named|counter_get_value|counter_reset|counter_reset_value|crack_check|crack_closedict|crack_getlastmessage|crack_opendict|crc32|create_function|crypt|ctype_alnum|ctype_alpha|ctype_cntrl|ctype_digit|ctype_graph|ctype_lower|ctype_print|ctype_punct|ctype_space|ctype_upper|ctype_xdigit|cubrid_affected_rows|cubrid_bind|cubrid_client_encoding|cubrid_close|cubrid_close_prepare|cubrid_close_request|cubrid_col_get|cubrid_col_size|cubrid_column_names|cubrid_column_types|cubrid_commit|cubrid_connect|cubrid_connect_with_url|cubrid_current_oid|cubrid_data_seek|cubrid_db_name|cubrid_disconnect|cubrid_drop|cubrid_errno|cubrid_error|cubrid_error_code|cubrid_error_code_facility|cubrid_error_msg|cubrid_execute|cubrid_fetch|cubrid_fetch_array|cubrid_fetch_assoc|cubrid_fetch_field|cubrid_fetch_lengths|cubrid_fetch_object|cubrid_fetch_row|cubrid_field_flags|cubrid_field_len|cubrid_field_name|cubrid_field_seek|cubrid_field_table|cubrid_field_type|cubrid_free_result|cubrid_get|cubrid_get_autocommit|cubrid_get_charset|cubrid_get_class_name|cubrid_get_client_info|cubrid_get_db_parameter|cubrid_get_server_info|cubrid_insert_id|cubrid_is_instance|cubrid_list_dbs|cubrid_load_from_glo|cubrid_lob_close|cubrid_lob_export|cubrid_lob_get|cubrid_lob_send|cubrid_lob_size|cubrid_lock_read|cubrid_lock_write|cubrid_move_cursor|cubrid_new_glo|cubrid_next_result|cubrid_num_cols|cubrid_num_fields|cubrid_num_rows|cubrid_ping|cubrid_prepare|cubrid_put|cubrid_query|cubrid_real_escape_string|cubrid_result|cubrid_rollback|cubrid_save_to_glo|cubrid_schema|cubrid_send_glo|cubrid_seq_drop|cubrid_seq_insert|cubrid_seq_put|cubrid_set_add|cubrid_set_autocommit|cubrid_set_db_parameter|cubrid_set_drop|cubrid_unbuffered_query|cubrid_version|curl_close|curl_copy_handle|curl_errno|curl_error|curl_exec|curl_getinfo|curl_init|curl_multi_add_handle|curl_multi_close|curl_multi_exec|curl_multi_getcontent|curl_multi_info_read|curl_multi_init|curl_multi_remove_handle|curl_multi_select|curl_setopt|curl_setopt_array|curl_version|current|cyrus_authenticate|cyrus_bind|cyrus_close|cyrus_connect|cyrus_query|cyrus_unbind|date|date_add|date_create|date_create_from_format|date_date_set|date_default_timezone_get|date_default_timezone_set|date_diff|date_format|date_get_last_errors|date_interval_create_from_date_string|date_interval_format|date_isodate_set|date_modify|date_offset_get|date_parse|date_parse_from_format|date_sub|date_sun_info|date_sunrise|date_sunset|date_time_set|date_timestamp_get|date_timestamp_set|date_timezone_get|date_timezone_set|dateinterval|dateperiod|datetime|datetimezone|db2_autocommit|db2_bind_param|db2_client_info|db2_close|db2_column_privileges|db2_columns|db2_commit|db2_conn_error|db2_conn_errormsg|db2_connect|db2_cursor_type|db2_escape_string|db2_exec|db2_execute|db2_fetch_array|db2_fetch_assoc|db2_fetch_both|db2_fetch_object|db2_fetch_row|db2_field_display_size|db2_field_name|db2_field_num|db2_field_precision|db2_field_scale|db2_field_type|db2_field_width|db2_foreign_keys|db2_free_result|db2_free_stmt|db2_get_option|db2_last_insert_id|db2_lob_read|db2_next_result|db2_num_fields|db2_num_rows|db2_pclose|db2_pconnect|db2_prepare|db2_primary_keys|db2_procedure_columns|db2_procedures|db2_result|db2_rollback|db2_server_info|db2_set_option|db2_special_columns|db2_statistics|db2_stmt_error|db2_stmt_errormsg|db2_table_privileges|db2_tables|dba_close|dba_delete|dba_exists|dba_fetch|dba_firstkey|dba_handlers|dba_insert|dba_key_split|dba_list|dba_nextkey|dba_open|dba_optimize|dba_popen|dba_replace|dba_sync|dbase_add_record|dbase_close|dbase_create|dbase_delete_record|dbase_get_header_info|dbase_get_record|dbase_get_record_with_names|dbase_numfields|dbase_numrecords|dbase_open|dbase_pack|dbase_replace_record|dbplus_add|dbplus_aql|dbplus_chdir|dbplus_close|dbplus_curr|dbplus_errcode|dbplus_errno|dbplus_find|dbplus_first|dbplus_flush|dbplus_freealllocks|dbplus_freelock|dbplus_freerlocks|dbplus_getlock|dbplus_getunique|dbplus_info|dbplus_last|dbplus_lockrel|dbplus_next|dbplus_open|dbplus_prev|dbplus_rchperm|dbplus_rcreate|dbplus_rcrtexact|dbplus_rcrtlike|dbplus_resolve|dbplus_restorepos|dbplus_rkeys|dbplus_ropen|dbplus_rquery|dbplus_rrename|dbplus_rsecindex|dbplus_runlink|dbplus_rzap|dbplus_savepos|dbplus_setindex|dbplus_setindexbynumber|dbplus_sql|dbplus_tcl|dbplus_tremove|dbplus_undo|dbplus_undoprepare|dbplus_unlockrel|dbplus_unselect|dbplus_update|dbplus_xlockrel|dbplus_xunlockrel|dbx_close|dbx_compare|dbx_connect|dbx_error|dbx_escape_string|dbx_fetch_row|dbx_query|dbx_sort|dcgettext|dcngettext|deaggregate|debug_backtrace|debug_print_backtrace|debug_zval_dump|decbin|dechex|decoct|define|define_syslog_variables|defined|deg2rad|delete|dgettext|die|dio_close|dio_fcntl|dio_open|dio_read|dio_seek|dio_stat|dio_tcsetattr|dio_truncate|dio_write|dir|directoryiterator|dirname|disk_free_space|disk_total_space|diskfreespace|dl|dngettext|dns_check_record|dns_get_mx|dns_get_record|dom_import_simplexml|domainexception|domattr|domattribute_name|domattribute_set_value|domattribute_specified|domattribute_value|domcharacterdata|domcomment|domdocument|domdocument_add_root|domdocument_create_attribute|domdocument_create_cdata_section|domdocument_create_comment|domdocument_create_element|domdocument_create_element_ns|domdocument_create_entity_reference|domdocument_create_processing_instruction|domdocument_create_text_node|domdocument_doctype|domdocument_document_element|domdocument_dump_file|domdocument_dump_mem|domdocument_get_element_by_id|domdocument_get_elements_by_tagname|domdocument_html_dump_mem|domdocument_xinclude|domdocumentfragment|domdocumenttype|domdocumenttype_entities|domdocumenttype_internal_subset|domdocumenttype_name|domdocumenttype_notations|domdocumenttype_public_id|domdocumenttype_system_id|domelement|domelement_get_attribute|domelement_get_attribute_node|domelement_get_elements_by_tagname|domelement_has_attribute|domelement_remove_attribute|domelement_set_attribute|domelement_set_attribute_node|domelement_tagname|domentity|domentityreference|domexception|domimplementation|domnamednodemap|domnode|domnode_add_namespace|domnode_append_child|domnode_append_sibling|domnode_attributes|domnode_child_nodes|domnode_clone_node|domnode_dump_node|domnode_first_child|domnode_get_content|domnode_has_attributes|domnode_has_child_nodes|domnode_insert_before|domnode_is_blank_node|domnode_last_child|domnode_next_sibling|domnode_node_name|domnode_node_type|domnode_node_value|domnode_owner_document|domnode_parent_node|domnode_prefix|domnode_previous_sibling|domnode_remove_child|domnode_replace_child|domnode_replace_node|domnode_set_content|domnode_set_name|domnode_set_namespace|domnode_unlink_node|domnodelist|domnotation|domprocessinginstruction|domprocessinginstruction_data|domprocessinginstruction_target|domtext|domxml_new_doc|domxml_open_file|domxml_open_mem|domxml_version|domxml_xmltree|domxml_xslt_stylesheet|domxml_xslt_stylesheet_doc|domxml_xslt_stylesheet_file|domxml_xslt_version|domxpath|domxsltstylesheet_process|domxsltstylesheet_result_dump_file|domxsltstylesheet_result_dump_mem|dotnet|dotnet_load|doubleval|each|easter_date|easter_days|echo|empty|emptyiterator|enchant_broker_describe|enchant_broker_dict_exists|enchant_broker_free|enchant_broker_free_dict|enchant_broker_get_error|enchant_broker_init|enchant_broker_list_dicts|enchant_broker_request_dict|enchant_broker_request_pwl_dict|enchant_broker_set_ordering|enchant_dict_add_to_personal|enchant_dict_add_to_session|enchant_dict_check|enchant_dict_describe|enchant_dict_get_error|enchant_dict_is_in_session|enchant_dict_quick_check|enchant_dict_store_replacement|enchant_dict_suggest|end|ereg|ereg_replace|eregi|eregi_replace|error_get_last|error_log|error_reporting|errorexception|escapeshellarg|escapeshellcmd|eval|event_add|event_base_free|event_base_loop|event_base_loopbreak|event_base_loopexit|event_base_new|event_base_priority_init|event_base_set|event_buffer_base_set|event_buffer_disable|event_buffer_enable|event_buffer_fd_set|event_buffer_free|event_buffer_new|event_buffer_priority_set|event_buffer_read|event_buffer_set_callback|event_buffer_timeout_set|event_buffer_watermark_set|event_buffer_write|event_del|event_free|event_new|event_set|exception|exec|exif_imagetype|exif_read_data|exif_tagname|exif_thumbnail|exit|exp|expect_expectl|expect_popen|explode|expm1|export|export|extension_loaded|extract|ezmlm_hash|fam_cancel_monitor|fam_close|fam_monitor_collection|fam_monitor_directory|fam_monitor_file|fam_next_event|fam_open|fam_pending|fam_resume_monitor|fam_suspend_monitor|fbsql_affected_rows|fbsql_autocommit|fbsql_blob_size|fbsql_change_user|fbsql_clob_size|fbsql_close|fbsql_commit|fbsql_connect|fbsql_create_blob|fbsql_create_clob|fbsql_create_db|fbsql_data_seek|fbsql_database|fbsql_database_password|fbsql_db_query|fbsql_db_status|fbsql_drop_db|fbsql_errno|fbsql_error|fbsql_fetch_array|fbsql_fetch_assoc|fbsql_fetch_field|fbsql_fetch_lengths|fbsql_fetch_object|fbsql_fetch_row|fbsql_field_flags|fbsql_field_len|fbsql_field_name|fbsql_field_seek|fbsql_field_table|fbsql_field_type|fbsql_free_result|fbsql_get_autostart_info|fbsql_hostname|fbsql_insert_id|fbsql_list_dbs|fbsql_list_fields|fbsql_list_tables|fbsql_next_result|fbsql_num_fields|fbsql_num_rows|fbsql_password|fbsql_pconnect|fbsql_query|fbsql_read_blob|fbsql_read_clob|fbsql_result|fbsql_rollback|fbsql_rows_fetched|fbsql_select_db|fbsql_set_characterset|fbsql_set_lob_mode|fbsql_set_password|fbsql_set_transaction|fbsql_start_db|fbsql_stop_db|fbsql_table_name|fbsql_tablename|fbsql_username|fbsql_warnings|fclose|fdf_add_doc_javascript|fdf_add_template|fdf_close|fdf_create|fdf_enum_values|fdf_errno|fdf_error|fdf_get_ap|fdf_get_attachment|fdf_get_encoding|fdf_get_file|fdf_get_flags|fdf_get_opt|fdf_get_status|fdf_get_value|fdf_get_version|fdf_header|fdf_next_field_name|fdf_open|fdf_open_string|fdf_remove_item|fdf_save|fdf_save_string|fdf_set_ap|fdf_set_encoding|fdf_set_file|fdf_set_flags|fdf_set_javascript_action|fdf_set_on_import_javascript|fdf_set_opt|fdf_set_status|fdf_set_submit_form_action|fdf_set_target_frame|fdf_set_value|fdf_set_version|feof|fflush|fgetc|fgetcsv|fgets|fgetss|file|file_exists|file_get_contents|file_put_contents|fileatime|filectime|filegroup|fileinode|filemtime|fileowner|fileperms|filepro|filepro_fieldcount|filepro_fieldname|filepro_fieldtype|filepro_fieldwidth|filepro_retrieve|filepro_rowcount|filesize|filesystemiterator|filetype|filter_has_var|filter_id|filter_input|filter_input_array|filter_list|filter_var|filter_var_array|filteriterator|finfo_buffer|finfo_close|finfo_file|finfo_open|finfo_set_flags|floatval|flock|floor|flush|fmod|fnmatch|fopen|forward_static_call|forward_static_call_array|fpassthru|fprintf|fputcsv|fputs|fread|frenchtojd|fribidi_log2vis|fscanf|fseek|fsockopen|fstat|ftell|ftok|ftp_alloc|ftp_cdup|ftp_chdir|ftp_chmod|ftp_close|ftp_connect|ftp_delete|ftp_exec|ftp_fget|ftp_fput|ftp_get|ftp_get_option|ftp_login|ftp_mdtm|ftp_mkdir|ftp_nb_continue|ftp_nb_fget|ftp_nb_fput|ftp_nb_get|ftp_nb_put|ftp_nlist|ftp_pasv|ftp_put|ftp_pwd|ftp_quit|ftp_raw|ftp_rawlist|ftp_rename|ftp_rmdir|ftp_set_option|ftp_site|ftp_size|ftp_ssl_connect|ftp_systype|ftruncate|func_get_arg|func_get_args|func_num_args|function_exists|fwrite|gc_collect_cycles|gc_disable|gc_enable|gc_enabled|gd_info|gearmanclient|gearmanjob|gearmantask|gearmanworker|geoip_continent_code_by_name|geoip_country_code3_by_name|geoip_country_code_by_name|geoip_country_name_by_name|geoip_database_info|geoip_db_avail|geoip_db_filename|geoip_db_get_all_info|geoip_id_by_name|geoip_isp_by_name|geoip_org_by_name|geoip_record_by_name|geoip_region_by_name|geoip_region_name_by_code|geoip_time_zone_by_country_and_region|getMeta|getNamed|getValue|get_browser|get_called_class|get_cfg_var|get_class|get_class_methods|get_class_vars|get_current_user|get_declared_classes|get_declared_interfaces|get_defined_constants|get_defined_functions|get_defined_vars|get_extension_funcs|get_headers|get_html_translation_table|get_include_path|get_included_files|get_loaded_extensions|get_magic_quotes_gpc|get_magic_quotes_runtime|get_meta_tags|get_object_vars|get_parent_class|get_required_files|get_resource_type|getallheaders|getconstant|getconstants|getconstructor|getcwd|getdate|getdefaultproperties|getdoccomment|getendline|getenv|getextension|getextensionname|getfilename|gethostbyaddr|gethostbyname|gethostbynamel|gethostname|getimagesize|getinterfacenames|getinterfaces|getlastmod|getmethod|getmethods|getmodifiers|getmxrr|getmygid|getmyinode|getmypid|getmyuid|getname|getnamespacename|getopt|getparentclass|getproperties|getproperty|getprotobyname|getprotobynumber|getrandmax|getrusage|getservbyname|getservbyport|getshortname|getstartline|getstaticproperties|getstaticpropertyvalue|gettext|gettimeofday|gettype|glob|globiterator|gmagick|gmagickdraw|gmagickpixel|gmdate|gmmktime|gmp_abs|gmp_add|gmp_and|gmp_clrbit|gmp_cmp|gmp_com|gmp_div|gmp_div_q|gmp_div_qr|gmp_div_r|gmp_divexact|gmp_fact|gmp_gcd|gmp_gcdext|gmp_hamdist|gmp_init|gmp_intval|gmp_invert|gmp_jacobi|gmp_legendre|gmp_mod|gmp_mul|gmp_neg|gmp_nextprime|gmp_or|gmp_perfect_square|gmp_popcount|gmp_pow|gmp_powm|gmp_prob_prime|gmp_random|gmp_scan0|gmp_scan1|gmp_setbit|gmp_sign|gmp_sqrt|gmp_sqrtrem|gmp_strval|gmp_sub|gmp_testbit|gmp_xor|gmstrftime|gnupg_adddecryptkey|gnupg_addencryptkey|gnupg_addsignkey|gnupg_cleardecryptkeys|gnupg_clearencryptkeys|gnupg_clearsignkeys|gnupg_decrypt|gnupg_decryptverify|gnupg_encrypt|gnupg_encryptsign|gnupg_export|gnupg_geterror|gnupg_getprotocol|gnupg_import|gnupg_init|gnupg_keyinfo|gnupg_setarmor|gnupg_seterrormode|gnupg_setsignmode|gnupg_sign|gnupg_verify|gopher_parsedir|grapheme_extract|grapheme_stripos|grapheme_stristr|grapheme_strlen|grapheme_strpos|grapheme_strripos|grapheme_strrpos|grapheme_strstr|grapheme_substr|gregoriantojd|gupnp_context_get_host_ip|gupnp_context_get_port|gupnp_context_get_subscription_timeout|gupnp_context_host_path|gupnp_context_new|gupnp_context_set_subscription_timeout|gupnp_context_timeout_add|gupnp_context_unhost_path|gupnp_control_point_browse_start|gupnp_control_point_browse_stop|gupnp_control_point_callback_set|gupnp_control_point_new|gupnp_device_action_callback_set|gupnp_device_info_get|gupnp_device_info_get_service|gupnp_root_device_get_available|gupnp_root_device_get_relative_location|gupnp_root_device_new|gupnp_root_device_set_available|gupnp_root_device_start|gupnp_root_device_stop|gupnp_service_action_get|gupnp_service_action_return|gupnp_service_action_return_error|gupnp_service_action_set|gupnp_service_freeze_notify|gupnp_service_info_get|gupnp_service_info_get_introspection|gupnp_service_introspection_get_state_variable|gupnp_service_notify|gupnp_service_proxy_action_get|gupnp_service_proxy_action_set|gupnp_service_proxy_add_notify|gupnp_service_proxy_callback_set|gupnp_service_proxy_get_subscribed|gupnp_service_proxy_remove_notify|gupnp_service_proxy_set_subscribed|gupnp_service_thaw_notify|gzclose|gzcompress|gzdecode|gzdeflate|gzencode|gzeof|gzfile|gzgetc|gzgets|gzgetss|gzinflate|gzopen|gzpassthru|gzputs|gzread|gzrewind|gzseek|gztell|gzuncompress|gzwrite|halt_compiler|haruannotation|haruannotation_setborderstyle|haruannotation_sethighlightmode|haruannotation_seticon|haruannotation_setopened|harudestination|harudestination_setfit|harudestination_setfitb|harudestination_setfitbh|harudestination_setfitbv|harudestination_setfith|harudestination_setfitr|harudestination_setfitv|harudestination_setxyz|harudoc|harudoc_addpage|harudoc_addpagelabel|harudoc_construct|harudoc_createoutline|harudoc_getcurrentencoder|harudoc_getcurrentpage|harudoc_getencoder|harudoc_getfont|harudoc_getinfoattr|harudoc_getpagelayout|harudoc_getpagemode|harudoc_getstreamsize|harudoc_insertpage|harudoc_loadjpeg|harudoc_loadpng|harudoc_loadraw|harudoc_loadttc|harudoc_loadttf|harudoc_loadtype1|harudoc_output|harudoc_readfromstream|harudoc_reseterror|harudoc_resetstream|harudoc_save|harudoc_savetostream|harudoc_setcompressionmode|harudoc_setcurrentencoder|harudoc_setencryptionmode|harudoc_setinfoattr|harudoc_setinfodateattr|harudoc_setopenaction|harudoc_setpagelayout|harudoc_setpagemode|harudoc_setpagesconfiguration|harudoc_setpassword|harudoc_setpermission|harudoc_usecnsencodings|harudoc_usecnsfonts|harudoc_usecntencodings|harudoc_usecntfonts|harudoc_usejpencodings|harudoc_usejpfonts|harudoc_usekrencodings|harudoc_usekrfonts|haruencoder|haruencoder_getbytetype|haruencoder_gettype|haruencoder_getunicode|haruencoder_getwritingmode|haruexception|harufont|harufont_getascent|harufont_getcapheight|harufont_getdescent|harufont_getencodingname|harufont_getfontname|harufont_gettextwidth|harufont_getunicodewidth|harufont_getxheight|harufont_measuretext|haruimage|haruimage_getbitspercomponent|haruimage_getcolorspace|haruimage_getheight|haruimage_getsize|haruimage_getwidth|haruimage_setcolormask|haruimage_setmaskimage|haruoutline|haruoutline_setdestination|haruoutline_setopened|harupage|harupage_arc|harupage_begintext|harupage_circle|harupage_closepath|harupage_concat|harupage_createdestination|harupage_createlinkannotation|harupage_createtextannotation|harupage_createurlannotation|harupage_curveto|harupage_curveto2|harupage_curveto3|harupage_drawimage|harupage_ellipse|harupage_endpath|harupage_endtext|harupage_eofill|harupage_eofillstroke|harupage_fill|harupage_fillstroke|harupage_getcharspace|harupage_getcmykfill|harupage_getcmykstroke|harupage_getcurrentfont|harupage_getcurrentfontsize|harupage_getcurrentpos|harupage_getcurrenttextpos|harupage_getdash|harupage_getfillingcolorspace|harupage_getflatness|harupage_getgmode|harupage_getgrayfill|harupage_getgraystroke|harupage_getheight|harupage_gethorizontalscaling|harupage_getlinecap|harupage_getlinejoin|harupage_getlinewidth|harupage_getmiterlimit|harupage_getrgbfill|harupage_getrgbstroke|harupage_getstrokingcolorspace|harupage_gettextleading|harupage_gettextmatrix|harupage_gettextrenderingmode|harupage_gettextrise|harupage_gettextwidth|harupage_gettransmatrix|harupage_getwidth|harupage_getwordspace|harupage_lineto|harupage_measuretext|harupage_movetextpos|harupage_moveto|harupage_movetonextline|harupage_rectangle|harupage_setcharspace|harupage_setcmykfill|harupage_setcmykstroke|harupage_setdash|harupage_setflatness|harupage_setfontandsize|harupage_setgrayfill|harupage_setgraystroke|harupage_setheight|harupage_sethorizontalscaling|harupage_setlinecap|harupage_setlinejoin|harupage_setlinewidth|harupage_setmiterlimit|harupage_setrgbfill|harupage_setrgbstroke|harupage_setrotate|harupage_setsize|harupage_setslideshow|harupage_settextleading|harupage_settextmatrix|harupage_settextrenderingmode|harupage_settextrise|harupage_setwidth|harupage_setwordspace|harupage_showtext|harupage_showtextnextline|harupage_stroke|harupage_textout|harupage_textrect|hasconstant|hash|hash_algos|hash_copy|hash_file|hash_final|hash_hmac|hash_hmac_file|hash_init|hash_update|hash_update_file|hash_update_stream|hasmethod|hasproperty|header|header_register_callback|header_remove|headers_list|headers_sent|hebrev|hebrevc|hex2bin|hexdec|highlight_file|highlight_string|html_entity_decode|htmlentities|htmlspecialchars|htmlspecialchars_decode|http_build_cookie|http_build_query|http_build_str|http_build_url|http_cache_etag|http_cache_last_modified|http_chunked_decode|http_date|http_deflate|http_get|http_get_request_body|http_get_request_body_stream|http_get_request_headers|http_head|http_inflate|http_match_etag|http_match_modified|http_match_request_header|http_negotiate_charset|http_negotiate_content_type|http_negotiate_language|http_parse_cookie|http_parse_headers|http_parse_message|http_parse_params|http_persistent_handles_clean|http_persistent_handles_count|http_persistent_handles_ident|http_post_data|http_post_fields|http_put_data|http_put_file|http_put_stream|http_redirect|http_request|http_request_body_encode|http_request_method_exists|http_request_method_name|http_request_method_register|http_request_method_unregister|http_response_code|http_send_content_disposition|http_send_content_type|http_send_data|http_send_file|http_send_last_modified|http_send_status|http_send_stream|http_support|http_throttle|httpdeflatestream|httpdeflatestream_construct|httpdeflatestream_factory|httpdeflatestream_finish|httpdeflatestream_flush|httpdeflatestream_update|httpinflatestream|httpinflatestream_construct|httpinflatestream_factory|httpinflatestream_finish|httpinflatestream_flush|httpinflatestream_update|httpmessage|httpmessage_addheaders|httpmessage_construct|httpmessage_detach|httpmessage_factory|httpmessage_fromenv|httpmessage_fromstring|httpmessage_getbody|httpmessage_getheader|httpmessage_getheaders|httpmessage_gethttpversion|httpmessage_getparentmessage|httpmessage_getrequestmethod|httpmessage_getrequesturl|httpmessage_getresponsecode|httpmessage_getresponsestatus|httpmessage_gettype|httpmessage_guesscontenttype|httpmessage_prepend|httpmessage_reverse|httpmessage_send|httpmessage_setbody|httpmessage_setheaders|httpmessage_sethttpversion|httpmessage_setrequestmethod|httpmessage_setrequesturl|httpmessage_setresponsecode|httpmessage_setresponsestatus|httpmessage_settype|httpmessage_tomessagetypeobject|httpmessage_tostring|httpquerystring|httpquerystring_construct|httpquerystring_get|httpquerystring_mod|httpquerystring_set|httpquerystring_singleton|httpquerystring_toarray|httpquerystring_tostring|httpquerystring_xlate|httprequest|httprequest_addcookies|httprequest_addheaders|httprequest_addpostfields|httprequest_addpostfile|httprequest_addputdata|httprequest_addquerydata|httprequest_addrawpostdata|httprequest_addssloptions|httprequest_clearhistory|httprequest_construct|httprequest_enablecookies|httprequest_getcontenttype|httprequest_getcookies|httprequest_getheaders|httprequest_gethistory|httprequest_getmethod|httprequest_getoptions|httprequest_getpostfields|httprequest_getpostfiles|httprequest_getputdata|httprequest_getputfile|httprequest_getquerydata|httprequest_getrawpostdata|httprequest_getrawrequestmessage|httprequest_getrawresponsemessage|httprequest_getrequestmessage|httprequest_getresponsebody|httprequest_getresponsecode|httprequest_getresponsecookies|httprequest_getresponsedata|httprequest_getresponseheader|httprequest_getresponseinfo|httprequest_getresponsemessage|httprequest_getresponsestatus|httprequest_getssloptions|httprequest_geturl|httprequest_resetcookies|httprequest_send|httprequest_setcontenttype|httprequest_setcookies|httprequest_setheaders|httprequest_setmethod|httprequest_setoptions|httprequest_setpostfields|httprequest_setpostfiles|httprequest_setputdata|httprequest_setputfile|httprequest_setquerydata|httprequest_setrawpostdata|httprequest_setssloptions|httprequest_seturl|httprequestpool|httprequestpool_attach|httprequestpool_construct|httprequestpool_destruct|httprequestpool_detach|httprequestpool_getattachedrequests|httprequestpool_getfinishedrequests|httprequestpool_reset|httprequestpool_send|httprequestpool_socketperform|httprequestpool_socketselect|httpresponse|httpresponse_capture|httpresponse_getbuffersize|httpresponse_getcache|httpresponse_getcachecontrol|httpresponse_getcontentdisposition|httpresponse_getcontenttype|httpresponse_getdata|httpresponse_getetag|httpresponse_getfile|httpresponse_getgzip|httpresponse_getheader|httpresponse_getlastmodified|httpresponse_getrequestbody|httpresponse_getrequestbodystream|httpresponse_getrequestheaders|httpresponse_getstream|httpresponse_getthrottledelay|httpresponse_guesscontenttype|httpresponse_redirect|httpresponse_send|httpresponse_setbuffersize|httpresponse_setcache|httpresponse_setcachecontrol|httpresponse_setcontentdisposition|httpresponse_setcontenttype|httpresponse_setdata|httpresponse_setetag|httpresponse_setfile|httpresponse_setgzip|httpresponse_setheader|httpresponse_setlastmodified|httpresponse_setstream|httpresponse_setthrottledelay|httpresponse_status|hw_array2objrec|hw_changeobject|hw_children|hw_childrenobj|hw_close|hw_connect|hw_connection_info|hw_cp|hw_deleteobject|hw_docbyanchor|hw_docbyanchorobj|hw_document_attributes|hw_document_bodytag|hw_document_content|hw_document_setcontent|hw_document_size|hw_dummy|hw_edittext|hw_error|hw_errormsg|hw_free_document|hw_getanchors|hw_getanchorsobj|hw_getandlock|hw_getchildcoll|hw_getchildcollobj|hw_getchilddoccoll|hw_getchilddoccollobj|hw_getobject|hw_getobjectbyquery|hw_getobjectbyquerycoll|hw_getobjectbyquerycollobj|hw_getobjectbyqueryobj|hw_getparents|hw_getparentsobj|hw_getrellink|hw_getremote|hw_getremotechildren|hw_getsrcbydestobj|hw_gettext|hw_getusername|hw_identify|hw_incollections|hw_info|hw_inscoll|hw_insdoc|hw_insertanchors|hw_insertdocument|hw_insertobject|hw_mapid|hw_modifyobject|hw_mv|hw_new_document|hw_objrec2array|hw_output_document|hw_pconnect|hw_pipedocument|hw_root|hw_setlinkroot|hw_stat|hw_unlock|hw_who|hwapi_attribute|hwapi_attribute_key|hwapi_attribute_langdepvalue|hwapi_attribute_value|hwapi_attribute_values|hwapi_checkin|hwapi_checkout|hwapi_children|hwapi_content|hwapi_content_mimetype|hwapi_content_read|hwapi_copy|hwapi_dbstat|hwapi_dcstat|hwapi_dstanchors|hwapi_dstofsrcanchor|hwapi_error_count|hwapi_error_reason|hwapi_find|hwapi_ftstat|hwapi_hgcsp|hwapi_hwstat|hwapi_identify|hwapi_info|hwapi_insert|hwapi_insertanchor|hwapi_insertcollection|hwapi_insertdocument|hwapi_link|hwapi_lock|hwapi_move|hwapi_new_content|hwapi_object|hwapi_object_assign|hwapi_object_attreditable|hwapi_object_count|hwapi_object_insert|hwapi_object_new|hwapi_object_remove|hwapi_object_title|hwapi_object_value|hwapi_objectbyanchor|hwapi_parents|hwapi_reason_description|hwapi_reason_type|hwapi_remove|hwapi_replace|hwapi_setcommittedversion|hwapi_srcanchors|hwapi_srcsofdst|hwapi_unlock|hwapi_user|hwapi_userlist|hypot|ibase_add_user|ibase_affected_rows|ibase_backup|ibase_blob_add|ibase_blob_cancel|ibase_blob_close|ibase_blob_create|ibase_blob_echo|ibase_blob_get|ibase_blob_import|ibase_blob_info|ibase_blob_open|ibase_close|ibase_commit|ibase_commit_ret|ibase_connect|ibase_db_info|ibase_delete_user|ibase_drop_db|ibase_errcode|ibase_errmsg|ibase_execute|ibase_fetch_assoc|ibase_fetch_object|ibase_fetch_row|ibase_field_info|ibase_free_event_handler|ibase_free_query|ibase_free_result|ibase_gen_id|ibase_maintain_db|ibase_modify_user|ibase_name_result|ibase_num_fields|ibase_num_params|ibase_param_info|ibase_pconnect|ibase_prepare|ibase_query|ibase_restore|ibase_rollback|ibase_rollback_ret|ibase_server_info|ibase_service_attach|ibase_service_detach|ibase_set_event_handler|ibase_timefmt|ibase_trans|ibase_wait_event|iconv|iconv_get_encoding|iconv_mime_decode|iconv_mime_decode_headers|iconv_mime_encode|iconv_set_encoding|iconv_strlen|iconv_strpos|iconv_strrpos|iconv_substr|id3_get_frame_long_name|id3_get_frame_short_name|id3_get_genre_id|id3_get_genre_list|id3_get_genre_name|id3_get_tag|id3_get_version|id3_remove_tag|id3_set_tag|id3v2attachedpictureframe|id3v2frame|id3v2tag|idate|idn_to_ascii|idn_to_unicode|idn_to_utf8|ifx_affected_rows|ifx_blobinfile_mode|ifx_byteasvarchar|ifx_close|ifx_connect|ifx_copy_blob|ifx_create_blob|ifx_create_char|ifx_do|ifx_error|ifx_errormsg|ifx_fetch_row|ifx_fieldproperties|ifx_fieldtypes|ifx_free_blob|ifx_free_char|ifx_free_result|ifx_get_blob|ifx_get_char|ifx_getsqlca|ifx_htmltbl_result|ifx_nullformat|ifx_num_fields|ifx_num_rows|ifx_pconnect|ifx_prepare|ifx_query|ifx_textasvarchar|ifx_update_blob|ifx_update_char|ifxus_close_slob|ifxus_create_slob|ifxus_free_slob|ifxus_open_slob|ifxus_read_slob|ifxus_seek_slob|ifxus_tell_slob|ifxus_write_slob|ignore_user_abort|iis_add_server|iis_get_dir_security|iis_get_script_map|iis_get_server_by_comment|iis_get_server_by_path|iis_get_server_rights|iis_get_service_state|iis_remove_server|iis_set_app_settings|iis_set_dir_security|iis_set_script_map|iis_set_server_rights|iis_start_server|iis_start_service|iis_stop_server|iis_stop_service|image2wbmp|image_type_to_extension|image_type_to_mime_type|imagealphablending|imageantialias|imagearc|imagechar|imagecharup|imagecolorallocate|imagecolorallocatealpha|imagecolorat|imagecolorclosest|imagecolorclosestalpha|imagecolorclosesthwb|imagecolordeallocate|imagecolorexact|imagecolorexactalpha|imagecolormatch|imagecolorresolve|imagecolorresolvealpha|imagecolorset|imagecolorsforindex|imagecolorstotal|imagecolortransparent|imageconvolution|imagecopy|imagecopymerge|imagecopymergegray|imagecopyresampled|imagecopyresized|imagecreate|imagecreatefromgd|imagecreatefromgd2|imagecreatefromgd2part|imagecreatefromgif|imagecreatefromjpeg|imagecreatefrompng|imagecreatefromstring|imagecreatefromwbmp|imagecreatefromxbm|imagecreatefromxpm|imagecreatetruecolor|imagedashedline|imagedestroy|imageellipse|imagefill|imagefilledarc|imagefilledellipse|imagefilledpolygon|imagefilledrectangle|imagefilltoborder|imagefilter|imagefontheight|imagefontwidth|imageftbbox|imagefttext|imagegammacorrect|imagegd|imagegd2|imagegif|imagegrabscreen|imagegrabwindow|imageinterlace|imageistruecolor|imagejpeg|imagelayereffect|imageline|imageloadfont|imagepalettecopy|imagepng|imagepolygon|imagepsbbox|imagepsencodefont|imagepsextendfont|imagepsfreefont|imagepsloadfont|imagepsslantfont|imagepstext|imagerectangle|imagerotate|imagesavealpha|imagesetbrush|imagesetpixel|imagesetstyle|imagesetthickness|imagesettile|imagestring|imagestringup|imagesx|imagesy|imagetruecolortopalette|imagettfbbox|imagettftext|imagetypes|imagewbmp|imagexbm|imagick|imagick_adaptiveblurimage|imagick_adaptiveresizeimage|imagick_adaptivesharpenimage|imagick_adaptivethresholdimage|imagick_addimage|imagick_addnoiseimage|imagick_affinetransformimage|imagick_animateimages|imagick_annotateimage|imagick_appendimages|imagick_averageimages|imagick_blackthresholdimage|imagick_blurimage|imagick_borderimage|imagick_charcoalimage|imagick_chopimage|imagick_clear|imagick_clipimage|imagick_clippathimage|imagick_clone|imagick_clutimage|imagick_coalesceimages|imagick_colorfloodfillimage|imagick_colorizeimage|imagick_combineimages|imagick_commentimage|imagick_compareimagechannels|imagick_compareimagelayers|imagick_compareimages|imagick_compositeimage|imagick_construct|imagick_contrastimage|imagick_contraststretchimage|imagick_convolveimage|imagick_cropimage|imagick_cropthumbnailimage|imagick_current|imagick_cyclecolormapimage|imagick_decipherimage|imagick_deconstructimages|imagick_deleteimageartifact|imagick_despeckleimage|imagick_destroy|imagick_displayimage|imagick_displayimages|imagick_distortimage|imagick_drawimage|imagick_edgeimage|imagick_embossimage|imagick_encipherimage|imagick_enhanceimage|imagick_equalizeimage|imagick_evaluateimage|imagick_extentimage|imagick_flattenimages|imagick_flipimage|imagick_floodfillpaintimage|imagick_flopimage|imagick_frameimage|imagick_fximage|imagick_gammaimage|imagick_gaussianblurimage|imagick_getcolorspace|imagick_getcompression|imagick_getcompressionquality|imagick_getcopyright|imagick_getfilename|imagick_getfont|imagick_getformat|imagick_getgravity|imagick_gethomeurl|imagick_getimage|imagick_getimagealphachannel|imagick_getimageartifact|imagick_getimagebackgroundcolor|imagick_getimageblob|imagick_getimageblueprimary|imagick_getimagebordercolor|imagick_getimagechanneldepth|imagick_getimagechanneldistortion|imagick_getimagechanneldistortions|imagick_getimagechannelextrema|imagick_getimagechannelmean|imagick_getimagechannelrange|imagick_getimagechannelstatistics|imagick_getimageclipmask|imagick_getimagecolormapcolor|imagick_getimagecolors|imagick_getimagecolorspace|imagick_getimagecompose|imagick_getimagecompression|imagick_getimagecompressionquality|imagick_getimagedelay|imagick_getimagedepth|imagick_getimagedispose|imagick_getimagedistortion|imagick_getimageextrema|imagick_getimagefilename|imagick_getimageformat|imagick_getimagegamma|imagick_getimagegeometry|imagick_getimagegravity|imagick_getimagegreenprimary|imagick_getimageheight|imagick_getimagehistogram|imagick_getimageindex|imagick_getimageinterlacescheme|imagick_getimageinterpolatemethod|imagick_getimageiterations|imagick_getimagelength|imagick_getimagemagicklicense|imagick_getimagematte|imagick_getimagemattecolor|imagick_getimageorientation|imagick_getimagepage|imagick_getimagepixelcolor|imagick_getimageprofile|imagick_getimageprofiles|imagick_getimageproperties|imagick_getimageproperty|imagick_getimageredprimary|imagick_getimageregion|imagick_getimagerenderingintent|imagick_getimageresolution|imagick_getimagesblob|imagick_getimagescene|imagick_getimagesignature|imagick_getimagesize|imagick_getimagetickspersecond|imagick_getimagetotalinkdensity|imagick_getimagetype|imagick_getimageunits|imagick_getimagevirtualpixelmethod|imagick_getimagewhitepoint|imagick_getimagewidth|imagick_getinterlacescheme|imagick_getiteratorindex|imagick_getnumberimages|imagick_getoption|imagick_getpackagename|imagick_getpage|imagick_getpixeliterator|imagick_getpixelregioniterator|imagick_getpointsize|imagick_getquantumdepth|imagick_getquantumrange|imagick_getreleasedate|imagick_getresource|imagick_getresourcelimit|imagick_getsamplingfactors|imagick_getsize|imagick_getsizeoffset|imagick_getversion|imagick_hasnextimage|imagick_haspreviousimage|imagick_identifyimage|imagick_implodeimage|imagick_labelimage|imagick_levelimage|imagick_linearstretchimage|imagick_liquidrescaleimage|imagick_magnifyimage|imagick_mapimage|imagick_mattefloodfillimage|imagick_medianfilterimage|imagick_mergeimagelayers|imagick_minifyimage|imagick_modulateimage|imagick_montageimage|imagick_morphimages|imagick_mosaicimages|imagick_motionblurimage|imagick_negateimage|imagick_newimage|imagick_newpseudoimage|imagick_nextimage|imagick_normalizeimage|imagick_oilpaintimage|imagick_opaquepaintimage|imagick_optimizeimagelayers|imagick_orderedposterizeimage|imagick_paintfloodfillimage|imagick_paintopaqueimage|imagick_painttransparentimage|imagick_pingimage|imagick_pingimageblob|imagick_pingimagefile|imagick_polaroidimage|imagick_posterizeimage|imagick_previewimages|imagick_previousimage|imagick_profileimage|imagick_quantizeimage|imagick_quantizeimages|imagick_queryfontmetrics|imagick_queryfonts|imagick_queryformats|imagick_radialblurimage|imagick_raiseimage|imagick_randomthresholdimage|imagick_readimage|imagick_readimageblob|imagick_readimagefile|imagick_recolorimage|imagick_reducenoiseimage|imagick_removeimage|imagick_removeimageprofile|imagick_render|imagick_resampleimage|imagick_resetimagepage|imagick_resizeimage|imagick_rollimage|imagick_rotateimage|imagick_roundcorners|imagick_sampleimage|imagick_scaleimage|imagick_separateimagechannel|imagick_sepiatoneimage|imagick_setbackgroundcolor|imagick_setcolorspace|imagick_setcompression|imagick_setcompressionquality|imagick_setfilename|imagick_setfirstiterator|imagick_setfont|imagick_setformat|imagick_setgravity|imagick_setimage|imagick_setimagealphachannel|imagick_setimageartifact|imagick_setimagebackgroundcolor|imagick_setimagebias|imagick_setimageblueprimary|imagick_setimagebordercolor|imagick_setimagechanneldepth|imagick_setimageclipmask|imagick_setimagecolormapcolor|imagick_setimagecolorspace|imagick_setimagecompose|imagick_setimagecompression|imagick_setimagecompressionquality|imagick_setimagedelay|imagick_setimagedepth|imagick_setimagedispose|imagick_setimageextent|imagick_setimagefilename|imagick_setimageformat|imagick_setimagegamma|imagick_setimagegravity|imagick_setimagegreenprimary|imagick_setimageindex|imagick_setimageinterlacescheme|imagick_setimageinterpolatemethod|imagick_setimageiterations|imagick_setimagematte|imagick_setimagemattecolor|imagick_setimageopacity|imagick_setimageorientation|imagick_setimagepage|imagick_setimageprofile|imagick_setimageproperty|imagick_setimageredprimary|imagick_setimagerenderingintent|imagick_setimageresolution|imagick_setimagescene|imagick_setimagetickspersecond|imagick_setimagetype|imagick_setimageunits|imagick_setimagevirtualpixelmethod|imagick_setimagewhitepoint|imagick_setinterlacescheme|imagick_setiteratorindex|imagick_setlastiterator|imagick_setoption|imagick_setpage|imagick_setpointsize|imagick_setresolution|imagick_setresourcelimit|imagick_setsamplingfactors|imagick_setsize|imagick_setsizeoffset|imagick_settype|imagick_shadeimage|imagick_shadowimage|imagick_sharpenimage|imagick_shaveimage|imagick_shearimage|imagick_sigmoidalcontrastimage|imagick_sketchimage|imagick_solarizeimage|imagick_spliceimage|imagick_spreadimage|imagick_steganoimage|imagick_stereoimage|imagick_stripimage|imagick_swirlimage|imagick_textureimage|imagick_thresholdimage|imagick_thumbnailimage|imagick_tintimage|imagick_transformimage|imagick_transparentpaintimage|imagick_transposeimage|imagick_transverseimage|imagick_trimimage|imagick_uniqueimagecolors|imagick_unsharpmaskimage|imagick_valid|imagick_vignetteimage|imagick_waveimage|imagick_whitethresholdimage|imagick_writeimage|imagick_writeimagefile|imagick_writeimages|imagick_writeimagesfile|imagickdraw|imagickdraw_affine|imagickdraw_annotation|imagickdraw_arc|imagickdraw_bezier|imagickdraw_circle|imagickdraw_clear|imagickdraw_clone|imagickdraw_color|imagickdraw_comment|imagickdraw_composite|imagickdraw_construct|imagickdraw_destroy|imagickdraw_ellipse|imagickdraw_getclippath|imagickdraw_getcliprule|imagickdraw_getclipunits|imagickdraw_getfillcolor|imagickdraw_getfillopacity|imagickdraw_getfillrule|imagickdraw_getfont|imagickdraw_getfontfamily|imagickdraw_getfontsize|imagickdraw_getfontstyle|imagickdraw_getfontweight|imagickdraw_getgravity|imagickdraw_getstrokeantialias|imagickdraw_getstrokecolor|imagickdraw_getstrokedasharray|imagickdraw_getstrokedashoffset|imagickdraw_getstrokelinecap|imagickdraw_getstrokelinejoin|imagickdraw_getstrokemiterlimit|imagickdraw_getstrokeopacity|imagickdraw_getstrokewidth|imagickdraw_gettextalignment|imagickdraw_gettextantialias|imagickdraw_gettextdecoration|imagickdraw_gettextencoding|imagickdraw_gettextundercolor|imagickdraw_getvectorgraphics|imagickdraw_line|imagickdraw_matte|imagickdraw_pathclose|imagickdraw_pathcurvetoabsolute|imagickdraw_pathcurvetoquadraticbezierabsolute|imagickdraw_pathcurvetoquadraticbezierrelative|imagickdraw_pathcurvetoquadraticbeziersmoothabsolute|imagickdraw_pathcurvetoquadraticbeziersmoothrelative|imagickdraw_pathcurvetorelative|imagickdraw_pathcurvetosmoothabsolute|imagickdraw_pathcurvetosmoothrelative|imagickdraw_pathellipticarcabsolute|imagickdraw_pathellipticarcrelative|imagickdraw_pathfinish|imagickdraw_pathlinetoabsolute|imagickdraw_pathlinetohorizontalabsolute|imagickdraw_pathlinetohorizontalrelative|imagickdraw_pathlinetorelative|imagickdraw_pathlinetoverticalabsolute|imagickdraw_pathlinetoverticalrelative|imagickdraw_pathmovetoabsolute|imagickdraw_pathmovetorelative|imagickdraw_pathstart|imagickdraw_point|imagickdraw_polygon|imagickdraw_polyline|imagickdraw_pop|imagickdraw_popclippath|imagickdraw_popdefs|imagickdraw_poppattern|imagickdraw_push|imagickdraw_pushclippath|imagickdraw_pushdefs|imagickdraw_pushpattern|imagickdraw_rectangle|imagickdraw_render|imagickdraw_rotate|imagickdraw_roundrectangle|imagickdraw_scale|imagickdraw_setclippath|imagickdraw_setcliprule|imagickdraw_setclipunits|imagickdraw_setfillalpha|imagickdraw_setfillcolor|imagickdraw_setfillopacity|imagickdraw_setfillpatternurl|imagickdraw_setfillrule|imagickdraw_setfont|imagickdraw_setfontfamily|imagickdraw_setfontsize|imagickdraw_setfontstretch|imagickdraw_setfontstyle|imagickdraw_setfontweight|imagickdraw_setgravity|imagickdraw_setstrokealpha|imagickdraw_setstrokeantialias|imagickdraw_setstrokecolor|imagickdraw_setstrokedasharray|imagickdraw_setstrokedashoffset|imagickdraw_setstrokelinecap|imagickdraw_setstrokelinejoin|imagickdraw_setstrokemiterlimit|imagickdraw_setstrokeopacity|imagickdraw_setstrokepatternurl|imagickdraw_setstrokewidth|imagickdraw_settextalignment|imagickdraw_settextantialias|imagickdraw_settextdecoration|imagickdraw_settextencoding|imagickdraw_settextundercolor|imagickdraw_setvectorgraphics|imagickdraw_setviewbox|imagickdraw_skewx|imagickdraw_skewy|imagickdraw_translate|imagickpixel|imagickpixel_clear|imagickpixel_construct|imagickpixel_destroy|imagickpixel_getcolor|imagickpixel_getcolorasstring|imagickpixel_getcolorcount|imagickpixel_getcolorvalue|imagickpixel_gethsl|imagickpixel_issimilar|imagickpixel_setcolor|imagickpixel_setcolorvalue|imagickpixel_sethsl|imagickpixeliterator|imagickpixeliterator_clear|imagickpixeliterator_construct|imagickpixeliterator_destroy|imagickpixeliterator_getcurrentiteratorrow|imagickpixeliterator_getiteratorrow|imagickpixeliterator_getnextiteratorrow|imagickpixeliterator_getpreviousiteratorrow|imagickpixeliterator_newpixeliterator|imagickpixeliterator_newpixelregioniterator|imagickpixeliterator_resetiterator|imagickpixeliterator_setiteratorfirstrow|imagickpixeliterator_setiteratorlastrow|imagickpixeliterator_setiteratorrow|imagickpixeliterator_synciterator|imap_8bit|imap_alerts|imap_append|imap_base64|imap_binary|imap_body|imap_bodystruct|imap_check|imap_clearflag_full|imap_close|imap_create|imap_createmailbox|imap_delete|imap_deletemailbox|imap_errors|imap_expunge|imap_fetch_overview|imap_fetchbody|imap_fetchheader|imap_fetchmime|imap_fetchstructure|imap_fetchtext|imap_gc|imap_get_quota|imap_get_quotaroot|imap_getacl|imap_getmailboxes|imap_getsubscribed|imap_header|imap_headerinfo|imap_headers|imap_last_error|imap_list|imap_listmailbox|imap_listscan|imap_listsubscribed|imap_lsub|imap_mail|imap_mail_compose|imap_mail_copy|imap_mail_move|imap_mailboxmsginfo|imap_mime_header_decode|imap_msgno|imap_num_msg|imap_num_recent|imap_open|imap_ping|imap_qprint|imap_rename|imap_renamemailbox|imap_reopen|imap_rfc822_parse_adrlist|imap_rfc822_parse_headers|imap_rfc822_write_address|imap_savebody|imap_scan|imap_scanmailbox|imap_search|imap_set_quota|imap_setacl|imap_setflag_full|imap_sort|imap_status|imap_subscribe|imap_thread|imap_timeout|imap_uid|imap_undelete|imap_unsubscribe|imap_utf7_decode|imap_utf7_encode|imap_utf8|implementsinterface|implode|import_request_variables|in_array|include|include_once|inclued_get_data|inet_ntop|inet_pton|infiniteiterator|ingres_autocommit|ingres_autocommit_state|ingres_charset|ingres_close|ingres_commit|ingres_connect|ingres_cursor|ingres_errno|ingres_error|ingres_errsqlstate|ingres_escape_string|ingres_execute|ingres_fetch_array|ingres_fetch_assoc|ingres_fetch_object|ingres_fetch_proc_return|ingres_fetch_row|ingres_field_length|ingres_field_name|ingres_field_nullable|ingres_field_precision|ingres_field_scale|ingres_field_type|ingres_free_result|ingres_next_error|ingres_num_fields|ingres_num_rows|ingres_pconnect|ingres_prepare|ingres_query|ingres_result_seek|ingres_rollback|ingres_set_environment|ingres_unbuffered_query|ini_alter|ini_get|ini_get_all|ini_restore|ini_set|innamespace|inotify_add_watch|inotify_init|inotify_queue_len|inotify_read|inotify_rm_watch|interface_exists|intl_error_name|intl_get_error_code|intl_get_error_message|intl_is_failure|intldateformatter|intval|invalidargumentexception|invoke|invokeargs|ip2long|iptcembed|iptcparse|is_a|is_array|is_bool|is_callable|is_dir|is_double|is_executable|is_file|is_finite|is_float|is_infinite|is_int|is_integer|is_link|is_long|is_nan|is_null|is_numeric|is_object|is_readable|is_real|is_resource|is_scalar|is_soap_fault|is_string|is_subclass_of|is_uploaded_file|is_writable|is_writeable|isabstract|iscloneable|isdisabled|isfinal|isinstance|isinstantiable|isinterface|isinternal|isiterateable|isset|issubclassof|isuserdefined|iterator|iterator_apply|iterator_count|iterator_to_array|iteratoraggregate|iteratoriterator|java_last_exception_clear|java_last_exception_get|jddayofweek|jdmonthname|jdtofrench|jdtogregorian|jdtojewish|jdtojulian|jdtounix|jewishtojd|join|jpeg2wbmp|json_decode|json_encode|json_last_error|jsonserializable|judy|judy_type|judy_version|juliantojd|kadm5_chpass_principal|kadm5_create_principal|kadm5_delete_principal|kadm5_destroy|kadm5_flush|kadm5_get_policies|kadm5_get_principal|kadm5_get_principals|kadm5_init_with_password|kadm5_modify_principal|key|krsort|ksort|lcfirst|lcg_value|lchgrp|lchown|ldap_8859_to_t61|ldap_add|ldap_bind|ldap_close|ldap_compare|ldap_connect|ldap_count_entries|ldap_delete|ldap_dn2ufn|ldap_err2str|ldap_errno|ldap_error|ldap_explode_dn|ldap_first_attribute|ldap_first_entry|ldap_first_reference|ldap_free_result|ldap_get_attributes|ldap_get_dn|ldap_get_entries|ldap_get_option|ldap_get_values|ldap_get_values_len|ldap_list|ldap_mod_add|ldap_mod_del|ldap_mod_replace|ldap_modify|ldap_next_attribute|ldap_next_entry|ldap_next_reference|ldap_parse_reference|ldap_parse_result|ldap_read|ldap_rename|ldap_sasl_bind|ldap_search|ldap_set_option|ldap_set_rebind_proc|ldap_sort|ldap_start_tls|ldap_t61_to_8859|ldap_unbind|lengthexception|levenshtein|libxml_clear_errors|libxml_disable_entity_loader|libxml_get_errors|libxml_get_last_error|libxml_set_streams_context|libxml_use_internal_errors|libxmlerror|limititerator|link|linkinfo|list|locale|localeconv|localtime|log|log10|log1p|logicexception|long2ip|lstat|ltrim|lzf_compress|lzf_decompress|lzf_optimized_for|m_checkstatus|m_completeauthorizations|m_connect|m_connectionerror|m_deletetrans|m_destroyconn|m_destroyengine|m_getcell|m_getcellbynum|m_getcommadelimited|m_getheader|m_initconn|m_initengine|m_iscommadelimited|m_maxconntimeout|m_monitor|m_numcolumns|m_numrows|m_parsecommadelimited|m_responsekeys|m_responseparam|m_returnstatus|m_setblocking|m_setdropfile|m_setip|m_setssl|m_setssl_cafile|m_setssl_files|m_settimeout|m_sslcert_gen_hash|m_transactionssent|m_transinqueue|m_transkeyval|m_transnew|m_transsend|m_uwait|m_validateidentifier|m_verifyconnection|m_verifysslcert|magic_quotes_runtime|mail|mailparse_determine_best_xfer_encoding|mailparse_msg_create|mailparse_msg_extract_part|mailparse_msg_extract_part_file|mailparse_msg_extract_whole_part_file|mailparse_msg_free|mailparse_msg_get_part|mailparse_msg_get_part_data|mailparse_msg_get_structure|mailparse_msg_parse|mailparse_msg_parse_file|mailparse_rfc822_parse_addresses|mailparse_stream_encode|mailparse_uudecode_all|main|max|maxdb_affected_rows|maxdb_autocommit|maxdb_bind_param|maxdb_bind_result|maxdb_change_user|maxdb_character_set_name|maxdb_client_encoding|maxdb_close|maxdb_close_long_data|maxdb_commit|maxdb_connect|maxdb_connect_errno|maxdb_connect_error|maxdb_data_seek|maxdb_debug|maxdb_disable_reads_from_master|maxdb_disable_rpl_parse|maxdb_dump_debug_info|maxdb_embedded_connect|maxdb_enable_reads_from_master|maxdb_enable_rpl_parse|maxdb_errno|maxdb_error|maxdb_escape_string|maxdb_execute|maxdb_fetch|maxdb_fetch_array|maxdb_fetch_assoc|maxdb_fetch_field|maxdb_fetch_field_direct|maxdb_fetch_fields|maxdb_fetch_lengths|maxdb_fetch_object|maxdb_fetch_row|maxdb_field_count|maxdb_field_seek|maxdb_field_tell|maxdb_free_result|maxdb_get_client_info|maxdb_get_client_version|maxdb_get_host_info|maxdb_get_metadata|maxdb_get_proto_info|maxdb_get_server_info|maxdb_get_server_version|maxdb_info|maxdb_init|maxdb_insert_id|maxdb_kill|maxdb_master_query|maxdb_more_results|maxdb_multi_query|maxdb_next_result|maxdb_num_fields|maxdb_num_rows|maxdb_options|maxdb_param_count|maxdb_ping|maxdb_prepare|maxdb_query|maxdb_real_connect|maxdb_real_escape_string|maxdb_real_query|maxdb_report|maxdb_rollback|maxdb_rpl_parse_enabled|maxdb_rpl_probe|maxdb_rpl_query_type|maxdb_select_db|maxdb_send_long_data|maxdb_send_query|maxdb_server_end|maxdb_server_init|maxdb_set_opt|maxdb_sqlstate|maxdb_ssl_set|maxdb_stat|maxdb_stmt_affected_rows|maxdb_stmt_bind_param|maxdb_stmt_bind_result|maxdb_stmt_close|maxdb_stmt_close_long_data|maxdb_stmt_data_seek|maxdb_stmt_errno|maxdb_stmt_error|maxdb_stmt_execute|maxdb_stmt_fetch|maxdb_stmt_free_result|maxdb_stmt_init|maxdb_stmt_num_rows|maxdb_stmt_param_count|maxdb_stmt_prepare|maxdb_stmt_reset|maxdb_stmt_result_metadata|maxdb_stmt_send_long_data|maxdb_stmt_sqlstate|maxdb_stmt_store_result|maxdb_store_result|maxdb_thread_id|maxdb_thread_safe|maxdb_use_result|maxdb_warning_count|mb_check_encoding|mb_convert_case|mb_convert_encoding|mb_convert_kana|mb_convert_variables|mb_decode_mimeheader|mb_decode_numericentity|mb_detect_encoding|mb_detect_order|mb_encode_mimeheader|mb_encode_numericentity|mb_encoding_aliases|mb_ereg|mb_ereg_match|mb_ereg_replace|mb_ereg_search|mb_ereg_search_getpos|mb_ereg_search_getregs|mb_ereg_search_init|mb_ereg_search_pos|mb_ereg_search_regs|mb_ereg_search_setpos|mb_eregi|mb_eregi_replace|mb_get_info|mb_http_input|mb_http_output|mb_internal_encoding|mb_language|mb_list_encodings|mb_output_handler|mb_parse_str|mb_preferred_mime_name|mb_regex_encoding|mb_regex_set_options|mb_send_mail|mb_split|mb_strcut|mb_strimwidth|mb_stripos|mb_stristr|mb_strlen|mb_strpos|mb_strrchr|mb_strrichr|mb_strripos|mb_strrpos|mb_strstr|mb_strtolower|mb_strtoupper|mb_strwidth|mb_substitute_character|mb_substr|mb_substr_count|mcrypt_cbc|mcrypt_cfb|mcrypt_create_iv|mcrypt_decrypt|mcrypt_ecb|mcrypt_enc_get_algorithms_name|mcrypt_enc_get_block_size|mcrypt_enc_get_iv_size|mcrypt_enc_get_key_size|mcrypt_enc_get_modes_name|mcrypt_enc_get_supported_key_sizes|mcrypt_enc_is_block_algorithm|mcrypt_enc_is_block_algorithm_mode|mcrypt_enc_is_block_mode|mcrypt_enc_self_test|mcrypt_encrypt|mcrypt_generic|mcrypt_generic_deinit|mcrypt_generic_end|mcrypt_generic_init|mcrypt_get_block_size|mcrypt_get_cipher_name|mcrypt_get_iv_size|mcrypt_get_key_size|mcrypt_list_algorithms|mcrypt_list_modes|mcrypt_module_close|mcrypt_module_get_algo_block_size|mcrypt_module_get_algo_key_size|mcrypt_module_get_supported_key_sizes|mcrypt_module_is_block_algorithm|mcrypt_module_is_block_algorithm_mode|mcrypt_module_is_block_mode|mcrypt_module_open|mcrypt_module_self_test|mcrypt_ofb|md5|md5_file|mdecrypt_generic|memcache|memcache_debug|memcached|memory_get_peak_usage|memory_get_usage|messageformatter|metaphone|method_exists|mhash|mhash_count|mhash_get_block_size|mhash_get_hash_name|mhash_keygen_s2k|microtime|mime_content_type|min|ming_keypress|ming_setcubicthreshold|ming_setscale|ming_setswfcompression|ming_useconstants|ming_useswfversion|mkdir|mktime|money_format|mongo|mongobindata|mongocode|mongocollection|mongoconnectionexception|mongocursor|mongocursorexception|mongocursortimeoutexception|mongodate|mongodb|mongodbref|mongoexception|mongogridfs|mongogridfscursor|mongogridfsexception|mongogridfsfile|mongoid|mongoint32|mongoint64|mongomaxkey|mongominkey|mongoregex|mongotimestamp|move_uploaded_file|mpegfile|mqseries_back|mqseries_begin|mqseries_close|mqseries_cmit|mqseries_conn|mqseries_connx|mqseries_disc|mqseries_get|mqseries_inq|mqseries_open|mqseries_put|mqseries_put1|mqseries_set|mqseries_strerror|msession_connect|msession_count|msession_create|msession_destroy|msession_disconnect|msession_find|msession_get|msession_get_array|msession_get_data|msession_inc|msession_list|msession_listvar|msession_lock|msession_plugin|msession_randstr|msession_set|msession_set_array|msession_set_data|msession_timeout|msession_uniq|msession_unlock|msg_get_queue|msg_queue_exists|msg_receive|msg_remove_queue|msg_send|msg_set_queue|msg_stat_queue|msql|msql_affected_rows|msql_close|msql_connect|msql_create_db|msql_createdb|msql_data_seek|msql_db_query|msql_dbname|msql_drop_db|msql_error|msql_fetch_array|msql_fetch_field|msql_fetch_object|msql_fetch_row|msql_field_flags|msql_field_len|msql_field_name|msql_field_seek|msql_field_table|msql_field_type|msql_fieldflags|msql_fieldlen|msql_fieldname|msql_fieldtable|msql_fieldtype|msql_free_result|msql_list_dbs|msql_list_fields|msql_list_tables|msql_num_fields|msql_num_rows|msql_numfields|msql_numrows|msql_pconnect|msql_query|msql_regcase|msql_result|msql_select_db|msql_tablename|mssql_bind|mssql_close|mssql_connect|mssql_data_seek|mssql_execute|mssql_fetch_array|mssql_fetch_assoc|mssql_fetch_batch|mssql_fetch_field|mssql_fetch_object|mssql_fetch_row|mssql_field_length|mssql_field_name|mssql_field_seek|mssql_field_type|mssql_free_result|mssql_free_statement|mssql_get_last_message|mssql_guid_string|mssql_init|mssql_min_error_severity|mssql_min_message_severity|mssql_next_result|mssql_num_fields|mssql_num_rows|mssql_pconnect|mssql_query|mssql_result|mssql_rows_affected|mssql_select_db|mt_getrandmax|mt_rand|mt_srand|multipleiterator|mysql_affected_rows|mysql_client_encoding|mysql_close|mysql_connect|mysql_create_db|mysql_data_seek|mysql_db_name|mysql_db_query|mysql_drop_db|mysql_errno|mysql_error|mysql_escape_string|mysql_fetch_array|mysql_fetch_assoc|mysql_fetch_field|mysql_fetch_lengths|mysql_fetch_object|mysql_fetch_row|mysql_field_flags|mysql_field_len|mysql_field_name|mysql_field_seek|mysql_field_table|mysql_field_type|mysql_free_result|mysql_get_client_info|mysql_get_host_info|mysql_get_proto_info|mysql_get_server_info|mysql_info|mysql_insert_id|mysql_list_dbs|mysql_list_fields|mysql_list_processes|mysql_list_tables|mysql_num_fields|mysql_num_rows|mysql_pconnect|mysql_ping|mysql_query|mysql_real_escape_string|mysql_result|mysql_select_db|mysql_set_charset|mysql_stat|mysql_tablename|mysql_thread_id|mysql_unbuffered_query|mysqli|mysqli_bind_param|mysqli_bind_result|mysqli_client_encoding|mysqli_connect|mysqli_disable_reads_from_master|mysqli_disable_rpl_parse|mysqli_driver|mysqli_enable_reads_from_master|mysqli_enable_rpl_parse|mysqli_escape_string|mysqli_execute|mysqli_fetch|mysqli_get_metadata|mysqli_master_query|mysqli_param_count|mysqli_report|mysqli_result|mysqli_rpl_parse_enabled|mysqli_rpl_probe|mysqli_rpl_query_type|mysqli_send_long_data|mysqli_send_query|mysqli_set_opt|mysqli_slave_query|mysqli_stmt|mysqli_warning|mysqlnd_ms_get_stats|mysqlnd_ms_query_is_select|mysqlnd_ms_set_user_pick_server|mysqlnd_qc_change_handler|mysqlnd_qc_clear_cache|mysqlnd_qc_get_cache_info|mysqlnd_qc_get_core_stats|mysqlnd_qc_get_handler|mysqlnd_qc_get_query_trace_log|mysqlnd_qc_set_user_handlers|natcasesort|natsort|ncurses_addch|ncurses_addchnstr|ncurses_addchstr|ncurses_addnstr|ncurses_addstr|ncurses_assume_default_colors|ncurses_attroff|ncurses_attron|ncurses_attrset|ncurses_baudrate|ncurses_beep|ncurses_bkgd|ncurses_bkgdset|ncurses_border|ncurses_bottom_panel|ncurses_can_change_color|ncurses_cbreak|ncurses_clear|ncurses_clrtobot|ncurses_clrtoeol|ncurses_color_content|ncurses_color_set|ncurses_curs_set|ncurses_def_prog_mode|ncurses_def_shell_mode|ncurses_define_key|ncurses_del_panel|ncurses_delay_output|ncurses_delch|ncurses_deleteln|ncurses_delwin|ncurses_doupdate|ncurses_echo|ncurses_echochar|ncurses_end|ncurses_erase|ncurses_erasechar|ncurses_filter|ncurses_flash|ncurses_flushinp|ncurses_getch|ncurses_getmaxyx|ncurses_getmouse|ncurses_getyx|ncurses_halfdelay|ncurses_has_colors|ncurses_has_ic|ncurses_has_il|ncurses_has_key|ncurses_hide_panel|ncurses_hline|ncurses_inch|ncurses_init|ncurses_init_color|ncurses_init_pair|ncurses_insch|ncurses_insdelln|ncurses_insertln|ncurses_insstr|ncurses_instr|ncurses_isendwin|ncurses_keyok|ncurses_keypad|ncurses_killchar|ncurses_longname|ncurses_meta|ncurses_mouse_trafo|ncurses_mouseinterval|ncurses_mousemask|ncurses_move|ncurses_move_panel|ncurses_mvaddch|ncurses_mvaddchnstr|ncurses_mvaddchstr|ncurses_mvaddnstr|ncurses_mvaddstr|ncurses_mvcur|ncurses_mvdelch|ncurses_mvgetch|ncurses_mvhline|ncurses_mvinch|ncurses_mvvline|ncurses_mvwaddstr|ncurses_napms|ncurses_new_panel|ncurses_newpad|ncurses_newwin|ncurses_nl|ncurses_nocbreak|ncurses_noecho|ncurses_nonl|ncurses_noqiflush|ncurses_noraw|ncurses_pair_content|ncurses_panel_above|ncurses_panel_below|ncurses_panel_window|ncurses_pnoutrefresh|ncurses_prefresh|ncurses_putp|ncurses_qiflush|ncurses_raw|ncurses_refresh|ncurses_replace_panel|ncurses_reset_prog_mode|ncurses_reset_shell_mode|ncurses_resetty|ncurses_savetty|ncurses_scr_dump|ncurses_scr_init|ncurses_scr_restore|ncurses_scr_set|ncurses_scrl|ncurses_show_panel|ncurses_slk_attr|ncurses_slk_attroff|ncurses_slk_attron|ncurses_slk_attrset|ncurses_slk_clear|ncurses_slk_color|ncurses_slk_init|ncurses_slk_noutrefresh|ncurses_slk_refresh|ncurses_slk_restore|ncurses_slk_set|ncurses_slk_touch|ncurses_standend|ncurses_standout|ncurses_start_color|ncurses_termattrs|ncurses_termname|ncurses_timeout|ncurses_top_panel|ncurses_typeahead|ncurses_ungetch|ncurses_ungetmouse|ncurses_update_panels|ncurses_use_default_colors|ncurses_use_env|ncurses_use_extended_names|ncurses_vidattr|ncurses_vline|ncurses_waddch|ncurses_waddstr|ncurses_wattroff|ncurses_wattron|ncurses_wattrset|ncurses_wborder|ncurses_wclear|ncurses_wcolor_set|ncurses_werase|ncurses_wgetch|ncurses_whline|ncurses_wmouse_trafo|ncurses_wmove|ncurses_wnoutrefresh|ncurses_wrefresh|ncurses_wstandend|ncurses_wstandout|ncurses_wvline|newinstance|newinstanceargs|newt_bell|newt_button|newt_button_bar|newt_centered_window|newt_checkbox|newt_checkbox_get_value|newt_checkbox_set_flags|newt_checkbox_set_value|newt_checkbox_tree|newt_checkbox_tree_add_item|newt_checkbox_tree_find_item|newt_checkbox_tree_get_current|newt_checkbox_tree_get_entry_value|newt_checkbox_tree_get_multi_selection|newt_checkbox_tree_get_selection|newt_checkbox_tree_multi|newt_checkbox_tree_set_current|newt_checkbox_tree_set_entry|newt_checkbox_tree_set_entry_value|newt_checkbox_tree_set_width|newt_clear_key_buffer|newt_cls|newt_compact_button|newt_component_add_callback|newt_component_takes_focus|newt_create_grid|newt_cursor_off|newt_cursor_on|newt_delay|newt_draw_form|newt_draw_root_text|newt_entry|newt_entry_get_value|newt_entry_set|newt_entry_set_filter|newt_entry_set_flags|newt_finished|newt_form|newt_form_add_component|newt_form_add_components|newt_form_add_hot_key|newt_form_destroy|newt_form_get_current|newt_form_run|newt_form_set_background|newt_form_set_height|newt_form_set_size|newt_form_set_timer|newt_form_set_width|newt_form_watch_fd|newt_get_screen_size|newt_grid_add_components_to_form|newt_grid_basic_window|newt_grid_free|newt_grid_get_size|newt_grid_h_close_stacked|newt_grid_h_stacked|newt_grid_place|newt_grid_set_field|newt_grid_simple_window|newt_grid_v_close_stacked|newt_grid_v_stacked|newt_grid_wrapped_window|newt_grid_wrapped_window_at|newt_init|newt_label|newt_label_set_text|newt_listbox|newt_listbox_append_entry|newt_listbox_clear|newt_listbox_clear_selection|newt_listbox_delete_entry|newt_listbox_get_current|newt_listbox_get_selection|newt_listbox_insert_entry|newt_listbox_item_count|newt_listbox_select_item|newt_listbox_set_current|newt_listbox_set_current_by_key|newt_listbox_set_data|newt_listbox_set_entry|newt_listbox_set_width|newt_listitem|newt_listitem_get_data|newt_listitem_set|newt_open_window|newt_pop_help_line|newt_pop_window|newt_push_help_line|newt_radio_get_current|newt_radiobutton|newt_redraw_help_line|newt_reflow_text|newt_refresh|newt_resize_screen|newt_resume|newt_run_form|newt_scale|newt_scale_set|newt_scrollbar_set|newt_set_help_callback|newt_set_suspend_callback|newt_suspend|newt_textbox|newt_textbox_get_num_lines|newt_textbox_reflowed|newt_textbox_set_height|newt_textbox_set_text|newt_vertical_scrollbar|newt_wait_for_key|newt_win_choice|newt_win_entries|newt_win_menu|newt_win_message|newt_win_messagev|newt_win_ternary|next|ngettext|nl2br|nl_langinfo|norewinditerator|normalizer|notes_body|notes_copy_db|notes_create_db|notes_create_note|notes_drop_db|notes_find_note|notes_header_info|notes_list_msgs|notes_mark_read|notes_mark_unread|notes_nav_create|notes_search|notes_unread|notes_version|nsapi_request_headers|nsapi_response_headers|nsapi_virtual|nthmac|number_format|numberformatter|oauth|oauth_get_sbs|oauth_urlencode|oauthexception|oauthprovider|ob_clean|ob_deflatehandler|ob_end_clean|ob_end_flush|ob_etaghandler|ob_flush|ob_get_clean|ob_get_contents|ob_get_flush|ob_get_length|ob_get_level|ob_get_status|ob_gzhandler|ob_iconv_handler|ob_implicit_flush|ob_inflatehandler|ob_list_handlers|ob_start|ob_tidyhandler|oci_bind_array_by_name|oci_bind_by_name|oci_cancel|oci_client_version|oci_close|oci_collection_append|oci_collection_assign|oci_collection_element_assign|oci_collection_element_get|oci_collection_free|oci_collection_max|oci_collection_size|oci_collection_trim|oci_commit|oci_connect|oci_define_by_name|oci_error|oci_execute|oci_fetch|oci_fetch_all|oci_fetch_array|oci_fetch_assoc|oci_fetch_object|oci_fetch_row|oci_field_is_null|oci_field_name|oci_field_precision|oci_field_scale|oci_field_size|oci_field_type|oci_field_type_raw|oci_free_statement|oci_internal_debug|oci_lob_append|oci_lob_close|oci_lob_copy|oci_lob_eof|oci_lob_erase|oci_lob_export|oci_lob_flush|oci_lob_free|oci_lob_getbuffering|oci_lob_import|oci_lob_is_equal|oci_lob_load|oci_lob_read|oci_lob_rewind|oci_lob_save|oci_lob_savefile|oci_lob_seek|oci_lob_setbuffering|oci_lob_size|oci_lob_tell|oci_lob_truncate|oci_lob_write|oci_lob_writetemporary|oci_lob_writetofile|oci_new_collection|oci_new_connect|oci_new_cursor|oci_new_descriptor|oci_num_fields|oci_num_rows|oci_parse|oci_password_change|oci_pconnect|oci_result|oci_rollback|oci_server_version|oci_set_action|oci_set_client_identifier|oci_set_client_info|oci_set_edition|oci_set_module_name|oci_set_prefetch|oci_statement_type|ocibindbyname|ocicancel|ocicloselob|ocicollappend|ocicollassign|ocicollassignelem|ocicollgetelem|ocicollmax|ocicollsize|ocicolltrim|ocicolumnisnull|ocicolumnname|ocicolumnprecision|ocicolumnscale|ocicolumnsize|ocicolumntype|ocicolumntyperaw|ocicommit|ocidefinebyname|ocierror|ociexecute|ocifetch|ocifetchinto|ocifetchstatement|ocifreecollection|ocifreecursor|ocifreedesc|ocifreestatement|ociinternaldebug|ociloadlob|ocilogoff|ocilogon|ocinewcollection|ocinewcursor|ocinewdescriptor|ocinlogon|ocinumcols|ociparse|ociplogon|ociresult|ocirollback|ocirowcount|ocisavelob|ocisavelobfile|ociserverversion|ocisetprefetch|ocistatementtype|ociwritelobtofile|ociwritetemporarylob|octdec|odbc_autocommit|odbc_binmode|odbc_close|odbc_close_all|odbc_columnprivileges|odbc_columns|odbc_commit|odbc_connect|odbc_cursor|odbc_data_source|odbc_do|odbc_error|odbc_errormsg|odbc_exec|odbc_execute|odbc_fetch_array|odbc_fetch_into|odbc_fetch_object|odbc_fetch_row|odbc_field_len|odbc_field_name|odbc_field_num|odbc_field_precision|odbc_field_scale|odbc_field_type|odbc_foreignkeys|odbc_free_result|odbc_gettypeinfo|odbc_longreadlen|odbc_next_result|odbc_num_fields|odbc_num_rows|odbc_pconnect|odbc_prepare|odbc_primarykeys|odbc_procedurecolumns|odbc_procedures|odbc_result|odbc_result_all|odbc_rollback|odbc_setoption|odbc_specialcolumns|odbc_statistics|odbc_tableprivileges|odbc_tables|openal_buffer_create|openal_buffer_data|openal_buffer_destroy|openal_buffer_get|openal_buffer_loadwav|openal_context_create|openal_context_current|openal_context_destroy|openal_context_process|openal_context_suspend|openal_device_close|openal_device_open|openal_listener_get|openal_listener_set|openal_source_create|openal_source_destroy|openal_source_get|openal_source_pause|openal_source_play|openal_source_rewind|openal_source_set|openal_source_stop|openal_stream|opendir|openlog|openssl_cipher_iv_length|openssl_csr_export|openssl_csr_export_to_file|openssl_csr_get_public_key|openssl_csr_get_subject|openssl_csr_new|openssl_csr_sign|openssl_decrypt|openssl_dh_compute_key|openssl_digest|openssl_encrypt|openssl_error_string|openssl_free_key|openssl_get_cipher_methods|openssl_get_md_methods|openssl_get_privatekey|openssl_get_publickey|openssl_open|openssl_pkcs12_export|openssl_pkcs12_export_to_file|openssl_pkcs12_read|openssl_pkcs7_decrypt|openssl_pkcs7_encrypt|openssl_pkcs7_sign|openssl_pkcs7_verify|openssl_pkey_export|openssl_pkey_export_to_file|openssl_pkey_free|openssl_pkey_get_details|openssl_pkey_get_private|openssl_pkey_get_public|openssl_pkey_new|openssl_private_decrypt|openssl_private_encrypt|openssl_public_decrypt|openssl_public_encrypt|openssl_random_pseudo_bytes|openssl_seal|openssl_sign|openssl_verify|openssl_x509_check_private_key|openssl_x509_checkpurpose|openssl_x509_export|openssl_x509_export_to_file|openssl_x509_free|openssl_x509_parse|openssl_x509_read|ord|outeriterator|outofboundsexception|outofrangeexception|output_add_rewrite_var|output_reset_rewrite_vars|overflowexception|overload|override_function|ovrimos_close|ovrimos_commit|ovrimos_connect|ovrimos_cursor|ovrimos_exec|ovrimos_execute|ovrimos_fetch_into|ovrimos_fetch_row|ovrimos_field_len|ovrimos_field_name|ovrimos_field_num|ovrimos_field_type|ovrimos_free_result|ovrimos_longreadlen|ovrimos_num_fields|ovrimos_num_rows|ovrimos_prepare|ovrimos_result|ovrimos_result_all|ovrimos_rollback|pack|parentiterator|parse_ini_file|parse_ini_string|parse_str|parse_url|parsekit_compile_file|parsekit_compile_string|parsekit_func_arginfo|passthru|pathinfo|pclose|pcntl_alarm|pcntl_exec|pcntl_fork|pcntl_getpriority|pcntl_setpriority|pcntl_signal|pcntl_signal_dispatch|pcntl_sigprocmask|pcntl_sigtimedwait|pcntl_sigwaitinfo|pcntl_wait|pcntl_waitpid|pcntl_wexitstatus|pcntl_wifexited|pcntl_wifsignaled|pcntl_wifstopped|pcntl_wstopsig|pcntl_wtermsig|pdf_activate_item|pdf_add_annotation|pdf_add_bookmark|pdf_add_launchlink|pdf_add_locallink|pdf_add_nameddest|pdf_add_note|pdf_add_outline|pdf_add_pdflink|pdf_add_table_cell|pdf_add_textflow|pdf_add_thumbnail|pdf_add_weblink|pdf_arc|pdf_arcn|pdf_attach_file|pdf_begin_document|pdf_begin_font|pdf_begin_glyph|pdf_begin_item|pdf_begin_layer|pdf_begin_page|pdf_begin_page_ext|pdf_begin_pattern|pdf_begin_template|pdf_begin_template_ext|pdf_circle|pdf_clip|pdf_close|pdf_close_image|pdf_close_pdi|pdf_close_pdi_page|pdf_closepath|pdf_closepath_fill_stroke|pdf_closepath_stroke|pdf_concat|pdf_continue_text|pdf_create_3dview|pdf_create_action|pdf_create_annotation|pdf_create_bookmark|pdf_create_field|pdf_create_fieldgroup|pdf_create_gstate|pdf_create_pvf|pdf_create_textflow|pdf_curveto|pdf_define_layer|pdf_delete|pdf_delete_pvf|pdf_delete_table|pdf_delete_textflow|pdf_encoding_set_char|pdf_end_document|pdf_end_font|pdf_end_glyph|pdf_end_item|pdf_end_layer|pdf_end_page|pdf_end_page_ext|pdf_end_pattern|pdf_end_template|pdf_endpath|pdf_fill|pdf_fill_imageblock|pdf_fill_pdfblock|pdf_fill_stroke|pdf_fill_textblock|pdf_findfont|pdf_fit_image|pdf_fit_pdi_page|pdf_fit_table|pdf_fit_textflow|pdf_fit_textline|pdf_get_apiname|pdf_get_buffer|pdf_get_errmsg|pdf_get_errnum|pdf_get_font|pdf_get_fontname|pdf_get_fontsize|pdf_get_image_height|pdf_get_image_width|pdf_get_majorversion|pdf_get_minorversion|pdf_get_parameter|pdf_get_pdi_parameter|pdf_get_pdi_value|pdf_get_value|pdf_info_font|pdf_info_matchbox|pdf_info_table|pdf_info_textflow|pdf_info_textline|pdf_initgraphics|pdf_lineto|pdf_load_3ddata|pdf_load_font|pdf_load_iccprofile|pdf_load_image|pdf_makespotcolor|pdf_moveto|pdf_new|pdf_open_ccitt|pdf_open_file|pdf_open_gif|pdf_open_image|pdf_open_image_file|pdf_open_jpeg|pdf_open_memory_image|pdf_open_pdi|pdf_open_pdi_document|pdf_open_pdi_page|pdf_open_tiff|pdf_pcos_get_number|pdf_pcos_get_stream|pdf_pcos_get_string|pdf_place_image|pdf_place_pdi_page|pdf_process_pdi|pdf_rect|pdf_restore|pdf_resume_page|pdf_rotate|pdf_save|pdf_scale|pdf_set_border_color|pdf_set_border_dash|pdf_set_border_style|pdf_set_char_spacing|pdf_set_duration|pdf_set_gstate|pdf_set_horiz_scaling|pdf_set_info|pdf_set_info_author|pdf_set_info_creator|pdf_set_info_keywords|pdf_set_info_subject|pdf_set_info_title|pdf_set_layer_dependency|pdf_set_leading|pdf_set_parameter|pdf_set_text_matrix|pdf_set_text_pos|pdf_set_text_rendering|pdf_set_text_rise|pdf_set_value|pdf_set_word_spacing|pdf_setcolor|pdf_setdash|pdf_setdashpattern|pdf_setflat|pdf_setfont|pdf_setgray|pdf_setgray_fill|pdf_setgray_stroke|pdf_setlinecap|pdf_setlinejoin|pdf_setlinewidth|pdf_setmatrix|pdf_setmiterlimit|pdf_setpolydash|pdf_setrgbcolor|pdf_setrgbcolor_fill|pdf_setrgbcolor_stroke|pdf_shading|pdf_shading_pattern|pdf_shfill|pdf_show|pdf_show_boxed|pdf_show_xy|pdf_skew|pdf_stringwidth|pdf_stroke|pdf_suspend_page|pdf_translate|pdf_utf16_to_utf8|pdf_utf32_to_utf16|pdf_utf8_to_utf16|pdo|pdo_cubrid_schema|pdo_pgsqllobcreate|pdo_pgsqllobopen|pdo_pgsqllobunlink|pdo_sqlitecreateaggregate|pdo_sqlitecreatefunction|pdoexception|pdostatement|pfsockopen|pg_affected_rows|pg_cancel_query|pg_client_encoding|pg_close|pg_connect|pg_connection_busy|pg_connection_reset|pg_connection_status|pg_convert|pg_copy_from|pg_copy_to|pg_dbname|pg_delete|pg_end_copy|pg_escape_bytea|pg_escape_string|pg_execute|pg_fetch_all|pg_fetch_all_columns|pg_fetch_array|pg_fetch_assoc|pg_fetch_object|pg_fetch_result|pg_fetch_row|pg_field_is_null|pg_field_name|pg_field_num|pg_field_prtlen|pg_field_size|pg_field_table|pg_field_type|pg_field_type_oid|pg_free_result|pg_get_notify|pg_get_pid|pg_get_result|pg_host|pg_insert|pg_last_error|pg_last_notice|pg_last_oid|pg_lo_close|pg_lo_create|pg_lo_export|pg_lo_import|pg_lo_open|pg_lo_read|pg_lo_read_all|pg_lo_seek|pg_lo_tell|pg_lo_unlink|pg_lo_write|pg_meta_data|pg_num_fields|pg_num_rows|pg_options|pg_parameter_status|pg_pconnect|pg_ping|pg_port|pg_prepare|pg_put_line|pg_query|pg_query_params|pg_result_error|pg_result_error_field|pg_result_seek|pg_result_status|pg_select|pg_send_execute|pg_send_prepare|pg_send_query|pg_send_query_params|pg_set_client_encoding|pg_set_error_verbosity|pg_trace|pg_transaction_status|pg_tty|pg_unescape_bytea|pg_untrace|pg_update|pg_version|php_check_syntax|php_ini_loaded_file|php_ini_scanned_files|php_logo_guid|php_sapi_name|php_strip_whitespace|php_uname|phpcredits|phpinfo|phpversion|pi|png2wbmp|popen|pos|posix_access|posix_ctermid|posix_errno|posix_get_last_error|posix_getcwd|posix_getegid|posix_geteuid|posix_getgid|posix_getgrgid|posix_getgrnam|posix_getgroups|posix_getlogin|posix_getpgid|posix_getpgrp|posix_getpid|posix_getppid|posix_getpwnam|posix_getpwuid|posix_getrlimit|posix_getsid|posix_getuid|posix_initgroups|posix_isatty|posix_kill|posix_mkfifo|posix_mknod|posix_setegid|posix_seteuid|posix_setgid|posix_setpgid|posix_setsid|posix_setuid|posix_strerror|posix_times|posix_ttyname|posix_uname|pow|preg_filter|preg_grep|preg_last_error|preg_match|preg_match_all|preg_quote|preg_replace|preg_replace_callback|preg_split|prev|print|print_r|printer_abort|printer_close|printer_create_brush|printer_create_dc|printer_create_font|printer_create_pen|printer_delete_brush|printer_delete_dc|printer_delete_font|printer_delete_pen|printer_draw_bmp|printer_draw_chord|printer_draw_elipse|printer_draw_line|printer_draw_pie|printer_draw_rectangle|printer_draw_roundrect|printer_draw_text|printer_end_doc|printer_end_page|printer_get_option|printer_list|printer_logical_fontheight|printer_open|printer_select_brush|printer_select_font|printer_select_pen|printer_set_option|printer_start_doc|printer_start_page|printer_write|printf|proc_close|proc_get_status|proc_nice|proc_open|proc_terminate|property_exists|ps_add_bookmark|ps_add_launchlink|ps_add_locallink|ps_add_note|ps_add_pdflink|ps_add_weblink|ps_arc|ps_arcn|ps_begin_page|ps_begin_pattern|ps_begin_template|ps_circle|ps_clip|ps_close|ps_close_image|ps_closepath|ps_closepath_stroke|ps_continue_text|ps_curveto|ps_delete|ps_end_page|ps_end_pattern|ps_end_template|ps_fill|ps_fill_stroke|ps_findfont|ps_get_buffer|ps_get_parameter|ps_get_value|ps_hyphenate|ps_include_file|ps_lineto|ps_makespotcolor|ps_moveto|ps_new|ps_open_file|ps_open_image|ps_open_image_file|ps_open_memory_image|ps_place_image|ps_rect|ps_restore|ps_rotate|ps_save|ps_scale|ps_set_border_color|ps_set_border_dash|ps_set_border_style|ps_set_info|ps_set_parameter|ps_set_text_pos|ps_set_value|ps_setcolor|ps_setdash|ps_setflat|ps_setfont|ps_setgray|ps_setlinecap|ps_setlinejoin|ps_setlinewidth|ps_setmiterlimit|ps_setoverprintmode|ps_setpolydash|ps_shading|ps_shading_pattern|ps_shfill|ps_show|ps_show2|ps_show_boxed|ps_show_xy|ps_show_xy2|ps_string_geometry|ps_stringwidth|ps_stroke|ps_symbol|ps_symbol_name|ps_symbol_width|ps_translate|pspell_add_to_personal|pspell_add_to_session|pspell_check|pspell_clear_session|pspell_config_create|pspell_config_data_dir|pspell_config_dict_dir|pspell_config_ignore|pspell_config_mode|pspell_config_personal|pspell_config_repl|pspell_config_runtogether|pspell_config_save_repl|pspell_new|pspell_new_config|pspell_new_personal|pspell_save_wordlist|pspell_store_replacement|pspell_suggest|putenv|px_close|px_create_fp|px_date2string|px_delete|px_delete_record|px_get_field|px_get_info|px_get_parameter|px_get_record|px_get_schema|px_get_value|px_insert_record|px_new|px_numfields|px_numrecords|px_open_fp|px_put_record|px_retrieve_record|px_set_blob_file|px_set_parameter|px_set_tablename|px_set_targetencoding|px_set_value|px_timestamp2string|px_update_record|qdom_error|qdom_tree|quoted_printable_decode|quoted_printable_encode|quotemeta|rad2deg|radius_acct_open|radius_add_server|radius_auth_open|radius_close|radius_config|radius_create_request|radius_cvt_addr|radius_cvt_int|radius_cvt_string|radius_demangle|radius_demangle_mppe_key|radius_get_attr|radius_get_vendor_attr|radius_put_addr|radius_put_attr|radius_put_int|radius_put_string|radius_put_vendor_addr|radius_put_vendor_attr|radius_put_vendor_int|radius_put_vendor_string|radius_request_authenticator|radius_send_request|radius_server_secret|radius_strerror|rand|range|rangeexception|rar_wrapper_cache_stats|rararchive|rarentry|rarexception|rawurldecode|rawurlencode|read_exif_data|readdir|readfile|readgzfile|readline|readline_add_history|readline_callback_handler_install|readline_callback_handler_remove|readline_callback_read_char|readline_clear_history|readline_completion_function|readline_info|readline_list_history|readline_on_new_line|readline_read_history|readline_redisplay|readline_write_history|readlink|realpath|realpath_cache_get|realpath_cache_size|recode|recode_file|recode_string|recursivearrayiterator|recursivecachingiterator|recursivecallbackfilteriterator|recursivedirectoryiterator|recursivefilteriterator|recursiveiterator|recursiveiteratoriterator|recursiveregexiterator|recursivetreeiterator|reflection|reflectionclass|reflectionexception|reflectionextension|reflectionfunction|reflectionfunctionabstract|reflectionmethod|reflectionobject|reflectionparameter|reflectionproperty|reflector|regexiterator|register_shutdown_function|register_tick_function|rename|rename_function|require|require_once|reset|resetValue|resourcebundle|restore_error_handler|restore_exception_handler|restore_include_path|return|rewind|rewinddir|rmdir|round|rpm_close|rpm_get_tag|rpm_is_valid|rpm_open|rpm_version|rrd_create|rrd_error|rrd_fetch|rrd_first|rrd_graph|rrd_info|rrd_last|rrd_lastupdate|rrd_restore|rrd_tune|rrd_update|rrd_xport|rrdcreator|rrdgraph|rrdupdater|rsort|rtrim|runkit_class_adopt|runkit_class_emancipate|runkit_constant_add|runkit_constant_redefine|runkit_constant_remove|runkit_function_add|runkit_function_copy|runkit_function_redefine|runkit_function_remove|runkit_function_rename|runkit_import|runkit_lint|runkit_lint_file|runkit_method_add|runkit_method_copy|runkit_method_redefine|runkit_method_remove|runkit_method_rename|runkit_return_value_used|runkit_sandbox_output_handler|runkit_superglobals|runtimeexception|samconnection_commit|samconnection_connect|samconnection_constructor|samconnection_disconnect|samconnection_errno|samconnection_error|samconnection_isconnected|samconnection_peek|samconnection_peekall|samconnection_receive|samconnection_remove|samconnection_rollback|samconnection_send|samconnection_setDebug|samconnection_subscribe|samconnection_unsubscribe|sammessage_body|sammessage_constructor|sammessage_header|sca_createdataobject|sca_getservice|sca_localproxy_createdataobject|sca_soapproxy_createdataobject|scandir|sdo_das_changesummary_beginlogging|sdo_das_changesummary_endlogging|sdo_das_changesummary_getchangeddataobjects|sdo_das_changesummary_getchangetype|sdo_das_changesummary_getoldcontainer|sdo_das_changesummary_getoldvalues|sdo_das_changesummary_islogging|sdo_das_datafactory_addpropertytotype|sdo_das_datafactory_addtype|sdo_das_datafactory_getdatafactory|sdo_das_dataobject_getchangesummary|sdo_das_relational_applychanges|sdo_das_relational_construct|sdo_das_relational_createrootdataobject|sdo_das_relational_executepreparedquery|sdo_das_relational_executequery|sdo_das_setting_getlistindex|sdo_das_setting_getpropertyindex|sdo_das_setting_getpropertyname|sdo_das_setting_getvalue|sdo_das_setting_isset|sdo_das_xml_addtypes|sdo_das_xml_create|sdo_das_xml_createdataobject|sdo_das_xml_createdocument|sdo_das_xml_document_getrootdataobject|sdo_das_xml_document_getrootelementname|sdo_das_xml_document_getrootelementuri|sdo_das_xml_document_setencoding|sdo_das_xml_document_setxmldeclaration|sdo_das_xml_document_setxmlversion|sdo_das_xml_loadfile|sdo_das_xml_loadstring|sdo_das_xml_savefile|sdo_das_xml_savestring|sdo_datafactory_create|sdo_dataobject_clear|sdo_dataobject_createdataobject|sdo_dataobject_getcontainer|sdo_dataobject_getsequence|sdo_dataobject_gettypename|sdo_dataobject_gettypenamespaceuri|sdo_exception_getcause|sdo_list_insert|sdo_model_property_getcontainingtype|sdo_model_property_getdefault|sdo_model_property_getname|sdo_model_property_gettype|sdo_model_property_iscontainment|sdo_model_property_ismany|sdo_model_reflectiondataobject_construct|sdo_model_reflectiondataobject_export|sdo_model_reflectiondataobject_getcontainmentproperty|sdo_model_reflectiondataobject_getinstanceproperties|sdo_model_reflectiondataobject_gettype|sdo_model_type_getbasetype|sdo_model_type_getname|sdo_model_type_getnamespaceuri|sdo_model_type_getproperties|sdo_model_type_getproperty|sdo_model_type_isabstracttype|sdo_model_type_isdatatype|sdo_model_type_isinstance|sdo_model_type_isopentype|sdo_model_type_issequencedtype|sdo_sequence_getproperty|sdo_sequence_insert|sdo_sequence_move|seekableiterator|sem_acquire|sem_get|sem_release|sem_remove|serializable|serialize|session_cache_expire|session_cache_limiter|session_commit|session_decode|session_destroy|session_encode|session_get_cookie_params|session_id|session_is_registered|session_module_name|session_name|session_pgsql_add_error|session_pgsql_get_error|session_pgsql_get_field|session_pgsql_reset|session_pgsql_set_field|session_pgsql_status|session_regenerate_id|session_register|session_save_path|session_set_cookie_params|session_set_save_handler|session_start|session_unregister|session_unset|session_write_close|setCounterClass|set_error_handler|set_exception_handler|set_file_buffer|set_include_path|set_magic_quotes_runtime|set_socket_blocking|set_time_limit|setcookie|setlocale|setproctitle|setrawcookie|setstaticpropertyvalue|setthreadtitle|settype|sha1|sha1_file|shell_exec|shm_attach|shm_detach|shm_get_var|shm_has_var|shm_put_var|shm_remove|shm_remove_var|shmop_close|shmop_delete|shmop_open|shmop_read|shmop_size|shmop_write|show_source|shuffle|signeurlpaiement|similar_text|simplexml_import_dom|simplexml_load_file|simplexml_load_string|simplexmlelement|simplexmliterator|sin|sinh|sizeof|sleep|snmp|snmp2_get|snmp2_getnext|snmp2_real_walk|snmp2_set|snmp2_walk|snmp3_get|snmp3_getnext|snmp3_real_walk|snmp3_set|snmp3_walk|snmp_get_quick_print|snmp_get_valueretrieval|snmp_read_mib|snmp_set_enum_print|snmp_set_oid_numeric_print|snmp_set_oid_output_format|snmp_set_quick_print|snmp_set_valueretrieval|snmpget|snmpgetnext|snmprealwalk|snmpset|snmpwalk|snmpwalkoid|soapclient|soapfault|soapheader|soapparam|soapserver|soapvar|socket_accept|socket_bind|socket_clear_error|socket_close|socket_connect|socket_create|socket_create_listen|socket_create_pair|socket_get_option|socket_get_status|socket_getpeername|socket_getsockname|socket_last_error|socket_listen|socket_read|socket_recv|socket_recvfrom|socket_select|socket_send|socket_sendto|socket_set_block|socket_set_blocking|socket_set_nonblock|socket_set_option|socket_set_timeout|socket_shutdown|socket_strerror|socket_write|solr_get_version|solrclient|solrclientexception|solrdocument|solrdocumentfield|solrexception|solrgenericresponse|solrillegalargumentexception|solrillegaloperationexception|solrinputdocument|solrmodifiableparams|solrobject|solrparams|solrpingresponse|solrquery|solrqueryresponse|solrresponse|solrupdateresponse|solrutils|sort|soundex|sphinxclient|spl_autoload|spl_autoload_call|spl_autoload_extensions|spl_autoload_functions|spl_autoload_register|spl_autoload_unregister|spl_classes|spl_object_hash|splbool|spldoublylinkedlist|splenum|splfileinfo|splfileobject|splfixedarray|splfloat|splheap|splint|split|spliti|splmaxheap|splminheap|splobjectstorage|splobserver|splpriorityqueue|splqueue|splstack|splstring|splsubject|spltempfileobject|spoofchecker|sprintf|sql_regcase|sqlite3|sqlite3result|sqlite3stmt|sqlite_array_query|sqlite_busy_timeout|sqlite_changes|sqlite_close|sqlite_column|sqlite_create_aggregate|sqlite_create_function|sqlite_current|sqlite_error_string|sqlite_escape_string|sqlite_exec|sqlite_factory|sqlite_fetch_all|sqlite_fetch_array|sqlite_fetch_column_types|sqlite_fetch_object|sqlite_fetch_single|sqlite_fetch_string|sqlite_field_name|sqlite_has_more|sqlite_has_prev|sqlite_key|sqlite_last_error|sqlite_last_insert_rowid|sqlite_libencoding|sqlite_libversion|sqlite_next|sqlite_num_fields|sqlite_num_rows|sqlite_open|sqlite_popen|sqlite_prev|sqlite_query|sqlite_rewind|sqlite_seek|sqlite_single_query|sqlite_udf_decode_binary|sqlite_udf_encode_binary|sqlite_unbuffered_query|sqlite_valid|sqrt|srand|sscanf|ssdeep_fuzzy_compare|ssdeep_fuzzy_hash|ssdeep_fuzzy_hash_filename|ssh2_auth_hostbased_file|ssh2_auth_none|ssh2_auth_password|ssh2_auth_pubkey_file|ssh2_connect|ssh2_exec|ssh2_fetch_stream|ssh2_fingerprint|ssh2_methods_negotiated|ssh2_publickey_add|ssh2_publickey_init|ssh2_publickey_list|ssh2_publickey_remove|ssh2_scp_recv|ssh2_scp_send|ssh2_sftp|ssh2_sftp_lstat|ssh2_sftp_mkdir|ssh2_sftp_readlink|ssh2_sftp_realpath|ssh2_sftp_rename|ssh2_sftp_rmdir|ssh2_sftp_stat|ssh2_sftp_symlink|ssh2_sftp_unlink|ssh2_shell|ssh2_tunnel|stat|stats_absolute_deviation|stats_cdf_beta|stats_cdf_binomial|stats_cdf_cauchy|stats_cdf_chisquare|stats_cdf_exponential|stats_cdf_f|stats_cdf_gamma|stats_cdf_laplace|stats_cdf_logistic|stats_cdf_negative_binomial|stats_cdf_noncentral_chisquare|stats_cdf_noncentral_f|stats_cdf_poisson|stats_cdf_t|stats_cdf_uniform|stats_cdf_weibull|stats_covariance|stats_den_uniform|stats_dens_beta|stats_dens_cauchy|stats_dens_chisquare|stats_dens_exponential|stats_dens_f|stats_dens_gamma|stats_dens_laplace|stats_dens_logistic|stats_dens_negative_binomial|stats_dens_normal|stats_dens_pmf_binomial|stats_dens_pmf_hypergeometric|stats_dens_pmf_poisson|stats_dens_t|stats_dens_weibull|stats_harmonic_mean|stats_kurtosis|stats_rand_gen_beta|stats_rand_gen_chisquare|stats_rand_gen_exponential|stats_rand_gen_f|stats_rand_gen_funiform|stats_rand_gen_gamma|stats_rand_gen_ibinomial|stats_rand_gen_ibinomial_negative|stats_rand_gen_int|stats_rand_gen_ipoisson|stats_rand_gen_iuniform|stats_rand_gen_noncenral_chisquare|stats_rand_gen_noncentral_f|stats_rand_gen_noncentral_t|stats_rand_gen_normal|stats_rand_gen_t|stats_rand_get_seeds|stats_rand_phrase_to_seeds|stats_rand_ranf|stats_rand_setall|stats_skew|stats_standard_deviation|stats_stat_binomial_coef|stats_stat_correlation|stats_stat_gennch|stats_stat_independent_t|stats_stat_innerproduct|stats_stat_noncentral_t|stats_stat_paired_t|stats_stat_percentile|stats_stat_powersum|stats_variance|stomp|stomp_connect_error|stomp_version|stompexception|stompframe|str_getcsv|str_ireplace|str_pad|str_repeat|str_replace|str_rot13|str_shuffle|str_split|str_word_count|strcasecmp|strchr|strcmp|strcoll|strcspn|stream_bucket_append|stream_bucket_make_writeable|stream_bucket_new|stream_bucket_prepend|stream_context_create|stream_context_get_default|stream_context_get_options|stream_context_get_params|stream_context_set_default|stream_context_set_option|stream_context_set_params|stream_copy_to_stream|stream_encoding|stream_filter_append|stream_filter_prepend|stream_filter_register|stream_filter_remove|stream_get_contents|stream_get_filters|stream_get_line|stream_get_meta_data|stream_get_transports|stream_get_wrappers|stream_is_local|stream_notification_callback|stream_register_wrapper|stream_resolve_include_path|stream_select|stream_set_blocking|stream_set_read_buffer|stream_set_timeout|stream_set_write_buffer|stream_socket_accept|stream_socket_client|stream_socket_enable_crypto|stream_socket_get_name|stream_socket_pair|stream_socket_recvfrom|stream_socket_sendto|stream_socket_server|stream_socket_shutdown|stream_supports_lock|stream_wrapper_register|stream_wrapper_restore|stream_wrapper_unregister|streamwrapper|strftime|strip_tags|stripcslashes|stripos|stripslashes|stristr|strlen|strnatcasecmp|strnatcmp|strncasecmp|strncmp|strpbrk|strpos|strptime|strrchr|strrev|strripos|strrpos|strspn|strstr|strtok|strtolower|strtotime|strtoupper|strtr|strval|substr|substr_compare|substr_count|substr_replace|svm|svmmodel|svn_add|svn_auth_get_parameter|svn_auth_set_parameter|svn_blame|svn_cat|svn_checkout|svn_cleanup|svn_client_version|svn_commit|svn_delete|svn_diff|svn_export|svn_fs_abort_txn|svn_fs_apply_text|svn_fs_begin_txn2|svn_fs_change_node_prop|svn_fs_check_path|svn_fs_contents_changed|svn_fs_copy|svn_fs_delete|svn_fs_dir_entries|svn_fs_file_contents|svn_fs_file_length|svn_fs_is_dir|svn_fs_is_file|svn_fs_make_dir|svn_fs_make_file|svn_fs_node_created_rev|svn_fs_node_prop|svn_fs_props_changed|svn_fs_revision_prop|svn_fs_revision_root|svn_fs_txn_root|svn_fs_youngest_rev|svn_import|svn_log|svn_ls|svn_mkdir|svn_repos_create|svn_repos_fs|svn_repos_fs_begin_txn_for_commit|svn_repos_fs_commit_txn|svn_repos_hotcopy|svn_repos_open|svn_repos_recover|svn_revert|svn_status|svn_update|swf_actiongeturl|swf_actiongotoframe|swf_actiongotolabel|swf_actionnextframe|swf_actionplay|swf_actionprevframe|swf_actionsettarget|swf_actionstop|swf_actiontogglequality|swf_actionwaitforframe|swf_addbuttonrecord|swf_addcolor|swf_closefile|swf_definebitmap|swf_definefont|swf_defineline|swf_definepoly|swf_definerect|swf_definetext|swf_endbutton|swf_enddoaction|swf_endshape|swf_endsymbol|swf_fontsize|swf_fontslant|swf_fonttracking|swf_getbitmapinfo|swf_getfontinfo|swf_getframe|swf_labelframe|swf_lookat|swf_modifyobject|swf_mulcolor|swf_nextid|swf_oncondition|swf_openfile|swf_ortho|swf_ortho2|swf_perspective|swf_placeobject|swf_polarview|swf_popmatrix|swf_posround|swf_pushmatrix|swf_removeobject|swf_rotate|swf_scale|swf_setfont|swf_setframe|swf_shapearc|swf_shapecurveto|swf_shapecurveto3|swf_shapefillbitmapclip|swf_shapefillbitmaptile|swf_shapefilloff|swf_shapefillsolid|swf_shapelinesolid|swf_shapelineto|swf_shapemoveto|swf_showframe|swf_startbutton|swf_startdoaction|swf_startshape|swf_startsymbol|swf_textwidth|swf_translate|swf_viewport|swfaction|swfbitmap|swfbutton|swfdisplayitem|swffill|swffont|swffontchar|swfgradient|swfmorph|swfmovie|swfprebuiltclip|swfshape|swfsound|swfsoundinstance|swfsprite|swftext|swftextfield|swfvideostream|swish_construct|swish_getmetalist|swish_getpropertylist|swish_prepare|swish_query|swishresult_getmetalist|swishresult_stem|swishresults_getparsedwords|swishresults_getremovedstopwords|swishresults_nextresult|swishresults_seekresult|swishsearch_execute|swishsearch_resetlimit|swishsearch_setlimit|swishsearch_setphrasedelimiter|swishsearch_setsort|swishsearch_setstructure|sybase_affected_rows|sybase_close|sybase_connect|sybase_data_seek|sybase_deadlock_retry_count|sybase_fetch_array|sybase_fetch_assoc|sybase_fetch_field|sybase_fetch_object|sybase_fetch_row|sybase_field_seek|sybase_free_result|sybase_get_last_message|sybase_min_client_severity|sybase_min_error_severity|sybase_min_message_severity|sybase_min_server_severity|sybase_num_fields|sybase_num_rows|sybase_pconnect|sybase_query|sybase_result|sybase_select_db|sybase_set_message_handler|sybase_unbuffered_query|symlink|sys_get_temp_dir|sys_getloadavg|syslog|system|tag|tan|tanh|tcpwrap_check|tempnam|textdomain|tidy|tidy_access_count|tidy_config_count|tidy_diagnose|tidy_error_count|tidy_get_error_buffer|tidy_get_output|tidy_load_config|tidy_reset_config|tidy_save_config|tidy_set_encoding|tidy_setopt|tidy_warning_count|tidynode|time|time_nanosleep|time_sleep_until|timezone_abbreviations_list|timezone_identifiers_list|timezone_location_get|timezone_name_from_abbr|timezone_name_get|timezone_offset_get|timezone_open|timezone_transitions_get|timezone_version_get|tmpfile|token_get_all|token_name|tokyotyrant|tokyotyrantquery|tokyotyranttable|tostring|tostring|touch|transliterator|traversable|trigger_error|trim|uasort|ucfirst|ucwords|udm_add_search_limit|udm_alloc_agent|udm_alloc_agent_array|udm_api_version|udm_cat_list|udm_cat_path|udm_check_charset|udm_check_stored|udm_clear_search_limits|udm_close_stored|udm_crc32|udm_errno|udm_error|udm_find|udm_free_agent|udm_free_ispell_data|udm_free_res|udm_get_doc_count|udm_get_res_field|udm_get_res_param|udm_hash32|udm_load_ispell_data|udm_open_stored|udm_set_agent_param|uksort|umask|underflowexception|unexpectedvalueexception|uniqid|unixtojd|unlink|unpack|unregister_tick_function|unserialize|unset|urldecode|urlencode|use_soap_error_handler|user_error|usleep|usort|utf8_decode|utf8_encode|v8js|v8jsexception|var_dump|var_export|variant|variant_abs|variant_add|variant_and|variant_cast|variant_cat|variant_cmp|variant_date_from_timestamp|variant_date_to_timestamp|variant_div|variant_eqv|variant_fix|variant_get_type|variant_idiv|variant_imp|variant_int|variant_mod|variant_mul|variant_neg|variant_not|variant_or|variant_pow|variant_round|variant_set|variant_set_type|variant_sub|variant_xor|version_compare|vfprintf|virtual|vpopmail_add_alias_domain|vpopmail_add_alias_domain_ex|vpopmail_add_domain|vpopmail_add_domain_ex|vpopmail_add_user|vpopmail_alias_add|vpopmail_alias_del|vpopmail_alias_del_domain|vpopmail_alias_get|vpopmail_alias_get_all|vpopmail_auth_user|vpopmail_del_domain|vpopmail_del_domain_ex|vpopmail_del_user|vpopmail_error|vpopmail_passwd|vpopmail_set_user_quota|vprintf|vsprintf|w32api_deftype|w32api_init_dtype|w32api_invoke_function|w32api_register_function|w32api_set_call_method|wddx_add_vars|wddx_deserialize|wddx_packet_end|wddx_packet_start|wddx_serialize_value|wddx_serialize_vars|win32_continue_service|win32_create_service|win32_delete_service|win32_get_last_control_message|win32_pause_service|win32_ps_list_procs|win32_ps_stat_mem|win32_ps_stat_proc|win32_query_service_status|win32_set_service_status|win32_start_service|win32_start_service_ctrl_dispatcher|win32_stop_service|wincache_fcache_fileinfo|wincache_fcache_meminfo|wincache_lock|wincache_ocache_fileinfo|wincache_ocache_meminfo|wincache_refresh_if_changed|wincache_rplist_fileinfo|wincache_rplist_meminfo|wincache_scache_info|wincache_scache_meminfo|wincache_ucache_add|wincache_ucache_cas|wincache_ucache_clear|wincache_ucache_dec|wincache_ucache_delete|wincache_ucache_exists|wincache_ucache_get|wincache_ucache_inc|wincache_ucache_info|wincache_ucache_meminfo|wincache_ucache_set|wincache_unlock|wordwrap|xattr_get|xattr_list|xattr_remove|xattr_set|xattr_supported|xdiff_file_bdiff|xdiff_file_bdiff_size|xdiff_file_bpatch|xdiff_file_diff|xdiff_file_diff_binary|xdiff_file_merge3|xdiff_file_patch|xdiff_file_patch_binary|xdiff_file_rabdiff|xdiff_string_bdiff|xdiff_string_bdiff_size|xdiff_string_bpatch|xdiff_string_diff|xdiff_string_diff_binary|xdiff_string_merge3|xdiff_string_patch|xdiff_string_patch_binary|xdiff_string_rabdiff|xhprof_disable|xhprof_enable|xhprof_sample_disable|xhprof_sample_enable|xml_error_string|xml_get_current_byte_index|xml_get_current_column_number|xml_get_current_line_number|xml_get_error_code|xml_parse|xml_parse_into_struct|xml_parser_create|xml_parser_create_ns|xml_parser_free|xml_parser_get_option|xml_parser_set_option|xml_set_character_data_handler|xml_set_default_handler|xml_set_element_handler|xml_set_end_namespace_decl_handler|xml_set_external_entity_ref_handler|xml_set_notation_decl_handler|xml_set_object|xml_set_processing_instruction_handler|xml_set_start_namespace_decl_handler|xml_set_unparsed_entity_decl_handler|xmlreader|xmlrpc_decode|xmlrpc_decode_request|xmlrpc_encode|xmlrpc_encode_request|xmlrpc_get_type|xmlrpc_is_fault|xmlrpc_parse_method_descriptions|xmlrpc_server_add_introspection_data|xmlrpc_server_call_method|xmlrpc_server_create|xmlrpc_server_destroy|xmlrpc_server_register_introspection_callback|xmlrpc_server_register_method|xmlrpc_set_type|xmlwriter_end_attribute|xmlwriter_end_cdata|xmlwriter_end_comment|xmlwriter_end_document|xmlwriter_end_dtd|xmlwriter_end_dtd_attlist|xmlwriter_end_dtd_element|xmlwriter_end_dtd_entity|xmlwriter_end_element|xmlwriter_end_pi|xmlwriter_flush|xmlwriter_full_end_element|xmlwriter_open_memory|xmlwriter_open_uri|xmlwriter_output_memory|xmlwriter_set_indent|xmlwriter_set_indent_string|xmlwriter_start_attribute|xmlwriter_start_attribute_ns|xmlwriter_start_cdata|xmlwriter_start_comment|xmlwriter_start_document|xmlwriter_start_dtd|xmlwriter_start_dtd_attlist|xmlwriter_start_dtd_element|xmlwriter_start_dtd_entity|xmlwriter_start_element|xmlwriter_start_element_ns|xmlwriter_start_pi|xmlwriter_text|xmlwriter_write_attribute|xmlwriter_write_attribute_ns|xmlwriter_write_cdata|xmlwriter_write_comment|xmlwriter_write_dtd|xmlwriter_write_dtd_attlist|xmlwriter_write_dtd_element|xmlwriter_write_dtd_entity|xmlwriter_write_element|xmlwriter_write_element_ns|xmlwriter_write_pi|xmlwriter_write_raw|xpath_eval|xpath_eval_expression|xpath_new_context|xpath_register_ns|xpath_register_ns_auto|xptr_eval|xptr_new_context|xslt_backend_info|xslt_backend_name|xslt_backend_version|xslt_create|xslt_errno|xslt_error|xslt_free|xslt_getopt|xslt_process|xslt_set_base|xslt_set_encoding|xslt_set_error_handler|xslt_set_log|xslt_set_object|xslt_set_sax_handler|xslt_set_sax_handlers|xslt_set_scheme_handler|xslt_set_scheme_handlers|xslt_setopt|xsltprocessor|yaml_emit|yaml_emit_file|yaml_parse|yaml_parse_file|yaml_parse_url|yaz_addinfo|yaz_ccl_conf|yaz_ccl_parse|yaz_close|yaz_connect|yaz_database|yaz_element|yaz_errno|yaz_error|yaz_es|yaz_es_result|yaz_get_option|yaz_hits|yaz_itemorder|yaz_present|yaz_range|yaz_record|yaz_scan|yaz_scan_result|yaz_schema|yaz_search|yaz_set_option|yaz_sort|yaz_syntax|yaz_wait|yp_all|yp_cat|yp_err_string|yp_errno|yp_first|yp_get_default_domain|yp_master|yp_match|yp_next|yp_order|zend_logo_guid|zend_thread_id|zend_version|zip_close|zip_entry_close|zip_entry_compressedsize|zip_entry_compressionmethod|zip_entry_filesize|zip_entry_name|zip_entry_open|zip_entry_read|zip_open|zip_read|ziparchive|ziparchive_addemptydir|ziparchive_addfile|ziparchive_addfromstring|ziparchive_close|ziparchive_deleteindex|ziparchive_deletename|ziparchive_extractto|ziparchive_getarchivecomment|ziparchive_getcommentindex|ziparchive_getcommentname|ziparchive_getfromindex|ziparchive_getfromname|ziparchive_getnameindex|ziparchive_getstatusstring|ziparchive_getstream|ziparchive_locatename|ziparchive_open|ziparchive_renameindex|ziparchive_renamename|ziparchive_setCommentName|ziparchive_setarchivecomment|ziparchive_setcommentindex|ziparchive_statindex|ziparchive_statname|ziparchive_unchangeall|ziparchive_unchangearchive|ziparchive_unchangeindex|ziparchive_unchangename|zlib_get_coding_type".split("|")),c=e.arrayToMap("abstract|and|array|as|break|case|catch|class|clone|const|continue|declare|default|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|final|for|foreach|function|global|goto|if|implements|interface|instanceof|namespace|new|or|private|protected|public|static|switch|throw|try|use|var|while|xor".split("|")),d=e.arrayToMap("die|echo|empty|exit|eval|include|include_once|isset|list|require|require_once|return|print|unset".split("|")),g=e.arrayToMap("true|false|null|__CLASS__|__DIR__|__FILE__|__LINE__|__METHOD__|__FUNCTION__|__NAMESPACE__".split("|")),h=e.arrayToMap("$GLOBALS|$_SERVER|$_GET|$_POST|$_FILES|$_REQUEST|$_SESSION|$_ENV|$_COOKIE|$php_errormsg|$HTTP_RAW_POST_DATA|$http_response_header|$argc|$argv".split("|")),i=e.arrayToMap("key_exists|cairo_matrix_create_scale|cairo_matrix_create_translate|call_user_method|call_user_method_array|com_addref|com_get|com_invoke|com_isenum|com_load|com_release|com_set|connection_timeout|cubrid_load_from_glo|cubrid_new_glo|cubrid_save_to_glo|cubrid_send_glo|define_syslog_variables|dl|ereg|ereg_replace|eregi|eregi_replace|hw_documentattributes|hw_documentbodytag|hw_documentsize|hw_outputdocument|imagedashedline|maxdb_bind_param|maxdb_bind_result|maxdb_client_encoding|maxdb_close_long_data|maxdb_execute|maxdb_fetch|maxdb_get_metadata|maxdb_param_count|maxdb_send_long_data|mcrypt_ecb|mcrypt_generic_end|mime_content_type|mysql_createdb|mysql_dbname|mysql_db_query|mysql_drop_db|mysql_dropdb|mysql_escape_string|mysql_fieldflags|mysql_fieldflags|mysql_fieldname|mysql_fieldtable|mysql_fieldtype|mysql_freeresult|mysql_listdbs|mysql_list_fields|mysql_listfields|mysql_list_tables|mysql_listtables|mysql_numfields|mysql_numrows|mysql_selectdb|mysql_tablename|mysqli_bind_param|mysqli_bind_result|mysqli_disable_reads_from_master|mysqli_disable_rpl_parse|mysqli_enable_reads_from_master|mysqli_enable_rpl_parse|mysqli_execute|mysqli_fetch|mysqli_get_metadata|mysqli_master_query|mysqli_param_count|mysqli_rpl_parse_enabled|mysqli_rpl_probe|mysqli_rpl_query_type|mysqli_send_long_data|mysqli_send_query|mysqli_slave_query|ocibindbyname|ocicancel|ocicloselob|ocicollappend|ocicollassign|ocicollassignelem|ocicollgetelem|ocicollmax|ocicollsize|ocicolltrim|ocicolumnisnull|ocicolumnname|ocicolumnprecision|ocicolumnscale|ocicolumnsize|ocicolumntype|ocicolumntyperaw|ocicommit|ocidefinebyname|ocierror|ociexecute|ocifetch|ocifetchinto|ocifetchstatement|ocifreecollection|ocifreecursor|ocifreedesc|ocifreestatement|ociinternaldebug|ociloadlob|ocilogoff|ocilogon|ocinewcollection|ocinewcursor|ocinewdescriptor|ocinlogon|ocinumcols|ociparse|ociplogon|ociresult|ocirollback|ocirowcount|ocisavelob|ocisavelobfile|ociserverversion|ocisetprefetch|ocistatementtype|ociwritelobtofile|ociwritetemporarylob|PDF_add_annotation|PDF_add_bookmark|PDF_add_launchlink|PDF_add_locallink|PDF_add_note|PDF_add_outline|PDF_add_pdflink|PDF_add_weblink|PDF_attach_file|PDF_begin_page|PDF_begin_template|PDF_close_pdi|PDF_close|PDF_findfont|PDF_get_font|PDF_get_fontname|PDF_get_fontsize|PDF_get_image_height|PDF_get_image_width|PDF_get_majorversion|PDF_get_minorversion|PDF_get_pdi_parameter|PDF_get_pdi_value|PDF_open_ccitt|PDF_open_file|PDF_open_gif|PDF_open_image_file|PDF_open_image|PDF_open_jpeg|PDF_open_pdi|PDF_open_tiff|PDF_place_image|PDF_place_pdi_page|PDF_set_border_color|PDF_set_border_dash|PDF_set_border_style|PDF_set_char_spacing|PDF_set_duration|PDF_set_horiz_scaling|PDF_set_info_author|PDF_set_info_creator|PDF_set_info_keywords|PDF_set_info_subject|PDF_set_info_title|PDF_set_leading|PDF_set_text_matrix|PDF_set_text_rendering|PDF_set_text_rise|PDF_set_word_spacing|PDF_setgray_fill|PDF_setgray_stroke|PDF_setgray|PDF_setpolydash|PDF_setrgbcolor_fill|PDF_setrgbcolor_stroke|PDF_setrgbcolor|PDF_show_boxed|php_check_syntax|px_set_tablename|px_set_targetencoding|runkit_sandbox_output_handler|session_is_registered|session_register|session_unregisterset_magic_quotes_runtime|magic_quotes_runtime|set_socket_blocking|socket_set_blocking|set_socket_timeout|socket_set_timeout|split|spliti|sql_regcase".split("|")),j=e.arrayToMap("cfunction|old_function".split("|")),k=e.arrayToMap([]);this.$rules={start:[{token:"support.php_tag",regex:"<\\?(?:php|\\=)"},{token:"support.php_tag",regex:"\\?>"},{token:"comment",regex:"<\\!--",next:"htmlcomment"},{token:"meta.tag",regex:"<style",next:"css"},{token:"meta.tag",regex:"<\\/?[-_a-zA-Z0-9:]+",next:"htmltag"},{token:"meta.tag",regex:"<!DOCTYPE.*?>"},{token:"comment",regex:"\\/\\/.*$"},{token:"comment",regex:"#.*$"},a.getStartRule("doc-start"),{token:"comment",regex:"\\/\\*",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/][gimy]*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language",regex:"\\b(?:DEFAULT_INCLUDE_PATH|E_(?:ALL|CO(?:MPILE_(?:ERROR|WARNING)|RE_(?:ERROR|WARNING))|ERROR|NOTICE|PARSE|STRICT|USER_(?:ERROR|NOTICE|WARNING)|WARNING)|P(?:EAR_(?:EXTENSION_DIR|INSTALL_DIR)|HP_(?:BINDIR|CONFIG_FILE_(?:PATH|SCAN_DIR)|DATADIR|E(?:OL|XTENSION_DIR)|INT_(?:MAX|SIZE)|L(?:IBDIR|OCALSTATEDIR)|O(?:S|UTPUT_HANDLER_(?:CONT|END|START))|PREFIX|S(?:API|HLIB_SUFFIX|YSCONFDIR)|VERSION))|__COMPILER_HALT_OFFSET__)\\b"},{token:"constant.language",regex:"\\b(?:A(?:B(?:DAY_(?:1|2|3|4|5|6|7)|MON_(?:1(?:0|1|2|)|2|3|4|5|6|7|8|9))|LT_DIGITS|M_STR|SSERT_(?:ACTIVE|BAIL|CALLBACK|QUIET_EVAL|WARNING))|C(?:ASE_(?:LOWER|UPPER)|HAR_MAX|O(?:DESET|NNECTION_(?:ABORTED|NORMAL|TIMEOUT)|UNT_(?:NORMAL|RECURSIVE))|R(?:EDITS_(?:ALL|DOCS|FULLPAGE|G(?:ENERAL|ROUP)|MODULES|QA|SAPI)|NCYSTR|YPT_(?:BLOWFISH|EXT_DES|MD5|S(?:ALT_LENGTH|TD_DES)))|URRENCY_SYMBOL)|D(?:AY_(?:1|2|3|4|5|6|7)|ECIMAL_POINT|IRECTORY_SEPARATOR|_(?:FMT|T_FMT))|E(?:NT_(?:COMPAT|NOQUOTES|QUOTES)|RA(?:_(?:D_(?:FMT|T_FMT)|T_FMT|YEAR)|)|XTR_(?:IF_EXISTS|OVERWRITE|PREFIX_(?:ALL|I(?:F_EXISTS|NVALID)|SAME)|SKIP))|FRAC_DIGITS|GROUPING|HTML_(?:ENTITIES|SPECIALCHARS)|IN(?:FO_(?:ALL|C(?:ONFIGURATION|REDITS)|ENVIRONMENT|GENERAL|LICENSE|MODULES|VARIABLES)|I_(?:ALL|PERDIR|SYSTEM|USER)|T_(?:CURR_SYMBOL|FRAC_DIGITS))|L(?:C_(?:ALL|C(?:OLLATE|TYPE)|M(?:ESSAGES|ONETARY)|NUMERIC|TIME)|O(?:CK_(?:EX|NB|SH|UN)|G_(?:A(?:LERT|UTH(?:PRIV|))|C(?:ONS|R(?:IT|ON))|D(?:AEMON|EBUG)|E(?:MERG|RR)|INFO|KERN|L(?:OCAL(?:0|1|2|3|4|5|6|7)|PR)|MAIL|N(?:DELAY|EWS|O(?:TICE|WAIT))|ODELAY|P(?:ERROR|ID)|SYSLOG|U(?:SER|UCP)|WARNING)))|M(?:ON_(?:1(?:0|1|2|)|2|3|4|5|6|7|8|9|DECIMAL_POINT|GROUPING|THOUSANDS_SEP)|_(?:1_PI|2_(?:PI|SQRTPI)|E|L(?:N(?:10|2)|OG(?:10E|2E))|PI(?:_(?:2|4)|)|SQRT(?:1_2|2)))|N(?:EGATIVE_SIGN|O(?:EXPR|STR)|_(?:CS_PRECEDES|S(?:EP_BY_SPACE|IGN_POSN)))|P(?:ATH(?:INFO_(?:BASENAME|DIRNAME|EXTENSION)|_SEPARATOR)|M_STR|OSITIVE_SIGN|_(?:CS_PRECEDES|S(?:EP_BY_SPACE|IGN_POSN)))|RADIXCHAR|S(?:EEK_(?:CUR|END|SET)|ORT_(?:ASC|DESC|NUMERIC|REGULAR|STRING)|TR_PAD_(?:BOTH|LEFT|RIGHT))|T(?:HOUS(?:ANDS_SEP|EP)|_FMT(?:_AMPM|))|YES(?:EXPR|STR)|STD(?:IN|OUT|ERR))\\b"},{token:function(a){return c.hasOwnProperty(a)?"keyword":g.hasOwnProperty(a)?"constant.language":h.hasOwnProperty(a)?"variable.language":k.hasOwnProperty(a)?"invalid.illegal":b.hasOwnProperty(a)?"support.function":a=="debugger"?"invalid.deprecated":a.match(/^(\$[a-zA-Z][a-zA-Z0-9_]*|self|parent)$/)?"variable":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",regex:".+"}],htmlcomment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",regex:".+"}],htmltag:[{token:"meta.tag",regex:">",next:"start"},{token:"text",regex:"[-_a-zA-Z0-9:]+"},{token:"text",regex:"\\s+"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"}],css:[{token:"meta.tag",regex:"</style>",next:"htmltag"},{token:"meta.tag",regex:">"},{token:"text",regex:"(?:media|type|href)"},{token:"string",regex:'=".*?"'},{token:"paren.lparen",regex:"{",next:"cssdeclaration"},{token:"keyword",regex:"#[A-Za-z0-9-_.]+"},{token:"variable",regex:"\\.[A-Za-z0-9-_.]+"},{token:"constant",regex:"[A-Za-z0-9]+"}],cssdeclaration:[{token:"support.type",regex:"[-a-zA-Z]+",next:"cssvalue"},{token:"paren.rparen",regex:"}",next:"css"}],cssvalue:[{token:"text",regex:":"},{token:"constant",regex:"#[0-9a-zA-Z]+"},{token:"text",regex:"[-_0-9a-zA-Z\"' ,%]+"},{token:"text",regex:";",next:"cssdeclaration"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.PhpHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return null;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-powershell.js b/apps/files_texteditor/js/aceeditor/mode-powershell.js
new file mode 100755
index 00000000000..9bbdef6989b
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-powershell.js
@@ -0,0 +1 @@
+define("ace/mode/powershell",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/powershell_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./powershell_highlight_rules").PowershellHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./behaviour/cstyle").CstyleBehaviour,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new i,this.foldingRules=new j};d.inherits(k,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){return null}}.call(k.prototype),b.Mode=k}),define("ace/mode/powershell_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("function|if|else|elseif|switch|while|default|for|do|until|break|continue|foreach|return|filter|in|trap|throw|param|begin|process|end".split("|")),b=e.arrayToMap("Get-Alias|Import-Alias|New-Alias|Set-Alias|Get-AuthenticodeSignature|Set-AuthenticodeSignature|Set-Location|Get-ChildItem|Clear-Item|Get-Command|Measure-Command|Trace-Command|Add-Computer|Checkpoint-Computer|Remove-Computer|Restart-Computer|Restore-Computer|Stop-Computer|Reset-ComputerMachinePassword|Test-ComputerSecureChannel|Add-Content|Get-Content|Set-Content|Clear-Content|Get-Command|Invoke-Command|Enable-ComputerRestore|Disable-ComputerRestore|Get-ComputerRestorePoint|Test-Connection|ConvertFrom-CSV|ConvertTo-CSV|ConvertTo-Html|ConvertTo-Xml|ConvertFrom-SecureString|ConvertTo-SecureString|Copy-Item|Export-Counter|Get-Counter|Import-Counter|Get-Credential|Get-Culture|Get-ChildItem|Get-Date|Set-Date|Remove-Item|Compare-Object|Get-Event|Get-WinEvent|New-Event|Remove-Event|Unregister-Event|Wait-Event|Clear-EventLog|Get-Eventlog|Limit-EventLog|New-Eventlog|Remove-EventLog|Show-EventLog|Write-EventLog|Get-EventSubscriber|Register-EngineEvent|Register-ObjectEvent|Register-WmiEvent|Get-ExecutionPolicy|Set-ExecutionPolicy|Export-Alias|Export-Clixml|Export-Console|Export-Csv|ForEach-Object|Format-Custom|Format-List|Format-Table|Format-Wide|Export-FormatData|Get-FormatData|Get-Item|Get-ChildItem|Get-Help|Add-History|Clear-History|Get-History|Invoke-History|Get-Host|Read-Host|Write-Host|Get-HotFix|Import-Clixml|Import-Csv|Invoke-Command|Invoke-Expression|Get-Item|Invoke-Item|New-Item|Remove-Item|Set-Item|Clear-ItemProperty|Copy-ItemProperty|Get-ItemProperty|Move-ItemProperty|New-ItemProperty|Remove-ItemProperty|Rename-ItemProperty|Set-ItemProperty|Get-Job|Receive-Job|Remove-Job|Start-Job|Stop-Job|Wait-Job|Stop-Process|Update-List|Get-Location|Pop-Location|Push-Location|Set-Location|Send-MailMessage|Add-Member|Get-Member|Move-Item|Compare-Object|Group-Object|Measure-Object|New-Object|Select-Object|Sort-Object|Where-Object|Out-Default|Out-File|Out-GridView|Out-Host|Out-Null|Out-Printer|Out-String|Convert-Path|Join-Path|Resolve-Path|Split-Path|Test-Path|Get-Pfxcertificate|Pop-Location|Push-Location|Get-Process|Start-Process|Stop-Process|Wait-Process|Enable-PSBreakpoint|Disable-PSBreakpoint|Get-PSBreakpoint|Set-PSBreakpoint|Remove-PSBreakpoint|Get-PSDrive|New-PSDrive|Remove-PSDrive|Get-PSProvider|Set-PSdebug|Enter-PSSession|Exit-PSSession|Export-PSSession|Get-PSSession|Import-PSSession|New-PSSession|Remove-PSSession|Disable-PSSessionConfiguration|Enable-PSSessionConfiguration|Get-PSSessionConfiguration|Register-PSSessionConfiguration|Set-PSSessionConfiguration|Unregister-PSSessionConfiguration|New-PSSessionOption|Add-PsSnapIn|Get-PsSnapin|Remove-PSSnapin|Get-Random|Read-Host|Remove-Item|Rename-Item|Rename-ItemProperty|Select-Object|Select-XML|Send-MailMessage|Get-Service|New-Service|Restart-Service|Resume-Service|Set-Service|Start-Service|Stop-Service|Suspend-Service|Sort-Object|Start-Sleep|ConvertFrom-StringData|Select-String|Tee-Object|New-Timespan|Trace-Command|Get-Tracesource|Set-Tracesource|Start-Transaction|Complete-Transaction|Get-Transaction|Use-Transaction|Undo-Transaction|Start-Transcript|Stop-Transcript|Add-Type|Update-TypeData|Get-Uiculture|Get-Unique|Update-Formatdata|Update-Typedata|Clear-Variable|Get-Variable|New-Variable|Remove-Variable|Set-Variable|New-WebServiceProxy|Where-Object|Write-Debug|Write-Error|Write-Host|Write-Output|Write-Progress|Write-Verbose|Write-Warning|Set-WmiInstance|Invoke-WmiMethod|Get-WmiObject|Remove-WmiObject|Connect-WSMan|Disconnect-WSMan|Test-WSMan|Invoke-WSManAction|Disable-WSManCredSSP|Enable-WSManCredSSP|Get-WSManCredSSP|New-WSManInstance|Get-WSManInstance|Set-WSManInstance|Remove-WSManInstance|Set-WSManQuickConfig|New-WSManSessionOption".split("|")),c="eq|ne|ge|gt|lt|le|like|notlike|match|notmatch|replace|contains|notcontains|ieq|ine|ige|igt|ile|ilt|ilike|inotlike|imatch|inotmatch|ireplace|icontains|inotcontains|is|isnot|as|and|or|band|bor|not";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"[$](?:[Tt]rue|[Ff]alse)\\b"},{token:"constant.language",regex:"[$][Nn]ull\\b"},{token:"variable.instance",regex:"[$][a-zA-Z][a-zA-Z0-9_]*\\b"},{token:function(c){return a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$\\-]*\\b"},{token:"keyword.operator",regex:"\\-(?:"+c+")"},{token:"keyword.operator",regex:"&|\\*|\\+|\\-|\\=|\\+=|\\-="},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PowershellHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return null;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-python.js b/apps/files_texteditor/js/aceeditor/mode-python.js
index e0632e253ea..116f838b1d9 100644
--- a/apps/files_texteditor/js/aceeditor/mode-python.js
+++ b/apps/files_texteditor/js/aceeditor/mode-python.js
@@ -1 +1 @@
-define("ace/mode/python",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/python_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/python_highlight_rules").PythonHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)#/;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[\:]\s*$/);h&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/python_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield".split("|")),b=e.arrayToMap("True|False|None|NotImplemented|Ellipsis|__debug__".split("|")),c=e.arrayToMap("abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|float|list|raw_input|unichr|callable|format|locals|reduce|unicode|chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|__import__|complex|hash|min|set|apply|delattr|help|next|setattr|buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern".split("|")),d=e.arrayToMap("".split("|")),f="(?:r|u|ur|R|U|UR|Ur|uR)?",g="(?:(?:[1-9]\\d*)|(?:0))",h="(?:0[oO]?[0-7]+)",i="(?:0[xX][\\dA-Fa-f]+)",j="(?:0[bB][01]+)",k="(?:"+g+"|"+h+"|"+i+"|"+j+")",l="(?:[eE][+-]?\\d+)",m="(?:\\.\\d+)",n="(?:\\d+)",o="(?:(?:"+n+"?"+m+")|(?:"+n+"\\.))",p="(?:(?:"+o+"|"+n+")"+l+")",q="(?:"+p+"|"+o+")";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:f+'"{3}(?:[^\\\\]|\\\\.)*?"{3}'},{token:"string",merge:!0,regex:f+'"{3}.*$',next:"qqstring"},{token:"string",regex:f+'"(?:[^\\\\]|\\\\.)*?"'},{token:"string",regex:f+"'{3}(?:[^\\\\]|\\\\.)*?'{3}"},{token:"string",merge:!0,regex:f+"'{3}.*$",next:"qstring"},{token:"string",regex:f+"'(?:[^\\\\]|\\\\.)*?'"},{token:"constant.numeric",regex:"(?:"+q+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:q},{token:"constant.numeric",regex:k+"[lL]\\b"},{token:"constant.numeric",regex:k+"\\b"},{token:function(e){return a.hasOwnProperty(e)?"keyword":b.hasOwnProperty(e)?"constant.language":d.hasOwnProperty(e)?"invalid.illegal":c.hasOwnProperty(e)?"support.function":e=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"lparen",regex:"[\\[\\(\\{]"},{token:"rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:[^\\\\]|\\\\.)*?"{3}',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?'{3}",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PythonHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})
\ No newline at end of file
+define("ace/mode/python",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/python_highlight_rules","ace/mode/folding/pythonic","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./python_highlight_rules").PythonHighlightRules,h=a("./folding/pythonic").FoldMode,i=a("../range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.foldingRules=new h("\\:")};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[\:]\s*$/);g&&(d+=c)}return d};var a={pass:1,"return":1,raise:1,"break":1,"continue":1};this.checkOutdent=function(b,c,d){if(d!=="\r\n"&&d!=="\r"&&d!=="\n")return!1;var e=this.$tokenizer.getLineTokens(c.trim(),b).tokens;if(!e)return!1;do var f=e.pop();while(f&&(f.type=="comment"||f.type=="text"&&f.value.match(/^\s+$/)));return f?f.type=="keyword"&&a[f.value]:!1},this.autoOutdent=function(a,b,c){c+=1;var d=this.$getIndent(b.getLine(c)),e=b.getTabString();d.slice(-e.length)==e&&b.remove(new i(c,d.length-e.length,c,d.length))}}.call(j.prototype),b.Mode=j}),define("ace/mode/python_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield".split("|")),b=e.arrayToMap("True|False|None|NotImplemented|Ellipsis|__debug__".split("|")),c=e.arrayToMap("abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|float|list|raw_input|unichr|callable|format|locals|reduce|unicode|chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|__import__|complex|hash|min|set|apply|delattr|help|next|setattr|buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern".split("|")),d=e.arrayToMap("".split("|")),f="(?:r|u|ur|R|U|UR|Ur|uR)?",g="(?:(?:[1-9]\\d*)|(?:0))",h="(?:0[oO]?[0-7]+)",i="(?:0[xX][\\dA-Fa-f]+)",j="(?:0[bB][01]+)",k="(?:"+g+"|"+h+"|"+i+"|"+j+")",l="(?:[eE][+-]?\\d+)",m="(?:\\.\\d+)",n="(?:\\d+)",o="(?:(?:"+n+"?"+m+")|(?:"+n+"\\.))",p="(?:(?:"+o+"|"+n+")"+l+")",q="(?:"+p+"|"+o+")";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:f+'"{3}(?:[^\\\\]|\\\\.)*?"{3}'},{token:"string",merge:!0,regex:f+'"{3}.*$',next:"qqstring"},{token:"string",regex:f+'"(?:[^\\\\]|\\\\.)*?"'},{token:"string",regex:f+"'{3}(?:[^\\\\]|\\\\.)*?'{3}"},{token:"string",merge:!0,regex:f+"'{3}.*$",next:"qstring"},{token:"string",regex:f+"'(?:[^\\\\]|\\\\.)*?'"},{token:"constant.numeric",regex:"(?:"+q+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:q},{token:"constant.numeric",regex:k+"[lL]\\b"},{token:"constant.numeric",regex:k+"\\b"},{token:function(e){return a.hasOwnProperty(e)?"keyword":b.hasOwnProperty(e)?"constant.language":d.hasOwnProperty(e)?"invalid.illegal":c.hasOwnProperty(e)?"support.function":e=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"lparen.paren",regex:"[\\[\\(\\{]"},{token:"paren.rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:[^\\\\]|\\\\.)*?"{3}',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?'{3}",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PythonHighlightRules=g}),define("ace/mode/folding/pythonic",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./fold_mode").FoldMode,f=b.FoldMode=function(a){this.foldingStartMarker=new RegExp("(?:([\\[{])|("+a+"))(?:\\s*)(?:#.*)?$")};d.inherits(f,e),function(){this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),e=d.match(this.foldingStartMarker);if(e)return e[1]?this.openingBracketBlock(a,e[1],c,e.index):e[2]?this.indentationBlock(a,c,e.index+e[2].length):this.indentationBlock(a,c)}}.call(f.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-ruby.js b/apps/files_texteditor/js/aceeditor/mode-ruby.js
index 43bfa2a5d8a..2eeb69f5d5a 100644
--- a/apps/files_texteditor/js/aceeditor/mode-ruby.js
+++ b/apps/files_texteditor/js/aceeditor/mode-ruby.js
@@ -1 +1 @@
-define("ace/mode/ruby",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/ruby_highlight_rules").RubyHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)#/;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[]\s*$/);h&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/ruby_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("abort|Array|assert|assert_equal|assert_not_equal|assert_same|assert_not_same|assert_nil|assert_not_nil|assert_match|assert_no_match|assert_in_delta|assert_throws|assert_raise|assert_nothing_raised|assert_instance_of|assert_kind_of|assert_respond_to|assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|attr|attr_writer|attr_reader|attr_accessor|attr_accessible|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|exit!|fail|Float|flunk|follow_redirect!|fork|form_for|form_tag|format|gets|global_variables|gsub|gsub!|get_via_redirect|h|host!|https?|https!|include|Integer|lambda|link_to|link_to_unless_current|link_to_function|link_to_remote|load|local_variables|loop|open|open_session|p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|set_trace_func|sleep|split|sprintf|srand|String|stylesheet_link_tag|syscall|system|sub|sub!|test|throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan|render|javascript_include_tag|csrf_meta_tag|label_tag|text_field_tag|submit_tag|check_box_tag|content_tag|radio_button_tag|text_area_tag|password_field_tag|hidden_field_tag|fields_for|select_tag|options_for_select|options_from_collection_for_select|collection_select|time_zone_select|select_date|select_time|select_datetime|date_select|time_select|datetime_select|select_year|select_month|select_day|select_hour|select_minute|select_second|file_field_tag|file_field|respond_to|skip_before_filter|around_filter|after_filter|verify|protect_from_forgery|rescue_from|helper_method|redirect_to|before_filter|send_data|send_file|validates_presence_of|validates_uniqueness_of|validates_length_of|validates_format_of|validates_acceptance_of|validates_associated|validates_exclusion_of|validates_inclusion_of|validates_numericality_of|validates_with|validates_each|authenticate_or_request_with_http_basic|authenticate_or_request_with_http_digest|filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|translate|localize|extract_locale_from_tld|t|l|caches_page|expire_page|caches_action|expire_action|cache|expire_fragment|expire_cache_for|observe|cache_sweeper|has_many|has_one|belongs_to|has_and_belongs_to_many".split("|")),b=e.arrayToMap("alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield".split("|")),c=e.arrayToMap("true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING".split("|")),d=e.arrayToMap("$DEBUG|$defout|$FILENAME|$LOAD_PATH|$SAFE|$stdin|$stdout|$stderr|$VERBOSE|$!|root_url|flash|session|cookies|params|request|response|logger".split("|"));this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"comment",merge:!0,regex:"^=begin$",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",regex:"[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"},{token:"text",regex:"::"},{token:"variable.instancce",regex:"@{1,2}(?:[a-zA-Z_]|d)+"},{token:"variable.class",regex:"[A-Z](?:[a-zA-Z_]|d)+"},{token:"string",regex:"[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"},{token:"constant.numeric",regex:"[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return e=="self"?"variable.language":b.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"constant.language":d.hasOwnProperty(e)?"variable.language":a.hasOwnProperty(e)?"support.function":e=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:"^=end$",next:"start"},{token:"comment",merge:!0,regex:".+"}]}};d.inherits(g,f),b.RubyHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})
\ No newline at end of file
+define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./ruby_highlight_rules").RubyHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/ruby_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("abort|Array|assert|assert_equal|assert_not_equal|assert_same|assert_not_same|assert_nil|assert_not_nil|assert_match|assert_no_match|assert_in_delta|assert_throws|assert_raise|assert_nothing_raised|assert_instance_of|assert_kind_of|assert_respond_to|assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|attr|attr_writer|attr_reader|attr_accessor|attr_accessible|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|exit!|fail|Float|flunk|follow_redirect!|fork|form_for|form_tag|format|gets|global_variables|gsub|gsub!|get_via_redirect|h|host!|https?|https!|include|Integer|lambda|link_to|link_to_unless_current|link_to_function|link_to_remote|load|local_variables|loop|open|open_session|p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|set_trace_func|sleep|split|sprintf|srand|String|stylesheet_link_tag|syscall|system|sub|sub!|test|throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan|render|javascript_include_tag|csrf_meta_tag|label_tag|text_field_tag|submit_tag|check_box_tag|content_tag|radio_button_tag|text_area_tag|password_field_tag|hidden_field_tag|fields_for|select_tag|options_for_select|options_from_collection_for_select|collection_select|time_zone_select|select_date|select_time|select_datetime|date_select|time_select|datetime_select|select_year|select_month|select_day|select_hour|select_minute|select_second|file_field_tag|file_field|respond_to|skip_before_filter|around_filter|after_filter|verify|protect_from_forgery|rescue_from|helper_method|redirect_to|before_filter|send_data|send_file|validates_presence_of|validates_uniqueness_of|validates_length_of|validates_format_of|validates_acceptance_of|validates_associated|validates_exclusion_of|validates_inclusion_of|validates_numericality_of|validates_with|validates_each|authenticate_or_request_with_http_basic|authenticate_or_request_with_http_digest|filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|translate|localize|extract_locale_from_tld|t|l|caches_page|expire_page|caches_action|expire_action|cache|expire_fragment|expire_cache_for|observe|cache_sweeper|has_many|has_one|belongs_to|has_and_belongs_to_many".split("|")),b=e.arrayToMap("alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield".split("|")),c=e.arrayToMap("true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING".split("|")),d=e.arrayToMap("$DEBUG|$defout|$FILENAME|$LOAD_PATH|$SAFE|$stdin|$stdout|$stderr|$VERBOSE|$!|root_url|flash|session|cookies|params|request|response|logger".split("|"));this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"comment",merge:!0,regex:"^=begin$",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",regex:"[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"},{token:"text",regex:"::"},{token:"variable.instancce",regex:"@{1,2}(?:[a-zA-Z_]|d)+"},{token:"variable.class",regex:"[A-Z](?:[a-zA-Z_]|d)+"},{token:"string",regex:"[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"},{token:"constant.numeric",regex:"[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return e=="self"?"variable.language":b.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"constant.language":d.hasOwnProperty(e)?"variable.language":a.hasOwnProperty(e)?"support.function":e=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:"^=end$",next:"start"},{token:"comment",merge:!0,regex:".+"}]}};d.inherits(g,f),b.RubyHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-scad.js b/apps/files_texteditor/js/aceeditor/mode-scad.js
index 32054602fa4..1deeef11524 100644
--- a/apps/files_texteditor/js/aceeditor/mode-scad.js
+++ b/apps/files_texteditor/js/aceeditor/mode-scad.js
@@ -1 +1 @@
-define("ace/mode/scad",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/scad_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/scad_highlight_rules").scadHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=a("ace/mode/behaviour/cstyle").CstyleBehaviour,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new j};d.inherits(k,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)\/\//;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[]\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(k.prototype),b.Mode=k}),define("ace/mode/scad_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules,g=a("ace/mode/text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("module|if|else|for".split("|")),b=e.arrayToMap("NULL".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant",regex:"<[a-zA-Z0-9.]+>"},{token:"keyword",regex:"(?:use|include)"},{token:function(c){return c=="this"?"variable.language":a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.scadHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","pilot/oop","ace/mode/behaviour"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return!1;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}return!1}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}"){e.end.column++;return e}}return!1}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}return!1}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")"){e.end.column++;return e}}return!1}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return!1;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}return!1}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"'){e.end.column++;return e}}return!1})};d.inherits(f,e),b.CstyleBehaviour=f})
\ No newline at end of file
+define("ace/mode/scad",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/scad_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./scad_highlight_rules").scadHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("./behaviour/cstyle").CstyleBehaviour,k=a("./folding/cstyle").FoldMode,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new j,this.foldingRules=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[]\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(l.prototype),b.Mode=l}),define("ace/mode/scad_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("module|if|else|for".split("|")),b=e.arrayToMap("NULL".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant",regex:"<[a-zA-Z0-9.]+>"},{token:"keyword",regex:"(?:use|include)"},{token:function(c){return c=="this"?"variable.language":a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.scadHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return null;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-scala.js b/apps/files_texteditor/js/aceeditor/mode-scala.js
index aab530c11aa..c697fe1781a 100644
--- a/apps/files_texteditor/js/aceeditor/mode-scala.js
+++ b/apps/files_texteditor/js/aceeditor/mode-scala.js
@@ -1 +1 @@
-define("ace/mode/scala",["require","exports","module","pilot/oop","ace/mode/javascript","ace/tokenizer","ace/mode/scala_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/javascript").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/scala_highlight_rules").ScalaHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/mode/behaviour/cstyle").CstyleBehaviour,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new i};d.inherits(j,e),function(){this.createWorker=function(a){return null}}.call(j.prototype),b.Mode=j}),define("ace/mode/javascript",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=a("ace/worker/worker_client").WorkerClient,k=a("ace/mode/behaviour/cstyle").CstyleBehaviour,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)\/\//;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[\:]\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=a.getDocument(),c=new j(["ace","pilot"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");c.call("setValue",[b.getValue()]),b.on("change",function(a){a.range={start:a.data.range.start,end:a.data.range.end},c.emit("change",a)}),c.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),c.on("narcissus",function(b){a.setAnnotations([b.data])}),c.on("terminate",function(){a.clearAnnotations()});return c}}.call(l.prototype),b.Mode=l}),define("ace/mode/javascript_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/unicode"),g=a("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules,h=a("ace/mode/text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),b=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),c=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),d="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(d){return d=="this"?"variable.language":a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"invalid.illegal":d=="debugger"?"invalid.deprecated":"identifier"},regex:d},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",next:"regex_allowed"},{token:"lparen",regex:"[[({]",next:"regex_allowed"},{token:"rparen",regex:"[\\])}]"},{token:"keyword.operator",regex:"\\/=?",next:"regex_allowed"},{token:"comment",regex:"^#!.*$"},{token:"text",regex:"\\s+"}],regex_allowed:[{token:"string.regexp",regex:"\\/(?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*",next:"start"},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","pilot/oop","pilot/event_emitter"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=function(b,c,d,e){this.callbacks=[];if(a.packaged)var f=this.$guessBasePath(),g=this.$worker=new Worker(f+c);else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_")),g=this.$worker=new Worker(h),i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:d,classname:e}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){window.console&&console.log&&console.log(a);throw a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._dispatchEvent(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};(function(){d.implement(this,e),this.$normalizePath=function(a){a.match(/^\w+:/)||(a=location.protocol+"//"+location.host+location.pathname+"/"+a);return a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace-uncompressed\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._dispatchEvent("terminate",{}),this.$worker.terminate()},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){this.$worker.postMessage({event:a,data:b})}}).call(f.prototype),b.WorkerClient=f}),define("ace/mode/behaviour/cstyle",["require","exports","module","pilot/oop","ace/mode/behaviour"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return!1;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}return!1}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}"){e.end.column++;return e}}return!1}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}return!1}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")"){e.end.column++;return e}}return!1}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return!1;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}return!1}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"'){e.end.column++;return e}}return!1})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/scala_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules,g=a("ace/mode/text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("case|default|do|else|for|if|match|while|throw|return|try|catch|finally|yield|abstract|class|def|extends|final|forSome|implicit|implicits|import|lazy|new|object|override|package|private|protected|sealed|super|this|trait|type|val|var|with".split("|")),b=e.arrayToMap("true|false".split("|")),c=e.arrayToMap("AbstractMethodError|AssertionError|ClassCircularityError|ClassFormatError|Deprecated|EnumConstantNotPresentException|ExceptionInInitializerError|IllegalAccessError|IllegalThreadStateException|InstantiationError|InternalError|NegativeArraySizeException|NoSuchFieldError|Override|Process|ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|SuppressWarnings|TypeNotPresentException|UnknownError|UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|InstantiationException|IndexOutOfBoundsException|ArrayIndexOutOfBoundsException|CloneNotSupportedException|NoSuchFieldException|IllegalArgumentException|NumberFormatException|SecurityException|Void|InheritableThreadLocal|IllegalStateException|InterruptedException|NoSuchMethodException|IllegalAccessException|UnsupportedOperationException|Enum|StrictMath|Package|Compiler|Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|Character|Boolean|StackTraceElement|Appendable|StringBuffer|Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|StackOverflowError|OutOfMemoryError|VirtualMachineError|ArrayStoreException|ClassCastException|LinkageError|NoClassDefFoundError|ClassNotFoundException|RuntimeException|Exception|ThreadDeath|Error|Throwable|System|ClassLoader|Cloneable|Class|CharSequence|Comparable|String|Object|Unit|Any|AnyVal|AnyRef|Null|ScalaObject|Singleton|Seq|Iterable|List|Option|Array|Char|Byte|Short|Int|Long|Nothing".split("|")),d=e.arrayToMap("".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return e=="this"?"variable.language":a.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e)?"support.function":b.hasOwnProperty(e)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.ScalaHighlightRules=h})
\ No newline at end of file
+define("ace/mode/scala",["require","exports","module","ace/lib/oop","ace/mode/javascript","ace/tokenizer","ace/mode/scala_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./javascript").Mode,f=a("../tokenizer").Tokenizer,g=a("./scala_highlight_rules").ScalaHighlightRules,h=function(){e.call(this),this.$tokenizer=new f((new g).getRules())};d.inherits(h,e),function(){this.createWorker=function(a){return null}}.call(h.prototype),b.Mode=h}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:["keyword.definition","text","entity.name.function"],regex:"(function)(\\s+)("+k+")"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"keyword.definition":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",next:"regex_allowed"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\.",next:"regex_allowed"},{token:"paren.lparen",regex:"[[({]",next:"regex_allowed"},{token:"paren.rparen",regex:"[\\])}]"},{token:"keyword.operator",regex:"\\/=?",next:"regex_allowed"},{token:"comment",regex:"^#!.*$"},{token:"text",regex:"\\s+"}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/event_emitter").EventEmitter,f=function(b,d,e,f){this.changeListener=this.changeListener.bind(this);if(c.packaged){var g=this.$guessBasePath();this.$worker=new Worker(g+d)}else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_"));this.$worker=new Worker(h);var i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:e,classname:f}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){throw window.console&&console.log&&console.log(a),a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._emit(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};((function(){d.implement(this,e),this.$normalizePath=function(a){return a=a.replace(/^[a-z]+:\/\/[^\/]+\//,""),a=location.protocol+"//"+location.host+(a.charAt(0)=="/"?"":location.pathname.replace(/\/[^\/]*$/,""))+"/"+a.replace(/^[\/]+/,""),a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._emit("terminate",{}),this.$worker.terminate(),this.$worker=null,this.$doc.removeEventListener("change",this.changeListener),this.$doc=null},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){try{this.$worker.postMessage({event:a,data:{data:b.data}})}catch(c){}},this.attachToDocument=function(a){this.$doc&&this.terminate(),this.$doc=a,this.call("setValue",[a.getValue()]),a.on("change",this.changeListener)},this.changeListener=function(a){a.range={start:a.data.range.start,end:a.data.range.end},this.emit("change",a)}})).call(f.prototype),b.WorkerClient=f}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return null;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),define("ace/mode/scala_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("case|default|do|else|for|if|match|while|throw|return|try|catch|finally|yield|abstract|class|def|extends|final|forSome|implicit|implicits|import|lazy|new|object|override|package|private|protected|sealed|super|this|trait|type|val|var|with".split("|")),b=e.arrayToMap("true|false".split("|")),c=e.arrayToMap("AbstractMethodError|AssertionError|ClassCircularityError|ClassFormatError|Deprecated|EnumConstantNotPresentException|ExceptionInInitializerError|IllegalAccessError|IllegalThreadStateException|InstantiationError|InternalError|NegativeArraySizeException|NoSuchFieldError|Override|Process|ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|SuppressWarnings|TypeNotPresentException|UnknownError|UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|InstantiationException|IndexOutOfBoundsException|ArrayIndexOutOfBoundsException|CloneNotSupportedException|NoSuchFieldException|IllegalArgumentException|NumberFormatException|SecurityException|Void|InheritableThreadLocal|IllegalStateException|InterruptedException|NoSuchMethodException|IllegalAccessException|UnsupportedOperationException|Enum|StrictMath|Package|Compiler|Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|Character|Boolean|StackTraceElement|Appendable|StringBuffer|Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|StackOverflowError|OutOfMemoryError|VirtualMachineError|ArrayStoreException|ClassCastException|LinkageError|NoClassDefFoundError|ClassNotFoundException|RuntimeException|Exception|ThreadDeath|Error|Throwable|System|ClassLoader|Cloneable|Class|CharSequence|Comparable|String|Object|Unit|Any|AnyVal|AnyRef|Null|ScalaObject|Singleton|Seq|Iterable|List|Option|Array|Char|Byte|Short|Int|Long|Nothing".split("|")),d=e.arrayToMap("".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return e=="this"?"variable.language":a.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e)?"support.function":b.hasOwnProperty(e)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.ScalaHighlightRules=h}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-scss.js b/apps/files_texteditor/js/aceeditor/mode-scss.js
index 9b4e118427a..3f63dc4305d 100644
--- a/apps/files_texteditor/js/aceeditor/mode-scss.js
+++ b/apps/files_texteditor/js/aceeditor/mode-scss.js
@@ -1 +1 @@
-define("ace/mode/scss",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/scss_highlight_rules","ace/mode/matching_brace_outdent"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/scss_highlight_rules").ScssHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(i,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);f&&(d+=c);return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(i.prototype),b.Mode=i}),define("ace/mode/scss_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/text_highlight_rules").TextHighlightRules,g=function(){function i(a){var b=[],c=a.split("");for(var d=0;d<c.length;d++)b.push("[",c[d].toLowerCase(),c[d].toUpperCase(),"]");return b.join("")}var a=e.arrayToMap(function(){var a="-webkit-|-moz-|-o-|-ms-|-svg-|-pie-|-khtml-".split("|"),b="appearance|background-clip|background-inline-policy|background-origin|background-size|binding|border-bottom-colors|border-left-colors|border-right-colors|border-top-colors|border-end|border-end-color|border-end-style|border-end-width|border-image|border-start|border-start-color|border-start-style|border-start-width|box-align|box-direction|box-flex|box-flexgroup|box-ordinal-group|box-orient|box-pack|box-sizing|column-count|column-gap|column-width|column-rule|column-rule-width|column-rule-style|column-rule-color|float-edge|font-feature-settings|font-language-override|force-broken-image-icon|image-region|margin-end|margin-start|opacity|outline|outline-color|outline-offset|outline-radius|outline-radius-bottomleft|outline-radius-bottomright|outline-radius-topleft|outline-radius-topright|outline-style|outline-width|padding-end|padding-start|stack-sizing|tab-size|text-blink|text-decoration-color|text-decoration-line|text-decoration-style|transform|transform-origin|transition|transition-delay|transition-duration|transition-property|transition-timing-function|user-focus|user-input|user-modify|user-select|window-shadow|border-radius".split("|"),c="azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|opacity|orphans|outline-color|outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|position|quotes|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|stress|table-layout|text-align|text-decoration|text-indent|text-shadow|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index".split("|"),d=[];for(var e=0,f=a.length;e<f;e++)Array.prototype.push.apply(d,(a[e]+b.join("|"+a[e])).split("|"));Array.prototype.push.apply(d,b),Array.prototype.push.apply(d,c);return d}()),b=e.arrayToMap("hsl|hsla|rgb|rgba|url|attr|counter|counters|abs|adjust_color|adjust_hue|alpha|join|blue|ceil|change_color|comparable|complement|darken|desaturate|floor|grayscale|green|hue|if|invert|join|length|lighten|lightness|mix|nth|opacify|opacity|percentage|quote|red|round|saturate|saturation|scale_color|transparentize|type_of|unit|unitless|unqoute".split("|")),c=e.arrayToMap("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f=e.arrayToMap("@mixin|@extend|@include|@import|@media|@debug|@warn|@if|@for|@each|@while|@else|@font-face|@-webkit-keyframes|if|and|!default|module|def|end|declare".split("|")),g=e.arrayToMap("a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdo|big|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|dir|div|dl|dt|em|embed|fieldset|figcaption|figure|font|footer|form|frame|frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|img|input|ins|keygen|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|u|ul|var|video|wbr|xmp".split("|")),h="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:h+i("em")},{token:"constant.numeric",regex:h+i("ex")},{token:"constant.numeric",regex:h+i("px")},{token:"constant.numeric",regex:h+i("cm")},{token:"constant.numeric",regex:h+i("mm")},{token:"constant.numeric",regex:h+i("in")},{token:"constant.numeric",regex:h+i("pt")},{token:"constant.numeric",regex:h+i("pc")},{token:"constant.numeric",regex:h+i("deg")},{token:"constant.numeric",regex:h+i("rad")},{token:"constant.numeric",regex:h+i("grad")},{token:"constant.numeric",regex:h+i("ms")},{token:"constant.numeric",regex:h+i("s")},{token:"constant.numeric",regex:h+i("hz")},{token:"constant.numeric",regex:h+i("khz")},{token:"constant.numeric",regex:h+"%"},{token:"constant.numeric",regex:"#[a-fA-F0-9]{6}"},{token:"constant.numeric",regex:"#[a-fA-F0-9]{3}"},{token:"constant.numeric",regex:h},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":f.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"constant.language":b.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":g.hasOwnProperty(e.toLowerCase())?"variable.language":"text"},regex:"\\-?[@a-zA-Z_][@a-zA-Z0-9_\\-]*"},{token:"variable",regex:"[a-zA-Z_\\-$][a-zA-Z0-9_\\-$]*\\b"},{token:"variable.language",regex:"#[a-zA-Z0-9-_]+"},{token:"variable.language",regex:"\\.[a-zA-Z0-9-_]+"},{token:"variable.language",regex:":[a-zA-Z0-9-_]+"},{token:"constant",regex:"[a-zA-Z0-9-_]+"},{token:"keyword.operator",regex:"<|>|<=|>=|==|!=|-|%|#|\\+|\\$|\\+|\\*"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.ScssHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})
\ No newline at end of file
+define("ace/mode/scss",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/scss_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./scss_highlight_rules").ScssHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./folding/cstyle").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/scss_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap(function(){var a="-webkit-|-moz-|-o-|-ms-|-svg-|-pie-|-khtml-".split("|"),b="appearance|background-clip|background-inline-policy|background-origin|background-size|binding|border-bottom-colors|border-left-colors|border-right-colors|border-top-colors|border-end|border-end-color|border-end-style|border-end-width|border-image|border-start|border-start-color|border-start-style|border-start-width|box-align|box-direction|box-flex|box-flexgroup|box-ordinal-group|box-orient|box-pack|box-sizing|column-count|column-gap|column-width|column-rule|column-rule-width|column-rule-style|column-rule-color|float-edge|font-feature-settings|font-language-override|force-broken-image-icon|image-region|margin-end|margin-start|opacity|outline|outline-color|outline-offset|outline-radius|outline-radius-bottomleft|outline-radius-bottomright|outline-radius-topleft|outline-radius-topright|outline-style|outline-width|padding-end|padding-start|stack-sizing|tab-size|text-blink|text-decoration-color|text-decoration-line|text-decoration-style|transform|transform-origin|transition|transition-delay|transition-duration|transition-property|transition-timing-function|user-focus|user-input|user-modify|user-select|window-shadow|border-radius".split("|"),c="azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|opacity|orphans|outline-color|outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|position|quotes|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|stress|table-layout|text-align|text-decoration|text-indent|text-shadow|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index".split("|"),d=[];for(var e=0,f=a.length;e<f;e++)Array.prototype.push.apply(d,(a[e]+b.join("|"+a[e])).split("|"));return Array.prototype.push.apply(d,b),Array.prototype.push.apply(d,c),d}()),b=e.arrayToMap("hsl|hsla|rgb|rgba|url|attr|counter|counters|abs|adjust_color|adjust_hue|alpha|join|blue|ceil|change_color|comparable|complement|darken|desaturate|floor|grayscale|green|hue|if|invert|join|length|lighten|lightness|mix|nth|opacify|opacity|percentage|quote|red|round|saturate|saturation|scale_color|transparentize|type_of|unit|unitless|unqoute".split("|")),c=e.arrayToMap("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f=e.arrayToMap("@mixin|@extend|@include|@import|@media|@debug|@warn|@if|@for|@each|@while|@else|@font-face|@-webkit-keyframes|if|and|!default|module|def|end|declare".split("|")),g=e.arrayToMap("a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdo|big|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|dir|div|dl|dt|em|embed|fieldset|figcaption|figure|font|footer|form|frame|frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|img|input|ins|keygen|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|u|ul|var|video|wbr|xmp".split("|")),h="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:h+"(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:"constant.numeric",regex:h},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":f.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"constant.language":b.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":g.hasOwnProperty(e.toLowerCase())?"variable.language":"text"},regex:"\\-?[@a-z_][@a-z0-9_\\-]*"},{token:"variable",regex:"[a-z_\\-$][a-z0-9_\\-$]*\\b"},{token:"variable.language",regex:"#[a-z0-9-_]+"},{token:"variable.language",regex:"\\.[a-z0-9-_]+"},{token:"variable.language",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"},{token:"keyword.operator",regex:"<|>|<=|>=|==|!=|-|%|#|\\+|\\$|\\+|\\*"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.ScssHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-sql.js b/apps/files_texteditor/js/aceeditor/mode-sql.js
new file mode 100755
index 00000000000..3ca95359086
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-sql.js
@@ -0,0 +1 @@
+define("ace/mode/sql",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/sql_highlight_rules","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./sql_highlight_rules").SqlHighlightRules,h=a("../range").Range,i=function(){this.$tokenizer=new f((new g).getRules())};d.inherits(i,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)--/;for(var i=c;i<=d;i++)if(!g.test(b.getLine(i))){e=!1;break}if(e){var j=new h(0,0,0,0);for(var i=c;i<=d;i++){var k=b.getLine(i),l=k.match(g);j.start.row=i,j.end.row=i,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"--")}}.call(i.prototype),b.Mode=i}),define("ace/mode/sql_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("select|from|where|and|or|group|by|order|limit|offset|having|as|case|when|else|end|type|left|right|join|on|outer|desc|asc".split("|")),b=e.arrayToMap("true|false|null".split("|")),c=e.arrayToMap("count|min|max|avg|sum|rank|now|coalesce".split("|"));this.$rules={start:[{token:"comment",regex:"--.*$"},{token:"string",regex:'".*"'},{token:"string",regex:"'.*'"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:function(d){return d=d.toLowerCase(),a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\/|\\/\\/|%|<@>|@>|<@|&|\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"lparen.paren",regex:"[\\(]"},{token:"paren.rparen",regex:"[\\)]"},{token:"text",regex:"\\s+"}]}};d.inherits(g,f),b.SqlHighlightRules=g}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-svg.js b/apps/files_texteditor/js/aceeditor/mode-svg.js
index d8b49f8971e..e3865a788d3 100644
--- a/apps/files_texteditor/js/aceeditor/mode-svg.js
+++ b/apps/files_texteditor/js/aceeditor/mode-svg.js
@@ -1 +1 @@
-define("ace/mode/svg",["require","exports","module","pilot/oop","ace/mode/text","ace/mode/javascript","ace/tokenizer","ace/mode/svg_highlight_rules","ace/mode/behaviour/xml"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/mode/javascript").Mode,g=a("ace/tokenizer").Tokenizer,h=a("ace/mode/svg_highlight_rules").SvgHighlightRules,i=a("ace/mode/behaviour/xml").XmlBehaviour,j=function(){this.highlighter=new h,this.$tokenizer=new g(this.highlighter.getRules()),this.$behaviour=new i,this.$embeds=this.highlighter.getEmbeds(),this.createModeDelegates({"js-":f})};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){return 0},this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)},this.checkOutdent=function(a,b,c){return!1}}.call(j.prototype),b.Mode=j}),define("ace/mode/javascript",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=a("ace/worker/worker_client").WorkerClient,k=a("ace/mode/behaviour/cstyle").CstyleBehaviour,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)\/\//;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[\:]\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=a.getDocument(),c=new j(["ace","pilot"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");c.call("setValue",[b.getValue()]),b.on("change",function(a){a.range={start:a.data.range.start,end:a.data.range.end},c.emit("change",a)}),c.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),c.on("narcissus",function(b){a.setAnnotations([b.data])}),c.on("terminate",function(){a.clearAnnotations()});return c}}.call(l.prototype),b.Mode=l}),define("ace/mode/javascript_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/unicode"),g=a("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules,h=a("ace/mode/text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),b=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),c=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),d="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(d){return d=="this"?"variable.language":a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"invalid.illegal":d=="debugger"?"invalid.deprecated":"identifier"},regex:d},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",next:"regex_allowed"},{token:"lparen",regex:"[[({]",next:"regex_allowed"},{token:"rparen",regex:"[\\])}]"},{token:"keyword.operator",regex:"\\/=?",next:"regex_allowed"},{token:"comment",regex:"^#!.*$"},{token:"text",regex:"\\s+"}],regex_allowed:[{token:"string.regexp",regex:"\\/(?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*",next:"start"},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","pilot/oop","pilot/event_emitter"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=function(b,c,d,e){this.callbacks=[];if(a.packaged)var f=this.$guessBasePath(),g=this.$worker=new Worker(f+c);else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_")),g=this.$worker=new Worker(h),i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:d,classname:e}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){window.console&&console.log&&console.log(a);throw a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._dispatchEvent(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};(function(){d.implement(this,e),this.$normalizePath=function(a){a.match(/^\w+:/)||(a=location.protocol+"//"+location.host+location.pathname+"/"+a);return a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace-uncompressed\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._dispatchEvent("terminate",{}),this.$worker.terminate()},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){this.$worker.postMessage({event:a,data:b})}}).call(f.prototype),b.WorkerClient=f}),define("ace/mode/behaviour/cstyle",["require","exports","module","pilot/oop","ace/mode/behaviour"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return!1;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}return!1}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}"){e.end.column++;return e}}return!1}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}return!1}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")"){e.end.column++;return e}}return!1}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return!1;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}return!1}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"'){e.end.column++;return e}}return!1})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/svg_highlight_rules",["require","exports","module","pilot/oop","ace/mode/javascript_highlight_rules","ace/mode/xml_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules,f=a("ace/mode/xml_highlight_rules").XmlHighlightRules,g=function(){f.call(this),this.$rules.start.splice(3,0,{token:"text",regex:"<(?=s*script)",next:"script"}),this.$rules.script=[{token:"text",regex:">",next:"js-start"},{token:"keyword",regex:"[-_a-zA-Z0-9:]+"},{token:"text",regex:"\\s+"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"}],this.embedRules(e,"js-",[{token:"comment",regex:"\\/\\/.*(?=<\\/script>)",next:"tag"},{token:"text",regex:"<\\/(?=script)",next:"tag"}])};d.inherits(g,f),b.SvgHighlightRules=g}),define("ace/mode/xml_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"text",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"text",regex:"[^<]+"}],tag:[{token:"text",regex:">",next:"start"},{token:"keyword",regex:"[-_a-zA-Z0-9:]+"},{token:"text",regex:"\\s+"},{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*$',next:"qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*$",next:"qstring"}],qstring:[{token:"string",regex:".*'",next:"tag"},{token:"string",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'.*"',next:"tag"},{token:"string",merge:!0,regex:".+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]}};d.inherits(f,e),b.XmlHighlightRules=f}),define("ace/mode/behaviour/xml",["require","exports","module","pilot/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/behaviour").Behaviour,f=a("ace/mode/behaviour/cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}return!1})};d.inherits(g,e),b.XmlBehaviour=g})
\ No newline at end of file
+define("ace/mode/svg",["require","exports","module","ace/lib/oop","ace/mode/xml","ace/mode/javascript","ace/tokenizer","ace/mode/svg_highlight_rules","ace/mode/folding/mixed","ace/mode/folding/xml","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml").Mode,f=a("./javascript").Mode,g=a("../tokenizer").Tokenizer,h=a("./svg_highlight_rules").SvgHighlightRules,i=a("./folding/mixed").FoldMode,j=a("./folding/xml").FoldMode,k=a("./folding/cstyle").FoldMode,l=function(){e.call(this),this.highlighter=new h,this.$tokenizer=new g(this.highlighter.getRules()),this.$embeds=this.highlighter.getEmbeds(),this.createModeDelegates({"js-":f}),this.foldingRules=new i(new j({}),{"js-":new k})};d.inherits(l,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(l.prototype),b.Mode=l}),define("ace/mode/xml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/xml_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/xml"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./xml_highlight_rules").XmlHighlightRules,h=a("./behaviour/xml").XmlBehaviour,i=a("./folding/xml").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules()),this.$behaviour=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(j.prototype),b.Mode=j}),define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml_util"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},e.tag(this.$rules,"tag","start")};d.inherits(g,f),b.XmlHighlightRules=g}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"-qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"-qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:!]+",next:b+"embed-attribute-list"},{token:"empty",regex:"",next:b+"embed-attribute-list"}],a[b+"-qstring"]=h("'",b+"embed-attribute-list"),a[b+"-qqstring"]=h('"',b+"embed-attribute-list"),a[b+"embed-attribute-list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}})};d.inherits(g,e),b.XmlBehaviour=g}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return null;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../lib/lang"),f=a("../../range").Range,g=a("./fold_mode").FoldMode,h=a("../../token_iterator").TokenIterator,i=b.FoldMode=function(a){g.call(this),this.voidElements=a||{}};d.inherits(i,g),function(){this.getFoldWidget=function(a,b,c){var d=this._getFirstTagInLine(a,c);return d.closing?b=="markbeginend"?"end":"":!d.tagName||this.voidElements[d.tagName.toLowerCase()]?"":d.selfClosing?"":d.value.indexOf("/"+d.tagName)!==-1?"":"start"},this._getFirstTagInLine=function(a,b){var c=a.getTokens(b,b)[0].tokens,d="";for(var f=0;f<c.length;f++){var g=c[f];g.type.indexOf("meta.tag")===0?d+=g.value:d+=e.stringRepeat(" ",g.value.length)}return this._parseTag(d)},this.tagRe=/^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/,this._parseTag=function(a){var b=this.tagRe.exec(a),c=this.tagRe.lastIndex||0;return this.tagRe.lastIndex=0,{value:a,match:b?b[2]:"",closing:b?!!b[3]:!1,selfClosing:b?!!b[5]||b[2]=="/>":!1,tagName:b?b[4]:"",column:b[1]?c+b[1].length:c}},this._readTagForward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){if(!d)var d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()};c+=b.value;if(c.indexOf(">")!==-1){var e=this._parseTag(c);return e.start=d,e.end={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length},a.stepForward(),e}}while(b=a.stepForward());return null},this._readTagBackward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){d||(d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length}),c=b.value+c;if(c.indexOf("<")!==-1){var e=this._parseTag(c);return e.end=d,e.start={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()},a.stepBackward(),e}}while(b=a.stepBackward());return null},this._pop=function(a,b){while(a.length){var c=a[a.length-1];if(!b||c.tagName==b.tagName)return a.pop();if(this.voidElements[b.tagName])return;if(this.voidElements[c.tagName]){a.pop();continue}return null}},this.getFoldWidgetRange=function(a,b,c){var d=this._getFirstTagInLine(a,c);if(!d.match)return null;var e=d.closing||d.selfClosing,g=[],i;if(!e){var j=new h(a,c,d.column),k={row:c,column:d.column+d.tagName.length+2};while(i=this._readTagForward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(i.closing){this._pop(g,i);if(g.length==0)return f.fromPoints(k,i.start)}else g.push(i)}}else{var j=new h(a,c,d.column+d.match.length),l={row:c,column:d.column};while(i=this._readTagBackward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(!i.closing){this._pop(g,i);if(g.length==0)return i.start.column+=i.tagName.length+2,f.fromPoints(i.start,l)}else g.push(i)}}}}.call(i.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:["keyword.definition","text","entity.name.function"],regex:"(function)(\\s+)("+k+")"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"keyword.definition":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",next:"regex_allowed"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\.",next:"regex_allowed"},{token:"paren.lparen",regex:"[[({]",next:"regex_allowed"},{token:"paren.rparen",regex:"[\\])}]"},{token:"keyword.operator",regex:"\\/=?",next:"regex_allowed"},{token:"comment",regex:"^#!.*$"},{token:"text",regex:"\\s+"}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/event_emitter").EventEmitter,f=function(b,d,e,f){this.changeListener=this.changeListener.bind(this);if(c.packaged){var g=this.$guessBasePath();this.$worker=new Worker(g+d)}else{var h=this.$normalizePath(a.nameToUrl("ace/worker/worker",null,"_"));this.$worker=new Worker(h);var i={};for(var j=0;j<b.length;j++){var k=b[j],l=this.$normalizePath(a.nameToUrl(k,null,"_").replace(/.js$/,""));i[k]=l}}this.$worker.postMessage({init:!0,tlns:i,module:e,classname:f}),this.callbackId=1,this.callbacks={};var m=this;this.$worker.onerror=function(a){throw window.console&&console.log&&console.log(a),a},this.$worker.onmessage=function(a){var b=a.data;switch(b.type){case"log":window.console&&console.log&&console.log(b.data);break;case"event":m._emit(b.name,{data:b.data});break;case"call":var c=m.callbacks[b.id];c&&(c(b.data),delete m.callbacks[b.id])}}};((function(){d.implement(this,e),this.$normalizePath=function(a){return a=a.replace(/^[a-z]+:\/\/[^\/]+\//,""),a=location.protocol+"//"+location.host+(a.charAt(0)=="/"?"":location.pathname.replace(/\/[^\/]*$/,""))+"/"+a.replace(/^[\/]+/,""),a},this.$guessBasePath=function(){if(a.aceBaseUrl)return a.aceBaseUrl;var b=document.getElementsByTagName("script");for(var c=0;c<b.length;c++){var d=b[c],e=d.getAttribute("data-ace-base");if(e)return e.replace(/\/*$/,"/");var f=d.src||d.getAttribute("src");if(!f)continue;var g=f.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);if(g)return g[1]||g[2]}return""},this.terminate=function(){this._emit("terminate",{}),this.$worker.terminate(),this.$worker=null,this.$doc.removeEventListener("change",this.changeListener),this.$doc=null},this.send=function(a,b){this.$worker.postMessage({command:a,args:b})},this.call=function(a,b,c){if(c){var d=this.callbackId++;this.callbacks[d]=c,b.push(d)}this.send(a,b)},this.emit=function(a,b){try{this.$worker.postMessage({event:a,data:{data:b.data}})}catch(c){}},this.attachToDocument=function(a){this.$doc&&this.terminate(),this.$doc=a,this.call("setValue",[a.getValue()]),a.on("change",this.changeListener)},this.changeListener=function(a){a.range={start:a.data.range.start,end:a.data.range.end},this.emit("change",a)}})).call(f.prototype),b.WorkerClient=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/svg_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/javascript_highlight_rules","ace/mode/xml_highlight_rules","ace/mode/xml_util"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./javascript_highlight_rules").JavaScriptHighlightRules,f=a("./xml_highlight_rules").XmlHighlightRules,g=a("./xml_util"),h=function(){f.call(this),this.$rules.start.splice(3,0,{token:"meta.tag",regex:"<(?=s*script)",next:"script"}),g.tag(this.$rules,"script","js-start"),this.embedRules(e,"js-",[{token:"comment",regex:"\\/\\/.*(?=<\\/script>)",next:"tag"},{token:"meta.tag",regex:"<\\/(?=script)",next:"tag"}])};d.inherits(h,f),b.SvgHighlightRules=h}),define("ace/mode/folding/mixed",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./fold_mode").FoldMode,f=b.FoldMode=function(a,b){this.defaultMode=a,this.subModes=b};d.inherits(f,e),function(){this.$getMode=function(a){for(var b in this.subModes)if(a.indexOf(b)===0)return this.subModes[b];return null},this.$tryMode=function(a,b,c,d){var e=this.$getMode(a);return e?e.getFoldWidget(b,c,d):""},this.getFoldWidget=function(a,b,c){return this.$tryMode(a.getState(c-1),a,b,c)||this.$tryMode(a.getState(c),a,b,c)||this.defaultMode.getFoldWidget(a,b,c)},this.getFoldWidgetRange=function(a,b,c){var d=this.$getMode(a.getState(c-1));if(!d||!d.getFoldWidget(a,b,c))d=this.$getMode(a.getState(c));if(!d||!d.getFoldWidget(a,b,c))d=this.defaultMode;return d.getFoldWidgetRange(a,b,c)}}.call(f.prototype)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-textile.js b/apps/files_texteditor/js/aceeditor/mode-textile.js
index 6767f638716..ad30c2d579e 100644
--- a/apps/files_texteditor/js/aceeditor/mode-textile.js
+++ b/apps/files_texteditor/js/aceeditor/mode-textile.js
@@ -1 +1 @@
-define("ace/mode/textile",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/textile_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/textile_highlight_rules").TextileHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return a=="intag"?c:""},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/textile_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"keyword",regex:"h1|h2|h3|h4|h5|h6|bq|p|bc|pre",next:"blocktag"},{token:"keyword",regex:"[\\*]+|[#]+"},{token:"text",regex:".+"}],blocktag:[{token:"keyword",regex:"\\. ",next:"start"},{token:"keyword",regex:"\\(",next:"blocktagproperties"}],blocktagproperties:[{token:"keyword",regex:"\\)",next:"blocktag"},{token:"string",regex:"[a-zA-Z0-9\\-_]+"},{token:"keyword",regex:"#"}]}};d.inherits(f,e),b.TextileHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})
\ No newline at end of file
+define("ace/mode/textile",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/textile_highlight_rules","ace/mode/matching_brace_outdent"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./textile_highlight_rules").TextileHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(i,e),function(){this.getNextLineIndent=function(a,b,c){return a=="intag"?c:""},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(i.prototype),b.Mode=i}),define("ace/mode/textile_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:function(a){return a.match(/^h\d$/)?"markup.heading."+a.charAt(1):"markup.heading"},regex:"h1|h2|h3|h4|h5|h6|bq|p|bc|pre",next:"blocktag"},{token:"keyword",regex:"[\\*]+|[#]+"},{token:"text",regex:".+"}],blocktag:[{token:"keyword",regex:"\\. ",next:"start"},{token:"keyword",regex:"\\(",next:"blocktagproperties"}],blocktagproperties:[{token:"keyword",regex:"\\)",next:"blocktag"},{token:"string",regex:"[a-zA-Z0-9\\-_]+"},{token:"keyword",regex:"#"}]}};d.inherits(f,e),b.TextileHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};((function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}})).call(e.prototype),b.MatchingBraceOutdent=e}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-xml.js b/apps/files_texteditor/js/aceeditor/mode-xml.js
index d000462f33b..236ab2430eb 100644
--- a/apps/files_texteditor/js/aceeditor/mode-xml.js
+++ b/apps/files_texteditor/js/aceeditor/mode-xml.js
@@ -1 +1 @@
-define("ace/mode/xml",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/xml_highlight_rules","ace/mode/behaviour/xml"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/xml_highlight_rules").XmlHighlightRules,h=a("ace/mode/behaviour/xml").XmlBehaviour,i=function(){this.$tokenizer=new f((new g).getRules()),this.$behaviour=new h};d.inherits(i,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(i.prototype),b.Mode=i}),define("ace/mode/xml_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"text",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"text",regex:"[^<]+"}],tag:[{token:"text",regex:">",next:"start"},{token:"keyword",regex:"[-_a-zA-Z0-9:]+"},{token:"text",regex:"\\s+"},{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*$',next:"qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*$",next:"qstring"}],qstring:[{token:"string",regex:".*'",next:"tag"},{token:"string",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'.*"',next:"tag"},{token:"string",merge:!0,regex:".+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]}};d.inherits(f,e),b.XmlHighlightRules=f}),define("ace/mode/behaviour/xml",["require","exports","module","pilot/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/behaviour").Behaviour,f=a("ace/mode/behaviour/cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}return!1})};d.inherits(g,e),b.XmlBehaviour=g}),define("ace/mode/behaviour/cstyle",["require","exports","module","pilot/oop","ace/mode/behaviour"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return!1;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}return!1}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}"){e.end.column++;return e}}return!1}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}return!1}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")"){e.end.column++;return e}}return!1}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return!1;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}return!1}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"'){e.end.column++;return e}}return!1})};d.inherits(f,e),b.CstyleBehaviour=f})
\ No newline at end of file
+define("ace/mode/xml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/xml_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/xml"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./xml_highlight_rules").XmlHighlightRules,h=a("./behaviour/xml").XmlBehaviour,i=a("./folding/xml").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules()),this.$behaviour=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(j.prototype),b.Mode=j}),define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml_util"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},e.tag(this.$rules,"tag","start")};d.inherits(g,f),b.XmlHighlightRules=g}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"-qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"-qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:!]+",next:b+"embed-attribute-list"},{token:"empty",regex:"",next:b+"embed-attribute-list"}],a[b+"-qstring"]=h("'",b+"embed-attribute-list"),a[b+"-qqstring"]=h('"',b+"embed-attribute-list"),a[b+"embed-attribute-list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}})};d.inherits(g,e),b.XmlBehaviour=g}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);if(g!=="")return{text:'"'+g+'"',selection:!1};var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column-1,h.column);if(j=="\\")return null;var k=d.getTokens(f.start.row,f.start.row)[0].tokens,l=0,m,n=-1;for(var o=0;o<k.length;o++){m=k[o],m.type=="string"?n=-1:n<0&&(n=m.value.indexOf('"'));if(m.value.length+l>f.start.column)break;l+=k[o].value.length}if(!m||n<0&&m.type!=="comment"&&(m.type!=="string"||f.start.column!==m.value.length+l-1&&m.value.lastIndexOf('"')===m.value.length-1))return{text:'""',selection:[1,1]};if(m&&m.type==="string"){var p=i.substring(h.column,h.column+1);if(p=='"')return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=='"'){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../lib/lang"),f=a("../../range").Range,g=a("./fold_mode").FoldMode,h=a("../../token_iterator").TokenIterator,i=b.FoldMode=function(a){g.call(this),this.voidElements=a||{}};d.inherits(i,g),function(){this.getFoldWidget=function(a,b,c){var d=this._getFirstTagInLine(a,c);return d.closing?b=="markbeginend"?"end":"":!d.tagName||this.voidElements[d.tagName.toLowerCase()]?"":d.selfClosing?"":d.value.indexOf("/"+d.tagName)!==-1?"":"start"},this._getFirstTagInLine=function(a,b){var c=a.getTokens(b,b)[0].tokens,d="";for(var f=0;f<c.length;f++){var g=c[f];g.type.indexOf("meta.tag")===0?d+=g.value:d+=e.stringRepeat(" ",g.value.length)}return this._parseTag(d)},this.tagRe=/^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/,this._parseTag=function(a){var b=this.tagRe.exec(a),c=this.tagRe.lastIndex||0;return this.tagRe.lastIndex=0,{value:a,match:b?b[2]:"",closing:b?!!b[3]:!1,selfClosing:b?!!b[5]||b[2]=="/>":!1,tagName:b?b[4]:"",column:b[1]?c+b[1].length:c}},this._readTagForward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){if(!d)var d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()};c+=b.value;if(c.indexOf(">")!==-1){var e=this._parseTag(c);return e.start=d,e.end={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length},a.stepForward(),e}}while(b=a.stepForward());return null},this._readTagBackward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){d||(d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length}),c=b.value+c;if(c.indexOf("<")!==-1){var e=this._parseTag(c);return e.end=d,e.start={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()},a.stepBackward(),e}}while(b=a.stepBackward());return null},this._pop=function(a,b){while(a.length){var c=a[a.length-1];if(!b||c.tagName==b.tagName)return a.pop();if(this.voidElements[b.tagName])return;if(this.voidElements[c.tagName]){a.pop();continue}return null}},this.getFoldWidgetRange=function(a,b,c){var d=this._getFirstTagInLine(a,c);if(!d.match)return null;var e=d.closing||d.selfClosing,g=[],i;if(!e){var j=new h(a,c,d.column),k={row:c,column:d.column+d.tagName.length+2};while(i=this._readTagForward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(i.closing){this._pop(g,i);if(g.length==0)return f.fromPoints(k,i.start)}else g.push(i)}}else{var j=new h(a,c,d.column+d.match.length),l={row:c,column:d.column};while(i=this._readTagBackward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(!i.closing){this._pop(g,i);if(g.length==0)return i.start.column+=i.tagName.length+2,f.fromPoints(i.start,l)}else g.push(i)}}}}.call(i.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};((function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}})).call(e.prototype)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/theme-clouds.js b/apps/files_texteditor/js/aceeditor/theme-clouds.js
index c14d3cbcff6..78a1d5b5e5c 100644
--- a/apps/files_texteditor/js/aceeditor/theme-clouds.js
+++ b/apps/files_texteditor/js/aceeditor/theme-clouds.js
@@ -1 +1 @@
-define("ace/theme/clouds",["require","exports","module"],function(a,b,c){var d=a("pilot/dom"),e=".ace-clouds .ace_editor {\n  border: 2px solid rgb(159, 159, 159);\n}\n\n.ace-clouds .ace_editor.ace_focus {\n  border: 2px solid #327fbd;\n}\n\n.ace-clouds .ace_gutter {\n  width: 50px;\n  background: #e8e8e8;\n  color: #333;\n  overflow : hidden;\n}\n\n.ace-clouds .ace_gutter-layer {\n  width: 100%;\n  text-align: right;\n}\n\n.ace-clouds .ace_gutter-layer .ace_gutter-cell {\n  padding-right: 6px;\n}\n\n.ace-clouds .ace_print_margin {\n  width: 1px;\n  background: #e8e8e8;\n}\n\n.ace-clouds .ace_scroller {\n  background-color: #FFFFFF;\n}\n\n.ace-clouds .ace_text-layer {\n  cursor: text;\n  color: #000000;\n}\n\n.ace-clouds .ace_cursor {\n  border-left: 2px solid #000000;\n}\n\n.ace-clouds .ace_cursor.ace_overwrite {\n  border-left: 0px;\n  border-bottom: 1px solid #000000;\n}\n \n.ace-clouds .ace_marker-layer .ace_selection {\n  background: #BDD5FC;\n}\n\n.ace-clouds .ace_marker-layer .ace_step {\n  background: rgb(198, 219, 174);\n}\n\n.ace-clouds .ace_marker-layer .ace_bracket {\n  margin: -1px 0 0 -1px;\n  border: 1px solid #BFBFBF;\n}\n\n.ace-clouds .ace_marker-layer .ace_active_line {\n  background: #FFFBD1;\n}\n\n       \n.ace-clouds .ace_invisible {\n  color: #BFBFBF;\n}\n\n.ace-clouds .ace_keyword {\n  color:#AF956F;\n}\n\n.ace-clouds .ace_keyword.ace_operator {\n  color:#484848;\n}\n\n.ace-clouds .ace_constant {\n  \n}\n\n.ace-clouds .ace_constant.ace_language {\n  color:#39946A;\n}\n\n.ace-clouds .ace_constant.ace_library {\n  \n}\n\n.ace-clouds .ace_constant.ace_numeric {\n  color:#46A609;\n}\n\n.ace-clouds .ace_invalid {\n  background-color:#FF002A;\n}\n\n.ace-clouds .ace_invalid.ace_illegal {\n  \n}\n\n.ace-clouds .ace_invalid.ace_deprecated {\n  \n}\n\n.ace-clouds .ace_support {\n  \n}\n\n.ace-clouds .ace_support.ace_function {\n  color:#C52727;\n}\n\n.ace-clouds .ace_function.ace_buildin {\n  \n}\n\n.ace-clouds .ace_string {\n  color:#5D90CD;\n}\n\n.ace-clouds .ace_string.ace_regexp {\n  \n}\n\n.ace-clouds .ace_comment {\n  color:#BCC8BA;\n}\n\n.ace-clouds .ace_comment.ace_doc {\n  \n}\n\n.ace-clouds .ace_comment.ace_doc.ace_tag {\n  \n}\n\n.ace-clouds .ace_variable {\n  \n}\n\n.ace-clouds .ace_variable.ace_language {\n  \n}\n\n.ace-clouds .ace_xml_pe {\n  \n}";d.importCssString(e),b.cssClass="ace-clouds"})
\ No newline at end of file
+define("ace/theme/clouds",["require","exports","module"],function(a,b,c){b.isDark=!1,b.cssClass="ace-clouds",b.cssText=".ace-clouds .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-clouds .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-clouds .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-clouds .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-clouds .ace_scroller {  background-color: #FFFFFF;}.ace-clouds .ace_text-layer {  cursor: text;  color: #000000;}.ace-clouds .ace_cursor {  border-left: 2px solid #000000;}.ace-clouds .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #000000;} .ace-clouds .ace_marker-layer .ace_selection {  background: #BDD5FC;}.ace-clouds .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-clouds .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid #BFBFBF;}.ace-clouds .ace_marker-layer .ace_active_line {  background: #FFFBD1;}.ace-clouds .ace_marker-layer .ace_selected_word {  border: 1px solid #BDD5FC;}       .ace-clouds .ace_invisible {  color: #BFBFBF;}.ace-clouds .ace_keyword {  color:#AF956F;}.ace-clouds .ace_keyword.ace_operator {  color:#484848;}.ace-clouds .ace_constant.ace_language {  color:#39946A;}.ace-clouds .ace_constant.ace_numeric {  color:#46A609;}.ace-clouds .ace_invalid {  background-color:#FF002A;}.ace-clouds .ace_fold {    background-color: #AF956F;    border-color: #000000;}.ace-clouds .ace_support.ace_function {  color:#C52727;}.ace-clouds .ace_string {  color:#5D90CD;}.ace-clouds .ace_comment {  color:#BCC8BA;}.ace-clouds .ace_entity.ace_other.ace_attribute-name {  color:#606060;}.ace-clouds .ace_markup.ace_underline {    text-decoration:underline;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)}),function(){window.require(["ace/ace"],function(a){window.ace||(window.ace={});for(var b in a)a.hasOwnProperty(b)&&(ace[b]=a[b])})}()
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/worker-coffee.js b/apps/files_texteditor/js/aceeditor/worker-coffee.js
index a4cbf589440..d47238ceb7d 100644
--- a/apps/files_texteditor/js/aceeditor/worker-coffee.js
+++ b/apps/files_texteditor/js/aceeditor/worker-coffee.js
@@ -1 +1,7054 @@
-function initSender(){var a=require("pilot/event_emitter").EventEmitter,b=require("pilot/oop"),c=function(){};(function(){b.implement(this,a),this.callback=function(a,b){postMessage({type:"call",id:b,data:a})},this.emit=function(a,b){postMessage({type:"event",name:a,data:b})}}).call(c.prototype);return new c}function initBaseUrls(a){require.tlns=a}var console={log:function(a){postMessage({type:"log",data:a})}},window={console:console},require=function(a){var b=require.modules[a];if(b){b.initialized||(b.exports=b.factory().exports,b.initialized=!0);return b.exports}var c=a.split("/");c[0]=require.tlns[c[0]]||c[0],path=c.join("/")+".js",require.id=a,importScripts(path);return require(a)};require.modules={},require.tlns={};var define=function(a,b,c){arguments.length==2?c=b:arguments.length==1&&(c=a,a=require.id);a.indexOf("text/")!==0&&(require.modules[a]={factory:function(){var a={exports:{}},b=c(require,a.exports,a);b&&(a.exports=b);return a}})},main,sender;onmessage=function(a){var b=a.data;if(b.command)main[b.command].apply(main,b.args);else if(b.init){initBaseUrls(b.tlns),require("pilot/fixoldbrowsers"),sender=initSender();var c=require(b.module)[b.classname];main=new c(sender)}else b.event&&sender&&sender._dispatchEvent(b.event,b.data)},define("pilot/fixoldbrowsers",["require","exports","module"],function(a,b,c){if(!Function.prototype.bind){var d=Array.prototype.slice;Function.prototype.bind=function(a){var b=this;if(typeof b.apply!="function"||typeof b.call!="function")return new TypeError;var c=d.call(arguments),e=function f(){if(this instanceof f){var a=Object.create(b.prototype);b.apply(a,c.concat(d.call(arguments)));return a}return b.call.apply(b,c.concat(d.call(arguments)))};e.length=typeof b=="function"?Math.max(b.length-c.length,0):0;return e}}var e=Function.prototype.call,f=Array.prototype,g=Object.prototype,h=e.bind(g.hasOwnProperty),i,j,k,l,m;if(m=h(g,"__defineGetter__"))i=e.bind(g.__defineGetter__),j=e.bind(g.__defineSetter__),k=e.bind(g.__lookupGetter__),l=e.bind(g.__lookupSetter__);Array.isArray||(Array.isArray=function(a){return Object.prototype.toString.call(a)==="[object Array]"}),Array.prototype.forEach||(Array.prototype.forEach=function(a,b){var c=+this.length;for(var d=0;d<c;d++)d in this&&a.call(b,this[d],d,this)}),Array.prototype.map||(Array.prototype.map=function(a){var b=+this.length;if(typeof a!="function")throw new TypeError;var c=Array(b),d=arguments[1];for(var e=0;e<b;e++)e in this&&(c[e]=a.call(d,this[e],e,this));return c}),Array.prototype.filter||(Array.prototype.filter=function(a){var b=[],c=arguments[1];for(var d=0;d<this.length;d++)a.call(c,this[d])&&b.push(this[d]);return b}),Array.prototype.every||(Array.prototype.every=function(a){var b=arguments[1];for(var c=0;c<this.length;c++)if(!a.call(b,this[c]))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(a){var b=arguments[1];for(var c=0;c<this.length;c++)if(a.call(b,this[c]))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(a){var b=+this.length;if(typeof a!="function")throw new TypeError;if(b===0&&arguments.length===1)throw new TypeError;var c=0;if(arguments.length>=2)var d=arguments[1];else do{if(c in this){d=this[c++];break}if(++c>=b)throw new TypeError}while(!0);for(;c<b;c++)c in this&&(d=a.call(null,d,this[c],c,this));return d}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(a){var b=+this.length;if(typeof a!="function")throw new TypeError;if(b===0&&arguments.length===1)throw new TypeError;var c=b-1;if(arguments.length>=2)var d=arguments[1];else do{if(c in this){d=this[c--];break}if(--c<0)throw new TypeError}while(!0);for(;c>=0;c--)c in this&&(d=a.call(null,d,this[c],c,this));return d}),Array.prototype.indexOf||(Array.prototype.indexOf=function(a){var b=this.length;if(!b)return-1;var c=arguments[1]||0;if(c>=b)return-1;c<0&&(c+=b);for(;c<b;c++){if(!h(this,c))continue;if(a===this[c])return c}return-1}),Array.prototype.lastIndexOf||(Array.prototype.lastIndexOf=function(a){var b=this.length;if(!b)return-1;var c=arguments[1]||b;c<0&&(c+=b),c=Math.min(c,b-1);for(;c>=0;c--){if(!h(this,c))continue;if(a===this[c])return c}return-1}),Object.getPrototypeOf||(Object.getPrototypeOf=function(a){return a.__proto__||a.constructor.prototype});if(!Object.getOwnPropertyDescriptor){var n="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(a,b){if(typeof a!="object"&&typeof a!="function"||a===null)throw new TypeError(n+a);if(!h(a,b))return undefined;var c,d,e;c={enumerable:!0,configurable:!0};if(m){var f=a.__proto__;a.__proto__=g;var d=k(a,b),e=l(a,b);a.__proto__=f;if(d||e){d&&(descriptor.get=d),e&&(descriptor.set=e);return descriptor}}descriptor.value=a[b];return descriptor}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(a){return Object.keys(a)}),Object.create||(Object.create=function(a,b){var c;if(a===null)c={"__proto__":null};else{if(typeof a!="object")throw new TypeError("typeof prototype["+typeof a+"] != 'object'");var d=function(){};d.prototype=a,c=new d,c.__proto__=a}typeof b!="undefined"&&Object.defineProperties(c,b);return c});if(!Object.defineProperty){var o="Property description must be an object: ",p="Object.defineProperty called on non-object: ",q="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(a,b,c){if(typeof a!="object"&&typeof a!="function")throw new TypeError(p+a);if(typeof a!="object"||a===null)throw new TypeError(o+c);if(h(c,"value"))if(m&&(k(a,b)||l(a,b))){var d=a.__proto__;a.__proto__=g,delete a[b],a[b]=c.value,a.prototype}else a[b]=c.value;else{if(!m)throw new TypeError(q);h(c,"get")&&i(a,b,c.get),h(c,"set")&&j(a,b,c.set)}return a}}Object.defineProperties||(Object.defineProperties=function(a,b){for(var c in b)h(b,c)&&Object.defineProperty(a,c,b[c]);return a}),Object.seal||(Object.seal=function(a){return a}),Object.freeze||(Object.freeze=function(a){return a});try{Object.freeze(function(){})}catch(r){Object.freeze=function(a){return function b(b){return typeof b=="function"?b:a(b)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(a){return a}),Object.isSealed||(Object.isSealed=function(a){return!1}),Object.isFrozen||(Object.isFrozen=function(a){return!1}),Object.isExtensible||(Object.isExtensible=function(a){return!0});if(!Object.keys){var s=!0,t=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],u=t.length;for(var v in{toString:null})s=!1;Object.keys=function W(a){if(typeof a!="object"&&typeof a!="function"||a===null)throw new TypeError("Object.keys called on a non-object");var W=[];for(var b in a)h(a,b)&&W.push(b);if(s)for(var c=0,d=u;c<d;c++){var e=t[c];h(a,e)&&W.push(e)}return W}}Date.prototype.toISOString||(Date.prototype.toISOString=function(){return this.getUTCFullYear()+"-"+(this.getUTCMonth()+1)+"-"+this.getUTCDate()+"T"+this.getUTCHours()+":"+this.getUTCMinutes()+":"+this.getUTCSeconds()+"Z"}),Date.now||(Date.now=function(){return(new Date).getTime()}),Date.prototype.toJSON||(Date.prototype.toJSON=function(a){if(typeof this.toISOString!="function")throw new TypeError;return this.toISOString()}),isNaN(Date.parse("T00:00"))&&(Date=function(a){var b=function(c,d,e,f,g,h,i){var j=arguments.length;if(this instanceof a){var k=j===1&&String(c)===c?new a(b.parse(c)):j>=7?new a(c,d,e,f,g,h,i):j>=6?new a(c,d,e,f,g,h):j>=5?new a(c,d,e,f,g):j>=4?new a(c,d,e,f):j>=3?new a(c,d,e):j>=2?new a(c,d):j>=1?new a(c):new a;k.constructor=b;return k}return a.apply(this,arguments)},c=new RegExp("^(?:((?:[+-]\\d\\d)?\\d\\d\\d\\d)(?:-(\\d\\d)(?:-(\\d\\d))?)?)?(?:T(\\d\\d):(\\d\\d)(?::(\\d\\d)(?:\\.(\\d\\d\\d))?)?)?(?:Z|([+-])(\\d\\d):(\\d\\d))?$");for(var d in a)b[d]=a[d];b.now=a.now,b.UTC=a.UTC,b.prototype=a.prototype,b.prototype.constructor=b,b.parse=function e(b){var d=c.exec(b);if(d){d.shift();var e=d[0]===undefined;for(var f=0;f<10;f++){if(f===7)continue;d[f]=+(d[f]||(f<3?1:0)),f===1&&d[f]--}if(e)return((d[3]*60+d[4])*60+d[5])*1e3+d[6];var g=(d[8]*60+d[9])*60*1e3;d[6]==="-"&&(g=-g);return a.UTC.apply(this,d.slice(0,7))+g}return a.parse.apply(this,arguments)};return b}(Date));if(!String.prototype.trim){var w=/^\s\s*/,x=/\s\s*$/;String.prototype.trim=function(){return String(this).replace(w,"").replace(x,"")}}}),define("pilot/event_emitter",["require","exports","module"],function(a,b,c){var d={};d._emit=d._dispatchEvent=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!!c&&!!c.length){var b=b||{};b.type=a;for(var d=0;d<c.length;d++)c[d](b)}},d.on=d.addEventListener=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!c)var c=this._eventRegistry[a]=[];c.indexOf(b)==-1&&c.push(b)},d.removeListener=d.removeEventListener=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!!c){var d=c.indexOf(b);d!==-1&&c.splice(d,1)}},d.removeAllListeners=function(a){this._eventRegistry&&(this._eventRegistry[a]=[])},b.EventEmitter=d}),define("pilot/oop",["require","exports","module"],function(a,b,c){b.inherits=function(){var a=function(){};return function(b,c){a.prototype=c.prototype,b.super_=c.prototype,b.prototype=new a,b.prototype.constructor=b}}(),b.mixin=function(a,b){for(var c in b)a[c]=b[c]},b.implement=function(a,c){b.mixin(a,c)}}),define("ace/mode/coffee_worker",["require","exports","module","pilot/oop","ace/worker/mirror","ace/mode/coffee/coffee-script"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/worker/mirror").Mirror,f=a("ace/mode/coffee/coffee-script");window.addEventListener=function(){};var g=b.Worker=function(a){e.call(this,a),this.setTimeout(200)};d.inherits(g,e),function(){this.onUpdate=function(){var a=this.doc.getValue();try{f.parse(a)}catch(b){var c=b.message.match(/Parse error on line (\d+): (.*)/);if(c){this.sender.emit("error",{row:parseInt(c[1])-1,column:null,text:c[2],type:"error"});return}if(b instanceof SyntaxError){var c=b.message.match(/ on line (\d+)/);c&&this.sender.emit("error",{row:parseInt(c[1])-1,column:null,text:b.message.replace(c[0],""),type:"error"})}return}this.sender.emit("ok")}}.call(g.prototype)}),define("ace/worker/mirror",["require","exports","module","ace/document","pilot/lang"],function(a,b,c){var d=a("ace/document").Document,e=a("pilot/lang"),f=b.Mirror=function(a){this.sender=a;var b=this.doc=new d(""),c=this.deferredUpdate=e.deferredCall(this.onUpdate.bind(this)),f=this;a.on("change",function(a){b.applyDeltas([a.data]),c.schedule(f.$timeout)})};(function(){this.$timeout=500,this.setTimeout=function(a){this.$timeout=a},this.setValue=function(a){this.doc.setValue(a),this.deferredUpdate.schedule(this.$timeout)},this.getValue=function(a){this.sender.callback(this.doc.getValue(),a)},this.onUpdate=function(){}}).call(f.prototype)}),define("ace/document",["require","exports","module","pilot/oop","pilot/event_emitter","ace/range","ace/anchor"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=a("ace/range").Range,g=a("ace/anchor").Anchor,h=function(a){this.$lines=[],Array.isArray(a)?this.insertLines(0,a):a.length==0?this.$lines=[""]:this.insert({row:0,column:0},a)};(function(){d.implement(this,e),this.setValue=function(a){var b=this.getLength();this.remove(new f(0,0,b,this.getLine(b-1).length)),this.insert({row:0,column:0},a)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(a,b){return new g(this,a,b)},"aaa".split(/a/).length==0?this.$split=function(a){return a.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(a){return a.split(/\r\n|\r|\n/)},this.$detectNewLine=function(a){var b=a.match(/^.*?(\r?\n)/m);b?this.$autoNewLine=b[1]:this.$autoNewLine="\n"},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";case"auto":return this.$autoNewLine}},this.$autoNewLine="\n",this.$newLineMode="auto",this.setNewLineMode=function(a){this.$newLineMode!==a&&(this.$newLineMode=a)},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(a){return a=="\r\n"||a=="\r"||a=="\n"},this.getLine=function(a){return this.$lines[a]||""},this.getLines=function(a,b){return this.$lines.slice(a,b+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(a){if(a.start.row==a.end.row)return this.$lines[a.start.row].substring(a.start.column,a.end.column);var b=[];b.push(this.$lines[a.start.row].substring(a.start.column)),b.push.apply(b,this.getLines(a.start.row+1,a.end.row-1)),b.push(this.$lines[a.end.row].substring(0,a.end.column));return b.join(this.getNewLineCharacter())},this.$clipPosition=function(a){var b=this.getLength();a.row>=b&&(a.row=Math.max(0,b-1),a.column=this.getLine(b-1).length);return a},this.insert=function(a,b){if(b.length==0)return a;a=this.$clipPosition(a),this.getLength()<=1&&this.$detectNewLine(b);var c=this.$split(b),d=c.splice(0,1)[0],e=c.length==0?null:c.splice(c.length-1,1)[0];a=this.insertInLine(a,d),e!==null&&(a=this.insertNewLine(a),a=this.insertLines(a.row,c),a=this.insertInLine(a,e||""));return a},this.insertLines=function(a,b){if(b.length==0)return{row:a,column:0};var c=[a,0];c.push.apply(c,b),this.$lines.splice.apply(this.$lines,c);var d=new f(a,0,a+b.length,0),e={action:"insertLines",range:d,lines:b};this._dispatchEvent("change",{data:e});return d.end},this.insertNewLine=function(a){a=this.$clipPosition(a);var b=this.$lines[a.row]||"";this.$lines[a.row]=b.substring(0,a.column),this.$lines.splice(a.row+1,0,b.substring(a.column,b.length));var c={row:a.row+1,column:0},d={action:"insertText",range:f.fromPoints(a,c),text:this.getNewLineCharacter()};this._dispatchEvent("change",{data:d});return c},this.insertInLine=function(a,b){if(b.length==0)return a;var c=this.$lines[a.row]||"";this.$lines[a.row]=c.substring(0,a.column)+b+c.substring(a.column);var d={row:a.row,column:a.column+b.length},e={action:"insertText",range:f.fromPoints(a,d),text:b};this._dispatchEvent("change",{data:e});return d},this.remove=function(a){a.start=this.$clipPosition(a.start),a.end=this.$clipPosition(a.end);if(a.isEmpty())return a.start;var b=a.start.row,c=a.end.row;if(a.isMultiLine()){var d=a.start.column==0?b:b+1,e=c-1;a.end.column>0&&this.removeInLine(c,0,a.end.column),e>=d&&this.removeLines(d,e),d!=b&&(this.removeInLine(b,a.start.column,this.getLine(b).length),this.removeNewLine(a.start.row))}else this.removeInLine(b,a.start.column,a.end.column);return a.start},this.removeInLine=function(a,b,c){if(b!=c){var d=new f(a,b,a,c),e=this.getLine(a),g=e.substring(b,c),h=e.substring(0,b)+e.substring(c,e.length);this.$lines.splice(a,1,h);var i={action:"removeText",range:d,text:g};this._dispatchEvent("change",{data:i});return d.start}},this.removeLines=function(a,b){var c=new f(a,0,b+1,0),d=this.$lines.splice(a,b-a+1),e={action:"removeLines",range:c,nl:this.getNewLineCharacter(),lines:d};this._dispatchEvent("change",{data:e});return d},this.removeNewLine=function(a){var b=this.getLine(a),c=this.getLine(a+1),d=new f(a,b.length,a+1,0),e=b+c;this.$lines.splice(a,2,e);var g={action:"removeText",range:d,text:this.getNewLineCharacter()};this._dispatchEvent("change",{data:g})},this.replace=function(a,b){if(b.length==0&&a.isEmpty())return a.start;if(b==this.getTextRange(a))return a.end;this.remove(a);if(b)var c=this.insert(a.start,b);else c=a.start;return c},this.applyDeltas=function(a){for(var b=0;b<a.length;b++){var c=a[b],d=f.fromPoints(c.range.start,c.range.end);c.action=="insertLines"?this.insertLines(d.start.row,c.lines):c.action=="insertText"?this.insert(d.start,c.text):c.action=="removeLines"?this.removeLines(d.start.row,d.end.row-1):c.action=="removeText"&&this.remove(d)}},this.revertDeltas=function(a){for(var b=a.length-1;b>=0;b--){var c=a[b],d=f.fromPoints(c.range.start,c.range.end);c.action=="insertLines"?this.removeLines(d.start.row,d.end.row-1):c.action=="insertText"?this.remove(d):c.action=="removeLines"?this.insertLines(d.start.row,c.lines):c.action=="removeText"&&this.insert(d.start,c.text)}}}).call(h.prototype),b.Document=h}),define("ace/range",["require","exports","module"],function(a,b,c){var d=function(a,b,c,d){this.start={row:a,column:b},this.end={row:c,column:d}};(function(){this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(a,b){return this.compare(a,b)==0},this.compareRange=function(a){var b,c=a.end,d=a.start;b=this.compare(c.row,c.column);if(b==1){b=this.compare(d.row,d.column);return b==1?2:b==0?1:0}if(b==-1)return-2;b=this.compare(d.row,d.column);return b==-1?-1:b==1?42:0},this.containsRange=function(a){var b=this.compareRange(a);return b==-1||b==0||b==1},this.isEnd=function(a,b){return this.end.row==a&&this.end.column==b},this.isStart=function(a,b){return this.start.row==a&&this.start.column==b},this.setStart=function(a,b){typeof a=="object"?(this.start.column=a.column,this.start.row=a.row):(this.start.row=a,this.start.column=b)},this.setEnd=function(a,b){typeof a=="object"?(this.end.column=a.column,this.end.row=a.row):(this.end.row=a,this.end.column=b)},this.inside=function(a,b){if(this.compare(a,b)==0)return this.isEnd(a,b)||this.isStart(a,b)?!1:!0;return!1},this.insideStart=function(a,b){if(this.compare(a,b)==0)return this.isEnd(a,b)?!1:!0;return!1},this.insideEnd=function(a,b){if(this.compare(a,b)==0)return this.isStart(a,b)?!1:!0;return!1},this.compare=function(a,b){if(!this.isMultiLine()&&a===this.start.row)return b<this.start.column?-1:b>this.end.column?1:0;return a<this.start.row?-1:a>this.end.row?1:this.start.row===a?b>=this.start.column?0:-1:this.end.row===a?b<=this.end.column?0:1:0},this.compareStart=function(a,b){return this.start.row==a&&this.start.column==b?-1:this.compare(a,b)},this.compareEnd=function(a,b){return this.end.row==a&&this.end.column==b?1:this.compare(a,b)},this.compareInside=function(a,b){return this.end.row==a&&this.end.column==b?1:this.start.row==a&&this.start.column==b?-1:this.compare(a,b)},this.clipRows=function(a,b){if(this.end.row>b)var c={row:b+1,column:0};if(this.start.row>b)var e={row:b+1,column:0};if(this.start.row<a)var e={row:a,column:0};if(this.end.row<a)var c={row:a,column:0};return d.fromPoints(e||this.start,c||this.end)},this.extend=function(a,b){var c=this.compare(a,b);if(c==0)return this;if(c==-1)var e={row:a,column:b};else var f={row:a,column:b};return d.fromPoints(e||this.start,f||this.end)},this.isEmpty=function(){return this.start.row==this.end.row&&this.start.column==this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return d.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new d(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new d(this.start.row,0,this.end.row,0)},this.toScreenRange=function(a){var b=a.documentToScreenPosition(this.start),c=a.documentToScreenPosition(this.end);return new d(b.row,b.column,c.row,c.column)}}).call(d.prototype),d.fromPoints=function(a,b){return new d(a.row,a.column,b.row,b.column)},b.Range=d}),define("ace/anchor",["require","exports","module","pilot/oop","pilot/event_emitter"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=b.Anchor=function(a,b,c){this.document=a,typeof c=="undefined"?this.setPosition(b.row,b.column):this.setPosition(b,c),this.$onChange=this.onChange.bind(this),a.on("change",this.$onChange)};(function(){d.implement(this,e),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.onChange=function(a){var b=a.data,c=b.range;if(c.start.row!=c.end.row||c.start.row==this.row){if(c.start.row>this.row)return;if(c.start.row==this.row&&c.start.column>this.column)return;var d=this.row,e=this.column;b.action==="insertText"?c.start.row===d&&c.start.column<=e?c.start.row===c.end.row?e+=c.end.column-c.start.column:(e-=c.start.column,d+=c.end.row-c.start.row):c.start.row!==c.end.row&&c.start.row<d&&(d+=c.end.row-c.start.row):b.action==="insertLines"?c.start.row<=d&&(d+=c.end.row-c.start.row):b.action=="removeText"?c.start.row==d&&c.start.column<e?c.end.column>=e?e=c.start.column:e=Math.max(0,e-(c.end.column-c.start.column)):c.start.row!==c.end.row&&c.start.row<d?(c.end.row==d&&(e=Math.max(0,e-c.end.column)+c.start.column),d-=c.end.row-c.start.row):c.end.row==d&&(d-=c.end.row-c.start.row,e=Math.max(0,e-c.end.column)+c.start.column):b.action=="removeLines"&&c.start.row<=d&&(c.end.row<=d?d-=c.end.row-c.start.row:(d=c.start.row,e=0)),this.setPosition(d,e,!0)}},this.setPosition=function(a,b,c){var d;c?d={row:a,column:b}:d=this.$clipPositionToDocument(a,b);if(this.row!=d.row||this.column!=d.column){var e={row:this.row,column:this.column};this.row=d.row,this.column=d.column,this._dispatchEvent("change",{old:e,value:d})}},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.$clipPositionToDocument=function(a,b){var c={};a>=this.document.getLength()?(c.row=Math.max(0,this.document.getLength()-1),c.column=this.document.getLine(c.row).length):a<0?(c.row=0,c.column=0):(c.row=a,c.column=Math.min(this.document.getLine(c.row).length,Math.max(0,b))),b<0&&(c.column=0);return c}}).call(f.prototype)}),define("pilot/lang",["require","exports","module"],function(a,b,c){b.stringReverse=function(a){return a.split("").reverse().join("")},b.stringRepeat=function(a,b){return Array(b+1).join(a)};var d=/^\s\s*/,e=/\s\s*$/;b.stringTrimLeft=function(a){return a.replace(d,"")},b.stringTrimRight=function(a){return a.replace(e,"")},b.copyObject=function(a){var b={};for(var c in a)b[c]=a[c];return b},b.copyArray=function(a){var b=[];for(i=0,l=a.length;i<l;i++)a[i]&&typeof a[i]=="object"?b[i]=this.copyObject(a[i]):b[i]=a[i];return b},b.deepCopy=function(a){if(typeof a!="object")return a;var b=a.constructor();for(var c in a)typeof a[c]=="object"?b[c]=this.deepCopy(a[c]):b[c]=a[c];return b},b.arrayToMap=function(a){var b={};for(var c=0;c<a.length;c++)b[a[c]]=1;return b},b.arrayRemove=function(a,b){for(var c=0;c<=a.length;c++)b===a[c]&&a.splice(c,1)},b.escapeRegExp=function(a){return a.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},b.deferredCall=function(a){var b=null,c=function(){b=null,a()},d=function(a){b||(b=setTimeout(c,a||0));return d};d.schedule=d,d.call=function(){this.cancel(),a();return d},d.cancel=function(){clearTimeout(b),b=null;return d};return d}}),define("ace/mode/coffee/coffee-script",["require","exports","module","ace/mode/coffee/lexer","ace/mode/coffee/parser","ace/mode/coffee/nodes"],function(a,b,c){var d=a("ace/mode/coffee/lexer").Lexer,e=a("ace/mode/coffee/parser"),f=new d;e.lexer={lex:function(){var a,b;b=this.tokens[this.pos++]||[""],a=b[0],this.yytext=b[1],this.yylineno=b[2];return a},setInput:function(a){this.tokens=a;return this.pos=0},upcomingInput:function(){return""}},e.yy=a("ace/mode/coffee/nodes"),b.parse=function(a){return e.parse(f.tokenize(a))}}),define("ace/mode/coffee/lexer",["require","exports","module","ace/mode/coffee/rewriter","ace/mode/coffee/helpers"],function(a,b,c){var d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y=Array.prototype.indexOf||function(a){for(var b=0,c=this.length;b<c;b++)if(this[b]===a)return b;return-1};M=a("ace/mode/coffee/rewriter").Rewriter,X=a("ace/mode/coffee/helpers"),T=X.count,W=X.starts,S=X.compact,V=X.last,b.Lexer=A=function(){function a(){}a.prototype.tokenize=function(a,b){var c;b==null&&(b={}),R.test(a)&&(a="\n"+a),a=a.replace(/\r/g,"").replace(P,""),this.code=a,this.line=b.line||0,this.indent=0,this.indebt=0,this.outdebt=0,this.indents=[],this.tokens=[],c=0;while(this.chunk=a.slice(c))c+=this.identifierToken()||this.commentToken()||this.whitespaceToken()||this.lineToken()||this.heredocToken()||this.stringToken()||this.numberToken()||this.regexToken()||this.jsToken()||this.literalToken();this.closeIndentation();return b.rewrite===!1?this.tokens:(new M).rewrite(this.tokens)},a.prototype.identifierToken=function(){var a,b,c,d,e,f,g,k,l;if(!(e=s.exec(this.chunk)))return 0;d=e[0],c=e[1],a=e[2];if(c==="own"&&this.tag()==="FOR"){this.token("OWN",c);return c.length}b=a||(f=V(this.tokens))&&((k=f[0])==="."||k==="?."||k==="::"||!f.spaced&&f[0]==="@"),g="IDENTIFIER";if(Y.call(w,c)>=0||!b&&Y.call(j,c)>=0)g=c.toUpperCase(),g==="WHEN"&&(l=this.tag(),Y.call(x,l)>=0)?g="LEADING_WHEN":g==="FOR"?this.seenFor=!0:g==="UNLESS"?g="IF":Y.call(Q,g)>=0?g="UNARY":Y.call(K,g)>=0&&(g!=="INSTANCEOF"&&this.seenFor?(g="FOR"+g,this.seenFor=!1):(g="RELATION",this.value()==="!"&&(this.tokens.pop(),c="!"+c)));Y.call(v,c)>=0&&(b?(g="IDENTIFIER",c=new String(c),c.reserved=!0):Y.call(L,c)>=0&&this.identifierError(c)),b||(Y.call(h,c)>=0&&(c=i[c]),g=function(){switch(c){case"!":return"UNARY";case"==":case"!=":return"COMPARE";case"&&":case"||":return"LOGIC";case"true":case"false":case"null":case"undefined":return"BOOL";case"break":case"continue":case"debugger":return"STATEMENT";default:return g}}()),this.token(g,c),a&&this.token(":",":");return d.length},a.prototype.numberToken=function(){var a,b;if(!(a=H.exec(this.chunk)))return 0;b=a[0],this.token("NUMBER",b);return b.length},a.prototype.stringToken=function(){var a,b;switch(this.chunk.charAt(0)){case"'":if(!(a=O.exec(this.chunk)))return 0;this.token("STRING",(b=a[0]).replace(C,"\\\n"));break;case'"':if(!(b=this.balancedString(this.chunk,'"')))return 0;0<b.indexOf("#{",1)?this.interpolateString(b.slice(1,-1)):this.token("STRING",this.escapeLines(b));break;default:return 0}this.line+=T(b,"\n");return b.length},a.prototype.heredocToken=function(){var a,b,c,d;if(!(c=n.exec(this.chunk)))return 0;b=c[0],d=b.charAt(0),a=this.sanitizeHeredoc(c[2],{quote:d,indent:null}),d==='"'&&0<=a.indexOf("#{")?this.interpolateString(a,{heredoc:!0}):this.token("STRING",this.makeString(a,d,!0)),this.line+=T(b,"\n");return b.length},a.prototype.commentToken=function(){var a,b,c;if(!(c=this.chunk.match(k)))return 0;a=c[0],b=c[1],b&&(this.token("HERECOMMENT",this.sanitizeHeredoc(b,{herecomment:!0,indent:Array(this.indent+1).join(" ")})),this.token("TERMINATOR","\n")),this.line+=T(a,"\n");return a.length},a.prototype.jsToken=function(){var a,b;if(this.chunk.charAt(0)!=="`"||!(a=u.exec(this.chunk)))return 0;this.token("JS",(b=a[0]).slice(1,-1));return b.length},a.prototype.regexToken=function(){var a,b,c,d;if(this.chunk.charAt(0)!=="/")return 0;if(a=q.exec(this.chunk)){this.line+=T(a[0],"\n");return this.heregexToken(a)}b=V(this.tokens);if(b&&(d=b[0],Y.call(b.spaced?E:F,d)>=0))return 0;if(!(a=J.exec(this.chunk)))return 0;c=a[0],this.token("REGEX",c==="//"?"/(?:)/":c);return c.length},a.prototype.heregexToken=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n;d=a[0],b=a[1],c=a[2];if(0>b.indexOf("#{")){e=b.replace(r,"").replace(/\//g,"\\/"),this.token("REGEX","/"+(e||"(?:)")+"/"+c);return d.length}this.token("IDENTIFIER","RegExp"),this.tokens.push(["CALL_START","("]),g=[],k=this.interpolateString(b,{regex:!0});for(i=0,j=k.length;i<j;i++){l=k[i],f=l[0],h=l[1];if(f==="TOKENS")g.push.apply(g,h);else{if(!(h=h.replace(r,"")))continue;h=h.replace(/\\/g,"\\\\"),g.push(["STRING",this.makeString(h,'"',!0)])}g.push(["+","+"])}g.pop(),((m=g[0])!=null?m[0]:void 0)!=="STRING"&&this.tokens.push(["STRING",'""'],["+","+"]),(n=this.tokens).push.apply(n,g),c&&this.tokens.push([",",","],["STRING",'"'+c+'"']),this.token(")",")");return d.length},a.prototype.lineToken=function(){var a,b,c,d,e,f;if(!(c=D.exec(this.chunk)))return 0;b=c[0],this.line+=T(b,"\n"),e=V(this.tokens,1),f=b.length-1-b.lastIndexOf("\n"),d=this.unfinished();if(f-this.indebt===this.indent){d?this.suppressNewlines():this.newlineToken();return b.length}if(f>this.indent){if(d){this.indebt=f-this.indent,this.suppressNewlines();return b.length}a=f-this.indent+this.outdebt,this.token("INDENT",a),this.indents.push(a),this.outdebt=this.indebt=0}else this.indebt=0,this.outdentToken(this.indent-f,d);this.indent=f;return b.length},a.prototype.outdentToken=function(a,b,c){var d,e;while(a>0)e=this.indents.length-1,this.indents[e]===void 0?a=0:this.indents[e]===this.outdebt?(a-=this.outdebt,this.outdebt=0):this.indents[e]<this.outdebt?(this.outdebt-=this.indents[e],a-=this.indents[e]):(d=this.indents.pop()-this.outdebt,a-=d,this.outdebt=0,this.token("OUTDENT",d));d&&(this.outdebt-=a),this.tag()!=="TERMINATOR"&&!b&&this.token("TERMINATOR","\n");return this},a.prototype.whitespaceToken=function(){var a,b,c;if(!(a=R.exec(this.chunk))&&!(b=this.chunk.charAt(0)==="\n"))return 0;c=V(this.tokens),c&&(c[a?"spaced":"newLine"]=!0);return a?a[0].length:0},a.prototype.newlineToken=function(){this.tag()!=="TERMINATOR"&&this.token("TERMINATOR","\n");return this},a.prototype.suppressNewlines=function(){this.value()==="\\"&&this.tokens.pop();return this},a.prototype.literalToken=function(){var a,b,c,d,e,h,i,j;(a=I.exec(this.chunk))?(d=a[0],g.test(d)&&this.tagParameters()):d=this.chunk.charAt(0),c=d,b=V(this.tokens);if(d==="="&&b){!b[1].reserved&&(e=b[1],Y.call(v,e)>=0)&&this.assignmentError();if((h=b[1])==="||"||h==="&&"){b[0]="COMPOUND_ASSIGN",b[1]+="=";return d.length}}if(d===";")c="TERMINATOR";else if(Y.call(B,d)>=0)c="MATH";else if(Y.call(l,d)>=0)c="COMPARE";else if(Y.call(m,d)>=0)c="COMPOUND_ASSIGN";else if(Y.call(Q,d)>=0)c="UNARY";else if(Y.call(N,d)>=0)c="SHIFT";else if(Y.call(z,d)>=0||d==="?"&&(b!=null?b.spaced:void 0))c="LOGIC";else if(b&&!b.spaced)if(d==="("&&(i=b[0],Y.call(f,i)>=0))b[0]==="?"&&(b[0]="FUNC_EXIST"),c="CALL_START";else if(d==="["&&(j=b[0],Y.call(t,j)>=0)){c="INDEX_START";switch(b[0]){case"?":b[0]="INDEX_SOAK";break;case"::":b[0]="INDEX_PROTO"}}this.token(c,d);return d.length},a.prototype.sanitizeHeredoc=function(a,b){var c,d,e,f,g;e=b.indent,d=b.herecomment;if(d){if(o.test(a))throw new Error('block comment cannot contain "*/", starting on line '+(this.line+1));if(a.indexOf("\n")<=0)return a}else while(f=p.exec(a)){c=f[1];if(e===null||0<(g=c.length)&&g<e.length)e=c}e&&(a=a.replace(RegExp("\\n"+e,"g"),"\n")),d||(a=a.replace(/^\n/,""));return a},a.prototype.tagParameters=function(){var a,b,c,d;if(this.tag()!==")")return this;b=[],d=this.tokens,a=d.length,d[--a][0]="PARAM_END";while(c=d[--a])switch(c[0]){case")":b.push(c);break;case"(":case"CALL_START":if(b.length)b.pop();else if(c[0]==="("){c[0]="PARAM_START";return this}}return this},a.prototype.closeIndentation=function(){return this.outdentToken(this.indent)},a.prototype.identifierError=function(a){throw SyntaxError('Reserved word "'+a+'" on line '+(this.line+1))},a.prototype.assignmentError=function(){throw SyntaxError('Reserved word "'+this.value()+'" on line '+(this.line+1)+" can't be assigned")},a.prototype.balancedString=function(a,b){var c,d,e,f,g;f=[b];for(c=1,g=a.length;1<=g?c<g:c>g;1<=g?c++:c--){switch(d=a.charAt(c)){case"\\":c++;continue;case b:f.pop();if(!f.length)return a.slice(0,c+1);b=f[f.length-1];continue}b!=="}"||d!=='"'&&d!=="'"?b==="}"&&d==="{"?f.push(b="}"):b==='"'&&e==="#"&&d==="{"&&f.push(b="}"):f.push(b=d),e=d}throw new Error("missing "+f.pop()+", starting on line "+(this.line+1))},a.prototype.interpolateString=function(b,c){var d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t;c==null&&(c={}),e=c.heredoc,m=c.regex,o=[],l=0,f=-1;while(j=b.charAt(f+=1)){if(j==="\\"){f+=1;continue}if(j!=="#"||b.charAt(f+1)!=="{"||!(d=this.balancedString(b.slice(f+1),"}")))continue;l<f&&o.push(["NEOSTRING",b.slice(l,f)]),g=d.slice(1,-1);if(g.length){k=(new a).tokenize(g,{line:this.line,rewrite:!1}),k.pop(),((r=k[0])!=null?r[0]:void 0)==="TERMINATOR"&&k.shift();if(i=k.length)i>1&&(k.unshift(["(","("]),k.push([")",")"])),o.push(["TOKENS",k])}f+=d.length,l=f+1}f>l&&l<b.length&&o.push(["NEOSTRING",b.slice(l)]);if(m)return o;if(!o.length)return this.token("STRING",'""');o[0][0]!=="NEOSTRING"&&o.unshift(["",""]),(h=o.length>1)&&this.token("(","(");for(f=0,q=o.length;f<q;f++)s=o[f],n=s[0],p=s[1],f&&this.token("+","+"),n==="TOKENS"?(t=this.tokens).push.apply(t,p):this.token("STRING",this.makeString(p,'"',e));h&&this.token(")",")");return o},a.prototype.token=function(a,b){return this.tokens.push([a,b,this.line])},a.prototype.tag=function(a,b){var c;return(c=V(this.tokens,a))&&(b?c[0]=b:c[0])},a.prototype.value=function(a,b){var c;return(c=V(this.tokens,a))&&(b?c[1]=b:c[1])},a.prototype.unfinished=function(){var a,b;return y.test(this.chunk)||(a=V(this.tokens,1))&&a[0]!=="."&&(b=this.value())&&!b.reserved&&G.test(b)&&!g.test(b)&&!d.test(this.chunk)},a.prototype.escapeLines=function(a,b){return a.replace(C,b?"\\n":"")},a.prototype.makeString=function(a,b,c){if(!a)return b+b;a=a.replace(/\\([\s\S])/g,function(a,c){return c==="\n"||c===b?c:a}),a=a.replace(RegExp(""+b,"g"),"\\$&");return b+this.escapeLines(a,c)+b};return a}(),w=["true","false","null","this","new","delete","typeof","in","instanceof","return","throw","break","continue","debugger","if","else","switch","for","while","do","try","catch","finally","class","extends","super"],j=["undefined","then","unless","until","loop","of","by","when"],i={and:"&&",or:"||",is:"==",isnt:"!=",not:"!",yes:"true",no:"false",on:"true",off:"false"},h=function(){var a;a=[];for(U in i)a.push(U);return a}(),j=j.concat(h),L=["case","default","function","var","void","with","const","let","enum","export","import","native","__hasProp","__extends","__slice","__bind","__indexOf"],v=w.concat(L),b.RESERVED=L.concat(w).concat(j),s=/^([$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*)([^\n\S]*:(?!:))?/,H=/^0x[\da-f]+|^(?:\d+(\.\d+)?|\.\d+)(?:e[+-]?\d+)?/i,n=/^("""|''')([\s\S]*?)(?:\n[^\n\S]*)?\1/,I=/^(?:[-=]>|[-+*\/%<>&|^!?=]=|>>>=?|([-+:])\1|([&|<>])\2=?|\?\.|\.{2,3})/,R=/^[^\n\S]+/,k=/^###([^#][\s\S]*?)(?:###[^\n\S]*|(?:###)?$)|^(?:\s*#(?!##[^#]).*)+/,g=/^[-=]>/,D=/^(?:\n[^\n\S]*)+/,O=/^'[^\\']*(?:\\.[^\\']*)*'/,u=/^`[^\\`]*(?:\\.[^\\`]*)*`/,J=/^\/(?![\s=])[^[\/\n\\]*(?:(?:\\[\s\S]|\[[^\]\n\\]*(?:\\[\s\S][^\]\n\\]*)*])[^[\/\n\\]*)*\/[imgy]{0,4}(?!\w)/,q=/^\/{3}([\s\S]+?)\/{3}([imgy]{0,4})(?!\w)/,r=/\s+(?:#.*)?/g,C=/\n/g,p=/\n+([^\n\S]*)/g,o=/\*\//,d=/^\s*@?([$A-Za-z_][$\w\x7f-\uffff]*|['"].*['"])[^\n\S]*?[:=][^:=>]/,y=/^\s*(?:,|\??\.(?![.\d])|::)/,P=/\s+$/,G=/^(?:[-+*&|\/%=<>!.\\][<>=&|]*|and|or|is(?:nt)?|n(?:ot|ew)|delete|typeof|instanceof)$/,m=["-=","+=","/=","*=","%=","||=","&&=","?=","<<=",">>=",">>>=","&=","^=","|="],Q=["!","~","NEW","TYPEOF","DELETE","DO"],z=["&&","||","&","|","^"],N=["<<",">>",">>>"],l=["==","!=","<",">","<=",">="],B=["*","/","%"],K=["IN","OF","INSTANCEOF"],e=["TRUE","FALSE","NULL","UNDEFINED"],E=["NUMBER","REGEX","BOOL","++","--","]"],F=E.concat(")","}","THIS","IDENTIFIER","STRING"),f=["IDENTIFIER","STRING","REGEX",")","]","}","?","::","@","THIS","SUPER"],t=f.concat("NUMBER","BOOL"),x=["INDENT","OUTDENT","TERMINATOR"]}),define("ace/mode/coffee/rewriter",["require","exports","module"],function(a,b,c){var d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v=Array.prototype.indexOf||function(a){for(var b=0,c=this.length;b<c;b++)if(this[b]===a)return b;return-1},w=Array.prototype.slice;b.Rewriter=function(){function a(){}a.prototype.rewrite=function(a){this.tokens=a,this.removeLeadingNewlines(),this.removeMidExpressionNewlines(),this.closeOpenCalls(),this.closeOpenIndexes(),this.addImplicitIndentation(),this.tagPostfixConditionals(),this.addImplicitBraces(),this.addImplicitParentheses(),this.ensureBalance(d),this.rewriteClosingParens();return this.tokens},a.prototype.scanTokens=function(a){var b,c,d;d=this.tokens,b=0;while(c=d[b])b+=a.call(this,c,b,d);return!0},a.prototype.detectEnd=function(a,b,c){var d,e,h,i,j;h=this.tokens,d=0;while(e=h[a]){if(d===0&&b.call(this,e,a))return c.call(this,e,a);if(!e||d<0)return c.call(this,e,a-1);if(i=e[0],v.call(g,i)>=0)d+=1;else if(j=e[0],v.call(f,j)>=0)d-=1;a+=1}return a-1},a.prototype.removeLeadingNewlines=function(){var a,b,c,d;d=this.tokens;for(a=0,c=d.length;a<c;a++){b=d[a][0];if(b!=="TERMINATOR")break}if(a)return this.tokens.splice(0,a)},a.prototype.removeMidExpressionNewlines=function(){return this.scanTokens(function(a,b,c){var d;if(a[0]==="TERMINATOR"&&(d=this.tag(b+1),v.call(e,d)>=0)){c.splice(b,1);return 0}return 1})},a.prototype.closeOpenCalls=function(){var a,b;b=function(a,b){var c;return(c=a[0])===")"||c==="CALL_END"||a[0]==="OUTDENT"&&this.tag(b-1)===")"},a=function(a,b){return this.tokens[a[0]==="OUTDENT"?b-1:b][0]="CALL_END"};return this.scanTokens(function(c,d){c[0]==="CALL_START"&&this.detectEnd(d+1,b,a);return 1})},a.prototype.closeOpenIndexes=function(){var a,b;b=function(a,b){var c;return(c=a[0])==="]"||c==="INDEX_END"},a=function(a,b){return a[0]="INDEX_END"};return this.scanTokens(function(c,d){c[0]==="INDEX_START"&&this.detectEnd(d+1,b,a);return 1})},a.prototype.addImplicitBraces=function(){var a,b,c,d,e;c=[],d=null,e=0,b=function(a,b){var c,d,e,f,g,h;g=this.tokens.slice(b+1,b+3+1||9e9),c=g[0],f=g[1],e=g[2];if("HERECOMMENT"===(c!=null?c[0]:void 0))return!1;d=a[0];return(d==="TERMINATOR"||d==="OUTDENT")&&(f!=null?f[0]:void 0)!==":"&&((c!=null?c[0]:void 0)!=="@"||(e!=null?e[0]:void 0)!==":")||d===","&&c&&(h=c[0])!=="IDENTIFIER"&&h!=="NUMBER"&&h!=="STRING"&&h!=="@"&&h!=="TERMINATOR"&&h!=="OUTDENT"},a=function(a,b){var c;c=["}","}",a[2]],c.generated=!0;return this.tokens.splice(b,0,c)};return this.scanTokens(function(e,h,i){var j,k,l,m,n,o,p;if(o=l=e[0],v.call(g,o)>=0){c.push([l==="INDENT"&&this.tag(h-1)==="{"?"{":l,h]);return 1}if(v.call(f,l)>=0){d=c.pop();return 1}if(l!==":"||(j=this.tag(h-2))!==":"&&((p=c[c.length-1])!=null?p[0]:void 0)==="{")return 1;c.push(["{"]),k=j==="@"?h-2:h-1;while(this.tag(k-2)==="HERECOMMENT")k-=2;n=new String("{"),n.generated=!0,m=["{",n,e[2]],m.generated=!0,i.splice(k,0,m),this.detectEnd(h+2,b,a);return 2})},a.prototype.addImplicitParentheses=function(){var a,b;b=!1,a=function(a,b){var c;c=a[0]==="OUTDENT"?b+1:b;return this.tokens.splice(c,0,["CALL_END",")",a[2]])};return this.scanTokens(function(c,d,e){var f,g,m,o,p,q,r,s,t,u;r=c[0];if(r==="CLASS"||r==="IF")b=!0;s=e.slice(d-1,d+1+1||9e9),o=s[0],g=s[1],m=s[2],f=!b&&r==="INDENT"&&m&&m.generated&&m[0]==="{"&&o&&(t=o[0],v.call(k,t)>=0),q=!1,p=!1,v.call(n,r)>=0&&(b=!1),o&&!o.spaced&&r==="?"&&(c.call=!0);if(c.fromThen)return 1;if(!(f||(o!=null?o.spaced:void 0)&&(o.call||(u=o[0],v.call(k,u)>=0))&&(v.call(i,r)>=0||!c.spaced&&!c.newLine&&v.call(l,r)>=0)))return 1;e.splice(d,0,["CALL_START","(",c[2]]),this.detectEnd(d+1,function(a,b){var c,d;r=a[0];if(!q&&a.fromThen)return!0;if(r==="IF"||r==="ELSE"||r==="CATCH"||r==="->"||r==="=>")q=!0;if(r==="IF"||r==="ELSE"||r==="SWITCH"||r==="TRY")p=!0;return r!=="."&&r!=="?."&&r!=="::"||this.tag(b-1)!=="OUTDENT"?!a.generated&&this.tag(b-1)!==","&&(v.call(j,r)>=0||r==="INDENT"&&!p)&&(r!=="INDENT"||this.tag(b-2)!=="CLASS"&&(d=this.tag(b-1),v.call(h,d)<0)&&(!(c=this.tokens[b+1])||!c.generated||c[0]!=="{")):!0},a),o[0]==="?"&&(o[0]="FUNC_EXIST");return 2})},a.prototype.addImplicitIndentation=function(){return this.scanTokens(function(a,b,c){var d,e,f,g,h,i,j,k;i=a[0];if(i==="TERMINATOR"&&this.tag(b+1)==="THEN"){c.splice(b,1);return 0}if(i==="ELSE"&&this.tag(b-1)!=="OUTDENT"){c.splice.apply(c,[b,0].concat(w.call(this.indentation(a))));return 2}if(i!=="CATCH"||(j=this.tag(b+2))!=="OUTDENT"&&j!=="TERMINATOR"&&j!=="FINALLY"){if(v.call(p,i)>=0&&this.tag(b+1)!=="INDENT"&&(i!=="ELSE"||this.tag(b+1)!=="IF")){h=i,k=this.indentation(a),f=k[0],g=k[1],h==="THEN"&&(f.fromThen=!0),f.generated=g.generated=!0,c.splice(b+1,0,f),e=function(a,b){var c;return a[1]!==";"&&(c=a[0],v.call(o,c)>=0)&&(a[0]!=="ELSE"||h==="IF"||h==="THEN")},d=function(a,b){return this.tokens.splice(this.tag(b-1)===","?b-1:b,0,g)},this.detectEnd(b+2,e,d),i==="THEN"&&c.splice(b,1);return 1}return 1}c.splice.apply(c,[b+2,0].concat(w.call(this.indentation(a))));return 4})},a.prototype.tagPostfixConditionals=function(){var a;a=function(a,b){var c;return(c=a[0])==="TERMINATOR"||c==="INDENT"};return this.scanTokens(function(b,c){var d;if(b[0]!=="IF")return 1;d=b,this.detectEnd(c+1,a,function(a,b){if(a[0]!=="INDENT")return d[0]="POST_"+d[0]});return 1})},a.prototype.ensureBalance=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n;d={},f={},m=this.tokens;for(i=0,k=m.length;i<k;i++){h=m[i],g=h[0];for(j=0,l=a.length;j<l;j++){n=a[j],e=n[0],b=n[1],d[e]|=0;if(g===e)d[e]++===0&&(f[e]=h[2]);else if(g===b&&--d[e]<0)throw Error("too many "+h[1]+" on line "+(h[2]+1))}}for(e in d){c=d[e];if(c>0)throw Error("unclosed "+e+" on line "+(f[e]+1))}return this},a.prototype.rewriteClosingParens=function(){var a,b,c;c=[],a={};for(b in m)a[b]=0;return this.scanTokens(function(b,d,e){var h,i,j,k,l,n,o;if(o=l=b[0],v.call(g,o)>=0){c.push(b);return 1}if(v.call(f,l)<0)return 1;if(a[h=m[l]]>0){a[h]-=1,e.splice(d,1);return 0}i=c.pop(),j=i[0],k=m[j];if(l===k)return 1;a[j]+=1,n=[k,j==="INDENT"?i[1]:k],this.tag(d+2)===j?(e.splice(d+3,0,n),c.push(i)):e.splice(d,0,n);return 1})},a.prototype.indentation=function(a){return[["INDENT",2,a[2]],["OUTDENT",2,a[2]]]},a.prototype.tag=function(a){var b;return(b=this.tokens[a])!=null?b[0]:void 0};return a}(),d=[["(",")"],["[","]"],["{","}"],["INDENT","OUTDENT"],["CALL_START","CALL_END"],["PARAM_START","PARAM_END"],["INDEX_START","INDEX_END"]],m={},g=[],f=[];for(s=0,t=d.length;s<t;s++)u=d[s],q=u[0],r=u[1],g.push(m[r]=q),f.push(m[q]=r);e=["CATCH","WHEN","ELSE","FINALLY"].concat(f),k=["IDENTIFIER","SUPER",")","CALL_END","]","INDEX_END","@","THIS"],i=["IDENTIFIER","NUMBER","STRING","JS","REGEX","NEW","PARAM_START","CLASS","IF","TRY","SWITCH","THIS","BOOL","UNARY","SUPER","@","->","=>","[","(","{","--","++"],l=["+","-"],h=["->","=>","{","[",","],j=["POST_IF","FOR","WHILE","UNTIL","WHEN","BY","LOOP","TERMINATOR"],p=["ELSE","->","=>","TRY","FINALLY","THEN"],o=["TERMINATOR","CATCH","FINALLY","ELSE","OUTDENT","LEADING_WHEN"],n=["TERMINATOR","INDENT","OUTDENT"]}),define("ace/mode/coffee/helpers",["require","exports","module"],function(a,b,c){var d,e;b.starts=function(a,b,c){return b===a.substr(c,b.length)},b.ends=function(a,b,c){var d;d=b.length;return b===a.substr(a.length-d-(c||0),d)},b.compact=function(a){var b,c,d,e;e=[];for(c=0,d=a.length;c<d;c++)b=a[c],b&&e.push(b);return e},b.count=function(a,b){var c,d;c=d=0;if(!b.length)return 1/0;while(d=1+a.indexOf(b,d))c++;return c},b.merge=function(a,b){return d(d({},a),b)},d=b.extend=function(a,b){var c,d;for(c in b)d=b[c],a[c]=d;return a},b.flatten=e=function(a){var b,c,d,f;c=[];for(d=0,f=a.length;d<f;d++)b=a[d],b instanceof Array?c=c.concat(e(b)):c.push(b);return c},b.del=function(a,b){var c;c=a[b],delete a[b];return c},b.last=function(a,b){return a[a.length-(b||0)-1]}}),define("ace/mode/coffee/parser",["require","exports","module"],function(a,b,c){var d={trace:function(){},yy:{},symbols_:{error:2,Root:3,Body:4,Block:5,TERMINATOR:6,Line:7,Expression:8,Statement:9,Return:10,Throw:11,Comment:12,STATEMENT:13,Value:14,Invocation:15,Code:16,Operation:17,Assign:18,If:19,Try:20,While:21,For:22,Switch:23,Class:24,INDENT:25,OUTDENT:26,Identifier:27,IDENTIFIER:28,AlphaNumeric:29,NUMBER:30,STRING:31,Literal:32,JS:33,REGEX:34,BOOL:35,Assignable:36,"=":37,AssignObj:38,ObjAssignable:39,":":40,ThisProperty:41,RETURN:42,HERECOMMENT:43,PARAM_START:44,ParamList:45,PARAM_END:46,FuncGlyph:47,"->":48,"=>":49,OptComma:50,",":51,Param:52,ParamVar:53,"...":54,Array:55,Object:56,Splat:57,SimpleAssignable:58,Accessor:59,Parenthetical:60,Range:61,This:62,".":63,"?.":64,"::":65,Index:66,INDEX_START:67,IndexValue:68,INDEX_END:69,INDEX_SOAK:70,INDEX_PROTO:71,Slice:72,"{":73,AssignList:74,"}":75,CLASS:76,EXTENDS:77,OptFuncExist:78,Arguments:79,SUPER:80,FUNC_EXIST:81,CALL_START:82,CALL_END:83,ArgList:84,THIS:85,"@":86,"[":87,"]":88,RangeDots:89,"..":90,Arg:91,SimpleArgs:92,TRY:93,Catch:94,FINALLY:95,CATCH:96,THROW:97,"(":98,")":99,WhileSource:100,WHILE:101,WHEN:102,UNTIL:103,Loop:104,LOOP:105,ForBody:106,FOR:107,ForStart:108,ForSource:109,ForVariables:110,OWN:111,ForValue:112,FORIN:113,FOROF:114,BY:115,SWITCH:116,Whens:117,ELSE:118,When:119,LEADING_WHEN:120,IfBlock:121,IF:122,POST_IF:123,UNARY:124,"-":125,"+":126,"--":127,"++":128,"?":129,MATH:130,SHIFT:131,COMPARE:132,LOGIC:133,RELATION:134,COMPOUND_ASSIGN:135,$accept:0,$end:1},terminals_:{2:"error",6:"TERMINATOR",13:"STATEMENT",25:"INDENT",26:"OUTDENT",28:"IDENTIFIER",30:"NUMBER",31:"STRING",33:"JS",34:"REGEX",35:"BOOL",37:"=",40:":",42:"RETURN",43:"HERECOMMENT",44:"PARAM_START",46:"PARAM_END",48:"->",49:"=>",51:",",54:"...",63:".",64:"?.",65:"::",67:"INDEX_START",69:"INDEX_END",70:"INDEX_SOAK",71:"INDEX_PROTO",73:"{",75:"}",76:"CLASS",77:"EXTENDS",80:"SUPER",81:"FUNC_EXIST",82:"CALL_START",83:"CALL_END",85:"THIS",86:"@",87:"[",88:"]",90:"..",93:"TRY",95:"FINALLY",96:"CATCH",97:"THROW",98:"(",99:")",101:"WHILE",102:"WHEN",103:"UNTIL",105:"LOOP",107:"FOR",111:"OWN",113:"FORIN",114:"FOROF",115:"BY",116:"SWITCH",118:"ELSE",120:"LEADING_WHEN",122:"IF",123:"POST_IF",124:"UNARY",125:"-",126:"+",127:"--",128:"++",129:"?",130:"MATH",131:"SHIFT",132:"COMPARE",133:"LOGIC",134:"RELATION",135:"COMPOUND_ASSIGN"},productions_:[0,[3,0],[3,1],[3,2],[4,1],[4,3],[4,2],[7,1],[7,1],[9,1],[9,1],[9,1],[9,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[5,2],[5,3],[27,1],[29,1],[29,1],[32,1],[32,1],[32,1],[32,1],[18,3],[18,5],[38,1],[38,3],[38,5],[38,1],[39,1],[39,1],[39,1],[10,2],[10,1],[12,1],[16,5],[16,2],[47,1],[47,1],[50,0],[50,1],[45,0],[45,1],[45,3],[52,1],[52,2],[52,3],[53,1],[53,1],[53,1],[53,1],[57,2],[58,1],[58,2],[58,2],[58,1],[36,1],[36,1],[36,1],[14,1],[14,1],[14,1],[14,1],[14,1],[59,2],[59,2],[59,2],[59,1],[59,1],[66,3],[66,2],[66,2],[68,1],[68,1],[56,4],[74,0],[74,1],[74,3],[74,4],[74,6],[24,1],[24,2],[24,3],[24,4],[24,2],[24,3],[24,4],[24,5],[15,3],[15,3],[15,1],[15,2],[78,0],[78,1],[79,2],[79,4],[62,1],[62,1],[41,2],[55,2],[55,4],[89,1],[89,1],[61,5],[72,3],[72,2],[72,2],[84,1],[84,3],[84,4],[84,4],[84,6],[91,1],[91,1],[92,1],[92,3],[20,2],[20,3],[20,4],[20,5],[94,3],[11,2],[60,3],[60,5],[100,2],[100,4],[100,2],[100,4],[21,2],[21,2],[21,2],[21,1],[104,2],[104,2],[22,2],[22,2],[22,2],[106,2],[106,2],[108,2],[108,3],[112,1],[112,1],[112,1],[110,1],[110,3],[109,2],[109,2],[109,4],[109,4],[109,4],[109,6],[109,6],[23,5],[23,7],[23,4],[23,6],[117,1],[117,2],[119,3],[119,4],[121,3],[121,5],[19,1],[19,3],[19,3],[19,3],[17,2],[17,2],[17,2],[17,2],[17,2],[17,2],[17,2],[17,2],[17,3],[17,3],[17,3],[17,3],[17,3],[17,3],[17,3],[17,3],[17,5],[17,3]],performAction:function f(a,b,c,d,e,f,g){var h=f.length-1;switch(e){case 1:return this.$=new d.Block;case 2:return this.$=f[h];case 3:return this.$=f[h-1];case 4:this.$=d.Block.wrap([f[h]]);break;case 5:this.$=f[h-2].push(f[h]);break;case 6:this.$=f[h-1];break;case 7:this.$=f[h];break;case 8:this.$=f[h];break;case 9:this.$=f[h];break;case 10:this.$=f[h];break;case 11:this.$=f[h];break;case 12:this.$=new d.Literal(f[h]);break;case 13:this.$=f[h];break;case 14:this.$=f[h];break;case 15:this.$=f[h];break;case 16:this.$=f[h];break;case 17:this.$=f[h];break;case 18:this.$=f[h];break;case 19:this.$=f[h];break;case 20:this.$=f[h];break;case 21:this.$=f[h];break;case 22:this.$=f[h];break;case 23:this.$=f[h];break;case 24:this.$=new d.Block;break;case 25:this.$=f[h-1];break;case 26:this.$=new d.Literal(f[h]);break;case 27:this.$=new d.Literal(f[h]);break;case 28:this.$=new d.Literal(f[h]);break;case 29:this.$=f[h];break;case 30:this.$=new d.Literal(f[h]);break;case 31:this.$=new d.Literal(f[h]);break;case 32:this.$=function(){var a;a=new d.Literal(f[h]),f[h]==="undefined"&&(a.isUndefined=!0);return a}();break;case 33:this.$=new d.Assign(f[h-2],f[h]);break;case 34:this.$=new d.Assign(f[h-4],f[h-1]);break;case 35:this.$=new d.Value(f[h]);break;case 36:this.$=new d.Assign(new d.Value(f[h-2]),f[h],"object");break;case 37:this.$=new d.Assign(new d.Value(f[h-4]),f[h-1],"object");break;case 38:this.$=f[h];break;case 39:this.$=f[h];break;case 40:this.$=f[h];break;case 41:this.$=f[h];break;case 42:this.$=new d.Return(f[h]);break;case 43:this.$=new d.Return;break;case 44:this.$=new d.Comment(f[h]);break;case 45:this.$=new d.Code(f[h-3],f[h],f[h-1]);break;case 46:this.$=new d.Code([],f[h],f[h-1]);break;case 47:this.$="func";break;case 48:this.$="boundfunc";break;case 49:this.$=f[h];break;case 50:this.$=f[h];break;case 51:this.$=[];break;case 52:this.$=[f[h]];break;case 53:this.$=f[h-2].concat(f[h]);break;case 54:this.$=new d.Param(f[h]);break;case 55:this.$=new d.Param(f[h-1],null,!0);break;case 56:this.$=new d.Param(f[h-2],f[h]);break;case 57:this.$=f[h];break;case 58:this.$=f[h];break;case 59:this.$=f[h];break;case 60:this.$=f[h];break;case 61:this.$=new d.Splat(f[h-1]);break;case 62:this.$=new d.Value(f[h]);break;case 63:this.$=f[h-1].push(f[h]);break;case 64:this.$=new d.Value(f[h-1],[f[h]]);break;case 65:this.$=f[h];break;case 66:this.$=f[h];break;case 67:this.$=new d.Value(f[h]);break;case 68:this.$=new d.Value(f[h]);break;case 69:this.$=f[h];break;case 70:this.$=new d.Value(f[h]);break;case 71:this.$=new d.Value(f[h]);break;case 72:this.$=new d.Value(f[h]);break;case 73:this.$=f[h];break;case 74:this.$=new d.Access(f[h]);break;case 75:this.$=new d.Access(f[h],"soak");break;case 76:this.$=new d.Access(f[h],"proto");break;case 77:this.$=new d.Access(new d.Literal("prototype"));break;case 78:this.$=f[h];break;case 79:this.$=f[h-1];break;case 80:this.$=d.extend(f[h],{soak:!0});break;case 81:this.$=d.extend(f[h],{proto:!0});break;case 82:this.$=new d.Index(f[h]);break;case 83:this.$=new d.Slice(f[h]);break;case 84:this.$=new d.Obj(f[h-2],f[h-3].generated);break;case 85:this.$=[];break;case 86:this.$=[f[h]];break;case 87:this.$=f[h-2].concat(f[h]);break;case 88:this.$=f[h-3].concat(f[h]);break;case 89:this.$=f[h-5].concat(f[h-2]);break;case 90:this.$=new d.Class;break;case 91:this.$=new d.Class(null,null,f[h]);break;case 92:this.$=new d.Class(null,f[h]);break;case 93:this.$=new d.Class(null,f[h-1],f[h]);break;case 94:this.$=new d.Class(f[h]);break;case 95:this.$=new d.Class(f[h-1],null,f[h]);break;case 96:this.$=new d.Class(f[h-2],f[h]);break;case 97:this.$=new d.Class(f[h-3],f[h-1],f[h]);break;case 98:this.$=new d.Call(f[h-2],f[h],f[h-1]);break;case 99:this.$=new d.Call(f[h-2],f[h],f[h-1]);break;case 100:this.$=new d.Call("super",[new d.Splat(new d.Literal("arguments"))]);break;case 101:this.$=new d.Call("super",f[h]);break;case 102:this.$=!1;break;case 103:this.$=!0;break;case 104:this.$=[];break;case 105:this.$=f[h-2];break;case 106:this.$=new d.Value(new d.Literal("this"));break;case 107:this.$=new d.Value(new d.Literal("this"));break;case 108:this.$=new d.Value(new d.Literal("this"),[new d.Access(f[h])],"this");break;case 109:this.$=new d.Arr([]);break;case 110:this.$=new d.Arr(f[h-2]);break;case 111:this.$="inclusive";break;case 112:this.$="exclusive";break;case 113:this.$=new d.Range(f[h-3],f[h-1],f[h-2]);break;case 114:this.$=new d.Range(f[h-2],f[h],f[h-1]);break;case 115:this.$=new d.Range(f[h-1],null,f[h]);break;case 116:this.$=new d.Range(null,f[h],f[h-1]);break;case 117:this.$=[f[h]];break;case 118:this.$=f[h-2].concat(f[h]);break;case 119:this.$=f[h-3].concat(f[h]);break;case 120:this.$=f[h-2];break;case 121:this.$=f[h-5].concat(f[h-2]);break;case 122:this.$=f[h];break;case 123:this.$=f[h];break;case 124:this.$=f[h];break;case 125:this.$=[].concat(f[h-2],f[h]);break;case 126:this.$=new d.Try(f[h]);break;case 127:this.$=new d.Try(f[h-1],f[h][0],f[h][1]);break;case 128:this.$=new d.Try(f[h-2],null,null,f[h]);break;case 129:this.$=new d.Try(f[h-3],f[h-2][0],f[h-2][1],f[h]);break;case 130:this.$=[f[h-1],f[h]];break;case 131:this.$=new d.Throw(f[h]);break;case 132:this.$=new d.Parens(f[h-1]);break;case 133:this.$=new d.Parens(f[h-2]);break;case 134:this.$=new d.While(f[h]);break;case 135:this.$=new d.While(f[h-2],{guard:f[h]});break;case 136:this.$=new d.While(f[h],{invert:!0});break;case 137:this.$=new d.While(f[h-2],{invert:!0,guard:f[h]});break;case 138:this.$=f[h-1].addBody(f[h]);break;case 139:this.$=f[h].addBody(d.Block.wrap([f[h-1]]));break;case 140:this.$=f[h].addBody(d.Block.wrap([f[h-1]]));break;case 141:this.$=f[h];break;case 142:this.$=(new d.While(new d.Literal("true"))).addBody(f[h]);break;case 143:this.$=(new d.While(new d.Literal("true"))).addBody(d.Block.wrap([f[h]]));break;case 144:this.$=new d.For(f[h-1],f[h]);break;case 145:this.$=new d.For(f[h-1],f[h]);break;case 146:this.$=new d.For(f[h],f[h-1]);break;case 147:this.$={source:new d.Value(f[h])};break;case 148:this.$=function(){f[h].own=f[h-1].own,f[h].name=f[h-1][0],f[h].index=f[h-1][1];return f[h]}();break;case 149:this.$=f[h];break;case 150:this.$=function(){f[h].own=!0;return f[h]}();break;case 151:this.$=f[h];break;case 152:this.$=new d.Value(f[h]);break;case 153:this.$=new d.Value(f[h]);break;case 154:this.$=[f[h]];break;case 155:this.$=[f[h-2],f[h]];break;case 156:this.$={source:f[h]};break;case 157:this.$={source:f[h],object:!0};break;case 158:this.$={source:f[h-2],guard:f[h]};break;case 159:this.$={source:f[h-2],guard:f[h],object:!0};break;case 160:this.$={source:f[h-2],step:f[h]};break;case 161:this.$={source:f[h-4],guard:f[h-2],step:f[h]};break;case 162:this.$={source:f[h-4],step:f[h-2],guard:f[h]};break;case 163:this.$=new d.Switch(f[h-3],f[h-1]);break;case 164:this.$=new d.Switch(f[h-5],f[h-3],f[h-1]);break;case 165:this.$=new d.Switch(null,f[h-1]);break;case 166:this.$=new d.Switch(null,f[h-3],f[h-1]);break;case 167:this.$=f[h];break;case 168:this.$=f[h-1].concat(f[h]);break;case 169:this.$=[[f[h-1],f[h]]];break;case 170:this.$=[[f[h-2],f[h-1]]];break;case 171:this.$=new d.If(f[h-1],f[h],{type:f[h-2]});break;case 172:this.$=f[h-4].addElse(new d.If(f[h-1],f[h],{type:f[h-2]}));break;case 173:this.$=f[h];break;case 174:this.$=f[h-2].addElse(f[h]);break;case 175:this.$=new d.If(f[h],d.Block.wrap([f[h-2]]),{type:f[h-1],statement:!0});break;case 176:this.$=new d.If(f[h],d.Block.wrap([f[h-2]]),{type:f[h-1],statement:!0});break;case 177:this.$=new d.Op(f[h-1],f[h]);break;case 178:this.$=new d.Op("-",f[h]);break;case 179:this.$=new d.Op("+",f[h]);break;case 180:this.$=new d.Op("--",f[h]);break;case 181:this.$=new d.Op("++",f[h]);break;case 182:this.$=new d.Op("--",f[h-1],null,!0);break;case 183:this.$=new d.Op("++",f[h-1],null,!0);break;case 184:this.$=new d.Existence(f[h-1]);break;case 185:this.$=new d.Op("+",f[h-2],f[h]);break;case 186:this.$=new d.Op("-",f[h-2],f[h]);break;case 187:this.$=new d.Op(f[h-1],f[h-2],f[h]);break;case 188:this.$=new d.Op(f[h-1],f[h-2],f[h]);break;case 189:this.$=new d.Op(f[h-1],f[h-2],f[h]);break;case 190:this.$=new d.Op(f[h-1],f[h-2],f[h]);break;case 191:this.$=function(){return f[h-1].charAt(0)==="!"?(new d.Op(f[h-1].slice(1),f[h-2],f[h])).invert():new d.Op(f[h-1],f[h-2],f[h])}();break;case 192:this.$=new d.Assign(f[h-2],f[h],f[h-1]);break;case 193:this.$=new d.Assign(f[h-4],f[h-1],f[h-3]);break;case 194:this.$=new d.Extends(f[h-2],f[h])}},table:[{1:[2,1],3:1,4:2,5:3,7:4,8:6,9:7,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,5],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[3]},{1:[2,2],6:[1,71]},{6:[1,72]},{1:[2,4],6:[2,4],26:[2,4],99:[2,4]},{4:74,7:4,8:6,9:7,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,26:[1,73],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,7],6:[2,7],26:[2,7],99:[2,7],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,8],6:[2,8],26:[2,8],99:[2,8],100:87,101:[1,62],103:[1,63],106:88,107:[1,65],108:66,123:[1,86]},{1:[2,13],6:[2,13],25:[2,13],26:[2,13],46:[2,13],51:[2,13],54:[2,13],59:90,63:[1,92],64:[1,93],65:[1,94],66:95,67:[1,96],69:[2,13],70:[1,97],71:[1,98],75:[2,13],78:89,81:[1,91],82:[2,102],83:[2,13],88:[2,13],90:[2,13],99:[2,13],101:[2,13],102:[2,13],103:[2,13],107:[2,13],115:[2,13],123:[2,13],125:[2,13],126:[2,13],129:[2,13],130:[2,13],131:[2,13],132:[2,13],133:[2,13],134:[2,13]},{1:[2,14],6:[2,14],25:[2,14],26:[2,14],46:[2,14],51:[2,14],54:[2,14],59:100,63:[1,92],64:[1,93],65:[1,94],66:95,67:[1,96],69:[2,14],70:[1,97],71:[1,98],75:[2,14],78:99,81:[1,91],82:[2,102],83:[2,14],88:[2,14],90:[2,14],99:[2,14],101:[2,14],102:[2,14],103:[2,14],107:[2,14],115:[2,14],123:[2,14],125:[2,14],126:[2,14],129:[2,14],130:[2,14],131:[2,14],132:[2,14],133:[2,14],134:[2,14]},{1:[2,15],6:[2,15],25:[2,15],26:[2,15],46:[2,15],51:[2,15],54:[2,15],69:[2,15],75:[2,15],83:[2,15],88:[2,15],90:[2,15],99:[2,15],101:[2,15],102:[2,15],103:[2,15],107:[2,15],115:[2,15],123:[2,15],125:[2,15],126:[2,15],129:[2,15],130:[2,15],131:[2,15],132:[2,15],133:[2,15],134:[2,15]},{1:[2,16],6:[2,16],25:[2,16],26:[2,16],46:[2,16],51:[2,16],54:[2,16],69:[2,16],75:[2,16],83:[2,16],88:[2,16],90:[2,16],99:[2,16],101:[2,16],102:[2,16],103:[2,16],107:[2,16],115:[2,16],123:[2,16],125:[2,16],126:[2,16],129:[2,16],130:[2,16],131:[2,16],132:[2,16],133:[2,16],134:[2,16]},{1:[2,17],6:[2,17],25:[2,17],26:[2,17],46:[2,17],51:[2,17],54:[2,17],69:[2,17],75:[2,17],83:[2,17],88:[2,17],90:[2,17],99:[2,17],101:[2,17],102:[2,17],103:[2,17],107:[2,17],115:[2,17],123:[2,17],125:[2,17],126:[2,17],129:[2,17],130:[2,17],131:[2,17],132:[2,17],133:[2,17],134:[2,17]},{1:[2,18],6:[2,18],25:[2,18],26:[2,18],46:[2,18],51:[2,18],54:[2,18],69:[2,18],75:[2,18],83:[2,18],88:[2,18],90:[2,18],99:[2,18],101:[2,18],102:[2,18],103:[2,18],107:[2,18],115:[2,18],123:[2,18],125:[2,18],126:[2,18],129:[2,18],130:[2,18],131:[2,18],132:[2,18],133:[2,18],134:[2,18]},{1:[2,19],6:[2,19],25:[2,19],26:[2,19],46:[2,19],51:[2,19],54:[2,19],69:[2,19],75:[2,19],83:[2,19],88:[2,19],90:[2,19],99:[2,19],101:[2,19],102:[2,19],103:[2,19],107:[2,19],115:[2,19],123:[2,19],125:[2,19],126:[2,19],129:[2,19],130:[2,19],131:[2,19],132:[2,19],133:[2,19],134:[2,19]},{1:[2,20],6:[2,20],25:[2,20],26:[2,20],46:[2,20],51:[2,20],54:[2,20],69:[2,20],75:[2,20],83:[2,20],88:[2,20],90:[2,20],99:[2,20],101:[2,20],102:[2,20],103:[2,20],107:[2,20],115:[2,20],123:[2,20],125:[2,20],126:[2,20],129:[2,20],130:[2,20],131:[2,20],132:[2,20],133:[2,20],134:[2,20]},{1:[2,21],6:[2,21],25:[2,21],26:[2,21],46:[2,21],51:[2,21],54:[2,21],69:[2,21],75:[2,21],83:[2,21],88:[2,21],90:[2,21],99:[2,21],101:[2,21],102:[2,21],103:[2,21],107:[2,21],115:[2,21],123:[2,21],125:[2,21],126:[2,21],129:[2,21],130:[2,21],131:[2,21],132:[2,21],133:[2,21],134:[2,21]},{1:[2,22],6:[2,22],25:[2,22],26:[2,22],46:[2,22],51:[2,22],54:[2,22],69:[2,22],75:[2,22],83:[2,22],88:[2,22],90:[2,22],99:[2,22],101:[2,22],102:[2,22],103:[2,22],107:[2,22],115:[2,22],123:[2,22],125:[2,22],126:[2,22],129:[2,22],130:[2,22],131:[2,22],132:[2,22],133:[2,22],134:[2,22]},{1:[2,23],6:[2,23],25:[2,23],26:[2,23],46:[2,23],51:[2,23],54:[2,23],69:[2,23],75:[2,23],83:[2,23],88:[2,23],90:[2,23],99:[2,23],101:[2,23],102:[2,23],103:[2,23],107:[2,23],115:[2,23],123:[2,23],125:[2,23],126:[2,23],129:[2,23],130:[2,23],131:[2,23],132:[2,23],133:[2,23],134:[2,23]},{1:[2,9],6:[2,9],26:[2,9],99:[2,9],101:[2,9],103:[2,9],107:[2,9],123:[2,9]},{1:[2,10],6:[2,10],26:[2,10],99:[2,10],101:[2,10],103:[2,10],107:[2,10],123:[2,10]},{1:[2,11],6:[2,11],26:[2,11],99:[2,11],101:[2,11],103:[2,11],107:[2,11],123:[2,11]},{1:[2,12],6:[2,12],26:[2,12],99:[2,12],101:[2,12],103:[2,12],107:[2,12],123:[2,12]},{1:[2,69],6:[2,69],25:[2,69],26:[2,69],37:[1,101],46:[2,69],51:[2,69],54:[2,69],63:[2,69],64:[2,69],65:[2,69],67:[2,69],69:[2,69],70:[2,69],71:[2,69],75:[2,69],81:[2,69],82:[2,69],83:[2,69],88:[2,69],90:[2,69],99:[2,69],101:[2,69],102:[2,69],103:[2,69],107:[2,69],115:[2,69],123:[2,69],125:[2,69],126:[2,69],129:[2,69],130:[2,69],131:[2,69],132:[2,69],133:[2,69],134:[2,69]},{1:[2,70],6:[2,70],25:[2,70],26:[2,70],46:[2,70],51:[2,70],54:[2,70],63:[2,70],64:[2,70],65:[2,70],67:[2,70],69:[2,70],70:[2,70],71:[2,70],75:[2,70],81:[2,70],82:[2,70],83:[2,70],88:[2,70],90:[2,70],99:[2,70],101:[2,70],102:[2,70],103:[2,70],107:[2,70],115:[2,70],123:[2,70],125:[2,70],126:[2,70],129:[2,70],130:[2,70],131:[2,70],132:[2,70],133:[2,70],134:[2,70]},{1:[2,71],6:[2,71],25:[2,71],26:[2,71],46:[2,71],51:[2,71],54:[2,71],63:[2,71],64:[2,71],65:[2,71],67:[2,71],69:[2,71],70:[2,71],71:[2,71],75:[2,71],81:[2,71],82:[2,71],83:[2,71],88:[2,71],90:[2,71],99:[2,71],101:[2,71],102:[2,71],103:[2,71],107:[2,71],115:[2,71],123:[2,71],125:[2,71],126:[2,71],129:[2,71],130:[2,71],131:[2,71],132:[2,71],133:[2,71],134:[2,71]},{1:[2,72],6:[2,72],25:[2,72],26:[2,72],46:[2,72],51:[2,72],54:[2,72],63:[2,72],64:[2,72],65:[2,72],67:[2,72],69:[2,72],70:[2,72],71:[2,72],75:[2,72],81:[2,72],82:[2,72],83:[2,72],88:[2,72],90:[2,72],99:[2,72],101:[2,72],102:[2,72],103:[2,72],107:[2,72],115:[2,72],123:[2,72],125:[2,72],126:[2,72],129:[2,72],130:[2,72],131:[2,72],132:[2,72],133:[2,72],134:[2,72]},{1:[2,73],6:[2,73],25:[2,73],26:[2,73],46:[2,73],51:[2,73],54:[2,73],63:[2,73],64:[2,73],65:[2,73],67:[2,73],69:[2,73],70:[2,73],71:[2,73],75:[2,73],81:[2,73],82:[2,73],83:[2,73],88:[2,73],90:[2,73],99:[2,73],101:[2,73],102:[2,73],103:[2,73],107:[2,73],115:[2,73],123:[2,73],125:[2,73],126:[2,73],129:[2,73],130:[2,73],131:[2,73],132:[2,73],133:[2,73],134:[2,73]},{1:[2,100],6:[2,100],25:[2,100],26:[2,100],46:[2,100],51:[2,100],54:[2,100],63:[2,100],64:[2,100],65:[2,100],67:[2,100],69:[2,100],70:[2,100],71:[2,100],75:[2,100],79:102,81:[2,100],82:[1,103],83:[2,100],88:[2,100],90:[2,100],99:[2,100],101:[2,100],102:[2,100],103:[2,100],107:[2,100],115:[2,100],123:[2,100],125:[2,100],126:[2,100],129:[2,100],130:[2,100],131:[2,100],132:[2,100],133:[2,100],134:[2,100]},{27:107,28:[1,70],41:108,45:104,46:[2,51],51:[2,51],52:105,53:106,55:109,56:110,73:[1,67],86:[1,111],87:[1,112]},{5:113,25:[1,5]},{8:114,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:116,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:117,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{14:119,15:120,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:121,41:60,55:47,56:48,58:118,60:25,61:26,62:27,73:[1,67],80:[1,28],85:[1,55],86:[1,56],87:[1,54],98:[1,53]},{14:119,15:120,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:121,41:60,55:47,56:48,58:122,60:25,61:26,62:27,73:[1,67],80:[1,28],85:[1,55],86:[1,56],87:[1,54],98:[1,53]},{1:[2,66],6:[2,66],25:[2,66],26:[2,66],37:[2,66],46:[2,66],51:[2,66],54:[2,66],63:[2,66],64:[2,66],65:[2,66],67:[2,66],69:[2,66],70:[2,66],71:[2,66],75:[2,66],77:[1,126],81:[2,66],82:[2,66],83:[2,66],88:[2,66],90:[2,66],99:[2,66],101:[2,66],102:[2,66],103:[2,66],107:[2,66],115:[2,66],123:[2,66],125:[2,66],126:[2,66],127:[1,123],128:[1,124],129:[2,66],130:[2,66],131:[2,66],132:[2,66],133:[2,66],134:[2,66],135:[1,125]},{1:[2,173],6:[2,173],25:[2,173],26:[2,173],46:[2,173],51:[2,173],54:[2,173],69:[2,173],75:[2,173],83:[2,173],88:[2,173],90:[2,173],99:[2,173],101:[2,173],102:[2,173],103:[2,173],107:[2,173],115:[2,173],118:[1,127],123:[2,173],125:[2,173],126:[2,173],129:[2,173],130:[2,173],131:[2,173],132:[2,173],133:[2,173],134:[2,173]},{5:128,25:[1,5]},{5:129,25:[1,5]},{1:[2,141],6:[2,141],25:[2,141],26:[2,141],46:[2,141],51:[2,141],54:[2,141],69:[2,141],75:[2,141],83:[2,141],88:[2,141],90:[2,141],99:[2,141],101:[2,141],102:[2,141],103:[2,141],107:[2,141],115:[2,141],123:[2,141],125:[2,141],126:[2,141],129:[2,141],130:[2,141],131:[2,141],132:[2,141],133:[2,141],134:[2,141]},{5:130,25:[1,5]},{8:131,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,132],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,90],5:133,6:[2,90],14:119,15:120,25:[1,5],26:[2,90],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:121,41:60,46:[2,90],51:[2,90],54:[2,90],55:47,56:48,58:135,60:25,61:26,62:27,69:[2,90],73:[1,67],75:[2,90],77:[1,134],80:[1,28],83:[2,90],85:[1,55],86:[1,56],87:[1,54],88:[2,90],90:[2,90],98:[1,53],99:[2,90],101:[2,90],102:[2,90],103:[2,90],107:[2,90],115:[2,90],123:[2,90],125:[2,90],126:[2,90],129:[2,90],130:[2,90],131:[2,90],132:[2,90],133:[2,90],134:[2,90]},{1:[2,43],6:[2,43],8:136,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,26:[2,43],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],99:[2,43],100:39,101:[2,43],103:[2,43],104:40,105:[1,64],106:41,107:[2,43],108:66,116:[1,42],121:37,122:[1,61],123:[2,43],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:137,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,44],6:[2,44],25:[2,44],26:[2,44],51:[2,44],75:[2,44],99:[2,44],101:[2,44],103:[2,44],107:[2,44],123:[2,44]},{1:[2,67],6:[2,67],25:[2,67],26:[2,67],37:[2,67],46:[2,67],51:[2,67],54:[2,67],63:[2,67],64:[2,67],65:[2,67],67:[2,67],69:[2,67],70:[2,67],71:[2,67],75:[2,67],81:[2,67],82:[2,67],83:[2,67],88:[2,67],90:[2,67],99:[2,67],101:[2,67],102:[2,67],103:[2,67],107:[2,67],115:[2,67],123:[2,67],125:[2,67],126:[2,67],129:[2,67],130:[2,67],131:[2,67],132:[2,67],133:[2,67],134:[2,67]},{1:[2,68],6:[2,68],25:[2,68],26:[2,68],37:[2,68],46:[2,68],51:[2,68],54:[2,68],63:[2,68],64:[2,68],65:[2,68],67:[2,68],69:[2,68],70:[2,68],71:[2,68],75:[2,68],81:[2,68],82:[2,68],83:[2,68],88:[2,68],90:[2,68],99:[2,68],101:[2,68],102:[2,68],103:[2,68],107:[2,68],115:[2,68],123:[2,68],125:[2,68],126:[2,68],129:[2,68],130:[2,68],131:[2,68],132:[2,68],133:[2,68],134:[2,68]},{1:[2,29],6:[2,29],25:[2,29],26:[2,29],46:[2,29],51:[2,29],54:[2,29],63:[2,29],64:[2,29],65:[2,29],67:[2,29],69:[2,29],70:[2,29],71:[2,29],75:[2,29],81:[2,29],82:[2,29],83:[2,29],88:[2,29],90:[2,29],99:[2,29],101:[2,29],102:[2,29],103:[2,29],107:[2,29],115:[2,29],123:[2,29],125:[2,29],126:[2,29],129:[2,29],130:[2,29],131:[2,29],132:[2,29],133:[2,29],134:[2,29]},{1:[2,30],6:[2,30],25:[2,30],26:[2,30],46:[2,30],51:[2,30],54:[2,30],63:[2,30],64:[2,30],65:[2,30],67:[2,30],69:[2,30],70:[2,30],71:[2,30],75:[2,30],81:[2,30],82:[2,30],83:[2,30],88:[2,30],90:[2,30],99:[2,30],101:[2,30],102:[2,30],103:[2,30],107:[2,30],115:[2,30],123:[2,30],125:[2,30],126:[2,30],129:[2,30],130:[2,30],131:[2,30],132:[2,30],133:[2,30],134:[2,30]},{1:[2,31],6:[2,31],25:[2,31],26:[2,31],46:[2,31],51:[2,31],54:[2,31],63:[2,31],64:[2,31],65:[2,31],67:[2,31],69:[2,31],70:[2,31],71:[2,31],75:[2,31],81:[2,31],82:[2,31],83:[2,31],88:[2,31],90:[2,31],99:[2,31],101:[2,31],102:[2,31],103:[2,31],107:[2,31],115:[2,31],123:[2,31],125:[2,31],126:[2,31],129:[2,31],130:[2,31],131:[2,31],132:[2,31],133:[2,31],134:[2,31]},{1:[2,32],6:[2,32],25:[2,32],26:[2,32],46:[2,32],51:[2,32],54:[2,32],63:[2,32],64:[2,32],65:[2,32],67:[2,32],69:[2,32],70:[2,32],71:[2,32],75:[2,32],81:[2,32],82:[2,32],83:[2,32],88:[2,32],90:[2,32],99:[2,32],101:[2,32],102:[2,32],103:[2,32],107:[2,32],115:[2,32],123:[2,32],125:[2,32],126:[2,32],129:[2,32],130:[2,32],131:[2,32],132:[2,32],133:[2,32],134:[2,32]},{4:138,7:4,8:6,9:7,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,139],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:140,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,144],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,57:145,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],84:142,85:[1,55],86:[1,56],87:[1,54],88:[1,141],91:143,93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,106],6:[2,106],25:[2,106],26:[2,106],46:[2,106],51:[2,106],54:[2,106],63:[2,106],64:[2,106],65:[2,106],67:[2,106],69:[2,106],70:[2,106],71:[2,106],75:[2,106],81:[2,106],82:[2,106],83:[2,106],88:[2,106],90:[2,106],99:[2,106],101:[2,106],102:[2,106],103:[2,106],107:[2,106],115:[2,106],123:[2,106],125:[2,106],126:[2,106],129:[2,106],130:[2,106],131:[2,106],132:[2,106],133:[2,106],134:[2,106]},{1:[2,107],6:[2,107],25:[2,107],26:[2,107],27:146,28:[1,70],46:[2,107],51:[2,107],54:[2,107],63:[2,107],64:[2,107],65:[2,107],67:[2,107],69:[2,107],70:[2,107],71:[2,107],75:[2,107],81:[2,107],82:[2,107],83:[2,107],88:[2,107],90:[2,107],99:[2,107],101:[2,107],102:[2,107],103:[2,107],107:[2,107],115:[2,107],123:[2,107],125:[2,107],126:[2,107],129:[2,107],130:[2,107],131:[2,107],132:[2,107],133:[2,107],134:[2,107]},{25:[2,47]},{25:[2,48]},{1:[2,62],6:[2,62],25:[2,62],26:[2,62],37:[2,62],46:[2,62],51:[2,62],54:[2,62],63:[2,62],64:[2,62],65:[2,62],67:[2,62],69:[2,62],70:[2,62],71:[2,62],75:[2,62],77:[2,62],81:[2,62],82:[2,62],83:[2,62],88:[2,62],90:[2,62],99:[2,62],101:[2,62],102:[2,62],103:[2,62],107:[2,62],115:[2,62],123:[2,62],125:[2,62],126:[2,62],127:[2,62],128:[2,62],129:[2,62],130:[2,62],131:[2,62],132:[2,62],133:[2,62],134:[2,62],135:[2,62]},{1:[2,65],6:[2,65],25:[2,65],26:[2,65],37:[2,65],46:[2,65],51:[2,65],54:[2,65],63:[2,65],64:[2,65],65:[2,65],67:[2,65],69:[2,65],70:[2,65],71:[2,65],75:[2,65],77:[2,65],81:[2,65],82:[2,65],83:[2,65],88:[2,65],90:[2,65],99:[2,65],101:[2,65],102:[2,65],103:[2,65],107:[2,65],115:[2,65],123:[2,65],125:[2,65],126:[2,65],127:[2,65],128:[2,65],129:[2,65],130:[2,65],131:[2,65],132:[2,65],133:[2,65],134:[2,65],135:[2,65]},{8:147,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:148,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:149,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{5:150,8:151,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,5],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{27:156,28:[1,70],55:157,56:158,61:152,73:[1,67],87:[1,54],110:153,111:[1,154],112:155},{109:159,113:[1,160],114:[1,161]},{6:[2,85],12:165,25:[2,85],27:166,28:[1,70],29:167,30:[1,68],31:[1,69],38:163,39:164,41:168,43:[1,46],51:[2,85],74:162,75:[2,85],86:[1,111]},{1:[2,27],6:[2,27],25:[2,27],26:[2,27],40:[2,27],46:[2,27],51:[2,27],54:[2,27],63:[2,27],64:[2,27],65:[2,27],67:[2,27],69:[2,27],70:[2,27],71:[2,27],75:[2,27],81:[2,27],82:[2,27],83:[2,27],88:[2,27],90:[2,27],99:[2,27],101:[2,27],102:[2,27],103:[2,27],107:[2,27],115:[2,27],123:[2,27],125:[2,27],126:[2,27],129:[2,27],130:[2,27],131:[2,27],132:[2,27],133:[2,27],134:[2,27]},{1:[2,28],6:[2,28],25:[2,28],26:[2,28],40:[2,28],46:[2,28],51:[2,28],54:[2,28],63:[2,28],64:[2,28],65:[2,28],67:[2,28],69:[2,28],70:[2,28],71:[2,28],75:[2,28],81:[2,28],82:[2,28],83:[2,28],88:[2,28],90:[2,28],99:[2,28],101:[2,28],102:[2,28],103:[2,28],107:[2,28],115:[2,28],123:[2,28],125:[2,28],126:[2,28],129:[2,28],130:[2,28],131:[2,28],132:[2,28],133:[2,28],134:[2,28]},{1:[2,26],6:[2,26],25:[2,26],26:[2,26],37:[2,26],40:[2,26],46:[2,26],51:[2,26],54:[2,26],63:[2,26],64:[2,26],65:[2,26],67:[2,26],69:[2,26],70:[2,26],71:[2,26],75:[2,26],77:[2,26],81:[2,26],82:[2,26],83:[2,26],88:[2,26],90:[2,26],99:[2,26],101:[2,26],102:[2,26],103:[2,26],107:[2,26],113:[2,26],114:[2,26],115:[2,26],123:[2,26],125:[2,26],126:[2,26],127:[2,26],128:[2,26],129:[2,26],130:[2,26],131:[2,26],132:[2,26],133:[2,26],134:[2,26],135:[2,26]},{1:[2,6],6:[2,6],7:169,8:6,9:7,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,26:[2,6],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],99:[2,6],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,3]},{1:[2,24],6:[2,24],25:[2,24],26:[2,24],46:[2,24],51:[2,24],54:[2,24],69:[2,24],75:[2,24],83:[2,24],88:[2,24],90:[2,24],95:[2,24],96:[2,24],99:[2,24],101:[2,24],102:[2,24],103:[2,24],107:[2,24],115:[2,24],118:[2,24],120:[2,24],123:[2,24],125:[2,24],126:[2,24],129:[2,24],130:[2,24],131:[2,24],132:[2,24],133:[2,24],134:[2,24]},{6:[1,71],26:[1,170]},{1:[2,184],6:[2,184],25:[2,184],26:[2,184],46:[2,184],51:[2,184],54:[2,184],69:[2,184],75:[2,184],83:[2,184],88:[2,184],90:[2,184],99:[2,184],101:[2,184],102:[2,184],103:[2,184],107:[2,184],115:[2,184],123:[2,184],125:[2,184],126:[2,184],129:[2,184],130:[2,184],131:[2,184],132:[2,184],133:[2,184],134:[2,184]},{8:171,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:172,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:173,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:174,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:175,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:176,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:177,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:178,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,140],6:[2,140],25:[2,140],26:[2,140],46:[2,140],51:[2,140],54:[2,140],69:[2,140],75:[2,140],83:[2,140],88:[2,140],90:[2,140],99:[2,140],101:[2,140],102:[2,140],103:[2,140],107:[2,140],115:[2,140],123:[2,140],125:[2,140],126:[2,140],129:[2,140],130:[2,140],131:[2,140],132:[2,140],133:[2,140],134:[2,140]},{1:[2,145],6:[2,145],25:[2,145],26:[2,145],46:[2,145],51:[2,145],54:[2,145],69:[2,145],75:[2,145],83:[2,145],88:[2,145],90:[2,145],99:[2,145],101:[2,145],102:[2,145],103:[2,145],107:[2,145],115:[2,145],123:[2,145],125:[2,145],126:[2,145],129:[2,145],130:[2,145],131:[2,145],132:[2,145],133:[2,145],134:[2,145]},{8:179,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,139],6:[2,139],25:[2,139],26:[2,139],46:[2,139],51:[2,139],54:[2,139],69:[2,139],75:[2,139],83:[2,139],88:[2,139],90:[2,139],99:[2,139],101:[2,139],102:[2,139],103:[2,139],107:[2,139],115:[2,139],123:[2,139],125:[2,139],126:[2,139],129:[2,139],130:[2,139],131:[2,139],132:[2,139],133:[2,139],134:[2,139]},{1:[2,144],6:[2,144],25:[2,144],26:[2,144],46:[2,144],51:[2,144],54:[2,144],69:[2,144],75:[2,144],83:[2,144],88:[2,144],90:[2,144],99:[2,144],101:[2,144],102:[2,144],103:[2,144],107:[2,144],115:[2,144],123:[2,144],125:[2,144],126:[2,144],129:[2,144],130:[2,144],131:[2,144],132:[2,144],133:[2,144],134:[2,144]},{79:180,82:[1,103]},{1:[2,63],6:[2,63],25:[2,63],26:[2,63],37:[2,63],46:[2,63],51:[2,63],54:[2,63],63:[2,63],64:[2,63],65:[2,63],67:[2,63],69:[2,63],70:[2,63],71:[2,63],75:[2,63],77:[2,63],81:[2,63],82:[2,63],83:[2,63],88:[2,63],90:[2,63],99:[2,63],101:[2,63],102:[2,63],103:[2,63],107:[2,63],115:[2,63],123:[2,63],125:[2,63],126:[2,63],127:[2,63],128:[2,63],129:[2,63],130:[2,63],131:[2,63],132:[2,63],133:[2,63],134:[2,63],135:[2,63]},{82:[2,103]},{27:181,28:[1,70]},{27:182,28:[1,70]},{1:[2,77],6:[2,77],25:[2,77],26:[2,77],27:183,28:[1,70],37:[2,77],46:[2,77],51:[2,77],54:[2,77],63:[2,77],64:[2,77],65:[2,77],67:[2,77],69:[2,77],70:[2,77],71:[2,77],75:[2,77],77:[2,77],81:[2,77],82:[2,77],83:[2,77],88:[2,77],90:[2,77],99:[2,77],101:[2,77],102:[2,77],103:[2,77],107:[2,77],115:[2,77],123:[2,77],125:[2,77],126:[2,77],127:[2,77],128:[2,77],129:[2,77],130:[2,77],131:[2,77],132:[2,77],133:[2,77],134:[2,77],135:[2,77]},{1:[2,78],6:[2,78],25:[2,78],26:[2,78],37:[2,78],46:[2,78],51:[2,78],54:[2,78],63:[2,78],64:[2,78],65:[2,78],67:[2,78],69:[2,78],70:[2,78],71:[2,78],75:[2,78],77:[2,78],81:[2,78],82:[2,78],83:[2,78],88:[2,78],90:[2,78],99:[2,78],101:[2,78],102:[2,78],103:[2,78],107:[2,78],115:[2,78],123:[2,78],125:[2,78],126:[2,78],127:[2,78],128:[2,78],129:[2,78],130:[2,78],131:[2,78],132:[2,78],133:[2,78],134:[2,78],135:[2,78]},{8:185,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],54:[1,189],55:47,56:48,58:36,60:25,61:26,62:27,68:184,72:186,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],89:187,90:[1,188],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{66:190,67:[1,96],70:[1,97],71:[1,98]},{66:191,67:[1,96],70:[1,97],71:[1,98]},{79:192,82:[1,103]},{1:[2,64],6:[2,64],25:[2,64],26:[2,64],37:[2,64],46:[2,64],51:[2,64],54:[2,64],63:[2,64],64:[2,64],65:[2,64],67:[2,64],69:[2,64],70:[2,64],71:[2,64],75:[2,64],77:[2,64],81:[2,64],82:[2,64],83:[2,64],88:[2,64],90:[2,64],99:[2,64],101:[2,64],102:[2,64],103:[2,64],107:[2,64],115:[2,64],123:[2,64],125:[2,64],126:[2,64],127:[2,64],128:[2,64],129:[2,64],130:[2,64],131:[2,64],132:[2,64],133:[2,64],134:[2,64],135:[2,64]},{8:193,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,194],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,101],6:[2,101],25:[2,101],26:[2,101],46:[2,101],51:[2,101],54:[2,101],63:[2,101],64:[2,101],65:[2,101],67:[2,101],69:[2,101],70:[2,101],71:[2,101],75:[2,101],81:[2,101],82:[2,101],83:[2,101],88:[2,101],90:[2,101],99:[2,101],101:[2,101],102:[2,101],103:[2,101],107:[2,101],115:[2,101],123:[2,101],125:[2,101],126:[2,101],129:[2,101],130:[2,101],131:[2,101],132:[2,101],133:[2,101],134:[2,101]},{8:197,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,144],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,57:145,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],83:[1,195],84:196,85:[1,55],86:[1,56],87:[1,54],91:143,93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{46:[1,198],51:[1,199]},{46:[2,52],51:[2,52]},{37:[1,201],46:[2,54],51:[2,54],54:[1,200]},{37:[2,57],46:[2,57],51:[2,57],54:[2,57]},{37:[2,58],46:[2,58],51:[2,58],54:[2,58]},{37:[2,59],46:[2,59],51:[2,59],54:[2,59]},{37:[2,60],46:[2,60],51:[2,60],54:[2,60]},{27:146,28:[1,70]},{8:197,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,144],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,57:145,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],84:142,85:[1,55],86:[1,56],87:[1,54],88:[1,141],91:143,93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,46],6:[2,46],25:[2,46],26:[2,46],46:[2,46],51:[2,46],54:[2,46],69:[2,46],75:[2,46],83:[2,46],88:[2,46],90:[2,46],99:[2,46],101:[2,46],102:[2,46],103:[2,46],107:[2,46],115:[2,46],123:[2,46],125:[2,46],126:[2,46],129:[2,46],130:[2,46],131:[2,46],132:[2,46],133:[2,46],134:[2,46]},{1:[2,177],6:[2,177],25:[2,177],26:[2,177],46:[2,177],51:[2,177],54:[2,177],69:[2,177],75:[2,177],83:[2,177],88:[2,177],90:[2,177],99:[2,177],100:84,101:[2,177],102:[2,177],103:[2,177],106:85,107:[2,177],108:66,115:[2,177],123:[2,177],125:[2,177],126:[2,177],129:[1,75],130:[2,177],131:[2,177],132:[2,177],133:[2,177],134:[2,177]},{100:87,101:[1,62],103:[1,63],106:88,107:[1,65],108:66,123:[1,86]},{1:[2,178],6:[2,178],25:[2,178],26:[2,178],46:[2,178],51:[2,178],54:[2,178],69:[2,178],75:[2,178],83:[2,178],88:[2,178],90:[2,178],99:[2,178],100:84,101:[2,178],102:[2,178],103:[2,178],106:85,107:[2,178],108:66,115:[2,178],123:[2,178],125:[2,178],126:[2,178],129:[1,75],130:[2,178],131:[2,178],132:[2,178],133:[2,178],134:[2,178]},{1:[2,179],6:[2,179],25:[2,179],26:[2,179],46:[2,179],51:[2,179],54:[2,179],69:[2,179],75:[2,179],83:[2,179],88:[2,179],90:[2,179],99:[2,179],100:84,101:[2,179],102:[2,179],103:[2,179],106:85,107:[2,179],108:66,115:[2,179],123:[2,179],125:[2,179],126:[2,179],129:[1,75],130:[2,179],131:[2,179],132:[2,179],133:[2,179],134:[2,179]},{1:[2,180],6:[2,180],25:[2,180],26:[2,180],46:[2,180],51:[2,180],54:[2,180],63:[2,66],64:[2,66],65:[2,66],67:[2,66],69:[2,180],70:[2,66],71:[2,66],75:[2,180],81:[2,66],82:[2,66],83:[2,180],88:[2,180],90:[2,180],99:[2,180],101:[2,180],102:[2,180],103:[2,180],107:[2,180],115:[2,180],123:[2,180],125:[2,180],126:[2,180],129:[2,180],130:[2,180],131:[2,180],132:[2,180],133:[2,180],134:[2,180]},{59:90,63:[1,92],64:[1,93],65:[1,94],66:95,67:[1,96],70:[1,97],71:[1,98],78:89,81:[1,91],82:[2,102]},{59:100,63:[1,92],64:[1,93],65:[1,94],66:95,67:[1,96],70:[1,97],71:[1,98],78:99,81:[1,91],82:[2,102]},{1:[2,69],6:[2,69],25:[2,69],26:[2,69],46:[2,69],51:[2,69],54:[2,69],63:[2,69],64:[2,69],65:[2,69],67:[2,69],69:[2,69],70:[2,69],71:[2,69],75:[2,69],81:[2,69],82:[2,69],83:[2,69],88:[2,69],90:[2,69],99:[2,69],101:[2,69],102:[2,69],103:[2,69],107:[2,69],115:[2,69],123:[2,69],125:[2,69],126:[2,69],129:[2,69],130:[2,69],131:[2,69],132:[2,69],133:[2,69],134:[2,69]},{1:[2,181],6:[2,181],25:[2,181],26:[2,181],46:[2,181],51:[2,181],54:[2,181],63:[2,66],64:[2,66],65:[2,66],67:[2,66],69:[2,181],70:[2,66],71:[2,66],75:[2,181],81:[2,66],82:[2,66],83:[2,181],88:[2,181],90:[2,181],99:[2,181],101:[2,181],102:[2,181],103:[2,181],107:[2,181],115:[2,181],123:[2,181],125:[2,181],126:[2,181],129:[2,181],130:[2,181],131:[2,181],132:[2,181],133:[2,181],134:[2,181]},{1:[2,182],6:[2,182],25:[2,182],26:[2,182],46:[2,182],51:[2,182],54:[2,182],69:[2,182],75:[2,182],83:[2,182],88:[2,182],90:[2,182],99:[2,182],101:[2,182],102:[2,182],103:[2,182],107:[2,182],115:[2,182],123:[2,182],125:[2,182],126:[2,182],129:[2,182],130:[2,182],131:[2,182],132:[2,182],133:[2,182],134:[2,182]},{1:[2,183],6:[2,183],25:[2,183],26:[2,183],46:[2,183],51:[2,183],54:[2,183],69:[2,183],75:[2,183],83:[2,183],88:[2,183],90:[2,183],99:[2,183],101:[2,183],102:[2,183],103:[2,183],107:[2,183],115:[2,183],123:[2,183],125:[2,183],126:[2,183],129:[2,183],130:[2,183],131:[2,183],132:[2,183],133:[2,183],134:[2,183]},{8:202,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,203],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:204,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{5:205,25:[1,5],122:[1,206]},{1:[2,126],6:[2,126],25:[2,126],26:[2,126],46:[2,126],51:[2,126],54:[2,126],69:[2,126],75:[2,126],83:[2,126],88:[2,126],90:[2,126],94:207,95:[1,208],96:[1,209],99:[2,126],101:[2,126],102:[2,126],103:[2,126],107:[2,126],115:[2,126],123:[2,126],125:[2,126],126:[2,126],129:[2,126],130:[2,126],131:[2,126],132:[2,126],133:[2,126],134:[2,126]},{1:[2,138],6:[2,138],25:[2,138],26:[2,138],46:[2,138],51:[2,138],54:[2,138],69:[2,138],75:[2,138],83:[2,138],88:[2,138],90:[2,138],99:[2,138],101:[2,138],102:[2,138],103:[2,138],107:[2,138],115:[2,138],123:[2,138],125:[2,138],126:[2,138],129:[2,138],130:[2,138],131:[2,138],132:[2,138],133:[2,138],134:[2,138]},{1:[2,146],6:[2,146],25:[2,146],26:[2,146],46:[2,146],51:[2,146],54:[2,146],69:[2,146],75:[2,146],83:[2,146],88:[2,146],90:[2,146],99:[2,146],101:[2,146],102:[2,146],103:[2,146],107:[2,146],115:[2,146],123:[2,146],125:[2,146],126:[2,146],129:[2,146],130:[2,146],131:[2,146],132:[2,146],133:[2,146],134:[2,146]},{25:[1,210],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{117:211,119:212,120:[1,213]},{1:[2,91],6:[2,91],25:[2,91],26:[2,91],46:[2,91],51:[2,91],54:[2,91],69:[2,91],75:[2,91],83:[2,91],88:[2,91],90:[2,91],99:[2,91],101:[2,91],102:[2,91],103:[2,91],107:[2,91],115:[2,91],123:[2,91],125:[2,91],126:[2,91],129:[2,91],130:[2,91],131:[2,91],132:[2,91],133:[2,91],134:[2,91]},{14:214,15:120,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:121,41:60,55:47,56:48,58:215,60:25,61:26,62:27,73:[1,67],80:[1,28],85:[1,55],86:[1,56],87:[1,54],98:[1,53]},{1:[2,94],5:216,6:[2,94],25:[1,5],26:[2,94],46:[2,94],51:[2,94],54:[2,94],63:[2,66],64:[2,66],65:[2,66],67:[2,66],69:[2,94],70:[2,66],71:[2,66],75:[2,94],77:[1,217],81:[2,66],82:[2,66],83:[2,94],88:[2,94],90:[2,94],99:[2,94],101:[2,94],102:[2,94],103:[2,94],107:[2,94],115:[2,94],123:[2,94],125:[2,94],126:[2,94],129:[2,94],130:[2,94],131:[2,94],132:[2,94],133:[2,94],134:[2,94]},{1:[2,42],6:[2,42],26:[2,42],99:[2,42],100:84,101:[2,42],103:[2,42],106:85,107:[2,42],108:66,123:[2,42],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,131],6:[2,131],26:[2,131],99:[2,131],100:84,101:[2,131],103:[2,131],106:85,107:[2,131],108:66,123:[2,131],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{6:[1,71],99:[1,218]},{4:219,7:4,8:6,9:7,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,122],25:[2,122],51:[2,122],54:[1,221],88:[2,122],89:220,90:[1,188],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,109],6:[2,109],25:[2,109],26:[2,109],37:[2,109],46:[2,109],51:[2,109],54:[2,109],63:[2,109],64:[2,109],65:[2,109],67:[2,109],69:[2,109],70:[2,109],71:[2,109],75:[2,109],81:[2,109],82:[2,109],83:[2,109],88:[2,109],90:[2,109],99:[2,109],101:[2,109],102:[2,109],103:[2,109],107:[2,109],113:[2,109],114:[2,109],115:[2,109],123:[2,109],125:[2,109],126:[2,109],129:[2,109],130:[2,109],131:[2,109],132:[2,109],133:[2,109],134:[2,109]},{6:[2,49],25:[2,49],50:222,51:[1,223],88:[2,49]},{6:[2,117],25:[2,117],26:[2,117],51:[2,117],83:[2,117],88:[2,117]},{8:197,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,144],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,57:145,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],84:224,85:[1,55],86:[1,56],87:[1,54],91:143,93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,123],25:[2,123],26:[2,123],51:[2,123],83:[2,123],88:[2,123]},{1:[2,108],6:[2,108],25:[2,108],26:[2,108],37:[2,108],40:[2,108],46:[2,108],51:[2,108],54:[2,108],63:[2,108],64:[2,108],65:[2,108],67:[2,108],69:[2,108],70:[2,108],71:[2,108],75:[2,108],77:[2,108],81:[2,108],82:[2,108],83:[2,108],88:[2,108],90:[2,108],99:[2,108],101:[2,108],102:[2,108],103:[2,108],107:[2,108],115:[2,108],123:[2,108],125:[2,108],126:[2,108],127:[2,108],128:[2,108],129:[2,108],130:[2,108],131:[2,108],132:[2,108],133:[2,108],134:[2,108],135:[2,108]},{5:225,25:[1,5],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,134],6:[2,134],25:[2,134],26:[2,134],46:[2,134],51:[2,134],54:[2,134],69:[2,134],75:[2,134],83:[2,134],88:[2,134],90:[2,134],99:[2,134],100:84,101:[1,62],102:[1,226],103:[1,63],106:85,107:[1,65],108:66,115:[2,134],123:[2,134],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,136],6:[2,136],25:[2,136],26:[2,136],46:[2,136],51:[2,136],54:[2,136],69:[2,136],75:[2,136],83:[2,136],88:[2,136],90:[2,136],99:[2,136],100:84,101:[1,62],102:[1,227],103:[1,63],106:85,107:[1,65],108:66,115:[2,136],123:[2,136],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,142],6:[2,142],25:[2,142],26:[2,142],46:[2,142],51:[2,142],54:[2,142],69:[2,142],75:[2,142],83:[2,142],88:[2,142],90:[2,142],99:[2,142],101:[2,142],102:[2,142],103:[2,142],107:[2,142],115:[2,142],123:[2,142],125:[2,142],126:[2,142],129:[2,142],130:[2,142],131:[2,142],132:[2,142],133:[2,142],134:[2,142]},{1:[2,143],6:[2,143],25:[2,143],26:[2,143],46:[2,143],51:[2,143],54:[2,143],69:[2,143],75:[2,143],83:[2,143],88:[2,143],90:[2,143],99:[2,143],100:84,101:[1,62],102:[2,143],103:[1,63],106:85,107:[1,65],108:66,115:[2,143],123:[2,143],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,147],6:[2,147],25:[2,147],26:[2,147],46:[2,147],51:[2,147],54:[2,147],69:[2,147],75:[2,147],83:[2,147],88:[2,147],90:[2,147],99:[2,147],101:[2,147],102:[2,147],103:[2,147],107:[2,147],115:[2,147],123:[2,147],125:[2,147],126:[2,147],129:[2,147],130:[2,147],131:[2,147],132:[2,147],133:[2,147],134:[2,147]},{113:[2,149],114:[2,149]},{27:156,28:[1,70],55:157,56:158,73:[1,67],87:[1,112],110:228,112:155},{51:[1,229],113:[2,154],114:[2,154]},{51:[2,151],113:[2,151],114:[2,151]},{51:[2,152],113:[2,152],114:[2,152]},{51:[2,153],113:[2,153],114:[2,153]},{1:[2,148],6:[2,148],25:[2,148],26:[2,148],46:[2,148],51:[2,148],54:[2,148],69:[2,148],75:[2,148],83:[2,148],88:[2,148],90:[2,148],99:[2,148],101:[2,148],102:[2,148],103:[2,148],107:[2,148],115:[2,148],123:[2,148],125:[2,148],126:[2,148],129:[2,148],130:[2,148],131:[2,148],132:[2,148],133:[2,148],134:[2,148]},{8:230,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:231,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,49],25:[2,49],50:232,51:[1,233],75:[2,49]},{6:[2,86],25:[2,86],26:[2,86],51:[2,86],75:[2,86]},{6:[2,35],25:[2,35],26:[2,35],40:[1,234],51:[2,35],75:[2,35]},{6:[2,38],25:[2,38],26:[2,38],51:[2,38],75:[2,38]},{6:[2,39],25:[2,39],26:[2,39],40:[2,39],51:[2,39],75:[2,39]},{6:[2,40],25:[2,40],26:[2,40],40:[2,40],51:[2,40],75:[2,40]},{6:[2,41],25:[2,41],26:[2,41],40:[2,41],51:[2,41],75:[2,41]},{1:[2,5],6:[2,5],26:[2,5],99:[2,5]},{1:[2,25],6:[2,25],25:[2,25],26:[2,25],46:[2,25],51:[2,25],54:[2,25],69:[2,25],75:[2,25],83:[2,25],88:[2,25],90:[2,25],95:[2,25],96:[2,25],99:[2,25],101:[2,25],102:[2,25],103:[2,25],107:[2,25],115:[2,25],118:[2,25],120:[2,25],123:[2,25],125:[2,25],126:[2,25],129:[2,25],130:[2,25],131:[2,25],132:[2,25],133:[2,25],134:[2,25]},{1:[2,185],6:[2,185],25:[2,185],26:[2,185],46:[2,185],51:[2,185],54:[2,185],69:[2,185],75:[2,185],83:[2,185],88:[2,185],90:[2,185],99:[2,185],100:84,101:[2,185],102:[2,185],103:[2,185],106:85,107:[2,185],108:66,115:[2,185],123:[2,185],125:[2,185],126:[2,185],129:[1,75],130:[1,78],131:[2,185],132:[2,185],133:[2,185],134:[2,185]},{1:[2,186],6:[2,186],25:[2,186],26:[2,186],46:[2,186],51:[2,186],54:[2,186],69:[2,186],75:[2,186],83:[2,186],88:[2,186],90:[2,186],99:[2,186],100:84,101:[2,186],102:[2,186],103:[2,186],106:85,107:[2,186],108:66,115:[2,186],123:[2,186],125:[2,186],126:[2,186],129:[1,75],130:[1,78],131:[2,186],132:[2,186],133:[2,186],134:[2,186]},{1:[2,187],6:[2,187],25:[2,187],26:[2,187],46:[2,187],51:[2,187],54:[2,187],69:[2,187],75:[2,187],83:[2,187],88:[2,187],90:[2,187],99:[2,187],100:84,101:[2,187],102:[2,187],103:[2,187],106:85,107:[2,187],108:66,115:[2,187],123:[2,187],125:[2,187],126:[2,187],129:[1,75],130:[2,187],131:[2,187],132:[2,187],133:[2,187],134:[2,187]},{1:[2,188],6:[2,188],25:[2,188],26:[2,188],46:[2,188],51:[2,188],54:[2,188],69:[2,188],75:[2,188],83:[2,188],88:[2,188],90:[2,188],99:[2,188],100:84,101:[2,188],102:[2,188],103:[2,188],106:85,107:[2,188],108:66,115:[2,188],123:[2,188],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[2,188],132:[2,188],133:[2,188],134:[2,188]},{1:[2,189],6:[2,189],25:[2,189],26:[2,189],46:[2,189],51:[2,189],54:[2,189],69:[2,189],75:[2,189],83:[2,189],88:[2,189],90:[2,189],99:[2,189],100:84,101:[2,189],102:[2,189],103:[2,189],106:85,107:[2,189],108:66,115:[2,189],123:[2,189],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[2,189],133:[2,189],134:[1,82]},{1:[2,190],6:[2,190],25:[2,190],26:[2,190],46:[2,190],51:[2,190],54:[2,190],69:[2,190],75:[2,190],83:[2,190],88:[2,190],90:[2,190],99:[2,190],100:84,101:[2,190],102:[2,190],103:[2,190],106:85,107:[2,190],108:66,115:[2,190],123:[2,190],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[2,190],134:[1,82]},{1:[2,191],6:[2,191],25:[2,191],26:[2,191],46:[2,191],51:[2,191],54:[2,191],69:[2,191],75:[2,191],83:[2,191],88:[2,191],90:[2,191],99:[2,191],100:84,101:[2,191],102:[2,191],103:[2,191],106:85,107:[2,191],108:66,115:[2,191],123:[2,191],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[2,191],133:[2,191],134:[2,191]},{1:[2,176],6:[2,176],25:[2,176],26:[2,176],46:[2,176],51:[2,176],54:[2,176],69:[2,176],75:[2,176],83:[2,176],88:[2,176],90:[2,176],99:[2,176],100:84,101:[1,62],102:[2,176],103:[1,63],106:85,107:[1,65],108:66,115:[2,176],123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,175],6:[2,175],25:[2,175],26:[2,175],46:[2,175],51:[2,175],54:[2,175],69:[2,175],75:[2,175],83:[2,175],88:[2,175],90:[2,175],99:[2,175],100:84,101:[1,62],102:[2,175],103:[1,63],106:85,107:[1,65],108:66,115:[2,175],123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,98],6:[2,98],25:[2,98],26:[2,98],46:[2,98],51:[2,98],54:[2,98],63:[2,98],64:[2,98],65:[2,98],67:[2,98],69:[2,98],70:[2,98],71:[2,98],75:[2,98],81:[2,98],82:[2,98],83:[2,98],88:[2,98],90:[2,98],99:[2,98],101:[2,98],102:[2,98],103:[2,98],107:[2,98],115:[2,98],123:[2,98],125:[2,98],126:[2,98],129:[2,98],130:[2,98],131:[2,98],132:[2,98],133:[2,98],134:[2,98]},{1:[2,74],6:[2,74],25:[2,74],26:[2,74],37:[2,74],46:[2,74],51:[2,74],54:[2,74],63:[2,74],64:[2,74],65:[2,74],67:[2,74],69:[2,74],70:[2,74],71:[2,74],75:[2,74],77:[2,74],81:[2,74],82:[2,74],83:[2,74],88:[2,74],90:[2,74],99:[2,74],101:[2,74],102:[2,74],103:[2,74],107:[2,74],115:[2,74],123:[2,74],125:[2,74],126:[2,74],127:[2,74],128:[2,74],129:[2,74],130:[2,74],131:[2,74],132:[2,74],133:[2,74],134:[2,74],135:[2,74]},{1:[2,75],6:[2,75],25:[2,75],26:[2,75],37:[2,75],46:[2,75],51:[2,75],54:[2,75],63:[2,75],64:[2,75],65:[2,75],67:[2,75],69:[2,75],70:[2,75],71:[2,75],75:[2,75],77:[2,75],81:[2,75],82:[2,75],83:[2,75],88:[2,75],90:[2,75],99:[2,75],101:[2,75],102:[2,75],103:[2,75],107:[2,75],115:[2,75],123:[2,75],125:[2,75],126:[2,75],127:[2,75],128:[2,75],129:[2,75],130:[2,75],131:[2,75],132:[2,75],133:[2,75],134:[2,75],135:[2,75]},{1:[2,76],6:[2,76],25:[2,76],26:[2,76],37:[2,76],46:[2,76],51:[2,76],54:[2,76],63:[2,76],64:[2,76],65:[2,76],67:[2,76],69:[2,76],70:[2,76],71:[2,76],75:[2,76],77:[2,76],81:[2,76],82:[2,76],83:[2,76],88:[2,76],90:[2,76],99:[2,76],101:[2,76],102:[2,76],103:[2,76],107:[2,76],115:[2,76],123:[2,76],125:[2,76],126:[2,76],127:[2,76],128:[2,76],129:[2,76],130:[2,76],131:[2,76],132:[2,76],133:[2,76],134:[2,76],135:[2,76]},{69:[1,235]},{54:[1,189],69:[2,82],89:236,90:[1,188],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{69:[2,83]},{8:237,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{13:[2,111],28:[2,111],30:[2,111],31:[2,111],33:[2,111],34:[2,111],35:[2,111],42:[2,111],43:[2,111],44:[2,111],48:[2,111],49:[2,111],69:[2,111],73:[2,111],76:[2,111],80:[2,111],85:[2,111],86:[2,111],87:[2,111],93:[2,111],97:[2,111],98:[2,111],101:[2,111],103:[2,111],105:[2,111],107:[2,111],116:[2,111],122:[2,111],124:[2,111],125:[2,111],126:[2,111],127:[2,111],128:[2,111]},{13:[2,112],28:[2,112],30:[2,112],31:[2,112],33:[2,112],34:[2,112],35:[2,112],42:[2,112],43:[2,112],44:[2,112],48:[2,112],49:[2,112],69:[2,112],73:[2,112],76:[2,112],80:[2,112],85:[2,112],86:[2,112],87:[2,112],93:[2,112],97:[2,112],98:[2,112],101:[2,112],103:[2,112],105:[2,112],107:[2,112],116:[2,112],122:[2,112],124:[2,112],125:[2,112],126:[2,112],127:[2,112],128:[2,112]},{1:[2,80],6:[2,80],25:[2,80],26:[2,80],37:[2,80],46:[2,80],51:[2,80],54:[2,80],63:[2,80],64:[2,80],65:[2,80],67:[2,80],69:[2,80],70:[2,80],71:[2,80],75:[2,80],77:[2,80],81:[2,80],82:[2,80],83:[2,80],88:[2,80],90:[2,80],99:[2,80],101:[2,80],102:[2,80],103:[2,80],107:[2,80],115:[2,80],123:[2,80],125:[2,80],126:[2,80],127:[2,80],128:[2,80],129:[2,80],130:[2,80],131:[2,80],132:[2,80],133:[2,80],134:[2,80],135:[2,80]},{1:[2,81],6:[2,81],25:[2,81],26:[2,81],37:[2,81],46:[2,81],51:[2,81],54:[2,81],63:[2,81],64:[2,81],65:[2,81],67:[2,81],69:[2,81],70:[2,81],71:[2,81],75:[2,81],77:[2,81],81:[2,81],82:[2,81],83:[2,81],88:[2,81],90:[2,81],99:[2,81],101:[2,81],102:[2,81],103:[2,81],107:[2,81],115:[2,81],123:[2,81],125:[2,81],126:[2,81],127:[2,81],128:[2,81],129:[2,81],130:[2,81],131:[2,81],132:[2,81],133:[2,81],134:[2,81],135:[2,81]},{1:[2,99],6:[2,99],25:[2,99],26:[2,99],46:[2,99],51:[2,99],54:[2,99],63:[2,99],64:[2,99],65:[2,99],67:[2,99],69:[2,99],70:[2,99],71:[2,99],75:[2,99],81:[2,99],82:[2,99],83:[2,99],88:[2,99],90:[2,99],99:[2,99],101:[2,99],102:[2,99],103:[2,99],107:[2,99],115:[2,99],123:[2,99],125:[2,99],126:[2,99],129:[2,99],130:[2,99],131:[2,99],132:[2,99],133:[2,99],134:[2,99]},{1:[2,33],6:[2,33],25:[2,33],26:[2,33],46:[2,33],51:[2,33],54:[2,33],69:[2,33],75:[2,33],83:[2,33],88:[2,33],90:[2,33],99:[2,33],100:84,101:[2,33],102:[2,33],103:[2,33],106:85,107:[2,33],108:66,115:[2,33],123:[2,33],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{8:238,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,104],6:[2,104],25:[2,104],26:[2,104],46:[2,104],51:[2,104],54:[2,104],63:[2,104],64:[2,104],65:[2,104],67:[2,104],69:[2,104],70:[2,104],71:[2,104],75:[2,104],81:[2,104],82:[2,104],83:[2,104],88:[2,104],90:[2,104],99:[2,104],101:[2,104],102:[2,104],103:[2,104],107:[2,104],115:[2,104],123:[2,104],125:[2,104],126:[2,104],129:[2,104],130:[2,104],131:[2,104],132:[2,104],133:[2,104],134:[2,104]},{6:[2,49],25:[2,49],50:239,51:[1,223],83:[2,49]},{6:[2,122],25:[2,122],26:[2,122],51:[2,122],54:[1,240],83:[2,122],88:[2,122],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{47:241,48:[1,57],49:[1,58]},{27:107,28:[1,70],41:108,52:242,53:106,55:109,56:110,73:[1,67],86:[1,111],87:[1,112]},{46:[2,55],51:[2,55]},{8:243,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,192],6:[2,192],25:[2,192],26:[2,192],46:[2,192],51:[2,192],54:[2,192],69:[2,192],75:[2,192],83:[2,192],88:[2,192],90:[2,192],99:[2,192],100:84,101:[2,192],102:[2,192],103:[2,192],106:85,107:[2,192],108:66,115:[2,192],123:[2,192],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{8:244,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,194],6:[2,194],25:[2,194],26:[2,194],46:[2,194],51:[2,194],54:[2,194],69:[2,194],75:[2,194],83:[2,194],88:[2,194],90:[2,194],99:[2,194],100:84,101:[2,194],102:[2,194],103:[2,194],106:85,107:[2,194],108:66,115:[2,194],123:[2,194],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,174],6:[2,174],25:[2,174],26:[2,174],46:[2,174],51:[2,174],54:[2,174],69:[2,174],75:[2,174],83:[2,174],88:[2,174],90:[2,174],99:[2,174],101:[2,174],102:[2,174],103:[2,174],107:[2,174],115:[2,174],123:[2,174],125:[2,174],126:[2,174],129:[2,174],130:[2,174],131:[2,174],132:[2,174],133:[2,174],134:[2,174]},{8:245,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,127],6:[2,127],25:[2,127],26:[2,127],46:[2,127],51:[2,127],54:[2,127],69:[2,127],75:[2,127],83:[2,127],88:[2,127],90:[2,127],95:[1,246],99:[2,127],101:[2,127],102:[2,127],103:[2,127],107:[2,127],115:[2,127],123:[2,127],125:[2,127],126:[2,127],129:[2,127],130:[2,127],131:[2,127],132:[2,127],133:[2,127],134:[2,127]},{5:247,25:[1,5]},{27:248,28:[1,70]},{117:249,119:212,120:[1,213]},{26:[1,250],118:[1,251],119:252,120:[1,213]},{26:[2,167],118:[2,167],120:[2,167]},{8:254,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],92:253,93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,92],5:255,6:[2,92],25:[1,5],26:[2,92],46:[2,92],51:[2,92],54:[2,92],59:90,63:[1,92],64:[1,93],65:[1,94],66:95,67:[1,96],69:[2,92],70:[1,97],71:[1,98],75:[2,92],78:89,81:[1,91],82:[2,102],83:[2,92],88:[2,92],90:[2,92],99:[2,92],101:[2,92],102:[2,92],103:[2,92],107:[2,92],115:[2,92],123:[2,92],125:[2,92],126:[2,92],129:[2,92],130:[2,92],131:[2,92],132:[2,92],133:[2,92],134:[2,92]},{1:[2,66],6:[2,66],25:[2,66],26:[2,66],46:[2,66],51:[2,66],54:[2,66],63:[2,66],64:[2,66],65:[2,66],67:[2,66],69:[2,66],70:[2,66],71:[2,66],75:[2,66],81:[2,66],82:[2,66],83:[2,66],88:[2,66],90:[2,66],99:[2,66],101:[2,66],102:[2,66],103:[2,66],107:[2,66],115:[2,66],123:[2,66],125:[2,66],126:[2,66],129:[2,66],130:[2,66],131:[2,66],132:[2,66],133:[2,66],134:[2,66]},{1:[2,95],6:[2,95],25:[2,95],26:[2,95],46:[2,95],51:[2,95],54:[2,95],69:[2,95],75:[2,95],83:[2,95],88:[2,95],90:[2,95],99:[2,95],101:[2,95],102:[2,95],103:[2,95],107:[2,95],115:[2,95],123:[2,95],125:[2,95],126:[2,95],129:[2,95],130:[2,95],131:[2,95],132:[2,95],133:[2,95],134:[2,95]},{14:256,15:120,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:121,41:60,55:47,56:48,58:215,60:25,61:26,62:27,73:[1,67],80:[1,28],85:[1,55],86:[1,56],87:[1,54],98:[1,53]},{1:[2,132],6:[2,132],25:[2,132],26:[2,132],46:[2,132],51:[2,132],54:[2,132],63:[2,132],64:[2,132],65:[2,132],67:[2,132],69:[2,132],70:[2,132],71:[2,132],75:[2,132],81:[2,132],82:[2,132],83:[2,132],88:[2,132],90:[2,132],99:[2,132],101:[2,132],102:[2,132],103:[2,132],107:[2,132],115:[2,132],123:[2,132],125:[2,132],126:[2,132],129:[2,132],130:[2,132],131:[2,132],132:[2,132],133:[2,132],134:[2,132]},{6:[1,71],26:[1,257]},{8:258,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,61],13:[2,112],25:[2,61],28:[2,112],30:[2,112],31:[2,112],33:[2,112],34:[2,112],35:[2,112],42:[2,112],43:[2,112],44:[2,112],48:[2,112],49:[2,112],51:[2,61],73:[2,112],76:[2,112],80:[2,112],85:[2,112],86:[2,112],87:[2,112],88:[2,61],93:[2,112],97:[2,112],98:[2,112],101:[2,112],103:[2,112],105:[2,112],107:[2,112],116:[2,112],122:[2,112],124:[2,112],125:[2,112],126:[2,112],127:[2,112],128:[2,112]},{6:[1,260],25:[1,261],88:[1,259]},{6:[2,50],8:197,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[2,50],26:[2,50],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,57:145,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],83:[2,50],85:[1,55],86:[1,56],87:[1,54],88:[2,50],91:262,93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,49],25:[2,49],26:[2,49],50:263,51:[1,223]},{1:[2,171],6:[2,171],25:[2,171],26:[2,171],46:[2,171],51:[2,171],54:[2,171],69:[2,171],75:[2,171],83:[2,171],88:[2,171],90:[2,171],99:[2,171],101:[2,171],102:[2,171],103:[2,171],107:[2,171],115:[2,171],118:[2,171],123:[2,171],125:[2,171],126:[2,171],129:[2,171],130:[2,171],131:[2,171],132:[2,171],133:[2,171],134:[2,171]},{8:264,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:265,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{113:[2,150],114:[2,150]},{27:156,28:[1,70],55:157,56:158,73:[1,67],87:[1,112],112:266},{1:[2,156],6:[2,156],25:[2,156],26:[2,156],46:[2,156],51:[2,156],54:[2,156],69:[2,156],75:[2,156],83:[2,156],88:[2,156],90:[2,156],99:[2,156],100:84,101:[2,156],102:[1,267],103:[2,156],106:85,107:[2,156],108:66,115:[1,268],123:[2,156],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,157],6:[2,157],25:[2,157],26:[2,157],46:[2,157],51:[2,157],54:[2,157],69:[2,157],75:[2,157],83:[2,157],88:[2,157],90:[2,157],99:[2,157],100:84,101:[2,157],102:[1,269],103:[2,157],106:85,107:[2,157],108:66,115:[2,157],123:[2,157],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{6:[1,271],25:[1,272],75:[1,270]},{6:[2,50],12:165,25:[2,50],26:[2,50],27:166,28:[1,70],29:167,30:[1,68],31:[1,69],38:273,39:164,41:168,43:[1,46],75:[2,50],86:[1,111]},{8:274,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,275],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,79],6:[2,79],25:[2,79],26:[2,79],37:[2,79],46:[2,79],51:[2,79],54:[2,79],63:[2,79],64:[2,79],65:[2,79],67:[2,79],69:[2,79],70:[2,79],71:[2,79],75:[2,79],77:[2,79],81:[2,79],82:[2,79],83:[2,79],88:[2,79],90:[2,79],99:[2,79],101:[2,79],102:[2,79],103:[2,79],107:[2,79],115:[2,79],123:[2,79],125:[2,79],126:[2,79],127:[2,79],128:[2,79],129:[2,79],130:[2,79],131:[2,79],132:[2,79],133:[2,79],134:[2,79],135:[2,79]},{8:276,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,69:[2,115],73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{69:[2,116],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{26:[1,277],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{6:[1,260],25:[1,261],83:[1,278]},{6:[2,61],25:[2,61],26:[2,61],51:[2,61],83:[2,61],88:[2,61]},{5:279,25:[1,5]},{46:[2,53],51:[2,53]},{46:[2,56],51:[2,56],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{26:[1,280],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{5:281,25:[1,5],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{5:282,25:[1,5]},{1:[2,128],6:[2,128],25:[2,128],26:[2,128],46:[2,128],51:[2,128],54:[2,128],69:[2,128],75:[2,128],83:[2,128],88:[2,128],90:[2,128],99:[2,128],101:[2,128],102:[2,128],103:[2,128],107:[2,128],115:[2,128],123:[2,128],125:[2,128],126:[2,128],129:[2,128],130:[2,128],131:[2,128],132:[2,128],133:[2,128],134:[2,128]},{5:283,25:[1,5]},{26:[1,284],118:[1,285],119:252,120:[1,213]},{1:[2,165],6:[2,165],25:[2,165],26:[2,165],46:[2,165],51:[2,165],54:[2,165],69:[2,165],75:[2,165],83:[2,165],88:[2,165],90:[2,165],99:[2,165],101:[2,165],102:[2,165],103:[2,165],107:[2,165],115:[2,165],123:[2,165],125:[2,165],126:[2,165],129:[2,165],130:[2,165],131:[2,165],132:[2,165],133:[2,165],134:[2,165]},{5:286,25:[1,5]},{26:[2,168],118:[2,168],120:[2,168]},{5:287,25:[1,5],51:[1,288]},{25:[2,124],51:[2,124],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,93],6:[2,93],25:[2,93],26:[2,93],46:[2,93],51:[2,93],54:[2,93],69:[2,93],75:[2,93],83:[2,93],88:[2,93],90:[2,93],99:[2,93],101:[2,93],102:[2,93],103:[2,93],107:[2,93],115:[2,93],123:[2,93],125:[2,93],126:[2,93],129:[2,93],130:[2,93],131:[2,93],132:[2,93],133:[2,93],134:[2,93]},{1:[2,96],5:289,6:[2,96],25:[1,5],26:[2,96],46:[2,96],51:[2,96],54:[2,96],59:90,63:[1,92],64:[1,93],65:[1,94],66:95,67:[1,96],69:[2,96],70:[1,97],71:[1,98],75:[2,96],78:89,81:[1,91],82:[2,102],83:[2,96],88:[2,96],90:[2,96],99:[2,96],101:[2,96],102:[2,96],103:[2,96],107:[2,96],115:[2,96],123:[2,96],125:[2,96],126:[2,96],129:[2,96],130:[2,96],131:[2,96],132:[2,96],133:[2,96],134:[2,96]},{99:[1,290]},{88:[1,291],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,110],6:[2,110],25:[2,110],26:[2,110],37:[2,110],46:[2,110],51:[2,110],54:[2,110],63:[2,110],64:[2,110],65:[2,110],67:[2,110],69:[2,110],70:[2,110],71:[2,110],75:[2,110],81:[2,110],82:[2,110],83:[2,110],88:[2,110],90:[2,110],99:[2,110],101:[2,110],102:[2,110],103:[2,110],107:[2,110],113:[2,110],114:[2,110],115:[2,110],123:[2,110],125:[2,110],126:[2,110],129:[2,110],130:[2,110],131:[2,110],132:[2,110],133:[2,110],134:[2,110]},{8:197,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,57:145,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],91:292,93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:197,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,144],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,57:145,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],84:293,85:[1,55],86:[1,56],87:[1,54],91:143,93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,118],25:[2,118],26:[2,118],51:[2,118],83:[2,118],88:[2,118]},{6:[1,260],25:[1,261],26:[1,294]},{1:[2,135],6:[2,135],25:[2,135],26:[2,135],46:[2,135],51:[2,135],54:[2,135],69:[2,135],75:[2,135],83:[2,135],88:[2,135],90:[2,135],99:[2,135],100:84,101:[1,62],102:[2,135],103:[1,63],106:85,107:[1,65],108:66,115:[2,135],123:[2,135],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,137],6:[2,137],25:[2,137],26:[2,137],46:[2,137],51:[2,137],54:[2,137],69:[2,137],75:[2,137],83:[2,137],88:[2,137],90:[2,137],99:[2,137],100:84,101:[1,62],102:[2,137],103:[1,63],106:85,107:[1,65],108:66,115:[2,137],123:[2,137],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{113:[2,155],114:[2,155]},{8:295,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:296,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:297,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,84],6:[2,84],25:[2,84],26:[2,84],37:[2,84],46:[2,84],51:[2,84],54:[2,84],63:[2,84],64:[2,84],65:[2,84],67:[2,84],69:[2,84],70:[2,84],71:[2,84],75:[2,84],81:[2,84],82:[2,84],83:[2,84],88:[2,84],90:[2,84],99:[2,84],101:[2,84],102:[2,84],103:[2,84],107:[2,84],113:[2,84],114:[2,84],115:[2,84],123:[2,84],125:[2,84],126:[2,84],129:[2,84],130:[2,84],131:[2,84],132:[2,84],133:[2,84],134:[2,84]},{12:165,27:166,28:[1,70],29:167,30:[1,68],31:[1,69],38:298,39:164,41:168,43:[1,46],86:[1,111]},{6:[2,85],12:165,25:[2,85],26:[2,85],27:166,28:[1,70],29:167,30:[1,68],31:[1,69],38:163,39:164,41:168,43:[1,46],51:[2,85],74:299,86:[1,111]},{6:[2,87],25:[2,87],26:[2,87],51:[2,87],75:[2,87]},{6:[2,36],25:[2,36],26:[2,36],51:[2,36],75:[2,36],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{8:300,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{69:[2,114],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,34],6:[2,34],25:[2,34],26:[2,34],46:[2,34],51:[2,34],54:[2,34],69:[2,34],75:[2,34],83:[2,34],88:[2,34],90:[2,34],99:[2,34],101:[2,34],102:[2,34],103:[2,34],107:[2,34],115:[2,34],123:[2,34],125:[2,34],126:[2,34],129:[2,34],130:[2,34],131:[2,34],132:[2,34],133:[2,34],134:[2,34]},{1:[2,105],6:[2,105],25:[2,105],26:[2,105],46:[2,105],51:[2,105],54:[2,105],63:[2,105],64:[2,105],65:[2,105],67:[2,105],69:[2,105],70:[2,105],71:[2,105],75:[2,105],81:[2,105],82:[2,105],83:[2,105],88:[2,105],90:[2,105],99:[2,105],101:[2,105],102:[2,105],103:[2,105],107:[2,105],115:[2,105],123:[2,105],125:[2,105],126:[2,105],129:[2,105],130:[2,105],131:[2,105],132:[2,105],133:[2,105],134:[2,105]},{1:[2,45],6:[2,45],25:[2,45],26:[2,45],46:[2,45],51:[2,45],54:[2,45],69:[2,45],75:[2,45],83:[2,45],88:[2,45],90:[2,45],99:[2,45],101:[2,45],102:[2,45],103:[2,45],107:[2,45],115:[2,45],123:[2,45],125:[2,45],126:[2,45],129:[2,45],130:[2,45],131:[2,45],132:[2,45],133:[2,45],134:[2,45]},{1:[2,193],6:[2,193],25:[2,193],26:[2,193],46:[2,193],51:[2,193],54:[2,193],69:[2,193],75:[2,193],83:[2,193],88:[2,193],90:[2,193],99:[2,193],101:[2,193],102:[2,193],103:[2,193],107:[2,193],115:[2,193],123:[2,193],125:[2,193],126:[2,193],129:[2,193],130:[2,193],131:[2,193],132:[2,193],133:[2,193],134:[2,193]},{1:[2,172],6:[2,172],25:[2,172],26:[2,172],46:[2,172],51:[2,172],54:[2,172],69:[2,172],75:[2,172],83:[2,172],88:[2,172],90:[2,172],99:[2,172],101:[2,172],102:[2,172],103:[2,172],107:[2,172],115:[2,172],118:[2,172],123:[2,172],125:[2,172],126:[2,172],129:[2,172],130:[2,172],131:[2,172],132:[2,172],133:[2,172],134:[2,172]},{1:[2,129],6:[2,129],25:[2,129],26:[2,129],46:[2,129],51:[2,129],54:[2,129],69:[2,129],75:[2,129],83:[2,129],88:[2,129],90:[2,129],99:[2,129],101:[2,129],102:[2,129],103:[2,129],107:[2,129],115:[2,129],123:[2,129],125:[2,129],126:[2,129],129:[2,129],130:[2,129],131:[2,129],132:[2,129],133:[2,129],134:[2,129]},{1:[2,130],6:[2,130],25:[2,130],26:[2,130],46:[2,130],51:[2,130],54:[2,130],69:[2,130],75:[2,130],83:[2,130],88:[2,130],90:[2,130],95:[2,130],99:[2,130],101:[2,130],102:[2,130],103:[2,130],107:[2,130],115:[2,130],123:[2,130],125:[2,130],126:[2,130],129:[2,130],130:[2,130],131:[2,130],132:[2,130],133:[2,130],134:[2,130]},{1:[2,163],6:[2,163],25:[2,163],26:[2,163],46:[2,163],51:[2,163],54:[2,163],69:[2,163],75:[2,163],83:[2,163],88:[2,163],90:[2,163],99:[2,163],101:[2,163],102:[2,163],103:[2,163],107:[2,163],115:[2,163],123:[2,163],125:[2,163],126:[2,163],129:[2,163],130:[2,163],131:[2,163],132:[2,163],133:[2,163],134:[2,163]},{5:301,25:[1,5]},{26:[1,302]},{6:[1,303],26:[2,169],118:[2,169],120:[2,169]},{8:304,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,97],6:[2,97],25:[2,97],26:[2,97],46:[2,97],51:[2,97],54:[2,97],69:[2,97],75:[2,97],83:[2,97],88:[2,97],90:[2,97],99:[2,97],101:[2,97],102:[2,97],103:[2,97],107:[2,97],115:[2,97],123:[2,97],125:[2,97],126:[2,97],129:[2,97],130:[2,97],131:[2,97],132:[2,97],133:[2,97],134:[2,97]},{1:[2,133],6:[2,133],25:[2,133],26:[2,133],46:[2,133],51:[2,133],54:[2,133],63:[2,133],64:[2,133],65:[2,133],67:[2,133],69:[2,133],70:[2,133],71:[2,133],75:[2,133],81:[2,133],82:[2,133],83:[2,133],88:[2,133],90:[2,133],99:[2,133],101:[2,133],102:[2,133],103:[2,133],107:[2,133],115:[2,133],123:[2,133],125:[2,133],126:[2,133],129:[2,133],130:[2,133],131:[2,133],132:[2,133],133:[2,133],134:[2,133]},{1:[2,113],6:[2,113],25:[2,113],26:[2,113],46:[2,113],51:[2,113],54:[2,113],63:[2,113],64:[2,113],65:[2,113],67:[2,113],69:[2,113],70:[2,113],71:[2,113],75:[2,113],81:[2,113],82:[2,113],83:[2,113],88:[2,113],90:[2,113],99:[2,113],101:[2,113],102:[2,113],103:[2,113],107:[2,113],115:[2,113],123:[2,113],125:[2,113],126:[2,113],129:[2,113],130:[2,113],131:[2,113],132:[2,113],133:[2,113],134:[2,113]},{6:[2,119],25:[2,119],26:[2,119],51:[2,119],83:[2,119],88:[2,119]},{6:[2,49],25:[2,49],26:[2,49],50:305,51:[1,223]},{6:[2,120],25:[2,120],26:[2,120],51:[2,120],83:[2,120],88:[2,120]},{1:[2,158],6:[2,158],25:[2,158],26:[2,158],46:[2,158],51:[2,158],54:[2,158],69:[2,158],75:[2,158],83:[2,158],88:[2,158],90:[2,158],99:[2,158],100:84,101:[2,158],102:[2,158],103:[2,158],106:85,107:[2,158],108:66,115:[1,306],123:[2,158],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,160],6:[2,160],25:[2,160],26:[2,160],46:[2,160],51:[2,160],54:[2,160],69:[2,160],75:[2,160],83:[2,160],88:[2,160],90:[2,160],99:[2,160],100:84,101:[2,160],102:[1,307],103:[2,160],106:85,107:[2,160],108:66,115:[2,160],123:[2,160],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,159],6:[2,159],25:[2,159],26:[2,159],46:[2,159],51:[2,159],54:[2,159],69:[2,159],75:[2,159],83:[2,159],88:[2,159],90:[2,159],99:[2,159],100:84,101:[2,159],102:[2,159],103:[2,159],106:85,107:[2,159],108:66,115:[2,159],123:[2,159],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{6:[2,88],25:[2,88],26:[2,88],51:[2,88],75:[2,88]},{6:[2,49],25:[2,49],26:[2,49],50:308,51:[1,233]},{26:[1,309],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{26:[1,310]},{1:[2,166],6:[2,166],25:[2,166],26:[2,166],46:[2,166],51:[2,166],54:[2,166],69:[2,166],75:[2,166],83:[2,166],88:[2,166],90:[2,166],99:[2,166],101:[2,166],102:[2,166],103:[2,166],107:[2,166],115:[2,166],123:[2,166],125:[2,166],126:[2,166],129:[2,166],130:[2,166],131:[2,166],132:[2,166],133:[2,166],134:[2,166]},{26:[2,170],118:[2,170],120:[2,170]},{25:[2,125],51:[2,125],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{6:[1,260],25:[1,261],26:[1,311]},{8:312,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:313,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[1,271],25:[1,272],26:[1,314]},{6:[2,37],25:[2,37],26:[2,37],51:[2,37],75:[2,37]},{1:[2,164],6:[2,164],25:[2,164],26:[2,164],46:[2,164],51:[2,164],54:[2,164],69:[2,164],75:[2,164],83:[2,164],88:[2,164],90:[2,164],99:[2,164],101:[2,164],102:[2,164],103:[2,164],107:[2,164],115:[2,164],123:[2,164],125:[2,164],126:[2,164],129:[2,164],130:[2,164],131:[2,164],132:[2,164],133:[2,164],134:[2,164]},{6:[2,121],25:[2,121],26:[2,121],51:[2,121],83:[2,121],88:[2,121]},{1:[2,161],6:[2,161],25:[2,161],26:[2,161],46:[2,161],51:[2,161],54:[2,161],69:[2,161],75:[2,161],83:[2,161],88:[2,161],90:[2,161],99:[2,161],100:84,101:[2,161],102:[2,161],103:[2,161],106:85,107:[2,161],108:66,115:[2,161],123:[2,161],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,162],6:[2,162],25:[2,162],26:[2,162],46:[2,162],51:[2,162],54:[2,162],69:[2,162],75:[2,162],83:[2,162],88:[2,162],90:[2,162],99:[2,162],100:84,101:[2,162],102:[2,162],103:[2,162],106:85,107:[2,162],108:66,115:[2,162],123:[2,162],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{6:[2,89],25:[2,89],26:[2,89],51:[2,89],75:[2,89]}],defaultActions:{57:[2,47],58:[2,48],72:[2,3],91:[2,103],186:[2,83]},parseError:function(a,b){throw new Error(a)},parse:function h(a){function o(){var a;a=b.lexer.lex()||1,typeof a!="number"&&(a=b.symbols_[a]||a);return a}function n(a){c.length=c.length-2*a,d.length=d.length-a,e.length=e.length-a}var b=this,c=[0],d=[null],e=[],f=this.table,g="",h=0,i=0,j=0,k=2,l=1;this.lexer.setInput(a),this.lexer.yy=this.yy,this.yy.lexer=this.lexer,typeof this.lexer.yylloc=="undefined"&&(this.lexer.yylloc={});var m=this.lexer.yylloc;e.push(m),typeof this.yy.parseError=="function"&&(this.parseError=this.yy.parseError);var p,q,r,s,t,u,v={},w,x,y,z;for(;;){r=c[c.length-1],this.defaultActions[r]?s=this.defaultActions[r]:(p==null&&(p=o()),s=f[r]&&f[r][p]);if(typeof s=="undefined"||!s.length||!s[0]){if(!j){z=[];for(w in f[r])this.terminals_[w]&&w>2&&z.push("'"+this.terminals_[w]+"'");var A="";this.lexer.showPosition?A="Parse error on line "+(h+1)+":\n"+this.lexer.showPosition()+"\nExpecting "+z.join(", "):A="Parse error on line "+(h+1)+": Unexpected "+(p==1?"end of input":"'"+(this.terminals_[p]||p)+"'"),this.parseError(A,{text:this.lexer.match,token:this.terminals_[p]||p,line:this.lexer.yylineno,loc:m,expected:z})}if(j==3){if(p==l)throw new Error(A||"Parsing halted.");i=this.lexer.yyleng,g=this.lexer.yytext,h=this.lexer.yylineno,m=this.lexer.yylloc,p=o()}for(;;){if(k.toString()in f[r])break;if(r==0)throw new Error(A||"Parsing halted.");n(1),r=c[c.length-1]}q=p,p=k,r=c[c.length-1],s=f[r]&&f[r][k],j=3}if(s[0]instanceof Array&&s.length>1)throw new Error("Parse Error: multiple actions possible at state: "+r+", token: "+p);switch(s[0]){case 1:c.push(p),d.push(this.lexer.yytext),e.push(this.lexer.yylloc),c.push(s[1]),p=null,q?(p=q,q=null):(i=this.lexer.yyleng,g=this.lexer.yytext,h=this.lexer.yylineno,m=this.lexer.yylloc,j>0&&j--);break;case 2:x=this.productions_[s[1]][1],v.$=d[d.length-x],v._$={first_line:e[e.length-(x||1)].first_line,last_line:e[e.length-1].last_line,first_column:e[e.length-(x||1)].first_column,last_column:e[e.length-1].last_column},u=this.performAction.call(v,g,i,h,this.yy,s[1],d,e);if(typeof u!="undefined")return u;x&&(c=c.slice(0,-1*x*2),d=d.slice(0,-1*x),e=e.slice(0,-1*x)),c.push(this.productions_[s[1]][0]),d.push(v.$),e.push(v._$),y=f[c[c.length-2]][c[c.length-1]],c.push(y);break;case 3:return!0}}return!0}};c.exports=d}),define("ace/mode/coffee/nodes",["require","exports","module","ace/mode/coffee/scope","ace/mode/coffee/helpers"],function(a,b,c){var d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,$,_,ba,bb,bc,bd,be,bf,bg,bh,bi,bj=Object.prototype.hasOwnProperty,bk=function(a,b){function d(){this.constructor=a}for(var c in b)bj.call(b,c)&&(a[c]=b[c]);d.prototype=b.prototype,a.prototype=new d,a.__super__=b.prototype;return a},bl=function(a,b){return function(){return a.apply(b,arguments)}},bm=Array.prototype.indexOf||function(a){for(var b=0,c=this.length;b<c;b++)if(this[b]===a)return b;return-1};N=a("ace/mode/coffee/scope").Scope,bi=a("ace/mode/coffee/helpers"),Z=bi.compact,bb=bi.flatten,ba=bi.extend,bd=bi.merge,$=bi.del,bf=bi.starts,_=bi.ends,bc=bi.last,b.extend=ba,Y=function(){return!0},E=function(){return!1},S=function(){return this},D=function(){this.negated=!this.negated;return this},b.Base=g=function(){function a(){}a.prototype.compile=function(a,b){var c;a=ba({},a),b&&(a.level=b),c=this.unfoldSoak(a)||this,c.tab=a.indent;return a.level===A||!c.isStatement(a)?c.compileNode(a):c.compileClosure(a)},a.prototype.compileClosure=function(a){if(this.jumps()||this instanceof T)throw SyntaxError("cannot use a pure statement in an expression.");a.sharedScope=!0;return k.wrap(this).compileNode(a)},a.prototype.cache=function(a,b,c){var d,e;if(!this.isComplex()){d=b?this.compile(a,b):this;return[d,d]}d=new B(c||a.scope.freeVariable("ref")),e=new f(d,this);return b?[e.compile(a,b),d.value]:[e,d]},a.prototype.compileLoopReference=function(a,b){var c,d;c=d=this.compile(a,x),-Infinity<+c&&+c<Infinity||q.test(c)&&a.scope.check(c,!0)||(c=""+(d=a.scope.freeVariable(b))+" = "+c);return[c,d]},a.prototype.makeReturn=function(){return new L(this)},a.prototype.contains=function(a){var b;b=!1,this.traverseChildren(!1,function(c){if(a(c)){b=!0;return!1}});return b},a.prototype.containsType=function(a){return this instanceof a||this.contains(function(b){return b instanceof a})},a.prototype.lastNonComment=function(a){var b;b=a.length;while(b--)if(!(a[b]instanceof m))return a[b];return null},a.prototype.toString=function(a,b){var c;a==null&&(a=""),b==null&&(b=this.constructor.name),c="\n"+a+b,this.soak&&(c+="?"),this.eachChild(function(b){return c+=b.toString(a+R)});return c},a.prototype.eachChild=function(a){var b,c,d,e,f,g,h,i;if(!this.children)return this;h=this.children;for(d=0,f=h.length;d<f;d++){b=h[d];if(this[b]){i=bb([this[b]]);for(e=0,g=i.length;e<g;e++){c=i[e];if(a(c)===!1)return this}}}return this},a.prototype.traverseChildren=function(a,b){return this.eachChild(function(c){return b(c)===!1?!1:c.traverseChildren(a,b)})},a.prototype.invert=function(){return new G("!",this)},a.prototype.unwrapAll=function(){var a;a=this;while(a!==(a=a.unwrap()))continue;return a},a.prototype.children=[],a.prototype.isStatement=E,a.prototype.jumps=E,a.prototype.isComplex=Y,a.prototype.isChainable=E,a.prototype.isAssignable=E,a.prototype.unwrap=S,a.prototype.unfoldSoak=E,a.prototype.assigns=E;return a}(),b.Block=h=function(){function a(a){this.expressions=Z(bb(a||[]))}bk(a,g),a.prototype.children=["expressions"],a.prototype.push=function(a){this.expressions.push(a);return this},a.prototype.pop=function(){return this.expressions.pop()},a.prototype.unshift=function(a){this.expressions.unshift(a);return this},a.prototype.unwrap=function(){return this.expressions.length===1?this.expressions[0]:this},a.prototype.isEmpty=function(){return!this.expressions.length},a.prototype.isStatement=function(a){var b,c,d,e;e=this.expressions;for(c=0,d=e.length;c<d;c++){b=e[c];if(b.isStatement(a))return!0}return!1},a.prototype.jumps=function(a){var b,c,d,e;e=this.expressions;for(c=0,d=e.length;c<d;c++){b=e[c];if(b.jumps(a))return b}},a.prototype.makeReturn=function(){var a,b;b=this.expressions.length;while(b--){a=this.expressions[b];if(!(a instanceof m)){this.expressions[b]=a.makeReturn(),a instanceof L&&!a.expression&&this.expressions.splice(b,1);break}}return this},a.prototype.compile=function(b,c){b==null&&(b={});return b.scope?a.__super__.compile.call(this,b,c):this.compileRoot(b)},a.prototype.compileNode=function(a){var b,c,d,e,f,g,h;this.tab=a.indent,e=a.level===A,c=[],h=this.expressions;for(f=0,g=h.length;f<g;f++)d=h[f],d=d.unwrapAll(),d=d.unfoldSoak(a)||d,e?(d.front=!0,b=d.compile(a),c.push(d.isStatement(a)?b:this.tab+b+";")):c.push(d.compile(a,x));if(e)return c.join("\n");b=c.join(", ")||"void 0";return c.length>1&&a.level>=x?"("+b+")":b},a.prototype.compileRoot=function(a){var b;a.indent=this.tab=a.bare?"":R,a.scope=new N(null,this,null),a.level=A,b=this.compileWithDeclarations(a);return a.bare?b:"(function() {\n"+b+"\n}).call(this);\n"},a.prototype.compileWithDeclarations=function(a){var b,c,d,e,f,g,h,i,j,k;c=g="",k=this.expressions;for(f=0,j=k.length;f<j;f++){e=k[f],e=e.unwrap();if(!(e instanceof m||e instanceof B))break}a=bd(a,{level:A}),f&&(h=this.expressions.splice(f,this.expressions.length),c=this.compileNode(a),this.expressions=h),g=this.compileNode(a),i=a.scope,i.expressions===this&&(d=a.scope.hasDeclarations(),b=i.hasAssignments,(d||b)&&f&&(c+="\n"),d&&(c+=""+this.tab+"var "+i.declaredVariables().join(", ")+";\n"),b&&(c+=""+this.tab+"var "+be(i.assignedVariables().join(", "),this.tab)+";\n"));return c+g},a.wrap=function(b){return b.length===1&&b[0]instanceof a?b[0]:new a(b)};return a}(),b.Literal=B=function(){function a(a){this.value=a}bk(a,g),a.prototype.makeReturn=function(){return this.isStatement()?this:new L(this)},a.prototype.isAssignable=function(){return q.test(this.value)},a.prototype.isStatement=function(){var a;return(a=this.value)==="break"||a==="continue"||a==="debugger"},a.prototype.isComplex=E,a.prototype.assigns=function(a){return a===this.value},a.prototype.jumps=function(a){return this.isStatement()?!a||!(a.loop||a.block&&this.value!=="continue")?this:!1:!1},a.prototype.compileNode=function(a){var b;b=this.isUndefined?a.level>=v?"(void 0)":"void 0":this.value.reserved?'"'+this.value+'"':this.value;return this.isStatement()?""+this.tab+b+";":b},a.prototype.toString=function(){return' "'+this.value+'"'};return a}(),b.Return=L=function(){function a(a){a&&!a.unwrap().isUndefined&&(this.expression=a)}bk(a,g),a.prototype.children=["expression"],a.prototype.isStatement=Y,a.prototype.makeReturn=S,a.prototype.jumps=S,a.prototype.compile=function(b,c){var d,e;d=(e=this.expression)!=null?e.makeReturn():void 0;return!d||d instanceof a?a.__super__.compile.call(this,b,c):d.compile(b,c)},a.prototype.compileNode=function(a){return this.tab+("return"+(this.expression?" "+this.expression.compile(a,z):"")+";")};return a}(),b.Value=W=function(){function a(b,c,d){if(!c&&b instanceof a)return b;this.base=b,this.properties=c||[],d&&(this[d]=!0);return this}bk(a,g),a.prototype.children=["base","properties"],a.prototype.push=function(a){this.properties.push(a);return this},a.prototype.hasProperties=function(){return!!this.properties.length},a.prototype.isArray=function(){return!this.properties.length&&this.base instanceof e},a.prototype.isComplex=function(){return this.hasProperties()||this.base.isComplex()},a.prototype.isAssignable=function(){return this.hasProperties()||this.base.isAssignable()},a.prototype.isSimpleNumber=function(){return this.base instanceof B&&M.test(this.base.value)},a.prototype.isAtomic=function(){var a,b,c,d;d=this.properties.concat(this.base);for(b=0,c=d.length;b<c;b++){a=d[b];if(a.soak||a instanceof i)return!1}return!0},a.prototype.isStatement=function(a){return!this.properties.length&&this.base.isStatement(a)},a.prototype.assigns=function(a){return!this.properties.length&&this.base.assigns(a)},a.prototype.jumps=function(a){return!this.properties.length&&this.base.jumps(a)},a.prototype.isObject=function(a){return this.properties.length?!1:this.base instanceof F&&(!a||this.base.generated)},a.prototype.isSplice=function(){return bc(this.properties)instanceof O},a.prototype.makeReturn=function(){return this.properties.length?a.__super__.makeReturn.call(this):this.base.makeReturn()},a.prototype.unwrap=function(){return this.properties.length?this:this.base},a.prototype.cacheReference=function(b){var c,d,e,g;e=bc(this.properties);if(this.properties.length<2&&!this.base.isComplex()&&(e!=null?!e.isComplex():!void 0))return[this,this];c=new a(this.base,this.properties.slice(0,-1)),c.isComplex()&&(d=new B(b.scope.freeVariable("base")),c=new a(new I(new f(d,c))));if(!e)return[c,d];e.isComplex()&&(g=new B(b.scope.freeVariable("name")),e=new u(new f(g,e.index)),g=new u(g));return[c.push(e),new a(d||c.base,[g||e])]},a.prototype.compileNode=function(a){var b,c,e,f,g;this.base.front=this.front,e=this.properties,b=this.base.compile(a,e.length?v:null),e[0]instanceof d&&this.isSimpleNumber()&&(b="("+b+")");for(f=0,g=e.length;f<g;f++)c=e[f],b+=c.compile(a);return b},a.prototype.unfoldSoak=function(b){var c;if(this.unfoldedSoak!=null)return this.unfoldedSoak;c=bl(function(){var c,d,e,g,h,i,j,k;if(e=this.base.unfoldSoak(b)){Array.prototype.push.apply(e.body.properties,this.properties);return e}k=this.properties;for(d=0,j=k.length;d<j;d++){g=k[d];if(g.soak){g.soak=!1,c=new a(this.base,this.properties.slice(0,d)),i=new a(this.base,this.properties.slice(d)),c.isComplex()&&(h=new B(b.scope.freeVariable("ref")),c=new I(new f(h,c)),i.base=h);return new s(new n(c),i,{soak:!0})}}return null},this)();return this.unfoldedSoak=c||!1};return a}(),b.Comment=m=function(){function a(a){this.comment=a}bk(a,g),a.prototype.isStatement=Y,a.prototype.makeReturn=S,a.prototype.compileNode=function(a,b){var c;c="/*"+be(this.comment,this.tab)+"*/",(b||a.level)===A&&(c=a.indent+c);return c};return a}(),b.Call=i=function(){function a(a,b,c){this.args=b!=null?b:[],this.soak=c,this.isNew=!1,this.isSuper=a==="super",this.variable=this.isSuper?null:a}bk(a,g),a.prototype.children=["variable","args"],a.prototype.newInstance=function(){var b;b=this.variable.base||this.variable,b instanceof a?b.newInstance():this.isNew=!0;return this},a.prototype.superReference=function(a){var b,c;b=a.scope.method;if(!b)throw SyntaxError("cannot call super outside of a function.");c=b.name;if(!c)throw SyntaxError("cannot call super on an anonymous function.");return b.klass?""+b.klass+".__super__."+c:""+c+".__super__.constructor"},a.prototype.unfoldSoak=function(b){var c,d,e,f,g,h,i,j,k;if(this.soak){if(this.variable){if(d=bg(b,this,"variable"))return d;j=(new W(this.variable)).cacheReference(b),e=j[0],g=j[1]}else e=new B(this.superReference(b)),g=new W(e);g=new a(g,this.args),g.isNew=this.isNew,e=new B("typeof "+e.compile(b)+' === "function"');return new s(e,new W(g),{soak:!0})}c=this,f=[];for(;;){if(c.variable instanceof a){f.push(c),c=c.variable;continue}if(!(c.variable instanceof W))break;f.push(c);if(!((c=c.variable.base)instanceof a))break}k=f.reverse();for(h=0,i=k.length;h<i;h++)c=k[h],d&&(c.variable instanceof a?c.variable=d:c.variable.base=d),d=bg(b,c,"variable");return d},a.prototype.filterImplicitObjects=function(a){var b,c,d,e,g,h,i,j,k,l;c=[];for(h=0,j=a.length;h<j;h++){b=a[h];if(!((typeof b.isObject=="function"?b.isObject():void 0)&&b.base.generated)){c.push(b);continue}d=null,l=b.base.properties;for(i=0,k=l.length;i<k;i++)e=l[i],e instanceof f?(d||c.push(d=new F(g=[],!0)),g.push(e)):(c.push(e),d=null)}return c},a.prototype.compileNode=function(a){var b,c,d,e;(e=this.variable)!=null&&(e.front=this.front);if(d=P.compileSplattedArray(a,this.args,!0))return this.compileSplat(a,d);c=this.filterImplicitObjects(this.args),c=function(){var d,e,f;f=[];for(d=0,e=c.length;d<e;d++)b=c[d],f.push(b.compile(a,x));return f}().join(", ");return this.isSuper?this.superReference(a)+(".call(this"+(c&&", "+c)+")"):(this.isNew?"new ":"")+this.variable.compile(a,v)+("("+c+")")},a.prototype.compileSuper=function(a,b){return""+this.superReference(b)+".call(this"+(a.length?", ":"")+a+")"},a.prototype.compileSplat=function(a,b){var c,d,e,f,g;if(this.isSuper)return""+this.superReference(a)+".apply(this, "+b+")";if(this.isNew){e=this.tab+R;return"(function(func, args, ctor) {\n"+e+"ctor.prototype = func.prototype;\n"+e+"var child = new ctor, result = func.apply(child, args);\n"+e+'return typeof result === "object" ? result : child;\n'+this.tab+"})("+this.variable.compile(a,x)+", "+b+", function() {})"}c=new W(this.variable),(f=c.properties.pop())&&c.isComplex()?(g=a.scope.freeVariable("ref"),d="("+g+" = "+c.compile(a,x)+")"+f.compile(a)):(d=c.compile(a,v),M.test(d)&&(d="("+d+")"),f?(g=d,d+=f.compile(a)):g="null");return""+d+".apply("+g+", "+b+")"};return a}(),b.Extends=o=function(){function a(a,b){this.child=a,this.parent=b}bk(a,g),a.prototype.children=["child","parent"],a.prototype.compile=function(a){bh("hasProp");return(new i(new W(new B(bh("extends"))),[this.child,this.parent])).compile(a)};return a}(),b.Access=d=function(){function a(a,b){this.name=a,this.name.asKey=!0,this.proto=b==="proto"?".prototype":"",this.soak=b==="soak"}bk(a,g),a.prototype.children=["name"],a.prototype.compile=function(a){var b;b=this.name.compile(a);return this.proto+(r.test(b)?"["+b+"]":"."+b)},a.prototype.isComplex=E;return a}(),b.Index=u=function(){function a(a){this.index=a}bk(a,g),a.prototype.children=["index"],a.prototype.compile=function(a){return(this.proto?".prototype":"")+("["+this.index.compile(a,z)+"]")},a.prototype.isComplex=function(){return this.index.isComplex()};return a}(),b.Range=K=function(){function a(a,b,c){this.from=a,this.to=b,this.exclusive=c==="exclusive",this.equals=this.exclusive?"":"="}bk(a,g),a.prototype.children=["from","to"],a.prototype.compileVariables=function(a){var b,c,d,e,f;a=bd(a,{top:!0}),c=this.from.cache(a,x),this.from=c[0],this.fromVar=c[1],d=this.to.cache(a,x),this.to=d[0],this.toVar=d[1];if(b=$(a,"step"))e=b.cache(a,x),this.step=e[0],this.stepVar=e[1];f=[this.fromVar.match(M),this.toVar.match(M)],this.fromNum=f[0],this.toNum=f[1];if(this.stepVar)return this.stepNum=this.stepVar.match(M)},a.prototype.compileNode=function(a){var b,c,d,e,f,g,h,i,j,k,l,m;this.fromVar||this.compileVariables(a);if(!a.index)return this.compileArray(a);g=this.fromNum&&this.toNum,f=$(a,"index"),k=""+f+" = "+this.from,this.to!==this.toVar&&(k+=", "+this.to),this.step!==this.stepVar&&(k+=", "+this.step),l=[""+f+" <"+this.equals,""+f+" >"+this.equals],h=l[0],e=l[1],c=this.stepNum?c=+this.stepNum>0?""+h+" "+this.toVar:""+e+" "+this.toVar:g?(m=[+this.fromNum,+this.toNum],d=m[0],j=m[1],m,c=d<=j?""+h+" "+j:""+e+" "+j):(b=""+this.fromVar+" <= "+this.toVar,c=""+b+" ? "+h+" "+this.toVar+" : "+e+" "+this.toVar),i=this.stepVar?""+f+" += "+this.stepVar:g?d<=j?""+f+"++":""+f+"--":""+b+" ? "+f+"++ : "+f+"--";return""+k+"; "+c+"; "+i},a.prototype.compileArray=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n;if(this.fromNum&&this.toNum&&Math.abs(this.fromNum-this.toNum)<=20){h=function(){n=[];for(var a=l=+this.fromNum,b=+this.toNum;l<=b?a<=b:a>=b;l<=b?a++:a--)n.push(a);return n}.apply(this,arguments),this.exclusive&&h.pop();return"["+h.join(", ")+"]"}e=this.tab+R,d=a.scope.freeVariable("i"),i=a.scope.freeVariable("results"),g="\n"+e+i+" = [];",this.fromNum&&this.toNum?(a.index=d,b=this.compileNode(a)):(j=""+d+" = "+this.from+(this.to!==this.toVar?", "+this.to:""),c=""+this.fromVar+" <= "+this.toVar,b="var "+j+"; "+c+" ? "+d+" <"+this.equals+" "+this.toVar+" : "+d+" >"+this.equals+" "+this.toVar+"; "+c+" ? "+d+"++ : "+d+"--"),f="{ "+i+".push("+d+"); }\n"+e+"return "+i+";\n"+a.indent;return"(function() {"+g+"\n"+e+"for ("+b+")"+f+"}).apply(this, arguments)"};return a}(),b.Slice=O=function(){function a(b){this.range=b,a.__super__.constructor.call(this)}bk(a,g),a.prototype.children=["range"],a.prototype.compileNode=function(a){var b,c,d,e,f,g;g=this.range,e=g.to,c=g.from,d=c&&c.compile(a,z)||"0",b=e&&e.compile(a,z),e&&(!!this.range.exclusive||+b!==-1)&&(f=", "+(this.range.exclusive?b:M.test(b)?(+b+1).toString():"("+b+" + 1) || 9e9"));return".slice("+d+(f||"")+")"};return a}(),b.Obj=F=function(){function a(a,b){this.generated=b!=null?b:!1,this.objects=this.properties=a||[]}bk(a,g),a.prototype.children=["properties"],a.prototype.compileNode=function(a){var b,c,d,e,g,h,i,j,k,l,n;k=this.properties;if(!k.length)return this.front?"({})":"{}";if(this.generated)for(l=0,n=k.length;l<n;l++){h=k[l];if(h instanceof W)throw new Error("cannot have an implicit value in an implicit object")}c=a.indent+=R,g=this.lastNonComment(this.properties),k=function(){var h,i;i=[];for(b=0,h=k.length;b<h;b++)j=k[b],e=b===k.length-1?"":j===g||j instanceof m?"\n":",\n",d=j instanceof m?"":c,j instanceof W&&j["this"]&&(j=new f(j.properties[0].name,j,"object")),j instanceof m||(j instanceof f||(j=new f(j,j,"object")),(j.variable.base||j.variable).asKey=!0),i.push(d+j.compile(a,A)+e);return i}(),k=k.join(""),i="{"+(k&&"\n"+k+"\n"+this.tab)+"}";return this.front?"("+i+")":i},a.prototype.assigns=function(a){var b,c,d,e;e=this.properties;for(c=0,d=e.length;c<d;c++){b=e[c];if(b.assigns(a))return!0}return!1};return a}(),b.Arr=e=function(){function a(a){this.objects=a||[]}bk(a,g),a.prototype.children=["objects"],a.prototype.filterImplicitObjects=i.prototype.filterImplicitObjects,a.prototype.compileNode=function(a){var b,c,d;if(!this.objects.length)return"[]";a.indent+=R,d=this.filterImplicitObjects(this.objects);if(b=P.compileSplattedArray(a,d))return b;b=function(){var b,e,f;f=[];for(b=0,e=d.length;b<e;b++)c=d[b],f.push(c.compile(a,x));return f}().join(", ");return b.indexOf("\n")>=0?"[\n"+a.indent+b+"\n"+this.tab+"]":"["+b+"]"},a.prototype.assigns=function(a){var b,c,d,e;e=this.objects;for(c=0,d=e.length;c<d;c++){b=e[c];if(b.assigns(a))return!0}return!1};return a}(),b.Class=j=function(){function a(a,b,c){this.variable=a,this.parent=b,this.body=c!=null?c:new h,this.boundFuncs=[],this.body.classBody=!0}bk(a,g),a.prototype.children=["variable","parent","body"],a.prototype.determineName=function(){var a,b;if(!this.variable)return null;a=(b=bc(this.variable.properties))?b instanceof d&&b.name.value:this.variable.base.value;return a&&(a=q.test(a)&&a)},a.prototype.setContext=function(a){return this.body.traverseChildren(!1,function(b){if(b.classBody)return!1;if(b instanceof B&&b.value==="this")return b.value=a;if(b instanceof l){b.klass=a;if(b.bound)return b.context=a}})},a.prototype.addBoundFunctions=function(a){var b,c,d,e,f,g;if(this.boundFuncs.length){f=this.boundFuncs,g=[];for(d=0,e=f.length;d<e;d++)c=f[d],b=c.compile(a),g.push(this.ctor.body.unshift(new B("this."+b+" = "+bh("bind")+"(this."+b+", this)")));return g}},a.prototype.addProperties=function(a,b,c){var e,g,h,i,j;j=a.base.properties.slice(0),h=function(){var a;a=[];while(e=j.shift()){if(e instanceof f){g=e.variable.base,delete e.context,i=e.value;if(g.value==="constructor"){if(this.ctor)throw new Error("cannot define more than one constructor in a class");if(i.bound)throw new Error("cannot define a constructor as a bound function");i instanceof l?e=this.ctor=i:(this.externalCtor=c.scope.freeVariable("class"),e=new f(new B(this.externalCtor),i))}else e.variable["this"]||(e.variable=new W(new B(b),[new d(g,"proto")])),i instanceof l&&i.bound&&(this.boundFuncs.push(g),i.bound=!1)}a.push(e)}return a}.call(this);return Z(h)},a.prototype.walkBody=function(b,c){return this.traverseChildren(!1,bl(function(d){var e,f,g,i,j;if(d instanceof a)return!1;if(d instanceof h){j=e=d.expressions;for(f=0,i=j.length;f<i;f++)g=j[f],g instanceof W&&g.isObject(!0)&&(e[f]=this.addProperties(g,b,c));return d.expressions=e=bb(e)}},this))},a.prototype.ensureConstructor=function(a){this.ctor||(this.ctor=new l,this.parent&&this.ctor.body.push(new B(""+a+".__super__.constructor.apply(this, arguments)")),this.externalCtor&&this.ctor.body.push(new B(""+this.externalCtor+".apply(this, arguments)")),this.body.expressions.unshift(this.ctor)),this.ctor.ctor=this.ctor.name=a,this.ctor.klass=null;return this.ctor.noReturn=!0},a.prototype.compileNode=function(a){var b,c,d,e;b=this.determineName(),e=b||this.name||"_Class",d=new B(e),this.setContext(e),this.walkBody(e,a),this.ensureConstructor(e),this.parent&&this.body.expressions.unshift(new o(d,this.parent)),this.ctor instanceof l||this.body.expressions.unshift(this.ctor),this.body.expressions.push(d),this.addBoundFunctions(a),c=new I(k.wrap(this.body),!0),this.variable&&(c=new f(this.variable,c));return c.compile(a)};return a}(),b.Assign=f=function(){function a(a,b,c,d){this.variable=a,this.value=b,this.context=c,this.param=d&&d.param}bk(a,g),a.prototype.children=["variable","value"],a.prototype.assigns=function(a){return this[this.context==="object"?"value":"variable"].assigns(a)},a.prototype.unfoldSoak=function(a){return bg(a,this,"variable")},a.prototype.compileNode=function(a){var b,c,d,e,f;if(b=this.variable instanceof W){if(this.variable.isArray()||this.variable.isObject())return this.compilePatternMatch(a);if(this.variable.isSplice())return this.compileSplice(a);if((f=this.context)==="||="||f==="&&="||f==="?=")return this.compileConditional(a)}d=this.variable.compile(a,x);if(!this.context&&!this.variable.isAssignable())throw SyntaxError('"'+this.variable.compile(a)+'" cannot be assigned.');this.context||b&&(this.variable.namespaced||this.variable.hasProperties())||(this.param?a.scope.add(d,"var"):a.scope.find(d)),this.value instanceof l&&(c=C.exec(d))&&(this.value.name=c[2],c[1]&&(this.value.klass=c[1])),e=this.value.compile(a,x);if(this.context==="object")return""+d+": "+e;e=d+(" "+(this.context||"=")+" ")+e;return a.level<=x?e:"("+e+")"},a.prototype.compilePatternMatch=function(b){var c,e,f,g,h,i,j,k,l,m,n,o,p,r,s,t,v,w,z,C,D,E;r=b.level===A,t=this.value,l=this.variable.base.objects;if(!(m=l.length)){f=t.compile(b);return b.level>=y?"("+f+")":f}i=this.variable.isObject();if(!r||m!==1||(k=l[0])instanceof P){v=t.compile(b,x),e=[],p=!1;if(!q.test(v)||this.variable.assigns(v))e.push(""+(n=b.scope.freeVariable("ref"))+" = "+v),v=n;for(g=0,w=l.length;g<w;g++){k=l[g],h=g,i&&(k instanceof a?(D=k,h=D.variable.base,k=D.value):k.base instanceof I?(E=(new W(k.unwrapAll())).cacheReference(b),k=E[0],h=E[1]):h=k["this"]?k.properties[0].name:k);if(!p&&k instanceof P)s=""+m+" <= "+v+".length ? "+bh("slice")+".call("+v+", "+g,(o=m-g-1)?(j=b.scope.freeVariable("i"),s+=", "+j+" = "+v+".length - "+o+") : ("+j+" = "+g+", [])"):s+=") : []",s=new B(s),p=""+j+"++";else{if(k instanceof P){k=k.name.compile(b);throw SyntaxError("multiple splats are disallowed in an assignment: "+k+" ...")}typeof h=="number"?(h=new B(p||h),c=!1):c=i&&q.test(h.unwrap().value||0),s=new W(new B(v),[new(c?d:u)(h)])}e.push((new a(k,s,null,{param:this.param})).compile(b,A))}r||e.push(v),f=e.join(", ");return b.level<x?f:"("+f+")"}k instanceof a?(z=k,h=z.variable.base,k=z.value):k.base instanceof I?(C=(new W(k.unwrapAll())).cacheReference(b),k=C[0],h=C[1]):h=i?k["this"]?k.properties[0].name:k:new B(0),c=q.test(h.unwrap().value||0),t=new W(t),t.properties.push(new(c?d:u)(h));return(new a(k,t,null,{param:this.param})).compile(b,A)},a.prototype.compileConditional=function(b){var c,d,e;e=this.variable.cacheReference(b),c=e[0],d=e[1],bm.call(this.context,"?")>=0&&(b.isExistentialEquals=!0);return(new G(this.context.slice(0,-1),c,new a(d,this.value,"="))).compile(b)},a.prototype.compileSplice=function(a){var b,c,d,e,f,g,h,i,j,k,l,m;k=this.variable.properties.pop().range,d=k.from,h=k.to,c=k.exclusive,g=this.variable.compile(a),l=(d!=null?d.cache(a,y):void 0)||["0","0"],e=l[0],f=l[1],h?(d!=null?d.isSimpleNumber():void 0)&&h.isSimpleNumber()?(h=+h.compile(a)- +f,c||(h+=1)):(h=h.compile(a)+" - "+f,c||(h+=" + 1")):h="9e9",m=this.value.cache(a,x),i=m[0],j=m[1],b="[].splice.apply("+g+", ["+e+", "+h+"].concat("+i+")), "+j;return a.level>A?"("+b+")":b};return a}(),b.Code=l=function(){function a(a,b,c){this.params=a||[],this.body=b||new h,this.bound=c==="boundfunc",this.bound&&(this.context="this")}bk(a,g),a.prototype.children=["params","body"],a.prototype.isStatement=function(){return!!this.ctor},a.prototype.jumps=E,a.prototype.compileNode=function(a){var b,c,d,g,h,i,j,k,l,m,n,o,p,q,r,t,u,w,x,y,z,A,C,D;a.scope=new N(a.scope,this.body,this),a.scope.shared=$(a,"sharedScope"),a.indent+=R,delete a.bare,o=[],c=[],z=this.params;for(q=0,u=z.length;q<u;q++){j=z[q];if(j.splat){A=this.params;for(r=0,w=A.length;r<w;r++)i=A[r],i.name.value&&a.scope.add(i.name.value,"var",!0);l=new f(new W(new e(function(){var b,c,d,e;d=this.params,e=[];for(b=0,c=d.length;b<c;b++)i=d[b],e.push(i.asReference(a));return e}.call(this))),new W(new B("arguments")));break}}C=this.params;for(t=0,x=C.length;t<x;t++)j=C[t],j.isComplex()?(n=k=j.asReference(a),j.value&&(n=new G("?",k,j.value)),c.push(new f(new W(j.name),n,"=",{param:!0}))):(k=j,j.value&&(h=new B(k.name.value+" == null"),n=new f(new W(j.name),j.value,"="),c.push(new s(h,n)))),l||o.push(k);p=this.body.isEmpty(),l&&c.unshift(l),c.length&&(D=this.body.expressions).unshift.apply(D,c);if(!l)for(d=0,y=o.length;d<y;d++)m=o[d],a.scope.parameter(o[d]=m.compile(a));!p&&!this.noReturn&&this.body.makeReturn(),g=a.indent,b="function",this.ctor&&(b+=" "+this.name),b+="("+o.join(", ")+") {",this.body.isEmpty()||(b+="\n"+this.body.compileWithDeclarations(a)+"\n"+this.tab),b+="}";return this.ctor?this.tab+b:this.bound?bh("bind")+("("+b+", "+this.context+")"):this.front||a.level>=v?"("+b+")":b},a.prototype.traverseChildren=function(b,c){if(b)return a.__super__.traverseChildren.call(this,b,c)};return a}(),b.Param=H=function(){function a(a,b,c){this.name=a,this.value=b,this.splat=c}bk(a,g),a.prototype.children=["name","value"],a.prototype.compile=function(a){return this.name.compile(a,x)},a.prototype.asReference=function(a){var b;if(this.reference)return this.reference;b=this.name,b["this"]?(b=b.properties[0].name,b.value.reserved&&(b=new B("_"+b.value))):b.isComplex()&&(b=new B(a.scope.freeVariable("arg"))),b=new W(b),this.splat&&(b=new P(b));return this.reference=b},a.prototype.isComplex=function(){return this.name.isComplex()};return a}(),b.Splat=P=function(){function a(a){this.name=a.compile?a:new B(a)}bk(a,g),a.prototype.children=["name"],a.prototype.isAssignable=Y,a.prototype.assigns=function(a){return this.name.assigns(a)},a.prototype.compile=function(a){return this.index!=null?this.compileParam(a):this.name.compile(a)},a.compileSplattedArray=function(b,c,d){var e,f,g,h,i,j,k;i=-1;while((j=c[++i])&&!(j instanceof a))continue;if(i>=c.length)return"";if(c.length===1){g=c[0].compile(b,x);return d?g:""+bh("slice")+".call("+g+")"}e=c.slice(i);for(h=0,k=e.length;h<k;h++)j=e[h],g=j.compile(b,x),e[h]=j instanceof a?""+bh("slice")+".call("+g+")":"["+g+"]";if(i===0)return e[0]+(".concat("+e.slice(1).join(", ")+")");f=function(){var a,d,e,f;e=c.slice(0,i),f=[];for(a=0,d=e.length;a<d;a++)j=e[a],f.push(j.compile(b,x));return f}();return"["+f.join(", ")+"].concat("+e.join(", ")+")"};return a}(),b.While=X=function(){function a(a,b){this.condition=(b!=null?b.invert:void 0)?a.invert():a,this.guard=b!=null?b.guard:void 0}bk(a,g),a.prototype.children=["condition","guard","body"],a.prototype.isStatement=Y,a.prototype.makeReturn=function(){this.returns=!0;return this},a.prototype.addBody=function(a){this.body=a;return this},a.prototype.jumps=function(){var a,b,c,d;a=this.body.expressions;if(!a.length)return!1;for(c=0,d=a.length;c<d;c++){b=a[c];if(b.jumps({loop:!0}))return b}return!1},a.prototype.compileNode=function(a){var b,c,d,e;a.indent+=R,e="",b=this.body;if(b.isEmpty())b="";else{if(a.level>A||this.returns)d=a.scope.freeVariable("results"),e=""+this.tab+d+" = [];\n",b&&(b=J.wrap(d,b));this.guard&&(b=h.wrap([new s(this.guard,b)])),b="\n"+b.compile(a,A)+"\n"+this.tab}c=e+this.tab+("while ("+this.condition.compile(a,z)+") {"+b+"}"),this.returns&&(c+="\n"+this.tab+"return "+d+";");return c};return a}(),b.Op=G=function(){function c(b,c,d,e){var f;if(b==="in")return new t(c,d);if(b==="do"){f=new i(c,c.params||[]),f["do"]=!0;return f}if(b==="new"){if(c instanceof i&&!c["do"])return c.newInstance();if(c instanceof l&&c.bound||c["do"])c=new I(c)}this.operator=a[b]||b,this.first=c,this.second=d,this.flip=!!e;return this}var a,b;bk(c,g),a={"==":"===","!=":"!==",of:"in"},b={"!==":"===","===":"!=="},c.prototype.children=["first","second"],c.prototype.isSimpleNumber=E,c.prototype.isUnary=function(){return!this.second},c.prototype.isComplex=function(){var a;return!this.isUnary()||(a=this.operator)!=="+"&&a!=="-"||this.first.isComplex()},c.prototype.isChainable=function(){var a;return(a=this.operator)==="<"||a===">"||a===">="||a==="<="||a==="==="||a==="!=="},c.prototype.invert=function(){var a,d,e,f,g;if(this.isChainable()&&this.first.isChainable()){a=!0,d=this;while(d&&d.operator)a&&(a=d.operator in b),d=d.first;if(!a)return(new I(this)).invert();d=this;while(d&&d.operator)d.invert=!d.invert,d.operator=b[d.operator],d=d.first;return this}if(f=b[this.operator]){this.operator=f,this.first.unwrap()instanceof c&&this.first.invert();return this}return this.second?(new I(this)).invert():this.operator==="!"&&(e=this.first.unwrap())instanceof c&&((g=e.operator)==="!"||g==="in"||g==="instanceof")?e:new c("!",this)},c.prototype.unfoldSoak=function(a){var b;return((b=this.operator)==="++"||b==="--"||b==="delete")&&bg(a,this,"first")},c.prototype.compileNode=function(a){var b;if(this.isUnary())return this.compileUnary(a);if(this.isChainable()&&this.first.isChainable())return this.compileChain(a);if(this.operator==="?")return this.compileExistence(a);this.first.front=this.front,b=this.first.compile(a,y)+" "+this.operator+" "+this.second.compile(a,y);return a.level<=y?b:"("+b+")"},c.prototype.compileChain=function(a){var b,c,d,e;e=this.first.second.cache(a),this.first.second=e[0],d=e[1],c=this.first.compile(a,y),b=""+c+" "+(this.invert?"&&":"||")+" "+d.compile(a)+" "+this.operator+" "+this.second.compile(a,y);return"("+b+")"},c.prototype.compileExistence=function(a){var b,c;this.first.isComplex()?(c=new B(a.scope.freeVariable("ref")),b=new I(new f(c,this.first))):(b=this.first,c=b);return(new s(new n(b),c,{type:"if"})).addElse(this.second).compile(a)},c.prototype.compileUnary=function(a){var b,d;d=[b=this.operator],(b==="new"||b==="typeof"||b==="delete"||(b==="+"||b==="-")&&this.first instanceof c&&this.first.operator===b)&&d.push(" "),b==="new"&&this.first.isStatement(a)&&(this.first=new I(this.first)),d.push(this.first.compile(a,y)),this.flip&&d.reverse();return d.join("")},c.prototype.toString=function(a){return c.__super__.toString.call(this,a,this.constructor.name+" "+this.operator)};return c}(),b.In=t=function(){function a(a,b){this.object=a,this.array=b}bk(a,g),a.prototype.children=["object","array"],a.prototype.invert=D,a.prototype.compileNode=function(a){var b,c,d,e,f;if(this.array instanceof W&&this.array.isArray()){f=this.array.base.objects;for(d=0,e=f.length;d<e;d++){c=f[d];if(c instanceof P){b=!0;break}}if(!b)return this.compileOrTest(a)}return this.compileLoopTest(a)},a.prototype.compileOrTest=function(a){var b,c,d,e,f,g,h,i,j;i=this.object.cache(a,y),g=i[0],f=i[1],j=this.negated?[" !== "," && "]:[" === "," || "],b=j[0],c=j[1],h=function(){var c,h,i;h=this.array.base.objects,i=[];for(d=0,c=h.length;d<c;d++)e=h[d],i.push((d?f:g)+b+e.compile(a,y));return i}.call(this);if(h.length===0)return"false";h=h.join(c);return a.level<y?h:"("+h+")"},a.prototype.compileLoopTest=function(a){var b,c,d,e;e=this.object.cache(a,x),d=e[0],c=e[1],b=bh("indexOf")+(".call("+this.array.compile(a,x)+", "+c+") ")+(this.negated?"< 0":">= 0");if(d===c)return b;b=d+", "+b;return a.level<x?b:"("+b+")"},a.prototype.toString=function(b){return a.__super__.toString.call(this,b,this.constructor.name+(this.negated?"!":""))};return a}(),b.Try=U=function(){function a(a,b,c,d){this.attempt=a,this.error=b,this.recovery=c,this.ensure=d}bk(a,g),a.prototype.children=["attempt","recovery","ensure"],a.prototype.isStatement=Y,a.prototype.jumps=function(a){var b;return this.attempt.jumps(a)||((b=this.recovery)!=null?b.jumps(a):void 0)},a.prototype.makeReturn=function(){this.attempt&&(this.attempt=this.attempt.makeReturn()),this.recovery&&(this.recovery=this.recovery.makeReturn());return this},a.prototype.compileNode=function(a){var b,c;a.indent+=R,c=this.error?" ("+this.error.compile(a)+") ":" ",b=this.recovery?" catch"+c+"{\n"+this.recovery.compile(a,A)+"\n"+this.tab+"}":!this.ensure&&!this.recovery?" catch (_e) {}":void 0;return""+this.tab+"try {\n"+this.attempt.compile(a,A)+"\n"+this.tab+"}"+(b||"")+(this.ensure?" finally {\n"+this.ensure.compile(a,A)+"\n"+this.tab+"}":"")};return a}(),b.Throw=T=function(){function a(a){this.expression=a}bk(a,g),a.prototype.children=["expression"],a.prototype.isStatement=Y,a.prototype.jumps=E,a.prototype.makeReturn=S,a.prototype.compileNode=function(a){return this.tab+("throw "+this.expression.compile(a)+";")};return a}(),b.Existence=n=function(){function a(a){this.expression=a}bk(a,g),a.prototype.children=["expression"],a.prototype.invert=D,a.prototype.compileNode=function(a){var b,c,d,e;d=this.expression.compile(a,y),d=q.test(d)&&!a.scope.check(d)?(e=this.negated?["===","||"]:["!==","&&"],b=e[0],c=e[1],e,"typeof "+d+" "+b+' "undefined" '+c+" "+d+" "+b+" null"):""+d+" "+(this.negated?"==":"!=")+" null";return a.level<=w?d:"("+d+")"};return a}(),b.Parens=I=function(){function a(a){this.body=a}bk(a,g),a.prototype.children=["body"],a.prototype.unwrap=function(){return this.body},a.prototype.isComplex=function(){return this.body.isComplex()},a.prototype.makeReturn=function(){return this.body.makeReturn()},a.prototype.compileNode=function(a){var b,c,d;d=this.body.unwrap();if(d instanceof W&&d.isAtomic()){d.front=this.front;return d.compile(a)}c=d.compile(a,z),b=a.level<y&&(d instanceof G||d instanceof i||d instanceof p&&d.returns);return b?c:"("+c+")"};return a}(),b.For=p=function(){function a(a,b){var c;this.source=b.source,this.guard=b.guard,this.step=b.step,this.name=b.name,this.index=b.index,this.body=h.wrap([a]),this.own=!!b.own,this.object=!!b.object,this.object&&(c=[this.index,this.name],this.name=c[0],this.index=c[1]);if(this.index instanceof W)throw SyntaxError("index cannot be a pattern matching expression");this.range=this.source instanceof W&&this.source.base instanceof K&&!this.source.properties.length,this.pattern=this.name instanceof W;if(this.range&&this.index)throw SyntaxError("indexes do not apply to range loops");if(this.range&&this.pattern)throw SyntaxError("cannot pattern match over range loops");this.returns=!1}bk(a,g),a.prototype.children=["body","source","guard","step"],a.prototype.isStatement=Y,a.prototype.jumps=X.prototype.jumps,a.prototype.makeReturn=function(){this.returns=!0;return this},a.prototype.compileNode=function(a){var b,c,d,e,g,i,j,k,l,m,n,o,p,r,t,u,v,w,z,C,D,E,F;b=h.wrap([this.body]),l=(F=bc(b.expressions))!=null?F.jumps():void 0,l&&l instanceof L&&(this.returns=!1),w=this.range?this.source.base:this.source,v=a.scope,n=this.name&&this.name.compile(a,x),j=this.index&&this.index.compile(a,x),n&&!this.pattern&&v.find(n,{immediate:!0}),j&&v.find(j,{immediate:!0}),this.returns&&(u=v.freeVariable("results")),k=(this.range?n:j)||v.freeVariable("i"),this.step&&!this.range&&(C=v.freeVariable("step")),this.pattern&&(n=k),E="",g="",c="",i=this.tab+R,this.range?d=w.compile(bd(a,{index:k,step:this.step})):(D=this.source.compile(a,x),(n||this.own)&&!q.test(D)&&(c=""+this.tab+(p=v.freeVariable("ref"))+" = "+D+";\n",D=p),n&&!this.pattern&&(o=""+n+" = "+D+"["+k+"]"),this.object||(m=v.freeVariable("len"),e=""+k+" = 0, "+m+" = "+D+".length"+(this.step?", "+C+" = "+this.step.compile(a,y):""),z=this.step?""+k+" += "+C:""+k+"++",d=""+e+"; "+k+" < "+m+"; "+z)),this.returns&&(r=""+this.tab+u+" = [];\n",t="\n"+this.tab+"return "+u+";",b=J.wrap(u,b)),this.guard&&(b=h.wrap([new s(this.guard,b)])),this.pattern&&b.expressions.unshift(new f(this.name,new B(""+D+"["+k+"]"))),c+=this.pluckDirectCall(a,b),o&&(E="\n"+i+o+";"),this.object&&(d=""+k+" in "+D,this.own&&(g="\n"+i+"if (!"+bh("hasProp")+".call("+D+", "+k+")) continue;")),b=b.compile(bd(a,{indent:i}),A),b&&(b="\n"+b+"\n");return""+c+(r||"")+this.tab+"for ("+d+") {"+g+E+b+this.tab+"}"+(t||"")},a.prototype.pluckDirectCall=function(a,b){var c,d,e,g,h,j,k,m,n,o,p,q,r,s;d="",n=b.expressions;for(h=0,m=n.length;h<m;h++){e=n[h],e=e.unwrapAll();if(!(e instanceof i))continue;k=e.variable.unwrapAll();if(k instanceof l||k instanceof W&&((o=k.base)!=null?o.unwrapAll():void 0)instanceof l&&k.properties.length===1&&((p=(q=k.properties[0].name)!=null?q.value:void 0)==="call"||p==="apply"))g=((r=k.base)!=null?r.unwrapAll():void 0)||k,j=new B(a.scope.freeVariable("fn")),c=new W(j),k.base&&(s=[c,k],k.base=s[0],c=s[1],args.unshift(new B("this"))),b.expressions[h]=new i(c,e.args),d+=this.tab+(new f(j,g)).compile(a,A)+";\n";else continue}return d};return a}(),b.Switch=Q=function(){function a(a,b,c){this.subject=a,this.cases=b,this.otherwise=c}bk(a,g),a.prototype.children=["subject","cases","otherwise"],a.prototype.isStatement=Y,a.prototype.jumps=function(a){var b,c,d,e,f,g,h;a==null&&(a={block:!0}),f=this.cases;for(d=0,e=f.length;d<e;d++){g=f[d],c=g[0],b=g[1];if(b.jumps(a))return b}return(h=this.otherwise)!=null?h.jumps(a):void 0},a.prototype.makeReturn=function(){var a,b,c,d,e;d=this.cases;for(b=0,c=d.length;b<c;b++)a=d[b],a[1].makeReturn();(e=this.otherwise)!=null&&e.makeReturn();return this},a.prototype.compileNode=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q;i=a.indent+R,j=a.indent=i+R,d=this.tab+("switch ("+(((n=this.subject)!=null?n.compile(a,z):void 0)||!1)+") {\n"),o=this.cases;for(h=0,l=o.length;h<l;h++){p=o[h],f=p[0],b=p[1],q=bb([f]);for(k=0,m=q.length;k<m;k++)e=q[k],this.subject||(e=e.invert()),d+=i+("case "+e.compile(a,z)+":\n");if(c=b.compile(a,A))d+=c+"\n";if(h===this.cases.length-1&&!this.otherwise)break;g=this.lastNonComment(b.expressions);if(g instanceof L||g instanceof B&&g.jumps()&&g.value!=="debugger")continue;d+=j+"break;\n"}this.otherwise&&this.otherwise.expressions.length&&(d+=i+("default:\n"+this.otherwise.compile(a,A)+"\n"));return d+this.tab+"}"};return a}(),b.If=s=function(){function a(a,b,c){this.body=b,c==null&&(c={}),this.condition=c.type==="unless"?a.invert():a,this.elseBody=null,this.isChain=!1,this.soak=c.soak}bk(a,g),a.prototype.children=["condition","body","elseBody"],a.prototype.bodyNode=function(){var a;return(a=this.body)!=null?a.unwrap():void 0},a.prototype.elseBodyNode=function(){var a;return(a=this.elseBody)!=null?a.unwrap():void 0},a.prototype.addElse=function(b){this.isChain?this.elseBodyNode().addElse(b):(this.isChain=b instanceof a,this.elseBody=this.ensureBlock(b));return this},a.prototype.isStatement=function(a){var b;return(a!=null?a.level:void 0)===A||this.bodyNode().isStatement(a)||((b=this.elseBodyNode())!=null?b.isStatement(a):void 0)},a.prototype.jumps=function(a){var b;return this.body.jumps(a)||((b=this.elseBody)!=null?b.jumps(a):void 0)},a.prototype.compileNode=function(a){return this.isStatement(a)?this.compileStatement(a):this.compileExpression(a)},a.prototype.makeReturn=function(){this.body&&(this.body=new h([this.body.makeReturn()])),this.elseBody&&(this.elseBody=new h([this.elseBody.makeReturn()]));return this},a.prototype.ensureBlock=function(a){return a instanceof h?a:new h([a])},a.prototype.compileStatement=function(b){var c,d,e,f,g;d=$(b,"chainChild"),f=$(b,"isExistentialEquals");if(f)return(new a(this.condition.invert(),this.elseBodyNode(),{type:"if"})).compile(b);e=this.condition.compile(b,z),b.indent+=R,c=this.ensureBlock(this.body).compile(b),c&&(c="\n"+c+"\n"+this.tab),g="if ("+e+") {"+c+"}",d||(g=this.tab+g);return this.elseBody?g+" else "+(this.isChain?(b.indent=this.tab,b.chainChild=!0,this.elseBody.unwrap().compile(b,A)):"{\n"+this.elseBody.compile(b,A)+"\n"+this.tab+"}"):g},a.prototype.compileExpression=function(a){var b,c,d,e;e=this.condition.compile(a,w),c=this.bodyNode().compile(a,x),b=this.elseBodyNode()?this.elseBodyNode().compile(a,x):"void 0",d=""+e+" ? "+c+" : "+b;return a.level>=w?"("+d+")":d},a.prototype.unfoldSoak=function(){return this.soak&&this};return a}(),J={wrap:function(a,b){return b.isEmpty()||bc(b.expressions).jumps()?b:b.push(new i(new W(new B(a),[new d(new B("push"))]),[b.pop()]))}},k={wrap:function(a,b,c){var e,f,g,j,k;if(a.jumps())return a;g=new l([],h.wrap([a])),e=[];if((j=a.contains(this.literalArgs))||a.contains(this.literalThis))k=new B(j?"apply":"call"),e=[new B("this")],j&&e.push(new B("arguments")),g=new W(g,[new d(k)]);g.noReturn=c,f=new i(g,e);return b?h.wrap([f]):f},literalArgs:function(a){return a instanceof B&&a.value==="arguments"&&!a.asKey},literalThis:function(a){return a instanceof B&&a.value==="this"&&!a.asKey||a instanceof l&&a.bound}},bg=function(a,b,c){var d;if(!!(d=b[c].unfoldSoak(a))){b[c]=d.body,d.body=new W(b);return d}},V={"extends":"function(child, parent) {\n  for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; }\n  function ctor() { this.constructor = child; }\n  ctor.prototype = parent.prototype;\n  child.prototype = new ctor;\n  child.__super__ = parent.prototype;\n  return child;\n}",bind:"function(fn, me){ return function(){ return fn.apply(me, arguments); }; }",indexOf:"Array.prototype.indexOf || function(item) {\n  for (var i = 0, l = this.length; i < l; i++) {\n    if (this[i] === item) return i;\n  }\n  return -1;\n}",hasProp:"Object.prototype.hasOwnProperty",slice:"Array.prototype.slice"},A=1,z=2,x=3,w=4,y=5,v=6,R="  ",q=/^[$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*$/,M=/^[+-]?\d+$/,C=/^(?:([$A-Za-z_][$\w\x7f-\uffff]*)\.prototype\.)?([$A-Za-z_][$\w\x7f-\uffff]*)$/,r=/^['"]/,bh=function(a){var b;b="__"+a,N.root.assign(b,V[a]);return b},be=function(a,b){return a.replace(/\n/g,"$&"+b)}}),define("ace/mode/coffee/scope",["require","exports","module","ace/mode/coffee/helpers"],function(a,b,c){var d,e,f,g;g=a("ace/mode/coffee/helpers"),e=g.extend,f=g.last,b.Scope=d=function(){function a(b,c,d){this.parent=b,this.expressions=c,this.method=d,this.variables=[{name:"arguments",type:"arguments"}],this.positions={},this.parent||(a.root=this)}a.root=null,a.prototype.add=function(a,b,c){var d;return this.shared&&!c?this.parent.add(a,b,c):typeof (d=this.positions[a])=="number"?this.variables[d].type=b:this.positions[a]=this.variables.push({name:a,type:b})-1},a.prototype.find=function(a,b){if(this.check(a,b))return!0;this.add(a,"var");return!1},a.prototype.parameter=function(a){if(!this.shared||!this.parent.check(a,!0))return this.add(a,"param")},a.prototype.check=function(a,b){var c,d;c=!!this.type(a);return c||b?c:(d=this.parent)!=null?!!d.check(a):!!void 0},a.prototype.temporary=function(a,b){return a.length>1?"_"+a+(b>1?b:""):"_"+(b+parseInt(a,36)).toString(36).replace(/\d/g,"a")},a.prototype.type=function(a){var b,c,d,e;e=this.variables;for(c=0,d=e.length;c<d;c++){b=e[c];if(b.name===a)return b.type}return null},a.prototype.freeVariable=function(a){var b,c;b=0;while(this.check(c=this.temporary(a,b)))b++;this.add(c,"var",!0);return c},a.prototype.assign=function(a,b){this.add(a,{value:b,assigned:!0});return this.hasAssignments=!0},a.prototype.hasDeclarations=function(){return!!this.declaredVariables().length},a.prototype.declaredVariables=function(){var a,b,c,d,e,f;a=[],b=[],f=this.variables;for(d=0,e=f.length;d<e;d++)c=f[d],c.type==="var"&&(c.name.charAt(0)==="_"?b:a).push(c.name);return a.sort().concat(b.sort())},a.prototype.assignedVariables=function(){var a,b,c,d,e;d=this.variables,e=[];for(b=0,c=d.length;b<c;b++)a=d[b],a.type.assigned&&e.push(""+a.name+" = "+a.type.value);return e};return a}()})
\ No newline at end of file
+"no use strict";
+
+var console = {
+    log: function(msg) {
+        postMessage({type: "log", data: msg});
+    }
+};
+var window = {
+    console: console
+};
+
+var normalizeModule = function(parentId, moduleName) {
+    // normalize plugin requires
+    if (moduleName.indexOf("!") !== -1) {
+        var chunks = moduleName.split("!");
+        return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]);
+    }
+    // normalize relative requires
+    if (moduleName.charAt(0) == ".") {
+        var base = parentId.split("/").slice(0, -1).join("/");
+        var moduleName = base + "/" + moduleName;
+        
+        while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
+            var previous = moduleName;
+            var moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
+        }
+    }
+    
+    return moduleName;
+};
+
+var require = function(parentId, id) {
+    var id = normalizeModule(parentId, id);
+    
+    var module = require.modules[id];
+    if (module) {
+        if (!module.initialized) {
+            module.exports = module.factory().exports;
+            module.initialized = true;
+        }
+        return module.exports;
+    }
+    
+    var chunks = id.split("/");
+    chunks[0] = require.tlns[chunks[0]] || chunks[0];
+    var path = chunks.join("/") + ".js";
+    
+    require.id = id;
+    importScripts(path);
+    return require(parentId, id);    
+};
+
+require.modules = {};
+require.tlns = {};
+
+var define = function(id, deps, factory) {
+    if (arguments.length == 2) {
+        factory = deps;
+    } else if (arguments.length == 1) {
+        factory = id;
+        id = require.id;
+    }
+
+    if (id.indexOf("text!") === 0) 
+        return;
+    
+    var req = function(deps, factory) {
+        return require(id, deps, factory);
+    };
+
+    require.modules[id] = {
+        factory: function() {
+            var module = {
+                exports: {}
+            };
+            var returnExports = factory(req, module.exports, module);
+            if (returnExports)
+                module.exports = returnExports;
+            return module;
+        }
+    };
+};
+
+function initBaseUrls(topLevelNamespaces) {
+    require.tlns = topLevelNamespaces;
+}
+
+function initSender() {
+
+    var EventEmitter = require(null, "ace/lib/event_emitter").EventEmitter;
+    var oop = require(null, "ace/lib/oop");
+    
+    var Sender = function() {};
+    
+    (function() {
+        
+        oop.implement(this, EventEmitter);
+                
+        this.callback = function(data, callbackId) {
+            postMessage({
+                type: "call",
+                id: callbackId,
+                data: data
+            });
+        };
+    
+        this.emit = function(name, data) {
+            postMessage({
+                type: "event",
+                name: name,
+                data: data
+            });
+        };
+        
+    }).call(Sender.prototype);
+    
+    return new Sender();
+}
+
+var main;
+var sender;
+
+onmessage = function(e) {
+    var msg = e.data;
+    if (msg.command) {
+        main[msg.command].apply(main, msg.args);
+    }
+    else if (msg.init) {        
+        initBaseUrls(msg.tlns);
+        require(null, "ace/lib/fixoldbrowsers");
+        sender = initSender();
+        var clazz = require(null, msg.module)[msg.classname];
+        main = new clazz(sender);
+    } 
+    else if (msg.event && sender) {
+        sender._emit(msg.event, msg.data);
+    }
+};
+// vim:set ts=4 sts=4 sw=4 st:
+// -- kriskowal Kris Kowal Copyright (C) 2009-2010 MIT License
+// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
+// -- dantman Daniel Friesen Copyright(C) 2010 XXX No License Specified
+// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
+// -- Irakli Gozalishvili Copyright (C) 2010 MIT License
+
+/*!
+    Copyright (c) 2009, 280 North Inc. http://280north.com/
+    MIT License. http://github.com/280north/narwhal/blob/master/README.md
+*/
+
+define('ace/lib/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/regexp', 'ace/lib/es5-shim'], function(require, exports, module) {
+"use strict";
+
+require("./regexp");
+require("./es5-shim");
+
+});/**
+ *  Based on code from:
+ *
+ * XRegExp 1.5.0
+ * (c) 2007-2010 Steven Levithan
+ * MIT License
+ * <http://xregexp.com>
+ * Provides an augmented, extensible, cross-browser implementation of regular expressions,
+ * including support for additional syntax, flags, and methods
+ */
+ 
+define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+    //---------------------------------
+    //  Private variables
+    //---------------------------------
+
+    var real = {
+            exec: RegExp.prototype.exec,
+            test: RegExp.prototype.test,
+            match: String.prototype.match,
+            replace: String.prototype.replace,
+            split: String.prototype.split
+        },
+        compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups
+        compliantLastIndexIncrement = function () {
+            var x = /^/g;
+            real.test.call(x, "");
+            return !x.lastIndex;
+        }();
+
+    //---------------------------------
+    //  Overriden native methods
+    //---------------------------------
+
+    // Adds named capture support (with backreferences returned as `result.name`), and fixes two
+    // cross-browser issues per ES3:
+    // - Captured values for nonparticipating capturing groups should be returned as `undefined`,
+    //   rather than the empty string.
+    // - `lastIndex` should not be incremented after zero-length matches.
+    RegExp.prototype.exec = function (str) {
+        var match = real.exec.apply(this, arguments),
+            name, r2;
+        if (match) {
+            // Fix browsers whose `exec` methods don't consistently return `undefined` for
+            // nonparticipating capturing groups
+            if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) {
+                r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", ""));
+                // Using `str.slice(match.index)` rather than `match[0]` in case lookahead allowed
+                // matching due to characters outside the match
+                real.replace.call(str.slice(match.index), r2, function () {
+                    for (var i = 1; i < arguments.length - 2; i++) {
+                        if (arguments[i] === undefined)
+                            match[i] = undefined;
+                    }
+                });
+            }
+            // Attach named capture properties
+            if (this._xregexp && this._xregexp.captureNames) {
+                for (var i = 1; i < match.length; i++) {
+                    name = this._xregexp.captureNames[i - 1];
+                    if (name)
+                       match[name] = match[i];
+                }
+            }
+            // Fix browsers that increment `lastIndex` after zero-length matches
+            if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index))
+                this.lastIndex--;
+        }
+        return match;
+    };
+
+    // Don't override `test` if it won't change anything
+    if (!compliantLastIndexIncrement) {
+        // Fix browser bug in native method
+        RegExp.prototype.test = function (str) {
+            // Use the native `exec` to skip some processing overhead, even though the overriden
+            // `exec` would take care of the `lastIndex` fix
+            var match = real.exec.call(this, str);
+            // Fix browsers that increment `lastIndex` after zero-length matches
+            if (match && this.global && !match[0].length && (this.lastIndex > match.index))
+                this.lastIndex--;
+            return !!match;
+        };
+    }
+
+    //---------------------------------
+    //  Private helper functions
+    //---------------------------------
+
+    function getNativeFlags (regex) {
+        return (regex.global     ? "g" : "") +
+               (regex.ignoreCase ? "i" : "") +
+               (regex.multiline  ? "m" : "") +
+               (regex.extended   ? "x" : "") + // Proposed for ES4; included in AS3
+               (regex.sticky     ? "y" : "");
+    };
+
+    function indexOf (array, item, from) {
+        if (Array.prototype.indexOf) // Use the native array method if available
+            return array.indexOf(item, from);
+        for (var i = from || 0; i < array.length; i++) {
+            if (array[i] === item)
+                return i;
+        }
+        return -1;
+    };
+
+});// vim: ts=4 sts=4 sw=4 expandtab
+// -- kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
+// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
+// -- dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
+// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
+// -- Gozala Irakli Gozalishvili Copyright (C) 2010 MIT License
+// -- kitcambridge Kit Cambridge Copyright (C) 2011 MIT License
+// -- kossnocorp Sasha Koss XXX TODO License or CLA
+// -- bryanforbes Bryan Forbes XXX TODO License or CLA
+// -- killdream Quildreen Motta Copyright (C) 2011 MIT Licence
+// -- michaelficarra Michael Ficarra Copyright (C) 2011 3-clause BSD License
+// -- sharkbrainguy Gerard Paapu Copyright (C) 2011 MIT License
+// -- bbqsrc Brendan Molloy (C) 2011 Creative Commons Zero (public domain)
+// -- iwyg XXX TODO License or CLA
+// -- DomenicDenicola Domenic Denicola Copyright (C) 2011 MIT License
+// -- xavierm02 Montillet Xavier XXX TODO License or CLA
+// -- Raynos Raynos XXX TODO License or CLA
+// -- samsonjs Sami Samhuri Copyright (C) 2010 MIT License
+// -- rwldrn Rick Waldron Copyright (C) 2011 MIT License
+// -- lexer Alexey Zakharov XXX TODO License or CLA
+
+/*!
+    Copyright (c) 2009, 280 North Inc. http://280north.com/
+    MIT License. http://github.com/280north/narwhal/blob/master/README.md
+*/
+
+define('ace/lib/es5-shim', ['require', 'exports', 'module' ], function(require, exports, module) {
+
+/**
+ * Brings an environment as close to ECMAScript 5 compliance
+ * as is possible with the facilities of erstwhile engines.
+ *
+ * Annotated ES5: http://es5.github.com/ (specific links below)
+ * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
+ *
+ * @module
+ */
+
+/*whatsupdoc*/
+
+//
+// Function
+// ========
+//
+
+// ES-5 15.3.4.5
+// http://es5.github.com/#x15.3.4.5
+
+if (!Function.prototype.bind) {
+    Function.prototype.bind = function bind(that) { // .length is 1
+        // 1. Let Target be the this value.
+        var target = this;
+        // 2. If IsCallable(Target) is false, throw a TypeError exception.
+        if (typeof target != "function")
+            throw new TypeError(); // TODO message
+        // 3. Let A be a new (possibly empty) internal list of all of the
+        //   argument values provided after thisArg (arg1, arg2 etc), in order.
+        // XXX slicedArgs will stand in for "A" if used
+        var args = slice.call(arguments, 1); // for normal call
+        // 4. Let F be a new native ECMAScript object.
+        // 11. Set the [[Prototype]] internal property of F to the standard
+        //   built-in Function prototype object as specified in 15.3.3.1.
+        // 12. Set the [[Call]] internal property of F as described in
+        //   15.3.4.5.1.
+        // 13. Set the [[Construct]] internal property of F as described in
+        //   15.3.4.5.2.
+        // 14. Set the [[HasInstance]] internal property of F as described in
+        //   15.3.4.5.3.
+        var bound = function () {
+
+            if (this instanceof bound) {
+                // 15.3.4.5.2 [[Construct]]
+                // When the [[Construct]] internal method of a function object,
+                // F that was created using the bind function is called with a
+                // list of arguments ExtraArgs, the following steps are taken:
+                // 1. Let target be the value of F's [[TargetFunction]]
+                //   internal property.
+                // 2. If target has no [[Construct]] internal method, a
+                //   TypeError exception is thrown.
+                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
+                //   property.
+                // 4. Let args be a new list containing the same values as the
+                //   list boundArgs in the same order followed by the same
+                //   values as the list ExtraArgs in the same order.
+                // 5. Return the result of calling the [[Construct]] internal 
+                //   method of target providing args as the arguments.
+
+                var F = function(){};
+                F.prototype = target.prototype;
+                var self = new F;
+
+                var result = target.apply(
+                    self,
+                    args.concat(slice.call(arguments))
+                );
+                if (result !== null && Object(result) === result)
+                    return result;
+                return self;
+
+            } else {
+                // 15.3.4.5.1 [[Call]]
+                // When the [[Call]] internal method of a function object, F,
+                // which was created using the bind function is called with a
+                // this value and a list of arguments ExtraArgs, the following
+                // steps are taken:
+                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
+                //   property.
+                // 2. Let boundThis be the value of F's [[BoundThis]] internal
+                //   property.
+                // 3. Let target be the value of F's [[TargetFunction]] internal
+                //   property.
+                // 4. Let args be a new list containing the same values as the 
+                //   list boundArgs in the same order followed by the same 
+                //   values as the list ExtraArgs in the same order.
+                // 5. Return the result of calling the [[Call]] internal method 
+                //   of target providing boundThis as the this value and 
+                //   providing args as the arguments.
+
+                // equiv: target.call(this, ...boundArgs, ...args)
+                return target.apply(
+                    that,
+                    args.concat(slice.call(arguments))
+                );
+
+            }
+
+        };
+        // XXX bound.length is never writable, so don't even try
+        //
+        // 15. If the [[Class]] internal property of Target is "Function", then
+        //     a. Let L be the length property of Target minus the length of A.
+        //     b. Set the length own property of F to either 0 or L, whichever is 
+        //       larger.
+        // 16. Else set the length own property of F to 0.
+        // 17. Set the attributes of the length own property of F to the values
+        //   specified in 15.3.5.1.
+
+        // TODO
+        // 18. Set the [[Extensible]] internal property of F to true.
+        
+        // TODO
+        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
+        // 20. Call the [[DefineOwnProperty]] internal method of F with 
+        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
+        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and 
+        //   false.
+        // 21. Call the [[DefineOwnProperty]] internal method of F with 
+        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower, 
+        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
+        //   and false.
+
+        // TODO
+        // NOTE Function objects created using Function.prototype.bind do not 
+        // have a prototype property or the [[Code]], [[FormalParameters]], and
+        // [[Scope]] internal properties.
+        // XXX can't delete prototype in pure-js.
+
+        // 22. Return F.
+        return bound;
+    };
+}
+
+// Shortcut to an often accessed properties, in order to avoid multiple
+// dereference that costs universally.
+// _Please note: Shortcuts are defined after `Function.prototype.bind` as we
+// us it in defining shortcuts.
+var call = Function.prototype.call;
+var prototypeOfArray = Array.prototype;
+var prototypeOfObject = Object.prototype;
+var slice = prototypeOfArray.slice;
+var toString = call.bind(prototypeOfObject.toString);
+var owns = call.bind(prototypeOfObject.hasOwnProperty);
+
+// If JS engine supports accessors creating shortcuts.
+var defineGetter;
+var defineSetter;
+var lookupGetter;
+var lookupSetter;
+var supportsAccessors;
+if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
+    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
+    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
+    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
+    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
+}
+
+//
+// Array
+// =====
+//
+
+// ES5 15.4.3.2
+// http://es5.github.com/#x15.4.3.2
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
+if (!Array.isArray) {
+    Array.isArray = function isArray(obj) {
+        return toString(obj) == "[object Array]";
+    };
+}
+
+// The IsCallable() check in the Array functions
+// has been replaced with a strict check on the
+// internal class of the object to trap cases where
+// the provided function was actually a regular
+// expression literal, which in V8 and
+// JavaScriptCore is a typeof "function".  Only in
+// V8 are regular expression literals permitted as
+// reduce parameters, so it is desirable in the
+// general case for the shim to match the more
+// strict and common behavior of rejecting regular
+// expressions.
+
+// ES5 15.4.4.18
+// http://es5.github.com/#x15.4.4.18
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
+if (!Array.prototype.forEach) {
+    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
+        var self = toObject(this),
+            thisp = arguments[1],
+            i = 0,
+            length = self.length >>> 0;
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        while (i < length) {
+            if (i in self) {
+                // Invoke the callback function with call, passing arguments:
+                // context, property value, property key, thisArg object context
+                fun.call(thisp, self[i], i, self);
+            }
+            i++;
+        }
+    };
+}
+
+// ES5 15.4.4.19
+// http://es5.github.com/#x15.4.4.19
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
+if (!Array.prototype.map) {
+    Array.prototype.map = function map(fun /*, thisp*/) {
+        var self = toObject(this),
+            length = self.length >>> 0,
+            result = Array(length),
+            thisp = arguments[1];
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        for (var i = 0; i < length; i++) {
+            if (i in self)
+                result[i] = fun.call(thisp, self[i], i, self);
+        }
+        return result;
+    };
+}
+
+// ES5 15.4.4.20
+// http://es5.github.com/#x15.4.4.20
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
+if (!Array.prototype.filter) {
+    Array.prototype.filter = function filter(fun /*, thisp */) {
+        var self = toObject(this),
+            length = self.length >>> 0,
+            result = [],
+            thisp = arguments[1];
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        for (var i = 0; i < length; i++) {
+            if (i in self && fun.call(thisp, self[i], i, self))
+                result.push(self[i]);
+        }
+        return result;
+    };
+}
+
+// ES5 15.4.4.16
+// http://es5.github.com/#x15.4.4.16
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
+if (!Array.prototype.every) {
+    Array.prototype.every = function every(fun /*, thisp */) {
+        var self = toObject(this),
+            length = self.length >>> 0,
+            thisp = arguments[1];
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        for (var i = 0; i < length; i++) {
+            if (i in self && !fun.call(thisp, self[i], i, self))
+                return false;
+        }
+        return true;
+    };
+}
+
+// ES5 15.4.4.17
+// http://es5.github.com/#x15.4.4.17
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
+if (!Array.prototype.some) {
+    Array.prototype.some = function some(fun /*, thisp */) {
+        var self = toObject(this),
+            length = self.length >>> 0,
+            thisp = arguments[1];
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        for (var i = 0; i < length; i++) {
+            if (i in self && fun.call(thisp, self[i], i, self))
+                return true;
+        }
+        return false;
+    };
+}
+
+// ES5 15.4.4.21
+// http://es5.github.com/#x15.4.4.21
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
+if (!Array.prototype.reduce) {
+    Array.prototype.reduce = function reduce(fun /*, initial*/) {
+        var self = toObject(this),
+            length = self.length >>> 0;
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        // no value to return if no initial value and an empty array
+        if (!length && arguments.length == 1)
+            throw new TypeError(); // TODO message
+
+        var i = 0;
+        var result;
+        if (arguments.length >= 2) {
+            result = arguments[1];
+        } else {
+            do {
+                if (i in self) {
+                    result = self[i++];
+                    break;
+                }
+
+                // if array contains no values, no initial value to return
+                if (++i >= length)
+                    throw new TypeError(); // TODO message
+            } while (true);
+        }
+
+        for (; i < length; i++) {
+            if (i in self)
+                result = fun.call(void 0, result, self[i], i, self);
+        }
+
+        return result;
+    };
+}
+
+// ES5 15.4.4.22
+// http://es5.github.com/#x15.4.4.22
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
+if (!Array.prototype.reduceRight) {
+    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
+        var self = toObject(this),
+            length = self.length >>> 0;
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        // no value to return if no initial value, empty array
+        if (!length && arguments.length == 1)
+            throw new TypeError(); // TODO message
+
+        var result, i = length - 1;
+        if (arguments.length >= 2) {
+            result = arguments[1];
+        } else {
+            do {
+                if (i in self) {
+                    result = self[i--];
+                    break;
+                }
+
+                // if array contains no values, no initial value to return
+                if (--i < 0)
+                    throw new TypeError(); // TODO message
+            } while (true);
+        }
+
+        do {
+            if (i in this)
+                result = fun.call(void 0, result, self[i], i, self);
+        } while (i--);
+
+        return result;
+    };
+}
+
+// ES5 15.4.4.14
+// http://es5.github.com/#x15.4.4.14
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
+if (!Array.prototype.indexOf) {
+    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
+        var self = toObject(this),
+            length = self.length >>> 0;
+
+        if (!length)
+            return -1;
+
+        var i = 0;
+        if (arguments.length > 1)
+            i = toInteger(arguments[1]);
+
+        // handle negative indices
+        i = i >= 0 ? i : Math.max(0, length + i);
+        for (; i < length; i++) {
+            if (i in self && self[i] === sought) {
+                return i;
+            }
+        }
+        return -1;
+    };
+}
+
+// ES5 15.4.4.15
+// http://es5.github.com/#x15.4.4.15
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
+if (!Array.prototype.lastIndexOf) {
+    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
+        var self = toObject(this),
+            length = self.length >>> 0;
+
+        if (!length)
+            return -1;
+        var i = length - 1;
+        if (arguments.length > 1)
+            i = Math.min(i, toInteger(arguments[1]));
+        // handle negative indices
+        i = i >= 0 ? i : length - Math.abs(i);
+        for (; i >= 0; i--) {
+            if (i in self && sought === self[i])
+                return i;
+        }
+        return -1;
+    };
+}
+
+//
+// Object
+// ======
+//
+
+// ES5 15.2.3.2
+// http://es5.github.com/#x15.2.3.2
+if (!Object.getPrototypeOf) {
+    // https://github.com/kriskowal/es5-shim/issues#issue/2
+    // http://ejohn.org/blog/objectgetprototypeof/
+    // recommended by fschaefer on github
+    Object.getPrototypeOf = function getPrototypeOf(object) {
+        return object.__proto__ || (
+            object.constructor ?
+            object.constructor.prototype :
+            prototypeOfObject
+        );
+    };
+}
+
+// ES5 15.2.3.3
+// http://es5.github.com/#x15.2.3.3
+if (!Object.getOwnPropertyDescriptor) {
+    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
+                         "non-object: ";
+    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
+        if ((typeof object != "object" && typeof object != "function") || object === null)
+            throw new TypeError(ERR_NON_OBJECT + object);
+        // If object does not owns property return undefined immediately.
+        if (!owns(object, property))
+            return;
+
+        var descriptor, getter, setter;
+
+        // If object has a property then it's for sure both `enumerable` and
+        // `configurable`.
+        descriptor =  { enumerable: true, configurable: true };
+
+        // If JS engine supports accessor properties then property may be a
+        // getter or setter.
+        if (supportsAccessors) {
+            // Unfortunately `__lookupGetter__` will return a getter even
+            // if object has own non getter property along with a same named
+            // inherited getter. To avoid misbehavior we temporary remove
+            // `__proto__` so that `__lookupGetter__` will return getter only
+            // if it's owned by an object.
+            var prototype = object.__proto__;
+            object.__proto__ = prototypeOfObject;
+
+            var getter = lookupGetter(object, property);
+            var setter = lookupSetter(object, property);
+
+            // Once we have getter and setter we can put values back.
+            object.__proto__ = prototype;
+
+            if (getter || setter) {
+                if (getter) descriptor.get = getter;
+                if (setter) descriptor.set = setter;
+
+                // If it was accessor property we're done and return here
+                // in order to avoid adding `value` to the descriptor.
+                return descriptor;
+            }
+        }
+
+        // If we got this far we know that object has an own property that is
+        // not an accessor so we set it as a value and return descriptor.
+        descriptor.value = object[property];
+        return descriptor;
+    };
+}
+
+// ES5 15.2.3.4
+// http://es5.github.com/#x15.2.3.4
+if (!Object.getOwnPropertyNames) {
+    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
+        return Object.keys(object);
+    };
+}
+
+// ES5 15.2.3.5
+// http://es5.github.com/#x15.2.3.5
+if (!Object.create) {
+    Object.create = function create(prototype, properties) {
+        var object;
+        if (prototype === null) {
+            object = { "__proto__": null };
+        } else {
+            if (typeof prototype != "object")
+                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
+            var Type = function () {};
+            Type.prototype = prototype;
+            object = new Type();
+            // IE has no built-in implementation of `Object.getPrototypeOf`
+            // neither `__proto__`, but this manually setting `__proto__` will
+            // guarantee that `Object.getPrototypeOf` will work as expected with
+            // objects created using `Object.create`
+            object.__proto__ = prototype;
+        }
+        if (properties !== void 0)
+            Object.defineProperties(object, properties);
+        return object;
+    };
+}
+
+// ES5 15.2.3.6
+// http://es5.github.com/#x15.2.3.6
+
+// Patch for WebKit and IE8 standard mode
+// Designed by hax <hax.github.com>
+// related issue: https://github.com/kriskowal/es5-shim/issues#issue/5
+// IE8 Reference:
+//     http://msdn.microsoft.com/en-us/library/dd282900.aspx
+//     http://msdn.microsoft.com/en-us/library/dd229916.aspx
+// WebKit Bugs:
+//     https://bugs.webkit.org/show_bug.cgi?id=36423
+
+function doesDefinePropertyWork(object) {
+    try {
+        Object.defineProperty(object, "sentinel", {});
+        return "sentinel" in object;
+    } catch (exception) {
+        // returns falsy
+    }
+}
+
+// check whether defineProperty works if it's given. Otherwise,
+// shim partially.
+if (Object.defineProperty) {
+    var definePropertyWorksOnObject = doesDefinePropertyWork({});
+    var definePropertyWorksOnDom = typeof document == "undefined" ||
+        doesDefinePropertyWork(document.createElement("div"));
+    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
+        var definePropertyFallback = Object.defineProperty;
+    }
+}
+
+if (!Object.defineProperty || definePropertyFallback) {
+    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
+    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
+    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
+                                      "on this javascript engine";
+
+    Object.defineProperty = function defineProperty(object, property, descriptor) {
+        if ((typeof object != "object" && typeof object != "function") || object === null)
+            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
+        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
+            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
+
+        // make a valiant attempt to use the real defineProperty
+        // for I8's DOM elements.
+        if (definePropertyFallback) {
+            try {
+                return definePropertyFallback.call(Object, object, property, descriptor);
+            } catch (exception) {
+                // try the shim if the real one doesn't work
+            }
+        }
+
+        // If it's a data property.
+        if (owns(descriptor, "value")) {
+            // fail silently if "writable", "enumerable", or "configurable"
+            // are requested but not supported
+            /*
+            // alternate approach:
+            if ( // can't implement these features; allow false but not true
+                !(owns(descriptor, "writable") ? descriptor.writable : true) ||
+                !(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
+                !(owns(descriptor, "configurable") ? descriptor.configurable : true)
+            )
+                throw new RangeError(
+                    "This implementation of Object.defineProperty does not " +
+                    "support configurable, enumerable, or writable."
+                );
+            */
+
+            if (supportsAccessors && (lookupGetter(object, property) ||
+                                      lookupSetter(object, property)))
+            {
+                // As accessors are supported only on engines implementing
+                // `__proto__` we can safely override `__proto__` while defining
+                // a property to make sure that we don't hit an inherited
+                // accessor.
+                var prototype = object.__proto__;
+                object.__proto__ = prototypeOfObject;
+                // Deleting a property anyway since getter / setter may be
+                // defined on object itself.
+                delete object[property];
+                object[property] = descriptor.value;
+                // Setting original `__proto__` back now.
+                object.__proto__ = prototype;
+            } else {
+                object[property] = descriptor.value;
+            }
+        } else {
+            if (!supportsAccessors)
+                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
+            // If we got that far then getters and setters can be defined !!
+            if (owns(descriptor, "get"))
+                defineGetter(object, property, descriptor.get);
+            if (owns(descriptor, "set"))
+                defineSetter(object, property, descriptor.set);
+        }
+
+        return object;
+    };
+}
+
+// ES5 15.2.3.7
+// http://es5.github.com/#x15.2.3.7
+if (!Object.defineProperties) {
+    Object.defineProperties = function defineProperties(object, properties) {
+        for (var property in properties) {
+            if (owns(properties, property))
+                Object.defineProperty(object, property, properties[property]);
+        }
+        return object;
+    };
+}
+
+// ES5 15.2.3.8
+// http://es5.github.com/#x15.2.3.8
+if (!Object.seal) {
+    Object.seal = function seal(object) {
+        // this is misleading and breaks feature-detection, but
+        // allows "securable" code to "gracefully" degrade to working
+        // but insecure code.
+        return object;
+    };
+}
+
+// ES5 15.2.3.9
+// http://es5.github.com/#x15.2.3.9
+if (!Object.freeze) {
+    Object.freeze = function freeze(object) {
+        // this is misleading and breaks feature-detection, but
+        // allows "securable" code to "gracefully" degrade to working
+        // but insecure code.
+        return object;
+    };
+}
+
+// detect a Rhino bug and patch it
+try {
+    Object.freeze(function () {});
+} catch (exception) {
+    Object.freeze = (function freeze(freezeObject) {
+        return function freeze(object) {
+            if (typeof object == "function") {
+                return object;
+            } else {
+                return freezeObject(object);
+            }
+        };
+    })(Object.freeze);
+}
+
+// ES5 15.2.3.10
+// http://es5.github.com/#x15.2.3.10
+if (!Object.preventExtensions) {
+    Object.preventExtensions = function preventExtensions(object) {
+        // this is misleading and breaks feature-detection, but
+        // allows "securable" code to "gracefully" degrade to working
+        // but insecure code.
+        return object;
+    };
+}
+
+// ES5 15.2.3.11
+// http://es5.github.com/#x15.2.3.11
+if (!Object.isSealed) {
+    Object.isSealed = function isSealed(object) {
+        return false;
+    };
+}
+
+// ES5 15.2.3.12
+// http://es5.github.com/#x15.2.3.12
+if (!Object.isFrozen) {
+    Object.isFrozen = function isFrozen(object) {
+        return false;
+    };
+}
+
+// ES5 15.2.3.13
+// http://es5.github.com/#x15.2.3.13
+if (!Object.isExtensible) {
+    Object.isExtensible = function isExtensible(object) {
+        // 1. If Type(O) is not Object throw a TypeError exception.
+        if (Object(object) === object) {
+            throw new TypeError(); // TODO message
+        }
+        // 2. Return the Boolean value of the [[Extensible]] internal property of O.
+        var name = '';
+        while (owns(object, name)) {
+            name += '?';
+        }
+        object[name] = true;
+        var returnValue = owns(object, name);
+        delete object[name];
+        return returnValue;
+    };
+}
+
+// ES5 15.2.3.14
+// http://es5.github.com/#x15.2.3.14
+if (!Object.keys) {
+    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
+    var hasDontEnumBug = true,
+        dontEnums = [
+            "toString",
+            "toLocaleString",
+            "valueOf",
+            "hasOwnProperty",
+            "isPrototypeOf",
+            "propertyIsEnumerable",
+            "constructor"
+        ],
+        dontEnumsLength = dontEnums.length;
+
+    for (var key in {"toString": null})
+        hasDontEnumBug = false;
+
+    Object.keys = function keys(object) {
+
+        if ((typeof object != "object" && typeof object != "function") || object === null)
+            throw new TypeError("Object.keys called on a non-object");
+
+        var keys = [];
+        for (var name in object) {
+            if (owns(object, name)) {
+                keys.push(name);
+            }
+        }
+
+        if (hasDontEnumBug) {
+            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
+                var dontEnum = dontEnums[i];
+                if (owns(object, dontEnum)) {
+                    keys.push(dontEnum);
+                }
+            }
+        }
+
+        return keys;
+    };
+
+}
+
+//
+// Date
+// ====
+//
+
+// ES5 15.9.5.43
+// http://es5.github.com/#x15.9.5.43
+// This function returns a String value represent the instance in time 
+// represented by this Date object. The format of the String is the Date Time 
+// string format defined in 15.9.1.15. All fields are present in the String. 
+// The time zone is always UTC, denoted by the suffix Z. If the time value of 
+// this object is not a finite Number a RangeError exception is thrown.
+if (!Date.prototype.toISOString || (new Date(-62198755200000).toISOString().indexOf('-000001') === -1)) {
+    Date.prototype.toISOString = function toISOString() {
+        var result, length, value, year;
+        if (!isFinite(this))
+            throw new RangeError;
+
+        // the date time string format is specified in 15.9.1.15.
+        result = [this.getUTCMonth() + 1, this.getUTCDate(),
+            this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
+        year = this.getUTCFullYear();
+        year = (year < 0 ? '-' : (year > 9999 ? '+' : '')) + ('00000' + Math.abs(year)).slice(0 <= year && year <= 9999 ? -4 : -6);
+
+        length = result.length;
+        while (length--) {
+            value = result[length];
+            // pad months, days, hours, minutes, and seconds to have two digits.
+            if (value < 10)
+                result[length] = "0" + value;
+        }
+        // pad milliseconds to have three digits.
+        return year + "-" + result.slice(0, 2).join("-") + "T" + result.slice(2).join(":") + "." +
+            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z";
+    }
+}
+
+// ES5 15.9.4.4
+// http://es5.github.com/#x15.9.4.4
+if (!Date.now) {
+    Date.now = function now() {
+        return new Date().getTime();
+    };
+}
+
+// ES5 15.9.5.44
+// http://es5.github.com/#x15.9.5.44
+// This function provides a String representation of a Date object for use by 
+// JSON.stringify (15.12.3).
+if (!Date.prototype.toJSON) {
+    Date.prototype.toJSON = function toJSON(key) {
+        // When the toJSON method is called with argument key, the following 
+        // steps are taken:
+
+        // 1.  Let O be the result of calling ToObject, giving it the this
+        // value as its argument.
+        // 2. Let tv be ToPrimitive(O, hint Number).
+        // 3. If tv is a Number and is not finite, return null.
+        // XXX
+        // 4. Let toISO be the result of calling the [[Get]] internal method of
+        // O with argument "toISOString".
+        // 5. If IsCallable(toISO) is false, throw a TypeError exception.
+        if (typeof this.toISOString != "function")
+            throw new TypeError(); // TODO message
+        // 6. Return the result of calling the [[Call]] internal method of
+        //  toISO with O as the this value and an empty argument list.
+        return this.toISOString();
+
+        // NOTE 1 The argument is ignored.
+
+        // NOTE 2 The toJSON function is intentionally generic; it does not
+        // require that its this value be a Date object. Therefore, it can be
+        // transferred to other kinds of objects for use as a method. However,
+        // it does require that any such object have a toISOString method. An
+        // object is free to use the argument key to filter its
+        // stringification.
+    };
+}
+
+// ES5 15.9.4.2
+// http://es5.github.com/#x15.9.4.2
+// based on work shared by Daniel Friesen (dantman)
+// http://gist.github.com/303249
+if (Date.parse("+275760-09-13T00:00:00.000Z") !== 8.64e15) {
+    // XXX global assignment won't work in embeddings that use
+    // an alternate object for the context.
+    Date = (function(NativeDate) {
+
+        // Date.length === 7
+        var Date = function Date(Y, M, D, h, m, s, ms) {
+            var length = arguments.length;
+            if (this instanceof NativeDate) {
+                var date = length == 1 && String(Y) === Y ? // isString(Y)
+                    // We explicitly pass it through parse:
+                    new NativeDate(Date.parse(Y)) :
+                    // We have to manually make calls depending on argument
+                    // length here
+                    length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
+                    length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
+                    length >= 5 ? new NativeDate(Y, M, D, h, m) :
+                    length >= 4 ? new NativeDate(Y, M, D, h) :
+                    length >= 3 ? new NativeDate(Y, M, D) :
+                    length >= 2 ? new NativeDate(Y, M) :
+                    length >= 1 ? new NativeDate(Y) :
+                                  new NativeDate();
+                // Prevent mixups with unfixed Date object
+                date.constructor = Date;
+                return date;
+            }
+            return NativeDate.apply(this, arguments);
+        };
+
+        // 15.9.1.15 Date Time String Format.
+        var isoDateExpression = new RegExp("^" +
+            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign + 6-digit extended year
+            "(?:-(\\d{2})" + // optional month capture
+            "(?:-(\\d{2})" + // optional day capture
+            "(?:" + // capture hours:minutes:seconds.milliseconds
+                "T(\\d{2})" + // hours capture
+                ":(\\d{2})" + // minutes capture
+                "(?:" + // optional :seconds.milliseconds
+                    ":(\\d{2})" + // seconds capture
+                    "(?:\\.(\\d{3}))?" + // milliseconds capture
+                ")?" +
+            "(?:" + // capture UTC offset component
+                "Z|" + // UTC capture
+                "(?:" + // offset specifier +/-hours:minutes
+                    "([-+])" + // sign capture
+                    "(\\d{2})" + // hours offset capture
+                    ":(\\d{2})" + // minutes offset capture
+                ")" +
+            ")?)?)?)?" +
+        "$");
+
+        // Copy any custom methods a 3rd party library may have added
+        for (var key in NativeDate)
+            Date[key] = NativeDate[key];
+
+        // Copy "native" methods explicitly; they may be non-enumerable
+        Date.now = NativeDate.now;
+        Date.UTC = NativeDate.UTC;
+        Date.prototype = NativeDate.prototype;
+        Date.prototype.constructor = Date;
+
+        // Upgrade Date.parse to handle simplified ISO 8601 strings
+        Date.parse = function parse(string) {
+            var match = isoDateExpression.exec(string);
+            if (match) {
+                match.shift(); // kill match[0], the full match
+                // parse months, days, hours, minutes, seconds, and milliseconds
+                for (var i = 1; i < 7; i++) {
+                    // provide default values if necessary
+                    match[i] = +(match[i] || (i < 3 ? 1 : 0));
+                    // match[1] is the month. Months are 0-11 in JavaScript
+                    // `Date` objects, but 1-12 in ISO notation, so we
+                    // decrement.
+                    if (i == 1)
+                        match[i]--;
+                }
+
+                // parse the UTC offset component
+                var minuteOffset = +match.pop(), hourOffset = +match.pop(), sign = match.pop();
+
+                // compute the explicit time zone offset if specified
+                var offset = 0;
+                if (sign) {
+                    // detect invalid offsets and return early
+                    if (hourOffset > 23 || minuteOffset > 59)
+                        return NaN;
+
+                    // express the provided time zone offset in minutes. The offset is
+                    // negative for time zones west of UTC; positive otherwise.
+                    offset = (hourOffset * 60 + minuteOffset) * 6e4 * (sign == "+" ? -1 : 1);
+                }
+
+                // Date.UTC for years between 0 and 99 converts year to 1900 + year
+                // The Gregorian calendar has a 400-year cycle, so 
+                // to Date.UTC(year + 400, .... ) - 12622780800000 == Date.UTC(year, ...),
+                // where 12622780800000 - number of milliseconds in Gregorian calendar 400 years
+                var year = +match[0];
+                if (0 <= year && year <= 99) {
+                    match[0] = year + 400;
+                    return NativeDate.UTC.apply(this, match) + offset - 12622780800000;
+                }
+
+                // compute a new UTC date value, accounting for the optional offset
+                return NativeDate.UTC.apply(this, match) + offset;
+            }
+            return NativeDate.parse.apply(this, arguments);
+        };
+
+        return Date;
+    })(Date);
+}
+
+//
+// String
+// ======
+//
+
+// ES5 15.5.4.20
+// http://es5.github.com/#x15.5.4.20
+var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
+    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
+    "\u2029\uFEFF";
+if (!String.prototype.trim || ws.trim()) {
+    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
+    // http://perfectionkills.com/whitespace-deviations/
+    ws = "[" + ws + "]";
+    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
+        trimEndRegexp = new RegExp(ws + ws + "*$");
+    String.prototype.trim = function trim() {
+        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
+    };
+}
+
+//
+// Util
+// ======
+//
+
+// ES5 9.4
+// http://es5.github.com/#x9.4
+// http://jsperf.com/to-integer
+var toInteger = function (n) {
+    n = +n;
+    if (n !== n) // isNaN
+        n = 0;
+    else if (n !== 0 && n !== (1/0) && n !== -(1/0))
+        n = (n > 0 || -1) * Math.floor(Math.abs(n));
+    return n;
+};
+
+var prepareString = "a"[0] != "a",
+    // ES5 9.9
+    // http://es5.github.com/#x9.9
+    toObject = function (o) {
+        if (o == null) { // this matches both null and undefined
+            throw new TypeError(); // TODO message
+        }
+        // If the implementation doesn't support by-index access of
+        // string characters (ex. IE < 7), split the string
+        if (prepareString && typeof o == "string" && o) {
+            return o.split("");
+        }
+        return Object(o);
+    };
+});/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
+ *      Mike de Boer <mike AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+var EventEmitter = {};
+
+EventEmitter._emit =
+EventEmitter._dispatchEvent = function(eventName, e) {
+    this._eventRegistry = this._eventRegistry || {};
+    this._defaultHandlers = this._defaultHandlers || {};
+
+    var listeners = this._eventRegistry[eventName] || [];
+    var defaultHandler = this._defaultHandlers[eventName];
+    if (!listeners.length && !defaultHandler)
+        return;
+
+    e = e || {};
+    e.type = eventName;
+    
+    if (!e.stopPropagation) {
+        e.stopPropagation = function() {
+            this.propagationStopped = true;
+        };
+    }
+    
+    if (!e.preventDefault) {
+        e.preventDefault = function() {
+            this.defaultPrevented = true;
+        };
+    }
+
+    for (var i=0; i<listeners.length; i++) {
+        listeners[i](e);
+        if (e.propagationStopped)
+            break;
+    }
+    
+    if (defaultHandler && !e.defaultPrevented)
+        defaultHandler(e);
+};
+
+EventEmitter.setDefaultHandler = function(eventName, callback) {
+    this._defaultHandlers = this._defaultHandlers || {};
+    
+    if (this._defaultHandlers[eventName])
+        throw new Error("The default handler for '" + eventName + "' is already set");
+        
+    this._defaultHandlers[eventName] = callback;
+};
+
+EventEmitter.on =
+EventEmitter.addEventListener = function(eventName, callback) {
+    this._eventRegistry = this._eventRegistry || {};
+
+    var listeners = this._eventRegistry[eventName];
+    if (!listeners)
+        var listeners = this._eventRegistry[eventName] = [];
+
+    if (listeners.indexOf(callback) == -1)
+        listeners.push(callback);
+};
+
+EventEmitter.removeListener =
+EventEmitter.removeEventListener = function(eventName, callback) {
+    this._eventRegistry = this._eventRegistry || {};
+
+    var listeners = this._eventRegistry[eventName];
+    if (!listeners)
+        return;
+
+    var index = listeners.indexOf(callback);
+    if (index !== -1)
+        listeners.splice(index, 1);
+};
+
+EventEmitter.removeAllListeners = function(eventName) {
+    if (this._eventRegistry) this._eventRegistry[eventName] = [];
+};
+
+exports.EventEmitter = EventEmitter;
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/lib/oop', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+exports.inherits = (function() {
+    var tempCtor = function() {};
+    return function(ctor, superCtor) {
+        tempCtor.prototype = superCtor.prototype;
+        ctor.super_ = superCtor.prototype;
+        ctor.prototype = new tempCtor();
+        ctor.prototype.constructor = ctor;
+    };
+}());
+
+exports.mixin = function(obj, mixin) {
+    for (var key in mixin) {
+        obj[key] = mixin[key];
+    }
+};
+
+exports.implement = function(proto, mixin) {
+    exports.mixin(proto, mixin);
+};
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+ 
+define('ace/mode/coffee_worker', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/worker/mirror', 'ace/mode/coffee/coffee-script'], function(require, exports, module) {
+"use strict";
+    
+var oop = require("../lib/oop");
+var Mirror = require("../worker/mirror").Mirror;
+var coffee = require("../mode/coffee/coffee-script");
+
+window.addEventListener = function() {};
+
+
+var Worker = exports.Worker = function(sender) {
+    Mirror.call(this, sender);
+    this.setTimeout(200);
+};
+
+oop.inherits(Worker, Mirror);
+
+(function() {
+    
+    this.onUpdate = function() {
+        var value = this.doc.getValue();
+        
+        try {
+            coffee.parse(value);
+        } catch(e) {
+            var m = e.message.match(/Parse error on line (\d+): (.*)/);
+            if (m) {
+                this.sender.emit("error", {
+                    row: parseInt(m[1]) - 1,
+                    column: null,
+                    text: m[2],
+                    type: "error"
+                });
+                return;
+            }
+            
+            if (e instanceof SyntaxError) {
+                var m = e.message.match(/ on line (\d+)/);
+                if (m) {                    
+                    this.sender.emit("error", {
+                        row: parseInt(m[1]) - 1,
+                        column: null,
+                        text: e.message.replace(m[0], ""),
+                        type: "error"
+                    });
+                }
+            }
+            return;
+        }
+        this.sender.emit("ok");
+    };
+    
+}).call(Worker.prototype);
+
+});define('ace/worker/mirror', ['require', 'exports', 'module' , 'ace/document', 'ace/lib/lang'], function(require, exports, module) {
+"use strict";
+
+var Document = require("../document").Document;
+var lang = require("../lib/lang");
+    
+var Mirror = exports.Mirror = function(sender) {
+    this.sender = sender;
+    var doc = this.doc = new Document("");
+    
+    var deferredUpdate = this.deferredUpdate = lang.deferredCall(this.onUpdate.bind(this));
+    
+    var _self = this;
+    sender.on("change", function(e) {
+        doc.applyDeltas([e.data]);        
+        deferredUpdate.schedule(_self.$timeout);
+    });
+};
+
+(function() {
+    
+    this.$timeout = 500;
+    
+    this.setTimeout = function(timeout) {
+        this.$timeout = timeout;
+    };
+    
+    this.setValue = function(value) {
+        this.doc.setValue(value);
+        this.deferredUpdate.schedule(this.$timeout);
+    };
+    
+    this.getValue = function(callbackId) {
+        this.sender.callback(this.doc.getValue(), callbackId);
+    };
+    
+    this.onUpdate = function() {
+        // abstract method
+    };
+    
+}).call(Mirror.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/range', 'ace/anchor'], function(require, exports, module) {
+"use strict";
+
+var oop = require("./lib/oop");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+var Range = require("./range").Range;
+var Anchor = require("./anchor").Anchor;
+
+var Document = function(text) {
+    this.$lines = [];
+
+    if (Array.isArray(text)) {
+        this.insertLines(0, text);
+    }
+    // There has to be one line at least in the document. If you pass an empty
+    // string to the insert function, nothing will happen. Workaround.
+    else if (text.length == 0) {
+        this.$lines = [""];
+    } else {
+        this.insert({row: 0, column:0}, text);
+    }
+};
+
+(function() {
+
+    oop.implement(this, EventEmitter);
+
+    this.setValue = function(text) {
+        var len = this.getLength();
+        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
+        this.insert({row: 0, column:0}, text);
+    };
+
+    this.getValue = function() {
+        return this.getAllLines().join(this.getNewLineCharacter());
+    };
+
+    this.createAnchor = function(row, column) {
+        return new Anchor(this, row, column);
+    };
+
+    // check for IE split bug
+    if ("aaa".split(/a/).length == 0)
+        this.$split = function(text) {
+            return text.replace(/\r\n|\r/g, "\n").split("\n");
+        }
+    else
+        this.$split = function(text) {
+            return text.split(/\r\n|\r|\n/);
+        };
+
+
+    this.$detectNewLine = function(text) {
+        var match = text.match(/^.*?(\r\n|\r|\n)/m);
+        if (match) {
+            this.$autoNewLine = match[1];
+        } else {
+            this.$autoNewLine = "\n";
+        }
+    };
+
+    this.getNewLineCharacter = function() {
+      switch (this.$newLineMode) {
+          case "windows":
+              return "\r\n";
+
+          case "unix":
+              return "\n";
+
+          case "auto":
+              return this.$autoNewLine;
+      }
+    };
+
+    this.$autoNewLine = "\n";
+    this.$newLineMode = "auto";
+    this.setNewLineMode = function(newLineMode) {
+        if (this.$newLineMode === newLineMode)
+            return;
+
+        this.$newLineMode = newLineMode;
+    };
+
+    this.getNewLineMode = function() {
+        return this.$newLineMode;
+    };
+
+    this.isNewLine = function(text) {
+        return (text == "\r\n" || text == "\r" || text == "\n");
+    };
+
+    /**
+     * Get a verbatim copy of the given line as it is in the document
+     */
+    this.getLine = function(row) {
+        return this.$lines[row] || "";
+    };
+
+    this.getLines = function(firstRow, lastRow) {
+        return this.$lines.slice(firstRow, lastRow + 1);
+    };
+
+    /**
+     * Returns all lines in the document as string array. Warning: The caller
+     * should not modify this array!
+     */
+    this.getAllLines = function() {
+        return this.getLines(0, this.getLength());
+    };
+
+    this.getLength = function() {
+        return this.$lines.length;
+    };
+
+    this.getTextRange = function(range) {
+        if (range.start.row == range.end.row) {
+            return this.$lines[range.start.row].substring(range.start.column,
+                                                         range.end.column);
+        }
+        else {
+            var lines = [];
+            lines.push(this.$lines[range.start.row].substring(range.start.column));
+            lines.push.apply(lines, this.getLines(range.start.row+1, range.end.row-1));
+            lines.push(this.$lines[range.end.row].substring(0, range.end.column));
+            return lines.join(this.getNewLineCharacter());
+        }
+    };
+
+    this.$clipPosition = function(position) {
+        var length = this.getLength();
+        if (position.row >= length) {
+            position.row = Math.max(0, length - 1);
+            position.column = this.getLine(length-1).length;
+        }
+        return position;
+    };
+
+    this.insert = function(position, text) {
+        if (text.length == 0)
+            return position;
+
+        position = this.$clipPosition(position);
+
+        if (this.getLength() <= 1)
+            this.$detectNewLine(text);
+
+        var lines = this.$split(text);
+        var firstLine = lines.splice(0, 1)[0];
+        var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
+
+        position = this.insertInLine(position, firstLine);
+        if (lastLine !== null) {
+            position = this.insertNewLine(position); // terminate first line
+            position = this.insertLines(position.row, lines);
+            position = this.insertInLine(position, lastLine || "");
+        }
+        return position;
+    };
+
+    this.insertLines = function(row, lines) {
+        if (lines.length == 0)
+            return {row: row, column: 0};
+
+        var args = [row, 0];
+        args.push.apply(args, lines);
+        this.$lines.splice.apply(this.$lines, args);
+
+        var range = new Range(row, 0, row + lines.length, 0);
+        var delta = {
+            action: "insertLines",
+            range: range,
+            lines: lines
+        };
+        this._emit("change", { data: delta });
+        return range.end;
+    };
+
+    this.insertNewLine = function(position) {
+        position = this.$clipPosition(position);
+        var line = this.$lines[position.row] || "";
+
+        this.$lines[position.row] = line.substring(0, position.column);
+        this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
+
+        var end = {
+            row : position.row + 1,
+            column : 0
+        };
+
+        var delta = {
+            action: "insertText",
+            range: Range.fromPoints(position, end),
+            text: this.getNewLineCharacter()
+        };
+        this._emit("change", { data: delta });
+
+        return end;
+    };
+
+    this.insertInLine = function(position, text) {
+        if (text.length == 0)
+            return position;
+
+        var line = this.$lines[position.row] || "";
+
+        this.$lines[position.row] = line.substring(0, position.column) + text
+                + line.substring(position.column);
+
+        var end = {
+            row : position.row,
+            column : position.column + text.length
+        };
+
+        var delta = {
+            action: "insertText",
+            range: Range.fromPoints(position, end),
+            text: text
+        };
+        this._emit("change", { data: delta });
+
+        return end;
+    };
+
+    this.remove = function(range) {
+        // clip to document
+        range.start = this.$clipPosition(range.start);
+        range.end = this.$clipPosition(range.end);
+
+        if (range.isEmpty())
+            return range.start;
+
+        var firstRow = range.start.row;
+        var lastRow = range.end.row;
+
+        if (range.isMultiLine()) {
+            var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
+            var lastFullRow = lastRow - 1;
+
+            if (range.end.column > 0)
+                this.removeInLine(lastRow, 0, range.end.column);
+
+            if (lastFullRow >= firstFullRow)
+                this.removeLines(firstFullRow, lastFullRow);
+
+            if (firstFullRow != firstRow) {
+                this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length);
+                this.removeNewLine(range.start.row);
+            }
+        }
+        else {
+            this.removeInLine(firstRow, range.start.column, range.end.column);
+        }
+        return range.start;
+    };
+
+    this.removeInLine = function(row, startColumn, endColumn) {
+        if (startColumn == endColumn)
+            return;
+
+        var range = new Range(row, startColumn, row, endColumn);
+        var line = this.getLine(row);
+        var removed = line.substring(startColumn, endColumn);
+        var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
+        this.$lines.splice(row, 1, newLine);
+
+        var delta = {
+            action: "removeText",
+            range: range,
+            text: removed
+        };
+        this._emit("change", { data: delta });
+        return range.start;
+    };
+
+    /**
+     * Removes a range of full lines
+     *
+     * @param firstRow {Integer} The first row to be removed
+     * @param lastRow {Integer} The last row to be removed
+     * @return {String[]} The removed lines
+     */
+    this.removeLines = function(firstRow, lastRow) {
+        var range = new Range(firstRow, 0, lastRow + 1, 0);
+        var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
+
+        var delta = {
+            action: "removeLines",
+            range: range,
+            nl: this.getNewLineCharacter(),
+            lines: removed
+        };
+        this._emit("change", { data: delta });
+        return removed;
+    };
+
+    this.removeNewLine = function(row) {
+        var firstLine = this.getLine(row);
+        var secondLine = this.getLine(row+1);
+
+        var range = new Range(row, firstLine.length, row+1, 0);
+        var line = firstLine + secondLine;
+
+        this.$lines.splice(row, 2, line);
+
+        var delta = {
+            action: "removeText",
+            range: range,
+            text: this.getNewLineCharacter()
+        };
+        this._emit("change", { data: delta });
+    };
+
+    this.replace = function(range, text) {
+        if (text.length == 0 && range.isEmpty())
+            return range.start;
+
+        // Shortcut: If the text we want to insert is the same as it is already
+        // in the document, we don't have to replace anything.
+        if (text == this.getTextRange(range))
+            return range.end;
+
+        this.remove(range);
+        if (text) {
+            var end = this.insert(range.start, text);
+        }
+        else {
+            end = range.start;
+        }
+
+        return end;
+    };
+
+    this.applyDeltas = function(deltas) {
+        for (var i=0; i<deltas.length; i++) {
+            var delta = deltas[i];
+            var range = Range.fromPoints(delta.range.start, delta.range.end);
+
+            if (delta.action == "insertLines")
+                this.insertLines(range.start.row, delta.lines);
+            else if (delta.action == "insertText")
+                this.insert(range.start, delta.text);
+            else if (delta.action == "removeLines")
+                this.removeLines(range.start.row, range.end.row - 1);
+            else if (delta.action == "removeText")
+                this.remove(range);
+        }
+    };
+
+    this.revertDeltas = function(deltas) {
+        for (var i=deltas.length-1; i>=0; i--) {
+            var delta = deltas[i];
+
+            var range = Range.fromPoints(delta.range.start, delta.range.end);
+
+            if (delta.action == "insertLines")
+                this.removeLines(range.start.row, range.end.row - 1);
+            else if (delta.action == "insertText")
+                this.remove(range);
+            else if (delta.action == "removeLines")
+                this.insertLines(range.start.row, delta.lines);
+            else if (delta.action == "removeText")
+                this.insert(range.start, delta.text);
+        }
+    };
+
+}).call(Document.prototype);
+
+exports.Document = Document;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/range', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+var Range = function(startRow, startColumn, endRow, endColumn) {
+    this.start = {
+        row: startRow,
+        column: startColumn
+    };
+
+    this.end = {
+        row: endRow,
+        column: endColumn
+    };
+};
+
+(function() {
+    this.isEequal = function(range) {
+        return this.start.row == range.start.row &&
+            this.end.row == range.end.row &&
+            this.start.column == range.start.column &&
+            this.end.column == range.end.column
+    };
+
+    this.toString = function() {
+        return ("Range: [" + this.start.row + "/" + this.start.column +
+            "] -> [" + this.end.row + "/" + this.end.column + "]");
+    };
+
+    this.contains = function(row, column) {
+        return this.compare(row, column) == 0;
+    };
+
+    /**
+     * Compares this range (A) with another range (B), where B is the passed in
+     * range.
+     *
+     * Return values:
+     *  -2: (B) is infront of (A) and doesn't intersect with (A)
+     *  -1: (B) begins before (A) but ends inside of (A)
+     *   0: (B) is completly inside of (A) OR (A) is complety inside of (B)
+     *  +1: (B) begins inside of (A) but ends outside of (A)
+     *  +2: (B) is after (A) and doesn't intersect with (A)
+     *
+     *  42: FTW state: (B) ends in (A) but starts outside of (A)
+     */
+    this.compareRange = function(range) {
+        var cmp,
+            end = range.end,
+            start = range.start;
+
+        cmp = this.compare(end.row, end.column);
+        if (cmp == 1) {
+            cmp = this.compare(start.row, start.column);
+            if (cmp == 1) {
+                return 2;
+            } else if (cmp == 0) {
+                return 1;
+            } else {
+                return 0;
+            }
+        } else if (cmp == -1) {
+            return -2;
+        } else {
+            cmp = this.compare(start.row, start.column);
+            if (cmp == -1) {
+                return -1;
+            } else if (cmp == 1) {
+                return 42;
+            } else {
+                return 0;
+            }
+        }
+    }
+
+    this.comparePoint = function(p) {
+        return this.compare(p.row, p.column);
+    }
+
+    this.containsRange = function(range) {
+        return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
+    }
+
+    this.isEnd = function(row, column) {
+        return this.end.row == row && this.end.column == column;
+    }
+
+    this.isStart = function(row, column) {
+        return this.start.row == row && this.start.column == column;
+    }
+
+    this.setStart = function(row, column) {
+        if (typeof row == "object") {
+            this.start.column = row.column;
+            this.start.row = row.row;
+        } else {
+            this.start.row = row;
+            this.start.column = column;
+        }
+    }
+
+    this.setEnd = function(row, column) {
+        if (typeof row == "object") {
+            this.end.column = row.column;
+            this.end.row = row.row;
+        } else {
+            this.end.row = row;
+            this.end.column = column;
+        }
+    }
+
+    this.inside = function(row, column) {
+        if (this.compare(row, column) == 0) {
+            if (this.isEnd(row, column) || this.isStart(row, column)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    this.insideStart = function(row, column) {
+        if (this.compare(row, column) == 0) {
+            if (this.isEnd(row, column)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    this.insideEnd = function(row, column) {
+        if (this.compare(row, column) == 0) {
+            if (this.isStart(row, column)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    this.compare = function(row, column) {
+        if (!this.isMultiLine()) {
+            if (row === this.start.row) {
+                return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0);
+            };
+        }
+
+        if (row < this.start.row)
+            return -1;
+
+        if (row > this.end.row)
+            return 1;
+
+        if (this.start.row === row)
+            return column >= this.start.column ? 0 : -1;
+
+        if (this.end.row === row)
+            return column <= this.end.column ? 0 : 1;
+
+        return 0;
+    };
+
+    /**
+     * Like .compare(), but if isStart is true, return -1;
+     */
+    this.compareStart = function(row, column) {
+        if (this.start.row == row && this.start.column == column) {
+            return -1;
+        } else {
+            return this.compare(row, column);
+        }
+    }
+
+    /**
+     * Like .compare(), but if isEnd is true, return 1;
+     */
+    this.compareEnd = function(row, column) {
+        if (this.end.row == row && this.end.column == column) {
+            return 1;
+        } else {
+            return this.compare(row, column);
+        }
+    }
+
+    this.compareInside = function(row, column) {
+        if (this.end.row == row && this.end.column == column) {
+            return 1;
+        } else if (this.start.row == row && this.start.column == column) {
+            return -1;
+        } else {
+            return this.compare(row, column);
+        }
+    }
+
+    this.clipRows = function(firstRow, lastRow) {
+        if (this.end.row > lastRow) {
+            var end = {
+                row: lastRow+1,
+                column: 0
+            };
+        }
+
+        if (this.start.row > lastRow) {
+            var start = {
+                row: lastRow+1,
+                column: 0
+            };
+        }
+
+        if (this.start.row < firstRow) {
+            var start = {
+                row: firstRow,
+                column: 0
+            };
+        }
+
+        if (this.end.row < firstRow) {
+            var end = {
+                row: firstRow,
+                column: 0
+            };
+        }
+        return Range.fromPoints(start || this.start, end || this.end);
+    };
+
+    this.extend = function(row, column) {
+        var cmp = this.compare(row, column);
+
+        if (cmp == 0)
+            return this;
+        else if (cmp == -1)
+            var start = {row: row, column: column};
+        else
+            var end = {row: row, column: column};
+
+        return Range.fromPoints(start || this.start, end || this.end);
+    };
+
+    this.isEmpty = function() {
+        return (this.start.row == this.end.row && this.start.column == this.end.column);
+    };
+
+    this.isMultiLine = function() {
+        return (this.start.row !== this.end.row);
+    };
+
+    this.clone = function() {
+        return Range.fromPoints(this.start, this.end);
+    };
+
+    this.collapseRows = function() {
+        if (this.end.column == 0)
+            return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0)
+        else
+            return new Range(this.start.row, 0, this.end.row, 0)
+    };
+
+    this.toScreenRange = function(session) {
+        var screenPosStart =
+            session.documentToScreenPosition(this.start);
+        var screenPosEnd =
+            session.documentToScreenPosition(this.end);
+
+        return new Range(
+            screenPosStart.row, screenPosStart.column,
+            screenPosEnd.row, screenPosEnd.column
+        );
+    };
+
+}).call(Range.prototype);
+
+
+Range.fromPoints = function(start, end) {
+    return new Range(start.row, start.column, end.row, end.column);
+};
+
+exports.Range = Range;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("./lib/oop");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+
+/**
+ * An Anchor is a floating pointer in the document. Whenever text is inserted or
+ * deleted before the cursor, the position of the cursor is updated
+ */
+var Anchor = exports.Anchor = function(doc, row, column) {
+    this.document = doc;
+    
+    if (typeof column == "undefined")
+        this.setPosition(row.row, row.column);
+    else
+        this.setPosition(row, column);
+
+    this.$onChange = this.onChange.bind(this);
+    doc.on("change", this.$onChange);
+};
+
+(function() {
+
+    oop.implement(this, EventEmitter);
+    
+    this.getPosition = function() {
+        return this.$clipPositionToDocument(this.row, this.column);
+    };
+    
+    this.getDocument = function() {
+        return this.document;
+    };
+    
+    this.onChange = function(e) {
+        var delta = e.data;
+        var range = delta.range;
+            
+        if (range.start.row == range.end.row && range.start.row != this.row)
+            return;
+            
+        if (range.start.row > this.row)
+            return;
+            
+        if (range.start.row == this.row && range.start.column > this.column)
+            return;
+    
+        var row = this.row;
+        var column = this.column;
+        
+        if (delta.action === "insertText") {
+            if (range.start.row === row && range.start.column <= column) {
+                if (range.start.row === range.end.row) {
+                    column += range.end.column - range.start.column;
+                }
+                else {
+                    column -= range.start.column;
+                    row += range.end.row - range.start.row;
+                }
+            }
+            else if (range.start.row !== range.end.row && range.start.row < row) {
+                row += range.end.row - range.start.row;
+            }
+        } else if (delta.action === "insertLines") {
+            if (range.start.row <= row) {
+                row += range.end.row - range.start.row;
+            }
+        }
+        else if (delta.action == "removeText") {
+            if (range.start.row == row && range.start.column < column) {
+                if (range.end.column >= column)
+                    column = range.start.column;
+                else
+                    column = Math.max(0, column - (range.end.column - range.start.column));
+                
+            } else if (range.start.row !== range.end.row && range.start.row < row) {
+                if (range.end.row == row) {
+                    column = Math.max(0, column - range.end.column) + range.start.column;
+                }
+                row -= (range.end.row - range.start.row);
+            }
+            else if (range.end.row == row) {
+                row -= range.end.row - range.start.row;
+                column = Math.max(0, column - range.end.column) + range.start.column;
+            }
+        } else if (delta.action == "removeLines") {
+            if (range.start.row <= row) {
+                if (range.end.row <= row)
+                    row -= range.end.row - range.start.row;
+                else {
+                    row = range.start.row;
+                    column = 0;
+                }
+            }
+        }
+
+        this.setPosition(row, column, true);
+    };
+
+    this.setPosition = function(row, column, noClip) {
+        var pos;
+        if (noClip) {
+            pos = {
+                row: row,
+                column: column
+            };
+        }
+        else {
+            pos = this.$clipPositionToDocument(row, column);
+        }
+        
+        if (this.row == pos.row && this.column == pos.column)
+            return;
+            
+        var old = {
+            row: this.row,
+            column: this.column
+        };
+        
+        this.row = pos.row;
+        this.column = pos.column;
+        this._emit("change", {
+            old: old,
+            value: pos
+        });
+    };
+    
+    this.detach = function() {
+        this.document.removeEventListener("change", this.$onChange);
+    };
+    
+    this.$clipPositionToDocument = function(row, column) {
+        var pos = {};
+    
+        if (row >= this.document.getLength()) {
+            pos.row = Math.max(0, this.document.getLength() - 1);
+            pos.column = this.document.getLine(pos.row).length;
+        }
+        else if (row < 0) {
+            pos.row = 0;
+            pos.column = 0;
+        }
+        else {
+            pos.row = row;
+            pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
+        }
+        
+        if (column < 0)
+            pos.column = 0;
+            
+        return pos;
+    };
+    
+}).call(Anchor.prototype);
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/lib/lang', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+exports.stringReverse = function(string) {
+    return string.split("").reverse().join("");
+};
+
+exports.stringRepeat = function (string, count) {
+     return new Array(count + 1).join(string);
+};
+
+var trimBeginRegexp = /^\s\s*/;
+var trimEndRegexp = /\s\s*$/;
+
+exports.stringTrimLeft = function (string) {
+    return string.replace(trimBeginRegexp, '');
+};
+
+exports.stringTrimRight = function (string) {
+    return string.replace(trimEndRegexp, '');
+};
+
+exports.copyObject = function(obj) {
+    var copy = {};
+    for (var key in obj) {
+        copy[key] = obj[key];
+    }
+    return copy;
+};
+
+exports.copyArray = function(array){
+    var copy = [];
+    for (var i=0, l=array.length; i<l; i++) {
+        if (array[i] && typeof array[i] == "object")
+            copy[i] = this.copyObject( array[i] );
+        else 
+            copy[i] = array[i];
+    }
+    return copy;
+};
+
+exports.deepCopy = function (obj) {
+    if (typeof obj != "object") {
+        return obj;
+    }
+    
+    var copy = obj.constructor();
+    for (var key in obj) {
+        if (typeof obj[key] == "object") {
+            copy[key] = this.deepCopy(obj[key]);
+        } else {
+            copy[key] = obj[key];
+        }
+    }
+    return copy;
+};
+
+exports.arrayToMap = function(arr) {
+    var map = {};
+    for (var i=0; i<arr.length; i++) {
+        map[arr[i]] = 1;
+    }
+    return map;
+
+};
+
+/**
+ * splice out of 'array' anything that === 'value'
+ */
+exports.arrayRemove = function(array, value) {
+  for (var i = 0; i <= array.length; i++) {
+    if (value === array[i]) {
+      array.splice(i, 1);
+    }
+  }
+};
+
+exports.escapeRegExp = function(str) {
+    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
+};
+
+exports.deferredCall = function(fcn) {
+
+    var timer = null;
+    var callback = function() {
+        timer = null;
+        fcn();
+    };
+
+    var deferred = function(timeout) {
+        deferred.cancel();
+        timer = setTimeout(callback, timeout || 0);
+        return deferred;
+    };
+
+    deferred.schedule = deferred;
+
+    deferred.call = function() {
+        this.cancel();
+        fcn();
+        return deferred;
+    };
+
+    deferred.cancel = function() {
+        clearTimeout(timer);
+        timer = null;
+        return deferred;
+    };
+
+    return deferred;
+};
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+ 
+define('ace/mode/coffee/coffee-script', ['require', 'exports', 'module' , 'ace/mode/coffee/lexer', 'ace/mode/coffee/parser', 'ace/mode/coffee/nodes'], function(require, exports, module) {
+    
+    var Lexer = require("./lexer").Lexer;
+    var parser = require("./parser");
+
+    var lexer = new Lexer();
+    parser.lexer = {
+        lex: function() {
+            var tag, _ref2;
+            _ref2 = this.tokens[this.pos++] || [''], tag = _ref2[0], this.yytext = _ref2[1], this.yylineno = _ref2[2];
+            return tag;
+        },
+        setInput: function(tokens) {
+            this.tokens = tokens;
+            return this.pos = 0;
+        },
+        upcomingInput: function() {
+            return "";
+        }
+    };
+    parser.yy = require('./nodes');
+    
+    exports.parse = function(code) {
+        return parser.parse(lexer.tokenize(code));
+    };
+});/**
+ * Copyright (c) 2011 Jeremy Ashkenas
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+define('ace/mode/coffee/lexer', ['require', 'exports', 'module' , 'ace/mode/coffee/rewriter', 'ace/mode/coffee/helpers'], function(require, exports, module) {
+    
+  var ASSIGNED, BOOL, CALLABLE, CODE, COFFEE_ALIASES, COFFEE_ALIAS_MAP, COFFEE_KEYWORDS, COMMENT, COMPARE, COMPOUND_ASSIGN, HEREDOC, HEREDOC_ILLEGAL, HEREDOC_INDENT, HEREGEX, HEREGEX_OMIT, IDENTIFIER, INDEXABLE, JSTOKEN, JS_FORBIDDEN, JS_KEYWORDS, LINE_BREAK, LINE_CONTINUER, LOGIC, Lexer, MATH, MULTILINER, MULTI_DENT, NOT_REGEX, NOT_SPACED_REGEX, NO_NEWLINE, NUMBER, OPERATOR, REGEX, RELATION, RESERVED, Rewriter, SHIFT, SIMPLESTR, TRAILING_SPACES, UNARY, WHITESPACE, compact, count, key, last, starts, _ref;
+  var __indexOf = Array.prototype.indexOf || function(item) {
+    for (var i = 0, l = this.length; i < l; i++) {
+      if (this[i] === item) return i;
+    }
+    return -1;
+  };
+  Rewriter = require('./rewriter').Rewriter;
+  _ref = require('./helpers'), count = _ref.count, starts = _ref.starts, compact = _ref.compact, last = _ref.last;
+  exports.Lexer = Lexer = (function() {
+    function Lexer() {}
+    Lexer.prototype.tokenize = function(code, opts) {
+      var i;
+      if (opts == null) {
+        opts = {};
+      }
+      if (WHITESPACE.test(code)) {
+        code = "\n" + code;
+      }
+      code = code.replace(/\r/g, '').replace(TRAILING_SPACES, '');
+      this.code = code;
+      this.line = opts.line || 0;
+      this.indent = 0;
+      this.indebt = 0;
+      this.outdebt = 0;
+      this.indents = [];
+      this.tokens = [];
+      i = 0;
+      while (this.chunk = code.slice(i)) {
+        i += this.identifierToken() || this.commentToken() || this.whitespaceToken() || this.lineToken() || this.heredocToken() || this.stringToken() || this.numberToken() || this.regexToken() || this.jsToken() || this.literalToken();
+      }
+      this.closeIndentation();
+      if (opts.rewrite === false) {
+        return this.tokens;
+      }
+      return (new Rewriter).rewrite(this.tokens);
+    };
+    Lexer.prototype.identifierToken = function() {
+      var colon, forcedIdentifier, id, input, match, prev, tag, _ref2, _ref3;
+      if (!(match = IDENTIFIER.exec(this.chunk))) {
+        return 0;
+      }
+      input = match[0], id = match[1], colon = match[2];
+      if (id === 'own' && this.tag() === 'FOR') {
+        this.token('OWN', id);
+        return id.length;
+      }
+      forcedIdentifier = colon || (prev = last(this.tokens)) && (((_ref2 = prev[0]) === '.' || _ref2 === '?.' || _ref2 === '::') || !prev.spaced && prev[0] === '@');
+      tag = 'IDENTIFIER';
+      if (__indexOf.call(JS_KEYWORDS, id) >= 0 || !forcedIdentifier && __indexOf.call(COFFEE_KEYWORDS, id) >= 0) {
+        tag = id.toUpperCase();
+        if (tag === 'WHEN' && (_ref3 = this.tag(), __indexOf.call(LINE_BREAK, _ref3) >= 0)) {
+          tag = 'LEADING_WHEN';
+        } else if (tag === 'FOR') {
+          this.seenFor = true;
+        } else if (tag === 'UNLESS') {
+          tag = 'IF';
+        } else if (__indexOf.call(UNARY, tag) >= 0) {
+          tag = 'UNARY';
+        } else if (__indexOf.call(RELATION, tag) >= 0) {
+          if (tag !== 'INSTANCEOF' && this.seenFor) {
+            tag = 'FOR' + tag;
+            this.seenFor = false;
+          } else {
+            tag = 'RELATION';
+            if (this.value() === '!') {
+              this.tokens.pop();
+              id = '!' + id;
+            }
+          }
+        }
+      }
+      if (__indexOf.call(JS_FORBIDDEN, id) >= 0) {
+        if (forcedIdentifier) {
+          tag = 'IDENTIFIER';
+          id = new String(id);
+          id.reserved = true;
+        } else if (__indexOf.call(RESERVED, id) >= 0) {
+          this.identifierError(id);
+        }
+      }
+      if (!forcedIdentifier) {
+        if (__indexOf.call(COFFEE_ALIASES, id) >= 0) {
+          id = COFFEE_ALIAS_MAP[id];
+        }
+        tag = (function() {
+          switch (id) {
+            case '!':
+              return 'UNARY';
+            case '==':
+            case '!=':
+              return 'COMPARE';
+            case '&&':
+            case '||':
+              return 'LOGIC';
+            case 'true':
+            case 'false':
+            case 'null':
+            case 'undefined':
+              return 'BOOL';
+            case 'break':
+            case 'continue':
+            case 'debugger':
+              return 'STATEMENT';
+            default:
+              return tag;
+          }
+        })();
+      }
+      this.token(tag, id);
+      if (colon) {
+        this.token(':', ':');
+      }
+      return input.length;
+    };
+    Lexer.prototype.numberToken = function() {
+      var match, number;
+      if (!(match = NUMBER.exec(this.chunk))) {
+        return 0;
+      }
+      number = match[0];
+      this.token('NUMBER', number);
+      return number.length;
+    };
+    Lexer.prototype.stringToken = function() {
+      var match, string;
+      switch (this.chunk.charAt(0)) {
+        case "'":
+          if (!(match = SIMPLESTR.exec(this.chunk))) {
+            return 0;
+          }
+          this.token('STRING', (string = match[0]).replace(MULTILINER, '\\\n'));
+          break;
+        case '"':
+          if (!(string = this.balancedString(this.chunk, '"'))) {
+            return 0;
+          }
+          if (0 < string.indexOf('#{', 1)) {
+            this.interpolateString(string.slice(1, -1));
+          } else {
+            this.token('STRING', this.escapeLines(string));
+          }
+          break;
+        default:
+          return 0;
+      }
+      this.line += count(string, '\n');
+      return string.length;
+    };
+    Lexer.prototype.heredocToken = function() {
+      var doc, heredoc, match, quote;
+      if (!(match = HEREDOC.exec(this.chunk))) {
+        return 0;
+      }
+      heredoc = match[0];
+      quote = heredoc.charAt(0);
+      doc = this.sanitizeHeredoc(match[2], {
+        quote: quote,
+        indent: null
+      });
+      if (quote === '"' && 0 <= doc.indexOf('#{')) {
+        this.interpolateString(doc, {
+          heredoc: true
+        });
+      } else {
+        this.token('STRING', this.makeString(doc, quote, true));
+      }
+      this.line += count(heredoc, '\n');
+      return heredoc.length;
+    };
+    Lexer.prototype.commentToken = function() {
+      var comment, here, match;
+      if (!(match = this.chunk.match(COMMENT))) {
+        return 0;
+      }
+      comment = match[0], here = match[1];
+      if (here) {
+        this.token('HERECOMMENT', this.sanitizeHeredoc(here, {
+          herecomment: true,
+          indent: Array(this.indent + 1).join(' ')
+        }));
+        this.token('TERMINATOR', '\n');
+      }
+      this.line += count(comment, '\n');
+      return comment.length;
+    };
+    Lexer.prototype.jsToken = function() {
+      var match, script;
+      if (!(this.chunk.charAt(0) === '`' && (match = JSTOKEN.exec(this.chunk)))) {
+        return 0;
+      }
+      this.token('JS', (script = match[0]).slice(1, -1));
+      return script.length;
+    };
+    Lexer.prototype.regexToken = function() {
+      var match, prev, regex, _ref2;
+      if (this.chunk.charAt(0) !== '/') {
+        return 0;
+      }
+      if (match = HEREGEX.exec(this.chunk)) {
+        this.line += count(match[0], '\n');        
+        return this.heregexToken(match);
+      }
+      prev = last(this.tokens);
+      if (prev && (_ref2 = prev[0], __indexOf.call((prev.spaced ? NOT_REGEX : NOT_SPACED_REGEX), _ref2) >= 0)) {
+        return 0;
+      }
+      if (!(match = REGEX.exec(this.chunk))) {
+        return 0;
+      }
+      regex = match[0];
+      this.token('REGEX', regex === '//' ? '/(?:)/' : regex);
+      return regex.length;
+    };
+    Lexer.prototype.heregexToken = function(match) {
+      var body, flags, heregex, re, tag, tokens, value, _i, _len, _ref2, _ref3, _ref4, _ref5;
+      heregex = match[0], body = match[1], flags = match[2];
+      if (0 > body.indexOf('#{')) {
+        re = body.replace(HEREGEX_OMIT, '').replace(/\//g, '\\/');
+        this.token('REGEX', "/" + (re || '(?:)') + "/" + flags);
+        return heregex.length;
+      }
+      this.token('IDENTIFIER', 'RegExp');
+      this.tokens.push(['CALL_START', '(']);
+      tokens = [];
+      _ref2 = this.interpolateString(body, {
+        regex: true
+      });
+      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+        _ref3 = _ref2[_i], tag = _ref3[0], value = _ref3[1];
+        if (tag === 'TOKENS') {
+          tokens.push.apply(tokens, value);
+        } else {
+          if (!(value = value.replace(HEREGEX_OMIT, ''))) {
+            continue;
+          }
+          value = value.replace(/\\/g, '\\\\');
+          tokens.push(['STRING', this.makeString(value, '"', true)]);
+        }
+        tokens.push(['+', '+']);
+      }
+      tokens.pop();
+      if (((_ref4 = tokens[0]) != null ? _ref4[0] : void 0) !== 'STRING') {
+        this.tokens.push(['STRING', '""'], ['+', '+']);
+      }
+      (_ref5 = this.tokens).push.apply(_ref5, tokens);
+      if (flags) {
+        this.tokens.push([',', ','], ['STRING', '"' + flags + '"']);
+      }
+      this.token(')', ')');
+      return heregex.length;
+    };
+    Lexer.prototype.lineToken = function() {
+      var diff, indent, match, noNewlines, prev, size;
+      if (!(match = MULTI_DENT.exec(this.chunk))) {
+        return 0;
+      }
+      indent = match[0];
+      this.line += count(indent, '\n');
+      prev = last(this.tokens, 1);
+      size = indent.length - 1 - indent.lastIndexOf('\n');
+      noNewlines = this.unfinished();
+      if (size - this.indebt === this.indent) {
+        if (noNewlines) {
+          this.suppressNewlines();
+        } else {
+          this.newlineToken();
+        }
+        return indent.length;
+      }
+      if (size > this.indent) {
+        if (noNewlines) {
+          this.indebt = size - this.indent;
+          this.suppressNewlines();
+          return indent.length;
+        }
+        diff = size - this.indent + this.outdebt;
+        this.token('INDENT', diff);
+        this.indents.push(diff);
+        this.outdebt = this.indebt = 0;
+      } else {
+        this.indebt = 0;
+        this.outdentToken(this.indent - size, noNewlines);
+      }
+      this.indent = size;
+      return indent.length;
+    };
+    Lexer.prototype.outdentToken = function(moveOut, noNewlines, close) {
+      var dent, len;
+      while (moveOut > 0) {
+        len = this.indents.length - 1;
+        if (this.indents[len] === void 0) {
+          moveOut = 0;
+        } else if (this.indents[len] === this.outdebt) {
+          moveOut -= this.outdebt;
+          this.outdebt = 0;
+        } else if (this.indents[len] < this.outdebt) {
+          this.outdebt -= this.indents[len];
+          moveOut -= this.indents[len];
+        } else {
+          dent = this.indents.pop() - this.outdebt;
+          moveOut -= dent;
+          this.outdebt = 0;
+          this.token('OUTDENT', dent);
+        }
+      }
+      if (dent) {
+        this.outdebt -= moveOut;
+      }
+      if (!(this.tag() === 'TERMINATOR' || noNewlines)) {
+        this.token('TERMINATOR', '\n');
+      }
+      return this;
+    };
+    Lexer.prototype.whitespaceToken = function() {
+      var match, nline, prev;
+      if (!((match = WHITESPACE.exec(this.chunk)) || (nline = this.chunk.charAt(0) === '\n'))) {
+        return 0;
+      }
+      prev = last(this.tokens);
+      if (prev) {
+        prev[match ? 'spaced' : 'newLine'] = true;
+      }
+      if (match) {
+        return match[0].length;
+      } else {
+        return 0;
+      }
+    };
+    Lexer.prototype.newlineToken = function() {
+      if (this.tag() !== 'TERMINATOR') {
+        this.token('TERMINATOR', '\n');
+      }
+      return this;
+    };
+    Lexer.prototype.suppressNewlines = function() {
+      if (this.value() === '\\') {
+        this.tokens.pop();
+      }
+      return this;
+    };
+    Lexer.prototype.literalToken = function() {
+      var match, prev, tag, value, _ref2, _ref3, _ref4, _ref5;
+      if (match = OPERATOR.exec(this.chunk)) {
+        value = match[0];
+        if (CODE.test(value)) {
+          this.tagParameters();
+        }
+      } else {
+        value = this.chunk.charAt(0);
+      }
+      tag = value;
+      prev = last(this.tokens);
+      if (value === '=' && prev) {
+        if (!prev[1].reserved && (_ref2 = prev[1], __indexOf.call(JS_FORBIDDEN, _ref2) >= 0)) {
+          this.assignmentError();
+        }
+        if ((_ref3 = prev[1]) === '||' || _ref3 === '&&') {
+          prev[0] = 'COMPOUND_ASSIGN';
+          prev[1] += '=';
+          return value.length;
+        }
+      }
+      if (value === ';') {
+        tag = 'TERMINATOR';
+      } else if (__indexOf.call(MATH, value) >= 0) {
+        tag = 'MATH';
+      } else if (__indexOf.call(COMPARE, value) >= 0) {
+        tag = 'COMPARE';
+      } else if (__indexOf.call(COMPOUND_ASSIGN, value) >= 0) {
+        tag = 'COMPOUND_ASSIGN';
+      } else if (__indexOf.call(UNARY, value) >= 0) {
+        tag = 'UNARY';
+      } else if (__indexOf.call(SHIFT, value) >= 0) {
+        tag = 'SHIFT';
+      } else if (__indexOf.call(LOGIC, value) >= 0 || value === '?' && (prev != null ? prev.spaced : void 0)) {
+        tag = 'LOGIC';
+      } else if (prev && !prev.spaced) {
+        if (value === '(' && (_ref4 = prev[0], __indexOf.call(CALLABLE, _ref4) >= 0)) {
+          if (prev[0] === '?') {
+            prev[0] = 'FUNC_EXIST';
+          }
+          tag = 'CALL_START';
+        } else if (value === '[' && (_ref5 = prev[0], __indexOf.call(INDEXABLE, _ref5) >= 0)) {
+          tag = 'INDEX_START';
+          switch (prev[0]) {
+            case '?':
+              prev[0] = 'INDEX_SOAK';
+              break;
+            case '::':
+              prev[0] = 'INDEX_PROTO';
+          }
+        }
+      }
+      this.token(tag, value);
+      return value.length;
+    };
+    Lexer.prototype.sanitizeHeredoc = function(doc, options) {
+      var attempt, herecomment, indent, match, _ref2;
+      indent = options.indent, herecomment = options.herecomment;
+      if (herecomment) {
+        if (HEREDOC_ILLEGAL.test(doc)) {
+          throw new Error("block comment cannot contain \"*/\", starting on line " + (this.line + 1));
+        }
+        if (doc.indexOf('\n') <= 0) {
+          return doc;
+        }
+      } else {
+        while (match = HEREDOC_INDENT.exec(doc)) {
+          attempt = match[1];
+          if (indent === null || (0 < (_ref2 = attempt.length) && _ref2 < indent.length)) {
+            indent = attempt;
+          }
+        }
+      }
+      if (indent) {
+        doc = doc.replace(RegExp("\\n" + indent, "g"), '\n');
+      }
+      if (!herecomment) {
+        doc = doc.replace(/^\n/, '');
+      }
+      return doc;
+    };
+    Lexer.prototype.tagParameters = function() {
+      var i, stack, tok, tokens;
+      if (this.tag() !== ')') {
+        return this;
+      }
+      stack = [];
+      tokens = this.tokens;
+      i = tokens.length;
+      tokens[--i][0] = 'PARAM_END';
+      while (tok = tokens[--i]) {
+        switch (tok[0]) {
+          case ')':
+            stack.push(tok);
+            break;
+          case '(':
+          case 'CALL_START':
+            if (stack.length) {
+              stack.pop();
+            } else if (tok[0] === '(') {
+              tok[0] = 'PARAM_START';
+              return this;
+            }
+        }
+      }
+      return this;
+    };
+    Lexer.prototype.closeIndentation = function() {
+      return this.outdentToken(this.indent);
+    };
+    Lexer.prototype.identifierError = function(word) {
+      throw SyntaxError("Reserved word \"" + word + "\" on line " + (this.line + 1));
+    };
+    Lexer.prototype.assignmentError = function() {
+      throw SyntaxError("Reserved word \"" + (this.value()) + "\" on line " + (this.line + 1) + " can't be assigned");
+    };
+    Lexer.prototype.balancedString = function(str, end) {
+      var i, letter, prev, stack, _ref2;
+      stack = [end];
+      for (i = 1, _ref2 = str.length; 1 <= _ref2 ? i < _ref2 : i > _ref2; 1 <= _ref2 ? i++ : i--) {
+        switch (letter = str.charAt(i)) {
+          case '\\':
+            i++;
+            continue;
+          case end:
+            stack.pop();
+            if (!stack.length) {
+              return str.slice(0, i + 1);
+            }
+            end = stack[stack.length - 1];
+            continue;
+        }
+        if (end === '}' && (letter === '"' || letter === "'")) {
+          stack.push(end = letter);
+        } else if (end === '}' && letter === '{') {
+          stack.push(end = '}');
+        } else if (end === '"' && prev === '#' && letter === '{') {
+          stack.push(end = '}');
+        }
+        prev = letter;
+      }
+      throw new Error("missing " + (stack.pop()) + ", starting on line " + (this.line + 1));
+    };
+    Lexer.prototype.interpolateString = function(str, options) {
+      var expr, heredoc, i, inner, interpolated, len, letter, nested, pi, regex, tag, tokens, value, _len, _ref2, _ref3, _ref4;
+      if (options == null) {
+        options = {};
+      }
+      heredoc = options.heredoc, regex = options.regex;
+      tokens = [];
+      pi = 0;
+      i = -1;
+      while (letter = str.charAt(i += 1)) {
+        if (letter === '\\') {
+          i += 1;
+          continue;
+        }
+        if (!(letter === '#' && str.charAt(i + 1) === '{' && (expr = this.balancedString(str.slice(i + 1), '}')))) {
+          continue;
+        }
+        if (pi < i) {
+          tokens.push(['NEOSTRING', str.slice(pi, i)]);
+        }
+        inner = expr.slice(1, -1);
+        if (inner.length) {
+          nested = new Lexer().tokenize(inner, {
+            line: this.line,
+            rewrite: false
+          });
+          nested.pop();
+          if (((_ref2 = nested[0]) != null ? _ref2[0] : void 0) === 'TERMINATOR') {
+            nested.shift();
+          }
+          if (len = nested.length) {
+            if (len > 1) {
+              nested.unshift(['(', '(']);
+              nested.push([')', ')']);
+            }
+            tokens.push(['TOKENS', nested]);
+          }
+        }
+        i += expr.length;
+        pi = i + 1;
+      }
+      if ((i > pi && pi < str.length)) {
+        tokens.push(['NEOSTRING', str.slice(pi)]);
+      }
+      if (regex) {
+        return tokens;
+      }
+      if (!tokens.length) {
+        return this.token('STRING', '""');
+      }
+      if (tokens[0][0] !== 'NEOSTRING') {
+        tokens.unshift(['', '']);
+      }
+      if (interpolated = tokens.length > 1) {
+        this.token('(', '(');
+      }
+      for (i = 0, _len = tokens.length; i < _len; i++) {
+        _ref3 = tokens[i], tag = _ref3[0], value = _ref3[1];
+        if (i) {
+          this.token('+', '+');
+        }
+        if (tag === 'TOKENS') {
+          (_ref4 = this.tokens).push.apply(_ref4, value);
+        } else {
+          this.token('STRING', this.makeString(value, '"', heredoc));
+        }
+      }
+      if (interpolated) {
+        this.token(')', ')');
+      }
+      return tokens;
+    };
+    Lexer.prototype.token = function(tag, value) {
+      return this.tokens.push([tag, value, this.line]);
+    };
+    Lexer.prototype.tag = function(index, tag) {
+      var tok;
+      return (tok = last(this.tokens, index)) && (tag ? tok[0] = tag : tok[0]);
+    };
+    Lexer.prototype.value = function(index, val) {
+      var tok;
+      return (tok = last(this.tokens, index)) && (val ? tok[1] = val : tok[1]);
+    };
+    Lexer.prototype.unfinished = function() {
+      var prev, value;
+      return LINE_CONTINUER.test(this.chunk) || (prev = last(this.tokens, 1)) && prev[0] !== '.' && (value = this.value()) && !value.reserved && NO_NEWLINE.test(value) && !CODE.test(value) && !ASSIGNED.test(this.chunk);
+    };
+    Lexer.prototype.escapeLines = function(str, heredoc) {
+      return str.replace(MULTILINER, heredoc ? '\\n' : '');
+    };
+    Lexer.prototype.makeString = function(body, quote, heredoc) {
+      if (!body) {
+        return quote + quote;
+      }
+      body = body.replace(/\\([\s\S])/g, function(match, contents) {
+        if (contents === '\n' || contents === quote) {
+          return contents;
+        } else {
+          return match;
+        }
+      });
+      body = body.replace(RegExp("" + quote, "g"), '\\$&');
+      return quote + this.escapeLines(body, heredoc) + quote;
+    };
+    return Lexer;
+  })();
+  JS_KEYWORDS = ['true', 'false', 'null', 'this', 'new', 'delete', 'typeof', 'in', 'instanceof', 'return', 'throw', 'break', 'continue', 'debugger', 'if', 'else', 'switch', 'for', 'while', 'do', 'try', 'catch', 'finally', 'class', 'extends', 'super'];
+  COFFEE_KEYWORDS = ['undefined', 'then', 'unless', 'until', 'loop', 'of', 'by', 'when'];
+  COFFEE_ALIAS_MAP = {
+    and: '&&',
+    or: '||',
+    is: '==',
+    isnt: '!=',
+    not: '!',
+    yes: 'true',
+    no: 'false',
+    on: 'true',
+    off: 'false'
+  };
+  COFFEE_ALIASES = (function() {
+    var _results;
+    _results = [];
+    for (key in COFFEE_ALIAS_MAP) {
+      _results.push(key);
+    }
+    return _results;
+  })();
+  COFFEE_KEYWORDS = COFFEE_KEYWORDS.concat(COFFEE_ALIASES);
+  RESERVED = ['case', 'default', 'function', 'var', 'void', 'with', 'const', 'let', 'enum', 'export', 'import', 'native', '__hasProp', '__extends', '__slice', '__bind', '__indexOf'];
+  JS_FORBIDDEN = JS_KEYWORDS.concat(RESERVED);
+  exports.RESERVED = RESERVED.concat(JS_KEYWORDS).concat(COFFEE_KEYWORDS);
+  IDENTIFIER = /^([$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*)([^\n\S]*:(?!:))?/;
+  NUMBER = /^0x[\da-f]+|^(?:\d+(\.\d+)?|\.\d+)(?:e[+-]?\d+)?/i;
+  HEREDOC = /^("""|''')([\s\S]*?)(?:\n[^\n\S]*)?\1/;
+  OPERATOR = /^(?:[-=]>|[-+*\/%<>&|^!?=]=|>>>=?|([-+:])\1|([&|<>])\2=?|\?\.|\.{2,3})/;
+  WHITESPACE = /^[^\n\S]+/;
+  COMMENT = /^###([^#][\s\S]*?)(?:###[^\n\S]*|(?:###)?$)|^(?:\s*#(?!##[^#]).*)+/;
+  CODE = /^[-=]>/;
+  MULTI_DENT = /^(?:\n[^\n\S]*)+/;
+  SIMPLESTR = /^'[^\\']*(?:\\.[^\\']*)*'/;
+  JSTOKEN = /^`[^\\`]*(?:\\.[^\\`]*)*`/;
+  REGEX = /^\/(?![\s=])[^[\/\n\\]*(?:(?:\\[\s\S]|\[[^\]\n\\]*(?:\\[\s\S][^\]\n\\]*)*])[^[\/\n\\]*)*\/[imgy]{0,4}(?!\w)/;
+  HEREGEX = /^\/{3}([\s\S]+?)\/{3}([imgy]{0,4})(?!\w)/;
+  HEREGEX_OMIT = /\s+(?:#.*)?/g;
+  MULTILINER = /\n/g;
+  HEREDOC_INDENT = /\n+([^\n\S]*)/g;
+  HEREDOC_ILLEGAL = /\*\//;
+  ASSIGNED = /^\s*@?([$A-Za-z_][$\w\x7f-\uffff]*|['"].*['"])[^\n\S]*?[:=][^:=>]/;
+  LINE_CONTINUER = /^\s*(?:,|\??\.(?![.\d])|::)/;
+  TRAILING_SPACES = /\s+$/;
+  NO_NEWLINE = /^(?:[-+*&|\/%=<>!.\\][<>=&|]*|and|or|is(?:nt)?|n(?:ot|ew)|delete|typeof|instanceof)$/;
+  COMPOUND_ASSIGN = ['-=', '+=', '/=', '*=', '%=', '||=', '&&=', '?=', '<<=', '>>=', '>>>=', '&=', '^=', '|='];
+  UNARY = ['!', '~', 'NEW', 'TYPEOF', 'DELETE', 'DO'];
+  LOGIC = ['&&', '||', '&', '|', '^'];
+  SHIFT = ['<<', '>>', '>>>'];
+  COMPARE = ['==', '!=', '<', '>', '<=', '>='];
+  MATH = ['*', '/', '%'];
+  RELATION = ['IN', 'OF', 'INSTANCEOF'];
+  BOOL = ['TRUE', 'FALSE', 'NULL', 'UNDEFINED'];
+  NOT_REGEX = ['NUMBER', 'REGEX', 'BOOL', '++', '--', ']'];
+  NOT_SPACED_REGEX = NOT_REGEX.concat(')', '}', 'THIS', 'IDENTIFIER', 'STRING');
+  CALLABLE = ['IDENTIFIER', 'STRING', 'REGEX', ')', ']', '}', '?', '::', '@', 'THIS', 'SUPER'];
+  INDEXABLE = CALLABLE.concat('NUMBER', 'BOOL');
+  LINE_BREAK = ['INDENT', 'OUTDENT', 'TERMINATOR'];
+});
+/**
+ * Copyright (c) 2011 Jeremy Ashkenas
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+define('ace/mode/coffee/rewriter', ['require', 'exports', 'module' ], function(require, exports, module) {
+    
+  var BALANCED_PAIRS, EXPRESSION_CLOSE, EXPRESSION_END, EXPRESSION_START, IMPLICIT_BLOCK, IMPLICIT_CALL, IMPLICIT_END, IMPLICIT_FUNC, IMPLICIT_UNSPACED_CALL, INVERSES, LINEBREAKS, SINGLE_CLOSERS, SINGLE_LINERS, left, rite, _i, _len, _ref;
+  var __indexOf = Array.prototype.indexOf || function(item) {
+    for (var i = 0, l = this.length; i < l; i++) {
+      if (this[i] === item) return i;
+    }
+    return -1;
+  }, __slice = Array.prototype.slice;
+  exports.Rewriter = (function() {
+    function Rewriter() {}
+    Rewriter.prototype.rewrite = function(tokens) {
+      this.tokens = tokens;
+      this.removeLeadingNewlines();
+      this.removeMidExpressionNewlines();
+      this.closeOpenCalls();
+      this.closeOpenIndexes();
+      this.addImplicitIndentation();
+      this.tagPostfixConditionals();
+      this.addImplicitBraces();
+      this.addImplicitParentheses();
+      this.ensureBalance(BALANCED_PAIRS);
+      this.rewriteClosingParens();
+      return this.tokens;
+    };
+    Rewriter.prototype.scanTokens = function(block) {
+      var i, token, tokens;
+      tokens = this.tokens;
+      i = 0;
+      while (token = tokens[i]) {
+        i += block.call(this, token, i, tokens);
+      }
+      return true;
+    };
+    Rewriter.prototype.detectEnd = function(i, condition, action) {
+      var levels, token, tokens, _ref, _ref2;
+      tokens = this.tokens;
+      levels = 0;
+      while (token = tokens[i]) {
+        if (levels === 0 && condition.call(this, token, i)) {
+          return action.call(this, token, i);
+        }
+        if (!token || levels < 0) {
+          return action.call(this, token, i - 1);
+        }
+        if (_ref = token[0], __indexOf.call(EXPRESSION_START, _ref) >= 0) {
+          levels += 1;
+        } else if (_ref2 = token[0], __indexOf.call(EXPRESSION_END, _ref2) >= 0) {
+          levels -= 1;
+        }
+        i += 1;
+      }
+      return i - 1;
+    };
+    Rewriter.prototype.removeLeadingNewlines = function() {
+      var i, tag, _len, _ref;
+      _ref = this.tokens;
+      for (i = 0, _len = _ref.length; i < _len; i++) {
+        tag = _ref[i][0];
+        if (tag !== 'TERMINATOR') {
+          break;
+        }
+      }
+      if (i) {
+        return this.tokens.splice(0, i);
+      }
+    };
+    Rewriter.prototype.removeMidExpressionNewlines = function() {
+      return this.scanTokens(function(token, i, tokens) {
+        var _ref;
+        if (!(token[0] === 'TERMINATOR' && (_ref = this.tag(i + 1), __indexOf.call(EXPRESSION_CLOSE, _ref) >= 0))) {
+          return 1;
+        }
+        tokens.splice(i, 1);
+        return 0;
+      });
+    };
+    Rewriter.prototype.closeOpenCalls = function() {
+      var action, condition;
+      condition = function(token, i) {
+        var _ref;
+        return ((_ref = token[0]) === ')' || _ref === 'CALL_END') || token[0] === 'OUTDENT' && this.tag(i - 1) === ')';
+      };
+      action = function(token, i) {
+        return this.tokens[token[0] === 'OUTDENT' ? i - 1 : i][0] = 'CALL_END';
+      };
+      return this.scanTokens(function(token, i) {
+        if (token[0] === 'CALL_START') {
+          this.detectEnd(i + 1, condition, action);
+        }
+        return 1;
+      });
+    };
+    Rewriter.prototype.closeOpenIndexes = function() {
+      var action, condition;
+      condition = function(token, i) {
+        var _ref;
+        return (_ref = token[0]) === ']' || _ref === 'INDEX_END';
+      };
+      action = function(token, i) {
+        return token[0] = 'INDEX_END';
+      };
+      return this.scanTokens(function(token, i) {
+        if (token[0] === 'INDEX_START') {
+          this.detectEnd(i + 1, condition, action);
+        }
+        return 1;
+      });
+    };
+    Rewriter.prototype.addImplicitBraces = function() {
+      var action, condition, stack, start, startIndent;
+      stack = [];
+      start = null;
+      startIndent = 0;
+      condition = function(token, i) {
+        var one, tag, three, two, _ref, _ref2;
+        _ref = this.tokens.slice(i + 1, (i + 3 + 1) || 9e9), one = _ref[0], two = _ref[1], three = _ref[2];
+        if ('HERECOMMENT' === (one != null ? one[0] : void 0)) {
+          return false;
+        }
+        tag = token[0];
+        return ((tag === 'TERMINATOR' || tag === 'OUTDENT') && !((two != null ? two[0] : void 0) === ':' || (one != null ? one[0] : void 0) === '@' && (three != null ? three[0] : void 0) === ':')) || (tag === ',' && one && ((_ref2 = one[0]) !== 'IDENTIFIER' && _ref2 !== 'NUMBER' && _ref2 !== 'STRING' && _ref2 !== '@' && _ref2 !== 'TERMINATOR' && _ref2 !== 'OUTDENT'));
+      };
+      action = function(token, i) {
+        var tok;
+        tok = ['}', '}', token[2]];
+        tok.generated = true;
+        return this.tokens.splice(i, 0, tok);
+      };
+      return this.scanTokens(function(token, i, tokens) {
+        var ago, idx, tag, tok, value, _ref, _ref2;
+        if (_ref = (tag = token[0]), __indexOf.call(EXPRESSION_START, _ref) >= 0) {
+          stack.push([(tag === 'INDENT' && this.tag(i - 1) === '{' ? '{' : tag), i]);
+          return 1;
+        }
+        if (__indexOf.call(EXPRESSION_END, tag) >= 0) {
+          start = stack.pop();
+          return 1;
+        }
+        if (!(tag === ':' && ((ago = this.tag(i - 2)) === ':' || ((_ref2 = stack[stack.length - 1]) != null ? _ref2[0] : void 0) !== '{'))) {
+          return 1;
+        }
+        stack.push(['{']);
+        idx = ago === '@' ? i - 2 : i - 1;
+        while (this.tag(idx - 2) === 'HERECOMMENT') {
+          idx -= 2;
+        }
+        value = new String('{');
+        value.generated = true;
+        tok = ['{', value, token[2]];
+        tok.generated = true;
+        tokens.splice(idx, 0, tok);
+        this.detectEnd(i + 2, condition, action);
+        return 2;
+      });
+    };
+    Rewriter.prototype.addImplicitParentheses = function() {
+      var action, noCall;
+      noCall = false;
+      action = function(token, i) {
+        var idx;
+        idx = token[0] === 'OUTDENT' ? i + 1 : i;
+        return this.tokens.splice(idx, 0, ['CALL_END', ')', token[2]]);
+      };
+      return this.scanTokens(function(token, i, tokens) {
+        var callObject, current, next, prev, seenControl, seenSingle, tag, _ref, _ref2, _ref3;
+        tag = token[0];
+        if (tag === 'CLASS' || tag === 'IF') {
+          noCall = true;
+        }
+        _ref = tokens.slice(i - 1, (i + 1 + 1) || 9e9), prev = _ref[0], current = _ref[1], next = _ref[2];
+        callObject = !noCall && tag === 'INDENT' && next && next.generated && next[0] === '{' && prev && (_ref2 = prev[0], __indexOf.call(IMPLICIT_FUNC, _ref2) >= 0);
+        seenSingle = false;
+        seenControl = false;
+        if (__indexOf.call(LINEBREAKS, tag) >= 0) {
+          noCall = false;
+        }
+        if (prev && !prev.spaced && tag === '?') {
+          token.call = true;
+        }
+        if (token.fromThen) {
+          return 1;
+        }
+        if (!(callObject || (prev != null ? prev.spaced : void 0) && (prev.call || (_ref3 = prev[0], __indexOf.call(IMPLICIT_FUNC, _ref3) >= 0)) && (__indexOf.call(IMPLICIT_CALL, tag) >= 0 || !(token.spaced || token.newLine) && __indexOf.call(IMPLICIT_UNSPACED_CALL, tag) >= 0))) {
+          return 1;
+        }
+        tokens.splice(i, 0, ['CALL_START', '(', token[2]]);
+        this.detectEnd(i + 1, function(token, i) {
+          var post, _ref4;
+          tag = token[0];
+          if (!seenSingle && token.fromThen) {
+            return true;
+          }
+          if (tag === 'IF' || tag === 'ELSE' || tag === 'CATCH' || tag === '->' || tag === '=>') {
+            seenSingle = true;
+          }
+          if (tag === 'IF' || tag === 'ELSE' || tag === 'SWITCH' || tag === 'TRY') {
+            seenControl = true;
+          }
+          if ((tag === '.' || tag === '?.' || tag === '::') && this.tag(i - 1) === 'OUTDENT') {
+            return true;
+          }
+          return !token.generated && this.tag(i - 1) !== ',' && (__indexOf.call(IMPLICIT_END, tag) >= 0 || (tag === 'INDENT' && !seenControl)) && (tag !== 'INDENT' || (this.tag(i - 2) !== 'CLASS' && (_ref4 = this.tag(i - 1), __indexOf.call(IMPLICIT_BLOCK, _ref4) < 0) && !((post = this.tokens[i + 1]) && post.generated && post[0] === '{')));
+        }, action);
+        if (prev[0] === '?') {
+          prev[0] = 'FUNC_EXIST';
+        }
+        return 2;
+      });
+    };
+    Rewriter.prototype.addImplicitIndentation = function() {
+      return this.scanTokens(function(token, i, tokens) {
+        var action, condition, indent, outdent, starter, tag, _ref, _ref2;
+        tag = token[0];
+        if (tag === 'TERMINATOR' && this.tag(i + 1) === 'THEN') {
+          tokens.splice(i, 1);
+          return 0;
+        }
+        if (tag === 'ELSE' && this.tag(i - 1) !== 'OUTDENT') {
+          tokens.splice.apply(tokens, [i, 0].concat(__slice.call(this.indentation(token))));
+          return 2;
+        }
+        if (tag === 'CATCH' && ((_ref = this.tag(i + 2)) === 'OUTDENT' || _ref === 'TERMINATOR' || _ref === 'FINALLY')) {
+          tokens.splice.apply(tokens, [i + 2, 0].concat(__slice.call(this.indentation(token))));
+          return 4;
+        }
+        if (__indexOf.call(SINGLE_LINERS, tag) >= 0 && this.tag(i + 1) !== 'INDENT' && !(tag === 'ELSE' && this.tag(i + 1) === 'IF')) {
+          starter = tag;
+          _ref2 = this.indentation(token), indent = _ref2[0], outdent = _ref2[1];
+          if (starter === 'THEN') {
+            indent.fromThen = true;
+          }
+          indent.generated = outdent.generated = true;
+          tokens.splice(i + 1, 0, indent);
+          condition = function(token, i) {
+            var _ref3;
+            return token[1] !== ';' && (_ref3 = token[0], __indexOf.call(SINGLE_CLOSERS, _ref3) >= 0) && !(token[0] === 'ELSE' && (starter !== 'IF' && starter !== 'THEN'));
+          };
+          action = function(token, i) {
+            return this.tokens.splice((this.tag(i - 1) === ',' ? i - 1 : i), 0, outdent);
+          };
+          this.detectEnd(i + 2, condition, action);
+          if (tag === 'THEN') {
+            tokens.splice(i, 1);
+          }
+          return 1;
+        }
+        return 1;
+      });
+    };
+    Rewriter.prototype.tagPostfixConditionals = function() {
+      var condition;
+      condition = function(token, i) {
+        var _ref;
+        return (_ref = token[0]) === 'TERMINATOR' || _ref === 'INDENT';
+      };
+      return this.scanTokens(function(token, i) {
+        var original;
+        if (token[0] !== 'IF') {
+          return 1;
+        }
+        original = token;
+        this.detectEnd(i + 1, condition, function(token, i) {
+          if (token[0] !== 'INDENT') {
+            return original[0] = 'POST_' + original[0];
+          }
+        });
+        return 1;
+      });
+    };
+    Rewriter.prototype.ensureBalance = function(pairs) {
+      var close, level, levels, open, openLine, tag, token, _i, _j, _len, _len2, _ref, _ref2;
+      levels = {};
+      openLine = {};
+      _ref = this.tokens;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        token = _ref[_i];
+        tag = token[0];
+        for (_j = 0, _len2 = pairs.length; _j < _len2; _j++) {
+          _ref2 = pairs[_j], open = _ref2[0], close = _ref2[1];
+          levels[open] |= 0;
+          if (tag === open) {
+            if (levels[open]++ === 0) {
+              openLine[open] = token[2];
+            }
+          } else if (tag === close && --levels[open] < 0) {
+            throw Error("too many " + token[1] + " on line " + (token[2] + 1));
+          }
+        }
+      }
+      for (open in levels) {
+        level = levels[open];
+        if (level > 0) {
+          throw Error("unclosed " + open + " on line " + (openLine[open] + 1));
+        }
+      }
+      return this;
+    };
+    Rewriter.prototype.rewriteClosingParens = function() {
+      var debt, key, stack;
+      stack = [];
+      debt = {};
+      for (key in INVERSES) {
+        debt[key] = 0;
+      }
+      return this.scanTokens(function(token, i, tokens) {
+        var inv, match, mtag, oppos, tag, val, _ref;
+        if (_ref = (tag = token[0]), __indexOf.call(EXPRESSION_START, _ref) >= 0) {
+          stack.push(token);
+          return 1;
+        }
+        if (__indexOf.call(EXPRESSION_END, tag) < 0) {
+          return 1;
+        }
+        if (debt[inv = INVERSES[tag]] > 0) {
+          debt[inv] -= 1;
+          tokens.splice(i, 1);
+          return 0;
+        }
+        match = stack.pop();
+        mtag = match[0];
+        oppos = INVERSES[mtag];
+        if (tag === oppos) {
+          return 1;
+        }
+        debt[mtag] += 1;
+        val = [oppos, mtag === 'INDENT' ? match[1] : oppos];
+        if (this.tag(i + 2) === mtag) {
+          tokens.splice(i + 3, 0, val);
+          stack.push(match);
+        } else {
+          tokens.splice(i, 0, val);
+        }
+        return 1;
+      });
+    };
+    Rewriter.prototype.indentation = function(token) {
+      return [['INDENT', 2, token[2]], ['OUTDENT', 2, token[2]]];
+    };
+    Rewriter.prototype.tag = function(i) {
+      var _ref;
+      return (_ref = this.tokens[i]) != null ? _ref[0] : void 0;
+    };
+    return Rewriter;
+  })();
+  BALANCED_PAIRS = [['(', ')'], ['[', ']'], ['{', '}'], ['INDENT', 'OUTDENT'], ['CALL_START', 'CALL_END'], ['PARAM_START', 'PARAM_END'], ['INDEX_START', 'INDEX_END']];
+  INVERSES = {};
+  EXPRESSION_START = [];
+  EXPRESSION_END = [];
+  for (_i = 0, _len = BALANCED_PAIRS.length; _i < _len; _i++) {
+    _ref = BALANCED_PAIRS[_i], left = _ref[0], rite = _ref[1];
+    EXPRESSION_START.push(INVERSES[rite] = left);
+    EXPRESSION_END.push(INVERSES[left] = rite);
+  }
+  EXPRESSION_CLOSE = ['CATCH', 'WHEN', 'ELSE', 'FINALLY'].concat(EXPRESSION_END);
+  IMPLICIT_FUNC = ['IDENTIFIER', 'SUPER', ')', 'CALL_END', ']', 'INDEX_END', '@', 'THIS'];
+  IMPLICIT_CALL = ['IDENTIFIER', 'NUMBER', 'STRING', 'JS', 'REGEX', 'NEW', 'PARAM_START', 'CLASS', 'IF', 'TRY', 'SWITCH', 'THIS', 'BOOL', 'UNARY', 'SUPER', '@', '->', '=>', '[', '(', '{', '--', '++'];
+  IMPLICIT_UNSPACED_CALL = ['+', '-'];
+  IMPLICIT_BLOCK = ['->', '=>', '{', '[', ','];
+  IMPLICIT_END = ['POST_IF', 'FOR', 'WHILE', 'UNTIL', 'WHEN', 'BY', 'LOOP', 'TERMINATOR'];
+  SINGLE_LINERS = ['ELSE', '->', '=>', 'TRY', 'FINALLY', 'THEN'];
+  SINGLE_CLOSERS = ['TERMINATOR', 'CATCH', 'FINALLY', 'ELSE', 'OUTDENT', 'LEADING_WHEN'];
+  LINEBREAKS = ['TERMINATOR', 'INDENT', 'OUTDENT'];
+});
+/**
+ * Copyright (c) 2011 Jeremy Ashkenas
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+define('ace/mode/coffee/helpers', ['require', 'exports', 'module' ], function(require, exports, module) {
+    
+  var extend, flatten;
+  exports.starts = function(string, literal, start) {
+    return literal === string.substr(start, literal.length);
+  };
+  exports.ends = function(string, literal, back) {
+    var len;
+    len = literal.length;
+    return literal === string.substr(string.length - len - (back || 0), len);
+  };
+  exports.compact = function(array) {
+    var item, _i, _len, _results;
+    _results = [];
+    for (_i = 0, _len = array.length; _i < _len; _i++) {
+      item = array[_i];
+      if (item) {
+        _results.push(item);
+      }
+    }
+    return _results;
+  };
+  exports.count = function(string, substr) {
+    var num, pos;
+    num = pos = 0;
+    if (!substr.length) {
+      return 1 / 0;
+    }
+    while (pos = 1 + string.indexOf(substr, pos)) {
+      num++;
+    }
+    return num;
+  };
+  exports.merge = function(options, overrides) {
+    return extend(extend({}, options), overrides);
+  };
+  extend = exports.extend = function(object, properties) {
+    var key, val;
+    for (key in properties) {
+      val = properties[key];
+      object[key] = val;
+    }
+    return object;
+  };
+  exports.flatten = flatten = function(array) {
+    var element, flattened, _i, _len;
+    flattened = [];
+    for (_i = 0, _len = array.length; _i < _len; _i++) {
+      element = array[_i];
+      if (element instanceof Array) {
+        flattened = flattened.concat(flatten(element));
+      } else {
+        flattened.push(element);
+      }
+    }
+    return flattened;
+  };
+  exports.del = function(obj, key) {
+    var val;
+    val = obj[key];
+    delete obj[key];
+    return val;
+  };
+  exports.last = function(array, back) {
+    return array[array.length - (back || 0) - 1];
+  };
+});
+/**
+ * Copyright (c) 2011 Jeremy Ashkenas
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+define('ace/mode/coffee/parser', ['require', 'exports', 'module' ], function(require, exports, module) {
+
+/* Jison generated parser */
+var parser = {trace: function trace() { },
+yy: {},
+symbols_: {"error":2,"Root":3,"Body":4,"Block":5,"TERMINATOR":6,"Line":7,"Expression":8,"Statement":9,"Return":10,"Throw":11,"Comment":12,"STATEMENT":13,"Value":14,"Invocation":15,"Code":16,"Operation":17,"Assign":18,"If":19,"Try":20,"While":21,"For":22,"Switch":23,"Class":24,"INDENT":25,"OUTDENT":26,"Identifier":27,"IDENTIFIER":28,"AlphaNumeric":29,"NUMBER":30,"STRING":31,"Literal":32,"JS":33,"REGEX":34,"BOOL":35,"Assignable":36,"=":37,"AssignObj":38,"ObjAssignable":39,":":40,"ThisProperty":41,"RETURN":42,"HERECOMMENT":43,"PARAM_START":44,"ParamList":45,"PARAM_END":46,"FuncGlyph":47,"->":48,"=>":49,"OptComma":50,",":51,"Param":52,"ParamVar":53,"...":54,"Array":55,"Object":56,"Splat":57,"SimpleAssignable":58,"Accessor":59,"Parenthetical":60,"Range":61,"This":62,".":63,"?.":64,"::":65,"Index":66,"INDEX_START":67,"IndexValue":68,"INDEX_END":69,"INDEX_SOAK":70,"INDEX_PROTO":71,"Slice":72,"{":73,"AssignList":74,"}":75,"CLASS":76,"EXTENDS":77,"OptFuncExist":78,"Arguments":79,"SUPER":80,"FUNC_EXIST":81,"CALL_START":82,"CALL_END":83,"ArgList":84,"THIS":85,"@":86,"[":87,"]":88,"RangeDots":89,"..":90,"Arg":91,"SimpleArgs":92,"TRY":93,"Catch":94,"FINALLY":95,"CATCH":96,"THROW":97,"(":98,")":99,"WhileSource":100,"WHILE":101,"WHEN":102,"UNTIL":103,"Loop":104,"LOOP":105,"ForBody":106,"FOR":107,"ForStart":108,"ForSource":109,"ForVariables":110,"OWN":111,"ForValue":112,"FORIN":113,"FOROF":114,"BY":115,"SWITCH":116,"Whens":117,"ELSE":118,"When":119,"LEADING_WHEN":120,"IfBlock":121,"IF":122,"POST_IF":123,"UNARY":124,"-":125,"+":126,"--":127,"++":128,"?":129,"MATH":130,"SHIFT":131,"COMPARE":132,"LOGIC":133,"RELATION":134,"COMPOUND_ASSIGN":135,"$accept":0,"$end":1},
+terminals_: {2:"error",6:"TERMINATOR",13:"STATEMENT",25:"INDENT",26:"OUTDENT",28:"IDENTIFIER",30:"NUMBER",31:"STRING",33:"JS",34:"REGEX",35:"BOOL",37:"=",40:":",42:"RETURN",43:"HERECOMMENT",44:"PARAM_START",46:"PARAM_END",48:"->",49:"=>",51:",",54:"...",63:".",64:"?.",65:"::",67:"INDEX_START",69:"INDEX_END",70:"INDEX_SOAK",71:"INDEX_PROTO",73:"{",75:"}",76:"CLASS",77:"EXTENDS",80:"SUPER",81:"FUNC_EXIST",82:"CALL_START",83:"CALL_END",85:"THIS",86:"@",87:"[",88:"]",90:"..",93:"TRY",95:"FINALLY",96:"CATCH",97:"THROW",98:"(",99:")",101:"WHILE",102:"WHEN",103:"UNTIL",105:"LOOP",107:"FOR",111:"OWN",113:"FORIN",114:"FOROF",115:"BY",116:"SWITCH",118:"ELSE",120:"LEADING_WHEN",122:"IF",123:"POST_IF",124:"UNARY",125:"-",126:"+",127:"--",128:"++",129:"?",130:"MATH",131:"SHIFT",132:"COMPARE",133:"LOGIC",134:"RELATION",135:"COMPOUND_ASSIGN"},
+productions_: [0,[3,0],[3,1],[3,2],[4,1],[4,3],[4,2],[7,1],[7,1],[9,1],[9,1],[9,1],[9,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[5,2],[5,3],[27,1],[29,1],[29,1],[32,1],[32,1],[32,1],[32,1],[18,3],[18,5],[38,1],[38,3],[38,5],[38,1],[39,1],[39,1],[39,1],[10,2],[10,1],[12,1],[16,5],[16,2],[47,1],[47,1],[50,0],[50,1],[45,0],[45,1],[45,3],[52,1],[52,2],[52,3],[53,1],[53,1],[53,1],[53,1],[57,2],[58,1],[58,2],[58,2],[58,1],[36,1],[36,1],[36,1],[14,1],[14,1],[14,1],[14,1],[14,1],[59,2],[59,2],[59,2],[59,1],[59,1],[66,3],[66,2],[66,2],[68,1],[68,1],[56,4],[74,0],[74,1],[74,3],[74,4],[74,6],[24,1],[24,2],[24,3],[24,4],[24,2],[24,3],[24,4],[24,5],[15,3],[15,3],[15,1],[15,2],[78,0],[78,1],[79,2],[79,4],[62,1],[62,1],[41,2],[55,2],[55,4],[89,1],[89,1],[61,5],[72,3],[72,2],[72,2],[84,1],[84,3],[84,4],[84,4],[84,6],[91,1],[91,1],[92,1],[92,3],[20,2],[20,3],[20,4],[20,5],[94,3],[11,2],[60,3],[60,5],[100,2],[100,4],[100,2],[100,4],[21,2],[21,2],[21,2],[21,1],[104,2],[104,2],[22,2],[22,2],[22,2],[106,2],[106,2],[108,2],[108,3],[112,1],[112,1],[112,1],[110,1],[110,3],[109,2],[109,2],[109,4],[109,4],[109,4],[109,6],[109,6],[23,5],[23,7],[23,4],[23,6],[117,1],[117,2],[119,3],[119,4],[121,3],[121,5],[19,1],[19,3],[19,3],[19,3],[17,2],[17,2],[17,2],[17,2],[17,2],[17,2],[17,2],[17,2],[17,3],[17,3],[17,3],[17,3],[17,3],[17,3],[17,3],[17,3],[17,5],[17,3]],
+performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
+
+var $0 = $$.length - 1;
+switch (yystate) {
+case 1:return this.$ = new yy.Block;
+break;
+case 2:return this.$ = $$[$0];
+break;
+case 3:return this.$ = $$[$0-1];
+break;
+case 4:this.$ = yy.Block.wrap([$$[$0]]);
+break;
+case 5:this.$ = $$[$0-2].push($$[$0]);
+break;
+case 6:this.$ = $$[$0-1];
+break;
+case 7:this.$ = $$[$0];
+break;
+case 8:this.$ = $$[$0];
+break;
+case 9:this.$ = $$[$0];
+break;
+case 10:this.$ = $$[$0];
+break;
+case 11:this.$ = $$[$0];
+break;
+case 12:this.$ = new yy.Literal($$[$0]);
+break;
+case 13:this.$ = $$[$0];
+break;
+case 14:this.$ = $$[$0];
+break;
+case 15:this.$ = $$[$0];
+break;
+case 16:this.$ = $$[$0];
+break;
+case 17:this.$ = $$[$0];
+break;
+case 18:this.$ = $$[$0];
+break;
+case 19:this.$ = $$[$0];
+break;
+case 20:this.$ = $$[$0];
+break;
+case 21:this.$ = $$[$0];
+break;
+case 22:this.$ = $$[$0];
+break;
+case 23:this.$ = $$[$0];
+break;
+case 24:this.$ = new yy.Block;
+break;
+case 25:this.$ = $$[$0-1];
+break;
+case 26:this.$ = new yy.Literal($$[$0]);
+break;
+case 27:this.$ = new yy.Literal($$[$0]);
+break;
+case 28:this.$ = new yy.Literal($$[$0]);
+break;
+case 29:this.$ = $$[$0];
+break;
+case 30:this.$ = new yy.Literal($$[$0]);
+break;
+case 31:this.$ = new yy.Literal($$[$0]);
+break;
+case 32:this.$ = (function () {
+        var val;
+        val = new yy.Literal($$[$0]);
+        if ($$[$0] === 'undefined') {
+          val.isUndefined = true;
+        }
+        return val;
+      }());
+break;
+case 33:this.$ = new yy.Assign($$[$0-2], $$[$0]);
+break;
+case 34:this.$ = new yy.Assign($$[$0-4], $$[$0-1]);
+break;
+case 35:this.$ = new yy.Value($$[$0]);
+break;
+case 36:this.$ = new yy.Assign(new yy.Value($$[$0-2]), $$[$0], 'object');
+break;
+case 37:this.$ = new yy.Assign(new yy.Value($$[$0-4]), $$[$0-1], 'object');
+break;
+case 38:this.$ = $$[$0];
+break;
+case 39:this.$ = $$[$0];
+break;
+case 40:this.$ = $$[$0];
+break;
+case 41:this.$ = $$[$0];
+break;
+case 42:this.$ = new yy.Return($$[$0]);
+break;
+case 43:this.$ = new yy.Return;
+break;
+case 44:this.$ = new yy.Comment($$[$0]);
+break;
+case 45:this.$ = new yy.Code($$[$0-3], $$[$0], $$[$0-1]);
+break;
+case 46:this.$ = new yy.Code([], $$[$0], $$[$0-1]);
+break;
+case 47:this.$ = 'func';
+break;
+case 48:this.$ = 'boundfunc';
+break;
+case 49:this.$ = $$[$0];
+break;
+case 50:this.$ = $$[$0];
+break;
+case 51:this.$ = [];
+break;
+case 52:this.$ = [$$[$0]];
+break;
+case 53:this.$ = $$[$0-2].concat($$[$0]);
+break;
+case 54:this.$ = new yy.Param($$[$0]);
+break;
+case 55:this.$ = new yy.Param($$[$0-1], null, true);
+break;
+case 56:this.$ = new yy.Param($$[$0-2], $$[$0]);
+break;
+case 57:this.$ = $$[$0];
+break;
+case 58:this.$ = $$[$0];
+break;
+case 59:this.$ = $$[$0];
+break;
+case 60:this.$ = $$[$0];
+break;
+case 61:this.$ = new yy.Splat($$[$0-1]);
+break;
+case 62:this.$ = new yy.Value($$[$0]);
+break;
+case 63:this.$ = $$[$0-1].push($$[$0]);
+break;
+case 64:this.$ = new yy.Value($$[$0-1], [$$[$0]]);
+break;
+case 65:this.$ = $$[$0];
+break;
+case 66:this.$ = $$[$0];
+break;
+case 67:this.$ = new yy.Value($$[$0]);
+break;
+case 68:this.$ = new yy.Value($$[$0]);
+break;
+case 69:this.$ = $$[$0];
+break;
+case 70:this.$ = new yy.Value($$[$0]);
+break;
+case 71:this.$ = new yy.Value($$[$0]);
+break;
+case 72:this.$ = new yy.Value($$[$0]);
+break;
+case 73:this.$ = $$[$0];
+break;
+case 74:this.$ = new yy.Access($$[$0]);
+break;
+case 75:this.$ = new yy.Access($$[$0], 'soak');
+break;
+case 76:this.$ = new yy.Access($$[$0], 'proto');
+break;
+case 77:this.$ = new yy.Access(new yy.Literal('prototype'));
+break;
+case 78:this.$ = $$[$0];
+break;
+case 79:this.$ = $$[$0-1];
+break;
+case 80:this.$ = yy.extend($$[$0], {
+          soak: true
+        });
+break;
+case 81:this.$ = yy.extend($$[$0], {
+          proto: true
+        });
+break;
+case 82:this.$ = new yy.Index($$[$0]);
+break;
+case 83:this.$ = new yy.Slice($$[$0]);
+break;
+case 84:this.$ = new yy.Obj($$[$0-2], $$[$0-3].generated);
+break;
+case 85:this.$ = [];
+break;
+case 86:this.$ = [$$[$0]];
+break;
+case 87:this.$ = $$[$0-2].concat($$[$0]);
+break;
+case 88:this.$ = $$[$0-3].concat($$[$0]);
+break;
+case 89:this.$ = $$[$0-5].concat($$[$0-2]);
+break;
+case 90:this.$ = new yy.Class;
+break;
+case 91:this.$ = new yy.Class(null, null, $$[$0]);
+break;
+case 92:this.$ = new yy.Class(null, $$[$0]);
+break;
+case 93:this.$ = new yy.Class(null, $$[$0-1], $$[$0]);
+break;
+case 94:this.$ = new yy.Class($$[$0]);
+break;
+case 95:this.$ = new yy.Class($$[$0-1], null, $$[$0]);
+break;
+case 96:this.$ = new yy.Class($$[$0-2], $$[$0]);
+break;
+case 97:this.$ = new yy.Class($$[$0-3], $$[$0-1], $$[$0]);
+break;
+case 98:this.$ = new yy.Call($$[$0-2], $$[$0], $$[$0-1]);
+break;
+case 99:this.$ = new yy.Call($$[$0-2], $$[$0], $$[$0-1]);
+break;
+case 100:this.$ = new yy.Call('super', [new yy.Splat(new yy.Literal('arguments'))]);
+break;
+case 101:this.$ = new yy.Call('super', $$[$0]);
+break;
+case 102:this.$ = false;
+break;
+case 103:this.$ = true;
+break;
+case 104:this.$ = [];
+break;
+case 105:this.$ = $$[$0-2];
+break;
+case 106:this.$ = new yy.Value(new yy.Literal('this'));
+break;
+case 107:this.$ = new yy.Value(new yy.Literal('this'));
+break;
+case 108:this.$ = new yy.Value(new yy.Literal('this'), [new yy.Access($$[$0])], 'this');
+break;
+case 109:this.$ = new yy.Arr([]);
+break;
+case 110:this.$ = new yy.Arr($$[$0-2]);
+break;
+case 111:this.$ = 'inclusive';
+break;
+case 112:this.$ = 'exclusive';
+break;
+case 113:this.$ = new yy.Range($$[$0-3], $$[$0-1], $$[$0-2]);
+break;
+case 114:this.$ = new yy.Range($$[$0-2], $$[$0], $$[$0-1]);
+break;
+case 115:this.$ = new yy.Range($$[$0-1], null, $$[$0]);
+break;
+case 116:this.$ = new yy.Range(null, $$[$0], $$[$0-1]);
+break;
+case 117:this.$ = [$$[$0]];
+break;
+case 118:this.$ = $$[$0-2].concat($$[$0]);
+break;
+case 119:this.$ = $$[$0-3].concat($$[$0]);
+break;
+case 120:this.$ = $$[$0-2];
+break;
+case 121:this.$ = $$[$0-5].concat($$[$0-2]);
+break;
+case 122:this.$ = $$[$0];
+break;
+case 123:this.$ = $$[$0];
+break;
+case 124:this.$ = $$[$0];
+break;
+case 125:this.$ = [].concat($$[$0-2], $$[$0]);
+break;
+case 126:this.$ = new yy.Try($$[$0]);
+break;
+case 127:this.$ = new yy.Try($$[$0-1], $$[$0][0], $$[$0][1]);
+break;
+case 128:this.$ = new yy.Try($$[$0-2], null, null, $$[$0]);
+break;
+case 129:this.$ = new yy.Try($$[$0-3], $$[$0-2][0], $$[$0-2][1], $$[$0]);
+break;
+case 130:this.$ = [$$[$0-1], $$[$0]];
+break;
+case 131:this.$ = new yy.Throw($$[$0]);
+break;
+case 132:this.$ = new yy.Parens($$[$0-1]);
+break;
+case 133:this.$ = new yy.Parens($$[$0-2]);
+break;
+case 134:this.$ = new yy.While($$[$0]);
+break;
+case 135:this.$ = new yy.While($$[$0-2], {
+          guard: $$[$0]
+        });
+break;
+case 136:this.$ = new yy.While($$[$0], {
+          invert: true
+        });
+break;
+case 137:this.$ = new yy.While($$[$0-2], {
+          invert: true,
+          guard: $$[$0]
+        });
+break;
+case 138:this.$ = $$[$0-1].addBody($$[$0]);
+break;
+case 139:this.$ = $$[$0].addBody(yy.Block.wrap([$$[$0-1]]));
+break;
+case 140:this.$ = $$[$0].addBody(yy.Block.wrap([$$[$0-1]]));
+break;
+case 141:this.$ = $$[$0];
+break;
+case 142:this.$ = new yy.While(new yy.Literal('true')).addBody($$[$0]);
+break;
+case 143:this.$ = new yy.While(new yy.Literal('true')).addBody(yy.Block.wrap([$$[$0]]));
+break;
+case 144:this.$ = new yy.For($$[$0-1], $$[$0]);
+break;
+case 145:this.$ = new yy.For($$[$0-1], $$[$0]);
+break;
+case 146:this.$ = new yy.For($$[$0], $$[$0-1]);
+break;
+case 147:this.$ = {
+          source: new yy.Value($$[$0])
+        };
+break;
+case 148:this.$ = (function () {
+        $$[$0].own = $$[$0-1].own;
+        $$[$0].name = $$[$0-1][0];
+        $$[$0].index = $$[$0-1][1];
+        return $$[$0];
+      }());
+break;
+case 149:this.$ = $$[$0];
+break;
+case 150:this.$ = (function () {
+        $$[$0].own = true;
+        return $$[$0];
+      }());
+break;
+case 151:this.$ = $$[$0];
+break;
+case 152:this.$ = new yy.Value($$[$0]);
+break;
+case 153:this.$ = new yy.Value($$[$0]);
+break;
+case 154:this.$ = [$$[$0]];
+break;
+case 155:this.$ = [$$[$0-2], $$[$0]];
+break;
+case 156:this.$ = {
+          source: $$[$0]
+        };
+break;
+case 157:this.$ = {
+          source: $$[$0],
+          object: true
+        };
+break;
+case 158:this.$ = {
+          source: $$[$0-2],
+          guard: $$[$0]
+        };
+break;
+case 159:this.$ = {
+          source: $$[$0-2],
+          guard: $$[$0],
+          object: true
+        };
+break;
+case 160:this.$ = {
+          source: $$[$0-2],
+          step: $$[$0]
+        };
+break;
+case 161:this.$ = {
+          source: $$[$0-4],
+          guard: $$[$0-2],
+          step: $$[$0]
+        };
+break;
+case 162:this.$ = {
+          source: $$[$0-4],
+          step: $$[$0-2],
+          guard: $$[$0]
+        };
+break;
+case 163:this.$ = new yy.Switch($$[$0-3], $$[$0-1]);
+break;
+case 164:this.$ = new yy.Switch($$[$0-5], $$[$0-3], $$[$0-1]);
+break;
+case 165:this.$ = new yy.Switch(null, $$[$0-1]);
+break;
+case 166:this.$ = new yy.Switch(null, $$[$0-3], $$[$0-1]);
+break;
+case 167:this.$ = $$[$0];
+break;
+case 168:this.$ = $$[$0-1].concat($$[$0]);
+break;
+case 169:this.$ = [[$$[$0-1], $$[$0]]];
+break;
+case 170:this.$ = [[$$[$0-2], $$[$0-1]]];
+break;
+case 171:this.$ = new yy.If($$[$0-1], $$[$0], {
+          type: $$[$0-2]
+        });
+break;
+case 172:this.$ = $$[$0-4].addElse(new yy.If($$[$0-1], $$[$0], {
+          type: $$[$0-2]
+        }));
+break;
+case 173:this.$ = $$[$0];
+break;
+case 174:this.$ = $$[$0-2].addElse($$[$0]);
+break;
+case 175:this.$ = new yy.If($$[$0], yy.Block.wrap([$$[$0-2]]), {
+          type: $$[$0-1],
+          statement: true
+        });
+break;
+case 176:this.$ = new yy.If($$[$0], yy.Block.wrap([$$[$0-2]]), {
+          type: $$[$0-1],
+          statement: true
+        });
+break;
+case 177:this.$ = new yy.Op($$[$0-1], $$[$0]);
+break;
+case 178:this.$ = new yy.Op('-', $$[$0]);
+break;
+case 179:this.$ = new yy.Op('+', $$[$0]);
+break;
+case 180:this.$ = new yy.Op('--', $$[$0]);
+break;
+case 181:this.$ = new yy.Op('++', $$[$0]);
+break;
+case 182:this.$ = new yy.Op('--', $$[$0-1], null, true);
+break;
+case 183:this.$ = new yy.Op('++', $$[$0-1], null, true);
+break;
+case 184:this.$ = new yy.Existence($$[$0-1]);
+break;
+case 185:this.$ = new yy.Op('+', $$[$0-2], $$[$0]);
+break;
+case 186:this.$ = new yy.Op('-', $$[$0-2], $$[$0]);
+break;
+case 187:this.$ = new yy.Op($$[$0-1], $$[$0-2], $$[$0]);
+break;
+case 188:this.$ = new yy.Op($$[$0-1], $$[$0-2], $$[$0]);
+break;
+case 189:this.$ = new yy.Op($$[$0-1], $$[$0-2], $$[$0]);
+break;
+case 190:this.$ = new yy.Op($$[$0-1], $$[$0-2], $$[$0]);
+break;
+case 191:this.$ = (function () {
+        if ($$[$0-1].charAt(0) === '!') {
+          return new yy.Op($$[$0-1].slice(1), $$[$0-2], $$[$0]).invert();
+        } else {
+          return new yy.Op($$[$0-1], $$[$0-2], $$[$0]);
+        }
+      }());
+break;
+case 192:this.$ = new yy.Assign($$[$0-2], $$[$0], $$[$0-1]);
+break;
+case 193:this.$ = new yy.Assign($$[$0-4], $$[$0-1], $$[$0-3]);
+break;
+case 194:this.$ = new yy.Extends($$[$0-2], $$[$0]);
+break;
+}
+},
+table: [{1:[2,1],3:1,4:2,5:3,7:4,8:6,9:7,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,5],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[3]},{1:[2,2],6:[1,71]},{6:[1,72]},{1:[2,4],6:[2,4],26:[2,4],99:[2,4]},{4:74,7:4,8:6,9:7,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,26:[1,73],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,7],6:[2,7],26:[2,7],99:[2,7],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,8],6:[2,8],26:[2,8],99:[2,8],100:87,101:[1,62],103:[1,63],106:88,107:[1,65],108:66,123:[1,86]},{1:[2,13],6:[2,13],25:[2,13],26:[2,13],46:[2,13],51:[2,13],54:[2,13],59:90,63:[1,92],64:[1,93],65:[1,94],66:95,67:[1,96],69:[2,13],70:[1,97],71:[1,98],75:[2,13],78:89,81:[1,91],82:[2,102],83:[2,13],88:[2,13],90:[2,13],99:[2,13],101:[2,13],102:[2,13],103:[2,13],107:[2,13],115:[2,13],123:[2,13],125:[2,13],126:[2,13],129:[2,13],130:[2,13],131:[2,13],132:[2,13],133:[2,13],134:[2,13]},{1:[2,14],6:[2,14],25:[2,14],26:[2,14],46:[2,14],51:[2,14],54:[2,14],59:100,63:[1,92],64:[1,93],65:[1,94],66:95,67:[1,96],69:[2,14],70:[1,97],71:[1,98],75:[2,14],78:99,81:[1,91],82:[2,102],83:[2,14],88:[2,14],90:[2,14],99:[2,14],101:[2,14],102:[2,14],103:[2,14],107:[2,14],115:[2,14],123:[2,14],125:[2,14],126:[2,14],129:[2,14],130:[2,14],131:[2,14],132:[2,14],133:[2,14],134:[2,14]},{1:[2,15],6:[2,15],25:[2,15],26:[2,15],46:[2,15],51:[2,15],54:[2,15],69:[2,15],75:[2,15],83:[2,15],88:[2,15],90:[2,15],99:[2,15],101:[2,15],102:[2,15],103:[2,15],107:[2,15],115:[2,15],123:[2,15],125:[2,15],126:[2,15],129:[2,15],130:[2,15],131:[2,15],132:[2,15],133:[2,15],134:[2,15]},{1:[2,16],6:[2,16],25:[2,16],26:[2,16],46:[2,16],51:[2,16],54:[2,16],69:[2,16],75:[2,16],83:[2,16],88:[2,16],90:[2,16],99:[2,16],101:[2,16],102:[2,16],103:[2,16],107:[2,16],115:[2,16],123:[2,16],125:[2,16],126:[2,16],129:[2,16],130:[2,16],131:[2,16],132:[2,16],133:[2,16],134:[2,16]},{1:[2,17],6:[2,17],25:[2,17],26:[2,17],46:[2,17],51:[2,17],54:[2,17],69:[2,17],75:[2,17],83:[2,17],88:[2,17],90:[2,17],99:[2,17],101:[2,17],102:[2,17],103:[2,17],107:[2,17],115:[2,17],123:[2,17],125:[2,17],126:[2,17],129:[2,17],130:[2,17],131:[2,17],132:[2,17],133:[2,17],134:[2,17]},{1:[2,18],6:[2,18],25:[2,18],26:[2,18],46:[2,18],51:[2,18],54:[2,18],69:[2,18],75:[2,18],83:[2,18],88:[2,18],90:[2,18],99:[2,18],101:[2,18],102:[2,18],103:[2,18],107:[2,18],115:[2,18],123:[2,18],125:[2,18],126:[2,18],129:[2,18],130:[2,18],131:[2,18],132:[2,18],133:[2,18],134:[2,18]},{1:[2,19],6:[2,19],25:[2,19],26:[2,19],46:[2,19],51:[2,19],54:[2,19],69:[2,19],75:[2,19],83:[2,19],88:[2,19],90:[2,19],99:[2,19],101:[2,19],102:[2,19],103:[2,19],107:[2,19],115:[2,19],123:[2,19],125:[2,19],126:[2,19],129:[2,19],130:[2,19],131:[2,19],132:[2,19],133:[2,19],134:[2,19]},{1:[2,20],6:[2,20],25:[2,20],26:[2,20],46:[2,20],51:[2,20],54:[2,20],69:[2,20],75:[2,20],83:[2,20],88:[2,20],90:[2,20],99:[2,20],101:[2,20],102:[2,20],103:[2,20],107:[2,20],115:[2,20],123:[2,20],125:[2,20],126:[2,20],129:[2,20],130:[2,20],131:[2,20],132:[2,20],133:[2,20],134:[2,20]},{1:[2,21],6:[2,21],25:[2,21],26:[2,21],46:[2,21],51:[2,21],54:[2,21],69:[2,21],75:[2,21],83:[2,21],88:[2,21],90:[2,21],99:[2,21],101:[2,21],102:[2,21],103:[2,21],107:[2,21],115:[2,21],123:[2,21],125:[2,21],126:[2,21],129:[2,21],130:[2,21],131:[2,21],132:[2,21],133:[2,21],134:[2,21]},{1:[2,22],6:[2,22],25:[2,22],26:[2,22],46:[2,22],51:[2,22],54:[2,22],69:[2,22],75:[2,22],83:[2,22],88:[2,22],90:[2,22],99:[2,22],101:[2,22],102:[2,22],103:[2,22],107:[2,22],115:[2,22],123:[2,22],125:[2,22],126:[2,22],129:[2,22],130:[2,22],131:[2,22],132:[2,22],133:[2,22],134:[2,22]},{1:[2,23],6:[2,23],25:[2,23],26:[2,23],46:[2,23],51:[2,23],54:[2,23],69:[2,23],75:[2,23],83:[2,23],88:[2,23],90:[2,23],99:[2,23],101:[2,23],102:[2,23],103:[2,23],107:[2,23],115:[2,23],123:[2,23],125:[2,23],126:[2,23],129:[2,23],130:[2,23],131:[2,23],132:[2,23],133:[2,23],134:[2,23]},{1:[2,9],6:[2,9],26:[2,9],99:[2,9],101:[2,9],103:[2,9],107:[2,9],123:[2,9]},{1:[2,10],6:[2,10],26:[2,10],99:[2,10],101:[2,10],103:[2,10],107:[2,10],123:[2,10]},{1:[2,11],6:[2,11],26:[2,11],99:[2,11],101:[2,11],103:[2,11],107:[2,11],123:[2,11]},{1:[2,12],6:[2,12],26:[2,12],99:[2,12],101:[2,12],103:[2,12],107:[2,12],123:[2,12]},{1:[2,69],6:[2,69],25:[2,69],26:[2,69],37:[1,101],46:[2,69],51:[2,69],54:[2,69],63:[2,69],64:[2,69],65:[2,69],67:[2,69],69:[2,69],70:[2,69],71:[2,69],75:[2,69],81:[2,69],82:[2,69],83:[2,69],88:[2,69],90:[2,69],99:[2,69],101:[2,69],102:[2,69],103:[2,69],107:[2,69],115:[2,69],123:[2,69],125:[2,69],126:[2,69],129:[2,69],130:[2,69],131:[2,69],132:[2,69],133:[2,69],134:[2,69]},{1:[2,70],6:[2,70],25:[2,70],26:[2,70],46:[2,70],51:[2,70],54:[2,70],63:[2,70],64:[2,70],65:[2,70],67:[2,70],69:[2,70],70:[2,70],71:[2,70],75:[2,70],81:[2,70],82:[2,70],83:[2,70],88:[2,70],90:[2,70],99:[2,70],101:[2,70],102:[2,70],103:[2,70],107:[2,70],115:[2,70],123:[2,70],125:[2,70],126:[2,70],129:[2,70],130:[2,70],131:[2,70],132:[2,70],133:[2,70],134:[2,70]},{1:[2,71],6:[2,71],25:[2,71],26:[2,71],46:[2,71],51:[2,71],54:[2,71],63:[2,71],64:[2,71],65:[2,71],67:[2,71],69:[2,71],70:[2,71],71:[2,71],75:[2,71],81:[2,71],82:[2,71],83:[2,71],88:[2,71],90:[2,71],99:[2,71],101:[2,71],102:[2,71],103:[2,71],107:[2,71],115:[2,71],123:[2,71],125:[2,71],126:[2,71],129:[2,71],130:[2,71],131:[2,71],132:[2,71],133:[2,71],134:[2,71]},{1:[2,72],6:[2,72],25:[2,72],26:[2,72],46:[2,72],51:[2,72],54:[2,72],63:[2,72],64:[2,72],65:[2,72],67:[2,72],69:[2,72],70:[2,72],71:[2,72],75:[2,72],81:[2,72],82:[2,72],83:[2,72],88:[2,72],90:[2,72],99:[2,72],101:[2,72],102:[2,72],103:[2,72],107:[2,72],115:[2,72],123:[2,72],125:[2,72],126:[2,72],129:[2,72],130:[2,72],131:[2,72],132:[2,72],133:[2,72],134:[2,72]},{1:[2,73],6:[2,73],25:[2,73],26:[2,73],46:[2,73],51:[2,73],54:[2,73],63:[2,73],64:[2,73],65:[2,73],67:[2,73],69:[2,73],70:[2,73],71:[2,73],75:[2,73],81:[2,73],82:[2,73],83:[2,73],88:[2,73],90:[2,73],99:[2,73],101:[2,73],102:[2,73],103:[2,73],107:[2,73],115:[2,73],123:[2,73],125:[2,73],126:[2,73],129:[2,73],130:[2,73],131:[2,73],132:[2,73],133:[2,73],134:[2,73]},{1:[2,100],6:[2,100],25:[2,100],26:[2,100],46:[2,100],51:[2,100],54:[2,100],63:[2,100],64:[2,100],65:[2,100],67:[2,100],69:[2,100],70:[2,100],71:[2,100],75:[2,100],79:102,81:[2,100],82:[1,103],83:[2,100],88:[2,100],90:[2,100],99:[2,100],101:[2,100],102:[2,100],103:[2,100],107:[2,100],115:[2,100],123:[2,100],125:[2,100],126:[2,100],129:[2,100],130:[2,100],131:[2,100],132:[2,100],133:[2,100],134:[2,100]},{27:107,28:[1,70],41:108,45:104,46:[2,51],51:[2,51],52:105,53:106,55:109,56:110,73:[1,67],86:[1,111],87:[1,112]},{5:113,25:[1,5]},{8:114,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:116,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:117,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{14:119,15:120,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:121,41:60,55:47,56:48,58:118,60:25,61:26,62:27,73:[1,67],80:[1,28],85:[1,55],86:[1,56],87:[1,54],98:[1,53]},{14:119,15:120,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:121,41:60,55:47,56:48,58:122,60:25,61:26,62:27,73:[1,67],80:[1,28],85:[1,55],86:[1,56],87:[1,54],98:[1,53]},{1:[2,66],6:[2,66],25:[2,66],26:[2,66],37:[2,66],46:[2,66],51:[2,66],54:[2,66],63:[2,66],64:[2,66],65:[2,66],67:[2,66],69:[2,66],70:[2,66],71:[2,66],75:[2,66],77:[1,126],81:[2,66],82:[2,66],83:[2,66],88:[2,66],90:[2,66],99:[2,66],101:[2,66],102:[2,66],103:[2,66],107:[2,66],115:[2,66],123:[2,66],125:[2,66],126:[2,66],127:[1,123],128:[1,124],129:[2,66],130:[2,66],131:[2,66],132:[2,66],133:[2,66],134:[2,66],135:[1,125]},{1:[2,173],6:[2,173],25:[2,173],26:[2,173],46:[2,173],51:[2,173],54:[2,173],69:[2,173],75:[2,173],83:[2,173],88:[2,173],90:[2,173],99:[2,173],101:[2,173],102:[2,173],103:[2,173],107:[2,173],115:[2,173],118:[1,127],123:[2,173],125:[2,173],126:[2,173],129:[2,173],130:[2,173],131:[2,173],132:[2,173],133:[2,173],134:[2,173]},{5:128,25:[1,5]},{5:129,25:[1,5]},{1:[2,141],6:[2,141],25:[2,141],26:[2,141],46:[2,141],51:[2,141],54:[2,141],69:[2,141],75:[2,141],83:[2,141],88:[2,141],90:[2,141],99:[2,141],101:[2,141],102:[2,141],103:[2,141],107:[2,141],115:[2,141],123:[2,141],125:[2,141],126:[2,141],129:[2,141],130:[2,141],131:[2,141],132:[2,141],133:[2,141],134:[2,141]},{5:130,25:[1,5]},{8:131,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,132],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,90],5:133,6:[2,90],14:119,15:120,25:[1,5],26:[2,90],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:121,41:60,46:[2,90],51:[2,90],54:[2,90],55:47,56:48,58:135,60:25,61:26,62:27,69:[2,90],73:[1,67],75:[2,90],77:[1,134],80:[1,28],83:[2,90],85:[1,55],86:[1,56],87:[1,54],88:[2,90],90:[2,90],98:[1,53],99:[2,90],101:[2,90],102:[2,90],103:[2,90],107:[2,90],115:[2,90],123:[2,90],125:[2,90],126:[2,90],129:[2,90],130:[2,90],131:[2,90],132:[2,90],133:[2,90],134:[2,90]},{1:[2,43],6:[2,43],8:136,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,26:[2,43],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],99:[2,43],100:39,101:[2,43],103:[2,43],104:40,105:[1,64],106:41,107:[2,43],108:66,116:[1,42],121:37,122:[1,61],123:[2,43],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:137,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,44],6:[2,44],25:[2,44],26:[2,44],51:[2,44],75:[2,44],99:[2,44],101:[2,44],103:[2,44],107:[2,44],123:[2,44]},{1:[2,67],6:[2,67],25:[2,67],26:[2,67],37:[2,67],46:[2,67],51:[2,67],54:[2,67],63:[2,67],64:[2,67],65:[2,67],67:[2,67],69:[2,67],70:[2,67],71:[2,67],75:[2,67],81:[2,67],82:[2,67],83:[2,67],88:[2,67],90:[2,67],99:[2,67],101:[2,67],102:[2,67],103:[2,67],107:[2,67],115:[2,67],123:[2,67],125:[2,67],126:[2,67],129:[2,67],130:[2,67],131:[2,67],132:[2,67],133:[2,67],134:[2,67]},{1:[2,68],6:[2,68],25:[2,68],26:[2,68],37:[2,68],46:[2,68],51:[2,68],54:[2,68],63:[2,68],64:[2,68],65:[2,68],67:[2,68],69:[2,68],70:[2,68],71:[2,68],75:[2,68],81:[2,68],82:[2,68],83:[2,68],88:[2,68],90:[2,68],99:[2,68],101:[2,68],102:[2,68],103:[2,68],107:[2,68],115:[2,68],123:[2,68],125:[2,68],126:[2,68],129:[2,68],130:[2,68],131:[2,68],132:[2,68],133:[2,68],134:[2,68]},{1:[2,29],6:[2,29],25:[2,29],26:[2,29],46:[2,29],51:[2,29],54:[2,29],63:[2,29],64:[2,29],65:[2,29],67:[2,29],69:[2,29],70:[2,29],71:[2,29],75:[2,29],81:[2,29],82:[2,29],83:[2,29],88:[2,29],90:[2,29],99:[2,29],101:[2,29],102:[2,29],103:[2,29],107:[2,29],115:[2,29],123:[2,29],125:[2,29],126:[2,29],129:[2,29],130:[2,29],131:[2,29],132:[2,29],133:[2,29],134:[2,29]},{1:[2,30],6:[2,30],25:[2,30],26:[2,30],46:[2,30],51:[2,30],54:[2,30],63:[2,30],64:[2,30],65:[2,30],67:[2,30],69:[2,30],70:[2,30],71:[2,30],75:[2,30],81:[2,30],82:[2,30],83:[2,30],88:[2,30],90:[2,30],99:[2,30],101:[2,30],102:[2,30],103:[2,30],107:[2,30],115:[2,30],123:[2,30],125:[2,30],126:[2,30],129:[2,30],130:[2,30],131:[2,30],132:[2,30],133:[2,30],134:[2,30]},{1:[2,31],6:[2,31],25:[2,31],26:[2,31],46:[2,31],51:[2,31],54:[2,31],63:[2,31],64:[2,31],65:[2,31],67:[2,31],69:[2,31],70:[2,31],71:[2,31],75:[2,31],81:[2,31],82:[2,31],83:[2,31],88:[2,31],90:[2,31],99:[2,31],101:[2,31],102:[2,31],103:[2,31],107:[2,31],115:[2,31],123:[2,31],125:[2,31],126:[2,31],129:[2,31],130:[2,31],131:[2,31],132:[2,31],133:[2,31],134:[2,31]},{1:[2,32],6:[2,32],25:[2,32],26:[2,32],46:[2,32],51:[2,32],54:[2,32],63:[2,32],64:[2,32],65:[2,32],67:[2,32],69:[2,32],70:[2,32],71:[2,32],75:[2,32],81:[2,32],82:[2,32],83:[2,32],88:[2,32],90:[2,32],99:[2,32],101:[2,32],102:[2,32],103:[2,32],107:[2,32],115:[2,32],123:[2,32],125:[2,32],126:[2,32],129:[2,32],130:[2,32],131:[2,32],132:[2,32],133:[2,32],134:[2,32]},{4:138,7:4,8:6,9:7,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,139],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:140,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,144],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,57:145,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],84:142,85:[1,55],86:[1,56],87:[1,54],88:[1,141],91:143,93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,106],6:[2,106],25:[2,106],26:[2,106],46:[2,106],51:[2,106],54:[2,106],63:[2,106],64:[2,106],65:[2,106],67:[2,106],69:[2,106],70:[2,106],71:[2,106],75:[2,106],81:[2,106],82:[2,106],83:[2,106],88:[2,106],90:[2,106],99:[2,106],101:[2,106],102:[2,106],103:[2,106],107:[2,106],115:[2,106],123:[2,106],125:[2,106],126:[2,106],129:[2,106],130:[2,106],131:[2,106],132:[2,106],133:[2,106],134:[2,106]},{1:[2,107],6:[2,107],25:[2,107],26:[2,107],27:146,28:[1,70],46:[2,107],51:[2,107],54:[2,107],63:[2,107],64:[2,107],65:[2,107],67:[2,107],69:[2,107],70:[2,107],71:[2,107],75:[2,107],81:[2,107],82:[2,107],83:[2,107],88:[2,107],90:[2,107],99:[2,107],101:[2,107],102:[2,107],103:[2,107],107:[2,107],115:[2,107],123:[2,107],125:[2,107],126:[2,107],129:[2,107],130:[2,107],131:[2,107],132:[2,107],133:[2,107],134:[2,107]},{25:[2,47]},{25:[2,48]},{1:[2,62],6:[2,62],25:[2,62],26:[2,62],37:[2,62],46:[2,62],51:[2,62],54:[2,62],63:[2,62],64:[2,62],65:[2,62],67:[2,62],69:[2,62],70:[2,62],71:[2,62],75:[2,62],77:[2,62],81:[2,62],82:[2,62],83:[2,62],88:[2,62],90:[2,62],99:[2,62],101:[2,62],102:[2,62],103:[2,62],107:[2,62],115:[2,62],123:[2,62],125:[2,62],126:[2,62],127:[2,62],128:[2,62],129:[2,62],130:[2,62],131:[2,62],132:[2,62],133:[2,62],134:[2,62],135:[2,62]},{1:[2,65],6:[2,65],25:[2,65],26:[2,65],37:[2,65],46:[2,65],51:[2,65],54:[2,65],63:[2,65],64:[2,65],65:[2,65],67:[2,65],69:[2,65],70:[2,65],71:[2,65],75:[2,65],77:[2,65],81:[2,65],82:[2,65],83:[2,65],88:[2,65],90:[2,65],99:[2,65],101:[2,65],102:[2,65],103:[2,65],107:[2,65],115:[2,65],123:[2,65],125:[2,65],126:[2,65],127:[2,65],128:[2,65],129:[2,65],130:[2,65],131:[2,65],132:[2,65],133:[2,65],134:[2,65],135:[2,65]},{8:147,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:148,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:149,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{5:150,8:151,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,5],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{27:156,28:[1,70],55:157,56:158,61:152,73:[1,67],87:[1,54],110:153,111:[1,154],112:155},{109:159,113:[1,160],114:[1,161]},{6:[2,85],12:165,25:[2,85],27:166,28:[1,70],29:167,30:[1,68],31:[1,69],38:163,39:164,41:168,43:[1,46],51:[2,85],74:162,75:[2,85],86:[1,111]},{1:[2,27],6:[2,27],25:[2,27],26:[2,27],40:[2,27],46:[2,27],51:[2,27],54:[2,27],63:[2,27],64:[2,27],65:[2,27],67:[2,27],69:[2,27],70:[2,27],71:[2,27],75:[2,27],81:[2,27],82:[2,27],83:[2,27],88:[2,27],90:[2,27],99:[2,27],101:[2,27],102:[2,27],103:[2,27],107:[2,27],115:[2,27],123:[2,27],125:[2,27],126:[2,27],129:[2,27],130:[2,27],131:[2,27],132:[2,27],133:[2,27],134:[2,27]},{1:[2,28],6:[2,28],25:[2,28],26:[2,28],40:[2,28],46:[2,28],51:[2,28],54:[2,28],63:[2,28],64:[2,28],65:[2,28],67:[2,28],69:[2,28],70:[2,28],71:[2,28],75:[2,28],81:[2,28],82:[2,28],83:[2,28],88:[2,28],90:[2,28],99:[2,28],101:[2,28],102:[2,28],103:[2,28],107:[2,28],115:[2,28],123:[2,28],125:[2,28],126:[2,28],129:[2,28],130:[2,28],131:[2,28],132:[2,28],133:[2,28],134:[2,28]},{1:[2,26],6:[2,26],25:[2,26],26:[2,26],37:[2,26],40:[2,26],46:[2,26],51:[2,26],54:[2,26],63:[2,26],64:[2,26],65:[2,26],67:[2,26],69:[2,26],70:[2,26],71:[2,26],75:[2,26],77:[2,26],81:[2,26],82:[2,26],83:[2,26],88:[2,26],90:[2,26],99:[2,26],101:[2,26],102:[2,26],103:[2,26],107:[2,26],113:[2,26],114:[2,26],115:[2,26],123:[2,26],125:[2,26],126:[2,26],127:[2,26],128:[2,26],129:[2,26],130:[2,26],131:[2,26],132:[2,26],133:[2,26],134:[2,26],135:[2,26]},{1:[2,6],6:[2,6],7:169,8:6,9:7,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,26:[2,6],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],99:[2,6],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,3]},{1:[2,24],6:[2,24],25:[2,24],26:[2,24],46:[2,24],51:[2,24],54:[2,24],69:[2,24],75:[2,24],83:[2,24],88:[2,24],90:[2,24],95:[2,24],96:[2,24],99:[2,24],101:[2,24],102:[2,24],103:[2,24],107:[2,24],115:[2,24],118:[2,24],120:[2,24],123:[2,24],125:[2,24],126:[2,24],129:[2,24],130:[2,24],131:[2,24],132:[2,24],133:[2,24],134:[2,24]},{6:[1,71],26:[1,170]},{1:[2,184],6:[2,184],25:[2,184],26:[2,184],46:[2,184],51:[2,184],54:[2,184],69:[2,184],75:[2,184],83:[2,184],88:[2,184],90:[2,184],99:[2,184],101:[2,184],102:[2,184],103:[2,184],107:[2,184],115:[2,184],123:[2,184],125:[2,184],126:[2,184],129:[2,184],130:[2,184],131:[2,184],132:[2,184],133:[2,184],134:[2,184]},{8:171,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:172,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:173,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:174,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:175,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:176,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:177,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:178,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,140],6:[2,140],25:[2,140],26:[2,140],46:[2,140],51:[2,140],54:[2,140],69:[2,140],75:[2,140],83:[2,140],88:[2,140],90:[2,140],99:[2,140],101:[2,140],102:[2,140],103:[2,140],107:[2,140],115:[2,140],123:[2,140],125:[2,140],126:[2,140],129:[2,140],130:[2,140],131:[2,140],132:[2,140],133:[2,140],134:[2,140]},{1:[2,145],6:[2,145],25:[2,145],26:[2,145],46:[2,145],51:[2,145],54:[2,145],69:[2,145],75:[2,145],83:[2,145],88:[2,145],90:[2,145],99:[2,145],101:[2,145],102:[2,145],103:[2,145],107:[2,145],115:[2,145],123:[2,145],125:[2,145],126:[2,145],129:[2,145],130:[2,145],131:[2,145],132:[2,145],133:[2,145],134:[2,145]},{8:179,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,139],6:[2,139],25:[2,139],26:[2,139],46:[2,139],51:[2,139],54:[2,139],69:[2,139],75:[2,139],83:[2,139],88:[2,139],90:[2,139],99:[2,139],101:[2,139],102:[2,139],103:[2,139],107:[2,139],115:[2,139],123:[2,139],125:[2,139],126:[2,139],129:[2,139],130:[2,139],131:[2,139],132:[2,139],133:[2,139],134:[2,139]},{1:[2,144],6:[2,144],25:[2,144],26:[2,144],46:[2,144],51:[2,144],54:[2,144],69:[2,144],75:[2,144],83:[2,144],88:[2,144],90:[2,144],99:[2,144],101:[2,144],102:[2,144],103:[2,144],107:[2,144],115:[2,144],123:[2,144],125:[2,144],126:[2,144],129:[2,144],130:[2,144],131:[2,144],132:[2,144],133:[2,144],134:[2,144]},{79:180,82:[1,103]},{1:[2,63],6:[2,63],25:[2,63],26:[2,63],37:[2,63],46:[2,63],51:[2,63],54:[2,63],63:[2,63],64:[2,63],65:[2,63],67:[2,63],69:[2,63],70:[2,63],71:[2,63],75:[2,63],77:[2,63],81:[2,63],82:[2,63],83:[2,63],88:[2,63],90:[2,63],99:[2,63],101:[2,63],102:[2,63],103:[2,63],107:[2,63],115:[2,63],123:[2,63],125:[2,63],126:[2,63],127:[2,63],128:[2,63],129:[2,63],130:[2,63],131:[2,63],132:[2,63],133:[2,63],134:[2,63],135:[2,63]},{82:[2,103]},{27:181,28:[1,70]},{27:182,28:[1,70]},{1:[2,77],6:[2,77],25:[2,77],26:[2,77],27:183,28:[1,70],37:[2,77],46:[2,77],51:[2,77],54:[2,77],63:[2,77],64:[2,77],65:[2,77],67:[2,77],69:[2,77],70:[2,77],71:[2,77],75:[2,77],77:[2,77],81:[2,77],82:[2,77],83:[2,77],88:[2,77],90:[2,77],99:[2,77],101:[2,77],102:[2,77],103:[2,77],107:[2,77],115:[2,77],123:[2,77],125:[2,77],126:[2,77],127:[2,77],128:[2,77],129:[2,77],130:[2,77],131:[2,77],132:[2,77],133:[2,77],134:[2,77],135:[2,77]},{1:[2,78],6:[2,78],25:[2,78],26:[2,78],37:[2,78],46:[2,78],51:[2,78],54:[2,78],63:[2,78],64:[2,78],65:[2,78],67:[2,78],69:[2,78],70:[2,78],71:[2,78],75:[2,78],77:[2,78],81:[2,78],82:[2,78],83:[2,78],88:[2,78],90:[2,78],99:[2,78],101:[2,78],102:[2,78],103:[2,78],107:[2,78],115:[2,78],123:[2,78],125:[2,78],126:[2,78],127:[2,78],128:[2,78],129:[2,78],130:[2,78],131:[2,78],132:[2,78],133:[2,78],134:[2,78],135:[2,78]},{8:185,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],54:[1,189],55:47,56:48,58:36,60:25,61:26,62:27,68:184,72:186,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],89:187,90:[1,188],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{66:190,67:[1,96],70:[1,97],71:[1,98]},{66:191,67:[1,96],70:[1,97],71:[1,98]},{79:192,82:[1,103]},{1:[2,64],6:[2,64],25:[2,64],26:[2,64],37:[2,64],46:[2,64],51:[2,64],54:[2,64],63:[2,64],64:[2,64],65:[2,64],67:[2,64],69:[2,64],70:[2,64],71:[2,64],75:[2,64],77:[2,64],81:[2,64],82:[2,64],83:[2,64],88:[2,64],90:[2,64],99:[2,64],101:[2,64],102:[2,64],103:[2,64],107:[2,64],115:[2,64],123:[2,64],125:[2,64],126:[2,64],127:[2,64],128:[2,64],129:[2,64],130:[2,64],131:[2,64],132:[2,64],133:[2,64],134:[2,64],135:[2,64]},{8:193,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,194],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,101],6:[2,101],25:[2,101],26:[2,101],46:[2,101],51:[2,101],54:[2,101],63:[2,101],64:[2,101],65:[2,101],67:[2,101],69:[2,101],70:[2,101],71:[2,101],75:[2,101],81:[2,101],82:[2,101],83:[2,101],88:[2,101],90:[2,101],99:[2,101],101:[2,101],102:[2,101],103:[2,101],107:[2,101],115:[2,101],123:[2,101],125:[2,101],126:[2,101],129:[2,101],130:[2,101],131:[2,101],132:[2,101],133:[2,101],134:[2,101]},{8:197,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,144],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,57:145,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],83:[1,195],84:196,85:[1,55],86:[1,56],87:[1,54],91:143,93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{46:[1,198],51:[1,199]},{46:[2,52],51:[2,52]},{37:[1,201],46:[2,54],51:[2,54],54:[1,200]},{37:[2,57],46:[2,57],51:[2,57],54:[2,57]},{37:[2,58],46:[2,58],51:[2,58],54:[2,58]},{37:[2,59],46:[2,59],51:[2,59],54:[2,59]},{37:[2,60],46:[2,60],51:[2,60],54:[2,60]},{27:146,28:[1,70]},{8:197,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,144],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,57:145,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],84:142,85:[1,55],86:[1,56],87:[1,54],88:[1,141],91:143,93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,46],6:[2,46],25:[2,46],26:[2,46],46:[2,46],51:[2,46],54:[2,46],69:[2,46],75:[2,46],83:[2,46],88:[2,46],90:[2,46],99:[2,46],101:[2,46],102:[2,46],103:[2,46],107:[2,46],115:[2,46],123:[2,46],125:[2,46],126:[2,46],129:[2,46],130:[2,46],131:[2,46],132:[2,46],133:[2,46],134:[2,46]},{1:[2,177],6:[2,177],25:[2,177],26:[2,177],46:[2,177],51:[2,177],54:[2,177],69:[2,177],75:[2,177],83:[2,177],88:[2,177],90:[2,177],99:[2,177],100:84,101:[2,177],102:[2,177],103:[2,177],106:85,107:[2,177],108:66,115:[2,177],123:[2,177],125:[2,177],126:[2,177],129:[1,75],130:[2,177],131:[2,177],132:[2,177],133:[2,177],134:[2,177]},{100:87,101:[1,62],103:[1,63],106:88,107:[1,65],108:66,123:[1,86]},{1:[2,178],6:[2,178],25:[2,178],26:[2,178],46:[2,178],51:[2,178],54:[2,178],69:[2,178],75:[2,178],83:[2,178],88:[2,178],90:[2,178],99:[2,178],100:84,101:[2,178],102:[2,178],103:[2,178],106:85,107:[2,178],108:66,115:[2,178],123:[2,178],125:[2,178],126:[2,178],129:[1,75],130:[2,178],131:[2,178],132:[2,178],133:[2,178],134:[2,178]},{1:[2,179],6:[2,179],25:[2,179],26:[2,179],46:[2,179],51:[2,179],54:[2,179],69:[2,179],75:[2,179],83:[2,179],88:[2,179],90:[2,179],99:[2,179],100:84,101:[2,179],102:[2,179],103:[2,179],106:85,107:[2,179],108:66,115:[2,179],123:[2,179],125:[2,179],126:[2,179],129:[1,75],130:[2,179],131:[2,179],132:[2,179],133:[2,179],134:[2,179]},{1:[2,180],6:[2,180],25:[2,180],26:[2,180],46:[2,180],51:[2,180],54:[2,180],63:[2,66],64:[2,66],65:[2,66],67:[2,66],69:[2,180],70:[2,66],71:[2,66],75:[2,180],81:[2,66],82:[2,66],83:[2,180],88:[2,180],90:[2,180],99:[2,180],101:[2,180],102:[2,180],103:[2,180],107:[2,180],115:[2,180],123:[2,180],125:[2,180],126:[2,180],129:[2,180],130:[2,180],131:[2,180],132:[2,180],133:[2,180],134:[2,180]},{59:90,63:[1,92],64:[1,93],65:[1,94],66:95,67:[1,96],70:[1,97],71:[1,98],78:89,81:[1,91],82:[2,102]},{59:100,63:[1,92],64:[1,93],65:[1,94],66:95,67:[1,96],70:[1,97],71:[1,98],78:99,81:[1,91],82:[2,102]},{1:[2,69],6:[2,69],25:[2,69],26:[2,69],46:[2,69],51:[2,69],54:[2,69],63:[2,69],64:[2,69],65:[2,69],67:[2,69],69:[2,69],70:[2,69],71:[2,69],75:[2,69],81:[2,69],82:[2,69],83:[2,69],88:[2,69],90:[2,69],99:[2,69],101:[2,69],102:[2,69],103:[2,69],107:[2,69],115:[2,69],123:[2,69],125:[2,69],126:[2,69],129:[2,69],130:[2,69],131:[2,69],132:[2,69],133:[2,69],134:[2,69]},{1:[2,181],6:[2,181],25:[2,181],26:[2,181],46:[2,181],51:[2,181],54:[2,181],63:[2,66],64:[2,66],65:[2,66],67:[2,66],69:[2,181],70:[2,66],71:[2,66],75:[2,181],81:[2,66],82:[2,66],83:[2,181],88:[2,181],90:[2,181],99:[2,181],101:[2,181],102:[2,181],103:[2,181],107:[2,181],115:[2,181],123:[2,181],125:[2,181],126:[2,181],129:[2,181],130:[2,181],131:[2,181],132:[2,181],133:[2,181],134:[2,181]},{1:[2,182],6:[2,182],25:[2,182],26:[2,182],46:[2,182],51:[2,182],54:[2,182],69:[2,182],75:[2,182],83:[2,182],88:[2,182],90:[2,182],99:[2,182],101:[2,182],102:[2,182],103:[2,182],107:[2,182],115:[2,182],123:[2,182],125:[2,182],126:[2,182],129:[2,182],130:[2,182],131:[2,182],132:[2,182],133:[2,182],134:[2,182]},{1:[2,183],6:[2,183],25:[2,183],26:[2,183],46:[2,183],51:[2,183],54:[2,183],69:[2,183],75:[2,183],83:[2,183],88:[2,183],90:[2,183],99:[2,183],101:[2,183],102:[2,183],103:[2,183],107:[2,183],115:[2,183],123:[2,183],125:[2,183],126:[2,183],129:[2,183],130:[2,183],131:[2,183],132:[2,183],133:[2,183],134:[2,183]},{8:202,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,203],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:204,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{5:205,25:[1,5],122:[1,206]},{1:[2,126],6:[2,126],25:[2,126],26:[2,126],46:[2,126],51:[2,126],54:[2,126],69:[2,126],75:[2,126],83:[2,126],88:[2,126],90:[2,126],94:207,95:[1,208],96:[1,209],99:[2,126],101:[2,126],102:[2,126],103:[2,126],107:[2,126],115:[2,126],123:[2,126],125:[2,126],126:[2,126],129:[2,126],130:[2,126],131:[2,126],132:[2,126],133:[2,126],134:[2,126]},{1:[2,138],6:[2,138],25:[2,138],26:[2,138],46:[2,138],51:[2,138],54:[2,138],69:[2,138],75:[2,138],83:[2,138],88:[2,138],90:[2,138],99:[2,138],101:[2,138],102:[2,138],103:[2,138],107:[2,138],115:[2,138],123:[2,138],125:[2,138],126:[2,138],129:[2,138],130:[2,138],131:[2,138],132:[2,138],133:[2,138],134:[2,138]},{1:[2,146],6:[2,146],25:[2,146],26:[2,146],46:[2,146],51:[2,146],54:[2,146],69:[2,146],75:[2,146],83:[2,146],88:[2,146],90:[2,146],99:[2,146],101:[2,146],102:[2,146],103:[2,146],107:[2,146],115:[2,146],123:[2,146],125:[2,146],126:[2,146],129:[2,146],130:[2,146],131:[2,146],132:[2,146],133:[2,146],134:[2,146]},{25:[1,210],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{117:211,119:212,120:[1,213]},{1:[2,91],6:[2,91],25:[2,91],26:[2,91],46:[2,91],51:[2,91],54:[2,91],69:[2,91],75:[2,91],83:[2,91],88:[2,91],90:[2,91],99:[2,91],101:[2,91],102:[2,91],103:[2,91],107:[2,91],115:[2,91],123:[2,91],125:[2,91],126:[2,91],129:[2,91],130:[2,91],131:[2,91],132:[2,91],133:[2,91],134:[2,91]},{14:214,15:120,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:121,41:60,55:47,56:48,58:215,60:25,61:26,62:27,73:[1,67],80:[1,28],85:[1,55],86:[1,56],87:[1,54],98:[1,53]},{1:[2,94],5:216,6:[2,94],25:[1,5],26:[2,94],46:[2,94],51:[2,94],54:[2,94],63:[2,66],64:[2,66],65:[2,66],67:[2,66],69:[2,94],70:[2,66],71:[2,66],75:[2,94],77:[1,217],81:[2,66],82:[2,66],83:[2,94],88:[2,94],90:[2,94],99:[2,94],101:[2,94],102:[2,94],103:[2,94],107:[2,94],115:[2,94],123:[2,94],125:[2,94],126:[2,94],129:[2,94],130:[2,94],131:[2,94],132:[2,94],133:[2,94],134:[2,94]},{1:[2,42],6:[2,42],26:[2,42],99:[2,42],100:84,101:[2,42],103:[2,42],106:85,107:[2,42],108:66,123:[2,42],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,131],6:[2,131],26:[2,131],99:[2,131],100:84,101:[2,131],103:[2,131],106:85,107:[2,131],108:66,123:[2,131],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{6:[1,71],99:[1,218]},{4:219,7:4,8:6,9:7,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,122],25:[2,122],51:[2,122],54:[1,221],88:[2,122],89:220,90:[1,188],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,109],6:[2,109],25:[2,109],26:[2,109],37:[2,109],46:[2,109],51:[2,109],54:[2,109],63:[2,109],64:[2,109],65:[2,109],67:[2,109],69:[2,109],70:[2,109],71:[2,109],75:[2,109],81:[2,109],82:[2,109],83:[2,109],88:[2,109],90:[2,109],99:[2,109],101:[2,109],102:[2,109],103:[2,109],107:[2,109],113:[2,109],114:[2,109],115:[2,109],123:[2,109],125:[2,109],126:[2,109],129:[2,109],130:[2,109],131:[2,109],132:[2,109],133:[2,109],134:[2,109]},{6:[2,49],25:[2,49],50:222,51:[1,223],88:[2,49]},{6:[2,117],25:[2,117],26:[2,117],51:[2,117],83:[2,117],88:[2,117]},{8:197,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,144],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,57:145,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],84:224,85:[1,55],86:[1,56],87:[1,54],91:143,93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,123],25:[2,123],26:[2,123],51:[2,123],83:[2,123],88:[2,123]},{1:[2,108],6:[2,108],25:[2,108],26:[2,108],37:[2,108],40:[2,108],46:[2,108],51:[2,108],54:[2,108],63:[2,108],64:[2,108],65:[2,108],67:[2,108],69:[2,108],70:[2,108],71:[2,108],75:[2,108],77:[2,108],81:[2,108],82:[2,108],83:[2,108],88:[2,108],90:[2,108],99:[2,108],101:[2,108],102:[2,108],103:[2,108],107:[2,108],115:[2,108],123:[2,108],125:[2,108],126:[2,108],127:[2,108],128:[2,108],129:[2,108],130:[2,108],131:[2,108],132:[2,108],133:[2,108],134:[2,108],135:[2,108]},{5:225,25:[1,5],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,134],6:[2,134],25:[2,134],26:[2,134],46:[2,134],51:[2,134],54:[2,134],69:[2,134],75:[2,134],83:[2,134],88:[2,134],90:[2,134],99:[2,134],100:84,101:[1,62],102:[1,226],103:[1,63],106:85,107:[1,65],108:66,115:[2,134],123:[2,134],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,136],6:[2,136],25:[2,136],26:[2,136],46:[2,136],51:[2,136],54:[2,136],69:[2,136],75:[2,136],83:[2,136],88:[2,136],90:[2,136],99:[2,136],100:84,101:[1,62],102:[1,227],103:[1,63],106:85,107:[1,65],108:66,115:[2,136],123:[2,136],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,142],6:[2,142],25:[2,142],26:[2,142],46:[2,142],51:[2,142],54:[2,142],69:[2,142],75:[2,142],83:[2,142],88:[2,142],90:[2,142],99:[2,142],101:[2,142],102:[2,142],103:[2,142],107:[2,142],115:[2,142],123:[2,142],125:[2,142],126:[2,142],129:[2,142],130:[2,142],131:[2,142],132:[2,142],133:[2,142],134:[2,142]},{1:[2,143],6:[2,143],25:[2,143],26:[2,143],46:[2,143],51:[2,143],54:[2,143],69:[2,143],75:[2,143],83:[2,143],88:[2,143],90:[2,143],99:[2,143],100:84,101:[1,62],102:[2,143],103:[1,63],106:85,107:[1,65],108:66,115:[2,143],123:[2,143],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,147],6:[2,147],25:[2,147],26:[2,147],46:[2,147],51:[2,147],54:[2,147],69:[2,147],75:[2,147],83:[2,147],88:[2,147],90:[2,147],99:[2,147],101:[2,147],102:[2,147],103:[2,147],107:[2,147],115:[2,147],123:[2,147],125:[2,147],126:[2,147],129:[2,147],130:[2,147],131:[2,147],132:[2,147],133:[2,147],134:[2,147]},{113:[2,149],114:[2,149]},{27:156,28:[1,70],55:157,56:158,73:[1,67],87:[1,112],110:228,112:155},{51:[1,229],113:[2,154],114:[2,154]},{51:[2,151],113:[2,151],114:[2,151]},{51:[2,152],113:[2,152],114:[2,152]},{51:[2,153],113:[2,153],114:[2,153]},{1:[2,148],6:[2,148],25:[2,148],26:[2,148],46:[2,148],51:[2,148],54:[2,148],69:[2,148],75:[2,148],83:[2,148],88:[2,148],90:[2,148],99:[2,148],101:[2,148],102:[2,148],103:[2,148],107:[2,148],115:[2,148],123:[2,148],125:[2,148],126:[2,148],129:[2,148],130:[2,148],131:[2,148],132:[2,148],133:[2,148],134:[2,148]},{8:230,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:231,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,49],25:[2,49],50:232,51:[1,233],75:[2,49]},{6:[2,86],25:[2,86],26:[2,86],51:[2,86],75:[2,86]},{6:[2,35],25:[2,35],26:[2,35],40:[1,234],51:[2,35],75:[2,35]},{6:[2,38],25:[2,38],26:[2,38],51:[2,38],75:[2,38]},{6:[2,39],25:[2,39],26:[2,39],40:[2,39],51:[2,39],75:[2,39]},{6:[2,40],25:[2,40],26:[2,40],40:[2,40],51:[2,40],75:[2,40]},{6:[2,41],25:[2,41],26:[2,41],40:[2,41],51:[2,41],75:[2,41]},{1:[2,5],6:[2,5],26:[2,5],99:[2,5]},{1:[2,25],6:[2,25],25:[2,25],26:[2,25],46:[2,25],51:[2,25],54:[2,25],69:[2,25],75:[2,25],83:[2,25],88:[2,25],90:[2,25],95:[2,25],96:[2,25],99:[2,25],101:[2,25],102:[2,25],103:[2,25],107:[2,25],115:[2,25],118:[2,25],120:[2,25],123:[2,25],125:[2,25],126:[2,25],129:[2,25],130:[2,25],131:[2,25],132:[2,25],133:[2,25],134:[2,25]},{1:[2,185],6:[2,185],25:[2,185],26:[2,185],46:[2,185],51:[2,185],54:[2,185],69:[2,185],75:[2,185],83:[2,185],88:[2,185],90:[2,185],99:[2,185],100:84,101:[2,185],102:[2,185],103:[2,185],106:85,107:[2,185],108:66,115:[2,185],123:[2,185],125:[2,185],126:[2,185],129:[1,75],130:[1,78],131:[2,185],132:[2,185],133:[2,185],134:[2,185]},{1:[2,186],6:[2,186],25:[2,186],26:[2,186],46:[2,186],51:[2,186],54:[2,186],69:[2,186],75:[2,186],83:[2,186],88:[2,186],90:[2,186],99:[2,186],100:84,101:[2,186],102:[2,186],103:[2,186],106:85,107:[2,186],108:66,115:[2,186],123:[2,186],125:[2,186],126:[2,186],129:[1,75],130:[1,78],131:[2,186],132:[2,186],133:[2,186],134:[2,186]},{1:[2,187],6:[2,187],25:[2,187],26:[2,187],46:[2,187],51:[2,187],54:[2,187],69:[2,187],75:[2,187],83:[2,187],88:[2,187],90:[2,187],99:[2,187],100:84,101:[2,187],102:[2,187],103:[2,187],106:85,107:[2,187],108:66,115:[2,187],123:[2,187],125:[2,187],126:[2,187],129:[1,75],130:[2,187],131:[2,187],132:[2,187],133:[2,187],134:[2,187]},{1:[2,188],6:[2,188],25:[2,188],26:[2,188],46:[2,188],51:[2,188],54:[2,188],69:[2,188],75:[2,188],83:[2,188],88:[2,188],90:[2,188],99:[2,188],100:84,101:[2,188],102:[2,188],103:[2,188],106:85,107:[2,188],108:66,115:[2,188],123:[2,188],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[2,188],132:[2,188],133:[2,188],134:[2,188]},{1:[2,189],6:[2,189],25:[2,189],26:[2,189],46:[2,189],51:[2,189],54:[2,189],69:[2,189],75:[2,189],83:[2,189],88:[2,189],90:[2,189],99:[2,189],100:84,101:[2,189],102:[2,189],103:[2,189],106:85,107:[2,189],108:66,115:[2,189],123:[2,189],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[2,189],133:[2,189],134:[1,82]},{1:[2,190],6:[2,190],25:[2,190],26:[2,190],46:[2,190],51:[2,190],54:[2,190],69:[2,190],75:[2,190],83:[2,190],88:[2,190],90:[2,190],99:[2,190],100:84,101:[2,190],102:[2,190],103:[2,190],106:85,107:[2,190],108:66,115:[2,190],123:[2,190],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[2,190],134:[1,82]},{1:[2,191],6:[2,191],25:[2,191],26:[2,191],46:[2,191],51:[2,191],54:[2,191],69:[2,191],75:[2,191],83:[2,191],88:[2,191],90:[2,191],99:[2,191],100:84,101:[2,191],102:[2,191],103:[2,191],106:85,107:[2,191],108:66,115:[2,191],123:[2,191],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[2,191],133:[2,191],134:[2,191]},{1:[2,176],6:[2,176],25:[2,176],26:[2,176],46:[2,176],51:[2,176],54:[2,176],69:[2,176],75:[2,176],83:[2,176],88:[2,176],90:[2,176],99:[2,176],100:84,101:[1,62],102:[2,176],103:[1,63],106:85,107:[1,65],108:66,115:[2,176],123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,175],6:[2,175],25:[2,175],26:[2,175],46:[2,175],51:[2,175],54:[2,175],69:[2,175],75:[2,175],83:[2,175],88:[2,175],90:[2,175],99:[2,175],100:84,101:[1,62],102:[2,175],103:[1,63],106:85,107:[1,65],108:66,115:[2,175],123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,98],6:[2,98],25:[2,98],26:[2,98],46:[2,98],51:[2,98],54:[2,98],63:[2,98],64:[2,98],65:[2,98],67:[2,98],69:[2,98],70:[2,98],71:[2,98],75:[2,98],81:[2,98],82:[2,98],83:[2,98],88:[2,98],90:[2,98],99:[2,98],101:[2,98],102:[2,98],103:[2,98],107:[2,98],115:[2,98],123:[2,98],125:[2,98],126:[2,98],129:[2,98],130:[2,98],131:[2,98],132:[2,98],133:[2,98],134:[2,98]},{1:[2,74],6:[2,74],25:[2,74],26:[2,74],37:[2,74],46:[2,74],51:[2,74],54:[2,74],63:[2,74],64:[2,74],65:[2,74],67:[2,74],69:[2,74],70:[2,74],71:[2,74],75:[2,74],77:[2,74],81:[2,74],82:[2,74],83:[2,74],88:[2,74],90:[2,74],99:[2,74],101:[2,74],102:[2,74],103:[2,74],107:[2,74],115:[2,74],123:[2,74],125:[2,74],126:[2,74],127:[2,74],128:[2,74],129:[2,74],130:[2,74],131:[2,74],132:[2,74],133:[2,74],134:[2,74],135:[2,74]},{1:[2,75],6:[2,75],25:[2,75],26:[2,75],37:[2,75],46:[2,75],51:[2,75],54:[2,75],63:[2,75],64:[2,75],65:[2,75],67:[2,75],69:[2,75],70:[2,75],71:[2,75],75:[2,75],77:[2,75],81:[2,75],82:[2,75],83:[2,75],88:[2,75],90:[2,75],99:[2,75],101:[2,75],102:[2,75],103:[2,75],107:[2,75],115:[2,75],123:[2,75],125:[2,75],126:[2,75],127:[2,75],128:[2,75],129:[2,75],130:[2,75],131:[2,75],132:[2,75],133:[2,75],134:[2,75],135:[2,75]},{1:[2,76],6:[2,76],25:[2,76],26:[2,76],37:[2,76],46:[2,76],51:[2,76],54:[2,76],63:[2,76],64:[2,76],65:[2,76],67:[2,76],69:[2,76],70:[2,76],71:[2,76],75:[2,76],77:[2,76],81:[2,76],82:[2,76],83:[2,76],88:[2,76],90:[2,76],99:[2,76],101:[2,76],102:[2,76],103:[2,76],107:[2,76],115:[2,76],123:[2,76],125:[2,76],126:[2,76],127:[2,76],128:[2,76],129:[2,76],130:[2,76],131:[2,76],132:[2,76],133:[2,76],134:[2,76],135:[2,76]},{69:[1,235]},{54:[1,189],69:[2,82],89:236,90:[1,188],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{69:[2,83]},{8:237,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{13:[2,111],28:[2,111],30:[2,111],31:[2,111],33:[2,111],34:[2,111],35:[2,111],42:[2,111],43:[2,111],44:[2,111],48:[2,111],49:[2,111],69:[2,111],73:[2,111],76:[2,111],80:[2,111],85:[2,111],86:[2,111],87:[2,111],93:[2,111],97:[2,111],98:[2,111],101:[2,111],103:[2,111],105:[2,111],107:[2,111],116:[2,111],122:[2,111],124:[2,111],125:[2,111],126:[2,111],127:[2,111],128:[2,111]},{13:[2,112],28:[2,112],30:[2,112],31:[2,112],33:[2,112],34:[2,112],35:[2,112],42:[2,112],43:[2,112],44:[2,112],48:[2,112],49:[2,112],69:[2,112],73:[2,112],76:[2,112],80:[2,112],85:[2,112],86:[2,112],87:[2,112],93:[2,112],97:[2,112],98:[2,112],101:[2,112],103:[2,112],105:[2,112],107:[2,112],116:[2,112],122:[2,112],124:[2,112],125:[2,112],126:[2,112],127:[2,112],128:[2,112]},{1:[2,80],6:[2,80],25:[2,80],26:[2,80],37:[2,80],46:[2,80],51:[2,80],54:[2,80],63:[2,80],64:[2,80],65:[2,80],67:[2,80],69:[2,80],70:[2,80],71:[2,80],75:[2,80],77:[2,80],81:[2,80],82:[2,80],83:[2,80],88:[2,80],90:[2,80],99:[2,80],101:[2,80],102:[2,80],103:[2,80],107:[2,80],115:[2,80],123:[2,80],125:[2,80],126:[2,80],127:[2,80],128:[2,80],129:[2,80],130:[2,80],131:[2,80],132:[2,80],133:[2,80],134:[2,80],135:[2,80]},{1:[2,81],6:[2,81],25:[2,81],26:[2,81],37:[2,81],46:[2,81],51:[2,81],54:[2,81],63:[2,81],64:[2,81],65:[2,81],67:[2,81],69:[2,81],70:[2,81],71:[2,81],75:[2,81],77:[2,81],81:[2,81],82:[2,81],83:[2,81],88:[2,81],90:[2,81],99:[2,81],101:[2,81],102:[2,81],103:[2,81],107:[2,81],115:[2,81],123:[2,81],125:[2,81],126:[2,81],127:[2,81],128:[2,81],129:[2,81],130:[2,81],131:[2,81],132:[2,81],133:[2,81],134:[2,81],135:[2,81]},{1:[2,99],6:[2,99],25:[2,99],26:[2,99],46:[2,99],51:[2,99],54:[2,99],63:[2,99],64:[2,99],65:[2,99],67:[2,99],69:[2,99],70:[2,99],71:[2,99],75:[2,99],81:[2,99],82:[2,99],83:[2,99],88:[2,99],90:[2,99],99:[2,99],101:[2,99],102:[2,99],103:[2,99],107:[2,99],115:[2,99],123:[2,99],125:[2,99],126:[2,99],129:[2,99],130:[2,99],131:[2,99],132:[2,99],133:[2,99],134:[2,99]},{1:[2,33],6:[2,33],25:[2,33],26:[2,33],46:[2,33],51:[2,33],54:[2,33],69:[2,33],75:[2,33],83:[2,33],88:[2,33],90:[2,33],99:[2,33],100:84,101:[2,33],102:[2,33],103:[2,33],106:85,107:[2,33],108:66,115:[2,33],123:[2,33],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{8:238,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,104],6:[2,104],25:[2,104],26:[2,104],46:[2,104],51:[2,104],54:[2,104],63:[2,104],64:[2,104],65:[2,104],67:[2,104],69:[2,104],70:[2,104],71:[2,104],75:[2,104],81:[2,104],82:[2,104],83:[2,104],88:[2,104],90:[2,104],99:[2,104],101:[2,104],102:[2,104],103:[2,104],107:[2,104],115:[2,104],123:[2,104],125:[2,104],126:[2,104],129:[2,104],130:[2,104],131:[2,104],132:[2,104],133:[2,104],134:[2,104]},{6:[2,49],25:[2,49],50:239,51:[1,223],83:[2,49]},{6:[2,122],25:[2,122],26:[2,122],51:[2,122],54:[1,240],83:[2,122],88:[2,122],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{47:241,48:[1,57],49:[1,58]},{27:107,28:[1,70],41:108,52:242,53:106,55:109,56:110,73:[1,67],86:[1,111],87:[1,112]},{46:[2,55],51:[2,55]},{8:243,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,192],6:[2,192],25:[2,192],26:[2,192],46:[2,192],51:[2,192],54:[2,192],69:[2,192],75:[2,192],83:[2,192],88:[2,192],90:[2,192],99:[2,192],100:84,101:[2,192],102:[2,192],103:[2,192],106:85,107:[2,192],108:66,115:[2,192],123:[2,192],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{8:244,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,194],6:[2,194],25:[2,194],26:[2,194],46:[2,194],51:[2,194],54:[2,194],69:[2,194],75:[2,194],83:[2,194],88:[2,194],90:[2,194],99:[2,194],100:84,101:[2,194],102:[2,194],103:[2,194],106:85,107:[2,194],108:66,115:[2,194],123:[2,194],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,174],6:[2,174],25:[2,174],26:[2,174],46:[2,174],51:[2,174],54:[2,174],69:[2,174],75:[2,174],83:[2,174],88:[2,174],90:[2,174],99:[2,174],101:[2,174],102:[2,174],103:[2,174],107:[2,174],115:[2,174],123:[2,174],125:[2,174],126:[2,174],129:[2,174],130:[2,174],131:[2,174],132:[2,174],133:[2,174],134:[2,174]},{8:245,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,127],6:[2,127],25:[2,127],26:[2,127],46:[2,127],51:[2,127],54:[2,127],69:[2,127],75:[2,127],83:[2,127],88:[2,127],90:[2,127],95:[1,246],99:[2,127],101:[2,127],102:[2,127],103:[2,127],107:[2,127],115:[2,127],123:[2,127],125:[2,127],126:[2,127],129:[2,127],130:[2,127],131:[2,127],132:[2,127],133:[2,127],134:[2,127]},{5:247,25:[1,5]},{27:248,28:[1,70]},{117:249,119:212,120:[1,213]},{26:[1,250],118:[1,251],119:252,120:[1,213]},{26:[2,167],118:[2,167],120:[2,167]},{8:254,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],92:253,93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,92],5:255,6:[2,92],25:[1,5],26:[2,92],46:[2,92],51:[2,92],54:[2,92],59:90,63:[1,92],64:[1,93],65:[1,94],66:95,67:[1,96],69:[2,92],70:[1,97],71:[1,98],75:[2,92],78:89,81:[1,91],82:[2,102],83:[2,92],88:[2,92],90:[2,92],99:[2,92],101:[2,92],102:[2,92],103:[2,92],107:[2,92],115:[2,92],123:[2,92],125:[2,92],126:[2,92],129:[2,92],130:[2,92],131:[2,92],132:[2,92],133:[2,92],134:[2,92]},{1:[2,66],6:[2,66],25:[2,66],26:[2,66],46:[2,66],51:[2,66],54:[2,66],63:[2,66],64:[2,66],65:[2,66],67:[2,66],69:[2,66],70:[2,66],71:[2,66],75:[2,66],81:[2,66],82:[2,66],83:[2,66],88:[2,66],90:[2,66],99:[2,66],101:[2,66],102:[2,66],103:[2,66],107:[2,66],115:[2,66],123:[2,66],125:[2,66],126:[2,66],129:[2,66],130:[2,66],131:[2,66],132:[2,66],133:[2,66],134:[2,66]},{1:[2,95],6:[2,95],25:[2,95],26:[2,95],46:[2,95],51:[2,95],54:[2,95],69:[2,95],75:[2,95],83:[2,95],88:[2,95],90:[2,95],99:[2,95],101:[2,95],102:[2,95],103:[2,95],107:[2,95],115:[2,95],123:[2,95],125:[2,95],126:[2,95],129:[2,95],130:[2,95],131:[2,95],132:[2,95],133:[2,95],134:[2,95]},{14:256,15:120,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:121,41:60,55:47,56:48,58:215,60:25,61:26,62:27,73:[1,67],80:[1,28],85:[1,55],86:[1,56],87:[1,54],98:[1,53]},{1:[2,132],6:[2,132],25:[2,132],26:[2,132],46:[2,132],51:[2,132],54:[2,132],63:[2,132],64:[2,132],65:[2,132],67:[2,132],69:[2,132],70:[2,132],71:[2,132],75:[2,132],81:[2,132],82:[2,132],83:[2,132],88:[2,132],90:[2,132],99:[2,132],101:[2,132],102:[2,132],103:[2,132],107:[2,132],115:[2,132],123:[2,132],125:[2,132],126:[2,132],129:[2,132],130:[2,132],131:[2,132],132:[2,132],133:[2,132],134:[2,132]},{6:[1,71],26:[1,257]},{8:258,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,61],13:[2,112],25:[2,61],28:[2,112],30:[2,112],31:[2,112],33:[2,112],34:[2,112],35:[2,112],42:[2,112],43:[2,112],44:[2,112],48:[2,112],49:[2,112],51:[2,61],73:[2,112],76:[2,112],80:[2,112],85:[2,112],86:[2,112],87:[2,112],88:[2,61],93:[2,112],97:[2,112],98:[2,112],101:[2,112],103:[2,112],105:[2,112],107:[2,112],116:[2,112],122:[2,112],124:[2,112],125:[2,112],126:[2,112],127:[2,112],128:[2,112]},{6:[1,260],25:[1,261],88:[1,259]},{6:[2,50],8:197,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[2,50],26:[2,50],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,57:145,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],83:[2,50],85:[1,55],86:[1,56],87:[1,54],88:[2,50],91:262,93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,49],25:[2,49],26:[2,49],50:263,51:[1,223]},{1:[2,171],6:[2,171],25:[2,171],26:[2,171],46:[2,171],51:[2,171],54:[2,171],69:[2,171],75:[2,171],83:[2,171],88:[2,171],90:[2,171],99:[2,171],101:[2,171],102:[2,171],103:[2,171],107:[2,171],115:[2,171],118:[2,171],123:[2,171],125:[2,171],126:[2,171],129:[2,171],130:[2,171],131:[2,171],132:[2,171],133:[2,171],134:[2,171]},{8:264,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:265,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{113:[2,150],114:[2,150]},{27:156,28:[1,70],55:157,56:158,73:[1,67],87:[1,112],112:266},{1:[2,156],6:[2,156],25:[2,156],26:[2,156],46:[2,156],51:[2,156],54:[2,156],69:[2,156],75:[2,156],83:[2,156],88:[2,156],90:[2,156],99:[2,156],100:84,101:[2,156],102:[1,267],103:[2,156],106:85,107:[2,156],108:66,115:[1,268],123:[2,156],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,157],6:[2,157],25:[2,157],26:[2,157],46:[2,157],51:[2,157],54:[2,157],69:[2,157],75:[2,157],83:[2,157],88:[2,157],90:[2,157],99:[2,157],100:84,101:[2,157],102:[1,269],103:[2,157],106:85,107:[2,157],108:66,115:[2,157],123:[2,157],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{6:[1,271],25:[1,272],75:[1,270]},{6:[2,50],12:165,25:[2,50],26:[2,50],27:166,28:[1,70],29:167,30:[1,68],31:[1,69],38:273,39:164,41:168,43:[1,46],75:[2,50],86:[1,111]},{8:274,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,275],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,79],6:[2,79],25:[2,79],26:[2,79],37:[2,79],46:[2,79],51:[2,79],54:[2,79],63:[2,79],64:[2,79],65:[2,79],67:[2,79],69:[2,79],70:[2,79],71:[2,79],75:[2,79],77:[2,79],81:[2,79],82:[2,79],83:[2,79],88:[2,79],90:[2,79],99:[2,79],101:[2,79],102:[2,79],103:[2,79],107:[2,79],115:[2,79],123:[2,79],125:[2,79],126:[2,79],127:[2,79],128:[2,79],129:[2,79],130:[2,79],131:[2,79],132:[2,79],133:[2,79],134:[2,79],135:[2,79]},{8:276,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,69:[2,115],73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{69:[2,116],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{26:[1,277],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{6:[1,260],25:[1,261],83:[1,278]},{6:[2,61],25:[2,61],26:[2,61],51:[2,61],83:[2,61],88:[2,61]},{5:279,25:[1,5]},{46:[2,53],51:[2,53]},{46:[2,56],51:[2,56],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{26:[1,280],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{5:281,25:[1,5],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{5:282,25:[1,5]},{1:[2,128],6:[2,128],25:[2,128],26:[2,128],46:[2,128],51:[2,128],54:[2,128],69:[2,128],75:[2,128],83:[2,128],88:[2,128],90:[2,128],99:[2,128],101:[2,128],102:[2,128],103:[2,128],107:[2,128],115:[2,128],123:[2,128],125:[2,128],126:[2,128],129:[2,128],130:[2,128],131:[2,128],132:[2,128],133:[2,128],134:[2,128]},{5:283,25:[1,5]},{26:[1,284],118:[1,285],119:252,120:[1,213]},{1:[2,165],6:[2,165],25:[2,165],26:[2,165],46:[2,165],51:[2,165],54:[2,165],69:[2,165],75:[2,165],83:[2,165],88:[2,165],90:[2,165],99:[2,165],101:[2,165],102:[2,165],103:[2,165],107:[2,165],115:[2,165],123:[2,165],125:[2,165],126:[2,165],129:[2,165],130:[2,165],131:[2,165],132:[2,165],133:[2,165],134:[2,165]},{5:286,25:[1,5]},{26:[2,168],118:[2,168],120:[2,168]},{5:287,25:[1,5],51:[1,288]},{25:[2,124],51:[2,124],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,93],6:[2,93],25:[2,93],26:[2,93],46:[2,93],51:[2,93],54:[2,93],69:[2,93],75:[2,93],83:[2,93],88:[2,93],90:[2,93],99:[2,93],101:[2,93],102:[2,93],103:[2,93],107:[2,93],115:[2,93],123:[2,93],125:[2,93],126:[2,93],129:[2,93],130:[2,93],131:[2,93],132:[2,93],133:[2,93],134:[2,93]},{1:[2,96],5:289,6:[2,96],25:[1,5],26:[2,96],46:[2,96],51:[2,96],54:[2,96],59:90,63:[1,92],64:[1,93],65:[1,94],66:95,67:[1,96],69:[2,96],70:[1,97],71:[1,98],75:[2,96],78:89,81:[1,91],82:[2,102],83:[2,96],88:[2,96],90:[2,96],99:[2,96],101:[2,96],102:[2,96],103:[2,96],107:[2,96],115:[2,96],123:[2,96],125:[2,96],126:[2,96],129:[2,96],130:[2,96],131:[2,96],132:[2,96],133:[2,96],134:[2,96]},{99:[1,290]},{88:[1,291],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,110],6:[2,110],25:[2,110],26:[2,110],37:[2,110],46:[2,110],51:[2,110],54:[2,110],63:[2,110],64:[2,110],65:[2,110],67:[2,110],69:[2,110],70:[2,110],71:[2,110],75:[2,110],81:[2,110],82:[2,110],83:[2,110],88:[2,110],90:[2,110],99:[2,110],101:[2,110],102:[2,110],103:[2,110],107:[2,110],113:[2,110],114:[2,110],115:[2,110],123:[2,110],125:[2,110],126:[2,110],129:[2,110],130:[2,110],131:[2,110],132:[2,110],133:[2,110],134:[2,110]},{8:197,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,57:145,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],91:292,93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:197,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,25:[1,144],27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,57:145,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],84:293,85:[1,55],86:[1,56],87:[1,54],91:143,93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,118],25:[2,118],26:[2,118],51:[2,118],83:[2,118],88:[2,118]},{6:[1,260],25:[1,261],26:[1,294]},{1:[2,135],6:[2,135],25:[2,135],26:[2,135],46:[2,135],51:[2,135],54:[2,135],69:[2,135],75:[2,135],83:[2,135],88:[2,135],90:[2,135],99:[2,135],100:84,101:[1,62],102:[2,135],103:[1,63],106:85,107:[1,65],108:66,115:[2,135],123:[2,135],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,137],6:[2,137],25:[2,137],26:[2,137],46:[2,137],51:[2,137],54:[2,137],69:[2,137],75:[2,137],83:[2,137],88:[2,137],90:[2,137],99:[2,137],100:84,101:[1,62],102:[2,137],103:[1,63],106:85,107:[1,65],108:66,115:[2,137],123:[2,137],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{113:[2,155],114:[2,155]},{8:295,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:296,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:297,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,84],6:[2,84],25:[2,84],26:[2,84],37:[2,84],46:[2,84],51:[2,84],54:[2,84],63:[2,84],64:[2,84],65:[2,84],67:[2,84],69:[2,84],70:[2,84],71:[2,84],75:[2,84],81:[2,84],82:[2,84],83:[2,84],88:[2,84],90:[2,84],99:[2,84],101:[2,84],102:[2,84],103:[2,84],107:[2,84],113:[2,84],114:[2,84],115:[2,84],123:[2,84],125:[2,84],126:[2,84],129:[2,84],130:[2,84],131:[2,84],132:[2,84],133:[2,84],134:[2,84]},{12:165,27:166,28:[1,70],29:167,30:[1,68],31:[1,69],38:298,39:164,41:168,43:[1,46],86:[1,111]},{6:[2,85],12:165,25:[2,85],26:[2,85],27:166,28:[1,70],29:167,30:[1,68],31:[1,69],38:163,39:164,41:168,43:[1,46],51:[2,85],74:299,86:[1,111]},{6:[2,87],25:[2,87],26:[2,87],51:[2,87],75:[2,87]},{6:[2,36],25:[2,36],26:[2,36],51:[2,36],75:[2,36],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{8:300,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{69:[2,114],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,34],6:[2,34],25:[2,34],26:[2,34],46:[2,34],51:[2,34],54:[2,34],69:[2,34],75:[2,34],83:[2,34],88:[2,34],90:[2,34],99:[2,34],101:[2,34],102:[2,34],103:[2,34],107:[2,34],115:[2,34],123:[2,34],125:[2,34],126:[2,34],129:[2,34],130:[2,34],131:[2,34],132:[2,34],133:[2,34],134:[2,34]},{1:[2,105],6:[2,105],25:[2,105],26:[2,105],46:[2,105],51:[2,105],54:[2,105],63:[2,105],64:[2,105],65:[2,105],67:[2,105],69:[2,105],70:[2,105],71:[2,105],75:[2,105],81:[2,105],82:[2,105],83:[2,105],88:[2,105],90:[2,105],99:[2,105],101:[2,105],102:[2,105],103:[2,105],107:[2,105],115:[2,105],123:[2,105],125:[2,105],126:[2,105],129:[2,105],130:[2,105],131:[2,105],132:[2,105],133:[2,105],134:[2,105]},{1:[2,45],6:[2,45],25:[2,45],26:[2,45],46:[2,45],51:[2,45],54:[2,45],69:[2,45],75:[2,45],83:[2,45],88:[2,45],90:[2,45],99:[2,45],101:[2,45],102:[2,45],103:[2,45],107:[2,45],115:[2,45],123:[2,45],125:[2,45],126:[2,45],129:[2,45],130:[2,45],131:[2,45],132:[2,45],133:[2,45],134:[2,45]},{1:[2,193],6:[2,193],25:[2,193],26:[2,193],46:[2,193],51:[2,193],54:[2,193],69:[2,193],75:[2,193],83:[2,193],88:[2,193],90:[2,193],99:[2,193],101:[2,193],102:[2,193],103:[2,193],107:[2,193],115:[2,193],123:[2,193],125:[2,193],126:[2,193],129:[2,193],130:[2,193],131:[2,193],132:[2,193],133:[2,193],134:[2,193]},{1:[2,172],6:[2,172],25:[2,172],26:[2,172],46:[2,172],51:[2,172],54:[2,172],69:[2,172],75:[2,172],83:[2,172],88:[2,172],90:[2,172],99:[2,172],101:[2,172],102:[2,172],103:[2,172],107:[2,172],115:[2,172],118:[2,172],123:[2,172],125:[2,172],126:[2,172],129:[2,172],130:[2,172],131:[2,172],132:[2,172],133:[2,172],134:[2,172]},{1:[2,129],6:[2,129],25:[2,129],26:[2,129],46:[2,129],51:[2,129],54:[2,129],69:[2,129],75:[2,129],83:[2,129],88:[2,129],90:[2,129],99:[2,129],101:[2,129],102:[2,129],103:[2,129],107:[2,129],115:[2,129],123:[2,129],125:[2,129],126:[2,129],129:[2,129],130:[2,129],131:[2,129],132:[2,129],133:[2,129],134:[2,129]},{1:[2,130],6:[2,130],25:[2,130],26:[2,130],46:[2,130],51:[2,130],54:[2,130],69:[2,130],75:[2,130],83:[2,130],88:[2,130],90:[2,130],95:[2,130],99:[2,130],101:[2,130],102:[2,130],103:[2,130],107:[2,130],115:[2,130],123:[2,130],125:[2,130],126:[2,130],129:[2,130],130:[2,130],131:[2,130],132:[2,130],133:[2,130],134:[2,130]},{1:[2,163],6:[2,163],25:[2,163],26:[2,163],46:[2,163],51:[2,163],54:[2,163],69:[2,163],75:[2,163],83:[2,163],88:[2,163],90:[2,163],99:[2,163],101:[2,163],102:[2,163],103:[2,163],107:[2,163],115:[2,163],123:[2,163],125:[2,163],126:[2,163],129:[2,163],130:[2,163],131:[2,163],132:[2,163],133:[2,163],134:[2,163]},{5:301,25:[1,5]},{26:[1,302]},{6:[1,303],26:[2,169],118:[2,169],120:[2,169]},{8:304,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,97],6:[2,97],25:[2,97],26:[2,97],46:[2,97],51:[2,97],54:[2,97],69:[2,97],75:[2,97],83:[2,97],88:[2,97],90:[2,97],99:[2,97],101:[2,97],102:[2,97],103:[2,97],107:[2,97],115:[2,97],123:[2,97],125:[2,97],126:[2,97],129:[2,97],130:[2,97],131:[2,97],132:[2,97],133:[2,97],134:[2,97]},{1:[2,133],6:[2,133],25:[2,133],26:[2,133],46:[2,133],51:[2,133],54:[2,133],63:[2,133],64:[2,133],65:[2,133],67:[2,133],69:[2,133],70:[2,133],71:[2,133],75:[2,133],81:[2,133],82:[2,133],83:[2,133],88:[2,133],90:[2,133],99:[2,133],101:[2,133],102:[2,133],103:[2,133],107:[2,133],115:[2,133],123:[2,133],125:[2,133],126:[2,133],129:[2,133],130:[2,133],131:[2,133],132:[2,133],133:[2,133],134:[2,133]},{1:[2,113],6:[2,113],25:[2,113],26:[2,113],46:[2,113],51:[2,113],54:[2,113],63:[2,113],64:[2,113],65:[2,113],67:[2,113],69:[2,113],70:[2,113],71:[2,113],75:[2,113],81:[2,113],82:[2,113],83:[2,113],88:[2,113],90:[2,113],99:[2,113],101:[2,113],102:[2,113],103:[2,113],107:[2,113],115:[2,113],123:[2,113],125:[2,113],126:[2,113],129:[2,113],130:[2,113],131:[2,113],132:[2,113],133:[2,113],134:[2,113]},{6:[2,119],25:[2,119],26:[2,119],51:[2,119],83:[2,119],88:[2,119]},{6:[2,49],25:[2,49],26:[2,49],50:305,51:[1,223]},{6:[2,120],25:[2,120],26:[2,120],51:[2,120],83:[2,120],88:[2,120]},{1:[2,158],6:[2,158],25:[2,158],26:[2,158],46:[2,158],51:[2,158],54:[2,158],69:[2,158],75:[2,158],83:[2,158],88:[2,158],90:[2,158],99:[2,158],100:84,101:[2,158],102:[2,158],103:[2,158],106:85,107:[2,158],108:66,115:[1,306],123:[2,158],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,160],6:[2,160],25:[2,160],26:[2,160],46:[2,160],51:[2,160],54:[2,160],69:[2,160],75:[2,160],83:[2,160],88:[2,160],90:[2,160],99:[2,160],100:84,101:[2,160],102:[1,307],103:[2,160],106:85,107:[2,160],108:66,115:[2,160],123:[2,160],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,159],6:[2,159],25:[2,159],26:[2,159],46:[2,159],51:[2,159],54:[2,159],69:[2,159],75:[2,159],83:[2,159],88:[2,159],90:[2,159],99:[2,159],100:84,101:[2,159],102:[2,159],103:[2,159],106:85,107:[2,159],108:66,115:[2,159],123:[2,159],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{6:[2,88],25:[2,88],26:[2,88],51:[2,88],75:[2,88]},{6:[2,49],25:[2,49],26:[2,49],50:308,51:[1,233]},{26:[1,309],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{26:[1,310]},{1:[2,166],6:[2,166],25:[2,166],26:[2,166],46:[2,166],51:[2,166],54:[2,166],69:[2,166],75:[2,166],83:[2,166],88:[2,166],90:[2,166],99:[2,166],101:[2,166],102:[2,166],103:[2,166],107:[2,166],115:[2,166],123:[2,166],125:[2,166],126:[2,166],129:[2,166],130:[2,166],131:[2,166],132:[2,166],133:[2,166],134:[2,166]},{26:[2,170],118:[2,170],120:[2,170]},{25:[2,125],51:[2,125],100:84,101:[1,62],103:[1,63],106:85,107:[1,65],108:66,123:[1,83],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{6:[1,260],25:[1,261],26:[1,311]},{8:312,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:313,9:115,10:19,11:20,12:21,13:[1,22],14:8,15:9,16:10,17:11,18:12,19:13,20:14,21:15,22:16,23:17,24:18,27:59,28:[1,70],29:49,30:[1,68],31:[1,69],32:24,33:[1,50],34:[1,51],35:[1,52],36:23,41:60,42:[1,44],43:[1,46],44:[1,29],47:30,48:[1,57],49:[1,58],55:47,56:48,58:36,60:25,61:26,62:27,73:[1,67],76:[1,43],80:[1,28],85:[1,55],86:[1,56],87:[1,54],93:[1,38],97:[1,45],98:[1,53],100:39,101:[1,62],103:[1,63],104:40,105:[1,64],106:41,107:[1,65],108:66,116:[1,42],121:37,122:[1,61],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[1,271],25:[1,272],26:[1,314]},{6:[2,37],25:[2,37],26:[2,37],51:[2,37],75:[2,37]},{1:[2,164],6:[2,164],25:[2,164],26:[2,164],46:[2,164],51:[2,164],54:[2,164],69:[2,164],75:[2,164],83:[2,164],88:[2,164],90:[2,164],99:[2,164],101:[2,164],102:[2,164],103:[2,164],107:[2,164],115:[2,164],123:[2,164],125:[2,164],126:[2,164],129:[2,164],130:[2,164],131:[2,164],132:[2,164],133:[2,164],134:[2,164]},{6:[2,121],25:[2,121],26:[2,121],51:[2,121],83:[2,121],88:[2,121]},{1:[2,161],6:[2,161],25:[2,161],26:[2,161],46:[2,161],51:[2,161],54:[2,161],69:[2,161],75:[2,161],83:[2,161],88:[2,161],90:[2,161],99:[2,161],100:84,101:[2,161],102:[2,161],103:[2,161],106:85,107:[2,161],108:66,115:[2,161],123:[2,161],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{1:[2,162],6:[2,162],25:[2,162],26:[2,162],46:[2,162],51:[2,162],54:[2,162],69:[2,162],75:[2,162],83:[2,162],88:[2,162],90:[2,162],99:[2,162],100:84,101:[2,162],102:[2,162],103:[2,162],106:85,107:[2,162],108:66,115:[2,162],123:[2,162],125:[1,77],126:[1,76],129:[1,75],130:[1,78],131:[1,79],132:[1,80],133:[1,81],134:[1,82]},{6:[2,89],25:[2,89],26:[2,89],51:[2,89],75:[2,89]}],
+defaultActions: {57:[2,47],58:[2,48],72:[2,3],91:[2,103],186:[2,83]},
+parseError: function parseError(str, hash) {
+    throw new Error(str);
+},
+parse: function parse(input) {
+    var self = this,
+        stack = [0],
+        vstack = [null], // semantic value stack
+        lstack = [], // location stack
+        table = this.table,
+        yytext = '',
+        yylineno = 0,
+        yyleng = 0,
+        recovering = 0,
+        TERROR = 2,
+        EOF = 1;
+
+    //this.reductionCount = this.shiftCount = 0;
+
+    this.lexer.setInput(input);
+    this.lexer.yy = this.yy;
+    this.yy.lexer = this.lexer;
+    if (typeof this.lexer.yylloc == 'undefined')
+        this.lexer.yylloc = {};
+    var yyloc = this.lexer.yylloc;
+    lstack.push(yyloc);
+
+    if (typeof this.yy.parseError === 'function')
+        this.parseError = this.yy.parseError;
+
+    function popStack (n) {
+        stack.length = stack.length - 2*n;
+        vstack.length = vstack.length - n;
+        lstack.length = lstack.length - n;
+    }
+
+    function lex() {
+        var token;
+        token = self.lexer.lex() || 1; // $end = 1
+        // if token isn't its numeric value, convert
+        if (typeof token !== 'number') {
+            token = self.symbols_[token] || token;
+        }
+        return token;
+    };
+
+    var symbol, preErrorSymbol, state, action, a, r, yyval={},p,len,newState, expected;
+    while (true) {
+        // retreive state number from top of stack
+        state = stack[stack.length-1];
+
+        // use default actions if available
+        if (this.defaultActions[state]) {
+            action = this.defaultActions[state];
+        } else {
+            if (symbol == null)
+                symbol = lex();
+            // read action for current state and first input
+            action = table[state] && table[state][symbol];
+        }
+
+        // handle parse error
+        if (typeof action === 'undefined' || !action.length || !action[0]) {
+
+            if (!recovering) {
+                // Report error
+                expected = [];
+                for (p in table[state]) if (this.terminals_[p] && p > 2) {
+                    expected.push("'"+this.terminals_[p]+"'");
+                }
+                var errStr = '';
+                if (this.lexer.showPosition) {
+                    errStr = 'Parse error on line '+(yylineno+1)+":\n"+this.lexer.showPosition()+'\nExpecting '+expected.join(', ');
+                } else {
+                    errStr = 'Parse error on line '+(yylineno+1)+": Unexpected " +
+                                  (symbol == 1 /*EOF*/ ? "end of input" :
+                                              ("'"+(this.terminals_[symbol] || symbol)+"'"));
+                }
+                this.parseError(errStr,
+                    {text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, loc: yyloc, expected: expected});
+            }
+
+            // just recovered from another error
+            if (recovering == 3) {
+                if (symbol == EOF) {
+                    throw new Error(errStr || 'Parsing halted.');
+                }
+
+                // discard current lookahead and grab another
+                yyleng = this.lexer.yyleng;
+                yytext = this.lexer.yytext;
+                yylineno = this.lexer.yylineno;
+                yyloc = this.lexer.yylloc;
+                symbol = lex();
+            }
+
+            // try to recover from error
+            while (1) {
+                // check for error recovery rule in this state
+                if ((TERROR.toString()) in table[state]) {
+                    break;
+                }
+                if (state == 0) {
+                    throw new Error(errStr || 'Parsing halted.');
+                }
+                popStack(1);
+                state = stack[stack.length-1];
+            }
+
+            preErrorSymbol = symbol; // save the lookahead token
+            symbol = TERROR;         // insert generic error symbol as new lookahead
+            state = stack[stack.length-1];
+            action = table[state] && table[state][TERROR];
+            recovering = 3; // allow 3 real symbols to be shifted before reporting a new error
+        }
+
+        // this shouldn't happen, unless resolve defaults are off
+        if (action[0] instanceof Array && action.length > 1) {
+            throw new Error('Parse Error: multiple actions possible at state: '+state+', token: '+symbol);
+        }
+
+        switch (action[0]) {
+
+            case 1: // shift
+                //this.shiftCount++;
+
+                stack.push(symbol);
+                vstack.push(this.lexer.yytext);
+                lstack.push(this.lexer.yylloc);
+                stack.push(action[1]); // push state
+                symbol = null;
+                if (!preErrorSymbol) { // normal execution/no error
+                    yyleng = this.lexer.yyleng;
+                    yytext = this.lexer.yytext;
+                    yylineno = this.lexer.yylineno;
+                    yyloc = this.lexer.yylloc;
+                    if (recovering > 0)
+                        recovering--;
+                } else { // error just occurred, resume old lookahead f/ before error
+                    symbol = preErrorSymbol;
+                    preErrorSymbol = null;
+                }
+                break;
+
+            case 2: // reduce
+                //this.reductionCount++;
+
+                len = this.productions_[action[1]][1];
+
+                // perform semantic action
+                yyval.$ = vstack[vstack.length-len]; // default to $$ = $1
+                // default location, uses first token for firsts, last for lasts
+                yyval._$ = {
+                    first_line: lstack[lstack.length-(len||1)].first_line,
+                    last_line: lstack[lstack.length-1].last_line,
+                    first_column: lstack[lstack.length-(len||1)].first_column,
+                    last_column: lstack[lstack.length-1].last_column
+                };
+                r = this.performAction.call(yyval, yytext, yyleng, yylineno, this.yy, action[1], vstack, lstack);
+
+                if (typeof r !== 'undefined') {
+                    return r;
+                }
+
+                // pop off stack
+                if (len) {
+                    stack = stack.slice(0,-1*len*2);
+                    vstack = vstack.slice(0, -1*len);
+                    lstack = lstack.slice(0, -1*len);
+                }
+
+                stack.push(this.productions_[action[1]][0]);    // push nonterminal (reduce)
+                vstack.push(yyval.$);
+                lstack.push(yyval._$);
+                // goto new state = table[STATE][NONTERMINAL]
+                newState = table[stack[stack.length-2]][stack[stack.length-1]];
+                stack.push(newState);
+                break;
+
+            case 3: // accept
+                return true;
+        }
+
+    }
+
+    return true;
+}};
+
+module.exports = parser;
+});/**
+ * Copyright (c) 2011 Jeremy Ashkenas
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+define('ace/mode/coffee/nodes', ['require', 'exports', 'module' , 'ace/mode/coffee/scope', 'ace/mode/coffee/helpers'], function(require, exports, module) {
+  var Access, Arr, Assign, Base, Block, Call, Class, Closure, Code, Comment, Existence, Extends, For, IDENTIFIER, IS_STRING, If, In, Index, LEVEL_ACCESS, LEVEL_COND, LEVEL_LIST, LEVEL_OP, LEVEL_PAREN, LEVEL_TOP, Literal, METHOD_DEF, NEGATE, NO, Obj, Op, Param, Parens, Push, Range, Return, SIMPLENUM, Scope, Slice, Splat, Switch, TAB, THIS, Throw, Try, UTILITIES, Value, While, YES, compact, del, ends, extend, flatten, last, merge, multident, starts, unfoldSoak, utility, _ref;
+  var __hasProp = Object.prototype.hasOwnProperty, __extends = function(child, parent) {
+    for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; }
+    function ctor() { this.constructor = child; }
+    ctor.prototype = parent.prototype;
+    child.prototype = new ctor;
+    child.__super__ = parent.prototype;
+    return child;
+  }, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, __indexOf = Array.prototype.indexOf || function(item) {
+    for (var i = 0, l = this.length; i < l; i++) {
+      if (this[i] === item) return i;
+    }
+    return -1;
+  };
+  Scope = require('./scope').Scope;
+  _ref = require('./helpers'), compact = _ref.compact, flatten = _ref.flatten, extend = _ref.extend, merge = _ref.merge, del = _ref.del, starts = _ref.starts, ends = _ref.ends, last = _ref.last;
+  exports.extend = extend;
+  YES = function() {
+    return true;
+  };
+  NO = function() {
+    return false;
+  };
+  THIS = function() {
+    return this;
+  };
+  NEGATE = function() {
+    this.negated = !this.negated;
+    return this;
+  };
+  exports.Base = Base = (function() {
+    function Base() {}
+    Base.prototype.compile = function(o, lvl) {
+      var node;
+      o = extend({}, o);
+      if (lvl) {
+        o.level = lvl;
+      }
+      node = this.unfoldSoak(o) || this;
+      node.tab = o.indent;
+      if (o.level === LEVEL_TOP || !node.isStatement(o)) {
+        return node.compileNode(o);
+      } else {
+        return node.compileClosure(o);
+      }
+    };
+    Base.prototype.compileClosure = function(o) {
+      if (this.jumps() || this instanceof Throw) {
+        throw SyntaxError('cannot use a pure statement in an expression.');
+      }
+      o.sharedScope = true;
+      return Closure.wrap(this).compileNode(o);
+    };
+    Base.prototype.cache = function(o, level, reused) {
+      var ref, sub;
+      if (!this.isComplex()) {
+        ref = level ? this.compile(o, level) : this;
+        return [ref, ref];
+      } else {
+        ref = new Literal(reused || o.scope.freeVariable('ref'));
+        sub = new Assign(ref, this);
+        if (level) {
+          return [sub.compile(o, level), ref.value];
+        } else {
+          return [sub, ref];
+        }
+      }
+    };
+    Base.prototype.compileLoopReference = function(o, name) {
+      var src, tmp;
+      src = tmp = this.compile(o, LEVEL_LIST);
+      if (!((-Infinity < +src && +src < Infinity) || IDENTIFIER.test(src) && o.scope.check(src, true))) {
+        src = "" + (tmp = o.scope.freeVariable(name)) + " = " + src;
+      }
+      return [src, tmp];
+    };
+    Base.prototype.makeReturn = function() {
+      return new Return(this);
+    };
+    Base.prototype.contains = function(pred) {
+      var contains;
+      contains = false;
+      this.traverseChildren(false, function(node) {
+        if (pred(node)) {
+          contains = true;
+          return false;
+        }
+      });
+      return contains;
+    };
+    Base.prototype.containsType = function(type) {
+      return this instanceof type || this.contains(function(node) {
+        return node instanceof type;
+      });
+    };
+    Base.prototype.lastNonComment = function(list) {
+      var i;
+      i = list.length;
+      while (i--) {
+        if (!(list[i] instanceof Comment)) {
+          return list[i];
+        }
+      }
+      return null;
+    };
+    Base.prototype.toString = function(idt, name) {
+      var tree;
+      if (idt == null) {
+        idt = '';
+      }
+      if (name == null) {
+        name = this.constructor.name;
+      }
+      tree = '\n' + idt + name;
+      if (this.soak) {
+        tree += '?';
+      }
+      this.eachChild(function(node) {
+        return tree += node.toString(idt + TAB);
+      });
+      return tree;
+    };
+    Base.prototype.eachChild = function(func) {
+      var attr, child, _i, _j, _len, _len2, _ref2, _ref3;
+      if (!this.children) {
+        return this;
+      }
+      _ref2 = this.children;
+      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+        attr = _ref2[_i];
+        if (this[attr]) {
+          _ref3 = flatten([this[attr]]);
+          for (_j = 0, _len2 = _ref3.length; _j < _len2; _j++) {
+            child = _ref3[_j];
+            if (func(child) === false) {
+              return this;
+            }
+          }
+        }
+      }
+      return this;
+    };
+    Base.prototype.traverseChildren = function(crossScope, func) {
+      return this.eachChild(function(child) {
+        if (func(child) === false) {
+          return false;
+        }
+        return child.traverseChildren(crossScope, func);
+      });
+    };
+    Base.prototype.invert = function() {
+      return new Op('!', this);
+    };
+    Base.prototype.unwrapAll = function() {
+      var node;
+      node = this;
+      while (node !== (node = node.unwrap())) {
+        continue;
+      }
+      return node;
+    };
+    Base.prototype.children = [];
+    Base.prototype.isStatement = NO;
+    Base.prototype.jumps = NO;
+    Base.prototype.isComplex = YES;
+    Base.prototype.isChainable = NO;
+    Base.prototype.isAssignable = NO;
+    Base.prototype.unwrap = THIS;
+    Base.prototype.unfoldSoak = NO;
+    Base.prototype.assigns = NO;
+    return Base;
+  })();
+  exports.Block = Block = (function() {
+    __extends(Block, Base);
+    function Block(nodes) {
+      this.expressions = compact(flatten(nodes || []));
+    }
+    Block.prototype.children = ['expressions'];
+    Block.prototype.push = function(node) {
+      this.expressions.push(node);
+      return this;
+    };
+    Block.prototype.pop = function() {
+      return this.expressions.pop();
+    };
+    Block.prototype.unshift = function(node) {
+      this.expressions.unshift(node);
+      return this;
+    };
+    Block.prototype.unwrap = function() {
+      if (this.expressions.length === 1) {
+        return this.expressions[0];
+      } else {
+        return this;
+      }
+    };
+    Block.prototype.isEmpty = function() {
+      return !this.expressions.length;
+    };
+    Block.prototype.isStatement = function(o) {
+      var exp, _i, _len, _ref2;
+      _ref2 = this.expressions;
+      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+        exp = _ref2[_i];
+        if (exp.isStatement(o)) {
+          return true;
+        }
+      }
+      return false;
+    };
+    Block.prototype.jumps = function(o) {
+      var exp, _i, _len, _ref2;
+      _ref2 = this.expressions;
+      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+        exp = _ref2[_i];
+        if (exp.jumps(o)) {
+          return exp;
+        }
+      }
+    };
+    Block.prototype.makeReturn = function() {
+      var expr, len;
+      len = this.expressions.length;
+      while (len--) {
+        expr = this.expressions[len];
+        if (!(expr instanceof Comment)) {
+          this.expressions[len] = expr.makeReturn();
+          if (expr instanceof Return && !expr.expression) {
+            this.expressions.splice(len, 1);
+          }
+          break;
+        }
+      }
+      return this;
+    };
+    Block.prototype.compile = function(o, level) {
+      if (o == null) {
+        o = {};
+      }
+      if (o.scope) {
+        return Block.__super__.compile.call(this, o, level);
+      } else {
+        return this.compileRoot(o);
+      }
+    };
+    Block.prototype.compileNode = function(o) {
+      var code, codes, node, top, _i, _len, _ref2;
+      this.tab = o.indent;
+      top = o.level === LEVEL_TOP;
+      codes = [];
+      _ref2 = this.expressions;
+      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+        node = _ref2[_i];
+        node = node.unwrapAll();
+        node = node.unfoldSoak(o) || node;
+        if (top) {
+          node.front = true;
+          code = node.compile(o);
+          codes.push(node.isStatement(o) ? code : this.tab + code + ';');
+        } else {
+          codes.push(node.compile(o, LEVEL_LIST));
+        }
+      }
+      if (top) {
+        return codes.join('\n');
+      }
+      code = codes.join(', ') || 'void 0';
+      if (codes.length > 1 && o.level >= LEVEL_LIST) {
+        return "(" + code + ")";
+      } else {
+        return code;
+      }
+    };
+    Block.prototype.compileRoot = function(o) {
+      var code;
+      o.indent = this.tab = o.bare ? '' : TAB;
+      o.scope = new Scope(null, this, null);
+      o.level = LEVEL_TOP;
+      code = this.compileWithDeclarations(o);
+      if (o.bare) {
+        return code;
+      } else {
+        return "(function() {\n" + code + "\n}).call(this);\n";
+      }
+    };
+    Block.prototype.compileWithDeclarations = function(o) {
+      var assigns, code, declars, exp, i, post, rest, scope, _len, _ref2;
+      code = post = '';
+      _ref2 = this.expressions;
+      for (i = 0, _len = _ref2.length; i < _len; i++) {
+        exp = _ref2[i];
+        exp = exp.unwrap();
+        if (!(exp instanceof Comment || exp instanceof Literal)) {
+          break;
+        }
+      }
+      o = merge(o, {
+        level: LEVEL_TOP
+      });
+      if (i) {
+        rest = this.expressions.splice(i, this.expressions.length);
+        code = this.compileNode(o);
+        this.expressions = rest;
+      }
+      post = this.compileNode(o);
+      scope = o.scope;
+      if (scope.expressions === this) {
+        declars = o.scope.hasDeclarations();
+        assigns = scope.hasAssignments;
+        if ((declars || assigns) && i) {
+          code += '\n';
+        }
+        if (declars) {
+          code += "" + this.tab + "var " + (scope.declaredVariables().join(', ')) + ";\n";
+        }
+        if (assigns) {
+          code += "" + this.tab + "var " + (multident(scope.assignedVariables().join(', '), this.tab)) + ";\n";
+        }
+      }
+      return code + post;
+    };
+    Block.wrap = function(nodes) {
+      if (nodes.length === 1 && nodes[0] instanceof Block) {
+        return nodes[0];
+      }
+      return new Block(nodes);
+    };
+    return Block;
+  })();
+  exports.Literal = Literal = (function() {
+    __extends(Literal, Base);
+    function Literal(value) {
+      this.value = value;
+    }
+    Literal.prototype.makeReturn = function() {
+      if (this.isStatement()) {
+        return this;
+      } else {
+        return new Return(this);
+      }
+    };
+    Literal.prototype.isAssignable = function() {
+      return IDENTIFIER.test(this.value);
+    };
+    Literal.prototype.isStatement = function() {
+      var _ref2;
+      return (_ref2 = this.value) === 'break' || _ref2 === 'continue' || _ref2 === 'debugger';
+    };
+    Literal.prototype.isComplex = NO;
+    Literal.prototype.assigns = function(name) {
+      return name === this.value;
+    };
+    Literal.prototype.jumps = function(o) {
+      if (!this.isStatement()) {
+        return false;
+      }
+      if (!(o && (o.loop || o.block && (this.value !== 'continue')))) {
+        return this;
+      } else {
+        return false;
+      }
+    };
+    Literal.prototype.compileNode = function(o) {
+      var code;
+      code = this.isUndefined ? o.level >= LEVEL_ACCESS ? '(void 0)' : 'void 0' : this.value.reserved ? "\"" + this.value + "\"" : this.value;
+      if (this.isStatement()) {
+        return "" + this.tab + code + ";";
+      } else {
+        return code;
+      }
+    };
+    Literal.prototype.toString = function() {
+      return ' "' + this.value + '"';
+    };
+    return Literal;
+  })();
+  exports.Return = Return = (function() {
+    __extends(Return, Base);
+    function Return(expr) {
+      if (expr && !expr.unwrap().isUndefined) {
+        this.expression = expr;
+      }
+    }
+    Return.prototype.children = ['expression'];
+    Return.prototype.isStatement = YES;
+    Return.prototype.makeReturn = THIS;
+    Return.prototype.jumps = THIS;
+    Return.prototype.compile = function(o, level) {
+      var expr, _ref2;
+      expr = (_ref2 = this.expression) != null ? _ref2.makeReturn() : void 0;
+      if (expr && !(expr instanceof Return)) {
+        return expr.compile(o, level);
+      } else {
+        return Return.__super__.compile.call(this, o, level);
+      }
+    };
+    Return.prototype.compileNode = function(o) {
+      return this.tab + ("return" + (this.expression ? ' ' + this.expression.compile(o, LEVEL_PAREN) : '') + ";");
+    };
+    return Return;
+  })();
+  exports.Value = Value = (function() {
+    __extends(Value, Base);
+    function Value(base, props, tag) {
+      if (!props && base instanceof Value) {
+        return base;
+      }
+      this.base = base;
+      this.properties = props || [];
+      if (tag) {
+        this[tag] = true;
+      }
+      return this;
+    }
+    Value.prototype.children = ['base', 'properties'];
+    Value.prototype.push = function(prop) {
+      this.properties.push(prop);
+      return this;
+    };
+    Value.prototype.hasProperties = function() {
+      return !!this.properties.length;
+    };
+    Value.prototype.isArray = function() {
+      return !this.properties.length && this.base instanceof Arr;
+    };
+    Value.prototype.isComplex = function() {
+      return this.hasProperties() || this.base.isComplex();
+    };
+    Value.prototype.isAssignable = function() {
+      return this.hasProperties() || this.base.isAssignable();
+    };
+    Value.prototype.isSimpleNumber = function() {
+      return this.base instanceof Literal && SIMPLENUM.test(this.base.value);
+    };
+    Value.prototype.isAtomic = function() {
+      var node, _i, _len, _ref2;
+      _ref2 = this.properties.concat(this.base);
+      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+        node = _ref2[_i];
+        if (node.soak || node instanceof Call) {
+          return false;
+        }
+      }
+      return true;
+    };
+    Value.prototype.isStatement = function(o) {
+      return !this.properties.length && this.base.isStatement(o);
+    };
+    Value.prototype.assigns = function(name) {
+      return !this.properties.length && this.base.assigns(name);
+    };
+    Value.prototype.jumps = function(o) {
+      return !this.properties.length && this.base.jumps(o);
+    };
+    Value.prototype.isObject = function(onlyGenerated) {
+      if (this.properties.length) {
+        return false;
+      }
+      return (this.base instanceof Obj) && (!onlyGenerated || this.base.generated);
+    };
+    Value.prototype.isSplice = function() {
+      return last(this.properties) instanceof Slice;
+    };
+    Value.prototype.makeReturn = function() {
+      if (this.properties.length) {
+        return Value.__super__.makeReturn.call(this);
+      } else {
+        return this.base.makeReturn();
+      }
+    };
+    Value.prototype.unwrap = function() {
+      if (this.properties.length) {
+        return this;
+      } else {
+        return this.base;
+      }
+    };
+    Value.prototype.cacheReference = function(o) {
+      var base, bref, name, nref;
+      name = last(this.properties);
+      if (this.properties.length < 2 && !this.base.isComplex() && !(name != null ? name.isComplex() : void 0)) {
+        return [this, this];
+      }
+      base = new Value(this.base, this.properties.slice(0, -1));
+      if (base.isComplex()) {
+        bref = new Literal(o.scope.freeVariable('base'));
+        base = new Value(new Parens(new Assign(bref, base)));
+      }
+      if (!name) {
+        return [base, bref];
+      }
+      if (name.isComplex()) {
+        nref = new Literal(o.scope.freeVariable('name'));
+        name = new Index(new Assign(nref, name.index));
+        nref = new Index(nref);
+      }
+      return [base.push(name), new Value(bref || base.base, [nref || name])];
+    };
+    Value.prototype.compileNode = function(o) {
+      var code, prop, props, _i, _len;
+      this.base.front = this.front;
+      props = this.properties;
+      code = this.base.compile(o, props.length ? LEVEL_ACCESS : null);
+      if (props[0] instanceof Access && this.isSimpleNumber()) {
+        code = "(" + code + ")";
+      }
+      for (_i = 0, _len = props.length; _i < _len; _i++) {
+        prop = props[_i];
+        code += prop.compile(o);
+      }
+      return code;
+    };
+    Value.prototype.unfoldSoak = function(o) {
+      var result;
+      if (this.unfoldedSoak != null) {
+        return this.unfoldedSoak;
+      }
+      result = __bind(function() {
+        var fst, i, ifn, prop, ref, snd, _len, _ref2;
+        if (ifn = this.base.unfoldSoak(o)) {
+          Array.prototype.push.apply(ifn.body.properties, this.properties);
+          return ifn;
+        }
+        _ref2 = this.properties;
+        for (i = 0, _len = _ref2.length; i < _len; i++) {
+          prop = _ref2[i];
+          if (prop.soak) {
+            prop.soak = false;
+            fst = new Value(this.base, this.properties.slice(0, i));
+            snd = new Value(this.base, this.properties.slice(i));
+            if (fst.isComplex()) {
+              ref = new Literal(o.scope.freeVariable('ref'));
+              fst = new Parens(new Assign(ref, fst));
+              snd.base = ref;
+            }
+            return new If(new Existence(fst), snd, {
+              soak: true
+            });
+          }
+        }
+        return null;
+      }, this)();
+      return this.unfoldedSoak = result || false;
+    };
+    return Value;
+  })();
+  exports.Comment = Comment = (function() {
+    __extends(Comment, Base);
+    function Comment(comment) {
+      this.comment = comment;
+    }
+    Comment.prototype.isStatement = YES;
+    Comment.prototype.makeReturn = THIS;
+    Comment.prototype.compileNode = function(o, level) {
+      var code;
+      code = '/*' + multident(this.comment, this.tab) + '*/';
+      if ((level || o.level) === LEVEL_TOP) {
+        code = o.indent + code;
+      }
+      return code;
+    };
+    return Comment;
+  })();
+  exports.Call = Call = (function() {
+    __extends(Call, Base);
+    function Call(variable, args, soak) {
+      this.args = args != null ? args : [];
+      this.soak = soak;
+      this.isNew = false;
+      this.isSuper = variable === 'super';
+      this.variable = this.isSuper ? null : variable;
+    }
+    Call.prototype.children = ['variable', 'args'];
+    Call.prototype.newInstance = function() {
+      var base;
+      base = this.variable.base || this.variable;
+      if (base instanceof Call) {
+        base.newInstance();
+      } else {
+        this.isNew = true;
+      }
+      return this;
+    };
+    Call.prototype.superReference = function(o) {
+      var method, name;
+      method = o.scope.method;
+      if (!method) {
+        throw SyntaxError('cannot call super outside of a function.');
+      }
+      name = method.name;
+      if (!name) {
+        throw SyntaxError('cannot call super on an anonymous function.');
+      }
+      if (method.klass) {
+        return "" + method.klass + ".__super__." + name;
+      } else {
+        return "" + name + ".__super__.constructor";
+      }
+    };
+    Call.prototype.unfoldSoak = function(o) {
+      var call, ifn, left, list, rite, _i, _len, _ref2, _ref3;
+      if (this.soak) {
+        if (this.variable) {
+          if (ifn = unfoldSoak(o, this, 'variable')) {
+            return ifn;
+          }
+          _ref2 = new Value(this.variable).cacheReference(o), left = _ref2[0], rite = _ref2[1];
+        } else {
+          left = new Literal(this.superReference(o));
+          rite = new Value(left);
+        }
+        rite = new Call(rite, this.args);
+        rite.isNew = this.isNew;
+        left = new Literal("typeof " + (left.compile(o)) + " === \"function\"");
+        return new If(left, new Value(rite), {
+          soak: true
+        });
+      }
+      call = this;
+      list = [];
+      while (true) {
+        if (call.variable instanceof Call) {
+          list.push(call);
+          call = call.variable;
+          continue;
+        }
+        if (!(call.variable instanceof Value)) {
+          break;
+        }
+        list.push(call);
+        if (!((call = call.variable.base) instanceof Call)) {
+          break;
+        }
+      }
+      _ref3 = list.reverse();
+      for (_i = 0, _len = _ref3.length; _i < _len; _i++) {
+        call = _ref3[_i];
+        if (ifn) {
+          if (call.variable instanceof Call) {
+            call.variable = ifn;
+          } else {
+            call.variable.base = ifn;
+          }
+        }
+        ifn = unfoldSoak(o, call, 'variable');
+      }
+      return ifn;
+    };
+    Call.prototype.filterImplicitObjects = function(list) {
+      var node, nodes, obj, prop, properties, _i, _j, _len, _len2, _ref2;
+      nodes = [];
+      for (_i = 0, _len = list.length; _i < _len; _i++) {
+        node = list[_i];
+        if (!((typeof node.isObject === "function" ? node.isObject() : void 0) && node.base.generated)) {
+          nodes.push(node);
+          continue;
+        }
+        obj = null;
+        _ref2 = node.base.properties;
+        for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) {
+          prop = _ref2[_j];
+          if (prop instanceof Assign) {
+            if (!obj) {
+              nodes.push(obj = new Obj(properties = [], true));
+            }
+            properties.push(prop);
+          } else {
+            nodes.push(prop);
+            obj = null;
+          }
+        }
+      }
+      return nodes;
+    };
+    Call.prototype.compileNode = function(o) {
+      var arg, args, code, _ref2;
+      if ((_ref2 = this.variable) != null) {
+        _ref2.front = this.front;
+      }
+      if (code = Splat.compileSplattedArray(o, this.args, true)) {
+        return this.compileSplat(o, code);
+      }
+      args = this.filterImplicitObjects(this.args);
+      args = ((function() {
+        var _i, _len, _results;
+        _results = [];
+        for (_i = 0, _len = args.length; _i < _len; _i++) {
+          arg = args[_i];
+          _results.push(arg.compile(o, LEVEL_LIST));
+        }
+        return _results;
+      })()).join(', ');
+      if (this.isSuper) {
+        return this.superReference(o) + (".call(this" + (args && ', ' + args) + ")");
+      } else {
+        return (this.isNew ? 'new ' : '') + this.variable.compile(o, LEVEL_ACCESS) + ("(" + args + ")");
+      }
+    };
+    Call.prototype.compileSuper = function(args, o) {
+      return "" + (this.superReference(o)) + ".call(this" + (args.length ? ', ' : '') + args + ")";
+    };
+    Call.prototype.compileSplat = function(o, splatArgs) {
+      var base, fun, idt, name, ref;
+      if (this.isSuper) {
+        return "" + (this.superReference(o)) + ".apply(this, " + splatArgs + ")";
+      }
+      if (this.isNew) {
+        idt = this.tab + TAB;
+        return "(function(func, args, ctor) {\n" + idt + "ctor.prototype = func.prototype;\n" + idt + "var child = new ctor, result = func.apply(child, args);\n" + idt + "return typeof result === \"object\" ? result : child;\n" + this.tab + "})(" + (this.variable.compile(o, LEVEL_LIST)) + ", " + splatArgs + ", function() {})";
+      }
+      base = new Value(this.variable);
+      if ((name = base.properties.pop()) && base.isComplex()) {
+        ref = o.scope.freeVariable('ref');
+        fun = "(" + ref + " = " + (base.compile(o, LEVEL_LIST)) + ")" + (name.compile(o));
+      } else {
+        fun = base.compile(o, LEVEL_ACCESS);
+        if (SIMPLENUM.test(fun)) {
+          fun = "(" + fun + ")";
+        }
+        if (name) {
+          ref = fun;
+          fun += name.compile(o);
+        } else {
+          ref = 'null';
+        }
+      }
+      return "" + fun + ".apply(" + ref + ", " + splatArgs + ")";
+    };
+    return Call;
+  })();
+  exports.Extends = Extends = (function() {
+    __extends(Extends, Base);
+    function Extends(child, parent) {
+      this.child = child;
+      this.parent = parent;
+    }
+    Extends.prototype.children = ['child', 'parent'];
+    Extends.prototype.compile = function(o) {
+      utility('hasProp');
+      return new Call(new Value(new Literal(utility('extends'))), [this.child, this.parent]).compile(o);
+    };
+    return Extends;
+  })();
+  exports.Access = Access = (function() {
+    __extends(Access, Base);
+    function Access(name, tag) {
+      this.name = name;
+      this.name.asKey = true;
+      this.proto = tag === 'proto' ? '.prototype' : '';
+      this.soak = tag === 'soak';
+    }
+    Access.prototype.children = ['name'];
+    Access.prototype.compile = function(o) {
+      var name;
+      name = this.name.compile(o);
+      return this.proto + (IS_STRING.test(name) ? "[" + name + "]" : "." + name);
+    };
+    Access.prototype.isComplex = NO;
+    return Access;
+  })();
+  exports.Index = Index = (function() {
+    __extends(Index, Base);
+    function Index(index) {
+      this.index = index;
+    }
+    Index.prototype.children = ['index'];
+    Index.prototype.compile = function(o) {
+      return (this.proto ? '.prototype' : '') + ("[" + (this.index.compile(o, LEVEL_PAREN)) + "]");
+    };
+    Index.prototype.isComplex = function() {
+      return this.index.isComplex();
+    };
+    return Index;
+  })();
+  exports.Range = Range = (function() {
+    __extends(Range, Base);
+    Range.prototype.children = ['from', 'to'];
+    function Range(from, to, tag) {
+      this.from = from;
+      this.to = to;
+      this.exclusive = tag === 'exclusive';
+      this.equals = this.exclusive ? '' : '=';
+    }
+    Range.prototype.compileVariables = function(o) {
+      var step, _ref2, _ref3, _ref4, _ref5;
+      o = merge(o, {
+        top: true
+      });
+      _ref2 = this.from.cache(o, LEVEL_LIST), this.from = _ref2[0], this.fromVar = _ref2[1];
+      _ref3 = this.to.cache(o, LEVEL_LIST), this.to = _ref3[0], this.toVar = _ref3[1];
+      if (step = del(o, 'step')) {
+        _ref4 = step.cache(o, LEVEL_LIST), this.step = _ref4[0], this.stepVar = _ref4[1];
+      }
+      _ref5 = [this.fromVar.match(SIMPLENUM), this.toVar.match(SIMPLENUM)], this.fromNum = _ref5[0], this.toNum = _ref5[1];
+      if (this.stepVar) {
+        return this.stepNum = this.stepVar.match(SIMPLENUM);
+      }
+    };
+    Range.prototype.compileNode = function(o) {
+      var cond, condPart, from, gt, idx, known, lt, stepPart, to, varPart, _ref2, _ref3;
+      if (!this.fromVar) {
+        this.compileVariables(o);
+      }
+      if (!o.index) {
+        return this.compileArray(o);
+      }
+      known = this.fromNum && this.toNum;
+      idx = del(o, 'index');
+      varPart = "" + idx + " = " + this.from;
+      if (this.to !== this.toVar) {
+        varPart += ", " + this.to;
+      }
+      if (this.step !== this.stepVar) {
+        varPart += ", " + this.step;
+      }
+      _ref2 = ["" + idx + " <" + this.equals, "" + idx + " >" + this.equals], lt = _ref2[0], gt = _ref2[1];
+      condPart = this.stepNum ? condPart = +this.stepNum > 0 ? "" + lt + " " + this.toVar : "" + gt + " " + this.toVar : known ? ((_ref3 = [+this.fromNum, +this.toNum], from = _ref3[0], to = _ref3[1], _ref3), condPart = from <= to ? "" + lt + " " + to : "" + gt + " " + to) : (cond = "" + this.fromVar + " <= " + this.toVar, condPart = "" + cond + " ? " + lt + " " + this.toVar + " : " + gt + " " + this.toVar);
+      stepPart = this.stepVar ? "" + idx + " += " + this.stepVar : known ? from <= to ? "" + idx + "++" : "" + idx + "--" : "" + cond + " ? " + idx + "++ : " + idx + "--";
+      return "" + varPart + "; " + condPart + "; " + stepPart;
+    };
+    Range.prototype.compileArray = function(o) {
+      var body, cond, i, idt, post, pre, range, result, vars, _i, _ref2, _ref3, _results;
+      if (this.fromNum && this.toNum && Math.abs(this.fromNum - this.toNum) <= 20) {
+        range = (function() {
+          _results = [];
+          for (var _i = _ref2 = +this.fromNum, _ref3 = +this.toNum; _ref2 <= _ref3 ? _i <= _ref3 : _i >= _ref3; _ref2 <= _ref3 ? _i++ : _i--){ _results.push(_i); }
+          return _results;
+        }).apply(this, arguments);
+        if (this.exclusive) {
+          range.pop();
+        }
+        return "[" + (range.join(', ')) + "]";
+      }
+      idt = this.tab + TAB;
+      i = o.scope.freeVariable('i');
+      result = o.scope.freeVariable('results');
+      pre = "\n" + idt + result + " = [];";
+      if (this.fromNum && this.toNum) {
+        o.index = i;
+        body = this.compileNode(o);
+      } else {
+        vars = ("" + i + " = " + this.from) + (this.to !== this.toVar ? ", " + this.to : '');
+        cond = "" + this.fromVar + " <= " + this.toVar;
+        body = "var " + vars + "; " + cond + " ? " + i + " <" + this.equals + " " + this.toVar + " : " + i + " >" + this.equals + " " + this.toVar + "; " + cond + " ? " + i + "++ : " + i + "--";
+      }
+      post = "{ " + result + ".push(" + i + "); }\n" + idt + "return " + result + ";\n" + o.indent;
+      return "(function() {" + pre + "\n" + idt + "for (" + body + ")" + post + "}).apply(this, arguments)";
+    };
+    return Range;
+  })();
+  exports.Slice = Slice = (function() {
+    __extends(Slice, Base);
+    Slice.prototype.children = ['range'];
+    function Slice(range) {
+      this.range = range;
+      Slice.__super__.constructor.call(this);
+    }
+    Slice.prototype.compileNode = function(o) {
+      var compiled, from, fromStr, to, toStr, _ref2;
+      _ref2 = this.range, to = _ref2.to, from = _ref2.from;
+      fromStr = from && from.compile(o, LEVEL_PAREN) || '0';
+      compiled = to && to.compile(o, LEVEL_PAREN);
+      if (to && !(!this.range.exclusive && +compiled === -1)) {
+        toStr = ', ' + (this.range.exclusive ? compiled : SIMPLENUM.test(compiled) ? (+compiled + 1).toString() : "(" + compiled + " + 1) || 9e9");
+      }
+      return ".slice(" + fromStr + (toStr || '') + ")";
+    };
+    return Slice;
+  })();
+  exports.Obj = Obj = (function() {
+    __extends(Obj, Base);
+    function Obj(props, generated) {
+      this.generated = generated != null ? generated : false;
+      this.objects = this.properties = props || [];
+    }
+    Obj.prototype.children = ['properties'];
+    Obj.prototype.compileNode = function(o) {
+      var i, idt, indent, join, lastNoncom, node, obj, prop, props, _i, _len;
+      props = this.properties;
+      if (!props.length) {
+        if (this.front) {
+          return '({})';
+        } else {
+          return '{}';
+        }
+      }
+      if (this.generated) {
+        for (_i = 0, _len = props.length; _i < _len; _i++) {
+          node = props[_i];
+          if (node instanceof Value) {
+            throw new Error('cannot have an implicit value in an implicit object');
+          }
+        }
+      }
+      idt = o.indent += TAB;
+      lastNoncom = this.lastNonComment(this.properties);
+      props = (function() {
+        var _len2, _results;
+        _results = [];
+        for (i = 0, _len2 = props.length; i < _len2; i++) {
+          prop = props[i];
+          join = i === props.length - 1 ? '' : prop === lastNoncom || prop instanceof Comment ? '\n' : ',\n';
+          indent = prop instanceof Comment ? '' : idt;
+          if (prop instanceof Value && prop["this"]) {
+            prop = new Assign(prop.properties[0].name, prop, 'object');
+          }
+          if (!(prop instanceof Comment)) {
+            if (!(prop instanceof Assign)) {
+              prop = new Assign(prop, prop, 'object');
+            }
+            (prop.variable.base || prop.variable).asKey = true;
+          }
+          _results.push(indent + prop.compile(o, LEVEL_TOP) + join);
+        }
+        return _results;
+      })();
+      props = props.join('');
+      obj = "{" + (props && '\n' + props + '\n' + this.tab) + "}";
+      if (this.front) {
+        return "(" + obj + ")";
+      } else {
+        return obj;
+      }
+    };
+    Obj.prototype.assigns = function(name) {
+      var prop, _i, _len, _ref2;
+      _ref2 = this.properties;
+      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+        prop = _ref2[_i];
+        if (prop.assigns(name)) {
+          return true;
+        }
+      }
+      return false;
+    };
+    return Obj;
+  })();
+  exports.Arr = Arr = (function() {
+    __extends(Arr, Base);
+    function Arr(objs) {
+      this.objects = objs || [];
+    }
+    Arr.prototype.children = ['objects'];
+    Arr.prototype.filterImplicitObjects = Call.prototype.filterImplicitObjects;
+    Arr.prototype.compileNode = function(o) {
+      var code, obj, objs;
+      if (!this.objects.length) {
+        return '[]';
+      }
+      o.indent += TAB;
+      objs = this.filterImplicitObjects(this.objects);
+      if (code = Splat.compileSplattedArray(o, objs)) {
+        return code;
+      }
+      code = ((function() {
+        var _i, _len, _results;
+        _results = [];
+        for (_i = 0, _len = objs.length; _i < _len; _i++) {
+          obj = objs[_i];
+          _results.push(obj.compile(o, LEVEL_LIST));
+        }
+        return _results;
+      })()).join(', ');
+      if (code.indexOf('\n') >= 0) {
+        return "[\n" + o.indent + code + "\n" + this.tab + "]";
+      } else {
+        return "[" + code + "]";
+      }
+    };
+    Arr.prototype.assigns = function(name) {
+      var obj, _i, _len, _ref2;
+      _ref2 = this.objects;
+      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+        obj = _ref2[_i];
+        if (obj.assigns(name)) {
+          return true;
+        }
+      }
+      return false;
+    };
+    return Arr;
+  })();
+  exports.Class = Class = (function() {
+    __extends(Class, Base);
+    function Class(variable, parent, body) {
+      this.variable = variable;
+      this.parent = parent;
+      this.body = body != null ? body : new Block;
+      this.boundFuncs = [];
+      this.body.classBody = true;
+    }
+    Class.prototype.children = ['variable', 'parent', 'body'];
+    Class.prototype.determineName = function() {
+      var decl, tail;
+      if (!this.variable) {
+        return null;
+      }
+      decl = (tail = last(this.variable.properties)) ? tail instanceof Access && tail.name.value : this.variable.base.value;
+      return decl && (decl = IDENTIFIER.test(decl) && decl);
+    };
+    Class.prototype.setContext = function(name) {
+      return this.body.traverseChildren(false, function(node) {
+        if (node.classBody) {
+          return false;
+        }
+        if (node instanceof Literal && node.value === 'this') {
+          return node.value = name;
+        } else if (node instanceof Code) {
+          node.klass = name;
+          if (node.bound) {
+            return node.context = name;
+          }
+        }
+      });
+    };
+    Class.prototype.addBoundFunctions = function(o) {
+      var bname, bvar, _i, _len, _ref2, _results;
+      if (this.boundFuncs.length) {
+        _ref2 = this.boundFuncs;
+        _results = [];
+        for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+          bvar = _ref2[_i];
+          bname = bvar.compile(o);
+          _results.push(this.ctor.body.unshift(new Literal("this." + bname + " = " + (utility('bind')) + "(this." + bname + ", this)")));
+        }
+        return _results;
+      }
+    };
+    Class.prototype.addProperties = function(node, name, o) {
+      var assign, base, exprs, func, props;
+      props = node.base.properties.slice(0);
+      exprs = (function() {
+        var _results;
+        _results = [];
+        while (assign = props.shift()) {
+          if (assign instanceof Assign) {
+            base = assign.variable.base;
+            delete assign.context;
+            func = assign.value;
+            if (base.value === 'constructor') {
+              if (this.ctor) {
+                throw new Error('cannot define more than one constructor in a class');
+              }
+              if (func.bound) {
+                throw new Error('cannot define a constructor as a bound function');
+              }
+              if (func instanceof Code) {
+                assign = this.ctor = func;
+              } else {
+                this.externalCtor = o.scope.freeVariable('class');
+                assign = new Assign(new Literal(this.externalCtor), func);
+              }
+            } else {
+              if (!assign.variable["this"]) {
+                assign.variable = new Value(new Literal(name), [new Access(base, 'proto')]);
+              }
+              if (func instanceof Code && func.bound) {
+                this.boundFuncs.push(base);
+                func.bound = false;
+              }
+            }
+          }
+          _results.push(assign);
+        }
+        return _results;
+      }).call(this);
+      return compact(exprs);
+    };
+    Class.prototype.walkBody = function(name, o) {
+      return this.traverseChildren(false, __bind(function(child) {
+        var exps, i, node, _len, _ref2;
+        if (child instanceof Class) {
+          return false;
+        }
+        if (child instanceof Block) {
+          _ref2 = exps = child.expressions;
+          for (i = 0, _len = _ref2.length; i < _len; i++) {
+            node = _ref2[i];
+            if (node instanceof Value && node.isObject(true)) {
+              exps[i] = this.addProperties(node, name, o);
+            }
+          }
+          return child.expressions = exps = flatten(exps);
+        }
+      }, this));
+    };
+    Class.prototype.ensureConstructor = function(name) {
+      if (!this.ctor) {
+        this.ctor = new Code;
+        if (this.parent) {
+          this.ctor.body.push(new Literal("" + name + ".__super__.constructor.apply(this, arguments)"));
+        }
+        if (this.externalCtor) {
+          this.ctor.body.push(new Literal("" + this.externalCtor + ".apply(this, arguments)"));
+        }
+        this.body.expressions.unshift(this.ctor);
+      }
+      this.ctor.ctor = this.ctor.name = name;
+      this.ctor.klass = null;
+      return this.ctor.noReturn = true;
+    };
+    Class.prototype.compileNode = function(o) {
+      var decl, klass, lname, name;
+      decl = this.determineName();
+      name = decl || this.name || '_Class';
+      lname = new Literal(name);
+      this.setContext(name);
+      this.walkBody(name, o);
+      this.ensureConstructor(name);
+      if (this.parent) {
+        this.body.expressions.unshift(new Extends(lname, this.parent));
+      }
+      if (!(this.ctor instanceof Code)) {
+        this.body.expressions.unshift(this.ctor);
+      }
+      this.body.expressions.push(lname);
+      this.addBoundFunctions(o);
+      klass = new Parens(Closure.wrap(this.body), true);
+      if (this.variable) {
+        klass = new Assign(this.variable, klass);
+      }
+      return klass.compile(o);
+    };
+    return Class;
+  })();
+  exports.Assign = Assign = (function() {
+    __extends(Assign, Base);
+    function Assign(variable, value, context, options) {
+      this.variable = variable;
+      this.value = value;
+      this.context = context;
+      this.param = options && options.param;
+    }
+    Assign.prototype.children = ['variable', 'value'];
+    Assign.prototype.assigns = function(name) {
+      return this[this.context === 'object' ? 'value' : 'variable'].assigns(name);
+    };
+    Assign.prototype.unfoldSoak = function(o) {
+      return unfoldSoak(o, this, 'variable');
+    };
+    Assign.prototype.compileNode = function(o) {
+      var isValue, match, name, val, _ref2;
+      if (isValue = this.variable instanceof Value) {
+        if (this.variable.isArray() || this.variable.isObject()) {
+          return this.compilePatternMatch(o);
+        }
+        if (this.variable.isSplice()) {
+          return this.compileSplice(o);
+        }
+        if ((_ref2 = this.context) === '||=' || _ref2 === '&&=' || _ref2 === '?=') {
+          return this.compileConditional(o);
+        }
+      }
+      name = this.variable.compile(o, LEVEL_LIST);
+      if (!(this.context || this.variable.isAssignable())) {
+        throw SyntaxError("\"" + (this.variable.compile(o)) + "\" cannot be assigned.");
+      }
+      if (!(this.context || isValue && (this.variable.namespaced || this.variable.hasProperties()))) {
+        if (this.param) {
+          o.scope.add(name, 'var');
+        } else {
+          o.scope.find(name);
+        }
+      }
+      if (this.value instanceof Code && (match = METHOD_DEF.exec(name))) {
+        this.value.name = match[2];
+        if (match[1]) {
+          this.value.klass = match[1];
+        }
+      }
+      val = this.value.compile(o, LEVEL_LIST);
+      if (this.context === 'object') {
+        return "" + name + ": " + val;
+      }
+      val = name + (" " + (this.context || '=') + " ") + val;
+      if (o.level <= LEVEL_LIST) {
+        return val;
+      } else {
+        return "(" + val + ")";
+      }
+    };
+    Assign.prototype.compilePatternMatch = function(o) {
+      var acc, assigns, code, i, idx, isObject, ivar, obj, objects, olen, ref, rest, splat, top, val, value, vvar, _len, _ref2, _ref3, _ref4, _ref5;
+      top = o.level === LEVEL_TOP;
+      value = this.value;
+      objects = this.variable.base.objects;
+      if (!(olen = objects.length)) {
+        code = value.compile(o);
+        if (o.level >= LEVEL_OP) {
+          return "(" + code + ")";
+        } else {
+          return code;
+        }
+      }
+      isObject = this.variable.isObject();
+      if (top && olen === 1 && !((obj = objects[0]) instanceof Splat)) {
+        if (obj instanceof Assign) {
+          _ref2 = obj, idx = _ref2.variable.base, obj = _ref2.value;
+        } else {
+          if (obj.base instanceof Parens) {
+            _ref3 = new Value(obj.unwrapAll()).cacheReference(o), obj = _ref3[0], idx = _ref3[1];
+          } else {
+            idx = isObject ? obj["this"] ? obj.properties[0].name : obj : new Literal(0);
+          }
+        }
+        acc = IDENTIFIER.test(idx.unwrap().value || 0);
+        value = new Value(value);
+        value.properties.push(new (acc ? Access : Index)(idx));
+        return new Assign(obj, value, null, {
+          param: this.param
+        }).compile(o, LEVEL_TOP);
+      }
+      vvar = value.compile(o, LEVEL_LIST);
+      assigns = [];
+      splat = false;
+      if (!IDENTIFIER.test(vvar) || this.variable.assigns(vvar)) {
+        assigns.push("" + (ref = o.scope.freeVariable('ref')) + " = " + vvar);
+        vvar = ref;
+      }
+      for (i = 0, _len = objects.length; i < _len; i++) {
+        obj = objects[i];
+        idx = i;
+        if (isObject) {
+          if (obj instanceof Assign) {
+            _ref4 = obj, idx = _ref4.variable.base, obj = _ref4.value;
+          } else {
+            if (obj.base instanceof Parens) {
+              _ref5 = new Value(obj.unwrapAll()).cacheReference(o), obj = _ref5[0], idx = _ref5[1];
+            } else {
+              idx = obj["this"] ? obj.properties[0].name : obj;
+            }
+          }
+        }
+        if (!splat && obj instanceof Splat) {
+          val = "" + olen + " <= " + vvar + ".length ? " + (utility('slice')) + ".call(" + vvar + ", " + i;
+          if (rest = olen - i - 1) {
+            ivar = o.scope.freeVariable('i');
+            val += ", " + ivar + " = " + vvar + ".length - " + rest + ") : (" + ivar + " = " + i + ", [])";
+          } else {
+            val += ") : []";
+          }
+          val = new Literal(val);
+          splat = "" + ivar + "++";
+        } else {
+          if (obj instanceof Splat) {
+            obj = obj.name.compile(o);
+            throw SyntaxError("multiple splats are disallowed in an assignment: " + obj + " ...");
+          }
+          if (typeof idx === 'number') {
+            idx = new Literal(splat || idx);
+            acc = false;
+          } else {
+            acc = isObject && IDENTIFIER.test(idx.unwrap().value || 0);
+          }
+          val = new Value(new Literal(vvar), [new (acc ? Access : Index)(idx)]);
+        }
+        assigns.push(new Assign(obj, val, null, {
+          param: this.param
+        }).compile(o, LEVEL_TOP));
+      }
+      if (!top) {
+        assigns.push(vvar);
+      }
+      code = assigns.join(', ');
+      if (o.level < LEVEL_LIST) {
+        return code;
+      } else {
+        return "(" + code + ")";
+      }
+    };
+    Assign.prototype.compileConditional = function(o) {
+      var left, rite, _ref2;
+      _ref2 = this.variable.cacheReference(o), left = _ref2[0], rite = _ref2[1];
+      if (__indexOf.call(this.context, "?") >= 0) {
+        o.isExistentialEquals = true;
+      }
+      return new Op(this.context.slice(0, -1), left, new Assign(rite, this.value, '=')).compile(o);
+    };
+    Assign.prototype.compileSplice = function(o) {
+      var code, exclusive, from, fromDecl, fromRef, name, to, valDef, valRef, _ref2, _ref3, _ref4;
+      _ref2 = this.variable.properties.pop().range, from = _ref2.from, to = _ref2.to, exclusive = _ref2.exclusive;
+      name = this.variable.compile(o);
+      _ref3 = (from != null ? from.cache(o, LEVEL_OP) : void 0) || ['0', '0'], fromDecl = _ref3[0], fromRef = _ref3[1];
+      if (to) {
+        if ((from != null ? from.isSimpleNumber() : void 0) && to.isSimpleNumber()) {
+          to = +to.compile(o) - +fromRef;
+          if (!exclusive) {
+            to += 1;
+          }
+        } else {
+          to = to.compile(o) + ' - ' + fromRef;
+          if (!exclusive) {
+            to += ' + 1';
+          }
+        }
+      } else {
+        to = "9e9";
+      }
+      _ref4 = this.value.cache(o, LEVEL_LIST), valDef = _ref4[0], valRef = _ref4[1];
+      code = "[].splice.apply(" + name + ", [" + fromDecl + ", " + to + "].concat(" + valDef + ")), " + valRef;
+      if (o.level > LEVEL_TOP) {
+        return "(" + code + ")";
+      } else {
+        return code;
+      }
+    };
+    return Assign;
+  })();
+  exports.Code = Code = (function() {
+    __extends(Code, Base);
+    function Code(params, body, tag) {
+      this.params = params || [];
+      this.body = body || new Block;
+      this.bound = tag === 'boundfunc';
+      if (this.bound) {
+        this.context = 'this';
+      }
+    }
+    Code.prototype.children = ['params', 'body'];
+    Code.prototype.isStatement = function() {
+      return !!this.ctor;
+    };
+    Code.prototype.jumps = NO;
+    Code.prototype.compileNode = function(o) {
+      var code, exprs, i, idt, lit, p, param, ref, splats, v, val, vars, wasEmpty, _i, _j, _k, _len, _len2, _len3, _len4, _ref2, _ref3, _ref4, _ref5;
+      o.scope = new Scope(o.scope, this.body, this);
+      o.scope.shared = del(o, 'sharedScope');
+      o.indent += TAB;
+      delete o.bare;
+      vars = [];
+      exprs = [];
+      _ref2 = this.params;
+      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+        param = _ref2[_i];
+        if (param.splat) {
+          _ref3 = this.params;
+          for (_j = 0, _len2 = _ref3.length; _j < _len2; _j++) {
+            p = _ref3[_j];
+            if (p.name.value) {
+              o.scope.add(p.name.value, 'var', true);
+            }
+          }
+          splats = new Assign(new Value(new Arr((function() {
+            var _k, _len3, _ref4, _results;
+            _ref4 = this.params;
+            _results = [];
+            for (_k = 0, _len3 = _ref4.length; _k < _len3; _k++) {
+              p = _ref4[_k];
+              _results.push(p.asReference(o));
+            }
+            return _results;
+          }).call(this))), new Value(new Literal('arguments')));
+          break;
+        }
+      }
+      _ref4 = this.params;
+      for (_k = 0, _len3 = _ref4.length; _k < _len3; _k++) {
+        param = _ref4[_k];
+        if (param.isComplex()) {
+          val = ref = param.asReference(o);
+          if (param.value) {
+            val = new Op('?', ref, param.value);
+          }
+          exprs.push(new Assign(new Value(param.name), val, '=', {
+            param: true
+          }));
+        } else {
+          ref = param;
+          if (param.value) {
+            lit = new Literal(ref.name.value + ' == null');
+            val = new Assign(new Value(param.name), param.value, '=');
+            exprs.push(new If(lit, val));
+          }
+        }
+        if (!splats) {
+          vars.push(ref);
+        }
+      }
+      wasEmpty = this.body.isEmpty();
+      if (splats) {
+        exprs.unshift(splats);
+      }
+      if (exprs.length) {
+        (_ref5 = this.body.expressions).unshift.apply(_ref5, exprs);
+      }
+      if (!splats) {
+        for (i = 0, _len4 = vars.length; i < _len4; i++) {
+          v = vars[i];
+          o.scope.parameter(vars[i] = v.compile(o));
+        }
+      }
+      if (!(wasEmpty || this.noReturn)) {
+        this.body.makeReturn();
+      }
+      idt = o.indent;
+      code = 'function';
+      if (this.ctor) {
+        code += ' ' + this.name;
+      }
+      code += '(' + vars.join(', ') + ') {';
+      if (!this.body.isEmpty()) {
+        code += "\n" + (this.body.compileWithDeclarations(o)) + "\n" + this.tab;
+      }
+      code += '}';
+      if (this.ctor) {
+        return this.tab + code;
+      }
+      if (this.bound) {
+        return utility('bind') + ("(" + code + ", " + this.context + ")");
+      }
+      if (this.front || (o.level >= LEVEL_ACCESS)) {
+        return "(" + code + ")";
+      } else {
+        return code;
+      }
+    };
+    Code.prototype.traverseChildren = function(crossScope, func) {
+      if (crossScope) {
+        return Code.__super__.traverseChildren.call(this, crossScope, func);
+      }
+    };
+    return Code;
+  })();
+  exports.Param = Param = (function() {
+    __extends(Param, Base);
+    function Param(name, value, splat) {
+      this.name = name;
+      this.value = value;
+      this.splat = splat;
+    }
+    Param.prototype.children = ['name', 'value'];
+    Param.prototype.compile = function(o) {
+      return this.name.compile(o, LEVEL_LIST);
+    };
+    Param.prototype.asReference = function(o) {
+      var node;
+      if (this.reference) {
+        return this.reference;
+      }
+      node = this.name;
+      if (node["this"]) {
+        node = node.properties[0].name;
+        if (node.value.reserved) {
+          node = new Literal('_' + node.value);
+        }
+      } else if (node.isComplex()) {
+        node = new Literal(o.scope.freeVariable('arg'));
+      }
+      node = new Value(node);
+      if (this.splat) {
+        node = new Splat(node);
+      }
+      return this.reference = node;
+    };
+    Param.prototype.isComplex = function() {
+      return this.name.isComplex();
+    };
+    return Param;
+  })();
+  exports.Splat = Splat = (function() {
+    __extends(Splat, Base);
+    Splat.prototype.children = ['name'];
+    Splat.prototype.isAssignable = YES;
+    function Splat(name) {
+      this.name = name.compile ? name : new Literal(name);
+    }
+    Splat.prototype.assigns = function(name) {
+      return this.name.assigns(name);
+    };
+    Splat.prototype.compile = function(o) {
+      if (this.index != null) {
+        return this.compileParam(o);
+      } else {
+        return this.name.compile(o);
+      }
+    };
+    Splat.compileSplattedArray = function(o, list, apply) {
+      var args, base, code, i, index, node, _len;
+      index = -1;
+      while ((node = list[++index]) && !(node instanceof Splat)) {
+        continue;
+      }
+      if (index >= list.length) {
+        return '';
+      }
+      if (list.length === 1) {
+        code = list[0].compile(o, LEVEL_LIST);
+        if (apply) {
+          return code;
+        }
+        return "" + (utility('slice')) + ".call(" + code + ")";
+      }
+      args = list.slice(index);
+      for (i = 0, _len = args.length; i < _len; i++) {
+        node = args[i];
+        code = node.compile(o, LEVEL_LIST);
+        args[i] = node instanceof Splat ? "" + (utility('slice')) + ".call(" + code + ")" : "[" + code + "]";
+      }
+      if (index === 0) {
+        return args[0] + (".concat(" + (args.slice(1).join(', ')) + ")");
+      }
+      base = (function() {
+        var _i, _len2, _ref2, _results;
+        _ref2 = list.slice(0, index);
+        _results = [];
+        for (_i = 0, _len2 = _ref2.length; _i < _len2; _i++) {
+          node = _ref2[_i];
+          _results.push(node.compile(o, LEVEL_LIST));
+        }
+        return _results;
+      })();
+      return "[" + (base.join(', ')) + "].concat(" + (args.join(', ')) + ")";
+    };
+    return Splat;
+  })();
+  exports.While = While = (function() {
+    __extends(While, Base);
+    function While(condition, options) {
+      this.condition = (options != null ? options.invert : void 0) ? condition.invert() : condition;
+      this.guard = options != null ? options.guard : void 0;
+    }
+    While.prototype.children = ['condition', 'guard', 'body'];
+    While.prototype.isStatement = YES;
+    While.prototype.makeReturn = function() {
+      this.returns = true;
+      return this;
+    };
+    While.prototype.addBody = function(body) {
+      this.body = body;
+      return this;
+    };
+    While.prototype.jumps = function() {
+      var expressions, node, _i, _len;
+      expressions = this.body.expressions;
+      if (!expressions.length) {
+        return false;
+      }
+      for (_i = 0, _len = expressions.length; _i < _len; _i++) {
+        node = expressions[_i];
+        if (node.jumps({
+          loop: true
+        })) {
+          return node;
+        }
+      }
+      return false;
+    };
+    While.prototype.compileNode = function(o) {
+      var body, code, rvar, set;
+      o.indent += TAB;
+      set = '';
+      body = this.body;
+      if (body.isEmpty()) {
+        body = '';
+      } else {
+        if (o.level > LEVEL_TOP || this.returns) {
+          rvar = o.scope.freeVariable('results');
+          set = "" + this.tab + rvar + " = [];\n";
+          if (body) {
+            body = Push.wrap(rvar, body);
+          }
+        }
+        if (this.guard) {
+          body = Block.wrap([new If(this.guard, body)]);
+        }
+        body = "\n" + (body.compile(o, LEVEL_TOP)) + "\n" + this.tab;
+      }
+      code = set + this.tab + ("while (" + (this.condition.compile(o, LEVEL_PAREN)) + ") {" + body + "}");
+      if (this.returns) {
+        code += "\n" + this.tab + "return " + rvar + ";";
+      }
+      return code;
+    };
+    return While;
+  })();
+  exports.Op = Op = (function() {
+    var CONVERSIONS, INVERSIONS;
+    __extends(Op, Base);
+    function Op(op, first, second, flip) {
+      var call;
+      if (op === 'in') {
+        return new In(first, second);
+      }
+      if (op === 'do') {
+        call = new Call(first, first.params || []);
+        call["do"] = true;
+        return call;
+      }
+      if (op === 'new') {
+        if (first instanceof Call && !first["do"]) {
+          return first.newInstance();
+        }
+        if (first instanceof Code && first.bound || first["do"]) {
+          first = new Parens(first);
+        }
+      }
+      this.operator = CONVERSIONS[op] || op;
+      this.first = first;
+      this.second = second;
+      this.flip = !!flip;
+      return this;
+    }
+    CONVERSIONS = {
+      '==': '===',
+      '!=': '!==',
+      'of': 'in'
+    };
+    INVERSIONS = {
+      '!==': '===',
+      '===': '!=='
+    };
+    Op.prototype.children = ['first', 'second'];
+    Op.prototype.isSimpleNumber = NO;
+    Op.prototype.isUnary = function() {
+      return !this.second;
+    };
+    Op.prototype.isComplex = function() {
+      var _ref2;
+      return !(this.isUnary() && ((_ref2 = this.operator) === '+' || _ref2 === '-')) || this.first.isComplex();
+    };
+    Op.prototype.isChainable = function() {
+      var _ref2;
+      return (_ref2 = this.operator) === '<' || _ref2 === '>' || _ref2 === '>=' || _ref2 === '<=' || _ref2 === '===' || _ref2 === '!==';
+    };
+    Op.prototype.invert = function() {
+      var allInvertable, curr, fst, op, _ref2;
+      if (this.isChainable() && this.first.isChainable()) {
+        allInvertable = true;
+        curr = this;
+        while (curr && curr.operator) {
+          allInvertable && (allInvertable = curr.operator in INVERSIONS);
+          curr = curr.first;
+        }
+        if (!allInvertable) {
+          return new Parens(this).invert();
+        }
+        curr = this;
+        while (curr && curr.operator) {
+          curr.invert = !curr.invert;
+          curr.operator = INVERSIONS[curr.operator];
+          curr = curr.first;
+        }
+        return this;
+      } else if (op = INVERSIONS[this.operator]) {
+        this.operator = op;
+        if (this.first.unwrap() instanceof Op) {
+          this.first.invert();
+        }
+        return this;
+      } else if (this.second) {
+        return new Parens(this).invert();
+      } else if (this.operator === '!' && (fst = this.first.unwrap()) instanceof Op && ((_ref2 = fst.operator) === '!' || _ref2 === 'in' || _ref2 === 'instanceof')) {
+        return fst;
+      } else {
+        return new Op('!', this);
+      }
+    };
+    Op.prototype.unfoldSoak = function(o) {
+      var _ref2;
+      return ((_ref2 = this.operator) === '++' || _ref2 === '--' || _ref2 === 'delete') && unfoldSoak(o, this, 'first');
+    };
+    Op.prototype.compileNode = function(o) {
+      var code;
+      if (this.isUnary()) {
+        return this.compileUnary(o);
+      }
+      if (this.isChainable() && this.first.isChainable()) {
+        return this.compileChain(o);
+      }
+      if (this.operator === '?') {
+        return this.compileExistence(o);
+      }
+      this.first.front = this.front;
+      code = this.first.compile(o, LEVEL_OP) + ' ' + this.operator + ' ' + this.second.compile(o, LEVEL_OP);
+      if (o.level <= LEVEL_OP) {
+        return code;
+      } else {
+        return "(" + code + ")";
+      }
+    };
+    Op.prototype.compileChain = function(o) {
+      var code, fst, shared, _ref2;
+      _ref2 = this.first.second.cache(o), this.first.second = _ref2[0], shared = _ref2[1];
+      fst = this.first.compile(o, LEVEL_OP);
+      code = "" + fst + " " + (this.invert ? '&&' : '||') + " " + (shared.compile(o)) + " " + this.operator + " " + (this.second.compile(o, LEVEL_OP));
+      return "(" + code + ")";
+    };
+    Op.prototype.compileExistence = function(o) {
+      var fst, ref;
+      if (this.first.isComplex()) {
+        ref = new Literal(o.scope.freeVariable('ref'));
+        fst = new Parens(new Assign(ref, this.first));
+      } else {
+        fst = this.first;
+        ref = fst;
+      }
+      return new If(new Existence(fst), ref, {
+        type: 'if'
+      }).addElse(this.second).compile(o);
+    };
+    Op.prototype.compileUnary = function(o) {
+      var op, parts;
+      parts = [op = this.operator];
+      if ((op === 'new' || op === 'typeof' || op === 'delete') || (op === '+' || op === '-') && this.first instanceof Op && this.first.operator === op) {
+        parts.push(' ');
+      }
+      if (op === 'new' && this.first.isStatement(o)) {
+        this.first = new Parens(this.first);
+      }
+      parts.push(this.first.compile(o, LEVEL_OP));
+      if (this.flip) {
+        parts.reverse();
+      }
+      return parts.join('');
+    };
+    Op.prototype.toString = function(idt) {
+      return Op.__super__.toString.call(this, idt, this.constructor.name + ' ' + this.operator);
+    };
+    return Op;
+  })();
+  exports.In = In = (function() {
+    __extends(In, Base);
+    function In(object, array) {
+      this.object = object;
+      this.array = array;
+    }
+    In.prototype.children = ['object', 'array'];
+    In.prototype.invert = NEGATE;
+    In.prototype.compileNode = function(o) {
+      var hasSplat, obj, _i, _len, _ref2;
+      if (this.array instanceof Value && this.array.isArray()) {
+        _ref2 = this.array.base.objects;
+        for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+          obj = _ref2[_i];
+          if (obj instanceof Splat) {
+            hasSplat = true;
+            break;
+          }
+        }
+        if (!hasSplat) {
+          return this.compileOrTest(o);
+        }
+      }
+      return this.compileLoopTest(o);
+    };
+    In.prototype.compileOrTest = function(o) {
+      var cmp, cnj, i, item, ref, sub, tests, _ref2, _ref3;
+      _ref2 = this.object.cache(o, LEVEL_OP), sub = _ref2[0], ref = _ref2[1];
+      _ref3 = this.negated ? [' !== ', ' && '] : [' === ', ' || '], cmp = _ref3[0], cnj = _ref3[1];
+      tests = (function() {
+        var _len, _ref4, _results;
+        _ref4 = this.array.base.objects;
+        _results = [];
+        for (i = 0, _len = _ref4.length; i < _len; i++) {
+          item = _ref4[i];
+          _results.push((i ? ref : sub) + cmp + item.compile(o, LEVEL_OP));
+        }
+        return _results;
+      }).call(this);
+      if (tests.length === 0) {
+        return 'false';
+      }
+      tests = tests.join(cnj);
+      if (o.level < LEVEL_OP) {
+        return tests;
+      } else {
+        return "(" + tests + ")";
+      }
+    };
+    In.prototype.compileLoopTest = function(o) {
+      var code, ref, sub, _ref2;
+      _ref2 = this.object.cache(o, LEVEL_LIST), sub = _ref2[0], ref = _ref2[1];
+      code = utility('indexOf') + (".call(" + (this.array.compile(o, LEVEL_LIST)) + ", " + ref + ") ") + (this.negated ? '< 0' : '>= 0');
+      if (sub === ref) {
+        return code;
+      }
+      code = sub + ', ' + code;
+      if (o.level < LEVEL_LIST) {
+        return code;
+      } else {
+        return "(" + code + ")";
+      }
+    };
+    In.prototype.toString = function(idt) {
+      return In.__super__.toString.call(this, idt, this.constructor.name + (this.negated ? '!' : ''));
+    };
+    return In;
+  })();
+  exports.Try = Try = (function() {
+    __extends(Try, Base);
+    function Try(attempt, error, recovery, ensure) {
+      this.attempt = attempt;
+      this.error = error;
+      this.recovery = recovery;
+      this.ensure = ensure;
+    }
+    Try.prototype.children = ['attempt', 'recovery', 'ensure'];
+    Try.prototype.isStatement = YES;
+    Try.prototype.jumps = function(o) {
+      var _ref2;
+      return this.attempt.jumps(o) || ((_ref2 = this.recovery) != null ? _ref2.jumps(o) : void 0);
+    };
+    Try.prototype.makeReturn = function() {
+      if (this.attempt) {
+        this.attempt = this.attempt.makeReturn();
+      }
+      if (this.recovery) {
+        this.recovery = this.recovery.makeReturn();
+      }
+      return this;
+    };
+    Try.prototype.compileNode = function(o) {
+      var catchPart, errorPart;
+      o.indent += TAB;
+      errorPart = this.error ? " (" + (this.error.compile(o)) + ") " : ' ';
+      catchPart = this.recovery ? " catch" + errorPart + "{\n" + (this.recovery.compile(o, LEVEL_TOP)) + "\n" + this.tab + "}" : !(this.ensure || this.recovery) ? ' catch (_e) {}' : void 0;
+      return ("" + this.tab + "try {\n" + (this.attempt.compile(o, LEVEL_TOP)) + "\n" + this.tab + "}" + (catchPart || '')) + (this.ensure ? " finally {\n" + (this.ensure.compile(o, LEVEL_TOP)) + "\n" + this.tab + "}" : '');
+    };
+    return Try;
+  })();
+  exports.Throw = Throw = (function() {
+    __extends(Throw, Base);
+    function Throw(expression) {
+      this.expression = expression;
+    }
+    Throw.prototype.children = ['expression'];
+    Throw.prototype.isStatement = YES;
+    Throw.prototype.jumps = NO;
+    Throw.prototype.makeReturn = THIS;
+    Throw.prototype.compileNode = function(o) {
+      return this.tab + ("throw " + (this.expression.compile(o)) + ";");
+    };
+    return Throw;
+  })();
+  exports.Existence = Existence = (function() {
+    __extends(Existence, Base);
+    function Existence(expression) {
+      this.expression = expression;
+    }
+    Existence.prototype.children = ['expression'];
+    Existence.prototype.invert = NEGATE;
+    Existence.prototype.compileNode = function(o) {
+      var cmp, cnj, code, _ref2;
+      code = this.expression.compile(o, LEVEL_OP);
+      code = IDENTIFIER.test(code) && !o.scope.check(code) ? ((_ref2 = this.negated ? ['===', '||'] : ['!==', '&&'], cmp = _ref2[0], cnj = _ref2[1], _ref2), "typeof " + code + " " + cmp + " \"undefined\" " + cnj + " " + code + " " + cmp + " null") : "" + code + " " + (this.negated ? '==' : '!=') + " null";
+      if (o.level <= LEVEL_COND) {
+        return code;
+      } else {
+        return "(" + code + ")";
+      }
+    };
+    return Existence;
+  })();
+  exports.Parens = Parens = (function() {
+    __extends(Parens, Base);
+    function Parens(body) {
+      this.body = body;
+    }
+    Parens.prototype.children = ['body'];
+    Parens.prototype.unwrap = function() {
+      return this.body;
+    };
+    Parens.prototype.isComplex = function() {
+      return this.body.isComplex();
+    };
+    Parens.prototype.makeReturn = function() {
+      return this.body.makeReturn();
+    };
+    Parens.prototype.compileNode = function(o) {
+      var bare, code, expr;
+      expr = this.body.unwrap();
+      if (expr instanceof Value && expr.isAtomic()) {
+        expr.front = this.front;
+        return expr.compile(o);
+      }
+      code = expr.compile(o, LEVEL_PAREN);
+      bare = o.level < LEVEL_OP && (expr instanceof Op || expr instanceof Call || (expr instanceof For && expr.returns));
+      if (bare) {
+        return code;
+      } else {
+        return "(" + code + ")";
+      }
+    };
+    return Parens;
+  })();
+  exports.For = For = (function() {
+    __extends(For, Base);
+    function For(body, source) {
+      var _ref2;
+      this.source = source.source, this.guard = source.guard, this.step = source.step, this.name = source.name, this.index = source.index;
+      this.body = Block.wrap([body]);
+      this.own = !!source.own;
+      this.object = !!source.object;
+      if (this.object) {
+        _ref2 = [this.index, this.name], this.name = _ref2[0], this.index = _ref2[1];
+      }
+      if (this.index instanceof Value) {
+        throw SyntaxError('index cannot be a pattern matching expression');
+      }
+      this.range = this.source instanceof Value && this.source.base instanceof Range && !this.source.properties.length;
+      this.pattern = this.name instanceof Value;
+      if (this.range && this.index) {
+        throw SyntaxError('indexes do not apply to range loops');
+      }
+      if (this.range && this.pattern) {
+        throw SyntaxError('cannot pattern match over range loops');
+      }
+      this.returns = false;
+    }
+    For.prototype.children = ['body', 'source', 'guard', 'step'];
+    For.prototype.isStatement = YES;
+    For.prototype.jumps = While.prototype.jumps;
+    For.prototype.makeReturn = function() {
+      this.returns = true;
+      return this;
+    };
+    For.prototype.compileNode = function(o) {
+      var body, defPart, forPart, forVarPart, guardPart, idt1, index, ivar, lastJumps, lvar, name, namePart, ref, resultPart, returnResult, rvar, scope, source, stepPart, stepvar, svar, varPart, _ref2;
+      body = Block.wrap([this.body]);
+      lastJumps = (_ref2 = last(body.expressions)) != null ? _ref2.jumps() : void 0;
+      if (lastJumps && lastJumps instanceof Return) {
+        this.returns = false;
+      }
+      source = this.range ? this.source.base : this.source;
+      scope = o.scope;
+      name = this.name && this.name.compile(o, LEVEL_LIST);
+      index = this.index && this.index.compile(o, LEVEL_LIST);
+      if (name && !this.pattern) {
+        scope.find(name, {
+          immediate: true
+        });
+      }
+      if (index) {
+        scope.find(index, {
+          immediate: true
+        });
+      }
+      if (this.returns) {
+        rvar = scope.freeVariable('results');
+      }
+      ivar = (this.range ? name : index) || scope.freeVariable('i');
+      if (this.step && !this.range) {
+        stepvar = scope.freeVariable("step");
+      }
+      if (this.pattern) {
+        name = ivar;
+      }
+      varPart = '';
+      guardPart = '';
+      defPart = '';
+      idt1 = this.tab + TAB;
+      if (this.range) {
+        forPart = source.compile(merge(o, {
+          index: ivar,
+          step: this.step
+        }));
+      } else {
+        svar = this.source.compile(o, LEVEL_LIST);
+        if ((name || this.own) && !IDENTIFIER.test(svar)) {
+          defPart = "" + this.tab + (ref = scope.freeVariable('ref')) + " = " + svar + ";\n";
+          svar = ref;
+        }
+        if (name && !this.pattern) {
+          namePart = "" + name + " = " + svar + "[" + ivar + "]";
+        }
+        if (!this.object) {
+          lvar = scope.freeVariable('len');
+          forVarPart = ("" + ivar + " = 0, " + lvar + " = " + svar + ".length") + (this.step ? ", " + stepvar + " = " + (this.step.compile(o, LEVEL_OP)) : '');
+          stepPart = this.step ? "" + ivar + " += " + stepvar : "" + ivar + "++";
+          forPart = "" + forVarPart + "; " + ivar + " < " + lvar + "; " + stepPart;
+        }
+      }
+      if (this.returns) {
+        resultPart = "" + this.tab + rvar + " = [];\n";
+        returnResult = "\n" + this.tab + "return " + rvar + ";";
+        body = Push.wrap(rvar, body);
+      }
+      if (this.guard) {
+        body = Block.wrap([new If(this.guard, body)]);
+      }
+      if (this.pattern) {
+        body.expressions.unshift(new Assign(this.name, new Literal("" + svar + "[" + ivar + "]")));
+      }
+      defPart += this.pluckDirectCall(o, body);
+      if (namePart) {
+        varPart = "\n" + idt1 + namePart + ";";
+      }
+      if (this.object) {
+        forPart = "" + ivar + " in " + svar;
+        if (this.own) {
+          guardPart = "\n" + idt1 + "if (!" + (utility('hasProp')) + ".call(" + svar + ", " + ivar + ")) continue;";
+        }
+      }
+      body = body.compile(merge(o, {
+        indent: idt1
+      }), LEVEL_TOP);
+      if (body) {
+        body = '\n' + body + '\n';
+      }
+      return "" + defPart + (resultPart || '') + this.tab + "for (" + forPart + ") {" + guardPart + varPart + body + this.tab + "}" + (returnResult || '');
+    };
+    For.prototype.pluckDirectCall = function(o, body) {
+      var base, defs, expr, fn, idx, ref, val, _len, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7;
+      defs = '';
+      _ref2 = body.expressions;
+      for (idx = 0, _len = _ref2.length; idx < _len; idx++) {
+        expr = _ref2[idx];
+        expr = expr.unwrapAll();
+        if (!(expr instanceof Call)) {
+          continue;
+        }
+        val = expr.variable.unwrapAll();
+        if (!((val instanceof Code) || (val instanceof Value && ((_ref3 = val.base) != null ? _ref3.unwrapAll() : void 0) instanceof Code && val.properties.length === 1 && ((_ref4 = (_ref5 = val.properties[0].name) != null ? _ref5.value : void 0) === 'call' || _ref4 === 'apply')))) {
+          continue;
+        }
+        fn = ((_ref6 = val.base) != null ? _ref6.unwrapAll() : void 0) || val;
+        ref = new Literal(o.scope.freeVariable('fn'));
+        base = new Value(ref);
+        if (val.base) {
+          _ref7 = [base, val], val.base = _ref7[0], base = _ref7[1];
+          args.unshift(new Literal('this'));
+        }
+        body.expressions[idx] = new Call(base, expr.args);
+        defs += this.tab + new Assign(ref, fn).compile(o, LEVEL_TOP) + ';\n';
+      }
+      return defs;
+    };
+    return For;
+  })();
+  exports.Switch = Switch = (function() {
+    __extends(Switch, Base);
+    function Switch(subject, cases, otherwise) {
+      this.subject = subject;
+      this.cases = cases;
+      this.otherwise = otherwise;
+    }
+    Switch.prototype.children = ['subject', 'cases', 'otherwise'];
+    Switch.prototype.isStatement = YES;
+    Switch.prototype.jumps = function(o) {
+      var block, conds, _i, _len, _ref2, _ref3, _ref4;
+      if (o == null) {
+        o = {
+          block: true
+        };
+      }
+      _ref2 = this.cases;
+      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+        _ref3 = _ref2[_i], conds = _ref3[0], block = _ref3[1];
+        if (block.jumps(o)) {
+          return block;
+        }
+      }
+      return (_ref4 = this.otherwise) != null ? _ref4.jumps(o) : void 0;
+    };
+    Switch.prototype.makeReturn = function() {
+      var pair, _i, _len, _ref2, _ref3;
+      _ref2 = this.cases;
+      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+        pair = _ref2[_i];
+        pair[1].makeReturn();
+      }
+      if ((_ref3 = this.otherwise) != null) {
+        _ref3.makeReturn();
+      }
+      return this;
+    };
+    Switch.prototype.compileNode = function(o) {
+      var block, body, code, cond, conditions, expr, i, idt1, idt2, _i, _len, _len2, _ref2, _ref3, _ref4, _ref5;
+      idt1 = o.indent + TAB;
+      idt2 = o.indent = idt1 + TAB;
+      code = this.tab + ("switch (" + (((_ref2 = this.subject) != null ? _ref2.compile(o, LEVEL_PAREN) : void 0) || false) + ") {\n");
+      _ref3 = this.cases;
+      for (i = 0, _len = _ref3.length; i < _len; i++) {
+        _ref4 = _ref3[i], conditions = _ref4[0], block = _ref4[1];
+        _ref5 = flatten([conditions]);
+        for (_i = 0, _len2 = _ref5.length; _i < _len2; _i++) {
+          cond = _ref5[_i];
+          if (!this.subject) {
+            cond = cond.invert();
+          }
+          code += idt1 + ("case " + (cond.compile(o, LEVEL_PAREN)) + ":\n");
+        }
+        if (body = block.compile(o, LEVEL_TOP)) {
+          code += body + '\n';
+        }
+        if (i === this.cases.length - 1 && !this.otherwise) {
+          break;
+        }
+        expr = this.lastNonComment(block.expressions);
+        if (expr instanceof Return || (expr instanceof Literal && expr.jumps() && expr.value !== 'debugger')) {
+          continue;
+        }
+        code += idt2 + 'break;\n';
+      }
+      if (this.otherwise && this.otherwise.expressions.length) {
+        code += idt1 + ("default:\n" + (this.otherwise.compile(o, LEVEL_TOP)) + "\n");
+      }
+      return code + this.tab + '}';
+    };
+    return Switch;
+  })();
+  exports.If = If = (function() {
+    __extends(If, Base);
+    function If(condition, body, options) {
+      this.body = body;
+      if (options == null) {
+        options = {};
+      }
+      this.condition = options.type === 'unless' ? condition.invert() : condition;
+      this.elseBody = null;
+      this.isChain = false;
+      this.soak = options.soak;
+    }
+    If.prototype.children = ['condition', 'body', 'elseBody'];
+    If.prototype.bodyNode = function() {
+      var _ref2;
+      return (_ref2 = this.body) != null ? _ref2.unwrap() : void 0;
+    };
+    If.prototype.elseBodyNode = function() {
+      var _ref2;
+      return (_ref2 = this.elseBody) != null ? _ref2.unwrap() : void 0;
+    };
+    If.prototype.addElse = function(elseBody) {
+      if (this.isChain) {
+        this.elseBodyNode().addElse(elseBody);
+      } else {
+        this.isChain = elseBody instanceof If;
+        this.elseBody = this.ensureBlock(elseBody);
+      }
+      return this;
+    };
+    If.prototype.isStatement = function(o) {
+      var _ref2;
+      return (o != null ? o.level : void 0) === LEVEL_TOP || this.bodyNode().isStatement(o) || ((_ref2 = this.elseBodyNode()) != null ? _ref2.isStatement(o) : void 0);
+    };
+    If.prototype.jumps = function(o) {
+      var _ref2;
+      return this.body.jumps(o) || ((_ref2 = this.elseBody) != null ? _ref2.jumps(o) : void 0);
+    };
+    If.prototype.compileNode = function(o) {
+      if (this.isStatement(o)) {
+        return this.compileStatement(o);
+      } else {
+        return this.compileExpression(o);
+      }
+    };
+    If.prototype.makeReturn = function() {
+      this.body && (this.body = new Block([this.body.makeReturn()]));
+      this.elseBody && (this.elseBody = new Block([this.elseBody.makeReturn()]));
+      return this;
+    };
+    If.prototype.ensureBlock = function(node) {
+      if (node instanceof Block) {
+        return node;
+      } else {
+        return new Block([node]);
+      }
+    };
+    If.prototype.compileStatement = function(o) {
+      var body, child, cond, exeq, ifPart;
+      child = del(o, 'chainChild');
+      exeq = del(o, 'isExistentialEquals');
+      if (exeq) {
+        return new If(this.condition.invert(), this.elseBodyNode(), {
+          type: 'if'
+        }).compile(o);
+      }
+      cond = this.condition.compile(o, LEVEL_PAREN);
+      o.indent += TAB;
+      body = this.ensureBlock(this.body).compile(o);
+      if (body) {
+        body = "\n" + body + "\n" + this.tab;
+      }
+      ifPart = "if (" + cond + ") {" + body + "}";
+      if (!child) {
+        ifPart = this.tab + ifPart;
+      }
+      if (!this.elseBody) {
+        return ifPart;
+      }
+      return ifPart + ' else ' + (this.isChain ? (o.indent = this.tab, o.chainChild = true, this.elseBody.unwrap().compile(o, LEVEL_TOP)) : "{\n" + (this.elseBody.compile(o, LEVEL_TOP)) + "\n" + this.tab + "}");
+    };
+    If.prototype.compileExpression = function(o) {
+      var alt, body, code, cond;
+      cond = this.condition.compile(o, LEVEL_COND);
+      body = this.bodyNode().compile(o, LEVEL_LIST);
+      alt = this.elseBodyNode() ? this.elseBodyNode().compile(o, LEVEL_LIST) : 'void 0';
+      code = "" + cond + " ? " + body + " : " + alt;
+      if (o.level >= LEVEL_COND) {
+        return "(" + code + ")";
+      } else {
+        return code;
+      }
+    };
+    If.prototype.unfoldSoak = function() {
+      return this.soak && this;
+    };
+    return If;
+  })();
+  Push = {
+    wrap: function(name, exps) {
+      if (exps.isEmpty() || last(exps.expressions).jumps()) {
+        return exps;
+      }
+      return exps.push(new Call(new Value(new Literal(name), [new Access(new Literal('push'))]), [exps.pop()]));
+    }
+  };
+  Closure = {
+    wrap: function(expressions, statement, noReturn) {
+      var args, call, func, mentionsArgs, meth;
+      if (expressions.jumps()) {
+        return expressions;
+      }
+      func = new Code([], Block.wrap([expressions]));
+      args = [];
+      if ((mentionsArgs = expressions.contains(this.literalArgs)) || expressions.contains(this.literalThis)) {
+        meth = new Literal(mentionsArgs ? 'apply' : 'call');
+        args = [new Literal('this')];
+        if (mentionsArgs) {
+          args.push(new Literal('arguments'));
+        }
+        func = new Value(func, [new Access(meth)]);
+      }
+      func.noReturn = noReturn;
+      call = new Call(func, args);
+      if (statement) {
+        return Block.wrap([call]);
+      } else {
+        return call;
+      }
+    },
+    literalArgs: function(node) {
+      return node instanceof Literal && node.value === 'arguments' && !node.asKey;
+    },
+    literalThis: function(node) {
+      return (node instanceof Literal && node.value === 'this' && !node.asKey) || (node instanceof Code && node.bound);
+    }
+  };
+  unfoldSoak = function(o, parent, name) {
+    var ifn;
+    if (!(ifn = parent[name].unfoldSoak(o))) {
+      return;
+    }
+    parent[name] = ifn.body;
+    ifn.body = new Value(parent);
+    return ifn;
+  };
+  UTILITIES = {
+    "extends": 'function(child, parent) {\n  for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; }\n  function ctor() { this.constructor = child; }\n  ctor.prototype = parent.prototype;\n  child.prototype = new ctor;\n  child.__super__ = parent.prototype;\n  return child;\n}',
+    bind: 'function(fn, me){ return function(){ return fn.apply(me, arguments); }; }',
+    indexOf: 'Array.prototype.indexOf || function(item) {\n  for (var i = 0, l = this.length; i < l; i++) {\n    if (this[i] === item) return i;\n  }\n  return -1;\n}',
+    hasProp: 'Object.prototype.hasOwnProperty',
+    slice: 'Array.prototype.slice'
+  };
+  LEVEL_TOP = 1;
+  LEVEL_PAREN = 2;
+  LEVEL_LIST = 3;
+  LEVEL_COND = 4;
+  LEVEL_OP = 5;
+  LEVEL_ACCESS = 6;
+  TAB = '  ';
+  IDENTIFIER = /^[$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*$/;
+  SIMPLENUM = /^[+-]?\d+$/;
+  METHOD_DEF = /^(?:([$A-Za-z_][$\w\x7f-\uffff]*)\.prototype\.)?([$A-Za-z_][$\w\x7f-\uffff]*)$/;
+  IS_STRING = /^['"]/;
+  utility = function(name) {
+    var ref;
+    ref = "__" + name;
+    Scope.root.assign(ref, UTILITIES[name]);
+    return ref;
+  };
+  multident = function(code, tab) {
+    return code.replace(/\n/g, '$&' + tab);
+  };
+});
+/**
+ * Copyright (c) 2011 Jeremy Ashkenas
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+define('ace/mode/coffee/scope', ['require', 'exports', 'module' , 'ace/mode/coffee/helpers'], function(require, exports, module) {
+  var Scope, extend, last, _ref;
+  _ref = require('./helpers'), extend = _ref.extend, last = _ref.last;
+  exports.Scope = Scope = (function() {
+    Scope.root = null;
+    function Scope(parent, expressions, method) {
+      this.parent = parent;
+      this.expressions = expressions;
+      this.method = method;
+      this.variables = [
+        {
+          name: 'arguments',
+          type: 'arguments'
+        }
+      ];
+      this.positions = {};
+      if (!this.parent) {
+        Scope.root = this;
+      }
+    }
+    Scope.prototype.add = function(name, type, immediate) {
+      var pos;
+      if (this.shared && !immediate) {
+        return this.parent.add(name, type, immediate);
+      }
+      if (typeof (pos = this.positions[name]) === 'number') {
+        return this.variables[pos].type = type;
+      } else {
+        return this.positions[name] = this.variables.push({
+          name: name,
+          type: type
+        }) - 1;
+      }
+    };
+    Scope.prototype.find = function(name, options) {
+      if (this.check(name, options)) {
+        return true;
+      }
+      this.add(name, 'var');
+      return false;
+    };
+    Scope.prototype.parameter = function(name) {
+      if (this.shared && this.parent.check(name, true)) {
+        return;
+      }
+      return this.add(name, 'param');
+    };
+    Scope.prototype.check = function(name, immediate) {
+      var found, _ref2;
+      found = !!this.type(name);
+      if (found || immediate) {
+        return found;
+      }
+      return !!((_ref2 = this.parent) != null ? _ref2.check(name) : void 0);
+    };
+    Scope.prototype.temporary = function(name, index) {
+      if (name.length > 1) {
+        return '_' + name + (index > 1 ? index : '');
+      } else {
+        return '_' + (index + parseInt(name, 36)).toString(36).replace(/\d/g, 'a');
+      }
+    };
+    Scope.prototype.type = function(name) {
+      var v, _i, _len, _ref2;
+      _ref2 = this.variables;
+      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+        v = _ref2[_i];
+        if (v.name === name) {
+          return v.type;
+        }
+      }
+      return null;
+    };
+    Scope.prototype.freeVariable = function(type) {
+      var index, temp;
+      index = 0;
+      while (this.check((temp = this.temporary(type, index)))) {
+        index++;
+      }
+      this.add(temp, 'var', true);
+      return temp;
+    };
+    Scope.prototype.assign = function(name, value) {
+      this.add(name, {
+        value: value,
+        assigned: true
+      });
+      return this.hasAssignments = true;
+    };
+    Scope.prototype.hasDeclarations = function() {
+      return !!this.declaredVariables().length;
+    };
+    Scope.prototype.declaredVariables = function() {
+      var realVars, tempVars, v, _i, _len, _ref2;
+      realVars = [];
+      tempVars = [];
+      _ref2 = this.variables;
+      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+        v = _ref2[_i];
+        if (v.type === 'var') {
+          (v.name.charAt(0) === '_' ? tempVars : realVars).push(v.name);
+        }
+      }
+      return realVars.sort().concat(tempVars.sort());
+    };
+    Scope.prototype.assignedVariables = function() {
+      var v, _i, _len, _ref2, _results;
+      _ref2 = this.variables;
+      _results = [];
+      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+        v = _ref2[_i];
+        if (v.type.assigned) {
+          _results.push("" + v.name + " = " + v.type.value);
+        }
+      }
+      return _results;
+    };
+    return Scope;
+  })();
+});
diff --git a/apps/files_texteditor/js/aceeditor/worker-css.js b/apps/files_texteditor/js/aceeditor/worker-css.js
index cfd506b289f..7b179068ae1 100644
--- a/apps/files_texteditor/js/aceeditor/worker-css.js
+++ b/apps/files_texteditor/js/aceeditor/worker-css.js
@@ -1 +1,9538 @@
-function initSender(){var a=require("pilot/event_emitter").EventEmitter,b=require("pilot/oop"),c=function(){};(function(){b.implement(this,a),this.callback=function(a,b){postMessage({type:"call",id:b,data:a})},this.emit=function(a,b){postMessage({type:"event",name:a,data:b})}}).call(c.prototype);return new c}function initBaseUrls(a){require.tlns=a}var console={log:function(a){postMessage({type:"log",data:a})}},window={console:console},require=function(a){var b=require.modules[a];if(b){b.initialized||(b.exports=b.factory().exports,b.initialized=!0);return b.exports}var c=a.split("/");c[0]=require.tlns[c[0]]||c[0],path=c.join("/")+".js",require.id=a,importScripts(path);return require(a)};require.modules={},require.tlns={};var define=function(a,b,c){arguments.length==2?c=b:arguments.length==1&&(c=a,a=require.id);a.indexOf("text/")!==0&&(require.modules[a]={factory:function(){var a={exports:{}},b=c(require,a.exports,a);b&&(a.exports=b);return a}})},main,sender;onmessage=function(a){var b=a.data;if(b.command)main[b.command].apply(main,b.args);else if(b.init){initBaseUrls(b.tlns),require("pilot/fixoldbrowsers"),sender=initSender();var c=require(b.module)[b.classname];main=new c(sender)}else b.event&&sender&&sender._dispatchEvent(b.event,b.data)},define("pilot/fixoldbrowsers",["require","exports","module"],function(a,b,c){if(!Function.prototype.bind){var d=Array.prototype.slice;Function.prototype.bind=function(a){var b=this;if(typeof b.apply!="function"||typeof b.call!="function")return new TypeError;var c=d.call(arguments),e=function f(){if(this instanceof f){var a=Object.create(b.prototype);b.apply(a,c.concat(d.call(arguments)));return a}return b.call.apply(b,c.concat(d.call(arguments)))};e.length=typeof b=="function"?Math.max(b.length-c.length,0):0;return e}}var e=Function.prototype.call,f=Array.prototype,g=Object.prototype,h=e.bind(g.hasOwnProperty),i,j,k,l,m;if(m=h(g,"__defineGetter__"))i=e.bind(g.__defineGetter__),j=e.bind(g.__defineSetter__),k=e.bind(g.__lookupGetter__),l=e.bind(g.__lookupSetter__);Array.isArray||(Array.isArray=function(a){return Object.prototype.toString.call(a)==="[object Array]"}),Array.prototype.forEach||(Array.prototype.forEach=function(a,b){var c=+this.length;for(var d=0;d<c;d++)d in this&&a.call(b,this[d],d,this)}),Array.prototype.map||(Array.prototype.map=function(a){var b=+this.length;if(typeof a!="function")throw new TypeError;var c=Array(b),d=arguments[1];for(var e=0;e<b;e++)e in this&&(c[e]=a.call(d,this[e],e,this));return c}),Array.prototype.filter||(Array.prototype.filter=function(a){var b=[],c=arguments[1];for(var d=0;d<this.length;d++)a.call(c,this[d])&&b.push(this[d]);return b}),Array.prototype.every||(Array.prototype.every=function(a){var b=arguments[1];for(var c=0;c<this.length;c++)if(!a.call(b,this[c]))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(a){var b=arguments[1];for(var c=0;c<this.length;c++)if(a.call(b,this[c]))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(a){var b=+this.length;if(typeof a!="function")throw new TypeError;if(b===0&&arguments.length===1)throw new TypeError;var c=0;if(arguments.length>=2)var d=arguments[1];else do{if(c in this){d=this[c++];break}if(++c>=b)throw new TypeError}while(!0);for(;c<b;c++)c in this&&(d=a.call(null,d,this[c],c,this));return d}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(a){var b=+this.length;if(typeof a!="function")throw new TypeError;if(b===0&&arguments.length===1)throw new TypeError;var c=b-1;if(arguments.length>=2)var d=arguments[1];else do{if(c in this){d=this[c--];break}if(--c<0)throw new TypeError}while(!0);for(;c>=0;c--)c in this&&(d=a.call(null,d,this[c],c,this));return d}),Array.prototype.indexOf||(Array.prototype.indexOf=function(a){var b=this.length;if(!b)return-1;var c=arguments[1]||0;if(c>=b)return-1;c<0&&(c+=b);for(;c<b;c++){if(!h(this,c))continue;if(a===this[c])return c}return-1}),Array.prototype.lastIndexOf||(Array.prototype.lastIndexOf=function(a){var b=this.length;if(!b)return-1;var c=arguments[1]||b;c<0&&(c+=b),c=Math.min(c,b-1);for(;c>=0;c--){if(!h(this,c))continue;if(a===this[c])return c}return-1}),Object.getPrototypeOf||(Object.getPrototypeOf=function(a){return a.__proto__||a.constructor.prototype});if(!Object.getOwnPropertyDescriptor){var n="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(a,b){if(typeof a!="object"&&typeof a!="function"||a===null)throw new TypeError(n+a);if(!h(a,b))return undefined;var c,d,e;c={enumerable:!0,configurable:!0};if(m){var f=a.__proto__;a.__proto__=g;var d=k(a,b),e=l(a,b);a.__proto__=f;if(d||e){d&&(descriptor.get=d),e&&(descriptor.set=e);return descriptor}}descriptor.value=a[b];return descriptor}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(a){return Object.keys(a)}),Object.create||(Object.create=function(a,b){var c;if(a===null)c={"__proto__":null};else{if(typeof a!="object")throw new TypeError("typeof prototype["+typeof a+"] != 'object'");var d=function(){};d.prototype=a,c=new d,c.__proto__=a}typeof b!="undefined"&&Object.defineProperties(c,b);return c});if(!Object.defineProperty){var o="Property description must be an object: ",p="Object.defineProperty called on non-object: ",q="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(a,b,c){if(typeof a!="object"&&typeof a!="function")throw new TypeError(p+a);if(typeof a!="object"||a===null)throw new TypeError(o+c);if(h(c,"value"))if(m&&(k(a,b)||l(a,b))){var d=a.__proto__;a.__proto__=g,delete a[b],a[b]=c.value,a.prototype}else a[b]=c.value;else{if(!m)throw new TypeError(q);h(c,"get")&&i(a,b,c.get),h(c,"set")&&j(a,b,c.set)}return a}}Object.defineProperties||(Object.defineProperties=function(a,b){for(var c in b)h(b,c)&&Object.defineProperty(a,c,b[c]);return a}),Object.seal||(Object.seal=function(a){return a}),Object.freeze||(Object.freeze=function(a){return a});try{Object.freeze(function(){})}catch(r){Object.freeze=function(a){return function b(b){return typeof b=="function"?b:a(b)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(a){return a}),Object.isSealed||(Object.isSealed=function(a){return!1}),Object.isFrozen||(Object.isFrozen=function(a){return!1}),Object.isExtensible||(Object.isExtensible=function(a){return!0});if(!Object.keys){var s=!0,t=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],u=t.length;for(var v in{toString:null})s=!1;Object.keys=function W(a){if(typeof a!="object"&&typeof a!="function"||a===null)throw new TypeError("Object.keys called on a non-object");var W=[];for(var b in a)h(a,b)&&W.push(b);if(s)for(var c=0,d=u;c<d;c++){var e=t[c];h(a,e)&&W.push(e)}return W}}Date.prototype.toISOString||(Date.prototype.toISOString=function(){return this.getUTCFullYear()+"-"+(this.getUTCMonth()+1)+"-"+this.getUTCDate()+"T"+this.getUTCHours()+":"+this.getUTCMinutes()+":"+this.getUTCSeconds()+"Z"}),Date.now||(Date.now=function(){return(new Date).getTime()}),Date.prototype.toJSON||(Date.prototype.toJSON=function(a){if(typeof this.toISOString!="function")throw new TypeError;return this.toISOString()}),isNaN(Date.parse("T00:00"))&&(Date=function(a){var b=function(c,d,e,f,g,h,i){var j=arguments.length;if(this instanceof a){var k=j===1&&String(c)===c?new a(b.parse(c)):j>=7?new a(c,d,e,f,g,h,i):j>=6?new a(c,d,e,f,g,h):j>=5?new a(c,d,e,f,g):j>=4?new a(c,d,e,f):j>=3?new a(c,d,e):j>=2?new a(c,d):j>=1?new a(c):new a;k.constructor=b;return k}return a.apply(this,arguments)},c=new RegExp("^(?:((?:[+-]\\d\\d)?\\d\\d\\d\\d)(?:-(\\d\\d)(?:-(\\d\\d))?)?)?(?:T(\\d\\d):(\\d\\d)(?::(\\d\\d)(?:\\.(\\d\\d\\d))?)?)?(?:Z|([+-])(\\d\\d):(\\d\\d))?$");for(var d in a)b[d]=a[d];b.now=a.now,b.UTC=a.UTC,b.prototype=a.prototype,b.prototype.constructor=b,b.parse=function e(b){var d=c.exec(b);if(d){d.shift();var e=d[0]===undefined;for(var f=0;f<10;f++){if(f===7)continue;d[f]=+(d[f]||(f<3?1:0)),f===1&&d[f]--}if(e)return((d[3]*60+d[4])*60+d[5])*1e3+d[6];var g=(d[8]*60+d[9])*60*1e3;d[6]==="-"&&(g=-g);return a.UTC.apply(this,d.slice(0,7))+g}return a.parse.apply(this,arguments)};return b}(Date));if(!String.prototype.trim){var w=/^\s\s*/,x=/\s\s*$/;String.prototype.trim=function(){return String(this).replace(w,"").replace(x,"")}}}),define("pilot/event_emitter",["require","exports","module"],function(a,b,c){var d={};d._emit=d._dispatchEvent=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!!c&&!!c.length){var b=b||{};b.type=a;for(var d=0;d<c.length;d++)c[d](b)}},d.on=d.addEventListener=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!c)var c=this._eventRegistry[a]=[];c.indexOf(b)==-1&&c.push(b)},d.removeListener=d.removeEventListener=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!!c){var d=c.indexOf(b);d!==-1&&c.splice(d,1)}},d.removeAllListeners=function(a){this._eventRegistry&&(this._eventRegistry[a]=[])},b.EventEmitter=d}),define("pilot/oop",["require","exports","module"],function(a,b,c){b.inherits=function(){var a=function(){};return function(b,c){a.prototype=c.prototype,b.super_=c.prototype,b.prototype=new a,b.prototype.constructor=b}}(),b.mixin=function(a,b){for(var c in b)a[c]=b[c]},b.implement=function(a,c){b.mixin(a,c)}}),define("ace/mode/css_worker",["require","exports","module","pilot/oop","ace/worker/mirror","ace/mode/css/csslint"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/worker/mirror").Mirror,f=a("ace/mode/css/csslint").CSSLint,g=b.Worker=function(a){e.call(this,a),this.setTimeout(200)};d.inherits(g,e),function(){this.onUpdate=function(){var a=this.doc.getValue();result=f.verify(a),this.sender.emit("csslint",result.messages.map(function(a){delete a.rule;return a}))}}.call(g.prototype)}),define("ace/worker/mirror",["require","exports","module","ace/document","pilot/lang"],function(a,b,c){var d=a("ace/document").Document,e=a("pilot/lang"),f=b.Mirror=function(a){this.sender=a;var b=this.doc=new d(""),c=this.deferredUpdate=e.deferredCall(this.onUpdate.bind(this)),f=this;a.on("change",function(a){b.applyDeltas([a.data]),c.schedule(f.$timeout)})};(function(){this.$timeout=500,this.setTimeout=function(a){this.$timeout=a},this.setValue=function(a){this.doc.setValue(a),this.deferredUpdate.schedule(this.$timeout)},this.getValue=function(a){this.sender.callback(this.doc.getValue(),a)},this.onUpdate=function(){}}).call(f.prototype)}),define("ace/document",["require","exports","module","pilot/oop","pilot/event_emitter","ace/range","ace/anchor"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=a("ace/range").Range,g=a("ace/anchor").Anchor,h=function(a){this.$lines=[],Array.isArray(a)?this.insertLines(0,a):a.length==0?this.$lines=[""]:this.insert({row:0,column:0},a)};(function(){d.implement(this,e),this.setValue=function(a){var b=this.getLength();this.remove(new f(0,0,b,this.getLine(b-1).length)),this.insert({row:0,column:0},a)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(a,b){return new g(this,a,b)},"aaa".split(/a/).length==0?this.$split=function(a){return a.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(a){return a.split(/\r\n|\r|\n/)},this.$detectNewLine=function(a){var b=a.match(/^.*?(\r?\n)/m);b?this.$autoNewLine=b[1]:this.$autoNewLine="\n"},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";case"auto":return this.$autoNewLine}},this.$autoNewLine="\n",this.$newLineMode="auto",this.setNewLineMode=function(a){this.$newLineMode!==a&&(this.$newLineMode=a)},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(a){return a=="\r\n"||a=="\r"||a=="\n"},this.getLine=function(a){return this.$lines[a]||""},this.getLines=function(a,b){return this.$lines.slice(a,b+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(a){if(a.start.row==a.end.row)return this.$lines[a.start.row].substring(a.start.column,a.end.column);var b=[];b.push(this.$lines[a.start.row].substring(a.start.column)),b.push.apply(b,this.getLines(a.start.row+1,a.end.row-1)),b.push(this.$lines[a.end.row].substring(0,a.end.column));return b.join(this.getNewLineCharacter())},this.$clipPosition=function(a){var b=this.getLength();a.row>=b&&(a.row=Math.max(0,b-1),a.column=this.getLine(b-1).length);return a},this.insert=function(a,b){if(b.length==0)return a;a=this.$clipPosition(a),this.getLength()<=1&&this.$detectNewLine(b);var c=this.$split(b),d=c.splice(0,1)[0],e=c.length==0?null:c.splice(c.length-1,1)[0];a=this.insertInLine(a,d),e!==null&&(a=this.insertNewLine(a),a=this.insertLines(a.row,c),a=this.insertInLine(a,e||""));return a},this.insertLines=function(a,b){if(b.length==0)return{row:a,column:0};var c=[a,0];c.push.apply(c,b),this.$lines.splice.apply(this.$lines,c);var d=new f(a,0,a+b.length,0),e={action:"insertLines",range:d,lines:b};this._dispatchEvent("change",{data:e});return d.end},this.insertNewLine=function(a){a=this.$clipPosition(a);var b=this.$lines[a.row]||"";this.$lines[a.row]=b.substring(0,a.column),this.$lines.splice(a.row+1,0,b.substring(a.column,b.length));var c={row:a.row+1,column:0},d={action:"insertText",range:f.fromPoints(a,c),text:this.getNewLineCharacter()};this._dispatchEvent("change",{data:d});return c},this.insertInLine=function(a,b){if(b.length==0)return a;var c=this.$lines[a.row]||"";this.$lines[a.row]=c.substring(0,a.column)+b+c.substring(a.column);var d={row:a.row,column:a.column+b.length},e={action:"insertText",range:f.fromPoints(a,d),text:b};this._dispatchEvent("change",{data:e});return d},this.remove=function(a){a.start=this.$clipPosition(a.start),a.end=this.$clipPosition(a.end);if(a.isEmpty())return a.start;var b=a.start.row,c=a.end.row;if(a.isMultiLine()){var d=a.start.column==0?b:b+1,e=c-1;a.end.column>0&&this.removeInLine(c,0,a.end.column),e>=d&&this.removeLines(d,e),d!=b&&(this.removeInLine(b,a.start.column,this.getLine(b).length),this.removeNewLine(a.start.row))}else this.removeInLine(b,a.start.column,a.end.column);return a.start},this.removeInLine=function(a,b,c){if(b!=c){var d=new f(a,b,a,c),e=this.getLine(a),g=e.substring(b,c),h=e.substring(0,b)+e.substring(c,e.length);this.$lines.splice(a,1,h);var i={action:"removeText",range:d,text:g};this._dispatchEvent("change",{data:i});return d.start}},this.removeLines=function(a,b){var c=new f(a,0,b+1,0),d=this.$lines.splice(a,b-a+1),e={action:"removeLines",range:c,nl:this.getNewLineCharacter(),lines:d};this._dispatchEvent("change",{data:e});return d},this.removeNewLine=function(a){var b=this.getLine(a),c=this.getLine(a+1),d=new f(a,b.length,a+1,0),e=b+c;this.$lines.splice(a,2,e);var g={action:"removeText",range:d,text:this.getNewLineCharacter()};this._dispatchEvent("change",{data:g})},this.replace=function(a,b){if(b.length==0&&a.isEmpty())return a.start;if(b==this.getTextRange(a))return a.end;this.remove(a);if(b)var c=this.insert(a.start,b);else c=a.start;return c},this.applyDeltas=function(a){for(var b=0;b<a.length;b++){var c=a[b],d=f.fromPoints(c.range.start,c.range.end);c.action=="insertLines"?this.insertLines(d.start.row,c.lines):c.action=="insertText"?this.insert(d.start,c.text):c.action=="removeLines"?this.removeLines(d.start.row,d.end.row-1):c.action=="removeText"&&this.remove(d)}},this.revertDeltas=function(a){for(var b=a.length-1;b>=0;b--){var c=a[b],d=f.fromPoints(c.range.start,c.range.end);c.action=="insertLines"?this.removeLines(d.start.row,d.end.row-1):c.action=="insertText"?this.remove(d):c.action=="removeLines"?this.insertLines(d.start.row,c.lines):c.action=="removeText"&&this.insert(d.start,c.text)}}}).call(h.prototype),b.Document=h}),define("ace/range",["require","exports","module"],function(a,b,c){var d=function(a,b,c,d){this.start={row:a,column:b},this.end={row:c,column:d}};(function(){this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(a,b){return this.compare(a,b)==0},this.compareRange=function(a){var b,c=a.end,d=a.start;b=this.compare(c.row,c.column);if(b==1){b=this.compare(d.row,d.column);return b==1?2:b==0?1:0}if(b==-1)return-2;b=this.compare(d.row,d.column);return b==-1?-1:b==1?42:0},this.containsRange=function(a){var b=this.compareRange(a);return b==-1||b==0||b==1},this.isEnd=function(a,b){return this.end.row==a&&this.end.column==b},this.isStart=function(a,b){return this.start.row==a&&this.start.column==b},this.setStart=function(a,b){typeof a=="object"?(this.start.column=a.column,this.start.row=a.row):(this.start.row=a,this.start.column=b)},this.setEnd=function(a,b){typeof a=="object"?(this.end.column=a.column,this.end.row=a.row):(this.end.row=a,this.end.column=b)},this.inside=function(a,b){if(this.compare(a,b)==0)return this.isEnd(a,b)||this.isStart(a,b)?!1:!0;return!1},this.insideStart=function(a,b){if(this.compare(a,b)==0)return this.isEnd(a,b)?!1:!0;return!1},this.insideEnd=function(a,b){if(this.compare(a,b)==0)return this.isStart(a,b)?!1:!0;return!1},this.compare=function(a,b){if(!this.isMultiLine()&&a===this.start.row)return b<this.start.column?-1:b>this.end.column?1:0;return a<this.start.row?-1:a>this.end.row?1:this.start.row===a?b>=this.start.column?0:-1:this.end.row===a?b<=this.end.column?0:1:0},this.compareStart=function(a,b){return this.start.row==a&&this.start.column==b?-1:this.compare(a,b)},this.compareEnd=function(a,b){return this.end.row==a&&this.end.column==b?1:this.compare(a,b)},this.compareInside=function(a,b){return this.end.row==a&&this.end.column==b?1:this.start.row==a&&this.start.column==b?-1:this.compare(a,b)},this.clipRows=function(a,b){if(this.end.row>b)var c={row:b+1,column:0};if(this.start.row>b)var e={row:b+1,column:0};if(this.start.row<a)var e={row:a,column:0};if(this.end.row<a)var c={row:a,column:0};return d.fromPoints(e||this.start,c||this.end)},this.extend=function(a,b){var c=this.compare(a,b);if(c==0)return this;if(c==-1)var e={row:a,column:b};else var f={row:a,column:b};return d.fromPoints(e||this.start,f||this.end)},this.isEmpty=function(){return this.start.row==this.end.row&&this.start.column==this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return d.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new d(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new d(this.start.row,0,this.end.row,0)},this.toScreenRange=function(a){var b=a.documentToScreenPosition(this.start),c=a.documentToScreenPosition(this.end);return new d(b.row,b.column,c.row,c.column)}}).call(d.prototype),d.fromPoints=function(a,b){return new d(a.row,a.column,b.row,b.column)},b.Range=d}),define("ace/anchor",["require","exports","module","pilot/oop","pilot/event_emitter"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=b.Anchor=function(a,b,c){this.document=a,typeof c=="undefined"?this.setPosition(b.row,b.column):this.setPosition(b,c),this.$onChange=this.onChange.bind(this),a.on("change",this.$onChange)};(function(){d.implement(this,e),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.onChange=function(a){var b=a.data,c=b.range;if(c.start.row!=c.end.row||c.start.row==this.row){if(c.start.row>this.row)return;if(c.start.row==this.row&&c.start.column>this.column)return;var d=this.row,e=this.column;b.action==="insertText"?c.start.row===d&&c.start.column<=e?c.start.row===c.end.row?e+=c.end.column-c.start.column:(e-=c.start.column,d+=c.end.row-c.start.row):c.start.row!==c.end.row&&c.start.row<d&&(d+=c.end.row-c.start.row):b.action==="insertLines"?c.start.row<=d&&(d+=c.end.row-c.start.row):b.action=="removeText"?c.start.row==d&&c.start.column<e?c.end.column>=e?e=c.start.column:e=Math.max(0,e-(c.end.column-c.start.column)):c.start.row!==c.end.row&&c.start.row<d?(c.end.row==d&&(e=Math.max(0,e-c.end.column)+c.start.column),d-=c.end.row-c.start.row):c.end.row==d&&(d-=c.end.row-c.start.row,e=Math.max(0,e-c.end.column)+c.start.column):b.action=="removeLines"&&c.start.row<=d&&(c.end.row<=d?d-=c.end.row-c.start.row:(d=c.start.row,e=0)),this.setPosition(d,e,!0)}},this.setPosition=function(a,b,c){var d;c?d={row:a,column:b}:d=this.$clipPositionToDocument(a,b);if(this.row!=d.row||this.column!=d.column){var e={row:this.row,column:this.column};this.row=d.row,this.column=d.column,this._dispatchEvent("change",{old:e,value:d})}},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.$clipPositionToDocument=function(a,b){var c={};a>=this.document.getLength()?(c.row=Math.max(0,this.document.getLength()-1),c.column=this.document.getLine(c.row).length):a<0?(c.row=0,c.column=0):(c.row=a,c.column=Math.min(this.document.getLine(c.row).length,Math.max(0,b))),b<0&&(c.column=0);return c}}).call(f.prototype)}),define("pilot/lang",["require","exports","module"],function(a,b,c){b.stringReverse=function(a){return a.split("").reverse().join("")},b.stringRepeat=function(a,b){return Array(b+1).join(a)};var d=/^\s\s*/,e=/\s\s*$/;b.stringTrimLeft=function(a){return a.replace(d,"")},b.stringTrimRight=function(a){return a.replace(e,"")},b.copyObject=function(a){var b={};for(var c in a)b[c]=a[c];return b},b.copyArray=function(a){var b=[];for(i=0,l=a.length;i<l;i++)a[i]&&typeof a[i]=="object"?b[i]=this.copyObject(a[i]):b[i]=a[i];return b},b.deepCopy=function(a){if(typeof a!="object")return a;var b=a.constructor();for(var c in a)typeof a[c]=="object"?b[c]=this.deepCopy(a[c]):b[c]=a[c];return b},b.arrayToMap=function(a){var b={};for(var c=0;c<a.length;c++)b[a[c]]=1;return b},b.arrayRemove=function(a,b){for(var c=0;c<=a.length;c++)b===a[c]&&a.splice(c,1)},b.escapeRegExp=function(a){return a.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},b.deferredCall=function(a){var b=null,c=function(){b=null,a()},d=function(a){b||(b=setTimeout(c,a||0));return d};d.schedule=d,d.call=function(){this.cancel(),a();return d},d.cancel=function(){clearTimeout(b),b=null;return d};return d}}),define("ace/mode/css/csslint",["require","exports","module"],function(require,exports,module){function indexOf(a,b){if(a.indexOf)return a.indexOf(b);for(var c=0,d=a.length;c<d;c++)if(a[c]===b)return c;return-1}function mix(a,b){var c;for(c in b)b.hasOwnProperty(c)&&(receiver[c]=b[c]);return c}function Reporter(a){this.messages=[],this.stats=[],this.lines=a}var parserlib={};(function(){function e(a,c){this._reader=a?new b(a.toString()):null,this._token=null,this._tokenData=c,this._lt=[],this._ltIndex=0,this._ltIndexCache=[]}function d(a,b,c){this.col=c,this.line=b,this.text=a}function c(a,b,c){this.col=c,this.line=b,this.message=a}function b(a){this._input=a.replace(/\n\r?/g,"\n"),this._line=1,this._col=1,this._cursor=0}function a(){this._listeners={}}a.prototype={constructor:a,addListener:function(a,b){this._listeners[a]||(this._listeners[a]=[]),this._listeners[a].push(b)},fire:function(a){typeof a=="string"&&(a={type:a}),a.target||(a.target=this);if(!a.type)throw new Error("Event object missing 'type' property.");if(this._listeners[a.type]){var b=this._listeners[a.type].concat();for(var c=0,d=b.length;c<d;c++)b[c].call(this,a)}},removeListener:function(a,b){if(this._listeners[a]){var c=this._listeners[a];for(var d=0,e=c.length;d<e;d++)if(c[d]===b){c.splice(d,1);break}}}},b.prototype={constructor:b,getCol:function(){return this._col},getLine:function(){return this._line},eof:function(){return this._cursor==this._input.length},peek:function(a){var b=null;a=typeof a=="undefined"?1:a,this._cursor<this._input.length&&(b=this._input.charAt(this._cursor+a-1));return b},read:function(){var a=null;this._cursor<this._input.length&&(this._input.charAt(this._cursor)=="\n"?(this._line++,this._col=1):this._col++,a=this._input.charAt(this._cursor++));return a},mark:function(){this._bookmark={cursor:this._cursor,line:this._line,col:this._col}},reset:function(){this._bookmark&&(this._cursor=this._bookmark.cursor,this._line=this._bookmark.line,this._col=this._bookmark.col,delete this._bookmark)},readTo:function(a){var b="",c;while(b.length<a.length||b.lastIndexOf(a)!=b.length-a.length){c=this.read();if(c)b+=c;else throw new Error('Expected "'+a+'" at line '+this._line+", col "+this._col+".")}return b},readWhile:function(a){var b="",c=this.read();while(c!==null&&a(c))b+=c,c=this.read();return b},readMatch:function(a){var b=this._input.substring(this._cursor),c=null;typeof a=="string"?b.indexOf(a)===0&&(c=this.readCount(a.length)):a instanceof RegExp&&a.test(b)&&(c=this.readCount(RegExp.lastMatch.length));return c},readCount:function(a){var b="";while(a--)b+=this.read();return b}},c.prototype=new Error,d.fromToken=function(a){return new d(a.value,a.startLine,a.startCol)},d.prototype={constructor:d,valueOf:function(){return this.toString()},toString:function(){return this.text}},e.createTokenData=function(a){var b=[],c={},d=a.concat([]),e=0,f=d.length+1;d.UNKNOWN=-1,d.unshift({name:"EOF"});for(;e<f;e++)b.push(d[e].name),d[d[e].name]=e,d[e].text&&(c[d[e].text]=e);d.name=function(a){return b[a]},d.type=function(a){return c[a]};return d},e.prototype={constructor:e,match:function(a,b){a instanceof Array||(a=[a]);var c=this.get(b),d=0,e=a.length;while(d<e)if(c==a[d++])return!0;this.unget();return!1},mustMatch:function(a,b){a instanceof Array||(a=[a]);if(!this.match.apply(this,arguments)){token=this.LT(1);throw new c("Expected "+this._tokenData[a[0]].name+" at line "+token.startLine+", col "+token.startCol+".",token.startLine,token.startCol)}},advance:function(a,b){while(this.LA(0)!=0&&!this.match(a,b))this.get();return this.LA(0)},get:function(a){var b=this._tokenData,c=this._reader,d,e=0,f=b.length,g=!1,h,i;if(this._lt.length&&this._ltIndex>=0&&this._ltIndex<this._lt.length){e++,this._token=this._lt[this._ltIndex++],i=b[this._token.type];while(i.channel!==undefined&&a!==i.channel&&this._ltIndex<this._lt.length)this._token=this._lt[this._ltIndex++],i=b[this._token.type],e++;if((i.channel===undefined||a===i.channel)&&this._ltIndex<=this._lt.length){this._ltIndexCache.push(e);return this._token.type}}h=this._getToken(),h.type>-1&&!b[h.type].hide&&(h.channel=b[h.type].channel,this._token=h,this._lt.push(h),this._ltIndexCache.push(this._lt.length-this._ltIndex+e),this._lt.length>5&&this._lt.shift(),this._ltIndexCache.length>5&&this._ltIndexCache.shift(),this._ltIndex=this._lt.length),i=b[h.type];return i&&(i.hide||i.channel!==undefined&&a!==i.channel)?this.get(a):h.type},LA:function(a){var b=a,c;if(a>0){if(a>5)throw new Error("Too much lookahead.");while(b)c=this.get(),b--;while(b<a)this.unget(),b++}else if(a<0)if(this._lt[this._ltIndex+a])c=this._lt[this._ltIndex+a].type;else throw new Error("Too much lookbehind.");else c=this._token.type;return c},LT:function(a){this.LA(a);return this._lt[this._ltIndex+a-1]},peek:function(){return this.LA(1)},token:function(){return this._token},tokenName:function(a){return a<0||a>this._tokenData.length?"UNKNOWN_TOKEN":this._tokenData[a].name},tokenType:function(a){return this._tokenData[a]||-1},unget:function(){if(this._ltIndexCache.length)this._ltIndex-=this._ltIndexCache.pop(),this._token=this._lt[this._ltIndex-1];else throw new Error("Too much lookahead.")}},parserlib.util={StringReader:b,SyntaxError:c,SyntaxUnit:d,EventTarget:a,TokenStreamBase:e}})(),function(){function TokenStream(a){TokenStreamBase.call(this,a,Tokens)}function mix(a,b){for(var c in b)b.hasOwnProperty(c)&&(a[c]=b[c]);return a}function isIdentStart(a){return a!=null&&(isNameStart(a)||/\-\\/.test(a))}function isNameChar(a){return a!=null&&(isNameStart(a)||/[0-9\-\\]/.test(a))}function isNameStart(a){return a!=null&&/[a-z_\u0080-\uFFFF\\]/i.test(a)}function isNewLine(a){return a!=null&&nl.test(a)}function isWhitespace(a){return a!=null&&/\s/.test(a)}function isDigit(a){return a!=null&&/\d/.test(a)}function isHexDigit(a){return a!=null&&h.test(a)}function SelectorSubPart(a,b,c,d){SyntaxUnit.call(this,a,c,d),this.type=b,this.args=[]}function SelectorPart(a,b,c,d,e){SyntaxUnit.call(this,c,d,e),this.elementName=a,this.modifiers=b}function Selector(a,b,c){SyntaxUnit.call(this,a.join(" "),b,c),this.parts=a}function PropertyValuePart(text,line,col){SyntaxUnit.apply(this,arguments),this.type="unknown";var temp;if(/^([+\-]?[\d\.]+)([a-z]+)$/i.test(text)){this.type="dimension",this.value=+RegExp.$1,this.units=RegExp.$2;switch(this.units.toLowerCase()){case"em":case"rem":case"ex":case"px":case"cm":case"mm":case"in":case"pt":case"pc":this.type="length";break;case"deg":case"rad":case"grad":this.type="angle";break;case"ms":case"s":this.type="time";break;case"hz":case"khz":this.type="frequency";break;case"dpi":case"dpcm":this.type="resolution"}}else/^([+\-]?[\d\.]+)%$/i.test(text)?(this.type="percentage",this.value=+RegExp.$1):/^([+\-]?[\d\.]+)%$/i.test(text)?(this.type="percentage",this.value=+RegExp.$1):/^([+\-]?\d+)$/i.test(text)?(this.type="integer",this.value=+RegExp.$1):/^([+\-]?[\d\.]+)$/i.test(text)?(this.type="number",this.value=+RegExp.$1):/^#([a-f0-9]{3,6})/i.test(text)?(this.type="color",temp=RegExp.$1,temp.length==3?(this.red=parseInt(temp.charAt(0)+temp.charAt(0),16),this.green=parseInt(temp.charAt(1)+temp.charAt(1),16),this.blue=parseInt(temp.charAt(2)+temp.charAt(2),16)):(this.red=parseInt(temp.substring(0,2),16),this.green=parseInt(temp.substring(2,4),16),this.blue=parseInt(temp.substring(4,6),16))):/^rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/i.test(text)?(this.type="color",this.red=+RegExp.$1,this.green=+RegExp.$2,this.blue=+RegExp.$3):/^rgb\(\s*(\d+)%\s*,\s*(\d+)%\s*,\s*(\d+)%\s*\)/i.test(text)?(this.type="color",this.red=+RegExp.$1*255/100,this.green=+RegExp.$2*255/100,this.blue=+RegExp.$3*255/100):/^url\(["']?([^\)"']+)["']?\)/i.test(text)?(this.type="uri",this.uri=RegExp.$1):/^["'][^"']*["']/.test(text)?(this.type="string",this.value=eval(text)):Colors[text.toLowerCase()]?(this.type="color",temp=Colors[text.toLowerCase()].substring(1),this.red=parseInt(temp.substring(0,2),16),this.green=parseInt(temp.substring(2,4),16),this.blue=parseInt(temp.substring(4,6),16)):/^[\,\/]$/.test(text)?(this.type="operator",this.value=text):/^[a-z\-\u0080-\uFFFF][a-z0-9\-\u0080-\uFFFF]*$/i.test(text)&&(this.type="identifier",this.value=text)}function PropertyValue(a,b,c){SyntaxUnit.call(this,a.join(" "),b,c),this.parts=a}function PropertyName(a,b,c,d){SyntaxUnit.call(this,(b||"")+a,c,d),this.hack=b}function Parser(a){EventTarget.call(this),this.options=a||{},this._tokenStream=null}function MediaQuery(a,b,c,d,e){SyntaxUnit.call(this,(a?a+" ":"")+(b?b+" ":"")+c.join(" and "),d,e),this.modifier=a,this.mediaType=b,this.features=c}function MediaFeature(a,b){SyntaxUnit.call(this,"("+a+(b!==null?":"+b:"")+")",a.startLine,a.startCol),this.name=a,this.value=b}function Combinator(a,b,c){SyntaxUnit.call(this,a,b,c),this.type="unknown",/^\s+$/.test(a)?this.type="descendant":a==">"?this.type="child":a=="+"?this.type="adjacent-sibling":a=="~"&&(this.type="sibling")}var EventTarget=parserlib.util.EventTarget,TokenStreamBase=parserlib.util.TokenStreamBase,StringReader=parserlib.util.StringReader,SyntaxError=parserlib.util.SyntaxError,SyntaxUnit=parserlib.util.SyntaxUnit,Colors={aliceblue:"#f0f8ff",antiquewhite:"#faebd7",aqua:"#00ffff",aquamarine:"#7fffd4",azure:"#f0ffff",beige:"#f5f5dc",bisque:"#ffe4c4",black:"#000000",blanchedalmond:"#ffebcd",blue:"#0000ff",blueviolet:"#8a2be2",brown:"#a52a2a",burlywood:"#deb887",cadetblue:"#5f9ea0",chartreuse:"#7fff00",chocolate:"#d2691e",coral:"#ff7f50",cornflowerblue:"#6495ed",cornsilk:"#fff8dc",crimson:"#dc143c",cyan:"#00ffff",darkblue:"#00008b",darkcyan:"#008b8b",darkgoldenrod:"#b8860b",darkgray:"#a9a9a9",darkgreen:"#006400",darkkhaki:"#bdb76b",darkmagenta:"#8b008b",darkolivegreen:"#556b2f",darkorange:"#ff8c00",darkorchid:"#9932cc",darkred:"#8b0000",darksalmon:"#e9967a",darkseagreen:"#8fbc8f",darkslateblue:"#483d8b",darkslategray:"#2f4f4f",darkturquoise:"#00ced1",darkviolet:"#9400d3",deeppink:"#ff1493",deepskyblue:"#00bfff",dimgray:"#696969",dodgerblue:"#1e90ff",firebrick:"#b22222",floralwhite:"#fffaf0",forestgreen:"#228b22",fuchsia:"#ff00ff",gainsboro:"#dcdcdc",ghostwhite:"#f8f8ff",gold:"#ffd700",goldenrod:"#daa520",gray:"#808080",green:"#008000",greenyellow:"#adff2f",honeydew:"#f0fff0",hotpink:"#ff69b4",indianred:"#cd5c5c",indigo:"#4b0082",ivory:"#fffff0",khaki:"#f0e68c",lavender:"#e6e6fa",lavenderblush:"#fff0f5",lawngreen:"#7cfc00",lemonchiffon:"#fffacd",lightblue:"#add8e6",lightcoral:"#f08080",lightcyan:"#e0ffff",lightgoldenrodyellow:"#fafad2",lightgrey:"#d3d3d3",lightgreen:"#90ee90",lightpink:"#ffb6c1",lightsalmon:"#ffa07a",lightseagreen:"#20b2aa",lightskyblue:"#87cefa",lightslategray:"#778899",lightsteelblue:"#b0c4de",lightyellow:"#ffffe0",lime:"#00ff00",limegreen:"#32cd32",linen:"#faf0e6",magenta:"#ff00ff",maroon:"#800000",mediumaquamarine:"#66cdaa",mediumblue:"#0000cd",mediumorchid:"#ba55d3",mediumpurple:"#9370d8",mediumseagreen:"#3cb371",mediumslateblue:"#7b68ee",mediumspringgreen:"#00fa9a",mediumturquoise:"#48d1cc",mediumvioletred:"#c71585",midnightblue:"#191970",mintcream:"#f5fffa",mistyrose:"#ffe4e1",moccasin:"#ffe4b5",navajowhite:"#ffdead",navy:"#000080",oldlace:"#fdf5e6",olive:"#808000",olivedrab:"#6b8e23",orange:"#ffa500",orangered:"#ff4500",orchid:"#da70d6",palegoldenrod:"#eee8aa",palegreen:"#98fb98",paleturquoise:"#afeeee",palevioletred:"#d87093",papayawhip:"#ffefd5",peachpuff:"#ffdab9",peru:"#cd853f",pink:"#ffc0cb",plum:"#dda0dd",powderblue:"#b0e0e6",purple:"#800080",red:"#ff0000",rosybrown:"#bc8f8f",royalblue:"#4169e1",saddlebrown:"#8b4513",salmon:"#fa8072",sandybrown:"#f4a460",seagreen:"#2e8b57",seashell:"#fff5ee",sienna:"#a0522d",silver:"#c0c0c0",skyblue:"#87ceeb",slateblue:"#6a5acd",slategray:"#708090",snow:"#fffafa",springgreen:"#00ff7f",steelblue:"#4682b4",tan:"#d2b48c",teal:"#008080",thistle:"#d8bfd8",tomato:"#ff6347",turquoise:"#40e0d0",violet:"#ee82ee",wheat:"#f5deb3",white:"#ffffff",whitesmoke:"#f5f5f5",yellow:"#ffff00",yellowgreen:"#9acd32"};Combinator.prototype=new SyntaxUnit,Combinator.prototype.constructor=Combinator;var Level1Properties={background:1,"background-attachment":1,"background-color":1,"background-image":1,"background-position":1,"background-repeat":1,border:1,"border-bottom":1,"border-bottom-width":1,"border-color":1,"border-left":1,"border-left-width":1,"border-right":1,"border-right-width":1,"border-style":1,"border-top":1,"border-top-width":1,"border-width":1,clear:1,color:1,display:1,"float":1,font:1,"font-family":1,"font-size":1,"font-style":1,"font-variant":1,"font-weight":1,height:1,"letter-spacing":1,"line-height":1,"list-style":1,"list-style-image":1,"list-style-position":1,"list-style-type":1,margin:1,"margin-bottom":1,"margin-left":1,"margin-right":1,"margin-top":1,padding:1,"padding-bottom":1,"padding-left":1,"padding-right":1,"padding-top":1,"text-align":1,"text-decoration":1,"text-indent":1,"text-transform":1,"vertical-align":1,"white-space":1,width:1,"word-spacing":1},Level2Properties={azimuth:1,"cue-after":1,"cue-before":1,cue:1,elevation:1,"pause-after":1,"pause-before":1,pause:1,"pitch-range":1,pitch:1,"play-during":1,richness:1,"speak-header":1,"speak-numeral":1,"speak-punctuation":1,speak:1,"speech-rate":1,stress:1,"voice-family":1,volume:1,orphans:1,"page-break-after":1,"page-break-before":1,"page-break-inside":1,widows:1,cursor:1,"outline-color":1,"outline-style":1,"outline-width":1,outline:1,"background-attachment":1,"background-color":1,"background-image":1,"background-position":1,"background-repeat":1,background:1,"border-collapse":1,"border-color":1,"border-spacing":1,"border-style":1,"border-top":1,"border-top-color":1,"border-top-style":1,"border-top-width":1,"border-width":1,border:1,bottom:1,"caption-side":1,clear:1,clip:1,color:1,content:1,"counter-increment":1,"counter-reset":1,direction:1,display:1,"empty-cells":1,"float":1,"font-family":1,"font-size":1,"font-style":1,"font-variant":1,"font-weight":1,font:1,height:1,left:1,"letter-spacing":1,"line-height":1,"list-style-image":1,"list-style-position":1,"list-style-type":1,"list-style":1,"margin-right":1,"margin-top":1,margin:1,"max-height":1,"max-width":1,"min-height":1,"min-width":1,overflow:1,"padding-top":1,padding:1,position:1,quotes:1,right:1,"table-layout":1,"text-align":1,"text-decoration":1,"text-indent":1,"text-transform":1,top:1,"unicode-bidi":1,"vertical-align":1,visibility:1,"white-space":1,width:1,"word-spacing":1,"z-index":1};MediaFeature.prototype=new SyntaxUnit,MediaFeature.prototype.constructor=MediaFeature,MediaQuery.prototype=new SyntaxUnit,MediaQuery.prototype.constructor=MediaQuery,Parser.prototype=function(){var a=new EventTarget,b,c={constructor:Parser,_stylesheet:function(){var a=this._tokenStream,b=null,c,d;this.fire("startstylesheet"),this._charset(),this._skipCruft();while(a.peek()==Tokens.IMPORT_SYM)this._import(),this._skipCruft();while(a.peek()==Tokens.NAMESPACE_SYM)this._namespace(),this._skipCruft();d=a.peek();while(d>Tokens.EOF){try{switch(d){case Tokens.MEDIA_SYM:this._media(),this._skipCruft();break;case Tokens.PAGE_SYM:this._page(),this._skipCruft();break;case Tokens.FONT_FACE_SYM:this._font_face(),this._skipCruft();break;case Tokens.KEYFRAMES_SYM:this._keyframes(),this._skipCruft();break;case Tokens.S:this._readWhitespace();break;default:if(!this._ruleset())switch(d){case Tokens.CHARSET_SYM:c=a.LT(1),this._charset(!1);throw new SyntaxError("@charset not allowed here.",c.startLine,c.startCol);case Tokens.IMPORT_SYM:c=a.LT(1),this._import(!1);throw new SyntaxError("@import not allowed here.",c.startLine,c.startCol);case Tokens.NAMESPACE_SYM:c=a.LT(1),this._namespace(!1);throw new SyntaxError("@namespace not allowed here.",c.startLine,c.startCol);default:a.get(),this._unexpectedToken(a.token())}}}catch(e){if(e instanceof SyntaxError&&!this.options.strict)this.fire({type:"error",error:e,message:e.message,line:e.line,col:e.col});else throw e}d=a.peek()}d!=Tokens.EOF&&this._unexpectedToken(a.token()),this.fire("endstylesheet")},_charset:function(a){var b=this._tokenStream,c,d,e,f;b.match(Tokens.CHARSET_SYM)&&(e=b.token().startLine,f=b.token().startCol,this._readWhitespace(),b.mustMatch(Tokens.STRING),d=b.token(),c=d.value,this._readWhitespace(),b.mustMatch(Tokens.SEMICOLON),a!==!1&&this.fire({type:"charset",charset:c,line:e,col:f}))},_import:function(a){var b=this._tokenStream,c,d,e,f=[];b.mustMatch(Tokens.IMPORT_SYM),e=b.token(),this._readWhitespace(),b.mustMatch([Tokens.STRING,Tokens.URI]),d=b.token().value.replace(/(?:url\()?["']([^"']+)["']\)?/,"$1"),this._readWhitespace(),f=this._media_query_list(),b.mustMatch(Tokens.SEMICOLON),this._readWhitespace(),a!==!1&&this.fire({type:"import",uri:d,media:f,line:e.startLine,col:e.startCol})},_namespace:function(a){var b=this._tokenStream,c,d,e,f;b.mustMatch(Tokens.NAMESPACE_SYM),c=b.token().startLine,d=b.token().startCol,this._readWhitespace(),b.match(Tokens.IDENT)&&(e=b.token().value,this._readWhitespace()),b.mustMatch([Tokens.STRING,Tokens.URI]),f=b.token().value.replace(/(?:url\()?["']([^"']+)["']\)?/,"$1"),this._readWhitespace(),b.mustMatch(Tokens.SEMICOLON),this._readWhitespace(),a!==!1&&this.fire({type:"namespace",prefix:e,uri:f,line:c,col:d})},_media:function(){var a=this._tokenStream,b,c,d;a.mustMatch(Tokens.MEDIA_SYM),b=a.token().startLine,c=a.token().startCol,this._readWhitespace(),d=this._media_query_list(),a.mustMatch(Tokens.LBRACE),this._readWhitespace(),this.fire({type:"startmedia",media:d,line:b,col:c});for(;;)if(a.peek()==Tokens.PAGE_SYM)this._page();else if(!this._ruleset())break;a.mustMatch(Tokens.RBRACE),this._readWhitespace(),this.fire({type:"endmedia",media:d,line:b,col:c})},_media_query_list:function(){var a=this._tokenStream,b=[];this._readWhitespace(),(a.peek()==Tokens.IDENT||a.peek()==Tokens.LPAREN)&&b.push(this._media_query());while(a.match(Tokens.COMMA))this._readWhitespace(),b.push(this._media_query());return b},_media_query:function(){var a=this._tokenStream,b=null,c=null,d=null,e=[];a.match(Tokens.IDENT)&&(c=a.token().value.toLowerCase(),c!="only"&&c!="not"?(a.unget(),c=null):d=a.token()),this._readWhitespace(),a.peek()==Tokens.IDENT?(b=this._media_type(),d===null&&(d=a.token())):a.peek()==Tokens.LPAREN&&(d===null&&(d=a.LT(1)),e.push(this._media_expression()));if(b===null&&e.length===0)return null;this._readWhitespace();while(a.match(Tokens.IDENT))a.token().value.toLowerCase()!="and"&&this._unexpectedToken(a.token()),this._readWhitespace(),e.push(this._media_expression());return new MediaQuery(c,b,e,d.startLine,d.startCol)},_media_type:function(){return this._media_feature()},_media_expression:function(){var a=this._tokenStream,b=null,c,d=null;a.mustMatch(Tokens.LPAREN),b=this._media_feature(),this._readWhitespace(),a.match(Tokens.COLON)&&(this._readWhitespace(),c=a.LT(1),d=this._expression()),a.mustMatch(Tokens.RPAREN),this._readWhitespace();return new MediaFeature(b,d?new SyntaxUnit(d,c.startLine,c.startCol):null)},_media_feature:function(){var a=this._tokenStream;a.mustMatch(Tokens.IDENT);return SyntaxUnit.fromToken(a.token())},_page:function(){var a=this._tokenStream,b,c,d=null,e=null;a.mustMatch(Tokens.PAGE_SYM),b=a.token().startLine,c=a.token().startCol,this._readWhitespace(),a.match(Tokens.IDENT)&&(d=a.token().value,d.toLowerCase()==="auto"&&this._unexpectedToken(a.token())),a.peek()==Tokens.COLON&&(e=this._pseudo_page()),this._readWhitespace(),this.fire({type:"startpage",id:d,pseudo:e,line:b,col:c}),this._readDeclarations(!0,!0),this.fire({type:"endpage",id:d,pseudo:e,line:b,col:c})},_margin:function(){var a=this._tokenStream,b,c,d=this._margin_sym();if(d){b=a.token().startLine,c=a.token().startCol,this.fire({type:"startpagemargin",margin:d,line:b,col:c}),this._readDeclarations(!0),this.fire({type:"endpagemargin",margin:d,line:b,col:c});return!0}return!1},_margin_sym:function(){var a=this._tokenStream;return a.match([Tokens.TOPLEFTCORNER_SYM,Tokens.TOPLEFT_SYM,Tokens.TOPCENTER_SYM,Tokens.TOPRIGHT_SYM,Tokens.TOPRIGHTCORNER_SYM,Tokens.BOTTOMLEFTCORNER_SYM,Tokens.BOTTOMLEFT_SYM,Tokens.BOTTOMCENTER_SYM,Tokens.BOTTOMRIGHT_SYM,Tokens.BOTTOMRIGHTCORNER_SYM,Tokens.LEFTTOP_SYM,Tokens.LEFTMIDDLE_SYM,Tokens.LEFTBOTTOM_SYM,Tokens.RIGHTTOP_SYM,Tokens.RIGHTMIDDLE_SYM,Tokens.RIGHTBOTTOM_SYM])?SyntaxUnit.fromToken(a.token()):null},_pseudo_page:function(){var a=this._tokenStream;a.mustMatch(Tokens.COLON),a.mustMatch(Tokens.IDENT);return a.token().value},_font_face:function(){var a=this._tokenStream,b,c;a.mustMatch(Tokens.FONT_FACE_SYM),b=a.token().startLine,c=a.token().startCol,this._readWhitespace(),this.fire({type:"startfontface",line:b,col:c}),this._readDeclarations(!0),this.fire({type:"endfontface",line:b,col:c})},_operator:function(){var a=this._tokenStream,b=null;a.match([Tokens.SLASH,Tokens.COMMA])&&(b=a.token(),this._readWhitespace());return b?PropertyValuePart.fromToken(b):null},_combinator:function(){var a=this._tokenStream,b=null,c;a.match([Tokens.PLUS,Tokens.GREATER,Tokens.TILDE])&&(c=a.token(),b=new Combinator(c.value,c.startLine,c.startCol),this._readWhitespace());return b},_unary_operator:function(){var a=this._tokenStream;return a.match([Tokens.MINUS,Tokens.PLUS])?a.token().value:null},_property:function(){var a=this._tokenStream,b=null,c=null,d,e,f,g;a.peek()==Tokens.STAR&&this.options.starHack&&(a.get(),e=a.token(),c=e.value,f=e.startLine,g=e.startCol),a.match(Tokens.IDENT)&&(e=a.token(),d=e.value,d.charAt(0)=="_"&&this.options.underscoreHack&&(c="_",d=d.substring(1)),b=new PropertyName(d,c,f||e.startLine,g||e.startCol),this._readWhitespace());return b},_ruleset:function(){var a=this._tokenStream,b,c;try{c=this._selectors_group()}catch(d){if(!(d instanceof SyntaxError&&!this.options.strict))throw d;this.fire({type:"error",error:d,message:d.message,line:d.line,col:d.col}),b=a.advance([Tokens.RBRACE]);if(b!=Tokens.RBRACE)throw d;return!0}c&&(this.fire({type:"startrule",selectors:c,line:c[0].line,col:c[0].col}),this._readDeclarations(!0),this.fire({type:"endrule",selectors:c,line:c[0].line,col:c[0].col}));return c},_selectors_group:function(){var a=this._tokenStream,b=[],c;c=this._selector();if(c!==null){b.push(c);while(a.match(Tokens.COMMA))this._readWhitespace(),c=this._selector(),c!==null?b.push(c):this._unexpectedToken(a.LT(1))}return b.length?b:null},_selector:function(){var a=this._tokenStream,b=[],c=null,d=null,e=null;c=this._simple_selector_sequence();if(c===null)return null;b.push(c);do{d=this._combinator();if(d!==null)b.push(d),c=this._simple_selector_sequence(),c===null?this._unexpectedToken(this.LT(1)):b.push(c);else if(this._readWhitespace())e=new Combinator(a.token().value,a.token().startLine,a.token().startCol),d=this._combinator(),c=this._simple_selector_sequence(),c===null?d!==null&&this._unexpectedToken(a.LT(1)):(d!==null?b.push(d):b.push(e),b.push(c));else break}while(!0);return new Selector(b,b[0].line,b[0].col)},_simple_selector_sequence:function(){var a=this._tokenStream,b=null,c=[],d="",e=[function(){return a.match(Tokens.HASH)?new SelectorSubPart(a.token().value,"id",a.token().startLine,a.token().startCol):null},this._class,this._attrib,this._pseudo,this._negation],f=0,g=e.length,h=null,i=!1,j,k;j=a.LT(1).startLine,k=a.LT(1).startCol,b=this._type_selector(),b||(b=this._universal()),b!==null&&(d+=b);for(;;){if(a.peek()===Tokens.S)break;while(f<g&&h===null)h=e[f++].call(this);if(h===null){if(d==="")return null;break}f=0,c.push(h),d+=h.toString(),h=null}return d!==""?new SelectorPart(b,c,d,j,k):null},_type_selector:function(){var a=this._tokenStream,b=this._namespace_prefix(),c=this._element_name();if(!c){b&&(a.unget(),b.length>1&&a.unget());return null}b&&(c.text=b+c.text,c.col-=b.length);return c},_class:function(){var a=this._tokenStream,b;if(a.match(Tokens.DOT)){a.mustMatch(Tokens.IDENT),b=a.token();return new SelectorSubPart("."+b.value,"class",b.startLine,b.startCol-1)}return null},_element_name:function(){var a=this._tokenStream,b;if(a.match(Tokens.IDENT)){b=a.token();return new SelectorSubPart(b.value,"elementName",b.startLine,b.startCol)}return null},_namespace_prefix:function(){var a=this._tokenStream,b="";if(a.LA(1)===Tokens.PIPE||a.LA(2)===Tokens.PIPE)a.match([Tokens.IDENT,Tokens.STAR])&&(b+=a.token().value),a.mustMatch(Tokens.PIPE),b+="|";return b.length?b:null},_universal:function(){var a=this._tokenStream,b="",c;c=this._namespace_prefix(),c&&(b+=c),a.match(Tokens.STAR)&&(b+="*");return b.length?b:null},_attrib:function(){var a=this._tokenStream,b=null,c,d;if(a.match(Tokens.LBRACKET)){d=a.token(),b=d.value,b+=this._readWhitespace(),c=this._namespace_prefix(),c&&(b+=c),a.mustMatch(Tokens.IDENT),b+=a.token().value,b+=this._readWhitespace(),a.match([Tokens.PREFIXMATCH,Tokens.SUFFIXMATCH,Tokens.SUBSTRINGMATCH,Tokens.EQUALS,Tokens.INCLUDES,Tokens.DASHMATCH])&&(b+=a.token().value,b+=this._readWhitespace(),a.mustMatch([Tokens.IDENT,Tokens.STRING]),b+=a.token().value,b+=this._readWhitespace()),a.mustMatch(Tokens.RBRACKET);return new SelectorSubPart(b+"]","attribute",d.startLine,d.startCol)}return null},_pseudo:function(){var a=this._tokenStream,b=null,c=":",d,e;a.match(Tokens.COLON)&&(a.match(Tokens.COLON)&&(c+=":"),a.match(Tokens.IDENT)?(b=a.token().value,d=a.token().startLine,e=a.token().startCol-c.length):a.peek()==Tokens.FUNCTION&&(d=a.LT(1).startLine,e=a.LT(1).startCol-c.length,b=this._functional_pseudo()),b&&(b=new SelectorSubPart(c+b,"pseudo",d,e)));return b},_functional_pseudo:function(){var a=this._tokenStream,b=null;a.match(Tokens.FUNCTION)&&(b=a.token().value,b+=this._readWhitespace(),b+=this._expression(),a.mustMatch(Tokens.RPAREN),b+=")");return b},_expression:function(){var a=this._tokenStream,b="";while(a.match([Tokens.PLUS,Tokens.MINUS,Tokens.DIMENSION,Tokens.NUMBER,Tokens.STRING,Tokens.IDENT,Tokens.LENGTH,Tokens.FREQ,Tokens.ANGLE,Tokens.TIME,Tokens.RESOLUTION]))b+=a.token().value,b+=this._readWhitespace();return b.length?b:null},_negation:function(){var a=this._tokenStream,b,c,d="",e,f=null;a.match(Tokens.NOT)&&(d=a.token().value,b=a.token().startLine,c=a.token().startCol,d+=this._readWhitespace(),e=this._negation_arg(),d+=e,d+=this._readWhitespace(),a.match(Tokens.RPAREN),d+=a.token().value,f=new SelectorSubPart(d,"not",b,c),f.args.push(e));return f},_negation_arg:function(){var a=this._tokenStream,b=[this._type_selector,this._universal,function(){return a.match(Tokens.HASH)?new SelectorSubPart(a.token().value,"id",a.token().startLine,a.token().startCol):null},this._class,this._attrib,this._pseudo],c=null,d=0,e=b.length,f,g,h,i;g=a.LT(1).startLine,h=a.LT(1).startCol;while(d<e&&c===null)c=b[d].call(this),d++;c===null&&this._unexpectedToken(a.LT(1)),c.type=="elementName"?i=new SelectorPart(c,[],c.toString(),g,h):i=new SelectorPart(null,[c],c.toString(),g,h);return i},_declaration:function(){var a=this._tokenStream,b=null,c=null,d=null;b=this._property();if(b!==null){a.mustMatch(Tokens.COLON),this._readWhitespace(),c=this._expr(),(!c||c.length===0)&&this._unexpectedToken(a.LT(1)),d=this._prio(),this.fire({type:"property",property:b,value:c,important:d,line:b.line,col:b.col});return!0}return!1},_prio:function(){var a=this._tokenStream,b=a.match(Tokens.IMPORTANT_SYM);this._readWhitespace();return b},_expr:function(){var a=this._tokenStream,b=[],c=null,d=null;c=this._term();if(c!==null){b.push(c);do{d=this._operator(),d&&b.push(d),c=this._term();if(c===null)break;b.push(c)}while(!0)}return b.length>0?new PropertyValue(b,b[0].startLine,b[0].startCol):null},_term:function(){var a=this._tokenStream,b=null,c=null,d,e;b=this._unary_operator(),b!==null&&(d=a.token().startLine,e=a.token().startCol),a.peek()==Tokens.IE_FUNCTION&&this.options.ieFilters?(c=this._ie_function(),b===null&&(d=a.token().startLine,e=a.token().startCol)):a.match([Tokens.NUMBER,Tokens.PERCENTAGE,Tokens.LENGTH,Tokens.ANGLE,Tokens.TIME,Tokens.FREQ,Tokens.STRING,Tokens.IDENT,Tokens.URI,Tokens.UNICODE_RANGE])?(c=a.token().value,b===null&&(d=a.token().startLine,e=a.token().startCol),this._readWhitespace()):(c=this._hexcolor(),c===null?(b===null&&(d=a.LT(1).startLine,e=a.LT(1).startCol),c===null&&(a.LA(3)==Tokens.EQUALS&&this.options.ieFilters?c=this._ie_function():c=this._function())):b===null&&(d=a.token().startLine,e=a.token().startCol));return c!==null?new PropertyValuePart(b!==null?b+c:c,d,e):null},_function:function(){var a=this._tokenStream,b=null,c=null;a.match(Tokens.FUNCTION)&&(b=a.token().value,this._readWhitespace(),c=this._expr(),a.match(Tokens.RPAREN),b+=c+")",this._readWhitespace());return b},_ie_function:function(){var a=this._tokenStream,b=null,c=null,d;if(a.match([Tokens.IE_FUNCTION,Tokens.FUNCTION])){b=a.token().value;do{this._readWhitespace()&&(b+=a.token().value),a.LA(0)==Tokens.COMMA&&(b+=a.token().value),a.match(Tokens.IDENT),b+=a.token().value,a.match(Tokens.EQUALS),b+=a.token().value,d=a.peek();while(d!=Tokens.COMMA&&d!=Tokens.S&&d!=Tokens.RPAREN)a.get(),b+=a.token().value,d=a.peek()}while(a.match([Tokens.COMMA,Tokens.S]));a.match(Tokens.RPAREN),b+=")",this._readWhitespace()}return b},_hexcolor:function(){var a=this._tokenStream,b,c=null;if(a.match(Tokens.HASH)){b=a.token(),c=b.value;if(!/#[a-f0-9]{3,6}/i.test(c))throw new SyntaxError("Expected a hex color but found '"+c+"' at line "+b.startLine+", col "+b.startCol+".",b.startLine,b.startCol);this._readWhitespace()}return c},_keyframes:function(){var a=this._tokenStream,b,c,d;a.mustMatch(Tokens.KEYFRAMES_SYM),this._readWhitespace(),d=this._keyframe_name(),this._readWhitespace(),a.mustMatch(Tokens.LBRACE),this.fire({type:"startkeyframes",name:d,line:d.line,col:d.col}),this._readWhitespace(),c=a.peek();while(c==Tokens.IDENT||c==Tokens.PERCENTAGE)this._keyframe_rule(),this._readWhitespace(),c=a.peek();this.fire({type:"endkeyframes",name:d,line:d.line,col:d.col}),this._readWhitespace(),a.mustMatch(Tokens.RBRACE)},_keyframe_name:function(){var a=this._tokenStream,b;a.mustMatch([Tokens.IDENT,Tokens.STRING]);return SyntaxUnit.fromToken(a.token())},_keyframe_rule:function(){var a=this._tokenStream,b,c=this._key_list();this.fire({type:"startkeyframerule",keys:c,line:c[0].line,col:c[0].col}),this._readDeclarations(!0),this.fire({type:"endkeyframerule",keys:c,line:c[0].line,col:c[0].col})},_key_list:function(){var a=this._tokenStream,b,c,d=[];d.push(this._key()),this._readWhitespace();while(a.match(Tokens.COMMA))this._readWhitespace(),d.push(this._key()),this._readWhitespace();return d},_key:function(){var a=this._tokenStream,b;if(a.match(Tokens.PERCENTAGE))return SyntaxUnit.fromToken(a.token());if(a.match(Tokens.IDENT)){b=a.token();if(/from|to/i.test(b.value))return SyntaxUnit.fromToken(b);a.unget()}this._unexpectedToken(a.LT(1))},_skipCruft:function(){while(this._tokenStream.match([Tokens.S,Tokens.CDO,Tokens.CDC]));},_readDeclarations:function(a,b){var c=this._tokenStream,d;this._readWhitespace(),a&&c.mustMatch(Tokens.LBRACE),this._readWhitespace();try{for(;;){if(!b||!this._margin()){if(!this._declaration())break;if(!c.match(Tokens.SEMICOLON))break}this._readWhitespace()}c.mustMatch(Tokens.RBRACE),this._readWhitespace()}catch(e){if(!(e instanceof SyntaxError&&!this.options.strict))throw e;this.fire({type:"error",error:e,message:e.message,line:e.line,col:e.col}),d=c.advance([Tokens.SEMICOLON,Tokens.RBRACE]);if(d==Tokens.SEMICOLON)this._readDeclarations(!1,b);else if(d!=Tokens.RBRACE)throw e}},_readWhitespace:function(){var a=this._tokenStream,b="";while(a.match(Tokens.S))b+=a.token().value;return b},_unexpectedToken:function(a){throw new SyntaxError("Unexpected token '"+a.value+"' at line "+a.startLine+", col "+a.startCol+".",a.startLine,a.startCol)},_verifyEnd:function(){this._tokenStream.LA(1)!=Tokens.EOF&&this._unexpectedToken(this._tokenStream.LT(1))},parse:function(a){this._tokenStream=new TokenStream(a,Tokens),this._stylesheet()},parseStyleSheet:function(a){return this.parse(a)},parseMediaQuery:function(a){this._tokenStream=new TokenStream(a,Tokens);var b=this._media_query();this._verifyEnd();return b},parsePropertyValue:function(a){this._tokenStream=new TokenStream(a,Tokens),this._readWhitespace();var b=this._expr();this._readWhitespace(),this._verifyEnd();return b},parseRule:function(a){this._tokenStream=new TokenStream(a,Tokens),this._readWhitespace();var b=this._ruleset();this._readWhitespace(),this._verifyEnd();return b},parseSelector:function(a){this._tokenStream=new TokenStream(a,Tokens),this._readWhitespace();var b=this._selector();this._readWhitespace(),this._verifyEnd();return b}};for(b in c)a[b]=c[b];return a}(),PropertyName.prototype=new SyntaxUnit,PropertyName.prototype.constructor=PropertyName,PropertyValue.prototype=new SyntaxUnit,PropertyValue.prototype.constructor=PropertyValue,PropertyValuePart.prototype=new SyntaxUnit,PropertyValuePart.prototype.constructor=PropertyValue,PropertyValuePart.fromToken=function(a){return new PropertyValuePart(a.value,a.startLine,a.startCol)},Selector.prototype=new SyntaxUnit,Selector.prototype.constructor=Selector,SelectorPart.prototype=new SyntaxUnit,SelectorPart.prototype.constructor=SelectorPart,SelectorSubPart.prototype=new SyntaxUnit,SelectorSubPart.prototype.constructor=SelectorSubPart;var h=/^[0-9a-fA-F]$/,nonascii=/^[\u0080-\uFFFF]$/,nl=/\n|\r\n|\r|\f/;TokenStream.prototype=mix(new TokenStreamBase,{_getToken:function(a){var b,c=this._reader,d=null,e=c.getLine(),f=c.getCol();b=c.read();while(b){switch(b){case"/":c.peek()=="*"?d=this.commentToken(b,e,f):d=this.charToken(b,e,f);break;case"|":case"~":case"^":case"$":case"*":c.peek()=="="?d=this.comparisonToken(b,e,f):d=this.charToken(b,e,f);break;case'"':case"'":d=this.stringToken(b,e,f);break;case"#":isNameChar(c.peek())?d=this.hashToken(b,e,f):d=this.charToken(b,e,f);break;case".":isDigit(c.peek())?d=this.numberToken(b,e,f):d=this.charToken(b,e,f);break;case"-":c.peek()=="-"?d=this.htmlCommentEndToken(b,e,f):isNameStart(c.peek())?d=this.identOrFunctionToken(b,e,f):d=this.charToken(b,e,f);break;case"!":d=this.importantToken(b,e,f);break;case"@":d=this.atRuleToken(b,e,f);break;case":":d=this.notToken(b,e,f);break;case"<":d=this.htmlCommentStartToken(b,e,f);break;case"U":case"u":if(c.peek()=="+"){d=this.unicodeRangeToken(b,e,f);break};default:isDigit(b)?d=this.numberToken(b,e,f):isWhitespace(b)?d=this.whitespaceToken(b,e,f):isIdentStart(b)?d=this.identOrFunctionToken(b,e,f):d=this.charToken(b,e,f)}break}!d&&b==null&&(d=this.createToken(Tokens.EOF,null,e,f));return d},createToken:function(a,b,c,d,e){var f=this._reader;e=e||{};return{value:b,type:a,channel:e.channel,hide:e.hide||!1,startLine:c,startCol:d,endLine:f.getLine(),endCol:f.getCol()}},atRuleToken:function(a,b,c){var d=a,e=this._reader,f=Tokens.CHAR,g=!1,h,i;e.mark(),h=this.readName(),d=a+h,f=Tokens.type(d.toLowerCase());if(f==Tokens.CHAR||f==Tokens.UNKNOWN)f=Tokens.CHAR,d=a,e.reset();return this.createToken(f,d,b,c)},charToken:function(a,b,c){var d=Tokens.type(a);d==-1&&(d=Tokens.CHAR);return this.createToken(d,a,b,c)},commentToken:function(a,b,c){var d=this._reader,e=this.readComment(a);return this.createToken(Tokens.COMMENT,e,b,c)},comparisonToken:function(a,b,c){var d=this._reader,e=a+d.read(),f=Tokens.type(e)||Tokens.CHAR;return this.createToken(f,e,b,c)},hashToken:function(a,b,c){var d=this._reader,e=this.readName(a);return this.createToken(Tokens.HASH,e,b,c)},htmlCommentStartToken:function(a,b,c){var d=this._reader,e=a;d.mark(),e+=d.readCount(3);if(e=="<!--")return this.createToken(Tokens.CDO,e,b,c);d.reset();return this.charToken(a,b,c)},htmlCommentEndToken:function(a,b,c){var d=this._reader,e=a;d.mark(),e+=d.readCount(2);if(e=="-->")return this.createToken(Tokens.CDC,e,b,c);d.reset();return this.charToken(a,b,c)},identOrFunctionToken:function(a,b,c){var d=this._reader,e=this.readName(a),f=Tokens.IDENT;d.peek()=="("?(e+=d.read(),e.toLowerCase()=="url("?(f=Tokens.URI,e=this.readURI(e),e.toLowerCase()=="url("&&(f=Tokens.FUNCTION)):f=Tokens.FUNCTION):d.peek()==":"&&e.toLowerCase()=="progid"&&(e+=d.readTo("("),f=Tokens.IE_FUNCTION);return this.createToken(f,e,b,c)},importantToken:function(a,b,c){var d=this._reader,e=a,f=Tokens.CHAR,g,h;d.mark(),h=d.read();while(h){if(h=="/"){if(d.peek()!="*")break;g=this.readComment(h);if(g=="")break}else if(isWhitespace(h))e+=h+this.readWhitespace();else{if(/i/i.test(h)){g=d.readCount(8),/mportant/i.test(g)&&(e+=h+g,f=Tokens.IMPORTANT_SYM);break}break}h=d.read()}if(f==Tokens.CHAR){d.reset();return this.charToken(a,b,c)}return this.createToken(f,e,b,c)},notToken:function(a,b,c){var d=this._reader,e=a;d.mark(),e+=d.readCount(4);if(e.toLowerCase()==":not(")return this.createToken(Tokens.NOT,e,b,c);d.reset();return this.charToken(a,b,c)},numberToken:function(a,b,c){var d=this._reader,e=this.readNumber(a),f,g=Tokens.NUMBER,h=d.peek();isIdentStart(h)?(f=this.readName(d.read()),e+=f,/^em$|^ex$|^px$|^gd$|^rem$|^vw$|^vh$|^vm$|^ch$|^cm$|^mm$|^in$|^pt$|^pc$/i.test(f)?g=Tokens.LENGTH:/^deg|^rad$|^grad$/i.test(f)?g=Tokens.ANGLE:/^ms$|^s$/i.test(f)?g=Tokens.TIME:/^hz$|^khz$/i.test(f)?g=Tokens.FREQ:/^dpi$|^dpcm$/i.test(f)?g=Tokens.RESOLUTION:g=Tokens.DIMENSION):h=="%"&&(e+=d.read(),g=Tokens.PERCENTAGE);return this.createToken(g,e,b,c)},stringToken:function(a,b,c){var d=a,e=a,f=this._reader,g=a,h=Tokens.STRING,i=f.read();while(i){e+=i;if(i==d&&g!="\\")break;if(isNewLine(f.peek())&&i!="\\"){h=Tokens.INVALID;break}g=i,i=f.read()}i==null&&(h=Tokens.INVALID);return this.createToken(h,e,b,c)},unicodeRangeToken:function(a,b,c){var d=this._reader,e=a,f,g=Tokens.CHAR;d.peek()=="+"&&(d.mark(),e+=d.read(),e+=this.readUnicodeRangePart(!0),e.length==2?d.reset():(g=Tokens.UNICODE_RANGE,e.indexOf("?")==-1&&d.peek()=="-"&&(d.mark(),f=d.read(),f+=this.readUnicodeRangePart(!1),f.length==1?d.reset():e+=f)));return this.createToken(g,e,b,c)},whitespaceToken:function(a,b,c){var d=this._reader,e=a+this.readWhitespace();return this.createToken(Tokens.S,e,b,c)},readUnicodeRangePart:function(a){var b=this._reader,c="",d=b.peek();while(isHexDigit(d)&&c.length<6)b.read(),c+=d,d=b.peek();if(a)while(d=="?"&&c.length<6)b.read(),c+=d,d=b.peek();return c},readWhitespace:function(){var a=this._reader,b="",c=a.peek();while(isWhitespace(c))a.read(),b+=c,c=a.peek();return b},readNumber:function(a){var b=this._reader,c=a,d=a==".",e=b.peek();while(e){if(isDigit(e))c+=b.read();else{if(e!=".")break;if(d)break;d=!0,c+=b.read()}e=b.peek()}return c},readString:function(){var a=this._reader,b=a.read(),c=b,d=b,e=a.peek();while(e){e=a.read(),c+=e;if(e==b&&d!="\\")break;if(isNewLine(a.peek())&&e!="\\"){c="";break}d=e,e=a.peek()}e==null&&(c="");return c},readURI:function(a){var b=this._reader,c=a,d="",e=b.peek();b.mark();while(e&&isWhitespace(e))b.read(),e=b.peek();e=="'"||e=='"'?d=this.readString():d=this.readURL(),e=b.peek();while(e&&isWhitespace(e))b.read(),e=b.peek();d==""||e!=")"?(c=a,b.reset()):c+=d+b.read();return c},readURL:function(){var a=this._reader,b="",c=a.peek();while(/^[!#$%&\\*-~]$/.test(c))b+=a.read(),c=a.peek();return b},readName:function(a){var b=this._reader,c=a||"",d=b.peek();for(;;)if(d=="\\")c+=this.readEscape(b.read()),d=b.peek();else if(d&&isNameChar(d))c+=b.read(),d=b.peek();else break;return c},readEscape:function(a){var b=this._reader,c=a||"",d=0,e=b.peek();if(isHexDigit(e))do c+=b.read(),e=b.peek();while(e&&isHexDigit(e)&&++d<6);c.length==3&&/\s/.test(e)||c.length==7||c.length==1?b.read():e="";return c+e},readComment:function(a){var b=this._reader,c=a||"",d=b.read();if(d=="*"){while(d){c+=d;if(d=="*"&&b.peek()=="/"){c+=b.read();break}d=b.read()}return c}return""}});var Tokens=[{name:"CDO"},{name:"CDC"},{name:"S",whitespace:!0},{name:"COMMENT",comment:!0,hide:!0,channel:"comment"},{name:"INCLUDES",text:"~="},{name:"DASHMATCH",text:"|="},{name:"PREFIXMATCH",text:"^="},{name:"SUFFIXMATCH",text:"$="},{name:"SUBSTRINGMATCH",text:"*="},{name:"STRING"},{name:"IDENT"},{name:"HASH"},{name:"IMPORT_SYM",text:"@import"},{name:"PAGE_SYM",text:"@page"},{name:"MEDIA_SYM",text:"@media"},{name:"FONT_FACE_SYM",text:"@font-face"},{name:"CHARSET_SYM",text:"@charset"},{name:"NAMESPACE_SYM",text:"@namespace"},{name:"KEYFRAMES_SYM",text:["@keyframes","@-webkit-keyframes","@-moz-keyframes"]},{name:"IMPORTANT_SYM"},{name:"LENGTH"},{name:"ANGLE"},{name:"TIME"},{name:"FREQ"},{name:"DIMENSION"},{name:"PERCENTAGE"},{name:"NUMBER"},{name:"URI"},{name:"FUNCTION"},{name:"UNICODE_RANGE"},{name:"INVALID"},{name:"PLUS",text:"+"},{name:"GREATER",text:">"},{name:"COMMA",text:","},{name:"TILDE",text:"~"},{name:"NOT"},{name:"TOPLEFTCORNER_SYM",text:"@top-left-corner"},{name:"TOPLEFT_SYM",text:"@top-left"},{name:"TOPCENTER_SYM",text:"@top-center"},{name:"TOPRIGHT_SYM",text:"@top-right"},{name:"TOPRIGHTCORNER_SYM",text:"@top-right-corner"},{name:"BOTTOMLEFTCORNER_SYM",text:"@bottom-left-corner"},{name:"BOTTOMLEFT_SYM",text:"@bottom-left"},{name:"BOTTOMCENTER_SYM",text:"@bottom-center"},{name:"BOTTOMRIGHT_SYM",text:"@bottom-right"},{name:"BOTTOMRIGHTCORNER_SYM",text:"@bottom-right-corner"},{name:"LEFTTOP_SYM",text:"@left-top"},{name:"LEFTMIDDLE_SYM",text:"@left-middle"},{name:"LEFTBOTTOM_SYM",text:"@left-bottom"},{name:"RIGHTTOP_SYM",text:"@right-top"},{name:"RIGHTMIDDLE_SYM",text:"@right-middle"},{name:"RIGHTBOTTOM_SYM",text:"@right-bottom"},{name:"RESOLUTION",state:"media"},{name:"IE_FUNCTION"},{name:"CHAR"},{name:"PIPE",text:"|"},{name:"SLASH",text:"/"},{name:"MINUS",text:"-"},{name:"STAR",text:"*"},{name:"LBRACE",text:"{"},{name:"RBRACE",text:"}"},{name:"LBRACKET",text:"["},{name:"RBRACKET",text:"]"},{name:"EQUALS",text:"="},{name:"COLON",text:":"},{name:"SEMICOLON",text:";"},{name:"LPAREN",text:"("},{name:"RPAREN",text:")"},{name:"DOT",text:"."}];(function(){var a=[],b={};Tokens.UNKNOWN=-1,Tokens.unshift({name:"EOF"});for(var c=0,d=Tokens.length;c<d;c++){a.push(Tokens[c].name),Tokens[Tokens[c].name]=c;if(Tokens[c].text)if(Tokens[c].text instanceof Array)for(var e=0;e<Tokens[c].text.length;e++)b[Tokens[c].text[e]]=c;else b[Tokens[c].text]=c}Tokens.name=function(b){return a[b]},Tokens.type=function(a){return b[a]||-1}})(),parserlib.css={Colors:Colors,Combinator:Combinator,Parser:Parser,PropertyName:PropertyName,PropertyValue:PropertyValue,PropertyValuePart:PropertyValuePart,MediaFeature:MediaFeature,MediaQuery:MediaQuery,Selector:Selector,SelectorPart:SelectorPart,SelectorSubPart:SelectorSubPart,TokenStream:TokenStream,Tokens:Tokens}}();var CSSLint=function(){var a=[],b=[],c=new parserlib.util.EventTarget;c.version="@VERSION@",c.addRule=function(b){a.push(b),a[b.id]=b},c.clearRules=function(){a=[]},c.addFormatter=function(a){b[a.id]=a},c.getFormatter=function(a){return b[a]},c.format=function(a,b,c){var d=this.getFormatter(c),e=null;d&&(e=d.startFormat(),e+=d.formatResults(a,b),e+=d.endFormat());return e},c.hasFormat=function(a){return b.hasOwnProperty(a)},c.verify=function(b,c){var d=0,e=a.length,f,g,h=new parserlib.css.Parser({starHack:!0,ieFilters:!0,underscoreHack:!0,strict:!1});g=b.split(/\n\r?/g),f=new Reporter(g);if(!c)while(d<e)a[d++].init(h,f);else{c.errors=1;for(d in c)c.hasOwnProperty(d)&&a[d]&&a[d].init(h,f)}try{h.parse(b)}catch(i){f.error("Fatal error, cannot continue: "+i.message,i.line,i.col)}return{messages:f.messages,stats:f.stats}};return c}();Reporter.prototype={constructor:Reporter,error:function(a,b,c,d){this.messages.push({type:"error",line:b,col:c,message:a,evidence:this.lines[b-1],rule:d})},warn:function(a,b,c,d){this.messages.push({type:"warning",line:b,col:c,message:a,evidence:this.lines[b-1],rule:d})},info:function(a,b,c,d){this.messages.push({type:"info",line:b,col:c,message:a,evidence:this.lines[b-1],rule:d})},rollupError:function(a,b){this.messages.push({type:"error",rollup:!0,message:a,rule:b})},rollupWarn:function(a,b){this.messages.push({type:"warning",rollup:!0,message:a,rule:b})},stat:function(a,b){this.stats[a]=b}},CSSLint.addRule({id:"adjoining-classes",name:"Adjoining Classes",desc:"Don't use adjoining classes.",browsers:"IE6",init:function(a,b){var c=this;a.addListener("startrule",function(a){var d=a.selectors,e,f,g,h,i,j,k;for(i=0;i<d.length;i++){e=d[i];for(j=0;j<e.parts.length;j++){f=e.parts[j];if(f instanceof parserlib.css.SelectorPart){h=0;for(k=0;k<f.modifiers.length;k++)g=f.modifiers[k],g.type=="class"&&h++,h>1&&b.warn("Don't use adjoining classes.",f.line,f.col,c)}}}})}}),CSSLint.addRule({id:"box-model",name:"Box Model",desc:"Don't use width or height when using padding or border.",browsers:"All",init:function(a,b){var c=this,d={border:1,"border-left":1,"border-right":1,padding:1,"padding-left":1,"padding-right":1},e={border:1,"border-bottom":1,"border-top":1,padding:1,"padding-bottom":1,"padding-top":1},f;a.addListener("startrule",function(){f={}}),a.addListener("property",function(a){var b=a.property.text.toLowerCase();if(e[b]||d[b])!/^0\S*$/.test(a.value)&&(b!="border"||a.value!="none")&&(f[b]={line:a.property.line,col:a.property.col,value:a.value});else if(b=="width"||b=="height")f[b]=1}),a.addListener("endrule",function(){var a;if(f.height)for(a in e)e.hasOwnProperty(a)&&f[a]&&(a!="padding"||f[a].value.parts.length!=2||f[a].value.parts[0].value!=0)&&b.warn("Broken box model: using height with "+a+".",f[a].line,f[a].col,c);if(f.width)for(a in d)d.hasOwnProperty(a)&&f[a]&&(a!="padding"||f[a].value.parts.length!=2||f[a].value.parts[1].value!=0)&&b.warn("Broken box model: using width with "+a+".",f[a].line,f[a].col,c)})}}),CSSLint.addRule({id:"compatible-vendor-prefixes",name:"Compatible Vendor Prefixes",desc:"Include all compatible vendor prefixes to reach a wider range of users.",browsers:"All",init:function(a,b){var c=this,d,e,f,g,h,i,j,k=Array.prototype.push,l=[];d={animation:"webkit moz","animation-delay":"webkit moz","animation-direction":"webkit moz","animation-duration":"webkit moz","animation-fill-mode":"webkit moz","animation-iteration-count":"webkit moz","animation-name":"webkit moz","animation-play-state":"webkit moz","animation-timing-function":"webkit moz",appearance:"webkit moz","border-end":"webkit moz","border-end-color":"webkit moz","border-end-style":"webkit moz","border-end-width":"webkit moz","border-image":"webkit moz o","border-radius":"webkit moz","border-start":"webkit moz","border-start-color":"webkit moz","border-start-style":"webkit moz","border-start-width":"webkit moz","box-align":"webkit moz ms","box-direction":"webkit moz ms","box-flex":"webkit moz ms","box-lines":"webkit ms","box-ordinal-group":"webkit moz ms","box-orient":"webkit moz ms","box-pack":"webkit moz ms","box-sizing":"webkit moz","box-shadow":"webkit moz","column-count":"webkit moz","column-gap":"webkit moz","column-rule":"webkit moz","column-rule-color":"webkit moz","column-rule-style":"webkit moz","column-rule-width":"webkit moz","column-width":"webkit moz",hyphens:"epub moz","line-break":"webkit ms","margin-end":"webkit moz","margin-start":"webkit moz","marquee-speed":"webkit wap","marquee-style":"webkit wap","padding-end":"webkit moz","padding-start":"webkit moz","tab-size":"moz o","text-size-adjust":"webkit ms",transform:"webkit moz ms o","transform-origin":"webkit moz ms o",transition:"webkit moz o","transition-delay":"webkit moz o","transition-duration":"webkit moz o","transition-property":"webkit moz o","transition-timing-function":"webkit moz o","user-modify":"webkit moz","user-select":"webkit moz","word-break":"epub ms","writing-mode":"epub ms"};for(f in d)if(d.hasOwnProperty(f)){g=[],h=d[f].split(" ");for(i=0,j=h.length;i<j;i++)g.push("-"+h[i]+"-"+f);d[f]=g,k.apply(l,g)}a.addListener("startrule",function(){e=[]}),a.addListener("property",function(a){var b=a.property.text;l.indexOf(b)>-1&&e.push(b)}),a.addListener("endrule",function(a){if(!!e.length){var f={},g,h,i,j,k,l,m,n,o,p;for(g=0,h=e.length;g<h;g++){i=e[g];for(j in d)d.hasOwnProperty(j)&&(k=d[j],k.indexOf(i)>-1&&(f[j]===undefined&&(f[j]={full:k.slice(0),actual:[]}),f[j].actual.indexOf(i)===-1&&f[j].actual.push(i)))}for(j in f)if(f.hasOwnProperty(j)){l=f[j],m=l.full,n=l.actual;if(m.length>n.length)for(g=0,h=m.length;g<h;g++)o=m[g],n.indexOf(o)===-1&&(p=n.length===1?n[0]:n.length==2?n.join(" and "):n.join(", "),b.warn("The property "+o+" is compatible with "+p+" and should be included as well.",a.selectors[0].line,a.selectors[0].col,c))}}})}}),CSSLint.addRule({id:"display-property-grouping",name:"Display Property Grouping",desc:"Certain properties shouldn't be used with certain display property values.",browsers:"All",init:function(a,b){function f(a,f,g){e[a]&&(typeof d[a]!="string"||e[a].value.toLowerCase()!=d[a])&&b.warn(g||a+" can't be used with display: "+f+".",e[a].line,e[a].col,c)}var c=this,d={display:1,"float":"none",height:1,width:1,margin:1,"margin-left":1,"margin-right":1,"margin-bottom":1,"margin-top":1,padding:1,"padding-left":1,"padding-right":1,"padding-bottom":1,"padding-top":1,"vertical-align":1},e;a.addListener("startrule",function(){e={}}),a.addListener("property",function(a){var b=a.property.text.toLowerCase();d[b]&&(e[b]={value:a.value.text,line:a.property.line,col:a.property.col})}),a.addListener("endrule",function(){var a=e.display?e.display.value:null;if(a)switch(a){case"inline":f("height",a),f("width",a),f("margin",a),f("margin-top",a),f("margin-bottom",a),f("float",a,"display:inline has no effect on floated elements (but may be used to fix the IE6 double-margin bug).");break;case"block":f("vertical-align",a);break;case"inline-block":f("float",a);break;default:a.indexOf("table-")==0&&(f("margin",a),f("margin-left",a),f("margin-right",a),f("margin-top",a),f("margin-bottom",a),f("float",a))}})}}),CSSLint.addRule({id:"duplicate-properties",name:"Duplicate Properties",desc:"Duplicate properties must appear one after the other.",browsers:"All",init:function(a,b){function f(a){d={}}var c=this,d,e;a.addListener("startrule",f),a.addListener("startfontface",f),a.addListener("startpage",f),a.addListener("property",function(a){var f=a.property,g=f.text.toLowerCase();d[g]&&(e!=g||d[g]==a.value.text)&&b.warn("Duplicate property '"+a.property+"' found.",a.line,a.col,c),d[g]=a.value.text,e=g})}}),CSSLint.addRule({id:"empty-rules",name:"Empty Rules",desc:"Rules without any properties specified should be removed.",browsers:"All",init:function(a,b){var c=this,d=0;a.addListener("startrule",function(){d=0}),a.addListener("property",function(){d++}),a.addListener("endrule",function(a){var e=a.selectors;d==0&&b.warn("Rule is empty.",e[0].line,e[0].col,c)})}}),CSSLint.addRule({id:"errors",name:"Parsing Errors",desc:"This rule looks for recoverable syntax errors.",browsers:"All",init:function(a,b){var c=this;a.addListener("error",function(a){b.error(a.message,a.line,a.col,c)})}}),CSSLint.addRule({id:"floats",name:"Floats",desc:"This rule tests if the float property is used too many times",browsers:"All",init:function(a,b){var c=this,d=0;a.addListener("property",function(a){a.property.text.toLowerCase()=="float"&&a.value.text.toLowerCase()!="none"&&d++}),a.addListener("endstylesheet",function(){b.stat("floats",d),d>=10&&b.rollupWarn("Too many floats ("+d+"), you're probably using them for layout. Consider using a grid system instead.",c)})}}),CSSLint.addRule({id:"font-faces",name:"Font Faces",desc:"Too many different web fonts in the same stylesheet.",browsers:"All",init:function(a,b){var c=this,d=0;a.addListener("startfontface",function(){d++}),a.addListener("endstylesheet",function(){d>5&&b.rollupWarn("Too many @font-face declarations ("+d+").",c)})}}),CSSLint.addRule({id:"font-sizes",name:"Font Sizes",desc:"Checks the number of font-size declarations.",browsers:"All",init:function(a,b){var c=this,d=0;a.addListener("property",function(a){a.property=="font-size"&&d++}),a.addListener("endstylesheet",function(){b.stat("font-sizes",d),d>=10&&b.rollupWarn("Too many font-size declarations ("+d+"), abstraction needed.",c)})}}),CSSLint.addRule({id:"gradients",name:"Gradients",desc:"When using a vendor-prefixed gradient, make sure to use them all.",browsers:"All",init:function(a,b){var c=this,d;a.addListener("startrule",function(){d={moz:0,webkit:0,ms:0,o:0}}),a.addListener("property",function(a){/\-(moz|ms|o|webkit)(?:\-(?:linear|radial))\-gradient/.test(a.value)&&(d[RegExp.$1]=1)}),a.addListener("endrule",function(a){var e=[];d.moz||e.push("Firefox 3.6+"),d.webkit||e.push("Webkit (Safari, Chrome)"),d.ms||e.push("Internet Explorer 10+"),d.o||e.push("Opera 11.1+"),e.length&&e.length<4&&b.warn("Missing vendor-prefixed CSS gradients for "+e.join(", ")+".",a.selectors[0].line,a.selectors[0].col,c)})}}),CSSLint.addRule({id:"ids",name:"IDs",desc:"Selectors should not contain IDs.",browsers:"All",init:function(a,b){var c=this;a.addListener("startrule",function(a){var d=a.selectors,e,f,g,h,i,j,k;for(i=0;i<d.length;i++){e=d[i],h=0;for(j=0;j<e.parts.length;j++){f=e.parts[j];if(f instanceof parserlib.css.SelectorPart)for(k=0;k<f.modifiers.length;k++)g=f.modifiers[k],g.type=="id"&&h++}h==1?b.warn("Don't use IDs in selectors.",e.line,e.col,c):h>1&&b.warn(h+" IDs in the selector, really?",e.line,e.col,c)}})}}),CSSLint.addRule({id:"import",name:"@import",desc:"Don't use @import, use <link> instead.",browsers:"All",init:function(a,b){var c=this;a.addListener("import",function(a){b.warn("@import prevents parallel downloads, use <link> instead.",a.line,a.col,c)})}}),CSSLint.addRule({id:"important",name:"Important",desc:"Be careful when using !important declaration",browsers:"All",init:function(a,b){var c=this,d=0;a.addListener("property",function(a){a.important===!0&&(d++,b.warn("Use of !important",a.line,a.col,c))}),a.addListener("endstylesheet",function(){b.stat("important",d),d>=10&&b.rollupWarn("Too many !important declarations ("+d+"), try to use less than 10 to avoid specifity issues.",c)})}}),CSSLint.addRule({id:"known-properties",name:"Known Properties",desc:"Properties should be known (listed in CSS specification) or be a vendor-prefixed property.",browsers:"All",init:function(a,b){var c=this,d={"alignment-adjust":1,"alignment-baseline":1,animation:1,"animation-delay":1,"animation-direction":1,"animation-duration":1,"animation-iteration-count":1,"animation-name":1,"animation-play-state":1,"animation-timing-function":1,appearance:1,azimuth:1,"backface-visibility":1,background:1,"background-attachment":1,"background-break":1,"background-clip":1,"background-color":1,"background-image":1,"background-origin":1,"background-position":1,"background-repeat":1,"background-size":1,"baseline-shift":1,binding:1,bleed:1,"bookmark-label":1,"bookmark-level":1,"bookmark-state":1,"bookmark-target":1,border:1,"border-bottom":1,"border-bottom-color":1,"border-bottom-left-radius":1,"border-bottom-right-radius":1,"border-bottom-style":1,"border-bottom-width":1,"border-collapse":1,"border-color":1,"border-image":1,"border-image-outset":1,"border-image-repeat":1,"border-image-slice":1,"border-image-source":1,"border-image-width":1,"border-left":1,"border-left-color":1,"border-left-style":1,"border-left-width":1,"border-radius":1,"border-right":1,"border-right-color":1,"border-right-style":1,"border-right-width":1,"border-spacing":1,"border-style":1,"border-top":1,"border-top-color":1,"border-top-left-radius":1,"border-top-right-radius":1,"border-top-style":1,"border-top-width":1,"border-width":1,bottom:1,"box-align":1,"box-decoration-break":1,"box-direction":1,"box-flex":1,"box-flex-group":1,"box-lines":1,"box-ordinal-group":1,"box-orient":1,"box-pack":1,"box-shadow":1,"box-sizing":1,"break-after":1,"break-before":1,"break-inside":1,"caption-side":1,clear:1,clip:1,color:1,"color-profile":1,"column-count":1,"column-fill":1,"column-gap":1,"column-rule":1,"column-rule-color":1,"column-rule-style":1,"column-rule-width":1,"column-span":1,"column-width":1,columns:1,content:1,"counter-increment":1,"counter-reset":1,crop:1,cue:1,"cue-after":1,"cue-before":1,cursor:1,direction:1,display:1,"dominant-baseline":1,"drop-initial-after-adjust":1,"drop-initial-after-align":1,"drop-initial-before-adjust":1,"drop-initial-before-align":1,"drop-initial-size":1,"drop-initial-value":1,elevation:1,"empty-cells":1,fit:1,"fit-position":1,"float":1,"float-offset":1,font:1,"font-family":1,"font-size":1,"font-size-adjust":1,"font-stretch":1,"font-style":1,"font-variant":1,"font-weight":1,"grid-columns":1,"grid-rows":1,"hanging-punctuation":1,height:1,"hyphenate-after":1,"hyphenate-before":1,"hyphenate-character":1,"hyphenate-lines":1,"hyphenate-resource":1,hyphens:1,icon:1,"image-orientation":1,"image-rendering":1,"image-resolution":1,"inline-box-align":1,left:1,"letter-spacing":1,"line-height":1,"line-stacking":1,"line-stacking-ruby":1,"line-stacking-shift":1,"line-stacking-strategy":1,"list-style":1,"list-style-image":1,"list-style-position":1,"list-style-type":1,margin:1,"margin-bottom":1,"margin-left":1,"margin-right":1,"margin-top":1,mark:1,"mark-after":1,"mark-before":1,marks:1,"marquee-direction":1,"marquee-play-count":1,"marquee-speed":1,"marquee-style":1,"max-height":1,"max-width":1,"min-height":1,"min-width":1,"move-to":1,"nav-down":1,"nav-index":1,"nav-left":1,"nav-right":1,"nav-up":1,opacity:1,orphans:1,outline:1,"outline-color":1,"outline-offset":1,"outline-style":1,"outline-width":1,overflow:1,"overflow-style":1,"overflow-x":1,"overflow-y":1,padding:1,"padding-bottom":1,"padding-left":1,"padding-right":1,"padding-top":1,page:1,"page-break-after":1,"page-break-before":1,"page-break-inside":1,"page-policy":1,pause:1,"pause-after":1,"pause-before":1,perspective:1,"perspective-origin":1,phonemes:1,pitch:1,"pitch-range":1,"play-during":1,position:1,"presentation-level":1,"punctuation-trim":1,quotes:1,"rendering-intent":1,resize:1,rest:1,"rest-after":1,"rest-before":1,richness:1,right:1,rotation:1,"rotation-point":1,"ruby-align":1,"ruby-overhang":1,"ruby-position":1,"ruby-span":1,size:1,speak:1,"speak-header":1,"speak-numeral":1,"speak-punctuation":1,"speech-rate":1,stress:1,"string-set":1,"table-layout":1,target:1,"target-name":1,"target-new":1,"target-position":1,"text-align":1,"text-align-last":1,"text-decoration":1,"text-emphasis":1,"text-height":1,"text-indent":1,"text-justify":1,"text-outline":1,"text-shadow":1,"text-transform":1,"text-wrap":1,top:1,transform:1,"transform-origin":1,"transform-style":1,transition:1,"transition-delay":1,"transition-duration":1,"transition-property":1,"transition-timing-function":1,"unicode-bidi":1,"vertical-align":1,visibility:1,"voice-balance":1,"voice-duration":1,"voice-family":1,"voice-pitch":1,"voice-pitch-range":1,"voice-rate":1,"voice-stress":1,"voice-volume":1,volume:1,"white-space":1,"white-space-collapse":1,widows:1,width:1,"word-break":1,"word-spacing":1,"word-wrap":1,"z-index":1,filter:1,zoom:1};a.addListener("property",function(a){var e=a.property.text.toLowerCase();!d[e]&&e.charAt(0)!="-"&&b.error("Unknown property '"+a.property+"'.",a.line,a.col,c)})}}),CSSLint.addRule({id:"overqualified-elements",name:"Overqualified Elements",desc:"Don't use classes or IDs with elements (a.foo or a#foo).",browsers:"All",init:function(a,b){var c=this,d={};a.addListener("startrule",function(a){var e=a.selectors,f,g,h,i,j,k;for(i=0;i<e.length;i++){f=e[i];for(j=0;j<f.parts.length;j++){g=f.parts[j];if(g instanceof parserlib.css.SelectorPart)for(k=0;k<g.modifiers.length;k++)h=g.modifiers[k],g.elementName&&h.type=="id"?b.warn("Element ("+g+") is overqualified, just use "+h+" without element name.",g.line,g.col,c):h.type=="class"&&(d[h]||(d[h]=[]),d[h].push({modifier:h,part:g}))}}}),a.addListener("endstylesheet",function(){var a;for(a in d)d.hasOwnProperty(a)&&d[a].length==1&&d[a][0].part.elementName&&b.warn("Element ("+d[a][0].part+") is overqualified, just use "+d[a][0].modifier+" without element name.",d[a][0].part.line,d[a][0].part.col,c)})}}),CSSLint.addRule({id:"qualified-headings",name:"Qualified Headings",desc:"Headings should not be qualified (namespaced).",browsers:"All",init:function(a,b){var c=this;a.addListener("startrule",function(a){var d=a.selectors,e,f,g,h;for(g=0;g<d.length;g++){e=d[g];for(h=0;h<e.parts.length;h++)f=e.parts[h],f instanceof parserlib.css.SelectorPart&&f.elementName&&/h[1-6]/.test(f.elementName.toString())&&h>0&&b.warn("Heading ("+f.elementName+") should not be qualified.",f.line,f.col,c)}})}}),CSSLint.addRule({id:"regex-selectors",name:"Regex Selectors",desc:"Selectors that look like regular expressions are slow and should be avoided.",browsers:"All",init:function(a,b){var c=this;a.addListener("startrule",function(a){var d=a.selectors,e,f,g,h,i,j;for(h=0;h<d.length;h++){e=d[h];for(i=0;i<e.parts.length;i++){f=e.parts[i];if(f instanceof parserlib.css.SelectorPart)for(j=0;j<f.modifiers.length;j++)g=f.modifiers[j],g.type=="attribute"&&/([\~\|\^\$\*]=)/.test(g)&&b.warn("Attribute selectors with "+RegExp.$1+" are slow!",g.line,g.col,c)}}})}}),CSSLint.addRule({id:"rules-count",name:"Rules Count",desc:"Track how many rules there are.",browsers:"All",init:function(a,b){var c=this,d=0;a.addListener("startrule",function(){d++}),a.addListener("endstylesheet",function(){b.stat("rule-count",d)})}}),CSSLint.addRule({id:"text-indent",name:"Text Indent",desc:"Checks for text indent less than -99px",browsers:"All",init:function(a,b){var c=this;a.addListener("property",function(a){var d=a.property,e=a.value.parts[0].value;d=="text-indent"&&e<-99&&b.warn("Negative text-indent doesn't work well with RTL. If you use text-indent for image replacement explicitly set text-direction for that item to ltr.",d.line,d.col,c)})}}),CSSLint.addRule({id:"unique-headings",name:"Unique Headings",desc:"Headings should be defined only once.",browsers:"All",init:function(a,b){var c=this,d={h1:0,h2:0,h3:0,h4:0,h5:0,h6:0};a.addListener("startrule",function(a){var e=a.selectors,f,g,h;for(h=0;h<e.length;h++)f=e[h],g=f.parts[f.parts.length-1],g.elementName&&/(h[1-6])/.test(g.elementName.toString())&&(d[RegExp.$1]++,d[RegExp.$1]>1&&b.warn("Heading ("+g.elementName+") has already been defined.",g.line,g.col,c))})}}),CSSLint.addRule({id:"universal-selector",name:"Universal Selector",desc:"The universal selector (*) is known to be slow.",browsers:"All",init:function(a,b){var c=this;a.addListener("startrule",function(a){var d=a.selectors,e,f,g,h,i,j;for(h=0;h<d.length;h++)e=d[h],f=e.parts[e.parts.length-1],f.elementName=="*"&&b.warn(c.desc,f.line,f.col,c)})}}),CSSLint.addRule({id:"vendor-prefix",name:"Vendor Prefix",desc:"When using a vendor-prefixed property, make sure to include the standard one.",browsers:"All",init:function(a,b){function h(a){var e,g,h,i,j,k,l=[];for(e in d)f[e]&&l.push({actual:e,needed:f[e]});for(g=0,h=l.length;g<h;g++)j=l[g].needed,k=l[g].actual,d[j]?d[j][0].pos<d[k][0].pos&&b.warn("Standard property '"+j+"' should come after vendor-prefixed property '"+k+"'.",a.line,a.col,c):b.warn("Missing standard property '"+j+"' to go along with '"+k+"'.",a.line,a.col,c)}function g(){d={},e=1}var c=this,d,e,f={"-moz-border-radius":"border-radius","-webkit-border-radius":"border-radius","-webkit-border-top-left-radius":"border-top-left-radius","-webkit-border-top-right-radius":"border-top-right-radius","-webkit-border-bottom-left-radius":"border-bottom-left-radius","-webkit-border-bottom-right-radius":"border-bottom-right-radius","-moz-border-radius-topleft":"border-top-left-radius","-moz-border-radius-topright":"border-top-right-radius","-moz-border-radius-bottomleft":"border-bottom-left-radius","-moz-border-radius-bottomright":"border-bottom-right-radius","-moz-box-shadow":"box-shadow","-webkit-box-shadow":"box-shadow","-moz-transform":"transform","-webkit-transform":"transform","-o-transform":"transform","-ms-transform":"transform","-moz-box-sizing":"box-sizing","-webkit-box-sizing":"box-sizing","-moz-user-select":"user-select","-khtml-user-select":"user-select","-webkit-user-select":"user-select"};a.addListener("startrule",g),a.addListener("startfontface",g),a.addListener("property",function(a){var b=a.property.text.toLowerCase();d[b]||(d[b]=[]),d[b].push({name:a.property,value:a.value,pos:e++})}),a.addListener("endrule",h),a.addListener("endfontface",h)}}),CSSLint.addRule({id:"zero-units",name:"Zero Units",desc:"You don't need to specify units when a value is 0.",browsers:"All",init:function(a,b){var c=this;a.addListener("property",function(a){var d=a.value.parts,e=0,f=d.length;while(e<f)(d[e].units||d[e].type=="percentage")&&d[e].value===0&&b.warn("Values of 0 shouldn't have units specified.",d[e].line,d[e].col,c),e++})}}),exports.CSSLint=CSSLint})
\ No newline at end of file
+"no use strict";
+
+var console = {
+    log: function(msg) {
+        postMessage({type: "log", data: msg});
+    }
+};
+var window = {
+    console: console
+};
+
+var normalizeModule = function(parentId, moduleName) {
+    // normalize plugin requires
+    if (moduleName.indexOf("!") !== -1) {
+        var chunks = moduleName.split("!");
+        return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]);
+    }
+    // normalize relative requires
+    if (moduleName.charAt(0) == ".") {
+        var base = parentId.split("/").slice(0, -1).join("/");
+        var moduleName = base + "/" + moduleName;
+        
+        while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
+            var previous = moduleName;
+            var moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
+        }
+    }
+    
+    return moduleName;
+};
+
+var require = function(parentId, id) {
+    var id = normalizeModule(parentId, id);
+    
+    var module = require.modules[id];
+    if (module) {
+        if (!module.initialized) {
+            module.exports = module.factory().exports;
+            module.initialized = true;
+        }
+        return module.exports;
+    }
+    
+    var chunks = id.split("/");
+    chunks[0] = require.tlns[chunks[0]] || chunks[0];
+    var path = chunks.join("/") + ".js";
+    
+    require.id = id;
+    importScripts(path);
+    return require(parentId, id);    
+};
+
+require.modules = {};
+require.tlns = {};
+
+var define = function(id, deps, factory) {
+    if (arguments.length == 2) {
+        factory = deps;
+    } else if (arguments.length == 1) {
+        factory = id;
+        id = require.id;
+    }
+
+    if (id.indexOf("text!") === 0) 
+        return;
+    
+    var req = function(deps, factory) {
+        return require(id, deps, factory);
+    };
+
+    require.modules[id] = {
+        factory: function() {
+            var module = {
+                exports: {}
+            };
+            var returnExports = factory(req, module.exports, module);
+            if (returnExports)
+                module.exports = returnExports;
+            return module;
+        }
+    };
+};
+
+function initBaseUrls(topLevelNamespaces) {
+    require.tlns = topLevelNamespaces;
+}
+
+function initSender() {
+
+    var EventEmitter = require(null, "ace/lib/event_emitter").EventEmitter;
+    var oop = require(null, "ace/lib/oop");
+    
+    var Sender = function() {};
+    
+    (function() {
+        
+        oop.implement(this, EventEmitter);
+                
+        this.callback = function(data, callbackId) {
+            postMessage({
+                type: "call",
+                id: callbackId,
+                data: data
+            });
+        };
+    
+        this.emit = function(name, data) {
+            postMessage({
+                type: "event",
+                name: name,
+                data: data
+            });
+        };
+        
+    }).call(Sender.prototype);
+    
+    return new Sender();
+}
+
+var main;
+var sender;
+
+onmessage = function(e) {
+    var msg = e.data;
+    if (msg.command) {
+        main[msg.command].apply(main, msg.args);
+    }
+    else if (msg.init) {        
+        initBaseUrls(msg.tlns);
+        require(null, "ace/lib/fixoldbrowsers");
+        sender = initSender();
+        var clazz = require(null, msg.module)[msg.classname];
+        main = new clazz(sender);
+    } 
+    else if (msg.event && sender) {
+        sender._emit(msg.event, msg.data);
+    }
+};
+// vim:set ts=4 sts=4 sw=4 st:
+// -- kriskowal Kris Kowal Copyright (C) 2009-2010 MIT License
+// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
+// -- dantman Daniel Friesen Copyright(C) 2010 XXX No License Specified
+// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
+// -- Irakli Gozalishvili Copyright (C) 2010 MIT License
+
+/*!
+    Copyright (c) 2009, 280 North Inc. http://280north.com/
+    MIT License. http://github.com/280north/narwhal/blob/master/README.md
+*/
+
+define('ace/lib/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/regexp', 'ace/lib/es5-shim'], function(require, exports, module) {
+"use strict";
+
+require("./regexp");
+require("./es5-shim");
+
+});/**
+ *  Based on code from:
+ *
+ * XRegExp 1.5.0
+ * (c) 2007-2010 Steven Levithan
+ * MIT License
+ * <http://xregexp.com>
+ * Provides an augmented, extensible, cross-browser implementation of regular expressions,
+ * including support for additional syntax, flags, and methods
+ */
+ 
+define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+    //---------------------------------
+    //  Private variables
+    //---------------------------------
+
+    var real = {
+            exec: RegExp.prototype.exec,
+            test: RegExp.prototype.test,
+            match: String.prototype.match,
+            replace: String.prototype.replace,
+            split: String.prototype.split
+        },
+        compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups
+        compliantLastIndexIncrement = function () {
+            var x = /^/g;
+            real.test.call(x, "");
+            return !x.lastIndex;
+        }();
+
+    //---------------------------------
+    //  Overriden native methods
+    //---------------------------------
+
+    // Adds named capture support (with backreferences returned as `result.name`), and fixes two
+    // cross-browser issues per ES3:
+    // - Captured values for nonparticipating capturing groups should be returned as `undefined`,
+    //   rather than the empty string.
+    // - `lastIndex` should not be incremented after zero-length matches.
+    RegExp.prototype.exec = function (str) {
+        var match = real.exec.apply(this, arguments),
+            name, r2;
+        if (match) {
+            // Fix browsers whose `exec` methods don't consistently return `undefined` for
+            // nonparticipating capturing groups
+            if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) {
+                r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", ""));
+                // Using `str.slice(match.index)` rather than `match[0]` in case lookahead allowed
+                // matching due to characters outside the match
+                real.replace.call(str.slice(match.index), r2, function () {
+                    for (var i = 1; i < arguments.length - 2; i++) {
+                        if (arguments[i] === undefined)
+                            match[i] = undefined;
+                    }
+                });
+            }
+            // Attach named capture properties
+            if (this._xregexp && this._xregexp.captureNames) {
+                for (var i = 1; i < match.length; i++) {
+                    name = this._xregexp.captureNames[i - 1];
+                    if (name)
+                       match[name] = match[i];
+                }
+            }
+            // Fix browsers that increment `lastIndex` after zero-length matches
+            if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index))
+                this.lastIndex--;
+        }
+        return match;
+    };
+
+    // Don't override `test` if it won't change anything
+    if (!compliantLastIndexIncrement) {
+        // Fix browser bug in native method
+        RegExp.prototype.test = function (str) {
+            // Use the native `exec` to skip some processing overhead, even though the overriden
+            // `exec` would take care of the `lastIndex` fix
+            var match = real.exec.call(this, str);
+            // Fix browsers that increment `lastIndex` after zero-length matches
+            if (match && this.global && !match[0].length && (this.lastIndex > match.index))
+                this.lastIndex--;
+            return !!match;
+        };
+    }
+
+    //---------------------------------
+    //  Private helper functions
+    //---------------------------------
+
+    function getNativeFlags (regex) {
+        return (regex.global     ? "g" : "") +
+               (regex.ignoreCase ? "i" : "") +
+               (regex.multiline  ? "m" : "") +
+               (regex.extended   ? "x" : "") + // Proposed for ES4; included in AS3
+               (regex.sticky     ? "y" : "");
+    };
+
+    function indexOf (array, item, from) {
+        if (Array.prototype.indexOf) // Use the native array method if available
+            return array.indexOf(item, from);
+        for (var i = from || 0; i < array.length; i++) {
+            if (array[i] === item)
+                return i;
+        }
+        return -1;
+    };
+
+});// vim: ts=4 sts=4 sw=4 expandtab
+// -- kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
+// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
+// -- dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
+// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
+// -- Gozala Irakli Gozalishvili Copyright (C) 2010 MIT License
+// -- kitcambridge Kit Cambridge Copyright (C) 2011 MIT License
+// -- kossnocorp Sasha Koss XXX TODO License or CLA
+// -- bryanforbes Bryan Forbes XXX TODO License or CLA
+// -- killdream Quildreen Motta Copyright (C) 2011 MIT Licence
+// -- michaelficarra Michael Ficarra Copyright (C) 2011 3-clause BSD License
+// -- sharkbrainguy Gerard Paapu Copyright (C) 2011 MIT License
+// -- bbqsrc Brendan Molloy (C) 2011 Creative Commons Zero (public domain)
+// -- iwyg XXX TODO License or CLA
+// -- DomenicDenicola Domenic Denicola Copyright (C) 2011 MIT License
+// -- xavierm02 Montillet Xavier XXX TODO License or CLA
+// -- Raynos Raynos XXX TODO License or CLA
+// -- samsonjs Sami Samhuri Copyright (C) 2010 MIT License
+// -- rwldrn Rick Waldron Copyright (C) 2011 MIT License
+// -- lexer Alexey Zakharov XXX TODO License or CLA
+
+/*!
+    Copyright (c) 2009, 280 North Inc. http://280north.com/
+    MIT License. http://github.com/280north/narwhal/blob/master/README.md
+*/
+
+define('ace/lib/es5-shim', ['require', 'exports', 'module' ], function(require, exports, module) {
+
+/**
+ * Brings an environment as close to ECMAScript 5 compliance
+ * as is possible with the facilities of erstwhile engines.
+ *
+ * Annotated ES5: http://es5.github.com/ (specific links below)
+ * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
+ *
+ * @module
+ */
+
+/*whatsupdoc*/
+
+//
+// Function
+// ========
+//
+
+// ES-5 15.3.4.5
+// http://es5.github.com/#x15.3.4.5
+
+if (!Function.prototype.bind) {
+    Function.prototype.bind = function bind(that) { // .length is 1
+        // 1. Let Target be the this value.
+        var target = this;
+        // 2. If IsCallable(Target) is false, throw a TypeError exception.
+        if (typeof target != "function")
+            throw new TypeError(); // TODO message
+        // 3. Let A be a new (possibly empty) internal list of all of the
+        //   argument values provided after thisArg (arg1, arg2 etc), in order.
+        // XXX slicedArgs will stand in for "A" if used
+        var args = slice.call(arguments, 1); // for normal call
+        // 4. Let F be a new native ECMAScript object.
+        // 11. Set the [[Prototype]] internal property of F to the standard
+        //   built-in Function prototype object as specified in 15.3.3.1.
+        // 12. Set the [[Call]] internal property of F as described in
+        //   15.3.4.5.1.
+        // 13. Set the [[Construct]] internal property of F as described in
+        //   15.3.4.5.2.
+        // 14. Set the [[HasInstance]] internal property of F as described in
+        //   15.3.4.5.3.
+        var bound = function () {
+
+            if (this instanceof bound) {
+                // 15.3.4.5.2 [[Construct]]
+                // When the [[Construct]] internal method of a function object,
+                // F that was created using the bind function is called with a
+                // list of arguments ExtraArgs, the following steps are taken:
+                // 1. Let target be the value of F's [[TargetFunction]]
+                //   internal property.
+                // 2. If target has no [[Construct]] internal method, a
+                //   TypeError exception is thrown.
+                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
+                //   property.
+                // 4. Let args be a new list containing the same values as the
+                //   list boundArgs in the same order followed by the same
+                //   values as the list ExtraArgs in the same order.
+                // 5. Return the result of calling the [[Construct]] internal 
+                //   method of target providing args as the arguments.
+
+                var F = function(){};
+                F.prototype = target.prototype;
+                var self = new F;
+
+                var result = target.apply(
+                    self,
+                    args.concat(slice.call(arguments))
+                );
+                if (result !== null && Object(result) === result)
+                    return result;
+                return self;
+
+            } else {
+                // 15.3.4.5.1 [[Call]]
+                // When the [[Call]] internal method of a function object, F,
+                // which was created using the bind function is called with a
+                // this value and a list of arguments ExtraArgs, the following
+                // steps are taken:
+                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
+                //   property.
+                // 2. Let boundThis be the value of F's [[BoundThis]] internal
+                //   property.
+                // 3. Let target be the value of F's [[TargetFunction]] internal
+                //   property.
+                // 4. Let args be a new list containing the same values as the 
+                //   list boundArgs in the same order followed by the same 
+                //   values as the list ExtraArgs in the same order.
+                // 5. Return the result of calling the [[Call]] internal method 
+                //   of target providing boundThis as the this value and 
+                //   providing args as the arguments.
+
+                // equiv: target.call(this, ...boundArgs, ...args)
+                return target.apply(
+                    that,
+                    args.concat(slice.call(arguments))
+                );
+
+            }
+
+        };
+        // XXX bound.length is never writable, so don't even try
+        //
+        // 15. If the [[Class]] internal property of Target is "Function", then
+        //     a. Let L be the length property of Target minus the length of A.
+        //     b. Set the length own property of F to either 0 or L, whichever is 
+        //       larger.
+        // 16. Else set the length own property of F to 0.
+        // 17. Set the attributes of the length own property of F to the values
+        //   specified in 15.3.5.1.
+
+        // TODO
+        // 18. Set the [[Extensible]] internal property of F to true.
+        
+        // TODO
+        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
+        // 20. Call the [[DefineOwnProperty]] internal method of F with 
+        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
+        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and 
+        //   false.
+        // 21. Call the [[DefineOwnProperty]] internal method of F with 
+        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower, 
+        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
+        //   and false.
+
+        // TODO
+        // NOTE Function objects created using Function.prototype.bind do not 
+        // have a prototype property or the [[Code]], [[FormalParameters]], and
+        // [[Scope]] internal properties.
+        // XXX can't delete prototype in pure-js.
+
+        // 22. Return F.
+        return bound;
+    };
+}
+
+// Shortcut to an often accessed properties, in order to avoid multiple
+// dereference that costs universally.
+// _Please note: Shortcuts are defined after `Function.prototype.bind` as we
+// us it in defining shortcuts.
+var call = Function.prototype.call;
+var prototypeOfArray = Array.prototype;
+var prototypeOfObject = Object.prototype;
+var slice = prototypeOfArray.slice;
+var toString = call.bind(prototypeOfObject.toString);
+var owns = call.bind(prototypeOfObject.hasOwnProperty);
+
+// If JS engine supports accessors creating shortcuts.
+var defineGetter;
+var defineSetter;
+var lookupGetter;
+var lookupSetter;
+var supportsAccessors;
+if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
+    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
+    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
+    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
+    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
+}
+
+//
+// Array
+// =====
+//
+
+// ES5 15.4.3.2
+// http://es5.github.com/#x15.4.3.2
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
+if (!Array.isArray) {
+    Array.isArray = function isArray(obj) {
+        return toString(obj) == "[object Array]";
+    };
+}
+
+// The IsCallable() check in the Array functions
+// has been replaced with a strict check on the
+// internal class of the object to trap cases where
+// the provided function was actually a regular
+// expression literal, which in V8 and
+// JavaScriptCore is a typeof "function".  Only in
+// V8 are regular expression literals permitted as
+// reduce parameters, so it is desirable in the
+// general case for the shim to match the more
+// strict and common behavior of rejecting regular
+// expressions.
+
+// ES5 15.4.4.18
+// http://es5.github.com/#x15.4.4.18
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
+if (!Array.prototype.forEach) {
+    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
+        var self = toObject(this),
+            thisp = arguments[1],
+            i = 0,
+            length = self.length >>> 0;
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        while (i < length) {
+            if (i in self) {
+                // Invoke the callback function with call, passing arguments:
+                // context, property value, property key, thisArg object context
+                fun.call(thisp, self[i], i, self);
+            }
+            i++;
+        }
+    };
+}
+
+// ES5 15.4.4.19
+// http://es5.github.com/#x15.4.4.19
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
+if (!Array.prototype.map) {
+    Array.prototype.map = function map(fun /*, thisp*/) {
+        var self = toObject(this),
+            length = self.length >>> 0,
+            result = Array(length),
+            thisp = arguments[1];
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        for (var i = 0; i < length; i++) {
+            if (i in self)
+                result[i] = fun.call(thisp, self[i], i, self);
+        }
+        return result;
+    };
+}
+
+// ES5 15.4.4.20
+// http://es5.github.com/#x15.4.4.20
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
+if (!Array.prototype.filter) {
+    Array.prototype.filter = function filter(fun /*, thisp */) {
+        var self = toObject(this),
+            length = self.length >>> 0,
+            result = [],
+            thisp = arguments[1];
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        for (var i = 0; i < length; i++) {
+            if (i in self && fun.call(thisp, self[i], i, self))
+                result.push(self[i]);
+        }
+        return result;
+    };
+}
+
+// ES5 15.4.4.16
+// http://es5.github.com/#x15.4.4.16
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
+if (!Array.prototype.every) {
+    Array.prototype.every = function every(fun /*, thisp */) {
+        var self = toObject(this),
+            length = self.length >>> 0,
+            thisp = arguments[1];
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        for (var i = 0; i < length; i++) {
+            if (i in self && !fun.call(thisp, self[i], i, self))
+                return false;
+        }
+        return true;
+    };
+}
+
+// ES5 15.4.4.17
+// http://es5.github.com/#x15.4.4.17
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
+if (!Array.prototype.some) {
+    Array.prototype.some = function some(fun /*, thisp */) {
+        var self = toObject(this),
+            length = self.length >>> 0,
+            thisp = arguments[1];
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        for (var i = 0; i < length; i++) {
+            if (i in self && fun.call(thisp, self[i], i, self))
+                return true;
+        }
+        return false;
+    };
+}
+
+// ES5 15.4.4.21
+// http://es5.github.com/#x15.4.4.21
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
+if (!Array.prototype.reduce) {
+    Array.prototype.reduce = function reduce(fun /*, initial*/) {
+        var self = toObject(this),
+            length = self.length >>> 0;
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        // no value to return if no initial value and an empty array
+        if (!length && arguments.length == 1)
+            throw new TypeError(); // TODO message
+
+        var i = 0;
+        var result;
+        if (arguments.length >= 2) {
+            result = arguments[1];
+        } else {
+            do {
+                if (i in self) {
+                    result = self[i++];
+                    break;
+                }
+
+                // if array contains no values, no initial value to return
+                if (++i >= length)
+                    throw new TypeError(); // TODO message
+            } while (true);
+        }
+
+        for (; i < length; i++) {
+            if (i in self)
+                result = fun.call(void 0, result, self[i], i, self);
+        }
+
+        return result;
+    };
+}
+
+// ES5 15.4.4.22
+// http://es5.github.com/#x15.4.4.22
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
+if (!Array.prototype.reduceRight) {
+    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
+        var self = toObject(this),
+            length = self.length >>> 0;
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        // no value to return if no initial value, empty array
+        if (!length && arguments.length == 1)
+            throw new TypeError(); // TODO message
+
+        var result, i = length - 1;
+        if (arguments.length >= 2) {
+            result = arguments[1];
+        } else {
+            do {
+                if (i in self) {
+                    result = self[i--];
+                    break;
+                }
+
+                // if array contains no values, no initial value to return
+                if (--i < 0)
+                    throw new TypeError(); // TODO message
+            } while (true);
+        }
+
+        do {
+            if (i in this)
+                result = fun.call(void 0, result, self[i], i, self);
+        } while (i--);
+
+        return result;
+    };
+}
+
+// ES5 15.4.4.14
+// http://es5.github.com/#x15.4.4.14
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
+if (!Array.prototype.indexOf) {
+    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
+        var self = toObject(this),
+            length = self.length >>> 0;
+
+        if (!length)
+            return -1;
+
+        var i = 0;
+        if (arguments.length > 1)
+            i = toInteger(arguments[1]);
+
+        // handle negative indices
+        i = i >= 0 ? i : Math.max(0, length + i);
+        for (; i < length; i++) {
+            if (i in self && self[i] === sought) {
+                return i;
+            }
+        }
+        return -1;
+    };
+}
+
+// ES5 15.4.4.15
+// http://es5.github.com/#x15.4.4.15
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
+if (!Array.prototype.lastIndexOf) {
+    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
+        var self = toObject(this),
+            length = self.length >>> 0;
+
+        if (!length)
+            return -1;
+        var i = length - 1;
+        if (arguments.length > 1)
+            i = Math.min(i, toInteger(arguments[1]));
+        // handle negative indices
+        i = i >= 0 ? i : length - Math.abs(i);
+        for (; i >= 0; i--) {
+            if (i in self && sought === self[i])
+                return i;
+        }
+        return -1;
+    };
+}
+
+//
+// Object
+// ======
+//
+
+// ES5 15.2.3.2
+// http://es5.github.com/#x15.2.3.2
+if (!Object.getPrototypeOf) {
+    // https://github.com/kriskowal/es5-shim/issues#issue/2
+    // http://ejohn.org/blog/objectgetprototypeof/
+    // recommended by fschaefer on github
+    Object.getPrototypeOf = function getPrototypeOf(object) {
+        return object.__proto__ || (
+            object.constructor ?
+            object.constructor.prototype :
+            prototypeOfObject
+        );
+    };
+}
+
+// ES5 15.2.3.3
+// http://es5.github.com/#x15.2.3.3
+if (!Object.getOwnPropertyDescriptor) {
+    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
+                         "non-object: ";
+    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
+        if ((typeof object != "object" && typeof object != "function") || object === null)
+            throw new TypeError(ERR_NON_OBJECT + object);
+        // If object does not owns property return undefined immediately.
+        if (!owns(object, property))
+            return;
+
+        var descriptor, getter, setter;
+
+        // If object has a property then it's for sure both `enumerable` and
+        // `configurable`.
+        descriptor =  { enumerable: true, configurable: true };
+
+        // If JS engine supports accessor properties then property may be a
+        // getter or setter.
+        if (supportsAccessors) {
+            // Unfortunately `__lookupGetter__` will return a getter even
+            // if object has own non getter property along with a same named
+            // inherited getter. To avoid misbehavior we temporary remove
+            // `__proto__` so that `__lookupGetter__` will return getter only
+            // if it's owned by an object.
+            var prototype = object.__proto__;
+            object.__proto__ = prototypeOfObject;
+
+            var getter = lookupGetter(object, property);
+            var setter = lookupSetter(object, property);
+
+            // Once we have getter and setter we can put values back.
+            object.__proto__ = prototype;
+
+            if (getter || setter) {
+                if (getter) descriptor.get = getter;
+                if (setter) descriptor.set = setter;
+
+                // If it was accessor property we're done and return here
+                // in order to avoid adding `value` to the descriptor.
+                return descriptor;
+            }
+        }
+
+        // If we got this far we know that object has an own property that is
+        // not an accessor so we set it as a value and return descriptor.
+        descriptor.value = object[property];
+        return descriptor;
+    };
+}
+
+// ES5 15.2.3.4
+// http://es5.github.com/#x15.2.3.4
+if (!Object.getOwnPropertyNames) {
+    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
+        return Object.keys(object);
+    };
+}
+
+// ES5 15.2.3.5
+// http://es5.github.com/#x15.2.3.5
+if (!Object.create) {
+    Object.create = function create(prototype, properties) {
+        var object;
+        if (prototype === null) {
+            object = { "__proto__": null };
+        } else {
+            if (typeof prototype != "object")
+                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
+            var Type = function () {};
+            Type.prototype = prototype;
+            object = new Type();
+            // IE has no built-in implementation of `Object.getPrototypeOf`
+            // neither `__proto__`, but this manually setting `__proto__` will
+            // guarantee that `Object.getPrototypeOf` will work as expected with
+            // objects created using `Object.create`
+            object.__proto__ = prototype;
+        }
+        if (properties !== void 0)
+            Object.defineProperties(object, properties);
+        return object;
+    };
+}
+
+// ES5 15.2.3.6
+// http://es5.github.com/#x15.2.3.6
+
+// Patch for WebKit and IE8 standard mode
+// Designed by hax <hax.github.com>
+// related issue: https://github.com/kriskowal/es5-shim/issues#issue/5
+// IE8 Reference:
+//     http://msdn.microsoft.com/en-us/library/dd282900.aspx
+//     http://msdn.microsoft.com/en-us/library/dd229916.aspx
+// WebKit Bugs:
+//     https://bugs.webkit.org/show_bug.cgi?id=36423
+
+function doesDefinePropertyWork(object) {
+    try {
+        Object.defineProperty(object, "sentinel", {});
+        return "sentinel" in object;
+    } catch (exception) {
+        // returns falsy
+    }
+}
+
+// check whether defineProperty works if it's given. Otherwise,
+// shim partially.
+if (Object.defineProperty) {
+    var definePropertyWorksOnObject = doesDefinePropertyWork({});
+    var definePropertyWorksOnDom = typeof document == "undefined" ||
+        doesDefinePropertyWork(document.createElement("div"));
+    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
+        var definePropertyFallback = Object.defineProperty;
+    }
+}
+
+if (!Object.defineProperty || definePropertyFallback) {
+    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
+    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
+    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
+                                      "on this javascript engine";
+
+    Object.defineProperty = function defineProperty(object, property, descriptor) {
+        if ((typeof object != "object" && typeof object != "function") || object === null)
+            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
+        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
+            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
+
+        // make a valiant attempt to use the real defineProperty
+        // for I8's DOM elements.
+        if (definePropertyFallback) {
+            try {
+                return definePropertyFallback.call(Object, object, property, descriptor);
+            } catch (exception) {
+                // try the shim if the real one doesn't work
+            }
+        }
+
+        // If it's a data property.
+        if (owns(descriptor, "value")) {
+            // fail silently if "writable", "enumerable", or "configurable"
+            // are requested but not supported
+            /*
+            // alternate approach:
+            if ( // can't implement these features; allow false but not true
+                !(owns(descriptor, "writable") ? descriptor.writable : true) ||
+                !(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
+                !(owns(descriptor, "configurable") ? descriptor.configurable : true)
+            )
+                throw new RangeError(
+                    "This implementation of Object.defineProperty does not " +
+                    "support configurable, enumerable, or writable."
+                );
+            */
+
+            if (supportsAccessors && (lookupGetter(object, property) ||
+                                      lookupSetter(object, property)))
+            {
+                // As accessors are supported only on engines implementing
+                // `__proto__` we can safely override `__proto__` while defining
+                // a property to make sure that we don't hit an inherited
+                // accessor.
+                var prototype = object.__proto__;
+                object.__proto__ = prototypeOfObject;
+                // Deleting a property anyway since getter / setter may be
+                // defined on object itself.
+                delete object[property];
+                object[property] = descriptor.value;
+                // Setting original `__proto__` back now.
+                object.__proto__ = prototype;
+            } else {
+                object[property] = descriptor.value;
+            }
+        } else {
+            if (!supportsAccessors)
+                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
+            // If we got that far then getters and setters can be defined !!
+            if (owns(descriptor, "get"))
+                defineGetter(object, property, descriptor.get);
+            if (owns(descriptor, "set"))
+                defineSetter(object, property, descriptor.set);
+        }
+
+        return object;
+    };
+}
+
+// ES5 15.2.3.7
+// http://es5.github.com/#x15.2.3.7
+if (!Object.defineProperties) {
+    Object.defineProperties = function defineProperties(object, properties) {
+        for (var property in properties) {
+            if (owns(properties, property))
+                Object.defineProperty(object, property, properties[property]);
+        }
+        return object;
+    };
+}
+
+// ES5 15.2.3.8
+// http://es5.github.com/#x15.2.3.8
+if (!Object.seal) {
+    Object.seal = function seal(object) {
+        // this is misleading and breaks feature-detection, but
+        // allows "securable" code to "gracefully" degrade to working
+        // but insecure code.
+        return object;
+    };
+}
+
+// ES5 15.2.3.9
+// http://es5.github.com/#x15.2.3.9
+if (!Object.freeze) {
+    Object.freeze = function freeze(object) {
+        // this is misleading and breaks feature-detection, but
+        // allows "securable" code to "gracefully" degrade to working
+        // but insecure code.
+        return object;
+    };
+}
+
+// detect a Rhino bug and patch it
+try {
+    Object.freeze(function () {});
+} catch (exception) {
+    Object.freeze = (function freeze(freezeObject) {
+        return function freeze(object) {
+            if (typeof object == "function") {
+                return object;
+            } else {
+                return freezeObject(object);
+            }
+        };
+    })(Object.freeze);
+}
+
+// ES5 15.2.3.10
+// http://es5.github.com/#x15.2.3.10
+if (!Object.preventExtensions) {
+    Object.preventExtensions = function preventExtensions(object) {
+        // this is misleading and breaks feature-detection, but
+        // allows "securable" code to "gracefully" degrade to working
+        // but insecure code.
+        return object;
+    };
+}
+
+// ES5 15.2.3.11
+// http://es5.github.com/#x15.2.3.11
+if (!Object.isSealed) {
+    Object.isSealed = function isSealed(object) {
+        return false;
+    };
+}
+
+// ES5 15.2.3.12
+// http://es5.github.com/#x15.2.3.12
+if (!Object.isFrozen) {
+    Object.isFrozen = function isFrozen(object) {
+        return false;
+    };
+}
+
+// ES5 15.2.3.13
+// http://es5.github.com/#x15.2.3.13
+if (!Object.isExtensible) {
+    Object.isExtensible = function isExtensible(object) {
+        // 1. If Type(O) is not Object throw a TypeError exception.
+        if (Object(object) === object) {
+            throw new TypeError(); // TODO message
+        }
+        // 2. Return the Boolean value of the [[Extensible]] internal property of O.
+        var name = '';
+        while (owns(object, name)) {
+            name += '?';
+        }
+        object[name] = true;
+        var returnValue = owns(object, name);
+        delete object[name];
+        return returnValue;
+    };
+}
+
+// ES5 15.2.3.14
+// http://es5.github.com/#x15.2.3.14
+if (!Object.keys) {
+    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
+    var hasDontEnumBug = true,
+        dontEnums = [
+            "toString",
+            "toLocaleString",
+            "valueOf",
+            "hasOwnProperty",
+            "isPrototypeOf",
+            "propertyIsEnumerable",
+            "constructor"
+        ],
+        dontEnumsLength = dontEnums.length;
+
+    for (var key in {"toString": null})
+        hasDontEnumBug = false;
+
+    Object.keys = function keys(object) {
+
+        if ((typeof object != "object" && typeof object != "function") || object === null)
+            throw new TypeError("Object.keys called on a non-object");
+
+        var keys = [];
+        for (var name in object) {
+            if (owns(object, name)) {
+                keys.push(name);
+            }
+        }
+
+        if (hasDontEnumBug) {
+            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
+                var dontEnum = dontEnums[i];
+                if (owns(object, dontEnum)) {
+                    keys.push(dontEnum);
+                }
+            }
+        }
+
+        return keys;
+    };
+
+}
+
+//
+// Date
+// ====
+//
+
+// ES5 15.9.5.43
+// http://es5.github.com/#x15.9.5.43
+// This function returns a String value represent the instance in time 
+// represented by this Date object. The format of the String is the Date Time 
+// string format defined in 15.9.1.15. All fields are present in the String. 
+// The time zone is always UTC, denoted by the suffix Z. If the time value of 
+// this object is not a finite Number a RangeError exception is thrown.
+if (!Date.prototype.toISOString || (new Date(-62198755200000).toISOString().indexOf('-000001') === -1)) {
+    Date.prototype.toISOString = function toISOString() {
+        var result, length, value, year;
+        if (!isFinite(this))
+            throw new RangeError;
+
+        // the date time string format is specified in 15.9.1.15.
+        result = [this.getUTCMonth() + 1, this.getUTCDate(),
+            this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
+        year = this.getUTCFullYear();
+        year = (year < 0 ? '-' : (year > 9999 ? '+' : '')) + ('00000' + Math.abs(year)).slice(0 <= year && year <= 9999 ? -4 : -6);
+
+        length = result.length;
+        while (length--) {
+            value = result[length];
+            // pad months, days, hours, minutes, and seconds to have two digits.
+            if (value < 10)
+                result[length] = "0" + value;
+        }
+        // pad milliseconds to have three digits.
+        return year + "-" + result.slice(0, 2).join("-") + "T" + result.slice(2).join(":") + "." +
+            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z";
+    }
+}
+
+// ES5 15.9.4.4
+// http://es5.github.com/#x15.9.4.4
+if (!Date.now) {
+    Date.now = function now() {
+        return new Date().getTime();
+    };
+}
+
+// ES5 15.9.5.44
+// http://es5.github.com/#x15.9.5.44
+// This function provides a String representation of a Date object for use by 
+// JSON.stringify (15.12.3).
+if (!Date.prototype.toJSON) {
+    Date.prototype.toJSON = function toJSON(key) {
+        // When the toJSON method is called with argument key, the following 
+        // steps are taken:
+
+        // 1.  Let O be the result of calling ToObject, giving it the this
+        // value as its argument.
+        // 2. Let tv be ToPrimitive(O, hint Number).
+        // 3. If tv is a Number and is not finite, return null.
+        // XXX
+        // 4. Let toISO be the result of calling the [[Get]] internal method of
+        // O with argument "toISOString".
+        // 5. If IsCallable(toISO) is false, throw a TypeError exception.
+        if (typeof this.toISOString != "function")
+            throw new TypeError(); // TODO message
+        // 6. Return the result of calling the [[Call]] internal method of
+        //  toISO with O as the this value and an empty argument list.
+        return this.toISOString();
+
+        // NOTE 1 The argument is ignored.
+
+        // NOTE 2 The toJSON function is intentionally generic; it does not
+        // require that its this value be a Date object. Therefore, it can be
+        // transferred to other kinds of objects for use as a method. However,
+        // it does require that any such object have a toISOString method. An
+        // object is free to use the argument key to filter its
+        // stringification.
+    };
+}
+
+// ES5 15.9.4.2
+// http://es5.github.com/#x15.9.4.2
+// based on work shared by Daniel Friesen (dantman)
+// http://gist.github.com/303249
+if (Date.parse("+275760-09-13T00:00:00.000Z") !== 8.64e15) {
+    // XXX global assignment won't work in embeddings that use
+    // an alternate object for the context.
+    Date = (function(NativeDate) {
+
+        // Date.length === 7
+        var Date = function Date(Y, M, D, h, m, s, ms) {
+            var length = arguments.length;
+            if (this instanceof NativeDate) {
+                var date = length == 1 && String(Y) === Y ? // isString(Y)
+                    // We explicitly pass it through parse:
+                    new NativeDate(Date.parse(Y)) :
+                    // We have to manually make calls depending on argument
+                    // length here
+                    length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
+                    length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
+                    length >= 5 ? new NativeDate(Y, M, D, h, m) :
+                    length >= 4 ? new NativeDate(Y, M, D, h) :
+                    length >= 3 ? new NativeDate(Y, M, D) :
+                    length >= 2 ? new NativeDate(Y, M) :
+                    length >= 1 ? new NativeDate(Y) :
+                                  new NativeDate();
+                // Prevent mixups with unfixed Date object
+                date.constructor = Date;
+                return date;
+            }
+            return NativeDate.apply(this, arguments);
+        };
+
+        // 15.9.1.15 Date Time String Format.
+        var isoDateExpression = new RegExp("^" +
+            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign + 6-digit extended year
+            "(?:-(\\d{2})" + // optional month capture
+            "(?:-(\\d{2})" + // optional day capture
+            "(?:" + // capture hours:minutes:seconds.milliseconds
+                "T(\\d{2})" + // hours capture
+                ":(\\d{2})" + // minutes capture
+                "(?:" + // optional :seconds.milliseconds
+                    ":(\\d{2})" + // seconds capture
+                    "(?:\\.(\\d{3}))?" + // milliseconds capture
+                ")?" +
+            "(?:" + // capture UTC offset component
+                "Z|" + // UTC capture
+                "(?:" + // offset specifier +/-hours:minutes
+                    "([-+])" + // sign capture
+                    "(\\d{2})" + // hours offset capture
+                    ":(\\d{2})" + // minutes offset capture
+                ")" +
+            ")?)?)?)?" +
+        "$");
+
+        // Copy any custom methods a 3rd party library may have added
+        for (var key in NativeDate)
+            Date[key] = NativeDate[key];
+
+        // Copy "native" methods explicitly; they may be non-enumerable
+        Date.now = NativeDate.now;
+        Date.UTC = NativeDate.UTC;
+        Date.prototype = NativeDate.prototype;
+        Date.prototype.constructor = Date;
+
+        // Upgrade Date.parse to handle simplified ISO 8601 strings
+        Date.parse = function parse(string) {
+            var match = isoDateExpression.exec(string);
+            if (match) {
+                match.shift(); // kill match[0], the full match
+                // parse months, days, hours, minutes, seconds, and milliseconds
+                for (var i = 1; i < 7; i++) {
+                    // provide default values if necessary
+                    match[i] = +(match[i] || (i < 3 ? 1 : 0));
+                    // match[1] is the month. Months are 0-11 in JavaScript
+                    // `Date` objects, but 1-12 in ISO notation, so we
+                    // decrement.
+                    if (i == 1)
+                        match[i]--;
+                }
+
+                // parse the UTC offset component
+                var minuteOffset = +match.pop(), hourOffset = +match.pop(), sign = match.pop();
+
+                // compute the explicit time zone offset if specified
+                var offset = 0;
+                if (sign) {
+                    // detect invalid offsets and return early
+                    if (hourOffset > 23 || minuteOffset > 59)
+                        return NaN;
+
+                    // express the provided time zone offset in minutes. The offset is
+                    // negative for time zones west of UTC; positive otherwise.
+                    offset = (hourOffset * 60 + minuteOffset) * 6e4 * (sign == "+" ? -1 : 1);
+                }
+
+                // Date.UTC for years between 0 and 99 converts year to 1900 + year
+                // The Gregorian calendar has a 400-year cycle, so 
+                // to Date.UTC(year + 400, .... ) - 12622780800000 == Date.UTC(year, ...),
+                // where 12622780800000 - number of milliseconds in Gregorian calendar 400 years
+                var year = +match[0];
+                if (0 <= year && year <= 99) {
+                    match[0] = year + 400;
+                    return NativeDate.UTC.apply(this, match) + offset - 12622780800000;
+                }
+
+                // compute a new UTC date value, accounting for the optional offset
+                return NativeDate.UTC.apply(this, match) + offset;
+            }
+            return NativeDate.parse.apply(this, arguments);
+        };
+
+        return Date;
+    })(Date);
+}
+
+//
+// String
+// ======
+//
+
+// ES5 15.5.4.20
+// http://es5.github.com/#x15.5.4.20
+var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
+    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
+    "\u2029\uFEFF";
+if (!String.prototype.trim || ws.trim()) {
+    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
+    // http://perfectionkills.com/whitespace-deviations/
+    ws = "[" + ws + "]";
+    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
+        trimEndRegexp = new RegExp(ws + ws + "*$");
+    String.prototype.trim = function trim() {
+        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
+    };
+}
+
+//
+// Util
+// ======
+//
+
+// ES5 9.4
+// http://es5.github.com/#x9.4
+// http://jsperf.com/to-integer
+var toInteger = function (n) {
+    n = +n;
+    if (n !== n) // isNaN
+        n = 0;
+    else if (n !== 0 && n !== (1/0) && n !== -(1/0))
+        n = (n > 0 || -1) * Math.floor(Math.abs(n));
+    return n;
+};
+
+var prepareString = "a"[0] != "a",
+    // ES5 9.9
+    // http://es5.github.com/#x9.9
+    toObject = function (o) {
+        if (o == null) { // this matches both null and undefined
+            throw new TypeError(); // TODO message
+        }
+        // If the implementation doesn't support by-index access of
+        // string characters (ex. IE < 7), split the string
+        if (prepareString && typeof o == "string" && o) {
+            return o.split("");
+        }
+        return Object(o);
+    };
+});/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
+ *      Mike de Boer <mike AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+var EventEmitter = {};
+
+EventEmitter._emit =
+EventEmitter._dispatchEvent = function(eventName, e) {
+    this._eventRegistry = this._eventRegistry || {};
+    this._defaultHandlers = this._defaultHandlers || {};
+
+    var listeners = this._eventRegistry[eventName] || [];
+    var defaultHandler = this._defaultHandlers[eventName];
+    if (!listeners.length && !defaultHandler)
+        return;
+
+    e = e || {};
+    e.type = eventName;
+    
+    if (!e.stopPropagation) {
+        e.stopPropagation = function() {
+            this.propagationStopped = true;
+        };
+    }
+    
+    if (!e.preventDefault) {
+        e.preventDefault = function() {
+            this.defaultPrevented = true;
+        };
+    }
+
+    for (var i=0; i<listeners.length; i++) {
+        listeners[i](e);
+        if (e.propagationStopped)
+            break;
+    }
+    
+    if (defaultHandler && !e.defaultPrevented)
+        defaultHandler(e);
+};
+
+EventEmitter.setDefaultHandler = function(eventName, callback) {
+    this._defaultHandlers = this._defaultHandlers || {};
+    
+    if (this._defaultHandlers[eventName])
+        throw new Error("The default handler for '" + eventName + "' is already set");
+        
+    this._defaultHandlers[eventName] = callback;
+};
+
+EventEmitter.on =
+EventEmitter.addEventListener = function(eventName, callback) {
+    this._eventRegistry = this._eventRegistry || {};
+
+    var listeners = this._eventRegistry[eventName];
+    if (!listeners)
+        var listeners = this._eventRegistry[eventName] = [];
+
+    if (listeners.indexOf(callback) == -1)
+        listeners.push(callback);
+};
+
+EventEmitter.removeListener =
+EventEmitter.removeEventListener = function(eventName, callback) {
+    this._eventRegistry = this._eventRegistry || {};
+
+    var listeners = this._eventRegistry[eventName];
+    if (!listeners)
+        return;
+
+    var index = listeners.indexOf(callback);
+    if (index !== -1)
+        listeners.splice(index, 1);
+};
+
+EventEmitter.removeAllListeners = function(eventName) {
+    if (this._eventRegistry) this._eventRegistry[eventName] = [];
+};
+
+exports.EventEmitter = EventEmitter;
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/lib/oop', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+exports.inherits = (function() {
+    var tempCtor = function() {};
+    return function(ctor, superCtor) {
+        tempCtor.prototype = superCtor.prototype;
+        ctor.super_ = superCtor.prototype;
+        ctor.prototype = new tempCtor();
+        ctor.prototype.constructor = ctor;
+    };
+}());
+
+exports.mixin = function(obj, mixin) {
+    for (var key in mixin) {
+        obj[key] = mixin[key];
+    }
+};
+
+exports.implement = function(proto, mixin) {
+    exports.mixin(proto, mixin);
+};
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+ 
+define('ace/mode/css_worker', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/worker/mirror', 'ace/mode/css/csslint'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var Mirror = require("../worker/mirror").Mirror;
+var CSSLint = require("./css/csslint").CSSLint;
+
+var Worker = exports.Worker = function(sender) {
+    Mirror.call(this, sender);
+    this.setTimeout(200);
+};
+
+oop.inherits(Worker, Mirror);
+
+(function() {
+    
+    this.onUpdate = function() {
+        var value = this.doc.getValue();
+        
+        var result = CSSLint.verify(value);
+        this.sender.emit("csslint", result.messages.map(function(msg) {
+            delete msg.rule;
+            return msg;
+        }));
+    };
+    
+}).call(Worker.prototype);
+
+});define('ace/worker/mirror', ['require', 'exports', 'module' , 'ace/document', 'ace/lib/lang'], function(require, exports, module) {
+"use strict";
+
+var Document = require("../document").Document;
+var lang = require("../lib/lang");
+    
+var Mirror = exports.Mirror = function(sender) {
+    this.sender = sender;
+    var doc = this.doc = new Document("");
+    
+    var deferredUpdate = this.deferredUpdate = lang.deferredCall(this.onUpdate.bind(this));
+    
+    var _self = this;
+    sender.on("change", function(e) {
+        doc.applyDeltas([e.data]);        
+        deferredUpdate.schedule(_self.$timeout);
+    });
+};
+
+(function() {
+    
+    this.$timeout = 500;
+    
+    this.setTimeout = function(timeout) {
+        this.$timeout = timeout;
+    };
+    
+    this.setValue = function(value) {
+        this.doc.setValue(value);
+        this.deferredUpdate.schedule(this.$timeout);
+    };
+    
+    this.getValue = function(callbackId) {
+        this.sender.callback(this.doc.getValue(), callbackId);
+    };
+    
+    this.onUpdate = function() {
+        // abstract method
+    };
+    
+}).call(Mirror.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/range', 'ace/anchor'], function(require, exports, module) {
+"use strict";
+
+var oop = require("./lib/oop");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+var Range = require("./range").Range;
+var Anchor = require("./anchor").Anchor;
+
+var Document = function(text) {
+    this.$lines = [];
+
+    if (Array.isArray(text)) {
+        this.insertLines(0, text);
+    }
+    // There has to be one line at least in the document. If you pass an empty
+    // string to the insert function, nothing will happen. Workaround.
+    else if (text.length == 0) {
+        this.$lines = [""];
+    } else {
+        this.insert({row: 0, column:0}, text);
+    }
+};
+
+(function() {
+
+    oop.implement(this, EventEmitter);
+
+    this.setValue = function(text) {
+        var len = this.getLength();
+        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
+        this.insert({row: 0, column:0}, text);
+    };
+
+    this.getValue = function() {
+        return this.getAllLines().join(this.getNewLineCharacter());
+    };
+
+    this.createAnchor = function(row, column) {
+        return new Anchor(this, row, column);
+    };
+
+    // check for IE split bug
+    if ("aaa".split(/a/).length == 0)
+        this.$split = function(text) {
+            return text.replace(/\r\n|\r/g, "\n").split("\n");
+        }
+    else
+        this.$split = function(text) {
+            return text.split(/\r\n|\r|\n/);
+        };
+
+
+    this.$detectNewLine = function(text) {
+        var match = text.match(/^.*?(\r\n|\r|\n)/m);
+        if (match) {
+            this.$autoNewLine = match[1];
+        } else {
+            this.$autoNewLine = "\n";
+        }
+    };
+
+    this.getNewLineCharacter = function() {
+      switch (this.$newLineMode) {
+          case "windows":
+              return "\r\n";
+
+          case "unix":
+              return "\n";
+
+          case "auto":
+              return this.$autoNewLine;
+      }
+    };
+
+    this.$autoNewLine = "\n";
+    this.$newLineMode = "auto";
+    this.setNewLineMode = function(newLineMode) {
+        if (this.$newLineMode === newLineMode)
+            return;
+
+        this.$newLineMode = newLineMode;
+    };
+
+    this.getNewLineMode = function() {
+        return this.$newLineMode;
+    };
+
+    this.isNewLine = function(text) {
+        return (text == "\r\n" || text == "\r" || text == "\n");
+    };
+
+    /**
+     * Get a verbatim copy of the given line as it is in the document
+     */
+    this.getLine = function(row) {
+        return this.$lines[row] || "";
+    };
+
+    this.getLines = function(firstRow, lastRow) {
+        return this.$lines.slice(firstRow, lastRow + 1);
+    };
+
+    /**
+     * Returns all lines in the document as string array. Warning: The caller
+     * should not modify this array!
+     */
+    this.getAllLines = function() {
+        return this.getLines(0, this.getLength());
+    };
+
+    this.getLength = function() {
+        return this.$lines.length;
+    };
+
+    this.getTextRange = function(range) {
+        if (range.start.row == range.end.row) {
+            return this.$lines[range.start.row].substring(range.start.column,
+                                                         range.end.column);
+        }
+        else {
+            var lines = [];
+            lines.push(this.$lines[range.start.row].substring(range.start.column));
+            lines.push.apply(lines, this.getLines(range.start.row+1, range.end.row-1));
+            lines.push(this.$lines[range.end.row].substring(0, range.end.column));
+            return lines.join(this.getNewLineCharacter());
+        }
+    };
+
+    this.$clipPosition = function(position) {
+        var length = this.getLength();
+        if (position.row >= length) {
+            position.row = Math.max(0, length - 1);
+            position.column = this.getLine(length-1).length;
+        }
+        return position;
+    };
+
+    this.insert = function(position, text) {
+        if (text.length == 0)
+            return position;
+
+        position = this.$clipPosition(position);
+
+        if (this.getLength() <= 1)
+            this.$detectNewLine(text);
+
+        var lines = this.$split(text);
+        var firstLine = lines.splice(0, 1)[0];
+        var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
+
+        position = this.insertInLine(position, firstLine);
+        if (lastLine !== null) {
+            position = this.insertNewLine(position); // terminate first line
+            position = this.insertLines(position.row, lines);
+            position = this.insertInLine(position, lastLine || "");
+        }
+        return position;
+    };
+
+    this.insertLines = function(row, lines) {
+        if (lines.length == 0)
+            return {row: row, column: 0};
+
+        var args = [row, 0];
+        args.push.apply(args, lines);
+        this.$lines.splice.apply(this.$lines, args);
+
+        var range = new Range(row, 0, row + lines.length, 0);
+        var delta = {
+            action: "insertLines",
+            range: range,
+            lines: lines
+        };
+        this._emit("change", { data: delta });
+        return range.end;
+    };
+
+    this.insertNewLine = function(position) {
+        position = this.$clipPosition(position);
+        var line = this.$lines[position.row] || "";
+
+        this.$lines[position.row] = line.substring(0, position.column);
+        this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
+
+        var end = {
+            row : position.row + 1,
+            column : 0
+        };
+
+        var delta = {
+            action: "insertText",
+            range: Range.fromPoints(position, end),
+            text: this.getNewLineCharacter()
+        };
+        this._emit("change", { data: delta });
+
+        return end;
+    };
+
+    this.insertInLine = function(position, text) {
+        if (text.length == 0)
+            return position;
+
+        var line = this.$lines[position.row] || "";
+
+        this.$lines[position.row] = line.substring(0, position.column) + text
+                + line.substring(position.column);
+
+        var end = {
+            row : position.row,
+            column : position.column + text.length
+        };
+
+        var delta = {
+            action: "insertText",
+            range: Range.fromPoints(position, end),
+            text: text
+        };
+        this._emit("change", { data: delta });
+
+        return end;
+    };
+
+    this.remove = function(range) {
+        // clip to document
+        range.start = this.$clipPosition(range.start);
+        range.end = this.$clipPosition(range.end);
+
+        if (range.isEmpty())
+            return range.start;
+
+        var firstRow = range.start.row;
+        var lastRow = range.end.row;
+
+        if (range.isMultiLine()) {
+            var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
+            var lastFullRow = lastRow - 1;
+
+            if (range.end.column > 0)
+                this.removeInLine(lastRow, 0, range.end.column);
+
+            if (lastFullRow >= firstFullRow)
+                this.removeLines(firstFullRow, lastFullRow);
+
+            if (firstFullRow != firstRow) {
+                this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length);
+                this.removeNewLine(range.start.row);
+            }
+        }
+        else {
+            this.removeInLine(firstRow, range.start.column, range.end.column);
+        }
+        return range.start;
+    };
+
+    this.removeInLine = function(row, startColumn, endColumn) {
+        if (startColumn == endColumn)
+            return;
+
+        var range = new Range(row, startColumn, row, endColumn);
+        var line = this.getLine(row);
+        var removed = line.substring(startColumn, endColumn);
+        var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
+        this.$lines.splice(row, 1, newLine);
+
+        var delta = {
+            action: "removeText",
+            range: range,
+            text: removed
+        };
+        this._emit("change", { data: delta });
+        return range.start;
+    };
+
+    /**
+     * Removes a range of full lines
+     *
+     * @param firstRow {Integer} The first row to be removed
+     * @param lastRow {Integer} The last row to be removed
+     * @return {String[]} The removed lines
+     */
+    this.removeLines = function(firstRow, lastRow) {
+        var range = new Range(firstRow, 0, lastRow + 1, 0);
+        var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
+
+        var delta = {
+            action: "removeLines",
+            range: range,
+            nl: this.getNewLineCharacter(),
+            lines: removed
+        };
+        this._emit("change", { data: delta });
+        return removed;
+    };
+
+    this.removeNewLine = function(row) {
+        var firstLine = this.getLine(row);
+        var secondLine = this.getLine(row+1);
+
+        var range = new Range(row, firstLine.length, row+1, 0);
+        var line = firstLine + secondLine;
+
+        this.$lines.splice(row, 2, line);
+
+        var delta = {
+            action: "removeText",
+            range: range,
+            text: this.getNewLineCharacter()
+        };
+        this._emit("change", { data: delta });
+    };
+
+    this.replace = function(range, text) {
+        if (text.length == 0 && range.isEmpty())
+            return range.start;
+
+        // Shortcut: If the text we want to insert is the same as it is already
+        // in the document, we don't have to replace anything.
+        if (text == this.getTextRange(range))
+            return range.end;
+
+        this.remove(range);
+        if (text) {
+            var end = this.insert(range.start, text);
+        }
+        else {
+            end = range.start;
+        }
+
+        return end;
+    };
+
+    this.applyDeltas = function(deltas) {
+        for (var i=0; i<deltas.length; i++) {
+            var delta = deltas[i];
+            var range = Range.fromPoints(delta.range.start, delta.range.end);
+
+            if (delta.action == "insertLines")
+                this.insertLines(range.start.row, delta.lines);
+            else if (delta.action == "insertText")
+                this.insert(range.start, delta.text);
+            else if (delta.action == "removeLines")
+                this.removeLines(range.start.row, range.end.row - 1);
+            else if (delta.action == "removeText")
+                this.remove(range);
+        }
+    };
+
+    this.revertDeltas = function(deltas) {
+        for (var i=deltas.length-1; i>=0; i--) {
+            var delta = deltas[i];
+
+            var range = Range.fromPoints(delta.range.start, delta.range.end);
+
+            if (delta.action == "insertLines")
+                this.removeLines(range.start.row, range.end.row - 1);
+            else if (delta.action == "insertText")
+                this.remove(range);
+            else if (delta.action == "removeLines")
+                this.insertLines(range.start.row, delta.lines);
+            else if (delta.action == "removeText")
+                this.insert(range.start, delta.text);
+        }
+    };
+
+}).call(Document.prototype);
+
+exports.Document = Document;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/range', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+var Range = function(startRow, startColumn, endRow, endColumn) {
+    this.start = {
+        row: startRow,
+        column: startColumn
+    };
+
+    this.end = {
+        row: endRow,
+        column: endColumn
+    };
+};
+
+(function() {
+    this.isEequal = function(range) {
+        return this.start.row == range.start.row &&
+            this.end.row == range.end.row &&
+            this.start.column == range.start.column &&
+            this.end.column == range.end.column
+    };
+
+    this.toString = function() {
+        return ("Range: [" + this.start.row + "/" + this.start.column +
+            "] -> [" + this.end.row + "/" + this.end.column + "]");
+    };
+
+    this.contains = function(row, column) {
+        return this.compare(row, column) == 0;
+    };
+
+    /**
+     * Compares this range (A) with another range (B), where B is the passed in
+     * range.
+     *
+     * Return values:
+     *  -2: (B) is infront of (A) and doesn't intersect with (A)
+     *  -1: (B) begins before (A) but ends inside of (A)
+     *   0: (B) is completly inside of (A) OR (A) is complety inside of (B)
+     *  +1: (B) begins inside of (A) but ends outside of (A)
+     *  +2: (B) is after (A) and doesn't intersect with (A)
+     *
+     *  42: FTW state: (B) ends in (A) but starts outside of (A)
+     */
+    this.compareRange = function(range) {
+        var cmp,
+            end = range.end,
+            start = range.start;
+
+        cmp = this.compare(end.row, end.column);
+        if (cmp == 1) {
+            cmp = this.compare(start.row, start.column);
+            if (cmp == 1) {
+                return 2;
+            } else if (cmp == 0) {
+                return 1;
+            } else {
+                return 0;
+            }
+        } else if (cmp == -1) {
+            return -2;
+        } else {
+            cmp = this.compare(start.row, start.column);
+            if (cmp == -1) {
+                return -1;
+            } else if (cmp == 1) {
+                return 42;
+            } else {
+                return 0;
+            }
+        }
+    }
+
+    this.comparePoint = function(p) {
+        return this.compare(p.row, p.column);
+    }
+
+    this.containsRange = function(range) {
+        return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
+    }
+
+    this.isEnd = function(row, column) {
+        return this.end.row == row && this.end.column == column;
+    }
+
+    this.isStart = function(row, column) {
+        return this.start.row == row && this.start.column == column;
+    }
+
+    this.setStart = function(row, column) {
+        if (typeof row == "object") {
+            this.start.column = row.column;
+            this.start.row = row.row;
+        } else {
+            this.start.row = row;
+            this.start.column = column;
+        }
+    }
+
+    this.setEnd = function(row, column) {
+        if (typeof row == "object") {
+            this.end.column = row.column;
+            this.end.row = row.row;
+        } else {
+            this.end.row = row;
+            this.end.column = column;
+        }
+    }
+
+    this.inside = function(row, column) {
+        if (this.compare(row, column) == 0) {
+            if (this.isEnd(row, column) || this.isStart(row, column)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    this.insideStart = function(row, column) {
+        if (this.compare(row, column) == 0) {
+            if (this.isEnd(row, column)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    this.insideEnd = function(row, column) {
+        if (this.compare(row, column) == 0) {
+            if (this.isStart(row, column)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    this.compare = function(row, column) {
+        if (!this.isMultiLine()) {
+            if (row === this.start.row) {
+                return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0);
+            };
+        }
+
+        if (row < this.start.row)
+            return -1;
+
+        if (row > this.end.row)
+            return 1;
+
+        if (this.start.row === row)
+            return column >= this.start.column ? 0 : -1;
+
+        if (this.end.row === row)
+            return column <= this.end.column ? 0 : 1;
+
+        return 0;
+    };
+
+    /**
+     * Like .compare(), but if isStart is true, return -1;
+     */
+    this.compareStart = function(row, column) {
+        if (this.start.row == row && this.start.column == column) {
+            return -1;
+        } else {
+            return this.compare(row, column);
+        }
+    }
+
+    /**
+     * Like .compare(), but if isEnd is true, return 1;
+     */
+    this.compareEnd = function(row, column) {
+        if (this.end.row == row && this.end.column == column) {
+            return 1;
+        } else {
+            return this.compare(row, column);
+        }
+    }
+
+    this.compareInside = function(row, column) {
+        if (this.end.row == row && this.end.column == column) {
+            return 1;
+        } else if (this.start.row == row && this.start.column == column) {
+            return -1;
+        } else {
+            return this.compare(row, column);
+        }
+    }
+
+    this.clipRows = function(firstRow, lastRow) {
+        if (this.end.row > lastRow) {
+            var end = {
+                row: lastRow+1,
+                column: 0
+            };
+        }
+
+        if (this.start.row > lastRow) {
+            var start = {
+                row: lastRow+1,
+                column: 0
+            };
+        }
+
+        if (this.start.row < firstRow) {
+            var start = {
+                row: firstRow,
+                column: 0
+            };
+        }
+
+        if (this.end.row < firstRow) {
+            var end = {
+                row: firstRow,
+                column: 0
+            };
+        }
+        return Range.fromPoints(start || this.start, end || this.end);
+    };
+
+    this.extend = function(row, column) {
+        var cmp = this.compare(row, column);
+
+        if (cmp == 0)
+            return this;
+        else if (cmp == -1)
+            var start = {row: row, column: column};
+        else
+            var end = {row: row, column: column};
+
+        return Range.fromPoints(start || this.start, end || this.end);
+    };
+
+    this.isEmpty = function() {
+        return (this.start.row == this.end.row && this.start.column == this.end.column);
+    };
+
+    this.isMultiLine = function() {
+        return (this.start.row !== this.end.row);
+    };
+
+    this.clone = function() {
+        return Range.fromPoints(this.start, this.end);
+    };
+
+    this.collapseRows = function() {
+        if (this.end.column == 0)
+            return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0)
+        else
+            return new Range(this.start.row, 0, this.end.row, 0)
+    };
+
+    this.toScreenRange = function(session) {
+        var screenPosStart =
+            session.documentToScreenPosition(this.start);
+        var screenPosEnd =
+            session.documentToScreenPosition(this.end);
+
+        return new Range(
+            screenPosStart.row, screenPosStart.column,
+            screenPosEnd.row, screenPosEnd.column
+        );
+    };
+
+}).call(Range.prototype);
+
+
+Range.fromPoints = function(start, end) {
+    return new Range(start.row, start.column, end.row, end.column);
+};
+
+exports.Range = Range;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("./lib/oop");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+
+/**
+ * An Anchor is a floating pointer in the document. Whenever text is inserted or
+ * deleted before the cursor, the position of the cursor is updated
+ */
+var Anchor = exports.Anchor = function(doc, row, column) {
+    this.document = doc;
+    
+    if (typeof column == "undefined")
+        this.setPosition(row.row, row.column);
+    else
+        this.setPosition(row, column);
+
+    this.$onChange = this.onChange.bind(this);
+    doc.on("change", this.$onChange);
+};
+
+(function() {
+
+    oop.implement(this, EventEmitter);
+    
+    this.getPosition = function() {
+        return this.$clipPositionToDocument(this.row, this.column);
+    };
+    
+    this.getDocument = function() {
+        return this.document;
+    };
+    
+    this.onChange = function(e) {
+        var delta = e.data;
+        var range = delta.range;
+            
+        if (range.start.row == range.end.row && range.start.row != this.row)
+            return;
+            
+        if (range.start.row > this.row)
+            return;
+            
+        if (range.start.row == this.row && range.start.column > this.column)
+            return;
+    
+        var row = this.row;
+        var column = this.column;
+        
+        if (delta.action === "insertText") {
+            if (range.start.row === row && range.start.column <= column) {
+                if (range.start.row === range.end.row) {
+                    column += range.end.column - range.start.column;
+                }
+                else {
+                    column -= range.start.column;
+                    row += range.end.row - range.start.row;
+                }
+            }
+            else if (range.start.row !== range.end.row && range.start.row < row) {
+                row += range.end.row - range.start.row;
+            }
+        } else if (delta.action === "insertLines") {
+            if (range.start.row <= row) {
+                row += range.end.row - range.start.row;
+            }
+        }
+        else if (delta.action == "removeText") {
+            if (range.start.row == row && range.start.column < column) {
+                if (range.end.column >= column)
+                    column = range.start.column;
+                else
+                    column = Math.max(0, column - (range.end.column - range.start.column));
+                
+            } else if (range.start.row !== range.end.row && range.start.row < row) {
+                if (range.end.row == row) {
+                    column = Math.max(0, column - range.end.column) + range.start.column;
+                }
+                row -= (range.end.row - range.start.row);
+            }
+            else if (range.end.row == row) {
+                row -= range.end.row - range.start.row;
+                column = Math.max(0, column - range.end.column) + range.start.column;
+            }
+        } else if (delta.action == "removeLines") {
+            if (range.start.row <= row) {
+                if (range.end.row <= row)
+                    row -= range.end.row - range.start.row;
+                else {
+                    row = range.start.row;
+                    column = 0;
+                }
+            }
+        }
+
+        this.setPosition(row, column, true);
+    };
+
+    this.setPosition = function(row, column, noClip) {
+        var pos;
+        if (noClip) {
+            pos = {
+                row: row,
+                column: column
+            };
+        }
+        else {
+            pos = this.$clipPositionToDocument(row, column);
+        }
+        
+        if (this.row == pos.row && this.column == pos.column)
+            return;
+            
+        var old = {
+            row: this.row,
+            column: this.column
+        };
+        
+        this.row = pos.row;
+        this.column = pos.column;
+        this._emit("change", {
+            old: old,
+            value: pos
+        });
+    };
+    
+    this.detach = function() {
+        this.document.removeEventListener("change", this.$onChange);
+    };
+    
+    this.$clipPositionToDocument = function(row, column) {
+        var pos = {};
+    
+        if (row >= this.document.getLength()) {
+            pos.row = Math.max(0, this.document.getLength() - 1);
+            pos.column = this.document.getLine(pos.row).length;
+        }
+        else if (row < 0) {
+            pos.row = 0;
+            pos.column = 0;
+        }
+        else {
+            pos.row = row;
+            pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
+        }
+        
+        if (column < 0)
+            pos.column = 0;
+            
+        return pos;
+    };
+    
+}).call(Anchor.prototype);
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/lib/lang', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+exports.stringReverse = function(string) {
+    return string.split("").reverse().join("");
+};
+
+exports.stringRepeat = function (string, count) {
+     return new Array(count + 1).join(string);
+};
+
+var trimBeginRegexp = /^\s\s*/;
+var trimEndRegexp = /\s\s*$/;
+
+exports.stringTrimLeft = function (string) {
+    return string.replace(trimBeginRegexp, '');
+};
+
+exports.stringTrimRight = function (string) {
+    return string.replace(trimEndRegexp, '');
+};
+
+exports.copyObject = function(obj) {
+    var copy = {};
+    for (var key in obj) {
+        copy[key] = obj[key];
+    }
+    return copy;
+};
+
+exports.copyArray = function(array){
+    var copy = [];
+    for (var i=0, l=array.length; i<l; i++) {
+        if (array[i] && typeof array[i] == "object")
+            copy[i] = this.copyObject( array[i] );
+        else 
+            copy[i] = array[i];
+    }
+    return copy;
+};
+
+exports.deepCopy = function (obj) {
+    if (typeof obj != "object") {
+        return obj;
+    }
+    
+    var copy = obj.constructor();
+    for (var key in obj) {
+        if (typeof obj[key] == "object") {
+            copy[key] = this.deepCopy(obj[key]);
+        } else {
+            copy[key] = obj[key];
+        }
+    }
+    return copy;
+};
+
+exports.arrayToMap = function(arr) {
+    var map = {};
+    for (var i=0; i<arr.length; i++) {
+        map[arr[i]] = 1;
+    }
+    return map;
+
+};
+
+/**
+ * splice out of 'array' anything that === 'value'
+ */
+exports.arrayRemove = function(array, value) {
+  for (var i = 0; i <= array.length; i++) {
+    if (value === array[i]) {
+      array.splice(i, 1);
+    }
+  }
+};
+
+exports.escapeRegExp = function(str) {
+    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
+};
+
+exports.deferredCall = function(fcn) {
+
+    var timer = null;
+    var callback = function() {
+        timer = null;
+        fcn();
+    };
+
+    var deferred = function(timeout) {
+        deferred.cancel();
+        timer = setTimeout(callback, timeout || 0);
+        return deferred;
+    };
+
+    deferred.schedule = deferred;
+
+    deferred.call = function() {
+        this.cancel();
+        fcn();
+        return deferred;
+    };
+
+    deferred.cancel = function() {
+        clearTimeout(timer);
+        timer = null;
+        return deferred;
+    };
+
+    return deferred;
+};
+
+});
+/* 
+CSSLint
+Copyright (c) 2011 Nicole Sullivan and Nicholas C. Zakas. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+define('ace/mode/css/csslint', ['require', 'exports', 'module' ], function(require, exports, module) {
+/*!
+Parser-Lib
+Copyright (c) 2009-2011 Nicholas C. Zakas. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+/* Build time: 13-July-2011 04:35:28 */
+var parserlib = {};
+(function(){
+
+/**
+ * A generic base to inherit from for any object
+ * that needs event handling.
+ * @class EventTarget
+ * @constructor
+ */
+function EventTarget(){
+
+    /**
+     * The array of listeners for various events.
+     * @type Object
+     * @property _listeners
+     * @private
+     */
+    this._listeners = {};    
+}
+
+EventTarget.prototype = {
+
+    //restore constructor
+    constructor: EventTarget,
+
+    /**
+     * Adds a listener for a given event type.
+     * @param {String} type The type of event to add a listener for.
+     * @param {Function} listener The function to call when the event occurs.
+     * @return {void}
+     * @method addListener
+     */
+    addListener: function(type, listener){
+        if (!this._listeners[type]){
+            this._listeners[type] = [];
+        }
+
+        this._listeners[type].push(listener);
+    },
+    
+    /**
+     * Fires an event based on the passed-in object.
+     * @param {Object|String} event An object with at least a 'type' attribute
+     *      or a string indicating the event name.
+     * @return {void}
+     * @method fire
+     */    
+    fire: function(event){
+        if (typeof event == "string"){
+            event = { type: event };
+        }
+        if (!event.target){
+            event.target = this;
+        }
+        
+        if (!event.type){
+            throw new Error("Event object missing 'type' property.");
+        }
+        
+        if (this._listeners[event.type]){
+        
+            //create a copy of the array and use that so listeners can't chane
+            var listeners = this._listeners[event.type].concat();
+            for (var i=0, len=listeners.length; i < len; i++){
+                listeners[i].call(this, event);
+            }
+        }            
+    },
+
+    /**
+     * Removes a listener for a given event type.
+     * @param {String} type The type of event to remove a listener from.
+     * @param {Function} listener The function to remove from the event.
+     * @return {void}
+     * @method removeListener
+     */
+    removeListener: function(type, listener){
+        if (this._listeners[type]){
+            var listeners = this._listeners[type];
+            for (var i=0, len=listeners.length; i < len; i++){
+                if (listeners[i] === listener){
+                    listeners.splice(i, 1);
+                    break;
+                }
+            }
+            
+            
+        }            
+    }
+};
+/**
+ * Convenient way to read through strings.
+ * @namespace parserlib.util
+ * @class StringReader
+ * @constructor
+ * @param {String} text The text to read.
+ */
+function StringReader(text){
+
+    /**
+     * The input text with line endings normalized.
+     * @property _input
+     * @type String
+     * @private
+     */
+    this._input = text.replace(/\n\r?/g, "\n");
+
+
+    /**
+     * The row for the character to be read next.
+     * @property _line
+     * @type int
+     * @private
+     */
+    this._line = 1;
+
+
+    /**
+     * The column for the character to be read next.
+     * @property _col
+     * @type int
+     * @private
+     */
+    this._col = 1;
+
+    /**
+     * The index of the character in the input to be read next.
+     * @property _cursor
+     * @type int
+     * @private
+     */
+    this._cursor = 0;
+}
+
+StringReader.prototype = {
+
+    //restore constructor
+    constructor: StringReader,
+
+    //-------------------------------------------------------------------------
+    // Position info
+    //-------------------------------------------------------------------------
+
+    /**
+     * Returns the column of the character to be read next.
+     * @return {int} The column of the character to be read next.
+     * @method getCol
+     */
+    getCol: function(){
+        return this._col;
+    },
+
+    /**
+     * Returns the row of the character to be read next.
+     * @return {int} The row of the character to be read next.
+     * @method getLine
+     */
+    getLine: function(){
+        return this._line ;
+    },
+
+    /**
+     * Determines if you're at the end of the input.
+     * @return {Boolean} True if there's no more input, false otherwise.
+     * @method eof
+     */
+    eof: function(){
+        return (this._cursor == this._input.length);
+    },
+
+    //-------------------------------------------------------------------------
+    // Basic reading
+    //-------------------------------------------------------------------------
+
+    /**
+     * Reads the next character without advancing the cursor.
+     * @param {int} count How many characters to look ahead (default is 1).
+     * @return {String} The next character or null if there is no next character.
+     * @method peek
+     */
+    peek: function(count){
+        var c = null;
+        count = (typeof count == "undefined" ? 1 : count);
+
+        //if we're not at the end of the input...
+        if (this._cursor < this._input.length){
+
+            //get character and increment cursor and column
+            c = this._input.charAt(this._cursor + count - 1);
+        }
+
+        return c;
+    },
+
+    /**
+     * Reads the next character from the input and adjusts the row and column
+     * accordingly.
+     * @return {String} The next character or null if there is no next character.
+     * @method read
+     */
+    read: function(){
+        var c = null;
+
+        //if we're not at the end of the input...
+        if (this._cursor < this._input.length){
+
+            //if the last character was a newline, increment row count
+            //and reset column count
+            if (this._input.charAt(this._cursor) == "\n"){
+                this._line++;
+                this._col=1;
+            } else {
+                this._col++;
+            }
+
+            //get character and increment cursor and column
+            c = this._input.charAt(this._cursor++);
+        }
+
+        return c;
+    },
+
+    //-------------------------------------------------------------------------
+    // Misc
+    //-------------------------------------------------------------------------
+
+    /**
+     * Saves the current location so it can be returned to later.
+     * @method mark
+     * @return {void}
+     */
+    mark: function(){
+        this._bookmark = {
+            cursor: this._cursor,
+            line:   this._line,
+            col:    this._col
+        };
+    },
+
+    reset: function(){
+        if (this._bookmark){
+            this._cursor = this._bookmark.cursor;
+            this._line = this._bookmark.line;
+            this._col = this._bookmark.col;
+            delete this._bookmark;
+        }
+    },
+
+    //-------------------------------------------------------------------------
+    // Advanced reading
+    //-------------------------------------------------------------------------
+
+    /**
+     * Reads up to and including the given string. Throws an error if that
+     * string is not found.
+     * @param {String} pattern The string to read.
+     * @return {String} The string when it is found.
+     * @throws Error when the string pattern is not found.
+     * @method readTo
+     */
+    readTo: function(pattern){
+
+        var buffer = "",
+            c;
+
+        /*
+         * First, buffer must be the same length as the pattern.
+         * Then, buffer must end with the pattern or else reach the
+         * end of the input.
+         */
+        while (buffer.length < pattern.length || buffer.lastIndexOf(pattern) != buffer.length - pattern.length){
+            c = this.read();
+            if (c){
+                buffer += c;
+            } else {
+                throw new Error("Expected \"" + pattern + "\" at line " + this._line  + ", col " + this._col + ".");
+            }
+        }
+
+        return buffer;
+
+    },
+
+    /**
+     * Reads characters while each character causes the given
+     * filter function to return true. The function is passed
+     * in each character and either returns true to continue
+     * reading or false to stop.
+     * @param {Function} filter The function to read on each character.
+     * @return {String} The string made up of all characters that passed the
+     *      filter check.
+     * @method readWhile
+     */
+    readWhile: function(filter){
+
+        var buffer = "",
+            c = this.read();
+
+        while(c !== null && filter(c)){
+            buffer += c;
+            c = this.read();
+        }
+
+        return buffer;
+
+    },
+
+    /**
+     * Reads characters that match either text or a regular expression and
+     * returns those characters. If a match is found, the row and column
+     * are adjusted; if no match is found, the reader's state is unchanged.
+     * reading or false to stop.
+     * @param {String|RegExp} matchter If a string, then the literal string
+     *      value is searched for. If a regular expression, then any string
+     *      matching the pattern is search for.
+     * @return {String} The string made up of all characters that matched or
+     *      null if there was no match.
+     * @method readMatch
+     */
+    readMatch: function(matcher){
+
+        var source = this._input.substring(this._cursor),
+            value = null;
+
+        //if it's a string, just do a straight match
+        if (typeof matcher == "string"){
+            if (source.indexOf(matcher) === 0){
+                value = this.readCount(matcher.length);
+            }
+        } else if (matcher instanceof RegExp){
+            if (matcher.test(source)){
+                value = this.readCount(RegExp.lastMatch.length);
+            }
+        }
+
+        return value;
+    },
+
+
+    /**
+     * Reads a given number of characters. If the end of the input is reached,
+     * it reads only the remaining characters and does not throw an error.
+     * @param {int} count The number of characters to read.
+     * @return {String} The string made up the read characters.
+     * @method readCount
+     */
+    readCount: function(count){
+        var buffer = "";
+
+        while(count--){
+            buffer += this.read();
+        }
+
+        return buffer;
+    }
+
+};
+/**
+ * Type to use when a syntax error occurs.
+ * @class SyntaxError
+ * @namespace parserlib.util
+ * @constructor
+ * @param {String} message The error message.
+ * @param {int} line The line at which the error occurred.
+ * @param {int} col The column at which the error occurred.
+ */
+function SyntaxError(message, line, col){
+
+    /**
+     * The column at which the error occurred.
+     * @type int
+     * @property col
+     */
+    this.col = col;
+
+    /**
+     * The line at which the error occurred.
+     * @type int
+     * @property line
+     */
+    this.line = line;
+
+    /**
+     * The text representation of the unit.
+     * @type String
+     * @property text
+     */
+    this.message = message;
+
+}
+
+//inherit from Error
+SyntaxError.prototype = new Error();
+/**
+ * Base type to represent a single syntactic unit.
+ * @class SyntaxUnit
+ * @namespace parserlib.util
+ * @constructor
+ * @param {String} text The text of the unit.
+ * @param {int} line The line of text on which the unit resides.
+ * @param {int} col The column of text on which the unit resides.
+ */
+function SyntaxUnit(text, line, col){
+
+
+    /**
+     * The column of text on which the unit resides.
+     * @type int
+     * @property col
+     */
+    this.col = col;
+
+    /**
+     * The line of text on which the unit resides.
+     * @type int
+     * @property line
+     */
+    this.line = line;
+
+    /**
+     * The text representation of the unit.
+     * @type String
+     * @property text
+     */
+    this.text = text;
+
+}
+
+/**
+ * Create a new syntax unit based solely on the given token.
+ * Convenience method for creating a new syntax unit when
+ * it represents a single token instead of multiple.
+ * @param {Object} token The token object to represent.
+ * @return {parserlib.util.SyntaxUnit} The object representing the token.
+ * @static
+ * @method fromToken
+ */
+SyntaxUnit.fromToken = function(token){
+    return new SyntaxUnit(token.value, token.startLine, token.startCol);
+};
+
+SyntaxUnit.prototype = {
+
+    //restore constructor
+    constructor: SyntaxUnit,
+    
+    /**
+     * Returns the text representation of the unit.
+     * @return {String} The text representation of the unit.
+     * @method valueOf
+     */
+    valueOf: function(){
+        return this.toString();
+    },
+    
+    /**
+     * Returns the text representation of the unit.
+     * @return {String} The text representation of the unit.
+     * @method toString
+     */
+    toString: function(){
+        return this.text;
+    }
+
+};
+/**
+ * Generic TokenStream providing base functionality.
+ * @class TokenStreamBase
+ * @namespace parserlib.util
+ * @constructor
+ * @param {String|StringReader} input The text to tokenize or a reader from 
+ *      which to read the input.
+ */
+function TokenStreamBase(input, tokenData){
+
+    /**
+     * The string reader for easy access to the text.
+     * @type StringReader
+     * @property _reader
+     * @private
+     */
+    //this._reader = (typeof input == "string") ? new StringReader(input) : input;
+    this._reader = input ? new StringReader(input.toString()) : null;
+    
+    /**
+     * Token object for the last consumed token.
+     * @type Token
+     * @property _token
+     * @private
+     */
+    this._token = null;    
+    
+    /**
+     * The array of token information.
+     * @type Array
+     * @property _tokenData
+     * @private
+     */
+    this._tokenData = tokenData;
+    
+    /**
+     * Lookahead token buffer.
+     * @type Array
+     * @property _lt
+     * @private
+     */
+    this._lt = [];
+    
+    /**
+     * Lookahead token buffer index.
+     * @type int
+     * @property _ltIndex
+     * @private
+     */
+    this._ltIndex = 0;
+    
+    this._ltIndexCache = [];
+}
+
+/**
+ * Accepts an array of token information and outputs
+ * an array of token data containing key-value mappings
+ * and matching functions that the TokenStream needs.
+ * @param {Array} tokens An array of token descriptors.
+ * @return {Array} An array of processed token data.
+ * @method createTokenData
+ * @static
+ */
+TokenStreamBase.createTokenData = function(tokens){
+
+    var nameMap 	= [],
+        typeMap 	= {},
+		tokenData 	= tokens.concat([]),
+		i			= 0,
+		len			= tokenData.length+1;
+    
+    tokenData.UNKNOWN = -1;
+	tokenData.unshift({name:"EOF"});
+
+    for (; i < len; i++){
+        nameMap.push(tokenData[i].name);
+        tokenData[tokenData[i].name] = i;
+        if (tokenData[i].text){
+            typeMap[tokenData[i].text] = i;
+        }
+    }
+    
+    tokenData.name = function(tt){
+        return nameMap[tt];
+    };
+    
+    tokenData.type = function(c){
+        return typeMap[c];
+    };
+	
+	return tokenData;
+};
+
+TokenStreamBase.prototype = {
+
+    //restore constructor
+    constructor: TokenStreamBase,    
+    
+    //-------------------------------------------------------------------------
+    // Matching methods
+    //-------------------------------------------------------------------------
+    
+    /**
+     * Determines if the next token matches the given token type.
+     * If so, that token is consumed; if not, the token is placed
+     * back onto the token stream. You can pass in any number of
+     * token types and this will return true if any of the token
+     * types is found.
+     * @param {int|int[]} tokenTypes Either a single token type or an array of
+     *      token types that the next token might be. If an array is passed,
+     *      it's assumed that the token can be any of these.
+     * @param {variant} channel (Optional) The channel to read from. If not
+     *      provided, reads from the default (unnamed) channel.
+     * @return {Boolean} True if the token type matches, false if not.
+     * @method match
+     */
+    match: function(tokenTypes, channel){
+    
+        //always convert to an array, makes things easier
+        if (!(tokenTypes instanceof Array)){
+            tokenTypes = [tokenTypes];
+        }
+                
+        var tt  = this.get(channel),
+            i   = 0,
+            len = tokenTypes.length;
+            
+        while(i < len){
+            if (tt == tokenTypes[i++]){
+                return true;
+            }
+        }
+        
+        //no match found, put the token back
+        this.unget();
+        return false;
+    },    
+    
+    /**
+     * Determines if the next token matches the given token type.
+     * If so, that token is consumed; if not, an error is thrown.
+     * @param {int|int[]} tokenTypes Either a single token type or an array of
+     *      token types that the next token should be. If an array is passed,
+     *      it's assumed that the token must be one of these.
+     * @param {variant} channel (Optional) The channel to read from. If not
+     *      provided, reads from the default (unnamed) channel.
+     * @return {void}
+     * @method mustMatch
+     */    
+    mustMatch: function(tokenTypes, channel){
+
+        //always convert to an array, makes things easier
+        if (!(tokenTypes instanceof Array)){
+            tokenTypes = [tokenTypes];
+        }
+
+        if (!this.match.apply(this, arguments)){    
+            token = this.LT(1);
+            throw new SyntaxError("Expected " + this._tokenData[tokenTypes[0]].name + 
+                " at line " + token.startLine + ", col " + token.startCol + ".", token.startLine, token.startCol);
+        }
+    },
+    
+    //-------------------------------------------------------------------------
+    // Consuming methods
+    //-------------------------------------------------------------------------
+    
+    /**
+     * Keeps reading from the token stream until either one of the specified
+     * token types is found or until the end of the input is reached.
+     * @param {int|int[]} tokenTypes Either a single token type or an array of
+     *      token types that the next token should be. If an array is passed,
+     *      it's assumed that the token must be one of these.
+     * @param {variant} channel (Optional) The channel to read from. If not
+     *      provided, reads from the default (unnamed) channel.
+     * @return {void}
+     * @method advance
+     */
+    advance: function(tokenTypes, channel){
+        
+        while(this.LA(0) != 0 && !this.match(tokenTypes, channel)){
+            this.get();
+        }
+
+        return this.LA(0);    
+    },
+    
+    /**
+     * Consumes the next token from the token stream. 
+     * @return {int} The token type of the token that was just consumed.
+     * @method get
+     */      
+    get: function(channel){
+    
+        var tokenInfo   = this._tokenData,
+            reader      = this._reader,
+            value,
+            i           =0,
+            len         = tokenInfo.length,
+            found       = false,
+            token,
+            info;
+            
+        //check the lookahead buffer first
+        if (this._lt.length && this._ltIndex >= 0 && this._ltIndex < this._lt.length){  
+                           
+            i++;
+            this._token = this._lt[this._ltIndex++];
+            info = tokenInfo[this._token.type];
+            
+            //obey channels logic
+            while((info.channel !== undefined && channel !== info.channel) &&
+                    this._ltIndex < this._lt.length){
+                this._token = this._lt[this._ltIndex++];
+                info = tokenInfo[this._token.type];
+                i++;
+            }
+            
+            //here be dragons
+            if ((info.channel === undefined || channel === info.channel) &&
+                    this._ltIndex <= this._lt.length){
+                this._ltIndexCache.push(i);
+                return this._token.type;
+            }
+        }
+        
+        //call token retriever method
+		token = this._getToken();
+
+        //if it should be hidden, don't save a token
+        if (token.type > -1 && !tokenInfo[token.type].hide){
+                     
+            //apply token channel
+            token.channel = tokenInfo[token.type].channel;
+         
+            //save for later
+            this._token = token;
+            this._lt.push(token);
+
+            //save space that will be moved (must be done before array is truncated)
+            this._ltIndexCache.push(this._lt.length - this._ltIndex + i);  
+        
+            //keep the buffer under 5 items
+            if (this._lt.length > 5){
+                this._lt.shift();                
+            }
+            
+            //also keep the shift buffer under 5 items
+            if (this._ltIndexCache.length > 5){
+                this._ltIndexCache.shift();
+            }
+                
+            //update lookahead index
+            this._ltIndex = this._lt.length;
+        }
+            
+        /*
+         * Skip to the next token if:
+         * 1. The token type is marked as hidden.
+         * 2. The token type has a channel specified and it isn't the current channel.
+         */
+        info = tokenInfo[token.type];
+        if (info && 
+                (info.hide || 
+                (info.channel !== undefined && channel !== info.channel))){
+            return this.get(channel);
+        } else {
+            //return just the type
+            return token.type;
+        }
+    },
+    
+    /**
+     * Looks ahead a certain number of tokens and returns the token type at
+     * that position. This will throw an error if you lookahead past the
+     * end of input, past the size of the lookahead buffer, or back past
+     * the first token in the lookahead buffer.
+     * @param {int} The index of the token type to retrieve. 0 for the
+     *      current token, 1 for the next, -1 for the previous, etc.
+     * @return {int} The token type of the token in the given position.
+     * @method LA
+     */
+    LA: function(index){
+        var total = index,
+            tt;
+        if (index > 0){
+            //TODO: Store 5 somewhere
+            if (index > 5){
+                throw new Error("Too much lookahead.");
+            }
+        
+            //get all those tokens
+            while(total){
+                tt = this.get();   
+                total--;                            
+            }
+            
+            //unget all those tokens
+            while(total < index){
+                this.unget();
+                total++;
+            }
+        } else if (index < 0){
+        
+            if(this._lt[this._ltIndex+index]){
+                tt = this._lt[this._ltIndex+index].type;
+            } else {
+                throw new Error("Too much lookbehind.");
+            }
+        
+        } else {
+            tt = this._token.type;
+        }
+        
+        return tt;
+    
+    },
+    
+    /**
+     * Looks ahead a certain number of tokens and returns the token at
+     * that position. This will throw an error if you lookahead past the
+     * end of input, past the size of the lookahead buffer, or back past
+     * the first token in the lookahead buffer.
+     * @param {int} The index of the token type to retrieve. 0 for the
+     *      current token, 1 for the next, -1 for the previous, etc.
+     * @return {Object} The token of the token in the given position.
+     * @method LA
+     */    
+    LT: function(index){
+    
+        //lookahead first to prime the token buffer
+        this.LA(index);
+        
+        //now find the token, subtract one because _ltIndex is already at the next index
+        return this._lt[this._ltIndex+index-1];    
+    },
+    
+    /**
+     * Returns the token type for the next token in the stream without 
+     * consuming it.
+     * @return {int} The token type of the next token in the stream.
+     * @method peek
+     */
+    peek: function(){
+        return this.LA(1);
+    },
+    
+    /**
+     * Returns the actual token object for the last consumed token.
+     * @return {Token} The token object for the last consumed token.
+     * @method token
+     */
+    token: function(){
+        return this._token;
+    },
+    
+    /**
+     * Returns the name of the token for the given token type.
+     * @param {int} tokenType The type of token to get the name of.
+     * @return {String} The name of the token or "UNKNOWN_TOKEN" for any
+     *      invalid token type.
+     * @method tokenName
+     */
+    tokenName: function(tokenType){
+        if (tokenType < 0 || tokenType > this._tokenData.length){
+            return "UNKNOWN_TOKEN";
+        } else {
+            return this._tokenData[tokenType].name;
+        }
+    },
+    
+    /**
+     * Returns the token type value for the given token name.
+     * @param {String} tokenName The name of the token whose value should be returned.
+     * @return {int} The token type value for the given token name or -1
+     *      for an unknown token.
+     * @method tokenName
+     */    
+    tokenType: function(tokenName){
+        return this._tokenData[tokenName] || -1;
+    },
+    
+    /**
+     * Returns the last consumed token to the token stream.
+     * @method unget
+     */      
+    unget: function(){
+        //if (this._ltIndex > -1){
+        if (this._ltIndexCache.length){
+            this._ltIndex -= this._ltIndexCache.pop();//--;
+            this._token = this._lt[this._ltIndex - 1];
+        } else {
+            throw new Error("Too much lookahead.");
+        }
+    }
+
+};
+
+
+
+parserlib.util = {
+StringReader: StringReader,
+SyntaxError : SyntaxError,
+SyntaxUnit  : SyntaxUnit,
+EventTarget : EventTarget,
+TokenStreamBase : TokenStreamBase
+};
+})();
+
+/* 
+Parser-Lib
+Copyright (c) 2009-2011 Nicholas C. Zakas. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+/* Build time: 13-July-2011 04:35:28 */
+(function(){
+var EventTarget = parserlib.util.EventTarget,
+TokenStreamBase = parserlib.util.TokenStreamBase,
+StringReader = parserlib.util.StringReader,
+SyntaxError = parserlib.util.SyntaxError,
+SyntaxUnit  = parserlib.util.SyntaxUnit;
+
+var Colors = {
+    aliceblue       :"#f0f8ff",
+    antiquewhite    :"#faebd7",
+    aqua            :"#00ffff",
+    aquamarine      :"#7fffd4",
+    azure           :"#f0ffff",
+    beige           :"#f5f5dc",
+    bisque          :"#ffe4c4",
+    black           :"#000000",
+    blanchedalmond  :"#ffebcd",
+    blue            :"#0000ff",
+    blueviolet      :"#8a2be2",
+    brown           :"#a52a2a",
+    burlywood       :"#deb887",
+    cadetblue       :"#5f9ea0",
+    chartreuse      :"#7fff00",
+    chocolate       :"#d2691e",
+    coral           :"#ff7f50",
+    cornflowerblue  :"#6495ed",
+    cornsilk        :"#fff8dc",
+    crimson         :"#dc143c",
+    cyan            :"#00ffff",
+    darkblue        :"#00008b",
+    darkcyan        :"#008b8b",
+    darkgoldenrod   :"#b8860b",
+    darkgray        :"#a9a9a9",
+    darkgreen       :"#006400",
+    darkkhaki       :"#bdb76b",
+    darkmagenta     :"#8b008b",
+    darkolivegreen  :"#556b2f",
+    darkorange      :"#ff8c00",
+    darkorchid      :"#9932cc",
+    darkred         :"#8b0000",
+    darksalmon      :"#e9967a",
+    darkseagreen    :"#8fbc8f",
+    darkslateblue   :"#483d8b",
+    darkslategray   :"#2f4f4f",
+    darkturquoise   :"#00ced1",
+    darkviolet      :"#9400d3",
+    deeppink        :"#ff1493",
+    deepskyblue     :"#00bfff",
+    dimgray         :"#696969",
+    dodgerblue      :"#1e90ff",
+    firebrick       :"#b22222",
+    floralwhite     :"#fffaf0",
+    forestgreen     :"#228b22",
+    fuchsia         :"#ff00ff",
+    gainsboro       :"#dcdcdc",
+    ghostwhite      :"#f8f8ff",
+    gold            :"#ffd700",
+    goldenrod       :"#daa520",
+    gray            :"#808080",
+    green           :"#008000",
+    greenyellow     :"#adff2f",
+    honeydew        :"#f0fff0",
+    hotpink         :"#ff69b4",
+    indianred       :"#cd5c5c",
+    indigo          :"#4b0082",
+    ivory           :"#fffff0",
+    khaki           :"#f0e68c",
+    lavender        :"#e6e6fa",
+    lavenderblush   :"#fff0f5",
+    lawngreen       :"#7cfc00",
+    lemonchiffon    :"#fffacd",
+    lightblue       :"#add8e6",
+    lightcoral      :"#f08080",
+    lightcyan       :"#e0ffff",
+    lightgoldenrodyellow  :"#fafad2",
+    lightgrey       :"#d3d3d3",
+    lightgreen      :"#90ee90",
+    lightpink       :"#ffb6c1",
+    lightsalmon     :"#ffa07a",
+    lightseagreen   :"#20b2aa",
+    lightskyblue    :"#87cefa",
+    lightslategray  :"#778899",
+    lightsteelblue  :"#b0c4de",
+    lightyellow     :"#ffffe0",
+    lime            :"#00ff00",
+    limegreen       :"#32cd32",
+    linen           :"#faf0e6",
+    magenta         :"#ff00ff",
+    maroon          :"#800000",
+    mediumaquamarine:"#66cdaa",
+    mediumblue      :"#0000cd",
+    mediumorchid    :"#ba55d3",
+    mediumpurple    :"#9370d8",
+    mediumseagreen  :"#3cb371",
+    mediumslateblue :"#7b68ee",
+    mediumspringgreen   :"#00fa9a",
+    mediumturquoise :"#48d1cc",
+    mediumvioletred :"#c71585",
+    midnightblue    :"#191970",
+    mintcream       :"#f5fffa",
+    mistyrose       :"#ffe4e1",
+    moccasin        :"#ffe4b5",
+    navajowhite     :"#ffdead",
+    navy            :"#000080",
+    oldlace         :"#fdf5e6",
+    olive           :"#808000",
+    olivedrab       :"#6b8e23",
+    orange          :"#ffa500",
+    orangered       :"#ff4500",
+    orchid          :"#da70d6",
+    palegoldenrod   :"#eee8aa",
+    palegreen       :"#98fb98",
+    paleturquoise   :"#afeeee",
+    palevioletred   :"#d87093",
+    papayawhip      :"#ffefd5",
+    peachpuff       :"#ffdab9",
+    peru            :"#cd853f",
+    pink            :"#ffc0cb",
+    plum            :"#dda0dd",
+    powderblue      :"#b0e0e6",
+    purple          :"#800080",
+    red             :"#ff0000",
+    rosybrown       :"#bc8f8f",
+    royalblue       :"#4169e1",
+    saddlebrown     :"#8b4513",
+    salmon          :"#fa8072",
+    sandybrown      :"#f4a460",
+    seagreen        :"#2e8b57",
+    seashell        :"#fff5ee",
+    sienna          :"#a0522d",
+    silver          :"#c0c0c0",
+    skyblue         :"#87ceeb",
+    slateblue       :"#6a5acd",
+    slategray       :"#708090",
+    snow            :"#fffafa",
+    springgreen     :"#00ff7f",
+    steelblue       :"#4682b4",
+    tan             :"#d2b48c",
+    teal            :"#008080",
+    thistle         :"#d8bfd8",
+    tomato          :"#ff6347",
+    turquoise       :"#40e0d0",
+    violet          :"#ee82ee",
+    wheat           :"#f5deb3",
+    white           :"#ffffff",
+    whitesmoke      :"#f5f5f5",
+    yellow          :"#ffff00",
+    yellowgreen     :"#9acd32"
+};
+/**
+ * Represents a selector combinator (whitespace, +, >).
+ * @namespace parserlib.css
+ * @class Combinator
+ * @extends parserlib.util.SyntaxUnit
+ * @constructor
+ * @param {String} text The text representation of the unit. 
+ * @param {int} line The line of text on which the unit resides.
+ * @param {int} col The column of text on which the unit resides.
+ */
+function Combinator(text, line, col){
+    
+    SyntaxUnit.call(this, text, line, col);
+
+    /**
+     * The type of modifier.
+     * @type String
+     * @property type
+     */
+    this.type = "unknown";
+    
+    //pretty simple
+    if (/^\s+$/.test(text)){
+        this.type = "descendant";
+    } else if (text == ">"){
+        this.type = "child";
+    } else if (text == "+"){
+        this.type = "adjacent-sibling";
+    } else if (text == "~"){
+        this.type = "sibling";
+    }
+
+}
+
+Combinator.prototype = new SyntaxUnit();
+Combinator.prototype.constructor = Combinator;
+
+
+
+var Level1Properties = {
+
+    "background": 1,
+    "background-attachment": 1,
+    "background-color": 1,
+    "background-image": 1,
+    "background-position": 1,
+    "background-repeat": 1,
+ 
+    "border": 1,
+    "border-bottom": 1,
+    "border-bottom-width": 1,
+    "border-color": 1,
+    "border-left": 1,
+    "border-left-width": 1,
+    "border-right": 1,
+    "border-right-width": 1,
+    "border-style": 1,
+    "border-top": 1,
+    "border-top-width": 1,
+    "border-width": 1,
+ 
+    "clear": 1,
+    "color": 1,
+    "display": 1,
+    "float": 1,
+ 
+    "font": 1,
+    "font-family": 1,
+    "font-size": 1,
+    "font-style": 1,
+    "font-variant": 1,
+    "font-weight": 1,
+ 
+    "height": 1,
+    "letter-spacing": 1,
+    "line-height": 1,
+ 
+    "list-style": 1,
+    "list-style-image": 1,
+    "list-style-position": 1,
+    "list-style-type": 1,
+ 
+    "margin": 1,
+    "margin-bottom": 1,
+    "margin-left": 1,
+    "margin-right": 1,
+    "margin-top": 1,
+ 
+    "padding": 1,
+    "padding-bottom": 1,
+    "padding-left": 1,
+    "padding-right": 1,
+    "padding-top": 1,
+ 
+    "text-align": 1,
+    "text-decoration": 1,
+    "text-indent": 1,
+    "text-transform": 1,
+ 
+    "vertical-align": 1,
+    "white-space": 1,
+    "width": 1,
+    "word-spacing": 1
+    
+};
+
+var Level2Properties = {
+
+    //Aural
+    "azimuth": 1,
+    "cue-after": 1,
+    "cue-before": 1,
+    "cue": 1,
+    "elevation": 1,
+    "pause-after": 1,
+    "pause-before": 1,
+    "pause": 1,
+    "pitch-range": 1,
+    "pitch": 1,
+    "play-during": 1,
+    "richness": 1,
+    "speak-header": 1,
+    "speak-numeral": 1,
+    "speak-punctuation": 1,
+    "speak": 1,
+    "speech-rate": 1,
+    "stress": 1,
+    "voice-family": 1,
+    "volume": 1,
+    
+    //Paged
+    "orphans": 1,
+    "page-break-after": 1,
+    "page-break-before": 1,
+    "page-break-inside": 1,
+    "widows": 1,
+
+    //Interactive
+    "cursor": 1,
+    "outline-color": 1,
+    "outline-style": 1,
+    "outline-width": 1,
+    "outline": 1,    
+    
+    //Visual
+    "background-attachment": 1,
+    "background-color": 1,
+    "background-image": 1,
+    "background-position": 1,
+    "background-repeat": 1,
+    "background": 1,    
+    "border-collapse": 1,
+    "border-color": 1,
+    "border-spacing": 1,
+    "border-style": 1,
+    "border-top": 1,
+    "border-top-color": 1,
+    "border-top-style": 1,
+    "border-top-width": 1,
+    "border-width": 1,
+    "border": 1,
+    "bottom": 1,    
+    "caption-side": 1,
+    "clear": 1,
+    "clip": 1,
+    "color": 1,
+    "content": 1,
+    "counter-increment": 1,
+    "counter-reset": 1,
+    "direction": 1,
+    "display": 1,
+    "empty-cells": 1,
+    "float": 1,
+    "font-family": 1,
+    "font-size": 1,
+    "font-style": 1,
+    "font-variant": 1,
+    "font-weight": 1,
+    "font": 1,
+    "height": 1,
+    "left": 1,
+    "letter-spacing": 1,
+    "line-height": 1,
+    "list-style-image": 1,
+    "list-style-position": 1,
+    "list-style-type": 1,
+    "list-style": 1,
+    "margin-right": 1,
+    "margin-top": 1,
+    "margin": 1,
+    "max-height": 1,
+    "max-width": 1,
+    "min-height": 1,
+    "min-width": 1,
+    "overflow": 1,
+    "padding-top": 1,
+    "padding": 1,
+    "position": 1,
+    "quotes": 1,
+    "right": 1,
+    "table-layout": 1,
+    "text-align": 1,
+    "text-decoration": 1,
+    "text-indent": 1,
+    "text-transform": 1,
+    "top": 1,
+    "unicode-bidi": 1,
+    "vertical-align": 1,
+    "visibility": 1,
+    "white-space": 1,
+    "width": 1,
+    "word-spacing": 1,
+    "z-index": 1
+};
+/**
+ * Represents a media feature, such as max-width:500.
+ * @namespace parserlib.css
+ * @class MediaFeature
+ * @extends parserlib.util.SyntaxUnit
+ * @constructor
+ * @param {SyntaxUnit} name The name of the feature.
+ * @param {SyntaxUnit} value The value of the feature or null if none.
+ */
+function MediaFeature(name, value){
+    
+    SyntaxUnit.call(this, "(" + name + (value !== null ? ":" + value : "") + ")", name.startLine, name.startCol);
+
+    /**
+     * The name of the media feature
+     * @type String
+     * @property name
+     */
+    this.name = name;
+
+    /**
+     * The value for the feature or null if there is none.
+     * @type SyntaxUnit
+     * @property value
+     */
+    this.value = value;
+}
+
+MediaFeature.prototype = new SyntaxUnit();
+MediaFeature.prototype.constructor = MediaFeature;
+
+
+/**
+ * Represents an individual media query.
+ * @namespace parserlib.css
+ * @class MediaQuery
+ * @extends parserlib.util.SyntaxUnit
+ * @constructor
+ * @param {String} modifier The modifier "not" or "only" (or null).
+ * @param {String} mediaType The type of media (i.e., "print").
+ * @param {Array} parts Array of selectors parts making up this selector.
+ * @param {int} line The line of text on which the unit resides.
+ * @param {int} col The column of text on which the unit resides.
+ */
+function MediaQuery(modifier, mediaType, features, line, col){
+    
+    SyntaxUnit.call(this, (modifier ? modifier + " ": "") + (mediaType ? mediaType + " " : "") + features.join(" and "), line, col);
+
+    /**
+     * The media modifier ("not" or "only")
+     * @type String
+     * @property modifier
+     */
+    this.modifier = modifier;
+
+    /**
+     * The mediaType (i.e., "print")
+     * @type String
+     * @property mediaType
+     */
+    this.mediaType = mediaType;    
+    
+    /**
+     * The parts that make up the selector.
+     * @type Array
+     * @property features
+     */
+    this.features = features;
+
+}
+
+MediaQuery.prototype = new SyntaxUnit();
+MediaQuery.prototype.constructor = MediaQuery;
+
+
+/**
+ * A CSS3 parser.
+ * @namespace parserlib.css
+ * @class Parser
+ * @constructor
+ * @param {Object} options (Optional) Various options for the parser:
+ *      starHack (true|false) to allow IE6 star hack as valid,
+ *      underscoreHack (true|false) to interpret leading underscores
+ *      as IE6-7 targeting for known properties, ieFilters (true|false)
+ *      to indicate that IE < 8 filters should be accepted and not throw
+ *      syntax errors.
+ */
+function Parser(options){
+
+    //inherit event functionality
+    EventTarget.call(this);
+
+
+    this.options = options || {};
+
+    this._tokenStream = null;
+}
+
+Parser.prototype = function(){
+
+    var proto = new EventTarget(),  //new prototype
+        prop,
+        additions =  {
+        
+            //restore constructor
+            constructor: Parser,
+        
+            //-----------------------------------------------------------------
+            // Grammar
+            //-----------------------------------------------------------------
+        
+            _stylesheet: function(){
+            
+                /*
+                 * stylesheet
+                 *  : [ CHARSET_SYM S* STRING S* ';' ]?
+                 *    [S|CDO|CDC]* [ import [S|CDO|CDC]* ]*
+                 *    [ namespace [S|CDO|CDC]* ]*
+                 *    [ [ ruleset | media | page | font_face | keyframes ] [S|CDO|CDC]* ]*
+                 *  ;
+                 */ 
+               
+                var tokenStream = this._tokenStream,
+                    charset     = null,
+                    token,
+                    tt;
+                    
+                this.fire("startstylesheet");
+            
+                //try to read character set
+                this._charset();
+                
+                this._skipCruft();
+
+                //try to read imports - may be more than one
+                while (tokenStream.peek() == Tokens.IMPORT_SYM){
+                    this._import();
+                    this._skipCruft();
+                }
+                
+                //try to read namespaces - may be more than one
+                while (tokenStream.peek() == Tokens.NAMESPACE_SYM){
+                    this._namespace();
+                    this._skipCruft();
+                }
+                
+                //get the next token
+                tt = tokenStream.peek();
+                
+                //try to read the rest
+                while(tt > Tokens.EOF){
+                
+                    try {
+                
+                        switch(tt){
+                            case Tokens.MEDIA_SYM:
+                                this._media();
+                                this._skipCruft();
+                                break;
+                            case Tokens.PAGE_SYM:
+                                this._page(); 
+                                this._skipCruft();
+                                break;                   
+                            case Tokens.FONT_FACE_SYM:
+                                this._font_face(); 
+                                this._skipCruft();
+                                break;  
+                            case Tokens.KEYFRAMES_SYM:
+                                this._keyframes(); 
+                                this._skipCruft();
+                                break;  
+                            case Tokens.S:
+                                this._readWhitespace();
+                                break;
+                            default:                            
+                                if(!this._ruleset()){
+                                
+                                    //error handling for known issues
+                                    switch(tt){
+                                        case Tokens.CHARSET_SYM:
+                                            token = tokenStream.LT(1);
+                                            this._charset(false);
+                                            throw new SyntaxError("@charset not allowed here.", token.startLine, token.startCol);
+                                        case Tokens.IMPORT_SYM:
+                                            token = tokenStream.LT(1);
+                                            this._import(false);
+                                            throw new SyntaxError("@import not allowed here.", token.startLine, token.startCol);
+                                        case Tokens.NAMESPACE_SYM:
+                                            token = tokenStream.LT(1);
+                                            this._namespace(false);
+                                            throw new SyntaxError("@namespace not allowed here.", token.startLine, token.startCol);
+                                        default:
+                                            tokenStream.get();  //get the last token
+                                            this._unexpectedToken(tokenStream.token());
+                                    }
+                                
+                                }
+                        }
+                    } catch(ex) {
+                        if (ex instanceof SyntaxError && !this.options.strict){
+                            this.fire({
+                                type:       "error",
+                                error:      ex,
+                                message:    ex.message,
+                                line:       ex.line,
+                                col:        ex.col
+                            });                     
+                        } else {
+                            throw ex;
+                        }
+                    }
+                    
+                    tt = tokenStream.peek();
+                }
+                
+                if (tt != Tokens.EOF){
+                    this._unexpectedToken(tokenStream.token());
+                }
+            
+                this.fire("endstylesheet");
+            },
+            
+            _charset: function(emit){
+                var tokenStream = this._tokenStream,
+                    charset,
+                    token,
+                    line,
+                    col;
+                    
+                if (tokenStream.match(Tokens.CHARSET_SYM)){
+                    line = tokenStream.token().startLine;
+                    col = tokenStream.token().startCol;
+                
+                    this._readWhitespace();
+                    tokenStream.mustMatch(Tokens.STRING);
+                    
+                    token = tokenStream.token();
+                    charset = token.value;
+                    
+                    this._readWhitespace();
+                    tokenStream.mustMatch(Tokens.SEMICOLON);
+                    
+                    if (emit !== false){
+                        this.fire({ 
+                            type:   "charset",
+                            charset:charset,
+                            line:   line,
+                            col:    col
+                        });
+                    }
+                }            
+            },
+            
+            _import: function(emit){
+                /*
+                 * import
+                 *   : IMPORT_SYM S*
+                 *    [STRING|URI] S* media_query_list? ';' S*
+                 */    
+            
+                var tokenStream = this._tokenStream,
+                    tt,
+                    uri,
+                    importToken,
+                    mediaList   = [];
+                
+                //read import symbol
+                tokenStream.mustMatch(Tokens.IMPORT_SYM);
+                importToken = tokenStream.token();
+                this._readWhitespace();
+                
+                tokenStream.mustMatch([Tokens.STRING, Tokens.URI]);
+                
+                //grab the URI value
+                uri = tokenStream.token().value.replace(/(?:url\()?["']([^"']+)["']\)?/, "$1");                
+
+                this._readWhitespace();
+                
+                mediaList = this._media_query_list();
+                
+                //must end with a semicolon
+                tokenStream.mustMatch(Tokens.SEMICOLON);
+                this._readWhitespace();
+                
+                if (emit !== false){
+                    this.fire({
+                        type:   "import",
+                        uri:    uri,
+                        media:  mediaList,
+                        line:   importToken.startLine,
+                        col:    importToken.startCol
+                    });
+                }
+        
+            },
+            
+            _namespace: function(emit){
+                /*
+                 * namespace
+                 *   : NAMESPACE_SYM S* [namespace_prefix S*]? [STRING|URI] S* ';' S*
+                 */    
+            
+                var tokenStream = this._tokenStream,
+                    line,
+                    col,
+                    prefix,
+                    uri;
+                
+                //read import symbol
+                tokenStream.mustMatch(Tokens.NAMESPACE_SYM);
+                line = tokenStream.token().startLine;
+                col = tokenStream.token().startCol;
+                this._readWhitespace();
+                
+                //it's a namespace prefix - no _namespace_prefix() method because it's just an IDENT
+                if (tokenStream.match(Tokens.IDENT)){
+                    prefix = tokenStream.token().value;
+                    this._readWhitespace();
+                }
+                
+                tokenStream.mustMatch([Tokens.STRING, Tokens.URI]);
+                /*if (!tokenStream.match(Tokens.STRING)){
+                    tokenStream.mustMatch(Tokens.URI);
+                }*/
+                
+                //grab the URI value
+                uri = tokenStream.token().value.replace(/(?:url\()?["']([^"']+)["']\)?/, "$1");                
+
+                this._readWhitespace();
+
+                //must end with a semicolon
+                tokenStream.mustMatch(Tokens.SEMICOLON);
+                this._readWhitespace();
+                
+                if (emit !== false){
+                    this.fire({
+                        type:   "namespace",
+                        prefix: prefix,
+                        uri:    uri,
+                        line:   line,
+                        col:    col
+                    });
+                }
+        
+            },            
+                       
+            _media: function(){
+                /*
+                 * media
+                 *   : MEDIA_SYM S* media_query_list S* '{' S* ruleset* '}' S*
+                 *   ;
+                 */
+                var tokenStream     = this._tokenStream,
+                    line,
+                    col,
+                    mediaList;//       = [];
+                
+                //look for @media
+                tokenStream.mustMatch(Tokens.MEDIA_SYM);
+                line = tokenStream.token().startLine;
+                col = tokenStream.token().startCol;
+                
+                this._readWhitespace();               
+
+                mediaList = this._media_query_list();
+
+                tokenStream.mustMatch(Tokens.LBRACE);
+                this._readWhitespace();
+                
+                this.fire({
+                    type:   "startmedia",
+                    media:  mediaList,
+                    line:   line,
+                    col:    col
+                });
+                
+                while(true) {
+                    if (tokenStream.peek() == Tokens.PAGE_SYM){
+                        this._page();
+                    } else if (!this._ruleset()){
+                        break;
+                    }                
+                }
+                
+                tokenStream.mustMatch(Tokens.RBRACE);
+                this._readWhitespace();
+        
+                this.fire({
+                    type:   "endmedia",
+                    media:  mediaList,
+                    line:   line,
+                    col:    col
+                });
+            },                           
+        
+
+            //CSS3 Media Queries
+            _media_query_list: function(){
+                /*
+                 * media_query_list
+                 *   : S* [media_query [ ',' S* media_query ]* ]?
+                 *   ;
+                 */
+                var tokenStream = this._tokenStream,
+                    mediaList   = [];
+                
+                
+                this._readWhitespace();
+                
+                if (tokenStream.peek() == Tokens.IDENT || tokenStream.peek() == Tokens.LPAREN){
+                    mediaList.push(this._media_query());
+                }
+                
+                while(tokenStream.match(Tokens.COMMA)){
+                    this._readWhitespace();
+                    mediaList.push(this._media_query());
+                }
+                
+                return mediaList;
+            },
+            
+            /*
+             * Note: "expression" in the grammar maps to the _media_expression
+             * method.
+             
+             */
+            _media_query: function(){
+                /*
+                 * media_query
+                 *   : [ONLY | NOT]? S* media_type S* [ AND S* expression ]*
+                 *   | expression [ AND S* expression ]*
+                 *   ;
+                 */
+                var tokenStream = this._tokenStream,
+                    type        = null,
+                    ident       = null,
+                    token       = null,
+                    expressions = [];
+                    
+                if (tokenStream.match(Tokens.IDENT)){
+                    ident = tokenStream.token().value.toLowerCase();
+                    
+                    //since there's no custom tokens for these, need to manually check
+                    if (ident != "only" && ident != "not"){
+                        tokenStream.unget();
+                        ident = null;
+                    } else {
+                        token = tokenStream.token();
+                    }
+                }
+                                
+                this._readWhitespace();
+                
+                if (tokenStream.peek() == Tokens.IDENT){
+                    type = this._media_type();
+                    if (token === null){
+                        token = tokenStream.token();
+                    }
+                } else if (tokenStream.peek() == Tokens.LPAREN){
+                    if (token === null){
+                        token = tokenStream.LT(1);
+                    }
+                    expressions.push(this._media_expression());
+                }                               
+                
+                if (type === null && expressions.length === 0){
+                    return null;
+                } else {                
+                    this._readWhitespace();
+                    while (tokenStream.match(Tokens.IDENT)){
+                        if (tokenStream.token().value.toLowerCase() != "and"){
+                            this._unexpectedToken(tokenStream.token());
+                        }
+                        
+                        this._readWhitespace();
+                        expressions.push(this._media_expression());
+                    }
+                }
+
+                return new MediaQuery(ident, type, expressions, token.startLine, token.startCol);
+            },
+
+            //CSS3 Media Queries
+            _media_type: function(){
+                /*
+                 * media_type
+                 *   : IDENT
+                 *   ;
+                 */
+                return this._media_feature();           
+            },
+
+            /**
+             * Note: in CSS3 Media Queries, this is called "expression".
+             * Renamed here to avoid conflict with CSS3 Selectors
+             * definition of "expression". Also note that "expr" in the
+             * grammar now maps to "expression" from CSS3 selectors.
+             * @method _media_expression
+             * @private
+             */
+            _media_expression: function(){
+                /*
+                 * expression
+                 *  : '(' S* media_feature S* [ ':' S* expr ]? ')' S*
+                 *  ;
+                 */
+                var tokenStream = this._tokenStream,
+                    feature     = null,
+                    token,
+                    expression  = null;
+                
+                tokenStream.mustMatch(Tokens.LPAREN);
+                
+                feature = this._media_feature();
+                this._readWhitespace();
+                
+                if (tokenStream.match(Tokens.COLON)){
+                    this._readWhitespace();
+                    token = tokenStream.LT(1);
+                    expression = this._expression();
+                }
+                
+                tokenStream.mustMatch(Tokens.RPAREN);
+                this._readWhitespace();
+
+                return new MediaFeature(feature, (expression ? new SyntaxUnit(expression, token.startLine, token.startCol) : null));            
+            },
+
+            //CSS3 Media Queries
+            _media_feature: function(){
+                /*
+                 * media_feature
+                 *   : IDENT
+                 *   ;
+                 */
+                var tokenStream = this._tokenStream;
+                    
+                tokenStream.mustMatch(Tokens.IDENT);
+                
+                return SyntaxUnit.fromToken(tokenStream.token());            
+            },
+            
+            //CSS3 Paged Media
+            _page: function(){
+                /*
+                 * page:
+                 *    PAGE_SYM S* IDENT? pseudo_page? S* 
+                 *    '{' S* [ declaration | margin ]? [ ';' S* [ declaration | margin ]? ]* '}' S*
+                 *    ;
+                 */            
+                var tokenStream = this._tokenStream,
+                    line,
+                    col,
+                    identifier  = null,
+                    pseudoPage  = null;
+                
+                //look for @page
+                tokenStream.mustMatch(Tokens.PAGE_SYM);
+                line = tokenStream.token().startLine;
+                col = tokenStream.token().startCol;
+                
+                this._readWhitespace();
+                
+                if (tokenStream.match(Tokens.IDENT)){
+                    identifier = tokenStream.token().value;
+
+                    //The value 'auto' may not be used as a page name and MUST be treated as a syntax error.
+                    if (identifier.toLowerCase() === "auto"){
+                        this._unexpectedToken(tokenStream.token());
+                    }
+                }                
+                
+                //see if there's a colon upcoming
+                if (tokenStream.peek() == Tokens.COLON){
+                    pseudoPage = this._pseudo_page();
+                }
+            
+                this._readWhitespace();
+                
+                this.fire({
+                    type:   "startpage",
+                    id:     identifier,
+                    pseudo: pseudoPage,
+                    line:   line,
+                    col:    col
+                });                   
+
+                this._readDeclarations(true, true);                
+                
+                this.fire({
+                    type:   "endpage",
+                    id:     identifier,
+                    pseudo: pseudoPage,
+                    line:   line,
+                    col:    col
+                });             
+            
+            },
+            
+            //CSS3 Paged Media
+            _margin: function(){
+                /*
+                 * margin :
+                 *    margin_sym S* '{' declaration [ ';' S* declaration? ]* '}' S*
+                 *    ;
+                 */
+                var tokenStream = this._tokenStream,
+                    line,
+                    col,
+                    marginSym   = this._margin_sym();
+
+                if (marginSym){
+                    line = tokenStream.token().startLine;
+                    col = tokenStream.token().startCol;
+                
+                    this.fire({
+                        type: "startpagemargin",
+                        margin: marginSym,
+                        line:   line,
+                        col:    col
+                    });    
+                    
+                    this._readDeclarations(true);
+
+                    this.fire({
+                        type: "endpagemargin",
+                        margin: marginSym,
+                        line:   line,
+                        col:    col
+                    });    
+                    return true;
+                } else {
+                    return false;
+                }
+            },
+
+            //CSS3 Paged Media
+            _margin_sym: function(){
+            
+                /*
+                 * margin_sym :
+                 *    TOPLEFTCORNER_SYM | 
+                 *    TOPLEFT_SYM | 
+                 *    TOPCENTER_SYM | 
+                 *    TOPRIGHT_SYM | 
+                 *    TOPRIGHTCORNER_SYM |
+                 *    BOTTOMLEFTCORNER_SYM | 
+                 *    BOTTOMLEFT_SYM | 
+                 *    BOTTOMCENTER_SYM | 
+                 *    BOTTOMRIGHT_SYM |
+                 *    BOTTOMRIGHTCORNER_SYM |
+                 *    LEFTTOP_SYM |
+                 *    LEFTMIDDLE_SYM |
+                 *    LEFTBOTTOM_SYM |
+                 *    RIGHTTOP_SYM |
+                 *    RIGHTMIDDLE_SYM |
+                 *    RIGHTBOTTOM_SYM 
+                 *    ;
+                 */
+            
+                var tokenStream = this._tokenStream;
+            
+                if(tokenStream.match([Tokens.TOPLEFTCORNER_SYM, Tokens.TOPLEFT_SYM,
+                        Tokens.TOPCENTER_SYM, Tokens.TOPRIGHT_SYM, Tokens.TOPRIGHTCORNER_SYM,
+                        Tokens.BOTTOMLEFTCORNER_SYM, Tokens.BOTTOMLEFT_SYM, 
+                        Tokens.BOTTOMCENTER_SYM, Tokens.BOTTOMRIGHT_SYM,
+                        Tokens.BOTTOMRIGHTCORNER_SYM, Tokens.LEFTTOP_SYM, 
+                        Tokens.LEFTMIDDLE_SYM, Tokens.LEFTBOTTOM_SYM, Tokens.RIGHTTOP_SYM,
+                        Tokens.RIGHTMIDDLE_SYM, Tokens.RIGHTBOTTOM_SYM]))
+                {
+                    return SyntaxUnit.fromToken(tokenStream.token());                
+                } else {
+                    return null;
+                }
+            
+            },
+            
+            _pseudo_page: function(){
+                /*
+                 * pseudo_page
+                 *   : ':' IDENT
+                 *   ;    
+                 */
+        
+                var tokenStream = this._tokenStream;
+                
+                tokenStream.mustMatch(Tokens.COLON);
+                tokenStream.mustMatch(Tokens.IDENT);
+                
+                //TODO: CSS3 Paged Media says only "left", "center", and "right" are allowed
+                
+                return tokenStream.token().value;
+            },
+            
+            _font_face: function(){
+                /*
+                 * font_face
+                 *   : FONT_FACE_SYM S* 
+                 *     '{' S* declaration [ ';' S* declaration ]* '}' S*
+                 *   ;
+                 */     
+                var tokenStream = this._tokenStream,
+                    line,
+                    col;
+                
+                //look for @page
+                tokenStream.mustMatch(Tokens.FONT_FACE_SYM);
+                line = tokenStream.token().startLine;
+                col = tokenStream.token().startCol;
+                
+                this._readWhitespace();
+
+                this.fire({
+                    type:   "startfontface",
+                    line:   line,
+                    col:    col
+                });                    
+                
+                this._readDeclarations(true);
+                
+                this.fire({
+                    type:   "endfontface",
+                    line:   line,
+                    col:    col
+                });              
+            },
+
+            _operator: function(){
+            
+                /*
+                 * operator
+                 *  : '/' S* | ',' S* | /( empty )/
+                 *  ;
+                 */    
+                 
+                var tokenStream = this._tokenStream,
+                    token       = null;
+                
+                if (tokenStream.match([Tokens.SLASH, Tokens.COMMA])){
+                    token =  tokenStream.token();
+                    this._readWhitespace();
+                } 
+                return token ? PropertyValuePart.fromToken(token) : null;
+                
+            },
+            
+            _combinator: function(){
+            
+                /*
+                 * combinator
+                 *  : PLUS S* | GREATER S* | TILDE S* | S+
+                 *  ;
+                 */    
+                 
+                var tokenStream = this._tokenStream,
+                    value       = null,
+                    token;
+                
+                if(tokenStream.match([Tokens.PLUS, Tokens.GREATER, Tokens.TILDE])){                
+                    token = tokenStream.token();
+                    value = new Combinator(token.value, token.startLine, token.startCol);
+                    this._readWhitespace();
+                }
+                
+                return value;
+            },
+            
+            _unary_operator: function(){
+            
+                /*
+                 * unary_operator
+                 *  : '-' | '+'
+                 *  ;
+                 */
+                 
+                var tokenStream = this._tokenStream;
+                
+                if (tokenStream.match([Tokens.MINUS, Tokens.PLUS])){
+                    return tokenStream.token().value;
+                } else {
+                    return null;
+                }         
+            },
+            
+            _property: function(){
+            
+                /*
+                 * property
+                 *   : IDENT S*
+                 *   ;        
+                 */
+                 
+                var tokenStream = this._tokenStream,
+                    value       = null,
+                    hack        = null,
+                    tokenValue,
+                    token,
+                    line,
+                    col;
+                    
+                //check for star hack - throws error if not allowed
+                if (tokenStream.peek() == Tokens.STAR && this.options.starHack){
+                    tokenStream.get();
+                    token = tokenStream.token();
+                    hack = token.value;
+                    line = token.startLine;
+                    col = token.startCol;
+                }
+                
+                if(tokenStream.match(Tokens.IDENT)){
+                    token = tokenStream.token();
+                    tokenValue = token.value;
+                    
+                    //check for underscore hack - no error if not allowed because it's valid CSS syntax
+                    if (tokenValue.charAt(0) == "_" && this.options.underscoreHack){
+                        hack = "_";
+                        tokenValue = tokenValue.substring(1);
+                    }
+                    
+                    value = new PropertyName(tokenValue, hack, (line||token.startLine), (col||token.startCol));
+                    this._readWhitespace();
+                }
+                
+                return value;
+            },
+        
+            //Augmented with CSS3 Selectors
+            _ruleset: function(){
+                /*
+                 * ruleset
+                 *   : selectors_group
+                 *     '{' S* declaration? [ ';' S* declaration? ]* '}' S*
+                 *   ;    
+                 */    
+                 
+                var tokenStream = this._tokenStream,
+                    tt,
+                    selectors;
+
+
+                /*
+                 * Error Recovery: If even a single selector fails to parse,
+                 * then the entire ruleset should be thrown away.
+                 */
+                try {
+                    selectors = this._selectors_group();
+                } catch (ex){
+                    if (ex instanceof SyntaxError && !this.options.strict){
+                    
+                        //fire error event
+                        this.fire({
+                            type:       "error",
+                            error:      ex,
+                            message:    ex.message,
+                            line:       ex.line,
+                            col:        ex.col
+                        });                          
+                        
+                        //skip over everything until closing brace
+                        tt = tokenStream.advance([Tokens.RBRACE]);
+                        if (tt == Tokens.RBRACE){
+                            //if there's a right brace, the rule is finished so don't do anything
+                        } else {
+                            //otherwise, rethrow the error because it wasn't handled properly
+                            throw ex;
+                        }                        
+                        
+                    } else {
+                        //not a syntax error, rethrow it
+                        throw ex;
+                    }                
+                
+                    //trigger parser to continue
+                    return true;
+                }
+                
+                //if it got here, all selectors parsed
+                if (selectors){ 
+                                    
+                    this.fire({
+                        type:       "startrule",
+                        selectors:  selectors,
+                        line:       selectors[0].line,
+                        col:        selectors[0].col
+                    });                
+                    
+                    this._readDeclarations(true);                
+                    
+                    this.fire({
+                        type:       "endrule",
+                        selectors:  selectors,
+                        line:       selectors[0].line,
+                        col:        selectors[0].col
+                    });  
+                    
+                }
+                
+                return selectors;
+                
+            },
+
+            //CSS3 Selectors
+            _selectors_group: function(){
+            
+                /*            
+                 * selectors_group
+                 *   : selector [ COMMA S* selector ]*
+                 *   ;
+                 */           
+                var tokenStream = this._tokenStream,
+                    selectors   = [],
+                    selector;
+                    
+                selector = this._selector();
+                if (selector !== null){
+                
+                    selectors.push(selector);
+                    while(tokenStream.match(Tokens.COMMA)){
+                        this._readWhitespace();
+                        selector = this._selector();
+                        if (selector !== null){
+                            selectors.push(selector);
+                        } else {
+                            this._unexpectedToken(tokenStream.LT(1));
+                        }
+                    }
+                }
+
+                return selectors.length ? selectors : null;
+            },
+                
+            //CSS3 Selectors
+            _selector: function(){
+                /*
+                 * selector
+                 *   : simple_selector_sequence [ combinator simple_selector_sequence ]*
+                 *   ;    
+                 */
+                 
+                var tokenStream = this._tokenStream,
+                    selector    = [],
+                    nextSelector = null,
+                    combinator  = null,
+                    ws          = null;
+                
+                //if there's no simple selector, then there's no selector
+                nextSelector = this._simple_selector_sequence();
+                if (nextSelector === null){
+                    return null;
+                }
+                
+                selector.push(nextSelector);
+                
+                do {
+                    
+                    //look for a combinator
+                    combinator = this._combinator();
+                    
+                    if (combinator !== null){
+                        selector.push(combinator);
+                        nextSelector = this._simple_selector_sequence();
+                        
+                        //there must be a next selector
+                        if (nextSelector === null){
+                            this._unexpectedToken(this.LT(1));
+                        } else {
+                        
+                            //nextSelector is an instance of SelectorPart
+                            selector.push(nextSelector);
+                        }
+                    } else {
+                        
+                        //if there's not whitespace, we're done
+                        if (this._readWhitespace()){           
+        
+                            //add whitespace separator
+                            ws = new Combinator(tokenStream.token().value, tokenStream.token().startLine, tokenStream.token().startCol);
+                            
+                            //combinator is not required
+                            combinator = this._combinator();
+                            
+                            //selector is required if there's a combinator
+                            nextSelector = this._simple_selector_sequence();
+                            if (nextSelector === null){                        
+                                if (combinator !== null){
+                                    this._unexpectedToken(tokenStream.LT(1));
+                                }
+                            } else {
+                                
+                                if (combinator !== null){
+                                    selector.push(combinator);
+                                } else {
+                                    selector.push(ws);
+                                }
+                                
+                                selector.push(nextSelector);
+                            }     
+                        } else {
+                            break;
+                        }               
+                    
+                    }
+                } while(true);
+                
+                return new Selector(selector, selector[0].line, selector[0].col);
+            },
+            
+            //CSS3 Selectors
+            _simple_selector_sequence: function(){
+                /*
+                 * simple_selector_sequence
+                 *   : [ type_selector | universal ]
+                 *     [ HASH | class | attrib | pseudo | negation ]*
+                 *   | [ HASH | class | attrib | pseudo | negation ]+
+                 *   ;
+                 */
+                 
+                var tokenStream = this._tokenStream,
+                
+                    //parts of a simple selector
+                    elementName = null,
+                    modifiers   = [],
+                    
+                    //complete selector text
+                    selectorText= "",
+
+                    //the different parts after the element name to search for
+                    components  = [
+                        //HASH
+                        function(){
+                            return tokenStream.match(Tokens.HASH) ?
+                                    new SelectorSubPart(tokenStream.token().value, "id", tokenStream.token().startLine, tokenStream.token().startCol) :
+                                    null;
+                        },
+                        this._class,
+                        this._attrib,
+                        this._pseudo,
+                        this._negation
+                    ],
+                    i           = 0,
+                    len         = components.length,
+                    component   = null,
+                    found       = false,
+                    line,
+                    col;
+                    
+                    
+                //get starting line and column for the selector
+                line = tokenStream.LT(1).startLine;
+                col = tokenStream.LT(1).startCol;
+                                        
+                elementName = this._type_selector();
+                if (!elementName){
+                    elementName = this._universal();
+                }
+                
+                if (elementName !== null){
+                    selectorText += elementName;
+                }                
+                
+                while(true){
+
+                    //whitespace means we're done
+                    if (tokenStream.peek() === Tokens.S){
+                        break;
+                    }
+                
+                    //check for each component
+                    while(i < len && component === null){
+                        component = components[i++].call(this);
+                    }
+        
+                    if (component === null){
+                    
+                        //we don't have a selector
+                        if (selectorText === ""){
+                            return null;
+                        } else {
+                            break;
+                        }
+                    } else {
+                        i = 0;
+                        modifiers.push(component);
+                        selectorText += component.toString(); 
+                        component = null;
+                    }
+                }
+
+                 
+                return selectorText !== "" ?
+                        new SelectorPart(elementName, modifiers, selectorText, line, col) :
+                        null;
+            },            
+            
+            //CSS3 Selectors
+            _type_selector: function(){
+                /*
+                 * type_selector
+                 *   : [ namespace_prefix ]? element_name
+                 *   ;
+                 */
+                 
+                var tokenStream = this._tokenStream,
+                    ns          = this._namespace_prefix(),
+                    elementName = this._element_name();
+                    
+                if (!elementName){                    
+                    /*
+                     * Need to back out the namespace that was read due to both
+                     * type_selector and universal reading namespace_prefix
+                     * first. Kind of hacky, but only way I can figure out
+                     * right now how to not change the grammar.
+                     */
+                    if (ns){
+                        tokenStream.unget();
+                        if (ns.length > 1){
+                            tokenStream.unget();
+                        }
+                    }
+                
+                    return null;
+                } else {     
+                    if (ns){
+                        elementName.text = ns + elementName.text;
+                        elementName.col -= ns.length;
+                    }
+                    return elementName;
+                }
+            },
+            
+            //CSS3 Selectors
+            _class: function(){
+                /*
+                 * class
+                 *   : '.' IDENT
+                 *   ;
+                 */    
+                 
+                var tokenStream = this._tokenStream,
+                    token;
+                
+                if (tokenStream.match(Tokens.DOT)){
+                    tokenStream.mustMatch(Tokens.IDENT);    
+                    token = tokenStream.token();
+                    return new SelectorSubPart("." + token.value, "class", token.startLine, token.startCol - 1);        
+                } else {
+                    return null;
+                }
+        
+            },
+            
+            //CSS3 Selectors
+            _element_name: function(){
+                /*
+                 * element_name
+                 *   : IDENT
+                 *   ;
+                 */    
+                
+                var tokenStream = this._tokenStream,
+                    token;
+                
+                if (tokenStream.match(Tokens.IDENT)){
+                    token = tokenStream.token();
+                    return new SelectorSubPart(token.value, "elementName", token.startLine, token.startCol);        
+                
+                } else {
+                    return null;
+                }
+            },
+            
+            //CSS3 Selectors
+            _namespace_prefix: function(){
+                /*            
+                 * namespace_prefix
+                 *   : [ IDENT | '*' ]? '|'
+                 *   ;
+                 */
+                var tokenStream = this._tokenStream,
+                    value       = "";
+                    
+                //verify that this is a namespace prefix
+                if (tokenStream.LA(1) === Tokens.PIPE || tokenStream.LA(2) === Tokens.PIPE){
+                        
+                    if(tokenStream.match([Tokens.IDENT, Tokens.STAR])){
+                        value += tokenStream.token().value;
+                    }
+                    
+                    tokenStream.mustMatch(Tokens.PIPE);
+                    value += "|";
+                    
+                }
+                
+                return value.length ? value : null;                
+            },
+            
+            //CSS3 Selectors
+            _universal: function(){
+                /*
+                 * universal
+                 *   : [ namespace_prefix ]? '*'
+                 *   ;            
+                 */
+                var tokenStream = this._tokenStream,
+                    value       = "",
+                    ns;
+                    
+                ns = this._namespace_prefix();
+                if(ns){
+                    value += ns;
+                }
+                
+                if(tokenStream.match(Tokens.STAR)){
+                    value += "*";
+                }
+                
+                return value.length ? value : null;
+                
+           },
+            
+            //CSS3 Selectors
+            _attrib: function(){
+                /*
+                 * attrib
+                 *   : '[' S* [ namespace_prefix ]? IDENT S*
+                 *         [ [ PREFIXMATCH |
+                 *             SUFFIXMATCH |
+                 *             SUBSTRINGMATCH |
+                 *             '=' |
+                 *             INCLUDES |
+                 *             DASHMATCH ] S* [ IDENT | STRING ] S*
+                 *         ]? ']'
+                 *   ;    
+                 */
+                 
+                var tokenStream = this._tokenStream,
+                    value       = null,
+                    ns,
+                    token;
+                
+                if (tokenStream.match(Tokens.LBRACKET)){
+                    token = tokenStream.token();
+                    value = token.value;
+                    value += this._readWhitespace();
+                    
+                    ns = this._namespace_prefix();
+                    
+                    if (ns){
+                        value += ns;
+                    }
+                                        
+                    tokenStream.mustMatch(Tokens.IDENT);
+                    value += tokenStream.token().value;                    
+                    value += this._readWhitespace();
+                    
+                    if(tokenStream.match([Tokens.PREFIXMATCH, Tokens.SUFFIXMATCH, Tokens.SUBSTRINGMATCH,
+                            Tokens.EQUALS, Tokens.INCLUDES, Tokens.DASHMATCH])){
+                    
+                        value += tokenStream.token().value;                    
+                        value += this._readWhitespace();
+                        
+                        tokenStream.mustMatch([Tokens.IDENT, Tokens.STRING]);
+                        value += tokenStream.token().value;                    
+                        value += this._readWhitespace();
+                    }
+                    
+                    tokenStream.mustMatch(Tokens.RBRACKET);
+                                        
+                    return new SelectorSubPart(value + "]", "attribute", token.startLine, token.startCol);
+                } else {
+                    return null;
+                }
+            },
+            
+            //CSS3 Selectors
+            _pseudo: function(){
+            
+                /*
+                 * pseudo
+                 *   : ':' ':'? [ IDENT | functional_pseudo ]
+                 *   ;    
+                 */   
+            
+                var tokenStream = this._tokenStream,
+                    pseudo      = null,
+                    colons      = ":",
+                    line,
+                    col;
+                
+                if (tokenStream.match(Tokens.COLON)){
+                
+                    if (tokenStream.match(Tokens.COLON)){
+                        colons += ":";
+                    }
+                
+                    if (tokenStream.match(Tokens.IDENT)){
+                        pseudo = tokenStream.token().value;
+                        line = tokenStream.token().startLine;
+                        col = tokenStream.token().startCol - colons.length;
+                    } else if (tokenStream.peek() == Tokens.FUNCTION){
+                        line = tokenStream.LT(1).startLine;
+                        col = tokenStream.LT(1).startCol - colons.length;
+                        pseudo = this._functional_pseudo();
+                    }
+                    
+                    if (pseudo){
+                        pseudo = new SelectorSubPart(colons + pseudo, "pseudo", line, col);
+                    }
+                }
+        
+                return pseudo;
+            },
+            
+            //CSS3 Selectors
+            _functional_pseudo: function(){
+                /*
+                 * functional_pseudo
+                 *   : FUNCTION S* expression ')'
+                 *   ;
+                */            
+                
+                var tokenStream = this._tokenStream,
+                    value = null;
+                
+                if(tokenStream.match(Tokens.FUNCTION)){
+                    value = tokenStream.token().value;
+                    value += this._readWhitespace();
+                    value += this._expression();
+                    tokenStream.mustMatch(Tokens.RPAREN);
+                    value += ")";
+                }
+                
+                return value;
+            },
+            
+            //CSS3 Selectors
+            _expression: function(){
+                /*
+                 * expression
+                 *   : [ [ PLUS | '-' | DIMENSION | NUMBER | STRING | IDENT ] S* ]+
+                 *   ;
+                 */
+                 
+                var tokenStream = this._tokenStream,
+                    value       = "";
+                    
+                while(tokenStream.match([Tokens.PLUS, Tokens.MINUS, Tokens.DIMENSION,
+                        Tokens.NUMBER, Tokens.STRING, Tokens.IDENT, Tokens.LENGTH,
+                        Tokens.FREQ, Tokens.ANGLE, Tokens.TIME,
+                        Tokens.RESOLUTION])){
+                    
+                    value += tokenStream.token().value;
+                    value += this._readWhitespace();                        
+                }
+                
+                return value.length ? value : null;
+                
+            },
+
+            //CSS3 Selectors
+            _negation: function(){
+                /*            
+                 * negation
+                 *   : NOT S* negation_arg S* ')'
+                 *   ;
+                 */
+
+                var tokenStream = this._tokenStream,
+                    line,
+                    col,
+                    value       = "",
+                    arg,
+                    subpart     = null;
+                    
+                if (tokenStream.match(Tokens.NOT)){
+                    value = tokenStream.token().value;
+                    line = tokenStream.token().startLine;
+                    col = tokenStream.token().startCol;
+                    value += this._readWhitespace();
+                    arg = this._negation_arg();
+                    value += arg;
+                    value += this._readWhitespace();
+                    tokenStream.match(Tokens.RPAREN);
+                    value += tokenStream.token().value;
+                    
+                    subpart = new SelectorSubPart(value, "not", line, col);
+                    subpart.args.push(arg);
+                }
+                
+                return subpart;
+            },
+            
+            //CSS3 Selectors
+            _negation_arg: function(){            
+                /*
+                 * negation_arg
+                 *   : type_selector | universal | HASH | class | attrib | pseudo
+                 *   ;            
+                 */           
+                 
+                var tokenStream = this._tokenStream,
+                    args        = [
+                        this._type_selector,
+                        this._universal,
+                        function(){
+                            return tokenStream.match(Tokens.HASH) ?
+                                    new SelectorSubPart(tokenStream.token().value, "id", tokenStream.token().startLine, tokenStream.token().startCol) :
+                                    null;                        
+                        },
+                        this._class,
+                        this._attrib,
+                        this._pseudo                    
+                    ],
+                    arg         = null,
+                    i           = 0,
+                    len         = args.length,
+                    elementName,
+                    line,
+                    col,
+                    part;
+                    
+                line = tokenStream.LT(1).startLine;
+                col = tokenStream.LT(1).startCol;
+                
+                while(i < len && arg === null){
+                    
+                    arg = args[i].call(this);
+                    i++;
+                }
+                
+                //must be a negation arg
+                if (arg === null){
+                    this._unexpectedToken(tokenStream.LT(1));
+                }
+ 
+                //it's an element name
+                if (arg.type == "elementName"){
+                    part = new SelectorPart(arg, [], arg.toString(), line, col);
+                } else {
+                    part = new SelectorPart(null, [arg], arg.toString(), line, col);
+                }
+                
+                return part;                
+            },
+            
+            _declaration: function(){
+            
+                /*
+                 * declaration
+                 *   : property ':' S* expr prio?
+                 *   | /( empty )/
+                 *   ;     
+                 */    
+            
+                var tokenStream = this._tokenStream,
+                    property    = null,
+                    expr        = null,
+                    prio        = null;
+                
+                property = this._property();
+                if (property !== null){
+
+                    tokenStream.mustMatch(Tokens.COLON);
+                    this._readWhitespace();
+                    
+                    expr = this._expr();
+                    
+                    //if there's no parts for the value, it's an error
+                    if (!expr || expr.length === 0){
+                        this._unexpectedToken(tokenStream.LT(1));
+                    }
+                    
+                    prio = this._prio();
+                    
+                    this.fire({
+                        type:       "property",
+                        property:   property,
+                        value:      expr,
+                        important:  prio,
+                        line:       property.line,
+                        col:        property.col
+                    });                      
+                    
+                    return true;
+                } else {
+                    return false;
+                }
+            },
+            
+            _prio: function(){
+                /*
+                 * prio
+                 *   : IMPORTANT_SYM S*
+                 *   ;    
+                 */
+                 
+                var tokenStream = this._tokenStream,
+                    result      = tokenStream.match(Tokens.IMPORTANT_SYM);
+                    
+                this._readWhitespace();
+                return result;
+            },
+            
+            _expr: function(){
+                /*
+                 * expr
+                 *   : term [ operator term ]*
+                 *   ;
+                 */
+        
+                var tokenStream = this._tokenStream,
+                    values      = [],
+					//valueParts	= [],
+                    value       = null,
+                    operator    = null;
+                    
+                value = this._term();
+                if (value !== null){
+                
+                    values.push(value);
+                    
+                    do {
+                        operator = this._operator();
+        
+                        //if there's an operator, keep building up the value parts
+                        if (operator){
+                            values.push(operator);
+                        } /*else {
+                            //if there's not an operator, you have a full value
+							values.push(new PropertyValue(valueParts, valueParts[0].line, valueParts[0].col));
+							valueParts = [];
+						}*/
+                        
+                        value = this._term();
+                        
+                        if (value === null){
+                            break;
+                        } else {
+                            values.push(value);
+                        }
+                    } while(true);
+                }
+				
+				//cleanup
+                /*if (valueParts.length){
+                    values.push(new PropertyValue(valueParts, valueParts[0].line, valueParts[0].col));
+                }*/
+        
+                return values.length > 0 ? new PropertyValue(values, values[0].startLine, values[0].startCol) : null;
+            },
+            
+            _term: function(){                       
+            
+                /*
+                 * term
+                 *   : unary_operator?
+                 *     [ NUMBER S* | PERCENTAGE S* | LENGTH S* | ANGLE S* |
+                 *       TIME S* | FREQ S* | function | ie_function ]
+                 *   | STRING S* | IDENT S* | URI S* | UNICODERANGE S* | hexcolor
+                 *   ;
+                 */    
+        
+                var tokenStream = this._tokenStream,
+                    unary       = null,
+                    value       = null,
+                    line,
+                    col;
+                    
+                //returns the operator or null
+                unary = this._unary_operator();
+                if (unary !== null){
+                    line = tokenStream.token().startLine;
+                    col = tokenStream.token().startCol;
+                }                
+               
+                //exception for IE filters
+                if (tokenStream.peek() == Tokens.IE_FUNCTION && this.options.ieFilters){
+                
+                    value = this._ie_function();
+                    if (unary === null){
+                        line = tokenStream.token().startLine;
+                        col = tokenStream.token().startCol;
+                    }
+                
+                //see if there's a simple match
+                } else if (tokenStream.match([Tokens.NUMBER, Tokens.PERCENTAGE, Tokens.LENGTH,
+                        Tokens.ANGLE, Tokens.TIME,
+                        Tokens.FREQ, Tokens.STRING, Tokens.IDENT, Tokens.URI, Tokens.UNICODE_RANGE])){
+                 
+                    value = tokenStream.token().value;
+                    if (unary === null){
+                        line = tokenStream.token().startLine;
+                        col = tokenStream.token().startCol;
+                    }
+                    this._readWhitespace();
+                } else {
+                
+                    //see if it's a color
+                    value = this._hexcolor();
+                    if (value === null){
+                    
+                        //if there's no unary, get the start of the next token for line/col info
+                        if (unary === null){
+                            line = tokenStream.LT(1).startLine;
+                            col = tokenStream.LT(1).startCol;
+                        }                    
+                    
+                        //has to be a function
+                        if (value === null){
+                            
+                            /*
+                             * This checks for alpha(opacity=0) style of IE
+                             * functions. IE_FUNCTION only presents progid: style.
+                             */
+                            if (tokenStream.LA(3) == Tokens.EQUALS && this.options.ieFilters){
+                                value = this._ie_function();
+                            } else {
+                                value = this._function();
+                            }
+                        }
+
+                        /*if (value === null){
+                            return null;
+                            //throw new Error("Expected identifier at line " + tokenStream.token().startLine + ", character " +  tokenStream.token().startCol + ".");
+                        }*/
+                    
+                    } else {
+                        if (unary === null){
+                            line = tokenStream.token().startLine;
+                            col = tokenStream.token().startCol;
+                        }                    
+                    }
+                
+                }                
+                
+                return value !== null ?
+                        new PropertyValuePart(unary !== null ? unary + value : value, line, col) :
+                        null;
+        
+            },
+            
+            _function: function(){
+            
+                /*
+                 * function
+                 *   : FUNCTION S* expr ')' S*
+                 *   ;
+                 */
+                 
+                var tokenStream = this._tokenStream,
+                    functionText = null,
+                    expr        = null;
+                    
+                if (tokenStream.match(Tokens.FUNCTION)){
+                    functionText = tokenStream.token().value;
+                    this._readWhitespace();
+                    expr = this._expr();
+                    
+                    tokenStream.match(Tokens.RPAREN);    
+                    functionText += expr + ")";
+                    this._readWhitespace();
+                }                
+                
+                return functionText;
+            }, 
+            
+            _ie_function: function(){
+            
+                /* (My own extension)
+                 * ie_function
+                 *   : IE_FUNCTION S* IDENT '=' term [S* ','? IDENT '=' term]+ ')' S*
+                 *   ;
+                 */
+                 
+                var tokenStream = this._tokenStream,
+                    functionText = null,
+                    expr        = null,
+                    lt;
+                    
+                //IE function can begin like a regular function, too
+                if (tokenStream.match([Tokens.IE_FUNCTION, Tokens.FUNCTION])){
+                    functionText = tokenStream.token().value;
+                    
+                    do {
+                    
+                        if (this._readWhitespace()){
+                            functionText += tokenStream.token().value;
+                        }
+                        
+                        //might be second time in the loop
+                        if (tokenStream.LA(0) == Tokens.COMMA){
+                            functionText += tokenStream.token().value;
+                        }
+                    
+                        tokenStream.match(Tokens.IDENT);
+                        functionText += tokenStream.token().value;
+                        
+                        tokenStream.match(Tokens.EQUALS);
+                        functionText += tokenStream.token().value;
+                        
+                        //functionText += this._term();
+                        lt = tokenStream.peek();
+                        while(lt != Tokens.COMMA && lt != Tokens.S && lt != Tokens.RPAREN){
+                            tokenStream.get();
+                            functionText += tokenStream.token().value;
+                            lt = tokenStream.peek();
+                        }
+                    } while(tokenStream.match([Tokens.COMMA, Tokens.S]));                    
+                    
+                    tokenStream.match(Tokens.RPAREN);    
+                    functionText += ")";
+                    this._readWhitespace();
+                }                
+                
+                return functionText;
+            }, 
+            
+            _hexcolor: function(){
+                /*
+                 * There is a constraint on the color that it must
+                 * have either 3 or 6 hex-digits (i.e., [0-9a-fA-F])
+                 * after the "#"; e.g., "#000" is OK, but "#abcd" is not.
+                 *
+                 * hexcolor
+                 *   : HASH S*
+                 *   ;
+                 */
+                 
+                var tokenStream = this._tokenStream,
+                    token,
+                    color = null;
+                
+                if(tokenStream.match(Tokens.HASH)){
+                
+                    //need to do some validation here
+                    
+                    token = tokenStream.token();
+                    color = token.value;
+                    if (!/#[a-f0-9]{3,6}/i.test(color)){
+                        throw new SyntaxError("Expected a hex color but found '" + color + "' at line " + token.startLine + ", col " + token.startCol + ".", token.startLine, token.startCol);
+                    }
+                    this._readWhitespace();
+                }
+                
+                return color;
+            },
+            
+            //-----------------------------------------------------------------
+            // Animations methods
+            //-----------------------------------------------------------------
+            
+            _keyframes: function(){
+            
+                /*
+                 * keyframes:
+                 *   : KEYFRAMES_SYM S* keyframe_name S* '{' S* keyframe_rule* '}' {
+                 *   ;
+                 */
+                var tokenStream = this._tokenStream,
+                    token,
+                    tt,
+                    name;            
+                    
+                tokenStream.mustMatch(Tokens.KEYFRAMES_SYM);
+                this._readWhitespace();
+                name = this._keyframe_name();
+                
+                this._readWhitespace();
+                tokenStream.mustMatch(Tokens.LBRACE);
+                    
+                this.fire({
+                    type:   "startkeyframes",
+                    name:   name,
+                    line:   name.line,
+                    col:    name.col
+                });                
+                
+                this._readWhitespace();
+                tt = tokenStream.peek();
+                
+                //check for key
+                while(tt == Tokens.IDENT || tt == Tokens.PERCENTAGE) {
+                    this._keyframe_rule();
+                    this._readWhitespace();
+                    tt = tokenStream.peek();
+                }           
+                
+                this.fire({
+                    type:   "endkeyframes",
+                    name:   name,
+                    line:   name.line,
+                    col:    name.col
+                });                      
+                    
+                this._readWhitespace();
+                tokenStream.mustMatch(Tokens.RBRACE);                    
+                
+            },
+            
+            _keyframe_name: function(){
+            
+                /*
+                 * keyframe_name:
+                 *   : IDENT
+                 *   | STRING
+                 *   ;
+                 */
+                var tokenStream = this._tokenStream,
+                    token;
+
+                tokenStream.mustMatch([Tokens.IDENT, Tokens.STRING]);
+                return SyntaxUnit.fromToken(tokenStream.token());            
+            },
+            
+            _keyframe_rule: function(){
+            
+                /*
+                 * keyframe_rule:
+                 *   : key_list S* 
+                 *     '{' S* declaration [ ';' S* declaration ]* '}' S*
+                 *   ;
+                 */
+                var tokenStream = this._tokenStream,
+                    token,
+                    keyList = this._key_list();
+                                    
+                this.fire({
+                    type:   "startkeyframerule",
+                    keys:   keyList,
+                    line:   keyList[0].line,
+                    col:    keyList[0].col
+                });                
+                
+                this._readDeclarations(true);                
+                
+                this.fire({
+                    type:   "endkeyframerule",
+                    keys:   keyList,
+                    line:   keyList[0].line,
+                    col:    keyList[0].col
+                });  
+                
+            },
+            
+            _key_list: function(){
+            
+                /*
+                 * key_list:
+                 *   : key [ S* ',' S* key]*
+                 *   ;
+                 */
+                var tokenStream = this._tokenStream,
+                    token,
+                    key,
+                    keyList = [];
+                    
+                //must be least one key
+                keyList.push(this._key());
+                    
+                this._readWhitespace();
+                    
+                while(tokenStream.match(Tokens.COMMA)){
+                    this._readWhitespace();
+                    keyList.push(this._key());
+                    this._readWhitespace();
+                }
+
+                return keyList;
+            },
+                        
+            _key: function(){
+                /*
+                 * There is a restriction that IDENT can be only "from" or "to".
+                 *
+                 * key
+                 *   : PERCENTAGE
+                 *   | IDENT
+                 *   ;
+                 */
+                 
+                var tokenStream = this._tokenStream,
+                    token;
+                    
+                if (tokenStream.match(Tokens.PERCENTAGE)){
+                    return SyntaxUnit.fromToken(tokenStream.token());
+                } else if (tokenStream.match(Tokens.IDENT)){
+                    token = tokenStream.token();                    
+                    
+                    if (/from|to/i.test(token.value)){
+                        return SyntaxUnit.fromToken(token);
+                    }
+                    
+                    tokenStream.unget();
+                }
+                
+                //if it gets here, there wasn't a valid token, so time to explode
+                this._unexpectedToken(tokenStream.LT(1));
+            },
+            
+            //-----------------------------------------------------------------
+            // Helper methods
+            //-----------------------------------------------------------------
+            
+            /**
+             * Not part of CSS grammar, but useful for skipping over
+             * combination of white space and HTML-style comments.
+             * @return {void}
+             * @method _skipCruft
+             * @private
+             */
+            _skipCruft: function(){
+                while(this._tokenStream.match([Tokens.S, Tokens.CDO, Tokens.CDC])){
+                    //noop
+                }
+            },
+
+            /**
+             * Not part of CSS grammar, but this pattern occurs frequently
+             * in the official CSS grammar. Split out here to eliminate
+             * duplicate code.
+             * @param {Boolean} checkStart Indicates if the rule should check
+             *      for the left brace at the beginning.
+             * @param {Boolean} readMargins Indicates if the rule should check
+             *      for margin patterns.
+             * @return {void}
+             * @method _readDeclarations
+             * @private
+             */
+            _readDeclarations: function(checkStart, readMargins){
+                /*
+                 * Reads the pattern
+                 * S* '{' S* declaration [ ';' S* declaration ]* '}' S*
+                 * or
+                 * S* '{' S* [ declaration | margin ]? [ ';' S* [ declaration | margin ]? ]* '}' S*
+                 * Note that this is how it is described in CSS3 Paged Media, but is actually incorrect.
+                 * A semicolon is only necessary following a delcaration is there's another declaration
+                 * or margin afterwards. 
+                 */
+                var tokenStream = this._tokenStream,
+                    tt;
+                       
+
+                this._readWhitespace();
+                
+                if (checkStart){
+                    tokenStream.mustMatch(Tokens.LBRACE);            
+                }
+                
+                this._readWhitespace();
+
+                try {
+                    
+                    while(true){
+                    
+                        if (readMargins && this._margin()){
+                            //noop
+                        } else if (this._declaration()){
+                            if (!tokenStream.match(Tokens.SEMICOLON)){
+                                break;
+                            }
+                        } else {
+                            break;
+                        }
+                    
+                        //if ((!this._margin() && !this._declaration()) || !tokenStream.match(Tokens.SEMICOLON)){
+                        //    break;
+                        //}
+                        this._readWhitespace();
+                    }
+                    
+                    tokenStream.mustMatch(Tokens.RBRACE);
+                    this._readWhitespace();
+                    
+                } catch (ex) {
+                    if (ex instanceof SyntaxError && !this.options.strict){
+                    
+                        //fire error event
+                        this.fire({
+                            type:       "error",
+                            error:      ex,
+                            message:    ex.message,
+                            line:       ex.line,
+                            col:        ex.col
+                        });                          
+                        
+                        //see if there's another declaration
+                        tt = tokenStream.advance([Tokens.SEMICOLON, Tokens.RBRACE]);
+                        if (tt == Tokens.SEMICOLON){
+                            //if there's a semicolon, then there might be another declaration
+                            this._readDeclarations(false, readMargins);
+                        } else if (tt == Tokens.RBRACE){
+                            //if there's a right brace, the rule is finished so don't do anything
+                        } else {
+                            //otherwise, rethrow the error because it wasn't handled properly
+                            throw ex;
+                        }                        
+                        
+                    } else {
+                        //not a syntax error, rethrow it
+                        throw ex;
+                    }
+                }    
+            
+            },      
+            
+            /**
+             * In some cases, you can end up with two white space tokens in a
+             * row. Instead of making a change in every function that looks for
+             * white space, this function is used to match as much white space
+             * as necessary.
+             * @method _readWhitespace
+             * @return {String} The white space if found, empty string if not.
+             * @private
+             */
+            _readWhitespace: function(){
+            
+                var tokenStream = this._tokenStream,
+                    ws = "";
+                    
+                while(tokenStream.match(Tokens.S)){
+                    ws += tokenStream.token().value;
+                }
+                
+                return ws;
+            },
+          
+
+            /**
+             * Throws an error when an unexpected token is found.
+             * @param {Object} token The token that was found.
+             * @method _unexpectedToken
+             * @return {void}
+             * @private
+             */
+            _unexpectedToken: function(token){
+                throw new SyntaxError("Unexpected token '" + token.value + "' at line " + token.startLine + ", col " + token.startCol + ".", token.startLine, token.startCol);
+            },
+            
+            /**
+             * Helper method used for parsing subparts of a style sheet.
+             * @return {void}
+             * @method _verifyEnd
+             * @private
+             */
+            _verifyEnd: function(){
+                if (this._tokenStream.LA(1) != Tokens.EOF){
+                    this._unexpectedToken(this._tokenStream.LT(1));
+                }            
+            },
+            
+            //-----------------------------------------------------------------
+            // Parsing methods
+            //-----------------------------------------------------------------
+            
+            parse: function(input){    
+                this._tokenStream = new TokenStream(input, Tokens);
+                this._stylesheet();
+            },
+            
+            parseStyleSheet: function(input){
+                //just passthrough
+                return this.parse(input);
+            },
+            
+            parseMediaQuery: function(input){
+                this._tokenStream = new TokenStream(input, Tokens);
+                var result = this._media_query();
+                
+                //if there's anything more, then it's an invalid selector
+                this._verifyEnd();
+                
+                //otherwise return result
+                return result;            
+            },
+            
+            /**
+             * Parses a property value (everything after the semicolon).
+             * @return {parserlib.css.PropertyValue} The property value.
+             * @throws parserlib.util.SyntaxError If an unexpected token is found.
+             * @method parserPropertyValue
+             */             
+            parsePropertyValue: function(input){
+            
+                this._tokenStream = new TokenStream(input, Tokens);
+                this._readWhitespace();
+                
+                var result = this._expr();
+                
+                //okay to have a trailing white space
+                this._readWhitespace();
+                
+                //if there's anything more, then it's an invalid selector
+                this._verifyEnd();
+                
+                //otherwise return result
+                return result;
+            },
+            
+            /**
+             * Parses a complete CSS rule, including selectors and
+             * properties.
+             * @param {String} input The text to parser.
+             * @return {Boolean} True if the parse completed successfully, false if not.
+             * @method parseRule
+             */
+            parseRule: function(input){
+                this._tokenStream = new TokenStream(input, Tokens);
+                
+                //skip any leading white space
+                this._readWhitespace();
+                
+                var result = this._ruleset();
+                
+                //skip any trailing white space
+                this._readWhitespace();
+
+                //if there's anything more, then it's an invalid selector
+                this._verifyEnd();
+                
+                //otherwise return result
+                return result;            
+            },
+            
+            /**
+             * Parses a single CSS selector (no comma)
+             * @param {String} input The text to parse as a CSS selector.
+             * @return {Selector} An object representing the selector.
+             * @throws parserlib.util.SyntaxError If an unexpected token is found.
+             * @method parseSelector
+             */
+            parseSelector: function(input){
+            
+                this._tokenStream = new TokenStream(input, Tokens);
+                
+                //skip any leading white space
+                this._readWhitespace();
+                
+                var result = this._selector();
+                
+                //skip any trailing white space
+                this._readWhitespace();
+
+                //if there's anything more, then it's an invalid selector
+                this._verifyEnd();
+                
+                //otherwise return result
+                return result;
+            }
+            
+        };
+        
+    //copy over onto prototype
+    for (prop in additions){
+        proto[prop] = additions[prop];
+    }   
+    
+    return proto;
+}();
+
+
+/*
+nth
+  : S* [ ['-'|'+']? INTEGER? {N} [ S* ['-'|'+'] S* INTEGER ]? |
+         ['-'|'+']? INTEGER | {O}{D}{D} | {E}{V}{E}{N} ] S*
+  ;
+*/
+/**
+ * Represents a selector combinator (whitespace, +, >).
+ * @namespace parserlib.css
+ * @class PropertyName
+ * @extends parserlib.util.SyntaxUnit
+ * @constructor
+ * @param {String} text The text representation of the unit. 
+ * @param {String} hack The type of IE hack applied ("*", "_", or null).
+ * @param {int} line The line of text on which the unit resides.
+ * @param {int} col The column of text on which the unit resides.
+ */
+function PropertyName(text, hack, line, col){
+    
+    SyntaxUnit.call(this, (hack||"") + text, line, col);
+
+    /**
+     * The type of IE hack applied ("*", "_", or null).
+     * @type String
+     * @property hack
+     */
+    this.hack = hack;
+
+}
+
+PropertyName.prototype = new SyntaxUnit();
+PropertyName.prototype.constructor = PropertyName;
+
+
+/**
+ * Represents a single part of a CSS property value, meaning that it represents
+ * just everything single part between ":" and ";". If there are multiple values
+ * separated by commas, this type represents just one of the values.
+ * @param {String[]} parts An array of value parts making up this value.
+ * @param {int} line The line of text on which the unit resides.
+ * @param {int} col The column of text on which the unit resides.
+ * @namespace parserlib.css
+ * @class PropertyValue
+ * @extends parserlib.util.SyntaxUnit
+ * @constructor
+ */
+function PropertyValue(parts, line, col){
+
+    SyntaxUnit.call(this, parts.join(" "), line, col);
+    
+    /**
+     * The parts that make up the selector.
+     * @type Array
+     * @property parts
+     */
+    this.parts = parts;
+    
+}
+
+PropertyValue.prototype = new SyntaxUnit();
+PropertyValue.prototype.constructor = PropertyValue;
+
+
+/**
+ * Represents a single part of a CSS property value, meaning that it represents
+ * just one part of the data between ":" and ";".
+ * @param {String} text The text representation of the unit.
+ * @param {int} line The line of text on which the unit resides.
+ * @param {int} col The column of text on which the unit resides.
+ * @namespace parserlib.css
+ * @class PropertyValuePart
+ * @extends parserlib.util.SyntaxUnit
+ * @constructor
+ */
+function PropertyValuePart(text, line, col){
+
+    SyntaxUnit.apply(this,arguments);
+    
+    /**
+     * Indicates the type of value unit.
+     * @type String
+     * @property type
+     */
+    this.type = "unknown";
+
+    //figure out what type of data it is
+    
+    var temp;
+    
+    //it is a measurement?
+    if (/^([+\-]?[\d\.]+)([a-z]+)$/i.test(text)){  //dimension
+        this.type = "dimension";
+        this.value = +RegExp.$1;
+        this.units = RegExp.$2;
+        
+        //try to narrow down
+        switch(this.units.toLowerCase()){
+        
+            case "em":
+            case "rem":
+            case "ex":
+            case "px":
+            case "cm":
+            case "mm":
+            case "in":
+            case "pt":
+            case "pc":
+                this.type = "length";
+                break;
+                
+            case "deg":
+            case "rad":
+            case "grad":
+                this.type = "angle";
+                break;
+            
+            case "ms":
+            case "s":
+                this.type = "time";
+                break;
+            
+            case "hz":
+            case "khz":
+                this.type = "frequency";
+                break;
+            
+            case "dpi":
+            case "dpcm":
+                this.type = "resolution";
+                break;
+                
+            //default
+                
+        }
+        
+    } else if (/^([+\-]?[\d\.]+)%$/i.test(text)){  //percentage
+        this.type = "percentage";
+        this.value = +RegExp.$1;
+    } else if (/^([+\-]?[\d\.]+)%$/i.test(text)){  //percentage
+        this.type = "percentage";
+        this.value = +RegExp.$1;
+    } else if (/^([+\-]?\d+)$/i.test(text)){  //integer
+        this.type = "integer";
+        this.value = +RegExp.$1;
+    } else if (/^([+\-]?[\d\.]+)$/i.test(text)){  //number
+        this.type = "number";
+        this.value = +RegExp.$1;
+    
+    } else if (/^#([a-f0-9]{3,6})/i.test(text)){  //hexcolor
+        this.type = "color";
+        temp = RegExp.$1;
+        if (temp.length == 3){
+            this.red    = parseInt(temp.charAt(0)+temp.charAt(0),16);
+            this.green  = parseInt(temp.charAt(1)+temp.charAt(1),16);
+            this.blue   = parseInt(temp.charAt(2)+temp.charAt(2),16);            
+        } else {
+            this.red    = parseInt(temp.substring(0,2),16);
+            this.green  = parseInt(temp.substring(2,4),16);
+            this.blue   = parseInt(temp.substring(4,6),16);            
+        }
+    } else if (/^rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/i.test(text)){ //rgb() color with absolute numbers
+        this.type   = "color";
+        this.red    = +RegExp.$1;
+        this.green  = +RegExp.$2;
+        this.blue   = +RegExp.$3;
+    } else if (/^rgb\(\s*(\d+)%\s*,\s*(\d+)%\s*,\s*(\d+)%\s*\)/i.test(text)){ //rgb() color with percentages
+        this.type   = "color";
+        this.red    = +RegExp.$1 * 255 / 100;
+        this.green  = +RegExp.$2 * 255 / 100;
+        this.blue   = +RegExp.$3 * 255 / 100;
+    } else if (/^url\(["']?([^\)"']+)["']?\)/i.test(text)){ //URI
+        this.type   = "uri";
+        this.uri    = RegExp.$1;
+    } else if (/^["'][^"']*["']/.test(text)){    //string
+        this.type   = "string";
+        this.value  = eval(text);
+    } else if (Colors[text.toLowerCase()]){  //named color
+        this.type   = "color";
+        temp        = Colors[text.toLowerCase()].substring(1);
+        this.red    = parseInt(temp.substring(0,2),16);
+        this.green  = parseInt(temp.substring(2,4),16);
+        this.blue   = parseInt(temp.substring(4,6),16);         
+    } else if (/^[\,\/]$/.test(text)){
+        this.type   = "operator";
+        this.value  = text;
+    } else if (/^[a-z\-\u0080-\uFFFF][a-z0-9\-\u0080-\uFFFF]*$/i.test(text)){
+        this.type   = "identifier";
+        this.value  = text;
+    }
+
+}
+
+PropertyValuePart.prototype = new SyntaxUnit();
+PropertyValuePart.prototype.constructor = PropertyValue;
+
+/**
+ * Create a new syntax unit based solely on the given token.
+ * Convenience method for creating a new syntax unit when
+ * it represents a single token instead of multiple.
+ * @param {Object} token The token object to represent.
+ * @return {parserlib.css.PropertyValuePart} The object representing the token.
+ * @static
+ * @method fromToken
+ */
+PropertyValuePart.fromToken = function(token){
+    return new PropertyValuePart(token.value, token.startLine, token.startCol);
+};
+/**
+ * Represents an entire single selector, including all parts but not
+ * including multiple selectors (those separated by commas).
+ * @namespace parserlib.css
+ * @class Selector
+ * @extends parserlib.util.SyntaxUnit
+ * @constructor
+ * @param {Array} parts Array of selectors parts making up this selector.
+ * @param {int} line The line of text on which the unit resides.
+ * @param {int} col The column of text on which the unit resides.
+ */
+function Selector(parts, line, col){
+    
+    SyntaxUnit.call(this, parts.join(" "), line, col);
+    
+    /**
+     * The parts that make up the selector.
+     * @type Array
+     * @property parts
+     */
+    this.parts = parts;
+
+}
+
+Selector.prototype = new SyntaxUnit();
+Selector.prototype.constructor = Selector;
+
+
+/**
+ * Represents a single part of a selector string, meaning a single set of
+ * element name and modifiers. This does not include combinators such as
+ * spaces, +, >, etc.
+ * @namespace parserlib.css
+ * @class SelectorPart
+ * @extends parserlib.util.SyntaxUnit
+ * @constructor
+ * @param {String} elementName The element name in the selector or null
+ *      if there is no element name.
+ * @param {Array} modifiers Array of individual modifiers for the element.
+ *      May be empty if there are none.
+ * @param {String} text The text representation of the unit. 
+ * @param {int} line The line of text on which the unit resides.
+ * @param {int} col The column of text on which the unit resides.
+ */
+function SelectorPart(elementName, modifiers, text, line, col){
+    
+    SyntaxUnit.call(this, text, line, col);
+
+    /**
+     * The tag name of the element to which this part
+     * of the selector affects.
+     * @type String
+     * @property elementName
+     */
+    this.elementName = elementName;
+    
+    /**
+     * The parts that come after the element name, such as class names, IDs,
+     * pseudo classes/elements, etc.
+     * @type Array
+     * @property modifiers
+     */
+    this.modifiers = modifiers;
+
+}
+
+SelectorPart.prototype = new SyntaxUnit();
+SelectorPart.prototype.constructor = SelectorPart;
+
+
+/**
+ * Represents a selector modifier string, meaning a class name, element name,
+ * element ID, pseudo rule, etc.
+ * @namespace parserlib.css
+ * @class SelectorSubPart
+ * @extends parserlib.util.SyntaxUnit
+ * @constructor
+ * @param {String} text The text representation of the unit. 
+ * @param {String} type The type of selector modifier.
+ * @param {int} line The line of text on which the unit resides.
+ * @param {int} col The column of text on which the unit resides.
+ */
+function SelectorSubPart(text, type, line, col){
+    
+    SyntaxUnit.call(this, text, line, col);
+
+    /**
+     * The type of modifier.
+     * @type String
+     * @property type
+     */
+    this.type = type;
+    
+    /**
+     * Some subparts have arguments, this represents them.
+     * @type Array
+     * @property args
+     */
+    this.args = [];
+
+}
+
+SelectorSubPart.prototype = new SyntaxUnit();
+SelectorSubPart.prototype.constructor = SelectorSubPart;
+
+
+
+
+var h = /^[0-9a-fA-F]$/,
+    nonascii = /^[\u0080-\uFFFF]$/,
+    nl = /\n|\r\n|\r|\f/;
+
+//-----------------------------------------------------------------------------
+// Helper functions
+//-----------------------------------------------------------------------------
+
+
+function isHexDigit(c){
+    return c != null && h.test(c);
+}
+
+function isDigit(c){
+    return c != null && /\d/.test(c);
+}
+
+function isWhitespace(c){
+    return c != null && /\s/.test(c);
+}
+
+function isNewLine(c){
+    return c != null && nl.test(c);
+}
+
+function isNameStart(c){
+    return c != null && (/[a-z_\u0080-\uFFFF\\]/i.test(c));
+}
+
+function isNameChar(c){
+    return c != null && (isNameStart(c) || /[0-9\-\\]/.test(c));
+}
+
+function isIdentStart(c){
+    return c != null && (isNameStart(c) || /\-\\/.test(c));
+}
+
+function mix(receiver, supplier){
+	for (var prop in supplier){
+		if (supplier.hasOwnProperty(prop)){
+			receiver[prop] = supplier[prop];
+		}
+	}
+	return receiver;
+}
+
+//-----------------------------------------------------------------------------
+// CSS Token Stream
+//-----------------------------------------------------------------------------
+
+
+/**
+ * A token stream that produces CSS tokens.
+ * @param {String|Reader} input The source of text to tokenize.
+ * @constructor
+ * @class TokenStream
+ * @namespace parserlib.css
+ */
+function TokenStream(input){
+	TokenStreamBase.call(this, input, Tokens);
+}
+
+TokenStream.prototype = mix(new TokenStreamBase(), {
+
+    /**
+     * Overrides the TokenStreamBase method of the same name
+     * to produce CSS tokens.
+     * @param {variant} channel The name of the channel to use
+     *      for the next token.
+     * @return {Object} A token object representing the next token.
+     * @method _getToken
+     * @private
+     */
+    _getToken: function(channel){
+
+        var c,
+            reader = this._reader,
+            token   = null,
+            startLine   = reader.getLine(),
+            startCol    = reader.getCol();
+
+        c = reader.read();
+
+
+        while(c){
+            switch(c){
+
+                /*
+                 * Potential tokens:
+                 * - COMMENT
+                 * - SLASH
+                 * - CHAR
+                 */
+                case "/":
+
+                    if(reader.peek() == "*"){
+                        token = this.commentToken(c, startLine, startCol);
+                    } else {
+                        token = this.charToken(c, startLine, startCol);
+                    }
+                    break;
+
+                /*
+                 * Potential tokens:
+                 * - DASHMATCH
+                 * - INCLUDES
+                 * - PREFIXMATCH
+                 * - SUFFIXMATCH
+                 * - SUBSTRINGMATCH
+                 * - CHAR
+                 */
+                case "|":
+                case "~":
+                case "^":
+                case "$":
+                case "*":
+                    if(reader.peek() == "="){
+                        token = this.comparisonToken(c, startLine, startCol);
+                    } else {
+                        token = this.charToken(c, startLine, startCol);
+                    }
+                    break;
+
+                /*
+                 * Potential tokens:
+                 * - STRING
+                 * - INVALID
+                 */
+                case "\"":
+                case "'":
+                    token = this.stringToken(c, startLine, startCol);
+                    break;
+
+                /*
+                 * Potential tokens:
+                 * - HASH
+                 * - CHAR
+                 */
+                case "#":
+                    if (isNameChar(reader.peek())){
+                        token = this.hashToken(c, startLine, startCol);
+                    } else {
+                        token = this.charToken(c, startLine, startCol);
+                    }
+                    break;
+
+                /*
+                 * Potential tokens:
+                 * - DOT
+                 * - NUMBER
+                 * - DIMENSION
+                 * - PERCENTAGE
+                 */
+                case ".":
+                    if (isDigit(reader.peek())){
+                        token = this.numberToken(c, startLine, startCol);
+                    } else {
+                        token = this.charToken(c, startLine, startCol);
+                    }
+                    break;
+
+                /*
+                 * Potential tokens:
+                 * - CDC
+                 * - MINUS
+                 * - NUMBER
+                 * - DIMENSION
+                 * - PERCENTAGE
+                 */
+                case "-":
+                    if (reader.peek() == "-"){  //could be closing HTML-style comment
+                        token = this.htmlCommentEndToken(c, startLine, startCol);
+                    } else if (isNameStart(reader.peek())){
+                        token = this.identOrFunctionToken(c, startLine, startCol);
+                    } else {
+                        token = this.charToken(c, startLine, startCol);
+                    }
+                    break;
+
+                /*
+                 * Potential tokens:
+                 * - IMPORTANT_SYM
+                 * - CHAR
+                 */
+                case "!":
+                    token = this.importantToken(c, startLine, startCol);
+                    break;
+
+                /*
+                 * Any at-keyword or CHAR
+                 */
+                case "@":
+                    token = this.atRuleToken(c, startLine, startCol);
+                    break;
+
+                /*
+                 * Potential tokens:
+                 * - NOT
+                 * - CHAR
+                 */
+                case ":":
+                    token = this.notToken(c, startLine, startCol);
+                    break;
+
+                /*
+                 * Potential tokens:
+                 * - CDO
+                 * - CHAR
+                 */
+                case "<":
+                    token = this.htmlCommentStartToken(c, startLine, startCol);
+                    break;
+
+                /*
+                 * Potential tokens:
+                 * - UNICODE_RANGE
+                 * - URL
+                 * - CHAR
+                 */
+                case "U":
+                case "u":
+                    if (reader.peek() == "+"){
+                        token = this.unicodeRangeToken(c, startLine, startCol);
+                        break;
+                    }
+                    /*falls through*/
+
+                default:
+
+                    /*
+                     * Potential tokens:
+                     * - NUMBER
+                     * - DIMENSION
+                     * - LENGTH
+                     * - FREQ
+                     * - TIME
+                     * - EMS
+                     * - EXS
+                     * - ANGLE
+                     */
+                    if (isDigit(c)){
+                        token = this.numberToken(c, startLine, startCol);
+                    } else
+
+                    /*
+                     * Potential tokens:
+                     * - S
+                     */
+                    if (isWhitespace(c)){
+                        token = this.whitespaceToken(c, startLine, startCol);
+                    } else
+
+                    /*
+                     * Potential tokens:
+                     * - IDENT
+                     */
+                    if (isIdentStart(c)){
+                        token = this.identOrFunctionToken(c, startLine, startCol);
+                    } else
+
+                    /*
+                     * Potential tokens:
+                     * - CHAR
+                     * - PLUS
+                     */
+                    {
+                        token = this.charToken(c, startLine, startCol);
+                    }
+
+
+
+
+
+
+            }
+
+            //make sure this token is wanted
+            //TODO: check channel
+            break;
+
+            c = reader.read();
+        }
+
+        if (!token && c == null){
+            token = this.createToken(Tokens.EOF,null,startLine,startCol);
+        }
+
+        return token;
+    },
+
+    //-------------------------------------------------------------------------
+    // Methods to create tokens
+    //-------------------------------------------------------------------------
+
+    /**
+     * Produces a token based on available data and the current
+     * reader position information. This method is called by other
+     * private methods to create tokens and is never called directly.
+     * @param {int} tt The token type.
+     * @param {String} value The text value of the token.
+     * @param {int} startLine The beginning line for the character.
+     * @param {int} startCol The beginning column for the character.
+     * @param {Object} options (Optional) Specifies a channel property
+     *      to indicate that a different channel should be scanned
+     *      and/or a hide property indicating that the token should
+     *      be hidden.
+     * @return {Object} A token object.
+     * @method createToken
+     */
+    createToken: function(tt, value, startLine, startCol, options){
+        var reader = this._reader;
+        options = options || {};
+
+        return {
+            value:      value,
+            type:       tt,
+            channel:    options.channel,
+            hide:       options.hide || false,
+            startLine:  startLine,
+            startCol:   startCol,
+            endLine:    reader.getLine(),
+            endCol:     reader.getCol()
+        };
+    },
+
+    //-------------------------------------------------------------------------
+    // Methods to create specific tokens
+    //-------------------------------------------------------------------------
+
+    /**
+     * Produces a token for any at-rule. If the at-rule is unknown, then
+     * the token is for a single "@" character.
+     * @param {String} first The first character for the token.
+     * @param {int} startLine The beginning line for the character.
+     * @param {int} startCol The beginning column for the character.
+     * @return {Object} A token object.
+     * @method atRuleToken
+     */
+    atRuleToken: function(first, startLine, startCol){
+        var rule    = first,
+            reader  = this._reader,
+            tt      = Tokens.CHAR,
+            valid   = false,
+            ident,
+            c;
+
+        /*
+         * First, mark where we are. There are only four @ rules,
+         * so anything else is really just an invalid token.
+         * Basically, if this doesn't match one of the known @
+         * rules, just return '@' as an unknown token and allow
+         * parsing to continue after that point.
+         */
+        reader.mark();
+
+        //try to find the at-keyword
+        ident = this.readName();
+        rule = first + ident;
+        tt = Tokens.type(rule.toLowerCase());
+
+        //if it's not valid, use the first character only and reset the reader
+        if (tt == Tokens.CHAR || tt == Tokens.UNKNOWN){
+            tt = Tokens.CHAR;
+            rule = first;
+            reader.reset();
+        }
+
+        return this.createToken(tt, rule, startLine, startCol);
+    },
+
+    /**
+     * Produces a character token based on the given character
+     * and location in the stream. If there's a special (non-standard)
+     * token name, this is used; otherwise CHAR is used.
+     * @param {String} c The character for the token.
+     * @param {int} startLine The beginning line for the character.
+     * @param {int} startCol The beginning column for the character.
+     * @return {Object} A token object.
+     * @method charToken
+     */
+    charToken: function(c, startLine, startCol){
+        var tt = Tokens.type(c);
+
+        if (tt == -1){
+            tt = Tokens.CHAR;
+        }
+
+        return this.createToken(tt, c, startLine, startCol);
+    },
+
+    /**
+     * Produces a character token based on the given character
+     * and location in the stream. If there's a special (non-standard)
+     * token name, this is used; otherwise CHAR is used.
+     * @param {String} first The first character for the token.
+     * @param {int} startLine The beginning line for the character.
+     * @param {int} startCol The beginning column for the character.
+     * @return {Object} A token object.
+     * @method commentToken
+     */
+    commentToken: function(first, startLine, startCol){
+        var reader  = this._reader,
+            comment = this.readComment(first);
+
+        return this.createToken(Tokens.COMMENT, comment, startLine, startCol);
+    },
+
+    /**
+     * Produces a comparison token based on the given character
+     * and location in the stream. The next character must be
+     * read and is already known to be an equals sign.
+     * @param {String} c The character for the token.
+     * @param {int} startLine The beginning line for the character.
+     * @param {int} startCol The beginning column for the character.
+     * @return {Object} A token object.
+     * @method comparisonToken
+     */
+    comparisonToken: function(c, startLine, startCol){
+        var reader  = this._reader,
+            comparison  = c + reader.read(),
+            tt      = Tokens.type(comparison) || Tokens.CHAR;
+
+        return this.createToken(tt, comparison, startLine, startCol);
+    },
+
+    /**
+     * Produces a hash token based on the specified information. The
+     * first character provided is the pound sign (#) and then this
+     * method reads a name afterward.
+     * @param {String} first The first character (#) in the hash name.
+     * @param {int} startLine The beginning line for the character.
+     * @param {int} startCol The beginning column for the character.
+     * @return {Object} A token object.
+     * @method hashToken
+     */
+    hashToken: function(first, startLine, startCol){
+        var reader  = this._reader,
+            name    = this.readName(first);
+
+        return this.createToken(Tokens.HASH, name, startLine, startCol);
+    },
+
+    /**
+     * Produces a CDO or CHAR token based on the specified information. The
+     * first character is provided and the rest is read by the function to determine
+     * the correct token to create.
+     * @param {String} first The first character in the token.
+     * @param {int} startLine The beginning line for the character.
+     * @param {int} startCol The beginning column for the character.
+     * @return {Object} A token object.
+     * @method htmlCommentStartToken
+     */
+    htmlCommentStartToken: function(first, startLine, startCol){
+        var reader      = this._reader,
+            text        = first;
+
+        reader.mark();
+        text += reader.readCount(3);
+
+        if (text == "<!--"){
+            return this.createToken(Tokens.CDO, text, startLine, startCol);
+        } else {
+            reader.reset();
+            return this.charToken(first, startLine, startCol);
+        }
+    },
+
+    /**
+     * Produces a CDC or CHAR token based on the specified information. The
+     * first character is provided and the rest is read by the function to determine
+     * the correct token to create.
+     * @param {String} first The first character in the token.
+     * @param {int} startLine The beginning line for the character.
+     * @param {int} startCol The beginning column for the character.
+     * @return {Object} A token object.
+     * @method htmlCommentEndToken
+     */
+    htmlCommentEndToken: function(first, startLine, startCol){
+        var reader      = this._reader,
+            text        = first;
+
+        reader.mark();
+        text += reader.readCount(2);
+
+        if (text == "-->"){
+            return this.createToken(Tokens.CDC, text, startLine, startCol);
+        } else {
+            reader.reset();
+            return this.charToken(first, startLine, startCol);
+        }
+    },
+
+    /**
+     * Produces an IDENT or FUNCTION token based on the specified information. The
+     * first character is provided and the rest is read by the function to determine
+     * the correct token to create.
+     * @param {String} first The first character in the identifier.
+     * @param {int} startLine The beginning line for the character.
+     * @param {int} startCol The beginning column for the character.
+     * @return {Object} A token object.
+     * @method identOrFunctionToken
+     */
+    identOrFunctionToken: function(first, startLine, startCol){
+        var reader  = this._reader,
+            ident   = this.readName(first),
+            tt      = Tokens.IDENT;
+
+        //if there's a left paren immediately after, it's a URI or function
+        if (reader.peek() == "("){
+            ident += reader.read();
+            if (ident.toLowerCase() == "url("){
+                tt = Tokens.URI;
+                ident = this.readURI(ident);
+
+                //didn't find a valid URL or there's no closing paren
+                if (ident.toLowerCase() == "url("){
+                    tt = Tokens.FUNCTION;
+                }
+            } else {
+                tt = Tokens.FUNCTION;
+            }
+        } else if (reader.peek() == ":"){  //might be an IE function
+
+            //IE-specific functions always being with progid:
+            if (ident.toLowerCase() == "progid"){
+                ident += reader.readTo("(");
+                tt = Tokens.IE_FUNCTION;
+            }
+        }
+
+        return this.createToken(tt, ident, startLine, startCol);
+    },
+
+    /**
+     * Produces an IMPORTANT_SYM or CHAR token based on the specified information. The
+     * first character is provided and the rest is read by the function to determine
+     * the correct token to create.
+     * @param {String} first The first character in the token.
+     * @param {int} startLine The beginning line for the character.
+     * @param {int} startCol The beginning column for the character.
+     * @return {Object} A token object.
+     * @method importantToken
+     */
+    importantToken: function(first, startLine, startCol){
+        var reader      = this._reader,
+            important   = first,
+            tt          = Tokens.CHAR,
+            temp,
+            c;
+
+        reader.mark();
+        c = reader.read();
+
+        while(c){
+
+            //there can be a comment in here
+            if (c == "/"){
+
+                //if the next character isn't a star, then this isn't a valid !important token
+                if (reader.peek() != "*"){
+                    break;
+                } else {
+                    temp = this.readComment(c);
+                    if (temp == ""){    //broken!
+                        break;
+                    }
+                }
+            } else if (isWhitespace(c)){
+                important += c + this.readWhitespace();
+            } else if (/i/i.test(c)){
+                temp = reader.readCount(8);
+                if (/mportant/i.test(temp)){
+                    important += c + temp;
+                    tt = Tokens.IMPORTANT_SYM;
+
+                }
+                break;  //we're done
+            } else {
+                break;
+            }
+
+            c = reader.read();
+        }
+
+        if (tt == Tokens.CHAR){
+            reader.reset();
+            return this.charToken(first, startLine, startCol);
+        } else {
+            return this.createToken(tt, important, startLine, startCol);
+        }
+
+
+    },
+
+    /**
+     * Produces a NOT or CHAR token based on the specified information. The
+     * first character is provided and the rest is read by the function to determine
+     * the correct token to create.
+     * @param {String} first The first character in the token.
+     * @param {int} startLine The beginning line for the character.
+     * @param {int} startCol The beginning column for the character.
+     * @return {Object} A token object.
+     * @method notToken
+     */
+    notToken: function(first, startLine, startCol){
+        var reader      = this._reader,
+            text        = first;
+
+        reader.mark();
+        text += reader.readCount(4);
+
+        if (text.toLowerCase() == ":not("){
+            return this.createToken(Tokens.NOT, text, startLine, startCol);
+        } else {
+            reader.reset();
+            return this.charToken(first, startLine, startCol);
+        }
+    },
+
+    /**
+     * Produces a number token based on the given character
+     * and location in the stream. This may return a token of
+     * NUMBER, EMS, EXS, LENGTH, ANGLE, TIME, FREQ, DIMENSION,
+     * or PERCENTAGE.
+     * @param {String} first The first character for the token.
+     * @param {int} startLine The beginning line for the character.
+     * @param {int} startCol The beginning column for the character.
+     * @return {Object} A token object.
+     * @method numberToken
+     */
+    numberToken: function(first, startLine, startCol){
+        var reader  = this._reader,
+            value   = this.readNumber(first),
+            ident,
+            tt      = Tokens.NUMBER,
+            c       = reader.peek();
+
+        if (isIdentStart(c)){
+            ident = this.readName(reader.read());
+            value += ident;
+
+            if (/^em$|^ex$|^px$|^gd$|^rem$|^vw$|^vh$|^vm$|^ch$|^cm$|^mm$|^in$|^pt$|^pc$/i.test(ident)){
+                tt = Tokens.LENGTH;
+            } else if (/^deg|^rad$|^grad$/i.test(ident)){
+                tt = Tokens.ANGLE;
+            } else if (/^ms$|^s$/i.test(ident)){
+                tt = Tokens.TIME;
+            } else if (/^hz$|^khz$/i.test(ident)){
+                tt = Tokens.FREQ;
+            } else if (/^dpi$|^dpcm$/i.test(ident)){
+                tt = Tokens.RESOLUTION;
+            } else {
+                tt = Tokens.DIMENSION;
+            }
+
+        } else if (c == "%"){
+            value += reader.read();
+            tt = Tokens.PERCENTAGE;
+        }
+
+        return this.createToken(tt, value, startLine, startCol);
+    },
+
+    /**
+     * Produces a string token based on the given character
+     * and location in the stream. Since strings may be indicated
+     * by single or double quotes, a failure to match starting
+     * and ending quotes results in an INVALID token being generated.
+     * The first character in the string is passed in and then
+     * the rest are read up to and including the final quotation mark.
+     * @param {String} first The first character in the string.
+     * @param {int} startLine The beginning line for the character.
+     * @param {int} startCol The beginning column for the character.
+     * @return {Object} A token object.
+     * @method stringToken
+     */
+    stringToken: function(first, startLine, startCol){
+        var delim   = first,
+            string  = first,
+            reader  = this._reader,
+            prev    = first,
+            tt      = Tokens.STRING,
+            c       = reader.read();
+
+        while(c){
+            string += c;
+
+            //if the delimiter is found with an escapement, we're done.
+            if (c == delim && prev != "\\"){
+                break;
+            }
+
+            //if there's a newline without an escapement, it's an invalid string
+            if (isNewLine(reader.peek()) && c != "\\"){
+                tt = Tokens.INVALID;
+                break;
+            }
+
+            //save previous and get next
+            prev = c;
+            c = reader.read();
+        }
+
+        //if c is null, that means we're out of input and the string was never closed
+        if (c == null){
+            tt = Tokens.INVALID;
+        }
+
+        return this.createToken(tt, string, startLine, startCol);
+    },
+
+    unicodeRangeToken: function(first, startLine, startCol){
+        var reader  = this._reader,
+            value   = first,
+            temp,
+            tt      = Tokens.CHAR;
+
+        //then it should be a unicode range
+        if (reader.peek() == "+"){
+            reader.mark();
+            value += reader.read();
+            value += this.readUnicodeRangePart(true);
+
+            //ensure there's an actual unicode range here
+            if (value.length == 2){
+                reader.reset();
+            } else {
+
+                tt = Tokens.UNICODE_RANGE;
+
+                //if there's a ? in the first part, there can't be a second part
+                if (value.indexOf("?") == -1){
+
+                    if (reader.peek() == "-"){
+                        reader.mark();
+                        temp = reader.read();
+                        temp += this.readUnicodeRangePart(false);
+
+                        //if there's not another value, back up and just take the first
+                        if (temp.length == 1){
+                            reader.reset();
+                        } else {
+                            value += temp;
+                        }
+                    }
+
+                }
+            }
+        }
+
+        return this.createToken(tt, value, startLine, startCol);
+    },
+
+    /**
+     * Produces a S token based on the specified information. Since whitespace
+     * may have multiple characters, this consumes all whitespace characters
+     * into a single token.
+     * @param {String} first The first character in the token.
+     * @param {int} startLine The beginning line for the character.
+     * @param {int} startCol The beginning column for the character.
+     * @return {Object} A token object.
+     * @method whitespaceToken
+     */
+    whitespaceToken: function(first, startLine, startCol){
+        var reader  = this._reader,
+            value   = first + this.readWhitespace();
+        return this.createToken(Tokens.S, value, startLine, startCol);
+    },
+
+
+
+
+    //-------------------------------------------------------------------------
+    // Methods to read values from the string stream
+    //-------------------------------------------------------------------------
+
+    readUnicodeRangePart: function(allowQuestionMark){
+        var reader  = this._reader,
+            part = "",
+            c       = reader.peek();
+
+        //first read hex digits
+        while(isHexDigit(c) && part.length < 6){
+            reader.read();
+            part += c;
+            c = reader.peek();
+        }
+
+        //then read question marks if allowed
+        if (allowQuestionMark){
+            while(c == "?" && part.length < 6){
+                reader.read();
+                part += c;
+                c = reader.peek();
+            }
+        }
+
+        //there can't be any other characters after this point
+
+        return part;
+    },
+
+    readWhitespace: function(){
+        var reader  = this._reader,
+            whitespace = "",
+            c       = reader.peek();
+
+        while(isWhitespace(c)){
+            reader.read();
+            whitespace += c;
+            c = reader.peek();
+        }
+
+        return whitespace;
+    },
+    readNumber: function(first){
+        var reader  = this._reader,
+            number  = first,
+            hasDot  = (first == "."),
+            c       = reader.peek();
+
+
+        while(c){
+            if (isDigit(c)){
+                number += reader.read();
+            } else if (c == "."){
+                if (hasDot){
+                    break;
+                } else {
+                    hasDot = true;
+                    number += reader.read();
+                }
+            } else {
+                break;
+            }
+
+            c = reader.peek();
+        }
+
+        return number;
+    },
+    readString: function(){
+        var reader  = this._reader,
+            delim   = reader.read(),
+            string  = delim,
+            prev    = delim,
+            c       = reader.peek();
+
+        while(c){
+            c = reader.read();
+            string += c;
+
+            //if the delimiter is found with an escapement, we're done.
+            if (c == delim && prev != "\\"){
+                break;
+            }
+
+            //if there's a newline without an escapement, it's an invalid string
+            if (isNewLine(reader.peek()) && c != "\\"){
+                string = "";
+                break;
+            }
+
+            //save previous and get next
+            prev = c;
+            c = reader.peek();
+        }
+
+        //if c is null, that means we're out of input and the string was never closed
+        if (c == null){
+            string = "";
+        }
+
+        return string;
+    },
+    readURI: function(first){
+        var reader  = this._reader,
+            uri     = first,
+            inner   = "",
+            c       = reader.peek();
+
+        reader.mark();
+
+        //skip whitespace before
+        while(c && isWhitespace(c)){
+            reader.read();
+            c = reader.peek();
+        }
+
+        //it's a string
+        if (c == "'" || c == "\""){
+            inner = this.readString();
+        } else {
+            inner = this.readURL();
+        }
+
+        c = reader.peek();
+
+        //skip whitespace after
+        while(c && isWhitespace(c)){
+            reader.read();
+            c = reader.peek();
+        }
+
+        //if there was no inner value or the next character isn't closing paren, it's not a URI
+        if (inner == "" || c != ")"){
+            uri = first;
+            reader.reset();
+        } else {
+            uri += inner + reader.read();
+        }
+
+        return uri;
+    },
+    readURL: function(){
+        var reader  = this._reader,
+            url     = "",
+            c       = reader.peek();
+
+        //TODO: Check for escape and nonascii
+        while (/^[!#$%&\\*-~]$/.test(c)){
+            url += reader.read();
+            c = reader.peek();
+        }
+
+        return url;
+
+    },
+    readName: function(first){
+        var reader  = this._reader,
+            ident   = first || "",
+            c       = reader.peek();
+
+        while(true){
+            if (c == "\\"){
+                ident += this.readEscape(reader.read());
+                c = reader.peek();
+            } else if(c && isNameChar(c)){
+                ident += reader.read();
+                c = reader.peek();
+            } else {
+                break;
+            }
+        }
+
+        return ident;
+    },
+    
+    readEscape: function(first){
+        var reader  = this._reader,
+            cssEscape = first || "",
+            i       = 0,
+            c       = reader.peek();    
+    
+        if (isHexDigit(c)){
+            do {
+                cssEscape += reader.read();
+                c = reader.peek();
+            } while(c && isHexDigit(c) && ++i < 6);
+        }
+        
+        if (cssEscape.length == 3 && /\s/.test(c) ||
+            cssEscape.length == 7 || cssEscape.length == 1){
+                reader.read();
+        } else {
+            c = "";
+        }
+        
+        return cssEscape + c;
+    },
+    
+    readComment: function(first){
+        var reader  = this._reader,
+            comment = first || "",
+            c       = reader.read();
+
+        if (c == "*"){
+            while(c){
+                comment += c;
+
+                //look for end of comment
+                if (c == "*" && reader.peek() == "/"){
+                    comment += reader.read();
+                    break;
+                }
+
+                c = reader.read();
+            }
+
+            return comment;
+        } else {
+            return "";
+        }
+
+    }
+});
+
+
+var Tokens  = [
+
+    /*
+     * The following token names are defined in CSS3 Grammar: http://www.w3.org/TR/css3-syntax/#lexical
+     */
+     
+    //HTML-style comments
+    { name: "CDO"},
+    { name: "CDC"},
+
+    //ignorables
+    { name: "S", whitespace: true/*, channel: "ws"*/},
+    { name: "COMMENT", comment: true, hide: true, channel: "comment" },
+        
+    //attribute equality
+    { name: "INCLUDES", text: "~="},
+    { name: "DASHMATCH", text: "|="},
+    { name: "PREFIXMATCH", text: "^="},
+    { name: "SUFFIXMATCH", text: "$="},
+    { name: "SUBSTRINGMATCH", text: "*="},
+        
+    //identifier types
+    { name: "STRING"},     
+    { name: "IDENT"},
+    { name: "HASH"},
+
+    //at-keywords
+    { name: "IMPORT_SYM", text: "@import"},
+    { name: "PAGE_SYM", text: "@page"},
+    { name: "MEDIA_SYM", text: "@media"},
+    { name: "FONT_FACE_SYM", text: "@font-face"},
+    { name: "CHARSET_SYM", text: "@charset"},
+    { name: "NAMESPACE_SYM", text: "@namespace"},
+    //{ name: "ATKEYWORD"},
+    
+    //CSS3 animations
+    { name: "KEYFRAMES_SYM", text: [ "@keyframes", "@-webkit-keyframes", "@-moz-keyframes" ] },
+
+    //important symbol
+    { name: "IMPORTANT_SYM"},
+
+    //measurements
+    { name: "LENGTH"},
+    { name: "ANGLE"},
+    { name: "TIME"},
+    { name: "FREQ"},
+    { name: "DIMENSION"},
+    { name: "PERCENTAGE"},
+    { name: "NUMBER"},
+    
+    //functions
+    { name: "URI"},
+    { name: "FUNCTION"},
+    
+    //Unicode ranges
+    { name: "UNICODE_RANGE"},
+    
+    /*
+     * The following token names are defined in CSS3 Selectors: http://www.w3.org/TR/css3-selectors/#selector-syntax
+     */    
+    
+    //invalid string
+    { name: "INVALID"},
+    
+    //combinators
+    { name: "PLUS", text: "+" },
+    { name: "GREATER", text: ">"},
+    { name: "COMMA", text: ","},
+    { name: "TILDE", text: "~"},
+    
+    //modifier
+    { name: "NOT"},        
+    
+    /*
+     * Defined in CSS3 Paged Media
+     */
+    { name: "TOPLEFTCORNER_SYM", text: "@top-left-corner"},
+    { name: "TOPLEFT_SYM", text: "@top-left"},
+    { name: "TOPCENTER_SYM", text: "@top-center"},
+    { name: "TOPRIGHT_SYM", text: "@top-right"},
+    { name: "TOPRIGHTCORNER_SYM", text: "@top-right-corner"},
+    { name: "BOTTOMLEFTCORNER_SYM", text: "@bottom-left-corner"},
+    { name: "BOTTOMLEFT_SYM", text: "@bottom-left"},
+    { name: "BOTTOMCENTER_SYM", text: "@bottom-center"},
+    { name: "BOTTOMRIGHT_SYM", text: "@bottom-right"},
+    { name: "BOTTOMRIGHTCORNER_SYM", text: "@bottom-right-corner"},
+    { name: "LEFTTOP_SYM", text: "@left-top"},
+    { name: "LEFTMIDDLE_SYM", text: "@left-middle"},
+    { name: "LEFTBOTTOM_SYM", text: "@left-bottom"},
+    { name: "RIGHTTOP_SYM", text: "@right-top"},
+    { name: "RIGHTMIDDLE_SYM", text: "@right-middle"},
+    { name: "RIGHTBOTTOM_SYM", text: "@right-bottom"},
+
+    /*
+     * The following token names are defined in CSS3 Media Queries: http://www.w3.org/TR/css3-mediaqueries/#syntax
+     */
+    /*{ name: "MEDIA_ONLY", state: "media"},
+    { name: "MEDIA_NOT", state: "media"},
+    { name: "MEDIA_AND", state: "media"},*/
+    { name: "RESOLUTION", state: "media"},
+
+    /*
+     * The following token names are not defined in any CSS specification but are used by the lexer.
+     */
+    
+    //not a real token, but useful for stupid IE filters
+    { name: "IE_FUNCTION" },
+
+    //part of CSS3 grammar but not the Flex code
+    { name: "CHAR" },
+    
+    //TODO: Needed?
+    //Not defined as tokens, but might as well be
+    {
+        name: "PIPE",
+        text: "|"
+    },
+    {
+        name: "SLASH",
+        text: "/"
+    },
+    {
+        name: "MINUS",
+        text: "-"
+    },
+    {
+        name: "STAR",
+        text: "*"
+    },
+
+    {
+        name: "LBRACE",
+        text: "{"
+    },   
+    {
+        name: "RBRACE",
+        text: "}"
+    },      
+    {
+        name: "LBRACKET",
+        text: "["
+    },   
+    {
+        name: "RBRACKET",
+        text: "]"
+    },    
+    {
+        name: "EQUALS",
+        text: "="
+    },
+    {
+        name: "COLON",
+        text: ":"
+    },    
+    {
+        name: "SEMICOLON",
+        text: ";"
+    },    
+ 
+    {
+        name: "LPAREN",
+        text: "("
+    },   
+    {
+        name: "RPAREN",
+        text: ")"
+    },     
+    {
+        name: "DOT",
+        text: "."
+    }
+];
+
+(function(){
+
+    var nameMap = [],
+        typeMap = {};
+    
+    Tokens.UNKNOWN = -1;
+    Tokens.unshift({name:"EOF"});
+    for (var i=0, len = Tokens.length; i < len; i++){
+        nameMap.push(Tokens[i].name);
+        Tokens[Tokens[i].name] = i;
+        if (Tokens[i].text){
+            if (Tokens[i].text instanceof Array){
+                for (var j=0; j < Tokens[i].text.length; j++){
+                    typeMap[Tokens[i].text[j]] = i;
+                }
+            } else {
+                typeMap[Tokens[i].text] = i;
+            }
+        }
+    }
+    
+    Tokens.name = function(tt){
+        return nameMap[tt];
+    };
+    
+    Tokens.type = function(c){
+        return typeMap[c] || -1;
+    };
+
+})();
+
+
+
+
+
+parserlib.css = {
+Colors              :Colors,    
+Combinator          :Combinator,                
+Parser              :Parser,
+PropertyName        :PropertyName,
+PropertyValue       :PropertyValue,
+PropertyValuePart   :PropertyValuePart,
+MediaFeature        :MediaFeature,
+MediaQuery          :MediaQuery,
+Selector            :Selector,
+SelectorPart        :SelectorPart,
+SelectorSubPart     :SelectorSubPart,
+TokenStream         :TokenStream,
+Tokens              :Tokens
+};
+})();
+
+/**
+ * Main CSSLint object.
+ * @class CSSLint
+ * @static
+ * @extends parserlib.util.EventTarget
+ */
+var CSSLint = (function(){
+
+    var rules      = [],
+        formatters = [],
+        api        = new parserlib.util.EventTarget();
+        
+    api.version = "@VERSION@";
+
+    //-------------------------------------------------------------------------
+    // Rule Management
+    //-------------------------------------------------------------------------
+
+    /**
+     * Adds a new rule to the engine.
+     * @param {Object} rule The rule to add.
+     * @method addRule
+     */
+    api.addRule = function(rule){
+        rules.push(rule);
+        rules[rule.id] = rule;
+    };
+
+    /**
+     * Clears all rule from the engine.
+     * @method clearRules
+     */
+    api.clearRules = function(){
+        rules = [];
+    };
+
+    //-------------------------------------------------------------------------
+    // Formatters
+    //-------------------------------------------------------------------------
+
+    /**
+     * Adds a new formatter to the engine.
+     * @param {Object} formatter The formatter to add.
+     * @method addFormatter
+     */
+    api.addFormatter = function(formatter) {
+        // formatters.push(formatter);
+        formatters[formatter.id] = formatter;
+    };
+    
+    /**
+     * Retrieves a formatter for use.
+     * @param {String} formatId The name of the format to retrieve.
+     * @return {Object} The formatter or undefined.
+     * @method getFormatter
+     */
+    api.getFormatter = function(formatId){
+        return formatters[formatId];
+    };
+    
+    /**
+     * Formats the results in a particular format for a single file.
+     * @param {Object} result The results returned from CSSLint.verify().
+     * @param {String} filename The filename for which the results apply.
+     * @param {String} formatId The name of the formatter to use.
+     * @return {String} A formatted string for the results.
+     * @method format
+     */
+    api.format = function(results, filename, formatId) {
+        var formatter = this.getFormatter(formatId),
+            result = null;
+            
+        if (formatter){
+            result = formatter.startFormat();
+            result += formatter.formatResults(results, filename);
+            result += formatter.endFormat();
+        }
+        
+        return result;
+    }    
+    
+    /**
+     * Indicates if the given format is supported.
+     * @param {String} formatId The ID of the format to check.
+     * @return {Boolean} True if the format exists, false if not.
+     * @method hasFormat
+     */
+    api.hasFormat = function(formatId){
+        return formatters.hasOwnProperty(formatId);
+    };
+
+    //-------------------------------------------------------------------------
+    // Verification
+    //-------------------------------------------------------------------------
+
+    /**
+     * Starts the verification process for the given CSS text.
+     * @param {String} text The CSS text to verify.
+     * @param {Object} ruleset (Optional) List of rules to apply. If null, then
+     *      all rules are used.
+     * @return {Object} Results of the verification.
+     * @method verify
+     */
+    api.verify = function(text, ruleset){
+
+        var i       = 0,
+            len     = rules.length,
+            reporter,
+            lines,
+            parser = new parserlib.css.Parser({ starHack: true, ieFilters: true,
+                                                underscoreHack: true, strict: false });
+
+        lines = text.split(/\n\r?/g);
+        reporter = new Reporter(lines);
+
+        if (!ruleset){
+            while (i < len){
+                rules[i++].init(parser, reporter);
+            }
+        } else {
+            ruleset.errors = 1;       //always report parsing errors
+            for (i in ruleset){
+                if(ruleset.hasOwnProperty(i)){
+                    if (rules[i]){
+                        rules[i].init(parser, reporter);
+                    }
+                }
+            }
+        }
+
+        //capture most horrible error type
+        try {
+            parser.parse(text);
+        } catch (ex) {
+            reporter.error("Fatal error, cannot continue: " + ex.message, ex.line, ex.col);
+        }
+
+        return {
+            messages    : reporter.messages,
+            stats       : reporter.stats
+        };
+    };
+
+    //-------------------------------------------------------------------------
+    // Publish the API
+    //-------------------------------------------------------------------------
+
+    return api;
+
+})();
+/**
+ * An instance of Report is used to report results of the
+ * verification back to the main API.
+ * @class Reporter
+ * @constructor
+ * @param {String[]} lines The text lines of the source.
+ */
+function Reporter(lines){
+
+    /**
+     * List of messages being reported.
+     * @property messages
+     * @type String[]
+     */
+    this.messages = [];
+
+    /**
+     * List of statistics being reported.
+     * @property stats
+     * @type String[]
+     */
+    this.stats = [];
+
+    /**
+     * Lines of code being reported on. Used to provide contextual information
+     * for messages.
+     * @property lines
+     * @type String[]
+     */
+    this.lines = lines;
+}
+
+Reporter.prototype = {
+
+    //restore constructor
+    constructor: Reporter,
+
+    /**
+     * Report an error.
+     * @param {String} message The message to store.
+     * @param {int} line The line number.
+     * @param {int} col The column number.
+     * @param {Object} rule The rule this message relates to.
+     * @method error
+     */
+    error: function(message, line, col, rule){
+        this.messages.push({
+            type    : "error",
+            line    : line,
+            col     : col,
+            message : message,
+            evidence: this.lines[line-1],
+            rule    : rule
+        });
+    },
+
+    /**
+     * Report an warning.
+     * @param {String} message The message to store.
+     * @param {int} line The line number.
+     * @param {int} col The column number.
+     * @param {Object} rule The rule this message relates to.
+     * @method warn
+     */
+    warn: function(message, line, col, rule){
+        this.messages.push({
+            type    : "warning",
+            line    : line,
+            col     : col,
+            message : message,
+            evidence: this.lines[line-1],
+            rule    : rule
+        });
+    },
+
+    /**
+     * Report some informational text.
+     * @param {String} message The message to store.
+     * @param {int} line The line number.
+     * @param {int} col The column number.
+     * @param {Object} rule The rule this message relates to.
+     * @method info
+     */
+    info: function(message, line, col, rule){
+        this.messages.push({
+            type    : "info",
+            line    : line,
+            col     : col,
+            message : message,
+            evidence: this.lines[line-1],
+            rule    : rule
+        });
+    },
+
+    /**
+     * Report some rollup error information.
+     * @param {String} message The message to store.
+     * @param {Object} rule The rule this message relates to.
+     * @method rollupError
+     */
+    rollupError: function(message, rule){
+        this.messages.push({
+            type    : "error",
+            rollup  : true,
+            message : message,
+            rule    : rule
+        });
+    },
+
+    /**
+     * Report some rollup warning information.
+     * @param {String} message The message to store.
+     * @param {Object} rule The rule this message relates to.
+     * @method rollupWarn
+     */
+    rollupWarn: function(message, rule){
+        this.messages.push({
+            type    : "warning",
+            rollup  : true,
+            message : message,
+            rule    : rule
+        });
+    },
+
+    /**
+     * Report a statistic.
+     * @param {String} name The name of the stat to store.
+     * @param {Variant} value The value of the stat.
+     * @method stat
+     */
+    stat: function(name, value){
+        this.stats[name] = value;
+    }
+};
+/*
+ * Utility functions that make life easier.
+ */
+
+/*
+ * Adds all properties from supplier onto receiver,
+ * overwriting if the same name already exists on
+ * reciever.
+ * @param {Object} The object to receive the properties.
+ * @param {Object} The object to provide the properties.
+ * @return {Object} The receiver
+ */
+function mix(reciever, supplier){
+    var prop;
+
+    for (prop in supplier){
+        if (supplier.hasOwnProperty(prop)){
+            receiver[prop] = supplier[prop];
+        }
+    }
+
+    return prop;
+}
+
+/*
+ * Polyfill for array indexOf() method.
+ * @param {Array} values The array to search.
+ * @param {Variant} value The value to search for.
+ * @return {int} The index of the value if found, -1 if not.
+ */
+function indexOf(values, value){
+    if (values.indexOf){
+        return values.indexOf(value);
+    } else {
+        for (var i=0, len=values.length; i < len; i++){
+            if (values[i] === value){
+                return i;
+            }
+        }
+        return -1;
+    }
+}
+/*
+ * Rule: Don't use adjoining classes (.foo.bar).
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "adjoining-classes",
+    name: "Adjoining Classes",
+    desc: "Don't use adjoining classes.",
+    browsers: "IE6",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this;
+        parser.addListener("startrule", function(event){
+            var selectors = event.selectors,
+                selector,
+                part,
+                modifier,
+                classCount,
+                i, j, k;
+
+            for (i=0; i < selectors.length; i++){
+                selector = selectors[i];
+                for (j=0; j < selector.parts.length; j++){
+                    part = selector.parts[j];
+                    if (part instanceof parserlib.css.SelectorPart){
+                        classCount = 0;
+                        for (k=0; k < part.modifiers.length; k++){
+                            modifier = part.modifiers[k];
+                            if (modifier.type == "class"){
+                                classCount++;
+                            }
+                            if (classCount > 1){
+                                reporter.warn("Don't use adjoining classes.", part.line, part.col, rule);
+                            }
+                        }
+                    }
+                }
+            }
+        });
+    }
+
+});
+/*
+ * Rule: Don't use width or height when using padding or border. 
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "box-model",
+    name: "Box Model",
+    desc: "Don't use width or height when using padding or border.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this,
+            widthProperties = {
+                border: 1,
+                "border-left": 1,
+                "border-right": 1,
+                padding: 1,
+                "padding-left": 1,
+                "padding-right": 1
+            },
+            heightProperties = {
+                border: 1,
+                "border-bottom": 1,
+                "border-top": 1,
+                padding: 1,
+                "padding-bottom": 1,
+                "padding-top": 1
+            },
+            properties;
+
+        parser.addListener("startrule", function(){
+            properties = {
+            };
+        });
+
+        parser.addListener("property", function(event){
+            var name = event.property.text.toLowerCase();
+            
+            if (heightProperties[name] || widthProperties[name]){
+                if (!/^0\S*$/.test(event.value) && !(name == "border" && event.value == "none")){
+                    properties[name] = { line: event.property.line, col: event.property.col, value: event.value };
+                }
+            } else {
+                if (name == "width" || name == "height"){
+                    properties[name] = 1;
+                }
+            }
+            
+        });
+
+        parser.addListener("endrule", function(){
+            var prop;
+            if (properties["height"]){
+                for (prop in heightProperties){
+                    if (heightProperties.hasOwnProperty(prop) && properties[prop]){
+                    
+                        //special case for padding
+                        if (prop == "padding" && properties[prop].value.parts.length == 2 && properties[prop].value.parts[0].value == 0){
+                            //noop
+                        } else {
+                            reporter.warn("Broken box model: using height with " + prop + ".", properties[prop].line, properties[prop].col, rule);
+                        }
+                    }
+                }
+            }
+
+            if (properties["width"]){
+                for (prop in widthProperties){
+                    if (widthProperties.hasOwnProperty(prop) && properties[prop]){
+
+                        if (prop == "padding" && properties[prop].value.parts.length == 2 && properties[prop].value.parts[1].value == 0){
+                            //noop
+                        } else {
+                            reporter.warn("Broken box model: using width with " + prop + ".", properties[prop].line, properties[prop].col, rule);
+                        }
+                    }
+                }
+            }
+
+        });
+    }
+
+});
+/*
+ * Rule: Include all compatible vendor prefixes to reach a wider
+ * range of users.
+ */
+/*global CSSLint*/ 
+CSSLint.addRule({
+
+    //rule information
+    id: "compatible-vendor-prefixes",
+    name: "Compatible Vendor Prefixes",
+    desc: "Include all compatible vendor prefixes to reach a wider range of users.",
+    browsers: "All",
+
+    //initialization
+    init: function (parser, reporter) {
+        var rule = this,
+            compatiblePrefixes,
+            properties,
+            prop,
+            variations,
+            prefixed,
+            i,
+            len,
+            arrayPush = Array.prototype.push,
+            applyTo = [];
+
+        // See http://peter.sh/experiments/vendor-prefixed-css-property-overview/ for details
+        compatiblePrefixes = {
+            "animation"                  : "webkit moz",
+            "animation-delay"            : "webkit moz",
+            "animation-direction"        : "webkit moz",
+            "animation-duration"         : "webkit moz",
+            "animation-fill-mode"        : "webkit moz",
+            "animation-iteration-count"  : "webkit moz",
+            "animation-name"             : "webkit moz",
+            "animation-play-state"       : "webkit moz",
+            "animation-timing-function"  : "webkit moz",
+            "appearance"                 : "webkit moz",
+            "border-end"                 : "webkit moz",
+            "border-end-color"           : "webkit moz",
+            "border-end-style"           : "webkit moz",
+            "border-end-width"           : "webkit moz",
+            "border-image"               : "webkit moz o",
+            "border-radius"              : "webkit moz",
+            "border-start"               : "webkit moz",
+            "border-start-color"         : "webkit moz",
+            "border-start-style"         : "webkit moz",
+            "border-start-width"         : "webkit moz",
+            "box-align"                  : "webkit moz ms",
+            "box-direction"              : "webkit moz ms",
+            "box-flex"                   : "webkit moz ms",
+            "box-lines"                  : "webkit ms",
+            "box-ordinal-group"          : "webkit moz ms",
+            "box-orient"                 : "webkit moz ms",
+            "box-pack"                   : "webkit moz ms",
+            "box-sizing"                 : "webkit moz",
+            "box-shadow"                 : "webkit moz",
+            "column-count"               : "webkit moz",
+            "column-gap"                 : "webkit moz",
+            "column-rule"                : "webkit moz",
+            "column-rule-color"          : "webkit moz",
+            "column-rule-style"          : "webkit moz",
+            "column-rule-width"          : "webkit moz",
+            "column-width"               : "webkit moz",
+            "hyphens"                    : "epub moz",
+            "line-break"                 : "webkit ms",
+            "margin-end"                 : "webkit moz",
+            "margin-start"               : "webkit moz",
+            "marquee-speed"              : "webkit wap",
+            "marquee-style"              : "webkit wap",
+            "padding-end"                : "webkit moz",
+            "padding-start"              : "webkit moz",
+            "tab-size"                   : "moz o",
+            "text-size-adjust"           : "webkit ms",
+            "transform"                  : "webkit moz ms o",
+            "transform-origin"           : "webkit moz ms o",
+            "transition"                 : "webkit moz o",
+            "transition-delay"           : "webkit moz o",
+            "transition-duration"        : "webkit moz o",
+            "transition-property"        : "webkit moz o",
+            "transition-timing-function" : "webkit moz o",
+            "user-modify"                : "webkit moz",
+            "user-select"                : "webkit moz",
+            "word-break"                 : "epub ms",
+            "writing-mode"               : "epub ms"
+        };
+
+        for (prop in compatiblePrefixes) {
+            if (compatiblePrefixes.hasOwnProperty(prop)) {
+                variations = [];
+                prefixed = compatiblePrefixes[prop].split(' ');
+                for (i = 0, len = prefixed.length; i < len; i++) {
+                    variations.push('-' + prefixed[i] + '-' + prop);
+                }
+                compatiblePrefixes[prop] = variations;
+                arrayPush.apply(applyTo, variations);
+            }
+        }
+        parser.addListener("startrule", function () {
+            properties = [];
+        });
+
+        parser.addListener("property", function (event) {
+            var name = event.property.text;
+            if (applyTo.indexOf(name) > -1) {
+                properties.push(name);
+            }
+        });
+
+        parser.addListener("endrule", function (event) {
+            if (!properties.length) {
+                return;
+            }
+
+            var propertyGroups = {},
+                i,
+                len,
+                name,
+                prop,
+                variations,
+                value,
+                full,
+                actual,
+                item,
+                propertiesSpecified;
+
+            for (i = 0, len = properties.length; i < len; i++) {
+                name = properties[i];
+
+                for (prop in compatiblePrefixes) {
+                    if (compatiblePrefixes.hasOwnProperty(prop)) {
+                        variations = compatiblePrefixes[prop];
+                        if (variations.indexOf(name) > -1) {
+                            if (propertyGroups[prop] === undefined) {
+                                propertyGroups[prop] = {
+                                    full : variations.slice(0),
+                                    actual : []
+                                };
+                            }
+                            if (propertyGroups[prop].actual.indexOf(name) === -1) {
+                                propertyGroups[prop].actual.push(name);
+                            }
+                        }
+                    }
+                }
+            }
+
+            for (prop in propertyGroups) {
+                if (propertyGroups.hasOwnProperty(prop)) {
+                    value = propertyGroups[prop];
+                    full = value.full;
+                    actual = value.actual;
+
+                    if (full.length > actual.length) {
+                        for (i = 0, len = full.length; i < len; i++) {
+                            item = full[i];
+                            if (actual.indexOf(item) === -1) {
+                                propertiesSpecified = (actual.length === 1) ? actual[0] : (actual.length == 2) ? actual.join(" and ") : actual.join(", ");
+                                reporter.warn("The property " + item + " is compatible with " + propertiesSpecified + " and should be included as well.", event.selectors[0].line, event.selectors[0].col, rule); 
+                            }
+                        }
+
+                    }
+                }
+            }
+        });
+    }
+});
+/*
+ * Rule: Certain properties don't play well with certain display values. 
+ * - float should not be used with inline-block
+ * - height, width, margin-top, margin-bottom, float should not be used with inline
+ * - vertical-align should not be used with block
+ * - margin, float should not be used with table-*
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "display-property-grouping",
+    name: "Display Property Grouping",
+    desc: "Certain properties shouldn't be used with certain display property values.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this;
+
+        var propertiesToCheck = {
+                display: 1,
+                "float": "none",
+                height: 1,
+                width: 1,
+                margin: 1,
+                "margin-left": 1,
+                "margin-right": 1,
+                "margin-bottom": 1,
+                "margin-top": 1,
+                padding: 1,
+                "padding-left": 1,
+                "padding-right": 1,
+                "padding-bottom": 1,
+                "padding-top": 1,
+                "vertical-align": 1
+            },
+            properties;
+
+        parser.addListener("startrule", function(){
+            properties = {};
+        });
+
+        parser.addListener("property", function(event){
+            var name = event.property.text.toLowerCase();
+
+            if (propertiesToCheck[name]){
+                properties[name] = { value: event.value.text, line: event.property.line, col: event.property.col };                    
+            }
+        });
+
+        parser.addListener("endrule", function(){
+
+            var display = properties.display ? properties.display.value : null;
+            if (display){
+                switch(display){
+
+                    case "inline":
+                        //height, width, margin-top, margin-bottom, float should not be used with inline
+                        reportProperty("height", display);
+                        reportProperty("width", display);
+                        reportProperty("margin", display);
+                        reportProperty("margin-top", display);
+                        reportProperty("margin-bottom", display);              
+                        reportProperty("float", display, "display:inline has no effect on floated elements (but may be used to fix the IE6 double-margin bug).");
+                        break;
+
+                    case "block":
+                        //vertical-align should not be used with block
+                        reportProperty("vertical-align", display);
+                        break;
+
+                    case "inline-block":
+                        //float should not be used with inline-block
+                        reportProperty("float", display);
+                        break;
+
+                    default:
+                        //margin, float should not be used with table
+                        if (display.indexOf("table-") == 0){
+                            reportProperty("margin", display);
+                            reportProperty("margin-left", display);
+                            reportProperty("margin-right", display);
+                            reportProperty("margin-top", display);
+                            reportProperty("margin-bottom", display);
+                            reportProperty("float", display);
+                        }
+
+                        //otherwise do nothing
+                }
+            }
+          
+        });
+
+
+        function reportProperty(name, display, msg){
+            if (properties[name]){
+                if (!(typeof propertiesToCheck[name] == "string") || properties[name].value.toLowerCase() != propertiesToCheck[name]){
+                    reporter.warn(msg || name + " can't be used with display: " + display + ".", properties[name].line, properties[name].col, rule);
+                }
+            }
+        }
+    }
+
+});
+/*
+ * Rule: Duplicate properties must appear one after the other. If an already-defined
+ * property appears somewhere else in the rule, then it's likely an error.
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "duplicate-properties",
+    name: "Duplicate Properties",
+    desc: "Duplicate properties must appear one after the other.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this,
+            properties,
+            lastProperty;            
+            
+        function startRule(event){
+            properties = {};        
+        }
+        
+        parser.addListener("startrule", startRule);
+        parser.addListener("startfontface", startRule);
+        parser.addListener("startpage", startRule);
+        
+        parser.addListener("property", function(event){
+            var property = event.property,
+                name = property.text.toLowerCase();
+            
+            if (properties[name] && (lastProperty != name || properties[name] == event.value.text)){
+                reporter.warn("Duplicate property '" + event.property + "' found.", event.line, event.col, rule);
+            }
+            
+            properties[name] = event.value.text;
+            lastProperty = name;
+                        
+        });
+            
+        
+    }
+
+});
+/*
+ * Rule: Style rules without any properties defined should be removed.
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "empty-rules",
+    name: "Empty Rules",
+    desc: "Rules without any properties specified should be removed.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this,
+            count = 0;
+
+        parser.addListener("startrule", function(){
+            count=0;
+        });
+
+        parser.addListener("property", function(){
+            count++;
+        });
+
+        parser.addListener("endrule", function(event){
+            var selectors = event.selectors;
+            if (count == 0){
+                reporter.warn("Rule is empty.", selectors[0].line, selectors[0].col, rule);
+            }
+        });
+    }
+
+});
+/*
+ * Rule: There should be no syntax errors. (Duh.)
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "errors",
+    name: "Parsing Errors",
+    desc: "This rule looks for recoverable syntax errors.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this;
+
+        parser.addListener("error", function(event){
+            reporter.error(event.message, event.line, event.col, rule);
+        });
+
+    }
+
+});
+/*
+ * Rule: You shouldn't use more than 10 floats. If you do, there's probably
+ * room for some abstraction.
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "floats",
+    name: "Floats",
+    desc: "This rule tests if the float property is used too many times",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this;
+        var count = 0;
+
+        //count how many times "float" is used
+        parser.addListener("property", function(event){
+            if (event.property.text.toLowerCase() == "float" &&
+                    event.value.text.toLowerCase() != "none"){
+                count++;
+            }
+        });
+
+        //report the results
+        parser.addListener("endstylesheet", function(){
+            reporter.stat("floats", count);
+            if (count >= 10){
+                reporter.rollupWarn("Too many floats (" + count + "), you're probably using them for layout. Consider using a grid system instead.", rule);
+            }
+        });
+    }
+
+});
+/*
+ * Rule: Avoid too many @font-face declarations in the same stylesheet.
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "font-faces",
+    name: "Font Faces",
+    desc: "Too many different web fonts in the same stylesheet.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this,
+            count = 0;
+
+
+        parser.addListener("startfontface", function(){
+            count++;
+        });
+
+        parser.addListener("endstylesheet", function(){
+            if (count > 5){
+                reporter.rollupWarn("Too many @font-face declarations (" + count + ").", rule);
+            }
+        });
+    }
+
+});
+/*
+ * Rule: You shouldn't need more than 9 font-size declarations.
+ */
+
+CSSLint.addRule({
+
+    //rule information
+    id: "font-sizes",
+    name: "Font Sizes",
+    desc: "Checks the number of font-size declarations.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this,
+            count = 0;
+
+        //check for use of "font-size"
+        parser.addListener("property", function(event){
+            if (event.property == "font-size"){
+                count++;
+            }
+        });
+
+        //report the results
+        parser.addListener("endstylesheet", function(){
+            reporter.stat("font-sizes", count);
+            if (count >= 10){
+                reporter.rollupWarn("Too many font-size declarations (" + count + "), abstraction needed.", rule);
+            }
+        });
+    }
+
+});
+/*
+ * Rule: When using a vendor-prefixed gradient, make sure to use them all.
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "gradients",
+    name: "Gradients",
+    desc: "When using a vendor-prefixed gradient, make sure to use them all.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this,
+            gradients;
+
+        parser.addListener("startrule", function(){
+            gradients = {
+                moz: 0,
+                webkit: 0,
+                ms: 0,
+                o: 0
+            };
+        });
+
+        parser.addListener("property", function(event){
+
+            if (/\-(moz|ms|o|webkit)(?:\-(?:linear|radial))\-gradient/.test(event.value)){
+                gradients[RegExp.$1] = 1;
+            }
+
+        });
+
+        parser.addListener("endrule", function(event){
+            var missing = [];
+
+            if (!gradients.moz){
+                missing.push("Firefox 3.6+");
+            }
+
+            if (!gradients.webkit){
+                missing.push("Webkit (Safari, Chrome)");
+            }
+
+            if (!gradients.ms){
+                missing.push("Internet Explorer 10+");
+            }
+
+            if (!gradients.o){
+                missing.push("Opera 11.1+");
+            }
+
+            if (missing.length && missing.length < 4){            
+                reporter.warn("Missing vendor-prefixed CSS gradients for " + missing.join(", ") + ".", event.selectors[0].line, event.selectors[0].col, rule); 
+            }
+
+        });
+
+    }
+
+});
+/*
+ * Rule: Don't use IDs for selectors.
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "ids",
+    name: "IDs",
+    desc: "Selectors should not contain IDs.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this;
+        parser.addListener("startrule", function(event){
+            var selectors = event.selectors,
+                selector,
+                part,
+                modifier,
+                idCount,
+                i, j, k;
+
+            for (i=0; i < selectors.length; i++){
+                selector = selectors[i];
+                idCount = 0;
+
+                for (j=0; j < selector.parts.length; j++){
+                    part = selector.parts[j];
+                    if (part instanceof parserlib.css.SelectorPart){
+                        for (k=0; k < part.modifiers.length; k++){
+                            modifier = part.modifiers[k];
+                            if (modifier.type == "id"){
+                                idCount++;
+                            }
+                        }
+                    }
+                }
+
+                if (idCount == 1){
+                    reporter.warn("Don't use IDs in selectors.", selector.line, selector.col, rule);
+                } else if (idCount > 1){
+                    reporter.warn(idCount + " IDs in the selector, really?", selector.line, selector.col, rule);
+                }
+            }
+
+        });
+    }
+
+});
+/*
+ * Rule: Don't use @import, use <link> instead.
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "import",
+    name: "@import",
+    desc: "Don't use @import, use <link> instead.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this;
+        
+        parser.addListener("import", function(event){        
+            reporter.warn("@import prevents parallel downloads, use <link> instead.", event.line, event.col, rule);
+        });
+
+    }
+
+});
+/*
+ * Rule: Make sure !important is not overused, this could lead to specificity
+ * war. Display a warning on !important declarations, an error if it's
+ * used more at least 10 times.
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "important",
+    name: "Important",
+    desc: "Be careful when using !important declaration",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this,
+            count = 0;
+
+        //warn that important is used and increment the declaration counter
+        parser.addListener("property", function(event){
+            if (event.important === true){
+                count++;
+                reporter.warn("Use of !important", event.line, event.col, rule);
+            }
+        });
+
+        //if there are more than 10, show an error
+        parser.addListener("endstylesheet", function(){
+            reporter.stat("important", count);
+            if (count >= 10){
+                reporter.rollupWarn("Too many !important declarations (" + count + "), try to use less than 10 to avoid specifity issues.", rule);
+            }
+        });
+    }
+
+});
+/*
+ * Rule: Properties should be known (listed in CSS3 specification) or
+ * be a vendor-prefixed property.
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "known-properties",
+    name: "Known Properties",
+    desc: "Properties should be known (listed in CSS specification) or be a vendor-prefixed property.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this,
+            properties = {
+
+                "alignment-adjust": 1,
+                "alignment-baseline": 1,
+                "animation": 1,
+                "animation-delay": 1,
+                "animation-direction": 1,
+                "animation-duration": 1,
+                "animation-iteration-count": 1,
+                "animation-name": 1,
+                "animation-play-state": 1,
+                "animation-timing-function": 1,
+                "appearance": 1,
+                "azimuth": 1,
+                "backface-visibility": 1,
+                "background": 1,
+                "background-attachment": 1,
+                "background-break": 1,
+                "background-clip": 1,
+                "background-color": 1,
+                "background-image": 1,
+                "background-origin": 1,
+                "background-position": 1,
+                "background-repeat": 1,
+                "background-size": 1,
+                "baseline-shift": 1,
+                "binding": 1,
+                "bleed": 1,
+                "bookmark-label": 1,
+                "bookmark-level": 1,
+                "bookmark-state": 1,
+                "bookmark-target": 1,
+                "border": 1,
+                "border-bottom": 1,
+                "border-bottom-color": 1,
+                "border-bottom-left-radius": 1,
+                "border-bottom-right-radius": 1,
+                "border-bottom-style": 1,
+                "border-bottom-width": 1,
+                "border-collapse": 1,
+                "border-color": 1,
+                "border-image": 1,
+                "border-image-outset": 1,
+                "border-image-repeat": 1,
+                "border-image-slice": 1,
+                "border-image-source": 1,
+                "border-image-width": 1,
+                "border-left": 1,
+                "border-left-color": 1,
+                "border-left-style": 1,
+                "border-left-width": 1,
+                "border-radius": 1,
+                "border-right": 1,
+                "border-right-color": 1,
+                "border-right-style": 1,
+                "border-right-width": 1,
+                "border-spacing": 1,
+                "border-style": 1,
+                "border-top": 1,
+                "border-top-color": 1,
+                "border-top-left-radius": 1,
+                "border-top-right-radius": 1,
+                "border-top-style": 1,
+                "border-top-width": 1,
+                "border-width": 1,
+                "bottom": 1, 
+                "box-align": 1,
+                "box-decoration-break": 1,
+                "box-direction": 1,
+                "box-flex": 1,
+                "box-flex-group": 1,
+                "box-lines": 1,
+                "box-ordinal-group": 1,
+                "box-orient": 1,
+                "box-pack": 1,
+                "box-shadow": 1,
+                "box-sizing": 1,
+                "break-after": 1,
+                "break-before": 1,
+                "break-inside": 1,
+                "caption-side": 1,
+                "clear": 1,
+                "clip": 1,
+                "color": 1,
+                "color-profile": 1,
+                "column-count": 1,
+                "column-fill": 1,
+                "column-gap": 1,
+                "column-rule": 1,
+                "column-rule-color": 1,
+                "column-rule-style": 1,
+                "column-rule-width": 1,
+                "column-span": 1,
+                "column-width": 1,
+                "columns": 1,
+                "content": 1,
+                "counter-increment": 1,
+                "counter-reset": 1,
+                "crop": 1,
+                "cue": 1,
+                "cue-after": 1,
+                "cue-before": 1,
+                "cursor": 1,
+                "direction": 1,
+                "display": 1,
+                "dominant-baseline": 1,
+                "drop-initial-after-adjust": 1,
+                "drop-initial-after-align": 1,
+                "drop-initial-before-adjust": 1,
+                "drop-initial-before-align": 1,
+                "drop-initial-size": 1,
+                "drop-initial-value": 1,
+                "elevation": 1,
+                "empty-cells": 1,
+                "fit": 1,
+                "fit-position": 1,
+                "float": 1,                
+                "float-offset": 1,
+                "font": 1,
+                "font-family": 1,
+                "font-size": 1,
+                "font-size-adjust": 1,
+                "font-stretch": 1,
+                "font-style": 1,
+                "font-variant": 1,
+                "font-weight": 1,
+                "grid-columns": 1,
+                "grid-rows": 1,
+                "hanging-punctuation": 1,
+                "height": 1,
+                "hyphenate-after": 1,
+                "hyphenate-before": 1,
+                "hyphenate-character": 1,
+                "hyphenate-lines": 1,
+                "hyphenate-resource": 1,
+                "hyphens": 1,
+                "icon": 1,
+                "image-orientation": 1,
+                "image-rendering": 1,
+                "image-resolution": 1,
+                "inline-box-align": 1,
+                "left": 1,
+                "letter-spacing": 1,
+                "line-height": 1,
+                "line-stacking": 1,
+                "line-stacking-ruby": 1,
+                "line-stacking-shift": 1,
+                "line-stacking-strategy": 1,
+                "list-style": 1,
+                "list-style-image": 1,
+                "list-style-position": 1,
+                "list-style-type": 1,
+                "margin": 1,
+                "margin-bottom": 1,
+                "margin-left": 1,
+                "margin-right": 1,
+                "margin-top": 1,
+                "mark": 1,
+                "mark-after": 1,
+                "mark-before": 1,
+                "marks": 1,
+                "marquee-direction": 1,
+                "marquee-play-count": 1,
+                "marquee-speed": 1,
+                "marquee-style": 1,
+                "max-height": 1,
+                "max-width": 1,
+                "min-height": 1,
+                "min-width": 1,
+                "move-to": 1,
+                "nav-down": 1,
+                "nav-index": 1,
+                "nav-left": 1,
+                "nav-right": 1,
+                "nav-up": 1,
+                "opacity": 1,
+                "orphans": 1,
+                "outline": 1,
+                "outline-color": 1,
+                "outline-offset": 1,
+                "outline-style": 1,
+                "outline-width": 1,
+                "overflow": 1,
+                "overflow-style": 1,
+                "overflow-x": 1,
+                "overflow-y": 1,
+                "padding": 1,
+                "padding-bottom": 1,
+                "padding-left": 1,
+                "padding-right": 1,
+                "padding-top": 1,
+                "page": 1,
+                "page-break-after": 1,
+                "page-break-before": 1,
+                "page-break-inside": 1,
+                "page-policy": 1,
+                "pause": 1,
+                "pause-after": 1,
+                "pause-before": 1,
+                "perspective": 1,
+                "perspective-origin": 1,
+                "phonemes": 1,
+                "pitch": 1,
+                "pitch-range": 1,
+                "play-during": 1,
+                "position": 1,
+                "presentation-level": 1,
+                "punctuation-trim": 1,
+                "quotes": 1,
+                "rendering-intent": 1,
+                "resize": 1,
+                "rest": 1,
+                "rest-after": 1,
+                "rest-before": 1,
+                "richness": 1,
+                "right": 1,
+                "rotation": 1,
+                "rotation-point": 1,
+                "ruby-align": 1,
+                "ruby-overhang": 1,
+                "ruby-position": 1,
+                "ruby-span": 1,
+                "size": 1,
+                "speak": 1,
+                "speak-header": 1,
+                "speak-numeral": 1,
+                "speak-punctuation": 1,
+                "speech-rate": 1,
+                "stress": 1,
+                "string-set": 1,
+                "table-layout": 1,
+                "target": 1,
+                "target-name": 1,
+                "target-new": 1,
+                "target-position": 1,
+                "text-align": 1,
+                "text-align-last": 1,
+                "text-decoration": 1,
+                "text-emphasis": 1,
+                "text-height": 1,
+                "text-indent": 1,
+                "text-justify": 1,
+                "text-outline": 1,
+                "text-shadow": 1,
+                "text-transform": 1,
+                "text-wrap": 1,
+                "top": 1,
+                "transform": 1,
+                "transform-origin": 1,
+                "transform-style": 1,
+                "transition": 1,
+                "transition-delay": 1,
+                "transition-duration": 1,
+                "transition-property": 1,
+                "transition-timing-function": 1,
+                "unicode-bidi": 1,
+                "vertical-align": 1,
+                "visibility": 1,
+                "voice-balance": 1,
+                "voice-duration": 1,
+                "voice-family": 1,
+                "voice-pitch": 1,
+                "voice-pitch-range": 1,
+                "voice-rate": 1,
+                "voice-stress": 1,
+                "voice-volume": 1,
+                "volume": 1,
+                "white-space": 1,
+                "white-space-collapse": 1,
+                "widows": 1,
+                "width": 1,
+                "word-break": 1,
+                "word-spacing": 1,
+                "word-wrap": 1,
+                "z-index": 1,
+                
+                //IE
+                "filter": 1,
+                "zoom": 1
+            };
+
+        parser.addListener("property", function(event){
+            var name = event.property.text.toLowerCase();
+
+            if (!properties[name] && name.charAt(0) != "-"){
+                reporter.error("Unknown property '" + event.property + "'.", event.line, event.col, rule);
+            }
+
+        });
+    }
+
+});
+/*
+ * Rule: Don't use classes or IDs with elements (a.foo or a#foo).
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "overqualified-elements",
+    name: "Overqualified Elements",
+    desc: "Don't use classes or IDs with elements (a.foo or a#foo).",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this,
+            classes = {};
+            
+        parser.addListener("startrule", function(event){
+            var selectors = event.selectors,
+                selector,
+                part,
+                modifier,
+                i, j, k;
+
+            for (i=0; i < selectors.length; i++){
+                selector = selectors[i];
+
+                for (j=0; j < selector.parts.length; j++){
+                    part = selector.parts[j];
+                    if (part instanceof parserlib.css.SelectorPart){
+                        for (k=0; k < part.modifiers.length; k++){
+                            modifier = part.modifiers[k];
+                            if (part.elementName && modifier.type == "id"){
+                                reporter.warn("Element (" + part + ") is overqualified, just use " + modifier + " without element name.", part.line, part.col, rule);
+                            } else if (modifier.type == "class"){
+                                
+                                if (!classes[modifier]){
+                                    classes[modifier] = [];
+                                }
+                                classes[modifier].push({ modifier: modifier, part: part });
+                            }
+                        }
+                    }
+                }
+            }
+        });
+        
+        parser.addListener("endstylesheet", function(){
+        
+            var prop;
+            for (prop in classes){
+                if (classes.hasOwnProperty(prop)){
+                
+                    //one use means that this is overqualified
+                    if (classes[prop].length == 1 && classes[prop][0].part.elementName){
+                        reporter.warn("Element (" + classes[prop][0].part + ") is overqualified, just use " + classes[prop][0].modifier + " without element name.", classes[prop][0].part.line, classes[prop][0].part.col, rule);
+                    }
+                }
+            }        
+        });
+    }
+
+});
+/*
+ * Rule: Headings (h1-h6) should not be qualified (namespaced).
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "qualified-headings",
+    name: "Qualified Headings",
+    desc: "Headings should not be qualified (namespaced).",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this;
+
+        parser.addListener("startrule", function(event){
+            var selectors = event.selectors,
+                selector,
+                part,
+                i, j;
+
+            for (i=0; i < selectors.length; i++){
+                selector = selectors[i];
+
+                for (j=0; j < selector.parts.length; j++){
+                    part = selector.parts[j];
+                    if (part instanceof parserlib.css.SelectorPart){
+                        if (part.elementName && /h[1-6]/.test(part.elementName.toString()) && j > 0){
+                            reporter.warn("Heading (" + part.elementName + ") should not be qualified.", part.line, part.col, rule);
+                        }
+                    }
+                }
+            }
+        });
+    }
+
+});
+/*
+ * Rule: Selectors that look like regular expressions are slow and should be avoided.
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "regex-selectors",
+    name: "Regex Selectors",
+    desc: "Selectors that look like regular expressions are slow and should be avoided.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this;
+
+        parser.addListener("startrule", function(event){
+            var selectors = event.selectors,
+                selector,
+                part,
+                modifier,
+                i, j, k;
+
+            for (i=0; i < selectors.length; i++){
+                selector = selectors[i];
+                for (j=0; j < selector.parts.length; j++){
+                    part = selector.parts[j];
+                    if (part instanceof parserlib.css.SelectorPart){
+                        for (k=0; k < part.modifiers.length; k++){
+                            modifier = part.modifiers[k];
+                            if (modifier.type == "attribute"){
+                                if (/([\~\|\^\$\*]=)/.test(modifier)){
+                                    reporter.warn("Attribute selectors with " + RegExp.$1 + " are slow!", modifier.line, modifier.col, rule);
+                                }
+                            }
+
+                        }
+                    }
+                }
+            }
+        });
+    }
+
+});
+/*
+ * Rule: Total number of rules should not exceed x.
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "rules-count",
+    name: "Rules Count",
+    desc: "Track how many rules there are.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this,
+            count = 0;
+
+        //count each rule
+        parser.addListener("startrule", function(){
+            count++;
+        });
+
+        parser.addListener("endstylesheet", function(){
+            reporter.stat("rule-count", count);
+        });
+    }
+
+});
+/*
+ * Rule: Don't use text-indent for image replacement if you need to support rtl. 
+ * 
+ */
+/*
+ * Should we be checking for rtl/ltr?
+ */
+//Commented out due to lack of tests
+CSSLint.addRule({
+
+    //rule information
+    id: "text-indent",
+    name: "Text Indent",
+    desc: "Checks for text indent less than -99px",
+    browsers: "All",
+    
+    //initialization
+    init: function(parser, reporter){
+        var rule = this;
+    
+        //check for use of "font-size"
+        parser.addListener("property", function(event){
+            var name = event.property,
+                value = event.value.parts[0].value;
+
+            if (name == "text-indent" && value < -99){
+                reporter.warn("Negative text-indent doesn't work well with RTL. If you use text-indent for image replacement explicitly set text-direction for that item to ltr.", name.line, name.col, rule);
+            }
+        });
+    }
+
+});
+/*
+ * Rule: Headings (h1-h6) should be defined only once.
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "unique-headings",
+    name: "Unique Headings",
+    desc: "Headings should be defined only once.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this;
+
+        var headings =  {
+                h1: 0,
+                h2: 0,
+                h3: 0,
+                h4: 0,
+                h5: 0,
+                h6: 0
+            };
+
+        parser.addListener("startrule", function(event){
+            var selectors = event.selectors,
+                selector,
+                part,
+                i;
+
+            for (i=0; i < selectors.length; i++){
+                selector = selectors[i];
+                part = selector.parts[selector.parts.length-1];
+
+                if (part.elementName && /(h[1-6])/.test(part.elementName.toString())){
+                    headings[RegExp.$1]++;
+                    if (headings[RegExp.$1] > 1) {
+                        reporter.warn("Heading (" + part.elementName + ") has already been defined.", part.line, part.col, rule);
+                    }
+                }
+            }
+        });
+    }
+
+});
+/*
+ * Rule: Don't use universal selector because it's slow.
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "universal-selector",
+    name: "Universal Selector",
+    desc: "The universal selector (*) is known to be slow.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this;
+
+        parser.addListener("startrule", function(event){
+            var selectors = event.selectors,
+                selector,
+                part,
+                modifier,
+                i, j, k;
+
+            for (i=0; i < selectors.length; i++){
+                selector = selectors[i];
+                
+                part = selector.parts[selector.parts.length-1];
+                if (part.elementName == "*"){
+                    reporter.warn(rule.desc, part.line, part.col, rule);
+                }
+            }
+        });
+    }
+
+});
+/*
+ * Rule: When using a vendor-prefixed property, make sure to
+ * include the standard one.
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "vendor-prefix",
+    name: "Vendor Prefix",
+    desc: "When using a vendor-prefixed property, make sure to include the standard one.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this,
+            properties,
+            num,
+            propertiesToCheck = {
+                "-moz-border-radius": "border-radius",
+                "-webkit-border-radius": "border-radius",
+                "-webkit-border-top-left-radius": "border-top-left-radius",
+                "-webkit-border-top-right-radius": "border-top-right-radius",
+                "-webkit-border-bottom-left-radius": "border-bottom-left-radius",
+                "-webkit-border-bottom-right-radius": "border-bottom-right-radius",
+                "-moz-border-radius-topleft": "border-top-left-radius",
+                "-moz-border-radius-topright": "border-top-right-radius",
+                "-moz-border-radius-bottomleft": "border-bottom-left-radius",
+                "-moz-border-radius-bottomright": "border-bottom-right-radius",
+                "-moz-box-shadow": "box-shadow",
+                "-webkit-box-shadow": "box-shadow",
+                "-moz-transform" : "transform",
+                "-webkit-transform" : "transform",
+                "-o-transform" : "transform",
+                "-ms-transform" : "transform",
+                "-moz-box-sizing" : "box-sizing",
+                "-webkit-box-sizing" : "box-sizing",
+                "-moz-user-select" : "user-select",
+                "-khtml-user-select" : "user-select",
+                "-webkit-user-select" : "user-select"                
+            };
+
+        //event handler for beginning of rules
+        function startRule(){
+            properties = {};
+            num=1;        
+        }
+        
+        //event handler for end of rules
+        function endRule(event){
+            var prop,
+                i, len,
+                standard,
+                needed,
+                actual,
+                needsStandard = [];
+
+            for (prop in properties){
+                if (propertiesToCheck[prop]){
+                    needsStandard.push({ actual: prop, needed: propertiesToCheck[prop]});
+                }
+            }
+
+            for (i=0, len=needsStandard.length; i < len; i++){
+                needed = needsStandard[i].needed;
+                actual = needsStandard[i].actual;
+
+                if (!properties[needed]){               
+                    reporter.warn("Missing standard property '" + needed + "' to go along with '" + actual + "'.", event.line, event.col, rule);
+                } else {
+                    //make sure standard property is last
+                    if (properties[needed][0].pos < properties[actual][0].pos){
+                        reporter.warn("Standard property '" + needed + "' should come after vendor-prefixed property '" + actual + "'.", event.line, event.col, rule);
+                    }
+                }
+            }
+
+        }        
+        
+        parser.addListener("startrule", startRule);
+        parser.addListener("startfontface", startRule);
+
+        parser.addListener("property", function(event){
+            var name = event.property.text.toLowerCase();
+
+            if (!properties[name]){
+                properties[name] = [];
+            }
+
+            properties[name].push({ name: event.property, value : event.value, pos:num++ });
+        });
+
+        parser.addListener("endrule", endRule);
+        parser.addListener("endfontface", endRule);
+    }
+
+});
+/*
+ * Rule: If an element has a width of 100%, be careful when placing within
+ * an element that has padding. It may look strange.
+ */
+//Commented out pending further review.
+/*CSSLint.addRule({
+
+    //rule information
+    id: "width-100",
+    name: "Width 100%",
+    desc: "Be careful when using width: 100% on elements.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this,
+            width100,
+            boxsizing;
+
+        parser.addListener("startrule", function(){
+            width100 = null;
+            boxsizing = false;
+        });
+
+        parser.addListener("property", function(event){
+            var name = event.property.text.toLowerCase(),
+                value = event.value;
+
+            if (name == "width" && value == "100%"){
+                width100 = event.property;
+            } else if (name == "box-sizing" || /\-(?:webkit|ms|moz)\-box-sizing/.test(name)){  //means you know what you're doing
+                boxsizing = true;
+            }
+        });
+        
+        parser.addListener("endrule", function(){
+            if (width100 && !boxsizing){
+                reporter.warn("Elements with a width of 100% may not appear as you expect inside of other elements.", width100.line, width100.col, rule);
+            }
+        });
+    }
+
+});*/
+/*
+ * Rule: You don't need to specify units when a value is 0.
+ */
+CSSLint.addRule({
+
+    //rule information
+    id: "zero-units",
+    name: "Zero Units",
+    desc: "You don't need to specify units when a value is 0.",
+    browsers: "All",
+
+    //initialization
+    init: function(parser, reporter){
+        var rule = this;
+
+        //count how many times "float" is used
+        parser.addListener("property", function(event){
+            var parts = event.value.parts,
+                i = 0, 
+                len = parts.length;
+
+            while(i < len){
+                if ((parts[i].units || parts[i].type == "percentage") && parts[i].value === 0){
+                    reporter.warn("Values of 0 shouldn't have units specified.", parts[i].line, parts[i].col, rule);
+                }
+                i++;
+            }
+
+        });
+
+    }
+
+});
+
+exports.CSSLint = CSSLint;
+});
diff --git a/apps/files_texteditor/js/aceeditor/worker-javascript.js b/apps/files_texteditor/js/aceeditor/worker-javascript.js
index 5792f4562c4..e48c6e810dc 100644
--- a/apps/files_texteditor/js/aceeditor/worker-javascript.js
+++ b/apps/files_texteditor/js/aceeditor/worker-javascript.js
@@ -1 +1,9752 @@
-function initSender(){var a=require("pilot/event_emitter").EventEmitter,b=require("pilot/oop"),c=function(){};(function(){b.implement(this,a),this.callback=function(a,b){postMessage({type:"call",id:b,data:a})},this.emit=function(a,b){postMessage({type:"event",name:a,data:b})}}).call(c.prototype);return new c}function initBaseUrls(a){require.tlns=a}var console={log:function(a){postMessage({type:"log",data:a})}},window={console:console},require=function(a){var b=require.modules[a];if(b){b.initialized||(b.exports=b.factory().exports,b.initialized=!0);return b.exports}var c=a.split("/");c[0]=require.tlns[c[0]]||c[0],path=c.join("/")+".js",require.id=a,importScripts(path);return require(a)};require.modules={},require.tlns={};var define=function(a,b,c){arguments.length==2?c=b:arguments.length==1&&(c=a,a=require.id);a.indexOf("text/")!==0&&(require.modules[a]={factory:function(){var a={exports:{}},b=c(require,a.exports,a);b&&(a.exports=b);return a}})},main,sender;onmessage=function(a){var b=a.data;if(b.command)main[b.command].apply(main,b.args);else if(b.init){initBaseUrls(b.tlns),require("pilot/fixoldbrowsers"),sender=initSender();var c=require(b.module)[b.classname];main=new c(sender)}else b.event&&sender&&sender._dispatchEvent(b.event,b.data)},define("pilot/fixoldbrowsers",["require","exports","module"],function(a,b,c){if(!Function.prototype.bind){var d=Array.prototype.slice;Function.prototype.bind=function(a){var b=this;if(typeof b.apply!="function"||typeof b.call!="function")return new TypeError;var c=d.call(arguments),e=function f(){if(this instanceof f){var a=Object.create(b.prototype);b.apply(a,c.concat(d.call(arguments)));return a}return b.call.apply(b,c.concat(d.call(arguments)))};e.length=typeof b=="function"?Math.max(b.length-c.length,0):0;return e}}var e=Function.prototype.call,f=Array.prototype,g=Object.prototype,h=e.bind(g.hasOwnProperty),i,j,k,l,m;if(m=h(g,"__defineGetter__"))i=e.bind(g.__defineGetter__),j=e.bind(g.__defineSetter__),k=e.bind(g.__lookupGetter__),l=e.bind(g.__lookupSetter__);Array.isArray||(Array.isArray=function(a){return Object.prototype.toString.call(a)==="[object Array]"}),Array.prototype.forEach||(Array.prototype.forEach=function(a,b){var c=+this.length;for(var d=0;d<c;d++)d in this&&a.call(b,this[d],d,this)}),Array.prototype.map||(Array.prototype.map=function(a){var b=+this.length;if(typeof a!="function")throw new TypeError;var c=Array(b),d=arguments[1];for(var e=0;e<b;e++)e in this&&(c[e]=a.call(d,this[e],e,this));return c}),Array.prototype.filter||(Array.prototype.filter=function(a){var b=[],c=arguments[1];for(var d=0;d<this.length;d++)a.call(c,this[d])&&b.push(this[d]);return b}),Array.prototype.every||(Array.prototype.every=function(a){var b=arguments[1];for(var c=0;c<this.length;c++)if(!a.call(b,this[c]))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(a){var b=arguments[1];for(var c=0;c<this.length;c++)if(a.call(b,this[c]))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(a){var b=+this.length;if(typeof a!="function")throw new TypeError;if(b===0&&arguments.length===1)throw new TypeError;var c=0;if(arguments.length>=2)var d=arguments[1];else do{if(c in this){d=this[c++];break}if(++c>=b)throw new TypeError}while(!0);for(;c<b;c++)c in this&&(d=a.call(null,d,this[c],c,this));return d}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(a){var b=+this.length;if(typeof a!="function")throw new TypeError;if(b===0&&arguments.length===1)throw new TypeError;var c=b-1;if(arguments.length>=2)var d=arguments[1];else do{if(c in this){d=this[c--];break}if(--c<0)throw new TypeError}while(!0);for(;c>=0;c--)c in this&&(d=a.call(null,d,this[c],c,this));return d}),Array.prototype.indexOf||(Array.prototype.indexOf=function(a){var b=this.length;if(!b)return-1;var c=arguments[1]||0;if(c>=b)return-1;c<0&&(c+=b);for(;c<b;c++){if(!h(this,c))continue;if(a===this[c])return c}return-1}),Array.prototype.lastIndexOf||(Array.prototype.lastIndexOf=function(a){var b=this.length;if(!b)return-1;var c=arguments[1]||b;c<0&&(c+=b),c=Math.min(c,b-1);for(;c>=0;c--){if(!h(this,c))continue;if(a===this[c])return c}return-1}),Object.getPrototypeOf||(Object.getPrototypeOf=function(a){return a.__proto__||a.constructor.prototype});if(!Object.getOwnPropertyDescriptor){var n="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(a,b){if(typeof a!="object"&&typeof a!="function"||a===null)throw new TypeError(n+a);if(!h(a,b))return undefined;var c,d,e;c={enumerable:!0,configurable:!0};if(m){var f=a.__proto__;a.__proto__=g;var d=k(a,b),e=l(a,b);a.__proto__=f;if(d||e){d&&(descriptor.get=d),e&&(descriptor.set=e);return descriptor}}descriptor.value=a[b];return descriptor}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(a){return Object.keys(a)}),Object.create||(Object.create=function(a,b){var c;if(a===null)c={"__proto__":null};else{if(typeof a!="object")throw new TypeError("typeof prototype["+typeof a+"] != 'object'");var d=function(){};d.prototype=a,c=new d,c.__proto__=a}typeof b!="undefined"&&Object.defineProperties(c,b);return c});if(!Object.defineProperty){var o="Property description must be an object: ",p="Object.defineProperty called on non-object: ",q="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(a,b,c){if(typeof a!="object"&&typeof a!="function")throw new TypeError(p+a);if(typeof a!="object"||a===null)throw new TypeError(o+c);if(h(c,"value"))if(m&&(k(a,b)||l(a,b))){var d=a.__proto__;a.__proto__=g,delete a[b],a[b]=c.value,a.prototype}else a[b]=c.value;else{if(!m)throw new TypeError(q);h(c,"get")&&i(a,b,c.get),h(c,"set")&&j(a,b,c.set)}return a}}Object.defineProperties||(Object.defineProperties=function(a,b){for(var c in b)h(b,c)&&Object.defineProperty(a,c,b[c]);return a}),Object.seal||(Object.seal=function(a){return a}),Object.freeze||(Object.freeze=function(a){return a});try{Object.freeze(function(){})}catch(r){Object.freeze=function(a){return function b(b){return typeof b=="function"?b:a(b)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(a){return a}),Object.isSealed||(Object.isSealed=function(a){return!1}),Object.isFrozen||(Object.isFrozen=function(a){return!1}),Object.isExtensible||(Object.isExtensible=function(a){return!0});if(!Object.keys){var s=!0,t=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],u=t.length;for(var v in{toString:null})s=!1;Object.keys=function W(a){if(typeof a!="object"&&typeof a!="function"||a===null)throw new TypeError("Object.keys called on a non-object");var W=[];for(var b in a)h(a,b)&&W.push(b);if(s)for(var c=0,d=u;c<d;c++){var e=t[c];h(a,e)&&W.push(e)}return W}}Date.prototype.toISOString||(Date.prototype.toISOString=function(){return this.getUTCFullYear()+"-"+(this.getUTCMonth()+1)+"-"+this.getUTCDate()+"T"+this.getUTCHours()+":"+this.getUTCMinutes()+":"+this.getUTCSeconds()+"Z"}),Date.now||(Date.now=function(){return(new Date).getTime()}),Date.prototype.toJSON||(Date.prototype.toJSON=function(a){if(typeof this.toISOString!="function")throw new TypeError;return this.toISOString()}),isNaN(Date.parse("T00:00"))&&(Date=function(a){var b=function(c,d,e,f,g,h,i){var j=arguments.length;if(this instanceof a){var k=j===1&&String(c)===c?new a(b.parse(c)):j>=7?new a(c,d,e,f,g,h,i):j>=6?new a(c,d,e,f,g,h):j>=5?new a(c,d,e,f,g):j>=4?new a(c,d,e,f):j>=3?new a(c,d,e):j>=2?new a(c,d):j>=1?new a(c):new a;k.constructor=b;return k}return a.apply(this,arguments)},c=new RegExp("^(?:((?:[+-]\\d\\d)?\\d\\d\\d\\d)(?:-(\\d\\d)(?:-(\\d\\d))?)?)?(?:T(\\d\\d):(\\d\\d)(?::(\\d\\d)(?:\\.(\\d\\d\\d))?)?)?(?:Z|([+-])(\\d\\d):(\\d\\d))?$");for(var d in a)b[d]=a[d];b.now=a.now,b.UTC=a.UTC,b.prototype=a.prototype,b.prototype.constructor=b,b.parse=function e(b){var d=c.exec(b);if(d){d.shift();var e=d[0]===undefined;for(var f=0;f<10;f++){if(f===7)continue;d[f]=+(d[f]||(f<3?1:0)),f===1&&d[f]--}if(e)return((d[3]*60+d[4])*60+d[5])*1e3+d[6];var g=(d[8]*60+d[9])*60*1e3;d[6]==="-"&&(g=-g);return a.UTC.apply(this,d.slice(0,7))+g}return a.parse.apply(this,arguments)};return b}(Date));if(!String.prototype.trim){var w=/^\s\s*/,x=/\s\s*$/;String.prototype.trim=function(){return String(this).replace(w,"").replace(x,"")}}}),define("pilot/event_emitter",["require","exports","module"],function(a,b,c){var d={};d._emit=d._dispatchEvent=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!!c&&!!c.length){var b=b||{};b.type=a;for(var d=0;d<c.length;d++)c[d](b)}},d.on=d.addEventListener=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!c)var c=this._eventRegistry[a]=[];c.indexOf(b)==-1&&c.push(b)},d.removeListener=d.removeEventListener=function(a,b){this._eventRegistry=this._eventRegistry||{};var c=this._eventRegistry[a];if(!!c){var d=c.indexOf(b);d!==-1&&c.splice(d,1)}},d.removeAllListeners=function(a){this._eventRegistry&&(this._eventRegistry[a]=[])},b.EventEmitter=d}),define("pilot/oop",["require","exports","module"],function(a,b,c){b.inherits=function(){var a=function(){};return function(b,c){a.prototype=c.prototype,b.super_=c.prototype,b.prototype=new a,b.prototype.constructor=b}}(),b.mixin=function(a,b){for(var c in b)a[c]=b[c]},b.implement=function(a,c){b.mixin(a,c)}}),define("ace/mode/javascript_worker",["require","exports","module","pilot/oop","ace/worker/mirror","ace/worker/jshint","ace/narcissus/jsparse"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/worker/mirror").Mirror,f=a("ace/worker/jshint").JSHINT,g=b.JavaScriptWorker=function(a){e.call(this,a),this.setTimeout(500)};d.inherits(g,e),function(){this.onUpdate=function(){var b=this.doc.getValue();b=b.replace(/^#!.*\n/,"\n");var c=a("ace/narcissus/jsparse");try{c.parse(b)}catch(d){this.sender.emit("narcissus",{row:d.lineno-1,column:null,text:d.message,type:"error"});return}finally{}f(b,{undef:!1,onevar:!1,passfail:!1}),this.sender.emit("jslint",f.errors)}}.call(g.prototype)}),define("ace/worker/mirror",["require","exports","module","ace/document","pilot/lang"],function(a,b,c){var d=a("ace/document").Document,e=a("pilot/lang"),f=b.Mirror=function(a){this.sender=a;var b=this.doc=new d(""),c=this.deferredUpdate=e.deferredCall(this.onUpdate.bind(this)),f=this;a.on("change",function(a){b.applyDeltas([a.data]),c.schedule(f.$timeout)})};(function(){this.$timeout=500,this.setTimeout=function(a){this.$timeout=a},this.setValue=function(a){this.doc.setValue(a),this.deferredUpdate.schedule(this.$timeout)},this.getValue=function(a){this.sender.callback(this.doc.getValue(),a)},this.onUpdate=function(){}}).call(f.prototype)}),define("ace/document",["require","exports","module","pilot/oop","pilot/event_emitter","ace/range","ace/anchor"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=a("ace/range").Range,g=a("ace/anchor").Anchor,h=function(a){this.$lines=[],Array.isArray(a)?this.insertLines(0,a):a.length==0?this.$lines=[""]:this.insert({row:0,column:0},a)};(function(){d.implement(this,e),this.setValue=function(a){var b=this.getLength();this.remove(new f(0,0,b,this.getLine(b-1).length)),this.insert({row:0,column:0},a)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(a,b){return new g(this,a,b)},"aaa".split(/a/).length==0?this.$split=function(a){return a.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(a){return a.split(/\r\n|\r|\n/)},this.$detectNewLine=function(a){var b=a.match(/^.*?(\r?\n)/m);b?this.$autoNewLine=b[1]:this.$autoNewLine="\n"},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";case"auto":return this.$autoNewLine}},this.$autoNewLine="\n",this.$newLineMode="auto",this.setNewLineMode=function(a){this.$newLineMode!==a&&(this.$newLineMode=a)},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(a){return a=="\r\n"||a=="\r"||a=="\n"},this.getLine=function(a){return this.$lines[a]||""},this.getLines=function(a,b){return this.$lines.slice(a,b+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(a){if(a.start.row==a.end.row)return this.$lines[a.start.row].substring(a.start.column,a.end.column);var b=[];b.push(this.$lines[a.start.row].substring(a.start.column)),b.push.apply(b,this.getLines(a.start.row+1,a.end.row-1)),b.push(this.$lines[a.end.row].substring(0,a.end.column));return b.join(this.getNewLineCharacter())},this.$clipPosition=function(a){var b=this.getLength();a.row>=b&&(a.row=Math.max(0,b-1),a.column=this.getLine(b-1).length);return a},this.insert=function(a,b){if(b.length==0)return a;a=this.$clipPosition(a),this.getLength()<=1&&this.$detectNewLine(b);var c=this.$split(b),d=c.splice(0,1)[0],e=c.length==0?null:c.splice(c.length-1,1)[0];a=this.insertInLine(a,d),e!==null&&(a=this.insertNewLine(a),a=this.insertLines(a.row,c),a=this.insertInLine(a,e||""));return a},this.insertLines=function(a,b){if(b.length==0)return{row:a,column:0};var c=[a,0];c.push.apply(c,b),this.$lines.splice.apply(this.$lines,c);var d=new f(a,0,a+b.length,0),e={action:"insertLines",range:d,lines:b};this._dispatchEvent("change",{data:e});return d.end},this.insertNewLine=function(a){a=this.$clipPosition(a);var b=this.$lines[a.row]||"";this.$lines[a.row]=b.substring(0,a.column),this.$lines.splice(a.row+1,0,b.substring(a.column,b.length));var c={row:a.row+1,column:0},d={action:"insertText",range:f.fromPoints(a,c),text:this.getNewLineCharacter()};this._dispatchEvent("change",{data:d});return c},this.insertInLine=function(a,b){if(b.length==0)return a;var c=this.$lines[a.row]||"";this.$lines[a.row]=c.substring(0,a.column)+b+c.substring(a.column);var d={row:a.row,column:a.column+b.length},e={action:"insertText",range:f.fromPoints(a,d),text:b};this._dispatchEvent("change",{data:e});return d},this.remove=function(a){a.start=this.$clipPosition(a.start),a.end=this.$clipPosition(a.end);if(a.isEmpty())return a.start;var b=a.start.row,c=a.end.row;if(a.isMultiLine()){var d=a.start.column==0?b:b+1,e=c-1;a.end.column>0&&this.removeInLine(c,0,a.end.column),e>=d&&this.removeLines(d,e),d!=b&&(this.removeInLine(b,a.start.column,this.getLine(b).length),this.removeNewLine(a.start.row))}else this.removeInLine(b,a.start.column,a.end.column);return a.start},this.removeInLine=function(a,b,c){if(b!=c){var d=new f(a,b,a,c),e=this.getLine(a),g=e.substring(b,c),h=e.substring(0,b)+e.substring(c,e.length);this.$lines.splice(a,1,h);var i={action:"removeText",range:d,text:g};this._dispatchEvent("change",{data:i});return d.start}},this.removeLines=function(a,b){var c=new f(a,0,b+1,0),d=this.$lines.splice(a,b-a+1),e={action:"removeLines",range:c,nl:this.getNewLineCharacter(),lines:d};this._dispatchEvent("change",{data:e});return d},this.removeNewLine=function(a){var b=this.getLine(a),c=this.getLine(a+1),d=new f(a,b.length,a+1,0),e=b+c;this.$lines.splice(a,2,e);var g={action:"removeText",range:d,text:this.getNewLineCharacter()};this._dispatchEvent("change",{data:g})},this.replace=function(a,b){if(b.length==0&&a.isEmpty())return a.start;if(b==this.getTextRange(a))return a.end;this.remove(a);if(b)var c=this.insert(a.start,b);else c=a.start;return c},this.applyDeltas=function(a){for(var b=0;b<a.length;b++){var c=a[b],d=f.fromPoints(c.range.start,c.range.end);c.action=="insertLines"?this.insertLines(d.start.row,c.lines):c.action=="insertText"?this.insert(d.start,c.text):c.action=="removeLines"?this.removeLines(d.start.row,d.end.row-1):c.action=="removeText"&&this.remove(d)}},this.revertDeltas=function(a){for(var b=a.length-1;b>=0;b--){var c=a[b],d=f.fromPoints(c.range.start,c.range.end);c.action=="insertLines"?this.removeLines(d.start.row,d.end.row-1):c.action=="insertText"?this.remove(d):c.action=="removeLines"?this.insertLines(d.start.row,c.lines):c.action=="removeText"&&this.insert(d.start,c.text)}}}).call(h.prototype),b.Document=h}),define("ace/range",["require","exports","module"],function(a,b,c){var d=function(a,b,c,d){this.start={row:a,column:b},this.end={row:c,column:d}};(function(){this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(a,b){return this.compare(a,b)==0},this.compareRange=function(a){var b,c=a.end,d=a.start;b=this.compare(c.row,c.column);if(b==1){b=this.compare(d.row,d.column);return b==1?2:b==0?1:0}if(b==-1)return-2;b=this.compare(d.row,d.column);return b==-1?-1:b==1?42:0},this.containsRange=function(a){var b=this.compareRange(a);return b==-1||b==0||b==1},this.isEnd=function(a,b){return this.end.row==a&&this.end.column==b},this.isStart=function(a,b){return this.start.row==a&&this.start.column==b},this.setStart=function(a,b){typeof a=="object"?(this.start.column=a.column,this.start.row=a.row):(this.start.row=a,this.start.column=b)},this.setEnd=function(a,b){typeof a=="object"?(this.end.column=a.column,this.end.row=a.row):(this.end.row=a,this.end.column=b)},this.inside=function(a,b){if(this.compare(a,b)==0)return this.isEnd(a,b)||this.isStart(a,b)?!1:!0;return!1},this.insideStart=function(a,b){if(this.compare(a,b)==0)return this.isEnd(a,b)?!1:!0;return!1},this.insideEnd=function(a,b){if(this.compare(a,b)==0)return this.isStart(a,b)?!1:!0;return!1},this.compare=function(a,b){if(!this.isMultiLine()&&a===this.start.row)return b<this.start.column?-1:b>this.end.column?1:0;return a<this.start.row?-1:a>this.end.row?1:this.start.row===a?b>=this.start.column?0:-1:this.end.row===a?b<=this.end.column?0:1:0},this.compareStart=function(a,b){return this.start.row==a&&this.start.column==b?-1:this.compare(a,b)},this.compareEnd=function(a,b){return this.end.row==a&&this.end.column==b?1:this.compare(a,b)},this.compareInside=function(a,b){return this.end.row==a&&this.end.column==b?1:this.start.row==a&&this.start.column==b?-1:this.compare(a,b)},this.clipRows=function(a,b){if(this.end.row>b)var c={row:b+1,column:0};if(this.start.row>b)var e={row:b+1,column:0};if(this.start.row<a)var e={row:a,column:0};if(this.end.row<a)var c={row:a,column:0};return d.fromPoints(e||this.start,c||this.end)},this.extend=function(a,b){var c=this.compare(a,b);if(c==0)return this;if(c==-1)var e={row:a,column:b};else var f={row:a,column:b};return d.fromPoints(e||this.start,f||this.end)},this.isEmpty=function(){return this.start.row==this.end.row&&this.start.column==this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return d.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new d(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new d(this.start.row,0,this.end.row,0)},this.toScreenRange=function(a){var b=a.documentToScreenPosition(this.start),c=a.documentToScreenPosition(this.end);return new d(b.row,b.column,c.row,c.column)}}).call(d.prototype),d.fromPoints=function(a,b){return new d(a.row,a.column,b.row,b.column)},b.Range=d}),define("ace/anchor",["require","exports","module","pilot/oop","pilot/event_emitter"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/event_emitter").EventEmitter,f=b.Anchor=function(a,b,c){this.document=a,typeof c=="undefined"?this.setPosition(b.row,b.column):this.setPosition(b,c),this.$onChange=this.onChange.bind(this),a.on("change",this.$onChange)};(function(){d.implement(this,e),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.onChange=function(a){var b=a.data,c=b.range;if(c.start.row!=c.end.row||c.start.row==this.row){if(c.start.row>this.row)return;if(c.start.row==this.row&&c.start.column>this.column)return;var d=this.row,e=this.column;b.action==="insertText"?c.start.row===d&&c.start.column<=e?c.start.row===c.end.row?e+=c.end.column-c.start.column:(e-=c.start.column,d+=c.end.row-c.start.row):c.start.row!==c.end.row&&c.start.row<d&&(d+=c.end.row-c.start.row):b.action==="insertLines"?c.start.row<=d&&(d+=c.end.row-c.start.row):b.action=="removeText"?c.start.row==d&&c.start.column<e?c.end.column>=e?e=c.start.column:e=Math.max(0,e-(c.end.column-c.start.column)):c.start.row!==c.end.row&&c.start.row<d?(c.end.row==d&&(e=Math.max(0,e-c.end.column)+c.start.column),d-=c.end.row-c.start.row):c.end.row==d&&(d-=c.end.row-c.start.row,e=Math.max(0,e-c.end.column)+c.start.column):b.action=="removeLines"&&c.start.row<=d&&(c.end.row<=d?d-=c.end.row-c.start.row:(d=c.start.row,e=0)),this.setPosition(d,e,!0)}},this.setPosition=function(a,b,c){var d;c?d={row:a,column:b}:d=this.$clipPositionToDocument(a,b);if(this.row!=d.row||this.column!=d.column){var e={row:this.row,column:this.column};this.row=d.row,this.column=d.column,this._dispatchEvent("change",{old:e,value:d})}},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.$clipPositionToDocument=function(a,b){var c={};a>=this.document.getLength()?(c.row=Math.max(0,this.document.getLength()-1),c.column=this.document.getLine(c.row).length):a<0?(c.row=0,c.column=0):(c.row=a,c.column=Math.min(this.document.getLine(c.row).length,Math.max(0,b))),b<0&&(c.column=0);return c}}).call(f.prototype)}),define("pilot/lang",["require","exports","module"],function(a,b,c){b.stringReverse=function(a){return a.split("").reverse().join("")},b.stringRepeat=function(a,b){return Array(b+1).join(a)};var d=/^\s\s*/,e=/\s\s*$/;b.stringTrimLeft=function(a){return a.replace(d,"")},b.stringTrimRight=function(a){return a.replace(e,"")},b.copyObject=function(a){var b={};for(var c in a)b[c]=a[c];return b},b.copyArray=function(a){var b=[];for(i=0,l=a.length;i<l;i++)a[i]&&typeof a[i]=="object"?b[i]=this.copyObject(a[i]):b[i]=a[i];return b},b.deepCopy=function(a){if(typeof a!="object")return a;var b=a.constructor();for(var c in a)typeof a[c]=="object"?b[c]=this.deepCopy(a[c]):b[c]=a[c];return b},b.arrayToMap=function(a){var b={};for(var c=0;c<a.length;c++)b[a[c]]=1;return b},b.arrayRemove=function(a,b){for(var c=0;c<=a.length;c++)b===a[c]&&a.splice(c,1)},b.escapeRegExp=function(a){return a.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},b.deferredCall=function(a){var b=null,c=function(){b=null,a()},d=function(a){b||(b=setTimeout(c,a||0));return d};d.schedule=d,d.call=function(){this.cancel(),a();return d},d.cancel=function(){clearTimeout(b),b=null;return d};return d}}),define("ace/worker/jshint",["require","exports","module"],function(a,b,c){var d=function(){function bZ(){function b(){var a=x;bm("[");if(x.id!=="]")for(;;){if(x.id==="(end)")bg("Missing ']' to match '[' from line {a}.",x,a.line);else{if(x.id==="]"){be("Unexpected comma.",O);break}x.id===","&&bg("Unexpected comma.",x)}bZ();if(x.id!==",")break;bm(",")}bm("]")}function a(){var a={},b=x;bm("{");if(x.id!=="}")for(;;){if(x.id==="(end)")bg("Missing '}' to match '{' from line {a}.",x,b.line);else{if(x.id==="}"){be("Unexpected comma.",O);break}x.id===","?bg("Unexpected comma.",x):x.id!=="(string)"&&be("Expected a string and instead saw {a}.",x,x.value)}a[x.value]===!0?be("Duplicate key '{a}'.",x,x.value):x.value==="__proto__"&&!A.proto||x.value==="__iterator__"&&!A.iterator?be("The '{a}' key may produce unexpected results.",x,x.value):a[x.value]=!0,bm(),bm(":"),bZ();if(x.id!==",")break;bm(",")}bm("}")}switch(x.id){case"{":a();break;case"[":b();break;case"true":case"false":case"null":case"(number)":case"(string)":bm();break;case"-":bm("-"),O.character!==x.from&&be("Unexpected space after '-'.",O),bo(O,x),bm("(number)");break;default:bg("Expected a JSON value.",x)}}function bX(b,c){var d,e=A,f=G;A=Object.create(A),G=Object.create(G),j={"(name)":b||'"'+a+'"',"(line)":x.line,"(context)":j,"(breakage)":0,"(loopage)":0,"(scope)":G,"(statement)":c},d=j,O.funct=j,l.push(j),b&&bj(b,"function"),j["(params)"]=bW(),bS(!1),G=f,A=e,j["(last)"]=O.line,j=j["(context)"];return d}function bW(){var a,b=x,c=[];bm("("),bq();if(x.id===")")bm(")"),bq(D,O);else for(;;){a=bN(!0),c.push(a),bj(a,"parameter");if(x.id===",")bv();else{bm(")",b),bq(D,O);return c}}}function bV(){var a=bM(!0);a||(x.id==="(string)"?(a=x.value,bm()):x.id==="(number)"&&(a=x.value.toString(),bm()));return a}function bU(a){var b=a.value,c=a.line,d=n[b];typeof d=="function"&&(d=!1),d?d[d.length-1]!==c&&d.push(c):(d=[c],n[b]=d)}function bT(a){v&&typeof v[a]!="boolean"&&be("Unexpected /*member '{a}'.",O,a),typeof u[a]=="number"?u[a]+=1:u[a]=1}function bS(a,b){var c,d=o,e=p,f=L,g=G,h;o=a,G=Object.create(G),br(O,x),h=x;if(x.id==="{"){bm("{");if(x.id!=="}"||O.line!==x.line){p+=A.indent;while(!a&&x.from>p)p+=A.indent;!a&&!bQ()&&!f&&A.strict&&j["(context)"]["(global)"]&&be('Missing "use strict" statement.'),c=bR(),L=f,p-=A.indent,bt()}bm("}",h),p=e}else a?((!b||A.curly)&&be("Expected '{a}' and instead saw '{b}'.",x,"{",x.value),z=!0,c=[bP()],z=!1):bg("Expected '{a}' and instead saw '{b}'.",x,"{",x.value);j["(verb)"]=null,G=g,o=d,a&&A.noempty&&(!c||c.length===0)&&be("Empty block.");return c}function bR(a){var b=[],c,d;while(!x.reach&&x.id!=="(end)")x.id===";"?(be("Unnecessary semicolon."),bm(";")):b.push(bP());return b}function bQ(){if(x.value==="use strict"){L&&be('Unnecessary "use strict".'),bm(),bm(";"),L=!0,A.newcap=!0,A.undef=!0;return!0}return!1}function bP(a){var b=p,c,d=G,e=x;if(e.id===";")be("Unnecessary semicolon.",e),bm(";");else{e.identifier&&!e.reserved&&bl().id===":"&&(bm(),bm(":"),G=Object.create(d),bj(e.value,"label"),x.labelled||be("Label '{a}' on {b} statement.",x,e.value,x.value),Z.test(e.value+":")&&be("Label '{a}' looks like a javascript url.",e,e.value),x.label=e.value,e=x),a||bt(),c=bn(0,!0),e.block||(!A.expr&&(!c||!c.exps)?be("Expected an assignment or function call and instead saw an expression.",O):A.nonew&&c.id==="("&&c.left.id==="new"&&be("Do not use 'new' for side effects."),x.id!==";"?!A.asi&&(!A.lastsemic||x.id!="}"||x.line!=O.line)&&bf("Missing semicolon.",O.line,O.from+O.value.length):(bo(O,x),bm(";"),br(O,x))),p=b,G=d;return c}}function bO(a){var b=0,c;if(x.id===";"&&!z)for(;;){c=bl(b);if(c.reach)return;if(c.id!=="(endline)"){if(c.id==="function"){be("Inner functions should be listed at the top of the outer function.",c);break}be("Unreachable '{a}' after '{b}'.",c,c.value,a);break}b+=1}}function bN(a){var b=bM(a);if(b)return b;O.id==="function"&&x.id==="("?be("Missing name in function declaration."):bg("Expected an identifier and instead saw '{a}'.",x,x.value)}function bM(a){if(x.identifier){bm(),O.reserved&&!A.es5&&(!a||O.value!="undefined")&&be("Expected an identifier and instead saw '{a}' (a reserved word).",O,O.id);return O.value}}function bL(a,b){var c=bw(a,150);c.led=function(a){A.plusplus?be("Unexpected use of '{a}'.",this,this.id):(!a.identifier||a.reserved)&&a.id!=="."&&a.id!=="["&&be("Bad operand.",this),this.left=a;return this};return c}function bK(a){bw(a,20).exps=!0;return bF(a,function(a,b){A.bitwise&&be("Unexpected use of '{a}'.",b,b.id),br(D,O),br(O,x);if(a){if(a.id==="."||a.id==="["||a.identifier&&!a.reserved){bn(19);return b}a===M["function"]&&be("Expected an identifier in an assignment, and instead saw a function invocation.",O);return b}bg("Bad assignment.",b)},20)}function bJ(a,b,c){var d=bw(a,c);bA(d),d.led=typeof b=="function"?b:function(a){A.bitwise&&be("Unexpected use of '{a}'.",this,this.id),this.left=a,this.right=bn(c);return this};return d}function bI(a,b){bw(a,20).exps=!0;return bF(a,function(a,b){var c;b.left=a,B[a.value]===!1&&G[a.value]["(global)"]===!0?be("Read only.",a):a["function"]&&be("'{a}' is a function.",a,a.value);if(a){if(a.id==="."||a.id==="["){(!a.left||a.left.value==="arguments")&&be("Bad assignment.",b),b.right=bn(19);return b}if(a.identifier&&!a.reserved){j[a.value]==="exception"&&be("Do not assign to the exception parameter.",a),b.right=bn(19);return b}a===M["function"]&&be("Expected an identifier in an assignment and instead saw a function invocation.",O)}bg("Bad assignment.",b)},20)}function bH(a){return a&&(a.type==="(number)"&&+a.value===0||a.type==="(string)"&&a.value===""||a.type==="null"&&!A.eqnull||a.type==="true"||a.type==="false"||a.type==="undefined")}function bG(a,b){var c=bw(a,100);c.led=function(a){bs(D,O),br(O,x);var c=bn(100);a&&a.id==="NaN"||c&&c.id==="NaN"?be("Use the isNaN function to compare with NaN.",this):b&&b.apply(this,[a,c]),a.id==="!"&&be("Confusing use of '{a}'.",a,"!"),c.id==="!"&&be("Confusing use of '{a}'.",a,"!"),this.left=a,this.right=c;return this};return c}function bF(a,b,c,d){var e=bw(a,c);bA(e),e.led=function(a){d||(bs(D,O),br(O,x));if(typeof b=="function")return b(a,this);this.left=a,this.right=bn(c);return this};return e}function bE(a,b){return bD(a,function(){typeof b=="function"&&b(this);return this})}function bD(a,b){var c=bC(a,b);c.identifier=c.reserved=!0;return c}function bC(a,b){var c=bx(a);c.type=a,c.nud=b;return c}function bB(a,b){var c=bw(a,150);bA(c),c.nud=typeof b=="function"?b:function(){this.right=bn(150),this.arity="unary";if(this.id==="++"||this.id==="--")A.plusplus?be("Unexpected use of '{a}'.",this,this.id):(!this.right.identifier||this.right.reserved)&&this.right.id!=="."&&this.right.id!=="["&&be("Bad operand.",this);return this};return c}function bA(a){var b=a.id.charAt(0);if(b>="a"&&b<="z"||b>="A"&&b<="Z")a.identifier=a.reserved=!0;return a}function bz(a,b){var c=by(a,b);c.block=!0;return c}function by(a,b){var c=bx(a);c.identifier=c.reserved=!0,c.fud=b;return c}function bx(a){return bw(a,0)}function bw(a,b){var c=M[a];if(!c||typeof c!="object")M[a]=c={id:a,lbp:b,value:a};return c}function bv(){O.line!==x.line?A.laxbreak||be("Bad line breaking before '{a}'.",O,x.id):O.character!==x.from&&A.white&&be("Unexpected space after '{a}'.",x,O.value),bm(","),br(O,x)}function bu(a){a=a||O,a.line!==x.line&&be("Line breaking error '{a}'.",a,a.value)}function bt(a){var b;A.white&&x.id!=="(end)"&&(b=p+(a||0),x.from!==b&&be("Expected '{a}' to have an indentation at {b} instead at {c}.",x,x.value,b,x.from))}function bs(a,b){a=a||O,b=b||x,!A.laxbreak&&a.line!==b.line?be("Bad line breaking before '{a}'.",b,b.id):A.white&&(a=a||O,b=b||x,a.character===b.from&&be("Missing space after '{a}'.",x,a.value))}function br(a,b){A.white&&(a=a||O,b=b||x,a.line===b.line&&a.character===b.from&&be("Missing space after '{a}'.",x,a.value))}function bq(a,b){a=a||O,b=b||x,A.white&&!a.comment&&a.line===b.line&&bo(a,b)}function bp(a,b){a=a||O,b=b||x,A.white&&(a.character!==b.from||a.line!==b.line)&&be("Unexpected space before '{a}'.",b,b.value)}function bo(a,b){a=a||O,b=b||x,A.white&&a.character!==b.from&&a.line===b.line&&be("Unexpected space after '{a}'.",b,a.value)}function bn(b,c){var d,e=!1;x.id==="(end)"&&bg("Unexpected early end of program.",O),bm(),c&&(a="anonymous",j["(verb)"]=O.value);if(c===!0&&O.fud)d=O.fud();else{if(O.nud)d=O.nud();else{if(x.type==="(number)"&&O.id==="."){be("A leading decimal point can be confused with a dot: '.{a}'.",O,x.value),bm();return O}bg("Expected an identifier and instead saw '{a}'.",O,O.id)}while(b<x.lbp)e=O.value=="Array",bm(),e&&O.id=="("&&x.id==")"&&be("Use the array literal notation [].",O),O.led?d=O.led(d):bg("Expected an operator and instead saw '{a}'.",O,O.id)}return d}function bm(b,c){switch(O.id){case"(number)":x.id==="."&&be("A dot following a number can be confused with a decimal point.",O);break;case"-":(x.id==="-"||x.id==="--")&&be("Confusing minusses.");break;case"+":(x.id==="+"||x.id==="++")&&be("Confusing plusses.")}if(O.type==="(string)"||O.identifier)a=O.value;b&&x.id!==b&&(c?x.id==="(end)"?be("Unmatched '{a}'.",c,c.id):be("Expected '{a}' to match '{b}' from line {c} and instead saw '{d}'.",x,b,c.id,c.line,x.value):(x.type!=="(identifier)"||x.value!==b)&&be("Expected '{a}' and instead saw '{b}'.",x,b,x.value)),D=O,O=x;for(;;){x=t.shift()||bi.token();if(x.id==="(end)"||x.id==="(error)")return;if(x.type==="special")bk();else if(x.id!=="(endline)")break}}function bl(a){var b=a||0,c=0,d;while(c<=b)d=t[c],d||(d=t[c]=bi.token()),c+=1;return d}function bk(){var a,b,d,e=x.value,f,g;switch(e){case"*/":bg("Unbegun comment.");break;case"/*members":case"/*member":e="/*members",v||(v={}),b=v;break;case"/*jshint":case"/*jslint":b=A,d=c;break;case"/*global":b=B;break;default:bg("What?")}f=bi.token();loop:for(;;){for(;;){if(f.type==="special"&&f.value==="*/")break loop;if(f.id!=="(endline)"&&f.id!==",")break;f=bi.token()}f.type!=="(string)"&&f.type!=="(identifier)"&&e!=="/*members"&&bg("Bad option.",f),g=bi.token(),g.id===":"?(g=bi.token(),b===v&&bg("Expected '{a}' and instead saw '{b}'.",f,"*/",":"),f.value!=="indent"||e!=="/*jshint"&&e!=="/*jslint"?f.value!=="maxerr"||e!=="/*jshint"&&e!=="/*jslint"?f.value!=="maxlen"||e!=="/*jshint"&&e!=="/*jslint"?g.value==="true"?b[f.value]=!0:g.value==="false"?b[f.value]=!1:bg("Bad option value.",g):(a=+g.value,(typeof a!="number"||!isFinite(a)||a<=0||Math.floor(a)!==a)&&bg("Expected a small integer and instead saw '{a}'.",g,g.value),b.maxlen=a):(a=+g.value,(typeof a!="number"||!isFinite(a)||a<=0||Math.floor(a)!==a)&&bg("Expected a small integer and instead saw '{a}'.",g,g.value),b.maxerr=a):(a=+g.value,(typeof a!="number"||!isFinite(a)||a<=0||Math.floor(a)!==a)&&bg("Expected a small integer and instead saw '{a}'.",g,g.value),b.white=!0,b.indent=a),f=bi.token()):((e==="/*jshint"||e==="/*jslint")&&bg("Missing option value.",f),b[f.value]=!1,f=g)}d&&bc()}function bj(a,b){a==="hasOwnProperty"&&be("'hasOwnProperty' is a really bad name."),ba(j,a)&&!j["(global)"]&&(j[a]===!0?A.latedef&&be("'{a}' was used before it was defined.",x,a):A.shadow||be("'{a}' is already defined.",x,a)),j[a]=b,j["(global)"]?(m[a]=j,ba(n,a)&&(A.latedef&&be("'{a}' was used before it was defined.",x,a),delete n[a])):G[a]=j}function bh(a,b,c,d,e,f,g){return bg(a,{line:b,from:c},d,e,f,g)}function bg(a,b,c,d,e,f){var g=be(a,b,c,d,e,f);bd("Stopping, unable to continue.",g.line,g.character)}function bf(a,b,c,d,e,f,g){return be(a,{line:b,from:c},d,e,f,g)}function be(a,b,c,e,f,g){var h,i,j;b=b||x,b.id==="(end)"&&(b=O),i=b.line||0,h=b.from||0,j={id:"(error)",raw:a,evidence:s[i-1]||"",line:i,character:h,a:c,b:e,c:f,d:g},j.reason=a.supplant(j),d.errors.push(j),A.passfail&&bd("Stopping. ",i,h),Q+=1,Q>=A.maxerr&&bd("Too many errors.",i,h);return j}function bd(a,b,c){var d=Math.floor(b/s.length*100);throw{name:"JSHintError",line:b,character:c,message:a+" ("+d+"% scanned)."}}function bc(){A.couch&&bb(B,f),A.rhino&&bb(B,F),A.prototypejs&&bb(B,E),A.node&&bb(B,y),A.devel&&bb(B,g),A.dojo&&bb(B,h),A.browser&&bb(B,e),A.jquery&&bb(B,r),A.mootools&&bb(B,w),A.wsh&&bb(B,R),A.globalstrict&&A.strict!==!1&&(A.strict=!0)}function bb(a,b){var c;for(c in b)ba(b,c)&&(a[c]=b[c])}function ba(a,b){return Object.prototype.hasOwnProperty.call(a,b)}function _(){}"use strict";var a,b={"<":!0,"<=":!0,"==":!0,"===":!0,"!==":!0,"!=":!0,">":!0,">=":!0,"+":!0,"-":!0,"*":!0,"/":!0,"%":!0},c={asi:!0,bitwise:!0,boss:!0,browser:!0,couch:!0,curly:!0,debug:!0,devel:!0,dojo:!0,eqeqeq:!0,eqnull:!0,es5:!0,evil:!0,expr:!0,forin:!0,globalstrict:!0,immed:!0,iterator:!0,jquery:!0,latedef:!0,laxbreak:!0,loopfunc:!0,mootools:!0,newcap:!0,noarg:!0,node:!0,noempty:!0,nonew:!0,nomen:!0,onevar:!0,passfail:!0,plusplus:!0,proto:!0,prototypejs:!0,regexdash:!0,regexp:!0,rhino:!0,undef:!0,scripturl:!0,shadow:!0,strict:!0,sub:!0,supernew:!0,trailing:!0,white:!0,wsh:!0},e={ArrayBuffer:!1,ArrayBufferView:!1,addEventListener:!1,applicationCache:!1,blur:!1,clearInterval:!1,clearTimeout:!1,close:!1,closed:!1,DataView:!1,defaultStatus:!1,document:!1,event:!1,FileReader:!1,Float32Array:!1,Float64Array:!1,focus:!1,frames:!1,getComputedStyle:!1,HTMLElement:!1,history:!1,Int16Array:!1,Int32Array:!1,Int8Array:!1,Image:!1,length:!1,localStorage:!1,location:!1,moveBy:!1,moveTo:!1,name:!1,navigator:!1,onbeforeunload:!0,onblur:!0,onerror:!0,onfocus:!0,onload:!0,onresize:!0,onunload:!0,open:!1,openDatabase:!1,opener:!1,Option:!1,parent:!1,print:!1,removeEventListener:!1,resizeBy:!1,resizeTo:!1,screen:!1,scroll:!1,scrollBy:!1,scrollTo:!1,setInterval:!1,setTimeout:!1,status:!1,top:!1,Uint16Array:!1,Uint32Array:!1,Uint8Array:!1,WebSocket:!1,window:!1,Worker:!1,XMLHttpRequest:!1,XPathEvaluator:!1,XPathException:!1,XPathExpression:!1,XPathNamespace:!1,XPathNSResolver:!1,XPathResult:!1},f={require:!1,respond:!1,getRow:!1,emit:!1,send:!1,start:!1,sum:!1,log:!1,exports:!1,module:!1},g={alert:!1,confirm:!1,console:!1,Debug:!1,opera:!1,prompt:!1},h={dojo:!1,dijit:!1,dojox:!1,define:!1,require:!1},i={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"/":"\\/","\\":"\\\\"},j,k=["closure","exception","global","label","outer","unused","var"],l,m,n,o,p,q,r={$:!1,jQuery:!1},s,t,u,v,w={$:!1,$$:!1,Assets:!1,Browser:!1,Chain:!1,Class:!1,Color:!1,Cookie:!1,Core:!1,Document:!1,DomReady:!1,DOMReady:!1,Drag:!1,Element:!1,Elements:!1,Event:!1,Events:!1,Fx:!1,Group:!1,Hash:!1,HtmlTable:!1,Iframe:!1,IframeShim:!1,InputValidator:!1,instanceOf:!1,Keyboard:!1,Locale:!1,Mask:!1,MooTools:!1,Native:!1,Options:!1,OverText:!1,Request:!1,Scroller:!1,Slick:!1,Slider:!1,Sortables:!1,Spinner:!1,Swiff:!1,Tips:!1,Type:!1,typeOf:!1,URI:!1,Window:!1},x,y={__filename:!1,__dirname:!1,exports:!1,Buffer:!1,GLOBAL:!1,global:!1,module:!1,process:!1,require:!1},z,A,B,C,D,E={$:!1,$$:!1,$A:!1,$F:!1,$H:!1,$R:!1,$break:!1,$continue:!1,$w:!1,Abstract:!1,Ajax:!1,Class:!1,Enumerable:!1,Element:!1,Event:!1,Field:!1,Form:!1,Hash:!1,Insertion:!1,ObjectRange:!1,PeriodicalExecuter:!1,Position:!1,Prototype:!1,Selector:!1,Template:!1,Toggle:!1,Try:!1,Autocompleter:!1,Builder:!1,Control:!1,Draggable:!1,Draggables:!1,Droppables:!1,Effect:!1,Sortable:!1,SortableObserver:!1,Sound:!1,Scriptaculous:!1},F={defineClass:!1,deserialize:!1,gc:!1,help:!1,load:!1,loadClass:!1,print:!1,quit:!1,readFile:!1,readUrl:!1,runCommand:!1,seal:!1,serialize:!1,spawn:!1,sync:!1,toint32:!1,version:!1},G,H,I,J={Array:!1,Boolean:!1,Date:!1,decodeURI:!1,decodeURIComponent:!1,encodeURI:!1,encodeURIComponent:!1,Error:!1,eval:!1,EvalError:!1,Function:!1,hasOwnProperty:!1,isFinite:!1,isNaN:!1,JSON:!1,Math:!1,Number:!1,Object:!1,parseInt:!1,parseFloat:!1,RangeError:!1,ReferenceError:!1,RegExp:!1,String:!1,SyntaxError:!1,TypeError:!1,URIError:!1},K={E:!0,LN2:!0,LN10:!0,LOG2E:!0,LOG10E:!0,MAX_VALUE:!0,MIN_VALUE:!0,NEGATIVE_INFINITY:!0,PI:!0,POSITIVE_INFINITY:!0,SQRT1_2:!0,SQRT2:!0},L,M={},N,O,P,Q,R={ActiveXObject:!0,Enumerator:!0,GetObject:!0,ScriptEngine:!0,ScriptEngineBuildVersion:!0,ScriptEngineMajorVersion:!0,ScriptEngineMinorVersion:!0,VBArray:!0,WSH:!0,WScript:!0},S,T,U,V,W,X,Y,Z,$;(function(){S=/@cc|<\/?|script|\]\s*\]|<\s*!|&lt/i,T=/[\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/,U=/^\s*([(){}\[.,:;'"~\?\]#@]|==?=?|\/(\*(jshint|jslint|members?|global)?|=|\/)?|\*[\/=]?|\+(?:=|\++)?|-(?:=|-+)?|%=?|&[&=]?|\|[|=]?|>>?>?=?|<([\/=!]|\!(\[|--)?|<=?)?|\^=?|\!=?=?|[a-zA-Z_$][a-zA-Z0-9_$]*|[0-9]+([xX][0-9a-fA-F]+|\.[0-9]*)?([eE][+\-]?[0-9]+)?)/,V=/[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/,W=/[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,X=/\*\/|\/\*/,Y=/^([a-zA-Z_$][a-zA-Z0-9_$]*)$/,Z=/^(?:javascript|jscript|ecmascript|vbscript|mocha|livescript)\s*:/i,$=/^\s*\/\*\s*falls\sthrough\s*\*\/\s*$/})(),typeof Array.isArray!="function"&&(Array.isArray=function(a){return Object.prototype.toString.apply(a)==="[object Array]"}),typeof Object.create!="function"&&(Object.create=function(a){_.prototype=a;return new _}),typeof Object.keys!="function"&&(Object.keys=function(a){var b=[],c;for(c in a)ba(a,c)&&b.push(c);return b}),typeof String.prototype.entityify!="function"&&(String.prototype.entityify=function(){return this.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}),typeof String.prototype.isAlpha!="function"&&(String.prototype.isAlpha=function(){return this>="a"&&this<="zï¿¿"||this>="A"&&this<="Zï¿¿"}),typeof String.prototype.isDigit!="function"&&(String.prototype.isDigit=function(){return this>="0"&&this<="9"}),typeof String.prototype.supplant!="function"&&(String.prototype.supplant=function(a){return this.replace(/\{([^{}]*)\}/g,function(b,c){var d=a[c];return typeof d=="string"||typeof d=="number"?d:b})}),typeof String.prototype.name!="function"&&(String.prototype.name=function(){return Y.test(this)?this:V.test(this)?'"'+this.replace(W,function(a){var b=i[a];return b?b:"\\u"+("0000"+a.charCodeAt().toString(16)).slice(-4)})+'"':'"'+this+'"'});var bi=function(){function f(d,e){var f,g;d==="(color)"||d==="(range)"?g={type:d}:d==="(punctuator)"||d==="(identifier)"&&ba(M,e)?g=M[e]||M["(error)"]:g=M[d],g=Object.create(g),(d==="(string)"||d==="(range)")&&!A.scripturl&&Z.test(e)&&bf("Script URL.",c,b),d==="(identifier)"&&(g.identifier=!0,e==="__proto__"&&!A.proto?bf("The '{a}' property is deprecated.",c,b,e):e==="__iterator__"&&!A.iterator?bf("'{a}' is only available in JavaScript 1.7.",c,b,e):A.nomen&&(e.charAt(0)==="_"||e.charAt(e.length-1)==="_")&&bf("Unexpected {a} in '{b}'.",c,b,"dangling '_'",e)),g.value=e,g.line=c,g.character=a,g.from=b,f=g.id,f!=="(endline)"&&(C=f&&("(,=:[!&|?{};".indexOf(f.charAt(f.length-1))>=0||f==="return"));return g}function e(){var b,e;if(c>=s.length)return!1;a=1,d=s[c],c+=1,b=d.search(/ \t/),b>=0&&bf("Mixed spaces and tabs.",c,b+1),d=d.replace(/\t/g,N),b=d.search(T),b>=0&&bf("Unsafe character.",c,b),A.maxlen&&A.maxlen<d.length&&bf("Line too long.",c,d.length),e=d.search(/\s+$/),A.trailing&&~e&&!~d.search(/^\s+$/)&&bf("Trailing whitespace.",c,e);return!0}var a,b,c,d;return{init:function(a){typeof a=="string"?s=a.replace(/\r\n/g,"\n").replace(/\r/g,"\n").split("\n"):s=a,s[0]&&s[0].substr(0,2)=="#!"&&(s[0]=""),c=0,e(),b=1},range:function(e,g){var h,i="";b=a,d.charAt(0)!==e&&bh("Expected '{a}' and instead saw '{b}'.",c,a,e,d.charAt(0));for(;;){d=d.slice(1),a+=1,h=d.charAt(0);switch(h){case"":bh("Missing '{a}'.",c,a,h);break;case g:d=d.slice(1),a+=1;return f("(range)",i);case"\\":bf("Unexpected '{a}'.",c,a,h)}i+=h}},token:function(){function t(g){function k(b){var e=parseInt(d.substr(i+1,b),16);i+=b,e>=32&&e<=126&&e!==34&&e!==92&&e!==39&&bf("Unnecessary escapement.",c,a),a+=b,h=String.fromCharCode(e)}var h,i,j="";q&&g!=='"'&&bf("Strings must use doublequote.",c,a),i=0;for(;;){while(i>=d.length)i=0,e()||bh("Unclosed string.",c,b);h=d.charAt(i);if(h===g){a+=1,d=d.substr(i+1);return f("(string)",j,g)}if(h<" "){if(h==="\n"||h==="\r")break;bf("Control character in string: {a}.",c,a+i,d.slice(0,i))}else if(h==="\\"){i+=1,a+=1,h=d.charAt(i);switch(h){case"\\":case'"':case"/":break;case"'":q&&bf("Avoid \\'.",c,a);break;case"b":h="\b";break;case"f":h="\f";break;case"n":h="\n";break;case"r":h="\r";break;case"t":h="\t";break;case"u":k(4);break;case"v":q&&bf("Avoid \\v.",c,a),h="";break;case"x":q&&bf("Avoid \\x-.",c,a),k(2);break;default:bf("Bad escapement.",c,a)}}j+=h,a+=1,i+=1}}function s(c){var e=c.exec(d),f;if(e){n=e[0].length,f=e[1],h=f.charAt(0),d=d.substr(n),b=a+n-f.length,a+=n;return f}}var g,h,i,j,k,l,m,n,o,p,r;for(;;){if(!d)return f(e()?"(endline)":"(end)","");r=s(U);if(!r){r="",h="";while(d&&d<"!")d=d.substr(1);d&&bh("Unexpected '{a}'.",c,a,d.substr(0,1))}else{if(h.isAlpha()||h==="_"||h==="$")return f("(identifier)",r);if(h.isDigit()){isFinite(Number(r))||bf("Bad number '{a}'.",c,a,r),d.substr(0,1).isAlpha()&&bf("Missing space after '{a}'.",c,a,r),h==="0"&&(j=r.substr(1,1),j.isDigit()?O.id!=="."&&bf("Don't use extra leading zeros '{a}'.",c,a,r):q&&(j==="x"||j==="X")&&bf("Avoid 0x-. '{a}'.",c,a,r)),r.substr(r.length-1)==="."&&bf("A trailing decimal point can be confused with a dot '{a}'.",c,a,r);return f("(number)",r)}switch(r){case'"':case"'":return t(r);case"//":H&&bf("Unexpected comment.",c,a),d="",O.comment=!0;break;case"/*":H&&bf("Unexpected comment.",c,a);for(;;){m=d.search(X);if(m>=0)break;e()||bh("Unclosed comment.",c,a)}a+=m+2,d.substr(m,1)==="/"&&bh("Nested comment.",c,a),d=d.substr(m+2),O.comment=!0;break;case"/*members":case"/*member":case"/*jshint":case"/*jslint":case"/*global":case"*/":return{value:r,type:"special",line:c,character:a,from:b};case"":break;case"/":O.id==="/="&&bh("A regular expression literal can be confused with '/='.",c,b);if(C){k=0,i=0,n=0;for(;;){g=!0,h=d.charAt(n),n+=1;switch(h){case"":bh("Unclosed regular expression.",c,b);return;case"/":k>0&&bf("Unescaped '{a}'.",c,b+n,"/"),h=d.substr(0,n-1),p={g:!0,i:!0,m:!0};while(p[d.charAt(n)]===!0)p[d.charAt(n)]=!1,n+=1;a+=n,d=d.substr(n),p=d.charAt(0),(p==="/"||p==="*")&&bh("Confusing regular expression.",c,b);return f("(regexp)",h);case"\\":h=d.charAt(n),h<" "?bf("Unexpected control character in regular expression.",c,b+n):h==="<"&&bf("Unexpected escaped character '{a}' in regular expression.",c,b+n,h),n+=1;break;case"(":k+=1,g=!1;if(d.charAt(n)==="?"){n+=1;switch(d.charAt(n)){case":":case"=":case"!":n+=1;break;default:bf("Expected '{a}' and instead saw '{b}'.",c,b+n,":",d.charAt(n))}}else i+=1;break;case"|":g=!1;break;case")":k===0?bf("Unescaped '{a}'.",c,b+n,")"):k-=1;break;case" ":p=1;while(d.charAt(n)===" ")n+=1,p+=1;p>1&&bf("Spaces are hard to count. Use {{a}}.",c,b+n,p);break;case"[":h=d.charAt(n),h==="^"&&(n+=1,A.regexp?bf("Insecure '{a}'.",c,b+n,h):d.charAt(n)==="]"&&bh("Unescaped '{a}'.",c,b+n,"^")),p=!1,h==="]"&&(bf("Empty class.",c,b+n-1),p=!0);klass:do{h=d.charAt(n),n+=1;switch(h){case"[":case"^":bf("Unescaped '{a}'.",c,b+n,h),p=!0;break;case"-":p?p=!1:(bf("Unescaped '{a}'.",c,b+n,"-"),p=!0);break;case"]":!p&&!A.regexdash&&bf("Unescaped '{a}'.",c,b+n-1,"-");break klass;case"\\":h=d.charAt(n),h<" "?bf("Unexpected control character in regular expression.",c,b+n):h==="<"&&bf("Unexpected escaped character '{a}' in regular expression.",c,b+n,h),n+=1,p=!0;break;case"/":bf("Unescaped '{a}'.",c,b+n-1,"/"),p=!0;break;case"<":p=!0;break;default:p=!0}}while(h);break;case".":A.regexp&&bf("Insecure '{a}'.",c,b+n,h);break;case"]":case"?":case"{":case"}":case"+":case"*":bf("Unescaped '{a}'.",c,b+n,h)}if(g)switch(d.charAt(n)){case"?":case"+":case"*":n+=1,d.charAt(n)==="?"&&(n+=1);break;case"{":n+=1,h=d.charAt(n),(h<"0"||h>"9")&&bf("Expected a number and instead saw '{a}'.",c,b+n,h),n+=1,o=+h;for(;;){h=d.charAt(n);if(h<"0"||h>"9")break;n+=1,o=+h+o*10}l=o;if(h===","){n+=1,l=Infinity,h=d.charAt(n);if(h>="0"&&h<="9"){n+=1,l=+h;for(;;){h=d.charAt(n);if(h<"0"||h>"9")break;n+=1,l=+h+l*10}}}d.charAt(n)!=="}"?bf("Expected '{a}' and instead saw '{b}'.",c,b+n,"}",h):n+=1,d.charAt(n)==="?"&&(n+=1),o>l&&bf("'{a}' should not be greater than '{b}'.",c,b+n,o,l)}}h=d.substr(0,n-1),a+=n,d=d.substr(n);return f("(regexp)",h)}return f("(punctuator)",r);case"#":return f("(punctuator)",r);default:return f("(punctuator)",r)}}}}}}();bC("(number)",function(){return this}),bC("(string)",function(){return this}),M["(identifier)"]={type:"(identifier)",lbp:0,identifier:!0,nud:function(){var b=this.value,c=G[b],d;typeof c=="function"?c=undefined:typeof c=="boolean"&&(d=j,j=l[0],bj(b,"var"),c=j,j=d);if(j===c)switch(j[b]){case"unused":j[b]="var";break;case"unction":j[b]="function",this["function"]=!0;break;case"function":this["function"]=!0;break;case"label":be("'{a}' is a statement label.",O,b)}else if(j["(global)"])a!="typeof"&&a!="delete"&&A.undef&&typeof B[b]!="boolean"&&be("'{a}' is not defined.",O,b),bU(O);else switch(j[b]){case"closure":case"function":case"var":case"unused":be("'{a}' used out of scope.",O,b);break;case"label":be("'{a}' is a statement label.",O,b);break;case"outer":case"global":break;default:if(c===!0)j[b]=!0;else if(c===null)be("'{a}' is not allowed.",O,b),bU(O);else if(typeof c!="object")a!="typeof"&&a!="delete"&&A.undef?be("'{a}' is not defined.",O,b):j[b]=!0,bU(O);else switch(c[b]){case"function":case"unction":this["function"]=!0,c[b]="closure",j[b]=c["(global)"]?"global":"outer";break;case"var":case"unused":c[b]="closure",j[b]=c["(global)"]?"global":"outer";break;case"closure":case"parameter":j[b]=c["(global)"]?"global":"outer";break;case"label":be("'{a}' is a statement label.",O,b)}}return this},led:function(){bg("Expected an operator and instead saw '{a}'.",x,x.value)}},bC("(regexp)",function(){return this}),bx("(endline)"),bx("(begin)"),bx("(end)").reach=!0,bx("</").reach=!0,bx("<!"),bx("<!--"),bx("-->"),bx("(error)").reach=!0,bx("}").reach=!0,bx(")"),bx("]"),bx('"').reach=!0,bx("'").reach=!0,bx(";"),bx(":").reach=!0,bx(","),bx("#"),bx("@"),bD("else"),bD("case").reach=!0,bD("catch"),bD("default").reach=!0,bD("finally"),bE("arguments",function(a){L&&j["(global)"]&&be("Strict violation.",a)}),bE("eval"),bE("false"),bE("Infinity"),bE("NaN"),bE("null"),bE("this",function(a){L&&(j["(statement)"]&&j["(name)"].charAt(0)>"Z"||j["(global)"])&&be("Strict violation.",a)}),bE("true"),bE("undefined"),bI("=","assign",20),bI("+=","assignadd",20),bI("-=","assignsub",20),bI("*=","assignmult",20),bI("/=","assigndiv",20).nud=function(){bg("A regular expression literal can be confused with '/='.")},bI("%=","assignmod",20),bK("&=","assignbitand",20),bK("|=","assignbitor",20),bK("^=","assignbitxor",20),bK("<<=","assignshiftleft",20),bK(">>=","assignshiftright",20),bK(">>>=","assignshiftrightunsigned",20),bF("?",function(a,b){b.left=a,b.right=bn(10),bm(":"),b["else"]=bn(10);return b},30),bF("||","or",40),bF("&&","and",50),bJ("|","bitor",70),bJ("^","bitxor",80),bJ("&","bitand",90),bG("==",function(a,b){var c=A.eqnull&&(a.value=="null"||b.value=="null");!c&&A.eqeqeq?be("Expected '{a}' and instead saw '{b}'.",this,"===","=="):bH(a)?be("Use '{a}' to compare with '{b}'.",this,"===",a.value):bH(b)&&be("Use '{a}' to compare with '{b}'.",this,"===",b.value);return this}),bG("==="),bG("!=",function(a,b){var c=A.eqnull&&(a.value=="null"||b.value=="null");!c&&A.eqeqeq?be("Expected '{a}' and instead saw '{b}'.",this,"!==","!="):bH(a)?be("Use '{a}' to compare with '{b}'.",this,"!==",a.value):bH(b)&&be("Use '{a}' to compare with '{b}'.",this,"!==",b.value);return this}),bG("!=="),bG("<"),bG(">"),bG("<="),bG(">="),bJ("<<","shiftleft",120),bJ(">>","shiftright",120),bJ(">>>","shiftrightunsigned",120),bF("in","in",120),bF("instanceof","instanceof",120),bF("+",function(a,b){var c=bn(130);if(a&&c&&a.id==="(string)"&&c.id==="(string)"){a.value+=c.value,a.character=c.character,!A.scripturl&&Z.test(a.value)&&be("JavaScript URL.",a);return a}b.left=a,b.right=c;return b},130),bB("+","num"),bB("+++",function(){be("Confusing pluses."),this.right=bn(150),this.arity="unary";return this}),bF("+++",function(a){be("Confusing pluses."),this.left=a,this.right=bn(130);return this},130),bF("-","sub",130),bB("-","neg"),bB("---",function(){be("Confusing minuses."),this.right=bn(150),this.arity="unary";return this}),bF("---",function(a){be("Confusing minuses."),this.left=a,this.right=bn(130);return this},130),bF("*","mult",140),bF("/","div",140),bF("%","mod",140),bL("++","postinc"),bB("++","preinc"),M["++"].exps=!0,bL("--","postdec"),bB("--","predec"),M["--"].exps=!0,bB("delete",function(){var a=bn(0);(!a||a.id!=="."&&a.id!=="[")&&be("Variables should not be deleted."),this.first=a;return this}).exps=!0,bB("~",function(){A.bitwise&&be("Unexpected '{a}'.",this,"~"),bn(150);return this}),bB("!",function(){this.right=bn(150),this.arity="unary",b[this.right.id]===!0&&be("Confusing use of '{a}'.",this,"!");return this}),bB("typeof","typeof"),bB("new",function(){var a=bn(155),b;if(a&&a.id!=="function")if(a.identifier){a["new"]=!0;switch(a.value){case"Object":be("Use the object literal notation {}.",O);break;case"Number":case"String":case"Boolean":case"Math":case"JSON":be("Do not use {a} as a constructor.",O,a.value);break;case"Function":A.evil||be("The Function constructor is eval.");break;case"Date":case"RegExp":break;default:a.id!=="function"&&(b=a.value.substr(0,1),A.newcap&&(b<"A"||b>"Z")&&be("A constructor name should start with an uppercase letter.",O))}}else a.id!=="."&&a.id!=="["&&a.id!=="("&&be("Bad constructor.",O);else A.supernew||be("Weird construction. Delete 'new'.",this);bo(O,x),x.id!=="("&&!A.supernew&&be("Missing '()' invoking a constructor."),this.first=a;return this}),M["new"].exps=!0,bB("void").exps=!0,bF(".",function(a,b){bo(D,O),bp();var c=bN();typeof c=="string"&&bT(c),b.left=a,b.right=c,A.noarg&&a&&a.value==="arguments"&&(c==="callee"||c==="caller")?be("Avoid arguments.{a}.",a,c):!A.evil&&a&&a.value==="document"&&(c==="write"||c==="writeln")&&be("document.write can be a form of eval.",a),!A.evil&&(c==="eval"||c==="execScript")&&be("eval is evil.");return b},160,!0),bF("(",function(a,b){D.id!=="}"&&D.id!==")"&&bp(D,O),bq(),A.immed&&!a.immed&&a.id==="function"&&be("Wrap an immediate function invocation in parentheses to assist the reader in understanding that the expression is the result of a function, and not the function itself.");var c=0,d=[];a&&a.type==="(identifier)"&&a.value.match(/^[A-Z]([A-Z0-9_$]*[a-z][A-Za-z0-9_$]*)?$/)&&a.value!=="Number"&&a.value!=="String"&&a.value!=="Boolean"&&a.value!=="Date"&&(a.value==="Math"?be("Math is not a function.",a):A.newcap&&be("Missing 'new' prefix when invoking a constructor.",a));if(x.id!==")")for(;;){d[d.length]=bn(10),c+=1;if(x.id!==",")break;bv()}bm(")"),bq(D,O),typeof a=="object"&&(a.value==="parseInt"&&c===1&&be("Missing radix parameter.",a),A.evil||(a.value==="eval"||a.value==="Function"||a.value==="execScript"?be("eval is evil.",a):d[0]&&d[0].id==="(string)"&&(a.value==="setTimeout"||a.value==="setInterval")&&be("Implied eval is evil. Pass a function instead of a string.",a)),!a.identifier&&a.id!=="."&&a.id!=="["&&a.id!=="("&&a.id!=="&&"&&a.id!=="||"&&a.id!=="?"&&be("Bad invocation.",a)),b.left=a;return b},155,!0).exps=!0,bB("(",function(){bq(),x.id==="function"&&(x.immed=!0);var a=bn(0);bm(")",this),bq(D,O),A.immed&&a.id==="function"&&(x.id==="("?be("Move the invocation into the parens that contain the function.",x):be("Do not wrap function literals in parens unless they are to be immediately invoked.",this));return a}),bF("[",function(a,b){bp(D,O),bq();var c=bn(0),d;c&&c.type==="(string)"&&(!A.evil&&(c.value==="eval"||c.value==="execScript")&&be("eval is evil.",b),bT(c.value),!A.sub&&Y.test(c.value)&&(d=M[c.value],(!d||!d.reserved)&&be("['{a}'] is better written in dot notation.",c,c.value))),bm("]",b),bq(D,O),b.left=a,b.right=c;return b},160,!0),bB("[",function(){var a=O.line!==x.line;this.first=[],a&&(p+=A.indent,x.from===p+A.indent&&(p+=A.indent));while(x.id!=="(end)"){while(x.id===",")be("Extra comma."),bm(",");if(x.id==="]")break;a&&O.line!==x.line&&bt(),this.first.push(bn(10));if(x.id!==",")break;bv();if(x.id==="]"&&!A.es5){be("Extra comma.",O);break}}a&&(p-=A.indent,bt()),bm("]",this);return this},160),function(a){a.nud=function(){var a,b,c,d,e,f={},g;a=O.line!==x.line,a&&(p+=A.indent,x.from===p+A.indent&&(p+=A.indent));for(;;){if(x.id==="}")break;a&&bt();if(x.value==="get"&&bl().id!==":")bm("get"),A.es5||bg("get/set are ES5 features."),c=bV(),c||bg("Missing property name."),g=x,bo(O,x),b=bX(),!A.loopfunc&&j["(loopage)"]&&be("Don't make functions within a loop.",g),e=b["(params)"],e&&be("Unexpected parameter '{a}' in get {b} function.",g,e[0],c),bo(O,x),bm(","),bt(),bm("set"),d=bV(),c!==d&&bg("Expected {a} and instead saw {b}.",O,c,d),g=x,bo(O,x),b=bX(),e=b["(params)"],(!e||e.length!==1||e[0]!=="value")&&be("Expected (value) in set {a} function.",g,c);else{c=bV();if(typeof c!="string")break;bm(":"),br(O,x),bn(10)}f[c]===!0&&be("Duplicate member '{a}'.",x,c),f[c]=!0,bT(c);if(x.id===",")bv(),x.id===","?be("Extra comma.",O):x.id==="}"&&!A.es5&&be("Extra comma.",O);else break}a&&(p-=A.indent,bt()),bm("}",this);return this},a.fud=function(){bg("Expected to see a statement and instead saw a block.",O)}}(bx("{"));var bY=by("var",function(a){var b,c,d;j["(onevar)"]&&A.onevar?be("Too many var statements."):j["(global)"]||(j["(onevar)"]=!0),this.first=[];for(;;){br(O,x),b=bN(),j["(global)"]&&B[b]===!1&&be("Redefinition of '{a}'.",O,b),bj(b,"unused");if(a)break;c=O,this.first.push(O),x.id==="="&&(br(O,x),bm("="),br(O,x),x.id==="undefined"&&be("It is not necessary to initialize '{a}' to 'undefined'.",O,b),bl(0).id==="="&&x.identifier&&bg("Variable {a} was not declared correctly.",x,x.value),d=bn(0),c.first=d);if(x.id!==",")break;bv()}return this});bY.exps=!0,bz("function",function(){o&&be("Function declarations should not be placed in blocks. Use a function expression or move the statement to the top of the outer function.",O);var a=bN();bo(O,x),bj(a,"unction"),bX(a,!0),x.id==="("&&x.line===O.line&&bg("Function declarations are not invocable. Wrap the whole function invocation in parens.");return this}),bB("function",function(){var a=bM();a?bo(O,x):br(O,x),bX(a),!A.loopfunc&&j["(loopage)"]&&be("Don't make functions within a loop.");return this}),bz("if",function(){var a=x;bm("("),br(this,a),bq(),bn(20),x.id==="="&&(A.boss||be("Expected a conditional expression and instead saw an assignment."),bm("="),bn(20)),bm(")",a),bq(D,O),bS(!0,!0),x.id==="else"&&(br(O,x),bm("else"),x.id==="if"||x.id==="switch"?bP(!0):bS(!0,!0));return this}),bz("try",function(){var a,b,c;bS(!1),x.id==="catch"&&(bm("catch"),br(O,x),bm("("),c=G,G=Object.create(c),b=x.value,x.type!=="(identifier)"?be("Expected an identifier and instead saw '{a}'.",x,b):bj(b,"exception"),bm(),bm(")"),bS(!1),a=!0,G=c);if(x.id==="finally")bm("finally"),bS(!1);else{a||bg("Expected '{a}' and instead saw '{b}'.",x,"catch",x.value);return this}}),bz("while",function(){var a=x;j["(breakage)"]+=1,j["(loopage)"]+=1,bm("("),br(this,a),bq(),bn(20),x.id==="="&&(A.boss||be("Expected a conditional expression and instead saw an assignment."),bm("="),bn(20)),bm(")",a),bq(D,O),bS(!0,!0),j["(breakage)"]-=1,j["(loopage)"]-=1;return this}).labelled=!0,bD("with"),bz("switch",function(){var a=x,b=!1;j["(breakage)"]+=1,bm("("),br(this,a),bq(),this.condition=bn(20),bm(")",a),bq(D,O),br(O,x),a=x,bm("{"),br(O,x),p+=A.indent,this.cases=[];for(;;)switch(x.id){case"case":switch(j["(verb)"]){case"break":case"case":case"continue":case"return":case"switch":case"throw":break;default:$.test(s[x.line-2])||be("Expected a 'break' statement before 'case'.",O)}bt(-A.indent),bm("case"),this.cases.push(bn(20)),b=!0,bm(":"),j["(verb)"]="case";break;case"default":switch(j["(verb)"]){case"break":case"continue":case"return":case"throw":break;default:$.test(s[x.line-2])||be("Expected a 'break' statement before 'default'.",O)}bt(-A.indent),bm("default"),b=!0,bm(":");break;case"}":p-=A.indent,bt(),bm("}",a),(this.cases.length===1||this.condition.id==="true"||this.condition.id==="false")&&be("This 'switch' should be an 'if'.",this),j["(breakage)"]-=1,j["(verb)"]=undefined;return;case"(end)":bg("Missing '{a}'.",x,"}");return;default:if(b)switch(O.id){case",":bg("Each value should have its own case label.");return;case":":bR();break;default:bg("Missing ':' on a case clause.",O)}else bg("Expected '{a}' and instead saw '{b}'.",x,"case",x.value)}}).labelled=!0,by("debugger",function(){A.debug||be("All 'debugger' statements should be removed.");return this}).exps=!0,function(){var a=by("do",function(){j["(breakage)"]+=1,j["(loopage)"]+=1,this.first=bS(!0),bm("while");var a=x;br(O,a),bm("("),bq(),bn(20),x.id==="="&&(A.boss||be("Expected a conditional expression and instead saw an assignment."),bm("="),bn(20)),bm(")",a),bq(D,O),j["(breakage)"]-=1,j["(loopage)"]-=1;return this});a.labelled=!0,a.exps=!0}(),bz("for",function(){var a,b=x;j["(breakage)"]+=1,j["(loopage)"]+=1,bm("("),br(this,b),bq();if(bl(x.id==="var"?1:0).id==="in"){if(x.id==="var")bm("var"),bY.fud.call(bY,!0);else{switch(j[x.value]){case"unused":j[x.value]="var";break;case"var":break;default:be("Bad for in variable '{a}'.",x,x.value)}bm()}bm("in"),bn(20),bm(")",b),a=bS(!0,!0),A.forin&&(a.length>1||typeof a[0]!="object"||a[0].value!=="if")&&be("The body of a for in should be wrapped in an if statement to filter unwanted properties from the prototype.",this),j["(breakage)"]-=1,j["(loopage)"]-=1;return this}if(x.id!==";")if(x.id==="var")bm("var"),bY.fud.call(bY);else for(;;){bn(0,"for");if(x.id!==",")break;bv()}bu(O),bm(";"),x.id!==";"&&(bn(20),x.id==="="&&(A.boss||be("Expected a conditional expression and instead saw an assignment."),bm("="),bn(20))),bu(O),bm(";"),x.id===";"&&bg("Expected '{a}' and instead saw '{b}'.",x,")",";");if(x.id!==")")for(;;){bn(0,"for");if(x.id!==",")break;bv()}bm(")",b),bq(D,O),bS(!0,!0),j["(breakage)"]-=1,j["(loopage)"]-=1;return this}).labelled=!0,by("break",function(){var a=x.value;j["(breakage)"]===0&&be("Unexpected '{a}'.",x,this.value),bu(this),x.id!==";"&&O.line===x.line&&(j[a]!=="label"?be("'{a}' is not a statement label.",x,a):G[a]!==j&&be("'{a}' is out of scope.",x,a),this.first=x,bm()),bO("break");return this}).exps=!0,by("continue",function(){var a=x.value;j["(breakage)"]===0&&be("Unexpected '{a}'.",x,this.value),bu(this),x.id!==";"?O.line===x.line&&(j[a]!=="label"?be("'{a}' is not a statement label.",x,a):G[a]!==j&&be("'{a}' is out of scope.",x,a),this.first=x,bm()):j["(loopage)"]||be("Unexpected '{a}'.",x,this.value),bO("continue");return this}).exps=!0,by("return",function(){bu(this),x.id==="(regexp)"&&be("Wrap the /regexp/ literal in parens to disambiguate the slash operator."),x.id!==";"&&!x.reach&&(br(O,x),this.first=bn(20)),bO("return");return this}).exps=!0,by("throw",function(){bu(this),br(O,x),this.first=bn(20),bO("throw");return this}).exps=!0,bD("class"),bD("const"),bD("enum"),bD("export"),bD("extends"),bD("import"),bD("super"),bD("let"),bD("yield"),bD("implements"),bD("interface"),bD("package"),bD("private"),bD("protected"),bD("public"),bD("static");var b$=function(a,b,c){var e,f,g;d.errors=[],B=Object.create(J),bb(B,c||{});if(b){e=b.predef;if(e)if(Array.isArray(e))for(f=0;f<e.length;f+=1)B[e[f]]=!0;else if(typeof e=="object"){g=Object.keys(e);for(f=0;f<g.length;f+=1)B[g[f]]=!!e[g[f]]}A=b}else A={};A.indent=A.indent||4,A.maxerr=A.maxerr||50,N="";for(f=0;f<A.indent;f+=1)N+=" ";p=1,m=Object.create(B),G=m,j={"(global)":!0,"(name)":"(global)","(scope)":G,"(breakage)":0,"(loopage)":0},l=[j],P=[],H=!1,I=null,u={},v=null,n={},o=!1,t=[],q=!1,Q=0,bi.init(a),C=!0,L=!1,D=O=x=M["(begin)"],bc();try{bm();switch(x.id){case"{":case"[":A.laxbreak=!0,q=!0,bZ();break;default:x.value==="use strict"&&(A.globalstrict||be('Use the function form of "use strict".'),bQ()),bR("lib")}bm("(end)")}catch(h){h&&d.errors.push({reason:h.message,line:h.line||x.line,character:h.character||x.from},null)}return d.errors.length===0};b$.data=function(){var a={functions:[]},b,c,d=[],e,f,g,h=[],i,j=[],m;b$.errors.length&&(a.errors=b$.errors),q&&(a.json=!0);for(i in n)ba(n,i)&&d.push({name:i,line:n[i]});d.length>0&&(a.implieds=d),P.length>0&&(a.urls=P),c=Object.keys(G),c.length>0&&(a.globals=c);for(f=1;f<l.length;f+=1){e=l[f],b={};for(g=0;g<k.length;g+=1)b[k[g]]=[];for(i in e)ba(e,i)&&i.charAt(0)!=="("&&(m=e[i],m==="unction"&&(m="unused"),Array.isArray(b[m])&&(b[m].push(i),m==="unused"&&j.push({name:i,line:e["(line)"],"function":e["(name)"]})));for(g=0;g<k.length;g+=1)b[k[g]].length===0&&delete b[k[g]];b.name=e["(name)"],b.param=e["(params)"],b.line=e["(line)"],b.last=e["(last)"],a.functions.push(b)}j.length>0&&(a.unused=j),h=[];for(i in u)if(typeof u[i]=="number"){a.member=u;break}return a},b$.report=function(a){function o(a,b){var c,d,e;if(b){m.push("<div><i>"+a+"</i> "),b=b.sort();for(d=0;d<b.length;d+=1)b[d]!==e&&(e=b[d],m.push((c?", ":"")+e),c=!0);m.push("</div>")}}var b=b$.data(),c=[],d,e,f,g,h,i,j,k="",l,m=[],n;if(b.errors||b.implieds||b.unused){f=!0,m.push("<div id=errors><i>Error:</i>");if(b.errors)for(h=0;h<b.errors.length;h+=1)d=b.errors[h],d&&(e=d.evidence||"",m.push("<p>Problem"+(isFinite(d.line)?" at line "+d.line+" character "+d.character:"")+": "+d.reason.entityify()+"</p><p class=evidence>"+(e&&(e.length>80?e.slice(0,77)+"...":e).entityify())+"</p>"));if(b.implieds){n=[];for(h=0;h<b.implieds.length;h+=1)n[h]="<code>"+b.implieds[h].name+"</code>&nbsp;<i>"+b.implieds[h].line+"</i>";m.push("<p><i>Implied global:</i> "+n.join(", ")+"</p>")}if(b.unused){n=[];for(h=0;h<b.unused.length;h+=1)n[h]="<code><u>"+b.unused[h].name+"</u></code>&nbsp;<i>"+b.unused[h].line+"</i> <code>"+b.unused[h]["function"]+"</code>";m.push("<p><i>Unused variable:</i> "+n.join(", ")+"</p>")}b.json&&m.push("<p>JSON: bad.</p>"),m.push("</div>")}if(!a){m.push("<br><div id=functions>"),b.urls&&o("URLs<br>",b.urls,"<br>"),b.json&&!f?m.push("<p>JSON: good.</p>"):b.globals?m.push("<div><i>Global</i> "+b.globals.sort().join(", ")+"</div>"):m.push("<div><i>No new global variables introduced.</i></div>");for(h=0;h<b.functions.length;h+=1)g=b.functions[h],m.push("<br><div class=function><i>"+g.line+"-"+g.last+"</i> "+(g.name||"")+"("+(g.param?g.param.join(", "):"")+")</div>"),o("<big><b>Unused</b></big>",g.unused),o("Closure",g.closure),o("Variable",g["var"]),o("Exception",g.exception),o("Outer",g.outer),o("Global",g.global),o("Label",g.label);if(b.member){c=Object.keys(b.member);if(c.length){c=c.sort(),k="<br><pre id=members>/*members ",j=10;for(h=0;h<c.length;h+=1)i=c[h],l=i.name(),j+l.length>72&&(m.push(k+"<br>"),k="    ",j=1),j+=l.length+2,b.member[i]===1&&(l="<i>"+l+"</i>"),h<c.length-1&&(l+=", "),k+=l;m.push(k+"<br>*/</pre>")}m.push("</div>")}}return m.join("")},b$.jshint=b$,b$.edition="2011-04-16";return b$}();typeof b=="object"&&b&&(b.JSHINT=d)}),define("ace/narcissus/jsparse",["require","exports","module","ace/narcissus/jslex","ace/narcissus/jsdefs"],function(require,exports,module){function parseStdin(a,b){for(;;)try{var c=new lexer.Tokenizer(a,"stdin",b.value),d=Script(c,!1);b.value=c.lineno;return d}catch(e){if(!c.unexpectedEOF)throw e;var f=readline();if(!f)throw e;a+="\n"+f}}function parse(a,b,c){var d=new lexer.Tokenizer(a,b,c),e=Script(d,!1);if(!d.done)throw d.newSyntaxError("Syntax error");return e}function PrimaryExpression(a,b){var c,d,e=a.get(!0);switch(e){case FUNCTION:c=FunctionDefinition(a,b,!1,EXPRESSED_FORM);break;case LEFT_BRACKET:c=new Node(a,{type:ARRAY_INIT});while((e=a.peek(!0))!==RIGHT_BRACKET){if(e===COMMA){a.get(),c.push(null);continue}c.push(AssignExpression(a,b));if(e!==COMMA&&!a.match(COMMA))break}c.children.length===1&&a.match(FOR)&&(d=new Node(a,{type:ARRAY_COMP,expression:c.children[0],tail:ComprehensionTail(a,b)}),c=d),a.mustMatch(RIGHT_BRACKET);break;case LEFT_CURLY:var f,g;c=new Node(a,{type:OBJECT_INIT});object_init:if(!a.match(RIGHT_CURLY)){do{e=a.get();if(a.token.value!=="get"&&a.token.value!=="set"||a.peek()!==IDENTIFIER){switch(e){case IDENTIFIER:case NUMBER:case STRING:f=new Node(a,{type:IDENTIFIER});break;case RIGHT_CURLY:if(b.ecma3OnlyMode)throw a.newSyntaxError("Illegal trailing ,");break object_init;default:if(a.token.value in definitions.keywords){f=new Node(a,{type:IDENTIFIER});break}throw a.newSyntaxError("Invalid property name")}if(a.match(COLON))d=new Node(a,{type:PROPERTY_INIT}),d.push(f),d.push(AssignExpression(a,b)),c.push(d);else{if(a.peek()!==COMMA&&a.peek()!==RIGHT_CURLY)throw a.newSyntaxError("missing : after property");c.push(f)}}else{if(b.ecma3OnlyMode)throw a.newSyntaxError("Illegal property accessor");c.push(FunctionDefinition(a,b,!0,EXPRESSED_FORM))}}while(a.match(COMMA));a.mustMatch(RIGHT_CURLY)}break;case LEFT_PAREN:c=ParenExpression(a,b),a.mustMatch(RIGHT_PAREN),c.parenthesized=!0;break;case LET:c=LetBlock(a,b,!1);break;case NULL:case THIS:case TRUE:case FALSE:case IDENTIFIER:case NUMBER:case STRING:case REGEXP:c=new Node(a);break;default:throw a.newSyntaxError("missing operand")}return c}function ArgumentList(a,b){var c,d;c=new Node(a,{type:LIST});if(a.match(RIGHT_PAREN,!0))return c;do{d=AssignExpression(a,b);if(d.type===YIELD&&!d.parenthesized&&a.peek()===COMMA)throw a.newSyntaxError("Yield expression must be parenthesized");if(a.match(FOR)){d=GeneratorExpression(a,b,d);if(c.children.length>1||a.peek(!0)===COMMA)throw a.newSyntaxError("Generator expression must be parenthesized")}c.push(d)}while(a.match(COMMA));a.mustMatch(RIGHT_PAREN);return c}function MemberExpression(a,b,c){var d,e,f,g;a.match(NEW)?(d=new Node(a),d.push(MemberExpression(a,b,!1)),a.match(LEFT_PAREN)&&(d.type=NEW_WITH_ARGS,d.push(ArgumentList(a,b)))):d=PrimaryExpression(a,b);while((g=a.get())!==END){switch(g){case DOT:e=new Node(a),e.push(d),a.mustMatch(IDENTIFIER),e.push(new Node(a));break;case LEFT_BRACKET:e=new Node(a,{type:INDEX}),e.push(d),e.push(Expression(a,b)),a.mustMatch(RIGHT_BRACKET);break;case LEFT_PAREN:if(c){e=new Node(a,{type:CALL}),e.push(d),e.push(ArgumentList(a,b));break};default:a.unget();return d}d=e}return d}function UnaryExpression(a,b){var c,d,e;switch(e=a.get(!0)){case DELETE:case VOID:case TYPEOF:case NOT:case BITWISE_NOT:case PLUS:case MINUS:e===PLUS?c=new Node(a,{type:UNARY_PLUS}):e===MINUS?c=new Node(a,{type:UNARY_MINUS}):c=new Node(a),c.push(UnaryExpression(a,b));break;case INCREMENT:case DECREMENT:c=new Node(a),c.push(MemberExpression(a,b,!0));break;default:a.unget(),c=MemberExpression(a,b,!0),a.tokens[a.tokenIndex+a.lookahead-1&3].lineno===a.lineno&&(a.match(INCREMENT)||a.match(DECREMENT))&&(d=new Node(a,{postfix:!0}),d.push(c),c=d)}return c}function MultiplyExpression(a,b){var c,d;c=UnaryExpression(a,b);while(a.match(MUL)||a.match(DIV)||a.match(MOD))d=new Node(a),d.push(c),d.push(UnaryExpression(a,b)),c=d;return c}function AddExpression(a,b){var c,d;c=MultiplyExpression(a,b);while(a.match(PLUS)||a.match(MINUS))d=new Node(a),d.push(c),d.push(MultiplyExpression(a,b)),c=d;return c}function ShiftExpression(a,b){var c,d;c=AddExpression(a,b);while(a.match(LSH)||a.match(RSH)||a.match(URSH))d=new Node(a),d.push(c),d.push(AddExpression(a,b)),c=d;return c}function RelationalExpression(a,b){var c,d,e=b.update({inForLoopInit:!1});c=ShiftExpression(a,e);while(a.match(LT)||a.match(LE)||a.match(GE)||a.match(GT)||!b.inForLoopInit&&a.match(IN)||a.match(INSTANCEOF))d=new Node(a),d.push(c),d.push(ShiftExpression(a,e)),c=d;return c}function EqualityExpression(a,b){var c,d;c=RelationalExpression(a,b);while(a.match(EQ)||a.match(NE)||a.match(STRICT_EQ)||a.match(STRICT_NE))d=new Node(a),d.push(c),d.push(RelationalExpression(a,b)),c=d;return c}function BitwiseAndExpression(a,b){var c,d;c=EqualityExpression(a,b);while(a.match(BITWISE_AND))d=new Node(a),d.push(c),d.push(EqualityExpression(a,b)),c=d;return c}function BitwiseXorExpression(a,b){var c,d;c=BitwiseAndExpression(a,b);while(a.match(BITWISE_XOR))d=new Node(a),d.push(c),d.push(BitwiseAndExpression(a,b)),c=d;return c}function BitwiseOrExpression(a,b){var c,d;c=BitwiseXorExpression(a,b);while(a.match(BITWISE_OR))d=new Node(a),d.push(c),d.push(BitwiseXorExpression(a,b)),c=d;return c}function AndExpression(a,b){var c,d;c=BitwiseOrExpression(a,b);while(a.match(AND))d=new Node(a),d.push(c),d.push(BitwiseOrExpression(a,b)),c=d;return c}function OrExpression(a,b){var c,d;c=AndExpression(a,b);while(a.match(OR))d=new Node(a),d.push(c),d.push(AndExpression(a,b)),c=d;return c}function ConditionalExpression(a,b){var c,d;c=OrExpression(a,b);if(a.match(HOOK)){d=c,c=new Node(a,{type:HOOK}),c.push(d),c.push(AssignExpression(a,b.update({inForLoopInit:!1})));if(!a.match(COLON))throw a.newSyntaxError("missing : after ?");c.push(AssignExpression(a,b))}return c}function AssignExpression(a,b){var c,d;if(a.match(YIELD,!0))return ReturnOrYield(a,b);c=new Node(a,{type:ASSIGN}),d=ConditionalExpression(a,b);if(!a.match(ASSIGN))return d;switch(d.type){case OBJECT_INIT:case ARRAY_INIT:d.destructuredNames=checkDestructuring(a,b,d);case IDENTIFIER:case DOT:case INDEX:case CALL:break;default:throw a.newSyntaxError("Bad left-hand side of assignment")}c.assignOp=a.token.assignOp,c.push(d),c.push(AssignExpression(a,b));return c}function Expression(a,b){var c,d;c=AssignExpression(a,b);if(a.match(COMMA)){d=new Node(a,{type:COMMA}),d.push(c),c=d;do{d=c.children[c.children.length-1];if(d.type===YIELD&&!d.parenthesized)throw a.newSyntaxError("Yield expression must be parenthesized");c.push(AssignExpression(a,b))}while(a.match(COMMA))}return c}function ParenExpression(a,b){var c=Expression(a,b.update({inForLoopInit:b.inForLoopInit&&a.token.type===LEFT_PAREN}));if(a.match(FOR)){if(c.type===YIELD&&!c.parenthesized)throw a.newSyntaxError("Yield expression must be parenthesized");if(c.type===COMMA&&!c.parenthesized)throw a.newSyntaxError("Generator expression must be parenthesized");c=GeneratorExpression(a,b,c)}return c}function HeadExpression(a,b){var c=MaybeLeftParen(a,b),d=ParenExpression(a,b);MaybeRightParen(a,c);if(c===END&&!d.parenthesized){var e=a.peek();if(e!==LEFT_CURLY&&!definitions.isStatementStartCode[e])throw a.newSyntaxError("Unparenthesized head followed by unbraced body")}return d}function ComprehensionTail(a,b){var c,d,e,f,g;c=new Node(a,{type:COMP_TAIL});do{d=new Node(a,{type:FOR_IN,isLoop:!0}),a.match(IDENTIFIER)&&(a.token.value==="each"?d.isEach=!0:a.unget()),g=MaybeLeftParen(a,b);switch(a.get()){case LEFT_BRACKET:case LEFT_CURLY:a.unget(),d.iterator=DestructuringExpression(a,b);break;case IDENTIFIER:d.iterator=f=new Node(a,{type:IDENTIFIER}),f.name=f.value,d.varDecl=e=new Node(a,{type:VAR}),e.push(f),b.parentScript.varDecls.push(f);break;default:throw a.newSyntaxError("missing identifier")}a.mustMatch(IN),d.object=Expression(a,b),MaybeRightParen(a,g),c.push(d)}while(a.match(FOR));a.match(IF)&&(c.guard=HeadExpression(a,b));return c}function GeneratorExpression(a,b,c){return new Node(a,{type:GENERATOR,expression:c,tail:ComprehensionTail(a,b)})}function DestructuringExpression(a,b,c){var d=PrimaryExpression(a,b);d.destructuredNames=checkDestructuring(a,b,d,c);return d}function checkDestructuring(a,b,c,d){if(c.type===ARRAY_COMP)throw a.newSyntaxError("Invalid array comprehension left-hand side");if(c.type===ARRAY_INIT||c.type===OBJECT_INIT){var e={},f,g,h,i,j,k=c.children;for(var l=0,m=k.length;l<m;l++){if(!(f=k[l]))continue;f.type===PROPERTY_INIT?(j=f.children,i=j[1],h=j[0].value):c.type===OBJECT_INIT?(i=f,h=f.value):(i=f,h=l);if(i.type===ARRAY_INIT||i.type===OBJECT_INIT)e[h]=checkDestructuring(a,b,i,d);else{if(d&&i.type!==IDENTIFIER)throw a.newSyntaxError("missing name in pattern");e[h]=i}}return e}}function LetBlock(a,b,c){var d,e;d=new Node(a,{type:LET_BLOCK,varDecls:[]}),a.mustMatch(LEFT_PAREN),d.variables=Variables(a,b,d),a.mustMatch(RIGHT_PAREN),c&&a.peek()!==LEFT_CURLY&&(e=new Node(a,{type:SEMICOLON,expression:d}),c=!1),c?d.block=Block(a,b):d.expression=AssignExpression(a,b);return d}function Variables(a,b,c){var d,e,f,g,h,i;i=a.token.type;switch(i){case VAR:case CONST:h=b.parentScript;break;case LET:h=b.parentBlock;break;case LEFT_PAREN:i=LET,h=c}d=new Node(a,{type:i,destructurings:[]});do{i=a.get();if(i===LEFT_BRACKET||i===LEFT_CURLY){a.unget();var j=DestructuringExpression(a,b,!0);e=new Node(a,{type:IDENTIFIER,name:j,readOnly:d.type===CONST}),d.push(e),pushDestructuringVarDecls(e.name.destructuredNames,h),d.destructurings.push({exp:j,decl:e});if(b.inForLoopInit&&a.peek()===IN)continue;a.mustMatch(ASSIGN);if(a.token.assignOp)throw a.newSyntaxError("Invalid variable initialization");e.initializer=AssignExpression(a,b);continue}if(i!==IDENTIFIER)throw a.newSyntaxError("missing variable name");e=new Node(a,{type:IDENTIFIER,name:a.token.value,readOnly:d.type===CONST}),d.push(e),h.varDecls.push(e);if(a.match(ASSIGN)){if(a.token.assignOp)throw a.newSyntaxError("Invalid variable initialization");e.initializer=AssignExpression(a,b)}}while(a.match(COMMA));return d}function FunctionDefinition(a,b,c,d){var e,f=new Node(a,{params:[]});f.type!==FUNCTION&&(f.type=f.value==="get"?GETTER:SETTER);if(a.match(IDENTIFIER))f.name=a.token.value;else if(c)throw a.newSyntaxError("missing function identifier");var g=new StaticContext(null,null,!0,!1,NESTING_TOP);a.mustMatch(LEFT_PAREN);if(!a.match(RIGHT_PAREN)){do switch(a.get()){case LEFT_BRACKET:case LEFT_CURLY:a.unget(),f.params.push(DestructuringExpression(a,g));break;case IDENTIFIER:f.params.push(a.token.value);break;default:throw a.newSyntaxError("missing formal parameter")}while(a.match(COMMA));a.mustMatch(RIGHT_PAREN)}e=a.get(),e!==LEFT_CURLY&&a.unget();if(e!==LEFT_CURLY){f.body=AssignExpression(a,g);if(f.body.isGenerator)throw a.newSyntaxError("Generator returns a value")}else f.body=Script(a,!0);e===LEFT_CURLY&&a.mustMatch(RIGHT_CURLY),f.end=a.token.end,f.functionForm=d,d===DECLARED_FORM&&b.parentScript.funDecls.push(f);return f}function ReturnOrYield(a,b){var c,d,e=a.token.type,f,g=b.parentScript;if(e===RETURN){if(!b.inFunction)throw a.newSyntaxError("Return not in function")}else{if(!b.inFunction)throw a.newSyntaxError("Yield not in function");g.isGenerator=!0}c=new Node(a,{value:undefined}),f=a.peek(!0),f!==END&&f!==NEWLINE&&f!==SEMICOLON&&f!==RIGHT_CURLY&&(e!==YIELD||f!==e&&f!==RIGHT_BRACKET&&f!==RIGHT_PAREN&&f!==COLON&&f!==COMMA)?e===RETURN?(c.value=Expression(a,b),g.hasReturnWithValue=!0):c.value=AssignExpression(a,b):e===RETURN&&(g.hasEmptyReturn=!0);if(g.hasReturnWithValue&&g.isGenerator)throw a.newSyntaxError("Generator returns a value");return c}function MagicalSemicolon(a){var b;if(a.lineno===a.token.lineno){b=a.peekOnSameLine();if(b!==END&&b!==NEWLINE&&b!==SEMICOLON&&b!==RIGHT_CURLY)throw a.newSyntaxError("missing ; before statement")}a.match(SEMICOLON)}function Statement(a,b){var c,d,e,f,g,h,i,j=a.get(!0),k,l,m;switch(j){case FUNCTION:return FunctionDefinition(a,b,!0,b.nesting!==NESTING_TOP?STATEMENT_FORM:DECLARED_FORM);case LEFT_CURLY:e=new Node(a,blockInit()),Statements(a,b.update({parentBlock:e}).pushTarget(e).nest(NESTING_SHALLOW),e),a.mustMatch(RIGHT_CURLY);return e;case IF:e=new Node(a),e.condition=HeadExpression(a,b),l=b.pushTarget(e).nest(NESTING_DEEP),e.thenPart=Statement(a,l),e.elsePart=a.match(ELSE)?Statement(a,l):null;return e;case SWITCH:e=new Node(a,{cases:[],defaultIndex:-1}),e.discriminant=HeadExpression(a,b),l=b.pushTarget(e).nest(NESTING_DEEP),a.mustMatch(LEFT_CURLY);while((j=a.get())!==RIGHT_CURLY){switch(j){case DEFAULT:if(e.defaultIndex>=0)throw a.newSyntaxError("More than one switch default");case CASE:f=new Node(a),j===DEFAULT?e.defaultIndex=e.cases.length:f.caseLabel=Expression(a,l,COLON);break;default:throw a.newSyntaxError("Invalid switch case")}a.mustMatch(COLON),f.statements=new Node(a,blockInit());while((j=a.peek(!0))!==CASE&&j!==DEFAULT&&j!==RIGHT_CURLY)f.statements.push(Statement(a,l));e.cases.push(f)}return e;case FOR:e=new Node(a,LOOP_INIT),a.match(IDENTIFIER)&&(a.token.value==="each"?e.isEach=!0:a.unget()),b.parenFreeMode||a.mustMatch(LEFT_PAREN),l=b.pushTarget(e).nest(NESTING_DEEP),m=b.update({inForLoopInit:!0}),(j=a.peek())!==SEMICOLON&&(j===VAR||j===CONST?(a.get(),f=Variables(a,m)):j===LET?(a.get(),a.peek()===LEFT_PAREN?f=LetBlock(a,m,!1):(m.parentBlock=e,e.varDecls=[],f=Variables(a,m))):f=Expression(a,m));if(f&&a.match(IN)){e.type=FOR_IN,e.object=Expression(a,m);if(f.type===VAR||f.type===LET){h=f.children;if(h.length!==1&&f.destructurings.length!==1)throw new SyntaxError("Invalid for..in left-hand side",a.filename,f.lineno);f.destructurings.length>0?e.iterator=f.destructurings[0]:e.iterator=h[0],e.varDecl=f}else{if(f.type===ARRAY_INIT||f.type===OBJECT_INIT)f.destructuredNames=checkDestructuring(a,m,f);e.iterator=f}}else{e.setup=f,a.mustMatch(SEMICOLON);if(e.isEach)throw a.newSyntaxError("Invalid for each..in loop");e.condition=a.peek()===SEMICOLON?null:Expression(a,m),a.mustMatch(SEMICOLON),k=a.peek(),e.update=(b.parenFreeMode?k===LEFT_CURLY||definitions.isStatementStartCode[k]:k===RIGHT_PAREN)?null:Expression(a,m)}b.parenFreeMode||a.mustMatch(RIGHT_PAREN),e.body=Statement(a,l);return e;case WHILE:e=new Node(a,{isLoop:!0}),e.condition=HeadExpression(a,b),e.body=Statement(a,b.pushTarget(e).nest(NESTING_DEEP));return e;case DO:e=new Node(a,{isLoop:!0}),e.body=Statement(a,b.pushTarget(e).nest(NESTING_DEEP)),a.mustMatch(WHILE),e.condition=HeadExpression(a,b);if(!b.ecmaStrictMode){a.match(SEMICOLON);return e}break;case BREAK:case CONTINUE:e=new Node(a),l=b.pushTarget(e),a.peekOnSameLine()===IDENTIFIER&&(a.get(),e.label=a.token.value),e.target=e.label?l.labeledTargets.find(function(a){return a.labels.has(e.label)}):l.defaultTarget;if(!e.target)throw a.newSyntaxError("Invalid "+(j===BREAK?"break":"continue"));if(!e.target.isLoop&&j===CONTINUE)throw a.newSyntaxError("Invalid continue");break;case TRY:e=new Node(a,{catchClauses:[]}),e.tryBlock=Block(a,b);while(a.match(CATCH)){f=new Node(a),g=MaybeLeftParen(a,b);switch(a.get()){case LEFT_BRACKET:case LEFT_CURLY:a.unget(),f.varName=DestructuringExpression(a,b,!0);break;case IDENTIFIER:f.varName=a.token.value;break;default:throw a.newSyntaxError("missing identifier in catch")}if(a.match(IF)){if(b.ecma3OnlyMode)throw a.newSyntaxError("Illegal catch guard");if(e.catchClauses.length&&!e.catchClauses.top().guard)throw a.newSyntaxError("Guarded catch after unguarded");f.guard=Expression(a,b)}MaybeRightParen(a,g),f.block=Block(a,b),e.catchClauses.push(f)}a.match(FINALLY)&&(e.finallyBlock=Block(a,b));if(!e.catchClauses.length&&!e.finallyBlock)throw a.newSyntaxError("Invalid try statement");return e;case CATCH:case FINALLY:throw a.newSyntaxError(definitions.tokens[j]+" without preceding try");case THROW:e=new Node(a),e.exception=Expression(a,b);break;case RETURN:e=ReturnOrYield(a,b);break;case WITH:e=new Node(a),e.object=HeadExpression(a,b),e.body=Statement(a,b.pushTarget(e).nest(NESTING_DEEP));return e;case VAR:case CONST:e=Variables(a,b);break;case LET:a.peek()===LEFT_PAREN?e=LetBlock(a,b,!0):e=Variables(a,b);break;case DEBUGGER:e=new Node(a);break;case NEWLINE:case SEMICOLON:e=new Node(a,{type:SEMICOLON}),e.expression=null;return e;default:if(j===IDENTIFIER){j=a.peek();if(j===COLON){d=a.token.value;if(b.allLabels.has(d))throw a.newSyntaxError("Duplicate label");a.get(),e=new Node(a,{type:LABEL,label:d}),e.statement=Statement(a,b.pushLabel(d).nest(NESTING_SHALLOW)),e.target=e.statement.type===LABEL?e.statement.target:e.statement;return e}}e=new Node(a,{type:SEMICOLON}),a.unget(),e.expression=Expression(a,b),e.end=e.expression.end}MagicalSemicolon(a);return e}function Block(a,b){a.mustMatch(LEFT_CURLY);var c=new Node(a,blockInit());Statements(a,b.update({parentBlock:c}).pushTarget(c),c),a.mustMatch(RIGHT_CURLY);return c}function Statements(a,b,c){try{while(!a.done&&a.peek(!0)!==RIGHT_CURLY)c.push(Statement(a,b))}catch(d){a.done&&(a.unexpectedEOF=!0);throw d}}function MaybeRightParen(a,b){b===LEFT_PAREN&&a.mustMatch(RIGHT_PAREN)}function MaybeLeftParen(a,b){return b.parenFreeMode?a.match(LEFT_PAREN)?LEFT_PAREN:END:a.mustMatch(LEFT_PAREN).type}function scriptInit(){return{type:SCRIPT,funDecls:[],varDecls:[],modDecls:[],impDecls:[],expDecls:[],loadDeps:[],hasEmptyReturn:!1,hasReturnWithValue:!1,isGenerator:!1}}function blockInit(){return{type:BLOCK,varDecls:[]}}function tokenString(a){var b=definitions.tokens[a];return/^\W/.test(b)?definitions.opTypeNames[b]:b.toUpperCase()}function Node(a,b){var c=a.token;c?(this.type=c.type,this.value=c.value,this.lineno=c.lineno,this.start=c.start,this.end=c.end):this.lineno=a.lineno,this.tokenizer=a,this.children=[];for(var d in b)this[d]=b[d]}function Script(a,b){var c=new Node(a,scriptInit()),d=new StaticContext(c,c,b,!1,NESTING_TOP);Statements(a,d,c);return c}function StaticContext(a,b,c,d,e){this.parentScript=a,this.parentBlock=b,this.inFunction=c,this.inForLoopInit=d,this.nesting=e,this.allLabels=new Stack,this.currentLabels=new Stack,this.labeledTargets=new Stack,this.defaultTarget=null,definitions.options.ecma3OnlyMode&&(this.ecma3OnlyMode=!0),definitions.options.parenFreeMode&&(this.parenFreeMode=!0)}function pushDestructuringVarDecls(a,b){for(var c in a){var d=a[c];d.type===IDENTIFIER?b.varDecls.push(d):pushDestructuringVarDecls(d,b)}}var lexer=require("ace/narcissus/jslex"),definitions=require("ace/narcissus/jsdefs");const StringMap=definitions.StringMap,Stack=definitions.Stack;eval(definitions.consts);const NESTING_TOP=0,NESTING_SHALLOW=1,NESTING_DEEP=2;StaticContext.prototype={ecma3OnlyMode:!1,parenFreeMode:!1,update:function(a){var b={};for(var c in a)b[c]={value:a[c],writable:!0,enumerable:!0,configurable:!0};return Object.create(this,b)},pushLabel:function(a){return this.update({currentLabels:this.currentLabels.push(a),allLabels:this.allLabels.push(a)})},pushTarget:function(a){var b=a.isLoop||a.type===SWITCH;if(this.currentLabels.isEmpty())return b?this.update({defaultTarget:a}):this;a.labels=new StringMap,this.currentLabels.forEach(function(b){a.labels.set(b,!0)});return this.update({currentLabels:new Stack,labeledTargets:this.labeledTargets.push(a),defaultTarget:b?a:this.defaultTarget})},nest:function(a){var b=Math.max(this.nesting,a);return b!==this.nesting?this.update({nesting:b}):this}},definitions.defineProperty(Array.prototype,"top",function(){return this.length&&this[this.length-1]},!1,!1,!0);var Np=Node.prototype={};Np.constructor=Node,Np.toSource=Object.prototype.toSource,Np.push=function(a){a!==null&&(a.start<this.start&&(this.start=a.start),this.end<a.end&&(this.end=a.end));return this.children.push(a)},Node.indentLevel=0,Np.toString=function(){var a=[];for(var b in this)this.hasOwnProperty(b)&&b!=="type"&&b!=="target"&&a.push({id:b,value:this[b]});a.sort(function(a,b){return a.id<b.id?-1:1});const c="    ";var d=++Node.indentLevel,e="{\n"+c.repeat(d)+"type: "+tokenString(this.type);for(b=0;b<a.length;b++)e+=",\n"+c.repeat(d)+a[b].id+": "+a[b].value;d=--Node.indentLevel,e+="\n"+c.repeat(d)+"}";return e},Np.getSource=function(){return this.tokenizer.source.slice(this.start,this.end)};const LOOP_INIT={isLoop:!0};definitions.defineGetter(Np,"filename",function(){return this.tokenizer.filename}),definitions.defineProperty(String.prototype,"repeat",function(a){var b="",c=this+b;while(--a>=0)b+=c;return b},!1,!1,!0);const DECLARED_FORM=0,EXPRESSED_FORM=1,STATEMENT_FORM=2;exports.parse=parse,exports.parseStdin=parseStdin,exports.Node=Node,exports.DECLARED_FORM=DECLARED_FORM,exports.EXPRESSED_FORM=EXPRESSED_FORM,exports.STATEMENT_FORM=STATEMENT_FORM,exports.Tokenizer=lexer.Tokenizer,exports.FunctionDefinition=FunctionDefinition}),define("ace/narcissus/jslex",["require","exports","module","ace/narcissus/jsdefs"],function(require,exports,module){function Tokenizer(a,b,c){this.cursor=0,this.source=String(a),this.tokens=[],this.tokenIndex=0,this.lookahead=0,this.scanNewlines=!1,this.unexpectedEOF=!1,this.filename=b||"",this.lineno=c||1}var definitions=require("ace/narcissus/jsdefs");eval(definitions.consts);var opTokens={};for(var op in definitions.opTypeNames){if(op==="\n"||op===".")continue;var node=opTokens;for(var i=0;i<op.length;i++){var ch=op[i];ch in node||(node[ch]={}),node=node[ch],node.op=op}}Tokenizer.prototype={get done(){return this.peek(!0)===END},get token(){return this.tokens[this.tokenIndex]},match:function(a,b){return this.get(b)===a||this.unget()},mustMatch:function(a){if(!this.match(a))throw this.newSyntaxError("Missing "+definitions.tokens[a].toLowerCase());return this.token},peek:function(a){var b,c;this.lookahead?(c=this.tokens[this.tokenIndex+this.lookahead&3],b=this.scanNewlines&&c.lineno!==this.lineno?NEWLINE:c.type):(b=this.get(a),this.unget());return b},peekOnSameLine:function(a){this.scanNewlines=!0;var b=this.peek(a);this.scanNewlines=!1;return b},skip:function(){var a=this.source;for(;;){var b=a[this.cursor++],c=a[this.cursor];if(b==="\n"&&!this.scanNewlines)this.lineno++;else if(b==="/"&&c==="*"){this.cursor++;for(;;){b=a[this.cursor++];if(b===undefined)throw this.newSyntaxError("Unterminated comment");if(b==="*"){c=a[this.cursor];if(c==="/"){this.cursor++;break}}else b==="\n"&&this.lineno++}}else if(b==="/"&&c==="/"){this.cursor++;for(;;){b=a[this.cursor++];if(b===undefined)return;if(b==="\n"){this.lineno++;break}}}else if(b!==" "&&b!=="\t"){this.cursor--;return}}},lexExponent:function(){var a=this.source,b=a[this.cursor];if(b==="e"||b==="E"){this.cursor++,ch=a[this.cursor++];if(ch==="+"||ch==="-")ch=a[this.cursor++];if(ch<"0"||ch>"9")throw this.newSyntaxError("Missing exponent");do ch=a[this.cursor++];while(ch>="0"&&ch<="9");this.cursor--;return!0}return!1},lexZeroNumber:function(a){var b=this.token,c=this.source;b.type=NUMBER,a=c[this.cursor++];if(a==="."){do a=c[this.cursor++];while(a>="0"&&a<="9");this.cursor--,this.lexExponent(),b.value=parseFloat(b.start,this.cursor)}else if(a==="x"||a==="X"){do a=c[this.cursor++];while(a>="0"&&a<="9"||a>="a"&&a<="f"||a>="A"&&a<="F");this.cursor--,b.value=parseInt(c.substring(b.start,this.cursor))}else if(a>="0"&&a<="7"){do a=c[this.cursor++];while(a>="0"&&a<="7");this.cursor--,b.value=parseInt(c.substring(b.start,this.cursor))}else this.cursor--,this.lexExponent(),b.value=0},lexNumber:function(a){var b=this.token,c=this.source;b.type=NUMBER;var d=!1;do a=c[this.cursor++],a==="."&&!d&&(d=!0,a=c[this.cursor++]);while(a>="0"&&a<="9");this.cursor--;var e=this.lexExponent();d=d||e;var f=c.substring(b.start,this.cursor);b.value=d?parseFloat(f):parseInt(f)},lexDot:function(a){var b=this.token,c=this.source,d=c[this.cursor];if(d>="0"&&d<="9"){do a=c[this.cursor++];while(a>="0"&&a<="9");this.cursor--,this.lexExponent(),b.type=NUMBER,b.value=parseFloat(b.start,this.cursor)}else b.type=DOT,b.assignOp=null,b.value="."},lexString:function(ch){var token=this.token,input=this.source;token.type=STRING;var hasEscapes=!1,delim=ch;if(input.length<=this.cursor)throw this.newSyntaxError("Unterminated string literal");while((ch=input[this.cursor++])!==delim){if(this.cursor==input.length)throw this.newSyntaxError("Unterminated string literal");if(ch==="\\"){hasEscapes=!0;if(++this.cursor==input.length)throw this.newSyntaxError("Unterminated string literal")}}token.value=hasEscapes?eval(input.substring(token.start,this.cursor)):input.substring(token.start+1,this.cursor-1)},lexRegExp:function(ch){var token=this.token,input=this.source;token.type=REGEXP;do{ch=input[this.cursor++];if(ch==="\\")this.cursor++;else if(ch==="["){do{if(ch===undefined)throw this.newSyntaxError("Unterminated character class");ch==="\\"&&this.cursor++,ch=input[this.cursor++]}while(ch!=="]")}else if(ch===undefined)throw this.newSyntaxError("Unterminated regex")}while(ch!=="/");do ch=input[this.cursor++];while(ch>="a"&&ch<="z");this.cursor--,token.value=eval(input.substring(token.start,this.cursor))},lexOp:function(a){var b=this.token,c=this.source,d=opTokens[a],e=c[this.cursor];e in d&&(d=d[e],this.cursor++,e=c[this.cursor],e in d&&(d=d[e],this.cursor++,e=c[this.cursor]));var f=d.op;definitions.assignOps[f]&&c[this.cursor]==="="?(this.cursor++,b.type=ASSIGN,b.assignOp=definitions.tokenIds[definitions.opTypeNames[f]],f+="="):(b.type=definitions.tokenIds[definitions.opTypeNames[f]],b.assignOp=null),b.value=f},lexIdent:function(a){var b=this.token,c=this.source;do a=c[this.cursor++];while(a>="a"&&a<="z"||a>="A"&&a<="Z"||a>="0"&&a<="9"||a==="$"||a==="_");this.cursor--;var d=c.substring(b.start,this.cursor);b.type=definitions.keywords[d]||IDENTIFIER,b.value=d},get:function(a){var b;while(this.lookahead){--this.lookahead,this.tokenIndex=this.tokenIndex+1&3,b=this.tokens[this.tokenIndex];if(b.type!==NEWLINE||this.scanNewlines)return b.type}this.skip(),this.tokenIndex=this.tokenIndex+1&3,b=this.tokens[this.tokenIndex],b||(this.tokens[this.tokenIndex]=b={});var c=this.source;if(this.cursor===c.length)return b.type=END;b.start=this.cursor,b.lineno=this.lineno;var d=c[this.cursor++];if(d>="a"&&d<="z"||d>="A"&&d<="Z"||d==="$"||d==="_")this.lexIdent(d);else if(a&&d==="/")this.lexRegExp(d);else if(d in opTokens)this.lexOp(d);else if(d===".")this.lexDot(d);else if(d>="1"&&d<="9")this.lexNumber(d);else if(d==="0")this.lexZeroNumber(d);else if(d==='"'||d==="'")this.lexString(d);else if(this.scanNewlines&&d==="\n")b.type=NEWLINE,b.value="\n",this.lineno++;else throw this.newSyntaxError("Illegal token");b.end=this.cursor;return b.type},unget:function(){if(++this.lookahead===4)throw"PANIC: too much lookahead!";this.tokenIndex=this.tokenIndex-1&3},newSyntaxError:function(a){var b=new SyntaxError(a,this.filename,this.lineno);b.source=this.source,b.lineno=this.lineno,b.cursor=this.lookahead?this.tokens[this.tokenIndex+this.lookahead&3].start:this.cursor;return b}},exports.Tokenizer=Tokenizer}),define("ace/narcissus/jsdefs",["require","exports","module"],function(a,b,c){function y(a){this.elts=a||null}function x(){this.table=Object.create(null,{}),this.size=0}function v(){return undefined}function u(a){return{getOwnPropertyDescriptor:function(b){var c=Object.getOwnPropertyDescriptor(a,b);c.configurable=!0;return c},getPropertyDescriptor:function(b){var c=s(a,b);c.configurable=!0;return c},getOwnPropertyNames:function(){return Object.getOwnPropertyNames(a)},defineProperty:function(b,c){Object.defineProperty(a,b,c)},"delete":function(b){return delete a[b]},fix:function(){return Object.isFrozen(a)?t(a):undefined},has:function(b){return b in a},hasOwn:function(b){return{}.hasOwnProperty.call(a,b)},get:function(b,c){return a[c]},set:function(b,c,d){a[c]=d;return!0},enumerate:function(){var b=[];for(m in a)b.push(m);return b},keys:function(){return Object.keys(a)}}}function t(a){var b={};for(var c in Object.getOwnPropertyNames(a))b[c]=Object.getOwnPropertyDescriptor(a,c);return b}function s(a,b){while(a){if({}.hasOwnProperty.call(a,b))return Object.getOwnPropertyDescriptor(a,b);a=Object.getPrototypeOf(a)}}function r(a){return typeof a=="function"&&a.toString().match(/\[native code\]/)}function q(a,b,c,d,e,f){Object.defineProperty(a,b,{value:c,writable:!e,configurable:!d,enumerable:!f})}function p(a,b,c,d,e){Object.defineProperty(a,b,{get:c,configurable:!d,enumerable:!e})}b.options={version:185},function(){b.hostGlobal=this}();var d=["END","\n",";",",","=","?",":","CONDITIONAL","||","&&","|","^","&","==","!=","===","!==","<","<=",">=",">","<<",">>",">>>","+","-","*","/","%","!","~","UNARY_PLUS","UNARY_MINUS","++","--",".","[","]","{","}","(",")","SCRIPT","BLOCK","LABEL","FOR_IN","CALL","NEW_WITH_ARGS","INDEX","ARRAY_INIT","OBJECT_INIT","PROPERTY_INIT","GETTER","SETTER","GROUP","LIST","LET_BLOCK","ARRAY_COMP","GENERATOR","COMP_TAIL","IDENTIFIER","NUMBER","STRING","REGEXP","break","case","catch","const","continue","debugger","default","delete","do","else","false","finally","for","function","if","in","instanceof","let","new","null","return","switch","this","throw","true","try","typeof","var","void","yield","while","with"],e=["break","const","continue","debugger","do","for","if","return","switch","throw","try","var","yield","while","with"],f={"\n":"NEWLINE",";":"SEMICOLON",",":"COMMA","?":"HOOK",":":"COLON","||":"OR","&&":"AND","|":"BITWISE_OR","^":"BITWISE_XOR","&":"BITWISE_AND","===":"STRICT_EQ","==":"EQ","=":"ASSIGN","!==":"STRICT_NE","!=":"NE","<<":"LSH","<=":"LE","<":"LT",">>>":"URSH",">>":"RSH",">=":"GE",">":"GT","++":"INCREMENT","--":"DECREMENT","+":"PLUS","-":"MINUS","*":"MUL","/":"DIV","%":"MOD","!":"NOT","~":"BITWISE_NOT",".":"DOT","[":"LEFT_BRACKET","]":"RIGHT_BRACKET","{":"LEFT_CURLY","}":"RIGHT_CURLY","(":"LEFT_PAREN",")":"RIGHT_PAREN"},g={"__proto__":null},h={},i="const ";for(var j=0,k=d.length;j<k;j++){j>0&&(i+=", ");var l=d[j],m;/^[a-z]/.test(l)?(m=l.toUpperCase(),g[l]=j):m=/^\W/.test(l)?f[l]:l,i+=m+" = "+j,h[m]=j,d[l]=j}i+=";";var n={"__proto__":null};for(j=0,k=e.length;j<k;j++)n[g[e[j]]]=!0;var o=["|","^","&","<<",">>",">>>","+","-","*","/","%"];for(j=0,k=o.length;j<k;j++)l=o[j],o[l]=d[l];var w={}.hasOwnProperty;x.prototype={has:function(a){return w.call(this.table,a)},set:function(a,b){w.call(this.table,a)||this.size++,this.table[a]=b},get:function(a){return this.table[a]},getDef:function(a,b){w.call(this.table,a)||(this.size++,this.table[a]=b());return this.table[a]},forEach:function(a){var b=this.table;for(var c in b)a.call(this,c,b[c])},toString:function(){return"[object StringMap]"}},y.prototype={push:function(a){return new y({top:a,rest:this.elts})},top:function(){if(!this.elts)throw new Error("empty stack");return this.elts.top},isEmpty:function(){return this.top===null},find:function(a){for(var b=this.elts;b;b=b.rest)if(a(b.top))return b.top;return null},has:function(a){return Boolean(this.find(function(b){return b===a}))},forEach:function(a){for(var b=this.elts;b;b=b.rest)a(b.top)}},b.tokens=d,b.opTypeNames=f,b.keywords=g,b.isStatementStartCode=n,b.tokenIds=h,b.consts=i,b.assignOps=o,b.defineGetter=p,b.defineProperty=q,b.isNativeCode=r,b.makePassthruHandler=u,b.noPropFound=v,b.StringMap=x,b.Stack=y})
\ No newline at end of file
+"no use strict";
+
+var console = {
+    log: function(msg) {
+        postMessage({type: "log", data: msg});
+    }
+};
+var window = {
+    console: console
+};
+
+var normalizeModule = function(parentId, moduleName) {
+    // normalize plugin requires
+    if (moduleName.indexOf("!") !== -1) {
+        var chunks = moduleName.split("!");
+        return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]);
+    }
+    // normalize relative requires
+    if (moduleName.charAt(0) == ".") {
+        var base = parentId.split("/").slice(0, -1).join("/");
+        var moduleName = base + "/" + moduleName;
+        
+        while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
+            var previous = moduleName;
+            var moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
+        }
+    }
+    
+    return moduleName;
+};
+
+var require = function(parentId, id) {
+    var id = normalizeModule(parentId, id);
+    
+    var module = require.modules[id];
+    if (module) {
+        if (!module.initialized) {
+            module.exports = module.factory().exports;
+            module.initialized = true;
+        }
+        return module.exports;
+    }
+    
+    var chunks = id.split("/");
+    chunks[0] = require.tlns[chunks[0]] || chunks[0];
+    var path = chunks.join("/") + ".js";
+    
+    require.id = id;
+    importScripts(path);
+    return require(parentId, id);    
+};
+
+require.modules = {};
+require.tlns = {};
+
+var define = function(id, deps, factory) {
+    if (arguments.length == 2) {
+        factory = deps;
+    } else if (arguments.length == 1) {
+        factory = id;
+        id = require.id;
+    }
+
+    if (id.indexOf("text!") === 0) 
+        return;
+    
+    var req = function(deps, factory) {
+        return require(id, deps, factory);
+    };
+
+    require.modules[id] = {
+        factory: function() {
+            var module = {
+                exports: {}
+            };
+            var returnExports = factory(req, module.exports, module);
+            if (returnExports)
+                module.exports = returnExports;
+            return module;
+        }
+    };
+};
+
+function initBaseUrls(topLevelNamespaces) {
+    require.tlns = topLevelNamespaces;
+}
+
+function initSender() {
+
+    var EventEmitter = require(null, "ace/lib/event_emitter").EventEmitter;
+    var oop = require(null, "ace/lib/oop");
+    
+    var Sender = function() {};
+    
+    (function() {
+        
+        oop.implement(this, EventEmitter);
+                
+        this.callback = function(data, callbackId) {
+            postMessage({
+                type: "call",
+                id: callbackId,
+                data: data
+            });
+        };
+    
+        this.emit = function(name, data) {
+            postMessage({
+                type: "event",
+                name: name,
+                data: data
+            });
+        };
+        
+    }).call(Sender.prototype);
+    
+    return new Sender();
+}
+
+var main;
+var sender;
+
+onmessage = function(e) {
+    var msg = e.data;
+    if (msg.command) {
+        main[msg.command].apply(main, msg.args);
+    }
+    else if (msg.init) {        
+        initBaseUrls(msg.tlns);
+        require(null, "ace/lib/fixoldbrowsers");
+        sender = initSender();
+        var clazz = require(null, msg.module)[msg.classname];
+        main = new clazz(sender);
+    } 
+    else if (msg.event && sender) {
+        sender._emit(msg.event, msg.data);
+    }
+};
+// vim:set ts=4 sts=4 sw=4 st:
+// -- kriskowal Kris Kowal Copyright (C) 2009-2010 MIT License
+// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
+// -- dantman Daniel Friesen Copyright(C) 2010 XXX No License Specified
+// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
+// -- Irakli Gozalishvili Copyright (C) 2010 MIT License
+
+/*!
+    Copyright (c) 2009, 280 North Inc. http://280north.com/
+    MIT License. http://github.com/280north/narwhal/blob/master/README.md
+*/
+
+define('ace/lib/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/regexp', 'ace/lib/es5-shim'], function(require, exports, module) {
+"use strict";
+
+require("./regexp");
+require("./es5-shim");
+
+});/**
+ *  Based on code from:
+ *
+ * XRegExp 1.5.0
+ * (c) 2007-2010 Steven Levithan
+ * MIT License
+ * <http://xregexp.com>
+ * Provides an augmented, extensible, cross-browser implementation of regular expressions,
+ * including support for additional syntax, flags, and methods
+ */
+ 
+define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+    //---------------------------------
+    //  Private variables
+    //---------------------------------
+
+    var real = {
+            exec: RegExp.prototype.exec,
+            test: RegExp.prototype.test,
+            match: String.prototype.match,
+            replace: String.prototype.replace,
+            split: String.prototype.split
+        },
+        compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups
+        compliantLastIndexIncrement = function () {
+            var x = /^/g;
+            real.test.call(x, "");
+            return !x.lastIndex;
+        }();
+
+    //---------------------------------
+    //  Overriden native methods
+    //---------------------------------
+
+    // Adds named capture support (with backreferences returned as `result.name`), and fixes two
+    // cross-browser issues per ES3:
+    // - Captured values for nonparticipating capturing groups should be returned as `undefined`,
+    //   rather than the empty string.
+    // - `lastIndex` should not be incremented after zero-length matches.
+    RegExp.prototype.exec = function (str) {
+        var match = real.exec.apply(this, arguments),
+            name, r2;
+        if (match) {
+            // Fix browsers whose `exec` methods don't consistently return `undefined` for
+            // nonparticipating capturing groups
+            if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) {
+                r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", ""));
+                // Using `str.slice(match.index)` rather than `match[0]` in case lookahead allowed
+                // matching due to characters outside the match
+                real.replace.call(str.slice(match.index), r2, function () {
+                    for (var i = 1; i < arguments.length - 2; i++) {
+                        if (arguments[i] === undefined)
+                            match[i] = undefined;
+                    }
+                });
+            }
+            // Attach named capture properties
+            if (this._xregexp && this._xregexp.captureNames) {
+                for (var i = 1; i < match.length; i++) {
+                    name = this._xregexp.captureNames[i - 1];
+                    if (name)
+                       match[name] = match[i];
+                }
+            }
+            // Fix browsers that increment `lastIndex` after zero-length matches
+            if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index))
+                this.lastIndex--;
+        }
+        return match;
+    };
+
+    // Don't override `test` if it won't change anything
+    if (!compliantLastIndexIncrement) {
+        // Fix browser bug in native method
+        RegExp.prototype.test = function (str) {
+            // Use the native `exec` to skip some processing overhead, even though the overriden
+            // `exec` would take care of the `lastIndex` fix
+            var match = real.exec.call(this, str);
+            // Fix browsers that increment `lastIndex` after zero-length matches
+            if (match && this.global && !match[0].length && (this.lastIndex > match.index))
+                this.lastIndex--;
+            return !!match;
+        };
+    }
+
+    //---------------------------------
+    //  Private helper functions
+    //---------------------------------
+
+    function getNativeFlags (regex) {
+        return (regex.global     ? "g" : "") +
+               (regex.ignoreCase ? "i" : "") +
+               (regex.multiline  ? "m" : "") +
+               (regex.extended   ? "x" : "") + // Proposed for ES4; included in AS3
+               (regex.sticky     ? "y" : "");
+    };
+
+    function indexOf (array, item, from) {
+        if (Array.prototype.indexOf) // Use the native array method if available
+            return array.indexOf(item, from);
+        for (var i = from || 0; i < array.length; i++) {
+            if (array[i] === item)
+                return i;
+        }
+        return -1;
+    };
+
+});// vim: ts=4 sts=4 sw=4 expandtab
+// -- kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
+// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
+// -- dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
+// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
+// -- Gozala Irakli Gozalishvili Copyright (C) 2010 MIT License
+// -- kitcambridge Kit Cambridge Copyright (C) 2011 MIT License
+// -- kossnocorp Sasha Koss XXX TODO License or CLA
+// -- bryanforbes Bryan Forbes XXX TODO License or CLA
+// -- killdream Quildreen Motta Copyright (C) 2011 MIT Licence
+// -- michaelficarra Michael Ficarra Copyright (C) 2011 3-clause BSD License
+// -- sharkbrainguy Gerard Paapu Copyright (C) 2011 MIT License
+// -- bbqsrc Brendan Molloy (C) 2011 Creative Commons Zero (public domain)
+// -- iwyg XXX TODO License or CLA
+// -- DomenicDenicola Domenic Denicola Copyright (C) 2011 MIT License
+// -- xavierm02 Montillet Xavier XXX TODO License or CLA
+// -- Raynos Raynos XXX TODO License or CLA
+// -- samsonjs Sami Samhuri Copyright (C) 2010 MIT License
+// -- rwldrn Rick Waldron Copyright (C) 2011 MIT License
+// -- lexer Alexey Zakharov XXX TODO License or CLA
+
+/*!
+    Copyright (c) 2009, 280 North Inc. http://280north.com/
+    MIT License. http://github.com/280north/narwhal/blob/master/README.md
+*/
+
+define('ace/lib/es5-shim', ['require', 'exports', 'module' ], function(require, exports, module) {
+
+/**
+ * Brings an environment as close to ECMAScript 5 compliance
+ * as is possible with the facilities of erstwhile engines.
+ *
+ * Annotated ES5: http://es5.github.com/ (specific links below)
+ * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
+ *
+ * @module
+ */
+
+/*whatsupdoc*/
+
+//
+// Function
+// ========
+//
+
+// ES-5 15.3.4.5
+// http://es5.github.com/#x15.3.4.5
+
+if (!Function.prototype.bind) {
+    Function.prototype.bind = function bind(that) { // .length is 1
+        // 1. Let Target be the this value.
+        var target = this;
+        // 2. If IsCallable(Target) is false, throw a TypeError exception.
+        if (typeof target != "function")
+            throw new TypeError(); // TODO message
+        // 3. Let A be a new (possibly empty) internal list of all of the
+        //   argument values provided after thisArg (arg1, arg2 etc), in order.
+        // XXX slicedArgs will stand in for "A" if used
+        var args = slice.call(arguments, 1); // for normal call
+        // 4. Let F be a new native ECMAScript object.
+        // 11. Set the [[Prototype]] internal property of F to the standard
+        //   built-in Function prototype object as specified in 15.3.3.1.
+        // 12. Set the [[Call]] internal property of F as described in
+        //   15.3.4.5.1.
+        // 13. Set the [[Construct]] internal property of F as described in
+        //   15.3.4.5.2.
+        // 14. Set the [[HasInstance]] internal property of F as described in
+        //   15.3.4.5.3.
+        var bound = function () {
+
+            if (this instanceof bound) {
+                // 15.3.4.5.2 [[Construct]]
+                // When the [[Construct]] internal method of a function object,
+                // F that was created using the bind function is called with a
+                // list of arguments ExtraArgs, the following steps are taken:
+                // 1. Let target be the value of F's [[TargetFunction]]
+                //   internal property.
+                // 2. If target has no [[Construct]] internal method, a
+                //   TypeError exception is thrown.
+                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
+                //   property.
+                // 4. Let args be a new list containing the same values as the
+                //   list boundArgs in the same order followed by the same
+                //   values as the list ExtraArgs in the same order.
+                // 5. Return the result of calling the [[Construct]] internal 
+                //   method of target providing args as the arguments.
+
+                var F = function(){};
+                F.prototype = target.prototype;
+                var self = new F;
+
+                var result = target.apply(
+                    self,
+                    args.concat(slice.call(arguments))
+                );
+                if (result !== null && Object(result) === result)
+                    return result;
+                return self;
+
+            } else {
+                // 15.3.4.5.1 [[Call]]
+                // When the [[Call]] internal method of a function object, F,
+                // which was created using the bind function is called with a
+                // this value and a list of arguments ExtraArgs, the following
+                // steps are taken:
+                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
+                //   property.
+                // 2. Let boundThis be the value of F's [[BoundThis]] internal
+                //   property.
+                // 3. Let target be the value of F's [[TargetFunction]] internal
+                //   property.
+                // 4. Let args be a new list containing the same values as the 
+                //   list boundArgs in the same order followed by the same 
+                //   values as the list ExtraArgs in the same order.
+                // 5. Return the result of calling the [[Call]] internal method 
+                //   of target providing boundThis as the this value and 
+                //   providing args as the arguments.
+
+                // equiv: target.call(this, ...boundArgs, ...args)
+                return target.apply(
+                    that,
+                    args.concat(slice.call(arguments))
+                );
+
+            }
+
+        };
+        // XXX bound.length is never writable, so don't even try
+        //
+        // 15. If the [[Class]] internal property of Target is "Function", then
+        //     a. Let L be the length property of Target minus the length of A.
+        //     b. Set the length own property of F to either 0 or L, whichever is 
+        //       larger.
+        // 16. Else set the length own property of F to 0.
+        // 17. Set the attributes of the length own property of F to the values
+        //   specified in 15.3.5.1.
+
+        // TODO
+        // 18. Set the [[Extensible]] internal property of F to true.
+        
+        // TODO
+        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
+        // 20. Call the [[DefineOwnProperty]] internal method of F with 
+        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
+        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and 
+        //   false.
+        // 21. Call the [[DefineOwnProperty]] internal method of F with 
+        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower, 
+        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
+        //   and false.
+
+        // TODO
+        // NOTE Function objects created using Function.prototype.bind do not 
+        // have a prototype property or the [[Code]], [[FormalParameters]], and
+        // [[Scope]] internal properties.
+        // XXX can't delete prototype in pure-js.
+
+        // 22. Return F.
+        return bound;
+    };
+}
+
+// Shortcut to an often accessed properties, in order to avoid multiple
+// dereference that costs universally.
+// _Please note: Shortcuts are defined after `Function.prototype.bind` as we
+// us it in defining shortcuts.
+var call = Function.prototype.call;
+var prototypeOfArray = Array.prototype;
+var prototypeOfObject = Object.prototype;
+var slice = prototypeOfArray.slice;
+var toString = call.bind(prototypeOfObject.toString);
+var owns = call.bind(prototypeOfObject.hasOwnProperty);
+
+// If JS engine supports accessors creating shortcuts.
+var defineGetter;
+var defineSetter;
+var lookupGetter;
+var lookupSetter;
+var supportsAccessors;
+if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
+    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
+    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
+    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
+    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
+}
+
+//
+// Array
+// =====
+//
+
+// ES5 15.4.3.2
+// http://es5.github.com/#x15.4.3.2
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
+if (!Array.isArray) {
+    Array.isArray = function isArray(obj) {
+        return toString(obj) == "[object Array]";
+    };
+}
+
+// The IsCallable() check in the Array functions
+// has been replaced with a strict check on the
+// internal class of the object to trap cases where
+// the provided function was actually a regular
+// expression literal, which in V8 and
+// JavaScriptCore is a typeof "function".  Only in
+// V8 are regular expression literals permitted as
+// reduce parameters, so it is desirable in the
+// general case for the shim to match the more
+// strict and common behavior of rejecting regular
+// expressions.
+
+// ES5 15.4.4.18
+// http://es5.github.com/#x15.4.4.18
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
+if (!Array.prototype.forEach) {
+    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
+        var self = toObject(this),
+            thisp = arguments[1],
+            i = 0,
+            length = self.length >>> 0;
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        while (i < length) {
+            if (i in self) {
+                // Invoke the callback function with call, passing arguments:
+                // context, property value, property key, thisArg object context
+                fun.call(thisp, self[i], i, self);
+            }
+            i++;
+        }
+    };
+}
+
+// ES5 15.4.4.19
+// http://es5.github.com/#x15.4.4.19
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
+if (!Array.prototype.map) {
+    Array.prototype.map = function map(fun /*, thisp*/) {
+        var self = toObject(this),
+            length = self.length >>> 0,
+            result = Array(length),
+            thisp = arguments[1];
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        for (var i = 0; i < length; i++) {
+            if (i in self)
+                result[i] = fun.call(thisp, self[i], i, self);
+        }
+        return result;
+    };
+}
+
+// ES5 15.4.4.20
+// http://es5.github.com/#x15.4.4.20
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
+if (!Array.prototype.filter) {
+    Array.prototype.filter = function filter(fun /*, thisp */) {
+        var self = toObject(this),
+            length = self.length >>> 0,
+            result = [],
+            thisp = arguments[1];
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        for (var i = 0; i < length; i++) {
+            if (i in self && fun.call(thisp, self[i], i, self))
+                result.push(self[i]);
+        }
+        return result;
+    };
+}
+
+// ES5 15.4.4.16
+// http://es5.github.com/#x15.4.4.16
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
+if (!Array.prototype.every) {
+    Array.prototype.every = function every(fun /*, thisp */) {
+        var self = toObject(this),
+            length = self.length >>> 0,
+            thisp = arguments[1];
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        for (var i = 0; i < length; i++) {
+            if (i in self && !fun.call(thisp, self[i], i, self))
+                return false;
+        }
+        return true;
+    };
+}
+
+// ES5 15.4.4.17
+// http://es5.github.com/#x15.4.4.17
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
+if (!Array.prototype.some) {
+    Array.prototype.some = function some(fun /*, thisp */) {
+        var self = toObject(this),
+            length = self.length >>> 0,
+            thisp = arguments[1];
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        for (var i = 0; i < length; i++) {
+            if (i in self && fun.call(thisp, self[i], i, self))
+                return true;
+        }
+        return false;
+    };
+}
+
+// ES5 15.4.4.21
+// http://es5.github.com/#x15.4.4.21
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
+if (!Array.prototype.reduce) {
+    Array.prototype.reduce = function reduce(fun /*, initial*/) {
+        var self = toObject(this),
+            length = self.length >>> 0;
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        // no value to return if no initial value and an empty array
+        if (!length && arguments.length == 1)
+            throw new TypeError(); // TODO message
+
+        var i = 0;
+        var result;
+        if (arguments.length >= 2) {
+            result = arguments[1];
+        } else {
+            do {
+                if (i in self) {
+                    result = self[i++];
+                    break;
+                }
+
+                // if array contains no values, no initial value to return
+                if (++i >= length)
+                    throw new TypeError(); // TODO message
+            } while (true);
+        }
+
+        for (; i < length; i++) {
+            if (i in self)
+                result = fun.call(void 0, result, self[i], i, self);
+        }
+
+        return result;
+    };
+}
+
+// ES5 15.4.4.22
+// http://es5.github.com/#x15.4.4.22
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
+if (!Array.prototype.reduceRight) {
+    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
+        var self = toObject(this),
+            length = self.length >>> 0;
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        // no value to return if no initial value, empty array
+        if (!length && arguments.length == 1)
+            throw new TypeError(); // TODO message
+
+        var result, i = length - 1;
+        if (arguments.length >= 2) {
+            result = arguments[1];
+        } else {
+            do {
+                if (i in self) {
+                    result = self[i--];
+                    break;
+                }
+
+                // if array contains no values, no initial value to return
+                if (--i < 0)
+                    throw new TypeError(); // TODO message
+            } while (true);
+        }
+
+        do {
+            if (i in this)
+                result = fun.call(void 0, result, self[i], i, self);
+        } while (i--);
+
+        return result;
+    };
+}
+
+// ES5 15.4.4.14
+// http://es5.github.com/#x15.4.4.14
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
+if (!Array.prototype.indexOf) {
+    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
+        var self = toObject(this),
+            length = self.length >>> 0;
+
+        if (!length)
+            return -1;
+
+        var i = 0;
+        if (arguments.length > 1)
+            i = toInteger(arguments[1]);
+
+        // handle negative indices
+        i = i >= 0 ? i : Math.max(0, length + i);
+        for (; i < length; i++) {
+            if (i in self && self[i] === sought) {
+                return i;
+            }
+        }
+        return -1;
+    };
+}
+
+// ES5 15.4.4.15
+// http://es5.github.com/#x15.4.4.15
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
+if (!Array.prototype.lastIndexOf) {
+    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
+        var self = toObject(this),
+            length = self.length >>> 0;
+
+        if (!length)
+            return -1;
+        var i = length - 1;
+        if (arguments.length > 1)
+            i = Math.min(i, toInteger(arguments[1]));
+        // handle negative indices
+        i = i >= 0 ? i : length - Math.abs(i);
+        for (; i >= 0; i--) {
+            if (i in self && sought === self[i])
+                return i;
+        }
+        return -1;
+    };
+}
+
+//
+// Object
+// ======
+//
+
+// ES5 15.2.3.2
+// http://es5.github.com/#x15.2.3.2
+if (!Object.getPrototypeOf) {
+    // https://github.com/kriskowal/es5-shim/issues#issue/2
+    // http://ejohn.org/blog/objectgetprototypeof/
+    // recommended by fschaefer on github
+    Object.getPrototypeOf = function getPrototypeOf(object) {
+        return object.__proto__ || (
+            object.constructor ?
+            object.constructor.prototype :
+            prototypeOfObject
+        );
+    };
+}
+
+// ES5 15.2.3.3
+// http://es5.github.com/#x15.2.3.3
+if (!Object.getOwnPropertyDescriptor) {
+    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
+                         "non-object: ";
+    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
+        if ((typeof object != "object" && typeof object != "function") || object === null)
+            throw new TypeError(ERR_NON_OBJECT + object);
+        // If object does not owns property return undefined immediately.
+        if (!owns(object, property))
+            return;
+
+        var descriptor, getter, setter;
+
+        // If object has a property then it's for sure both `enumerable` and
+        // `configurable`.
+        descriptor =  { enumerable: true, configurable: true };
+
+        // If JS engine supports accessor properties then property may be a
+        // getter or setter.
+        if (supportsAccessors) {
+            // Unfortunately `__lookupGetter__` will return a getter even
+            // if object has own non getter property along with a same named
+            // inherited getter. To avoid misbehavior we temporary remove
+            // `__proto__` so that `__lookupGetter__` will return getter only
+            // if it's owned by an object.
+            var prototype = object.__proto__;
+            object.__proto__ = prototypeOfObject;
+
+            var getter = lookupGetter(object, property);
+            var setter = lookupSetter(object, property);
+
+            // Once we have getter and setter we can put values back.
+            object.__proto__ = prototype;
+
+            if (getter || setter) {
+                if (getter) descriptor.get = getter;
+                if (setter) descriptor.set = setter;
+
+                // If it was accessor property we're done and return here
+                // in order to avoid adding `value` to the descriptor.
+                return descriptor;
+            }
+        }
+
+        // If we got this far we know that object has an own property that is
+        // not an accessor so we set it as a value and return descriptor.
+        descriptor.value = object[property];
+        return descriptor;
+    };
+}
+
+// ES5 15.2.3.4
+// http://es5.github.com/#x15.2.3.4
+if (!Object.getOwnPropertyNames) {
+    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
+        return Object.keys(object);
+    };
+}
+
+// ES5 15.2.3.5
+// http://es5.github.com/#x15.2.3.5
+if (!Object.create) {
+    Object.create = function create(prototype, properties) {
+        var object;
+        if (prototype === null) {
+            object = { "__proto__": null };
+        } else {
+            if (typeof prototype != "object")
+                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
+            var Type = function () {};
+            Type.prototype = prototype;
+            object = new Type();
+            // IE has no built-in implementation of `Object.getPrototypeOf`
+            // neither `__proto__`, but this manually setting `__proto__` will
+            // guarantee that `Object.getPrototypeOf` will work as expected with
+            // objects created using `Object.create`
+            object.__proto__ = prototype;
+        }
+        if (properties !== void 0)
+            Object.defineProperties(object, properties);
+        return object;
+    };
+}
+
+// ES5 15.2.3.6
+// http://es5.github.com/#x15.2.3.6
+
+// Patch for WebKit and IE8 standard mode
+// Designed by hax <hax.github.com>
+// related issue: https://github.com/kriskowal/es5-shim/issues#issue/5
+// IE8 Reference:
+//     http://msdn.microsoft.com/en-us/library/dd282900.aspx
+//     http://msdn.microsoft.com/en-us/library/dd229916.aspx
+// WebKit Bugs:
+//     https://bugs.webkit.org/show_bug.cgi?id=36423
+
+function doesDefinePropertyWork(object) {
+    try {
+        Object.defineProperty(object, "sentinel", {});
+        return "sentinel" in object;
+    } catch (exception) {
+        // returns falsy
+    }
+}
+
+// check whether defineProperty works if it's given. Otherwise,
+// shim partially.
+if (Object.defineProperty) {
+    var definePropertyWorksOnObject = doesDefinePropertyWork({});
+    var definePropertyWorksOnDom = typeof document == "undefined" ||
+        doesDefinePropertyWork(document.createElement("div"));
+    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
+        var definePropertyFallback = Object.defineProperty;
+    }
+}
+
+if (!Object.defineProperty || definePropertyFallback) {
+    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
+    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
+    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
+                                      "on this javascript engine";
+
+    Object.defineProperty = function defineProperty(object, property, descriptor) {
+        if ((typeof object != "object" && typeof object != "function") || object === null)
+            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
+        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
+            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
+
+        // make a valiant attempt to use the real defineProperty
+        // for I8's DOM elements.
+        if (definePropertyFallback) {
+            try {
+                return definePropertyFallback.call(Object, object, property, descriptor);
+            } catch (exception) {
+                // try the shim if the real one doesn't work
+            }
+        }
+
+        // If it's a data property.
+        if (owns(descriptor, "value")) {
+            // fail silently if "writable", "enumerable", or "configurable"
+            // are requested but not supported
+            /*
+            // alternate approach:
+            if ( // can't implement these features; allow false but not true
+                !(owns(descriptor, "writable") ? descriptor.writable : true) ||
+                !(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
+                !(owns(descriptor, "configurable") ? descriptor.configurable : true)
+            )
+                throw new RangeError(
+                    "This implementation of Object.defineProperty does not " +
+                    "support configurable, enumerable, or writable."
+                );
+            */
+
+            if (supportsAccessors && (lookupGetter(object, property) ||
+                                      lookupSetter(object, property)))
+            {
+                // As accessors are supported only on engines implementing
+                // `__proto__` we can safely override `__proto__` while defining
+                // a property to make sure that we don't hit an inherited
+                // accessor.
+                var prototype = object.__proto__;
+                object.__proto__ = prototypeOfObject;
+                // Deleting a property anyway since getter / setter may be
+                // defined on object itself.
+                delete object[property];
+                object[property] = descriptor.value;
+                // Setting original `__proto__` back now.
+                object.__proto__ = prototype;
+            } else {
+                object[property] = descriptor.value;
+            }
+        } else {
+            if (!supportsAccessors)
+                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
+            // If we got that far then getters and setters can be defined !!
+            if (owns(descriptor, "get"))
+                defineGetter(object, property, descriptor.get);
+            if (owns(descriptor, "set"))
+                defineSetter(object, property, descriptor.set);
+        }
+
+        return object;
+    };
+}
+
+// ES5 15.2.3.7
+// http://es5.github.com/#x15.2.3.7
+if (!Object.defineProperties) {
+    Object.defineProperties = function defineProperties(object, properties) {
+        for (var property in properties) {
+            if (owns(properties, property))
+                Object.defineProperty(object, property, properties[property]);
+        }
+        return object;
+    };
+}
+
+// ES5 15.2.3.8
+// http://es5.github.com/#x15.2.3.8
+if (!Object.seal) {
+    Object.seal = function seal(object) {
+        // this is misleading and breaks feature-detection, but
+        // allows "securable" code to "gracefully" degrade to working
+        // but insecure code.
+        return object;
+    };
+}
+
+// ES5 15.2.3.9
+// http://es5.github.com/#x15.2.3.9
+if (!Object.freeze) {
+    Object.freeze = function freeze(object) {
+        // this is misleading and breaks feature-detection, but
+        // allows "securable" code to "gracefully" degrade to working
+        // but insecure code.
+        return object;
+    };
+}
+
+// detect a Rhino bug and patch it
+try {
+    Object.freeze(function () {});
+} catch (exception) {
+    Object.freeze = (function freeze(freezeObject) {
+        return function freeze(object) {
+            if (typeof object == "function") {
+                return object;
+            } else {
+                return freezeObject(object);
+            }
+        };
+    })(Object.freeze);
+}
+
+// ES5 15.2.3.10
+// http://es5.github.com/#x15.2.3.10
+if (!Object.preventExtensions) {
+    Object.preventExtensions = function preventExtensions(object) {
+        // this is misleading and breaks feature-detection, but
+        // allows "securable" code to "gracefully" degrade to working
+        // but insecure code.
+        return object;
+    };
+}
+
+// ES5 15.2.3.11
+// http://es5.github.com/#x15.2.3.11
+if (!Object.isSealed) {
+    Object.isSealed = function isSealed(object) {
+        return false;
+    };
+}
+
+// ES5 15.2.3.12
+// http://es5.github.com/#x15.2.3.12
+if (!Object.isFrozen) {
+    Object.isFrozen = function isFrozen(object) {
+        return false;
+    };
+}
+
+// ES5 15.2.3.13
+// http://es5.github.com/#x15.2.3.13
+if (!Object.isExtensible) {
+    Object.isExtensible = function isExtensible(object) {
+        // 1. If Type(O) is not Object throw a TypeError exception.
+        if (Object(object) === object) {
+            throw new TypeError(); // TODO message
+        }
+        // 2. Return the Boolean value of the [[Extensible]] internal property of O.
+        var name = '';
+        while (owns(object, name)) {
+            name += '?';
+        }
+        object[name] = true;
+        var returnValue = owns(object, name);
+        delete object[name];
+        return returnValue;
+    };
+}
+
+// ES5 15.2.3.14
+// http://es5.github.com/#x15.2.3.14
+if (!Object.keys) {
+    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
+    var hasDontEnumBug = true,
+        dontEnums = [
+            "toString",
+            "toLocaleString",
+            "valueOf",
+            "hasOwnProperty",
+            "isPrototypeOf",
+            "propertyIsEnumerable",
+            "constructor"
+        ],
+        dontEnumsLength = dontEnums.length;
+
+    for (var key in {"toString": null})
+        hasDontEnumBug = false;
+
+    Object.keys = function keys(object) {
+
+        if ((typeof object != "object" && typeof object != "function") || object === null)
+            throw new TypeError("Object.keys called on a non-object");
+
+        var keys = [];
+        for (var name in object) {
+            if (owns(object, name)) {
+                keys.push(name);
+            }
+        }
+
+        if (hasDontEnumBug) {
+            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
+                var dontEnum = dontEnums[i];
+                if (owns(object, dontEnum)) {
+                    keys.push(dontEnum);
+                }
+            }
+        }
+
+        return keys;
+    };
+
+}
+
+//
+// Date
+// ====
+//
+
+// ES5 15.9.5.43
+// http://es5.github.com/#x15.9.5.43
+// This function returns a String value represent the instance in time 
+// represented by this Date object. The format of the String is the Date Time 
+// string format defined in 15.9.1.15. All fields are present in the String. 
+// The time zone is always UTC, denoted by the suffix Z. If the time value of 
+// this object is not a finite Number a RangeError exception is thrown.
+if (!Date.prototype.toISOString || (new Date(-62198755200000).toISOString().indexOf('-000001') === -1)) {
+    Date.prototype.toISOString = function toISOString() {
+        var result, length, value, year;
+        if (!isFinite(this))
+            throw new RangeError;
+
+        // the date time string format is specified in 15.9.1.15.
+        result = [this.getUTCMonth() + 1, this.getUTCDate(),
+            this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
+        year = this.getUTCFullYear();
+        year = (year < 0 ? '-' : (year > 9999 ? '+' : '')) + ('00000' + Math.abs(year)).slice(0 <= year && year <= 9999 ? -4 : -6);
+
+        length = result.length;
+        while (length--) {
+            value = result[length];
+            // pad months, days, hours, minutes, and seconds to have two digits.
+            if (value < 10)
+                result[length] = "0" + value;
+        }
+        // pad milliseconds to have three digits.
+        return year + "-" + result.slice(0, 2).join("-") + "T" + result.slice(2).join(":") + "." +
+            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z";
+    }
+}
+
+// ES5 15.9.4.4
+// http://es5.github.com/#x15.9.4.4
+if (!Date.now) {
+    Date.now = function now() {
+        return new Date().getTime();
+    };
+}
+
+// ES5 15.9.5.44
+// http://es5.github.com/#x15.9.5.44
+// This function provides a String representation of a Date object for use by 
+// JSON.stringify (15.12.3).
+if (!Date.prototype.toJSON) {
+    Date.prototype.toJSON = function toJSON(key) {
+        // When the toJSON method is called with argument key, the following 
+        // steps are taken:
+
+        // 1.  Let O be the result of calling ToObject, giving it the this
+        // value as its argument.
+        // 2. Let tv be ToPrimitive(O, hint Number).
+        // 3. If tv is a Number and is not finite, return null.
+        // XXX
+        // 4. Let toISO be the result of calling the [[Get]] internal method of
+        // O with argument "toISOString".
+        // 5. If IsCallable(toISO) is false, throw a TypeError exception.
+        if (typeof this.toISOString != "function")
+            throw new TypeError(); // TODO message
+        // 6. Return the result of calling the [[Call]] internal method of
+        //  toISO with O as the this value and an empty argument list.
+        return this.toISOString();
+
+        // NOTE 1 The argument is ignored.
+
+        // NOTE 2 The toJSON function is intentionally generic; it does not
+        // require that its this value be a Date object. Therefore, it can be
+        // transferred to other kinds of objects for use as a method. However,
+        // it does require that any such object have a toISOString method. An
+        // object is free to use the argument key to filter its
+        // stringification.
+    };
+}
+
+// ES5 15.9.4.2
+// http://es5.github.com/#x15.9.4.2
+// based on work shared by Daniel Friesen (dantman)
+// http://gist.github.com/303249
+if (Date.parse("+275760-09-13T00:00:00.000Z") !== 8.64e15) {
+    // XXX global assignment won't work in embeddings that use
+    // an alternate object for the context.
+    Date = (function(NativeDate) {
+
+        // Date.length === 7
+        var Date = function Date(Y, M, D, h, m, s, ms) {
+            var length = arguments.length;
+            if (this instanceof NativeDate) {
+                var date = length == 1 && String(Y) === Y ? // isString(Y)
+                    // We explicitly pass it through parse:
+                    new NativeDate(Date.parse(Y)) :
+                    // We have to manually make calls depending on argument
+                    // length here
+                    length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
+                    length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
+                    length >= 5 ? new NativeDate(Y, M, D, h, m) :
+                    length >= 4 ? new NativeDate(Y, M, D, h) :
+                    length >= 3 ? new NativeDate(Y, M, D) :
+                    length >= 2 ? new NativeDate(Y, M) :
+                    length >= 1 ? new NativeDate(Y) :
+                                  new NativeDate();
+                // Prevent mixups with unfixed Date object
+                date.constructor = Date;
+                return date;
+            }
+            return NativeDate.apply(this, arguments);
+        };
+
+        // 15.9.1.15 Date Time String Format.
+        var isoDateExpression = new RegExp("^" +
+            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign + 6-digit extended year
+            "(?:-(\\d{2})" + // optional month capture
+            "(?:-(\\d{2})" + // optional day capture
+            "(?:" + // capture hours:minutes:seconds.milliseconds
+                "T(\\d{2})" + // hours capture
+                ":(\\d{2})" + // minutes capture
+                "(?:" + // optional :seconds.milliseconds
+                    ":(\\d{2})" + // seconds capture
+                    "(?:\\.(\\d{3}))?" + // milliseconds capture
+                ")?" +
+            "(?:" + // capture UTC offset component
+                "Z|" + // UTC capture
+                "(?:" + // offset specifier +/-hours:minutes
+                    "([-+])" + // sign capture
+                    "(\\d{2})" + // hours offset capture
+                    ":(\\d{2})" + // minutes offset capture
+                ")" +
+            ")?)?)?)?" +
+        "$");
+
+        // Copy any custom methods a 3rd party library may have added
+        for (var key in NativeDate)
+            Date[key] = NativeDate[key];
+
+        // Copy "native" methods explicitly; they may be non-enumerable
+        Date.now = NativeDate.now;
+        Date.UTC = NativeDate.UTC;
+        Date.prototype = NativeDate.prototype;
+        Date.prototype.constructor = Date;
+
+        // Upgrade Date.parse to handle simplified ISO 8601 strings
+        Date.parse = function parse(string) {
+            var match = isoDateExpression.exec(string);
+            if (match) {
+                match.shift(); // kill match[0], the full match
+                // parse months, days, hours, minutes, seconds, and milliseconds
+                for (var i = 1; i < 7; i++) {
+                    // provide default values if necessary
+                    match[i] = +(match[i] || (i < 3 ? 1 : 0));
+                    // match[1] is the month. Months are 0-11 in JavaScript
+                    // `Date` objects, but 1-12 in ISO notation, so we
+                    // decrement.
+                    if (i == 1)
+                        match[i]--;
+                }
+
+                // parse the UTC offset component
+                var minuteOffset = +match.pop(), hourOffset = +match.pop(), sign = match.pop();
+
+                // compute the explicit time zone offset if specified
+                var offset = 0;
+                if (sign) {
+                    // detect invalid offsets and return early
+                    if (hourOffset > 23 || minuteOffset > 59)
+                        return NaN;
+
+                    // express the provided time zone offset in minutes. The offset is
+                    // negative for time zones west of UTC; positive otherwise.
+                    offset = (hourOffset * 60 + minuteOffset) * 6e4 * (sign == "+" ? -1 : 1);
+                }
+
+                // Date.UTC for years between 0 and 99 converts year to 1900 + year
+                // The Gregorian calendar has a 400-year cycle, so 
+                // to Date.UTC(year + 400, .... ) - 12622780800000 == Date.UTC(year, ...),
+                // where 12622780800000 - number of milliseconds in Gregorian calendar 400 years
+                var year = +match[0];
+                if (0 <= year && year <= 99) {
+                    match[0] = year + 400;
+                    return NativeDate.UTC.apply(this, match) + offset - 12622780800000;
+                }
+
+                // compute a new UTC date value, accounting for the optional offset
+                return NativeDate.UTC.apply(this, match) + offset;
+            }
+            return NativeDate.parse.apply(this, arguments);
+        };
+
+        return Date;
+    })(Date);
+}
+
+//
+// String
+// ======
+//
+
+// ES5 15.5.4.20
+// http://es5.github.com/#x15.5.4.20
+var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
+    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
+    "\u2029\uFEFF";
+if (!String.prototype.trim || ws.trim()) {
+    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
+    // http://perfectionkills.com/whitespace-deviations/
+    ws = "[" + ws + "]";
+    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
+        trimEndRegexp = new RegExp(ws + ws + "*$");
+    String.prototype.trim = function trim() {
+        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
+    };
+}
+
+//
+// Util
+// ======
+//
+
+// ES5 9.4
+// http://es5.github.com/#x9.4
+// http://jsperf.com/to-integer
+var toInteger = function (n) {
+    n = +n;
+    if (n !== n) // isNaN
+        n = 0;
+    else if (n !== 0 && n !== (1/0) && n !== -(1/0))
+        n = (n > 0 || -1) * Math.floor(Math.abs(n));
+    return n;
+};
+
+var prepareString = "a"[0] != "a",
+    // ES5 9.9
+    // http://es5.github.com/#x9.9
+    toObject = function (o) {
+        if (o == null) { // this matches both null and undefined
+            throw new TypeError(); // TODO message
+        }
+        // If the implementation doesn't support by-index access of
+        // string characters (ex. IE < 7), split the string
+        if (prepareString && typeof o == "string" && o) {
+            return o.split("");
+        }
+        return Object(o);
+    };
+});/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
+ *      Mike de Boer <mike AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+var EventEmitter = {};
+
+EventEmitter._emit =
+EventEmitter._dispatchEvent = function(eventName, e) {
+    this._eventRegistry = this._eventRegistry || {};
+    this._defaultHandlers = this._defaultHandlers || {};
+
+    var listeners = this._eventRegistry[eventName] || [];
+    var defaultHandler = this._defaultHandlers[eventName];
+    if (!listeners.length && !defaultHandler)
+        return;
+
+    e = e || {};
+    e.type = eventName;
+    
+    if (!e.stopPropagation) {
+        e.stopPropagation = function() {
+            this.propagationStopped = true;
+        };
+    }
+    
+    if (!e.preventDefault) {
+        e.preventDefault = function() {
+            this.defaultPrevented = true;
+        };
+    }
+
+    for (var i=0; i<listeners.length; i++) {
+        listeners[i](e);
+        if (e.propagationStopped)
+            break;
+    }
+    
+    if (defaultHandler && !e.defaultPrevented)
+        defaultHandler(e);
+};
+
+EventEmitter.setDefaultHandler = function(eventName, callback) {
+    this._defaultHandlers = this._defaultHandlers || {};
+    
+    if (this._defaultHandlers[eventName])
+        throw new Error("The default handler for '" + eventName + "' is already set");
+        
+    this._defaultHandlers[eventName] = callback;
+};
+
+EventEmitter.on =
+EventEmitter.addEventListener = function(eventName, callback) {
+    this._eventRegistry = this._eventRegistry || {};
+
+    var listeners = this._eventRegistry[eventName];
+    if (!listeners)
+        var listeners = this._eventRegistry[eventName] = [];
+
+    if (listeners.indexOf(callback) == -1)
+        listeners.push(callback);
+};
+
+EventEmitter.removeListener =
+EventEmitter.removeEventListener = function(eventName, callback) {
+    this._eventRegistry = this._eventRegistry || {};
+
+    var listeners = this._eventRegistry[eventName];
+    if (!listeners)
+        return;
+
+    var index = listeners.indexOf(callback);
+    if (index !== -1)
+        listeners.splice(index, 1);
+};
+
+EventEmitter.removeAllListeners = function(eventName) {
+    if (this._eventRegistry) this._eventRegistry[eventName] = [];
+};
+
+exports.EventEmitter = EventEmitter;
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/lib/oop', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+exports.inherits = (function() {
+    var tempCtor = function() {};
+    return function(ctor, superCtor) {
+        tempCtor.prototype = superCtor.prototype;
+        ctor.super_ = superCtor.prototype;
+        ctor.prototype = new tempCtor();
+        ctor.prototype.constructor = ctor;
+    };
+}());
+
+exports.mixin = function(obj, mixin) {
+    for (var key in mixin) {
+        obj[key] = mixin[key];
+    }
+};
+
+exports.implement = function(proto, mixin) {
+    exports.mixin(proto, mixin);
+};
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+ 
+define('ace/mode/javascript_worker', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/worker/mirror', 'ace/worker/jshint', 'ace/narcissus/jsparse'], function(require, exports, module) {
+"use strict";
+    
+var oop = require("../lib/oop");
+var Mirror = require("../worker/mirror").Mirror;
+var lint = require("../worker/jshint").JSHINT;
+    
+var JavaScriptWorker = exports.JavaScriptWorker = function(sender) {
+    Mirror.call(this, sender);
+    this.setTimeout(500);
+};
+
+oop.inherits(JavaScriptWorker, Mirror);
+
+(function() {
+    
+    this.onUpdate = function() {
+        var value = this.doc.getValue();
+        value = value.replace(/^#!.*\n/, "\n");
+        
+//        var start = new Date();
+        var parser = require("../narcissus/jsparse");
+        try {
+            parser.parse(value);
+        } catch(e) {
+//            console.log("narcissus")
+//            console.log(e);
+            var chunks = e.message.split(":")
+            var message = chunks.pop().trim();
+            var lineNumber = parseInt(chunks.pop().trim()) - 1;
+            this.sender.emit("narcissus", {
+                row: lineNumber,
+                column: null, // TODO convert e.cursor
+                text: message,
+                type: "error"
+            });
+            return;
+        } finally {
+//            console.log("parse time: " + (new Date() - start));
+        }
+        
+//        var start = new Date();
+//        console.log("jslint")
+        lint(value, {undef: false, onevar: false, passfail: false});
+        this.sender.emit("jslint", lint.errors);        
+//        console.log("lint time: " + (new Date() - start));
+    }
+    
+}).call(JavaScriptWorker.prototype);
+
+});define('ace/worker/mirror', ['require', 'exports', 'module' , 'ace/document', 'ace/lib/lang'], function(require, exports, module) {
+"use strict";
+
+var Document = require("../document").Document;
+var lang = require("../lib/lang");
+    
+var Mirror = exports.Mirror = function(sender) {
+    this.sender = sender;
+    var doc = this.doc = new Document("");
+    
+    var deferredUpdate = this.deferredUpdate = lang.deferredCall(this.onUpdate.bind(this));
+    
+    var _self = this;
+    sender.on("change", function(e) {
+        doc.applyDeltas([e.data]);        
+        deferredUpdate.schedule(_self.$timeout);
+    });
+};
+
+(function() {
+    
+    this.$timeout = 500;
+    
+    this.setTimeout = function(timeout) {
+        this.$timeout = timeout;
+    };
+    
+    this.setValue = function(value) {
+        this.doc.setValue(value);
+        this.deferredUpdate.schedule(this.$timeout);
+    };
+    
+    this.getValue = function(callbackId) {
+        this.sender.callback(this.doc.getValue(), callbackId);
+    };
+    
+    this.onUpdate = function() {
+        // abstract method
+    };
+    
+}).call(Mirror.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/range', 'ace/anchor'], function(require, exports, module) {
+"use strict";
+
+var oop = require("./lib/oop");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+var Range = require("./range").Range;
+var Anchor = require("./anchor").Anchor;
+
+var Document = function(text) {
+    this.$lines = [];
+
+    if (Array.isArray(text)) {
+        this.insertLines(0, text);
+    }
+    // There has to be one line at least in the document. If you pass an empty
+    // string to the insert function, nothing will happen. Workaround.
+    else if (text.length == 0) {
+        this.$lines = [""];
+    } else {
+        this.insert({row: 0, column:0}, text);
+    }
+};
+
+(function() {
+
+    oop.implement(this, EventEmitter);
+
+    this.setValue = function(text) {
+        var len = this.getLength();
+        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
+        this.insert({row: 0, column:0}, text);
+    };
+
+    this.getValue = function() {
+        return this.getAllLines().join(this.getNewLineCharacter());
+    };
+
+    this.createAnchor = function(row, column) {
+        return new Anchor(this, row, column);
+    };
+
+    // check for IE split bug
+    if ("aaa".split(/a/).length == 0)
+        this.$split = function(text) {
+            return text.replace(/\r\n|\r/g, "\n").split("\n");
+        }
+    else
+        this.$split = function(text) {
+            return text.split(/\r\n|\r|\n/);
+        };
+
+
+    this.$detectNewLine = function(text) {
+        var match = text.match(/^.*?(\r\n|\r|\n)/m);
+        if (match) {
+            this.$autoNewLine = match[1];
+        } else {
+            this.$autoNewLine = "\n";
+        }
+    };
+
+    this.getNewLineCharacter = function() {
+      switch (this.$newLineMode) {
+          case "windows":
+              return "\r\n";
+
+          case "unix":
+              return "\n";
+
+          case "auto":
+              return this.$autoNewLine;
+      }
+    };
+
+    this.$autoNewLine = "\n";
+    this.$newLineMode = "auto";
+    this.setNewLineMode = function(newLineMode) {
+        if (this.$newLineMode === newLineMode)
+            return;
+
+        this.$newLineMode = newLineMode;
+    };
+
+    this.getNewLineMode = function() {
+        return this.$newLineMode;
+    };
+
+    this.isNewLine = function(text) {
+        return (text == "\r\n" || text == "\r" || text == "\n");
+    };
+
+    /**
+     * Get a verbatim copy of the given line as it is in the document
+     */
+    this.getLine = function(row) {
+        return this.$lines[row] || "";
+    };
+
+    this.getLines = function(firstRow, lastRow) {
+        return this.$lines.slice(firstRow, lastRow + 1);
+    };
+
+    /**
+     * Returns all lines in the document as string array. Warning: The caller
+     * should not modify this array!
+     */
+    this.getAllLines = function() {
+        return this.getLines(0, this.getLength());
+    };
+
+    this.getLength = function() {
+        return this.$lines.length;
+    };
+
+    this.getTextRange = function(range) {
+        if (range.start.row == range.end.row) {
+            return this.$lines[range.start.row].substring(range.start.column,
+                                                         range.end.column);
+        }
+        else {
+            var lines = [];
+            lines.push(this.$lines[range.start.row].substring(range.start.column));
+            lines.push.apply(lines, this.getLines(range.start.row+1, range.end.row-1));
+            lines.push(this.$lines[range.end.row].substring(0, range.end.column));
+            return lines.join(this.getNewLineCharacter());
+        }
+    };
+
+    this.$clipPosition = function(position) {
+        var length = this.getLength();
+        if (position.row >= length) {
+            position.row = Math.max(0, length - 1);
+            position.column = this.getLine(length-1).length;
+        }
+        return position;
+    };
+
+    this.insert = function(position, text) {
+        if (text.length == 0)
+            return position;
+
+        position = this.$clipPosition(position);
+
+        if (this.getLength() <= 1)
+            this.$detectNewLine(text);
+
+        var lines = this.$split(text);
+        var firstLine = lines.splice(0, 1)[0];
+        var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
+
+        position = this.insertInLine(position, firstLine);
+        if (lastLine !== null) {
+            position = this.insertNewLine(position); // terminate first line
+            position = this.insertLines(position.row, lines);
+            position = this.insertInLine(position, lastLine || "");
+        }
+        return position;
+    };
+
+    this.insertLines = function(row, lines) {
+        if (lines.length == 0)
+            return {row: row, column: 0};
+
+        var args = [row, 0];
+        args.push.apply(args, lines);
+        this.$lines.splice.apply(this.$lines, args);
+
+        var range = new Range(row, 0, row + lines.length, 0);
+        var delta = {
+            action: "insertLines",
+            range: range,
+            lines: lines
+        };
+        this._emit("change", { data: delta });
+        return range.end;
+    };
+
+    this.insertNewLine = function(position) {
+        position = this.$clipPosition(position);
+        var line = this.$lines[position.row] || "";
+
+        this.$lines[position.row] = line.substring(0, position.column);
+        this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
+
+        var end = {
+            row : position.row + 1,
+            column : 0
+        };
+
+        var delta = {
+            action: "insertText",
+            range: Range.fromPoints(position, end),
+            text: this.getNewLineCharacter()
+        };
+        this._emit("change", { data: delta });
+
+        return end;
+    };
+
+    this.insertInLine = function(position, text) {
+        if (text.length == 0)
+            return position;
+
+        var line = this.$lines[position.row] || "";
+
+        this.$lines[position.row] = line.substring(0, position.column) + text
+                + line.substring(position.column);
+
+        var end = {
+            row : position.row,
+            column : position.column + text.length
+        };
+
+        var delta = {
+            action: "insertText",
+            range: Range.fromPoints(position, end),
+            text: text
+        };
+        this._emit("change", { data: delta });
+
+        return end;
+    };
+
+    this.remove = function(range) {
+        // clip to document
+        range.start = this.$clipPosition(range.start);
+        range.end = this.$clipPosition(range.end);
+
+        if (range.isEmpty())
+            return range.start;
+
+        var firstRow = range.start.row;
+        var lastRow = range.end.row;
+
+        if (range.isMultiLine()) {
+            var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
+            var lastFullRow = lastRow - 1;
+
+            if (range.end.column > 0)
+                this.removeInLine(lastRow, 0, range.end.column);
+
+            if (lastFullRow >= firstFullRow)
+                this.removeLines(firstFullRow, lastFullRow);
+
+            if (firstFullRow != firstRow) {
+                this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length);
+                this.removeNewLine(range.start.row);
+            }
+        }
+        else {
+            this.removeInLine(firstRow, range.start.column, range.end.column);
+        }
+        return range.start;
+    };
+
+    this.removeInLine = function(row, startColumn, endColumn) {
+        if (startColumn == endColumn)
+            return;
+
+        var range = new Range(row, startColumn, row, endColumn);
+        var line = this.getLine(row);
+        var removed = line.substring(startColumn, endColumn);
+        var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
+        this.$lines.splice(row, 1, newLine);
+
+        var delta = {
+            action: "removeText",
+            range: range,
+            text: removed
+        };
+        this._emit("change", { data: delta });
+        return range.start;
+    };
+
+    /**
+     * Removes a range of full lines
+     *
+     * @param firstRow {Integer} The first row to be removed
+     * @param lastRow {Integer} The last row to be removed
+     * @return {String[]} The removed lines
+     */
+    this.removeLines = function(firstRow, lastRow) {
+        var range = new Range(firstRow, 0, lastRow + 1, 0);
+        var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
+
+        var delta = {
+            action: "removeLines",
+            range: range,
+            nl: this.getNewLineCharacter(),
+            lines: removed
+        };
+        this._emit("change", { data: delta });
+        return removed;
+    };
+
+    this.removeNewLine = function(row) {
+        var firstLine = this.getLine(row);
+        var secondLine = this.getLine(row+1);
+
+        var range = new Range(row, firstLine.length, row+1, 0);
+        var line = firstLine + secondLine;
+
+        this.$lines.splice(row, 2, line);
+
+        var delta = {
+            action: "removeText",
+            range: range,
+            text: this.getNewLineCharacter()
+        };
+        this._emit("change", { data: delta });
+    };
+
+    this.replace = function(range, text) {
+        if (text.length == 0 && range.isEmpty())
+            return range.start;
+
+        // Shortcut: If the text we want to insert is the same as it is already
+        // in the document, we don't have to replace anything.
+        if (text == this.getTextRange(range))
+            return range.end;
+
+        this.remove(range);
+        if (text) {
+            var end = this.insert(range.start, text);
+        }
+        else {
+            end = range.start;
+        }
+
+        return end;
+    };
+
+    this.applyDeltas = function(deltas) {
+        for (var i=0; i<deltas.length; i++) {
+            var delta = deltas[i];
+            var range = Range.fromPoints(delta.range.start, delta.range.end);
+
+            if (delta.action == "insertLines")
+                this.insertLines(range.start.row, delta.lines);
+            else if (delta.action == "insertText")
+                this.insert(range.start, delta.text);
+            else if (delta.action == "removeLines")
+                this.removeLines(range.start.row, range.end.row - 1);
+            else if (delta.action == "removeText")
+                this.remove(range);
+        }
+    };
+
+    this.revertDeltas = function(deltas) {
+        for (var i=deltas.length-1; i>=0; i--) {
+            var delta = deltas[i];
+
+            var range = Range.fromPoints(delta.range.start, delta.range.end);
+
+            if (delta.action == "insertLines")
+                this.removeLines(range.start.row, range.end.row - 1);
+            else if (delta.action == "insertText")
+                this.remove(range);
+            else if (delta.action == "removeLines")
+                this.insertLines(range.start.row, delta.lines);
+            else if (delta.action == "removeText")
+                this.insert(range.start, delta.text);
+        }
+    };
+
+}).call(Document.prototype);
+
+exports.Document = Document;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/range', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+var Range = function(startRow, startColumn, endRow, endColumn) {
+    this.start = {
+        row: startRow,
+        column: startColumn
+    };
+
+    this.end = {
+        row: endRow,
+        column: endColumn
+    };
+};
+
+(function() {
+    this.isEequal = function(range) {
+        return this.start.row == range.start.row &&
+            this.end.row == range.end.row &&
+            this.start.column == range.start.column &&
+            this.end.column == range.end.column
+    };
+
+    this.toString = function() {
+        return ("Range: [" + this.start.row + "/" + this.start.column +
+            "] -> [" + this.end.row + "/" + this.end.column + "]");
+    };
+
+    this.contains = function(row, column) {
+        return this.compare(row, column) == 0;
+    };
+
+    /**
+     * Compares this range (A) with another range (B), where B is the passed in
+     * range.
+     *
+     * Return values:
+     *  -2: (B) is infront of (A) and doesn't intersect with (A)
+     *  -1: (B) begins before (A) but ends inside of (A)
+     *   0: (B) is completly inside of (A) OR (A) is complety inside of (B)
+     *  +1: (B) begins inside of (A) but ends outside of (A)
+     *  +2: (B) is after (A) and doesn't intersect with (A)
+     *
+     *  42: FTW state: (B) ends in (A) but starts outside of (A)
+     */
+    this.compareRange = function(range) {
+        var cmp,
+            end = range.end,
+            start = range.start;
+
+        cmp = this.compare(end.row, end.column);
+        if (cmp == 1) {
+            cmp = this.compare(start.row, start.column);
+            if (cmp == 1) {
+                return 2;
+            } else if (cmp == 0) {
+                return 1;
+            } else {
+                return 0;
+            }
+        } else if (cmp == -1) {
+            return -2;
+        } else {
+            cmp = this.compare(start.row, start.column);
+            if (cmp == -1) {
+                return -1;
+            } else if (cmp == 1) {
+                return 42;
+            } else {
+                return 0;
+            }
+        }
+    }
+
+    this.comparePoint = function(p) {
+        return this.compare(p.row, p.column);
+    }
+
+    this.containsRange = function(range) {
+        return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
+    }
+
+    this.isEnd = function(row, column) {
+        return this.end.row == row && this.end.column == column;
+    }
+
+    this.isStart = function(row, column) {
+        return this.start.row == row && this.start.column == column;
+    }
+
+    this.setStart = function(row, column) {
+        if (typeof row == "object") {
+            this.start.column = row.column;
+            this.start.row = row.row;
+        } else {
+            this.start.row = row;
+            this.start.column = column;
+        }
+    }
+
+    this.setEnd = function(row, column) {
+        if (typeof row == "object") {
+            this.end.column = row.column;
+            this.end.row = row.row;
+        } else {
+            this.end.row = row;
+            this.end.column = column;
+        }
+    }
+
+    this.inside = function(row, column) {
+        if (this.compare(row, column) == 0) {
+            if (this.isEnd(row, column) || this.isStart(row, column)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    this.insideStart = function(row, column) {
+        if (this.compare(row, column) == 0) {
+            if (this.isEnd(row, column)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    this.insideEnd = function(row, column) {
+        if (this.compare(row, column) == 0) {
+            if (this.isStart(row, column)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    this.compare = function(row, column) {
+        if (!this.isMultiLine()) {
+            if (row === this.start.row) {
+                return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0);
+            };
+        }
+
+        if (row < this.start.row)
+            return -1;
+
+        if (row > this.end.row)
+            return 1;
+
+        if (this.start.row === row)
+            return column >= this.start.column ? 0 : -1;
+
+        if (this.end.row === row)
+            return column <= this.end.column ? 0 : 1;
+
+        return 0;
+    };
+
+    /**
+     * Like .compare(), but if isStart is true, return -1;
+     */
+    this.compareStart = function(row, column) {
+        if (this.start.row == row && this.start.column == column) {
+            return -1;
+        } else {
+            return this.compare(row, column);
+        }
+    }
+
+    /**
+     * Like .compare(), but if isEnd is true, return 1;
+     */
+    this.compareEnd = function(row, column) {
+        if (this.end.row == row && this.end.column == column) {
+            return 1;
+        } else {
+            return this.compare(row, column);
+        }
+    }
+
+    this.compareInside = function(row, column) {
+        if (this.end.row == row && this.end.column == column) {
+            return 1;
+        } else if (this.start.row == row && this.start.column == column) {
+            return -1;
+        } else {
+            return this.compare(row, column);
+        }
+    }
+
+    this.clipRows = function(firstRow, lastRow) {
+        if (this.end.row > lastRow) {
+            var end = {
+                row: lastRow+1,
+                column: 0
+            };
+        }
+
+        if (this.start.row > lastRow) {
+            var start = {
+                row: lastRow+1,
+                column: 0
+            };
+        }
+
+        if (this.start.row < firstRow) {
+            var start = {
+                row: firstRow,
+                column: 0
+            };
+        }
+
+        if (this.end.row < firstRow) {
+            var end = {
+                row: firstRow,
+                column: 0
+            };
+        }
+        return Range.fromPoints(start || this.start, end || this.end);
+    };
+
+    this.extend = function(row, column) {
+        var cmp = this.compare(row, column);
+
+        if (cmp == 0)
+            return this;
+        else if (cmp == -1)
+            var start = {row: row, column: column};
+        else
+            var end = {row: row, column: column};
+
+        return Range.fromPoints(start || this.start, end || this.end);
+    };
+
+    this.isEmpty = function() {
+        return (this.start.row == this.end.row && this.start.column == this.end.column);
+    };
+
+    this.isMultiLine = function() {
+        return (this.start.row !== this.end.row);
+    };
+
+    this.clone = function() {
+        return Range.fromPoints(this.start, this.end);
+    };
+
+    this.collapseRows = function() {
+        if (this.end.column == 0)
+            return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0)
+        else
+            return new Range(this.start.row, 0, this.end.row, 0)
+    };
+
+    this.toScreenRange = function(session) {
+        var screenPosStart =
+            session.documentToScreenPosition(this.start);
+        var screenPosEnd =
+            session.documentToScreenPosition(this.end);
+
+        return new Range(
+            screenPosStart.row, screenPosStart.column,
+            screenPosEnd.row, screenPosEnd.column
+        );
+    };
+
+}).call(Range.prototype);
+
+
+Range.fromPoints = function(start, end) {
+    return new Range(start.row, start.column, end.row, end.column);
+};
+
+exports.Range = Range;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("./lib/oop");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+
+/**
+ * An Anchor is a floating pointer in the document. Whenever text is inserted or
+ * deleted before the cursor, the position of the cursor is updated
+ */
+var Anchor = exports.Anchor = function(doc, row, column) {
+    this.document = doc;
+    
+    if (typeof column == "undefined")
+        this.setPosition(row.row, row.column);
+    else
+        this.setPosition(row, column);
+
+    this.$onChange = this.onChange.bind(this);
+    doc.on("change", this.$onChange);
+};
+
+(function() {
+
+    oop.implement(this, EventEmitter);
+    
+    this.getPosition = function() {
+        return this.$clipPositionToDocument(this.row, this.column);
+    };
+    
+    this.getDocument = function() {
+        return this.document;
+    };
+    
+    this.onChange = function(e) {
+        var delta = e.data;
+        var range = delta.range;
+            
+        if (range.start.row == range.end.row && range.start.row != this.row)
+            return;
+            
+        if (range.start.row > this.row)
+            return;
+            
+        if (range.start.row == this.row && range.start.column > this.column)
+            return;
+    
+        var row = this.row;
+        var column = this.column;
+        
+        if (delta.action === "insertText") {
+            if (range.start.row === row && range.start.column <= column) {
+                if (range.start.row === range.end.row) {
+                    column += range.end.column - range.start.column;
+                }
+                else {
+                    column -= range.start.column;
+                    row += range.end.row - range.start.row;
+                }
+            }
+            else if (range.start.row !== range.end.row && range.start.row < row) {
+                row += range.end.row - range.start.row;
+            }
+        } else if (delta.action === "insertLines") {
+            if (range.start.row <= row) {
+                row += range.end.row - range.start.row;
+            }
+        }
+        else if (delta.action == "removeText") {
+            if (range.start.row == row && range.start.column < column) {
+                if (range.end.column >= column)
+                    column = range.start.column;
+                else
+                    column = Math.max(0, column - (range.end.column - range.start.column));
+                
+            } else if (range.start.row !== range.end.row && range.start.row < row) {
+                if (range.end.row == row) {
+                    column = Math.max(0, column - range.end.column) + range.start.column;
+                }
+                row -= (range.end.row - range.start.row);
+            }
+            else if (range.end.row == row) {
+                row -= range.end.row - range.start.row;
+                column = Math.max(0, column - range.end.column) + range.start.column;
+            }
+        } else if (delta.action == "removeLines") {
+            if (range.start.row <= row) {
+                if (range.end.row <= row)
+                    row -= range.end.row - range.start.row;
+                else {
+                    row = range.start.row;
+                    column = 0;
+                }
+            }
+        }
+
+        this.setPosition(row, column, true);
+    };
+
+    this.setPosition = function(row, column, noClip) {
+        var pos;
+        if (noClip) {
+            pos = {
+                row: row,
+                column: column
+            };
+        }
+        else {
+            pos = this.$clipPositionToDocument(row, column);
+        }
+        
+        if (this.row == pos.row && this.column == pos.column)
+            return;
+            
+        var old = {
+            row: this.row,
+            column: this.column
+        };
+        
+        this.row = pos.row;
+        this.column = pos.column;
+        this._emit("change", {
+            old: old,
+            value: pos
+        });
+    };
+    
+    this.detach = function() {
+        this.document.removeEventListener("change", this.$onChange);
+    };
+    
+    this.$clipPositionToDocument = function(row, column) {
+        var pos = {};
+    
+        if (row >= this.document.getLength()) {
+            pos.row = Math.max(0, this.document.getLength() - 1);
+            pos.column = this.document.getLine(pos.row).length;
+        }
+        else if (row < 0) {
+            pos.row = 0;
+            pos.column = 0;
+        }
+        else {
+            pos.row = row;
+            pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
+        }
+        
+        if (column < 0)
+            pos.column = 0;
+            
+        return pos;
+    };
+    
+}).call(Anchor.prototype);
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/lib/lang', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+exports.stringReverse = function(string) {
+    return string.split("").reverse().join("");
+};
+
+exports.stringRepeat = function (string, count) {
+     return new Array(count + 1).join(string);
+};
+
+var trimBeginRegexp = /^\s\s*/;
+var trimEndRegexp = /\s\s*$/;
+
+exports.stringTrimLeft = function (string) {
+    return string.replace(trimBeginRegexp, '');
+};
+
+exports.stringTrimRight = function (string) {
+    return string.replace(trimEndRegexp, '');
+};
+
+exports.copyObject = function(obj) {
+    var copy = {};
+    for (var key in obj) {
+        copy[key] = obj[key];
+    }
+    return copy;
+};
+
+exports.copyArray = function(array){
+    var copy = [];
+    for (var i=0, l=array.length; i<l; i++) {
+        if (array[i] && typeof array[i] == "object")
+            copy[i] = this.copyObject( array[i] );
+        else 
+            copy[i] = array[i];
+    }
+    return copy;
+};
+
+exports.deepCopy = function (obj) {
+    if (typeof obj != "object") {
+        return obj;
+    }
+    
+    var copy = obj.constructor();
+    for (var key in obj) {
+        if (typeof obj[key] == "object") {
+            copy[key] = this.deepCopy(obj[key]);
+        } else {
+            copy[key] = obj[key];
+        }
+    }
+    return copy;
+};
+
+exports.arrayToMap = function(arr) {
+    var map = {};
+    for (var i=0; i<arr.length; i++) {
+        map[arr[i]] = 1;
+    }
+    return map;
+
+};
+
+/**
+ * splice out of 'array' anything that === 'value'
+ */
+exports.arrayRemove = function(array, value) {
+  for (var i = 0; i <= array.length; i++) {
+    if (value === array[i]) {
+      array.splice(i, 1);
+    }
+  }
+};
+
+exports.escapeRegExp = function(str) {
+    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
+};
+
+exports.deferredCall = function(fcn) {
+
+    var timer = null;
+    var callback = function() {
+        timer = null;
+        fcn();
+    };
+
+    var deferred = function(timeout) {
+        deferred.cancel();
+        timer = setTimeout(callback, timeout || 0);
+        return deferred;
+    };
+
+    deferred.schedule = deferred;
+
+    deferred.call = function() {
+        this.cancel();
+        fcn();
+        return deferred;
+    };
+
+    deferred.cancel = function() {
+        clearTimeout(timer);
+        timer = null;
+        return deferred;
+    };
+
+    return deferred;
+};
+
+});
+define('ace/worker/jshint', ['require', 'exports', 'module' ], function(require, exports, module) {
+/*!
+ * JSHint, by JSHint Community.
+ *
+ * Licensed under the same slightly modified MIT license that JSLint is.
+ * It stops evil-doers everywhere.
+ *
+ * JSHint is a derivative work of JSLint:
+ *
+ *   Copyright (c) 2002 Douglas Crockford  (www.JSLint.com)
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining
+ *   a copy of this software and associated documentation files (the "Software"),
+ *   to deal in the Software without restriction, including without limitation
+ *   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *   and/or sell copies of the Software, and to permit persons to whom
+ *   the Software is furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included
+ *   in all copies or substantial portions of the Software.
+ *
+ *   The Software shall be used for Good, not Evil.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ *   DEALINGS IN THE SOFTWARE.
+ *
+ * JSHint was forked from 2010-12-16 edition of JSLint.
+ *
+ */
+
+/*
+ JSHINT is a global function. It takes two parameters.
+
+     var myResult = JSHINT(source, option);
+
+ The first parameter is either a string or an array of strings. If it is a
+ string, it will be split on '\n' or '\r'. If it is an array of strings, it
+ is assumed that each string represents one line. The source can be a
+ JavaScript text or a JSON text.
+
+ The second parameter is an optional object of options which control the
+ operation of JSHINT. Most of the options are booleans: They are all
+ optional and have a default value of false. One of the options, predef,
+ can be an array of names, which will be used to declare global variables,
+ or an object whose keys are used as global names, with a boolean value
+ that determines if they are assignable.
+
+ If it checks out, JSHINT returns true. Otherwise, it returns false.
+
+ If false, you can inspect JSHINT.errors to find out the problems.
+ JSHINT.errors is an array of objects containing these members:
+
+ {
+     line      : The line (relative to 0) at which the lint was found
+     character : The character (relative to 0) at which the lint was found
+     reason    : The problem
+     evidence  : The text line in which the problem occurred
+     raw       : The raw message before the details were inserted
+     a         : The first detail
+     b         : The second detail
+     c         : The third detail
+     d         : The fourth detail
+ }
+
+ If a fatal error was found, a null will be the last element of the
+ JSHINT.errors array.
+
+ You can request a Function Report, which shows all of the functions
+ and the parameters and vars that they use. This can be used to find
+ implied global variables and other problems. The report is in HTML and
+ can be inserted in an HTML <body>.
+
+     var myReport = JSHINT.report(limited);
+
+ If limited is true, then the report will be limited to only errors.
+
+ You can request a data structure which contains JSHint's results.
+
+     var myData = JSHINT.data();
+
+ It returns a structure with this form:
+
+ {
+     errors: [
+         {
+             line: NUMBER,
+             character: NUMBER,
+             reason: STRING,
+             evidence: STRING
+         }
+     ],
+     functions: [
+         name: STRING,
+         line: NUMBER,
+         last: NUMBER,
+         param: [
+             STRING
+         ],
+         closure: [
+             STRING
+         ],
+         var: [
+             STRING
+         ],
+         exception: [
+             STRING
+         ],
+         outer: [
+             STRING
+         ],
+         unused: [
+             STRING
+         ],
+         global: [
+             STRING
+         ],
+         label: [
+             STRING
+         ]
+     ],
+     globals: [
+         STRING
+     ],
+     member: {
+         STRING: NUMBER
+     },
+     unuseds: [
+         {
+             name: STRING,
+             line: NUMBER
+         }
+     ],
+     implieds: [
+         {
+             name: STRING,
+             line: NUMBER
+         }
+     ],
+     urls: [
+         STRING
+     ],
+     json: BOOLEAN
+ }
+
+ Empty arrays will not be included.
+
+*/
+
+/*jshint
+ evil: true, nomen: false, onevar: false, regexp: false, strict: true, boss: true,
+ undef: true, maxlen: 100
+*/
+
+/*members "\b", "\t", "\n", "\f", "\r", "!=", "!==", "\"", "%", "(begin)",
+ "(breakage)", "(context)", "(error)", "(global)", "(identifier)", "(last)",
+ "(line)", "(loopage)", "(name)", "(onevar)", "(params)", "(scope)",
+ "(statement)", "(verb)", "*", "+", "++", "-", "--", "\/", "<", "<=", "==",
+ "===", ">", ">=", $, $$, $A, $F, $H, $R, $break, $continue, $w, Abstract, Ajax,
+ __filename, __dirname, ActiveXObject, Array, ArrayBuffer, ArrayBufferView,
+ Autocompleter, Assets, Boolean, Builder, Buffer, Browser, COM, CScript, Canvas,
+ CustomAnimation, Class, Control, Chain, Color, Cookie, Core, DataView, Date,
+ Debug, Draggable, Draggables, Droppables, Document, DomReady, DOMReady, Drag,
+ E, Enumerator, Enumerable, Element, Elements, Error, Effect, EvalError, Event,
+ Events, FadeAnimation, Field, Flash, Float32Array, Float64Array, Form,
+ FormField, Frame, Function, Fx, GetObject, Group, Hash, HotKey, HTMLElement,
+ HtmlTable, Iframe, IframeShim, Image, Int16Array, Int32Array, Int8Array,
+ Insertion, InputValidator, JSON, Keyboard, Locale, LN10, LN2, LOG10E, LOG2E,
+ MAX_VALUE, MIN_VALUE, Mask, Math, MenuItem, MoveAnimation, MooTools, Native,
+ NEGATIVE_INFINITY, Number, Object, ObjectRange, Option, Options, OverText, PI,
+ POSITIVE_INFINITY, PeriodicalExecuter, Point, Position, Prototype, RangeError,
+ Rectangle, ReferenceError, RegExp, ResizeAnimation, Request, RotateAnimation,
+ SQRT1_2, SQRT2, ScrollBar, ScriptEngine, ScriptEngineBuildVersion,
+ ScriptEngineMajorVersion, ScriptEngineMinorVersion, Scriptaculous, Scroller,
+ Slick, Slider, Selector, String, Style, SyntaxError, Sortable, Sortables,
+ SortableObserver, Sound, Spinner, System, Swiff, Text, TextArea, Template,
+ Timer, Tips, Type, TypeError, Toggle, Try, URI, URIError, URL, VBArray, WSH,
+ WScript, Web, Window, XMLDOM, XMLHttpRequest, XPathEvaluator, XPathException,
+ XPathExpression, XPathNamespace, XPathNSResolver, XPathResult, "\\", a,
+ addEventListener, address, alert, apply, applicationCache, arguments, arity,
+ asi, b, bitwise, block, blur, boolOptions, boss, browser, c, call, callee,
+ caller, cases, charAt, charCodeAt, character, clearInterval, clearTimeout,
+ close, closed, closure, comment, condition, confirm, console, constructor,
+ content, couch, create, css, curly, d, data, datalist, dd, debug, decodeURI,
+ decodeURIComponent, defaultStatus, defineClass, deserialize, devel, document,
+ dojo, dijit, dojox, define, edition, else, emit, encodeURI, encodeURIComponent,
+ entityify, eqeqeq, eqnull, errors, es5, escape, eval, event, evidence, evil,
+ ex, exception, exec, exps, expr, exports, FileReader, first, floor, focus,
+ forin, fragment, frames, from, fromCharCode, fud, funct, function, functions,
+ g, gc, getComputedStyle, getRow, GLOBAL, global, globals, globalstrict,
+ hasOwnProperty, help, history, i, id, identifier, immed, implieds, include,
+ indent, indexOf, init, ins, instanceOf, isAlpha, isApplicationRunning, isArray,
+ isDigit, isFinite, isNaN, iterator, join, jshint,
+ JSHINT, json, jquery, jQuery, keys, label, labelled, last, lastsemic, laxbreak,
+ latedef, lbp, led, left, length, line, load, loadClass, localStorage, location,
+ log, loopfunc, m, match, maxerr, maxlen, member,message, meta, module, moveBy,
+ moveTo, mootools, name, navigator, new, newcap, noarg, node, noempty, nomen,
+ nonew, nud, onbeforeunload, onblur, onerror, onevar, onfocus, onload, onresize,
+ onunload, open, openDatabase, openURL, opener, opera, outer, param, parent,
+ parseFloat, parseInt, passfail, plusplus, predef, print, process, prompt,
+ proto, prototype, prototypejs, push, quit, range, raw, reach, reason, regexp,
+ readFile, readUrl, regexdash, removeEventListener, replace, report, require,
+ reserved, resizeBy, resizeTo, resolvePath, resumeUpdates, respond, rhino, right,
+ runCommand, scroll, screen, scripturl, scrollBy, scrollTo, scrollbar, search, seal, send,
+ serialize, setInterval, setTimeout, shift, slice, sort,spawn, split, stack,
+ status, start, strict, sub, substr, supernew, shadow, supplant, sum, sync,
+ test, toLowerCase, toString, toUpperCase, toint32, token, top, trailing, type,
+ typeOf, Uint16Array, Uint32Array, Uint8Array, undef, unused, urls, value, valueOf,
+ var, version, WebSocket, white, window, Worker, wsh*/
+
+/*global exports: false */
+
+// We build the application inside a function so that we produce only a single
+// global variable. That function will be invoked immediately, and its return
+// value is the JSHINT function itself.
+
+var JSHINT = (function () {
+    "use strict";
+
+    var anonname,       // The guessed name for anonymous functions.
+
+// These are operators that should not be used with the ! operator.
+
+        bang = {
+            '<'  : true,
+            '<=' : true,
+            '==' : true,
+            '===': true,
+            '!==': true,
+            '!=' : true,
+            '>'  : true,
+            '>=' : true,
+            '+'  : true,
+            '-'  : true,
+            '*'  : true,
+            '/'  : true,
+            '%'  : true
+        },
+
+// These are the JSHint boolean options.
+
+        boolOptions = {
+            asi         : true, // if automatic semicolon insertion should be tolerated
+            bitwise     : true, // if bitwise operators should not be allowed
+            boss        : true, // if advanced usage of assignments should be allowed
+            browser     : true, // if the standard browser globals should be predefined
+            couch       : true, // if CouchDB globals should be predefined
+            curly       : true, // if curly braces around all blocks should be required
+            debug       : true, // if debugger statements should be allowed
+            devel       : true, // if logging globals should be predefined (console, alert, etc.)
+            dojo        : true, // if Dojo Toolkit globals should be predefined
+            eqeqeq      : true, // if === should be required
+            eqnull      : true, // if == null comparisons should be tolerated
+            es5         : true, // if ES5 syntax should be allowed
+            evil        : true, // if eval should be allowed
+            expr        : true, // if ExpressionStatement should be allowed as Programs
+            forin       : true, // if for in statements must filter
+            globalstrict: true, // if global "use strict"; should be allowed (also enables 'strict')
+            immed       : true, // if immediate invocations must be wrapped in parens
+            iterator    : true, // if the `__iterator__` property should be disallowed
+            jquery      : true, // if jQuery globals should be predefined
+            latedef     : true, // if the use before definition should not be tolerated
+            laxbreak    : true, // if line breaks should not be checked
+            loopfunc    : true, // if functions should be allowed to be defined within loops
+            mootools    : true, // if MooTools globals should be predefined
+            newcap      : true, // if constructor names must be capitalized
+            noarg       : true, // if arguments.caller and arguments.callee should be disallowed
+            node        : true, // if the Node.js environment globals should be predefined
+            noempty     : true, // if empty blocks should be disallowed
+            nonew       : true, // if using `new` for side-effects should be disallowed
+            nomen       : true, // if names should be checked
+            onevar      : true, // if only one var statement per function should be allowed
+            passfail    : true, // if the scan should stop on first error
+            plusplus    : true, // if increment/decrement should not be allowed
+            proto       : true, // if the `__proto__` property should be disallowed
+            prototypejs : true, // if Prototype and Scriptaculous globals should be predefined
+            regexdash   : true, // if unescaped last dash (-) inside brackets should be tolerated
+            regexp      : true, // if the . should not be allowed in regexp literals
+            rhino       : true, // if the Rhino environment globals should be predefined
+            undef       : true, // if variables should be declared before used
+            scripturl   : true, // if script-targeted URLs should be tolerated
+            shadow      : true, // if variable shadowing should be tolerated
+            strict      : true, // require the "use strict"; pragma
+            sub         : true, // if all forms of subscript notation are tolerated
+            supernew    : true, // if `new function () { ... };` and `new Object;`
+                                // should be tolerated
+            trailing    : true, // if trailing whitespace rules apply
+            white       : true, // if strict whitespace rules apply
+            wsh         : true  // if the Windows Scripting Host environment globals should
+                                // be predefined
+        },
+
+// browser contains a set of global names which are commonly provided by a
+// web browser environment.
+
+        browser = {
+            ArrayBuffer     : false,
+            ArrayBufferView : false,
+            addEventListener: false,
+            applicationCache: false,
+            blur            : false,
+            clearInterval   : false,
+            clearTimeout    : false,
+            close           : false,
+            closed          : false,
+            DataView        : false,
+            defaultStatus   : false,
+            document        : false,
+            event           : false,
+            FileReader      : false,
+            Float32Array    : false,
+            Float64Array    : false,
+            focus           : false,
+            frames          : false,
+            getComputedStyle: false,
+            HTMLElement     : false,
+            history         : false,
+            Int16Array      : false,
+            Int32Array      : false,
+            Int8Array       : false,
+            Image           : false,
+            length          : false,
+            localStorage    : false,
+            location        : false,
+            moveBy          : false,
+            moveTo          : false,
+            name            : false,
+            navigator       : false,
+            onbeforeunload  : true,
+            onblur          : true,
+            onerror         : true,
+            onfocus         : true,
+            onload          : true,
+            onresize        : true,
+            onunload        : true,
+            open            : false,
+            openDatabase    : false,
+            opener          : false,
+            Option          : false,
+            parent          : false,
+            print           : false,
+            removeEventListener: false,
+            resizeBy        : false,
+            resizeTo        : false,
+            screen          : false,
+            scroll          : false,
+            scrollBy        : false,
+            scrollTo        : false,
+            setInterval     : false,
+            setTimeout      : false,
+            status          : false,
+            top             : false,
+            Uint16Array     : false,
+            Uint32Array     : false,
+            Uint8Array      : false,
+            WebSocket       : false,
+            window          : false,
+            Worker          : false,
+            XMLHttpRequest  : false,
+            XPathEvaluator  : false,
+            XPathException  : false,
+            XPathExpression : false,
+            XPathNamespace  : false,
+            XPathNSResolver : false,
+            XPathResult     : false
+        },
+
+        couch = {
+            "require" : false,
+            respond   : false,
+            getRow    : false,
+            emit      : false,
+            send      : false,
+            start     : false,
+            sum       : false,
+            log       : false,
+            exports   : false,
+            module    : false
+        },
+
+        devel = {
+            alert   : false,
+            confirm : false,
+            console : false,
+            Debug   : false,
+            opera   : false,
+            prompt  : false
+        },
+
+        dojo = {
+            dojo      : false,
+            dijit     : false,
+            dojox     : false,
+            define    : false,
+            "require" : false
+        },
+
+        escapes = {
+            '\b': '\\b',
+            '\t': '\\t',
+            '\n': '\\n',
+            '\f': '\\f',
+            '\r': '\\r',
+            '"' : '\\"',
+            '/' : '\\/',
+            '\\': '\\\\'
+        },
+
+        funct,          // The current function
+
+        functionicity = [
+            'closure', 'exception', 'global', 'label',
+            'outer', 'unused', 'var'
+        ],
+
+        functions,      // All of the functions
+
+        global,         // The global scope
+        implied,        // Implied globals
+        inblock,
+        indent,
+        jsonmode,
+
+        jquery = {
+            '$'    : false,
+            jQuery : false
+        },
+
+        lines,
+        lookahead,
+        member,
+        membersOnly,
+
+        mootools = {
+            '$'             : false,
+            '$$'            : false,
+            Assets          : false,
+            Browser         : false,
+            Chain           : false,
+            Class           : false,
+            Color           : false,
+            Cookie          : false,
+            Core            : false,
+            Document        : false,
+            DomReady        : false,
+            DOMReady        : false,
+            Drag            : false,
+            Element         : false,
+            Elements        : false,
+            Event           : false,
+            Events          : false,
+            Fx              : false,
+            Group           : false,
+            Hash            : false,
+            HtmlTable       : false,
+            Iframe          : false,
+            IframeShim      : false,
+            InputValidator  : false,
+            instanceOf      : false,
+            Keyboard        : false,
+            Locale          : false,
+            Mask            : false,
+            MooTools        : false,
+            Native          : false,
+            Options         : false,
+            OverText        : false,
+            Request         : false,
+            Scroller        : false,
+            Slick           : false,
+            Slider          : false,
+            Sortables       : false,
+            Spinner         : false,
+            Swiff           : false,
+            Tips            : false,
+            Type            : false,
+            typeOf          : false,
+            URI             : false,
+            Window          : false
+        },
+
+        nexttoken,
+
+        node = {
+            __filename  : false,
+            __dirname   : false,
+            exports     : false,
+            Buffer      : false,
+            GLOBAL      : false,
+            global      : false,
+            module      : false,
+            process     : false,
+            require     : false
+        },
+
+        noreach,
+        option,
+        predefined,     // Global variables defined by option
+        prereg,
+        prevtoken,
+
+        prototypejs = {
+            '$'               : false,
+            '$$'              : false,
+            '$A'              : false,
+            '$F'              : false,
+            '$H'              : false,
+            '$R'              : false,
+            '$break'          : false,
+            '$continue'       : false,
+            '$w'              : false,
+            Abstract          : false,
+            Ajax              : false,
+            Class             : false,
+            Enumerable        : false,
+            Element           : false,
+            Event             : false,
+            Field             : false,
+            Form              : false,
+            Hash              : false,
+            Insertion         : false,
+            ObjectRange       : false,
+            PeriodicalExecuter: false,
+            Position          : false,
+            Prototype         : false,
+            Selector          : false,
+            Template          : false,
+            Toggle            : false,
+            Try               : false,
+            Autocompleter     : false,
+            Builder           : false,
+            Control           : false,
+            Draggable         : false,
+            Draggables        : false,
+            Droppables        : false,
+            Effect            : false,
+            Sortable          : false,
+            SortableObserver  : false,
+            Sound             : false,
+            Scriptaculous     : false
+        },
+
+        rhino = {
+            defineClass : false,
+            deserialize : false,
+            gc          : false,
+            help        : false,
+            load        : false,
+            loadClass   : false,
+            print       : false,
+            quit        : false,
+            readFile    : false,
+            readUrl     : false,
+            runCommand  : false,
+            seal        : false,
+            serialize   : false,
+            spawn       : false,
+            sync        : false,
+            toint32     : false,
+            version     : false
+        },
+
+        scope,      // The current scope
+        src,
+        stack,
+
+// standard contains the global names that are provided by the
+// ECMAScript standard.
+
+        standard = {
+            Array               : false,
+            Boolean             : false,
+            Date                : false,
+            decodeURI           : false,
+            decodeURIComponent  : false,
+            encodeURI           : false,
+            encodeURIComponent  : false,
+            Error               : false,
+            'eval'              : false,
+            EvalError           : false,
+            Function            : false,
+            hasOwnProperty      : false,
+            isFinite            : false,
+            isNaN               : false,
+            JSON                : false,
+            Math                : false,
+            Number              : false,
+            Object              : false,
+            parseInt            : false,
+            parseFloat          : false,
+            RangeError          : false,
+            ReferenceError      : false,
+            RegExp              : false,
+            String              : false,
+            SyntaxError         : false,
+            TypeError           : false,
+            URIError            : false
+        },
+
+        standard_member = {
+            E                   : true,
+            LN2                 : true,
+            LN10                : true,
+            LOG2E               : true,
+            LOG10E              : true,
+            MAX_VALUE           : true,
+            MIN_VALUE           : true,
+            NEGATIVE_INFINITY   : true,
+            PI                  : true,
+            POSITIVE_INFINITY   : true,
+            SQRT1_2             : true,
+            SQRT2               : true
+        },
+
+        strict_mode,
+        syntax = {},
+        tab,
+        token,
+        urls,
+        warnings,
+
+        wsh = {
+            ActiveXObject             : true,
+            Enumerator                : true,
+            GetObject                 : true,
+            ScriptEngine              : true,
+            ScriptEngineBuildVersion  : true,
+            ScriptEngineMajorVersion  : true,
+            ScriptEngineMinorVersion  : true,
+            VBArray                   : true,
+            WSH                       : true,
+            WScript                   : true
+        };
+
+        // Regular expressions. Some of these are stupidly long.
+        var ax, cx, tx, nx, nxg, lx, ix, jx, ft;
+        (function () {
+            /*jshint maxlen:300 */
+
+            // unsafe comment or string
+            ax = /@cc|<\/?|script|\]\s*\]|<\s*!|&lt/i;
+
+            // unsafe characters that are silently deleted by one or more browsers
+            cx = /[\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/;
+
+            // token
+            tx = /^\s*([(){}\[.,:;'"~\?\]#@]|==?=?|\/(\*(jshint|jslint|members?|global)?|=|\/)?|\*[\/=]?|\+(?:=|\++)?|-(?:=|-+)?|%=?|&[&=]?|\|[|=]?|>>?>?=?|<([\/=!]|\!(\[|--)?|<=?)?|\^=?|\!=?=?|[a-zA-Z_$][a-zA-Z0-9_$]*|[0-9]+([xX][0-9a-fA-F]+|\.[0-9]*)?([eE][+\-]?[0-9]+)?)/;
+
+            // characters in strings that need escapement
+            nx = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/;
+            nxg = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+
+            // star slash
+            lx = /\*\/|\/\*/;
+
+            // identifier
+            ix = /^([a-zA-Z_$][a-zA-Z0-9_$]*)$/;
+
+            // javascript url
+            jx = /^(?:javascript|jscript|ecmascript|vbscript|mocha|livescript)\s*:/i;
+
+            // catches /* falls through */ comments
+            ft = /^\s*\/\*\s*falls\sthrough\s*\*\/\s*$/;
+        }());
+
+    function F() {}     // Used by Object.create
+
+    function is_own(object, name) {
+
+// The object.hasOwnProperty method fails when the property under consideration
+// is named 'hasOwnProperty'. So we have to use this more convoluted form.
+
+        return Object.prototype.hasOwnProperty.call(object, name);
+    }
+
+// Provide critical ES5 functions to ES3.
+
+    if (typeof Array.isArray !== 'function') {
+        Array.isArray = function (o) {
+            return Object.prototype.toString.apply(o) === '[object Array]';
+        };
+    }
+
+    if (typeof Object.create !== 'function') {
+        Object.create = function (o) {
+            F.prototype = o;
+            return new F();
+        };
+    }
+
+    if (typeof Object.keys !== 'function') {
+        Object.keys = function (o) {
+            var a = [], k;
+            for (k in o) {
+                if (is_own(o, k)) {
+                    a.push(k);
+                }
+            }
+            return a;
+        };
+    }
+
+// Non standard methods
+
+    if (typeof String.prototype.entityify !== 'function') {
+        String.prototype.entityify = function () {
+            return this
+                .replace(/&/g, '&amp;')
+                .replace(/</g, '&lt;')
+                .replace(/>/g, '&gt;');
+        };
+    }
+
+    if (typeof String.prototype.isAlpha !== 'function') {
+        String.prototype.isAlpha = function () {
+            return (this >= 'a' && this <= 'z\uffff') ||
+                (this >= 'A' && this <= 'Z\uffff');
+        };
+    }
+
+    if (typeof String.prototype.isDigit !== 'function') {
+        String.prototype.isDigit = function () {
+            return (this >= '0' && this <= '9');
+        };
+    }
+
+    if (typeof String.prototype.supplant !== 'function') {
+        String.prototype.supplant = function (o) {
+            return this.replace(/\{([^{}]*)\}/g, function (a, b) {
+                var r = o[b];
+                return typeof r === 'string' || typeof r === 'number' ? r : a;
+            });
+        };
+    }
+
+    if (typeof String.prototype.name !== 'function') {
+        String.prototype.name = function () {
+
+// If the string looks like an identifier, then we can return it as is.
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can simply slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe
+// sequences.
+
+            if (ix.test(this)) {
+                return this;
+            }
+            if (nx.test(this)) {
+                return '"' + this.replace(nxg, function (a) {
+                    var c = escapes[a];
+                    if (c) {
+                        return c;
+                    }
+                    return '\\u' + ('0000' + a.charCodeAt().toString(16)).slice(-4);
+                }) + '"';
+            }
+            return '"' + this + '"';
+        };
+    }
+
+
+    function combine(t, o) {
+        var n;
+        for (n in o) {
+            if (is_own(o, n)) {
+                t[n] = o[n];
+            }
+        }
+    }
+
+    function assume() {
+        if (option.couch)
+            combine(predefined, couch);
+
+        if (option.rhino)
+            combine(predefined, rhino);
+
+        if (option.prototypejs)
+            combine(predefined, prototypejs);
+
+        if (option.node)
+            combine(predefined, node);
+
+        if (option.devel)
+            combine(predefined, devel);
+
+        if (option.dojo)
+            combine(predefined, dojo);
+
+        if (option.browser)
+            combine(predefined, browser);
+
+        if (option.jquery)
+            combine(predefined, jquery);
+
+        if (option.mootools)
+            combine(predefined, mootools);
+
+        if (option.wsh)
+            combine(predefined, wsh);
+
+        if (option.globalstrict && option.strict !== false)
+            option.strict = true;
+    }
+
+
+// Produce an error warning.
+
+    function quit(message, line, chr) {
+        var percentage = Math.floor((line / lines.length) * 100);
+
+        throw {
+            name: 'JSHintError',
+            line: line,
+            character: chr,
+            message: message + " (" + percentage + "% scanned)."
+        };
+    }
+
+    function warning(m, t, a, b, c, d) {
+        var ch, l, w;
+        t = t || nexttoken;
+        if (t.id === '(end)') {  // `~
+            t = token;
+        }
+        l = t.line || 0;
+        ch = t.from || 0;
+        w = {
+            id: '(error)',
+            raw: m,
+            evidence: lines[l - 1] || '',
+            line: l,
+            character: ch,
+            a: a,
+            b: b,
+            c: c,
+            d: d
+        };
+        w.reason = m.supplant(w);
+        JSHINT.errors.push(w);
+        if (option.passfail) {
+            quit('Stopping. ', l, ch);
+        }
+        warnings += 1;
+        if (warnings >= option.maxerr) {
+            quit("Too many errors.", l, ch);
+        }
+        return w;
+    }
+
+    function warningAt(m, l, ch, a, b, c, d) {
+        return warning(m, {
+            line: l,
+            from: ch
+        }, a, b, c, d);
+    }
+
+    function error(m, t, a, b, c, d) {
+        var w = warning(m, t, a, b, c, d);
+        quit("Stopping, unable to continue.", w.line, w.character);
+    }
+
+    function errorAt(m, l, ch, a, b, c, d) {
+        return error(m, {
+            line: l,
+            from: ch
+        }, a, b, c, d);
+    }
+
+
+
+// lexical analysis and token construction
+
+    var lex = (function lex() {
+        var character, from, line, s;
+
+// Private lex methods
+
+        function nextLine() {
+            var at,
+                tw; // trailing whitespace check
+
+            if (line >= lines.length)
+                return false;
+
+            character = 1;
+            s = lines[line];
+            line += 1;
+            at = s.search(/ \t/);
+
+            if (at >= 0)
+                warningAt("Mixed spaces and tabs.", line, at + 1);
+
+            s = s.replace(/\t/g, tab);
+            at = s.search(cx);
+
+            if (at >= 0)
+                warningAt("Unsafe character.", line, at);
+
+            if (option.maxlen && option.maxlen < s.length)
+                warningAt("Line too long.", line, s.length);
+
+            // Check for trailing whitespaces
+            tw = s.search(/\s+$/);
+            if (option.trailing && ~tw && !~s.search(/^\s+$/))
+                warningAt("Trailing whitespace.", line, tw);
+
+            return true;
+        }
+
+// Produce a token object.  The token inherits from a syntax symbol.
+
+        function it(type, value) {
+            var i, t;
+            if (type === '(color)' || type === '(range)') {
+                t = {type: type};
+            } else if (type === '(punctuator)' ||
+                    (type === '(identifier)' && is_own(syntax, value))) {
+                t = syntax[value] || syntax['(error)'];
+            } else {
+                t = syntax[type];
+            }
+            t = Object.create(t);
+            if (type === '(string)' || type === '(range)') {
+                if (!option.scripturl && jx.test(value)) {
+                    warningAt("Script URL.", line, from);
+                }
+            }
+            if (type === '(identifier)') {
+                t.identifier = true;
+                if (value === '__proto__' && !option.proto) {
+                    warningAt("The '{a}' property is deprecated.",
+                        line, from, value);
+                } else if (value === '__iterator__' && !option.iterator) {
+                    warningAt("'{a}' is only available in JavaScript 1.7.",
+                        line, from, value);
+                } else if (option.nomen && (value.charAt(0) === '_' ||
+                         value.charAt(value.length - 1) === '_')) {
+                    warningAt("Unexpected {a} in '{b}'.", line, from,
+                        "dangling '_'", value);
+                }
+            }
+            t.value = value;
+            t.line = line;
+            t.character = character;
+            t.from = from;
+            i = t.id;
+            if (i !== '(endline)') {
+                prereg = i &&
+                    (('(,=:[!&|?{};'.indexOf(i.charAt(i.length - 1)) >= 0) ||
+                    i === 'return');
+            }
+            return t;
+        }
+
+// Public lex methods
+
+        return {
+            init: function (source) {
+                if (typeof source === 'string') {
+                    lines = source
+                        .replace(/\r\n/g, '\n')
+                        .replace(/\r/g, '\n')
+                        .split('\n');
+                } else {
+                    lines = source;
+                }
+
+                // If the first line is a shebang (#!), make it a blank and move on.
+                // Shebangs are used by Node scripts.
+                if (lines[0] && lines[0].substr(0, 2) == '#!')
+                    lines[0] = '';
+
+                line = 0;
+                nextLine();
+                from = 1;
+            },
+
+            range: function (begin, end) {
+                var c, value = '';
+                from = character;
+                if (s.charAt(0) !== begin) {
+                    errorAt("Expected '{a}' and instead saw '{b}'.",
+                            line, character, begin, s.charAt(0));
+                }
+                for (;;) {
+                    s = s.slice(1);
+                    character += 1;
+                    c = s.charAt(0);
+                    switch (c) {
+                    case '':
+                        errorAt("Missing '{a}'.", line, character, c);
+                        break;
+                    case end:
+                        s = s.slice(1);
+                        character += 1;
+                        return it('(range)', value);
+                    case '\\':
+                        warningAt("Unexpected '{a}'.", line, character, c);
+                    }
+                    value += c;
+                }
+
+            },
+
+// token -- this is called by advance to get the next token.
+
+            token: function () {
+                var b, c, captures, d, depth, high, i, l, low, q, t;
+
+                function match(x) {
+                    var r = x.exec(s), r1;
+                    if (r) {
+                        l = r[0].length;
+                        r1 = r[1];
+                        c = r1.charAt(0);
+                        s = s.substr(l);
+                        from = character + l - r1.length;
+                        character += l;
+                        return r1;
+                    }
+                }
+
+                function string(x) {
+                    var c, j, r = '';
+
+                    if (jsonmode && x !== '"') {
+                        warningAt("Strings must use doublequote.",
+                                line, character);
+                    }
+
+                    function esc(n) {
+                        var i = parseInt(s.substr(j + 1, n), 16);
+                        j += n;
+                        if (i >= 32 && i <= 126 &&
+                                i !== 34 && i !== 92 && i !== 39) {
+                            warningAt("Unnecessary escapement.", line, character);
+                        }
+                        character += n;
+                        c = String.fromCharCode(i);
+                    }
+                    j = 0;
+                    for (;;) {
+                        while (j >= s.length) {
+                            j = 0;
+                            if (!nextLine()) {
+                                errorAt("Unclosed string.", line, from);
+                            }
+                        }
+                        c = s.charAt(j);
+                        if (c === x) {
+                            character += 1;
+                            s = s.substr(j + 1);
+                            return it('(string)', r, x);
+                        }
+                        if (c < ' ') {
+                            if (c === '\n' || c === '\r') {
+                                break;
+                            }
+                            warningAt("Control character in string: {a}.",
+                                    line, character + j, s.slice(0, j));
+                        } else if (c === '\\') {
+                            j += 1;
+                            character += 1;
+                            c = s.charAt(j);
+                            switch (c) {
+                            case '\\':
+                            case '"':
+                            case '/':
+                                break;
+                            case '\'':
+                                if (jsonmode) {
+                                    warningAt("Avoid \\'.", line, character);
+                                }
+                                break;
+                            case 'b':
+                                c = '\b';
+                                break;
+                            case 'f':
+                                c = '\f';
+                                break;
+                            case 'n':
+                                c = '\n';
+                                break;
+                            case 'r':
+                                c = '\r';
+                                break;
+                            case 't':
+                                c = '\t';
+                                break;
+                            case 'u':
+                                esc(4);
+                                break;
+                            case 'v':
+                                if (jsonmode) {
+                                    warningAt("Avoid \\v.", line, character);
+                                }
+                                c = '\v';
+                                break;
+                            case 'x':
+                                if (jsonmode) {
+                                    warningAt("Avoid \\x-.", line, character);
+                                }
+                                esc(2);
+                                break;
+                            default:
+                                warningAt("Bad escapement.", line, character);
+                            }
+                        }
+                        r += c;
+                        character += 1;
+                        j += 1;
+                    }
+                }
+
+                for (;;) {
+                    if (!s) {
+                        return it(nextLine() ? '(endline)' : '(end)', '');
+                    }
+                    t = match(tx);
+                    if (!t) {
+                        t = '';
+                        c = '';
+                        while (s && s < '!') {
+                            s = s.substr(1);
+                        }
+                        if (s) {
+                            errorAt("Unexpected '{a}'.", line, character, s.substr(0, 1));
+                        }
+                    } else {
+
+    //      identifier
+
+                        if (c.isAlpha() || c === '_' || c === '$') {
+                            return it('(identifier)', t);
+                        }
+
+    //      number
+
+                        if (c.isDigit()) {
+                            if (!isFinite(Number(t))) {
+                                warningAt("Bad number '{a}'.",
+                                    line, character, t);
+                            }
+                            if (s.substr(0, 1).isAlpha()) {
+                                warningAt("Missing space after '{a}'.",
+                                        line, character, t);
+                            }
+                            if (c === '0') {
+                                d = t.substr(1, 1);
+                                if (d.isDigit()) {
+                                    if (token.id !== '.') {
+                                        warningAt("Don't use extra leading zeros '{a}'.",
+                                            line, character, t);
+                                    }
+                                } else if (jsonmode && (d === 'x' || d === 'X')) {
+                                    warningAt("Avoid 0x-. '{a}'.",
+                                            line, character, t);
+                                }
+                            }
+                            if (t.substr(t.length - 1) === '.') {
+                                warningAt(
+"A trailing decimal point can be confused with a dot '{a}'.", line, character, t);
+                            }
+                            return it('(number)', t);
+                        }
+                        switch (t) {
+
+    //      string
+
+                        case '"':
+                        case "'":
+                            return string(t);
+
+    //      // comment
+
+                        case '//':
+                            if (src) {
+                                warningAt("Unexpected comment.", line, character);
+                            }
+                            s = '';
+                            token.comment = true;
+                            break;
+
+    //      /* comment
+
+                        case '/*':
+                            if (src) {
+                                warningAt("Unexpected comment.", line, character);
+                            }
+                            for (;;) {
+                                i = s.search(lx);
+                                if (i >= 0) {
+                                    break;
+                                }
+                                if (!nextLine()) {
+                                    errorAt("Unclosed comment.", line, character);
+                                }
+                            }
+                            character += i + 2;
+                            if (s.substr(i, 1) === '/') {
+                                errorAt("Nested comment.", line, character);
+                            }
+                            s = s.substr(i + 2);
+                            token.comment = true;
+                            break;
+
+    //      /*members /*jshint /*global
+
+                        case '/*members':
+                        case '/*member':
+                        case '/*jshint':
+                        case '/*jslint':
+                        case '/*global':
+                        case '*/':
+                            return {
+                                value: t,
+                                type: 'special',
+                                line: line,
+                                character: character,
+                                from: from
+                            };
+
+                        case '':
+                            break;
+    //      /
+                        case '/':
+                            if (token.id === '/=') {
+                                errorAt(
+"A regular expression literal can be confused with '/='.", line, from);
+                            }
+                            if (prereg) {
+                                depth = 0;
+                                captures = 0;
+                                l = 0;
+                                for (;;) {
+                                    b = true;
+                                    c = s.charAt(l);
+                                    l += 1;
+                                    switch (c) {
+                                    case '':
+                                        errorAt("Unclosed regular expression.",
+                                                line, from);
+                                        return;
+                                    case '/':
+                                        if (depth > 0) {
+                                            warningAt("Unescaped '{a}'.",
+                                                    line, from + l, '/');
+                                        }
+                                        c = s.substr(0, l - 1);
+                                        q = {
+                                            g: true,
+                                            i: true,
+                                            m: true
+                                        };
+                                        while (q[s.charAt(l)] === true) {
+                                            q[s.charAt(l)] = false;
+                                            l += 1;
+                                        }
+                                        character += l;
+                                        s = s.substr(l);
+                                        q = s.charAt(0);
+                                        if (q === '/' || q === '*') {
+                                            errorAt("Confusing regular expression.",
+                                                    line, from);
+                                        }
+                                        return it('(regexp)', c);
+                                    case '\\':
+                                        c = s.charAt(l);
+                                        if (c < ' ') {
+                                            warningAt(
+"Unexpected control character in regular expression.", line, from + l);
+                                        } else if (c === '<') {
+                                            warningAt(
+"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
+                                        }
+                                        l += 1;
+                                        break;
+                                    case '(':
+                                        depth += 1;
+                                        b = false;
+                                        if (s.charAt(l) === '?') {
+                                            l += 1;
+                                            switch (s.charAt(l)) {
+                                            case ':':
+                                            case '=':
+                                            case '!':
+                                                l += 1;
+                                                break;
+                                            default:
+                                                warningAt(
+"Expected '{a}' and instead saw '{b}'.", line, from + l, ':', s.charAt(l));
+                                            }
+                                        } else {
+                                            captures += 1;
+                                        }
+                                        break;
+                                    case '|':
+                                        b = false;
+                                        break;
+                                    case ')':
+                                        if (depth === 0) {
+                                            warningAt("Unescaped '{a}'.",
+                                                    line, from + l, ')');
+                                        } else {
+                                            depth -= 1;
+                                        }
+                                        break;
+                                    case ' ':
+                                        q = 1;
+                                        while (s.charAt(l) === ' ') {
+                                            l += 1;
+                                            q += 1;
+                                        }
+                                        if (q > 1) {
+                                            warningAt(
+"Spaces are hard to count. Use {{a}}.", line, from + l, q);
+                                        }
+                                        break;
+                                    case '[':
+                                        c = s.charAt(l);
+                                        if (c === '^') {
+                                            l += 1;
+                                            if (option.regexp) {
+                                                warningAt("Insecure '{a}'.",
+                                                        line, from + l, c);
+                                            } else if (s.charAt(l) === ']') {
+                                                errorAt("Unescaped '{a}'.",
+                                                    line, from + l, '^');
+                                            }
+                                        }
+                                        q = false;
+                                        if (c === ']') {
+                                            warningAt("Empty class.", line,
+                                                    from + l - 1);
+                                            q = true;
+                                        }
+klass:                                  do {
+                                            c = s.charAt(l);
+                                            l += 1;
+                                            switch (c) {
+                                            case '[':
+                                            case '^':
+                                                warningAt("Unescaped '{a}'.",
+                                                        line, from + l, c);
+                                                q = true;
+                                                break;
+                                            case '-':
+                                                if (q) {
+                                                    q = false;
+                                                } else {
+                                                    warningAt("Unescaped '{a}'.",
+                                                            line, from + l, '-');
+                                                    q = true;
+                                                }
+                                                break;
+                                            case ']':
+                                                if (!q && !option.regexdash) {
+                                                    warningAt("Unescaped '{a}'.",
+                                                            line, from + l - 1, '-');
+                                                }
+                                                break klass;
+                                            case '\\':
+                                                c = s.charAt(l);
+                                                if (c < ' ') {
+                                                    warningAt(
+"Unexpected control character in regular expression.", line, from + l);
+                                                } else if (c === '<') {
+                                                    warningAt(
+"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
+                                                }
+                                                l += 1;
+                                                q = true;
+                                                break;
+                                            case '/':
+                                                warningAt("Unescaped '{a}'.",
+                                                        line, from + l - 1, '/');
+                                                q = true;
+                                                break;
+                                            case '<':
+                                                q = true;
+                                                break;
+                                            default:
+                                                q = true;
+                                            }
+                                        } while (c);
+                                        break;
+                                    case '.':
+                                        if (option.regexp) {
+                                            warningAt("Insecure '{a}'.", line,
+                                                    from + l, c);
+                                        }
+                                        break;
+                                    case ']':
+                                    case '?':
+                                    case '{':
+                                    case '}':
+                                    case '+':
+                                    case '*':
+                                        warningAt("Unescaped '{a}'.", line,
+                                                from + l, c);
+                                    }
+                                    if (b) {
+                                        switch (s.charAt(l)) {
+                                        case '?':
+                                        case '+':
+                                        case '*':
+                                            l += 1;
+                                            if (s.charAt(l) === '?') {
+                                                l += 1;
+                                            }
+                                            break;
+                                        case '{':
+                                            l += 1;
+                                            c = s.charAt(l);
+                                            if (c < '0' || c > '9') {
+                                                warningAt(
+"Expected a number and instead saw '{a}'.", line, from + l, c);
+                                            }
+                                            l += 1;
+                                            low = +c;
+                                            for (;;) {
+                                                c = s.charAt(l);
+                                                if (c < '0' || c > '9') {
+                                                    break;
+                                                }
+                                                l += 1;
+                                                low = +c + (low * 10);
+                                            }
+                                            high = low;
+                                            if (c === ',') {
+                                                l += 1;
+                                                high = Infinity;
+                                                c = s.charAt(l);
+                                                if (c >= '0' && c <= '9') {
+                                                    l += 1;
+                                                    high = +c;
+                                                    for (;;) {
+                                                        c = s.charAt(l);
+                                                        if (c < '0' || c > '9') {
+                                                            break;
+                                                        }
+                                                        l += 1;
+                                                        high = +c + (high * 10);
+                                                    }
+                                                }
+                                            }
+                                            if (s.charAt(l) !== '}') {
+                                                warningAt(
+"Expected '{a}' and instead saw '{b}'.", line, from + l, '}', c);
+                                            } else {
+                                                l += 1;
+                                            }
+                                            if (s.charAt(l) === '?') {
+                                                l += 1;
+                                            }
+                                            if (low > high) {
+                                                warningAt(
+"'{a}' should not be greater than '{b}'.", line, from + l, low, high);
+                                            }
+                                        }
+                                    }
+                                }
+                                c = s.substr(0, l - 1);
+                                character += l;
+                                s = s.substr(l);
+                                return it('(regexp)', c);
+                            }
+                            return it('(punctuator)', t);
+
+    //      punctuator
+
+                        case '#':
+                            return it('(punctuator)', t);
+                        default:
+                            return it('(punctuator)', t);
+                        }
+                    }
+                }
+            }
+        };
+    }());
+
+
+    function addlabel(t, type) {
+
+        if (t === 'hasOwnProperty') {
+            warning("'hasOwnProperty' is a really bad name.");
+        }
+
+// Define t in the current function in the current scope.
+
+        if (is_own(funct, t) && !funct['(global)']) {
+            if (funct[t] === true) {
+                if (option.latedef)
+                    warning("'{a}' was used before it was defined.", nexttoken, t);
+            } else {
+                if (!option.shadow)
+                    warning("'{a}' is already defined.", nexttoken, t);
+            }
+        }
+
+        funct[t] = type;
+        if (funct['(global)']) {
+            global[t] = funct;
+            if (is_own(implied, t)) {
+                if (option.latedef)
+                    warning("'{a}' was used before it was defined.", nexttoken, t);
+                delete implied[t];
+            }
+        } else {
+            scope[t] = funct;
+        }
+    }
+
+
+    function doOption() {
+        var b, obj, filter, o = nexttoken.value, t, v;
+        switch (o) {
+        case '*/':
+            error("Unbegun comment.");
+            break;
+        case '/*members':
+        case '/*member':
+            o = '/*members';
+            if (!membersOnly) {
+                membersOnly = {};
+            }
+            obj = membersOnly;
+            break;
+        case '/*jshint':
+        case '/*jslint':
+            obj = option;
+            filter = boolOptions;
+            break;
+        case '/*global':
+            obj = predefined;
+            break;
+        default:
+            error("What?");
+        }
+        t = lex.token();
+loop:   for (;;) {
+            for (;;) {
+                if (t.type === 'special' && t.value === '*/') {
+                    break loop;
+                }
+                if (t.id !== '(endline)' && t.id !== ',') {
+                    break;
+                }
+                t = lex.token();
+            }
+            if (t.type !== '(string)' && t.type !== '(identifier)' &&
+                    o !== '/*members') {
+                error("Bad option.", t);
+            }
+            v = lex.token();
+            if (v.id === ':') {
+                v = lex.token();
+                if (obj === membersOnly) {
+                    error("Expected '{a}' and instead saw '{b}'.",
+                            t, '*/', ':');
+                }
+                if (t.value === 'indent' && (o === '/*jshint' || o === '/*jslint')) {
+                    b = +v.value;
+                    if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
+                            Math.floor(b) !== b) {
+                        error("Expected a small integer and instead saw '{a}'.",
+                                v, v.value);
+                    }
+                    obj.white = true;
+                    obj.indent = b;
+                } else if (t.value === 'maxerr' && (o === '/*jshint' || o === '/*jslint')) {
+                    b = +v.value;
+                    if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
+                            Math.floor(b) !== b) {
+                        error("Expected a small integer and instead saw '{a}'.",
+                                v, v.value);
+                    }
+                    obj.maxerr = b;
+                } else if (t.value === 'maxlen' && (o === '/*jshint' || o === '/*jslint')) {
+                    b = +v.value;
+                    if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
+                            Math.floor(b) !== b) {
+                        error("Expected a small integer and instead saw '{a}'.",
+                                v, v.value);
+                    }
+                    obj.maxlen = b;
+                } else if (v.value === 'true') {
+                    obj[t.value] = true;
+                } else if (v.value === 'false') {
+                    obj[t.value] = false;
+                } else {
+                    error("Bad option value.", v);
+                }
+                t = lex.token();
+            } else {
+                if (o === '/*jshint' || o === '/*jslint') {
+                    error("Missing option value.", t);
+                }
+                obj[t.value] = false;
+                t = v;
+            }
+        }
+        if (filter) {
+            assume();
+        }
+    }
+
+
+// We need a peek function. If it has an argument, it peeks that much farther
+// ahead. It is used to distinguish
+//     for ( var i in ...
+// from
+//     for ( var i = ...
+
+    function peek(p) {
+        var i = p || 0, j = 0, t;
+
+        while (j <= i) {
+            t = lookahead[j];
+            if (!t) {
+                t = lookahead[j] = lex.token();
+            }
+            j += 1;
+        }
+        return t;
+    }
+
+
+
+// Produce the next token. It looks for programming errors.
+
+    function advance(id, t) {
+        switch (token.id) {
+        case '(number)':
+            if (nexttoken.id === '.') {
+                warning("A dot following a number can be confused with a decimal point.", token);
+            }
+            break;
+        case '-':
+            if (nexttoken.id === '-' || nexttoken.id === '--') {
+                warning("Confusing minusses.");
+            }
+            break;
+        case '+':
+            if (nexttoken.id === '+' || nexttoken.id === '++') {
+                warning("Confusing plusses.");
+            }
+            break;
+        }
+        if (token.type === '(string)' || token.identifier) {
+            anonname = token.value;
+        }
+
+        if (id && nexttoken.id !== id) {
+            if (t) {
+                if (nexttoken.id === '(end)') {
+                    warning("Unmatched '{a}'.", t, t.id);
+                } else {
+                    warning("Expected '{a}' to match '{b}' from line {c} and instead saw '{d}'.",
+                            nexttoken, id, t.id, t.line, nexttoken.value);
+                }
+            } else if (nexttoken.type !== '(identifier)' ||
+                            nexttoken.value !== id) {
+                warning("Expected '{a}' and instead saw '{b}'.",
+                        nexttoken, id, nexttoken.value);
+            }
+        }
+        prevtoken = token;
+        token = nexttoken;
+        for (;;) {
+            nexttoken = lookahead.shift() || lex.token();
+            if (nexttoken.id === '(end)' || nexttoken.id === '(error)') {
+                return;
+            }
+            if (nexttoken.type === 'special') {
+                doOption();
+            } else {
+                if (nexttoken.id !== '(endline)') {
+                    break;
+                }
+            }
+        }
+    }
+
+
+// This is the heart of JSHINT, the Pratt parser. In addition to parsing, it
+// is looking for ad hoc lint patterns. We add .fud to Pratt's model, which is
+// like .nud except that it is only used on the first token of a statement.
+// Having .fud makes it much easier to define statement-oriented languages like
+// JavaScript. I retained Pratt's nomenclature.
+
+// .nud     Null denotation
+// .fud     First null denotation
+// .led     Left denotation
+//  lbp     Left binding power
+//  rbp     Right binding power
+
+// They are elements of the parsing method called Top Down Operator Precedence.
+
+    function expression(rbp, initial) {
+        var left, isArray = false;
+
+        if (nexttoken.id === '(end)')
+            error("Unexpected early end of program.", token);
+
+        advance();
+        if (initial) {
+            anonname = 'anonymous';
+            funct['(verb)'] = token.value;
+        }
+        if (initial === true && token.fud) {
+            left = token.fud();
+        } else {
+            if (token.nud) {
+                left = token.nud();
+            } else {
+                if (nexttoken.type === '(number)' && token.id === '.') {
+                    warning("A leading decimal point can be confused with a dot: '.{a}'.",
+                            token, nexttoken.value);
+                    advance();
+                    return token;
+                } else {
+                    error("Expected an identifier and instead saw '{a}'.",
+                            token, token.id);
+                }
+            }
+            while (rbp < nexttoken.lbp) {
+                isArray = token.value == 'Array';
+                advance();
+                if (isArray && token.id == '(' && nexttoken.id == ')')
+                    warning("Use the array literal notation [].", token);
+                if (token.led) {
+                    left = token.led(left);
+                } else {
+                    error("Expected an operator and instead saw '{a}'.",
+                        token, token.id);
+                }
+            }
+        }
+        return left;
+    }
+
+
+// Functions for conformance of style.
+
+    function adjacent(left, right) {
+        left = left || token;
+        right = right || nexttoken;
+        if (option.white) {
+            if (left.character !== right.from && left.line === right.line) {
+                warning("Unexpected space after '{a}'.", right, left.value);
+            }
+        }
+    }
+
+    function nobreak(left, right) {
+        left = left || token;
+        right = right || nexttoken;
+        if (option.white && (left.character !== right.from || left.line !== right.line)) {
+            warning("Unexpected space before '{a}'.", right, right.value);
+        }
+    }
+
+    function nospace(left, right) {
+        left = left || token;
+        right = right || nexttoken;
+        if (option.white && !left.comment) {
+            if (left.line === right.line) {
+                adjacent(left, right);
+            }
+        }
+    }
+
+    function nonadjacent(left, right) {
+        if (option.white) {
+            left = left || token;
+            right = right || nexttoken;
+            if (left.line === right.line && left.character === right.from) {
+                warning("Missing space after '{a}'.",
+                        nexttoken, left.value);
+            }
+        }
+    }
+
+    function nobreaknonadjacent(left, right) {
+        left = left || token;
+        right = right || nexttoken;
+        if (!option.laxbreak && left.line !== right.line) {
+            warning("Bad line breaking before '{a}'.", right, right.id);
+        } else if (option.white) {
+            left = left || token;
+            right = right || nexttoken;
+            if (left.character === right.from) {
+                warning("Missing space after '{a}'.",
+                        nexttoken, left.value);
+            }
+        }
+    }
+
+    function indentation(bias) {
+        var i;
+        if (option.white && nexttoken.id !== '(end)') {
+            i = indent + (bias || 0);
+            if (nexttoken.from !== i) {
+                warning(
+"Expected '{a}' to have an indentation at {b} instead at {c}.",
+                        nexttoken, nexttoken.value, i, nexttoken.from);
+            }
+        }
+    }
+
+    function nolinebreak(t) {
+        t = t || token;
+        if (t.line !== nexttoken.line) {
+            warning("Line breaking error '{a}'.", t, t.value);
+        }
+    }
+
+
+    function comma() {
+        if (token.line !== nexttoken.line) {
+            if (!option.laxbreak) {
+                warning("Bad line breaking before '{a}'.", token, nexttoken.id);
+            }
+        } else if (token.character !== nexttoken.from && option.white) {
+            warning("Unexpected space after '{a}'.", nexttoken, token.value);
+        }
+        advance(',');
+        nonadjacent(token, nexttoken);
+    }
+
+
+// Functional constructors for making the symbols that will be inherited by
+// tokens.
+
+    function symbol(s, p) {
+        var x = syntax[s];
+        if (!x || typeof x !== 'object') {
+            syntax[s] = x = {
+                id: s,
+                lbp: p,
+                value: s
+            };
+        }
+        return x;
+    }
+
+
+    function delim(s) {
+        return symbol(s, 0);
+    }
+
+
+    function stmt(s, f) {
+        var x = delim(s);
+        x.identifier = x.reserved = true;
+        x.fud = f;
+        return x;
+    }
+
+
+    function blockstmt(s, f) {
+        var x = stmt(s, f);
+        x.block = true;
+        return x;
+    }
+
+
+    function reserveName(x) {
+        var c = x.id.charAt(0);
+        if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
+            x.identifier = x.reserved = true;
+        }
+        return x;
+    }
+
+
+    function prefix(s, f) {
+        var x = symbol(s, 150);
+        reserveName(x);
+        x.nud = (typeof f === 'function') ? f : function () {
+            this.right = expression(150);
+            this.arity = 'unary';
+            if (this.id === '++' || this.id === '--') {
+                if (option.plusplus) {
+                    warning("Unexpected use of '{a}'.", this, this.id);
+                } else if ((!this.right.identifier || this.right.reserved) &&
+                        this.right.id !== '.' && this.right.id !== '[') {
+                    warning("Bad operand.", this);
+                }
+            }
+            return this;
+        };
+        return x;
+    }
+
+
+    function type(s, f) {
+        var x = delim(s);
+        x.type = s;
+        x.nud = f;
+        return x;
+    }
+
+
+    function reserve(s, f) {
+        var x = type(s, f);
+        x.identifier = x.reserved = true;
+        return x;
+    }
+
+
+    function reservevar(s, v) {
+        return reserve(s, function () {
+            if (typeof v === 'function') {
+                v(this);
+            }
+            return this;
+        });
+    }
+
+
+    function infix(s, f, p, w) {
+        var x = symbol(s, p);
+        reserveName(x);
+        x.led = function (left) {
+            if (!w) {
+                nobreaknonadjacent(prevtoken, token);
+                nonadjacent(token, nexttoken);
+            }
+            if (typeof f === 'function') {
+                return f(left, this);
+            } else {
+                this.left = left;
+                this.right = expression(p);
+                return this;
+            }
+        };
+        return x;
+    }
+
+
+    function relation(s, f) {
+        var x = symbol(s, 100);
+        x.led = function (left) {
+            nobreaknonadjacent(prevtoken, token);
+            nonadjacent(token, nexttoken);
+            var right = expression(100);
+            if ((left && left.id === 'NaN') || (right && right.id === 'NaN')) {
+                warning("Use the isNaN function to compare with NaN.", this);
+            } else if (f) {
+                f.apply(this, [left, right]);
+            }
+            if (left.id === '!') {
+                warning("Confusing use of '{a}'.", left, '!');
+            }
+            if (right.id === '!') {
+                warning("Confusing use of '{a}'.", left, '!');
+            }
+            this.left = left;
+            this.right = right;
+            return this;
+        };
+        return x;
+    }
+
+
+    function isPoorRelation(node) {
+        return node &&
+              ((node.type === '(number)' && +node.value === 0) ||
+               (node.type === '(string)' && node.value === '') ||
+               (node.type === 'null' && !option.eqnull) ||
+                node.type === 'true' ||
+                node.type === 'false' ||
+                node.type === 'undefined');
+    }
+
+
+    function assignop(s, f) {
+        symbol(s, 20).exps = true;
+        return infix(s, function (left, that) {
+            var l;
+            that.left = left;
+            if (predefined[left.value] === false &&
+                    scope[left.value]['(global)'] === true) {
+                warning("Read only.", left);
+            } else if (left['function']) {
+                warning("'{a}' is a function.", left, left.value);
+            }
+            if (left) {
+                if (left.id === '.' || left.id === '[') {
+                    if (!left.left || left.left.value === 'arguments') {
+                        warning('Bad assignment.', that);
+                    }
+                    that.right = expression(19);
+                    return that;
+                } else if (left.identifier && !left.reserved) {
+                    if (funct[left.value] === 'exception') {
+                        warning("Do not assign to the exception parameter.", left);
+                    }
+                    that.right = expression(19);
+                    return that;
+                }
+                if (left === syntax['function']) {
+                    warning(
+"Expected an identifier in an assignment and instead saw a function invocation.",
+                                token);
+                }
+            }
+            error("Bad assignment.", that);
+        }, 20);
+    }
+
+
+    function bitwise(s, f, p) {
+        var x = symbol(s, p);
+        reserveName(x);
+        x.led = (typeof f === 'function') ? f : function (left) {
+            if (option.bitwise) {
+                warning("Unexpected use of '{a}'.", this, this.id);
+            }
+            this.left = left;
+            this.right = expression(p);
+            return this;
+        };
+        return x;
+    }
+
+
+    function bitwiseassignop(s) {
+        symbol(s, 20).exps = true;
+        return infix(s, function (left, that) {
+            if (option.bitwise) {
+                warning("Unexpected use of '{a}'.", that, that.id);
+            }
+            nonadjacent(prevtoken, token);
+            nonadjacent(token, nexttoken);
+            if (left) {
+                if (left.id === '.' || left.id === '[' ||
+                        (left.identifier && !left.reserved)) {
+                    expression(19);
+                    return that;
+                }
+                if (left === syntax['function']) {
+                    warning(
+"Expected an identifier in an assignment, and instead saw a function invocation.",
+                                token);
+                }
+                return that;
+            }
+            error("Bad assignment.", that);
+        }, 20);
+    }
+
+
+    function suffix(s, f) {
+        var x = symbol(s, 150);
+        x.led = function (left) {
+            if (option.plusplus) {
+                warning("Unexpected use of '{a}'.", this, this.id);
+            } else if ((!left.identifier || left.reserved) &&
+                    left.id !== '.' && left.id !== '[') {
+                warning("Bad operand.", this);
+            }
+            this.left = left;
+            return this;
+        };
+        return x;
+    }
+
+
+    // fnparam means that this identifier is being defined as a function
+    // argument (see identifier())
+    function optionalidentifier(fnparam) {
+        if (nexttoken.identifier) {
+            advance();
+            if (token.reserved && !option.es5) {
+                // `undefined` as a function param is a common pattern to protect
+                // against the case when somebody does `undefined = true` and
+                // help with minification. More info: https://gist.github.com/315916
+                if (!fnparam || token.value != 'undefined') {
+                    warning("Expected an identifier and instead saw '{a}' (a reserved word).",
+                            token, token.id);
+                }
+            }
+            return token.value;
+        }
+    }
+
+    // fnparam means that this identifier is being defined as a function
+    // argument
+    function identifier(fnparam) {
+        var i = optionalidentifier(fnparam);
+        if (i) {
+            return i;
+        }
+        if (token.id === 'function' && nexttoken.id === '(') {
+            warning("Missing name in function declaration.");
+        } else {
+            error("Expected an identifier and instead saw '{a}'.",
+                    nexttoken, nexttoken.value);
+        }
+    }
+
+
+    function reachable(s) {
+        var i = 0, t;
+        if (nexttoken.id !== ';' || noreach) {
+            return;
+        }
+        for (;;) {
+            t = peek(i);
+            if (t.reach) {
+                return;
+            }
+            if (t.id !== '(endline)') {
+                if (t.id === 'function') {
+                    warning(
+"Inner functions should be listed at the top of the outer function.", t);
+                    break;
+                }
+                warning("Unreachable '{a}' after '{b}'.", t, t.value, s);
+                break;
+            }
+            i += 1;
+        }
+    }
+
+
+    function statement(noindent) {
+        var i = indent, r, s = scope, t = nexttoken;
+
+// We don't like the empty statement.
+
+        if (t.id === ';') {
+            warning("Unnecessary semicolon.", t);
+            advance(';');
+            return;
+        }
+
+// Is this a labelled statement?
+
+        if (t.identifier && !t.reserved && peek().id === ':') {
+            advance();
+            advance(':');
+            scope = Object.create(s);
+            addlabel(t.value, 'label');
+            if (!nexttoken.labelled) {
+                warning("Label '{a}' on {b} statement.",
+                        nexttoken, t.value, nexttoken.value);
+            }
+            if (jx.test(t.value + ':')) {
+                warning("Label '{a}' looks like a javascript url.",
+                        t, t.value);
+            }
+            nexttoken.label = t.value;
+            t = nexttoken;
+        }
+
+// Parse the statement.
+
+        if (!noindent) {
+            indentation();
+        }
+        r = expression(0, true);
+
+// Look for the final semicolon.
+
+        if (!t.block) {
+            if (!option.expr && (!r || !r.exps)) {
+                warning("Expected an assignment or function call and instead saw an expression.",
+                    token);
+            } else if (option.nonew && r.id === '(' && r.left.id === 'new') {
+                warning("Do not use 'new' for side effects.");
+            }
+            if (nexttoken.id !== ';') {
+                if (!option.asi && !(option.lastsemic && nexttoken.id == '}' &&
+                        nexttoken.line == token.line)) {
+                    warningAt("Missing semicolon.", token.line, token.from + token.value.length);
+                }
+            } else {
+                adjacent(token, nexttoken);
+                advance(';');
+                nonadjacent(token, nexttoken);
+            }
+        }
+
+// Restore the indentation.
+
+        indent = i;
+        scope = s;
+        return r;
+    }
+
+
+    function use_strict() {
+        if (nexttoken.value === 'use strict') {
+            if (strict_mode) {
+                warning("Unnecessary \"use strict\".");
+            }
+            advance();
+            advance(';');
+            strict_mode = true;
+            option.newcap = true;
+            option.undef = true;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+
+    function statements(begin) {
+        var a = [], f, p;
+
+        while (!nexttoken.reach && nexttoken.id !== '(end)') {
+            if (nexttoken.id === ';') {
+                warning("Unnecessary semicolon.");
+                advance(';');
+            } else {
+                a.push(statement());
+            }
+        }
+        return a;
+    }
+
+
+    /*
+     * Parses a single block. A block is a sequence of statements wrapped in
+     * braces.
+     *
+     * ordinary - true for everything but function bodies and try blocks.
+     * stmt     - true if block can be a single statement (e.g. in if/for/while).
+     */
+    function block(ordinary, stmt) {
+        var a,
+            b = inblock,
+            old_indent = indent,
+            m = strict_mode,
+            s = scope,
+            t;
+
+        inblock = ordinary;
+        scope = Object.create(scope);
+        nonadjacent(token, nexttoken);
+        t = nexttoken;
+
+        if (nexttoken.id === '{') {
+            advance('{');
+            if (nexttoken.id !== '}' || token.line !== nexttoken.line) {
+                indent += option.indent;
+                while (!ordinary && nexttoken.from > indent) {
+                    indent += option.indent;
+                }
+                if (!ordinary && !use_strict() && !m && option.strict &&
+                        funct['(context)']['(global)']) {
+                    warning("Missing \"use strict\" statement.");
+                }
+                a = statements();
+                strict_mode = m;
+                indent -= option.indent;
+                indentation();
+            }
+            advance('}', t);
+            indent = old_indent;
+        } else if (!ordinary) {
+            error("Expected '{a}' and instead saw '{b}'.",
+                  nexttoken, '{', nexttoken.value);
+        } else {
+            if (!stmt || option.curly)
+                warning("Expected '{a}' and instead saw '{b}'.",
+                        nexttoken, '{', nexttoken.value);
+
+            noreach = true;
+            a = [statement()];
+            noreach = false;
+        }
+        funct['(verb)'] = null;
+        scope = s;
+        inblock = b;
+        if (ordinary && option.noempty && (!a || a.length === 0)) {
+            warning("Empty block.");
+        }
+        return a;
+    }
+
+
+    function countMember(m) {
+        if (membersOnly && typeof membersOnly[m] !== 'boolean') {
+            warning("Unexpected /*member '{a}'.", token, m);
+        }
+        if (typeof member[m] === 'number') {
+            member[m] += 1;
+        } else {
+            member[m] = 1;
+        }
+    }
+
+
+    function note_implied(token) {
+        var name = token.value, line = token.line, a = implied[name];
+        if (typeof a === 'function') {
+            a = false;
+        }
+        if (!a) {
+            a = [line];
+            implied[name] = a;
+        } else if (a[a.length - 1] !== line) {
+            a.push(line);
+        }
+    }
+
+// Build the syntax table by declaring the syntactic elements of the language.
+
+    type('(number)', function () {
+        return this;
+    });
+    type('(string)', function () {
+        return this;
+    });
+
+    syntax['(identifier)'] = {
+        type: '(identifier)',
+        lbp: 0,
+        identifier: true,
+        nud: function () {
+            var v = this.value,
+                s = scope[v],
+                f;
+            if (typeof s === 'function') {
+
+// Protection against accidental inheritance.
+
+                s = undefined;
+            } else if (typeof s === 'boolean') {
+                f = funct;
+                funct = functions[0];
+                addlabel(v, 'var');
+                s = funct;
+                funct = f;
+            }
+
+// The name is in scope and defined in the current function.
+
+            if (funct === s) {
+
+//      Change 'unused' to 'var', and reject labels.
+
+                switch (funct[v]) {
+                case 'unused':
+                    funct[v] = 'var';
+                    break;
+                case 'unction':
+                    funct[v] = 'function';
+                    this['function'] = true;
+                    break;
+                case 'function':
+                    this['function'] = true;
+                    break;
+                case 'label':
+                    warning("'{a}' is a statement label.", token, v);
+                    break;
+                }
+
+// The name is not defined in the function.  If we are in the global scope,
+// then we have an undefined variable.
+//
+// Operators typeof and delete do not raise runtime errors even if the base
+// object of a reference is null so no need to display warning if we're
+// inside of typeof or delete.
+
+            } else if (funct['(global)']) {
+                if (anonname != 'typeof' && anonname != 'delete' &&
+                    option.undef && typeof predefined[v] !== 'boolean') {
+                    warning("'{a}' is not defined.", token, v);
+                }
+                note_implied(token);
+
+// If the name is already defined in the current
+// function, but not as outer, then there is a scope error.
+
+            } else {
+                switch (funct[v]) {
+                case 'closure':
+                case 'function':
+                case 'var':
+                case 'unused':
+                    warning("'{a}' used out of scope.", token, v);
+                    break;
+                case 'label':
+                    warning("'{a}' is a statement label.", token, v);
+                    break;
+                case 'outer':
+                case 'global':
+                    break;
+                default:
+
+// If the name is defined in an outer function, make an outer entry, and if
+// it was unused, make it var.
+
+                    if (s === true) {
+                        funct[v] = true;
+                    } else if (s === null) {
+                        warning("'{a}' is not allowed.", token, v);
+                        note_implied(token);
+                    } else if (typeof s !== 'object') {
+
+// Operators typeof and delete do not raise runtime errors even if the base object of
+// a reference is null so no need to display warning if we're inside of typeof or delete.
+
+                        if (anonname != 'typeof' && anonname != 'delete' && option.undef) {
+                            warning("'{a}' is not defined.", token, v);
+                        } else {
+                            funct[v] = true;
+                        }
+                        note_implied(token);
+                    } else {
+                        switch (s[v]) {
+                        case 'function':
+                        case 'unction':
+                            this['function'] = true;
+                            s[v] = 'closure';
+                            funct[v] = s['(global)'] ? 'global' : 'outer';
+                            break;
+                        case 'var':
+                        case 'unused':
+                            s[v] = 'closure';
+                            funct[v] = s['(global)'] ? 'global' : 'outer';
+                            break;
+                        case 'closure':
+                        case 'parameter':
+                            funct[v] = s['(global)'] ? 'global' : 'outer';
+                            break;
+                        case 'label':
+                            warning("'{a}' is a statement label.", token, v);
+                        }
+                    }
+                }
+            }
+            return this;
+        },
+        led: function () {
+            error("Expected an operator and instead saw '{a}'.",
+                nexttoken, nexttoken.value);
+        }
+    };
+
+    type('(regexp)', function () {
+        return this;
+    });
+
+
+// ECMAScript parser
+
+    delim('(endline)');
+    delim('(begin)');
+    delim('(end)').reach = true;
+    delim('</').reach = true;
+    delim('<!');
+    delim('<!--');
+    delim('-->');
+    delim('(error)').reach = true;
+    delim('}').reach = true;
+    delim(')');
+    delim(']');
+    delim('"').reach = true;
+    delim("'").reach = true;
+    delim(';');
+    delim(':').reach = true;
+    delim(',');
+    delim('#');
+    delim('@');
+    reserve('else');
+    reserve('case').reach = true;
+    reserve('catch');
+    reserve('default').reach = true;
+    reserve('finally');
+    reservevar('arguments', function (x) {
+        if (strict_mode && funct['(global)']) {
+            warning("Strict violation.", x);
+        }
+    });
+    reservevar('eval');
+    reservevar('false');
+    reservevar('Infinity');
+    reservevar('NaN');
+    reservevar('null');
+    reservevar('this', function (x) {
+        if (strict_mode && ((funct['(statement)'] &&
+                funct['(name)'].charAt(0) > 'Z') || funct['(global)'])) {
+            warning("Strict violation.", x);
+        }
+    });
+    reservevar('true');
+    reservevar('undefined');
+    assignop('=', 'assign', 20);
+    assignop('+=', 'assignadd', 20);
+    assignop('-=', 'assignsub', 20);
+    assignop('*=', 'assignmult', 20);
+    assignop('/=', 'assigndiv', 20).nud = function () {
+        error("A regular expression literal can be confused with '/='.");
+    };
+    assignop('%=', 'assignmod', 20);
+    bitwiseassignop('&=', 'assignbitand', 20);
+    bitwiseassignop('|=', 'assignbitor', 20);
+    bitwiseassignop('^=', 'assignbitxor', 20);
+    bitwiseassignop('<<=', 'assignshiftleft', 20);
+    bitwiseassignop('>>=', 'assignshiftright', 20);
+    bitwiseassignop('>>>=', 'assignshiftrightunsigned', 20);
+    infix('?', function (left, that) {
+        that.left = left;
+        that.right = expression(10);
+        advance(':');
+        that['else'] = expression(10);
+        return that;
+    }, 30);
+
+    infix('||', 'or', 40);
+    infix('&&', 'and', 50);
+    bitwise('|', 'bitor', 70);
+    bitwise('^', 'bitxor', 80);
+    bitwise('&', 'bitand', 90);
+    relation('==', function (left, right) {
+        var eqnull = option.eqnull &&
+                (left.value == 'null' || right.value == 'null');
+
+        if (!eqnull && option.eqeqeq) {
+            warning("Expected '{a}' and instead saw '{b}'.",
+                    this, '===', '==');
+        } else if (isPoorRelation(left)) {
+            warning("Use '{a}' to compare with '{b}'.",
+                this, '===', left.value);
+        } else if (isPoorRelation(right)) {
+            warning("Use '{a}' to compare with '{b}'.",
+                this, '===', right.value);
+        }
+        return this;
+    });
+    relation('===');
+    relation('!=', function (left, right) {
+        var eqnull = option.eqnull &&
+                (left.value == 'null' || right.value == 'null');
+
+        if (!eqnull && option.eqeqeq) {
+            warning("Expected '{a}' and instead saw '{b}'.",
+                    this, '!==', '!=');
+        } else if (isPoorRelation(left)) {
+            warning("Use '{a}' to compare with '{b}'.",
+                    this, '!==', left.value);
+        } else if (isPoorRelation(right)) {
+            warning("Use '{a}' to compare with '{b}'.",
+                    this, '!==', right.value);
+        }
+        return this;
+    });
+    relation('!==');
+    relation('<');
+    relation('>');
+    relation('<=');
+    relation('>=');
+    bitwise('<<', 'shiftleft', 120);
+    bitwise('>>', 'shiftright', 120);
+    bitwise('>>>', 'shiftrightunsigned', 120);
+    infix('in', 'in', 120);
+    infix('instanceof', 'instanceof', 120);
+    infix('+', function (left, that) {
+        var right = expression(130);
+        if (left && right && left.id === '(string)' && right.id === '(string)') {
+            left.value += right.value;
+            left.character = right.character;
+            if (!option.scripturl && jx.test(left.value)) {
+                warning("JavaScript URL.", left);
+            }
+            return left;
+        }
+        that.left = left;
+        that.right = right;
+        return that;
+    }, 130);
+    prefix('+', 'num');
+    prefix('+++', function () {
+        warning("Confusing pluses.");
+        this.right = expression(150);
+        this.arity = 'unary';
+        return this;
+    });
+    infix('+++', function (left) {
+        warning("Confusing pluses.");
+        this.left = left;
+        this.right = expression(130);
+        return this;
+    }, 130);
+    infix('-', 'sub', 130);
+    prefix('-', 'neg');
+    prefix('---', function () {
+        warning("Confusing minuses.");
+        this.right = expression(150);
+        this.arity = 'unary';
+        return this;
+    });
+    infix('---', function (left) {
+        warning("Confusing minuses.");
+        this.left = left;
+        this.right = expression(130);
+        return this;
+    }, 130);
+    infix('*', 'mult', 140);
+    infix('/', 'div', 140);
+    infix('%', 'mod', 140);
+
+    suffix('++', 'postinc');
+    prefix('++', 'preinc');
+    syntax['++'].exps = true;
+
+    suffix('--', 'postdec');
+    prefix('--', 'predec');
+    syntax['--'].exps = true;
+    prefix('delete', function () {
+        var p = expression(0);
+        if (!p || (p.id !== '.' && p.id !== '[')) {
+            warning("Variables should not be deleted.");
+        }
+        this.first = p;
+        return this;
+    }).exps = true;
+
+    prefix('~', function () {
+        if (option.bitwise) {
+            warning("Unexpected '{a}'.", this, '~');
+        }
+        expression(150);
+        return this;
+    });
+
+    prefix('!', function () {
+        this.right = expression(150);
+        this.arity = 'unary';
+        if (bang[this.right.id] === true) {
+            warning("Confusing use of '{a}'.", this, '!');
+        }
+        return this;
+    });
+    prefix('typeof', 'typeof');
+    prefix('new', function () {
+        var c = expression(155), i;
+        if (c && c.id !== 'function') {
+            if (c.identifier) {
+                c['new'] = true;
+                switch (c.value) {
+                case 'Object':
+                    warning("Use the object literal notation {}.", token);
+                    break;
+                case 'Number':
+                case 'String':
+                case 'Boolean':
+                case 'Math':
+                case 'JSON':
+                    warning("Do not use {a} as a constructor.", token, c.value);
+                    break;
+                case 'Function':
+                    if (!option.evil) {
+                        warning("The Function constructor is eval.");
+                    }
+                    break;
+                case 'Date':
+                case 'RegExp':
+                    break;
+                default:
+                    if (c.id !== 'function') {
+                        i = c.value.substr(0, 1);
+                        if (option.newcap && (i < 'A' || i > 'Z')) {
+                            warning("A constructor name should start with "+
+                                "an uppercase letter.", token);
+                        }
+                    }
+                }
+            } else {
+                if (c.id !== '.' && c.id !== '[' && c.id !== '(') {
+                    warning("Bad constructor.", token);
+                }
+            }
+        } else {
+            if (!option.supernew)
+                warning("Weird construction. Delete 'new'.", this);
+        }
+        adjacent(token, nexttoken);
+        if (nexttoken.id !== '(' && !option.supernew) {
+            warning("Missing '()' invoking a constructor.");
+        }
+        this.first = c;
+        return this;
+    });
+    syntax['new'].exps = true;
+
+    prefix('void').exps = true;
+
+    infix('.', function (left, that) {
+        adjacent(prevtoken, token);
+        nobreak();
+        var m = identifier();
+        if (typeof m === 'string') {
+            countMember(m);
+        }
+        that.left = left;
+        that.right = m;
+        if (option.noarg && left && left.value === 'arguments' &&
+                (m === 'callee' || m === 'caller')) {
+            warning("Avoid arguments.{a}.", left, m);
+        } else if (!option.evil && left && left.value === 'document' &&
+                (m === 'write' || m === 'writeln')) {
+            warning("document.write can be a form of eval.", left);
+        }
+        if (!option.evil && (m === 'eval' || m === 'execScript')) {
+            warning('eval is evil.');
+        }
+        return that;
+    }, 160, true);
+
+    infix('(', function (left, that) {
+        if (prevtoken.id !== '}' && prevtoken.id !== ')') {
+            nobreak(prevtoken, token);
+        }
+        nospace();
+        if (option.immed && !left.immed && left.id === 'function') {
+            warning("Wrap an immediate function invocation in parentheses " +
+                "to assist the reader in understanding that the expression " +
+                "is the result of a function, and not the function itself.");
+        }
+        var n = 0,
+            p = [];
+        if (left) {
+            if (left.type === '(identifier)') {
+                if (left.value.match(/^[A-Z]([A-Z0-9_$]*[a-z][A-Za-z0-9_$]*)?$/)) {
+                    if (left.value !== 'Number' && left.value !== 'String' &&
+                            left.value !== 'Boolean' &&
+                            left.value !== 'Date') {
+                        if (left.value === 'Math') {
+                            warning("Math is not a function.", left);
+                        } else if (option.newcap) {
+                            warning(
+"Missing 'new' prefix when invoking a constructor.", left);
+                        }
+                    }
+                }
+            }
+        }
+        if (nexttoken.id !== ')') {
+            for (;;) {
+                p[p.length] = expression(10);
+                n += 1;
+                if (nexttoken.id !== ',') {
+                    break;
+                }
+                comma();
+            }
+        }
+        advance(')');
+        nospace(prevtoken, token);
+        if (typeof left === 'object') {
+            if (left.value === 'parseInt' && n === 1) {
+                warning("Missing radix parameter.", left);
+            }
+            if (!option.evil) {
+                if (left.value === 'eval' || left.value === 'Function' ||
+                        left.value === 'execScript') {
+                    warning("eval is evil.", left);
+                } else if (p[0] && p[0].id === '(string)' &&
+                       (left.value === 'setTimeout' ||
+                        left.value === 'setInterval')) {
+                    warning(
+    "Implied eval is evil. Pass a function instead of a string.", left);
+                }
+            }
+            if (!left.identifier && left.id !== '.' && left.id !== '[' &&
+                    left.id !== '(' && left.id !== '&&' && left.id !== '||' &&
+                    left.id !== '?') {
+                warning("Bad invocation.", left);
+            }
+        }
+        that.left = left;
+        return that;
+    }, 155, true).exps = true;
+
+    prefix('(', function () {
+        nospace();
+        if (nexttoken.id === 'function') {
+            nexttoken.immed = true;
+        }
+        var v = expression(0);
+        advance(')', this);
+        nospace(prevtoken, token);
+        if (option.immed && v.id === 'function') {
+            if (nexttoken.id === '(') {
+                warning(
+"Move the invocation into the parens that contain the function.", nexttoken);
+            } else {
+                warning(
+"Do not wrap function literals in parens unless they are to be immediately invoked.",
+                        this);
+            }
+        }
+        return v;
+    });
+
+    infix('[', function (left, that) {
+        nobreak(prevtoken, token);
+        nospace();
+        var e = expression(0), s;
+        if (e && e.type === '(string)') {
+            if (!option.evil && (e.value === 'eval' || e.value === 'execScript')) {
+                warning("eval is evil.", that);
+            }
+            countMember(e.value);
+            if (!option.sub && ix.test(e.value)) {
+                s = syntax[e.value];
+                if (!s || !s.reserved) {
+                    warning("['{a}'] is better written in dot notation.",
+                            e, e.value);
+                }
+            }
+        }
+        advance(']', that);
+        nospace(prevtoken, token);
+        that.left = left;
+        that.right = e;
+        return that;
+    }, 160, true);
+
+    prefix('[', function () {
+        var b = token.line !== nexttoken.line;
+        this.first = [];
+        if (b) {
+            indent += option.indent;
+            if (nexttoken.from === indent + option.indent) {
+                indent += option.indent;
+            }
+        }
+        while (nexttoken.id !== '(end)') {
+            while (nexttoken.id === ',') {
+                warning("Extra comma.");
+                advance(',');
+            }
+            if (nexttoken.id === ']') {
+                break;
+            }
+            if (b && token.line !== nexttoken.line) {
+                indentation();
+            }
+            this.first.push(expression(10));
+            if (nexttoken.id === ',') {
+                comma();
+                if (nexttoken.id === ']' && !option.es5) {
+                    warning("Extra comma.", token);
+                    break;
+                }
+            } else {
+                break;
+            }
+        }
+        if (b) {
+            indent -= option.indent;
+            indentation();
+        }
+        advance(']', this);
+        return this;
+    }, 160);
+
+
+    function property_name() {
+        var id = optionalidentifier(true);
+        if (!id) {
+            if (nexttoken.id === '(string)') {
+                id = nexttoken.value;
+                advance();
+            } else if (nexttoken.id === '(number)') {
+                id = nexttoken.value.toString();
+                advance();
+            }
+        }
+        return id;
+    }
+
+
+    function functionparams() {
+        var i, t = nexttoken, p = [];
+        advance('(');
+        nospace();
+        if (nexttoken.id === ')') {
+            advance(')');
+            nospace(prevtoken, token);
+            return;
+        }
+        for (;;) {
+            i = identifier(true);
+            p.push(i);
+            addlabel(i, 'parameter');
+            if (nexttoken.id === ',') {
+                comma();
+            } else {
+                advance(')', t);
+                nospace(prevtoken, token);
+                return p;
+            }
+        }
+    }
+
+
+    function doFunction(i, statement) {
+        var f,
+            oldOption = option,
+            oldScope  = scope;
+
+        option = Object.create(option);
+        scope = Object.create(scope);
+
+        funct = {
+            '(name)'     : i || '"' + anonname + '"',
+            '(line)'     : nexttoken.line,
+            '(context)'  : funct,
+            '(breakage)' : 0,
+            '(loopage)'  : 0,
+            '(scope)'    : scope,
+            '(statement)': statement
+        };
+        f = funct;
+        token.funct = funct;
+        functions.push(funct);
+        if (i) {
+            addlabel(i, 'function');
+        }
+        funct['(params)'] = functionparams();
+
+        block(false);
+        scope = oldScope;
+        option = oldOption;
+        funct['(last)'] = token.line;
+        funct = funct['(context)'];
+        return f;
+    }
+
+
+    (function (x) {
+        x.nud = function () {
+            var b, f, i, j, p, seen = {}, t;
+
+            b = token.line !== nexttoken.line;
+            if (b) {
+                indent += option.indent;
+                if (nexttoken.from === indent + option.indent) {
+                    indent += option.indent;
+                }
+            }
+            for (;;) {
+                if (nexttoken.id === '}') {
+                    break;
+                }
+                if (b) {
+                    indentation();
+                }
+                if (nexttoken.value === 'get' && peek().id !== ':') {
+                    advance('get');
+                    if (!option.es5) {
+                        error("get/set are ES5 features.");
+                    }
+                    i = property_name();
+                    if (!i) {
+                        error("Missing property name.");
+                    }
+                    t = nexttoken;
+                    adjacent(token, nexttoken);
+                    f = doFunction();
+                    if (!option.loopfunc && funct['(loopage)']) {
+                        warning("Don't make functions within a loop.", t);
+                    }
+                    p = f['(params)'];
+                    if (p) {
+                        warning("Unexpected parameter '{a}' in get {b} function.", t, p[0], i);
+                    }
+                    adjacent(token, nexttoken);
+                    advance(',');
+                    indentation();
+                    advance('set');
+                    j = property_name();
+                    if (i !== j) {
+                        error("Expected {a} and instead saw {b}.", token, i, j);
+                    }
+                    t = nexttoken;
+                    adjacent(token, nexttoken);
+                    f = doFunction();
+                    p = f['(params)'];
+                    if (!p || p.length !== 1 || p[0] !== 'value') {
+                        warning("Expected (value) in set {a} function.", t, i);
+                    }
+                } else {
+                    i = property_name();
+                    if (typeof i !== 'string') {
+                        break;
+                    }
+                    advance(':');
+                    nonadjacent(token, nexttoken);
+                    expression(10);
+                }
+                if (seen[i] === true) {
+                    warning("Duplicate member '{a}'.", nexttoken, i);
+                }
+                seen[i] = true;
+                countMember(i);
+                if (nexttoken.id === ',') {
+                    comma();
+                    if (nexttoken.id === ',') {
+                        warning("Extra comma.", token);
+                    } else if (nexttoken.id === '}' && !option.es5) {
+                        warning("Extra comma.", token);
+                    }
+                } else {
+                    break;
+                }
+            }
+            if (b) {
+                indent -= option.indent;
+                indentation();
+            }
+            advance('}', this);
+            return this;
+        };
+        x.fud = function () {
+            error("Expected to see a statement and instead saw a block.", token);
+        };
+    }(delim('{')));
+
+    var varstatement = stmt('var', function (prefix) {
+        // JavaScript does not have block scope. It only has function scope. So,
+        // declaring a variable in a block can have unexpected consequences.
+        var id, name, value;
+
+        if (funct['(onevar)'] && option.onevar) {
+            warning("Too many var statements.");
+        } else if (!funct['(global)']) {
+            funct['(onevar)'] = true;
+        }
+        this.first = [];
+        for (;;) {
+            nonadjacent(token, nexttoken);
+            id = identifier();
+            if (funct['(global)'] && predefined[id] === false) {
+                warning("Redefinition of '{a}'.", token, id);
+            }
+            addlabel(id, 'unused');
+            if (prefix) {
+                break;
+            }
+            name = token;
+            this.first.push(token);
+            if (nexttoken.id === '=') {
+                nonadjacent(token, nexttoken);
+                advance('=');
+                nonadjacent(token, nexttoken);
+                if (nexttoken.id === 'undefined') {
+                    warning("It is not necessary to initialize '{a}' to 'undefined'.", token, id);
+                }
+                if (peek(0).id === '=' && nexttoken.identifier) {
+                    error("Variable {a} was not declared correctly.",
+                            nexttoken, nexttoken.value);
+                }
+                value = expression(0);
+                name.first = value;
+            }
+            if (nexttoken.id !== ',') {
+                break;
+            }
+            comma();
+        }
+        return this;
+    });
+    varstatement.exps = true;
+
+    blockstmt('function', function () {
+        if (inblock) {
+            warning("Function declarations should not be placed in blocks. " +
+                "Use a function expression or move the statement to the top of " +
+                "the outer function.", token);
+
+        }
+        var i = identifier();
+        adjacent(token, nexttoken);
+        addlabel(i, 'unction');
+        doFunction(i, true);
+        if (nexttoken.id === '(' && nexttoken.line === token.line) {
+            error(
+"Function declarations are not invocable. Wrap the whole function invocation in parens.");
+        }
+        return this;
+    });
+
+    prefix('function', function () {
+        var i = optionalidentifier();
+        if (i) {
+            adjacent(token, nexttoken);
+        } else {
+            nonadjacent(token, nexttoken);
+        }
+        doFunction(i);
+        if (!option.loopfunc && funct['(loopage)']) {
+            warning("Don't make functions within a loop.");
+        }
+        return this;
+    });
+
+    blockstmt('if', function () {
+        var t = nexttoken;
+        advance('(');
+        nonadjacent(this, t);
+        nospace();
+        expression(20);
+        if (nexttoken.id === '=') {
+            if (!option.boss)
+                warning("Expected a conditional expression and instead saw an assignment.");
+            advance('=');
+            expression(20);
+        }
+        advance(')', t);
+        nospace(prevtoken, token);
+        block(true, true);
+        if (nexttoken.id === 'else') {
+            nonadjacent(token, nexttoken);
+            advance('else');
+            if (nexttoken.id === 'if' || nexttoken.id === 'switch') {
+                statement(true);
+            } else {
+                block(true, true);
+            }
+        }
+        return this;
+    });
+
+    blockstmt('try', function () {
+        var b, e, s;
+
+        block(false);
+        if (nexttoken.id === 'catch') {
+            advance('catch');
+            nonadjacent(token, nexttoken);
+            advance('(');
+            s = scope;
+            scope = Object.create(s);
+            e = nexttoken.value;
+            if (nexttoken.type !== '(identifier)') {
+                warning("Expected an identifier and instead saw '{a}'.",
+                    nexttoken, e);
+            } else {
+                addlabel(e, 'exception');
+            }
+            advance();
+            advance(')');
+            block(false);
+            b = true;
+            scope = s;
+        }
+        if (nexttoken.id === 'finally') {
+            advance('finally');
+            block(false);
+            return;
+        } else if (!b) {
+            error("Expected '{a}' and instead saw '{b}'.",
+                    nexttoken, 'catch', nexttoken.value);
+        }
+        return this;
+    });
+
+    blockstmt('while', function () {
+        var t = nexttoken;
+        funct['(breakage)'] += 1;
+        funct['(loopage)'] += 1;
+        advance('(');
+        nonadjacent(this, t);
+        nospace();
+        expression(20);
+        if (nexttoken.id === '=') {
+            if (!option.boss)
+                warning("Expected a conditional expression and instead saw an assignment.");
+            advance('=');
+            expression(20);
+        }
+        advance(')', t);
+        nospace(prevtoken, token);
+        block(true, true);
+        funct['(breakage)'] -= 1;
+        funct['(loopage)'] -= 1;
+        return this;
+    }).labelled = true;
+
+    reserve('with');
+
+    blockstmt('switch', function () {
+        var t = nexttoken,
+            g = false;
+        funct['(breakage)'] += 1;
+        advance('(');
+        nonadjacent(this, t);
+        nospace();
+        this.condition = expression(20);
+        advance(')', t);
+        nospace(prevtoken, token);
+        nonadjacent(token, nexttoken);
+        t = nexttoken;
+        advance('{');
+        nonadjacent(token, nexttoken);
+        indent += option.indent;
+        this.cases = [];
+        for (;;) {
+            switch (nexttoken.id) {
+            case 'case':
+                switch (funct['(verb)']) {
+                case 'break':
+                case 'case':
+                case 'continue':
+                case 'return':
+                case 'switch':
+                case 'throw':
+                    break;
+                default:
+                    // You can tell JSHint that you don't use break intentionally by
+                    // adding a comment /* falls through */ on a line just before
+                    // the next `case`.
+                    if (!ft.test(lines[nexttoken.line - 2])) {
+                        warning(
+                            "Expected a 'break' statement before 'case'.",
+                            token);
+                    }
+                }
+                indentation(-option.indent);
+                advance('case');
+                this.cases.push(expression(20));
+                g = true;
+                advance(':');
+                funct['(verb)'] = 'case';
+                break;
+            case 'default':
+                switch (funct['(verb)']) {
+                case 'break':
+                case 'continue':
+                case 'return':
+                case 'throw':
+                    break;
+                default:
+                    if (!ft.test(lines[nexttoken.line - 2])) {
+                        warning(
+                            "Expected a 'break' statement before 'default'.",
+                            token);
+                    }
+                }
+                indentation(-option.indent);
+                advance('default');
+                g = true;
+                advance(':');
+                break;
+            case '}':
+                indent -= option.indent;
+                indentation();
+                advance('}', t);
+                if (this.cases.length === 1 || this.condition.id === 'true' ||
+                        this.condition.id === 'false') {
+                    warning("This 'switch' should be an 'if'.", this);
+                }
+                funct['(breakage)'] -= 1;
+                funct['(verb)'] = undefined;
+                return;
+            case '(end)':
+                error("Missing '{a}'.", nexttoken, '}');
+                return;
+            default:
+                if (g) {
+                    switch (token.id) {
+                    case ',':
+                        error("Each value should have its own case label.");
+                        return;
+                    case ':':
+                        statements();
+                        break;
+                    default:
+                        error("Missing ':' on a case clause.", token);
+                    }
+                } else {
+                    error("Expected '{a}' and instead saw '{b}'.",
+                        nexttoken, 'case', nexttoken.value);
+                }
+            }
+        }
+    }).labelled = true;
+
+    stmt('debugger', function () {
+        if (!option.debug) {
+            warning("All 'debugger' statements should be removed.");
+        }
+        return this;
+    }).exps = true;
+
+    (function () {
+        var x = stmt('do', function () {
+            funct['(breakage)'] += 1;
+            funct['(loopage)'] += 1;
+            this.first = block(true);
+            advance('while');
+            var t = nexttoken;
+            nonadjacent(token, t);
+            advance('(');
+            nospace();
+            expression(20);
+            if (nexttoken.id === '=') {
+                if (!option.boss)
+                    warning("Expected a conditional expression and instead saw an assignment.");
+                advance('=');
+                expression(20);
+            }
+            advance(')', t);
+            nospace(prevtoken, token);
+            funct['(breakage)'] -= 1;
+            funct['(loopage)'] -= 1;
+            return this;
+        });
+        x.labelled = true;
+        x.exps = true;
+    }());
+
+    blockstmt('for', function () {
+        var s, t = nexttoken;
+        funct['(breakage)'] += 1;
+        funct['(loopage)'] += 1;
+        advance('(');
+        nonadjacent(this, t);
+        nospace();
+        if (peek(nexttoken.id === 'var' ? 1 : 0).id === 'in') {
+            if (nexttoken.id === 'var') {
+                advance('var');
+                varstatement.fud.call(varstatement, true);
+            } else {
+                switch (funct[nexttoken.value]) {
+                case 'unused':
+                    funct[nexttoken.value] = 'var';
+                    break;
+                case 'var':
+                    break;
+                default:
+                    warning("Bad for in variable '{a}'.",
+                            nexttoken, nexttoken.value);
+                }
+                advance();
+            }
+            advance('in');
+            expression(20);
+            advance(')', t);
+            s = block(true, true);
+            if (option.forin && (s.length > 1 || typeof s[0] !== 'object' ||
+                    s[0].value !== 'if')) {
+                warning("The body of a for in should be wrapped in an if statement to filter " +
+                        "unwanted properties from the prototype.", this);
+            }
+            funct['(breakage)'] -= 1;
+            funct['(loopage)'] -= 1;
+            return this;
+        } else {
+            if (nexttoken.id !== ';') {
+                if (nexttoken.id === 'var') {
+                    advance('var');
+                    varstatement.fud.call(varstatement);
+                } else {
+                    for (;;) {
+                        expression(0, 'for');
+                        if (nexttoken.id !== ',') {
+                            break;
+                        }
+                        comma();
+                    }
+                }
+            }
+            nolinebreak(token);
+            advance(';');
+            if (nexttoken.id !== ';') {
+                expression(20);
+                if (nexttoken.id === '=') {
+                    if (!option.boss)
+                        warning("Expected a conditional expression and instead saw an assignment.");
+                    advance('=');
+                    expression(20);
+                }
+            }
+            nolinebreak(token);
+            advance(';');
+            if (nexttoken.id === ';') {
+                error("Expected '{a}' and instead saw '{b}'.",
+                        nexttoken, ')', ';');
+            }
+            if (nexttoken.id !== ')') {
+                for (;;) {
+                    expression(0, 'for');
+                    if (nexttoken.id !== ',') {
+                        break;
+                    }
+                    comma();
+                }
+            }
+            advance(')', t);
+            nospace(prevtoken, token);
+            block(true, true);
+            funct['(breakage)'] -= 1;
+            funct['(loopage)'] -= 1;
+            return this;
+        }
+    }).labelled = true;
+
+
+    stmt('break', function () {
+        var v = nexttoken.value;
+        if (funct['(breakage)'] === 0) {
+            warning("Unexpected '{a}'.", nexttoken, this.value);
+        }
+        nolinebreak(this);
+        if (nexttoken.id !== ';') {
+            if (token.line === nexttoken.line) {
+                if (funct[v] !== 'label') {
+                    warning("'{a}' is not a statement label.", nexttoken, v);
+                } else if (scope[v] !== funct) {
+                    warning("'{a}' is out of scope.", nexttoken, v);
+                }
+                this.first = nexttoken;
+                advance();
+            }
+        }
+        reachable('break');
+        return this;
+    }).exps = true;
+
+
+    stmt('continue', function () {
+        var v = nexttoken.value;
+        if (funct['(breakage)'] === 0) {
+            warning("Unexpected '{a}'.", nexttoken, this.value);
+        }
+        nolinebreak(this);
+        if (nexttoken.id !== ';') {
+            if (token.line === nexttoken.line) {
+                if (funct[v] !== 'label') {
+                    warning("'{a}' is not a statement label.", nexttoken, v);
+                } else if (scope[v] !== funct) {
+                    warning("'{a}' is out of scope.", nexttoken, v);
+                }
+                this.first = nexttoken;
+                advance();
+            }
+        } else if (!funct['(loopage)']) {
+            warning("Unexpected '{a}'.", nexttoken, this.value);
+        }
+        reachable('continue');
+        return this;
+    }).exps = true;
+
+
+    stmt('return', function () {
+        nolinebreak(this);
+        if (nexttoken.id === '(regexp)') {
+            warning("Wrap the /regexp/ literal in parens to disambiguate the slash operator.");
+        }
+        if (nexttoken.id !== ';' && !nexttoken.reach) {
+            nonadjacent(token, nexttoken);
+            this.first = expression(20);
+        }
+        reachable('return');
+        return this;
+    }).exps = true;
+
+
+    stmt('throw', function () {
+        nolinebreak(this);
+        nonadjacent(token, nexttoken);
+        this.first = expression(20);
+        reachable('throw');
+        return this;
+    }).exps = true;
+
+//  Superfluous reserved words
+
+    reserve('class');
+    reserve('const');
+    reserve('enum');
+    reserve('export');
+    reserve('extends');
+    reserve('import');
+    reserve('super');
+
+    reserve('let');
+    reserve('yield');
+    reserve('implements');
+    reserve('interface');
+    reserve('package');
+    reserve('private');
+    reserve('protected');
+    reserve('public');
+    reserve('static');
+
+
+// Parse JSON
+
+    function jsonValue() {
+
+        function jsonObject() {
+            var o = {}, t = nexttoken;
+            advance('{');
+            if (nexttoken.id !== '}') {
+                for (;;) {
+                    if (nexttoken.id === '(end)') {
+                        error("Missing '}' to match '{' from line {a}.",
+                                nexttoken, t.line);
+                    } else if (nexttoken.id === '}') {
+                        warning("Unexpected comma.", token);
+                        break;
+                    } else if (nexttoken.id === ',') {
+                        error("Unexpected comma.", nexttoken);
+                    } else if (nexttoken.id !== '(string)') {
+                        warning("Expected a string and instead saw {a}.",
+                                nexttoken, nexttoken.value);
+                    }
+                    if (o[nexttoken.value] === true) {
+                        warning("Duplicate key '{a}'.",
+                                nexttoken, nexttoken.value);
+                    } else if ((nexttoken.value === '__proto__' &&
+                        !option.proto) || (nexttoken.value === '__iterator__' &&
+                        !option.iterator)) {
+                            warning("The '{a}' key may produce unexpected results.",
+                                nexttoken, nexttoken.value);
+                    } else {
+                        o[nexttoken.value] = true;
+                    }
+                    advance();
+                    advance(':');
+                    jsonValue();
+                    if (nexttoken.id !== ',') {
+                        break;
+                    }
+                    advance(',');
+                }
+            }
+            advance('}');
+        }
+
+        function jsonArray() {
+            var t = nexttoken;
+            advance('[');
+            if (nexttoken.id !== ']') {
+                for (;;) {
+                    if (nexttoken.id === '(end)') {
+                        error("Missing ']' to match '[' from line {a}.",
+                                nexttoken, t.line);
+                    } else if (nexttoken.id === ']') {
+                        warning("Unexpected comma.", token);
+                        break;
+                    } else if (nexttoken.id === ',') {
+                        error("Unexpected comma.", nexttoken);
+                    }
+                    jsonValue();
+                    if (nexttoken.id !== ',') {
+                        break;
+                    }
+                    advance(',');
+                }
+            }
+            advance(']');
+        }
+
+        switch (nexttoken.id) {
+        case '{':
+            jsonObject();
+            break;
+        case '[':
+            jsonArray();
+            break;
+        case 'true':
+        case 'false':
+        case 'null':
+        case '(number)':
+        case '(string)':
+            advance();
+            break;
+        case '-':
+            advance('-');
+            if (token.character !== nexttoken.from) {
+                warning("Unexpected space after '-'.", token);
+            }
+            adjacent(token, nexttoken);
+            advance('(number)');
+            break;
+        default:
+            error("Expected a JSON value.", nexttoken);
+        }
+    }
+
+
+// The actual JSHINT function itself.
+
+    var itself = function (s, o, g) {
+        var a, i, k;
+        JSHINT.errors = [];
+        predefined = Object.create(standard);
+        combine(predefined, g || {});
+        if (o) {
+            a = o.predef;
+            if (a) {
+                if (Array.isArray(a)) {
+                    for (i = 0; i < a.length; i += 1) {
+                        predefined[a[i]] = true;
+                    }
+                } else if (typeof a === 'object') {
+                    k = Object.keys(a);
+                    for (i = 0; i < k.length; i += 1) {
+                        predefined[k[i]] = !!a[k[i]];
+                    }
+                }
+            }
+            option = o;
+        } else {
+            option = {};
+        }
+        option.indent = option.indent || 4;
+        option.maxerr = option.maxerr || 50;
+
+        tab = '';
+        for (i = 0; i < option.indent; i += 1) {
+            tab += ' ';
+        }
+        indent = 1;
+        global = Object.create(predefined);
+        scope = global;
+        funct = {
+            '(global)': true,
+            '(name)': '(global)',
+            '(scope)': scope,
+            '(breakage)': 0,
+            '(loopage)': 0
+        };
+        functions = [funct];
+        urls = [];
+        src = false;
+        stack = null;
+        member = {};
+        membersOnly = null;
+        implied = {};
+        inblock = false;
+        lookahead = [];
+        jsonmode = false;
+        warnings = 0;
+        lex.init(s);
+        prereg = true;
+        strict_mode = false;
+
+        prevtoken = token = nexttoken = syntax['(begin)'];
+        assume();
+
+        try {
+            advance();
+            switch (nexttoken.id) {
+            case '{':
+            case '[':
+                option.laxbreak = true;
+                jsonmode = true;
+                jsonValue();
+                break;
+            default:
+                if (nexttoken.value === 'use strict') {
+                    if (!option.globalstrict)
+                        warning("Use the function form of \"use strict\".");
+                    use_strict();
+                }
+                statements('lib');
+            }
+            advance('(end)');
+        } catch (e) {
+            if (e) {
+                JSHINT.errors.push({
+                    reason    : e.message,
+                    line      : e.line || nexttoken.line,
+                    character : e.character || nexttoken.from
+                }, null);
+            }
+        }
+        return JSHINT.errors.length === 0;
+    };
+
+
+// Data summary.
+
+    itself.data = function () {
+
+        var data = {functions: []}, fu, globals, implieds = [], f, i, j,
+            members = [], n, unused = [], v;
+        if (itself.errors.length) {
+            data.errors = itself.errors;
+        }
+
+        if (jsonmode) {
+            data.json = true;
+        }
+
+        for (n in implied) {
+            if (is_own(implied, n)) {
+                implieds.push({
+                    name: n,
+                    line: implied[n]
+                });
+            }
+        }
+        if (implieds.length > 0) {
+            data.implieds = implieds;
+        }
+
+        if (urls.length > 0) {
+            data.urls = urls;
+        }
+
+        globals = Object.keys(scope);
+        if (globals.length > 0) {
+            data.globals = globals;
+        }
+
+        for (i = 1; i < functions.length; i += 1) {
+            f = functions[i];
+            fu = {};
+            for (j = 0; j < functionicity.length; j += 1) {
+                fu[functionicity[j]] = [];
+            }
+            for (n in f) {
+                if (is_own(f, n) && n.charAt(0) !== '(') {
+                    v = f[n];
+                    if (v === 'unction') {
+                        v = 'unused';
+                    }
+                    if (Array.isArray(fu[v])) {
+                        fu[v].push(n);
+                        if (v === 'unused') {
+                            unused.push({
+                                name: n,
+                                line: f['(line)'],
+                                'function': f['(name)']
+                            });
+                        }
+                    }
+                }
+            }
+            for (j = 0; j < functionicity.length; j += 1) {
+                if (fu[functionicity[j]].length === 0) {
+                    delete fu[functionicity[j]];
+                }
+            }
+            fu.name = f['(name)'];
+            fu.param = f['(params)'];
+            fu.line = f['(line)'];
+            fu.last = f['(last)'];
+            data.functions.push(fu);
+        }
+
+        if (unused.length > 0) {
+            data.unused = unused;
+        }
+
+        members = [];
+        for (n in member) {
+            if (typeof member[n] === 'number') {
+                data.member = member;
+                break;
+            }
+        }
+
+        return data;
+    };
+
+    itself.report = function (option) {
+        var data = itself.data();
+
+        var a = [], c, e, err, f, i, k, l, m = '', n, o = [], s;
+
+        function detail(h, array) {
+            var b, i, singularity;
+            if (array) {
+                o.push('<div><i>' + h + '</i> ');
+                array = array.sort();
+                for (i = 0; i < array.length; i += 1) {
+                    if (array[i] !== singularity) {
+                        singularity = array[i];
+                        o.push((b ? ', ' : '') + singularity);
+                        b = true;
+                    }
+                }
+                o.push('</div>');
+            }
+        }
+
+
+        if (data.errors || data.implieds || data.unused) {
+            err = true;
+            o.push('<div id=errors><i>Error:</i>');
+            if (data.errors) {
+                for (i = 0; i < data.errors.length; i += 1) {
+                    c = data.errors[i];
+                    if (c) {
+                        e = c.evidence || '';
+                        o.push('<p>Problem' + (isFinite(c.line) ? ' at line ' +
+                                c.line + ' character ' + c.character : '') +
+                                ': ' + c.reason.entityify() +
+                                '</p><p class=evidence>' +
+                                (e && (e.length > 80 ? e.slice(0, 77) + '...' :
+                                e).entityify()) + '</p>');
+                    }
+                }
+            }
+
+            if (data.implieds) {
+                s = [];
+                for (i = 0; i < data.implieds.length; i += 1) {
+                    s[i] = '<code>' + data.implieds[i].name + '</code>&nbsp;<i>' +
+                        data.implieds[i].line + '</i>';
+                }
+                o.push('<p><i>Implied global:</i> ' + s.join(', ') + '</p>');
+            }
+
+            if (data.unused) {
+                s = [];
+                for (i = 0; i < data.unused.length; i += 1) {
+                    s[i] = '<code><u>' + data.unused[i].name + '</u></code>&nbsp;<i>' +
+                        data.unused[i].line + '</i> <code>' +
+                        data.unused[i]['function'] + '</code>';
+                }
+                o.push('<p><i>Unused variable:</i> ' + s.join(', ') + '</p>');
+            }
+            if (data.json) {
+                o.push('<p>JSON: bad.</p>');
+            }
+            o.push('</div>');
+        }
+
+        if (!option) {
+
+            o.push('<br><div id=functions>');
+
+            if (data.urls) {
+                detail("URLs<br>", data.urls, '<br>');
+            }
+
+            if (data.json && !err) {
+                o.push('<p>JSON: good.</p>');
+            } else if (data.globals) {
+                o.push('<div><i>Global</i> ' +
+                        data.globals.sort().join(', ') + '</div>');
+            } else {
+                o.push('<div><i>No new global variables introduced.</i></div>');
+            }
+
+            for (i = 0; i < data.functions.length; i += 1) {
+                f = data.functions[i];
+
+                o.push('<br><div class=function><i>' + f.line + '-' +
+                        f.last + '</i> ' + (f.name || '') + '(' +
+                        (f.param ? f.param.join(', ') : '') + ')</div>');
+                detail('<big><b>Unused</b></big>', f.unused);
+                detail('Closure', f.closure);
+                detail('Variable', f['var']);
+                detail('Exception', f.exception);
+                detail('Outer', f.outer);
+                detail('Global', f.global);
+                detail('Label', f.label);
+            }
+
+            if (data.member) {
+                a = Object.keys(data.member);
+                if (a.length) {
+                    a = a.sort();
+                    m = '<br><pre id=members>/*members ';
+                    l = 10;
+                    for (i = 0; i < a.length; i += 1) {
+                        k = a[i];
+                        n = k.name();
+                        if (l + n.length > 72) {
+                            o.push(m + '<br>');
+                            m = '    ';
+                            l = 1;
+                        }
+                        l += n.length + 2;
+                        if (data.member[k] === 1) {
+                            n = '<i>' + n + '</i>';
+                        }
+                        if (i < a.length - 1) {
+                            n += ', ';
+                        }
+                        m += n;
+                    }
+                    o.push(m + '<br>*/</pre>');
+                }
+                o.push('</div>');
+            }
+        }
+        return o.join('');
+    };
+    itself.jshint = itself;
+
+    itself.edition = '2011-04-16';
+
+    return itself;
+
+}());
+
+// Make JSHINT a Node module, if possible.
+if (typeof exports == 'object' && exports)
+    exports.JSHINT = JSHINT;
+
+});/* -*- Mode: JS; tab-width: 4; indent-tabs-mode: nil; -*-
+ * vim: set sw=4 ts=4 et tw=78:
+ * ***** BEGIN LICENSE BLOCK *****
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Narcissus JavaScript engine.
+ *
+ * The Initial Developer of the Original Code is
+ * Brendan Eich <brendan@mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Tom Austin <taustin@ucsc.edu>
+ *   Brendan Eich <brendan@mozilla.org>
+ *   Shu-Yu Guo <shu@rfrn.org>
+ *   Dave Herman <dherman@mozilla.com>
+ *   Dimitris Vardoulakis <dimvar@ccs.neu.edu>
+ *   Patrick Walton <pcwalton@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Narcissus - JS implemented in JS.
+ *
+ * Parser.
+ */
+
+define('ace/narcissus/jsparse', ['require', 'exports', 'module' , 'ace/narcissus/jslex', 'ace/narcissus/jsdefs'], function(require, exports, module) {
+
+    var lexer = require("./jslex");
+    var definitions = require("./jsdefs");
+
+    const StringMap = definitions.StringMap;
+    const Stack = definitions.Stack;
+
+    // Set constants in the local scope.
+    eval(definitions.consts);
+
+    // Banned statement types by language version.
+    const blackLists = { 160: {}, 185: {}, harmony: {} };
+    blackLists[160][IMPORT] = true;
+    blackLists[160][EXPORT] = true;
+    blackLists[160][LET] = true;
+    blackLists[160][MODULE] = true;
+    blackLists[160][YIELD] = true;
+    blackLists[185][IMPORT] = true;
+    blackLists[185][EXPORT] = true;
+    blackLists[185][MODULE] = true;
+    blackLists.harmony[WITH] = true;
+
+    /*
+     * pushDestructuringVarDecls :: (node, hoisting node) -> void
+     *
+     * Recursively add all destructured declarations to varDecls.
+     */
+    function pushDestructuringVarDecls(n, s) {
+        for (var i in n) {
+            var sub = n[i];
+            if (sub.type === IDENTIFIER) {
+                s.varDecls.push(sub);
+            } else {
+                pushDestructuringVarDecls(sub, s);
+            }
+        }
+    }
+
+    function StaticContext(parentScript, parentBlock, inModule, inFunction) {
+        this.parentScript = parentScript;
+        this.parentBlock = parentBlock || parentScript;
+        this.inModule = inModule || false;
+        this.inFunction = inFunction || false;
+        this.inForLoopInit = false;
+        this.topLevel = true;
+        this.allLabels = new Stack();
+        this.currentLabels = new Stack();
+        this.labeledTargets = new Stack();
+        this.defaultLoopTarget = null;
+        this.defaultTarget = null;
+        this.blackList = blackLists[Narcissus.options.version];
+        Narcissus.options.ecma3OnlyMode && (this.ecma3OnlyMode = true);
+        Narcissus.options.parenFreeMode && (this.parenFreeMode = true);
+    }
+
+    StaticContext.prototype = {
+        ecma3OnlyMode: false,
+        parenFreeMode: false,
+        // non-destructive update via prototype extension
+        update: function(ext) {
+            var desc = {};
+            for (var key in ext) {
+                desc[key] = {
+                    value: ext[key],
+                    writable: true,
+                    enumerable: true,
+                    configurable: true
+                }
+            }
+            return Object.create(this, desc);
+        },
+        pushLabel: function(label) {
+            return this.update({ currentLabels: this.currentLabels.push(label),
+                                 allLabels: this.allLabels.push(label) });
+        },
+        pushTarget: function(target) {
+            var isDefaultLoopTarget = target.isLoop;
+            var isDefaultTarget = isDefaultLoopTarget || target.type === SWITCH;
+
+            if (this.currentLabels.isEmpty()) {
+                if (isDefaultLoopTarget) this.update({ defaultLoopTarget: target });
+                if (isDefaultTarget) this.update({ defaultTarget: target });
+                return this;
+            }
+
+            target.labels = new StringMap();
+            this.currentLabels.forEach(function(label) {
+                target.labels.set(label, true);
+            });
+            return this.update({ currentLabels: new Stack(),
+                                 labeledTargets: this.labeledTargets.push(target),
+                                 defaultLoopTarget: isDefaultLoopTarget
+                                                    ? target
+                                                    : this.defaultLoopTarget,
+                                 defaultTarget: isDefaultTarget
+                                                ? target
+                                                : this.defaultTarget });
+        },
+        nest: function() {
+            return this.topLevel ? this.update({ topLevel: false }) : this;
+        },
+        allow: function(type) {
+            switch (type) {
+              case EXPORT:
+                if (!this.inModule || this.inFunction || !this.topLevel)
+                    return false;
+                // FALL THROUGH
+
+              case IMPORT:
+                return !this.inFunction && this.topLevel;
+
+              case MODULE:
+                return !this.inFunction && this.topLevel;
+
+              default:
+                return true;
+            }
+        }
+    };
+
+    /*
+     * Script :: (tokenizer, boolean, boolean) -> node
+     *
+     * Parses the toplevel and module/function bodies.
+     */
+    function Script(t, inModule, inFunction) {
+        var n = new Node(t, scriptInit());
+        Statements(t, new StaticContext(n, n, inModule, inFunction), n);
+        return n;
+    }
+
+    // We extend Array slightly with a top-of-stack method.
+    definitions.defineProperty(Array.prototype, "top",
+                               function() {
+                                   return this.length && this[this.length-1];
+                               }, false, false, true);
+
+    /*
+     * Node :: (tokenizer, optional init object) -> node
+     */
+    function Node(t, init) {
+        var token = t.token;
+        if (token) {
+            // If init.type exists it will override token.type.
+            this.type = token.type;
+            this.value = token.value;
+            this.lineno = token.lineno;
+
+            // Start and end are file positions for error handling.
+            this.start = token.start;
+            this.end = token.end;
+        } else {
+            this.lineno = t.lineno;
+        }
+
+        // Node uses a tokenizer for debugging (getSource, filename getter).
+        this.tokenizer = t;
+        this.children = [];
+
+        for (var prop in init)
+            this[prop] = init[prop];
+    }
+
+    /*
+     * SyntheticNode :: (tokenizer, optional init object) -> node
+     */
+    function SyntheticNode(t, init) {
+        // print("SYNTHETIC NODE");
+        // if (init.type === COMMA) {
+        //     print("SYNTHETIC COMMA");
+        //     print(init);
+        // }
+        this.tokenizer = t;
+        this.children = [];
+        for (var prop in init)
+            this[prop] = init[prop];
+        this.synthetic = true;
+    }
+
+    var Np = Node.prototype = SyntheticNode.prototype = {};
+    Np.constructor = Node;
+
+    const TO_SOURCE_SKIP = {
+        type: true,
+        value: true,
+        lineno: true,
+        start: true,
+        end: true,
+        tokenizer: true,
+        assignOp: true
+    };
+    function unevalableConst(code) {
+        var token = definitions.tokens[code];
+        var constName = definitions.opTypeNames.hasOwnProperty(token)
+                      ? definitions.opTypeNames[token]
+                      : token in definitions.keywords
+                      ? token.toUpperCase()
+                      : token;
+        return { toSource: function() { return constName } };
+    }
+    Np.toSource = function toSource() {
+        var mock = {};
+        var self = this;
+        mock.type = unevalableConst(this.type);
+        if ("value" in this)
+            mock.value = this.value;
+        if ("lineno" in this)
+            mock.lineno = this.lineno;
+        if ("start" in this)
+            mock.start = this.start;
+        if ("end" in this)
+            mock.end = this.end;
+        if (this.assignOp)
+            mock.assignOp = unevalableConst(this.assignOp);
+        for (var key in this) {
+            if (this.hasOwnProperty(key) && !(key in TO_SOURCE_SKIP))
+                mock[key] = this[key];
+        }
+        return mock.toSource();
+    };
+
+    // Always use push to add operands to an expression, to update start and end.
+    Np.push = function (kid) {
+        // kid can be null e.g. [1, , 2].
+        if (kid !== null) {
+            if (kid.start < this.start)
+                this.start = kid.start;
+            if (this.end < kid.end)
+                this.end = kid.end;
+        }
+        return this.children.push(kid);
+    }
+
+    Node.indentLevel = 0;
+
+    function tokenString(tt) {
+        var t = definitions.tokens[tt];
+        return /^\W/.test(t) ? definitions.opTypeNames[t] : t.toUpperCase();
+    }
+
+    Np.toString = function () {
+        var a = [];
+        for (var i in this) {
+            if (this.hasOwnProperty(i) && i !== 'type' && i !== 'target')
+                a.push({id: i, value: this[i]});
+        }
+        a.sort(function (a,b) { return (a.id < b.id) ? -1 : 1; });
+        const INDENTATION = "    ";
+        var n = ++Node.indentLevel;
+        var s = "{\n" + INDENTATION.repeat(n) + "type: " + tokenString(this.type);
+        for (i = 0; i < a.length; i++)
+            s += ",\n" + INDENTATION.repeat(n) + a[i].id + ": " + a[i].value;
+        n = --Node.indentLevel;
+        s += "\n" + INDENTATION.repeat(n) + "}";
+        return s;
+    }
+
+    Np.getSource = function () {
+        return this.tokenizer.source.slice(this.start, this.end);
+    };
+
+    /*
+     * Helper init objects for common nodes.
+     */
+
+    const LOOP_INIT = { isLoop: true };
+
+    function blockInit() {
+        return { type: BLOCK, varDecls: [] };
+    }
+
+    function scriptInit() {
+        return { type: SCRIPT,
+                 funDecls: [],
+                 varDecls: [],
+                 modDefns: new StringMap(),
+                 modAssns: new StringMap(),
+                 modDecls: new StringMap(),
+                 modLoads: new StringMap(),
+                 impDecls: [],
+                 expDecls: [],
+                 exports: new StringMap(),
+                 hasEmptyReturn: false,
+                 hasReturnWithValue: false,
+                 isGenerator: false };
+    }
+
+    definitions.defineGetter(Np, "filename",
+                             function() {
+                                 return this.tokenizer.filename;
+                             });
+
+    definitions.defineGetter(Np, "length",
+                             function() {
+                                 throw new Error("Node.prototype.length is gone; " +
+                                                 "use n.children.length instead");
+                             });
+
+    definitions.defineProperty(String.prototype, "repeat",
+                               function(n) {
+                                   var s = "", t = this + s;
+                                   while (--n >= 0)
+                                       s += t;
+                                   return s;
+                               }, false, false, true);
+
+    function MaybeLeftParen(t, x) {
+        if (x.parenFreeMode)
+            return t.match(LEFT_PAREN) ? LEFT_PAREN : END;
+        return t.mustMatch(LEFT_PAREN).type;
+    }
+
+    function MaybeRightParen(t, p) {
+        if (p === LEFT_PAREN)
+            t.mustMatch(RIGHT_PAREN);
+    }
+
+    /*
+     * Statements :: (tokenizer, compiler context, node) -> void
+     *
+     * Parses a sequence of Statements.
+     */
+    function Statements(t, x, n) {
+        try {
+            while (!t.done && t.peek(true) !== RIGHT_CURLY)
+                n.push(Statement(t, x));
+        } catch (e) {
+            if (t.done)
+                t.unexpectedEOF = true;
+            throw e;
+        }
+    }
+
+    function Block(t, x) {
+        t.mustMatch(LEFT_CURLY);
+        var n = new Node(t, blockInit());
+        Statements(t, x.update({ parentBlock: n }).pushTarget(n), n);
+        t.mustMatch(RIGHT_CURLY);
+        return n;
+    }
+
+    const DECLARED_FORM = 0, EXPRESSED_FORM = 1, STATEMENT_FORM = 2;
+
+    /*
+     * Export :: (binding node, boolean) -> Export
+     *
+     * Static semantic representation of a module export.
+     */
+    function Export(node, isDefinition) {
+        this.node = node;                 // the AST node declaring this individual export
+        this.isDefinition = isDefinition; // is the node an 'export'-annotated definition?
+        this.resolved = null;             // resolved pointer to the target of this export
+    }
+
+    /*
+     * registerExport :: (StringMap, EXPORT node) -> void
+     */
+    function registerExport(exports, decl) {
+        function register(name, exp) {
+            if (exports.has(name))
+                throw new SyntaxError("multiple exports of " + name);
+            exports.set(name, exp);
+        }
+
+        switch (decl.type) {
+          case MODULE:
+          case FUNCTION:
+            register(decl.name, new Export(decl, true));
+            break;
+
+          case VAR:
+            for (var i = 0; i < decl.children.length; i++)
+                register(decl.children[i].name, new Export(decl.children[i], true));
+            break;
+
+          case LET:
+          case CONST:
+            throw new Error("NYI: " + definitions.tokens[decl.type]);
+
+          case EXPORT:
+            for (var i = 0; i < decl.pathList.length; i++) {
+                var path = decl.pathList[i];
+                switch (path.type) {
+                  case OBJECT_INIT:
+                    for (var j = 0; j < path.children.length; j++) {
+                        // init :: IDENTIFIER | PROPERTY_INIT
+                        var init = path.children[j];
+                        if (init.type === IDENTIFIER)
+                            register(init.value, new Export(init, false));
+                        else
+                            register(init.children[0].value, new Export(init.children[1], false));
+                    }
+                    break;
+
+                  case DOT:
+                    register(path.children[1].value, new Export(path, false));
+                    break;
+
+                  case IDENTIFIER:
+                    register(path.value, new Export(path, false));
+                    break;
+
+                  default:
+                    throw new Error("unexpected export path: " + definitions.tokens[path.type]);
+                }
+            }
+            break;
+
+          default:
+            throw new Error("unexpected export decl: " + definitions.tokens[exp.type]);
+        }
+    }
+
+    /*
+     * Module :: (node) -> Module
+     *
+     * Static semantic representation of a module.
+     */
+    function Module(node) {
+        var exports = node.body.exports;
+        var modDefns = node.body.modDefns;
+
+        var exportedModules = new StringMap();
+
+        exports.forEach(function(name, exp) {
+            var node = exp.node;
+            if (node.type === MODULE) {
+                exportedModules.set(name, node);
+            } else if (!exp.isDefinition && node.type === IDENTIFIER && modDefns.has(node.value)) {
+                var mod = modDefns.get(node.value);
+                exportedModules.set(name, mod);
+            }
+        });
+
+        this.node = node;
+        this.exports = exports;
+        this.exportedModules = exportedModules;
+    }
+
+    /*
+     * Statement :: (tokenizer, compiler context) -> node
+     *
+     * Parses a Statement.
+     */
+    function Statement(t, x) {
+        var i, label, n, n2, p, c, ss, tt = t.get(true), tt2, x2, x3;
+
+        var comments = t.blockComments;
+
+        if (x.blackList[tt])
+            throw t.newSyntaxError(definitions.tokens[tt] + " statements only allowed in Harmony");
+        if (!x.allow(tt))
+            throw t.newSyntaxError(definitions.tokens[tt] + " statement in illegal context");
+
+        // Cases for statements ending in a right curly return early, avoiding the
+        // common semicolon insertion magic after this switch.
+        switch (tt) {
+          case IMPORT:
+            n = new Node(t);
+            n.pathList = ImportPathList(t, x);
+            x.parentScript.impDecls.push(n);
+            break;
+
+          case EXPORT:
+            switch (t.peek()) {
+              case MODULE:
+              case FUNCTION:
+              case LET:
+              case VAR:
+              case CONST:
+                n = Statement(t, x);
+                n.blockComments = comments;
+                n.exported = true;
+                x.parentScript.expDecls.push(n);
+                registerExport(x.parentScript.exports, n);
+                return n;
+
+              default:
+                n = new Node(t);
+                n.pathList = ExportPathList(t, x);
+                break;
+            }
+            x.parentScript.expDecls.push(n);
+            registerExport(x.parentScript.exports, n);
+            break;
+
+          case MODULE:
+            n = new Node(t);
+            n.blockComments = comments;
+            t.mustMatch(IDENTIFIER);
+            label = t.token.value;
+
+            if (t.match(LEFT_CURLY)) {
+                n.name = label;
+                n.body = Script(t, true, false);
+                n.module = new Module(n);
+                t.mustMatch(RIGHT_CURLY);
+                x.parentScript.modDefns.set(n.name, n);
+                return n;
+            }
+
+            t.unget();
+            ModuleVariables(t, x, n);
+            return n;
+
+          case FUNCTION:
+            // DECLARED_FORM extends funDecls of x, STATEMENT_FORM doesn't.
+            return FunctionDefinition(t, x, true, x.topLevel ? DECLARED_FORM : STATEMENT_FORM, comments);
+
+          case LEFT_CURLY:
+            n = new Node(t, blockInit());
+            Statements(t, x.update({ parentBlock: n }).pushTarget(n).nest(), n);
+            t.mustMatch(RIGHT_CURLY);
+            return n;
+
+          case IF:
+            n = new Node(t);
+            n.condition = HeadExpression(t, x);
+            x2 = x.pushTarget(n).nest();
+            n.thenPart = Statement(t, x2);
+            n.elsePart = t.match(ELSE, true) ? Statement(t, x2) : null;
+            return n;
+
+          case SWITCH:
+            // This allows CASEs after a DEFAULT, which is in the standard.
+            n = new Node(t, { cases: [], defaultIndex: -1 });
+            n.discriminant = HeadExpression(t, x);
+            x2 = x.pushTarget(n).nest();
+            t.mustMatch(LEFT_CURLY);
+            while ((tt = t.get()) !== RIGHT_CURLY) {
+                switch (tt) {
+                  case DEFAULT:
+                    if (n.defaultIndex >= 0)
+                        throw t.newSyntaxError("More than one switch default");
+                    // FALL THROUGH
+                  case CASE:
+                    n2 = new Node(t);
+                    if (tt === DEFAULT)
+                        n.defaultIndex = n.cases.length;
+                    else
+                        n2.caseLabel = Expression(t, x2, COLON);
+                    break;
+
+                  default:
+                    throw t.newSyntaxError("Invalid switch case");
+                }
+                t.mustMatch(COLON);
+                n2.statements = new Node(t, blockInit());
+                while ((tt=t.peek(true)) !== CASE && tt !== DEFAULT &&
+                        tt !== RIGHT_CURLY)
+                    n2.statements.push(Statement(t, x2));
+                n.cases.push(n2);
+            }
+            return n;
+
+          case FOR:
+            n = new Node(t, LOOP_INIT);
+            n.blockComments = comments;
+            if (t.match(IDENTIFIER)) {
+                if (t.token.value === "each")
+                    n.isEach = true;
+                else
+                    t.unget();
+            }
+            if (!x.parenFreeMode)
+                t.mustMatch(LEFT_PAREN);
+            x2 = x.pushTarget(n).nest();
+            x3 = x.update({ inForLoopInit: true });
+            n2 = null;
+            if ((tt = t.peek(true)) !== SEMICOLON) {
+                if (tt === VAR || tt === CONST) {
+                    t.get();
+                    n2 = Variables(t, x3);
+                } else if (tt === LET) {
+                    t.get();
+                    if (t.peek() === LEFT_PAREN) {
+                        n2 = LetBlock(t, x3, false);
+                    } else {
+                        // Let in for head, we need to add an implicit block
+                        // around the rest of the for.
+                        x3.parentBlock = n;
+                        n.varDecls = [];
+                        n2 = Variables(t, x3);
+                    }
+                } else {
+                    n2 = Expression(t, x3);
+                }
+            }
+            if (n2 && t.match(IN)) {
+                n.type = FOR_IN;
+                n.object = Expression(t, x3);
+                if (n2.type === VAR || n2.type === LET) {
+                    c = n2.children;
+
+                    // Destructuring turns one decl into multiples, so either
+                    // there must be only one destructuring or only one
+                    // decl.
+                    if (c.length !== 1 && n2.destructurings.length !== 1) {
+                        throw new SyntaxError("Invalid for..in left-hand side",
+                                              t.filename, n2.lineno);
+                    }
+                    if (n2.destructurings.length > 0) {
+                        n.iterator = n2.destructurings[0];
+                    } else {
+                        n.iterator = c[0];
+                    }
+                    n.varDecl = n2;
+                } else {
+                    if (n2.type === ARRAY_INIT || n2.type === OBJECT_INIT) {
+                        n2.destructuredNames = checkDestructuring(t, x3, n2);
+                    }
+                    n.iterator = n2;
+                }
+            } else {
+                x3.inForLoopInit = false;
+                n.setup = n2;
+                t.mustMatch(SEMICOLON);
+                if (n.isEach)
+                    throw t.newSyntaxError("Invalid for each..in loop");
+                n.condition = (t.peek(true) === SEMICOLON)
+                              ? null
+                              : Expression(t, x3);
+                t.mustMatch(SEMICOLON);
+                tt2 = t.peek(true);
+                n.update = (x.parenFreeMode
+                            ? tt2 === LEFT_CURLY || definitions.isStatementStartCode[tt2]
+                            : tt2 === RIGHT_PAREN)
+                           ? null
+                           : Expression(t, x3);
+            }
+            if (!x.parenFreeMode)
+                t.mustMatch(RIGHT_PAREN);
+            n.body = Statement(t, x2);
+            return n;
+
+          case WHILE:
+            n = new Node(t, { isLoop: true });
+            n.blockComments = comments;
+            n.condition = HeadExpression(t, x);
+            n.body = Statement(t, x.pushTarget(n).nest());
+            return n;
+
+          case DO:
+            n = new Node(t, { isLoop: true });
+            n.blockComments = comments;
+            n.body = Statement(t, x.pushTarget(n).nest());
+            t.mustMatch(WHILE);
+            n.condition = HeadExpression(t, x);
+            if (!x.ecmaStrictMode) {
+                // <script language="JavaScript"> (without version hints) may need
+                // automatic semicolon insertion without a newline after do-while.
+                // See http://bugzilla.mozilla.org/show_bug.cgi?id=238945.
+                t.match(SEMICOLON);
+                return n;
+            }
+            break;
+
+          case BREAK:
+          case CONTINUE:
+            n = new Node(t);
+            n.blockComments = comments;
+
+            // handle the |foo: break foo;| corner case
+            x2 = x.pushTarget(n);
+
+            if (t.peekOnSameLine() === IDENTIFIER) {
+                t.get();
+                n.label = t.token.value;
+            }
+
+            if (n.label) {
+                n.target = x2.labeledTargets.find(function(target) { return target.labels.has(n.label) });
+            } else if (tt === CONTINUE) {
+                n.target = x2.defaultLoopTarget;
+            } else {
+                n.target = x2.defaultTarget;
+            }
+
+            if (!n.target)
+                throw t.newSyntaxError("Invalid " + ((tt === BREAK) ? "break" : "continue"));
+            if (!n.target.isLoop && tt === CONTINUE)
+                throw t.newSyntaxError("Invalid continue");
+
+            break;
+
+          case TRY:
+            n = new Node(t, { catchClauses: [] });
+            n.blockComments = comments;
+            n.tryBlock = Block(t, x);
+            while (t.match(CATCH)) {
+                n2 = new Node(t);
+                p = MaybeLeftParen(t, x);
+                switch (t.get()) {
+                  case LEFT_BRACKET:
+                  case LEFT_CURLY:
+                    // Destructured catch identifiers.
+                    t.unget();
+                    n2.varName = DestructuringExpression(t, x, true);
+                    break;
+                  case IDENTIFIER:
+                    n2.varName = t.token.value;
+                    break;
+                  default:
+                    throw t.newSyntaxError("missing identifier in catch");
+                    break;
+                }
+                if (t.match(IF)) {
+                    if (x.ecma3OnlyMode)
+                        throw t.newSyntaxError("Illegal catch guard");
+                    if (n.catchClauses.length && !n.catchClauses.top().guard)
+                        throw t.newSyntaxError("Guarded catch after unguarded");
+                    n2.guard = Expression(t, x);
+                }
+                MaybeRightParen(t, p);
+                n2.block = Block(t, x);
+                n.catchClauses.push(n2);
+            }
+            if (t.match(FINALLY))
+                n.finallyBlock = Block(t, x);
+            if (!n.catchClauses.length && !n.finallyBlock)
+                throw t.newSyntaxError("Invalid try statement");
+            return n;
+
+          case CATCH:
+          case FINALLY:
+            throw t.newSyntaxError(definitions.tokens[tt] + " without preceding try");
+
+          case THROW:
+            n = new Node(t);
+            n.exception = Expression(t, x);
+            break;
+
+          case RETURN:
+            n = ReturnOrYield(t, x);
+            break;
+
+          case WITH:
+            n = new Node(t);
+            n.blockComments = comments;
+            n.object = HeadExpression(t, x);
+            n.body = Statement(t, x.pushTarget(n).nest());
+            return n;
+
+          case VAR:
+          case CONST:
+            n = Variables(t, x);
+            break;
+
+          case LET:
+            if (t.peek() === LEFT_PAREN)
+                n = LetBlock(t, x, true);
+            else
+                n = Variables(t, x);
+            break;
+
+          case DEBUGGER:
+            n = new Node(t);
+            break;
+
+          case NEWLINE:
+          case SEMICOLON:
+            n = new Node(t, { type: SEMICOLON });
+            n.blockComments = comments;
+            n.expression = null;
+            return n;
+
+          default:
+            if (tt === IDENTIFIER) {
+                tt = t.peek();
+                // Labeled statement.
+                if (tt === COLON) {
+                    label = t.token.value;
+                    if (x.allLabels.has(label))
+                        throw t.newSyntaxError("Duplicate label");
+                    t.get();
+                    n = new Node(t, { type: LABEL, label: label });
+                    n.blockComments = comments;
+                    n.statement = Statement(t, x.pushLabel(label).nest());
+                    n.target = (n.statement.type === LABEL) ? n.statement.target : n.statement;
+                    return n;
+                }
+            }
+
+            // Expression statement.
+            // We unget the current token to parse the expression as a whole.
+            n = new Node(t, { type: SEMICOLON });
+            t.unget();
+            n.blockComments = comments;
+            n.expression = Expression(t, x);
+            n.end = n.expression.end;
+            break;
+        }
+
+        n.blockComments = comments;
+        MagicalSemicolon(t);
+        return n;
+    }
+
+    /*
+     * MagicalSemicolon :: (tokenizer) -> void
+     */
+    function MagicalSemicolon(t) {
+        var tt;
+        if (t.lineno === t.token.lineno) {
+            tt = t.peekOnSameLine();
+            if (tt !== END && tt !== NEWLINE && tt !== SEMICOLON && tt !== RIGHT_CURLY)
+                throw t.newSyntaxError("missing ; before statement");
+        }
+        t.match(SEMICOLON);
+    }
+
+    /*
+     * ReturnOrYield :: (tokenizer, compiler context) -> (RETURN | YIELD) node
+     */
+    function ReturnOrYield(t, x) {
+        var n, b, tt = t.token.type, tt2;
+
+        var parentScript = x.parentScript;
+
+        if (tt === RETURN) {
+            if (!x.inFunction)
+                throw t.newSyntaxError("Return not in function");
+        } else /* if (tt === YIELD) */ {
+            if (!x.inFunction)
+                throw t.newSyntaxError("Yield not in function");
+            parentScript.isGenerator = true;
+        }
+        n = new Node(t, { value: undefined });
+
+        tt2 = (tt === RETURN) ? t.peekOnSameLine(true) : t.peek(true);
+        if (tt2 !== END && tt2 !== NEWLINE &&
+            tt2 !== SEMICOLON && tt2 !== RIGHT_CURLY
+            && (tt !== YIELD ||
+                (tt2 !== tt && tt2 !== RIGHT_BRACKET && tt2 !== RIGHT_PAREN &&
+                 tt2 !== COLON && tt2 !== COMMA))) {
+            if (tt === RETURN) {
+                n.value = Expression(t, x);
+                parentScript.hasReturnWithValue = true;
+            } else {
+                n.value = AssignExpression(t, x);
+            }
+        } else if (tt === RETURN) {
+            parentScript.hasEmptyReturn = true;
+        }
+
+        // Disallow return v; in generator.
+        if (parentScript.hasReturnWithValue && parentScript.isGenerator)
+            throw t.newSyntaxError("Generator returns a value");
+
+        return n;
+    }
+
+    /*
+     * ModuleExpression :: (tokenizer, compiler context) -> (STRING | IDENTIFIER | DOT) node
+     */
+    function ModuleExpression(t, x) {
+        return t.match(STRING) ? new Node(t) : QualifiedPath(t, x);
+    }
+
+    /*
+     * ImportPathList :: (tokenizer, compiler context) -> Array[DOT node]
+     */
+    function ImportPathList(t, x) {
+        var a = [];
+        do {
+            a.push(ImportPath(t, x));
+        } while (t.match(COMMA));
+        return a;
+    }
+
+    /*
+     * ImportPath :: (tokenizer, compiler context) -> DOT node
+     */
+    function ImportPath(t, x) {
+        var n = QualifiedPath(t, x);
+        if (!t.match(DOT)) {
+            if (n.type === IDENTIFIER)
+                throw t.newSyntaxError("cannot import local variable");
+            return n;
+        }
+
+        var n2 = new Node(t);
+        n2.push(n);
+        n2.push(ImportSpecifierSet(t, x));
+        return n2;
+    }
+
+    /*
+     * ExplicitSpecifierSet :: (tokenizer, compiler context, (tokenizer, compiler context) -> node)
+     *                      -> OBJECT_INIT node
+     */
+    function ExplicitSpecifierSet(t, x, SpecifierRHS) {
+        var n, n2, id, tt;
+
+        n = new Node(t, { type: OBJECT_INIT });
+        t.mustMatch(LEFT_CURLY);
+
+        if (!t.match(RIGHT_CURLY)) {
+            do {
+                id = Identifier(t, x);
+                if (t.match(COLON)) {
+                    n2 = new Node(t, { type: PROPERTY_INIT });
+                    n2.push(id);
+                    n2.push(SpecifierRHS(t, x));
+                    n.push(n2);
+                } else {
+                    n.push(id);
+                }
+            } while (!t.match(RIGHT_CURLY) && t.mustMatch(COMMA));
+        }
+
+        return n;
+    }
+
+    /*
+     * ImportSpecifierSet :: (tokenizer, compiler context) -> (IDENTIFIER | OBJECT_INIT) node
+     */
+    function ImportSpecifierSet(t, x) {
+        return t.match(MUL)
+             ? new Node(t, { type: IDENTIFIER, name: "*" })
+             : ExplicitSpecifierSet(t, x, Identifier);
+    }
+
+    /*
+     * Identifier :: (tokenizer, compiler context) -> IDENTIFIER node
+     */
+    function Identifier(t, x) {
+        t.mustMatch(IDENTIFIER);
+        return new Node(t, { type: IDENTIFIER });
+    }
+
+    /*
+     * IdentifierName :: (tokenizer) -> IDENTIFIER node
+     */
+    function IdentifierName(t) {
+        if (t.match(IDENTIFIER))
+            return new Node(t, { type: IDENTIFIER });
+        t.get();
+        if (t.token.value in definitions.keywords)
+            return new Node(t, { type: IDENTIFIER });
+        throw t.newSyntaxError("missing IdentifierName");
+    }
+
+    /*
+     * QualifiedPath :: (tokenizer, compiler context) -> (IDENTIFIER | DOT) node
+     */
+    function QualifiedPath(t, x) {
+        var n, n2;
+
+        n = Identifier(t, x);
+
+        while (t.match(DOT)) {
+            if (t.peek() !== IDENTIFIER) {
+                // Unget the '.' token, which isn't part of the QualifiedPath.
+                t.unget();
+                break;
+            }
+            n2 = new Node(t);
+            n2.push(n);
+            n2.push(Identifier(t, x));
+            n = n2;
+        }
+
+        return n;
+    }
+
+    /*
+     * ExportPath :: (tokenizer, compiler context) -> (IDENTIFIER | DOT | OBJECT_INIT) node
+     */
+    function ExportPath(t, x) {
+        if (t.peek() === LEFT_CURLY)
+            return ExplicitSpecifierSet(t, x, QualifiedPath);
+        return QualifiedPath(t, x);
+    }
+
+    /*
+     * ExportPathList :: (tokenizer, compiler context)
+     *                -> Array[(IDENTIFIER | DOT | OBJECT_INIT) node]
+     */
+    function ExportPathList(t, x) {
+        var a = [];
+        do {
+            a.push(ExportPath(t, x));
+        } while (t.match(COMMA));
+        return a;
+    }
+
+    /*
+     * FunctionDefinition :: (tokenizer, compiler context, boolean,
+     *                        DECLARED_FORM or EXPRESSED_FORM or STATEMENT_FORM,
+     *                        [string] or null or undefined)
+     *                    -> node
+     */
+    function FunctionDefinition(t, x, requireName, functionForm, comments) {
+        var tt;
+        var f = new Node(t, { params: [], paramComments: [] });
+        if (typeof comment === "undefined")
+            comment = null;
+        f.blockComments = comments;
+        if (f.type !== FUNCTION)
+            f.type = (f.value === "get") ? GETTER : SETTER;
+        if (t.match(IDENTIFIER))
+            f.name = t.token.value;
+        else if (requireName)
+            throw t.newSyntaxError("missing function identifier");
+
+        var inModule = x ? x.inModule : false;
+        var x2 = new StaticContext(null, null, inModule, true);
+
+        t.mustMatch(LEFT_PAREN);
+        if (!t.match(RIGHT_PAREN)) {
+            do {
+                tt = t.get();
+                f.paramComments.push(t.lastBlockComment());
+                switch (tt) {
+                  case LEFT_BRACKET:
+                  case LEFT_CURLY:
+                    // Destructured formal parameters.
+                    t.unget();
+                    f.params.push(DestructuringExpression(t, x2));
+                    break;
+                  case IDENTIFIER:
+                    f.params.push(t.token.value);
+                    break;
+                  default:
+                    throw t.newSyntaxError("missing formal parameter");
+                    break;
+                }
+            } while (t.match(COMMA));
+            t.mustMatch(RIGHT_PAREN);
+        }
+
+        // Do we have an expression closure or a normal body?
+        tt = t.get();
+        if (tt !== LEFT_CURLY)
+            t.unget();
+
+        if (tt !== LEFT_CURLY) {
+            f.body = AssignExpression(t, x2);
+            if (f.body.isGenerator)
+                throw t.newSyntaxError("Generator returns a value");
+        } else {
+            f.body = Script(t, inModule, true);
+        }
+
+        if (tt === LEFT_CURLY)
+            t.mustMatch(RIGHT_CURLY);
+
+        f.end = t.token.end;
+        f.functionForm = functionForm;
+        if (functionForm === DECLARED_FORM)
+            x.parentScript.funDecls.push(f);
+        return f;
+    }
+
+    /*
+     * ModuleVariables :: (tokenizer, compiler context, MODULE node) -> void
+     *
+     * Parses a comma-separated list of module declarations (and maybe
+     * initializations).
+     */
+    function ModuleVariables(t, x, n) {
+        var n1, n2;
+        do {
+            n1 = Identifier(t, x);
+            if (t.match(ASSIGN)) {
+                n2 = ModuleExpression(t, x);
+                n1.initializer = n2;
+                if (n2.type === STRING)
+                    x.parentScript.modLoads.set(n1.value, n2.value);
+                else
+                    x.parentScript.modAssns.set(n1.value, n1);
+            }
+            n.push(n1);
+        } while (t.match(COMMA));
+    }
+
+    /*
+     * Variables :: (tokenizer, compiler context) -> node
+     *
+     * Parses a comma-separated list of var declarations (and maybe
+     * initializations).
+     */
+    function Variables(t, x, letBlock) {
+        var n, n2, ss, i, s, tt;
+
+        tt = t.token.type;
+        switch (tt) {
+          case VAR:
+          case CONST:
+            s = x.parentScript;
+            break;
+          case LET:
+            s = x.parentBlock;
+            break;
+          case LEFT_PAREN:
+            tt = LET;
+            s = letBlock;
+            break;
+        }
+
+        n = new Node(t, { type: tt, destructurings: [] });
+
+        do {
+            tt = t.get();
+            if (tt === LEFT_BRACKET || tt === LEFT_CURLY) {
+                // Need to unget to parse the full destructured expression.
+                t.unget();
+
+                var dexp = DestructuringExpression(t, x, true);
+
+                n2 = new Node(t, { type: IDENTIFIER,
+                                   name: dexp,
+                                   readOnly: n.type === CONST });
+                n.push(n2);
+                pushDestructuringVarDecls(n2.name.destructuredNames, s);
+                n.destructurings.push({ exp: dexp, decl: n2 });
+
+                if (x.inForLoopInit && t.peek() === IN) {
+                    continue;
+                }
+
+                t.mustMatch(ASSIGN);
+                if (t.token.assignOp)
+                    throw t.newSyntaxError("Invalid variable initialization");
+
+                n2.blockComment = t.lastBlockComment();
+                n2.initializer = AssignExpression(t, x);
+
+                continue;
+            }
+
+            if (tt !== IDENTIFIER)
+                throw t.newSyntaxError("missing variable name");
+
+            n2 = new Node(t, { type: IDENTIFIER,
+                               name: t.token.value,
+                               readOnly: n.type === CONST });
+            n.push(n2);
+            s.varDecls.push(n2);
+
+            if (t.match(ASSIGN)) {
+                var comment = t.lastBlockComment();
+                if (t.token.assignOp)
+                    throw t.newSyntaxError("Invalid variable initialization");
+
+                n2.initializer = AssignExpression(t, x);
+            } else {
+                var comment = t.lastBlockComment();
+            }
+            n2.blockComment = comment;
+        } while (t.match(COMMA));
+
+        return n;
+    }
+
+    /*
+     * LetBlock :: (tokenizer, compiler context, boolean) -> node
+     *
+     * Does not handle let inside of for loop init.
+     */
+    function LetBlock(t, x, isStatement) {
+        var n, n2;
+
+        // t.token.type must be LET
+        n = new Node(t, { type: LET_BLOCK, varDecls: [] });
+        t.mustMatch(LEFT_PAREN);
+        n.variables = Variables(t, x, n);
+        t.mustMatch(RIGHT_PAREN);
+
+        if (isStatement && t.peek() !== LEFT_CURLY) {
+            /*
+             * If this is really an expression in let statement guise, then we
+             * need to wrap the LET_BLOCK node in a SEMICOLON node so that we pop
+             * the return value of the expression.
+             */
+            n2 = new Node(t, { type: SEMICOLON,
+                               expression: n });
+            isStatement = false;
+        }
+
+        if (isStatement)
+            n.block = Block(t, x);
+        else
+            n.expression = AssignExpression(t, x);
+
+        return n;
+    }
+
+    function checkDestructuring(t, x, n, simpleNamesOnly) {
+        if (n.type === ARRAY_COMP)
+            throw t.newSyntaxError("Invalid array comprehension left-hand side");
+        if (n.type !== ARRAY_INIT && n.type !== OBJECT_INIT)
+            return;
+
+        var lhss = {};
+        var nn, n2, idx, sub, cc, c = n.children;
+        for (var i = 0, j = c.length; i < j; i++) {
+            if (!(nn = c[i]))
+                continue;
+            if (nn.type === PROPERTY_INIT) {
+                cc = nn.children;
+                sub = cc[1];
+                idx = cc[0].value;
+            } else if (n.type === OBJECT_INIT) {
+                // Do we have destructuring shorthand {foo, bar}?
+                sub = nn;
+                idx = nn.value;
+            } else {
+                sub = nn;
+                idx = i;
+            }
+
+            if (sub.type === ARRAY_INIT || sub.type === OBJECT_INIT) {
+                lhss[idx] = checkDestructuring(t, x, sub, simpleNamesOnly);
+            } else {
+                if (simpleNamesOnly && sub.type !== IDENTIFIER) {
+                    // In declarations, lhs must be simple names
+                    throw t.newSyntaxError("missing name in pattern");
+                }
+
+                lhss[idx] = sub;
+            }
+        }
+
+        return lhss;
+    }
+
+    function DestructuringExpression(t, x, simpleNamesOnly) {
+        var n = PrimaryExpression(t, x);
+        // Keep the list of lefthand sides for varDecls
+        n.destructuredNames = checkDestructuring(t, x, n, simpleNamesOnly);
+        return n;
+    }
+
+    function GeneratorExpression(t, x, e) {
+        return new Node(t, { type: GENERATOR,
+                             expression: e,
+                             tail: ComprehensionTail(t, x) });
+    }
+
+    function ComprehensionTail(t, x) {
+        var body, n, n2, n3, p;
+
+        // t.token.type must be FOR
+        body = new Node(t, { type: COMP_TAIL });
+
+        do {
+            // Comprehension tails are always for..in loops.
+            n = new Node(t, { type: FOR_IN, isLoop: true });
+            if (t.match(IDENTIFIER)) {
+                // But sometimes they're for each..in.
+                if (t.token.value === "each")
+                    n.isEach = true;
+                else
+                    t.unget();
+            }
+            p = MaybeLeftParen(t, x);
+            switch(t.get()) {
+              case LEFT_BRACKET:
+              case LEFT_CURLY:
+                t.unget();
+                // Destructured left side of for in comprehension tails.
+                n.iterator = DestructuringExpression(t, x);
+                break;
+
+              case IDENTIFIER:
+                n.iterator = n3 = new Node(t, { type: IDENTIFIER });
+                n3.name = n3.value;
+                n.varDecl = n2 = new Node(t, { type: VAR });
+                n2.push(n3);
+                x.parentScript.varDecls.push(n3);
+                // Don't add to varDecls since the semantics of comprehensions is
+                // such that the variables are in their own function when
+                // desugared.
+                break;
+
+              default:
+                throw t.newSyntaxError("missing identifier");
+            }
+            t.mustMatch(IN);
+            n.object = Expression(t, x);
+            MaybeRightParen(t, p);
+            body.push(n);
+        } while (t.match(FOR));
+
+        // Optional guard.
+        if (t.match(IF))
+            body.guard = HeadExpression(t, x);
+
+        return body;
+    }
+
+    function HeadExpression(t, x) {
+        var p = MaybeLeftParen(t, x);
+        var n = ParenExpression(t, x);
+        MaybeRightParen(t, p);
+        if (p === END && !n.parenthesized) {
+            var tt = t.peek();
+            if (tt !== LEFT_CURLY && !definitions.isStatementStartCode[tt])
+                throw t.newSyntaxError("Unparenthesized head followed by unbraced body");
+        }
+        return n;
+    }
+
+    function ParenExpression(t, x) {
+        // Always accept the 'in' operator in a parenthesized expression,
+        // where it's unambiguous, even if we might be parsing the init of a
+        // for statement.
+        var n = Expression(t, x.update({ inForLoopInit: x.inForLoopInit &&
+                                                        (t.token.type === LEFT_PAREN) }));
+
+        if (t.match(FOR)) {
+            if (n.type === YIELD && !n.parenthesized)
+                throw t.newSyntaxError("Yield expression must be parenthesized");
+            if (n.type === COMMA && !n.parenthesized)
+                throw t.newSyntaxError("Generator expression must be parenthesized");
+            n = GeneratorExpression(t, x, n);
+        }
+
+        return n;
+    }
+
+    /*
+     * Expression :: (tokenizer, compiler context) -> node
+     *
+     * Top-down expression parser matched against SpiderMonkey.
+     */
+    function Expression(t, x) {
+        var n, n2;
+
+        n = AssignExpression(t, x);
+        if (t.match(COMMA)) {
+            n2 = new Node(t, { type: COMMA });
+            n2.push(n);
+            n = n2;
+            do {
+                n2 = n.children[n.children.length-1];
+                if (n2.type === YIELD && !n2.parenthesized)
+                    throw t.newSyntaxError("Yield expression must be parenthesized");
+                n.push(AssignExpression(t, x));
+            } while (t.match(COMMA));
+        }
+
+        return n;
+    }
+
+    function AssignExpression(t, x) {
+        var n, lhs;
+
+        // Have to treat yield like an operand because it could be the leftmost
+        // operand of the expression.
+        if (t.match(YIELD, true))
+            return ReturnOrYield(t, x);
+
+        n = new Node(t, { type: ASSIGN });
+        lhs = ConditionalExpression(t, x);
+
+        if (!t.match(ASSIGN)) {
+            return lhs;
+        }
+
+        n.blockComment = t.lastBlockComment();
+
+        switch (lhs.type) {
+          case OBJECT_INIT:
+          case ARRAY_INIT:
+            lhs.destructuredNames = checkDestructuring(t, x, lhs);
+            // FALL THROUGH
+          case IDENTIFIER: case DOT: case INDEX: case CALL:
+            break;
+          default:
+            throw t.newSyntaxError("Bad left-hand side of assignment");
+            break;
+        }
+
+        n.assignOp = lhs.assignOp = t.token.assignOp;
+        n.push(lhs);
+        n.push(AssignExpression(t, x));
+
+        return n;
+    }
+
+    function ConditionalExpression(t, x) {
+        var n, n2;
+
+        n = OrExpression(t, x);
+        if (t.match(HOOK)) {
+            n2 = n;
+            n = new Node(t, { type: HOOK });
+            n.push(n2);
+            /*
+             * Always accept the 'in' operator in the middle clause of a ternary,
+             * where it's unambiguous, even if we might be parsing the init of a
+             * for statement.
+             */
+            n.push(AssignExpression(t, x.update({ inForLoopInit: false })));
+            if (!t.match(COLON))
+                throw t.newSyntaxError("missing : after ?");
+            n.push(AssignExpression(t, x));
+        }
+
+        return n;
+    }
+
+    function OrExpression(t, x) {
+        var n, n2;
+
+        n = AndExpression(t, x);
+        while (t.match(OR)) {
+            n2 = new Node(t);
+            n2.push(n);
+            n2.push(AndExpression(t, x));
+            n = n2;
+        }
+
+        return n;
+    }
+
+    function AndExpression(t, x) {
+        var n, n2;
+
+        n = BitwiseOrExpression(t, x);
+        while (t.match(AND)) {
+            n2 = new Node(t);
+            n2.push(n);
+            n2.push(BitwiseOrExpression(t, x));
+            n = n2;
+        }
+
+        return n;
+    }
+
+    function BitwiseOrExpression(t, x) {
+        var n, n2;
+
+        n = BitwiseXorExpression(t, x);
+        while (t.match(BITWISE_OR)) {
+            n2 = new Node(t);
+            n2.push(n);
+            n2.push(BitwiseXorExpression(t, x));
+            n = n2;
+        }
+
+        return n;
+    }
+
+    function BitwiseXorExpression(t, x) {
+        var n, n2;
+
+        n = BitwiseAndExpression(t, x);
+        while (t.match(BITWISE_XOR)) {
+            n2 = new Node(t);
+            n2.push(n);
+            n2.push(BitwiseAndExpression(t, x));
+            n = n2;
+        }
+
+        return n;
+    }
+
+    function BitwiseAndExpression(t, x) {
+        var n, n2;
+
+        n = EqualityExpression(t, x);
+        while (t.match(BITWISE_AND)) {
+            n2 = new Node(t);
+            n2.push(n);
+            n2.push(EqualityExpression(t, x));
+            n = n2;
+        }
+
+        return n;
+    }
+
+    function EqualityExpression(t, x) {
+        var n, n2;
+
+        n = RelationalExpression(t, x);
+        while (t.match(EQ) || t.match(NE) ||
+               t.match(STRICT_EQ) || t.match(STRICT_NE)) {
+            n2 = new Node(t);
+            n2.push(n);
+            n2.push(RelationalExpression(t, x));
+            n = n2;
+        }
+
+        return n;
+    }
+
+    function RelationalExpression(t, x) {
+        var n, n2;
+
+        /*
+         * Uses of the in operator in shiftExprs are always unambiguous,
+         * so unset the flag that prohibits recognizing it.
+         */
+        var x2 = x.update({ inForLoopInit: false });
+        n = ShiftExpression(t, x2);
+        while ((t.match(LT) || t.match(LE) || t.match(GE) || t.match(GT) ||
+               (!x.inForLoopInit && t.match(IN)) ||
+               t.match(INSTANCEOF))) {
+            n2 = new Node(t);
+            n2.push(n);
+            n2.push(ShiftExpression(t, x2));
+            n = n2;
+        }
+
+        return n;
+    }
+
+    function ShiftExpression(t, x) {
+        var n, n2;
+
+        n = AddExpression(t, x);
+        while (t.match(LSH) || t.match(RSH) || t.match(URSH)) {
+            n2 = new Node(t);
+            n2.push(n);
+            n2.push(AddExpression(t, x));
+            n = n2;
+        }
+
+        return n;
+    }
+
+    function AddExpression(t, x) {
+        var n, n2;
+
+        n = MultiplyExpression(t, x);
+        while (t.match(PLUS) || t.match(MINUS)) {
+            n2 = new Node(t);
+            n2.push(n);
+            n2.push(MultiplyExpression(t, x));
+            n = n2;
+        }
+
+        return n;
+    }
+
+    function MultiplyExpression(t, x) {
+        var n, n2;
+
+        n = UnaryExpression(t, x);
+        while (t.match(MUL) || t.match(DIV) || t.match(MOD)) {
+            n2 = new Node(t);
+            n2.push(n);
+            n2.push(UnaryExpression(t, x));
+            n = n2;
+        }
+
+        return n;
+    }
+
+    function UnaryExpression(t, x) {
+        var n, n2, tt;
+
+        switch (tt = t.get(true)) {
+          case DELETE: case VOID: case TYPEOF:
+          case NOT: case BITWISE_NOT: case PLUS: case MINUS:
+            if (tt === PLUS)
+                n = new Node(t, { type: UNARY_PLUS });
+            else if (tt === MINUS)
+                n = new Node(t, { type: UNARY_MINUS });
+            else
+                n = new Node(t);
+            n.push(UnaryExpression(t, x));
+            break;
+
+          case INCREMENT:
+          case DECREMENT:
+            // Prefix increment/decrement.
+            n = new Node(t);
+            n.push(MemberExpression(t, x, true));
+            break;
+
+          default:
+            t.unget();
+            n = MemberExpression(t, x, true);
+
+            // Don't look across a newline boundary for a postfix {in,de}crement.
+            if (t.tokens[(t.tokenIndex + t.lookahead - 1) & 3].lineno ===
+                t.lineno) {
+                if (t.match(INCREMENT) || t.match(DECREMENT)) {
+                    n2 = new Node(t, { postfix: true });
+                    n2.push(n);
+                    n = n2;
+                }
+            }
+            break;
+        }
+
+        return n;
+    }
+
+    function MemberExpression(t, x, allowCallSyntax) {
+        var n, n2, name, tt;
+
+        if (t.match(NEW)) {
+            n = new Node(t);
+            n.push(MemberExpression(t, x, false));
+            if (t.match(LEFT_PAREN)) {
+                n.type = NEW_WITH_ARGS;
+                n.push(ArgumentList(t, x));
+            }
+        } else {
+            n = PrimaryExpression(t, x);
+        }
+
+        while ((tt = t.get()) !== END) {
+            switch (tt) {
+              case DOT:
+                n2 = new Node(t);
+                n2.push(n);
+                n2.push(IdentifierName(t));
+                break;
+
+              case LEFT_BRACKET:
+                n2 = new Node(t, { type: INDEX });
+                n2.push(n);
+                n2.push(Expression(t, x));
+                t.mustMatch(RIGHT_BRACKET);
+                break;
+
+              case LEFT_PAREN:
+                if (allowCallSyntax) {
+                    n2 = new Node(t, { type: CALL });
+                    n2.push(n);
+                    n2.push(ArgumentList(t, x));
+                    break;
+                }
+
+                // FALL THROUGH
+              default:
+                t.unget();
+                return n;
+            }
+
+            n = n2;
+        }
+
+        return n;
+    }
+
+    function ArgumentList(t, x) {
+        var n, n2;
+
+        n = new Node(t, { type: LIST });
+        if (t.match(RIGHT_PAREN, true))
+            return n;
+        do {
+            n2 = AssignExpression(t, x);
+            if (n2.type === YIELD && !n2.parenthesized && t.peek() === COMMA)
+                throw t.newSyntaxError("Yield expression must be parenthesized");
+            if (t.match(FOR)) {
+                n2 = GeneratorExpression(t, x, n2);
+                if (n.children.length > 1 || t.peek(true) === COMMA)
+                    throw t.newSyntaxError("Generator expression must be parenthesized");
+            }
+            n.push(n2);
+        } while (t.match(COMMA));
+        t.mustMatch(RIGHT_PAREN);
+
+        return n;
+    }
+
+    function PrimaryExpression(t, x) {
+        var n, n2, tt = t.get(true);
+
+        switch (tt) {
+          case FUNCTION:
+            n = FunctionDefinition(t, x, false, EXPRESSED_FORM);
+            break;
+
+          case LEFT_BRACKET:
+            n = new Node(t, { type: ARRAY_INIT });
+            while ((tt = t.peek(true)) !== RIGHT_BRACKET) {
+                if (tt === COMMA) {
+                    t.get();
+                    n.push(null);
+                    continue;
+                }
+                n.push(AssignExpression(t, x));
+                if (tt !== COMMA && !t.match(COMMA))
+                    break;
+            }
+
+            // If we matched exactly one element and got a FOR, we have an
+            // array comprehension.
+            if (n.children.length === 1 && t.match(FOR)) {
+                n2 = new Node(t, { type: ARRAY_COMP,
+                                   expression: n.children[0],
+                                   tail: ComprehensionTail(t, x) });
+                n = n2;
+            }
+            t.mustMatch(RIGHT_BRACKET);
+            break;
+
+          case LEFT_CURLY:
+            var id, fd;
+            n = new Node(t, { type: OBJECT_INIT });
+
+          object_init:
+            if (!t.match(RIGHT_CURLY)) {
+                do {
+                    tt = t.get();
+                    if ((t.token.value === "get" || t.token.value === "set") &&
+                        t.peek() === IDENTIFIER) {
+                        if (x.ecma3OnlyMode)
+                            throw t.newSyntaxError("Illegal property accessor");
+                        n.push(FunctionDefinition(t, x, true, EXPRESSED_FORM));
+                    } else {
+                        var comments = t.blockComments;
+                        switch (tt) {
+                          case IDENTIFIER: case NUMBER: case STRING:
+                            id = new Node(t, { type: IDENTIFIER });
+                            break;
+                          case RIGHT_CURLY:
+                            if (x.ecma3OnlyMode)
+                                throw t.newSyntaxError("Illegal trailing ,");
+                            break object_init;
+                          default:
+                            if (t.token.value in definitions.keywords) {
+                                id = new Node(t, { type: IDENTIFIER });
+                                break;
+                            }
+                            throw t.newSyntaxError("Invalid property name");
+                        }
+                        if (t.match(COLON)) {
+                            n2 = new Node(t, { type: PROPERTY_INIT });
+                            n2.push(id);
+                            n2.push(AssignExpression(t, x));
+                            n2.blockComments = comments;
+                            n.push(n2);
+                        } else {
+                            // Support, e.g., |var {x, y} = o| as destructuring shorthand
+                            // for |var {x: x, y: y} = o|, per proposed JS2/ES4 for JS1.8.
+                            if (t.peek() !== COMMA && t.peek() !== RIGHT_CURLY)
+                                throw t.newSyntaxError("missing : after property");
+                            n.push(id);
+                        }
+                    }
+                } while (t.match(COMMA));
+                t.mustMatch(RIGHT_CURLY);
+            }
+            break;
+
+          case LEFT_PAREN:
+            n = ParenExpression(t, x);
+            t.mustMatch(RIGHT_PAREN);
+            n.parenthesized = true;
+            break;
+
+          case LET:
+            n = LetBlock(t, x, false);
+            break;
+
+          case NULL: case THIS: case TRUE: case FALSE:
+          case IDENTIFIER: case NUMBER: case STRING: case REGEXP:
+            n = new Node(t);
+            break;
+
+          default:
+            throw t.newSyntaxError("missing operand");
+            break;
+        }
+
+        return n;
+    }
+
+    /*
+     * parse :: (source, filename, line number) -> node
+     */
+    function parse(s, f, l) {
+        var t = new lexer.Tokenizer(s, f, l);
+        var n = Script(t, false, false);
+        if (!t.done)
+            throw t.newSyntaxError("Syntax error");
+
+        return n;
+    }
+
+    /*
+     * parseStdin :: (source, {line number}, string, (string) -> boolean) -> program node
+     */
+    function parseStdin(s, ln, prefix, isCommand) {
+        // the special .begin command is only recognized at the beginning
+        if (s.match(/^[\s]*\.begin[\s]*$/)) {
+            ++ln.value;
+            return parseMultiline(ln, prefix);
+        }
+
+        // commands at the beginning are treated as the entire input
+        if (isCommand(s.trim()))
+            s = "";
+
+        for (;;) {
+            try {
+                var t = new lexer.Tokenizer(s, "stdin", ln.value);
+                var n = Script(t, false, false);
+                ln.value = t.lineno;
+                return n;
+            } catch (e) {
+                if (!t.unexpectedEOF)
+                    throw e;
+
+                // commands in the middle are not treated as part of the input
+                var more;
+                do {
+                    if (prefix)
+                        putstr(prefix);
+                    more = readline();
+                    if (!more)
+                        throw e;
+                } while (isCommand(more.trim()));
+
+                s += "\n" + more;
+            }
+        }
+    }
+
+    /*
+     * parseMultiline :: ({line number}, string | null) -> program node
+     */
+    function parseMultiline(ln, prefix) {
+        var s = "";
+        for (;;) {
+            if (prefix)
+                putstr(prefix);
+            var more = readline();
+            if (more === null)
+                return null;
+            // the only command recognized in multiline mode is .end
+            if (more.match(/^[\s]*\.end[\s]*$/))
+                break;
+            s += "\n" + more;
+        }
+        var t = new lexer.Tokenizer(s, "stdin", ln.value);
+        var n = Script(t, false, false);
+        ln.value = t.lineno;
+        return n;
+    }
+
+    module.exports = {
+        parse: parse,
+        parseStdin: parseStdin,
+        Node: Node,
+        SyntheticNode: SyntheticNode,
+        DECLARED_FORM: DECLARED_FORM,
+        EXPRESSED_FORM: EXPRESSED_FORM,
+        STATEMENT_FORM: STATEMENT_FORM,
+        Tokenizer: lexer.Tokenizer,
+        FunctionDefinition: FunctionDefinition,
+        Module: Module,
+        Export: Export
+    };
+
+});/* vim: set sw=4 ts=4 et tw=78: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Narcissus JavaScript engine.
+ *
+ * The Initial Developer of the Original Code is
+ * Brendan Eich <brendan@mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Tom Austin <taustin@ucsc.edu>
+ *   Brendan Eich <brendan@mozilla.org>
+ *   Shu-Yu Guo <shu@rfrn.org>
+ *   Dave Herman <dherman@mozilla.com>
+ *   Dimitris Vardoulakis <dimvar@ccs.neu.edu>
+ *   Patrick Walton <pcwalton@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Narcissus - JS implemented in JS.
+ *
+ * Lexical scanner.
+ */
+
+ define('ace/narcissus/jslex', ['require', 'exports', 'module' , 'ace/narcissus/jsdefs'], function(require, exports, module) {
+
+    var definitions = require("./jsdefs");
+
+    // Set constants in the local scope.
+    eval(definitions.consts);
+
+    // Banned keywords by language version
+    const blackLists = { 160: {}, 185: {}, harmony: {} };
+    blackLists[160][LET] = true;
+    blackLists[160][MODULE] = true;
+    blackLists[160][YIELD] = true;
+    blackLists[185][MODULE] = true;
+
+    // Build up a trie of operator tokens.
+    var opTokens = {};
+    for (var op in definitions.opTypeNames) {
+        if (op === '\n' || op === '.')
+            continue;
+
+        var node = opTokens;
+        for (var i = 0; i < op.length; i++) {
+            var ch = op[i];
+            if (!(ch in node))
+                node[ch] = {};
+            node = node[ch];
+            node.op = op;
+        }
+    }
+
+    /*
+     * Tokenizer :: (source, filename, line number) -> Tokenizer
+     */
+    function Tokenizer(s, f, l) {
+        this.cursor = 0;
+        this.source = String(s);
+        this.tokens = [];
+        this.tokenIndex = 0;
+        this.lookahead = 0;
+        this.scanNewlines = false;
+        this.unexpectedEOF = false;
+        this.filename = f || "";
+        this.lineno = l || 1;
+        this.blackList = blackLists[Narcissus.options.version];
+        this.blockComments = null;
+    }
+
+    Tokenizer.prototype = {
+        get done() {
+            // We need to set scanOperand to true here because the first thing
+            // might be a regexp.
+            return this.peek(true) === END;
+        },
+
+        get token() {
+            return this.tokens[this.tokenIndex];
+        },
+
+        match: function (tt, scanOperand) {
+            return this.get(scanOperand) === tt || this.unget();
+        },
+
+        mustMatch: function (tt) {
+            if (!this.match(tt)) {
+                throw this.newSyntaxError("Missing " +
+                                          definitions.tokens[tt].toLowerCase());
+            }
+            return this.token;
+        },
+
+        peek: function (scanOperand) {
+            var tt, next;
+            if (this.lookahead) {
+                next = this.tokens[(this.tokenIndex + this.lookahead) & 3];
+                tt = (this.scanNewlines && next.lineno !== this.lineno)
+                     ? NEWLINE
+                     : next.type;
+            } else {
+                tt = this.get(scanOperand);
+                this.unget();
+            }
+            return tt;
+        },
+
+        peekOnSameLine: function (scanOperand) {
+            this.scanNewlines = true;
+            var tt = this.peek(scanOperand);
+            this.scanNewlines = false;
+            return tt;
+        },
+
+        lastBlockComment: function() {
+            var length = this.blockComments.length;
+            return length ? this.blockComments[length - 1] : null;
+        },
+
+        // Eat comments and whitespace.
+        skip: function () {
+            var input = this.source;
+            this.blockComments = [];
+            for (;;) {
+                var ch = input[this.cursor++];
+                var next = input[this.cursor];
+                // handle \r, \r\n and (always preferable) \n
+                if (ch === '\r') {
+                    // if the next character is \n, we don't care about this at all
+                    if (next === '\n') continue;
+
+                    // otherwise, we want to consider this as a newline
+                    ch = '\n';
+                }
+
+                if (ch === '\n' && !this.scanNewlines) {
+                    this.lineno++;
+                } else if (ch === '/' && next === '*') {
+                    var commentStart = ++this.cursor;
+                    for (;;) {
+                        ch = input[this.cursor++];
+                        if (ch === undefined)
+                            throw this.newSyntaxError("Unterminated comment");
+
+                        if (ch === '*') {
+                            next = input[this.cursor];
+                            if (next === '/') {
+                                var commentEnd = this.cursor - 1;
+                                this.cursor++;
+                                break;
+                            }
+                        } else if (ch === '\n') {
+                            this.lineno++;
+                        }
+                    }
+                    this.blockComments.push(input.substring(commentStart, commentEnd));
+                } else if (ch === '/' && next === '/') {
+                    this.cursor++;
+                    for (;;) {
+                        ch = input[this.cursor++];
+                        next = input[this.cursor];
+                        if (ch === undefined)
+                            return;
+
+                        if (ch === '\r') {
+                            // check for \r\n
+                            if (next !== '\n') ch = '\n';
+                        }
+
+                        if (ch === '\n') {
+                            if (this.scanNewlines) {
+                                this.cursor--;
+                            } else {
+                                this.lineno++;
+                            }
+                            break;
+                        }
+                    }
+                } else if (!(ch in definitions.whitespace)) {
+                    this.cursor--;
+                    return;
+                }
+            }
+        },
+
+        // Lex the exponential part of a number, if present. Return true iff an
+        // exponential part was found.
+        lexExponent: function() {
+            var input = this.source;
+            var next = input[this.cursor];
+            if (next === 'e' || next === 'E') {
+                this.cursor++;
+                ch = input[this.cursor++];
+                if (ch === '+' || ch === '-')
+                    ch = input[this.cursor++];
+
+                if (ch < '0' || ch > '9')
+                    throw this.newSyntaxError("Missing exponent");
+
+                do {
+                    ch = input[this.cursor++];
+                } while (ch >= '0' && ch <= '9');
+                this.cursor--;
+
+                return true;
+            }
+
+            return false;
+        },
+
+        lexZeroNumber: function (ch) {
+            var token = this.token, input = this.source;
+            token.type = NUMBER;
+
+            ch = input[this.cursor++];
+            if (ch === '.') {
+                do {
+                    ch = input[this.cursor++];
+                } while (ch >= '0' && ch <= '9');
+                this.cursor--;
+
+                this.lexExponent();
+                token.value = parseFloat(token.start, this.cursor);
+            } else if (ch === 'x' || ch === 'X') {
+                do {
+                    ch = input[this.cursor++];
+                } while ((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') ||
+                         (ch >= 'A' && ch <= 'F'));
+                this.cursor--;
+
+                token.value = parseInt(input.substring(token.start, this.cursor));
+            } else if (ch >= '0' && ch <= '7') {
+                do {
+                    ch = input[this.cursor++];
+                } while (ch >= '0' && ch <= '7');
+                this.cursor--;
+
+                token.value = parseInt(input.substring(token.start, this.cursor));
+            } else {
+                this.cursor--;
+                this.lexExponent();     // 0E1, &c.
+                token.value = 0;
+            }
+        },
+
+        lexNumber: function (ch) {
+            var token = this.token, input = this.source;
+            token.type = NUMBER;
+
+            var floating = false;
+            do {
+                ch = input[this.cursor++];
+                if (ch === '.' && !floating) {
+                    floating = true;
+                    ch = input[this.cursor++];
+                }
+            } while (ch >= '0' && ch <= '9');
+
+            this.cursor--;
+
+            var exponent = this.lexExponent();
+            floating = floating || exponent;
+
+            var str = input.substring(token.start, this.cursor);
+            token.value = floating ? parseFloat(str) : parseInt(str);
+        },
+
+        lexDot: function (ch) {
+            var token = this.token, input = this.source;
+            var next = input[this.cursor];
+            if (next >= '0' && next <= '9') {
+                do {
+                    ch = input[this.cursor++];
+                } while (ch >= '0' && ch <= '9');
+                this.cursor--;
+
+                this.lexExponent();
+
+                token.type = NUMBER;
+                token.value = parseFloat(token.start, this.cursor);
+            } else {
+                token.type = DOT;
+                token.assignOp = null;
+                token.value = '.';
+            }
+        },
+
+        lexString: function (ch) {
+            var token = this.token, input = this.source;
+            token.type = STRING;
+
+            var hasEscapes = false;
+            var delim = ch;
+            if (input.length <= this.cursor)
+                throw this.newSyntaxError("Unterminated string literal");
+            while ((ch = input[this.cursor++]) !== delim) {
+                if (this.cursor == input.length)
+                    throw this.newSyntaxError("Unterminated string literal");
+                if (ch === '\\') {
+                    hasEscapes = true;
+                    if (++this.cursor == input.length)
+                        throw this.newSyntaxError("Unterminated string literal");
+                }
+            }
+
+            token.value = hasEscapes
+                          ? eval(input.substring(token.start, this.cursor))
+                          : input.substring(token.start + 1, this.cursor - 1);
+        },
+
+        lexRegExp: function (ch) {
+            var token = this.token, input = this.source;
+            token.type = REGEXP;
+
+            do {
+                ch = input[this.cursor++];
+                if (ch === '\\') {
+                    this.cursor++;
+                } else if (ch === '[') {
+                    do {
+                        if (ch === undefined)
+                            throw this.newSyntaxError("Unterminated character class");
+
+                        if (ch === '\\')
+                            this.cursor++;
+
+                        ch = input[this.cursor++];
+                    } while (ch !== ']');
+                } else if (ch === undefined) {
+                    throw this.newSyntaxError("Unterminated regex");
+                }
+            } while (ch !== '/');
+
+            do {
+                ch = input[this.cursor++];
+            } while (ch >= 'a' && ch <= 'z');
+
+            this.cursor--;
+
+            token.value = eval(input.substring(token.start, this.cursor));
+        },
+
+        lexOp: function (ch) {
+            var token = this.token, input = this.source;
+
+            // A bit ugly, but it seems wasteful to write a trie lookup routine
+            // for only 3 characters...
+            var node = opTokens[ch];
+            var next = input[this.cursor];
+            if (next in node) {
+                node = node[next];
+                this.cursor++;
+                next = input[this.cursor];
+                if (next in node) {
+                    node = node[next];
+                    this.cursor++;
+                    next = input[this.cursor];
+                }
+            }
+
+            var op = node.op;
+            if (definitions.assignOps[op] && input[this.cursor] === '=') {
+                this.cursor++;
+                token.type = ASSIGN;
+                token.assignOp = definitions.tokenIds[definitions.opTypeNames[op]];
+                op += '=';
+            } else {
+                token.type = definitions.tokenIds[definitions.opTypeNames[op]];
+                token.assignOp = null;
+            }
+
+            token.value = op;
+        },
+
+        // FIXME: Unicode escape sequences
+        lexIdent: function (ch) {
+            var token = this.token;
+            var id = ch;
+
+            while ((ch = this.getValidIdentifierChar(false)) !== null) {
+                id += ch;
+            }
+
+            token.type = definitions.keywords[id] || IDENTIFIER;
+            if (token.type in this.blackList) {
+                // banned keyword, this is an identifier
+                token.type = IDENTIFIER;
+            }
+            token.value = id;
+        },
+
+        /*
+         * Tokenizer.get :: void -> token type
+         *
+         * Consume input *only* if there is no lookahead.
+         * Dispatch to the appropriate lexing function depending on the input.
+         */
+        get: function (scanOperand) {
+            var token;
+            while (this.lookahead) {
+                --this.lookahead;
+                this.tokenIndex = (this.tokenIndex + 1) & 3;
+                token = this.tokens[this.tokenIndex];
+                if (token.type !== NEWLINE || this.scanNewlines)
+                    return token.type;
+            }
+
+            this.skip();
+
+            this.tokenIndex = (this.tokenIndex + 1) & 3;
+            token = this.tokens[this.tokenIndex];
+            if (!token)
+                this.tokens[this.tokenIndex] = token = {};
+
+            var input = this.source;
+            if (this.cursor >= input.length)
+                return token.type = END;
+
+            token.start = this.cursor;
+            token.lineno = this.lineno;
+
+            var ich = this.getValidIdentifierChar(true);
+            var ch = (ich === null) ? input[this.cursor++] : null;
+            if (ich !== null) {
+                this.lexIdent(ich);
+            } else if (scanOperand && ch === '/') {
+                this.lexRegExp(ch);
+            } else if (ch in opTokens) {
+                this.lexOp(ch);
+            } else if (ch === '.') {
+                this.lexDot(ch);
+            } else if (ch >= '1' && ch <= '9') {
+                this.lexNumber(ch);
+            } else if (ch === '0') {
+                this.lexZeroNumber(ch);
+            } else if (ch === '"' || ch === "'") {
+                this.lexString(ch);
+            } else if (this.scanNewlines && (ch === '\n' || ch === '\r')) {
+                // if this was a \r, look for \r\n
+                if (ch === '\r' && input[this.cursor] === '\n') this.cursor++;
+                token.type = NEWLINE;
+                token.value = '\n';
+                this.lineno++;
+            } else {
+                throw this.newSyntaxError("Illegal token");
+            }
+
+            token.end = this.cursor;
+            return token.type;
+        },
+
+        /*
+         * Tokenizer.unget :: void -> undefined
+         *
+         * Match depends on unget returning undefined.
+         */
+        unget: function () {
+            if (++this.lookahead === 4) throw "PANIC: too much lookahead!";
+            this.tokenIndex = (this.tokenIndex - 1) & 3;
+        },
+
+        newSyntaxError: function (m) {
+            m = (this.filename ? this.filename + ":" : "") + this.lineno + ": " + m;
+            var e = new SyntaxError(m, this.filename, this.lineno);
+            e.source = this.source;
+            e.cursor = this.lookahead
+                       ? this.tokens[(this.tokenIndex + this.lookahead) & 3].start
+                       : this.cursor;
+            return e;
+        },
+
+        /* Gets a single valid identifier char from the input stream, or null
+         * if there is none.
+         * Since JavaScript provides no convenient way to determine if a
+         * character is in a particular Unicode category, we use
+         * metacircularity to accomplish this (oh yeaaaah!) */
+        getValidIdentifierChar: function(first) {
+            var input = this.source;
+            if (this.cursor >= input.length) return null;
+            var ch = input[this.cursor];
+
+            // first check for \u escapes
+            if (ch === '\\' && input[this.cursor+1] === 'u') {
+                // get the character value
+                try {
+                    ch = String.fromCharCode(parseInt(
+                        input.substring(this.cursor + 2, this.cursor + 6),
+                        16));
+                } catch (ex) {
+                    return null;
+                }
+                this.cursor += 5;
+            }
+
+            // check directly for ASCII
+            if (ch <= "\u007F") {
+                if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch === '$' || ch === '_' ||
+                    (!first && (ch >= '0' && ch <= '9'))) {
+                    this.cursor++;
+                    return ch;
+                }
+                return null;
+            }
+    
+            // create an object to test this in
+            var x = {};
+            x["x"+ch] = true;
+            x[ch] = true;
+    
+            // then use eval to determine if it's a valid character
+            var valid = false;
+            try {
+                valid = (Function("x", "return (x." + (first?"":"x") + ch + ");")(x) === true);
+            } catch (ex) {}
+            if (valid) this.cursor++;
+            return (valid ? ch : null);
+        },
+    };
+
+
+    module.exports = { Tokenizer: Tokenizer };
+
+});
+/* vim: set sw=4 ts=4 et tw=78: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Narcissus JavaScript engine.
+ *
+ * The Initial Developer of the Original Code is
+ * Brendan Eich <brendan@mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Tom Austin <taustin@ucsc.edu>
+ *   Brendan Eich <brendan@mozilla.org>
+ *   Shu-Yu Guo <shu@rfrn.org>
+ *   Dave Herman <dherman@mozilla.com>
+ *   Dimitris Vardoulakis <dimvar@ccs.neu.edu>
+ *   Patrick Walton <pcwalton@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Narcissus - JS implemented in JS.
+ *
+ * Well-known constants and lookup tables.  Many consts are generated from the
+ * tokens table via eval to minimize redundancy, so consumers must be compiled
+ * separately to take advantage of the simple switch-case constant propagation
+ * done by SpiderMonkey.
+ */
+
+define('ace/narcissus/jsdefs', ['require', 'exports', 'module' ], function(require, exports, module) {
+
+    var narcissus = {
+        options: {
+            version: 185,
+            // Global variables to hide from the interpreter
+            hiddenHostGlobals: { Narcissus: true },
+            // Desugar SpiderMonkey language extensions?
+            desugarExtensions: false
+        },
+        hostSupportsEvalConst: (function() {
+            try {
+                return eval("(function(s) { eval(s); return x })('const x = true;')");
+            } catch (e) {
+                return false;
+            }
+        })(),
+        hostGlobal: this
+    };
+    Narcissus = narcissus;
+
+    var tokens = [
+        // End of source.
+        "END",
+
+        // Operators and punctuators.  Some pair-wise order matters, e.g. (+, -)
+        // and (UNARY_PLUS, UNARY_MINUS).
+        "\n", ";",
+        ",",
+        "=",
+        "?", ":", "CONDITIONAL",
+        "||",
+        "&&",
+        "|",
+        "^",
+        "&",
+        "==", "!=", "===", "!==",
+        "<", "<=", ">=", ">",
+        "<<", ">>", ">>>",
+        "+", "-",
+        "*", "/", "%",
+        "!", "~", "UNARY_PLUS", "UNARY_MINUS",
+        "++", "--",
+        ".",
+        "[", "]",
+        "{", "}",
+        "(", ")",
+
+        // Nonterminal tree node type codes.
+        "SCRIPT", "BLOCK", "LABEL", "FOR_IN", "CALL", "NEW_WITH_ARGS", "INDEX",
+        "ARRAY_INIT", "OBJECT_INIT", "PROPERTY_INIT", "GETTER", "SETTER",
+        "GROUP", "LIST", "LET_BLOCK", "ARRAY_COMP", "GENERATOR", "COMP_TAIL",
+
+        // Terminals.
+        "IDENTIFIER", "NUMBER", "STRING", "REGEXP",
+
+        // Keywords.
+        "break",
+        "case", "catch", "const", "continue",
+        "debugger", "default", "delete", "do",
+        "else", "export",
+        "false", "finally", "for", "function",
+        "if", "import", "in", "instanceof",
+        "let", "module",
+        "new", "null",
+        "return",
+        "switch",
+        "this", "throw", "true", "try", "typeof",
+        "var", "void",
+        "yield",
+        "while", "with",
+    ];
+
+    var statementStartTokens = [
+        "break",
+        "const", "continue",
+        "debugger", "do",
+        "for",
+        "if",
+        "return",
+        "switch",
+        "throw", "try",
+        "var",
+        "yield",
+        "while", "with",
+    ];
+
+    // Whitespace characters (see ECMA-262 7.2)
+    var whitespaceChars = [
+        // normal whitespace:
+        "\u0009", "\u000B", "\u000C", "\u0020", "\u00A0", "\uFEFF", 
+
+        // high-Unicode whitespace:
+        "\u1680", "\u180E",
+        "\u2000", "\u2001", "\u2002", "\u2003", "\u2004", "\u2005", "\u2006",
+        "\u2007", "\u2008", "\u2009", "\u200A",
+        "\u202F", "\u205F", "\u3000"
+    ];
+
+    var whitespace = {};
+    for (var i = 0; i < whitespaceChars.length; i++) {
+        whitespace[whitespaceChars[i]] = true;
+    }
+
+    // Operator and punctuator mapping from token to tree node type name.
+    // NB: because the lexer doesn't backtrack, all token prefixes must themselves
+    // be valid tokens (e.g. !== is acceptable because its prefixes are the valid
+    // tokens != and !).
+    var opTypeNames = {
+        '\n':   "NEWLINE",
+        ';':    "SEMICOLON",
+        ',':    "COMMA",
+        '?':    "HOOK",
+        ':':    "COLON",
+        '||':   "OR",
+        '&&':   "AND",
+        '|':    "BITWISE_OR",
+        '^':    "BITWISE_XOR",
+        '&':    "BITWISE_AND",
+        '===':  "STRICT_EQ",
+        '==':   "EQ",
+        '=':    "ASSIGN",
+        '!==':  "STRICT_NE",
+        '!=':   "NE",
+        '<<':   "LSH",
+        '<=':   "LE",
+        '<':    "LT",
+        '>>>':  "URSH",
+        '>>':   "RSH",
+        '>=':   "GE",
+        '>':    "GT",
+        '++':   "INCREMENT",
+        '--':   "DECREMENT",
+        '+':    "PLUS",
+        '-':    "MINUS",
+        '*':    "MUL",
+        '/':    "DIV",
+        '%':    "MOD",
+        '!':    "NOT",
+        '~':    "BITWISE_NOT",
+        '.':    "DOT",
+        '[':    "LEFT_BRACKET",
+        ']':    "RIGHT_BRACKET",
+        '{':    "LEFT_CURLY",
+        '}':    "RIGHT_CURLY",
+        '(':    "LEFT_PAREN",
+        ')':    "RIGHT_PAREN"
+    };
+
+    // Hash of keyword identifier to tokens index.  NB: we must null __proto__ to
+    // avoid toString, etc. namespace pollution.
+    var keywords = {__proto__: null};
+
+    // Define const END, etc., based on the token names.  Also map name to index.
+    var tokenIds = {};
+
+    // Building up a string to be eval'd in different contexts.
+    var consts = Narcissus.hostSupportsEvalConst ? "const " : "var ";
+    for (var i = 0, j = tokens.length; i < j; i++) {
+        if (i > 0)
+            consts += ", ";
+        var t = tokens[i];
+        var name;
+        if (/^[a-z]/.test(t)) {
+            name = t.toUpperCase();
+            keywords[t] = i;
+        } else {
+            name = (/^\W/.test(t) ? opTypeNames[t] : t);
+        }
+        consts += name + " = " + i;
+        tokenIds[name] = i;
+        tokens[t] = i;
+    }
+    consts += ";";
+
+    var isStatementStartCode = {__proto__: null};
+    for (i = 0, j = statementStartTokens.length; i < j; i++)
+        isStatementStartCode[keywords[statementStartTokens[i]]] = true;
+
+    // Map assignment operators to their indexes in the tokens array.
+    var assignOps = ['|', '^', '&', '<<', '>>', '>>>', '+', '-', '*', '/', '%'];
+
+    for (i = 0, j = assignOps.length; i < j; i++) {
+        t = assignOps[i];
+        assignOps[t] = tokens[t];
+    }
+
+    function defineGetter(obj, prop, fn, dontDelete, dontEnum) {
+        Object.defineProperty(obj, prop,
+                              { get: fn, configurable: !dontDelete, enumerable: !dontEnum });
+    }
+
+    function defineGetterSetter(obj, prop, getter, setter, dontDelete, dontEnum) {
+        Object.defineProperty(obj, prop, {
+            get: getter,
+            set: setter,
+            configurable: !dontDelete,
+            enumerable: !dontEnum
+        });
+    }
+
+    function defineMemoGetter(obj, prop, fn, dontDelete, dontEnum) {
+        Object.defineProperty(obj, prop, {
+            get: function() {
+                var val = fn();
+                defineProperty(obj, prop, val, dontDelete, true, dontEnum);
+                return val;
+            },
+            configurable: true,
+            enumerable: !dontEnum
+        });
+    }
+
+    function defineProperty(obj, prop, val, dontDelete, readOnly, dontEnum) {
+        Object.defineProperty(obj, prop,
+                              { value: val, writable: !readOnly, configurable: !dontDelete,
+                                enumerable: !dontEnum });
+    }
+
+    // Returns true if fn is a native function.  (Note: SpiderMonkey specific.)
+    function isNativeCode(fn) {
+        // Relies on the toString method to identify native code.
+        return ((typeof fn) === "function") && fn.toString().match(/\[native code\]/);
+    }
+
+    function getPropertyDescriptor(obj, name) {
+        while (obj) {
+            if (({}).hasOwnProperty.call(obj, name))
+                return Object.getOwnPropertyDescriptor(obj, name);
+            obj = Object.getPrototypeOf(obj);
+        }
+    }
+
+    function getPropertyNames(obj) {
+        var table = Object.create(null, {});
+        while (obj) {
+            var names = Object.getOwnPropertyNames(obj);
+            for (var i = 0, n = names.length; i < n; i++)
+                table[names[i]] = true;
+            obj = Object.getPrototypeOf(obj);
+        }
+        return Object.keys(table);
+    }
+
+    function getOwnProperties(obj) {
+        var map = {};
+        for (var name in Object.getOwnPropertyNames(obj))
+            map[name] = Object.getOwnPropertyDescriptor(obj, name);
+        return map;
+    }
+
+    function blacklistHandler(target, blacklist) {
+        var mask = Object.create(null, {});
+        var redirect = StringMap.create(blacklist).mapObject(function(name) { return mask; });
+        return mixinHandler(redirect, target);
+    }
+
+    function whitelistHandler(target, whitelist) {
+        var catchall = Object.create(null, {});
+        var redirect = StringMap.create(whitelist).mapObject(function(name) { return target; });
+        return mixinHandler(redirect, catchall);
+    }
+
+    function mirrorHandler(target, writable) {
+        var handler = makePassthruHandler(target);
+
+        var defineProperty = handler.defineProperty;
+        handler.defineProperty = function(name, desc) {
+            if (!desc.enumerable)
+                throw new Error("mirror property must be enumerable");
+            if (!desc.configurable)
+                throw new Error("mirror property must be configurable");
+            if (desc.writable !== writable)
+                throw new Error("mirror property must " + (writable ? "" : "not ") + "be writable");
+            defineProperty(name, desc);
+        };
+
+        handler.fix = function() { };
+        handler.getOwnPropertyDescriptor = handler.getPropertyDescriptor;
+        handler.getOwnPropertyNames = getPropertyNames.bind(handler, target);
+        handler.keys = handler.enumerate;
+        handler["delete"] = function() { return false; };
+        handler.hasOwn = handler.has;
+        return handler;
+    }
+
+    /*
+     * Mixin proxies break the single-inheritance model of prototypes, so
+     * the handler treats all properties as own-properties:
+     *
+     *                  X
+     *                  |
+     *     +------------+------------+
+     *     |                 O       |
+     *     |                 |       |
+     *     |  O         O    O       |
+     *     |  |         |    |       |
+     *     |  O    O    O    O       |
+     *     |  |    |    |    |       |
+     *     |  O    O    O    O    O  |
+     *     |  |    |    |    |    |  |
+     *     +-(*)--(w)--(x)--(y)--(z)-+
+     */
+
+    function mixinHandler(redirect, catchall) {
+        function targetFor(name) {
+            return hasOwn(redirect, name) ? redirect[name] : catchall;
+        }
+
+        function getMuxPropertyDescriptor(name) {
+            var desc = getPropertyDescriptor(targetFor(name), name);
+            if (desc)
+                desc.configurable = true;
+            return desc;
+        }
+
+        function getMuxPropertyNames() {
+            var names1 = Object.getOwnPropertyNames(redirect).filter(function(name) {
+                return name in redirect[name];
+            });
+            var names2 = getPropertyNames(catchall).filter(function(name) {
+                return !hasOwn(redirect, name);
+            });
+            return names1.concat(names2);
+        }
+
+        function enumerateMux() {
+            var result = Object.getOwnPropertyNames(redirect).filter(function(name) {
+                return name in redirect[name];
+            });
+            for (name in catchall) {
+                if (!hasOwn(redirect, name))
+                    result.push(name);
+            };
+            return result;
+        }
+
+        function hasMux(name) {
+            return name in targetFor(name);
+        }
+
+        return {
+            getOwnPropertyDescriptor: getMuxPropertyDescriptor,
+            getPropertyDescriptor: getMuxPropertyDescriptor,
+            getOwnPropertyNames: getMuxPropertyNames,
+            defineProperty: function(name, desc) {
+                Object.defineProperty(targetFor(name), name, desc);
+            },
+            "delete": function(name) {
+                var target = targetFor(name);
+                return delete target[name];
+            },
+            // FIXME: ha ha ha
+            fix: function() { },
+            has: hasMux,
+            hasOwn: hasMux,
+            get: function(receiver, name) {
+                var target = targetFor(name);
+                return target[name];
+            },
+            set: function(receiver, name, val) {
+                var target = targetFor(name);
+                target[name] = val;
+                return true;
+            },
+            enumerate: enumerateMux,
+            keys: enumerateMux
+        };
+    }
+
+    function makePassthruHandler(obj) {
+        // Handler copied from
+        // http://wiki.ecmascript.org/doku.php?id=harmony:proxies&s=proxy%20object#examplea_no-op_forwarding_proxy
+        return {
+            getOwnPropertyDescriptor: function(name) {
+                var desc = Object.getOwnPropertyDescriptor(obj, name);
+
+                // a trapping proxy's properties must always be configurable
+                desc.configurable = true;
+                return desc;
+            },
+            getPropertyDescriptor: function(name) {
+                var desc = getPropertyDescriptor(obj, name);
+
+                // a trapping proxy's properties must always be configurable
+                desc.configurable = true;
+                return desc;
+            },
+            getOwnPropertyNames: function() {
+                return Object.getOwnPropertyNames(obj);
+            },
+            defineProperty: function(name, desc) {
+                Object.defineProperty(obj, name, desc);
+            },
+            "delete": function(name) { return delete obj[name]; },
+            fix: function() {
+                if (Object.isFrozen(obj)) {
+                    return getOwnProperties(obj);
+                }
+
+                // As long as obj is not frozen, the proxy won't allow itself to be fixed.
+                return undefined; // will cause a TypeError to be thrown
+            },
+
+            has: function(name) { return name in obj; },
+            hasOwn: function(name) { return ({}).hasOwnProperty.call(obj, name); },
+            get: function(receiver, name) { return obj[name]; },
+
+            // bad behavior when set fails in non-strict mode
+            set: function(receiver, name, val) { obj[name] = val; return true; },
+            enumerate: function() {
+                var result = [];
+                for (name in obj) { result.push(name); };
+                return result;
+            },
+            keys: function() { return Object.keys(obj); }
+        };
+    }
+
+    var hasOwnProperty = ({}).hasOwnProperty;
+
+    function hasOwn(obj, name) {
+        return hasOwnProperty.call(obj, name);
+    }
+
+    function StringMap(table, size) {
+        this.table = table || Object.create(null, {});
+        this.size = size || 0;
+    }
+
+    StringMap.create = function(table) {
+        var init = Object.create(null, {});
+        var size = 0;
+        var names = Object.getOwnPropertyNames(table);
+        for (var i = 0, n = names.length; i < n; i++) {
+            var name = names[i];
+            init[name] = table[name];
+            size++;
+        }
+        return new StringMap(init, size);
+    };
+
+    StringMap.prototype = {
+        has: function(x) { return hasOwnProperty.call(this.table, x); },
+        set: function(x, v) {
+            if (!hasOwnProperty.call(this.table, x))
+                this.size++;
+            this.table[x] = v;
+        },
+        get: function(x) { return this.table[x]; },
+        getDef: function(x, thunk) {
+            if (!hasOwnProperty.call(this.table, x)) {
+                this.size++;
+                this.table[x] = thunk();
+            }
+            return this.table[x];
+        },
+        forEach: function(f) {
+            var table = this.table;
+            for (var key in table)
+                f.call(this, key, table[key]);
+        },
+        map: function(f) {
+            var table1 = this.table;
+            var table2 = Object.create(null, {});
+            this.forEach(function(key, val) {
+                table2[key] = f.call(this, val, key);
+            });
+            return new StringMap(table2, this.size);
+        },
+        mapObject: function(f) {
+            var table1 = this.table;
+            var table2 = Object.create(null, {});
+            this.forEach(function(key, val) {
+                table2[key] = f.call(this, val, key);
+            });
+            return table2;
+        },
+        toObject: function() {
+            return this.mapObject(function(val) { return val; });
+        },
+        choose: function() {
+            return Object.getOwnPropertyNames(this.table)[0];
+        },
+        remove: function(x) {
+            if (hasOwnProperty.call(this.table, x)) {
+                this.size--;
+                delete this.table[x];
+            }
+        },
+        copy: function() {
+            var table = Object.create(null, {});
+            for (var key in this.table)
+                table[key] = this.table[key];
+            return new StringMap(table, this.size);
+        },
+        toString: function() { return "[object StringMap]" }
+    };
+
+    // an object-key table with poor asymptotics (replace with WeakMap when possible)
+    function ObjectMap(array) {
+        this.array = array || [];
+    }
+
+    function searchMap(map, key, found, notFound) {
+        var a = map.array;
+        for (var i = 0, n = a.length; i < n; i++) {
+            var pair = a[i];
+            if (pair.key === key)
+                return found(pair, i);
+        }
+        return notFound();
+    }
+
+    ObjectMap.prototype = {
+        has: function(x) {
+            return searchMap(this, x, function() { return true }, function() { return false });
+        },
+        set: function(x, v) {
+            var a = this.array;
+            searchMap(this, x,
+                      function(pair) { pair.value = v },
+                      function() { a.push({ key: x, value: v }) });
+        },
+        get: function(x) {
+            return searchMap(this, x,
+                             function(pair) { return pair.value },
+                             function() { return null });
+        },
+        getDef: function(x, thunk) {
+            var a = this.array;
+            return searchMap(this, x,
+                             function(pair) { return pair.value },
+                             function() {
+                                 var v = thunk();
+                                 a.push({ key: x, value: v });
+                                 return v;
+                             });
+        },
+        forEach: function(f) {
+            var a = this.array;
+            for (var i = 0, n = a.length; i < n; i++) {
+                var pair = a[i];
+                f.call(this, pair.key, pair.value);
+            }
+        },
+        choose: function() {
+            return this.array[0].key;
+        },
+        get size() {
+            return this.array.length;
+        },
+        remove: function(x) {
+            var a = this.array;
+            searchMap(this, x,
+                      function(pair, i) { a.splice(i, 1) },
+                      function() { });
+        },
+        copy: function() {
+            return new ObjectMap(this.array.map(function(pair) {
+                return { key: pair.key, value: pair.value }
+            }));
+        },
+        clear: function() {
+            this.array = [];
+        },
+        toString: function() { return "[object ObjectMap]" }
+    };
+
+    // non-destructive stack
+    function Stack(elts) {
+        this.elts = elts || null;
+    }
+
+    Stack.prototype = {
+        push: function(x) {
+            return new Stack({ top: x, rest: this.elts });
+        },
+        top: function() {
+            if (!this.elts)
+                throw new Error("empty stack");
+            return this.elts.top;
+        },
+        isEmpty: function() {
+            return this.top === null;
+        },
+        find: function(test) {
+            for (var elts = this.elts; elts; elts = elts.rest) {
+                if (test(elts.top))
+                    return elts.top;
+            }
+            return null;
+        },
+        has: function(x) {
+            return Boolean(this.find(function(elt) { return elt === x }));
+        },
+        forEach: function(f) {
+            for (var elts = this.elts; elts; elts = elts.rest) {
+                f(elts.top);
+            }
+        }
+    };
+
+    module.exports = {
+        tokens: tokens,
+        whitespace: whitespace,
+        opTypeNames: opTypeNames,
+        keywords: keywords,
+        isStatementStartCode: isStatementStartCode,
+        tokenIds: tokenIds,
+        consts: consts,
+        assignOps: assignOps,
+        defineGetter: defineGetter,
+        defineGetterSetter: defineGetterSetter,
+        defineMemoGetter: defineMemoGetter,
+        defineProperty: defineProperty,
+        isNativeCode: isNativeCode,
+        mirrorHandler: mirrorHandler,
+        mixinHandler: mixinHandler,
+        whitelistHandler: whitelistHandler,
+        blacklistHandler: blacklistHandler,
+        makePassthruHandler: makePassthruHandler,
+        StringMap: StringMap,
+        ObjectMap: ObjectMap,
+        Stack: Stack
+    };
+});
\ No newline at end of file
-- 
GitLab


From ad9a81bf41fa83eb66c9be574d2981a0756f303b Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 1 Jan 2012 20:04:46 +0000
Subject: [PATCH 113/546] Added support for more file types

---
 apps/files_texteditor/js/editor.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index dce3a359d82..63e67460a3b 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -14,25 +14,32 @@ function setSyntaxMode(ext){
 	// Todo finish these
     filetype["h"] = "c_cpp";
     filetype["c"] = "c_cpp";
-    filetype["cpp"] = "c_cpp";
     filetype["clj"] = "clojure";
     filetype["coffee"] = "coffee"; // coffescript can be compiled to javascript
+    filetype["coldfusion"] = "cfc";
+    filetype["cpp"] = "c_cpp";
     filetype["cs"] = "csharp";
 	filetype["css"] = "css";
     filetype["groovy"] = "groovy";
+   	filetype["haxe"] = "hx";
 	filetype["html"] = "html";
     filetype["java"] = "java";
 	filetype["js"] = "javascript";
     filetype["json"] = "json";
+   	filetype["latex"] = "latex";
+    filetype["lua"] = "lua";
+    filetype["markdown"] = "markdown"; // also: .md .markdown .mdown .mdwn
     filetype["ml"] = "ocaml";
     filetype["mli"] = "ocaml";
 	filetype["pl"] = "perl";
 	filetype["php"] = "php";
+	filetype["powershell"] = "ps1";
 	filetype["py"] = "python";
 	filetype["rb"] = "ruby";
     filetype["scad"] = "scad"; // seems to be something like 3d model files printed with e.g. reprap
     filetype["scala"] = "scala";
     filetype["scss"] = "scss"; // "sassy css"
+    filetype["sql"] = "sql";
     filetype["svg"] = "svg";
     filetype["textile"] = "textile"; // related to markdown
 	filetype["xml"] = "xml";
-- 
GitLab


From 5d9b7bf1dd5276f78826018080838b9e8de551b6 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 1 Jan 2012 20:05:30 +0000
Subject: [PATCH 114/546] Added ace license file

---
 apps/files_texteditor/js/aceeditor/LICENSE | 476 +++++++++++++++++++++
 1 file changed, 476 insertions(+)
 create mode 100755 apps/files_texteditor/js/aceeditor/LICENSE

diff --git a/apps/files_texteditor/js/aceeditor/LICENSE b/apps/files_texteditor/js/aceeditor/LICENSE
new file mode 100755
index 00000000000..853e4fd5a56
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/LICENSE
@@ -0,0 +1,476 @@
+Licensed under the tri-license MPL/LGPL/GPL.
+
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ---------------
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.1 (the "License"); you may not use this file except in
+     compliance with the License. You may obtain a copy of the License at
+     http://www.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+
+
+
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
\ No newline at end of file
-- 
GitLab


From 19328fd8b2a7d050c040b5db2bf6fcc423eec1dc Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sun, 1 Jan 2012 15:56:33 -0500
Subject: [PATCH 115/546] Initial commit of common filestorage

---
 lib/filestoragecommon.php | 76 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 lib/filestoragecommon.php

diff --git a/lib/filestoragecommon.php b/lib/filestoragecommon.php
new file mode 100644
index 00000000000..347a92ec1f5
--- /dev/null
+++ b/lib/filestoragecommon.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+* ownCloud
+*
+* @author Michael Gapczynski
+* @copyright 2012 Michael Gapczynski GapczynskiM@gmail.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class OC_Filestorage_Common extends OC_Filestorage {
+
+	public function __construct($parameters){}
+	public function mkdir($path){}
+	public function rmdir($path){}
+	public function opendir($path){}
+	public function is_dir($path){}
+	public function is_file($path){}
+	public function stat($path){}
+	public function filetype($path){}
+	public function filesize($path) {
+		$stat = $this->stat($path);
+		return $stat['size'];
+	}
+	public function is_readable($path){}
+	public function is_writeable($path){}
+	public function file_exists($path){}
+	public function readfile($path) {
+		echo $this->file_get_contents($path);
+		return $this->filesize($path);
+	}
+	public function filectime($path) {
+		$stat = $this->stat($path);
+		return $stat['ctime'];
+	}
+	public function filemtime($path) {
+		$stat = $this->stat($path);
+		return $stat['mtime'];
+	}
+	public function fileatime($path) {
+		$stat = $this->stat($path);
+		return $stat['atime'];
+	}
+	public function file_get_contents($path) {
+		$handle = $this->fopen($path, "r");
+		return fread($handle, $this->filesize($path));
+	}
+	public function file_put_contents($path,$data) {
+		$handle = $this->fopen($path, "w");
+		return fwrite($handle, $data);
+	}
+	public function unlink($path){}
+	public function rename($path1,$path2){}
+	public function copy($path1,$path2){}
+	public function fopen($path,$mode){}
+	public function toTmpFile($path){}
+	public function fromTmpFile($tmpPath,$path){}
+	public function fromUploadedFile($tmpPath,$path){}
+	public function getMimeType($path){}
+	public function hash($type,$path,$raw){}
+	public function free_space($path){}
+	public function search($query){}
+	public function getLocalFile($path){}
+}
-- 
GitLab


From 782d201191c79b400ece4109fbb0e194e23880e6 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sun, 1 Jan 2012 16:25:43 -0500
Subject: [PATCH 116/546] Move to branch

---
 lib/filestoragecommon.php | 76 ---------------------------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 lib/filestoragecommon.php

diff --git a/lib/filestoragecommon.php b/lib/filestoragecommon.php
deleted file mode 100644
index 347a92ec1f5..00000000000
--- a/lib/filestoragecommon.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
-* ownCloud
-*
-* @author Michael Gapczynski
-* @copyright 2012 Michael Gapczynski GapczynskiM@gmail.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-class OC_Filestorage_Common extends OC_Filestorage {
-
-	public function __construct($parameters){}
-	public function mkdir($path){}
-	public function rmdir($path){}
-	public function opendir($path){}
-	public function is_dir($path){}
-	public function is_file($path){}
-	public function stat($path){}
-	public function filetype($path){}
-	public function filesize($path) {
-		$stat = $this->stat($path);
-		return $stat['size'];
-	}
-	public function is_readable($path){}
-	public function is_writeable($path){}
-	public function file_exists($path){}
-	public function readfile($path) {
-		echo $this->file_get_contents($path);
-		return $this->filesize($path);
-	}
-	public function filectime($path) {
-		$stat = $this->stat($path);
-		return $stat['ctime'];
-	}
-	public function filemtime($path) {
-		$stat = $this->stat($path);
-		return $stat['mtime'];
-	}
-	public function fileatime($path) {
-		$stat = $this->stat($path);
-		return $stat['atime'];
-	}
-	public function file_get_contents($path) {
-		$handle = $this->fopen($path, "r");
-		return fread($handle, $this->filesize($path));
-	}
-	public function file_put_contents($path,$data) {
-		$handle = $this->fopen($path, "w");
-		return fwrite($handle, $data);
-	}
-	public function unlink($path){}
-	public function rename($path1,$path2){}
-	public function copy($path1,$path2){}
-	public function fopen($path,$mode){}
-	public function toTmpFile($path){}
-	public function fromTmpFile($tmpPath,$path){}
-	public function fromUploadedFile($tmpPath,$path){}
-	public function getMimeType($path){}
-	public function hash($type,$path,$raw){}
-	public function free_space($path){}
-	public function search($query){}
-	public function getLocalFile($path){}
-}
-- 
GitLab


From 67854a94bfda28203511f70933a94819a4787ad3 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 1 Jan 2012 21:27:38 +0000
Subject: [PATCH 117/546] Removed old code

---
 .../js/aceeditor/ace-uncompressed.js          | 17319 ----------------
 .../js/aceeditor/cockpit-uncompressed.js      |  2504 ---
 apps/files_texteditor/js/aceeditor/cockpit.js |     1 -
 3 files changed, 19824 deletions(-)
 delete mode 100644 apps/files_texteditor/js/aceeditor/ace-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/cockpit-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/cockpit.js

diff --git a/apps/files_texteditor/js/aceeditor/ace-uncompressed.js b/apps/files_texteditor/js/aceeditor/ace-uncompressed.js
deleted file mode 100644
index f6e78da4f0b..00000000000
--- a/apps/files_texteditor/js/aceeditor/ace-uncompressed.js
+++ /dev/null
@@ -1,17319 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/**
- * Define a module along with a payload
- * @param module a name for the payload
- * @param payload a function to call with (require, exports, module) params
- */
- 
-(function() {
-    
-var global = (function() {
-    return this;
-})();
-    
-// if we find an existing require function use it.
-if (global.require && global.define) {
-    require.packaged = true;
-    return;
-}
-    
-var _define = function(module, deps, payload) {
-    if (typeof module !== 'string') {
-        if (_define.original)
-            _define.original.apply(window, arguments);
-        else {
-            console.error('dropping module because define wasn\'t a string.');
-            console.trace();
-        }
-        return;
-    }
-
-    if (arguments.length == 2)
-        payload = deps;
-
-    if (!define.modules)
-        define.modules = {};
-        
-    define.modules[module] = payload;
-};
-if (global.define)
-    _define.original = global.define;
-    
-global.define = _define;
-
-
-/**
- * Get at functionality define()ed using the function above
- */
-var _require = function(module, callback) {
-    if (Object.prototype.toString.call(module) === "[object Array]") {
-        var params = [];
-        for (var i = 0, l = module.length; i < l; ++i) {
-            var dep = lookup(module[i]);
-            if (!dep && _require.original)
-                return _require.original.apply(window, arguments);
-            params.push(dep);
-        }
-        if (callback) {
-            callback.apply(null, params);
-        }
-    }
-    else if (typeof module === 'string') {
-        var payload = lookup(module);
-        if (!payload && _require.original)
-            return _require.original.apply(window, arguments);
-        
-        if (callback) {
-            callback();
-        }
-    
-        return payload;
-    }
-    else {
-        if (_require.original)
-            return _require.original.apply(window, arguments);
-    }
-};
-
-if (global.require)
-    _require.original = global.require;
-    
-global.require = _require;
-require.packaged = true;
-
-/**
- * Internal function to lookup moduleNames and resolve them by calling the
- * definition function if needed.
- */
-var lookup = function(moduleName) {
-    var module = define.modules[moduleName];
-    if (module == null) {
-        console.error('Missing module: ' + moduleName);
-        return null;
-    }
-
-    if (typeof module === 'function') {
-        var exports = {};
-        module(require, exports, { id: moduleName, uri: '' });
-        // cache the resulting module object for next time
-        define.modules[moduleName] = exports;
-        return exports;
-    }
-
-    return module;
-};
-
-})();// vim:set ts=4 sts=4 sw=4 st:
-// -- kriskowal Kris Kowal Copyright (C) 2009-2010 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright(C) 2010 XXX No License Specified
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Irakli Gozalishvili Copyright (C) 2010 MIT License
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('pilot/fixoldbrowsers', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-/**
- * Brings an environment as close to ECMAScript 5 compliance
- * as is possible with the facilities of erstwhile engines.
- *
- * ES5 Draft
- * http://www.ecma-international.org/publications/files/drafts/tc39-2009-050.pdf
- *
- * NOTE: this is a draft, and as such, the URL is subject to change.  If the
- * link is broken, check in the parent directory for the latest TC39 PDF.
- * http://www.ecma-international.org/publications/files/drafts/
- *
- * Previous ES5 Draft
- * http://www.ecma-international.org/publications/files/drafts/tc39-2009-025.pdf
- * This is a broken link to the previous draft of ES5 on which most of the
- * numbered specification references and quotes herein were taken.  Updating
- * these references and quotes to reflect the new document would be a welcome
- * volunteer project.
- *
- * @module
- */
-
-/*whatsupdoc*/
-
-//
-// Function
-// ========
-//
-
-// ES-5 15.3.4.5
-// http://www.ecma-international.org/publications/files/drafts/tc39-2009-025.pdf
-
-if (!Function.prototype.bind) {
-    var slice = Array.prototype.slice;
-    Function.prototype.bind = function bind(that) { // .length is 1
-        // 1. Let Target be the this value.
-        var target = this;
-        // 2. If IsCallable(Target) is false, throw a TypeError exception.
-        // XXX this gets pretty close, for all intents and purposes, letting
-        // some duck-types slide
-        if (typeof target.apply !== "function" || typeof target.call !== "function")
-            return new TypeError();
-        // 3. Let A be a new (possibly empty) internal list of all of the
-        //   argument values provided after thisArg (arg1, arg2 etc), in order.
-        var args = slice.call(arguments);
-        // 4. Let F be a new native ECMAScript object.
-        // 9. Set the [[Prototype]] internal property of F to the standard
-        //   built-in Function prototype object as specified in 15.3.3.1.
-        // 10. Set the [[Call]] internal property of F as described in
-        //   15.3.4.5.1.
-        // 11. Set the [[Construct]] internal property of F as described in
-        //   15.3.4.5.2.
-        // 12. Set the [[HasInstance]] internal property of F as described in
-        //   15.3.4.5.3.
-        // 13. The [[Scope]] internal property of F is unused and need not
-        //   exist.
-        var bound = function bound() {
-
-            if (this instanceof bound) {
-                // 15.3.4.5.2 [[Construct]]
-                // When the [[Construct]] internal method of a function object,
-                // F that was created using the bind function is called with a
-                // list of arguments ExtraArgs the following steps are taken:
-                // 1. Let target be the value of F's [[TargetFunction]]
-                //   internal property.
-                // 2. If target has no [[Construct]] internal method, a
-                //   TypeError exception is thrown.
-                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the
-                //   list boundArgs in the same order followed by the same
-                //   values as the list ExtraArgs in the same order.
-
-                var self = Object.create(target.prototype);
-                target.apply(self, args.concat(slice.call(arguments)));
-                return self;
-
-            } else {
-                // 15.3.4.5.1 [[Call]]
-                // When the [[Call]] internal method of a function object, F,
-                // which was created using the bind function is called with a
-                // this value and a list of arguments ExtraArgs the following
-                // steps are taken:
-                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 2. Let boundThis be the value of F's [[BoundThis]] internal
-                //   property.
-                // 3. Let target be the value of F's [[TargetFunction]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the list
-                //   boundArgs in the same order followed by the same values as
-                //   the list ExtraArgs in the same order. 5.  Return the
-                //   result of calling the [[Call]] internal method of target
-                //   providing boundThis as the this value and providing args
-                //   as the arguments.
-
-                // equiv: target.call(this, ...boundArgs, ...args)
-                return target.call.apply(
-                    target,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        bound.length = (
-            // 14. If the [[Class]] internal property of Target is "Function", then
-            typeof target === "function" ?
-            // a. Let L be the length property of Target minus the length of A.
-            // b. Set the length own property of F to either 0 or L, whichever is larger.
-            Math.max(target.length - args.length, 0) :
-            // 15. Else set the length own property of F to 0.
-            0
-        )
-        // 16. The length own property of F is given attributes as specified in
-        //   15.3.5.1.
-        // TODO
-        // 17. Set the [[Extensible]] internal property of F to true.
-        // TODO
-        // 18. Call the [[DefineOwnProperty]] internal method of F with
-        //   arguments "caller", PropertyDescriptor {[[Value]]: null,
-        //   [[Writable]]: false, [[Enumerable]]: false, [[Configurable]]:
-        //   false}, and false.
-        // TODO
-        // 19. Call the [[DefineOwnProperty]] internal method of F with
-        //   arguments "arguments", PropertyDescriptor {[[Value]]: null,
-        //   [[Writable]]: false, [[Enumerable]]: false, [[Configurable]]:
-        //   false}, and false.
-        // TODO
-        // NOTE Function objects created using Function.prototype.bind do not
-        // have a prototype property.
-        // XXX can't delete it in pure-js.
-        return bound;
-    };
-}
-
-// Shortcut to an often accessed properties, in order to avoid multiple
-// dereference that costs universally.
-// _Please note: Shortcuts are defined after `Function.prototype.bind` as we
-// us it in defining shortcuts.
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-
-var defineGetter, defineSetter, lookupGetter, lookupSetter, supportsAccessors;
-// If JS engine supports accessors creating shortcuts.
-if ((supportsAccessors = owns(prototypeOfObject, '__defineGetter__'))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-
-
-//
-// Array
-// =====
-//
-
-// ES5 15.4.3.2
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return Object.prototype.toString.call(obj) === "[object Array]";
-    };
-}
-
-// ES5 15.4.4.18
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach =  function forEach(block, thisObject) {
-        var len = +this.length;
-        for (var i = 0; i < len; i++) {
-            if (i in this) {
-                block.call(thisObject, this[i], i, this);
-            }
-        }
-    };
-}
-
-// ES5 15.4.4.19
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var len = +this.length;
-        if (typeof fun !== "function")
-          throw new TypeError();
-
-        var res = new Array(len);
-        var thisp = arguments[1];
-        for (var i = 0; i < len; i++) {
-            if (i in this)
-                res[i] = fun.call(thisp, this[i], i, this);
-        }
-
-        return res;
-    };
-}
-
-// ES5 15.4.4.20
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(block /*, thisp */) {
-        var values = [];
-        var thisp = arguments[1];
-        for (var i = 0; i < this.length; i++)
-            if (block.call(thisp, this[i]))
-                values.push(this[i]);
-        return values;
-    };
-}
-
-// ES5 15.4.4.16
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(block /*, thisp */) {
-        var thisp = arguments[1];
-        for (var i = 0; i < this.length; i++)
-            if (!block.call(thisp, this[i]))
-                return false;
-        return true;
-    };
-}
-
-// ES5 15.4.4.17
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(block /*, thisp */) {
-        var thisp = arguments[1];
-        for (var i = 0; i < this.length; i++)
-            if (block.call(thisp, this[i]))
-                return true;
-        return false;
-    };
-}
-
-// ES5 15.4.4.21
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var len = +this.length;
-        if (typeof fun !== "function")
-            throw new TypeError();
-
-        // no value to return if no initial value and an empty array
-        if (len === 0 && arguments.length === 1)
-            throw new TypeError();
-
-        var i = 0;
-        if (arguments.length >= 2) {
-            var rv = arguments[1];
-        } else {
-            do {
-                if (i in this) {
-                    rv = this[i++];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (++i >= len)
-                    throw new TypeError();
-            } while (true);
-        }
-
-        for (; i < len; i++) {
-            if (i in this)
-                rv = fun.call(null, rv, this[i], i, this);
-        }
-
-        return rv;
-    };
-}
-
-// ES5 15.4.4.22
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var len = +this.length;
-        if (typeof fun !== "function")
-            throw new TypeError();
-
-        // no value to return if no initial value, empty array
-        if (len === 0 && arguments.length === 1)
-            throw new TypeError();
-
-        var i = len - 1;
-        if (arguments.length >= 2) {
-            var rv = arguments[1];
-        } else {
-            do {
-                if (i in this) {
-                    rv = this[i--];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (--i < 0)
-                    throw new TypeError();
-            } while (true);
-        }
-
-        for (; i >= 0; i--) {
-            if (i in this)
-                rv = fun.call(null, rv, this[i], i, this);
-        }
-
-        return rv;
-    };
-}
-
-// ES5 15.4.4.14
-if (!Array.prototype.indexOf) {
-    Array.prototype.indexOf = function indexOf(value /*, fromIndex */ ) {
-        var length = this.length;
-        if (!length)
-            return -1;
-        var i = arguments[1] || 0;
-        if (i >= length)
-            return -1;
-        if (i < 0)
-            i += length;
-        for (; i < length; i++) {
-            if (!owns(this, i))
-                continue;
-            if (value === this[i])
-                return i;
-        }
-        return -1;
-    };
-}
-
-// ES5 15.4.4.15
-if (!Array.prototype.lastIndexOf) {
-    Array.prototype.lastIndexOf = function lastIndexOf(value /*, fromIndex */) {
-        var length = this.length;
-        if (!length)
-            return -1;
-        var i = arguments[1] || length;
-        if (i < 0)
-            i += length;
-        i = Math.min(i, length - 1);
-        for (; i >= 0; i--) {
-            if (!owns(this, i))
-                continue;
-            if (value === this[i])
-                return i;
-        }
-        return -1;
-    };
-}
-
-//
-// Object
-// ======
-//
-
-// ES5 15.2.3.2
-if (!Object.getPrototypeOf) {
-    // https://github.com/kriskowal/es5-shim/issues#issue/2
-    // http://ejohn.org/blog/objectgetprototypeof/
-    // recommended by fschaefer on github
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || object.constructor.prototype;
-        // or undefined if not available in this engine
-    };
-}
-
-// ES5 15.2.3.3
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object !== "object" && typeof object !== "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        // If object does not owns property return undefined immediately.
-        if (!owns(object, property))
-            return undefined;
-
-        var despriptor, getter, setter;
-
-        // If object has a property then it's for sure both `enumerable` and
-        // `configurable`.
-        despriptor =  { enumerable: true, configurable: true };
-
-        // If JS engine supports accessor properties then property may be a
-        // getter or setter.
-        if (supportsAccessors) {
-            // Unfortunately `__lookupGetter__` will return a getter even
-            // if object has own non getter property along with a same named
-            // inherited getter. To avoid misbehavior we temporary remove
-            // `__proto__` so that `__lookupGetter__` will return getter only
-            // if it's owned by an object.
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-
-            // Once we have getter and setter we can put values back.
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-
-                // If it was accessor property we're done and return here
-                // in order to avoid adding `value` to the descriptor.
-                return descriptor;
-            }
-        }
-
-        // If we got this far we know that object has an own property that is
-        // not an accessor so we set it as a value and return descriptor.
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-
-// ES5 15.2.3.4
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-
-// ES5 15.2.3.5
-if (!Object.create) {
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = { "__proto__": null };
-        } else {
-            if (typeof prototype !== "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            // IE has no built-in implementation of `Object.getPrototypeOf`
-            // neither `__proto__`, but this manually setting `__proto__` will
-            // guarantee that `Object.getPrototypeOf` will work as expected with
-            // objects created using `Object.create`
-            object.__proto__ = prototype;
-        }
-        if (typeof properties !== "undefined")
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-// ES5 15.2.3.6
-if (!Object.defineProperty) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if (typeof object !== "object" && typeof object !== "function")
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if (typeof object !== "object" || object === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-
-        // If it's a data property.
-        if (owns(descriptor, "value")) {
-            // fail silently if "writable", "enumerable", or "configurable"
-            // are requested but not supported
-            /*
-            // alternate approach:
-            if ( // can't implement these features; allow false but not true
-                !(owns(descriptor, "writable") ? descriptor.writable : true) ||
-                !(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
-                !(owns(descriptor, "configurable") ? descriptor.configurable : true)
-            )
-                throw new RangeError(
-                    "This implementation of Object.defineProperty does not " +
-                    "support configurable, enumerable, or writable."
-                );
-            */
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                // As accessors are supported only on engines implementing
-                // `__proto__` we can safely override `__proto__` while defining
-                // a property to make sure that we don't hit an inherited
-                // accessor.
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                // Deleting a property anyway since getter / setter may be
-                // defined on object itself.
-                delete object[property];
-                object[property] = descriptor.value;
-                // Setting original `__proto__` back now.
-                object.prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            // If we got that far then getters and setters can be defined !!
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-
-// ES5 15.2.3.7
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-
-// ES5 15.2.3.8
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.9
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// detect a Rhino bug and patch it
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object === "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-
-// ES5 15.2.3.10
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.11
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.12
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.13
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        return true;
-    };
-}
-
-// ES5 15.2.3.14
-// http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
-if (!Object.keys) {
-
-    var hasDontEnumBug = true,
-        dontEnums = [
-            'toString',
-            'toLocaleString',
-            'valueOf',
-            'hasOwnProperty',
-            'isPrototypeOf',
-            'propertyIsEnumerable',
-            'constructor'
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null})
-        hasDontEnumBug = false;
-
-    Object.keys = function keys(object) {
-
-        if (
-            typeof object !== "object" && typeof object !== "function"
-            || object === null
-        )
-            throw new TypeError("Object.keys called on a non-object");
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-
-        return keys;
-    };
-
-}
-
-//
-// Date
-// ====
-//
-
-// ES5 15.9.5.43
-// Format a Date object as a string according to a subset of the ISO-8601 standard.
-// Useful in Atom, among other things.
-if (!Date.prototype.toISOString) {
-    Date.prototype.toISOString = function toISOString() {
-        return (
-            this.getUTCFullYear() + "-" +
-            (this.getUTCMonth() + 1) + "-" +
-            this.getUTCDate() + "T" +
-            this.getUTCHours() + ":" +
-            this.getUTCMinutes() + ":" +
-            this.getUTCSeconds() + "Z"
-        );
-    }
-}
-
-// ES5 15.9.4.4
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-
-// ES5 15.9.5.44
-if (!Date.prototype.toJSON) {
-    Date.prototype.toJSON = function toJSON(key) {
-        // This function provides a String representation of a Date object for
-        // use by JSON.stringify (15.12.3). When the toJSON method is called
-        // with argument key, the following steps are taken:
-
-        // 1.  Let O be the result of calling ToObject, giving it the this
-        // value as its argument.
-        // 2. Let tv be ToPrimitive(O, hint Number).
-        // 3. If tv is a Number and is not finite, return null.
-        // XXX
-        // 4. Let toISO be the result of calling the [[Get]] internal method of
-        // O with argument "toISOString".
-        // 5. If IsCallable(toISO) is false, throw a TypeError exception.
-        if (typeof this.toISOString !== "function")
-            throw new TypeError();
-        // 6. Return the result of calling the [[Call]] internal method of
-        // toISO with O as the this value and an empty argument list.
-        return this.toISOString();
-
-        // NOTE 1 The argument is ignored.
-
-        // NOTE 2 The toJSON function is intentionally generic; it does not
-        // require that its this value be a Date object. Therefore, it can be
-        // transferred to other kinds of objects for use as a method. However,
-        // it does require that any such object have a toISOString method. An
-        // object is free to use the argument key to filter its
-        // stringification.
-    };
-}
-
-// 15.9.4.2 Date.parse (string)
-// 15.9.1.15 Date Time String Format
-// Date.parse
-// based on work shared by Daniel Friesen (dantman)
-// http://gist.github.com/303249
-if (isNaN(Date.parse("T00:00"))) {
-    // XXX global assignment won't work in embeddings that use
-    // an alternate object for the context.
-    Date = (function(NativeDate) {
-
-        // Date.length === 7
-        var Date = function(Y, M, D, h, m, s, ms) {
-            var length = arguments.length;
-            if (this instanceof NativeDate) {
-                var date = length === 1 && String(Y) === Y ? // isString(Y)
-                    // We explicitly pass it through parse:
-                    new NativeDate(Date.parse(Y)) :
-                    // We have to manually make calls depending on argument
-                    // length here
-                    length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
-                    length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
-                    length >= 5 ? new NativeDate(Y, M, D, h, m) :
-                    length >= 4 ? new NativeDate(Y, M, D, h) :
-                    length >= 3 ? new NativeDate(Y, M, D) :
-                    length >= 2 ? new NativeDate(Y, M) :
-                    length >= 1 ? new NativeDate(Y) :
-                                  new NativeDate();
-                // Prevent mixups with unfixed Date object
-                date.constructor = Date;
-                return date;
-            }
-            return NativeDate.apply(this, arguments);
-        };
-
-        // 15.9.1.15 Date Time String Format
-        var isoDateExpression = new RegExp("^" +
-            "(?:" + // optional year-month-day
-                "(" + // year capture
-                    "(?:[+-]\\d\\d)?" + // 15.9.1.15.1 Extended years
-                    "\\d\\d\\d\\d" + // four-digit year
-                ")" +
-                "(?:-" + // optional month-day
-                    "(\\d\\d)" + // month capture
-                    "(?:-" + // optional day
-                        "(\\d\\d)" + // day capture
-                    ")?" +
-                ")?" +
-            ")?" +
-            "(?:T" + // hour:minute:second.subsecond
-                "(\\d\\d)" + // hour capture
-                ":(\\d\\d)" + // minute capture
-                "(?::" + // optional :second.subsecond
-                    "(\\d\\d)" + // second capture
-                    "(?:\\.(\\d\\d\\d))?" + // milisecond capture
-                ")?" +
-            ")?" +
-            "(?:" + // time zone
-                "Z|" + // UTC capture
-                "([+-])(\\d\\d):(\\d\\d)" + // timezone offset
-                // capture sign, hour, minute
-            ")?" +
-        "$");
-
-        // Copy any custom methods a 3rd party library may have added
-        for (var key in NativeDate)
-            Date[key] = NativeDate[key];
-
-        // Copy "native" methods explicitly; they may be non-enumerable
-        Date.now = NativeDate.now;
-        Date.UTC = NativeDate.UTC;
-        Date.prototype = NativeDate.prototype;
-        Date.prototype.constructor = Date;
-
-        // Upgrade Date.parse to handle the ISO dates we use
-        // TODO review specification to ascertain whether it is
-        // necessary to implement partial ISO date strings.
-        Date.parse = function parse(string) {
-            var match = isoDateExpression.exec(string);
-            if (match) {
-                match.shift(); // kill match[0], the full match
-                // recognize times without dates before normalizing the
-                // numeric values, for later use
-                var timeOnly = match[0] === undefined;
-                // parse numerics
-                for (var i = 0; i < 10; i++) {
-                    // skip + or - for the timezone offset
-                    if (i === 7)
-                        continue;
-                    // Note: parseInt would read 0-prefix numbers as
-                    // octal.  Number constructor or unary + work better
-                    // here:
-                    match[i] = +(match[i] || (i < 3 ? 1 : 0));
-                    // match[1] is the month. Months are 0-11 in JavaScript
-                    // Date objects, but 1-12 in ISO notation, so we
-                    // decrement.
-                    if (i === 1)
-                        match[i]--;
-                }
-                // if no year-month-date is provided, return a milisecond
-                // quantity instead of a UTC date number value.
-                if (timeOnly)
-                    return ((match[3] * 60 + match[4]) * 60 + match[5]) * 1000 + match[6];
-
-                // account for an explicit time zone offset if provided
-                var offset = (match[8] * 60 + match[9]) * 60 * 1000;
-                if (match[6] === "-")
-                    offset = -offset;
-
-                return NativeDate.UTC.apply(this, match.slice(0, 7)) + offset;
-            }
-            return NativeDate.parse.apply(this, arguments);
-        };
-
-        return Date;
-    })(Date);
-}
-
-//
-// String
-// ======
-//
-
-// ES5 15.5.4.20
-if (!String.prototype.trim) {
-    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
-    var trimBeginRegexp = /^\s\s*/;
-    var trimEndRegexp = /\s\s*$/;
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, '').replace(trimEndRegexp, '');
-    };
-}
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Kevin Dangoor (kdangoor@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/ace', ['require', 'exports', 'module' , 'pilot/index', 'pilot/fixoldbrowsers', 'pilot/plugin_manager', 'pilot/dom', 'pilot/event', 'ace/editor', 'ace/edit_session', 'ace/undomanager', 'ace/virtual_renderer', 'ace/theme/textmate', 'pilot/environment'], function(require, exports, module) {
-
-    require("pilot/index");
-    require("pilot/fixoldbrowsers");
-    var catalog = require("pilot/plugin_manager").catalog;
-    catalog.registerPlugins([ "pilot/index" ]);
-
-    var Dom = require("pilot/dom");
-    var Event = require("pilot/event");
-
-    var Editor = require("ace/editor").Editor;
-    var EditSession = require("ace/edit_session").EditSession;
-    var UndoManager = require("ace/undomanager").UndoManager;
-    var Renderer = require("ace/virtual_renderer").VirtualRenderer;
-
-    exports.edit = function(el) {
-        if (typeof(el) == "string") {
-            el = document.getElementById(el);
-        }
-
-        var doc = new EditSession(Dom.getInnerText(el));
-        doc.setUndoManager(new UndoManager());
-        el.innerHTML = '';
-
-        var editor = new Editor(new Renderer(el, require("ace/theme/textmate")));
-        editor.setSession(doc);
-
-        var env = require("pilot/environment").create();
-        catalog.startupPlugins({ env: env }).then(function() {
-            env.document = doc;
-            env.editor = editor;
-            editor.resize();
-            Event.addListener(window, "resize", function() {
-                editor.resize();
-            });
-            el.env = env;
-        });
-        // Store env on editor such that it can be accessed later on from
-        // the returned object.
-        editor.env = env;
-        return editor;
-    };
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Kevin Dangoor (kdangoor@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/index', ['require', 'exports', 'module' , 'pilot/fixoldbrowsers', 'pilot/types/basic', 'pilot/types/command', 'pilot/types/settings', 'pilot/commands/settings', 'pilot/commands/basic', 'pilot/settings/canon', 'pilot/canon'], function(require, exports, module) {
-
-exports.startup = function(data, reason) {
-    require('pilot/fixoldbrowsers');
-
-    require('pilot/types/basic').startup(data, reason);
-    require('pilot/types/command').startup(data, reason);
-    require('pilot/types/settings').startup(data, reason);
-    require('pilot/commands/settings').startup(data, reason);
-    require('pilot/commands/basic').startup(data, reason);
-    // require('pilot/commands/history').startup(data, reason);
-    require('pilot/settings/canon').startup(data, reason);
-    require('pilot/canon').startup(data, reason);
-};
-
-exports.shutdown = function(data, reason) {
-    require('pilot/types/basic').shutdown(data, reason);
-    require('pilot/types/command').shutdown(data, reason);
-    require('pilot/types/settings').shutdown(data, reason);
-    require('pilot/commands/settings').shutdown(data, reason);
-    require('pilot/commands/basic').shutdown(data, reason);
-    // require('pilot/commands/history').shutdown(data, reason);
-    require('pilot/settings/canon').shutdown(data, reason);
-    require('pilot/canon').shutdown(data, reason);
-};
-
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Joe Walker (jwalker@mozilla.com)
- *      Kevin Dangoor (kdangoor@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/types/basic', ['require', 'exports', 'module' , 'pilot/types'], function(require, exports, module) {
-
-var types = require("pilot/types");
-var Type = types.Type;
-var Conversion = types.Conversion;
-var Status = types.Status;
-
-/**
- * These are the basic types that we accept. They are vaguely based on the
- * Jetpack settings system (https://wiki.mozilla.org/Labs/Jetpack/JEP/24)
- * although clearly more restricted.
- *
- * <p>In addition to these types, Jetpack also accepts range, member, password
- * that we are thinking of adding.
- *
- * <p>This module probably should not be accessed directly, but instead used
- * through types.js
- */
-
-/**
- * 'text' is the default if no type is given.
- */
-var text = new Type();
-
-text.stringify = function(value) {
-    return value;
-};
-
-text.parse = function(value) {
-    if (typeof value != 'string') {
-        throw new Error('non-string passed to text.parse()');
-    }
-    return new Conversion(value);
-};
-
-text.name = 'text';
-
-/**
- * We don't currently plan to distinguish between integers and floats
- */
-var number = new Type();
-
-number.stringify = function(value) {
-    if (!value) {
-        return null;
-    }
-    return '' + value;
-};
-
-number.parse = function(value) {
-    if (typeof value != 'string') {
-        throw new Error('non-string passed to number.parse()');
-    }
-
-    if (value.replace(/\s/g, '').length === 0) {
-        return new Conversion(null, Status.INCOMPLETE, '');
-    }
-
-    var reply = new Conversion(parseInt(value, 10));
-    if (isNaN(reply.value)) {
-        reply.status = Status.INVALID;
-        reply.message = 'Can\'t convert "' + value + '" to a number.';
-    }
-
-    return reply;
-};
-
-number.decrement = function(value) {
-    return value - 1;
-};
-
-number.increment = function(value) {
-    return value + 1;
-};
-
-number.name = 'number';
-
-/**
- * One of a known set of options
- */
-function SelectionType(typeSpec) {
-    if (!Array.isArray(typeSpec.data) && typeof typeSpec.data !== 'function') {
-        throw new Error('instances of SelectionType need typeSpec.data to be an array or function that returns an array:' + JSON.stringify(typeSpec));
-    }
-    Object.keys(typeSpec).forEach(function(key) {
-        this[key] = typeSpec[key];
-    }, this);
-};
-
-SelectionType.prototype = new Type();
-
-SelectionType.prototype.stringify = function(value) {
-    return value;
-};
-
-SelectionType.prototype.parse = function(str) {
-    if (typeof str != 'string') {
-        throw new Error('non-string passed to parse()');
-    }
-    if (!this.data) {
-        throw new Error('Missing data on selection type extension.');
-    }
-    var data = (typeof(this.data) === 'function') ? this.data() : this.data;
-
-    // The matchedValue could be the boolean value false
-    var hasMatched = false;
-    var matchedValue;
-    var completions = [];
-    data.forEach(function(option) {
-        if (str == option) {
-            matchedValue = this.fromString(option);
-            hasMatched = true;
-        }
-        else if (option.indexOf(str) === 0) {
-            completions.push(this.fromString(option));
-        }
-    }, this);
-
-    if (hasMatched) {
-        return new Conversion(matchedValue);
-    }
-    else {
-        // This is something of a hack it basically allows us to tell the
-        // setting type to forget its last setting hack.
-        if (this.noMatch) {
-            this.noMatch();
-        }
-
-        if (completions.length > 0) {
-            var msg = 'Possibilities' +
-                (str.length === 0 ? '' : ' for \'' + str + '\'');
-            return new Conversion(null, Status.INCOMPLETE, msg, completions);
-        }
-        else {
-            var msg = 'Can\'t use \'' + str + '\'.';
-            return new Conversion(null, Status.INVALID, msg, completions);
-        }
-    }
-};
-
-SelectionType.prototype.fromString = function(str) {
-    return str;
-};
-
-SelectionType.prototype.decrement = function(value) {
-    var data = (typeof this.data === 'function') ? this.data() : this.data;
-    var index;
-    if (value == null) {
-        index = data.length - 1;
-    }
-    else {
-        var name = this.stringify(value);
-        var index = data.indexOf(name);
-        index = (index === 0 ? data.length - 1 : index - 1);
-    }
-    return this.fromString(data[index]);
-};
-
-SelectionType.prototype.increment = function(value) {
-    var data = (typeof this.data === 'function') ? this.data() : this.data;
-    var index;
-    if (value == null) {
-        index = 0;
-    }
-    else {
-        var name = this.stringify(value);
-        var index = data.indexOf(name);
-        index = (index === data.length - 1 ? 0 : index + 1);
-    }
-    return this.fromString(data[index]);
-};
-
-SelectionType.prototype.name = 'selection';
-
-/**
- * SelectionType is a base class for other types
- */
-exports.SelectionType = SelectionType;
-
-/**
- * true/false values
- */
-var bool = new SelectionType({
-    name: 'bool',
-    data: [ 'true', 'false' ],
-    stringify: function(value) {
-        return '' + value;
-    },
-    fromString: function(str) {
-        return str === 'true' ? true : false;
-    }
-});
-
-
-/**
- * A we don't know right now, but hope to soon.
- */
-function DeferredType(typeSpec) {
-    if (typeof typeSpec.defer !== 'function') {
-        throw new Error('Instances of DeferredType need typeSpec.defer to be a function that returns a type');
-    }
-    Object.keys(typeSpec).forEach(function(key) {
-        this[key] = typeSpec[key];
-    }, this);
-};
-
-DeferredType.prototype = new Type();
-
-DeferredType.prototype.stringify = function(value) {
-    return this.defer().stringify(value);
-};
-
-DeferredType.prototype.parse = function(value) {
-    return this.defer().parse(value);
-};
-
-DeferredType.prototype.decrement = function(value) {
-    var deferred = this.defer();
-    return (deferred.decrement ? deferred.decrement(value) : undefined);
-};
-
-DeferredType.prototype.increment = function(value) {
-    var deferred = this.defer();
-    return (deferred.increment ? deferred.increment(value) : undefined);
-};
-
-DeferredType.prototype.name = 'deferred';
-
-/**
- * DeferredType is a base class for other types
- */
-exports.DeferredType = DeferredType;
-
-
-/**
- * A set of objects of the same type
- */
-function ArrayType(typeSpec) {
-    if (typeSpec instanceof Type) {
-        this.subtype = typeSpec;
-    }
-    else if (typeof typeSpec === 'string') {
-        this.subtype = types.getType(typeSpec);
-        if (this.subtype == null) {
-            throw new Error('Unknown array subtype: ' + typeSpec);
-        }
-    }
-    else {
-        throw new Error('Can\' handle array subtype');
-    }
-};
-
-ArrayType.prototype = new Type();
-
-ArrayType.prototype.stringify = function(values) {
-    // TODO: Check for strings with spaces and add quotes
-    return values.join(' ');
-};
-
-ArrayType.prototype.parse = function(value) {
-    return this.defer().parse(value);
-};
-
-ArrayType.prototype.name = 'array';
-
-/**
- * Registration and de-registration.
- */
-var isStarted = false;
-exports.startup = function() {
-    if (isStarted) {
-        return;
-    }
-    isStarted = true;
-    types.registerType(text);
-    types.registerType(number);
-    types.registerType(bool);
-    types.registerType(SelectionType);
-    types.registerType(DeferredType);
-    types.registerType(ArrayType);
-};
-
-exports.shutdown = function() {
-    isStarted = false;
-    types.unregisterType(text);
-    types.unregisterType(number);
-    types.unregisterType(bool);
-    types.unregisterType(SelectionType);
-    types.unregisterType(DeferredType);
-    types.unregisterType(ArrayType);
-};
-
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Walker (jwalker@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/types', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-/**
- * Some types can detect validity, that is to say they can distinguish between
- * valid and invalid values.
- * TODO: Change these constants to be numbers for more performance?
- */
-var Status = {
-    /**
-     * The conversion process worked without any problem, and the value is
-     * valid. There are a number of failure states, so the best way to check
-     * for failure is (x !== Status.VALID)
-     */
-    VALID: {
-        toString: function() { return 'VALID'; },
-        valueOf: function() { return 0; }
-    },
-
-    /**
-     * A conversion process failed, however it was noted that the string
-     * provided to 'parse()' could be VALID by the addition of more characters,
-     * so the typing may not be actually incorrect yet, just unfinished.
-     * @see Status.INVALID
-     */
-    INCOMPLETE: {
-        toString: function() { return 'INCOMPLETE'; },
-        valueOf: function() { return 1; }
-    },
-
-    /**
-     * The conversion process did not work, the value should be null and a
-     * reason for failure should have been provided. In addition some completion
-     * values may be available.
-     * @see Status.INCOMPLETE
-     */
-    INVALID: {
-        toString: function() { return 'INVALID'; },
-        valueOf: function() { return 2; }
-    },
-
-    /**
-     * A combined status is the worser of the provided statuses
-     */
-    combine: function(statuses) {
-        var combined = Status.VALID;
-        for (var i = 0; i < statuses.length; i++) {
-            if (statuses[i].valueOf() > combined.valueOf()) {
-                combined = statuses[i];
-            }
-        }
-        return combined;
-    }
-};
-exports.Status = Status;
-
-/**
- * The type.parse() method returns a Conversion to inform the user about not
- * only the result of a Conversion but also about what went wrong.
- * We could use an exception, and throw if the conversion failed, but that
- * seems to violate the idea that exceptions should be exceptional. Typos are
- * not. Also in order to store both a status and a message we'd still need
- * some sort of exception type...
- */
-function Conversion(value, status, message, predictions) {
-    /**
-     * The result of the conversion process. Will be null if status != VALID
-     */
-    this.value = value;
-
-    /**
-     * The status of the conversion.
-     * @see Status
-     */
-    this.status = status || Status.VALID;
-
-    /**
-     * A message to go with the conversion. This could be present for any status
-     * including VALID in the case where we want to note a warning for example.
-     * I18N: On the one hand this nasty and un-internationalized, however with
-     * a command line it is hard to know where to start.
-     */
-    this.message = message;
-
-    /**
-     * A array of strings which are the systems best guess at better inputs than
-     * the one presented.
-     * We generally expect there to be about 7 predictions (to match human list
-     * comprehension ability) however it is valid to provide up to about 20,
-     * or less. It is the job of the predictor to decide a smart cut-off.
-     * For example if there are 4 very good matches and 4 very poor ones,
-     * probably only the 4 very good matches should be presented.
-     */
-    this.predictions = predictions || [];
-}
-exports.Conversion = Conversion;
-
-/**
- * Most of our types are 'static' e.g. there is only one type of 'text', however
- * some types like 'selection' and 'deferred' are customizable. The basic
- * Type type isn't useful, but does provide documentation about what types do.
- */
-function Type() {
-};
-Type.prototype = {
-    /**
-     * Convert the given <tt>value</tt> to a string representation.
-     * Where possible, there should be round-tripping between values and their
-     * string representations.
-     */
-    stringify: function(value) { throw new Error("not implemented"); },
-
-    /**
-     * Convert the given <tt>str</tt> to an instance of this type.
-     * Where possible, there should be round-tripping between values and their
-     * string representations.
-     * @return Conversion
-     */
-    parse: function(str) { throw new Error("not implemented"); },
-
-    /**
-     * The plug-in system, and other things need to know what this type is
-     * called. The name alone is not enough to fully specify a type. Types like
-     * 'selection' and 'deferred' need extra data, however this function returns
-     * only the name, not the extra data.
-     * <p>In old bespin, equality was based on the name. This may turn out to be
-     * important in Ace too.
-     */
-    name: undefined,
-
-    /**
-     * If there is some concept of a higher value, return it,
-     * otherwise return undefined.
-     */
-    increment: function(value) {
-        return undefined;
-    },
-
-    /**
-     * If there is some concept of a lower value, return it,
-     * otherwise return undefined.
-     */
-    decrement: function(value) {
-        return undefined;
-    },
-
-    /**
-     * There is interesting information (like predictions) in a conversion of
-     * nothing, the output of this can sometimes be customized.
-     * @return Conversion
-     */
-    getDefault: function() {
-        return this.parse('');
-    }
-};
-exports.Type = Type;
-
-/**
- * Private registry of types
- * Invariant: types[name] = type.name
- */
-var types = {};
-
-/**
- * Add a new type to the list available to the system.
- * You can pass 2 things to this function - either an instance of Type, in
- * which case we return this instance when #getType() is called with a 'name'
- * that matches type.name.
- * Also you can pass in a constructor (i.e. function) in which case when
- * #getType() is called with a 'name' that matches Type.prototype.name we will
- * pass the typeSpec into this constructor. See #reconstituteType().
- */
-exports.registerType = function(type) {
-    if (typeof type === 'object') {
-        if (type instanceof Type) {
-            if (!type.name) {
-                throw new Error('All registered types must have a name');
-            }
-            types[type.name] = type;
-        }
-        else {
-            throw new Error('Can\'t registerType using: ' + type);
-        }
-    }
-    else if (typeof type === 'function') {
-        if (!type.prototype.name) {
-            throw new Error('All registered types must have a name');
-        }
-        types[type.prototype.name] = type;
-    }
-    else {
-        throw new Error('Unknown type: ' + type);
-    }
-};
-
-exports.registerTypes = function registerTypes(types) {
-    Object.keys(types).forEach(function (name) {
-        var type = types[name];
-        type.name = name;
-        exports.registerType(type);
-    });
-};
-
-/**
- * Remove a type from the list available to the system
- */
-exports.deregisterType = function(type) {
-    delete types[type.name];
-};
-
-/**
- * See description of #exports.registerType()
- */
-function reconstituteType(name, typeSpec) {
-    if (name.substr(-2) === '[]') { // i.e. endsWith('[]')
-        var subtypeName = name.slice(0, -2);
-        return new types['array'](subtypeName);
-    }
-
-    var type = types[name];
-    if (typeof type === 'function') {
-        type = new type(typeSpec);
-    }
-    return type;
-}
-
-/**
- * Find a type, previously registered using #registerType()
- */
-exports.getType = function(typeSpec) {
-    if (typeof typeSpec === 'string') {
-        return reconstituteType(typeSpec);
-    }
-
-    if (typeof typeSpec === 'object') {
-        if (!typeSpec.name) {
-            throw new Error('Missing \'name\' member to typeSpec');
-        }
-        return reconstituteType(typeSpec.name, typeSpec);
-    }
-
-    throw new Error('Can\'t extract type from ' + typeSpec);
-};
-
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Joe Walker (jwalker@mozilla.com)
- *      Kevin Dangoor (kdangoor@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/types/command', ['require', 'exports', 'module' , 'pilot/canon', 'pilot/types/basic', 'pilot/types'], function(require, exports, module) {
-
-var canon = require("pilot/canon");
-var SelectionType = require("pilot/types/basic").SelectionType;
-var types = require("pilot/types");
-
-
-/**
- * Select from the available commands
- */
-var command = new SelectionType({
-    name: 'command',
-    data: function() {
-        return canon.getCommandNames();
-    },
-    stringify: function(command) {
-        return command.name;
-    },
-    fromString: function(str) {
-        return canon.getCommand(str);
-    }
-});
-
-
-/**
- * Registration and de-registration.
- */
-exports.startup = function() {
-    types.registerType(command);
-};
-
-exports.shutdown = function() {
-    types.unregisterType(command);
-};
-
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Walker (jwalker@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/canon', ['require', 'exports', 'module' , 'pilot/console', 'pilot/stacktrace', 'pilot/oop', 'pilot/useragent', 'pilot/keys', 'pilot/event_emitter', 'pilot/typecheck', 'pilot/catalog', 'pilot/types', 'pilot/lang'], function(require, exports, module) {
-
-var console = require('pilot/console');
-var Trace = require('pilot/stacktrace').Trace;
-var oop = require('pilot/oop');
-var useragent = require('pilot/useragent');
-var keyUtil = require('pilot/keys');
-var EventEmitter = require('pilot/event_emitter').EventEmitter;
-var typecheck = require('pilot/typecheck');
-var catalog = require('pilot/catalog');
-var Status = require('pilot/types').Status;
-var types = require('pilot/types');
-var lang = require('pilot/lang');
-
-/*
-// TODO: this doesn't belong here - or maybe anywhere?
-var dimensionsChangedExtensionSpec = {
-    name: 'dimensionsChanged',
-    description: 'A dimensionsChanged is a way to be notified of ' +
-            'changes to the dimension of Skywriter'
-};
-exports.startup = function(data, reason) {
-    catalog.addExtensionSpec(commandExtensionSpec);
-};
-exports.shutdown = function(data, reason) {
-    catalog.removeExtensionSpec(commandExtensionSpec);
-};
-*/
-
-var commandExtensionSpec = {
-    name: 'command',
-    description: 'A command is a bit of functionality with optional ' +
-            'typed arguments which can do something small like moving ' +
-            'the cursor around the screen, or large like cloning a ' +
-            'project from VCS.',
-    indexOn: 'name'
-};
-
-exports.startup = function(data, reason) {
-    // TODO: this is probably all kinds of evil, but we need something working
-    catalog.addExtensionSpec(commandExtensionSpec);
-};
-
-exports.shutdown = function(data, reason) {
-    catalog.removeExtensionSpec(commandExtensionSpec);
-};
-
-/**
- * Manage a list of commands in the current canon
- */
-
-/**
- * A Command is a discrete action optionally with a set of ways to customize
- * how it happens. This is here for documentation purposes.
- * TODO: Document better
- */
-var thingCommand = {
-    name: 'thing',
-    description: 'thing is an example command',
-    params: [{
-        name: 'param1',
-        description: 'an example parameter',
-        type: 'text',
-        defaultValue: null
-    }],
-    exec: function(env, args, request) {
-        thing();
-    }
-};
-
-/**
- * A lookup hash of our registered commands
- */
-var commands = {};
-
-/**
- * A lookup has for command key bindings that use a string as sender.
- */
-var commmandKeyBinding = {};
-
-/**
- * Array with command key bindings that use a function to determ the sender.
- */
-var commandKeyBindingFunc = { };
-
-function splitSafe(s, separator, limit, bLowerCase) {
-    return (bLowerCase && s.toLowerCase() || s)
-        .replace(/(?:^\s+|\n|\s+$)/g, "")
-        .split(new RegExp("[\\s ]*" + separator + "[\\s ]*", "g"), limit || 999);
-}
-
-function parseKeys(keys, val, ret) {
-    var key,
-        hashId = 0,
-        parts  = splitSafe(keys, "\\-", null, true),
-        i      = 0,
-        l      = parts.length;
-
-    for (; i < l; ++i) {
-        if (keyUtil.KEY_MODS[parts[i]])
-            hashId = hashId | keyUtil.KEY_MODS[parts[i]];
-        else
-            key = parts[i] || "-"; //when empty, the splitSafe removed a '-'
-    }
-
-    if (ret == null) {
-        return {
-            key: key,
-            hashId: hashId
-        }
-    } else {
-        (ret[hashId] || (ret[hashId] = {}))[key] = val;
-    }
-}
-
-var platform = useragent.isMac ? "mac" : "win";
-function buildKeyHash(command) {
-    var binding = command.bindKey,
-        key = binding[platform],
-        ckb = commmandKeyBinding,
-        ckbf = commandKeyBindingFunc
-
-    if (!binding.sender) {
-        throw new Error('All key bindings must have a sender');   
-    }
-    if (!binding.mac && binding.mac !== null) {
-        throw new Error('All key bindings must have a mac key binding');
-    }
-    if (!binding.win && binding.win !== null) {
-        throw new Error('All key bindings must have a windows key binding');
-    }
-    if(!binding[platform]) {
-        // No keymapping for this platform.
-        return;   
-    }
-    if (typeof binding.sender == 'string') {
-        var targets = splitSafe(binding.sender, "\\|", null, true);
-        targets.forEach(function(target) {
-            if (!ckb[target]) {
-                ckb[target] = { };
-            }
-            key.split("|").forEach(function(keyPart) {
-                parseKeys(keyPart, command, ckb[target]);        
-            });
-        });
-    } else if (typecheck.isFunction(binding.sender)) {
-        var val = {
-            command: command,
-            sender:  binding.sender
-        };
-        
-        keyData = parseKeys(key);
-        if (!ckbf[keyData.hashId]) {
-            ckbf[keyData.hashId] = { };
-        }
-        if (!ckbf[keyData.hashId][keyData.key]) {
-            ckbf[keyData.hashId][keyData.key] = [ val ];   
-        } else {
-            ckbf[keyData.hashId][keyData.key].push(val);
-        }
-    } else {
-        throw new Error('Key binding must have a sender that is a string or function');   
-    }
-}
-
-function findKeyCommand(env, sender, hashId, textOrKey) {
-    // Convert keyCode to the string representation.
-    if (typecheck.isNumber(textOrKey)) {
-        textOrKey = keyUtil.keyCodeToString(textOrKey);
-    }
-    
-    // Check bindings with functions as sender first.    
-    var bindFuncs = (commandKeyBindingFunc[hashId]  || {})[textOrKey] || [];
-    for (var i = 0; i < bindFuncs.length; i++) {
-        if (bindFuncs[i].sender(env, sender, hashId, textOrKey)) {
-            return bindFuncs[i].command;
-        }
-    }
-    
-    var ckbr = commmandKeyBinding[sender];
-    return ckbr && ckbr[hashId] && ckbr[hashId][textOrKey];
-}
-
-function execKeyCommand(env, sender, hashId, textOrKey) {
-    var command = findKeyCommand(env, sender, hashId, textOrKey);
-    if (command) {
-        return exec(command, env, sender, { });   
-    } else {
-        return false;
-    }
-}
-
-/**
- * A sorted list of command names, we regularly want them in order, so pre-sort
- */
-var commandNames = [];
-
-/**
- * This registration method isn't like other Ace registration methods because
- * it doesn't return a decorated command because there is no functional
- * decoration to be done.
- * TODO: Are we sure that in the future there will be no such decoration?
- */
-function addCommand(command) {
-    if (!command.name) {
-        throw new Error('All registered commands must have a name');
-    }
-    if (command.params == null) {
-        command.params = [];
-    }
-    if (!Array.isArray(command.params)) {
-        throw new Error('command.params must be an array in ' + command.name);
-    }
-    // Replace the type
-    command.params.forEach(function(param) {
-        if (!param.name) {
-            throw new Error('In ' + command.name + ': all params must have a name');
-        }
-        upgradeType(command.name, param);
-    }, this);
-    commands[command.name] = command;
-
-    if (command.bindKey) {
-        buildKeyHash(command);   
-    }
-
-    commandNames.push(command.name);
-    commandNames.sort();
-};
-
-function upgradeType(name, param) {
-    var lookup = param.type;
-    param.type = types.getType(lookup);
-    if (param.type == null) {
-        throw new Error('In ' + name + '/' + param.name +
-            ': can\'t find type for: ' + JSON.stringify(lookup));
-    }
-}
-
-function removeCommand(command) {
-    var name = (typeof command === 'string' ? command : command.name);
-    command = commands[name];
-    delete commands[name];
-    lang.arrayRemove(commandNames, name);
-
-    // exaustive search is a little bit brute force but since removeCommand is
-    // not a performance critical operation this should be OK
-    var ckb = commmandKeyBinding;
-    for (var k1 in ckb) {
-        for (var k2 in ckb[k1]) {
-            for (var k3 in ckb[k1][k2]) {
-                if (ckb[k1][k2][k3] == command)
-                    delete ckb[k1][k2][k3];
-            }
-        }
-    }
-    
-    var ckbf = commandKeyBindingFunc;
-    for (var k1 in ckbf) {
-        for (var k2 in ckbf[k1]) {
-            ckbf[k1][k2].forEach(function(cmd, i) {
-                if (cmd.command == command) {
-                    ckbf[k1][k2].splice(i, 1);
-                }
-            })
-        }
-    }
-};
-
-function getCommand(name) {
-    return commands[name];
-};
-
-function getCommandNames() {
-    return commandNames;
-};
-
-/**
- * Default ArgumentProvider that is used if no ArgumentProvider is provided
- * by the command's sender.
- */
-function defaultArgsProvider(request, callback) {
-    var args  = request.args,
-        params = request.command.params;
-
-    for (var i = 0; i < params.length; i++) {
-        var param = params[i];
-
-        // If the parameter is already valid, then don't ask for it anymore.
-        if (request.getParamStatus(param) != Status.VALID ||
-            // Ask for optional parameters as well.
-            param.defaultValue === null) 
-        {
-            var paramPrompt = param.description;
-            if (param.defaultValue === null) {
-                paramPrompt += " (optional)";
-            }
-            var value = prompt(paramPrompt, param.defaultValue || "");
-            // No value but required -> nope.
-            if (!value) {
-                callback();
-                return;
-            } else {
-                args[param.name] = value;
-            }           
-        }
-    }
-    callback();
-}
-
-/**
- * Entry point for keyboard accelerators or anything else that wants to execute
- * a command. A new request object is created and a check performed, if the
- * passed in arguments are VALID/INVALID or INCOMPLETE. If they are INCOMPLETE
- * the ArgumentProvider on the sender is called or otherwise the default 
- * ArgumentProvider to get the still required arguments.
- * If they are valid (or valid after the ArgumentProvider is done), the command
- * is executed.
- * 
- * @param command   Either a command, or the name of one
- * @param env       Current environment to execute the command in
- * @param sender    String that should be the same as the senderObject stored on 
- *                  the environment in env[sender]
- * @param args      Arguments for the command
- * @param typed     (Optional)
- */
-function exec(command, env, sender, args, typed) {
-    if (typeof command === 'string') {
-        command = commands[command];
-    }
-    if (!command) {
-        // TODO: Should we complain more than returning false?
-        return false;
-    }
-
-    var request = new Request({
-        sender: sender,
-        command: command,
-        args: args || {},
-        typed: typed
-    });
-    
-    /**
-     * Executes the command and ensures request.done is called on the request in 
-     * case it's not marked to be done already or async.
-     */
-    function execute() {
-        command.exec(env, request.args, request);
-        
-        // If the request isn't asnync and isn't done, then make it done.
-        if (!request.isAsync && !request.isDone) {
-            request.done();
-        }
-    }
-    
-    
-    if (request.getStatus() == Status.INVALID) {
-        console.error("Canon.exec: Invalid parameter(s) passed to " + 
-                            command.name);
-        return false;   
-    } 
-    // If the request isn't complete yet, try to complete it.
-    else if (request.getStatus() == Status.INCOMPLETE) {
-        // Check if the sender has a ArgsProvider, otherwise use the default
-        // build in one.
-        var argsProvider;
-        var senderObj = env[sender];
-        if (!senderObj || !senderObj.getArgsProvider ||
-            !(argsProvider = senderObj.getArgsProvider())) 
-        {
-            argsProvider = defaultArgsProvider;
-        }
-
-        // Ask the paramProvider to complete the request.
-        argsProvider(request, function() {
-            if (request.getStatus() == Status.VALID) {
-                execute();
-            }
-        });
-        return true;
-    } else {
-        execute();
-        return true;
-    }
-};
-
-exports.removeCommand = removeCommand;
-exports.addCommand = addCommand;
-exports.getCommand = getCommand;
-exports.getCommandNames = getCommandNames;
-exports.findKeyCommand = findKeyCommand;
-exports.exec = exec;
-exports.execKeyCommand = execKeyCommand;
-exports.upgradeType = upgradeType;
-
-
-/**
- * We publish a 'output' event whenever new command begins output
- * TODO: make this more obvious
- */
-oop.implement(exports, EventEmitter);
-
-
-/**
- * Current requirements are around displaying the command line, and provision
- * of a 'history' command and cursor up|down navigation of history.
- * <p>Future requirements could include:
- * <ul>
- * <li>Multiple command lines
- * <li>The ability to recall key presses (i.e. requests with no output) which
- * will likely be needed for macro recording or similar
- * <li>The ability to store the command history either on the server or in the
- * browser local storage.
- * </ul>
- * <p>The execute() command doesn't really live here, except as part of that
- * last future requirement, and because it doesn't really have anywhere else to
- * live.
- */
-
-/**
- * The array of requests that wish to announce their presence
- */
-var requests = [];
-
-/**
- * How many requests do we store?
- */
-var maxRequestLength = 100;
-
-/**
- * To create an invocation, you need to do something like this (all the ctor
- * args are optional):
- * <pre>
- * var request = new Request({
- *     command: command,
- *     args: args,
- *     typed: typed
- * });
- * </pre>
- * @constructor
- */
-function Request(options) {
-    options = options || {};
-
-    // Will be used in the keyboard case and the cli case
-    this.command = options.command;
-
-    // Will be used only in the cli case
-    this.args = options.args;
-    this.typed = options.typed;
-
-    // Have we been initialized?
-    this._begunOutput = false;
-
-    this.start = new Date();
-    this.end = null;
-    this.completed = false;
-    this.error = false;
-};
-
-oop.implement(Request.prototype, EventEmitter);
-
-/**
- * Return the status of a parameter on the request object.
- */
-Request.prototype.getParamStatus = function(param) {
-    var args = this.args || {};
-    
-    // Check if there is already a value for this parameter.
-    if (param.name in args) {
-        // If there is no value set and then the value is VALID if it's not
-        // required or INCOMPLETE if not set yet.
-        if (args[param.name] == null) {
-            if (param.defaultValue === null) {
-                return Status.VALID;
-            } else {
-                return Status.INCOMPLETE;   
-            } 
-        }
-        
-        // Check if the parameter value is valid.
-        var reply,
-            // The passed in value when parsing a type is a string.
-            argsValue = args[param.name].toString();
-        
-        // Type.parse can throw errors. 
-        try {
-            reply = param.type.parse(argsValue);
-        } catch (e) {
-            return Status.INVALID;   
-        }
-        
-        if (reply.status != Status.VALID) {
-            return reply.status;   
-        }
-    } 
-    // Check if the param is marked as required.
-    else if (param.defaultValue === undefined) {
-        // The parameter is not set on the args object but it's required,
-        // which means, things are invalid.
-        return Status.INCOMPLETE;
-    }
-    
-    return Status.VALID;
-}
-
-/**
- * Return the status of a parameter name on the request object.
- */
-Request.prototype.getParamNameStatus = function(paramName) {
-    var params = this.command.params || [];
-    
-    for (var i = 0; i < params.length; i++) {
-        if (params[i].name == paramName) {
-            return this.getParamStatus(params[i]);   
-        }
-    }
-    
-    throw "Parameter '" + paramName + 
-                "' not defined on command '" + this.command.name + "'"; 
-}
-
-/**
- * Checks if all required arguments are set on the request such that it can
- * get executed.
- */
-Request.prototype.getStatus = function() {
-    var args = this.args || {},
-        params = this.command.params;
-
-    // If there are not parameters, then it's valid.
-    if (!params || params.length == 0) {
-        return Status.VALID;
-    }
-
-    var status = [];
-    for (var i = 0; i < params.length; i++) {
-        status.push(this.getParamStatus(params[i]));        
-    }
-
-    return Status.combine(status);
-}
-
-/**
- * Lazy init to register with the history should only be done on output.
- * init() is expensive, and won't be used in the majority of cases
- */
-Request.prototype._beginOutput = function() {
-    this._begunOutput = true;
-    this.outputs = [];
-
-    requests.push(this);
-    // This could probably be optimized with some maths, but 99.99% of the
-    // time we will only be off by one, and I'm feeling lazy.
-    while (requests.length > maxRequestLength) {
-        requests.shiftObject();
-    }
-
-    exports._dispatchEvent('output', { requests: requests, request: this });
-};
-
-/**
- * Sugar for:
- * <pre>request.error = true; request.done(output);</pre>
- */
-Request.prototype.doneWithError = function(content) {
-    this.error = true;
-    this.done(content);
-};
-
-/**
- * Declares that this function will not be automatically done when
- * the command exits
- */
-Request.prototype.async = function() {
-    this.isAsync = true;
-    if (!this._begunOutput) {
-        this._beginOutput();
-    }
-};
-
-/**
- * Complete the currently executing command with successful output.
- * @param output Either DOM node, an SproutCore element or something that
- * can be used in the content of a DIV to create a DOM node.
- */
-Request.prototype.output = function(content) {
-    if (!this._begunOutput) {
-        this._beginOutput();
-    }
-
-    if (typeof content !== 'string' && !(content instanceof Node)) {
-        content = content.toString();
-    }
-
-    this.outputs.push(content);
-    this.isDone = true;
-    this._dispatchEvent('output', {});
-
-    return this;
-};
-
-/**
- * All commands that do output must call this to indicate that the command
- * has finished execution.
- */
-Request.prototype.done = function(content) {
-    this.completed = true;
-    this.end = new Date();
-    this.duration = this.end.getTime() - this.start.getTime();
-
-    if (content) {
-        this.output(content);
-    }
-    
-    // Ensure to finish the request only once.
-    if (!this.isDone) {
-        this.isDone = true;
-        this._dispatchEvent('output', {});   
-    }
-};
-exports.Request = Request;
-
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Walker (jwalker@mozilla.com)
- *   Patrick Walton (pwalton@mozilla.com)
- *   Julian Viereck (jviereck@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-define('pilot/console', ['require', 'exports', 'module' ], function(require, exports, module) {
-    
-/**
- * This object represents a "safe console" object that forwards debugging
- * messages appropriately without creating a dependency on Firebug in Firefox.
- */
-
-var noop = function() {};
-
-// These are the functions that are available in Chrome 4/5, Safari 4
-// and Firefox 3.6. Don't add to this list without checking browser support
-var NAMES = [
-    "assert", "count", "debug", "dir", "dirxml", "error", "group", "groupEnd",
-    "info", "log", "profile", "profileEnd", "time", "timeEnd", "trace", "warn"
-];
-
-if (typeof(window) === 'undefined') {
-    // We're in a web worker. Forward to the main thread so the messages
-    // will show up.
-    NAMES.forEach(function(name) {
-        exports[name] = function() {
-            var args = Array.prototype.slice.call(arguments);
-            var msg = { op: 'log', method: name, args: args };
-            postMessage(JSON.stringify(msg));
-        };
-    });
-} else {
-    // For each of the console functions, copy them if they exist, stub if not
-    NAMES.forEach(function(name) {
-        if (window.console && window.console[name]) {
-            exports[name] = Function.prototype.bind.call(window.console[name], window.console);
-        } else {
-            exports[name] = noop;
-        }
-    });
-}
-
-});
-define('pilot/stacktrace', ['require', 'exports', 'module' , 'pilot/useragent', 'pilot/console'], function(require, exports, module) {
-    
-var ua = require("pilot/useragent");
-var console = require('pilot/console');
-
-// Changed to suit the specific needs of running within Skywriter
-
-// Domain Public by Eric Wendelin http://eriwen.com/ (2008)
-//                  Luke Smith http://lucassmith.name/ (2008)
-//                  Loic Dachary <loic@dachary.org> (2008)
-//                  Johan Euphrosine <proppy@aminche.com> (2008)
-//                  Øyvind Sean Kinsey http://kinsey.no/blog
-//
-// Information and discussions
-// http://jspoker.pokersource.info/skin/test-printstacktrace.html
-// http://eriwen.com/javascript/js-stack-trace/
-// http://eriwen.com/javascript/stacktrace-update/
-// http://pastie.org/253058
-// http://browsershots.org/http://jspoker.pokersource.info/skin/test-printstacktrace.html
-//
-
-//
-// guessFunctionNameFromLines comes from firebug
-//
-// Software License Agreement (BSD License)
-//
-// Copyright (c) 2007, Parakey Inc.
-// All rights reserved.
-//
-// Redistribution and use of this software in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above
-//   copyright notice, this list of conditions and the
-//   following disclaimer.
-//
-// * Redistributions in binary form must reproduce the above
-//   copyright notice, this list of conditions and the
-//   following disclaimer in the documentation and/or other
-//   materials provided with the distribution.
-//
-// * Neither the name of Parakey Inc. nor the names of its
-//   contributors may be used to endorse or promote products
-//   derived from this software without specific prior
-//   written permission of Parakey Inc.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-/**
- * Different browsers create stack traces in different ways.
- * <strike>Feature</strike> Browser detection baby ;).
- */
-var mode = (function() {
-
-    // We use SC's browser detection here to avoid the "break on error"
-    // functionality provided by Firebug. Firebug tries to do the right
-    // thing here and break, but it happens every time you load the page.
-    // bug 554105
-    if (ua.isGecko) {
-        return 'firefox';
-    } else if (ua.isOpera) {
-        return 'opera';
-    } else {
-        return 'other';
-    }
-
-    // SC doesn't do any detection of Chrome at this time.
-
-    // this is the original feature detection code that is used as a
-    // fallback.
-    try {
-        (0)();
-    } catch (e) {
-        if (e.arguments) {
-            return 'chrome';
-        }
-        if (e.stack) {
-            return 'firefox';
-        }
-        if (window.opera && !('stacktrace' in e)) { //Opera 9-
-            return 'opera';
-        }
-    }
-    return 'other';
-})();
-
-/**
- *
- */
-function stringifyArguments(args) {
-    for (var i = 0; i < args.length; ++i) {
-        var argument = args[i];
-        if (typeof argument == 'object') {
-            args[i] = '#object';
-        } else if (typeof argument == 'function') {
-            args[i] = '#function';
-        } else if (typeof argument == 'string') {
-            args[i] = '"' + argument + '"';
-        }
-    }
-    return args.join(',');
-}
-
-/**
- * Extract a stack trace from the format emitted by each browser.
- */
-var decoders = {
-    chrome: function(e) {
-        var stack = e.stack;
-        if (!stack) {
-            console.log(e);
-            return [];
-        }
-        return stack.replace(/^.*?\n/, '').
-                replace(/^.*?\n/, '').
-                replace(/^.*?\n/, '').
-                replace(/^[^\(]+?[\n$]/gm, '').
-                replace(/^\s+at\s+/gm, '').
-                replace(/^Object.<anonymous>\s*\(/gm, '{anonymous}()@').
-                split('\n');
-    },
-
-    firefox: function(e) {
-        var stack = e.stack;
-        if (!stack) {
-            console.log(e);
-            return [];
-        }
-        // stack = stack.replace(/^.*?\n/, '');
-        stack = stack.replace(/(?:\n@:0)?\s+$/m, '');
-        stack = stack.replace(/^\(/gm, '{anonymous}(');
-        return stack.split('\n');
-    },
-
-    // Opera 7.x and 8.x only!
-    opera: function(e) {
-        var lines = e.message.split('\n'), ANON = '{anonymous}',
-            lineRE = /Line\s+(\d+).*?script\s+(http\S+)(?:.*?in\s+function\s+(\S+))?/i, i, j, len;
-
-        for (i = 4, j = 0, len = lines.length; i < len; i += 2) {
-            if (lineRE.test(lines[i])) {
-                lines[j++] = (RegExp.$3 ? RegExp.$3 + '()@' + RegExp.$2 + RegExp.$1 : ANON + '()@' + RegExp.$2 + ':' + RegExp.$1) +
-                ' -- ' +
-                lines[i + 1].replace(/^\s+/, '');
-            }
-        }
-
-        lines.splice(j, lines.length - j);
-        return lines;
-    },
-
-    // Safari, Opera 9+, IE, and others
-    other: function(curr) {
-        var ANON = '{anonymous}', fnRE = /function\s*([\w\-$]+)?\s*\(/i, stack = [], j = 0, fn, args;
-
-        var maxStackSize = 10;
-        while (curr && stack.length < maxStackSize) {
-            fn = fnRE.test(curr.toString()) ? RegExp.$1 || ANON : ANON;
-            args = Array.prototype.slice.call(curr['arguments']);
-            stack[j++] = fn + '(' + stringifyArguments(args) + ')';
-
-            //Opera bug: if curr.caller does not exist, Opera returns curr (WTF)
-            if (curr === curr.caller && window.opera) {
-                //TODO: check for same arguments if possible
-                break;
-            }
-            curr = curr.caller;
-        }
-        return stack;
-    }
-};
-
-/**
- *
- */
-function NameGuesser() {
-}
-
-NameGuesser.prototype = {
-
-    sourceCache: {},
-
-    ajax: function(url) {
-        var req = this.createXMLHTTPObject();
-        if (!req) {
-            return;
-        }
-        req.open('GET', url, false);
-        req.setRequestHeader('User-Agent', 'XMLHTTP/1.0');
-        req.send('');
-        return req.responseText;
-    },
-
-    createXMLHTTPObject: function() {
-	    // Try XHR methods in order and store XHR factory
-        var xmlhttp, XMLHttpFactories = [
-            function() {
-                return new XMLHttpRequest();
-            }, function() {
-                return new ActiveXObject('Msxml2.XMLHTTP');
-            }, function() {
-                return new ActiveXObject('Msxml3.XMLHTTP');
-            }, function() {
-                return new ActiveXObject('Microsoft.XMLHTTP');
-            }
-        ];
-        for (var i = 0; i < XMLHttpFactories.length; i++) {
-            try {
-                xmlhttp = XMLHttpFactories[i]();
-                // Use memoization to cache the factory
-                this.createXMLHTTPObject = XMLHttpFactories[i];
-                return xmlhttp;
-            } catch (e) {}
-        }
-    },
-
-    getSource: function(url) {
-        if (!(url in this.sourceCache)) {
-            this.sourceCache[url] = this.ajax(url).split('\n');
-        }
-        return this.sourceCache[url];
-    },
-
-    guessFunctions: function(stack) {
-        for (var i = 0; i < stack.length; ++i) {
-            var reStack = /{anonymous}\(.*\)@(\w+:\/\/([-\w\.]+)+(:\d+)?[^:]+):(\d+):?(\d+)?/;
-            var frame = stack[i], m = reStack.exec(frame);
-            if (m) {
-                var file = m[1], lineno = m[4]; //m[7] is character position in Chrome
-                if (file && lineno) {
-                    var functionName = this.guessFunctionName(file, lineno);
-                    stack[i] = frame.replace('{anonymous}', functionName);
-                }
-            }
-        }
-        return stack;
-    },
-
-    guessFunctionName: function(url, lineNo) {
-        try {
-            return this.guessFunctionNameFromLines(lineNo, this.getSource(url));
-        } catch (e) {
-            return 'getSource failed with url: ' + url + ', exception: ' + e.toString();
-        }
-    },
-
-    guessFunctionNameFromLines: function(lineNo, source) {
-        var reFunctionArgNames = /function ([^(]*)\(([^)]*)\)/;
-        var reGuessFunction = /['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*(function|eval|new Function)/;
-        // Walk backwards from the first line in the function until we find the line which
-        // matches the pattern above, which is the function definition
-        var line = '', maxLines = 10;
-        for (var i = 0; i < maxLines; ++i) {
-            line = source[lineNo - i] + line;
-            if (line !== undefined) {
-                var m = reGuessFunction.exec(line);
-                if (m) {
-                    return m[1];
-                }
-                else {
-                    m = reFunctionArgNames.exec(line);
-                }
-                if (m && m[1]) {
-                    return m[1];
-                }
-            }
-        }
-        return '(?)';
-    }
-};
-
-var guesser = new NameGuesser();
-
-var frameIgnorePatterns = [
-    /http:\/\/localhost:4020\/sproutcore.js:/
-];
-
-exports.ignoreFramesMatching = function(regex) {
-    frameIgnorePatterns.push(regex);
-};
-
-/**
- * Create a stack trace from an exception
- * @param ex {Error} The error to create a stacktrace from (optional)
- * @param guess {Boolean} If we should try to resolve the names of anonymous functions
- */
-exports.Trace = function Trace(ex, guess) {
-    this._ex = ex;
-    this._stack = decoders[mode](ex);
-
-    if (guess) {
-        this._stack = guesser.guessFunctions(this._stack);
-    }
-};
-
-/**
- * Log to the console a number of lines (default all of them)
- * @param lines {number} Maximum number of lines to wrote to console
- */
-exports.Trace.prototype.log = function(lines) {
-    if (lines <= 0) {
-        // You aren't going to have more lines in your stack trace than this
-        // and it still fits in a 32bit integer
-        lines = 999999999;
-    }
-
-    var printed = 0;
-    for (var i = 0; i < this._stack.length && printed < lines; i++) {
-        var frame = this._stack[i];
-        var display = true;
-        frameIgnorePatterns.forEach(function(regex) {
-            if (regex.test(frame)) {
-                display = false;
-            }
-        });
-        if (display) {
-            console.debug(frame);
-            printed++;
-        }
-    }
-};
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/useragent', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-var os = (navigator.platform.match(/mac|win|linux/i) || ["other"])[0].toLowerCase();
-var ua = navigator.userAgent;
-var av = navigator.appVersion;
-
-/** Is the user using a browser that identifies itself as Windows */
-exports.isWin = (os == "win");
-
-/** Is the user using a browser that identifies itself as Mac OS */
-exports.isMac = (os == "mac");
-
-/** Is the user using a browser that identifies itself as Linux */
-exports.isLinux = (os == "linux");
-
-exports.isIE = ! + "\v1";
-
-/** Is this Firefox or related? */
-exports.isGecko = exports.isMozilla = window.controllers && window.navigator.product === "Gecko";
-
-/** oldGecko == rev < 2.0 **/
-exports.isOldGecko = exports.isGecko && /rv\:1/.test(navigator.userAgent);
-
-/** Is this Opera */
-exports.isOpera = window.opera && Object.prototype.toString.call(window.opera) == "[object Opera]";
-
-/** Is the user using a browser that identifies itself as WebKit */
-exports.isWebKit = parseFloat(ua.split("WebKit/")[1]) || undefined;
-
-exports.isChrome = parseFloat(ua.split(" Chrome/")[1]) || undefined;
-
-exports.isAIR = ua.indexOf("AdobeAIR") >= 0;
-
-exports.isIPad = ua.indexOf("iPad") >= 0;
-
-/**
- * I hate doing this, but we need some way to determine if the user is on a Mac
- * The reason is that users have different expectations of their key combinations.
- *
- * Take copy as an example, Mac people expect to use CMD or APPLE + C
- * Windows folks expect to use CTRL + C
- */
-exports.OS = {
-    LINUX: 'LINUX',
-    MAC: 'MAC',
-    WINDOWS: 'WINDOWS'
-};
-
-/**
- * Return an exports.OS constant
- */
-exports.getOS = function() {
-    if (exports.isMac) {
-        return exports.OS['MAC'];
-    } else if (exports.isLinux) {
-        return exports.OS['LINUX'];
-    } else {
-        return exports.OS['WINDOWS'];
-    }
-};
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/oop', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-exports.inherits = (function() {
-    var tempCtor = function() {};
-    return function(ctor, superCtor) {
-        tempCtor.prototype = superCtor.prototype;
-        ctor.super_ = superCtor.prototype;
-        ctor.prototype = new tempCtor();
-        ctor.prototype.constructor = ctor;
-    }
-}());
-
-exports.mixin = function(obj, mixin) {
-    for (var key in mixin) {
-        obj[key] = mixin[key];
-    }
-};
-
-exports.implement = function(proto, mixin) {
-    exports.mixin(proto, mixin);
-};
-
-});
-/*! @license
-==========================================================================
-SproutCore -- JavaScript Application Framework
-copyright 2006-2009, Sprout Systems Inc., Apple Inc. and contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-SproutCore and the SproutCore logo are trademarks of Sprout Systems, Inc.
-
-For more information about SproutCore, visit http://www.sproutcore.com
-
-
-==========================================================================
-@license */
-
-// Most of the following code is taken from SproutCore with a few changes.
-
-define('pilot/keys', ['require', 'exports', 'module' , 'pilot/oop'], function(require, exports, module) {
-
-var oop = require("pilot/oop");
-
-/**
- * Helper functions and hashes for key handling.
- */
-var Keys = (function() {
-    var ret = {
-        MODIFIER_KEYS: {
-            16: 'Shift', 17: 'Ctrl', 18: 'Alt', 224: 'Meta'
-        },
-
-        KEY_MODS: {
-            "ctrl": 1, "alt": 2, "option" : 2,
-            "shift": 4, "meta": 8, "command": 8
-        },
-
-        FUNCTION_KEYS : {
-            8  : "Backspace",
-            9  : "Tab",
-            13 : "Return",
-            19 : "Pause",
-            27 : "Esc",
-            32 : "Space",
-            33 : "PageUp",
-            34 : "PageDown",
-            35 : "End",
-            36 : "Home",
-            37 : "Left",
-            38 : "Up",
-            39 : "Right",
-            40 : "Down",
-            44 : "Print",
-            45 : "Insert",
-            46 : "Delete",
-            112: "F1",
-            113: "F2",
-            114: "F3",
-            115: "F4",
-            116: "F5",
-            117: "F6",
-            118: "F7",
-            119: "F8",
-            120: "F9",
-            121: "F10",
-            122: "F11",
-            123: "F12",
-            144: "Numlock",
-            145: "Scrolllock"
-        },
-
-        PRINTABLE_KEYS: {
-           32: ' ',  48: '0',  49: '1',  50: '2',  51: '3',  52: '4', 53:  '5',
-           54: '6',  55: '7',  56: '8',  57: '9',  59: ';',  61: '=', 65:  'a',
-           66: 'b',  67: 'c',  68: 'd',  69: 'e',  70: 'f',  71: 'g', 72:  'h',
-           73: 'i',  74: 'j',  75: 'k',  76: 'l',  77: 'm',  78: 'n', 79:  'o',
-           80: 'p',  81: 'q',  82: 'r',  83: 's',  84: 't',  85: 'u', 86:  'v',
-           87: 'w',  88: 'x',  89: 'y',  90: 'z', 107: '+', 109: '-', 110: '.',
-          188: ',', 190: '.', 191: '/', 192: '`', 219: '[', 220: '\\',
-          221: ']', 222: '\"'
-        }
-    };
-
-    // A reverse map of FUNCTION_KEYS
-    for (i in ret.FUNCTION_KEYS) {
-        var name = ret.FUNCTION_KEYS[i].toUpperCase();
-        ret[name] = parseInt(i, 10);
-    }
-
-    // Add the MODIFIER_KEYS, FUNCTION_KEYS and PRINTABLE_KEYS to the KEY
-    // variables as well.
-    oop.mixin(ret, ret.MODIFIER_KEYS);
-    oop.mixin(ret, ret.PRINTABLE_KEYS);
-    oop.mixin(ret, ret.FUNCTION_KEYS);
-
-    return ret;
-})();
-oop.mixin(exports, Keys);
-
-exports.keyCodeToString = function(keyCode) {
-    return (Keys[keyCode] || String.fromCharCode(keyCode)).toLowerCase();
-}
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/event_emitter', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-var EventEmitter = {};
-
-EventEmitter._emit =
-EventEmitter._dispatchEvent = function(eventName, e) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners || !listeners.length) return;
-
-    var e = e || {};
-    e.type = eventName;
-
-    for (var i=0; i<listeners.length; i++) {
-        listeners[i](e);
-    }
-};
-
-EventEmitter.on =
-EventEmitter.addEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners) {
-      var listeners = this._eventRegistry[eventName] = [];
-    }
-    if (listeners.indexOf(callback) == -1) {
-        listeners.push(callback);
-    }
-};
-
-EventEmitter.removeListener =
-EventEmitter.removeEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners) {
-      return;
-    }
-    var index = listeners.indexOf(callback);
-    if (index !== -1) {
-        listeners.splice(index, 1);
-    }
-};
-
-EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
-}
-
-exports.EventEmitter = EventEmitter;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Walker (jwalker@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/typecheck', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-var objectToString = Object.prototype.toString;
-
-/**
- * Return true if it is a String
- */
-exports.isString = function(it) {
-    return it && objectToString.call(it) === "[object String]";
-};
-
-/**
- * Returns true if it is a Boolean.
- */
-exports.isBoolean = function(it) {
-    return it && objectToString.call(it) === "[object Boolean]";
-};
-
-/**
- * Returns true if it is a Number.
- */
-exports.isNumber = function(it) {
-    return it && objectToString.call(it) === "[object Number]" && isFinite(it);
-};
-
-/**
- * Hack copied from dojo.
- */
-exports.isObject = function(it) {
-    return it !== undefined &&
-        (it === null || typeof it == "object" ||
-        Array.isArray(it) || exports.isFunction(it));
-};
-
-/**
- * Is the passed object a function?
- * From dojo.isFunction()
- */
-exports.isFunction = function(it) {
-    return it && objectToString.call(it) === "[object Function]";
-};
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Julian Viereck (jviereck@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/catalog', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-
-var extensionSpecs = {};
-
-exports.addExtensionSpec = function(extensionSpec) {
-    extensionSpecs[extensionSpec.name] = extensionSpec;
-};
-
-exports.removeExtensionSpec = function(extensionSpec) {
-    if (typeof extensionSpec === "string") {
-        delete extensionSpecs[extensionSpec];
-    }
-    else {
-        delete extensionSpecs[extensionSpec.name];
-    }
-};
-
-exports.getExtensionSpec = function(name) {
-    return extensionSpecs[name];
-};
-
-exports.getExtensionSpecs = function() {
-    return Object.keys(extensionSpecs);
-};
-
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/lang', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-exports.stringReverse = function(string) {
-    return string.split("").reverse().join("");
-};
-
-exports.stringRepeat = function (string, count) {
-     return new Array(count + 1).join(string);
-};
-
-var trimBeginRegexp = /^\s\s*/;
-var trimEndRegexp = /\s\s*$/;
-
-exports.stringTrimLeft = function (string) {
-    return string.replace(trimBeginRegexp, '')
-};
-
-exports.stringTrimRight = function (string) {
-    return string.replace(trimEndRegexp, '');
-};
-
-exports.copyObject = function(obj) {
-    var copy = {};
-    for (var key in obj) {
-        copy[key] = obj[key];
-    }
-    return copy;
-};
-
-exports.copyArray = function(array){
-    var copy = [];
-    for (i=0, l=array.length; i<l; i++) {
-        if (array[i] && typeof array[i] == "object")
-            copy[i] = this.copyObject( array[i] );
-        else 
-            copy[i] = array[i]
-    }
-    return copy;
-};
-
-exports.deepCopy = function (obj) {
-    if (typeof obj != "object") {
-        return obj;
-    }
-    
-    var copy = obj.constructor();
-    for (var key in obj) {
-        if (typeof obj[key] == "object") {
-            copy[key] = this.deepCopy(obj[key]);
-        } else {
-            copy[key] = obj[key];
-        }
-    }
-    return copy;
-}
-
-exports.arrayToMap = function(arr) {
-    var map = {};
-    for (var i=0; i<arr.length; i++) {
-        map[arr[i]] = 1;
-    }
-    return map;
-
-};
-
-/**
- * splice out of 'array' anything that === 'value'
- */
-exports.arrayRemove = function(array, value) {
-  for (var i = 0; i <= array.length; i++) {
-    if (value === array[i]) {
-      array.splice(i, 1);
-    }
-  }
-};
-
-exports.escapeRegExp = function(str) {
-    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
-};
-
-exports.deferredCall = function(fcn) {
-
-    var timer = null;
-    var callback = function() {
-        timer = null;
-        fcn();
-    };
-
-    var deferred = function(timeout) {
-        if (!timer) {
-            timer = setTimeout(callback, timeout || 0);
-        }
-        return deferred;
-    }
-
-    deferred.schedule = deferred;
-
-    deferred.call = function() {
-        this.cancel();
-        fcn();
-        return deferred;
-    };
-
-    deferred.cancel = function() {
-        clearTimeout(timer);
-        timer = null;
-        return deferred;
-    };
-
-    return deferred;
-};
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Joe Walker (jwalker@mozilla.com)
- *      Kevin Dangoor (kdangoor@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/types/settings', ['require', 'exports', 'module' , 'pilot/types/basic', 'pilot/types', 'pilot/settings'], function(require, exports, module) {
-
-var SelectionType = require('pilot/types/basic').SelectionType;
-var DeferredType = require('pilot/types/basic').DeferredType;
-var types = require('pilot/types');
-var settings = require('pilot/settings').settings;
-
-
-/**
- * EVIL: This relies on us using settingValue in the same event as setting
- * The alternative is to have some central place where we store the current
- * command line, but this might be a lesser evil for now.
- */
-var lastSetting;
-
-/**
- * Select from the available settings
- */
-var setting = new SelectionType({
-    name: 'setting',
-    data: function() {
-        return env.settings.getSettingNames();
-    },
-    stringify: function(setting) {
-        lastSetting = setting;
-        return setting.name;
-    },
-    fromString: function(str) {
-        lastSetting = settings.getSetting(str);
-        return lastSetting;
-    },
-    noMatch: function() {
-        lastSetting = null;
-    }
-});
-
-/**
- * Something of a hack to allow the set command to give a clearer definition
- * of the type to the command line.
- */
-var settingValue = new DeferredType({
-    name: 'settingValue',
-    defer: function() {
-        if (lastSetting) {
-            return lastSetting.type;
-        }
-        else {
-            return types.getType('text');
-        }
-    },
-    /**
-     * Promote the current value in any list of predictions, and add it if
-     * there are none.
-     */
-    getDefault: function() {
-        var conversion = this.parse('');
-        if (lastSetting) {
-            var current = lastSetting.get();
-            if (conversion.predictions.length === 0) {
-                conversion.predictions.push(current);
-            }
-            else {
-                // Remove current from predictions
-                var removed = false;
-                while (true) {
-                    var index = conversion.predictions.indexOf(current);
-                    if (index === -1) {
-                        break;
-                    }
-                    conversion.predictions.splice(index, 1);
-                    removed = true;
-                }
-                // If the current value wasn't something we would predict, leave it
-                if (removed) {
-                    conversion.predictions.push(current);
-                }
-            }
-        }
-        return conversion;
-    }
-});
-
-var env;
-
-/**
- * Registration and de-registration.
- */
-exports.startup = function(data, reason) {
-    // TODO: this is probably all kinds of evil, but we need something working
-    env = data.env;
-    types.registerType(setting);
-    types.registerType(settingValue);
-};
-
-exports.shutdown = function(data, reason) {
-    types.unregisterType(setting);
-    types.unregisterType(settingValue);
-};
-
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Walker (jwalker@mozilla.com)
- *   Julian Viereck (jviereck@mozilla.com)
- *   Kevin Dangoor (kdangoor@mozilla.com)
- *   Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/settings', ['require', 'exports', 'module' , 'pilot/console', 'pilot/oop', 'pilot/types', 'pilot/event_emitter', 'pilot/catalog'], function(require, exports, module) {
-
-/**
- * This plug-in manages settings.
- */
-
-var console = require('pilot/console');
-var oop = require('pilot/oop');
-var types = require('pilot/types');
-var EventEmitter = require('pilot/event_emitter').EventEmitter;
-var catalog = require('pilot/catalog');
-
-var settingExtensionSpec = {
-    name: 'setting',
-    description: 'A setting is something that the application offers as a ' +
-            'way to customize how it works',
-    register: 'env.settings.addSetting',
-    indexOn: 'name'
-};
-
-exports.startup = function(data, reason) {
-    catalog.addExtensionSpec(settingExtensionSpec);
-};
-
-exports.shutdown = function(data, reason) {
-    catalog.removeExtensionSpec(settingExtensionSpec);
-};
-
-
-/**
- * Create a new setting.
- * @param settingSpec An object literal that looks like this:
- * {
- *   name: 'thing',
- *   description: 'Thing is an example setting',
- *   type: 'string',
- *   defaultValue: 'something'
- * }
- */
-function Setting(settingSpec, settings) {
-    this._settings = settings;
-
-    Object.keys(settingSpec).forEach(function(key) {
-        this[key] = settingSpec[key];
-    }, this);
-
-    this.type = types.getType(this.type);
-    if (this.type == null) {
-        throw new Error('In ' + this.name +
-            ': can\'t find type for: ' + JSON.stringify(settingSpec.type));
-    }
-
-    if (!this.name) {
-        throw new Error('Setting.name == undefined. Ignoring.', this);
-    }
-
-    if (!this.defaultValue === undefined) {
-        throw new Error('Setting.defaultValue == undefined', this);
-    }
-
-    if (this.onChange) {
-        this.on('change', this.onChange.bind(this))
-    }
-
-    this.set(this.defaultValue);
-}
-Setting.prototype = {
-    get: function() {
-        return this.value;
-    },
-
-    set: function(value) {
-        if (this.value === value) {
-            return;
-        }
-
-        this.value = value;
-        if (this._settings.persister) {
-            this._settings.persister.persistValue(this._settings, this.name, value);
-        }
-
-        this._dispatchEvent('change', { setting: this, value: value });
-    },
-
-    /**
-     * Reset the value of the <code>key</code> setting to it's default
-     */
-    resetValue: function() {
-        this.set(this.defaultValue);
-    },
-    toString: function () {
-        return this.name;
-    }
-};
-oop.implement(Setting.prototype, EventEmitter);
-
-
-/**
- * A base class for all the various methods of storing settings.
- * <p>Usage:
- * <pre>
- * // Create manually, or require 'settings' from the container.
- * // This is the manual version:
- * var settings = plugins.catalog.getObject('settings');
- * // Add a new setting
- * settings.addSetting({ name:'foo', ... });
- * // Display the default value
- * alert(settings.get('foo'));
- * // Alter the value, which also publishes the change etc.
- * settings.set('foo', 'bar');
- * // Reset the value to the default
- * settings.resetValue('foo');
- * </pre>
- * @constructor
- */
-function Settings(persister) {
-    // Storage for deactivated values
-    this._deactivated = {};
-
-    // Storage for the active settings
-    this._settings = {};
-    // We often want sorted setting names. Cache
-    this._settingNames = [];
-
-    if (persister) {
-        this.setPersister(persister);
-    }
-};
-
-Settings.prototype = {
-    /**
-     * Function to add to the list of available settings.
-     * <p>Example usage:
-     * <pre>
-     * var settings = plugins.catalog.getObject('settings');
-     * settings.addSetting({
-     *     name: 'tabsize', // For use in settings.get('X')
-     *     type: 'number',  // To allow value checking.
-     *     defaultValue: 4  // Default value for use when none is directly set
-     * });
-     * </pre>
-     * @param {object} settingSpec Object containing name/type/defaultValue members.
-     */
-    addSetting: function(settingSpec) {
-        var setting = new Setting(settingSpec, this);
-        this._settings[setting.name] = setting;
-        this._settingNames.push(setting.name);
-        this._settingNames.sort();
-    },
-
-    addSettings: function addSettings(settings) {
-        Object.keys(settings).forEach(function (name) {
-            var setting = settings[name];
-            if (!('name' in setting)) setting.name = name;
-            this.addSetting(setting);
-        }, this);
-    },
-
-    removeSetting: function(setting) {
-        var name = (typeof setting === 'string' ? setting : setting.name);
-        setting = this._settings[name];
-        delete this._settings[name];
-        util.arrayRemove(this._settingNames, name);
-        settings.removeAllListeners('change');
-    },
-
-    removeSettings: function removeSettings(settings) {
-        Object.keys(settings).forEach(function(name) {
-            var setting = settings[name];
-            if (!('name' in setting)) setting.name = name;
-            this.removeSettings(setting);
-        }, this);
-    },
-
-    getSettingNames: function() {
-        return this._settingNames;
-    },
-
-    getSetting: function(name) {
-        return this._settings[name];
-    },
-
-    /**
-     * A Persister is able to store settings. It is an object that defines
-     * two functions:
-     * loadInitialValues(settings) and persistValue(settings, key, value).
-     */
-    setPersister: function(persister) {
-        this._persister = persister;
-        if (persister) {
-            persister.loadInitialValues(this);
-        }
-    },
-
-    resetAll: function() {
-        this.getSettingNames().forEach(function(key) {
-            this.resetValue(key);
-        }, this);
-    },
-
-    /**
-     * Retrieve a list of the known settings and their values
-     */
-    _list: function() {
-        var reply = [];
-        this.getSettingNames().forEach(function(setting) {
-            reply.push({
-                'key': setting,
-                'value': this.getSetting(setting).get()
-            });
-        }, this);
-        return reply;
-    },
-
-    /**
-     * Prime the local cache with the defaults.
-     */
-    _loadDefaultValues: function() {
-        this._loadFromObject(this._getDefaultValues());
-    },
-
-    /**
-     * Utility to load settings from an object
-     */
-    _loadFromObject: function(data) {
-        // We iterate over data rather than keys so we don't forget values
-        // which don't have a setting yet.
-        for (var key in data) {
-            if (data.hasOwnProperty(key)) {
-                var setting = this._settings[key];
-                if (setting) {
-                    var value = setting.type.parse(data[key]);
-                    this.set(key, value);
-                } else {
-                    this.set(key, data[key]);
-                }
-            }
-        }
-    },
-
-    /**
-     * Utility to grab all the settings and export them into an object
-     */
-    _saveToObject: function() {
-        return this.getSettingNames().map(function(key) {
-            return this._settings[key].type.stringify(this.get(key));
-        }.bind(this));
-    },
-
-    /**
-     * The default initial settings
-     */
-    _getDefaultValues: function() {
-        return this.getSettingNames().map(function(key) {
-            return this._settings[key].spec.defaultValue;
-        }.bind(this));
-    }
-};
-exports.settings = new Settings();
-
-/**
- * Save the settings in a cookie
- * This code has not been tested since reboot
- * @constructor
- */
-function CookiePersister() {
-};
-
-CookiePersister.prototype = {
-    loadInitialValues: function(settings) {
-        settings._loadDefaultValues();
-        var data = cookie.get('settings');
-        settings._loadFromObject(JSON.parse(data));
-    },
-
-    persistValue: function(settings, key, value) {
-        try {
-            var stringData = JSON.stringify(settings._saveToObject());
-            cookie.set('settings', stringData);
-        } catch (ex) {
-            console.error('Unable to JSONify the settings! ' + ex);
-            return;
-        }
-    }
-};
-
-exports.CookiePersister = CookiePersister;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Skywriter Team (skywriter@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/commands/settings', ['require', 'exports', 'module' , 'pilot/canon'], function(require, exports, module) {
-
-
-var setCommandSpec = {
-    name: 'set',
-    params: [
-        {
-            name: 'setting',
-            type: 'setting',
-            description: 'The name of the setting to display or alter',
-            defaultValue: null
-        },
-        {
-            name: 'value',
-            type: 'settingValue',
-            description: 'The new value for the chosen setting',
-            defaultValue: null
-        }
-    ],
-    description: 'define and show settings',
-    exec: function(env, args, request) {
-        var html;
-        if (!args.setting) {
-            // 'set' by itself lists all the settings
-            var names = env.settings.getSettingNames();
-            html = '';
-            // first sort the settingsList based on the name
-            names.sort(function(name1, name2) {
-                return name1.localeCompare(name2);
-            });
-
-            names.forEach(function(name) {
-                var setting = env.settings.getSetting(name);
-                var url = 'https://wiki.mozilla.org/Labs/Skywriter/Settings#' +
-                        setting.name;
-                html += '<a class="setting" href="' + url +
-                        '" title="View external documentation on setting: ' +
-                        setting.name +
-                        '" target="_blank">' +
-                        setting.name +
-                        '</a> = ' +
-                        setting.value +
-                        '<br/>';
-            });
-        } else {
-            // set with only a setting, shows the value for that setting
-            if (args.value === undefined) {
-                html = '<strong>' + setting.name + '</strong> = ' +
-                        setting.get();
-            } else {
-                // Actually change the setting
-                args.setting.set(args.value);
-                html = 'Setting: <strong>' + args.setting.name + '</strong> = ' +
-                        args.setting.get();
-            }
-        }
-        request.done(html);
-    }
-};
-
-var unsetCommandSpec = {
-    name: 'unset',
-    params: [
-        {
-            name: 'setting',
-            type: 'setting',
-            description: 'The name of the setting to return to defaults'
-        }
-    ],
-    description: 'unset a setting entirely',
-    exec: function(env, args, request) {
-        var setting = env.settings.get(args.setting);
-        if (!setting) {
-            request.doneWithError('No setting with the name <strong>' +
-                args.setting + '</strong>.');
-            return;
-        }
-
-        setting.reset();
-        request.done('Reset ' + setting.name + ' to default: ' +
-                env.settings.get(args.setting));
-    }
-};
-
-var canon = require('pilot/canon');
-
-exports.startup = function(data, reason) {
-    canon.addCommand(setCommandSpec);
-    canon.addCommand(unsetCommandSpec);
-};
-
-exports.shutdown = function(data, reason) {
-    canon.removeCommand(setCommandSpec);
-    canon.removeCommand(unsetCommandSpec);
-};
-
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Skywriter Team (skywriter@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/commands/basic', ['require', 'exports', 'module' , 'pilot/typecheck', 'pilot/canon'], function(require, exports, module) {
-
-
-var checks = require("pilot/typecheck");
-var canon = require('pilot/canon');
-
-/**
- * 'help' command
- */
-var helpCommandSpec = {
-    name: 'help',
-    params: [
-        {
-            name: 'search',
-            type: 'text',
-            description: 'Search string to narrow the output.',
-            defaultValue: null
-        }
-    ],
-    description: 'Get help on the available commands.',
-    exec: function(env, args, request) {
-        var output = [];
-
-        var command = canon.getCommand(args.search);
-        if (command && command.exec) {
-            // caught a real command
-            output.push(command.description ?
-                    command.description :
-                    'No description for ' + args.search);
-        } else {
-            var showHidden = false;
-
-            if (command) {
-                // We must be looking at sub-commands
-                output.push('<h2>Sub-Commands of ' + command.name + '</h2>');
-                output.push('<p>' + command.description + '</p>');
-            }
-            else if (args.search) {
-                if (args.search == 'hidden') { // sneaky, sneaky.
-                    args.search = '';
-                    showHidden = true;
-                }
-                output.push('<h2>Commands starting with \'' + args.search + '\':</h2>');
-            }
-            else {
-                output.push('<h2>Available Commands:</h2>');
-            }
-
-            var commandNames = canon.getCommandNames();
-            commandNames.sort();
-
-            output.push('<table>');
-            for (var i = 0; i < commandNames.length; i++) {
-                command = canon.getCommand(commandNames[i]);
-                if (!showHidden && command.hidden) {
-                    continue;
-                }
-                if (command.description === undefined) {
-                    // Ignore editor actions
-                    continue;
-                }
-                if (args.search && command.name.indexOf(args.search) !== 0) {
-                    // Filtered out by the user
-                    continue;
-                }
-                if (!args.search && command.name.indexOf(' ') != -1) {
-                    // sub command
-                    continue;
-                }
-                if (command && command.name == args.search) {
-                    // sub command, and we've already given that help
-                    continue;
-                }
-
-                // todo add back a column with parameter information, perhaps?
-
-                output.push('<tr>');
-                output.push('<th class="right">' + command.name + '</th>');
-                output.push('<td>' + command.description + '</td>');
-                output.push('</tr>');
-            }
-            output.push('</table>');
-        }
-
-        request.done(output.join(''));
-    }
-};
-
-/**
- * 'eval' command
- */
-var evalCommandSpec = {
-    name: 'eval',
-    params: [
-        {
-            name: 'javascript',
-            type: 'text',
-            description: 'The JavaScript to evaluate'
-        }
-    ],
-    description: 'evals given js code and show the result',
-    hidden: true,
-    exec: function(env, args, request) {
-        var result;
-        var javascript = args.javascript;
-        try {
-            result = eval(javascript);
-        } catch (e) {
-            result = '<b>Error: ' + e.message + '</b>';
-        }
-
-        var msg = '';
-        var type = '';
-        var x;
-
-        if (checks.isFunction(result)) {
-            // converts the function to a well formated string
-            msg = (result + '').replace(/\n/g, '<br>').replace(/ /g, '&#160');
-            type = 'function';
-        } else if (checks.isObject(result)) {
-            if (Array.isArray(result)) {
-                type = 'array';
-            } else {
-                type = 'object';
-            }
-
-            var items = [];
-            var value;
-
-            for (x in result) {
-                if (result.hasOwnProperty(x)) {
-                    if (checks.isFunction(result[x])) {
-                        value = '[function]';
-                    } else if (checks.isObject(result[x])) {
-                        value = '[object]';
-                    } else {
-                        value = result[x];
-                    }
-
-                    items.push({name: x, value: value});
-                }
-            }
-
-            items.sort(function(a,b) {
-                return (a.name.toLowerCase() < b.name.toLowerCase()) ? -1 : 1;
-            });
-
-            for (x = 0; x < items.length; x++) {
-                msg += '<b>' + items[x].name + '</b>: ' + items[x].value + '<br>';
-            }
-
-        } else {
-            msg = result;
-            type = typeof result;
-        }
-
-        request.done('Result for eval <b>\'' + javascript + '\'</b>' +
-                ' (type: '+ type+'): <br><br>'+ msg);
-    }
-};
-
-var canon = require('pilot/canon');
-
-exports.startup = function(data, reason) {
-    canon.addCommand(helpCommandSpec);
-    canon.addCommand(evalCommandSpec);
-};
-
-exports.shutdown = function(data, reason) {
-    canon.removeCommand(helpCommandSpec);
-    canon.removeCommand(evalCommandSpec);
-};
-
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Walker (jwalker@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/settings/canon', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-
-var historyLengthSetting = {
-    name: "historyLength",
-    description: "How many typed commands do we recall for reference?",
-    type: "number",
-    defaultValue: 50
-};
-
-exports.startup = function(data, reason) {
-    data.env.settings.addSetting(historyLengthSetting);
-};
-
-exports.shutdown = function(data, reason) {
-    data.env.settings.removeSetting(historyLengthSetting);
-};
-
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Kevin Dangoor (kdangoor@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/plugin_manager', ['require', 'exports', 'module' , 'pilot/promise'], function(require, exports, module) {
-
-var Promise = require("pilot/promise").Promise;
-
-exports.REASONS = {
-    APP_STARTUP: 1,
-    APP_SHUTDOWN: 2,
-    PLUGIN_ENABLE: 3,
-    PLUGIN_DISABLE: 4,
-    PLUGIN_INSTALL: 5,
-    PLUGIN_UNINSTALL: 6,
-    PLUGIN_UPGRADE: 7,
-    PLUGIN_DOWNGRADE: 8
-};
-
-exports.Plugin = function(name) {
-    this.name = name;
-    this.status = this.INSTALLED;
-};
-
-exports.Plugin.prototype = {
-    /**
-     * constants for the state
-     */
-    NEW: 0,
-    INSTALLED: 1,
-    REGISTERED: 2,
-    STARTED: 3,
-    UNREGISTERED: 4,
-    SHUTDOWN: 5,
-
-    install: function(data, reason) {
-        var pr = new Promise();
-        if (this.status > this.NEW) {
-            pr.resolve(this);
-            return pr;
-        }
-        require([this.name], function(pluginModule) {
-            if (pluginModule.install) {
-                pluginModule.install(data, reason);
-            }
-            this.status = this.INSTALLED;
-            pr.resolve(this);
-        }.bind(this));
-        return pr;
-    },
-
-    register: function(data, reason) {
-        var pr = new Promise();
-        if (this.status != this.INSTALLED) {
-            pr.resolve(this);
-            return pr;
-        }
-        require([this.name], function(pluginModule) {
-            if (pluginModule.register) {
-                pluginModule.register(data, reason);
-            }
-            this.status = this.REGISTERED;
-            pr.resolve(this);
-        }.bind(this));
-        return pr;
-    },
-
-    startup: function(data, reason) {
-        reason = reason || exports.REASONS.APP_STARTUP;
-        var pr = new Promise();
-        if (this.status != this.REGISTERED) {
-            pr.resolve(this);
-            return pr;
-        }
-        require([this.name], function(pluginModule) {
-            if (pluginModule.startup) {
-                pluginModule.startup(data, reason);
-            }
-            this.status = this.STARTED;
-            pr.resolve(this);
-        }.bind(this));
-        return pr;
-    },
-
-    shutdown: function(data, reason) {
-        if (this.status != this.STARTED) {
-            return;
-        }
-        pluginModule = require(this.name);
-        if (pluginModule.shutdown) {
-            pluginModule.shutdown(data, reason);
-        }
-    }
-};
-
-exports.PluginCatalog = function() {
-    this.plugins = {};
-};
-
-exports.PluginCatalog.prototype = {
-    registerPlugins: function(pluginList, data, reason) {
-        var registrationPromises = [];
-        pluginList.forEach(function(pluginName) {
-            var plugin = this.plugins[pluginName];
-            if (plugin === undefined) {
-                plugin = new exports.Plugin(pluginName);
-                this.plugins[pluginName] = plugin;
-                registrationPromises.push(plugin.register(data, reason));
-            }
-        }.bind(this));
-        return Promise.group(registrationPromises);
-    },
-
-    startupPlugins: function(data, reason) {
-        var startupPromises = [];
-        for (var pluginName in this.plugins) {
-            var plugin = this.plugins[pluginName];
-            startupPromises.push(plugin.startup(data, reason));
-        }
-        return Promise.group(startupPromises);
-    }
-};
-
-exports.catalog = new exports.PluginCatalog();
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Walker (jwalker@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/promise', ['require', 'exports', 'module' , 'pilot/console', 'pilot/stacktrace'], function(require, exports, module) {
-
-var console = require("pilot/console");
-var Trace = require('pilot/stacktrace').Trace;
-
-/**
- * A promise can be in one of 2 states.
- * The ERROR and SUCCESS states are terminal, the PENDING state is the only
- * start state.
- */
-var ERROR = -1;
-var PENDING = 0;
-var SUCCESS = 1;
-
-/**
- * We give promises and ID so we can track which are outstanding
- */
-var _nextId = 0;
-
-/**
- * Debugging help if 2 things try to complete the same promise.
- * This can be slow (especially on chrome due to the stack trace unwinding) so
- * we should leave this turned off in normal use.
- */
-var _traceCompletion = false;
-
-/**
- * Outstanding promises. Handy list for debugging only.
- */
-var _outstanding = [];
-
-/**
- * Recently resolved promises. Also for debugging only.
- */
-var _recent = [];
-
-/**
- * Create an unfulfilled promise
- */
-Promise = function () {
-    this._status = PENDING;
-    this._value = undefined;
-    this._onSuccessHandlers = [];
-    this._onErrorHandlers = [];
-
-    // Debugging help
-    this._id = _nextId++;
-    //this._createTrace = new Trace(new Error());
-    _outstanding[this._id] = this;
-};
-
-/**
- * Yeay for RTTI.
- */
-Promise.prototype.isPromise = true;
-
-/**
- * Have we either been resolve()ed or reject()ed?
- */
-Promise.prototype.isComplete = function() {
-    return this._status != PENDING;
-};
-
-/**
- * Have we resolve()ed?
- */
-Promise.prototype.isResolved = function() {
-    return this._status == SUCCESS;
-};
-
-/**
- * Have we reject()ed?
- */
-Promise.prototype.isRejected = function() {
-    return this._status == ERROR;
-};
-
-/**
- * Take the specified action of fulfillment of a promise, and (optionally)
- * a different action on promise rejection.
- */
-Promise.prototype.then = function(onSuccess, onError) {
-    if (typeof onSuccess === 'function') {
-        if (this._status === SUCCESS) {
-            onSuccess.call(null, this._value);
-        } else if (this._status === PENDING) {
-            this._onSuccessHandlers.push(onSuccess);
-        }
-    }
-
-    if (typeof onError === 'function') {
-        if (this._status === ERROR) {
-            onError.call(null, this._value);
-        } else if (this._status === PENDING) {
-            this._onErrorHandlers.push(onError);
-        }
-    }
-
-    return this;
-};
-
-/**
- * Like then() except that rather than returning <tt>this</tt> we return
- * a promise which
- */
-Promise.prototype.chainPromise = function(onSuccess) {
-    var chain = new Promise();
-    chain._chainedFrom = this;
-    this.then(function(data) {
-        try {
-            chain.resolve(onSuccess(data));
-        } catch (ex) {
-            chain.reject(ex);
-        }
-    }, function(ex) {
-        chain.reject(ex);
-    });
-    return chain;
-};
-
-/**
- * Supply the fulfillment of a promise
- */
-Promise.prototype.resolve = function(data) {
-    return this._complete(this._onSuccessHandlers, SUCCESS, data, 'resolve');
-};
-
-/**
- * Renege on a promise
- */
-Promise.prototype.reject = function(data) {
-    return this._complete(this._onErrorHandlers, ERROR, data, 'reject');
-};
-
-/**
- * Internal method to be called on resolve() or reject().
- * @private
- */
-Promise.prototype._complete = function(list, status, data, name) {
-    // Complain if we've already been completed
-    if (this._status != PENDING) {
-        console.group('Promise already closed');
-        console.error('Attempted ' + name + '() with ', data);
-        console.error('Previous status = ', this._status,
-                ', previous value = ', this._value);
-        console.trace();
-
-        if (this._completeTrace) {
-            console.error('Trace of previous completion:');
-            this._completeTrace.log(5);
-        }
-        console.groupEnd();
-        return this;
-    }
-
-    if (_traceCompletion) {
-        this._completeTrace = new Trace(new Error());
-    }
-
-    this._status = status;
-    this._value = data;
-
-    // Call all the handlers, and then delete them
-    list.forEach(function(handler) {
-        handler.call(null, this._value);
-    }, this);
-    this._onSuccessHandlers.length = 0;
-    this._onErrorHandlers.length = 0;
-
-    // Remove the given {promise} from the _outstanding list, and add it to the
-    // _recent list, pruning more than 20 recent promises from that list.
-    delete _outstanding[this._id];
-    _recent.push(this);
-    while (_recent.length > 20) {
-        _recent.shift();
-    }
-
-    return this;
-};
-
-/**
- * Takes an array of promises and returns a promise that that is fulfilled once
- * all the promises in the array are fulfilled
- * @param group The array of promises
- * @return the promise that is fulfilled when all the array is fulfilled
- */
-Promise.group = function(promiseList) {
-    if (!(promiseList instanceof Array)) {
-        promiseList = Array.prototype.slice.call(arguments);
-    }
-
-    // If the original array has nothing in it, return now to avoid waiting
-    if (promiseList.length === 0) {
-        return new Promise().resolve([]);
-    }
-
-    var groupPromise = new Promise();
-    var results = [];
-    var fulfilled = 0;
-
-    var onSuccessFactory = function(index) {
-        return function(data) {
-            results[index] = data;
-            fulfilled++;
-            // If the group has already failed, silently drop extra results
-            if (groupPromise._status !== ERROR) {
-                if (fulfilled === promiseList.length) {
-                    groupPromise.resolve(results);
-                }
-            }
-        };
-    };
-
-    promiseList.forEach(function(promise, index) {
-        var onSuccess = onSuccessFactory(index);
-        var onError = groupPromise.reject.bind(groupPromise);
-        promise.then(onSuccess, onError);
-    });
-
-    return groupPromise;
-};
-
-exports.Promise = Promise;
-exports._outstanding = _outstanding;
-exports._recent = _recent;
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai AT sucan AT gmail ODT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/dom', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-var XHTML_NS = "http://www.w3.org/1999/xhtml";
-
-exports.createElement = function(tag, ns) {
-    return document.createElementNS ?
-           document.createElementNS(ns || XHTML_NS, tag) :
-           document.createElement(tag);
-};
-
-exports.setText = function(elem, text) {
-    if (elem.innerText !== undefined) {
-        elem.innerText = text;
-    }
-    if (elem.textContent !== undefined) {
-        elem.textContent = text;
-    }
-};
-
-if (!document.documentElement.classList) {
-    exports.hasCssClass = function(el, name) {
-        var classes = el.className.split(/\s+/g);
-        return classes.indexOf(name) !== -1;
-    };
-
-    /**
-    * Add a CSS class to the list of classes on the given node
-    */
-    exports.addCssClass = function(el, name) {
-        if (!exports.hasCssClass(el, name)) {
-            el.className += " " + name;
-        }
-    };
-
-    /**
-    * Remove a CSS class from the list of classes on the given node
-    */
-    exports.removeCssClass = function(el, name) {
-        var classes = el.className.split(/\s+/g);
-        while (true) {
-            var index = classes.indexOf(name);
-            if (index == -1) {
-                break;
-            }
-            classes.splice(index, 1);
-        }
-        el.className = classes.join(" ");
-    };
-
-    exports.toggleCssClass = function(el, name) {
-        var classes = el.className.split(/\s+/g), add = true;
-        while (true) {
-            var index = classes.indexOf(name);
-            if (index == -1) {
-                break;
-            }
-            add = false;
-            classes.splice(index, 1);
-        }
-        if(add)
-            classes.push(name);
-
-        el.className = classes.join(" ");
-        return add;
-    };
-} else {
-    exports.hasCssClass = function(el, name) {
-        return el.classList.contains(name);
-    };
-
-    exports.addCssClass = function(el, name) {
-        el.classList.add(name);
-    };
-
-    exports.removeCssClass = function(el, name) {
-        el.classList.remove(name);
-    };
-
-    exports.toggleCssClass = function(el, name) {
-        return el.classList.toggle(name);
-    };
-}
-
-/**
- * Add or remove a CSS class from the list of classes on the given node
- * depending on the value of <tt>include</tt>
- */
-exports.setCssClass = function(node, className, include) {
-    if (include) {
-        exports.addCssClass(node, className);
-    } else {
-        exports.removeCssClass(node, className);
-    }
-};
-
-exports.importCssString = function(cssText, doc){
-    doc = doc || document;
-
-    if (doc.createStyleSheet) {
-        var sheet = doc.createStyleSheet();
-        sheet.cssText = cssText;
-    }
-    else {
-        var style = doc.createElementNS ?
-                    doc.createElementNS(XHTML_NS, "style") :
-                    doc.createElement("style");
-
-        style.appendChild(doc.createTextNode(cssText));
-
-        var head = doc.getElementsByTagName("head")[0] || doc.documentElement;
-        head.appendChild(style);
-    }
-};
-
-exports.getInnerWidth = function(element) {
-    return (parseInt(exports.computedStyle(element, "paddingLeft"))
-            + parseInt(exports.computedStyle(element, "paddingRight")) + element.clientWidth);
-};
-
-exports.getInnerHeight = function(element) {
-    return (parseInt(exports.computedStyle(element, "paddingTop"))
-            + parseInt(exports.computedStyle(element, "paddingBottom")) + element.clientHeight);
-};
-
-if (window.pageYOffset !== undefined) {
-    exports.getPageScrollTop = function() {
-        return window.pageYOffset;
-    };
-
-    exports.getPageScrollLeft = function() {
-        return window.pageXOffset;
-    };
-}
-else {
-    exports.getPageScrollTop = function() {
-        return document.body.scrollTop;
-    };
-
-    exports.getPageScrollLeft = function() {
-        return document.body.scrollLeft;
-    };
-}
-
-if (window.getComputedStyle)
-    exports.computedStyle = function(element, style) {
-        if (style)
-            return (window.getComputedStyle(element, "") || {})[style] || "";
-        return window.getComputedStyle(element, "") || {}
-    };
-else
-    exports.computedStyle = function(element, style) {
-        if (style)
-            return element.currentStyle[style];
-        return element.currentStyle
-    };
-
-exports.scrollbarWidth = function() {
-
-    var inner = exports.createElement("p");
-    inner.style.width = "100%";
-    inner.style.minWidth = "0px";
-    inner.style.height = "200px";
-
-    var outer = exports.createElement("div");
-    var style = outer.style;
-
-    style.position = "absolute";
-    style.left = "-10000px";
-    style.overflow = "hidden";
-    style.width = "200px";
-    style.minWidth = "0px";
-    style.height = "150px";
-
-    outer.appendChild(inner);
-
-    var body = document.body || document.documentElement;
-    body.appendChild(outer);
-
-    var noScrollbar = inner.offsetWidth;
-
-    style.overflow = "scroll";
-    var withScrollbar = inner.offsetWidth;
-
-    if (noScrollbar == withScrollbar) {
-        withScrollbar = outer.clientWidth;
-    }
-
-    body.removeChild(outer);
-
-    return noScrollbar-withScrollbar;
-};
-
-/**
- * Optimized set innerHTML. This is faster than plain innerHTML if the element
- * already contains a lot of child elements.
- *
- * See http://blog.stevenlevithan.com/archives/faster-than-innerhtml for details
- */
-exports.setInnerHtml = function(el, innerHtml) {
-    var element = el.cloneNode(false);//document.createElement("div");
-    element.innerHTML = innerHtml;
-    el.parentNode.replaceChild(element, el);
-    return element;
-};
-
-exports.setInnerText = function(el, innerText) {
-    if (document.body && "textContent" in document.body)
-        el.textContent = innerText;
-    else
-        el.innerText = innerText;
-
-};
-
-exports.getInnerText = function(el) {
-    if (document.body && "textContent" in document.body)
-        return el.textContent;
-    else
-         return el.innerText || el.textContent || "";
-};
-
-exports.getParentWindow = function(document) {
-    return document.defaultView || document.parentWindow;
-};
-
-exports.getSelectionStart = function(textarea) {
-    // TODO IE
-    var start;
-    try {
-        start = textarea.selectionStart || 0;
-    } catch (e) {
-        start = 0;
-    }
-    return start;
-};
-
-exports.setSelectionStart = function(textarea, start) {
-    // TODO IE
-    return textarea.selectionStart = start;
-};
-
-exports.getSelectionEnd = function(textarea) {
-    // TODO IE
-    var end;
-    try {
-        end = textarea.selectionEnd || 0;
-    } catch (e) {
-        end = 0;
-    }
-    return end;
-};
-
-exports.setSelectionEnd = function(textarea, end) {
-    // TODO IE
-    return textarea.selectionEnd = end;
-};
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/event', ['require', 'exports', 'module' , 'pilot/keys', 'pilot/useragent', 'pilot/dom'], function(require, exports, module) {
-
-var keys = require("pilot/keys");
-var useragent = require("pilot/useragent");
-var dom = require("pilot/dom");
-
-exports.addListener = function(elem, type, callback) {
-    if (elem.addEventListener) {
-        return elem.addEventListener(type, callback, false);
-    }
-    if (elem.attachEvent) {
-        var wrapper = function() {
-            callback(window.event);
-        };
-        callback._wrapper = wrapper;
-        elem.attachEvent("on" + type, wrapper);
-    }
-};
-
-exports.removeListener = function(elem, type, callback) {
-    if (elem.removeEventListener) {
-        return elem.removeEventListener(type, callback, false);
-    }
-    if (elem.detachEvent) {
-        elem.detachEvent("on" + type, callback._wrapper || callback);
-    }
-};
-
-/**
-* Prevents propagation and clobbers the default action of the passed event
-*/
-exports.stopEvent = function(e) {
-    exports.stopPropagation(e);
-    exports.preventDefault(e);
-    return false;
-};
-
-exports.stopPropagation = function(e) {
-    if (e.stopPropagation)
-        e.stopPropagation();
-    else
-        e.cancelBubble = true;
-};
-
-exports.preventDefault = function(e) {
-    if (e.preventDefault)
-        e.preventDefault();
-    else
-        e.returnValue = false;
-};
-
-exports.getDocumentX = function(e) {
-    if (e.clientX) {        
-        return e.clientX + dom.getPageScrollLeft();
-    } else {
-        return e.pageX;
-    }
-};
-
-exports.getDocumentY = function(e) {
-    if (e.clientY) {
-        return e.clientY + dom.getPageScrollTop();
-    } else {
-        return e.pageY;
-    }
-};
-
-/**
- * @return {Number} 0 for left button, 1 for middle button, 2 for right button
- */
-exports.getButton = function(e) {
-    if (e.type == "dblclick")
-        return 0;
-    else if (e.type == "contextmenu")
-        return 2;
-        
-    // DOM Event
-    if (e.preventDefault) {
-        return e.button;
-    }
-    // old IE
-    else {
-        return {1:0, 2:2, 4:1}[e.button];
-    }
-};
-
-if (document.documentElement.setCapture) {
-    exports.capture = function(el, eventHandler, releaseCaptureHandler) {
-        function onMouseMove(e) {
-            eventHandler(e);
-            return exports.stopPropagation(e);
-        }
-
-        function onReleaseCapture(e) {
-            eventHandler && eventHandler(e);
-            releaseCaptureHandler && releaseCaptureHandler();
-
-            exports.removeListener(el, "mousemove", eventHandler);
-            exports.removeListener(el, "mouseup", onReleaseCapture);
-            exports.removeListener(el, "losecapture", onReleaseCapture);
-
-            el.releaseCapture();
-        }
-
-        exports.addListener(el, "mousemove", eventHandler);
-        exports.addListener(el, "mouseup", onReleaseCapture);
-        exports.addListener(el, "losecapture", onReleaseCapture);
-        el.setCapture();
-    };
-}
-else {
-    exports.capture = function(el, eventHandler, releaseCaptureHandler) {
-        function onMouseMove(e) {
-            eventHandler(e);
-            e.stopPropagation();
-        }
-
-        function onMouseUp(e) {
-            eventHandler && eventHandler(e);
-            releaseCaptureHandler && releaseCaptureHandler();
-
-            document.removeEventListener("mousemove", onMouseMove, true);
-            document.removeEventListener("mouseup", onMouseUp, true);
-
-            e.stopPropagation();
-        }
-
-        document.addEventListener("mousemove", onMouseMove, true);
-        document.addEventListener("mouseup", onMouseUp, true);
-    };
-}
-
-exports.addMouseWheelListener = function(el, callback) {
-    var listener = function(e) {
-        if (e.wheelDelta !== undefined) {
-            if (e.wheelDeltaX !== undefined) {
-                e.wheelX = -e.wheelDeltaX / 8;
-                e.wheelY = -e.wheelDeltaY / 8;
-            } else {
-                e.wheelX = 0;
-                e.wheelY = -e.wheelDelta / 8;
-            }
-        }
-        else {
-            if (e.axis && e.axis == e.HORIZONTAL_AXIS) {
-                e.wheelX = (e.detail || 0) * 5;
-                e.wheelY = 0;
-            } else {
-                e.wheelX = 0;
-                e.wheelY = (e.detail || 0) * 5;
-            }
-        }
-        callback(e);
-    };
-    exports.addListener(el, "DOMMouseScroll", listener);
-    exports.addListener(el, "mousewheel", listener);
-};
-
-exports.addMultiMouseDownListener = function(el, button, count, timeout, callback) {
-    var clicks = 0;
-    var startX, startY;
-
-    var listener = function(e) {
-        clicks += 1;
-        if (clicks == 1) {
-            startX = e.clientX;
-            startY = e.clientY;
-
-            setTimeout(function() {
-                clicks = 0;
-            }, timeout || 600);
-        }
-
-        var isButton = exports.getButton(e) == button;
-        if (!isButton || Math.abs(e.clientX - startX) > 5 || Math.abs(e.clientY - startY) > 5)
-            clicks = 0;
-
-        if (clicks == count) {
-            clicks = 0;
-            callback(e);
-        }
-        
-        if (isButton)
-            return exports.preventDefault(e);
-    };
-
-    exports.addListener(el, "mousedown", listener);
-    useragent.isIE && exports.addListener(el, "dblclick", listener);
-};
-
-function normalizeCommandKeys(callback, e, keyCode) {
-    var hashId = 0;
-    if (useragent.isOpera && useragent.isMac) {
-        hashId = 0 | (e.metaKey ? 1 : 0) | (e.altKey ? 2 : 0)
-            | (e.shiftKey ? 4 : 0) | (e.ctrlKey ? 8 : 0);
-    } else {
-        hashId = 0 | (e.ctrlKey ? 1 : 0) | (e.altKey ? 2 : 0)
-            | (e.shiftKey ? 4 : 0) | (e.metaKey ? 8 : 0);
-    }
-
-    if (keyCode in keys.MODIFIER_KEYS) {
-        switch (keys.MODIFIER_KEYS[keyCode]) {
-            case "Alt":
-                hashId = 2;
-                break;
-            case "Shift":
-                hashId = 4;
-                break
-            case "Ctrl":
-                hashId = 1;
-                break;
-            default:
-                hashId = 8;
-                break;
-        }
-        keyCode = 0;
-    }
-
-    if (hashId & 8 && (keyCode == 91 || keyCode == 93)) {
-        keyCode = 0;
-    }
-
-    // If there is no hashID and the keyCode is not a function key, then
-    // we don't call the callback as we don't handle a command key here
-    // (it's a normal key/character input).
-    if (hashId == 0 && !(keyCode in keys.FUNCTION_KEYS)) {
-        return false;
-    }
-
-    return callback(e, hashId, keyCode);
-}
-
-exports.addCommandKeyListener = function(el, callback) {
-    var addListener = exports.addListener;
-    if (useragent.isOldGecko) {
-        // Old versions of Gecko aka. Firefox < 4.0 didn't repeat the keydown
-        // event if the user pressed the key for a longer time. Instead, the
-        // keydown event was fired once and later on only the keypress event.
-        // To emulate the 'right' keydown behavior, the keyCode of the initial
-        // keyDown event is stored and in the following keypress events the
-        // stores keyCode is used to emulate a keyDown event.
-        var lastKeyDownKeyCode = null;
-        addListener(el, "keydown", function(e) {
-            lastKeyDownKeyCode = e.keyCode;
-        });
-        addListener(el, "keypress", function(e) {
-            return normalizeCommandKeys(callback, e, lastKeyDownKeyCode);
-        });
-    } else {
-        var lastDown = null;
-
-        addListener(el, "keydown", function(e) {
-            lastDown = e.keyIdentifier || e.keyCode;
-            return normalizeCommandKeys(callback, e, e.keyCode);
-        });
-
-        // repeated keys are fired as keypress and not keydown events
-        if (useragent.isMac && useragent.isOpera) {
-            addListener(el, "keypress", function(e) {
-                var keyId = e.keyIdentifier || e.keyCode;
-                if (lastDown !== keyId) {
-                    return normalizeCommandKeys(callback, e, e.keyCode);
-                } else {
-                    lastDown = null;
-                }
-            });
-        }
-    }
-};
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/editor', ['require', 'exports', 'module' , 'pilot/fixoldbrowsers', 'pilot/oop', 'pilot/event', 'pilot/lang', 'pilot/useragent', 'ace/keyboard/textinput', 'ace/mouse_handler', 'ace/keyboard/keybinding', 'ace/edit_session', 'ace/search', 'ace/range', 'pilot/event_emitter'], function(require, exports, module) {
-
-require("pilot/fixoldbrowsers");
-
-var oop = require("pilot/oop");
-var event = require("pilot/event");
-var lang = require("pilot/lang");
-var useragent = require("pilot/useragent");
-var TextInput = require("ace/keyboard/textinput").TextInput;
-var MouseHandler = require("ace/mouse_handler").MouseHandler;
-//var TouchHandler = require("ace/touch_handler").TouchHandler;
-var KeyBinding = require("ace/keyboard/keybinding").KeyBinding;
-var EditSession = require("ace/edit_session").EditSession;
-var Search = require("ace/search").Search;
-var Range = require("ace/range").Range;
-var EventEmitter = require("pilot/event_emitter").EventEmitter;
-
-var Editor =function(renderer, session) {
-    var container = renderer.getContainerElement();
-    this.container = container;
-    this.renderer = renderer;
-
-    this.textInput  = new TextInput(renderer.getTextAreaContainer(), this);
-    this.keyBinding = new KeyBinding(this);
-
-    // TODO detect touch event support
-    if (useragent.isIPad) {
-        //this.$mouseHandler = new TouchHandler(this);
-    } else {
-        this.$mouseHandler = new MouseHandler(this);
-    }
-
-    this.$blockScrolling = 0;
-    this.$search = new Search().set({
-        wrap: true
-    });
-
-    this.setSession(session || new EditSession(""));
-};
-
-(function(){
-
-    oop.implement(this, EventEmitter);
-
-    this.$forwardEvents = {
-        gutterclick: 1,
-        gutterdblclick: 1
-    };
-
-    this.$originalAddEventListener = this.addEventListener;
-    this.$originalRemoveEventListener = this.removeEventListener;
-
-    this.addEventListener = function(eventName, callback) {
-        if (this.$forwardEvents[eventName]) {
-            return this.renderer.addEventListener(eventName, callback);
-        } else {
-            return this.$originalAddEventListener(eventName, callback);
-        }
-    };
-
-    this.removeEventListener = function(eventName, callback) {
-        if (this.$forwardEvents[eventName]) {
-            return this.renderer.removeEventListener(eventName, callback);
-        } else {
-            return this.$originalRemoveEventListener(eventName, callback);
-        }
-    };
-
-    this.setKeyboardHandler = function(keyboardHandler) {
-        this.keyBinding.setKeyboardHandler(keyboardHandler);
-    };
-
-    this.getKeyboardHandler = function() {
-        return this.keyBinding.getKeyboardHandler();
-    };
-
-    this.setSession = function(session) {
-        if (this.session == session)
-            return;
-
-        if (this.session) {
-            var oldSession = this.session;
-            this.session.removeEventListener("change", this.$onDocumentChange);
-            this.session.removeEventListener("changeMode", this.$onChangeMode);
-            this.session.removeEventListener("tokenizerUpdate", this.$onTokenizerUpdate);
-            this.session.removeEventListener("changeTabSize", this.$onChangeTabSize);
-            this.session.removeEventListener("changeWrapLimit", this.$onChangeWrapLimit);
-            this.session.removeEventListener("changeWrapMode", this.$onChangeWrapMode);
-            this.session.removeEventListener("onChangeFold", this.$onChangeFold);
-            this.session.removeEventListener("changeFrontMarker", this.$onChangeFrontMarker);
-            this.session.removeEventListener("changeBackMarker", this.$onChangeBackMarker);
-            this.session.removeEventListener("changeBreakpoint", this.$onChangeBreakpoint);
-            this.session.removeEventListener("changeAnnotation", this.$onChangeAnnotation);
-            this.session.removeEventListener("changeOverwrite", this.$onCursorChange);
-
-            var selection = this.session.getSelection();
-            selection.removeEventListener("changeCursor", this.$onCursorChange);
-            selection.removeEventListener("changeSelection", this.$onSelectionChange);
-
-            this.session.setScrollTopRow(this.renderer.getScrollTopRow());
-        }
-
-        this.session = session;
-
-        this.$onDocumentChange = this.onDocumentChange.bind(this);
-        session.addEventListener("change", this.$onDocumentChange);
-        this.renderer.setSession(session);
-
-        this.$onChangeMode = this.onChangeMode.bind(this);
-        session.addEventListener("changeMode", this.$onChangeMode);
-
-        this.$onTokenizerUpdate = this.onTokenizerUpdate.bind(this);
-        session.addEventListener("tokenizerUpdate", this.$onTokenizerUpdate);
-
-        this.$onChangeTabSize = this.renderer.updateText.bind(this.renderer);
-        session.addEventListener("changeTabSize", this.$onChangeTabSize);
-
-        this.$onChangeWrapLimit = this.onChangeWrapLimit.bind(this);
-        session.addEventListener("changeWrapLimit", this.$onChangeWrapLimit);
-
-        this.$onChangeWrapMode = this.onChangeWrapMode.bind(this);
-        session.addEventListener("changeWrapMode", this.$onChangeWrapMode);
-
-        this.$onChangeFold = this.onChangeFold.bind(this);
-        session.addEventListener("changeFold", this.$onChangeFold);
-
-        this.$onChangeFrontMarker = this.onChangeFrontMarker.bind(this);
-        this.session.addEventListener("changeFrontMarker", this.$onChangeFrontMarker);
-
-        this.$onChangeBackMarker = this.onChangeBackMarker.bind(this);
-        this.session.addEventListener("changeBackMarker", this.$onChangeBackMarker);
-
-        this.$onChangeBreakpoint = this.onChangeBreakpoint.bind(this);
-        this.session.addEventListener("changeBreakpoint", this.$onChangeBreakpoint);
-
-        this.$onChangeAnnotation = this.onChangeAnnotation.bind(this);
-        this.session.addEventListener("changeAnnotation", this.$onChangeAnnotation);
-
-        this.$onCursorChange = this.onCursorChange.bind(this);
-        this.session.addEventListener("changeOverwrite", this.$onCursorChange);
-
-        this.selection = session.getSelection();
-        this.selection.addEventListener("changeCursor", this.$onCursorChange);
-
-        this.$onSelectionChange = this.onSelectionChange.bind(this);
-        this.selection.addEventListener("changeSelection", this.$onSelectionChange);
-
-        this.onChangeMode();
-
-        this.onCursorChange();
-        this.onSelectionChange();
-        this.onChangeFrontMarker();
-        this.onChangeBackMarker();
-        this.onChangeBreakpoint();
-        this.onChangeAnnotation();
-        this.session.getUseWrapMode() && this.renderer.adjustWrapLimit();
-        this.renderer.scrollToRow(session.getScrollTopRow());
-        this.renderer.updateFull();
-
-        this._dispatchEvent("changeSession", {
-            session: session,
-            oldSession: oldSession
-        });
-    };
-
-    this.getSession = function() {
-        return this.session;
-    };
-
-    this.getSelection = function() {
-        return this.selection;
-    };
-
-    this.resize = function() {
-        this.renderer.onResize();
-    };
-
-    this.setTheme = function(theme) {
-        this.renderer.setTheme(theme);
-    };
-
-    this.getTheme = function() {
-        return this.renderer.getTheme();
-    };
-
-    this.setStyle = function(style) {
-        this.renderer.setStyle(style);
-    };
-
-    this.unsetStyle = function(style) {
-        this.renderer.unsetStyle(style);
-    };
-    
-    this.setFontSize = function(size) {
-        this.container.style.fontSize = size;
-    };
-
-    this.$highlightBrackets = function() {
-        if (this.session.$bracketHighlight) {
-            this.session.removeMarker(this.session.$bracketHighlight);
-            this.session.$bracketHighlight = null;
-        }
-
-        if (this.$highlightPending) {
-            return;
-        }
-
-        // perform highlight async to not block the browser during navigation
-        var self = this;
-        this.$highlightPending = true;
-        setTimeout(function() {
-            self.$highlightPending = false;
-
-            var pos = self.session.findMatchingBracket(self.getCursorPosition());
-            if (pos) {
-                var range = new Range(pos.row, pos.column, pos.row, pos.column+1);
-                self.session.$bracketHighlight = self.session.addMarker(range, "ace_bracket", "text");
-            }
-        }, 10);
-    };
-
-    this.focus = function() {
-        // Safari needs the timeout
-        // iOS and Firefox need it called immediately
-        // to be on the save side we do both
-        // except for IE
-        var _self = this;
-        if (!useragent.isIE) {
-            setTimeout(function() {
-                _self.textInput.focus();
-            });
-        }
-        this.textInput.focus();
-    };
-    
-    this.isFocused = function() {
-        return this.textInput.isFocused();
-    };
-
-    this.blur = function() {
-        this.textInput.blur();
-    };
-
-    this.onFocus = function() {
-        this.renderer.showCursor();
-        this.renderer.visualizeFocus();
-        this._dispatchEvent("focus");
-    };
-
-    this.onBlur = function() {
-        this.renderer.hideCursor();
-        this.renderer.visualizeBlur();
-        this._dispatchEvent("blur");
-    };
-
-    this.onDocumentChange = function(e) {
-        var delta = e.data;
-        var range = delta.range;
-
-        if (range.start.row == range.end.row && delta.action != "insertLines" && delta.action != "removeLines")
-            var lastRow = range.end.row;
-        else
-            lastRow = Infinity;
-        this.renderer.updateLines(range.start.row, lastRow);
-
-        // update cursor because tab characters can influence the cursor position
-        this.renderer.updateCursor();
-    };
-
-    this.onTokenizerUpdate = function(e) {
-        var rows = e.data;
-        this.renderer.updateLines(rows.first, rows.last);
-    };
-
-    this.onCursorChange = function(e) {
-        this.renderer.updateCursor();
-
-        if (!this.$blockScrolling) {
-            this.renderer.scrollCursorIntoView();
-        }
-
-        // move text input over the cursor
-        // this is required for iOS and IME
-        this.renderer.moveTextAreaToCursor(this.textInput.getElement());
-
-        this.$highlightBrackets();
-        this.$updateHighlightActiveLine();
-    };
-
-    this.$updateHighlightActiveLine = function() {
-        var session = this.getSession();
-
-        if (session.$highlightLineMarker) {
-            session.removeMarker(session.$highlightLineMarker);
-        }
-        session.$highlightLineMarker = null;
-
-        if (this.getHighlightActiveLine() && (this.getSelectionStyle() != "line" || !this.selection.isMultiLine())) {
-            var cursor = this.getCursorPosition(),
-                foldLine = this.session.getFoldLine(cursor.row);
-            var range;
-            if (foldLine) {
-                range = new Range(foldLine.start.row, 0, foldLine.end.row + 1, 0);
-            } else {
-                range = new Range(cursor.row, 0, cursor.row+1, 0);
-            }
-            session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background");
-        }
-    };
-
-    this.onSelectionChange = function(e) {
-        var session = this.getSession();
-
-        if (session.$selectionMarker) {
-            session.removeMarker(session.$selectionMarker);
-        }
-        session.$selectionMarker = null;
-
-        if (!this.selection.isEmpty()) {
-            var range = this.selection.getRange();
-            var style = this.getSelectionStyle();
-            session.$selectionMarker = session.addMarker(range, "ace_selection", style);
-        } else {
-            this.$updateHighlightActiveLine();
-        }
-
-        if (this.$highlightSelectedWord)
-            this.session.getMode().highlightSelection(this);
-    };
-
-    this.onChangeFrontMarker = function() {
-        this.renderer.updateFrontMarkers();
-    };
-
-    this.onChangeBackMarker = function() {
-        this.renderer.updateBackMarkers();
-    };
-
-    this.onChangeBreakpoint = function() {
-        this.renderer.setBreakpoints(this.session.getBreakpoints());
-    };
-
-    this.onChangeAnnotation = function() {
-        this.renderer.setAnnotations(this.session.getAnnotations());
-    };
-
-    this.onChangeMode = function() {
-        this.renderer.updateText()
-    };
-
-    this.onChangeWrapLimit = function() {
-        this.renderer.updateFull();
-    };
-
-    this.onChangeWrapMode = function() {
-        this.renderer.onResize(true);
-    };
-
-    this.onChangeFold = function() {
-        // Update the active line marker as due to folding changes the current
-        // line range on the screen might have changed.
-        this.$updateHighlightActiveLine();
-        // TODO: This might be too much updating. Okay for now.
-        this.renderer.updateFull();
-    };
-
-    this.getCopyText = function() {
-        if (!this.selection.isEmpty()) {
-            return this.session.getTextRange(this.getSelectionRange());
-        }
-        else {
-            return "";
-        }
-    };
-
-    this.onCut = function() {
-        if (this.$readOnly)
-            return;
-
-        if (!this.selection.isEmpty()) {
-            this.session.remove(this.getSelectionRange())
-            this.clearSelection();
-        }
-    };
-
-    this.insert = function(text) {
-        if (this.$readOnly)
-            return;
-
-        var session = this.session;
-        var mode = session.getMode();
-
-        var cursor = this.getCursorPosition();
-
-        if (this.getBehavioursEnabled()) {
-            // Get a transform if the current mode wants one.
-            var transform = mode.transformAction(session.getState(cursor.row), 'insertion', this, session, text);
-            if (transform)
-                text = transform.text;
-        }
-
-        text = text.replace("\t", this.session.getTabString());
-
-        // remove selected text
-        if (!this.selection.isEmpty()) {
-            var cursor = this.session.remove(this.getSelectionRange());
-            this.clearSelection();
-        }
-        else if (this.session.getOverwrite()) {
-            var range = new Range.fromPoints(cursor, cursor);
-            range.end.column += text.length;
-            this.session.remove(range);
-        }
-
-        this.clearSelection();
-
-        var start = cursor.column;
-        var lineState = session.getState(cursor.row);
-        var shouldOutdent = mode.checkOutdent(lineState, session.getLine(cursor.row), text);
-        var line = session.getLine(cursor.row);
-        var lineIndent = mode.getNextLineIndent(lineState, line.slice(0, cursor.column), session.getTabString());
-        var end = session.insert(cursor, text);
-
-        if (transform && transform.selection) {
-            if (transform.selection.length == 2) { // Transform relative to the current column
-                this.selection.setSelectionRange(
-                    new Range(cursor.row, start + transform.selection[0],
-                              cursor.row, start + transform.selection[1]));
-            } else { // Transform relative to the current row.
-                this.selection.setSelectionRange(
-                    new Range(cursor.row + transform.selection[0],
-                              transform.selection[1],
-                              cursor.row + transform.selection[2],
-                              transform.selection[3]));
-            }
-        }
-
-        var lineState = session.getState(cursor.row);
-
-        // TODO disabled multiline auto indent
-        // possibly doing the indent before inserting the text
-        // if (cursor.row !== end.row) {
-        if (session.getDocument().isNewLine(text)) {
-            this.moveCursorTo(cursor.row+1, 0);
-
-            var size = session.getTabSize();
-            var minIndent = Number.MAX_VALUE;
-
-            for (var row = cursor.row + 1; row <= end.row; ++row) {
-                var indent = 0;
-
-                line = session.getLine(row);
-                for (var i = 0; i < line.length; ++i)
-                    if (line.charAt(i) == '\t')
-                        indent += size;
-                    else if (line.charAt(i) == ' ')
-                        indent += 1;
-                    else
-                        break;
-                if (/[^\s]/.test(line))
-                    minIndent = Math.min(indent, minIndent);
-            }
-
-            for (var row = cursor.row + 1; row <= end.row; ++row) {
-                var outdent = minIndent;
-
-                line = session.getLine(row);
-                for (var i = 0; i < line.length && outdent > 0; ++i)
-                    if (line.charAt(i) == '\t')
-                        outdent -= size;
-                    else if (line.charAt(i) == ' ')
-                        outdent -= 1;
-                session.remove(new Range(row, 0, row, i));
-            }
-            session.indentRows(cursor.row + 1, end.row, lineIndent);
-        } else {
-            if (shouldOutdent) {
-                mode.autoOutdent(lineState, session, cursor.row);
-            }
-        }
-    };
-
-    this.onTextInput = function(text, notPasted) {
-        // In case the text was not pasted and we got only one character, then
-        // handel it as a command key stroke.
-        if (notPasted && text.length == 1) {
-            // Note: The `null` as `keyCode` is important here, as there are
-            // some checks in the code for `keyCode == 0` meaning the text comes
-            // from the keyBinding.onTextInput code path.
-            var handled = this.keyBinding.onCommandKey({}, 0, null, text);
-
-            // Check if the text was handled. If not, then handled it as "normal"
-            // text and insert it to the editor directly. This shouldn't be done
-            // using the this.keyBinding.onTextInput(text) function, as it would
-            // make the `text` get sent to the keyboardHandler twice, which might
-            // turn out to be a bad thing in case there is a custome keyboard
-            // handler like the StateHandler.
-            if (!handled) {
-                this.insert(text);
-            }
-        } else {
-            this.keyBinding.onTextInput(text);
-        }
-    };
-
-    this.onCommandKey = function(e, hashId, keyCode) {
-        this.keyBinding.onCommandKey(e, hashId, keyCode);
-    };
-
-    this.setOverwrite = function(overwrite) {
-        this.session.setOverwrite(overwrite);
-    };
-
-    this.getOverwrite = function() {
-        return this.session.getOverwrite();
-    };
-
-    this.toggleOverwrite = function() {
-        this.session.toggleOverwrite();
-    };
-
-    this.setScrollSpeed = function(speed) {
-        this.$mouseHandler.setScrollSpeed(speed);
-    };
-
-    this.getScrollSpeed = function() {
-        return this.$mouseHandler.getScrollSpeed()
-    };
-
-    this.$selectionStyle = "line";
-    this.setSelectionStyle = function(style) {
-        if (this.$selectionStyle == style) return;
-
-        this.$selectionStyle = style;
-        this.onSelectionChange();
-        this._dispatchEvent("changeSelectionStyle", {data: style});
-    };
-
-    this.getSelectionStyle = function() {
-        return this.$selectionStyle;
-    };
-
-    this.$highlightActiveLine = true;
-    this.setHighlightActiveLine = function(shouldHighlight) {
-        if (this.$highlightActiveLine == shouldHighlight) return;
-
-        this.$highlightActiveLine = shouldHighlight;
-        this.$updateHighlightActiveLine();
-    };
-
-    this.getHighlightActiveLine = function() {
-        return this.$highlightActiveLine;
-    };
-
-    this.$highlightSelectedWord = true;
-    this.setHighlightSelectedWord = function(shouldHighlight) {
-        if (this.$highlightSelectedWord == shouldHighlight)
-            return;
-
-        this.$highlightSelectedWord = shouldHighlight;
-        if (shouldHighlight)
-            this.session.getMode().highlightSelection(this);
-        else
-            this.session.getMode().clearSelectionHighlight(this);
-    };
-
-    this.getHighlightSelectedWord = function() {
-        return this.$highlightSelectedWord;
-    };
-
-    this.setShowInvisibles = function(showInvisibles) {
-        if (this.getShowInvisibles() == showInvisibles)
-            return;
-
-        this.renderer.setShowInvisibles(showInvisibles);
-    };
-
-    this.getShowInvisibles = function() {
-        return this.renderer.getShowInvisibles();
-    };
-
-    this.setShowPrintMargin = function(showPrintMargin) {
-        this.renderer.setShowPrintMargin(showPrintMargin);
-    };
-
-    this.getShowPrintMargin = function() {
-        return this.renderer.getShowPrintMargin();
-    };
-
-    this.setPrintMarginColumn = function(showPrintMargin) {
-        this.renderer.setPrintMarginColumn(showPrintMargin);
-    };
-
-    this.getPrintMarginColumn = function() {
-        return this.renderer.getPrintMarginColumn();
-    };
-
-    this.$readOnly = false;
-    this.setReadOnly = function(readOnly) {
-        this.$readOnly = readOnly;
-    };
-
-    this.getReadOnly = function() {
-        return this.$readOnly;
-    };
-
-    this.$modeBehaviours = true;
-    this.setBehavioursEnabled = function (enabled) {
-        this.$modeBehaviours = enabled;
-    }
-
-    this.getBehavioursEnabled = function () {
-        return this.$modeBehaviours;
-    }
-
-    this.removeRight = function() {
-        if (this.$readOnly)
-            return;
-
-        if (this.selection.isEmpty()) {
-            this.selection.selectRight();
-        }
-        this.session.remove(this.getSelectionRange())
-        this.clearSelection();
-    };
-
-    this.removeLeft = function() {
-        if (this.$readOnly)
-            return;
-
-        if (this.selection.isEmpty())
-            this.selection.selectLeft();
-
-        var range = this.getSelectionRange();
-        if (this.getBehavioursEnabled()) {
-            var session = this.session;
-            var state = session.getState(range.start.row);
-            var new_range = session.getMode().transformAction(state, 'deletion', this, session, range);
-            if (new_range !== false) {
-                range = new_range;
-            }
-        }
-
-        this.session.remove(range);
-        this.clearSelection();
-    };
-
-    this.removeWordRight = function() {
-        if (this.$readOnly)
-            return;
-
-        if (this.selection.isEmpty())
-            this.selection.selectWordRight();
-
-        this.session.remove(this.getSelectionRange());
-        this.clearSelection();
-    };
-
-    this.removeWordLeft = function() {
-        if (this.$readOnly)
-            return;
-
-        if (this.selection.isEmpty())
-            this.selection.selectWordLeft();
-
-        this.session.remove(this.getSelectionRange());
-        this.clearSelection();
-    };
-
-    this.removeToLineStart = function() {
-        if (this.$readOnly)
-            return;
-
-        if (this.selection.isEmpty())
-            this.selection.selectLineStart();
-
-        this.session.remove(this.getSelectionRange());
-        this.clearSelection();
-    };
-
-    this.removeToLineEnd = function() {
-        if (this.$readOnly)
-            return;
-
-        if (this.selection.isEmpty())
-            this.selection.selectLineEnd();
-
-        var range = this.getSelectionRange();
-        if (range.start.column == range.end.column && range.start.row == range.end.row) {
-            range.end.column = 0;
-            range.end.row++;
-        }
-
-        this.session.remove(range);
-        this.clearSelection();
-    };
-
-    this.splitLine = function() {
-        if (this.$readOnly)
-            return;
-
-        if (!this.selection.isEmpty()) {
-            this.session.remove(this.getSelectionRange());
-            this.clearSelection();
-        }
-
-        var cursor = this.getCursorPosition();
-        this.insert("\n");
-        this.moveCursorToPosition(cursor);
-    };
-
-    this.transposeLetters = function() {
-        if (this.$readOnly)
-            return;
-
-        if (!this.selection.isEmpty()) {
-            return;
-        }
-
-        var cursor = this.getCursorPosition();
-        var column = cursor.column;
-        if (column == 0)
-            return;
-
-        var line = this.session.getLine(cursor.row);
-        if (column < line.length) {
-            var swap = line.charAt(column) + line.charAt(column-1);
-            var range = new Range(cursor.row, column-1, cursor.row, column+1)
-        }
-        else {
-            var swap = line.charAt(column-1) + line.charAt(column-2);
-            var range = new Range(cursor.row, column-2, cursor.row, column)
-        }
-        this.session.replace(range, swap);
-    };
-
-    this.indent = function() {
-        if (this.$readOnly)
-            return;
-
-        var session = this.session;
-        var range = this.getSelectionRange();
-
-        if (range.start.row < range.end.row || range.start.column < range.end.column) {
-            var rows = this.$getSelectedRows();
-            session.indentRows(rows.first, rows.last, "\t");
-        } else {
-            var indentString;
-
-            if (this.session.getUseSoftTabs()) {
-                var size        = session.getTabSize(),
-                    position    = this.getCursorPosition(),
-                    column      = session.documentToScreenColumn(position.row, position.column),
-                    count       = (size - column % size);
-
-                indentString = lang.stringRepeat(" ", count);
-            } else
-                indentString = "\t";
-            return this.onTextInput(indentString);
-        }
-    };
-
-    this.blockOutdent = function() {
-        if (this.$readOnly)
-            return;
-
-        var selection = this.session.getSelection();
-        this.session.outdentRows(selection.getRange());
-    };
-
-    this.toggleCommentLines = function() {
-        if (this.$readOnly)
-            return;
-
-        var state = this.session.getState(this.getCursorPosition().row);
-        var rows = this.$getSelectedRows()
-        this.session.getMode().toggleCommentLines(state, this.session, rows.first, rows.last);
-    };
-
-    this.removeLines = function() {
-        if (this.$readOnly)
-            return;
-
-        var rows = this.$getSelectedRows();
-        if (rows.last == 0 || rows.last+1 < this.session.getLength())
-            var range = new Range(rows.first, 0, rows.last+1, 0)
-        else
-            var range = new Range(
-                rows.first-1, this.session.getLine(rows.first).length,
-                rows.last, this.session.getLine(rows.last).length
-            );
-        this.session.remove(range);
-        this.clearSelection();
-    };
-
-    this.moveLinesDown = function() {
-        if (this.$readOnly)
-            return;
-
-        this.$moveLines(function(firstRow, lastRow) {
-            return this.session.moveLinesDown(firstRow, lastRow);
-        });
-    };
-
-    this.moveLinesUp = function() {
-        if (this.$readOnly)
-            return;
-
-        this.$moveLines(function(firstRow, lastRow) {
-            return this.session.moveLinesUp(firstRow, lastRow);
-        });
-    };
-
-    this.moveText = function(range, toPosition) {
-        if (this.$readOnly)
-            return null;
-
-        return this.session.moveText(range, toPosition);
-    };
-
-    this.copyLinesUp = function() {
-        if (this.$readOnly)
-            return;
-
-        this.$moveLines(function(firstRow, lastRow) {
-            this.session.duplicateLines(firstRow, lastRow);
-            return 0;
-        });
-    };
-
-    this.copyLinesDown = function() {
-        if (this.$readOnly)
-            return;
-
-        this.$moveLines(function(firstRow, lastRow) {
-            return this.session.duplicateLines(firstRow, lastRow);
-        });
-    };
-
-
-    this.$moveLines = function(mover) {
-        var rows = this.$getSelectedRows();
-
-        var linesMoved = mover.call(this, rows.first, rows.last);
-
-        var selection = this.selection;
-        selection.setSelectionAnchor(rows.last+linesMoved+1, 0);
-        selection.$moveSelection(function() {
-            selection.moveCursorTo(rows.first+linesMoved, 0);
-        });
-    };
-
-    this.$getSelectedRows = function() {
-        var range = this.getSelectionRange().collapseRows();
-
-        return {
-            first: range.start.row,
-            last: range.end.row
-        };
-    };
-
-    this.onCompositionStart = function(text) {
-        this.renderer.showComposition(this.getCursorPosition());
-    };
-
-    this.onCompositionUpdate = function(text) {
-        this.renderer.setCompositionText(text);
-    };
-
-    this.onCompositionEnd = function() {
-        this.renderer.hideComposition();
-    };
-
-
-    this.getFirstVisibleRow = function() {
-        return this.renderer.getFirstVisibleRow();
-    };
-
-    this.getLastVisibleRow = function() {
-        return this.renderer.getLastVisibleRow();
-    };
-
-    this.isRowVisible = function(row) {
-        return (row >= this.getFirstVisibleRow() && row <= this.getLastVisibleRow());
-    };
-
-    this.$getVisibleRowCount = function() {
-        return this.renderer.getScrollBottomRow() - this.renderer.getScrollTopRow() + 1;
-    };
-
-    this.$getPageDownRow = function() {
-        return this.renderer.getScrollBottomRow();
-    };
-
-    this.$getPageUpRow = function() {
-        var firstRow = this.renderer.getScrollTopRow();
-        var lastRow = this.renderer.getScrollBottomRow();
-
-        return firstRow - (lastRow - firstRow);
-    };
-
-    this.selectPageDown = function() {
-        var row = this.$getPageDownRow() + Math.floor(this.$getVisibleRowCount() / 2);
-
-        this.scrollPageDown();
-
-        var selection = this.getSelection();
-        var leadScreenPos = this.session.documentToScreenPosition(selection.getSelectionLead());
-        var dest = this.session.screenToDocumentPosition(row, leadScreenPos.column);
-        selection.selectTo(dest.row, dest.column);
-    };
-
-    this.selectPageUp = function() {
-        var visibleRows = this.renderer.getScrollTopRow() - this.renderer.getScrollBottomRow();
-        var row = this.$getPageUpRow() + Math.round(visibleRows / 2);
-
-        this.scrollPageUp();
-
-        var selection = this.getSelection();
-        var leadScreenPos = this.session.documentToScreenPosition(selection.getSelectionLead());
-        var dest = this.session.screenToDocumentPosition(row, leadScreenPos.column);
-        selection.selectTo(dest.row, dest.column);
-    };
-
-    this.gotoPageDown = function() {
-        var row = this.$getPageDownRow();
-        var column = this.getCursorPositionScreen().column;
-
-        this.scrollToRow(row);
-        this.getSelection().moveCursorToScreen(row, column);
-    };
-
-    this.gotoPageUp = function() {
-        var row = this.$getPageUpRow();
-        var column = this.getCursorPositionScreen().column;
-
-       this.scrollToRow(row);
-       this.getSelection().moveCursorToScreen(row, column);
-    };
-
-    this.scrollPageDown = function() {
-        this.scrollToRow(this.$getPageDownRow());
-    };
-
-    this.scrollPageUp = function() {
-        this.renderer.scrollToRow(this.$getPageUpRow());
-    };
-
-    this.scrollToRow = function(row) {
-        this.renderer.scrollToRow(row);
-    };
-
-    this.scrollToLine = function(line, center) {
-        this.renderer.scrollToLine(line, center);
-    };
-
-    this.centerSelection = function() {
-        var range = this.getSelectionRange();
-        var line = Math.floor(range.start.row + (range.end.row - range.start.row) / 2);
-        this.renderer.scrollToLine(line, true);
-    };
-
-    this.getCursorPosition = function() {
-        return this.selection.getCursor();
-    };
-
-    this.getCursorPositionScreen = function() {
-        return this.session.documentToScreenPosition(this.getCursorPosition());
-    };
-
-    this.getSelectionRange = function() {
-        return this.selection.getRange();
-    };
-
-
-    this.selectAll = function() {
-        this.$blockScrolling += 1;
-        this.selection.selectAll();
-        this.$blockScrolling -= 1;
-    };
-
-    this.clearSelection = function() {
-        this.selection.clearSelection();
-    };
-
-    this.moveCursorTo = function(row, column) {
-        this.selection.moveCursorTo(row, column);
-    };
-
-    this.moveCursorToPosition = function(pos) {
-        this.selection.moveCursorToPosition(pos);
-    };
-
-
-    this.gotoLine = function(lineNumber, column) {
-        this.selection.clearSelection();
-
-        this.$blockScrolling += 1;
-        this.moveCursorTo(lineNumber-1, column || 0);
-        this.$blockScrolling -= 1;
-
-        if (!this.isRowVisible(this.getCursorPosition().row)) {
-            this.scrollToLine(lineNumber, true);
-        }
-    },
-
-    this.navigateTo = function(row, column) {
-        this.clearSelection();
-        this.moveCursorTo(row, column);
-    };
-
-    this.navigateUp = function(times) {
-        this.selection.clearSelection();
-        times = times || 1;
-        this.selection.moveCursorBy(-times, 0);
-    };
-
-    this.navigateDown = function(times) {
-        this.selection.clearSelection();
-        times = times || 1;
-        this.selection.moveCursorBy(times, 0);
-    };
-
-    this.navigateLeft = function(times) {
-        if (!this.selection.isEmpty()) {
-            var selectionStart = this.getSelectionRange().start;
-            this.moveCursorToPosition(selectionStart);
-        }
-        else {
-            times = times || 1;
-            while (times--) {
-                this.selection.moveCursorLeft();
-            }
-        }
-        this.clearSelection();
-    };
-
-    this.navigateRight = function(times) {
-        if (!this.selection.isEmpty()) {
-            var selectionEnd = this.getSelectionRange().end;
-            this.moveCursorToPosition(selectionEnd);
-        }
-        else {
-            times = times || 1;
-            while (times--) {
-                this.selection.moveCursorRight();
-            }
-        }
-        this.clearSelection();
-    };
-
-    this.navigateLineStart = function() {
-        this.selection.moveCursorLineStart();
-        this.clearSelection();
-    };
-
-    this.navigateLineEnd = function() {
-        this.selection.moveCursorLineEnd();
-        this.clearSelection();
-    };
-
-    this.navigateFileEnd = function() {
-        this.selection.moveCursorFileEnd();
-        this.clearSelection();
-    };
-
-    this.navigateFileStart = function() {
-        this.selection.moveCursorFileStart();
-        this.clearSelection();
-    };
-
-    this.navigateWordRight = function() {
-        this.selection.moveCursorWordRight();
-        this.clearSelection();
-    };
-
-    this.navigateWordLeft = function() {
-        this.selection.moveCursorWordLeft();
-        this.clearSelection();
-    };
-
-    this.replace = function(replacement, options) {
-        if (options)
-            this.$search.set(options);
-
-        var range = this.$search.find(this.session);
-        if (!range)
-            return;
-
-        this.$tryReplace(range, replacement);
-        if (range !== null)
-            this.selection.setSelectionRange(range);
-    },
-
-    this.replaceAll = function(replacement, options) {
-        if (options) {
-            this.$search.set(options);
-        }
-
-        var ranges = this.$search.findAll(this.session);
-        if (!ranges.length)
-            return;
-
-        var selection = this.getSelectionRange();
-        this.clearSelection();
-        this.selection.moveCursorTo(0, 0);
-
-        this.$blockScrolling += 1;
-        for (var i = ranges.length - 1; i >= 0; --i)
-            this.$tryReplace(ranges[i], replacement);
-
-        this.selection.setSelectionRange(selection);
-        this.$blockScrolling -= 1;
-    },
-
-    this.$tryReplace = function(range, replacement) {
-        var input = this.session.getTextRange(range);
-        var replacement = this.$search.replace(input, replacement);
-        if (replacement !== null) {
-            range.end = this.session.replace(range, replacement);
-            return range;
-        } else {
-            return null;
-        }
-    };
-
-    this.getLastSearchOptions = function() {
-        return this.$search.getOptions();
-    };
-
-    this.find = function(needle, options) {
-        this.clearSelection();
-        options = options || {};
-        options.needle = needle;
-        this.$search.set(options);
-        this.$find();
-    },
-
-    this.findNext = function(options) {
-        options = options || {};
-        if (typeof options.backwards == "undefined")
-            options.backwards = false;
-        this.$search.set(options);
-        this.$find();
-    };
-
-    this.findPrevious = function(options) {
-        options = options || {};
-        if (typeof options.backwards == "undefined")
-            options.backwards = true;
-        this.$search.set(options);
-        this.$find();
-    };
-
-    this.$find = function(backwards) {
-        if (!this.selection.isEmpty()) {
-            this.$search.set({needle: this.session.getTextRange(this.getSelectionRange())});
-        }
-
-        if (typeof backwards != "undefined")
-            this.$search.set({backwards: backwards});
-
-        var range = this.$search.find(this.session);
-        if (range) {
-            this.gotoLine(range.end.row+1, range.end.column);
-            this.selection.setSelectionRange(range);
-        }
-    };
-
-    this.undo = function() {
-        this.session.getUndoManager().undo();
-    };
-
-    this.redo = function() {
-        this.session.getUndoManager().redo();
-    };
-
-    this.destroy = function() {
-        this.renderer.destroy();
-    }
-
-}).call(Editor.prototype);
-
-
-exports.Editor = Editor;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/keyboard/textinput', ['require', 'exports', 'module' , 'pilot/event', 'pilot/useragent', 'pilot/dom'], function(require, exports, module) {
-
-var event = require("pilot/event");
-var useragent = require("pilot/useragent");
-var dom = require("pilot/dom");
-
-var TextInput = function(parentNode, host) {
-
-    var text = dom.createElement("textarea");
-    text.style.left = "-10000px";
-    parentNode.appendChild(text);
-
-    var PLACEHOLDER = String.fromCharCode(0);
-    sendText();
-
-    var inCompostion = false;
-    var copied = false;
-    var pasted = false;
-    var tempStyle = '';
-
-    function sendText(valueToSend) {
-        if (!copied) {
-            var value = valueToSend || text.value;
-            if (value) {
-                if (value.charCodeAt(value.length-1) == PLACEHOLDER.charCodeAt(0)) {
-                    value = value.slice(0, -1);
-                    if (value)
-                        host.onTextInput(value, !pasted);
-                }
-                else {
-                    host.onTextInput(value, !pasted);
-                }
-
-                // If editor is no longer focused we quit immediately, since
-                // it means that something else is in charge now.
-                if (!isFocused())
-                    return false;
-            }
-        }
-
-        copied = false;
-        pasted = false;
-
-        // Safari doesn't fire copy events if no text is selected
-        text.value = PLACEHOLDER;
-        text.select();
-    }
-
-    var onTextInput = function(e) {
-        setTimeout(function () {
-            if (!inCompostion)
-                sendText(e.data);                
-        }, 0);
-    };
-    
-    var onKeyPress = function(e) {
-        if (useragent.isIE && text.value.charCodeAt(0) > 128) return;
-        setTimeout(function() {
-            if (!inCompostion)
-                sendText();
-        }, 0);
-    };
-
-    var onCompositionStart = function(e) {
-        inCompostion = true;
-        host.onCompositionStart();
-        if (!useragent.isGecko) setTimeout(onCompositionUpdate, 0);
-    };
-
-    var onCompositionUpdate = function() {
-        if (!inCompostion) return;
-        host.onCompositionUpdate(text.value);
-    };
-
-    var onCompositionEnd = function(e) {
-        inCompostion = false;
-        host.onCompositionEnd();
-    };
-
-    var onCopy = function(e) {
-        copied = true;
-        var copyText = host.getCopyText();
-        if(copyText)
-            text.value = copyText;
-        else
-            e.preventDefault();
-        text.select();
-        setTimeout(function () {
-            sendText();
-        }, 0);
-    };
-
-    var onCut = function(e) {
-        copied = true;
-        var copyText = host.getCopyText();
-        if(copyText) {
-            text.value = copyText;
-            host.onCut();
-        } else
-            e.preventDefault();
-        text.select();
-        setTimeout(function () {
-            sendText();
-        }, 0);
-    };
-
-    event.addCommandKeyListener(text, host.onCommandKey.bind(host));
-    if (useragent.isIE) {
-        var keytable = { 13:1, 27:1 };
-        event.addListener(text, "keyup", function (e) {
-            if (inCompostion && (!text.value || keytable[e.keyCode]))
-                setTimeout(onCompositionEnd, 0);
-            if ((text.value.charCodeAt(0)|0) < 129) {
-                return;
-            };
-            inCompostion ? onCompositionUpdate() : onCompositionStart();
-        });
-    };
-
-    if (text.attachEvent) {
-        // Old IE + Opera
-        event.addListener(text, "propertychange", onKeyPress);
-    }
-    else {
-        if (useragent.isChrome || useragent.isSafari)
-            event.addListener(text, "textInput", onTextInput);
-        else if (useragent.isIE)
-            // IE9
-            event.addListener(text, "textinput", onTextInput);
-        else
-            // All browsers except old IE
-            event.addListener(text, "input", onTextInput);
-    }
-    
-    
-    event.addListener(text, "paste", function(e) {
-        // Mark that the next input text comes from past.
-        pasted = true;
-        // Some browsers support the event.clipboardData API. Use this to get
-        // the pasted content which increases speed if pasting a lot of lines.
-        if (e.clipboardData && e.clipboardData.getData) {
-            sendText(e.clipboardData.getData("text/plain"));
-            e.preventDefault();
-        } 
-        else {
-            // If a browser doesn't support any of the things above, use the regular
-            // method to detect the pasted input.
-            onKeyPress();
-        }
-    });
-
-    if (useragent.isIE) {
-        event.addListener(text, "beforecopy", function(e) {
-            var copyText = host.getCopyText();
-            if(copyText)
-                clipboardData.setData("Text", copyText);
-            else
-                e.preventDefault();
-        });
-        event.addListener(parentNode, "keydown", function(e) {
-            if (e.ctrlKey && e.keyCode == 88) {
-                var copyText = host.getCopyText();
-                if (copyText) {
-                    clipboardData.setData("Text", copyText);
-                    host.onCut();
-                }
-                event.preventDefault(e)
-            }
-        });
-    }
-    else {
-        event.addListener(text, "copy", onCopy);
-        event.addListener(text, "cut", onCut);
-    }
-
-    event.addListener(text, "compositionstart", onCompositionStart);
-    if (useragent.isGecko) {
-        event.addListener(text, "text", onCompositionUpdate);
-    };
-    if (useragent.isWebKit) {
-        event.addListener(text, "keyup", onCompositionUpdate);
-    };
-    event.addListener(text, "compositionend", onCompositionEnd);
-
-    event.addListener(text, "blur", function() {
-        host.onBlur();
-    });
-
-    event.addListener(text, "focus", function() {
-        host.onFocus();
-        text.select();
-    });
-
-    this.focus = function() {
-        host.onFocus();
-        text.select();
-        text.focus();
-    };
-
-    this.blur = function() {
-        text.blur();
-    };
-
-    function isFocused() {
-        return document.activeElement === text;
-    };
-    this.isFocused = isFocused;
-
-    this.getElement = function() {
-        return text;
-    };
-
-    this.onContextMenu = function(mousePos, isEmpty){
-        if (mousePos) {
-            if(!tempStyle)
-                tempStyle = text.style.cssText;
-            text.style.cssText = 'position:fixed; z-index:1000;' +
-                    'left:' + (mousePos.x - 2) + 'px; top:' + (mousePos.y - 2) + 'px;'
-
-        }
-        if (isEmpty)
-            text.value='';
-    }
-
-    this.onContextMenuClose = function(){
-        setTimeout(function () {
-            if (tempStyle) {
-                text.style.cssText = tempStyle;
-                tempStyle = '';
-            }
-            sendText();
-        }, 0);
-    }
-};
-
-exports.TextInput = TextInput;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mouse_handler', ['require', 'exports', 'module' , 'pilot/event', 'pilot/dom', 'pilot/browser_focus'], function(require, exports, module) {
-
-var event = require("pilot/event");
-var dom = require("pilot/dom");
-var BrowserFocus = require("pilot/browser_focus").BrowserFocus;
-
-var STATE_UNKNOWN = 0;
-var STATE_SELECT = 1;
-var STATE_DRAG = 2;
-
-var DRAG_TIMER = 250; // milliseconds
-var DRAG_OFFSET = 5; // pixels
-
-var MouseHandler = function(editor) {
-    this.editor = editor;
-    
-    this.browserFocus = new BrowserFocus();
-    event.addListener(editor.container, "mousedown", function(e) {
-        editor.focus();
-        return event.preventDefault(e);
-    });
-    event.addListener(editor.container, "selectstart", function(e) {
-        return event.preventDefault(e);
-    });
-
-    var mouseTarget = editor.renderer.getMouseEventTarget();
-    event.addListener(mouseTarget, "mousedown", this.onMouseDown.bind(this));
-    event.addMultiMouseDownListener(mouseTarget, 0, 2, 500, this.onMouseDoubleClick.bind(this));
-    event.addMultiMouseDownListener(mouseTarget, 0, 3, 600, this.onMouseTripleClick.bind(this));
-    event.addMultiMouseDownListener(mouseTarget, 0, 4, 600, this.onMouseQuadClick.bind(this));
-    event.addMouseWheelListener(mouseTarget, this.onMouseWheel.bind(this));
-};
-
-(function() {
-
-    this.$scrollSpeed = 1;
-    this.setScrollSpeed = function(speed) {
-        this.$scrollSpeed = speed;
-    };
-
-    this.getScrollSpeed = function() {
-        return this.$scrollSpeed;
-    };
-
-    this.$getEventPosition = function(e) {
-        var pageX = event.getDocumentX(e);
-        var pageY = event.getDocumentY(e);
-        var pos = this.editor.renderer.screenToTextCoordinates(pageX, pageY);
-        pos.row = Math.max(0, Math.min(pos.row, this.editor.session.getLength()-1));
-        return pos;
-    };
-
-    this.$distance = function(ax, ay, bx, by) {
-        return Math.sqrt(Math.pow(bx - ax, 2) + Math.pow(by - ay, 2));
-    };
-
-    this.onMouseDown = function(e) {
-        // if this click caused the editor to be focused ignore the click
-        // for selection and cursor placement
-        if (
-            !this.browserFocus.isFocused()
-            || new Date().getTime() - this.browserFocus.lastFocus < 20
-            || !this.editor.isFocused()
-        )
-            return;
-        
-        var pageX = event.getDocumentX(e);
-        var pageY = event.getDocumentY(e);
-        var pos = this.$getEventPosition(e);
-        var editor = this.editor;
-        var self = this;
-        var selectionRange = editor.getSelectionRange();
-        var selectionEmpty = selectionRange.isEmpty();
-        var state = STATE_UNKNOWN;
-        var inSelection = false;
-
-        var button = event.getButton(e);
-        if (button !== 0) {
-            if (selectionEmpty) {
-                editor.moveCursorToPosition(pos);
-            }
-            if(button == 2) {
-                editor.textInput.onContextMenu({x: pageX, y: pageY}, selectionEmpty);
-                event.capture(editor.container, function(){}, editor.textInput.onContextMenuClose);
-            }
-            return;
-        } else {
-            // Select the fold as the user clicks it.
-            var fold = editor.session.getFoldAt(pos.row, pos.column, 1);
-            if (fold) {
-                editor.selection.setSelectionRange(fold.range);
-                return;
-            }
-
-            inSelection = !editor.getReadOnly()
-                && !selectionEmpty
-                && selectionRange.contains(pos.row, pos.column);
-        }
-
-        if (!inSelection) {
-            // Directly pick STATE_SELECT, since the user is not clicking inside
-            // a selection.
-            onStartSelect(pos);
-        }
-
-        var mousePageX, mousePageY;
-        var overwrite = editor.getOverwrite();
-        var mousedownTime = (new Date()).getTime();
-        var dragCursor, dragRange;
-
-        var onMouseSelection = function(e) {
-            mousePageX = event.getDocumentX(e);
-            mousePageY = event.getDocumentY(e);
-        };
-
-        var onMouseSelectionEnd = function() {
-            clearInterval(timerId);
-            if (state == STATE_UNKNOWN)
-                onStartSelect(pos);
-            else if (state == STATE_DRAG)
-                onMouseDragSelectionEnd();
-
-            self.$clickSelection = null;
-            state = STATE_UNKNOWN;
-        };
-
-        var onMouseDragSelectionEnd = function() {
-            dom.removeCssClass(editor.container, "ace_dragging");
-            editor.session.removeMarker(dragSelectionMarker);
-
-            if (!self.$clickSelection) {
-                if (!dragCursor) {
-                    editor.moveCursorToPosition(pos);
-                    editor.selection.clearSelection(pos.row, pos.column);
-                }
-            }
-
-            if (!dragCursor)
-                return;
-
-            if (dragRange.contains(dragCursor.row, dragCursor.column)) {
-                dragCursor = null;
-                return;
-            }
-
-            editor.clearSelection();
-            var newRange = editor.moveText(dragRange, dragCursor);
-            if (!newRange) {
-                dragCursor = null;
-                return;
-            }
-
-            editor.selection.setSelectionRange(newRange);
-        };
-
-        var onSelectionInterval = function() {
-            if (mousePageX === undefined || mousePageY === undefined)
-                return;
-
-            if (state == STATE_UNKNOWN) {
-                var distance = self.$distance(pageX, pageY, mousePageX, mousePageY);
-                var time = (new Date()).getTime();
-
-
-                if (distance > DRAG_OFFSET) {
-                    state = STATE_SELECT;
-                    var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
-                    cursor.row = Math.max(0, Math.min(cursor.row, editor.session.getLength()-1));
-                    onStartSelect(cursor);
-                } else if ((time - mousedownTime) > DRAG_TIMER) {
-                    state = STATE_DRAG;
-                    dragRange = editor.getSelectionRange();
-                    var style = editor.getSelectionStyle();
-                    dragSelectionMarker = editor.session.addMarker(dragRange, "ace_selection", style);
-                    editor.clearSelection();
-                    dom.addCssClass(editor.container, "ace_dragging");
-                }
-
-            }
-
-            if (state == STATE_DRAG)
-                onDragSelectionInterval();
-            else if (state == STATE_SELECT)
-                onUpdateSelectionInterval();
-        };
-
-        function onStartSelect(pos) {
-            if (e.shiftKey)
-                editor.selection.selectToPosition(pos)
-            else {
-                if (!self.$clickSelection) {
-                    editor.moveCursorToPosition(pos);
-                    editor.selection.clearSelection(pos.row, pos.column);
-                }
-            }
-            state = STATE_SELECT;
-        }
-
-        var onUpdateSelectionInterval = function() {
-            var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
-            cursor.row = Math.max(0, Math.min(cursor.row, editor.session.getLength()-1));
-
-            if (self.$clickSelection) {
-                if (self.$clickSelection.contains(cursor.row, cursor.column)) {
-                    editor.selection.setSelectionRange(self.$clickSelection);
-                } else {
-                    if (self.$clickSelection.compare(cursor.row, cursor.column) == -1) {
-                        var anchor = self.$clickSelection.end;
-                    } else {
-                        var anchor = self.$clickSelection.start;
-                    }
-                    editor.selection.setSelectionAnchor(anchor.row, anchor.column);
-                    editor.selection.selectToPosition(cursor);
-                }
-            }
-            else {
-                editor.selection.selectToPosition(cursor);
-            }
-
-            editor.renderer.scrollCursorIntoView();
-        };
-
-        var onDragSelectionInterval = function() {
-            dragCursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
-            dragCursor.row = Math.max(0, Math.min(dragCursor.row,
-                                                  editor.session.getLength() - 1));
-
-            editor.moveCursorToPosition(dragCursor);
-        };
-
-        event.capture(editor.container, onMouseSelection, onMouseSelectionEnd);
-        var timerId = setInterval(onSelectionInterval, 20);
-
-        return event.preventDefault(e);
-    };
-
-    this.onMouseDoubleClick = function(e) {
-        var editor = this.editor;
-        var pos = this.$getEventPosition(e);
-
-        // If the user dclicked on a fold, then expand it.
-        var fold = editor.session.getFoldAt(pos.row, pos.column, 1);
-        if (fold) {
-            editor.session.expandFold(fold);
-        } else {
-            editor.moveCursorToPosition(pos);
-            editor.selection.selectWord();
-            this.$clickSelection = editor.getSelectionRange();
-        }
-    };
-
-    this.onMouseTripleClick = function(e) {
-        var pos = this.$getEventPosition(e);
-        this.editor.moveCursorToPosition(pos);
-        this.editor.selection.selectLine();
-        this.$clickSelection = this.editor.getSelectionRange();
-    };
-
-    this.onMouseQuadClick = function(e) {
-        this.editor.selectAll();
-        this.$clickSelection = this.editor.getSelectionRange();
-    };
-
-    this.onMouseWheel = function(e) {
-        var speed = this.$scrollSpeed * 2;
-
-        this.editor.renderer.scrollBy(e.wheelX * speed, e.wheelY * speed);
-        return event.preventDefault(e);
-    };
-
-
-}).call(MouseHandler.prototype);
-
-exports.MouseHandler = MouseHandler;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/browser_focus', ['require', 'exports', 'module' , 'pilot/oop', 'pilot/event', 'pilot/event_emitter'], function(require, exports, module) {
-
-var oop = require("pilot/oop");
-var event = require("pilot/event");
-var EventEmitter = require("pilot/event_emitter").EventEmitter;
-
-/**
- * This class keeps track of the focus state of the given window.
- * Focus changes for example when the user switches a browser tab,
- * goes to the location bar or switches to another application.
- */ 
-var BrowserFocus = function(win) {
-    win = win || window;
-    
-    this.lastFocus = new Date().getTime();
-    this._isFocused = true;
-    
-    var _self = this;
-    event.addListener(win, "blur", function(e) {
-        _self._setFocused(false);
-    });
-
-    event.addListener(win, "focus", function(e) {
-        _self._setFocused(true);
-    });
-};
-
-(function(){
-
-    oop.implement(this, EventEmitter);
-    
-    this.isFocused = function() {
-        return this._isFocused;
-    };
-    
-    this._setFocused = function(isFocused) {
-        if (this._isFocused == isFocused)
-            return;
-            
-        if (isFocused)
-            this.lastFocus = new Date().getTime();
-            
-        this._isFocused = isFocused;
-        this._emit("changeFocus");
-    };
-
-}).call(BrowserFocus.prototype);
-
-
-exports.BrowserFocus = BrowserFocus;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/keyboard/keybinding', ['require', 'exports', 'module' , 'pilot/useragent', 'pilot/keys', 'pilot/event', 'pilot/settings', 'pilot/canon', 'ace/commands/default_commands'], function(require, exports, module) {
-
-var useragent = require("pilot/useragent");
-var keyUtil  = require("pilot/keys");
-var event = require("pilot/event");
-var settings  = require("pilot/settings").settings;
-var canon = require("pilot/canon");
-require("ace/commands/default_commands");
-
-var KeyBinding = function(editor) {
-    this.$editor = editor;
-    this.$data = { };
-    this.$keyboardHandler = null;
-};
-
-(function() {
-    this.setKeyboardHandler = function(keyboardHandler) {
-        if (this.$keyboardHandler != keyboardHandler) {
-            this.$data = { };
-            this.$keyboardHandler = keyboardHandler;
-        }
-    };
-
-    this.getKeyboardHandler = function() {
-        return this.$keyboardHandler;
-    };
-
-    this.$callKeyboardHandler = function (e, hashId, keyOrText, keyCode) {
-        var env = {editor: this.$editor},
-            toExecute;
-
-        if (this.$keyboardHandler) {
-            toExecute =
-                this.$keyboardHandler.handleKeyboard(this.$data, hashId, keyOrText, keyCode, e);
-        }
-
-        // If there is nothing to execute yet, then use the default keymapping.
-        if (!toExecute || !toExecute.command) {
-            if (hashId != 0 || keyCode != 0) {
-                toExecute = {
-                    command: canon.findKeyCommand(env, "editor", hashId, keyOrText)
-                }
-            } else {
-                toExecute = {
-                    command: "inserttext",
-                    args: {
-                        text: keyOrText
-                    }
-                }
-            }
-        }
-
-        var success = false;
-        if (toExecute) {
-            success = canon.exec(toExecute.command,
-                                        env, "editor", toExecute.args);
-            if (success) {
-                event.stopEvent(e);
-            }
-        }
-        return success;
-    };
-
-    this.onCommandKey = function(e, hashId, keyCode, keyString) {
-        // In case there is no keyString, try to interprete the keyCode.
-        if (!keyString) {
-            keyString = keyUtil.keyCodeToString(keyCode);
-        }
-        return this.$callKeyboardHandler(e, hashId, keyString, keyCode);
-    };
-
-    this.onTextInput = function(text) {
-        return this.$callKeyboardHandler({}, 0, text, 0);
-    }
-
-}).call(KeyBinding.prototype);
-
-exports.KeyBinding = KeyBinding;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian.viereck@gmail.com>
- *      Mihai Sucan <mihai.sucan@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/commands/default_commands', ['require', 'exports', 'module' , 'pilot/lang', 'pilot/canon'], function(require, exports, module) {
-
-var lang = require("pilot/lang");
-var canon = require("pilot/canon");
-
-function bindKey(win, mac) {
-    return {
-        win: win,
-        mac: mac,
-        sender: "editor"
-    };
-}
-
-canon.addCommand({
-    name: "null",
-    exec: function(env, args, request) {  }
-});
-
-canon.addCommand({
-    name: "selectall",
-    bindKey: bindKey("Ctrl-A", "Command-A"),
-    exec: function(env, args, request) { env.editor.selectAll(); }
-});
-canon.addCommand({
-    name: "removeline",
-    bindKey: bindKey("Ctrl-D", "Command-D"),
-    exec: function(env, args, request) { env.editor.removeLines(); }
-});
-canon.addCommand({
-    name: "gotoline",
-    bindKey: bindKey("Ctrl-L", "Command-L"),
-    exec: function(env, args, request) {
-        var line = parseInt(prompt("Enter line number:"));
-        if (!isNaN(line)) {
-            env.editor.gotoLine(line);
-        }
-    }
-});
-canon.addCommand({
-    name: "togglecomment",
-    bindKey: bindKey("Ctrl-7", "Command-7"),
-    exec: function(env, args, request) { env.editor.toggleCommentLines(); }
-});
-canon.addCommand({
-    name: "findnext",
-    bindKey: bindKey("Ctrl-K", "Command-G"),
-    exec: function(env, args, request) { env.editor.findNext(); }
-});
-canon.addCommand({
-    name: "findprevious",
-    bindKey: bindKey("Ctrl-Shift-K", "Command-Shift-G"),
-    exec: function(env, args, request) { env.editor.findPrevious(); }
-});
-canon.addCommand({
-    name: "find",
-    bindKey: bindKey("Ctrl-F", "Command-F"),
-    exec: function(env, args, request) {
-        var needle = prompt("Find:");
-        env.editor.find(needle);
-    }
-});
-canon.addCommand({
-    name: "replace",
-    bindKey: bindKey("Ctrl-R", "Command-Option-F"),
-    exec: function(env, args, request) {
-        var needle = prompt("Find:");
-        if (!needle)
-            return;
-        var replacement = prompt("Replacement:");
-        if (!replacement)
-            return;
-        env.editor.replace(replacement, {needle: needle});
-    }
-});
-canon.addCommand({
-    name: "replaceall",
-    bindKey: bindKey("Ctrl-Shift-R", "Command-Shift-Option-F"),
-    exec: function(env, args, request) {
-        var needle = prompt("Find:");
-        if (!needle)
-            return;
-        var replacement = prompt("Replacement:");
-        if (!replacement)
-            return;
-        env.editor.replaceAll(replacement, {needle: needle});
-    }
-});
-canon.addCommand({
-    name: "undo",
-    bindKey: bindKey("Ctrl-Z", "Command-Z"),
-    exec: function(env, args, request) { env.editor.undo(); }
-});
-canon.addCommand({
-    name: "redo",
-    bindKey: bindKey("Ctrl-Shift-Z|Ctrl-Y", "Command-Shift-Z|Command-Y"),
-    exec: function(env, args, request) { env.editor.redo(); }
-});
-canon.addCommand({
-    name: "overwrite",
-    bindKey: bindKey("Insert", "Insert"),
-    exec: function(env, args, request) { env.editor.toggleOverwrite(); }
-});
-canon.addCommand({
-    name: "copylinesup",
-    bindKey: bindKey("Ctrl-Alt-Up", "Command-Option-Up"),
-    exec: function(env, args, request) { env.editor.copyLinesUp(); }
-});
-canon.addCommand({
-    name: "movelinesup",
-    bindKey: bindKey("Alt-Up", "Option-Up"),
-    exec: function(env, args, request) { env.editor.moveLinesUp(); }
-});
-canon.addCommand({
-    name: "selecttostart",
-    bindKey: bindKey("Ctrl-Shift-Home|Alt-Shift-Up", "Command-Shift-Up"),
-    exec: function(env, args, request) { env.editor.getSelection().selectFileStart(); }
-});
-canon.addCommand({
-    name: "gotostart",
-    bindKey: bindKey("Ctrl-Home|Ctrl-Up", "Command-Home|Command-Up"),
-    exec: function(env, args, request) { env.editor.navigateFileStart(); }
-});
-canon.addCommand({
-    name: "selectup",
-    bindKey: bindKey("Shift-Up", "Shift-Up"),
-    exec: function(env, args, request) { env.editor.getSelection().selectUp(); }
-});
-canon.addCommand({
-    name: "golineup",
-    bindKey: bindKey("Up", "Up|Ctrl-P"),
-    exec: function(env, args, request) { env.editor.navigateUp(args.times); }
-});
-canon.addCommand({
-    name: "copylinesdown",
-    bindKey: bindKey("Ctrl-Alt-Down", "Command-Option-Down"),
-    exec: function(env, args, request) { env.editor.copyLinesDown(); }
-});
-canon.addCommand({
-    name: "movelinesdown",
-    bindKey: bindKey("Alt-Down", "Option-Down"),
-    exec: function(env, args, request) { env.editor.moveLinesDown(); }
-});
-canon.addCommand({
-    name: "selecttoend",
-    bindKey: bindKey("Ctrl-Shift-End|Alt-Shift-Down", "Command-Shift-Down"),
-    exec: function(env, args, request) { env.editor.getSelection().selectFileEnd(); }
-});
-canon.addCommand({
-    name: "gotoend",
-    bindKey: bindKey("Ctrl-End|Ctrl-Down", "Command-End|Command-Down"),
-    exec: function(env, args, request) { env.editor.navigateFileEnd(); }
-});
-canon.addCommand({
-    name: "selectdown",
-    bindKey: bindKey("Shift-Down", "Shift-Down"),
-    exec: function(env, args, request) { env.editor.getSelection().selectDown(); }
-});
-canon.addCommand({
-    name: "golinedown",
-    bindKey: bindKey("Down", "Down|Ctrl-N"),
-    exec: function(env, args, request) { env.editor.navigateDown(args.times); }
-});
-canon.addCommand({
-    name: "selectwordleft",
-    bindKey: bindKey("Ctrl-Shift-Left", "Option-Shift-Left"),
-    exec: function(env, args, request) { env.editor.getSelection().selectWordLeft(); }
-});
-canon.addCommand({
-    name: "gotowordleft",
-    bindKey: bindKey("Ctrl-Left", "Option-Left"),
-    exec: function(env, args, request) { env.editor.navigateWordLeft(); }
-});
-canon.addCommand({
-    name: "selecttolinestart",
-    bindKey: bindKey("Alt-Shift-Left", "Command-Shift-Left"),
-    exec: function(env, args, request) { env.editor.getSelection().selectLineStart(); }
-});
-canon.addCommand({
-    name: "gotolinestart",
-    bindKey: bindKey("Alt-Left|Home", "Command-Left|Home|Ctrl-A"),
-    exec: function(env, args, request) { env.editor.navigateLineStart(); }
-});
-canon.addCommand({
-    name: "selectleft",
-    bindKey: bindKey("Shift-Left", "Shift-Left"),
-    exec: function(env, args, request) { env.editor.getSelection().selectLeft(); }
-});
-canon.addCommand({
-    name: "gotoleft",
-    bindKey: bindKey("Left", "Left|Ctrl-B"),
-    exec: function(env, args, request) { env.editor.navigateLeft(args.times); }
-});
-canon.addCommand({
-    name: "selectwordright",
-    bindKey: bindKey("Ctrl-Shift-Right", "Option-Shift-Right"),
-    exec: function(env, args, request) { env.editor.getSelection().selectWordRight(); }
-});
-canon.addCommand({
-    name: "gotowordright",
-    bindKey: bindKey("Ctrl-Right", "Option-Right"),
-    exec: function(env, args, request) { env.editor.navigateWordRight(); }
-});
-canon.addCommand({
-    name: "selecttolineend",
-    bindKey: bindKey("Alt-Shift-Right", "Command-Shift-Right"),
-    exec: function(env, args, request) { env.editor.getSelection().selectLineEnd(); }
-});
-canon.addCommand({
-    name: "gotolineend",
-    bindKey: bindKey("Alt-Right|End", "Command-Right|End|Ctrl-E"),
-    exec: function(env, args, request) { env.editor.navigateLineEnd(); }
-});
-canon.addCommand({
-    name: "selectright",
-    bindKey: bindKey("Shift-Right", "Shift-Right"),
-    exec: function(env, args, request) { env.editor.getSelection().selectRight(); }
-});
-canon.addCommand({
-    name: "gotoright",
-    bindKey: bindKey("Right", "Right|Ctrl-F"),
-    exec: function(env, args, request) { env.editor.navigateRight(args.times); }
-});
-canon.addCommand({
-    name: "selectpagedown",
-    bindKey: bindKey("Shift-PageDown", "Shift-PageDown"),
-    exec: function(env, args, request) { env.editor.selectPageDown(); }
-});
-canon.addCommand({
-    name: "pagedown",
-    bindKey: bindKey(null, "PageDown"),
-    exec: function(env, args, request) { env.editor.scrollPageDown(); }
-});
-canon.addCommand({
-    name: "gotopagedown",
-    bindKey: bindKey("PageDown", "Option-PageDown|Ctrl-V"),
-    exec: function(env, args, request) { env.editor.gotoPageDown(); }
-});
-canon.addCommand({
-    name: "selectpageup",
-    bindKey: bindKey("Shift-PageUp", "Shift-PageUp"),
-    exec: function(env, args, request) { env.editor.selectPageUp(); }
-});
-canon.addCommand({
-    name: "pageup",
-    bindKey: bindKey(null, "PageUp"),
-    exec: function(env, args, request) { env.editor.scrollPageUp(); }
-});
-canon.addCommand({
-    name: "gotopageup",
-    bindKey: bindKey("PageUp", "Option-PageUp"),
-    exec: function(env, args, request) { env.editor.gotoPageUp(); }
-});
-canon.addCommand({
-    name: "selectlinestart",
-    bindKey: bindKey("Shift-Home", "Shift-Home"),
-    exec: function(env, args, request) { env.editor.getSelection().selectLineStart(); }
-});
-canon.addCommand({
-    name: "selectlineend",
-    bindKey: bindKey("Shift-End", "Shift-End"),
-    exec: function(env, args, request) { env.editor.getSelection().selectLineEnd(); }
-});
-canon.addCommand({
-    name: "del",
-    bindKey: bindKey("Delete", "Delete|Ctrl-D"),
-    exec: function(env, args, request) { env.editor.removeRight(); }
-});
-canon.addCommand({
-    name: "backspace",
-    bindKey: bindKey(
-        "Ctrl-Backspace|Command-Backspace|Option-Backspace|Shift-Backspace|Backspace",
-        "Ctrl-Backspace|Command-Backspace|Shift-Backspace|Backspace|Ctrl-H"
-    ),
-    exec: function(env, args, request) { env.editor.removeLeft(); }
-});
-canon.addCommand({
-    name: "removetolinestart",
-    bindKey: bindKey(null, "Option-Backspace"),
-    exec: function(env, args, request) { env.editor.removeToLineStart(); }
-});
-canon.addCommand({
-    name: "removetolineend",
-    bindKey: bindKey(null, "Ctrl-K"),
-    exec: function(env, args, request) { env.editor.removeToLineEnd(); }
-});
-canon.addCommand({
-    name: "removewordleft",
-    bindKey: bindKey("Ctrl-Backspace", "Alt-Backspace|Ctrl-Alt-Backspace"),
-    exec: function(env, args, request) { env.editor.removeWordLeft(); }
-});
-canon.addCommand({
-    name: "removewordright",
-    bindKey: bindKey(null, "Alt-Delete"),
-    exec: function(env, args, request) { env.editor.removeWordRight(); }
-});
-canon.addCommand({
-    name: "outdent",
-    bindKey: bindKey("Shift-Tab", "Shift-Tab"),
-    exec: function(env, args, request) { env.editor.blockOutdent(); }
-});
-canon.addCommand({
-    name: "indent",
-    bindKey: bindKey("Tab", "Tab"),
-    exec: function(env, args, request) { env.editor.indent(); }
-});
-canon.addCommand({
-    name: "inserttext",
-    exec: function(env, args, request) {
-        env.editor.insert(lang.stringRepeat(args.text  || "", args.times || 1));
-    }
-});
-canon.addCommand({
-    name: "centerselection",
-    bindKey: bindKey(null, "Ctrl-L"),
-    exec: function(env, args, request) { env.editor.centerSelection(); }
-});
-canon.addCommand({
-    name: "splitline",
-    bindKey: bindKey(null, "Ctrl-O"),
-    exec: function(env, args, request) { env.editor.splitLine(); }
-});
-canon.addCommand({
-    name: "transposeletters",
-    bindKey: bindKey("Ctrl-T", "Ctrl-T"),
-    exec: function(env, args, request) { env.editor.transposeLetters(); }
-});
-
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/edit_session', ['require', 'exports', 'module' , 'pilot/oop', 'pilot/lang', 'pilot/event_emitter', 'ace/selection', 'ace/mode/text', 'ace/range', 'ace/document', 'ace/background_tokenizer', 'ace/edit_session/folding'], function(require, exports, module) {
-
-var oop = require("pilot/oop");
-var lang = require("pilot/lang");
-var EventEmitter = require("pilot/event_emitter").EventEmitter;
-var Selection = require("ace/selection").Selection;
-var TextMode = require("ace/mode/text").Mode;
-var Range = require("ace/range").Range;
-var Document = require("ace/document").Document;
-var BackgroundTokenizer = require("ace/background_tokenizer").BackgroundTokenizer;
-
-var EditSession = function(text, mode) {
-    this.$modified = true;
-    this.$breakpoints = [];
-    this.$frontMarkers = {};
-    this.$backMarkers = {};
-    this.$markerId = 1;
-    this.$rowCache = [];
-    this.$wrapData = [];
-    this.$foldData = [];
-    this.$foldData.toString = function() {
-        var str = "";
-        this.forEach(function(foldLine) {
-            str += "\n" + foldLine.toString();
-        });
-        return str;
-    }
-
-    if (text instanceof Document) {
-        this.setDocument(text);
-    } else {
-        this.setDocument(new Document(text));
-    }
-
-    this.selection = new Selection(this);
-    if (mode)
-        this.setMode(mode);
-    else
-        this.setMode(new TextMode());
-};
-
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.setDocument = function(doc) {
-        if (this.doc)
-            throw new Error("Document is already set");
-
-        this.doc = doc;
-        doc.on("change", this.onChange.bind(this));
-        this.on("changeFold", this.onChangeFold.bind(this));
-    };
-
-    this.getDocument = function() {
-        return this.doc;
-    };
-
-    this.$resetRowCache = function(row) {
-        if (row == 0) {
-            this.$rowCache = [];
-            return;
-        }
-        var rowCache = this.$rowCache;
-        for (var i = 0; i < rowCache.length; i++) {
-            if (rowCache[i].docRow >= row) {
-                rowCache.splice(i, rowCache.length);
-                return;
-            }
-        }
-    };
-
-    this.onChangeFold = function(e) {
-        var fold = e.data;
-        this.$resetRowCache(fold.start.row);
-    };
-
-    this.onChange = function(e) {
-        var delta = e.data;
-        this.$modified = true;
-
-        this.$resetRowCache(delta.range.start.row);
-
-        var removedFolds = this.$updateInternalDataOnChange(e);
-        if (!this.$fromUndo && this.$undoManager && !delta.ignore) {
-            this.$deltasDoc.push(delta);
-            if (removedFolds && removedFolds.length != 0) {
-                this.$deltasFold.push({
-                    action: "removeFolds",
-                    folds:  removedFolds
-                });
-            }
-            
-            this.$informUndoManager.schedule();
-        }
-
-        this.bgTokenizer.start(delta.range.start.row);
-        this._dispatchEvent("change", e);
-    };
-
-    this.setValue = function(text) {
-        this.doc.setValue(text);
-        this.selection.moveCursorTo(0, 0);
-        this.selection.clearSelection();
-        
-        this.$resetRowCache(0);
-        this.$deltas = [];
-        this.$deltasDoc = [];
-        this.$deltasFold = [];
-        this.getUndoManager().reset();
-    };
-
-    this.getValue =
-    this.toString = function() {
-        return this.doc.getValue();
-    };
-
-    this.getSelection = function() {
-        return this.selection;
-    };
-
-    this.getState = function(row) {
-        return this.bgTokenizer.getState(row);
-    };
-
-    this.getTokens = function(firstRow, lastRow) {
-        return this.bgTokenizer.getTokens(firstRow, lastRow);
-    };
-
-    this.setUndoManager = function(undoManager) {
-        this.$undoManager = undoManager;
-        this.$resetRowCache(0);
-        this.$deltas = [];
-        this.$deltasDoc = [];
-        this.$deltasFold = [];
-
-        if (this.$informUndoManager)
-            this.$informUndoManager.cancel();
-
-        if (undoManager) {
-            var self = this;
-            this.$syncInformUndoManager = function() {
-                self.$informUndoManager.cancel();
-                
-                if (self.$deltasFold.length) {
-                    self.$deltas.push({
-                        group: "fold",
-                        deltas: self.$deltasFold
-                    });
-                    self.$deltasFold = [];
-                }
-                
-                if (self.$deltasDoc.length) {
-                    self.$deltas.push({
-                        group: "doc",
-                        deltas: self.$deltasDoc
-                    });
-                    self.$deltasDoc = [];
-                }
-                
-                if (self.$deltas.length > 0) {
-                    undoManager.execute({
-                        action: "aceupdate",
-                        args: [self.$deltas, self]
-                    });
-                }
-                
-                self.$deltas = [];
-            }
-            this.$informUndoManager =
-                lang.deferredCall(this.$syncInformUndoManager);
-        }
-    };
-
-    this.$defaultUndoManager = {
-        undo: function() {},
-        redo: function() {},
-        reset: function() {}
-    };
-
-    this.getUndoManager = function() {
-        return this.$undoManager || this.$defaultUndoManager;
-    },
-
-    this.getTabString = function() {
-        if (this.getUseSoftTabs()) {
-            return lang.stringRepeat(" ", this.getTabSize());
-        } else {
-            return "\t";
-        }
-    };
-
-    this.$useSoftTabs = true;
-    this.setUseSoftTabs = function(useSoftTabs) {
-        if (this.$useSoftTabs === useSoftTabs) return;
-
-        this.$useSoftTabs = useSoftTabs;
-    };
-
-    this.getUseSoftTabs = function() {
-        return this.$useSoftTabs;
-    };
-
-    this.$tabSize = 4;
-    this.setTabSize = function(tabSize) {
-        if (isNaN(tabSize) || this.$tabSize === tabSize) return;
-
-        this.$modified = true;
-        this.$tabSize = tabSize;
-        this._dispatchEvent("changeTabSize");
-    };
-
-    this.getTabSize = function() {
-        return this.$tabSize;
-    };
-
-    this.isTabStop = function(position) {
-        return this.$useSoftTabs && (position.column % this.$tabSize == 0);
-    };
-
-    this.$overwrite = false;
-    this.setOverwrite = function(overwrite) {
-        if (this.$overwrite == overwrite) return;
-
-        this.$overwrite = overwrite;
-        this._dispatchEvent("changeOverwrite");
-    };
-
-    this.getOverwrite = function() {
-        return this.$overwrite;
-    };
-
-    this.toggleOverwrite = function() {
-        this.setOverwrite(!this.$overwrite);
-    };
-
-    this.getBreakpoints = function() {
-        return this.$breakpoints;
-    };
-
-    this.setBreakpoints = function(rows) {
-        this.$breakpoints = [];
-        for (var i=0; i<rows.length; i++) {
-            this.$breakpoints[rows[i]] = true;
-        }
-        this._dispatchEvent("changeBreakpoint", {});
-    };
-
-    this.clearBreakpoints = function() {
-        this.$breakpoints = [];
-        this._dispatchEvent("changeBreakpoint", {});
-    };
-
-    this.setBreakpoint = function(row) {
-        this.$breakpoints[row] = true;
-        this._dispatchEvent("changeBreakpoint", {});
-    };
-
-    this.clearBreakpoint = function(row) {
-        delete this.$breakpoints[row];
-        this._dispatchEvent("changeBreakpoint", {});
-    };
-
-    this.getBreakpoints = function() {
-        return this.$breakpoints;
-    };
-
-    this.addMarker = function(range, clazz, type, inFront) {
-        var id = this.$markerId++;
-
-        var marker = {
-            range : range,
-            type : type || "line",
-            renderer: typeof type == "function" ? type : null,
-            clazz : clazz,
-            inFront: !!inFront
-        }
-
-        if (inFront) {
-            this.$frontMarkers[id] = marker;
-            this._dispatchEvent("changeFrontMarker")
-        } else {
-            this.$backMarkers[id] = marker;
-            this._dispatchEvent("changeBackMarker")
-        }
-
-        return id;
-    };
-
-    this.removeMarker = function(markerId) {
-        var marker = this.$frontMarkers[markerId] || this.$backMarkers[markerId];
-        if (!marker)
-            return;
-
-        var markers = marker.inFront ? this.$frontMarkers : this.$backMarkers;
-        if (marker) {
-            delete (markers[markerId]);
-            this._dispatchEvent(marker.inFront ? "changeFrontMarker" : "changeBackMarker");
-        }
-    };
-
-    this.getMarkers = function(inFront) {
-        return inFront ? this.$frontMarkers : this.$backMarkers;
-    };
-
-    /**
-     * Error:
-     *  {
-     *    row: 12,
-     *    column: 2, //can be undefined
-     *    text: "Missing argument",
-     *    type: "error" // or "warning" or "info"
-     *  }
-     */
-    this.setAnnotations = function(annotations) {
-        this.$annotations = {};
-        for (var i=0; i<annotations.length; i++) {
-            var annotation = annotations[i];
-            var row = annotation.row;
-            if (this.$annotations[row])
-                this.$annotations[row].push(annotation);
-            else
-                this.$annotations[row] = [annotation];
-        }
-        this._dispatchEvent("changeAnnotation", {});
-    };
-
-    this.getAnnotations = function() {
-        return this.$annotations;
-    };
-
-    this.clearAnnotations = function() {
-        this.$annotations = {};
-        this._dispatchEvent("changeAnnotation", {});
-    };
-
-    this.$detectNewLine = function(text) {
-        var match = text.match(/^.*?(\r?\n)/m);
-        if (match) {
-            this.$autoNewLine = match[1];
-        } else {
-            this.$autoNewLine = "\n";
-        }
-    };
-
-    this.getWordRange = function(row, column) {
-        var line = this.getLine(row);
-
-        var inToken = false;
-        if (column > 0) {
-            inToken = !!line.charAt(column - 1).match(this.tokenRe);
-        }
-
-        if (!inToken) {
-            inToken = !!line.charAt(column).match(this.tokenRe);
-        }
-
-        var re = inToken ? this.tokenRe : this.nonTokenRe;
-
-        var start = column;
-        if (start > 0) {
-            do {
-                start--;
-            }
-            while (start >= 0 && line.charAt(start).match(re));
-            start++;
-        }
-
-        var end = column;
-        while (end < line.length && line.charAt(end).match(re)) {
-            end++;
-        }
-
-        return new Range(row, start, row, end);
-    };
-
-    this.setNewLineMode = function(newLineMode) {
-        this.doc.setNewLineMode(newLineMode);
-    };
-
-    this.getNewLineMode = function() {
-        return this.doc.getNewLineMode();
-    };
-
-    this.$useWorker = true;
-    this.setUseWorker = function(useWorker) {
-        if (this.$useWorker == useWorker)
-            return;
-
-        this.$useWorker = useWorker;
-
-        this.$stopWorker();
-        if (useWorker)
-            this.$startWorker();
-    };
-
-    this.getUseWorker = function() {
-        return this.$useWorker;
-    };
-
-    this.onReloadTokenizer = function(e) {
-        var rows = e.data;
-        this.bgTokenizer.start(rows.first);
-        this._dispatchEvent("tokenizerUpdate", e);
-    };
-
-    this.$mode = null;
-    this.setMode = function(mode) {
-        if (this.$mode === mode) return;
-        this.$mode = mode;
-
-        this.$stopWorker();
-
-        if (this.$useWorker)
-            this.$startWorker();
-
-        var tokenizer = mode.getTokenizer();
-
-        if(tokenizer.addEventListener !== undefined) {
-            var onReloadTokenizer = this.onReloadTokenizer.bind(this);
-            tokenizer.addEventListener("update", onReloadTokenizer);
-        }
-
-        if (!this.bgTokenizer) {
-            this.bgTokenizer = new BackgroundTokenizer(tokenizer);
-            var _self = this;
-            this.bgTokenizer.addEventListener("update", function(e) {
-                _self._dispatchEvent("tokenizerUpdate", e);
-            });
-        } else {
-            this.bgTokenizer.setTokenizer(tokenizer);
-        }
-
-        this.bgTokenizer.setDocument(this.getDocument());
-        this.bgTokenizer.start(0);
-        
-        this.tokenRe = mode.tokenRe;
-        this.nonTokenRe = mode.nonTokenRe;
-
-        this._dispatchEvent("changeMode");
-    };
-
-    this.$stopWorker = function() {
-        if (this.$worker)
-            this.$worker.terminate();
-
-        this.$worker = null;
-    };
-
-    this.$startWorker = function() {
-        if (typeof Worker !== "undefined" && !require.noWorker) {
-            try {
-                this.$worker = this.$mode.createWorker(this);
-            } catch (e) {
-                console.log("Could not load worker");
-                console.log(e);
-                this.$worker = null;
-            }
-        }
-        else
-            this.$worker = null;
-    };
-
-    this.getMode = function() {
-        return this.$mode;
-    };
-
-    this.$scrollTop = 0;
-    this.setScrollTopRow = function(scrollTopRow) {
-        if (this.$scrollTop === scrollTopRow) return;
-
-        this.$scrollTop = scrollTopRow;
-        this._dispatchEvent("changeScrollTop");
-    };
-
-    this.getScrollTopRow = function() {
-        return this.$scrollTop;
-    };
-
-    this.getWidth = function() {
-        this.$computeWidth();
-        return this.width;
-    };
-
-    this.getScreenWidth = function() {
-        this.$computeWidth();
-        return this.screenWidth;
-    };
-
-    this.$computeWidth = function(force) {
-        if (this.$modified || force) {
-            this.$modified = false;
-
-            var lines = this.doc.getAllLines();
-            var longestLine = 0;
-            var longestScreenLine = 0;
-
-            for ( var i = 0; i < lines.length; i++) {
-                var foldLine = this.getFoldLine(i),
-                    line, len;
-
-                line = lines[i];
-                if (foldLine) {
-                    var end = foldLine.range.end;
-                    line = this.getFoldDisplayLine(foldLine);
-                    // Continue after the foldLine.end.row. All the lines in
-                    // between are folded.
-                    i = end.row;
-                }
-                len = line.length;
-                longestLine = Math.max(longestLine, len);
-                if (!this.$useWrapMode) {
-                    longestScreenLine = Math.max(
-                        longestScreenLine,
-                        this.$getStringScreenWidth(line)[0]
-                    );
-                }
-            }
-            this.width = longestLine;
-
-            if (this.$useWrapMode) {
-                this.screenWidth = this.$wrapLimit;
-            } else {
-                this.screenWidth = longestScreenLine;
-            }
-        }
-    };
-
-    /**
-     * Get a verbatim copy of the given line as it is in the document
-     */
-    this.getLine = function(row) {
-        return this.doc.getLine(row);
-    };
-
-    this.getLines = function(firstRow, lastRow) {
-        return this.doc.getLines(firstRow, lastRow);
-    };
-
-    this.getLength = function() {
-        return this.doc.getLength();
-    };
-
-    this.getTextRange = function(range) {
-        return this.doc.getTextRange(range);
-    };
-
-    this.findMatchingBracket = function(position) {
-        if (position.column == 0) return null;
-
-        var charBeforeCursor = this.getLine(position.row).charAt(position.column-1);
-        if (charBeforeCursor == "") return null;
-
-        var match = charBeforeCursor.match(/([\(\[\{])|([\)\]\}])/);
-        if (!match) {
-            return null;
-        }
-
-        if (match[1]) {
-            return this.$findClosingBracket(match[1], position);
-        } else {
-            return this.$findOpeningBracket(match[2], position);
-        }
-    };
-
-    this.$brackets = {
-        ")": "(",
-        "(": ")",
-        "]": "[",
-        "[": "]",
-        "{": "}",
-        "}": "{"
-    };
-
-    this.$findOpeningBracket = function(bracket, position) {
-        var openBracket = this.$brackets[bracket];
-
-        var column = position.column - 2;
-        var row = position.row;
-        var depth = 1;
-
-        var line = this.getLine(row);
-
-        while (true) {
-            while(column >= 0) {
-                var ch = line.charAt(column);
-                if (ch == openBracket) {
-                    depth -= 1;
-                    if (depth == 0) {
-                        return {row: row, column: column};
-                    }
-                }
-                else if (ch == bracket) {
-                    depth +=1;
-                }
-                column -= 1;
-            }
-            row -=1;
-            if (row < 0) break;
-
-            var line = this.getLine(row);
-            var column = line.length-1;
-        }
-        return null;
-    };
-
-    this.$findClosingBracket = function(bracket, position) {
-        var closingBracket = this.$brackets[bracket];
-
-        var column = position.column;
-        var row = position.row;
-        var depth = 1;
-
-        var line = this.getLine(row);
-        var lineCount = this.getLength();
-
-        while (true) {
-            while(column < line.length) {
-                var ch = line.charAt(column);
-                if (ch == closingBracket) {
-                    depth -= 1;
-                    if (depth == 0) {
-                        return {row: row, column: column};
-                    }
-                }
-                else if (ch == bracket) {
-                    depth +=1;
-                }
-                column += 1;
-            }
-            row +=1;
-            if (row >= lineCount) break;
-
-            var line = this.getLine(row);
-            var column = 0;
-        }
-        return null;
-    };
-
-    this.insert = function(position, text) {
-        return this.doc.insert(position, text);
-    };
-
-    this.remove = function(range) {
-        return this.doc.remove(range);
-    };
-
-    this.undoChanges = function(deltas, dontSelect) {
-        if (!deltas.length)
-            return;
-
-        this.$fromUndo = true;
-        var lastUndoRange = null;
-        for (var i = deltas.length - 1; i != -1; i--) {
-            delta = deltas[i];
-            if (delta.group == "doc") {
-                this.doc.revertDeltas(delta.deltas);
-                lastUndoRange =
-                    this.$getUndoSelection(delta.deltas, true, lastUndoRange);
-            } else {
-                delta.deltas.forEach(function(foldDelta) {
-                    this.addFolds(foldDelta.folds);
-                }, this);
-            }
-        }
-        this.$fromUndo = false;
-        lastUndoRange &&
-            !dontSelect &&
-            this.selection.setSelectionRange(lastUndoRange);
-        return lastUndoRange;
-    },
-
-    this.redoChanges = function(deltas, dontSelect) {
-        if (!deltas.length)
-            return;
-
-        this.$fromUndo = true;
-        var lastUndoRange = null;
-        for (var i = 0; i < deltas.length; i++) {
-            delta = deltas[i];
-            if (delta.group == "doc") {
-                this.doc.applyDeltas(delta.deltas);
-                lastUndoRange =
-                    this.$getUndoSelection(delta.deltas, false, lastUndoRange);
-            }
-        }
-        this.$fromUndo = false;
-        lastUndoRange &&
-            !dontSelect &&
-            this.selection.setSelectionRange(lastUndoRange);
-        return lastUndoRange;
-    },
-
-    this.$getUndoSelection = function(deltas, isUndo, lastUndoRange) {
-        function isInsert(delta) {
-            var insert =
-                delta.action == "insertText" || delta.action == "insertLines";
-            return isUndo ? !insert : insert;
-        }
-
-        var delta = deltas[0];
-        var range, point;
-        var lastDeltaIsInsert = false;
-        if (isInsert(delta)) {
-            range = delta.range.clone();
-            lastDeltaIsInsert = true;
-        } else {
-            range = Range.fromPoints(delta.range.start, delta.range.start);
-            lastDeltaIsInsert = false;
-        }
-
-        for (var i = 1; i < deltas.length; i++) {
-            delta = deltas[i];
-            if (isInsert(delta)) {
-                point = delta.range.start;
-                if (range.compare(point.row, point.column) == -1) {
-                    range.setStart(delta.range.start);
-                }
-                point = delta.range.end;
-                if (range.compare(point.row, point.column) == 1) {
-                    range.setEnd(delta.range.end);
-                }
-                lastDeltaIsInsert = true;
-            } else {
-                point = delta.range.start;
-                if (range.compare(point.row, point.column) == -1) {
-                    range =
-                        Range.fromPoints(delta.range.start, delta.range.start);
-                }
-                lastDeltaIsInsert = false;
-            }
-        }
-
-        // Check if this range and the last undo range has something in common.
-        // If true, merge the ranges.
-        if (lastUndoRange != null) {
-            var cmp = lastUndoRange.compareRange(range);
-            if (cmp == 1) {
-                range.setStart(lastUndoRange.start);
-            } else if (cmp == -1) {
-                range.setEnd(lastUndoRange.end);
-            }
-        }
-
-        return range;
-    },
-
-    this.replace = function(range, text) {
-        return this.doc.replace(range, text);
-    };
-
-    /**
-     * Move a range of text from the given range to the given position.
-     *
-     * @param fromRange {Range} The range of text you want moved within the
-     * document.
-     * @param toPosition {Object} The location (row and column) where you want
-     * to move the text to.
-     * @return {Range} The new range where the text was moved to.
-     */
-    this.moveText = function(fromRange, toPosition) {
-        var text = this.getTextRange(fromRange);
-        this.remove(fromRange);
-
-        var toRow = toPosition.row;
-        var toColumn = toPosition.column;
-
-        // Make sure to update the insert location, when text is removed in
-        // front of the chosen point of insertion.
-        if (!fromRange.isMultiLine() && fromRange.start.row == toRow &&
-            fromRange.end.column < toColumn)
-            toColumn -= text.length;
-
-        if (fromRange.isMultiLine() && fromRange.end.row < toRow) {
-            var lines = this.doc.$split(text);
-            toRow -= lines.length - 1;
-        }
-
-        var endRow = toRow + fromRange.end.row - fromRange.start.row;
-        var endColumn = fromRange.isMultiLine() ?
-                        fromRange.end.column :
-                        toColumn + fromRange.end.column - fromRange.start.column;
-
-        var toRange = new Range(toRow, toColumn, endRow, endColumn);
-
-        this.insert(toRange.start, text);
-
-        return toRange;
-    };
-
-    this.indentRows = function(startRow, endRow, indentString) {
-        indentString = indentString.replace(/\t/g, this.getTabString());
-        for (var row=startRow; row<=endRow; row++) {
-            this.insert({row: row, column:0}, indentString);
-        }
-    };
-
-    this.outdentRows = function (range) {
-        var rowRange = range.collapseRows();
-        var deleteRange = new Range(0, 0, 0, 0);
-        var size = this.getTabSize();
-
-        for (var i = rowRange.start.row; i <= rowRange.end.row; ++i) {
-            var line = this.getLine(i);
-
-            deleteRange.start.row = i;
-            deleteRange.end.row = i;
-            for (var j = 0; j < size; ++j)
-                if (line.charAt(j) != ' ')
-                    break;
-            if (j < size && line.charAt(j) == '\t') {
-                deleteRange.start.column = j;
-                deleteRange.end.column = j + 1;
-            } else {
-                deleteRange.start.column = 0;
-                deleteRange.end.column = j;
-            }
-            this.remove(deleteRange);
-        }
-    };
-
-    this.moveLinesUp = function(firstRow, lastRow) {
-        if (firstRow <= 0) return 0;
-
-        var removed = this.doc.removeLines(firstRow, lastRow);
-        this.doc.insertLines(firstRow - 1, removed);
-        return -1;
-    };
-
-    this.moveLinesDown = function(firstRow, lastRow) {
-        if (lastRow >= this.doc.getLength()-1) return 0;
-
-        var removed = this.doc.removeLines(firstRow, lastRow);
-        this.doc.insertLines(firstRow+1, removed);
-        return 1;
-    };
-
-    this.duplicateLines = function(firstRow, lastRow) {
-        var firstRow = this.$clipRowToDocument(firstRow);
-        var lastRow = this.$clipRowToDocument(lastRow);
-
-        var lines = this.getLines(firstRow, lastRow);
-        this.doc.insertLines(firstRow, lines);
-
-        var addedRows = lastRow - firstRow + 1;
-        return addedRows;
-    };
-
-    this.$clipRowToDocument = function(row) {
-        return Math.max(0, Math.min(row, this.doc.getLength()-1));
-    };
-    
-    this.$clipPositionToDocument = function(row, column) {
-        column = Math.max(0, column);
-
-        if (row < 0) {
-            row = 0;
-            column = 0;
-        } else {
-            var len = this.doc.getLength();
-            if (row >= len) {
-                row = len - 1;
-                column = this.doc.getLine(len-1).length;
-            } else {
-                column = Math.min(this.doc.getLine(row).length, column);
-            }
-        }
-        
-        return {
-            row: row,
-            column: column
-        };
-    };
-
-    // WRAPMODE
-    this.$wrapLimit = 80;
-    this.$useWrapMode = false;
-    this.$wrapLimitRange = {
-        min : null,
-        max : null
-    };
-
-    this.setUseWrapMode = function(useWrapMode) {
-        if (useWrapMode != this.$useWrapMode) {
-            this.$useWrapMode = useWrapMode;
-            this.$modified = true;
-            this.$resetRowCache(0);
-
-            // If wrapMode is activaed, the wrapData array has to be initialized.
-            if (useWrapMode) {
-                var len = this.getLength();
-                this.$wrapData = [];
-                for (i = 0; i < len; i++) {
-                    this.$wrapData.push([]);
-                }
-                this.$updateWrapData(0, len - 1);
-            }
-
-            this._dispatchEvent("changeWrapMode");
-        }
-    };
-
-    this.getUseWrapMode = function() {
-        return this.$useWrapMode;
-    };
-
-    // Allow the wrap limit to move freely between min and max. Either
-    // parameter can be null to allow the wrap limit to be unconstrained
-    // in that direction. Or set both parameters to the same number to pin
-    // the limit to that value.
-    this.setWrapLimitRange = function(min, max) {
-        if (this.$wrapLimitRange.min !== min || this.$wrapLimitRange.max !== max) {
-            this.$wrapLimitRange.min = min;
-            this.$wrapLimitRange.max = max;
-            this.$modified = true;
-            // This will force a recalculation of the wrap limit
-            this._dispatchEvent("changeWrapMode");
-        }
-    };
-
-    // This should generally only be called by the renderer when a resize
-    // is detected.
-    this.adjustWrapLimit = function(desiredLimit) {
-        var wrapLimit = this.$constrainWrapLimit(desiredLimit);
-        if (wrapLimit != this.$wrapLimit && wrapLimit > 0) {
-            this.$wrapLimit = wrapLimit;
-            this.$modified = true;
-            if (this.$useWrapMode) {
-                this.$updateWrapData(0, this.getLength() - 1);
-                this.$resetRowCache(0)
-                this._dispatchEvent("changeWrapLimit");
-            }
-            return true;
-        }
-        return false;
-    };
-
-    this.$constrainWrapLimit = function(wrapLimit) {
-        var min = this.$wrapLimitRange.min;
-        if (min)
-            wrapLimit = Math.max(min, wrapLimit);
-
-        var max = this.$wrapLimitRange.max;
-        if (max)
-            wrapLimit = Math.min(max, wrapLimit);
-
-        // What would a limit of 0 even mean?
-        return Math.max(1, wrapLimit);
-    };
-
-    this.getWrapLimit = function() {
-        return this.$wrapLimit;
-    };
-
-    this.getWrapLimitRange = function() {
-        // Avoid unexpected mutation by returning a copy
-        return {
-            min : this.$wrapLimitRange.min,
-            max : this.$wrapLimitRange.max
-        };
-    };
-
-    this.$updateInternalDataOnChange = function(e) {
-        var useWrapMode = this.$useWrapMode;
-        var len;
-        var action = e.data.action;
-        var firstRow = e.data.range.start.row,
-            lastRow = e.data.range.end.row,
-            start = e.data.range.start,
-            end = e.data.range.end;
-        var removedFolds = null;
-
-        if (action.indexOf("Lines") != -1) {
-            if (action == "insertLines") {
-                lastRow = firstRow + (e.data.lines.length);
-            } else {
-                lastRow = firstRow;
-            }
-            len = e.data.lines.length;
-        } else {
-            len = lastRow - firstRow;
-        }
-
-        if (len != 0) {
-            if (action.indexOf("remove") != -1) {
-                useWrapMode && this.$wrapData.splice(firstRow, len);
-
-                var foldLines = this.$foldData;
-                removedFolds = this.getFoldsInRange(e.data.range);
-                this.removeFolds(removedFolds);
-
-                var foldLine = this.getFoldLine(end.row);
-                var idx = 0;
-                if (foldLine) {
-                    foldLine.addRemoveChars(end.row, end.column, start.column - end.column);
-                    foldLine.shiftRow(-len);
-
-                    var foldLineBefore = this.getFoldLine(firstRow);
-                    if (foldLineBefore && foldLineBefore !== foldLine) {
-                        foldLineBefore.merge(foldLine);
-                        foldLine = foldLineBefore;
-                    }
-                    idx = foldLines.indexOf(foldLine) + 1;
-                }
-
-                for (idx; idx < foldLines.length; idx++) {
-                    var foldLine = foldLines[idx];
-                    if (foldLine.start.row >= end.row) {
-                        foldLine.shiftRow(-len);
-                    }
-                }
-
-                lastRow = firstRow;
-            } else {
-                var args;
-                if (useWrapMode) {
-                    args = [firstRow, 0];
-                    for (var i = 0; i < len; i++) args.push([]);
-                    this.$wrapData.splice.apply(this.$wrapData, args);
-                }
-
-                // If some new line is added inside of a foldLine, then split
-                // the fold line up.
-                var foldLines = this.$foldData;
-                var foldLine = this.getFoldLine(firstRow);
-                var idx = 0;
-                if (foldLine) {
-                    var cmp = foldLine.range.compareInside(start.row, start.column)
-                    // Inside of the foldLine range. Need to split stuff up.
-                    if (cmp == 0) {
-                        foldLine = foldLine.split(start.row, start.column);
-                        foldLine.shiftRow(len);
-                        foldLine.addRemoveChars(
-                            lastRow, 0, end.column - start.column);
-                    } else
-                    // Infront of the foldLine but same row. Need to shift column.
-                    if (cmp == -1) {
-                        foldLine.addRemoveChars(firstRow, 0, end.column - start.column);
-                        foldLine.shiftRow(len);
-                    }
-                    // Nothing to do if the insert is after the foldLine.
-                    idx = foldLines.indexOf(foldLine) + 1;
-                }
-
-                for (idx; idx < foldLines.length; idx++) {
-                    var foldLine = foldLines[idx];
-                    if (foldLine.start.row >= firstRow) {
-                        foldLine.shiftRow(len);
-                    }
-                }
-            }
-        } else {
-            // Realign folds. E.g. if you add some new chars before a fold, the
-            // fold should "move" to the right.
-            var column;
-            len = Math.abs(e.data.range.start.column - e.data.range.end.column);
-            if (action.indexOf("remove") != -1) {
-                // Get all the folds in the change range and remove them.
-                removedFolds = this.getFoldsInRange(e.data.range);
-                this.removeFolds(removedFolds);
-
-                len = -len;
-            }
-            var foldLine = this.getFoldLine(firstRow);
-            if (foldLine) {
-                foldLine.addRemoveChars(firstRow, start.column, len);
-            }
-        }
-
-        if (useWrapMode && this.$wrapData.length != this.doc.getLength()) {
-            console.error("doc.getLength() and $wrapData.length have to be the same!");
-        }
-
-        useWrapMode && this.$updateWrapData(firstRow, lastRow);
-
-        return removedFolds;
-    };
-
-    this.$updateWrapData = function(firstRow, lastRow) {
-        var lines = this.doc.getAllLines();
-        var tabSize = this.getTabSize();
-        var wrapData = this.$wrapData;
-        var wrapLimit = this.$wrapLimit;
-        var tokens;
-        var foldLine;
-
-        var row = firstRow;
-        lastRow = Math.min(lastRow, lines.length - 1);
-        while (row <= lastRow) {
-            foldLine = this.getFoldLine(row);
-            if (!foldLine) {
-                tokens = this.$getDisplayTokens(lang.stringTrimRight(lines[row]));
-            } else {
-                tokens = [];
-                foldLine.walk(
-                    function(placeholder, row, column, lastColumn) {
-                        var walkTokens;
-                        if (placeholder) {
-                            walkTokens = this.$getDisplayTokens(
-                                            placeholder, tokens.length);
-                            walkTokens[0] = PLACEHOLDER_START;
-                            for (var i = 1; i < walkTokens.length; i++) {
-                                walkTokens[i] = PLACEHOLDER_BODY;
-                            }
-                        } else {
-                            walkTokens = this.$getDisplayTokens(
-                                lines[row].substring(lastColumn, column),
-                                tokens.length);
-                        }
-                        tokens = tokens.concat(walkTokens);
-                    }.bind(this),
-                    foldLine.end.row,
-                    lines[foldLine.end.row].length + 1
-                );
-                // Remove spaces/tabs from the back of the token array.
-                while (tokens.length != 0
-                    && tokens[tokens.length - 1] >= SPACE)
-                {
-                    tokens.pop();
-                }
-            }
-            wrapData[row] =
-                this.$computeWrapSplits(tokens, wrapLimit, tabSize);
-
-            row = this.getRowFoldEnd(row) + 1;
-        }
-    };
-
-    // "Tokens"
-    var CHAR = 1,
-        CHAR_EXT = 2,
-        PLACEHOLDER_START = 3,
-        PLACEHOLDER_BODY =  4,
-        SPACE = 10,
-        TAB = 11,
-        TAB_SPACE = 12;
-
-    this.$computeWrapSplits = function(tokens, wrapLimit, tabSize) {
-        if (tokens.length == 0) {
-            return [];
-        }
-
-        var tabSize = this.getTabSize();
-        var splits = [];
-        var displayLength = tokens.length;
-        var lastSplit = 0, lastDocSplit = 0;
-
-        function addSplit(screenPos) {
-            var displayed = tokens.slice(lastSplit, screenPos);
-
-            // The document size is the current size - the extra width for tabs
-            // and multipleWidth characters.
-            var len = displayed.length;
-            displayed.join("").
-                // Get all the TAB_SPACEs.
-                replace(/12/g, function(m) {
-                    len -= 1;
-                }).
-                // Get all the CHAR_EXT/multipleWidth characters.
-                replace(/2/g, function(m) {
-                    len -= 1;
-                });
-
-            lastDocSplit += len;
-            splits.push(lastDocSplit);
-            lastSplit = screenPos;
-        }
-
-        while (displayLength - lastSplit > wrapLimit) {
-            // This is, where the split should be.
-            var split = lastSplit + wrapLimit;
-
-            // If there is a space or tab at this split position, then making
-            // a split is simple.
-            if (tokens[split] >= SPACE) {
-                // Include all following spaces + tabs in this split as well.
-                while (tokens[split] >= SPACE)  {
-                    split ++;
-                }
-                addSplit(split);
-                continue;
-            }
-
-            // === ELSE ===
-            // Check if split is inside of a placeholder. Placeholder are
-            // not splitable. Therefore, seek the beginning of the placeholder
-            // and try to place the split beofre the placeholder's start.
-            if (tokens[split] == PLACEHOLDER_START
-                || tokens[split] == PLACEHOLDER_BODY)
-            {
-                // Seek the start of the placeholder and do the split
-                // before the placeholder. By definition there always
-                // a PLACEHOLDER_START between split and lastSplit.
-                for (split; split != lastSplit - 1; split--) {
-                    if (tokens[split] == PLACEHOLDER_START) {
-                        // split++; << No incremental here as we want to
-                        //  have the position before the Placeholder.
-                        break;
-                    }
-                }
-
-                // If the PLACEHOLDER_START is not the index of the
-                // last split, then we can do the split
-                if (split > lastSplit) {
-                    addSplit(split);
-                    continue;
-                }
-
-                // If the PLACEHOLDER_START IS the index of the last
-                // split, then we have to place the split after the
-                // placeholder. So, let's seek for the end of the placeholder.
-                split = lastSplit + wrapLimit;
-                for (split; split < tokens.length; split++) {
-                    if (tokens[split] != PLACEHOLDER_BODY)
-                    {
-                        break;
-                    }
-                }
-
-                // If spilt == tokens.length, then the placeholder is the last
-                // thing in the line and adding a new split doesn't make sense.
-                if (split == tokens.length) {
-                    break;  // Breaks the while-loop.
-                }
-
-                // Finally, add the split...
-                addSplit(split);
-                continue;
-            }
-
-            // === ELSE ===
-            // Search for the first non space/tab/placeholder token backwards.
-            for (split; split != lastSplit - 1; split--) {
-                if (tokens[split] >= PLACEHOLDER_START) {
-                    split++;
-                    break;
-                }
-            }
-            // If we found one, then add the split.
-            if (split > lastSplit) {
-                addSplit(split);
-                continue;
-            }
-
-            // === ELSE ===
-            split = lastSplit + wrapLimit;
-            // The split is inside of a CHAR or CHAR_EXT token and no space
-            // around -> force a split.
-            addSplit(lastSplit + wrapLimit);
-        }
-        return splits;
-    }
-
-    /**
-     * @param
-     *   offset: The offset in screenColumn at which position str starts.
-     *           Important for calculating the realTabSize.
-     */
-    this.$getDisplayTokens = function(str, offset) {
-        var arr = [];
-        var tabSize;
-        offset = offset || 0;
-
-        for (var i = 0; i < str.length; i++) {
-            var c = str.charCodeAt(i);
-            // Tab
-            if (c == 9) {
-                tabSize = this.getScreenTabSize(arr.length + offset);
-                arr.push(TAB);
-                for (var n = 1; n < tabSize; n++) {
-                    arr.push(TAB_SPACE);
-                }
-            }
-            // Space
-            else if(c == 32) {
-                arr.push(SPACE);
-            }
-            // full width characters
-            else if (isFullWidth(c)) {
-                arr.push(CHAR, CHAR_EXT);
-            } else {
-                arr.push(CHAR);
-            }
-        }
-        return arr;
-    }
-
-    /**
-     * Calculates the width of the a string on the screen while assuming that
-     * the string starts at the first column on the screen.
-     *
-     * @param string str String to calculate the screen width of
-     * @return array
-     *      [0]: number of columns for str on screen.
-     *      [1]: docColumn position that was read until (useful with screenColumn)
-     */
-    this.$getStringScreenWidth = function(str, maxScreenColumn, screenColumn) {
-        if (maxScreenColumn == 0) {
-            return [0, 0];
-        }
-        if (maxScreenColumn == null) {
-            maxScreenColumn = screenColumn +
-                str.length * Math.max(this.getTabSize(), 2);
-        }
-        screenColumn = screenColumn || 0;
-
-        var c, column;
-        for (column = 0; column < str.length; column++) {
-            c = str.charCodeAt(column);
-            // tab
-            if (c == 9) {
-                screenColumn += this.getScreenTabSize(screenColumn);
-            }
-            // full width characters
-            else if (isFullWidth(c)) {
-                screenColumn += 2;
-            } else {
-                screenColumn += 1;
-            }
-            if (screenColumn > maxScreenColumn) {
-                break
-            }
-        }
-
-        return [screenColumn, column];
-    }
-
-    /**
-     * Returns the number of rows required to render this row on the screen
-     */
-    this.getRowLength = function(row) {
-        if (!this.$useWrapMode || !this.$wrapData[row]) {
-            return 1;
-        } else {
-            return this.$wrapData[row].length + 1;
-        }
-    }
-
-    /**
-     * Returns the height in pixels required to render this row on the screen
-     **/
-    this.getRowHeight = function(config, row) {
-        return this.getRowLength(row) * config.lineHeight;
-    }
-
-    this.getScreenLastRowColumn = function(screenRow) {
-        //return this.screenToDocumentColumn(screenRow, Number.MAX_VALUE / 10)
-        return this.documentToScreenColumn(screenRow, this.doc.getLine(screenRow).length);
-    };
-
-    this.getDocumentLastRowColumn = function(docRow, docColumn) {
-        var screenRow = this.documentToScreenRow(docRow, docColumn);
-        return this.getScreenLastRowColumn(screenRow);
-    };
-
-    this.getDocumentLastRowColumnPosition = function(docRow, docColumn) {
-        var screenRow = this.documentToScreenRow(docRow, docColumn);
-        return this.screenToDocumentPosition(screenRow, Number.MAX_VALUE / 10);
-    };
-
-    this.getRowSplitData = function(row) {
-        if (!this.$useWrapMode) {
-            return undefined;
-        } else {
-            return this.$wrapData[row];
-        }
-    };
-
-    /**
-     * Returns the width of a tab character at screenColumn.
-     */
-    this.getScreenTabSize = function(screenColumn) {
-        return this.$tabSize - screenColumn % this.$tabSize;
-    };
-
-    this.screenToDocumentRow = function(screenRow, screenColumn) {
-        return this.screenToDocumentPosition(screenRow, screenColumn).row;
-    };
-
-    this.screenToDocumentColumn = function(screenRow, screenColumn) {
-        return this.screenToDocumentPosition(screenRow, screenColumn).column;
-    };
-
-    this.screenToDocumentPosition = function(screenRow, screenColumn) {
-        if (screenRow < 0) {
-            return {
-                row: 0,
-                column: 0
-            }
-        }
-        
-        var line;
-        var docRow = 0;
-        var docColumn = 0;
-        var column;
-        var foldLineRowLength;
-        var row = 0;
-        var rowLength = 0;
-
-        var rowCache = this.$rowCache;
-        for (var i = 0; i < rowCache.length; i++) {
-            if (rowCache[i].screenRow < screenRow) {
-                row = rowCache[i].screenRow;
-                docRow = rowCache[i].docRow;
-            }
-            else {
-                break;
-            }
-        }
-        var doCache = !rowCache.length || i == rowCache.length;
-        
-        // clamp row before clamping column, for selection on last line
-        var maxRow = this.getLength() - 1;
-
-        var foldLine = this.getNextFold(docRow);
-        var foldStart = foldLine ? foldLine.start.row : Infinity;
-
-        while (row <= screenRow) {
-            rowLength = this.getRowLength(docRow);
-            if (row + rowLength - 1 >= screenRow || docRow >= maxRow) {
-                break;
-            } else {
-                row += rowLength;
-                docRow++;
-                if (docRow > foldStart) {
-                    docRow = foldLine.end.row+1;
-                    foldLine = this.getNextFold(docRow);
-                    foldStart = foldLine ? foldLine.start.row : Infinity;
-                }
-            }
-            if (doCache) {
-                rowCache.push({
-                    docRow: docRow,
-                    screenRow: row
-                });
-            }
-        }
-
-        if (foldLine && foldLine.start.row <= docRow)
-            line = this.getFoldDisplayLine(foldLine);
-        else {
-            line = this.getLine(docRow);
-            foldLine = null;
-        }
-
-        var splits = [];
-        if (this.$useWrapMode) {
-            splits = this.$wrapData[docRow];
-            if (splits) {
-                column = splits[screenRow - row]
-                if(screenRow > row && splits.length) {
-                    docColumn = splits[screenRow - row - 1] || splits[splits.length - 1];
-                    line = line.substring(docColumn);
-                }
-            }
-        }
-
-        docColumn += this.$getStringScreenWidth(line, screenColumn)[1];
-
-        // clip row at the end of the document
-        if (row + splits.length < screenRow)
-            docColumn = Number.MAX_VALUE;
-
-        // Need to do some clamping action here.
-        if (this.$useWrapMode) {
-            if (docColumn >= column) {
-                // We remove one character at the end such that the docColumn
-                // position returned is not associated to the next row on the
-                // screen.
-                docColumn = column - 1;
-            }
-        } else {
-            docColumn = Math.min(docColumn, line.length);
-        }
-
-        if (foldLine) {
-            return foldLine.idxToPosition(docColumn);
-        }
-        
-        return {
-            row: docRow,
-            column: docColumn
-        }
-    };
-
-    this.documentToScreenPosition = function(docRow, docColumn) {
-        // Normalize the passed in arguments.
-        if (typeof docColumn === "undefined")
-            var pos = this.$clipPositionToDocument(docRow.row, docRow.column);
-        else 
-            pos = this.$clipPositionToDocument(docRow, docColumn);
-
-        docRow = pos.row;
-        docColumn = pos.column;
-        
-        var LL = this.$rowCache.length;
-
-        var wrapData;
-        // Special case in wrapMode if the doc is at the end of the document.
-        if (this.$useWrapMode) {
-            wrapData = this.$wrapData;
-            if (docRow > wrapData.length - 1) {
-                return {
-                    row: this.getScreenLength(),
-                    column: wrapData.length == 0
-                        ? 0
-                        : (wrapData[wrapData.length - 1].length - 1)
-                };
-            }
-        }
-
-        var screenRow = 0;
-        var screenColumn = 0;
-        var foldStartRow = null;
-        var fold = null;
-
-        // Clamp the docRow position in case it's inside of a folded block.
-        fold = this.getFoldAt(docRow, docColumn, 1);
-        if (fold) {
-            docRow = fold.start.row;
-            docColumn = fold.start.column;
-        }
-
-        var rowEnd, row = 0;
-        var rowCache = this.$rowCache;
-
-        for (var i = 0; i < rowCache.length; i++) {
-            if (rowCache[i].docRow < docRow) {
-                screenRow = rowCache[i].screenRow;
-                row = rowCache[i].docRow;
-            } else {
-                break;
-            }
-        }
-        var doCache = !rowCache.length || i == rowCache.length;
-
-        var foldLine = this.getNextFold(row);
-        var foldStart = foldLine ?foldLine.start.row :Infinity;
-
-        while (row < docRow) {
-            if (row >= foldStart) {
-                rowEnd = foldLine.end.row + 1;
-                if (rowEnd > docRow)
-                    break;
-                foldLine = this.getNextFold(rowEnd);
-                foldStart = foldLine ?foldLine.start.row :Infinity;
-            }
-            else {
-                rowEnd = row + 1;
-            }
-
-            screenRow += this.getRowLength(row);
-            row = rowEnd;
-                        
-            if (doCache) {
-                rowCache.push({
-                    docRow: row,
-                    screenRow: screenRow
-                });
-            }
-        }
-
-        // Calculate the text line that is displayed in docRow on the screen.
-        var textLine = "";
-        // Check if the final row we want to reach is inside of a fold.
-        if (foldLine && row >= foldStart) {
-            textLine = this.getFoldDisplayLine(foldLine, docRow, docColumn);
-            foldStartRow = foldLine.start.row;
-        } else {
-            textLine = this.getLine(docRow).substring(0, docColumn);
-            foldStartRow = docRow;
-        }
-        // Clamp textLine if in wrapMode.
-        if (this.$useWrapMode) {
-            var wrapRow = wrapData[foldStartRow];
-            var screenRowOffset = 0;
-            while (textLine.length >= wrapRow[screenRowOffset]) {
-                screenRow ++;
-                screenRowOffset++;
-            }
-            textLine = textLine.substring(
-                wrapRow[screenRowOffset - 1] || 0, textLine.length
-            );
-        }
-
-        return {
-            row: screenRow,
-            column: this.$getStringScreenWidth(textLine)[0]
-        };
-    };
-
-    this.documentToScreenColumn = function(row, docColumn) {
-        return this.documentToScreenPosition(row, docColumn).column;
-    };
-
-    this.documentToScreenRow = function(docRow, docColumn) {
-        return this.documentToScreenPosition(docRow, docColumn).row;
-    };
-
-    this.getScreenLength = function() {
-        var screenRows = 0;
-        var lastFoldLine = null;
-        var foldLine = null;
-        if (!this.$useWrapMode) {
-            screenRows = this.getLength();
-
-            // Remove the folded lines again.
-            var foldData = this.$foldData;
-            for (var i = 0; i < foldData.length; i++) {
-                foldLine = foldData[i];
-                screenRows -= foldLine.end.row - foldLine.start.row;
-            }
-        } else {
-            for (var row = 0; row < this.$wrapData.length; row++) {
-                if (foldLine = this.getFoldLine(row, lastFoldLine)) {
-                    row = foldLine.end.row;
-                    screenRows += 1;
-                } else {
-                    screenRows += this.$wrapData[row].length + 1;
-                }
-            }
-        }
-
-        return screenRows;
-    }
-
-    // For every keystroke this gets called once per char in the whole doc!!
-    // Wouldn't hurt to make it a bit faster for c >= 0x1100
-    function isFullWidth(c) {
-        if (c < 0x1100)
-            return false;
-        return c >= 0x1100 && c <= 0x115F ||
-               c >= 0x11A3 && c <= 0x11A7 ||
-               c >= 0x11FA && c <= 0x11FF ||
-               c >= 0x2329 && c <= 0x232A ||
-               c >= 0x2E80 && c <= 0x2E99 ||
-               c >= 0x2E9B && c <= 0x2EF3 ||
-               c >= 0x2F00 && c <= 0x2FD5 ||
-               c >= 0x2FF0 && c <= 0x2FFB ||
-               c >= 0x3000 && c <= 0x303E ||
-               c >= 0x3041 && c <= 0x3096 ||
-               c >= 0x3099 && c <= 0x30FF ||
-               c >= 0x3105 && c <= 0x312D ||
-               c >= 0x3131 && c <= 0x318E ||
-               c >= 0x3190 && c <= 0x31BA ||
-               c >= 0x31C0 && c <= 0x31E3 ||
-               c >= 0x31F0 && c <= 0x321E ||
-               c >= 0x3220 && c <= 0x3247 ||
-               c >= 0x3250 && c <= 0x32FE ||
-               c >= 0x3300 && c <= 0x4DBF ||
-               c >= 0x4E00 && c <= 0xA48C ||
-               c >= 0xA490 && c <= 0xA4C6 ||
-               c >= 0xA960 && c <= 0xA97C ||
-               c >= 0xAC00 && c <= 0xD7A3 ||
-               c >= 0xD7B0 && c <= 0xD7C6 ||
-               c >= 0xD7CB && c <= 0xD7FB ||
-               c >= 0xF900 && c <= 0xFAFF ||
-               c >= 0xFE10 && c <= 0xFE19 ||
-               c >= 0xFE30 && c <= 0xFE52 ||
-               c >= 0xFE54 && c <= 0xFE66 ||
-               c >= 0xFE68 && c <= 0xFE6B ||
-               c >= 0xFF01 && c <= 0xFF60 ||
-               c >= 0xFFE0 && c <= 0xFFE6;
-    };
-
-}).call(EditSession.prototype);
-
-require("ace/edit_session/folding").Folding.call(EditSession.prototype);
-
-exports.EditSession = EditSession;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/selection', ['require', 'exports', 'module' , 'pilot/oop', 'pilot/lang', 'pilot/event_emitter', 'ace/range'], function(require, exports, module) {
-
-var oop = require("pilot/oop");
-var lang = require("pilot/lang");
-var EventEmitter = require("pilot/event_emitter").EventEmitter;
-var Range = require("ace/range").Range;
-
-/**
- * Keeps cursor position and the text selection of an edit session.
- * 
- * The row/columns used in the selection are in document coordinates
- * representing ths coordinates as thez appear in the document
- * before applying soft wrap and folding.
- */ 
-var Selection = function(session) {
-    this.session = session;
-    this.doc = session.getDocument();
-
-    this.clearSelection();
-    this.selectionLead = this.doc.createAnchor(0, 0);
-    this.selectionAnchor = this.doc.createAnchor(0, 0);
-
-    var _self = this;
-    this.selectionLead.on("change", function(e) {
-        _self._dispatchEvent("changeCursor");
-        if (!_self.$isEmpty)
-            _self._dispatchEvent("changeSelection");
-        if (!_self.$preventUpdateDesiredColumnOnChange && e.old.column != e.value.column)
-            _self.$updateDesiredColumn();
-    });
-
-    this.selectionAnchor.on("change", function() {
-        if (!_self.$isEmpty)
-            _self._dispatchEvent("changeSelection");
-    });
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.isEmpty = function() {
-        return (this.$isEmpty || (
-            this.selectionAnchor.row == this.selectionLead.row &&
-            this.selectionAnchor.column == this.selectionLead.column
-        ));
-    };
-
-    this.isMultiLine = function() {
-        if (this.isEmpty()) {
-            return false;
-        }
-
-        return this.getRange().isMultiLine();
-    };
-
-    this.getCursor = function() {
-        return this.selectionLead.getPosition();
-    };
-
-    this.setSelectionAnchor = function(row, column) {
-        this.selectionAnchor.setPosition(row, column);
-
-        if (this.$isEmpty) {
-            this.$isEmpty = false;
-            this._dispatchEvent("changeSelection");
-        }
-    };
-
-    this.getSelectionAnchor = function() {
-        if (this.$isEmpty)
-            return this.getSelectionLead()
-        else
-            return this.selectionAnchor.getPosition();
-    };
-
-    this.getSelectionLead = function() {
-        return this.selectionLead.getPosition();
-    };
-
-    this.shiftSelection = function(columns) {
-        if (this.$isEmpty) {
-            this.moveCursorTo(this.selectionLead.row, this.selectionLead.column + columns);
-            return;
-        };
-
-        var anchor = this.getSelectionAnchor();
-        var lead = this.getSelectionLead();
-
-        var isBackwards = this.isBackwards();
-
-        if (!isBackwards || anchor.column !== 0)
-            this.setSelectionAnchor(anchor.row, anchor.column + columns);
-
-        if (isBackwards || lead.column !== 0) {
-            this.$moveSelection(function() {
-                this.moveCursorTo(lead.row, lead.column + columns);
-            });
-        }
-    };
-
-    this.isBackwards = function() {
-        var anchor = this.selectionAnchor;
-        var lead = this.selectionLead;
-        return (anchor.row > lead.row || (anchor.row == lead.row && anchor.column > lead.column));
-    };
-
-    this.getRange = function() {
-        var anchor = this.selectionAnchor;
-        var lead = this.selectionLead;
-
-        if (this.isEmpty())
-            return Range.fromPoints(lead, lead);
-
-        if (this.isBackwards()) {
-            return Range.fromPoints(lead, anchor);
-        }
-        else {
-            return Range.fromPoints(anchor, lead);
-        }
-    };
-
-    this.clearSelection = function() {
-        if (!this.$isEmpty) {
-            this.$isEmpty = true;
-            this._dispatchEvent("changeSelection");
-        }
-    };
-
-    this.selectAll = function() {
-        var lastRow = this.doc.getLength() - 1;
-        this.setSelectionAnchor(lastRow, this.doc.getLine(lastRow).length);
-        this.moveCursorTo(0, 0);
-    };
-
-    this.setSelectionRange = function(range, reverse) {
-        if (reverse) {
-            this.setSelectionAnchor(range.end.row, range.end.column);
-            this.selectTo(range.start.row, range.start.column);
-        } else {
-            this.setSelectionAnchor(range.start.row, range.start.column);
-            this.selectTo(range.end.row, range.end.column);
-        }
-        this.$updateDesiredColumn();
-    };
-
-    this.$updateDesiredColumn = function() {
-        var cursor = this.getCursor();
-        this.$desiredColumn = this.session.documentToScreenColumn(cursor.row, cursor.column);
-    };
-
-    this.$moveSelection = function(mover) {
-        var lead = this.selectionLead;
-        if (this.$isEmpty)
-            this.setSelectionAnchor(lead.row, lead.column);
-
-        mover.call(this);
-    };
-
-    this.selectTo = function(row, column) {
-        this.$moveSelection(function() {
-            this.moveCursorTo(row, column);
-        });
-    };
-
-    this.selectToPosition = function(pos) {
-        this.$moveSelection(function() {
-            this.moveCursorToPosition(pos);
-        });
-    };
-
-    this.selectUp = function() {
-        this.$moveSelection(this.moveCursorUp);
-    };
-
-    this.selectDown = function() {
-        this.$moveSelection(this.moveCursorDown);
-    };
-
-    this.selectRight = function() {
-        this.$moveSelection(this.moveCursorRight);
-    };
-
-    this.selectLeft = function() {
-        this.$moveSelection(this.moveCursorLeft);
-    };
-
-    this.selectLineStart = function() {
-        this.$moveSelection(this.moveCursorLineStart);
-    };
-
-    this.selectLineEnd = function() {
-        this.$moveSelection(this.moveCursorLineEnd);
-    };
-
-    this.selectFileEnd = function() {
-        this.$moveSelection(this.moveCursorFileEnd);
-    };
-
-    this.selectFileStart = function() {
-        this.$moveSelection(this.moveCursorFileStart);
-    };
-
-    this.selectWordRight = function() {
-        this.$moveSelection(this.moveCursorWordRight);
-    };
-
-    this.selectWordLeft = function() {
-        this.$moveSelection(this.moveCursorWordLeft);
-    };
-
-    this.selectWord = function() {
-        var cursor = this.getCursor();
-        var range  = this.session.getWordRange(cursor.row, cursor.column);
-        this.setSelectionRange(range);
-    };
-
-    this.selectLine = function() {
-        var rowStart = this.selectionLead.row;
-        var rowEnd;
-
-        var foldLine = this.session.getFoldLine(rowStart);
-        if (foldLine) {
-            rowStart = foldLine.start.row;
-            rowEnd = foldLine.end.row;
-        } else {
-            rowEnd = rowStart;
-        }
-        this.setSelectionAnchor(rowStart, 0);
-        this.$moveSelection(function() {
-            this.moveCursorTo(rowEnd + 1, 0);
-        });
-    };
-
-    this.moveCursorUp = function() {
-        this.moveCursorBy(-1, 0);
-    };
-
-    this.moveCursorDown = function() {
-        this.moveCursorBy(1, 0);
-    };
-
-    this.moveCursorLeft = function() {
-        var cursor = this.selectionLead.getPosition(),
-            fold;
-
-        if (fold = this.session.getFoldAt(cursor.row, cursor.column, -1)) {
-            this.moveCursorTo(fold.start.row, fold.start.column);
-        } else if (cursor.column == 0) {
-            // cursor is a line (start
-            if (cursor.row > 0) {
-                this.moveCursorTo(cursor.row - 1, this.doc.getLine(cursor.row - 1).length);
-            }
-        }
-        else {
-            var tabSize = this.session.getTabSize();
-            if (this.session.isTabStop(cursor) && this.doc.getLine(cursor.row).slice(cursor.column-tabSize, cursor.column).split(" ").length-1 == tabSize)
-                this.moveCursorBy(0, -tabSize);
-            else
-                this.moveCursorBy(0, -1);
-        }
-    };
-
-    this.moveCursorRight = function() {
-        var cursor = this.selectionLead.getPosition(),
-            fold;
-        if (fold = this.session.getFoldAt(cursor.row, cursor.column, 1)) {
-            this.moveCursorTo(fold.end.row, fold.end.column);
-        }
-        else if (this.selectionLead.column == this.doc.getLine(this.selectionLead.row).length) {
-            if (this.selectionLead.row < this.doc.getLength() - 1) {
-                this.moveCursorTo(this.selectionLead.row + 1, 0);
-            }
-        }
-        else {
-            var tabSize = this.session.getTabSize();
-            var cursor = this.selectionLead;
-            if (this.session.isTabStop(cursor) && this.doc.getLine(cursor.row).slice(cursor.column, cursor.column+tabSize).split(" ").length-1 == tabSize)
-                this.moveCursorBy(0, tabSize);
-            else
-                this.moveCursorBy(0, 1);
-        }
-    };
-
-    this.moveCursorLineStart = function() {
-        var row = this.selectionLead.row;
-        var column = this.selectionLead.column;
-        var screenRow = this.session.documentToScreenRow(row, column);
-
-        // Determ the doc-position of the first character at the screen line.
-        var firstColumnPosition = this.session.screenToDocumentPosition(screenRow, 0);
-
-        // Determ the line
-        var beforeCursor = this.session.getDisplayLine(
-            row, null,
-            firstColumnPosition.row, firstColumnPosition.column
-        );
-
-        var leadingSpace = beforeCursor.match(/^\s*/);
-        if (leadingSpace[0].length == column) {
-            this.moveCursorTo(
-                firstColumnPosition.row, firstColumnPosition.column
-            );
-        }
-        else {
-            this.moveCursorTo(
-                firstColumnPosition.row,
-                firstColumnPosition.column + leadingSpace[0].length
-            );
-        }
-    };
-
-    this.moveCursorLineEnd = function() {
-        var lead = this.selectionLead;
-        var lastRowColumnPosition =
-            this.session.getDocumentLastRowColumnPosition(lead.row, lead.column);
-        this.moveCursorTo(
-            lastRowColumnPosition.row,
-            lastRowColumnPosition.column
-        );
-    };
-
-    this.moveCursorFileEnd = function() {
-        var row = this.doc.getLength() - 1;
-        var column = this.doc.getLine(row).length;
-        this.moveCursorTo(row, column);
-    };
-
-    this.moveCursorFileStart = function() {
-        this.moveCursorTo(0, 0);
-    };
-
-    this.moveCursorWordRight = function() {
-        var row = this.selectionLead.row;
-        var column = this.selectionLead.column;
-        var line = this.doc.getLine(row);
-        var rightOfCursor = line.substring(column);
-
-        var match;
-        this.session.nonTokenRe.lastIndex = 0;
-        this.session.tokenRe.lastIndex = 0;
-
-        var fold;
-        if (fold = this.session.getFoldAt(row, column, 1)) {
-            this.moveCursorTo(fold.end.row, fold.end.column);
-            return;
-        } else if (column == line.length) {
-            this.moveCursorRight();
-            return;
-        }
-        else if (match = this.session.nonTokenRe.exec(rightOfCursor)) {
-            column += this.session.nonTokenRe.lastIndex;
-            this.session.nonTokenRe.lastIndex = 0;
-        }
-        else if (match = this.session.tokenRe.exec(rightOfCursor)) {
-            column += this.session.tokenRe.lastIndex;
-            this.session.tokenRe.lastIndex = 0;
-        }
-
-        this.moveCursorTo(row, column);
-    };
-
-    this.moveCursorWordLeft = function() {
-        var row = this.selectionLead.row;
-        var column = this.selectionLead.column;
-
-        var fold;
-        if (fold = this.session.getFoldAt(row, column, -1)) {
-            this.moveCursorTo(fold.start.row, fold.start.column);
-            return;
-        }
-
-        if (column == 0) {
-            this.moveCursorLeft();
-            return;
-        }
-
-        var str = this.session.getFoldStringAt(row, column, -1);
-        if (str == null) {
-            str = this.doc.getLine(row).substring(0, column)
-        }
-        var leftOfCursor = lang.stringReverse(str);
-
-        var match;
-        this.session.nonTokenRe.lastIndex = 0;
-        this.session.tokenRe.lastIndex = 0;
-
-        if (match = this.session.nonTokenRe.exec(leftOfCursor)) {
-            column -= this.session.nonTokenRe.lastIndex;
-            this.session.nonTokenRe.lastIndex = 0;
-        }
-        else if (match = this.session.tokenRe.exec(leftOfCursor)) {
-            column -= this.session.tokenRe.lastIndex;
-            this.session.tokenRe.lastIndex = 0;
-        }
-
-        this.moveCursorTo(row, column);
-    };
-
-    this.moveCursorBy = function(rows, chars) {
-        var screenPos = this.session.documentToScreenPosition(
-            this.selectionLead.row,
-            this.selectionLead.column
-        );
-        var screenCol = (chars == 0 && this.$desiredColumn) || screenPos.column;
-        var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenCol);
-        this.moveCursorTo(docPos.row, docPos.column + chars, chars == 0);
-    };
-
-    this.moveCursorToPosition = function(position) {
-        this.moveCursorTo(position.row, position.column);
-    };
-
-    this.moveCursorTo = function(row, column, preventUpdateDesiredColumn) {
-        // Ensure the row/column is not inside of a fold.
-        var fold = this.session.getFoldAt(row, column, 1);
-        if (fold) {
-            row = fold.start.row;
-            column = fold.start.column;
-        }
-        
-        this.$preventUpdateDesiredColumnOnChange = true;
-        this.selectionLead.setPosition(row, column);
-        this.$preventUpdateDesiredColumnOnChange = false;
-        
-        if (!preventUpdateDesiredColumn)
-            this.$updateDesiredColumn(this.selectionLead.column);
-    };
-
-    this.moveCursorToScreen = function(row, column, preventUpdateDesiredColumn) {
-        var pos = this.session.screenToDocumentPosition(row, column);
-        row = pos.row;
-        column = pos.column;
-        this.moveCursorTo(row, column, preventUpdateDesiredColumn);
-    };
-
-}).call(Selection.prototype);
-
-exports.Selection = Selection;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/range', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-var Range = function(startRow, startColumn, endRow, endColumn) {
-    this.start = {
-        row: startRow,
-        column: startColumn
-    };
-
-    this.end = {
-        row: endRow,
-        column: endColumn
-    };
-};
-
-(function() {
-
-    this.toString = function() {
-        return ("Range: [" + this.start.row + "/" + this.start.column +
-            "] -> [" + this.end.row + "/" + this.end.column + "]");
-    };
-
-    this.contains = function(row, column) {
-        return this.compare(row, column) == 0;
-    };
-
-    /**
-     * Compares this range (A) with another range (B), where B is the passed in
-     * range.
-     *
-     * Return values:
-     *  -2: (B) is infront of (A) and doesn't intersect with (A)
-     *  -1: (B) begins before (A) but ends inside of (A)
-     *   0: (B) is completly inside of (A) OR (A) is complety inside of (B)
-     *  +1: (B) begins inside of (A) but ends outside of (A)
-     *  +2: (B) is after (A) and doesn't intersect with (A)
-     *
-     *  42: FTW state: (B) ends in (A) but starts outside of (A)
-     */
-    this.compareRange = function(range) {
-        var cmp,
-            end = range.end,
-            start = range.start;
-
-        cmp = this.compare(end.row, end.column);
-        if (cmp == 1) {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == 1) {
-                return 2;
-            } else if (cmp == 0) {
-                return 1;
-            } else {
-                return 0;
-            }
-        } else if (cmp == -1) {
-            return -2;
-        } else {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == -1) {
-                return -1;
-            } else if (cmp == 1) {
-                return 42;
-            } else {
-                return 0;
-            }
-        }
-    }
-
-    this.containsRange = function(range) {
-        var cmp = this.compareRange(range);
-        return (cmp == -1 || cmp == 0 || cmp == 1);
-    }
-
-    this.isEnd = function(row, column) {
-        return this.end.row == row && this.end.column == column;
-    }
-
-    this.isStart = function(row, column) {
-        return this.start.row == row && this.start.column == column;
-    }
-
-    this.setStart = function(row, column) {
-        if (typeof row == "object") {
-            this.start.column = row.column;
-            this.start.row = row.row;
-        } else {
-            this.start.row = row;
-            this.start.column = column;
-        }
-    }
-
-    this.setEnd = function(row, column) {
-        if (typeof row == "object") {
-            this.end.column = row.column;
-            this.end.row = row.row;
-        } else {
-            this.end.row = row;
-            this.end.column = column;
-        }
-    }
-
-    this.inside = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column) || this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideStart = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideEnd = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.compare = function(row, column) {
-        if (!this.isMultiLine()) {
-            if (row === this.start.row) {
-                return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0);
-            };
-        }
-
-        if (row < this.start.row)
-            return -1;
-
-        if (row > this.end.row)
-            return 1;
-
-        if (this.start.row === row)
-            return column >= this.start.column ? 0 : -1;
-
-        if (this.end.row === row)
-            return column <= this.end.column ? 0 : 1;
-
-        return 0;
-    };
-
-    /**
-     * Like .compare(), but if isStart is true, return -1;
-     */
-    this.compareStart = function(row, column) {
-        if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    /**
-     * Like .compare(), but if isEnd is true, return 1;
-     */
-    this.compareEnd = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.compareInside = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.clipRows = function(firstRow, lastRow) {
-        if (this.end.row > lastRow) {
-            var end = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row > lastRow) {
-            var start = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row < firstRow) {
-            var start = {
-                row: firstRow,
-                column: 0
-            };
-        }
-
-        if (this.end.row < firstRow) {
-            var end = {
-                row: firstRow,
-                column: 0
-            };
-        }
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.extend = function(row, column) {
-        var cmp = this.compare(row, column);
-
-        if (cmp == 0)
-            return this;
-        else if (cmp == -1)
-            var start = {row: row, column: column};
-        else
-            var end = {row: row, column: column};
-
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.isEmpty = function() {
-        return (this.start.row == this.end.row && this.start.column == this.end.column);
-    };
-
-    this.isMultiLine = function() {
-        return (this.start.row !== this.end.row);
-    };
-
-    this.clone = function() {
-        return Range.fromPoints(this.start, this.end);
-    };
-
-    this.collapseRows = function() {
-        if (this.end.column == 0)
-            return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0)
-        else
-            return new Range(this.start.row, 0, this.end.row, 0)
-    };
-
-    this.toScreenRange = function(session) {
-        var screenPosStart =
-            session.documentToScreenPosition(this.start);
-        var screenPosEnd =
-            session.documentToScreenPosition(this.end);
-
-        return new Range(
-            screenPosStart.row, screenPosStart.column,
-            screenPosEnd.row, screenPosEnd.column
-        );
-    };
-
-}).call(Range.prototype);
-
-
-Range.fromPoints = function(start, end) {
-    return new Range(start.row, start.column, end.row, end.column);
-};
-
-exports.Range = Range;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/text', ['require', 'exports', 'module' , 'ace/tokenizer', 'ace/mode/text_highlight_rules', 'ace/mode/behaviour', 'ace/unicode'], function(require, exports, module) {
-
-var Tokenizer = require("ace/tokenizer").Tokenizer;
-var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
-var Behaviour = require("ace/mode/behaviour").Behaviour;
-var unicode = require("ace/unicode");
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new TextHighlightRules().getRules());
-    this.$behaviour = new Behaviour();
-};
-
-(function() {
-
-    this.tokenRe = new RegExp("^["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]+", "g"
-    );
-    
-    this.nonTokenRe = new RegExp("^(?:[^"
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]|\s])+", "g"
-    );
-
-    this.getTokenizer = function() {
-        return this.$tokenizer;
-    };
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        return "";
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return false;
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-    
-    this.createWorker = function(session) {
-        return null;
-    };
-
-    this.highlightSelection = function(editor) {
-        var session = editor.session;
-        if (!session.$selectionOccurrences)
-            session.$selectionOccurrences = [];
-
-        if (session.$selectionOccurrences.length)
-            this.clearSelectionHighlight(editor);
-
-        var selection = editor.getSelectionRange();
-        if (selection.isEmpty() || selection.isMultiLine())
-            return;
-
-        var startOuter = selection.start.column - 1;
-        var endOuter = selection.end.column + 1;
-        var line = session.getLine(selection.start.row);
-        var lineCols = line.length;
-        var needle = line.substring(Math.max(startOuter, 0),
-                                    Math.min(endOuter, lineCols));
-
-        // Make sure the outer characters are not part of the word.
-        if ((startOuter >= 0 && /^[\w\d]/.test(needle)) ||
-            (endOuter <= lineCols && /[\w\d]$/.test(needle)))
-            return;
-
-        needle = line.substring(selection.start.column, selection.end.column);
-        if (!/^[\w\d]+$/.test(needle))
-            return;
-
-        var cursor = editor.getCursorPosition();
-
-        var newOptions = {
-            wrap: true,
-            wholeWord: true,
-            caseSensitive: true,
-            needle: needle
-        };
-
-        var currentOptions = editor.$search.getOptions();
-        editor.$search.set(newOptions);
-
-        var ranges = editor.$search.findAll(session);
-        ranges.forEach(function(range) {
-            if (!range.contains(cursor.row, cursor.column)) {
-                var marker = session.addMarker(range, "ace_selected_word", "text");
-                session.$selectionOccurrences.push(marker);
-            }
-        });
-
-        editor.$search.set(currentOptions);
-    };
-
-    this.clearSelectionHighlight = function(editor) {
-        if (!editor.session.$selectionOccurrences)
-            return;
-
-        editor.session.$selectionOccurrences.forEach(function(marker) {
-            editor.session.removeMarker(marker);
-        });
-
-        editor.session.$selectionOccurrences = [];
-    };
-    
-    this.createModeDelegates = function (mapping) {
-        if (!this.$embeds) {
-            return;
-        }
-        this.$modes = {};
-        for (var i = 0; i < this.$embeds.length; i++) {
-            if (mapping[this.$embeds[i]]) {
-                this.$modes[this.$embeds[i]] = new mapping[this.$embeds[i]]();
-            }
-        }
-        
-        var delegations = ['toggleCommentLines', 'getNextLineIndent', 'checkOutdent', 'autoOutdent', 'transformAction'];
-
-        for (var i = 0; i < delegations.length; i++) {
-            (function(scope) {
-              var functionName = delegations[i];
-              var defaultHandler = scope[functionName];
-              scope[delegations[i]] = function() {
-                  return this.$delegator(functionName, arguments, defaultHandler);
-              }
-            } (this));
-        }
-    }
-    
-    this.$delegator = function(method, args, defaultHandler) {
-        var state = args[0];
-        
-        for (var i = 0; i < this.$embeds.length; i++) {
-            if (!this.$modes[this.$embeds[i]]) continue;
-            
-            var split = state.split(this.$embeds[i]);
-            if (!split[0] && split[1]) {
-                args[0] = split[1];
-                var mode = this.$modes[this.$embeds[i]];
-                return mode[method].apply(mode, args);
-            }
-        }
-        var ret = defaultHandler.apply(this, args);
-        return defaultHandler ? ret : undefined;
-    };
-    
-    this.transformAction = function(state, action, editor, session, param) {
-        if (this.$behaviour) {
-            var behaviours = this.$behaviour.getBehaviours();
-            for (var key in behaviours) {
-                if (behaviours[key][action]) {
-                    var ret = behaviours[key][action].apply(this, arguments);
-                    if (ret !== false) {
-                        return ret;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-    
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/tokenizer', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-var Tokenizer = function(rules) {
-    this.rules = rules;
-
-    this.regExps = {};
-    this.matchMappings = {};
-    for ( var key in this.rules) {
-        var rule = this.rules[key];
-        var state = rule;
-        var ruleRegExps = [];
-        var matchTotal = 0;
-        var mapping = this.matchMappings[key] = {};
-        
-        for ( var i = 0; i < state.length; i++) {
-            // Count number of matching groups. 2 extra groups from the full match
-            // And the catch-all on the end (used to force a match);
-            var matchcount = new RegExp("(?:(" + state[i].regex + ")|(.))").exec("a").length - 2;
-        
-            // Replace any backreferences and offset appropriately.
-            var adjustedregex = state[i].regex.replace(/\\([0-9]+)/g, function (match, digit) {
-                return "\\" + (parseInt(digit, 10) + matchTotal + 1);
-            });
-            
-            mapping[matchTotal] = {
-                rule: i,
-                len: matchcount
-            };
-            matchTotal += matchcount;
-            
-            ruleRegExps.push(adjustedregex);
-        }
-
-        this.regExps[key] = new RegExp("(?:(" + ruleRegExps.join(")|(") + ")|(.))", "g");
-    }
-};
-
-(function() {
-
-    this.getLineTokens = function(line, startState) {
-        var currentState = startState;
-        var state = this.rules[currentState];
-        var mapping = this.matchMappings[currentState];
-        var re = this.regExps[currentState];
-        re.lastIndex = 0;
-        
-        var match, tokens = [];
-        
-        var lastIndex = 0;
-        
-        var token = {
-            type: null,
-            value: ""
-        };
-        
-        while (match = re.exec(line)) {
-            var type = "text";
-            var rule = null;
-            var value = [match[0]];
-
-            for (var i = 0; i < match.length-2; i++) {
-                if (match[i + 1] !== undefined) {
-                    rule = state[mapping[i].rule];
-                    
-                    if (mapping[i].len > 1) {
-                        value = match.slice(i+2, i+1+mapping[i].len);
-                    }
-                    
-                    // compute token type
-                    if (typeof rule.token == "function")
-                        type = rule.token.apply(this, value);
-                    else
-                        type = rule.token;
-
-                    var next = rule.next;                    
-                    if (next && next !== currentState) {
-                        currentState = next;
-                        state = this.rules[currentState];
-                        mapping = this.matchMappings[currentState];
-                        lastIndex = re.lastIndex;
-
-                        re = this.regExps[currentState];
-                        re.lastIndex = lastIndex;
-                    }
-                    break;
-                }
-            };
-
-            if (value[0]) {
-                if (typeof type == "string") {
-                    value = [value.join("")];
-                    type = [type];
-                }
-                for (var i = 0; i < value.length; i++) {
-                    if ((!rule || rule.merge || type[i] === "text") && token.type === type[i]) {
-                        token.value += value[i];
-                    } else {
-                        if (token.type) {
-                            tokens.push(token);
-                        }
-                    
-                        token = {
-                            type: type[i],
-                            value: value[i]
-                        }
-                    }
-                }
-            }
-            
-            if (lastIndex == line.length)
-                break;
-            
-            lastIndex = re.lastIndex;
-        };
-
-        if (token.type)
-            tokens.push(token);
-
-        return {
-            tokens : tokens,
-            state : currentState
-        };
-    };
-
-}).call(Tokenizer.prototype);
-
-exports.Tokenizer = Tokenizer;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/text_highlight_rules', ['require', 'exports', 'module' , 'pilot/lang'], function(require, exports, module) {
-
-var lang = require("pilot/lang");
-
-var TextHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [{
-            token : "empty_line",
-            regex : '^$'
-        }, {
-            token : "text",
-            regex : ".+"
-        }]
-    };
-};
-
-(function() {
-
-    this.addRules = function(rules, prefix) {
-        for (var key in rules) {
-            var state = rules[key];
-            for (var i=0; i<state.length; i++) {
-                var rule = state[i];
-                if (rule.next) {
-                    rule.next = prefix + rule.next;
-                } else {
-                    rule.next = prefix + key;
-                }
-            }
-            this.$rules[prefix + key] = state;
-        }
-    };
-
-    this.getRules = function() {
-        return this.$rules;
-    };
-    
-    this.embedRules = function (HighlightRules, prefix, escapeRules, states) {
-        var embedRules = new HighlightRules().getRules();
-        if (states) {
-            for (var i = 0; i < states.length; i++) {
-                states[i] = prefix + states[i];
-            }
-        } else {
-            states = [];
-            for (var key in embedRules) {
-                states.push(prefix + key);
-            }
-        }
-        this.addRules(embedRules, prefix);
-        
-        for (var i = 0; i < states.length; i++) {
-            Array.prototype.unshift.apply(this.$rules[states[i]], lang.deepCopy(escapeRules));
-        }
-        
-        if (!this.$embeds) {
-            this.$embeds = [];
-        }
-        this.$embeds.push(prefix);
-    }
-    
-    this.getEmbeds = function() {
-        return this.$embeds;
-    }
-
-}).call(TextHighlightRules.prototype);
-
-exports.TextHighlightRules = TextHighlightRules;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/mode/behaviour', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-var Behaviour = function() {
-   this.$behaviours = {};
-};
-
-(function () {
-
-    this.add = function (name, action, callback) {
-        switch (undefined) {
-          case this.$behaviours:
-              this.$behaviours = {};
-          case this.$behaviours[name]:
-              this.$behaviours[name] = {};
-        }
-        this.$behaviours[name][action] = callback;
-    }
-    
-    this.addBehaviours = function (behaviours) {
-        for (var key in behaviours) {
-            for (var action in behaviours[key]) {
-                this.add(key, action, behaviours[key][action]);
-            }
-        }
-    }
-    
-    this.remove = function (name) {
-        if (this.$behaviours && this.$behaviours[name]) {
-            delete this.$behaviours[name];
-        }
-    }
-    
-    this.inherit = function (mode, filter) {
-        if (typeof mode === "function") {
-            var behaviours = new mode().getBehaviours(filter);
-        } else {
-            var behaviours = mode.getBehaviours(filter);
-        }
-        this.addBehaviours(behaviours);
-    }
-    
-    this.getBehaviours = function (filter) {
-        if (!filter) {
-            return this.$behaviours;
-        } else {
-            var ret = {}
-            for (var i = 0; i < filter.length; i++) {
-                if (this.$behaviours[filter[i]]) {
-                    ret[filter[i]] = this.$behaviours[filter[i]];
-                }
-            }
-            return ret;
-        }
-    }
-
-}).call(Behaviour.prototype);
-
-exports.Behaviour = Behaviour;
-});define('ace/unicode', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-/*
-XRegExp Unicode plugin pack: Categories 1.0
-(c) 2010 Steven Levithan
-MIT License
-<http://xregexp.com>
-Uses the Unicode 5.2 character database
-
-This package for the XRegExp Unicode plugin enables the following Unicode categories (aka properties):
-
-L - Letter (the top-level Letter category is included in the Unicode plugin base script)
-    Ll - Lowercase letter
-    Lu - Uppercase letter
-    Lt - Titlecase letter
-    Lm - Modifier letter
-    Lo - Letter without case
-M - Mark
-    Mn - Non-spacing mark
-    Mc - Spacing combining mark
-    Me - Enclosing mark
-N - Number
-    Nd - Decimal digit
-    Nl - Letter number
-    No -  Other number
-P - Punctuation
-    Pd - Dash punctuation
-    Ps - Open punctuation
-    Pe - Close punctuation
-    Pi - Initial punctuation
-    Pf - Final punctuation
-    Pc - Connector punctuation
-    Po - Other punctuation
-S - Symbol
-    Sm - Math symbol
-    Sc - Currency symbol
-    Sk - Modifier symbol
-    So - Other symbol
-Z - Separator
-    Zs - Space separator
-    Zl - Line separator
-    Zp - Paragraph separator
-C - Other
-    Cc - Control
-    Cf - Format
-    Co - Private use
-    Cs - Surrogate
-    Cn - Unassigned
-
-Example usage:
-
-    \p{N}
-    \p{Cn}
-*/
-
-
-// will be populated by addUnicodePackage
-exports.packages = {};
-
-addUnicodePackage({
-    L:  "0041-005A0061-007A00AA00B500BA00C0-00D600D8-00F600F8-02C102C6-02D102E0-02E402EC02EE0370-037403760377037A-037D03860388-038A038C038E-03A103A3-03F503F7-0481048A-05250531-055605590561-058705D0-05EA05F0-05F20621-064A066E066F0671-06D306D506E506E606EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA07F407F507FA0800-0815081A082408280904-0939093D09500958-0961097109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E460E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EC60EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10A0-10C510D0-10FA10FC1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317D717DC1820-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541AA71B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C7D1CE9-1CEC1CEE-1CF11D00-1DBF1E00-1F151F18-1F1D1F20-1F451F48-1F4D1F50-1F571F591F5B1F5D1F5F-1F7D1F80-1FB41FB6-1FBC1FBE1FC2-1FC41FC6-1FCC1FD0-1FD31FD6-1FDB1FE0-1FEC1FF2-1FF41FF6-1FFC2071207F2090-209421022107210A-211321152119-211D212421262128212A-212D212F-2139213C-213F2145-2149214E218321842C00-2C2E2C30-2C5E2C60-2CE42CEB-2CEE2D00-2D252D30-2D652D6F2D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE2E2F300530063031-3035303B303C3041-3096309D-309F30A1-30FA30FC-30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A48CA4D0-A4FDA500-A60CA610-A61FA62AA62BA640-A65FA662-A66EA67F-A697A6A0-A6E5A717-A71FA722-A788A78BA78CA7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2A9CFAA00-AA28AA40-AA42AA44-AA4BAA60-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADB-AADDABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB00-FB06FB13-FB17FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF21-FF3AFF41-FF5AFF66-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",
-    Ll: "0061-007A00AA00B500BA00DF-00F600F8-00FF01010103010501070109010B010D010F01110113011501170119011B011D011F01210123012501270129012B012D012F01310133013501370138013A013C013E014001420144014601480149014B014D014F01510153015501570159015B015D015F01610163016501670169016B016D016F0171017301750177017A017C017E-0180018301850188018C018D019201950199-019B019E01A101A301A501A801AA01AB01AD01B001B401B601B901BA01BD-01BF01C601C901CC01CE01D001D201D401D601D801DA01DC01DD01DF01E101E301E501E701E901EB01ED01EF01F001F301F501F901FB01FD01FF02010203020502070209020B020D020F02110213021502170219021B021D021F02210223022502270229022B022D022F02310233-0239023C023F0240024202470249024B024D024F-02930295-02AF037103730377037B-037D039003AC-03CE03D003D103D5-03D703D903DB03DD03DF03E103E303E503E703E903EB03ED03EF-03F303F503F803FB03FC0430-045F04610463046504670469046B046D046F04710473047504770479047B047D047F0481048B048D048F04910493049504970499049B049D049F04A104A304A504A704A904AB04AD04AF04B104B304B504B704B904BB04BD04BF04C204C404C604C804CA04CC04CE04CF04D104D304D504D704D904DB04DD04DF04E104E304E504E704E904EB04ED04EF04F104F304F504F704F904FB04FD04FF05010503050505070509050B050D050F05110513051505170519051B051D051F0521052305250561-05871D00-1D2B1D62-1D771D79-1D9A1E011E031E051E071E091E0B1E0D1E0F1E111E131E151E171E191E1B1E1D1E1F1E211E231E251E271E291E2B1E2D1E2F1E311E331E351E371E391E3B1E3D1E3F1E411E431E451E471E491E4B1E4D1E4F1E511E531E551E571E591E5B1E5D1E5F1E611E631E651E671E691E6B1E6D1E6F1E711E731E751E771E791E7B1E7D1E7F1E811E831E851E871E891E8B1E8D1E8F1E911E931E95-1E9D1E9F1EA11EA31EA51EA71EA91EAB1EAD1EAF1EB11EB31EB51EB71EB91EBB1EBD1EBF1EC11EC31EC51EC71EC91ECB1ECD1ECF1ED11ED31ED51ED71ED91EDB1EDD1EDF1EE11EE31EE51EE71EE91EEB1EED1EEF1EF11EF31EF51EF71EF91EFB1EFD1EFF-1F071F10-1F151F20-1F271F30-1F371F40-1F451F50-1F571F60-1F671F70-1F7D1F80-1F871F90-1F971FA0-1FA71FB0-1FB41FB61FB71FBE1FC2-1FC41FC61FC71FD0-1FD31FD61FD71FE0-1FE71FF2-1FF41FF61FF7210A210E210F2113212F21342139213C213D2146-2149214E21842C30-2C5E2C612C652C662C682C6A2C6C2C712C732C742C76-2C7C2C812C832C852C872C892C8B2C8D2C8F2C912C932C952C972C992C9B2C9D2C9F2CA12CA32CA52CA72CA92CAB2CAD2CAF2CB12CB32CB52CB72CB92CBB2CBD2CBF2CC12CC32CC52CC72CC92CCB2CCD2CCF2CD12CD32CD52CD72CD92CDB2CDD2CDF2CE12CE32CE42CEC2CEE2D00-2D25A641A643A645A647A649A64BA64DA64FA651A653A655A657A659A65BA65DA65FA663A665A667A669A66BA66DA681A683A685A687A689A68BA68DA68FA691A693A695A697A723A725A727A729A72BA72DA72F-A731A733A735A737A739A73BA73DA73FA741A743A745A747A749A74BA74DA74FA751A753A755A757A759A75BA75DA75FA761A763A765A767A769A76BA76DA76FA771-A778A77AA77CA77FA781A783A785A787A78CFB00-FB06FB13-FB17FF41-FF5A",
-    Lu: "0041-005A00C0-00D600D8-00DE01000102010401060108010A010C010E01100112011401160118011A011C011E01200122012401260128012A012C012E01300132013401360139013B013D013F0141014301450147014A014C014E01500152015401560158015A015C015E01600162016401660168016A016C016E017001720174017601780179017B017D018101820184018601870189-018B018E-0191019301940196-0198019C019D019F01A001A201A401A601A701A901AC01AE01AF01B1-01B301B501B701B801BC01C401C701CA01CD01CF01D101D301D501D701D901DB01DE01E001E201E401E601E801EA01EC01EE01F101F401F6-01F801FA01FC01FE02000202020402060208020A020C020E02100212021402160218021A021C021E02200222022402260228022A022C022E02300232023A023B023D023E02410243-02460248024A024C024E03700372037603860388-038A038C038E038F0391-03A103A3-03AB03CF03D2-03D403D803DA03DC03DE03E003E203E403E603E803EA03EC03EE03F403F703F903FA03FD-042F04600462046404660468046A046C046E04700472047404760478047A047C047E0480048A048C048E04900492049404960498049A049C049E04A004A204A404A604A804AA04AC04AE04B004B204B404B604B804BA04BC04BE04C004C104C304C504C704C904CB04CD04D004D204D404D604D804DA04DC04DE04E004E204E404E604E804EA04EC04EE04F004F204F404F604F804FA04FC04FE05000502050405060508050A050C050E05100512051405160518051A051C051E0520052205240531-055610A0-10C51E001E021E041E061E081E0A1E0C1E0E1E101E121E141E161E181E1A1E1C1E1E1E201E221E241E261E281E2A1E2C1E2E1E301E321E341E361E381E3A1E3C1E3E1E401E421E441E461E481E4A1E4C1E4E1E501E521E541E561E581E5A1E5C1E5E1E601E621E641E661E681E6A1E6C1E6E1E701E721E741E761E781E7A1E7C1E7E1E801E821E841E861E881E8A1E8C1E8E1E901E921E941E9E1EA01EA21EA41EA61EA81EAA1EAC1EAE1EB01EB21EB41EB61EB81EBA1EBC1EBE1EC01EC21EC41EC61EC81ECA1ECC1ECE1ED01ED21ED41ED61ED81EDA1EDC1EDE1EE01EE21EE41EE61EE81EEA1EEC1EEE1EF01EF21EF41EF61EF81EFA1EFC1EFE1F08-1F0F1F18-1F1D1F28-1F2F1F38-1F3F1F48-1F4D1F591F5B1F5D1F5F1F68-1F6F1FB8-1FBB1FC8-1FCB1FD8-1FDB1FE8-1FEC1FF8-1FFB21022107210B-210D2110-211221152119-211D212421262128212A-212D2130-2133213E213F214521832C00-2C2E2C602C62-2C642C672C692C6B2C6D-2C702C722C752C7E-2C802C822C842C862C882C8A2C8C2C8E2C902C922C942C962C982C9A2C9C2C9E2CA02CA22CA42CA62CA82CAA2CAC2CAE2CB02CB22CB42CB62CB82CBA2CBC2CBE2CC02CC22CC42CC62CC82CCA2CCC2CCE2CD02CD22CD42CD62CD82CDA2CDC2CDE2CE02CE22CEB2CEDA640A642A644A646A648A64AA64CA64EA650A652A654A656A658A65AA65CA65EA662A664A666A668A66AA66CA680A682A684A686A688A68AA68CA68EA690A692A694A696A722A724A726A728A72AA72CA72EA732A734A736A738A73AA73CA73EA740A742A744A746A748A74AA74CA74EA750A752A754A756A758A75AA75CA75EA760A762A764A766A768A76AA76CA76EA779A77BA77DA77EA780A782A784A786A78BFF21-FF3A",
-    Lt: "01C501C801CB01F21F88-1F8F1F98-1F9F1FA8-1FAF1FBC1FCC1FFC",
-    Lm: "02B0-02C102C6-02D102E0-02E402EC02EE0374037A0559064006E506E607F407F507FA081A0824082809710E460EC610FC17D718431AA71C78-1C7D1D2C-1D611D781D9B-1DBF2071207F2090-20942C7D2D6F2E2F30053031-3035303B309D309E30FC-30FEA015A4F8-A4FDA60CA67FA717-A71FA770A788A9CFAA70AADDFF70FF9EFF9F",
-    Lo: "01BB01C0-01C3029405D0-05EA05F0-05F20621-063F0641-064A066E066F0671-06D306D506EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA0800-08150904-0939093D09500958-096109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E450E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10D0-10FA1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317DC1820-18421844-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C771CE9-1CEC1CEE-1CF12135-21382D30-2D652D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE3006303C3041-3096309F30A1-30FA30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A014A016-A48CA4D0-A4F7A500-A60BA610-A61FA62AA62BA66EA6A0-A6E5A7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2AA00-AA28AA40-AA42AA44-AA4BAA60-AA6FAA71-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADBAADCABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF66-FF6FFF71-FF9DFFA0-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",
-    M:  "0300-036F0483-04890591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DE-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0903093C093E-094E0951-0955096209630981-098309BC09BE-09C409C709C809CB-09CD09D709E209E30A01-0A030A3C0A3E-0A420A470A480A4B-0A4D0A510A700A710A750A81-0A830ABC0ABE-0AC50AC7-0AC90ACB-0ACD0AE20AE30B01-0B030B3C0B3E-0B440B470B480B4B-0B4D0B560B570B620B630B820BBE-0BC20BC6-0BC80BCA-0BCD0BD70C01-0C030C3E-0C440C46-0C480C4A-0C4D0C550C560C620C630C820C830CBC0CBE-0CC40CC6-0CC80CCA-0CCD0CD50CD60CE20CE30D020D030D3E-0D440D46-0D480D4A-0D4D0D570D620D630D820D830DCA0DCF-0DD40DD60DD8-0DDF0DF20DF30E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F3E0F3F0F71-0F840F860F870F90-0F970F99-0FBC0FC6102B-103E1056-1059105E-10601062-10641067-106D1071-10741082-108D108F109A-109D135F1712-17141732-1734175217531772177317B6-17D317DD180B-180D18A91920-192B1930-193B19B0-19C019C819C91A17-1A1B1A55-1A5E1A60-1A7C1A7F1B00-1B041B34-1B441B6B-1B731B80-1B821BA1-1BAA1C24-1C371CD0-1CD21CD4-1CE81CED1CF21DC0-1DE61DFD-1DFF20D0-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66F-A672A67CA67DA6F0A6F1A802A806A80BA823-A827A880A881A8B4-A8C4A8E0-A8F1A926-A92DA947-A953A980-A983A9B3-A9C0AA29-AA36AA43AA4CAA4DAA7BAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE3-ABEAABECABEDFB1EFE00-FE0FFE20-FE26",
-    Mn: "0300-036F0483-04870591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DF-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0902093C0941-0948094D0951-095509620963098109BC09C1-09C409CD09E209E30A010A020A3C0A410A420A470A480A4B-0A4D0A510A700A710A750A810A820ABC0AC1-0AC50AC70AC80ACD0AE20AE30B010B3C0B3F0B41-0B440B4D0B560B620B630B820BC00BCD0C3E-0C400C46-0C480C4A-0C4D0C550C560C620C630CBC0CBF0CC60CCC0CCD0CE20CE30D41-0D440D4D0D620D630DCA0DD2-0DD40DD60E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F71-0F7E0F80-0F840F860F870F90-0F970F99-0FBC0FC6102D-10301032-10371039103A103D103E10581059105E-10601071-1074108210851086108D109D135F1712-17141732-1734175217531772177317B7-17BD17C617C9-17D317DD180B-180D18A91920-19221927192819321939-193B1A171A181A561A58-1A5E1A601A621A65-1A6C1A73-1A7C1A7F1B00-1B031B341B36-1B3A1B3C1B421B6B-1B731B801B811BA2-1BA51BA81BA91C2C-1C331C361C371CD0-1CD21CD4-1CE01CE2-1CE81CED1DC0-1DE61DFD-1DFF20D0-20DC20E120E5-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66FA67CA67DA6F0A6F1A802A806A80BA825A826A8C4A8E0-A8F1A926-A92DA947-A951A980-A982A9B3A9B6-A9B9A9BCAA29-AA2EAA31AA32AA35AA36AA43AA4CAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE5ABE8ABEDFB1EFE00-FE0FFE20-FE26",
-    Mc: "0903093E-09400949-094C094E0982098309BE-09C009C709C809CB09CC09D70A030A3E-0A400A830ABE-0AC00AC90ACB0ACC0B020B030B3E0B400B470B480B4B0B4C0B570BBE0BBF0BC10BC20BC6-0BC80BCA-0BCC0BD70C01-0C030C41-0C440C820C830CBE0CC0-0CC40CC70CC80CCA0CCB0CD50CD60D020D030D3E-0D400D46-0D480D4A-0D4C0D570D820D830DCF-0DD10DD8-0DDF0DF20DF30F3E0F3F0F7F102B102C10311038103B103C105610571062-10641067-106D108310841087-108C108F109A-109C17B617BE-17C517C717C81923-19261929-192B193019311933-193819B0-19C019C819C91A19-1A1B1A551A571A611A631A641A6D-1A721B041B351B3B1B3D-1B411B431B441B821BA11BA61BA71BAA1C24-1C2B1C341C351CE11CF2A823A824A827A880A881A8B4-A8C3A952A953A983A9B4A9B5A9BAA9BBA9BD-A9C0AA2FAA30AA33AA34AA4DAA7BABE3ABE4ABE6ABE7ABE9ABEAABEC",
-    Me: "0488048906DE20DD-20E020E2-20E4A670-A672",
-    N:  "0030-003900B200B300B900BC-00BE0660-066906F0-06F907C0-07C90966-096F09E6-09EF09F4-09F90A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BF20C66-0C6F0C78-0C7E0CE6-0CEF0D66-0D750E50-0E590ED0-0ED90F20-0F331040-10491090-10991369-137C16EE-16F017E0-17E917F0-17F91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C5920702074-20792080-20892150-21822185-21892460-249B24EA-24FF2776-27932CFD30073021-30293038-303A3192-31953220-32293251-325F3280-328932B1-32BFA620-A629A6E6-A6EFA830-A835A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",
-    Nd: "0030-00390660-066906F0-06F907C0-07C90966-096F09E6-09EF0A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BEF0C66-0C6F0CE6-0CEF0D66-0D6F0E50-0E590ED0-0ED90F20-0F291040-10491090-109917E0-17E91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C59A620-A629A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",
-    Nl: "16EE-16F02160-21822185-218830073021-30293038-303AA6E6-A6EF",
-    No: "00B200B300B900BC-00BE09F4-09F90BF0-0BF20C78-0C7E0D70-0D750F2A-0F331369-137C17F0-17F920702074-20792080-20892150-215F21892460-249B24EA-24FF2776-27932CFD3192-31953220-32293251-325F3280-328932B1-32BFA830-A835",
-    P:  "0021-00230025-002A002C-002F003A003B003F0040005B-005D005F007B007D00A100AB00B700BB00BF037E0387055A-055F0589058A05BE05C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F3A-0F3D0F850FD0-0FD4104A-104F10FB1361-13681400166D166E169B169C16EB-16ED1735173617D4-17D617D8-17DA1800-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD32010-20272030-20432045-20512053-205E207D207E208D208E2329232A2768-277527C527C627E6-27EF2983-299829D8-29DB29FC29FD2CF9-2CFC2CFE2CFF2E00-2E2E2E302E313001-30033008-30113014-301F3030303D30A030FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFD3EFD3FFE10-FE19FE30-FE52FE54-FE61FE63FE68FE6AFE6BFF01-FF03FF05-FF0AFF0C-FF0FFF1AFF1BFF1FFF20FF3B-FF3DFF3FFF5BFF5DFF5F-FF65",
-    Pd: "002D058A05BE140018062010-20152E172E1A301C303030A0FE31FE32FE58FE63FF0D",
-    Ps: "0028005B007B0F3A0F3C169B201A201E2045207D208D23292768276A276C276E27702772277427C527E627E827EA27EC27EE2983298529872989298B298D298F299129932995299729D829DA29FC2E222E242E262E283008300A300C300E3010301430163018301A301DFD3EFE17FE35FE37FE39FE3BFE3DFE3FFE41FE43FE47FE59FE5BFE5DFF08FF3BFF5BFF5FFF62",
-    Pe: "0029005D007D0F3B0F3D169C2046207E208E232A2769276B276D276F27712773277527C627E727E927EB27ED27EF298429862988298A298C298E2990299229942996299829D929DB29FD2E232E252E272E293009300B300D300F3011301530173019301B301E301FFD3FFE18FE36FE38FE3AFE3CFE3EFE40FE42FE44FE48FE5AFE5CFE5EFF09FF3DFF5DFF60FF63",
-    Pi: "00AB2018201B201C201F20392E022E042E092E0C2E1C2E20",
-    Pf: "00BB2019201D203A2E032E052E0A2E0D2E1D2E21",
-    Pc: "005F203F20402054FE33FE34FE4D-FE4FFF3F",
-    Po: "0021-00230025-0027002A002C002E002F003A003B003F0040005C00A100B700BF037E0387055A-055F058905C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F850FD0-0FD4104A-104F10FB1361-1368166D166E16EB-16ED1735173617D4-17D617D8-17DA1800-18051807-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD3201620172020-20272030-2038203B-203E2041-20432047-205120532055-205E2CF9-2CFC2CFE2CFF2E002E012E06-2E082E0B2E0E-2E162E182E192E1B2E1E2E1F2E2A-2E2E2E302E313001-3003303D30FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFE10-FE16FE19FE30FE45FE46FE49-FE4CFE50-FE52FE54-FE57FE5F-FE61FE68FE6AFE6BFF01-FF03FF05-FF07FF0AFF0CFF0EFF0FFF1AFF1BFF1FFF20FF3CFF61FF64FF65",
-    S:  "0024002B003C-003E005E0060007C007E00A2-00A900AC00AE-00B100B400B600B800D700F702C2-02C502D2-02DF02E5-02EB02ED02EF-02FF03750384038503F604820606-0608060B060E060F06E906FD06FE07F609F209F309FA09FB0AF10B700BF3-0BFA0C7F0CF10CF20D790E3F0F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-139917DB194019E0-19FF1B61-1B6A1B74-1B7C1FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE20442052207A-207C208A-208C20A0-20B8210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B2140-2144214A-214D214F2190-2328232B-23E82400-24262440-244A249C-24E92500-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE27C0-27C427C7-27CA27CC27D0-27E527F0-29822999-29D729DC-29FB29FE-2B4C2B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F309B309C319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A700-A716A720A721A789A78AA828-A82BA836-A839AA77-AA79FB29FDFCFDFDFE62FE64-FE66FE69FF04FF0BFF1C-FF1EFF3EFF40FF5CFF5EFFE0-FFE6FFE8-FFEEFFFCFFFD",
-    Sm: "002B003C-003E007C007E00AC00B100D700F703F60606-060820442052207A-207C208A-208C2140-2144214B2190-2194219A219B21A021A321A621AE21CE21CF21D221D421F4-22FF2308-230B23202321237C239B-23B323DC-23E125B725C125F8-25FF266F27C0-27C427C7-27CA27CC27D0-27E527F0-27FF2900-29822999-29D729DC-29FB29FE-2AFF2B30-2B442B47-2B4CFB29FE62FE64-FE66FF0BFF1C-FF1EFF5CFF5EFFE2FFE9-FFEC",
-    Sc: "002400A2-00A5060B09F209F309FB0AF10BF90E3F17DB20A0-20B8A838FDFCFE69FF04FFE0FFE1FFE5FFE6",
-    Sk: "005E006000A800AF00B400B802C2-02C502D2-02DF02E5-02EB02ED02EF-02FF0375038403851FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE309B309CA700-A716A720A721A789A78AFF3EFF40FFE3",
-    So: "00A600A700A900AE00B000B60482060E060F06E906FD06FE07F609FA0B700BF3-0BF80BFA0C7F0CF10CF20D790F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-1399194019E0-19FF1B61-1B6A1B74-1B7C210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B214A214C214D214F2195-2199219C-219F21A121A221A421A521A7-21AD21AF-21CD21D021D121D321D5-21F32300-2307230C-231F2322-2328232B-237B237D-239A23B4-23DB23E2-23E82400-24262440-244A249C-24E92500-25B625B8-25C025C2-25F72600-266E2670-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE2800-28FF2B00-2B2F2B452B462B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A828-A82BA836A837A839AA77-AA79FDFDFFE4FFE8FFEDFFEEFFFCFFFD",
-    Z:  "002000A01680180E2000-200A20282029202F205F3000",
-    Zs: "002000A01680180E2000-200A202F205F3000",
-    Zl: "2028",
-    Zp: "2029",
-    C:  "0000-001F007F-009F00AD03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-0605061C061D0620065F06DD070E070F074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17B417B517DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF200B-200F202A-202E2060-206F20722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-F8FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFD-FF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFFBFFFEFFFF",
-    Cc: "0000-001F007F-009F",
-    Cf: "00AD0600-060306DD070F17B417B5200B-200F202A-202E2060-2064206A-206FFEFFFFF9-FFFB",
-    Co: "E000-F8FF",
-    Cs: "D800-DFFF",
-    Cn: "03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-05FF06040605061C061D0620065F070E074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF2065-206920722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-D7FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFDFEFEFF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFF8FFFEFFFF"
-});
-
-function addUnicodePackage (pack) {
-    var codePoint = /\w{4}/g;
-    for (var name in pack)
-        exports.packages[name] = pack[name].replace(codePoint, "\\u$&");
-};
-
-});/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/document', ['require', 'exports', 'module' , 'pilot/oop', 'pilot/event_emitter', 'ace/range', 'ace/anchor'], function(require, exports, module) {
-
-var oop = require("pilot/oop");
-var EventEmitter = require("pilot/event_emitter").EventEmitter;
-var Range = require("ace/range").Range;
-var Anchor = require("ace/anchor").Anchor;
-
-var Document = function(text) {
-    this.$lines = [];
-
-    if (Array.isArray(text)) {
-        this.insertLines(0, text);
-    }
-    // There has to be one line at least in the document. If you pass an empty
-    // string to the insert function, nothing will happen. Workaround.
-    else if (text.length == 0) {
-        this.$lines = [""];
-    } else {
-        this.insert({row: 0, column:0}, text);
-    }
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.setValue = function(text) {
-        var len = this.getLength();
-        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
-        this.insert({row: 0, column:0}, text);
-    };
-
-    this.getValue = function() {
-        return this.getAllLines().join(this.getNewLineCharacter());
-    };
-
-    this.createAnchor = function(row, column) {
-        return new Anchor(this, row, column);
-    };
-
-    // check for IE split bug
-    if ("aaa".split(/a/).length == 0)
-        this.$split = function(text) {
-            return text.replace(/\r\n|\r/g, "\n").split("\n");
-        }
-    else
-        this.$split = function(text) {
-            return text.split(/\r\n|\r|\n/);
-        };
-
-
-    this.$detectNewLine = function(text) {
-        var match = text.match(/^.*?(\r?\n)/m);
-        if (match) {
-            this.$autoNewLine = match[1];
-        } else {
-            this.$autoNewLine = "\n";
-        }
-    };
-
-    this.getNewLineCharacter = function() {
-      switch (this.$newLineMode) {
-          case "windows":
-              return "\r\n";
-
-          case "unix":
-              return "\n";
-
-          case "auto":
-              return this.$autoNewLine;
-      }
-    },
-
-    this.$autoNewLine = "\n";
-    this.$newLineMode = "auto";
-    this.setNewLineMode = function(newLineMode) {
-        if (this.$newLineMode === newLineMode) return;
-
-        this.$newLineMode = newLineMode;
-    };
-
-    this.getNewLineMode = function() {
-        return this.$newLineMode;
-    };
-
-    this.isNewLine = function(text) {
-        return (text == "\r\n" || text == "\r" || text == "\n");
-    };
-
-    /**
-     * Get a verbatim copy of the given line as it is in the document
-     */
-    this.getLine = function(row) {
-        return this.$lines[row] || "";
-    };
-
-    this.getLines = function(firstRow, lastRow) {
-        return this.$lines.slice(firstRow, lastRow + 1);
-    };
-
-    /**
-     * Returns all lines in the document as string array. Warning: The caller
-     * should not modify this array!
-     */
-    this.getAllLines = function() {
-        return this.getLines(0, this.getLength());
-    };
-
-    this.getLength = function() {
-        return this.$lines.length;
-    };
-
-    this.getTextRange = function(range) {
-        if (range.start.row == range.end.row) {
-            return this.$lines[range.start.row].substring(range.start.column,
-                                                         range.end.column);
-        }
-        else {
-            var lines = [];
-            lines.push(this.$lines[range.start.row].substring(range.start.column));
-            lines.push.apply(lines, this.getLines(range.start.row+1, range.end.row-1));
-            lines.push(this.$lines[range.end.row].substring(0, range.end.column));
-            return lines.join(this.getNewLineCharacter());
-        }
-    };
-
-    this.$clipPosition = function(position) {
-        var length = this.getLength();
-        if (position.row >= length) {
-            position.row = Math.max(0, length - 1);
-            position.column = this.getLine(length-1).length;
-        }
-        return position;
-    }
-
-    this.insert = function(position, text) {
-        if (text.length == 0)
-            return position;
-
-        position = this.$clipPosition(position);
-
-        if (this.getLength() <= 1)
-            this.$detectNewLine(text);
-
-        var lines = this.$split(text);
-        var firstLine = lines.splice(0, 1)[0];
-        var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
-
-        position = this.insertInLine(position, firstLine);
-        if (lastLine !== null) {
-            position = this.insertNewLine(position); // terminate first line
-            position = this.insertLines(position.row, lines);
-            position = this.insertInLine(position, lastLine || "");
-        }
-        return position;
-    };
-
-    this.insertLines = function(row, lines) {
-        if (lines.length == 0)
-            return {row: row, column: 0};
-
-        var args = [row, 0];
-        args.push.apply(args, lines);
-        this.$lines.splice.apply(this.$lines, args);
-
-        var range = new Range(row, 0, row + lines.length, 0);
-        var delta = {
-            action: "insertLines",
-            range: range,
-            lines: lines
-        };
-        this._dispatchEvent("change", { data: delta });
-        return range.end;
-    },
-
-    this.insertNewLine = function(position) {
-        position = this.$clipPosition(position);
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column);
-        this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
-
-        var end = {
-            row : position.row + 1,
-            column : 0
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: this.getNewLineCharacter()
-        };
-        this._dispatchEvent("change", { data: delta });
-
-        return end;
-    };
-
-    this.insertInLine = function(position, text) {
-        if (text.length == 0)
-            return position;
-
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column) + text
-                + line.substring(position.column);
-
-        var end = {
-            row : position.row,
-            column : position.column + text.length
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: text
-        };
-        this._dispatchEvent("change", { data: delta });
-
-        return end;
-    };
-
-    this.remove = function(range) {
-        // clip to document
-        range.start = this.$clipPosition(range.start);
-        range.end = this.$clipPosition(range.end);
-
-        if (range.isEmpty())
-            return range.start;
-
-        var firstRow = range.start.row;
-        var lastRow = range.end.row;
-
-        if (range.isMultiLine()) {
-            var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
-            var lastFullRow = lastRow - 1;
-
-            if (range.end.column > 0)
-                this.removeInLine(lastRow, 0, range.end.column);
-
-            if (lastFullRow >= firstFullRow)
-                this.removeLines(firstFullRow, lastFullRow);
-
-            if (firstFullRow != firstRow) {
-                this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length);
-                this.removeNewLine(range.start.row);
-            }
-        }
-        else {
-            this.removeInLine(firstRow, range.start.column, range.end.column);
-        }
-        return range.start;
-    };
-
-    this.removeInLine = function(row, startColumn, endColumn) {
-        if (startColumn == endColumn)
-            return;
-
-        var range = new Range(row, startColumn, row, endColumn);
-        var line = this.getLine(row);
-        var removed = line.substring(startColumn, endColumn);
-        var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
-        this.$lines.splice(row, 1, newLine);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: removed
-        };
-        this._dispatchEvent("change", { data: delta });
-        return range.start;
-    };
-
-    /**
-     * Removes a range of full lines
-     *
-     * @param firstRow {Integer} The first row to be removed
-     * @param lastRow {Integer} The last row to be removed
-     * @return {String[]} The removed lines
-     */
-    this.removeLines = function(firstRow, lastRow) {
-        var range = new Range(firstRow, 0, lastRow + 1, 0);
-        var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
-
-        var delta = {
-            action: "removeLines",
-            range: range,
-            nl: this.getNewLineCharacter(),
-            lines: removed
-        };
-        this._dispatchEvent("change", { data: delta });
-        return removed;
-    };
-
-    this.removeNewLine = function(row) {
-        var firstLine = this.getLine(row);
-        var secondLine = this.getLine(row+1);
-
-        var range = new Range(row, firstLine.length, row+1, 0);
-        var line = firstLine + secondLine;
-
-        this.$lines.splice(row, 2, line);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: this.getNewLineCharacter()
-        };
-        this._dispatchEvent("change", { data: delta });
-    };
-
-    this.replace = function(range, text) {
-        if (text.length == 0 && range.isEmpty())
-            return range.start;
-
-        // Shortcut: If the text we want to insert is the same as it is already
-        // in the document, we don't have to replace anything.
-        if (text == this.getTextRange(range))
-            return range.end;
-
-        this.remove(range);
-        if (text) {
-            var end = this.insert(range.start, text);
-        }
-        else {
-            end = range.start;
-        }
-
-        return end;
-    };
-
-    this.applyDeltas = function(deltas) {
-        for (var i=0; i<deltas.length; i++) {
-            var delta = deltas[i];
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.insertLines(range.start.row, delta.lines)
-            else if (delta.action == "insertText")
-                this.insert(range.start, delta.text)
-            else if (delta.action == "removeLines")
-                this.removeLines(range.start.row, range.end.row - 1)
-            else if (delta.action == "removeText")
-                this.remove(range)
-        }
-    };
-
-    this.revertDeltas = function(deltas) {
-        for (var i=deltas.length-1; i>=0; i--) {
-            var delta = deltas[i];
-
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.removeLines(range.start.row, range.end.row - 1)
-            else if (delta.action == "insertText")
-                this.remove(range)
-            else if (delta.action == "removeLines")
-                this.insertLines(range.start.row, delta.lines)
-            else if (delta.action == "removeText")
-                this.insert(range.start, delta.text)
-        }
-    };
-
-}).call(Document.prototype);
-
-exports.Document = Document;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/anchor', ['require', 'exports', 'module' , 'pilot/oop', 'pilot/event_emitter'], function(require, exports, module) {
-
-var oop = require("pilot/oop");
-var EventEmitter = require("pilot/event_emitter").EventEmitter;
-
-/**
- * An Anchor is a floating pointer in the document. Whenever text is inserted or
- * deleted before the cursor, the position of the cursor is updated
- */
-var Anchor = exports.Anchor = function(doc, row, column) {
-    this.document = doc;
-    
-    if (typeof column == "undefined")
-        this.setPosition(row.row, row.column);
-    else
-        this.setPosition(row, column);
-
-    this.$onChange = this.onChange.bind(this);
-    doc.on("change", this.$onChange);
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-    
-    this.getPosition = function() {
-        return this.$clipPositionToDocument(this.row, this.column);
-    };
-    
-    this.getDocument = function() {
-        return this.document;
-    };
-    
-    this.onChange = function(e) {
-        var delta = e.data;
-        var range = delta.range;
-            
-        if (range.start.row == range.end.row && range.start.row != this.row)
-            return;
-            
-        if (range.start.row > this.row)
-            return;
-            
-        if (range.start.row == this.row && range.start.column > this.column)
-            return;
-    
-        var row = this.row;
-        var column = this.column;
-        
-        if (delta.action === "insertText") {
-            if (range.start.row === row && range.start.column <= column) {
-                if (range.start.row === range.end.row) {
-                    column += range.end.column - range.start.column;
-                }
-                else {
-                    column -= range.start.column;
-                    row += range.end.row - range.start.row;
-                }
-            }
-            else if (range.start.row !== range.end.row && range.start.row < row) {
-                row += range.end.row - range.start.row;
-            }
-        } else if (delta.action === "insertLines") {
-            if (range.start.row <= row) {
-                row += range.end.row - range.start.row;
-            }
-        }
-        else if (delta.action == "removeText") {
-            if (range.start.row == row && range.start.column < column) {
-                if (range.end.column >= column)
-                    column = range.start.column;
-                else
-                    column = Math.max(0, column - (range.end.column - range.start.column));
-                
-            } else if (range.start.row !== range.end.row && range.start.row < row) {
-                if (range.end.row == row) {
-                    column = Math.max(0, column - range.end.column) + range.start.column;
-                }
-                row -= (range.end.row - range.start.row);
-            }
-            else if (range.end.row == row) {
-                row -= range.end.row - range.start.row;
-                column = Math.max(0, column - range.end.column) + range.start.column;
-            }
-        } else if (delta.action == "removeLines") {
-            if (range.start.row <= row) {
-                if (range.end.row <= row)
-                    row -= range.end.row - range.start.row;
-                else {
-                    row = range.start.row;
-                    column = 0;
-                }
-            }
-        }
-
-        this.setPosition(row, column, true);
-    };
-
-    this.setPosition = function(row, column, noClip) {
-        var pos;
-        if (noClip) {
-            pos = {
-                row: row,
-                column: column
-            };
-        }
-        else {
-            pos = this.$clipPositionToDocument(row, column);
-        }
-        
-        if (this.row == pos.row && this.column == pos.column)
-            return;
-            
-        var old = {
-            row: this.row,
-            column: this.column
-        };
-        
-        this.row = pos.row;
-        this.column = pos.column;
-        this._dispatchEvent("change", {
-            old: old,
-            value: pos
-        });
-    };
-    
-    this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
-    };
-    
-    this.$clipPositionToDocument = function(row, column) {
-        var pos = {};
-    
-        if (row >= this.document.getLength()) {
-            pos.row = Math.max(0, this.document.getLength() - 1);
-            pos.column = this.document.getLine(pos.row).length;
-        }
-        else if (row < 0) {
-            pos.row = 0;
-            pos.column = 0;
-        }
-        else {
-            pos.row = row;
-            pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
-        }
-        
-        if (column < 0)
-            pos.column = 0;
-            
-        return pos;
-    };
-    
-}).call(Anchor.prototype);
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/background_tokenizer', ['require', 'exports', 'module' , 'pilot/oop', 'pilot/event_emitter'], function(require, exports, module) {
-
-var oop = require("pilot/oop");
-var EventEmitter = require("pilot/event_emitter").EventEmitter;
-
-var BackgroundTokenizer = function(tokenizer, editor) {
-    this.running = false;    
-    this.lines = [];
-    this.currentLine = 0;
-    this.tokenizer = tokenizer;
-
-    var self = this;
-
-    this.$worker = function() {
-        if (!self.running) { return; }
-
-        var workerStart = new Date();
-        var startLine = self.currentLine;
-        var doc = self.doc;
-
-        var processedLines = 0;
-
-        var len = doc.getLength();
-        while (self.currentLine < len) {
-            self.lines[self.currentLine] = self.$tokenizeRows(self.currentLine, self.currentLine)[0];
-            self.currentLine++;
-
-            // only check every 5 lines
-            processedLines += 1;
-            if ((processedLines % 5 == 0) && (new Date() - workerStart) > 20) {
-                self.fireUpdateEvent(startLine, self.currentLine-1);
-                self.running = setTimeout(self.$worker, 20);
-                return;
-            }
-        }
-
-        self.running = false;
-
-        self.fireUpdateEvent(startLine, len - 1);
-    };
-};
-
-(function(){
-
-    oop.implement(this, EventEmitter);
-
-    this.setTokenizer = function(tokenizer) {
-        this.tokenizer = tokenizer;
-        this.lines = [];
-
-        this.start(0);
-    };
-
-    this.setDocument = function(doc) {
-        this.doc = doc;
-        this.lines = [];
-
-        this.stop();
-    };
-
-    this.fireUpdateEvent = function(firstRow, lastRow) {
-        var data = {
-            first: firstRow,
-            last: lastRow
-        };
-        this._dispatchEvent("update", {data: data});
-    };
-
-    this.start = function(startRow) {
-        this.currentLine = Math.min(startRow || 0, this.currentLine,
-                                    this.doc.getLength());
-
-        // remove all cached items below this line
-        this.lines.splice(this.currentLine, this.lines.length);
-
-        this.stop();
-        // pretty long delay to prevent the tokenizer from interfering with the user
-        this.running = setTimeout(this.$worker, 700);
-    };
-
-    this.stop = function() {
-        if (this.running)
-            clearTimeout(this.running);
-        this.running = false;
-    };
-
-    this.getTokens = function(firstRow, lastRow) {
-        return this.$tokenizeRows(firstRow, lastRow);
-    };
-
-    this.getState = function(row) {
-        return this.$tokenizeRows(row, row)[0].state;
-    };
-
-    this.$tokenizeRows = function(firstRow, lastRow) {
-        if (!this.doc)
-            return [];
-            
-        var rows = [];
-
-        // determine start state
-        var state = "start";
-        var doCache = false;
-        if (firstRow > 0 && this.lines[firstRow - 1]) {
-            state = this.lines[firstRow - 1].state;
-            doCache = true;
-        } else if (firstRow == 0) {
-            state = "start";
-            doCache = true;
-        } else if (this.lines.length > 0) {
-            // Guess that we haven't changed state.
-            state = this.lines[this.lines.length-1].state;
-        }
-
-        var lines = this.doc.getLines(firstRow, lastRow);
-        for (var row=firstRow; row<=lastRow; row++) {
-            if (!this.lines[row]) {
-                var tokens = this.tokenizer.getLineTokens(lines[row-firstRow] || "", state);
-                var state = tokens.state;
-                rows.push(tokens);
-
-                if (doCache) {
-                    this.lines[row] = tokens;
-                }
-            }
-            else {
-                var tokens = this.lines[row];
-                state = tokens.state;
-                rows.push(tokens);
-            }
-        }
-        return rows;
-    };
-
-}).call(BackgroundTokenizer.prototype);
-
-exports.BackgroundTokenizer = BackgroundTokenizer;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/edit_session/folding', ['require', 'exports', 'module' , 'ace/range', 'ace/edit_session/fold_line', 'ace/edit_session/fold'], function(require, exports, module) {
-
-var Range = require("ace/range").Range;
-var FoldLine = require("ace/edit_session/fold_line").FoldLine;
-var Fold = require("ace/edit_session/fold").Fold;
-
-function Folding() {
-    /**
-     * Looks up a fold at a given row/column. Possible values for side:
-     *   -1: ignore a fold if fold.start = row/column
-     *   +1: ignore a fold if fold.end = row/column
-     */
-    this.getFoldAt = function(row, column, side) {
-        var foldLine = this.getFoldLine(row);
-        if (!foldLine)
-            return null;
-            
-        var folds = foldLine.folds;
-        for (var i = 0; i < folds.length; i++) {
-            var fold = folds[i];
-            if (fold.range.contains(row, column)) {
-                if (side == 1 && fold.range.isEnd(row, column)) {
-                    continue;
-                } else if (side == -1 && fold.range.isStart(row, column)) {
-                    continue;
-                }
-                return fold;
-            }
-        }
-    };
-
-    /**
-     * Returns all folds in the given range. Note, that this will return folds
-     *
-     */
-    this.getFoldsInRange = function(range) {
-        range = range.clone();
-        var start = range.start;
-        var end = range.end;
-        var foldLines = this.$foldData;
-        var foundFolds = [];
-
-        start.column += 1;
-        end.column -= 1;
-
-        for (var i = 0; i < foldLines.length; i++) {
-            var cmp = foldLines[i].range.compareRange(range);
-            if (cmp == 2) {
-                // Range is before foldLine. No intersection. This means,
-                // there might be other foldLines that intersect.
-                continue;
-            }
-            else if (cmp == -2) {
-                // Range is after foldLine. There can't be any other foldLines then,
-                // so let's give up.
-                break;
-            }
-
-            var folds = foldLines[i].folds;
-            for (var j = 0; j < folds.length; j++) {
-                var fold = folds[j];
-                cmp = fold.range.compareRange(range);
-                if (cmp == -2) {
-                    break;
-                } else if (cmp == 2) {
-                    continue;
-                } else
-                // WTF-state: Can happen due to -1/+1 to start/end column.
-                if (cmp == 42) {
-                    break;
-                }
-                foundFolds.push(fold);
-            }
-        }
-        return foundFolds;
-    }
-
-    /**
-     * Returns the string between folds at the given position.
-     * E.g.
-     *  foo<fold>b|ar<fold>wolrd -> "bar"
-     *  foo<fold>bar<fold>wol|rd -> "world"
-     *  foo<fold>bar<fo|ld>wolrd -> <null>
-     *
-     * where | means the position of row/column
-     *
-     * The trim option determs if the return string should be trimed according
-     * to the "side" passed with the trim value:
-     *
-     * E.g.
-     *  foo<fold>b|ar<fold>wolrd -trim=-1> "b"
-     *  foo<fold>bar<fold>wol|rd -trim=+1> "rld"
-     *  fo|o<fold>bar<fold>wolrd -trim=00> "foo"
-     */
-    this.getFoldStringAt = function(row, column, trim, foldLine) {
-        var foldLine = foldLine || this.getFoldLine(row);
-        if (!foldLine)
-            return null;
-            
-        var lastFold = {
-            end: { column: 0 }
-        };
-        // TODO: Refactor to use getNextFoldTo function.
-        for (var i = 0; i < foldLine.folds.length; i++) {
-            var fold = foldLine.folds[i];
-            var cmp = fold.range.compareEnd(row, column);
-            if (cmp == -1) {
-                var str = this
-                    .getLine(fold.start.row)
-                    .substring(lastFold.end.column, fold.start.column);
-                break;
-            }
-            else if (cmp == 0) {
-                return null;
-            }
-            lastFold = fold;
-        }
-        if (!str)
-            str = this.getLine(fold.start.row).substring(lastFold.end.column);
-
-        if (trim == -1)
-            return str.substring(0, column - lastFold.end.column);
-        else if (trim == 1)
-            return str.substring(column - lastFold.end.column)
-        else
-            return str;
-    }
-
-    this.getFoldLine = function(docRow, startFoldLine) {
-        var foldData = this.$foldData;
-        var i = 0;
-        if (startFoldLine)
-            i = foldData.indexOf(startFoldLine);
-        if (i == -1)
-            i = 0;
-        for (i; i < foldData.length; i++) {
-            var foldLine = foldData[i];
-            if (foldLine.start.row <= docRow && foldLine.end.row >= docRow) {
-                return foldLine;
-            } else if (foldLine.end.row > docRow) {
-                return null;
-            }
-        }
-        return null;
-    }
-
-    // returns the fold which starts after or contains docRow
-    this.getNextFold = function(docRow, startFoldLine) {
-        var foldData = this.$foldData, ans;
-        var i = 0;
-        if (startFoldLine)
-            i = foldData.indexOf(startFoldLine);
-        if (i == -1)
-            i = 0;
-        for (i; i < foldData.length; i++) {
-            var foldLine = foldData[i];
-            if (foldLine.end.row >= docRow) {
-                return foldLine;
-            }
-        }
-        return null;
-    }
-
-    this.getFoldedRowCount = function(first, last) {
-        var foldData = this.$foldData, rowCount = last-first+1;
-        for (var i = 0; i < foldData.length; i++) {
-            var foldLine = foldData[i],
-                end = foldLine.end.row,
-                start = foldLine.start.row;
-            if (end >= last) {
-                if(start < last) {
-                    if(start >= first)
-                        rowCount -= last-start;
-                    else
-                        rowCount = 0;//in one fold
-                }
-                break;
-            } else if(end >= first){
-                if (start >= first) //fold inside range
-                    rowCount -=  end-start;
-                else
-                    rowCount -=  end-first+1;
-            }
-        }
-        return rowCount;
-    }
-
-    this.$addFoldLine = function(foldLine) {
-        this.$foldData.push(foldLine);
-        this.$foldData.sort(function(a, b) {
-            return a.start.row - b.start.row;
-        });
-        return foldLine;
-    }
-
-    /**
-     * Adds a new fold.
-     *
-     * @returns
-     *      The new created Fold object or an existing fold object in case the
-     *      passed in range fits an existing fold exactly.
-     */
-    this.addFold = function(placeholder, range) {
-        var foldData = this.$foldData;
-        var added = false;
-
-        if (placeholder instanceof Fold)
-            var fold = placeholder;
-        else
-            fold = new Fold(range, placeholder);
-
-        var startRow = fold.start.row;
-        var startColumn = fold.start.column;
-        var endRow = fold.end.row;
-        var endColumn = fold.end.column;
-        
-        // --- Some checking ---
-        if (fold.placeholder.length < 2)
-            throw "Placeholder has to be at least 2 characters";
-
-        if (startRow == endRow && endColumn - startColumn < 2)
-            throw "The range has to be at least 2 characters width";
-
-        var existingFold = this.getFoldAt(startRow, startColumn, 1);
-        if (
-            existingFold
-            && existingFold.range.isEnd(endRow, endColumn)
-            && existingFold.range.isStart(startRow, startColumn)
-        ) {
-            return fold;
-        }
-
-        existingFold = this.getFoldAt(startRow, startColumn, 1);
-        if (existingFold && !existingFold.range.isStart(startRow, startColumn))
-            throw "A fold can't start inside of an already existing fold";
-
-        existingFold = this.getFoldAt(endRow, endColumn, -1);
-        if (existingFold && !existingFold.range.isEnd(endRow, endColumn))
-            throw "A fold can't end inside of an already existing fold";
-
-        if (endRow >= this.doc.getLength())
-            throw "End of fold is outside of the document.";
-
-        if (endColumn > this.getLine(endRow).length || startColumn > this.getLine(startRow).length)
-            throw "End of fold is outside of the document.";
-
-        // Check if there are folds in the range we create the new fold for.
-        var folds = this.getFoldsInRange(fold.range);
-        if (folds.length > 0) {
-            // Remove the folds from fold data.
-            this.removeFolds(folds);
-            // Add the removed folds as subfolds on the new fold.
-            fold.subFolds = folds;
-        }
-
-        for (var i = 0; i < foldData.length; i++) {
-            var foldLine = foldData[i];
-            if (endRow == foldLine.start.row) {
-                foldLine.addFold(fold);
-                added = true;
-                break;
-            }
-            else if (startRow == foldLine.end.row) {
-                foldLine.addFold(fold);
-                added = true;
-                if (!fold.sameRow) {
-                    // Check if we might have to merge two FoldLines.
-                    foldLineNext = foldData[i + 1];
-                    if (foldLineNext && foldLineNext.start.row == endRow) {
-                        // We need to merge!
-                        foldLine.merge(foldLineNext);
-                        break;
-                    }
-                }
-                break;
-            }
-            else if (endRow <= foldLine.start.row) {
-                break;
-            }
-        }
-
-        if (!added)
-            foldLine = this.$addFoldLine(new FoldLine(this.$foldData, fold));
-
-        if (this.$useWrapMode)
-            this.$updateWrapData(foldLine.start.row, foldLine.start.row);
-
-        // Notify that fold data has changed.
-        this.$modified = true;
-        this._dispatchEvent("changeFold", { data: fold });
-
-        return fold;
-    };
-
-    this.addFolds = function(folds) {
-        folds.forEach(function(fold) {
-            this.addFold(fold);
-        }, this);
-    };
-
-    this.removeFold = function(fold) {
-        var foldLine = fold.foldLine;
-        var startRow = foldLine.start.row;
-        var endRow = foldLine.end.row;
-
-        var foldLines = this.$foldData,
-            folds = foldLine.folds;
-        // Simple case where there is only one fold in the FoldLine such that
-        // the entire fold line can get removed directly.
-        if (folds.length == 1) {
-            foldLines.splice(foldLines.indexOf(foldLine), 1);
-        } else
-        // If the fold is the last fold of the foldLine, just remove it.
-        if (foldLine.range.isEnd(fold.end.row, fold.end.column)) {
-            folds.pop();
-            foldLine.end.row = folds[folds.length - 1].end.row;
-            foldLine.end.column = folds[folds.length - 1].end.column;
-        } else
-        // If the fold is the first fold of the foldLine, just remove it.
-        if (foldLine.range.isStart(fold.start.row, fold.start.column)) {
-            folds.shift();
-            foldLine.start.row = folds[0].start.row;
-            foldLine.start.column = folds[0].start.column;
-        } else
-        // We know there are more then 2 folds and the fold is not at the edge.
-        // This means, the fold is somewhere in between.
-        //
-        // If the fold is in one row, we just can remove it.
-        if (fold.sameRow) {
-            folds.splice(folds.indexOf(fold), 1);
-        } else
-        // The fold goes over more then one row. This means remvoing this fold
-        // will cause the fold line to get splitted up.
-        {
-            var newFoldLine = foldLine.split(fold.start.row, fold.start.column);
-            newFoldLine.folds.shift();
-            foldLine.start.row = folds[0].start.row;
-            foldLine.start.column = folds[0].start.column;
-            this.$addFoldLine(newFoldLine);
-        }
-
-        if (this.$useWrapMode) {
-            this.$updateWrapData(startRow, endRow);
-        }
-
-        // Notify that fold data has changed.
-        this.$modified = true;
-        this._dispatchEvent("changeFold", { data: fold });
-    }
-
-    this.removeFolds = function(folds) {
-        // We need to clone the folds array passed in as it might be the folds
-        // array of a fold line and as we call this.removeFold(fold), folds
-        // are removed from folds and changes the current index.
-        var cloneFolds = [];
-        for (var i = 0; i < folds.length; i++) {
-            cloneFolds.push(folds[i]);
-        }
-
-        cloneFolds.forEach(function(fold) {
-            this.removeFold(fold);
-        }, this);
-        this.$modified = true;
-    }
-
-    this.expandFold = function(fold) {
-        this.removeFold(fold);
-        fold.subFolds.forEach(function(fold) {
-            this.addFold(fold);
-        }, this);
-        fold.subFolds = [];
-    }
-
-    this.expandFolds = function(folds) {
-        folds.forEach(function(fold) {
-            this.expandFold(fold);
-        }, this);
-    }
-
-    /**
-     * Checks if a given documentRow is folded. This is true if there are some
-     * folded parts such that some parts of the line is still visible.
-     **/
-    this.isRowFolded = function(docRow, startFoldRow) {
-        return !!this.getFoldLine(docRow, startFoldRow);
-    };
-
-    this.getRowFoldEnd = function(docRow, startFoldRow) {
-        var foldLine = this.getFoldLine(docRow, startFoldRow);
-        return (foldLine
-                    ? foldLine.end.row
-                    : docRow)
-    };
-
-    this.getFoldDisplayLine = function(foldLine, endRow, endColumn, startRow, startColumn) {
-        if (startRow == null) {
-            startRow = foldLine.start.row;
-            startColumn = 0;
-        }
-
-        if (endRow == null) {
-            endRow = foldLine.end.row;
-            endColumn = this.getLine(endRow).length;
-        }
-
-        // Build the textline using the FoldLine walker.
-        var line = "";
-        var doc = this.doc;
-        var textLine = "";
-
-        foldLine.walk(function(placeholder, row, column, lastColumn, isNewRow) {
-            if (row < startRow) {
-                return;
-            } else if (row == startRow) {
-                if (column < startColumn) {
-                    return;
-                }
-                lastColumn = Math.max(startColumn, lastColumn);
-            }
-            if (placeholder) {
-                textLine += placeholder;
-            } else {
-                textLine += doc.getLine(row).substring(lastColumn, column);
-            }
-        }.bind(this), endRow, endColumn);
-        return textLine;
-    };
-
-    this.getDisplayLine = function(row, endColumn, startRow, startColumn) {
-        var foldLine = this.getFoldLine(row);
-
-        if (!foldLine) {
-            var line;
-            line = this.doc.getLine(row);
-            return line.substring(startColumn || 0, endColumn || line.length);
-        } else {
-            return this.getFoldDisplayLine(
-                foldLine, row, endColumn, startRow, startColumn);
-        }
-    };
-
-    this.$cloneFoldData = function() {
-        var foldData = this.$foldData;
-        var fd = [];
-        fd = this.$foldData.map(function(foldLine) {
-            var folds = foldLine.folds.map(function(fold) {
-                return fold.clone();
-            });
-            return new FoldLine(fd, folds);
-        });
-
-        return fd;
-    };
-}
-
-exports.Folding = Folding;
-
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/edit_session/fold_line', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-
-var Range = require("ace/range").Range;
-
-/**
- * If the an array is passed in, the folds are expected to be sorted already.
- */
-function FoldLine(foldData, folds) {
-    this.foldData = foldData;
-    if (Array.isArray(folds)) {
-        this.folds = folds;
-    } else {
-        folds = this.folds = [ folds ];
-    }
-
-    var last = folds[folds.length - 1]
-    this.range = new Range(folds[0].start.row, folds[0].start.column,
-                           last.end.row, last.end.column);
-    this.start = this.range.start;
-    this.end   = this.range.end;
-
-    this.folds.forEach(function(fold) {
-        fold.setFoldLine(this);
-    }, this);
-}
-
-(function() {
-    /**
-     * Note: This doesn't update wrapData!
-     */
-    this.shiftRow = function(shift) {
-        this.start.row += shift;
-        this.end.row += shift;
-        this.folds.forEach(function(fold) {
-            fold.start.row += shift;
-            fold.end.row += shift;
-        });
-    }
-
-    this.addFold = function(fold) {
-        if (fold.sameRow) {
-            if (fold.start.row < this.startRow || fold.endRow > this.endRow) {
-                throw "Can't add a fold to this FoldLine as it has no connection";
-            }
-            this.folds.push(fold);
-            this.folds.sort(function(a, b) {
-                return -a.range.compareEnd(b.start.row, b.start.column);
-            });
-            if (this.range.compareEnd(fold.start.row, fold.start.column) > 0) {
-                this.end.row = fold.end.row;
-                this.end.column =  fold.end.column;
-            } else if (this.range.compareStart(fold.end.row, fold.end.column) < 0) {
-                this.start.row = fold.start.row;
-                this.start.column = fold.start.column;
-            }
-        } else if (fold.start.row == this.end.row) {
-            this.folds.push(fold);
-            this.end.row = fold.end.row;
-            this.end.column = fold.end.column;
-        } else if (fold.end.row == this.start.row) {
-            this.folds.unshift(fold);
-            this.start.row = fold.start.row;
-            this.start.column = fold.start.column;
-        } else {
-            throw "Trying to add fold to FoldRow that doesn't have a matching row";
-        }
-        fold.foldLine = this;
-    }
-
-    this.containsRow = function(row) {
-        return row >= this.start.row && row <= this.end.row;
-    }
-
-    this.walk = function(callback, endRow, endColumn) {
-        var lastEnd = 0,
-            folds = this.folds,
-            fold,
-            comp, stop, isNewRow = true;
-
-        if (endRow == null) {
-            endRow = this.end.row;
-            endColumn = this.end.column;
-        }
-
-        for (var i = 0; i < folds.length; i++) {
-            fold = folds[i];
-
-            comp = fold.range.compareStart(endRow, endColumn);
-            // This fold is after the endRow/Column.
-            if (comp == -1) {
-                callback(null, endRow, endColumn, lastEnd, isNewRow);
-                return;
-            }
-
-            stop = callback(null, fold.start.row, fold.start.column, lastEnd, isNewRow);
-            stop = !stop && callback(fold.placeholder, fold.start.row, fold.start.column, lastEnd);
-
-            // If the user requested to stop the walk or endRow/endColumn is
-            // inside of this fold (comp == 0), then end here.
-            if (stop || comp == 0) {
-                return;
-            }
-
-            // Note the new lastEnd might not be on the same line. However,
-            // it's the callback's job to recognize this.
-            isNewRow = !fold.sameRow;
-            lastEnd = fold.end.column;
-        }
-        callback(null, endRow, endColumn, lastEnd, isNewRow);
-    }
-
-    this.getNextFoldTo = function(row, column) {
-        var fold, cmp;
-        for (var i = 0; i < this.folds.length; i++) {
-            fold = this.folds[i];
-            cmp = fold.range.compareEnd(row, column);
-            if (cmp == -1) {
-                return {
-                    fold: fold,
-                    kind: "after"
-                };
-            } else if (cmp == 0) {
-                return {
-                    fold: fold,
-                    kind: "inside"
-                }
-            }
-        }
-        return null;
-    }
-
-    this.addRemoveChars = function(row, column, len) {
-        var ret = this.getNextFoldTo(row, column),
-            fold, folds;
-        if (ret) {
-            fold = ret.fold;
-            if (ret.kind == "inside"
-                && fold.start.column != column
-                && fold.start.row != row)
-            {
-                throw "Moving characters inside of a fold should never be reached";
-            } else if (fold.start.row == row) {
-                folds = this.folds;
-                var i = folds.indexOf(fold);
-                if (i == 0) {
-                    this.start.column += len;
-                }
-                for (i; i < folds.length; i++) {
-                    fold = folds[i];
-                    fold.start.column += len;
-                    if (!fold.sameRow) {
-                        return;
-                    }
-                    fold.end.column += len;
-                }
-                this.end.column += len;
-            }
-        }
-    }
-
-    this.split = function(row, column) {
-        var fold = this.getNextFoldTo(row, column).fold,
-            folds = this.folds;
-        var foldData = this.foldData;
-
-        if (!fold) {
-            return null;
-        }
-        var i = folds.indexOf(fold);
-        var foldBefore = folds[i - 1];
-        this.end.row = foldBefore.end.row;
-        this.end.column = foldBefore.end.column;
-
-        // Remove the folds after row/column and create a new FoldLine
-        // containing these removed folds.
-        folds = folds.splice(i, folds.length - i);
-
-        var newFoldLine = new FoldLine(foldData, folds);
-        foldData.splice(foldData.indexOf(this) + 1, 0, newFoldLine);
-        return newFoldLine;
-    }
-
-    this.merge = function(foldLineNext) {
-        var folds = foldLineNext.folds;
-        for (var i = 0; i < folds.length; i++) {
-            this.addFold(folds[i]);
-        }
-        // Remove the foldLineNext - no longer needed, as
-        // it's merged now with foldLineNext.
-        var foldData = this.foldData;
-        foldData.splice(foldData.indexOf(foldLineNext), 1);
-    }
-
-    this.toString = function() {
-        var ret = [this.range.toString() + ": [" ];
-
-        this.folds.forEach(function(fold) {
-            ret.push("  " + fold.toString());
-        });
-        ret.push("]")
-        return ret.join("\n");
-    }
-
-    this.idxToPosition = function(idx) {
-        var lastFoldEndColumn = 0;
-        var fold;
-
-        for (var i = 0; i < this.folds.length; i++) {
-            var fold = this.folds[i];
-
-            idx -= fold.start.column - lastFoldEndColumn;
-            if (idx < 0) {
-                return {
-                    row: fold.start.row,
-                    column: fold.start.column + idx
-                };
-            }
-
-            idx -= fold.placeholder.length;
-            if (idx < 0) {
-                return fold.start;
-            }
-
-            lastFoldEndColumn = fold.end.column;
-        }
-
-        return {
-            row: this.end.row,
-            column: this.end.column + idx
-        };
-    }
-}).call(FoldLine.prototype);
-
-exports.FoldLine = FoldLine;
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/edit_session/fold', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-/**
- * Simple fold-data struct.
- **/
-var Fold = exports.Fold = function(range, placeholder) {
-    this.foldLine = null;
-    this.placeholder = placeholder;
-    this.range = range;
-    this.start = range.start;
-    this.end = range.end;
-
-    this.sameRow = range.start.row == range.end.row;
-    this.subFolds = [];
-};
-
-(function() {
-
-    this.toString = function() {
-        return '"' + this.placeholder + '" ' + this.range.toString();
-    };
-
-    this.setFoldLine = function(foldLine) {
-        this.foldLine = foldLine;
-        this.subFolds.forEach(function(fold) {
-            fold.setFoldLine(foldLine);
-        });
-    };
-
-    this.clone = function() {
-        var range = this.range.clone();
-        var fold = new Fold(range, this.placeholder);
-        this.subFolds.forEach(function(subFold) {
-            fold.subFolds.push(subFold.clone());
-        });
-        return fold;
-    };
-
-}).call(Fold.prototype);
-
-});/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/search', ['require', 'exports', 'module' , 'pilot/lang', 'pilot/oop', 'ace/range'], function(require, exports, module) {
-
-var lang = require("pilot/lang");
-var oop = require("pilot/oop");
-var Range = require("ace/range").Range;
-
-var Search = function() {
-    this.$options = {
-        needle: "",
-        backwards: false,
-        wrap: false,
-        caseSensitive: false,
-        wholeWord: false,
-        scope: Search.ALL,
-        regExp: false
-    };
-};
-
-Search.ALL = 1;
-Search.SELECTION = 2;
-
-(function() {
-
-    this.set = function(options) {
-        oop.mixin(this.$options, options);
-        return this;
-    };
-    
-    this.getOptions = function() {
-        return lang.copyObject(this.$options);
-    };
-
-    this.find = function(session) {
-        if (!this.$options.needle)
-            return null;
-
-        if (this.$options.backwards) {
-            var iterator = this.$backwardMatchIterator(session);
-        } else {
-            iterator = this.$forwardMatchIterator(session);
-        }
-
-        var firstRange = null;
-        iterator.forEach(function(range) {
-            firstRange = range;
-            return true;
-        });
-
-        return firstRange;
-    };
-
-    this.findAll = function(session) {
-        if (!this.$options.needle)
-            return [];
-
-        if (this.$options.backwards) {
-            var iterator = this.$backwardMatchIterator(session);
-        } else {
-            iterator = this.$forwardMatchIterator(session);
-        }
-
-        var ranges = [];
-        iterator.forEach(function(range) {
-            ranges.push(range);
-        });
-
-        return ranges;
-    };
-
-    this.replace = function(input, replacement) {
-        var re = this.$assembleRegExp();
-        var match = re.exec(input);
-        if (match && match[0].length == input.length) {
-            if (this.$options.regExp) {
-                return input.replace(re, replacement);
-            } else {
-                return replacement;
-            }
-        } else {
-            return null;
-        }
-    };
-
-    this.$forwardMatchIterator = function(session) {
-        var re = this.$assembleRegExp();
-        var self = this;
-
-        return {
-            forEach: function(callback) {
-                self.$forwardLineIterator(session).forEach(function(line, startIndex, row) {
-                    if (startIndex) {
-                        line = line.substring(startIndex);
-                    }
-
-                    var matches = [];
-
-                    line.replace(re, function(str) {
-                        var offset = arguments[arguments.length-2];
-                        matches.push({
-                            str: str,
-                            offset: startIndex + offset
-                        });
-                        return str;
-                    });
-
-                    for (var i=0; i<matches.length; i++) {
-                        var match = matches[i];
-                        var range = self.$rangeFromMatch(row, match.offset, match.str.length);
-                        if (callback(range))
-                            return true;
-                    }
-
-                });
-            }
-        };
-    };
-
-    this.$backwardMatchIterator = function(session) {
-        var re = this.$assembleRegExp();
-        var self = this;
-
-        return {
-            forEach: function(callback) {
-                self.$backwardLineIterator(session).forEach(function(line, startIndex, row) {
-                    if (startIndex) {
-                        line = line.substring(startIndex);
-                    }
-
-                    var matches = [];
-
-                    line.replace(re, function(str, offset) {
-                        matches.push({
-                            str: str,
-                            offset: startIndex + offset
-                        });
-                        return str;
-                    });
-
-                    for (var i=matches.length-1; i>= 0; i--) {
-                        var match = matches[i];
-                        var range = self.$rangeFromMatch(row, match.offset, match.str.length);
-                        if (callback(range))
-                            return true;
-                    }
-                });
-            }
-        };
-    };
-
-    this.$rangeFromMatch = function(row, column, length) {
-        return new Range(row, column, row, column+length);
-    };
-
-    this.$assembleRegExp = function() {
-        if (this.$options.regExp) {
-            var needle = this.$options.needle;
-        } else {
-            needle = lang.escapeRegExp(this.$options.needle);
-        }
-
-        if (this.$options.wholeWord) {
-            needle = "\\b" + needle + "\\b";
-        }
-
-        var modifier = "g";
-        if (!this.$options.caseSensitive) {
-            modifier += "i";
-        }
-
-        var re = new RegExp(needle, modifier);
-        return re;
-    };
-
-    this.$forwardLineIterator = function(session) {
-        var searchSelection = this.$options.scope == Search.SELECTION;
-
-        var range = session.getSelection().getRange();
-        var start = session.getSelection().getCursor();
-
-        var firstRow = searchSelection ? range.start.row : 0;
-        var firstColumn = searchSelection ? range.start.column : 0;
-        var lastRow = searchSelection ? range.end.row : session.getLength() - 1;
-
-        var wrap = this.$options.wrap;
-        var inWrap = false;
-
-        function getLine(row) {
-            var line = session.getLine(row);
-            if (searchSelection && row == range.end.row) {
-                line = line.substring(0, range.end.column);
-            }
-            if (inWrap && row == start.row) {
-                line = line.substring(0, start.column);
-            }
-            return line;
-        }
-
-        return {
-            forEach: function(callback) {
-                var row = start.row;
-
-                var line = getLine(row);
-                var startIndex = start.column;
-
-                var stop = false;
-                inWrap = false;
-
-                while (!callback(line, startIndex, row)) {
-
-                    if (stop) {
-                        return;
-                    }
-
-                    row++;
-                    startIndex = 0;
-
-                    if (row > lastRow) {
-                        if (wrap) {
-                            row = firstRow;
-                            startIndex = firstColumn;
-                            inWrap = true;
-                        } else {
-                            return;
-                        }
-                    }
-
-                    if (row == start.row)
-                        stop = true;
-
-                    line = getLine(row);
-                }
-            }
-        };
-    };
-
-    this.$backwardLineIterator = function(session) {
-        var searchSelection = this.$options.scope == Search.SELECTION;
-
-        var range = session.getSelection().getRange();
-        var start = searchSelection ? range.end : range.start;
-
-        var firstRow = searchSelection ? range.start.row : 0;
-        var firstColumn = searchSelection ? range.start.column : 0;
-        var lastRow = searchSelection ? range.end.row : session.getLength() - 1;
-
-        var wrap = this.$options.wrap;
-
-        return {
-            forEach : function(callback) {
-                var row = start.row;
-
-                var line = session.getLine(row).substring(0, start.column);
-                var startIndex = 0;
-                var stop = false;
-                var inWrap = false;
-
-                while (!callback(line, startIndex, row)) {
-
-                    if (stop)
-                        return;
-
-                    row--;
-                    startIndex = 0;
-
-                    if (row < firstRow) {
-                        if (wrap) {
-                            row = lastRow;
-                            inWrap = true;
-                        } else {
-                            return;
-                        }
-                    }
-
-                    if (row == start.row)
-                        stop = true;
-
-                    line = session.getLine(row);
-                    if (searchSelection) {
-                        if (row == firstRow)
-                            startIndex = firstColumn;
-                        else if (row == lastRow)
-                            line = line.substring(0, range.end.column);
-                    }
-
-                    if (inWrap && row == start.row)
-                        startIndex = start.column;
-                }
-            }
-        };
-    };
-
-}).call(Search.prototype);
-
-exports.Search = Search;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/undomanager', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-var UndoManager = function() {
-    this.reset();
-};
-
-(function() {
-
-    this.execute = function(options) {
-        var deltas = options.args[0];
-        this.$doc  = options.args[1];
-        this.$undoStack.push(deltas);
-        this.$redoStack = [];
-    };
-
-    this.undo = function(dontSelect) {
-        var deltas = this.$undoStack.pop();
-        var undoSelectionRange = null;
-        if (deltas) {
-            undoSelectionRange =
-                this.$doc.undoChanges(deltas, dontSelect);
-            this.$redoStack.push(deltas);
-        }
-        return undoSelectionRange;
-    };
-
-    this.redo = function(dontSelect) {
-        var deltas = this.$redoStack.pop();
-        var redoSelectionRange = null;
-        if (deltas) {
-            redoSelectionRange =
-                this.$doc.redoChanges(deltas, dontSelect);
-            this.$undoStack.push(deltas);
-        }
-        return redoSelectionRange;
-    };
-
-    this.reset = function() {
-        this.$undoStack = [];
-        this.$redoStack = [];
-    };
-
-    this.hasUndo = function() {
-        return this.$undoStack.length > 0;
-    };
-
-    this.hasRedo = function() {
-        return this.$redoStack.length > 0;
-    };
-
-}).call(UndoManager.prototype);
-
-exports.UndoManager = UndoManager;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian@ajax.org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/virtual_renderer', ['require', 'exports', 'module' , 'pilot/oop', 'pilot/dom', 'pilot/event', 'pilot/useragent', 'ace/layer/gutter', 'ace/layer/marker', 'ace/layer/text', 'ace/layer/cursor', 'ace/scrollbar', 'ace/renderloop', 'pilot/event_emitter', 'text/ace/css/editor.css'], function(require, exports, module) {
-
-var oop = require("pilot/oop");
-var dom = require("pilot/dom");
-var event = require("pilot/event");
-var useragent = require("pilot/useragent");
-var GutterLayer = require("ace/layer/gutter").Gutter;
-var MarkerLayer = require("ace/layer/marker").Marker;
-var TextLayer = require("ace/layer/text").Text;
-var CursorLayer = require("ace/layer/cursor").Cursor;
-var ScrollBar = require("ace/scrollbar").ScrollBar;
-var RenderLoop = require("ace/renderloop").RenderLoop;
-var EventEmitter = require("pilot/event_emitter").EventEmitter;
-var editorCss = require("text/ace/css/editor.css");
-
-// import CSS once
-dom.importCssString(editorCss);
-
-var VirtualRenderer = function(container, theme) {
-    this.container = container;
-    dom.addCssClass(this.container, "ace_editor");
-
-    this.setTheme(theme);
-
-    this.$gutter = dom.createElement("div");
-    this.$gutter.className = "ace_gutter";
-    this.container.appendChild(this.$gutter);
-
-    this.scroller = dom.createElement("div");
-    this.scroller.className = "ace_scroller";
-    this.container.appendChild(this.scroller);
-
-    this.content = dom.createElement("div");
-    this.content.className = "ace_content";
-    this.scroller.appendChild(this.content);
-
-    this.$gutterLayer = new GutterLayer(this.$gutter);
-    this.$markerBack = new MarkerLayer(this.content);
-
-    var textLayer = this.$textLayer = new TextLayer(this.content);
-    this.canvas = textLayer.element;
-
-    this.$markerFront = new MarkerLayer(this.content);
-
-    this.characterWidth = textLayer.getCharacterWidth();
-    this.lineHeight = textLayer.getLineHeight();
-
-    this.$cursorLayer = new CursorLayer(this.content);
-    this.$cursorPadding = 8;
-
-    // Indicates whether the horizontal scrollbar is visible
-    this.$horizScroll = true;
-    this.$horizScrollAlwaysVisible = true;
-
-    this.scrollBar = new ScrollBar(container);
-    this.scrollBar.addEventListener("scroll", this.onScroll.bind(this));
-
-    this.scrollTop = 0;
-
-    this.cursorPos = {
-        row : 0,
-        column : 0
-    };
-
-    var _self = this;
-    this.$textLayer.addEventListener("changeCharaterSize", function() {
-        _self.characterWidth = textLayer.getCharacterWidth();
-        _self.lineHeight = textLayer.getLineHeight();
-        _self.$updatePrintMargin();
-        _self.onResize(true);
-
-        _self.$loop.schedule(_self.CHANGE_FULL);
-    });
-    event.addListener(this.$gutter, "click", this.$onGutterClick.bind(this));
-    event.addListener(this.$gutter, "dblclick", this.$onGutterClick.bind(this));
-
-    this.$size = {
-        width: 0,
-        height: 0,
-        scrollerHeight: 0,
-        scrollerWidth: 0
-    };
-
-    this.layerConfig = {
-        width : 1,
-        padding : 0,
-        firstRow : 0,
-        firstRowScreen: 0,
-        lastRow : 0,
-        lineHeight : 1,
-        characterWidth : 1,
-        minHeight : 1,
-        maxHeight : 1,
-        offset : 0,
-        height : 1
-    };
-
-    this.$loop = new RenderLoop(this.$renderChanges.bind(this));
-    this.$loop.schedule(this.CHANGE_FULL);
-
-    this.setPadding(4);
-    this.$updatePrintMargin();
-};
-
-(function() {
-    this.showGutter = true;
-
-    this.CHANGE_CURSOR = 1;
-    this.CHANGE_MARKER = 2;
-    this.CHANGE_GUTTER = 4;
-    this.CHANGE_SCROLL = 8;
-    this.CHANGE_LINES = 16;
-    this.CHANGE_TEXT = 32;
-    this.CHANGE_SIZE = 64;
-    this.CHANGE_MARKER_BACK = 128;
-    this.CHANGE_MARKER_FRONT = 256;
-    this.CHANGE_FULL = 512;
-
-    oop.implement(this, EventEmitter);
-
-    this.setSession = function(session) {
-        this.session = session;
-        this.$cursorLayer.setSession(session);
-        this.$markerBack.setSession(session);
-        this.$markerFront.setSession(session);
-        this.$gutterLayer.setSession(session);
-        this.$textLayer.setSession(session);
-        this.$loop.schedule(this.CHANGE_FULL);
-    };
-
-    /**
-     * Triggers partial update of the text layer
-     */
-    this.updateLines = function(firstRow, lastRow) {
-        if (lastRow === undefined)
-            lastRow = Infinity;
-
-        if (!this.$changedLines) {
-            this.$changedLines = {
-                firstRow: firstRow,
-                lastRow: lastRow
-            };
-        }
-        else {
-            if (this.$changedLines.firstRow > firstRow)
-                this.$changedLines.firstRow = firstRow;
-
-            if (this.$changedLines.lastRow < lastRow)
-                this.$changedLines.lastRow = lastRow;
-        }
-
-        this.$loop.schedule(this.CHANGE_LINES);
-    };
-
-    /**
-     * Triggers full update of the text layer
-     */
-    this.updateText = function() {
-        this.$loop.schedule(this.CHANGE_TEXT);
-    };
-
-    /**
-     * Triggers a full update of all layers
-     */
-    this.updateFull = function() {
-        this.$loop.schedule(this.CHANGE_FULL);
-    };
-
-    this.updateFontSize = function() {
-        this.$textLayer.checkForSizeChanges();
-    };
-
-    /**
-     * Triggers resize of the editor
-     */
-    this.onResize = function(force) {
-        var changes = this.CHANGE_SIZE;
-        var size = this.$size;
-
-        var height = dom.getInnerHeight(this.container);
-        if (force || size.height != height) {
-            size.height = height;
-
-            this.scroller.style.height = height + "px";
-            size.scrollerHeight = this.scroller.clientHeight;
-            this.scrollBar.setHeight(size.scrollerHeight);
-
-            if (this.session) {
-                this.scrollToY(this.getScrollTop());
-                changes = changes | this.CHANGE_FULL;
-            }
-        }
-
-        var width = dom.getInnerWidth(this.container);
-        if (force || size.width != width) {
-            size.width = width;
-
-            var gutterWidth = this.showGutter ? this.$gutter.offsetWidth : 0;
-            this.scroller.style.left = gutterWidth + "px";
-            size.scrollerWidth = Math.max(0, width - gutterWidth - this.scrollBar.getWidth())
-            this.scroller.style.width = size.scrollerWidth + "px";
-
-            if (this.session.getUseWrapMode() && this.adjustWrapLimit() || force)
-                changes = changes | this.CHANGE_FULL;
-        }
-
-        this.$loop.schedule(changes);
-    };
-
-    this.adjustWrapLimit = function(){
-        var availableWidth = this.$size.scrollerWidth - this.$padding * 2;
-        var limit = Math.floor(availableWidth / this.characterWidth) - 1;
-        return this.session.adjustWrapLimit(limit);
-    };
-
-    this.$onGutterClick = function(e) {
-        var pageX = event.getDocumentX(e);
-        var pageY = event.getDocumentY(e);
-
-        this._dispatchEvent("gutter" + e.type, {
-            row: this.screenToTextCoordinates(pageX, pageY).row,
-            htmlEvent: e
-        });
-    };
-
-    this.setShowInvisibles = function(showInvisibles) {
-        if (this.$textLayer.setShowInvisibles(showInvisibles))
-            this.$loop.schedule(this.CHANGE_TEXT);
-    };
-
-    this.getShowInvisibles = function() {
-        return this.$textLayer.showInvisibles;
-    };
-
-    this.$showPrintMargin = true;
-    this.setShowPrintMargin = function(showPrintMargin) {
-        this.$showPrintMargin = showPrintMargin;
-        this.$updatePrintMargin();
-    };
-
-    this.getShowPrintMargin = function() {
-        return this.$showPrintMargin;
-    };
-
-    this.$printMarginColumn = 80;
-    this.setPrintMarginColumn = function(showPrintMargin) {
-        this.$printMarginColumn = showPrintMargin;
-        this.$updatePrintMargin();
-    };
-
-    this.getPrintMarginColumn = function() {
-        return this.$printMarginColumn;
-    };
-
-    this.getShowGutter = function(){
-        return this.showGutter;
-    };
-
-    this.setShowGutter = function(show){
-        if(this.showGutter === show)
-            return;
-        this.$gutter.style.display = show ? "block" : "none";
-        this.showGutter = show;
-        this.onResize(true);
-    };
-
-    this.$updatePrintMargin = function() {
-        var containerEl;
-
-        if (!this.$showPrintMargin && !this.$printMarginEl)
-            return;
-
-        if (!this.$printMarginEl) {
-            containerEl = dom.createElement("div");
-            containerEl.className = "ace_print_margin_layer";
-            this.$printMarginEl = dom.createElement("div");
-            this.$printMarginEl.className = "ace_print_margin";
-            containerEl.appendChild(this.$printMarginEl);
-            this.content.insertBefore(containerEl, this.$textLayer.element);
-        }
-
-        var style = this.$printMarginEl.style;
-        style.left = ((this.characterWidth * this.$printMarginColumn) + this.$padding * 2) + "px";
-        style.visibility = this.$showPrintMargin ? "visible" : "hidden";
-    };
-
-    this.getContainerElement = function() {
-        return this.container;
-    };
-
-    this.getMouseEventTarget = function() {
-        return this.content;
-    };
-
-    this.getTextAreaContainer = function() {
-        return this.container;
-    };
-
-    this.moveTextAreaToCursor = function(textarea) {
-        // in IE the native cursor always shines through
-        if (useragent.isIE)
-            return;
-
-        var pos = this.$cursorLayer.getPixelPosition();
-        if (!pos)
-            return;
-
-        var bounds = this.content.getBoundingClientRect();
-        var offset = this.layerConfig.offset;
-
-        textarea.style.left = (bounds.left + pos.left + this.$padding) + "px";
-        textarea.style.top = (bounds.top + pos.top - this.scrollTop + offset) + "px";
-    };
-
-    this.getFirstVisibleRow = function() {
-        return this.layerConfig.firstRow;
-    };
-
-    this.getFirstFullyVisibleRow = function() {
-        return this.layerConfig.firstRow + (this.layerConfig.offset === 0 ? 0 : 1);
-    };
-
-    this.getLastFullyVisibleRow = function() {
-        var flint = Math.floor((this.layerConfig.height + this.layerConfig.offset) / this.layerConfig.lineHeight);
-        return this.layerConfig.firstRow - 1 + flint;
-    };
-
-    this.getLastVisibleRow = function() {
-        return this.layerConfig.lastRow;
-    };
-
-    this.$padding = null;
-    this.setPadding = function(padding) {
-        this.$padding = padding;
-        this.$textLayer.setPadding(padding);
-        this.$cursorLayer.setPadding(padding);
-        this.$markerFront.setPadding(padding);
-        this.$markerBack.setPadding(padding);
-        this.$loop.schedule(this.CHANGE_FULL);
-        this.$updatePrintMargin();
-    };
-
-    this.getHScrollBarAlwaysVisible = function() {
-        return this.$horizScrollAlwaysVisible;
-    };
-
-    this.setHScrollBarAlwaysVisible = function(alwaysVisible) {
-        if (this.$horizScrollAlwaysVisible != alwaysVisible) {
-            this.$horizScrollAlwaysVisible = alwaysVisible;
-            if (!this.$horizScrollAlwaysVisible || !this.$horizScroll)
-                this.$loop.schedule(this.CHANGE_SCROLL);
-        }
-    };
-
-    this.onScroll = function(e) {
-        this.scrollToY(e.data);
-    };
-
-    this.$updateScrollBar = function() {
-        this.scrollBar.setInnerHeight(this.layerConfig.maxHeight);
-        this.scrollBar.setScrollTop(this.scrollTop);
-    };
-
-    this.$renderChanges = function(changes) {
-        if (!changes || !this.session)
-            return;
-
-        // text, scrolling and resize changes can cause the view port size to change
-        if (changes & this.CHANGE_FULL ||
-            changes & this.CHANGE_SIZE ||
-            changes & this.CHANGE_TEXT ||
-            changes & this.CHANGE_LINES ||
-            changes & this.CHANGE_SCROLL
-        )
-            this.$computeLayerConfig();
-
-        // full
-        if (changes & this.CHANGE_FULL) {
-            this.$textLayer.update(this.layerConfig);
-            if (this.showGutter)
-                this.$gutterLayer.update(this.layerConfig);
-            this.$markerBack.update(this.layerConfig);
-            this.$markerFront.update(this.layerConfig);
-            this.$cursorLayer.update(this.layerConfig);
-            this.$updateScrollBar();
-            return;
-        }
-
-        // scrolling
-        if (changes & this.CHANGE_SCROLL) {
-            if (changes & this.CHANGE_TEXT || changes & this.CHANGE_LINES)
-                this.$textLayer.update(this.layerConfig);
-            else
-                this.$textLayer.scrollLines(this.layerConfig);
-
-            if (this.showGutter)
-                this.$gutterLayer.update(this.layerConfig);
-            this.$markerBack.update(this.layerConfig);
-            this.$markerFront.update(this.layerConfig);
-            this.$cursorLayer.update(this.layerConfig);
-            this.$updateScrollBar();
-            return;
-        }
-
-        if (changes & this.CHANGE_TEXT) {
-            this.$textLayer.update(this.layerConfig);
-            if (this.showGutter)
-                this.$gutterLayer.update(this.layerConfig);
-        }
-        else if (changes & this.CHANGE_LINES) {
-            this.$updateLines();
-            this.$updateScrollBar();
-            if (this.showGutter)
-                this.$gutterLayer.update(this.layerConfig);
-        } else if (changes & this.CHANGE_GUTTER) {
-            if (this.showGutter)
-                this.$gutterLayer.update(this.layerConfig);
-        }
-
-        if (changes & this.CHANGE_CURSOR)
-            this.$cursorLayer.update(this.layerConfig);
-
-        if (changes & (this.CHANGE_MARKER | this.CHANGE_MARKER_FRONT)) {
-            this.$markerFront.update(this.layerConfig);
-        }
-
-        if (changes & (this.CHANGE_MARKER | this.CHANGE_MARKER_BACK)) {
-            this.$markerBack.update(this.layerConfig);
-        }
-
-        if (changes & this.CHANGE_SIZE)
-            this.$updateScrollBar();
-    };
-
-    this.$computeLayerConfig = function() {
-        var session = this.session;
-
-        var offset = this.scrollTop % this.lineHeight;
-        var minHeight = this.$size.scrollerHeight + this.lineHeight;
-
-        var longestLine = this.$getLongestLine();
-        var widthChanged = this.layerConfig.width != longestLine;
-
-        var horizScroll = this.$horizScrollAlwaysVisible || this.$size.scrollerWidth - longestLine < 0;
-        var horizScrollChanged = this.$horizScroll !== horizScroll;
-        this.$horizScroll = horizScroll;
-        if (horizScrollChanged)
-            this.scroller.style.overflowX = horizScroll ? "scroll" : "hidden";
-
-        var maxHeight = this.session.getScreenLength() * this.lineHeight;
-        this.scrollTop = Math.max(0, Math.min(this.scrollTop, maxHeight - this.$size.scrollerHeight));
-
-        var lineCount = Math.ceil(minHeight / this.lineHeight) - 1;
-        var firstRow = Math.max(0, Math.round((this.scrollTop - offset) / this.lineHeight));
-        var lastRow = firstRow + lineCount;
-
-        // Map lines on the screen to lines in the document.
-        var firstRowScreen, firstRowHeight;
-        var lineHeight = { lineHeight: this.lineHeight };
-        firstRow = session.screenToDocumentRow(firstRow, 0);
-
-        // Check if firstRow is inside of a foldLine. If true, then use the first
-        // row of the foldLine.
-        var foldLine = session.getFoldLine(firstRow);
-        if (foldLine) {
-            firstRow = foldLine.start.row;
-        }
-
-        firstRowScreen = session.documentToScreenRow(firstRow, 0);
-        firstRowHeight = session.getRowHeight(lineHeight, firstRow);
-
-        lastRow = Math.min(session.screenToDocumentRow(lastRow, 0), session.getLength() - 1);
-        minHeight = this.$size.scrollerHeight + session.getRowHeight(lineHeight, lastRow)+
-                                                firstRowHeight;
-
-        offset = this.scrollTop - firstRowScreen * this.lineHeight;
-
-        this.layerConfig = {
-            width : longestLine,
-            padding : this.$padding,
-            firstRow : firstRow,
-            firstRowScreen: firstRowScreen,
-            lastRow : lastRow,
-            lineHeight : this.lineHeight,
-            characterWidth : this.characterWidth,
-            minHeight : minHeight,
-            maxHeight : maxHeight,
-            offset : offset,
-            height : this.$size.scrollerHeight
-        };
-
-        // For debugging.
-        // console.log(JSON.stringify(this.layerConfig));
-
-        this.$gutterLayer.element.style.marginTop = (-offset) + "px";
-        this.content.style.marginTop = (-offset) + "px";
-        this.content.style.width = longestLine + "px";
-        this.content.style.height = minHeight + "px";
-
-        // scroller.scrollWidth was smaller than scrollLeft we needed
-        if (this.$desiredScrollLeft) {
-            this.scrollToX(this.$desiredScrollLeft);
-            this.$desiredScrollLeft = 0;
-        }
-
-        // Horizontal scrollbar visibility may have changed, which changes
-        // the client height of the scroller
-        if (horizScrollChanged)
-            this.onResize(true);
-    };
-
-    this.$updateLines = function() {
-        var firstRow = this.$changedLines.firstRow;
-        var lastRow = this.$changedLines.lastRow;
-        this.$changedLines = null;
-
-        var layerConfig = this.layerConfig;
-
-        // if the update changes the width of the document do a full redraw
-        if (layerConfig.width != this.$getLongestLine())
-            return this.$textLayer.update(layerConfig);
-
-        if (firstRow > layerConfig.lastRow + 1) { return; }
-        if (lastRow < layerConfig.firstRow) { return; }
-
-        // if the last row is unknown -> redraw everything
-        if (lastRow === Infinity) {
-            if (this.showGutter)
-                this.$gutterLayer.update(layerConfig);
-            this.$textLayer.update(layerConfig);
-            return;
-        }
-
-        // else update only the changed rows
-        this.$textLayer.updateLines(layerConfig, firstRow, lastRow);
-    };
-
-    this.$getLongestLine = function() {
-        var charCount = this.session.getScreenWidth() + 1;
-        if (this.$textLayer.showInvisibles)
-            charCount += 1;
-
-        return Math.max(this.$size.scrollerWidth, Math.round(charCount * this.characterWidth));
-    };
-
-    this.updateFrontMarkers = function() {
-        this.$markerFront.setMarkers(this.session.getMarkers(true));
-        this.$loop.schedule(this.CHANGE_MARKER_FRONT);
-    };
-
-    this.updateBackMarkers = function() {
-        this.$markerBack.setMarkers(this.session.getMarkers());
-        this.$loop.schedule(this.CHANGE_MARKER_BACK);
-    };
-
-    this.addGutterDecoration = function(row, className){
-        this.$gutterLayer.addGutterDecoration(row, className);
-        this.$loop.schedule(this.CHANGE_GUTTER);
-    };
-
-    this.removeGutterDecoration = function(row, className){
-        this.$gutterLayer.removeGutterDecoration(row, className);
-        this.$loop.schedule(this.CHANGE_GUTTER);
-    };
-
-    this.setBreakpoints = function(rows) {
-        this.$gutterLayer.setBreakpoints(rows);
-        this.$loop.schedule(this.CHANGE_GUTTER);
-    };
-
-    this.setAnnotations = function(annotations) {
-        this.$gutterLayer.setAnnotations(annotations);
-        this.$loop.schedule(this.CHANGE_GUTTER);
-    };
-
-    this.updateCursor = function() {
-        this.$loop.schedule(this.CHANGE_CURSOR);
-    };
-
-    this.hideCursor = function() {
-        this.$cursorLayer.hideCursor();
-    };
-
-    this.showCursor = function() {
-        this.$cursorLayer.showCursor();
-    };
-
-    this.scrollCursorIntoView = function() {
-        // the editor is not visible
-        if (this.$size.scrollerHeight === 0)
-            return;
-
-        var pos = this.$cursorLayer.getPixelPosition();
-
-        var left = pos.left + this.$padding;
-        var top = pos.top;
-
-        if (this.scrollTop > top) {
-            this.scrollToY(top);
-        }
-
-        if (this.scrollTop + this.$size.scrollerHeight < top + this.lineHeight) {
-            this.scrollToY(top + this.lineHeight - this.$size.scrollerHeight);
-        }
-
-        var scrollLeft = this.scroller.scrollLeft;
-
-        if (scrollLeft > left) {
-            this.scrollToX(left);
-        }
-
-        if (scrollLeft + this.$size.scrollerWidth < left + this.characterWidth) {
-            if (left > this.layerConfig.width)
-                this.$desiredScrollLeft = left + 2 * this.characterWidth;
-            else
-                this.scrollToX(Math.round(left + this.characterWidth - this.$size.scrollerWidth));
-        }
-    };
-
-    this.getScrollTop = function() {
-        return this.scrollTop;
-    };
-
-    this.getScrollLeft = function() {
-        return this.scroller.scrollLeft;
-    };
-
-    this.getScrollTopRow = function() {
-        return this.scrollTop / this.lineHeight;
-    };
-
-    this.getScrollBottomRow = function() {
-        return Math.max(0, Math.floor((this.scrollTop + this.$size.scrollerHeight) / this.lineHeight) - 1);
-    };
-
-    this.scrollToRow = function(row) {
-        this.scrollToY(row * this.lineHeight);
-    };
-
-    this.scrollToLine = function(line, center) {
-        var lineHeight = { lineHeight: this.lineHeight };
-        var offset = 0;
-        for (var l = 1; l < line; l++) {
-            offset += this.session.getRowHeight(lineHeight, l-1);
-        }
-
-        if (center) {
-            offset -= this.$size.scrollerHeight / 2;
-        }
-        this.scrollToY(offset);
-    };
-
-    this.scrollToY = function(scrollTop) {
-        // after calling scrollBar.setScrollTop
-        // scrollbar sends us event with same scrollTop. ignore it
-        scrollTop = Math.max(0, scrollTop);
-        if (this.scrollTop !== scrollTop) {
-            this.$loop.schedule(this.CHANGE_SCROLL);
-            this.scrollTop = scrollTop;
-        }
-    };
-
-    this.scrollToX = function(scrollLeft) {
-        if (scrollLeft <= this.$padding)
-            scrollLeft = 0;
-
-        this.scroller.scrollLeft = scrollLeft;
-    };
-
-    this.scrollBy = function(deltaX, deltaY) {
-        deltaY && this.scrollToY(this.scrollTop + deltaY);
-        deltaX && this.scrollToX(this.scroller.scrollLeft + deltaX);
-    };
-
-    this.screenToTextCoordinates = function(pageX, pageY) {
-        var canvasPos = this.scroller.getBoundingClientRect();
-
-        var col = Math.round((pageX + this.scroller.scrollLeft - canvasPos.left - this.$padding - dom.getPageScrollLeft())
-                / this.characterWidth);
-        var row = Math.floor((pageY + this.scrollTop - canvasPos.top - dom.getPageScrollTop())
-                / this.lineHeight);
-
-        return this.session.screenToDocumentPosition(row, Math.max(col, 0));
-    };
-
-    this.textToScreenCoordinates = function(row, column) {
-        var canvasPos = this.scroller.getBoundingClientRect();
-        var pos = this.session.documentToScreenPosition(row, column);
-
-        var x = this.$padding + Math.round(pos.column * this.characterWidth);
-        var y = pos.row * this.lineHeight;
-
-        return {
-            pageX: canvasPos.left + x - this.getScrollLeft(),
-            pageY: canvasPos.top + y - this.getScrollTop()
-        };
-    };
-
-    this.visualizeFocus = function() {
-        dom.addCssClass(this.container, "ace_focus");
-    };
-
-    this.visualizeBlur = function() {
-        dom.removeCssClass(this.container, "ace_focus");
-    };
-
-    this.showComposition = function(position) {
-        if (!this.$composition) {
-            this.$composition = dom.createElement("div");
-            this.$composition.className = "ace_composition";
-            this.content.appendChild(this.$composition);
-        }
-
-        this.$composition.innerHTML = "&#160;";
-
-        var pos = this.$cursorLayer.getPixelPosition();
-        var style = this.$composition.style;
-        style.top = pos.top + "px";
-        style.left = (pos.left + this.$padding) + "px";
-        style.height = this.lineHeight + "px";
-
-        this.hideCursor();
-    };
-
-    this.setCompositionText = function(text) {
-        dom.setInnerText(this.$composition, text);
-    };
-
-    this.hideComposition = function() {
-        this.showCursor();
-
-        if (!this.$composition)
-            return;
-
-        var style = this.$composition.style;
-        style.top = "-10000px";
-        style.left = "-10000px";
-    };
-
-    this.setTheme = function(theme) {
-        var _self = this;
-
-        this.$themeValue = theme;
-        if (!theme || typeof theme == "string") {
-            theme = theme || "ace/theme/textmate";
-            require([theme], function(theme) {
-                afterLoad(theme);
-            });
-        } else {
-            afterLoad(theme);
-        }
-
-        function afterLoad(theme) {
-            if (_self.$theme)
-                dom.removeCssClass(_self.container, _self.$theme);
-
-            _self.$theme = theme ? theme.cssClass : null;
-
-            if (_self.$theme)
-                dom.addCssClass(_self.container, _self.$theme);
-
-            // force re-measure of the gutter width
-            if (_self.$size) {
-                _self.$size.width = 0;
-                _self.onResize();
-            }
-        }
-    };
-
-    this.getTheme = function() {
-        return this.$themeValue;
-    };
-
-    // Methods allows to add / remove CSS classnames to the editor element.
-    // This feature can be used by plug-ins to provide a visual indication of
-    // a certain mode that editor is in.
-
-    this.setStyle = function setStyle(style) {
-      dom.addCssClass(this.container, style);
-    };
-
-    this.unsetStyle = function unsetStyle(style) {
-      dom.removeCssClass(this.container, style);
-    };
-
-    this.destroy = function() {
-        this.$textLayer.destroy();
-        this.$cursorLayer.destroy();
-    };
-
-}).call(VirtualRenderer.prototype);
-
-exports.VirtualRenderer = VirtualRenderer;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/layer/gutter', ['require', 'exports', 'module' , 'pilot/dom'], function(require, exports, module) {
-
-var dom = require("pilot/dom");
-
-var Gutter = function(parentEl) {
-    this.element = dom.createElement("div");
-    this.element.className = "ace_layer ace_gutter-layer";
-    parentEl.appendChild(this.element);
-
-    this.$breakpoints = [];
-    this.$annotations = [];
-    this.$decorations = [];
-};
-
-(function() {
-
-    this.setSession = function(session) {
-        this.session = session;
-    };
-
-    this.addGutterDecoration = function(row, className){
-        if (!this.$decorations[row])
-            this.$decorations[row] = "";
-        this.$decorations[row] += " ace_" + className;
-    }
-
-    this.removeGutterDecoration = function(row, className){
-        this.$decorations[row] = this.$decorations[row].replace(" ace_" + className, "");
-    };
-
-    this.setBreakpoints = function(rows) {
-        this.$breakpoints = rows.concat();
-    };
-
-    this.setAnnotations = function(annotations) {
-        // iterate over sparse array
-        this.$annotations = [];
-        for (var row in annotations) if (annotations.hasOwnProperty(row)) {
-            var rowAnnotations = annotations[row];
-            if (!rowAnnotations)
-                continue;
-
-            var rowInfo = this.$annotations[row] = {
-                text: []
-            };
-            for (var i=0; i<rowAnnotations.length; i++) {
-                var annotation = rowAnnotations[i];
-                rowInfo.text.push(annotation.text.replace(/"/g, "&quot;").replace(/'/g, "&#8217;").replace(/</, "&lt;"));
-                var type = annotation.type;
-                if (type == "error")
-                    rowInfo.className = "ace_error";
-                else if (type == "warning" && rowInfo.className != "ace_error")
-                    rowInfo.className = "ace_warning";
-                else if (type == "info" && (!rowInfo.className))
-                    rowInfo.className = "ace_info";
-            }
-        }
-    };
-
-    this.update = function(config) {
-        this.$config = config;
-
-        var emptyAnno = {className: "", text: []};
-        var html = [];
-        var i = config.firstRow;
-        var lastRow = config.lastRow;
-        var fold = this.session.getNextFold(i);
-        var foldStart = fold ? fold.start.row : Infinity;
-
-        while (true) {
-            if(i > foldStart) {
-                i = fold.end.row + 1;
-                fold = this.session.getNextFold(i);
-                foldStart = fold ?fold.start.row :Infinity;
-            }
-            if(i > lastRow)
-                break;
-
-            var annotation = this.$annotations[i] || emptyAnno;
-            html.push("<div class='ace_gutter-cell",
-                this.$decorations[i] || "",
-                this.$breakpoints[i] ? " ace_breakpoint " : " ",
-                annotation.className,
-                "' title='", annotation.text.join("\n"),
-                "' style='height:", config.lineHeight, "px;'>", (i+1));
-
-            var wrappedRowLength = this.session.getRowLength(i) - 1;
-            while (wrappedRowLength--) {
-                html.push("</div><div class='ace_gutter-cell' style='height:", config.lineHeight, "px'>&brvbar;</div>");
-            }
-
-            html.push("</div>");
-
-            i++;
-        }
-        this.element = dom.setInnerHtml(this.element, html.join(""));
-        this.element.style.height = config.minHeight + "px";
-    };
-
-}).call(Gutter.prototype);
-
-exports.Gutter = Gutter;
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/layer/marker', ['require', 'exports', 'module' , 'ace/range', 'pilot/dom'], function(require, exports, module) {
-
-var Range = require("ace/range").Range;
-var dom = require("pilot/dom");
-
-var Marker = function(parentEl) {
-    this.element = dom.createElement("div");
-    this.element.className = "ace_layer ace_marker-layer";
-    parentEl.appendChild(this.element);
-};
-
-(function() {
-
-    this.$padding = 0;
-
-    this.setPadding = function(padding) {
-        this.$padding = padding;
-    };
-    this.setSession = function(session) {
-        this.session = session;
-    };
-    
-    this.setMarkers = function(markers) {
-        this.markers = markers;
-    };
-
-    this.update = function(config) {
-        var config = config || this.config;
-        if (!config)
-            return;
-
-        this.config = config;
-
-
-        var html = [];
-        for ( var key in this.markers) {
-            var marker = this.markers[key];
-
-            var range = marker.range.clipRows(config.firstRow, config.lastRow);
-            if (range.isEmpty()) continue;
-
-            range = range.toScreenRange(this.session);
-            if (marker.renderer) {
-                var top = this.$getTop(range.start.row, config);
-                var left = Math.round(
-                    this.$padding + range.start.column * config.characterWidth
-                );
-                marker.renderer(html, range, left, top, config);
-            }
-            else if (range.isMultiLine()) {
-                if (marker.type == "text") {
-                    this.drawTextMarker(html, range, marker.clazz, config);
-                } else {
-                    this.drawMultiLineMarker(
-                        html, range, marker.clazz, config,
-                        marker.type
-                    );
-                }
-            }
-            else {
-                this.drawSingleLineMarker(
-                    html, range, marker.clazz, config,
-                    null, marker.type
-                );
-            }
-        }
-        this.element = dom.setInnerHtml(this.element, html.join(""));
-    };
-
-    this.$getTop = function(row, layerConfig) {
-        return (row - layerConfig.firstRowScreen) * layerConfig.lineHeight;
-    };
-
-    /**
-     * Draws a marker, which spans a range of text in a single line
-     */ 
-    this.drawTextMarker = function(stringBuilder, range, clazz, layerConfig) {
-        // selection start
-        var row = range.start.row;
-
-        var lineRange = new Range(
-            row, range.start.column,
-            row, this.session.getScreenLastRowColumn(row)
-        );
-        this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 1, "text");
-
-        // selection end
-        row = range.end.row;
-        lineRange = new Range(row, 0, row, range.end.column);
-        this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 0, "text");
-
-        for (row = range.start.row + 1; row < range.end.row; row++) {
-            lineRange.start.row = row;
-            lineRange.end.row = row;
-            lineRange.end.column = this.session.getScreenLastRowColumn(row);
-            this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 1, "text");
-        }
-    };
-
-    /**
-     * Draws a multi line marker, where lines span the full width
-     */
-     this.drawMultiLineMarker = function(stringBuilder, range, clazz, layerConfig, type) {
-        // from selection start to the end of the line
-        var padding = type === "background" ? 0 : this.$padding;
-        var height = layerConfig.lineHeight;
-        var width = Math.round(layerConfig.width - (range.start.column * layerConfig.characterWidth));
-        var top = this.$getTop(range.start.row, layerConfig);
-        var left = Math.round(
-            padding + range.start.column * layerConfig.characterWidth
-        );
-
-        stringBuilder.push(
-            "<div class='", clazz, "' style='",
-            "height:", height, "px;",
-            "width:", width, "px;",
-            "top:", top, "px;",
-            "left:", left, "px;'></div>"
-        );
-
-        // from start of the last line to the selection end
-        top = this.$getTop(range.end.row, layerConfig);
-        width = Math.round(range.end.column * layerConfig.characterWidth);
-
-        stringBuilder.push(
-            "<div class='", clazz, "' style='",
-            "height:", height, "px;",
-            "width:", width, "px;",
-            "top:", top, "px;",
-            "left:", padding, "px;'></div>"
-        );
-
-        // all the complete lines
-        height = (range.end.row - range.start.row - 1) * layerConfig.lineHeight;
-        if (height < 0)
-            return;
-        top = this.$getTop(range.start.row + 1, layerConfig);
-        width = layerConfig.width;
-
-        stringBuilder.push(
-            "<div class='", clazz, "' style='",
-            "height:", height, "px;",
-            "width:", width, "px;",
-            "top:", top, "px;",
-            "left:", padding, "px;'></div>"
-        );
-    };
-
-    /**
-     * Draws a marker which covers one single full line
-     */
-    this.drawSingleLineMarker = function(stringBuilder, range, clazz, layerConfig, extraLength, type) {
-        var padding = type === "background" ? 0 : this.$padding;
-        var height = layerConfig.lineHeight;
-
-        if (type === "background")
-            var width = layerConfig.width;
-        else
-            width = Math.round((range.end.column + (extraLength || 0) - range.start.column) * layerConfig.characterWidth);
-
-        var top = this.$getTop(range.start.row, layerConfig);
-        var left = Math.round(
-            padding + range.start.column * layerConfig.characterWidth
-        );
-
-        stringBuilder.push(
-            "<div class='", clazz, "' style='",
-            "height:", height, "px;",
-            "width:", width, "px;",
-            "top:", top, "px;",
-            "left:", left,"px;'></div>"
-        );
-    };
-
-}).call(Marker.prototype);
-
-exports.Marker = Marker;
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *      Mihai Sucan <mihai.sucan@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/layer/text', ['require', 'exports', 'module' , 'pilot/oop', 'pilot/dom', 'pilot/lang', 'pilot/useragent', 'pilot/event_emitter'], function(require, exports, module) {
-
-var oop = require("pilot/oop");
-var dom = require("pilot/dom");
-var lang = require("pilot/lang");
-var useragent = require("pilot/useragent");
-var EventEmitter = require("pilot/event_emitter").EventEmitter;
-
-var Text = function(parentEl) {
-    this.element = dom.createElement("div");
-    this.element.className = "ace_layer ace_text-layer";
-    this.element.style.width = "auto";
-    parentEl.appendChild(this.element);
-
-    this.$characterSize = this.$measureSizes() || {width: 0, height: 0};
-    this.$pollSizeChanges();
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.EOF_CHAR = "&para;";
-    this.EOL_CHAR = "&not;";
-    this.TAB_CHAR = "&rarr;";
-    this.SPACE_CHAR = "&middot;";
-    this.$padding = 0;
-
-    this.setPadding = function(padding) {
-        this.$padding = padding;
-        this.element.style.padding = "0 " + padding + "px";
-    };
-
-    this.getLineHeight = function() {
-        return this.$characterSize.height || 1;
-    };
-
-    this.getCharacterWidth = function() {
-        return this.$characterSize.width || 1;
-    };
-
-    this.checkForSizeChanges = function() {
-        var size = this.$measureSizes();
-        if (size && (this.$characterSize.width !== size.width || this.$characterSize.height !== size.height)) {
-            this.$characterSize = size;
-            this._dispatchEvent("changeCharaterSize", {data: size});
-        }
-    };
-
-    this.$pollSizeChanges = function() {
-        var self = this;
-        this.$pollSizeChangesTimer = setInterval(function() {
-            self.checkForSizeChanges();
-        }, 500);
-    };
-
-    this.$fontStyles = {
-        fontFamily : 1,
-        fontSize : 1,
-        fontWeight : 1,
-        fontStyle : 1,
-        lineHeight : 1
-    };
-
-    this.$measureSizes = function() {
-        var n = 1000;
-        if (!this.$measureNode) {
-            var measureNode = this.$measureNode = dom.createElement("div");
-            var style = measureNode.style;
-
-            style.width = style.height = "auto";
-            style.left = style.top = (-n * 40)  + "px";
-
-            style.visibility = "hidden";
-            style.position = "absolute";
-            style.overflow = "visible";
-            style.whiteSpace = "nowrap";
-
-            // in FF 3.6 monospace fonts can have a fixed sub pixel width.
-            // that's why we have to measure many characters
-            // Note: characterWidth can be a float!
-            measureNode.innerHTML = lang.stringRepeat("Xy", n);
-
-            if (document.body) {
-                document.body.appendChild(measureNode);
-            } else {
-                var container = this.element.parentNode;
-                while (!dom.hasCssClass(container, "ace_editor"))
-                    container = container.parentNode;
-                container.appendChild(measureNode);
-            }
-
-        }
-
-        var style = this.$measureNode.style;
-        var computedStyle = dom.computedStyle(this.element);
-        for (var prop in this.$fontStyles)
-            style[prop] = computedStyle[prop];
-
-        var size = {
-            height: this.$measureNode.offsetHeight,
-            width: this.$measureNode.offsetWidth / (n * 2)
-        };
-
-        // Size and width can be null if the editor is not visible or
-        // detached from the document
-        if (size.width == 0 && size.height == 0)
-            return null;
-
-        return size;
-    };
-
-    this.setSession = function(session) {
-        this.session = session;
-    };
-
-    this.showInvisibles = false;
-    this.setShowInvisibles = function(showInvisibles) {
-        if (this.showInvisibles == showInvisibles)
-            return false;
-
-        this.showInvisibles = showInvisibles;
-        return true;
-    };
-
-    this.$tabStrings = [];
-    this.$computeTabString = function() {
-        var tabSize = this.session.getTabSize();
-        var tabStr = this.$tabStrings = [0];
-        for (var i = 1; i < tabSize + 1; i++) {
-            if (this.showInvisibles) {
-                tabStr.push("<span class='ace_invisible'>"
-                    + this.TAB_CHAR
-                    + new Array(i).join("&#160;")
-                    + "</span>");
-            } else {
-                tabStr.push(new Array(i+1).join("&#160;"));
-            }
-        }
-
-    };
-
-    this.updateLines = function(config, firstRow, lastRow) {
-        this.$computeTabString();
-        // Due to wrap line changes there can be new lines if e.g.
-        // the line to updated wrapped in the meantime.
-        if (this.config.lastRow != config.lastRow ||
-            this.config.firstRow != config.firstRow) {
-            this.scrollLines(config);
-        }
-        this.config = config;
-
-        var first = Math.max(firstRow, config.firstRow);
-        var last = Math.min(lastRow, config.lastRow);
-
-        var lineElements = this.element.childNodes;
-        var lineElementsIdx = 0;
-
-        for (var row = config.firstRow; row < first; row++) {
-            var foldLine = this.session.getFoldLine(row);
-            if (foldLine) {
-                if (foldLine.containsRow(first)) {
-                    break;
-                } else {
-                    row = foldLine.end.row;
-                }
-            }
-            lineElementsIdx ++;
-        }
-
-        for (var i=first; i<=last; i++) {
-            var lineElement = lineElements[lineElementsIdx++];
-            if (!lineElement)
-                continue;
-
-            var html = [];
-            var tokens = this.session.getTokens(i, i);
-            this.$renderLine(html, i, tokens[0].tokens, true);
-            lineElement = dom.setInnerHtml(lineElement, html.join(""));
-
-            i = this.session.getRowFoldEnd(i);
-        }
-    };
-
-    this.scrollLines = function(config) {
-        this.$computeTabString();
-        var oldConfig = this.config;
-        this.config = config;
-
-        if (!oldConfig || oldConfig.lastRow < config.firstRow)
-            return this.update(config);
-
-        if (config.lastRow < oldConfig.firstRow)
-            return this.update(config);
-
-        var el = this.element;
-        if (oldConfig.firstRow < config.firstRow)
-            for (var row=this.session.getFoldedRowCount(oldConfig.firstRow, config.firstRow - 1); row>0; row--)
-                el.removeChild(el.firstChild);
-
-        if (oldConfig.lastRow > config.lastRow)
-            for (var row=this.session.getFoldedRowCount(config.lastRow + 1, oldConfig.lastRow); row>0; row--)
-                el.removeChild(el.lastChild);
-
-        if (config.firstRow < oldConfig.firstRow) {
-            var fragment = this.$renderLinesFragment(config, config.firstRow, oldConfig.firstRow - 1);
-            if (el.firstChild)
-                el.insertBefore(fragment, el.firstChild);
-            else
-                el.appendChild(fragment);
-        }
-
-        if (config.lastRow > oldConfig.lastRow) {
-            var fragment = this.$renderLinesFragment(config, oldConfig.lastRow + 1, config.lastRow);
-            el.appendChild(fragment);
-        }
-    };
-
-    this.$renderLinesFragment = function(config, firstRow, lastRow) {
-        var fragment = document.createDocumentFragment(),
-            row = firstRow,
-            fold = this.session.getNextFold(row),
-            foldStart = fold ?fold.start.row :Infinity;
-
-        while (true) {
-            if(row > foldStart) {
-                row = fold.end.row+1;
-                fold = this.session.getNextFold(row);
-                foldStart = fold ?fold.start.row :Infinity;
-            }
-            if(row > lastRow)
-                break;
-
-            var container = dom.createElement("div");
-
-            var html = [];
-            // Get the tokens per line as there might be some lines in between
-            // beeing folded.
-            // OPTIMIZE: If there is a long block of unfolded lines, just make
-            // this call once for that big block of unfolded lines.
-            var tokens = this.session.getTokens(row, row);
-            if (tokens.length == 1)
-                this.$renderLine(html, row, tokens[0].tokens, false);
-
-            // don't use setInnerHtml since we are working with an empty DIV
-            container.innerHTML = html.join("");
-            var lines = container.childNodes
-            while(lines.length)
-                fragment.appendChild(lines[0]);
-
-            row++;
-        }
-        return fragment;
-    };
-
-    this.update = function(config) {
-        this.$computeTabString();
-        this.config = config;
-
-        var html = [];
-        var firstRow = config.firstRow, lastRow = config.lastRow;
-
-        var row = firstRow,
-            fold = this.session.getNextFold(row),
-            foldStart = fold ?fold.start.row :Infinity;
-
-        while (true) {
-            if(row > foldStart) {
-                row = fold.end.row+1;
-                fold = this.session.getNextFold(row);
-                foldStart = fold ?fold.start.row :Infinity;
-            }
-            if(row > lastRow)
-                break;
-
-            // Get the tokens per line as there might be some lines in between
-            // beeing folded.
-            // OPTIMIZE: If there is a long block of unfolded lines, just make
-            // this call once for that big block of unfolded lines.
-            var tokens = this.session.getTokens(row, row);
-            if (tokens.length == 1)
-                this.$renderLine(html, row, tokens[0].tokens, false);
-
-            row++;
-        }
-        this.element = dom.setInnerHtml(this.element, html.join(""));
-    };
-
-    this.$textToken = {
-        "text": true,
-        "rparen": true,
-        "lparen": true
-    };
-
-    this.$renderToken = function(stringBuilder, screenColumn, token, value) {        
-        var self = this;
-        var replaceReg = /\t|&|<|( +)|([\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000])|[\u1100-\u115F]|[\u11A3-\u11A7]|[\u11FA-\u11FF]|[\u2329-\u232A]|[\u2E80-\u2E99]|[\u2E9B-\u2EF3]|[\u2F00-\u2FD5]|[\u2FF0-\u2FFB]|[\u3000-\u303E]|[\u3041-\u3096]|[\u3099-\u30FF]|[\u3105-\u312D]|[\u3131-\u318E]|[\u3190-\u31BA]|[\u31C0-\u31E3]|[\u31F0-\u321E]|[\u3220-\u3247]|[\u3250-\u32FE]|[\u3300-\u4DBF]|[\u4E00-\uA48C]|[\uA490-\uA4C6]|[\uA960-\uA97C]|[\uAC00-\uD7A3]|[\uD7B0-\uD7C6]|[\uD7CB-\uD7FB]|[\uF900-\uFAFF]|[\uFE10-\uFE19]|[\uFE30-\uFE52]|[\uFE54-\uFE66]|[\uFE68-\uFE6B]|[\uFF01-\uFF60]|[\uFFE0-\uFFE6]/g;
-        var replaceFunc = function(c, a, b, tabIdx, idx4) {
-            if (c.charCodeAt(0) == 32) {
-                return new Array(c.length+1).join("&#160;");
-            } else if (c == "\t") {
-                var tabSize = self.session.getScreenTabSize(screenColumn + tabIdx);
-                screenColumn += tabSize - 1;
-                return self.$tabStrings[tabSize];
-            } else if (c == "&") {
-                if (useragent.isOldGecko)
-                    return "&";
-                else
-                    return "&amp;";
-            } else if (c == "<") {
-                return "&lt;";
-            } else if (c.match(/[\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000]/)) {
-                if (self.showInvisibles) {
-                    var space = new Array(c.length+1).join(self.SPACE_CHAR);
-                    return "<span class='ace_invisible'>" + space + "</span>";
-                } else {
-                    return "&#160;";
-                }
-            } else {
-                screenColumn += 1;
-                return "<span class='ace_cjk' style='width:" +
-                    (self.config.characterWidth * 2) +
-                    "px'>" + c + "</span>";
-            }
-        };
-
-        var output = value.replace(replaceReg, replaceFunc);
-
-        if (!this.$textToken[token.type]) {
-            var classes = "ace_" + token.type.replace(/\./g, " ace_");
-            stringBuilder.push("<span class='", classes, "'>", output, "</span>");
-        }
-        else {
-            stringBuilder.push(output);
-        }
-        return screenColumn + value.length;
-    };
-
-    this.$renderLineCore = function(stringBuilder, lastRow, tokens, splits, onlyContents) {
-        var chars = 0;
-        var split = 0;
-        var splitChars;
-        var characterWidth = this.config.characterWidth;
-        var screenColumn = 0;
-        var self = this;
-
-        if (!splits || splits.length == 0)
-            splitChars = Number.MAX_VALUE;
-        else
-            splitChars = splits[0];
-
-        if (!onlyContents) {
-            stringBuilder.push("<div class='ace_line' style='height:",
-                this.config.lineHeight, "px",
-                "'>"
-            );
-        }
-        
-        for (var i = 0; i < tokens.length; i++) {
-            var token = tokens[i];
-            var value = token.value;
-
-            if (chars + value.length < splitChars) {
-                screenColumn = self.$renderToken(
-                    stringBuilder, screenColumn, token, value
-                );
-                chars += value.length;
-            }
-            else {
-                while (chars + value.length >= splitChars) {
-                    screenColumn = self.$renderToken(
-                        stringBuilder, screenColumn, 
-                        token, value.substring(0, splitChars - chars)
-                    );
-                    value = value.substring(splitChars - chars);
-                    chars = splitChars;
-                    
-                    if (!onlyContents) {
-                        stringBuilder.push("</div>",
-                            "<div class='ace_line' style='height:",
-                            this.config.lineHeight, "px",
-                            "'>"
-                        );
-                    }
-
-                    split ++;
-                    screenColumn = 0;
-                    splitChars = splits[split] || Number.MAX_VALUE;
-                }
-                if (value.length != 0) {
-                    chars += value.length;
-                    screenColumn = self.$renderToken(
-                        stringBuilder, screenColumn, token, value
-                    );
-                }
-            }
-        }
-
-        if (this.showInvisibles) {
-            if (lastRow !== this.session.getLength() - 1)
-                stringBuilder.push("<span class='ace_invisible'>" + this.EOL_CHAR + "</span>");
-            else
-                stringBuilder.push("<span class='ace_invisible'>" + this.EOF_CHAR + "</span>");
-        }
-        stringBuilder.push("</div>");
-    };
-
-    this.$renderLine = function(stringBuilder, row, tokens, onlyContents) {
-        // Check if the line to render is folded or not. If not, things are
-        // simple, otherwise, we need to fake some things...
-        if (!this.session.isRowFolded(row)) {
-            var splits = this.session.getRowSplitData(row);
-            this.$renderLineCore(stringBuilder, row, tokens, splits, onlyContents);
-        } else {
-            this.$renderFoldLine(stringBuilder, row, tokens, onlyContents);
-        }
-    };
-
-    this.$renderFoldLine = function(stringBuilder, row, tokens, onlyContents) {
-        var session = this.session,
-            foldLine = session.getFoldLine(row),
-            renderTokens = [];
-
-        function addTokens(tokens, from, to) {
-            var idx = 0, col = 0;
-            while ((col + tokens[idx].value.length) < from) {
-                col += tokens[idx].value.length;
-                idx++;
-
-                if (idx == tokens.length) {
-                    return;
-                }
-            }
-            if (col != from) {
-                var value = tokens[idx].value.substring(from - col);
-                // Check if the token value is longer then the from...to spacing.
-                if (value.length > (to - from)) {
-                    value = value.substring(0, to - from);
-                }
-
-                renderTokens.push({
-                    type: tokens[idx].type,
-                    value: value
-                });
-
-                col = from + value.length;
-                idx += 1;
-            }
-
-            while (col < to) {
-                var value = tokens[idx].value;
-                if (value.length + col > to) {
-                    value = value.substring(0, to - col);
-                }
-                renderTokens.push({
-                    type: tokens[idx].type,
-                    value: value
-                });
-                col += value.length;
-                idx += 1;
-            }
-        }
-
-        foldLine.walk(function(placeholder, row, column, lastColumn, isNewRow) {
-            if (placeholder) {
-               renderTokens.push({
-                    type: "fold",
-                    value: placeholder
-                });
-            } else {
-                if (isNewRow) {
-                   tokens = this.session.getTokens(row, row)[0].tokens;
-                }
-                if (tokens.length != 0) {
-                    addTokens(tokens, lastColumn, column);
-                }
-            }
-        }.bind(this), foldLine.end.row, this.session.getLine(foldLine.end.row).length);
-
-        // TODO: Build a fake splits array!
-        var splits = this.session.$useWrapMode?this.session.$wrapData[row]:null;
-        this.$renderLineCore(stringBuilder, row, renderTokens, splits, onlyContents);
-    };
-
-    this.destroy = function() {
-        clearInterval(this.$pollSizeChangesTimer);
-        if (this.$measureNode)
-            this.$measureNode.parentNode.removeChild(this.$measureNode);
-        delete this.$measureNode;
-    };
-
-}).call(Text.prototype);
-
-exports.Text = Text;
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/layer/cursor', ['require', 'exports', 'module' , 'pilot/dom'], function(require, exports, module) {
-
-var dom = require("pilot/dom");
-
-var Cursor = function(parentEl) {
-    this.element = dom.createElement("div");
-    this.element.className = "ace_layer ace_cursor-layer";
-    parentEl.appendChild(this.element);
-
-    this.cursor = dom.createElement("div");
-    this.cursor.className = "ace_cursor ace_hidden";
-    this.element.appendChild(this.cursor);
-
-    this.isVisible = false;
-};
-
-(function() {
-
-    this.$padding = 0;
-    this.setPadding = function(padding) {
-        this.$padding = padding;
-    };
-
-    this.setSession = function(session) {
-        this.session = session;
-    };
-
-    this.hideCursor = function() {
-        this.isVisible = false;
-        dom.addCssClass(this.cursor, "ace_hidden");
-        clearInterval(this.blinkId);
-    };
-
-    this.showCursor = function() {
-        this.isVisible = true;
-        dom.removeCssClass(this.cursor, "ace_hidden");
-        this.cursor.style.visibility = "visible";
-        this.restartTimer();
-    };
-
-    this.restartTimer = function() {
-        clearInterval(this.blinkId);
-        if (!this.isVisible) {
-            return;
-        }
-
-        var cursor = this.cursor;
-        this.blinkId = setInterval(function() {
-            cursor.style.visibility = "hidden";
-            setTimeout(function() {
-                cursor.style.visibility = "visible";
-            }, 400);
-        }, 1000);
-    };
-
-    this.getPixelPosition = function(onScreen) {
-        if (!this.config || !this.session) {
-            return {
-                left : 0,
-                top : 0
-            };
-        }
-
-        var position = this.session.selection.getCursor();
-        var pos = this.session.documentToScreenPosition(position);
-        var cursorLeft = Math.round(this.$padding +
-                                    pos.column * this.config.characterWidth);
-        var cursorTop = (pos.row - (onScreen ? this.config.firstRowScreen : 0)) *
-            this.config.lineHeight;
-
-        return {
-            left : cursorLeft,
-            top : cursorTop
-        };
-    };
-
-    this.update = function(config) {
-        this.config = config;
-
-        this.pixelPos = this.getPixelPosition(true);
-
-        this.cursor.style.left = this.pixelPos.left + "px";
-        this.cursor.style.top =  this.pixelPos.top + "px";
-        this.cursor.style.width = config.characterWidth + "px";
-        this.cursor.style.height = config.lineHeight + "px";
-
-        var overwrite = this.session.getOverwrite()
-        if (overwrite != this.overwrite) {
-            this.overwrite = overwrite;
-            if (overwrite)
-                dom.addCssClass(this.cursor, "ace_overwrite");
-            else
-                dom.removeCssClass(this.cursor, "ace_overwrite");
-        }
-
-        this.restartTimer();
-    };
-
-    this.destroy = function() {
-        clearInterval(this.blinkId);
-    }
-
-}).call(Cursor.prototype);
-
-exports.Cursor = Cursor;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/scrollbar', ['require', 'exports', 'module' , 'pilot/oop', 'pilot/dom', 'pilot/event', 'pilot/event_emitter'], function(require, exports, module) {
-
-var oop = require("pilot/oop");
-var dom = require("pilot/dom");
-var event = require("pilot/event");
-var EventEmitter = require("pilot/event_emitter").EventEmitter;
-
-var ScrollBar = function(parent) {
-    this.element = dom.createElement("div");
-    this.element.className = "ace_sb";
-
-    this.inner = dom.createElement("div");
-    this.element.appendChild(this.inner);
-
-    parent.appendChild(this.element);
-
-    // in OSX lion the scrollbars appear to have no width. In this case resize
-    // the to show the scrollbar but still pretend that the scrollbar has a width
-    // of 0px
-    this.width = dom.scrollbarWidth();
-    this.element.style.width = (this.width || 15) + "px";
-
-    event.addListener(this.element, "scroll", this.onScroll.bind(this));
-};
-
-(function() {
-    oop.implement(this, EventEmitter);
-
-    this.onScroll = function() {
-        this._dispatchEvent("scroll", {data: this.element.scrollTop});
-    };
-
-    this.getWidth = function() {
-        return this.width;
-    };
-
-    this.setHeight = function(height) {
-        this.element.style.height = height + "px";
-    };
-
-    this.setInnerHeight = function(height) {
-        this.inner.style.height = height + "px";
-    };
-
-    this.setScrollTop = function(scrollTop) {
-        this.element.scrollTop = scrollTop;
-    };
-
-}).call(ScrollBar.prototype);
-
-exports.ScrollBar = ScrollBar;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/renderloop', ['require', 'exports', 'module' , 'pilot/event'], function(require, exports, module) {
-
-var event = require("pilot/event");
-
-var RenderLoop = function(onRender) {
-    this.onRender = onRender;
-    this.pending = false;
-    this.changes = 0;
-};
-
-(function() {
-
-    this.schedule = function(change) {
-        //this.onRender(change);
-        //return;
-        this.changes = this.changes | change;
-        if (!this.pending) {
-            this.pending = true;
-            var _self = this;
-            this.setTimeoutZero(function() {
-                _self.pending = false;
-                var changes = _self.changes;
-                _self.changes = 0;
-                _self.onRender(changes);
-            })
-        }
-    };
-
-    this.setTimeoutZero = window.requestAnimationFrame ||
-         window.webkitRequestAnimationFrame ||
-         window.mozRequestAnimationFrame ||
-         window.oRequestAnimationFrame ||
-         window.msRequestAnimationFrame;
-
-    if (this.setTimeoutZero) {
-
-        this.setTimeoutZero = this.setTimeoutZero.bind(window)
-    } else if (window.postMessage) {
-
-        this.messageName = "zero-timeout-message";
-
-        this.setTimeoutZero = function(callback) {
-            if (!this.attached) {
-                var _self = this;
-                event.addListener(window, "message", function(e) {
-                    if (_self.callback && e.data == _self.messageName) {
-                        event.stopPropagation(e);
-                        _self.callback();
-                    }
-                });
-                this.attached = true;
-            }
-            this.callback = callback;
-            window.postMessage(this.messageName, "*");
-        }
-
-    } else {
-
-        this.setTimeoutZero = function(callback) {
-            setTimeout(callback, 0);
-        }
-    }
-
-}).call(RenderLoop.prototype);
-
-exports.RenderLoop = RenderLoop;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('ace/theme/textmate', ['require', 'exports', 'module' , 'pilot/dom'], function(require, exports, module) {
-
-    var dom = require("pilot/dom");
-
-    var cssText = ".ace-tm .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-tm .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-tm .ace_gutter {\
-  width: 50px;\
-  background: #e8e8e8;\
-  color: #333;\
-  overflow : hidden;\
-}\
-\
-.ace-tm .ace_gutter-layer {\
-  width: 100%;\
-  text-align: right;\
-}\
-\
-.ace-tm .ace_gutter-layer .ace_gutter-cell {\
-  padding-right: 6px;\
-}\
-\
-.ace-tm .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-tm .ace_text-layer {\
-  cursor: text;\
-}\
-\
-.ace-tm .ace_cursor {\
-  border-left: 2px solid black;\
-}\
-\
-.ace-tm .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid black;\
-}\
-        \
-.ace-tm .ace_line .ace_invisible {\
-  color: rgb(191, 191, 191);\
-}\
-\
-.ace-tm .ace_line .ace_keyword {\
-  color: blue;\
-}\
-\
-.ace-tm .ace_line .ace_constant.ace_buildin {\
-  color: rgb(88, 72, 246);\
-}\
-\
-.ace-tm .ace_line .ace_constant.ace_language {\
-  color: rgb(88, 92, 246);\
-}\
-\
-.ace-tm .ace_line .ace_constant.ace_library {\
-  color: rgb(6, 150, 14);\
-}\
-\
-.ace-tm .ace_line .ace_invalid {\
-  background-color: rgb(153, 0, 0);\
-  color: white;\
-}\
-\
-.ace-tm .ace_line .ace_fold {\
-    background-color: #E4E4E4;\
-    border-radius: 3px;\
-}\
-\
-.ace-tm .ace_line .ace_support.ace_function {\
-  color: rgb(60, 76, 114);\
-}\
-\
-.ace-tm .ace_line .ace_support.ace_constant {\
-  color: rgb(6, 150, 14);\
-}\
-\
-.ace-tm .ace_line .ace_support.ace_type,\
-.ace-tm .ace_line .ace_support.ace_class {\
-  color: rgb(109, 121, 222);\
-}\
-\
-.ace-tm .ace_line .ace_keyword.ace_operator {\
-  color: rgb(104, 118, 135);\
-}\
-\
-.ace-tm .ace_line .ace_string {\
-  color: rgb(3, 106, 7);\
-}\
-\
-.ace-tm .ace_line .ace_comment {\
-  color: rgb(76, 136, 107);\
-}\
-\
-.ace-tm .ace_line .ace_comment.ace_doc {\
-  color: rgb(0, 102, 255);\
-}\
-\
-.ace-tm .ace_line .ace_comment.ace_doc.ace_tag {\
-  color: rgb(128, 159, 191);\
-}\
-\
-.ace-tm .ace_line .ace_constant.ace_numeric {\
-  color: rgb(0, 0, 205);\
-}\
-\
-.ace-tm .ace_line .ace_variable {\
-  color: rgb(49, 132, 149);\
-}\
-\
-.ace-tm .ace_line .ace_xml_pe {\
-  color: rgb(104, 104, 91);\
-}\
-\
-.ace-tm .ace_marker-layer .ace_selection {\
-  background: rgb(181, 213, 255);\
-}\
-\
-.ace-tm .ace_marker-layer .ace_step {\
-  background: rgb(252, 255, 0);\
-}\
-\
-.ace-tm .ace_marker-layer .ace_stack {\
-  background: rgb(164, 229, 101);\
-}\
-\
-.ace-tm .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid rgb(192, 192, 192);\
-}\
-\
-.ace-tm .ace_marker-layer .ace_active_line {\
-  background: rgba(0, 0, 0, 0.07);\
-}\
-\
-.ace-tm .ace_marker-layer .ace_selected_word {\
-  background: rgb(250, 250, 255);\
-  border: 1px solid rgb(200, 200, 250);\
-}\
-\
-.ace-tm .ace_string.ace_regex {\
-  color: rgb(255, 0, 0)\
-}";
-
-    // import CSS once
-    dom.importCssString(cssText);
-
-    exports.cssClass = "ace-tm";
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is DomTemplate.
- *
- * The Initial Developer of the Original Code is Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Walker (jwalker@mozilla.com) (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/environment', ['require', 'exports', 'module' , 'pilot/settings'], function(require, exports, module) {
-
-
-var settings = require("pilot/settings").settings;
-
-/**
- * Create an environment object
- */
-function create() {
-    return {
-        settings: settings
-    };
-};
-
-exports.create = create;
-
-
-});
-define("text/cockpit/ui/cli_view.css", [], "" +
-  "#cockpitInput { padding-left: 16px; }" +
-  "" +
-  ".cptOutput { overflow: auto; position: absolute; z-index: 999; display: none; }" +
-  "" +
-  ".cptCompletion { padding: 0; position: absolute; z-index: -1000; }" +
-  ".cptCompletion.VALID { background: #FFF; }" +
-  ".cptCompletion.INCOMPLETE { background: #DDD; }" +
-  ".cptCompletion.INVALID { background: #DDD; }" +
-  ".cptCompletion span { color: #FFF; }" +
-  ".cptCompletion span.INCOMPLETE { color: #DDD; border-bottom: 2px dotted #F80; }" +
-  ".cptCompletion span.INVALID { color: #DDD; border-bottom: 2px dotted #F00; }" +
-  "span.cptPrompt { color: #66F; font-weight: bold; }" +
-  "" +
-  "" +
-  ".cptHints {" +
-  "  color: #000;" +
-  "  position: absolute;" +
-  "  border: 1px solid rgba(230, 230, 230, 0.8);" +
-  "  background: rgba(250, 250, 250, 0.8);" +
-  "  -moz-border-radius-topleft: 10px;" +
-  "  -moz-border-radius-topright: 10px;" +
-  "  border-top-left-radius: 10px; border-top-right-radius: 10px;" +
-  "  z-index: 1000;" +
-  "  padding: 8px;" +
-  "  display: none;" +
-  "}" +
-  "" +
-  ".cptFocusPopup { display: block; }" +
-  ".cptFocusPopup.cptNoPopup { display: none; }" +
-  "" +
-  ".cptHints ul { margin: 0; padding: 0 15px; }" +
-  "" +
-  ".cptGt { font-weight: bold; font-size: 120%; }" +
-  "");
-
-define("text/cockpit/ui/request_view.css", [], "" +
-  ".cptRowIn {" +
-  "  display: box; display: -moz-box; display: -webkit-box;" +
-  "  box-orient: horizontal; -moz-box-orient: horizontal; -webkit-box-orient: horizontal;" +
-  "  box-align: center; -moz-box-align: center; -webkit-box-align: center;" +
-  "  color: #333;" +
-  "  background-color: #EEE;" +
-  "  width: 100%;" +
-  "  font-family: consolas, courier, monospace;" +
-  "}" +
-  ".cptRowIn > * { padding-left: 2px; padding-right: 2px; }" +
-  ".cptRowIn > img { cursor: pointer; }" +
-  ".cptHover { display: none; }" +
-  ".cptRowIn:hover > .cptHover { display: block; }" +
-  ".cptRowIn:hover > .cptHover.cptHidden { display: none; }" +
-  ".cptOutTyped {" +
-  "  box-flex: 1; -moz-box-flex: 1; -webkit-box-flex: 1;" +
-  "  font-weight: bold; color: #000; font-size: 120%;" +
-  "}" +
-  ".cptRowOutput { padding-left: 10px; line-height: 1.2em; }" +
-  ".cptRowOutput strong," +
-  ".cptRowOutput b," +
-  ".cptRowOutput th," +
-  ".cptRowOutput h1," +
-  ".cptRowOutput h2," +
-  ".cptRowOutput h3 { color: #000; }" +
-  ".cptRowOutput a { font-weight: bold; color: #666; text-decoration: none; }" +
-  ".cptRowOutput a: hover { text-decoration: underline; cursor: pointer; }" +
-  ".cptRowOutput input[type=password]," +
-  ".cptRowOutput input[type=text]," +
-  ".cptRowOutput textarea {" +
-  "  color: #000; font-size: 120%;" +
-  "  background: transparent; padding: 3px;" +
-  "  border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px;" +
-  "}" +
-  ".cptRowOutput table," +
-  ".cptRowOutput td," +
-  ".cptRowOutput th { border: 0; padding: 0 2px; }" +
-  ".cptRowOutput .right { text-align: right; }" +
-  "");
-
-define("text/ace/css/editor.css", [], ".ace_editor {" +
-  "    position: absolute;" +
-  "    overflow: hidden;" +
-  "    font-family: Monaco, \"Menlo\", \"Courier New\", monospace;" +
-  "    font-size: 12px;" +
-  "}" +
-  "" +
-  ".ace_scroller {" +
-  "    position: absolute;" +
-  "    overflow-x: scroll;" +
-  "    overflow-y: hidden;" +
-  "}" +
-  "" +
-  ".ace_content {" +
-  "    position: absolute;" +
-  "    box-sizing: border-box;" +
-  "    -moz-box-sizing: border-box;" +
-  "    -webkit-box-sizing: border-box;" +
-  "}" +
-  "" +
-  ".ace_composition {" +
-  "    position: absolute;" +
-  "    background: #555;" +
-  "    color: #DDD;" +
-  "    z-index: 4;" +
-  "}" +
-  "" +
-  ".ace_gutter {" +
-  "    position: absolute;" +
-  "    overflow-x: hidden;" +
-  "    overflow-y: hidden;" +
-  "    height: 100%;" +
-  "}" +
-  "" +
-  ".ace_gutter-cell.ace_error {" +
-  "    background-image: url(\"data:image/gif,GIF89a%10%00%10%00%D5%00%00%F5or%F5%87%88%F5nr%F4ns%EBmq%F5z%7F%DDJT%DEKS%DFOW%F1Yc%F2ah%CE(7%CE)8%D18E%DD%40M%F2KZ%EBU%60%F4%60m%DCir%C8%16(%C8%19*%CE%255%F1%3FR%F1%3FS%E6%AB%B5%CA%5DI%CEn%5E%F7%A2%9A%C9G%3E%E0a%5B%F7%89%85%F5yy%F6%82%80%ED%82%80%FF%BF%BF%E3%C4%C4%FF%FF%FF%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%25%00%2C%00%00%00%00%10%00%10%00%00%06p%C0%92pH%2C%1A%8F%C8%D2H%93%E1d4%23%E4%88%D3%09mB%1DN%B48%F5%90%40%60%92G%5B%94%20%3E%22%D2%87%24%FA%20%24%C5%06A%00%20%B1%07%02B%A38%89X.v%17%82%11%13q%10%0Fi%24%0F%8B%10%7BD%12%0Ei%09%92%09%0EpD%18%15%24%0A%9Ci%05%0C%18F%18%0B%07%04%01%04%06%A0H%18%12%0D%14%0D%12%A1I%B3%B4%B5IA%00%3B\");" +
-  "    background-repeat: no-repeat;" +
-  "    background-position: 4px center;" +
-  "}" +
-  "" +
-  ".ace_gutter-cell.ace_warning {" +
-  "    background-image: url(\"data:image/gif,GIF89a%10%00%10%00%D5%00%00%FF%DBr%FF%DE%81%FF%E2%8D%FF%E2%8F%FF%E4%96%FF%E3%97%FF%E5%9D%FF%E6%9E%FF%EE%C1%FF%C8Z%FF%CDk%FF%D0s%FF%D4%81%FF%D5%82%FF%D5%83%FF%DC%97%FF%DE%9D%FF%E7%B8%FF%CCl%7BQ%13%80U%15%82W%16%81U%16%89%5B%18%87%5B%18%8C%5E%1A%94d%1D%C5%83-%C9%87%2F%C6%84.%C6%85.%CD%8B2%C9%871%CB%8A3%CD%8B5%DC%98%3F%DF%9BB%E0%9CC%E1%A5U%CB%871%CF%8B5%D1%8D6%DB%97%40%DF%9AB%DD%99B%E3%B0p%E7%CC%AE%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%2F%00%2C%00%00%00%00%10%00%10%00%00%06a%C0%97pH%2C%1A%8FH%A1%ABTr%25%87%2B%04%82%F4%7C%B9X%91%08%CB%99%1C!%26%13%84*iJ9(%15G%CA%84%14%01%1A%97%0C%03%80%3A%9A%3E%81%84%3E%11%08%B1%8B%20%02%12%0F%18%1A%0F%0A%03'F%1C%04%0B%10%16%18%10%0B%05%1CF%1D-%06%07%9A%9A-%1EG%1B%A0%A1%A0U%A4%A5%A6BA%00%3B\");" +
-  "    background-repeat: no-repeat;" +
-  "    background-position: 4px center;" +
-  "}" +
-  "" +
-  ".ace_editor .ace_sb {" +
-  "    position: absolute;" +
-  "    overflow-x: hidden;" +
-  "    overflow-y: scroll;" +
-  "    right: 0;" +
-  "}" +
-  "" +
-  ".ace_editor .ace_sb div {" +
-  "    position: absolute;" +
-  "    width: 1px;" +
-  "    left: 0;" +
-  "}" +
-  "" +
-  ".ace_editor .ace_print_margin_layer {" +
-  "    z-index: 0;" +
-  "    position: absolute;" +
-  "    overflow: hidden;" +
-  "    margin: 0;" +
-  "    left: 0;" +
-  "    height: 100%;" +
-  "    width: 100%;" +
-  "}" +
-  "" +
-  ".ace_editor .ace_print_margin {" +
-  "    position: absolute;" +
-  "    height: 100%;" +
-  "}" +
-  "" +
-  ".ace_editor textarea {" +
-  "    position: fixed;" +
-  "    z-index: -1;" +
-  "    width: 10px;" +
-  "    height: 30px;" +
-  "    opacity: 0;" +
-  "    background: transparent;" +
-  "    appearance: none;" +
-  "    -moz-appearance: none;" +
-  "    border: none;" +
-  "    resize: none;" +
-  "    outline: none;" +
-  "    overflow: hidden;" +
-  "}" +
-  "" +
-  ".ace_layer {" +
-  "    z-index: 1;" +
-  "    position: absolute;" +
-  "    overflow: hidden;" +
-  "    white-space: nowrap;" +
-  "    height: 100%;" +
-  "    width: 100%;" +
-  "}" +
-  "" +
-  ".ace_text-layer {" +
-  "    color: black;" +
-  "}" +
-  "" +
-  ".ace_cjk {" +
-  "    display: inline-block;" +
-  "    text-align: center;" +
-  "}" +
-  "" +
-  ".ace_cursor-layer {" +
-  "    z-index: 4;" +
-  "    cursor: text;" +
-  "    /* setting pointer-events: none; here will break mouse wheel scrolling in Safari */" +
-  "}" +
-  "" +
-  ".ace_cursor {" +
-  "    z-index: 4;" +
-  "    position: absolute;" +
-  "}" +
-  "" +
-  ".ace_cursor.ace_hidden {" +
-  "    opacity: 0.2;" +
-  "}" +
-  "" +
-  ".ace_line {" +
-  "    white-space: nowrap;" +
-  "}" +
-  "" +
-  ".ace_marker-layer {" +
-  "    cursor: text;" +
-  "    pointer-events: none;" +
-  "}" +
-  "" +
-  ".ace_marker-layer .ace_step {" +
-  "    position: absolute;" +
-  "    z-index: 3;" +
-  "}" +
-  "" +
-  ".ace_marker-layer .ace_selection {" +
-  "    position: absolute;" +
-  "    z-index: 4;" +
-  "}" +
-  "" +
-  ".ace_marker-layer .ace_bracket {" +
-  "    position: absolute;" +
-  "    z-index: 5;" +
-  "}" +
-  "" +
-  ".ace_marker-layer .ace_active_line {" +
-  "    position: absolute;" +
-  "    z-index: 2;" +
-  "}" +
-  "" +
-  ".ace_marker-layer .ace_selected_word {" +
-  "    position: absolute;" +
-  "    z-index: 6;" +
-  "    box-sizing: border-box;" +
-  "    -moz-box-sizing: border-box;" +
-  "    -webkit-box-sizing: border-box;" +
-  "}" +
-  "" +
-  ".ace_line .ace_fold {" +
-  "    cursor: pointer;" +
-  "}" +
-  "" +
-  ".ace_dragging .ace_marker-layer, .ace_dragging .ace_text-layer {" +
-  "  cursor: move;" +
-  "}" +
-  "");
-
-define("text/build/demo/styles.css", [], "html {" +
-  "    height: 100%;" +
-  "    width: 100%;" +
-  "    overflow: hidden;" +
-  "}" +
-  "" +
-  "body {" +
-  "    overflow: hidden;" +
-  "    margin: 0;" +
-  "    padding: 0;" +
-  "    height: 100%;" +
-  "    width: 100%;" +
-  "    font-family: Arial, Helvetica, sans-serif, Tahoma, Verdana, sans-serif;" +
-  "    font-size: 12px;" +
-  "    background: rgb(14, 98, 165);" +
-  "    color: white;" +
-  "}" +
-  "" +
-  "#logo {" +
-  "    padding: 15px;" +
-  "    margin-left: 65px;" +
-  "}" +
-  "" +
-  "#editor {" +
-  "    position: absolute;" +
-  "    top:  0px;" +
-  "    left: 280px;" +
-  "    bottom: 0px;" +
-  "    right: 0px;" +
-  "    background: white;" +
-  "}" +
-  "" +
-  "#controls {" +
-  "    padding: 5px;" +
-  "}" +
-  "" +
-  "#controls td {" +
-  "    text-align: right;" +
-  "}" +
-  "" +
-  "#controls td + td {" +
-  "    text-align: left;" +
-  "}" +
-  "" +
-  "#cockpitInput {" +
-  "    position: absolute;" +
-  "    left: 280px;" +
-  "    right: 0px;" +
-  "    bottom: 0;" +
-  "" +
-  "    border: none; outline: none;" +
-  "    font-family: consolas, courier, monospace;" +
-  "    font-size: 120%;" +
-  "}" +
-  "" +
-  "#cockpitOutput {" +
-  "    padding: 10px;" +
-  "    margin: 0 15px;" +
-  "    border: 1px solid #AAA;" +
-  "    -moz-border-radius-topleft: 10px;" +
-  "    -moz-border-radius-topright: 10px;" +
-  "    border-top-left-radius: 4px; border-top-right-radius: 4px;" +
-  "    background: #DDD; color: #000;" +
-  "}");
-
-define("text/build_support/style.css", [], "body {" +
-  "    margin:0;" +
-  "    padding:0;" +
-  "    background-color:#e6f5fc;" +
-  "    " +
-  "}" +
-  "" +
-  "H2, H3, H4 {" +
-  "    font-family:Trebuchet MS;" +
-  "    font-weight:bold;" +
-  "    margin:0;" +
-  "    padding:0;" +
-  "}" +
-  "" +
-  "H2 {" +
-  "    font-size:28px;" +
-  "    color:#263842;" +
-  "    padding-bottom:6px;" +
-  "}" +
-  "" +
-  "H3 {" +
-  "    font-family:Trebuchet MS;" +
-  "    font-weight:bold;" +
-  "    font-size:22px;" +
-  "    color:#253741;" +
-  "    margin-top:43px;" +
-  "    margin-bottom:8px;" +
-  "}" +
-  "" +
-  "H4 {" +
-  "    font-family:Trebuchet MS;" +
-  "    font-weight:bold;" +
-  "    font-size:21px;" +
-  "    color:#222222;" +
-  "    margin-bottom:4px;" +
-  "}" +
-  "" +
-  "P {" +
-  "    padding:13px 0;" +
-  "    margin:0;" +
-  "    line-height:22px;" +
-  "}" +
-  "" +
-  "UL{" +
-  "    line-height : 22px;" +
-  "}" +
-  "" +
-  "PRE{" +
-  "    background : #333;" +
-  "    color : white;" +
-  "    padding : 10px;" +
-  "}" +
-  "" +
-  "#header {" +
-  "    height : 227px;" +
-  "    position:relative;" +
-  "    overflow:hidden;" +
-  "    background: url(images/background.png) repeat-x 0 0;" +
-  "    border-bottom:1px solid #c9e8fa;   " +
-  "}" +
-  "" +
-  "#header .content .signature {" +
-  "    font-family:Trebuchet MS;" +
-  "    font-size:11px;" +
-  "    color:#ebe4d6;" +
-  "    position:absolute;" +
-  "    bottom:5px;" +
-  "    right:42px;" +
-  "    letter-spacing : 1px;" +
-  "}" +
-  "" +
-  ".content {" +
-  "    width:970px;" +
-  "    position:relative;" +
-  "    overflow:hidden;" +
-  "    margin:0 auto;" +
-  "}" +
-  "" +
-  "#header .content {" +
-  "    height:184px;" +
-  "    margin-top:22px;" +
-  "}" +
-  "" +
-  "#header .content .logo {" +
-  "    width  : 282px;" +
-  "    height : 184px;" +
-  "    background:url(images/logo.png) no-repeat 0 0;" +
-  "    position:absolute;" +
-  "    top:0;" +
-  "    left:0;" +
-  "}" +
-  "" +
-  "#header .content .title {" +
-  "    width  : 605px;" +
-  "    height : 58px;" +
-  "    background:url(images/ace.png) no-repeat 0 0;" +
-  "    position:absolute;" +
-  "    top:98px;" +
-  "    left:329px;" +
-  "}" +
-  "" +
-  "#wrapper {" +
-  "    background:url(images/body_background.png) repeat-x 0 0;" +
-  "    min-height:250px;" +
-  "}" +
-  "" +
-  "#wrapper .content {" +
-  "    font-family:Arial;" +
-  "    font-size:14px;" +
-  "    color:#222222;" +
-  "    width:1000px;" +
-  "}" +
-  "" +
-  "#wrapper .content .column1 {" +
-  "    position:relative;" +
-  "    overflow:hidden;" +
-  "    float:left;" +
-  "    width:315px;" +
-  "    margin-right:31px;" +
-  "}" +
-  "" +
-  "#wrapper .content .column2 {" +
-  "    position:relative;" +
-  "    overflow:hidden;" +
-  "    float:left;" +
-  "    width:600px;" +
-  "    padding-top:47px;" +
-  "}" +
-  "" +
-  ".fork_on_github {" +
-  "    width:310px;" +
-  "    height:80px;" +
-  "    background:url(images/fork_on_github.png) no-repeat 0 0;" +
-  "    position:relative;" +
-  "    overflow:hidden;" +
-  "    margin-top:49px;" +
-  "    cursor:pointer;" +
-  "}" +
-  "" +
-  ".fork_on_github:hover {" +
-  "    background-position:0 -80px;" +
-  "}" +
-  "" +
-  ".divider {" +
-  "    height:3px;" +
-  "    background-color:#bedaea;" +
-  "    margin-bottom:3px;" +
-  "}" +
-  "" +
-  ".menu {" +
-  "    padding:23px 0 0 24px;" +
-  "}" +
-  "" +
-  "UL.content-list {" +
-  "    padding:15px;" +
-  "    margin:0;" +
-  "}" +
-  "" +
-  "UL.menu-list {" +
-  "    padding:0;" +
-  "    margin:0 0 20px 0;" +
-  "    list-style-type:none;" +
-  "    line-height : 16px;" +
-  "}" +
-  "" +
-  "UL.menu-list LI {" +
-  "    color:#2557b4;" +
-  "    font-family:Trebuchet MS;" +
-  "    font-size:14px;" +
-  "    padding:7px 0;" +
-  "    border-bottom:1px dotted #d6e2e7;" +
-  "}" +
-  "" +
-  "UL.menu-list LI:last-child {" +
-  "    border-bottom:0;" +
-  "}" +
-  "" +
-  "A {" +
-  "    color:#2557b4;" +
-  "    text-decoration:none;" +
-  "}" +
-  "" +
-  "A:hover {" +
-  "    text-decoration:underline;" +
-  "}" +
-  "" +
-  "P#first{" +
-  "    background : rgba(255,255,255,0.5);" +
-  "    padding : 20px;" +
-  "    font-size : 16px;" +
-  "    line-height : 24px;" +
-  "    margin : 0 0 20px 0;" +
-  "}" +
-  "" +
-  "#footer {" +
-  "    height:40px;" +
-  "    position:relative;" +
-  "    overflow:hidden;" +
-  "    background:url(images/bottombar.png) repeat-x 0 0;" +
-  "    position:relative;" +
-  "    margin-top:40px;" +
-  "}" +
-  "" +
-  "UL.menu-footer {" +
-  "    padding:0;" +
-  "    margin:8px 11px 0 0;" +
-  "    list-style-type:none;" +
-  "    float:right;" +
-  "}" +
-  "" +
-  "UL.menu-footer LI {" +
-  "    color:white;" +
-  "    font-family:Arial;" +
-  "    font-size:12px;" +
-  "    display:inline-block;" +
-  "    margin:0 1px;" +
-  "}" +
-  "" +
-  "UL.menu-footer LI A {" +
-  "    color:#8dd0ff;" +
-  "    text-decoration:none;" +
-  "}" +
-  "" +
-  "UL.menu-footer LI A:hover {" +
-  "    text-decoration:underline;" +
-  "}" +
-  "" +
-  "" +
-  "" +
-  "" +
-  "");
-
-define("text/demo/styles.css", [], "html {" +
-  "    height: 100%;" +
-  "    width: 100%;" +
-  "    overflow: hidden;" +
-  "}" +
-  "" +
-  "body {" +
-  "    overflow: hidden;" +
-  "    margin: 0;" +
-  "    padding: 0;" +
-  "    height: 100%;" +
-  "    width: 100%;" +
-  "    font-family: Arial, Helvetica, sans-serif, Tahoma, Verdana, sans-serif;" +
-  "    font-size: 12px;" +
-  "    background: rgb(14, 98, 165);" +
-  "    color: white;" +
-  "}" +
-  "" +
-  "#logo {" +
-  "    padding: 15px;" +
-  "    margin-left: 65px;" +
-  "}" +
-  "" +
-  "#editor {" +
-  "    position: absolute;" +
-  "    top:  0px;" +
-  "    left: 280px;" +
-  "    bottom: 0px;" +
-  "    right: 0px;" +
-  "    background: white;" +
-  "}" +
-  "" +
-  "#controls {" +
-  "    padding: 5px;" +
-  "}" +
-  "" +
-  "#controls td {" +
-  "    text-align: right;" +
-  "}" +
-  "" +
-  "#controls td + td {" +
-  "    text-align: left;" +
-  "}" +
-  "" +
-  "#cockpitInput {" +
-  "    position: absolute;" +
-  "    left: 280px;" +
-  "    right: 0px;" +
-  "    bottom: 0;" +
-  "" +
-  "    border: none; outline: none;" +
-  "    font-family: consolas, courier, monospace;" +
-  "    font-size: 120%;" +
-  "}" +
-  "" +
-  "#cockpitOutput {" +
-  "    padding: 10px;" +
-  "    margin: 0 15px;" +
-  "    border: 1px solid #AAA;" +
-  "    -moz-border-radius-topleft: 10px;" +
-  "    -moz-border-radius-topright: 10px;" +
-  "    border-top-left-radius: 4px; border-top-right-radius: 4px;" +
-  "    background: #DDD; color: #000;" +
-  "}");
-
-define("text/deps/csslint/demos/demo.css", [], "@charset \"UTF-8\";" +
-  "" +
-  "@import url(\"booya.css\") print,screen;" +
-  "@import \"whatup.css\" screen;" +
-  "@import \"wicked.css\";" +
-  "" +
-  "@namespace \"http://www.w3.org/1999/xhtml\";" +
-  "@namespace svg \"http://www.w3.org/2000/svg\";" +
-  "" +
-  "li.inline #foo {" +
-  "  background: url(\"something.png\");" +
-  "  display: inline;" +
-  "  padding-left: 3px;" +
-  "  padding-right: 7px;" +
-  "  border-right: 1px dotted #066;" +
-  "}" +
-  "" +
-  "li.last.first {" +
-  "  display: inline;" +
-  "  padding-left: 3px !important;" +
-  "  padding-right: 3px;" +
-  "  border-right: 0px;" +
-  "}" +
-  "" +
-  "@media print {" +
-  "    li.inline {" +
-  "      color: black;" +
-  "    }" +
-  "" +
-  "" +
-  "@charset \"UTF-8\"; " +
-  "" +
-  "@page {" +
-  "  margin: 10%;" +
-  "  counter-increment: page;" +
-  "" +
-  "  @top-center {" +
-  "    font-family: sans-serif;" +
-  "    font-weight: bold;" +
-  "    font-size: 2em;" +
-  "    content: counter(page);" +
-  "  }" +
-  "}");
-
-define("text/deps/requirejs/dist/ie.css", [], "" +
-  "body .sect {" +
-  "    display: none;" +
-  "}" +
-  "" +
-  "" +
-  "#content ul.index {" +
-  "    list-style: none;" +
-  "}" +
-  "");
-
-define("text/deps/requirejs/dist/main.css", [], "@font-face {" +
-  "    font-family: Inconsolata;" +
-  "    src: url(\"fonts/Inconsolata.ttf\");" +
-  "}" +
-  "" +
-  "* {" +
-  "    -moz-box-sizing: border-box;" +
-  "    -webkit-box-sizing: border-box;" +
-  "    box-sizing: border-box;" +
-  "    margin: 0;" +
-  "    padding: 0;" +
-  "}" +
-  "" +
-  "body {" +
-  "    font-size: 12px;" +
-  "    line-height: 21px;" +
-  "    background-color: #fff;" +
-  "    font-family: \"Helvetica Neue\", Helvetica, Arial, Verdana, sans-serif;" +
-  "    color: #0a0a0a;" +
-  "}" +
-  "" +
-  "#wrapper {" +
-  "    margin: 0;" +
-  "}" +
-  "" +
-  "#grid {" +
-  "    position: fixed;" +
-  "    top: 0;" +
-  "    left: 0;" +
-  "    width: 796px;" +
-  "    background-image: url(\"i/grid.png\");" +
-  "    z-index: 100;" +
-  "}" +
-  "" +
-  "pre {" +
-  "    line-height: 18px;" +
-  "    font-size: 13px;" +
-  "    margin: 7px 0 21px;" +
-  "    padding: 5px 10px;" +
-  "    overflow: auto;" +
-  "    background-color: #fafafa;" +
-  "    border: 1px solid #e6e6e6;" +
-  "    -moz-border-radius: 5px;" +
-  "    -webkit-border-radius: 5px;" +
-  "    border-radius: 5px;" +
-  "    -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.05);" +
-  "    -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.05);" +
-  "    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.05);" +
-  "}" +
-  "" +
-  "/*" +
-  "    typography stuff" +
-  "*/" +
-  ".mono {" +
-  "    font-family: \"Inconsolata\", Andale Mono, Monaco, Monospace;" +
-  "}" +
-  "" +
-  ".sans {" +
-  "    font-family: \"Helvetica Neue\", Helvetica, Arial, Verdana, sans-serif;" +
-  "}" +
-  "" +
-  ".serif {" +
-  "    font-family: \"Georgia\", Times New Roman, Times, serif;" +
-  "}" +
-  "" +
-  "a {" +
-  "    color: #2e87dd;" +
-  "    text-decoration: none;" +
-  "}" +
-  "" +
-  "a:hover {" +
-  "    text-decoration: underline;" +
-  "}" +
-  "" +
-  "/*" +
-  "    navigation" +
-  "*/" +
-  "" +
-  "#navBg {" +
-  "    background-color: #f2f2f2;" +
-  "    background-image: url(\"i/shadow.png\");" +
-  "    background-position: right top;" +
-  "    background-repeat: repeat-y;" +
-  "    width: 220px;" +
-  "    position: fixed;" +
-  "    top: 0;" +
-  "    left: 0;" +
-  "    z-index: 0;" +
-  "}" +
-  "" +
-  "#nav {" +
-  "    background-image: url(\"i/logo.png\");" +
-  "    background-repeat: no-repeat;" +
-  "    background-position: center 10px;" +
-  "    width: 220px;" +
-  "    float: left;" +
-  "    margin: 0;" +
-  "    padding: 150px 20px 0;" +
-  "    font-size: 13px;" +
-  "    text-shadow: 1px 1px #fff;" +
-  "    position: relative;" +
-  "    z-index: 1;" +
-  "}" +
-  "" +
-  "#nav .homeImageLink {" +
-  "    position: absolute;" +
-  "    display: block;" +
-  "    top: 10px;" +
-  "    left: 0;" +
-  "    width: 220px;" +
-  "    height: 138px;" +
-  "}" +
-  "#nav ul {" +
-  "    list-style-type:none;" +
-  "    padding: 0;" +
-  "    margin: 21px 0 0 0;" +
-  "}" +
-  "" +
-  "#nav ul li {" +
-  "    width: 100%;" +
-  "}" +
-  "" +
-  "#nav ul li.version {" +
-  "    text-align: center;" +
-  "    color: #4d4d4d;" +
-  "}" +
-  "" +
-  "#nav h1 {" +
-  "    color: #4d4d4d;" +
-  "    text-align: center;" +
-  "    font-size: 15px;" +
-  "    font-weight: normal;" +
-  "    text-transform: uppercase;" +
-  "    letter-spacing: 3px;" +
-  "}" +
-  "" +
-  "span.spacer {" +
-  "    color: #2e87dd;" +
-  "    margin: 0 3px 0 5px;" +
-  "    background-image: url(\"i/dot.png\");" +
-  "    background-repeat: repeat-x;" +
-  "    background-position: left 13px;" +
-  "}" +
-  "" +
-  "/*" +
-  "    icons" +
-  "*/" +
-  "" +
-  "span.icon {" +
-  "    width: 16px;" +
-  "    display: block;" +
-  "    background-image: url(\"i/sprite.png\");" +
-  "    background-repeat: no-repeat;" +
-  "}" +
-  "" +
-  "span.icon.home {" +
-  "    background-position: center 5px;" +
-  "}" +
-  "" +
-  "span.icon.start {" +
-  "    background-position: center -27px;" +
-  "}" +
-  "" +
-  "span.icon.download {" +
-  "    background-position: center -59px;" +
-  "}" +
-  "" +
-  "span.icon.api {" +
-  "    background-position: center -89px;" +
-  "}" +
-  "" +
-  "span.icon.optimize {" +
-  "    background-position: center -119px;" +
-  "}" +
-  "" +
-  "span.icon.script {" +
-  "    background-position: center -150px;" +
-  "}" +
-  "" +
-  "span.icon.question {" +
-  "    background-position: center -182px;" +
-  "}" +
-  "" +
-  "span.icon.requirement {" +
-  "    background-position: center -214px;" +
-  "}" +
-  "" +
-  "span.icon.history {" +
-  "    background-position: center -247px;" +
-  "}" +
-  "" +
-  "span.icon.help {" +
-  "    background-position: center -279px;" +
-  "}" +
-  "" +
-  "span.icon.blog {" +
-  "    background-position: center -311px;" +
-  "}" +
-  "" +
-  "span.icon.twitter {" +
-  "    background-position: center -343px;" +
-  "}" +
-  "" +
-  "span.icon.git {" +
-  "    background-position: center -375px;" +
-  "}" +
-  "" +
-  "span.icon.fork {" +
-  "    background-position: center -407px;" +
-  "}" +
-  "" +
-  "/*" +
-  "    content" +
-  "*/" +
-  "" +
-  "#content {" +
-  "    margin: 0 0 0 220px;" +
-  "    padding: 0 20px;" +
-  "    background-color: #fff;" +
-  "    font-family: \"Georgia\", Times New Roman, Times, serif;" +
-  "    position: relative;" +
-  "}" +
-  "" +
-  "#content p {" +
-  "    padding: 7px 0;" +
-  "    color: #333;" +
-  "    font-size: 14px;" +
-  "}" +
-  "" +
-  "#content h1," +
-  "#content h2," +
-  "#content h3," +
-  "#content h4," +
-  "#content h5 {" +
-  "    font-weight: normal;" +
-  "    padding: 21px 0 7px;" +
-  "}" +
-  "" +
-  "#content h1 {" +
-  "    font-size: 21px;" +
-  "}" +
-  "" +
-  "#content h2 {" +
-  "    padding: 0 0 18px 0;" +
-  "    margin: 0 0 7px 0;" +
-  "    font-weight: normal;" +
-  "    font-size: 21px;" +
-  "    line-height: 24px;" +
-  "    text-align: center;" +
-  "    color: #222;" +
-  "    background-image: url(\"i/arrow.png\");" +
-  "    background-repeat: no-repeat;" +
-  "    background-position: center bottom;" +
-  "    font-family: \"Inconsolata\", Andale Mono, Monaco, Monospace;" +
-  "    text-transform: uppercase;" +
-  "    letter-spacing: 2px;" +
-  "    text-shadow: 1px 1px 0 #fff;" +
-  "}" +
-  "" +
-  "#content h2 a {" +
-  "    color: #222;" +
-  "}" +
-  "" +
-  "#content h2 a:hover," +
-  "#content h3 a:hover," +
-  "#content h4 a:hover {" +
-  "    text-decoration: none;" +
-  "}" +
-  "" +
-  "span.sectionMark {" +
-  "    display: block;" +
-  "    color: #aaa;" +
-  "    text-shadow: 1px 1px 0 #fff;" +
-  "    font-size: 15px;" +
-  "    font-family: \"Inconsolata\", Andale Mono, Monaco, Monospace;" +
-  "}" +
-  "" +
-  "#content h3 {" +
-  "    font-size: 17px;" +
-  "}" +
-  "" +
-  "#content h4 {" +
-  "    padding-top: 0;" +
-  "    font-size: 15px;" +
-  "}" +
-  "" +
-  "#content h5 {" +
-  "    font-size: 10px;" +
-  "}" +
-  "" +
-  "#content ul {" +
-  "    list-style-type: disc;" +
-  "}" +
-  "" +
-  "#content ul," +
-  "#content ol {" +
-  "    /* border-left: 1px solid #333; */" +
-  "    color: #333;" +
-  "    font-size: 14px;" +
-  "    list-style-position: outside;" +
-  "    margin: 7px 0 21px 0;" +
-  "    /* padding: 0 0 0 28px; */" +
-  "}" +
-  "" +
-  "#content ul {" +
-  "    font-style: italic;" +
-  "}" +
-  "" +
-  "#content ol {" +
-  "    border: none;" +
-  "    list-style-position: inside;" +
-  "    padding: 0;" +
-  "    font-family: \"Georgia\", Times New Roman, Times, serif;" +
-  "}" +
-  "" +
-  "#content ul ul," +
-  "#content ol ol {" +
-  "    border: none;" +
-  "    padding: 0;" +
-  "    margin: 0 0 0 28px;" +
-  "}" +
-  "" +
-  "#content .section {" +
-  "    padding: 48px 0;" +
-  "    background-image: url(\"i/line.png\");" +
-  "    background-repeat: no-repeat;" +
-  "    background-position: center bottom;" +
-  "    width: 576px;" +
-  "    margin: 0 auto;" +
-  "}" +
-  "" +
-  "#content .section .subSection {" +
-  "    padding: 0 0 0 48px;" +
-  "    margin: 28px 0 0 0;" +
-  "    display: block;" +
-  "    border-left: 2px solid #ddd;" +
-  "}" +
-  "" +
-  "#content .section:last-child {" +
-  "    background-image: none;" +
-  "}" +
-  "" +
-  "#content .note {" +
-  "    color: #222;" +
-  "    background-color: #ffff99;" +
-  "    padding: 5px 10px;" +
-  "    margin: 7px 0;" +
-  "    display: inline-block;" +
-  "}" +
-  "" +
-  "/*" +
-  "    page directory" +
-  "*/" +
-  "" +
-  "#content #directory.section {" +
-  "    background-color: #fff;" +
-  "    width: 576px;" +
-  "}" +
-  "" +
-  "#content #directory.section ul ul ul {" +
-  "    margin: 0 0 0 48px;" +
-  "}" +
-  "" +
-  "#content #directory.section ul ul li {" +
-  "    background-image: url(\"i/sprite.png\");" +
-  "    background-repeat: no-repeat;" +
-  "    background-position: left -437px;" +
-  "    padding-left: 18px;" +
-  "    font-style: normal;" +
-  "}" +
-  "" +
-  "#content #directory h1 {" +
-  "    padding: 0 0 65px 0;" +
-  "    margin: 0 0 14px 0;" +
-  "    font-weight: normal;" +
-  "    font-size: 21px;" +
-  "    text-align: center;" +
-  "    text-transform: uppercase;" +
-  "    letter-spacing: 2px;" +
-  "    color: #222;" +
-  "    background-image: url(\"i/arrow-x.png\");" +
-  "    background-repeat: no-repeat;" +
-  "    background-position: center bottom;" +
-  "    font-family: \"Inconsolata\", Andale Mono, Monaco, Monospace;" +
-  "}" +
-  "" +
-  "" +
-  "#content ul.index {" +
-  "    padding: 0;" +
-  "    background-color: transparent;" +
-  "    border: none;" +
-  "    -moz-box-shadow: none;" +
-  "    font-style: normal;" +
-  "    font-family: \"Inconsolata\", Andale Mono, Monaco, Monospace;" +
-  "}" +
-  "" +
-  "#content ul.index li {" +
-  "    width: 100%;" +
-  "    font-size: 15px;" +
-  "    color: #333;" +
-  "    padding: 0 0 7px 0;" +
-  "}" +
-  "" +
-  "" +
-  "/*" +
-  "    intro page specific" +
-  "*/" +
-  "" +
-  "#content #intro {" +
-  "    width: 576px;" +
-  "    margin: 0 auto;" +
-  "    padding: 21px 0;" +
-  "}" +
-  "" +
-  "#content #intro p," +
-  "#content #intro h1 {" +
-  "    font-size: 19px;" +
-  "    line-height: 28px;" +
-  "    color: green;" +
-  "    letter-spacing: 2px;" +
-  "    padding: 0 0 28px 0;" +
-  "}" +
-  "" +
-  "#content #intro p:last-child," +
-  "#content #intro h1:last-child {" +
-  "    padding: 0;" +
-  "}" +
-  "" +
-  "#content #intro p a {" +
-  "    color: green;" +
-  "    text-decoration: underline;" +
-  "}" +
-  "" +
-  "/*" +
-  "    download page" +
-  "*/" +
-  "" +
-  "#content h4 a.download {" +
-  "    -webkit-border-radius: 5px;" +
-  "    -moz-border-radius: 5px;" +
-  "    background-color: #F2F2F2;" +
-  "    background-image: url(\"i/sprite.png\"), -moz-linear-gradient(center top , #FAFAFA 0%, #F2F2F2 100%);" +
-  "    background-image: url(\"i/sprite.png\"), -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fafafa), color-stop(100%, #f2f2f2));" +
-  "    background-position: 7px -58px, center center;" +
-  "    background-repeat: no-repeat, no-repeat;" +
-  "    border: 1px solid #CCCCCC;" +
-  "    color: #333333;" +
-  "    font-size: 12px;" +
-  "    margin: 0 0 0 5px;" +
-  "    padding: 0 10px 0 25px;" +
-  "    text-shadow: 1px 1px 0 #FFFFFF;" +
-  "}" +
-  "" +
-  "/*" +
-  "    footer" +
-  "*/" +
-  "#footer {" +
-  "    color: #4d4d4d;" +
-  "    padding: 65px 20px 20px;" +
-  "    margin: 20px 0 0 220px;" +
-  "    text-align: center;" +
-  "    display: block;" +
-  "    font-size: 13px;" +
-  "    background-image: url(\"i/arrow-x.png\");" +
-  "    background-repeat: no-repeat;" +
-  "    background-position: center top;" +
-  "    background-color: #fff;" +
-  "}" +
-  "" +
-  "#footer .line {" +
-  "    display: block;" +
-  "}" +
-  "" +
-  "#footer .line a {" +
-  "    color: #4d4d4d;" +
-  "    text-decoration: underline;" +
-  "}" +
-  "" +
-  "/*" +
-  "    Pygments manni style" +
-  "*/" +
-  "" +
-  "code {background-color: #fafafa; color: #333;}" +
-  "" +
-  "code .comment {color: green; font-style: italic}" +
-  "code .comment.preproc {color: #099; font-style: normal}" +
-  "code .comment.special {font-weight: bold}" +
-  "" +
-  "code .keyword {color: #069; font-weight: bold}" +
-  "code .keyword.pseudo {font-weight: normal}" +
-  "code .keyword.type {color: #078}" +
-  "" +
-  "code .operator {color: #555}" +
-  "code .operator.word {color: #000; font-weight: bold}" +
-  "" +
-  "code .name.builtin {color: #366}" +
-  "code .name.function {color: #c0f}" +
-  "code .name.class {color: #0a8; font-weight: bold}" +
-  "code .name.namespace {color: #0cf; font-weight: bold}" +
-  "code .name.exception {color: #c00; font-weight: bold}" +
-  "code .name.variable {color: #033}" +
-  "code .name.constant {color: #360}" +
-  "code .name.label {color: #99f}" +
-  "code .name.entity {color: #999; font-weight: bold}" +
-  "code .name.attribute {color: #309}" +
-  "code .name.tag {color: #309; font-weight: bold}" +
-  "code .name.decorator {color: #99f}" +
-  "" +
-  "code .string {color: #c30}" +
-  "code .string.doc {font-style: italic}" +
-  "code .string.interpol {color: #a00}" +
-  "code .string.escape {color: #c30; font-weight: bold}" +
-  "code .string.regex {color: #3aa}" +
-  "code .string.symbol {color: #fc3}" +
-  "code .string.other {color: #c30}" +
-  "" +
-  "code .number {color: #f60}" +
-  "" +
-  "" +
-  "/*" +
-  "    webkit scroll bars" +
-  "*/" +
-  "" +
-  "pre::-webkit-scrollbar {" +
-  "    width: 6px;" +
-  "    height: 6px;" +
-  "}" +
-  "" +
-  "pre::-webkit-scrollbar-button:start:decrement," +
-  "pre::-webkit-scrollbar-button:end:increment {" +
-  "    display: block;" +
-  "    height: 0;" +
-  "    width: 0;" +
-  "}" +
-  "" +
-  "pre::-webkit-scrollbar-button:vertical:increment," +
-  "pre::-webkit-scrollbar-button:horizontal:increment {" +
-  "    background-color: transparent;" +
-  "    display: block;" +
-  "    height: 0;" +
-  "    width: 0;" +
-  "}" +
-  "" +
-  "pre::-webkit-scrollbar-track-piece {" +
-  "    -webkit-border-radius: 3px;" +
-  "}" +
-  "" +
-  "pre::-webkit-scrollbar-thumb:vertical {" +
-  "    background-color: #aaa;" +
-  "    -webkit-border-radius: 3px;" +
-  "" +
-  "}" +
-  "" +
-  "pre::-webkit-scrollbar-thumb:horizontal {" +
-  "    background-color: #aaa;" +
-  "    -webkit-border-radius: 3px;" +
-  "}" +
-  "" +
-  "/*" +
-  "    hbox" +
-  "*/" +
-  "" +
-  ".hbox {" +
-  "	display: -webkit-box;" +
-  "	-webkit-box-orient: horizontal;" +
-  "	-webkit-box-align: stretch;" +
-  "" +
-  "	display: -moz-box;" +
-  "	-moz-box-orient: horizontal;" +
-  "	-moz-box-align: stretch;" +
-  "" +
-  "	display: box;" +
-  "	box-orient: horizontal;" +
-  "	box-align: stretch;" +
-  "" +
-  "	width: 100%;" +
-  "}" +
-  "" +
-  ".hbox > * {" +
-  "	-webkit-box-flex: 0;" +
-  "	-moz-box-flex: 0;" +
-  "	box-flex: 0;" +
-  "	display: block;" +
-  "}" +
-  "" +
-  ".vbox {" +
-  "	display: -webkit-box;" +
-  "	-webkit-box-orient: vertical;" +
-  "	-webkit-box-align: stretch;" +
-  "" +
-  "	display: -moz-box;" +
-  "	-moz-box-orient: vertical;" +
-  "	-moz-box-align: stretch;" +
-  "" +
-  "	display: box;" +
-  "	box-orient: vertical;" +
-  "	box-align: stretch;" +
-  "}" +
-  "" +
-  ".vbox > * {" +
-  "	-webkit-box-flex: 0;" +
-  "	-moz-box-flex: 0;" +
-  "	box-flex: 0;" +
-  "	display: block;" +
-  "}" +
-  "" +
-  ".spacer {" +
-  "	-webkit-box-flex: 1;" +
-  "	-moz-box-flex: 1;" +
-  "	box-flex: 1;" +
-  "}" +
-  "" +
-  ".reverse {" +
-  "	-webkit-box-direction: reverse;" +
-  "	-moz-box-direction: reverse;" +
-  "	box-direction: reverse;" +
-  "}" +
-  "" +
-  ".boxFlex0 {" +
-  "	-webkit-box-flex: 0;" +
-  "	-moz-box-flex: 0;" +
-  "	box-flex: 0;" +
-  "}" +
-  "" +
-  ".boxFlex1, .boxFlex {" +
-  "	-webkit-box-flex: 1;" +
-  "	-moz-box-flex: 1;" +
-  "	box-flex: 1;" +
-  "}" +
-  "" +
-  ".boxFlex2 {" +
-  "	-webkit-box-flex: 2;" +
-  "	-moz-box-flex: 2;" +
-  "	box-flex: 2;" +
-  "}" +
-  "" +
-  ".boxGroup1 {" +
-  "	-webkit-box-flex-group: 1;" +
-  "	-moz-box-flex-group: 1;" +
-  "	box-flex-group: 1;" +
-  "}" +
-  "" +
-  ".boxGroup2 {" +
-  "	-webkit-box-flex-group: 2;" +
-  "	-moz-box-flex-group: 2;" +
-  "	box-flex-group: 2;" +
-  "}" +
-  "" +
-  ".start {" +
-  "	-webkit-box-pack: start;" +
-  "	-moz-box-pack: start;" +
-  "	box-pack: start;" +
-  "}" +
-  "" +
-  ".end {" +
-  "	-webkit-box-pack: end;" +
-  "	-moz-box-pack: end;" +
-  "	box-pack: end;" +
-  "}" +
-  "" +
-  ".center {" +
-  "	-webkit-box-pack: center;" +
-  "	-moz-box-pack: center;" +
-  "	box-pack: center;" +
-  "}" +
-  "" +
-  "/*" +
-  "    clearfix" +
-  "*/" +
-  "" +
-  ".clearfix:after {" +
-  "	content: \".\";" +
-  "	display: block;" +
-  "	clear: both;" +
-  "	visibility: hidden;" +
-  "	line-height: 0;" +
-  "	height: 0;" +
-  "}" +
-  "" +
-  "html[xmlns] .clearfix {" +
-  "	display: block;" +
-  "}" +
-  "" +
-  "* html .clearfix {" +
-  "	height: 1%;" +
-  "}");
-
-define("text/lib/ace/css/editor.css", [], ".ace_editor {" +
-  "    position: absolute;" +
-  "    overflow: hidden;" +
-  "    font-family: Monaco, \"Menlo\", \"Courier New\", monospace;" +
-  "    font-size: 12px;" +
-  "}" +
-  "" +
-  ".ace_scroller {" +
-  "    position: absolute;" +
-  "    overflow-x: scroll;" +
-  "    overflow-y: hidden;" +
-  "}" +
-  "" +
-  ".ace_content {" +
-  "    position: absolute;" +
-  "    box-sizing: border-box;" +
-  "    -moz-box-sizing: border-box;" +
-  "    -webkit-box-sizing: border-box;" +
-  "}" +
-  "" +
-  ".ace_composition {" +
-  "    position: absolute;" +
-  "    background: #555;" +
-  "    color: #DDD;" +
-  "    z-index: 4;" +
-  "}" +
-  "" +
-  ".ace_gutter {" +
-  "    position: absolute;" +
-  "    overflow-x: hidden;" +
-  "    overflow-y: hidden;" +
-  "    height: 100%;" +
-  "}" +
-  "" +
-  ".ace_gutter-cell.ace_error {" +
-  "    background-image: url(\"data:image/gif,GIF89a%10%00%10%00%D5%00%00%F5or%F5%87%88%F5nr%F4ns%EBmq%F5z%7F%DDJT%DEKS%DFOW%F1Yc%F2ah%CE(7%CE)8%D18E%DD%40M%F2KZ%EBU%60%F4%60m%DCir%C8%16(%C8%19*%CE%255%F1%3FR%F1%3FS%E6%AB%B5%CA%5DI%CEn%5E%F7%A2%9A%C9G%3E%E0a%5B%F7%89%85%F5yy%F6%82%80%ED%82%80%FF%BF%BF%E3%C4%C4%FF%FF%FF%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%25%00%2C%00%00%00%00%10%00%10%00%00%06p%C0%92pH%2C%1A%8F%C8%D2H%93%E1d4%23%E4%88%D3%09mB%1DN%B48%F5%90%40%60%92G%5B%94%20%3E%22%D2%87%24%FA%20%24%C5%06A%00%20%B1%07%02B%A38%89X.v%17%82%11%13q%10%0Fi%24%0F%8B%10%7BD%12%0Ei%09%92%09%0EpD%18%15%24%0A%9Ci%05%0C%18F%18%0B%07%04%01%04%06%A0H%18%12%0D%14%0D%12%A1I%B3%B4%B5IA%00%3B\");" +
-  "    background-repeat: no-repeat;" +
-  "    background-position: 4px center;" +
-  "}" +
-  "" +
-  ".ace_gutter-cell.ace_warning {" +
-  "    background-image: url(\"data:image/gif,GIF89a%10%00%10%00%D5%00%00%FF%DBr%FF%DE%81%FF%E2%8D%FF%E2%8F%FF%E4%96%FF%E3%97%FF%E5%9D%FF%E6%9E%FF%EE%C1%FF%C8Z%FF%CDk%FF%D0s%FF%D4%81%FF%D5%82%FF%D5%83%FF%DC%97%FF%DE%9D%FF%E7%B8%FF%CCl%7BQ%13%80U%15%82W%16%81U%16%89%5B%18%87%5B%18%8C%5E%1A%94d%1D%C5%83-%C9%87%2F%C6%84.%C6%85.%CD%8B2%C9%871%CB%8A3%CD%8B5%DC%98%3F%DF%9BB%E0%9CC%E1%A5U%CB%871%CF%8B5%D1%8D6%DB%97%40%DF%9AB%DD%99B%E3%B0p%E7%CC%AE%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%2F%00%2C%00%00%00%00%10%00%10%00%00%06a%C0%97pH%2C%1A%8FH%A1%ABTr%25%87%2B%04%82%F4%7C%B9X%91%08%CB%99%1C!%26%13%84*iJ9(%15G%CA%84%14%01%1A%97%0C%03%80%3A%9A%3E%81%84%3E%11%08%B1%8B%20%02%12%0F%18%1A%0F%0A%03'F%1C%04%0B%10%16%18%10%0B%05%1CF%1D-%06%07%9A%9A-%1EG%1B%A0%A1%A0U%A4%A5%A6BA%00%3B\");" +
-  "    background-repeat: no-repeat;" +
-  "    background-position: 4px center;" +
-  "}" +
-  "" +
-  ".ace_editor .ace_sb {" +
-  "    position: absolute;" +
-  "    overflow-x: hidden;" +
-  "    overflow-y: scroll;" +
-  "    right: 0;" +
-  "}" +
-  "" +
-  ".ace_editor .ace_sb div {" +
-  "    position: absolute;" +
-  "    width: 1px;" +
-  "    left: 0;" +
-  "}" +
-  "" +
-  ".ace_editor .ace_print_margin_layer {" +
-  "    z-index: 0;" +
-  "    position: absolute;" +
-  "    overflow: hidden;" +
-  "    margin: 0;" +
-  "    left: 0;" +
-  "    height: 100%;" +
-  "    width: 100%;" +
-  "}" +
-  "" +
-  ".ace_editor .ace_print_margin {" +
-  "    position: absolute;" +
-  "    height: 100%;" +
-  "}" +
-  "" +
-  ".ace_editor textarea {" +
-  "    position: fixed;" +
-  "    z-index: -1;" +
-  "    width: 10px;" +
-  "    height: 30px;" +
-  "    opacity: 0;" +
-  "    background: transparent;" +
-  "    appearance: none;" +
-  "    -moz-appearance: none;" +
-  "    border: none;" +
-  "    resize: none;" +
-  "    outline: none;" +
-  "    overflow: hidden;" +
-  "}" +
-  "" +
-  ".ace_layer {" +
-  "    z-index: 1;" +
-  "    position: absolute;" +
-  "    overflow: hidden;" +
-  "    white-space: nowrap;" +
-  "    height: 100%;" +
-  "    width: 100%;" +
-  "}" +
-  "" +
-  ".ace_text-layer {" +
-  "    color: black;" +
-  "}" +
-  "" +
-  ".ace_cjk {" +
-  "    display: inline-block;" +
-  "    text-align: center;" +
-  "}" +
-  "" +
-  ".ace_cursor-layer {" +
-  "    z-index: 4;" +
-  "    cursor: text;" +
-  "    /* setting pointer-events: none; here will break mouse wheel scrolling in Safari */" +
-  "}" +
-  "" +
-  ".ace_cursor {" +
-  "    z-index: 4;" +
-  "    position: absolute;" +
-  "}" +
-  "" +
-  ".ace_cursor.ace_hidden {" +
-  "    opacity: 0.2;" +
-  "}" +
-  "" +
-  ".ace_line {" +
-  "    white-space: nowrap;" +
-  "}" +
-  "" +
-  ".ace_marker-layer {" +
-  "    cursor: text;" +
-  "    pointer-events: none;" +
-  "}" +
-  "" +
-  ".ace_marker-layer .ace_step {" +
-  "    position: absolute;" +
-  "    z-index: 3;" +
-  "}" +
-  "" +
-  ".ace_marker-layer .ace_selection {" +
-  "    position: absolute;" +
-  "    z-index: 4;" +
-  "}" +
-  "" +
-  ".ace_marker-layer .ace_bracket {" +
-  "    position: absolute;" +
-  "    z-index: 5;" +
-  "}" +
-  "" +
-  ".ace_marker-layer .ace_active_line {" +
-  "    position: absolute;" +
-  "    z-index: 2;" +
-  "}" +
-  "" +
-  ".ace_marker-layer .ace_selected_word {" +
-  "    position: absolute;" +
-  "    z-index: 6;" +
-  "    box-sizing: border-box;" +
-  "    -moz-box-sizing: border-box;" +
-  "    -webkit-box-sizing: border-box;" +
-  "}" +
-  "" +
-  ".ace_line .ace_fold {" +
-  "    cursor: pointer;" +
-  "}" +
-  "" +
-  ".ace_dragging .ace_marker-layer, .ace_dragging .ace_text-layer {" +
-  "  cursor: move;" +
-  "}" +
-  "");
-
-define("text/node_modules/uglify-js/docstyle.css", [], "html { font-family: \"Lucida Grande\",\"Trebuchet MS\",sans-serif; font-size: 12pt; }" +
-  "body { max-width: 60em; }" +
-  ".title  { text-align: center; }" +
-  ".todo   { color: red; }" +
-  ".done   { color: green; }" +
-  ".tag    { background-color:lightblue; font-weight:normal }" +
-  ".target { }" +
-  ".timestamp { color: grey }" +
-  ".timestamp-kwd { color: CadetBlue }" +
-  "p.verse { margin-left: 3% }" +
-  "pre {" +
-  "  border: 1pt solid #AEBDCC;" +
-  "  background-color: #F3F5F7;" +
-  "  padding: 5pt;" +
-  "  font-family: monospace;" +
-  "  font-size: 90%;" +
-  "  overflow:auto;" +
-  "}" +
-  "pre.src {" +
-  "  background-color: #eee; color: #112; border: 1px solid #000;" +
-  "}" +
-  "table { border-collapse: collapse; }" +
-  "td, th { vertical-align: top; }" +
-  "dt { font-weight: bold; }" +
-  "div.figure { padding: 0.5em; }" +
-  "div.figure p { text-align: center; }" +
-  ".linenr { font-size:smaller }" +
-  ".code-highlighted {background-color:#ffff00;}" +
-  ".org-info-js_info-navigation { border-style:none; }" +
-  "#org-info-js_console-label { font-size:10px; font-weight:bold;" +
-  "  white-space:nowrap; }" +
-  ".org-info-js_search-highlight {background-color:#ffff00; color:#000000;" +
-  "  font-weight:bold; }" +
-  "" +
-  "sup {" +
-  "  vertical-align: baseline;" +
-  "  position: relative;" +
-  "  top: -0.5em;" +
-  "  font-size: 80%;" +
-  "}" +
-  "" +
-  "sup a:link, sup a:visited {" +
-  "  text-decoration: none;" +
-  "  color: #c00;" +
-  "}" +
-  "" +
-  "sup a:before { content: \"[\"; color: #999; }" +
-  "sup a:after { content: \"]\"; color: #999; }" +
-  "" +
-  "h1.title { border-bottom: 4px solid #000; padding-bottom: 5px; margin-bottom: 2em; }" +
-  "" +
-  "#postamble {" +
-  "  color: #777;" +
-  "  font-size: 90%;" +
-  "  padding-top: 1em; padding-bottom: 1em; border-top: 1px solid #999;" +
-  "  margin-top: 2em;" +
-  "  padding-left: 2em;" +
-  "  padding-right: 2em;" +
-  "  text-align: right;" +
-  "}" +
-  "" +
-  "#postamble p { margin: 0; }" +
-  "" +
-  "#footnotes { border-top: 1px solid #000; }" +
-  "" +
-  "h1 { font-size: 200% }" +
-  "h2 { font-size: 175% }" +
-  "h3 { font-size: 150% }" +
-  "h4 { font-size: 125% }" +
-  "" +
-  "h1, h2, h3, h4 { font-family: \"Bookman\",Georgia,\"Times New Roman\",serif; font-weight: normal; }" +
-  "" +
-  "@media print {" +
-  "  html { font-size: 11pt; }" +
-  "}" +
-  "");
-
-define("text/support/cockpit/lib/cockpit/ui/cli_view.css", [], "" +
-  "#cockpitInput { padding-left: 16px; }" +
-  "" +
-  ".cptOutput { overflow: auto; position: absolute; z-index: 999; display: none; }" +
-  "" +
-  ".cptCompletion { padding: 0; position: absolute; z-index: -1000; }" +
-  ".cptCompletion.VALID { background: #FFF; }" +
-  ".cptCompletion.INCOMPLETE { background: #DDD; }" +
-  ".cptCompletion.INVALID { background: #DDD; }" +
-  ".cptCompletion span { color: #FFF; }" +
-  ".cptCompletion span.INCOMPLETE { color: #DDD; border-bottom: 2px dotted #F80; }" +
-  ".cptCompletion span.INVALID { color: #DDD; border-bottom: 2px dotted #F00; }" +
-  "span.cptPrompt { color: #66F; font-weight: bold; }" +
-  "" +
-  "" +
-  ".cptHints {" +
-  "  color: #000;" +
-  "  position: absolute;" +
-  "  border: 1px solid rgba(230, 230, 230, 0.8);" +
-  "  background: rgba(250, 250, 250, 0.8);" +
-  "  -moz-border-radius-topleft: 10px;" +
-  "  -moz-border-radius-topright: 10px;" +
-  "  border-top-left-radius: 10px; border-top-right-radius: 10px;" +
-  "  z-index: 1000;" +
-  "  padding: 8px;" +
-  "  display: none;" +
-  "}" +
-  "" +
-  ".cptFocusPopup { display: block; }" +
-  ".cptFocusPopup.cptNoPopup { display: none; }" +
-  "" +
-  ".cptHints ul { margin: 0; padding: 0 15px; }" +
-  "" +
-  ".cptGt { font-weight: bold; font-size: 120%; }" +
-  "");
-
-define("text/support/cockpit/lib/cockpit/ui/request_view.css", [], "" +
-  ".cptRowIn {" +
-  "  display: box; display: -moz-box; display: -webkit-box;" +
-  "  box-orient: horizontal; -moz-box-orient: horizontal; -webkit-box-orient: horizontal;" +
-  "  box-align: center; -moz-box-align: center; -webkit-box-align: center;" +
-  "  color: #333;" +
-  "  background-color: #EEE;" +
-  "  width: 100%;" +
-  "  font-family: consolas, courier, monospace;" +
-  "}" +
-  ".cptRowIn > * { padding-left: 2px; padding-right: 2px; }" +
-  ".cptRowIn > img { cursor: pointer; }" +
-  ".cptHover { display: none; }" +
-  ".cptRowIn:hover > .cptHover { display: block; }" +
-  ".cptRowIn:hover > .cptHover.cptHidden { display: none; }" +
-  ".cptOutTyped {" +
-  "  box-flex: 1; -moz-box-flex: 1; -webkit-box-flex: 1;" +
-  "  font-weight: bold; color: #000; font-size: 120%;" +
-  "}" +
-  ".cptRowOutput { padding-left: 10px; line-height: 1.2em; }" +
-  ".cptRowOutput strong," +
-  ".cptRowOutput b," +
-  ".cptRowOutput th," +
-  ".cptRowOutput h1," +
-  ".cptRowOutput h2," +
-  ".cptRowOutput h3 { color: #000; }" +
-  ".cptRowOutput a { font-weight: bold; color: #666; text-decoration: none; }" +
-  ".cptRowOutput a: hover { text-decoration: underline; cursor: pointer; }" +
-  ".cptRowOutput input[type=password]," +
-  ".cptRowOutput input[type=text]," +
-  ".cptRowOutput textarea {" +
-  "  color: #000; font-size: 120%;" +
-  "  background: transparent; padding: 3px;" +
-  "  border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px;" +
-  "}" +
-  ".cptRowOutput table," +
-  ".cptRowOutput td," +
-  ".cptRowOutput th { border: 0; padding: 0 2px; }" +
-  ".cptRowOutput .right { text-align: right; }" +
-  "");
-
-define("text/tool/Theme.tmpl.css", [], ".%cssClass% .ace_editor {" +
-  "  border: 2px solid rgb(159, 159, 159);" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_editor.ace_focus {" +
-  "  border: 2px solid #327fbd;" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_gutter {" +
-  "  width: 50px;" +
-  "  background: #e8e8e8;" +
-  "  color: #333;" +
-  "  overflow : hidden;" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_gutter-layer {" +
-  "  width: 100%;" +
-  "  text-align: right;" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_gutter-layer .ace_gutter-cell {" +
-  "  padding-right: 6px;" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_print_margin {" +
-  "  width: 1px;" +
-  "  background: %printMargin%;" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_scroller {" +
-  "  background-color: %background%;" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_text-layer {" +
-  "  cursor: text;" +
-  "  color: %foreground%;" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_cursor {" +
-  "  border-left: 2px solid %cursor%;" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_cursor.ace_overwrite {" +
-  "  border-left: 0px;" +
-  "  border-bottom: 1px solid %overwrite%;" +
-  "}" +
-  " " +
-  ".%cssClass% .ace_marker-layer .ace_selection {" +
-  "  background: %selection%;" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_marker-layer .ace_step {" +
-  "  background: %step%;" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_marker-layer .ace_bracket {" +
-  "  margin: -1px 0 0 -1px;" +
-  "  border: 1px solid %bracket%;" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_marker-layer .ace_active_line {" +
-  "  background: %active_line%;" +
-  "}" +
-  "" +
-  "       " +
-  ".%cssClass% .ace_invisible {" +
-  "  %invisible%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_keyword {" +
-  "  %keyword%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_keyword.ace_operator {" +
-  "  %keyword.operator%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_constant {" +
-  "  %constant%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_constant.ace_language {" +
-  "  %constant.language%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_constant.ace_library {" +
-  "  %constant.library%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_constant.ace_numeric {" +
-  "  %constant.numeric%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_invalid {" +
-  "  %invalid%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_invalid.ace_illegal {" +
-  "  %invalid.illegal%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_invalid.ace_deprecated {" +
-  "  %invalid.deprecated%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_support {" +
-  "  %support%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_support.ace_function {" +
-  "  %support.function%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_function.ace_buildin {" +
-  "  %function.buildin%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_string {" +
-  "  %string%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_string.ace_regexp {" +
-  "  %string.regexp%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_comment {" +
-  "  %comment%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_comment.ace_doc {" +
-  "  %comment.doc%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_comment.ace_doc.ace_tag {" +
-  "  %comment.doc.tag%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_variable {" +
-  "  %variable%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_variable.ace_language {" +
-  "  %variable.language%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_xml_pe {" +
-  "  %xml_pe%" +
-  "}" +
-  "" +
-  ".%cssClass% .ace_collab.ace_user1 {" +
-  "  %collab.user1%   " +
-  "}");
-
-define("text/styles.css", [], "html {" +
-  "    height: 100%;" +
-  "    width: 100%;" +
-  "    overflow: hidden;" +
-  "}" +
-  "" +
-  "body {" +
-  "    overflow: hidden;" +
-  "    margin: 0;" +
-  "    padding: 0;" +
-  "    height: 100%;" +
-  "    width: 100%;" +
-  "    font-family: Arial, Helvetica, sans-serif, Tahoma, Verdana, sans-serif;" +
-  "    font-size: 12px;" +
-  "    background: rgb(14, 98, 165);" +
-  "    color: white;" +
-  "}" +
-  "" +
-  "#logo {" +
-  "    padding: 15px;" +
-  "    margin-left: 65px;" +
-  "}" +
-  "" +
-  "#editor {" +
-  "    position: absolute;" +
-  "    top:  0px;" +
-  "    left: 280px;" +
-  "    bottom: 0px;" +
-  "    right: 0px;" +
-  "    background: white;" +
-  "}" +
-  "" +
-  "#controls {" +
-  "    padding: 5px;" +
-  "}" +
-  "" +
-  "#controls td {" +
-  "    text-align: right;" +
-  "}" +
-  "" +
-  "#controls td + td {" +
-  "    text-align: left;" +
-  "}" +
-  "" +
-  "#cockpitInput {" +
-  "    position: absolute;" +
-  "    left: 280px;" +
-  "    right: 0px;" +
-  "    bottom: 0;" +
-  "" +
-  "    border: none; outline: none;" +
-  "    font-family: consolas, courier, monospace;" +
-  "    font-size: 120%;" +
-  "}" +
-  "" +
-  "#cockpitOutput {" +
-  "    padding: 10px;" +
-  "    margin: 0 15px;" +
-  "    border: 1px solid #AAA;" +
-  "    -moz-border-radius-topleft: 10px;" +
-  "    -moz-border-radius-topright: 10px;" +
-  "    border-top-left-radius: 4px; border-top-right-radius: 4px;" +
-  "    background: #DDD; color: #000;" +
-  "}");
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Kevin Dangoor (kdangoor@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-require(["ace/ace"], function(ace) {
-    window.ace = ace;
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/cockpit-uncompressed.js b/apps/files_texteditor/js/aceeditor/cockpit-uncompressed.js
deleted file mode 100644
index ac7ef1ab169..00000000000
--- a/apps/files_texteditor/js/aceeditor/cockpit-uncompressed.js
+++ /dev/null
@@ -1,2504 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Kevin Dangoor (kdangoor@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('cockpit/index', ['require', 'exports', 'module' , 'pilot/index', 'cockpit/cli', 'cockpit/ui/settings', 'cockpit/ui/cli_view', 'cockpit/commands/basic'], function(require, exports, module) {
-
-
-exports.startup = function(data, reason) {
-  require('pilot/index');
-  require('cockpit/cli').startup(data, reason);
-  // window.testCli = require('cockpit/test/testCli');
-
-  require('cockpit/ui/settings').startup(data, reason);
-  require('cockpit/ui/cli_view').startup(data, reason);
-  require('cockpit/commands/basic').startup(data, reason);
-};
-
-/*
-exports.shutdown(data, reason) {
-};
-*/
-
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Walker (jwalker@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('cockpit/cli', ['require', 'exports', 'module' , 'pilot/console', 'pilot/lang', 'pilot/oop', 'pilot/event_emitter', 'pilot/types', 'pilot/canon'], function(require, exports, module) {
-
-
-var console = require('pilot/console');
-var lang = require('pilot/lang');
-var oop = require('pilot/oop');
-var EventEmitter = require('pilot/event_emitter').EventEmitter;
-
-//var keyboard = require('keyboard/keyboard');
-var types = require('pilot/types');
-var Status = require('pilot/types').Status;
-var Conversion = require('pilot/types').Conversion;
-var canon = require('pilot/canon');
-
-/**
- * Normally type upgrade is done when the owning command is registered, but
- * out commandParam isn't part of a command, so it misses out.
- */
-exports.startup = function(data, reason) {
-    canon.upgradeType('command', commandParam);
-};
-
-/**
- * The information required to tell the user there is a problem with their
- * input.
- * TODO: There a several places where {start,end} crop up. Perhaps we should
- * have a Cursor object.
- */
-function Hint(status, message, start, end, predictions) {
-    this.status = status;
-    this.message = message;
-
-    if (typeof start === 'number') {
-        this.start = start;
-        this.end = end;
-        this.predictions = predictions;
-    }
-    else {
-        var arg = start;
-        this.start = arg.start;
-        this.end = arg.end;
-        this.predictions = arg.predictions;
-    }
-}
-Hint.prototype = {
-};
-/**
- * Loop over the array of hints finding the one we should display.
- * @param hints array of hints
- */
-Hint.sort = function(hints, cursor) {
-    // Calculate 'distance from cursor'
-    if (cursor !== undefined) {
-        hints.forEach(function(hint) {
-            if (hint.start === Argument.AT_CURSOR) {
-                hint.distance = 0;
-            }
-            else if (cursor < hint.start) {
-                hint.distance = hint.start - cursor;
-            }
-            else if (cursor > hint.end) {
-                hint.distance = cursor - hint.end;
-            }
-            else {
-                hint.distance = 0;
-            }
-        }, this);
-    }
-    // Sort
-    hints.sort(function(hint1, hint2) {
-        // Compare first based on distance from cursor
-        if (cursor !== undefined) {
-            var diff = hint1.distance - hint2.distance;
-            if (diff != 0) {
-                return diff;
-            }
-        }
-        // otherwise go with hint severity
-        return hint2.status - hint1.status;
-    });
-    // tidy-up
-    if (cursor !== undefined) {
-        hints.forEach(function(hint) {
-            delete hint.distance;
-        }, this);
-    }
-    return hints;
-};
-exports.Hint = Hint;
-
-/**
- * A Hint that arose as a result of a Conversion
- */
-function ConversionHint(conversion, arg) {
-    this.status = conversion.status;
-    this.message = conversion.message;
-    if (arg) {
-        this.start = arg.start;
-        this.end = arg.end;
-    }
-    else {
-        this.start = 0;
-        this.end = 0;
-    }
-    this.predictions = conversion.predictions;
-};
-oop.inherits(ConversionHint, Hint);
-
-
-/**
- * We record where in the input string an argument comes so we can report errors
- * against those string positions.
- * We publish a 'change' event when-ever the text changes
- * @param emitter Arguments use something else to pass on change events.
- * Currently this will be the creating Requisition. This prevents dependency
- * loops and prevents us from needing to merge listener lists.
- * @param text The string (trimmed) that contains the argument
- * @param start The position of the text in the original input string
- * @param end See start
- * @param prefix Knowledge of quotation marks and whitespace used prior to the
- * text in the input string allows us to re-generate the original input from
- * the arguments.
- * @param suffix Any quotation marks and whitespace used after the text.
- * Whitespace is normally placed in the prefix to the succeeding argument, but
- * can be used here when this is the last argument.
- * @constructor
- */
-function Argument(emitter, text, start, end, prefix, suffix) {
-    this.emitter = emitter;
-    this.setText(text);
-    this.start = start;
-    this.end = end;
-    this.prefix = prefix;
-    this.suffix = suffix;
-}
-Argument.prototype = {
-    /**
-     * Return the result of merging these arguments.
-     * TODO: What happens when we're merging arguments for the single string
-     * case and some of the arguments are in quotation marks?
-     */
-    merge: function(following) {
-        if (following.emitter != this.emitter) {
-            throw new Error('Can\'t merge Arguments from different EventEmitters');
-        }
-        return new Argument(
-            this.emitter,
-            this.text + this.suffix + following.prefix + following.text,
-            this.start, following.end,
-            this.prefix,
-            following.suffix);
-    },
-
-    /**
-     * See notes on events in Assignment. We might need to hook changes here
-     * into a CliRequisition so they appear of the command line.
-     */
-    setText: function(text) {
-        if (text == null) {
-            throw new Error('Illegal text for Argument: ' + text);
-        }
-        var ev = { argument: this, oldText: this.text, text: text };
-        this.text = text;
-        this.emitter._dispatchEvent('argumentChange', ev);
-    },
-
-    /**
-     * Helper when we're putting arguments back together
-     */
-    toString: function() {
-        // TODO: There is a bug here - we should re-escape escaped characters
-        // But can we do that reliably?
-        return this.prefix + this.text + this.suffix;
-    }
-};
-
-/**
- * Merge an array of arguments into a single argument.
- * All Arguments in the array are expected to have the same emitter
- */
-Argument.merge = function(argArray, start, end) {
-    start = (start === undefined) ? 0 : start;
-    end = (end === undefined) ? argArray.length : end;
-
-    var joined;
-    for (var i = start; i < end; i++) {
-        var arg = argArray[i];
-        if (!joined) {
-            joined = arg;
-        }
-        else {
-            joined = joined.merge(arg);
-        }
-    }
-    return joined;
-};
-
-/**
- * We sometimes need a way to say 'this error occurs where ever the cursor is'
- */
-Argument.AT_CURSOR = -1;
-
-
-/**
- * A link between a parameter and the data for that parameter.
- * The data for the parameter is available as in the preferred type and as
- * an Argument for the CLI.
- * <p>We also record validity information where applicable.
- * <p>For values, null and undefined have distinct definitions. null means
- * that a value has been provided, undefined means that it has not.
- * Thus, null is a valid default value, and common because it identifies an
- * parameter that is optional. undefined means there is no value from
- * the command line.
- * @constructor
- */
-function Assignment(param, requisition) {
-    this.param = param;
-    this.requisition = requisition;
-    this.setValue(param.defaultValue);
-};
-Assignment.prototype = {
-    /**
-     * The parameter that we are assigning to
-     * @readonly
-     */
-    param: undefined,
-
-    /**
-     * Report on the status of the last parse() conversion.
-     * @see types.Conversion
-     */
-    conversion: undefined,
-
-    /**
-     * The current value in a type as specified by param.type
-     */
-    value: undefined,
-
-    /**
-     * The string version of the current value
-     */
-    arg: undefined,
-
-    /**
-     * The current value (i.e. not the string representation)
-     * Use setValue() to mutate
-     */
-    value: undefined,
-    setValue: function(value) {
-        if (this.value === value) {
-            return;
-        }
-
-        if (value === undefined) {
-            this.value = this.param.defaultValue;
-            this.conversion = this.param.getDefault ?
-                    this.param.getDefault() :
-                    this.param.type.getDefault();
-            this.arg = undefined;
-        } else {
-            this.value = value;
-            this.conversion = undefined;
-            var text = (value == null) ? '' : this.param.type.stringify(value);
-            if (this.arg) {
-                this.arg.setText(text);
-            }
-        }
-
-        this.requisition._assignmentChanged(this);
-    },
-
-    /**
-     * The textual representation of the current value
-     * Use setValue() to mutate
-     */
-    arg: undefined,
-    setArgument: function(arg) {
-        if (this.arg === arg) {
-            return;
-        }
-        this.arg = arg;
-        this.conversion = this.param.type.parse(arg.text);
-        this.conversion.arg = arg; // TODO: make this automatic?
-        this.value = this.conversion.value;
-        this.requisition._assignmentChanged(this);
-    },
-
-    /**
-     * Create a list of the hints associated with this parameter assignment.
-     * Generally there will be only one hint generated because we're currently
-     * only displaying one hint at a time, ordering by distance from cursor
-     * and severity. Since distance from cursor will be the same for all hints
-     * from this assignment all but the most severe will ever be used. It might
-     * make sense with more experience to alter this to function to be getHint()
-     */
-    getHint: function() {
-        // Allow the parameter to provide documentation
-        if (this.param.getCustomHint && this.value && this.arg) {
-            var hint = this.param.getCustomHint(this.value, this.arg);
-            if (hint) {
-                return hint;
-            }
-        }
-
-        // If there is no argument, use the cursor position
-        var message = '<strong>' + this.param.name + '</strong>: ';
-        if (this.param.description) {
-            // TODO: This should be a short description - do we need to trim?
-            message += this.param.description.trim();
-
-            // Ensure the help text ends with '. '
-            if (message.charAt(message.length - 1) !== '.') {
-                message += '.';
-            }
-            if (message.charAt(message.length - 1) !== ' ') {
-                message += ' ';
-            }
-        }
-        var status = Status.VALID;
-        var start = this.arg ? this.arg.start : Argument.AT_CURSOR;
-        var end = this.arg ? this.arg.end : Argument.AT_CURSOR;
-        var predictions;
-
-        // Non-valid conversions will have useful information to pass on
-        if (this.conversion) {
-            status = this.conversion.status;
-            if (this.conversion.message) {
-                message += this.conversion.message;
-            }
-            predictions = this.conversion.predictions;
-        }
-
-        // Hint if the param is required, but not provided
-        var argProvided = this.arg && this.arg.text !== '';
-        var dataProvided = this.value !== undefined || argProvided;
-        if (this.param.defaultValue === undefined && !dataProvided) {
-            status = Status.INVALID;
-            message += '<strong>Required<\strong>';
-        }
-
-        return new Hint(status, message, start, end, predictions);
-    },
-
-    /**
-     * Basically <tt>setValue(conversion.predictions[0])</tt> done in a safe
-     * way.
-     */
-    complete: function() {
-        if (this.conversion && this.conversion.predictions &&
-                this.conversion.predictions.length > 0) {
-            this.setValue(this.conversion.predictions[0]);
-        }
-    },
-
-    /**
-     * If the cursor is at 'position', do we have sufficient data to start
-     * displaying the next hint. This is both complex and important.
-     * For example, if the user has just typed:<ul>
-     * <li>'set tabstop ' then they clearly want to know about the valid
-     *     values for the tabstop setting, so the hint is based on the next
-     *     parameter.
-     * <li>'set tabstop' (without trailing space) - they will probably still
-     *     want to know about the valid values for the tabstop setting because
-     *     there is no confusion about the setting in question.
-     * <li>'set tabsto' they've not finished typing a setting name so the hint
-     *     should be based on the current parameter.
-     * <li>'set tabstop' (when there is an additional tabstopstyle setting) we
-     *     can't make assumptions about the setting - we're not finished.
-     * </ul>
-     * <p>Note that the input for 2 and 4 is identical, only the configuration
-     * has changed, so hint display is environmental.
-     *
-     * <p>This function works out if the cursor is before the end of this
-     * assignment (assuming that we've asked the same thing of the previous
-     * assignment) and then attempts to work out if we should use the hint from
-     * the next assignment even though technically the cursor is still inside
-     * this one due to the rules above.
-     */
-    isPositionCaptured: function(position) {
-        if (!this.arg) {
-            return false;
-        }
-
-        // Note we don't check if position >= this.arg.start because that's
-        // implied by the fact that we're asking the assignments in turn, and
-        // we want to avoid thing falling between the cracks, but we do need
-        // to check that the argument does have a position
-        if (this.arg.start === -1) {
-            return false;
-        }
-
-        // We're clearly done if the position is past the end of the text
-        if (position > this.arg.end) {
-            return false;
-        }
-
-        // If we're AT the end, the position is captured if either the status
-        // is not valid or if there are other valid options including current
-        if (position === this.arg.end) {
-            return this.conversion.status !== Status.VALID ||
-                    this.conversion.predictions.length !== 0;
-        }
-
-        // Otherwise we're clearly inside
-        return true;
-    },
-
-    /**
-     * Replace the current value with the lower value if such a concept
-     * exists.
-     */
-    decrement: function() {
-        var replacement = this.param.type.decrement(this.value);
-        if (replacement != null) {
-            this.setValue(replacement);
-        }
-    },
-
-    /**
-     * Replace the current value with the higher value if such a concept
-     * exists.
-     */
-    increment: function() {
-        var replacement = this.param.type.increment(this.value);
-        if (replacement != null) {
-            this.setValue(replacement);
-        }
-    },
-
-    /**
-     * Helper when we're rebuilding command lines.
-     */
-    toString: function() {
-        return this.arg ? this.arg.toString() : '';
-    }
-};
-exports.Assignment = Assignment;
-
-
-/**
- * This is a special parameter to reflect the command itself.
- */
-var commandParam = {
-    name: '__command',
-    type: 'command',
-    description: 'The command to execute',
-
-    /**
-     * Provide some documentation for a command.
-     */
-    getCustomHint: function(command, arg) {
-        var docs = [];
-        docs.push('<strong><tt> &gt; ');
-        docs.push(command.name);
-        if (command.params && command.params.length > 0) {
-            command.params.forEach(function(param) {
-                if (param.defaultValue === undefined) {
-                    docs.push(' [' + param.name + ']');
-                }
-                else {
-                    docs.push(' <em>[' + param.name + ']</em>');
-                }
-            }, this);
-        }
-        docs.push('</tt></strong><br/>');
-
-        docs.push(command.description ? command.description : '(No description)');
-        docs.push('<br/>');
-
-        if (command.params && command.params.length > 0) {
-            docs.push('<ul>');
-            command.params.forEach(function(param) {
-                docs.push('<li>');
-                docs.push('<strong><tt>' + param.name + '</tt></strong>: ');
-                docs.push(param.description ? param.description : '(No description)');
-                if (param.defaultValue === undefined) {
-                    docs.push(' <em>[Required]</em>');
-                }
-                else if (param.defaultValue === null) {
-                    docs.push(' <em>[Optional]</em>');
-                }
-                else {
-                    docs.push(' <em>[Default: ' + param.defaultValue + ']</em>');
-                }
-                docs.push('</li>');
-            }, this);
-            docs.push('</ul>');
-        }
-
-        return new Hint(Status.VALID, docs.join(''), arg);
-    }
-};
-
-/**
- * A Requisition collects the information needed to execute a command.
- * There is no point in a requisition for parameter-less commands because there
- * is no information to collect. A Requisition is a collection of assignments
- * of values to parameters, each handled by an instance of Assignment.
- * CliRequisition adds functions for parsing input from a command line to this
- * class.
- * <h2>Events<h2>
- * We publish the following events:<ul>
- * <li>argumentChange: The text of some argument has changed. It is likely that
- * any UI component displaying this argument will need to be updated. (Note that
- * this event is actually published by the Argument itself - see the docs for
- * Argument for more details)
- * The event object looks like: { argument: A, oldText: B, text: B }
- * <li>commandChange: The command has changed. It is likely that a UI
- * structure will need updating to match the parameters of the new command.
- * The event object looks like { command: A }
- * @constructor
- */
-function Requisition(env) {
-    this.env = env;
-    this.commandAssignment = new Assignment(commandParam, this);
-}
-
-Requisition.prototype = {
-    /**
-     * The command that we are about to execute.
-     * @see setCommandConversion()
-     * @readonly
-     */
-    commandAssignment: undefined,
-
-    /**
-     * The count of assignments. Excludes the commandAssignment
-     * @readonly
-     */
-    assignmentCount: undefined,
-
-    /**
-     * The object that stores of Assignment objects that we are filling out.
-     * The Assignment objects are stored under their param.name for named
-     * lookup. Note: We make use of the property of Javascript objects that
-     * they are not just hashmaps, but linked-list hashmaps which iterate in
-     * insertion order.
-     * Excludes the commandAssignment.
-     */
-    _assignments: undefined,
-
-    /**
-     * The store of hints generated by the assignments. We are trying to prevent
-     * the UI from needing to access this in broad form, but instead use
-     * methods that query part of this structure.
-     */
-    _hints: undefined,
-
-    /**
-     * When the command changes, we need to keep a bunch of stuff in sync
-     */
-    _assignmentChanged: function(assignment) {
-        // This is all about re-creating Assignments
-        if (assignment.param.name !== '__command') {
-            return;
-        }
-
-        this._assignments = {};
-
-        if (assignment.value) {
-            assignment.value.params.forEach(function(param) {
-                this._assignments[param.name] = new Assignment(param, this);
-            }, this);
-        }
-
-        this.assignmentCount = Object.keys(this._assignments).length;
-        this._dispatchEvent('commandChange', { command: assignment.value });
-    },
-
-    /**
-     * Assignments have an order, so we need to store them in an array.
-     * But we also need named access ...
-     */
-    getAssignment: function(nameOrNumber) {
-        var name = (typeof nameOrNumber === 'string') ?
-            nameOrNumber :
-            Object.keys(this._assignments)[nameOrNumber];
-        return this._assignments[name];
-    },
-
-    /**
-     * Where parameter name == assignment names - they are the same.
-     */
-    getParameterNames: function() {
-        return Object.keys(this._assignments);
-    },
-
-    /**
-     * A *shallow* clone of the assignments.
-     * This is useful for systems that wish to go over all the assignments
-     * finding values one way or another and wish to trim an array as they go.
-     */
-    cloneAssignments: function() {
-        return Object.keys(this._assignments).map(function(name) {
-            return this._assignments[name];
-        }, this);
-    },
-
-    /**
-     * Collect the statuses from the Assignments.
-     * The hints returned are sorted by severity
-     */
-    _updateHints: function() {
-        // TODO: work out when to clear this out for the plain Requisition case
-        // this._hints = [];
-        this.getAssignments(true).forEach(function(assignment) {
-            this._hints.push(assignment.getHint());
-        }, this);
-        Hint.sort(this._hints);
-
-        // We would like to put some initial help here, but for anyone but
-        // a complete novice a 'type help' message is very annoying, so we
-        // need to find a way to only display this message once, or for
-        // until the user click a 'close' button or similar
-        // TODO: Add special case for '' input
-    },
-
-    /**
-     * Returns the most severe status
-     */
-    getWorstHint: function() {
-        return this._hints[0];
-    },
-
-    /**
-     * Extract the names and values of all the assignments, and return as
-     * an object.
-     */
-    getArgsObject: function() {
-        var args = {};
-        this.getAssignments().forEach(function(assignment) {
-            args[assignment.param.name] = assignment.value;
-        }, this);
-        return args;
-    },
-
-    /**
-     * Access the arguments as an array.
-     * @param includeCommand By default only the parameter arguments are
-     * returned unless (includeCommand === true), in which case the list is
-     * prepended with commandAssignment.arg
-     */
-    getAssignments: function(includeCommand) {
-        var args = [];
-        if (includeCommand === true) {
-            args.push(this.commandAssignment);
-        }
-        Object.keys(this._assignments).forEach(function(name) {
-            args.push(this.getAssignment(name));
-        }, this);
-        return args;
-    },
-
-    /**
-     * Reset all the assignments to their default values
-     */
-    setDefaultValues: function() {
-        this.getAssignments().forEach(function(assignment) {
-            assignment.setValue(undefined);
-        }, this);
-    },
-
-    /**
-     * Helper to call canon.exec
-     */
-    exec: function() {
-        canon.exec(this.commandAssignment.value,
-              this.env,
-              "cli",
-              this.getArgsObject(),
-              this.toCanonicalString());
-    },
-
-    /**
-     * Extract a canonical version of the input
-     */
-    toCanonicalString: function() {
-        var line = [];
-        line.push(this.commandAssignment.value.name);
-        Object.keys(this._assignments).forEach(function(name) {
-            var assignment = this._assignments[name];
-            var type = assignment.param.type;
-            // TODO: This will cause problems if there is a non-default value
-            // after a default value. Also we need to decide when to use
-            // named parameters in place of positional params. Both can wait.
-            if (assignment.value !== assignment.param.defaultValue) {
-                line.push(' ');
-                line.push(type.stringify(assignment.value));
-            }
-        }, this);
-        return line.join('');
-    }
-};
-oop.implement(Requisition.prototype, EventEmitter);
-exports.Requisition = Requisition;
-
-
-/**
- * An object used during command line parsing to hold the various intermediate
- * data steps.
- * <p>The 'output' of the update is held in 2 objects: input.hints which is an
- * array of hints to display to the user. In the future this will become a
- * single value.
- * <p>The other output value is input.requisition which gives access to an
- * args object for use in executing the final command.
- *
- * <p>The majority of the functions in this class are called in sequence by the
- * constructor. Their task is to add to <tt>hints</tt> fill out the requisition.
- * <p>The general sequence is:<ul>
- * <li>_tokenize(): convert _typed into _parts
- * <li>_split(): convert _parts into _command and _unparsedArgs
- * <li>_assign(): convert _unparsedArgs into requisition
- * </ul>
- *
- * @param typed {string} The instruction as typed by the user so far
- * @param options {object} A list of optional named parameters. Can be any of:
- * <b>flags</b>: Flags for us to check against the predicates specified with the
- * commands. Defaulted to <tt>keyboard.buildFlags({ });</tt>
- * if not specified.
- * @constructor
- */
-function CliRequisition(env, options) {
-    Requisition.call(this, env);
-
-    if (options && options.flags) {
-        /**
-         * TODO: We were using a default of keyboard.buildFlags({ });
-         * This allowed us to have commands that only existed in certain contexts
-         * - i.e. Javascript specific commands.
-         */
-        this.flags = options.flags;
-    }
-}
-oop.inherits(CliRequisition, Requisition);
-(function() {
-    /**
-     * Called by the UI when ever the user interacts with a command line input
-     * @param input A structure that details the state of the input field.
-     * It should look something like: { typed:a, cursor: { start:b, end:c } }
-     * Where a is the contents of the input field, and b and c are the start
-     * and end of the cursor/selection respectively.
-     */
-    CliRequisition.prototype.update = function(input) {
-        this.input = input;
-        this._hints = [];
-
-        var args = this._tokenize(input.typed);
-        this._split(args);
-
-        if (this.commandAssignment.value) {
-            this._assign(args);
-        }
-
-        this._updateHints();
-    };
-
-    /**
-     * Return an array of Status scores so we can create a marked up
-     * version of the command line input.
-     */
-    CliRequisition.prototype.getInputStatusMarkup = function() {
-        // 'scores' is an array which tells us what chars are errors
-        // Initialize with everything VALID
-        var scores = this.toString().split('').map(function(ch) {
-            return Status.VALID;
-        });
-        // For all chars in all hints, check and upgrade the score
-        this._hints.forEach(function(hint) {
-            for (var i = hint.start; i <= hint.end; i++) {
-                if (hint.status > scores[i]) {
-                    scores[i] = hint.status;
-                }
-            }
-        }, this);
-        return scores;
-    };
-
-    /**
-     * Reconstitute the input from the args
-     */
-    CliRequisition.prototype.toString = function() {
-        return this.getAssignments(true).map(function(assignment) {
-            return assignment.toString();
-        }, this).join('');
-    };
-
-    var superUpdateHints = CliRequisition.prototype._updateHints;
-    /**
-     * Marks up hints in a number of ways:
-     * - Makes INCOMPLETE hints that are not near the cursor INVALID since
-     *   they can't be completed by typing
-     * - Finds the most severe hint, and annotates the array with it
-     * - Finds the hint to display, and also annotates the array with it
-     * TODO: I'm wondering if array annotation is evil and we should replace
-     * this with an object. Need to find out more.
-     */
-    CliRequisition.prototype._updateHints = function() {
-        superUpdateHints.call(this);
-
-        // Not knowing about cursor positioning, the requisition and assignments
-        // can't know this, but anything they mark as INCOMPLETE is actually
-        // INVALID unless the cursor is actually inside that argument.
-        var c = this.input.cursor;
-        this._hints.forEach(function(hint) {
-            var startInHint = c.start >= hint.start && c.start <= hint.end;
-            var endInHint = c.end >= hint.start && c.end <= hint.end;
-            var inHint = startInHint || endInHint;
-            if (!inHint && hint.status === Status.INCOMPLETE) {
-                 hint.status = Status.INVALID;
-            }
-        }, this);
-
-        Hint.sort(this._hints);
-    };
-
-    /**
-     * Accessor for the hints array.
-     * While we could just use the hints property, using getHints() is
-     * preferred for symmetry with Requisition where it needs a function due to
-     * lack of an atomic update system.
-     */
-    CliRequisition.prototype.getHints = function() {
-        return this._hints;
-    };
-
-    /**
-     * Look through the arguments attached to our assignments for the assignment
-     * at the given position.
-     */
-    CliRequisition.prototype.getAssignmentAt = function(position) {
-        var assignments = this.getAssignments(true);
-        for (var i = 0; i < assignments.length; i++) {
-            var assignment = assignments[i];
-            if (!assignment.arg) {
-                // There is no argument in this assignment, we've fallen off
-                // the end of the obvious answers - it must be this one.
-                return assignment;
-            }
-            if (assignment.isPositionCaptured(position)) {
-                return assignment;
-            }
-        }
-
-        return assignment;
-    };
-
-    /**
-     * Split up the input taking into account ' and "
-     */
-    CliRequisition.prototype._tokenize = function(typed) {
-        // For blank input, place a dummy empty argument into the list
-        if (typed == null || typed.length === 0) {
-            return [ new Argument(this, '', 0, 0, '', '') ];
-        }
-
-        var OUTSIDE = 1;     // The last character was whitespace
-        var IN_SIMPLE = 2;   // The last character was part of a parameter
-        var IN_SINGLE_Q = 3; // We're inside a single quote: '
-        var IN_DOUBLE_Q = 4; // We're inside double quotes: "
-
-        var mode = OUTSIDE;
-
-        // First we un-escape. This list was taken from:
-        // https://developer.mozilla.org/en/Core_JavaScript_1.5_Guide/Core_Language_Features#Unicode
-        // We are generally converting to their real values except for \', \"
-        // and '\ ' which we are converting to unicode private characters so we
-        // can distinguish them from ', " and ' ', which have special meaning.
-        // They need swapping back post-split - see unescape2()
-        typed = typed
-                .replace(/\\\\/g, '\\')
-                .replace(/\\b/g, '\b')
-                .replace(/\\f/g, '\f')
-                .replace(/\\n/g, '\n')
-                .replace(/\\r/g, '\r')
-                .replace(/\\t/g, '\t')
-                .replace(/\\v/g, '\v')
-                .replace(/\\n/g, '\n')
-                .replace(/\\r/g, '\r')
-                .replace(/\\ /g, '\uF000')
-                .replace(/\\'/g, '\uF001')
-                .replace(/\\"/g, '\uF002');
-
-        function unescape2(str) {
-            return str
-                .replace(/\uF000/g, ' ')
-                .replace(/\uF001/g, '\'')
-                .replace(/\uF002/g, '"');
-        }
-
-        var i = 0;
-        var start = 0; // Where did this section start?
-        var prefix = '';
-        var args = [];
-
-        while (true) {
-            if (i >= typed.length) {
-                // There is nothing else to read - tidy up
-                if (mode !== OUTSIDE) {
-                    var str = unescape2(typed.substring(start, i));
-                    args.push(new Argument(this, str, start, i, prefix, ''));
-                }
-                else {
-                    if (i !== start) {
-                        // There's a bunch of whitespace at the end of the
-                        // command add it to the last argument's suffix,
-                        // creating an empty argument if needed.
-                        var extra = typed.substring(start, i);
-                        var lastArg = args[args.length - 1];
-                        if (!lastArg) {
-                            lastArg = new Argument(this, '', i, i, extra, '');
-                            args.push(lastArg);
-                        }
-                        else {
-                            lastArg.suffix += extra;
-                        }
-                    }
-                }
-                break;
-            }
-
-            var c = typed[i];
-            switch (mode) {
-                case OUTSIDE:
-                    if (c === '\'') {
-                        prefix = typed.substring(start, i + 1);
-                        mode = IN_SINGLE_Q;
-                        start = i + 1;
-                    }
-                    else if (c === '"') {
-                        prefix = typed.substring(start, i + 1);
-                        mode = IN_DOUBLE_Q;
-                        start = i + 1;
-                    }
-                    else if (/ /.test(c)) {
-                        // Still whitespace, do nothing
-                    }
-                    else {
-                        prefix = typed.substring(start, i);
-                        mode = IN_SIMPLE;
-                        start = i;
-                    }
-                    break;
-
-                case IN_SIMPLE:
-                    // There is an edge case of xx'xx which we are assuming to
-                    // be a single parameter (and same with ")
-                    if (c === ' ') {
-                        var str = unescape2(typed.substring(start, i));
-                        args.push(new Argument(this, str,
-                                start, i, prefix, ''));
-                        mode = OUTSIDE;
-                        start = i;
-                        prefix = '';
-                    }
-                    break;
-
-                case IN_SINGLE_Q:
-                    if (c === '\'') {
-                        var str = unescape2(typed.substring(start, i));
-                        args.push(new Argument(this, str,
-                                start - 1, i + 1, prefix, c));
-                        mode = OUTSIDE;
-                        start = i + 1;
-                        prefix = '';
-                    }
-                    break;
-
-                case IN_DOUBLE_Q:
-                    if (c === '"') {
-                        var str = unescape2(typed.substring(start, i));
-                        args.push(new Argument(this, str,
-                                start - 1, i + 1, prefix, c));
-                        mode = OUTSIDE;
-                        start = i + 1;
-                        prefix = '';
-                    }
-                    break;
-            }
-
-            i++;
-        }
-
-        return args;
-    };
-
-    /**
-     * Looks in the canon for a command extension that matches what has been
-     * typed at the command line.
-     */
-    CliRequisition.prototype._split = function(args) {
-        var argsUsed = 1;
-        var arg;
-
-        while (argsUsed <= args.length) {
-            var arg = Argument.merge(args, 0, argsUsed);
-            this.commandAssignment.setArgument(arg);
-
-            if (!this.commandAssignment.value) {
-                // Not found. break with value == null
-                break;
-            }
-
-            /*
-            // Previously we needed a way to hide commands depending context.
-            // We have not resurrected that feature yet.
-            if (!keyboard.flagsMatch(command.predicates, this.flags)) {
-                // If the predicates say 'no match' then go LA LA LA
-                command = null;
-                break;
-            }
-            */
-
-            if (this.commandAssignment.value.exec) {
-                // Valid command, break with command valid
-                for (var i = 0; i < argsUsed; i++) {
-                    args.shift();
-                }
-                break;
-            }
-
-            argsUsed++;
-        }
-    };
-
-    /**
-     * Work out which arguments are applicable to which parameters.
-     * <p>This takes #_command.params and #_unparsedArgs and creates a map of
-     * param names to 'assignment' objects, which have the following properties:
-     * <ul>
-     * <li>param - The matching parameter.
-     * <li>index - Zero based index into where the match came from on the input
-     * <li>value - The matching input
-     * </ul>
-     */
-    CliRequisition.prototype._assign = function(args) {
-        if (args.length === 0) {
-            this.setDefaultValues();
-            return;
-        }
-
-        // Create an error if the command does not take parameters, but we have
-        // been given them ...
-        if (this.assignmentCount === 0) {
-            // TODO: previously we were doing some extra work to avoid this if
-            // we determined that we had args that were all whitespace, but
-            // probably given our tighter tokenize() this won't be an issue?
-            this._hints.push(new Hint(Status.INVALID,
-                    this.commandAssignment.value.name +
-                    ' does not take any parameters',
-                    Argument.merge(args)));
-            return;
-        }
-
-        // Special case: if there is only 1 parameter, and that's of type
-        // text we put all the params into the first param
-        if (this.assignmentCount === 1) {
-            var assignment = this.getAssignment(0);
-            if (assignment.param.type.name === 'text') {
-                assignment.setArgument(Argument.merge(args));
-                return;
-            }
-        }
-
-        var assignments = this.cloneAssignments();
-        var names = this.getParameterNames();
-
-        // Extract all the named parameters
-        var used = [];
-        assignments.forEach(function(assignment) {
-            var namedArgText = '--' + assignment.name;
-
-            var i = 0;
-            while (true) {
-                var arg = args[i];
-                if (namedArgText !== arg.text) {
-                    i++;
-                    if (i >= args.length) {
-                        break;
-                    }
-                    continue;
-                }
-
-                // boolean parameters don't have values, default to false
-                if (assignment.param.type.name === 'boolean') {
-                    assignment.setValue(true);
-                }
-                else {
-                    if (i + 1 < args.length) {
-                        // Missing value portion of this named param
-                        this._hints.push(new Hint(Status.INCOMPLETE,
-                                'Missing value for: ' + namedArgText,
-                                args[i]));
-                    }
-                    else {
-                        args.splice(i + 1, 1);
-                        assignment.setArgument(args[i + 1]);
-                    }
-                }
-
-                lang.arrayRemove(names, assignment.name);
-                args.splice(i, 1);
-                // We don't need to i++ if we splice
-            }
-        }, this);
-
-        // What's left are positional parameters assign in order
-        names.forEach(function(name) {
-            var assignment = this.getAssignment(name);
-            if (args.length === 0) {
-                // No more values
-                assignment.setValue(undefined); // i.e. default
-            }
-            else {
-                var arg = args[0];
-                args.splice(0, 1);
-                assignment.setArgument(arg);
-            }
-        }, this);
-
-        if (args.length > 0) {
-            var remaining = Argument.merge(args);
-            this._hints.push(new Hint(Status.INVALID,
-                    'Input \'' + remaining.text + '\' makes no sense.',
-                    remaining));
-        }
-    };
-
-})();
-exports.CliRequisition = CliRequisition;
-
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Walker (jwalker@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('cockpit/ui/settings', ['require', 'exports', 'module' , 'pilot/types', 'pilot/types/basic'], function(require, exports, module) {
-
-
-var types = require("pilot/types");
-var SelectionType = require('pilot/types/basic').SelectionType;
-
-var direction = new SelectionType({
-    name: 'direction',
-    data: [ 'above', 'below' ]
-});
-
-var hintDirectionSetting = {
-    name: "hintDirection",
-    description: "Are hints shown above or below the command line?",
-    type: "direction",
-    defaultValue: "above"
-};
-
-var outputDirectionSetting = {
-    name: "outputDirection",
-    description: "Is the output window shown above or below the command line?",
-    type: "direction",
-    defaultValue: "above"
-};
-
-var outputHeightSetting = {
-    name: "outputHeight",
-    description: "What height should the output panel be?",
-    type: "number",
-    defaultValue: 300
-};
-
-exports.startup = function(data, reason) {
-    types.registerType(direction);
-    data.env.settings.addSetting(hintDirectionSetting);
-    data.env.settings.addSetting(outputDirectionSetting);
-    data.env.settings.addSetting(outputHeightSetting);
-};
-
-exports.shutdown = function(data, reason) {
-    types.unregisterType(direction);
-    data.env.settings.removeSetting(hintDirectionSetting);
-    data.env.settings.removeSetting(outputDirectionSetting);
-    data.env.settings.removeSetting(outputHeightSetting);
-};
-
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Walker (jwalker@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('cockpit/ui/cli_view', ['require', 'exports', 'module' , 'text!cockpit/ui/cli_view.css', 'pilot/event', 'pilot/dom', 'pilot/keys', 'pilot/canon', 'pilot/types', 'cockpit/cli', 'cockpit/ui/request_view'], function(require, exports, module) {
-
-
-var editorCss = require("text!cockpit/ui/cli_view.css");
-var event = require("pilot/event");
-var dom = require("pilot/dom");
-
-dom.importCssString(editorCss);
-
-var event = require("pilot/event");
-var keys = require("pilot/keys");
-var canon = require("pilot/canon");
-var Status = require('pilot/types').Status;
-
-var CliRequisition = require('cockpit/cli').CliRequisition;
-var Hint = require('cockpit/cli').Hint;
-var RequestView = require('cockpit/ui/request_view').RequestView;
-
-var NO_HINT = new Hint(Status.VALID, '', 0, 0);
-
-/**
- * On startup we need to:
- * 1. Add 3 sets of elements to the DOM for:
- * - command line output
- * - input hints
- * - completion
- * 2. Attach a set of events so the command line works
- */
-exports.startup = function(data, reason) {
-    var cli = new CliRequisition(data.env);
-    var cliView = new CliView(cli, data.env);
-    data.env.cli = cli;
-};
-
-/**
- * A class to handle the simplest UI implementation
- */
-function CliView(cli, env) {
-    cli.cliView = this;
-    this.cli = cli;
-    this.doc = document;
-    this.win = dom.getParentWindow(this.doc);
-    this.env = env;
-
-    // TODO: we should have a better way to specify command lines???
-    this.element = this.doc.getElementById('cockpitInput');
-    if (!this.element) {
-        // console.log('No element with an id of cockpit. Bailing on cli');
-        return;
-    }
-
-    this.settings = env.settings;
-    this.hintDirection = this.settings.getSetting('hintDirection');
-    this.outputDirection = this.settings.getSetting('outputDirection');
-    this.outputHeight = this.settings.getSetting('outputHeight');
-
-    // If the requisition tells us something has changed, we use this to know
-    // if we should ignore it
-    this.isUpdating = false;
-
-    this.createElements();
-    this.update();
-}
-CliView.prototype = {
-    /**
-     * Create divs for completion, hints and output
-     */
-    createElements: function() {
-        var input = this.element;
-
-        this.element.spellcheck = false;
-
-        this.output = this.doc.getElementById('cockpitOutput');
-        this.popupOutput = (this.output == null);
-        if (!this.output) {
-            this.output = this.doc.createElement('div');
-            this.output.id = 'cockpitOutput';
-            this.output.className = 'cptOutput';
-            input.parentNode.insertBefore(this.output, input.nextSibling);
-
-            var setMaxOutputHeight = function() {
-                this.output.style.maxHeight = this.outputHeight.get() + 'px';
-            }.bind(this);
-            this.outputHeight.addEventListener('change', setMaxOutputHeight);
-            setMaxOutputHeight();
-        }
-
-        this.completer = this.doc.createElement('div');
-        this.completer.className = 'cptCompletion VALID';
-
-        this.completer.style.color = dom.computedStyle(input, "color");
-        this.completer.style.fontSize = dom.computedStyle(input, "fontSize");
-        this.completer.style.fontFamily = dom.computedStyle(input, "fontFamily");
-        this.completer.style.fontWeight = dom.computedStyle(input, "fontWeight");
-        this.completer.style.fontStyle = dom.computedStyle(input, "fontStyle");
-        input.parentNode.insertBefore(this.completer, input.nextSibling);
-
-        // Transfer background styling to the completer.
-        this.completer.style.backgroundColor = input.style.backgroundColor;
-        input.style.backgroundColor = 'transparent';
-
-        this.hinter = this.doc.createElement('div');
-        this.hinter.className = 'cptHints';
-        input.parentNode.insertBefore(this.hinter, input.nextSibling);
-
-        var resizer = this.resizer.bind(this);
-        event.addListener(this.win, 'resize', resizer);
-        this.hintDirection.addEventListener('change', resizer);
-        this.outputDirection.addEventListener('change', resizer);
-        resizer();
-
-        canon.addEventListener('output',  function(ev) {
-            new RequestView(ev.request, this);
-        }.bind(this));
-        event.addCommandKeyListener(input, this.onCommandKey.bind(this));
-        event.addListener(input, 'keyup', this.onKeyUp.bind(this));
-
-        // cursor position affects hint severity. TODO: shortcuts for speed
-        event.addListener(input, 'mouseup', function(ev) {
-            this.isUpdating = true;
-            this.update();
-            this.isUpdating = false;
-        }.bind(this));
-
-        this.cli.addEventListener('argumentChange', this.onArgChange.bind(this));
-
-        event.addListener(input, "focus", function() {
-            dom.addCssClass(this.output, "cptFocusPopup");
-            dom.addCssClass(this.hinter, "cptFocusPopup");
-        }.bind(this));
-
-        function hideOutput() {
-            dom.removeCssClass(this.output, "cptFocusPopup");
-            dom.removeCssClass(this.hinter, "cptFocusPopup");
-        };
-        event.addListener(input, "blur", hideOutput.bind(this));
-        hideOutput.call(this);
-    },
-
-    /**
-     * We need to see the output of the latest command entered
-     */
-    scrollOutputToBottom: function() {
-        // Certain browsers have a bug such that scrollHeight is too small
-        // when content does not fill the client area of the element
-        var scrollHeight = Math.max(this.output.scrollHeight, this.output.clientHeight);
-        this.output.scrollTop = scrollHeight - this.output.clientHeight;
-    },
-
-    /**
-     * To be called on window resize or any time we want to align the elements
-     * with the input box.
-     */
-    resizer: function() {
-        var rect = this.element.getClientRects()[0];
-
-        this.completer.style.top = rect.top + 'px';
-        var height = rect.bottom - rect.top;
-        this.completer.style.height = height + 'px';
-        this.completer.style.lineHeight = height + 'px';
-        this.completer.style.left = rect.left + 'px';
-        var width = rect.right - rect.left;
-        this.completer.style.width = width + 'px';
-
-        if (this.hintDirection.get() === 'below') {
-            this.hinter.style.top = rect.bottom + 'px';
-            this.hinter.style.bottom = 'auto';
-        }
-        else {
-            this.hinter.style.top = 'auto';
-            this.hinter.style.bottom = (this.doc.documentElement.clientHeight - rect.top) + 'px';
-        }
-        this.hinter.style.left = (rect.left + 30) + 'px';
-        this.hinter.style.maxWidth = (width - 110) + 'px';
-
-        if (this.popupOutput) {
-            if (this.outputDirection.get() === 'below') {
-                this.output.style.top = rect.bottom + 'px';
-                this.output.style.bottom = 'auto';
-            }
-            else {
-                this.output.style.top = 'auto';
-                this.output.style.bottom = (this.doc.documentElement.clientHeight - rect.top) + 'px';
-            }
-            this.output.style.left = rect.left + 'px';
-            this.output.style.width = (width - 80) + 'px';
-        }
-    },
-
-    /**
-     * Ensure that TAB isn't handled by the browser
-     */
-onCommandKey: function(ev, hashId, keyCode) {
-        var stopEvent;
-        if (keyCode === keys.TAB ||
-                keyCode === keys.UP ||
-                keyCode === keys.DOWN) {
-            stopEvent = true;
-        } else if (hashId != 0 || keyCode != 0) {
-            stopEvent = canon.execKeyCommand(this.env, 'cli', hashId, keyCode);
-        }
-        stopEvent && event.stopEvent(ev);
-    },
-
-    /**
-     * The main keyboard processing loop
-     */
-    onKeyUp: function(ev) {
-        var handled;
-        /*
-        var handled = keyboardManager.processKeyEvent(ev, this, {
-            isCommandLine: true, isKeyUp: true
-        });
-        */
-
-        // RETURN does a special exec/highlight thing
-        if (ev.keyCode === keys.RETURN) {
-            var worst = this.cli.getWorstHint();
-            // Deny RETURN unless the command might work
-            if (worst.status === Status.VALID) {
-                this.cli.exec();
-                this.element.value = '';
-            }
-            else {
-                // If we've denied RETURN because the command was not VALID,
-                // select the part of the command line that is causing problems
-                // TODO: if there are 2 errors are we picking the right one?
-                dom.setSelectionStart(this.element, worst.start);
-                dom.setSelectionEnd(this.element, worst.end);
-            }
-        }
-
-        this.update();
-
-        // Special actions which delegate to the assignment
-        var current = this.cli.getAssignmentAt(dom.getSelectionStart(this.element));
-        if (current) {
-            // TAB does a special complete thing
-            if (ev.keyCode === keys.TAB) {
-                current.complete();
-                this.update();
-            }
-
-            // UP/DOWN look for some history
-            if (ev.keyCode === keys.UP) {
-                current.increment();
-                this.update();
-            }
-            if (ev.keyCode === keys.DOWN) {
-                current.decrement();
-                this.update();
-            }
-        }
-
-        return handled;
-    },
-
-    /**
-     * Actually parse the input and make sure we're all up to date
-     */
-    update: function() {
-        this.isUpdating = true;
-        var input = {
-            typed: this.element.value,
-            cursor: {
-                start: dom.getSelectionStart(this.element),
-                end: dom.getSelectionEnd(this.element.selectionEnd)
-            }
-        };
-        this.cli.update(input);
-
-        var display = this.cli.getAssignmentAt(input.cursor.start).getHint();
-
-        // 1. Update the completer with prompt/error marker/TAB info
-        dom.removeCssClass(this.completer, Status.VALID.toString());
-        dom.removeCssClass(this.completer, Status.INCOMPLETE.toString());
-        dom.removeCssClass(this.completer, Status.INVALID.toString());
-
-        var completion = '<span class="cptPrompt">&gt;</span> ';
-        if (this.element.value.length > 0) {
-            var scores = this.cli.getInputStatusMarkup();
-            completion += this.markupStatusScore(scores);
-        }
-
-        // Display the "-> prediction" at the end of the completer
-        if (this.element.value.length > 0 &&
-                display.predictions && display.predictions.length > 0) {
-            var tab = display.predictions[0];
-            completion += ' &nbsp;&#x21E5; ' + (tab.name ? tab.name : tab);
-        }
-        this.completer.innerHTML = completion;
-        dom.addCssClass(this.completer, this.cli.getWorstHint().status.toString());
-
-        // 2. Update the hint element
-        var hint = '';
-        if (this.element.value.length !== 0) {
-            hint += display.message;
-            if (display.predictions && display.predictions.length > 0) {
-                hint += ': [ ';
-                display.predictions.forEach(function(prediction) {
-                    hint += (prediction.name ? prediction.name : prediction);
-                    hint += ' | ';
-                }, this);
-                hint = hint.replace(/\| $/, ']');
-            }
-        }
-
-        this.hinter.innerHTML = hint;
-        if (hint.length === 0) {
-            dom.addCssClass(this.hinter, 'cptNoPopup');
-        }
-        else {
-            dom.removeCssClass(this.hinter, 'cptNoPopup');
-        }
-
-        this.isUpdating = false;
-    },
-
-    /**
-     * Markup an array of Status values with spans
-     */
-    markupStatusScore: function(scores) {
-        var completion = '';
-        // Create mark-up
-        var i = 0;
-        var lastStatus = -1;
-        while (true) {
-            if (lastStatus !== scores[i]) {
-                completion += '<span class=' + scores[i].toString() + '>';
-                lastStatus = scores[i];
-            }
-            completion += this.element.value[i];
-            i++;
-            if (i === this.element.value.length) {
-                completion += '</span>';
-                break;
-            }
-            if (lastStatus !== scores[i]) {
-                completion += '</span>';
-            }
-        }
-
-        return completion;
-    },
-
-    /**
-     * Update the input element to reflect the changed argument
-     */
-    onArgChange: function(ev) {
-        if (this.isUpdating) {
-            return;
-        }
-
-        var prefix = this.element.value.substring(0, ev.argument.start);
-        var suffix = this.element.value.substring(ev.argument.end);
-        var insert = typeof ev.text === 'string' ? ev.text : ev.text.name;
-        this.element.value = prefix + insert + suffix;
-        // Fix the cursor.
-        var insertEnd = (prefix + insert).length;
-        this.element.selectionStart = insertEnd;
-        this.element.selectionEnd = insertEnd;
-    }
-};
-exports.CliView = CliView;
-
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Walker (jwalker@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('cockpit/ui/request_view', ['require', 'exports', 'module' , 'pilot/dom', 'pilot/event', 'text!cockpit/ui/request_view.html', 'pilot/domtemplate', 'text!cockpit/ui/request_view.css'], function(require, exports, module) {
-
-var dom = require("pilot/dom");
-var event = require("pilot/event");
-var requestViewHtml = require("text!cockpit/ui/request_view.html");
-var Templater = require("pilot/domtemplate").Templater;
-
-var requestViewCss = require("text!cockpit/ui/request_view.css");
-dom.importCssString(requestViewCss);
-
-/**
- * Pull the HTML into the DOM, but don't add it to the document
- */
-var templates = document.createElement('div');
-templates.innerHTML = requestViewHtml;
-var row = templates.querySelector('.cptRow');
-
-/**
- * Work out the path for images.
- * TODO: This should probably live in some utility area somewhere
- */
-function imageUrl(path) {
-    var dataUrl;
-    try {
-        dataUrl = require('text!cockpit/ui/' + path);
-    } catch (e) { }
-    if (dataUrl) {
-        return dataUrl;
-    }
-
-    var filename = module.id.split('/').pop() + '.js';
-    var imagePath;
-
-    if (module.uri.substr(-filename.length) !== filename) {
-        console.error('Can\'t work out path from module.uri/module.id');
-        return path;
-    }
-
-    if (module.uri) {
-        var end = module.uri.length - filename.length - 1;
-        return module.uri.substr(0, end) + "/" + path;
-    }
-
-    return filename + path;
-}
-
-
-/**
- * Adds a row to the CLI output display
- */
-function RequestView(request, cliView) {
-    this.request = request;
-    this.cliView = cliView;
-    this.imageUrl = imageUrl;
-
-    // Elements attached to this by the templater. For info only
-    this.rowin = null;
-    this.rowout = null;
-    this.output = null;
-    this.hide = null;
-    this.show = null;
-    this.duration = null;
-    this.throb = null;
-
-    new Templater().processNode(row.cloneNode(true), this);
-
-    this.cliView.output.appendChild(this.rowin);
-    this.cliView.output.appendChild(this.rowout);
-
-    this.request.addEventListener('output', this.onRequestChange.bind(this));
-};
-
-RequestView.prototype = {
-    /**
-     * A single click on an invocation line in the console copies the command to
-     * the command line
-     */
-    copyToInput: function() {
-        this.cliView.element.value = this.request.typed;
-    },
-
-    /**
-     * A double click on an invocation line in the console executes the command
-     */
-    executeRequest: function(ev) {
-        this.cliView.cli.update({
-            typed: this.request.typed,
-            cursor: { start:0, end:0 }
-        });
-        this.cliView.cli.exec();
-    },
-
-    hideOutput: function(ev) {
-        this.output.style.display = 'none';
-        dom.addCssClass(this.hide, 'cmd_hidden');
-        dom.removeCssClass(this.show, 'cmd_hidden');
-
-        event.stopPropagation(ev);
-    },
-
-    showOutput: function(ev) {
-        this.output.style.display = 'block';
-        dom.removeCssClass(this.hide, 'cmd_hidden');
-        dom.addCssClass(this.show, 'cmd_hidden');
-
-        event.stopPropagation(ev);
-    },
-
-    remove: function(ev) {
-        this.cliView.output.removeChild(this.rowin);
-        this.cliView.output.removeChild(this.rowout);
-        event.stopPropagation(ev);
-    },
-
-    onRequestChange: function(ev) {
-        this.duration.innerHTML = this.request.duration ?
-            'completed in ' + (this.request.duration / 1000) + ' sec ' :
-            '';
-
-        this.output.innerHTML = '';
-        this.request.outputs.forEach(function(output) {
-            var node;
-            if (typeof output == 'string') {
-                node = document.createElement('p');
-                node.innerHTML = output;
-            } else {
-                node = output;
-            }
-            this.output.appendChild(node);
-        }, this);
-        this.cliView.scrollOutputToBottom();
-
-        dom.setCssClass(this.output, 'cmd_error', this.request.error);
-
-        this.throb.style.display = this.request.completed ? 'none' : 'block';
-    }
-};
-exports.RequestView = RequestView;
-
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is DomTemplate.
- *
- * The Initial Developer of the Original Code is Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Walker (jwalker@mozilla.com) (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('pilot/domtemplate', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-
-// WARNING: do not 'use_strict' without reading the notes in envEval;
-
-/**
- * A templater that allows one to quickly template DOM nodes.
- */
-function Templater() {
-  this.scope = [];
-};
-
-/**
- * Recursive function to walk the tree processing the attributes as it goes.
- * @param node the node to process. If you pass a string in instead of a DOM
- * element, it is assumed to be an id for use with document.getElementById()
- * @param data the data to use for node processing.
- */
-Templater.prototype.processNode = function(node, data) {
-  if (typeof node === 'string') {
-    node = document.getElementById(node);
-  }
-  if (data === null || data === undefined) {
-    data = {};
-  }
-  this.scope.push(node.nodeName + (node.id ? '#' + node.id : ''));
-  try {
-    // Process attributes
-    if (node.attributes && node.attributes.length) {
-      // We need to handle 'foreach' and 'if' first because they might stop
-      // some types of processing from happening, and foreach must come first
-      // because it defines new data on which 'if' might depend.
-      if (node.hasAttribute('foreach')) {
-        this.processForEach(node, data);
-        return;
-      }
-      if (node.hasAttribute('if')) {
-        if (!this.processIf(node, data)) {
-          return;
-        }
-      }
-      // Only make the node available once we know it's not going away
-      data.__element = node;
-      // It's good to clean up the attributes when we've processed them,
-      // but if we do it straight away, we mess up the array index
-      var attrs = Array.prototype.slice.call(node.attributes);
-      for (var i = 0; i < attrs.length; i++) {
-        var value = attrs[i].value;
-        var name = attrs[i].name;
-        this.scope.push(name);
-        try {
-          if (name === 'save') {
-            // Save attributes are a setter using the node
-            value = this.stripBraces(value);
-            this.property(value, data, node);
-            node.removeAttribute('save');
-          } else if (name.substring(0, 2) === 'on') {
-            // Event registration relies on property doing a bind
-            value = this.stripBraces(value);
-            var func = this.property(value, data);
-            if (typeof func !== 'function') {
-              this.handleError('Expected ' + value +
-                ' to resolve to a function, but got ' + typeof func);
-            }
-            node.removeAttribute(name);
-            var capture = node.hasAttribute('capture' + name.substring(2));
-            node.addEventListener(name.substring(2), func, capture);
-            if (capture) {
-              node.removeAttribute('capture' + name.substring(2));
-            }
-          } else {
-            // Replace references in all other attributes
-            var self = this;
-            var newValue = value.replace(/\$\{[^}]*\}/g, function(path) {
-              return self.envEval(path.slice(2, -1), data, value);
-            });
-            // Remove '_' prefix of attribute names so the DOM won't try
-            // to use them before we've processed the template
-            if (name.charAt(0) === '_') {
-              node.removeAttribute(name);
-              node.setAttribute(name.substring(1), newValue);
-            } else if (value !== newValue) {
-              attrs[i].value = newValue;
-            }
-          }
-        } finally {
-          this.scope.pop();
-        }
-      }
-    }
-
-    // Loop through our children calling processNode. First clone them, so the
-    // set of nodes that we visit will be unaffected by additions or removals.
-    var childNodes = Array.prototype.slice.call(node.childNodes);
-    for (var j = 0; j < childNodes.length; j++) {
-      this.processNode(childNodes[j], data);
-    }
-
-    if (node.nodeType === Node.TEXT_NODE) {
-      this.processTextNode(node, data);
-    }
-  } finally {
-    this.scope.pop();
-  }
-};
-
-/**
- * Handle <x if="${...}">
- * @param node An element with an 'if' attribute
- * @param data The data to use with envEval
- * @returns true if processing should continue, false otherwise
- */
-Templater.prototype.processIf = function(node, data) {
-  this.scope.push('if');
-  try {
-    var originalValue = node.getAttribute('if');
-    var value = this.stripBraces(originalValue);
-    var recurse = true;
-    try {
-      var reply = this.envEval(value, data, originalValue);
-      recurse = !!reply;
-    } catch (ex) {
-      this.handleError('Error with \'' + value + '\'', ex);
-      recurse = false;
-    }
-    if (!recurse) {
-      node.parentNode.removeChild(node);
-    }
-    node.removeAttribute('if');
-    return recurse;
-  } finally {
-    this.scope.pop();
-  }
-};
-
-/**
- * Handle <x foreach="param in ${array}"> and the special case of
- * <loop foreach="param in ${array}">
- * @param node An element with a 'foreach' attribute
- * @param data The data to use with envEval
- */
-Templater.prototype.processForEach = function(node, data) {
-  this.scope.push('foreach');
-  try {
-    var originalValue = node.getAttribute('foreach');
-    var value = originalValue;
-
-    var paramName = 'param';
-    if (value.charAt(0) === '$') {
-      // No custom loop variable name. Use the default: 'param'
-      value = this.stripBraces(value);
-    } else {
-      // Extract the loop variable name from 'NAME in ${ARRAY}'
-      var nameArr = value.split(' in ');
-      paramName = nameArr[0].trim();
-      value = this.stripBraces(nameArr[1].trim());
-    }
-    node.removeAttribute('foreach');
-    try {
-      var self = this;
-      // Process a single iteration of a loop
-      var processSingle = function(member, clone, ref) {
-        ref.parentNode.insertBefore(clone, ref);
-        data[paramName] = member;
-        self.processNode(clone, data);
-        delete data[paramName];
-      };
-
-      // processSingle is no good for <loop> nodes where we want to work on
-      // the childNodes rather than the node itself
-      var processAll = function(scope, member) {
-        self.scope.push(scope);
-        try {
-          if (node.nodeName === 'LOOP') {
-            for (var i = 0; i < node.childNodes.length; i++) {
-              var clone = node.childNodes[i].cloneNode(true);
-              processSingle(member, clone, node);
-            }
-          } else {
-            var clone = node.cloneNode(true);
-            clone.removeAttribute('foreach');
-            processSingle(member, clone, node);
-          }
-        } finally {
-          self.scope.pop();
-        }
-      };
-
-      var reply = this.envEval(value, data, originalValue);
-      if (Array.isArray(reply)) {
-        reply.forEach(function(data, i) {
-          processAll('' + i, data);
-        }, this);
-      } else {
-        for (var param in reply) {
-          if (reply.hasOwnProperty(param)) {
-            processAll(param, param);
-          }
-        }
-      }
-      node.parentNode.removeChild(node);
-    } catch (ex) {
-      this.handleError('Error with \'' + value + '\'', ex);
-    }
-  } finally {
-    this.scope.pop();
-  }
-};
-
-/**
- * Take a text node and replace it with another text node with the ${...}
- * sections parsed out. We replace the node by altering node.parentNode but
- * we could probably use a DOM Text API to achieve the same thing.
- * @param node The Text node to work on
- * @param data The data to use in calls to envEval
- */
-Templater.prototype.processTextNode = function(node, data) {
-  // Replace references in other attributes
-  var value = node.data;
-  // We can't use the string.replace() with function trick (see generic
-  // attribute processing in processNode()) because we need to support
-  // functions that return DOM nodes, so we can't have the conversion to a
-  // string.
-  // Instead we process the string as an array of parts. In order to split
-  // the string up, we first replace '${' with '\uF001$' and '}' with '\uF002'
-  // We can then split using \uF001 or \uF002 to get an array of strings
-  // where scripts are prefixed with $.
-  // \uF001 and \uF002 are just unicode chars reserved for private use.
-  value = value.replace(/\$\{([^}]*)\}/g, '\uF001$$$1\uF002');
-  var parts = value.split(/\uF001|\uF002/);
-  if (parts.length > 1) {
-    parts.forEach(function(part) {
-      if (part === null || part === undefined || part === '') {
-        return;
-      }
-      if (part.charAt(0) === '$') {
-        part = this.envEval(part.slice(1), data, node.data);
-      }
-      // It looks like this was done a few lines above but see envEval
-      if (part === null) {
-        part = "null";
-      }
-      if (part === undefined) {
-        part = "undefined";
-      }
-      // if (isDOMElement(part)) { ... }
-      if (typeof part.cloneNode !== 'function') {
-        part = node.ownerDocument.createTextNode(part.toString());
-      }
-      node.parentNode.insertBefore(part, node);
-    }, this);
-    node.parentNode.removeChild(node);
-  }
-};
-
-/**
- * Warn of string does not begin '${' and end '}'
- * @param str the string to check.
- * @return The string stripped of ${ and }, or untouched if it does not match
- */
-Templater.prototype.stripBraces = function(str) {
-  if (!str.match(/\$\{.*\}/g)) {
-    this.handleError('Expected ' + str + ' to match ${...}');
-    return str;
-  }
-  return str.slice(2, -1);
-};
-
-/**
- * Combined getter and setter that works with a path through some data set.
- * For example:
- * <ul>
- * <li>property('a.b', { a: { b: 99 }}); // returns 99
- * <li>property('a', { a: { b: 99 }}); // returns { b: 99 }
- * <li>property('a', { a: { b: 99 }}, 42); // returns 99 and alters the
- * input data to be { a: { b: 42 }}
- * </ul>
- * @param path An array of strings indicating the path through the data, or
- * a string to be cut into an array using <tt>split('.')</tt>
- * @param data An object to look in for the <tt>path</tt> argument
- * @param newValue (optional) If defined, this value will replace the
- * original value for the data at the path specified.
- * @return The value pointed to by <tt>path</tt> before any
- * <tt>newValue</tt> is applied.
- */
-Templater.prototype.property = function(path, data, newValue) {
-  this.scope.push(path);
-  try {
-    if (typeof path === 'string') {
-      path = path.split('.');
-    }
-    var value = data[path[0]];
-    if (path.length === 1) {
-      if (newValue !== undefined) {
-        data[path[0]] = newValue;
-      }
-      if (typeof value === 'function') {
-        return function() {
-          return value.apply(data, arguments);
-        };
-      }
-      return value;
-    }
-    if (!value) {
-      this.handleError('Can\'t find path=' + path);
-      return null;
-    }
-    return this.property(path.slice(1), value, newValue);
-  } finally {
-    this.scope.pop();
-  }
-};
-
-/**
- * Like eval, but that creates a context of the variables in <tt>env</tt> in
- * which the script is evaluated.
- * WARNING: This script uses 'with' which is generally regarded to be evil.
- * The alternative is to create a Function at runtime that takes X parameters
- * according to the X keys in the env object, and then call that function using
- * the values in the env object. This is likely to be slow, but workable.
- * @param script The string to be evaluated.
- * @param env The environment in which to eval the script.
- * @param context Optional debugging string in case of failure
- * @return The return value of the script, or the error message if the script
- * execution failed.
- */
-Templater.prototype.envEval = function(script, env, context) {
-  with (env) {
-    try {
-      this.scope.push(context);
-      return eval(script);
-    } catch (ex) {
-      this.handleError('Template error evaluating \'' + script + '\'', ex);
-      return script;
-    } finally {
-      this.scope.pop();
-    }
-  }
-};
-
-/**
- * A generic way of reporting errors, for easy overloading in different
- * environments.
- * @param message the error message to report.
- * @param ex optional associated exception.
- */
-Templater.prototype.handleError = function(message, ex) {
-  this.logError(message);
-  this.logError('In: ' + this.scope.join(' > '));
-  if (ex) {
-    this.logError(ex);
-  }
-};
-
-
-/**
- * A generic way of reporting errors, for easy overloading in different
- * environments.
- * @param message the error message to report.
- */
-Templater.prototype.logError = function(message) {
-  window.console && window.console.log && console.log(message);
-};
-
-exports.Templater = Templater;
-
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Skywriter Team (skywriter@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('cockpit/commands/basic', ['require', 'exports', 'module' , 'pilot/canon'], function(require, exports, module) {
-
-
-var canon = require('pilot/canon');
-
-/**
- * '!' command
- */
-var bangCommandSpec = {
-    name: 'sh',
-    description: 'Execute a system command (requires server support)',
-    params: [
-        {
-            name: 'command',
-            type: 'text',
-            description: 'The string to send to the os shell.'
-        }
-    ],
-    exec: function(env, args, request) {
-        var req = new XMLHttpRequest();
-        req.open('GET', '/exec?args=' + args.command, true);
-        req.onreadystatechange = function(ev) {
-          if (req.readyState == 4) {
-            if (req.status == 200) {
-              request.done('<pre>' + req.responseText + '</pre>');
-            }
-          }
-        };
-        req.send(null);
-    }
-};
-
-var canon = require('pilot/canon');
-
-exports.startup = function(data, reason) {
-    canon.addCommand(bangCommandSpec);
-};
-
-exports.shutdown = function(data, reason) {
-    canon.removeCommand(bangCommandSpec);
-};
-
-
-});
-define("text!cockpit/ui/cli_view.css", [], "" +
-  "#cockpitInput { padding-left: 16px; }" +
-  "" +
-  ".cptOutput { overflow: auto; position: absolute; z-index: 999; display: none; }" +
-  "" +
-  ".cptCompletion { padding: 0; position: absolute; z-index: -1000; }" +
-  ".cptCompletion.VALID { background: #FFF; }" +
-  ".cptCompletion.INCOMPLETE { background: #DDD; }" +
-  ".cptCompletion.INVALID { background: #DDD; }" +
-  ".cptCompletion span { color: #FFF; }" +
-  ".cptCompletion span.INCOMPLETE { color: #DDD; border-bottom: 2px dotted #F80; }" +
-  ".cptCompletion span.INVALID { color: #DDD; border-bottom: 2px dotted #F00; }" +
-  "span.cptPrompt { color: #66F; font-weight: bold; }" +
-  "" +
-  "" +
-  ".cptHints {" +
-  "  color: #000;" +
-  "  position: absolute;" +
-  "  border: 1px solid rgba(230, 230, 230, 0.8);" +
-  "  background: rgba(250, 250, 250, 0.8);" +
-  "  -moz-border-radius-topleft: 10px;" +
-  "  -moz-border-radius-topright: 10px;" +
-  "  border-top-left-radius: 10px; border-top-right-radius: 10px;" +
-  "  z-index: 1000;" +
-  "  padding: 8px;" +
-  "  display: none;" +
-  "}" +
-  "" +
-  ".cptFocusPopup { display: block; }" +
-  ".cptFocusPopup.cptNoPopup { display: none; }" +
-  "" +
-  ".cptHints ul { margin: 0; padding: 0 15px; }" +
-  "" +
-  ".cptGt { font-weight: bold; font-size: 120%; }" +
-  "");
-
-define("text!cockpit/ui/request_view.css", [], "" +
-  ".cptRowIn {" +
-  "  display: box; display: -moz-box; display: -webkit-box;" +
-  "  box-orient: horizontal; -moz-box-orient: horizontal; -webkit-box-orient: horizontal;" +
-  "  box-align: center; -moz-box-align: center; -webkit-box-align: center;" +
-  "  color: #333;" +
-  "  background-color: #EEE;" +
-  "  width: 100%;" +
-  "  font-family: consolas, courier, monospace;" +
-  "}" +
-  ".cptRowIn > * { padding-left: 2px; padding-right: 2px; }" +
-  ".cptRowIn > img { cursor: pointer; }" +
-  ".cptHover { display: none; }" +
-  ".cptRowIn:hover > .cptHover { display: block; }" +
-  ".cptRowIn:hover > .cptHover.cptHidden { display: none; }" +
-  ".cptOutTyped {" +
-  "  box-flex: 1; -moz-box-flex: 1; -webkit-box-flex: 1;" +
-  "  font-weight: bold; color: #000; font-size: 120%;" +
-  "}" +
-  ".cptRowOutput { padding-left: 10px; line-height: 1.2em; }" +
-  ".cptRowOutput strong," +
-  ".cptRowOutput b," +
-  ".cptRowOutput th," +
-  ".cptRowOutput h1," +
-  ".cptRowOutput h2," +
-  ".cptRowOutput h3 { color: #000; }" +
-  ".cptRowOutput a { font-weight: bold; color: #666; text-decoration: none; }" +
-  ".cptRowOutput a: hover { text-decoration: underline; cursor: pointer; }" +
-  ".cptRowOutput input[type=password]," +
-  ".cptRowOutput input[type=text]," +
-  ".cptRowOutput textarea {" +
-  "  color: #000; font-size: 120%;" +
-  "  background: transparent; padding: 3px;" +
-  "  border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px;" +
-  "}" +
-  ".cptRowOutput table," +
-  ".cptRowOutput td," +
-  ".cptRowOutput th { border: 0; padding: 0 2px; }" +
-  ".cptRowOutput .right { text-align: right; }" +
-  "");
-
-define("text!cockpit/ui/request_view.html", [], "" +
-  "<div class=cptRow>" +
-  "  <!-- The div for the input (i.e. what was typed) -->" +
-  "  <div class=\"cptRowIn\" save=\"${rowin}\"" +
-  "      onclick=\"${copyToInput}\"" +
-  "      ondblclick=\"${executeRequest}\">" +
-  "" +
-  "    <!-- What the user actually typed -->" +
-  "    <div class=\"cptGt\">&gt; </div>" +
-  "    <div class=\"cptOutTyped\">${request.typed}</div>" +
-  "" +
-  "    <!-- The extra details that appear on hover -->" +
-  "    <div class=cptHover save=\"${duration}\"></div>" +
-  "    <img class=cptHover onclick=\"${hideOutput}\" save=\"${hide}\"" +
-  "        alt=\"Hide command output\" _src=\"${imageUrl('images/minus.png')}\"/>" +
-  "    <img class=\"cptHover cptHidden\" onclick=\"${showOutput}\" save=\"${show}\"" +
-  "        alt=\"Show command output\" _src=\"${imageUrl('images/plus.png')}\"/>" +
-  "    <img class=cptHover onclick=\"${remove}\"" +
-  "        alt=\"Remove this command from the history\"" +
-  "        _src=\"${imageUrl('images/closer.png')}\"/>" +
-  "" +
-  "  </div>" +
-  "" +
-  "  <!-- The div for the command output -->" +
-  "  <div class=\"cptRowOut\" save=\"${rowout}\">" +
-  "    <div class=\"cptRowOutput\" save=\"${output}\"></div>" +
-  "    <img _src=\"${imageUrl('images/throbber.gif')}\" save=\"${throb}\"/>" +
-  "  </div>" +
-  "</div>" +
-  "");
-
-define("text!cockpit/ui/images/closer.png", [], "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAj9JREFUeNp0ks+LUlEUx7/vV1o8Z8wUx3IEHcQmiBiQlomjRNCiZpEuEqF/oEUwq/6EhvoHggmRcJUQBM1CRJAW0aLIaGQimZJxJsWxyV/P9/R1zzWlFl04vPvOPZ9z7rnnK5imidmKRCIq+zxgdoPZ1T/ut8xeM3tcKpW6s1hhBkaj0Qj7bDebTX+324WmadxvsVigqipcLleN/d4rFoulORiLxTZY8ItOp8MBCpYkiYPj8Xjus9vtlORWoVB4KcTjcQc732dLpSRXvCZaAws6Q4WDdqsO52kNH+oCRFGEz+f7ydwBKRgMPmTXi49GI1x2D/DsznesB06ws2eDbI7w9HYN6bVjvGss4KAjwDAMq81mM2SW5Wa/3weBbz42UL9uYnVpiO2Nr9ANHSGXib2Wgm9tCYIggGKJEVkvlwgi5/FQRmTLxO6hgJVzI1x0T/fJrBtHJxPeL6tI/fsZLA6ot8lkQi8HRVbw94gkWYI5MaHrOjcCGSNRxZosy9y5cErDzn0Dqx7gcwO8WtBp4PndI35GMYqiUMUvBL5yOBz8yRfFNpbPmqgcCFh/IuHa1nR/YXGM8+oUpFhihEQiwcdRLpfVRqOBtWXWq34Gra6AXq8Hp2piZcmKT4cKnE4nwuHwdByVSmWQz+d32WCTlHG/qaHHREN9kgi0sYQfv0R4PB4EAgESQDKXy72fSy6VSnHJVatVf71eR7vd5n66mtfrRSgU4pLLZrOlf7RKK51Ok8g3/yPyR5lMZi7y3wIMAME4EigHWgKnAAAAAElFTkSuQmCC");
-
-define("text!cockpit/ui/images/dot_clear.gif", [], "data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAEBMgA7");
-
-define("text!cockpit/ui/images/minus.png", [], "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAAZiS0dEANIA0gDS7KbF4AAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9kFGw4xMrIJw5EAAAHcSURBVCjPhZIxSxtxGMZ/976XhJA/RA5EAyJcFksnp64hjUPBoXRyCYLQTyD0UxScu0nFwalCQSgFCVk7dXAwUAiBDA2RO4W7yN1x9+9gcyhU+pteHt4H3pfncay1LOl0OgY4BN4Ar/7KP4BvwNFwOIyWu87S2O12O8DxfD73oygiSRIAarUaxhhWV1fHwMFgMBiWxl6v9y6Koi+3t7ckSUKtVkNVAcjzvNRWVlYwxry9vLz86uzs7HjAZDKZGGstjUaDfxHHMSLC5ubmHdB2VfVwNpuZ5clxHPMcRVFwc3PTXFtbO3RFZHexWJCmabnweAaoVqvlv4vFAhHZdVX1ZZqmOI5DURR8fz/lxbp9Yrz+7bD72SfPcwBU1XdF5N5aWy2KgqIoeBzPEnWVLMseYnAcRERdVR27rrsdxzGqyutP6898+GBsNBqo6i9XVS88z9sOggAR4X94noeqXoiIHPm+H9XrdYIgIAxDwjAkTVPCMESzBy3LMprNJr7v34nIkV5dXd2fn59fG2P2siwjSRIqlQrWWlSVJFcqlQqtVot2u40xZu/s7OxnWbl+v98BjkejkT+dTgmCoDxtY2ODra2tMXBweno6fNJVgP39fQN8eKbkH09OTsqS/wHFRdHPfTSfjwAAAABJRU5ErkJggg==");
-
-define("text!cockpit/ui/images/pinaction.png", [], "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC7mlDQ1BJQ0MgUHJvZmlsZQAAeAGFVM9rE0EU/jZuqdAiCFprDrJ4kCJJWatoRdQ2/RFiawzbH7ZFkGQzSdZuNuvuJrWliOTi0SreRe2hB/+AHnrwZC9KhVpFKN6rKGKhFy3xzW5MtqXqwM5+8943731vdt8ADXLSNPWABOQNx1KiEWlsfEJq/IgAjqIJQTQlVdvsTiQGQYNz+Xvn2HoPgVtWw3v7d7J3rZrStpoHhP1A4Eea2Sqw7xdxClkSAog836Epx3QI3+PY8uyPOU55eMG1Dys9xFkifEA1Lc5/TbhTzSXTQINIOJT1cVI+nNeLlNcdB2luZsbIEL1PkKa7zO6rYqGcTvYOkL2d9H5Os94+wiHCCxmtP0a4jZ71jNU/4mHhpObEhj0cGDX0+GAVtxqp+DXCFF8QTSeiVHHZLg3xmK79VvJKgnCQOMpkYYBzWkhP10xu+LqHBX0m1xOv4ndWUeF5jxNn3tTd70XaAq8wDh0MGgyaDUhQEEUEYZiwUECGPBoxNLJyPyOrBhuTezJ1JGq7dGJEsUF7Ntw9t1Gk3Tz+KCJxlEO1CJL8Qf4qr8lP5Xn5y1yw2Fb3lK2bmrry4DvF5Zm5Gh7X08jjc01efJXUdpNXR5aseXq8muwaP+xXlzHmgjWPxHOw+/EtX5XMlymMFMXjVfPqS4R1WjE3359sfzs94i7PLrXWc62JizdWm5dn/WpI++6qvJPmVflPXvXx/GfNxGPiKTEmdornIYmXxS7xkthLqwviYG3HCJ2VhinSbZH6JNVgYJq89S9dP1t4vUZ/DPVRlBnM0lSJ93/CKmQ0nbkOb/qP28f8F+T3iuefKAIvbODImbptU3HvEKFlpW5zrgIXv9F98LZua6N+OPwEWDyrFq1SNZ8gvAEcdod6HugpmNOWls05Uocsn5O66cpiUsxQ20NSUtcl12VLFrOZVWLpdtiZ0x1uHKE5QvfEp0plk/qv8RGw/bBS+fmsUtl+ThrWgZf6b8C8/UXAeIuJAAAACXBIWXMAAAsTAAALEwEAmpwYAAAClklEQVQ4EX1TXUhUQRQ+Z3Zmd+9uN1q2P3UpZaEwcikKekkqLKggKHJ96MHe9DmLkCDa9U198Id8kErICmIlRAN96UdE6QdBW/tBA5Uic7E0zN297L17p5mb1zYjD3eYc+d83zlnON8g5xzWNUSEdUBkHTJasRWySPP7fw3hfwkk2GoNsc0vOaJRHo1GV/GiMctkTIJRFlpZli8opK+htmf83gXeG63oteOtra0u25e7TYJIJELb26vYCACTgUe1lXV86BTn745l+MsyHqs53S/Aq4VEUa9Y6ko14eYY4u3AyM3HYwdKU35DZyblGR2+qq6W0X2Nnh07xynnVYpHORx/E1/GvvqaAZUayjMjdM2f/Lgr5E+fV93zR4u3zKCLughsZqKwAzAxaz6dPY6JgjLUF+eSP5OpjmAw2E8DvldHSvJMKPg08aRor1tc4BuALu6mOwGWdQC3mKIqRsC8mKd8wYfD78/earzSYzdMDW9QgKb0Is8CBY1mQXOiaXAHEpMDE5XTJqIq4EiyxUqKlpfkF0pyV1OTAoFAhmTmyCCoDsZNZvIkUjELQpipo0sQqYZAswZHwsEEE10M0pq2SSZY9HqNcDicJcNTpBvQJz40UbSOTh1B8bDpuY0w9Hb3kkn9lPAlBLfhfD39XTtX/blFJqiqrjbkTi63Hbofj2uL4GMsmzFgbDJ/vmMgv/lB4syJ0oXO7d3j++vio6GFsYmD6cHJreWc3/jRVVHhsOYvM8iZ36mtjPDBk/xDZE8CoHlbrlAssbTxDdDJvdb536L7I6S7Vy++6Gi4Xi9BsUthJRaLOYSPz4XALKI4j4iObd/e5UtDKUjZzYyYRyGAJv01Zj8kC5cbs5WY83hQnv0DzCXl+r8APElkq0RU6oMAAAAASUVORK5CYII=");
-
-define("text!cockpit/ui/images/pinin.png", [], "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC7mlDQ1BJQ0MgUHJvZmlsZQAAeAGFVM9rE0EU/jZuqdAiCFprDrJ4kCJJWatoRdQ2/RFiawzbH7ZFkGQzSdZuNuvuJrWliOTi0SreRe2hB/+AHnrwZC9KhVpFKN6rKGKhFy3xzW5MtqXqwM5+8943731vdt8ADXLSNPWABOQNx1KiEWlsfEJq/IgAjqIJQTQlVdvsTiQGQYNz+Xvn2HoPgVtWw3v7d7J3rZrStpoHhP1A4Eea2Sqw7xdxClkSAog836Epx3QI3+PY8uyPOU55eMG1Dys9xFkifEA1Lc5/TbhTzSXTQINIOJT1cVI+nNeLlNcdB2luZsbIEL1PkKa7zO6rYqGcTvYOkL2d9H5Os94+wiHCCxmtP0a4jZ71jNU/4mHhpObEhj0cGDX0+GAVtxqp+DXCFF8QTSeiVHHZLg3xmK79VvJKgnCQOMpkYYBzWkhP10xu+LqHBX0m1xOv4ndWUeF5jxNn3tTd70XaAq8wDh0MGgyaDUhQEEUEYZiwUECGPBoxNLJyPyOrBhuTezJ1JGq7dGJEsUF7Ntw9t1Gk3Tz+KCJxlEO1CJL8Qf4qr8lP5Xn5y1yw2Fb3lK2bmrry4DvF5Zm5Gh7X08jjc01efJXUdpNXR5aseXq8muwaP+xXlzHmgjWPxHOw+/EtX5XMlymMFMXjVfPqS4R1WjE3359sfzs94i7PLrXWc62JizdWm5dn/WpI++6qvJPmVflPXvXx/GfNxGPiKTEmdornIYmXxS7xkthLqwviYG3HCJ2VhinSbZH6JNVgYJq89S9dP1t4vUZ/DPVRlBnM0lSJ93/CKmQ0nbkOb/qP28f8F+T3iuefKAIvbODImbptU3HvEKFlpW5zrgIXv9F98LZua6N+OPwEWDyrFq1SNZ8gvAEcdod6HugpmNOWls05Uocsn5O66cpiUsxQ20NSUtcl12VLFrOZVWLpdtiZ0x1uHKE5QvfEp0plk/qv8RGw/bBS+fmsUtl+ThrWgZf6b8C8/UXAeIuJAAAACXBIWXMAAAsTAAALEwEAmpwYAAABZ0lEQVQ4Ea2TPUsDQRCGZ89Eo4FACkULEQs1CH4Uamfjn7GxEYJFIFXgChFsbPwzNnZioREkaiHBQtEiEEiMRm/dZ8OEGAxR4sBxx877Pju7M2estTJIxLrNuVwuMxQEx0ZkzcFHyRtjXt02559RtB2GYanTYzoryOfz+6l4Nbszf2niwffKmpGRo9sVW22mDgqFwp5C2gDMm+P32a3JB1N+n5JifUGeP9JeNxGryPLYjcwMP8rJ07Q9fZltQzyAstOJ2vVu5sKc1ZZkRBrOcKeb+HexPidvkpCN5JUcllZtpZFc5DgBWc5M2eysZuMuofMBSA4NWjx4PUCsXefMlI0QY3ewRg4NWi4ZTQsgrjYXema+e4VqtEMK6KXvu+4B9Bklt90vVKMeD2BI6DOt4rZ/Gk7WyKFBi4fNPIAJY0joM61SCCZ9tI1o0OIB8D+DBIkYaJRbCBH9mZgNt+bb++ufSSF/eX8BYcDeAzuQJVUAAAAASUVORK5CYII=");
-
-define("text!cockpit/ui/images/pinout.png", [], "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC7mlDQ1BJQ0MgUHJvZmlsZQAAeAGFVM9rE0EU/jZuqdAiCFprDrJ4kCJJWatoRdQ2/RFiawzbH7ZFkGQzSdZuNuvuJrWliOTi0SreRe2hB/+AHnrwZC9KhVpFKN6rKGKhFy3xzW5MtqXqwM5+8943731vdt8ADXLSNPWABOQNx1KiEWlsfEJq/IgAjqIJQTQlVdvsTiQGQYNz+Xvn2HoPgVtWw3v7d7J3rZrStpoHhP1A4Eea2Sqw7xdxClkSAog836Epx3QI3+PY8uyPOU55eMG1Dys9xFkifEA1Lc5/TbhTzSXTQINIOJT1cVI+nNeLlNcdB2luZsbIEL1PkKa7zO6rYqGcTvYOkL2d9H5Os94+wiHCCxmtP0a4jZ71jNU/4mHhpObEhj0cGDX0+GAVtxqp+DXCFF8QTSeiVHHZLg3xmK79VvJKgnCQOMpkYYBzWkhP10xu+LqHBX0m1xOv4ndWUeF5jxNn3tTd70XaAq8wDh0MGgyaDUhQEEUEYZiwUECGPBoxNLJyPyOrBhuTezJ1JGq7dGJEsUF7Ntw9t1Gk3Tz+KCJxlEO1CJL8Qf4qr8lP5Xn5y1yw2Fb3lK2bmrry4DvF5Zm5Gh7X08jjc01efJXUdpNXR5aseXq8muwaP+xXlzHmgjWPxHOw+/EtX5XMlymMFMXjVfPqS4R1WjE3359sfzs94i7PLrXWc62JizdWm5dn/WpI++6qvJPmVflPXvXx/GfNxGPiKTEmdornIYmXxS7xkthLqwviYG3HCJ2VhinSbZH6JNVgYJq89S9dP1t4vUZ/DPVRlBnM0lSJ93/CKmQ0nbkOb/qP28f8F+T3iuefKAIvbODImbptU3HvEKFlpW5zrgIXv9F98LZua6N+OPwEWDyrFq1SNZ8gvAEcdod6HugpmNOWls05Uocsn5O66cpiUsxQ20NSUtcl12VLFrOZVWLpdtiZ0x1uHKE5QvfEp0plk/qv8RGw/bBS+fmsUtl+ThrWgZf6b8C8/UXAeIuJAAAACXBIWXMAAAsTAAALEwEAmpwYAAACyUlEQVQ4EW1TXUgUURQ+Z3ZmnVV3QV2xJbVSEIowQbAfLQx8McLoYX2qjB58MRSkP3vZppceYhGxgrZaIughlYpE7CHFWiiKyj9II0qxWmwlNh1Xtp2f27mz7GDlZX7uuXO+73zfuXeQMQYIgAyALppgyBtse32stsw86txkHhATn+FbfPfzxnPB+vR3RMJYuTwW6bbB4a6WS5O3Yu2VlXIesDiAamiQNKVlVXfx5I0GJ7DY7p0/+erU4dgeMJIA31WNxZmAgibOreXDqF55sY4SFUURqbi+nkjgwTyAbHhLX8yOLsSM2QRA3JRAAgd4RGPbVhkKEp8qeJ7PFyW3fw++YHtC7CkaD0amqyqihSwlMQQ0wa07IjPVI/vbexreIUrVaQV2D4RMQ/o7m12Mdfx4H3PfB9FNzTR1U2cO0Bi45aV6xNvFBNaoIAfbSiwLlqi9/hR/R3Nrhua+Oqi9TEKiB02C7YXz+Pba4MTDrpbLiMAxNgmXb+HpwVkZdoIrkn9isW7nRw/TZYaagZArAWyhfqsSDL/c9aTx7JUjGZCtYExRqCzAwGblwr6aFQ84nTo6qZ7XCeCVQNckE/KSWolvoQnxeoFFgIh8G/nA+kBAxxuQO5m9eFrwLIGJHgcyM63VFMhRSgNVyJr7og8y1vbTQpH8DIEVgxuYuexw0QECIalq5FYgEmpkgoFYltU/lnrqDz5osirSFpF7lrHAFKSWHYfEs+mY/82UnAStyMlW8sUPsVIciTZgz3jV1ebg0CEOpgPF22s1z1YQYKSXPJ1hbAhR8T26WdLhkuVfAzPR+YO1Ox5n58SmCcF6e3uzAoHA77RkevJdWH/3+f2O9TGf3w3fWQ2Hw5F/13mcsWAT+vv6DK4kFApJ/d3d1k+kJtbCrmxXHS3n8ER6b3CQbAqaEHVra6sGxcXW4SovLx+empxapS//FfwD9kpMJjMMBBAAAAAASUVORK5CYII=");
-
-define("text!cockpit/ui/images/pins.png", [], "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAQCAYAAABQrvyxAAAACXBIWXMAAAsTAAALEwEAmpwYAAAGYklEQVRIDbVWe0yURxCf/R735o6DO0FBe0RFsaL4iLXGIKa2SY3P6JGa2GpjlJjUV9NosbU++tYUbEnaQIrVaKJBG7WiNFQFUWO1UUEsVg2CAgoeHHLewcH32O58cBdQsX9Y5+7LfrszOzO/2ZnZj1BKgTBiIwVGVvKd49OVVYunDlXn6wdBKh+ogXrv+DOz1melIb+3LM5fNv2XPYE5EHY+L3PJljN5zavHpJjsQNsA/JJEgyC2+WTjy3b0GfoJW8O4aoHtDwiHQrj5lw1LLyyb1bp5zAjJTus9klrVpdD6TqH2ngVO+0dsRJnp06cLIYU4fx7NnRI3bu7UIYOeJ/McnuY88q3k62gc0S4Dgf5qhICQtIXS2lqD7BhSduPk3YfyzXaANhBBJDxYdUqCywB2qS4RdyUuSkTF/VJxcbH5j8N7/75RuFrN3Zh8OS8zqf5m4UpPeenOyP42dbtBeuvVnCdkK1e4PfPouX03mo9se+c33M8wqDk5Ofqed8REUTicQhbySUxp9u3KlMSHTtrFU6Kyn03lz15PPpW25vsZeYSIKyiVURcqeZJOH9lTNZLfnxRjU/uwrjbEUBWsapcSO2Hq4k0VfZg9EzxdDNCEjDxgNqRDme9umz/btwlsHRIEePHgAf73RdnHZ6LTuIUBN7OBQ+c1Fdnp6cZ1BQUdeRuWZi97o3ktDQQkVeFFzqJARd1A5a0Vr7ta6Kp6TZjtZ+NTIOoKF6qDrL7e0QQIUCiqMMKk8Z1Q/SCSKvzocf2B6NEN0SQn/kTO6fKJ0zqjZUlQBSpJ0GjR77w0aoc1Pr6S5/kVJrNpakV5hR+LWKN4t7sLX+p0rx2vqSta64olIulUKUgCSXLWE1R4KPPSj+5vhm2hdDOG+CkQBmhhyyKq6SaFYWTn5bB3QJRNz54AuXKn8TJjhu0Wbv+wNEKQjVhnmKopjo4FxXmetCRnC4F7BhCiCUepqAepRh0TM/gjjzOOSK2NgWZPc05qampRWJHb7dbOffep2ednzLzgczlbrQA6gHYF9BYDh9GY+FjddMweHMscmMuep07gXlMQoqw9ALoYu5MJsak9QmJA2IvAgVmoCRciooyPujJtNCv1uHt3TmK9gegFKrG9kh6oXwZiIEAtBIjORGKNTWR/WeW8XVkbjuJepLAyloM8LmTN//njKZPbraATZaLjCHEww9Ei4FFiPg6Ja5gT6gxYgLgnRDHRQwJXbz2GOw0d4A3K4GXlUtMahJjYVxiYbrwOmxIS10bFnIBOSi6Tl9Jgs0zbOEX18wyEwgLPMrxD1Y4aCK8kmTpgYcpAF27Mzs42Hjx4kA8BICUlJfKArR7LcEvTB1xEC9AoEw9OPagWkVU/D1oesmK6U911zEczMVe01oZjiMggg6ux2Qk379qh4rYKet4GjrhhwEteBgBrH8BssoXEtbHzPpSBRRSpqlNpgAiUoxzHKxLRszoVuggIisxaDQWZqkQvQjAoax3NbDbLLGuUEABNGedXqSyLRupXgDT5JfAGZNLio9B0X8Uiwk4w77MDc1D4yejjWtykPS3DX01UDCY/GPQcVDe0QYT0CIxGFvUorfvBxZsRfVrUuWruMBAb/lXCUofoFNZfzGJtowXOX0vwUSFK4BgyMKm6P6s9wQUZld+jrYyMDC0iIQDaJdG4IyZQfL3RfbFcCBIlRgc+u3CjaTApuZ9KsANgG8PNzHlWWD3tCxd6kafNNiFp5HAalAkkJ0SCV2H3CgOD9Nc/FqrXuyb0Eocvfhq171p5eyuJ1omKJEP5rQGe/FOOnXtq335z8YmvYo9cHb2t8spIb3lVSseZW46FlGY/Sk9P50P2w20UlWJUkUHIushfc5PXGAzCo0PlD2pnpCYfCXga3lu+fPlevEhWrVrFyrN/Orfv87FOW9tlqb2Kc9pV8DzioMk3UNUbXM+8B/ATBr8C8CKdvGXWGD/9sqm3dkxtzA4McMjHMB8D2ftheYXo+qzt3pXvz8/PP/vk+v8537V+yYW87Zu+RZ1ZbrexoKAA/SBpaWn4+aL5w5zGk+/jW59JiMkESW5urpiVlWXENRb1H/Yf2I9txIxz5IdkX3TsraukpsbQjz6090yb4XsAvQoRE0YvJdamtIIbOnRoUVlZ2ftsLVQzIdEXHntsaZdimssVfCpFui109+BnWPsXaWLI/zactygAAAAASUVORK5CYII=");
-
-define("text!cockpit/ui/images/plus.png", [], "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAAZiS0dEANIA0gDS7KbF4AAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9kFGw4yFTwuJTkAAAH7SURBVCjPdZKxa1NRFMZ/956XZMgFyyMlCZRA4hBx6lBcQ00GoYi4tEstFPwLAs7iLDi7FWuHThaUggihBDI5OWRoQAmBQFISQgvvpbwX3rsOaR4K+o2H8zvfOZxPWWtZqVarGaAJPAEe3ZW/A1+Bd+1221v1qhW4vb1dA44mk0nZ8zyCIAAgk8lgjGF9fb0PHF5cXLQTsF6vP/c879P19TVBEJDJZBARAKIoSmpra2sYY561Wq3PqtFouMBgMBgYay3ZbJZ/yfd9tNaUSqUboOKISPPq6sqsVvZ9H4AvL34B8PTj/QSO45jpdHovn883Ha31znw+JwzDpCEMQx4UloM8zyOdTif3zudztNY7jog8DMMQpRRxHPPt5TCBAEZvxlyOFTsfykRRBICIlB2t9a21Nh3HMXEc8+d7VhJHWCwWyzcohdZaHBHpO46z6fs+IsLj94XECaD4unCHL8FsNouI/HRE5Nx13c3ZbIbWOnG5HKtl+53TSq7rIiLnand31wUGnU7HjEYjlFLJZN/3yRnL1FMYY8jlcmxtbd0AFel2u7dnZ2eXxpi9xWJBEASkUimstYgIQSSkUimKxSKVSgVjzN7p6emPJHL7+/s14KjX65WHwyGz2SxZbWNjg2q12gcOT05O2n9lFeDg4MAAr/4T8rfHx8dJyH8DvvbYGzKvWukAAAAASUVORK5CYII=");
-
-define("text!cockpit/ui/images/throbber.gif", [], "data:image/gif;base64,R0lGODlh3AATAPQAAP///wAAAL6+vqamppycnLi4uLKyssjIyNjY2MTExNTU1Nzc3ODg4OTk5LCwsLy8vOjo6Ozs7MrKyvLy8vT09M7Ozvb29sbGxtDQ0O7u7tbW1sLCwqqqqvj4+KCgoJaWliH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCgAAACwAAAAA3AATAAAF/yAgjmRpnmiqrmzrvnAsz3Rt33iu73zv/8CgcEgECAaEpHLJbDqf0Kh0Sq1ar9isdjoQtAQFg8PwKIMHnLF63N2438f0mv1I2O8buXjvaOPtaHx7fn96goR4hmuId4qDdX95c4+RG4GCBoyAjpmQhZN0YGYFXitdZBIVGAoKoq4CG6Qaswi1CBtkcG6ytrYJubq8vbfAcMK9v7q7D8O1ycrHvsW6zcTKsczNz8HZw9vG3cjTsMIYqQgDLAQGCQoLDA0QCwUHqfYSFw/xEPz88/X38Onr14+Bp4ADCco7eC8hQYMAEe57yNCew4IVBU7EGNDiRn8Z831cGLHhSIgdE/9chIeBgDoB7gjaWUWTlYAFE3LqzDCTlc9WOHfm7PkTqNCh54rePDqB6M+lR536hCpUqs2gVZM+xbrTqtGoWqdy1emValeXKwgcWABB5y1acFNZmEvXwoJ2cGfJrTv3bl69Ffj2xZt3L1+/fw3XRVw4sGDGcR0fJhxZsF3KtBTThZxZ8mLMgC3fRatCLYMIFCzwLEprg84OsDus/tvqdezZf13Hvr2B9Szdu2X3pg18N+68xXn7rh1c+PLksI/Dhe6cuO3ow3NfV92bdArTqC2Ebc3A8vjf5QWf15Bg7Nz17c2fj69+fnq+8N2Lty+fuP78/eV2X13neIcCeBRwxorbZrAxAJoCDHbgoG8RTshahQ9iSKEEzUmYIYfNWViUhheCGJyIP5E4oom7WWjgCeBBAJNv1DVV01MZdJhhjdkplWNzO/5oXI846njjVEIqR2OS2B1pE5PVscajkxhMycqLJgxQCwT40PjfAV4GqNSXYdZXJn5gSkmmmmJu1aZYb14V51do+pTOCmA00AqVB4hG5IJ9PvYnhIFOxmdqhpaI6GeHCtpooisuutmg+Eg62KOMKuqoTaXgicQWoIYq6qiklmoqFV0UoeqqrLbq6quwxirrrLTWauutJ4QAACH5BAkKAAAALAAAAADcABMAAAX/ICCOZGmeaKqubOu+cCzPdG3feK7vfO//wKBwSAQIBoSkcslsOp/QqHRKrVqv2Kx2OhC0BAXHx/EoCzboAcdhcLDdgwJ6nua03YZ8PMFPoBMca215eg98G36IgYNvDgOGh4lqjHd7fXOTjYV9nItvhJaIfYF4jXuIf4CCbHmOBZySdoOtj5eja59wBmYFXitdHhwSFRgKxhobBgUPAmdoyxoI0tPJaM5+u9PaCQZzZ9gP2tPcdM7L4tLVznPn6OQb18nh6NV0fu3i5OvP8/nd1qjwaasHcIPAcf/gBSyAAMMwBANYEAhWYQGDBhAyLihwYJiEjx8fYMxIcsGDAxVA/yYIOZIkBAaGPIK8INJlRpgrPeasaRPmx5QgJfB0abLjz50tSeIM+pFmUo0nQQIV+vRlTJUSnNq0KlXCSq09ozIFexEBAYkeNiwgOaEtn2LFpGEQsKCtXbcSjOmVlqDuhAx3+eg1Jo3u37sZBA9GoMAw4MB5FyMwfLht4sh7G/utPGHlYAV8Nz9OnOBz4c2VFWem/Pivar0aKCP2LFn2XwhnVxBwsPbuBAQbEGiIFg1BggoWkidva5z4cL7IlStfkED48OIYoiufYIH68+cKPkqfnsB58ePjmZd3Dj199/XE20tv6/27XO3S6z9nPCz9BP3FISDefL/Bt192/uWmAv8BFzAQAQUWWFaaBgqA11hbHWTIXWIVXifNhRlq6FqF1sm1QQYhdiAhbNEYc2KKK1pXnAIvhrjhBh0KxxiINlqQAY4UXjdcjSJyeAx2G2BYJJD7NZQkjCPKuCORKnbAIXsuKhlhBxEomAIBBzgIYXIfHfmhAAyMR2ZkHk62gJoWlNlhi33ZJZ2cQiKTJoG05Wjcm3xith9dcOK5X51tLRenoHTuud2iMnaolp3KGXrdBo7eKYF5p/mXgJcogClmcgzAR5gCKymXYqlCgmacdhp2UCqL96mq4nuDBTmgBasaCFp4sHaQHHUsGvNRiiGyep1exyIra2mS7dprrtA5++z/Z8ZKYGuGsy6GqgTIDvupRGE+6CO0x3xI5Y2mOTkBjD4ySeGU79o44mcaSEClhglgsKyJ9S5ZTGY0Bnzrj+3SiKK9Rh5zjAALCywZBk/ayCWO3hYM5Y8Dn6qxxRFsgAGoJwwgDQRtYXAAragyQOmaLKNZKGaEuUlpyiub+ad/KtPqpntypvvnzR30DBtjMhNodK6Eqrl0zU0/GjTUgG43wdN6Ra2pAhGtAAZGE5Ta8TH6wknd2IytNKaiZ+Or79oR/tcvthIcAPe7DGAs9Edwk6r3qWoTaNzY2fb9HuHh2S343Hs1VIHhYtOt+Hh551rh24vP5YvXSGzh+eeghy76GuikU9FFEainrvrqrLfu+uuwxy777LTXfkIIACH5BAkKAAAALAAAAADcABMAAAX/ICCOZGmeaKqubOu+cCzPdG3feK7vfO//wKBwSAQIBoSkcslsOp/QqHRKrVqv2Kx2OhC0BAWHB2l4CDZo9IDjcBja7UEhTV+3DXi3PJFA8xMcbHiDBgMPG31pgHBvg4Z9iYiBjYx7kWocb26OD398mI2EhoiegJlud4UFiZ5sm6Kdn2mBr5t7pJ9rlG0cHg5gXitdaxwFGArIGgoaGwYCZ3QFDwjU1AoIzdCQzdPV1c0bZ9vS3tUJBmjQaGXl1OB0feze1+faiBvk8wjnimn55e/o4OtWjp+4NPIKogsXjaA3g/fiGZBQAcEAFgQGOChgYEEDCCBBLihwQILJkxIe/3wMKfJBSQkJYJpUyRIkgwcVUJq8QLPmTYoyY6ZcyfJmTp08iYZc8MBkhZgxk9aEcPOlzp5FmwI9KdWn1qASurJkClRoWKwhq6IUqpJBAwQEMBYroAHkhLt3+RyzhgCDgAV48Wbgg+waAnoLMgTOm6DwQ8CLBzdGdvjw38V5JTg2lzhyTMeUEwBWHPgzZc4TSOM1bZia6LuqJxCmnOxv7NSsl1mGHHiw5tOuIWeAEHcFATwJME/ApgFBc3MVLEgPvE+Ddb4JokufPmFBAuvPXWu3MIF89wTOmxvOvp179evQtwf2nr6aApPyzVd3jn089e/8xdfeXe/xdZ9/d1ngHf98lbHH3V0LMrgPgsWpcFwBEFBgHmyNXWeYAgLc1UF5sG2wTHjIhNjBiIKZCN81GGyQwYq9uajeMiBOQGOLJ1KjTI40kmfBYNfc2NcGIpI4pI0vyrhjiT1WFqOOLEIZnjVOVpmajYfBiCSNLGbA5YdOkjdihSkQwIEEEWg4nQUmvYhYe+bFKaFodN5lp3rKvJYfnBKAJ+gGDMi3mmbwWYfng7IheuWihu5p32XcSWdSj+stkF95dp64jJ+RBipocHkCCp6PCiRQ6INookCAAwy0yd2CtNET3Yo7RvihBjFZAOaKDHT43DL4BQnsZMo8xx6uI1oQrHXXhHZrB28G62n/YSYxi+uzP2IrgbbHbiaer7hCiOxDFWhrbmGnLVuus5NFexhFuHLX6gkEECorlLpZo0CWJG4pLjIACykmBsp0eSSVeC15TDJeUhlkowlL+SWLNJpW2WEF87urXzNWSZ6JOEb7b8g1brZMjCg3ezBtWKKc4MvyEtwybPeaMAA1ECRoAQYHYLpbeYYCLfQ+mtL5c9CnfQpYpUtHOSejEgT9ogZ/GSqd0f2m+LR5WzOtHqlQX1pYwpC+WbXKqSYtpJ5Mt4a01lGzS3akF60AxkcTaLgAyRBPWCoDgHfJqwRuBuzdw/1ml3iCwTIeLUWJN0v4McMe7uasCTxseNWPSxc5RbvIgD7geZLbGrqCG3jepUmbbze63Y6fvjiOylbwOITPfIHEFsAHL/zwxBdvPBVdFKH88sw37/zz0Ecv/fTUV2/99SeEAAAh+QQJCgAAACwAAAAA3AATAAAF/yAgjmRpnmiqrmzrvnAsz3Rt33iu73zv/8CgcEgECAaEpHLJbDqf0Kh0Sq1ar9isdjoQtAQFh2cw8BQEm3T6yHEYHHD4oKCuD9qGvNsxT6QTgAkcHHmFeX11fm17hXwPG35qgnhxbwMPkXaLhgZ9gWp3bpyegX4DcG+inY+Qn6eclpiZkHh6epetgLSUcBxlD2csXXdvBQrHGgoaGhsGaIkFDwjTCArTzX+QadHU3c1ofpHc3dcGG89/4+TYktvS1NYI7OHu3fEJ5tpqBu/k+HX7+nXDB06SuoHm0KXhR65cQT8P3FRAMIAFgVMPwDCAwLHjggIHJIgceeFBg44eC/+ITCCBZYKSJ1FCWPBgpE2YMmc+qNCypwScMmnaXAkUJYOaFVyKLOqx5tCXJnMelcBzJNSYKIX2ZPkzqsyjPLku9Zr1QciVErYxaICAgEUOBRJIgzChbt0MLOPFwyBggV27eCUcmxZvg9+/dfPGo5bg8N/Ag61ZM4w4seDF1fpWhizZmoa+GSortgcaMWd/fkP/HY0MgWbTipVV++wY8GhvqSG4XUEgoYTKE+Qh0OCvggULiBckWEZ4Ggbjx5HXVc58IPQJ0idQJ66XanTpFraTe348+XLizRNcz658eHMN3rNPT+C+G/nodqk3t6a+fN3j+u0Xn3nVTQPfdRPspkL/b+dEIN8EeMm2GAYbTNABdrbJ1hyFFv5lQYTodSZABhc+loCEyhxTYYkZopdMMiNeiBxyIFajV4wYHpfBBspUl8yKHu6ooV5APsZjQxyyeNeJ3N1IYod38cgdPBUid6GCKfRWgAYU4IccSyHew8B3doGJHmMLkGkZcynKk2Z50Ym0zJzLbDCmfBbI6eIyCdyJmJmoqZmnBAXy9+Z/yOlZDZpwYihnj7IZpuYEevrYJ5mJEuqiof4l+NYDEXQpXQcMnNjZNDx1oGqJ4S2nF3EsqWrhqqVWl6JIslpAK5MaIqDeqjJq56qN1aTaQaPbHTPYr8Be6Gsyyh6Da7OkmmqP/7GyztdrNVQBm5+pgw3X7aoYKhfZosb6hyUKBHCgQKij1rghkOAJuZg1SeYIIY+nIpDvf/sqm4yNG5CY64f87qdAwSXKGqFkhPH1ZHb2EgYtw3bpKGVkPz5pJAav+gukjB1UHE/HLNJobWcSX8jiuicMMBFd2OmKwQFs2tjXpDfnPE1j30V3c7iRHlrzBD2HONzODyZtsQJMI4r0AUNaE3XNHQw95c9GC001MpIxDacFQ+ulTNTZlU3O1eWVHa6vb/pnQUUrgHHSBKIuwG+bCPyEqbAg25gMVV1iOB/IGh5YOKLKIQ6xBAcUHmzjIcIqgajZ+Ro42DcvXl7j0U4WOUd+2IGu7DWjI1pt4DYq8BPm0entuGSQY/4tBi9Ss0HqfwngBQtHbCH88MQXb/zxyFfRRRHMN+/889BHL/301Fdv/fXYZ39CCAAh+QQJCgAAACwAAAAA3AATAAAF/yAgjmRpnmiqrmzrvnAsz3Rt33iu73zv/8CgcEgECAaEpHLJbDqf0Kh0Sq1ar9isdjoQtAQFh2fAKXsKm7R6Q+Y43vABep0mGwwOPH7w2CT+gHZ3d3lyagl+CQNvg4yGh36LcHoGfHR/ZYOElQ9/a4ocmoRygIiRk5p8pYmZjXePaYBujHoOqp5qZHBlHAUFXitddg8PBg8KGsgayxvGkAkFDwgICtPTzX2mftHW3QnOpojG3dbYkNjk1waxsdDS1N7ga9zw1t/aifTk35fu6Qj3numL14fOuHTNECHqU4DDgQEsCCwidiHBAwYQMmpcUOCAhI8gJVzUuLGThAQnP/9abEAyI4MCIVOKZNnyJUqUJxNcGNlywYOQgHZirGkSJ8gHNEky+AkS58qWEJYC/bMzacmbQHkqNdlUJ1KoSz2i9COhmQYCEXtVrCBgwYS3cCf8qTcNQ9u4cFFOq2bPLV65Cf7dxZthbjW+CgbjnWtNgWPFcAsHdoxgWWK/iyV045sAc2S96SDn1exYw17REwpLQEYt2eW/qtPZRQAB7QoC61RW+GsBwYZ/CXb/XRCYLsAKFizEtUAc+G7lcZsjroscOvTmsoUvx15PwccJ0N8yL17N9PG/E7jv9S4hOV7pdIPDdZ+ePDzv2qMXn2b5+wTbKuAWnF3oZbABZY0lVmD/ApQd9thybxno2GGuCVDggaUpoyBsB1bGGgIYbJCBcuFJiOAyGohIInQSmmdeiBnMF2GHfNUlIoc1rncjYRjW6NgGf3VQGILWwNjBfxEZcAFbC7gHXQcfUYOYdwzQNxo5yUhQZXhvRYlMeVSuSOJHKJa5AQMQThBlZWZ6Bp4Fa1qzTAJbijcBlJrtxeaZ4lnnpZwpukWieGQmYx5ATXIplwTL8DdNZ07CtWYybNIJF4Ap4NZHe0920AEDk035kafieQrqXofK5ympn5JHKYjPrfoWcR8WWQGp4Ul32KPVgXdnqxM6OKqspjIYrGPDrlrsZtRIcOuR86nHFwbPvmes/6PH4frrqbvySh+mKGhaAARPzjjdhCramdoGGOhp44i+zogBkSDuWC5KlE4r4pHJkarXrj++Raq5iLmWLlxHBteavjG+6amJrUkJJI4Ro5sBv9AaOK+jAau77sbH7nspCwNIYIACffL7J4JtWQnen421nNzMcB6AqpRa9klonmBSiR4GNi+cJZpvwgX0ejj71W9yR+eIgaVvQgf0l/A8nWjUFhwtZYWC4hVnkZ3p/PJqNQ5NnwUQrQCGBBBMQIGTtL7abK+5JjAv1fi9bS0GLlJHgdjEgYzzARTwC1fgEWdJuKKBZzj331Y23qB3i9v5aY/rSUC4w7PaLeWXmr9NszMFoN79eeiM232o33EJAIzaSGwh++y012777bhT0UURvPfu++/ABy/88MQXb/zxyCd/QggAIfkECQoAAAAsAAAAANwAEwAABf8gII5kaZ5oqq5s675wLM90bd94ru987//AoHBIBAgGhKRyyWw6n9CodEqtWq/YrHY6ELQEBY5nwCk7xIWNer0hO95wziC9Ttg5b4ND/+Y87IBqZAaEe29zGwmJigmDfHoGiImTjXiQhJEPdYyWhXwDmpuVmHwOoHZqjI6kZ3+MqhyemJKAdo6Ge3OKbEd4ZRwFBV4rc4MPrgYPChrMzAgbyZSJBcoI1tfQoYsJydfe2amT3d7W0OGp1OTl0YtqyQrq0Lt11PDk3KGoG+nxBpvTD9QhwCctm0BzbOyMIwdOUwEDEgawIOCB2oMLgB4wgMCx44IHBySIHClBY0ePfyT/JCB5weRJCAwejFw58kGDlzBTqqTZcuPLmCIBiWx58+VHmiRLFj0JVCVLl0xl7qSZwCbOo0lFWv0pdefQrVFDJtr5gMBEYBgxqBWwYILbtxPsqMPAFu7blfa81bUbN4HAvXAzyLWnoDBguHIRFF6m4LBbwQngMYPXuC3fldbyPrMcGLM3w5wRS1iWWUNlvnElKDZtz/EEwaqvYahQoexEfyILi4RrYYKFZwJ3810QWZ2ECrx9Ew+O3K6F5Yq9zXbb+y30a7olJJ+wnLC16W97Py+uwdtx1NcLWzs/3G9e07stVPc9kHJ0BcLtQp+c3ewKAgYkUAFpCaAmmHqKLSYA/18WHEiZPRhsQF1nlLFWmIR8ZbDBYs0YZuCGpGXWmG92aWiPMwhEOOEEHXRwIALlwXjhio+BeE15IzpnInaLbZBBhhti9x2GbnVQo2Y9ZuCfCgBeMCB+DJDIolt4iVhOaNSJdCOBUfIlkmkyMpPAAvKJ59aXzTQzJo0WoJnmQF36Jp6W1qC4gWW9GZladCiyJd+KnsHImgRRVjfnaDEKuiZvbcYWo5htzefbl5LFWNeSKQAo1QXasdhiiwwUl2B21H3aQaghXnPcp1NagCqYslXAqnV+zYWcpNwVp9l5eepJnHqL4SdBi56CGlmw2Zn6aaiZjZqfb8Y2m+Cz1O0n3f+tnvrGbF6kToApCgAWoNWPeh754JA0vmajiAr4iOuOW7abQXVGNriBWoRdOK8FxNqLwX3oluubhv8yluRbegqGb536ykesuoXhyJqPQJIGbLvQhkcwjKs1zBvBwSZIsbcsDCCBAAf4ya+UEhyQoIiEJtfoZ7oxUOafE2BwgMWMqUydfC1LVtiArk0QtGkWEopzlqM9aJrKHfw5c6wKjFkmXDrbhwFockodtMGFLWpXy9JdiXN1ZDNszV4WSLQCGBKoQYHUyonqrHa4ErewAgMmcAAF7f2baIoVzC2p3gUvJtLcvIWqloy6/R04mIpLwDhciI8qLOB5yud44pHPLbA83hFDWPjNbuk9KnySN57Av+TMBvgEAgzzNhJb5K777rz37vvvVHRRxPDEF2/88cgnr/zyzDfv/PPQnxACACH5BAkKAAAALAAAAADcABMAAAX/ICCOZGmeaKqubOu+cCzPdG3feK7vfO//wKBwSAQIBoSkcslsOp/QqHRKrVqv2Kx2OhC0BIUCwcMpO84OT2HDbm8GHLQjnn6wE3g83SA3DB55G3llfHxnfnZ4gglvew6Gf4ySgmYGlpCJknochWiId3kJcZZyDn93i6KPl4eniopwq6SIoZKxhpenbhtHZRxhXisDopwPgHkGDxrLGgjLG8mC0gkFDwjX2AgJ0bXJ2djbgNJsAtbfCNB2oOnn6MmKbeXt226K1fMGi6j359D69ua+QZskjd+3cOvY9XNgp4ABCQNYEDBl7EIeCQkeMIDAseOCBwckiBSZ4ILGjh4B/40kaXIjSggMHmBcifHky5gYE6zM2OAlzGM6Z5rs+fIjTZ0tfcYMSlLCUJ8fL47kCVXmTjwPiKJkUCDnyqc3CxzQmYeAxAEGLGJYiwCDgAUT4sqdgOebArdw507IUNfuW71xdZ7DC5iuhGsKErf9CxhPYgUaEhPWyzfBMgUIJDPW6zhb5M1y+R5GjFkBaLmCM0dOfHqvztXYJnMejaFCBQlmVxAYsEGkYnQV4lqYMNyCtnYSggNekAC58uJxmTufW5w55mwKkg+nLp105uTC53a/nhg88fMTmDfDVl65Xum/IZt/3/zaag3a5W63nll1dvfiWbaaZLmpQIABCVQA2f9lAhTG112PQWYadXE9+FtmEwKWwQYQJrZagxomsOCAGVImInsSbpCBhhwug6KKcXXQQYUcYuDMggrASFmNzjjzzIrh7cUhhhHqONeGpSEW2QYxHsmjhxpgUGAKB16g4IIbMNCkXMlhaJ8GWVJo2I3NyKclYF1GxgyYDEAnXHJrMpNAm/rFBSczPiYAlwXF8ZnmesvoOdyMbx7m4o0S5LWdn4bex2Z4xYmEzaEb5EUcnxbA+WWglqIn6aHPTInCgVbdlZyMqMrIQHMRSiaBBakS1903p04w434n0loBoQFOt1yu2YAnY68RXiNsqh2s2qqxuyKb7Imtmgcrqsp6h8D/fMSpapldx55nwayK/SfqCQd2hcFdAgDp5GMvqhvakF4mZuS710WGIYy30khekRkMu92GNu6bo7r/ttjqwLaua5+HOdrKq5Cl3dcwi+xKiLBwwwom4b0E6xvuYyqOa8IAEghwQAV45VvovpkxBl2mo0W7AKbCZXoAhgMmWnOkEqx2JX5nUufbgJHpXCfMOGu2QAd8eitpW1eaNrNeMGN27mNz0swziYnpSbXN19gYtstzfXrdYjNHtAIYGFVwwAEvR1dfxdjKxVzAP0twAAW/ir2w3nzTd3W4yQWO3t0DfleB4XYnEHCEhffdKgaA29p0eo4fHLng9qoG+OVyXz0gMeWGY7qq3xhiRIEAwayNxBawxy777LTXbjsVXRSh++689+7778AHL/zwxBdv/PEnhAAAIfkECQoAAAAsAAAAANwAEwAABf8gII5kaZ5oqq5s675wLM90bd94ru987//AoHBIBAgGhKRyyWw6n9CodEqtWq/YrHY6ELQEhYLD4BlwHGg0ubBpuzdm9Dk9eCTu+MTZkDb4PXYbeIIcHHxqf4F3gnqGY2kOdQmCjHCGfpCSjHhmh2N+knmEkJmKg3uHfgaaeY2qn6t2i4t7sKAPbwIJD2VhXisDCQZgDrKDBQ8aGgjKyhvDlJMJyAjV1gjCunkP1NfVwpRtk93e2ZVt5NfCk27jD97f0LPP7/Dr4pTp1veLgvrx7AL+Q/BM25uBegoYkDCABYFhEobhkUBRwoMGEDJqXPDgQMUEFC9c1LjxQUUJICX/iMRIEgIDkycrjmzJMSXFlDNJvkwJsmdOjQwKfDz5M+PLoSGLQqgZU6XSoB/voHxawGbFlS2XGktAwKEADB0xiEWAodqGBRPSqp1wx5qCamDRrp2Qoa3bagLkzrULF4GCvHPTglRAmKxZvWsHayBcliDitHUlvGWM97FgCdYWVw4c2e/kw4HZJlCwmDBhwHPrjraGYTHqtaoxVKggoesKAgd2SX5rbUMFCxOAC8cGDwHFwBYWJCgu4XfwtcqZV0grPHj0u2SnqwU+IXph3rK5b1fOu7Bx5+K7L6/2/Xhg8uyXnQ8dvfRiDe7TwyfNuzlybKYpgIFtKhAgwEKkKcOf/wChZbBBgMucRh1so5XH3wbI1WXafRJy9iCErmX4IWHNaIAhZ6uxBxeGHXQA24P3yYfBBhmgSBozESpwongWOBhggn/N1aKG8a1YY2oVAklgCgQUUwGJ8iXAgItrWUARbwpqIOWEal0ZoYJbzmWlZCWSlsAC6VkwZonNbMAAl5cpg+NiZwpnJ0Xylegmlc+tWY1mjnGnZnB4QukMA9UJRxGOf5r4ppqDjjmnfKilh2ejGiyJAgF1XNmYbC2GmhZ5AcJVgajcXecNqM9Rx8B6bingnlotviqdkB3YCg+rtOaapFsUhSrsq6axJ6sEwoZK7I/HWpCsr57FBxJ1w8LqV/81zbkoXK3LfVeNpic0KRQG4NHoIW/XEmZuaiN6tti62/moWbk18uhjqerWS6GFpe2YVotskVssWfBOAHACrZHoWcGQwQhlvmsdXBZ/F9YLMF2jzUuYBP4a7CLCnoEHrgkDSCDAARUILAGaVVqAwQHR8pZXomm9/ONhgjrbgc2lyYxmpIRK9uSNjrXs8gEbTrYyl2ryTJmsLCdKkWzFQl1lWlOXGmifal6p9VnbQfpyY2SZyXKVV7JmZkMrgIFSyrIeUJ2r7YKnXdivUg1kAgdQ8B7IzJjGsd9zKSdwyBL03WpwDGxwuOASEP5vriO2F3nLjQdIrpaRDxqcBdgIHGA74pKrZXiR2ZWuZt49m+o3pKMC3p4Av7SNxBa456777rz37jsVXRQh/PDEF2/88cgnr/zyzDfv/PMnhAAAIfkECQoAAAAsAAAAANwAEwAABf8gII5kaZ5oqq5s675wLM90bd94ru987//AoHBIBAgGhKRyyWw6n9CodEqtWq/YrHY6ELQEhYLDUPAMHGi0weEpbN7wI8cxTzsGj4R+n+DUxwaBeBt7hH1/gYIPhox+Y3Z3iwmGk36BkIN8egOIl3h8hBuOkAaZhQlna4BrpnyWa4mleZOFjrGKcXoFA2ReKwMJBgISDw6abwUPGggazc0bBqG0G8kI1tcIwZp51djW2nC03d7BjG8J49jl4cgP3t/RetLp1+vT6O7v5fKhAvnk0UKFogeP3zmCCIoZkDCABQFhChQYuKBHgkUJkxpA2MhxQYEDFhNcvPBAI8eNCx7/gMQYckPJkxsZPLhIM8FLmDJrYiRp8mTKkCwT8IQJwSPQkENhpgQpEunNkzlpWkwKdSbGihKocowqVSvKWQkIOBSgQOYFDBgQpI0oYMGEt3AzTLKm4BqGtnDjirxW95vbvG/nWlub8G9euRsiqqWLF/AEkRoiprX2wLDeDQgkW9PQGLDgyNc665WguK8C0XAnRY6oGPUEuRLsgk5g+a3cCxUqSBC7gsCBBXcVq6swwULx4hayvctGPK8FCwsSLE9A3Hje6NOrHzeOnW695sffRi/9HfDz7sIVSNB+XXrmugo0rHcM3X388o6jr44ceb51uNjF1xcC8zk3wXiS8aYC/wESaLABBs7ch0ECjr2WAGvLsLZBeHqVFl9kGxooV0T81TVhBo6NiOEyJ4p4IYnNRBQiYCN6x4wCG3ZAY2If8jXjYRcyk2FmG/5nXAY8wqhWAii+1YGOSGLoY4VRfqiAgikwmIeS1gjAgHkWYLQZf9m49V9gDWYWY5nmTYCRM2TS5pxxb8IZGV5nhplmhJyZadxzbrpnZ2d/6rnZgHIid5xIMDaDgJfbLdrgMkKW+Rygz1kEZz1mehabkBpgiQIByVikwGTqVfDkk2/Vxxqiqur4X3fksHccre8xlxerDLiHjQIVUAgXr77yFeyuOvYqXGbMrbrqBMqaFpFFzhL7qv9i1FX7ZLR0LUNdcc4e6Cus263KbV+inkAAHhJg0BeITR6WmHcaxhvXg/AJiKO9R77ILF1FwmVdAu6WBu+ZFua72mkZWMfqBElKu0G8rFZ5n4ATp5jkmvsOq+Nj7u63ZMMPv4bveyYy6fDH+C6brgnACHBABQUrkGirz2FwAHnM4Mmhzq9yijOrOi/MKabH6VwBiYwZdukEQAvILKTWXVq0ZvH5/CfUM7M29Zetthp1eht0eqkFYw8IKXKA6mzXfTeH7fZg9zW0AhgY0TwthUa6Ch9dBeIsbsFrYkRBfgTfiG0FhwMWnbsoq3cABUYOnu/ejU/A6uNeT8u4wMb1WnBCyJJTLjjnr8o3OeJrUcpc5oCiPqAEkz8tXuLkPeDL3Uhs4fvvwAcv/PDEU9FFEcgnr/zyzDfv/PPQRy/99NRXf0IIACH5BAkKAAAALAAAAADcABMAAAX/ICCOZGmeaKqubOu+cCzPdG3feK7vfO//wKBwSAQIBoSkcslsOp/QqHRKrVqv2Kx2OhC0BIWCw/AoDziOtCHt8BQ28PjmzK57Hom8fo42+P8DeAkbeYQcfX9+gYOFg4d1bIGEjQmPbICClI9/YwaLjHAJdJeKmZOViGtpn3qOqZineoeJgG8CeWUbBV4rAwkGAhIVGL97hGACGsrKCAgbBoTRhLvN1c3PepnU1s2/oZO6AtzdBoPf4eMI3tIJyOnF0YwFD+nY8e3z7+Xfefnj9uz8cVsXCh89axgk7BrAggAwBQsYIChwQILFixIeNIDAseOCBwcSXMy2sSPHjxJE/6a0eEGjSY4MQGK86PIlypUJEmYsaTKmyJ8JW/Ls6HMkzaEn8YwMWtPkx4pGd76E4DMPRqFTY860OGhogwYagBFoKEABA46DEGBAoEBB0AUT4sqdIFKBNbcC4M6dkEEk22oYFOTdG9fvWrtsBxM23MytYL17666t9phwXwlum2lIDHmuSA2IGyuOLOHv38qLMbdFjHruZbWgRXeOe1nC2BUEDiyAMMHZuwoTLAQX3nvDOAUW5Vogru434d4JnAsnPmFB9NBshQXfa9104+Rxl8e13rZxN+CEydtVsFkd+vDjE7C/q52wOvb4s7+faz025frbxefWbSoQIAEDEUCwgf9j7bUlwHN9ZVaegxDK1xYzFMJH24L5saXABhlYxiEzHoKoIV8LYqAMaw9aZqFmJUK4YHuNfRjiXhmk+NcyJgaIolvM8BhiBx3IleN8lH1IWAcRgkZgCgYiaBGJojGgHHFTgtagAFYSZhF7/qnTpY+faVlNAnqJN0EHWa6ozAZjBtgmmBokwMB01LW5jAZwbqfmlNips4B4eOqJgDJ2+imXRZpthuigeC6XZTWIxilXmRo8iYKBCwiWmWkJVEAkfB0w8KI1IvlIpKnOkVpqdB5+h96o8d3lFnijrgprjbfGRSt0lH0nAZG5vsprWxYRW6Suq4UWqrLEsspWg8Io6yv/q6EhK0Fw0GLbjKYn5CZYBYht1laPrnEY67kyrhYbuyceiR28Pso7bYwiXjihjWsWuWF5p/H765HmNoiur3RJsGKNG/jq748XMrwmjhwCfO6QD9v7LQsDxPTAMKsFpthyJCdkmgYiw0VdXF/Om9dyv7YMWGXTLYpZg5wNR11C78oW3p8HSGgul4qyrJppgllJHJZHn0Y0yUwDXCXUNquFZNLKyYXBAVZvxtAKYIQEsmPgDacr0tltO1y/DMwYpkgUpJfTasLGzd3cdCN3gN3UWRcY3epIEPevfq+3njBxq/kqBoGBduvea8f393zICS63ivRBTqgFpgaWZEIUULdcK+frIfAAL2AjscXqrLfu+uuwx05FF0XUbvvtuOeu++689+7778AHL/wJIQAAOwAAAAAAAAAAAA==");
-
diff --git a/apps/files_texteditor/js/aceeditor/cockpit.js b/apps/files_texteditor/js/aceeditor/cockpit.js
deleted file mode 100644
index ddc08281335..00000000000
--- a/apps/files_texteditor/js/aceeditor/cockpit.js
+++ /dev/null
@@ -1 +0,0 @@
-define("cockpit/index",["require","exports","module","pilot/index","cockpit/cli","cockpit/ui/settings","cockpit/ui/cli_view","cockpit/commands/basic"],function(a,b,c){b.startup=function(b,c){a("pilot/index"),a("cockpit/cli").startup(b,c),a("cockpit/ui/settings").startup(b,c),a("cockpit/ui/cli_view").startup(b,c),a("cockpit/commands/basic").startup(b,c)}}),define("cockpit/cli",["require","exports","module","pilot/console","pilot/lang","pilot/oop","pilot/event_emitter","pilot/types","pilot/canon"],function(a,b,c){function r(a,b){q.call(this,a),b&&b.flags&&(this.flags=b.flags)}function q(a){this.env=a,this.commandAssignment=new o(p,this)}function o(a,b){this.param=a,this.requisition=b,this.setValue(a.defaultValue)}function n(a,b,c,d,e,f){this.emitter=a,this.setText(b),this.start=c,this.end=d,this.prefix=e,this.suffix=f}function m(a,b){this.status=a.status,this.message=a.message,b?(this.start=b.start,this.end=b.end):(this.start=0,this.end=0),this.predictions=a.predictions}function l(a,b,c,d,e){this.status=a,this.message=b;if(typeof c=="number")this.start=c,this.end=d,this.predictions=e;else{var f=c;this.start=f.start,this.end=f.end,this.predictions=f.predictions}}var d=a("pilot/console"),e=a("pilot/lang"),f=a("pilot/oop"),g=a("pilot/event_emitter").EventEmitter,h=a("pilot/types"),i=a("pilot/types").Status,j=a("pilot/types").Conversion,k=a("pilot/canon");b.startup=function(a,b){k.upgradeType("command",p)},l.prototype={},l.sort=function(a,b){b!==undefined&&a.forEach(function(a){a.start===n.AT_CURSOR?a.distance=0:b<a.start?a.distance=a.start-b:b>a.end?a.distance=b-a.end:a.distance=0},this),a.sort(function(a,c){if(b!==undefined){var d=a.distance-c.distance;if(d!=0)return d}return c.status-a.status}),b!==undefined&&a.forEach(function(a){delete a.distance},this);return a},b.Hint=l,f.inherits(m,l),n.prototype={merge:function(a){if(a.emitter!=this.emitter)throw new Error("Can't merge Arguments from different EventEmitters");return new n(this.emitter,this.text+this.suffix+a.prefix+a.text,this.start,a.end,this.prefix,a.suffix)},setText:function(a){if(a==null)throw new Error("Illegal text for Argument: "+a);var b={argument:this,oldText:this.text,text:a};this.text=a,this.emitter._dispatchEvent("argumentChange",b)},toString:function(){return this.prefix+this.text+this.suffix}},n.merge=function(a,b,c){b=b===undefined?0:b,c=c===undefined?a.length:c;var d;for(var e=b;e<c;e++){var f=a[e];d?d=d.merge(f):d=f}return d},n.AT_CURSOR=-1,o.prototype={param:undefined,conversion:undefined,value:undefined,arg:undefined,value:undefined,setValue:function(a){if(this.value!==a){if(a===undefined)this.value=this.param.defaultValue,this.conversion=this.param.getDefault?this.param.getDefault():this.param.type.getDefault(),this.arg=undefined;else{this.value=a,this.conversion=undefined;var b=a==null?"":this.param.type.stringify(a);this.arg&&this.arg.setText(b)}this.requisition._assignmentChanged(this)}},arg:undefined,setArgument:function(a){this.arg!==a&&(this.arg=a,this.conversion=this.param.type.parse(a.text),this.conversion.arg=a,this.value=this.conversion.value,this.requisition._assignmentChanged(this))},getHint:function(){if(this.param.getCustomHint&&this.value&&this.arg){var a=this.param.getCustomHint(this.value,this.arg);if(a)return a}var b="<strong>"+this.param.name+"</strong>: ";this.param.description&&(b+=this.param.description.trim(),b.charAt(b.length-1)!=="."&&(b+="."),b.charAt(b.length-1)!==" "&&(b+=" "));var c=i.VALID,d=this.arg?this.arg.start:n.AT_CURSOR,e=this.arg?this.arg.end:n.AT_CURSOR,f;this.conversion&&(c=this.conversion.status,this.conversion.message&&(b+=this.conversion.message),f=this.conversion.predictions);var g=this.arg&&this.arg.text!=="",h=this.value!==undefined||g;this.param.defaultValue===undefined&&!h&&(c=i.INVALID,b+="<strong>Required<strong>");return new l(c,b,d,e,f)},complete:function(){this.conversion&&this.conversion.predictions&&this.conversion.predictions.length>0&&this.setValue(this.conversion.predictions[0])},isPositionCaptured:function(a){return this.arg?this.arg.start===-1?!1:a>this.arg.end?!1:a===this.arg.end?this.conversion.status!==i.VALID||this.conversion.predictions.length!==0:!0:!1},decrement:function(){var a=this.param.type.decrement(this.value);a!=null&&this.setValue(a)},increment:function(){var a=this.param.type.increment(this.value);a!=null&&this.setValue(a)},toString:function(){return this.arg?this.arg.toString():""}},b.Assignment=o;var p={name:"__command",type:"command",description:"The command to execute",getCustomHint:function(a,b){var c=[];c.push("<strong><tt> &gt; "),c.push(a.name),a.params&&a.params.length>0&&a.params.forEach(function(a){a.defaultValue===undefined?c.push(" ["+a.name+"]"):c.push(" <em>["+a.name+"]</em>")},this),c.push("</tt></strong><br/>"),c.push(a.description?a.description:"(No description)"),c.push("<br/>"),a.params&&a.params.length>0&&(c.push("<ul>"),a.params.forEach(function(a){c.push("<li>"),c.push("<strong><tt>"+a.name+"</tt></strong>: "),c.push(a.description?a.description:"(No description)"),a.defaultValue===undefined?c.push(" <em>[Required]</em>"):a.defaultValue===null?c.push(" <em>[Optional]</em>"):c.push(" <em>[Default: "+a.defaultValue+"]</em>"),c.push("</li>")},this),c.push("</ul>"));return new l(i.VALID,c.join(""),b)}};q.prototype={commandAssignment:undefined,assignmentCount:undefined,_assignments:undefined,_hints:undefined,_assignmentChanged:function(a){a.param.name==="__command"&&(this._assignments={},a.value&&a.value.params.forEach(function(a){this._assignments[a.name]=new o(a,this)},this),this.assignmentCount=Object.keys(this._assignments).length,this._dispatchEvent("commandChange",{command:a.value}))},getAssignment:function(a){var b=typeof a=="string"?a:Object.keys(this._assignments)[a];return this._assignments[b]},getParameterNames:function(){return Object.keys(this._assignments)},cloneAssignments:function(){return Object.keys(this._assignments).map(function(a){return this._assignments[a]},this)},_updateHints:function(){this.getAssignments(!0).forEach(function(a){this._hints.push(a.getHint())},this),l.sort(this._hints)},getWorstHint:function(){return this._hints[0]},getArgsObject:function(){var a={};this.getAssignments().forEach(function(b){a[b.param.name]=b.value},this);return a},getAssignments:function(a){var b=[];a===!0&&b.push(this.commandAssignment),Object.keys(this._assignments).forEach(function(a){b.push(this.getAssignment(a))},this);return b},setDefaultValues:function(){this.getAssignments().forEach(function(a){a.setValue(undefined)},this)},exec:function(){k.exec(this.commandAssignment.value,this.env,"cli",this.getArgsObject(),this.toCanonicalString())},toCanonicalString:function(){var a=[];a.push(this.commandAssignment.value.name),Object.keys(this._assignments).forEach(function(b){var c=this._assignments[b],d=c.param.type;c.value!==c.param.defaultValue&&(a.push(" "),a.push(d.stringify(c.value)))},this);return a.join("")}},f.implement(q.prototype,g),b.Requisition=q,f.inherits(r,q),function(){r.prototype.update=function(a){this.input=a,this._hints=[];var b=this._tokenize(a.typed);this._split(b),this.commandAssignment.value&&this._assign(b),this._updateHints()},r.prototype.getInputStatusMarkup=function(){var a=this.toString().split("").map(function(a){return i.VALID});this._hints.forEach(function(b){for(var c=b.start;c<=b.end;c++)b.status>a[c]&&(a[c]=b.status)},this);return a},r.prototype.toString=function(){return this.getAssignments(!0).map(function(a){return a.toString()},this).join("")};var a=r.prototype._updateHints;r.prototype._updateHints=function(){a.call(this);var b=this.input.cursor;this._hints.forEach(function(a){var c=b.start>=a.start&&b.start<=a.end,d=b.end>=a.start&&b.end<=a.end,e=c||d;!e&&a.status===i.INCOMPLETE&&(a.status=i.INVALID)},this),l.sort(this._hints)},r.prototype.getHints=function(){return this._hints},r.prototype.getAssignmentAt=function(a){var b=this.getAssignments(!0);for(var c=0;c<b.length;c++){var d=b[c];if(!d.arg)return d;if(d.isPositionCaptured(a))return d}return d},r.prototype._tokenize=function(a){function g(a){return a.replace(/\uF000/g," ").replace(/\uF001/g,"'").replace(/\uF002/g,'"')}if(a==null||a.length===0)return[new n(this,"",0,0,"","")];var b=1,c=2,d=3,e=4,f=b;a=a.replace(/\\\\/g,"\\").replace(/\\b/g,"\b").replace(/\\f/g,"\f").replace(/\\n/g,"\n").replace(/\\r/g,"\r").replace(/\\t/g,"\t").replace(/\\v/g,"").replace(/\\n/g,"\n").replace(/\\r/g,"\r").replace(/\\ /g,"").replace(/\\'/g,"�").replace(/\\"/g,"");var h=0,i=0,j="",k=[];for(;;){if(h>=a.length){if(f!==b){var l=g(a.substring(i,h));k.push(new n(this,l,i,h,j,""))}else if(h!==i){var m=a.substring(i,h),o=k[k.length-1];o?o.suffix+=m:(o=new n(this,"",h,h,m,""),k.push(o))}break}var p=a[h];switch(f){case b:p==="'"?(j=a.substring(i,h+1),f=d,i=h+1):p==='"'?(j=a.substring(i,h+1),f=e,i=h+1):/ /.test(p)||(j=a.substring(i,h),f=c,i=h);break;case c:if(p===" "){var l=g(a.substring(i,h));k.push(new n(this,l,i,h,j,"")),f=b,i=h,j=""}break;case d:if(p==="'"){var l=g(a.substring(i,h));k.push(new n(this,l,i-1,h+1,j,p)),f=b,i=h+1,j=""}break;case e:if(p==='"'){var l=g(a.substring(i,h));k.push(new n(this,l,i-1,h+1,j,p)),f=b,i=h+1,j=""}}h++}return k},r.prototype._split=function(a){var b=1,c;while(b<=a.length){var c=n.merge(a,0,b);this.commandAssignment.setArgument(c);if(!this.commandAssignment.value)break;if(this.commandAssignment.value.exec){for(var d=0;d<b;d++)a.shift();break}b++}},r.prototype._assign=function(a){if(a.length===0)this.setDefaultValues();else{if(this.assignmentCount===0){this._hints.push(new l(i.INVALID,this.commandAssignment.value.name+" does not take any parameters",n.merge(a)));return}if(this.assignmentCount===1){var b=this.getAssignment(0);if(b.param.type.name==="text"){b.setArgument(n.merge(a));return}}var c=this.cloneAssignments(),d=this.getParameterNames(),f=[];c.forEach(function(b){var c="--"+b.name,f=0;for(;;){var g=a[f];if(c!==g.text){f++;if(f>=a.length)break;continue}b.param.type.name==="boolean"?b.setValue(!0):f+1<a.length?this._hints.push(new l(i.INCOMPLETE,"Missing value for: "+c,a[f])):(a.splice(f+1,1),b.setArgument(a[f+1])),e.arrayRemove(d,b.name),a.splice(f,1)}},this),d.forEach(function(b){var c=this.getAssignment(b);if(a.length===0)c.setValue(undefined);else{var d=a[0];a.splice(0,1),c.setArgument(d)}},this);if(a.length>0){var g=n.merge(a);this._hints.push(new l(i.INVALID,"Input '"+g.text+"' makes no sense.",g))}}}}(),b.CliRequisition=r}),define("cockpit/ui/settings",["require","exports","module","pilot/types","pilot/types/basic"],function(a,b,c){var d=a("pilot/types"),e=a("pilot/types/basic").SelectionType,f=new e({name:"direction",data:["above","below"]}),g={name:"hintDirection",description:"Are hints shown above or below the command line?",type:"direction",defaultValue:"above"},h={name:"outputDirection",description:"Is the output window shown above or below the command line?",type:"direction",defaultValue:"above"},i={name:"outputHeight",description:"What height should the output panel be?",type:"number",defaultValue:300};b.startup=function(a,b){d.registerType(f),a.env.settings.addSetting(g),a.env.settings.addSetting(h),a.env.settings.addSetting(i)},b.shutdown=function(a,b){d.unregisterType(f),a.env.settings.removeSetting(g),a.env.settings.removeSetting(h),a.env.settings.removeSetting(i)}}),define("cockpit/ui/cli_view",["require","exports","module","text!cockpit/ui/cli_view.css","pilot/event","pilot/dom","pilot/keys","pilot/canon","pilot/types","cockpit/cli","cockpit/ui/request_view"],function(a,b,c){function n(a,b){a.cliView=this,this.cli=a,this.doc=document,this.win=f.getParentWindow(this.doc),this.env=b,this.element=this.doc.getElementById("cockpitInput");!this.element||(this.settings=b.settings,this.hintDirection=this.settings.getSetting("hintDirection"),this.outputDirection=this.settings.getSetting("outputDirection"),this.outputHeight=this.settings.getSetting("outputHeight"),this.isUpdating=!1,this.createElements(),this.update())}var d=a("text!cockpit/ui/cli_view.css"),e=a("pilot/event"),f=a("pilot/dom");f.importCssString(d);var e=a("pilot/event"),g=a("pilot/keys"),h=a("pilot/canon"),i=a("pilot/types").Status,j=a("cockpit/cli").CliRequisition,k=a("cockpit/cli").Hint,l=a("cockpit/ui/request_view").RequestView,m=new k(i.VALID,"",0,0);b.startup=function(a,b){var c=new j(a.env),d=new n(c,a.env);a.env.cli=c},n.prototype={createElements:function(){function d(){f.removeCssClass(this.output,"cptFocusPopup"),f.removeCssClass(this.hinter,"cptFocusPopup")}var a=this.element;this.element.spellcheck=!1,this.output=this.doc.getElementById("cockpitOutput"),this.popupOutput=this.output==null;if(!this.output){this.output=this.doc.createElement("div"),this.output.id="cockpitOutput",this.output.className="cptOutput",a.parentNode.insertBefore(this.output,a.nextSibling);var b=function(){this.output.style.maxHeight=this.outputHeight.get()+"px"}.bind(this);this.outputHeight.addEventListener("change",b),b()}this.completer=this.doc.createElement("div"),this.completer.className="cptCompletion VALID",this.completer.style.color=f.computedStyle(a,"color"),this.completer.style.fontSize=f.computedStyle(a,"fontSize"),this.completer.style.fontFamily=f.computedStyle(a,"fontFamily"),this.completer.style.fontWeight=f.computedStyle(a,"fontWeight"),this.completer.style.fontStyle=f.computedStyle(a,"fontStyle"),a.parentNode.insertBefore(this.completer,a.nextSibling),this.completer.style.backgroundColor=a.style.backgroundColor,a.style.backgroundColor="transparent",this.hinter=this.doc.createElement("div"),this.hinter.className="cptHints",a.parentNode.insertBefore(this.hinter,a.nextSibling);var c=this.resizer.bind(this);e.addListener(this.win,"resize",c),this.hintDirection.addEventListener("change",c),this.outputDirection.addEventListener("change",c),c(),h.addEventListener("output",function(a){new l(a.request,this)}.bind(this)),e.addCommandKeyListener(a,this.onCommandKey.bind(this)),e.addListener(a,"keyup",this.onKeyUp.bind(this)),e.addListener(a,"mouseup",function(a){this.isUpdating=!0,this.update(),this.isUpdating=!1}.bind(this)),this.cli.addEventListener("argumentChange",this.onArgChange.bind(this)),e.addListener(a,"focus",function(){f.addCssClass(this.output,"cptFocusPopup"),f.addCssClass(this.hinter,"cptFocusPopup")}.bind(this)),e.addListener(a,"blur",d.bind(this)),d.call(this)},scrollOutputToBottom:function(){var a=Math.max(this.output.scrollHeight,this.output.clientHeight);this.output.scrollTop=a-this.output.clientHeight},resizer:function(){var a=this.element.getClientRects()[0];this.completer.style.top=a.top+"px";var b=a.bottom-a.top;this.completer.style.height=b+"px",this.completer.style.lineHeight=b+"px",this.completer.style.left=a.left+"px";var c=a.right-a.left;this.completer.style.width=c+"px",this.hintDirection.get()==="below"?(this.hinter.style.top=a.bottom+"px",this.hinter.style.bottom="auto"):(this.hinter.style.top="auto",this.hinter.style.bottom=this.doc.documentElement.clientHeight-a.top+"px"),this.hinter.style.left=a.left+30+"px",this.hinter.style.maxWidth=c-110+"px",this.popupOutput&&(this.outputDirection.get()==="below"?(this.output.style.top=a.bottom+"px",this.output.style.bottom="auto"):(this.output.style.top="auto",this.output.style.bottom=this.doc.documentElement.clientHeight-a.top+"px"),this.output.style.left=a.left+"px",this.output.style.width=c-80+"px")},onCommandKey:function(a,b,c){var d;if(c===g.TAB||c===g.UP||c===g.DOWN)d=!0;else if(b!=0||c!=0)d=h.execKeyCommand(this.env,"cli",b,c);d&&e.stopEvent(a)},onKeyUp:function(a){var b;if(a.keyCode===g.RETURN){var c=this.cli.getWorstHint();c.status===i.VALID?(this.cli.exec(),this.element.value=""):(f.setSelectionStart(this.element,c.start),f.setSelectionEnd(this.element,c.end))}this.update();var d=this.cli.getAssignmentAt(f.getSelectionStart(this.element));d&&(a.keyCode===g.TAB&&(d.complete(),this.update()),a.keyCode===g.UP&&(d.increment(),this.update()),a.keyCode===g.DOWN&&(d.decrement(),this.update()));return b},update:function(){this.isUpdating=!0;var a={typed:this.element.value,cursor:{start:f.getSelectionStart(this.element),end:f.getSelectionEnd(this.element.selectionEnd)}};this.cli.update(a);var b=this.cli.getAssignmentAt(a.cursor.start).getHint();f.removeCssClass(this.completer,i.VALID.toString()),f.removeCssClass(this.completer,i.INCOMPLETE.toString()),f.removeCssClass(this.completer,i.INVALID.toString());var c='<span class="cptPrompt">&gt;</span> ';if(this.element.value.length>0){var d=this.cli.getInputStatusMarkup();c+=this.markupStatusScore(d)}if(this.element.value.length>0&&b.predictions&&b.predictions.length>0){var e=b.predictions[0];c+=" &nbsp;&#x21E5; "+(e.name?e.name:e)}this.completer.innerHTML=c,f.addCssClass(this.completer,this.cli.getWorstHint().status.toString());var g="";this.element.value.length!==0&&(g+=b.message,b.predictions&&b.predictions.length>0&&(g+=": [ ",b.predictions.forEach(function(a){g+=a.name?a.name:a,g+=" | "},this),g=g.replace(/\| $/,"]"))),this.hinter.innerHTML=g,g.length===0?f.addCssClass(this.hinter,"cptNoPopup"):f.removeCssClass(this.hinter,"cptNoPopup"),this.isUpdating=!1},markupStatusScore:function(a){var b="",c=0,d=-1;for(;;){d!==a[c]&&(b+="<span class="+a[c].toString()+">",d=a[c]),b+=this.element.value[c],c++;if(c===this.element.value.length){b+="</span>";break}d!==a[c]&&(b+="</span>")}return b},onArgChange:function(a){if(!this.isUpdating){var b=this.element.value.substring(0,a.argument.start),c=this.element.value.substring(a.argument.end),d=typeof a.text=="string"?a.text:a.text.name;this.element.value=b+d+c;var e=(b+d).length;this.element.selectionStart=e,this.element.selectionEnd=e}}},b.CliView=n}),define("cockpit/ui/request_view",["require","exports","module","pilot/dom","pilot/event","text!cockpit/ui/request_view.html","pilot/domtemplate","text!cockpit/ui/request_view.css"],function(a,b,c){function l(a,b){this.request=a,this.cliView=b,this.imageUrl=k,this.rowin=null,this.rowout=null,this.output=null,this.hide=null,this.show=null,this.duration=null,this.throb=null,(new g).processNode(j.cloneNode(!0),this),this.cliView.output.appendChild(this.rowin),this.cliView.output.appendChild(this.rowout),this.request.addEventListener("output",this.onRequestChange.bind(this))}function k(b){var d;try{d=a("text!cockpit/ui/"+b)}catch(e){}if(d)return d;var f=c.id.split("/").pop()+".js",g;if(c.uri.substr(-f.length)!==f){console.error("Can't work out path from module.uri/module.id");return b}if(c.uri){var h=c.uri.length-f.length-1;return c.uri.substr(0,h)+"/"+b}return f+b}var d=a("pilot/dom"),e=a("pilot/event"),f=a("text!cockpit/ui/request_view.html"),g=a("pilot/domtemplate").Templater,h=a("text!cockpit/ui/request_view.css");d.importCssString(h);var i=document.createElement("div");i.innerHTML=f;var j=i.querySelector(".cptRow");l.prototype={copyToInput:function(){this.cliView.element.value=this.request.typed},executeRequest:function(a){this.cliView.cli.update({typed:this.request.typed,cursor:{start:0,end:0}}),this.cliView.cli.exec()},hideOutput:function(a){this.output.style.display="none",d.addCssClass(this.hide,"cmd_hidden"),d.removeCssClass(this.show,"cmd_hidden"),e.stopPropagation(a)},showOutput:function(a){this.output.style.display="block",d.removeCssClass(this.hide,"cmd_hidden"),d.addCssClass(this.show,"cmd_hidden"),e.stopPropagation(a)},remove:function(a){this.cliView.output.removeChild(this.rowin),this.cliView.output.removeChild(this.rowout),e.stopPropagation(a)},onRequestChange:function(a){this.duration.innerHTML=this.request.duration?"completed in "+this.request.duration/1e3+" sec ":"",this.output.innerHTML="",this.request.outputs.forEach(function(a){var b;typeof a=="string"?(b=document.createElement("p"),b.innerHTML=a):b=a,this.output.appendChild(b)},this),this.cliView.scrollOutputToBottom(),d.setCssClass(this.output,"cmd_error",this.request.error),this.throb.style.display=this.request.completed?"none":"block"}},b.RequestView=l}),define("pilot/domtemplate",["require","exports","module"],function(require,exports,module){function Templater(){this.scope=[]}Templater.prototype.processNode=function(a,b){typeof a=="string"&&(a=document.getElementById(a));if(b===null||b===undefined)b={};this.scope.push(a.nodeName+(a.id?"#"+a.id:""));try{if(a.attributes&&a.attributes.length){if(a.hasAttribute("foreach")){this.processForEach(a,b);return}if(a.hasAttribute("if")&&!this.processIf(a,b))return;b.__element=a;var c=Array.prototype.slice.call(a.attributes);for(var d=0;d<c.length;d++){var e=c[d].value,f=c[d].name;this.scope.push(f);try{if(f==="save")e=this.stripBraces(e),this.property(e,b,a),a.removeAttribute("save");else if(f.substring(0,2)==="on"){e=this.stripBraces(e);var g=this.property(e,b);typeof g!="function"&&this.handleError("Expected "+e+" to resolve to a function, but got "+typeof g),a.removeAttribute(f);var h=a.hasAttribute("capture"+f.substring(2));a.addEventListener(f.substring(2),g,h),h&&a.removeAttribute("capture"+f.substring(2))}else{var i=this,j=e.replace(/\$\{[^}]*\}/g,function(a){return i.envEval(a.slice(2,-1),b,e)});f.charAt(0)==="_"?(a.removeAttribute(f),a.setAttribute(f.substring(1),j)):e!==j&&(c[d].value=j)}}finally{this.scope.pop()}}}var k=Array.prototype.slice.call(a.childNodes);for(var l=0;l<k.length;l++)this.processNode(k[l],b);a.nodeType===Node.TEXT_NODE&&this.processTextNode(a,b)}finally{this.scope.pop()}},Templater.prototype.processIf=function(a,b){this.scope.push("if");try{var c=a.getAttribute("if"),d=this.stripBraces(c),e=!0;try{var f=this.envEval(d,b,c);e=!!f}catch(g){this.handleError("Error with '"+d+"'",g),e=!1}e||a.parentNode.removeChild(a),a.removeAttribute("if");return e}finally{this.scope.pop()}},Templater.prototype.processForEach=function(a,b){this.scope.push("foreach");try{var c=a.getAttribute("foreach"),d=c,e="param";if(d.charAt(0)==="$")d=this.stripBraces(d);else{var f=d.split(" in ");e=f[0].trim(),d=this.stripBraces(f[1].trim())}a.removeAttribute("foreach");try{var g=this,h=function(a,c,d){d.parentNode.insertBefore(c,d),b[e]=a,g.processNode(c,b),delete b[e]},i=function(b,c){g.scope.push(b);try{if(a.nodeName==="LOOP")for(var d=0;d<a.childNodes.length;d++){var e=a.childNodes[d].cloneNode(!0);h(c,e,a)}else{var e=a.cloneNode(!0);e.removeAttribute("foreach"),h(c,e,a)}}finally{g.scope.pop()}},j=this.envEval(d,b,c);if(Array.isArray(j))j.forEach(function(a,b){i(""+b,a)},this);else for(var k in j)j.hasOwnProperty(k)&&i(k,k);a.parentNode.removeChild(a)}catch(l){this.handleError("Error with '"+d+"'",l)}}finally{this.scope.pop()}},Templater.prototype.processTextNode=function(a,b){var c=a.data;c=c.replace(/\$\{([^}]*)\}/g,"�$$$1");var d=c.split(/\uF001|\uF002/);d.length>1&&(d.forEach(function(c){c!==null&&c!==undefined&&c!==""&&(c.charAt(0)==="$"&&(c=this.envEval(c.slice(1),b,a.data)),c===null&&(c="null"),c===undefined&&(c="undefined"),typeof c.cloneNode!="function"&&(c=a.ownerDocument.createTextNode(c.toString())),a.parentNode.insertBefore(c,a))},this),a.parentNode.removeChild(a))},Templater.prototype.stripBraces=function(a){if(!a.match(/\$\{.*\}/g)){this.handleError("Expected "+a+" to match ${...}");return a}return a.slice(2,-1)},Templater.prototype.property=function(a,b,c){this.scope.push(a);try{typeof a=="string"&&(a=a.split("."));var d=b[a[0]];if(a.length===1){c!==undefined&&(b[a[0]]=c);return typeof d=="function"?function(){return d.apply(b,arguments)}:d}if(!d){this.handleError("Can't find path="+a);return null}return this.property(a.slice(1),d,c)}finally{this.scope.pop()}},Templater.prototype.envEval=function(script,env,context){with(env)try{this.scope.push(context);return eval(script)}catch(ex){this.handleError("Template error evaluating '"+script+"'",ex);return script}finally{this.scope.pop()}},Templater.prototype.handleError=function(a,b){this.logError(a),this.logError("In: "+this.scope.join(" > ")),b&&this.logError(b)},Templater.prototype.logError=function(a){window.console&&window.console.log&&console.log(a)},exports.Templater=Templater}),define("cockpit/commands/basic",["require","exports","module","pilot/canon"],function(a,b,c){var d=a("pilot/canon"),e={name:"sh",description:"Execute a system command (requires server support)",params:[{name:"command",type:"text",description:"The string to send to the os shell."}],exec:function(a,b,c){var d=new XMLHttpRequest;d.open("GET","/exec?args="+b.command,!0),d.onreadystatechange=function(a){d.readyState==4&&d.status==200&&c.done("<pre>"+d.responseText+"</pre>")},d.send(null)}},d=a("pilot/canon");b.startup=function(a,b){d.addCommand(e)},b.shutdown=function(a,b){d.removeCommand(e)}}),define("text!cockpit/ui/cli_view.css",[],"#cockpitInput { padding-left: 16px; }.cptOutput { overflow: auto; position: absolute; z-index: 999; display: none; }.cptCompletion { padding: 0; position: absolute; z-index: -1000; }.cptCompletion.VALID { background: #FFF; }.cptCompletion.INCOMPLETE { background: #DDD; }.cptCompletion.INVALID { background: #DDD; }.cptCompletion span { color: #FFF; }.cptCompletion span.INCOMPLETE { color: #DDD; border-bottom: 2px dotted #F80; }.cptCompletion span.INVALID { color: #DDD; border-bottom: 2px dotted #F00; }span.cptPrompt { color: #66F; font-weight: bold; }.cptHints {  color: #000;  position: absolute;  border: 1px solid rgba(230, 230, 230, 0.8);  background: rgba(250, 250, 250, 0.8);  -moz-border-radius-topleft: 10px;  -moz-border-radius-topright: 10px;  border-top-left-radius: 10px; border-top-right-radius: 10px;  z-index: 1000;  padding: 8px;  display: none;}.cptFocusPopup { display: block; }.cptFocusPopup.cptNoPopup { display: none; }.cptHints ul { margin: 0; padding: 0 15px; }.cptGt { font-weight: bold; font-size: 120%; }"),define("text!cockpit/ui/request_view.css",[],".cptRowIn {  display: box; display: -moz-box; display: -webkit-box;  box-orient: horizontal; -moz-box-orient: horizontal; -webkit-box-orient: horizontal;  box-align: center; -moz-box-align: center; -webkit-box-align: center;  color: #333;  background-color: #EEE;  width: 100%;  font-family: consolas, courier, monospace;}.cptRowIn > * { padding-left: 2px; padding-right: 2px; }.cptRowIn > img { cursor: pointer; }.cptHover { display: none; }.cptRowIn:hover > .cptHover { display: block; }.cptRowIn:hover > .cptHover.cptHidden { display: none; }.cptOutTyped {  box-flex: 1; -moz-box-flex: 1; -webkit-box-flex: 1;  font-weight: bold; color: #000; font-size: 120%;}.cptRowOutput { padding-left: 10px; line-height: 1.2em; }.cptRowOutput strong,.cptRowOutput b,.cptRowOutput th,.cptRowOutput h1,.cptRowOutput h2,.cptRowOutput h3 { color: #000; }.cptRowOutput a { font-weight: bold; color: #666; text-decoration: none; }.cptRowOutput a: hover { text-decoration: underline; cursor: pointer; }.cptRowOutput input[type=password],.cptRowOutput input[type=text],.cptRowOutput textarea {  color: #000; font-size: 120%;  background: transparent; padding: 3px;  border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px;}.cptRowOutput table,.cptRowOutput td,.cptRowOutput th { border: 0; padding: 0 2px; }.cptRowOutput .right { text-align: right; }"),define("text!cockpit/ui/request_view.html",[],'<div class=cptRow>  <!-- The div for the input (i.e. what was typed) -->  <div class="cptRowIn" save="${rowin}"      onclick="${copyToInput}"      ondblclick="${executeRequest}">    <!-- What the user actually typed -->    <div class="cptGt">&gt; </div>    <div class="cptOutTyped">${request.typed}</div>    <!-- The extra details that appear on hover -->    <div class=cptHover save="${duration}"></div>    <img class=cptHover onclick="${hideOutput}" save="${hide}"        alt="Hide command output" _src="${imageUrl(\'images/minus.png\')}"/>    <img class="cptHover cptHidden" onclick="${showOutput}" save="${show}"        alt="Show command output" _src="${imageUrl(\'images/plus.png\')}"/>    <img class=cptHover onclick="${remove}"        alt="Remove this command from the history"        _src="${imageUrl(\'images/closer.png\')}"/>  </div>  <!-- The div for the command output -->  <div class="cptRowOut" save="${rowout}">    <div class="cptRowOutput" save="${output}"></div>    <img _src="${imageUrl(\'images/throbber.gif\')}" save="${throb}"/>  </div></div>'),define("text!cockpit/ui/images/closer.png",[],"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAj9JREFUeNp0ks+LUlEUx7/vV1o8Z8wUx3IEHcQmiBiQlomjRNCiZpEuEqF/oEUwq/6EhvoHggmRcJUQBM1CRJAW0aLIaGQimZJxJsWxyV/P9/R1zzWlFl04vPvOPZ9z7rnnK5imidmKRCIq+zxgdoPZ1T/ut8xeM3tcKpW6s1hhBkaj0Qj7bDebTX+324WmadxvsVigqipcLleN/d4rFoulORiLxTZY8ItOp8MBCpYkiYPj8Xjus9vtlORWoVB4KcTjcQc732dLpSRXvCZaAws6Q4WDdqsO52kNH+oCRFGEz+f7ydwBKRgMPmTXi49GI1x2D/DsznesB06ws2eDbI7w9HYN6bVjvGss4KAjwDAMq81mM2SW5Wa/3weBbz42UL9uYnVpiO2Nr9ANHSGXib2Wgm9tCYIggGKJEVkvlwgi5/FQRmTLxO6hgJVzI1x0T/fJrBtHJxPeL6tI/fsZLA6ot8lkQi8HRVbw94gkWYI5MaHrOjcCGSNRxZosy9y5cErDzn0Dqx7gcwO8WtBp4PndI35GMYqiUMUvBL5yOBz8yRfFNpbPmqgcCFh/IuHa1nR/YXGM8+oUpFhihEQiwcdRLpfVRqOBtWXWq34Gra6AXq8Hp2piZcmKT4cKnE4nwuHwdByVSmWQz+d32WCTlHG/qaHHREN9kgi0sYQfv0R4PB4EAgESQDKXy72fSy6VSnHJVatVf71eR7vd5n66mtfrRSgU4pLLZrOlf7RKK51Ok8g3/yPyR5lMZi7y3wIMAME4EigHWgKnAAAAAElFTkSuQmCC"),define("text!cockpit/ui/images/dot_clear.gif",[],"data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAEBMgA7"),define("text!cockpit/ui/images/minus.png",[],"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAAZiS0dEANIA0gDS7KbF4AAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9kFGw4xMrIJw5EAAAHcSURBVCjPhZIxSxtxGMZ/976XhJA/RA5EAyJcFksnp64hjUPBoXRyCYLQTyD0UxScu0nFwalCQSgFCVk7dXAwUAiBDA2RO4W7yN1x9+9gcyhU+pteHt4H3pfncay1LOl0OgY4BN4Ar/7KP4BvwNFwOIyWu87S2O12O8DxfD73oygiSRIAarUaxhhWV1fHwMFgMBiWxl6v9y6Koi+3t7ckSUKtVkNVAcjzvNRWVlYwxry9vLz86uzs7HjAZDKZGGstjUaDfxHHMSLC5ubmHdB2VfVwNpuZ5clxHPMcRVFwc3PTXFtbO3RFZHexWJCmabnweAaoVqvlv4vFAhHZdVX1ZZqmOI5DURR8fz/lxbp9Yrz+7bD72SfPcwBU1XdF5N5aWy2KgqIoeBzPEnWVLMseYnAcRERdVR27rrsdxzGqyutP6898+GBsNBqo6i9XVS88z9sOggAR4X94noeqXoiIHPm+H9XrdYIgIAxDwjAkTVPCMESzBy3LMprNJr7v34nIkV5dXd2fn59fG2P2siwjSRIqlQrWWlSVJFcqlQqtVot2u40xZu/s7OxnWbl+v98BjkejkT+dTgmCoDxtY2ODra2tMXBweno6fNJVgP39fQN8eKbkH09OTsqS/wHFRdHPfTSfjwAAAABJRU5ErkJggg=="),define("text!cockpit/ui/images/pinaction.png",[],"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC7mlDQ1BJQ0MgUHJvZmlsZQAAeAGFVM9rE0EU/jZuqdAiCFprDrJ4kCJJWatoRdQ2/RFiawzbH7ZFkGQzSdZuNuvuJrWliOTi0SreRe2hB/+AHnrwZC9KhVpFKN6rKGKhFy3xzW5MtqXqwM5+8943731vdt8ADXLSNPWABOQNx1KiEWlsfEJq/IgAjqIJQTQlVdvsTiQGQYNz+Xvn2HoPgVtWw3v7d7J3rZrStpoHhP1A4Eea2Sqw7xdxClkSAog836Epx3QI3+PY8uyPOU55eMG1Dys9xFkifEA1Lc5/TbhTzSXTQINIOJT1cVI+nNeLlNcdB2luZsbIEL1PkKa7zO6rYqGcTvYOkL2d9H5Os94+wiHCCxmtP0a4jZ71jNU/4mHhpObEhj0cGDX0+GAVtxqp+DXCFF8QTSeiVHHZLg3xmK79VvJKgnCQOMpkYYBzWkhP10xu+LqHBX0m1xOv4ndWUeF5jxNn3tTd70XaAq8wDh0MGgyaDUhQEEUEYZiwUECGPBoxNLJyPyOrBhuTezJ1JGq7dGJEsUF7Ntw9t1Gk3Tz+KCJxlEO1CJL8Qf4qr8lP5Xn5y1yw2Fb3lK2bmrry4DvF5Zm5Gh7X08jjc01efJXUdpNXR5aseXq8muwaP+xXlzHmgjWPxHOw+/EtX5XMlymMFMXjVfPqS4R1WjE3359sfzs94i7PLrXWc62JizdWm5dn/WpI++6qvJPmVflPXvXx/GfNxGPiKTEmdornIYmXxS7xkthLqwviYG3HCJ2VhinSbZH6JNVgYJq89S9dP1t4vUZ/DPVRlBnM0lSJ93/CKmQ0nbkOb/qP28f8F+T3iuefKAIvbODImbptU3HvEKFlpW5zrgIXv9F98LZua6N+OPwEWDyrFq1SNZ8gvAEcdod6HugpmNOWls05Uocsn5O66cpiUsxQ20NSUtcl12VLFrOZVWLpdtiZ0x1uHKE5QvfEp0plk/qv8RGw/bBS+fmsUtl+ThrWgZf6b8C8/UXAeIuJAAAACXBIWXMAAAsTAAALEwEAmpwYAAAClklEQVQ4EX1TXUhUQRQ+Z3Zmd+9uN1q2P3UpZaEwcikKekkqLKggKHJ96MHe9DmLkCDa9U198Id8kErICmIlRAN96UdE6QdBW/tBA5Uic7E0zN297L17p5mb1zYjD3eYc+d83zlnON8g5xzWNUSEdUBkHTJasRWySPP7fw3hfwkk2GoNsc0vOaJRHo1GV/GiMctkTIJRFlpZli8opK+htmf83gXeG63oteOtra0u25e7TYJIJELb26vYCACTgUe1lXV86BTn745l+MsyHqs53S/Aq4VEUa9Y6ko14eYY4u3AyM3HYwdKU35DZyblGR2+qq6W0X2Nnh07xynnVYpHORx/E1/GvvqaAZUayjMjdM2f/Lgr5E+fV93zR4u3zKCLughsZqKwAzAxaz6dPY6JgjLUF+eSP5OpjmAw2E8DvldHSvJMKPg08aRor1tc4BuALu6mOwGWdQC3mKIqRsC8mKd8wYfD78/earzSYzdMDW9QgKb0Is8CBY1mQXOiaXAHEpMDE5XTJqIq4EiyxUqKlpfkF0pyV1OTAoFAhmTmyCCoDsZNZvIkUjELQpipo0sQqYZAswZHwsEEE10M0pq2SSZY9HqNcDicJcNTpBvQJz40UbSOTh1B8bDpuY0w9Hb3kkn9lPAlBLfhfD39XTtX/blFJqiqrjbkTi63Hbofj2uL4GMsmzFgbDJ/vmMgv/lB4syJ0oXO7d3j++vio6GFsYmD6cHJreWc3/jRVVHhsOYvM8iZ36mtjPDBk/xDZE8CoHlbrlAssbTxDdDJvdb536L7I6S7Vy++6Gi4Xi9BsUthJRaLOYSPz4XALKI4j4iObd/e5UtDKUjZzYyYRyGAJv01Zj8kC5cbs5WY83hQnv0DzCXl+r8APElkq0RU6oMAAAAASUVORK5CYII="),define("text!cockpit/ui/images/pinin.png",[],"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC7mlDQ1BJQ0MgUHJvZmlsZQAAeAGFVM9rE0EU/jZuqdAiCFprDrJ4kCJJWatoRdQ2/RFiawzbH7ZFkGQzSdZuNuvuJrWliOTi0SreRe2hB/+AHnrwZC9KhVpFKN6rKGKhFy3xzW5MtqXqwM5+8943731vdt8ADXLSNPWABOQNx1KiEWlsfEJq/IgAjqIJQTQlVdvsTiQGQYNz+Xvn2HoPgVtWw3v7d7J3rZrStpoHhP1A4Eea2Sqw7xdxClkSAog836Epx3QI3+PY8uyPOU55eMG1Dys9xFkifEA1Lc5/TbhTzSXTQINIOJT1cVI+nNeLlNcdB2luZsbIEL1PkKa7zO6rYqGcTvYOkL2d9H5Os94+wiHCCxmtP0a4jZ71jNU/4mHhpObEhj0cGDX0+GAVtxqp+DXCFF8QTSeiVHHZLg3xmK79VvJKgnCQOMpkYYBzWkhP10xu+LqHBX0m1xOv4ndWUeF5jxNn3tTd70XaAq8wDh0MGgyaDUhQEEUEYZiwUECGPBoxNLJyPyOrBhuTezJ1JGq7dGJEsUF7Ntw9t1Gk3Tz+KCJxlEO1CJL8Qf4qr8lP5Xn5y1yw2Fb3lK2bmrry4DvF5Zm5Gh7X08jjc01efJXUdpNXR5aseXq8muwaP+xXlzHmgjWPxHOw+/EtX5XMlymMFMXjVfPqS4R1WjE3359sfzs94i7PLrXWc62JizdWm5dn/WpI++6qvJPmVflPXvXx/GfNxGPiKTEmdornIYmXxS7xkthLqwviYG3HCJ2VhinSbZH6JNVgYJq89S9dP1t4vUZ/DPVRlBnM0lSJ93/CKmQ0nbkOb/qP28f8F+T3iuefKAIvbODImbptU3HvEKFlpW5zrgIXv9F98LZua6N+OPwEWDyrFq1SNZ8gvAEcdod6HugpmNOWls05Uocsn5O66cpiUsxQ20NSUtcl12VLFrOZVWLpdtiZ0x1uHKE5QvfEp0plk/qv8RGw/bBS+fmsUtl+ThrWgZf6b8C8/UXAeIuJAAAACXBIWXMAAAsTAAALEwEAmpwYAAABZ0lEQVQ4Ea2TPUsDQRCGZ89Eo4FACkULEQs1CH4Uamfjn7GxEYJFIFXgChFsbPwzNnZioREkaiHBQtEiEEiMRm/dZ8OEGAxR4sBxx877Pju7M2estTJIxLrNuVwuMxQEx0ZkzcFHyRtjXt02559RtB2GYanTYzoryOfz+6l4Nbszf2niwffKmpGRo9sVW22mDgqFwp5C2gDMm+P32a3JB1N+n5JifUGeP9JeNxGryPLYjcwMP8rJ07Q9fZltQzyAstOJ2vVu5sKc1ZZkRBrOcKeb+HexPidvkpCN5JUcllZtpZFc5DgBWc5M2eysZuMuofMBSA4NWjx4PUCsXefMlI0QY3ewRg4NWi4ZTQsgrjYXema+e4VqtEMK6KXvu+4B9Bklt90vVKMeD2BI6DOt4rZ/Gk7WyKFBi4fNPIAJY0joM61SCCZ9tI1o0OIB8D+DBIkYaJRbCBH9mZgNt+bb++ufSSF/eX8BYcDeAzuQJVUAAAAASUVORK5CYII="),define("text!cockpit/ui/images/pinout.png",[],"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC7mlDQ1BJQ0MgUHJvZmlsZQAAeAGFVM9rE0EU/jZuqdAiCFprDrJ4kCJJWatoRdQ2/RFiawzbH7ZFkGQzSdZuNuvuJrWliOTi0SreRe2hB/+AHnrwZC9KhVpFKN6rKGKhFy3xzW5MtqXqwM5+8943731vdt8ADXLSNPWABOQNx1KiEWlsfEJq/IgAjqIJQTQlVdvsTiQGQYNz+Xvn2HoPgVtWw3v7d7J3rZrStpoHhP1A4Eea2Sqw7xdxClkSAog836Epx3QI3+PY8uyPOU55eMG1Dys9xFkifEA1Lc5/TbhTzSXTQINIOJT1cVI+nNeLlNcdB2luZsbIEL1PkKa7zO6rYqGcTvYOkL2d9H5Os94+wiHCCxmtP0a4jZ71jNU/4mHhpObEhj0cGDX0+GAVtxqp+DXCFF8QTSeiVHHZLg3xmK79VvJKgnCQOMpkYYBzWkhP10xu+LqHBX0m1xOv4ndWUeF5jxNn3tTd70XaAq8wDh0MGgyaDUhQEEUEYZiwUECGPBoxNLJyPyOrBhuTezJ1JGq7dGJEsUF7Ntw9t1Gk3Tz+KCJxlEO1CJL8Qf4qr8lP5Xn5y1yw2Fb3lK2bmrry4DvF5Zm5Gh7X08jjc01efJXUdpNXR5aseXq8muwaP+xXlzHmgjWPxHOw+/EtX5XMlymMFMXjVfPqS4R1WjE3359sfzs94i7PLrXWc62JizdWm5dn/WpI++6qvJPmVflPXvXx/GfNxGPiKTEmdornIYmXxS7xkthLqwviYG3HCJ2VhinSbZH6JNVgYJq89S9dP1t4vUZ/DPVRlBnM0lSJ93/CKmQ0nbkOb/qP28f8F+T3iuefKAIvbODImbptU3HvEKFlpW5zrgIXv9F98LZua6N+OPwEWDyrFq1SNZ8gvAEcdod6HugpmNOWls05Uocsn5O66cpiUsxQ20NSUtcl12VLFrOZVWLpdtiZ0x1uHKE5QvfEp0plk/qv8RGw/bBS+fmsUtl+ThrWgZf6b8C8/UXAeIuJAAAACXBIWXMAAAsTAAALEwEAmpwYAAACyUlEQVQ4EW1TXUgUURQ+Z3ZmnVV3QV2xJbVSEIowQbAfLQx8McLoYX2qjB58MRSkP3vZppceYhGxgrZaIughlYpE7CHFWiiKyj9II0qxWmwlNh1Xtp2f27mz7GDlZX7uuXO+73zfuXeQMQYIgAyALppgyBtse32stsw86txkHhATn+FbfPfzxnPB+vR3RMJYuTwW6bbB4a6WS5O3Yu2VlXIesDiAamiQNKVlVXfx5I0GJ7DY7p0/+erU4dgeMJIA31WNxZmAgibOreXDqF55sY4SFUURqbi+nkjgwTyAbHhLX8yOLsSM2QRA3JRAAgd4RGPbVhkKEp8qeJ7PFyW3fw++YHtC7CkaD0amqyqihSwlMQQ0wa07IjPVI/vbexreIUrVaQV2D4RMQ/o7m12Mdfx4H3PfB9FNzTR1U2cO0Bi45aV6xNvFBNaoIAfbSiwLlqi9/hR/R3Nrhua+Oqi9TEKiB02C7YXz+Pba4MTDrpbLiMAxNgmXb+HpwVkZdoIrkn9isW7nRw/TZYaagZArAWyhfqsSDL/c9aTx7JUjGZCtYExRqCzAwGblwr6aFQ84nTo6qZ7XCeCVQNckE/KSWolvoQnxeoFFgIh8G/nA+kBAxxuQO5m9eFrwLIGJHgcyM63VFMhRSgNVyJr7og8y1vbTQpH8DIEVgxuYuexw0QECIalq5FYgEmpkgoFYltU/lnrqDz5osirSFpF7lrHAFKSWHYfEs+mY/82UnAStyMlW8sUPsVIciTZgz3jV1ebg0CEOpgPF22s1z1YQYKSXPJ1hbAhR8T26WdLhkuVfAzPR+YO1Ox5n58SmCcF6e3uzAoHA77RkevJdWH/3+f2O9TGf3w3fWQ2Hw5F/13mcsWAT+vv6DK4kFApJ/d3d1k+kJtbCrmxXHS3n8ER6b3CQbAqaEHVra6sGxcXW4SovLx+empxapS//FfwD9kpMJjMMBBAAAAAASUVORK5CYII="),define("text!cockpit/ui/images/pins.png",[],"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAQCAYAAABQrvyxAAAACXBIWXMAAAsTAAALEwEAmpwYAAAGYklEQVRIDbVWe0yURxCf/R735o6DO0FBe0RFsaL4iLXGIKa2SY3P6JGa2GpjlJjUV9NosbU++tYUbEnaQIrVaKJBG7WiNFQFUWO1UUEsVg2CAgoeHHLewcH32O58cBdQsX9Y5+7LfrszOzO/2ZnZj1BKgTBiIwVGVvKd49OVVYunDlXn6wdBKh+ogXrv+DOz1melIb+3LM5fNv2XPYE5EHY+L3PJljN5zavHpJjsQNsA/JJEgyC2+WTjy3b0GfoJW8O4aoHtDwiHQrj5lw1LLyyb1bp5zAjJTus9klrVpdD6TqH2ngVO+0dsRJnp06cLIYU4fx7NnRI3bu7UIYOeJ/McnuY88q3k62gc0S4Dgf5qhICQtIXS2lqD7BhSduPk3YfyzXaANhBBJDxYdUqCywB2qS4RdyUuSkTF/VJxcbH5j8N7/75RuFrN3Zh8OS8zqf5m4UpPeenOyP42dbtBeuvVnCdkK1e4PfPouX03mo9se+c33M8wqDk5Ofqed8REUTicQhbySUxp9u3KlMSHTtrFU6Kyn03lz15PPpW25vsZeYSIKyiVURcqeZJOH9lTNZLfnxRjU/uwrjbEUBWsapcSO2Hq4k0VfZg9EzxdDNCEjDxgNqRDme9umz/btwlsHRIEePHgAf73RdnHZ6LTuIUBN7OBQ+c1Fdnp6cZ1BQUdeRuWZi97o3ktDQQkVeFFzqJARd1A5a0Vr7ta6Kp6TZjtZ+NTIOoKF6qDrL7e0QQIUCiqMMKk8Z1Q/SCSKvzocf2B6NEN0SQn/kTO6fKJ0zqjZUlQBSpJ0GjR77w0aoc1Pr6S5/kVJrNpakV5hR+LWKN4t7sLX+p0rx2vqSta64olIulUKUgCSXLWE1R4KPPSj+5vhm2hdDOG+CkQBmhhyyKq6SaFYWTn5bB3QJRNz54AuXKn8TJjhu0Wbv+wNEKQjVhnmKopjo4FxXmetCRnC4F7BhCiCUepqAepRh0TM/gjjzOOSK2NgWZPc05qampRWJHb7dbOffep2ednzLzgczlbrQA6gHYF9BYDh9GY+FjddMweHMscmMuep07gXlMQoqw9ALoYu5MJsak9QmJA2IvAgVmoCRciooyPujJtNCv1uHt3TmK9gegFKrG9kh6oXwZiIEAtBIjORGKNTWR/WeW8XVkbjuJepLAyloM8LmTN//njKZPbraATZaLjCHEww9Ei4FFiPg6Ja5gT6gxYgLgnRDHRQwJXbz2GOw0d4A3K4GXlUtMahJjYVxiYbrwOmxIS10bFnIBOSi6Tl9Jgs0zbOEX18wyEwgLPMrxD1Y4aCK8kmTpgYcpAF27Mzs42Hjx4kA8BICUlJfKArR7LcEvTB1xEC9AoEw9OPagWkVU/D1oesmK6U911zEczMVe01oZjiMggg6ux2Qk379qh4rYKet4GjrhhwEteBgBrH8BssoXEtbHzPpSBRRSpqlNpgAiUoxzHKxLRszoVuggIisxaDQWZqkQvQjAoax3NbDbLLGuUEABNGedXqSyLRupXgDT5JfAGZNLio9B0X8Uiwk4w77MDc1D4yejjWtykPS3DX01UDCY/GPQcVDe0QYT0CIxGFvUorfvBxZsRfVrUuWruMBAb/lXCUofoFNZfzGJtowXOX0vwUSFK4BgyMKm6P6s9wQUZld+jrYyMDC0iIQDaJdG4IyZQfL3RfbFcCBIlRgc+u3CjaTApuZ9KsANgG8PNzHlWWD3tCxd6kafNNiFp5HAalAkkJ0SCV2H3CgOD9Nc/FqrXuyb0Eocvfhq171p5eyuJ1omKJEP5rQGe/FOOnXtq335z8YmvYo9cHb2t8spIb3lVSseZW46FlGY/Sk9P50P2w20UlWJUkUHIushfc5PXGAzCo0PlD2pnpCYfCXga3lu+fPlevEhWrVrFyrN/Orfv87FOW9tlqb2Kc9pV8DzioMk3UNUbXM+8B/ATBr8C8CKdvGXWGD/9sqm3dkxtzA4McMjHMB8D2ftheYXo+qzt3pXvz8/PP/vk+v8537V+yYW87Zu+RZ1ZbrexoKAA/SBpaWn4+aL5w5zGk+/jW59JiMkESW5urpiVlWXENRb1H/Yf2I9txIxz5IdkX3TsraukpsbQjz6090yb4XsAvQoRE0YvJdamtIIbOnRoUVlZ2ftsLVQzIdEXHntsaZdimssVfCpFui109+BnWPsXaWLI/zactygAAAAASUVORK5CYII="),define("text!cockpit/ui/images/plus.png",[],"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAAZiS0dEANIA0gDS7KbF4AAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9kFGw4yFTwuJTkAAAH7SURBVCjPdZKxa1NRFMZ/956XZMgFyyMlCZRA4hBx6lBcQ00GoYi4tEstFPwLAs7iLDi7FWuHThaUggihBDI5OWRoQAmBQFISQgvvpbwX3rsOaR4K+o2H8zvfOZxPWWtZqVarGaAJPAEe3ZW/A1+Bd+1221v1qhW4vb1dA44mk0nZ8zyCIAAgk8lgjGF9fb0PHF5cXLQTsF6vP/c879P19TVBEJDJZBARAKIoSmpra2sYY561Wq3PqtFouMBgMBgYay3ZbJZ/yfd9tNaUSqUboOKISPPq6sqsVvZ9H4AvL34B8PTj/QSO45jpdHovn883Ha31znw+JwzDpCEMQx4UloM8zyOdTif3zudztNY7jog8DMMQpRRxHPPt5TCBAEZvxlyOFTsfykRRBICIlB2t9a21Nh3HMXEc8+d7VhJHWCwWyzcohdZaHBHpO46z6fs+IsLj94XECaD4unCHL8FsNouI/HRE5Nx13c3ZbIbWOnG5HKtl+53TSq7rIiLnand31wUGnU7HjEYjlFLJZN/3yRnL1FMYY8jlcmxtbd0AFel2u7dnZ2eXxpi9xWJBEASkUimstYgIQSSkUimKxSKVSgVjzN7p6emPJHL7+/s14KjX65WHwyGz2SxZbWNjg2q12gcOT05O2n9lFeDg4MAAr/4T8rfHx8dJyH8DvvbYGzKvWukAAAAASUVORK5CYII="),define("text!cockpit/ui/images/throbber.gif",[],"data:image/gif;base64,R0lGODlh3AATAPQAAP///wAAAL6+vqamppycnLi4uLKyssjIyNjY2MTExNTU1Nzc3ODg4OTk5LCwsLy8vOjo6Ozs7MrKyvLy8vT09M7Ozvb29sbGxtDQ0O7u7tbW1sLCwqqqqvj4+KCgoJaWliH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCgAAACwAAAAA3AATAAAF/yAgjmRpnmiqrmzrvnAsz3Rt33iu73zv/8CgcEgECAaEpHLJbDqf0Kh0Sq1ar9isdjoQtAQFg8PwKIMHnLF63N2438f0mv1I2O8buXjvaOPtaHx7fn96goR4hmuId4qDdX95c4+RG4GCBoyAjpmQhZN0YGYFXitdZBIVGAoKoq4CG6Qaswi1CBtkcG6ytrYJubq8vbfAcMK9v7q7D8O1ycrHvsW6zcTKsczNz8HZw9vG3cjTsMIYqQgDLAQGCQoLDA0QCwUHqfYSFw/xEPz88/X38Onr14+Bp4ADCco7eC8hQYMAEe57yNCew4IVBU7EGNDiRn8Z831cGLHhSIgdE/9chIeBgDoB7gjaWUWTlYAFE3LqzDCTlc9WOHfm7PkTqNCh54rePDqB6M+lR536hCpUqs2gVZM+xbrTqtGoWqdy1emValeXKwgcWABB5y1acFNZmEvXwoJ2cGfJrTv3bl69Ffj2xZt3L1+/fw3XRVw4sGDGcR0fJhxZsF3KtBTThZxZ8mLMgC3fRatCLYMIFCzwLEprg84OsDus/tvqdezZf13Hvr2B9Szdu2X3pg18N+68xXn7rh1c+PLksI/Dhe6cuO3ow3NfV92bdArTqC2Ebc3A8vjf5QWf15Bg7Nz17c2fj69+fnq+8N2Lty+fuP78/eV2X13neIcCeBRwxorbZrAxAJoCDHbgoG8RTshahQ9iSKEEzUmYIYfNWViUhheCGJyIP5E4oom7WWjgCeBBAJNv1DVV01MZdJhhjdkplWNzO/5oXI846njjVEIqR2OS2B1pE5PVscajkxhMycqLJgxQCwT40PjfAV4GqNSXYdZXJn5gSkmmmmJu1aZYb14V51do+pTOCmA00AqVB4hG5IJ9PvYnhIFOxmdqhpaI6GeHCtpooisuutmg+Eg62KOMKuqoTaXgicQWoIYq6qiklmoqFV0UoeqqrLbq6quwxirrrLTWauutJ4QAACH5BAkKAAAALAAAAADcABMAAAX/ICCOZGmeaKqubOu+cCzPdG3feK7vfO//wKBwSAQIBoSkcslsOp/QqHRKrVqv2Kx2OhC0BAXHx/EoCzboAcdhcLDdgwJ6nua03YZ8PMFPoBMca215eg98G36IgYNvDgOGh4lqjHd7fXOTjYV9nItvhJaIfYF4jXuIf4CCbHmOBZySdoOtj5eja59wBmYFXitdHhwSFRgKxhobBgUPAmdoyxoI0tPJaM5+u9PaCQZzZ9gP2tPcdM7L4tLVznPn6OQb18nh6NV0fu3i5OvP8/nd1qjwaasHcIPAcf/gBSyAAMMwBANYEAhWYQGDBhAyLihwYJiEjx8fYMxIcsGDAxVA/yYIOZIkBAaGPIK8INJlRpgrPeasaRPmx5QgJfB0abLjz50tSeIM+pFmUo0nQQIV+vRlTJUSnNq0KlXCSq09ozIFexEBAYkeNiwgOaEtn2LFpGEQsKCtXbcSjOmVlqDuhAx3+eg1Jo3u37sZBA9GoMAw4MB5FyMwfLht4sh7G/utPGHlYAV8Nz9OnOBz4c2VFWem/Pivar0aKCP2LFn2XwhnVxBwsPbuBAQbEGiIFg1BggoWkidva5z4cL7IlStfkED48OIYoiufYIH68+cKPkqfnsB58ePjmZd3Dj199/XE20tv6/27XO3S6z9nPCz9BP3FISDefL/Bt192/uWmAv8BFzAQAQUWWFaaBgqA11hbHWTIXWIVXifNhRlq6FqF1sm1QQYhdiAhbNEYc2KKK1pXnAIvhrjhBh0KxxiINlqQAY4UXjdcjSJyeAx2G2BYJJD7NZQkjCPKuCORKnbAIXsuKhlhBxEomAIBBzgIYXIfHfmhAAyMR2ZkHk62gJoWlNlhi33ZJZ2cQiKTJoG05Wjcm3xith9dcOK5X51tLRenoHTuud2iMnaolp3KGXrdBo7eKYF5p/mXgJcogClmcgzAR5gCKymXYqlCgmacdhp2UCqL96mq4nuDBTmgBasaCFp4sHaQHHUsGvNRiiGyep1exyIra2mS7dprrtA5++z/Z8ZKYGuGsy6GqgTIDvupRGE+6CO0x3xI5Y2mOTkBjD4ySeGU79o44mcaSEClhglgsKyJ9S5ZTGY0Bnzrj+3SiKK9Rh5zjAALCywZBk/ayCWO3hYM5Y8Dn6qxxRFsgAGoJwwgDQRtYXAAragyQOmaLKNZKGaEuUlpyiub+ad/KtPqpntypvvnzR30DBtjMhNodK6Eqrl0zU0/GjTUgG43wdN6Ra2pAhGtAAZGE5Ta8TH6wknd2IytNKaiZ+Or79oR/tcvthIcAPe7DGAs9Edwk6r3qWoTaNzY2fb9HuHh2S343Hs1VIHhYtOt+Hh551rh24vP5YvXSGzh+eeghy76GuikU9FFEainrvrqrLfu+uuwxy777LTXfkIIACH5BAkKAAAALAAAAADcABMAAAX/ICCOZGmeaKqubOu+cCzPdG3feK7vfO//wKBwSAQIBoSkcslsOp/QqHRKrVqv2Kx2OhC0BAWHB2l4CDZo9IDjcBja7UEhTV+3DXi3PJFA8xMcbHiDBgMPG31pgHBvg4Z9iYiBjYx7kWocb26OD398mI2EhoiegJlud4UFiZ5sm6Kdn2mBr5t7pJ9rlG0cHg5gXitdaxwFGArIGgoaGwYCZ3QFDwjU1AoIzdCQzdPV1c0bZ9vS3tUJBmjQaGXl1OB0feze1+faiBvk8wjnimn55e/o4OtWjp+4NPIKogsXjaA3g/fiGZBQAcEAFgQGOChgYEEDCCBBLihwQILJkxIe/3wMKfJBSQkJYJpUyRIkgwcVUJq8QLPmTYoyY6ZcyfJmTp08iYZc8MBkhZgxk9aEcPOlzp5FmwI9KdWn1qASurJkClRoWKwhq6IUqpJBAwQEMBYroAHkhLt3+RyzhgCDgAV48Wbgg+waAnoLMgTOm6DwQ8CLBzdGdvjw38V5JTg2lzhyTMeUEwBWHPgzZc4TSOM1bZia6LuqJxCmnOxv7NSsl1mGHHiw5tOuIWeAEHcFATwJME/ApgFBc3MVLEgPvE+Ddb4JokufPmFBAuvPXWu3MIF89wTOmxvOvp179evQtwf2nr6aApPyzVd3jn089e/8xdfeXe/xdZ9/d1ngHf98lbHH3V0LMrgPgsWpcFwBEFBgHmyNXWeYAgLc1UF5sG2wTHjIhNjBiIKZCN81GGyQwYq9uajeMiBOQGOLJ1KjTI40kmfBYNfc2NcGIpI4pI0vyrhjiT1WFqOOLEIZnjVOVpmajYfBiCSNLGbA5YdOkjdihSkQwIEEEWg4nQUmvYhYe+bFKaFodN5lp3rKvJYfnBKAJ+gGDMi3mmbwWYfng7IheuWihu5p32XcSWdSj+stkF95dp64jJ+RBipocHkCCp6PCiRQ6INookCAAwy0yd2CtNET3Yo7RvihBjFZAOaKDHT43DL4BQnsZMo8xx6uI1oQrHXXhHZrB28G62n/YSYxi+uzP2IrgbbHbiaer7hCiOxDFWhrbmGnLVuus5NFexhFuHLX6gkEECorlLpZo0CWJG4pLjIACykmBsp0eSSVeC15TDJeUhlkowlL+SWLNJpW2WEF87urXzNWSZ6JOEb7b8g1brZMjCg3ezBtWKKc4MvyEtwybPeaMAA1ECRoAQYHYLpbeYYCLfQ+mtL5c9CnfQpYpUtHOSejEgT9ogZ/GSqd0f2m+LR5WzOtHqlQX1pYwpC+WbXKqSYtpJ5Mt4a01lGzS3akF60AxkcTaLgAyRBPWCoDgHfJqwRuBuzdw/1ml3iCwTIeLUWJN0v4McMe7uasCTxseNWPSxc5RbvIgD7geZLbGrqCG3jepUmbbze63Y6fvjiOylbwOITPfIHEFsAHL/zwxBdvPBVdFKH88sw37/zz0Ecv/fTUV2/99SeEAAAh+QQJCgAAACwAAAAA3AATAAAF/yAgjmRpnmiqrmzrvnAsz3Rt33iu73zv/8CgcEgECAaEpHLJbDqf0Kh0Sq1ar9isdjoQtAQFh2cw8BQEm3T6yHEYHHD4oKCuD9qGvNsxT6QTgAkcHHmFeX11fm17hXwPG35qgnhxbwMPkXaLhgZ9gWp3bpyegX4DcG+inY+Qn6eclpiZkHh6epetgLSUcBxlD2csXXdvBQrHGgoaGhsGaIkFDwjTCArTzX+QadHU3c1ofpHc3dcGG89/4+TYktvS1NYI7OHu3fEJ5tpqBu/k+HX7+nXDB06SuoHm0KXhR65cQT8P3FRAMIAFgVMPwDCAwLHjggIHJIgceeFBg44eC/+ITCCBZYKSJ1FCWPBgpE2YMmc+qNCypwScMmnaXAkUJYOaFVyKLOqx5tCXJnMelcBzJNSYKIX2ZPkzqsyjPLku9Zr1QciVErYxaICAgEUOBRJIgzChbt0MLOPFwyBggV27eCUcmxZvg9+/dfPGo5bg8N/Ag61ZM4w4seDF1fpWhizZmoa+GSortgcaMWd/fkP/HY0MgWbTipVV++wY8GhvqSG4XUEgoYTKE+Qh0OCvggULiBckWEZ4Ggbjx5HXVc58IPQJ0idQJ66XanTpFraTe348+XLizRNcz658eHMN3rNPT+C+G/nodqk3t6a+fN3j+u0Xn3nVTQPfdRPspkL/b+dEIN8EeMm2GAYbTNABdrbJ1hyFFv5lQYTodSZABhc+loCEyhxTYYkZopdMMiNeiBxyIFajV4wYHpfBBspUl8yKHu6ooV5APsZjQxyyeNeJ3N1IYod38cgdPBUid6GCKfRWgAYU4IccSyHew8B3doGJHmMLkGkZcynKk2Z50Ym0zJzLbDCmfBbI6eIyCdyJmJmoqZmnBAXy9+Z/yOlZDZpwYihnj7IZpuYEevrYJ5mJEuqiof4l+NYDEXQpXQcMnNjZNDx1oGqJ4S2nF3EsqWrhqqVWl6JIslpAK5MaIqDeqjJq56qN1aTaQaPbHTPYr8Be6Gsyyh6Da7OkmmqP/7GyztdrNVQBm5+pgw3X7aoYKhfZosb6hyUKBHCgQKij1rghkOAJuZg1SeYIIY+nIpDvf/sqm4yNG5CY64f87qdAwSXKGqFkhPH1ZHb2EgYtw3bpKGVkPz5pJAav+gukjB1UHE/HLNJobWcSX8jiuicMMBFd2OmKwQFs2tjXpDfnPE1j30V3c7iRHlrzBD2HONzODyZtsQJMI4r0AUNaE3XNHQw95c9GC001MpIxDacFQ+ulTNTZlU3O1eWVHa6vb/pnQUUrgHHSBKIuwG+bCPyEqbAg25gMVV1iOB/IGh5YOKLKIQ6xBAcUHmzjIcIqgajZ+Ro42DcvXl7j0U4WOUd+2IGu7DWjI1pt4DYq8BPm0entuGSQY/4tBi9Ss0HqfwngBQtHbCH88MQXb/zxyFfRRRHMN+/889BHL/301Fdv/fXYZ39CCAAh+QQJCgAAACwAAAAA3AATAAAF/yAgjmRpnmiqrmzrvnAsz3Rt33iu73zv/8CgcEgECAaEpHLJbDqf0Kh0Sq1ar9isdjoQtAQFh2fAKXsKm7R6Q+Y43vABep0mGwwOPH7w2CT+gHZ3d3lyagl+CQNvg4yGh36LcHoGfHR/ZYOElQ9/a4ocmoRygIiRk5p8pYmZjXePaYBujHoOqp5qZHBlHAUFXitddg8PBg8KGsgayxvGkAkFDwgICtPTzX2mftHW3QnOpojG3dbYkNjk1waxsdDS1N7ga9zw1t/aifTk35fu6Qj3numL14fOuHTNECHqU4DDgQEsCCwidiHBAwYQMmpcUOCAhI8gJVzUuLGThAQnP/9abEAyI4MCIVOKZNnyJUqUJxNcGNlywYOQgHZirGkSJ8gHNEky+AkS58qWEJYC/bMzacmbQHkqNdlUJ1KoSz2i9COhmQYCEXtVrCBgwYS3cCf8qTcNQ9u4cFFOq2bPLV65Cf7dxZthbjW+CgbjnWtNgWPFcAsHdoxgWWK/iyV045sAc2S96SDn1exYw17REwpLQEYt2eW/qtPZRQAB7QoC61RW+GsBwYZ/CXb/XRCYLsAKFizEtUAc+G7lcZsjroscOvTmsoUvx15PwccJ0N8yL17N9PG/E7jv9S4hOV7pdIPDdZ+ePDzv2qMXn2b5+wTbKuAWnF3oZbABZY0lVmD/ApQd9thybxno2GGuCVDggaUpoyBsB1bGGgIYbJCBcuFJiOAyGohIInQSmmdeiBnMF2GHfNUlIoc1rncjYRjW6NgGf3VQGILWwNjBfxEZcAFbC7gHXQcfUYOYdwzQNxo5yUhQZXhvRYlMeVSuSOJHKJa5AQMQThBlZWZ6Bp4Fa1qzTAJbijcBlJrtxeaZ4lnnpZwpukWieGQmYx5ATXIplwTL8DdNZ07CtWYybNIJF4Ap4NZHe0920AEDk035kafieQrqXofK5ympn5JHKYjPrfoWcR8WWQGp4Ul32KPVgXdnqxM6OKqspjIYrGPDrlrsZtRIcOuR86nHFwbPvmes/6PH4frrqbvySh+mKGhaAARPzjjdhCramdoGGOhp44i+zogBkSDuWC5KlE4r4pHJkarXrj++Raq5iLmWLlxHBteavjG+6amJrUkJJI4Ro5sBv9AaOK+jAau77sbH7nspCwNIYIACffL7J4JtWQnen421nNzMcB6AqpRa9klonmBSiR4GNi+cJZpvwgX0ejj71W9yR+eIgaVvQgf0l/A8nWjUFhwtZYWC4hVnkZ3p/PJqNQ5NnwUQrQCGBBBMQIGTtL7abK+5JjAv1fi9bS0GLlJHgdjEgYzzARTwC1fgEWdJuKKBZzj331Y23qB3i9v5aY/rSUC4w7PaLeWXmr9NszMFoN79eeiM232o33EJAIzaSGwh++y012777bhT0UURvPfu++/ABy/88MQXb/zxyCd/QggAIfkECQoAAAAsAAAAANwAEwAABf8gII5kaZ5oqq5s675wLM90bd94ru987//AoHBIBAgGhKRyyWw6n9CodEqtWq/YrHY6ELQEBY5nwCk7xIWNer0hO95wziC9Ttg5b4ND/+Y87IBqZAaEe29zGwmJigmDfHoGiImTjXiQhJEPdYyWhXwDmpuVmHwOoHZqjI6kZ3+MqhyemJKAdo6Ge3OKbEd4ZRwFBV4rc4MPrgYPChrMzAgbyZSJBcoI1tfQoYsJydfe2amT3d7W0OGp1OTl0YtqyQrq0Lt11PDk3KGoG+nxBpvTD9QhwCctm0BzbOyMIwdOUwEDEgawIOCB2oMLgB4wgMCx44IHBySIHClBY0ePfyT/JCB5weRJCAwejFw58kGDlzBTqqTZcuPLmCIBiWx58+VHmiRLFj0JVCVLl0xl7qSZwCbOo0lFWv0pdefQrVFDJtr5gMBEYBgxqBWwYILbtxPsqMPAFu7blfa81bUbN4HAvXAzyLWnoDBguHIRFF6m4LBbwQngMYPXuC3fldbyPrMcGLM3w5wRS1iWWUNlvnElKDZtz/EEwaqvYahQoexEfyILi4RrYYKFZwJ3810QWZ2ECrx9Ew+O3K6F5Yq9zXbb+y30a7olJJ+wnLC16W97Py+uwdtx1NcLWzs/3G9e07stVPc9kHJ0BcLtQp+c3ewKAgYkUAFpCaAmmHqKLSYA/18WHEiZPRhsQF1nlLFWmIR8ZbDBYs0YZuCGpGXWmG92aWiPMwhEOOEEHXRwIALlwXjhio+BeE15IzpnInaLbZBBhhti9x2GbnVQo2Y9ZuCfCgBeMCB+DJDIolt4iVhOaNSJdCOBUfIlkmkyMpPAAvKJ59aXzTQzJo0WoJnmQF36Jp6W1qC4gWW9GZladCiyJd+KnsHImgRRVjfnaDEKuiZvbcYWo5htzefbl5LFWNeSKQAo1QXasdhiiwwUl2B21H3aQaghXnPcp1NagCqYslXAqnV+zYWcpNwVp9l5eepJnHqL4SdBi56CGlmw2Zn6aaiZjZqfb8Y2m+Cz1O0n3f+tnvrGbF6kToApCgAWoNWPeh754JA0vmajiAr4iOuOW7abQXVGNriBWoRdOK8FxNqLwX3oluubhv8yluRbegqGb536ykesuoXhyJqPQJIGbLvQhkcwjKs1zBvBwSZIsbcsDCCBAAf4ya+UEhyQoIiEJtfoZ7oxUOafE2BwgMWMqUydfC1LVtiArk0QtGkWEopzlqM9aJrKHfw5c6wKjFkmXDrbhwFockodtMGFLWpXy9JdiXN1ZDNszV4WSLQCGBKoQYHUyonqrHa4ErewAgMmcAAF7f2baIoVzC2p3gUvJtLcvIWqloy6/R04mIpLwDhciI8qLOB5yud44pHPLbA83hFDWPjNbuk9KnySN57Av+TMBvgEAgzzNhJb5K777rz37vvvVHRRxPDEF2/88cgnr/zyzDfv/PPQnxACACH5BAkKAAAALAAAAADcABMAAAX/ICCOZGmeaKqubOu+cCzPdG3feK7vfO//wKBwSAQIBoSkcslsOp/QqHRKrVqv2Kx2OhC0BIUCwcMpO84OT2HDbm8GHLQjnn6wE3g83SA3DB55G3llfHxnfnZ4gglvew6Gf4ySgmYGlpCJknochWiId3kJcZZyDn93i6KPl4eniopwq6SIoZKxhpenbhtHZRxhXisDopwPgHkGDxrLGgjLG8mC0gkFDwjX2AgJ0bXJ2djbgNJsAtbfCNB2oOnn6MmKbeXt226K1fMGi6j359D69ua+QZskjd+3cOvY9XNgp4ABCQNYEDBl7EIeCQkeMIDAseOCBwckiBSZ4ILGjh4B/40kaXIjSggMHmBcifHky5gYE6zM2OAlzGM6Z5rs+fIjTZ0tfcYMSlLCUJ8fL47kCVXmTjwPiKJkUCDnyqc3CxzQmYeAxAEGLGJYiwCDgAUT4sqdgOebArdw507IUNfuW71xdZ7DC5iuhGsKErf9CxhPYgUaEhPWyzfBMgUIJDPW6zhb5M1y+R5GjFkBaLmCM0dOfHqvztXYJnMejaFCBQlmVxAYsEGkYnQV4lqYMNyCtnYSggNekAC58uJxmTufW5w55mwKkg+nLp105uTC53a/nhg88fMTmDfDVl65Xum/IZt/3/zaag3a5W63nll1dvfiWbaaZLmpQIABCVQA2f9lAhTG112PQWYadXE9+FtmEwKWwQYQJrZagxomsOCAGVImInsSbpCBhhwug6KKcXXQQYUcYuDMggrASFmNzjjzzIrh7cUhhhHqONeGpSEW2QYxHsmjhxpgUGAKB16g4IIbMNCkXMlhaJ8GWVJo2I3NyKclYF1GxgyYDEAnXHJrMpNAm/rFBSczPiYAlwXF8ZnmesvoOdyMbx7m4o0S5LWdn4bex2Z4xYmEzaEb5EUcnxbA+WWglqIn6aHPTInCgVbdlZyMqMrIQHMRSiaBBakS1903p04w434n0loBoQFOt1yu2YAnY68RXiNsqh2s2qqxuyKb7Imtmgcrqsp6h8D/fMSpapldx55nwayK/SfqCQd2hcFdAgDp5GMvqhvakF4mZuS710WGIYy30khekRkMu92GNu6bo7r/ttjqwLaua5+HOdrKq5Cl3dcwi+xKiLBwwwom4b0E6xvuYyqOa8IAEghwQAV45VvovpkxBl2mo0W7AKbCZXoAhgMmWnOkEqx2JX5nUufbgJHpXCfMOGu2QAd8eitpW1eaNrNeMGN27mNz0swziYnpSbXN19gYtstzfXrdYjNHtAIYGFVwwAEvR1dfxdjKxVzAP0twAAW/ir2w3nzTd3W4yQWO3t0DfleB4XYnEHCEhffdKgaA29p0eo4fHLng9qoG+OVyXz0gMeWGY7qq3xhiRIEAwayNxBawxy777LTXbjsVXRSh++689+7778AHL/zwxBdv/PEnhAAAIfkECQoAAAAsAAAAANwAEwAABf8gII5kaZ5oqq5s675wLM90bd94ru987//AoHBIBAgGhKRyyWw6n9CodEqtWq/YrHY6ELQEhYLD4BlwHGg0ubBpuzdm9Dk9eCTu+MTZkDb4PXYbeIIcHHxqf4F3gnqGY2kOdQmCjHCGfpCSjHhmh2N+knmEkJmKg3uHfgaaeY2qn6t2i4t7sKAPbwIJD2VhXisDCQZgDrKDBQ8aGgjKyhvDlJMJyAjV1gjCunkP1NfVwpRtk93e2ZVt5NfCk27jD97f0LPP7/Dr4pTp1veLgvrx7AL+Q/BM25uBegoYkDCABYFhEobhkUBRwoMGEDJqXPDgQMUEFC9c1LjxQUUJICX/iMRIEgIDkycrjmzJMSXFlDNJvkwJsmdOjQwKfDz5M+PLoSGLQqgZU6XSoB/voHxawGbFlS2XGktAwKEADB0xiEWAodqGBRPSqp1wx5qCamDRrp2Qoa3bagLkzrULF4GCvHPTglRAmKxZvWsHayBcliDitHUlvGWM97FgCdYWVw4c2e/kw4HZJlCwmDBhwHPrjraGYTHqtaoxVKggoesKAgd2SX5rbUMFCxOAC8cGDwHFwBYWJCgu4XfwtcqZV0grPHj0u2SnqwU+IXph3rK5b1fOu7Bx5+K7L6/2/Xhg8uyXnQ8dvfRiDe7TwyfNuzlybKYpgIFtKhAgwEKkKcOf/wChZbBBgMucRh1so5XH3wbI1WXafRJy9iCErmX4IWHNaIAhZ6uxBxeGHXQA24P3yYfBBhmgSBozESpwongWOBhggn/N1aKG8a1YY2oVAklgCgQUUwGJ8iXAgItrWUARbwpqIOWEal0ZoYJbzmWlZCWSlsAC6VkwZonNbMAAl5cpg+NiZwpnJ0Xylegmlc+tWY1mjnGnZnB4QukMA9UJRxGOf5r4ppqDjjmnfKilh2ejGiyJAgF1XNmYbC2GmhZ5AcJVgajcXecNqM9Rx8B6bingnlotviqdkB3YCg+rtOaapFsUhSrsq6axJ6sEwoZK7I/HWpCsr57FBxJ1w8LqV/81zbkoXK3LfVeNpic0KRQG4NHoIW/XEmZuaiN6tti62/moWbk18uhjqerWS6GFpe2YVotskVssWfBOAHACrZHoWcGQwQhlvmsdXBZ/F9YLMF2jzUuYBP4a7CLCnoEHrgkDSCDAARUILAGaVVqAwQHR8pZXomm9/ONhgjrbgc2lyYxmpIRK9uSNjrXs8gEbTrYyl2ryTJmsLCdKkWzFQl1lWlOXGmifal6p9VnbQfpyY2SZyXKVV7JmZkMrgIFSyrIeUJ2r7YKnXdivUg1kAgdQ8B7IzJjGsd9zKSdwyBL03WpwDGxwuOASEP5vriO2F3nLjQdIrpaRDxqcBdgIHGA74pKrZXiR2ZWuZt49m+o3pKMC3p4Av7SNxBa456777rz37jsVXRQh/PDEF2/88cgnr/zyzDfv/PMnhAAAIfkECQoAAAAsAAAAANwAEwAABf8gII5kaZ5oqq5s675wLM90bd94ru987//AoHBIBAgGhKRyyWw6n9CodEqtWq/YrHY6ELQEhYLDUPAMHGi0weEpbN7wI8cxTzsGj4R+n+DUxwaBeBt7hH1/gYIPhox+Y3Z3iwmGk36BkIN8egOIl3h8hBuOkAaZhQlna4BrpnyWa4mleZOFjrGKcXoFA2ReKwMJBgISDw6abwUPGggazc0bBqG0G8kI1tcIwZp51djW2nC03d7BjG8J49jl4cgP3t/RetLp1+vT6O7v5fKhAvnk0UKFogeP3zmCCIoZkDCABQFhChQYuKBHgkUJkxpA2MhxQYEDFhNcvPBAI8eNCx7/gMQYckPJkxsZPLhIM8FLmDJrYiRp8mTKkCwT8IQJwSPQkENhpgQpEunNkzlpWkwKdSbGihKocowqVSvKWQkIOBSgQOYFDBgQpI0oYMGEt3AzTLKm4BqGtnDjirxW95vbvG/nWlub8G9euRsiqqWLF/AEkRoiprX2wLDeDQgkW9PQGLDgyNc665WguK8C0XAnRY6oGPUEuRLsgk5g+a3cCxUqSBC7gsCBBXcVq6swwULx4hayvctGPK8FCwsSLE9A3Hje6NOrHzeOnW695sffRi/9HfDz7sIVSNB+XXrmugo0rHcM3X388o6jr44ceb51uNjF1xcC8zk3wXiS8aYC/wESaLABBs7ch0ECjr2WAGvLsLZBeHqVFl9kGxooV0T81TVhBo6NiOEyJ4p4IYnNRBQiYCN6x4wCG3ZAY2If8jXjYRcyk2FmG/5nXAY8wqhWAii+1YGOSGLoY4VRfqiAgikwmIeS1gjAgHkWYLQZf9m49V9gDWYWY5nmTYCRM2TS5pxxb8IZGV5nhplmhJyZadxzbrpnZ2d/6rnZgHIid5xIMDaDgJfbLdrgMkKW+Rygz1kEZz1mehabkBpgiQIByVikwGTqVfDkk2/Vxxqiqur4X3fksHccre8xlxerDLiHjQIVUAgXr77yFeyuOvYqXGbMrbrqBMqaFpFFzhL7qv9i1FX7ZLR0LUNdcc4e6Cus263KbV+inkAAHhJg0BeITR6WmHcaxhvXg/AJiKO9R77ILF1FwmVdAu6WBu+ZFua72mkZWMfqBElKu0G8rFZ5n4ATp5jkmvsOq+Nj7u63ZMMPv4bveyYy6fDH+C6brgnACHBABQUrkGirz2FwAHnM4Mmhzq9yijOrOi/MKabH6VwBiYwZdukEQAvILKTWXVq0ZvH5/CfUM7M29Zetthp1eht0eqkFYw8IKXKA6mzXfTeH7fZg9zW0AhgY0TwthUa6Ch9dBeIsbsFrYkRBfgTfiG0FhwMWnbsoq3cABUYOnu/ejU/A6uNeT8u4wMb1WnBCyJJTLjjnr8o3OeJrUcpc5oCiPqAEkz8tXuLkPeDL3Uhs4fvvwAcv/PDEU9FFEcgnr/zyzDfv/PPQRy/99NRXf0IIACH5BAkKAAAALAAAAADcABMAAAX/ICCOZGmeaKqubOu+cCzPdG3feK7vfO//wKBwSAQIBoSkcslsOp/QqHRKrVqv2Kx2OhC0BIWCw/AoDziOtCHt8BQ28PjmzK57Hom8fo42+P8DeAkbeYQcfX9+gYOFg4d1bIGEjQmPbICClI9/YwaLjHAJdJeKmZOViGtpn3qOqZineoeJgG8CeWUbBV4rAwkGAhIVGL97hGACGsrKCAgbBoTRhLvN1c3PepnU1s2/oZO6AtzdBoPf4eMI3tIJyOnF0YwFD+nY8e3z7+Xfefnj9uz8cVsXCh89axgk7BrAggAwBQsYIChwQILFixIeNIDAseOCBwcSXMy2sSPHjxJE/6a0eEGjSY4MQGK86PIlypUJEmYsaTKmyJ8JW/Ls6HMkzaEn8YwMWtPkx4pGd76E4DMPRqFTY860OGhogwYagBFoKEABA46DEGBAoEBB0AUT4sqdIFKBNbcC4M6dkEEk22oYFOTdG9fvWrtsBxM23MytYL17666t9phwXwlum2lIDHmuSA2IGyuOLOHv38qLMbdFjHruZbWgRXeOe1nC2BUEDiyAMMHZuwoTLAQX3nvDOAUW5Vogru434d4JnAsnPmFB9NBshQXfa9104+Rxl8e13rZxN+CEydtVsFkd+vDjE7C/q52wOvb4s7+faz025frbxefWbSoQIAEDEUCwgf9j7bUlwHN9ZVaegxDK1xYzFMJH24L5saXABhlYxiEzHoKoIV8LYqAMaw9aZqFmJUK4YHuNfRjiXhmk+NcyJgaIolvM8BhiBx3IleN8lH1IWAcRgkZgCgYiaBGJojGgHHFTgtagAFYSZhF7/qnTpY+faVlNAnqJN0EHWa6ozAZjBtgmmBokwMB01LW5jAZwbqfmlNips4B4eOqJgDJ2+imXRZpthuigeC6XZTWIxilXmRo8iYKBCwiWmWkJVEAkfB0w8KI1IvlIpKnOkVpqdB5+h96o8d3lFnijrgprjbfGRSt0lH0nAZG5vsprWxYRW6Suq4UWqrLEsspWg8Io6yv/q6EhK0Fw0GLbjKYn5CZYBYht1laPrnEY67kyrhYbuyceiR28Pso7bYwiXjihjWsWuWF5p/H765HmNoiur3RJsGKNG/jq748XMrwmjhwCfO6QD9v7LQsDxPTAMKsFpthyJCdkmgYiw0VdXF/Om9dyv7YMWGXTLYpZg5wNR11C78oW3p8HSGgul4qyrJppgllJHJZHn0Y0yUwDXCXUNquFZNLKyYXBAVZvxtAKYIQEsmPgDacr0tltO1y/DMwYpkgUpJfTasLGzd3cdCN3gN3UWRcY3epIEPevfq+3njBxq/kqBoGBduvea8f393zICS63ivRBTqgFpgaWZEIUULdcK+frIfAAL2AjscXqrLfu+uuwx05FF0XUbvvtuOeu++689+7778AHL/wJIQAAOwAAAAAAAAAAAA==")
\ No newline at end of file
-- 
GitLab


From 7250dc4e98ecccb1688f3d16f04b55de7122c3a7 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sun, 1 Jan 2012 16:58:51 -0500
Subject: [PATCH 118/546] Fix updateApp() and add extra check to updateApps()

---
 lib/app.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index 2e03db6c8d2..cc1b8041c9d 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -372,9 +372,11 @@ class OC_App{
 		foreach( $apps as $app ){
 			$installedVersion=OC_Appconfig::getValue($app,'installed_version');
 			$appInfo=OC_App::getAppInfo($app);
-			$currentVersion=$appInfo['version'];
-			if (version_compare($currentVersion, $installedVersion, '>')) {
-				OC_App::updateApp($app);
+			if (isset($appInfo['version'])) {
+				$currentVersion=$appInfo['version'];
+				if (version_compare($currentVersion, $installedVersion, '>')) {
+					OC_App::updateApp($app);
+				}
 			}
 		}
 	}
@@ -384,11 +386,11 @@ class OC_App{
 	 * @param string appid
 	 */
 	public static function updateApp($appid){
-		if(file_exists(OC::$SERVERROOT.'/apps/'.$file.'/appinfo/database.xml')){
-			OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/apps/'.$file.'/appinfo/database.xml');
+		if(file_exists(OC::$SERVERROOT.'/apps/'.$appid.'/appinfo/database.xml')){
+			OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/apps/'.$appid.'/appinfo/database.xml');
 		}
-		if(file_exists(OC::$SERVERROOT.'/apps/'.$file.'/appinfo/update.php')){
-			include OC::$SERVERROOT.'/apps/'.$file.'/appinfo/update.php';
+		if(file_exists(OC::$SERVERROOT.'/apps/'.$appid.'/appinfo/update.php')){
+			include OC::$SERVERROOT.'/apps/'.$appid.'/appinfo/update.php';
 		}
 	}
 }
-- 
GitLab


From a22b5feda6cf0dc4a4349f266371f95e91b62757 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sun, 1 Jan 2012 17:05:22 -0500
Subject: [PATCH 119/546] Initial commit of common filestorage

---
 lib/filestoragecommon.php | 83 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 lib/filestoragecommon.php

diff --git a/lib/filestoragecommon.php b/lib/filestoragecommon.php
new file mode 100644
index 00000000000..35a926ecb07
--- /dev/null
+++ b/lib/filestoragecommon.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+* ownCloud
+*
+* @author Michael Gapczynski
+* @copyright 2012 Michael Gapczynski GapczynskiM@gmail.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class OC_Filestorage_Common extends OC_Filestorage {
+
+	public function __construct($parameters){}
+	public function mkdir($path){}
+	public function rmdir($path){}
+	public function opendir($path){}
+	public function is_dir($path){}
+	public function is_file($path){}
+	public function stat($path){}
+	public function filetype($path){}
+	public function filesize($path) {
+		$stat = $this->stat($path);
+		return $stat['size'];
+	}
+	public function is_readable($path){}
+	public function is_writeable($path){}
+	public function file_exists($path){}
+	public function readfile($path) {
+		$handle = $this->fopen($path, "r");
+		$chunk = 1024;
+		while (!feof($handle)) {
+			echo fread($handle, $chunk);
+		}
+		return $this->filesize($path);
+	}
+	public function filectime($path) {
+		$stat = $this->stat($path);
+		return $stat['ctime'];
+	}
+	public function filemtime($path) {
+		$stat = $this->stat($path);
+		return $stat['mtime'];
+	}
+	public function fileatime($path) {
+		$stat = $this->stat($path);
+		return $stat['atime'];
+	}
+	public function file_get_contents($path) {
+		$handle = $this->fopen($path, "r");
+		return fread($handle, $this->filesize($path));
+	}
+	public function file_put_contents($path,$data) {
+		$handle = $this->fopen($path, "w");
+		return fwrite($handle, $data);
+	}
+	public function unlink($path){}
+	public function rename($path1,$path2){}
+	public function copy($path1,$path2) {
+		$data = $this->file_get_contents($path1);
+		return $this->file_put_contents($path2, $data);
+	}
+	public function fopen($path,$mode){}
+	public function toTmpFile($path){}
+	public function fromTmpFile($tmpPath,$path){}
+	public function fromUploadedFile($tmpPath,$path){}
+	public function getMimeType($path){}
+	public function hash($type,$path,$raw){}
+	public function free_space($path){}
+	public function search($query){}
+	public function getLocalFile($path){}
+}
-- 
GitLab


From 312e7993bb8edf95a746e62d9b3816d3a0e62fad Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 1 Jan 2012 23:26:24 +0100
Subject: [PATCH 120/546] Added image type specific loading and displaying.
 Added method 'valid()' to tell if image contains a valid resource. Renamed
 imageResource() to resource().

---
 lib/image.php | 139 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 128 insertions(+), 11 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index 0e1d1ee327f..b23e3507c34 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -21,6 +21,18 @@
 *
 */
 
+/** From user comments at http://dk2.php.net/manual/en/function.exif-imagetype.php
+ * Don't know if it can come in handy?
+if ( ! function_exists( 'exif_imagetype' ) ) {
+    function exif_imagetype ( $filename ) {
+        if ( ( list($width, $height, $type, $attr) = getimagesize( $filename ) ) !== false ) {
+            return $type;
+        }
+    return false;
+    }
+}
+*/
+
 /**
  * Class for image manipulation
  * Ideas: imagerotate, chunk_split(base64_encode())
@@ -29,6 +41,7 @@
 class OC_Image {
 	static private $resource = false; // tmp resource.
 	static private $destroy = false; // if the resource is created withing the object.
+	static private $imagetype = IMAGETYPE_PNG; // Default to png if file type isn't evident.
 	/**
 	* @brief Constructor.
 	* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
@@ -50,26 +63,69 @@ class OC_Image {
 	* @brief Destructor.
 	*/
 	function __destruct() {
-		if(self::$resource && self::$destroy) {
+		if(is_resource(self::$resource) && self::$destroy) {
 			imagedestroy(self::$resource); // Why does this issue a warning.
 		}
 	}
 
 	/**
 	* @brief Determine whether the object contains an image resource.
-	* returns bool
+	* @returns bool
 	*/
-	function empty() {
-		if(self::$resource && self::$destroy) {
-		}
+	public function valid() { // apparently you can't name a method 'empty'...
+		$ret = is_resource(self::$resource);
+		return $ret;
+	}
+
+	/**
+	* @brief Returns the MIME type of the image or an empty string if no image is loaded.
+	* @returns int
+	*/
+	public function mimeType() {
+		return is_resource(self::$resource) ? image_type_to_mime_type(self::$imagetype) : '';
+	}
+
+	/**
+	* @brief Returns the width of the image or -1 if no image is loaded.
+	* @returns int
+	*/
+	public function width() {
+		return is_resource(self::$resource) ? imagesx(self::$resource) : -1;
+	}
+
+	/**
+	* @brief Returns the height of the image or -1 if no image is loaded.
+	* @returns int
+	*/
+	public function height() {
+		return is_resource(self::$resource) ? imagesy(self::$resource) : -1;
 	}
 
 	/**
 	* @brief Prints the image.
 	*/
 	public function show() {
-		header('Content-Type: image/png');
-		imagepng(self::$resource);
+		header('Content-Type: '.self::mimeType());
+		switch(self::$imagetype) {
+			case IMAGETYPE_GIF:
+				imagegif(self::$resource);
+				break;
+			case IMAGETYPE_JPEG:
+				imagepng(self::$resource);
+				break;
+			case IMAGETYPE_PNG:
+				imagejpeg(self::$resource);
+				break;
+			case IMAGETYPE_XBM:
+				imagexbm(self::$resource);
+				break;
+			case IMAGETYPE_WBMP:
+			case IMAGETYPE_BMP:
+				imagewbmp(self::$resource);
+				break;
+			default:
+				imagepng(self::$resource);
+		}
 	}
 
 	/**
@@ -82,7 +138,7 @@ class OC_Image {
 	/**
 	* @returns Returns the image resource in any.
 	*/
-	public function imageResource() {
+	public function resource() {
 		return self::$resource;
 	}
 
@@ -126,11 +182,72 @@ class OC_Image {
 	*/
 	static public function loadFromFile($imagepath=false) {
 		if(!is_file($imagepath) || !file_exists($imagepath) || !is_readable($imagepath)) {
-			OC_Log::write('core','OC_Image::loadFromFile, couldn\'t load'.$imagepath, OC_Log::DEBUG);
+			OC_Log::write('core','OC_Image::loadFromFile, couldn\'t load', OC_Log::DEBUG);
 			return false;
 		}
-		self::$resource = imagecreatefromstring(file_get_contents($imagepath));
-		self::$destroy = true;
+		$itype = exif_imagetype($imagepath);
+		switch($itype) {
+			case IMAGETYPE_GIF:
+				if (imagetypes() & IMG_GIF) {
+					self::$resource = imagecreatefromgif($imagepath);
+				}
+				break;
+			case IMAGETYPE_JPEG:
+				if (imagetypes() & IMG_JPG) {
+					self::$resource = imagecreatefromjpeg($imagepath);
+				}
+				break;
+			case IMAGETYPE_PNG:
+				if (imagetypes() & IMG_PNG) {
+					self::$resource = imagecreatefrompng($imagepath);
+				}
+				break;
+			case IMAGETYPE_XBM:
+				if (imagetypes() & IMG_XPM) {
+					self::$resource = imagecreatefromxbm($imagepath);
+				}
+				break;
+			case IMAGETYPE_WBMP:
+			case IMAGETYPE_BMP:
+				if (imagetypes() & IMG_WBMP) {
+					self::$resource = imagecreatefromwbmp($imagepath);
+				}
+				break;
+			/*
+			case IMAGETYPE_TIFF_II: // (intel byte order)
+				break;
+			case IMAGETYPE_TIFF_MM: // (motorola byte order)
+				break;
+			case IMAGETYPE_JPC:
+				break;
+			case IMAGETYPE_JP2:
+				break;
+			case IMAGETYPE_JPX:
+				break;
+			case IMAGETYPE_JB2:
+				break;
+			case IMAGETYPE_SWC:
+				break;
+			case IMAGETYPE_IFF:
+				break;
+			case IMAGETYPE_ICO:
+				break;
+			case IMAGETYPE_SWF:
+				break;
+			case IMAGETYPE_PSD:
+				break;
+			*/
+			default:
+				self::$resource = imagecreatefromstring(file_get_contents($imagepath));
+				$itype = IMAGETYPE_PNG;
+				OC_Log::write('core','OC_Image::loadFromFile, Default', OC_Log::DEBUG);
+				break;
+		}
+		// if($this->valid()) { // FIXME: I get an error: "PHP Fatal error:  Using $this when not in object context..." WTF?
+		if(self::valid()) { // And here I get a warning: "PHP Strict Standards:  Non-static method OC_Image::valid() should not be called statically..." valid() shouldn't be a static member as it would fail on a non-instantiated class.
+			self::$imagetype = $itype;
+			self::$destroy = true;
+		}
 		return self::$resource;
 	}
 
-- 
GitLab


From db6738478b6e0efe5a2484151e01e37ae358ac18 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 1 Jan 2012 23:34:26 +0100
Subject: [PATCH 121/546] Mixed up two lines :-P

---
 lib/image.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index b23e3507c34..a8948956bf4 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -111,10 +111,10 @@ class OC_Image {
 				imagegif(self::$resource);
 				break;
 			case IMAGETYPE_JPEG:
-				imagepng(self::$resource);
+				imagejpeg(self::$resource);
 				break;
 			case IMAGETYPE_PNG:
-				imagejpeg(self::$resource);
+				imagepng(self::$resource);
 				break;
 			case IMAGETYPE_XBM:
 				imagexbm(self::$resource);
-- 
GitLab


From 536bc3d3c52bb44d9768a20041ae9f284d4f6eae Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 1 Jan 2012 23:41:30 +0100
Subject: [PATCH 122/546] add jplayer source

---
 .../js/jQuery.jPlayer.2.1.0.source/Jplayer.as |  415 +++
 .../jQuery.jPlayer.2.1.0.source/Jplayer.fla   |  Bin 0 -> 61952 bytes
 .../add-on/jplayer.playlist.js                |  452 ++++
 .../add-on/jquery.jplayer.inspector.js        |  331 +++
 .../happyworm/jPlayer/JplayerEvent.as         |   69 +
 .../happyworm/jPlayer/JplayerMp3.as           |  328 +++
 .../happyworm/jPlayer/JplayerMp4.as           |  413 +++
 .../happyworm/jPlayer/JplayerStatus.as        |  101 +
 .../jquery.jplayer.js                         | 2349 +++++++++++++++++
 9 files changed, 4458 insertions(+)
 create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as
 create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.fla
 create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js
 create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js
 create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as
 create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as
 create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as
 create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as
 create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js

diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as
new file mode 100644
index 00000000000..1178dacc345
--- /dev/null
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as
@@ -0,0 +1,415 @@
+/*
+ * jPlayer Plugin for jQuery JavaScript Library
+ * http://www.happyworm.com/jquery/jplayer
+ *
+ * Copyright (c) 2009 - 2011 Happyworm Ltd
+ * Dual licensed under the MIT and GPL licenses.
+ *  - http://www.opensource.org/licenses/mit-license.php
+ *  - http://www.gnu.org/copyleft/gpl.html
+ *
+ * Author: Mark J Panaghiston
+ * Version: 2.1.0
+ * Date: 1st September 2011
+ *
+ * FlashVars expected: (AS3 property of: loaderInfo.parameters)
+ *	id: 	(URL Encoded: String) Id of jPlayer instance
+ *	vol:	(Number) Sets the initial volume
+ *	muted:	(Boolean in a String) Sets the initial muted state
+ *	jQuery:	(URL Encoded: String) Sets the jQuery var name. Used with: someVar = jQuery.noConflict(true);
+ *
+ * Compiled using: Adobe Flex Compiler (mxmlc) Version 4.5.1 build 21328
+ */
+
+package {
+	import flash.system.Security;
+	import flash.external.ExternalInterface;
+
+	import flash.utils.Timer;
+	import flash.events.TimerEvent;
+	
+	import flash.text.TextField;
+	import flash.text.TextFormat;
+
+	import flash.events.KeyboardEvent;
+
+	import flash.display.Sprite;
+	import happyworm.jPlayer.*;
+
+	import flash.display.StageAlign;
+	import flash.display.StageScaleMode;
+	import flash.events.Event;
+	import flash.events.MouseEvent;
+
+	import flash.ui.ContextMenu;
+	import flash.ui.ContextMenuItem;
+	import flash.events.ContextMenuEvent;
+	import flash.net.URLRequest;
+	import flash.net.navigateToURL;
+
+	public class Jplayer extends Sprite {
+		private var jQuery:String;
+		private var sentNumberFractionDigits:uint = 2;
+
+		public var commonStatus:JplayerStatus = new JplayerStatus(); // Used for inital ready event so volume is correct.
+
+		private var myInitTimer:Timer = new Timer(100, 0);
+
+		private var myMp3Player:JplayerMp3;
+		private var myMp4Player:JplayerMp4;
+
+		private var isMp3:Boolean = false;
+		private var isVideo:Boolean = false;
+
+		private var txLog:TextField;
+		private var debug:Boolean = false; // Set debug to false for release compile!
+
+		public function Jplayer() {
+			flash.system.Security.allowDomain("*");
+
+			jQuery = loaderInfo.parameters.jQuery + "('#" + loaderInfo.parameters.id + "').jPlayer";
+			commonStatus.volume = Number(loaderInfo.parameters.vol);
+			commonStatus.muted = loaderInfo.parameters.muted == "true";
+
+			stage.scaleMode = StageScaleMode.NO_SCALE;
+			stage.align = StageAlign.TOP_LEFT;
+			stage.addEventListener(Event.RESIZE, resizeHandler);
+			stage.addEventListener(MouseEvent.CLICK, clickHandler);
+
+			var initialVolume:Number = commonStatus.volume;
+			if(commonStatus.muted) {
+				initialVolume = 0;
+			}
+			myMp3Player = new JplayerMp3(initialVolume);
+			addChild(myMp3Player);
+
+			myMp4Player = new JplayerMp4(initialVolume);
+			addChild(myMp4Player);
+
+			setupListeners(!isMp3, isMp3); // Set up the listeners to the default isMp3 state.
+
+			// The ContextMenu only partially works. The menu select events never occur.
+			// Investigated and it is something to do with the way jPlayer inserts the Flash on the page.
+			// A simple test inserting the Jplayer.swf on a page using: 1) SWFObject 2.2 works. 2) AC_FL_RunContent() works.
+			// jPlayer Flash insertion is based on SWFObject 2.2 and the resaon behind this failure is not clear. The Flash insertion HTML on the page looks similar.
+			var myContextMenu:ContextMenu = new ContextMenu();
+			myContextMenu.hideBuiltInItems();
+			var menuItem_jPlayer:ContextMenuItem = new ContextMenuItem("jPlayer " + JplayerStatus.VERSION);
+			var menuItem_happyworm:ContextMenuItem = new ContextMenuItem("© 2009-2011 Happyworm Ltd", true);
+			menuItem_jPlayer.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuSelectHandler_jPlayer);
+			menuItem_happyworm.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuSelectHandler_happyworm);
+			myContextMenu.customItems.push(menuItem_jPlayer, menuItem_happyworm);
+			contextMenu = myContextMenu;
+
+			// Log console for dev compile option: debug
+			if(debug) {
+				txLog = new TextField();
+				txLog.x = 5;
+				txLog.y = 5;
+				txLog.width = 540;
+				txLog.height = 390;
+				txLog.border = true;
+				txLog.background = true;
+				txLog.backgroundColor = 0xEEEEFF;
+				txLog.multiline = true;
+				txLog.text = "jPlayer " + JplayerStatus.VERSION;
+				txLog.visible = false;
+				this.addChild(txLog);
+				this.stage.addEventListener(KeyboardEvent.KEY_UP, keyboardHandler);
+
+				myMp3Player.addEventListener(JplayerEvent.DEBUG_MSG, debugMsgHandler);
+				myMp4Player.addEventListener(JplayerEvent.DEBUG_MSG, debugMsgHandler);
+			}
+
+			// Delay init() because Firefox 3.5.7+ developed a bug with local testing in Firebug.
+			myInitTimer.addEventListener(TimerEvent.TIMER, init);
+			myInitTimer.start();
+		}
+		
+		private function init(e:TimerEvent):void {
+			myInitTimer.stop();
+			if(ExternalInterface.available) {
+				ExternalInterface.addCallback("fl_setAudio_mp3", fl_setAudio_mp3);
+				ExternalInterface.addCallback("fl_setAudio_m4a", fl_setAudio_m4a);
+				ExternalInterface.addCallback("fl_setVideo_m4v", fl_setVideo_m4v);
+				ExternalInterface.addCallback("fl_clearMedia", fl_clearMedia);
+				ExternalInterface.addCallback("fl_load", fl_load);
+				ExternalInterface.addCallback("fl_play", fl_play);
+				ExternalInterface.addCallback("fl_pause", fl_pause);
+				ExternalInterface.addCallback("fl_play_head", fl_play_head);
+				ExternalInterface.addCallback("fl_volume", fl_volume);
+				ExternalInterface.addCallback("fl_mute", fl_mute);
+
+				ExternalInterface.call(jQuery, "jPlayerFlashEvent", JplayerEvent.JPLAYER_READY, extractStatusData(commonStatus)); // See JplayerStatus() class for version number.
+			}
+		}
+		private function setupListeners(oldMP3:Boolean, newMP3:Boolean):void {
+			if(oldMP3 != newMP3) {
+				if(newMP3) {
+					listenToMp3(true);
+					listenToMp4(false);
+				} else {
+					listenToMp3(false);
+					listenToMp4(true);
+				}
+			}
+		}
+		private function listenToMp3(active:Boolean):void {
+			if(active) {
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
+				
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
+
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
+			} else {
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
+				
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
+
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
+			}
+		}
+		private function listenToMp4(active:Boolean):void {
+			if(active) {
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
+
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
+
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
+
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_LOADEDMETADATA, jPlayerMetaDataHandler); // Note the unique handler
+			} else {
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
+
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
+
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
+
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_LOADEDMETADATA, jPlayerMetaDataHandler); // Note the unique handler
+			}
+		}
+		private function fl_setAudio_mp3(src:String):Boolean {
+			if (src != null) {
+				log("fl_setAudio_mp3: "+src);
+				setupListeners(isMp3, true);
+				isMp3 = true;
+				isVideo = false;
+				myMp4Player.clearFile();
+				myMp3Player.setFile(src);
+				return true;
+			} else {
+				log("fl_setAudio_mp3: null");
+				return false;
+			}
+		}
+		private function fl_setAudio_m4a(src:String):Boolean {
+			if (src != null) {
+				log("fl_setAudio_m4a: "+src);
+				setupListeners(isMp3, false);
+				isMp3 = false;
+				isVideo = false;
+				myMp3Player.clearFile();
+				myMp4Player.setFile(src);
+				return true;
+			} else {
+				log("fl_setAudio_m4a: null");
+				return false;
+			}
+		}
+		private function fl_setVideo_m4v(src:String):Boolean {
+			if (src != null) {
+				log("fl_setVideo_m4v: "+src);
+				setupListeners(isMp3, false);
+				isMp3 = false;
+				isVideo = true;
+				myMp3Player.clearFile();
+				myMp4Player.setFile(src);
+				return true;
+			} else {
+				log("fl_setVideo_m4v: null");
+				return false;
+			}
+		}
+		private function fl_clearMedia():void {
+			log("clearMedia.");
+			myMp3Player.clearFile();
+			myMp4Player.clearFile();
+		}
+		private function fl_load():Boolean {
+			log("load.");
+			if(isMp3) {
+				return myMp3Player.load();
+			} else {
+				return myMp4Player.load();
+			}
+		}
+		private function fl_play(time:Number = NaN):Boolean {
+			log("play: time = " + time);
+			if(isMp3) {
+				return myMp3Player.play(time * 1000); // Flash uses milliseconds
+			} else {
+				return myMp4Player.play(time * 1000); // Flash uses milliseconds
+			}
+		}
+		private function fl_pause(time:Number = NaN):Boolean {
+			log("pause: time = " + time);
+			if(isMp3) {
+				return myMp3Player.pause(time * 1000); // Flash uses milliseconds
+			} else {
+				return myMp4Player.pause(time * 1000); // Flash uses milliseconds
+			}
+		}
+		private function fl_play_head(percent:Number):Boolean {
+			log("play_head: "+percent+"%");
+			if(isMp3) {
+				return myMp3Player.playHead(percent);
+			} else {
+				return myMp4Player.playHead(percent);
+			}
+		}
+		private function fl_volume(v:Number):void {
+			log("volume: "+v);
+			commonStatus.volume = v;
+			if(!commonStatus.muted) {
+				myMp3Player.setVolume(v);
+				myMp4Player.setVolume(v);
+			}
+		}
+		private function fl_mute(mute:Boolean):void {
+			log("mute: "+mute);
+			commonStatus.muted = mute;
+			if(mute) {
+				myMp3Player.setVolume(0);
+				myMp4Player.setVolume(0);
+			} else {
+				myMp3Player.setVolume(commonStatus.volume);
+				myMp4Player.setVolume(commonStatus.volume);
+			}
+		}
+		private function jPlayerFlashEvent(e:JplayerEvent):void {
+			log("jPlayer Flash Event: " + e.type + ": " + e.target);
+			if(ExternalInterface.available) {
+				ExternalInterface.call(jQuery, "jPlayerFlashEvent", e.type, extractStatusData(e.data));
+			}
+		}
+		private function extractStatusData(data:JplayerStatus):Object {
+			var myStatus:Object = {
+				version: JplayerStatus.VERSION,
+				src: data.src,
+				paused: !data.isPlaying, // Changing this name requires inverting all assignments and conditional statements.
+				srcSet: data.srcSet,
+				seekPercent: data.seekPercent,
+				currentPercentRelative: data.currentPercentRelative,
+				currentPercentAbsolute: data.currentPercentAbsolute,
+				currentTime: data.currentTime / 1000, // JavaScript uses seconds
+				duration: data.duration / 1000, // JavaScript uses seconds
+				volume: commonStatus.volume,
+				muted: commonStatus.muted
+			};
+			log("extractStatusData: sp="+myStatus.seekPercent+" cpr="+myStatus.currentPercentRelative+" cpa="+myStatus.currentPercentAbsolute+" ct="+myStatus.currentTime+" d="+myStatus.duration);
+			return myStatus;
+		}
+		private function jPlayerMetaDataHandler(e:JplayerEvent):void {
+			log("jPlayerMetaDataHandler:" + e.target);
+			if(ExternalInterface.available) {
+				resizeHandler(new Event(Event.RESIZE));
+				ExternalInterface.call(jQuery, "jPlayerFlashEvent", e.type, extractStatusData(e.data));
+			}
+		}
+		private function resizeHandler(e:Event):void {
+			log("resizeHandler: stageWidth = " + stage.stageWidth + " | stageHeight = " + stage.stageHeight);
+
+			var mediaX:Number = 0;
+			var mediaY:Number = 0;
+			var mediaWidth:Number = 0;
+			var mediaHeight:Number = 0;
+
+			if(stage.stageWidth > 0 && stage.stageHeight > 0 && myMp4Player.myVideo.width > 0 && myMp4Player.myVideo.height > 0) {
+				var aspectRatioStage:Number = stage.stageWidth / stage.stageHeight;
+				var aspectRatioVideo:Number = myMp4Player.myVideo.width / myMp4Player.myVideo.height;
+				if(aspectRatioStage < aspectRatioVideo) {
+					mediaWidth = stage.stageWidth;
+					mediaHeight = stage.stageWidth / aspectRatioVideo;
+					mediaX = 0;
+					mediaY = (stage.stageHeight - mediaHeight) / 2;
+				} else {
+					mediaWidth = stage.stageHeight * aspectRatioVideo;
+					mediaHeight = stage.stageHeight;
+					mediaX = (stage.stageWidth - mediaWidth) / 2;
+					mediaY = 0;
+				}
+				resizeEntity(myMp4Player, mediaX, mediaY, mediaWidth, mediaHeight);
+			}
+			if(debug && stage.stageWidth > 20 && stage.stageHeight > 20) {
+				txLog.width = stage.stageWidth - 10;
+				txLog.height = stage.stageHeight - 10;
+			}
+		}
+		private function resizeEntity(entity:Sprite, mediaX:Number, mediaY:Number, mediaWidth:Number, mediaHeight:Number):void {
+			entity.x = mediaX;
+			entity.y = mediaY;
+			entity.width = mediaWidth;
+			entity.height = mediaHeight;
+		}
+		private function clickHandler(e:MouseEvent):void {
+			if(isMp3) {
+				jPlayerFlashEvent(new JplayerEvent(JplayerEvent.JPLAYER_CLICK, myMp3Player.myStatus, "click"))
+			} else {
+				jPlayerFlashEvent(new JplayerEvent(JplayerEvent.JPLAYER_CLICK, myMp4Player.myStatus, "click"))
+			}
+		}
+		// This event is never called. See comments in class constructor.
+		private function menuSelectHandler_jPlayer(e:ContextMenuEvent):void {
+			navigateToURL(new URLRequest("http://jplayer.org/"), "_blank");
+		}
+		// This event is never called. See comments in class constructor.
+		private function menuSelectHandler_happyworm(e:ContextMenuEvent):void {
+			navigateToURL(new URLRequest("http://happyworm.com/"), "_blank");
+		}
+		private function log(t:String):void {
+			if(debug) {
+				txLog.text = t + "\n" + txLog.text;
+			}
+		}
+		private function debugMsgHandler(e:JplayerEvent):void {
+			log(e.msg);
+		}
+		private function keyboardHandler(e:KeyboardEvent):void {
+			log("keyboardHandler: e.keyCode = " + e.keyCode);
+			switch(e.keyCode) {
+				case 68 : // d
+					txLog.visible = !txLog.visible;
+					log("Toggled log display: " + txLog.visible);
+					break;
+				case 76 : // l
+					if(e.ctrlKey && e.shiftKey) {
+						txLog.text = "Cleared log.";
+					}
+					break;
+			}
+		}
+	}
+}
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.fla b/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.fla
new file mode 100644
index 0000000000000000000000000000000000000000..61ae40d3ac2811ebcfd63b1ff3bb590f67984445
GIT binary patch
literal 61952
zcmeHQU2Gl4b-omB%T6r+#c}-aYuRyRJEHg_$`Y%{qDje=Em^cETdpfNqR4wmS|TZv
zm!cR1sE{B)A5tJdjH35VeQ019FyIyj64XFp^hrQ(&@^a@Joq6+fTBQw#3)dp1sb#8
zch1i2?(FZSX^~3jl5_8#-PtoU=bSm`%<Sx(pZ(*VzxvC+zW-k<&gVd-v-0WcEtQ)h
z=Q|?Dl{+ex1Auw%)78~gUg9wh{pUKOz=_H{{u-5P<xph~zYCQWva<B&p304u=OPRJ
z|M|g>KJFa(@!$OY>xcG#_goawnV)~>+aLbVKXg2clLv3qD?=!q<<{hTF`B*9@m-ZI
z9VGV_<mPXgo1R0ae+p_gikA0C>aFapbXRs)_Eh@u%fB+8hbvob`^%P3yq!V&%al=+
zhvk}2QC{~t`|j_|&Hs;n+3tfN#vl@phwwX$bO`A%((_0oNJo%fKzb4BDAF;cmynJl
zjUv5_bOLD%=_JxCNUtKDLV6A950PF+`Xi*%NN*thG151Y&LE8=okf~JnnbE0)sd!<
zrjcfl-bA9fo=2KRnnRjLx`6Z+(gG5DP6KHP=_1lH65Cbuxt9I^{U7)I?R)6|BKm>+
zZ$$sU8MN8x{{LS$pc3o!iSoEzl;&Qe2lz{yzZHqcx8U~+NMA&{6=@sNZAiBx!3C(?
ziF6mzmyqs8`ZCfzNMAv^7wJBv`;i_%dJyR$q=%6nL8>A>inJZ+F{H<lzKZk&($|o7
zAU%on6w=d3Uq{-B)P=MQi5j{GsTZjaX*W_o(jKH|koF?&LmEK(1El>(-#{wUFAQCN
z-+wzm58BR7B#I=vrQtvONjv=abiMwh1<q4P<>t!J=*-0E_*9L~TnCs=_~`gbZ6SK%
z@WS|PkVEe{S-aE-^!R1S3es)2$S44Sd^##Wg>v`=$B+MJb@dr45`2CFrO_eU0Y2NO
zaM>0+Zojt!M>h__md(H>p6B^nLuhB^Ias{&u#m^Z%2o~n4Q_<=;-7j#KY|U1{M|y)
zmJgvfVXe;t^9n5NLZvFu60GbDtZ5Y%cV5oE346XIIaYA?1?0boGzRO;dR-7d`6!Og
z0v<<Nfj*qZ*#@o+Kqu{j-Q`~w%DWILuS@VxA@{ZlE#3v(NsLo+cNHy|fTpWLlhN<o
zhohYV)Fa;M2uiykcP$I1SzJAeQYV3L7&Ruvsz@`yLr;1U-;+4AgyYGe#SN5I!?|Pd
zX-?vIT&`8&>5KxGd-o#RunlKfkMtI@6<XFj%2|+-O*?lvby);uW>LEa@WpG{1uWA@
z`DIO^u1ly9xike_69Em+qXu<g-G#HHcbC+47DuG?VYF)yd|?||Q*xdZs^aVzEJjs$
zF^fBAaEHppDdbUFD{Lg=1;KCRrwe%&rHnz;i<D)}Skf_ES%9}j>7kU7%HzW48Qjr8
zzB%0Ys+6{fatZUkF`OZH(#shJ4vvwEat8e=BKM|8@YH2ZQ12ZCgHL!IbmiduL%2Xo
zj8BjS+U;2+^d{!y$$z0q4nEP6%sKw@d{~A>rdclI2WcBJJ($)p*dcn5s&K}$x&V+<
z?;gh=k+Li#{_t~I)7CBa49^zjC@xb*o$Zw=1#hyi=MA0G>qTn-l{Gv+u{2woYtTg8
zcU#_=8I0UYeX0G8V{7>sA)sp!Es@95ubnvhAHhkwogy*3fk~Vb3-BsF1_Rlyxqf=$
zua22qbY~<Bv#k-Kz0Kg_FAM0DN)f^*8(=P5kLWGDjrEG2<FSFwFS1;A62Ra?StfQm
z<XfaO;^4pOCgXGP5q@8#NB3uyX_OUB9YQ+!l1}sX+i!!$bksXPz*h(BaVK@*6uR34
ztQ4&sHRl-gAI}h)Vy=#EX~&Ov{OBmO;91e^i_nG7BUc@|Z$Y#)^=JcUYS4cJ_@ho_
z3ACCujHSn68EVpgV5-J3oxt@|7<*^oT12g=Hz#2^`{DP$7}N}y?xT*KKpCo;2dvI#
z`4iC4)XLPjgsH(7<=!rSZ;#hv1lMU(vT8Ag>(u%U!L<ZTtP${lM)>|}9NS^3(X5o3
zg^?DQB_0OdNUI2yZgnk$$%~Sz@seJKozE)aD9Tq~=s0Ld{?HNu2U8n(22np+@NvwD
zB=9(N%&QOWW&?bgh6SC6*F||5#`mnyv4`Jxxg32(DE$(0HsEuS&*vn!Q2hZn_b~FE
zg`7^|Po<c=r*x`kLTQX}EmMBt{+}a1+aHH7Hwa2x5Z_`B{eWKHlkiXmMH-dPagVYO
zeoHrU&@(!#a`<qZlgdTnqBLajl%7V=m$tICb-+uwqd}@X5XV>~(?>y1dU&|AL#Y2y
z{QfdhOdpt<ggAsJ_s4PM$-^nMbrLn7=G~qBGAE0p$Kx1A(KG13rfV7_k>u~UP!l>B
z=S5DmuS>h0h+{0TamIj^x{w?>0{u9Qy4aSsjWxt|LV7|C^0EX9P+lz7FDGSs9#XX=
zT<0wM5NbouRNA*St|@@!EAIV=Dwl8<`v7H!V~FS|33qHe9AKP|U7>q~tBz(Xk}2AT
zdGyqiC~FFOojP+4{e3Zz5#h(z;`}JWslA$9rA}8Ws@BwYS=v3=9^O|_GmckOQlz!J
z+r>cto)Qx8i`1AQ&3R<Be5C(spL6P*Z&$}41^O&U`ix?5I8-Fv)E<<%ap^1ZQ7R~T
zb9|gCRCz2;m7)^rR-T>{`Wk5m_8WSF@h^_=btN^bF==m?gx{pBj_PsGmL6yc{NCf<
z%YM&M-U4#7Z*Y`mYz*=%r4oHB*H2(MP9HC$5yRFSo<}VE7vuf43pHJa4o68&pD0rj
zZCu@vyhvH8(oqI4sW^|>jnKEE<(^<IRmVFvKVN2P;dNeOA<chyv_09XL7QDb?dXY(
zfyYPSy;}ZO+rt%lmVKB<-W~NUofZ~Je6&_^oi6$=A+0($LCtL1au_YLmR&iQ(Bwy;
zY3Mak=g<?UXB+x>mOGALQKVft8%Dc8F0BYHck_EkoR&pc*dKKaFd^8e0qGUZS-WMq
z<k<Ie5=k9fraxT}ZH%(k;LA*d0`$l&B^@cq_e7!=$#^9Zf7|KbMG_TiY3jd4^gc5?
z8S~;3GIAUeLQXLEq)5mZdW+5xM(mu^>x#I`I#BXB<|n`Chgd4@j7v%xesWZ%b9EdM
zus5@W(3eeUF~>^gd6nwT=*Uw>JKCF^UXjmBwOgzc$2($c@9c$!*ol6}eo}?jR;|W)
zMl(7BMVxx(my&AD9hobyTghkkxk*Ti<;^2;-sEGWeo?Q5_LjW1cpR^uR*YVMmRCNE
zD@S<u*4=nY*8}a^j~VY?p1Iw%+zI`&g=;j@a%yR;A;<i-ZVttYWtke(%-kOXHqJW}
zo9ODN;uI^wHX_o?v4{2wYSJ9t*V`U;)v9I=neu2_uUg;;`ph7D<~aCHo~c!^l)1yD
z^+{l$m&ClpWOF*LURxh7qo3*T2=5&GQl><XB$hD(D9{yaz-&gb1(==QU8c_JqggsT
z{V2abCdTK^_&)#ca--|=cIZXO%L?dEZ5`+s%Fm;5i7t=tq-aojF~Gv)=&B-2q4&mB
zT{<f$J=htol;P4_kjXOA%hA_G*45ED`Fg&<19s}0&(-+MYKouH7Pb;Ia*nrFo-5{=
zWn$i>O^h7TQLDZxwyg#ZM8=ahahAgTfiI4gFS1jawkI(UN!vJqT5!ImhE-q3VBt_+
zhgd47)G`tmjuMF_O>XmLs$DtA$JV|a6j8PW#s^*N<c`Lp<D)A2XJUlp=pOYC>S7DC
zXHYMKe+x2(3cPcrzN6cV?0#tDtrV=m4^ED>skP@y=^~CfMRz(Qi!#!uqoe|B*B#gF
z<?yD@92At~=&U^N-ppMd3dT7rj$BB8T(fpg^`RYXMUt;lI0YHgnW!15sg;t1W{FGr
z7%XgLrsaOOkC2kdCmcE-Y-}^iqHapudmO%>j$TemU!sT4@e93a^(P}E2WR|T)E`EG
z%dB-l*`2#ZE90omewE?1ICGq3WYPF^W$Zfh$}@~7+n4!JlNU(2<KN_K<eagXL(zPH
zA(JnTFIgnjd=kRvE8wWwyu{3dKB?20Ei-<nj~0$3^X9^Ijm^CH_O!EnZlI;fU5Sy5
zmcv<J;*ZRRe<`iUn7NB^F2uIO(Vj(e?v9{Rr0cE2cmjSJEr~z3;heNtkHwWhoS~qu
zpMotq4Szz{6rIM59`B>aqbr8u`SiIX$N9`-`fU}Z5gG@kL3k+h&=EBp>s$z*$#5Oi
z7-ld|<NO@HNjdZ6k}JDHT&J-N=OpTL6uIIO9j?3r^&Hz<L^ri-tl2Vf&x;pjdC=yl
zn3ATHi`P%v#BnX>F$`zs(6-=-sapDVvD4(&ge}9!J6e>O;nyWixUz<E=``BG8OeA%
zBc*AJ99>;TJDRby<$<GB%HXhbt*Q|mjgn`@GqsYV=ks;s32<6RWHme?rVR7BmU2I0
z$sE0#uP@2hOVT?cPmw#h@<g6HIocv0ms(k_)T9=qKBHWwjM>_%p_vt+v~ylpW>ct_
z9W3QXYT>FH(Y3d^8kBT4&nc|DJRP@`Mg9Lc`u&{DjIn>}vuGZr^isCP=_^Ip>5Z4d
z>pagZ!ds|OSXakCEYow6^WT=P&geK_!i+5Cu6}UpS0oo)Pr`mQ58iODXBM&>nQcvs
z+PG+wGeXOOjMJZ_XUUnJs9muwywjC0wdH)`t7~_)G?B&a>3R7kqr0l%DC!)p*>=|K
zbjX^o#N0En$HszqzAPh%yWMhiyuseak!T8C68@03hjSNP$xTU$KA$Evo}u(OS~H4U
zM-rTAkFT!dY?Y;^qqp-lW~SbCYLSnnoR6L_xg~Y?nxE+Q<EcY$^og!xBa8gqOiCr>
zKa>phfcIjCdQ7;^dG=a#wo2{fL#}K^C8Z>e#L74JI^zvS*HI)SyrYk@lXxN>wjxJX
z9a$^Vo~#G`*vP11UFH<jmn`s!oVw<DBgUetPicFW^GqZUgK~{I!V!ks<Lz@>l>*0q
z&hK&Y*}jPXM_#stDcvWrZFcNqejiT9MO&<^MS-=Gy>KsU>CBPlV;+RBz;&UtJh2s<
zZQ8Q%DY}j?^&Jk>hBb10j3T=jK5rmr7Xpt+Yshy{KFi8LT{EXooz-S?Wh^~VU0JEN
zFz#^`)tB>w#%l}5foON?d}on9%+UFX6;)APmSHIq>%Q2N`Q);2eV@bqBK;HBeVkFL
zql|$2j-OS=?oL4_>(*n9^uolLPjjLqr$3b`h1R`5w>fmk(@fMHOBjK$7Yzb4`9ps#
z;z2lLt~_kUALcCYdHm5cF+Ql7O&9;k8H?m=w}LTOLSEEgR6AwnFbuS)Eqi1L^?C`s
zI)afQ-$>B+#KthU@lDX-6=>=a<T!!rTwVMPyq`?(lkWv?$9u%!+}Gp1tw`2r0n~mJ
zjda)pg+>nD%gBZqwVP2>L<SS@3@k!_a#aAzTSG}%PbNM~?I%Iq<Qg9xsYAo@qncUX
zI;m9t7w7nP^3c%y`T2$6TKxvRzJfFQ>Ac(~2*;;_r*^-^t1!G5t1cDn7O-i+5dm8U
zJR=|shGxD*5HF%jH3C$9f_aC*+$Wg#0~E}Cf_Vs_VD1ylhXD%aKEXT!P%zgmX1TX6
znC~{I>VlaC=~cnp4^S}I1vASP%yq$h5TIaoNY~eglI5e#cL~d@S8%V=N-|%vV4YVd
z0qVU?f^Pr}NJsE>fC1?Uz6LNL9l@&r1+!C)KEXT+E-9@9^C<3ATD5rZXype1s#OJl
zixXf<y+ZI~U{>M;4Gd7#1@jJrxh|OZ8_adVJY+D}1v7ahm>ts9>maRsw1F<^c$K76
z;`9;xz6Ir8Qc|xrdG#E?fOG^&*no5d&j1WaNALr4Z=YbkVp`M}V78=FRF-rE-!KjA
zTO~*yNdxN@f@F%+sxFwX8q7|6>r&@YWR+UgTfCP%QdEMOz3d(7IC0`Mn@wcqM>69#
z04tiAS4ldhMjyc+TCh&=dlnQ_q+~!kUY!FNkdELqz<_iF-!qx}1oIVKlgxdB`TG_O
zFq^9_-g_=29YOLaARWOE4d%LF{=lHB3+5}9Rsm*9Iz?qkN09v}jdZP63s?F1D21?<
z3a^rM+WbC(e{R7#K?<Q>Z4&&B1qCxHsaIEd^#Z_vbOhfuSNjC>6-y1l{6h;0=I>cB
zz-&7#QISUh=?GGurQEt;e$U)n7tG|5W){rkk%9qc14^CQkJ3m-!=j}7B$af$O43Pt
zp+x}xg$3&be_+8T!9TTNi{NDoN<pM#KssK1$AW^H1xXXo$#9iCQcy6HM+ypN@<>68
zSwPqU-1|PRN<q+V0Ldf0DwtW2Py;fEtL#S#3TE~r1uf=O(gi)#5GUSYoA&Am3ELEF
zwGEgR6l?W>1;twJu%KA0UVy@Vh(0R07ofDLWiiXumSFyZ$=njmG>dvwFh6WT!OVj6
zs$lL0D40<S{wo#~%r{$5FyCQ8!F;a;1#{Jcf|&&gW*`;J#7+l8u8wA0ZHl$}HLeDv
zqw%T$k<_^<*6MBxinZEdL9tf-V78Ro6l+DhFWhel=6?gI%@6Egkhvw8x0!oeg82ap
z3g#Ua6wKt2U|to>{|-<o8DKV71v7c1nFTX>q@Z9Xj}#QlB%Oe0d5m---W1?8!ZyWP
z{Q_45($N5YY>5+C=Rn6c#ait!8n`LeigsVhZHl#`Z}tvZ))LHgAp+77^RJOrs?iEC
z2luuFGkGMaT7sE8Qcy6{HxtaOg85ef1JV&Qc_f)v1I#9~U}itkdj&K5k%EGmq!Z8~
z9lAO&XUSx<LKAZp_l{_XRnSVEf|hgy`B7Sl9i(q2<u+G&mE!%8l8)fd0S2Ta_zT<_
zkd7dEq{Io_fB;oXFw-{^%q_u8c^1s8Qs-X+3`nP_Ea?ccAIZI|0cLZrV5Sf%D#1+R
z2#A*9Uj0airJl6f+qv2l3;TDtR~pz9YxSXNU{kCW?Y`1VtQCDTrBz_93@Fx$E`(I0
zC78(+!Q2weR}JQtV7_WFw*)hNGo_VaW)l>ZU?x+3Nv5m{=AQu!NJoQ99tBcIko_ni
z9YG4epjr(u8&rasq!Y{zaUgWKmram@oU2fxxcU=w6^a2M?Y`1VtQCDTrIlDK_I;@a
znv2Xdiwat6rR^2WAK|K$3mt>Z<dKS*V5V=Tv=YoLSML?fEJ#`e2=|iv0y-^%y24d9
zFd&@)1JW5#FoRS<W<@2K$)is&u-!_=kU-p7t%GNSPk1bwO2}E<NmNEmgFCqwTbMg~
zye@a5xV4puYOeK8+?Xsgn?g4QG{aB*cdKVerEl@;aufFZ-Bp-r`Dm^}ddo&2k{5MY
zeF`;MeS>ZJ6QX&S<oIW{j5TB>@#&Dg)bu$1O}-f3xWBxD8ICq)@AQcR_jhtv3~|$z
zJ1RpjpB!A8oS7f1H5xN>Q`{gDWxR%}cGz0TglC6r3ZfOdDrY#=Qs$$GD6zboRN$R*
z9KnEdtIK!ouRMz$q)WceVX}u0OSuq<)1h-R$+r6GcAVo&N}O^#g+&#|V49ENo+0F$
z#+4B)GviW;G5o%SX}Ssgp2PP(+_N3{4`8c8+V24*K2YTpKc_US0-r}Y+=Aqi;OBx6
zT?#c2oHx050T=HuSQ;pUH3}C`Rf9#|I<d$aRk3`k3y(9HcA`ez*o=f5O!ect3#lLH
z_aN=YCWdC4uf5pvp&PG2?ZWkL+{IU+2ISEszxN_v{BOIoPtWZK9VRhNHGpZ#VN77g
zTd3Dq=V`P*xjEUg)QS%(xS3WD=*K_SrWfD6_}dxa-wBGXfIg(+C7dM%9|K-eI$FE1
zKAfITzLHqA_2r95T%6Jnnr?USL~)XbA<xLqWQ$mzF4WENvJ155!}MLKEf-g@b-KAm
zvd)H*Dk}q!GIEj+ZAh7u_~u0Rff(Pzhb81a7tK{+ZaL*$mv)=ivG{0nztn>D&c+?5
zVs?%A$VVS19RPQ9Ppq9HJv&8uPU5&9<?IGDAUU3vTm$&-&ZtQgXMR17p>33aNvXql
zZe4mnIWCl7$*fTyBs{Aw*?5cU!$pF8;IgugbxFe+uLn75`dzx5U+aD`33*TUiVNsp
z3y{EY!#w8O1upWj4D}p)G&kjA@94pAcJJVw1E4hfgg$gV04d-GH||2yU0BRca}@87
zx&)e(OT)C;>8rZo7_3l|%H?&>tZ1aNx{i;jxa2}LWL$%nFLM$7a0Ohdf%05Xvj`5F
zZ5qP`9n|G<9%N}?){1!QpNSHAwNmV9)+MeN$&CR#oFgr$mH6@%x8NCuu2z0^K{wEk
z7=X=v2KxIj=(!L2dN2NZ<%l+uTWjtGv>WG!p{Jh1Q4hWcp|^%`Uq8-<Iy|q`Gz!uW
zq3+lFhC%)4Mm_P`QkQ)mwM{RzxVFd9*ZIN*Ju_OebUcREruO}y85hGI0xfBy_ThLR
z=o!+QTzC%G4}tpK$fb6yUueEBLF;n0C~nON+CfR723tvZE>U?8y%@UGZ{_ASGHL7q
zwPEPx=%QXeS~tCr`oryqSz0$*CsR(S6$ZeQa6#7r950|8^$sS5irIP7s8v)NrJ%T{
ztq1p`^-eE!E%jf97fg#+<T>qzzMzNhdMnXdg}ByI6Y5}YR~s&e)y2LI)Ga!?XxGb(
z)-bP(qB=+Y8_Kim&7?`n#>@XAWd9;Kym7L>9#$sG!)qh^Wjyt0t$x2{KTXf_<uUpf
z?4^_F4Z9NB)y=V<JuKQA^X!r9qm;3Cu6M%4TKY2TBy2Osvs{>N`u2KQv;AU2)W;h@
zS=Z90<d>Swvv{33$58CUt(P4%bxtp}Y@O-zY>X#I&0*S5t`=!+a%G#N?xdu;b}HI)
zipJ^DygHXgY+A0F0W>p%ZaGPNc>SD7qxSVv`)EylOQO`+9LJs~n}ZM0T6msBsj)eZ
zJx?|VAELGJJc&|ca~yk~Yz{s|YvFkkrN-ts_B`1fe2CV<^CU`*&2hX|o^WO$xsHiX
z7j)IqGM@5q9a3}!6_-WXFk1|PxCcw|uy|zrVr{Z|cBMKvIe)fRJ$!zAak_eHW^QtR
zd9m8l-PK(^yEJotvf96APqi^KTbr0)nrl?QQSIsL?%lJuyLT@`o#J!(#e?5Q)YU79
z$l9T2+WF=!Tp8Gj#D!cpB5?&B*S)nH|C8}weGE{t`}+C#_@6%hr;q=sakUs1*2n*Z
z5|_`lj{o@>HxP)295O3q+X;w^HObVzZA9k0jOHT6B7|}UV}8uhc1sbOZoV(;n50+j
zdWrw}n;9Sf)5rge?&*~ozmdD1`1qekK?NWGb5tHD>(1BCZc>@@le?GTb|3#UjP%Q$
zvwi$e?yy|6AD7u5D7q&gcO}!kHZhr?y8<P4)N&W*`uLw=EI8fs)zZ${^RIZ%CLjMZ
z?u>(yKK>{A@}hY~@`?B^U}g5`(wAYV5mI*PO6(Np<A25}T%<*#yBhlVpFaL4_pM~K
z2=#Nj0MR-?k2(AOmg%{C4a>*><OGeo<1`moniv|SWU%YJdMs;*r;yzLoFydp2Bc+|
zy-yv>p0`J(zF6Vof2Qrj`8*a1*MpatlUzO`d?oMMqxiy|^{kw@g+;r?`uLw2v5(t~
zbQ0gemVJaCZ}?)EkN?@gCJ|127iVARGMe9vV%yU~WiZ>FfK^vI{V2abntjQw7Ib#$
z&%Zlk$7W~W<05~H%i=jg9ml+zkN@f8e-_D0xJ$Z^|H;>NvtoFJqeR=gAB&HK^7qW<
z3^!+z)X#DD;HKSf3mbRfZosZg<5hM>xaIubFurHS0}v0)(Hlh`KnaYANE+^}eLOOv
zkN+7T>2M@09-0%As*F|g@jt^EY|429l25;v(L4B3bP(TKZT9wfzbuk`?eRYTCpRU6
z9&$!*MRT$lUdtMGus1$knOQjI_3=OX94E_OjiFcg_@4vV>VumrsV3%FEJeC}{Lhpb
zB#qg`7oC0lPi|GirvrRtTDRNE>UCyDvS3`ghPh4?Nrc{Knw~CGJ3H5^7@W~*-W*+K
zbTvoM=lj5X_1wq*lt@0bv`);O@*_1L|1+!qnRrLKnV!-0+%SvtBA_{w;~$pkIm!8N
z+Yg;_R{k818Ta}4pL`PL<9|-We`7qWEP2k<yN>S8$5PHm&zIbiy1N=5d$ps}eEiP~
z7}v(1AW+L7;DwL>3Ce^s0A`+@8y0E2Me&Gy{7-0-yyt~J{-=r6>EnNLEW<d9W9V56
z@QpO;b<`KK9!?^jBS$wr{wKHZB?W!_Pg#A}$!%u)X{!?Q;^Tjskx1m(w~zlRQB}+<
zPC?L*C@7J>7#rta3Be+fz6f>;D3QJhjtD4`z6hQX5Cc68c65oLkN*j3`1qfJY}lwU
zc*CBded-_%!wRWf`S_oaKIr3rLN+czGDMBkB|6z800}Bpm*`|Z{%1fOAOBNhw2EvX
z{Fq2i5PuA|3*h@uGAc+Coy^Do3<Bu+_@5eEQe2mokN?Sdm?oyBkN@f8e?o13q^_EY
z=ck^V)v=;f;kH1>>IZ(EkN*j3`1qeb{-^eca2v8P<|z6L-4fGnf+2XBXr&TZGI6Jm
z|H(BJV|Xgz<9{Nml#l<(Xj~>*rpE0^Myy-L0;^@j=kxJD!(Av%B$VtJou4H#lg3EP
z#+|kgWm=7*u{wSHPriu27ms}WPapr&#3<r}!p|%2u#f*a0NR>(K1sW>K2b?ET9A+b
zxqi_~-R*%i>S&(L(P*W|@tA&NqDDnyrk1Nkacj!NLsNgi$Nw~Rh{pZ9wz1kY@^My#
zxHN8uzMMJIxNQbg7`HIrbMo;&qp{F@{Lcm!+?11jAOF+zyy$Pd7v{yK{VXG_sHVy*
zV=bD)jqd5=f37{6bv%}4xqh|Yu{6_5&6bRKozo+6ejZWKLtlFU<J`2Uqh;&NrI#Dy
z$wk{xt`=!+(m0%asZu>tj`Do`&#0DN>v0;j*NSUn@AEC$So)`x?s<|%m5n{;d9tze
zPb=N?B#kN?d(QJ@W9gq(y5~t6RW|mV=gG#>Kdp4nlQgPq>^aYqjirBD>1*Z5riuT#
Lr)S@~#Q*$1&)N_z

literal 0
HcmV?d00001

diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js b/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js
new file mode 100644
index 00000000000..0eaa0ddf3d7
--- /dev/null
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js
@@ -0,0 +1,452 @@
+/*
+ * Playlist Object for the jPlayer Plugin
+ * http://www.jplayer.org
+ *
+ * Copyright (c) 2009 - 2011 Happyworm Ltd
+ * Dual licensed under the MIT and GPL licenses.
+ *  - http://www.opensource.org/licenses/mit-license.php
+ *  - http://www.gnu.org/copyleft/gpl.html
+ *
+ * Author: Mark J Panaghiston
+ * Version: 2.1.0 (jPlayer 2.1.0)
+ * Date: 1st September 2011
+ */
+
+/* Code verified using http://www.jshint.com/ */
+/*jshint asi:false, bitwise:false, boss:false, browser:true, curly:true, debug:false, eqeqeq:true, eqnull:false, evil:false, forin:false, immed:false, jquery:true, laxbreak:false, newcap:true, noarg:true, noempty:true, nonew:true, nomem:false, onevar:false, passfail:false, plusplus:false, regexp:false, undef:true, sub:false, strict:false, white:false */
+/*global  jPlayerPlaylist: true, jQuery:false, alert:false */
+
+(function($, undefined) {
+
+	jPlayerPlaylist = function(cssSelector, playlist, options) {
+		var self = this;
+
+		this.current = 0;
+		this.loop = false; // Flag used with the jPlayer repeat event
+		this.shuffled = false;
+		this.removing = false; // Flag is true during remove animation, disabling the remove() method until complete.
+
+		this.cssSelector = $.extend({}, this._cssSelector, cssSelector); // Object: Containing the css selectors for jPlayer and its cssSelectorAncestor
+		this.options = $.extend(true, {}, this._options, options); // Object: The jPlayer constructor options for this playlist and the playlist options
+
+		this.playlist = []; // Array of Objects: The current playlist displayed (Un-shuffled or Shuffled)
+		this.original = []; // Array of Objects: The original playlist
+
+		this._initPlaylist(playlist); // Copies playlist to this.original. Then mirrors this.original to this.playlist. Creating two arrays, where the element pointers match. (Enables pointer comparison.)
+
+		// Setup the css selectors for the extra interface items used by the playlist.
+		this.cssSelector.title = this.cssSelector.cssSelectorAncestor + " .jp-title"; // Note that the text is written to the decendant li node.
+		this.cssSelector.playlist = this.cssSelector.cssSelectorAncestor + " .jp-playlist";
+		this.cssSelector.next = this.cssSelector.cssSelectorAncestor + " .jp-next";
+		this.cssSelector.previous = this.cssSelector.cssSelectorAncestor + " .jp-previous";
+		this.cssSelector.shuffle = this.cssSelector.cssSelectorAncestor + " .jp-shuffle";
+		this.cssSelector.shuffleOff = this.cssSelector.cssSelectorAncestor + " .jp-shuffle-off";
+
+		// Override the cssSelectorAncestor given in options
+		this.options.cssSelectorAncestor = this.cssSelector.cssSelectorAncestor;
+
+		// Override the default repeat event handler
+		this.options.repeat = function(event) {
+			self.loop = event.jPlayer.options.loop;
+		};
+
+		// Create a ready event handler to initialize the playlist
+		$(this.cssSelector.jPlayer).bind($.jPlayer.event.ready, function(event) {
+			self._init();
+		});
+
+		// Create an ended event handler to move to the next item
+		$(this.cssSelector.jPlayer).bind($.jPlayer.event.ended, function(event) {
+			self.next();
+		});
+
+		// Create a play event handler to pause other instances
+		$(this.cssSelector.jPlayer).bind($.jPlayer.event.play, function(event) {
+			$(this).jPlayer("pauseOthers");
+		});
+
+		// Create a resize event handler to show the title in full screen mode.
+		$(this.cssSelector.jPlayer).bind($.jPlayer.event.resize, function(event) {
+			if(event.jPlayer.options.fullScreen) {
+				$(self.cssSelector.title).show();
+			} else {
+				$(self.cssSelector.title).hide();
+			}
+		});
+
+		// Create click handlers for the extra buttons that do playlist functions.
+		$(this.cssSelector.previous).click(function() {
+			self.previous();
+			$(this).blur();
+			return false;
+		});
+
+		$(this.cssSelector.next).click(function() {
+			self.next();
+			$(this).blur();
+			return false;
+		});
+
+		$(this.cssSelector.shuffle).click(function() {
+			self.shuffle(true);
+			return false;
+		});
+		$(this.cssSelector.shuffleOff).click(function() {
+			self.shuffle(false);
+			return false;
+		}).hide();
+
+		// Put the title in its initial display state
+		if(!this.options.fullScreen) {
+			$(this.cssSelector.title).hide();
+		}
+
+		// Remove the empty <li> from the page HTML. Allows page to be valid HTML, while not interfereing with display animations
+		$(this.cssSelector.playlist + " ul").empty();
+
+		// Create .live() handlers for the playlist items along with the free media and remove controls.
+		this._createItemHandlers();
+
+		// Instance jPlayer
+		$(this.cssSelector.jPlayer).jPlayer(this.options);
+	};
+
+	jPlayerPlaylist.prototype = {
+		_cssSelector: { // static object, instanced in constructor
+			jPlayer: "#jquery_jplayer_1",
+			cssSelectorAncestor: "#jp_container_1"
+		},
+		_options: { // static object, instanced in constructor
+			playlistOptions: {
+				autoPlay: false,
+				loopOnPrevious: false,
+				shuffleOnLoop: true,
+				enableRemoveControls: false,
+				displayTime: 'slow',
+				addTime: 'fast',
+				removeTime: 'fast',
+				shuffleTime: 'slow',
+				itemClass: "jp-playlist-item",
+				freeGroupClass: "jp-free-media",
+				freeItemClass: "jp-playlist-item-free",
+				removeItemClass: "jp-playlist-item-remove"
+			}
+		},
+		option: function(option, value) { // For changing playlist options only
+			if(value === undefined) {
+				return this.options.playlistOptions[option];
+			}
+
+			this.options.playlistOptions[option] = value;
+
+			switch(option) {
+				case "enableRemoveControls":
+					this._updateControls();
+					break;
+				case "itemClass":
+				case "freeGroupClass":
+				case "freeItemClass":
+				case "removeItemClass":
+					this._refresh(true); // Instant
+					this._createItemHandlers();
+					break;
+			}
+			return this;
+		},
+		_init: function() {
+			var self = this;
+			this._refresh(function() {
+				if(self.options.playlistOptions.autoPlay) {
+					self.play(self.current);
+				} else {
+					self.select(self.current);
+				}
+			});
+		},
+		_initPlaylist: function(playlist) {
+			this.current = 0;
+			this.shuffled = false;
+			this.removing = false;
+			this.original = $.extend(true, [], playlist); // Copy the Array of Objects
+			this._originalPlaylist();
+		},
+		_originalPlaylist: function() {
+			var self = this;
+			this.playlist = [];
+			// Make both arrays point to the same object elements. Gives us 2 different arrays, each pointing to the same actual object. ie., Not copies of the object.
+			$.each(this.original, function(i,v) {
+				self.playlist[i] = self.original[i];
+			});
+		},
+		_refresh: function(instant) {
+			/* instant: Can be undefined, true or a function.
+			 *	undefined -> use animation timings
+			 *	true -> no animation
+			 *	function -> use animation timings and excute function at half way point.
+			 */
+			var self = this;
+
+			if(instant && !$.isFunction(instant)) {
+				$(this.cssSelector.playlist + " ul").empty();
+				$.each(this.playlist, function(i,v) {
+					$(self.cssSelector.playlist + " ul").append(self._createListItem(self.playlist[i]));
+				});
+				this._updateControls();
+			} else {
+				var displayTime = $(this.cssSelector.playlist + " ul").children().length ? this.options.playlistOptions.displayTime : 0;
+
+				$(this.cssSelector.playlist + " ul").slideUp(displayTime, function() {
+					var $this = $(this);
+					$(this).empty();
+					
+					$.each(self.playlist, function(i,v) {
+						$this.append(self._createListItem(self.playlist[i]));
+					});
+					self._updateControls();
+					if($.isFunction(instant)) {
+						instant();
+					}
+					if(self.playlist.length) {
+						$(this).slideDown(self.options.playlistOptions.displayTime);
+					} else {
+						$(this).show();
+					}
+				});
+			}
+		},
+		_createListItem: function(media) {
+			var self = this;
+
+			// Wrap the <li> contents in a <div>
+			var listItem = "<li><div>";
+
+			// Create remove control
+			listItem += "<a href='javascript:;' class='" + this.options.playlistOptions.removeItemClass + "'>&times;</a>";
+
+			// Create links to free media
+			if(media.free) {
+				var first = true;
+				listItem += "<span class='" + this.options.playlistOptions.freeGroupClass + "'>(";
+				$.each(media, function(property,value) {
+					if($.jPlayer.prototype.format[property]) { // Check property is a media format.
+						if(first) {
+							first = false;
+						} else {
+							listItem += " | ";
+						}
+						listItem += "<a class='" + self.options.playlistOptions.freeItemClass + "' href='" + value + "' tabindex='1'>" + property + "</a>";
+					}
+				});
+				listItem += ")</span>";
+			}
+
+			// The title is given next in the HTML otherwise the float:right on the free media corrupts in IE6/7
+			listItem += "<a href='javascript:;' class='" + this.options.playlistOptions.itemClass + "' tabindex='1'>" + media.title + (media.artist ? " <span class='jp-artist'>by " + media.artist + "</span>" : "") + "</a>";
+			listItem += "</div></li>";
+
+			return listItem;
+		},
+		_createItemHandlers: function() {
+			var self = this;
+			// Create .live() handlers for the playlist items
+			$(this.cssSelector.playlist + " a." + this.options.playlistOptions.itemClass).die("click").live("click", function() {
+				var index = $(this).parent().parent().index();
+				if(self.current !== index) {
+					self.play(index);
+				} else {
+					$(self.cssSelector.jPlayer).jPlayer("play");
+				}
+				$(this).blur();
+				return false;
+			});
+
+			// Create .live() handlers that disable free media links to force access via right click
+			$(self.cssSelector.playlist + " a." + this.options.playlistOptions.freeItemClass).die("click").live("click", function() {
+				$(this).parent().parent().find("." + self.options.playlistOptions.itemClass).click();
+				$(this).blur();
+				return false;
+			});
+
+			// Create .live() handlers for the remove controls
+			$(self.cssSelector.playlist + " a." + this.options.playlistOptions.removeItemClass).die("click").live("click", function() {
+				var index = $(this).parent().parent().index();
+				self.remove(index);
+				$(this).blur();
+				return false;
+			});
+		},
+		_updateControls: function() {
+			if(this.options.playlistOptions.enableRemoveControls) {
+				$(this.cssSelector.playlist + " ." + this.options.playlistOptions.removeItemClass).show();
+			} else {
+				$(this.cssSelector.playlist + " ." + this.options.playlistOptions.removeItemClass).hide();
+			}
+			if(this.shuffled) {
+				$(this.cssSelector.shuffleOff).show();
+				$(this.cssSelector.shuffle).hide();
+			} else {
+				$(this.cssSelector.shuffleOff).hide();
+				$(this.cssSelector.shuffle).show();
+			}
+		},
+		_highlight: function(index) {
+			if(this.playlist.length && index !== undefined) {
+				$(this.cssSelector.playlist + " .jp-playlist-current").removeClass("jp-playlist-current");
+				$(this.cssSelector.playlist + " li:nth-child(" + (index + 1) + ")").addClass("jp-playlist-current").find(".jp-playlist-item").addClass("jp-playlist-current");
+				$(this.cssSelector.title + " li").html(this.playlist[index].title + (this.playlist[index].artist ? " <span class='jp-artist'>by " + this.playlist[index].artist + "</span>" : ""));
+			}
+		},
+		setPlaylist: function(playlist) {
+			this._initPlaylist(playlist);
+			this._init();
+		},
+		add: function(media, playNow) {
+			$(this.cssSelector.playlist + " ul").append(this._createListItem(media)).find("li:last-child").hide().slideDown(this.options.playlistOptions.addTime);
+			this._updateControls();
+			this.original.push(media);
+			this.playlist.push(media); // Both array elements share the same object pointer. Comforms with _initPlaylist(p) system.
+
+			if(playNow) {
+				this.play(this.playlist.length - 1);
+			} else {
+				if(this.original.length === 1) {
+					this.select(0);
+				}
+			}
+		},
+		remove: function(index) {
+			var self = this;
+
+			if(index === undefined) {
+				this._initPlaylist([]);
+				this._refresh(function() {
+					$(self.cssSelector.jPlayer).jPlayer("clearMedia");
+				});
+				return true;
+			} else {
+
+				if(this.removing) {
+					return false;
+				} else {
+					index = (index < 0) ? self.original.length + index : index; // Negative index relates to end of array.
+					if(0 <= index && index < this.playlist.length) {
+						this.removing = true;
+
+						$(this.cssSelector.playlist + " li:nth-child(" + (index + 1) + ")").slideUp(this.options.playlistOptions.removeTime, function() {
+							$(this).remove();
+
+							if(self.shuffled) {
+								var item = self.playlist[index];
+								$.each(self.original, function(i,v) {
+									if(self.original[i] === item) {
+										self.original.splice(i, 1);
+										return false; // Exit $.each
+									}
+								});
+								self.playlist.splice(index, 1);
+							} else {
+								self.original.splice(index, 1);
+								self.playlist.splice(index, 1);
+							}
+
+							if(self.original.length) {
+								if(index === self.current) {
+									self.current = (index < self.original.length) ? self.current : self.original.length - 1; // To cope when last element being selected when it was removed
+									self.select(self.current);
+								} else if(index < self.current) {
+									self.current--;
+								}
+							} else {
+								$(self.cssSelector.jPlayer).jPlayer("clearMedia");
+								self.current = 0;
+								self.shuffled = false;
+								self._updateControls();
+							}
+
+							self.removing = false;
+						});
+					}
+					return true;
+				}
+			}
+		},
+		select: function(index) {
+			index = (index < 0) ? this.original.length + index : index; // Negative index relates to end of array.
+			if(0 <= index && index < this.playlist.length) {
+				this.current = index;
+				this._highlight(index);
+				$(this.cssSelector.jPlayer).jPlayer("setMedia", this.playlist[this.current]);
+			} else {
+				this.current = 0;
+			}
+		},
+		play: function(index) {
+			index = (index < 0) ? this.original.length + index : index; // Negative index relates to end of array.
+			if(0 <= index && index < this.playlist.length) {
+				if(this.playlist.length) {
+					this.select(index);
+					$(this.cssSelector.jPlayer).jPlayer("play");
+				}
+			} else if(index === undefined) {
+				$(this.cssSelector.jPlayer).jPlayer("play");
+			}
+		},
+		pause: function() {
+			$(this.cssSelector.jPlayer).jPlayer("pause");
+		},
+		next: function() {
+			var index = (this.current + 1 < this.playlist.length) ? this.current + 1 : 0;
+
+			if(this.loop) {
+				// See if we need to shuffle before looping to start, and only shuffle if more than 1 item.
+				if(index === 0 && this.shuffled && this.options.playlistOptions.shuffleOnLoop && this.playlist.length > 1) {
+					this.shuffle(true, true); // playNow
+				} else {
+					this.play(index);
+				}
+			} else {
+				// The index will be zero if it just looped round
+				if(index > 0) {
+					this.play(index);
+				}
+			}
+		},
+		previous: function() {
+			var index = (this.current - 1 >= 0) ? this.current - 1 : this.playlist.length - 1;
+
+			if(this.loop && this.options.playlistOptions.loopOnPrevious || index < this.playlist.length - 1) {
+				this.play(index);
+			}
+		},
+		shuffle: function(shuffled, playNow) {
+			var self = this;
+
+			if(shuffled === undefined) {
+				shuffled = !this.shuffled;
+			}
+
+			if(shuffled || shuffled !== this.shuffled) {
+
+				$(this.cssSelector.playlist + " ul").slideUp(this.options.playlistOptions.shuffleTime, function() {
+					self.shuffled = shuffled;
+					if(shuffled) {
+						self.playlist.sort(function() {
+							return 0.5 - Math.random();
+						});
+					} else {
+						self._originalPlaylist();
+					}
+					self._refresh(true); // Instant
+
+					if(playNow || !$(self.cssSelector.jPlayer).data("jPlayer").status.paused) {
+						self.play(0);
+					} else {
+						self.select(0);
+					}
+
+					$(this).slideDown(self.options.playlistOptions.shuffleTime);
+				});
+			}
+		}
+	};
+})(jQuery);
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js b/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js
new file mode 100644
index 00000000000..46c090a1b01
--- /dev/null
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js
@@ -0,0 +1,331 @@
+/*
+ * jPlayerInspector Plugin for jPlayer (2.0.0+) Plugin for jQuery JavaScript Library
+ * http://www.happyworm.com/jquery/jplayer
+ *
+ * Copyright (c) 2009 - 2011 Happyworm Ltd
+ * Dual licensed under the MIT and GPL licenses.
+ *  - http://www.opensource.org/licenses/mit-license.php
+ *  - http://www.gnu.org/copyleft/gpl.html
+ *
+ * Author: Mark J Panaghiston
+ * Version: 1.0.3
+ * Date: 7th August 2011
+ *
+ * For use with jPlayer Version: 2.0.29
+ *
+ * Note: Declare inspector instances after jPlayer instances. ie., Otherwise the jPlayer instance is nonsense.
+ */
+
+(function($, undefined) {
+	$.jPlayerInspector = {};
+	$.jPlayerInspector.i = 0;
+	$.jPlayerInspector.defaults = {
+		jPlayer: undefined, // The jQuery selector of the jPlayer instance to inspect.
+		idPrefix: "jplayer_inspector_",
+		visible: false
+	};
+	
+	var methods = {
+		init: function(options) {
+			var self = this;
+			var $this = $(this);
+			
+			var config = $.extend({}, $.jPlayerInspector.defaults, options);
+			$(this).data("jPlayerInspector", config);
+
+			config.id = $(this).attr("id");
+			config.jPlayerId = config.jPlayer.attr("id");
+
+			config.windowId = config.idPrefix + "window_" + $.jPlayerInspector.i;
+			config.statusId = config.idPrefix + "status_" + $.jPlayerInspector.i;
+			config.configId = config.idPrefix + "config_" + $.jPlayerInspector.i;
+			config.toggleId = config.idPrefix + "toggle_" + $.jPlayerInspector.i;
+			config.eventResetId = config.idPrefix + "event_reset_" + $.jPlayerInspector.i;
+			config.updateId = config.idPrefix + "update_" + $.jPlayerInspector.i;
+			config.eventWindowId = config.idPrefix + "event_window_" + $.jPlayerInspector.i;
+			
+			config.eventId = {};
+			config.eventJq = {};
+			config.eventTimeout = {};
+			config.eventOccurrence = {};
+			
+			$.each($.jPlayer.event, function(eventName,eventType) {
+				config.eventId[eventType] = config.idPrefix + "event_" + eventName + "_" + $.jPlayerInspector.i;
+				config.eventOccurrence[eventType] = 0;
+			});
+			
+			var structure = 
+				'<p><a href="#" id="' + config.toggleId + '">' + (config.visible ? "Hide" : "Show") + '</a> jPlayer Inspector</p>' 
+				+ '<div id="' + config.windowId + '">'
+					+ '<div id="' + config.statusId + '"></div>'
+					+ '<div id="' + config.eventWindowId + '" style="padding:5px 5px 0 5px;background-color:#eee;border:1px dotted #000;">'
+						+ '<p style="margin:0 0 10px 0;"><strong>jPlayer events that have occurred over the past 1 second:</strong>'
+						+ '<br />(Backgrounds: <span style="padding:0 5px;background-color:#eee;border:1px dotted #000;">Never occurred</span> <span style="padding:0 5px;background-color:#fff;border:1px dotted #000;">Occurred before</span> <span style="padding:0 5px;background-color:#9f9;border:1px dotted #000;">Occurred</span> <span style="padding:0 5px;background-color:#ff9;border:1px dotted #000;">Multiple occurrences</span> <a href="#" id="' + config.eventResetId + '">reset</a>)</p>';
+			
+			// MJP: Would use the next 3 lines for ease, but the events are just slapped on the page.
+			// $.each($.jPlayer.event, function(eventName,eventType) {
+			// 	structure += '<div id="' + config.eventId[eventType] + '" style="float:left;">' + eventName + '</div>';
+			// });
+			
+			var eventStyle = "float:left;margin:0 5px 5px 0;padding:0 5px;border:1px dotted #000;";
+			// MJP: Doing it longhand so order and layout easier to control.
+			structure +=
+						'<div id="' + config.eventId[$.jPlayer.event.ready] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.flashreset] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.resize] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.repeat] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.click] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.error] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.warning] + '" style="' + eventStyle + '"></div>'
+
+						+ '<div id="' + config.eventId[$.jPlayer.event.loadstart] + '" style="clear:left;' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.progress] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.timeupdate] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.volumechange] + '" style="' + eventStyle + '"></div>'
+
+						+ '<div id="' + config.eventId[$.jPlayer.event.play] + '" style="clear:left;' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.pause] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.waiting] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.playing] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.seeking] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.seeked] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.ended] + '" style="' + eventStyle + '"></div>'
+
+						+ '<div id="' + config.eventId[$.jPlayer.event.loadeddata] + '" style="clear:left;' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.loadedmetadata] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.canplay] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.canplaythrough] + '" style="' + eventStyle + '"></div>'
+
+						+ '<div id="' + config.eventId[$.jPlayer.event.suspend] + '" style="clear:left;' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.abort] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.emptied] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.stalled] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.ratechange] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.durationchange] + '" style="' + eventStyle + '"></div>'
+
+						+ '<div style="clear:both"></div>';
+
+			// MJP: Would like a check here in case we missed an event.
+
+			// MJP: Check fails, since it is not on the page yet.
+/*			$.each($.jPlayer.event, function(eventName,eventType) {
+				if($("#" + config.eventId[eventType])[0] === undefined) {
+					structure += '<div id="' + config.eventId[eventType] + '" style="clear:left;' + eventStyle + '">' + eventName + '</div>';
+				}
+			});
+*/
+			structure +=
+					'</div>'
+					+ '<p><a href="#" id="' + config.updateId + '">Update</a> jPlayer Inspector</p>'
+					+ '<div id="' + config.configId + '"></div>'
+				+ '</div>';
+			$(this).html(structure);
+			
+			config.windowJq = $("#" + config.windowId);
+			config.statusJq = $("#" + config.statusId);
+			config.configJq = $("#" + config.configId);
+			config.toggleJq = $("#" + config.toggleId);
+			config.eventResetJq = $("#" + config.eventResetId);
+			config.updateJq = $("#" + config.updateId);
+
+			$.each($.jPlayer.event, function(eventName,eventType) {
+				config.eventJq[eventType] = $("#" + config.eventId[eventType]);
+				config.eventJq[eventType].text(eventName + " (" + config.eventOccurrence[eventType] + ")"); // Sets the text to the event name and (0);
+				
+				config.jPlayer.bind(eventType + ".jPlayerInspector", function(e) {
+					config.eventOccurrence[e.type]++;
+					if(config.eventOccurrence[e.type] > 1) {
+						config.eventJq[e.type].css("background-color","#ff9");
+					} else {
+						config.eventJq[e.type].css("background-color","#9f9");
+					}
+					config.eventJq[e.type].text(eventName + " (" + config.eventOccurrence[e.type] + ")");
+					// The timer to handle the color
+					clearTimeout(config.eventTimeout[e.type]);
+					config.eventTimeout[e.type] = setTimeout(function() {
+						config.eventJq[e.type].css("background-color","#fff");
+					}, 1000);
+					// The timer to handle the occurences.
+					setTimeout(function() {
+						config.eventOccurrence[e.type]--;
+						config.eventJq[e.type].text(eventName + " (" + config.eventOccurrence[e.type] + ")");
+					}, 1000);
+					if(config.visible) { // Update the status, if inspector open.
+						$this.jPlayerInspector("updateStatus");
+					}
+				});
+			});
+
+			config.jPlayer.bind($.jPlayer.event.ready + ".jPlayerInspector", function(e) {
+				$this.jPlayerInspector("updateConfig");
+			});
+
+			config.toggleJq.click(function() {
+				if(config.visible) {
+					$(this).text("Show");
+					config.windowJq.hide();
+					config.statusJq.empty();
+					config.configJq.empty();
+				} else {
+					$(this).text("Hide");
+					config.windowJq.show();
+					config.updateJq.click();
+				}
+				config.visible = !config.visible;
+				$(this).blur();
+				return false;
+			});
+
+			config.eventResetJq.click(function() {
+				$.each($.jPlayer.event, function(eventName,eventType) {
+					config.eventJq[eventType].css("background-color","#eee");
+				});
+				$(this).blur();
+				return false;
+			});
+
+			config.updateJq.click(function() {
+				$this.jPlayerInspector("updateStatus");
+				$this.jPlayerInspector("updateConfig");
+				return false;
+			});
+
+			if(!config.visible) {
+				config.windowJq.hide();
+			} else {
+				// config.updateJq.click();
+			}
+			
+			$.jPlayerInspector.i++;
+
+			return this;
+		},
+		destroy: function() {
+			$(this).data("jPlayerInspector") && $(this).data("jPlayerInspector").jPlayer.unbind(".jPlayerInspector");
+			$(this).empty();
+		},
+		updateConfig: function() { // This displays information about jPlayer's configuration in inspector
+		
+			var jPlayerInfo = "<p>This jPlayer instance is running in your browser where:<br />"
+
+			for(i = 0; i < $(this).data("jPlayerInspector").jPlayer.data("jPlayer").solutions.length; i++) {
+				var solution = $(this).data("jPlayerInspector").jPlayer.data("jPlayer").solutions[i];
+				jPlayerInfo += "&nbsp;jPlayer's <strong>" + solution + "</strong> solution is";				
+				if($(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].used) {
+					jPlayerInfo += " being <strong>used</strong> and will support:<strong>";
+					for(format in $(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].support) {
+						if($(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].support[format]) {
+							jPlayerInfo += " " + format;
+						}
+					}
+					jPlayerInfo += "</strong><br />";
+				} else {
+					jPlayerInfo += " <strong>not required</strong><br />";
+				}
+			}
+			jPlayerInfo += "</p>";
+
+			if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.active) {
+				if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").flash.active) {
+					jPlayerInfo += "<strong>Problem with jPlayer since both HTML5 and Flash are active.</strong>";
+				} else {
+					jPlayerInfo += "The <strong>HTML5 is active</strong>.";
+				}
+			} else {
+				if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").flash.active) {
+					jPlayerInfo += "The <strong>Flash is active</strong>.";
+				} else {
+					jPlayerInfo += "No solution is currently active. jPlayer needs a setMedia().";
+				}
+			}
+			jPlayerInfo += "</p>";
+
+			var formatType = $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.formatType;
+			jPlayerInfo += "<p><code>status.formatType = '" + formatType + "'</code><br />";
+			if(formatType) {
+				jPlayerInfo += "<code>Browser canPlay('" + $.jPlayer.prototype.format[formatType].codec + "')</code>";
+			} else {
+				jPlayerInfo += "</p>";
+			}
+			
+			jPlayerInfo += "<p><code>status.src = '" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.src + "'</code></p>";
+
+			jPlayerInfo += "<p><code>status.media = {<br />";
+			for(prop in $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.media) {
+				jPlayerInfo += "&nbsp;" + prop + ": " + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.media[prop] + "<br />"; // Some are strings
+			}
+			jPlayerInfo += "};</code></p>"
+
+			+ "<p>Raw browser test for HTML5 support. Should equal a function if HTML5 is available.<br />";
+			if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.audio.available) {
+				jPlayerInfo += "<code>htmlElement.audio.canPlayType = " + (typeof $(this).data("jPlayerInspector").jPlayer.data("jPlayer").htmlElement.audio.canPlayType) +"</code><br />"
+			}
+			if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.video.available) {
+				jPlayerInfo += "<code>htmlElement.video.canPlayType = " + (typeof $(this).data("jPlayerInspector").jPlayer.data("jPlayer").htmlElement.video.canPlayType) +"</code>";
+			}
+			jPlayerInfo += "</p>";
+
+			jPlayerInfo += "<p>This instance is using the constructor options:<br />"
+			+ "<code>$('#" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").internal.self.id + "').jPlayer({<br />"
+
+			+ "&nbsp;swfPath: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "swfPath") + "',<br />"
+
+			+ "&nbsp;solution: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "solution") + "',<br />"
+
+			+ "&nbsp;supplied: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "supplied") + "',<br />"
+
+			+ "&nbsp;preload: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "preload") + "',<br />"
+			
+			+ "&nbsp;volume: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "volume") + ",<br />"
+			
+			+ "&nbsp;muted: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "muted") + ",<br />"
+
+			+ "&nbsp;backgroundColor: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "backgroundColor") + "',<br />"
+
+			+ "&nbsp;cssSelectorAncestor: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelectorAncestor") + "',<br />"
+
+			+ "&nbsp;cssSelector: {";
+
+			var cssSelector = $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelector");
+			for(prop in cssSelector) {
+				
+				// jPlayerInfo += "<br />&nbsp;&nbsp;" + prop + ": '" + cssSelector[prop] + "'," // This works too of course, but want to use option method for deep keys.
+				jPlayerInfo += "<br />&nbsp;&nbsp;" + prop + ": '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelector." + prop) + "',"
+			}
+
+			jPlayerInfo = jPlayerInfo.slice(0, -1); // Because the sloppy comma was bugging me.
+
+			jPlayerInfo += "<br />&nbsp;},<br />"
+
+			+ "&nbsp;errorAlerts: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "errorAlerts") + ",<br />"
+			
+			+ "&nbsp;warningAlerts: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "warningAlerts") + "<br />"
+
+			+ "});</code></p>";
+			$(this).data("jPlayerInspector").configJq.html(jPlayerInfo);
+			return this;
+		},
+		updateStatus: function() { // This displays information about jPlayer's status in the inspector
+			$(this).data("jPlayerInspector").statusJq.html(
+				"<p>jPlayer is " +
+				($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.paused ? "paused" : "playing") +
+				" at time: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentTime*10)/10 + "s." +
+				" (d: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.duration*10)/10 + "s" +
+				", sp: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.seekPercent) + "%" +
+				", cpr: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentPercentRelative) + "%" +
+				", cpa: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentPercentAbsolute) + "%)</p>"
+			);
+			return this;
+		}
+	};
+	$.fn.jPlayerInspector = function( method ) {
+		// Method calling logic
+		if ( methods[method] ) {
+			return methods[ method ].apply( this, Array.prototype.slice.call( arguments, 1 ));
+		} else if ( typeof method === 'object' || ! method ) {
+			return methods.init.apply( this, arguments );
+		} else {
+			$.error( 'Method ' +  method + ' does not exist on jQuery.jPlayerInspector' );
+		}    
+	};
+})(jQuery);
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as
new file mode 100644
index 00000000000..addb97a7ae4
--- /dev/null
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as
@@ -0,0 +1,69 @@
+/*
+ * jPlayer Plugin for jQuery JavaScript Library
+ * http://www.happyworm.com/jquery/jplayer
+ *
+ * Copyright (c) 2009 - 2011 Happyworm Ltd
+ * Dual licensed under the MIT and GPL licenses.
+ *  - http://www.opensource.org/licenses/mit-license.php
+ *  - http://www.gnu.org/copyleft/gpl.html
+ *
+ * Author: Mark J Panaghiston
+ * Date: 8th August 2011
+ */
+
+package happyworm.jPlayer {
+	import flash.events.Event;
+	
+	public class JplayerEvent extends Event {
+		
+		// The event strings must match those in the JavaScript's $.jPlayer.event object
+
+		public static const JPLAYER_READY:String = "jPlayer_ready";
+		public static const JPLAYER_FLASHRESET:String = "jPlayer_flashreset"; // Handled in JavaScript
+		public static const JPLAYER_RESIZE:String = "jPlayer_resize"; // Handled in JavaScript
+		public static const JPLAYER_REPEAT:String = "jPlayer_repeat"; // Handled in JavaScript
+		public static const JPLAYER_CLICK:String = "jPlayer_click";
+		public static const JPLAYER_ERROR:String = "jPlayer_error";
+		public static const JPLAYER_WARNING:String = "jPlayer_warning"; // Currently not used by the flash solution
+
+		public static const JPLAYER_LOADSTART:String = "jPlayer_loadstart";
+		public static const JPLAYER_PROGRESS:String = "jPlayer_progress";
+		public static const JPLAYER_SUSPEND:String = "jPlayer_suspend"; // Not implemented
+		public static const JPLAYER_ABORT:String = "jPlayer_abort"; // Not implemented
+		public static const JPLAYER_EMPTIED:String = "jPlayer_emptied"; // Not implemented
+		public static const JPLAYER_STALLED:String = "jPlayer_stalled"; // Not implemented
+		public static const JPLAYER_PLAY:String = "jPlayer_play";
+		public static const JPLAYER_PAUSE:String = "jPlayer_pause";
+		public static const JPLAYER_LOADEDMETADATA:String = "jPlayer_loadedmetadata"; // MP3 has no equivilent
+		public static const JPLAYER_LOADEDDATA:String = "jPlayer_loadeddata"; // Not implemented
+		public static const JPLAYER_WAITING:String = "jPlayer_waiting"; // Not implemented
+		public static const JPLAYER_PLAYING:String = "jPlayer_playing"; // Not implemented
+		public static const JPLAYER_CANPLAY:String = "jPlayer_canplay"; // Not implemented
+		public static const JPLAYER_CANPLAYTHROUGH:String = "jPlayer_canplaythrough"; // Not implemented
+		public static const JPLAYER_SEEKING:String = "jPlayer_seeking";
+		public static const JPLAYER_SEEKED:String = "jPlayer_seeked";
+		public static const JPLAYER_TIMEUPDATE:String = "jPlayer_timeupdate";
+		public static const JPLAYER_ENDED:String = "jPlayer_ended";
+		public static const JPLAYER_RATECHANGE:String = "jPlayer_ratechange"; // Not implemented
+		public static const JPLAYER_DURATIONCHANGE:String = "jPlayer_durationchange"; // Not implemented
+		public static const JPLAYER_VOLUMECHANGE:String = "jPlayer_volumechange"; // See JavaScript
+
+		// Events used internal to jPlayer's Flash.
+		public static const DEBUG_MSG:String = "debug_msg";
+
+		public var data:JplayerStatus;
+		public var msg:String = ""
+
+		public function JplayerEvent(type:String, data:JplayerStatus, msg:String = "", bubbles:Boolean = false, cancelable:Boolean = false) {
+			super(type, bubbles, cancelable);
+			this.data = data;
+			this.msg = msg;
+		}
+		public override function clone():Event {
+			return new JplayerEvent(type, data, msg, bubbles, cancelable);
+		}
+		public override function toString():String {
+			return formatToString("JplayerEvent", "type", "bubbles", "cancelable", "eventPhase", "data", "msg");
+		}
+	}
+}
\ No newline at end of file
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as
new file mode 100644
index 00000000000..8c51d5b7633
--- /dev/null
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as
@@ -0,0 +1,328 @@
+/*
+ * jPlayer Plugin for jQuery JavaScript Library
+ * http://www.happyworm.com/jquery/jplayer
+ *
+ * Copyright (c) 2009 - 2011 Happyworm Ltd
+ * Dual licensed under the MIT and GPL licenses.
+ *  - http://www.opensource.org/licenses/mit-license.php
+ *  - http://www.gnu.org/copyleft/gpl.html
+ *
+ * Author: Mark J Panaghiston
+ * Date: 1st September 2011
+ */
+
+package happyworm.jPlayer {
+	import flash.display.Sprite;
+
+	import flash.media.Sound;
+	import flash.media.SoundChannel;
+	import flash.media.SoundLoaderContext;
+	import flash.media.SoundTransform;
+	import flash.net.URLRequest;
+	import flash.utils.Timer;
+	import flash.errors.IOError;
+	import flash.events.*;
+
+	public class JplayerMp3 extends Sprite {
+		private var mySound:Sound = new Sound();
+		private var myChannel:SoundChannel = new SoundChannel();
+		private var myContext:SoundLoaderContext = new SoundLoaderContext(3000, false);
+		private var myTransform:SoundTransform = new SoundTransform();
+		private var myRequest:URLRequest = new URLRequest();
+
+		private var timeUpdateTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
+		private var progressTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
+		private var seekingTimer:Timer = new Timer(100, 0); // Internal: How often seeking is checked to see if it is over.
+		
+		public var myStatus:JplayerStatus = new JplayerStatus();
+
+		public function JplayerMp3(volume:Number) {
+			timeUpdateTimer.addEventListener(TimerEvent.TIMER, timeUpdateHandler);
+			progressTimer.addEventListener(TimerEvent.TIMER, progressHandler);
+			seekingTimer.addEventListener(TimerEvent.TIMER, seekingHandler);
+			setVolume(volume);
+		}
+		public function setFile(src:String):void {
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "setFile: " + src));
+			if(myStatus.isPlaying) {
+				myChannel.stop();
+				progressUpdates(false);
+				timeUpdates(false);
+			}
+			try {
+				mySound.close();
+			} catch (err:IOError) {
+				// Occurs if the file is either yet to be opened or has finished downloading.
+			}
+			mySound = null;
+			mySound = new Sound();
+			mySound.addEventListener(IOErrorEvent.IO_ERROR, errorHandler);
+			mySound.addEventListener(Event.OPEN, loadOpen);
+			mySound.addEventListener(Event.COMPLETE, loadComplete);
+			myRequest = new URLRequest(src);
+			myStatus.reset();
+			myStatus.src = src;
+			myStatus.srcSet = true;
+			timeUpdateEvent();
+		}
+		public function clearFile():void {
+			setFile("");
+			myStatus.srcSet = false;
+		}
+		private function errorHandler(err:IOErrorEvent):void {
+			// MP3 player needs to stop progress and timeupdate events as they are started before the error occurs.
+			// NB: The MP4 player works differently and the error occurs before they are started.
+			progressUpdates(false);
+			timeUpdates(false);
+			myStatus.error(); // Resets status except the src, and it sets srcError property.
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ERROR, myStatus));
+		}
+		private function loadOpen(e:Event):void {
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "loadOpen:"));
+			myStatus.loading();
+			if(myStatus.playOnLoad) {
+				myStatus.playOnLoad = false; // Capture the flag
+				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus)); // So loadstart event happens before play event occurs.
+				play();
+			} else {
+				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus));
+				pause();
+			}
+			progressUpdates(true);
+		}
+		private function loadComplete(e:Event):void {
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "loadComplete:"));
+			myStatus.loaded();
+			progressUpdates(false);
+			progressEvent();
+		}
+		private function soundCompleteHandler(e:Event):void {
+			myStatus.pausePosition = 0;
+			myStatus.isPlaying = false;
+			timeUpdates(false);
+			timeUpdateEvent();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ENDED, myStatus));
+		}
+		private function progressUpdates(active:Boolean):void {
+			// Using a timer rather than Flash's load progress event, because that event gave data at about 200Hz. The 10Hz timer is closer to HTML5 norm.
+			if(active) {
+				progressTimer.start();
+			} else {
+				progressTimer.stop();
+			}
+		}
+		private function progressHandler(e:TimerEvent):void {
+			progressEvent();
+		}
+		private function progressEvent():void {
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressEvent:"));
+			updateStatusValues();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PROGRESS, myStatus));
+		}
+		private function timeUpdates(active:Boolean):void {
+			if(active) {
+				timeUpdateTimer.start();
+			} else {
+				timeUpdateTimer.stop();
+			}
+		}
+		private function timeUpdateHandler(e:TimerEvent):void {
+			timeUpdateEvent();
+		}
+		private function timeUpdateEvent():void {
+			updateStatusValues();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_TIMEUPDATE, myStatus));
+		}
+		private function seeking(active:Boolean):void {
+			if(active) {
+				if(!myStatus.isSeeking) {
+					seekingEvent();
+					seekingTimer.start();
+				}
+			} else {
+				seekingTimer.stop();
+			}
+		}
+		private function seekingHandler(e:TimerEvent):void {
+			if(myStatus.pausePosition <= getDuration()) {
+				seekedEvent();
+				seeking(false);
+				if(myStatus.playOnSeek) {
+					myStatus.playOnSeek = false; // Capture the flag.
+					play();
+				}
+			} else if(myStatus.isLoaded && (myStatus.pausePosition > getDuration())) {
+				// Illegal seek time
+				seeking(false);
+				seekedEvent();
+				pause(0);
+			}
+		}
+		private function seekingEvent():void {
+			myStatus.isSeeking = true;
+			updateStatusValues();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKING, myStatus));
+		}
+		private function seekedEvent():void {
+			myStatus.isSeeking = false;
+			updateStatusValues();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKED, myStatus));
+		}
+		public function load():Boolean {
+			if(myStatus.loadRequired()) {
+				myStatus.startingDownload();
+				mySound.load(myRequest, myContext);
+				return true;
+			} else {
+				return false;
+			}
+		}
+		public function play(time:Number = NaN):Boolean {
+			var wasPlaying:Boolean = myStatus.isPlaying;
+
+			if(!isNaN(time) && myStatus.srcSet) {
+				if(myStatus.isPlaying) {
+					myChannel.stop();
+					myStatus.isPlaying = false;
+				}
+				myStatus.pausePosition = time;
+			}
+
+			if(myStatus.isStartingDownload) {
+				myStatus.playOnLoad = true; // Raise flag, captured in loadOpen()
+				return true;
+			} else if(myStatus.loadRequired()) {
+				myStatus.playOnLoad = true; // Raise flag, captured in loadOpen()
+				return load();
+			} else if((myStatus.isLoading || myStatus.isLoaded) && !myStatus.isPlaying) {
+				if(myStatus.isLoaded && myStatus.pausePosition > getDuration()) { // The time is invalid, ie., past the end.
+					myStatus.pausePosition = 0;
+					timeUpdates(false);
+					timeUpdateEvent();
+					if(wasPlaying) { // For when playing and then get a play(huge)
+						this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
+					}
+				} else if(myStatus.pausePosition > getDuration()) {
+					myStatus.playOnSeek = true;
+					seeking(true);
+				} else {
+					myStatus.isPlaying = true; // Set immediately before playing. Could affects events.
+					myChannel = mySound.play(myStatus.pausePosition);
+					myChannel.soundTransform = myTransform;
+					myChannel.addEventListener(Event.SOUND_COMPLETE, soundCompleteHandler);
+					timeUpdates(true);
+					if(!wasPlaying) {
+						this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PLAY, myStatus));
+					}
+				}
+				return true;
+			} else {
+				return false;
+			}
+		}
+		public function pause(time:Number = NaN):Boolean {
+			myStatus.playOnLoad = false; // Reset flag in case load/play issued immediately before this command, ie., before loadOpen() event.
+			myStatus.playOnSeek = false; // Reset flag in case play(time) issued before the command and is still seeking to time set.
+
+			var wasPlaying:Boolean = myStatus.isPlaying;
+
+			// To avoid possible loops with timeupdate and pause(time). A pause() does not have the problem.
+			var alreadyPausedAtTime:Boolean = false;
+			if(!isNaN(time) && myStatus.pausePosition == time) {
+				alreadyPausedAtTime = true;
+			}
+
+			if(myStatus.isPlaying) {
+				myStatus.isPlaying = false;
+				myChannel.stop();
+				if(myChannel.position > 0) { // Required otherwise a fast play then pause causes myChannel.position to equal zero and not the correct value. ie., When it happens leave pausePosition alone.
+					myStatus.pausePosition = myChannel.position;
+				}
+			}
+
+			if(!isNaN(time) && myStatus.srcSet) {
+				myStatus.pausePosition = time;
+			}
+
+			if(wasPlaying) {
+				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
+			}
+			
+			if(myStatus.isStartingDownload) {
+				return true;
+			} else if(myStatus.loadRequired()) {
+				if(time > 0) { // We do not want the stop() command, which does pause(0), causing a load operation.
+					return load();
+				} else {
+					return true; // Technically the pause(0) succeeded. ie., It did nothing, since nothing was required.
+				}
+			} else if(myStatus.isLoading || myStatus.isLoaded) {
+				if(myStatus.isLoaded && myStatus.pausePosition > getDuration()) { // The time is invalid, ie., past the end.
+					myStatus.pausePosition = 0;
+				} else if(myStatus.pausePosition > getDuration()) {
+					seeking(true);
+				}
+				timeUpdates(false);
+				// Need to be careful with timeupdate event, otherwise a pause in a timeupdate event can cause a loop.
+				// Neither pause() nor pause(time) will cause a timeupdate loop.
+				if(wasPlaying || !isNaN(time) && !alreadyPausedAtTime) {
+					timeUpdateEvent();
+				}
+				return true;
+			} else {
+				return false;
+			}
+		}
+		public function playHead(percent:Number):Boolean {
+			var time:Number = percent * getDuration() / 100;
+			if(myStatus.isPlaying || myStatus.playOnLoad || myStatus.playOnSeek) {
+				return play(time);
+			} else {
+				return pause(time);
+			}
+		}
+		public function setVolume(v:Number):void {
+			myStatus.volume = v;
+			myTransform.volume = v;
+			myChannel.soundTransform = myTransform;
+		}
+		private function updateStatusValues():void {
+			myStatus.seekPercent = 100 * getLoadRatio();
+			myStatus.currentTime = getCurrentTime();
+			myStatus.currentPercentRelative = 100 * getCurrentRatioRel();
+			myStatus.currentPercentAbsolute = 100 * getCurrentRatioAbs();
+			myStatus.duration = getDuration();
+		}
+		public function getLoadRatio():Number {
+			if((myStatus.isLoading || myStatus.isLoaded) && mySound.bytesTotal > 0) {
+				return mySound.bytesLoaded / mySound.bytesTotal;
+			} else {
+				return 0;
+			}
+		}
+		public function getDuration():Number {
+			if(mySound.length > 0) {
+				return mySound.length;
+			} else {
+				return 0;
+			}
+		}
+		public function getCurrentTime():Number {
+			if(myStatus.isPlaying) {
+				return myChannel.position;
+			} else {
+				return myStatus.pausePosition;
+			}
+		}
+		public function getCurrentRatioRel():Number {
+			if((getDuration() > 0) && (getCurrentTime() <= getDuration())) {
+				return getCurrentTime() / getDuration();
+			} else {
+				return 0;
+			}
+		}
+		public function getCurrentRatioAbs():Number {
+			return getCurrentRatioRel() * getLoadRatio();
+		}
+	}
+}
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as
new file mode 100644
index 00000000000..dcdc0655d0d
--- /dev/null
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as
@@ -0,0 +1,413 @@
+/*
+ * jPlayer Plugin for jQuery JavaScript Library
+ * http://www.happyworm.com/jquery/jplayer
+ *
+ * Copyright (c) 2009 - 2011 Happyworm Ltd
+ * Dual licensed under the MIT and GPL licenses.
+ *  - http://www.opensource.org/licenses/mit-license.php
+ *  - http://www.gnu.org/copyleft/gpl.html
+ *
+ * Author: Mark J Panaghiston
+ * Date: 7th August 2011
+ */
+
+package happyworm.jPlayer {
+	import flash.display.Sprite;
+
+	import flash.media.Video;
+	import flash.media.SoundTransform;
+
+	import flash.net.NetConnection;
+	import flash.net.NetStream;
+
+	import flash.utils.Timer;
+
+	import flash.events.NetStatusEvent;
+	import flash.events.SecurityErrorEvent;
+	import flash.events.TimerEvent;
+
+	public class JplayerMp4 extends Sprite {
+		
+		public var myVideo:Video = new Video();
+		private var myConnection:NetConnection;
+		private var myStream:NetStream;
+		
+		private var myTransform:SoundTransform = new SoundTransform();
+
+		public var myStatus:JplayerStatus = new JplayerStatus();
+		
+		private var timeUpdateTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
+		private var progressTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
+		private var seekingTimer:Timer = new Timer(100, 0); // Internal: How often seeking is checked to see if it is over.
+
+		public function JplayerMp4(volume:Number) {
+			myConnection = new NetConnection();
+			myConnection.addEventListener(NetStatusEvent.NET_STATUS, netStatusHandler);
+			myConnection.addEventListener(SecurityErrorEvent.SECURITY_ERROR, securityErrorHandler);
+			myVideo.smoothing = true;
+			this.addChild(myVideo);
+			
+			timeUpdateTimer.addEventListener(TimerEvent.TIMER, timeUpdateHandler);
+			progressTimer.addEventListener(TimerEvent.TIMER, progressHandler);
+			seekingTimer.addEventListener(TimerEvent.TIMER, seekingHandler);
+
+			myStatus.volume = volume;
+		}
+		private function progressUpdates(active:Boolean):void {
+			if(active) {
+				progressTimer.start();
+			} else {
+				progressTimer.stop();
+			}
+		}
+		private function progressHandler(e:TimerEvent):void {
+			if(myStatus.isLoading) {
+				if(getLoadRatio() == 1) { // Close as can get to a loadComplete event since client.onPlayStatus only works with FMS
+					this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressHandler: loadComplete"));
+					myStatus.loaded();
+					progressUpdates(false);
+				}
+			}
+			progressEvent();
+		}
+		private function progressEvent():void {
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressEvent:"));
+			updateStatusValues();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PROGRESS, myStatus));
+		}
+		private function timeUpdates(active:Boolean):void {
+			if(active) {
+				timeUpdateTimer.start();
+			} else {
+				timeUpdateTimer.stop();
+			}
+		}
+		private function timeUpdateHandler(e:TimerEvent):void {
+			timeUpdateEvent();
+		}
+		private function timeUpdateEvent():void {
+			updateStatusValues();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_TIMEUPDATE, myStatus));
+		}
+		private function seeking(active:Boolean):void {
+			if(active) {
+				if(!myStatus.isSeeking) {
+					seekingEvent();
+				}
+				seekingTimer.start();
+			} else {
+				if(myStatus.isSeeking) {
+					seekedEvent();
+				}
+				seekingTimer.stop();
+			}
+		}
+		private function seekingHandler(e:TimerEvent):void {
+			if(getSeekTimeRatio() <= getLoadRatio()) {
+				seeking(false);
+				if(myStatus.playOnSeek) {
+					myStatus.playOnSeek = false; // Capture the flag.
+					play(myStatus.pausePosition); // Must pass time or the seek time is never set.
+				} else {
+					pause(myStatus.pausePosition); // Must pass time or the stream.time is read.
+				}
+			} else if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) {
+				// Illegal seek time
+				seeking(false);
+				pause(0);
+			}
+		}
+		private function seekingEvent():void {
+			myStatus.isSeeking = true;
+			updateStatusValues();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKING, myStatus));
+		}
+		private function seekedEvent():void {
+			myStatus.isSeeking = false;
+			updateStatusValues();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKED, myStatus));
+		}
+		private function netStatusHandler(e:NetStatusEvent):void {
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "netStatusHandler: '" + e.info.code + "'"));
+			switch(e.info.code) {
+				case "NetConnection.Connect.Success":
+					connectStream();
+					break;
+				case "NetStream.Play.Start":
+					// This event code occurs once, when the media is opened. Equiv to loadOpen() in mp3 player.
+					myStatus.loading();
+					this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus));
+					progressUpdates(true);
+					// See onMetaDataHandler() for other condition, since duration is vital.
+					break;
+				case "NetStream.Play.Stop":
+					this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "NetStream.Play.Stop: getDuration() - getCurrentTime() = " + (getDuration() - getCurrentTime())));
+
+					// Check if media is at the end (or close) otherwise this was due to download bandwidth stopping playback. ie., Download is not fast enough.
+					if(Math.abs(getDuration() - getCurrentTime()) < 150) { // Testing found 150ms worked best for M4A files, where playHead(99.9) caused a stuck state due to firing with ~116ms left to play.
+						endedEvent();
+					}
+					break;
+				case "NetStream.Seek.InvalidTime":
+					// Used for capturing invalid set times and clicks on the end of the progress bar.
+					endedEvent();
+					break;
+				case "NetStream.Play.StreamNotFound":
+					myStatus.error(); // Resets status except the src, and it sets srcError property.
+					this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ERROR, myStatus));
+					break;
+			}
+			// "NetStream.Seek.Notify" event code is not very useful. It occurs after every seek(t) command issued and does not appear to wait for the media to be ready.
+		}
+		private function endedEvent():void {
+			var wasPlaying:Boolean = myStatus.isPlaying;
+			pause(0);
+			timeUpdates(false);
+			timeUpdateEvent();
+			if(wasPlaying) {
+				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ENDED, myStatus));
+			}
+		}
+		private function securityErrorHandler(event:SecurityErrorEvent):void {
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "securityErrorHandler."));
+		}
+		private function connectStream():void {
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "connectStream."));
+			var customClient:Object = new Object();
+			customClient.onMetaData = onMetaDataHandler;
+			// customClient.onPlayStatus = onPlayStatusHandler; // According to the forums and my tests, onPlayStatus only works with FMS (Flash Media Server).
+			myStream = null;
+			myStream = new NetStream(myConnection);
+			myStream.addEventListener(NetStatusEvent.NET_STATUS, netStatusHandler);
+			myStream.client = customClient;
+			myVideo.attachNetStream(myStream);
+			setVolume(myStatus.volume);
+			myStream.play(myStatus.src);
+		}
+		public function setFile(src:String):void {
+			if(myStream != null) {
+				myStream.close();
+			}
+			myVideo.clear();
+			progressUpdates(false);
+			timeUpdates(false);
+
+			myStatus.reset();
+			myStatus.src = src;
+			myStatus.srcSet = true;
+			timeUpdateEvent();
+		}
+		public function clearFile():void {
+			setFile("");
+			myStatus.srcSet = false;
+		}
+		public function load():Boolean {
+			if(myStatus.loadRequired()) {
+				myStatus.startingDownload();
+				myConnection.connect(null);
+				return true;
+			} else {
+				return false;
+			}
+		}
+		public function play(time:Number = NaN):Boolean {
+			var wasPlaying:Boolean = myStatus.isPlaying;
+
+			if(!isNaN(time) && myStatus.srcSet) {
+				if(myStatus.isPlaying) {
+					myStream.pause();
+					myStatus.isPlaying = false;
+				}
+				myStatus.pausePosition = time;
+			}
+
+			if(myStatus.isStartingDownload) {
+				myStatus.playOnLoad = true; // Raise flag, captured in onMetaDataHandler()
+				return true;
+			} else if(myStatus.loadRequired()) {
+				myStatus.playOnLoad = true; // Raise flag, captured in onMetaDataHandler()
+				return load();
+			} else if((myStatus.isLoading || myStatus.isLoaded) && !myStatus.isPlaying) {
+				if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) { // The time is invalid, ie., past the end.
+					myStream.pause(); // Since it is playing by default at this point.
+					myStatus.pausePosition = 0;
+					myStream.seek(0);
+					timeUpdates(false);
+					timeUpdateEvent();
+					if(wasPlaying) { // For when playing and then get a play(huge)
+						this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
+					}
+				} else if(getSeekTimeRatio() > getLoadRatio()) { // Use an estimate based on the downloaded amount
+					myStatus.playOnSeek = true;
+					seeking(true);
+					myStream.pause(); // Since it is playing by default at this point.
+				} else {
+					if(!isNaN(time)) { // Avoid using seek() when it is already correct.
+						myStream.seek(myStatus.pausePosition/1000); // Since time is in ms and seek() takes seconds
+					}
+					myStatus.isPlaying = true; // Set immediately before playing. Could affects events.
+					myStream.resume();
+					timeUpdates(true);
+					if(!wasPlaying) {
+						this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PLAY, myStatus));
+					}
+				}
+				return true;
+			} else {
+				return false;
+			}
+		}
+		public function pause(time:Number = NaN):Boolean {
+			myStatus.playOnLoad = false; // Reset flag in case load/play issued immediately before this command, ie., before onMetadata() event.
+			myStatus.playOnSeek = false; // Reset flag in case play(time) issued before the command and is still seeking to time set.
+
+			var wasPlaying:Boolean = myStatus.isPlaying;
+
+			// To avoid possible loops with timeupdate and pause(time). A pause() does not have the problem.
+			var alreadyPausedAtTime:Boolean = false;
+			if(!isNaN(time) && myStatus.pausePosition == time) {
+				alreadyPausedAtTime = true;
+			}
+
+			// Need to wait for metadata to load before ever issuing a pause. The metadata handler will call this function if needed, when ready.
+			if(myStream != null && myStatus.metaDataReady) { // myStream is a null until the 1st media is loaded. ie., The 1st ever setMedia being followed by a pause() or pause(t).
+				myStream.pause();
+			}
+			if(myStatus.isPlaying) {
+				myStatus.isPlaying = false;
+				myStatus.pausePosition = myStream.time * 1000;
+			}
+			
+			if(!isNaN(time) && myStatus.srcSet) {
+				myStatus.pausePosition = time;
+			}
+
+			if(wasPlaying) {
+				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
+			}
+
+			if(myStatus.isStartingDownload) {
+				return true;
+			} else if(myStatus.loadRequired()) {
+				if(time > 0) { // We do not want the stop() command, which does pause(0), causing a load operation.
+					return load();
+				} else {
+					return true; // Technically the pause(0) succeeded. ie., It did nothing, since nothing was required.
+				}
+			} else if(myStatus.isLoading || myStatus.isLoaded) {
+				if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) { // The time is invalid, ie., past the end.
+					myStatus.pausePosition = 0;
+					myStream.seek(0);
+					seekedEvent(); // Deals with seeking effect when using setMedia() then pause(huge). NB: There is no preceeding seeking event.
+				} else if(!isNaN(time)) {
+					if(getSeekTimeRatio() > getLoadRatio()) { // Use an estimate based on the downloaded amount
+						seeking(true);
+					} else {
+						if(myStatus.metaDataReady) { // Otherwise seek(0) will stop the metadata loading.
+							myStream.seek(myStatus.pausePosition/1000);
+						}
+					}
+				}
+				timeUpdates(false);
+				// Need to be careful with timeupdate event, otherwise a pause in a timeupdate event can cause a loop.
+				// Neither pause() nor pause(time) will cause a timeupdate loop.
+				if(wasPlaying || !isNaN(time) && !alreadyPausedAtTime) {
+					timeUpdateEvent();
+				}
+				return true;
+			} else {
+				return false;
+			}
+		}
+		public function playHead(percent:Number):Boolean {
+			var time:Number = percent * getDuration() * getLoadRatio() / 100;
+			if(myStatus.isPlaying || myStatus.playOnLoad || myStatus.playOnSeek) {
+				return play(time);
+			} else {
+				return pause(time);
+			}
+		}
+		public function setVolume(v:Number):void {
+			myStatus.volume = v;
+			myTransform.volume = v;
+			if(myStream != null) {
+				myStream.soundTransform = myTransform;
+			}
+		}
+		private function updateStatusValues():void {
+			myStatus.seekPercent = 100 * getLoadRatio();
+			myStatus.currentTime = getCurrentTime();
+			myStatus.currentPercentRelative = 100 * getCurrentRatioRel();
+			myStatus.currentPercentAbsolute = 100 * getCurrentRatioAbs();
+			myStatus.duration = getDuration();
+		}
+		public function getLoadRatio():Number {
+			if((myStatus.isLoading || myStatus.isLoaded) && myStream.bytesTotal > 0) {
+				return myStream.bytesLoaded / myStream.bytesTotal;
+			} else {
+				return 0;
+			}
+		}
+		public function getDuration():Number {
+			return myStatus.duration; // Set from meta data.
+		}
+		public function getCurrentTime():Number {
+			if(myStatus.isPlaying) {
+				return myStream.time * 1000;
+			} else {
+				return myStatus.pausePosition;
+			}
+		}
+		public function getCurrentRatioRel():Number {
+			if((getLoadRatio() > 0) && (getCurrentRatioAbs() <= getLoadRatio())) {
+				return getCurrentRatioAbs() / getLoadRatio();
+			} else {
+				return 0;
+			}
+		}
+		public function getCurrentRatioAbs():Number {
+			if(getDuration() > 0) {
+				return getCurrentTime() / getDuration();
+			} else {
+				return 0;
+			}
+		}
+		public function getSeekTimeRatio():Number {
+			if(getDuration() > 0) {
+				return myStatus.pausePosition / getDuration();
+			} else {
+				return 1;
+			}
+		}
+		public function onMetaDataHandler(info:Object):void { // Used in connectStream() in myStream.client object.
+			// This event occurs when jumping to the start of static files! ie., seek(0) will cause this event to occur.
+			if(!myStatus.metaDataReady) {
+				this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "onMetaDataHandler: " + info.duration + " | " + info.width + "x" + info.height));
+
+				myStatus.metaDataReady = true; // Set flag so that this event only effects jPlayer the 1st time.
+				myStatus.metaData = info;
+				myStatus.duration = info.duration * 1000; // Only available via Meta Data.
+				if(info.width != undefined) {
+					myVideo.width = info.width;
+				}
+				if(info.height != undefined) {
+					myVideo.height = info.height;
+				}
+
+				if(myStatus.playOnLoad) {
+					myStatus.playOnLoad = false; // Capture the flag
+					if(myStatus.pausePosition > 0 ) { // Important for setMedia followed by play(time).
+						play(myStatus.pausePosition);
+					} else {
+						play(); // Not always sending pausePosition avoids the extra seek(0) for a normal play() command.
+					}
+				} else {
+					pause(myStatus.pausePosition); // Always send the pausePosition. Important for setMedia() followed by pause(time). Deals with not reading stream.time with setMedia() and play() immediately followed by stop() or pause(0)
+				}
+				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADEDMETADATA, myStatus));
+			} else {
+				this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "onMetaDataHandler: Already read (NO EFFECT)"));
+			}
+		}
+	}
+}
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as
new file mode 100644
index 00000000000..5cc1e1ff4b3
--- /dev/null
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as
@@ -0,0 +1,101 @@
+/*
+ * jPlayer Plugin for jQuery JavaScript Library
+ * http://www.happyworm.com/jquery/jplayer
+ *
+ * Copyright (c) 2009 - 2011 Happyworm Ltd
+ * Dual licensed under the MIT and GPL licenses.
+ *  - http://www.opensource.org/licenses/mit-license.php
+ *  - http://www.gnu.org/copyleft/gpl.html
+ *
+ * Author: Mark J Panaghiston
+ * Date: 1st September 2011
+ */
+
+package happyworm.jPlayer {
+	public class JplayerStatus {
+
+		public static const VERSION:String = "2.1.0"; // The version of the Flash jPlayer entity.
+
+		public var volume:Number = 0.5; // Not affected by reset()
+		public var muted:Boolean = false; // Not affected by reset()
+
+		public var src:String;
+		public var srcError:Boolean;
+
+		public var srcSet:Boolean;
+		public var isPlaying:Boolean;
+		public var isSeeking:Boolean;
+
+		public var playOnLoad:Boolean;
+		public var playOnSeek:Boolean;
+
+		public var isStartingDownload:Boolean;
+		public var isLoading:Boolean;
+		public var isLoaded:Boolean;
+
+		public var pausePosition:Number;
+
+		public var seekPercent:Number;
+		public var currentTime:Number;
+		public var currentPercentRelative:Number;
+		public var currentPercentAbsolute:Number;
+		public var duration:Number;
+		
+		public var metaDataReady:Boolean;
+		public var metaData:Object;
+
+		public function JplayerStatus() {
+			reset();
+		}
+		public function reset():void {
+			src = "";
+			srcError = false;
+
+			srcSet = false;
+			isPlaying = false;
+			isSeeking = false;
+
+			playOnLoad = false;
+			playOnSeek = false;
+
+			isStartingDownload = false;
+			isLoading = false;
+			isLoaded = false;
+
+			pausePosition = 0;
+
+			seekPercent = 0;
+			currentTime = 0;
+			currentPercentRelative = 0;
+			currentPercentAbsolute = 0;
+			duration = 0;
+			
+			metaDataReady = false;
+			metaData = {};
+		}
+		public function error():void {
+			var srcSaved:String = src;
+			reset();
+			src = srcSaved;
+			srcError = true;
+		}
+		public function loadRequired():Boolean {
+			return (srcSet && !isStartingDownload && !isLoading && !isLoaded);
+		}
+		public function startingDownload():void {
+			isStartingDownload = true;
+			isLoading = false;
+			isLoaded = false;
+		}
+		public function loading():void {
+			isStartingDownload = false;
+			isLoading = true;
+			isLoaded = false;
+		}
+		public function loaded():void {
+			isStartingDownload = false;
+			isLoading = false;
+			isLoaded = true;
+		}
+	}
+}
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js b/apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js
new file mode 100644
index 00000000000..9d41a12ee6c
--- /dev/null
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js
@@ -0,0 +1,2349 @@
+/*
+ * jPlayer Plugin for jQuery JavaScript Library
+ * http://www.jplayer.org
+ *
+ * Copyright (c) 2009 - 2011 Happyworm Ltd
+ * Dual licensed under the MIT and GPL licenses.
+ *  - http://www.opensource.org/licenses/mit-license.php
+ *  - http://www.gnu.org/copyleft/gpl.html
+ *
+ * Author: Mark J Panaghiston
+ * Version: 2.1.0
+ * Date: 1st September 2011
+ */
+
+/* Code verified using http://www.jshint.com/ */
+/*jshint asi:false, bitwise:false, boss:false, browser:true, curly:true, debug:false, eqeqeq:true, eqnull:false, evil:false, forin:false, immed:false, jquery:true, laxbreak:false, newcap:true, noarg:true, noempty:true, nonew:true, nomem:false, onevar:false, passfail:false, plusplus:false, regexp:false, undef:true, sub:false, strict:false, white:false */
+/*global jQuery:false, ActiveXObject:false, alert:false */
+
+(function($, undefined) {
+
+	// Adapted from jquery.ui.widget.js (1.8.7): $.widget.bridge
+	$.fn.jPlayer = function( options ) {
+		var name = "jPlayer";
+		var isMethodCall = typeof options === "string",
+			args = Array.prototype.slice.call( arguments, 1 ),
+			returnValue = this;
+
+		// allow multiple hashes to be passed on init
+		options = !isMethodCall && args.length ?
+			$.extend.apply( null, [ true, options ].concat(args) ) :
+			options;
+
+		// prevent calls to internal methods
+		if ( isMethodCall && options.charAt( 0 ) === "_" ) {
+			return returnValue;
+		}
+
+		if ( isMethodCall ) {
+			this.each(function() {
+				var instance = $.data( this, name ),
+					methodValue = instance && $.isFunction( instance[options] ) ?
+						instance[ options ].apply( instance, args ) :
+						instance;
+				if ( methodValue !== instance && methodValue !== undefined ) {
+					returnValue = methodValue;
+					return false;
+				}
+			});
+		} else {
+			this.each(function() {
+				var instance = $.data( this, name );
+				if ( instance ) {
+					// instance.option( options || {} )._init(); // Orig jquery.ui.widget.js code: Not recommend for jPlayer. ie., Applying new options to an existing instance (via the jPlayer constructor) and performing the _init(). The _init() is what concerns me. It would leave a lot of event handlers acting on jPlayer instance and the interface.
+					instance.option( options || {} ); // The new constructor only changes the options. Changing options only has basic support atm.
+				} else {
+					$.data( this, name, new $.jPlayer( options, this ) );
+				}
+			});
+		}
+
+		return returnValue;
+	};
+
+	$.jPlayer = function( options, element ) {
+		// allow instantiation without initializing for simple inheritance
+		if ( arguments.length ) {
+			this.element = $(element);
+			this.options = $.extend(true, {},
+				this.options,
+				options
+			);
+			var self = this;
+			this.element.bind( "remove.jPlayer", function() {
+				self.destroy();
+			});
+			this._init();
+		}
+	};
+	// End of: (Adapted from jquery.ui.widget.js (1.8.7))
+
+	// Emulated HTML5 methods and properties
+	$.jPlayer.emulateMethods = "load play pause";
+	$.jPlayer.emulateStatus = "src readyState networkState currentTime duration paused ended playbackRate";
+	$.jPlayer.emulateOptions = "muted volume";
+
+	// Reserved event names generated by jPlayer that are not part of the HTML5 Media element spec
+	$.jPlayer.reservedEvent = "ready flashreset resize repeat error warning";
+
+	// Events generated by jPlayer
+	$.jPlayer.event = {
+		ready: "jPlayer_ready",
+		flashreset: "jPlayer_flashreset", // Similar to the ready event if the Flash solution is set to display:none and then shown again or if it's reloaded for another reason by the browser. For example, using CSS position:fixed on Firefox for the full screen feature.
+		resize: "jPlayer_resize", // Occurs when the size changes through a full/restore screen operation or if the size/sizeFull options are changed.
+		repeat: "jPlayer_repeat", // Occurs when the repeat status changes. Usually through clicks on the repeat button of the interface.
+		click: "jPlayer_click", // Occurs when the user clicks on one of the following: poster image, html video, flash video.
+		error: "jPlayer_error", // Event error code in event.jPlayer.error.type. See $.jPlayer.error
+		warning: "jPlayer_warning", // Event warning code in event.jPlayer.warning.type. See $.jPlayer.warning
+
+		// Other events match HTML5 spec.
+		loadstart: "jPlayer_loadstart",
+		progress: "jPlayer_progress",
+		suspend: "jPlayer_suspend",
+		abort: "jPlayer_abort",
+		emptied: "jPlayer_emptied",
+		stalled: "jPlayer_stalled",
+		play: "jPlayer_play",
+		pause: "jPlayer_pause",
+		loadedmetadata: "jPlayer_loadedmetadata",
+		loadeddata: "jPlayer_loadeddata",
+		waiting: "jPlayer_waiting",
+		playing: "jPlayer_playing",
+		canplay: "jPlayer_canplay",
+		canplaythrough: "jPlayer_canplaythrough",
+		seeking: "jPlayer_seeking",
+		seeked: "jPlayer_seeked",
+		timeupdate: "jPlayer_timeupdate",
+		ended: "jPlayer_ended",
+		ratechange: "jPlayer_ratechange",
+		durationchange: "jPlayer_durationchange",
+		volumechange: "jPlayer_volumechange"
+	};
+
+	$.jPlayer.htmlEvent = [ // These HTML events are bubbled through to the jPlayer event, without any internal action.
+		"loadstart",
+		// "progress", // jPlayer uses internally before bubbling.
+		// "suspend", // jPlayer uses internally before bubbling.
+		"abort",
+		// "error", // jPlayer uses internally before bubbling.
+		"emptied",
+		"stalled",
+		// "play", // jPlayer uses internally before bubbling.
+		// "pause", // jPlayer uses internally before bubbling.
+		"loadedmetadata",
+		"loadeddata",
+		// "waiting", // jPlayer uses internally before bubbling.
+		// "playing", // jPlayer uses internally before bubbling.
+		"canplay",
+		"canplaythrough",
+		// "seeking", // jPlayer uses internally before bubbling.
+		// "seeked", // jPlayer uses internally before bubbling.
+		// "timeupdate", // jPlayer uses internally before bubbling.
+		// "ended", // jPlayer uses internally before bubbling.
+		"ratechange"
+		// "durationchange" // jPlayer uses internally before bubbling.
+		// "volumechange" // jPlayer uses internally before bubbling.
+	];
+
+	$.jPlayer.pause = function() {
+		$.each($.jPlayer.prototype.instances, function(i, element) {
+			if(element.data("jPlayer").status.srcSet) { // Check that media is set otherwise would cause error event.
+				element.jPlayer("pause");
+			}
+		});
+	};
+	
+	$.jPlayer.timeFormat = {
+		showHour: false,
+		showMin: true,
+		showSec: true,
+		padHour: false,
+		padMin: true,
+		padSec: true,
+		sepHour: ":",
+		sepMin: ":",
+		sepSec: ""
+	};
+
+	$.jPlayer.convertTime = function(s) {
+		var myTime = new Date(s * 1000);
+		var hour = myTime.getUTCHours();
+		var min = myTime.getUTCMinutes();
+		var sec = myTime.getUTCSeconds();
+		var strHour = ($.jPlayer.timeFormat.padHour && hour < 10) ? "0" + hour : hour;
+		var strMin = ($.jPlayer.timeFormat.padMin && min < 10) ? "0" + min : min;
+		var strSec = ($.jPlayer.timeFormat.padSec && sec < 10) ? "0" + sec : sec;
+		return (($.jPlayer.timeFormat.showHour) ? strHour + $.jPlayer.timeFormat.sepHour : "") + (($.jPlayer.timeFormat.showMin) ? strMin + $.jPlayer.timeFormat.sepMin : "") + (($.jPlayer.timeFormat.showSec) ? strSec + $.jPlayer.timeFormat.sepSec : "");
+	};
+
+	// Adapting jQuery 1.4.4 code for jQuery.browser. Required since jQuery 1.3.2 does not detect Chrome as webkit.
+	$.jPlayer.uaBrowser = function( userAgent ) {
+		var ua = userAgent.toLowerCase();
+
+		// Useragent RegExp
+		var rwebkit = /(webkit)[ \/]([\w.]+)/;
+		var ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/;
+		var rmsie = /(msie) ([\w.]+)/;
+		var rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/;
+
+		var match = rwebkit.exec( ua ) ||
+			ropera.exec( ua ) ||
+			rmsie.exec( ua ) ||
+			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
+			[];
+
+		return { browser: match[1] || "", version: match[2] || "0" };
+	};
+
+	// Platform sniffer for detecting mobile devices
+	$.jPlayer.uaPlatform = function( userAgent ) {
+		var ua = userAgent.toLowerCase();
+
+		// Useragent RegExp
+		var rplatform = /(ipad|iphone|ipod|android|blackberry|playbook|windows ce|webos)/;
+		var rtablet = /(ipad|playbook)/;
+		var randroid = /(android)/;
+		var rmobile = /(mobile)/;
+
+		var platform = rplatform.exec( ua ) || [];
+		var tablet = rtablet.exec( ua ) ||
+			!rmobile.exec( ua ) && randroid.exec( ua ) ||
+			[];
+
+		if(platform[1]) {
+			platform[1] = platform[1].replace(/\s/g, "_"); // Change whitespace to underscore. Enables dot notation.
+		}
+
+		return { platform: platform[1] || "", tablet: tablet[1] || "" };
+	};
+
+	$.jPlayer.browser = {
+	};
+	$.jPlayer.platform = {
+	};
+
+	var browserMatch = $.jPlayer.uaBrowser(navigator.userAgent);
+	if ( browserMatch.browser ) {
+		$.jPlayer.browser[ browserMatch.browser ] = true;
+		$.jPlayer.browser.version = browserMatch.version;
+	}
+	var platformMatch = $.jPlayer.uaPlatform(navigator.userAgent);
+	if ( platformMatch.platform ) {
+		$.jPlayer.platform[ platformMatch.platform ] = true;
+		$.jPlayer.platform.mobile = !platformMatch.tablet;
+		$.jPlayer.platform.tablet = !!platformMatch.tablet;
+	}
+
+	$.jPlayer.prototype = {
+		count: 0, // Static Variable: Change it via prototype.
+		version: { // Static Object
+			script: "2.1.0",
+			needFlash: "2.1.0",
+			flash: "unknown"
+		},
+		options: { // Instanced in $.jPlayer() constructor
+			swfPath: "js", // Path to Jplayer.swf. Can be relative, absolute or server root relative.
+			solution: "html, flash", // Valid solutions: html, flash. Order defines priority. 1st is highest,
+			supplied: "mp3", // Defines which formats jPlayer will try and support and the priority by the order. 1st is highest,
+			preload: 'metadata',  // HTML5 Spec values: none, metadata, auto.
+			volume: 0.8, // The volume. Number 0 to 1.
+			muted: false,
+			wmode: "opaque", // Valid wmode: window, transparent, opaque, direct, gpu. 
+			backgroundColor: "#000000", // To define the jPlayer div and Flash background color.
+			cssSelectorAncestor: "#jp_container_1",
+			cssSelector: { // * denotes properties that should only be required when video media type required. _cssSelector() would require changes to enable splitting these into Audio and Video defaults.
+				videoPlay: ".jp-video-play", // *
+				play: ".jp-play",
+				pause: ".jp-pause",
+				stop: ".jp-stop",
+				seekBar: ".jp-seek-bar",
+				playBar: ".jp-play-bar",
+				mute: ".jp-mute",
+				unmute: ".jp-unmute",
+				volumeBar: ".jp-volume-bar",
+				volumeBarValue: ".jp-volume-bar-value",
+				volumeMax: ".jp-volume-max",
+				currentTime: ".jp-current-time",
+				duration: ".jp-duration",
+				fullScreen: ".jp-full-screen", // *
+				restoreScreen: ".jp-restore-screen", // *
+				repeat: ".jp-repeat",
+				repeatOff: ".jp-repeat-off",
+				gui: ".jp-gui", // The interface used with autohide feature.
+				noSolution: ".jp-no-solution" // For error feedback when jPlayer cannot find a solution.
+			},
+			fullScreen: false,
+			autohide: {
+				restored: false, // Controls the interface autohide feature.
+				full: true, // Controls the interface autohide feature.
+				fadeIn: 200, // Milliseconds. The period of the fadeIn anim.
+				fadeOut: 600, // Milliseconds. The period of the fadeOut anim.
+				hold: 1000 // Milliseconds. The period of the pause before autohide beings.
+			},
+			loop: false,
+			repeat: function(event) { // The default jPlayer repeat event handler
+				if(event.jPlayer.options.loop) {
+					$(this).unbind(".jPlayerRepeat").bind($.jPlayer.event.ended + ".jPlayer.jPlayerRepeat", function() {
+						$(this).jPlayer("play");
+					});
+				} else {
+					$(this).unbind(".jPlayerRepeat");
+				}
+			},
+			nativeVideoControls: {
+				// Works well on standard browsers.
+				// Phone and tablet browsers can have problems with the controls disappearing.
+			},
+			noFullScreen: {
+				msie: /msie [0-6]/,
+				ipad: /ipad.*?os [0-4]/,
+				iphone: /iphone/,
+				ipod: /ipod/,
+				android_pad: /android [0-3](?!.*?mobile)/,
+				android_phone: /android.*?mobile/,
+				blackberry: /blackberry/,
+				windows_ce: /windows ce/,
+				webos: /webos/
+			},
+			noVolume: {
+				ipad: /ipad/,
+				iphone: /iphone/,
+				ipod: /ipod/,
+				android_pad: /android(?!.*?mobile)/,
+				android_phone: /android.*?mobile/,
+				blackberry: /blackberry/,
+				windows_ce: /windows ce/,
+				webos: /webos/,
+				playbook: /playbook/
+			},
+			verticalVolume: false, // Calculate volume from the bottom of the volume bar. Default is from the left. Also volume affects either width or height.
+			// globalVolume: false, // Not implemented: Set to make volume changes affect all jPlayer instances
+			// globalMute: false, // Not implemented: Set to make mute changes affect all jPlayer instances
+			idPrefix: "jp", // Prefix for the ids of html elements created by jPlayer. For flash, this must not include characters: . - + * / \
+			noConflict: "jQuery",
+			emulateHtml: false, // Emulates the HTML5 Media element on the jPlayer element.
+			errorAlerts: false,
+			warningAlerts: false
+		},
+		optionsAudio: {
+			size: {
+				width: "0px",
+				height: "0px",
+				cssClass: ""
+			},
+			sizeFull: {
+				width: "0px",
+				height: "0px",
+				cssClass: ""
+			}
+		},
+		optionsVideo: {
+			size: {
+				width: "480px",
+				height: "270px",
+				cssClass: "jp-video-270p"
+			},
+			sizeFull: {
+				width: "100%",
+				height: "100%",
+				cssClass: "jp-video-full"
+			}
+		},
+		instances: {}, // Static Object
+		status: { // Instanced in _init()
+			src: "",
+			media: {},
+			paused: true,
+			format: {},
+			formatType: "",
+			waitForPlay: true, // Same as waitForLoad except in case where preloading.
+			waitForLoad: true,
+			srcSet: false,
+			video: false, // True if playing a video
+			seekPercent: 0,
+			currentPercentRelative: 0,
+			currentPercentAbsolute: 0,
+			currentTime: 0,
+			duration: 0,
+			readyState: 0,
+			networkState: 0,
+			playbackRate: 1,
+			ended: 0
+
+/*		Persistant status properties created dynamically at _init():
+			width
+			height
+			cssClass
+			nativeVideoControls
+			noFullScreen
+			noVolume
+*/
+		},
+
+		internal: { // Instanced in _init()
+			ready: false
+			// instance: undefined
+			// domNode: undefined
+			// htmlDlyCmdId: undefined
+			// autohideId: undefined
+		},
+		solution: { // Static Object: Defines the solutions built in jPlayer.
+			html: true,
+			flash: true
+		},
+		// 'MPEG-4 support' : canPlayType('video/mp4; codecs="mp4v.20.8"')
+		format: { // Static Object
+			mp3: {
+				codec: 'audio/mpeg; codecs="mp3"',
+				flashCanPlay: true,
+				media: 'audio'
+			},
+			m4a: { // AAC / MP4
+				codec: 'audio/mp4; codecs="mp4a.40.2"',
+				flashCanPlay: true,
+				media: 'audio'
+			},
+			oga: { // OGG
+				codec: 'audio/ogg; codecs="vorbis"',
+				flashCanPlay: false,
+				media: 'audio'
+			},
+			wav: { // PCM
+				codec: 'audio/wav; codecs="1"',
+				flashCanPlay: false,
+				media: 'audio'
+			},
+			webma: { // WEBM
+				codec: 'audio/webm; codecs="vorbis"',
+				flashCanPlay: false,
+				media: 'audio'
+			},
+			fla: { // FLV / F4A
+				codec: 'audio/x-flv',
+				flashCanPlay: true,
+				media: 'audio'
+			},
+			m4v: { // H.264 / MP4
+				codec: 'video/mp4; codecs="avc1.42E01E, mp4a.40.2"',
+				flashCanPlay: true,
+				media: 'video'
+			},
+			ogv: { // OGG
+				codec: 'video/ogg; codecs="theora, vorbis"',
+				flashCanPlay: false,
+				media: 'video'
+			},
+			webmv: { // WEBM
+				codec: 'video/webm; codecs="vorbis, vp8"',
+				flashCanPlay: false,
+				media: 'video'
+			},
+			flv: { // FLV / F4V
+				codec: 'video/x-flv',
+				flashCanPlay: true,
+				media: 'video'
+			}
+		},
+		_init: function() {
+			var self = this;
+			
+			this.element.empty();
+			
+			this.status = $.extend({}, this.status); // Copy static to unique instance.
+			this.internal = $.extend({}, this.internal); // Copy static to unique instance.
+
+			this.internal.domNode = this.element.get(0);
+
+			this.formats = []; // Array based on supplied string option. Order defines priority.
+			this.solutions = []; // Array based on solution string option. Order defines priority.
+			this.require = {}; // Which media types are required: video, audio.
+			
+			this.htmlElement = {}; // DOM elements created by jPlayer
+			this.html = {}; // In _init()'s this.desired code and setmedia(): Accessed via this[solution], where solution from this.solutions array.
+			this.html.audio = {};
+			this.html.video = {};
+			this.flash = {}; // In _init()'s this.desired code and setmedia(): Accessed via this[solution], where solution from this.solutions array.
+			
+			this.css = {};
+			this.css.cs = {}; // Holds the css selector strings
+			this.css.jq = {}; // Holds jQuery selectors. ie., $(css.cs.method)
+
+			this.ancestorJq = []; // Holds jQuery selector of cssSelectorAncestor. Init would use $() instead of [], but it is only 1.4+
+
+			this.options.volume = this._limitValue(this.options.volume, 0, 1); // Limit volume value's bounds.
+
+			// Create the formats array, with prority based on the order of the supplied formats string
+			$.each(this.options.supplied.toLowerCase().split(","), function(index1, value1) {
+				var format = value1.replace(/^\s+|\s+$/g, ""); //trim
+				if(self.format[format]) { // Check format is valid.
+					var dupFound = false;
+					$.each(self.formats, function(index2, value2) { // Check for duplicates
+						if(format === value2) {
+							dupFound = true;
+							return false;
+						}
+					});
+					if(!dupFound) {
+						self.formats.push(format);
+					}
+				}
+			});
+
+			// Create the solutions array, with prority based on the order of the solution string
+			$.each(this.options.solution.toLowerCase().split(","), function(index1, value1) {
+				var solution = value1.replace(/^\s+|\s+$/g, ""); //trim
+				if(self.solution[solution]) { // Check solution is valid.
+					var dupFound = false;
+					$.each(self.solutions, function(index2, value2) { // Check for duplicates
+						if(solution === value2) {
+							dupFound = true;
+							return false;
+						}
+					});
+					if(!dupFound) {
+						self.solutions.push(solution);
+					}
+				}
+			});
+
+			this.internal.instance = "jp_" + this.count;
+			this.instances[this.internal.instance] = this.element;
+
+			// Check the jPlayer div has an id and create one if required. Important for Flash to know the unique id for comms.
+			if(!this.element.attr("id")) {
+				this.element.attr("id", this.options.idPrefix + "_jplayer_" + this.count);
+			}
+
+			this.internal.self = $.extend({}, {
+				id: this.element.attr("id"),
+				jq: this.element
+			});
+			this.internal.audio = $.extend({}, {
+				id: this.options.idPrefix + "_audio_" + this.count,
+				jq: undefined
+			});
+			this.internal.video = $.extend({}, {
+				id: this.options.idPrefix + "_video_" + this.count,
+				jq: undefined
+			});
+			this.internal.flash = $.extend({}, {
+				id: this.options.idPrefix + "_flash_" + this.count,
+				jq: undefined,
+				swf: this.options.swfPath + (this.options.swfPath.toLowerCase().slice(-4) !== ".swf" ? (this.options.swfPath && this.options.swfPath.slice(-1) !== "/" ? "/" : "") + "Jplayer.swf" : "")
+			});
+			this.internal.poster = $.extend({}, {
+				id: this.options.idPrefix + "_poster_" + this.count,
+				jq: undefined
+			});
+
+			// Register listeners defined in the constructor
+			$.each($.jPlayer.event, function(eventName,eventType) {
+				if(self.options[eventName] !== undefined) {
+					self.element.bind(eventType + ".jPlayer", self.options[eventName]); // With .jPlayer namespace.
+					self.options[eventName] = undefined; // Destroy the handler pointer copy on the options. Reason, events can be added/removed in other ways so this could be obsolete and misleading.
+				}
+			});
+
+			// Determine if we require solutions for audio, video or both media types.
+			this.require.audio = false;
+			this.require.video = false;
+			$.each(this.formats, function(priority, format) {
+				self.require[self.format[format].media] = true;
+			});
+
+			// Now required types are known, finish the options default settings.
+			if(this.require.video) {
+				this.options = $.extend(true, {},
+					this.optionsVideo,
+					this.options
+				);
+			} else {
+				this.options = $.extend(true, {},
+					this.optionsAudio,
+					this.options
+				);
+			}
+			this._setSize(); // update status and jPlayer element size
+
+			// Determine the status for Blocklisted options.
+			this.status.nativeVideoControls = this._uaBlocklist(this.options.nativeVideoControls);
+			this.status.noFullScreen = this._uaBlocklist(this.options.noFullScreen);
+			this.status.noVolume = this._uaBlocklist(this.options.noVolume);
+
+			// The native controls are only for video and are disabled when audio is also used.
+			this._restrictNativeVideoControls();
+
+			// Create the poster image.
+			this.htmlElement.poster = document.createElement('img');
+			this.htmlElement.poster.id = this.internal.poster.id;
+			this.htmlElement.poster.onload = function() { // Note that this did not work on Firefox 3.6: poster.addEventListener("onload", function() {}, false); Did not investigate x-browser.
+				if(!self.status.video || self.status.waitForPlay) {
+					self.internal.poster.jq.show();
+				}
+			};
+			this.element.append(this.htmlElement.poster);
+			this.internal.poster.jq = $("#" + this.internal.poster.id);
+			this.internal.poster.jq.css({'width': this.status.width, 'height': this.status.height});
+			this.internal.poster.jq.hide();
+			this.internal.poster.jq.bind("click.jPlayer", function() {
+				self._trigger($.jPlayer.event.click);
+			});
+			
+			// Generate the required media elements
+			this.html.audio.available = false;
+			if(this.require.audio) { // If a supplied format is audio
+				this.htmlElement.audio = document.createElement('audio');
+				this.htmlElement.audio.id = this.internal.audio.id;
+				this.html.audio.available = !!this.htmlElement.audio.canPlayType && this._testCanPlayType(this.htmlElement.audio); // Test is for IE9 on Win Server 2008.
+			}
+			this.html.video.available = false;
+			if(this.require.video) { // If a supplied format is video
+				this.htmlElement.video = document.createElement('video');
+				this.htmlElement.video.id = this.internal.video.id;
+				this.html.video.available = !!this.htmlElement.video.canPlayType && this._testCanPlayType(this.htmlElement.video); // Test is for IE9 on Win Server 2008.
+			}
+
+			this.flash.available = this._checkForFlash(10);
+
+			this.html.canPlay = {};
+			this.flash.canPlay = {};
+			$.each(this.formats, function(priority, format) {
+				self.html.canPlay[format] = self.html[self.format[format].media].available && "" !== self.htmlElement[self.format[format].media].canPlayType(self.format[format].codec);
+				self.flash.canPlay[format] = self.format[format].flashCanPlay && self.flash.available;
+			});
+			this.html.desired = false;
+			this.flash.desired = false;
+			$.each(this.solutions, function(solutionPriority, solution) {
+				if(solutionPriority === 0) {
+					self[solution].desired = true;
+				} else {
+					var audioCanPlay = false;
+					var videoCanPlay = false;
+					$.each(self.formats, function(formatPriority, format) {
+						if(self[self.solutions[0]].canPlay[format]) { // The other solution can play
+							if(self.format[format].media === 'video') {
+								videoCanPlay = true;
+							} else {
+								audioCanPlay = true;
+							}
+						}
+					});
+					self[solution].desired = (self.require.audio && !audioCanPlay) || (self.require.video && !videoCanPlay);
+				}
+			});
+			// This is what jPlayer will support, based on solution and supplied.
+			this.html.support = {};
+			this.flash.support = {};
+			$.each(this.formats, function(priority, format) {
+				self.html.support[format] = self.html.canPlay[format] && self.html.desired;
+				self.flash.support[format] = self.flash.canPlay[format] && self.flash.desired;
+			});
+			// If jPlayer is supporting any format in a solution, then the solution is used.
+			this.html.used = false;
+			this.flash.used = false;
+			$.each(this.solutions, function(solutionPriority, solution) {
+				$.each(self.formats, function(formatPriority, format) {
+					if(self[solution].support[format]) {
+						self[solution].used = true;
+						return false;
+					}
+				});
+			});
+
+			// Init solution active state and the event gates to false.
+			this._resetActive();
+			this._resetGate();
+
+			// Set up the css selectors for the control and feedback entities.
+			this._cssSelectorAncestor(this.options.cssSelectorAncestor);
+			
+			// If neither html nor flash are being used by this browser, then media playback is not possible. Trigger an error event.
+			if(!(this.html.used || this.flash.used)) {
+				this._error( {
+					type: $.jPlayer.error.NO_SOLUTION, 
+					context: "{solution:'" + this.options.solution + "', supplied:'" + this.options.supplied + "'}",
+					message: $.jPlayer.errorMsg.NO_SOLUTION,
+					hint: $.jPlayer.errorHint.NO_SOLUTION
+				});
+				if(this.css.jq.noSolution.length) {
+					this.css.jq.noSolution.show();
+				}
+			} else {
+				if(this.css.jq.noSolution.length) {
+					this.css.jq.noSolution.hide();
+				}
+			}
+
+			// Add the flash solution if it is being used.
+			if(this.flash.used) {
+				var htmlObj,
+				flashVars = 'jQuery=' + encodeURI(this.options.noConflict) + '&id=' + encodeURI(this.internal.self.id) + '&vol=' + this.options.volume + '&muted=' + this.options.muted;
+
+				// Code influenced by SWFObject 2.2: http://code.google.com/p/swfobject/
+				// Non IE browsers have an initial Flash size of 1 by 1 otherwise the wmode affected the Flash ready event. 
+
+				if($.browser.msie && Number($.browser.version) <= 8) {
+					var objStr = '<object id="' + this.internal.flash.id + '" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="0" height="0"></object>';
+
+					var paramStr = [
+						'<param name="movie" value="' + this.internal.flash.swf + '" />',
+						'<param name="FlashVars" value="' + flashVars + '" />',
+						'<param name="allowScriptAccess" value="always" />',
+						'<param name="bgcolor" value="' + this.options.backgroundColor + '" />',
+						'<param name="wmode" value="' + this.options.wmode + '" />'
+					];
+
+					htmlObj = document.createElement(objStr);
+					for(var i=0; i < paramStr.length; i++) {
+						htmlObj.appendChild(document.createElement(paramStr[i]));
+					}
+				} else {
+					var createParam = function(el, n, v) {
+						var p = document.createElement("param");
+						p.setAttribute("name", n);	
+						p.setAttribute("value", v);
+						el.appendChild(p);
+					};
+
+					htmlObj = document.createElement("object");
+					htmlObj.setAttribute("id", this.internal.flash.id);
+					htmlObj.setAttribute("data", this.internal.flash.swf);
+					htmlObj.setAttribute("type", "application/x-shockwave-flash");
+					htmlObj.setAttribute("width", "1"); // Non-zero
+					htmlObj.setAttribute("height", "1"); // Non-zero
+					createParam(htmlObj, "flashvars", flashVars);
+					createParam(htmlObj, "allowscriptaccess", "always");
+					createParam(htmlObj, "bgcolor", this.options.backgroundColor);
+					createParam(htmlObj, "wmode", this.options.wmode);
+				}
+
+				this.element.append(htmlObj);
+				this.internal.flash.jq = $(htmlObj);
+			}
+			
+			// Add the HTML solution if being used.
+			if(this.html.used) {
+
+				// The HTML Audio handlers
+				if(this.html.audio.available) {
+					this._addHtmlEventListeners(this.htmlElement.audio, this.html.audio);
+					this.element.append(this.htmlElement.audio);
+					this.internal.audio.jq = $("#" + this.internal.audio.id);
+				}
+
+				// The HTML Video handlers
+				if(this.html.video.available) {
+					this._addHtmlEventListeners(this.htmlElement.video, this.html.video);
+					this.element.append(this.htmlElement.video);
+					this.internal.video.jq = $("#" + this.internal.video.id);
+					if(this.status.nativeVideoControls) {
+						this.internal.video.jq.css({'width': this.status.width, 'height': this.status.height});
+					} else {
+						this.internal.video.jq.css({'width':'0px', 'height':'0px'}); // Using size 0x0 since a .hide() causes issues in iOS
+					}
+					this.internal.video.jq.bind("click.jPlayer", function() {
+						self._trigger($.jPlayer.event.click);
+					});
+				}
+			}
+
+			// Create the bridge that emulates the HTML Media element on the jPlayer DIV
+			if( this.options.emulateHtml ) {
+				this._emulateHtmlBridge();
+			}
+
+			if(this.html.used && !this.flash.used) { // If only HTML, then emulate flash ready() call after 100ms.
+				setTimeout( function() {
+					self.internal.ready = true;
+					self.version.flash = "n/a";
+					self._trigger($.jPlayer.event.repeat); // Trigger the repeat event so its handler can initialize itself with the loop option.
+					self._trigger($.jPlayer.event.ready);
+				}, 100);
+			}
+
+			// Initialize the interface components with the options.
+			this._updateNativeVideoControls(); // Must do this first, otherwise there is a bizarre bug in iOS 4.3.2, where the native controls are not shown. Fails in iOS if called after _updateButtons() below. Works if called later in setMedia too, so it odd.
+			this._updateInterface();
+			this._updateButtons(false);
+			this._updateAutohide();
+			this._updateVolume(this.options.volume);
+			this._updateMute(this.options.muted);
+			if(this.css.jq.videoPlay.length) {
+				this.css.jq.videoPlay.hide();
+			}
+
+			$.jPlayer.prototype.count++; // Change static variable via prototype.
+		},
+		destroy: function() {
+			// MJP: The background change remains. Would need to store the original to restore it correctly.
+			// MJP: The jPlayer element's size change remains.
+
+			// Clear the media to reset the GUI and stop any downloads. Streams on some browsers had persited. (Chrome)
+			this.clearMedia();
+			// Remove the size/sizeFull cssClass from the cssSelectorAncestor
+			this._removeUiClass();
+			// Remove the times from the GUI
+			if(this.css.jq.currentTime.length) {
+				this.css.jq.currentTime.text("");
+			}
+			if(this.css.jq.duration.length) {
+				this.css.jq.duration.text("");
+			}
+			// Remove any bindings from the interface controls.
+			$.each(this.css.jq, function(fn, jq) {
+				// Check selector is valid before trying to execute method.
+				if(jq.length) {
+					jq.unbind(".jPlayer");
+				}
+			});
+			// Remove the click handlers for $.jPlayer.event.click
+			this.internal.poster.jq.unbind(".jPlayer");
+			if(this.internal.video.jq) {
+				this.internal.video.jq.unbind(".jPlayer");
+			}
+			// Destroy the HTML bridge.
+			if(this.options.emulateHtml) {
+				this._destroyHtmlBridge();
+			}
+			this.element.removeData("jPlayer"); // Remove jPlayer data
+			this.element.unbind(".jPlayer"); // Remove all event handlers created by the jPlayer constructor
+			this.element.empty(); // Remove the inserted child elements
+			
+			delete this.instances[this.internal.instance]; // Clear the instance on the static instance object
+		},
+		enable: function() { // Plan to implement
+			// options.disabled = false
+		},
+		disable: function () { // Plan to implement
+			// options.disabled = true
+		},
+		_testCanPlayType: function(elem) {
+			// IE9 on Win Server 2008 did not implement canPlayType(), but it has the property.
+			try {
+				elem.canPlayType(this.format.mp3.codec); // The type is irrelevant.
+				return true;
+			} catch(err) {
+				return false;
+			}
+		},
+		_uaBlocklist: function(list) {
+			// list : object with properties that are all regular expressions. Property names are irrelevant.
+			// Returns true if the user agent is matched in list.
+			var	ua = navigator.userAgent.toLowerCase(),
+				block = false;
+
+			$.each(list, function(p, re) {
+				if(re && re.test(ua)) {
+					block = true;
+					return false; // exit $.each.
+				}
+			});
+			return block;
+		},
+		_restrictNativeVideoControls: function() {
+			// Fallback to noFullScreen when nativeVideoControls is true and audio media is being used. Affects when both media types are used.
+			if(this.require.audio) {
+				if(this.status.nativeVideoControls) {
+					this.status.nativeVideoControls = false;
+					this.status.noFullScreen = true;
+				}
+			}
+		},
+		_updateNativeVideoControls: function() {
+			if(this.html.video.available && this.html.used) {
+				// Turn the HTML Video controls on/off
+				this.htmlElement.video.controls = this.status.nativeVideoControls;
+				// Show/hide the jPlayer GUI.
+				this._updateAutohide();
+				// For when option changed. The poster image is not updated, as it is dealt with in setMedia(). Acceptable degradation since seriously doubt these options will change on the fly. Can again review later.
+				if(this.status.nativeVideoControls && this.require.video) {
+					this.internal.poster.jq.hide();
+					this.internal.video.jq.css({'width': this.status.width, 'height': this.status.height});
+				} else if(this.status.waitForPlay && this.status.video) {
+					this.internal.poster.jq.show();
+					this.internal.video.jq.css({'width': '0px', 'height': '0px'});
+				}
+			}
+		},
+		_addHtmlEventListeners: function(mediaElement, entity) {
+			var self = this;
+			mediaElement.preload = this.options.preload;
+			mediaElement.muted = this.options.muted;
+			mediaElement.volume = this.options.volume;
+
+			// Create the event listeners
+			// Only want the active entity to affect jPlayer and bubble events.
+			// Using entity.gate so that object is referenced and gate property always current
+			
+			mediaElement.addEventListener("progress", function() {
+				if(entity.gate) {
+					self._getHtmlStatus(mediaElement);
+					self._updateInterface();
+					self._trigger($.jPlayer.event.progress);
+				}
+			}, false);
+			mediaElement.addEventListener("timeupdate", function() {
+				if(entity.gate) {
+					self._getHtmlStatus(mediaElement);
+					self._updateInterface();
+					self._trigger($.jPlayer.event.timeupdate);
+				}
+			}, false);
+			mediaElement.addEventListener("durationchange", function() {
+				if(entity.gate) {
+					self.status.duration = this.duration;
+					self._getHtmlStatus(mediaElement);
+					self._updateInterface();
+					self._trigger($.jPlayer.event.durationchange);
+				}
+			}, false);
+			mediaElement.addEventListener("play", function() {
+				if(entity.gate) {
+					self._updateButtons(true);
+					self._html_checkWaitForPlay(); // So the native controls update this variable and puts the hidden interface in the correct state. Affects toggling native controls.
+					self._trigger($.jPlayer.event.play);
+				}
+			}, false);
+			mediaElement.addEventListener("playing", function() {
+				if(entity.gate) {
+					self._updateButtons(true);
+					self._seeked();
+					self._trigger($.jPlayer.event.playing);
+				}
+			}, false);
+			mediaElement.addEventListener("pause", function() {
+				if(entity.gate) {
+					self._updateButtons(false);
+					self._trigger($.jPlayer.event.pause);
+				}
+			}, false);
+			mediaElement.addEventListener("waiting", function() {
+				if(entity.gate) {
+					self._seeking();
+					self._trigger($.jPlayer.event.waiting);
+				}
+			}, false);
+			mediaElement.addEventListener("seeking", function() {
+				if(entity.gate) {
+					self._seeking();
+					self._trigger($.jPlayer.event.seeking);
+				}
+			}, false);
+			mediaElement.addEventListener("seeked", function() {
+				if(entity.gate) {
+					self._seeked();
+					self._trigger($.jPlayer.event.seeked);
+				}
+			}, false);
+			mediaElement.addEventListener("volumechange", function() {
+				if(entity.gate) {
+					// Read the values back from the element as the Blackberry PlayBook shares the volume with the physical buttons master volume control.
+					// However, when tested 6th July 2011, those buttons do not generate an event. The physical play/pause button does though.
+					self.options.volume = mediaElement.volume;
+					self.options.muted = mediaElement.muted;
+					self._updateMute();
+					self._updateVolume();
+					self._trigger($.jPlayer.event.volumechange);
+				}
+			}, false);
+			mediaElement.addEventListener("suspend", function() { // Seems to be the only way of capturing that the iOS4 browser did not actually play the media from the page code. ie., It needs a user gesture.
+				if(entity.gate) {
+					self._seeked();
+					self._trigger($.jPlayer.event.suspend);
+				}
+			}, false);
+			mediaElement.addEventListener("ended", function() {
+				if(entity.gate) {
+					// Order of the next few commands are important. Change the time and then pause.
+					// Solves a bug in Firefox, where issuing pause 1st causes the media to play from the start. ie., The pause is ignored.
+					if(!$.jPlayer.browser.webkit) { // Chrome crashes if you do this in conjunction with a setMedia command in an ended event handler. ie., The playlist demo.
+						self.htmlElement.media.currentTime = 0; // Safari does not care about this command. ie., It works with or without this line. (Both Safari and Chrome are Webkit.)
+					}
+					self.htmlElement.media.pause(); // Pause otherwise a click on the progress bar will play from that point, when it shouldn't, since it stopped playback.
+					self._updateButtons(false);
+					self._getHtmlStatus(mediaElement, true); // With override true. Otherwise Chrome leaves progress at full.
+					self._updateInterface();
+					self._trigger($.jPlayer.event.ended);
+				}
+			}, false);
+			mediaElement.addEventListener("error", function() {
+				if(entity.gate) {
+					self._updateButtons(false);
+					self._seeked();
+					if(self.status.srcSet) { // Deals with case of clearMedia() causing an error event.
+						clearTimeout(self.internal.htmlDlyCmdId); // Clears any delayed commands used in the HTML solution.
+						self.status.waitForLoad = true; // Allows the load operation to try again.
+						self.status.waitForPlay = true; // Reset since a play was captured.
+						if(self.status.video && !self.status.nativeVideoControls) {
+							self.internal.video.jq.css({'width':'0px', 'height':'0px'});
+						}
+						if(self._validString(self.status.media.poster) && !self.status.nativeVideoControls) {
+							self.internal.poster.jq.show();
+						}
+						if(self.css.jq.videoPlay.length) {
+							self.css.jq.videoPlay.show();
+						}
+						self._error( {
+							type: $.jPlayer.error.URL,
+							context: self.status.src, // this.src shows absolute urls. Want context to show the url given.
+							message: $.jPlayer.errorMsg.URL,
+							hint: $.jPlayer.errorHint.URL
+						});
+					}
+				}
+			}, false);
+			// Create all the other event listeners that bubble up to a jPlayer event from html, without being used by jPlayer.
+			$.each($.jPlayer.htmlEvent, function(i, eventType) {
+				mediaElement.addEventListener(this, function() {
+					if(entity.gate) {
+						self._trigger($.jPlayer.event[eventType]);
+					}
+				}, false);
+			});
+		},
+		_getHtmlStatus: function(media, override) {
+			var ct = 0, d = 0, cpa = 0, sp = 0, cpr = 0;
+
+			if(media.duration) { // Fixes the duration bug in iOS, where the durationchange event occurs when media.duration is not always correct.
+				this.status.duration = media.duration;
+			}
+			ct = media.currentTime;
+			cpa = (this.status.duration > 0) ? 100 * ct / this.status.duration : 0;
+			if((typeof media.seekable === "object") && (media.seekable.length > 0)) {
+				sp = (this.status.duration > 0) ? 100 * media.seekable.end(media.seekable.length-1) / this.status.duration : 100;
+				cpr = 100 * media.currentTime / media.seekable.end(media.seekable.length-1);
+			} else {
+				sp = 100;
+				cpr = cpa;
+			}
+			
+			if(override) {
+				ct = 0;
+				cpr = 0;
+				cpa = 0;
+			}
+
+			this.status.seekPercent = sp;
+			this.status.currentPercentRelative = cpr;
+			this.status.currentPercentAbsolute = cpa;
+			this.status.currentTime = ct;
+
+			this.status.readyState = media.readyState;
+			this.status.networkState = media.networkState;
+			this.status.playbackRate = media.playbackRate;
+			this.status.ended = media.ended;
+		},
+		_resetStatus: function() {
+			this.status = $.extend({}, this.status, $.jPlayer.prototype.status); // Maintains the status properties that persist through a reset.
+		},
+		_trigger: function(eventType, error, warning) { // eventType always valid as called using $.jPlayer.event.eventType
+			var event = $.Event(eventType);
+			event.jPlayer = {};
+			event.jPlayer.version = $.extend({}, this.version);
+			event.jPlayer.options = $.extend(true, {}, this.options); // Deep copy
+			event.jPlayer.status = $.extend(true, {}, this.status); // Deep copy
+			event.jPlayer.html = $.extend(true, {}, this.html); // Deep copy
+			event.jPlayer.flash = $.extend(true, {}, this.flash); // Deep copy
+			if(error) {
+				event.jPlayer.error = $.extend({}, error);
+			}
+			if(warning) {
+				event.jPlayer.warning = $.extend({}, warning);
+			}
+			this.element.trigger(event);
+		},
+		jPlayerFlashEvent: function(eventType, status) { // Called from Flash
+			if(eventType === $.jPlayer.event.ready) {
+				if(!this.internal.ready) {
+					this.internal.ready = true;
+					this.internal.flash.jq.css({'width':'0px', 'height':'0px'}); // Once Flash generates the ready event, minimise to zero as it is not affected by wmode anymore.
+
+					this.version.flash = status.version;
+					if(this.version.needFlash !== this.version.flash) {
+						this._error( {
+							type: $.jPlayer.error.VERSION,
+							context: this.version.flash,
+							message: $.jPlayer.errorMsg.VERSION + this.version.flash,
+							hint: $.jPlayer.errorHint.VERSION
+						});
+					}
+					this._trigger($.jPlayer.event.repeat); // Trigger the repeat event so its handler can initialize itself with the loop option.
+					this._trigger(eventType);
+				} else {
+					// This condition occurs if the Flash is hidden and then shown again.
+					// Firefox also reloads the Flash if the CSS position changes. position:fixed is used for full screen.
+
+					// Only do this if the Flash is the solution being used at the moment. Affects Media players where both solution may be being used.
+					if(this.flash.gate) {
+
+						// Send the current status to the Flash now that it is ready (available) again.
+						if(this.status.srcSet) {
+
+							// Need to read original status before issuing the setMedia command.
+							var	currentTime = this.status.currentTime,
+								paused = this.status.paused; 
+
+							this.setMedia(this.status.media);
+							if(currentTime > 0) {
+								if(paused) {
+									this.pause(currentTime);
+								} else {
+									this.play(currentTime);
+								}
+							}
+						}
+						this._trigger($.jPlayer.event.flashreset);
+					}
+				}
+			}
+			if(this.flash.gate) {
+				switch(eventType) {
+					case $.jPlayer.event.progress:
+						this._getFlashStatus(status);
+						this._updateInterface();
+						this._trigger(eventType);
+						break;
+					case $.jPlayer.event.timeupdate:
+						this._getFlashStatus(status);
+						this._updateInterface();
+						this._trigger(eventType);
+						break;
+					case $.jPlayer.event.play:
+						this._seeked();
+						this._updateButtons(true);
+						this._trigger(eventType);
+						break;
+					case $.jPlayer.event.pause:
+						this._updateButtons(false);
+						this._trigger(eventType);
+						break;
+					case $.jPlayer.event.ended:
+						this._updateButtons(false);
+						this._trigger(eventType);
+						break;
+					case $.jPlayer.event.click:
+						this._trigger(eventType); // This could be dealt with by the default
+						break;
+					case $.jPlayer.event.error:
+						this.status.waitForLoad = true; // Allows the load operation to try again.
+						this.status.waitForPlay = true; // Reset since a play was captured.
+						if(this.status.video) {
+							this.internal.flash.jq.css({'width':'0px', 'height':'0px'});
+						}
+						if(this._validString(this.status.media.poster)) {
+							this.internal.poster.jq.show();
+						}
+						if(this.css.jq.videoPlay.length && this.status.video) {
+							this.css.jq.videoPlay.show();
+						}
+						if(this.status.video) { // Set up for another try. Execute before error event.
+							this._flash_setVideo(this.status.media);
+						} else {
+							this._flash_setAudio(this.status.media);
+						}
+						this._updateButtons(false);
+						this._error( {
+							type: $.jPlayer.error.URL,
+							context:status.src,
+							message: $.jPlayer.errorMsg.URL,
+							hint: $.jPlayer.errorHint.URL
+						});
+						break;
+					case $.jPlayer.event.seeking:
+						this._seeking();
+						this._trigger(eventType);
+						break;
+					case $.jPlayer.event.seeked:
+						this._seeked();
+						this._trigger(eventType);
+						break;
+					case $.jPlayer.event.ready:
+						// The ready event is handled outside the switch statement.
+						// Captured here otherwise 2 ready events would be generated if the ready event handler used setMedia.
+						break;
+					default:
+						this._trigger(eventType);
+				}
+			}
+			return false;
+		},
+		_getFlashStatus: function(status) {
+			this.status.seekPercent = status.seekPercent;
+			this.status.currentPercentRelative = status.currentPercentRelative;
+			this.status.currentPercentAbsolute = status.currentPercentAbsolute;
+			this.status.currentTime = status.currentTime;
+			this.status.duration = status.duration;
+
+			// The Flash does not generate this information in this release
+			this.status.readyState = 4; // status.readyState;
+			this.status.networkState = 0; // status.networkState;
+			this.status.playbackRate = 1; // status.playbackRate;
+			this.status.ended = false; // status.ended;
+		},
+		_updateButtons: function(playing) {
+			if(playing !== undefined) {
+				this.status.paused = !playing;
+				if(this.css.jq.play.length && this.css.jq.pause.length) {
+					if(playing) {
+						this.css.jq.play.hide();
+						this.css.jq.pause.show();
+					} else {
+						this.css.jq.play.show();
+						this.css.jq.pause.hide();
+					}
+				}
+			}
+			if(this.css.jq.restoreScreen.length && this.css.jq.fullScreen.length) {
+				if(this.status.noFullScreen) {
+					this.css.jq.fullScreen.hide();
+					this.css.jq.restoreScreen.hide();
+				} else if(this.options.fullScreen) {
+					this.css.jq.fullScreen.hide();
+					this.css.jq.restoreScreen.show();
+				} else {
+					this.css.jq.fullScreen.show();
+					this.css.jq.restoreScreen.hide();
+				}
+			}
+			if(this.css.jq.repeat.length && this.css.jq.repeatOff.length) {
+				if(this.options.loop) {
+					this.css.jq.repeat.hide();
+					this.css.jq.repeatOff.show();
+				} else {
+					this.css.jq.repeat.show();
+					this.css.jq.repeatOff.hide();
+				}
+			}
+		},
+		_updateInterface: function() {
+			if(this.css.jq.seekBar.length) {
+				this.css.jq.seekBar.width(this.status.seekPercent+"%");
+			}
+			if(this.css.jq.playBar.length) {
+				this.css.jq.playBar.width(this.status.currentPercentRelative+"%");
+			}
+			if(this.css.jq.currentTime.length) {
+				this.css.jq.currentTime.text($.jPlayer.convertTime(this.status.currentTime));
+			}
+			if(this.css.jq.duration.length) {
+				this.css.jq.duration.text($.jPlayer.convertTime(this.status.duration));
+			}
+		},
+		_seeking: function() {
+			if(this.css.jq.seekBar.length) {
+				this.css.jq.seekBar.addClass("jp-seeking-bg");
+			}
+		},
+		_seeked: function() {
+			if(this.css.jq.seekBar.length) {
+				this.css.jq.seekBar.removeClass("jp-seeking-bg");
+			}
+		},
+		_resetGate: function() {
+			this.html.audio.gate = false;
+			this.html.video.gate = false;
+			this.flash.gate = false;
+		},
+		_resetActive: function() {
+			this.html.active = false;
+			this.flash.active = false;
+		},
+		setMedia: function(media) {
+		
+			/*	media[format] = String: URL of format. Must contain all of the supplied option's video or audio formats.
+			 *	media.poster = String: Video poster URL.
+			 *	media.subtitles = String: * NOT IMPLEMENTED * URL of subtitles SRT file
+			 *	media.chapters = String: * NOT IMPLEMENTED * URL of chapters SRT file
+			 *	media.stream = Boolean: * NOT IMPLEMENTED * Designating actual media streams. ie., "false/undefined" for files. Plan to refresh the flash every so often.
+			 */
+
+			var	self = this,
+				supported = false,
+				posterChanged = this.status.media.poster !== media.poster; // Compare before reset. Important for OSX Safari as this.htmlElement.poster.src is absolute, even if original poster URL was relative.
+
+			this._resetMedia();
+			this._resetGate();
+			this._resetActive();
+
+			$.each(this.formats, function(formatPriority, format) {
+				var isVideo = self.format[format].media === 'video';
+				$.each(self.solutions, function(solutionPriority, solution) {
+					if(self[solution].support[format] && self._validString(media[format])) { // Format supported in solution and url given for format.
+						var isHtml = solution === 'html';
+
+						if(isVideo) {
+							if(isHtml) {
+								self.html.video.gate = true;
+								self._html_setVideo(media);
+								self.html.active = true;
+							} else {
+								self.flash.gate = true;
+								self._flash_setVideo(media);
+								self.flash.active = true;
+							}
+							if(self.css.jq.videoPlay.length) {
+								self.css.jq.videoPlay.show();
+							}
+							self.status.video = true;
+						} else {
+							if(isHtml) {
+								self.html.audio.gate = true;
+								self._html_setAudio(media);
+								self.html.active = true;
+							} else {
+								self.flash.gate = true;
+								self._flash_setAudio(media);
+								self.flash.active = true;
+							}
+							if(self.css.jq.videoPlay.length) {
+								self.css.jq.videoPlay.hide();
+							}
+							self.status.video = false;
+						}
+						
+						supported = true;
+						return false; // Exit $.each
+					}
+				});
+				if(supported) {
+					return false; // Exit $.each
+				}
+			});
+
+			if(supported) {
+				if(!(this.status.nativeVideoControls && this.html.video.gate)) {
+					// Set poster IMG if native video controls are not being used
+					// Note: With IE the IMG onload event occurs immediately when cached.
+					// Note: Poster hidden by default in _resetMedia()
+					if(this._validString(media.poster)) {
+						if(posterChanged) { // Since some browsers do not generate img onload event.
+							this.htmlElement.poster.src = media.poster;
+						} else {
+							this.internal.poster.jq.show();
+						}
+					}
+				}
+				this.status.srcSet = true;
+				this.status.media = $.extend({}, media);
+				this._updateButtons(false);
+				this._updateInterface();
+			} else { // jPlayer cannot support any formats provided in this browser
+				// Send an error event
+				this._error( {
+					type: $.jPlayer.error.NO_SUPPORT,
+					context: "{supplied:'" + this.options.supplied + "'}",
+					message: $.jPlayer.errorMsg.NO_SUPPORT,
+					hint: $.jPlayer.errorHint.NO_SUPPORT
+				});
+			}
+		},
+		_resetMedia: function() {
+			this._resetStatus();
+			this._updateButtons(false);
+			this._updateInterface();
+			this._seeked();
+			this.internal.poster.jq.hide();
+
+			clearTimeout(this.internal.htmlDlyCmdId);
+
+			if(this.html.active) {
+				this._html_resetMedia();
+			} else if(this.flash.active) {
+				this._flash_resetMedia();
+			}
+		},
+		clearMedia: function() {
+			this._resetMedia();
+
+			if(this.html.active) {
+				this._html_clearMedia();
+			} else if(this.flash.active) {
+				this._flash_clearMedia();
+			}
+
+			this._resetGate();
+			this._resetActive();
+		},
+		load: function() {
+			if(this.status.srcSet) {
+				if(this.html.active) {
+					this._html_load();
+				} else if(this.flash.active) {
+					this._flash_load();
+				}
+			} else {
+				this._urlNotSetError("load");
+			}
+		},
+		play: function(time) {
+			time = (typeof time === "number") ? time : NaN; // Remove jQuery event from click handler
+			if(this.status.srcSet) {
+				if(this.html.active) {
+					this._html_play(time);
+				} else if(this.flash.active) {
+					this._flash_play(time);
+				}
+			} else {
+				this._urlNotSetError("play");
+			}
+		},
+		videoPlay: function(e) { // Handles clicks on the play button over the video poster
+			this.play();
+		},
+		pause: function(time) {
+			time = (typeof time === "number") ? time : NaN; // Remove jQuery event from click handler
+			if(this.status.srcSet) {
+				if(this.html.active) {
+					this._html_pause(time);
+				} else if(this.flash.active) {
+					this._flash_pause(time);
+				}
+			} else {
+				this._urlNotSetError("pause");
+			}
+		},
+		pauseOthers: function() {
+			var self = this;
+			$.each(this.instances, function(i, element) {
+				if(self.element !== element) { // Do not this instance.
+					if(element.data("jPlayer").status.srcSet) { // Check that media is set otherwise would cause error event.
+						element.jPlayer("pause");
+					}
+				}
+			});
+		},
+		stop: function() {
+			if(this.status.srcSet) {
+				if(this.html.active) {
+					this._html_pause(0);
+				} else if(this.flash.active) {
+					this._flash_pause(0);
+				}
+			} else {
+				this._urlNotSetError("stop");
+			}
+		},
+		playHead: function(p) {
+			p = this._limitValue(p, 0, 100);
+			if(this.status.srcSet) {
+				if(this.html.active) {
+					this._html_playHead(p);
+				} else if(this.flash.active) {
+					this._flash_playHead(p);
+				}
+			} else {
+				this._urlNotSetError("playHead");
+			}
+		},
+		_muted: function(muted) {
+			this.options.muted = muted;
+			if(this.html.used) {
+				this._html_mute(muted);
+			}
+			if(this.flash.used) {
+				this._flash_mute(muted);
+			}
+
+			// The HTML solution generates this event from the media element itself.
+			if(!this.html.video.gate && !this.html.audio.gate) {
+				this._updateMute(muted);
+				this._updateVolume(this.options.volume);
+				this._trigger($.jPlayer.event.volumechange);
+			}
+		},
+		mute: function(mute) { // mute is either: undefined (true), an event object (true) or a boolean (muted).
+			mute = mute === undefined ? true : !!mute;
+			this._muted(mute);
+		},
+		unmute: function(unmute) { // unmute is either: undefined (true), an event object (true) or a boolean (!muted).
+			unmute = unmute === undefined ? true : !!unmute;
+			this._muted(!unmute);
+		},
+		_updateMute: function(mute) {
+			if(mute === undefined) {
+				mute = this.options.muted;
+			}
+			if(this.css.jq.mute.length && this.css.jq.unmute.length) {
+				if(this.status.noVolume) {
+					this.css.jq.mute.hide();
+					this.css.jq.unmute.hide();
+				} else if(mute) {
+					this.css.jq.mute.hide();
+					this.css.jq.unmute.show();
+				} else {
+					this.css.jq.mute.show();
+					this.css.jq.unmute.hide();
+				}
+			}
+		},
+		volume: function(v) {
+			v = this._limitValue(v, 0, 1);
+			this.options.volume = v;
+
+			if(this.html.used) {
+				this._html_volume(v);
+			}
+			if(this.flash.used) {
+				this._flash_volume(v);
+			}
+
+			// The HTML solution generates this event from the media element itself.
+			if(!this.html.video.gate && !this.html.audio.gate) {
+				this._updateVolume(v);
+				this._trigger($.jPlayer.event.volumechange);
+			}
+		},
+		volumeBar: function(e) { // Handles clicks on the volumeBar
+			if(this.css.jq.volumeBar.length) {
+				var	offset = this.css.jq.volumeBar.offset(),
+					x = e.pageX - offset.left,
+					w = this.css.jq.volumeBar.width(),
+					y = this.css.jq.volumeBar.height() - e.pageY + offset.top,
+					h = this.css.jq.volumeBar.height();
+
+				if(this.options.verticalVolume) {
+					this.volume(y/h);
+				} else {
+					this.volume(x/w);
+				}
+			}
+			if(this.options.muted) {
+				this._muted(false);
+			}
+		},
+		volumeBarValue: function(e) { // Handles clicks on the volumeBarValue
+			this.volumeBar(e);
+		},
+		_updateVolume: function(v) {
+			if(v === undefined) {
+				v = this.options.volume;
+			}
+			v = this.options.muted ? 0 : v;
+
+			if(this.status.noVolume) {
+				if(this.css.jq.volumeBar.length) {
+					this.css.jq.volumeBar.hide();
+				}
+				if(this.css.jq.volumeBarValue.length) {
+					this.css.jq.volumeBarValue.hide();
+				}
+				if(this.css.jq.volumeMax.length) {
+					this.css.jq.volumeMax.hide();
+				}
+			} else {
+				if(this.css.jq.volumeBar.length) {
+					this.css.jq.volumeBar.show();
+				}
+				if(this.css.jq.volumeBarValue.length) {
+					this.css.jq.volumeBarValue.show();
+					this.css.jq.volumeBarValue[this.options.verticalVolume ? "height" : "width"]((v*100)+"%");
+				}
+				if(this.css.jq.volumeMax.length) {
+					this.css.jq.volumeMax.show();
+				}
+			}
+		},
+		volumeMax: function() { // Handles clicks on the volume max
+			this.volume(1);
+			if(this.options.muted) {
+				this._muted(false);
+			}
+		},
+		_cssSelectorAncestor: function(ancestor) {
+			var self = this;
+			this.options.cssSelectorAncestor = ancestor;
+			this._removeUiClass();
+			this.ancestorJq = ancestor ? $(ancestor) : []; // Would use $() instead of [], but it is only 1.4+
+			if(ancestor && this.ancestorJq.length !== 1) { // So empty strings do not generate the warning.
+				this._warning( {
+					type: $.jPlayer.warning.CSS_SELECTOR_COUNT,
+					context: ancestor,
+					message: $.jPlayer.warningMsg.CSS_SELECTOR_COUNT + this.ancestorJq.length + " found for cssSelectorAncestor.",
+					hint: $.jPlayer.warningHint.CSS_SELECTOR_COUNT
+				});
+			}
+			this._addUiClass();
+			$.each(this.options.cssSelector, function(fn, cssSel) {
+				self._cssSelector(fn, cssSel);
+			});
+		},
+		_cssSelector: function(fn, cssSel) {
+			var self = this;
+			if(typeof cssSel === 'string') {
+				if($.jPlayer.prototype.options.cssSelector[fn]) {
+					if(this.css.jq[fn] && this.css.jq[fn].length) {
+						this.css.jq[fn].unbind(".jPlayer");
+					}
+					this.options.cssSelector[fn] = cssSel;
+					this.css.cs[fn] = this.options.cssSelectorAncestor + " " + cssSel;
+
+					if(cssSel) { // Checks for empty string
+						this.css.jq[fn] = $(this.css.cs[fn]);
+					} else {
+						this.css.jq[fn] = []; // To comply with the css.jq[fn].length check before its use. As of jQuery 1.4 could have used $() for an empty set. 
+					}
+
+					if(this.css.jq[fn].length) {
+						var handler = function(e) {
+							self[fn](e);
+							$(this).blur();
+							return false;
+						};
+						this.css.jq[fn].bind("click.jPlayer", handler); // Using jPlayer namespace
+					}
+
+					if(cssSel && this.css.jq[fn].length !== 1) { // So empty strings do not generate the warning. ie., they just remove the old one.
+						this._warning( {
+							type: $.jPlayer.warning.CSS_SELECTOR_COUNT,
+							context: this.css.cs[fn],
+							message: $.jPlayer.warningMsg.CSS_SELECTOR_COUNT + this.css.jq[fn].length + " found for " + fn + " method.",
+							hint: $.jPlayer.warningHint.CSS_SELECTOR_COUNT
+						});
+					}
+				} else {
+					this._warning( {
+						type: $.jPlayer.warning.CSS_SELECTOR_METHOD,
+						context: fn,
+						message: $.jPlayer.warningMsg.CSS_SELECTOR_METHOD,
+						hint: $.jPlayer.warningHint.CSS_SELECTOR_METHOD
+					});
+				}
+			} else {
+				this._warning( {
+					type: $.jPlayer.warning.CSS_SELECTOR_STRING,
+					context: cssSel,
+					message: $.jPlayer.warningMsg.CSS_SELECTOR_STRING,
+					hint: $.jPlayer.warningHint.CSS_SELECTOR_STRING
+				});
+			}
+		},
+		seekBar: function(e) { // Handles clicks on the seekBar
+			if(this.css.jq.seekBar) {
+				var offset = this.css.jq.seekBar.offset();
+				var x = e.pageX - offset.left;
+				var w = this.css.jq.seekBar.width();
+				var p = 100*x/w;
+				this.playHead(p);
+			}
+		},
+		playBar: function(e) { // Handles clicks on the playBar
+			this.seekBar(e);
+		},
+		repeat: function() { // Handle clicks on the repeat button
+			this._loop(true);
+		},
+		repeatOff: function() { // Handle clicks on the repeatOff button
+			this._loop(false);
+		},
+		_loop: function(loop) {
+			if(this.options.loop !== loop) {
+				this.options.loop = loop;
+				this._updateButtons();
+				this._trigger($.jPlayer.event.repeat);
+			}
+		},
+
+		// Plan to review the cssSelector method to cope with missing associated functions accordingly.
+
+		currentTime: function(e) { // Handles clicks on the text
+			// Added to avoid errors using cssSelector system for the text
+		},
+		duration: function(e) { // Handles clicks on the text
+			// Added to avoid errors using cssSelector system for the text
+		},
+		gui: function(e) { // Handles clicks on the gui
+			// Added to avoid errors using cssSelector system for the gui
+		},
+		noSolution: function(e) { // Handles clicks on the error message
+			// Added to avoid errors using cssSelector system for no-solution
+		},
+
+		// Options code adapted from ui.widget.js (1.8.7).  Made changes so the key can use dot notation. To match previous getData solution in jPlayer 1.
+		option: function(key, value) {
+			var options = key;
+
+			 // Enables use: options().  Returns a copy of options object
+			if ( arguments.length === 0 ) {
+				return $.extend( true, {}, this.options );
+			}
+
+			if(typeof key === "string") {
+				var keys = key.split(".");
+
+				 // Enables use: options("someOption")  Returns a copy of the option. Supports dot notation.
+				if(value === undefined) {
+
+					var opt = $.extend(true, {}, this.options);
+					for(var i = 0; i < keys.length; i++) {
+						if(opt[keys[i]] !== undefined) {
+							opt = opt[keys[i]];
+						} else {
+							this._warning( {
+								type: $.jPlayer.warning.OPTION_KEY,
+								context: key,
+								message: $.jPlayer.warningMsg.OPTION_KEY,
+								hint: $.jPlayer.warningHint.OPTION_KEY
+							});
+							return undefined;
+						}
+					}
+					return opt;
+				}
+
+				 // Enables use: options("someOptionObject", someObject}).  Creates: {someOptionObject:someObject}
+				 // Enables use: options("someOption", someValue).  Creates: {someOption:someValue}
+				 // Enables use: options("someOptionObject.someOption", someValue).  Creates: {someOptionObject:{someOption:someValue}}
+
+				options = {};
+				var opts = options;
+
+				for(var j = 0; j < keys.length; j++) {
+					if(j < keys.length - 1) {
+						opts[keys[j]] = {};
+						opts = opts[keys[j]];
+					} else {
+						opts[keys[j]] = value;
+					}
+				}
+			}
+
+			 // Otherwise enables use: options(optionObject).  Uses original object (the key)
+
+			this._setOptions(options);
+
+			return this;
+		},
+		_setOptions: function(options) {
+			var self = this;
+			$.each(options, function(key, value) { // This supports the 2 level depth that the options of jPlayer has. Would review if we ever need more depth.
+				self._setOption(key, value);
+			});
+
+			return this;
+		},
+		_setOption: function(key, value) {
+			var self = this;
+
+			// The ability to set options is limited at this time.
+
+			switch(key) {
+				case "volume" :
+					this.volume(value);
+					break;
+				case "muted" :
+					this._muted(value);
+					break;
+				case "cssSelectorAncestor" :
+					this._cssSelectorAncestor(value); // Set and refresh all associations for the new ancestor.
+					break;
+				case "cssSelector" :
+					$.each(value, function(fn, cssSel) {
+						self._cssSelector(fn, cssSel); // NB: The option is set inside this function, after further validity checks.
+					});
+					break;
+				case "fullScreen" :
+					if(this.options[key] !== value) { // if changed
+						this._removeUiClass();
+						this.options[key] = value;
+						this._refreshSize();
+					}
+					break;
+				case "size" :
+					if(!this.options.fullScreen && this.options[key].cssClass !== value.cssClass) {
+						this._removeUiClass();
+					}
+					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
+					this._refreshSize();
+					break;
+				case "sizeFull" :
+					if(this.options.fullScreen && this.options[key].cssClass !== value.cssClass) {
+						this._removeUiClass();
+					}
+					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
+					this._refreshSize();
+					break;
+				case "autohide" :
+					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
+					this._updateAutohide();
+					break;
+				case "loop" :
+					this._loop(value);
+					break;
+				case "nativeVideoControls" :
+					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
+					this.status.nativeVideoControls = this._uaBlocklist(this.options.nativeVideoControls);
+					this._restrictNativeVideoControls();
+					this._updateNativeVideoControls();
+					break;
+				case "noFullScreen" :
+					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
+					this.status.nativeVideoControls = this._uaBlocklist(this.options.nativeVideoControls); // Need to check again as noFullScreen can depend on this flag and the restrict() can override it.
+					this.status.noFullScreen = this._uaBlocklist(this.options.noFullScreen);
+					this._restrictNativeVideoControls();
+					this._updateButtons();
+					break;
+				case "noVolume" :
+					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
+					this.status.noVolume = this._uaBlocklist(this.options.noVolume);
+					this._updateVolume();
+					this._updateMute();
+					break;
+				case "emulateHtml" :
+					if(this.options[key] !== value) { // To avoid multiple event handlers being created, if true already.
+						this.options[key] = value;
+						if(value) {
+							this._emulateHtmlBridge();
+						} else {
+							this._destroyHtmlBridge();
+						}
+					}
+					break;
+			}
+
+			return this;
+		},
+		// End of: (Options code adapted from ui.widget.js)
+
+		_refreshSize: function() {
+			this._setSize(); // update status and jPlayer element size
+			this._addUiClass(); // update the ui class
+			this._updateSize(); // update internal sizes
+			this._updateButtons();
+			this._updateAutohide();
+			this._trigger($.jPlayer.event.resize);
+		},
+		_setSize: function() {
+			// Determine the current size from the options
+			if(this.options.fullScreen) {
+				this.status.width = this.options.sizeFull.width;
+				this.status.height = this.options.sizeFull.height;
+				this.status.cssClass = this.options.sizeFull.cssClass;
+			} else {
+				this.status.width = this.options.size.width;
+				this.status.height = this.options.size.height;
+				this.status.cssClass = this.options.size.cssClass;
+			}
+
+			// Set the size of the jPlayer area.
+			this.element.css({'width': this.status.width, 'height': this.status.height});
+		},
+		_addUiClass: function() {
+			if(this.ancestorJq.length) {
+				this.ancestorJq.addClass(this.status.cssClass);
+			}
+		},
+		_removeUiClass: function() {
+			if(this.ancestorJq.length) {
+				this.ancestorJq.removeClass(this.status.cssClass);
+			}
+		},
+		_updateSize: function() {
+			// The poster uses show/hide so can simply resize it.
+			this.internal.poster.jq.css({'width': this.status.width, 'height': this.status.height});
+
+			// Video html or flash resized if necessary at this time, or if native video controls being used.
+			if(!this.status.waitForPlay && this.html.active && this.status.video || this.html.video.available && this.html.used && this.status.nativeVideoControls) {
+				this.internal.video.jq.css({'width': this.status.width, 'height': this.status.height});
+			}
+			else if(!this.status.waitForPlay && this.flash.active && this.status.video) {
+				this.internal.flash.jq.css({'width': this.status.width, 'height': this.status.height});
+			}
+		},
+		_updateAutohide: function() {
+			var	self = this,
+				event = "mousemove.jPlayer",
+				namespace = ".jPlayerAutohide",
+				eventType = event + namespace,
+				handler = function() {
+					self.css.jq.gui.fadeIn(self.options.autohide.fadeIn, function() {
+						clearTimeout(self.internal.autohideId);
+						self.internal.autohideId = setTimeout( function() {
+							self.css.jq.gui.fadeOut(self.options.autohide.fadeOut);
+						}, self.options.autohide.hold);
+					});
+				};
+
+			if(this.css.jq.gui.length) {
+
+				// End animations first so that its callback is executed now.
+				// Otherwise an in progress fadeIn animation still has the callback to fadeOut again.
+				this.css.jq.gui.stop(true, true);
+
+				// Removes the fadeOut operation from the fadeIn callback.
+				clearTimeout(this.internal.autohideId);
+
+				this.element.unbind(namespace);
+				this.css.jq.gui.unbind(namespace);
+
+				if(!this.status.nativeVideoControls) {
+					if(this.options.fullScreen && this.options.autohide.full || !this.options.fullScreen && this.options.autohide.restored) {
+						this.element.bind(eventType, handler);
+						this.css.jq.gui.bind(eventType, handler);
+						this.css.jq.gui.hide();
+					} else {
+						this.css.jq.gui.show();
+					}
+				} else {
+					this.css.jq.gui.hide();
+				}
+			}
+		},
+		fullScreen: function() {
+			this._setOption("fullScreen", true);
+		},
+		restoreScreen: function() {
+			this._setOption("fullScreen", false);
+		},
+		_html_initMedia: function() {
+			this.htmlElement.media.src = this.status.src;
+
+			if(this.options.preload !== 'none') {
+				this._html_load(); // See function for comments
+			}
+			this._trigger($.jPlayer.event.timeupdate); // The flash generates this event for its solution.
+		},
+		_html_setAudio: function(media) {
+			var self = this;
+			// Always finds a format due to checks in setMedia()
+			$.each(this.formats, function(priority, format) {
+				if(self.html.support[format] && media[format]) {
+					self.status.src = media[format];
+					self.status.format[format] = true;
+					self.status.formatType = format;
+					return false;
+				}
+			});
+			this.htmlElement.media = this.htmlElement.audio;
+			this._html_initMedia();
+		},
+		_html_setVideo: function(media) {
+			var self = this;
+			// Always finds a format due to checks in setMedia()
+			$.each(this.formats, function(priority, format) {
+				if(self.html.support[format] && media[format]) {
+					self.status.src = media[format];
+					self.status.format[format] = true;
+					self.status.formatType = format;
+					return false;
+				}
+			});
+			if(this.status.nativeVideoControls) {
+				this.htmlElement.video.poster = this._validString(media.poster) ? media.poster : "";
+			}
+			this.htmlElement.media = this.htmlElement.video;
+			this._html_initMedia();
+		},
+		_html_resetMedia: function() {
+			if(this.htmlElement.media) {
+				if(this.htmlElement.media.id === this.internal.video.id && !this.status.nativeVideoControls) {
+					this.internal.video.jq.css({'width':'0px', 'height':'0px'});
+				}
+				this.htmlElement.media.pause();
+			}
+		},
+		_html_clearMedia: function() {
+			if(this.htmlElement.media) {
+				this.htmlElement.media.src = "";
+				this.htmlElement.media.load(); // Stops an old, "in progress" download from continuing the download. Triggers the loadstart, error and emptied events, due to the empty src. Also an abort event if a download was in progress.
+			}
+		},
+		_html_load: function() {
+			// This function remains to allow the early HTML5 browsers to work, such as Firefox 3.6
+			// A change in the W3C spec for the media.load() command means that this is no longer necessary.
+			// This command should be removed and actually causes minor undesirable effects on some browsers. Such as loading the whole file and not only the metadata.
+			if(this.status.waitForLoad) {
+				this.status.waitForLoad = false;
+				this.htmlElement.media.load();
+			}
+			clearTimeout(this.internal.htmlDlyCmdId);
+		},
+		_html_play: function(time) {
+			var self = this;
+			this._html_load(); // Loads if required and clears any delayed commands.
+
+			this.htmlElement.media.play(); // Before currentTime attempt otherwise Firefox 4 Beta never loads.
+
+			if(!isNaN(time)) {
+				try {
+					this.htmlElement.media.currentTime = time;
+				} catch(err) {
+					this.internal.htmlDlyCmdId = setTimeout(function() {
+						self.play(time);
+					}, 100);
+					return; // Cancel execution and wait for the delayed command.
+				}
+			}
+			this._html_checkWaitForPlay();
+		},
+		_html_pause: function(time) {
+			var self = this;
+			
+			if(time > 0) { // We do not want the stop() command, which does pause(0), causing a load operation.
+				this._html_load(); // Loads if required and clears any delayed commands.
+			} else {
+				clearTimeout(this.internal.htmlDlyCmdId);
+			}
+
+			// Order of these commands is important for Safari (Win) and IE9. Pause then change currentTime.
+			this.htmlElement.media.pause();
+
+			if(!isNaN(time)) {
+				try {
+					this.htmlElement.media.currentTime = time;
+				} catch(err) {
+					this.internal.htmlDlyCmdId = setTimeout(function() {
+						self.pause(time);
+					}, 100);
+					return; // Cancel execution and wait for the delayed command.
+				}
+			}
+			if(time > 0) { // Avoids a setMedia() followed by stop() or pause(0) hiding the video play button.
+				this._html_checkWaitForPlay();
+			}
+		},
+		_html_playHead: function(percent) {
+			var self = this;
+			this._html_load(); // Loads if required and clears any delayed commands.
+			try {
+				if((typeof this.htmlElement.media.seekable === "object") && (this.htmlElement.media.seekable.length > 0)) {
+					this.htmlElement.media.currentTime = percent * this.htmlElement.media.seekable.end(this.htmlElement.media.seekable.length-1) / 100;
+				} else if(this.htmlElement.media.duration > 0 && !isNaN(this.htmlElement.media.duration)) {
+					this.htmlElement.media.currentTime = percent * this.htmlElement.media.duration / 100;
+				} else {
+					throw "e";
+				}
+			} catch(err) {
+				this.internal.htmlDlyCmdId = setTimeout(function() {
+					self.playHead(percent);
+				}, 100);
+				return; // Cancel execution and wait for the delayed command.
+			}
+			if(!this.status.waitForLoad) {
+				this._html_checkWaitForPlay();
+			}
+		},
+		_html_checkWaitForPlay: function() {
+			if(this.status.waitForPlay) {
+				this.status.waitForPlay = false;
+				if(this.css.jq.videoPlay.length) {
+					this.css.jq.videoPlay.hide();
+				}
+				if(this.status.video) {
+					this.internal.poster.jq.hide();
+					this.internal.video.jq.css({'width': this.status.width, 'height': this.status.height});
+				}
+			}
+		},
+		_html_volume: function(v) {
+			if(this.html.audio.available) {
+				this.htmlElement.audio.volume = v;
+			}
+			if(this.html.video.available) {
+				this.htmlElement.video.volume = v;
+			}
+		},
+		_html_mute: function(m) {
+			if(this.html.audio.available) {
+				this.htmlElement.audio.muted = m;
+			}
+			if(this.html.video.available) {
+				this.htmlElement.video.muted = m;
+			}
+		},
+		_flash_setAudio: function(media) {
+			var self = this;
+			try {
+				// Always finds a format due to checks in setMedia()
+				$.each(this.formats, function(priority, format) {
+					if(self.flash.support[format] && media[format]) {
+						switch (format) {
+							case "m4a" :
+							case "fla" :
+								self._getMovie().fl_setAudio_m4a(media[format]);
+								break;
+							case "mp3" :
+								self._getMovie().fl_setAudio_mp3(media[format]);
+								break;
+						}
+						self.status.src = media[format];
+						self.status.format[format] = true;
+						self.status.formatType = format;
+						return false;
+					}
+				});
+
+				if(this.options.preload === 'auto') {
+					this._flash_load();
+					this.status.waitForLoad = false;
+				}
+			} catch(err) { this._flashError(err); }
+		},
+		_flash_setVideo: function(media) {
+			var self = this;
+			try {
+				// Always finds a format due to checks in setMedia()
+				$.each(this.formats, function(priority, format) {
+					if(self.flash.support[format] && media[format]) {
+						switch (format) {
+							case "m4v" :
+							case "flv" :
+								self._getMovie().fl_setVideo_m4v(media[format]);
+								break;
+						}
+						self.status.src = media[format];
+						self.status.format[format] = true;
+						self.status.formatType = format;
+						return false;
+					}
+				});
+
+				if(this.options.preload === 'auto') {
+					this._flash_load();
+					this.status.waitForLoad = false;
+				}
+			} catch(err) { this._flashError(err); }
+		},
+		_flash_resetMedia: function() {
+			this.internal.flash.jq.css({'width':'0px', 'height':'0px'}); // Must do via CSS as setting attr() to zero causes a jQuery error in IE.
+			this._flash_pause(NaN);
+		},
+		_flash_clearMedia: function() {
+			try {
+				this._getMovie().fl_clearMedia();
+			} catch(err) { this._flashError(err); }
+		},
+		_flash_load: function() {
+			try {
+				this._getMovie().fl_load();
+			} catch(err) { this._flashError(err); }
+			this.status.waitForLoad = false;
+		},
+		_flash_play: function(time) {
+			try {
+				this._getMovie().fl_play(time);
+			} catch(err) { this._flashError(err); }
+			this.status.waitForLoad = false;
+			this._flash_checkWaitForPlay();
+		},
+		_flash_pause: function(time) {
+			try {
+				this._getMovie().fl_pause(time);
+			} catch(err) { this._flashError(err); }
+			if(time > 0) { // Avoids a setMedia() followed by stop() or pause(0) hiding the video play button.
+				this.status.waitForLoad = false;
+				this._flash_checkWaitForPlay();
+			}
+		},
+		_flash_playHead: function(p) {
+			try {
+				this._getMovie().fl_play_head(p);
+			} catch(err) { this._flashError(err); }
+			if(!this.status.waitForLoad) {
+				this._flash_checkWaitForPlay();
+			}
+		},
+		_flash_checkWaitForPlay: function() {
+			if(this.status.waitForPlay) {
+				this.status.waitForPlay = false;
+				if(this.css.jq.videoPlay.length) {
+					this.css.jq.videoPlay.hide();
+				}
+				if(this.status.video) {
+					this.internal.poster.jq.hide();
+					this.internal.flash.jq.css({'width': this.status.width, 'height': this.status.height});
+				}
+			}
+		},
+		_flash_volume: function(v) {
+			try {
+				this._getMovie().fl_volume(v);
+			} catch(err) { this._flashError(err); }
+		},
+		_flash_mute: function(m) {
+			try {
+				this._getMovie().fl_mute(m);
+			} catch(err) { this._flashError(err); }
+		},
+		_getMovie: function() {
+			return document[this.internal.flash.id];
+		},
+		_checkForFlash: function (version) {
+			// Function checkForFlash adapted from FlashReplace by Robert Nyman
+			// http://code.google.com/p/flashreplace/
+			var flashIsInstalled = false;
+			var flash;
+			if(window.ActiveXObject){
+				try{
+					flash = new ActiveXObject(("ShockwaveFlash.ShockwaveFlash." + version));
+					flashIsInstalled = true;
+				}
+				catch(e){
+					// Throws an error if the version isn't available			
+				}
+			}
+			else if(navigator.plugins && navigator.mimeTypes.length > 0){
+				flash = navigator.plugins["Shockwave Flash"];
+				if(flash){
+					var flashVersion = navigator.plugins["Shockwave Flash"].description.replace(/.*\s(\d+\.\d+).*/, "$1");
+					if(flashVersion >= version){
+						flashIsInstalled = true;
+					}
+				}
+			}
+			return flashIsInstalled;
+		},
+		_validString: function(url) {
+			return (url && typeof url === "string"); // Empty strings return false
+		},
+		_limitValue: function(value, min, max) {
+			return (value < min) ? min : ((value > max) ? max : value);
+		},
+		_urlNotSetError: function(context) {
+			this._error( {
+				type: $.jPlayer.error.URL_NOT_SET,
+				context: context,
+				message: $.jPlayer.errorMsg.URL_NOT_SET,
+				hint: $.jPlayer.errorHint.URL_NOT_SET
+			});
+		},
+		_flashError: function(error) {
+			var errorType;
+			if(!this.internal.ready) {
+				errorType = "FLASH";
+			} else {
+				errorType = "FLASH_DISABLED";
+			}
+			this._error( {
+				type: $.jPlayer.error[errorType],
+				context: this.internal.flash.swf,
+				message: $.jPlayer.errorMsg[errorType] + error.message,
+				hint: $.jPlayer.errorHint[errorType]
+			});
+			// Allow the audio player to recover if display:none and then shown again, or with position:fixed on Firefox.
+			// This really only affects audio in a media player, as an audio player could easily move the jPlayer element away from such issues.
+			this.internal.flash.jq.css({'width':'1px', 'height':'1px'});
+		},
+		_error: function(error) {
+			this._trigger($.jPlayer.event.error, error);
+			if(this.options.errorAlerts) {
+				this._alert("Error!" + (error.message ? "\n\n" + error.message : "") + (error.hint ? "\n\n" + error.hint : "") + "\n\nContext: " + error.context);
+			}
+		},
+		_warning: function(warning) {
+			this._trigger($.jPlayer.event.warning, undefined, warning);
+			if(this.options.warningAlerts) {
+				this._alert("Warning!" + (warning.message ? "\n\n" + warning.message : "") + (warning.hint ? "\n\n" + warning.hint : "") + "\n\nContext: " + warning.context);
+			}
+		},
+		_alert: function(message) {
+			alert("jPlayer " + this.version.script + " : id='" + this.internal.self.id +"' : " + message);
+		},
+		_emulateHtmlBridge: function() {
+			var self = this,
+			methods = $.jPlayer.emulateMethods;
+
+			// Emulate methods on jPlayer's DOM element.
+			$.each( $.jPlayer.emulateMethods.split(/\s+/g), function(i, name) {
+				self.internal.domNode[name] = function(arg) {
+					self[name](arg);
+				};
+
+			});
+
+			// Bubble jPlayer events to its DOM element.
+			$.each($.jPlayer.event, function(eventName,eventType) {
+				var nativeEvent = true;
+				$.each( $.jPlayer.reservedEvent.split(/\s+/g), function(i, name) {
+					if(name === eventName) {
+						nativeEvent = false;
+						return false;
+					}
+				});
+				if(nativeEvent) {
+					self.element.bind(eventType + ".jPlayer.jPlayerHtml", function() { // With .jPlayer & .jPlayerHtml namespaces.
+						self._emulateHtmlUpdate();
+						var domEvent = document.createEvent("Event");
+						domEvent.initEvent(eventName, false, true);
+						self.internal.domNode.dispatchEvent(domEvent);
+					});
+				}
+				// The error event would require a special case
+			});
+
+			// IE9 has a readyState property on all elements. The document should have it, but all (except media) elements inherit it in IE9. This conflicts with Popcorn, which polls the readyState.
+		},
+		_emulateHtmlUpdate: function() {
+			var self = this;
+
+			$.each( $.jPlayer.emulateStatus.split(/\s+/g), function(i, name) {
+				self.internal.domNode[name] = self.status[name];
+			});
+			$.each( $.jPlayer.emulateOptions.split(/\s+/g), function(i, name) {
+				self.internal.domNode[name] = self.options[name];
+			});
+		},
+		_destroyHtmlBridge: function() {
+			var self = this;
+
+			// Bridge event handlers are also removed by destroy() through .jPlayer namespace.
+			this.element.unbind(".jPlayerHtml"); // Remove all event handlers created by the jPlayer bridge. So you can change the emulateHtml option.
+
+			// Remove the methods and properties
+			var emulated = $.jPlayer.emulateMethods + " " + $.jPlayer.emulateStatus + " " + $.jPlayer.emulateOptions;
+			$.each( emulated.split(/\s+/g), function(i, name) {
+				delete self.internal.domNode[name];
+			});
+		}
+	};
+
+	$.jPlayer.error = {
+		FLASH: "e_flash",
+		FLASH_DISABLED: "e_flash_disabled",
+		NO_SOLUTION: "e_no_solution",
+		NO_SUPPORT: "e_no_support",
+		URL: "e_url",
+		URL_NOT_SET: "e_url_not_set",
+		VERSION: "e_version"
+	};
+
+	$.jPlayer.errorMsg = {
+		FLASH: "jPlayer's Flash fallback is not configured correctly, or a command was issued before the jPlayer Ready event. Details: ", // Used in: _flashError()
+		FLASH_DISABLED: "jPlayer's Flash fallback has been disabled by the browser due to the CSS rules you have used. Details: ", // Used in: _flashError()
+		NO_SOLUTION: "No solution can be found by jPlayer in this browser. Neither HTML nor Flash can be used.", // Used in: _init()
+		NO_SUPPORT: "It is not possible to play any media format provided in setMedia() on this browser using your current options.", // Used in: setMedia()
+		URL: "Media URL could not be loaded.", // Used in: jPlayerFlashEvent() and _addHtmlEventListeners()
+		URL_NOT_SET: "Attempt to issue media playback commands, while no media url is set.", // Used in: load(), play(), pause(), stop() and playHead()
+		VERSION: "jPlayer " + $.jPlayer.prototype.version.script + " needs Jplayer.swf version " + $.jPlayer.prototype.version.needFlash + " but found " // Used in: jPlayerReady()
+	};
+
+	$.jPlayer.errorHint = {
+		FLASH: "Check your swfPath option and that Jplayer.swf is there.",
+		FLASH_DISABLED: "Check that you have not display:none; the jPlayer entity or any ancestor.",
+		NO_SOLUTION: "Review the jPlayer options: support and supplied.",
+		NO_SUPPORT: "Video or audio formats defined in the supplied option are missing.",
+		URL: "Check media URL is valid.",
+		URL_NOT_SET: "Use setMedia() to set the media URL.",
+		VERSION: "Update jPlayer files."
+	};
+
+	$.jPlayer.warning = {
+		CSS_SELECTOR_COUNT: "e_css_selector_count",
+		CSS_SELECTOR_METHOD: "e_css_selector_method",
+		CSS_SELECTOR_STRING: "e_css_selector_string",
+		OPTION_KEY: "e_option_key"
+	};
+
+	$.jPlayer.warningMsg = {
+		CSS_SELECTOR_COUNT: "The number of css selectors found did not equal one: ",
+		CSS_SELECTOR_METHOD: "The methodName given in jPlayer('cssSelector') is not a valid jPlayer method.",
+		CSS_SELECTOR_STRING: "The methodCssSelector given in jPlayer('cssSelector') is not a String or is empty.",
+		OPTION_KEY: "The option requested in jPlayer('option') is undefined."
+	};
+
+	$.jPlayer.warningHint = {
+		CSS_SELECTOR_COUNT: "Check your css selector and the ancestor.",
+		CSS_SELECTOR_METHOD: "Check your method name.",
+		CSS_SELECTOR_STRING: "Check your css selector is a string.",
+		OPTION_KEY: "Check your option name."
+	};
+})(jQuery);
-- 
GitLab


From 1415cb8d196761b4f3b0ecb567aa2377fb417840 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 1 Jan 2012 23:45:22 +0100
Subject: [PATCH 123/546] add infieldlabel source

---
 core/js/jquery.infieldlabel.js | 140 +++++++++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100755 core/js/jquery.infieldlabel.js

diff --git a/core/js/jquery.infieldlabel.js b/core/js/jquery.infieldlabel.js
new file mode 100755
index 00000000000..f6a67b66ce1
--- /dev/null
+++ b/core/js/jquery.infieldlabel.js
@@ -0,0 +1,140 @@
+/*
+ * In-Field Label jQuery Plugin
+ * http://fuelyourcoding.com/scripts/infield.html
+ *
+ * Copyright (c) 2009 Doug Neiner
+ * Dual licensed under the MIT and GPL licenses.
+ * Uses the same license as jQuery, see:
+ * http://docs.jquery.com/License
+ *
+ * @version 0.1
+ */
+(function($){
+	
+    $.InFieldLabels = function(label,field, options){
+        // To avoid scope issues, use 'base' instead of 'this'
+        // to reference this class from internal events and functions.
+        var base = this;
+        
+        // Access to jQuery and DOM versions of each element
+        base.$label = $(label);
+        base.label = label;
+
+ 		base.$field = $(field);
+		base.field = field;
+        
+		base.$label.data("InFieldLabels", base);
+		base.showing = true;
+        
+        base.init = function(){
+			// Merge supplied options with default options
+            base.options = $.extend({},$.InFieldLabels.defaultOptions, options);
+
+			// Check if the field is already filled in
+			if(base.$field.val() != ""){
+				base.$label.hide();
+				base.showing = false;
+			};
+			
+			base.$field.focus(function(){
+				base.fadeOnFocus();
+			}).blur(function(){
+				base.checkForEmpty(true);
+			}).bind('keydown.infieldlabel',function(e){
+				// Use of a namespace (.infieldlabel) allows us to
+				// unbind just this method later
+				base.hideOnChange(e);
+			}).change(function(e){
+				base.checkForEmpty();
+			}).bind('onPropertyChange', function(){
+				base.checkForEmpty();
+			});
+        };
+
+		// If the label is currently showing
+		// then fade it down to the amount
+		// specified in the settings
+		base.fadeOnFocus = function(){
+			if(base.showing){
+				base.setOpacity(base.options.fadeOpacity);
+			};
+		};
+		
+		base.setOpacity = function(opacity){
+			base.$label.stop().animate({ opacity: opacity }, base.options.fadeDuration);
+			base.showing = (opacity > 0.0);
+		};
+		
+		// Checks for empty as a fail safe
+		// set blur to true when passing from
+		// the blur event
+		base.checkForEmpty = function(blur){
+			if(base.$field.val() == ""){
+				base.prepForShow();
+				base.setOpacity( blur ? 1.0 : base.options.fadeOpacity );
+			} else {
+				base.setOpacity(0.0);
+			};
+		};
+		
+		base.prepForShow = function(e){
+			if(!base.showing) {
+				// Prepare for a animate in...
+				base.$label.css({opacity: 0.0}).show();
+				
+				// Reattach the keydown event
+				base.$field.bind('keydown.infieldlabel',function(e){
+					base.hideOnChange(e);
+				});
+			};
+		};
+
+		base.hideOnChange = function(e){
+			if(
+				(e.keyCode == 16) || // Skip Shift
+				(e.keyCode == 9) // Skip Tab
+			  ) return; 
+			
+			if(base.showing){
+				base.$label.hide();
+				base.showing = false;
+			};
+			
+			// Remove keydown event to save on CPU processing
+			base.$field.unbind('keydown.infieldlabel');
+		};
+      
+		// Run the initialization method
+        base.init();
+    };
+	
+    $.InFieldLabels.defaultOptions = {
+        fadeOpacity: 0.5, // Once a field has focus, how transparent should the label be
+		fadeDuration: 300 // How long should it take to animate from 1.0 opacity to the fadeOpacity
+    };
+	
+
+    $.fn.inFieldLabels = function(options){
+        return this.each(function(){
+			// Find input or textarea based on for= attribute
+			// The for attribute on the label must contain the ID
+			// of the input or textarea element
+			var for_attr = $(this).attr('for');
+			if( !for_attr ) return; // Nothing to attach, since the for field wasn't used
+			
+			
+			// Find the referenced input or textarea element
+			var $field = $(
+				"input#" + for_attr + "[type='text']," + 
+				"input#" + for_attr + "[type='password']," + 
+				"textarea#" + for_attr
+				);
+				
+			if( $field.length == 0) return; // Again, nothing to attach
+			
+			// Only create object for input[text], input[password], or textarea
+            (new $.InFieldLabels(this, $field[0], options));
+        });
+    };
+	
+})(jQuery);
\ No newline at end of file
-- 
GitLab


From 65c37abef9a9fb7d5c8abae644f3aedb41cbb0a0 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 1 Jan 2012 23:29:23 +0000
Subject: [PATCH 124/546] added ace source

---
 .../js/aceeditor/ace-compat-uncompressed.js   |   490 +
 .../js/aceeditor/ace-uncompressed.js          | 14206 ++++++++++++++++
 .../keybinding-emacs-uncompressed.js          |   415 +
 .../aceeditor/keybinding-vim-uncompressed.js  |   403 +
 .../js/aceeditor/mode-c_cpp-uncompressed.js   |   928 +
 .../js/aceeditor/mode-clojure-uncompressed.js |   432 +
 .../js/aceeditor/mode-coffee-uncompressed.js  |   804 +
 .../aceeditor/mode-coldfusion-uncompressed.js |  2543 +++
 .../js/aceeditor/mode-csharp-uncompressed.js  |   778 +
 .../js/aceeditor/mode-css-uncompressed.js     |   863 +
 .../js/aceeditor/mode-groovy-uncompressed.js  |  1462 ++
 .../js/aceeditor/mode-haxe-uncompressed.js    |   778 +
 .../js/aceeditor/mode-html-uncompressed.js    |  2558 +++
 .../js/aceeditor/mode-java-uncompressed.js    |  1464 ++
 .../aceeditor/mode-javascript-uncompressed.js |  1295 ++
 .../js/aceeditor/mode-json-uncompressed.js    |   689 +
 .../js/aceeditor/mode-latex-uncompressed.js   |   105 +
 .../js/aceeditor/mode-lua-uncompressed.js     |   533 +
 .../aceeditor/mode-markdown-uncompressed.js   |  3000 ++++
 .../js/aceeditor/mode-ocaml-uncompressed.js   |   549 +
 .../js/aceeditor/mode-perl-uncompressed.js    |   583 +
 .../js/aceeditor/mode-php-uncompressed.js     |  1894 ++
 .../aceeditor/mode-powershell-uncompressed.js |   716 +
 .../js/aceeditor/mode-python-uncompressed.js  |   516 +
 .../js/aceeditor/mode-ruby-uncompressed.js    |   401 +
 .../js/aceeditor/mode-scad-uncompressed.js    |   916 +
 .../js/aceeditor/mode-scala-uncompressed.js   |  1464 ++
 .../js/aceeditor/mode-scss-uncompressed.js    |   688 +
 .../js/aceeditor/mode-sql-uncompressed.js     |   169 +
 .../js/aceeditor/mode-svg-uncompressed.js     |  2197 +++
 .../js/aceeditor/mode-textile-uncompressed.js |   264 +
 .../js/aceeditor/mode-xml-uncompressed.js     |  1011 ++
 .../js/aceeditor/theme-clouds-uncompressed.js |   162 +
 33 files changed, 45276 insertions(+)
 create mode 100755 apps/files_texteditor/js/aceeditor/ace-compat-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/ace-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/keybinding-emacs-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/keybinding-vim-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-c_cpp-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-clojure-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-coffee-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-coldfusion-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-csharp-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-css-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-groovy-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-haxe-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-html-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-java-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-javascript-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-json-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-latex-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-lua-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-markdown-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-ocaml-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-perl-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-php-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-powershell-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-python-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-ruby-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-scad-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-scala-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-scss-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-sql-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-svg-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-textile-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/mode-xml-uncompressed.js
 create mode 100755 apps/files_texteditor/js/aceeditor/theme-clouds-uncompressed.js

diff --git a/apps/files_texteditor/js/aceeditor/ace-compat-uncompressed.js b/apps/files_texteditor/js/aceeditor/ace-compat-uncompressed.js
new file mode 100755
index 00000000000..7fa232a335f
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/ace-compat-uncompressed.js
@@ -0,0 +1,490 @@
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('pilot/index', ['require', 'exports', 'module' , 'pilot/browser_focus', 'pilot/dom', 'pilot/event', 'pilot/event_emitter', 'pilot/fixoldbrowsers', 'pilot/keys', 'pilot/lang', 'pilot/oop', 'pilot/useragent', 'pilot/canon'], function(require, exports, module) {
+    require("pilot/browser_focus");
+    require("pilot/dom");
+    require("pilot/event");
+    require("pilot/event_emitter");
+    require("pilot/fixoldbrowsers");
+    require("pilot/keys");
+    require("pilot/lang");
+    require("pilot/oop");
+    require("pilot/useragent");
+    require("pilot/canon");
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('pilot/browser_focus', ['require', 'exports', 'module' , 'ace/lib/browser_focus'], function(require, exports, module) {
+    console.warn("DEPRECATED: 'pilot/browser_focus' is deprecated. Use 'ace/lib/browser_focus' instead");
+    module.exports = require("ace/lib/browser_focus");
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('pilot/dom', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
+    console.warn("DEPRECATED: 'pilot/dom' is deprecated. Use 'ace/lib/dom' instead");
+    module.exports = require("ace/lib/dom");
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('pilot/event', ['require', 'exports', 'module' , 'ace/lib/event'], function(require, exports, module) {
+    console.warn("DEPRECATED: 'pilot/event' is deprecated. Use 'ace/lib/event' instead");
+    module.exports = require("ace/lib/event");
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('pilot/event_emitter', ['require', 'exports', 'module' , 'ace/lib/event_emitter'], function(require, exports, module) {
+    console.warn("DEPRECATED: 'pilot/event_emitter' is deprecated. Use 'ace/lib/event_emitter' instead");
+    module.exports = require("ace/lib/event_emitter");
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('pilot/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/fixoldbrowsers'], function(require, exports, module) {
+    console.warn("DEPRECATED: 'pilot/fixoldbrowsers' is deprecated. Use 'ace/lib/fixoldbrowsers' instead");
+    module.exports = require("ace/lib/fixoldbrowsers");
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('pilot/keys', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
+    console.warn("DEPRECATED: 'pilot/keys' is deprecated. Use 'ace/lib/keys' instead");
+    module.exports = require("ace/lib/keys");
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('pilot/lang', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
+    console.warn("DEPRECATED: 'pilot/lang' is deprecated. Use 'ace/lib/lang' instead");
+    module.exports = require("ace/lib/lang");
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('pilot/oop', ['require', 'exports', 'module' , 'ace/lib/oop'], function(require, exports, module) {
+    console.warn("DEPRECATED: 'pilot/oop' is deprecated. Use 'ace/lib/oop' instead");
+    module.exports = require("ace/lib/oop");
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('pilot/useragent', ['require', 'exports', 'module' , 'ace/lib/useragent'], function(require, exports, module) {
+    console.warn("DEPRECATED: 'pilot/useragent' is deprecated. Use 'ace/lib/useragent' instead");
+    module.exports = require("ace/lib/useragent");
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('pilot/canon', ['require', 'exports', 'module' ], function(require, exports, module) {
+    console.warn("DEPRECATED: 'pilot/canon' is deprecated.");
+    //return require("ace/lib/dom");
+    
+    exports.addCommand = function() {
+        console.warn("DEPRECATED: 'canon.addCommand()' is deprecated. Use 'editor.commands.addCommand(command)' instead.");
+        console.trace();
+    }
+    
+    exports.removeCommand = function() {
+        console.warn("DEPRECATED: 'canon.removeCommand()' is deprecated. Use 'editor.commands.removeCommand(command)' instead.");
+        console.trace();
+    }
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/ace-uncompressed.js b/apps/files_texteditor/js/aceeditor/ace-uncompressed.js
new file mode 100755
index 00000000000..619baf49016
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/ace-uncompressed.js
@@ -0,0 +1,14206 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * Define a module along with a payload
+ * @param module a name for the payload
+ * @param payload a function to call with (require, exports, module) params
+ */
+ 
+(function() {
+
+var ACE_NAMESPACE = "";
+
+var global = (function() {
+    return this;
+})();
+
+if (typeof requirejs !== "undefined")
+    return;
+
+var _define = function(module, deps, payload) {
+    if (typeof module !== 'string') {
+        if (_define.original)
+            _define.original.apply(window, arguments);
+        else {
+            console.error('dropping module because define wasn\'t a string.');
+            console.trace();
+        }
+        return;
+    }
+
+    if (arguments.length == 2)
+        payload = deps;
+
+    if (!_define.modules)
+        _define.modules = {};
+        
+    _define.modules[module] = payload;
+};
+
+/**
+ * Get at functionality define()ed using the function above
+ */
+var _require = function(parentId, module, callback) {
+    if (Object.prototype.toString.call(module) === "[object Array]") {
+        var params = [];
+        for (var i = 0, l = module.length; i < l; ++i) {
+            var dep = lookup(parentId, module[i]);
+            if (!dep && _require.original)
+                return _require.original.apply(window, arguments);
+            params.push(dep);
+        }
+        if (callback) {
+            callback.apply(null, params);
+        }
+    }
+    else if (typeof module === 'string') {
+        var payload = lookup(parentId, module);
+        if (!payload && _require.original)
+            return _require.original.apply(window, arguments);
+        
+        if (callback) {
+            callback();
+        }
+    
+        return payload;
+    }
+    else {
+        if (_require.original)
+            return _require.original.apply(window, arguments);
+    }
+};
+
+var normalizeModule = function(parentId, moduleName) {
+    // normalize plugin requires
+    if (moduleName.indexOf("!") !== -1) {
+        var chunks = moduleName.split("!");
+        return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]);
+    }
+    // normalize relative requires
+    if (moduleName.charAt(0) == ".") {
+        var base = parentId.split("/").slice(0, -1).join("/");
+        moduleName = base + "/" + moduleName;
+        
+        while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
+            var previous = moduleName;
+            moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
+        }
+    }
+    
+    return moduleName;
+};
+
+/**
+ * Internal function to lookup moduleNames and resolve them by calling the
+ * definition function if needed.
+ */
+var lookup = function(parentId, moduleName) {
+
+    moduleName = normalizeModule(parentId, moduleName);
+
+    var module = _define.modules[moduleName];
+    if (!module) {
+        return null;
+    }
+
+    if (typeof module === 'function') {
+        var exports = {};
+        var mod = {
+            id: moduleName, 
+            uri: '',
+            exports: exports,
+            packaged: true
+        };
+        
+        var req = function(module, callback) {
+            return _require(moduleName, module, callback);
+        };
+        
+        var returnValue = module(req, exports, mod);
+        exports = returnValue || mod.exports;
+            
+        // cache the resulting module object for next time
+        _define.modules[moduleName] = exports;
+        return exports;
+    }
+
+    return module;
+};
+
+function exportAce(ns) {
+    var require = function(module, callback) {
+        return _require("", module, callback);
+    };
+    require.packaged = true;
+    
+    var root = global;
+    if (ns) {
+        if (!global[ns])
+            global[ns] = {};
+        root = global[ns];
+    }
+        
+    if (root.define)
+        _define.original = root.define;
+    
+    root.define = _define;
+
+    if (root.require)
+        _require.original = root.require;
+    
+    root.require = require;
+}
+
+exportAce(ACE_NAMESPACE);
+
+})();/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Skywriter.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Kevin Dangoor (kdangoor@mozilla.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/ace', ['require', 'exports', 'module' , 'ace/lib/fixoldbrowsers', 'ace/lib/dom', 'ace/lib/event', 'ace/editor', 'ace/edit_session', 'ace/undomanager', 'ace/virtual_renderer', 'ace/theme/textmate'], function(require, exports, module) {
+"use strict";
+
+require("./lib/fixoldbrowsers");
+
+var Dom = require("./lib/dom");
+var Event = require("./lib/event");
+
+var Editor = require("./editor").Editor;
+var EditSession = require("./edit_session").EditSession;
+var UndoManager = require("./undomanager").UndoManager;
+var Renderer = require("./virtual_renderer").VirtualRenderer;
+
+exports.edit = function(el) {
+    if (typeof(el) == "string") {
+        el = document.getElementById(el);
+    }
+
+    var doc = new EditSession(Dom.getInnerText(el));
+    doc.setUndoManager(new UndoManager());
+    el.innerHTML = '';
+
+    var editor = new Editor(new Renderer(el, require("./theme/textmate")));
+    editor.setSession(doc);
+
+    var env = {};
+    env.document = doc;
+    env.editor = editor;
+    editor.resize();
+    Event.addListener(window, "resize", function() {
+        editor.resize();
+    });
+    el.env = env;
+    // Store env on editor such that it can be accessed later on from
+    // the returned object.
+    editor.env = env;
+    return editor;
+};
+
+});// vim:set ts=4 sts=4 sw=4 st:
+// -- kriskowal Kris Kowal Copyright (C) 2009-2010 MIT License
+// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
+// -- dantman Daniel Friesen Copyright(C) 2010 XXX No License Specified
+// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
+// -- Irakli Gozalishvili Copyright (C) 2010 MIT License
+
+/*!
+    Copyright (c) 2009, 280 North Inc. http://280north.com/
+    MIT License. http://github.com/280north/narwhal/blob/master/README.md
+*/
+
+define('ace/lib/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/regexp', 'ace/lib/es5-shim'], function(require, exports, module) {
+"use strict";
+
+require("./regexp");
+require("./es5-shim");
+
+});/**
+ *  Based on code from:
+ *
+ * XRegExp 1.5.0
+ * (c) 2007-2010 Steven Levithan
+ * MIT License
+ * <http://xregexp.com>
+ * Provides an augmented, extensible, cross-browser implementation of regular expressions,
+ * including support for additional syntax, flags, and methods
+ */
+ 
+define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+    //---------------------------------
+    //  Private variables
+    //---------------------------------
+
+    var real = {
+            exec: RegExp.prototype.exec,
+            test: RegExp.prototype.test,
+            match: String.prototype.match,
+            replace: String.prototype.replace,
+            split: String.prototype.split
+        },
+        compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups
+        compliantLastIndexIncrement = function () {
+            var x = /^/g;
+            real.test.call(x, "");
+            return !x.lastIndex;
+        }();
+
+    //---------------------------------
+    //  Overriden native methods
+    //---------------------------------
+
+    // Adds named capture support (with backreferences returned as `result.name`), and fixes two
+    // cross-browser issues per ES3:
+    // - Captured values for nonparticipating capturing groups should be returned as `undefined`,
+    //   rather than the empty string.
+    // - `lastIndex` should not be incremented after zero-length matches.
+    RegExp.prototype.exec = function (str) {
+        var match = real.exec.apply(this, arguments),
+            name, r2;
+        if (match) {
+            // Fix browsers whose `exec` methods don't consistently return `undefined` for
+            // nonparticipating capturing groups
+            if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) {
+                r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", ""));
+                // Using `str.slice(match.index)` rather than `match[0]` in case lookahead allowed
+                // matching due to characters outside the match
+                real.replace.call(str.slice(match.index), r2, function () {
+                    for (var i = 1; i < arguments.length - 2; i++) {
+                        if (arguments[i] === undefined)
+                            match[i] = undefined;
+                    }
+                });
+            }
+            // Attach named capture properties
+            if (this._xregexp && this._xregexp.captureNames) {
+                for (var i = 1; i < match.length; i++) {
+                    name = this._xregexp.captureNames[i - 1];
+                    if (name)
+                       match[name] = match[i];
+                }
+            }
+            // Fix browsers that increment `lastIndex` after zero-length matches
+            if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index))
+                this.lastIndex--;
+        }
+        return match;
+    };
+
+    // Don't override `test` if it won't change anything
+    if (!compliantLastIndexIncrement) {
+        // Fix browser bug in native method
+        RegExp.prototype.test = function (str) {
+            // Use the native `exec` to skip some processing overhead, even though the overriden
+            // `exec` would take care of the `lastIndex` fix
+            var match = real.exec.call(this, str);
+            // Fix browsers that increment `lastIndex` after zero-length matches
+            if (match && this.global && !match[0].length && (this.lastIndex > match.index))
+                this.lastIndex--;
+            return !!match;
+        };
+    }
+
+    //---------------------------------
+    //  Private helper functions
+    //---------------------------------
+
+    function getNativeFlags (regex) {
+        return (regex.global     ? "g" : "") +
+               (regex.ignoreCase ? "i" : "") +
+               (regex.multiline  ? "m" : "") +
+               (regex.extended   ? "x" : "") + // Proposed for ES4; included in AS3
+               (regex.sticky     ? "y" : "");
+    };
+
+    function indexOf (array, item, from) {
+        if (Array.prototype.indexOf) // Use the native array method if available
+            return array.indexOf(item, from);
+        for (var i = from || 0; i < array.length; i++) {
+            if (array[i] === item)
+                return i;
+        }
+        return -1;
+    };
+
+});// vim: ts=4 sts=4 sw=4 expandtab
+// -- kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
+// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
+// -- dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
+// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
+// -- Gozala Irakli Gozalishvili Copyright (C) 2010 MIT License
+// -- kitcambridge Kit Cambridge Copyright (C) 2011 MIT License
+// -- kossnocorp Sasha Koss XXX TODO License or CLA
+// -- bryanforbes Bryan Forbes XXX TODO License or CLA
+// -- killdream Quildreen Motta Copyright (C) 2011 MIT Licence
+// -- michaelficarra Michael Ficarra Copyright (C) 2011 3-clause BSD License
+// -- sharkbrainguy Gerard Paapu Copyright (C) 2011 MIT License
+// -- bbqsrc Brendan Molloy (C) 2011 Creative Commons Zero (public domain)
+// -- iwyg XXX TODO License or CLA
+// -- DomenicDenicola Domenic Denicola Copyright (C) 2011 MIT License
+// -- xavierm02 Montillet Xavier XXX TODO License or CLA
+// -- Raynos Raynos XXX TODO License or CLA
+// -- samsonjs Sami Samhuri Copyright (C) 2010 MIT License
+// -- rwldrn Rick Waldron Copyright (C) 2011 MIT License
+// -- lexer Alexey Zakharov XXX TODO License or CLA
+
+/*!
+    Copyright (c) 2009, 280 North Inc. http://280north.com/
+    MIT License. http://github.com/280north/narwhal/blob/master/README.md
+*/
+
+define('ace/lib/es5-shim', ['require', 'exports', 'module' ], function(require, exports, module) {
+
+/**
+ * Brings an environment as close to ECMAScript 5 compliance
+ * as is possible with the facilities of erstwhile engines.
+ *
+ * Annotated ES5: http://es5.github.com/ (specific links below)
+ * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
+ *
+ * @module
+ */
+
+/*whatsupdoc*/
+
+//
+// Function
+// ========
+//
+
+// ES-5 15.3.4.5
+// http://es5.github.com/#x15.3.4.5
+
+if (!Function.prototype.bind) {
+    Function.prototype.bind = function bind(that) { // .length is 1
+        // 1. Let Target be the this value.
+        var target = this;
+        // 2. If IsCallable(Target) is false, throw a TypeError exception.
+        if (typeof target != "function")
+            throw new TypeError(); // TODO message
+        // 3. Let A be a new (possibly empty) internal list of all of the
+        //   argument values provided after thisArg (arg1, arg2 etc), in order.
+        // XXX slicedArgs will stand in for "A" if used
+        var args = slice.call(arguments, 1); // for normal call
+        // 4. Let F be a new native ECMAScript object.
+        // 11. Set the [[Prototype]] internal property of F to the standard
+        //   built-in Function prototype object as specified in 15.3.3.1.
+        // 12. Set the [[Call]] internal property of F as described in
+        //   15.3.4.5.1.
+        // 13. Set the [[Construct]] internal property of F as described in
+        //   15.3.4.5.2.
+        // 14. Set the [[HasInstance]] internal property of F as described in
+        //   15.3.4.5.3.
+        var bound = function () {
+
+            if (this instanceof bound) {
+                // 15.3.4.5.2 [[Construct]]
+                // When the [[Construct]] internal method of a function object,
+                // F that was created using the bind function is called with a
+                // list of arguments ExtraArgs, the following steps are taken:
+                // 1. Let target be the value of F's [[TargetFunction]]
+                //   internal property.
+                // 2. If target has no [[Construct]] internal method, a
+                //   TypeError exception is thrown.
+                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
+                //   property.
+                // 4. Let args be a new list containing the same values as the
+                //   list boundArgs in the same order followed by the same
+                //   values as the list ExtraArgs in the same order.
+                // 5. Return the result of calling the [[Construct]] internal 
+                //   method of target providing args as the arguments.
+
+                var F = function(){};
+                F.prototype = target.prototype;
+                var self = new F;
+
+                var result = target.apply(
+                    self,
+                    args.concat(slice.call(arguments))
+                );
+                if (result !== null && Object(result) === result)
+                    return result;
+                return self;
+
+            } else {
+                // 15.3.4.5.1 [[Call]]
+                // When the [[Call]] internal method of a function object, F,
+                // which was created using the bind function is called with a
+                // this value and a list of arguments ExtraArgs, the following
+                // steps are taken:
+                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
+                //   property.
+                // 2. Let boundThis be the value of F's [[BoundThis]] internal
+                //   property.
+                // 3. Let target be the value of F's [[TargetFunction]] internal
+                //   property.
+                // 4. Let args be a new list containing the same values as the 
+                //   list boundArgs in the same order followed by the same 
+                //   values as the list ExtraArgs in the same order.
+                // 5. Return the result of calling the [[Call]] internal method 
+                //   of target providing boundThis as the this value and 
+                //   providing args as the arguments.
+
+                // equiv: target.call(this, ...boundArgs, ...args)
+                return target.apply(
+                    that,
+                    args.concat(slice.call(arguments))
+                );
+
+            }
+
+        };
+        // XXX bound.length is never writable, so don't even try
+        //
+        // 15. If the [[Class]] internal property of Target is "Function", then
+        //     a. Let L be the length property of Target minus the length of A.
+        //     b. Set the length own property of F to either 0 or L, whichever is 
+        //       larger.
+        // 16. Else set the length own property of F to 0.
+        // 17. Set the attributes of the length own property of F to the values
+        //   specified in 15.3.5.1.
+
+        // TODO
+        // 18. Set the [[Extensible]] internal property of F to true.
+        
+        // TODO
+        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
+        // 20. Call the [[DefineOwnProperty]] internal method of F with 
+        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
+        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and 
+        //   false.
+        // 21. Call the [[DefineOwnProperty]] internal method of F with 
+        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower, 
+        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
+        //   and false.
+
+        // TODO
+        // NOTE Function objects created using Function.prototype.bind do not 
+        // have a prototype property or the [[Code]], [[FormalParameters]], and
+        // [[Scope]] internal properties.
+        // XXX can't delete prototype in pure-js.
+
+        // 22. Return F.
+        return bound;
+    };
+}
+
+// Shortcut to an often accessed properties, in order to avoid multiple
+// dereference that costs universally.
+// _Please note: Shortcuts are defined after `Function.prototype.bind` as we
+// us it in defining shortcuts.
+var call = Function.prototype.call;
+var prototypeOfArray = Array.prototype;
+var prototypeOfObject = Object.prototype;
+var slice = prototypeOfArray.slice;
+var toString = call.bind(prototypeOfObject.toString);
+var owns = call.bind(prototypeOfObject.hasOwnProperty);
+
+// If JS engine supports accessors creating shortcuts.
+var defineGetter;
+var defineSetter;
+var lookupGetter;
+var lookupSetter;
+var supportsAccessors;
+if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
+    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
+    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
+    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
+    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
+}
+
+//
+// Array
+// =====
+//
+
+// ES5 15.4.3.2
+// http://es5.github.com/#x15.4.3.2
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
+if (!Array.isArray) {
+    Array.isArray = function isArray(obj) {
+        return toString(obj) == "[object Array]";
+    };
+}
+
+// The IsCallable() check in the Array functions
+// has been replaced with a strict check on the
+// internal class of the object to trap cases where
+// the provided function was actually a regular
+// expression literal, which in V8 and
+// JavaScriptCore is a typeof "function".  Only in
+// V8 are regular expression literals permitted as
+// reduce parameters, so it is desirable in the
+// general case for the shim to match the more
+// strict and common behavior of rejecting regular
+// expressions.
+
+// ES5 15.4.4.18
+// http://es5.github.com/#x15.4.4.18
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
+if (!Array.prototype.forEach) {
+    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
+        var self = toObject(this),
+            thisp = arguments[1],
+            i = 0,
+            length = self.length >>> 0;
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        while (i < length) {
+            if (i in self) {
+                // Invoke the callback function with call, passing arguments:
+                // context, property value, property key, thisArg object context
+                fun.call(thisp, self[i], i, self);
+            }
+            i++;
+        }
+    };
+}
+
+// ES5 15.4.4.19
+// http://es5.github.com/#x15.4.4.19
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
+if (!Array.prototype.map) {
+    Array.prototype.map = function map(fun /*, thisp*/) {
+        var self = toObject(this),
+            length = self.length >>> 0,
+            result = Array(length),
+            thisp = arguments[1];
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        for (var i = 0; i < length; i++) {
+            if (i in self)
+                result[i] = fun.call(thisp, self[i], i, self);
+        }
+        return result;
+    };
+}
+
+// ES5 15.4.4.20
+// http://es5.github.com/#x15.4.4.20
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
+if (!Array.prototype.filter) {
+    Array.prototype.filter = function filter(fun /*, thisp */) {
+        var self = toObject(this),
+            length = self.length >>> 0,
+            result = [],
+            thisp = arguments[1];
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        for (var i = 0; i < length; i++) {
+            if (i in self && fun.call(thisp, self[i], i, self))
+                result.push(self[i]);
+        }
+        return result;
+    };
+}
+
+// ES5 15.4.4.16
+// http://es5.github.com/#x15.4.4.16
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
+if (!Array.prototype.every) {
+    Array.prototype.every = function every(fun /*, thisp */) {
+        var self = toObject(this),
+            length = self.length >>> 0,
+            thisp = arguments[1];
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        for (var i = 0; i < length; i++) {
+            if (i in self && !fun.call(thisp, self[i], i, self))
+                return false;
+        }
+        return true;
+    };
+}
+
+// ES5 15.4.4.17
+// http://es5.github.com/#x15.4.4.17
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
+if (!Array.prototype.some) {
+    Array.prototype.some = function some(fun /*, thisp */) {
+        var self = toObject(this),
+            length = self.length >>> 0,
+            thisp = arguments[1];
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        for (var i = 0; i < length; i++) {
+            if (i in self && fun.call(thisp, self[i], i, self))
+                return true;
+        }
+        return false;
+    };
+}
+
+// ES5 15.4.4.21
+// http://es5.github.com/#x15.4.4.21
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
+if (!Array.prototype.reduce) {
+    Array.prototype.reduce = function reduce(fun /*, initial*/) {
+        var self = toObject(this),
+            length = self.length >>> 0;
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        // no value to return if no initial value and an empty array
+        if (!length && arguments.length == 1)
+            throw new TypeError(); // TODO message
+
+        var i = 0;
+        var result;
+        if (arguments.length >= 2) {
+            result = arguments[1];
+        } else {
+            do {
+                if (i in self) {
+                    result = self[i++];
+                    break;
+                }
+
+                // if array contains no values, no initial value to return
+                if (++i >= length)
+                    throw new TypeError(); // TODO message
+            } while (true);
+        }
+
+        for (; i < length; i++) {
+            if (i in self)
+                result = fun.call(void 0, result, self[i], i, self);
+        }
+
+        return result;
+    };
+}
+
+// ES5 15.4.4.22
+// http://es5.github.com/#x15.4.4.22
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
+if (!Array.prototype.reduceRight) {
+    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
+        var self = toObject(this),
+            length = self.length >>> 0;
+
+        // If no callback function or if callback is not a callable function
+        if (toString(fun) != "[object Function]") {
+            throw new TypeError(); // TODO message
+        }
+
+        // no value to return if no initial value, empty array
+        if (!length && arguments.length == 1)
+            throw new TypeError(); // TODO message
+
+        var result, i = length - 1;
+        if (arguments.length >= 2) {
+            result = arguments[1];
+        } else {
+            do {
+                if (i in self) {
+                    result = self[i--];
+                    break;
+                }
+
+                // if array contains no values, no initial value to return
+                if (--i < 0)
+                    throw new TypeError(); // TODO message
+            } while (true);
+        }
+
+        do {
+            if (i in this)
+                result = fun.call(void 0, result, self[i], i, self);
+        } while (i--);
+
+        return result;
+    };
+}
+
+// ES5 15.4.4.14
+// http://es5.github.com/#x15.4.4.14
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
+if (!Array.prototype.indexOf) {
+    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
+        var self = toObject(this),
+            length = self.length >>> 0;
+
+        if (!length)
+            return -1;
+
+        var i = 0;
+        if (arguments.length > 1)
+            i = toInteger(arguments[1]);
+
+        // handle negative indices
+        i = i >= 0 ? i : Math.max(0, length + i);
+        for (; i < length; i++) {
+            if (i in self && self[i] === sought) {
+                return i;
+            }
+        }
+        return -1;
+    };
+}
+
+// ES5 15.4.4.15
+// http://es5.github.com/#x15.4.4.15
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
+if (!Array.prototype.lastIndexOf) {
+    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
+        var self = toObject(this),
+            length = self.length >>> 0;
+
+        if (!length)
+            return -1;
+        var i = length - 1;
+        if (arguments.length > 1)
+            i = Math.min(i, toInteger(arguments[1]));
+        // handle negative indices
+        i = i >= 0 ? i : length - Math.abs(i);
+        for (; i >= 0; i--) {
+            if (i in self && sought === self[i])
+                return i;
+        }
+        return -1;
+    };
+}
+
+//
+// Object
+// ======
+//
+
+// ES5 15.2.3.2
+// http://es5.github.com/#x15.2.3.2
+if (!Object.getPrototypeOf) {
+    // https://github.com/kriskowal/es5-shim/issues#issue/2
+    // http://ejohn.org/blog/objectgetprototypeof/
+    // recommended by fschaefer on github
+    Object.getPrototypeOf = function getPrototypeOf(object) {
+        return object.__proto__ || (
+            object.constructor ?
+            object.constructor.prototype :
+            prototypeOfObject
+        );
+    };
+}
+
+// ES5 15.2.3.3
+// http://es5.github.com/#x15.2.3.3
+if (!Object.getOwnPropertyDescriptor) {
+    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
+                         "non-object: ";
+    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
+        if ((typeof object != "object" && typeof object != "function") || object === null)
+            throw new TypeError(ERR_NON_OBJECT + object);
+        // If object does not owns property return undefined immediately.
+        if (!owns(object, property))
+            return;
+
+        var descriptor, getter, setter;
+
+        // If object has a property then it's for sure both `enumerable` and
+        // `configurable`.
+        descriptor =  { enumerable: true, configurable: true };
+
+        // If JS engine supports accessor properties then property may be a
+        // getter or setter.
+        if (supportsAccessors) {
+            // Unfortunately `__lookupGetter__` will return a getter even
+            // if object has own non getter property along with a same named
+            // inherited getter. To avoid misbehavior we temporary remove
+            // `__proto__` so that `__lookupGetter__` will return getter only
+            // if it's owned by an object.
+            var prototype = object.__proto__;
+            object.__proto__ = prototypeOfObject;
+
+            var getter = lookupGetter(object, property);
+            var setter = lookupSetter(object, property);
+
+            // Once we have getter and setter we can put values back.
+            object.__proto__ = prototype;
+
+            if (getter || setter) {
+                if (getter) descriptor.get = getter;
+                if (setter) descriptor.set = setter;
+
+                // If it was accessor property we're done and return here
+                // in order to avoid adding `value` to the descriptor.
+                return descriptor;
+            }
+        }
+
+        // If we got this far we know that object has an own property that is
+        // not an accessor so we set it as a value and return descriptor.
+        descriptor.value = object[property];
+        return descriptor;
+    };
+}
+
+// ES5 15.2.3.4
+// http://es5.github.com/#x15.2.3.4
+if (!Object.getOwnPropertyNames) {
+    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
+        return Object.keys(object);
+    };
+}
+
+// ES5 15.2.3.5
+// http://es5.github.com/#x15.2.3.5
+if (!Object.create) {
+    Object.create = function create(prototype, properties) {
+        var object;
+        if (prototype === null) {
+            object = { "__proto__": null };
+        } else {
+            if (typeof prototype != "object")
+                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
+            var Type = function () {};
+            Type.prototype = prototype;
+            object = new Type();
+            // IE has no built-in implementation of `Object.getPrototypeOf`
+            // neither `__proto__`, but this manually setting `__proto__` will
+            // guarantee that `Object.getPrototypeOf` will work as expected with
+            // objects created using `Object.create`
+            object.__proto__ = prototype;
+        }
+        if (properties !== void 0)
+            Object.defineProperties(object, properties);
+        return object;
+    };
+}
+
+// ES5 15.2.3.6
+// http://es5.github.com/#x15.2.3.6
+
+// Patch for WebKit and IE8 standard mode
+// Designed by hax <hax.github.com>
+// related issue: https://github.com/kriskowal/es5-shim/issues#issue/5
+// IE8 Reference:
+//     http://msdn.microsoft.com/en-us/library/dd282900.aspx
+//     http://msdn.microsoft.com/en-us/library/dd229916.aspx
+// WebKit Bugs:
+//     https://bugs.webkit.org/show_bug.cgi?id=36423
+
+function doesDefinePropertyWork(object) {
+    try {
+        Object.defineProperty(object, "sentinel", {});
+        return "sentinel" in object;
+    } catch (exception) {
+        // returns falsy
+    }
+}
+
+// check whether defineProperty works if it's given. Otherwise,
+// shim partially.
+if (Object.defineProperty) {
+    var definePropertyWorksOnObject = doesDefinePropertyWork({});
+    var definePropertyWorksOnDom = typeof document == "undefined" ||
+        doesDefinePropertyWork(document.createElement("div"));
+    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
+        var definePropertyFallback = Object.defineProperty;
+    }
+}
+
+if (!Object.defineProperty || definePropertyFallback) {
+    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
+    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
+    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
+                                      "on this javascript engine";
+
+    Object.defineProperty = function defineProperty(object, property, descriptor) {
+        if ((typeof object != "object" && typeof object != "function") || object === null)
+            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
+        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
+            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
+
+        // make a valiant attempt to use the real defineProperty
+        // for I8's DOM elements.
+        if (definePropertyFallback) {
+            try {
+                return definePropertyFallback.call(Object, object, property, descriptor);
+            } catch (exception) {
+                // try the shim if the real one doesn't work
+            }
+        }
+
+        // If it's a data property.
+        if (owns(descriptor, "value")) {
+            // fail silently if "writable", "enumerable", or "configurable"
+            // are requested but not supported
+            /*
+            // alternate approach:
+            if ( // can't implement these features; allow false but not true
+                !(owns(descriptor, "writable") ? descriptor.writable : true) ||
+                !(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
+                !(owns(descriptor, "configurable") ? descriptor.configurable : true)
+            )
+                throw new RangeError(
+                    "This implementation of Object.defineProperty does not " +
+                    "support configurable, enumerable, or writable."
+                );
+            */
+
+            if (supportsAccessors && (lookupGetter(object, property) ||
+                                      lookupSetter(object, property)))
+            {
+                // As accessors are supported only on engines implementing
+                // `__proto__` we can safely override `__proto__` while defining
+                // a property to make sure that we don't hit an inherited
+                // accessor.
+                var prototype = object.__proto__;
+                object.__proto__ = prototypeOfObject;
+                // Deleting a property anyway since getter / setter may be
+                // defined on object itself.
+                delete object[property];
+                object[property] = descriptor.value;
+                // Setting original `__proto__` back now.
+                object.__proto__ = prototype;
+            } else {
+                object[property] = descriptor.value;
+            }
+        } else {
+            if (!supportsAccessors)
+                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
+            // If we got that far then getters and setters can be defined !!
+            if (owns(descriptor, "get"))
+                defineGetter(object, property, descriptor.get);
+            if (owns(descriptor, "set"))
+                defineSetter(object, property, descriptor.set);
+        }
+
+        return object;
+    };
+}
+
+// ES5 15.2.3.7
+// http://es5.github.com/#x15.2.3.7
+if (!Object.defineProperties) {
+    Object.defineProperties = function defineProperties(object, properties) {
+        for (var property in properties) {
+            if (owns(properties, property))
+                Object.defineProperty(object, property, properties[property]);
+        }
+        return object;
+    };
+}
+
+// ES5 15.2.3.8
+// http://es5.github.com/#x15.2.3.8
+if (!Object.seal) {
+    Object.seal = function seal(object) {
+        // this is misleading and breaks feature-detection, but
+        // allows "securable" code to "gracefully" degrade to working
+        // but insecure code.
+        return object;
+    };
+}
+
+// ES5 15.2.3.9
+// http://es5.github.com/#x15.2.3.9
+if (!Object.freeze) {
+    Object.freeze = function freeze(object) {
+        // this is misleading and breaks feature-detection, but
+        // allows "securable" code to "gracefully" degrade to working
+        // but insecure code.
+        return object;
+    };
+}
+
+// detect a Rhino bug and patch it
+try {
+    Object.freeze(function () {});
+} catch (exception) {
+    Object.freeze = (function freeze(freezeObject) {
+        return function freeze(object) {
+            if (typeof object == "function") {
+                return object;
+            } else {
+                return freezeObject(object);
+            }
+        };
+    })(Object.freeze);
+}
+
+// ES5 15.2.3.10
+// http://es5.github.com/#x15.2.3.10
+if (!Object.preventExtensions) {
+    Object.preventExtensions = function preventExtensions(object) {
+        // this is misleading and breaks feature-detection, but
+        // allows "securable" code to "gracefully" degrade to working
+        // but insecure code.
+        return object;
+    };
+}
+
+// ES5 15.2.3.11
+// http://es5.github.com/#x15.2.3.11
+if (!Object.isSealed) {
+    Object.isSealed = function isSealed(object) {
+        return false;
+    };
+}
+
+// ES5 15.2.3.12
+// http://es5.github.com/#x15.2.3.12
+if (!Object.isFrozen) {
+    Object.isFrozen = function isFrozen(object) {
+        return false;
+    };
+}
+
+// ES5 15.2.3.13
+// http://es5.github.com/#x15.2.3.13
+if (!Object.isExtensible) {
+    Object.isExtensible = function isExtensible(object) {
+        // 1. If Type(O) is not Object throw a TypeError exception.
+        if (Object(object) === object) {
+            throw new TypeError(); // TODO message
+        }
+        // 2. Return the Boolean value of the [[Extensible]] internal property of O.
+        var name = '';
+        while (owns(object, name)) {
+            name += '?';
+        }
+        object[name] = true;
+        var returnValue = owns(object, name);
+        delete object[name];
+        return returnValue;
+    };
+}
+
+// ES5 15.2.3.14
+// http://es5.github.com/#x15.2.3.14
+if (!Object.keys) {
+    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
+    var hasDontEnumBug = true,
+        dontEnums = [
+            "toString",
+            "toLocaleString",
+            "valueOf",
+            "hasOwnProperty",
+            "isPrototypeOf",
+            "propertyIsEnumerable",
+            "constructor"
+        ],
+        dontEnumsLength = dontEnums.length;
+
+    for (var key in {"toString": null})
+        hasDontEnumBug = false;
+
+    Object.keys = function keys(object) {
+
+        if ((typeof object != "object" && typeof object != "function") || object === null)
+            throw new TypeError("Object.keys called on a non-object");
+
+        var keys = [];
+        for (var name in object) {
+            if (owns(object, name)) {
+                keys.push(name);
+            }
+        }
+
+        if (hasDontEnumBug) {
+            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
+                var dontEnum = dontEnums[i];
+                if (owns(object, dontEnum)) {
+                    keys.push(dontEnum);
+                }
+            }
+        }
+
+        return keys;
+    };
+
+}
+
+//
+// Date
+// ====
+//
+
+// ES5 15.9.5.43
+// http://es5.github.com/#x15.9.5.43
+// This function returns a String value represent the instance in time 
+// represented by this Date object. The format of the String is the Date Time 
+// string format defined in 15.9.1.15. All fields are present in the String. 
+// The time zone is always UTC, denoted by the suffix Z. If the time value of 
+// this object is not a finite Number a RangeError exception is thrown.
+if (!Date.prototype.toISOString || (new Date(-62198755200000).toISOString().indexOf('-000001') === -1)) {
+    Date.prototype.toISOString = function toISOString() {
+        var result, length, value, year;
+        if (!isFinite(this))
+            throw new RangeError;
+
+        // the date time string format is specified in 15.9.1.15.
+        result = [this.getUTCMonth() + 1, this.getUTCDate(),
+            this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
+        year = this.getUTCFullYear();
+        year = (year < 0 ? '-' : (year > 9999 ? '+' : '')) + ('00000' + Math.abs(year)).slice(0 <= year && year <= 9999 ? -4 : -6);
+
+        length = result.length;
+        while (length--) {
+            value = result[length];
+            // pad months, days, hours, minutes, and seconds to have two digits.
+            if (value < 10)
+                result[length] = "0" + value;
+        }
+        // pad milliseconds to have three digits.
+        return year + "-" + result.slice(0, 2).join("-") + "T" + result.slice(2).join(":") + "." +
+            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z";
+    }
+}
+
+// ES5 15.9.4.4
+// http://es5.github.com/#x15.9.4.4
+if (!Date.now) {
+    Date.now = function now() {
+        return new Date().getTime();
+    };
+}
+
+// ES5 15.9.5.44
+// http://es5.github.com/#x15.9.5.44
+// This function provides a String representation of a Date object for use by 
+// JSON.stringify (15.12.3).
+if (!Date.prototype.toJSON) {
+    Date.prototype.toJSON = function toJSON(key) {
+        // When the toJSON method is called with argument key, the following 
+        // steps are taken:
+
+        // 1.  Let O be the result of calling ToObject, giving it the this
+        // value as its argument.
+        // 2. Let tv be ToPrimitive(O, hint Number).
+        // 3. If tv is a Number and is not finite, return null.
+        // XXX
+        // 4. Let toISO be the result of calling the [[Get]] internal method of
+        // O with argument "toISOString".
+        // 5. If IsCallable(toISO) is false, throw a TypeError exception.
+        if (typeof this.toISOString != "function")
+            throw new TypeError(); // TODO message
+        // 6. Return the result of calling the [[Call]] internal method of
+        //  toISO with O as the this value and an empty argument list.
+        return this.toISOString();
+
+        // NOTE 1 The argument is ignored.
+
+        // NOTE 2 The toJSON function is intentionally generic; it does not
+        // require that its this value be a Date object. Therefore, it can be
+        // transferred to other kinds of objects for use as a method. However,
+        // it does require that any such object have a toISOString method. An
+        // object is free to use the argument key to filter its
+        // stringification.
+    };
+}
+
+// ES5 15.9.4.2
+// http://es5.github.com/#x15.9.4.2
+// based on work shared by Daniel Friesen (dantman)
+// http://gist.github.com/303249
+if (Date.parse("+275760-09-13T00:00:00.000Z") !== 8.64e15) {
+    // XXX global assignment won't work in embeddings that use
+    // an alternate object for the context.
+    Date = (function(NativeDate) {
+
+        // Date.length === 7
+        var Date = function Date(Y, M, D, h, m, s, ms) {
+            var length = arguments.length;
+            if (this instanceof NativeDate) {
+                var date = length == 1 && String(Y) === Y ? // isString(Y)
+                    // We explicitly pass it through parse:
+                    new NativeDate(Date.parse(Y)) :
+                    // We have to manually make calls depending on argument
+                    // length here
+                    length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
+                    length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
+                    length >= 5 ? new NativeDate(Y, M, D, h, m) :
+                    length >= 4 ? new NativeDate(Y, M, D, h) :
+                    length >= 3 ? new NativeDate(Y, M, D) :
+                    length >= 2 ? new NativeDate(Y, M) :
+                    length >= 1 ? new NativeDate(Y) :
+                                  new NativeDate();
+                // Prevent mixups with unfixed Date object
+                date.constructor = Date;
+                return date;
+            }
+            return NativeDate.apply(this, arguments);
+        };
+
+        // 15.9.1.15 Date Time String Format.
+        var isoDateExpression = new RegExp("^" +
+            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign + 6-digit extended year
+            "(?:-(\\d{2})" + // optional month capture
+            "(?:-(\\d{2})" + // optional day capture
+            "(?:" + // capture hours:minutes:seconds.milliseconds
+                "T(\\d{2})" + // hours capture
+                ":(\\d{2})" + // minutes capture
+                "(?:" + // optional :seconds.milliseconds
+                    ":(\\d{2})" + // seconds capture
+                    "(?:\\.(\\d{3}))?" + // milliseconds capture
+                ")?" +
+            "(?:" + // capture UTC offset component
+                "Z|" + // UTC capture
+                "(?:" + // offset specifier +/-hours:minutes
+                    "([-+])" + // sign capture
+                    "(\\d{2})" + // hours offset capture
+                    ":(\\d{2})" + // minutes offset capture
+                ")" +
+            ")?)?)?)?" +
+        "$");
+
+        // Copy any custom methods a 3rd party library may have added
+        for (var key in NativeDate)
+            Date[key] = NativeDate[key];
+
+        // Copy "native" methods explicitly; they may be non-enumerable
+        Date.now = NativeDate.now;
+        Date.UTC = NativeDate.UTC;
+        Date.prototype = NativeDate.prototype;
+        Date.prototype.constructor = Date;
+
+        // Upgrade Date.parse to handle simplified ISO 8601 strings
+        Date.parse = function parse(string) {
+            var match = isoDateExpression.exec(string);
+            if (match) {
+                match.shift(); // kill match[0], the full match
+                // parse months, days, hours, minutes, seconds, and milliseconds
+                for (var i = 1; i < 7; i++) {
+                    // provide default values if necessary
+                    match[i] = +(match[i] || (i < 3 ? 1 : 0));
+                    // match[1] is the month. Months are 0-11 in JavaScript
+                    // `Date` objects, but 1-12 in ISO notation, so we
+                    // decrement.
+                    if (i == 1)
+                        match[i]--;
+                }
+
+                // parse the UTC offset component
+                var minuteOffset = +match.pop(), hourOffset = +match.pop(), sign = match.pop();
+
+                // compute the explicit time zone offset if specified
+                var offset = 0;
+                if (sign) {
+                    // detect invalid offsets and return early
+                    if (hourOffset > 23 || minuteOffset > 59)
+                        return NaN;
+
+                    // express the provided time zone offset in minutes. The offset is
+                    // negative for time zones west of UTC; positive otherwise.
+                    offset = (hourOffset * 60 + minuteOffset) * 6e4 * (sign == "+" ? -1 : 1);
+                }
+
+                // Date.UTC for years between 0 and 99 converts year to 1900 + year
+                // The Gregorian calendar has a 400-year cycle, so 
+                // to Date.UTC(year + 400, .... ) - 12622780800000 == Date.UTC(year, ...),
+                // where 12622780800000 - number of milliseconds in Gregorian calendar 400 years
+                var year = +match[0];
+                if (0 <= year && year <= 99) {
+                    match[0] = year + 400;
+                    return NativeDate.UTC.apply(this, match) + offset - 12622780800000;
+                }
+
+                // compute a new UTC date value, accounting for the optional offset
+                return NativeDate.UTC.apply(this, match) + offset;
+            }
+            return NativeDate.parse.apply(this, arguments);
+        };
+
+        return Date;
+    })(Date);
+}
+
+//
+// String
+// ======
+//
+
+// ES5 15.5.4.20
+// http://es5.github.com/#x15.5.4.20
+var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
+    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
+    "\u2029\uFEFF";
+if (!String.prototype.trim || ws.trim()) {
+    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
+    // http://perfectionkills.com/whitespace-deviations/
+    ws = "[" + ws + "]";
+    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
+        trimEndRegexp = new RegExp(ws + ws + "*$");
+    String.prototype.trim = function trim() {
+        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
+    };
+}
+
+//
+// Util
+// ======
+//
+
+// ES5 9.4
+// http://es5.github.com/#x9.4
+// http://jsperf.com/to-integer
+var toInteger = function (n) {
+    n = +n;
+    if (n !== n) // isNaN
+        n = 0;
+    else if (n !== 0 && n !== (1/0) && n !== -(1/0))
+        n = (n > 0 || -1) * Math.floor(Math.abs(n));
+    return n;
+};
+
+var prepareString = "a"[0] != "a",
+    // ES5 9.9
+    // http://es5.github.com/#x9.9
+    toObject = function (o) {
+        if (o == null) { // this matches both null and undefined
+            throw new TypeError(); // TODO message
+        }
+        // If the implementation doesn't support by-index access of
+        // string characters (ex. IE < 7), split the string
+        if (prepareString && typeof o == "string" && o) {
+            return o.split("");
+        }
+        return Object(o);
+    };
+});/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai AT sucan AT gmail ODT com>
+ *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/lib/dom', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+var XHTML_NS = "http://www.w3.org/1999/xhtml";
+
+exports.createElement = function(tag, ns) {
+    return document.createElementNS ?
+           document.createElementNS(ns || XHTML_NS, tag) :
+           document.createElement(tag);
+};
+
+exports.setText = function(elem, text) {
+    if (elem.innerText !== undefined) {
+        elem.innerText = text;
+    }
+    if (elem.textContent !== undefined) {
+        elem.textContent = text;
+    }
+};
+
+exports.hasCssClass = function(el, name) {
+    var classes = el.className.split(/\s+/g);
+    return classes.indexOf(name) !== -1;
+};
+
+/**
+* Add a CSS class to the list of classes on the given node
+*/
+exports.addCssClass = function(el, name) {
+    if (!exports.hasCssClass(el, name)) {
+        el.className += " " + name;
+    }
+};
+
+/**
+* Remove a CSS class from the list of classes on the given node
+*/
+exports.removeCssClass = function(el, name) {
+    var classes = el.className.split(/\s+/g);
+    while (true) {
+        var index = classes.indexOf(name);
+        if (index == -1) {
+            break;
+        }
+        classes.splice(index, 1);
+    }
+    el.className = classes.join(" ");
+};
+
+exports.toggleCssClass = function(el, name) {
+    var classes = el.className.split(/\s+/g), add = true;
+    while (true) {
+        var index = classes.indexOf(name);
+        if (index == -1) {
+            break;
+        }
+        add = false;
+        classes.splice(index, 1);
+    }
+    if(add)
+        classes.push(name);
+
+    el.className = classes.join(" ");
+    return add;
+};
+
+/**
+ * Add or remove a CSS class from the list of classes on the given node
+ * depending on the value of <tt>include</tt>
+ */
+exports.setCssClass = function(node, className, include) {
+    if (include) {
+        exports.addCssClass(node, className);
+    } else {
+        exports.removeCssClass(node, className);
+    }
+};
+
+exports.hasCssString = function(id, doc) {
+    var index = 0, sheets;
+    doc = doc || document;
+
+    if (doc.createStyleSheet && (sheets = doc.styleSheets)) {
+        while (index < sheets.length)
+            if (sheets[index++].title === id) return true;
+    } else if ((sheets = doc.getElementsByTagName("style"))) {
+        while (index < sheets.length)
+            if (sheets[index++].id === id) return true;
+    }
+
+    return false;
+};
+
+exports.importCssString = function importCssString(cssText, id, doc) {
+    doc = doc || document;
+    // If style is already imported return immediately.
+    if (id && exports.hasCssString(id, doc))
+        return null;
+    
+    var style;
+    
+    if (doc.createStyleSheet) {
+        style = doc.createStyleSheet();
+        style.cssText = cssText;
+        if (id)
+            style.title = id;
+    } else {
+        style = doc.createElementNS
+            ? doc.createElementNS(XHTML_NS, "style")
+            : doc.createElement("style");
+
+        style.appendChild(doc.createTextNode(cssText));
+        if (id)
+            style.id = id;
+
+        var head = doc.getElementsByTagName("head")[0] || doc.documentElement;
+        head.appendChild(style);
+    }
+};
+
+exports.importCssStylsheet = function(uri, doc) {
+    if (doc.createStyleSheet) {
+        doc.createStyleSheet(uri);
+    } else {
+        var link = exports.createElement('link');
+        link.rel = 'stylesheet';
+        link.href = uri;
+
+        var head = doc.getElementsByTagName("head")[0] || doc.documentElement;
+        head.appendChild(link);
+    }
+};
+
+exports.getInnerWidth = function(element) {
+    return (
+        parseInt(exports.computedStyle(element, "paddingLeft"), 10) +
+        parseInt(exports.computedStyle(element, "paddingRight"), 10) + 
+        element.clientWidth
+    );
+};
+
+exports.getInnerHeight = function(element) {
+    return (
+        parseInt(exports.computedStyle(element, "paddingTop"), 10) +
+        parseInt(exports.computedStyle(element, "paddingBottom"), 10) +
+        element.clientHeight
+    );
+};
+
+if (window.pageYOffset !== undefined) {
+    exports.getPageScrollTop = function() {
+        return window.pageYOffset;
+    };
+
+    exports.getPageScrollLeft = function() {
+        return window.pageXOffset;
+    };
+}
+else {
+    exports.getPageScrollTop = function() {
+        return document.body.scrollTop;
+    };
+
+    exports.getPageScrollLeft = function() {
+        return document.body.scrollLeft;
+    };
+}
+
+if (window.getComputedStyle)
+    exports.computedStyle = function(element, style) {
+        if (style)
+            return (window.getComputedStyle(element, "") || {})[style] || "";
+        return window.getComputedStyle(element, "") || {};
+    };
+else
+    exports.computedStyle = function(element, style) {
+        if (style)
+            return element.currentStyle[style];
+        return element.currentStyle;
+    };
+
+exports.scrollbarWidth = function(document) {
+
+    var inner = exports.createElement("p");
+    inner.style.width = "100%";
+    inner.style.minWidth = "0px";
+    inner.style.height = "200px";
+
+    var outer = exports.createElement("div");
+    var style = outer.style;
+
+    style.position = "absolute";
+    style.left = "-10000px";
+    style.overflow = "hidden";
+    style.width = "200px";
+    style.minWidth = "0px";
+    style.height = "150px";
+
+    outer.appendChild(inner);
+
+    var body = document.body || document.documentElement;
+    body.appendChild(outer);
+
+    var noScrollbar = inner.offsetWidth;
+
+    style.overflow = "scroll";
+    var withScrollbar = inner.offsetWidth;
+
+    if (noScrollbar == withScrollbar) {
+        withScrollbar = outer.clientWidth;
+    }
+
+    body.removeChild(outer);
+
+    return noScrollbar-withScrollbar;
+};
+
+/**
+ * Optimized set innerHTML. This is faster than plain innerHTML if the element
+ * already contains a lot of child elements.
+ *
+ * See http://blog.stevenlevithan.com/archives/faster-than-innerhtml for details
+ */
+exports.setInnerHtml = function(el, innerHtml) {
+    var element = el.cloneNode(false);//document.createElement("div");
+    element.innerHTML = innerHtml;
+    el.parentNode.replaceChild(element, el);
+    return element;
+};
+
+exports.setInnerText = function(el, innerText) {
+    var document = el.ownerDocument;
+    if (document.body && "textContent" in document.body)
+        el.textContent = innerText;
+    else
+        el.innerText = innerText;
+
+};
+
+exports.getInnerText = function(el) {
+    var document = el.ownerDocument;
+    if (document.body && "textContent" in document.body)
+        return el.textContent;
+    else
+         return el.innerText || el.textContent || "";
+};
+
+exports.getParentWindow = function(document) {
+    return document.defaultView || document.parentWindow;
+};
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/lib/event', ['require', 'exports', 'module' , 'ace/lib/keys', 'ace/lib/useragent', 'ace/lib/dom'], function(require, exports, module) {
+"use strict";
+
+var keys = require("./keys");
+var useragent = require("./useragent");
+var dom = require("./dom");
+
+exports.addListener = function(elem, type, callback) {
+    if (elem.addEventListener) {
+        return elem.addEventListener(type, callback, false);
+    }
+    if (elem.attachEvent) {
+        var wrapper = function() {
+            callback(window.event);
+        };
+        callback._wrapper = wrapper;
+        elem.attachEvent("on" + type, wrapper);
+    }
+};
+
+exports.removeListener = function(elem, type, callback) {
+    if (elem.removeEventListener) {
+        return elem.removeEventListener(type, callback, false);
+    }
+    if (elem.detachEvent) {
+        elem.detachEvent("on" + type, callback._wrapper || callback);
+    }
+};
+
+/**
+* Prevents propagation and clobbers the default action of the passed event
+*/
+exports.stopEvent = function(e) {
+    exports.stopPropagation(e);
+    exports.preventDefault(e);
+    return false;
+};
+
+exports.stopPropagation = function(e) {
+    if (e.stopPropagation)
+        e.stopPropagation();
+    else
+        e.cancelBubble = true;
+};
+
+exports.preventDefault = function(e) {
+    if (e.preventDefault)
+        e.preventDefault();
+    else
+        e.returnValue = false;
+};
+
+exports.getDocumentX = function(e) {
+    if (e.clientX) {
+        return e.clientX + dom.getPageScrollLeft();
+    } else {
+        return e.pageX;
+    }
+};
+
+exports.getDocumentY = function(e) {
+    if (e.clientY) {
+        return e.clientY + dom.getPageScrollTop();
+    } else {
+        return e.pageY;
+    }
+};
+
+/**
+ * @return {Number} 0 for left button, 1 for middle button, 2 for right button
+ */
+exports.getButton = function(e) {
+    if (e.type == "dblclick")
+        return 0;
+    else if (e.type == "contextmenu")
+        return 2;
+
+    // DOM Event
+    if (e.preventDefault) {
+        return e.button;
+    }
+    // old IE
+    else {
+        return {1:0, 2:2, 4:1}[e.button];
+    }
+};
+
+if (document.documentElement.setCapture) {
+    exports.capture = function(el, eventHandler, releaseCaptureHandler) {
+        function onMouseMove(e) {
+            eventHandler(e);
+            return exports.stopPropagation(e);
+        }
+
+        var called = false;
+        function onReleaseCapture(e) {
+            eventHandler(e);
+
+            if (!called) {
+                called = true;
+                releaseCaptureHandler(e);
+            }
+
+            exports.removeListener(el, "mousemove", eventHandler);
+            exports.removeListener(el, "mouseup", onReleaseCapture);
+            exports.removeListener(el, "losecapture", onReleaseCapture);
+
+            el.releaseCapture();
+        }
+
+        exports.addListener(el, "mousemove", eventHandler);
+        exports.addListener(el, "mouseup", onReleaseCapture);
+        exports.addListener(el, "losecapture", onReleaseCapture);
+        el.setCapture();
+    };
+}
+else {
+    exports.capture = function(el, eventHandler, releaseCaptureHandler) {
+        function onMouseMove(e) {
+            eventHandler(e);
+            e.stopPropagation();
+        }
+
+        function onMouseUp(e) {
+            eventHandler && eventHandler(e);
+            releaseCaptureHandler && releaseCaptureHandler(e);
+
+            document.removeEventListener("mousemove", onMouseMove, true);
+            document.removeEventListener("mouseup", onMouseUp, true);
+
+            e.stopPropagation();
+        }
+
+        document.addEventListener("mousemove", onMouseMove, true);
+        document.addEventListener("mouseup", onMouseUp, true);
+    };
+}
+
+exports.addMouseWheelListener = function(el, callback) {
+    var max = 0;
+    var listener = function(e) {
+        if (e.wheelDelta !== undefined) {
+
+            // some versions of Safari (e.g. 5.0.5) report insanely high
+            // scroll values. These browsers require a higher factor
+            if (Math.abs(e.wheelDeltaY) > max)
+                max = Math.abs(e.wheelDeltaY);
+
+            if (max > 5000)
+                var factor = 400;
+            else
+                var factor = 8;
+
+            if (e.wheelDeltaX !== undefined) {
+                e.wheelX = -e.wheelDeltaX / factor;
+                e.wheelY = -e.wheelDeltaY / factor;
+            } else {
+                e.wheelX = 0;
+                e.wheelY = -e.wheelDelta / factor;
+            }
+        }
+        else {
+            if (e.axis && e.axis == e.HORIZONTAL_AXIS) {
+                e.wheelX = (e.detail || 0) * 5;
+                e.wheelY = 0;
+            } else {
+                e.wheelX = 0;
+                e.wheelY = (e.detail || 0) * 5;
+            }
+        }
+        callback(e);
+    };
+    exports.addListener(el, "DOMMouseScroll", listener);
+    exports.addListener(el, "mousewheel", listener);
+};
+
+exports.addMultiMouseDownListener = function(el, button, count, timeout, callback) {
+    var clicks = 0;
+    var startX, startY;
+
+    var listener = function(e) {
+        clicks += 1;
+        if (clicks == 1) {
+            startX = e.clientX;
+            startY = e.clientY;
+
+            setTimeout(function() {
+                clicks = 0;
+            }, timeout || 600);
+        }
+
+        var isButton = exports.getButton(e) == button;
+        if (!isButton || Math.abs(e.clientX - startX) > 5 || Math.abs(e.clientY - startY) > 5)
+            clicks = 0;
+
+        if (clicks == count) {
+            clicks = 0;
+            callback(e);
+        }
+
+        if (isButton)
+            return exports.preventDefault(e);
+    };
+
+    exports.addListener(el, "mousedown", listener);
+    useragent.isOldIE && exports.addListener(el, "dblclick", listener);
+};
+
+function normalizeCommandKeys(callback, e, keyCode) {
+    var hashId = 0;
+    if (useragent.isOpera && useragent.isMac) {
+        hashId = 0 | (e.metaKey ? 1 : 0) | (e.altKey ? 2 : 0)
+            | (e.shiftKey ? 4 : 0) | (e.ctrlKey ? 8 : 0);
+    } else {
+        hashId = 0 | (e.ctrlKey ? 1 : 0) | (e.altKey ? 2 : 0)
+            | (e.shiftKey ? 4 : 0) | (e.metaKey ? 8 : 0);
+    }
+
+    if (keyCode in keys.MODIFIER_KEYS) {
+        switch (keys.MODIFIER_KEYS[keyCode]) {
+            case "Alt":
+                hashId = 2;
+                break;
+            case "Shift":
+                hashId = 4;
+                break;
+            case "Ctrl":
+                hashId = 1;
+                break;
+            default:
+                hashId = 8;
+                break;
+        }
+        keyCode = 0;
+    }
+
+    if (hashId & 8 && (keyCode == 91 || keyCode == 93)) {
+        keyCode = 0;
+    }
+
+    // If there is no hashID and the keyCode is not a function key, then
+    // we don't call the callback as we don't handle a command key here
+    // (it's a normal key/character input).
+    if (!hashId && !(keyCode in keys.FUNCTION_KEYS) && !(keyCode in keys.PRINTABLE_KEYS)) {
+        return false;
+    }
+    return callback(e, hashId, keyCode);
+}
+
+exports.addCommandKeyListener = function(el, callback) {
+    var addListener = exports.addListener;
+    if (useragent.isOldGecko) {
+        // Old versions of Gecko aka. Firefox < 4.0 didn't repeat the keydown
+        // event if the user pressed the key for a longer time. Instead, the
+        // keydown event was fired once and later on only the keypress event.
+        // To emulate the 'right' keydown behavior, the keyCode of the initial
+        // keyDown event is stored and in the following keypress events the
+        // stores keyCode is used to emulate a keyDown event.
+        var lastKeyDownKeyCode = null;
+        addListener(el, "keydown", function(e) {
+            lastKeyDownKeyCode = e.keyCode;
+        });
+        addListener(el, "keypress", function(e) {
+            return normalizeCommandKeys(callback, e, lastKeyDownKeyCode);
+        });
+    } else {
+        var lastDown = null;
+
+        addListener(el, "keydown", function(e) {
+            lastDown = e.keyIdentifier || e.keyCode;
+            return normalizeCommandKeys(callback, e, e.keyCode);
+        });
+
+        // repeated keys are fired as keypress and not keydown events
+        if (useragent.isMac && useragent.isOpera) {
+            addListener(el, "keypress", function(e) {
+                var keyId = e.keyIdentifier || e.keyCode;
+                if (lastDown !== keyId) {
+                    return normalizeCommandKeys(callback, e, lastDown);
+                } else {
+                    lastDown = null;
+                }
+            });
+        }
+    }
+};
+
+if (window.postMessage) {
+    var postMessageId = 1;
+    exports.nextTick = function(callback, win) {
+        win = win || window;
+        var messageName = "zero-timeout-message-" + postMessageId;            
+        exports.addListener(win, "message", function listener(e) {
+            if (e.data == messageName) {
+                exports.stopPropagation(e);
+                exports.removeListener(win, "message", listener);
+                callback();
+            }
+        });
+        win.postMessage(messageName, "*");
+    };
+}
+else {
+    exports.nextTick = function(callback, win) {
+        win = win || window;
+        window.setTimeout(callback, 0);
+    };
+}
+
+});
+/*! @license
+==========================================================================
+SproutCore -- JavaScript Application Framework
+copyright 2006-2009, Sprout Systems Inc., Apple Inc. and contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+SproutCore and the SproutCore logo are trademarks of Sprout Systems, Inc.
+
+For more information about SproutCore, visit http://www.sproutcore.com
+
+
+==========================================================================
+@license */
+
+// Most of the following code is taken from SproutCore with a few changes.
+
+define('ace/lib/keys', ['require', 'exports', 'module' , 'ace/lib/oop'], function(require, exports, module) {
+"use strict";
+
+var oop = require("./oop");
+
+/**
+ * Helper functions and hashes for key handling.
+ */
+var Keys = (function() {
+    var ret = {
+        MODIFIER_KEYS: {
+            16: 'Shift', 17: 'Ctrl', 18: 'Alt', 224: 'Meta'
+        },
+
+        KEY_MODS: {
+            "ctrl": 1, "alt": 2, "option" : 2,
+            "shift": 4, "meta": 8, "command": 8
+        },
+
+        FUNCTION_KEYS : {
+            8  : "Backspace",
+            9  : "Tab",
+            13 : "Return",
+            19 : "Pause",
+            27 : "Esc",
+            32 : "Space",
+            33 : "PageUp",
+            34 : "PageDown",
+            35 : "End",
+            36 : "Home",
+            37 : "Left",
+            38 : "Up",
+            39 : "Right",
+            40 : "Down",
+            44 : "Print",
+            45 : "Insert",
+            46 : "Delete",
+            96 : "Numpad0",
+            97 : "Numpad1",
+            98 : "Numpad2",
+            99 : "Numpad3",
+            100: "Numpad4",
+            101: "Numpad5",
+            102: "Numpad6",
+            103: "Numpad7",
+            104: "Numpad8",
+            105: "Numpad9",
+            112: "F1",
+            113: "F2",
+            114: "F3",
+            115: "F4",
+            116: "F5",
+            117: "F6",
+            118: "F7",
+            119: "F8",
+            120: "F9",
+            121: "F10",
+            122: "F11",
+            123: "F12",
+            144: "Numlock",
+            145: "Scrolllock"
+        },
+
+        PRINTABLE_KEYS: {
+           32: ' ',  48: '0',  49: '1',  50: '2',  51: '3',  52: '4', 53:  '5',
+           54: '6',  55: '7',  56: '8',  57: '9',  59: ';',  61: '=', 65:  'a',
+           66: 'b',  67: 'c',  68: 'd',  69: 'e',  70: 'f',  71: 'g', 72:  'h',
+           73: 'i',  74: 'j',  75: 'k',  76: 'l',  77: 'm',  78: 'n', 79:  'o',
+           80: 'p',  81: 'q',  82: 'r',  83: 's',  84: 't',  85: 'u', 86:  'v',
+           87: 'w',  88: 'x',  89: 'y',  90: 'z', 107: '+', 109: '-', 110: '.',
+          188: ',', 190: '.', 191: '/', 192: '`', 219: '[', 220: '\\',
+          221: ']', 222: '\"'
+        }
+    };
+
+    // A reverse map of FUNCTION_KEYS
+    for (var i in ret.FUNCTION_KEYS) {
+        var name = ret.FUNCTION_KEYS[i].toUpperCase();
+        ret[name] = parseInt(i, 10);
+    }
+
+    // Add the MODIFIER_KEYS, FUNCTION_KEYS and PRINTABLE_KEYS to the KEY
+    // variables as well.
+    oop.mixin(ret, ret.MODIFIER_KEYS);
+    oop.mixin(ret, ret.PRINTABLE_KEYS);
+    oop.mixin(ret, ret.FUNCTION_KEYS);
+
+    return ret;
+})();
+oop.mixin(exports, Keys);
+
+exports.keyCodeToString = function(keyCode) {
+    return (Keys[keyCode] || String.fromCharCode(keyCode)).toLowerCase();
+}
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/lib/oop', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+exports.inherits = (function() {
+    var tempCtor = function() {};
+    return function(ctor, superCtor) {
+        tempCtor.prototype = superCtor.prototype;
+        ctor.super_ = superCtor.prototype;
+        ctor.prototype = new tempCtor();
+        ctor.prototype.constructor = ctor;
+    };
+}());
+
+exports.mixin = function(obj, mixin) {
+    for (var key in mixin) {
+        obj[key] = mixin[key];
+    }
+};
+
+exports.implement = function(proto, mixin) {
+    exports.mixin(proto, mixin);
+};
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/lib/useragent', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+var os = (navigator.platform.match(/mac|win|linux/i) || ["other"])[0].toLowerCase();
+var ua = navigator.userAgent;
+
+/** Is the user using a browser that identifies itself as Windows */
+exports.isWin = (os == "win");
+
+/** Is the user using a browser that identifies itself as Mac OS */
+exports.isMac = (os == "mac");
+
+/** Is the user using a browser that identifies itself as Linux */
+exports.isLinux = (os == "linux");
+
+exports.isIE = 
+    navigator.appName == "Microsoft Internet Explorer"
+    && parseFloat(navigator.userAgent.match(/MSIE ([0-9]+[\.0-9]+)/)[1]);
+    
+exports.isOldIE = exports.isIE && exports.isIE < 9;
+
+/** Is this Firefox or related? */
+exports.isGecko = exports.isMozilla = window.controllers && window.navigator.product === "Gecko";
+
+/** oldGecko == rev < 2.0 **/
+exports.isOldGecko = exports.isGecko && parseInt((navigator.userAgent.match(/rv\:(\d+)/)||[])[1], 10) < 4;
+
+/** Is this Opera */
+exports.isOpera = window.opera && Object.prototype.toString.call(window.opera) == "[object Opera]";
+
+/** Is the user using a browser that identifies itself as WebKit */
+exports.isWebKit = parseFloat(ua.split("WebKit/")[1]) || undefined;
+
+exports.isChrome = parseFloat(ua.split(" Chrome/")[1]) || undefined;
+
+exports.isAIR = ua.indexOf("AdobeAIR") >= 0;
+
+exports.isIPad = ua.indexOf("iPad") >= 0;
+
+exports.isTouchPad = ua.indexOf("TouchPad") >= 0;
+
+/**
+ * I hate doing this, but we need some way to determine if the user is on a Mac
+ * The reason is that users have different expectations of their key combinations.
+ *
+ * Take copy as an example, Mac people expect to use CMD or APPLE + C
+ * Windows folks expect to use CTRL + C
+ */
+exports.OS = {
+    LINUX: "LINUX",
+    MAC: "MAC",
+    WINDOWS: "WINDOWS"
+};
+
+/**
+ * Return an exports.OS constant
+ */
+exports.getOS = function() {
+    if (exports.isMac) {
+        return exports.OS.MAC;
+    } else if (exports.isLinux) {
+        return exports.OS.LINUX;
+    } else {
+        return exports.OS.WINDOWS;
+    }
+};
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
+ *      Julian Viereck <julian.viereck@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/editor', ['require', 'exports', 'module' , 'ace/lib/fixoldbrowsers', 'ace/lib/oop', 'ace/lib/lang', 'ace/lib/useragent', 'ace/keyboard/textinput', 'ace/mouse/mouse_handler', 'ace/mouse/fold_handler', 'ace/keyboard/keybinding', 'ace/edit_session', 'ace/search', 'ace/range', 'ace/lib/event_emitter', 'ace/commands/command_manager', 'ace/commands/default_commands'], function(require, exports, module) {
+"use strict";
+
+require("./lib/fixoldbrowsers");
+
+var oop = require("./lib/oop");
+var lang = require("./lib/lang");
+var useragent = require("./lib/useragent");
+var TextInput = require("./keyboard/textinput").TextInput;
+var MouseHandler = require("./mouse/mouse_handler").MouseHandler;
+var FoldHandler = require("./mouse/fold_handler").FoldHandler;
+//var TouchHandler = require("./touch_handler").TouchHandler;
+var KeyBinding = require("./keyboard/keybinding").KeyBinding;
+var EditSession = require("./edit_session").EditSession;
+var Search = require("./search").Search;
+var Range = require("./range").Range;
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+var CommandManager = require("./commands/command_manager").CommandManager;
+var defaultCommands = require("./commands/default_commands").commands;
+
+var Editor = function(renderer, session) {
+    var container = renderer.getContainerElement();
+    this.container = container;
+    this.renderer = renderer;
+    
+    this.textInput  = new TextInput(renderer.getTextAreaContainer(), this);
+    this.keyBinding = new KeyBinding(this);
+
+    // TODO detect touch event support
+    if (useragent.isIPad) {
+        //this.$mouseHandler = new TouchHandler(this);
+    } else {
+        this.$mouseHandler = new MouseHandler(this);
+        new FoldHandler(this);
+    }
+
+    this.$blockScrolling = 0;
+    this.$search = new Search().set({
+        wrap: true
+    });
+
+    this.commands = new CommandManager(useragent.isMac ? "mac" : "win", defaultCommands);
+    this.setSession(session || new EditSession(""));
+};
+
+(function(){
+
+    oop.implement(this, EventEmitter);
+
+    this.setKeyboardHandler = function(keyboardHandler) {
+        this.keyBinding.setKeyboardHandler(keyboardHandler);
+    };
+
+    this.getKeyboardHandler = function() {
+        return this.keyBinding.getKeyboardHandler();
+    };
+
+    this.setSession = function(session) {
+        if (this.session == session)
+            return;
+
+        if (this.session) {
+            var oldSession = this.session;
+            this.session.removeEventListener("change", this.$onDocumentChange);
+            this.session.removeEventListener("changeMode", this.$onChangeMode);
+            this.session.removeEventListener("tokenizerUpdate", this.$onTokenizerUpdate);
+            this.session.removeEventListener("changeTabSize", this.$onChangeTabSize);
+            this.session.removeEventListener("changeWrapLimit", this.$onChangeWrapLimit);
+            this.session.removeEventListener("changeWrapMode", this.$onChangeWrapMode);
+            this.session.removeEventListener("onChangeFold", this.$onChangeFold);
+            this.session.removeEventListener("changeFrontMarker", this.$onChangeFrontMarker);
+            this.session.removeEventListener("changeBackMarker", this.$onChangeBackMarker);
+            this.session.removeEventListener("changeBreakpoint", this.$onChangeBreakpoint);
+            this.session.removeEventListener("changeAnnotation", this.$onChangeAnnotation);
+            this.session.removeEventListener("changeOverwrite", this.$onCursorChange);
+            this.session.removeEventListener("changeScrollTop", this.$onScrollTopChange);
+            this.session.removeEventListener("changeLeftTop", this.$onScrollLeftChange);
+
+            var selection = this.session.getSelection();
+            selection.removeEventListener("changeCursor", this.$onCursorChange);
+            selection.removeEventListener("changeSelection", this.$onSelectionChange);
+        }
+
+        this.session = session;
+
+        this.$onDocumentChange = this.onDocumentChange.bind(this);
+        session.addEventListener("change", this.$onDocumentChange);
+        this.renderer.setSession(session);
+
+        this.$onChangeMode = this.onChangeMode.bind(this);
+        session.addEventListener("changeMode", this.$onChangeMode);
+
+        this.$onTokenizerUpdate = this.onTokenizerUpdate.bind(this);
+        session.addEventListener("tokenizerUpdate", this.$onTokenizerUpdate);
+
+        this.$onChangeTabSize = this.renderer.updateText.bind(this.renderer);
+        session.addEventListener("changeTabSize", this.$onChangeTabSize);
+
+        this.$onChangeWrapLimit = this.onChangeWrapLimit.bind(this);
+        session.addEventListener("changeWrapLimit", this.$onChangeWrapLimit);
+
+        this.$onChangeWrapMode = this.onChangeWrapMode.bind(this);
+        session.addEventListener("changeWrapMode", this.$onChangeWrapMode);
+
+        this.$onChangeFold = this.onChangeFold.bind(this);
+        session.addEventListener("changeFold", this.$onChangeFold);
+
+        this.$onChangeFrontMarker = this.onChangeFrontMarker.bind(this);
+        this.session.addEventListener("changeFrontMarker", this.$onChangeFrontMarker);
+
+        this.$onChangeBackMarker = this.onChangeBackMarker.bind(this);
+        this.session.addEventListener("changeBackMarker", this.$onChangeBackMarker);
+
+        this.$onChangeBreakpoint = this.onChangeBreakpoint.bind(this);
+        this.session.addEventListener("changeBreakpoint", this.$onChangeBreakpoint);
+
+        this.$onChangeAnnotation = this.onChangeAnnotation.bind(this);
+        this.session.addEventListener("changeAnnotation", this.$onChangeAnnotation);
+
+        this.$onCursorChange = this.onCursorChange.bind(this);
+        this.session.addEventListener("changeOverwrite", this.$onCursorChange);
+
+        this.$onScrollTopChange = this.onScrollTopChange.bind(this);
+        this.session.addEventListener("changeScrollTop", this.$onScrollTopChange);
+
+        this.$onScrollLeftChange = this.onScrollLeftChange.bind(this);
+        this.session.addEventListener("changeScrollLeft", this.$onScrollLeftChange);
+
+        this.selection = session.getSelection();
+        this.selection.addEventListener("changeCursor", this.$onCursorChange);
+
+        this.$onSelectionChange = this.onSelectionChange.bind(this);
+        this.selection.addEventListener("changeSelection", this.$onSelectionChange);
+
+        this.onChangeMode();
+
+        this.onCursorChange();
+        this.onScrollTopChange();
+        this.onScrollLeftChange();
+        this.onSelectionChange();
+        this.onChangeFrontMarker();
+        this.onChangeBackMarker();
+        this.onChangeBreakpoint();
+        this.onChangeAnnotation();
+        this.session.getUseWrapMode() && this.renderer.adjustWrapLimit();
+        this.renderer.updateFull();
+
+        this._emit("changeSession", {
+            session: session,
+            oldSession: oldSession
+        });
+    };
+
+    this.getSession = function() {
+        return this.session;
+    };
+
+    this.getSelection = function() {
+        return this.selection;
+    };
+
+    this.resize = function() {
+        this.renderer.onResize();
+    };
+
+    this.setTheme = function(theme) {
+        this.renderer.setTheme(theme);
+    };
+
+    this.getTheme = function() {
+        return this.renderer.getTheme();
+    };
+
+    this.setStyle = function(style) {
+        this.renderer.setStyle(style);
+    };
+
+    this.unsetStyle = function(style) {
+        this.renderer.unsetStyle(style);
+    };
+
+    this.setFontSize = function(size) {
+        this.container.style.fontSize = size;
+    };
+
+    this.$highlightBrackets = function() {
+        if (this.session.$bracketHighlight) {
+            this.session.removeMarker(this.session.$bracketHighlight);
+            this.session.$bracketHighlight = null;
+        }
+
+        if (this.$highlightPending) {
+            return;
+        }
+
+        // perform highlight async to not block the browser during navigation
+        var self = this;
+        this.$highlightPending = true;
+        setTimeout(function() {
+            self.$highlightPending = false;
+
+            var pos = self.session.findMatchingBracket(self.getCursorPosition());
+            if (pos) {
+                var range = new Range(pos.row, pos.column, pos.row, pos.column+1);
+                self.session.$bracketHighlight = self.session.addMarker(range, "ace_bracket", "text");
+            }
+        }, 10);
+    };
+
+    this.focus = function() {
+        // Safari needs the timeout
+        // iOS and Firefox need it called immediately
+        // to be on the save side we do both
+        var _self = this;
+        setTimeout(function() {
+            _self.textInput.focus();
+        });
+        this.textInput.focus();
+    };
+
+    this.isFocused = function() {
+        return this.textInput.isFocused();
+    };
+
+    this.blur = function() {
+        this.textInput.blur();
+    };
+
+    this.onFocus = function() {
+        this.renderer.showCursor();
+        this.renderer.visualizeFocus();
+        this._emit("focus");
+    };
+
+    this.onBlur = function() {
+        this.renderer.hideCursor();
+        this.renderer.visualizeBlur();
+        this._emit("blur");
+    };
+
+    this.onDocumentChange = function(e) {
+        var delta = e.data;
+        var range = delta.range;
+        var lastRow;
+
+        if (range.start.row == range.end.row && delta.action != "insertLines" && delta.action != "removeLines")
+            lastRow = range.end.row;
+        else
+            lastRow = Infinity;
+        this.renderer.updateLines(range.start.row, lastRow);
+
+        this._emit("change", e);
+
+        // update cursor because tab characters can influence the cursor position
+        this.onCursorChange();
+    };
+
+    this.onTokenizerUpdate = function(e) {
+        var rows = e.data;
+        this.renderer.updateLines(rows.first, rows.last);
+    };
+
+    this.onScrollTopChange = function() {
+        this.renderer.scrollToY(this.session.getScrollTop());
+    };
+
+    this.onScrollLeftChange = function() {
+        this.renderer.scrollToX(this.session.getScrollLeft());
+    };
+
+    this.onCursorChange = function() {
+        this.renderer.updateCursor();
+
+        if (!this.$blockScrolling) {
+            this.renderer.scrollCursorIntoView();
+        }
+
+        // move text input over the cursor
+        // this is required for iOS and IME
+        this.renderer.moveTextAreaToCursor(this.textInput.getElement());
+
+        this.$highlightBrackets();
+        this.$updateHighlightActiveLine();
+    };
+
+    this.$updateHighlightActiveLine = function() {
+        var session = this.getSession();
+
+        if (session.$highlightLineMarker) {
+            session.removeMarker(session.$highlightLineMarker);
+        }
+        session.$highlightLineMarker = null;
+
+        if (this.getHighlightActiveLine() && (this.getSelectionStyle() != "line" || !this.selection.isMultiLine())) {
+            var cursor = this.getCursorPosition(),
+                foldLine = this.session.getFoldLine(cursor.row);
+            var range;
+            if (foldLine) {
+                range = new Range(foldLine.start.row, 0, foldLine.end.row + 1, 0);
+            } else {
+                range = new Range(cursor.row, 0, cursor.row+1, 0);
+            }
+            session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background");
+        }
+    };
+
+    this.onSelectionChange = function(e) {
+        var session = this.getSession();
+
+        if (session.$selectionMarker) {
+            session.removeMarker(session.$selectionMarker);
+        }
+        session.$selectionMarker = null;
+
+        if (!this.selection.isEmpty()) {
+            var range = this.selection.getRange();
+            var style = this.getSelectionStyle();
+            session.$selectionMarker = session.addMarker(range, "ace_selection", style);
+        } else {
+            this.$updateHighlightActiveLine();
+        }
+
+        if (this.$highlightSelectedWord)
+            this.session.getMode().highlightSelection(this);
+    };
+
+    this.onChangeFrontMarker = function() {
+        this.renderer.updateFrontMarkers();
+    };
+
+    this.onChangeBackMarker = function() {
+        this.renderer.updateBackMarkers();
+    };
+
+    this.onChangeBreakpoint = function() {
+        this.renderer.setBreakpoints(this.session.getBreakpoints());
+    };
+
+    this.onChangeAnnotation = function() {
+        this.renderer.setAnnotations(this.session.getAnnotations());
+    };
+
+    this.onChangeMode = function() {
+        this.renderer.updateText();
+    };
+
+    this.onChangeWrapLimit = function() {
+        this.renderer.updateFull();
+    };
+
+    this.onChangeWrapMode = function() {
+        this.renderer.onResize(true);
+    };
+
+    this.onChangeFold = function() {
+        // Update the active line marker as due to folding changes the current
+        // line range on the screen might have changed.
+        this.$updateHighlightActiveLine();
+        // TODO: This might be too much updating. Okay for now.
+        this.renderer.updateFull();
+    };
+
+    this.getCopyText = function() {
+        var text = "";
+        if (!this.selection.isEmpty())
+            text = this.session.getTextRange(this.getSelectionRange());
+
+        this._emit("copy", text);
+        return text;
+    };
+
+    this.onCut = function() {
+        if (this.$readOnly)
+            return;
+
+        var range = this.getSelectionRange();
+        this._emit("cut", range);
+
+        if (!this.selection.isEmpty()) {
+            this.session.remove(range);
+            this.clearSelection();
+        }
+    };
+
+    this.insert = function(text) {
+        var session = this.session;
+        var mode = session.getMode();
+
+        var cursor = this.getCursorPosition();
+
+        if (this.getBehavioursEnabled()) {
+            // Get a transform if the current mode wants one.
+            var transform = mode.transformAction(session.getState(cursor.row), 'insertion', this, session, text);
+            if (transform)
+                text = transform.text;
+        }
+
+        text = text.replace("\t", this.session.getTabString());
+
+        // remove selected text
+        if (!this.selection.isEmpty()) {
+            cursor = this.session.remove(this.getSelectionRange());
+            this.clearSelection();
+        }
+        else if (this.session.getOverwrite()) {
+            var range = new Range.fromPoints(cursor, cursor);
+            range.end.column += text.length;
+            this.session.remove(range);
+        }
+
+        this.clearSelection();
+
+        var start = cursor.column;
+        var lineState = session.getState(cursor.row);
+        var shouldOutdent = mode.checkOutdent(lineState, session.getLine(cursor.row), text);
+        var line = session.getLine(cursor.row);
+        var lineIndent = mode.getNextLineIndent(lineState, line.slice(0, cursor.column), session.getTabString());
+        var end = session.insert(cursor, text);
+
+        if (transform && transform.selection) {
+            if (transform.selection.length == 2) { // Transform relative to the current column
+                this.selection.setSelectionRange(
+                    new Range(cursor.row, start + transform.selection[0],
+                              cursor.row, start + transform.selection[1]));
+            } else { // Transform relative to the current row.
+                this.selection.setSelectionRange(
+                    new Range(cursor.row + transform.selection[0],
+                              transform.selection[1],
+                              cursor.row + transform.selection[2],
+                              transform.selection[3]));
+            }
+        }
+
+        var lineState = session.getState(cursor.row);
+
+        // TODO disabled multiline auto indent
+        // possibly doing the indent before inserting the text
+        // if (cursor.row !== end.row) {
+        if (session.getDocument().isNewLine(text)) {
+            this.moveCursorTo(cursor.row+1, 0);
+
+            var size = session.getTabSize();
+            var minIndent = Number.MAX_VALUE;
+
+            for (var row = cursor.row + 1; row <= end.row; ++row) {
+                var indent = 0;
+
+                line = session.getLine(row);
+                for (var i = 0; i < line.length; ++i)
+                    if (line.charAt(i) == '\t')
+                        indent += size;
+                    else if (line.charAt(i) == ' ')
+                        indent += 1;
+                    else
+                        break;
+                if (/[^\s]/.test(line))
+                    minIndent = Math.min(indent, minIndent);
+            }
+
+            for (var row = cursor.row + 1; row <= end.row; ++row) {
+                var outdent = minIndent;
+
+                line = session.getLine(row);
+                for (var i = 0; i < line.length && outdent > 0; ++i)
+                    if (line.charAt(i) == '\t')
+                        outdent -= size;
+                    else if (line.charAt(i) == ' ')
+                        outdent -= 1;
+                session.remove(new Range(row, 0, row, i));
+            }
+            session.indentRows(cursor.row + 1, end.row, lineIndent);
+        }
+        if (shouldOutdent)
+            mode.autoOutdent(lineState, session, cursor.row);
+    };
+
+    this.onTextInput = function(text, pasted) {
+        if (pasted)
+            this._emit("paste", text);
+
+        this.keyBinding.onTextInput(text, pasted);
+    };
+
+    this.onCommandKey = function(e, hashId, keyCode) {
+        this.keyBinding.onCommandKey(e, hashId, keyCode);
+    };
+
+    this.setOverwrite = function(overwrite) {
+        this.session.setOverwrite(overwrite);
+    };
+
+    this.getOverwrite = function() {
+        return this.session.getOverwrite();
+    };
+
+    this.toggleOverwrite = function() {
+        this.session.toggleOverwrite();
+    };
+
+    this.setScrollSpeed = function(speed) {
+        this.$mouseHandler.setScrollSpeed(speed);
+    };
+
+    this.getScrollSpeed = function() {
+        return this.$mouseHandler.getScrollSpeed();
+    };
+
+    this.setDragDelay = function(dragDelay) {
+        this.$mouseHandler.setDragDelay(dragDelay);
+    };
+
+    this.getDragDelay = function() {
+        return this.$mouseHandler.getDragDelay();
+    };
+
+    this.$selectionStyle = "line";
+    this.setSelectionStyle = function(style) {
+        if (this.$selectionStyle == style) return;
+
+        this.$selectionStyle = style;
+        this.onSelectionChange();
+        this._emit("changeSelectionStyle", {data: style});
+    };
+
+    this.getSelectionStyle = function() {
+        return this.$selectionStyle;
+    };
+
+    this.$highlightActiveLine = true;
+    this.setHighlightActiveLine = function(shouldHighlight) {
+        if (this.$highlightActiveLine == shouldHighlight) return;
+
+        this.$highlightActiveLine = shouldHighlight;
+        this.$updateHighlightActiveLine();
+    };
+
+    this.getHighlightActiveLine = function() {
+        return this.$highlightActiveLine;
+    };
+
+    this.$highlightSelectedWord = true;
+    this.setHighlightSelectedWord = function(shouldHighlight) {
+        if (this.$highlightSelectedWord == shouldHighlight)
+            return;
+
+        this.$highlightSelectedWord = shouldHighlight;
+        if (shouldHighlight)
+            this.session.getMode().highlightSelection(this);
+        else
+            this.session.getMode().clearSelectionHighlight(this);
+    };
+
+    this.getHighlightSelectedWord = function() {
+        return this.$highlightSelectedWord;
+    };
+
+    this.setShowInvisibles = function(showInvisibles) {
+        if (this.getShowInvisibles() == showInvisibles)
+            return;
+
+        this.renderer.setShowInvisibles(showInvisibles);
+    };
+
+    this.getShowInvisibles = function() {
+        return this.renderer.getShowInvisibles();
+    };
+
+    this.setShowPrintMargin = function(showPrintMargin) {
+        this.renderer.setShowPrintMargin(showPrintMargin);
+    };
+
+    this.getShowPrintMargin = function() {
+        return this.renderer.getShowPrintMargin();
+    };
+
+    this.setPrintMarginColumn = function(showPrintMargin) {
+        this.renderer.setPrintMarginColumn(showPrintMargin);
+    };
+
+    this.getPrintMarginColumn = function() {
+        return this.renderer.getPrintMarginColumn();
+    };
+
+    this.$readOnly = false;
+    this.setReadOnly = function(readOnly) {
+        this.$readOnly = readOnly;
+    };
+
+    this.getReadOnly = function() {
+        return this.$readOnly;
+    };
+
+    this.$modeBehaviours = true;
+    this.setBehavioursEnabled = function (enabled) {
+        this.$modeBehaviours = enabled;
+    };
+
+    this.getBehavioursEnabled = function () {
+        return this.$modeBehaviours;
+    };
+
+    this.setShowFoldWidgets = function(show) {
+        var gutter = this.renderer.$gutterLayer;
+        if (gutter.getShowFoldWidgets() == show)
+            return;
+
+        this.renderer.$gutterLayer.setShowFoldWidgets(show);
+        this.$showFoldWidgets = show;
+        this.renderer.updateFull();
+    };
+    
+    this.getShowFoldWidgets = function() {
+        return this.renderer.$gutterLayer.getShowFoldWidgets();
+    };
+
+    this.remove = function(dir) {
+        if (this.selection.isEmpty()){
+            if(dir == "left")
+                this.selection.selectLeft();
+            else
+                this.selection.selectRight();
+        }
+
+        var range = this.getSelectionRange();
+        if (this.getBehavioursEnabled()) {
+            var session = this.session;
+            var state = session.getState(range.start.row);
+            var new_range = session.getMode().transformAction(state, 'deletion', this, session, range);
+            if (new_range)
+                range = new_range;
+        }
+
+        this.session.remove(range);
+        this.clearSelection();
+    };
+
+    this.removeWordRight = function() {
+        if (this.selection.isEmpty())
+            this.selection.selectWordRight();
+
+        this.session.remove(this.getSelectionRange());
+        this.clearSelection();
+    };
+
+    this.removeWordLeft = function() {
+        if (this.selection.isEmpty())
+            this.selection.selectWordLeft();
+
+        this.session.remove(this.getSelectionRange());
+        this.clearSelection();
+    };
+
+    this.removeToLineStart = function() {
+        if (this.selection.isEmpty())
+            this.selection.selectLineStart();
+
+        this.session.remove(this.getSelectionRange());
+        this.clearSelection();
+    };
+
+    this.removeToLineEnd = function() {
+        if (this.selection.isEmpty())
+            this.selection.selectLineEnd();
+
+        var range = this.getSelectionRange();
+        if (range.start.column == range.end.column && range.start.row == range.end.row) {
+            range.end.column = 0;
+            range.end.row++;
+        }
+
+        this.session.remove(range);
+        this.clearSelection();
+    };
+
+    this.splitLine = function() {
+        if (!this.selection.isEmpty()) {
+            this.session.remove(this.getSelectionRange());
+            this.clearSelection();
+        }
+
+        var cursor = this.getCursorPosition();
+        this.insert("\n");
+        this.moveCursorToPosition(cursor);
+    };
+
+    this.transposeLetters = function() {
+        if (!this.selection.isEmpty()) {
+            return;
+        }
+
+        var cursor = this.getCursorPosition();
+        var column = cursor.column;
+        if (column === 0)
+            return;
+
+        var line = this.session.getLine(cursor.row);
+        var swap, range;
+        if (column < line.length) {
+            swap = line.charAt(column) + line.charAt(column-1);
+            range = new Range(cursor.row, column-1, cursor.row, column+1);
+        }
+        else {
+            swap = line.charAt(column-1) + line.charAt(column-2);
+            range = new Range(cursor.row, column-2, cursor.row, column);
+        }
+        this.session.replace(range, swap);
+    };
+
+    this.toLowerCase = function() {
+        var originalRange = this.getSelectionRange();
+        if (this.selection.isEmpty()) {
+            this.selection.selectWord();
+        }
+
+        var range = this.getSelectionRange();
+        var text = this.session.getTextRange(range);
+        this.session.replace(range, text.toLowerCase());
+        this.selection.setSelectionRange(originalRange);
+    };
+
+    this.toUpperCase = function() {
+        var originalRange = this.getSelectionRange();
+        if (this.selection.isEmpty()) {
+            this.selection.selectWord();
+        }
+
+        var range = this.getSelectionRange();
+        var text = this.session.getTextRange(range);
+        this.session.replace(range, text.toUpperCase());
+        this.selection.setSelectionRange(originalRange);
+    };
+
+    this.indent = function() {
+        var session = this.session;
+        var range = this.getSelectionRange();
+
+        if (range.start.row < range.end.row || range.start.column < range.end.column) {
+            var rows = this.$getSelectedRows();
+            session.indentRows(rows.first, rows.last, "\t");
+        } else {
+            var indentString;
+
+            if (this.session.getUseSoftTabs()) {
+                var size        = session.getTabSize(),
+                    position    = this.getCursorPosition(),
+                    column      = session.documentToScreenColumn(position.row, position.column),
+                    count       = (size - column % size);
+
+                indentString = lang.stringRepeat(" ", count);
+            } else
+                indentString = "\t";
+            return this.insert(indentString);
+        }
+    };
+
+    this.blockOutdent = function() {
+        var selection = this.session.getSelection();
+        this.session.outdentRows(selection.getRange());
+    };
+
+    this.toggleCommentLines = function() {
+        var state = this.session.getState(this.getCursorPosition().row);
+        var rows = this.$getSelectedRows();
+        this.session.getMode().toggleCommentLines(state, this.session, rows.first, rows.last);
+    };
+
+    this.removeLines = function() {
+        var rows = this.$getSelectedRows();
+        var range;
+        if (rows.first === 0 || rows.last+1 < this.session.getLength())
+            range = new Range(rows.first, 0, rows.last+1, 0);
+        else
+            range = new Range(
+                rows.first-1, this.session.getLine(rows.first-1).length,
+                rows.last, this.session.getLine(rows.last).length
+            );
+        this.session.remove(range);
+        this.clearSelection();
+    };
+
+    this.moveLinesDown = function() {
+        this.$moveLines(function(firstRow, lastRow) {
+            return this.session.moveLinesDown(firstRow, lastRow);
+        });
+    };
+
+    this.moveLinesUp = function() {
+        this.$moveLines(function(firstRow, lastRow) {
+            return this.session.moveLinesUp(firstRow, lastRow);
+        });
+    };
+
+    this.moveText = function(range, toPosition) {
+        if (this.$readOnly)
+            return null;
+
+        return this.session.moveText(range, toPosition);
+    };
+
+    this.copyLinesUp = function() {
+        this.$moveLines(function(firstRow, lastRow) {
+            this.session.duplicateLines(firstRow, lastRow);
+            return 0;
+        });
+    };
+
+    this.copyLinesDown = function() {
+        this.$moveLines(function(firstRow, lastRow) {
+            return this.session.duplicateLines(firstRow, lastRow);
+        });
+    };
+
+
+    this.$moveLines = function(mover) {
+        var rows = this.$getSelectedRows();
+        var selection = this.selection;
+        if (!selection.isMultiLine()) {
+            var range = selection.getRange();
+            var reverse = selection.isBackwards();
+        }
+
+        var linesMoved = mover.call(this, rows.first, rows.last);
+
+        if (range) {
+            range.start.row += linesMoved;
+            range.end.row += linesMoved;
+            selection.setSelectionRange(range, reverse);
+        } 
+        else {
+            selection.setSelectionAnchor(rows.last+linesMoved+1, 0);
+            selection.$moveSelection(function() {
+                selection.moveCursorTo(rows.first+linesMoved, 0);
+            });
+        }
+    };
+
+    this.$getSelectedRows = function() {
+        var range = this.getSelectionRange().collapseRows();
+
+        return {
+            first: range.start.row,
+            last: range.end.row
+        };
+    };
+
+    this.onCompositionStart = function(text) {
+        this.renderer.showComposition(this.getCursorPosition());
+    };
+
+    this.onCompositionUpdate = function(text) {
+        this.renderer.setCompositionText(text);
+    };
+
+    this.onCompositionEnd = function() {
+        this.renderer.hideComposition();
+    };
+
+    this.getFirstVisibleRow = function() {
+        return this.renderer.getFirstVisibleRow();
+    };
+
+    this.getLastVisibleRow = function() {
+        return this.renderer.getLastVisibleRow();
+    };
+
+    this.isRowVisible = function(row) {
+        return (row >= this.getFirstVisibleRow() && row <= this.getLastVisibleRow());
+    };
+
+    this.isRowFullyVisible = function(row) {
+        return (row >= this.renderer.getFirstFullyVisibleRow() && row <= this.renderer.getLastFullyVisibleRow());
+    };
+
+    this.$getVisibleRowCount = function() {
+        return this.renderer.getScrollBottomRow() - this.renderer.getScrollTopRow() + 1;
+    };
+
+    this.$getPageDownRow = function() {
+        return this.renderer.getScrollBottomRow();
+    };
+
+    this.$getPageUpRow = function() {
+        var firstRow = this.renderer.getScrollTopRow();
+        var lastRow = this.renderer.getScrollBottomRow();
+
+        return firstRow - (lastRow - firstRow);
+    };
+
+    this.selectPageDown = function() {
+        var row = this.$getPageDownRow() + Math.floor(this.$getVisibleRowCount() / 2);
+
+        this.scrollPageDown();
+
+        var selection = this.getSelection();
+        var leadScreenPos = this.session.documentToScreenPosition(selection.getSelectionLead());
+        var dest = this.session.screenToDocumentPosition(row, leadScreenPos.column);
+        selection.selectTo(dest.row, dest.column);
+    };
+
+    this.selectPageUp = function() {
+        var visibleRows = this.renderer.getScrollTopRow() - this.renderer.getScrollBottomRow();
+        var row = this.$getPageUpRow() + Math.round(visibleRows / 2);
+
+        this.scrollPageUp();
+
+        var selection = this.getSelection();
+        var leadScreenPos = this.session.documentToScreenPosition(selection.getSelectionLead());
+        var dest = this.session.screenToDocumentPosition(row, leadScreenPos.column);
+        selection.selectTo(dest.row, dest.column);
+    };
+
+    this.gotoPageDown = function() {
+        var row = this.$getPageDownRow();
+        var column = this.getCursorPositionScreen().column;
+
+        this.scrollToRow(row);
+        this.getSelection().moveCursorToScreen(row, column);
+    };
+
+    this.gotoPageUp = function() {
+        var row = this.$getPageUpRow();
+        var column = this.getCursorPositionScreen().column;
+
+       this.scrollToRow(row);
+       this.getSelection().moveCursorToScreen(row, column);
+    };
+
+    this.scrollPageDown = function() {
+        this.scrollToRow(this.$getPageDownRow());
+    };
+
+    this.scrollPageUp = function() {
+        this.renderer.scrollToRow(this.$getPageUpRow());
+    };
+
+    this.scrollToRow = function(row) {
+        this.renderer.scrollToRow(row);
+    };
+
+    this.scrollToLine = function(line, center) {
+        this.renderer.scrollToLine(line, center);
+    };
+
+    this.centerSelection = function() {
+        var range = this.getSelectionRange();
+        var line = Math.floor(range.start.row + (range.end.row - range.start.row) / 2);
+        this.renderer.scrollToLine(line, true);
+    };
+
+    this.getCursorPosition = function() {
+        return this.selection.getCursor();
+    };
+
+    this.getCursorPositionScreen = function() {
+        return this.session.documentToScreenPosition(this.getCursorPosition());
+    };
+
+    this.getSelectionRange = function() {
+        return this.selection.getRange();
+    };
+
+
+    this.selectAll = function() {
+        this.$blockScrolling += 1;
+        this.selection.selectAll();
+        this.$blockScrolling -= 1;
+    };
+
+    this.clearSelection = function() {
+        this.selection.clearSelection();
+    };
+
+    this.moveCursorTo = function(row, column) {
+        this.selection.moveCursorTo(row, column);
+    };
+
+    this.moveCursorToPosition = function(pos) {
+        this.selection.moveCursorToPosition(pos);
+    };
+
+    this.jumpToMatching = function() {
+        var cursor = this.getCursorPosition();
+        var pos = this.session.findMatchingBracket(cursor);
+        if (!pos) {
+            cursor.column += 1;
+            pos = this.session.findMatchingBracket(cursor);
+        }
+        if (!pos) {
+            cursor.column -= 2;
+            pos = this.session.findMatchingBracket(cursor);
+        }
+        
+        if (pos) {
+            this.clearSelection();
+            this.moveCursorTo(pos.row, pos.column);
+        }
+    };
+    
+    this.gotoLine = function(lineNumber, column) {
+        this.selection.clearSelection();
+        this.session.unfold({row: lineNumber - 1, column: column || 0});
+
+        this.$blockScrolling += 1;
+        this.moveCursorTo(lineNumber-1, column || 0);
+        this.$blockScrolling -= 1;
+        if (!this.isRowFullyVisible(this.getCursorPosition().row))
+            this.scrollToLine(lineNumber, true);
+    };
+
+    this.navigateTo = function(row, column) {
+        this.clearSelection();
+        this.moveCursorTo(row, column);
+    };
+
+    this.navigateUp = function(times) {
+        this.selection.clearSelection();
+        times = times || 1;
+        this.selection.moveCursorBy(-times, 0);
+    };
+
+    this.navigateDown = function(times) {
+        this.selection.clearSelection();
+        times = times || 1;
+        this.selection.moveCursorBy(times, 0);
+    };
+
+    this.navigateLeft = function(times) {
+        if (!this.selection.isEmpty()) {
+            var selectionStart = this.getSelectionRange().start;
+            this.moveCursorToPosition(selectionStart);
+        }
+        else {
+            times = times || 1;
+            while (times--) {
+                this.selection.moveCursorLeft();
+            }
+        }
+        this.clearSelection();
+    };
+
+    this.navigateRight = function(times) {
+        if (!this.selection.isEmpty()) {
+            var selectionEnd = this.getSelectionRange().end;
+            this.moveCursorToPosition(selectionEnd);
+        }
+        else {
+            times = times || 1;
+            while (times--) {
+                this.selection.moveCursorRight();
+            }
+        }
+        this.clearSelection();
+    };
+
+    this.navigateLineStart = function() {
+        this.selection.moveCursorLineStart();
+        this.clearSelection();
+    };
+
+    this.navigateLineEnd = function() {
+        this.selection.moveCursorLineEnd();
+        this.clearSelection();
+    };
+
+    this.navigateFileEnd = function() {
+        this.selection.moveCursorFileEnd();
+        this.clearSelection();
+    };
+
+    this.navigateFileStart = function() {
+        this.selection.moveCursorFileStart();
+        this.clearSelection();
+    };
+
+    this.navigateWordRight = function() {
+        this.selection.moveCursorWordRight();
+        this.clearSelection();
+    };
+
+    this.navigateWordLeft = function() {
+        this.selection.moveCursorWordLeft();
+        this.clearSelection();
+    };
+
+    this.replace = function(replacement, options) {
+        if (options)
+            this.$search.set(options);
+
+        var range = this.$search.find(this.session);
+        if (!range)
+            return;
+
+        this.$tryReplace(range, replacement);
+        if (range !== null)
+            this.selection.setSelectionRange(range);
+    };
+
+    this.replaceAll = function(replacement, options) {
+        if (options) {
+            this.$search.set(options);
+        }
+
+        var ranges = this.$search.findAll(this.session);
+        if (!ranges.length)
+            return;
+
+        var selection = this.getSelectionRange();
+        this.clearSelection();
+        this.selection.moveCursorTo(0, 0);
+
+        this.$blockScrolling += 1;
+        for (var i = ranges.length - 1; i >= 0; --i)
+            this.$tryReplace(ranges[i], replacement);
+
+        this.selection.setSelectionRange(selection);
+        this.$blockScrolling -= 1;
+    };
+
+    this.$tryReplace = function(range, replacement) {
+        var input = this.session.getTextRange(range);
+        replacement = this.$search.replace(input, replacement);
+        if (replacement !== null) {
+            range.end = this.session.replace(range, replacement);
+            return range;
+        } else {
+            return null;
+        }
+    };
+
+    this.getLastSearchOptions = function() {
+        return this.$search.getOptions();
+    };
+
+    this.find = function(needle, options) {
+        this.clearSelection();
+        options = options || {};
+        options.needle = needle;
+        this.$search.set(options);
+        this.$find();
+    };
+
+    this.findNext = function(options) {
+        options = options || {};
+        if (typeof options.backwards == "undefined")
+            options.backwards = false;
+        this.$search.set(options);
+        this.$find();
+    };
+
+    this.findPrevious = function(options) {
+        options = options || {};
+        if (typeof options.backwards == "undefined")
+            options.backwards = true;
+        this.$search.set(options);
+        this.$find();
+    };
+
+    this.$find = function(backwards) {
+        if (!this.selection.isEmpty())
+            this.$search.set({needle: this.session.getTextRange(this.getSelectionRange())});
+
+        if (typeof backwards != "undefined")
+            this.$search.set({backwards: backwards});
+
+        var range = this.$search.find(this.session);
+        if (range) {
+            this.session.unfold(range);
+            this.gotoLine(range.end.row+1, range.end.column);
+            this.selection.setSelectionRange(range);
+        }
+    };
+
+    this.undo = function() {
+        this.session.getUndoManager().undo();
+    };
+
+    this.redo = function() {
+        this.session.getUndoManager().redo();
+    };
+
+    this.destroy = function() {
+        this.renderer.destroy();
+    };
+
+}).call(Editor.prototype);
+
+
+exports.Editor = Editor;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/lib/lang', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+exports.stringReverse = function(string) {
+    return string.split("").reverse().join("");
+};
+
+exports.stringRepeat = function (string, count) {
+     return new Array(count + 1).join(string);
+};
+
+var trimBeginRegexp = /^\s\s*/;
+var trimEndRegexp = /\s\s*$/;
+
+exports.stringTrimLeft = function (string) {
+    return string.replace(trimBeginRegexp, '');
+};
+
+exports.stringTrimRight = function (string) {
+    return string.replace(trimEndRegexp, '');
+};
+
+exports.copyObject = function(obj) {
+    var copy = {};
+    for (var key in obj) {
+        copy[key] = obj[key];
+    }
+    return copy;
+};
+
+exports.copyArray = function(array){
+    var copy = [];
+    for (var i=0, l=array.length; i<l; i++) {
+        if (array[i] && typeof array[i] == "object")
+            copy[i] = this.copyObject( array[i] );
+        else 
+            copy[i] = array[i];
+    }
+    return copy;
+};
+
+exports.deepCopy = function (obj) {
+    if (typeof obj != "object") {
+        return obj;
+    }
+    
+    var copy = obj.constructor();
+    for (var key in obj) {
+        if (typeof obj[key] == "object") {
+            copy[key] = this.deepCopy(obj[key]);
+        } else {
+            copy[key] = obj[key];
+        }
+    }
+    return copy;
+};
+
+exports.arrayToMap = function(arr) {
+    var map = {};
+    for (var i=0; i<arr.length; i++) {
+        map[arr[i]] = 1;
+    }
+    return map;
+
+};
+
+/**
+ * splice out of 'array' anything that === 'value'
+ */
+exports.arrayRemove = function(array, value) {
+  for (var i = 0; i <= array.length; i++) {
+    if (value === array[i]) {
+      array.splice(i, 1);
+    }
+  }
+};
+
+exports.escapeRegExp = function(str) {
+    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
+};
+
+exports.deferredCall = function(fcn) {
+
+    var timer = null;
+    var callback = function() {
+        timer = null;
+        fcn();
+    };
+
+    var deferred = function(timeout) {
+        deferred.cancel();
+        timer = setTimeout(callback, timeout || 0);
+        return deferred;
+    };
+
+    deferred.schedule = deferred;
+
+    deferred.call = function() {
+        this.cancel();
+        fcn();
+        return deferred;
+    };
+
+    deferred.cancel = function() {
+        clearTimeout(timer);
+        timer = null;
+        return deferred;
+    };
+
+    return deferred;
+};
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/keyboard/textinput', ['require', 'exports', 'module' , 'ace/lib/event', 'ace/lib/useragent', 'ace/lib/dom'], function(require, exports, module) {
+"use strict";
+
+var event = require("../lib/event");
+var useragent = require("../lib/useragent");
+var dom = require("../lib/dom");
+
+var TextInput = function(parentNode, host) {
+
+    var text = dom.createElement("textarea");
+    if (useragent.isTouchPad)
+        text.setAttribute("x-palm-disable-auto-cap", true);
+        
+    text.style.left = "-10000px";
+    text.style.position = "fixed";
+    parentNode.insertBefore(text, parentNode.firstChild);
+
+    var PLACEHOLDER = String.fromCharCode(0);
+    sendText();
+
+    var inCompostion = false;
+    var copied = false;
+    var pasted = false;
+    var tempStyle = '';
+
+    function select() {
+        try {
+            text.select();
+        } catch (e) {}
+    }
+
+    function sendText(valueToSend) {
+        if (!copied) {
+            var value = valueToSend || text.value;
+            if (value) {
+                if (value.charCodeAt(value.length-1) == PLACEHOLDER.charCodeAt(0)) {
+                    value = value.slice(0, -1);
+                    if (value)
+                        host.onTextInput(value, pasted);
+                }
+                else {
+                    host.onTextInput(value, pasted);
+                }
+
+                // If editor is no longer focused we quit immediately, since
+                // it means that something else is in charge now.
+                if (!isFocused())
+                    return false;
+            }
+        }
+
+        copied = false;
+        pasted = false;
+
+        // Safari doesn't fire copy events if no text is selected
+        text.value = PLACEHOLDER;
+        select();
+    }
+
+    var onTextInput = function(e) {
+        setTimeout(function () {
+            if (!inCompostion)
+                sendText(e.data);                
+        }, 0);
+    };
+    
+    var onPropertyChange = function(e) {
+        if (useragent.isOldIE && text.value.charCodeAt(0) > 128) return;
+        setTimeout(function() {
+            if (!inCompostion)
+                sendText();
+        }, 0);
+    };
+
+    var onCompositionStart = function(e) {
+        inCompostion = true;
+        host.onCompositionStart();
+        if (!useragent.isGecko) setTimeout(onCompositionUpdate, 0);
+    };
+
+    var onCompositionUpdate = function() {
+        if (!inCompostion) return;
+        host.onCompositionUpdate(text.value);
+    };
+
+    var onCompositionEnd = function(e) {
+        inCompostion = false;
+        host.onCompositionEnd();
+    };
+
+    var onCopy = function(e) {
+        copied = true;
+        var copyText = host.getCopyText();
+        if(copyText)
+            text.value = copyText;
+        else
+            e.preventDefault();
+        select();
+        setTimeout(function () {
+            sendText();
+        }, 0);
+    };
+    
+    var onCut = function(e) {
+        copied = true;
+        var copyText = host.getCopyText();
+        if(copyText) {
+            text.value = copyText;
+            host.onCut();
+        } else
+            e.preventDefault();
+        select();
+        setTimeout(function () {
+            sendText();
+        }, 0);
+    };
+
+    event.addCommandKeyListener(text, host.onCommandKey.bind(host));
+    if (useragent.isOldIE) {
+        var keytable = { 13:1, 27:1 };
+        event.addListener(text, "keyup", function (e) {
+            if (inCompostion && (!text.value || keytable[e.keyCode]))
+                setTimeout(onCompositionEnd, 0);
+            if ((text.value.charCodeAt(0)|0) < 129) {
+                return;
+            }
+            inCompostion ? onCompositionUpdate() : onCompositionStart();
+        });
+    }
+    
+    if ("onpropertychange" in text && !("oninput" in text))
+        event.addListener(text, "propertychange", onPropertyChange);
+    else
+        event.addListener(text, "input", onTextInput);
+    
+    event.addListener(text, "paste", function(e) {
+        // Mark that the next input text comes from past.
+        pasted = true;
+        // Some browsers support the event.clipboardData API. Use this to get
+        // the pasted content which increases speed if pasting a lot of lines.
+        if (e.clipboardData && e.clipboardData.getData) {
+            sendText(e.clipboardData.getData("text/plain"));
+            e.preventDefault();
+        } 
+        else {
+            // If a browser doesn't support any of the things above, use the regular
+            // method to detect the pasted input.
+            onPropertyChange();
+        }
+    });
+
+    if ("onbeforecopy" in text && typeof clipboardData !== "undefined") {
+        event.addListener(text, "beforecopy", function(e) {
+            var copyText = host.getCopyText();
+            if (copyText)
+                clipboardData.setData("Text", copyText);
+            else
+                e.preventDefault();
+        });
+        event.addListener(parentNode, "keydown", function(e) {
+            if (e.ctrlKey && e.keyCode == 88) {
+                var copyText = host.getCopyText();
+                if (copyText) {
+                    clipboardData.setData("Text", copyText);
+                    host.onCut();
+                }
+                event.preventDefault(e);
+            }
+        });
+    }
+    else {
+        event.addListener(text, "copy", onCopy);
+        event.addListener(text, "cut", onCut);
+    }
+
+    event.addListener(text, "compositionstart", onCompositionStart);
+    if (useragent.isGecko) {
+        event.addListener(text, "text", onCompositionUpdate);
+    }
+    if (useragent.isWebKit) {
+        event.addListener(text, "keyup", onCompositionUpdate);
+    }
+    event.addListener(text, "compositionend", onCompositionEnd);
+
+    event.addListener(text, "blur", function() {
+        host.onBlur();
+    });
+
+    event.addListener(text, "focus", function() {
+        host.onFocus();
+        select();
+    });
+
+    this.focus = function() {
+        host.onFocus();
+        select();
+        text.focus();
+    };
+
+    this.blur = function() {
+        text.blur();
+    };
+
+    function isFocused() {
+        return document.activeElement === text;
+    }
+    this.isFocused = isFocused;
+
+    this.getElement = function() {
+        return text;
+    };
+
+    this.onContextMenu = function(mousePos, isEmpty){
+        if (mousePos) {
+            if (!tempStyle)
+                tempStyle = text.style.cssText;
+                
+            text.style.cssText = 
+                'position:fixed; z-index:1000;' +
+                'left:' + (mousePos.x - 2) + 'px; top:' + (mousePos.y - 2) + 'px;';
+
+        }
+        if (isEmpty)
+            text.value='';
+    };
+
+    this.onContextMenuClose = function(){
+        setTimeout(function () {
+            if (tempStyle) {
+                text.style.cssText = tempStyle;
+                tempStyle = '';
+            }
+            sendText();
+        }, 0);
+    };
+};
+
+exports.TextInput = TextInput;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mouse/mouse_handler', ['require', 'exports', 'module' , 'ace/lib/event', 'ace/mouse/default_handlers', 'ace/mouse/default_gutter_handler', 'ace/mouse/mouse_event'], function(require, exports, module) {
+"use strict";
+
+var event = require("../lib/event");
+var DefaultHandlers = require("./default_handlers").DefaultHandlers;
+var DefaultGutterHandler = require("./default_gutter_handler").GutterHandler;
+var MouseEvent = require("./mouse_event").MouseEvent;
+
+var MouseHandler = function(editor) {
+    this.editor = editor;
+    
+    new DefaultHandlers(editor);
+    new DefaultGutterHandler(editor);
+    
+    event.addListener(editor.container, "mousedown", function(e) {
+        editor.focus();
+        return event.preventDefault(e);
+    });
+    event.addListener(editor.container, "selectstart", function(e) {
+        return event.preventDefault(e);
+    });
+
+    var mouseTarget = editor.renderer.getMouseEventTarget();
+    event.addListener(mouseTarget, "mousedown", this.onMouseEvent.bind(this, "mousedown"));
+    event.addListener(mouseTarget, "click", this.onMouseEvent.bind(this, "click"));
+    event.addListener(mouseTarget, "mousemove", this.onMouseMove.bind(this, "mousemove"));
+    event.addMultiMouseDownListener(mouseTarget, 0, 2, 500, this.onMouseEvent.bind(this, "dblclick"));
+    event.addMultiMouseDownListener(mouseTarget, 0, 3, 600, this.onMouseEvent.bind(this, "tripleclick"));
+    event.addMultiMouseDownListener(mouseTarget, 0, 4, 600, this.onMouseEvent.bind(this, "quadclick"));
+    event.addMouseWheelListener(editor.container, this.onMouseWheel.bind(this, "mousewheel"));
+    
+    var gutterEl = editor.renderer.$gutter;
+    event.addListener(gutterEl, "mousedown", this.onMouseEvent.bind(this, "guttermousedown"));
+    event.addListener(gutterEl, "click", this.onMouseEvent.bind(this, "gutterclick"));
+    event.addListener(gutterEl, "dblclick", this.onMouseEvent.bind(this, "gutterdblclick"));
+    event.addListener(gutterEl, "mousemove", this.onMouseMove.bind(this, "gutter"));
+};
+
+(function() {
+
+    this.$scrollSpeed = 1;
+    this.setScrollSpeed = function(speed) {
+        this.$scrollSpeed = speed;
+    };
+
+    this.getScrollSpeed = function() {
+        return this.$scrollSpeed;
+    };
+
+    this.onMouseEvent = function(name, e) {
+        this.editor._emit(name, new MouseEvent(e, this.editor));
+    };
+    
+    this.$dragDelay = 250;
+    this.setDragDelay = function(dragDelay) {
+        this.$dragDelay = dragDelay;
+    };
+
+    this.getDragDelay = function() {
+        return this.$dragDelay;
+    };
+
+    this.onMouseMove = function(name, e) {
+        // optimization, because mousemove doesn't have a default handler.
+        var listeners = this.editor._eventRegistry && this.editor._eventRegistry.mousemove;
+        if (!listeners || !listeners.length)
+            return;
+
+        this.editor._emit(name, new MouseEvent(e, this.editor));
+    };
+
+    this.onMouseWheel = function(name, e) {
+        var mouseEvent = new MouseEvent(e, this.editor);
+        mouseEvent.speed = this.$scrollSpeed * 2;
+        mouseEvent.wheelX = e.wheelX;
+        mouseEvent.wheelY = e.wheelY;
+        
+        this.editor._emit(name, mouseEvent);
+    };
+
+}).call(MouseHandler.prototype);
+
+exports.MouseHandler = MouseHandler;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mike de Boer <mike AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mouse/default_handlers', ['require', 'exports', 'module' , 'ace/lib/event', 'ace/lib/dom', 'ace/lib/browser_focus'], function(require, exports, module) {
+"use strict";
+
+var event = require("../lib/event");
+var dom = require("../lib/dom");
+var BrowserFocus = require("../lib/browser_focus").BrowserFocus;
+
+var STATE_UNKNOWN = 0;
+var STATE_SELECT = 1;
+var STATE_DRAG = 2;
+
+var DRAG_OFFSET = 5; // pixels
+
+function DefaultHandlers(editor) {
+    this.editor = editor;
+    this.$clickSelection = null;
+    this.browserFocus = new BrowserFocus();
+
+    editor.setDefaultHandler("mousedown", this.onMouseDown.bind(this));
+    editor.setDefaultHandler("dblclick", this.onDoubleClick.bind(this));
+    editor.setDefaultHandler("tripleclick", this.onTripleClick.bind(this));
+    editor.setDefaultHandler("quadclick", this.onQuadClick.bind(this));
+    editor.setDefaultHandler("mousewheel", this.onScroll.bind(this));
+}
+
+(function() {
+    
+    this.onMouseDown = function(ev) {
+        var inSelection = ev.inSelection();
+        var pageX = ev.pageX;
+        var pageY = ev.pageY;
+        var pos = ev.getDocumentPosition();
+        var editor = this.editor;
+        var _self = this;
+        
+        var selectionRange = editor.getSelectionRange();
+        var selectionEmpty = selectionRange.isEmpty();
+        var state = STATE_UNKNOWN;
+        
+        // if this click caused the editor to be focused should not clear the
+        // selection
+        if (
+            inSelection && (
+                !this.browserFocus.isFocused()
+                || new Date().getTime() - this.browserFocus.lastFocus < 20
+                || !editor.isFocused()
+            )
+        ) {
+            editor.focus();
+            return;
+        }
+
+        var button = ev.getButton();
+        if (button !== 0) {
+            if (selectionEmpty) {
+                editor.moveCursorToPosition(pos);
+            }
+            if (button == 2) {
+                editor.textInput.onContextMenu({x: ev.clientX, y: ev.clientY}, selectionEmpty);
+                event.capture(editor.container, function(){}, editor.textInput.onContextMenuClose);
+            }
+            return;
+        }
+
+        if (!inSelection) {
+            // Directly pick STATE_SELECT, since the user is not clicking inside
+            // a selection.
+            onStartSelect(pos);
+        }
+
+        var mousePageX = pageX, mousePageY = pageY;
+        var mousedownTime = (new Date()).getTime();
+        var dragCursor, dragRange, dragSelectionMarker;
+
+        var onMouseSelection = function(e) {
+            mousePageX = event.getDocumentX(e);
+            mousePageY = event.getDocumentY(e);
+        };
+
+        var onMouseSelectionEnd = function(e) {
+            clearInterval(timerId);
+            if (state == STATE_UNKNOWN)
+                onStartSelect(pos);
+            else if (state == STATE_DRAG)
+                onMouseDragSelectionEnd(e);
+
+            _self.$clickSelection = null;
+            state = STATE_UNKNOWN;
+        };
+
+        var onMouseDragSelectionEnd = function(e) {
+            dom.removeCssClass(editor.container, "ace_dragging");
+            editor.session.removeMarker(dragSelectionMarker);
+
+            if (!editor.$mouseHandler.$clickSelection) {
+                if (!dragCursor) {
+                    editor.moveCursorToPosition(pos);
+                    editor.selection.clearSelection(pos.row, pos.column);
+                }
+            }
+
+            if (!dragCursor)
+                return;
+
+            if (dragRange.contains(dragCursor.row, dragCursor.column)) {
+                dragCursor = null;
+                return;
+            }
+
+            editor.clearSelection();
+            if (e && (e.ctrlKey || e.altKey)) {
+                var session = editor.session;
+                var newRange = session.insert(dragCursor, session.getTextRange(dragRange));
+            } else {
+                var newRange = editor.moveText(dragRange, dragCursor);
+            }
+            if (!newRange) {
+                dragCursor = null;
+                return;
+            }
+
+            editor.selection.setSelectionRange(newRange);
+        };
+
+        var onSelectionInterval = function() {
+            if (state == STATE_UNKNOWN) {
+                var distance = calcDistance(pageX, pageY, mousePageX, mousePageY);
+                var time = (new Date()).getTime();
+
+                if (distance > DRAG_OFFSET) {
+                    state = STATE_SELECT;
+                    var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
+                    cursor.row = Math.max(0, Math.min(cursor.row, editor.session.getLength()-1));
+                    onStartSelect(cursor);
+                }
+                else if ((time - mousedownTime) > editor.getDragDelay()) {
+                    state = STATE_DRAG;
+                    dragRange = editor.getSelectionRange();
+                    var style = editor.getSelectionStyle();
+                    dragSelectionMarker = editor.session.addMarker(dragRange, "ace_selection", style);
+                    editor.clearSelection();
+                    dom.addCssClass(editor.container, "ace_dragging");
+                }
+
+            }
+
+            if (state == STATE_DRAG)
+                onDragSelectionInterval();
+            else if (state == STATE_SELECT)
+                onUpdateSelectionInterval();
+        };
+
+        function onStartSelect(pos) {
+            if (ev.getShiftKey()) {
+                editor.selection.selectToPosition(pos);
+            }
+            else {
+                if (!_self.$clickSelection) {
+                    editor.moveCursorToPosition(pos);
+                    editor.selection.clearSelection(pos.row, pos.column);
+                }
+            }
+            state = STATE_SELECT;
+        }
+
+        var onUpdateSelectionInterval = function() {
+            var anchor;
+            var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
+            cursor.row = Math.max(0, Math.min(cursor.row, editor.session.getLength()-1));
+
+            if (_self.$clickSelection) {
+                if (_self.$clickSelection.contains(cursor.row, cursor.column)) {
+                    editor.selection.setSelectionRange(_self.$clickSelection);
+                }
+                else {
+                    if (_self.$clickSelection.compare(cursor.row, cursor.column) == -1) {
+                        anchor = _self.$clickSelection.end;
+                    }
+                    else {
+                        anchor = _self.$clickSelection.start;
+                    }
+                    editor.selection.setSelectionAnchor(anchor.row, anchor.column);
+                    editor.selection.selectToPosition(cursor);
+                }
+            }
+            else {
+                editor.selection.selectToPosition(cursor);
+            }
+
+            editor.renderer.scrollCursorIntoView();
+        };
+
+        var onDragSelectionInterval = function() {
+            dragCursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
+            dragCursor.row = Math.max(0, Math.min(dragCursor.row, editor.session.getLength() - 1));
+
+            editor.moveCursorToPosition(dragCursor);
+        };
+
+        event.capture(editor.container, onMouseSelection, onMouseSelectionEnd);
+        var timerId = setInterval(onSelectionInterval, 20);
+
+        return ev.preventDefault();
+    };
+    
+    this.onDoubleClick = function(ev) {
+        var pos = ev.getDocumentPosition();
+        var editor = this.editor;
+        
+        editor.moveCursorToPosition(pos);
+        editor.selection.selectWord();
+        this.$clickSelection = editor.getSelectionRange();
+    };
+    
+    this.onTripleClick = function(ev) {
+        var pos = ev.getDocumentPosition();
+        var editor = this.editor;
+        
+        editor.moveCursorToPosition(pos);
+        editor.selection.selectLine();
+        this.$clickSelection = editor.getSelectionRange();
+    };
+    
+    this.onQuadClick = function(ev) {
+        var editor = this.editor;
+        
+        editor.selectAll();
+        this.$clickSelection = editor.getSelectionRange();
+    };
+    
+    this.onScroll = function(ev) {
+        var editor = this.editor;
+        
+        editor.renderer.scrollBy(ev.wheelX * ev.speed, ev.wheelY * ev.speed);
+        if (editor.renderer.isScrollableBy(ev.wheelX * ev.speed, ev.wheelY * ev.speed))
+            return ev.preventDefault();
+    };
+    
+}).call(DefaultHandlers.prototype);
+
+exports.DefaultHandlers = DefaultHandlers;
+
+function calcDistance(ax, ay, bx, by) {
+    return Math.sqrt(Math.pow(bx - ax, 2) + Math.pow(by - ay, 2));
+}
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
+ *      Julian Viereck <julian.viereck@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/lib/browser_focus', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("./oop");
+var event = require("./event");
+var EventEmitter = require("./event_emitter").EventEmitter;
+
+/**
+ * This class keeps track of the focus state of the given window.
+ * Focus changes for example when the user switches a browser tab,
+ * goes to the location bar or switches to another application.
+ */ 
+var BrowserFocus = function(win) {
+    win = win || window;
+    
+    this.lastFocus = new Date().getTime();
+    this._isFocused = true;
+    
+    var _self = this;
+
+    // IE < 9 supports focusin and focusout events
+    if ("onfocusin" in win.document) {
+        event.addListener(win.document, "focusin", function(e) {
+            _self._setFocused(true);
+        });
+
+        event.addListener(win.document, "focusout", function(e) {
+            _self._setFocused(!!e.toElement);
+        });
+    }
+    else {
+        event.addListener(win, "blur", function(e) {
+            _self._setFocused(false);
+        });
+
+        event.addListener(win, "focus", function(e) {
+            _self._setFocused(true);
+        });
+    }
+};
+
+(function(){
+
+    oop.implement(this, EventEmitter);
+    
+    this.isFocused = function() {
+        return this._isFocused;
+    };
+    
+    this._setFocused = function(isFocused) {
+        if (this._isFocused == isFocused)
+            return;
+            
+        if (isFocused)
+            this.lastFocus = new Date().getTime();
+            
+        this._isFocused = isFocused;
+        this._emit("changeFocus");
+    };
+
+}).call(BrowserFocus.prototype);
+
+
+exports.BrowserFocus = BrowserFocus;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
+ *      Mike de Boer <mike AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+var EventEmitter = {};
+
+EventEmitter._emit =
+EventEmitter._dispatchEvent = function(eventName, e) {
+    this._eventRegistry = this._eventRegistry || {};
+    this._defaultHandlers = this._defaultHandlers || {};
+
+    var listeners = this._eventRegistry[eventName] || [];
+    var defaultHandler = this._defaultHandlers[eventName];
+    if (!listeners.length && !defaultHandler)
+        return;
+
+    e = e || {};
+    e.type = eventName;
+    
+    if (!e.stopPropagation) {
+        e.stopPropagation = function() {
+            this.propagationStopped = true;
+        };
+    }
+    
+    if (!e.preventDefault) {
+        e.preventDefault = function() {
+            this.defaultPrevented = true;
+        };
+    }
+
+    for (var i=0; i<listeners.length; i++) {
+        listeners[i](e);
+        if (e.propagationStopped)
+            break;
+    }
+    
+    if (defaultHandler && !e.defaultPrevented)
+        defaultHandler(e);
+};
+
+EventEmitter.setDefaultHandler = function(eventName, callback) {
+    this._defaultHandlers = this._defaultHandlers || {};
+    
+    if (this._defaultHandlers[eventName])
+        throw new Error("The default handler for '" + eventName + "' is already set");
+        
+    this._defaultHandlers[eventName] = callback;
+};
+
+EventEmitter.on =
+EventEmitter.addEventListener = function(eventName, callback) {
+    this._eventRegistry = this._eventRegistry || {};
+
+    var listeners = this._eventRegistry[eventName];
+    if (!listeners)
+        var listeners = this._eventRegistry[eventName] = [];
+
+    if (listeners.indexOf(callback) == -1)
+        listeners.push(callback);
+};
+
+EventEmitter.removeListener =
+EventEmitter.removeEventListener = function(eventName, callback) {
+    this._eventRegistry = this._eventRegistry || {};
+
+    var listeners = this._eventRegistry[eventName];
+    if (!listeners)
+        return;
+
+    var index = listeners.indexOf(callback);
+    if (index !== -1)
+        listeners.splice(index, 1);
+};
+
+EventEmitter.removeAllListeners = function(eventName) {
+    if (this._eventRegistry) this._eventRegistry[eventName] = [];
+};
+
+exports.EventEmitter = EventEmitter;
+
+});/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mouse/default_gutter_handler', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+function GutterHandler(editor) {
+    editor.setDefaultHandler("gutterclick", function(e) {
+        var row = e.getDocumentPosition().row;
+        var selection = editor.session.selection;
+        
+        selection.moveCursorTo(row, 0);
+        selection.selectLine();
+    });
+}
+
+exports.GutterHandler = GutterHandler;
+
+});/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mouse/mouse_event', ['require', 'exports', 'module' , 'ace/lib/event'], function(require, exports, module) {
+"use strict";
+
+var event = require("../lib/event");
+
+/**
+ * Custom Ace mouse event
+ */
+var MouseEvent = exports.MouseEvent = function(domEvent, editor) {
+    this.domEvent = domEvent;
+    this.editor = editor;
+    
+    this.pageX = event.getDocumentX(domEvent);
+    this.pageY = event.getDocumentY(domEvent);
+    
+    this.clientX = domEvent.clientX;
+    this.clientY = domEvent.clientY;
+
+    this.$pos = null;
+    this.$inSelection = null;
+    
+    this.propagationStopped = false;
+    this.defaultPrevented = false;
+};
+
+(function() {  
+    
+    this.stopPropagation = function() {
+        event.stopPropagation(this.domEvent);
+        this.propagationStopped = true;
+    };
+    
+    this.preventDefault = function() {
+        event.preventDefault(this.domEvent);
+        this.defaultPrevented = true;
+    };
+    
+    this.stop = function() {
+        this.stopPropagation();
+        this.preventDefault();
+    };
+
+    /**
+     * Get the document position below the mouse cursor
+     * 
+     * @return {Object} 'row' and 'column' of the document position
+     */
+    this.getDocumentPosition = function() {
+        if (this.$pos)
+            return this.$pos;
+            
+        var pageX = event.getDocumentX(this.domEvent);
+        var pageY = event.getDocumentY(this.domEvent);
+        this.$pos = this.editor.renderer.screenToTextCoordinates(pageX, pageY);
+        this.$pos.row = Math.max(0, Math.min(this.$pos.row, this.editor.session.getLength()-1));
+        return this.$pos;
+    };
+    
+    /**
+     * Check if the mouse cursor is inside of the text selection
+     * 
+     * @return {Boolean} whether the mouse cursor is inside of the selection
+     */
+    this.inSelection = function() {
+        if (this.$inSelection !== null)
+            return this.$inSelection;
+            
+        var editor = this.editor;
+        
+        if (editor.getReadOnly()) {
+            this.$inSelection = false;
+        }
+        else {
+            var selectionRange = editor.getSelectionRange();
+            if (selectionRange.isEmpty())
+                this.$inSelection = false;
+            else {
+                var pos = this.getDocumentPosition();
+                this.$inSelection = selectionRange.contains(pos.row, pos.column);
+            }
+        }
+        return this.$inSelection;
+    };
+    
+    /**
+     * Get the clicked mouse button
+     * 
+     * @return {Number} 0 for left button, 1 for middle button, 2 for right button
+     */
+    this.getButton = function() {
+        return event.getButton(this.domEvent);
+    };
+    
+    /**
+     * @return {Boolean} whether the shift key was pressed when the event was emitted
+     */
+    this.getShiftKey = function() {
+        return this.domEvent.shiftKey;
+    };
+    
+    this.getAccelKey = function() {
+        return this.domEvent.ctrlKey || this.domEvent.metaKey ;
+    };
+    
+}).call(MouseEvent.prototype);
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mouse/fold_handler', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+function FoldHandler(editor) {
+    
+    editor.on("click", function(e) {
+        var position = e.getDocumentPosition();
+        var session = editor.session;
+        
+        // If the user dclicked on a fold, then expand it.
+        var fold = session.getFoldAt(position.row, position.column, 1);
+        if (fold) {
+            if (e.getAccelKey())
+                session.removeFold(fold);
+            else
+                session.expandFold(fold);
+                
+            e.stop();
+        }
+    });
+    
+    editor.on("gutterclick", function(e) {
+        if (e.domEvent.target.className.indexOf("ace_fold-widget") != -1) {
+            var row = e.getDocumentPosition().row;
+            editor.session.onFoldWidgetClick(row, e.domEvent);
+            e.stop();
+        }
+    });
+}
+
+exports.FoldHandler = FoldHandler;
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Julian Viereck <julian.viereck@gmail.com>
+ *      Harutyun Amirjanyan <amirjanyan@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/keyboard/keybinding', ['require', 'exports', 'module' , 'ace/lib/keys', 'ace/lib/event', 'ace/commands/default_commands'], function(require, exports, module) {
+"use strict";
+
+var keyUtil  = require("../lib/keys");
+var event = require("../lib/event");
+require("../commands/default_commands");
+
+var KeyBinding = function(editor) {
+    this.$editor = editor;
+    this.$data = { };
+    this.$handlers = [this];
+};
+
+(function() {
+    this.setKeyboardHandler = function(keyboardHandler) {
+        if (this.$handlers[this.$handlers.length - 1] == keyboardHandler)
+            return;
+        this.$data = { };
+        this.$handlers = keyboardHandler ? [this, keyboardHandler] : [this];
+    };
+
+    this.addKeyboardHandler = function(keyboardHandler) {
+        this.removeKeyboardHandler(keyboardHandler);
+        this.$handlers.push(keyboardHandler);
+    };
+
+    this.removeKeyboardHandler = function(keyboardHandler) {
+        var i = this.$handlers.indexOf(keyboardHandler);
+        if (i == -1)
+            return false;
+        this.$handlers.splice(i, 1);
+        return true;
+    };
+
+    this.getKeyboardHandler = function() {
+        return this.$handlers[this.$handlers.length - 1];
+    };
+
+    this.$callKeyboardHandlers = function (hashId, keyString, keyCode, e) {
+        var toExecute;
+        for (var i = this.$handlers.length; i--;) {
+            toExecute = this.$handlers[i].handleKeyboard(
+                this.$data, hashId, keyString, keyCode, e
+            );
+            if (toExecute && toExecute.command)
+                break;
+        }
+
+        if (!toExecute || !toExecute.command)
+            return false;
+
+        var success = false;
+        var commands = this.$editor.commands;
+
+        // allow keyboardHandler to consume keys
+        if (toExecute.command != "null")
+            success = commands.exec(toExecute.command, this.$editor, toExecute.args);
+        else
+            success = true;
+
+        if (success && e)
+            event.stopEvent(e);
+
+        return success;
+    };
+
+    this.handleKeyboard = function(data, hashId, keyString) {
+        return {
+            command: this.$editor.commands.findKeyCommand(hashId, keyString)
+        };
+    };
+
+    this.onCommandKey = function(e, hashId, keyCode) {
+        var keyString = keyUtil.keyCodeToString(keyCode);
+        this.$callKeyboardHandlers(hashId, keyString, keyCode, e);
+    };
+
+    this.onTextInput = function(text, pasted) {
+        var success = false;
+        if (!pasted && text.length == 1)
+            success = this.$callKeyboardHandlers(0, text);
+        if (!success)
+            this.$editor.commands.exec("insertstring", this.$editor, text);
+    };
+
+}).call(KeyBinding.prototype);
+
+exports.KeyBinding = KeyBinding;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Julian Viereck <julian.viereck@gmail.com>
+ *      Mihai Sucan <mihai.sucan@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/commands/default_commands', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
+"use strict";
+
+var lang = require("../lib/lang");
+
+function bindKey(win, mac) {
+    return {
+        win: win,
+        mac: mac
+    };
+}
+
+exports.commands = [{
+    name: "selectall",
+    bindKey: bindKey("Ctrl-A", "Command-A"),
+    exec: function(editor) { editor.selectAll(); },
+    readOnly: true
+}, {
+    name: "centerselection",
+    bindKey: bindKey(null, "Ctrl-L"),
+    exec: function(editor) { editor.centerSelection(); },
+    readOnly: true
+}, {
+    name: "gotoline",
+    bindKey: bindKey("Ctrl-L", "Command-L"),
+    exec: function(editor) {
+        var line = parseInt(prompt("Enter line number:"), 10);
+        if (!isNaN(line)) {
+            editor.gotoLine(line);
+        }
+    },
+    readOnly: true
+}, {
+    name: "fold",
+    bindKey: bindKey("Alt-L", "Alt-L"),
+    exec: function(editor) { editor.session.toggleFold(false); },
+    readOnly: true
+}, {
+    name: "unfold",
+    bindKey: bindKey("Alt-Shift-L", "Alt-Shift-L"),
+    exec: function(editor) { editor.session.toggleFold(true); },
+    readOnly: true
+}, {
+    name: "foldall",
+    bindKey: bindKey("Alt-0", "Alt-0"),
+    exec: function(editor) { editor.session.foldAll(); },
+    readOnly: true
+}, {
+    name: "unfoldall",
+    bindKey: bindKey("Alt-Shift-0", "Alt-Shift-0"),
+    exec: function(editor) { editor.session.unfold(); },
+    readOnly: true
+}, {
+    name: "findnext",
+    bindKey: bindKey("Ctrl-K", "Command-G"),
+    exec: function(editor) { editor.findNext(); },
+    readOnly: true
+}, {
+    name: "findprevious",
+    bindKey: bindKey("Ctrl-Shift-K", "Command-Shift-G"),
+    exec: function(editor) { editor.findPrevious(); },
+    readOnly: true
+}, {
+    name: "find",
+    bindKey: bindKey("Ctrl-F", "Command-F"),
+    exec: function(editor) {
+        var needle = prompt("Find:", editor.getCopyText());
+        editor.find(needle);
+    },
+    readOnly: true
+}, {
+    name: "overwrite",
+    bindKey: bindKey("Insert", "Insert"),
+    exec: function(editor) { editor.toggleOverwrite(); },
+    readOnly: true
+}, {
+    name: "selecttostart",
+    bindKey: bindKey("Ctrl-Shift-Home|Alt-Shift-Up", "Command-Shift-Up"),
+    exec: function(editor) { editor.getSelection().selectFileStart(); },
+    readOnly: true
+}, {
+    name: "gotostart",
+    bindKey: bindKey("Ctrl-Home|Ctrl-Up", "Command-Home|Command-Up"),
+    exec: function(editor) { editor.navigateFileStart(); },
+    readOnly: true
+}, {
+    name: "selectup",
+    bindKey: bindKey("Shift-Up", "Shift-Up"),
+    exec: function(editor) { editor.getSelection().selectUp(); },
+    readOnly: true
+}, {
+    name: "golineup",
+    bindKey: bindKey("Up", "Up|Ctrl-P"),
+    exec: function(editor, args) { editor.navigateUp(args.times); },
+    readOnly: true
+}, {
+    name: "selecttoend",
+    bindKey: bindKey("Ctrl-Shift-End|Alt-Shift-Down", "Command-Shift-Down"),
+    exec: function(editor) { editor.getSelection().selectFileEnd(); },
+    readOnly: true
+}, {
+    name: "gotoend",
+    bindKey: bindKey("Ctrl-End|Ctrl-Down", "Command-End|Command-Down"),
+    exec: function(editor) { editor.navigateFileEnd(); },
+    readOnly: true
+}, {
+    name: "selectdown",
+    bindKey: bindKey("Shift-Down", "Shift-Down"),
+    exec: function(editor) { editor.getSelection().selectDown(); },
+    readOnly: true
+}, {
+    name: "golinedown",
+    bindKey: bindKey("Down", "Down|Ctrl-N"),
+    exec: function(editor, args) { editor.navigateDown(args.times); },
+    readOnly: true
+}, {
+    name: "selectwordleft",
+    bindKey: bindKey("Ctrl-Shift-Left", "Option-Shift-Left"),
+    exec: function(editor) { editor.getSelection().selectWordLeft(); },
+    readOnly: true
+}, {
+    name: "gotowordleft",
+    bindKey: bindKey("Ctrl-Left", "Option-Left"),
+    exec: function(editor) { editor.navigateWordLeft(); },
+    readOnly: true
+}, {
+    name: "selecttolinestart",
+    bindKey: bindKey("Alt-Shift-Left", "Command-Shift-Left"),
+    exec: function(editor) { editor.getSelection().selectLineStart(); },
+    readOnly: true
+}, {
+    name: "gotolinestart",
+    bindKey: bindKey("Alt-Left|Home", "Command-Left|Home|Ctrl-A"),
+    exec: function(editor) { editor.navigateLineStart(); },
+    readOnly: true
+}, {
+    name: "selectleft",
+    bindKey: bindKey("Shift-Left", "Shift-Left"),
+    exec: function(editor) { editor.getSelection().selectLeft(); },
+    readOnly: true
+}, {
+    name: "gotoleft",
+    bindKey: bindKey("Left", "Left|Ctrl-B"),
+    exec: function(editor, args) { editor.navigateLeft(args.times); },
+    readOnly: true
+}, {
+    name: "selectwordright",
+    bindKey: bindKey("Ctrl-Shift-Right", "Option-Shift-Right"),
+    exec: function(editor) { editor.getSelection().selectWordRight(); },
+    readOnly: true
+}, {
+    name: "gotowordright",
+    bindKey: bindKey("Ctrl-Right", "Option-Right"),
+    exec: function(editor) { editor.navigateWordRight(); },
+    readOnly: true
+}, {
+    name: "selecttolineend",
+    bindKey: bindKey("Alt-Shift-Right", "Command-Shift-Right"),
+    exec: function(editor) { editor.getSelection().selectLineEnd(); },
+    readOnly: true
+}, {
+    name: "gotolineend",
+    bindKey: bindKey("Alt-Right|End", "Command-Right|End|Ctrl-E"),
+    exec: function(editor) { editor.navigateLineEnd(); },
+    readOnly: true
+}, {
+    name: "selectright",
+    bindKey: bindKey("Shift-Right", "Shift-Right"),
+    exec: function(editor) { editor.getSelection().selectRight(); },
+    readOnly: true
+}, {
+    name: "gotoright",
+    bindKey: bindKey("Right", "Right|Ctrl-F"),
+    exec: function(editor, args) { editor.navigateRight(args.times); },
+    readOnly: true
+}, {
+    name: "selectpagedown",
+    bindKey: bindKey("Shift-PageDown", "Shift-PageDown"),
+    exec: function(editor) { editor.selectPageDown(); },
+    readOnly: true
+}, {
+    name: "pagedown",
+    bindKey: bindKey(null, "PageDown"),
+    exec: function(editor) { editor.scrollPageDown(); },
+    readOnly: true
+}, {
+    name: "gotopagedown",
+    bindKey: bindKey("PageDown", "Option-PageDown|Ctrl-V"),
+    exec: function(editor) { editor.gotoPageDown(); },
+    readOnly: true
+}, {
+    name: "selectpageup",
+    bindKey: bindKey("Shift-PageUp", "Shift-PageUp"),
+    exec: function(editor) { editor.selectPageUp(); },
+    readOnly: true
+}, {
+    name: "pageup",
+    bindKey: bindKey(null, "PageUp"),
+    exec: function(editor) { editor.scrollPageUp(); },
+    readOnly: true
+}, {
+    name: "gotopageup",
+    bindKey: bindKey("PageUp", "Option-PageUp"),
+    exec: function(editor) { editor.gotoPageUp(); },
+    readOnly: true
+}, {
+    name: "selectlinestart",
+    bindKey: bindKey("Shift-Home", "Shift-Home"),
+    exec: function(editor) { editor.getSelection().selectLineStart(); },
+    readOnly: true
+}, {
+    name: "selectlineend",
+    bindKey: bindKey("Shift-End", "Shift-End"),
+    exec: function(editor) { editor.getSelection().selectLineEnd(); },
+    readOnly: true
+}, {
+    name: "togglerecording",
+    bindKey: bindKey("Ctrl-Alt-E", "Command-Option-E"),
+    exec: function(editor) { editor.commands.toggleRecording(); },
+    readOnly: true
+}, {
+    name: "replaymacro",
+    bindKey: bindKey("Ctrl-Shift-E", "Command-Shift-E"),
+    exec: function(editor) { editor.commands.replay(editor); },
+    readOnly: true
+}, 
+
+// commands disabled in readOnly mode
+{
+    name: "removeline",
+    bindKey: bindKey("Ctrl-D", "Command-D"),
+    exec: function(editor) { editor.removeLines(); }
+}, {
+    name: "togglecomment",
+    bindKey: bindKey("Ctrl-7", "Command-7"),
+    exec: function(editor) { editor.toggleCommentLines(); }
+}, {
+    name: "replace",
+    bindKey: bindKey("Ctrl-R", "Command-Option-F"),
+    exec: function(editor) {
+        var needle = prompt("Find:", editor.getCopyText());
+        if (!needle)
+            return;
+        var replacement = prompt("Replacement:");
+        if (!replacement)
+            return;
+        editor.replace(replacement, {needle: needle});
+    }
+}, {
+    name: "replaceall",
+    bindKey: bindKey("Ctrl-Shift-R", "Command-Shift-Option-F"),
+    exec: function(editor) {
+        var needle = prompt("Find:");
+        if (!needle)
+            return;
+        var replacement = prompt("Replacement:");
+        if (!replacement)
+            return;
+        editor.replaceAll(replacement, {needle: needle});
+    }
+}, {
+    name: "undo",
+    bindKey: bindKey("Ctrl-Z", "Command-Z"),
+    exec: function(editor) { editor.undo(); }
+}, {
+    name: "redo",
+    bindKey: bindKey("Ctrl-Shift-Z|Ctrl-Y", "Command-Shift-Z|Command-Y"),
+    exec: function(editor) { editor.redo(); }
+}, {
+    name: "copylinesup",
+    bindKey: bindKey("Ctrl-Alt-Up", "Command-Option-Up"),
+    exec: function(editor) { editor.copyLinesUp(); }
+}, {
+    name: "movelinesup",
+    bindKey: bindKey("Alt-Up", "Option-Up"),
+    exec: function(editor) { editor.moveLinesUp(); }
+}, {
+    name: "copylinesdown",
+    bindKey: bindKey("Ctrl-Alt-Down", "Command-Option-Down"),
+    exec: function(editor) { editor.copyLinesDown(); }
+}, {
+    name: "movelinesdown",
+    bindKey: bindKey("Alt-Down", "Option-Down"),
+    exec: function(editor) { editor.moveLinesDown(); }
+}, {
+    name: "del",
+    bindKey: bindKey("Delete", "Delete|Ctrl-D"),
+    exec: function(editor) { editor.remove("right"); }
+}, {
+    name: "backspace",
+    bindKey: bindKey(
+        "Ctrl-Backspace|Command-Backspace|Option-Backspace|Shift-Backspace|Backspace",
+        "Ctrl-Backspace|Command-Backspace|Shift-Backspace|Backspace|Ctrl-H"
+    ),
+    exec: function(editor) { editor.remove("left"); }
+}, {
+    name: "removetolinestart",
+    bindKey: bindKey("Alt-Backspace", "Option-Backspace"),
+    exec: function(editor) { editor.removeToLineStart(); }
+}, {
+    name: "removetolineend",
+    bindKey: bindKey("Alt-Delete", "Ctrl-K"),
+    exec: function(editor) { editor.removeToLineEnd(); }
+}, {
+    name: "removewordleft",
+    bindKey: bindKey("Ctrl-Backspace", "Alt-Backspace|Ctrl-Alt-Backspace"),
+    exec: function(editor) { editor.removeWordLeft(); }
+}, {
+    name: "removewordright",
+    bindKey: bindKey("Ctrl-Delete", "Alt-Delete"),
+    exec: function(editor) { editor.removeWordRight(); }
+}, {
+    name: "outdent",
+    bindKey: bindKey("Shift-Tab", "Shift-Tab"),
+    exec: function(editor) { editor.blockOutdent(); }
+}, {
+    name: "indent",
+    bindKey: bindKey("Tab", "Tab"),
+    exec: function(editor) { editor.indent(); }
+}, {
+    name: "insertstring",
+    exec: function(editor, str) { editor.insert(str); }
+}, {
+    name: "inserttext",
+    exec: function(editor, args) {
+        editor.insert(lang.stringRepeat(args.text  || "", args.times || 1));
+    }
+}, {
+    name: "splitline",
+    bindKey: bindKey(null, "Ctrl-O"),
+    exec: function(editor) { editor.splitLine(); }
+}, {
+    name: "transposeletters",
+    bindKey: bindKey("Ctrl-T", "Ctrl-T"),
+    exec: function(editor) { editor.transposeLetters(); }
+}, {
+    name: "touppercase",
+    bindKey: bindKey("Ctrl-U", "Ctrl-U"),
+    exec: function(editor) { editor.toUpperCase(); }
+}, {
+    name: "tolowercase",
+    bindKey: bindKey("Ctrl-Shift-U", "Ctrl-Shift-U"),
+    exec: function(editor) { editor.toLowerCase(); }
+}, {
+    name: "jumptomatching",
+    bindKey: bindKey("Ctrl-Shift-P", "Ctrl-Shift-P"),
+    exec: function(editor) { editor.jumpToMatching(); }
+}];
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
+ *      Julian Viereck <julian DOT viereck AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/edit_session', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/lib/event_emitter', 'ace/selection', 'ace/mode/text', 'ace/range', 'ace/document', 'ace/background_tokenizer', 'ace/edit_session/folding', 'ace/edit_session/bracket_match'], function(require, exports, module) {
+"use strict";
+
+var oop = require("./lib/oop");
+var lang = require("./lib/lang");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+var Selection = require("./selection").Selection;
+var TextMode = require("./mode/text").Mode;
+var Range = require("./range").Range;
+var Document = require("./document").Document;
+var BackgroundTokenizer = require("./background_tokenizer").BackgroundTokenizer;
+
+var EditSession = function(text, mode) {
+    this.$modified = true;
+    this.$breakpoints = [];
+    this.$frontMarkers = {};
+    this.$backMarkers = {};
+    this.$markerId = 1;
+    this.$rowCache = [];
+    this.$wrapData = [];
+    this.$foldData = [];
+    this.$undoSelect = true;
+    this.$foldData.toString = function() {
+        var str = "";
+        this.forEach(function(foldLine) {
+            str += "\n" + foldLine.toString();
+        });
+        return str;
+    }
+
+    if (text instanceof Document) {
+        this.setDocument(text);
+    } else {
+        this.setDocument(new Document(text));
+    }
+
+    this.selection = new Selection(this);
+    if (mode)
+        this.setMode(mode);
+    else
+        this.setMode(new TextMode());
+};
+
+
+(function() {
+
+    oop.implement(this, EventEmitter);
+
+    this.setDocument = function(doc) {
+        if (this.doc)
+            throw new Error("Document is already set");
+
+        this.doc = doc;
+        doc.on("change", this.onChange.bind(this));
+        this.on("changeFold", this.onChangeFold.bind(this));
+
+        if (this.bgTokenizer) {
+            this.bgTokenizer.setDocument(this.getDocument());
+            this.bgTokenizer.start(0);
+        }
+    };
+
+    this.getDocument = function() {
+        return this.doc;
+    };
+
+    this.$resetRowCache = function(row) {
+        if (row == 0) {
+            this.$rowCache = [];
+            return;
+        }
+        var rowCache = this.$rowCache;
+        for (var i = 0; i < rowCache.length; i++) {
+            if (rowCache[i].docRow >= row) {
+                rowCache.splice(i, rowCache.length);
+                return;
+            }
+        }
+    };
+
+    this.onChangeFold = function(e) {
+        var fold = e.data;
+        this.$resetRowCache(fold.start.row);
+    };
+
+    this.onChange = function(e) {
+        var delta = e.data;
+        this.$modified = true;
+
+        this.$resetRowCache(delta.range.start.row);
+
+        var removedFolds = this.$updateInternalDataOnChange(e);
+        if (!this.$fromUndo && this.$undoManager && !delta.ignore) {
+            this.$deltasDoc.push(delta);
+            if (removedFolds && removedFolds.length != 0) {
+                this.$deltasFold.push({
+                    action: "removeFolds",
+                    folds:  removedFolds
+                });
+            }
+
+            this.$informUndoManager.schedule();
+        }
+
+        this.bgTokenizer.start(delta.range.start.row);
+        this._emit("change", e);
+    };
+
+    this.setValue = function(text) {
+        this.doc.setValue(text);
+        this.selection.moveCursorTo(0, 0);
+        this.selection.clearSelection();
+
+        this.$resetRowCache(0);
+        this.$deltas = [];
+        this.$deltasDoc = [];
+        this.$deltasFold = [];
+        this.getUndoManager().reset();
+    };
+
+    this.getValue =
+    this.toString = function() {
+        return this.doc.getValue();
+    };
+
+    this.getSelection = function() {
+        return this.selection;
+    };
+
+    this.getState = function(row) {
+        return this.bgTokenizer.getState(row);
+    };
+
+    this.getTokens = function(firstRow, lastRow) {
+        return this.bgTokenizer.getTokens(firstRow, lastRow);
+    };
+
+    this.getTokenAt = function(row, column) {
+        var tokens = this.bgTokenizer.getTokens(row, row)[0].tokens;
+        var token, c = 0;
+        if (column == null) {
+            i = tokens.length - 1;
+            c = this.getLine(row).length;
+        } else {
+            for (var i = 0; i < tokens.length; i++) {
+                c += tokens[i].value.length;
+                if (c >= column)
+                    break;
+            }
+        }
+        token = tokens[i];
+        if (!token)
+            return null;
+        token.index = i;
+        token.start = c - token.value.length;
+        return token;
+    };
+
+    this.setUndoManager = function(undoManager) {
+        this.$undoManager = undoManager;
+        this.$resetRowCache(0);
+        this.$deltas = [];
+        this.$deltasDoc = [];
+        this.$deltasFold = [];
+
+        if (this.$informUndoManager)
+            this.$informUndoManager.cancel();
+
+        if (undoManager) {
+            var self = this;
+            this.$syncInformUndoManager = function() {
+                self.$informUndoManager.cancel();
+
+                if (self.$deltasFold.length) {
+                    self.$deltas.push({
+                        group: "fold",
+                        deltas: self.$deltasFold
+                    });
+                    self.$deltasFold = [];
+                }
+
+                if (self.$deltasDoc.length) {
+                    self.$deltas.push({
+                        group: "doc",
+                        deltas: self.$deltasDoc
+                    });
+                    self.$deltasDoc = [];
+                }
+
+                if (self.$deltas.length > 0) {
+                    undoManager.execute({
+                        action: "aceupdate",
+                        args: [self.$deltas, self]
+                    });
+                }
+
+                self.$deltas = [];
+            }
+            this.$informUndoManager =
+                lang.deferredCall(this.$syncInformUndoManager);
+        }
+    };
+
+    this.$defaultUndoManager = {
+        undo: function() {},
+        redo: function() {},
+        reset: function() {}
+    };
+
+    this.getUndoManager = function() {
+        return this.$undoManager || this.$defaultUndoManager;
+    },
+
+    this.getTabString = function() {
+        if (this.getUseSoftTabs()) {
+            return lang.stringRepeat(" ", this.getTabSize());
+        } else {
+            return "\t";
+        }
+    };
+
+    this.$useSoftTabs = true;
+    this.setUseSoftTabs = function(useSoftTabs) {
+        if (this.$useSoftTabs === useSoftTabs) return;
+
+        this.$useSoftTabs = useSoftTabs;
+    };
+
+    this.getUseSoftTabs = function() {
+        return this.$useSoftTabs;
+    };
+
+    this.$tabSize = 4;
+    this.setTabSize = function(tabSize) {
+        if (isNaN(tabSize) || this.$tabSize === tabSize) return;
+
+        this.$modified = true;
+        this.$tabSize = tabSize;
+        this._emit("changeTabSize");
+    };
+
+    this.getTabSize = function() {
+        return this.$tabSize;
+    };
+
+    this.isTabStop = function(position) {
+        return this.$useSoftTabs && (position.column % this.$tabSize == 0);
+    };
+
+    this.$overwrite = false;
+    this.setOverwrite = function(overwrite) {
+        if (this.$overwrite == overwrite) return;
+
+        this.$overwrite = overwrite;
+        this._emit("changeOverwrite");
+    };
+
+    this.getOverwrite = function() {
+        return this.$overwrite;
+    };
+
+    this.toggleOverwrite = function() {
+        this.setOverwrite(!this.$overwrite);
+    };
+
+    this.getBreakpoints = function() {
+        return this.$breakpoints;
+    };
+
+    this.setBreakpoints = function(rows) {
+        this.$breakpoints = [];
+        for (var i=0; i<rows.length; i++) {
+            this.$breakpoints[rows[i]] = true;
+        }
+        this._emit("changeBreakpoint", {});
+    };
+
+    this.clearBreakpoints = function() {
+        this.$breakpoints = [];
+        this._emit("changeBreakpoint", {});
+    };
+
+    this.setBreakpoint = function(row) {
+        this.$breakpoints[row] = true;
+        this._emit("changeBreakpoint", {});
+    };
+
+    this.clearBreakpoint = function(row) {
+        delete this.$breakpoints[row];
+        this._emit("changeBreakpoint", {});
+    };
+
+    this.getBreakpoints = function() {
+        return this.$breakpoints;
+    };
+
+    this.addMarker = function(range, clazz, type, inFront) {
+        var id = this.$markerId++;
+
+        var marker = {
+            range : range,
+            type : type || "line",
+            renderer: typeof type == "function" ? type : null,
+            clazz : clazz,
+            inFront: !!inFront
+        }
+
+        if (inFront) {
+            this.$frontMarkers[id] = marker;
+            this._emit("changeFrontMarker")
+        } else {
+            this.$backMarkers[id] = marker;
+            this._emit("changeBackMarker")
+        }
+
+        return id;
+    };
+
+    this.removeMarker = function(markerId) {
+        var marker = this.$frontMarkers[markerId] || this.$backMarkers[markerId];
+        if (!marker)
+            return;
+
+        var markers = marker.inFront ? this.$frontMarkers : this.$backMarkers;
+        if (marker) {
+            delete (markers[markerId]);
+            this._emit(marker.inFront ? "changeFrontMarker" : "changeBackMarker");
+        }
+    };
+
+    this.getMarkers = function(inFront) {
+        return inFront ? this.$frontMarkers : this.$backMarkers;
+    };
+
+    /**
+     * Error:
+     *  {
+     *    row: 12,
+     *    column: 2, //can be undefined
+     *    text: "Missing argument",
+     *    type: "error" // or "warning" or "info"
+     *  }
+     */
+    this.setAnnotations = function(annotations) {
+        this.$annotations = {};
+        for (var i=0; i<annotations.length; i++) {
+            var annotation = annotations[i];
+            var row = annotation.row;
+            if (this.$annotations[row])
+                this.$annotations[row].push(annotation);
+            else
+                this.$annotations[row] = [annotation];
+        }
+        this._emit("changeAnnotation", {});
+    };
+
+    this.getAnnotations = function() {
+        return this.$annotations || {};
+    };
+
+    this.clearAnnotations = function() {
+        this.$annotations = {};
+        this._emit("changeAnnotation", {});
+    };
+
+    this.$detectNewLine = function(text) {
+        var match = text.match(/^.*?(\r?\n)/m);
+        if (match) {
+            this.$autoNewLine = match[1];
+        } else {
+            this.$autoNewLine = "\n";
+        }
+    };
+
+    this.getWordRange = function(row, column) {
+        var line = this.getLine(row);
+
+        var inToken = false;
+        if (column > 0) {
+            inToken = !!line.charAt(column - 1).match(this.tokenRe);
+        }
+
+        if (!inToken) {
+            inToken = !!line.charAt(column).match(this.tokenRe);
+        }
+
+        var re = inToken ? this.tokenRe : this.nonTokenRe;
+
+        var start = column;
+        if (start > 0) {
+            do {
+                start--;
+            }
+            while (start >= 0 && line.charAt(start).match(re));
+            start++;
+        }
+
+        var end = column;
+        while (end < line.length && line.charAt(end).match(re)) {
+            end++;
+        }
+
+        return new Range(row, start, row, end);
+    };
+
+    // Gets the range of a word including its right whitespace
+    this.getAWordRange = function(row, column) {
+        var wordRange = this.getWordRange(row, column);
+        var line = this.getLine(wordRange.end.row);
+
+        while (line.charAt(wordRange.end.column).match(/[ \t]/)) {
+            wordRange.end.column += 1;
+        }
+        return wordRange;
+    };
+
+    this.setNewLineMode = function(newLineMode) {
+        this.doc.setNewLineMode(newLineMode);
+    };
+
+    this.getNewLineMode = function() {
+        return this.doc.getNewLineMode();
+    };
+
+    this.$useWorker = true;
+    this.setUseWorker = function(useWorker) {
+        if (this.$useWorker == useWorker)
+            return;
+
+        this.$useWorker = useWorker;
+
+        this.$stopWorker();
+        if (useWorker)
+            this.$startWorker();
+    };
+
+    this.getUseWorker = function() {
+        return this.$useWorker;
+    };
+
+    this.onReloadTokenizer = function(e) {
+        var rows = e.data;
+        this.bgTokenizer.start(rows.first);
+        this._emit("tokenizerUpdate", e);
+    };
+
+    this.$mode = null;
+    this.setMode = function(mode) {
+        if (this.$mode === mode) return;
+        this.$mode = mode;
+
+        this.$stopWorker();
+
+        if (this.$useWorker)
+            this.$startWorker();
+
+        var tokenizer = mode.getTokenizer();
+
+        if(tokenizer.addEventListener !== undefined) {
+            var onReloadTokenizer = this.onReloadTokenizer.bind(this);
+            tokenizer.addEventListener("update", onReloadTokenizer);
+        }
+
+        if (!this.bgTokenizer) {
+            this.bgTokenizer = new BackgroundTokenizer(tokenizer);
+            var _self = this;
+            this.bgTokenizer.addEventListener("update", function(e) {
+                _self._emit("tokenizerUpdate", e);
+            });
+        } else {
+            this.bgTokenizer.setTokenizer(tokenizer);
+        }
+
+        this.bgTokenizer.setDocument(this.getDocument());
+        this.bgTokenizer.start(0);
+
+        this.tokenRe = mode.tokenRe;
+        this.nonTokenRe = mode.nonTokenRe;
+
+        this.$setFolding(mode.foldingRules);
+
+        this._emit("changeMode");
+    };
+
+    this.$stopWorker = function() {
+        if (this.$worker)
+            this.$worker.terminate();
+
+        this.$worker = null;
+    };
+
+    this.$startWorker = function() {
+        if (typeof Worker !== "undefined" && !require.noWorker) {
+            try {
+                this.$worker = this.$mode.createWorker(this);
+            } catch (e) {
+                console.log("Could not load worker");
+                console.log(e);
+                this.$worker = null;
+            }
+        }
+        else
+            this.$worker = null;
+    };
+
+    this.getMode = function() {
+        return this.$mode;
+    };
+    
+    this.$scrollTop = 0;
+    this.setScrollTop = function(scrollTop) {
+        scrollTop = Math.round(Math.max(0, scrollTop));
+        if (this.$scrollTop === scrollTop)
+            return;
+
+        this.$scrollTop = scrollTop;
+        this._emit("changeScrollTop", scrollTop);
+    };
+
+    this.getScrollTop = function() {
+        return this.$scrollTop;
+    };
+    
+    this.$scrollLeft = 0;
+    this.setScrollLeft = function(scrollLeft) {
+        scrollLeft = Math.round(Math.max(0, scrollLeft));
+        if (this.$scrollLeft === scrollLeft)
+            return;
+
+        this.$scrollLeft = scrollLeft;
+        this._emit("changeScrollLeft", scrollLeft);
+    };
+
+    this.getScrollLeft = function() {
+        return this.$scrollLeft;
+    };
+
+    this.getWidth = function() {
+        this.$computeWidth();
+        return this.width;
+    };
+
+    this.getScreenWidth = function() {
+        this.$computeWidth();
+        return this.screenWidth;
+    };
+
+    this.$computeWidth = function(force) {
+        if (this.$modified || force) {
+            this.$modified = false;
+
+            var lines = this.doc.getAllLines();
+            var longestLine = 0;
+            var longestScreenLine = 0;
+
+            for ( var i = 0; i < lines.length; i++) {
+                var foldLine = this.getFoldLine(i),
+                    line, len;
+
+                line = lines[i];
+                if (foldLine) {
+                    var end = foldLine.range.end;
+                    line = this.getFoldDisplayLine(foldLine);
+                    // Continue after the foldLine.end.row. All the lines in
+                    // between are folded.
+                    i = end.row;
+                }
+                len = line.length;
+                longestLine = Math.max(longestLine, len);
+                if (!this.$useWrapMode) {
+                    longestScreenLine = Math.max(
+                        longestScreenLine,
+                        this.$getStringScreenWidth(line)[0]
+                    );
+                }
+            }
+            this.width = longestLine;
+
+            if (this.$useWrapMode) {
+                this.screenWidth = this.$wrapLimit;
+            } else {
+                this.screenWidth = longestScreenLine;
+            }
+        }
+    };
+
+    /**
+     * Get a verbatim copy of the given line as it is in the document
+     */
+    this.getLine = function(row) {
+        return this.doc.getLine(row);
+    };
+
+    this.getLines = function(firstRow, lastRow) {
+        return this.doc.getLines(firstRow, lastRow);
+    };
+
+    this.getLength = function() {
+        return this.doc.getLength();
+    };
+
+    this.getTextRange = function(range) {
+        return this.doc.getTextRange(range);
+    };
+
+    this.insert = function(position, text) {
+        return this.doc.insert(position, text);
+    };
+
+    this.remove = function(range) {
+        return this.doc.remove(range);
+    };
+
+    this.undoChanges = function(deltas, dontSelect) {
+        if (!deltas.length)
+            return;
+
+        this.$fromUndo = true;
+        var lastUndoRange = null;
+        for (var i = deltas.length - 1; i != -1; i--) {
+            var delta = deltas[i];
+            if (delta.group == "doc") {
+                this.doc.revertDeltas(delta.deltas);
+                lastUndoRange =
+                    this.$getUndoSelection(delta.deltas, true, lastUndoRange);
+            } else {
+                delta.deltas.forEach(function(foldDelta) {
+                    this.addFolds(foldDelta.folds);
+                }, this);
+            }
+        }
+        this.$fromUndo = false;
+        lastUndoRange &&
+            this.$undoSelect &&
+            !dontSelect &&
+            this.selection.setSelectionRange(lastUndoRange);
+        return lastUndoRange;
+    };
+
+    this.redoChanges = function(deltas, dontSelect) {
+        if (!deltas.length)
+            return;
+
+        this.$fromUndo = true;
+        var lastUndoRange = null;
+        for (var i = 0; i < deltas.length; i++) {
+            var delta = deltas[i];
+            if (delta.group == "doc") {
+                this.doc.applyDeltas(delta.deltas);
+                lastUndoRange =
+                    this.$getUndoSelection(delta.deltas, false, lastUndoRange);
+            }
+        }
+        this.$fromUndo = false;
+        lastUndoRange &&
+            this.$undoSelect &&
+            !dontSelect &&
+            this.selection.setSelectionRange(lastUndoRange);
+        return lastUndoRange;
+    };
+    
+    this.setUndoSelect = function(enable) {
+        this.$undoSelect = enable;
+    };
+
+    this.$getUndoSelection = function(deltas, isUndo, lastUndoRange) {
+        function isInsert(delta) {
+            var insert =
+                delta.action == "insertText" || delta.action == "insertLines";
+            return isUndo ? !insert : insert;
+        }
+
+        var delta = deltas[0];
+        var range, point;
+        var lastDeltaIsInsert = false;
+        if (isInsert(delta)) {
+            range = delta.range.clone();
+            lastDeltaIsInsert = true;
+        } else {
+            range = Range.fromPoints(delta.range.start, delta.range.start);
+            lastDeltaIsInsert = false;
+        }
+
+        for (var i = 1; i < deltas.length; i++) {
+            delta = deltas[i];
+            if (isInsert(delta)) {
+                point = delta.range.start;
+                if (range.compare(point.row, point.column) == -1) {
+                    range.setStart(delta.range.start);
+                }
+                point = delta.range.end;
+                if (range.compare(point.row, point.column) == 1) {
+                    range.setEnd(delta.range.end);
+                }
+                lastDeltaIsInsert = true;
+            } else {
+                point = delta.range.start;
+                if (range.compare(point.row, point.column) == -1) {
+                    range =
+                        Range.fromPoints(delta.range.start, delta.range.start);
+                }
+                lastDeltaIsInsert = false;
+            }
+        }
+
+        // Check if this range and the last undo range has something in common.
+        // If true, merge the ranges.
+        if (lastUndoRange != null) {
+            var cmp = lastUndoRange.compareRange(range);
+            if (cmp == 1) {
+                range.setStart(lastUndoRange.start);
+            } else if (cmp == -1) {
+                range.setEnd(lastUndoRange.end);
+            }
+        }
+
+        return range;
+    },
+
+    this.replace = function(range, text) {
+        return this.doc.replace(range, text);
+    };
+
+    /**
+     * Move a range of text from the given range to the given position.
+     *
+     * @param fromRange {Range} The range of text you want moved within the
+     * document.
+     * @param toPosition {Object} The location (row and column) where you want
+     * to move the text to.
+     * @return {Range} The new range where the text was moved to.
+     */
+    this.moveText = function(fromRange, toPosition) {
+        var text = this.getTextRange(fromRange);
+        this.remove(fromRange);
+
+        var toRow = toPosition.row;
+        var toColumn = toPosition.column;
+
+        // Make sure to update the insert location, when text is removed in
+        // front of the chosen point of insertion.
+        if (!fromRange.isMultiLine() && fromRange.start.row == toRow &&
+            fromRange.end.column < toColumn)
+            toColumn -= text.length;
+
+        if (fromRange.isMultiLine() && fromRange.end.row < toRow) {
+            var lines = this.doc.$split(text);
+            toRow -= lines.length - 1;
+        }
+
+        var endRow = toRow + fromRange.end.row - fromRange.start.row;
+        var endColumn = fromRange.isMultiLine() ?
+                        fromRange.end.column :
+                        toColumn + fromRange.end.column - fromRange.start.column;
+
+        var toRange = new Range(toRow, toColumn, endRow, endColumn);
+
+        this.insert(toRange.start, text);
+
+        return toRange;
+    };
+
+    this.indentRows = function(startRow, endRow, indentString) {
+        indentString = indentString.replace(/\t/g, this.getTabString());
+        for (var row=startRow; row<=endRow; row++)
+            this.insert({row: row, column:0}, indentString);
+    };
+
+    this.outdentRows = function (range) {
+        var rowRange = range.collapseRows();
+        var deleteRange = new Range(0, 0, 0, 0);
+        var size = this.getTabSize();
+
+        for (var i = rowRange.start.row; i <= rowRange.end.row; ++i) {
+            var line = this.getLine(i);
+
+            deleteRange.start.row = i;
+            deleteRange.end.row = i;
+            for (var j = 0; j < size; ++j)
+                if (line.charAt(j) != ' ')
+                    break;
+            if (j < size && line.charAt(j) == '\t') {
+                deleteRange.start.column = j;
+                deleteRange.end.column = j + 1;
+            } else {
+                deleteRange.start.column = 0;
+                deleteRange.end.column = j;
+            }
+            this.remove(deleteRange);
+        }
+    };
+
+    this.moveLinesUp = function(firstRow, lastRow) {
+        if (firstRow <= 0) return 0;
+
+        var removed = this.doc.removeLines(firstRow, lastRow);
+        this.doc.insertLines(firstRow - 1, removed);
+        return -1;
+    };
+
+    this.moveLinesDown = function(firstRow, lastRow) {
+        if (lastRow >= this.doc.getLength()-1) return 0;
+
+        var removed = this.doc.removeLines(firstRow, lastRow);
+        this.doc.insertLines(firstRow+1, removed);
+        return 1;
+    };
+
+    this.duplicateLines = function(firstRow, lastRow) {
+        var firstRow = this.$clipRowToDocument(firstRow);
+        var lastRow = this.$clipRowToDocument(lastRow);
+
+        var lines = this.getLines(firstRow, lastRow);
+        this.doc.insertLines(firstRow, lines);
+
+        var addedRows = lastRow - firstRow + 1;
+        return addedRows;
+    };
+
+    this.$clipRowToDocument = function(row) {
+        return Math.max(0, Math.min(row, this.doc.getLength()-1));
+    };
+
+    this.$clipColumnToRow = function(row, column) {
+        if (column < 0)
+            return 0;
+        return Math.min(this.doc.getLine(row).length, column);
+    };
+
+    this.$clipPositionToDocument = function(row, column) {
+        column = Math.max(0, column);
+
+        if (row < 0) {
+            row = 0;
+            column = 0;
+        } else {
+            var len = this.doc.getLength();
+            if (row >= len) {
+                row = len - 1;
+                column = this.doc.getLine(len-1).length;
+            } else {
+                column = Math.min(this.doc.getLine(row).length, column);
+            }
+        }
+
+        return {
+            row: row,
+            column: column
+        };
+    };
+
+    this.$clipRangeToDocument = function(range) {
+        if (range.start.row < 0) {
+            range.start.row = 0;
+            range.start.column = 0
+        } else {
+            range.start.column = this.$clipColumnToRow(
+                range.start.row,
+                range.start.column
+            );
+        }
+        
+        var len = this.doc.getLength() - 1;
+        if (range.end.row > len) {
+            range.end.row = len;
+            range.end.column = this.doc.getLine(len).length;
+        } else {
+            range.end.column = this.$clipColumnToRow(
+                range.end.row,
+                range.end.column
+            );
+        }
+        return range;
+    };
+
+    // WRAPMODE
+    this.$wrapLimit = 80;
+    this.$useWrapMode = false;
+    this.$wrapLimitRange = {
+        min : null,
+        max : null
+    };
+
+    this.setUseWrapMode = function(useWrapMode) {
+        if (useWrapMode != this.$useWrapMode) {
+            this.$useWrapMode = useWrapMode;
+            this.$modified = true;
+            this.$resetRowCache(0);
+
+            // If wrapMode is activaed, the wrapData array has to be initialized.
+            if (useWrapMode) {
+                var len = this.getLength();
+                this.$wrapData = [];
+                for (var i = 0; i < len; i++) {
+                    this.$wrapData.push([]);
+                }
+                this.$updateWrapData(0, len - 1);
+            }
+
+            this._emit("changeWrapMode");
+        }
+    };
+
+    this.getUseWrapMode = function() {
+        return this.$useWrapMode;
+    };
+
+    // Allow the wrap limit to move freely between min and max. Either
+    // parameter can be null to allow the wrap limit to be unconstrained
+    // in that direction. Or set both parameters to the same number to pin
+    // the limit to that value.
+    this.setWrapLimitRange = function(min, max) {
+        if (this.$wrapLimitRange.min !== min || this.$wrapLimitRange.max !== max) {
+            this.$wrapLimitRange.min = min;
+            this.$wrapLimitRange.max = max;
+            this.$modified = true;
+            // This will force a recalculation of the wrap limit
+            this._emit("changeWrapMode");
+        }
+    };
+
+    // This should generally only be called by the renderer when a resize
+    // is detected.
+    this.adjustWrapLimit = function(desiredLimit) {
+        var wrapLimit = this.$constrainWrapLimit(desiredLimit);
+        if (wrapLimit != this.$wrapLimit && wrapLimit > 0) {
+            this.$wrapLimit = wrapLimit;
+            this.$modified = true;
+            if (this.$useWrapMode) {
+                this.$updateWrapData(0, this.getLength() - 1);
+                this.$resetRowCache(0)
+                this._emit("changeWrapLimit");
+            }
+            return true;
+        }
+        return false;
+    };
+
+    this.$constrainWrapLimit = function(wrapLimit) {
+        var min = this.$wrapLimitRange.min;
+        if (min)
+            wrapLimit = Math.max(min, wrapLimit);
+
+        var max = this.$wrapLimitRange.max;
+        if (max)
+            wrapLimit = Math.min(max, wrapLimit);
+
+        // What would a limit of 0 even mean?
+        return Math.max(1, wrapLimit);
+    };
+
+    this.getWrapLimit = function() {
+        return this.$wrapLimit;
+    };
+
+    this.getWrapLimitRange = function() {
+        // Avoid unexpected mutation by returning a copy
+        return {
+            min : this.$wrapLimitRange.min,
+            max : this.$wrapLimitRange.max
+        };
+    };
+
+    this.$updateInternalDataOnChange = function(e) {
+        var useWrapMode = this.$useWrapMode;
+        var len;
+        var action = e.data.action;
+        var firstRow = e.data.range.start.row;
+        var lastRow = e.data.range.end.row;
+        var start = e.data.range.start;
+        var end = e.data.range.end;
+        var removedFolds = null;
+
+        if (action.indexOf("Lines") != -1) {
+            if (action == "insertLines") {
+                lastRow = firstRow + (e.data.lines.length);
+            } else {
+                lastRow = firstRow;
+            }
+            len = e.data.lines ? e.data.lines.length : lastRow - firstRow;
+        } else {
+            len = lastRow - firstRow;
+        }
+
+        if (len != 0) {
+            if (action.indexOf("remove") != -1) {
+                useWrapMode && this.$wrapData.splice(firstRow, len);
+
+                var foldLines = this.$foldData;
+                removedFolds = this.getFoldsInRange(e.data.range);
+                this.removeFolds(removedFolds);
+
+                var foldLine = this.getFoldLine(end.row);
+                var idx = 0;
+                if (foldLine) {
+                    foldLine.addRemoveChars(end.row, end.column, start.column - end.column);
+                    foldLine.shiftRow(-len);
+
+                    var foldLineBefore = this.getFoldLine(firstRow);
+                    if (foldLineBefore && foldLineBefore !== foldLine) {
+                        foldLineBefore.merge(foldLine);
+                        foldLine = foldLineBefore;
+                    }
+                    idx = foldLines.indexOf(foldLine) + 1;
+                }
+
+                for (idx; idx < foldLines.length; idx++) {
+                    var foldLine = foldLines[idx];
+                    if (foldLine.start.row >= end.row) {
+                        foldLine.shiftRow(-len);
+                    }
+                }
+
+                lastRow = firstRow;
+            } else {
+                var args;
+                if (useWrapMode) {
+                    args = [firstRow, 0];
+                    for (var i = 0; i < len; i++) args.push([]);
+                    this.$wrapData.splice.apply(this.$wrapData, args);
+                }
+
+                // If some new line is added inside of a foldLine, then split
+                // the fold line up.
+                var foldLines = this.$foldData;
+                var foldLine = this.getFoldLine(firstRow);
+                var idx = 0;
+                if (foldLine) {
+                    var cmp = foldLine.range.compareInside(start.row, start.column)
+                    // Inside of the foldLine range. Need to split stuff up.
+                    if (cmp == 0) {
+                        foldLine = foldLine.split(start.row, start.column);
+                        foldLine.shiftRow(len);
+                        foldLine.addRemoveChars(
+                            lastRow, 0, end.column - start.column);
+                    } else
+                    // Infront of the foldLine but same row. Need to shift column.
+                    if (cmp == -1) {
+                        foldLine.addRemoveChars(firstRow, 0, end.column - start.column);
+                        foldLine.shiftRow(len);
+                    }
+                    // Nothing to do if the insert is after the foldLine.
+                    idx = foldLines.indexOf(foldLine) + 1;
+                }
+
+                for (idx; idx < foldLines.length; idx++) {
+                    var foldLine = foldLines[idx];
+                    if (foldLine.start.row >= firstRow) {
+                        foldLine.shiftRow(len);
+                    }
+                }
+            }
+        } else {
+            // Realign folds. E.g. if you add some new chars before a fold, the
+            // fold should "move" to the right.
+            len = Math.abs(e.data.range.start.column - e.data.range.end.column);
+            if (action.indexOf("remove") != -1) {
+                // Get all the folds in the change range and remove them.
+                removedFolds = this.getFoldsInRange(e.data.range);
+                this.removeFolds(removedFolds);
+
+                len = -len;
+            }
+            var foldLine = this.getFoldLine(firstRow);
+            if (foldLine) {
+                foldLine.addRemoveChars(firstRow, start.column, len);
+            }
+        }
+
+        if (useWrapMode && this.$wrapData.length != this.doc.getLength()) {
+            console.error("doc.getLength() and $wrapData.length have to be the same!");
+        }
+
+        useWrapMode && this.$updateWrapData(firstRow, lastRow);
+
+        return removedFolds;
+    };
+
+    this.$updateWrapData = function(firstRow, lastRow) {
+        var lines = this.doc.getAllLines();
+        var tabSize = this.getTabSize();
+        var wrapData = this.$wrapData;
+        var wrapLimit = this.$wrapLimit;
+        var tokens;
+        var foldLine;
+
+        var row = firstRow;
+        lastRow = Math.min(lastRow, lines.length - 1);
+        while (row <= lastRow) {
+            foldLine = this.getFoldLine(row, foldLine);
+            if (!foldLine) {
+                tokens = this.$getDisplayTokens(lang.stringTrimRight(lines[row]));
+                wrapData[row] = this.$computeWrapSplits(tokens, wrapLimit, tabSize);
+                row ++;
+            } else {
+                tokens = [];
+                foldLine.walk(
+                    function(placeholder, row, column, lastColumn) {
+                        var walkTokens;
+                        if (placeholder) {
+                            walkTokens = this.$getDisplayTokens(
+                                            placeholder, tokens.length);
+                            walkTokens[0] = PLACEHOLDER_START;
+                            for (var i = 1; i < walkTokens.length; i++) {
+                                walkTokens[i] = PLACEHOLDER_BODY;
+                            }
+                        } else {
+                            walkTokens = this.$getDisplayTokens(
+                                lines[row].substring(lastColumn, column),
+                                tokens.length);
+                        }
+                        tokens = tokens.concat(walkTokens);
+                    }.bind(this),
+                    foldLine.end.row,
+                    lines[foldLine.end.row].length + 1
+                );
+                // Remove spaces/tabs from the back of the token array.
+                while (tokens.length != 0 && tokens[tokens.length - 1] >= SPACE)
+                    tokens.pop();
+
+                wrapData[foldLine.start.row]
+                    = this.$computeWrapSplits(tokens, wrapLimit, tabSize);
+                row = foldLine.end.row + 1;
+            }
+        }
+    };
+
+    // "Tokens"
+    var CHAR = 1,
+        CHAR_EXT = 2,
+        PLACEHOLDER_START = 3,
+        PLACEHOLDER_BODY =  4,
+        PUNCTUATION = 9,
+        SPACE = 10,
+        TAB = 11,
+        TAB_SPACE = 12;
+
+    this.$computeWrapSplits = function(tokens, wrapLimit) {
+        if (tokens.length == 0) {
+            return [];
+        }
+
+        var splits = [];
+        var displayLength = tokens.length;
+        var lastSplit = 0, lastDocSplit = 0;
+
+        function addSplit(screenPos) {
+            var displayed = tokens.slice(lastSplit, screenPos);
+
+            // The document size is the current size - the extra width for tabs
+            // and multipleWidth characters.
+            var len = displayed.length;
+            displayed.join("").
+                // Get all the TAB_SPACEs.
+                replace(/12/g, function() {
+                    len -= 1;
+                }).
+                // Get all the CHAR_EXT/multipleWidth characters.
+                replace(/2/g, function() {
+                    len -= 1;
+                });
+
+            lastDocSplit += len;
+            splits.push(lastDocSplit);
+            lastSplit = screenPos;
+        }
+
+        while (displayLength - lastSplit > wrapLimit) {
+            // This is, where the split should be.
+            var split = lastSplit + wrapLimit;
+
+            // If there is a space or tab at this split position, then making
+            // a split is simple.
+            if (tokens[split] >= SPACE) {
+                // Include all following spaces + tabs in this split as well.
+                while (tokens[split] >= SPACE) {
+                    split ++;
+                }
+                addSplit(split);
+                continue;
+            }
+
+            // === ELSE ===
+            // Check if split is inside of a placeholder. Placeholder are
+            // not splitable. Therefore, seek the beginning of the placeholder
+            // and try to place the split beofre the placeholder's start.
+            if (tokens[split] == PLACEHOLDER_START
+                || tokens[split] == PLACEHOLDER_BODY)
+            {
+                // Seek the start of the placeholder and do the split
+                // before the placeholder. By definition there always
+                // a PLACEHOLDER_START between split and lastSplit.
+                for (split; split != lastSplit - 1; split--) {
+                    if (tokens[split] == PLACEHOLDER_START) {
+                        // split++; << No incremental here as we want to
+                        //  have the position before the Placeholder.
+                        break;
+                    }
+                }
+
+                // If the PLACEHOLDER_START is not the index of the
+                // last split, then we can do the split
+                if (split > lastSplit) {
+                    addSplit(split);
+                    continue;
+                }
+
+                // If the PLACEHOLDER_START IS the index of the last
+                // split, then we have to place the split after the
+                // placeholder. So, let's seek for the end of the placeholder.
+                split = lastSplit + wrapLimit;
+                for (split; split < tokens.length; split++) {
+                    if (tokens[split] != PLACEHOLDER_BODY)
+                    {
+                        break;
+                    }
+                }
+
+                // If spilt == tokens.length, then the placeholder is the last
+                // thing in the line and adding a new split doesn't make sense.
+                if (split == tokens.length) {
+                    break;  // Breaks the while-loop.
+                }
+
+                // Finally, add the split...
+                addSplit(split);
+                continue;
+            }
+
+            // === ELSE ===
+            // Search for the first non space/tab/placeholder/punctuation token backwards.
+            var minSplit = Math.max(split - 10, lastSplit - 1);
+            while (split > minSplit && tokens[split] < PLACEHOLDER_START) {
+                split --;
+            }
+            while (split > minSplit && tokens[split] == PUNCTUATION) {
+                split --;
+            }
+            // If we found one, then add the split.
+            if (split > minSplit) {
+                addSplit(++split);
+                continue;
+            }
+
+            // === ELSE ===
+            split = lastSplit + wrapLimit;
+            // The split is inside of a CHAR or CHAR_EXT token and no space
+            // around -> force a split.
+            addSplit(split);
+        }
+        return splits;
+    }
+
+    /**
+     * @param
+     *   offset: The offset in screenColumn at which position str starts.
+     *           Important for calculating the realTabSize.
+     */
+    this.$getDisplayTokens = function(str, offset) {
+        var arr = [];
+        var tabSize;
+        offset = offset || 0;
+
+        for (var i = 0; i < str.length; i++) {
+            var c = str.charCodeAt(i);
+            // Tab
+            if (c == 9) {
+                tabSize = this.getScreenTabSize(arr.length + offset);
+                arr.push(TAB);
+                for (var n = 1; n < tabSize; n++) {
+                    arr.push(TAB_SPACE);
+                }
+            }
+            // Space
+            else if (c == 32) {
+                arr.push(SPACE);
+            } else if((c > 39 && c < 48) || (c > 57 && c < 64)) {
+                arr.push(PUNCTUATION);
+            }
+            // full width characters
+            else if (c >= 0x1100 && isFullWidth(c)) {
+                arr.push(CHAR, CHAR_EXT);
+            } else {
+                arr.push(CHAR);
+            }
+        }
+        return arr;
+    }
+
+    /**
+     * Calculates the width of the a string on the screen while assuming that
+     * the string starts at the first column on the screen.
+     *
+     * @param string str String to calculate the screen width of
+     * @return array
+     *      [0]: number of columns for str on screen.
+     *      [1]: docColumn position that was read until (useful with screenColumn)
+     */
+    this.$getStringScreenWidth = function(str, maxScreenColumn, screenColumn) {
+        if (maxScreenColumn == 0) {
+            return [0, 0];
+        }
+        if (maxScreenColumn == null) {
+            maxScreenColumn = screenColumn +
+                str.length * Math.max(this.getTabSize(), 2);
+        }
+        screenColumn = screenColumn || 0;
+
+        var c, column;
+        for (column = 0; column < str.length; column++) {
+            c = str.charCodeAt(column);
+            // tab
+            if (c == 9) {
+                screenColumn += this.getScreenTabSize(screenColumn);
+            }
+            // full width characters
+            else if (c >= 0x1100 && isFullWidth(c)) {
+                screenColumn += 2;
+            } else {
+                screenColumn += 1;
+            }
+            if (screenColumn > maxScreenColumn) {
+                break
+            }
+        }
+
+        return [screenColumn, column];
+    }
+
+    /**
+     * Returns the number of rows required to render this row on the screen
+     */
+    this.getRowLength = function(row) {
+        if (!this.$useWrapMode || !this.$wrapData[row]) {
+            return 1;
+        } else {
+            return this.$wrapData[row].length + 1;
+        }
+    }
+
+    /**
+     * Returns the height in pixels required to render this row on the screen
+     **/
+    this.getRowHeight = function(config, row) {
+        return this.getRowLength(row) * config.lineHeight;
+    }
+
+    this.getScreenLastRowColumn = function(screenRow) {
+        //return this.screenToDocumentColumn(screenRow, Number.MAX_VALUE / 10)
+        return this.documentToScreenColumn(screenRow, this.doc.getLine(screenRow).length);
+    };
+
+    this.getDocumentLastRowColumn = function(docRow, docColumn) {
+        var screenRow = this.documentToScreenRow(docRow, docColumn);
+        return this.getScreenLastRowColumn(screenRow);
+    };
+
+    this.getDocumentLastRowColumnPosition = function(docRow, docColumn) {
+        var screenRow = this.documentToScreenRow(docRow, docColumn);
+        return this.screenToDocumentPosition(screenRow, Number.MAX_VALUE / 10);
+    };
+
+    this.getRowSplitData = function(row) {
+        if (!this.$useWrapMode) {
+            return undefined;
+        } else {
+            return this.$wrapData[row];
+        }
+    };
+
+    /**
+     * Returns the width of a tab character at screenColumn.
+     */
+    this.getScreenTabSize = function(screenColumn) {
+        return this.$tabSize - screenColumn % this.$tabSize;
+    };
+
+    this.screenToDocumentRow = function(screenRow, screenColumn) {
+        return this.screenToDocumentPosition(screenRow, screenColumn).row;
+    };
+
+    this.screenToDocumentColumn = function(screenRow, screenColumn) {
+        return this.screenToDocumentPosition(screenRow, screenColumn).column;
+    };
+
+    this.screenToDocumentPosition = function(screenRow, screenColumn) {
+        if (screenRow < 0) {
+            return {
+                row: 0,
+                column: 0
+            }
+        }
+
+        var line;
+        var docRow = 0;
+        var docColumn = 0;
+        var column;
+        var row = 0;
+        var rowLength = 0;
+
+        var rowCache = this.$rowCache;
+        for (var i = 0; i < rowCache.length; i++) {
+            if (rowCache[i].screenRow < screenRow) {
+                row = rowCache[i].screenRow;
+                docRow = rowCache[i].docRow;
+            }
+            else {
+                break;
+            }
+        }
+        var doCache = !rowCache.length || i == rowCache.length;
+
+        var maxRow = this.getLength() - 1;
+        var foldLine = this.getNextFoldLine(docRow);
+        var foldStart = foldLine ? foldLine.start.row : Infinity;
+
+        while (row <= screenRow) {
+            rowLength = this.getRowLength(docRow);
+            if (row + rowLength - 1 >= screenRow || docRow >= maxRow) {
+                break;
+            } else {
+                row += rowLength;
+                docRow++;
+                if (docRow > foldStart) {
+                    docRow = foldLine.end.row+1;
+                    foldLine = this.getNextFoldLine(docRow, foldLine);
+                    foldStart = foldLine ? foldLine.start.row : Infinity;
+                }
+            }
+            if (doCache) {
+                rowCache.push({
+                    docRow: docRow,
+                    screenRow: row
+                });
+            }
+        }
+
+        if (foldLine && foldLine.start.row <= docRow) {
+            line = this.getFoldDisplayLine(foldLine);
+            docRow = foldLine.start.row;
+        } else if (row + rowLength <= screenRow || docRow > maxRow) {
+            // clip at the end of the document
+            return {
+                row: maxRow,
+                column: this.getLine(maxRow).length
+            }
+        } else {
+            line = this.getLine(docRow);
+            foldLine = null;
+        }
+
+        if (this.$useWrapMode) {
+            var splits = this.$wrapData[docRow];
+            if (splits) {
+                column = splits[screenRow - row];
+                if(screenRow > row && splits.length) {
+                    docColumn = splits[screenRow - row - 1] || splits[splits.length - 1];
+                    line = line.substring(docColumn);
+                }
+            }
+        }
+
+        docColumn += this.$getStringScreenWidth(line, screenColumn)[1];
+
+        // Need to do some clamping action here.
+        if (this.$useWrapMode) {
+            if (docColumn >= column) {
+                // We remove one character at the end such that the docColumn
+                // position returned is not associated to the next row on the
+                // screen.
+                docColumn = column - 1;
+            }
+        } else {
+            docColumn = Math.min(docColumn, line.length);
+        }
+
+        if (foldLine) {
+            return foldLine.idxToPosition(docColumn);
+        }
+
+        return {
+            row: docRow,
+            column: docColumn
+        }
+    };
+
+    this.documentToScreenPosition = function(docRow, docColumn) {
+        // Normalize the passed in arguments.
+        if (typeof docColumn === "undefined")
+            var pos = this.$clipPositionToDocument(docRow.row, docRow.column);
+        else
+            pos = this.$clipPositionToDocument(docRow, docColumn);
+
+        docRow = pos.row;
+        docColumn = pos.column;
+
+        var wrapData;
+        // Special case in wrapMode if the doc is at the end of the document.
+        if (this.$useWrapMode) {
+            wrapData = this.$wrapData;
+            if (docRow > wrapData.length - 1) {
+                return {
+                    row: this.getScreenLength(),
+                    column: wrapData.length == 0
+                        ? 0
+                        : (wrapData[wrapData.length - 1].length - 1)
+                };
+            }
+        }
+
+        var screenRow = 0;
+        var foldStartRow = null;
+        var fold = null;
+
+        // Clamp the docRow position in case it's inside of a folded block.
+        fold = this.getFoldAt(docRow, docColumn, 1);
+        if (fold) {
+            docRow = fold.start.row;
+            docColumn = fold.start.column;
+        }
+
+        var rowEnd, row = 0;
+        var rowCache = this.$rowCache;
+
+        for (var i = 0; i < rowCache.length; i++) {
+            if (rowCache[i].docRow < docRow) {
+                screenRow = rowCache[i].screenRow;
+                row = rowCache[i].docRow;
+            } else {
+                break;
+            }
+        }
+        var doCache = !rowCache.length || i == rowCache.length;
+
+        var foldLine = this.getNextFoldLine(row);
+        var foldStart = foldLine ?foldLine.start.row :Infinity;
+
+        while (row < docRow) {
+            if (row >= foldStart) {
+                rowEnd = foldLine.end.row + 1;
+                if (rowEnd > docRow)
+                    break;
+                foldLine = this.getNextFoldLine(rowEnd, foldLine);
+                foldStart = foldLine ?foldLine.start.row :Infinity;
+            }
+            else {
+                rowEnd = row + 1;
+            }
+
+            screenRow += this.getRowLength(row);
+            row = rowEnd;
+
+            if (doCache) {
+                rowCache.push({
+                    docRow: row,
+                    screenRow: screenRow
+                });
+            }
+        }
+
+        // Calculate the text line that is displayed in docRow on the screen.
+        var textLine = "";
+        // Check if the final row we want to reach is inside of a fold.
+        if (foldLine && row >= foldStart) {
+            textLine = this.getFoldDisplayLine(foldLine, docRow, docColumn);
+            foldStartRow = foldLine.start.row;
+        } else {
+            textLine = this.getLine(docRow).substring(0, docColumn);
+            foldStartRow = docRow;
+        }
+        // Clamp textLine if in wrapMode.
+        if (this.$useWrapMode) {
+            var wrapRow = wrapData[foldStartRow];
+            var screenRowOffset = 0;
+            while (textLine.length >= wrapRow[screenRowOffset]) {
+                screenRow ++;
+                screenRowOffset++;
+            }
+            textLine = textLine.substring(
+                wrapRow[screenRowOffset - 1] || 0, textLine.length
+            );
+        }
+
+        return {
+            row: screenRow,
+            column: this.$getStringScreenWidth(textLine)[0]
+        };
+    };
+
+    this.documentToScreenColumn = function(row, docColumn) {
+        return this.documentToScreenPosition(row, docColumn).column;
+    };
+
+    this.documentToScreenRow = function(docRow, docColumn) {
+        return this.documentToScreenPosition(docRow, docColumn).row;
+    };
+
+    this.getScreenLength = function() {
+        var screenRows = 0;
+        var fold = null;
+        if (!this.$useWrapMode) {
+            screenRows = this.getLength();
+
+            // Remove the folded lines again.
+            var foldData = this.$foldData;
+            for (var i = 0; i < foldData.length; i++) {
+                fold = foldData[i];
+                screenRows -= fold.end.row - fold.start.row;
+            }
+        } else {
+            var lastRow = this.$wrapData.length;
+            var row = 0, i = 0;
+            var fold = this.$foldData[i++];
+            var foldStart = fold ? fold.start.row :Infinity;
+
+            while (row < lastRow) {
+                screenRows += this.$wrapData[row].length + 1;
+                row ++;
+                if (row > foldStart) {
+                    row = fold.end.row+1;
+                    fold = this.$foldData[i++];
+                    foldStart = fold ?fold.start.row :Infinity;
+                }
+            }
+        }
+
+        return screenRows;
+    }
+
+    // For every keystroke this gets called once per char in the whole doc!!
+    // Wouldn't hurt to make it a bit faster for c >= 0x1100
+    function isFullWidth(c) {
+        if (c < 0x1100)
+            return false;
+        return c >= 0x1100 && c <= 0x115F ||
+               c >= 0x11A3 && c <= 0x11A7 ||
+               c >= 0x11FA && c <= 0x11FF ||
+               c >= 0x2329 && c <= 0x232A ||
+               c >= 0x2E80 && c <= 0x2E99 ||
+               c >= 0x2E9B && c <= 0x2EF3 ||
+               c >= 0x2F00 && c <= 0x2FD5 ||
+               c >= 0x2FF0 && c <= 0x2FFB ||
+               c >= 0x3000 && c <= 0x303E ||
+               c >= 0x3041 && c <= 0x3096 ||
+               c >= 0x3099 && c <= 0x30FF ||
+               c >= 0x3105 && c <= 0x312D ||
+               c >= 0x3131 && c <= 0x318E ||
+               c >= 0x3190 && c <= 0x31BA ||
+               c >= 0x31C0 && c <= 0x31E3 ||
+               c >= 0x31F0 && c <= 0x321E ||
+               c >= 0x3220 && c <= 0x3247 ||
+               c >= 0x3250 && c <= 0x32FE ||
+               c >= 0x3300 && c <= 0x4DBF ||
+               c >= 0x4E00 && c <= 0xA48C ||
+               c >= 0xA490 && c <= 0xA4C6 ||
+               c >= 0xA960 && c <= 0xA97C ||
+               c >= 0xAC00 && c <= 0xD7A3 ||
+               c >= 0xD7B0 && c <= 0xD7C6 ||
+               c >= 0xD7CB && c <= 0xD7FB ||
+               c >= 0xF900 && c <= 0xFAFF ||
+               c >= 0xFE10 && c <= 0xFE19 ||
+               c >= 0xFE30 && c <= 0xFE52 ||
+               c >= 0xFE54 && c <= 0xFE66 ||
+               c >= 0xFE68 && c <= 0xFE6B ||
+               c >= 0xFF01 && c <= 0xFF60 ||
+               c >= 0xFFE0 && c <= 0xFFE6;
+    };
+
+}).call(EditSession.prototype);
+
+require("./edit_session/folding").Folding.call(EditSession.prototype);
+require("./edit_session/bracket_match").BracketMatch.call(EditSession.prototype);
+
+exports.EditSession = EditSession;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Julian Viereck <julian.viereck@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/selection', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/lib/event_emitter', 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var oop = require("./lib/oop");
+var lang = require("./lib/lang");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+var Range = require("./range").Range;
+
+/**
+ * Keeps cursor position and the text selection of an edit session.
+ *
+ * The row/columns used in the selection are in document coordinates
+ * representing ths coordinates as thez appear in the document
+ * before applying soft wrap and folding.
+ */
+var Selection = function(session) {
+    this.session = session;
+    this.doc = session.getDocument();
+
+    this.clearSelection();
+    this.selectionLead = this.doc.createAnchor(0, 0);
+    this.selectionAnchor = this.doc.createAnchor(0, 0);
+
+    var _self = this;
+    this.selectionLead.on("change", function(e) {
+        _self._emit("changeCursor");
+        if (!_self.$isEmpty)
+            _self._emit("changeSelection");
+        if (!_self.$preventUpdateDesiredColumnOnChange && e.old.column != e.value.column)
+            _self.$updateDesiredColumn();
+    });
+
+    this.selectionAnchor.on("change", function() {
+        if (!_self.$isEmpty)
+            _self._emit("changeSelection");
+    });
+};
+
+(function() {
+
+    oop.implement(this, EventEmitter);
+
+    this.isEmpty = function() {
+        return (this.$isEmpty || (
+            this.selectionAnchor.row == this.selectionLead.row &&
+            this.selectionAnchor.column == this.selectionLead.column
+        ));
+    };
+
+    this.isMultiLine = function() {
+        if (this.isEmpty()) {
+            return false;
+        }
+
+        return this.getRange().isMultiLine();
+    };
+
+    this.getCursor = function() {
+        return this.selectionLead.getPosition();
+    };
+
+    this.setSelectionAnchor = function(row, column) {
+        this.selectionAnchor.setPosition(row, column);
+
+        if (this.$isEmpty) {
+            this.$isEmpty = false;
+            this._emit("changeSelection");
+        }
+    };
+
+    this.getSelectionAnchor = function() {
+        if (this.$isEmpty)
+            return this.getSelectionLead()
+        else
+            return this.selectionAnchor.getPosition();
+    };
+
+    this.getSelectionLead = function() {
+        return this.selectionLead.getPosition();
+    };
+
+    this.shiftSelection = function(columns) {
+        if (this.$isEmpty) {
+            this.moveCursorTo(this.selectionLead.row, this.selectionLead.column + columns);
+            return;
+        };
+
+        var anchor = this.getSelectionAnchor();
+        var lead = this.getSelectionLead();
+
+        var isBackwards = this.isBackwards();
+
+        if (!isBackwards || anchor.column !== 0)
+            this.setSelectionAnchor(anchor.row, anchor.column + columns);
+
+        if (isBackwards || lead.column !== 0) {
+            this.$moveSelection(function() {
+                this.moveCursorTo(lead.row, lead.column + columns);
+            });
+        }
+    };
+
+    this.isBackwards = function() {
+        var anchor = this.selectionAnchor;
+        var lead = this.selectionLead;
+        return (anchor.row > lead.row || (anchor.row == lead.row && anchor.column > lead.column));
+    };
+
+    this.getRange = function() {
+        var anchor = this.selectionAnchor;
+        var lead = this.selectionLead;
+
+        if (this.isEmpty())
+            return Range.fromPoints(lead, lead);
+
+        if (this.isBackwards()) {
+            return Range.fromPoints(lead, anchor);
+        }
+        else {
+            return Range.fromPoints(anchor, lead);
+        }
+    };
+
+    this.clearSelection = function() {
+        if (!this.$isEmpty) {
+            this.$isEmpty = true;
+            this._emit("changeSelection");
+        }
+    };
+
+    this.selectAll = function() {
+        var lastRow = this.doc.getLength() - 1;
+        this.setSelectionAnchor(lastRow, this.doc.getLine(lastRow).length);
+        this.moveCursorTo(0, 0);
+    };
+
+    this.setSelectionRange = function(range, reverse) {
+        if (reverse) {
+            this.setSelectionAnchor(range.end.row, range.end.column);
+            this.selectTo(range.start.row, range.start.column);
+        } else {
+            this.setSelectionAnchor(range.start.row, range.start.column);
+            this.selectTo(range.end.row, range.end.column);
+        }
+        this.$updateDesiredColumn();
+    };
+
+    this.$updateDesiredColumn = function() {
+        var cursor = this.getCursor();
+        this.$desiredColumn = this.session.documentToScreenColumn(cursor.row, cursor.column);
+    };
+
+    this.$moveSelection = function(mover) {
+        var lead = this.selectionLead;
+        if (this.$isEmpty)
+            this.setSelectionAnchor(lead.row, lead.column);
+
+        mover.call(this);
+    };
+
+    this.selectTo = function(row, column) {
+        this.$moveSelection(function() {
+            this.moveCursorTo(row, column);
+        });
+    };
+
+    this.selectToPosition = function(pos) {
+        this.$moveSelection(function() {
+            this.moveCursorToPosition(pos);
+        });
+    };
+
+    this.selectUp = function() {
+        this.$moveSelection(this.moveCursorUp);
+    };
+
+    this.selectDown = function() {
+        this.$moveSelection(this.moveCursorDown);
+    };
+
+    this.selectRight = function() {
+        this.$moveSelection(this.moveCursorRight);
+    };
+
+    this.selectLeft = function() {
+        this.$moveSelection(this.moveCursorLeft);
+    };
+
+    this.selectLineStart = function() {
+        this.$moveSelection(this.moveCursorLineStart);
+    };
+
+    this.selectLineEnd = function() {
+        this.$moveSelection(this.moveCursorLineEnd);
+    };
+
+    this.selectFileEnd = function() {
+        this.$moveSelection(this.moveCursorFileEnd);
+    };
+
+    this.selectFileStart = function() {
+        this.$moveSelection(this.moveCursorFileStart);
+    };
+
+    this.selectWordRight = function() {
+        this.$moveSelection(this.moveCursorWordRight);
+    };
+
+    this.selectWordLeft = function() {
+        this.$moveSelection(this.moveCursorWordLeft);
+    };
+
+    this.selectWord = function() {
+        var cursor = this.getCursor();
+        var range  = this.session.getWordRange(cursor.row, cursor.column);
+        this.setSelectionRange(range);
+    };
+
+    // Selects a word including its right whitespace
+    this.selectAWord = function() {
+        var cursor = this.getCursor();
+        var range = this.session.getAWordRange(cursor.row, cursor.column);
+        this.setSelectionRange(range);
+    };
+
+    this.selectLine = function() {
+        var rowStart = this.selectionLead.row;
+        var rowEnd;
+
+        var foldLine = this.session.getFoldLine(rowStart);
+        if (foldLine) {
+            rowStart = foldLine.start.row;
+            rowEnd = foldLine.end.row;
+        } else {
+            rowEnd = rowStart;
+        }
+        this.setSelectionAnchor(rowStart, 0);
+        this.$moveSelection(function() {
+            this.moveCursorTo(rowEnd + 1, 0);
+        });
+    };
+
+    this.moveCursorUp = function() {
+        this.moveCursorBy(-1, 0);
+    };
+
+    this.moveCursorDown = function() {
+        this.moveCursorBy(1, 0);
+    };
+
+    this.moveCursorLeft = function() {
+        var cursor = this.selectionLead.getPosition(),
+            fold;
+
+        if (fold = this.session.getFoldAt(cursor.row, cursor.column, -1)) {
+            this.moveCursorTo(fold.start.row, fold.start.column);
+        } else if (cursor.column == 0) {
+            // cursor is a line (start
+            if (cursor.row > 0) {
+                this.moveCursorTo(cursor.row - 1, this.doc.getLine(cursor.row - 1).length);
+            }
+        }
+        else {
+            var tabSize = this.session.getTabSize();
+            if (this.session.isTabStop(cursor) && this.doc.getLine(cursor.row).slice(cursor.column-tabSize, cursor.column).split(" ").length-1 == tabSize)
+                this.moveCursorBy(0, -tabSize);
+            else
+                this.moveCursorBy(0, -1);
+        }
+    };
+
+    this.moveCursorRight = function() {
+        var cursor = this.selectionLead.getPosition(),
+            fold;
+        if (fold = this.session.getFoldAt(cursor.row, cursor.column, 1)) {
+            this.moveCursorTo(fold.end.row, fold.end.column);
+        }
+        else if (this.selectionLead.column == this.doc.getLine(this.selectionLead.row).length) {
+            if (this.selectionLead.row < this.doc.getLength() - 1) {
+                this.moveCursorTo(this.selectionLead.row + 1, 0);
+            }
+        }
+        else {
+            var tabSize = this.session.getTabSize();
+            var cursor = this.selectionLead;
+            if (this.session.isTabStop(cursor) && this.doc.getLine(cursor.row).slice(cursor.column, cursor.column+tabSize).split(" ").length-1 == tabSize)
+                this.moveCursorBy(0, tabSize);
+            else
+                this.moveCursorBy(0, 1);
+        }
+    };
+
+    this.moveCursorLineStart = function() {
+        var row = this.selectionLead.row;
+        var column = this.selectionLead.column;
+        var screenRow = this.session.documentToScreenRow(row, column);
+
+        // Determ the doc-position of the first character at the screen line.
+        var firstColumnPosition = this.session.screenToDocumentPosition(screenRow, 0);
+
+        // Determ the line
+        var beforeCursor = this.session.getDisplayLine(
+            row, null,
+            firstColumnPosition.row, firstColumnPosition.column
+        );
+
+        var leadingSpace = beforeCursor.match(/^\s*/);
+        if (leadingSpace[0].length == column) {
+            this.moveCursorTo(
+                firstColumnPosition.row, firstColumnPosition.column
+            );
+        }
+        else {
+            this.moveCursorTo(
+                firstColumnPosition.row,
+                firstColumnPosition.column + leadingSpace[0].length
+            );
+        }
+    };
+
+    this.moveCursorLineEnd = function() {
+        var lead = this.selectionLead;
+        var lastRowColumnPosition =
+            this.session.getDocumentLastRowColumnPosition(lead.row, lead.column);
+        this.moveCursorTo(
+            lastRowColumnPosition.row,
+            lastRowColumnPosition.column
+        );
+    };
+
+    this.moveCursorFileEnd = function() {
+        var row = this.doc.getLength() - 1;
+        var column = this.doc.getLine(row).length;
+        this.moveCursorTo(row, column);
+    };
+
+    this.moveCursorFileStart = function() {
+        this.moveCursorTo(0, 0);
+    };
+
+    this.moveCursorWordRight = function() {
+        var row = this.selectionLead.row;
+        var column = this.selectionLead.column;
+        var line = this.doc.getLine(row);
+        var rightOfCursor = line.substring(column);
+
+        var match;
+        this.session.nonTokenRe.lastIndex = 0;
+        this.session.tokenRe.lastIndex = 0;
+
+        // skip folds
+        var fold = this.session.getFoldAt(row, column, 1);
+        if (fold) {
+            this.moveCursorTo(fold.end.row, fold.end.column);
+            return;
+        }
+        
+        // first skip space
+        if (match = this.session.nonTokenRe.exec(rightOfCursor)) {
+            column += this.session.nonTokenRe.lastIndex;
+            this.session.nonTokenRe.lastIndex = 0;
+            rightOfCursor = line.substring(column);
+        }
+        
+        // if at line end proceed with next line
+        if (column >= line.length) {
+            this.moveCursorTo(row, line.length);
+            this.moveCursorRight();
+            if (row < this.doc.getLength() - 1)
+                this.moveCursorWordRight();
+            return;
+        }
+        
+        // advance to the end of the next token
+        if (match = this.session.tokenRe.exec(rightOfCursor)) {
+            column += this.session.tokenRe.lastIndex;
+            this.session.tokenRe.lastIndex = 0;
+        }
+
+        this.moveCursorTo(row, column);
+    };
+
+    this.moveCursorWordLeft = function() {
+        var row = this.selectionLead.row;
+        var column = this.selectionLead.column;
+
+        // skip folds
+        var fold;
+        if (fold = this.session.getFoldAt(row, column, -1)) {
+            this.moveCursorTo(fold.start.row, fold.start.column);
+            return;
+        }
+
+        var str = this.session.getFoldStringAt(row, column, -1);
+        if (str == null) {
+            str = this.doc.getLine(row).substring(0, column)
+        }
+        
+        var leftOfCursor = lang.stringReverse(str);
+        var match;
+        this.session.nonTokenRe.lastIndex = 0;
+        this.session.tokenRe.lastIndex = 0;
+        
+        // skip whitespace
+        if (match = this.session.nonTokenRe.exec(leftOfCursor)) {
+            column -= this.session.nonTokenRe.lastIndex;
+            leftOfCursor = leftOfCursor.slice(this.session.nonTokenRe.lastIndex);
+            this.session.nonTokenRe.lastIndex = 0;
+        }
+        
+        // if at begin of the line proceed in line above
+        if (column <= 0) {
+            this.moveCursorTo(row, 0);
+            this.moveCursorLeft();
+            if (row > 0)
+                this.moveCursorWordLeft();
+            return;
+        }
+
+        // move to the begin of the word
+        if (match = this.session.tokenRe.exec(leftOfCursor)) {
+            column -= this.session.tokenRe.lastIndex;
+            this.session.tokenRe.lastIndex = 0;
+        }
+
+        this.moveCursorTo(row, column);
+    };
+
+    this.moveCursorBy = function(rows, chars) {
+        var screenPos = this.session.documentToScreenPosition(
+            this.selectionLead.row,
+            this.selectionLead.column
+        );
+
+        var screenCol = (chars === 0 && this.$desiredColumn) || screenPos.column;
+        var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenCol);
+
+        // move the cursor and update the desired column
+        this.moveCursorTo(docPos.row, docPos.column + chars, chars === 0);
+    };
+
+    this.moveCursorToPosition = function(position) {
+        this.moveCursorTo(position.row, position.column);
+    };
+
+    this.moveCursorTo = function(row, column, preventUpdateDesiredColumn) {
+        // Ensure the row/column is not inside of a fold.
+        var fold = this.session.getFoldAt(row, column, 1);
+        if (fold) {
+            row = fold.start.row;
+            column = fold.start.column;
+        }
+
+        this.$preventUpdateDesiredColumnOnChange = true;
+        this.selectionLead.setPosition(row, column);
+        this.$preventUpdateDesiredColumnOnChange = false;
+
+        if (!preventUpdateDesiredColumn)
+            this.$updateDesiredColumn(this.selectionLead.column);
+    };
+
+    this.moveCursorToScreen = function(row, column, preventUpdateDesiredColumn) {
+        var pos = this.session.screenToDocumentPosition(row, column);
+        row = pos.row;
+        column = pos.column;
+        this.moveCursorTo(row, column, preventUpdateDesiredColumn);
+    };
+
+}).call(Selection.prototype);
+
+exports.Selection = Selection;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/range', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+var Range = function(startRow, startColumn, endRow, endColumn) {
+    this.start = {
+        row: startRow,
+        column: startColumn
+    };
+
+    this.end = {
+        row: endRow,
+        column: endColumn
+    };
+};
+
+(function() {
+    this.isEequal = function(range) {
+        return this.start.row == range.start.row &&
+            this.end.row == range.end.row &&
+            this.start.column == range.start.column &&
+            this.end.column == range.end.column
+    };
+
+    this.toString = function() {
+        return ("Range: [" + this.start.row + "/" + this.start.column +
+            "] -> [" + this.end.row + "/" + this.end.column + "]");
+    };
+
+    this.contains = function(row, column) {
+        return this.compare(row, column) == 0;
+    };
+
+    /**
+     * Compares this range (A) with another range (B), where B is the passed in
+     * range.
+     *
+     * Return values:
+     *  -2: (B) is infront of (A) and doesn't intersect with (A)
+     *  -1: (B) begins before (A) but ends inside of (A)
+     *   0: (B) is completly inside of (A) OR (A) is complety inside of (B)
+     *  +1: (B) begins inside of (A) but ends outside of (A)
+     *  +2: (B) is after (A) and doesn't intersect with (A)
+     *
+     *  42: FTW state: (B) ends in (A) but starts outside of (A)
+     */
+    this.compareRange = function(range) {
+        var cmp,
+            end = range.end,
+            start = range.start;
+
+        cmp = this.compare(end.row, end.column);
+        if (cmp == 1) {
+            cmp = this.compare(start.row, start.column);
+            if (cmp == 1) {
+                return 2;
+            } else if (cmp == 0) {
+                return 1;
+            } else {
+                return 0;
+            }
+        } else if (cmp == -1) {
+            return -2;
+        } else {
+            cmp = this.compare(start.row, start.column);
+            if (cmp == -1) {
+                return -1;
+            } else if (cmp == 1) {
+                return 42;
+            } else {
+                return 0;
+            }
+        }
+    }
+
+    this.comparePoint = function(p) {
+        return this.compare(p.row, p.column);
+    }
+
+    this.containsRange = function(range) {
+        return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
+    }
+
+    this.isEnd = function(row, column) {
+        return this.end.row == row && this.end.column == column;
+    }
+
+    this.isStart = function(row, column) {
+        return this.start.row == row && this.start.column == column;
+    }
+
+    this.setStart = function(row, column) {
+        if (typeof row == "object") {
+            this.start.column = row.column;
+            this.start.row = row.row;
+        } else {
+            this.start.row = row;
+            this.start.column = column;
+        }
+    }
+
+    this.setEnd = function(row, column) {
+        if (typeof row == "object") {
+            this.end.column = row.column;
+            this.end.row = row.row;
+        } else {
+            this.end.row = row;
+            this.end.column = column;
+        }
+    }
+
+    this.inside = function(row, column) {
+        if (this.compare(row, column) == 0) {
+            if (this.isEnd(row, column) || this.isStart(row, column)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    this.insideStart = function(row, column) {
+        if (this.compare(row, column) == 0) {
+            if (this.isEnd(row, column)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    this.insideEnd = function(row, column) {
+        if (this.compare(row, column) == 0) {
+            if (this.isStart(row, column)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    this.compare = function(row, column) {
+        if (!this.isMultiLine()) {
+            if (row === this.start.row) {
+                return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0);
+            };
+        }
+
+        if (row < this.start.row)
+            return -1;
+
+        if (row > this.end.row)
+            return 1;
+
+        if (this.start.row === row)
+            return column >= this.start.column ? 0 : -1;
+
+        if (this.end.row === row)
+            return column <= this.end.column ? 0 : 1;
+
+        return 0;
+    };
+
+    /**
+     * Like .compare(), but if isStart is true, return -1;
+     */
+    this.compareStart = function(row, column) {
+        if (this.start.row == row && this.start.column == column) {
+            return -1;
+        } else {
+            return this.compare(row, column);
+        }
+    }
+
+    /**
+     * Like .compare(), but if isEnd is true, return 1;
+     */
+    this.compareEnd = function(row, column) {
+        if (this.end.row == row && this.end.column == column) {
+            return 1;
+        } else {
+            return this.compare(row, column);
+        }
+    }
+
+    this.compareInside = function(row, column) {
+        if (this.end.row == row && this.end.column == column) {
+            return 1;
+        } else if (this.start.row == row && this.start.column == column) {
+            return -1;
+        } else {
+            return this.compare(row, column);
+        }
+    }
+
+    this.clipRows = function(firstRow, lastRow) {
+        if (this.end.row > lastRow) {
+            var end = {
+                row: lastRow+1,
+                column: 0
+            };
+        }
+
+        if (this.start.row > lastRow) {
+            var start = {
+                row: lastRow+1,
+                column: 0
+            };
+        }
+
+        if (this.start.row < firstRow) {
+            var start = {
+                row: firstRow,
+                column: 0
+            };
+        }
+
+        if (this.end.row < firstRow) {
+            var end = {
+                row: firstRow,
+                column: 0
+            };
+        }
+        return Range.fromPoints(start || this.start, end || this.end);
+    };
+
+    this.extend = function(row, column) {
+        var cmp = this.compare(row, column);
+
+        if (cmp == 0)
+            return this;
+        else if (cmp == -1)
+            var start = {row: row, column: column};
+        else
+            var end = {row: row, column: column};
+
+        return Range.fromPoints(start || this.start, end || this.end);
+    };
+
+    this.isEmpty = function() {
+        return (this.start.row == this.end.row && this.start.column == this.end.column);
+    };
+
+    this.isMultiLine = function() {
+        return (this.start.row !== this.end.row);
+    };
+
+    this.clone = function() {
+        return Range.fromPoints(this.start, this.end);
+    };
+
+    this.collapseRows = function() {
+        if (this.end.column == 0)
+            return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0)
+        else
+            return new Range(this.start.row, 0, this.end.row, 0)
+    };
+
+    this.toScreenRange = function(session) {
+        var screenPosStart =
+            session.documentToScreenPosition(this.start);
+        var screenPosEnd =
+            session.documentToScreenPosition(this.end);
+
+        return new Range(
+            screenPosStart.row, screenPosStart.column,
+            screenPosEnd.row, screenPosEnd.column
+        );
+    };
+
+}).call(Range.prototype);
+
+
+Range.fromPoints = function(start, end) {
+    return new Range(start.row, start.column, end.row, end.column);
+};
+
+exports.Range = Range;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/text', ['require', 'exports', 'module' , 'ace/tokenizer', 'ace/mode/text_highlight_rules', 'ace/mode/behaviour', 'ace/unicode'], function(require, exports, module) {
+"use strict";
+
+var Tokenizer = require("../tokenizer").Tokenizer;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+var Behaviour = require("./behaviour").Behaviour;
+var unicode = require("../unicode");
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new TextHighlightRules().getRules());
+    this.$behaviour = new Behaviour();
+};
+
+(function() {
+
+    this.tokenRe = new RegExp("^["
+        + unicode.packages.L
+        + unicode.packages.Mn + unicode.packages.Mc
+        + unicode.packages.Nd
+        + unicode.packages.Pc + "\\$_]+", "g"
+    );
+    
+    this.nonTokenRe = new RegExp("^(?:[^"
+        + unicode.packages.L
+        + unicode.packages.Mn + unicode.packages.Mc
+        + unicode.packages.Nd
+        + unicode.packages.Pc + "\\$_]|\s])+", "g"
+    );
+
+    this.getTokenizer = function() {
+        return this.$tokenizer;
+    };
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        return "";
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return false;
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+    
+    this.createWorker = function(session) {
+        return null;
+    };
+
+    this.highlightSelection = function(editor) {
+        var session = editor.session;
+        if (!session.$selectionOccurrences)
+            session.$selectionOccurrences = [];
+
+        if (session.$selectionOccurrences.length)
+            this.clearSelectionHighlight(editor);
+
+        var selection = editor.getSelectionRange();
+        if (selection.isEmpty() || selection.isMultiLine())
+            return;
+
+        var startOuter = selection.start.column - 1;
+        var endOuter = selection.end.column + 1;
+        var line = session.getLine(selection.start.row);
+        var lineCols = line.length;
+        var needle = line.substring(Math.max(startOuter, 0),
+                                    Math.min(endOuter, lineCols));
+
+        // Make sure the outer characters are not part of the word.
+        if ((startOuter >= 0 && /^[\w\d]/.test(needle)) ||
+            (endOuter <= lineCols && /[\w\d]$/.test(needle)))
+            return;
+
+        needle = line.substring(selection.start.column, selection.end.column);
+        if (!/^[\w\d]+$/.test(needle))
+            return;
+
+        var cursor = editor.getCursorPosition();
+
+        var newOptions = {
+            wrap: true,
+            wholeWord: true,
+            caseSensitive: true,
+            needle: needle
+        };
+
+        var currentOptions = editor.$search.getOptions();
+        editor.$search.set(newOptions);
+
+        var ranges = editor.$search.findAll(session);
+        ranges.forEach(function(range) {
+            if (!range.contains(cursor.row, cursor.column)) {
+                var marker = session.addMarker(range, "ace_selected_word", "text");
+                session.$selectionOccurrences.push(marker);
+            }
+        });
+
+        editor.$search.set(currentOptions);
+    };
+
+    this.clearSelectionHighlight = function(editor) {
+        if (!editor.session.$selectionOccurrences)
+            return;
+
+        editor.session.$selectionOccurrences.forEach(function(marker) {
+            editor.session.removeMarker(marker);
+        });
+
+        editor.session.$selectionOccurrences = [];
+    };
+    
+    this.createModeDelegates = function (mapping) {
+        if (!this.$embeds) {
+            return;
+        }
+        this.$modes = {};
+        for (var i = 0; i < this.$embeds.length; i++) {
+            if (mapping[this.$embeds[i]]) {
+                this.$modes[this.$embeds[i]] = new mapping[this.$embeds[i]]();
+            }
+        }
+        
+        var delegations = ['toggleCommentLines', 'getNextLineIndent', 'checkOutdent', 'autoOutdent', 'transformAction'];
+
+        for (var i = 0; i < delegations.length; i++) {
+            (function(scope) {
+              var functionName = delegations[i];
+              var defaultHandler = scope[functionName];
+              scope[delegations[i]] = function() {
+                  return this.$delegator(functionName, arguments, defaultHandler);
+              }
+            } (this));
+        }
+    }
+    
+    this.$delegator = function(method, args, defaultHandler) {
+        var state = args[0];
+        
+        for (var i = 0; i < this.$embeds.length; i++) {
+            if (!this.$modes[this.$embeds[i]]) continue;
+            
+            var split = state.split(this.$embeds[i]);
+            if (!split[0] && split[1]) {
+                args[0] = split[1];
+                var mode = this.$modes[this.$embeds[i]];
+                return mode[method].apply(mode, args);
+            }
+        }
+        var ret = defaultHandler.apply(this, args);
+        return defaultHandler ? ret : undefined;
+    };
+    
+    this.transformAction = function(state, action, editor, session, param) {
+        if (this.$behaviour) {
+            var behaviours = this.$behaviour.getBehaviours();
+            for (var key in behaviours) {
+                if (behaviours[key][action]) {
+                    var ret = behaviours[key][action].apply(this, arguments);
+                    if (ret) {
+                        return ret;
+                    }
+                }
+            }
+        }
+    }
+    
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/tokenizer', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+var Tokenizer = function(rules, flag) {
+    flag = flag ? "g" + flag : "g";
+    this.rules = rules;
+
+    this.regExps = {};
+    this.matchMappings = {};
+    for ( var key in this.rules) {
+        var rule = this.rules[key];
+        var state = rule;
+        var ruleRegExps = [];
+        var matchTotal = 0;
+        var mapping = this.matchMappings[key] = {};
+        
+        for ( var i = 0; i < state.length; i++) {
+            // Count number of matching groups. 2 extra groups from the full match
+            // And the catch-all on the end (used to force a match);
+            var matchcount = new RegExp("(?:(" + state[i].regex + ")|(.))").exec("a").length - 2;
+        
+            // Replace any backreferences and offset appropriately.
+            var adjustedregex = state[i].regex.replace(/\\([0-9]+)/g, function (match, digit) {
+                return "\\" + (parseInt(digit, 10) + matchTotal + 1);
+            });
+            
+            mapping[matchTotal] = {
+                rule: i,
+                len: matchcount
+            };
+            matchTotal += matchcount;
+            
+            ruleRegExps.push(adjustedregex);
+        }
+
+        this.regExps[key] = new RegExp("(?:(" + ruleRegExps.join(")|(") + ")|(.))", flag);
+    }
+};
+
+(function() {
+
+    this.getLineTokens = function(line, startState) {
+        var currentState = startState;
+        var state = this.rules[currentState];
+        var mapping = this.matchMappings[currentState];
+        var re = this.regExps[currentState];
+        re.lastIndex = 0;
+        
+        var match, tokens = [];
+        
+        var lastIndex = 0;
+        
+        var token = {
+            type: null,
+            value: ""
+        };
+        
+        while (match = re.exec(line)) {
+            var type = "text";
+            var rule = null;
+            var value = [match[0]];
+
+            for (var i = 0; i < match.length-2; i++) {
+                if (match[i + 1] !== undefined) {
+                    rule = state[mapping[i].rule];
+                    
+                    if (mapping[i].len > 1) {
+                        value = match.slice(i+2, i+1+mapping[i].len);
+                    }
+                    
+                    // compute token type
+                    if (typeof rule.token == "function")
+                        type = rule.token.apply(this, value);
+                    else
+                        type = rule.token;
+
+                    var next = rule.next;                    
+                    if (next && next !== currentState) {
+                        currentState = next;
+                        state = this.rules[currentState];
+                        mapping = this.matchMappings[currentState];
+                        lastIndex = re.lastIndex;
+
+                        re = this.regExps[currentState];
+                        re.lastIndex = lastIndex;
+                    }
+                    break;
+                }
+            }
+
+            if (value[0]) {
+                if (typeof type == "string") {
+                    value = [value.join("")];
+                    type = [type];
+                }
+                for (var i = 0; i < value.length; i++) {
+                    if ((!rule || rule.merge || type[i] === "text") && token.type === type[i]) {
+                        token.value += value[i];
+                    } else {
+                        if (token.type) {
+                            tokens.push(token);
+                        }
+                    
+                        token = {
+                            type: type[i],
+                            value: value[i]
+                        };
+                    }
+                }
+            }
+            
+            if (lastIndex == line.length)
+                break;
+            
+            lastIndex = re.lastIndex;
+        }
+
+        if (token.type)
+            tokens.push(token);
+
+        return {
+            tokens : tokens,
+            state : currentState
+        };
+    };
+
+}).call(Tokenizer.prototype);
+
+exports.Tokenizer = Tokenizer;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/text_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
+"use strict";
+
+var lang = require("../lib/lang");
+
+var TextHighlightRules = function() {
+
+    // regexp must not have capturing parentheses
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [{
+            token : "empty_line",
+            regex : '^$'
+        }, {
+            token : "text",
+            regex : ".+"
+        }]
+    };
+};
+
+(function() {
+
+    this.addRules = function(rules, prefix) {
+        for (var key in rules) {
+            var state = rules[key];
+            for (var i=0; i<state.length; i++) {
+                var rule = state[i];
+                if (rule.next) {
+                    rule.next = prefix + rule.next;
+                } else {
+                    rule.next = prefix + key;
+                }
+            }
+            this.$rules[prefix + key] = state;
+        }
+    };
+
+    this.getRules = function() {
+        return this.$rules;
+    };
+    
+    this.embedRules = function (HighlightRules, prefix, escapeRules, states) {
+        var embedRules = new HighlightRules().getRules();
+        if (states) {
+            for (var i = 0; i < states.length; i++) {
+                states[i] = prefix + states[i];
+            }
+        } else {
+            states = [];
+            for (var key in embedRules) {
+                states.push(prefix + key);
+            }
+        }
+        this.addRules(embedRules, prefix);
+        
+        for (var i = 0; i < states.length; i++) {
+            Array.prototype.unshift.apply(this.$rules[states[i]], lang.deepCopy(escapeRules));
+        }
+        
+        if (!this.$embeds) {
+            this.$embeds = [];
+        }
+        this.$embeds.push(prefix);
+    }
+    
+    this.getEmbeds = function() {
+        return this.$embeds;
+    }
+
+}).call(TextHighlightRules.prototype);
+
+exports.TextHighlightRules = TextHighlightRules;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+var Behaviour = function() {
+   this.$behaviours = {};
+};
+
+(function () {
+
+    this.add = function (name, action, callback) {
+        switch (undefined) {
+          case this.$behaviours:
+              this.$behaviours = {};
+          case this.$behaviours[name]:
+              this.$behaviours[name] = {};
+        }
+        this.$behaviours[name][action] = callback;
+    }
+    
+    this.addBehaviours = function (behaviours) {
+        for (var key in behaviours) {
+            for (var action in behaviours[key]) {
+                this.add(key, action, behaviours[key][action]);
+            }
+        }
+    }
+    
+    this.remove = function (name) {
+        if (this.$behaviours && this.$behaviours[name]) {
+            delete this.$behaviours[name];
+        }
+    }
+    
+    this.inherit = function (mode, filter) {
+        if (typeof mode === "function") {
+            var behaviours = new mode().getBehaviours(filter);
+        } else {
+            var behaviours = mode.getBehaviours(filter);
+        }
+        this.addBehaviours(behaviours);
+    }
+    
+    this.getBehaviours = function (filter) {
+        if (!filter) {
+            return this.$behaviours;
+        } else {
+            var ret = {}
+            for (var i = 0; i < filter.length; i++) {
+                if (this.$behaviours[filter[i]]) {
+                    ret[filter[i]] = this.$behaviours[filter[i]];
+                }
+            }
+            return ret;
+        }
+    }
+
+}).call(Behaviour.prototype);
+
+exports.Behaviour = Behaviour;
+});define('ace/unicode', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+/*
+XRegExp Unicode plugin pack: Categories 1.0
+(c) 2010 Steven Levithan
+MIT License
+<http://xregexp.com>
+Uses the Unicode 5.2 character database
+
+This package for the XRegExp Unicode plugin enables the following Unicode categories (aka properties):
+
+L - Letter (the top-level Letter category is included in the Unicode plugin base script)
+    Ll - Lowercase letter
+    Lu - Uppercase letter
+    Lt - Titlecase letter
+    Lm - Modifier letter
+    Lo - Letter without case
+M - Mark
+    Mn - Non-spacing mark
+    Mc - Spacing combining mark
+    Me - Enclosing mark
+N - Number
+    Nd - Decimal digit
+    Nl - Letter number
+    No -  Other number
+P - Punctuation
+    Pd - Dash punctuation
+    Ps - Open punctuation
+    Pe - Close punctuation
+    Pi - Initial punctuation
+    Pf - Final punctuation
+    Pc - Connector punctuation
+    Po - Other punctuation
+S - Symbol
+    Sm - Math symbol
+    Sc - Currency symbol
+    Sk - Modifier symbol
+    So - Other symbol
+Z - Separator
+    Zs - Space separator
+    Zl - Line separator
+    Zp - Paragraph separator
+C - Other
+    Cc - Control
+    Cf - Format
+    Co - Private use
+    Cs - Surrogate
+    Cn - Unassigned
+
+Example usage:
+
+    \p{N}
+    \p{Cn}
+*/
+
+
+// will be populated by addUnicodePackage
+exports.packages = {};
+
+addUnicodePackage({
+    L:  "0041-005A0061-007A00AA00B500BA00C0-00D600D8-00F600F8-02C102C6-02D102E0-02E402EC02EE0370-037403760377037A-037D03860388-038A038C038E-03A103A3-03F503F7-0481048A-05250531-055605590561-058705D0-05EA05F0-05F20621-064A066E066F0671-06D306D506E506E606EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA07F407F507FA0800-0815081A082408280904-0939093D09500958-0961097109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E460E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EC60EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10A0-10C510D0-10FA10FC1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317D717DC1820-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541AA71B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C7D1CE9-1CEC1CEE-1CF11D00-1DBF1E00-1F151F18-1F1D1F20-1F451F48-1F4D1F50-1F571F591F5B1F5D1F5F-1F7D1F80-1FB41FB6-1FBC1FBE1FC2-1FC41FC6-1FCC1FD0-1FD31FD6-1FDB1FE0-1FEC1FF2-1FF41FF6-1FFC2071207F2090-209421022107210A-211321152119-211D212421262128212A-212D212F-2139213C-213F2145-2149214E218321842C00-2C2E2C30-2C5E2C60-2CE42CEB-2CEE2D00-2D252D30-2D652D6F2D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE2E2F300530063031-3035303B303C3041-3096309D-309F30A1-30FA30FC-30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A48CA4D0-A4FDA500-A60CA610-A61FA62AA62BA640-A65FA662-A66EA67F-A697A6A0-A6E5A717-A71FA722-A788A78BA78CA7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2A9CFAA00-AA28AA40-AA42AA44-AA4BAA60-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADB-AADDABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB00-FB06FB13-FB17FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF21-FF3AFF41-FF5AFF66-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",
+    Ll: "0061-007A00AA00B500BA00DF-00F600F8-00FF01010103010501070109010B010D010F01110113011501170119011B011D011F01210123012501270129012B012D012F01310133013501370138013A013C013E014001420144014601480149014B014D014F01510153015501570159015B015D015F01610163016501670169016B016D016F0171017301750177017A017C017E-0180018301850188018C018D019201950199-019B019E01A101A301A501A801AA01AB01AD01B001B401B601B901BA01BD-01BF01C601C901CC01CE01D001D201D401D601D801DA01DC01DD01DF01E101E301E501E701E901EB01ED01EF01F001F301F501F901FB01FD01FF02010203020502070209020B020D020F02110213021502170219021B021D021F02210223022502270229022B022D022F02310233-0239023C023F0240024202470249024B024D024F-02930295-02AF037103730377037B-037D039003AC-03CE03D003D103D5-03D703D903DB03DD03DF03E103E303E503E703E903EB03ED03EF-03F303F503F803FB03FC0430-045F04610463046504670469046B046D046F04710473047504770479047B047D047F0481048B048D048F04910493049504970499049B049D049F04A104A304A504A704A904AB04AD04AF04B104B304B504B704B904BB04BD04BF04C204C404C604C804CA04CC04CE04CF04D104D304D504D704D904DB04DD04DF04E104E304E504E704E904EB04ED04EF04F104F304F504F704F904FB04FD04FF05010503050505070509050B050D050F05110513051505170519051B051D051F0521052305250561-05871D00-1D2B1D62-1D771D79-1D9A1E011E031E051E071E091E0B1E0D1E0F1E111E131E151E171E191E1B1E1D1E1F1E211E231E251E271E291E2B1E2D1E2F1E311E331E351E371E391E3B1E3D1E3F1E411E431E451E471E491E4B1E4D1E4F1E511E531E551E571E591E5B1E5D1E5F1E611E631E651E671E691E6B1E6D1E6F1E711E731E751E771E791E7B1E7D1E7F1E811E831E851E871E891E8B1E8D1E8F1E911E931E95-1E9D1E9F1EA11EA31EA51EA71EA91EAB1EAD1EAF1EB11EB31EB51EB71EB91EBB1EBD1EBF1EC11EC31EC51EC71EC91ECB1ECD1ECF1ED11ED31ED51ED71ED91EDB1EDD1EDF1EE11EE31EE51EE71EE91EEB1EED1EEF1EF11EF31EF51EF71EF91EFB1EFD1EFF-1F071F10-1F151F20-1F271F30-1F371F40-1F451F50-1F571F60-1F671F70-1F7D1F80-1F871F90-1F971FA0-1FA71FB0-1FB41FB61FB71FBE1FC2-1FC41FC61FC71FD0-1FD31FD61FD71FE0-1FE71FF2-1FF41FF61FF7210A210E210F2113212F21342139213C213D2146-2149214E21842C30-2C5E2C612C652C662C682C6A2C6C2C712C732C742C76-2C7C2C812C832C852C872C892C8B2C8D2C8F2C912C932C952C972C992C9B2C9D2C9F2CA12CA32CA52CA72CA92CAB2CAD2CAF2CB12CB32CB52CB72CB92CBB2CBD2CBF2CC12CC32CC52CC72CC92CCB2CCD2CCF2CD12CD32CD52CD72CD92CDB2CDD2CDF2CE12CE32CE42CEC2CEE2D00-2D25A641A643A645A647A649A64BA64DA64FA651A653A655A657A659A65BA65DA65FA663A665A667A669A66BA66DA681A683A685A687A689A68BA68DA68FA691A693A695A697A723A725A727A729A72BA72DA72F-A731A733A735A737A739A73BA73DA73FA741A743A745A747A749A74BA74DA74FA751A753A755A757A759A75BA75DA75FA761A763A765A767A769A76BA76DA76FA771-A778A77AA77CA77FA781A783A785A787A78CFB00-FB06FB13-FB17FF41-FF5A",
+    Lu: "0041-005A00C0-00D600D8-00DE01000102010401060108010A010C010E01100112011401160118011A011C011E01200122012401260128012A012C012E01300132013401360139013B013D013F0141014301450147014A014C014E01500152015401560158015A015C015E01600162016401660168016A016C016E017001720174017601780179017B017D018101820184018601870189-018B018E-0191019301940196-0198019C019D019F01A001A201A401A601A701A901AC01AE01AF01B1-01B301B501B701B801BC01C401C701CA01CD01CF01D101D301D501D701D901DB01DE01E001E201E401E601E801EA01EC01EE01F101F401F6-01F801FA01FC01FE02000202020402060208020A020C020E02100212021402160218021A021C021E02200222022402260228022A022C022E02300232023A023B023D023E02410243-02460248024A024C024E03700372037603860388-038A038C038E038F0391-03A103A3-03AB03CF03D2-03D403D803DA03DC03DE03E003E203E403E603E803EA03EC03EE03F403F703F903FA03FD-042F04600462046404660468046A046C046E04700472047404760478047A047C047E0480048A048C048E04900492049404960498049A049C049E04A004A204A404A604A804AA04AC04AE04B004B204B404B604B804BA04BC04BE04C004C104C304C504C704C904CB04CD04D004D204D404D604D804DA04DC04DE04E004E204E404E604E804EA04EC04EE04F004F204F404F604F804FA04FC04FE05000502050405060508050A050C050E05100512051405160518051A051C051E0520052205240531-055610A0-10C51E001E021E041E061E081E0A1E0C1E0E1E101E121E141E161E181E1A1E1C1E1E1E201E221E241E261E281E2A1E2C1E2E1E301E321E341E361E381E3A1E3C1E3E1E401E421E441E461E481E4A1E4C1E4E1E501E521E541E561E581E5A1E5C1E5E1E601E621E641E661E681E6A1E6C1E6E1E701E721E741E761E781E7A1E7C1E7E1E801E821E841E861E881E8A1E8C1E8E1E901E921E941E9E1EA01EA21EA41EA61EA81EAA1EAC1EAE1EB01EB21EB41EB61EB81EBA1EBC1EBE1EC01EC21EC41EC61EC81ECA1ECC1ECE1ED01ED21ED41ED61ED81EDA1EDC1EDE1EE01EE21EE41EE61EE81EEA1EEC1EEE1EF01EF21EF41EF61EF81EFA1EFC1EFE1F08-1F0F1F18-1F1D1F28-1F2F1F38-1F3F1F48-1F4D1F591F5B1F5D1F5F1F68-1F6F1FB8-1FBB1FC8-1FCB1FD8-1FDB1FE8-1FEC1FF8-1FFB21022107210B-210D2110-211221152119-211D212421262128212A-212D2130-2133213E213F214521832C00-2C2E2C602C62-2C642C672C692C6B2C6D-2C702C722C752C7E-2C802C822C842C862C882C8A2C8C2C8E2C902C922C942C962C982C9A2C9C2C9E2CA02CA22CA42CA62CA82CAA2CAC2CAE2CB02CB22CB42CB62CB82CBA2CBC2CBE2CC02CC22CC42CC62CC82CCA2CCC2CCE2CD02CD22CD42CD62CD82CDA2CDC2CDE2CE02CE22CEB2CEDA640A642A644A646A648A64AA64CA64EA650A652A654A656A658A65AA65CA65EA662A664A666A668A66AA66CA680A682A684A686A688A68AA68CA68EA690A692A694A696A722A724A726A728A72AA72CA72EA732A734A736A738A73AA73CA73EA740A742A744A746A748A74AA74CA74EA750A752A754A756A758A75AA75CA75EA760A762A764A766A768A76AA76CA76EA779A77BA77DA77EA780A782A784A786A78BFF21-FF3A",
+    Lt: "01C501C801CB01F21F88-1F8F1F98-1F9F1FA8-1FAF1FBC1FCC1FFC",
+    Lm: "02B0-02C102C6-02D102E0-02E402EC02EE0374037A0559064006E506E607F407F507FA081A0824082809710E460EC610FC17D718431AA71C78-1C7D1D2C-1D611D781D9B-1DBF2071207F2090-20942C7D2D6F2E2F30053031-3035303B309D309E30FC-30FEA015A4F8-A4FDA60CA67FA717-A71FA770A788A9CFAA70AADDFF70FF9EFF9F",
+    Lo: "01BB01C0-01C3029405D0-05EA05F0-05F20621-063F0641-064A066E066F0671-06D306D506EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA0800-08150904-0939093D09500958-096109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E450E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10D0-10FA1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317DC1820-18421844-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C771CE9-1CEC1CEE-1CF12135-21382D30-2D652D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE3006303C3041-3096309F30A1-30FA30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A014A016-A48CA4D0-A4F7A500-A60BA610-A61FA62AA62BA66EA6A0-A6E5A7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2AA00-AA28AA40-AA42AA44-AA4BAA60-AA6FAA71-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADBAADCABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF66-FF6FFF71-FF9DFFA0-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",
+    M:  "0300-036F0483-04890591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DE-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0903093C093E-094E0951-0955096209630981-098309BC09BE-09C409C709C809CB-09CD09D709E209E30A01-0A030A3C0A3E-0A420A470A480A4B-0A4D0A510A700A710A750A81-0A830ABC0ABE-0AC50AC7-0AC90ACB-0ACD0AE20AE30B01-0B030B3C0B3E-0B440B470B480B4B-0B4D0B560B570B620B630B820BBE-0BC20BC6-0BC80BCA-0BCD0BD70C01-0C030C3E-0C440C46-0C480C4A-0C4D0C550C560C620C630C820C830CBC0CBE-0CC40CC6-0CC80CCA-0CCD0CD50CD60CE20CE30D020D030D3E-0D440D46-0D480D4A-0D4D0D570D620D630D820D830DCA0DCF-0DD40DD60DD8-0DDF0DF20DF30E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F3E0F3F0F71-0F840F860F870F90-0F970F99-0FBC0FC6102B-103E1056-1059105E-10601062-10641067-106D1071-10741082-108D108F109A-109D135F1712-17141732-1734175217531772177317B6-17D317DD180B-180D18A91920-192B1930-193B19B0-19C019C819C91A17-1A1B1A55-1A5E1A60-1A7C1A7F1B00-1B041B34-1B441B6B-1B731B80-1B821BA1-1BAA1C24-1C371CD0-1CD21CD4-1CE81CED1CF21DC0-1DE61DFD-1DFF20D0-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66F-A672A67CA67DA6F0A6F1A802A806A80BA823-A827A880A881A8B4-A8C4A8E0-A8F1A926-A92DA947-A953A980-A983A9B3-A9C0AA29-AA36AA43AA4CAA4DAA7BAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE3-ABEAABECABEDFB1EFE00-FE0FFE20-FE26",
+    Mn: "0300-036F0483-04870591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DF-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0902093C0941-0948094D0951-095509620963098109BC09C1-09C409CD09E209E30A010A020A3C0A410A420A470A480A4B-0A4D0A510A700A710A750A810A820ABC0AC1-0AC50AC70AC80ACD0AE20AE30B010B3C0B3F0B41-0B440B4D0B560B620B630B820BC00BCD0C3E-0C400C46-0C480C4A-0C4D0C550C560C620C630CBC0CBF0CC60CCC0CCD0CE20CE30D41-0D440D4D0D620D630DCA0DD2-0DD40DD60E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F71-0F7E0F80-0F840F860F870F90-0F970F99-0FBC0FC6102D-10301032-10371039103A103D103E10581059105E-10601071-1074108210851086108D109D135F1712-17141732-1734175217531772177317B7-17BD17C617C9-17D317DD180B-180D18A91920-19221927192819321939-193B1A171A181A561A58-1A5E1A601A621A65-1A6C1A73-1A7C1A7F1B00-1B031B341B36-1B3A1B3C1B421B6B-1B731B801B811BA2-1BA51BA81BA91C2C-1C331C361C371CD0-1CD21CD4-1CE01CE2-1CE81CED1DC0-1DE61DFD-1DFF20D0-20DC20E120E5-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66FA67CA67DA6F0A6F1A802A806A80BA825A826A8C4A8E0-A8F1A926-A92DA947-A951A980-A982A9B3A9B6-A9B9A9BCAA29-AA2EAA31AA32AA35AA36AA43AA4CAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE5ABE8ABEDFB1EFE00-FE0FFE20-FE26",
+    Mc: "0903093E-09400949-094C094E0982098309BE-09C009C709C809CB09CC09D70A030A3E-0A400A830ABE-0AC00AC90ACB0ACC0B020B030B3E0B400B470B480B4B0B4C0B570BBE0BBF0BC10BC20BC6-0BC80BCA-0BCC0BD70C01-0C030C41-0C440C820C830CBE0CC0-0CC40CC70CC80CCA0CCB0CD50CD60D020D030D3E-0D400D46-0D480D4A-0D4C0D570D820D830DCF-0DD10DD8-0DDF0DF20DF30F3E0F3F0F7F102B102C10311038103B103C105610571062-10641067-106D108310841087-108C108F109A-109C17B617BE-17C517C717C81923-19261929-192B193019311933-193819B0-19C019C819C91A19-1A1B1A551A571A611A631A641A6D-1A721B041B351B3B1B3D-1B411B431B441B821BA11BA61BA71BAA1C24-1C2B1C341C351CE11CF2A823A824A827A880A881A8B4-A8C3A952A953A983A9B4A9B5A9BAA9BBA9BD-A9C0AA2FAA30AA33AA34AA4DAA7BABE3ABE4ABE6ABE7ABE9ABEAABEC",
+    Me: "0488048906DE20DD-20E020E2-20E4A670-A672",
+    N:  "0030-003900B200B300B900BC-00BE0660-066906F0-06F907C0-07C90966-096F09E6-09EF09F4-09F90A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BF20C66-0C6F0C78-0C7E0CE6-0CEF0D66-0D750E50-0E590ED0-0ED90F20-0F331040-10491090-10991369-137C16EE-16F017E0-17E917F0-17F91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C5920702074-20792080-20892150-21822185-21892460-249B24EA-24FF2776-27932CFD30073021-30293038-303A3192-31953220-32293251-325F3280-328932B1-32BFA620-A629A6E6-A6EFA830-A835A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",
+    Nd: "0030-00390660-066906F0-06F907C0-07C90966-096F09E6-09EF0A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BEF0C66-0C6F0CE6-0CEF0D66-0D6F0E50-0E590ED0-0ED90F20-0F291040-10491090-109917E0-17E91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C59A620-A629A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",
+    Nl: "16EE-16F02160-21822185-218830073021-30293038-303AA6E6-A6EF",
+    No: "00B200B300B900BC-00BE09F4-09F90BF0-0BF20C78-0C7E0D70-0D750F2A-0F331369-137C17F0-17F920702074-20792080-20892150-215F21892460-249B24EA-24FF2776-27932CFD3192-31953220-32293251-325F3280-328932B1-32BFA830-A835",
+    P:  "0021-00230025-002A002C-002F003A003B003F0040005B-005D005F007B007D00A100AB00B700BB00BF037E0387055A-055F0589058A05BE05C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F3A-0F3D0F850FD0-0FD4104A-104F10FB1361-13681400166D166E169B169C16EB-16ED1735173617D4-17D617D8-17DA1800-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD32010-20272030-20432045-20512053-205E207D207E208D208E2329232A2768-277527C527C627E6-27EF2983-299829D8-29DB29FC29FD2CF9-2CFC2CFE2CFF2E00-2E2E2E302E313001-30033008-30113014-301F3030303D30A030FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFD3EFD3FFE10-FE19FE30-FE52FE54-FE61FE63FE68FE6AFE6BFF01-FF03FF05-FF0AFF0C-FF0FFF1AFF1BFF1FFF20FF3B-FF3DFF3FFF5BFF5DFF5F-FF65",
+    Pd: "002D058A05BE140018062010-20152E172E1A301C303030A0FE31FE32FE58FE63FF0D",
+    Ps: "0028005B007B0F3A0F3C169B201A201E2045207D208D23292768276A276C276E27702772277427C527E627E827EA27EC27EE2983298529872989298B298D298F299129932995299729D829DA29FC2E222E242E262E283008300A300C300E3010301430163018301A301DFD3EFE17FE35FE37FE39FE3BFE3DFE3FFE41FE43FE47FE59FE5BFE5DFF08FF3BFF5BFF5FFF62",
+    Pe: "0029005D007D0F3B0F3D169C2046207E208E232A2769276B276D276F27712773277527C627E727E927EB27ED27EF298429862988298A298C298E2990299229942996299829D929DB29FD2E232E252E272E293009300B300D300F3011301530173019301B301E301FFD3FFE18FE36FE38FE3AFE3CFE3EFE40FE42FE44FE48FE5AFE5CFE5EFF09FF3DFF5DFF60FF63",
+    Pi: "00AB2018201B201C201F20392E022E042E092E0C2E1C2E20",
+    Pf: "00BB2019201D203A2E032E052E0A2E0D2E1D2E21",
+    Pc: "005F203F20402054FE33FE34FE4D-FE4FFF3F",
+    Po: "0021-00230025-0027002A002C002E002F003A003B003F0040005C00A100B700BF037E0387055A-055F058905C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F850FD0-0FD4104A-104F10FB1361-1368166D166E16EB-16ED1735173617D4-17D617D8-17DA1800-18051807-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD3201620172020-20272030-2038203B-203E2041-20432047-205120532055-205E2CF9-2CFC2CFE2CFF2E002E012E06-2E082E0B2E0E-2E162E182E192E1B2E1E2E1F2E2A-2E2E2E302E313001-3003303D30FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFE10-FE16FE19FE30FE45FE46FE49-FE4CFE50-FE52FE54-FE57FE5F-FE61FE68FE6AFE6BFF01-FF03FF05-FF07FF0AFF0CFF0EFF0FFF1AFF1BFF1FFF20FF3CFF61FF64FF65",
+    S:  "0024002B003C-003E005E0060007C007E00A2-00A900AC00AE-00B100B400B600B800D700F702C2-02C502D2-02DF02E5-02EB02ED02EF-02FF03750384038503F604820606-0608060B060E060F06E906FD06FE07F609F209F309FA09FB0AF10B700BF3-0BFA0C7F0CF10CF20D790E3F0F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-139917DB194019E0-19FF1B61-1B6A1B74-1B7C1FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE20442052207A-207C208A-208C20A0-20B8210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B2140-2144214A-214D214F2190-2328232B-23E82400-24262440-244A249C-24E92500-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE27C0-27C427C7-27CA27CC27D0-27E527F0-29822999-29D729DC-29FB29FE-2B4C2B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F309B309C319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A700-A716A720A721A789A78AA828-A82BA836-A839AA77-AA79FB29FDFCFDFDFE62FE64-FE66FE69FF04FF0BFF1C-FF1EFF3EFF40FF5CFF5EFFE0-FFE6FFE8-FFEEFFFCFFFD",
+    Sm: "002B003C-003E007C007E00AC00B100D700F703F60606-060820442052207A-207C208A-208C2140-2144214B2190-2194219A219B21A021A321A621AE21CE21CF21D221D421F4-22FF2308-230B23202321237C239B-23B323DC-23E125B725C125F8-25FF266F27C0-27C427C7-27CA27CC27D0-27E527F0-27FF2900-29822999-29D729DC-29FB29FE-2AFF2B30-2B442B47-2B4CFB29FE62FE64-FE66FF0BFF1C-FF1EFF5CFF5EFFE2FFE9-FFEC",
+    Sc: "002400A2-00A5060B09F209F309FB0AF10BF90E3F17DB20A0-20B8A838FDFCFE69FF04FFE0FFE1FFE5FFE6",
+    Sk: "005E006000A800AF00B400B802C2-02C502D2-02DF02E5-02EB02ED02EF-02FF0375038403851FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE309B309CA700-A716A720A721A789A78AFF3EFF40FFE3",
+    So: "00A600A700A900AE00B000B60482060E060F06E906FD06FE07F609FA0B700BF3-0BF80BFA0C7F0CF10CF20D790F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-1399194019E0-19FF1B61-1B6A1B74-1B7C210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B214A214C214D214F2195-2199219C-219F21A121A221A421A521A7-21AD21AF-21CD21D021D121D321D5-21F32300-2307230C-231F2322-2328232B-237B237D-239A23B4-23DB23E2-23E82400-24262440-244A249C-24E92500-25B625B8-25C025C2-25F72600-266E2670-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE2800-28FF2B00-2B2F2B452B462B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A828-A82BA836A837A839AA77-AA79FDFDFFE4FFE8FFEDFFEEFFFCFFFD",
+    Z:  "002000A01680180E2000-200A20282029202F205F3000",
+    Zs: "002000A01680180E2000-200A202F205F3000",
+    Zl: "2028",
+    Zp: "2029",
+    C:  "0000-001F007F-009F00AD03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-0605061C061D0620065F06DD070E070F074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17B417B517DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF200B-200F202A-202E2060-206F20722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-F8FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFD-FF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFFBFFFEFFFF",
+    Cc: "0000-001F007F-009F",
+    Cf: "00AD0600-060306DD070F17B417B5200B-200F202A-202E2060-2064206A-206FFEFFFFF9-FFFB",
+    Co: "E000-F8FF",
+    Cs: "D800-DFFF",
+    Cn: "03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-05FF06040605061C061D0620065F070E074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF2065-206920722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-D7FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFDFEFEFF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFF8FFFEFFFF"
+});
+
+function addUnicodePackage (pack) {
+    var codePoint = /\w{4}/g;
+    for (var name in pack)
+        exports.packages[name] = pack[name].replace(codePoint, "\\u$&");
+};
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/range', 'ace/anchor'], function(require, exports, module) {
+"use strict";
+
+var oop = require("./lib/oop");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+var Range = require("./range").Range;
+var Anchor = require("./anchor").Anchor;
+
+var Document = function(text) {
+    this.$lines = [];
+
+    if (Array.isArray(text)) {
+        this.insertLines(0, text);
+    }
+    // There has to be one line at least in the document. If you pass an empty
+    // string to the insert function, nothing will happen. Workaround.
+    else if (text.length == 0) {
+        this.$lines = [""];
+    } else {
+        this.insert({row: 0, column:0}, text);
+    }
+};
+
+(function() {
+
+    oop.implement(this, EventEmitter);
+
+    this.setValue = function(text) {
+        var len = this.getLength();
+        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
+        this.insert({row: 0, column:0}, text);
+    };
+
+    this.getValue = function() {
+        return this.getAllLines().join(this.getNewLineCharacter());
+    };
+
+    this.createAnchor = function(row, column) {
+        return new Anchor(this, row, column);
+    };
+
+    // check for IE split bug
+    if ("aaa".split(/a/).length == 0)
+        this.$split = function(text) {
+            return text.replace(/\r\n|\r/g, "\n").split("\n");
+        }
+    else
+        this.$split = function(text) {
+            return text.split(/\r\n|\r|\n/);
+        };
+
+
+    this.$detectNewLine = function(text) {
+        var match = text.match(/^.*?(\r\n|\r|\n)/m);
+        if (match) {
+            this.$autoNewLine = match[1];
+        } else {
+            this.$autoNewLine = "\n";
+        }
+    };
+
+    this.getNewLineCharacter = function() {
+      switch (this.$newLineMode) {
+          case "windows":
+              return "\r\n";
+
+          case "unix":
+              return "\n";
+
+          case "auto":
+              return this.$autoNewLine;
+      }
+    };
+
+    this.$autoNewLine = "\n";
+    this.$newLineMode = "auto";
+    this.setNewLineMode = function(newLineMode) {
+        if (this.$newLineMode === newLineMode)
+            return;
+
+        this.$newLineMode = newLineMode;
+    };
+
+    this.getNewLineMode = function() {
+        return this.$newLineMode;
+    };
+
+    this.isNewLine = function(text) {
+        return (text == "\r\n" || text == "\r" || text == "\n");
+    };
+
+    /**
+     * Get a verbatim copy of the given line as it is in the document
+     */
+    this.getLine = function(row) {
+        return this.$lines[row] || "";
+    };
+
+    this.getLines = function(firstRow, lastRow) {
+        return this.$lines.slice(firstRow, lastRow + 1);
+    };
+
+    /**
+     * Returns all lines in the document as string array. Warning: The caller
+     * should not modify this array!
+     */
+    this.getAllLines = function() {
+        return this.getLines(0, this.getLength());
+    };
+
+    this.getLength = function() {
+        return this.$lines.length;
+    };
+
+    this.getTextRange = function(range) {
+        if (range.start.row == range.end.row) {
+            return this.$lines[range.start.row].substring(range.start.column,
+                                                         range.end.column);
+        }
+        else {
+            var lines = [];
+            lines.push(this.$lines[range.start.row].substring(range.start.column));
+            lines.push.apply(lines, this.getLines(range.start.row+1, range.end.row-1));
+            lines.push(this.$lines[range.end.row].substring(0, range.end.column));
+            return lines.join(this.getNewLineCharacter());
+        }
+    };
+
+    this.$clipPosition = function(position) {
+        var length = this.getLength();
+        if (position.row >= length) {
+            position.row = Math.max(0, length - 1);
+            position.column = this.getLine(length-1).length;
+        }
+        return position;
+    };
+
+    this.insert = function(position, text) {
+        if (text.length == 0)
+            return position;
+
+        position = this.$clipPosition(position);
+
+        if (this.getLength() <= 1)
+            this.$detectNewLine(text);
+
+        var lines = this.$split(text);
+        var firstLine = lines.splice(0, 1)[0];
+        var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
+
+        position = this.insertInLine(position, firstLine);
+        if (lastLine !== null) {
+            position = this.insertNewLine(position); // terminate first line
+            position = this.insertLines(position.row, lines);
+            position = this.insertInLine(position, lastLine || "");
+        }
+        return position;
+    };
+
+    this.insertLines = function(row, lines) {
+        if (lines.length == 0)
+            return {row: row, column: 0};
+
+        var args = [row, 0];
+        args.push.apply(args, lines);
+        this.$lines.splice.apply(this.$lines, args);
+
+        var range = new Range(row, 0, row + lines.length, 0);
+        var delta = {
+            action: "insertLines",
+            range: range,
+            lines: lines
+        };
+        this._emit("change", { data: delta });
+        return range.end;
+    };
+
+    this.insertNewLine = function(position) {
+        position = this.$clipPosition(position);
+        var line = this.$lines[position.row] || "";
+
+        this.$lines[position.row] = line.substring(0, position.column);
+        this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
+
+        var end = {
+            row : position.row + 1,
+            column : 0
+        };
+
+        var delta = {
+            action: "insertText",
+            range: Range.fromPoints(position, end),
+            text: this.getNewLineCharacter()
+        };
+        this._emit("change", { data: delta });
+
+        return end;
+    };
+
+    this.insertInLine = function(position, text) {
+        if (text.length == 0)
+            return position;
+
+        var line = this.$lines[position.row] || "";
+
+        this.$lines[position.row] = line.substring(0, position.column) + text
+                + line.substring(position.column);
+
+        var end = {
+            row : position.row,
+            column : position.column + text.length
+        };
+
+        var delta = {
+            action: "insertText",
+            range: Range.fromPoints(position, end),
+            text: text
+        };
+        this._emit("change", { data: delta });
+
+        return end;
+    };
+
+    this.remove = function(range) {
+        // clip to document
+        range.start = this.$clipPosition(range.start);
+        range.end = this.$clipPosition(range.end);
+
+        if (range.isEmpty())
+            return range.start;
+
+        var firstRow = range.start.row;
+        var lastRow = range.end.row;
+
+        if (range.isMultiLine()) {
+            var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
+            var lastFullRow = lastRow - 1;
+
+            if (range.end.column > 0)
+                this.removeInLine(lastRow, 0, range.end.column);
+
+            if (lastFullRow >= firstFullRow)
+                this.removeLines(firstFullRow, lastFullRow);
+
+            if (firstFullRow != firstRow) {
+                this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length);
+                this.removeNewLine(range.start.row);
+            }
+        }
+        else {
+            this.removeInLine(firstRow, range.start.column, range.end.column);
+        }
+        return range.start;
+    };
+
+    this.removeInLine = function(row, startColumn, endColumn) {
+        if (startColumn == endColumn)
+            return;
+
+        var range = new Range(row, startColumn, row, endColumn);
+        var line = this.getLine(row);
+        var removed = line.substring(startColumn, endColumn);
+        var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
+        this.$lines.splice(row, 1, newLine);
+
+        var delta = {
+            action: "removeText",
+            range: range,
+            text: removed
+        };
+        this._emit("change", { data: delta });
+        return range.start;
+    };
+
+    /**
+     * Removes a range of full lines
+     *
+     * @param firstRow {Integer} The first row to be removed
+     * @param lastRow {Integer} The last row to be removed
+     * @return {String[]} The removed lines
+     */
+    this.removeLines = function(firstRow, lastRow) {
+        var range = new Range(firstRow, 0, lastRow + 1, 0);
+        var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
+
+        var delta = {
+            action: "removeLines",
+            range: range,
+            nl: this.getNewLineCharacter(),
+            lines: removed
+        };
+        this._emit("change", { data: delta });
+        return removed;
+    };
+
+    this.removeNewLine = function(row) {
+        var firstLine = this.getLine(row);
+        var secondLine = this.getLine(row+1);
+
+        var range = new Range(row, firstLine.length, row+1, 0);
+        var line = firstLine + secondLine;
+
+        this.$lines.splice(row, 2, line);
+
+        var delta = {
+            action: "removeText",
+            range: range,
+            text: this.getNewLineCharacter()
+        };
+        this._emit("change", { data: delta });
+    };
+
+    this.replace = function(range, text) {
+        if (text.length == 0 && range.isEmpty())
+            return range.start;
+
+        // Shortcut: If the text we want to insert is the same as it is already
+        // in the document, we don't have to replace anything.
+        if (text == this.getTextRange(range))
+            return range.end;
+
+        this.remove(range);
+        if (text) {
+            var end = this.insert(range.start, text);
+        }
+        else {
+            end = range.start;
+        }
+
+        return end;
+    };
+
+    this.applyDeltas = function(deltas) {
+        for (var i=0; i<deltas.length; i++) {
+            var delta = deltas[i];
+            var range = Range.fromPoints(delta.range.start, delta.range.end);
+
+            if (delta.action == "insertLines")
+                this.insertLines(range.start.row, delta.lines);
+            else if (delta.action == "insertText")
+                this.insert(range.start, delta.text);
+            else if (delta.action == "removeLines")
+                this.removeLines(range.start.row, range.end.row - 1);
+            else if (delta.action == "removeText")
+                this.remove(range);
+        }
+    };
+
+    this.revertDeltas = function(deltas) {
+        for (var i=deltas.length-1; i>=0; i--) {
+            var delta = deltas[i];
+
+            var range = Range.fromPoints(delta.range.start, delta.range.end);
+
+            if (delta.action == "insertLines")
+                this.removeLines(range.start.row, range.end.row - 1);
+            else if (delta.action == "insertText")
+                this.remove(range);
+            else if (delta.action == "removeLines")
+                this.insertLines(range.start.row, delta.lines);
+            else if (delta.action == "removeText")
+                this.insert(range.start, delta.text);
+        }
+    };
+
+}).call(Document.prototype);
+
+exports.Document = Document;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("./lib/oop");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+
+/**
+ * An Anchor is a floating pointer in the document. Whenever text is inserted or
+ * deleted before the cursor, the position of the cursor is updated
+ */
+var Anchor = exports.Anchor = function(doc, row, column) {
+    this.document = doc;
+    
+    if (typeof column == "undefined")
+        this.setPosition(row.row, row.column);
+    else
+        this.setPosition(row, column);
+
+    this.$onChange = this.onChange.bind(this);
+    doc.on("change", this.$onChange);
+};
+
+(function() {
+
+    oop.implement(this, EventEmitter);
+    
+    this.getPosition = function() {
+        return this.$clipPositionToDocument(this.row, this.column);
+    };
+    
+    this.getDocument = function() {
+        return this.document;
+    };
+    
+    this.onChange = function(e) {
+        var delta = e.data;
+        var range = delta.range;
+            
+        if (range.start.row == range.end.row && range.start.row != this.row)
+            return;
+            
+        if (range.start.row > this.row)
+            return;
+            
+        if (range.start.row == this.row && range.start.column > this.column)
+            return;
+    
+        var row = this.row;
+        var column = this.column;
+        
+        if (delta.action === "insertText") {
+            if (range.start.row === row && range.start.column <= column) {
+                if (range.start.row === range.end.row) {
+                    column += range.end.column - range.start.column;
+                }
+                else {
+                    column -= range.start.column;
+                    row += range.end.row - range.start.row;
+                }
+            }
+            else if (range.start.row !== range.end.row && range.start.row < row) {
+                row += range.end.row - range.start.row;
+            }
+        } else if (delta.action === "insertLines") {
+            if (range.start.row <= row) {
+                row += range.end.row - range.start.row;
+            }
+        }
+        else if (delta.action == "removeText") {
+            if (range.start.row == row && range.start.column < column) {
+                if (range.end.column >= column)
+                    column = range.start.column;
+                else
+                    column = Math.max(0, column - (range.end.column - range.start.column));
+                
+            } else if (range.start.row !== range.end.row && range.start.row < row) {
+                if (range.end.row == row) {
+                    column = Math.max(0, column - range.end.column) + range.start.column;
+                }
+                row -= (range.end.row - range.start.row);
+            }
+            else if (range.end.row == row) {
+                row -= range.end.row - range.start.row;
+                column = Math.max(0, column - range.end.column) + range.start.column;
+            }
+        } else if (delta.action == "removeLines") {
+            if (range.start.row <= row) {
+                if (range.end.row <= row)
+                    row -= range.end.row - range.start.row;
+                else {
+                    row = range.start.row;
+                    column = 0;
+                }
+            }
+        }
+
+        this.setPosition(row, column, true);
+    };
+
+    this.setPosition = function(row, column, noClip) {
+        var pos;
+        if (noClip) {
+            pos = {
+                row: row,
+                column: column
+            };
+        }
+        else {
+            pos = this.$clipPositionToDocument(row, column);
+        }
+        
+        if (this.row == pos.row && this.column == pos.column)
+            return;
+            
+        var old = {
+            row: this.row,
+            column: this.column
+        };
+        
+        this.row = pos.row;
+        this.column = pos.column;
+        this._emit("change", {
+            old: old,
+            value: pos
+        });
+    };
+    
+    this.detach = function() {
+        this.document.removeEventListener("change", this.$onChange);
+    };
+    
+    this.$clipPositionToDocument = function(row, column) {
+        var pos = {};
+    
+        if (row >= this.document.getLength()) {
+            pos.row = Math.max(0, this.document.getLength() - 1);
+            pos.column = this.document.getLine(pos.row).length;
+        }
+        else if (row < 0) {
+            pos.row = 0;
+            pos.column = 0;
+        }
+        else {
+            pos.row = row;
+            pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
+        }
+        
+        if (column < 0)
+            pos.column = 0;
+            
+        return pos;
+    };
+    
+}).call(Anchor.prototype);
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/background_tokenizer', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("./lib/oop");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+
+var BackgroundTokenizer = function(tokenizer, editor) {
+    this.running = false;    
+    this.lines = [];
+    this.currentLine = 0;
+    this.tokenizer = tokenizer;
+
+    var self = this;
+
+    this.$worker = function() {
+        if (!self.running) { return; }
+
+        var workerStart = new Date();
+        var startLine = self.currentLine;
+        var doc = self.doc;
+
+        var processedLines = 0;
+
+        var len = doc.getLength();
+        while (self.currentLine < len) {
+            self.lines[self.currentLine] = self.$tokenizeRows(self.currentLine, self.currentLine)[0];
+            self.currentLine++;
+
+            // only check every 5 lines
+            processedLines += 1;
+            if ((processedLines % 5 == 0) && (new Date() - workerStart) > 20) {
+                self.fireUpdateEvent(startLine, self.currentLine-1);
+                self.running = setTimeout(self.$worker, 20);
+                return;
+            }
+        }
+
+        self.running = false;
+
+        self.fireUpdateEvent(startLine, len - 1);
+    };
+};
+
+(function(){
+
+    oop.implement(this, EventEmitter);
+
+    this.setTokenizer = function(tokenizer) {
+        this.tokenizer = tokenizer;
+        this.lines = [];
+
+        this.start(0);
+    };
+
+    this.setDocument = function(doc) {
+        this.doc = doc;
+        this.lines = [];
+
+        this.stop();
+    };
+
+    this.fireUpdateEvent = function(firstRow, lastRow) {
+        var data = {
+            first: firstRow,
+            last: lastRow
+        };
+        this._emit("update", {data: data});
+    };
+
+    this.start = function(startRow) {
+        this.currentLine = Math.min(startRow || 0, this.currentLine,
+                                    this.doc.getLength());
+
+        // remove all cached items below this line
+        this.lines.splice(this.currentLine, this.lines.length);
+
+        this.stop();
+        // pretty long delay to prevent the tokenizer from interfering with the user
+        this.running = setTimeout(this.$worker, 700);
+    };
+
+    this.stop = function() {
+        if (this.running)
+            clearTimeout(this.running);
+        this.running = false;
+    };
+
+    this.getTokens = function(firstRow, lastRow) {
+        return this.$tokenizeRows(firstRow, lastRow);
+    };
+
+    this.getState = function(row) {
+        return this.$tokenizeRows(row, row)[0].state;
+    };
+
+    this.$tokenizeRows = function(firstRow, lastRow) {
+        if (!this.doc || isNaN(firstRow) || isNaN(lastRow))
+            return [{'state':'start','tokens':[]}];
+            
+        var rows = [];
+
+        // determine start state
+        var state = "start";
+        var doCache = false;
+        if (firstRow > 0 && this.lines[firstRow - 1]) {
+            state = this.lines[firstRow - 1].state;
+            doCache = true;
+        } else if (firstRow == 0) {
+            state = "start";
+            doCache = true;
+        } else if (this.lines.length > 0) {
+            // Guess that we haven't changed state.
+            state = this.lines[this.lines.length-1].state;
+        }
+
+        var lines = this.doc.getLines(firstRow, lastRow);
+        for (var row=firstRow; row<=lastRow; row++) {
+            if (!this.lines[row]) {
+                var tokens = this.tokenizer.getLineTokens(lines[row-firstRow] || "", state);
+                var state = tokens.state;
+                rows.push(tokens);
+
+                if (doCache) {
+                    this.lines[row] = tokens;
+                }
+            }
+            else {
+                var tokens = this.lines[row];
+                state = tokens.state;
+                rows.push(tokens);
+            }
+        }
+        return rows;
+    };
+
+}).call(BackgroundTokenizer.prototype);
+
+exports.BackgroundTokenizer = BackgroundTokenizer;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Julian Viereck <julian DOT viereck AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/edit_session/folding', ['require', 'exports', 'module' , 'ace/range', 'ace/edit_session/fold_line', 'ace/edit_session/fold', 'ace/token_iterator'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+var FoldLine = require("./fold_line").FoldLine;
+var Fold = require("./fold").Fold;
+var TokenIterator = require("../token_iterator").TokenIterator;
+
+function Folding() {
+    /**
+     * Looks up a fold at a given row/column. Possible values for side:
+     *   -1: ignore a fold if fold.start = row/column
+     *   +1: ignore a fold if fold.end = row/column
+     */
+    this.getFoldAt = function(row, column, side) {
+        var foldLine = this.getFoldLine(row);
+        if (!foldLine)
+            return null;
+
+        var folds = foldLine.folds;
+        for (var i = 0; i < folds.length; i++) {
+            var fold = folds[i];
+            if (fold.range.contains(row, column)) {
+                if (side == 1 && fold.range.isEnd(row, column)) {
+                    continue;
+                } else if (side == -1 && fold.range.isStart(row, column)) {
+                    continue;
+                }
+                return fold;
+            }
+        }
+    };
+
+    /**
+     * Returns all folds in the given range. Note, that this will return folds
+     *
+     */
+    this.getFoldsInRange = function(range) {
+        range = range.clone();
+        var start = range.start;
+        var end = range.end;
+        var foldLines = this.$foldData;
+        var foundFolds = [];
+
+        start.column += 1;
+        end.column -= 1;
+
+        for (var i = 0; i < foldLines.length; i++) {
+            var cmp = foldLines[i].range.compareRange(range);
+            if (cmp == 2) {
+                // Range is before foldLine. No intersection. This means,
+                // there might be other foldLines that intersect.
+                continue;
+            }
+            else if (cmp == -2) {
+                // Range is after foldLine. There can't be any other foldLines then,
+                // so let's give up.
+                break;
+            }
+
+            var folds = foldLines[i].folds;
+            for (var j = 0; j < folds.length; j++) {
+                var fold = folds[j];
+                cmp = fold.range.compareRange(range);
+                if (cmp == -2) {
+                    break;
+                } else if (cmp == 2) {
+                    continue;
+                } else
+                // WTF-state: Can happen due to -1/+1 to start/end column.
+                if (cmp == 42) {
+                    break;
+                }
+                foundFolds.push(fold);
+            }
+        }
+        return foundFolds;
+    };
+    
+    /**
+     * Returns all folds in the document
+     */
+    this.getAllFolds = function() {
+        var folds = [];
+        var foldLines = this.$foldData;
+        
+        function addFold(fold) {
+            folds.push(fold);
+            if (!fold.subFolds)
+                return;
+                
+            for (var i = 0; i < fold.subFolds.length; i++)
+                addFold(fold.subFolds[i]);
+        }
+        
+        for (var i = 0; i < foldLines.length; i++)
+            for (var j = 0; j < foldLines[i].folds.length; j++)
+                addFold(foldLines[i].folds[j]);
+
+        return folds;
+    };
+
+    /**
+     * Returns the string between folds at the given position.
+     * E.g.
+     *  foo<fold>b|ar<fold>wolrd -> "bar"
+     *  foo<fold>bar<fold>wol|rd -> "world"
+     *  foo<fold>bar<fo|ld>wolrd -> <null>
+     *
+     * where | means the position of row/column
+     *
+     * The trim option determs if the return string should be trimed according
+     * to the "side" passed with the trim value:
+     *
+     * E.g.
+     *  foo<fold>b|ar<fold>wolrd -trim=-1> "b"
+     *  foo<fold>bar<fold>wol|rd -trim=+1> "rld"
+     *  fo|o<fold>bar<fold>wolrd -trim=00> "foo"
+     */
+    this.getFoldStringAt = function(row, column, trim, foldLine) {
+        foldLine = foldLine || this.getFoldLine(row);
+        if (!foldLine)
+            return null;
+
+        var lastFold = {
+            end: { column: 0 }
+        };
+        // TODO: Refactor to use getNextFoldTo function.
+        var str, fold;
+        for (var i = 0; i < foldLine.folds.length; i++) {
+            fold = foldLine.folds[i];
+            var cmp = fold.range.compareEnd(row, column);
+            if (cmp == -1) {
+                str = this
+                    .getLine(fold.start.row)
+                    .substring(lastFold.end.column, fold.start.column);
+                break;
+            }
+            else if (cmp === 0) {
+                return null;
+            }
+            lastFold = fold;
+        }
+        if (!str)
+            str = this.getLine(fold.start.row).substring(lastFold.end.column);
+
+        if (trim == -1)
+            return str.substring(0, column - lastFold.end.column);
+        else if (trim == 1)
+            return str.substring(column - lastFold.end.column);
+        else
+            return str;
+    };
+
+    this.getFoldLine = function(docRow, startFoldLine) {
+        var foldData = this.$foldData;
+        var i = 0;
+        if (startFoldLine)
+            i = foldData.indexOf(startFoldLine);
+        if (i == -1)
+            i = 0;
+        for (i; i < foldData.length; i++) {
+            var foldLine = foldData[i];
+            if (foldLine.start.row <= docRow && foldLine.end.row >= docRow) {
+                return foldLine;
+            } else if (foldLine.end.row > docRow) {
+                return null;
+            }
+        }
+        return null;
+    };
+
+    // returns the fold which starts after or contains docRow
+    this.getNextFoldLine = function(docRow, startFoldLine) {
+        var foldData = this.$foldData;
+        var i = 0;
+        if (startFoldLine)
+            i = foldData.indexOf(startFoldLine);
+        if (i == -1)
+            i = 0;
+        for (i; i < foldData.length; i++) {
+            var foldLine = foldData[i];
+            if (foldLine.end.row >= docRow) {
+                return foldLine;
+            }
+        }
+        return null;
+    };
+
+    this.getFoldedRowCount = function(first, last) {
+        var foldData = this.$foldData, rowCount = last-first+1;
+        for (var i = 0; i < foldData.length; i++) {
+            var foldLine = foldData[i],
+                end = foldLine.end.row,
+                start = foldLine.start.row;
+            if (end >= last) {
+                if(start < last) {
+                    if(start >= first)
+                        rowCount -= last-start;
+                    else
+                        rowCount = 0;//in one fold
+                }
+                break;
+            } else if(end >= first){
+                if (start >= first) //fold inside range
+                    rowCount -=  end-start;
+                else
+                    rowCount -=  end-first+1;
+            }
+        }
+        return rowCount;
+    };
+
+    this.$addFoldLine = function(foldLine) {
+        this.$foldData.push(foldLine);
+        this.$foldData.sort(function(a, b) {
+            return a.start.row - b.start.row;
+        });
+        return foldLine;
+    };
+
+    /**
+     * Adds a new fold.
+     *
+     * @returns
+     *      The new created Fold object or an existing fold object in case the
+     *      passed in range fits an existing fold exactly.
+     */
+    this.addFold = function(placeholder, range) {
+        var foldData = this.$foldData;
+        var added = false;
+        var fold;
+        
+        if (placeholder instanceof Fold)
+            fold = placeholder;
+        else
+            fold = new Fold(range, placeholder);
+
+        this.$clipRangeToDocument(fold.range);
+
+        var startRow = fold.start.row;
+        var startColumn = fold.start.column;
+        var endRow = fold.end.row;
+        var endColumn = fold.end.column;
+
+        // --- Some checking ---
+        if (fold.placeholder.length < 2)
+            throw "Placeholder has to be at least 2 characters";
+
+        if (startRow == endRow && endColumn - startColumn < 2)
+            throw "The range has to be at least 2 characters width";
+
+        var startFold = this.getFoldAt(startRow, startColumn, 1);
+        var endFold = this.getFoldAt(endRow, endColumn, -1);
+        if (startFold && endFold == startFold)
+            return startFold.addSubFold(fold);
+
+        if (
+            (startFold && !startFold.range.isStart(startRow, startColumn))
+            || (endFold && !endFold.range.isEnd(endRow, endColumn))
+        ) {
+            throw "A fold can't intersect already existing fold" + fold.range + startFold.range;
+        }
+
+        // Check if there are folds in the range we create the new fold for.
+        var folds = this.getFoldsInRange(fold.range);
+        if (folds.length > 0) {
+            // Remove the folds from fold data.
+            this.removeFolds(folds);
+            // Add the removed folds as subfolds on the new fold.
+            fold.subFolds = folds;
+        }
+
+        for (var i = 0; i < foldData.length; i++) {
+            var foldLine = foldData[i];
+            if (endRow == foldLine.start.row) {
+                foldLine.addFold(fold);
+                added = true;
+                break;
+            }
+            else if (startRow == foldLine.end.row) {
+                foldLine.addFold(fold);
+                added = true;
+                if (!fold.sameRow) {
+                    // Check if we might have to merge two FoldLines.
+                    var foldLineNext = foldData[i + 1];
+                    if (foldLineNext && foldLineNext.start.row == endRow) {
+                        // We need to merge!
+                        foldLine.merge(foldLineNext);
+                        break;
+                    }
+                }
+                break;
+            }
+            else if (endRow <= foldLine.start.row) {
+                break;
+            }
+        }
+
+        if (!added)
+            foldLine = this.$addFoldLine(new FoldLine(this.$foldData, fold));
+
+        if (this.$useWrapMode)
+            this.$updateWrapData(foldLine.start.row, foldLine.start.row);
+
+        // Notify that fold data has changed.
+        this.$modified = true;
+        this._emit("changeFold", { data: fold });
+
+        return fold;
+    };
+
+    this.addFolds = function(folds) {
+        folds.forEach(function(fold) {
+            this.addFold(fold);
+        }, this);
+    };
+
+    this.removeFold = function(fold) {
+        var foldLine = fold.foldLine;
+        var startRow = foldLine.start.row;
+        var endRow = foldLine.end.row;
+
+        var foldLines = this.$foldData;
+        var folds = foldLine.folds;
+        // Simple case where there is only one fold in the FoldLine such that
+        // the entire fold line can get removed directly.
+        if (folds.length == 1) {
+            foldLines.splice(foldLines.indexOf(foldLine), 1);
+        } else
+        // If the fold is the last fold of the foldLine, just remove it.
+        if (foldLine.range.isEnd(fold.end.row, fold.end.column)) {
+            folds.pop();
+            foldLine.end.row = folds[folds.length - 1].end.row;
+            foldLine.end.column = folds[folds.length - 1].end.column;
+        } else
+        // If the fold is the first fold of the foldLine, just remove it.
+        if (foldLine.range.isStart(fold.start.row, fold.start.column)) {
+            folds.shift();
+            foldLine.start.row = folds[0].start.row;
+            foldLine.start.column = folds[0].start.column;
+        } else
+        // We know there are more then 2 folds and the fold is not at the edge.
+        // This means, the fold is somewhere in between.
+        //
+        // If the fold is in one row, we just can remove it.
+        if (fold.sameRow) {
+            folds.splice(folds.indexOf(fold), 1);
+        } else
+        // The fold goes over more then one row. This means remvoing this fold
+        // will cause the fold line to get splitted up. newFoldLine is the second part
+        {
+            var newFoldLine = foldLine.split(fold.start.row, fold.start.column);
+            folds = newFoldLine.folds;
+            folds.shift();
+            newFoldLine.start.row = folds[0].start.row;
+            newFoldLine.start.column = folds[0].start.column;
+        }
+
+        if (this.$useWrapMode) {
+            this.$updateWrapData(startRow, endRow);
+        }
+
+        // Notify that fold data has changed.
+        this.$modified = true;
+        this._emit("changeFold", { data: fold });
+    };
+
+    this.removeFolds = function(folds) {
+        // We need to clone the folds array passed in as it might be the folds
+        // array of a fold line and as we call this.removeFold(fold), folds
+        // are removed from folds and changes the current index.
+        var cloneFolds = [];
+        for (var i = 0; i < folds.length; i++) {
+            cloneFolds.push(folds[i]);
+        }
+
+        cloneFolds.forEach(function(fold) {
+            this.removeFold(fold);
+        }, this);
+        this.$modified = true;
+    };
+
+    this.expandFold = function(fold) {
+        this.removeFold(fold);
+        fold.subFolds.forEach(function(fold) {
+            this.addFold(fold);
+        }, this);
+        fold.subFolds = [];
+    };
+
+    this.expandFolds = function(folds) {
+        folds.forEach(function(fold) {
+            this.expandFold(fold);
+        }, this);
+    };
+
+    this.unfold = function(location, expandInner) {
+        var range, folds;
+        if (location == null)
+            range = new Range(0, 0, this.getLength(), 0);
+        else if (typeof location == "number")
+            range = new Range(location, 0, location, this.getLine(location).length);
+        else if ("row" in location)
+            range = Range.fromPoints(location, location);
+        else
+            range = location;
+
+        folds = this.getFoldsInRange(range);
+        if (expandInner) {
+            this.removeFolds(folds);
+        } else {
+            // TODO: might need to remove and add folds in one go instead of using
+            // expandFolds several times.
+            while (folds.length) {
+                this.expandFolds(folds);
+                folds = this.getFoldsInRange(range);
+            }
+        }
+    };
+
+    /**
+     * Checks if a given documentRow is folded. This is true if there are some
+     * folded parts such that some parts of the line is still visible.
+     **/
+    this.isRowFolded = function(docRow, startFoldRow) {
+        return !!this.getFoldLine(docRow, startFoldRow);
+    };
+
+    this.getRowFoldEnd = function(docRow, startFoldRow) {
+        var foldLine = this.getFoldLine(docRow, startFoldRow);
+        return (foldLine
+            ? foldLine.end.row
+            : docRow);
+    };
+
+    this.getFoldDisplayLine = function(foldLine, endRow, endColumn, startRow, startColumn) {
+        if (startRow == null) {
+            startRow = foldLine.start.row;
+            startColumn = 0;
+        }
+
+        if (endRow == null) {
+            endRow = foldLine.end.row;
+            endColumn = this.getLine(endRow).length;
+        }
+
+        // Build the textline using the FoldLine walker.
+        var doc = this.doc;
+        var textLine = "";
+
+        foldLine.walk(function(placeholder, row, column, lastColumn) {
+            if (row < startRow) {
+                return;
+            } else if (row == startRow) {
+                if (column < startColumn) {
+                    return;
+                }
+                lastColumn = Math.max(startColumn, lastColumn);
+            }
+            if (placeholder) {
+                textLine += placeholder;
+            } else {
+                textLine += doc.getLine(row).substring(lastColumn, column);
+            }
+        }.bind(this), endRow, endColumn);
+        return textLine;
+    };
+
+    this.getDisplayLine = function(row, endColumn, startRow, startColumn) {
+        var foldLine = this.getFoldLine(row);
+
+        if (!foldLine) {
+            var line;
+            line = this.doc.getLine(row);
+            return line.substring(startColumn || 0, endColumn || line.length);
+        } else {
+            return this.getFoldDisplayLine(
+                foldLine, row, endColumn, startRow, startColumn);
+        }
+    };
+
+    this.$cloneFoldData = function() {
+        var fd = [];
+        fd = this.$foldData.map(function(foldLine) {
+            var folds = foldLine.folds.map(function(fold) {
+                return fold.clone();
+            });
+            return new FoldLine(fd, folds);
+        });
+
+        return fd;
+    };
+
+    this.toggleFold = function(tryToUnfold) {
+        var selection = this.selection;
+        var range = selection.getRange();
+        var fold;
+        var bracketPos;
+
+        if (range.isEmpty()) {
+            var cursor = range.start;
+            fold = this.getFoldAt(cursor.row, cursor.column);
+
+            if (fold) {
+                this.expandFold(fold);
+                return;
+            }
+            else if (bracketPos = this.findMatchingBracket(cursor)) {
+                if (range.comparePoint(bracketPos) == 1) {
+                    range.end = bracketPos;
+                } 
+                else {
+                    range.start = bracketPos;
+                    range.start.column++;
+                    range.end.column--;
+                }
+            }
+            else if (bracketPos = this.findMatchingBracket({row: cursor.row, column: cursor.column + 1})) {
+                if (range.comparePoint(bracketPos) == 1)
+                    range.end = bracketPos;
+                else
+                    range.start = bracketPos;
+
+                range.start.column++;
+            }
+            else {
+                range = this.getCommentFoldRange(cursor.row, cursor.column) || range;
+            }
+        } else {
+            var folds = this.getFoldsInRange(range);
+            if (tryToUnfold && folds.length) {
+                this.expandFolds(folds);
+                return;
+            } 
+            else if (folds.length == 1 ) {
+                fold = folds[0];
+            }
+        }
+
+        if (!fold)
+            fold = this.getFoldAt(range.start.row, range.start.column);
+
+        if (fold && fold.range.toString() == range.toString()) {
+            this.expandFold(fold);
+            return;
+        }
+
+        var placeholder = "...";
+        if (!range.isMultiLine()) {
+            placeholder = this.getTextRange(range);
+            if(placeholder.length < 4)
+                return;
+            placeholder = placeholder.trim().substring(0, 2) + "..";
+        }
+
+        this.addFold(placeholder, range);
+    };
+
+    this.getCommentFoldRange = function(row, column) {
+        var iterator = new TokenIterator(this, row, column);
+        var token = iterator.getCurrentToken();
+        if (token && /^comment|string/.test(token.type)) {
+            var range = new Range();
+            var re = new RegExp(token.type.replace(/\..*/, "\\."));
+            do {
+                token = iterator.stepBackward();
+            } while(token && re.test(token.type));
+
+            iterator.stepForward();
+            range.start.row = iterator.getCurrentTokenRow();
+            range.start.column = iterator.getCurrentTokenColumn() + 2;
+
+            iterator = new TokenIterator(this, row, column);
+
+            do {
+                token = iterator.stepForward();
+            } while(token && re.test(token.type));
+            
+            token = iterator.stepBackward();
+
+            range.end.row = iterator.getCurrentTokenRow();
+            range.end.column = iterator.getCurrentTokenColumn() + token.value.length;
+            return range;
+        }
+    };
+
+    this.foldAll = function(startRow, endRow) {
+        var foldWidgets = this.foldWidgets;
+        endRow = endRow || foldWidgets.length;
+        for (var row = startRow || 0; row < endRow; row++) {
+            if (foldWidgets[row] == null)
+                foldWidgets[row] = this.getFoldWidget(row);
+            if (foldWidgets[row] != "start")
+                continue;
+
+            var range = this.getFoldWidgetRange(row);
+            // sometimes range can be incompatible with existing fold
+            // wouldn't it be better for addFold to return null istead of throwing?
+            if (range && range.end.row < endRow) try {
+                this.addFold("...", range);
+            } catch(e) {}
+        }
+    };
+    
+    this.$foldStyles = {
+        "manual": 1,
+        "markbegin": 1,
+        "markbeginend": 1
+    };
+    this.$foldStyle = "markbegin";
+    this.setFoldStyle = function(style) {
+        if (!this.$foldStyles[style])
+            throw new Error("invalid fold style: " + style + "[" + Object.keys(this.$foldStyles).join(", ") + "]");
+        
+        if (this.$foldStyle == style)
+            return;
+
+        this.$foldStyle = style;
+        
+        if (style == "manual")
+            this.unfold();
+        
+        // reset folding
+        var mode = this.$foldMode;
+        this.$setFolding(null);
+        this.$setFolding(mode);
+    };
+
+    // structured folding
+    this.$setFolding = function(foldMode) {
+        if (this.$foldMode == foldMode)
+            return;
+            
+        this.$foldMode = foldMode;
+        
+        this.removeListener('change', this.$updateFoldWidgets);
+        this._emit("changeAnnotation");
+        
+        if (!foldMode || this.$foldStyle == "manual") {
+            this.foldWidgets = null;
+            return;
+        }
+        
+        this.foldWidgets = [];
+        this.getFoldWidget = foldMode.getFoldWidget.bind(foldMode, this, this.$foldStyle);
+        this.getFoldWidgetRange = foldMode.getFoldWidgetRange.bind(foldMode, this, this.$foldStyle);
+        
+        this.$updateFoldWidgets = this.updateFoldWidgets.bind(this);
+        this.on('change', this.$updateFoldWidgets);
+        
+    };
+
+    this.onFoldWidgetClick = function(row, e) {
+        var type = this.getFoldWidget(row);
+        var line = this.getLine(row);
+        var onlySubfolds = e.shiftKey;
+        var addSubfolds = onlySubfolds || e.ctrlKey || e.altKey || e.metaKey;
+        var fold;
+
+        if (type == "end")
+            fold = this.getFoldAt(row, 0, -1);
+        else
+            fold = this.getFoldAt(row, line.length, 1);
+
+        if (fold) {
+            if (addSubfolds)
+                this.removeFold(fold);
+            else
+                this.expandFold(fold);
+            return;
+        }
+
+        var range = this.getFoldWidgetRange(row);
+        if (range) {
+            // sometimes singleline folds can be missed by the code above
+            if (!range.isMultiLine()) {
+                fold = this.getFoldAt(range.start.row, range.start.column, 1);
+                if (fold && range.isEequal(fold.range)) {
+                    this.removeFold(fold);
+                    return;
+                }
+            }
+            
+            if (!onlySubfolds)
+                this.addFold("...", range);
+
+            if (addSubfolds)
+                this.foldAll(range.start.row + 1, range.end.row);
+        } else {
+            if (addSubfolds)
+                this.foldAll(row + 1, this.getLength());
+            e.target.className += " invalid"
+        }
+    };
+    
+    this.updateFoldWidgets = function(e) {
+        var delta = e.data;
+        var range = delta.range;
+        var firstRow = range.start.row;
+        var len = range.end.row - firstRow;
+
+        if (len === 0) {
+            this.foldWidgets[firstRow] = null;
+        } else if (delta.action == "removeText" || delta.action == "removeLines") {
+            this.foldWidgets.splice(firstRow, len + 1, null);
+        } else {
+            var args = Array(len + 1);
+            args.unshift(firstRow, 1);
+            this.foldWidgets.splice.apply(this.foldWidgets, args);
+        }
+    };
+
+}
+
+exports.Folding = Folding;
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Julian Viereck <julian DOT viereck AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/edit_session/fold_line', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+/**
+ * If an array is passed in, the folds are expected to be sorted already.
+ */
+function FoldLine(foldData, folds) {
+    this.foldData = foldData;
+    if (Array.isArray(folds)) {
+        this.folds = folds;
+    } else {
+        folds = this.folds = [ folds ];
+    }
+
+    var last = folds[folds.length - 1]
+    this.range = new Range(folds[0].start.row, folds[0].start.column,
+                           last.end.row, last.end.column);
+    this.start = this.range.start;
+    this.end   = this.range.end;
+
+    this.folds.forEach(function(fold) {
+        fold.setFoldLine(this);
+    }, this);
+}
+
+(function() {
+    /**
+     * Note: This doesn't update wrapData!
+     */
+    this.shiftRow = function(shift) {
+        this.start.row += shift;
+        this.end.row += shift;
+        this.folds.forEach(function(fold) {
+            fold.start.row += shift;
+            fold.end.row += shift;
+        });
+    }
+
+    this.addFold = function(fold) {
+        if (fold.sameRow) {
+            if (fold.start.row < this.startRow || fold.endRow > this.endRow) {
+                throw "Can't add a fold to this FoldLine as it has no connection";
+            }
+            this.folds.push(fold);
+            this.folds.sort(function(a, b) {
+                return -a.range.compareEnd(b.start.row, b.start.column);
+            });
+            if (this.range.compareEnd(fold.start.row, fold.start.column) > 0) {
+                this.end.row = fold.end.row;
+                this.end.column =  fold.end.column;
+            } else if (this.range.compareStart(fold.end.row, fold.end.column) < 0) {
+                this.start.row = fold.start.row;
+                this.start.column = fold.start.column;
+            }
+        } else if (fold.start.row == this.end.row) {
+            this.folds.push(fold);
+            this.end.row = fold.end.row;
+            this.end.column = fold.end.column;
+        } else if (fold.end.row == this.start.row) {
+            this.folds.unshift(fold);
+            this.start.row = fold.start.row;
+            this.start.column = fold.start.column;
+        } else {
+            throw "Trying to add fold to FoldRow that doesn't have a matching row";
+        }
+        fold.foldLine = this;
+    }
+
+    this.containsRow = function(row) {
+        return row >= this.start.row && row <= this.end.row;
+    }
+
+    this.walk = function(callback, endRow, endColumn) {
+        var lastEnd = 0,
+            folds = this.folds,
+            fold,
+            comp, stop, isNewRow = true;
+
+        if (endRow == null) {
+            endRow = this.end.row;
+            endColumn = this.end.column;
+        }
+
+        for (var i = 0; i < folds.length; i++) {
+            fold = folds[i];
+
+            comp = fold.range.compareStart(endRow, endColumn);
+            // This fold is after the endRow/Column.
+            if (comp == -1) {
+                callback(null, endRow, endColumn, lastEnd, isNewRow);
+                return;
+            }
+
+            stop = callback(null, fold.start.row, fold.start.column, lastEnd, isNewRow);
+            stop = !stop && callback(fold.placeholder, fold.start.row, fold.start.column, lastEnd);
+
+            // If the user requested to stop the walk or endRow/endColumn is
+            // inside of this fold (comp == 0), then end here.
+            if (stop || comp == 0) {
+                return;
+            }
+
+            // Note the new lastEnd might not be on the same line. However,
+            // it's the callback's job to recognize this.
+            isNewRow = !fold.sameRow;
+            lastEnd = fold.end.column;
+        }
+        callback(null, endRow, endColumn, lastEnd, isNewRow);
+    }
+
+    this.getNextFoldTo = function(row, column) {
+        var fold, cmp;
+        for (var i = 0; i < this.folds.length; i++) {
+            fold = this.folds[i];
+            cmp = fold.range.compareEnd(row, column);
+            if (cmp == -1) {
+                return {
+                    fold: fold,
+                    kind: "after"
+                };
+            } else if (cmp == 0) {
+                return {
+                    fold: fold,
+                    kind: "inside"
+                }
+            }
+        }
+        return null;
+    }
+
+    this.addRemoveChars = function(row, column, len) {
+        var ret = this.getNextFoldTo(row, column),
+            fold, folds;
+        if (ret) {
+            fold = ret.fold;
+            if (ret.kind == "inside"
+                && fold.start.column != column
+                && fold.start.row != row)
+            {
+                throw "Moving characters inside of a fold should never be reached";
+            } else if (fold.start.row == row) {
+                folds = this.folds;
+                var i = folds.indexOf(fold);
+                if (i == 0) {
+                    this.start.column += len;
+                }
+                for (i; i < folds.length; i++) {
+                    fold = folds[i];
+                    fold.start.column += len;
+                    if (!fold.sameRow) {
+                        return;
+                    }
+                    fold.end.column += len;
+                }
+                this.end.column += len;
+            }
+        }
+    }
+
+    this.split = function(row, column) {
+        var fold = this.getNextFoldTo(row, column).fold,
+            folds = this.folds;
+        var foldData = this.foldData;
+
+        if (!fold) {
+            return null;
+        }
+        var i = folds.indexOf(fold);
+        var foldBefore = folds[i - 1];
+        this.end.row = foldBefore.end.row;
+        this.end.column = foldBefore.end.column;
+
+        // Remove the folds after row/column and create a new FoldLine
+        // containing these removed folds.
+        folds = folds.splice(i, folds.length - i);
+
+        var newFoldLine = new FoldLine(foldData, folds);
+        foldData.splice(foldData.indexOf(this) + 1, 0, newFoldLine);
+        return newFoldLine;
+    }
+
+    this.merge = function(foldLineNext) {
+        var folds = foldLineNext.folds;
+        for (var i = 0; i < folds.length; i++) {
+            this.addFold(folds[i]);
+        }
+        // Remove the foldLineNext - no longer needed, as
+        // it's merged now with foldLineNext.
+        var foldData = this.foldData;
+        foldData.splice(foldData.indexOf(foldLineNext), 1);
+    }
+
+    this.toString = function() {
+        var ret = [this.range.toString() + ": [" ];
+
+        this.folds.forEach(function(fold) {
+            ret.push("  " + fold.toString());
+        });
+        ret.push("]")
+        return ret.join("\n");
+    }
+
+    this.idxToPosition = function(idx) {
+        var lastFoldEndColumn = 0;
+        var fold;
+
+        for (var i = 0; i < this.folds.length; i++) {
+            var fold = this.folds[i];
+
+            idx -= fold.start.column - lastFoldEndColumn;
+            if (idx < 0) {
+                return {
+                    row: fold.start.row,
+                    column: fold.start.column + idx
+                };
+            }
+
+            idx -= fold.placeholder.length;
+            if (idx < 0) {
+                return fold.start;
+            }
+
+            lastFoldEndColumn = fold.end.column;
+        }
+
+        return {
+            row: this.end.row,
+            column: this.end.column + idx
+        };
+    }
+}).call(FoldLine.prototype);
+
+exports.FoldLine = FoldLine;
+});/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Julian Viereck <julian DOT viereck AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/edit_session/fold', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+/**
+ * Simple fold-data struct.
+ **/
+var Fold = exports.Fold = function(range, placeholder) {
+    this.foldLine = null;
+    this.placeholder = placeholder;
+    this.range = range;
+    this.start = range.start;
+    this.end = range.end;
+
+    this.sameRow = range.start.row == range.end.row;
+    this.subFolds = [];
+};
+
+(function() {
+
+    this.toString = function() {
+        return '"' + this.placeholder + '" ' + this.range.toString();
+    };
+
+    this.setFoldLine = function(foldLine) {
+        this.foldLine = foldLine;
+        this.subFolds.forEach(function(fold) {
+            fold.setFoldLine(foldLine);
+        });
+    };
+
+    this.clone = function() {
+        var range = this.range.clone();
+        var fold = new Fold(range, this.placeholder);
+        this.subFolds.forEach(function(subFold) {
+            fold.subFolds.push(subFold.clone());
+        });
+        return fold;
+    };
+
+    this.addSubFold = function(fold) {
+        if (this.range.isEequal(fold))
+            return this;
+
+        if (!this.range.containsRange(fold))
+            throw "A fold can't intersect already existing fold" + fold.range + this.range;
+
+        var row = fold.range.start.row, column = fold.range.start.column;
+        for (var i = 0, cmp = -1; i < this.subFolds.length; i++) {
+            cmp = this.subFolds[i].range.compare(row, column);
+            if (cmp != 1)
+                break;
+        }
+        var afterStart = this.subFolds[i];
+
+        if (cmp == 0)
+            return afterStart.addSubFold(fold)
+
+        // cmp == -1
+        var row = fold.range.end.row, column = fold.range.end.column;
+        for (var j = i, cmp = -1; j < this.subFolds.length; j++) {
+            cmp = this.subFolds[j].range.compare(row, column);
+            if (cmp != 1)
+                break;
+        }
+        var afterEnd = this.subFolds[j];
+
+        if (cmp == 0)
+            throw "A fold can't intersect already existing fold" + fold.range + this.range;
+
+        var consumedFolds = this.subFolds.splice(i, j - i, fold)
+        fold.setFoldLine(this.foldLine);
+
+        return fold;
+    }
+
+}).call(Fold.prototype);
+
+});/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/token_iterator', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+var TokenIterator = function(session, initialRow, initialColumn) {
+    this.$session = session;
+    this.$row = initialRow;
+    this.$rowTokens = session.getTokens(initialRow, initialRow)[0].tokens;
+
+    var token = session.getTokenAt(initialRow, initialColumn);
+    this.$tokenIndex = token ? token.index : -1;
+};
+
+(function() {
+    
+    this.stepBackward = function() {
+        this.$tokenIndex -= 1;
+        
+        while (this.$tokenIndex < 0) {
+            this.$row -= 1;
+            if (this.$row < 0) {
+                this.$row = 0;
+                return null;
+            }
+                
+            this.$rowTokens = this.$session.getTokens(this.$row, this.$row)[0].tokens;
+            this.$tokenIndex = this.$rowTokens.length - 1;
+        }
+            
+        return this.$rowTokens[this.$tokenIndex];
+    };
+    
+    this.stepForward = function() {
+        var rowCount = this.$session.getLength();
+        this.$tokenIndex += 1;
+        
+        while (this.$tokenIndex >= this.$rowTokens.length) {
+            this.$row += 1;
+            if (this.$row >= rowCount) {
+                this.$row = rowCount - 1;
+                return null;
+            }
+
+            this.$rowTokens = this.$session.getTokens(this.$row, this.$row)[0].tokens;
+            this.$tokenIndex = 0;
+        }
+            
+        return this.$rowTokens[this.$tokenIndex];
+    };
+    
+    this.getCurrentToken = function () {
+        return this.$rowTokens[this.$tokenIndex];
+    };
+    
+    this.getCurrentTokenRow = function () {
+        return this.$row;
+    };
+    
+    this.getCurrentTokenColumn = function() {
+        var rowTokens = this.$rowTokens;
+        var tokenIndex = this.$tokenIndex;
+        
+        // If a column was cached by EditSession.getTokenAt, then use it
+        var column = rowTokens[tokenIndex].start;
+        if (column !== undefined)
+            return column;
+            
+        column = 0;
+        while (tokenIndex > 0) {
+            tokenIndex -= 1;
+            column += rowTokens[tokenIndex].value.length;
+        }
+        
+        return column;  
+    };
+            
+}).call(TokenIterator.prototype);
+
+exports.TokenIterator = TokenIterator;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/edit_session/bracket_match', ['require', 'exports', 'module' , 'ace/token_iterator'], function(require, exports, module) {
+"use strict";
+
+var TokenIterator = require("../token_iterator").TokenIterator;
+
+function BracketMatch() {
+
+    this.findMatchingBracket = function(position) {
+        if (position.column == 0) return null;
+
+        var charBeforeCursor = this.getLine(position.row).charAt(position.column-1);
+        if (charBeforeCursor == "") return null;
+
+        var match = charBeforeCursor.match(/([\(\[\{])|([\)\]\}])/);
+        if (!match) {
+            return null;
+        }
+
+        if (match[1]) {
+            return this.$findClosingBracket(match[1], position);
+        } else {
+            return this.$findOpeningBracket(match[2], position);
+        }
+    };
+
+    this.$brackets = {
+        ")": "(",
+        "(": ")",
+        "]": "[",
+        "[": "]",
+        "{": "}",
+        "}": "{"
+    };
+
+    this.$findOpeningBracket = function(bracket, position) {
+        var openBracket = this.$brackets[bracket];
+        var depth = 1;
+
+        var iterator = new TokenIterator(this, position.row, position.column);
+        var token = iterator.getCurrentToken();
+        if (!token) return null;
+        
+        // token.type contains a period-delimited list of token identifiers
+        // (e.g.: "constant.numeric" or "paren.lparen").  Create a pattern that
+        // matches any token containing the same identifiers or a subset.  In
+        // addition, if token.type includes "rparen", then also match "lparen".
+        // So if type.token is "paren.rparen", then typeRe will match "lparen.paren".
+        var typeRe = new RegExp("(\\.?" +
+            token.type.replace(".", "|").replace("rparen", "lparen|rparen") + ")+");
+        
+        // Start searching in token, just before the character at position.column
+        var valueIndex = position.column - iterator.getCurrentTokenColumn() - 2;
+        var value = token.value;
+        
+        while (true) {
+        
+            while (valueIndex >= 0) {
+                var chr = value.charAt(valueIndex);
+                if (chr == openBracket) {
+                    depth -= 1;
+                    if (depth == 0) {
+                        return {row: iterator.getCurrentTokenRow(),
+                            column: valueIndex + iterator.getCurrentTokenColumn()};
+                    }
+                }
+                else if (chr == bracket) {
+                    depth += 1;
+                }
+                valueIndex -= 1;
+            }
+
+            // Scan backward through the document, looking for the next token
+            // whose type matches typeRe
+            do {
+                token = iterator.stepBackward();
+            } while (token && !typeRe.test(token.type));
+
+            if (token == null)
+                break;
+                
+            value = token.value;
+            valueIndex = value.length - 1;
+        }
+        
+        return null;
+    };
+
+    this.$findClosingBracket = function(bracket, position) {
+        var closingBracket = this.$brackets[bracket];
+        var depth = 1;
+
+        var iterator = new TokenIterator(this, position.row, position.column);
+        var token = iterator.getCurrentToken();
+        if (!token) return null;
+
+        // token.type contains a period-delimited list of token identifiers
+        // (e.g.: "constant.numeric" or "paren.lparen").  Create a pattern that
+        // matches any token containing the same identifiers or a subset.  In
+        // addition, if token.type includes "lparen", then also match "rparen".
+        // So if type.token is "lparen.paren", then typeRe will match "paren.rparen".
+        var typeRe = new RegExp("(\\.?" +
+            token.type.replace(".", "|").replace("lparen", "lparen|rparen") + ")+");
+
+        // Start searching in token, after the character at position.column
+        var valueIndex = position.column - iterator.getCurrentTokenColumn();
+
+        while (true) {
+
+            var value = token.value;
+            var valueLength = value.length;
+            while (valueIndex < valueLength) {
+                var chr = value.charAt(valueIndex);
+                if (chr == closingBracket) {
+                    depth -= 1;
+                    if (depth == 0) {
+                        return {row: iterator.getCurrentTokenRow(),
+                            column: valueIndex + iterator.getCurrentTokenColumn()};
+                    }
+                }
+                else if (chr == bracket) {
+                    depth += 1;
+                }
+                valueIndex += 1;
+            }
+
+            // Scan forward through the document, looking for the next token
+            // whose type matches typeRe
+            do {
+                token = iterator.stepForward();
+            } while (token && !typeRe.test(token.type));
+
+            if (token == null)
+                break;
+
+            valueIndex = 0;
+        }
+        
+        return null;
+    };
+}
+exports.BracketMatch = BracketMatch;
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/search', ['require', 'exports', 'module' , 'ace/lib/lang', 'ace/lib/oop', 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var lang = require("./lib/lang");
+var oop = require("./lib/oop");
+var Range = require("./range").Range;
+
+var Search = function() {
+    this.$options = {
+        needle: "",
+        backwards: false,
+        wrap: false,
+        caseSensitive: false,
+        wholeWord: false,
+        scope: Search.ALL,
+        regExp: false
+    };
+};
+
+Search.ALL = 1;
+Search.SELECTION = 2;
+
+(function() {
+
+    this.set = function(options) {
+        oop.mixin(this.$options, options);
+        return this;
+    };
+    
+    this.getOptions = function() {
+        return lang.copyObject(this.$options);
+    };
+
+    this.find = function(session) {
+        if (!this.$options.needle)
+            return null;
+
+        if (this.$options.backwards) {
+            var iterator = this.$backwardMatchIterator(session);
+        } else {
+            iterator = this.$forwardMatchIterator(session);
+        }
+
+        var firstRange = null;
+        iterator.forEach(function(range) {
+            firstRange = range;
+            return true;
+        });
+
+        return firstRange;
+    };
+
+    this.findAll = function(session) {
+        var options = this.$options;
+        if (!options.needle)
+            return [];
+
+        if (options.backwards) {
+            var iterator = this.$backwardMatchIterator(session);
+        } else {
+            iterator = this.$forwardMatchIterator(session);
+        }
+
+        var ignoreCursor = !options.start && options.wrap && options.scope == Search.ALL;
+        if (ignoreCursor)
+            options.start = {row: 0, column: 0};
+
+        var ranges = [];
+        iterator.forEach(function(range) {
+            ranges.push(range);
+        });
+
+        if (ignoreCursor)
+            options.start = null;
+
+        return ranges;
+    };
+
+    this.replace = function(input, replacement) {
+        var re = this.$assembleRegExp();
+        var match = re.exec(input);
+        if (match && match[0].length == input.length) {
+            if (this.$options.regExp) {
+                return input.replace(re, replacement);
+            } else {
+                return replacement;
+            }
+        } else {
+            return null;
+        }
+    };
+
+    this.$forwardMatchIterator = function(session) {
+        var re = this.$assembleRegExp();
+        var self = this;
+
+        return {
+            forEach: function(callback) {
+                self.$forwardLineIterator(session).forEach(function(line, startIndex, row) {
+                    if (startIndex) {
+                        line = line.substring(startIndex);
+                    }
+
+                    var matches = [];
+
+                    line.replace(re, function(str) {
+                        var offset = arguments[arguments.length-2];
+                        matches.push({
+                            str: str,
+                            offset: startIndex + offset
+                        });
+                        return str;
+                    });
+
+                    for (var i=0; i<matches.length; i++) {
+                        var match = matches[i];
+                        var range = self.$rangeFromMatch(row, match.offset, match.str.length);
+                        if (callback(range))
+                            return true;
+                    }
+
+                });
+            }
+        };
+    };
+
+    this.$backwardMatchIterator = function(session) {
+        var re = this.$assembleRegExp();
+        var self = this;
+
+        return {
+            forEach: function(callback) {
+                self.$backwardLineIterator(session).forEach(function(line, startIndex, row) {
+                    if (startIndex) {
+                        line = line.substring(startIndex);
+                    }
+
+                    var matches = [];
+
+                    line.replace(re, function(str, offset) {
+                        matches.push({
+                            str: str,
+                            offset: startIndex + offset
+                        });
+                        return str;
+                    });
+
+                    for (var i=matches.length-1; i>= 0; i--) {
+                        var match = matches[i];
+                        var range = self.$rangeFromMatch(row, match.offset, match.str.length);
+                        if (callback(range))
+                            return true;
+                    }
+                });
+            }
+        };
+    };
+
+    this.$rangeFromMatch = function(row, column, length) {
+        return new Range(row, column, row, column+length);
+    };
+
+    this.$assembleRegExp = function() {
+        if (this.$options.regExp) {
+            var needle = this.$options.needle;
+        } else {
+            needle = lang.escapeRegExp(this.$options.needle);
+        }
+
+        if (this.$options.wholeWord) {
+            needle = "\\b" + needle + "\\b";
+        }
+
+        var modifier = "g";
+        if (!this.$options.caseSensitive) {
+            modifier += "i";
+        }
+
+        var re = new RegExp(needle, modifier);
+        return re;
+    };
+
+    this.$forwardLineIterator = function(session) {
+        var searchSelection = this.$options.scope == Search.SELECTION;
+
+        var range = this.$options.range || session.getSelection().getRange();
+        var start = this.$options.start || range[searchSelection ? "start" : "end"];
+
+        var firstRow = searchSelection ? range.start.row : 0;
+        var firstColumn = searchSelection ? range.start.column : 0;
+        var lastRow = searchSelection ? range.end.row : session.getLength() - 1;
+
+        var wrap = this.$options.wrap;
+        var inWrap = false;
+
+        function getLine(row) {
+            var line = session.getLine(row);
+            if (searchSelection && row == range.end.row) {
+                line = line.substring(0, range.end.column);
+            }
+            if (inWrap && row == start.row) {
+                line = line.substring(0, start.column);
+            }
+            return line;
+        }
+
+        return {
+            forEach: function(callback) {
+                var row = start.row;
+
+                var line = getLine(row);
+                var startIndex = start.column;
+
+                var stop = false;
+                inWrap = false;
+
+                while (!callback(line, startIndex, row)) {
+
+                    if (stop) {
+                        return;
+                    }
+
+                    row++;
+                    startIndex = 0;
+
+                    if (row > lastRow) {
+                        if (wrap) {
+                            row = firstRow;
+                            startIndex = firstColumn;
+                            inWrap = true;
+                        } else {
+                            return;
+                        }
+                    }
+
+                    if (row == start.row)
+                        stop = true;
+
+                    line = getLine(row);
+                }
+            }
+        };
+    };
+
+    this.$backwardLineIterator = function(session) {
+        var searchSelection = this.$options.scope == Search.SELECTION;
+
+        var range = this.$options.range || session.getSelection().getRange();
+        var start = this.$options.start || range[searchSelection ? "end" : "start"];
+
+        var firstRow = searchSelection ? range.start.row : 0;
+        var firstColumn = searchSelection ? range.start.column : 0;
+        var lastRow = searchSelection ? range.end.row : session.getLength() - 1;
+
+        var wrap = this.$options.wrap;
+
+        return {
+            forEach : function(callback) {
+                var row = start.row;
+
+                var line = session.getLine(row).substring(0, start.column);
+                var startIndex = 0;
+                var stop = false;
+                var inWrap = false;
+
+                while (!callback(line, startIndex, row)) {
+
+                    if (stop)
+                        return;
+
+                    row--;
+                    startIndex = 0;
+
+                    if (row < firstRow) {
+                        if (wrap) {
+                            row = lastRow;
+                            inWrap = true;
+                        } else {
+                            return;
+                        }
+                    }
+
+                    if (row == start.row)
+                        stop = true;
+
+                    line = session.getLine(row);
+                    if (searchSelection) {
+                        if (row == firstRow)
+                            startIndex = firstColumn;
+                        else if (row == lastRow)
+                            line = line.substring(0, range.end.column);
+                    }
+
+                    if (inWrap && row == start.row)
+                        startIndex = start.column;
+                }
+            }
+        };
+    };
+
+}).call(Search.prototype);
+
+exports.Search = Search;
+});
+define('ace/commands/command_manager', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
+"use strict";
+
+var keyUtil = require("../lib/keys");
+
+var CommandManager = function(platform, commands) {
+    if (typeof platform !== "string")
+        throw new TypeError("'platform' argument must be either 'mac' or 'win'");
+
+    this.platform = platform;
+    this.commands = {};
+    this.commmandKeyBinding = {};
+
+    if (commands)
+        commands.forEach(this.addCommand, this);
+};
+
+(function() {
+
+    this.addCommand = function(command) {
+        if (this.commands[command.name])
+            this.removeCommand(command);
+
+        this.commands[command.name] = command;
+
+        if (command.bindKey) {
+            this._buildKeyHash(command);
+        }
+    };
+
+    this.removeCommand = function(command) {
+        var name = (typeof command === 'string' ? command : command.name);
+        command = this.commands[name];
+        delete this.commands[name];
+
+        // exaustive search is brute force but since removeCommand is
+        // not a performance critical operation this should be OK
+        var ckb = this.commmandKeyBinding;
+        for (var hashId in ckb) {
+            for (var key in ckb[hashId]) {
+                if (ckb[hashId][key] == command)
+                    delete ckb[hashId][key];
+            }
+        }
+    };
+
+    this.addCommands = function(commands) {
+        Object.keys(commands).forEach(function(name) {
+            var command = commands[name];
+            if (typeof command === "string")
+                return this.bindKey(command, name);
+
+            if (typeof command === "function")
+                command = { exec: command };
+
+            if (!command.name)
+                command.name = name;
+
+            this.addCommand(command);
+        }, this);
+    };
+
+    this.removeCommands = function(commands) {
+        Object.keys(commands).forEach(function(name) {
+            this.removeCommand(commands[name]);
+        }, this);
+    };
+
+    this.bindKey = function(key, command) {
+        if(!key)
+            return;
+
+        var ckb = this.commmandKeyBinding;
+        key.split("|").forEach(function(keyPart) {
+            var binding = parseKeys(keyPart, command);
+            var hashId = binding.hashId;
+            (ckb[hashId] || (ckb[hashId] = {}))[binding.key] = command;
+        });
+    };
+
+    this.bindKeys = function(keyList) {
+        Object.keys(keyList).forEach(function(key) {
+            this.bindKey(key, keyList[key]);
+        }, this);
+    };
+
+    this._buildKeyHash = function(command) {
+        var binding = command.bindKey;
+        if (!binding)
+            return;
+
+        var key = typeof binding == "string" ? binding: binding[this.platform];
+        this.bindKey(key, command);
+    }
+
+    function parseKeys(keys, val, ret) {
+        var key;
+        var hashId = 0;
+        var parts = splitSafe(keys);
+
+        for (var i=0, l = parts.length; i < l; i++) {
+            if (keyUtil.KEY_MODS[parts[i]])
+                hashId = hashId | keyUtil.KEY_MODS[parts[i]];
+            else
+                key = parts[i] || "-"; //when empty, the splitSafe removed a '-'
+        }
+
+        return {
+            key: key,
+            hashId: hashId
+        }
+    }
+
+    function splitSafe(s, separator) {
+        return (s.toLowerCase()
+            .trim()
+            .split(new RegExp("[\\s ]*\\-[\\s ]*", "g"), 999));
+    }
+
+    this.findKeyCommand = function findKeyCommand(hashId, textOrKey) {
+        // Convert keyCode to the string representation.
+        if (typeof textOrKey == "number") {
+            textOrKey = keyUtil.keyCodeToString(textOrKey);
+        }
+
+        var ckbr = this.commmandKeyBinding;
+        return ckbr[hashId] && ckbr[hashId][textOrKey.toLowerCase()];
+    }
+
+    this.exec = function(command, editor, args) {
+        if (typeof command === 'string')
+            command = this.commands[command];
+
+        if (!command)
+            return false;
+
+        if (editor && editor.$readOnly && !command.readOnly)
+            return false;
+
+        command.exec(editor, args || {});
+        return true;
+    };
+
+    this.toggleRecording = function() {
+        if (this.$inReplay)
+            return;
+        if (this.recording) {
+            this.macro.pop();
+            this.exec = this.normal_exec;
+
+            if (!this.macro.length)
+                this.macro = this.oldMacro;
+
+            return this.recording = false;
+        }
+        this.oldMacro = this.macro;
+        this.macro = [];
+        this.normal_exec = this.exec;
+        this.exec = function(command, editor, args) {
+            this.macro.push([command, args]);
+            return this.normal_exec(command, editor, args);
+        };
+        return this.recording = true;
+    };
+
+    this.replay = function(editor) {
+        if (this.$inReplay || !this.macro)
+            return;
+
+        if (this.recording)
+            return this.toggleRecording();
+
+        try {
+            this.$inReplay = true;
+            this.macro.forEach(function(x) {
+                if (typeof x == "string")
+                    this.exec(x, editor);
+                else
+                    this.exec(x[0], editor, x[1]);
+            }, this)
+        } finally {
+            this.$inReplay = false;
+        }
+    };
+
+    this.trimMacro = function(m) {
+        return m.map(function(x){
+            if (typeof x[0] != "string")
+                x[0] = x[0].name;
+            if (!x[1])
+                x = x[0];
+            return x
+        })
+    }
+
+}).call(CommandManager.prototype);
+
+exports.CommandManager = CommandManager;
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/undomanager', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+var UndoManager = function() {
+    this.reset();
+};
+
+(function() {
+
+    this.execute = function(options) {
+        var deltas = options.args[0];
+        this.$doc  = options.args[1];
+        this.$undoStack.push(deltas);
+        this.$redoStack = [];
+    };
+
+    this.undo = function(dontSelect) {
+        var deltas = this.$undoStack.pop();
+        var undoSelectionRange = null;
+        if (deltas) {
+            undoSelectionRange =
+                this.$doc.undoChanges(deltas, dontSelect);
+            this.$redoStack.push(deltas);
+        }
+        return undoSelectionRange;
+    };
+
+    this.redo = function(dontSelect) {
+        var deltas = this.$redoStack.pop();
+        var redoSelectionRange = null;
+        if (deltas) {
+            redoSelectionRange =
+                this.$doc.redoChanges(deltas, dontSelect);
+            this.$undoStack.push(deltas);
+        }
+        return redoSelectionRange;
+    };
+
+    this.reset = function() {
+        this.$undoStack = [];
+        this.$redoStack = [];
+    };
+
+    this.hasUndo = function() {
+        return this.$undoStack.length > 0;
+    };
+
+    this.hasRedo = function() {
+        return this.$redoStack.length > 0;
+    };
+
+}).call(UndoManager.prototype);
+
+exports.UndoManager = UndoManager;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian@ajax.org>
+ *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
+ *      Julian Viereck <julian.viereck@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/virtual_renderer', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/dom', 'ace/lib/event', 'ace/lib/useragent', 'ace/layer/gutter', 'ace/layer/marker', 'ace/layer/text', 'ace/layer/cursor', 'ace/scrollbar', 'ace/renderloop', 'ace/lib/event_emitter', 'text!ace/css/editor.css'], function(require, exports, module) {
+"use strict";
+
+var oop = require("./lib/oop");
+var dom = require("./lib/dom");
+var event = require("./lib/event");
+var useragent = require("./lib/useragent");
+var GutterLayer = require("./layer/gutter").Gutter;
+var MarkerLayer = require("./layer/marker").Marker;
+var TextLayer = require("./layer/text").Text;
+var CursorLayer = require("./layer/cursor").Cursor;
+var ScrollBar = require("./scrollbar").ScrollBar;
+var RenderLoop = require("./renderloop").RenderLoop;
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+var editorCss = require("text!./css/editor.css");
+
+dom.importCssString(editorCss, "ace_editor");
+
+var VirtualRenderer = function(container, theme) {
+    var _self = this;
+    
+    this.container = container;
+
+    // TODO: this breaks rendering in Cloud9 with multiple ace instances
+//    // Imports CSS once per DOM document ('ace_editor' serves as an identifier).
+//    dom.importCssString(editorCss, "ace_editor", container.ownerDocument);
+    
+    dom.addCssClass(container, "ace_editor");
+
+    this.setTheme(theme);
+
+    this.$gutter = dom.createElement("div");
+    this.$gutter.className = "ace_gutter";
+    this.container.appendChild(this.$gutter);
+
+    this.scroller = dom.createElement("div");
+    this.scroller.className = "ace_scroller";
+    this.container.appendChild(this.scroller);
+
+    this.content = dom.createElement("div");
+    this.content.className = "ace_content";
+    this.scroller.appendChild(this.content);
+
+    this.$gutterLayer = new GutterLayer(this.$gutter);
+    this.$gutterLayer.on("changeGutterWidth", this.onResize.bind(this, true));    
+    
+    this.$markerBack = new MarkerLayer(this.content);
+
+    var textLayer = this.$textLayer = new TextLayer(this.content);
+    this.canvas = textLayer.element;
+
+    this.$markerFront = new MarkerLayer(this.content);
+
+    this.characterWidth = textLayer.getCharacterWidth();
+    this.lineHeight = textLayer.getLineHeight();
+
+    this.$cursorLayer = new CursorLayer(this.content);
+    this.$cursorPadding = 8;
+
+    // Indicates whether the horizontal scrollbar is visible
+    this.$horizScroll = true;
+    this.$horizScrollAlwaysVisible = true;
+
+    this.scrollBar = new ScrollBar(container);
+    this.scrollBar.addEventListener("scroll", function(e) {
+        _self.session.setScrollTop(e.data);
+    });
+
+    this.scrollTop = 0;
+    this.scrollLeft = 0;
+    
+    event.addListener(this.scroller, "scroll", function() {
+        _self.session.setScrollLeft(_self.scroller.scrollLeft);
+    });
+
+    this.cursorPos = {
+        row : 0,
+        column : 0
+    };
+
+    this.$textLayer.addEventListener("changeCharaterSize", function() {
+        _self.characterWidth = textLayer.getCharacterWidth();
+        _self.lineHeight = textLayer.getLineHeight();
+        _self.$updatePrintMargin();
+        _self.onResize(true);
+
+        _self.$loop.schedule(_self.CHANGE_FULL);
+    });
+
+    this.$size = {
+        width: 0,
+        height: 0,
+        scrollerHeight: 0,
+        scrollerWidth: 0
+    };
+
+    this.layerConfig = {
+        width : 1,
+        padding : 0,
+        firstRow : 0,
+        firstRowScreen: 0,
+        lastRow : 0,
+        lineHeight : 1,
+        characterWidth : 1,
+        minHeight : 1,
+        maxHeight : 1,
+        offset : 0,
+        height : 1
+    };
+
+    this.$loop = new RenderLoop(
+        this.$renderChanges.bind(this),
+        this.container.ownerDocument.defaultView
+    );
+    this.$loop.schedule(this.CHANGE_FULL);
+
+    this.setPadding(4);
+    this.$updatePrintMargin();
+};
+
+(function() {
+    this.showGutter = true;
+
+    this.CHANGE_CURSOR = 1;
+    this.CHANGE_MARKER = 2;
+    this.CHANGE_GUTTER = 4;
+    this.CHANGE_SCROLL = 8;
+    this.CHANGE_LINES = 16;
+    this.CHANGE_TEXT = 32;
+    this.CHANGE_SIZE = 64;
+    this.CHANGE_MARKER_BACK = 128;
+    this.CHANGE_MARKER_FRONT = 256;
+    this.CHANGE_FULL = 512;
+
+    oop.implement(this, EventEmitter);
+
+    this.setSession = function(session) {
+        this.session = session;
+        this.$cursorLayer.setSession(session);
+        this.$markerBack.setSession(session);
+        this.$markerFront.setSession(session);
+        this.$gutterLayer.setSession(session);
+        this.$textLayer.setSession(session);
+        this.$loop.schedule(this.CHANGE_FULL);
+    };
+
+    /**
+     * Triggers partial update of the text layer
+     */
+    this.updateLines = function(firstRow, lastRow) {
+        if (lastRow === undefined)
+            lastRow = Infinity;
+
+        if (!this.$changedLines) {
+            this.$changedLines = {
+                firstRow: firstRow,
+                lastRow: lastRow
+            };
+        }
+        else {
+            if (this.$changedLines.firstRow > firstRow)
+                this.$changedLines.firstRow = firstRow;
+
+            if (this.$changedLines.lastRow < lastRow)
+                this.$changedLines.lastRow = lastRow;
+        }
+
+        this.$loop.schedule(this.CHANGE_LINES);
+    };
+
+    /**
+     * Triggers full update of the text layer
+     */
+    this.updateText = function() {
+        this.$loop.schedule(this.CHANGE_TEXT);
+    };
+
+    /**
+     * Triggers a full update of all layers
+     */
+    this.updateFull = function() {
+        this.$loop.schedule(this.CHANGE_FULL);
+    };
+
+    this.updateFontSize = function() {
+        this.$textLayer.checkForSizeChanges();
+    };
+
+    /**
+     * Triggers resize of the editor
+     */
+    this.onResize = function(force) {
+        var changes = this.CHANGE_SIZE;
+        var size = this.$size;
+
+        var height = dom.getInnerHeight(this.container);
+        if (force || size.height != height) {
+            size.height = height;
+
+            this.scroller.style.height = height + "px";
+            size.scrollerHeight = this.scroller.clientHeight;
+            this.scrollBar.setHeight(size.scrollerHeight);
+
+            if (this.session) {
+                this.session.setScrollTop(this.getScrollTop());
+                changes = changes | this.CHANGE_FULL;
+            }
+        }
+
+        var width = dom.getInnerWidth(this.container);
+        if (force || size.width != width) {
+            size.width = width;
+
+            var gutterWidth = this.showGutter ? this.$gutter.offsetWidth : 0;
+            this.scroller.style.left = gutterWidth + "px";
+            size.scrollerWidth = Math.max(0, width - gutterWidth - this.scrollBar.getWidth());
+            this.scroller.style.width = size.scrollerWidth + "px";
+
+            if (this.session.getUseWrapMode() && this.adjustWrapLimit() || force)
+                changes = changes | this.CHANGE_FULL;
+        }
+
+        this.$loop.schedule(changes);
+    };
+
+    this.adjustWrapLimit = function() {
+        var availableWidth = this.$size.scrollerWidth - this.$padding * 2;
+        var limit = Math.floor(availableWidth / this.characterWidth);
+        return this.session.adjustWrapLimit(limit);
+    };
+
+    this.setShowInvisibles = function(showInvisibles) {
+        if (this.$textLayer.setShowInvisibles(showInvisibles))
+            this.$loop.schedule(this.CHANGE_TEXT);
+    };
+
+    this.getShowInvisibles = function() {
+        return this.$textLayer.showInvisibles;
+    };
+
+    this.$showPrintMargin = true;
+    this.setShowPrintMargin = function(showPrintMargin) {
+        this.$showPrintMargin = showPrintMargin;
+        this.$updatePrintMargin();
+    };
+
+    this.getShowPrintMargin = function() {
+        return this.$showPrintMargin;
+    };
+
+    this.$printMarginColumn = 80;
+    this.setPrintMarginColumn = function(showPrintMargin) {
+        this.$printMarginColumn = showPrintMargin;
+        this.$updatePrintMargin();
+    };
+
+    this.getPrintMarginColumn = function() {
+        return this.$printMarginColumn;
+    };
+
+    this.getShowGutter = function(){
+        return this.showGutter;
+    };
+
+    this.setShowGutter = function(show){
+        if(this.showGutter === show)
+            return;
+        this.$gutter.style.display = show ? "block" : "none";
+        this.showGutter = show;
+        this.onResize(true);
+    };
+
+    this.$updatePrintMargin = function() {
+        var containerEl;
+
+        if (!this.$showPrintMargin && !this.$printMarginEl)
+            return;
+
+        if (!this.$printMarginEl) {
+            containerEl = dom.createElement("div");
+            containerEl.className = "ace_print_margin_layer";
+            this.$printMarginEl = dom.createElement("div");
+            this.$printMarginEl.className = "ace_print_margin";
+            containerEl.appendChild(this.$printMarginEl);
+            this.content.insertBefore(containerEl, this.$textLayer.element);
+        }
+
+        var style = this.$printMarginEl.style;
+        style.left = ((this.characterWidth * this.$printMarginColumn) + this.$padding) + "px";
+        style.visibility = this.$showPrintMargin ? "visible" : "hidden";
+    };
+
+    this.getContainerElement = function() {
+        return this.container;
+    };
+
+    this.getMouseEventTarget = function() {
+        return this.content;
+    };
+
+    this.getTextAreaContainer = function() {
+        return this.container;
+    };
+
+    this.moveTextAreaToCursor = function(textarea) {
+        // in IE the native cursor always shines through
+        // this persists in IE9
+        if (useragent.isIE)
+            return;
+        
+        if (this.layerConfig.lastRow === 0)
+            return;
+
+        var pos = this.$cursorLayer.getPixelPosition();
+        if (!pos)
+            return;
+
+        var bounds = this.content.getBoundingClientRect();
+        var offset = this.layerConfig.offset;
+
+        textarea.style.left = (bounds.left + pos.left) + "px";
+        textarea.style.top = (bounds.top + pos.top - this.scrollTop + offset) + "px";
+    };
+
+    this.getFirstVisibleRow = function() {
+        return this.layerConfig.firstRow;
+    };
+
+    this.getFirstFullyVisibleRow = function() {
+        return this.layerConfig.firstRow + (this.layerConfig.offset === 0 ? 0 : 1);
+    };
+
+    this.getLastFullyVisibleRow = function() {
+        var flint = Math.floor((this.layerConfig.height + this.layerConfig.offset) / this.layerConfig.lineHeight);
+        return this.layerConfig.firstRow - 1 + flint;
+    };
+
+    this.getLastVisibleRow = function() {
+        return this.layerConfig.lastRow;
+    };
+
+    this.$padding = null;
+    this.setPadding = function(padding) {
+        this.$padding = padding;
+        this.$textLayer.setPadding(padding);
+        this.$cursorLayer.setPadding(padding);
+        this.$markerFront.setPadding(padding);
+        this.$markerBack.setPadding(padding);
+        this.$loop.schedule(this.CHANGE_FULL);
+        this.$updatePrintMargin();
+    };
+
+    this.getHScrollBarAlwaysVisible = function() {
+        return this.$horizScrollAlwaysVisible;
+    };
+
+    this.setHScrollBarAlwaysVisible = function(alwaysVisible) {
+        if (this.$horizScrollAlwaysVisible != alwaysVisible) {
+            this.$horizScrollAlwaysVisible = alwaysVisible;
+            if (!this.$horizScrollAlwaysVisible || !this.$horizScroll)
+                this.$loop.schedule(this.CHANGE_SCROLL);
+        }
+    };
+
+    this.$updateScrollBar = function() {
+        this.scrollBar.setInnerHeight(this.layerConfig.maxHeight);
+        this.scrollBar.setScrollTop(this.scrollTop);
+    };
+
+    this.$renderChanges = function(changes) {
+        if (!changes || !this.session)
+            return;
+
+        // text, scrolling and resize changes can cause the view port size to change
+        if (changes & this.CHANGE_FULL ||
+            changes & this.CHANGE_SIZE ||
+            changes & this.CHANGE_TEXT ||
+            changes & this.CHANGE_LINES ||
+            changes & this.CHANGE_SCROLL
+        )
+            this.$computeLayerConfig();
+
+        // full
+        if (changes & this.CHANGE_FULL) {
+            this.$textLayer.update(this.layerConfig);
+            if (this.showGutter)
+                this.$gutterLayer.update(this.layerConfig);
+            this.$markerBack.update(this.layerConfig);
+            this.$markerFront.update(this.layerConfig);
+            this.$cursorLayer.update(this.layerConfig);
+            this.$updateScrollBar();
+            return;
+        }
+
+        // scrolling
+        if (changes & this.CHANGE_SCROLL) {
+            if (changes & this.CHANGE_TEXT || changes & this.CHANGE_LINES)
+                this.$textLayer.update(this.layerConfig);
+            else
+                this.$textLayer.scrollLines(this.layerConfig);
+
+            if (this.showGutter)
+                this.$gutterLayer.update(this.layerConfig);
+            this.$markerBack.update(this.layerConfig);
+            this.$markerFront.update(this.layerConfig);
+            this.$cursorLayer.update(this.layerConfig);
+            this.$updateScrollBar();
+            return;
+        }
+
+        if (changes & this.CHANGE_TEXT) {
+            this.$textLayer.update(this.layerConfig);
+            if (this.showGutter)
+                this.$gutterLayer.update(this.layerConfig);
+        }
+        else if (changes & this.CHANGE_LINES) {
+            this.$updateLines();
+            this.$updateScrollBar();
+            if (this.showGutter)
+                this.$gutterLayer.update(this.layerConfig);
+        } else if (changes & this.CHANGE_GUTTER) {
+            if (this.showGutter)
+                this.$gutterLayer.update(this.layerConfig);
+        }
+
+        if (changes & this.CHANGE_CURSOR)
+            this.$cursorLayer.update(this.layerConfig);
+
+        if (changes & (this.CHANGE_MARKER | this.CHANGE_MARKER_FRONT)) {
+            this.$markerFront.update(this.layerConfig);
+        }
+
+        if (changes & (this.CHANGE_MARKER | this.CHANGE_MARKER_BACK)) {
+            this.$markerBack.update(this.layerConfig);
+        }
+
+        if (changes & this.CHANGE_SIZE)
+            this.$updateScrollBar();
+    };
+
+    this.$computeLayerConfig = function() {
+        var session = this.session;
+
+        var offset = this.scrollTop % this.lineHeight;
+        var minHeight = this.$size.scrollerHeight + this.lineHeight;
+
+        var longestLine = this.$getLongestLine();
+
+        var horizScroll = this.$horizScrollAlwaysVisible || this.$size.scrollerWidth - longestLine < 0;
+        var horizScrollChanged = this.$horizScroll !== horizScroll;
+        this.$horizScroll = horizScroll;
+        if (horizScrollChanged)
+            this.scroller.style.overflowX = horizScroll ? "scroll" : "hidden";
+
+        var maxHeight = this.session.getScreenLength() * this.lineHeight;
+        this.session.setScrollTop(Math.max(0, Math.min(this.scrollTop, maxHeight - this.$size.scrollerHeight)));
+
+        var lineCount = Math.ceil(minHeight / this.lineHeight) - 1;
+        var firstRow = Math.max(0, Math.round((this.scrollTop - offset) / this.lineHeight));
+        var lastRow = firstRow + lineCount;
+
+        // Map lines on the screen to lines in the document.
+        var firstRowScreen, firstRowHeight;
+        var lineHeight = { lineHeight: this.lineHeight };
+        firstRow = session.screenToDocumentRow(firstRow, 0);
+
+        // Check if firstRow is inside of a foldLine. If true, then use the first
+        // row of the foldLine.
+        var foldLine = session.getFoldLine(firstRow);
+        if (foldLine) {
+            firstRow = foldLine.start.row;
+        }
+
+        firstRowScreen = session.documentToScreenRow(firstRow, 0);
+        firstRowHeight = session.getRowHeight(lineHeight, firstRow);
+
+        lastRow = Math.min(session.screenToDocumentRow(lastRow, 0), session.getLength() - 1);
+        minHeight = this.$size.scrollerHeight + session.getRowHeight(lineHeight, lastRow)+
+                                                firstRowHeight;
+
+        offset = this.scrollTop - firstRowScreen * this.lineHeight;
+
+        this.layerConfig = {
+            width : longestLine,
+            padding : this.$padding,
+            firstRow : firstRow,
+            firstRowScreen: firstRowScreen,
+            lastRow : lastRow,
+            lineHeight : this.lineHeight,
+            characterWidth : this.characterWidth,
+            minHeight : minHeight,
+            maxHeight : maxHeight,
+            offset : offset,
+            height : this.$size.scrollerHeight
+        };
+
+        // For debugging.
+        // console.log(JSON.stringify(this.layerConfig));
+
+        this.$gutterLayer.element.style.marginTop = (-offset) + "px";
+        this.content.style.marginTop = (-offset) + "px";
+        this.content.style.width = longestLine + 2 * this.$padding + "px";
+        this.content.style.height = minHeight + "px";
+
+        // scroller.scrollWidth was smaller than scrollLeft we needed
+        if (this.$desiredScrollLeft) {
+            this.scrollToX(this.$desiredScrollLeft);
+            this.$desiredScrollLeft = 0;
+        }
+
+        // Horizontal scrollbar visibility may have changed, which changes
+        // the client height of the scroller
+        if (horizScrollChanged)
+            this.onResize(true);
+    };
+
+    this.$updateLines = function() {
+        var firstRow = this.$changedLines.firstRow;
+        var lastRow = this.$changedLines.lastRow;
+        this.$changedLines = null;
+
+        var layerConfig = this.layerConfig;
+
+        // if the update changes the width of the document do a full redraw
+        if (layerConfig.width != this.$getLongestLine())
+            return this.$textLayer.update(layerConfig);
+
+        if (firstRow > layerConfig.lastRow + 1) { return; }
+        if (lastRow < layerConfig.firstRow) { return; }
+
+        // if the last row is unknown -> redraw everything
+        if (lastRow === Infinity) {
+            if (this.showGutter)
+                this.$gutterLayer.update(layerConfig);
+            this.$textLayer.update(layerConfig);
+            return;
+        }
+
+        // else update only the changed rows
+        this.$textLayer.updateLines(layerConfig, firstRow, lastRow);
+    };
+
+    this.$getLongestLine = function() {
+        var charCount = this.session.getScreenWidth();
+        if (this.$textLayer.showInvisibles)
+            charCount += 1;
+
+        return Math.max(this.$size.scrollerWidth - 2 * this.$padding, Math.round(charCount * this.characterWidth));
+    };
+
+    this.updateFrontMarkers = function() {
+        this.$markerFront.setMarkers(this.session.getMarkers(true));
+        this.$loop.schedule(this.CHANGE_MARKER_FRONT);
+    };
+
+    this.updateBackMarkers = function() {
+        this.$markerBack.setMarkers(this.session.getMarkers());
+        this.$loop.schedule(this.CHANGE_MARKER_BACK);
+    };
+
+    this.addGutterDecoration = function(row, className){
+        this.$gutterLayer.addGutterDecoration(row, className);
+        this.$loop.schedule(this.CHANGE_GUTTER);
+    };
+
+    this.removeGutterDecoration = function(row, className){
+        this.$gutterLayer.removeGutterDecoration(row, className);
+        this.$loop.schedule(this.CHANGE_GUTTER);
+    };
+
+    this.setBreakpoints = function(rows) {
+        this.$gutterLayer.setBreakpoints(rows);
+        this.$loop.schedule(this.CHANGE_GUTTER);
+    };
+
+    this.setAnnotations = function(annotations) {
+        this.$gutterLayer.setAnnotations(annotations);
+        this.$loop.schedule(this.CHANGE_GUTTER);
+    };
+
+    this.updateCursor = function() {
+        this.$loop.schedule(this.CHANGE_CURSOR);
+    };
+
+    this.hideCursor = function() {
+        this.$cursorLayer.hideCursor();
+    };
+
+    this.showCursor = function() {
+        this.$cursorLayer.showCursor();
+    };
+
+    this.scrollCursorIntoView = function() {
+        // the editor is not visible
+        if (this.$size.scrollerHeight === 0)
+            return;
+
+        var pos = this.$cursorLayer.getPixelPosition();
+
+        var left = pos.left;
+        var top = pos.top;
+
+        if (this.scrollTop > top) {
+            this.session.setScrollTop(top);
+        }
+
+        if (this.scrollTop + this.$size.scrollerHeight < top + this.lineHeight) {
+            this.session.setScrollTop(top + this.lineHeight - this.$size.scrollerHeight);
+        }
+
+        var scrollLeft = this.scrollLeft;
+
+        if (scrollLeft > left) {
+            if (left < this.$padding + 2 * this.layerConfig.characterWidth)
+                left = 0;
+            this.scrollToX(left);
+        }
+
+        if (scrollLeft + this.$size.scrollerWidth < left + this.characterWidth) {
+            if (left > this.layerConfig.width + 2 * this.$padding)
+                this.$desiredScrollLeft = left;
+            else
+                this.scrollToX(Math.round(left + this.characterWidth - this.$size.scrollerWidth));
+        }
+    };
+
+    this.getScrollTop = function() {
+        return this.session.getScrollTop();
+    };
+
+    this.getScrollLeft = function() {
+        return this.session.getScrollTop();
+    };
+
+    this.getScrollTopRow = function() {
+        return this.scrollTop / this.lineHeight;
+    };
+
+    this.getScrollBottomRow = function() {
+        return Math.max(0, Math.floor((this.scrollTop + this.$size.scrollerHeight) / this.lineHeight) - 1);
+    };
+
+    this.scrollToRow = function(row) {
+        this.session.setScrollTop(row * this.lineHeight);
+    };
+
+    this.scrollToLine = function(line, center) {
+        var lineHeight = { lineHeight: this.lineHeight };
+        var offset = 0;
+        for (var l = 1; l < line; l++) {
+            offset += this.session.getRowHeight(lineHeight, l-1);
+        }
+
+        if (center) {
+            offset -= this.$size.scrollerHeight / 2;
+        }
+        this.session.setScrollTop(offset);
+    };
+
+    this.scrollToY = function(scrollTop) {
+        // after calling scrollBar.setScrollTop
+        // scrollbar sends us event with same scrollTop. ignore it
+        if (this.scrollTop !== scrollTop) {
+            this.$loop.schedule(this.CHANGE_SCROLL);
+            this.scrollTop = scrollTop;
+        }
+    };
+
+    this.scrollToX = function(scrollLeft) {
+        if (scrollLeft <= this.$padding)
+            scrollLeft = 0;
+
+        this.scroller.scrollLeft = scrollLeft;
+        scrollLeft = this.scroller.scrollLeft;
+    };
+
+    this.scrollBy = function(deltaX, deltaY) {
+        deltaY && this.session.setScrollTop(this.session.getScrollTop() + deltaY);
+        deltaX && this.session.setScrollLeft(this.session.getScrollLeft() + deltaX);
+    };
+
+    this.isScrollableBy = function(deltaX, deltaY) {
+        if (deltaY < 0 && this.session.getScrollTop() > 0)
+           return true;
+        if (deltaY > 0 && this.session.getScrollTop() + this.$size.scrollerHeight < this.layerConfig.maxHeight)
+           return true;
+        // todo: handle horizontal scrolling
+    };
+
+    this.screenToTextCoordinates = function(pageX, pageY) {
+        var canvasPos = this.scroller.getBoundingClientRect();
+
+        var col = Math.round(
+            (pageX + this.scrollLeft - canvasPos.left - this.$padding - dom.getPageScrollLeft())
+            / this.characterWidth
+        );
+        var row = Math.floor(
+            (pageY + this.scrollTop - canvasPos.top - dom.getPageScrollTop())
+            / this.lineHeight
+        );
+
+        return this.session.screenToDocumentPosition(row, Math.max(col, 0));
+    };
+
+    this.textToScreenCoordinates = function(row, column) {
+        var canvasPos = this.scroller.getBoundingClientRect();
+        var pos = this.session.documentToScreenPosition(row, column);
+
+        var x = this.$padding + Math.round(pos.column * this.characterWidth);
+        var y = pos.row * this.lineHeight;
+
+        return {
+            pageX: canvasPos.left + x - this.scrollLeft,
+            pageY: canvasPos.top + y - this.scrollTop
+        };
+    };
+
+    this.visualizeFocus = function() {
+        dom.addCssClass(this.container, "ace_focus");
+    };
+
+    this.visualizeBlur = function() {
+        dom.removeCssClass(this.container, "ace_focus");
+    };
+
+    this.showComposition = function(position) {
+        if (!this.$composition) {
+            this.$composition = dom.createElement("div");
+            this.$composition.className = "ace_composition";
+            this.content.appendChild(this.$composition);
+        }
+
+        this.$composition.innerHTML = "&#160;";
+
+        var pos = this.$cursorLayer.getPixelPosition();
+        var style = this.$composition.style;
+        style.top = pos.top + "px";
+        style.left = (pos.left + this.$padding) + "px";
+        style.height = this.lineHeight + "px";
+
+        this.hideCursor();
+    };
+
+    this.setCompositionText = function(text) {
+        dom.setInnerText(this.$composition, text);
+    };
+
+    this.hideComposition = function() {
+        this.showCursor();
+
+        if (!this.$composition)
+            return;
+
+        var style = this.$composition.style;
+        style.top = "-10000px";
+        style.left = "-10000px";
+    };
+
+    this.setTheme = function(theme) {
+        var _self = this;
+
+        this.$themeValue = theme;
+        if (!theme || typeof theme == "string") {
+            theme = theme || "ace/theme/textmate";
+            require([theme], function(theme) {
+                afterLoad(theme);
+            });
+        } else {
+            afterLoad(theme);
+        }
+
+        function afterLoad(theme) {
+            dom.importCssString(
+                theme.cssText,
+                theme.cssClass,
+                _self.container.ownerDocument
+            );
+
+            if (_self.$theme)
+                dom.removeCssClass(_self.container, _self.$theme);
+
+            _self.$theme = theme ? theme.cssClass : null;
+
+            if (_self.$theme)
+                dom.addCssClass(_self.container, _self.$theme);
+
+            if (theme && theme.isDark)
+                dom.addCssClass(_self.container, "ace_dark");
+            else
+                dom.removeCssClass(_self.container, "ace_dark");
+
+            // force re-measure of the gutter width
+            if (_self.$size) {
+                _self.$size.width = 0;
+                _self.onResize();
+            }
+        }
+    };
+
+    this.getTheme = function() {
+        return this.$themeValue;
+    };
+
+    // Methods allows to add / remove CSS classnames to the editor element.
+    // This feature can be used by plug-ins to provide a visual indication of
+    // a certain mode that editor is in.
+
+    this.setStyle = function setStyle(style) {
+      dom.addCssClass(this.container, style);
+    };
+
+    this.unsetStyle = function unsetStyle(style) {
+      dom.removeCssClass(this.container, style);
+    };
+
+    this.destroy = function() {
+        this.$textLayer.destroy();
+        this.$cursorLayer.destroy();
+    };
+
+}).call(VirtualRenderer.prototype);
+
+exports.VirtualRenderer = VirtualRenderer;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Julian Viereck <julian DOT viereck AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/layer/gutter', ['require', 'exports', 'module' , 'ace/lib/dom', 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var dom = require("../lib/dom");
+var oop = require("../lib/oop");
+var EventEmitter = require("../lib/event_emitter").EventEmitter;
+
+var Gutter = function(parentEl) {
+    this.element = dom.createElement("div");
+    this.element.className = "ace_layer ace_gutter-layer";
+    parentEl.appendChild(this.element);
+    this.setShowFoldWidgets(this.$showFoldWidgets);
+    
+    this.gutterWidth = 0;
+
+    this.$breakpoints = [];
+    this.$annotations = [];
+    this.$decorations = [];
+};
+
+(function() {
+
+    oop.implement(this, EventEmitter);
+    
+    this.setSession = function(session) {
+        this.session = session;
+    };
+
+    this.addGutterDecoration = function(row, className){
+        if (!this.$decorations[row])
+            this.$decorations[row] = "";
+        this.$decorations[row] += " ace_" + className;
+    };
+
+    this.removeGutterDecoration = function(row, className){
+        this.$decorations[row] = this.$decorations[row].replace(" ace_" + className, "");
+    };
+
+    this.setBreakpoints = function(rows) {
+        this.$breakpoints = rows.concat();
+    };
+
+    this.setAnnotations = function(annotations) {
+        // iterate over sparse array
+        this.$annotations = [];
+        for (var row in annotations) if (annotations.hasOwnProperty(row)) {
+            var rowAnnotations = annotations[row];
+            if (!rowAnnotations)
+                continue;
+
+            var rowInfo = this.$annotations[row] = {
+                text: []
+            };
+            for (var i=0; i<rowAnnotations.length; i++) {
+                var annotation = rowAnnotations[i];
+                var annoText = annotation.text.replace(/"/g, "&quot;").replace(/'/g, "&#8217;").replace(/</, "&lt;");
+                if (rowInfo.text.indexOf(annoText) === -1)
+                    rowInfo.text.push(annoText);
+                var type = annotation.type;
+                if (type == "error")
+                    rowInfo.className = "ace_error";
+                else if (type == "warning" && rowInfo.className != "ace_error")
+                    rowInfo.className = "ace_warning";
+                else if (type == "info" && (!rowInfo.className))
+                    rowInfo.className = "ace_info";
+            }
+        }
+    };
+
+    this.update = function(config) {
+        this.$config = config;
+
+        var emptyAnno = {className: "", text: []};
+        var html = [];
+        var i = config.firstRow;
+        var lastRow = config.lastRow;
+        var fold = this.session.getNextFoldLine(i);
+        var foldStart = fold ? fold.start.row : Infinity;
+        var foldWidgets = this.$showFoldWidgets && this.session.foldWidgets;
+
+        while (true) {
+            if(i > foldStart) {
+                i = fold.end.row + 1;
+                fold = this.session.getNextFoldLine(i, fold);
+                foldStart = fold ?fold.start.row :Infinity;
+            }
+            if(i > lastRow)
+                break;
+
+            var annotation = this.$annotations[i] || emptyAnno;
+            html.push("<div class='ace_gutter-cell",
+                this.$decorations[i] || "",
+                this.$breakpoints[i] ? " ace_breakpoint " : " ",
+                annotation.className,
+                "' title='", annotation.text.join("\n"),
+                "' style='height:", config.lineHeight, "px;'>", (i+1));
+
+            if (foldWidgets) {
+                var c = foldWidgets[i];
+                // check if cached value is invalidated and we need to recompute
+                if (c == null)
+                    c = foldWidgets[i] = this.session.getFoldWidget(i);
+                if (c)
+                    html.push(
+                        "<span class='ace_fold-widget ", c,
+                        c == "start" && i == foldStart && i < fold.end.row ? " closed" : " open",
+                        "'></span>"
+                    );
+            }
+
+            var wrappedRowLength = this.session.getRowLength(i) - 1;
+            while (wrappedRowLength--) {
+                html.push("</div><div class='ace_gutter-cell' style='height:", config.lineHeight, "px'>\xA6");
+            }
+
+            html.push("</div>");
+
+            i++;
+        }
+        this.element = dom.setInnerHtml(this.element, html.join(""));
+        this.element.style.height = config.minHeight + "px";
+        
+        var gutterWidth = this.element.offsetWidth;
+        if (gutterWidth !== this.gutterWidth) {
+            this.gutterWidth = gutterWidth;
+            this._emit("changeGutterWidth", gutterWidth);
+        }
+    };
+
+    this.$showFoldWidgets = true;
+    this.setShowFoldWidgets = function(show) {
+        if (show)
+            dom.addCssClass(this.element, "ace_folding-enabled");
+        else
+            dom.removeCssClass(this.element, "ace_folding-enabled");
+
+        this.$showFoldWidgets = show;
+    };
+    
+    this.getShowFoldWidgets = function() {
+        return this.$showFoldWidgets;
+    };
+
+}).call(Gutter.prototype);
+
+exports.Gutter = Gutter;
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Julian Viereck <julian.viereck@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/layer/marker', ['require', 'exports', 'module' , 'ace/range', 'ace/lib/dom'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+var dom = require("../lib/dom");
+
+var Marker = function(parentEl) {
+    this.element = dom.createElement("div");
+    this.element.className = "ace_layer ace_marker-layer";
+    parentEl.appendChild(this.element);
+};
+
+(function() {
+
+    this.$padding = 0;
+
+    this.setPadding = function(padding) {
+        this.$padding = padding;
+    };
+    this.setSession = function(session) {
+        this.session = session;
+    };
+    
+    this.setMarkers = function(markers) {
+        this.markers = markers;
+    };
+
+    this.update = function(config) {
+        var config = config || this.config;
+        if (!config)
+            return;
+
+        this.config = config;
+
+
+        var html = [];
+        for ( var key in this.markers) {
+            var marker = this.markers[key];
+
+            var range = marker.range.clipRows(config.firstRow, config.lastRow);
+            if (range.isEmpty()) continue;
+
+            range = range.toScreenRange(this.session);
+            if (marker.renderer) {
+                var top = this.$getTop(range.start.row, config);
+                var left = Math.round(
+                    this.$padding + range.start.column * config.characterWidth
+                );
+                marker.renderer(html, range, left, top, config);
+            }
+            else if (range.isMultiLine()) {
+                if (marker.type == "text") {
+                    this.drawTextMarker(html, range, marker.clazz, config);
+                } else {
+                    this.drawMultiLineMarker(
+                        html, range, marker.clazz, config,
+                        marker.type
+                    );
+                }
+            }
+            else {
+                this.drawSingleLineMarker(
+                    html, range, marker.clazz, config,
+                    null, marker.type
+                );
+            }
+        }
+        this.element = dom.setInnerHtml(this.element, html.join(""));
+    };
+
+    this.$getTop = function(row, layerConfig) {
+        return (row - layerConfig.firstRowScreen) * layerConfig.lineHeight;
+    };
+
+    /**
+     * Draws a marker, which spans a range of text in a single line
+     */ 
+    this.drawTextMarker = function(stringBuilder, range, clazz, layerConfig) {
+        // selection start
+        var row = range.start.row;
+
+        var lineRange = new Range(
+            row, range.start.column,
+            row, this.session.getScreenLastRowColumn(row)
+        );
+        this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 1, "text");
+
+        // selection end
+        row = range.end.row;
+        lineRange = new Range(row, 0, row, range.end.column);
+        this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 0, "text");
+
+        for (row = range.start.row + 1; row < range.end.row; row++) {
+            lineRange.start.row = row;
+            lineRange.end.row = row;
+            lineRange.end.column = this.session.getScreenLastRowColumn(row);
+            this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 1, "text");
+        }
+    };
+
+    /**
+     * Draws a multi line marker, where lines span the full width
+     */
+     this.drawMultiLineMarker = function(stringBuilder, range, clazz, layerConfig, type) {
+        var padding = type === "background" ? 0 : this.$padding;
+        var layerWidth = layerConfig.width + 2 * this.$padding - padding;
+        // from selection start to the end of the line
+        var height = layerConfig.lineHeight;
+        var width = Math.round(layerWidth - (range.start.column * layerConfig.characterWidth));
+        var top = this.$getTop(range.start.row, layerConfig);
+        var left = Math.round(
+            padding + range.start.column * layerConfig.characterWidth
+        );
+
+        stringBuilder.push(
+            "<div class='", clazz, "' style='",
+            "height:", height, "px;",
+            "width:", width, "px;",
+            "top:", top, "px;",
+            "left:", left, "px;'></div>"
+        );
+
+        // from start of the last line to the selection end
+        top = this.$getTop(range.end.row, layerConfig);
+        width = Math.round(range.end.column * layerConfig.characterWidth);
+
+        stringBuilder.push(
+            "<div class='", clazz, "' style='",
+            "height:", height, "px;",
+            "width:", width, "px;",
+            "top:", top, "px;",
+            "left:", padding, "px;'></div>"
+        );
+
+        // all the complete lines
+        height = (range.end.row - range.start.row - 1) * layerConfig.lineHeight;
+        if (height < 0)
+            return;
+        top = this.$getTop(range.start.row + 1, layerConfig);
+
+        stringBuilder.push(
+            "<div class='", clazz, "' style='",
+            "height:", height, "px;",
+            "width:", layerWidth, "px;",
+            "top:", top, "px;",
+            "left:", padding, "px;'></div>"
+        );
+    };
+
+    /**
+     * Draws a marker which covers one single full line
+     */
+    this.drawSingleLineMarker = function(stringBuilder, range, clazz, layerConfig, extraLength, type) {
+        var padding = type === "background" ? 0 : this.$padding;
+        var height = layerConfig.lineHeight;
+
+        if (type === "background")
+            var width = layerConfig.width;
+        else
+            width = Math.round((range.end.column + (extraLength || 0) - range.start.column) * layerConfig.characterWidth);
+
+        var top = this.$getTop(range.start.row, layerConfig);
+        var left = Math.round(
+            padding + range.start.column * layerConfig.characterWidth
+        );
+
+        stringBuilder.push(
+            "<div class='", clazz, "' style='",
+            "height:", height, "px;",
+            "width:", width, "px;",
+            "top:", top, "px;",
+            "left:", left,"px;'></div>"
+        );
+    };
+
+}).call(Marker.prototype);
+
+exports.Marker = Marker;
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Julian Viereck <julian DOT viereck AT gmail DOT com>
+ *      Mihai Sucan <mihai.sucan@gmail.com>
+ *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/layer/text', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/dom', 'ace/lib/lang', 'ace/lib/useragent', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var dom = require("../lib/dom");
+var lang = require("../lib/lang");
+var useragent = require("../lib/useragent");
+var EventEmitter = require("../lib/event_emitter").EventEmitter;
+
+var Text = function(parentEl) {
+    this.element = dom.createElement("div");
+    this.element.className = "ace_layer ace_text-layer";
+    parentEl.appendChild(this.element);
+
+    this.$characterSize = this.$measureSizes() || {width: 0, height: 0};
+    this.$pollSizeChanges();
+};
+
+(function() {
+
+    oop.implement(this, EventEmitter);
+
+    this.EOF_CHAR = "\xB6"; //"&para;";
+    this.EOL_CHAR = "\xAC"; //"&not;";
+    this.TAB_CHAR = "\u2192"; //"&rarr;";
+    this.SPACE_CHAR = "\xB7"; //"&middot;";
+    this.$padding = 0;
+
+    this.setPadding = function(padding) {
+        this.$padding = padding;
+        this.element.style.padding = "0 " + padding + "px";
+    };
+
+    this.getLineHeight = function() {
+        return this.$characterSize.height || 1;
+    };
+
+    this.getCharacterWidth = function() {
+        return this.$characterSize.width || 1;
+    };
+
+    this.checkForSizeChanges = function() {
+        var size = this.$measureSizes();
+        if (size && (this.$characterSize.width !== size.width || this.$characterSize.height !== size.height)) {
+            this.$characterSize = size;
+            this._emit("changeCharaterSize", {data: size});
+        }
+    };
+
+    this.$pollSizeChanges = function() {
+        var self = this;
+        this.$pollSizeChangesTimer = setInterval(function() {
+            self.checkForSizeChanges();
+        }, 500);
+    };
+
+    this.$fontStyles = {
+        fontFamily : 1,
+        fontSize : 1,
+        fontWeight : 1,
+        fontStyle : 1,
+        lineHeight : 1
+    };
+
+    this.$measureSizes = function() {
+        var n = 1000;
+        if (!this.$measureNode) {
+            var measureNode = this.$measureNode = dom.createElement("div");
+            var style = measureNode.style;
+
+            style.width = style.height = "auto";
+            style.left = style.top = (-n * 40)  + "px";
+
+            style.visibility = "hidden";
+            style.position = "absolute";
+            style.overflow = "visible";
+            style.whiteSpace = "nowrap";
+
+            // in FF 3.6 monospace fonts can have a fixed sub pixel width.
+            // that's why we have to measure many characters
+            // Note: characterWidth can be a float!
+            measureNode.innerHTML = lang.stringRepeat("Xy", n);
+
+            if (this.element.ownerDocument.body) {
+                this.element.ownerDocument.body.appendChild(measureNode);
+            } else {
+                var container = this.element.parentNode;
+                while (!dom.hasCssClass(container, "ace_editor"))
+                    container = container.parentNode;
+                container.appendChild(measureNode);
+            }
+
+        }
+
+        var style = this.$measureNode.style;
+        var computedStyle = dom.computedStyle(this.element);
+        for (var prop in this.$fontStyles)
+            style[prop] = computedStyle[prop];
+
+        var size = {
+            height: this.$measureNode.offsetHeight,
+            width: this.$measureNode.offsetWidth / (n * 2)
+        };
+
+        // Size and width can be null if the editor is not visible or
+        // detached from the document
+        if (size.width == 0 && size.height == 0)
+            return null;
+
+        return size;
+    };
+
+    this.setSession = function(session) {
+        this.session = session;
+    };
+
+    this.showInvisibles = false;
+    this.setShowInvisibles = function(showInvisibles) {
+        if (this.showInvisibles == showInvisibles)
+            return false;
+
+        this.showInvisibles = showInvisibles;
+        return true;
+    };
+
+    this.$tabStrings = [];
+    this.$computeTabString = function() {
+        var tabSize = this.session.getTabSize();
+        var tabStr = this.$tabStrings = [0];
+        for (var i = 1; i < tabSize + 1; i++) {
+            if (this.showInvisibles) {
+                tabStr.push("<span class='ace_invisible'>"
+                    + this.TAB_CHAR
+                    + new Array(i).join("&#160;")
+                    + "</span>");
+            } else {
+                tabStr.push(new Array(i+1).join("&#160;"));
+            }
+        }
+
+    };
+
+    this.updateLines = function(config, firstRow, lastRow) {
+        this.$computeTabString();
+        // Due to wrap line changes there can be new lines if e.g.
+        // the line to updated wrapped in the meantime.
+        if (this.config.lastRow != config.lastRow ||
+            this.config.firstRow != config.firstRow) {
+            this.scrollLines(config);
+        }
+        this.config = config;
+
+        var first = Math.max(firstRow, config.firstRow);
+        var last = Math.min(lastRow, config.lastRow);
+
+        var lineElements = this.element.childNodes;
+        var lineElementsIdx = 0;
+
+        for (var row = config.firstRow; row < first; row++) {
+            var foldLine = this.session.getFoldLine(row);
+            if (foldLine) {
+                if (foldLine.containsRow(first)) {
+                    first = foldLine.start.row;
+                    break;
+                } else {
+                    row = foldLine.end.row;
+                }
+            }
+            lineElementsIdx ++;
+        }
+
+        for (var i=first; i<=last; i++) {
+            var lineElement = lineElements[lineElementsIdx++];
+            if (!lineElement)
+                continue;
+
+            var html = [];
+            var tokens = this.session.getTokens(i, i);
+            this.$renderLine(html, i, tokens[0].tokens, !this.$useLineGroups());
+            lineElement = dom.setInnerHtml(lineElement, html.join(""));
+
+            i = this.session.getRowFoldEnd(i);
+        }
+    };
+
+    this.scrollLines = function(config) {
+        this.$computeTabString();
+        var oldConfig = this.config;
+        this.config = config;
+
+        if (!oldConfig || oldConfig.lastRow < config.firstRow)
+            return this.update(config);
+
+        if (config.lastRow < oldConfig.firstRow)
+            return this.update(config);
+
+        var el = this.element;
+        if (oldConfig.firstRow < config.firstRow)
+            for (var row=this.session.getFoldedRowCount(oldConfig.firstRow, config.firstRow - 1); row>0; row--)
+                el.removeChild(el.firstChild);
+
+        if (oldConfig.lastRow > config.lastRow)
+            for (var row=this.session.getFoldedRowCount(config.lastRow + 1, oldConfig.lastRow); row>0; row--)
+                el.removeChild(el.lastChild);
+
+        if (config.firstRow < oldConfig.firstRow) {
+            var fragment = this.$renderLinesFragment(config, config.firstRow, oldConfig.firstRow - 1);
+            if (el.firstChild)
+                el.insertBefore(fragment, el.firstChild);
+            else
+                el.appendChild(fragment);
+        }
+
+        if (config.lastRow > oldConfig.lastRow) {
+            var fragment = this.$renderLinesFragment(config, oldConfig.lastRow + 1, config.lastRow);
+            el.appendChild(fragment);
+        }
+    };
+
+    this.$renderLinesFragment = function(config, firstRow, lastRow) {
+        var fragment = this.element.ownerDocument.createDocumentFragment(),
+            row = firstRow,
+            fold = this.session.getNextFoldLine(row),
+            foldStart = fold ?fold.start.row :Infinity;
+
+        while (true) {
+            if (row > foldStart) {
+                row = fold.end.row+1;
+                fold = this.session.getNextFoldLine(row, fold);
+                foldStart = fold ?fold.start.row :Infinity;
+            }
+            if (row > lastRow)
+                break;
+
+            var container = dom.createElement("div");
+
+            var html = [];
+            // Get the tokens per line as there might be some lines in between
+            // beeing folded.
+            // OPTIMIZE: If there is a long block of unfolded lines, just make
+            // this call once for that big block of unfolded lines.
+            var tokens = this.session.getTokens(row, row);
+            if (tokens.length == 1)
+                this.$renderLine(html, row, tokens[0].tokens, false);
+
+            // don't use setInnerHtml since we are working with an empty DIV
+            container.innerHTML = html.join("");
+            if (this.$useLineGroups()) {
+                container.className = 'ace_line_group';
+                fragment.appendChild(container);
+            } else {
+                var lines = container.childNodes
+                while(lines.length)
+                    fragment.appendChild(lines[0]);
+            }
+
+            row++;
+        }
+        return fragment;
+    };
+
+    this.update = function(config) {
+        this.$computeTabString();
+        this.config = config;
+
+        var html = [];
+        var firstRow = config.firstRow, lastRow = config.lastRow;
+
+        var row = firstRow,
+            fold = this.session.getNextFoldLine(row),
+            foldStart = fold ?fold.start.row :Infinity;
+
+        while (true) {
+            if (row > foldStart) {
+                row = fold.end.row+1;
+                fold = this.session.getNextFoldLine(row, fold);
+                foldStart = fold ?fold.start.row :Infinity;
+            }
+            if (row > lastRow)
+                break;
+
+            if (this.$useLineGroups())
+                html.push("<div class='ace_line_group'>")
+
+            // Get the tokens per line as there might be some lines in between
+            // beeing folded.
+            // OPTIMIZE: If there is a long block of unfolded lines, just make
+            // this call once for that big block of unfolded lines.
+            var tokens = this.session.getTokens(row, row);
+            if (tokens.length == 1)
+                this.$renderLine(html, row, tokens[0].tokens, false);
+
+            if (this.$useLineGroups())
+                html.push("</div>"); // end the line group
+
+            row++;
+        }
+        this.element = dom.setInnerHtml(this.element, html.join(""));
+    };
+
+    this.$textToken = {
+        "text": true,
+        "rparen": true,
+        "lparen": true
+    };
+
+    this.$renderToken = function(stringBuilder, screenColumn, token, value) {        
+        var self = this;
+        var replaceReg = /\t|&|<|( +)|([\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000])|[\u1100-\u115F]|[\u11A3-\u11A7]|[\u11FA-\u11FF]|[\u2329-\u232A]|[\u2E80-\u2E99]|[\u2E9B-\u2EF3]|[\u2F00-\u2FD5]|[\u2FF0-\u2FFB]|[\u3000-\u303E]|[\u3041-\u3096]|[\u3099-\u30FF]|[\u3105-\u312D]|[\u3131-\u318E]|[\u3190-\u31BA]|[\u31C0-\u31E3]|[\u31F0-\u321E]|[\u3220-\u3247]|[\u3250-\u32FE]|[\u3300-\u4DBF]|[\u4E00-\uA48C]|[\uA490-\uA4C6]|[\uA960-\uA97C]|[\uAC00-\uD7A3]|[\uD7B0-\uD7C6]|[\uD7CB-\uD7FB]|[\uF900-\uFAFF]|[\uFE10-\uFE19]|[\uFE30-\uFE52]|[\uFE54-\uFE66]|[\uFE68-\uFE6B]|[\uFF01-\uFF60]|[\uFFE0-\uFFE6]/g;
+        var replaceFunc = function(c, a, b, tabIdx, idx4) {
+            if (c.charCodeAt(0) == 32) {
+                return new Array(c.length+1).join("&#160;");
+            } else if (c == "\t") {
+                var tabSize = self.session.getScreenTabSize(screenColumn + tabIdx);
+                screenColumn += tabSize - 1;
+                return self.$tabStrings[tabSize];
+            } else if (c == "&") {
+                if (useragent.isOldGecko)
+                    return "&";
+                else
+                    return "&amp;";
+            } else if (c == "<") {
+                return "&lt;";
+            } else if (c == "\u3000") {
+                // U+3000 is both invisible AND full-width, so must be handled uniquely
+                var classToUse = self.showInvisibles ? "ace_cjk ace_invisible" : "ace_cjk";
+                var space = self.showInvisibles ? self.SPACE_CHAR : "";
+                screenColumn += 1;
+                return "<span class='" + classToUse + "' style='width:" +
+                    (self.config.characterWidth * 2) +
+                    "px'>" + space + "</span>";
+            } else if (c.match(/[\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000]/)) {
+                if (self.showInvisibles) {
+                    var space = new Array(c.length+1).join(self.SPACE_CHAR);
+                    return "<span class='ace_invisible'>" + space + "</span>";
+                } else {
+                    return "&#160;";
+                }
+            } else {
+                screenColumn += 1;
+                return "<span class='ace_cjk' style='width:" +
+                    (self.config.characterWidth * 2) +
+                    "px'>" + c + "</span>";
+            }
+        };
+
+        var output = value.replace(replaceReg, replaceFunc);
+
+        if (!this.$textToken[token.type]) {
+            var classes = "ace_" + token.type.replace(/\./g, " ace_");
+            var style = "";
+            if (token.type == "fold")
+                style = " style='width:" + (token.value.length * this.config.characterWidth) + "px;' ";
+            stringBuilder.push("<span class='", classes, "'", style, ">", output, "</span>");
+        }
+        else {
+            stringBuilder.push(output);
+        }
+        return screenColumn + value.length;
+    };
+
+    this.$renderLineCore = function(stringBuilder, lastRow, tokens, splits, onlyContents) {
+        var chars = 0;
+        var split = 0;
+        var splitChars;
+        var screenColumn = 0;
+        var self = this;
+
+        if (!splits || splits.length == 0)
+            splitChars = Number.MAX_VALUE;
+        else
+            splitChars = splits[0];
+
+        if (!onlyContents) {
+            stringBuilder.push("<div class='ace_line' style='height:",
+                this.config.lineHeight, "px",
+                "'>"
+            );
+        }
+        
+        for (var i = 0; i < tokens.length; i++) {
+            var token = tokens[i];
+            var value = token.value;
+
+            if (chars + value.length < splitChars) {
+                screenColumn = self.$renderToken(
+                    stringBuilder, screenColumn, token, value
+                );
+                chars += value.length;
+            }
+            else {
+                while (chars + value.length >= splitChars) {
+                    screenColumn = self.$renderToken(
+                        stringBuilder, screenColumn, 
+                        token, value.substring(0, splitChars - chars)
+                    );
+                    value = value.substring(splitChars - chars);
+                    chars = splitChars;
+                    
+                    if (!onlyContents) {
+                        stringBuilder.push("</div>",
+                            "<div class='ace_line' style='height:",
+                            this.config.lineHeight, "px",
+                            "'>"
+                        );
+                    }
+
+                    split ++;
+                    screenColumn = 0;
+                    splitChars = splits[split] || Number.MAX_VALUE;
+                }
+                if (value.length != 0) {
+                    chars += value.length;
+                    screenColumn = self.$renderToken(
+                        stringBuilder, screenColumn, token, value
+                    );
+                }
+            }
+        }
+
+        if (this.showInvisibles) {
+            if (lastRow !== this.session.getLength() - 1)
+                stringBuilder.push("<span class='ace_invisible'>" + this.EOL_CHAR + "</span>");
+            else
+                stringBuilder.push("<span class='ace_invisible'>" + this.EOF_CHAR + "</span>");
+        }
+        if (!onlyContents)
+            stringBuilder.push("</div>");
+    };
+
+    this.$renderLine = function(stringBuilder, row, tokens, onlyContents) {
+        // Check if the line to render is folded or not. If not, things are
+        // simple, otherwise, we need to fake some things...
+        if (!this.session.isRowFolded(row)) {
+            var splits = this.session.getRowSplitData(row);
+            this.$renderLineCore(stringBuilder, row, tokens, splits, onlyContents);
+        } else {
+            this.$renderFoldLine(stringBuilder, row, tokens, onlyContents);
+        }
+    };
+
+    this.$renderFoldLine = function(stringBuilder, row, tokens, onlyContents) {
+        var session = this.session,
+            foldLine = session.getFoldLine(row),
+            renderTokens = [];
+
+        function addTokens(tokens, from, to) {
+            var idx = 0, col = 0;
+            while ((col + tokens[idx].value.length) < from) {
+                col += tokens[idx].value.length;
+                idx++;
+
+                if (idx == tokens.length) {
+                    return;
+                }
+            }
+            if (col != from) {
+                var value = tokens[idx].value.substring(from - col);
+                // Check if the token value is longer then the from...to spacing.
+                if (value.length > (to - from)) {
+                    value = value.substring(0, to - from);
+                }
+
+                renderTokens.push({
+                    type: tokens[idx].type,
+                    value: value
+                });
+
+                col = from + value.length;
+                idx += 1;
+            }
+
+            while (col < to) {
+                var value = tokens[idx].value;
+                if (value.length + col > to) {
+                    value = value.substring(0, to - col);
+                }
+                renderTokens.push({
+                    type: tokens[idx].type,
+                    value: value
+                });
+                col += value.length;
+                idx += 1;
+            }
+        }
+
+        foldLine.walk(function(placeholder, row, column, lastColumn, isNewRow) {
+            if (placeholder) {
+               renderTokens.push({
+                    type: "fold",
+                    value: placeholder
+                });
+            } else {
+                if (isNewRow) {
+                   tokens = this.session.getTokens(row, row)[0].tokens;
+                }
+                if (tokens.length != 0) {
+                    addTokens(tokens, lastColumn, column);
+                }
+            }
+        }.bind(this), foldLine.end.row, this.session.getLine(foldLine.end.row).length);
+
+        // TODO: Build a fake splits array!
+        var splits = this.session.$useWrapMode?this.session.$wrapData[row]:null;
+        this.$renderLineCore(stringBuilder, row, renderTokens, splits, onlyContents);
+    };
+    
+    this.$useLineGroups = function() {
+        // For the updateLines function to work correctly, it's important that the
+        // child nodes of this.element correspond on a 1-to-1 basis to rows in the 
+        // document (as distinct from lines on the screen). For sessions that are
+        // wrapped, this means we need to add a layer to the node hierarchy (tagged
+        // with the class name ace_line_group).
+        return this.session.getUseWrapMode();
+    };
+
+    this.destroy = function() {
+        clearInterval(this.$pollSizeChangesTimer);
+        if (this.$measureNode)
+            this.$measureNode.parentNode.removeChild(this.$measureNode);
+        delete this.$measureNode;
+    };
+
+}).call(Text.prototype);
+
+exports.Text = Text;
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Julian Viereck <julian.viereck@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/layer/cursor', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
+"use strict";
+
+var dom = require("../lib/dom");
+
+var Cursor = function(parentEl) {
+    this.element = dom.createElement("div");
+    this.element.className = "ace_layer ace_cursor-layer";
+    parentEl.appendChild(this.element);
+
+    this.cursor = dom.createElement("div");
+    this.cursor.className = "ace_cursor ace_hidden";
+    this.element.appendChild(this.cursor);
+
+    this.isVisible = false;
+};
+
+(function() {
+
+    this.$padding = 0;
+    this.setPadding = function(padding) {
+        this.$padding = padding;
+    };
+
+    this.setSession = function(session) {
+        this.session = session;
+    };
+
+    this.hideCursor = function() {
+        this.isVisible = false;
+        dom.addCssClass(this.cursor, "ace_hidden");
+        clearInterval(this.blinkId);
+    };
+
+    this.showCursor = function() {
+        this.isVisible = true;
+        dom.removeCssClass(this.cursor, "ace_hidden");
+        this.cursor.style.visibility = "visible";
+        this.restartTimer();
+    };
+
+    this.restartTimer = function() {
+        clearInterval(this.blinkId);
+        if (!this.isVisible) {
+            return;
+        }
+
+        var cursor = this.cursor;
+        this.blinkId = setInterval(function() {
+            cursor.style.visibility = "hidden";
+            setTimeout(function() {
+                cursor.style.visibility = "visible";
+            }, 400);
+        }, 1000);
+    };
+
+    this.getPixelPosition = function(onScreen) {
+        if (!this.config || !this.session) {
+            return {
+                left : 0,
+                top : 0
+            };
+        }
+
+        var position = this.session.selection.getCursor();
+        var pos = this.session.documentToScreenPosition(position);
+        var cursorLeft = Math.round(this.$padding +
+                                    pos.column * this.config.characterWidth);
+        var cursorTop = (pos.row - (onScreen ? this.config.firstRowScreen : 0)) *
+            this.config.lineHeight;
+
+        return {
+            left : cursorLeft,
+            top : cursorTop
+        };
+    };
+
+    this.update = function(config) {
+        this.config = config;
+
+        this.pixelPos = this.getPixelPosition(true);
+
+        this.cursor.style.left = this.pixelPos.left + "px";
+        this.cursor.style.top =  this.pixelPos.top + "px";
+        this.cursor.style.width = config.characterWidth + "px";
+        this.cursor.style.height = config.lineHeight + "px";
+
+        var overwrite = this.session.getOverwrite()
+        if (overwrite != this.overwrite) {
+            this.overwrite = overwrite;
+            if (overwrite)
+                dom.addCssClass(this.cursor, "ace_overwrite");
+            else
+                dom.removeCssClass(this.cursor, "ace_overwrite");
+        }
+
+        this.restartTimer();
+    };
+
+    this.destroy = function() {
+        clearInterval(this.blinkId);
+    }
+
+}).call(Cursor.prototype);
+
+exports.Cursor = Cursor;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/scrollbar', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/dom', 'ace/lib/event', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("./lib/oop");
+var dom = require("./lib/dom");
+var event = require("./lib/event");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+
+var ScrollBar = function(parent) {
+    this.element = dom.createElement("div");
+    this.element.className = "ace_sb";
+
+    this.inner = dom.createElement("div");
+    this.element.appendChild(this.inner);
+
+    parent.appendChild(this.element);
+
+    // in OSX lion the scrollbars appear to have no width. In this case resize
+    // the to show the scrollbar but still pretend that the scrollbar has a width
+    // of 0px
+    // in Firefox 6+ scrollbar is hidden if element has the same width as scrollbar
+    // make element a little bit wider to retain scrollbar when page is zoomed 
+    this.width = dom.scrollbarWidth(parent.ownerDocument);
+    this.element.style.width = (this.width || 15) + 5 + "px";
+
+    event.addListener(this.element, "scroll", this.onScroll.bind(this));
+};
+
+(function() {
+    oop.implement(this, EventEmitter);
+
+    this.onScroll = function() {
+        this._emit("scroll", {data: this.element.scrollTop});
+    };
+
+    this.getWidth = function() {
+        return this.width;
+    };
+
+    this.setHeight = function(height) {
+        this.element.style.height = height + "px";
+    };
+
+    this.setInnerHeight = function(height) {
+        this.inner.style.height = height + "px";
+    };
+
+    this.setScrollTop = function(scrollTop) {
+        this.element.scrollTop = scrollTop;
+    };
+
+}).call(ScrollBar.prototype);
+
+exports.ScrollBar = ScrollBar;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/renderloop', ['require', 'exports', 'module' , 'ace/lib/event'], function(require, exports, module) {
+"use strict";
+
+var event = require("./lib/event");
+
+var RenderLoop = function(onRender, win) {
+    this.onRender = onRender;
+    this.pending = false;
+    this.changes = 0;
+    this.window = win || window;
+};
+
+(function() {
+
+    this.schedule = function(change) {
+        //this.onRender(change);
+        //return;
+        this.changes = this.changes | change;
+        if (!this.pending) {
+            this.pending = true;
+            var _self = this;
+            event.nextTick(function() {
+                _self.pending = false;
+                var changes;
+                while (changes = _self.changes) {
+                    _self.changes = 0;
+                    _self.onRender(changes);
+                }
+            }, this.window);
+        }
+    };
+
+}).call(RenderLoop.prototype);
+
+exports.RenderLoop = RenderLoop;
+});
+define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
+  "\n" +
+  "\n" +
+  ".ace_editor {\n" +
+  "    position: absolute;\n" +
+  "    overflow: hidden;\n" +
+  "    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Droid Sans Mono', 'Courier New', monospace;\n" +
+  "    font-size: 12px;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_scroller {\n" +
+  "    position: absolute;\n" +
+  "    overflow-x: scroll;\n" +
+  "    overflow-y: hidden;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_content {\n" +
+  "    position: absolute;\n" +
+  "    box-sizing: border-box;\n" +
+  "    -moz-box-sizing: border-box;\n" +
+  "    -webkit-box-sizing: border-box;\n" +
+  "    cursor: text;\n" +
+  "}\n" +
+  "\n" +
+  "/* setting pointer-events: auto; on node under the mouse, which changes during scroll,\n" +
+  "  will break mouse wheel scrolling in Safari */\n" +
+  ".ace_content * {\n" +
+  "     pointer-events: none;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_composition {\n" +
+  "    position: absolute;\n" +
+  "    background: #555;\n" +
+  "    color: #DDD;\n" +
+  "    z-index: 4;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_gutter .ace_layer {\n" +
+  "    position: relative;\n" +
+  "    min-width: 54px;\n" +
+  "    text-align: right;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_gutter {\n" +
+  "    position: absolute;\n" +
+  "    overflow : hidden;\n" +
+  "    height: 100%;\n" +
+  "    width: auto;\n" +
+  "    cursor: default;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_gutter-cell {\n" +
+  "    padding-left: 19px;\n" +
+  "    padding-right: 6px;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_gutter-cell.ace_error {\n" +
+  "    background-image: url(\"data:image/gif,GIF89a%10%00%10%00%D5%00%00%F5or%F5%87%88%F5nr%F4ns%EBmq%F5z%7F%DDJT%DEKS%DFOW%F1Yc%F2ah%CE(7%CE)8%D18E%DD%40M%F2KZ%EBU%60%F4%60m%DCir%C8%16(%C8%19*%CE%255%F1%3FR%F1%3FS%E6%AB%B5%CA%5DI%CEn%5E%F7%A2%9A%C9G%3E%E0a%5B%F7%89%85%F5yy%F6%82%80%ED%82%80%FF%BF%BF%E3%C4%C4%FF%FF%FF%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%25%00%2C%00%00%00%00%10%00%10%00%00%06p%C0%92pH%2C%1A%8F%C8%D2H%93%E1d4%23%E4%88%D3%09mB%1DN%B48%F5%90%40%60%92G%5B%94%20%3E%22%D2%87%24%FA%20%24%C5%06A%00%20%B1%07%02B%A38%89X.v%17%82%11%13q%10%0Fi%24%0F%8B%10%7BD%12%0Ei%09%92%09%0EpD%18%15%24%0A%9Ci%05%0C%18F%18%0B%07%04%01%04%06%A0H%18%12%0D%14%0D%12%A1I%B3%B4%B5IA%00%3B\");\n" +
+  "    background-repeat: no-repeat;\n" +
+  "    background-position: 2px center;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_gutter-cell.ace_warning {\n" +
+  "    background-image: url(\"data:image/gif,GIF89a%10%00%10%00%D5%00%00%FF%DBr%FF%DE%81%FF%E2%8D%FF%E2%8F%FF%E4%96%FF%E3%97%FF%E5%9D%FF%E6%9E%FF%EE%C1%FF%C8Z%FF%CDk%FF%D0s%FF%D4%81%FF%D5%82%FF%D5%83%FF%DC%97%FF%DE%9D%FF%E7%B8%FF%CCl%7BQ%13%80U%15%82W%16%81U%16%89%5B%18%87%5B%18%8C%5E%1A%94d%1D%C5%83-%C9%87%2F%C6%84.%C6%85.%CD%8B2%C9%871%CB%8A3%CD%8B5%DC%98%3F%DF%9BB%E0%9CC%E1%A5U%CB%871%CF%8B5%D1%8D6%DB%97%40%DF%9AB%DD%99B%E3%B0p%E7%CC%AE%FF%FF%FF%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00!%F9%04%01%00%00%2F%00%2C%00%00%00%00%10%00%10%00%00%06a%C0%97pH%2C%1A%8FH%A1%ABTr%25%87%2B%04%82%F4%7C%B9X%91%08%CB%99%1C!%26%13%84*iJ9(%15G%CA%84%14%01%1A%97%0C%03%80%3A%9A%3E%81%84%3E%11%08%B1%8B%20%02%12%0F%18%1A%0F%0A%03'F%1C%04%0B%10%16%18%10%0B%05%1CF%1D-%06%07%9A%9A-%1EG%1B%A0%A1%A0U%A4%A5%A6BA%00%3B\");\n" +
+  "    background-repeat: no-repeat;\n" +
+  "    background-position: 2px center;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_gutter-cell.ace_info {\n" +
+  "    background-image: url(\"data:image/gif;base64,R0lGODlhEAAQAMQAAAAAAEFBQVJSUl5eXmRkZGtra39/f4WFhYmJiZGRkaampry8vMPDw8zMzNXV1dzc3OTk5Orq6vDw8P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABQALAAAAAAQABAAAAUuICWOZGmeaBml5XGwFCQSBGyXRSAwtqQIiRuiwIM5BoYVbEFIyGCQoeJGrVptIQA7\");\n" +
+  "    background-repeat: no-repeat;\n" +
+  "    background-position: 2px center;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_editor .ace_sb {\n" +
+  "    position: absolute;\n" +
+  "    overflow-x: hidden;\n" +
+  "    overflow-y: scroll;\n" +
+  "    right: 0;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_editor .ace_sb div {\n" +
+  "    position: absolute;\n" +
+  "    width: 1px;\n" +
+  "    left: 0;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_editor .ace_print_margin_layer {\n" +
+  "    z-index: 0;\n" +
+  "    position: absolute;\n" +
+  "    overflow: hidden;\n" +
+  "    margin: 0;\n" +
+  "    left: 0;\n" +
+  "    height: 100%;\n" +
+  "    width: 100%;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_editor .ace_print_margin {\n" +
+  "    position: absolute;\n" +
+  "    height: 100%;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_editor textarea {\n" +
+  "    position: fixed;\n" +
+  "    z-index: 0;\n" +
+  "    width: 10px;\n" +
+  "    height: 30px;\n" +
+  "    opacity: 0;\n" +
+  "    background: transparent;\n" +
+  "    appearance: none;\n" +
+  "    -moz-appearance: none;\n" +
+  "    border: none;\n" +
+  "    resize: none;\n" +
+  "    outline: none;\n" +
+  "    overflow: hidden;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_layer {\n" +
+  "    z-index: 1;\n" +
+  "    position: absolute;\n" +
+  "    overflow: hidden;\n" +
+  "    white-space: nowrap;\n" +
+  "    height: 100%;\n" +
+  "    width: 100%;\n" +
+  "    box-sizing: border-box;\n" +
+  "    -moz-box-sizing: border-box;\n" +
+  "    -webkit-box-sizing: border-box;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_text-layer {\n" +
+  "    color: black;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_cjk {\n" +
+  "    display: inline-block;\n" +
+  "    text-align: center;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_cursor-layer {\n" +
+  "    z-index: 4;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_cursor {\n" +
+  "    z-index: 4;\n" +
+  "    position: absolute;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_cursor.ace_hidden {\n" +
+  "    opacity: 0.2;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_line {\n" +
+  "    white-space: nowrap;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_marker-layer .ace_step {\n" +
+  "    position: absolute;\n" +
+  "    z-index: 3;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_marker-layer .ace_selection {\n" +
+  "    position: absolute;\n" +
+  "    z-index: 4;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_marker-layer .ace_bracket {\n" +
+  "    position: absolute;\n" +
+  "    z-index: 5;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_marker-layer .ace_active_line {\n" +
+  "    position: absolute;\n" +
+  "    z-index: 2;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_marker-layer .ace_selected_word {\n" +
+  "    position: absolute;\n" +
+  "    z-index: 6;\n" +
+  "    box-sizing: border-box;\n" +
+  "    -moz-box-sizing: border-box;\n" +
+  "    -webkit-box-sizing: border-box;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_line .ace_fold {\n" +
+  "    box-sizing: border-box;\n" +
+  "    -moz-box-sizing: border-box;\n" +
+  "    -webkit-box-sizing: border-box;\n" +
+  "    \n" +
+  "    display: inline-block;\n" +
+  "    height: 11px;\n" +
+  "    margin-top: -2px;\n" +
+  "    vertical-align: middle;\n" +
+  "\n" +
+  "    background-image: \n" +
+  "        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%11%00%00%00%09%08%06%00%00%00%D4%E8%C7%0C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%B5IDAT(%15%A5%91%3D%0E%02!%10%85ac%E1%05%D6%CE%D6%C6%CE%D2%E8%ED%CD%DE%C0%C6%D6N.%E0V%F8%3D%9Ca%891XH%C2%BE%D9y%3F%90!%E6%9C%C3%BFk%E5%011%C6-%F5%C8N%04%DF%BD%FF%89%DFt%83DN%60%3E%F3%AB%A0%DE%1A%5Dg%BE%10Q%97%1B%40%9C%A8o%10%8F%5E%828%B4%1B%60%87%F6%02%26%85%1Ch%1E%C1%2B%5Bk%FF%86%EE%B7j%09%9A%DA%9B%ACe%A3%F9%EC%DA!9%B4%D5%A6%81%86%86%98%CC%3C%5B%40%FA%81%B3%E9%CB%23%94%C16Azo%05%D4%E1%C1%95a%3B%8A'%A0%E8%CC%17%22%85%1D%BA%00%A2%FA%DC%0A%94%D1%D1%8D%8B%3A%84%17B%C7%60%1A%25Z%FC%8D%00%00%00%00IEND%AEB%60%82\"),\n" +
+  "        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%007%08%06%00%00%00%C4%DD%80C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%3AIDAT8%11c%FC%FF%FF%7F%18%03%1A%60%01%F2%3F%A0%891%80%04%FF%11-%F8%17%9BJ%E2%05%B1ZD%81v%26t%E7%80%F8%A3%82h%A12%1A%20%A3%01%02%0F%01%BA%25%06%00%19%C0%0D%AEF%D5%3ES%00%00%00%00IEND%AEB%60%82\");\n" +
+  "    background-repeat: no-repeat, repeat-x;\n" +
+  "    background-position: center center, top left;\n" +
+  "    color: transparent;\n" +
+  "\n" +
+  "    border: 1px solid black;\n" +
+  "    -moz-border-radius: 2px;\n" +
+  "    -webkit-border-radius: 2px;\n" +
+  "    border-radius: 2px;\n" +
+  "    \n" +
+  "    cursor: pointer;\n" +
+  "    pointer-events: auto;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_dark .ace_fold {\n" +
+  "}\n" +
+  "\n" +
+  ".ace_fold:hover{\n" +
+  "    background-image: \n" +
+  "        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%11%00%00%00%09%08%06%00%00%00%D4%E8%C7%0C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%B5IDAT(%15%A5%91%3D%0E%02!%10%85ac%E1%05%D6%CE%D6%C6%CE%D2%E8%ED%CD%DE%C0%C6%D6N.%E0V%F8%3D%9Ca%891XH%C2%BE%D9y%3F%90!%E6%9C%C3%BFk%E5%011%C6-%F5%C8N%04%DF%BD%FF%89%DFt%83DN%60%3E%F3%AB%A0%DE%1A%5Dg%BE%10Q%97%1B%40%9C%A8o%10%8F%5E%828%B4%1B%60%87%F6%02%26%85%1Ch%1E%C1%2B%5Bk%FF%86%EE%B7j%09%9A%DA%9B%ACe%A3%F9%EC%DA!9%B4%D5%A6%81%86%86%98%CC%3C%5B%40%FA%81%B3%E9%CB%23%94%C16Azo%05%D4%E1%C1%95a%3B%8A'%A0%E8%CC%17%22%85%1D%BA%00%A2%FA%DC%0A%94%D1%D1%8D%8B%3A%84%17B%C7%60%1A%25Z%FC%8D%00%00%00%00IEND%AEB%60%82\"),\n" +
+  "        url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%007%08%06%00%00%00%C4%DD%80C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%003IDAT8%11c%FC%FF%FF%7F%3E%03%1A%60%01%F2%3F%A3%891%80%04%FFQ%26%F8w%C0%B43%A1%DB%0C%E2%8F%0A%A2%85%CAh%80%8C%06%08%3C%04%E8%96%18%00%A3S%0D%CD%CF%D8%C1%9D%00%00%00%00IEND%AEB%60%82\");\n" +
+  "    background-repeat: no-repeat, repeat-x;\n" +
+  "    background-position: center center, top left;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_dragging .ace_content {\n" +
+  "    cursor: move;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_folding-enabled .ace_gutter-cell {\n" +
+  "    padding-right: 13px;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_fold-widget {\n" +
+  "    box-sizing: border-box;\n" +
+  "    -moz-box-sizing: border-box;\n" +
+  "    -webkit-box-sizing: border-box;\n" +
+  "\n" +
+  "    margin: 0 -12px 1px 1px;\n" +
+  "    display: inline-block;\n" +
+  "    height: 14px;\n" +
+  "    width: 11px;\n" +
+  "    vertical-align: text-bottom;\n" +
+  "    \n" +
+  "    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAe%8A%B1%0D%000%0C%C2%F2%2CK%96%BC%D0%8F9%81%88H%E9%D0%0E%96%C0%10%92%3E%02%80%5E%82%E4%A9*-%EEsw%C8%CC%11%EE%96w%D8%DC%E9*Eh%0C%151(%00%00%00%00IEND%AEB%60%82\");\n" +
+  "    background-repeat: no-repeat;\n" +
+  "    background-position: center 5px;\n" +
+  "\n" +
+  "    border-radius: 3px;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_fold-widget.end {\n" +
+  "    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAm%C7%C1%09%000%08C%D1%8C%ECE%C8E(%8E%EC%02)%1EZJ%F1%C1'%04%07I%E1%E5%EE%CAL%F5%A2%99%99%22%E2%D6%1FU%B5%FE0%D9x%A7%26Wz5%0E%D5%00%00%00%00IEND%AEB%60%82\");\n" +
+  "}\n" +
+  "\n" +
+  ".ace_fold-widget.closed {\n" +
+  "    background-image: url(\"data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%03%00%00%00%06%08%06%00%00%00%06%E5%24%0C%00%00%009IDATx%DA5%CA%C1%09%000%08%03%C0%AC*(%3E%04%C1%0D%BA%B1%23%A4Uh%E0%20%81%C0%CC%F8%82%81%AA%A2%AArGfr%88%08%11%11%1C%DD%7D%E0%EE%5B%F6%F6%CB%B8%05Q%2F%E9tai%D9%00%00%00%00IEND%AEB%60%82\");\n" +
+  "}\n" +
+  "\n" +
+  ".ace_fold-widget:hover {\n" +
+  "    border: 1px solid rgba(0, 0, 0, 0.3);\n" +
+  "    background-color: rgba(255, 255, 255, 0.2);\n" +
+  "    -moz-box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n" +
+  "    -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n" +
+  "    -webkit-box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n" +
+  "    -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n" +
+  "    box-shadow:inset 0 1px 1px rgba(255, 255, 255, 0.7);\n" +
+  "    box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\n" +
+  "    background-position: center 4px;\n" +
+  "}\n" +
+  "\n" +
+  ".ace_fold-widget:active {\n" +
+  "    border: 1px solid rgba(0, 0, 0, 0.4);\n" +
+  "    background-color: rgba(0, 0, 0, 0.05);\n" +
+  "    -moz-box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n" +
+  "    -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n" +
+  "    -webkit-box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n" +
+  "    -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n" +
+  "    box-shadow:inset 0 1px 1px rgba(255, 255, 255);\n" +
+  "    box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\n" +
+  "}\n" +
+  "\n" +
+  ".ace_fold-widget.invalid {\n" +
+  "    background-color: #FFB4B4;\n" +
+  "    border-color: #DE5555;\n" +
+  "}\n" +
+  "");
+
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/theme/textmate', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
+"use strict";
+
+exports.isDark = false;
+exports.cssClass = "ace-tm";
+exports.cssText = ".ace-tm .ace_editor {\
+  border: 2px solid rgb(159, 159, 159);\
+}\
+\
+.ace-tm .ace_editor.ace_focus {\
+  border: 2px solid #327fbd;\
+}\
+\
+.ace-tm .ace_gutter {\
+  background: #e8e8e8;\
+  color: #333;\
+}\
+\
+.ace-tm .ace_print_margin {\
+  width: 1px;\
+  background: #e8e8e8;\
+}\
+\
+.ace-tm .ace_fold {\
+    background-color: #0000A2;\
+}\
+\
+.ace-tm .ace_text-layer {\
+  cursor: text;\
+}\
+\
+.ace-tm .ace_cursor {\
+  border-left: 2px solid black;\
+}\
+\
+.ace-tm .ace_cursor.ace_overwrite {\
+  border-left: 0px;\
+  border-bottom: 1px solid black;\
+}\
+        \
+.ace-tm .ace_line .ace_invisible {\
+  color: rgb(191, 191, 191);\
+}\
+\
+.ace-tm .ace_line .ace_keyword {\
+  color: blue;\
+}\
+\
+.ace-tm .ace_line .ace_constant.ace_buildin {\
+  color: rgb(88, 72, 246);\
+}\
+\
+.ace-tm .ace_line .ace_constant.ace_language {\
+  color: rgb(88, 92, 246);\
+}\
+\
+.ace-tm .ace_line .ace_constant.ace_library {\
+  color: rgb(6, 150, 14);\
+}\
+\
+.ace-tm .ace_line .ace_invalid {\
+  background-color: rgb(153, 0, 0);\
+  color: white;\
+}\
+\
+.ace-tm .ace_line .ace_support.ace_function {\
+  color: rgb(60, 76, 114);\
+}\
+\
+.ace-tm .ace_line .ace_support.ace_constant {\
+  color: rgb(6, 150, 14);\
+}\
+\
+.ace-tm .ace_line .ace_support.ace_type,\
+.ace-tm .ace_line .ace_support.ace_class {\
+  color: rgb(109, 121, 222);\
+}\
+\
+.ace-tm .ace_line .ace_keyword.ace_operator {\
+  color: rgb(104, 118, 135);\
+}\
+\
+.ace-tm .ace_line .ace_string {\
+  color: rgb(3, 106, 7);\
+}\
+\
+.ace-tm .ace_line .ace_comment {\
+  color: rgb(76, 136, 107);\
+}\
+\
+.ace-tm .ace_line .ace_comment.ace_doc {\
+  color: rgb(0, 102, 255);\
+}\
+\
+.ace-tm .ace_line .ace_comment.ace_doc.ace_tag {\
+  color: rgb(128, 159, 191);\
+}\
+\
+.ace-tm .ace_line .ace_constant.ace_numeric {\
+  color: rgb(0, 0, 205);\
+}\
+\
+.ace-tm .ace_line .ace_variable {\
+  color: rgb(49, 132, 149);\
+}\
+\
+.ace-tm .ace_line .ace_xml_pe {\
+  color: rgb(104, 104, 91);\
+}\
+\
+.ace-tm .ace_entity.ace_name.ace_function {\
+  color: #0000A2;\
+}\
+\
+.ace-tm .ace_markup.ace_markupine {\
+    text-decoration:underline;\
+}\
+\
+.ace-tm .ace_markup.ace_heading {\
+  color: rgb(12, 7, 255);\
+}\
+\
+.ace-tm .ace_markup.ace_list {\
+  color:rgb(185, 6, 144);\
+}\
+\
+.ace-tm .ace_marker-layer .ace_selection {\
+  background: rgb(181, 213, 255);\
+}\
+\
+.ace-tm .ace_marker-layer .ace_step {\
+  background: rgb(252, 255, 0);\
+}\
+\
+.ace-tm .ace_marker-layer .ace_stack {\
+  background: rgb(164, 229, 101);\
+}\
+\
+.ace-tm .ace_marker-layer .ace_bracket {\
+  margin: -1px 0 0 -1px;\
+  border: 1px solid rgb(192, 192, 192);\
+}\
+\
+.ace-tm .ace_marker-layer .ace_active_line {\
+  background: rgba(0, 0, 0, 0.07);\
+}\
+\
+.ace-tm .ace_marker-layer .ace_selected_word {\
+  background: rgb(250, 250, 255);\
+  border: 1px solid rgb(200, 200, 250);\
+}\
+\
+.ace-tm .ace_meta.ace_tag {\
+  color:rgb(28, 2, 255);\
+}\
+\
+.ace-tm .ace_string.ace_regex {\
+  color: rgb(255, 0, 0)\
+}";
+
+var dom = require("../lib/dom");
+dom.importCssString(exports.cssText, exports.cssClass);
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/keybinding-emacs-uncompressed.js b/apps/files_texteditor/js/aceeditor/keybinding-emacs-uncompressed.js
new file mode 100755
index 00000000000..1d40eb461f4
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/keybinding-emacs-uncompressed.js
@@ -0,0 +1,415 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Skywriter.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Julian Viereck (julian.viereck@gmail.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/keyboard/keybinding/emacs', ['require', 'exports', 'module' , 'ace/keyboard/state_handler'], function(require, exports, module) {
+"use strict";
+
+var StateHandler = require("../state_handler").StateHandler;
+var matchCharacterOnly =  require("../state_handler").matchCharacterOnly;
+
+var emacsState = {
+    start: [
+        {
+            key:    "ctrl-x",
+            then:   "c-x"
+        },
+        {
+            regex:  [ "(?:command-([0-9]*))*", "(down|ctrl-n)" ],
+            exec:   "golinedown",
+            params: [
+                {
+                    name: "times",
+                    match: 1,
+                    type: "number",
+                    defaultValue: 1
+                }
+            ]
+        },
+        {
+            regex: [ "(?:command-([0-9]*))*", "(right|ctrl-f)" ],
+            exec: "gotoright",
+            params: [
+                {
+                    name: "times",
+                    match: 1,
+                    type: "number",
+                    defaultValue: 1
+                }
+            ]
+        },
+        {
+            regex: [ "(?:command-([0-9]*))*", "(up|ctrl-p)" ],
+            exec: "golineup",
+            params: [
+                {
+                    name: "times",
+                    match: 1,
+                    type: "number",
+                    defaultValue: 1
+                }
+            ]
+        },
+        {
+            regex: [ "(?:command-([0-9]*))*", "(left|ctrl-b)" ],
+            exec: "gotoleft",
+            params: [
+                {
+                    name: "times",
+                    match: 1,
+                    type: "number",
+                    defaultValue: 1
+                }
+            ]
+        },
+        {
+            comment: "This binding matches all printable characters except numbers as long as they are no numbers and print them n times.",
+            regex:  [ "(?:command-([0-9]*))", "([^0-9]+)*" ],
+            match:  matchCharacterOnly,
+            exec:   "inserttext",
+            params: [
+                {
+                    name: "times",
+                    match: 1,
+                    type: "number",
+                    defaultValue: "1"
+                },
+                {
+                    name: "text",
+                    match: 2
+                }
+            ]
+        },
+        {
+            comment: "This binding matches numbers as long as there is no meta_number in the buffer.",
+            regex:  [ "(command-[0-9]*)*", "([0-9]+)" ],
+            match:  matchCharacterOnly,
+            disallowMatches:  [ 1 ],
+            exec:   "inserttext",
+            params: [
+                {
+                    name: "text",
+                    match: 2,
+                    type: "text"
+                }
+            ]
+        },
+        {
+            regex: [ "command-([0-9]*)", "(command-[0-9]|[0-9])" ],
+            comment: "Stops execution if the regex /meta_[0-9]+/ matches to avoid resetting the buffer."
+        }
+    ],
+    "c-x": [
+        {
+            key: "ctrl-g",
+            then: "start"
+        },
+        {
+            key: "ctrl-s",
+            exec: "save",
+            then: "start"
+        }
+    ]
+};
+
+exports.Emacs = new StateHandler(emacsState);
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Skywriter.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Julian Viereck (julian.viereck@gmail.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/keyboard/state_handler', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+// If you're developing a new keymapping and want to get an idea what's going
+// on, then enable debugging.
+var DEBUG = false;
+
+function StateHandler(keymapping) {
+    this.keymapping = this.$buildKeymappingRegex(keymapping);
+}
+
+StateHandler.prototype = {
+    /**
+     * Build the RegExp from the keymapping as RegExp can't stored directly
+     * in the metadata JSON and as the RegExp used to match the keys/buffer
+     * need to be adapted.
+     */
+    $buildKeymappingRegex: function(keymapping) {
+        for (var state in keymapping) {
+            this.$buildBindingsRegex(keymapping[state]);
+        }
+        return keymapping;
+    },
+
+    $buildBindingsRegex: function(bindings) {
+        // Escape a given Regex string.
+        bindings.forEach(function(binding) {
+            if (binding.key) {
+                binding.key = new RegExp('^' + binding.key + '$');
+            } else if (Array.isArray(binding.regex)) {
+                if (!('key' in binding))
+                  binding.key = new RegExp('^' + binding.regex[1] + '$');
+                binding.regex = new RegExp(binding.regex.join('') + '$');
+            } else if (binding.regex) {
+                binding.regex = new RegExp(binding.regex + '$');
+            }
+        });
+    },
+
+    $composeBuffer: function(data, hashId, key, e) {
+        // Initialize the data object.
+        if (data.state == null || data.buffer == null) {
+            data.state = "start";
+            data.buffer = "";
+        }
+
+        var keyArray = [];
+        if (hashId & 1) keyArray.push("ctrl");
+        if (hashId & 8) keyArray.push("command");
+        if (hashId & 2) keyArray.push("option");
+        if (hashId & 4) keyArray.push("shift");
+        if (key)        keyArray.push(key);
+
+        var symbolicName = keyArray.join("-");
+        var bufferToUse = data.buffer + symbolicName;
+
+        // Don't add the symbolic name to the key buffer if the alt_ key is
+        // part of the symbolic name. If it starts with alt_, this means
+        // that the user hit an alt keycombo and there will be a single,
+        // new character detected after this event, which then will be
+        // added to the buffer (e.g. alt_j will result in ∆).
+        //
+        // We test for 2 and not for & 2 as we only want to exclude the case where
+        // the option key is pressed alone.
+        if (hashId != 2) {
+            data.buffer = bufferToUse;
+        }
+
+        var bufferObj = {
+            bufferToUse: bufferToUse,
+            symbolicName: symbolicName,
+        };
+
+        if (e) {
+            bufferObj.keyIdentifier = e.keyIdentifier
+        }
+
+        return bufferObj;
+    },
+
+    $find: function(data, buffer, symbolicName, hashId, key, keyIdentifier) {
+        // Holds the command to execute and the args if a command matched.
+        var result = {};
+
+        // Loop over all the bindings of the keymap until a match is found.
+        this.keymapping[data.state].some(function(binding) {
+            var match;
+
+            // Check if the key matches.
+            if (binding.key && !binding.key.test(symbolicName)) {
+                return false;
+            }
+
+            // Check if the regex matches.
+            if (binding.regex && !(match = binding.regex.exec(buffer))) {
+                return false;
+            }
+
+            // Check if the match function matches.
+            if (binding.match && !binding.match(buffer, hashId, key, symbolicName, keyIdentifier)) {
+                return false;
+            }
+
+            // Check for disallowed matches.
+            if (binding.disallowMatches) {
+                for (var i = 0; i < binding.disallowMatches.length; i++) {
+                    if (!!match[binding.disallowMatches[i]]) {
+                        return false;
+                    }
+                }
+            }
+
+            // If there is a command to execute, then figure out the
+            // command and the arguments.
+            if (binding.exec) {
+                result.command = binding.exec;
+
+                // Build the arguments.
+                if (binding.params) {
+                    var value;
+                    result.args = {};
+                    binding.params.forEach(function(param) {
+                        if (param.match != null && match != null) {
+                            value = match[param.match] || param.defaultValue;
+                        } else {
+                            value = param.defaultValue;
+                        }
+
+                        if (param.type === 'number') {
+                            value = parseInt(value);
+                        }
+
+                        result.args[param.name] = value;
+                    });
+                }
+                data.buffer = "";
+            }
+
+            // Handle the 'then' property.
+            if (binding.then) {
+                data.state = binding.then;
+                data.buffer = "";
+            }
+
+            // If no command is set, then execute the "null" fake command.
+            if (result.command == null) {
+                result.command = "null";
+            }
+
+            if (DEBUG) {
+                console.log("KeyboardStateMapper#find", binding);
+            }
+            return true;
+        });
+
+        if (result.command) {
+            return result;
+        } else {
+            data.buffer = "";
+            return false;
+        }
+    },
+
+    /**
+     * This function is called by keyBinding.
+     */
+    handleKeyboard: function(data, hashId, key, keyCode, e) {
+        // If we pressed any command key but no other key, then ignore the input.
+        // Otherwise "shift-" is added to the buffer, and later on "shift-g"
+        // which results in "shift-shift-g" which doesn't make sense.
+        if (hashId != 0 && (key == "" || key == String.fromCharCode(0))) {
+            return null;
+        }
+
+        // Compute the current value of the keyboard input buffer.
+        var r = this.$composeBuffer(data, hashId, key, e);
+        var buffer = r.bufferToUse;
+        var symbolicName = r.symbolicName;
+        var keyId = r.keyIdentifier;
+
+        r = this.$find(data, buffer, symbolicName, hashId, key, keyId);
+        if (DEBUG) {
+            console.log("KeyboardStateMapper#match", buffer, symbolicName, r);
+        }
+
+        return r;
+    }
+}
+
+/**
+ * This is a useful matching function and therefore is defined here so that
+ * users of KeyboardStateMapper can use it.
+ *
+ * @return boolean
+ *          If no command key (Command|Option|Shift|Ctrl) is pressed, it
+ *          returns true. If the only the Shift key is pressed + a character
+ *          true is returned as well. Otherwise, false is returned.
+ *          Summing up, the function returns true whenever the user typed
+ *          a normal character on the keyboard and no shortcut.
+ */
+exports.matchCharacterOnly = function(buffer, hashId, key, symbolicName) {
+    // If no command keys are pressed, then catch the input.
+    if (hashId == 0) {
+        return true;
+    }
+    // If only the shift key is pressed and a character key, then
+    // catch that input as well.
+    else if ((hashId == 4) && key.length == 1) {
+        return true;
+    }
+    // Otherwise, we let the input got through.
+    else {
+        return false;
+    }
+};
+
+exports.StateHandler = StateHandler;
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/keybinding-vim-uncompressed.js b/apps/files_texteditor/js/aceeditor/keybinding-vim-uncompressed.js
new file mode 100755
index 00000000000..bd730278477
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/keybinding-vim-uncompressed.js
@@ -0,0 +1,403 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Skywriter.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Julian Viereck (julian.viereck@gmail.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/keyboard/keybinding/vim', ['require', 'exports', 'module' , 'ace/keyboard/state_handler'], function(require, exports, module) {
+"use strict";
+
+var StateHandler = require("../state_handler").StateHandler;
+var matchCharacterOnly =  require("../state_handler").matchCharacterOnly;
+
+var vimcommand = function(key, exec, then) {
+    return {
+        regex:  [ "([0-9]*)", key ],
+        exec:   exec,
+        params: [
+            {
+                name:     "times",
+                match:    1,
+                type:     "number",
+                defaultValue:     1
+            }
+        ],
+        then:   then
+    }
+}
+
+var vimStates = {
+    start: [
+        {
+            key:    "i",
+            then:   "insertMode"
+        },
+        {
+            key:    "d",
+            then:   "deleteMode"
+        },
+        {
+            key:    "a",
+            exec:   "gotoright",
+            then:   "insertMode"
+        },
+        {
+            key:    "shift-i",
+            exec:   "gotolinestart",
+            then:   "insertMode"
+        },
+        {
+            key:    "shift-a",
+            exec:   "gotolineend",
+            then:   "insertMode"
+        },
+        {
+            key:    "shift-c",
+            exec:   "removetolineend",
+            then:   "insertMode"
+        },
+        {
+            key:    "shift-r",
+            exec:   "overwrite",
+            then:   "replaceMode"
+        },
+        vimcommand("(k|up)", "golineup"),
+        vimcommand("(j|down)", "golinedown"),
+        vimcommand("(l|right)", "gotoright"),
+        vimcommand("(h|left)", "gotoleft"),
+        {
+            key:    "shift-g",
+            exec:   "gotoend"
+        },
+        vimcommand("b", "gotowordleft"),
+        vimcommand("e", "gotowordright"),
+        vimcommand("x", "del"),
+        vimcommand("shift-x", "backspace"),
+        vimcommand("shift-d", "removetolineend"),
+        vimcommand("u", "undo"), // [count] on this may/may not work, depending on browser implementation...
+        {
+            comment:    "Catch some keyboard input to stop it here",
+            match:      matchCharacterOnly
+        }
+    ],
+    insertMode: [
+        {
+            key:      "esc",
+            then:     "start"
+        }
+    ],
+    replaceMode: [
+        {
+            key:      "esc",
+            exec:     "overwrite",
+            then:     "start"
+        }
+    ],
+    deleteMode: [
+        {
+            key:      "d",
+            exec:     "removeline",
+            then:     "start"
+        }
+    ]
+};
+
+exports.Vim = new StateHandler(vimStates);
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Skywriter.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Julian Viereck (julian.viereck@gmail.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/keyboard/state_handler', ['require', 'exports', 'module' ], function(require, exports, module) {
+"use strict";
+
+// If you're developing a new keymapping and want to get an idea what's going
+// on, then enable debugging.
+var DEBUG = false;
+
+function StateHandler(keymapping) {
+    this.keymapping = this.$buildKeymappingRegex(keymapping);
+}
+
+StateHandler.prototype = {
+    /**
+     * Build the RegExp from the keymapping as RegExp can't stored directly
+     * in the metadata JSON and as the RegExp used to match the keys/buffer
+     * need to be adapted.
+     */
+    $buildKeymappingRegex: function(keymapping) {
+        for (var state in keymapping) {
+            this.$buildBindingsRegex(keymapping[state]);
+        }
+        return keymapping;
+    },
+
+    $buildBindingsRegex: function(bindings) {
+        // Escape a given Regex string.
+        bindings.forEach(function(binding) {
+            if (binding.key) {
+                binding.key = new RegExp('^' + binding.key + '$');
+            } else if (Array.isArray(binding.regex)) {
+                if (!('key' in binding))
+                  binding.key = new RegExp('^' + binding.regex[1] + '$');
+                binding.regex = new RegExp(binding.regex.join('') + '$');
+            } else if (binding.regex) {
+                binding.regex = new RegExp(binding.regex + '$');
+            }
+        });
+    },
+
+    $composeBuffer: function(data, hashId, key, e) {
+        // Initialize the data object.
+        if (data.state == null || data.buffer == null) {
+            data.state = "start";
+            data.buffer = "";
+        }
+
+        var keyArray = [];
+        if (hashId & 1) keyArray.push("ctrl");
+        if (hashId & 8) keyArray.push("command");
+        if (hashId & 2) keyArray.push("option");
+        if (hashId & 4) keyArray.push("shift");
+        if (key)        keyArray.push(key);
+
+        var symbolicName = keyArray.join("-");
+        var bufferToUse = data.buffer + symbolicName;
+
+        // Don't add the symbolic name to the key buffer if the alt_ key is
+        // part of the symbolic name. If it starts with alt_, this means
+        // that the user hit an alt keycombo and there will be a single,
+        // new character detected after this event, which then will be
+        // added to the buffer (e.g. alt_j will result in ∆).
+        //
+        // We test for 2 and not for & 2 as we only want to exclude the case where
+        // the option key is pressed alone.
+        if (hashId != 2) {
+            data.buffer = bufferToUse;
+        }
+
+        var bufferObj = {
+            bufferToUse: bufferToUse,
+            symbolicName: symbolicName,
+        };
+
+        if (e) {
+            bufferObj.keyIdentifier = e.keyIdentifier
+        }
+
+        return bufferObj;
+    },
+
+    $find: function(data, buffer, symbolicName, hashId, key, keyIdentifier) {
+        // Holds the command to execute and the args if a command matched.
+        var result = {};
+
+        // Loop over all the bindings of the keymap until a match is found.
+        this.keymapping[data.state].some(function(binding) {
+            var match;
+
+            // Check if the key matches.
+            if (binding.key && !binding.key.test(symbolicName)) {
+                return false;
+            }
+
+            // Check if the regex matches.
+            if (binding.regex && !(match = binding.regex.exec(buffer))) {
+                return false;
+            }
+
+            // Check if the match function matches.
+            if (binding.match && !binding.match(buffer, hashId, key, symbolicName, keyIdentifier)) {
+                return false;
+            }
+
+            // Check for disallowed matches.
+            if (binding.disallowMatches) {
+                for (var i = 0; i < binding.disallowMatches.length; i++) {
+                    if (!!match[binding.disallowMatches[i]]) {
+                        return false;
+                    }
+                }
+            }
+
+            // If there is a command to execute, then figure out the
+            // command and the arguments.
+            if (binding.exec) {
+                result.command = binding.exec;
+
+                // Build the arguments.
+                if (binding.params) {
+                    var value;
+                    result.args = {};
+                    binding.params.forEach(function(param) {
+                        if (param.match != null && match != null) {
+                            value = match[param.match] || param.defaultValue;
+                        } else {
+                            value = param.defaultValue;
+                        }
+
+                        if (param.type === 'number') {
+                            value = parseInt(value);
+                        }
+
+                        result.args[param.name] = value;
+                    });
+                }
+                data.buffer = "";
+            }
+
+            // Handle the 'then' property.
+            if (binding.then) {
+                data.state = binding.then;
+                data.buffer = "";
+            }
+
+            // If no command is set, then execute the "null" fake command.
+            if (result.command == null) {
+                result.command = "null";
+            }
+
+            if (DEBUG) {
+                console.log("KeyboardStateMapper#find", binding);
+            }
+            return true;
+        });
+
+        if (result.command) {
+            return result;
+        } else {
+            data.buffer = "";
+            return false;
+        }
+    },
+
+    /**
+     * This function is called by keyBinding.
+     */
+    handleKeyboard: function(data, hashId, key, keyCode, e) {
+        // If we pressed any command key but no other key, then ignore the input.
+        // Otherwise "shift-" is added to the buffer, and later on "shift-g"
+        // which results in "shift-shift-g" which doesn't make sense.
+        if (hashId != 0 && (key == "" || key == String.fromCharCode(0))) {
+            return null;
+        }
+
+        // Compute the current value of the keyboard input buffer.
+        var r = this.$composeBuffer(data, hashId, key, e);
+        var buffer = r.bufferToUse;
+        var symbolicName = r.symbolicName;
+        var keyId = r.keyIdentifier;
+
+        r = this.$find(data, buffer, symbolicName, hashId, key, keyId);
+        if (DEBUG) {
+            console.log("KeyboardStateMapper#match", buffer, symbolicName, r);
+        }
+
+        return r;
+    }
+}
+
+/**
+ * This is a useful matching function and therefore is defined here so that
+ * users of KeyboardStateMapper can use it.
+ *
+ * @return boolean
+ *          If no command key (Command|Option|Shift|Ctrl) is pressed, it
+ *          returns true. If the only the Shift key is pressed + a character
+ *          true is returned as well. Otherwise, false is returned.
+ *          Summing up, the function returns true whenever the user typed
+ *          a normal character on the keyboard and no shortcut.
+ */
+exports.matchCharacterOnly = function(buffer, hashId, key, symbolicName) {
+    // If no command keys are pressed, then catch the input.
+    if (hashId == 0) {
+        return true;
+    }
+    // If only the shift key is pressed and a character key, then
+    // catch that input as well.
+    else if ((hashId == 4) && key.length == 1) {
+        return true;
+    }
+    // Otherwise, we let the input got through.
+    else {
+        return false;
+    }
+};
+
+exports.StateHandler = StateHandler;
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-c_cpp-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-c_cpp-uncompressed.js
new file mode 100755
index 00000000000..87a8fab9dd1
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-c_cpp-uncompressed.js
@@ -0,0 +1,928 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Gastón Kleiman <gaston.kleiman AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/c_cpp', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/c_cpp_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var c_cppHighlightRules = require("./c_cpp_highlight_rules").c_cppHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var Range = require("../range").Range;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new c_cppHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var re = /^(\s*)\/\//;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i);
+                var m = line.match(re);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, "//");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+        var endState = tokenizedLine.state;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+
+        if (state == "start") {
+            var match = line.match(/^.*[\{\(\[]\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        } else if (state == "doc-start") {
+            if (endState == "start") {
+                return "";
+            }
+            var match = line.match(/^\s*(\/?)\*/);
+            if (match) {
+                if (match[1]) {
+                    indent += " ";
+                }
+                indent += "* ";
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Gastón Kleiman <gaston.kleiman AT gmail DOT com>
+ *
+ * Based on Bespin's C/C++ Syntax Plugin by Marc McIntyre.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/c_cpp_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var c_cppHighlightRules = function() {
+
+    var keywords = lang.arrayToMap(
+        ("and|double|not_eq|throw|and_eq|dynamic_cast|operator|true|" +
+        "asm|else|or|try|auto|enum|or_eq|typedef|bitand|explicit|private|" +
+        "typeid|bitor|extern|protected|typename|bool|false|public|union|" +
+        "break|float|register|unsigned|case|fro|reinterpret-cast|using|catch|" +
+        "friend|return|virtual|char|goto|short|void|class|if|signed|volatile|" +
+        "compl|inline|sizeof|wchar_t|const|int|static|while|const-cast|long|" +
+        "static_cast|xor|continue|mutable|struct|xor_eq|default|namespace|" +
+        "switch|delete|new|template|do|not|this|for").split("|")
+    );
+
+    var buildinConstants = lang.arrayToMap(
+        ("NULL").split("|")
+    );
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            new DocCommentHighlightRules().getStartRule("doc-start"),
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : '["].*\\\\$',
+                next : "qqstring"
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : "['].*\\\\$",
+                next : "qstring"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+              token : "constant", // <CONSTANT>
+              regex : "<[a-zA-Z0-9.]+>"
+            }, {
+              token : "keyword", // pre-compiler directivs
+              regex : "(?:#include|#pragma|#line|#define|#undef|#ifdef|#else|#elif|#endif|#ifndef)"
+          }, {
+                token : function(value) {
+                    if (value == "this")
+                        return "variable.language";
+                    else if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else
+                        return "identifier";
+                },
+                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+            }, {
+                token : "keyword.operator",
+                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"
+            }, {
+              token : "punctuation.operator",
+              regex : "\\?|\\:|\\,|\\;|\\."
+            }, {
+                token : "paren.lparen",
+                regex : "[[({]"
+            }, {
+                token : "paren.rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "qqstring" : [
+            {
+                token : "string",
+                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ],
+        "qstring" : [
+            {
+                token : "string",
+                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ]
+    };
+    
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ new DocCommentHighlightRules().getEndRule("start") ]);
+};
+
+oop.inherits(c_cppHighlightRules, TextHighlightRules);
+
+exports.c_cppHighlightRules = c_cppHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var DocCommentHighlightRules = function() {
+
+    this.$rules = {
+        "start" : [ {
+            token : "comment.doc.tag",
+            regex : "@[\\w\\d_]+" // TODO: fix email addresses
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "\\s+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "TODO"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "[^@\\*]+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "."
+        }]
+    };
+};
+
+oop.inherits(DocCommentHighlightRules, TextHighlightRules);
+
+(function() {
+
+    this.getStartRule = function(start) {
+        return {
+            token : "comment.doc", // doc comment
+            merge : true,
+            regex : "\\/\\*(?=\\*)",
+            next  : start
+        };
+    };
+    
+    this.getEndRule = function (start) {
+        return {
+            token : "comment.doc", // closing comment
+            merge : true,
+            regex : "\\*\\/",
+            next  : start
+        };
+    };
+
+}).call(DocCommentHighlightRules.prototype);
+
+exports.DocCommentHighlightRules = DocCommentHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require('../behaviour').Behaviour;
+
+var CstyleBehaviour = function () {
+
+    this.add("braces", "insertion", function (state, action, editor, session, text) {
+        if (text == '{') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '}') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return null;
+
+                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
+                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+
+    this.add("braces", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '{') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.end.column, range.end.column + 1);
+            if (rightChar == '}') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("parens", "insertion", function (state, action, editor, session, text) {
+        if (text == '(') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '()',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == ')') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == ')') {
+                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("parens", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '(') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == ')') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '"' + selected + '"',
+                    selection: false
+                }
+            } else {
+                var cursor = editor.getCursorPosition();
+                var line = session.doc.getLine(cursor.row);
+                var leftChar = line.substring(cursor.column-1, cursor.column);
+
+                // We're escaped.
+                if (leftChar == '\\') {
+                    return null;
+                }
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf('"');
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
+                    return {
+                        text: '""',
+                        selection: [1,1]
+                    }
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == '"') {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '"') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == '"') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+}
+oop.inherits(CstyleBehaviour, Behaviour);
+
+exports.CstyleBehaviour = CstyleBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-clojure-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-clojure-uncompressed.js
new file mode 100755
index 00000000000..eb99ceb3eea
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-clojure-uncompressed.js
@@ -0,0 +1,432 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Shlomo Zalman Heigh <shlomozalmanheigh AT gmail DOT com>
+ *      Carin Meier
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/clojure', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/clojure_highlight_rules', 'ace/mode/matching_parens_outdent', 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var ClojureHighlightRules = require("./clojure_highlight_rules").ClojureHighlightRules;
+var MatchingParensOutdent = require("./matching_parens_outdent").MatchingParensOutdent;
+var Range = require("../range").Range;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new ClojureHighlightRules().getRules());
+    this.$outdent = new MatchingParensOutdent();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var re = /^(\s*)#/;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i);
+                var m = line.match(re);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, ";");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+        
+        if (state == "start") {
+            var match = line.match(/[\(\[]/);
+            if (match) {
+                indent += "  ";
+            }
+            match = line.match(/[\)]/);
+            if (match) {
+              indent = "";
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Shlomo Zalman Heigh <shlomozalmanheigh AT gmail DOT com>
+ *      Carin Meier
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/clojure_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+
+
+var ClojureHighlightRules = function() {
+
+       var builtinFunctions = lang.arrayToMap(
+        ('* *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* ' +
+            '*command-line-args* *compile-files* *compile-path* *e *err* *file* ' +
+            '*flush-on-newline* *in* *macro-meta* *math-context* *ns* *out* ' +
+            '*print-dup* *print-length* *print-level* *print-meta* *print-readably* ' +
+            '*read-eval* *source-path* *use-context-classloader* ' +
+            '*warn-on-reflection* + - -> -&gt; ->> -&gt;&gt; .. / < &lt; <= &lt;= = ' +
+            '== > &gt; >= &gt;= accessor aclone ' +
+            'add-classpath add-watch agent agent-errors aget alength alias all-ns ' +
+            'alter alter-meta! alter-var-root amap ancestors and apply areduce ' +
+            'array-map aset aset-boolean aset-byte aset-char aset-double aset-float ' +
+            'aset-int aset-long aset-short assert assoc assoc! assoc-in associative? ' +
+            'atom await await-for await1 bases bean bigdec bigint binding bit-and ' +
+            'bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left ' +
+            'bit-shift-right bit-test bit-xor boolean boolean-array booleans ' +
+            'bound-fn bound-fn* butlast byte byte-array bytes cast char char-array ' +
+            'char-escape-string char-name-string char? chars chunk chunk-append ' +
+            'chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? ' +
+            'class class? clear-agent-errors clojure-version coll? comment commute ' +
+            'comp comparator compare compare-and-set! compile complement concat cond ' +
+            'condp conj conj! cons constantly construct-proxy contains? count ' +
+            'counted? create-ns create-struct cycle dec decimal? declare definline ' +
+            'defmacro defmethod defmulti defn defn- defonce defstruct delay delay? ' +
+            'deliver deref derive descendants destructure disj disj! dissoc dissoc! ' +
+            'distinct distinct? doall doc dorun doseq dosync dotimes doto double ' +
+            'double-array doubles drop drop-last drop-while empty empty? ensure ' +
+            'enumeration-seq eval even? every? false? ffirst file-seq filter find ' +
+            'find-doc find-ns find-var first float float-array float? floats flush ' +
+            'fn fn? fnext for force format future future-call future-cancel ' +
+            'future-cancelled? future-done? future? gen-class gen-interface gensym ' +
+            'get get-in get-method get-proxy-class get-thread-bindings get-validator ' +
+            'hash hash-map hash-set identical? identity if-let if-not ifn? import ' +
+            'in-ns inc init-proxy instance? int int-array integer? interleave intern ' +
+            'interpose into into-array ints io! isa? iterate iterator-seq juxt key ' +
+            'keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list ' +
+            'list* list? load load-file load-reader load-string loaded-libs locking ' +
+            'long long-array longs loop macroexpand macroexpand-1 make-array ' +
+            'make-hierarchy map map? mapcat max max-key memfn memoize merge ' +
+            'merge-with meta method-sig methods min min-key mod name namespace neg? ' +
+            'newline next nfirst nil? nnext not not-any? not-empty not-every? not= ' +
+            'ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ' +
+            'ns-refers ns-resolve ns-unalias ns-unmap nth nthnext num number? odd? ' +
+            'or parents partial partition pcalls peek persistent! pmap pop pop! ' +
+            'pop-thread-bindings pos? pr pr-str prefer-method prefers ' +
+            'primitives-classnames print print-ctor print-doc print-dup print-method ' +
+            'print-namespace-doc print-simple print-special-doc print-str printf ' +
+            'println println-str prn prn-str promise proxy proxy-call-with-super ' +
+            'proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot ' +
+            'rand rand-int range ratio? rational? rationalize re-find re-groups ' +
+            're-matcher re-matches re-pattern re-seq read read-line read-string ' +
+            'reduce ref ref-history-count ref-max-history ref-min-history ref-set ' +
+            'refer refer-clojure release-pending-sends rem remove remove-method ' +
+            'remove-ns remove-watch repeat repeatedly replace replicate require ' +
+            'reset! reset-meta! resolve rest resultset-seq reverse reversible? rseq ' +
+            'rsubseq second select-keys send send-off seq seq? seque sequence ' +
+            'sequential? set set-validator! set? short short-array shorts ' +
+            'shutdown-agents slurp some sort sort-by sorted-map sorted-map-by ' +
+            'sorted-set sorted-set-by sorted? special-form-anchor special-symbol? ' +
+            'split-at split-with str stream? string? struct struct-map subs subseq ' +
+            'subvec supers swap! symbol symbol? sync syntax-symbol-anchor take ' +
+            'take-last take-nth take-while test the-ns time to-array to-array-2d ' +
+            'trampoline transient tree-seq true? type unchecked-add unchecked-dec ' +
+            'unchecked-divide unchecked-inc unchecked-multiply unchecked-negate ' +
+            'unchecked-remainder unchecked-subtract underive unquote ' +
+            'unquote-splicing update-in update-proxy use val vals var-get var-set ' +
+            'var? vary-meta vec vector vector? when when-first when-let when-not ' +
+            'while with-bindings with-bindings* with-in-str with-loading-context ' +
+            'with-local-vars with-meta with-open with-out-str with-precision xml-seq ' +
+            'zero? zipmap ').split(" ")
+    );
+
+    var keywords = lang.arrayToMap(
+        ('def do fn if let loop monitor-enter monitor-exit new quote recur set! ' +
+            'throw try var').split(" ")
+    );
+
+    var buildinConstants = lang.arrayToMap(
+        ("true false nil").split(" ")
+    );
+
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : ";.*$"
+            }, {
+                    token : "comment", // multi line comment
+                    regex : "^\=begin$",
+                    next : "comment"
+            }, {
+                token : "keyword", //parens
+                regex : "[\\(|\\)]"
+            }, {
+                token : "keyword", //lists
+                regex : "[\\'\\(]"
+            }, {
+                token : "keyword", //vectors
+                regex : "[\\[|\\]]"
+            }, {
+                token : "keyword", //sets and maps
+                regex : "[\\{|\\}|\\#\\{|\\#\\}]"
+            }, {
+                    token : "keyword", // ampersands
+                    regex : '[\\&]'
+            }, {
+                    token : "keyword", // metadata
+                    regex : '[\\#\\^\\{]'
+            }, {
+                    token : "keyword", // anonymous fn syntactic sugar
+                    regex : '[\\%]'
+            }, {
+                    token : "keyword", // deref reader macro
+                    regex : '[@]'
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : "constant.language",
+                regex : '[!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+||=|!=|<=|>=|<>|<|>|!|&&]'
+            }, {
+                token : function(value) {
+                    if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                        else if (builtinFunctions.hasOwnProperty(value))
+                        return "support.function";
+                    else
+                        return "identifier";
+                },
+                // TODO: Unicode escape sequences
+                // TODO: Unicode identifiers
+                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // symbol
+                regex : "[:](?:[a-zA-Z]|\d)+"
+            }, {
+            token : "string.regexp", //Regular Expressions
+            regex : '/#"(?:\.|(\\\")|[^\""\n])*"/g'
+            }
+              
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : "^\=end$",
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ]
+    };
+};
+
+oop.inherits(ClojureHighlightRules, TextHighlightRules);
+
+exports.ClojureHighlightRules = ClojureHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_parens_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingParensOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\)/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\))/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingParensOutdent.prototype);
+
+exports.MatchingParensOutdent = MatchingParensOutdent;
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-coffee-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-coffee-uncompressed.js
new file mode 100755
index 00000000000..9a06cbfcfe9
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-coffee-uncompressed.js
@@ -0,0 +1,804 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Satoshi Murakami <murky.satyr AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/coffee', ['require', 'exports', 'module' , 'ace/tokenizer', 'ace/mode/coffee_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/folding/pythonic', 'ace/range', 'ace/mode/text', 'ace/worker/worker_client', 'ace/lib/oop'], function(require, exports, module) {
+"use strict";
+
+var Tokenizer = require("../tokenizer").Tokenizer;
+var Rules = require("./coffee_highlight_rules").CoffeeHighlightRules;
+var Outdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var PythonFoldMode = require("./folding/pythonic").FoldMode;
+var Range = require("../range").Range;
+var TextMode = require("./text").Mode;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var oop = require("../lib/oop");
+
+function Mode() {
+    this.$tokenizer = new Tokenizer(new Rules().getRules());
+    this.$outdent   = new Outdent();
+    this.foldingRules = new PythonFoldMode("=|=>|->|\\s*class [^#]*");
+}
+
+oop.inherits(Mode, TextMode);
+
+(function() {
+    
+    var indenter = /(?:[({[=:]|[-=]>|\b(?:else|switch|try|catch(?:\s*[$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*)?|finally))\s*$/;
+    var commentLine = /^(\s*)#/;
+    var hereComment = /^\s*###(?!#)/;
+    var indentation = /^\s*/;
+    
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
+    
+        if (!(tokens.length && tokens[tokens.length - 1].type === 'comment') &&
+            state === 'start' && indenter.test(line))
+            indent += tab;
+        return indent;
+    };
+    
+    this.toggleCommentLines = function(state, doc, startRow, endRow){
+        console.log("toggle");
+        var range = new Range(0, 0, 0, 0);
+        for (var i = startRow; i <= endRow; ++i) {
+            var line = doc.getLine(i);
+            if (hereComment.test(line))
+                continue;
+                
+            if (commentLine.test(line))
+                line = line.replace(commentLine, '$1');
+            else
+                line = line.replace(indentation, '$&#');
+    
+            range.end.row = range.start.row = i;
+            range.end.column = line.length + 1;
+            doc.replace(range, line);
+        }
+    };
+    
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+    
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+    
+    this.createWorker = function(session) {
+        var worker = new WorkerClient(["ace"], "worker-coffee.js", "ace/mode/coffee_worker", "Worker");
+        worker.attachToDocument(session.getDocument());
+        
+        worker.on("error", function(e) {
+            session.setAnnotations([e.data]);
+        });
+        
+        worker.on("ok", function(e) {
+            session.clearAnnotations();
+        });
+        
+        return worker;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Satoshi Murakami <murky.satyr AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/coffee_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/lang', 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+    var lang = require("../lib/lang");
+    var oop = require("../lib/oop");
+    var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+    
+    oop.inherits(CoffeeHighlightRules, TextHighlightRules);
+
+    function CoffeeHighlightRules() {
+        var identifier = "[$A-Za-z_\\x7f-\\uffff][$\\w\\x7f-\\uffff]*";
+        var stringfill = {
+            token : "string",
+            merge : true,
+            regex : ".+"
+        };
+
+        var keywords = lang.arrayToMap((
+            "this|throw|then|try|typeof|super|switch|return|break|by)|continue|" +
+            "catch|class|in|instanceof|is|isnt|if|else|extends|for|forown|" +
+            "finally|function|while|when|new|no|not|delete|debugger|do|loop|of|off|" +
+            "or|on|unless|until|and|yes").split("|")
+        );
+        
+        var langConstant = lang.arrayToMap((
+            "true|false|null|undefined").split("|")
+        );
+        
+        var illegal = lang.arrayToMap((
+            "case|const|default|function|var|void|with|enum|export|implements|" +
+            "interface|let|package|private|protected|public|static|yield|" +
+            "__hasProp|extends|slice|bind|indexOf").split("|")
+        );
+        
+        var supportClass = lang.arrayToMap((
+            "Array|Boolean|Date|Function|Number|Object|RegExp|ReferenceError|" +
+            "RangeError|String|SyntaxError|Error|EvalError|TypeError|URIError").split("|")
+        );
+        
+        var supportFunction = lang.arrayToMap((
+            "Math|JSON|isNaN|isFinite|parseInt|parseFloat|encodeURI|" +
+            "encodeURIComponent|decodeURI|decodeURIComponent|RangeError|String|" +
+            "SyntaxError|Error|EvalError|TypeError|URIError").split("|")
+        );
+
+        this.$rules = {
+            start : [
+                {
+                    token : "identifier",
+                    regex : "(?:(?:\\.|::)\\s*)" + identifier
+                }, {
+                    token : "variable",
+                    regex : "@(?:" + identifier + ")?"
+                }, {
+                    token: function(value) {
+                        if (keywords.hasOwnProperty(value))
+                            return "keyword";
+                        else if (langConstant.hasOwnProperty(value))
+                            return "constant.language";
+                        else if (illegal.hasOwnProperty(value))
+                            return "invalid.illegal";
+                        else if (supportClass.hasOwnProperty(value))
+                            return "language.support.class";
+                        else if (supportFunction.hasOwnProperty(value))
+                            return "language.support.function";
+                        else
+                            return "identifier";
+                    },
+                    regex : identifier
+                }, {
+                    token : "constant.numeric",
+                    regex : "(?:0x[\\da-fA-F]+|(?:\\d+(?:\\.\\d+)?|\\.\\d+)(?:[eE][+-]?\\d+)?)"
+                }, {
+                    token : "string",
+                    merge : true,
+                    regex : "'''",
+                    next : "qdoc"
+                }, {
+                    token : "string",
+                    merge : true,
+                    regex : '"""',
+                    next : "qqdoc"
+                }, {
+                    token : "string",
+                    merge : true,
+                    regex : "'",
+                    next : "qstring"
+                }, {
+                    token : "string",
+                    merge : true,
+                    regex : '"',
+                    next : "qqstring"
+                }, {
+                    token : "string",
+                    merge : true,
+                    regex : "`",
+                    next : "js"
+                }, {
+                    token : "string.regex",
+                    merge : true,
+                    regex : "///",
+                    next : "heregex"
+                }, {
+                    token : "string.regex",
+                    regex : "/(?!\\s)[^[/\\n\\\\]*(?: (?:\\\\.|\\[[^\\]\\n\\\\]*(?:\\\\.[^\\]\\n\\\\]*)*\\])[^[/\\n\\\\]*)*/[imgy]{0,4}(?!\\w)"
+                }, {
+                    token : "comment",
+                    merge : true,
+                    regex : "###(?!#)",
+                    next : "comment"
+                }, {
+                    token : "comment",
+                    regex : "#.*"
+                }, {
+                    token : "punctuation.operator",
+                    regex : "\\?|\\:|\\,|\\."
+                }, {
+                    token : "keyword.operator",
+                    regex : "(?:[\\-=]>|[-+*/%<>&|^!?=]=|>>>=?|\\-\\-|\\+\\+|::|&&=|\\|\\|=|<<=|>>=|\\?\\.|\\.{2,3}|\\!)"
+                }, {
+                    token : "paren.lparen",
+                    regex : "[({[]"
+                }, {
+                    token : "paren.rparen",
+                    regex : "[\\]})]"
+                }, {
+                    token : "text",
+                    regex : "\\s+"
+                }],
+            
+            qdoc : [{
+                token : "string",
+                regex : ".*?'''",
+                next : "start"
+            }, stringfill],
+            
+            qqdoc : [{
+                token : "string",
+                regex : '.*?"""',
+                next : "start"
+            }, stringfill],
+            
+            qstring : [{
+                token : "string",
+                regex : "[^\\\\']*(?:\\\\.[^\\\\']*)*'",
+                merge : true,
+                next : "start"
+            }, stringfill],
+            
+            qqstring : [{
+                token : "string",
+                regex : '[^\\\\"]*(?:\\\\.[^\\\\"]*)*"',
+                merge : true,
+                next : "start"
+            }, stringfill],
+            
+            js : [{
+                token : "string",
+                merge : true,
+                regex : "[^\\\\`]*(?:\\\\.[^\\\\`]*)*`",
+                next : "start"
+            }, stringfill],
+            
+            heregex : [{
+                token : "string.regex",
+                regex : '.*?///[imgy]{0,4}',
+                next : "start"
+            }, {
+                token : "comment.regex",
+                regex : "\\s+(?:#.*)?"
+            }, {
+                token : "string.regex",
+                merge : true,
+                regex : "\\S+"
+            }],
+            
+            comment : [{
+                token : "comment",
+                regex : '.*?###',
+                next : "start"
+            }, {
+                token : "comment",
+                merge : true,
+                regex : ".+"
+            }]
+        };
+    }
+
+    exports.CoffeeHighlightRules = CoffeeHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/pythonic', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function(markers) {
+    this.foldingStartMarker = new RegExp("(?:([\\[{])|(" + markers + "))(?:\\s*)(?:#.*)?$");
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, match.index);
+            if (match[2])
+                return this.indentationBlock(session, row, match.index + match[2].length);
+            return this.indentationBlock(session, row);
+        }
+    }
+
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/worker/worker_client', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var EventEmitter = require("../lib/event_emitter").EventEmitter;
+
+var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
+
+    this.changeListener = this.changeListener.bind(this);
+
+    if (module.packaged) {
+        var base = this.$guessBasePath();
+        this.$worker = new Worker(base + packagedJs);
+    }
+    else {
+        var workerUrl = this.$normalizePath(require.nameToUrl("ace/worker/worker", null, "_"));
+        this.$worker = new Worker(workerUrl);
+
+        var tlns = {};
+        for (var i=0; i<topLevelNamespaces.length; i++) {
+            var ns = topLevelNamespaces[i];
+            var path = this.$normalizePath(require.nameToUrl(ns, null, "_").replace(/.js$/, ""));
+
+            tlns[ns] = path;
+        }
+    }
+
+    this.$worker.postMessage({
+        init : true,
+        tlns: tlns,
+        module: mod,
+        classname: classname
+    });
+
+    this.callbackId = 1;
+    this.callbacks = {};
+
+    var _self = this;
+    this.$worker.onerror = function(e) {
+        window.console && console.log && console.log(e);
+        throw e;
+    };
+    this.$worker.onmessage = function(e) {
+        var msg = e.data;
+        switch(msg.type) {
+            case "log":
+                window.console && console.log && console.log(msg.data);
+                break;
+
+            case "event":
+                _self._emit(msg.name, {data: msg.data});
+                break;
+
+            case "call":
+                var callback = _self.callbacks[msg.id];
+                if (callback) {
+                    callback(msg.data);
+                    delete _self.callbacks[msg.id];
+                }
+                break;
+        }
+    };
+};
+
+(function(){
+
+    oop.implement(this, EventEmitter);
+
+    this.$normalizePath = function(path) {
+        path = path.replace(/^[a-z]+:\/\/[^\/]+\//, ""); // Remove domain name and rebuild it
+        path = location.protocol + "//" + location.host
+            // paths starting with a slash are relative to the root (host)
+            + (path.charAt(0) == "/" ? "" : location.pathname.replace(/\/[^\/]*$/, ""))
+            + "/" + path.replace(/^[\/]+/, "");
+        return path;
+    };
+
+    this.$guessBasePath = function() {
+        if (require.aceBaseUrl)
+            return require.aceBaseUrl;
+
+        var scripts = document.getElementsByTagName("script");
+        for (var i=0; i<scripts.length; i++) {
+            var script = scripts[i];
+
+            var base = script.getAttribute("data-ace-base");
+            if (base)
+                return base.replace(/\/*$/, "/");
+
+            var src = script.src || script.getAttribute("src");
+            if (!src) {
+                continue;
+            }
+            var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);
+            if (m)
+                return m[1] || m[2];
+        }
+        return "";
+    };
+
+    this.terminate = function() {
+        this._emit("terminate", {});
+        this.$worker.terminate();
+        this.$worker = null;
+        this.$doc.removeEventListener("change", this.changeListener);
+        this.$doc = null;
+    };
+
+    this.send = function(cmd, args) {
+        this.$worker.postMessage({command: cmd, args: args});
+    };
+
+    this.call = function(cmd, args, callback) {
+        if (callback) {
+            var id = this.callbackId++;
+            this.callbacks[id] = callback;
+            args.push(id);
+        }
+        this.send(cmd, args);
+    };
+
+    this.emit = function(event, data) {
+        try {
+            // firefox refuses to clone objects which have function properties
+            // TODO: cleanup event
+            this.$worker.postMessage({event: event, data: {data: data.data}});
+        }
+        catch(ex) {}
+    };
+
+    this.attachToDocument = function(doc) {
+        if(this.$doc)
+            this.terminate();
+
+        this.$doc = doc;
+        this.call("setValue", [doc.getValue()]);
+        doc.on("change", this.changeListener);
+    };
+
+    this.changeListener = function(e) {
+        e.range = {
+            start: e.data.range.start,
+            end: e.data.range.end
+        };
+        this.emit("change", e);
+    };
+
+}).call(WorkerClient.prototype);
+
+exports.WorkerClient = WorkerClient;
+
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-coldfusion-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-coldfusion-uncompressed.js
new file mode 100755
index 00000000000..c9092a5e0c2
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-coldfusion-uncompressed.js
@@ -0,0 +1,2543 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/coldfusion', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml', 'ace/mode/javascript', 'ace/mode/css', 'ace/tokenizer', 'ace/mode/coldfusion_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var XmlMode = require("./xml").Mode;
+var JavaScriptMode = require("./javascript").Mode;
+var CssMode = require("./css").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var ColdfusionHighlightRules = require("./coldfusion_highlight_rules").ColdfusionHighlightRules;
+
+var Mode = function() {
+    XmlMode.call(this);
+    
+    var highlighter = new ColdfusionHighlightRules();
+    this.$tokenizer = new Tokenizer(highlighter.getRules());
+    
+    this.$embeds = highlighter.getEmbeds();
+    this.createModeDelegates({
+      "js-": JavaScriptMode,
+      "css-": CssMode
+    });
+};
+oop.inherits(Mode, XmlMode);
+
+(function() {
+
+    this.getNextLineIndent = function(state, line, tab) {
+        return this.$getIndent(line);
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xml_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/xml'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
+var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
+var XmlFoldMode = require("./folding/xml").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new XmlHighlightRules().getRules());
+    this.$behaviour = new XmlBehaviour();
+    this.foldingRules = new XmlFoldMode();
+};
+
+oop.inherits(Mode, TextMode);
+
+(function() {
+    
+    this.getNextLineIndent = function(state, line, tab) {
+        return this.$getIndent(line);
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/xml_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var xmlUtil = require("./xml_util");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var XmlHighlightRules = function() {
+
+    // regexp must not have capturing parentheses
+    // regexps are ordered -> the first match is used
+    this.$rules = {
+        start : [{
+            token : "text",
+            regex : "<\\!\\[CDATA\\[",
+            next : "cdata"
+        }, {
+            token : "xml_pe",
+            regex : "<\\?.*?\\?>"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : "<\\!--",
+            next : "comment"
+        }, {
+            token : "meta.tag", // opening tag
+            regex : "<\\/?",
+            next : "tag"
+        }, {
+            token : "text",
+            regex : "\\s+"
+        }, {
+            token : "text",
+            regex : "[^<]+"
+        }],
+        
+        cdata : [{
+            token : "text",
+            regex : "\\]\\]>",
+            next : "start"
+        }, {
+            token : "text",
+            regex : "\\s+"
+        }, {
+            token : "text",
+            regex : "(?:[^\\]]|\\](?!\\]>))+"
+        }],
+
+        comment : [{
+            token : "comment",
+            regex : ".*?-->",
+            next : "start"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : ".+"
+        }]
+    };
+    
+    xmlUtil.tag(this.$rules, "tag", "start");
+};
+
+oop.inherits(XmlHighlightRules, TextHighlightRules);
+
+exports.XmlHighlightRules = XmlHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
+"use strict";
+
+var lang = require("../lib/lang");
+
+var formTags = lang.arrayToMap(
+    ("button|form|input|label|select|textarea").split("|")
+);
+
+var tableTags = lang.arrayToMap(
+    ("table|tbody|td|tfoot|th|tr").split("|")
+);
+
+function string(state) {
+    return [{
+        token : "string",
+        regex : '".*?"'
+    }, {
+        token : "string", // multi line string start
+        merge : true,
+        regex : '["].*',
+        next : state + "-qqstring"
+    }, {
+        token : "string",
+        regex : "'.*?'"
+    }, {
+        token : "string", // multi line string start
+        merge : true,
+        regex : "['].*",
+        next : state + "-qstring"
+    }];
+}
+
+function multiLineString(quote, state) {
+    return [{
+        token : "string",
+        merge : true,
+        regex : ".*?" + quote,
+        next : state
+    }, {
+        token : "string",
+        merge : true,
+        regex : '.+'
+    }];
+}
+
+exports.tag = function(states, name, nextState) {
+    states[name] = [{
+        token : "text",
+        regex : "\\s+"
+    }, {
+        //token : "meta.tag",
+        
+    token : function(value) {
+            if ( value==='a' ) {
+                return "meta.tag.anchor";
+            }
+            else if ( value==='img' ) {
+                return "meta.tag.image";
+            }
+            else if ( value==='script' ) {
+                return "meta.tag.script";
+            }
+            else if ( value==='style' ) {
+                return "meta.tag.style";
+            }
+            else if (formTags.hasOwnProperty(value.toLowerCase())) {
+                return "meta.tag.form";
+            }
+            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
+                return "meta.tag.table";
+            }
+            else {
+                return "meta.tag";
+            }
+        },        
+        merge : true,
+        regex : "[-_a-zA-Z0-9:!]+",
+        next : name + "embed-attribute-list" 
+    }, {
+        token: "empty",
+        regex: "",
+        next : name + "embed-attribute-list"
+    }];
+
+    states[name + "-qstring"] = multiLineString("'", name + "embed-attribute-list");
+    states[name + "-qqstring"] = multiLineString("\"", name + "embed-attribute-list");
+    
+    states[name + "embed-attribute-list"] = [{
+        token : "meta.tag",
+        merge : true,
+        regex : "\/?>",
+        next : nextState
+    }, {
+        token : "keyword.operator",
+        regex : "="
+    }, {
+        token : "entity.other.attribute-name",
+        regex : "[-_a-zA-Z0-9:]+"
+    }, {
+        token : "constant.numeric", // float
+        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+    }, {
+        token : "text",
+        regex : "\\s+"
+    }].concat(string(name));
+};
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require("../behaviour").Behaviour;
+var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
+
+var XmlBehaviour = function () {
+    
+    this.inherit(CstyleBehaviour, ["string_dquotes"]); // Get string behaviour
+    
+    this.add("brackets", "insertion", function (state, action, editor, session, text) {
+        if (text == '<') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return false;
+            } else {
+                return {
+                    text: '<>',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '>') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '>') { // need some kind of matching check here
+                return {
+                    text: '',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChars = line.substring(cursor.column, cursor.column + 2);
+            if (rightChars == '</') {
+                var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
+                var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+    
+}
+oop.inherits(XmlBehaviour, Behaviour);
+
+exports.XmlBehaviour = XmlBehaviour;
+});/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require('../behaviour').Behaviour;
+
+var CstyleBehaviour = function () {
+
+    this.add("braces", "insertion", function (state, action, editor, session, text) {
+        if (text == '{') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '}') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return null;
+
+                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
+                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+
+    this.add("braces", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '{') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.end.column, range.end.column + 1);
+            if (rightChar == '}') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("parens", "insertion", function (state, action, editor, session, text) {
+        if (text == '(') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '()',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == ')') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == ')') {
+                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("parens", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '(') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == ')') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '"' + selected + '"',
+                    selection: false
+                }
+            } else {
+                var cursor = editor.getCursorPosition();
+                var line = session.doc.getLine(cursor.row);
+                var leftChar = line.substring(cursor.column-1, cursor.column);
+
+                // We're escaped.
+                if (leftChar == '\\') {
+                    return null;
+                }
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf('"');
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
+                    return {
+                        text: '""',
+                        selection: [1,1]
+                    }
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == '"') {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '"') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == '"') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+}
+oop.inherits(CstyleBehaviour, Behaviour);
+
+exports.CstyleBehaviour = CstyleBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/range', 'ace/mode/folding/fold_mode', 'ace/token_iterator'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var lang = require("../../lib/lang");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+var TokenIterator = require("../../token_iterator").TokenIterator;
+
+var FoldMode = exports.FoldMode = function(voidElements) {
+    BaseFoldMode.call(this);
+    this.voidElements = voidElements || {};
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var tag = this._getFirstTagInLine(session, row);
+
+        if (tag.closing)
+            return foldStyle == "markbeginend" ? "end" : "";
+
+        if (!tag.tagName || this.voidElements[tag.tagName.toLowerCase()])
+            return "";
+
+        if (tag.selfClosing)
+            return "";
+
+        if (tag.value.indexOf("/" + tag.tagName) !== -1)
+            return "";
+
+        return "start";
+    };
+    
+    this._getFirstTagInLine = function(session, row) {
+        var tokens = session.getTokens(row, row)[0].tokens;
+        var value = "";
+        for (var i = 0; i < tokens.length; i++) {
+            var token = tokens[i];
+            if (token.type.indexOf("meta.tag") === 0)
+                value += token.value;
+            else
+                value += lang.stringRepeat(" ", token.value.length);
+        }
+        
+        return this._parseTag(value);
+    };
+
+    this.tagRe = /^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/;
+    this._parseTag = function(tag) {
+        
+        var match = this.tagRe.exec(tag);
+        var column = this.tagRe.lastIndex || 0;
+        this.tagRe.lastIndex = 0;
+
+        return {
+            value: tag,
+            match: match ? match[2] : "",
+            closing: match ? !!match[3] : false,
+            selfClosing: match ? !!match[5] || match[2] == "/>" : false,
+            tagName: match ? match[4] : "",
+            column: match[1] ? column + match[1].length : column
+        };
+    };
+    
+    /**
+     * reads a full tag and places the iterator after the tag
+     */
+    this._readTagForward = function(iterator) {
+        var token = iterator.getCurrentToken();
+        if (!token)
+            return null;
+            
+        var value = "";
+        var start;
+        
+        do {
+            if (token.type.indexOf("meta.tag") === 0) {
+                if (!start) {
+                    var start = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn()
+                    };
+                }
+                value += token.value;
+                if (value.indexOf(">") !== -1) {
+                    var tag = this._parseTag(value);
+                    tag.start = start;
+                    tag.end = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn() + token.value.length
+                    };
+                    iterator.stepForward();
+                    return tag;
+                }
+            }
+        } while(token = iterator.stepForward());
+        
+        return null;
+    };
+    
+    this._readTagBackward = function(iterator) {
+        var token = iterator.getCurrentToken();
+        if (!token)
+            return null;
+            
+        var value = "";
+        var end;
+
+        do {
+            if (token.type.indexOf("meta.tag") === 0) {
+                if (!end) {
+                    end = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn() + token.value.length
+                    };
+                }
+                value = token.value + value;
+                if (value.indexOf("<") !== -1) {
+                    var tag = this._parseTag(value);
+                    tag.end = end;
+                    tag.start = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn()
+                    };
+                    iterator.stepBackward();
+                    return tag;
+                }
+            }
+        } while(token = iterator.stepBackward());
+        
+        return null;
+    };
+    
+    this._pop = function(stack, tag) {
+        while (stack.length) {
+            
+            var top = stack[stack.length-1];
+            if (!tag || top.tagName == tag.tagName) {
+                return stack.pop();
+            }
+            else if (this.voidElements[tag.tagName]) {
+                return;
+            }
+            else if (this.voidElements[top.tagName]) {
+                stack.pop();
+                continue;
+            } else {
+                return null;
+            }
+        }
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var firstTag = this._getFirstTagInLine(session, row);
+        
+        if (!firstTag.match)
+            return null;
+        
+        var isBackward = firstTag.closing || firstTag.selfClosing;
+        var stack = [];
+        var tag;
+        
+        if (!isBackward) {
+            var iterator = new TokenIterator(session, row, firstTag.column);
+            var start = {
+                row: row,
+                column: firstTag.column + firstTag.tagName.length + 2
+            };
+            while (tag = this._readTagForward(iterator)) {
+                if (tag.selfClosing) {
+                    if (!stack.length) {
+                        tag.start.column += tag.tagName.length + 2;
+                        tag.end.column -= 2;
+                        return Range.fromPoints(tag.start, tag.end);
+                    } else
+                        continue;
+                }
+                
+                if (tag.closing) {
+                    this._pop(stack, tag);
+                    if (stack.length == 0)
+                        return Range.fromPoints(start, tag.start);
+                }
+                else {
+                    stack.push(tag)
+                }
+            }
+        }
+        else {
+            var iterator = new TokenIterator(session, row, firstTag.column + firstTag.match.length);
+            var end = {
+                row: row,
+                column: firstTag.column
+            };
+            
+            while (tag = this._readTagBackward(iterator)) {
+                if (tag.selfClosing) {
+                    if (!stack.length) {
+                        tag.start.column += tag.tagName.length + 2;
+                        tag.end.column -= 2;
+                        return Range.fromPoints(tag.start, tag.end);
+                    } else
+                        continue;
+                }
+                
+                if (!tag.closing) {
+                    this._pop(stack, tag);
+                    if (stack.length == 0) {
+                        tag.start.column += tag.tagName.length + 2;
+                        return Range.fromPoints(tag.start, end);
+                    }
+                }
+                else {
+                    stack.push(tag)
+                }
+            }
+        }
+        
+    };
+
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var Range = require("../range").Range;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var re = /^(\s*)\/\//;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i);
+                var m = line.match(re);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, "//");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+        var endState = tokenizedLine.state;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+        
+        if (state == "start" || state == "regex_allowed") {
+            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        } else if (state == "doc-start") {
+            if (endState == "start" || state == "regex_allowed") {
+                return "";
+            }
+            var match = line.match(/^\s*(\/?)\*/);
+            if (match) {
+                if (match[1]) {
+                    indent += " ";
+                }
+                indent += "* ";
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+    
+    this.createWorker = function(session) {
+        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
+        worker.attachToDocument(session.getDocument());
+            
+        worker.on("jslint", function(results) {
+            var errors = [];
+            for (var i=0; i<results.data.length; i++) {
+                var error = results.data[i];
+                if (error)
+                    errors.push({
+                        row: error.line-1,
+                        column: error.character-1,
+                        text: error.reason,
+                        type: "warning",
+                        lint: error
+                    });
+            }
+            session.setAnnotations(errors);
+        });
+        
+        worker.on("narcissus", function(e) {
+            session.setAnnotations([e.data]);
+        });
+        
+        worker.on("terminate", function() {
+            session.clearAnnotations();
+        });
+        
+        return worker;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var unicode = require("../unicode");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var JavaScriptHighlightRules = function() {
+
+    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
+    var globals = lang.arrayToMap(
+      // Constructors
+        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
+      // E4X
+         "Namespace|QName|XML|XMLList|" +
+         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
+         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
+      // Errors
+        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
+        "SyntaxError|TypeError|URIError|" +
+      //  Non-constructor functions
+        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
+        "isNaN|parseFloat|parseInt|" +
+      // Other
+        "JSON|Math|" +
+      // Pseudo
+        "this|arguments|prototype|window|document"
+      ).split("|")
+    );
+
+    var keywords = lang.arrayToMap(
+        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
+        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
+        "const|yield|import|get|set").split("|")
+    );
+
+    // keywords which can be followed by regular expressions
+    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
+
+    var deprecated = lang.arrayToMap(
+        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
+    );
+
+    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
+
+    var buildinConstants = lang.arrayToMap(
+        ("null|Infinity|NaN|undefined").split("|")
+    );
+
+    var futureReserved = lang.arrayToMap(
+        ("class|enum|extends|super|export|implements|private|" +
+        "public|interface|package|protected|static").split("|")
+    );
+
+    // TODO: Unicode escape sequences
+    var identifierRe = "[" + unicode.packages.L + "\\$_][" 
+        + unicode.packages.L
+        + unicode.packages.Mn + unicode.packages.Mc
+        + unicode.packages.Nd
+        + unicode.packages.Pc + "\\$_]*\\b";
+        
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            new DocCommentHighlightRules().getStartRule("doc-start"),
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : '["].*\\\\$',
+                next : "qqstring"
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : "['].*\\\\$",
+                next : "qstring"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : ["keyword.definition", "text", "entity.name.function"],
+                regex : "(function)(\\s+)(" + identifierRe + ")"
+            }, {
+                token : "constant.language.boolean",
+                regex : "(?:true|false)\\b"
+            }, {
+                token : "keyword",
+                regex : "(?:" + kwBeforeRe + ")\\b",
+                next : "regex_allowed"
+            }, {
+                token : function(value) {
+                    if (globals.hasOwnProperty(value))
+                        return "variable.language";
+                    else if (deprecated.hasOwnProperty(value))
+                        return "invalid.deprecated";
+                    else if (definitions.hasOwnProperty(value))
+                        return "keyword.definition";
+                    else if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else if (futureReserved.hasOwnProperty(value))
+                        return "invalid.illegal";
+                    else if (value == "debugger")
+                        return "invalid.deprecated";
+                    else
+                        return "identifier";
+                },
+                regex : identifierRe
+            }, {
+                token : "keyword.operator",
+                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",
+                next  : "regex_allowed"
+            }, {
+                token : "punctuation.operator",
+                regex : "\\?|\\:|\\,|\\;|\\.",
+                next  : "regex_allowed"
+            }, {
+                token : "paren.lparen",
+                regex : "[[({]",
+                next  : "regex_allowed"
+            }, {
+                token : "paren.rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "keyword.operator",
+                regex : "\\/=?",
+                next  : "regex_allowed"
+            }, {
+                token: "comment",
+                regex: "^#!.*$" 
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        // regular expressions are only allowed after certain tokens. This
+        // makes sure we don't mix up regexps with the divison operator
+        "regex_allowed": [
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment_regex_allowed"
+            }, {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            }, {
+                token: "string.regexp",
+                regex: "\\/",
+                next: "regex",
+                merge: true
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }, {
+                // immediately return to the start mode without matching
+                // anything
+                token: "empty", 
+                regex: "",
+                next: "start"
+            }
+        ],
+        "regex": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
+                next: "regex"
+            }, {
+				// flag
+                token: "string.regexp", 
+                regex: "/\\w*",
+                next: "start",
+                merge: true 
+            }, {
+                token: "string.regexp",
+                regex: "[^\\\\/\\[]+",
+                next: "regex",
+                merge: true
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "\\[",
+                next: "regex_character_class",
+                merge: true
+            }, {
+                token: "empty", 
+                regex: "",
+                next: "start" 
+            }
+        ],
+        "regex_character_class": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
+                next: "regex_character_class"
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "]",
+                next: "regex",
+                merge: true
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "[^\\\\\\]]+",
+                next: "regex_character_class",
+                merge: true
+            }, {
+                token: "empty", 
+                regex: "",
+                next: "start" 
+            }
+        ],
+        "comment_regex_allowed" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                merge : true,
+                next : "regex_allowed"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                merge : true,
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "qqstring" : [
+            {
+                token : "string",
+                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ],
+        "qstring" : [
+            {
+                token : "string",
+                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ]
+    };
+    
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ new DocCommentHighlightRules().getEndRule("start") ]);
+};
+
+oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
+
+exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var DocCommentHighlightRules = function() {
+
+    this.$rules = {
+        "start" : [ {
+            token : "comment.doc.tag",
+            regex : "@[\\w\\d_]+" // TODO: fix email addresses
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "\\s+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "TODO"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "[^@\\*]+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "."
+        }]
+    };
+};
+
+oop.inherits(DocCommentHighlightRules, TextHighlightRules);
+
+(function() {
+
+    this.getStartRule = function(start) {
+        return {
+            token : "comment.doc", // doc comment
+            merge : true,
+            regex : "\\/\\*(?=\\*)",
+            next  : start
+        };
+    };
+    
+    this.getEndRule = function (start) {
+        return {
+            token : "comment.doc", // closing comment
+            merge : true,
+            regex : "\\*\\/",
+            next  : start
+        };
+    };
+
+}).call(DocCommentHighlightRules.prototype);
+
+exports.DocCommentHighlightRules = DocCommentHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/worker/worker_client', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var EventEmitter = require("../lib/event_emitter").EventEmitter;
+
+var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
+
+    this.changeListener = this.changeListener.bind(this);
+
+    if (module.packaged) {
+        var base = this.$guessBasePath();
+        this.$worker = new Worker(base + packagedJs);
+    }
+    else {
+        var workerUrl = this.$normalizePath(require.nameToUrl("ace/worker/worker", null, "_"));
+        this.$worker = new Worker(workerUrl);
+
+        var tlns = {};
+        for (var i=0; i<topLevelNamespaces.length; i++) {
+            var ns = topLevelNamespaces[i];
+            var path = this.$normalizePath(require.nameToUrl(ns, null, "_").replace(/.js$/, ""));
+
+            tlns[ns] = path;
+        }
+    }
+
+    this.$worker.postMessage({
+        init : true,
+        tlns: tlns,
+        module: mod,
+        classname: classname
+    });
+
+    this.callbackId = 1;
+    this.callbacks = {};
+
+    var _self = this;
+    this.$worker.onerror = function(e) {
+        window.console && console.log && console.log(e);
+        throw e;
+    };
+    this.$worker.onmessage = function(e) {
+        var msg = e.data;
+        switch(msg.type) {
+            case "log":
+                window.console && console.log && console.log(msg.data);
+                break;
+
+            case "event":
+                _self._emit(msg.name, {data: msg.data});
+                break;
+
+            case "call":
+                var callback = _self.callbacks[msg.id];
+                if (callback) {
+                    callback(msg.data);
+                    delete _self.callbacks[msg.id];
+                }
+                break;
+        }
+    };
+};
+
+(function(){
+
+    oop.implement(this, EventEmitter);
+
+    this.$normalizePath = function(path) {
+        path = path.replace(/^[a-z]+:\/\/[^\/]+\//, ""); // Remove domain name and rebuild it
+        path = location.protocol + "//" + location.host
+            // paths starting with a slash are relative to the root (host)
+            + (path.charAt(0) == "/" ? "" : location.pathname.replace(/\/[^\/]*$/, ""))
+            + "/" + path.replace(/^[\/]+/, "");
+        return path;
+    };
+
+    this.$guessBasePath = function() {
+        if (require.aceBaseUrl)
+            return require.aceBaseUrl;
+
+        var scripts = document.getElementsByTagName("script");
+        for (var i=0; i<scripts.length; i++) {
+            var script = scripts[i];
+
+            var base = script.getAttribute("data-ace-base");
+            if (base)
+                return base.replace(/\/*$/, "/");
+
+            var src = script.src || script.getAttribute("src");
+            if (!src) {
+                continue;
+            }
+            var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);
+            if (m)
+                return m[1] || m[2];
+        }
+        return "";
+    };
+
+    this.terminate = function() {
+        this._emit("terminate", {});
+        this.$worker.terminate();
+        this.$worker = null;
+        this.$doc.removeEventListener("change", this.changeListener);
+        this.$doc = null;
+    };
+
+    this.send = function(cmd, args) {
+        this.$worker.postMessage({command: cmd, args: args});
+    };
+
+    this.call = function(cmd, args, callback) {
+        if (callback) {
+            var id = this.callbackId++;
+            this.callbacks[id] = callback;
+            args.push(id);
+        }
+        this.send(cmd, args);
+    };
+
+    this.emit = function(event, data) {
+        try {
+            // firefox refuses to clone objects which have function properties
+            // TODO: cleanup event
+            this.$worker.postMessage({event: event, data: {data: data.data}});
+        }
+        catch(ex) {}
+    };
+
+    this.attachToDocument = function(doc) {
+        if(this.$doc)
+            this.terminate();
+
+        this.$doc = doc;
+        this.call("setValue", [doc.getValue()]);
+        doc.on("change", this.changeListener);
+    };
+
+    this.changeListener = function(e) {
+        e.range = {
+            start: e.data.range.start,
+            end: e.data.range.end
+        };
+        this.emit("change", e);
+    };
+
+}).call(WorkerClient.prototype);
+
+exports.WorkerClient = WorkerClient;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/css', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/css_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/worker/worker_client', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules(), "i");
+    this.$outdent = new MatchingBraceOutdent();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.foldingRules = "cStyle";
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        // ignore braces in comments
+        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+
+        var match = line.match(/^.*\{\s*$/);
+        if (match) {
+            indent += tab;
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+    
+    this.createWorker = function(session) {
+        var worker = new WorkerClient(["ace"], "worker-css.js", "ace/mode/css_worker", "Worker");
+        worker.attachToDocument(session.getDocument());
+        
+        worker.on("csslint", function(e) {
+            var errors = [];
+            e.data.forEach(function(message) {
+                errors.push({
+                    row: message.line - 1,
+                    column: message.col - 1,
+                    text: message.message,
+                    type: message.type,
+                    lint: message
+                });
+            });
+            
+            session.setAnnotations(errors);
+        });
+        return worker;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/css_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var CssHighlightRules = function() {
+
+    var properties = lang.arrayToMap(
+        ("-moz-appearance|-moz-box-sizing|-webkit-box-sizing|-moz-outline-radius|-moz-transform|-webkit-transform|" +
+        "appearance|azimuth|background-attachment|background-color|background-image|" +
+        "background-origin|background-position|background-repeat|background|border-bottom-color|" +
+        "border-bottom-style|border-bottom-width|border-bottom|border-collapse|" +
+        "border-color|border-left-color|border-left-style|border-left-width|" +
+        "border-left|border-right-color|border-right-style|border-right-width|" +
+        "border-right|border-spacing|border-style|border-top-color|" +
+        "border-top-style|border-top-width|border-top|border-width|border|" +
+        "bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|" +
+        "counter-reset|cue-after|cue-before|cue|cursor|direction|display|" +
+        "elevation|empty-cells|float|font-family|font-size-adjust|font-size|" +
+        "font-stretch|font-style|font-variant|font-weight|font|height|left|" +
+        "letter-spacing|line-height|list-style-image|list-style-position|" +
+        "list-style-type|list-style|margin-bottom|margin-left|margin-right|" +
+        "margin-top|marker-offset|margin|marks|max-height|max-width|min-height|" +
+        "min-width|-moz-border-radius|opacity|orphans|outline-color|outline-offset|outline-radius|" +
+        "outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|" +
+        "padding-left|padding-right|padding-top|padding|page-break-after|" +
+        "page-break-before|page-break-inside|page|pause-after|pause-before|" +
+        "pause|pitch-range|pitch|play-during|pointer-events|position|quotes|resize|richness|right|" +
+        "size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|" +
+        "stress|table-layout|text-align|text-decoration|text-indent|" +
+        "text-shadow|text-transform|top|transform|unicode-bidi|vertical-align|" +
+        "visibility|voice-family|volume|white-space|widows|width|word-spacing|" +
+        "z-index").split("|")
+    );
+
+    var functions = lang.arrayToMap(
+        ("rgb|rgba|url|attr|counter|counters").split("|")
+    );
+
+    var constants = lang.arrayToMap(
+        ("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|" +
+        "block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|" +
+        "char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|" +
+        "decimal-leading-zero|decimal|default|disabled|disc|" +
+        "distribute-all-lines|distribute-letter|distribute-space|" +
+        "distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|" +
+        "hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|" +
+        "ideograph-alpha|ideograph-numeric|ideograph-parenthesis|" +
+        "ideograph-space|inactive|inherit|inline-block|inline|inset|inside|" +
+        "inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|" +
+        "keep-all|left|lighter|line-edge|line-through|line|list-item|loose|" +
+        "lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|" +
+        "medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|" +
+        "nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|" +
+        "overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|" +
+        "ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|" +
+        "solid|square|static|strict|super|sw-resize|table-footer-group|" +
+        "table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|" +
+        "transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|" +
+        "vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|" +
+        "zero").split("|")
+    );
+
+    var colors = lang.arrayToMap(
+        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
+        "purple|red|silver|teal|white|yellow").split("|")
+    );
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
+
+    var base_ruleset = [
+        {
+            token : "comment", // multi line comment
+            merge : true,
+            regex : "\\/\\*",
+            next : "ruleset_comment"
+        },{
+            token : "string", // single line
+            regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+        }, {
+            token : "string", // single line
+            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+        }, {
+            token : "constant.numeric",
+            regex : numRe + "(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"
+        }, {
+            token : "constant.numeric",  // hex6 color
+            regex : "#[a-f0-9]{6}"
+        }, {
+            token : "constant.numeric", // hex3 color
+            regex : "#[a-f0-9]{3}"
+        }, {
+            token : function(value) {
+                if (properties.hasOwnProperty(value.toLowerCase())) {
+                    return "support.type";
+                }
+                else if (functions.hasOwnProperty(value.toLowerCase())) {
+                    return "support.function";
+                }
+                else if (constants.hasOwnProperty(value.toLowerCase())) {
+                    return "support.constant";
+                }
+                else if (colors.hasOwnProperty(value.toLowerCase())) {
+                    return "support.constant.color";
+                }
+                else {
+                    return "text";
+                }
+            },
+            regex : "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
+        }
+      ];
+
+    var ruleset = lang.copyArray(base_ruleset);
+    ruleset.unshift({
+        token : "paren.rparen",
+        regex : "\\}",
+        next:   "start"
+    });
+
+    var media_ruleset = lang.copyArray( base_ruleset );
+    media_ruleset.unshift({
+        token : "paren.rparen",
+        regex : "\\}",
+        next:   "media"
+    });
+
+    var base_comment = [{
+          token : "comment", // comment spanning whole line
+          merge : true,
+          regex : ".+"
+    }];
+
+    var comment = lang.copyArray(base_comment);
+    comment.unshift({
+          token : "comment", // closing comment
+          regex : ".*?\\*\\/",
+          next : "start"
+    });
+
+    var media_comment = lang.copyArray(base_comment);
+    media_comment.unshift({
+          token : "comment", // closing comment
+          regex : ".*?\\*\\/",
+          next : "media"
+    });
+
+    var ruleset_comment = lang.copyArray(base_comment);
+    ruleset_comment.unshift({
+          token : "comment", // closing comment
+          regex : ".*?\\*\\/",
+          next : "ruleset"
+    });
+
+    this.$rules = {
+        "start" : [{
+            token : "comment", // multi line comment
+            merge : true,
+            regex : "\\/\\*",
+            next : "comment"
+        }, {
+            token: "paren.lparen",
+            regex: "\\{",
+            next:  "ruleset"
+        }, {
+            token: "string",
+            regex: "@.*?{",
+            next:  "media"
+        },{
+            token: "keyword",
+            regex: "#[a-z0-9-_]+"
+        },{
+            token: "variable",
+            regex: "\\.[a-z0-9-_]+"
+        },{
+            token: "string",
+            regex: ":[a-z0-9-_]+"
+        },{
+            token: "constant",
+            regex: "[a-z0-9-_]+"
+        }],
+
+        "media" : [ {
+            token : "comment", // multi line comment
+            merge : true,
+            regex : "\\/\\*",
+            next : "media_comment"
+        }, {
+            token: "paren.lparen",
+            regex: "\\{",
+            next:  "media_ruleset"
+        },{
+            token: "string",
+            regex: "\\}",
+            next:  "start"
+        },{
+            token: "keyword",
+            regex: "#[a-z0-9-_]+"
+        },{
+            token: "variable",
+            regex: "\\.[a-z0-9-_]+"
+        },{
+            token: "string",
+            regex: ":[a-z0-9-_]+"
+        },{
+            token: "constant",
+            regex: "[a-z0-9-_]+"
+        }],
+
+        "comment" : comment,
+
+        "ruleset" : ruleset,
+        "ruleset_comment" : ruleset_comment,
+
+        "media_ruleset" : media_ruleset,
+        "media_comment" : media_comment
+    };
+};
+
+oop.inherits(CssHighlightRules, TextHighlightRules);
+
+exports.CssHighlightRules = CssHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/coldfusion_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/css_highlight_rules', 'ace/mode/javascript_highlight_rules', 'ace/mode/text_highlight_rules', 'ace/mode/xml_util'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
+var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+var xml_util = require("./xml_util");
+
+var ColdfusionHighlightRules = function() {
+
+    // regexp must not have capturing parentheses
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        start : [ {
+            token : "text",
+            merge : true,
+            regex : "<\\!\\[CDATA\\[",
+            next : "cdata"
+        }, {
+            token : "xml_pe",
+            regex : "<\\?.*?\\?>"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : "<\\!--",
+            next : "comment"
+        }, {
+            token : "meta.tag",
+            regex : "<(?=\s*script)",
+            next : "script"
+        }, {
+            token : "meta.tag",
+            regex : "<(?=\s*style)",
+            next : "css"
+        }, {
+            token : "meta.tag", // opening tag
+            regex : "<\\/?",
+            next : "tag"
+        }, {
+            token : "text",
+            regex : "\\s+"
+        }, {
+            token : "text",
+            regex : "[^<]+"
+        } ],
+    
+        cdata : [ {
+            token : "text",
+            regex : "\\]\\]>",
+            next : "start"
+        }, {
+            token : "text",
+            merge : true,
+            regex : "\\s+"
+        }, {
+            token : "text",
+            merge : true,
+            regex : ".+"
+        } ],
+
+        comment : [ {
+            token : "comment",
+            regex : ".*?-->",
+            next : "start"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : ".+"
+        } ]
+    };
+    
+    xml_util.tag(this.$rules, "tag", "start");
+    xml_util.tag(this.$rules, "css", "css-start");
+    xml_util.tag(this.$rules, "script", "js-start");
+    
+    this.embedRules(JavaScriptHighlightRules, "js-", [{
+        token: "comment",
+        regex: "\\/\\/.*(?=<\\/script>)",
+        next: "tag"
+    }, {
+        token: "meta.tag",
+        regex: "<\\/(?=script)",
+        next: "tag"
+    }]);
+    
+    this.embedRules(CssHighlightRules, "css-", [{
+        token: "meta.tag",
+        regex: "<\\/(?=style)",
+        next: "tag"
+    }]);
+};
+
+oop.inherits(ColdfusionHighlightRules, TextHighlightRules);
+
+exports.ColdfusionHighlightRules = ColdfusionHighlightRules;
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-csharp-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-csharp-uncompressed.js
new file mode 100755
index 00000000000..492e2ff9847
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-csharp-uncompressed.js
@@ -0,0 +1,778 @@
+define('ace/mode/csharp', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/csharp_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var CSharpHighlightRules = require("./csharp_highlight_rules").CSharpHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new CSharpHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+    
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+  
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+  
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+    
+        if (state == "start") {
+            var match = line.match(/^.*[\{\(\[]\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        }
+  
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+  
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+
+
+    this.createWorker = function(session) {
+        return null;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+define('ace/mode/csharp_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var CSharpHighlightRules = function() {
+    
+    var keywords = lang.arrayToMap(
+    ("abstract|event|new|struct|as|explicit|null|switch|base|extern|object|this|bool|false|operator|throw|break|finally|out|true|byte|fixed|override|try|case|float|params|typeof|catch|for|private|uint|char|foreach|protected|ulong|checked|goto|public|unchecked|class|if|readonly|unsafe|const|implicit|ref|ushort|continue|in|return|using|decimal|int|sbyte|virtual|default|interface|sealed|volatile|delegate|internal|short|void|do|is|sizeof|while|double|lock|stackalloc|else|long|static|enum|namespace|string|var|dynamic").split("|")
+    );
+
+    var buildinConstants = lang.arrayToMap(
+        ("null|true|false").split("|")
+    );
+
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            new DocCommentHighlightRules().getStartRule("doc-start"),
+            {
+                token : "comment", // multi line comment
+                regex : "\\/\\*",
+                merge : true,
+                next : "comment"
+            }, {
+                token : "string.regexp",
+                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : "constant.language.boolean",
+                regex : "(?:true|false)\\b"
+            }, {
+                token : function(value) {
+                    if (value == "this")
+                        return "variable.language";
+                    else if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else
+                        return "identifier";
+                },
+                // TODO: Unicode escape sequences
+                // TODO: Unicode identifiers
+                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+            }, {
+                token : "keyword.operator",
+                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+            }, {
+                token : "punctuation.operator",
+                regex : "\\?|\\:|\\,|\\;|\\."
+            }, {
+                token : "paren.lparen",
+                regex : "[[({]"
+            }, {
+                token : "paren.rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ]
+    };
+    
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ new DocCommentHighlightRules().getEndRule("start") ]);
+};
+
+oop.inherits(CSharpHighlightRules, TextHighlightRules);
+
+exports.CSharpHighlightRules = CSharpHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var DocCommentHighlightRules = function() {
+
+    this.$rules = {
+        "start" : [ {
+            token : "comment.doc.tag",
+            regex : "@[\\w\\d_]+" // TODO: fix email addresses
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "\\s+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "TODO"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "[^@\\*]+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "."
+        }]
+    };
+};
+
+oop.inherits(DocCommentHighlightRules, TextHighlightRules);
+
+(function() {
+
+    this.getStartRule = function(start) {
+        return {
+            token : "comment.doc", // doc comment
+            merge : true,
+            regex : "\\/\\*(?=\\*)",
+            next  : start
+        };
+    };
+    
+    this.getEndRule = function (start) {
+        return {
+            token : "comment.doc", // closing comment
+            merge : true,
+            regex : "\\*\\/",
+            next  : start
+        };
+    };
+
+}).call(DocCommentHighlightRules.prototype);
+
+exports.DocCommentHighlightRules = DocCommentHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require('../behaviour').Behaviour;
+
+var CstyleBehaviour = function () {
+
+    this.add("braces", "insertion", function (state, action, editor, session, text) {
+        if (text == '{') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '}') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return null;
+
+                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
+                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+
+    this.add("braces", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '{') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.end.column, range.end.column + 1);
+            if (rightChar == '}') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("parens", "insertion", function (state, action, editor, session, text) {
+        if (text == '(') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '()',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == ')') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == ')') {
+                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("parens", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '(') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == ')') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '"' + selected + '"',
+                    selection: false
+                }
+            } else {
+                var cursor = editor.getCursorPosition();
+                var line = session.doc.getLine(cursor.row);
+                var leftChar = line.substring(cursor.column-1, cursor.column);
+
+                // We're escaped.
+                if (leftChar == '\\') {
+                    return null;
+                }
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf('"');
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
+                    return {
+                        text: '""',
+                        selection: [1,1]
+                    }
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == '"') {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '"') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == '"') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+}
+oop.inherits(CstyleBehaviour, Behaviour);
+
+exports.CstyleBehaviour = CstyleBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-css-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-css-uncompressed.js
new file mode 100755
index 00000000000..17a7738b477
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-css-uncompressed.js
@@ -0,0 +1,863 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/css', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/css_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/worker/worker_client', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules(), "i");
+    this.$outdent = new MatchingBraceOutdent();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.foldingRules = "cStyle";
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        // ignore braces in comments
+        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+
+        var match = line.match(/^.*\{\s*$/);
+        if (match) {
+            indent += tab;
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+    
+    this.createWorker = function(session) {
+        var worker = new WorkerClient(["ace"], "worker-css.js", "ace/mode/css_worker", "Worker");
+        worker.attachToDocument(session.getDocument());
+        
+        worker.on("csslint", function(e) {
+            var errors = [];
+            e.data.forEach(function(message) {
+                errors.push({
+                    row: message.line - 1,
+                    column: message.col - 1,
+                    text: message.message,
+                    type: message.type,
+                    lint: message
+                });
+            });
+            
+            session.setAnnotations(errors);
+        });
+        return worker;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/css_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var CssHighlightRules = function() {
+
+    var properties = lang.arrayToMap(
+        ("-moz-appearance|-moz-box-sizing|-webkit-box-sizing|-moz-outline-radius|-moz-transform|-webkit-transform|" +
+        "appearance|azimuth|background-attachment|background-color|background-image|" +
+        "background-origin|background-position|background-repeat|background|border-bottom-color|" +
+        "border-bottom-style|border-bottom-width|border-bottom|border-collapse|" +
+        "border-color|border-left-color|border-left-style|border-left-width|" +
+        "border-left|border-right-color|border-right-style|border-right-width|" +
+        "border-right|border-spacing|border-style|border-top-color|" +
+        "border-top-style|border-top-width|border-top|border-width|border|" +
+        "bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|" +
+        "counter-reset|cue-after|cue-before|cue|cursor|direction|display|" +
+        "elevation|empty-cells|float|font-family|font-size-adjust|font-size|" +
+        "font-stretch|font-style|font-variant|font-weight|font|height|left|" +
+        "letter-spacing|line-height|list-style-image|list-style-position|" +
+        "list-style-type|list-style|margin-bottom|margin-left|margin-right|" +
+        "margin-top|marker-offset|margin|marks|max-height|max-width|min-height|" +
+        "min-width|-moz-border-radius|opacity|orphans|outline-color|outline-offset|outline-radius|" +
+        "outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|" +
+        "padding-left|padding-right|padding-top|padding|page-break-after|" +
+        "page-break-before|page-break-inside|page|pause-after|pause-before|" +
+        "pause|pitch-range|pitch|play-during|pointer-events|position|quotes|resize|richness|right|" +
+        "size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|" +
+        "stress|table-layout|text-align|text-decoration|text-indent|" +
+        "text-shadow|text-transform|top|transform|unicode-bidi|vertical-align|" +
+        "visibility|voice-family|volume|white-space|widows|width|word-spacing|" +
+        "z-index").split("|")
+    );
+
+    var functions = lang.arrayToMap(
+        ("rgb|rgba|url|attr|counter|counters").split("|")
+    );
+
+    var constants = lang.arrayToMap(
+        ("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|" +
+        "block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|" +
+        "char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|" +
+        "decimal-leading-zero|decimal|default|disabled|disc|" +
+        "distribute-all-lines|distribute-letter|distribute-space|" +
+        "distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|" +
+        "hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|" +
+        "ideograph-alpha|ideograph-numeric|ideograph-parenthesis|" +
+        "ideograph-space|inactive|inherit|inline-block|inline|inset|inside|" +
+        "inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|" +
+        "keep-all|left|lighter|line-edge|line-through|line|list-item|loose|" +
+        "lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|" +
+        "medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|" +
+        "nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|" +
+        "overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|" +
+        "ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|" +
+        "solid|square|static|strict|super|sw-resize|table-footer-group|" +
+        "table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|" +
+        "transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|" +
+        "vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|" +
+        "zero").split("|")
+    );
+
+    var colors = lang.arrayToMap(
+        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
+        "purple|red|silver|teal|white|yellow").split("|")
+    );
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
+
+    var base_ruleset = [
+        {
+            token : "comment", // multi line comment
+            merge : true,
+            regex : "\\/\\*",
+            next : "ruleset_comment"
+        },{
+            token : "string", // single line
+            regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+        }, {
+            token : "string", // single line
+            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+        }, {
+            token : "constant.numeric",
+            regex : numRe + "(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"
+        }, {
+            token : "constant.numeric",  // hex6 color
+            regex : "#[a-f0-9]{6}"
+        }, {
+            token : "constant.numeric", // hex3 color
+            regex : "#[a-f0-9]{3}"
+        }, {
+            token : function(value) {
+                if (properties.hasOwnProperty(value.toLowerCase())) {
+                    return "support.type";
+                }
+                else if (functions.hasOwnProperty(value.toLowerCase())) {
+                    return "support.function";
+                }
+                else if (constants.hasOwnProperty(value.toLowerCase())) {
+                    return "support.constant";
+                }
+                else if (colors.hasOwnProperty(value.toLowerCase())) {
+                    return "support.constant.color";
+                }
+                else {
+                    return "text";
+                }
+            },
+            regex : "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
+        }
+      ];
+
+    var ruleset = lang.copyArray(base_ruleset);
+    ruleset.unshift({
+        token : "paren.rparen",
+        regex : "\\}",
+        next:   "start"
+    });
+
+    var media_ruleset = lang.copyArray( base_ruleset );
+    media_ruleset.unshift({
+        token : "paren.rparen",
+        regex : "\\}",
+        next:   "media"
+    });
+
+    var base_comment = [{
+          token : "comment", // comment spanning whole line
+          merge : true,
+          regex : ".+"
+    }];
+
+    var comment = lang.copyArray(base_comment);
+    comment.unshift({
+          token : "comment", // closing comment
+          regex : ".*?\\*\\/",
+          next : "start"
+    });
+
+    var media_comment = lang.copyArray(base_comment);
+    media_comment.unshift({
+          token : "comment", // closing comment
+          regex : ".*?\\*\\/",
+          next : "media"
+    });
+
+    var ruleset_comment = lang.copyArray(base_comment);
+    ruleset_comment.unshift({
+          token : "comment", // closing comment
+          regex : ".*?\\*\\/",
+          next : "ruleset"
+    });
+
+    this.$rules = {
+        "start" : [{
+            token : "comment", // multi line comment
+            merge : true,
+            regex : "\\/\\*",
+            next : "comment"
+        }, {
+            token: "paren.lparen",
+            regex: "\\{",
+            next:  "ruleset"
+        }, {
+            token: "string",
+            regex: "@.*?{",
+            next:  "media"
+        },{
+            token: "keyword",
+            regex: "#[a-z0-9-_]+"
+        },{
+            token: "variable",
+            regex: "\\.[a-z0-9-_]+"
+        },{
+            token: "string",
+            regex: ":[a-z0-9-_]+"
+        },{
+            token: "constant",
+            regex: "[a-z0-9-_]+"
+        }],
+
+        "media" : [ {
+            token : "comment", // multi line comment
+            merge : true,
+            regex : "\\/\\*",
+            next : "media_comment"
+        }, {
+            token: "paren.lparen",
+            regex: "\\{",
+            next:  "media_ruleset"
+        },{
+            token: "string",
+            regex: "\\}",
+            next:  "start"
+        },{
+            token: "keyword",
+            regex: "#[a-z0-9-_]+"
+        },{
+            token: "variable",
+            regex: "\\.[a-z0-9-_]+"
+        },{
+            token: "string",
+            regex: ":[a-z0-9-_]+"
+        },{
+            token: "constant",
+            regex: "[a-z0-9-_]+"
+        }],
+
+        "comment" : comment,
+
+        "ruleset" : ruleset,
+        "ruleset_comment" : ruleset_comment,
+
+        "media_ruleset" : media_ruleset,
+        "media_comment" : media_comment
+    };
+};
+
+oop.inherits(CssHighlightRules, TextHighlightRules);
+
+exports.CssHighlightRules = CssHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/worker/worker_client', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var EventEmitter = require("../lib/event_emitter").EventEmitter;
+
+var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
+
+    this.changeListener = this.changeListener.bind(this);
+
+    if (module.packaged) {
+        var base = this.$guessBasePath();
+        this.$worker = new Worker(base + packagedJs);
+    }
+    else {
+        var workerUrl = this.$normalizePath(require.nameToUrl("ace/worker/worker", null, "_"));
+        this.$worker = new Worker(workerUrl);
+
+        var tlns = {};
+        for (var i=0; i<topLevelNamespaces.length; i++) {
+            var ns = topLevelNamespaces[i];
+            var path = this.$normalizePath(require.nameToUrl(ns, null, "_").replace(/.js$/, ""));
+
+            tlns[ns] = path;
+        }
+    }
+
+    this.$worker.postMessage({
+        init : true,
+        tlns: tlns,
+        module: mod,
+        classname: classname
+    });
+
+    this.callbackId = 1;
+    this.callbacks = {};
+
+    var _self = this;
+    this.$worker.onerror = function(e) {
+        window.console && console.log && console.log(e);
+        throw e;
+    };
+    this.$worker.onmessage = function(e) {
+        var msg = e.data;
+        switch(msg.type) {
+            case "log":
+                window.console && console.log && console.log(msg.data);
+                break;
+
+            case "event":
+                _self._emit(msg.name, {data: msg.data});
+                break;
+
+            case "call":
+                var callback = _self.callbacks[msg.id];
+                if (callback) {
+                    callback(msg.data);
+                    delete _self.callbacks[msg.id];
+                }
+                break;
+        }
+    };
+};
+
+(function(){
+
+    oop.implement(this, EventEmitter);
+
+    this.$normalizePath = function(path) {
+        path = path.replace(/^[a-z]+:\/\/[^\/]+\//, ""); // Remove domain name and rebuild it
+        path = location.protocol + "//" + location.host
+            // paths starting with a slash are relative to the root (host)
+            + (path.charAt(0) == "/" ? "" : location.pathname.replace(/\/[^\/]*$/, ""))
+            + "/" + path.replace(/^[\/]+/, "");
+        return path;
+    };
+
+    this.$guessBasePath = function() {
+        if (require.aceBaseUrl)
+            return require.aceBaseUrl;
+
+        var scripts = document.getElementsByTagName("script");
+        for (var i=0; i<scripts.length; i++) {
+            var script = scripts[i];
+
+            var base = script.getAttribute("data-ace-base");
+            if (base)
+                return base.replace(/\/*$/, "/");
+
+            var src = script.src || script.getAttribute("src");
+            if (!src) {
+                continue;
+            }
+            var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);
+            if (m)
+                return m[1] || m[2];
+        }
+        return "";
+    };
+
+    this.terminate = function() {
+        this._emit("terminate", {});
+        this.$worker.terminate();
+        this.$worker = null;
+        this.$doc.removeEventListener("change", this.changeListener);
+        this.$doc = null;
+    };
+
+    this.send = function(cmd, args) {
+        this.$worker.postMessage({command: cmd, args: args});
+    };
+
+    this.call = function(cmd, args, callback) {
+        if (callback) {
+            var id = this.callbackId++;
+            this.callbacks[id] = callback;
+            args.push(id);
+        }
+        this.send(cmd, args);
+    };
+
+    this.emit = function(event, data) {
+        try {
+            // firefox refuses to clone objects which have function properties
+            // TODO: cleanup event
+            this.$worker.postMessage({event: event, data: {data: data.data}});
+        }
+        catch(ex) {}
+    };
+
+    this.attachToDocument = function(doc) {
+        if(this.$doc)
+            this.terminate();
+
+        this.$doc = doc;
+        this.call("setValue", [doc.getValue()]);
+        doc.on("change", this.changeListener);
+    };
+
+    this.changeListener = function(e) {
+        e.range = {
+            start: e.data.range.start,
+            end: e.data.range.end
+        };
+        this.emit("change", e);
+    };
+
+}).call(WorkerClient.prototype);
+
+exports.WorkerClient = WorkerClient;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-groovy-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-groovy-uncompressed.js
new file mode 100755
index 00000000000..b6067e87773
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-groovy-uncompressed.js
@@ -0,0 +1,1462 @@
+define('ace/mode/groovy', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/javascript', 'ace/tokenizer', 'ace/mode/groovy_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var JavaScriptMode = require("./javascript").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var GroovyHighlightRules = require("./groovy_highlight_rules").GroovyHighlightRules;
+
+var Mode = function() {
+    JavaScriptMode.call(this);
+    this.$tokenizer = new Tokenizer(new GroovyHighlightRules().getRules());
+};
+oop.inherits(Mode, JavaScriptMode);
+
+(function() {
+
+    this.createWorker = function(session) {
+        return null;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var Range = require("../range").Range;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var re = /^(\s*)\/\//;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i);
+                var m = line.match(re);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, "//");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+        var endState = tokenizedLine.state;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+        
+        if (state == "start" || state == "regex_allowed") {
+            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        } else if (state == "doc-start") {
+            if (endState == "start" || state == "regex_allowed") {
+                return "";
+            }
+            var match = line.match(/^\s*(\/?)\*/);
+            if (match) {
+                if (match[1]) {
+                    indent += " ";
+                }
+                indent += "* ";
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+    
+    this.createWorker = function(session) {
+        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
+        worker.attachToDocument(session.getDocument());
+            
+        worker.on("jslint", function(results) {
+            var errors = [];
+            for (var i=0; i<results.data.length; i++) {
+                var error = results.data[i];
+                if (error)
+                    errors.push({
+                        row: error.line-1,
+                        column: error.character-1,
+                        text: error.reason,
+                        type: "warning",
+                        lint: error
+                    });
+            }
+            session.setAnnotations(errors);
+        });
+        
+        worker.on("narcissus", function(e) {
+            session.setAnnotations([e.data]);
+        });
+        
+        worker.on("terminate", function() {
+            session.clearAnnotations();
+        });
+        
+        return worker;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var unicode = require("../unicode");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var JavaScriptHighlightRules = function() {
+
+    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
+    var globals = lang.arrayToMap(
+      // Constructors
+        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
+      // E4X
+         "Namespace|QName|XML|XMLList|" +
+         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
+         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
+      // Errors
+        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
+        "SyntaxError|TypeError|URIError|" +
+      //  Non-constructor functions
+        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
+        "isNaN|parseFloat|parseInt|" +
+      // Other
+        "JSON|Math|" +
+      // Pseudo
+        "this|arguments|prototype|window|document"
+      ).split("|")
+    );
+
+    var keywords = lang.arrayToMap(
+        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
+        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
+        "const|yield|import|get|set").split("|")
+    );
+
+    // keywords which can be followed by regular expressions
+    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
+
+    var deprecated = lang.arrayToMap(
+        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
+    );
+
+    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
+
+    var buildinConstants = lang.arrayToMap(
+        ("null|Infinity|NaN|undefined").split("|")
+    );
+
+    var futureReserved = lang.arrayToMap(
+        ("class|enum|extends|super|export|implements|private|" +
+        "public|interface|package|protected|static").split("|")
+    );
+
+    // TODO: Unicode escape sequences
+    var identifierRe = "[" + unicode.packages.L + "\\$_][" 
+        + unicode.packages.L
+        + unicode.packages.Mn + unicode.packages.Mc
+        + unicode.packages.Nd
+        + unicode.packages.Pc + "\\$_]*\\b";
+        
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            new DocCommentHighlightRules().getStartRule("doc-start"),
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : '["].*\\\\$',
+                next : "qqstring"
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : "['].*\\\\$",
+                next : "qstring"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : ["keyword.definition", "text", "entity.name.function"],
+                regex : "(function)(\\s+)(" + identifierRe + ")"
+            }, {
+                token : "constant.language.boolean",
+                regex : "(?:true|false)\\b"
+            }, {
+                token : "keyword",
+                regex : "(?:" + kwBeforeRe + ")\\b",
+                next : "regex_allowed"
+            }, {
+                token : function(value) {
+                    if (globals.hasOwnProperty(value))
+                        return "variable.language";
+                    else if (deprecated.hasOwnProperty(value))
+                        return "invalid.deprecated";
+                    else if (definitions.hasOwnProperty(value))
+                        return "keyword.definition";
+                    else if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else if (futureReserved.hasOwnProperty(value))
+                        return "invalid.illegal";
+                    else if (value == "debugger")
+                        return "invalid.deprecated";
+                    else
+                        return "identifier";
+                },
+                regex : identifierRe
+            }, {
+                token : "keyword.operator",
+                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",
+                next  : "regex_allowed"
+            }, {
+                token : "punctuation.operator",
+                regex : "\\?|\\:|\\,|\\;|\\.",
+                next  : "regex_allowed"
+            }, {
+                token : "paren.lparen",
+                regex : "[[({]",
+                next  : "regex_allowed"
+            }, {
+                token : "paren.rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "keyword.operator",
+                regex : "\\/=?",
+                next  : "regex_allowed"
+            }, {
+                token: "comment",
+                regex: "^#!.*$" 
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        // regular expressions are only allowed after certain tokens. This
+        // makes sure we don't mix up regexps with the divison operator
+        "regex_allowed": [
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment_regex_allowed"
+            }, {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            }, {
+                token: "string.regexp",
+                regex: "\\/",
+                next: "regex",
+                merge: true
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }, {
+                // immediately return to the start mode without matching
+                // anything
+                token: "empty", 
+                regex: "",
+                next: "start"
+            }
+        ],
+        "regex": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
+                next: "regex"
+            }, {
+				// flag
+                token: "string.regexp", 
+                regex: "/\\w*",
+                next: "start",
+                merge: true 
+            }, {
+                token: "string.regexp",
+                regex: "[^\\\\/\\[]+",
+                next: "regex",
+                merge: true
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "\\[",
+                next: "regex_character_class",
+                merge: true
+            }, {
+                token: "empty", 
+                regex: "",
+                next: "start" 
+            }
+        ],
+        "regex_character_class": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
+                next: "regex_character_class"
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "]",
+                next: "regex",
+                merge: true
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "[^\\\\\\]]+",
+                next: "regex_character_class",
+                merge: true
+            }, {
+                token: "empty", 
+                regex: "",
+                next: "start" 
+            }
+        ],
+        "comment_regex_allowed" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                merge : true,
+                next : "regex_allowed"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                merge : true,
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "qqstring" : [
+            {
+                token : "string",
+                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ],
+        "qstring" : [
+            {
+                token : "string",
+                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ]
+    };
+    
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ new DocCommentHighlightRules().getEndRule("start") ]);
+};
+
+oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
+
+exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var DocCommentHighlightRules = function() {
+
+    this.$rules = {
+        "start" : [ {
+            token : "comment.doc.tag",
+            regex : "@[\\w\\d_]+" // TODO: fix email addresses
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "\\s+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "TODO"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "[^@\\*]+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "."
+        }]
+    };
+};
+
+oop.inherits(DocCommentHighlightRules, TextHighlightRules);
+
+(function() {
+
+    this.getStartRule = function(start) {
+        return {
+            token : "comment.doc", // doc comment
+            merge : true,
+            regex : "\\/\\*(?=\\*)",
+            next  : start
+        };
+    };
+    
+    this.getEndRule = function (start) {
+        return {
+            token : "comment.doc", // closing comment
+            merge : true,
+            regex : "\\*\\/",
+            next  : start
+        };
+    };
+
+}).call(DocCommentHighlightRules.prototype);
+
+exports.DocCommentHighlightRules = DocCommentHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/worker/worker_client', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var EventEmitter = require("../lib/event_emitter").EventEmitter;
+
+var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
+
+    this.changeListener = this.changeListener.bind(this);
+
+    if (module.packaged) {
+        var base = this.$guessBasePath();
+        this.$worker = new Worker(base + packagedJs);
+    }
+    else {
+        var workerUrl = this.$normalizePath(require.nameToUrl("ace/worker/worker", null, "_"));
+        this.$worker = new Worker(workerUrl);
+
+        var tlns = {};
+        for (var i=0; i<topLevelNamespaces.length; i++) {
+            var ns = topLevelNamespaces[i];
+            var path = this.$normalizePath(require.nameToUrl(ns, null, "_").replace(/.js$/, ""));
+
+            tlns[ns] = path;
+        }
+    }
+
+    this.$worker.postMessage({
+        init : true,
+        tlns: tlns,
+        module: mod,
+        classname: classname
+    });
+
+    this.callbackId = 1;
+    this.callbacks = {};
+
+    var _self = this;
+    this.$worker.onerror = function(e) {
+        window.console && console.log && console.log(e);
+        throw e;
+    };
+    this.$worker.onmessage = function(e) {
+        var msg = e.data;
+        switch(msg.type) {
+            case "log":
+                window.console && console.log && console.log(msg.data);
+                break;
+
+            case "event":
+                _self._emit(msg.name, {data: msg.data});
+                break;
+
+            case "call":
+                var callback = _self.callbacks[msg.id];
+                if (callback) {
+                    callback(msg.data);
+                    delete _self.callbacks[msg.id];
+                }
+                break;
+        }
+    };
+};
+
+(function(){
+
+    oop.implement(this, EventEmitter);
+
+    this.$normalizePath = function(path) {
+        path = path.replace(/^[a-z]+:\/\/[^\/]+\//, ""); // Remove domain name and rebuild it
+        path = location.protocol + "//" + location.host
+            // paths starting with a slash are relative to the root (host)
+            + (path.charAt(0) == "/" ? "" : location.pathname.replace(/\/[^\/]*$/, ""))
+            + "/" + path.replace(/^[\/]+/, "");
+        return path;
+    };
+
+    this.$guessBasePath = function() {
+        if (require.aceBaseUrl)
+            return require.aceBaseUrl;
+
+        var scripts = document.getElementsByTagName("script");
+        for (var i=0; i<scripts.length; i++) {
+            var script = scripts[i];
+
+            var base = script.getAttribute("data-ace-base");
+            if (base)
+                return base.replace(/\/*$/, "/");
+
+            var src = script.src || script.getAttribute("src");
+            if (!src) {
+                continue;
+            }
+            var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);
+            if (m)
+                return m[1] || m[2];
+        }
+        return "";
+    };
+
+    this.terminate = function() {
+        this._emit("terminate", {});
+        this.$worker.terminate();
+        this.$worker = null;
+        this.$doc.removeEventListener("change", this.changeListener);
+        this.$doc = null;
+    };
+
+    this.send = function(cmd, args) {
+        this.$worker.postMessage({command: cmd, args: args});
+    };
+
+    this.call = function(cmd, args, callback) {
+        if (callback) {
+            var id = this.callbackId++;
+            this.callbacks[id] = callback;
+            args.push(id);
+        }
+        this.send(cmd, args);
+    };
+
+    this.emit = function(event, data) {
+        try {
+            // firefox refuses to clone objects which have function properties
+            // TODO: cleanup event
+            this.$worker.postMessage({event: event, data: {data: data.data}});
+        }
+        catch(ex) {}
+    };
+
+    this.attachToDocument = function(doc) {
+        if(this.$doc)
+            this.terminate();
+
+        this.$doc = doc;
+        this.call("setValue", [doc.getValue()]);
+        doc.on("change", this.changeListener);
+    };
+
+    this.changeListener = function(e) {
+        e.range = {
+            start: e.data.range.start,
+            end: e.data.range.end
+        };
+        this.emit("change", e);
+    };
+
+}).call(WorkerClient.prototype);
+
+exports.WorkerClient = WorkerClient;
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require('../behaviour').Behaviour;
+
+var CstyleBehaviour = function () {
+
+    this.add("braces", "insertion", function (state, action, editor, session, text) {
+        if (text == '{') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '}') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return null;
+
+                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
+                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+
+    this.add("braces", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '{') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.end.column, range.end.column + 1);
+            if (rightChar == '}') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("parens", "insertion", function (state, action, editor, session, text) {
+        if (text == '(') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '()',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == ')') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == ')') {
+                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("parens", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '(') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == ')') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '"' + selected + '"',
+                    selection: false
+                }
+            } else {
+                var cursor = editor.getCursorPosition();
+                var line = session.doc.getLine(cursor.row);
+                var leftChar = line.substring(cursor.column-1, cursor.column);
+
+                // We're escaped.
+                if (leftChar == '\\') {
+                    return null;
+                }
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf('"');
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
+                    return {
+                        text: '""',
+                        selection: [1,1]
+                    }
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == '"') {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '"') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == '"') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+}
+oop.inherits(CstyleBehaviour, Behaviour);
+
+exports.CstyleBehaviour = CstyleBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+define('ace/mode/groovy_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var GroovyHighlightRules = function() {
+
+    var keywords = lang.arrayToMap(
+    ("assert|with|abstract|continue|for|new|switch|" +
+    "assert|default|goto|package|synchronized|" +
+    "boolean|do|if|private|this|" +
+    "break|double|implements|protected|throw|" +
+    "byte|else|import|public|throws|" +
+    "case|enum|instanceof|return|transient|" +
+    "catch|extends|int|short|try|" +
+    "char|final|interface|static|void|" +
+    "class|finally|long|strictfp|volatile|" +
+    "def|float|native|super|while").split("|")
+    );
+
+    var buildinConstants = lang.arrayToMap(
+        ("null|Infinity|NaN|undefined").split("|")
+    );
+
+    var langClasses = lang.arrayToMap(
+        ("AbstractMethodError|AssertionError|ClassCircularityError|"+
+        "ClassFormatError|Deprecated|EnumConstantNotPresentException|"+
+        "ExceptionInInitializerError|IllegalAccessError|"+
+        "IllegalThreadStateException|InstantiationError|InternalError|"+
+        "NegativeArraySizeException|NoSuchFieldError|Override|Process|"+
+        "ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|"+
+        "SuppressWarnings|TypeNotPresentException|UnknownError|"+
+        "UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|"+
+        "InstantiationException|IndexOutOfBoundsException|"+
+        "ArrayIndexOutOfBoundsException|CloneNotSupportedException|"+
+        "NoSuchFieldException|IllegalArgumentException|NumberFormatException|"+
+        "SecurityException|Void|InheritableThreadLocal|IllegalStateException|"+
+        "InterruptedException|NoSuchMethodException|IllegalAccessException|"+
+        "UnsupportedOperationException|Enum|StrictMath|Package|Compiler|"+
+        "Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|"+
+        "NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|"+
+        "NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|"+
+        "Character|Boolean|StackTraceElement|Appendable|StringBuffer|"+
+        "Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|"+
+        "StackOverflowError|OutOfMemoryError|VirtualMachineError|"+
+        "ArrayStoreException|ClassCastException|LinkageError|"+
+        "NoClassDefFoundError|ClassNotFoundException|RuntimeException|"+
+        "Exception|ThreadDeath|Error|Throwable|System|ClassLoader|"+
+        "Cloneable|Class|CharSequence|Comparable|String|Object").split("|")
+    );
+    
+    var importClasses = lang.arrayToMap(
+        ("").split("|")
+    );
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            new DocCommentHighlightRules().getStartRule("doc-start"),
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
+                token : "string.regexp",
+                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : "constant.language.boolean",
+                regex : "(?:true|false)\\b"
+            }, {
+                token : function(value) {
+                    if (value == "this")
+                        return "variable.language";
+                    else if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (langClasses.hasOwnProperty(value))
+                        return "support.function";
+                    else if (importClasses.hasOwnProperty(value))
+                        return "support.function";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else
+                        return "identifier";
+                },
+                // TODO: Unicode escape sequences
+                // TODO: Unicode identifiers
+                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+            }, {
+                token : "keyword.operator",
+                regex : "\\?:|\\?\\.|\\*\\.|<=>|=~|==~|\\.@|\\*\\.@|\\.&|as|in|is|!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+            }, {
+                token : "lparen",
+                regex : "[[({]"
+            }, {
+                token : "rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ]
+    };
+    
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ new DocCommentHighlightRules().getEndRule("start") ]);
+};
+
+oop.inherits(GroovyHighlightRules, TextHighlightRules);
+
+exports.GroovyHighlightRules = GroovyHighlightRules;
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-haxe-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-haxe-uncompressed.js
new file mode 100755
index 00000000000..5496580ed33
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-haxe-uncompressed.js
@@ -0,0 +1,778 @@
+define('ace/mode/haxe', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/haxe_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var HaxeHighlightRules = require("./haxe_highlight_rules").HaxeHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new HaxeHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+      this.getNextLineIndent = function(state, line, tab) {
+          var indent = this.$getIndent(line);
+
+          var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+          var tokens = tokenizedLine.tokens;
+
+          if (tokens.length && tokens[tokens.length-1].type == "comment") {
+              return indent;
+          }
+
+          if (state == "start") {
+              var match = line.match(/^.*[\{\(\[]\s*$/);
+              if (match) {
+                  indent += tab;
+              }
+          }
+
+          return indent;
+      };
+
+      this.checkOutdent = function(state, line, input) {
+          return this.$outdent.checkOutdent(line, input);
+      };
+
+      this.autoOutdent = function(state, doc, row) {
+          this.$outdent.autoOutdent(doc, row);
+      };
+
+
+    this.createWorker = function(session) {
+        return null;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+define('ace/mode/haxe_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var HaxeHighlightRules = function() {
+
+    var keywords = lang.arrayToMap(
+        ("break|case|cast|catch|class|continue|default|else|enum|extends|for|function|if|implements|import|in|inline|interface|new|override|package|private|public|return|static|super|switch|this|throw|trace|try|typedef|untyped|var|while|Array|Void|Bool|Int|UInt|Float|Dynamic|String|List|Hash|IntHash|Error|Unknown|Type|Std").split("|")
+    );
+
+    var buildinConstants = lang.arrayToMap(
+        ("null|true|false").split("|")
+    );
+
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            new DocCommentHighlightRules().getStartRule("doc-start"),
+            {
+                token : "comment", // multi line comment
+                regex : "\\/\\*",
+                merge : true,
+                next : "comment"
+            }, {
+                token : "string.regexp",
+                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : "constant.language.boolean",
+                regex : "(?:true|false)\\b"
+            }, {
+                token : function(value) {
+                    if (value == "this")
+                        return "variable.language";
+                    else if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else
+                        return "identifier";
+                },
+                // TODO: Unicode escape sequences
+                // TODO: Unicode identifiers
+                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+            }, {
+                token : "keyword.operator",
+                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+            }, {
+                token : "punctuation.operator",
+                regex : "\\?|\\:|\\,|\\;|\\."
+            }, {
+                token : "paren.lparen",
+                regex : "[[({<]"
+            }, {
+                token : "paren.rparen",
+                regex : "[\\])}>]"
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ]
+    };
+
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ new DocCommentHighlightRules().getEndRule("start") ]);
+};
+
+oop.inherits(HaxeHighlightRules, TextHighlightRules);
+
+exports.HaxeHighlightRules = HaxeHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var DocCommentHighlightRules = function() {
+
+    this.$rules = {
+        "start" : [ {
+            token : "comment.doc.tag",
+            regex : "@[\\w\\d_]+" // TODO: fix email addresses
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "\\s+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "TODO"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "[^@\\*]+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "."
+        }]
+    };
+};
+
+oop.inherits(DocCommentHighlightRules, TextHighlightRules);
+
+(function() {
+
+    this.getStartRule = function(start) {
+        return {
+            token : "comment.doc", // doc comment
+            merge : true,
+            regex : "\\/\\*(?=\\*)",
+            next  : start
+        };
+    };
+    
+    this.getEndRule = function (start) {
+        return {
+            token : "comment.doc", // closing comment
+            merge : true,
+            regex : "\\*\\/",
+            next  : start
+        };
+    };
+
+}).call(DocCommentHighlightRules.prototype);
+
+exports.DocCommentHighlightRules = DocCommentHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require('../behaviour').Behaviour;
+
+var CstyleBehaviour = function () {
+
+    this.add("braces", "insertion", function (state, action, editor, session, text) {
+        if (text == '{') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '}') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return null;
+
+                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
+                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+
+    this.add("braces", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '{') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.end.column, range.end.column + 1);
+            if (rightChar == '}') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("parens", "insertion", function (state, action, editor, session, text) {
+        if (text == '(') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '()',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == ')') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == ')') {
+                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("parens", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '(') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == ')') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '"' + selected + '"',
+                    selection: false
+                }
+            } else {
+                var cursor = editor.getCursorPosition();
+                var line = session.doc.getLine(cursor.row);
+                var leftChar = line.substring(cursor.column-1, cursor.column);
+
+                // We're escaped.
+                if (leftChar == '\\') {
+                    return null;
+                }
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf('"');
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
+                    return {
+                        text: '""',
+                        selection: [1,1]
+                    }
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == '"') {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '"') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == '"') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+}
+oop.inherits(CstyleBehaviour, Behaviour);
+
+exports.CstyleBehaviour = CstyleBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-html-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-html-uncompressed.js
new file mode 100755
index 00000000000..e994e2e06ef
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-html-uncompressed.js
@@ -0,0 +1,2558 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/html', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/mode/javascript', 'ace/mode/css', 'ace/tokenizer', 'ace/mode/html_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/html'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var JavaScriptMode = require("./javascript").Mode;
+var CssMode = require("./css").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
+var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
+var HtmlFoldMode = require("./folding/html").FoldMode;
+
+var Mode = function() {
+    var highlighter = new HtmlHighlightRules();
+    this.$tokenizer = new Tokenizer(highlighter.getRules());
+    this.$behaviour = new XmlBehaviour();
+    
+    this.$embeds = highlighter.getEmbeds();
+    this.createModeDelegates({
+        "js-": JavaScriptMode,
+        "css-": CssMode
+    });
+    
+    this.foldingRules = new HtmlFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        return 0;
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        return this.$getIndent(line);
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return false;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var Range = require("../range").Range;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var re = /^(\s*)\/\//;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i);
+                var m = line.match(re);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, "//");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+        var endState = tokenizedLine.state;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+        
+        if (state == "start" || state == "regex_allowed") {
+            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        } else if (state == "doc-start") {
+            if (endState == "start" || state == "regex_allowed") {
+                return "";
+            }
+            var match = line.match(/^\s*(\/?)\*/);
+            if (match) {
+                if (match[1]) {
+                    indent += " ";
+                }
+                indent += "* ";
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+    
+    this.createWorker = function(session) {
+        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
+        worker.attachToDocument(session.getDocument());
+            
+        worker.on("jslint", function(results) {
+            var errors = [];
+            for (var i=0; i<results.data.length; i++) {
+                var error = results.data[i];
+                if (error)
+                    errors.push({
+                        row: error.line-1,
+                        column: error.character-1,
+                        text: error.reason,
+                        type: "warning",
+                        lint: error
+                    });
+            }
+            session.setAnnotations(errors);
+        });
+        
+        worker.on("narcissus", function(e) {
+            session.setAnnotations([e.data]);
+        });
+        
+        worker.on("terminate", function() {
+            session.clearAnnotations();
+        });
+        
+        return worker;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var unicode = require("../unicode");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var JavaScriptHighlightRules = function() {
+
+    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
+    var globals = lang.arrayToMap(
+      // Constructors
+        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
+      // E4X
+         "Namespace|QName|XML|XMLList|" +
+         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
+         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
+      // Errors
+        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
+        "SyntaxError|TypeError|URIError|" +
+      //  Non-constructor functions
+        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
+        "isNaN|parseFloat|parseInt|" +
+      // Other
+        "JSON|Math|" +
+      // Pseudo
+        "this|arguments|prototype|window|document"
+      ).split("|")
+    );
+
+    var keywords = lang.arrayToMap(
+        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
+        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
+        "const|yield|import|get|set").split("|")
+    );
+
+    // keywords which can be followed by regular expressions
+    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
+
+    var deprecated = lang.arrayToMap(
+        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
+    );
+
+    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
+
+    var buildinConstants = lang.arrayToMap(
+        ("null|Infinity|NaN|undefined").split("|")
+    );
+
+    var futureReserved = lang.arrayToMap(
+        ("class|enum|extends|super|export|implements|private|" +
+        "public|interface|package|protected|static").split("|")
+    );
+
+    // TODO: Unicode escape sequences
+    var identifierRe = "[" + unicode.packages.L + "\\$_][" 
+        + unicode.packages.L
+        + unicode.packages.Mn + unicode.packages.Mc
+        + unicode.packages.Nd
+        + unicode.packages.Pc + "\\$_]*\\b";
+        
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            new DocCommentHighlightRules().getStartRule("doc-start"),
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : '["].*\\\\$',
+                next : "qqstring"
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : "['].*\\\\$",
+                next : "qstring"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : ["keyword.definition", "text", "entity.name.function"],
+                regex : "(function)(\\s+)(" + identifierRe + ")"
+            }, {
+                token : "constant.language.boolean",
+                regex : "(?:true|false)\\b"
+            }, {
+                token : "keyword",
+                regex : "(?:" + kwBeforeRe + ")\\b",
+                next : "regex_allowed"
+            }, {
+                token : function(value) {
+                    if (globals.hasOwnProperty(value))
+                        return "variable.language";
+                    else if (deprecated.hasOwnProperty(value))
+                        return "invalid.deprecated";
+                    else if (definitions.hasOwnProperty(value))
+                        return "keyword.definition";
+                    else if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else if (futureReserved.hasOwnProperty(value))
+                        return "invalid.illegal";
+                    else if (value == "debugger")
+                        return "invalid.deprecated";
+                    else
+                        return "identifier";
+                },
+                regex : identifierRe
+            }, {
+                token : "keyword.operator",
+                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",
+                next  : "regex_allowed"
+            }, {
+                token : "punctuation.operator",
+                regex : "\\?|\\:|\\,|\\;|\\.",
+                next  : "regex_allowed"
+            }, {
+                token : "paren.lparen",
+                regex : "[[({]",
+                next  : "regex_allowed"
+            }, {
+                token : "paren.rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "keyword.operator",
+                regex : "\\/=?",
+                next  : "regex_allowed"
+            }, {
+                token: "comment",
+                regex: "^#!.*$" 
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        // regular expressions are only allowed after certain tokens. This
+        // makes sure we don't mix up regexps with the divison operator
+        "regex_allowed": [
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment_regex_allowed"
+            }, {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            }, {
+                token: "string.regexp",
+                regex: "\\/",
+                next: "regex",
+                merge: true
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }, {
+                // immediately return to the start mode without matching
+                // anything
+                token: "empty", 
+                regex: "",
+                next: "start"
+            }
+        ],
+        "regex": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
+                next: "regex"
+            }, {
+				// flag
+                token: "string.regexp", 
+                regex: "/\\w*",
+                next: "start",
+                merge: true 
+            }, {
+                token: "string.regexp",
+                regex: "[^\\\\/\\[]+",
+                next: "regex",
+                merge: true
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "\\[",
+                next: "regex_character_class",
+                merge: true
+            }, {
+                token: "empty", 
+                regex: "",
+                next: "start" 
+            }
+        ],
+        "regex_character_class": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
+                next: "regex_character_class"
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "]",
+                next: "regex",
+                merge: true
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "[^\\\\\\]]+",
+                next: "regex_character_class",
+                merge: true
+            }, {
+                token: "empty", 
+                regex: "",
+                next: "start" 
+            }
+        ],
+        "comment_regex_allowed" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                merge : true,
+                next : "regex_allowed"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                merge : true,
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "qqstring" : [
+            {
+                token : "string",
+                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ],
+        "qstring" : [
+            {
+                token : "string",
+                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ]
+    };
+    
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ new DocCommentHighlightRules().getEndRule("start") ]);
+};
+
+oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
+
+exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var DocCommentHighlightRules = function() {
+
+    this.$rules = {
+        "start" : [ {
+            token : "comment.doc.tag",
+            regex : "@[\\w\\d_]+" // TODO: fix email addresses
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "\\s+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "TODO"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "[^@\\*]+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "."
+        }]
+    };
+};
+
+oop.inherits(DocCommentHighlightRules, TextHighlightRules);
+
+(function() {
+
+    this.getStartRule = function(start) {
+        return {
+            token : "comment.doc", // doc comment
+            merge : true,
+            regex : "\\/\\*(?=\\*)",
+            next  : start
+        };
+    };
+    
+    this.getEndRule = function (start) {
+        return {
+            token : "comment.doc", // closing comment
+            merge : true,
+            regex : "\\*\\/",
+            next  : start
+        };
+    };
+
+}).call(DocCommentHighlightRules.prototype);
+
+exports.DocCommentHighlightRules = DocCommentHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/worker/worker_client', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var EventEmitter = require("../lib/event_emitter").EventEmitter;
+
+var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
+
+    this.changeListener = this.changeListener.bind(this);
+
+    if (module.packaged) {
+        var base = this.$guessBasePath();
+        this.$worker = new Worker(base + packagedJs);
+    }
+    else {
+        var workerUrl = this.$normalizePath(require.nameToUrl("ace/worker/worker", null, "_"));
+        this.$worker = new Worker(workerUrl);
+
+        var tlns = {};
+        for (var i=0; i<topLevelNamespaces.length; i++) {
+            var ns = topLevelNamespaces[i];
+            var path = this.$normalizePath(require.nameToUrl(ns, null, "_").replace(/.js$/, ""));
+
+            tlns[ns] = path;
+        }
+    }
+
+    this.$worker.postMessage({
+        init : true,
+        tlns: tlns,
+        module: mod,
+        classname: classname
+    });
+
+    this.callbackId = 1;
+    this.callbacks = {};
+
+    var _self = this;
+    this.$worker.onerror = function(e) {
+        window.console && console.log && console.log(e);
+        throw e;
+    };
+    this.$worker.onmessage = function(e) {
+        var msg = e.data;
+        switch(msg.type) {
+            case "log":
+                window.console && console.log && console.log(msg.data);
+                break;
+
+            case "event":
+                _self._emit(msg.name, {data: msg.data});
+                break;
+
+            case "call":
+                var callback = _self.callbacks[msg.id];
+                if (callback) {
+                    callback(msg.data);
+                    delete _self.callbacks[msg.id];
+                }
+                break;
+        }
+    };
+};
+
+(function(){
+
+    oop.implement(this, EventEmitter);
+
+    this.$normalizePath = function(path) {
+        path = path.replace(/^[a-z]+:\/\/[^\/]+\//, ""); // Remove domain name and rebuild it
+        path = location.protocol + "//" + location.host
+            // paths starting with a slash are relative to the root (host)
+            + (path.charAt(0) == "/" ? "" : location.pathname.replace(/\/[^\/]*$/, ""))
+            + "/" + path.replace(/^[\/]+/, "");
+        return path;
+    };
+
+    this.$guessBasePath = function() {
+        if (require.aceBaseUrl)
+            return require.aceBaseUrl;
+
+        var scripts = document.getElementsByTagName("script");
+        for (var i=0; i<scripts.length; i++) {
+            var script = scripts[i];
+
+            var base = script.getAttribute("data-ace-base");
+            if (base)
+                return base.replace(/\/*$/, "/");
+
+            var src = script.src || script.getAttribute("src");
+            if (!src) {
+                continue;
+            }
+            var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);
+            if (m)
+                return m[1] || m[2];
+        }
+        return "";
+    };
+
+    this.terminate = function() {
+        this._emit("terminate", {});
+        this.$worker.terminate();
+        this.$worker = null;
+        this.$doc.removeEventListener("change", this.changeListener);
+        this.$doc = null;
+    };
+
+    this.send = function(cmd, args) {
+        this.$worker.postMessage({command: cmd, args: args});
+    };
+
+    this.call = function(cmd, args, callback) {
+        if (callback) {
+            var id = this.callbackId++;
+            this.callbacks[id] = callback;
+            args.push(id);
+        }
+        this.send(cmd, args);
+    };
+
+    this.emit = function(event, data) {
+        try {
+            // firefox refuses to clone objects which have function properties
+            // TODO: cleanup event
+            this.$worker.postMessage({event: event, data: {data: data.data}});
+        }
+        catch(ex) {}
+    };
+
+    this.attachToDocument = function(doc) {
+        if(this.$doc)
+            this.terminate();
+
+        this.$doc = doc;
+        this.call("setValue", [doc.getValue()]);
+        doc.on("change", this.changeListener);
+    };
+
+    this.changeListener = function(e) {
+        e.range = {
+            start: e.data.range.start,
+            end: e.data.range.end
+        };
+        this.emit("change", e);
+    };
+
+}).call(WorkerClient.prototype);
+
+exports.WorkerClient = WorkerClient;
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require('../behaviour').Behaviour;
+
+var CstyleBehaviour = function () {
+
+    this.add("braces", "insertion", function (state, action, editor, session, text) {
+        if (text == '{') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '}') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return null;
+
+                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
+                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+
+    this.add("braces", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '{') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.end.column, range.end.column + 1);
+            if (rightChar == '}') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("parens", "insertion", function (state, action, editor, session, text) {
+        if (text == '(') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '()',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == ')') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == ')') {
+                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("parens", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '(') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == ')') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '"' + selected + '"',
+                    selection: false
+                }
+            } else {
+                var cursor = editor.getCursorPosition();
+                var line = session.doc.getLine(cursor.row);
+                var leftChar = line.substring(cursor.column-1, cursor.column);
+
+                // We're escaped.
+                if (leftChar == '\\') {
+                    return null;
+                }
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf('"');
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
+                    return {
+                        text: '""',
+                        selection: [1,1]
+                    }
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == '"') {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '"') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == '"') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+}
+oop.inherits(CstyleBehaviour, Behaviour);
+
+exports.CstyleBehaviour = CstyleBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/css', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/css_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/worker/worker_client', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules(), "i");
+    this.$outdent = new MatchingBraceOutdent();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.foldingRules = "cStyle";
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        // ignore braces in comments
+        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+
+        var match = line.match(/^.*\{\s*$/);
+        if (match) {
+            indent += tab;
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+    
+    this.createWorker = function(session) {
+        var worker = new WorkerClient(["ace"], "worker-css.js", "ace/mode/css_worker", "Worker");
+        worker.attachToDocument(session.getDocument());
+        
+        worker.on("csslint", function(e) {
+            var errors = [];
+            e.data.forEach(function(message) {
+                errors.push({
+                    row: message.line - 1,
+                    column: message.col - 1,
+                    text: message.message,
+                    type: message.type,
+                    lint: message
+                });
+            });
+            
+            session.setAnnotations(errors);
+        });
+        return worker;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/css_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var CssHighlightRules = function() {
+
+    var properties = lang.arrayToMap(
+        ("-moz-appearance|-moz-box-sizing|-webkit-box-sizing|-moz-outline-radius|-moz-transform|-webkit-transform|" +
+        "appearance|azimuth|background-attachment|background-color|background-image|" +
+        "background-origin|background-position|background-repeat|background|border-bottom-color|" +
+        "border-bottom-style|border-bottom-width|border-bottom|border-collapse|" +
+        "border-color|border-left-color|border-left-style|border-left-width|" +
+        "border-left|border-right-color|border-right-style|border-right-width|" +
+        "border-right|border-spacing|border-style|border-top-color|" +
+        "border-top-style|border-top-width|border-top|border-width|border|" +
+        "bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|" +
+        "counter-reset|cue-after|cue-before|cue|cursor|direction|display|" +
+        "elevation|empty-cells|float|font-family|font-size-adjust|font-size|" +
+        "font-stretch|font-style|font-variant|font-weight|font|height|left|" +
+        "letter-spacing|line-height|list-style-image|list-style-position|" +
+        "list-style-type|list-style|margin-bottom|margin-left|margin-right|" +
+        "margin-top|marker-offset|margin|marks|max-height|max-width|min-height|" +
+        "min-width|-moz-border-radius|opacity|orphans|outline-color|outline-offset|outline-radius|" +
+        "outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|" +
+        "padding-left|padding-right|padding-top|padding|page-break-after|" +
+        "page-break-before|page-break-inside|page|pause-after|pause-before|" +
+        "pause|pitch-range|pitch|play-during|pointer-events|position|quotes|resize|richness|right|" +
+        "size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|" +
+        "stress|table-layout|text-align|text-decoration|text-indent|" +
+        "text-shadow|text-transform|top|transform|unicode-bidi|vertical-align|" +
+        "visibility|voice-family|volume|white-space|widows|width|word-spacing|" +
+        "z-index").split("|")
+    );
+
+    var functions = lang.arrayToMap(
+        ("rgb|rgba|url|attr|counter|counters").split("|")
+    );
+
+    var constants = lang.arrayToMap(
+        ("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|" +
+        "block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|" +
+        "char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|" +
+        "decimal-leading-zero|decimal|default|disabled|disc|" +
+        "distribute-all-lines|distribute-letter|distribute-space|" +
+        "distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|" +
+        "hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|" +
+        "ideograph-alpha|ideograph-numeric|ideograph-parenthesis|" +
+        "ideograph-space|inactive|inherit|inline-block|inline|inset|inside|" +
+        "inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|" +
+        "keep-all|left|lighter|line-edge|line-through|line|list-item|loose|" +
+        "lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|" +
+        "medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|" +
+        "nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|" +
+        "overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|" +
+        "ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|" +
+        "solid|square|static|strict|super|sw-resize|table-footer-group|" +
+        "table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|" +
+        "transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|" +
+        "vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|" +
+        "zero").split("|")
+    );
+
+    var colors = lang.arrayToMap(
+        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
+        "purple|red|silver|teal|white|yellow").split("|")
+    );
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
+
+    var base_ruleset = [
+        {
+            token : "comment", // multi line comment
+            merge : true,
+            regex : "\\/\\*",
+            next : "ruleset_comment"
+        },{
+            token : "string", // single line
+            regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+        }, {
+            token : "string", // single line
+            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+        }, {
+            token : "constant.numeric",
+            regex : numRe + "(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"
+        }, {
+            token : "constant.numeric",  // hex6 color
+            regex : "#[a-f0-9]{6}"
+        }, {
+            token : "constant.numeric", // hex3 color
+            regex : "#[a-f0-9]{3}"
+        }, {
+            token : function(value) {
+                if (properties.hasOwnProperty(value.toLowerCase())) {
+                    return "support.type";
+                }
+                else if (functions.hasOwnProperty(value.toLowerCase())) {
+                    return "support.function";
+                }
+                else if (constants.hasOwnProperty(value.toLowerCase())) {
+                    return "support.constant";
+                }
+                else if (colors.hasOwnProperty(value.toLowerCase())) {
+                    return "support.constant.color";
+                }
+                else {
+                    return "text";
+                }
+            },
+            regex : "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
+        }
+      ];
+
+    var ruleset = lang.copyArray(base_ruleset);
+    ruleset.unshift({
+        token : "paren.rparen",
+        regex : "\\}",
+        next:   "start"
+    });
+
+    var media_ruleset = lang.copyArray( base_ruleset );
+    media_ruleset.unshift({
+        token : "paren.rparen",
+        regex : "\\}",
+        next:   "media"
+    });
+
+    var base_comment = [{
+          token : "comment", // comment spanning whole line
+          merge : true,
+          regex : ".+"
+    }];
+
+    var comment = lang.copyArray(base_comment);
+    comment.unshift({
+          token : "comment", // closing comment
+          regex : ".*?\\*\\/",
+          next : "start"
+    });
+
+    var media_comment = lang.copyArray(base_comment);
+    media_comment.unshift({
+          token : "comment", // closing comment
+          regex : ".*?\\*\\/",
+          next : "media"
+    });
+
+    var ruleset_comment = lang.copyArray(base_comment);
+    ruleset_comment.unshift({
+          token : "comment", // closing comment
+          regex : ".*?\\*\\/",
+          next : "ruleset"
+    });
+
+    this.$rules = {
+        "start" : [{
+            token : "comment", // multi line comment
+            merge : true,
+            regex : "\\/\\*",
+            next : "comment"
+        }, {
+            token: "paren.lparen",
+            regex: "\\{",
+            next:  "ruleset"
+        }, {
+            token: "string",
+            regex: "@.*?{",
+            next:  "media"
+        },{
+            token: "keyword",
+            regex: "#[a-z0-9-_]+"
+        },{
+            token: "variable",
+            regex: "\\.[a-z0-9-_]+"
+        },{
+            token: "string",
+            regex: ":[a-z0-9-_]+"
+        },{
+            token: "constant",
+            regex: "[a-z0-9-_]+"
+        }],
+
+        "media" : [ {
+            token : "comment", // multi line comment
+            merge : true,
+            regex : "\\/\\*",
+            next : "media_comment"
+        }, {
+            token: "paren.lparen",
+            regex: "\\{",
+            next:  "media_ruleset"
+        },{
+            token: "string",
+            regex: "\\}",
+            next:  "start"
+        },{
+            token: "keyword",
+            regex: "#[a-z0-9-_]+"
+        },{
+            token: "variable",
+            regex: "\\.[a-z0-9-_]+"
+        },{
+            token: "string",
+            regex: ":[a-z0-9-_]+"
+        },{
+            token: "constant",
+            regex: "[a-z0-9-_]+"
+        }],
+
+        "comment" : comment,
+
+        "ruleset" : ruleset,
+        "ruleset_comment" : ruleset_comment,
+
+        "media_ruleset" : media_ruleset,
+        "media_comment" : media_comment
+    };
+};
+
+oop.inherits(CssHighlightRules, TextHighlightRules);
+
+exports.CssHighlightRules = CssHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/html_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/css_highlight_rules', 'ace/mode/javascript_highlight_rules', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
+var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
+var xmlUtil = require("./xml_util");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var HtmlHighlightRules = function() {
+
+    // regexp must not have capturing parentheses
+    // regexps are ordered -> the first match is used
+    this.$rules = {
+        start : [{
+            token : "text",
+            merge : true,
+            regex : "<\\!\\[CDATA\\[",
+            next : "cdata"
+        }, {
+            token : "xml_pe",
+            regex : "<\\?.*?\\?>"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : "<\\!--",
+            next : "comment"
+        }, {
+            token : "meta.tag",
+            regex : "<(?=\s*script\\b)",
+            next : "script"
+        }, {
+            token : "meta.tag",
+            regex : "<(?=\s*style\\b)",
+            next : "css"
+        }, {
+            token : "meta.tag", // opening tag
+            regex : "<\\/?",
+            next : "tag"
+        }, {
+            token : "text",
+            regex : "\\s+"
+        }, {
+            token : "text",
+            regex : "[^<]+"
+        } ],
+    
+        cdata : [ {
+            token : "text",
+            regex : "\\]\\]>",
+            next : "start"
+        }, {
+            token : "text",
+            merge : true,
+            regex : "\\s+"
+        }, {
+            token : "text",
+            merge : true,
+            regex : ".+"
+        } ],
+
+        comment : [ {
+            token : "comment",
+            regex : ".*?-->",
+            next : "start"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : ".+"
+        } ]
+    };
+    
+    xmlUtil.tag(this.$rules, "tag", "start");
+    xmlUtil.tag(this.$rules, "css", "css-start");
+    xmlUtil.tag(this.$rules, "script", "js-start");
+    
+    this.embedRules(JavaScriptHighlightRules, "js-", [{
+        token: "comment",
+        regex: "\\/\\/.*(?=<\\/script>)",
+        next: "tag"
+    }, {
+        token: "meta.tag",
+        regex: "<\\/(?=script)",
+        next: "tag"
+    }]);
+    
+    this.embedRules(CssHighlightRules, "css-", [{
+        token: "meta.tag",
+        regex: "<\\/(?=style)",
+        next: "tag"
+    }]);
+};
+
+oop.inherits(HtmlHighlightRules, TextHighlightRules);
+
+exports.HtmlHighlightRules = HtmlHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
+"use strict";
+
+var lang = require("../lib/lang");
+
+var formTags = lang.arrayToMap(
+    ("button|form|input|label|select|textarea").split("|")
+);
+
+var tableTags = lang.arrayToMap(
+    ("table|tbody|td|tfoot|th|tr").split("|")
+);
+
+function string(state) {
+    return [{
+        token : "string",
+        regex : '".*?"'
+    }, {
+        token : "string", // multi line string start
+        merge : true,
+        regex : '["].*',
+        next : state + "-qqstring"
+    }, {
+        token : "string",
+        regex : "'.*?'"
+    }, {
+        token : "string", // multi line string start
+        merge : true,
+        regex : "['].*",
+        next : state + "-qstring"
+    }];
+}
+
+function multiLineString(quote, state) {
+    return [{
+        token : "string",
+        merge : true,
+        regex : ".*?" + quote,
+        next : state
+    }, {
+        token : "string",
+        merge : true,
+        regex : '.+'
+    }];
+}
+
+exports.tag = function(states, name, nextState) {
+    states[name] = [{
+        token : "text",
+        regex : "\\s+"
+    }, {
+        //token : "meta.tag",
+        
+    token : function(value) {
+            if ( value==='a' ) {
+                return "meta.tag.anchor";
+            }
+            else if ( value==='img' ) {
+                return "meta.tag.image";
+            }
+            else if ( value==='script' ) {
+                return "meta.tag.script";
+            }
+            else if ( value==='style' ) {
+                return "meta.tag.style";
+            }
+            else if (formTags.hasOwnProperty(value.toLowerCase())) {
+                return "meta.tag.form";
+            }
+            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
+                return "meta.tag.table";
+            }
+            else {
+                return "meta.tag";
+            }
+        },        
+        merge : true,
+        regex : "[-_a-zA-Z0-9:!]+",
+        next : name + "embed-attribute-list" 
+    }, {
+        token: "empty",
+        regex: "",
+        next : name + "embed-attribute-list"
+    }];
+
+    states[name + "-qstring"] = multiLineString("'", name + "embed-attribute-list");
+    states[name + "-qqstring"] = multiLineString("\"", name + "embed-attribute-list");
+    
+    states[name + "embed-attribute-list"] = [{
+        token : "meta.tag",
+        merge : true,
+        regex : "\/?>",
+        next : nextState
+    }, {
+        token : "keyword.operator",
+        regex : "="
+    }, {
+        token : "entity.other.attribute-name",
+        regex : "[-_a-zA-Z0-9:]+"
+    }, {
+        token : "constant.numeric", // float
+        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+    }, {
+        token : "text",
+        regex : "\\s+"
+    }].concat(string(name));
+};
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require("../behaviour").Behaviour;
+var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
+
+var XmlBehaviour = function () {
+    
+    this.inherit(CstyleBehaviour, ["string_dquotes"]); // Get string behaviour
+    
+    this.add("brackets", "insertion", function (state, action, editor, session, text) {
+        if (text == '<') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return false;
+            } else {
+                return {
+                    text: '<>',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '>') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '>') { // need some kind of matching check here
+                return {
+                    text: '',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChars = line.substring(cursor.column, cursor.column + 2);
+            if (rightChars == '</') {
+                var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
+                var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+    
+}
+oop.inherits(XmlBehaviour, Behaviour);
+
+exports.XmlBehaviour = XmlBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/html', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/mixed', 'ace/mode/folding/xml', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var MixedFoldMode = require("./mixed").FoldMode;
+var XmlFoldMode = require("./xml").FoldMode;
+var CStyleFoldMode = require("./cstyle").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {
+    MixedFoldMode.call(this, new XmlFoldMode({
+        // void elements
+        "area": 1,
+        "base": 1,
+        "br": 1,
+        "col": 1,
+        "command": 1,
+        "embed": 1,
+        "hr": 1,
+        "img": 1,
+        "input": 1,
+        "keygen": 1,
+        "link": 1,
+        "meta": 1,
+        "param": 1,
+        "source": 1,
+        "track": 1,
+        "wbr": 1,
+        
+        // optional tags 
+        "li": 1,
+        "dt": 1,
+        "dd": 1,
+        "p": 1,
+        "rt": 1,
+        "rp": 1,
+        "optgroup": 1,
+        "option": 1,
+        "colgroup": 1,
+        "td": 1,
+        "th": 1
+    }), {
+        "js-": new CStyleFoldMode(),
+        "css-": new CStyleFoldMode()
+    });
+};
+
+oop.inherits(FoldMode, MixedFoldMode);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/mixed', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function(defaultMode, subModes) {
+    this.defaultMode = defaultMode;
+    this.subModes = subModes;
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+
+    this.$getMode = function(state) {
+        for (var key in this.subModes) {
+            if (state.indexOf(key) === 0)
+                return this.subModes[key];
+        }
+        return null;
+    };
+    
+    this.$tryMode = function(state, session, foldStyle, row) {
+        var mode = this.$getMode(state);
+        return (mode ? mode.getFoldWidget(session, foldStyle, row) : "");
+    };
+
+    this.getFoldWidget = function(session, foldStyle, row) {
+        return (
+            this.$tryMode(session.getState(row-1), session, foldStyle, row) ||
+            this.$tryMode(session.getState(row), session, foldStyle, row) ||
+            this.defaultMode.getFoldWidget(session, foldStyle, row)
+        );
+    };
+
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var mode = this.$getMode(session.getState(row-1));
+        
+        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
+            mode = this.$getMode(session.getState(row));
+        
+        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
+            mode = this.defaultMode;
+        
+        return mode.getFoldWidgetRange(session, foldStyle, row);
+    };
+
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/range', 'ace/mode/folding/fold_mode', 'ace/token_iterator'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var lang = require("../../lib/lang");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+var TokenIterator = require("../../token_iterator").TokenIterator;
+
+var FoldMode = exports.FoldMode = function(voidElements) {
+    BaseFoldMode.call(this);
+    this.voidElements = voidElements || {};
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var tag = this._getFirstTagInLine(session, row);
+
+        if (tag.closing)
+            return foldStyle == "markbeginend" ? "end" : "";
+
+        if (!tag.tagName || this.voidElements[tag.tagName.toLowerCase()])
+            return "";
+
+        if (tag.selfClosing)
+            return "";
+
+        if (tag.value.indexOf("/" + tag.tagName) !== -1)
+            return "";
+
+        return "start";
+    };
+    
+    this._getFirstTagInLine = function(session, row) {
+        var tokens = session.getTokens(row, row)[0].tokens;
+        var value = "";
+        for (var i = 0; i < tokens.length; i++) {
+            var token = tokens[i];
+            if (token.type.indexOf("meta.tag") === 0)
+                value += token.value;
+            else
+                value += lang.stringRepeat(" ", token.value.length);
+        }
+        
+        return this._parseTag(value);
+    };
+
+    this.tagRe = /^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/;
+    this._parseTag = function(tag) {
+        
+        var match = this.tagRe.exec(tag);
+        var column = this.tagRe.lastIndex || 0;
+        this.tagRe.lastIndex = 0;
+
+        return {
+            value: tag,
+            match: match ? match[2] : "",
+            closing: match ? !!match[3] : false,
+            selfClosing: match ? !!match[5] || match[2] == "/>" : false,
+            tagName: match ? match[4] : "",
+            column: match[1] ? column + match[1].length : column
+        };
+    };
+    
+    /**
+     * reads a full tag and places the iterator after the tag
+     */
+    this._readTagForward = function(iterator) {
+        var token = iterator.getCurrentToken();
+        if (!token)
+            return null;
+            
+        var value = "";
+        var start;
+        
+        do {
+            if (token.type.indexOf("meta.tag") === 0) {
+                if (!start) {
+                    var start = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn()
+                    };
+                }
+                value += token.value;
+                if (value.indexOf(">") !== -1) {
+                    var tag = this._parseTag(value);
+                    tag.start = start;
+                    tag.end = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn() + token.value.length
+                    };
+                    iterator.stepForward();
+                    return tag;
+                }
+            }
+        } while(token = iterator.stepForward());
+        
+        return null;
+    };
+    
+    this._readTagBackward = function(iterator) {
+        var token = iterator.getCurrentToken();
+        if (!token)
+            return null;
+            
+        var value = "";
+        var end;
+
+        do {
+            if (token.type.indexOf("meta.tag") === 0) {
+                if (!end) {
+                    end = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn() + token.value.length
+                    };
+                }
+                value = token.value + value;
+                if (value.indexOf("<") !== -1) {
+                    var tag = this._parseTag(value);
+                    tag.end = end;
+                    tag.start = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn()
+                    };
+                    iterator.stepBackward();
+                    return tag;
+                }
+            }
+        } while(token = iterator.stepBackward());
+        
+        return null;
+    };
+    
+    this._pop = function(stack, tag) {
+        while (stack.length) {
+            
+            var top = stack[stack.length-1];
+            if (!tag || top.tagName == tag.tagName) {
+                return stack.pop();
+            }
+            else if (this.voidElements[tag.tagName]) {
+                return;
+            }
+            else if (this.voidElements[top.tagName]) {
+                stack.pop();
+                continue;
+            } else {
+                return null;
+            }
+        }
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var firstTag = this._getFirstTagInLine(session, row);
+        
+        if (!firstTag.match)
+            return null;
+        
+        var isBackward = firstTag.closing || firstTag.selfClosing;
+        var stack = [];
+        var tag;
+        
+        if (!isBackward) {
+            var iterator = new TokenIterator(session, row, firstTag.column);
+            var start = {
+                row: row,
+                column: firstTag.column + firstTag.tagName.length + 2
+            };
+            while (tag = this._readTagForward(iterator)) {
+                if (tag.selfClosing) {
+                    if (!stack.length) {
+                        tag.start.column += tag.tagName.length + 2;
+                        tag.end.column -= 2;
+                        return Range.fromPoints(tag.start, tag.end);
+                    } else
+                        continue;
+                }
+                
+                if (tag.closing) {
+                    this._pop(stack, tag);
+                    if (stack.length == 0)
+                        return Range.fromPoints(start, tag.start);
+                }
+                else {
+                    stack.push(tag)
+                }
+            }
+        }
+        else {
+            var iterator = new TokenIterator(session, row, firstTag.column + firstTag.match.length);
+            var end = {
+                row: row,
+                column: firstTag.column
+            };
+            
+            while (tag = this._readTagBackward(iterator)) {
+                if (tag.selfClosing) {
+                    if (!stack.length) {
+                        tag.start.column += tag.tagName.length + 2;
+                        tag.end.column -= 2;
+                        return Range.fromPoints(tag.start, tag.end);
+                    } else
+                        continue;
+                }
+                
+                if (!tag.closing) {
+                    this._pop(stack, tag);
+                    if (stack.length == 0) {
+                        tag.start.column += tag.tagName.length + 2;
+                        return Range.fromPoints(tag.start, end);
+                    }
+                }
+                else {
+                    stack.push(tag)
+                }
+            }
+        }
+        
+    };
+
+}).call(FoldMode.prototype);
+
+});;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-java-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-java-uncompressed.js
new file mode 100755
index 00000000000..7263df5894c
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-java-uncompressed.js
@@ -0,0 +1,1464 @@
+define('ace/mode/java', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/javascript', 'ace/tokenizer', 'ace/mode/java_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var JavaScriptMode = require("./javascript").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var JavaHighlightRules = require("./java_highlight_rules").JavaHighlightRules;
+
+var Mode = function() {
+    JavaScriptMode.call(this);
+    
+    this.$tokenizer = new Tokenizer(new JavaHighlightRules().getRules());
+};
+oop.inherits(Mode, JavaScriptMode);
+
+(function() {
+    
+    this.createWorker = function(session) {
+        return null;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var Range = require("../range").Range;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var re = /^(\s*)\/\//;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i);
+                var m = line.match(re);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, "//");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+        var endState = tokenizedLine.state;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+        
+        if (state == "start" || state == "regex_allowed") {
+            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        } else if (state == "doc-start") {
+            if (endState == "start" || state == "regex_allowed") {
+                return "";
+            }
+            var match = line.match(/^\s*(\/?)\*/);
+            if (match) {
+                if (match[1]) {
+                    indent += " ";
+                }
+                indent += "* ";
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+    
+    this.createWorker = function(session) {
+        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
+        worker.attachToDocument(session.getDocument());
+            
+        worker.on("jslint", function(results) {
+            var errors = [];
+            for (var i=0; i<results.data.length; i++) {
+                var error = results.data[i];
+                if (error)
+                    errors.push({
+                        row: error.line-1,
+                        column: error.character-1,
+                        text: error.reason,
+                        type: "warning",
+                        lint: error
+                    });
+            }
+            session.setAnnotations(errors);
+        });
+        
+        worker.on("narcissus", function(e) {
+            session.setAnnotations([e.data]);
+        });
+        
+        worker.on("terminate", function() {
+            session.clearAnnotations();
+        });
+        
+        return worker;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var unicode = require("../unicode");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var JavaScriptHighlightRules = function() {
+
+    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
+    var globals = lang.arrayToMap(
+      // Constructors
+        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
+      // E4X
+         "Namespace|QName|XML|XMLList|" +
+         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
+         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
+      // Errors
+        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
+        "SyntaxError|TypeError|URIError|" +
+      //  Non-constructor functions
+        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
+        "isNaN|parseFloat|parseInt|" +
+      // Other
+        "JSON|Math|" +
+      // Pseudo
+        "this|arguments|prototype|window|document"
+      ).split("|")
+    );
+
+    var keywords = lang.arrayToMap(
+        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
+        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
+        "const|yield|import|get|set").split("|")
+    );
+
+    // keywords which can be followed by regular expressions
+    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
+
+    var deprecated = lang.arrayToMap(
+        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
+    );
+
+    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
+
+    var buildinConstants = lang.arrayToMap(
+        ("null|Infinity|NaN|undefined").split("|")
+    );
+
+    var futureReserved = lang.arrayToMap(
+        ("class|enum|extends|super|export|implements|private|" +
+        "public|interface|package|protected|static").split("|")
+    );
+
+    // TODO: Unicode escape sequences
+    var identifierRe = "[" + unicode.packages.L + "\\$_][" 
+        + unicode.packages.L
+        + unicode.packages.Mn + unicode.packages.Mc
+        + unicode.packages.Nd
+        + unicode.packages.Pc + "\\$_]*\\b";
+        
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            new DocCommentHighlightRules().getStartRule("doc-start"),
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : '["].*\\\\$',
+                next : "qqstring"
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : "['].*\\\\$",
+                next : "qstring"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : ["keyword.definition", "text", "entity.name.function"],
+                regex : "(function)(\\s+)(" + identifierRe + ")"
+            }, {
+                token : "constant.language.boolean",
+                regex : "(?:true|false)\\b"
+            }, {
+                token : "keyword",
+                regex : "(?:" + kwBeforeRe + ")\\b",
+                next : "regex_allowed"
+            }, {
+                token : function(value) {
+                    if (globals.hasOwnProperty(value))
+                        return "variable.language";
+                    else if (deprecated.hasOwnProperty(value))
+                        return "invalid.deprecated";
+                    else if (definitions.hasOwnProperty(value))
+                        return "keyword.definition";
+                    else if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else if (futureReserved.hasOwnProperty(value))
+                        return "invalid.illegal";
+                    else if (value == "debugger")
+                        return "invalid.deprecated";
+                    else
+                        return "identifier";
+                },
+                regex : identifierRe
+            }, {
+                token : "keyword.operator",
+                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",
+                next  : "regex_allowed"
+            }, {
+                token : "punctuation.operator",
+                regex : "\\?|\\:|\\,|\\;|\\.",
+                next  : "regex_allowed"
+            }, {
+                token : "paren.lparen",
+                regex : "[[({]",
+                next  : "regex_allowed"
+            }, {
+                token : "paren.rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "keyword.operator",
+                regex : "\\/=?",
+                next  : "regex_allowed"
+            }, {
+                token: "comment",
+                regex: "^#!.*$" 
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        // regular expressions are only allowed after certain tokens. This
+        // makes sure we don't mix up regexps with the divison operator
+        "regex_allowed": [
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment_regex_allowed"
+            }, {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            }, {
+                token: "string.regexp",
+                regex: "\\/",
+                next: "regex",
+                merge: true
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }, {
+                // immediately return to the start mode without matching
+                // anything
+                token: "empty", 
+                regex: "",
+                next: "start"
+            }
+        ],
+        "regex": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
+                next: "regex"
+            }, {
+				// flag
+                token: "string.regexp", 
+                regex: "/\\w*",
+                next: "start",
+                merge: true 
+            }, {
+                token: "string.regexp",
+                regex: "[^\\\\/\\[]+",
+                next: "regex",
+                merge: true
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "\\[",
+                next: "regex_character_class",
+                merge: true
+            }, {
+                token: "empty", 
+                regex: "",
+                next: "start" 
+            }
+        ],
+        "regex_character_class": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
+                next: "regex_character_class"
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "]",
+                next: "regex",
+                merge: true
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "[^\\\\\\]]+",
+                next: "regex_character_class",
+                merge: true
+            }, {
+                token: "empty", 
+                regex: "",
+                next: "start" 
+            }
+        ],
+        "comment_regex_allowed" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                merge : true,
+                next : "regex_allowed"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                merge : true,
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "qqstring" : [
+            {
+                token : "string",
+                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ],
+        "qstring" : [
+            {
+                token : "string",
+                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ]
+    };
+    
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ new DocCommentHighlightRules().getEndRule("start") ]);
+};
+
+oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
+
+exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var DocCommentHighlightRules = function() {
+
+    this.$rules = {
+        "start" : [ {
+            token : "comment.doc.tag",
+            regex : "@[\\w\\d_]+" // TODO: fix email addresses
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "\\s+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "TODO"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "[^@\\*]+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "."
+        }]
+    };
+};
+
+oop.inherits(DocCommentHighlightRules, TextHighlightRules);
+
+(function() {
+
+    this.getStartRule = function(start) {
+        return {
+            token : "comment.doc", // doc comment
+            merge : true,
+            regex : "\\/\\*(?=\\*)",
+            next  : start
+        };
+    };
+    
+    this.getEndRule = function (start) {
+        return {
+            token : "comment.doc", // closing comment
+            merge : true,
+            regex : "\\*\\/",
+            next  : start
+        };
+    };
+
+}).call(DocCommentHighlightRules.prototype);
+
+exports.DocCommentHighlightRules = DocCommentHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/worker/worker_client', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var EventEmitter = require("../lib/event_emitter").EventEmitter;
+
+var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
+
+    this.changeListener = this.changeListener.bind(this);
+
+    if (module.packaged) {
+        var base = this.$guessBasePath();
+        this.$worker = new Worker(base + packagedJs);
+    }
+    else {
+        var workerUrl = this.$normalizePath(require.nameToUrl("ace/worker/worker", null, "_"));
+        this.$worker = new Worker(workerUrl);
+
+        var tlns = {};
+        for (var i=0; i<topLevelNamespaces.length; i++) {
+            var ns = topLevelNamespaces[i];
+            var path = this.$normalizePath(require.nameToUrl(ns, null, "_").replace(/.js$/, ""));
+
+            tlns[ns] = path;
+        }
+    }
+
+    this.$worker.postMessage({
+        init : true,
+        tlns: tlns,
+        module: mod,
+        classname: classname
+    });
+
+    this.callbackId = 1;
+    this.callbacks = {};
+
+    var _self = this;
+    this.$worker.onerror = function(e) {
+        window.console && console.log && console.log(e);
+        throw e;
+    };
+    this.$worker.onmessage = function(e) {
+        var msg = e.data;
+        switch(msg.type) {
+            case "log":
+                window.console && console.log && console.log(msg.data);
+                break;
+
+            case "event":
+                _self._emit(msg.name, {data: msg.data});
+                break;
+
+            case "call":
+                var callback = _self.callbacks[msg.id];
+                if (callback) {
+                    callback(msg.data);
+                    delete _self.callbacks[msg.id];
+                }
+                break;
+        }
+    };
+};
+
+(function(){
+
+    oop.implement(this, EventEmitter);
+
+    this.$normalizePath = function(path) {
+        path = path.replace(/^[a-z]+:\/\/[^\/]+\//, ""); // Remove domain name and rebuild it
+        path = location.protocol + "//" + location.host
+            // paths starting with a slash are relative to the root (host)
+            + (path.charAt(0) == "/" ? "" : location.pathname.replace(/\/[^\/]*$/, ""))
+            + "/" + path.replace(/^[\/]+/, "");
+        return path;
+    };
+
+    this.$guessBasePath = function() {
+        if (require.aceBaseUrl)
+            return require.aceBaseUrl;
+
+        var scripts = document.getElementsByTagName("script");
+        for (var i=0; i<scripts.length; i++) {
+            var script = scripts[i];
+
+            var base = script.getAttribute("data-ace-base");
+            if (base)
+                return base.replace(/\/*$/, "/");
+
+            var src = script.src || script.getAttribute("src");
+            if (!src) {
+                continue;
+            }
+            var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);
+            if (m)
+                return m[1] || m[2];
+        }
+        return "";
+    };
+
+    this.terminate = function() {
+        this._emit("terminate", {});
+        this.$worker.terminate();
+        this.$worker = null;
+        this.$doc.removeEventListener("change", this.changeListener);
+        this.$doc = null;
+    };
+
+    this.send = function(cmd, args) {
+        this.$worker.postMessage({command: cmd, args: args});
+    };
+
+    this.call = function(cmd, args, callback) {
+        if (callback) {
+            var id = this.callbackId++;
+            this.callbacks[id] = callback;
+            args.push(id);
+        }
+        this.send(cmd, args);
+    };
+
+    this.emit = function(event, data) {
+        try {
+            // firefox refuses to clone objects which have function properties
+            // TODO: cleanup event
+            this.$worker.postMessage({event: event, data: {data: data.data}});
+        }
+        catch(ex) {}
+    };
+
+    this.attachToDocument = function(doc) {
+        if(this.$doc)
+            this.terminate();
+
+        this.$doc = doc;
+        this.call("setValue", [doc.getValue()]);
+        doc.on("change", this.changeListener);
+    };
+
+    this.changeListener = function(e) {
+        e.range = {
+            start: e.data.range.start,
+            end: e.data.range.end
+        };
+        this.emit("change", e);
+    };
+
+}).call(WorkerClient.prototype);
+
+exports.WorkerClient = WorkerClient;
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require('../behaviour').Behaviour;
+
+var CstyleBehaviour = function () {
+
+    this.add("braces", "insertion", function (state, action, editor, session, text) {
+        if (text == '{') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '}') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return null;
+
+                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
+                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+
+    this.add("braces", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '{') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.end.column, range.end.column + 1);
+            if (rightChar == '}') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("parens", "insertion", function (state, action, editor, session, text) {
+        if (text == '(') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '()',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == ')') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == ')') {
+                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("parens", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '(') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == ')') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '"' + selected + '"',
+                    selection: false
+                }
+            } else {
+                var cursor = editor.getCursorPosition();
+                var line = session.doc.getLine(cursor.row);
+                var leftChar = line.substring(cursor.column-1, cursor.column);
+
+                // We're escaped.
+                if (leftChar == '\\') {
+                    return null;
+                }
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf('"');
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
+                    return {
+                        text: '""',
+                        selection: [1,1]
+                    }
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == '"') {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '"') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == '"') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+}
+oop.inherits(CstyleBehaviour, Behaviour);
+
+exports.CstyleBehaviour = CstyleBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+define('ace/mode/java_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var JavaHighlightRules = function() {
+
+    // taken from http://download.oracle.com/javase/tutorial/java/nutsandbolts/_keywords.html
+    var keywords = lang.arrayToMap(
+    ("abstract|continue|for|new|switch|" +
+    "assert|default|goto|package|synchronized|" +
+    "boolean|do|if|private|this|" +
+    "break|double|implements|protected|throw|" +
+    "byte|else|import|public|throws|" +
+    "case|enum|instanceof|return|transient|" +
+    "catch|extends|int|short|try|" +
+    "char|final|interface|static|void|" +
+    "class|finally|long|strictfp|volatile|" +
+    "const|float|native|super|while").split("|")
+    );
+
+    var buildinConstants = lang.arrayToMap(
+        ("null|Infinity|NaN|undefined").split("|")
+    );
+
+    var langClasses = lang.arrayToMap(
+        ("AbstractMethodError|AssertionError|ClassCircularityError|"+
+        "ClassFormatError|Deprecated|EnumConstantNotPresentException|"+
+        "ExceptionInInitializerError|IllegalAccessError|"+
+        "IllegalThreadStateException|InstantiationError|InternalError|"+
+        "NegativeArraySizeException|NoSuchFieldError|Override|Process|"+
+        "ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|"+
+        "SuppressWarnings|TypeNotPresentException|UnknownError|"+
+        "UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|"+
+        "InstantiationException|IndexOutOfBoundsException|"+
+        "ArrayIndexOutOfBoundsException|CloneNotSupportedException|"+
+        "NoSuchFieldException|IllegalArgumentException|NumberFormatException|"+
+        "SecurityException|Void|InheritableThreadLocal|IllegalStateException|"+
+        "InterruptedException|NoSuchMethodException|IllegalAccessException|"+
+        "UnsupportedOperationException|Enum|StrictMath|Package|Compiler|"+
+        "Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|"+
+        "NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|"+
+        "NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|"+
+        "Character|Boolean|StackTraceElement|Appendable|StringBuffer|"+
+        "Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|"+
+        "StackOverflowError|OutOfMemoryError|VirtualMachineError|"+
+        "ArrayStoreException|ClassCastException|LinkageError|"+
+        "NoClassDefFoundError|ClassNotFoundException|RuntimeException|"+
+        "Exception|ThreadDeath|Error|Throwable|System|ClassLoader|"+
+        "Cloneable|Class|CharSequence|Comparable|String|Object").split("|")
+    );
+    
+    var importClasses = lang.arrayToMap(
+        ("").split("|")
+    );
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            new DocCommentHighlightRules().getStartRule("doc-start"),
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
+                token : "string.regexp",
+                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : "constant.language.boolean",
+                regex : "(?:true|false)\\b"
+            }, {
+                token : function(value) {
+                    if (value == "this")
+                        return "variable.language";
+                    else if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (langClasses.hasOwnProperty(value))
+                        return "support.function";
+                    else if (importClasses.hasOwnProperty(value))
+                        return "support.function";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else
+                        return "identifier";
+                },
+                // TODO: Unicode escape sequences
+                // TODO: Unicode identifiers
+                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+            }, {
+                token : "keyword.operator",
+                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+            }, {
+                token : "lparen",
+                regex : "[[({]"
+            }, {
+                token : "rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ]
+    };
+    
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ new DocCommentHighlightRules().getEndRule("start") ]);
+};
+
+oop.inherits(JavaHighlightRules, TextHighlightRules);
+
+exports.JavaHighlightRules = JavaHighlightRules;
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-javascript-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-javascript-uncompressed.js
new file mode 100755
index 00000000000..ba30b9e438f
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-javascript-uncompressed.js
@@ -0,0 +1,1295 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var Range = require("../range").Range;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var re = /^(\s*)\/\//;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i);
+                var m = line.match(re);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, "//");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+        var endState = tokenizedLine.state;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+        
+        if (state == "start" || state == "regex_allowed") {
+            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        } else if (state == "doc-start") {
+            if (endState == "start" || state == "regex_allowed") {
+                return "";
+            }
+            var match = line.match(/^\s*(\/?)\*/);
+            if (match) {
+                if (match[1]) {
+                    indent += " ";
+                }
+                indent += "* ";
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+    
+    this.createWorker = function(session) {
+        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
+        worker.attachToDocument(session.getDocument());
+            
+        worker.on("jslint", function(results) {
+            var errors = [];
+            for (var i=0; i<results.data.length; i++) {
+                var error = results.data[i];
+                if (error)
+                    errors.push({
+                        row: error.line-1,
+                        column: error.character-1,
+                        text: error.reason,
+                        type: "warning",
+                        lint: error
+                    });
+            }
+            session.setAnnotations(errors);
+        });
+        
+        worker.on("narcissus", function(e) {
+            session.setAnnotations([e.data]);
+        });
+        
+        worker.on("terminate", function() {
+            session.clearAnnotations();
+        });
+        
+        return worker;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var unicode = require("../unicode");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var JavaScriptHighlightRules = function() {
+
+    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
+    var globals = lang.arrayToMap(
+      // Constructors
+        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
+      // E4X
+         "Namespace|QName|XML|XMLList|" +
+         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
+         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
+      // Errors
+        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
+        "SyntaxError|TypeError|URIError|" +
+      //  Non-constructor functions
+        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
+        "isNaN|parseFloat|parseInt|" +
+      // Other
+        "JSON|Math|" +
+      // Pseudo
+        "this|arguments|prototype|window|document"
+      ).split("|")
+    );
+
+    var keywords = lang.arrayToMap(
+        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
+        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
+        "const|yield|import|get|set").split("|")
+    );
+
+    // keywords which can be followed by regular expressions
+    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
+
+    var deprecated = lang.arrayToMap(
+        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
+    );
+
+    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
+
+    var buildinConstants = lang.arrayToMap(
+        ("null|Infinity|NaN|undefined").split("|")
+    );
+
+    var futureReserved = lang.arrayToMap(
+        ("class|enum|extends|super|export|implements|private|" +
+        "public|interface|package|protected|static").split("|")
+    );
+
+    // TODO: Unicode escape sequences
+    var identifierRe = "[" + unicode.packages.L + "\\$_][" 
+        + unicode.packages.L
+        + unicode.packages.Mn + unicode.packages.Mc
+        + unicode.packages.Nd
+        + unicode.packages.Pc + "\\$_]*\\b";
+        
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            new DocCommentHighlightRules().getStartRule("doc-start"),
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : '["].*\\\\$',
+                next : "qqstring"
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : "['].*\\\\$",
+                next : "qstring"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : ["keyword.definition", "text", "entity.name.function"],
+                regex : "(function)(\\s+)(" + identifierRe + ")"
+            }, {
+                token : "constant.language.boolean",
+                regex : "(?:true|false)\\b"
+            }, {
+                token : "keyword",
+                regex : "(?:" + kwBeforeRe + ")\\b",
+                next : "regex_allowed"
+            }, {
+                token : function(value) {
+                    if (globals.hasOwnProperty(value))
+                        return "variable.language";
+                    else if (deprecated.hasOwnProperty(value))
+                        return "invalid.deprecated";
+                    else if (definitions.hasOwnProperty(value))
+                        return "keyword.definition";
+                    else if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else if (futureReserved.hasOwnProperty(value))
+                        return "invalid.illegal";
+                    else if (value == "debugger")
+                        return "invalid.deprecated";
+                    else
+                        return "identifier";
+                },
+                regex : identifierRe
+            }, {
+                token : "keyword.operator",
+                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",
+                next  : "regex_allowed"
+            }, {
+                token : "punctuation.operator",
+                regex : "\\?|\\:|\\,|\\;|\\.",
+                next  : "regex_allowed"
+            }, {
+                token : "paren.lparen",
+                regex : "[[({]",
+                next  : "regex_allowed"
+            }, {
+                token : "paren.rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "keyword.operator",
+                regex : "\\/=?",
+                next  : "regex_allowed"
+            }, {
+                token: "comment",
+                regex: "^#!.*$" 
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        // regular expressions are only allowed after certain tokens. This
+        // makes sure we don't mix up regexps with the divison operator
+        "regex_allowed": [
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment_regex_allowed"
+            }, {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            }, {
+                token: "string.regexp",
+                regex: "\\/",
+                next: "regex",
+                merge: true
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }, {
+                // immediately return to the start mode without matching
+                // anything
+                token: "empty", 
+                regex: "",
+                next: "start"
+            }
+        ],
+        "regex": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
+                next: "regex"
+            }, {
+				// flag
+                token: "string.regexp", 
+                regex: "/\\w*",
+                next: "start",
+                merge: true 
+            }, {
+                token: "string.regexp",
+                regex: "[^\\\\/\\[]+",
+                next: "regex",
+                merge: true
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "\\[",
+                next: "regex_character_class",
+                merge: true
+            }, {
+                token: "empty", 
+                regex: "",
+                next: "start" 
+            }
+        ],
+        "regex_character_class": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
+                next: "regex_character_class"
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "]",
+                next: "regex",
+                merge: true
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "[^\\\\\\]]+",
+                next: "regex_character_class",
+                merge: true
+            }, {
+                token: "empty", 
+                regex: "",
+                next: "start" 
+            }
+        ],
+        "comment_regex_allowed" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                merge : true,
+                next : "regex_allowed"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                merge : true,
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "qqstring" : [
+            {
+                token : "string",
+                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ],
+        "qstring" : [
+            {
+                token : "string",
+                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ]
+    };
+    
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ new DocCommentHighlightRules().getEndRule("start") ]);
+};
+
+oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
+
+exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var DocCommentHighlightRules = function() {
+
+    this.$rules = {
+        "start" : [ {
+            token : "comment.doc.tag",
+            regex : "@[\\w\\d_]+" // TODO: fix email addresses
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "\\s+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "TODO"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "[^@\\*]+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "."
+        }]
+    };
+};
+
+oop.inherits(DocCommentHighlightRules, TextHighlightRules);
+
+(function() {
+
+    this.getStartRule = function(start) {
+        return {
+            token : "comment.doc", // doc comment
+            merge : true,
+            regex : "\\/\\*(?=\\*)",
+            next  : start
+        };
+    };
+    
+    this.getEndRule = function (start) {
+        return {
+            token : "comment.doc", // closing comment
+            merge : true,
+            regex : "\\*\\/",
+            next  : start
+        };
+    };
+
+}).call(DocCommentHighlightRules.prototype);
+
+exports.DocCommentHighlightRules = DocCommentHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/worker/worker_client', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var EventEmitter = require("../lib/event_emitter").EventEmitter;
+
+var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
+
+    this.changeListener = this.changeListener.bind(this);
+
+    if (module.packaged) {
+        var base = this.$guessBasePath();
+        this.$worker = new Worker(base + packagedJs);
+    }
+    else {
+        var workerUrl = this.$normalizePath(require.nameToUrl("ace/worker/worker", null, "_"));
+        this.$worker = new Worker(workerUrl);
+
+        var tlns = {};
+        for (var i=0; i<topLevelNamespaces.length; i++) {
+            var ns = topLevelNamespaces[i];
+            var path = this.$normalizePath(require.nameToUrl(ns, null, "_").replace(/.js$/, ""));
+
+            tlns[ns] = path;
+        }
+    }
+
+    this.$worker.postMessage({
+        init : true,
+        tlns: tlns,
+        module: mod,
+        classname: classname
+    });
+
+    this.callbackId = 1;
+    this.callbacks = {};
+
+    var _self = this;
+    this.$worker.onerror = function(e) {
+        window.console && console.log && console.log(e);
+        throw e;
+    };
+    this.$worker.onmessage = function(e) {
+        var msg = e.data;
+        switch(msg.type) {
+            case "log":
+                window.console && console.log && console.log(msg.data);
+                break;
+
+            case "event":
+                _self._emit(msg.name, {data: msg.data});
+                break;
+
+            case "call":
+                var callback = _self.callbacks[msg.id];
+                if (callback) {
+                    callback(msg.data);
+                    delete _self.callbacks[msg.id];
+                }
+                break;
+        }
+    };
+};
+
+(function(){
+
+    oop.implement(this, EventEmitter);
+
+    this.$normalizePath = function(path) {
+        path = path.replace(/^[a-z]+:\/\/[^\/]+\//, ""); // Remove domain name and rebuild it
+        path = location.protocol + "//" + location.host
+            // paths starting with a slash are relative to the root (host)
+            + (path.charAt(0) == "/" ? "" : location.pathname.replace(/\/[^\/]*$/, ""))
+            + "/" + path.replace(/^[\/]+/, "");
+        return path;
+    };
+
+    this.$guessBasePath = function() {
+        if (require.aceBaseUrl)
+            return require.aceBaseUrl;
+
+        var scripts = document.getElementsByTagName("script");
+        for (var i=0; i<scripts.length; i++) {
+            var script = scripts[i];
+
+            var base = script.getAttribute("data-ace-base");
+            if (base)
+                return base.replace(/\/*$/, "/");
+
+            var src = script.src || script.getAttribute("src");
+            if (!src) {
+                continue;
+            }
+            var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);
+            if (m)
+                return m[1] || m[2];
+        }
+        return "";
+    };
+
+    this.terminate = function() {
+        this._emit("terminate", {});
+        this.$worker.terminate();
+        this.$worker = null;
+        this.$doc.removeEventListener("change", this.changeListener);
+        this.$doc = null;
+    };
+
+    this.send = function(cmd, args) {
+        this.$worker.postMessage({command: cmd, args: args});
+    };
+
+    this.call = function(cmd, args, callback) {
+        if (callback) {
+            var id = this.callbackId++;
+            this.callbacks[id] = callback;
+            args.push(id);
+        }
+        this.send(cmd, args);
+    };
+
+    this.emit = function(event, data) {
+        try {
+            // firefox refuses to clone objects which have function properties
+            // TODO: cleanup event
+            this.$worker.postMessage({event: event, data: {data: data.data}});
+        }
+        catch(ex) {}
+    };
+
+    this.attachToDocument = function(doc) {
+        if(this.$doc)
+            this.terminate();
+
+        this.$doc = doc;
+        this.call("setValue", [doc.getValue()]);
+        doc.on("change", this.changeListener);
+    };
+
+    this.changeListener = function(e) {
+        e.range = {
+            start: e.data.range.start,
+            end: e.data.range.end
+        };
+        this.emit("change", e);
+    };
+
+}).call(WorkerClient.prototype);
+
+exports.WorkerClient = WorkerClient;
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require('../behaviour').Behaviour;
+
+var CstyleBehaviour = function () {
+
+    this.add("braces", "insertion", function (state, action, editor, session, text) {
+        if (text == '{') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '}') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return null;
+
+                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
+                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+
+    this.add("braces", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '{') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.end.column, range.end.column + 1);
+            if (rightChar == '}') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("parens", "insertion", function (state, action, editor, session, text) {
+        if (text == '(') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '()',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == ')') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == ')') {
+                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("parens", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '(') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == ')') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '"' + selected + '"',
+                    selection: false
+                }
+            } else {
+                var cursor = editor.getCursorPosition();
+                var line = session.doc.getLine(cursor.row);
+                var leftChar = line.substring(cursor.column-1, cursor.column);
+
+                // We're escaped.
+                if (leftChar == '\\') {
+                    return null;
+                }
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf('"');
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
+                    return {
+                        text: '""',
+                        selection: [1,1]
+                    }
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == '"') {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '"') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == '"') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+}
+oop.inherits(CstyleBehaviour, Behaviour);
+
+exports.CstyleBehaviour = CstyleBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-json-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-json-uncompressed.js
new file mode 100755
index 00000000000..19dc612ab3e
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-json-uncompressed.js
@@ -0,0 +1,689 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/json', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/json_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var HighlightRules = require("./json_highlight_rules").JsonHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new HighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        if (state == "start") {
+            var match = line.match(/^.*[\{\(\[]\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+    
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/json_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var JsonHighlightRules = function() {
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+    this.$rules = {
+        "start" : [
+            {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : "constant.language.boolean",
+                regex : "(?:true|false)\\b"
+            }, {
+                token : "invalid.illegal", // single quoted strings are not allowed
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "invalid.illegal", // comments are not allowed
+                regex : "\\/\\/.*$"
+            }, {
+                token : "paren.lparen",
+                regex : "[[({]"
+            }, {
+                token : "paren.rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ]
+    };
+    
+};
+
+oop.inherits(JsonHighlightRules, TextHighlightRules);
+
+exports.JsonHighlightRules = JsonHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require('../behaviour').Behaviour;
+
+var CstyleBehaviour = function () {
+
+    this.add("braces", "insertion", function (state, action, editor, session, text) {
+        if (text == '{') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '}') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return null;
+
+                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
+                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+
+    this.add("braces", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '{') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.end.column, range.end.column + 1);
+            if (rightChar == '}') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("parens", "insertion", function (state, action, editor, session, text) {
+        if (text == '(') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '()',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == ')') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == ')') {
+                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("parens", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '(') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == ')') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '"' + selected + '"',
+                    selection: false
+                }
+            } else {
+                var cursor = editor.getCursorPosition();
+                var line = session.doc.getLine(cursor.row);
+                var leftChar = line.substring(cursor.column-1, cursor.column);
+
+                // We're escaped.
+                if (leftChar == '\\') {
+                    return null;
+                }
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf('"');
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
+                    return {
+                        text: '""',
+                        selection: [1,1]
+                    }
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == '"') {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '"') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == '"') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+}
+oop.inherits(CstyleBehaviour, Behaviour);
+
+exports.CstyleBehaviour = CstyleBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-latex-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-latex-uncompressed.js
new file mode 100755
index 00000000000..864f28d96a9
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-latex-uncompressed.js
@@ -0,0 +1,105 @@
+define('ace/mode/latex', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/latex_highlight_rules', 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var LatexHighlightRules = require("./latex_highlight_rules").LatexHighlightRules;
+var Range = require("../range").Range;
+
+var Mode = function()
+{
+    this.$tokenizer = new Tokenizer(new LatexHighlightRules().getRules());
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        // This code is adapted from ruby.js
+        var outdent = true;
+        
+        // LaTeX comments begin with % and go to the end of the line
+        var commentRegEx = /^(\s*)\%/;
+
+        for (var i = startRow; i <= endRow; i++) {
+            if (!commentRegEx.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i = startRow; i <= endRow; i++) {
+                var line = doc.getLine(i);
+                var m = line.match(commentRegEx);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, "%");
+        }
+    };
+    
+    // There is no universally accepted way of indenting a tex document
+    // so just maintain the indentation of the previous line
+    this.getNextLineIndent = function(state, line, tab) {
+        return this.$getIndent(line);
+    };
+    
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+
+});
+define('ace/mode/latex_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var LatexHighlightRules = function() {   
+    this.$rules = {
+        "start" : [{
+            // A tex command e.g. \foo
+            token : "keyword",
+            regex : "\\\\(?:[^a-zA-Z]|[a-zA-Z]+)",
+        }, {
+            // Curly and square braces
+            token : "lparen",
+            regex : "[[({]"
+        }, {
+            // Curly and square braces
+            token : "rparen",
+            regex : "[\\])}]"
+        }, {
+            // Inline math between two $ symbols
+            token : "string",
+            regex : "\\$(?:(?:\\\\.)|(?:[^\\$\\\\]))*?\\$"
+        }, {
+            // A comment. Tex comments start with % and go to 
+            // the end of the line
+            token : "comment",
+            regex : "%.*$"
+        }]
+    };
+};
+
+oop.inherits(LatexHighlightRules, TextHighlightRules);
+
+exports.LatexHighlightRules = LatexHighlightRules;
+
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-lua-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-lua-uncompressed.js
new file mode 100755
index 00000000000..454108c6d44
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-lua-uncompressed.js
@@ -0,0 +1,533 @@
+/* ***** BEGIN LICENSE BLOCK *****
+* Version: MPL 1.1/GPL 2.0/LGPL 2.1
+*
+* The contents of this file are subject to the Mozilla Public License Version
+* 1.1 (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+* http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS IS" basis,
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+* for the specific language governing rights and limitations under the
+* License.
+*
+* The Original Code is Ajax.org Code Editor (ACE).
+*
+* The Initial Developer of the Original Code is
+* Ajax.org B.V.
+* Portions created by the Initial Developer are Copyright (C) 2010
+* the Initial Developer. All Rights Reserved.
+*
+* Contributor(s):
+*      Fabian Jakobs <fabian AT ajax DOT org>
+*      Colin Gourlay <colin DOT j DOT gourlay AT gmail DOT com>
+*      Lee Gao
+*
+* Alternatively, the contents of this file may be used under the terms of
+* either the GNU General Public License Version 2 or later (the "GPL"), or
+* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+* in which case the provisions of the GPL or the LGPL are applicable instead
+* of those above. If you wish to allow use of your version of this file only
+* under the terms of either the GPL or the LGPL, and not to allow others to
+* use your version of this file under the terms of the MPL, indicate your
+* decision by deleting the provisions above and replace them with the notice
+* and other provisions required by the GPL or the LGPL. If you do not delete
+* the provisions above, a recipient may use your version of this file under
+* the terms of any one of the MPL, the GPL or the LGPL.
+*
+* ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/lua', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/lua_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var LuaHighlightRules = require("./lua_highlight_rules").LuaHighlightRules;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new LuaHighlightRules().getRules());
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+	
+        var chunks = ["function", "then", "do", "repeat"];
+        
+        if (state == "start") {
+            var match = line.match(/^.*[\{\(\[]\s*$/);
+            if (match) {
+                indent += tab;
+            } else {
+                for (var i in tokens){
+                    var token = tokens[i];
+                    if (token.type != "keyword") continue;
+                    var chunk_i = chunks.indexOf(token.value);
+                    if (chunk_i != -1){
+                        indent += tab;
+                        break;
+                    }
+                }
+            }
+        } 
+
+        return indent;
+    };
+    
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+
+
+/* ***** BEGIN LICENSE BLOCK *****
+* Version: MPL 1.1/GPL 2.0/LGPL 2.1
+*
+* The contents of this file are subject to the Mozilla Public License Version
+* 1.1 (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+* http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS IS" basis,
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+* for the specific language governing rights and limitations under the
+* License.
+*
+* The Original Code is Ajax.org Code Editor (ACE).
+*
+* The Initial Developer of the Original Code is
+* Ajax.org B.V.
+* Portions created by the Initial Developer are Copyright (C) 2010
+* the Initial Developer. All Rights Reserved.
+*
+* Contributor(s):
+*      Fabian Jakobs <fabian AT ajax DOT org>
+*      Colin Gourlay <colin DOT j DOT gourlay AT gmail DOT com>
+*      Lee Gao
+*
+* Alternatively, the contents of this file may be used under the terms of
+* either the GNU General Public License Version 2 or later (the "GPL"), or
+* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+* in which case the provisions of the GPL or the LGPL are applicable instead
+* of those above. If you wish to allow use of your version of this file only
+* under the terms of either the GPL or the LGPL, and not to allow others to
+* use your version of this file under the terms of the MPL, indicate your
+* decision by deleting the provisions above and replace them with the notice
+* and other provisions required by the GPL or the LGPL. If you do not delete
+* the provisions above, a recipient may use your version of this file under
+* the terms of any one of the MPL, the GPL or the LGPL.
+*
+* ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/lua_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var LuaHighlightRules = function() {
+
+    var keywords = lang.arrayToMap(
+        ("break|do|else|elseif|end|for|function|if|in|local|repeat|"+
+         "return|then|until|while|or|and|not").split("|")
+    );
+
+    var builtinConstants = lang.arrayToMap(
+        ("true|false|nil|_G|_VERSION").split("|")
+    );
+
+    var builtinFunctions = lang.arrayToMap(
+        ("string|xpcall|package|tostring|print|os|unpack|require|"+
+        "getfenv|setmetatable|next|assert|tonumber|io|rawequal|"+
+        "collectgarbage|getmetatable|module|rawset|math|debug|"+
+        "pcall|table|newproxy|type|coroutine|_G|select|gcinfo|"+
+        "pairs|rawget|loadstring|ipairs|_VERSION|dofile|setfenv|"+
+        "load|error|loadfile|"+
+
+        "sub|upper|len|gfind|rep|find|match|char|dump|gmatch|"+
+        "reverse|byte|format|gsub|lower|preload|loadlib|loaded|"+
+        "loaders|cpath|config|path|seeall|exit|setlocale|date|"+
+        "getenv|difftime|remove|time|clock|tmpname|rename|execute|"+
+        "lines|write|close|flush|open|output|type|read|stderr|"+
+        "stdin|input|stdout|popen|tmpfile|log|max|acos|huge|"+
+        "ldexp|pi|cos|tanh|pow|deg|tan|cosh|sinh|random|randomseed|"+
+        "frexp|ceil|floor|rad|abs|sqrt|modf|asin|min|mod|fmod|log10|"+
+        "atan2|exp|sin|atan|getupvalue|debug|sethook|getmetatable|"+
+        "gethook|setmetatable|setlocal|traceback|setfenv|getinfo|"+
+        "setupvalue|getlocal|getregistry|getfenv|setn|insert|getn|"+
+        "foreachi|maxn|foreach|concat|sort|remove|resume|yield|"+
+        "status|wrap|create|running").split("|")
+    );
+    
+    var stdLibaries = lang.arrayToMap(
+        ("string|package|os|io|math|debug|table|coroutine").split("|")
+    );
+    
+    var metatableMethods = lang.arrayToMap(
+        ("__add|__sub|__mod|__unm|__concat|__lt|__index|__call|__gc|__metatable|"+
+         "__mul|__div|__pow|__len|__eq|__le|__newindex|__tostring|__mode|__tonumber").split("|")
+    );
+
+    var futureReserved = lang.arrayToMap(
+        ("").split("|")
+    );
+    
+    var deprecatedIn5152 = lang.arrayToMap(
+        ("setn|foreach|foreachi|gcinfo|log10|maxn").split("|")
+    );
+
+    var strPre = "";
+
+    var decimalInteger = "(?:(?:[1-9]\\d*)|(?:0))";
+    var hexInteger = "(?:0[xX][\\dA-Fa-f]+)";
+    var integer = "(?:" + decimalInteger + "|" + hexInteger + ")";
+
+    var fraction = "(?:\\.\\d+)";
+    var intPart = "(?:\\d+)";
+    var pointFloat = "(?:(?:" + intPart + "?" + fraction + ")|(?:" + intPart + "\\.))";
+    var floatNumber = "(?:" + pointFloat + ")";
+    
+    var comment_stack = [];
+    
+    this.$rules = {
+        "start" : 
+
+		
+        // bracketed comments
+        [{
+            token : "comment",           // --[[ comment
+            regex : strPre + '\\-\\-\\[\\[.*\\]\\]'
+        }, {
+            token : "comment",           // --[=[ comment
+            regex : strPre + '\\-\\-\\[\\=\\[.*\\]\\=\\]'
+        }, {
+            token : "comment",           // --[==[ comment
+            regex : strPre + '\\-\\-\\[\\={2}\\[.*\\]\\={2}\\]'
+        }, {
+            token : "comment",           // --[===[ comment
+            regex : strPre + '\\-\\-\\[\\={3}\\[.*\\]\\={3}\\]'
+        }, {
+            token : "comment",           // --[====[ comment
+            regex : strPre + '\\-\\-\\[\\={4}\\[.*\\]\\={4}\\]'
+        }, {
+            token : "comment",           // --[====+[ comment
+            regex : strPre + '\\-\\-\\[\\={5}\\=*\\[.*\\]\\={5}\\=*\\]'
+        },
+		
+		// multiline bracketed comments
+		{
+            token : "comment",           // --[[ comment
+            regex : strPre + '\\-\\-\\[\\[.*$',
+            merge : true,
+            next  : "qcomment"
+        }, {
+            token : "comment",           // --[=[ comment
+            regex : strPre + '\\-\\-\\[\\=\\[.*$',
+            merge : true,
+            next  : "qcomment1"
+        }, {
+            token : "comment",           // --[==[ comment
+            regex : strPre + '\\-\\-\\[\\={2}\\[.*$',
+            merge : true,
+            next  : "qcomment2"
+        }, {
+            token : "comment",           // --[===[ comment
+            regex : strPre + '\\-\\-\\[\\={3}\\[.*$',
+            merge : true,
+            next  : "qcomment3"
+        }, {
+            token : "comment",           // --[====[ comment
+            regex : strPre + '\\-\\-\\[\\={4}\\[.*$',
+            merge : true,
+            next  : "qcomment4"
+        }, {
+            token : function(value){     // --[====+[ comment
+                // WARNING: EXTREMELY SLOW, but this is the only way to circumvent the
+                // limits imposed by the current automaton.
+                // I've never personally seen any practical code where 5 or more '='s are
+                // used for string or commenting, so this will rarely be invoked.
+                var pattern = /\-\-\[(\=+)\[/, match;
+                // you can never be too paranoid ;)
+                if ((match = pattern.exec(value)) != null && (match = match[1]) != undefined)
+                    comment_stack.push(match.length);
+                
+                return "comment";
+            },
+            regex : strPre + '\\-\\-\\[\\={5}\\=*\\[.*$',
+            merge : true,
+            next  : "qcomment5"
+        },
+        
+        // single line comments
+        {
+            token : "comment",
+            regex : "\\-\\-.*$"
+        }, 
+        
+        // bracketed strings
+		{
+            token : "string",           // [[ string
+            regex : strPre + '\\[\\[.*\\]\\]'
+        }, {
+            token : "string",           // [=[ string
+            regex : strPre + '\\[\\=\\[.*\\]\\=\\]'
+        }, {
+            token : "string",           // [==[ string
+            regex : strPre + '\\[\\={2}\\[.*\\]\\={2}\\]'
+        }, {
+            token : "string",           // [===[ string
+            regex : strPre + '\\[\\={3}\\[.*\\]\\={3}\\]'
+        }, {
+            token : "string",           // [====[ string
+            regex : strPre + '\\[\\={4}\\[.*\\]\\={4}\\]'
+        }, {
+            token : "string",           // [====+[ string
+            regex : strPre + '\\[\\={5}\\=*\\[.*\\]\\={5}\\=*\\]'
+        },
+		
+		// multiline bracketed strings
+        {
+            token : "string",           // [[ string
+            regex : strPre + '\\[\\[.*$',
+            merge : true,
+            next  : "qstring"
+        }, {
+            token : "string",           // [=[ string
+            regex : strPre + '\\[\\=\\[.*$',
+            merge : true,
+            next  : "qstring1"
+        }, {
+            token : "string",           // [==[ string
+            regex : strPre + '\\[\\={2}\\[.*$',
+            merge : true,
+            next  : "qstring2"
+        }, {
+            token : "string",           // [===[ string
+            regex : strPre + '\\[\\={3}\\[.*$',
+            merge : true,
+            next  : "qstring3"
+        }, {
+            token : "string",           // [====[ string
+            regex : strPre + '\\[\\={4}\\[.*$',
+            merge : true,
+            next  : "qstring4"
+        }, {
+            token : function(value){     // --[====+[ string
+                // WARNING: EXTREMELY SLOW, see above.
+                var pattern = /\[(\=+)\[/, match;
+                if ((match = pattern.exec(value)) != null && (match = match[1]) != undefined)
+                    comment_stack.push(match.length);
+                
+                return "string";
+            },
+            regex : strPre + '\\[\\={5}\\=*\\[.*$',
+            merge : true,
+            next  : "qstring5"
+        }, 
+        
+        {
+            token : "string",           // " string
+            regex : strPre + '"(?:[^\\\\]|\\\\.)*?"'
+        }, {
+            token : "string",           // ' string
+            regex : strPre + "'(?:[^\\\\]|\\\\.)*?'"
+        }, {
+            token : "constant.numeric", // float
+            regex : floatNumber
+        }, {
+            token : "constant.numeric", // integer
+            regex : integer + "\\b"
+        }, {
+            token : function(value) {
+                if (keywords.hasOwnProperty(value))
+                    return "keyword";
+                else if (builtinConstants.hasOwnProperty(value))
+                    return "constant.language";
+                else if (futureReserved.hasOwnProperty(value))
+                    return "invalid.illegal";
+                else if (stdLibaries.hasOwnProperty(value))
+                    return "constant.library";
+                else if (deprecatedIn5152.hasOwnProperty(value))
+                    return "invalid.deprecated";
+                else if (builtinFunctions.hasOwnProperty(value))
+                    return "support.function";
+                else if (metatableMethods.hasOwnProperty(value))
+                    return "support.function";
+                else
+                    return "identifier";
+            },
+            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+        }, {
+            token : "keyword.operator",
+            regex : "\\+|\\-|\\*|\\/|%|\\#|\\^|~|<|>|<=|=>|==|~=|=|\\:|\\.\\.\\.|\\.\\."
+        }, {
+            token : "paren.lparen",
+            regex : "[\\[\\(\\{]"
+        }, {
+            token : "paren.rparen",
+            regex : "[\\]\\)\\}]"
+        }, {
+            token : "text",
+            regex : "\\s+"
+        } ],
+        
+        "qcomment": [ {
+            token : "comment",
+            regex : "(?:[^\\\\]|\\\\.)*?\\]\\]",
+            next  : "start"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : '.+'
+        } ],
+        "qcomment1": [ {
+            token : "comment",
+            regex : "(?:[^\\\\]|\\\\.)*?\\]\\=\\]",
+            next  : "start"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : '.+'
+        } ],
+        "qcomment2": [ {
+            token : "comment",
+            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={2}\\]",
+            next  : "start"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : '.+'
+        } ],
+        "qcomment3": [ {
+            token : "comment",
+            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={3}\\]",
+            next  : "start"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : '.+'
+        } ],
+        "qcomment4": [ {
+            token : "comment",
+            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={4}\\]",
+            next  : "start"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : '.+'
+        } ],
+        "qcomment5": [ {
+            token : function(value){ 
+                // very hackish, mutates the qcomment5 field on the fly.
+                var pattern = /\](\=+)\]/, rule = this.rules.qcomment5[0], match;
+                rule.next = "start";
+                if ((match = pattern.exec(value)) != null && (match = match[1]) != undefined){
+                    var found = match.length, expected;
+                    if ((expected = comment_stack.pop()) != found){
+                        comment_stack.push(expected);
+                        rule.next = "qcomment5";
+                    }
+                }
+                
+                return "comment";
+            },
+            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={5}\\=*\\]",
+            next  : "start"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : '.+'
+        } ],
+        
+        "qstring": [ {
+            token : "string",
+            regex : "(?:[^\\\\]|\\\\.)*?\\]\\]",
+            next  : "start"
+        }, {
+            token : "string",
+            merge : true,
+            regex : '.+'
+        } ],
+        "qstring1": [ {
+            token : "string",
+            regex : "(?:[^\\\\]|\\\\.)*?\\]\\=\\]",
+            next  : "start"
+        }, {
+            token : "string",
+            merge : true,
+            regex : '.+'
+        } ],
+        "qstring2": [ {
+            token : "string",
+            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={2}\\]",
+            next  : "start"
+        }, {
+            token : "string",
+            merge : true,
+            regex : '.+'
+        } ],
+        "qstring3": [ {
+            token : "string",
+            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={3}\\]",
+            next  : "start"
+        }, {
+            token : "string",
+            merge : true,
+            regex : '.+'
+        } ],
+        "qstring4": [ {
+            token : "string",
+            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={4}\\]",
+            next  : "start"
+        }, {
+            token : "string",
+            merge : true,
+            regex : '.+'
+        } ],
+        "qstring5": [ {
+            token : function(value){ 
+                // very hackish, mutates the qstring5 field on the fly.
+                var pattern = /\](\=+)\]/, rule = this.rules.qstring5[0], match;
+                rule.next = "start";
+                if ((match = pattern.exec(value)) != null && (match = match[1]) != undefined){
+                    var found = match.length, expected;
+                    if ((expected = comment_stack.pop()) != found){
+                        comment_stack.push(expected);
+                        rule.next = "qstring5";
+                    }
+                }
+                
+                return "string";
+            },
+            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={5}\\=*\\]",
+            next  : "start"
+        }, {
+            token : "string",
+            merge : true,
+            regex : '.+'
+        } ]
+        
+    };
+
+}
+
+oop.inherits(LuaHighlightRules, TextHighlightRules);
+
+exports.LuaHighlightRules = LuaHighlightRules;
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-markdown-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-markdown-uncompressed.js
new file mode 100755
index 00000000000..0ddb789736c
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-markdown-uncompressed.js
@@ -0,0 +1,3000 @@
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/markdown', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/mode/javascript', 'ace/mode/xml', 'ace/mode/html', 'ace/tokenizer', 'ace/mode/markdown_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var JavaScriptMode = require("./javascript").Mode;
+var XmlMode = require("./xml").Mode;
+var HtmlMode = require("./html").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var MarkdownHighlightRules = require("./markdown_highlight_rules").MarkdownHighlightRules;
+
+var Mode = function() {
+    var highlighter = new MarkdownHighlightRules();
+    
+    this.$tokenizer = new Tokenizer(highlighter.getRules());
+    this.$embeds = highlighter.getEmbeds();
+    this.createModeDelegates({
+      "js-": JavaScriptMode,
+      "xml-": XmlMode,
+      "html-": HtmlMode
+    });
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+    this.getNextLineIndent = function(state, line, tab) {
+        if (state == "listblock") {
+            var match = /^((?:.+)?)([-+*][ ]+)/.exec(line);
+            if (match) {
+                return new Array(match[1].length + 1).join(" ") + match[2];
+            } else {
+                return "";
+            }
+        } else {
+            return this.$getIndent(line);
+        }
+    };
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var Range = require("../range").Range;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var re = /^(\s*)\/\//;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i);
+                var m = line.match(re);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, "//");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+        var endState = tokenizedLine.state;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+        
+        if (state == "start" || state == "regex_allowed") {
+            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        } else if (state == "doc-start") {
+            if (endState == "start" || state == "regex_allowed") {
+                return "";
+            }
+            var match = line.match(/^\s*(\/?)\*/);
+            if (match) {
+                if (match[1]) {
+                    indent += " ";
+                }
+                indent += "* ";
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+    
+    this.createWorker = function(session) {
+        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
+        worker.attachToDocument(session.getDocument());
+            
+        worker.on("jslint", function(results) {
+            var errors = [];
+            for (var i=0; i<results.data.length; i++) {
+                var error = results.data[i];
+                if (error)
+                    errors.push({
+                        row: error.line-1,
+                        column: error.character-1,
+                        text: error.reason,
+                        type: "warning",
+                        lint: error
+                    });
+            }
+            session.setAnnotations(errors);
+        });
+        
+        worker.on("narcissus", function(e) {
+            session.setAnnotations([e.data]);
+        });
+        
+        worker.on("terminate", function() {
+            session.clearAnnotations();
+        });
+        
+        return worker;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var unicode = require("../unicode");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var JavaScriptHighlightRules = function() {
+
+    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
+    var globals = lang.arrayToMap(
+      // Constructors
+        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
+      // E4X
+         "Namespace|QName|XML|XMLList|" +
+         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
+         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
+      // Errors
+        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
+        "SyntaxError|TypeError|URIError|" +
+      //  Non-constructor functions
+        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
+        "isNaN|parseFloat|parseInt|" +
+      // Other
+        "JSON|Math|" +
+      // Pseudo
+        "this|arguments|prototype|window|document"
+      ).split("|")
+    );
+
+    var keywords = lang.arrayToMap(
+        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
+        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
+        "const|yield|import|get|set").split("|")
+    );
+
+    // keywords which can be followed by regular expressions
+    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
+
+    var deprecated = lang.arrayToMap(
+        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
+    );
+
+    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
+
+    var buildinConstants = lang.arrayToMap(
+        ("null|Infinity|NaN|undefined").split("|")
+    );
+
+    var futureReserved = lang.arrayToMap(
+        ("class|enum|extends|super|export|implements|private|" +
+        "public|interface|package|protected|static").split("|")
+    );
+
+    // TODO: Unicode escape sequences
+    var identifierRe = "[" + unicode.packages.L + "\\$_][" 
+        + unicode.packages.L
+        + unicode.packages.Mn + unicode.packages.Mc
+        + unicode.packages.Nd
+        + unicode.packages.Pc + "\\$_]*\\b";
+        
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            new DocCommentHighlightRules().getStartRule("doc-start"),
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : '["].*\\\\$',
+                next : "qqstring"
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : "['].*\\\\$",
+                next : "qstring"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : ["keyword.definition", "text", "entity.name.function"],
+                regex : "(function)(\\s+)(" + identifierRe + ")"
+            }, {
+                token : "constant.language.boolean",
+                regex : "(?:true|false)\\b"
+            }, {
+                token : "keyword",
+                regex : "(?:" + kwBeforeRe + ")\\b",
+                next : "regex_allowed"
+            }, {
+                token : function(value) {
+                    if (globals.hasOwnProperty(value))
+                        return "variable.language";
+                    else if (deprecated.hasOwnProperty(value))
+                        return "invalid.deprecated";
+                    else if (definitions.hasOwnProperty(value))
+                        return "keyword.definition";
+                    else if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else if (futureReserved.hasOwnProperty(value))
+                        return "invalid.illegal";
+                    else if (value == "debugger")
+                        return "invalid.deprecated";
+                    else
+                        return "identifier";
+                },
+                regex : identifierRe
+            }, {
+                token : "keyword.operator",
+                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",
+                next  : "regex_allowed"
+            }, {
+                token : "punctuation.operator",
+                regex : "\\?|\\:|\\,|\\;|\\.",
+                next  : "regex_allowed"
+            }, {
+                token : "paren.lparen",
+                regex : "[[({]",
+                next  : "regex_allowed"
+            }, {
+                token : "paren.rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "keyword.operator",
+                regex : "\\/=?",
+                next  : "regex_allowed"
+            }, {
+                token: "comment",
+                regex: "^#!.*$" 
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        // regular expressions are only allowed after certain tokens. This
+        // makes sure we don't mix up regexps with the divison operator
+        "regex_allowed": [
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment_regex_allowed"
+            }, {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            }, {
+                token: "string.regexp",
+                regex: "\\/",
+                next: "regex",
+                merge: true
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }, {
+                // immediately return to the start mode without matching
+                // anything
+                token: "empty", 
+                regex: "",
+                next: "start"
+            }
+        ],
+        "regex": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
+                next: "regex"
+            }, {
+				// flag
+                token: "string.regexp", 
+                regex: "/\\w*",
+                next: "start",
+                merge: true 
+            }, {
+                token: "string.regexp",
+                regex: "[^\\\\/\\[]+",
+                next: "regex",
+                merge: true
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "\\[",
+                next: "regex_character_class",
+                merge: true
+            }, {
+                token: "empty", 
+                regex: "",
+                next: "start" 
+            }
+        ],
+        "regex_character_class": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
+                next: "regex_character_class"
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "]",
+                next: "regex",
+                merge: true
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "[^\\\\\\]]+",
+                next: "regex_character_class",
+                merge: true
+            }, {
+                token: "empty", 
+                regex: "",
+                next: "start" 
+            }
+        ],
+        "comment_regex_allowed" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                merge : true,
+                next : "regex_allowed"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                merge : true,
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "qqstring" : [
+            {
+                token : "string",
+                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ],
+        "qstring" : [
+            {
+                token : "string",
+                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ]
+    };
+    
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ new DocCommentHighlightRules().getEndRule("start") ]);
+};
+
+oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
+
+exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var DocCommentHighlightRules = function() {
+
+    this.$rules = {
+        "start" : [ {
+            token : "comment.doc.tag",
+            regex : "@[\\w\\d_]+" // TODO: fix email addresses
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "\\s+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "TODO"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "[^@\\*]+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "."
+        }]
+    };
+};
+
+oop.inherits(DocCommentHighlightRules, TextHighlightRules);
+
+(function() {
+
+    this.getStartRule = function(start) {
+        return {
+            token : "comment.doc", // doc comment
+            merge : true,
+            regex : "\\/\\*(?=\\*)",
+            next  : start
+        };
+    };
+    
+    this.getEndRule = function (start) {
+        return {
+            token : "comment.doc", // closing comment
+            merge : true,
+            regex : "\\*\\/",
+            next  : start
+        };
+    };
+
+}).call(DocCommentHighlightRules.prototype);
+
+exports.DocCommentHighlightRules = DocCommentHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/worker/worker_client', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var EventEmitter = require("../lib/event_emitter").EventEmitter;
+
+var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
+
+    this.changeListener = this.changeListener.bind(this);
+
+    if (module.packaged) {
+        var base = this.$guessBasePath();
+        this.$worker = new Worker(base + packagedJs);
+    }
+    else {
+        var workerUrl = this.$normalizePath(require.nameToUrl("ace/worker/worker", null, "_"));
+        this.$worker = new Worker(workerUrl);
+
+        var tlns = {};
+        for (var i=0; i<topLevelNamespaces.length; i++) {
+            var ns = topLevelNamespaces[i];
+            var path = this.$normalizePath(require.nameToUrl(ns, null, "_").replace(/.js$/, ""));
+
+            tlns[ns] = path;
+        }
+    }
+
+    this.$worker.postMessage({
+        init : true,
+        tlns: tlns,
+        module: mod,
+        classname: classname
+    });
+
+    this.callbackId = 1;
+    this.callbacks = {};
+
+    var _self = this;
+    this.$worker.onerror = function(e) {
+        window.console && console.log && console.log(e);
+        throw e;
+    };
+    this.$worker.onmessage = function(e) {
+        var msg = e.data;
+        switch(msg.type) {
+            case "log":
+                window.console && console.log && console.log(msg.data);
+                break;
+
+            case "event":
+                _self._emit(msg.name, {data: msg.data});
+                break;
+
+            case "call":
+                var callback = _self.callbacks[msg.id];
+                if (callback) {
+                    callback(msg.data);
+                    delete _self.callbacks[msg.id];
+                }
+                break;
+        }
+    };
+};
+
+(function(){
+
+    oop.implement(this, EventEmitter);
+
+    this.$normalizePath = function(path) {
+        path = path.replace(/^[a-z]+:\/\/[^\/]+\//, ""); // Remove domain name and rebuild it
+        path = location.protocol + "//" + location.host
+            // paths starting with a slash are relative to the root (host)
+            + (path.charAt(0) == "/" ? "" : location.pathname.replace(/\/[^\/]*$/, ""))
+            + "/" + path.replace(/^[\/]+/, "");
+        return path;
+    };
+
+    this.$guessBasePath = function() {
+        if (require.aceBaseUrl)
+            return require.aceBaseUrl;
+
+        var scripts = document.getElementsByTagName("script");
+        for (var i=0; i<scripts.length; i++) {
+            var script = scripts[i];
+
+            var base = script.getAttribute("data-ace-base");
+            if (base)
+                return base.replace(/\/*$/, "/");
+
+            var src = script.src || script.getAttribute("src");
+            if (!src) {
+                continue;
+            }
+            var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);
+            if (m)
+                return m[1] || m[2];
+        }
+        return "";
+    };
+
+    this.terminate = function() {
+        this._emit("terminate", {});
+        this.$worker.terminate();
+        this.$worker = null;
+        this.$doc.removeEventListener("change", this.changeListener);
+        this.$doc = null;
+    };
+
+    this.send = function(cmd, args) {
+        this.$worker.postMessage({command: cmd, args: args});
+    };
+
+    this.call = function(cmd, args, callback) {
+        if (callback) {
+            var id = this.callbackId++;
+            this.callbacks[id] = callback;
+            args.push(id);
+        }
+        this.send(cmd, args);
+    };
+
+    this.emit = function(event, data) {
+        try {
+            // firefox refuses to clone objects which have function properties
+            // TODO: cleanup event
+            this.$worker.postMessage({event: event, data: {data: data.data}});
+        }
+        catch(ex) {}
+    };
+
+    this.attachToDocument = function(doc) {
+        if(this.$doc)
+            this.terminate();
+
+        this.$doc = doc;
+        this.call("setValue", [doc.getValue()]);
+        doc.on("change", this.changeListener);
+    };
+
+    this.changeListener = function(e) {
+        e.range = {
+            start: e.data.range.start,
+            end: e.data.range.end
+        };
+        this.emit("change", e);
+    };
+
+}).call(WorkerClient.prototype);
+
+exports.WorkerClient = WorkerClient;
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require('../behaviour').Behaviour;
+
+var CstyleBehaviour = function () {
+
+    this.add("braces", "insertion", function (state, action, editor, session, text) {
+        if (text == '{') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '}') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return null;
+
+                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
+                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+
+    this.add("braces", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '{') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.end.column, range.end.column + 1);
+            if (rightChar == '}') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("parens", "insertion", function (state, action, editor, session, text) {
+        if (text == '(') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '()',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == ')') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == ')') {
+                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("parens", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '(') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == ')') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '"' + selected + '"',
+                    selection: false
+                }
+            } else {
+                var cursor = editor.getCursorPosition();
+                var line = session.doc.getLine(cursor.row);
+                var leftChar = line.substring(cursor.column-1, cursor.column);
+
+                // We're escaped.
+                if (leftChar == '\\') {
+                    return null;
+                }
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf('"');
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
+                    return {
+                        text: '""',
+                        selection: [1,1]
+                    }
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == '"') {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '"') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == '"') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+}
+oop.inherits(CstyleBehaviour, Behaviour);
+
+exports.CstyleBehaviour = CstyleBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xml_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/xml'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
+var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
+var XmlFoldMode = require("./folding/xml").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new XmlHighlightRules().getRules());
+    this.$behaviour = new XmlBehaviour();
+    this.foldingRules = new XmlFoldMode();
+};
+
+oop.inherits(Mode, TextMode);
+
+(function() {
+    
+    this.getNextLineIndent = function(state, line, tab) {
+        return this.$getIndent(line);
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/xml_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var xmlUtil = require("./xml_util");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var XmlHighlightRules = function() {
+
+    // regexp must not have capturing parentheses
+    // regexps are ordered -> the first match is used
+    this.$rules = {
+        start : [{
+            token : "text",
+            regex : "<\\!\\[CDATA\\[",
+            next : "cdata"
+        }, {
+            token : "xml_pe",
+            regex : "<\\?.*?\\?>"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : "<\\!--",
+            next : "comment"
+        }, {
+            token : "meta.tag", // opening tag
+            regex : "<\\/?",
+            next : "tag"
+        }, {
+            token : "text",
+            regex : "\\s+"
+        }, {
+            token : "text",
+            regex : "[^<]+"
+        }],
+        
+        cdata : [{
+            token : "text",
+            regex : "\\]\\]>",
+            next : "start"
+        }, {
+            token : "text",
+            regex : "\\s+"
+        }, {
+            token : "text",
+            regex : "(?:[^\\]]|\\](?!\\]>))+"
+        }],
+
+        comment : [{
+            token : "comment",
+            regex : ".*?-->",
+            next : "start"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : ".+"
+        }]
+    };
+    
+    xmlUtil.tag(this.$rules, "tag", "start");
+};
+
+oop.inherits(XmlHighlightRules, TextHighlightRules);
+
+exports.XmlHighlightRules = XmlHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
+"use strict";
+
+var lang = require("../lib/lang");
+
+var formTags = lang.arrayToMap(
+    ("button|form|input|label|select|textarea").split("|")
+);
+
+var tableTags = lang.arrayToMap(
+    ("table|tbody|td|tfoot|th|tr").split("|")
+);
+
+function string(state) {
+    return [{
+        token : "string",
+        regex : '".*?"'
+    }, {
+        token : "string", // multi line string start
+        merge : true,
+        regex : '["].*',
+        next : state + "-qqstring"
+    }, {
+        token : "string",
+        regex : "'.*?'"
+    }, {
+        token : "string", // multi line string start
+        merge : true,
+        regex : "['].*",
+        next : state + "-qstring"
+    }];
+}
+
+function multiLineString(quote, state) {
+    return [{
+        token : "string",
+        merge : true,
+        regex : ".*?" + quote,
+        next : state
+    }, {
+        token : "string",
+        merge : true,
+        regex : '.+'
+    }];
+}
+
+exports.tag = function(states, name, nextState) {
+    states[name] = [{
+        token : "text",
+        regex : "\\s+"
+    }, {
+        //token : "meta.tag",
+        
+    token : function(value) {
+            if ( value==='a' ) {
+                return "meta.tag.anchor";
+            }
+            else if ( value==='img' ) {
+                return "meta.tag.image";
+            }
+            else if ( value==='script' ) {
+                return "meta.tag.script";
+            }
+            else if ( value==='style' ) {
+                return "meta.tag.style";
+            }
+            else if (formTags.hasOwnProperty(value.toLowerCase())) {
+                return "meta.tag.form";
+            }
+            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
+                return "meta.tag.table";
+            }
+            else {
+                return "meta.tag";
+            }
+        },        
+        merge : true,
+        regex : "[-_a-zA-Z0-9:!]+",
+        next : name + "embed-attribute-list" 
+    }, {
+        token: "empty",
+        regex: "",
+        next : name + "embed-attribute-list"
+    }];
+
+    states[name + "-qstring"] = multiLineString("'", name + "embed-attribute-list");
+    states[name + "-qqstring"] = multiLineString("\"", name + "embed-attribute-list");
+    
+    states[name + "embed-attribute-list"] = [{
+        token : "meta.tag",
+        merge : true,
+        regex : "\/?>",
+        next : nextState
+    }, {
+        token : "keyword.operator",
+        regex : "="
+    }, {
+        token : "entity.other.attribute-name",
+        regex : "[-_a-zA-Z0-9:]+"
+    }, {
+        token : "constant.numeric", // float
+        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+    }, {
+        token : "text",
+        regex : "\\s+"
+    }].concat(string(name));
+};
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require("../behaviour").Behaviour;
+var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
+
+var XmlBehaviour = function () {
+    
+    this.inherit(CstyleBehaviour, ["string_dquotes"]); // Get string behaviour
+    
+    this.add("brackets", "insertion", function (state, action, editor, session, text) {
+        if (text == '<') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return false;
+            } else {
+                return {
+                    text: '<>',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '>') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '>') { // need some kind of matching check here
+                return {
+                    text: '',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChars = line.substring(cursor.column, cursor.column + 2);
+            if (rightChars == '</') {
+                var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
+                var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+    
+}
+oop.inherits(XmlBehaviour, Behaviour);
+
+exports.XmlBehaviour = XmlBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/range', 'ace/mode/folding/fold_mode', 'ace/token_iterator'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var lang = require("../../lib/lang");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+var TokenIterator = require("../../token_iterator").TokenIterator;
+
+var FoldMode = exports.FoldMode = function(voidElements) {
+    BaseFoldMode.call(this);
+    this.voidElements = voidElements || {};
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var tag = this._getFirstTagInLine(session, row);
+
+        if (tag.closing)
+            return foldStyle == "markbeginend" ? "end" : "";
+
+        if (!tag.tagName || this.voidElements[tag.tagName.toLowerCase()])
+            return "";
+
+        if (tag.selfClosing)
+            return "";
+
+        if (tag.value.indexOf("/" + tag.tagName) !== -1)
+            return "";
+
+        return "start";
+    };
+    
+    this._getFirstTagInLine = function(session, row) {
+        var tokens = session.getTokens(row, row)[0].tokens;
+        var value = "";
+        for (var i = 0; i < tokens.length; i++) {
+            var token = tokens[i];
+            if (token.type.indexOf("meta.tag") === 0)
+                value += token.value;
+            else
+                value += lang.stringRepeat(" ", token.value.length);
+        }
+        
+        return this._parseTag(value);
+    };
+
+    this.tagRe = /^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/;
+    this._parseTag = function(tag) {
+        
+        var match = this.tagRe.exec(tag);
+        var column = this.tagRe.lastIndex || 0;
+        this.tagRe.lastIndex = 0;
+
+        return {
+            value: tag,
+            match: match ? match[2] : "",
+            closing: match ? !!match[3] : false,
+            selfClosing: match ? !!match[5] || match[2] == "/>" : false,
+            tagName: match ? match[4] : "",
+            column: match[1] ? column + match[1].length : column
+        };
+    };
+    
+    /**
+     * reads a full tag and places the iterator after the tag
+     */
+    this._readTagForward = function(iterator) {
+        var token = iterator.getCurrentToken();
+        if (!token)
+            return null;
+            
+        var value = "";
+        var start;
+        
+        do {
+            if (token.type.indexOf("meta.tag") === 0) {
+                if (!start) {
+                    var start = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn()
+                    };
+                }
+                value += token.value;
+                if (value.indexOf(">") !== -1) {
+                    var tag = this._parseTag(value);
+                    tag.start = start;
+                    tag.end = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn() + token.value.length
+                    };
+                    iterator.stepForward();
+                    return tag;
+                }
+            }
+        } while(token = iterator.stepForward());
+        
+        return null;
+    };
+    
+    this._readTagBackward = function(iterator) {
+        var token = iterator.getCurrentToken();
+        if (!token)
+            return null;
+            
+        var value = "";
+        var end;
+
+        do {
+            if (token.type.indexOf("meta.tag") === 0) {
+                if (!end) {
+                    end = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn() + token.value.length
+                    };
+                }
+                value = token.value + value;
+                if (value.indexOf("<") !== -1) {
+                    var tag = this._parseTag(value);
+                    tag.end = end;
+                    tag.start = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn()
+                    };
+                    iterator.stepBackward();
+                    return tag;
+                }
+            }
+        } while(token = iterator.stepBackward());
+        
+        return null;
+    };
+    
+    this._pop = function(stack, tag) {
+        while (stack.length) {
+            
+            var top = stack[stack.length-1];
+            if (!tag || top.tagName == tag.tagName) {
+                return stack.pop();
+            }
+            else if (this.voidElements[tag.tagName]) {
+                return;
+            }
+            else if (this.voidElements[top.tagName]) {
+                stack.pop();
+                continue;
+            } else {
+                return null;
+            }
+        }
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var firstTag = this._getFirstTagInLine(session, row);
+        
+        if (!firstTag.match)
+            return null;
+        
+        var isBackward = firstTag.closing || firstTag.selfClosing;
+        var stack = [];
+        var tag;
+        
+        if (!isBackward) {
+            var iterator = new TokenIterator(session, row, firstTag.column);
+            var start = {
+                row: row,
+                column: firstTag.column + firstTag.tagName.length + 2
+            };
+            while (tag = this._readTagForward(iterator)) {
+                if (tag.selfClosing) {
+                    if (!stack.length) {
+                        tag.start.column += tag.tagName.length + 2;
+                        tag.end.column -= 2;
+                        return Range.fromPoints(tag.start, tag.end);
+                    } else
+                        continue;
+                }
+                
+                if (tag.closing) {
+                    this._pop(stack, tag);
+                    if (stack.length == 0)
+                        return Range.fromPoints(start, tag.start);
+                }
+                else {
+                    stack.push(tag)
+                }
+            }
+        }
+        else {
+            var iterator = new TokenIterator(session, row, firstTag.column + firstTag.match.length);
+            var end = {
+                row: row,
+                column: firstTag.column
+            };
+            
+            while (tag = this._readTagBackward(iterator)) {
+                if (tag.selfClosing) {
+                    if (!stack.length) {
+                        tag.start.column += tag.tagName.length + 2;
+                        tag.end.column -= 2;
+                        return Range.fromPoints(tag.start, tag.end);
+                    } else
+                        continue;
+                }
+                
+                if (!tag.closing) {
+                    this._pop(stack, tag);
+                    if (stack.length == 0) {
+                        tag.start.column += tag.tagName.length + 2;
+                        return Range.fromPoints(tag.start, end);
+                    }
+                }
+                else {
+                    stack.push(tag)
+                }
+            }
+        }
+        
+    };
+
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/html', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/mode/javascript', 'ace/mode/css', 'ace/tokenizer', 'ace/mode/html_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/html'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var JavaScriptMode = require("./javascript").Mode;
+var CssMode = require("./css").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
+var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
+var HtmlFoldMode = require("./folding/html").FoldMode;
+
+var Mode = function() {
+    var highlighter = new HtmlHighlightRules();
+    this.$tokenizer = new Tokenizer(highlighter.getRules());
+    this.$behaviour = new XmlBehaviour();
+    
+    this.$embeds = highlighter.getEmbeds();
+    this.createModeDelegates({
+        "js-": JavaScriptMode,
+        "css-": CssMode
+    });
+    
+    this.foldingRules = new HtmlFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        return 0;
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        return this.$getIndent(line);
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return false;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/css', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/css_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/worker/worker_client', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules(), "i");
+    this.$outdent = new MatchingBraceOutdent();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.foldingRules = "cStyle";
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        // ignore braces in comments
+        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+
+        var match = line.match(/^.*\{\s*$/);
+        if (match) {
+            indent += tab;
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+    
+    this.createWorker = function(session) {
+        var worker = new WorkerClient(["ace"], "worker-css.js", "ace/mode/css_worker", "Worker");
+        worker.attachToDocument(session.getDocument());
+        
+        worker.on("csslint", function(e) {
+            var errors = [];
+            e.data.forEach(function(message) {
+                errors.push({
+                    row: message.line - 1,
+                    column: message.col - 1,
+                    text: message.message,
+                    type: message.type,
+                    lint: message
+                });
+            });
+            
+            session.setAnnotations(errors);
+        });
+        return worker;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/css_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var CssHighlightRules = function() {
+
+    var properties = lang.arrayToMap(
+        ("-moz-appearance|-moz-box-sizing|-webkit-box-sizing|-moz-outline-radius|-moz-transform|-webkit-transform|" +
+        "appearance|azimuth|background-attachment|background-color|background-image|" +
+        "background-origin|background-position|background-repeat|background|border-bottom-color|" +
+        "border-bottom-style|border-bottom-width|border-bottom|border-collapse|" +
+        "border-color|border-left-color|border-left-style|border-left-width|" +
+        "border-left|border-right-color|border-right-style|border-right-width|" +
+        "border-right|border-spacing|border-style|border-top-color|" +
+        "border-top-style|border-top-width|border-top|border-width|border|" +
+        "bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|" +
+        "counter-reset|cue-after|cue-before|cue|cursor|direction|display|" +
+        "elevation|empty-cells|float|font-family|font-size-adjust|font-size|" +
+        "font-stretch|font-style|font-variant|font-weight|font|height|left|" +
+        "letter-spacing|line-height|list-style-image|list-style-position|" +
+        "list-style-type|list-style|margin-bottom|margin-left|margin-right|" +
+        "margin-top|marker-offset|margin|marks|max-height|max-width|min-height|" +
+        "min-width|-moz-border-radius|opacity|orphans|outline-color|outline-offset|outline-radius|" +
+        "outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|" +
+        "padding-left|padding-right|padding-top|padding|page-break-after|" +
+        "page-break-before|page-break-inside|page|pause-after|pause-before|" +
+        "pause|pitch-range|pitch|play-during|pointer-events|position|quotes|resize|richness|right|" +
+        "size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|" +
+        "stress|table-layout|text-align|text-decoration|text-indent|" +
+        "text-shadow|text-transform|top|transform|unicode-bidi|vertical-align|" +
+        "visibility|voice-family|volume|white-space|widows|width|word-spacing|" +
+        "z-index").split("|")
+    );
+
+    var functions = lang.arrayToMap(
+        ("rgb|rgba|url|attr|counter|counters").split("|")
+    );
+
+    var constants = lang.arrayToMap(
+        ("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|" +
+        "block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|" +
+        "char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|" +
+        "decimal-leading-zero|decimal|default|disabled|disc|" +
+        "distribute-all-lines|distribute-letter|distribute-space|" +
+        "distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|" +
+        "hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|" +
+        "ideograph-alpha|ideograph-numeric|ideograph-parenthesis|" +
+        "ideograph-space|inactive|inherit|inline-block|inline|inset|inside|" +
+        "inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|" +
+        "keep-all|left|lighter|line-edge|line-through|line|list-item|loose|" +
+        "lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|" +
+        "medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|" +
+        "nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|" +
+        "overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|" +
+        "ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|" +
+        "solid|square|static|strict|super|sw-resize|table-footer-group|" +
+        "table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|" +
+        "transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|" +
+        "vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|" +
+        "zero").split("|")
+    );
+
+    var colors = lang.arrayToMap(
+        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
+        "purple|red|silver|teal|white|yellow").split("|")
+    );
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
+
+    var base_ruleset = [
+        {
+            token : "comment", // multi line comment
+            merge : true,
+            regex : "\\/\\*",
+            next : "ruleset_comment"
+        },{
+            token : "string", // single line
+            regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+        }, {
+            token : "string", // single line
+            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+        }, {
+            token : "constant.numeric",
+            regex : numRe + "(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"
+        }, {
+            token : "constant.numeric",  // hex6 color
+            regex : "#[a-f0-9]{6}"
+        }, {
+            token : "constant.numeric", // hex3 color
+            regex : "#[a-f0-9]{3}"
+        }, {
+            token : function(value) {
+                if (properties.hasOwnProperty(value.toLowerCase())) {
+                    return "support.type";
+                }
+                else if (functions.hasOwnProperty(value.toLowerCase())) {
+                    return "support.function";
+                }
+                else if (constants.hasOwnProperty(value.toLowerCase())) {
+                    return "support.constant";
+                }
+                else if (colors.hasOwnProperty(value.toLowerCase())) {
+                    return "support.constant.color";
+                }
+                else {
+                    return "text";
+                }
+            },
+            regex : "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
+        }
+      ];
+
+    var ruleset = lang.copyArray(base_ruleset);
+    ruleset.unshift({
+        token : "paren.rparen",
+        regex : "\\}",
+        next:   "start"
+    });
+
+    var media_ruleset = lang.copyArray( base_ruleset );
+    media_ruleset.unshift({
+        token : "paren.rparen",
+        regex : "\\}",
+        next:   "media"
+    });
+
+    var base_comment = [{
+          token : "comment", // comment spanning whole line
+          merge : true,
+          regex : ".+"
+    }];
+
+    var comment = lang.copyArray(base_comment);
+    comment.unshift({
+          token : "comment", // closing comment
+          regex : ".*?\\*\\/",
+          next : "start"
+    });
+
+    var media_comment = lang.copyArray(base_comment);
+    media_comment.unshift({
+          token : "comment", // closing comment
+          regex : ".*?\\*\\/",
+          next : "media"
+    });
+
+    var ruleset_comment = lang.copyArray(base_comment);
+    ruleset_comment.unshift({
+          token : "comment", // closing comment
+          regex : ".*?\\*\\/",
+          next : "ruleset"
+    });
+
+    this.$rules = {
+        "start" : [{
+            token : "comment", // multi line comment
+            merge : true,
+            regex : "\\/\\*",
+            next : "comment"
+        }, {
+            token: "paren.lparen",
+            regex: "\\{",
+            next:  "ruleset"
+        }, {
+            token: "string",
+            regex: "@.*?{",
+            next:  "media"
+        },{
+            token: "keyword",
+            regex: "#[a-z0-9-_]+"
+        },{
+            token: "variable",
+            regex: "\\.[a-z0-9-_]+"
+        },{
+            token: "string",
+            regex: ":[a-z0-9-_]+"
+        },{
+            token: "constant",
+            regex: "[a-z0-9-_]+"
+        }],
+
+        "media" : [ {
+            token : "comment", // multi line comment
+            merge : true,
+            regex : "\\/\\*",
+            next : "media_comment"
+        }, {
+            token: "paren.lparen",
+            regex: "\\{",
+            next:  "media_ruleset"
+        },{
+            token: "string",
+            regex: "\\}",
+            next:  "start"
+        },{
+            token: "keyword",
+            regex: "#[a-z0-9-_]+"
+        },{
+            token: "variable",
+            regex: "\\.[a-z0-9-_]+"
+        },{
+            token: "string",
+            regex: ":[a-z0-9-_]+"
+        },{
+            token: "constant",
+            regex: "[a-z0-9-_]+"
+        }],
+
+        "comment" : comment,
+
+        "ruleset" : ruleset,
+        "ruleset_comment" : ruleset_comment,
+
+        "media_ruleset" : media_ruleset,
+        "media_comment" : media_comment
+    };
+};
+
+oop.inherits(CssHighlightRules, TextHighlightRules);
+
+exports.CssHighlightRules = CssHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/html_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/css_highlight_rules', 'ace/mode/javascript_highlight_rules', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
+var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
+var xmlUtil = require("./xml_util");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var HtmlHighlightRules = function() {
+
+    // regexp must not have capturing parentheses
+    // regexps are ordered -> the first match is used
+    this.$rules = {
+        start : [{
+            token : "text",
+            merge : true,
+            regex : "<\\!\\[CDATA\\[",
+            next : "cdata"
+        }, {
+            token : "xml_pe",
+            regex : "<\\?.*?\\?>"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : "<\\!--",
+            next : "comment"
+        }, {
+            token : "meta.tag",
+            regex : "<(?=\s*script\\b)",
+            next : "script"
+        }, {
+            token : "meta.tag",
+            regex : "<(?=\s*style\\b)",
+            next : "css"
+        }, {
+            token : "meta.tag", // opening tag
+            regex : "<\\/?",
+            next : "tag"
+        }, {
+            token : "text",
+            regex : "\\s+"
+        }, {
+            token : "text",
+            regex : "[^<]+"
+        } ],
+    
+        cdata : [ {
+            token : "text",
+            regex : "\\]\\]>",
+            next : "start"
+        }, {
+            token : "text",
+            merge : true,
+            regex : "\\s+"
+        }, {
+            token : "text",
+            merge : true,
+            regex : ".+"
+        } ],
+
+        comment : [ {
+            token : "comment",
+            regex : ".*?-->",
+            next : "start"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : ".+"
+        } ]
+    };
+    
+    xmlUtil.tag(this.$rules, "tag", "start");
+    xmlUtil.tag(this.$rules, "css", "css-start");
+    xmlUtil.tag(this.$rules, "script", "js-start");
+    
+    this.embedRules(JavaScriptHighlightRules, "js-", [{
+        token: "comment",
+        regex: "\\/\\/.*(?=<\\/script>)",
+        next: "tag"
+    }, {
+        token: "meta.tag",
+        regex: "<\\/(?=script)",
+        next: "tag"
+    }]);
+    
+    this.embedRules(CssHighlightRules, "css-", [{
+        token: "meta.tag",
+        regex: "<\\/(?=style)",
+        next: "tag"
+    }]);
+};
+
+oop.inherits(HtmlHighlightRules, TextHighlightRules);
+
+exports.HtmlHighlightRules = HtmlHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/html', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/mixed', 'ace/mode/folding/xml', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var MixedFoldMode = require("./mixed").FoldMode;
+var XmlFoldMode = require("./xml").FoldMode;
+var CStyleFoldMode = require("./cstyle").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {
+    MixedFoldMode.call(this, new XmlFoldMode({
+        // void elements
+        "area": 1,
+        "base": 1,
+        "br": 1,
+        "col": 1,
+        "command": 1,
+        "embed": 1,
+        "hr": 1,
+        "img": 1,
+        "input": 1,
+        "keygen": 1,
+        "link": 1,
+        "meta": 1,
+        "param": 1,
+        "source": 1,
+        "track": 1,
+        "wbr": 1,
+        
+        // optional tags 
+        "li": 1,
+        "dt": 1,
+        "dd": 1,
+        "p": 1,
+        "rt": 1,
+        "rp": 1,
+        "optgroup": 1,
+        "option": 1,
+        "colgroup": 1,
+        "td": 1,
+        "th": 1
+    }), {
+        "js-": new CStyleFoldMode(),
+        "css-": new CStyleFoldMode()
+    });
+};
+
+oop.inherits(FoldMode, MixedFoldMode);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/mixed', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function(defaultMode, subModes) {
+    this.defaultMode = defaultMode;
+    this.subModes = subModes;
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+
+    this.$getMode = function(state) {
+        for (var key in this.subModes) {
+            if (state.indexOf(key) === 0)
+                return this.subModes[key];
+        }
+        return null;
+    };
+    
+    this.$tryMode = function(state, session, foldStyle, row) {
+        var mode = this.$getMode(state);
+        return (mode ? mode.getFoldWidget(session, foldStyle, row) : "");
+    };
+
+    this.getFoldWidget = function(session, foldStyle, row) {
+        return (
+            this.$tryMode(session.getState(row-1), session, foldStyle, row) ||
+            this.$tryMode(session.getState(row), session, foldStyle, row) ||
+            this.defaultMode.getFoldWidget(session, foldStyle, row)
+        );
+    };
+
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var mode = this.$getMode(session.getState(row-1));
+        
+        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
+            mode = this.$getMode(session.getState(row));
+        
+        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
+            mode = this.defaultMode;
+        
+        return mode.getFoldWidgetRange(session, foldStyle, row);
+    };
+
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/markdown_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules', 'ace/mode/javascript_highlight_rules', 'ace/mode/xml_highlight_rules', 'ace/mode/html_highlight_rules', 'ace/mode/css_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
+var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
+var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
+var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
+
+function github_embed(tag, prefix) {
+    return { // Github style block
+        token : "support.function",
+        regex : "^```" + tag + "\\s*$",
+        next  : prefix + "start"
+    };
+}
+
+var MarkdownHighlightRules = function() {
+
+    // regexp must not have capturing parentheses
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [ {
+            token : "empty_line",
+            regex : '^$'
+        }, { // code span `
+            token : "support.function",
+            regex : "(`+)([^\\r]*?[^`])(\\1)"
+        }, { // code block
+            token : "support.function",
+            regex : "^[ ]{4}.+"
+        }, { // h1
+            token: "markup.heading.1",
+            regex: "^=+(?=\\s*$)"
+        }, { // h2
+            token: "markup.heading.1",
+            regex: "^\\-+(?=\\s*$)"
+        }, { // header
+            token : function(value) {
+                return "markup.heading." + value.length;
+            },
+            regex : "^#{1,6}"
+        }, github_embed("javascript", "js-"),
+           github_embed("xml", "xml-"),
+           github_embed("html", "html-"),
+           github_embed("css", "css-"),
+        { // Github style block
+            token : "support.function",
+            regex : "^```[a-zA-Z]+\\s*$",
+            next  : "githubblock"
+        }, { // block quote
+            token : "string",
+            regex : "^>[ ].+$",
+            next  : "blockquote"
+        }, { // reference
+            token : ["text", "constant", "text", "url", "string", "text"],
+            regex : "^([ ]{0,3}\\[)([^\\]]+)(\\]:\\s*)([^ ]+)(\\s*(?:[\"][^\"]+[\"])?\\s*)$"
+        }, { // link by reference
+            token : ["text", "string", "text", "constant", "text"],
+            regex : "(\\[)((?:[[^\\]]*\\]|[^\\[\\]])*)(\\][ ]?(?:\\n[ ]*)?\\[)(.*?)(\\])"
+        }, { // link by url
+            token : ["text", "string", "text", "markup.underline", "string", "text"],
+            regex : "(\\[)"+
+                    "(\\[[^\\]]*\\]|[^\\[\\]]*)"+
+                    "(\\]\\([ \\t]*)"+
+                    "(<?(?:(?:[^\\(]*?\\([^\\)]*?\\)\\S*?)|(?:.*?))>?)"+
+                    "((?:[ \t]*\"(?:.*?)\"[ \\t]*)?)"+
+                    "(\\))"
+        }, { // HR *
+            token : "constant",
+            regex : "^[ ]{0,2}(?:[ ]?\\*[ ]?){3,}\\s*$"
+        }, { // HR -
+            token : "constant",
+            regex : "^[ ]{0,2}(?:[ ]?\\-[ ]?){3,}\\s*$"
+        }, { // HR _
+            token : "constant",
+            regex : "^[ ]{0,2}(?:[ ]?\\_[ ]?){3,}\\s*$"
+        }, { // list
+            token : "markup.list",
+            regex : "^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+",
+            next  : "listblock"
+        }, { // strong ** __
+            token : "string",
+            regex : "([*]{2}|[_]{2}(?=\\S))([^\\r]*?\\S[*_]*)(\\1)"
+        }, { // emphasis * _
+            token : "string",
+            regex : "([*]|[_](?=\\S))([^\\r]*?\\S[*_]*)(\\1)"
+        }, { // 
+            token : ["text", "url", "text"],
+            regex : "(<)("+
+                      "(?:https?|ftp|dict):[^'\">\\s]+"+
+                      "|"+
+                      "(?:mailto:)?[-.\\w]+\\@[-a-z0-9]+(?:\\.[-a-z0-9]+)*\\.[a-z]+"+
+                    ")(>)"
+        }, {
+            token : "text",
+            regex : "[^\\*_%$`\\[#<>]+"
+        } ],
+        
+        "listblock" : [ { // Lists only escape on completely blank lines.
+            token : "empty_line",
+            regex : "^$",
+            next  : "start"
+        }, {
+            token : "markup.list",
+            regex : ".+"
+        } ],
+        
+        "blockquote" : [ { // BLockquotes only escape on blank lines.
+            token : "empty_line",
+            regex : "^\\s*$",
+            next  : "start"
+        }, {
+            token : "string",
+            regex : ".+"
+        } ],
+        
+        "githubblock" : [ {
+            token : "support.function",
+            regex : "^```",
+            next  : "start"
+        }, {
+            token : "support.function",
+            regex : ".+"
+        } ]
+    };
+    
+    this.embedRules(JavaScriptHighlightRules, "js-", [{
+       token : "support.function",
+       regex : "^```",
+       next  : "start"
+    }]);
+    
+    this.embedRules(HtmlHighlightRules, "html-", [{
+       token : "support.function",
+       regex : "^```",
+       next  : "start"
+    }]);
+    
+    this.embedRules(CssHighlightRules, "css-", [{
+       token : "support.function",
+       regex : "^```",
+       next  : "start"
+    }]);
+    
+    this.embedRules(XmlHighlightRules, "xml-", [{
+       token : "support.function",
+       regex : "^```",
+       next  : "start"
+    }]);
+};
+oop.inherits(MarkdownHighlightRules, TextHighlightRules);
+
+exports.MarkdownHighlightRules = MarkdownHighlightRules;
+});;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-ocaml-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-ocaml-uncompressed.js
new file mode 100755
index 00000000000..b91107dea60
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-ocaml-uncompressed.js
@@ -0,0 +1,549 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Sergi Mansilla <sergi AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/ocaml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/ocaml_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var OcamlHighlightRules = require("./ocaml_highlight_rules").OcamlHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var Range = require("../range").Range;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new OcamlHighlightRules().getRules());
+    this.$outdent   = new MatchingBraceOutdent();
+};
+oop.inherits(Mode, TextMode);
+
+var indenter = /(?:[({[=:]|[-=]>|\b(?:else|try|with))\s*$/;
+
+(function() {
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var i, line;
+        var outdent = true;
+        var re = /^\s*\(\*(.*)\*\)/;
+
+        for (i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        var range = new Range(0, 0, 0, 0);
+        for (i=startRow; i<= endRow; i++) {
+            line = doc.getLine(i);
+            range.start.row  = i;
+            range.end.row    = i;
+            range.end.column = line.length;
+
+            doc.replace(range, outdent ? line.match(re)[1] : "(*" + line + "*)");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
+
+        if (!(tokens.length && tokens[tokens.length - 1].type === 'comment') &&
+            state === 'start' && indenter.test(line))
+            indent += tab;
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Sergi Mansilla <sergi AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK *****
+ *
+ */
+
+define('ace/mode/ocaml_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var OcamlHighlightRules = function() {
+
+    var keywords = lang.arrayToMap((
+        "and|as|assert|begin|class|constraint|do|done|downto|else|end|"  +
+        "exception|external|for|fun|function|functor|if|in|include|"     +
+        "inherit|initializer|lazy|let|match|method|module|mutable|new|"  +
+        "object|of|open|or|private|rec|sig|struct|then|to|try|type|val|" +
+        "virtual|when|while|with").split("|")
+    );
+
+    var builtinConstants = lang.arrayToMap(
+        ("true|false").split("|")
+    );
+
+    var builtinFunctions = lang.arrayToMap((
+        "abs|abs_big_int|abs_float|abs_num|abstract_tag|accept|access|acos|add|" +
+        "add_available_units|add_big_int|add_buffer|add_channel|add_char|" +
+        "add_initializer|add_int_big_int|add_interfaces|add_num|add_string|" +
+        "add_substitute|add_substring|alarm|allocated_bytes|allow_only|" +
+        "allow_unsafe_modules|always|append|appname_get|appname_set|" +
+        "approx_num_exp|approx_num_fix|arg|argv|arith_status|array|" +
+        "array1_of_genarray|array2_of_genarray|array3_of_genarray|asin|asr|" +
+        "assoc|assq|at_exit|atan|atan2|auto_synchronize|background|basename|" +
+        "beginning_of_input|big_int_of_int|big_int_of_num|big_int_of_string|bind|" +
+        "bind_class|bind_tag|bits|bits_of_float|black|blit|blit_image|blue|bool|" +
+        "bool_of_string|bounded_full_split|bounded_split|bounded_split_delim|" +
+        "bprintf|break|broadcast|bscanf|button_down|c_layout|capitalize|cardinal|" +
+        "cardinal|catch|catch_break|ceil|ceiling_num|channel|char|char_of_int|" +
+        "chdir|check|check_suffix|chmod|choose|chop_extension|chop_suffix|chown|" +
+        "chown|chr|chroot|classify_float|clear|clear_available_units|" +
+        "clear_close_on_exec|clear_graph|clear_nonblock|clear_parser|" +
+        "close|close|closeTk|close_box|close_graph|close_in|close_in_noerr|" +
+        "close_out|close_out_noerr|close_process|close_process|" +
+        "close_process_full|close_process_in|close_process_out|close_subwindow|" +
+        "close_tag|close_tbox|closedir|closedir|closure_tag|code|combine|" +
+        "combine|combine|command|compact|compare|compare_big_int|compare_num|" +
+        "complex32|complex64|concat|conj|connect|contains|contains_from|contents|" +
+        "copy|cos|cosh|count|count|counters|create|create_alarm|create_image|" +
+        "create_matrix|create_matrix|create_matrix|create_object|" +
+        "create_object_and_run_initializers|create_object_opt|create_process|" +
+        "create_process|create_process_env|create_process_env|create_table|" +
+        "current|current_dir_name|current_point|current_x|current_y|curveto|" +
+        "custom_tag|cyan|data_size|decr|decr_num|default_available_units|delay|" +
+        "delete_alarm|descr_of_in_channel|descr_of_out_channel|destroy|diff|dim|" +
+        "dim1|dim2|dim3|dims|dirname|display_mode|div|div_big_int|div_num|" +
+        "double_array_tag|double_tag|draw_arc|draw_char|draw_circle|draw_ellipse|" +
+        "draw_image|draw_poly|draw_poly_line|draw_rect|draw_segments|draw_string|" +
+        "dummy_pos|dummy_table|dump_image|dup|dup2|elements|empty|end_of_input|" +
+        "environment|eprintf|epsilon_float|eq_big_int|eq_num|equal|err_formatter|" +
+        "error_message|escaped|establish_server|executable_name|execv|execve|execvp|" +
+        "execvpe|exists|exists2|exit|exp|failwith|fast_sort|fchmod|fchown|field|" +
+        "file|file_exists|fill|fill_arc|fill_circle|fill_ellipse|fill_poly|fill_rect|" +
+        "filter|final_tag|finalise|find|find_all|first_chars|firstkey|flatten|" +
+        "float|float32|float64|float_of_big_int|float_of_bits|float_of_int|" +
+        "float_of_num|float_of_string|floor|floor_num|flush|flush_all|flush_input|" +
+        "flush_str_formatter|fold|fold_left|fold_left2|fold_right|fold_right2|" +
+        "for_all|for_all2|force|force_newline|force_val|foreground|fork|" +
+        "format_of_string|formatter_of_buffer|formatter_of_out_channel|" +
+        "fortran_layout|forward_tag|fprintf|frexp|from|from_channel|from_file|" +
+        "from_file_bin|from_function|from_string|fscanf|fst|fstat|ftruncate|" +
+        "full_init|full_major|full_split|gcd_big_int|ge_big_int|ge_num|" +
+        "genarray_of_array1|genarray_of_array2|genarray_of_array3|get|" +
+        "get_all_formatter_output_functions|get_approx_printing|get_copy|" +
+        "get_ellipsis_text|get_error_when_null_denominator|get_floating_precision|" +
+        "get_formatter_output_functions|get_formatter_tag_functions|get_image|" +
+        "get_margin|get_mark_tags|get_max_boxes|get_max_indent|get_method|" +
+        "get_method_label|get_normalize_ratio|get_normalize_ratio_when_printing|" +
+        "get_print_tags|get_state|get_variable|getcwd|getegid|getegid|getenv|" +
+        "getenv|getenv|geteuid|geteuid|getgid|getgid|getgrgid|getgrgid|getgrnam|" +
+        "getgrnam|getgroups|gethostbyaddr|gethostbyname|gethostname|getitimer|" +
+        "getlogin|getpeername|getpid|getppid|getprotobyname|getprotobynumber|" +
+        "getpwnam|getpwuid|getservbyname|getservbyport|getsockname|getsockopt|" +
+        "getsockopt_float|getsockopt_int|getsockopt_optint|gettimeofday|getuid|" +
+        "global_replace|global_substitute|gmtime|green|grid|group_beginning|" +
+        "group_end|gt_big_int|gt_num|guard|handle_unix_error|hash|hash_param|" +
+        "hd|header_size|i|id|ignore|in_channel_length|in_channel_of_descr|incr|" +
+        "incr_num|index|index_from|inet_addr_any|inet_addr_of_string|infinity|" +
+        "infix_tag|init|init_class|input|input_binary_int|input_byte|input_char|" +
+        "input_line|input_value|int|int16_signed|int16_unsigned|int32|int64|" +
+        "int8_signed|int8_unsigned|int_of_big_int|int_of_char|int_of_float|" +
+        "int_of_num|int_of_string|integer_num|inter|interactive|inv|invalid_arg|" +
+        "is_block|is_empty|is_implicit|is_int|is_int_big_int|is_integer_num|" +
+        "is_relative|iter|iter2|iteri|join|junk|key_pressed|kill|kind|kprintf|" +
+        "kscanf|land|last_chars|layout|lazy_from_fun|lazy_from_val|lazy_is_val|" +
+        "lazy_tag|ldexp|le_big_int|le_num|length|lexeme|lexeme_char|lexeme_end|" +
+        "lexeme_end_p|lexeme_start|lexeme_start_p|lineto|link|list|listen|lnot|" +
+        "loadfile|loadfile_private|localtime|lock|lockf|log|log10|logand|lognot|" +
+        "logor|logxor|lor|lower_window|lowercase|lseek|lsl|lsr|lstat|lt_big_int|" +
+        "lt_num|lxor|magenta|magic|mainLoop|major|major_slice|make|make_formatter|" +
+        "make_image|make_lexer|make_matrix|make_self_init|map|map2|map_file|mapi|" +
+        "marshal|match_beginning|match_end|matched_group|matched_string|max|" +
+        "max_array_length|max_big_int|max_elt|max_float|max_int|max_num|" +
+        "max_string_length|mem|mem_assoc|mem_assq|memq|merge|min|min_big_int|" +
+        "min_elt|min_float|min_int|min_num|minor|minus_big_int|minus_num|" +
+        "minus_one|mkdir|mkfifo|mktime|mod|mod_big_int|mod_float|mod_num|modf|" +
+        "mouse_pos|moveto|mul|mult_big_int|mult_int_big_int|mult_num|nan|narrow|" +
+        "nat_of_num|nativeint|neg|neg_infinity|new_block|new_channel|new_method|" +
+        "new_variable|next|nextkey|nice|nice|no_scan_tag|norm|norm2|not|npeek|" +
+        "nth|nth_dim|num_digits_big_int|num_dims|num_of_big_int|num_of_int|" +
+        "num_of_nat|num_of_ratio|num_of_string|O|obj|object_tag|ocaml_version|" +
+        "of_array|of_channel|of_float|of_int|of_int32|of_list|of_nativeint|" +
+        "of_string|one|openTk|open_box|open_connection|open_graph|open_hbox|" +
+        "open_hovbox|open_hvbox|open_in|open_in_bin|open_in_gen|open_out|" +
+        "open_out_bin|open_out_gen|open_process|open_process_full|open_process_in|" +
+        "open_process_out|open_subwindow|open_tag|open_tbox|open_temp_file|" +
+        "open_vbox|opendbm|opendir|openfile|or|os_type|out_channel_length|" +
+        "out_channel_of_descr|output|output_binary_int|output_buffer|output_byte|" +
+        "output_char|output_string|output_value|over_max_boxes|pack|params|" +
+        "parent_dir_name|parse|parse_argv|partition|pause|peek|pipe|pixels|" +
+        "place|plot|plots|point_color|polar|poll|pop|pos_in|pos_out|pow|" +
+        "power_big_int_positive_big_int|power_big_int_positive_int|" +
+        "power_int_positive_big_int|power_int_positive_int|power_num|" +
+        "pp_close_box|pp_close_tag|pp_close_tbox|pp_force_newline|" +
+        "pp_get_all_formatter_output_functions|pp_get_ellipsis_text|" +
+        "pp_get_formatter_output_functions|pp_get_formatter_tag_functions|" +
+        "pp_get_margin|pp_get_mark_tags|pp_get_max_boxes|pp_get_max_indent|" +
+        "pp_get_print_tags|pp_open_box|pp_open_hbox|pp_open_hovbox|pp_open_hvbox|" +
+        "pp_open_tag|pp_open_tbox|pp_open_vbox|pp_over_max_boxes|pp_print_as|" +
+        "pp_print_bool|pp_print_break|pp_print_char|pp_print_cut|pp_print_float|" +
+        "pp_print_flush|pp_print_if_newline|pp_print_int|pp_print_newline|" +
+        "pp_print_space|pp_print_string|pp_print_tab|pp_print_tbreak|" +
+        "pp_set_all_formatter_output_functions|pp_set_ellipsis_text|" +
+        "pp_set_formatter_out_channel|pp_set_formatter_output_functions|" +
+        "pp_set_formatter_tag_functions|pp_set_margin|pp_set_mark_tags|" +
+        "pp_set_max_boxes|pp_set_max_indent|pp_set_print_tags|pp_set_tab|" +
+        "pp_set_tags|pred|pred_big_int|pred_num|prerr_char|prerr_endline|" +
+        "prerr_float|prerr_int|prerr_newline|prerr_string|print|print_as|" +
+        "print_bool|print_break|print_char|print_cut|print_endline|print_float|" +
+        "print_flush|print_if_newline|print_int|print_newline|print_space|" +
+        "print_stat|print_string|print_tab|print_tbreak|printf|prohibit|" +
+        "public_method_label|push|putenv|quo_num|quomod_big_int|quote|raise|" +
+        "raise_window|ratio_of_num|rcontains_from|read|read_float|read_int|" +
+        "read_key|read_line|readdir|readdir|readlink|really_input|receive|recv|" +
+        "recvfrom|red|ref|regexp|regexp_case_fold|regexp_string|" +
+        "regexp_string_case_fold|register|register_exception|rem|remember_mode|" +
+        "remove|remove_assoc|remove_assq|rename|replace|replace_first|" +
+        "replace_matched|repr|reset|reshape|reshape_1|reshape_2|reshape_3|rev|" +
+        "rev_append|rev_map|rev_map2|rewinddir|rgb|rhs_end|rhs_end_pos|rhs_start|" +
+        "rhs_start_pos|rindex|rindex_from|rlineto|rmdir|rmoveto|round_num|" +
+        "run_initializers|run_initializers_opt|scanf|search_backward|" +
+        "search_forward|seek_in|seek_out|select|self|self_init|send|sendto|set|" +
+        "set_all_formatter_output_functions|set_approx_printing|" +
+        "set_binary_mode_in|set_binary_mode_out|set_close_on_exec|" +
+        "set_close_on_exec|set_color|set_ellipsis_text|" +
+        "set_error_when_null_denominator|set_field|set_floating_precision|" +
+        "set_font|set_formatter_out_channel|set_formatter_output_functions|" +
+        "set_formatter_tag_functions|set_line_width|set_margin|set_mark_tags|" +
+        "set_max_boxes|set_max_indent|set_method|set_nonblock|set_nonblock|" +
+        "set_normalize_ratio|set_normalize_ratio_when_printing|set_print_tags|" +
+        "set_signal|set_state|set_tab|set_tag|set_tags|set_text_size|" +
+        "set_window_title|setgid|setgid|setitimer|setitimer|setsid|setsid|" +
+        "setsockopt|setsockopt|setsockopt_float|setsockopt_float|setsockopt_int|" +
+        "setsockopt_int|setsockopt_optint|setsockopt_optint|setuid|setuid|" +
+        "shift_left|shift_left|shift_left|shift_right|shift_right|shift_right|" +
+        "shift_right_logical|shift_right_logical|shift_right_logical|show_buckets|" +
+        "shutdown|shutdown|shutdown_connection|shutdown_connection|sigabrt|" +
+        "sigalrm|sigchld|sigcont|sigfpe|sighup|sigill|sigint|sigkill|sign_big_int|" +
+        "sign_num|signal|signal|sigpending|sigpending|sigpipe|sigprocmask|" +
+        "sigprocmask|sigprof|sigquit|sigsegv|sigstop|sigsuspend|sigsuspend|" +
+        "sigterm|sigtstp|sigttin|sigttou|sigusr1|sigusr2|sigvtalrm|sin|singleton|" +
+        "sinh|size|size|size_x|size_y|sleep|sleep|sleep|slice_left|slice_left|" +
+        "slice_left_1|slice_left_2|slice_right|slice_right|slice_right_1|" +
+        "slice_right_2|snd|socket|socket|socket|socketpair|socketpair|sort|sound|" +
+        "split|split_delim|sprintf|sprintf|sqrt|sqrt|sqrt_big_int|square_big_int|" +
+        "square_num|sscanf|stable_sort|stable_sort|stable_sort|stable_sort|stable_sort|" +
+        "stable_sort|stat|stat|stat|stat|stat|stats|stats|std_formatter|stdbuf|" +
+        "stderr|stderr|stderr|stdib|stdin|stdin|stdin|stdout|stdout|stdout|" +
+        "str_formatter|string|string_after|string_before|string_match|" +
+        "string_of_big_int|string_of_bool|string_of_float|string_of_format|" +
+        "string_of_inet_addr|string_of_inet_addr|string_of_int|string_of_num|" +
+        "string_partial_match|string_tag|sub|sub|sub_big_int|sub_left|sub_num|" +
+        "sub_right|subset|subset|substitute_first|substring|succ|succ|" +
+        "succ|succ|succ_big_int|succ_num|symbol_end|symbol_end_pos|symbol_start|" +
+        "symbol_start_pos|symlink|symlink|sync|synchronize|system|system|system|" +
+        "tag|take|tan|tanh|tcdrain|tcdrain|tcflow|tcflow|tcflush|tcflush|" +
+        "tcgetattr|tcgetattr|tcsendbreak|tcsendbreak|tcsetattr|tcsetattr|" +
+        "temp_file|text_size|time|time|time|timed_read|timed_write|times|times|" +
+        "tl|tl|tl|to_buffer|to_channel|to_float|to_hex|to_int|to_int32|to_list|" +
+        "to_list|to_list|to_nativeint|to_string|to_string|to_string|to_string|" +
+        "to_string|top|top|total_size|transfer|transp|truncate|truncate|truncate|" +
+        "truncate|truncate|truncate|try_lock|umask|umask|uncapitalize|uncapitalize|" +
+        "uncapitalize|union|union|unit_big_int|unlink|unlink|unlock|unmarshal|" +
+        "unsafe_blit|unsafe_fill|unsafe_get|unsafe_get|unsafe_set|unsafe_set|" +
+        "update|uppercase|uppercase|uppercase|uppercase|usage|utimes|utimes|wait|" +
+        "wait|wait|wait|wait_next_event|wait_pid|wait_read|wait_signal|" +
+        "wait_timed_read|wait_timed_write|wait_write|waitpid|white|" +
+        "widen|window_id|word_size|wrap|wrap_abort|write|yellow|yield|zero|zero_big_int|" +
+
+        "Arg|Arith_status|Array|Array1|Array2|Array3|ArrayLabels|Big_int|Bigarray|" +
+        "Buffer|Callback|CamlinternalOO|Char|Complex|Condition|Dbm|Digest|Dynlink|" +
+        "Event|Filename|Format|Gc|Genarray|Genlex|Graphics|GraphicsX11|Hashtbl|" +
+        "Int32|Int64|LargeFile|Lazy|Lexing|List|ListLabels|Make|Map|Marshal|" +
+        "MoreLabels|Mutex|Nativeint|Num|Obj|Oo|Parsing|Pervasives|Printexc|" +
+        "Printf|Queue|Random|Scanf|Scanning|Set|Sort|Stack|State|StdLabels|Str|" +
+        "Stream|String|StringLabels|Sys|Thread|ThreadUnix|Tk|Unix|UnixLabels|Weak"
+    ).split("|"));
+
+    var decimalInteger = "(?:(?:[1-9]\\d*)|(?:0))";
+    var octInteger = "(?:0[oO]?[0-7]+)";
+    var hexInteger = "(?:0[xX][\\dA-Fa-f]+)";
+    var binInteger = "(?:0[bB][01]+)";
+    var integer = "(?:" + decimalInteger + "|" + octInteger + "|" + hexInteger + "|" + binInteger + ")";
+
+    var exponent = "(?:[eE][+-]?\\d+)";
+    var fraction = "(?:\\.\\d+)";
+    var intPart = "(?:\\d+)";
+    var pointFloat = "(?:(?:" + intPart + "?" + fraction + ")|(?:" + intPart + "\\.))";
+    var exponentFloat = "(?:(?:" + pointFloat + "|" +  intPart + ")" + exponent + ")";
+    var floatNumber = "(?:" + exponentFloat + "|" + pointFloat + ")";
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : '\\(\\*.*?\\*\\)\\s*?$'
+            },
+            {
+                token : "comment",
+                merge : true,
+                regex : '\\(\\*.*',
+                next : "comment"
+            },
+            {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            },
+            {
+                token : "string", // single char
+                regex : "'.'"
+            },
+            {
+                token : "string", // " string
+                merge : true,
+                regex : '"',
+                next  : "qstring"
+            },
+            {
+                token : "constant.numeric", // imaginary
+                regex : "(?:" + floatNumber + "|\\d+)[jJ]\\b"
+            },
+            {
+                token : "constant.numeric", // float
+                regex : floatNumber
+            },
+            {
+                token : "constant.numeric", // integer
+                regex : integer + "\\b"
+            },
+            {
+                token : function(value) {
+                    if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (builtinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else if (builtinFunctions.hasOwnProperty(value))
+                        return "support.function";
+                    else
+                        return "identifier";
+                },
+                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+            },
+            {
+                token : "keyword.operator",
+                regex : "\\+\\.|\\-\\.|\\*\\.|\\/\\.|#|;;|\\+|\\-|\\*|\\*\\*\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|<-|="
+            },
+            {
+                token : "paren.lparen",
+                regex : "[[({]"
+            },
+            {
+                token : "paren.rparen",
+                regex : "[\\])}]"
+            },
+            {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\)",
+                next : "start"
+            },
+            {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+
+        "qstring" : [
+            {
+                token : "string",
+                regex : '"',
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ]
+    };
+};
+
+oop.inherits(OcamlHighlightRules, TextHighlightRules);
+
+exports.OcamlHighlightRules = OcamlHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-perl-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-perl-uncompressed.js
new file mode 100755
index 00000000000..c8bf4c47eb5
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-perl-uncompressed.js
@@ -0,0 +1,583 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Panagiotis Astithas <pastith AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/perl', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/perl_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var PerlHighlightRules = require("./perl_highlight_rules").PerlHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var Range = require("../range").Range;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new PerlHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var re = /^(\s*)#/;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i);
+                var m = line.match(re);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, "#");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+
+        if (state == "start") {
+            var match = line.match(/^.*[\{\(\[\:]\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Panagiotis Astithas <pastith AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/perl_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var PerlHighlightRules = function() {
+
+    var keywords = lang.arrayToMap(
+        ("base|constant|continue|else|elsif|for|foreach|format|goto|if|last|local|my|next|" +
+         "no|package|parent|redo|require|scalar|sub|unless|until|while|use|vars").split("|")
+    );
+
+    var buildinConstants = lang.arrayToMap(
+        ("ARGV|ENV|INC|SIG").split("|")
+    );
+
+    var builtinFunctions = lang.arrayToMap(
+        ("getprotobynumber|getprotobyname|getservbyname|gethostbyaddr|" +
+         "gethostbyname|getservbyport|getnetbyaddr|getnetbyname|getsockname|" +
+         "getpeername|setpriority|getprotoent|setprotoent|getpriority|" +
+         "endprotoent|getservent|setservent|endservent|sethostent|socketpair|" +
+         "getsockopt|gethostent|endhostent|setsockopt|setnetent|quotemeta|" +
+         "localtime|prototype|getnetent|endnetent|rewinddir|wantarray|getpwuid|" +
+         "closedir|getlogin|readlink|endgrent|getgrgid|getgrnam|shmwrite|" +
+         "shutdown|readline|endpwent|setgrent|readpipe|formline|truncate|" +
+         "dbmclose|syswrite|setpwent|getpwnam|getgrent|getpwent|ucfirst|sysread|" +
+         "setpgrp|shmread|sysseek|sysopen|telldir|defined|opendir|connect|" +
+         "lcfirst|getppid|binmode|syscall|sprintf|getpgrp|readdir|seekdir|" +
+         "waitpid|reverse|unshift|symlink|dbmopen|semget|msgrcv|rename|listen|" +
+         "chroot|msgsnd|shmctl|accept|unpack|exists|fileno|shmget|system|" +
+         "unlink|printf|gmtime|msgctl|semctl|values|rindex|substr|splice|" +
+         "length|msgget|select|socket|return|caller|delete|alarm|ioctl|index|" +
+         "undef|lstat|times|srand|chown|fcntl|close|write|umask|rmdir|study|" +
+         "sleep|chomp|untie|print|utime|mkdir|atan2|split|crypt|flock|chmod|" +
+         "BEGIN|bless|chdir|semop|shift|reset|link|stat|chop|grep|fork|dump|" +
+         "join|open|tell|pipe|exit|glob|warn|each|bind|sort|pack|eval|push|" +
+         "keys|getc|kill|seek|sqrt|send|wait|rand|tied|read|time|exec|recv|" +
+         "eof|chr|int|ord|exp|pos|pop|sin|log|abs|oct|hex|tie|cos|vec|END|ref|" +
+         "map|die|uc|lc|do").split("|")
+    );
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "#.*$"
+            }, {
+                token : "string.regexp",
+                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : '["].*\\\\$',
+                next : "qqstring"
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : "['].*\\\\$",
+                next : "qstring"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0x[0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : function(value) {
+                    if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else if (builtinFunctions.hasOwnProperty(value))
+                        return "support.function";
+                    else
+                        return "identifier";
+                },
+                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+            }, {
+                token : "keyword.operator",
+                regex : "\\.\\.\\.|\\|\\|=|>>=|<<=|<=>|&&=|=>|!~|\\^=|&=|\\|=|\\.=|x=|%=|\\/=|\\*=|\\-=|\\+=|=~|\\*\\*|\\-\\-|\\.\\.|\\|\\||&&|\\+\\+|\\->|!=|==|>=|<=|>>|<<|,|=|\\?\\:|\\^|\\||x|%|\\/|\\*|<|&|\\\\|~|!|>|\\.|\\-|\\+|\\-C|\\-b|\\-S|\\-u|\\-t|\\-p|\\-l|\\-d|\\-f|\\-g|\\-s|\\-z|\\-k|\\-e|\\-O|\\-T|\\-B|\\-M|\\-A|\\-X|\\-W|\\-c|\\-R|\\-o|\\-x|\\-w|\\-r|\\b(?:and|cmp|eq|ge|gt|le|lt|ne|not|or|xor)"
+            }, {
+                token : "lparen",
+                regex : "[[({]"
+            }, {
+                token : "rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        "qqstring" : [
+            {
+                token : "string",
+                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ],
+        "qstring" : [
+            {
+                token : "string",
+                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ]
+    };
+};
+
+oop.inherits(PerlHighlightRules, TextHighlightRules);
+
+exports.PerlHighlightRules = PerlHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-php-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-php-uncompressed.js
new file mode 100755
index 00000000000..58c9255623d
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-php-uncompressed.js
@@ -0,0 +1,1894 @@
+/* ***** BEGIN LICENSE BLOCK *****
+* Version: MPL 1.1/GPL 2.0/LGPL 2.1
+*
+* The contents of this file are subject to the Mozilla Public License Version
+* 1.1 (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+* http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS IS" basis,
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+* for the specific language governing rights and limitations under the
+* License.
+*
+* The Original Code is Ajax.org Code Editor (ACE).
+*
+* The Initial Developer of the Original Code is
+* Ajax.org B.V.
+* Portions created by the Initial Developer are Copyright (C) 2010
+* the Initial Developer. All Rights Reserved.
+*
+* Contributor(s):
+*      André Fiedler <fiedler dot andre a t gmail dot com>
+*
+* Alternatively, the contents of this file may be used under the terms of
+* either the GNU General Public License Version 2 or later (the "GPL"), or
+* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+* in which case the provisions of the GPL or the LGPL are applicable instead
+* of those above. If you wish to allow use of your version of this file only
+* under the terms of either the GPL or the LGPL, and not to allow others to
+* use your version of this file under the terms of the MPL, indicate your
+* decision by deleting the provisions above and replace them with the notice
+* and other provisions required by the GPL or the LGPL. If you do not delete
+* the provisions above, a recipient may use your version of this file under
+* the terms of any one of the MPL, the GPL or the LGPL.
+*
+* ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/php', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/php_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var PhpHighlightRules = require("./php_highlight_rules").PhpHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var Range = require("../range").Range;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new PhpHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var re = /^(\s*)#/;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i);
+                var m = line.match(re);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, "#");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+
+        if (state == "start") {
+            var match = line.match(/^.*[\{\(\[\:]\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      André Fiedler <fiedler dot andre a t gmail dot com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
+define('ace/mode/php_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var PhpHighlightRules = function() {
+    var docComment = new DocCommentHighlightRules();
+    // http://php.net/quickref.php
+    var builtinFunctions = lang.arrayToMap(
+        ('abs|acos|acosh|addcslashes|addslashes|aggregate|aggregate_info|aggregate_methods|aggregate_methods_by_list|aggregate_methods_by_regexp|' +
+        'aggregate_properties|aggregate_properties_by_list|aggregate_properties_by_regexp|aggregation_info|amqpconnection|amqpexchange|amqpqueue|' +
+        'apache_child_terminate|apache_get_modules|apache_get_version|apache_getenv|apache_lookup_uri|apache_note|apache_request_headers|' +
+        'apache_reset_timeout|apache_response_headers|apache_setenv|apc_add|apc_bin_dump|apc_bin_dumpfile|apc_bin_load|apc_bin_loadfile|' +
+        'apc_cache_info|apc_cas|apc_clear_cache|apc_compile_file|apc_dec|apc_define_constants|apc_delete|apc_delete_file|apc_exists|apc_fetch|' +
+        'apc_inc|apc_load_constants|apc_sma_info|apc_store|apciterator|apd_breakpoint|apd_callstack|apd_clunk|apd_continue|apd_croak|' +
+        'apd_dump_function_table|apd_dump_persistent_resources|apd_dump_regular_resources|apd_echo|apd_get_active_symbols|apd_set_pprof_trace|' +
+        'apd_set_session|apd_set_session_trace|apd_set_session_trace_socket|appenditerator|array|array_change_key_case|array_chunk|array_combine|' +
+        'array_count_values|array_diff|array_diff_assoc|array_diff_key|array_diff_uassoc|array_diff_ukey|array_fill|array_fill_keys|array_filter|' +
+        'array_flip|array_intersect|array_intersect_assoc|array_intersect_key|array_intersect_uassoc|array_intersect_ukey|array_key_exists|' +
+        'array_keys|array_map|array_merge|array_merge_recursive|array_multisort|array_pad|array_pop|array_product|array_push|array_rand|' +
+        'array_reduce|array_replace|array_replace_recursive|array_reverse|array_search|array_shift|array_slice|array_splice|array_sum|array_udiff|' +
+        'array_udiff_assoc|array_udiff_uassoc|array_uintersect|array_uintersect_assoc|array_uintersect_uassoc|array_unique|array_unshift|' +
+        'array_values|array_walk|array_walk_recursive|arrayaccess|arrayiterator|arrayobject|arsort|asin|asinh|asort|assert|assert_options|atan|' +
+        'atan2|atanh|audioproperties|badfunctioncallexception|badmethodcallexception|base64_decode|base64_encode|base_convert|basename|' +
+        'bbcode_add_element|bbcode_add_smiley|bbcode_create|bbcode_destroy|bbcode_parse|bbcode_set_arg_parser|bbcode_set_flags|bcadd|bccomp|bcdiv|' +
+        'bcmod|bcmul|bcompiler_load|bcompiler_load_exe|bcompiler_parse_class|bcompiler_read|bcompiler_write_class|bcompiler_write_constant|' +
+        'bcompiler_write_exe_footer|bcompiler_write_file|bcompiler_write_footer|bcompiler_write_function|bcompiler_write_functions_from_file|' +
+        'bcompiler_write_header|bcompiler_write_included_filename|bcpow|bcpowmod|bcscale|bcsqrt|bcsub|bin2hex|bind_textdomain_codeset|bindec|' +
+        'bindtextdomain|bson_decode|bson_encode|bumpValue|bzclose|bzcompress|bzdecompress|bzerrno|bzerror|bzerrstr|bzflush|bzopen|bzread|bzwrite|' +
+        'cachingiterator|cairo|cairo_create|cairo_font_face_get_type|cairo_font_face_status|cairo_font_options_create|cairo_font_options_equal|' +
+        'cairo_font_options_get_antialias|cairo_font_options_get_hint_metrics|cairo_font_options_get_hint_style|' +
+        'cairo_font_options_get_subpixel_order|cairo_font_options_hash|cairo_font_options_merge|cairo_font_options_set_antialias|' +
+        'cairo_font_options_set_hint_metrics|cairo_font_options_set_hint_style|cairo_font_options_set_subpixel_order|cairo_font_options_status|' +
+        'cairo_format_stride_for_width|cairo_image_surface_create|cairo_image_surface_create_for_data|cairo_image_surface_create_from_png|' +
+        'cairo_image_surface_get_data|cairo_image_surface_get_format|cairo_image_surface_get_height|cairo_image_surface_get_stride|' +
+        'cairo_image_surface_get_width|cairo_matrix_create_scale|cairo_matrix_create_translate|cairo_matrix_invert|cairo_matrix_multiply|' +
+        'cairo_matrix_rotate|cairo_matrix_transform_distance|cairo_matrix_transform_point|cairo_matrix_translate|cairo_pattern_add_color_stop_rgb|' +
+        'cairo_pattern_add_color_stop_rgba|cairo_pattern_create_for_surface|cairo_pattern_create_linear|cairo_pattern_create_radial|' +
+        'cairo_pattern_create_rgb|cairo_pattern_create_rgba|cairo_pattern_get_color_stop_count|cairo_pattern_get_color_stop_rgba|' +
+        'cairo_pattern_get_extend|cairo_pattern_get_filter|cairo_pattern_get_linear_points|cairo_pattern_get_matrix|' +
+        'cairo_pattern_get_radial_circles|cairo_pattern_get_rgba|cairo_pattern_get_surface|cairo_pattern_get_type|cairo_pattern_set_extend|' +
+        'cairo_pattern_set_filter|cairo_pattern_set_matrix|cairo_pattern_status|cairo_pdf_surface_create|cairo_pdf_surface_set_size|' +
+        'cairo_ps_get_levels|cairo_ps_level_to_string|cairo_ps_surface_create|cairo_ps_surface_dsc_begin_page_setup|' +
+        'cairo_ps_surface_dsc_begin_setup|cairo_ps_surface_dsc_comment|cairo_ps_surface_get_eps|cairo_ps_surface_restrict_to_level|' +
+        'cairo_ps_surface_set_eps|cairo_ps_surface_set_size|cairo_scaled_font_create|cairo_scaled_font_extents|cairo_scaled_font_get_ctm|' +
+        'cairo_scaled_font_get_font_face|cairo_scaled_font_get_font_matrix|cairo_scaled_font_get_font_options|cairo_scaled_font_get_scale_matrix|' +
+        'cairo_scaled_font_get_type|cairo_scaled_font_glyph_extents|cairo_scaled_font_status|cairo_scaled_font_text_extents|' +
+        'cairo_surface_copy_page|cairo_surface_create_similar|cairo_surface_finish|cairo_surface_flush|cairo_surface_get_content|' +
+        'cairo_surface_get_device_offset|cairo_surface_get_font_options|cairo_surface_get_type|cairo_surface_mark_dirty|' +
+        'cairo_surface_mark_dirty_rectangle|cairo_surface_set_device_offset|cairo_surface_set_fallback_resolution|cairo_surface_show_page|' +
+        'cairo_surface_status|cairo_surface_write_to_png|cairo_svg_surface_create|cairo_svg_surface_restrict_to_version|' +
+        'cairo_svg_version_to_string|cairoantialias|cairocontent|cairocontext|cairoexception|cairoextend|cairofillrule|cairofilter|cairofontface|' +
+        'cairofontoptions|cairofontslant|cairofonttype|cairofontweight|cairoformat|cairogradientpattern|cairohintmetrics|cairohintstyle|' +
+        'cairoimagesurface|cairolineargradient|cairolinecap|cairolinejoin|cairomatrix|cairooperator|cairopath|cairopattern|cairopatterntype|' +
+        'cairopdfsurface|cairopslevel|cairopssurface|cairoradialgradient|cairoscaledfont|cairosolidpattern|cairostatus|cairosubpixelorder|' +
+        'cairosurface|cairosurfacepattern|cairosurfacetype|cairosvgsurface|cairosvgversion|cairotoyfontface|cal_days_in_month|cal_from_jd|cal_info|' +
+        'cal_to_jd|calcul_hmac|calculhmac|call_user_func|call_user_func_array|call_user_method|call_user_method_array|callbackfilteriterator|ceil|' +
+        'chdb|chdb_create|chdir|checkdate|checkdnsrr|chgrp|chmod|chop|chown|chr|chroot|chunk_split|class_alias|class_exists|class_implements|' +
+        'class_parents|classkit_import|classkit_method_add|classkit_method_copy|classkit_method_redefine|classkit_method_remove|' +
+        'classkit_method_rename|clearstatcache|clone|closedir|closelog|collator|com|com_addref|com_create_guid|com_event_sink|com_get|' +
+        'com_get_active_object|com_invoke|com_isenum|com_load|com_load_typelib|com_message_pump|com_print_typeinfo|com_propget|com_propput|' +
+        'com_propset|com_release|com_set|compact|connection_aborted|connection_status|connection_timeout|constant|construct|construct|construct|' +
+        'convert_cyr_string|convert_uudecode|convert_uuencode|copy|cos|cosh|count|count_chars|countable|counter_bump|counter_bump_value|' +
+        'counter_create|counter_get|counter_get_meta|counter_get_named|counter_get_value|counter_reset|counter_reset_value|crack_check|' +
+        'crack_closedict|crack_getlastmessage|crack_opendict|crc32|create_function|crypt|ctype_alnum|ctype_alpha|ctype_cntrl|ctype_digit|' +
+        'ctype_graph|ctype_lower|ctype_print|ctype_punct|ctype_space|ctype_upper|ctype_xdigit|cubrid_affected_rows|cubrid_bind|' +
+        'cubrid_client_encoding|cubrid_close|cubrid_close_prepare|cubrid_close_request|cubrid_col_get|cubrid_col_size|cubrid_column_names|' +
+        'cubrid_column_types|cubrid_commit|cubrid_connect|cubrid_connect_with_url|cubrid_current_oid|cubrid_data_seek|cubrid_db_name|' +
+        'cubrid_disconnect|cubrid_drop|cubrid_errno|cubrid_error|cubrid_error_code|cubrid_error_code_facility|cubrid_error_msg|cubrid_execute|' +
+        'cubrid_fetch|cubrid_fetch_array|cubrid_fetch_assoc|cubrid_fetch_field|cubrid_fetch_lengths|cubrid_fetch_object|cubrid_fetch_row|' +
+        'cubrid_field_flags|cubrid_field_len|cubrid_field_name|cubrid_field_seek|cubrid_field_table|cubrid_field_type|cubrid_free_result|' +
+        'cubrid_get|cubrid_get_autocommit|cubrid_get_charset|cubrid_get_class_name|cubrid_get_client_info|cubrid_get_db_parameter|' +
+        'cubrid_get_server_info|cubrid_insert_id|cubrid_is_instance|cubrid_list_dbs|cubrid_load_from_glo|cubrid_lob_close|cubrid_lob_export|' +
+        'cubrid_lob_get|cubrid_lob_send|cubrid_lob_size|cubrid_lock_read|cubrid_lock_write|cubrid_move_cursor|cubrid_new_glo|cubrid_next_result|' +
+        'cubrid_num_cols|cubrid_num_fields|cubrid_num_rows|cubrid_ping|cubrid_prepare|cubrid_put|cubrid_query|cubrid_real_escape_string|' +
+        'cubrid_result|cubrid_rollback|cubrid_save_to_glo|cubrid_schema|cubrid_send_glo|cubrid_seq_drop|cubrid_seq_insert|cubrid_seq_put|' +
+        'cubrid_set_add|cubrid_set_autocommit|cubrid_set_db_parameter|cubrid_set_drop|cubrid_unbuffered_query|cubrid_version|curl_close|' +
+        'curl_copy_handle|curl_errno|curl_error|curl_exec|curl_getinfo|curl_init|curl_multi_add_handle|curl_multi_close|curl_multi_exec|' +
+        'curl_multi_getcontent|curl_multi_info_read|curl_multi_init|curl_multi_remove_handle|curl_multi_select|curl_setopt|curl_setopt_array|' +
+        'curl_version|current|cyrus_authenticate|cyrus_bind|cyrus_close|cyrus_connect|cyrus_query|cyrus_unbind|date|date_add|date_create|' +
+        'date_create_from_format|date_date_set|date_default_timezone_get|date_default_timezone_set|date_diff|date_format|date_get_last_errors|' +
+        'date_interval_create_from_date_string|date_interval_format|date_isodate_set|date_modify|date_offset_get|date_parse|date_parse_from_format|' +
+        'date_sub|date_sun_info|date_sunrise|date_sunset|date_time_set|date_timestamp_get|date_timestamp_set|date_timezone_get|date_timezone_set|' +
+        'dateinterval|dateperiod|datetime|datetimezone|db2_autocommit|db2_bind_param|db2_client_info|db2_close|db2_column_privileges|db2_columns|' +
+        'db2_commit|db2_conn_error|db2_conn_errormsg|db2_connect|db2_cursor_type|db2_escape_string|db2_exec|db2_execute|db2_fetch_array|' +
+        'db2_fetch_assoc|db2_fetch_both|db2_fetch_object|db2_fetch_row|db2_field_display_size|db2_field_name|db2_field_num|db2_field_precision|' +
+        'db2_field_scale|db2_field_type|db2_field_width|db2_foreign_keys|db2_free_result|db2_free_stmt|db2_get_option|db2_last_insert_id|' +
+        'db2_lob_read|db2_next_result|db2_num_fields|db2_num_rows|db2_pclose|db2_pconnect|db2_prepare|db2_primary_keys|db2_procedure_columns|' +
+        'db2_procedures|db2_result|db2_rollback|db2_server_info|db2_set_option|db2_special_columns|db2_statistics|db2_stmt_error|db2_stmt_errormsg|' +
+        'db2_table_privileges|db2_tables|dba_close|dba_delete|dba_exists|dba_fetch|dba_firstkey|dba_handlers|dba_insert|dba_key_split|dba_list|' +
+        'dba_nextkey|dba_open|dba_optimize|dba_popen|dba_replace|dba_sync|dbase_add_record|dbase_close|dbase_create|dbase_delete_record|' +
+        'dbase_get_header_info|dbase_get_record|dbase_get_record_with_names|dbase_numfields|dbase_numrecords|dbase_open|dbase_pack|' +
+        'dbase_replace_record|dbplus_add|dbplus_aql|dbplus_chdir|dbplus_close|dbplus_curr|dbplus_errcode|dbplus_errno|dbplus_find|dbplus_first|' +
+        'dbplus_flush|dbplus_freealllocks|dbplus_freelock|dbplus_freerlocks|dbplus_getlock|dbplus_getunique|dbplus_info|dbplus_last|dbplus_lockrel|' +
+        'dbplus_next|dbplus_open|dbplus_prev|dbplus_rchperm|dbplus_rcreate|dbplus_rcrtexact|dbplus_rcrtlike|dbplus_resolve|dbplus_restorepos|' +
+        'dbplus_rkeys|dbplus_ropen|dbplus_rquery|dbplus_rrename|dbplus_rsecindex|dbplus_runlink|dbplus_rzap|dbplus_savepos|dbplus_setindex|' +
+        'dbplus_setindexbynumber|dbplus_sql|dbplus_tcl|dbplus_tremove|dbplus_undo|dbplus_undoprepare|dbplus_unlockrel|dbplus_unselect|' +
+        'dbplus_update|dbplus_xlockrel|dbplus_xunlockrel|dbx_close|dbx_compare|dbx_connect|dbx_error|dbx_escape_string|dbx_fetch_row|dbx_query|' +
+        'dbx_sort|dcgettext|dcngettext|deaggregate|debug_backtrace|debug_print_backtrace|debug_zval_dump|decbin|dechex|decoct|define|' +
+        'define_syslog_variables|defined|deg2rad|delete|dgettext|die|dio_close|dio_fcntl|dio_open|dio_read|dio_seek|dio_stat|dio_tcsetattr|' +
+        'dio_truncate|dio_write|dir|directoryiterator|dirname|disk_free_space|disk_total_space|diskfreespace|dl|dngettext|dns_check_record|' +
+        'dns_get_mx|dns_get_record|dom_import_simplexml|domainexception|domattr|domattribute_name|domattribute_set_value|domattribute_specified|' +
+        'domattribute_value|domcharacterdata|domcomment|domdocument|domdocument_add_root|domdocument_create_attribute|' +
+        'domdocument_create_cdata_section|domdocument_create_comment|domdocument_create_element|domdocument_create_element_ns|' +
+        'domdocument_create_entity_reference|domdocument_create_processing_instruction|domdocument_create_text_node|domdocument_doctype|' +
+        'domdocument_document_element|domdocument_dump_file|domdocument_dump_mem|domdocument_get_element_by_id|domdocument_get_elements_by_tagname|' +
+        'domdocument_html_dump_mem|domdocument_xinclude|domdocumentfragment|domdocumenttype|domdocumenttype_entities|' +
+        'domdocumenttype_internal_subset|domdocumenttype_name|domdocumenttype_notations|domdocumenttype_public_id|domdocumenttype_system_id|' +
+        'domelement|domelement_get_attribute|domelement_get_attribute_node|domelement_get_elements_by_tagname|domelement_has_attribute|' +
+        'domelement_remove_attribute|domelement_set_attribute|domelement_set_attribute_node|domelement_tagname|domentity|domentityreference|' +
+        'domexception|domimplementation|domnamednodemap|domnode|domnode_add_namespace|domnode_append_child|domnode_append_sibling|' +
+        'domnode_attributes|domnode_child_nodes|domnode_clone_node|domnode_dump_node|domnode_first_child|domnode_get_content|' +
+        'domnode_has_attributes|domnode_has_child_nodes|domnode_insert_before|domnode_is_blank_node|domnode_last_child|domnode_next_sibling|' +
+        'domnode_node_name|domnode_node_type|domnode_node_value|domnode_owner_document|domnode_parent_node|domnode_prefix|domnode_previous_sibling|' +
+        'domnode_remove_child|domnode_replace_child|domnode_replace_node|domnode_set_content|domnode_set_name|domnode_set_namespace|' +
+        'domnode_unlink_node|domnodelist|domnotation|domprocessinginstruction|domprocessinginstruction_data|domprocessinginstruction_target|' +
+        'domtext|domxml_new_doc|domxml_open_file|domxml_open_mem|domxml_version|domxml_xmltree|domxml_xslt_stylesheet|domxml_xslt_stylesheet_doc|' +
+        'domxml_xslt_stylesheet_file|domxml_xslt_version|domxpath|domxsltstylesheet_process|domxsltstylesheet_result_dump_file|' +
+        'domxsltstylesheet_result_dump_mem|dotnet|dotnet_load|doubleval|each|easter_date|easter_days|echo|empty|emptyiterator|' +
+        'enchant_broker_describe|enchant_broker_dict_exists|enchant_broker_free|enchant_broker_free_dict|enchant_broker_get_error|' +
+        'enchant_broker_init|enchant_broker_list_dicts|enchant_broker_request_dict|enchant_broker_request_pwl_dict|enchant_broker_set_ordering|' +
+        'enchant_dict_add_to_personal|enchant_dict_add_to_session|enchant_dict_check|enchant_dict_describe|enchant_dict_get_error|' +
+        'enchant_dict_is_in_session|enchant_dict_quick_check|enchant_dict_store_replacement|enchant_dict_suggest|end|ereg|ereg_replace|eregi|' +
+        'eregi_replace|error_get_last|error_log|error_reporting|errorexception|escapeshellarg|escapeshellcmd|eval|event_add|event_base_free|' +
+        'event_base_loop|event_base_loopbreak|event_base_loopexit|event_base_new|event_base_priority_init|event_base_set|event_buffer_base_set|' +
+        'event_buffer_disable|event_buffer_enable|event_buffer_fd_set|event_buffer_free|event_buffer_new|event_buffer_priority_set|' +
+        'event_buffer_read|event_buffer_set_callback|event_buffer_timeout_set|event_buffer_watermark_set|event_buffer_write|event_del|event_free|' +
+        'event_new|event_set|exception|exec|exif_imagetype|exif_read_data|exif_tagname|exif_thumbnail|exit|exp|expect_expectl|expect_popen|explode|' +
+        'expm1|export|export|extension_loaded|extract|ezmlm_hash|fam_cancel_monitor|fam_close|fam_monitor_collection|fam_monitor_directory|' +
+        'fam_monitor_file|fam_next_event|fam_open|fam_pending|fam_resume_monitor|fam_suspend_monitor|fbsql_affected_rows|fbsql_autocommit|' +
+        'fbsql_blob_size|fbsql_change_user|fbsql_clob_size|fbsql_close|fbsql_commit|fbsql_connect|fbsql_create_blob|fbsql_create_clob|' +
+        'fbsql_create_db|fbsql_data_seek|fbsql_database|fbsql_database_password|fbsql_db_query|fbsql_db_status|fbsql_drop_db|fbsql_errno|' +
+        'fbsql_error|fbsql_fetch_array|fbsql_fetch_assoc|fbsql_fetch_field|fbsql_fetch_lengths|fbsql_fetch_object|fbsql_fetch_row|' +
+        'fbsql_field_flags|fbsql_field_len|fbsql_field_name|fbsql_field_seek|fbsql_field_table|fbsql_field_type|fbsql_free_result|' +
+        'fbsql_get_autostart_info|fbsql_hostname|fbsql_insert_id|fbsql_list_dbs|fbsql_list_fields|fbsql_list_tables|fbsql_next_result|' +
+        'fbsql_num_fields|fbsql_num_rows|fbsql_password|fbsql_pconnect|fbsql_query|fbsql_read_blob|fbsql_read_clob|fbsql_result|fbsql_rollback|' +
+        'fbsql_rows_fetched|fbsql_select_db|fbsql_set_characterset|fbsql_set_lob_mode|fbsql_set_password|fbsql_set_transaction|fbsql_start_db|' +
+        'fbsql_stop_db|fbsql_table_name|fbsql_tablename|fbsql_username|fbsql_warnings|fclose|fdf_add_doc_javascript|fdf_add_template|fdf_close|' +
+        'fdf_create|fdf_enum_values|fdf_errno|fdf_error|fdf_get_ap|fdf_get_attachment|fdf_get_encoding|fdf_get_file|fdf_get_flags|fdf_get_opt|' +
+        'fdf_get_status|fdf_get_value|fdf_get_version|fdf_header|fdf_next_field_name|fdf_open|fdf_open_string|fdf_remove_item|fdf_save|' +
+        'fdf_save_string|fdf_set_ap|fdf_set_encoding|fdf_set_file|fdf_set_flags|fdf_set_javascript_action|fdf_set_on_import_javascript|fdf_set_opt|' +
+        'fdf_set_status|fdf_set_submit_form_action|fdf_set_target_frame|fdf_set_value|fdf_set_version|feof|fflush|fgetc|fgetcsv|fgets|fgetss|file|' +
+        'file_exists|file_get_contents|file_put_contents|fileatime|filectime|filegroup|fileinode|filemtime|fileowner|fileperms|filepro|' +
+        'filepro_fieldcount|filepro_fieldname|filepro_fieldtype|filepro_fieldwidth|filepro_retrieve|filepro_rowcount|filesize|filesystemiterator|' +
+        'filetype|filter_has_var|filter_id|filter_input|filter_input_array|filter_list|filter_var|filter_var_array|filteriterator|finfo_buffer|' +
+        'finfo_close|finfo_file|finfo_open|finfo_set_flags|floatval|flock|floor|flush|fmod|fnmatch|fopen|forward_static_call|' +
+        'forward_static_call_array|fpassthru|fprintf|fputcsv|fputs|fread|frenchtojd|fribidi_log2vis|fscanf|fseek|fsockopen|fstat|ftell|ftok|' +
+        'ftp_alloc|ftp_cdup|ftp_chdir|ftp_chmod|ftp_close|ftp_connect|ftp_delete|ftp_exec|ftp_fget|ftp_fput|ftp_get|ftp_get_option|ftp_login|' +
+        'ftp_mdtm|ftp_mkdir|ftp_nb_continue|ftp_nb_fget|ftp_nb_fput|ftp_nb_get|ftp_nb_put|ftp_nlist|ftp_pasv|ftp_put|ftp_pwd|ftp_quit|ftp_raw|' +
+        'ftp_rawlist|ftp_rename|ftp_rmdir|ftp_set_option|ftp_site|ftp_size|ftp_ssl_connect|ftp_systype|ftruncate|func_get_arg|func_get_args|' +
+        'func_num_args|function_exists|fwrite|gc_collect_cycles|gc_disable|gc_enable|gc_enabled|gd_info|gearmanclient|gearmanjob|gearmantask|' +
+        'gearmanworker|geoip_continent_code_by_name|geoip_country_code3_by_name|geoip_country_code_by_name|geoip_country_name_by_name|' +
+        'geoip_database_info|geoip_db_avail|geoip_db_filename|geoip_db_get_all_info|geoip_id_by_name|geoip_isp_by_name|geoip_org_by_name|' +
+        'geoip_record_by_name|geoip_region_by_name|geoip_region_name_by_code|geoip_time_zone_by_country_and_region|getMeta|getNamed|getValue|' +
+        'get_browser|get_called_class|get_cfg_var|get_class|get_class_methods|get_class_vars|get_current_user|get_declared_classes|' +
+        'get_declared_interfaces|get_defined_constants|get_defined_functions|get_defined_vars|get_extension_funcs|get_headers|' +
+        'get_html_translation_table|get_include_path|get_included_files|get_loaded_extensions|get_magic_quotes_gpc|get_magic_quotes_runtime|' +
+        'get_meta_tags|get_object_vars|get_parent_class|get_required_files|get_resource_type|getallheaders|getconstant|getconstants|getconstructor|' +
+        'getcwd|getdate|getdefaultproperties|getdoccomment|getendline|getenv|getextension|getextensionname|getfilename|gethostbyaddr|gethostbyname|' +
+        'gethostbynamel|gethostname|getimagesize|getinterfacenames|getinterfaces|getlastmod|getmethod|getmethods|getmodifiers|getmxrr|getmygid|' +
+        'getmyinode|getmypid|getmyuid|getname|getnamespacename|getopt|getparentclass|getproperties|getproperty|getprotobyname|getprotobynumber|' +
+        'getrandmax|getrusage|getservbyname|getservbyport|getshortname|getstartline|getstaticproperties|getstaticpropertyvalue|gettext|' +
+        'gettimeofday|gettype|glob|globiterator|gmagick|gmagickdraw|gmagickpixel|gmdate|gmmktime|gmp_abs|gmp_add|gmp_and|gmp_clrbit|gmp_cmp|' +
+        'gmp_com|gmp_div|gmp_div_q|gmp_div_qr|gmp_div_r|gmp_divexact|gmp_fact|gmp_gcd|gmp_gcdext|gmp_hamdist|gmp_init|gmp_intval|gmp_invert|' +
+        'gmp_jacobi|gmp_legendre|gmp_mod|gmp_mul|gmp_neg|gmp_nextprime|gmp_or|gmp_perfect_square|gmp_popcount|gmp_pow|gmp_powm|gmp_prob_prime|' +
+        'gmp_random|gmp_scan0|gmp_scan1|gmp_setbit|gmp_sign|gmp_sqrt|gmp_sqrtrem|gmp_strval|gmp_sub|gmp_testbit|gmp_xor|gmstrftime|' +
+        'gnupg_adddecryptkey|gnupg_addencryptkey|gnupg_addsignkey|gnupg_cleardecryptkeys|gnupg_clearencryptkeys|gnupg_clearsignkeys|gnupg_decrypt|' +
+        'gnupg_decryptverify|gnupg_encrypt|gnupg_encryptsign|gnupg_export|gnupg_geterror|gnupg_getprotocol|gnupg_import|gnupg_init|gnupg_keyinfo|' +
+        'gnupg_setarmor|gnupg_seterrormode|gnupg_setsignmode|gnupg_sign|gnupg_verify|gopher_parsedir|grapheme_extract|grapheme_stripos|' +
+        'grapheme_stristr|grapheme_strlen|grapheme_strpos|grapheme_strripos|grapheme_strrpos|grapheme_strstr|grapheme_substr|gregoriantojd|' +
+        'gupnp_context_get_host_ip|gupnp_context_get_port|gupnp_context_get_subscription_timeout|gupnp_context_host_path|gupnp_context_new|' +
+        'gupnp_context_set_subscription_timeout|gupnp_context_timeout_add|gupnp_context_unhost_path|gupnp_control_point_browse_start|' +
+        'gupnp_control_point_browse_stop|gupnp_control_point_callback_set|gupnp_control_point_new|gupnp_device_action_callback_set|' +
+        'gupnp_device_info_get|gupnp_device_info_get_service|gupnp_root_device_get_available|gupnp_root_device_get_relative_location|' +
+        'gupnp_root_device_new|gupnp_root_device_set_available|gupnp_root_device_start|gupnp_root_device_stop|gupnp_service_action_get|' +
+        'gupnp_service_action_return|gupnp_service_action_return_error|gupnp_service_action_set|gupnp_service_freeze_notify|gupnp_service_info_get|' +
+        'gupnp_service_info_get_introspection|gupnp_service_introspection_get_state_variable|gupnp_service_notify|gupnp_service_proxy_action_get|' +
+        'gupnp_service_proxy_action_set|gupnp_service_proxy_add_notify|gupnp_service_proxy_callback_set|gupnp_service_proxy_get_subscribed|' +
+        'gupnp_service_proxy_remove_notify|gupnp_service_proxy_set_subscribed|gupnp_service_thaw_notify|gzclose|gzcompress|gzdecode|gzdeflate|' +
+        'gzencode|gzeof|gzfile|gzgetc|gzgets|gzgetss|gzinflate|gzopen|gzpassthru|gzputs|gzread|gzrewind|gzseek|gztell|gzuncompress|gzwrite|' +
+        'halt_compiler|haruannotation|haruannotation_setborderstyle|haruannotation_sethighlightmode|haruannotation_seticon|' +
+        'haruannotation_setopened|harudestination|harudestination_setfit|harudestination_setfitb|harudestination_setfitbh|harudestination_setfitbv|' +
+        'harudestination_setfith|harudestination_setfitr|harudestination_setfitv|harudestination_setxyz|harudoc|harudoc_addpage|' +
+        'harudoc_addpagelabel|harudoc_construct|harudoc_createoutline|harudoc_getcurrentencoder|harudoc_getcurrentpage|harudoc_getencoder|' +
+        'harudoc_getfont|harudoc_getinfoattr|harudoc_getpagelayout|harudoc_getpagemode|harudoc_getstreamsize|harudoc_insertpage|harudoc_loadjpeg|' +
+        'harudoc_loadpng|harudoc_loadraw|harudoc_loadttc|harudoc_loadttf|harudoc_loadtype1|harudoc_output|harudoc_readfromstream|' +
+        'harudoc_reseterror|harudoc_resetstream|harudoc_save|harudoc_savetostream|harudoc_setcompressionmode|harudoc_setcurrentencoder|' +
+        'harudoc_setencryptionmode|harudoc_setinfoattr|harudoc_setinfodateattr|harudoc_setopenaction|harudoc_setpagelayout|harudoc_setpagemode|' +
+        'harudoc_setpagesconfiguration|harudoc_setpassword|harudoc_setpermission|harudoc_usecnsencodings|harudoc_usecnsfonts|' +
+        'harudoc_usecntencodings|harudoc_usecntfonts|harudoc_usejpencodings|harudoc_usejpfonts|harudoc_usekrencodings|harudoc_usekrfonts|' +
+        'haruencoder|haruencoder_getbytetype|haruencoder_gettype|haruencoder_getunicode|haruencoder_getwritingmode|haruexception|harufont|' +
+        'harufont_getascent|harufont_getcapheight|harufont_getdescent|harufont_getencodingname|harufont_getfontname|harufont_gettextwidth|' +
+        'harufont_getunicodewidth|harufont_getxheight|harufont_measuretext|haruimage|haruimage_getbitspercomponent|haruimage_getcolorspace|' +
+        'haruimage_getheight|haruimage_getsize|haruimage_getwidth|haruimage_setcolormask|haruimage_setmaskimage|haruoutline|' +
+        'haruoutline_setdestination|haruoutline_setopened|harupage|harupage_arc|harupage_begintext|harupage_circle|harupage_closepath|' +
+        'harupage_concat|harupage_createdestination|harupage_createlinkannotation|harupage_createtextannotation|harupage_createurlannotation|' +
+        'harupage_curveto|harupage_curveto2|harupage_curveto3|harupage_drawimage|harupage_ellipse|harupage_endpath|harupage_endtext|' +
+        'harupage_eofill|harupage_eofillstroke|harupage_fill|harupage_fillstroke|harupage_getcharspace|harupage_getcmykfill|harupage_getcmykstroke|' +
+        'harupage_getcurrentfont|harupage_getcurrentfontsize|harupage_getcurrentpos|harupage_getcurrenttextpos|harupage_getdash|' +
+        'harupage_getfillingcolorspace|harupage_getflatness|harupage_getgmode|harupage_getgrayfill|harupage_getgraystroke|harupage_getheight|' +
+        'harupage_gethorizontalscaling|harupage_getlinecap|harupage_getlinejoin|harupage_getlinewidth|harupage_getmiterlimit|harupage_getrgbfill|' +
+        'harupage_getrgbstroke|harupage_getstrokingcolorspace|harupage_gettextleading|harupage_gettextmatrix|harupage_gettextrenderingmode|' +
+        'harupage_gettextrise|harupage_gettextwidth|harupage_gettransmatrix|harupage_getwidth|harupage_getwordspace|harupage_lineto|' +
+        'harupage_measuretext|harupage_movetextpos|harupage_moveto|harupage_movetonextline|harupage_rectangle|harupage_setcharspace|' +
+        'harupage_setcmykfill|harupage_setcmykstroke|harupage_setdash|harupage_setflatness|harupage_setfontandsize|harupage_setgrayfill|' +
+        'harupage_setgraystroke|harupage_setheight|harupage_sethorizontalscaling|harupage_setlinecap|harupage_setlinejoin|harupage_setlinewidth|' +
+        'harupage_setmiterlimit|harupage_setrgbfill|harupage_setrgbstroke|harupage_setrotate|harupage_setsize|harupage_setslideshow|' +
+        'harupage_settextleading|harupage_settextmatrix|harupage_settextrenderingmode|harupage_settextrise|harupage_setwidth|harupage_setwordspace|' +
+        'harupage_showtext|harupage_showtextnextline|harupage_stroke|harupage_textout|harupage_textrect|hasconstant|hash|hash_algos|hash_copy|' +
+        'hash_file|hash_final|hash_hmac|hash_hmac_file|hash_init|hash_update|hash_update_file|hash_update_stream|hasmethod|hasproperty|header|' +
+        'header_register_callback|header_remove|headers_list|headers_sent|hebrev|hebrevc|hex2bin|hexdec|highlight_file|highlight_string|' +
+        'html_entity_decode|htmlentities|htmlspecialchars|htmlspecialchars_decode|http_build_cookie|http_build_query|http_build_str|http_build_url|' +
+        'http_cache_etag|http_cache_last_modified|http_chunked_decode|http_date|http_deflate|http_get|http_get_request_body|' +
+        'http_get_request_body_stream|http_get_request_headers|http_head|http_inflate|http_match_etag|http_match_modified|' +
+        'http_match_request_header|http_negotiate_charset|http_negotiate_content_type|http_negotiate_language|http_parse_cookie|http_parse_headers|' +
+        'http_parse_message|http_parse_params|http_persistent_handles_clean|http_persistent_handles_count|http_persistent_handles_ident|' +
+        'http_post_data|http_post_fields|http_put_data|http_put_file|http_put_stream|http_redirect|http_request|http_request_body_encode|' +
+        'http_request_method_exists|http_request_method_name|http_request_method_register|http_request_method_unregister|http_response_code|' +
+        'http_send_content_disposition|http_send_content_type|http_send_data|http_send_file|http_send_last_modified|http_send_status|' +
+        'http_send_stream|http_support|http_throttle|httpdeflatestream|httpdeflatestream_construct|httpdeflatestream_factory|' +
+        'httpdeflatestream_finish|httpdeflatestream_flush|httpdeflatestream_update|httpinflatestream|httpinflatestream_construct|' +
+        'httpinflatestream_factory|httpinflatestream_finish|httpinflatestream_flush|httpinflatestream_update|httpmessage|httpmessage_addheaders|' +
+        'httpmessage_construct|httpmessage_detach|httpmessage_factory|httpmessage_fromenv|httpmessage_fromstring|httpmessage_getbody|' +
+        'httpmessage_getheader|httpmessage_getheaders|httpmessage_gethttpversion|httpmessage_getparentmessage|httpmessage_getrequestmethod|' +
+        'httpmessage_getrequesturl|httpmessage_getresponsecode|httpmessage_getresponsestatus|httpmessage_gettype|httpmessage_guesscontenttype|' +
+        'httpmessage_prepend|httpmessage_reverse|httpmessage_send|httpmessage_setbody|httpmessage_setheaders|httpmessage_sethttpversion|' +
+        'httpmessage_setrequestmethod|httpmessage_setrequesturl|httpmessage_setresponsecode|httpmessage_setresponsestatus|httpmessage_settype|' +
+        'httpmessage_tomessagetypeobject|httpmessage_tostring|httpquerystring|httpquerystring_construct|httpquerystring_get|httpquerystring_mod|' +
+        'httpquerystring_set|httpquerystring_singleton|httpquerystring_toarray|httpquerystring_tostring|httpquerystring_xlate|httprequest|' +
+        'httprequest_addcookies|httprequest_addheaders|httprequest_addpostfields|httprequest_addpostfile|httprequest_addputdata|' +
+        'httprequest_addquerydata|httprequest_addrawpostdata|httprequest_addssloptions|httprequest_clearhistory|httprequest_construct|' +
+        'httprequest_enablecookies|httprequest_getcontenttype|httprequest_getcookies|httprequest_getheaders|httprequest_gethistory|' +
+        'httprequest_getmethod|httprequest_getoptions|httprequest_getpostfields|httprequest_getpostfiles|httprequest_getputdata|' +
+        'httprequest_getputfile|httprequest_getquerydata|httprequest_getrawpostdata|httprequest_getrawrequestmessage|' +
+        'httprequest_getrawresponsemessage|httprequest_getrequestmessage|httprequest_getresponsebody|httprequest_getresponsecode|' +
+        'httprequest_getresponsecookies|httprequest_getresponsedata|httprequest_getresponseheader|httprequest_getresponseinfo|' +
+        'httprequest_getresponsemessage|httprequest_getresponsestatus|httprequest_getssloptions|httprequest_geturl|httprequest_resetcookies|' +
+        'httprequest_send|httprequest_setcontenttype|httprequest_setcookies|httprequest_setheaders|httprequest_setmethod|httprequest_setoptions|' +
+        'httprequest_setpostfields|httprequest_setpostfiles|httprequest_setputdata|httprequest_setputfile|httprequest_setquerydata|' +
+        'httprequest_setrawpostdata|httprequest_setssloptions|httprequest_seturl|httprequestpool|httprequestpool_attach|httprequestpool_construct|' +
+        'httprequestpool_destruct|httprequestpool_detach|httprequestpool_getattachedrequests|httprequestpool_getfinishedrequests|' +
+        'httprequestpool_reset|httprequestpool_send|httprequestpool_socketperform|httprequestpool_socketselect|httpresponse|httpresponse_capture|' +
+        'httpresponse_getbuffersize|httpresponse_getcache|httpresponse_getcachecontrol|httpresponse_getcontentdisposition|' +
+        'httpresponse_getcontenttype|httpresponse_getdata|httpresponse_getetag|httpresponse_getfile|httpresponse_getgzip|httpresponse_getheader|' +
+        'httpresponse_getlastmodified|httpresponse_getrequestbody|httpresponse_getrequestbodystream|httpresponse_getrequestheaders|' +
+        'httpresponse_getstream|httpresponse_getthrottledelay|httpresponse_guesscontenttype|httpresponse_redirect|httpresponse_send|' +
+        'httpresponse_setbuffersize|httpresponse_setcache|httpresponse_setcachecontrol|httpresponse_setcontentdisposition|' +
+        'httpresponse_setcontenttype|httpresponse_setdata|httpresponse_setetag|httpresponse_setfile|httpresponse_setgzip|httpresponse_setheader|' +
+        'httpresponse_setlastmodified|httpresponse_setstream|httpresponse_setthrottledelay|httpresponse_status|hw_array2objrec|hw_changeobject|' +
+        'hw_children|hw_childrenobj|hw_close|hw_connect|hw_connection_info|hw_cp|hw_deleteobject|hw_docbyanchor|hw_docbyanchorobj|' +
+        'hw_document_attributes|hw_document_bodytag|hw_document_content|hw_document_setcontent|hw_document_size|hw_dummy|hw_edittext|hw_error|' +
+        'hw_errormsg|hw_free_document|hw_getanchors|hw_getanchorsobj|hw_getandlock|hw_getchildcoll|hw_getchildcollobj|hw_getchilddoccoll|' +
+        'hw_getchilddoccollobj|hw_getobject|hw_getobjectbyquery|hw_getobjectbyquerycoll|hw_getobjectbyquerycollobj|hw_getobjectbyqueryobj|' +
+        'hw_getparents|hw_getparentsobj|hw_getrellink|hw_getremote|hw_getremotechildren|hw_getsrcbydestobj|hw_gettext|hw_getusername|hw_identify|' +
+        'hw_incollections|hw_info|hw_inscoll|hw_insdoc|hw_insertanchors|hw_insertdocument|hw_insertobject|hw_mapid|hw_modifyobject|hw_mv|' +
+        'hw_new_document|hw_objrec2array|hw_output_document|hw_pconnect|hw_pipedocument|hw_root|hw_setlinkroot|hw_stat|hw_unlock|hw_who|' +
+        'hwapi_attribute|hwapi_attribute_key|hwapi_attribute_langdepvalue|hwapi_attribute_value|hwapi_attribute_values|hwapi_checkin|' +
+        'hwapi_checkout|hwapi_children|hwapi_content|hwapi_content_mimetype|hwapi_content_read|hwapi_copy|hwapi_dbstat|hwapi_dcstat|' +
+        'hwapi_dstanchors|hwapi_dstofsrcanchor|hwapi_error_count|hwapi_error_reason|hwapi_find|hwapi_ftstat|hwapi_hgcsp|hwapi_hwstat|' +
+        'hwapi_identify|hwapi_info|hwapi_insert|hwapi_insertanchor|hwapi_insertcollection|hwapi_insertdocument|hwapi_link|hwapi_lock|hwapi_move|' +
+        'hwapi_new_content|hwapi_object|hwapi_object_assign|hwapi_object_attreditable|hwapi_object_count|hwapi_object_insert|hwapi_object_new|' +
+        'hwapi_object_remove|hwapi_object_title|hwapi_object_value|hwapi_objectbyanchor|hwapi_parents|hwapi_reason_description|hwapi_reason_type|' +
+        'hwapi_remove|hwapi_replace|hwapi_setcommittedversion|hwapi_srcanchors|hwapi_srcsofdst|hwapi_unlock|hwapi_user|hwapi_userlist|hypot|' +
+        'ibase_add_user|ibase_affected_rows|ibase_backup|ibase_blob_add|ibase_blob_cancel|ibase_blob_close|ibase_blob_create|ibase_blob_echo|' +
+        'ibase_blob_get|ibase_blob_import|ibase_blob_info|ibase_blob_open|ibase_close|ibase_commit|ibase_commit_ret|ibase_connect|ibase_db_info|' +
+        'ibase_delete_user|ibase_drop_db|ibase_errcode|ibase_errmsg|ibase_execute|ibase_fetch_assoc|ibase_fetch_object|ibase_fetch_row|' +
+        'ibase_field_info|ibase_free_event_handler|ibase_free_query|ibase_free_result|ibase_gen_id|ibase_maintain_db|ibase_modify_user|' +
+        'ibase_name_result|ibase_num_fields|ibase_num_params|ibase_param_info|ibase_pconnect|ibase_prepare|ibase_query|ibase_restore|' +
+        'ibase_rollback|ibase_rollback_ret|ibase_server_info|ibase_service_attach|ibase_service_detach|ibase_set_event_handler|ibase_timefmt|' +
+        'ibase_trans|ibase_wait_event|iconv|iconv_get_encoding|iconv_mime_decode|iconv_mime_decode_headers|iconv_mime_encode|iconv_set_encoding|' +
+        'iconv_strlen|iconv_strpos|iconv_strrpos|iconv_substr|id3_get_frame_long_name|id3_get_frame_short_name|id3_get_genre_id|id3_get_genre_list|' +
+        'id3_get_genre_name|id3_get_tag|id3_get_version|id3_remove_tag|id3_set_tag|id3v2attachedpictureframe|id3v2frame|id3v2tag|idate|' +
+        'idn_to_ascii|idn_to_unicode|idn_to_utf8|ifx_affected_rows|ifx_blobinfile_mode|ifx_byteasvarchar|ifx_close|ifx_connect|ifx_copy_blob|' +
+        'ifx_create_blob|ifx_create_char|ifx_do|ifx_error|ifx_errormsg|ifx_fetch_row|ifx_fieldproperties|ifx_fieldtypes|ifx_free_blob|' +
+        'ifx_free_char|ifx_free_result|ifx_get_blob|ifx_get_char|ifx_getsqlca|ifx_htmltbl_result|ifx_nullformat|ifx_num_fields|ifx_num_rows|' +
+        'ifx_pconnect|ifx_prepare|ifx_query|ifx_textasvarchar|ifx_update_blob|ifx_update_char|ifxus_close_slob|ifxus_create_slob|ifxus_free_slob|' +
+        'ifxus_open_slob|ifxus_read_slob|ifxus_seek_slob|ifxus_tell_slob|ifxus_write_slob|ignore_user_abort|iis_add_server|iis_get_dir_security|' +
+        'iis_get_script_map|iis_get_server_by_comment|iis_get_server_by_path|iis_get_server_rights|iis_get_service_state|iis_remove_server|' +
+        'iis_set_app_settings|iis_set_dir_security|iis_set_script_map|iis_set_server_rights|iis_start_server|iis_start_service|iis_stop_server|' +
+        'iis_stop_service|image2wbmp|image_type_to_extension|image_type_to_mime_type|imagealphablending|imageantialias|imagearc|imagechar|' +
+        'imagecharup|imagecolorallocate|imagecolorallocatealpha|imagecolorat|imagecolorclosest|imagecolorclosestalpha|imagecolorclosesthwb|' +
+        'imagecolordeallocate|imagecolorexact|imagecolorexactalpha|imagecolormatch|imagecolorresolve|imagecolorresolvealpha|imagecolorset|' +
+        'imagecolorsforindex|imagecolorstotal|imagecolortransparent|imageconvolution|imagecopy|imagecopymerge|imagecopymergegray|' +
+        'imagecopyresampled|imagecopyresized|imagecreate|imagecreatefromgd|imagecreatefromgd2|imagecreatefromgd2part|imagecreatefromgif|' +
+        'imagecreatefromjpeg|imagecreatefrompng|imagecreatefromstring|imagecreatefromwbmp|imagecreatefromxbm|imagecreatefromxpm|' +
+        'imagecreatetruecolor|imagedashedline|imagedestroy|imageellipse|imagefill|imagefilledarc|imagefilledellipse|imagefilledpolygon|' +
+        'imagefilledrectangle|imagefilltoborder|imagefilter|imagefontheight|imagefontwidth|imageftbbox|imagefttext|imagegammacorrect|imagegd|' +
+        'imagegd2|imagegif|imagegrabscreen|imagegrabwindow|imageinterlace|imageistruecolor|imagejpeg|imagelayereffect|imageline|imageloadfont|' +
+        'imagepalettecopy|imagepng|imagepolygon|imagepsbbox|imagepsencodefont|imagepsextendfont|imagepsfreefont|imagepsloadfont|imagepsslantfont|' +
+        'imagepstext|imagerectangle|imagerotate|imagesavealpha|imagesetbrush|imagesetpixel|imagesetstyle|imagesetthickness|imagesettile|' +
+        'imagestring|imagestringup|imagesx|imagesy|imagetruecolortopalette|imagettfbbox|imagettftext|imagetypes|imagewbmp|imagexbm|imagick|' +
+        'imagick_adaptiveblurimage|imagick_adaptiveresizeimage|imagick_adaptivesharpenimage|imagick_adaptivethresholdimage|imagick_addimage|' +
+        'imagick_addnoiseimage|imagick_affinetransformimage|imagick_animateimages|imagick_annotateimage|imagick_appendimages|imagick_averageimages|' +
+        'imagick_blackthresholdimage|imagick_blurimage|imagick_borderimage|imagick_charcoalimage|imagick_chopimage|imagick_clear|imagick_clipimage|' +
+        'imagick_clippathimage|imagick_clone|imagick_clutimage|imagick_coalesceimages|imagick_colorfloodfillimage|imagick_colorizeimage|' +
+        'imagick_combineimages|imagick_commentimage|imagick_compareimagechannels|imagick_compareimagelayers|imagick_compareimages|' +
+        'imagick_compositeimage|imagick_construct|imagick_contrastimage|imagick_contraststretchimage|imagick_convolveimage|imagick_cropimage|' +
+        'imagick_cropthumbnailimage|imagick_current|imagick_cyclecolormapimage|imagick_decipherimage|imagick_deconstructimages|' +
+        'imagick_deleteimageartifact|imagick_despeckleimage|imagick_destroy|imagick_displayimage|imagick_displayimages|imagick_distortimage|' +
+        'imagick_drawimage|imagick_edgeimage|imagick_embossimage|imagick_encipherimage|imagick_enhanceimage|imagick_equalizeimage|' +
+        'imagick_evaluateimage|imagick_extentimage|imagick_flattenimages|imagick_flipimage|imagick_floodfillpaintimage|imagick_flopimage|' +
+        'imagick_frameimage|imagick_fximage|imagick_gammaimage|imagick_gaussianblurimage|imagick_getcolorspace|imagick_getcompression|' +
+        'imagick_getcompressionquality|imagick_getcopyright|imagick_getfilename|imagick_getfont|imagick_getformat|imagick_getgravity|' +
+        'imagick_gethomeurl|imagick_getimage|imagick_getimagealphachannel|imagick_getimageartifact|imagick_getimagebackgroundcolor|' +
+        'imagick_getimageblob|imagick_getimageblueprimary|imagick_getimagebordercolor|imagick_getimagechanneldepth|' +
+        'imagick_getimagechanneldistortion|imagick_getimagechanneldistortions|imagick_getimagechannelextrema|imagick_getimagechannelmean|' +
+        'imagick_getimagechannelrange|imagick_getimagechannelstatistics|imagick_getimageclipmask|imagick_getimagecolormapcolor|' +
+        'imagick_getimagecolors|imagick_getimagecolorspace|imagick_getimagecompose|imagick_getimagecompression|imagick_getimagecompressionquality|' +
+        'imagick_getimagedelay|imagick_getimagedepth|imagick_getimagedispose|imagick_getimagedistortion|imagick_getimageextrema|' +
+        'imagick_getimagefilename|imagick_getimageformat|imagick_getimagegamma|imagick_getimagegeometry|imagick_getimagegravity|' +
+        'imagick_getimagegreenprimary|imagick_getimageheight|imagick_getimagehistogram|imagick_getimageindex|imagick_getimageinterlacescheme|' +
+        'imagick_getimageinterpolatemethod|imagick_getimageiterations|imagick_getimagelength|imagick_getimagemagicklicense|imagick_getimagematte|' +
+        'imagick_getimagemattecolor|imagick_getimageorientation|imagick_getimagepage|imagick_getimagepixelcolor|imagick_getimageprofile|' +
+        'imagick_getimageprofiles|imagick_getimageproperties|imagick_getimageproperty|imagick_getimageredprimary|imagick_getimageregion|' +
+        'imagick_getimagerenderingintent|imagick_getimageresolution|imagick_getimagesblob|imagick_getimagescene|imagick_getimagesignature|' +
+        'imagick_getimagesize|imagick_getimagetickspersecond|imagick_getimagetotalinkdensity|imagick_getimagetype|imagick_getimageunits|' +
+        'imagick_getimagevirtualpixelmethod|imagick_getimagewhitepoint|imagick_getimagewidth|imagick_getinterlacescheme|imagick_getiteratorindex|' +
+        'imagick_getnumberimages|imagick_getoption|imagick_getpackagename|imagick_getpage|imagick_getpixeliterator|imagick_getpixelregioniterator|' +
+        'imagick_getpointsize|imagick_getquantumdepth|imagick_getquantumrange|imagick_getreleasedate|imagick_getresource|imagick_getresourcelimit|' +
+        'imagick_getsamplingfactors|imagick_getsize|imagick_getsizeoffset|imagick_getversion|imagick_hasnextimage|imagick_haspreviousimage|' +
+        'imagick_identifyimage|imagick_implodeimage|imagick_labelimage|imagick_levelimage|imagick_linearstretchimage|imagick_liquidrescaleimage|' +
+        'imagick_magnifyimage|imagick_mapimage|imagick_mattefloodfillimage|imagick_medianfilterimage|imagick_mergeimagelayers|imagick_minifyimage|' +
+        'imagick_modulateimage|imagick_montageimage|imagick_morphimages|imagick_mosaicimages|imagick_motionblurimage|imagick_negateimage|' +
+        'imagick_newimage|imagick_newpseudoimage|imagick_nextimage|imagick_normalizeimage|imagick_oilpaintimage|imagick_opaquepaintimage|' +
+        'imagick_optimizeimagelayers|imagick_orderedposterizeimage|imagick_paintfloodfillimage|imagick_paintopaqueimage|' +
+        'imagick_painttransparentimage|imagick_pingimage|imagick_pingimageblob|imagick_pingimagefile|imagick_polaroidimage|imagick_posterizeimage|' +
+        'imagick_previewimages|imagick_previousimage|imagick_profileimage|imagick_quantizeimage|imagick_quantizeimages|imagick_queryfontmetrics|' +
+        'imagick_queryfonts|imagick_queryformats|imagick_radialblurimage|imagick_raiseimage|imagick_randomthresholdimage|imagick_readimage|' +
+        'imagick_readimageblob|imagick_readimagefile|imagick_recolorimage|imagick_reducenoiseimage|imagick_removeimage|imagick_removeimageprofile|' +
+        'imagick_render|imagick_resampleimage|imagick_resetimagepage|imagick_resizeimage|imagick_rollimage|imagick_rotateimage|' +
+        'imagick_roundcorners|imagick_sampleimage|imagick_scaleimage|imagick_separateimagechannel|imagick_sepiatoneimage|' +
+        'imagick_setbackgroundcolor|imagick_setcolorspace|imagick_setcompression|imagick_setcompressionquality|imagick_setfilename|' +
+        'imagick_setfirstiterator|imagick_setfont|imagick_setformat|imagick_setgravity|imagick_setimage|imagick_setimagealphachannel|' +
+        'imagick_setimageartifact|imagick_setimagebackgroundcolor|imagick_setimagebias|imagick_setimageblueprimary|imagick_setimagebordercolor|' +
+        'imagick_setimagechanneldepth|imagick_setimageclipmask|imagick_setimagecolormapcolor|imagick_setimagecolorspace|imagick_setimagecompose|' +
+        'imagick_setimagecompression|imagick_setimagecompressionquality|imagick_setimagedelay|imagick_setimagedepth|imagick_setimagedispose|' +
+        'imagick_setimageextent|imagick_setimagefilename|imagick_setimageformat|imagick_setimagegamma|imagick_setimagegravity|' +
+        'imagick_setimagegreenprimary|imagick_setimageindex|imagick_setimageinterlacescheme|imagick_setimageinterpolatemethod|' +
+        'imagick_setimageiterations|imagick_setimagematte|imagick_setimagemattecolor|imagick_setimageopacity|imagick_setimageorientation|' +
+        'imagick_setimagepage|imagick_setimageprofile|imagick_setimageproperty|imagick_setimageredprimary|imagick_setimagerenderingintent|' +
+        'imagick_setimageresolution|imagick_setimagescene|imagick_setimagetickspersecond|imagick_setimagetype|imagick_setimageunits|' +
+        'imagick_setimagevirtualpixelmethod|imagick_setimagewhitepoint|imagick_setinterlacescheme|imagick_setiteratorindex|imagick_setlastiterator|' +
+        'imagick_setoption|imagick_setpage|imagick_setpointsize|imagick_setresolution|imagick_setresourcelimit|imagick_setsamplingfactors|' +
+        'imagick_setsize|imagick_setsizeoffset|imagick_settype|imagick_shadeimage|imagick_shadowimage|imagick_sharpenimage|imagick_shaveimage|' +
+        'imagick_shearimage|imagick_sigmoidalcontrastimage|imagick_sketchimage|imagick_solarizeimage|imagick_spliceimage|imagick_spreadimage|' +
+        'imagick_steganoimage|imagick_stereoimage|imagick_stripimage|imagick_swirlimage|imagick_textureimage|imagick_thresholdimage|' +
+        'imagick_thumbnailimage|imagick_tintimage|imagick_transformimage|imagick_transparentpaintimage|imagick_transposeimage|' +
+        'imagick_transverseimage|imagick_trimimage|imagick_uniqueimagecolors|imagick_unsharpmaskimage|imagick_valid|imagick_vignetteimage|' +
+        'imagick_waveimage|imagick_whitethresholdimage|imagick_writeimage|imagick_writeimagefile|imagick_writeimages|imagick_writeimagesfile|' +
+        'imagickdraw|imagickdraw_affine|imagickdraw_annotation|imagickdraw_arc|imagickdraw_bezier|imagickdraw_circle|imagickdraw_clear|' +
+        'imagickdraw_clone|imagickdraw_color|imagickdraw_comment|imagickdraw_composite|imagickdraw_construct|imagickdraw_destroy|' +
+        'imagickdraw_ellipse|imagickdraw_getclippath|imagickdraw_getcliprule|imagickdraw_getclipunits|imagickdraw_getfillcolor|' +
+        'imagickdraw_getfillopacity|imagickdraw_getfillrule|imagickdraw_getfont|imagickdraw_getfontfamily|imagickdraw_getfontsize|' +
+        'imagickdraw_getfontstyle|imagickdraw_getfontweight|imagickdraw_getgravity|imagickdraw_getstrokeantialias|imagickdraw_getstrokecolor|' +
+        'imagickdraw_getstrokedasharray|imagickdraw_getstrokedashoffset|imagickdraw_getstrokelinecap|imagickdraw_getstrokelinejoin|' +
+        'imagickdraw_getstrokemiterlimit|imagickdraw_getstrokeopacity|imagickdraw_getstrokewidth|imagickdraw_gettextalignment|' +
+        'imagickdraw_gettextantialias|imagickdraw_gettextdecoration|imagickdraw_gettextencoding|imagickdraw_gettextundercolor|' +
+        'imagickdraw_getvectorgraphics|imagickdraw_line|imagickdraw_matte|imagickdraw_pathclose|imagickdraw_pathcurvetoabsolute|' +
+        'imagickdraw_pathcurvetoquadraticbezierabsolute|imagickdraw_pathcurvetoquadraticbezierrelative|' +
+        'imagickdraw_pathcurvetoquadraticbeziersmoothabsolute|imagickdraw_pathcurvetoquadraticbeziersmoothrelative|imagickdraw_pathcurvetorelative|' +
+        'imagickdraw_pathcurvetosmoothabsolute|imagickdraw_pathcurvetosmoothrelative|imagickdraw_pathellipticarcabsolute|' +
+        'imagickdraw_pathellipticarcrelative|imagickdraw_pathfinish|imagickdraw_pathlinetoabsolute|imagickdraw_pathlinetohorizontalabsolute|' +
+        'imagickdraw_pathlinetohorizontalrelative|imagickdraw_pathlinetorelative|imagickdraw_pathlinetoverticalabsolute|' +
+        'imagickdraw_pathlinetoverticalrelative|imagickdraw_pathmovetoabsolute|imagickdraw_pathmovetorelative|imagickdraw_pathstart|' +
+        'imagickdraw_point|imagickdraw_polygon|imagickdraw_polyline|imagickdraw_pop|imagickdraw_popclippath|imagickdraw_popdefs|' +
+        'imagickdraw_poppattern|imagickdraw_push|imagickdraw_pushclippath|imagickdraw_pushdefs|imagickdraw_pushpattern|imagickdraw_rectangle|' +
+        'imagickdraw_render|imagickdraw_rotate|imagickdraw_roundrectangle|imagickdraw_scale|imagickdraw_setclippath|imagickdraw_setcliprule|' +
+        'imagickdraw_setclipunits|imagickdraw_setfillalpha|imagickdraw_setfillcolor|imagickdraw_setfillopacity|imagickdraw_setfillpatternurl|' +
+        'imagickdraw_setfillrule|imagickdraw_setfont|imagickdraw_setfontfamily|imagickdraw_setfontsize|imagickdraw_setfontstretch|' +
+        'imagickdraw_setfontstyle|imagickdraw_setfontweight|imagickdraw_setgravity|imagickdraw_setstrokealpha|imagickdraw_setstrokeantialias|' +
+        'imagickdraw_setstrokecolor|imagickdraw_setstrokedasharray|imagickdraw_setstrokedashoffset|imagickdraw_setstrokelinecap|' +
+        'imagickdraw_setstrokelinejoin|imagickdraw_setstrokemiterlimit|imagickdraw_setstrokeopacity|imagickdraw_setstrokepatternurl|' +
+        'imagickdraw_setstrokewidth|imagickdraw_settextalignment|imagickdraw_settextantialias|imagickdraw_settextdecoration|' +
+        'imagickdraw_settextencoding|imagickdraw_settextundercolor|imagickdraw_setvectorgraphics|imagickdraw_setviewbox|imagickdraw_skewx|' +
+        'imagickdraw_skewy|imagickdraw_translate|imagickpixel|imagickpixel_clear|imagickpixel_construct|imagickpixel_destroy|imagickpixel_getcolor|' +
+        'imagickpixel_getcolorasstring|imagickpixel_getcolorcount|imagickpixel_getcolorvalue|imagickpixel_gethsl|imagickpixel_issimilar|' +
+        'imagickpixel_setcolor|imagickpixel_setcolorvalue|imagickpixel_sethsl|imagickpixeliterator|imagickpixeliterator_clear|' +
+        'imagickpixeliterator_construct|imagickpixeliterator_destroy|imagickpixeliterator_getcurrentiteratorrow|' +
+        'imagickpixeliterator_getiteratorrow|imagickpixeliterator_getnextiteratorrow|imagickpixeliterator_getpreviousiteratorrow|' +
+        'imagickpixeliterator_newpixeliterator|imagickpixeliterator_newpixelregioniterator|imagickpixeliterator_resetiterator|' +
+        'imagickpixeliterator_setiteratorfirstrow|imagickpixeliterator_setiteratorlastrow|imagickpixeliterator_setiteratorrow|' +
+        'imagickpixeliterator_synciterator|imap_8bit|imap_alerts|imap_append|imap_base64|imap_binary|imap_body|imap_bodystruct|imap_check|' +
+        'imap_clearflag_full|imap_close|imap_create|imap_createmailbox|imap_delete|imap_deletemailbox|imap_errors|imap_expunge|imap_fetch_overview|' +
+        'imap_fetchbody|imap_fetchheader|imap_fetchmime|imap_fetchstructure|imap_fetchtext|imap_gc|imap_get_quota|imap_get_quotaroot|imap_getacl|' +
+        'imap_getmailboxes|imap_getsubscribed|imap_header|imap_headerinfo|imap_headers|imap_last_error|imap_list|imap_listmailbox|imap_listscan|' +
+        'imap_listsubscribed|imap_lsub|imap_mail|imap_mail_compose|imap_mail_copy|imap_mail_move|imap_mailboxmsginfo|imap_mime_header_decode|' +
+        'imap_msgno|imap_num_msg|imap_num_recent|imap_open|imap_ping|imap_qprint|imap_rename|imap_renamemailbox|imap_reopen|' +
+        'imap_rfc822_parse_adrlist|imap_rfc822_parse_headers|imap_rfc822_write_address|imap_savebody|imap_scan|imap_scanmailbox|imap_search|' +
+        'imap_set_quota|imap_setacl|imap_setflag_full|imap_sort|imap_status|imap_subscribe|imap_thread|imap_timeout|imap_uid|imap_undelete|' +
+        'imap_unsubscribe|imap_utf7_decode|imap_utf7_encode|imap_utf8|implementsinterface|implode|import_request_variables|in_array|include|' +
+        'include_once|inclued_get_data|inet_ntop|inet_pton|infiniteiterator|ingres_autocommit|ingres_autocommit_state|ingres_charset|ingres_close|' +
+        'ingres_commit|ingres_connect|ingres_cursor|ingres_errno|ingres_error|ingres_errsqlstate|ingres_escape_string|ingres_execute|' +
+        'ingres_fetch_array|ingres_fetch_assoc|ingres_fetch_object|ingres_fetch_proc_return|ingres_fetch_row|ingres_field_length|ingres_field_name|' +
+        'ingres_field_nullable|ingres_field_precision|ingres_field_scale|ingres_field_type|ingres_free_result|ingres_next_error|ingres_num_fields|' +
+        'ingres_num_rows|ingres_pconnect|ingres_prepare|ingres_query|ingres_result_seek|ingres_rollback|ingres_set_environment|' +
+        'ingres_unbuffered_query|ini_alter|ini_get|ini_get_all|ini_restore|ini_set|innamespace|inotify_add_watch|inotify_init|inotify_queue_len|' +
+        'inotify_read|inotify_rm_watch|interface_exists|intl_error_name|intl_get_error_code|intl_get_error_message|intl_is_failure|' +
+        'intldateformatter|intval|invalidargumentexception|invoke|invokeargs|ip2long|iptcembed|iptcparse|is_a|is_array|is_bool|is_callable|is_dir|' +
+        'is_double|is_executable|is_file|is_finite|is_float|is_infinite|is_int|is_integer|is_link|is_long|is_nan|is_null|is_numeric|is_object|' +
+        'is_readable|is_real|is_resource|is_scalar|is_soap_fault|is_string|is_subclass_of|is_uploaded_file|is_writable|is_writeable|isabstract|' +
+        'iscloneable|isdisabled|isfinal|isinstance|isinstantiable|isinterface|isinternal|isiterateable|isset|issubclassof|isuserdefined|iterator|' +
+        'iterator_apply|iterator_count|iterator_to_array|iteratoraggregate|iteratoriterator|java_last_exception_clear|java_last_exception_get|' +
+        'jddayofweek|jdmonthname|jdtofrench|jdtogregorian|jdtojewish|jdtojulian|jdtounix|jewishtojd|join|jpeg2wbmp|json_decode|json_encode|' +
+        'json_last_error|jsonserializable|judy|judy_type|judy_version|juliantojd|kadm5_chpass_principal|kadm5_create_principal|' +
+        'kadm5_delete_principal|kadm5_destroy|kadm5_flush|kadm5_get_policies|kadm5_get_principal|kadm5_get_principals|kadm5_init_with_password|' +
+        'kadm5_modify_principal|key|krsort|ksort|lcfirst|lcg_value|lchgrp|lchown|ldap_8859_to_t61|ldap_add|ldap_bind|ldap_close|ldap_compare|' +
+        'ldap_connect|ldap_count_entries|ldap_delete|ldap_dn2ufn|ldap_err2str|ldap_errno|ldap_error|ldap_explode_dn|ldap_first_attribute|' +
+        'ldap_first_entry|ldap_first_reference|ldap_free_result|ldap_get_attributes|ldap_get_dn|ldap_get_entries|ldap_get_option|ldap_get_values|' +
+        'ldap_get_values_len|ldap_list|ldap_mod_add|ldap_mod_del|ldap_mod_replace|ldap_modify|ldap_next_attribute|ldap_next_entry|' +
+        'ldap_next_reference|ldap_parse_reference|ldap_parse_result|ldap_read|ldap_rename|ldap_sasl_bind|ldap_search|ldap_set_option|' +
+        'ldap_set_rebind_proc|ldap_sort|ldap_start_tls|ldap_t61_to_8859|ldap_unbind|lengthexception|levenshtein|libxml_clear_errors|' +
+        'libxml_disable_entity_loader|libxml_get_errors|libxml_get_last_error|libxml_set_streams_context|libxml_use_internal_errors|libxmlerror|' +
+        'limititerator|link|linkinfo|list|locale|localeconv|localtime|log|log10|log1p|logicexception|long2ip|lstat|ltrim|lzf_compress|' +
+        'lzf_decompress|lzf_optimized_for|m_checkstatus|m_completeauthorizations|m_connect|m_connectionerror|m_deletetrans|m_destroyconn|' +
+        'm_destroyengine|m_getcell|m_getcellbynum|m_getcommadelimited|m_getheader|m_initconn|m_initengine|m_iscommadelimited|m_maxconntimeout|' +
+        'm_monitor|m_numcolumns|m_numrows|m_parsecommadelimited|m_responsekeys|m_responseparam|m_returnstatus|m_setblocking|m_setdropfile|m_setip|' +
+        'm_setssl|m_setssl_cafile|m_setssl_files|m_settimeout|m_sslcert_gen_hash|m_transactionssent|m_transinqueue|m_transkeyval|m_transnew|' +
+        'm_transsend|m_uwait|m_validateidentifier|m_verifyconnection|m_verifysslcert|magic_quotes_runtime|mail|' +
+        'mailparse_determine_best_xfer_encoding|mailparse_msg_create|mailparse_msg_extract_part|mailparse_msg_extract_part_file|' +
+        'mailparse_msg_extract_whole_part_file|mailparse_msg_free|mailparse_msg_get_part|mailparse_msg_get_part_data|mailparse_msg_get_structure|' +
+        'mailparse_msg_parse|mailparse_msg_parse_file|mailparse_rfc822_parse_addresses|mailparse_stream_encode|mailparse_uudecode_all|main|max|' +
+        'maxdb_affected_rows|maxdb_autocommit|maxdb_bind_param|maxdb_bind_result|maxdb_change_user|maxdb_character_set_name|maxdb_client_encoding|' +
+        'maxdb_close|maxdb_close_long_data|maxdb_commit|maxdb_connect|maxdb_connect_errno|maxdb_connect_error|maxdb_data_seek|maxdb_debug|' +
+        'maxdb_disable_reads_from_master|maxdb_disable_rpl_parse|maxdb_dump_debug_info|maxdb_embedded_connect|maxdb_enable_reads_from_master|' +
+        'maxdb_enable_rpl_parse|maxdb_errno|maxdb_error|maxdb_escape_string|maxdb_execute|maxdb_fetch|maxdb_fetch_array|maxdb_fetch_assoc|' +
+        'maxdb_fetch_field|maxdb_fetch_field_direct|maxdb_fetch_fields|maxdb_fetch_lengths|maxdb_fetch_object|maxdb_fetch_row|maxdb_field_count|' +
+        'maxdb_field_seek|maxdb_field_tell|maxdb_free_result|maxdb_get_client_info|maxdb_get_client_version|maxdb_get_host_info|maxdb_get_metadata|' +
+        'maxdb_get_proto_info|maxdb_get_server_info|maxdb_get_server_version|maxdb_info|maxdb_init|maxdb_insert_id|maxdb_kill|maxdb_master_query|' +
+        'maxdb_more_results|maxdb_multi_query|maxdb_next_result|maxdb_num_fields|maxdb_num_rows|maxdb_options|maxdb_param_count|maxdb_ping|' +
+        'maxdb_prepare|maxdb_query|maxdb_real_connect|maxdb_real_escape_string|maxdb_real_query|maxdb_report|maxdb_rollback|' +
+        'maxdb_rpl_parse_enabled|maxdb_rpl_probe|maxdb_rpl_query_type|maxdb_select_db|maxdb_send_long_data|maxdb_send_query|maxdb_server_end|' +
+        'maxdb_server_init|maxdb_set_opt|maxdb_sqlstate|maxdb_ssl_set|maxdb_stat|maxdb_stmt_affected_rows|maxdb_stmt_bind_param|' +
+        'maxdb_stmt_bind_result|maxdb_stmt_close|maxdb_stmt_close_long_data|maxdb_stmt_data_seek|maxdb_stmt_errno|maxdb_stmt_error|' +
+        'maxdb_stmt_execute|maxdb_stmt_fetch|maxdb_stmt_free_result|maxdb_stmt_init|maxdb_stmt_num_rows|maxdb_stmt_param_count|maxdb_stmt_prepare|' +
+        'maxdb_stmt_reset|maxdb_stmt_result_metadata|maxdb_stmt_send_long_data|maxdb_stmt_sqlstate|maxdb_stmt_store_result|maxdb_store_result|' +
+        'maxdb_thread_id|maxdb_thread_safe|maxdb_use_result|maxdb_warning_count|mb_check_encoding|mb_convert_case|mb_convert_encoding|' +
+        'mb_convert_kana|mb_convert_variables|mb_decode_mimeheader|mb_decode_numericentity|mb_detect_encoding|mb_detect_order|mb_encode_mimeheader|' +
+        'mb_encode_numericentity|mb_encoding_aliases|mb_ereg|mb_ereg_match|mb_ereg_replace|mb_ereg_search|mb_ereg_search_getpos|' +
+        'mb_ereg_search_getregs|mb_ereg_search_init|mb_ereg_search_pos|mb_ereg_search_regs|mb_ereg_search_setpos|mb_eregi|mb_eregi_replace|' +
+        'mb_get_info|mb_http_input|mb_http_output|mb_internal_encoding|mb_language|mb_list_encodings|mb_output_handler|mb_parse_str|' +
+        'mb_preferred_mime_name|mb_regex_encoding|mb_regex_set_options|mb_send_mail|mb_split|mb_strcut|mb_strimwidth|mb_stripos|mb_stristr|' +
+        'mb_strlen|mb_strpos|mb_strrchr|mb_strrichr|mb_strripos|mb_strrpos|mb_strstr|mb_strtolower|mb_strtoupper|mb_strwidth|' +
+        'mb_substitute_character|mb_substr|mb_substr_count|mcrypt_cbc|mcrypt_cfb|mcrypt_create_iv|mcrypt_decrypt|mcrypt_ecb|' +
+        'mcrypt_enc_get_algorithms_name|mcrypt_enc_get_block_size|mcrypt_enc_get_iv_size|mcrypt_enc_get_key_size|mcrypt_enc_get_modes_name|' +
+        'mcrypt_enc_get_supported_key_sizes|mcrypt_enc_is_block_algorithm|mcrypt_enc_is_block_algorithm_mode|mcrypt_enc_is_block_mode|' +
+        'mcrypt_enc_self_test|mcrypt_encrypt|mcrypt_generic|mcrypt_generic_deinit|mcrypt_generic_end|mcrypt_generic_init|mcrypt_get_block_size|' +
+        'mcrypt_get_cipher_name|mcrypt_get_iv_size|mcrypt_get_key_size|mcrypt_list_algorithms|mcrypt_list_modes|mcrypt_module_close|' +
+        'mcrypt_module_get_algo_block_size|mcrypt_module_get_algo_key_size|mcrypt_module_get_supported_key_sizes|mcrypt_module_is_block_algorithm|' +
+        'mcrypt_module_is_block_algorithm_mode|mcrypt_module_is_block_mode|mcrypt_module_open|mcrypt_module_self_test|mcrypt_ofb|md5|md5_file|' +
+        'mdecrypt_generic|memcache|memcache_debug|memcached|memory_get_peak_usage|memory_get_usage|messageformatter|metaphone|method_exists|mhash|' +
+        'mhash_count|mhash_get_block_size|mhash_get_hash_name|mhash_keygen_s2k|microtime|mime_content_type|min|ming_keypress|' +
+        'ming_setcubicthreshold|ming_setscale|ming_setswfcompression|ming_useconstants|ming_useswfversion|mkdir|mktime|money_format|mongo|' +
+        'mongobindata|mongocode|mongocollection|mongoconnectionexception|mongocursor|mongocursorexception|mongocursortimeoutexception|mongodate|' +
+        'mongodb|mongodbref|mongoexception|mongogridfs|mongogridfscursor|mongogridfsexception|mongogridfsfile|mongoid|mongoint32|mongoint64|' +
+        'mongomaxkey|mongominkey|mongoregex|mongotimestamp|move_uploaded_file|mpegfile|mqseries_back|mqseries_begin|mqseries_close|mqseries_cmit|' +
+        'mqseries_conn|mqseries_connx|mqseries_disc|mqseries_get|mqseries_inq|mqseries_open|mqseries_put|mqseries_put1|mqseries_set|' +
+        'mqseries_strerror|msession_connect|msession_count|msession_create|msession_destroy|msession_disconnect|msession_find|msession_get|' +
+        'msession_get_array|msession_get_data|msession_inc|msession_list|msession_listvar|msession_lock|msession_plugin|msession_randstr|' +
+        'msession_set|msession_set_array|msession_set_data|msession_timeout|msession_uniq|msession_unlock|msg_get_queue|msg_queue_exists|' +
+        'msg_receive|msg_remove_queue|msg_send|msg_set_queue|msg_stat_queue|msql|msql_affected_rows|msql_close|msql_connect|msql_create_db|' +
+        'msql_createdb|msql_data_seek|msql_db_query|msql_dbname|msql_drop_db|msql_error|msql_fetch_array|msql_fetch_field|msql_fetch_object|' +
+        'msql_fetch_row|msql_field_flags|msql_field_len|msql_field_name|msql_field_seek|msql_field_table|msql_field_type|msql_fieldflags|' +
+        'msql_fieldlen|msql_fieldname|msql_fieldtable|msql_fieldtype|msql_free_result|msql_list_dbs|msql_list_fields|msql_list_tables|' +
+        'msql_num_fields|msql_num_rows|msql_numfields|msql_numrows|msql_pconnect|msql_query|msql_regcase|msql_result|msql_select_db|msql_tablename|' +
+        'mssql_bind|mssql_close|mssql_connect|mssql_data_seek|mssql_execute|mssql_fetch_array|mssql_fetch_assoc|mssql_fetch_batch|' +
+        'mssql_fetch_field|mssql_fetch_object|mssql_fetch_row|mssql_field_length|mssql_field_name|mssql_field_seek|mssql_field_type|' +
+        'mssql_free_result|mssql_free_statement|mssql_get_last_message|mssql_guid_string|mssql_init|mssql_min_error_severity|' +
+        'mssql_min_message_severity|mssql_next_result|mssql_num_fields|mssql_num_rows|mssql_pconnect|mssql_query|mssql_result|mssql_rows_affected|' +
+        'mssql_select_db|mt_getrandmax|mt_rand|mt_srand|multipleiterator|mysql_affected_rows|mysql_client_encoding|mysql_close|mysql_connect|' +
+        'mysql_create_db|mysql_data_seek|mysql_db_name|mysql_db_query|mysql_drop_db|mysql_errno|mysql_error|mysql_escape_string|mysql_fetch_array|' +
+        'mysql_fetch_assoc|mysql_fetch_field|mysql_fetch_lengths|mysql_fetch_object|mysql_fetch_row|mysql_field_flags|mysql_field_len|' +
+        'mysql_field_name|mysql_field_seek|mysql_field_table|mysql_field_type|mysql_free_result|mysql_get_client_info|mysql_get_host_info|' +
+        'mysql_get_proto_info|mysql_get_server_info|mysql_info|mysql_insert_id|mysql_list_dbs|mysql_list_fields|mysql_list_processes|' +
+        'mysql_list_tables|mysql_num_fields|mysql_num_rows|mysql_pconnect|mysql_ping|mysql_query|mysql_real_escape_string|mysql_result|' +
+        'mysql_select_db|mysql_set_charset|mysql_stat|mysql_tablename|mysql_thread_id|mysql_unbuffered_query|mysqli|mysqli_bind_param|' +
+        'mysqli_bind_result|mysqli_client_encoding|mysqli_connect|mysqli_disable_reads_from_master|mysqli_disable_rpl_parse|mysqli_driver|' +
+        'mysqli_enable_reads_from_master|mysqli_enable_rpl_parse|mysqli_escape_string|mysqli_execute|mysqli_fetch|mysqli_get_metadata|' +
+        'mysqli_master_query|mysqli_param_count|mysqli_report|mysqli_result|mysqli_rpl_parse_enabled|mysqli_rpl_probe|mysqli_rpl_query_type|' +
+        'mysqli_send_long_data|mysqli_send_query|mysqli_set_opt|mysqli_slave_query|mysqli_stmt|mysqli_warning|mysqlnd_ms_get_stats|' +
+        'mysqlnd_ms_query_is_select|mysqlnd_ms_set_user_pick_server|mysqlnd_qc_change_handler|mysqlnd_qc_clear_cache|mysqlnd_qc_get_cache_info|' +
+        'mysqlnd_qc_get_core_stats|mysqlnd_qc_get_handler|mysqlnd_qc_get_query_trace_log|mysqlnd_qc_set_user_handlers|natcasesort|natsort|' +
+        'ncurses_addch|ncurses_addchnstr|ncurses_addchstr|ncurses_addnstr|ncurses_addstr|ncurses_assume_default_colors|ncurses_attroff|' +
+        'ncurses_attron|ncurses_attrset|ncurses_baudrate|ncurses_beep|ncurses_bkgd|ncurses_bkgdset|ncurses_border|ncurses_bottom_panel|' +
+        'ncurses_can_change_color|ncurses_cbreak|ncurses_clear|ncurses_clrtobot|ncurses_clrtoeol|ncurses_color_content|ncurses_color_set|' +
+        'ncurses_curs_set|ncurses_def_prog_mode|ncurses_def_shell_mode|ncurses_define_key|ncurses_del_panel|ncurses_delay_output|ncurses_delch|' +
+        'ncurses_deleteln|ncurses_delwin|ncurses_doupdate|ncurses_echo|ncurses_echochar|ncurses_end|ncurses_erase|ncurses_erasechar|ncurses_filter|' +
+        'ncurses_flash|ncurses_flushinp|ncurses_getch|ncurses_getmaxyx|ncurses_getmouse|ncurses_getyx|ncurses_halfdelay|ncurses_has_colors|' +
+        'ncurses_has_ic|ncurses_has_il|ncurses_has_key|ncurses_hide_panel|ncurses_hline|ncurses_inch|ncurses_init|ncurses_init_color|' +
+        'ncurses_init_pair|ncurses_insch|ncurses_insdelln|ncurses_insertln|ncurses_insstr|ncurses_instr|ncurses_isendwin|ncurses_keyok|' +
+        'ncurses_keypad|ncurses_killchar|ncurses_longname|ncurses_meta|ncurses_mouse_trafo|ncurses_mouseinterval|ncurses_mousemask|ncurses_move|' +
+        'ncurses_move_panel|ncurses_mvaddch|ncurses_mvaddchnstr|ncurses_mvaddchstr|ncurses_mvaddnstr|ncurses_mvaddstr|ncurses_mvcur|' +
+        'ncurses_mvdelch|ncurses_mvgetch|ncurses_mvhline|ncurses_mvinch|ncurses_mvvline|ncurses_mvwaddstr|ncurses_napms|ncurses_new_panel|' +
+        'ncurses_newpad|ncurses_newwin|ncurses_nl|ncurses_nocbreak|ncurses_noecho|ncurses_nonl|ncurses_noqiflush|ncurses_noraw|' +
+        'ncurses_pair_content|ncurses_panel_above|ncurses_panel_below|ncurses_panel_window|ncurses_pnoutrefresh|ncurses_prefresh|ncurses_putp|' +
+        'ncurses_qiflush|ncurses_raw|ncurses_refresh|ncurses_replace_panel|ncurses_reset_prog_mode|ncurses_reset_shell_mode|ncurses_resetty|' +
+        'ncurses_savetty|ncurses_scr_dump|ncurses_scr_init|ncurses_scr_restore|ncurses_scr_set|ncurses_scrl|ncurses_show_panel|ncurses_slk_attr|' +
+        'ncurses_slk_attroff|ncurses_slk_attron|ncurses_slk_attrset|ncurses_slk_clear|ncurses_slk_color|ncurses_slk_init|ncurses_slk_noutrefresh|' +
+        'ncurses_slk_refresh|ncurses_slk_restore|ncurses_slk_set|ncurses_slk_touch|ncurses_standend|ncurses_standout|ncurses_start_color|' +
+        'ncurses_termattrs|ncurses_termname|ncurses_timeout|ncurses_top_panel|ncurses_typeahead|ncurses_ungetch|ncurses_ungetmouse|' +
+        'ncurses_update_panels|ncurses_use_default_colors|ncurses_use_env|ncurses_use_extended_names|ncurses_vidattr|ncurses_vline|ncurses_waddch|' +
+        'ncurses_waddstr|ncurses_wattroff|ncurses_wattron|ncurses_wattrset|ncurses_wborder|ncurses_wclear|ncurses_wcolor_set|ncurses_werase|' +
+        'ncurses_wgetch|ncurses_whline|ncurses_wmouse_trafo|ncurses_wmove|ncurses_wnoutrefresh|ncurses_wrefresh|ncurses_wstandend|' +
+        'ncurses_wstandout|ncurses_wvline|newinstance|newinstanceargs|newt_bell|newt_button|newt_button_bar|newt_centered_window|newt_checkbox|' +
+        'newt_checkbox_get_value|newt_checkbox_set_flags|newt_checkbox_set_value|newt_checkbox_tree|newt_checkbox_tree_add_item|' +
+        'newt_checkbox_tree_find_item|newt_checkbox_tree_get_current|newt_checkbox_tree_get_entry_value|newt_checkbox_tree_get_multi_selection|' +
+        'newt_checkbox_tree_get_selection|newt_checkbox_tree_multi|newt_checkbox_tree_set_current|newt_checkbox_tree_set_entry|' +
+        'newt_checkbox_tree_set_entry_value|newt_checkbox_tree_set_width|newt_clear_key_buffer|newt_cls|newt_compact_button|' +
+        'newt_component_add_callback|newt_component_takes_focus|newt_create_grid|newt_cursor_off|newt_cursor_on|newt_delay|newt_draw_form|' +
+        'newt_draw_root_text|newt_entry|newt_entry_get_value|newt_entry_set|newt_entry_set_filter|newt_entry_set_flags|newt_finished|newt_form|' +
+        'newt_form_add_component|newt_form_add_components|newt_form_add_hot_key|newt_form_destroy|newt_form_get_current|newt_form_run|' +
+        'newt_form_set_background|newt_form_set_height|newt_form_set_size|newt_form_set_timer|newt_form_set_width|newt_form_watch_fd|' +
+        'newt_get_screen_size|newt_grid_add_components_to_form|newt_grid_basic_window|newt_grid_free|newt_grid_get_size|newt_grid_h_close_stacked|' +
+        'newt_grid_h_stacked|newt_grid_place|newt_grid_set_field|newt_grid_simple_window|newt_grid_v_close_stacked|newt_grid_v_stacked|' +
+        'newt_grid_wrapped_window|newt_grid_wrapped_window_at|newt_init|newt_label|newt_label_set_text|newt_listbox|newt_listbox_append_entry|' +
+        'newt_listbox_clear|newt_listbox_clear_selection|newt_listbox_delete_entry|newt_listbox_get_current|newt_listbox_get_selection|' +
+        'newt_listbox_insert_entry|newt_listbox_item_count|newt_listbox_select_item|newt_listbox_set_current|newt_listbox_set_current_by_key|' +
+        'newt_listbox_set_data|newt_listbox_set_entry|newt_listbox_set_width|newt_listitem|newt_listitem_get_data|newt_listitem_set|' +
+        'newt_open_window|newt_pop_help_line|newt_pop_window|newt_push_help_line|newt_radio_get_current|newt_radiobutton|newt_redraw_help_line|' +
+        'newt_reflow_text|newt_refresh|newt_resize_screen|newt_resume|newt_run_form|newt_scale|newt_scale_set|newt_scrollbar_set|' +
+        'newt_set_help_callback|newt_set_suspend_callback|newt_suspend|newt_textbox|newt_textbox_get_num_lines|newt_textbox_reflowed|' +
+        'newt_textbox_set_height|newt_textbox_set_text|newt_vertical_scrollbar|newt_wait_for_key|newt_win_choice|newt_win_entries|newt_win_menu|' +
+        'newt_win_message|newt_win_messagev|newt_win_ternary|next|ngettext|nl2br|nl_langinfo|norewinditerator|normalizer|notes_body|notes_copy_db|' +
+        'notes_create_db|notes_create_note|notes_drop_db|notes_find_note|notes_header_info|notes_list_msgs|notes_mark_read|notes_mark_unread|' +
+        'notes_nav_create|notes_search|notes_unread|notes_version|nsapi_request_headers|nsapi_response_headers|nsapi_virtual|nthmac|number_format|' +
+        'numberformatter|oauth|oauth_get_sbs|oauth_urlencode|oauthexception|oauthprovider|ob_clean|ob_deflatehandler|ob_end_clean|ob_end_flush|' +
+        'ob_etaghandler|ob_flush|ob_get_clean|ob_get_contents|ob_get_flush|ob_get_length|ob_get_level|ob_get_status|ob_gzhandler|ob_iconv_handler|' +
+        'ob_implicit_flush|ob_inflatehandler|ob_list_handlers|ob_start|ob_tidyhandler|oci_bind_array_by_name|oci_bind_by_name|oci_cancel|' +
+        'oci_client_version|oci_close|oci_collection_append|oci_collection_assign|oci_collection_element_assign|oci_collection_element_get|' +
+        'oci_collection_free|oci_collection_max|oci_collection_size|oci_collection_trim|oci_commit|oci_connect|oci_define_by_name|oci_error|' +
+        'oci_execute|oci_fetch|oci_fetch_all|oci_fetch_array|oci_fetch_assoc|oci_fetch_object|oci_fetch_row|oci_field_is_null|oci_field_name|' +
+        'oci_field_precision|oci_field_scale|oci_field_size|oci_field_type|oci_field_type_raw|oci_free_statement|oci_internal_debug|oci_lob_append|' +
+        'oci_lob_close|oci_lob_copy|oci_lob_eof|oci_lob_erase|oci_lob_export|oci_lob_flush|oci_lob_free|oci_lob_getbuffering|oci_lob_import|' +
+        'oci_lob_is_equal|oci_lob_load|oci_lob_read|oci_lob_rewind|oci_lob_save|oci_lob_savefile|oci_lob_seek|oci_lob_setbuffering|oci_lob_size|' +
+        'oci_lob_tell|oci_lob_truncate|oci_lob_write|oci_lob_writetemporary|oci_lob_writetofile|oci_new_collection|oci_new_connect|oci_new_cursor|' +
+        'oci_new_descriptor|oci_num_fields|oci_num_rows|oci_parse|oci_password_change|oci_pconnect|oci_result|oci_rollback|oci_server_version|' +
+        'oci_set_action|oci_set_client_identifier|oci_set_client_info|oci_set_edition|oci_set_module_name|oci_set_prefetch|oci_statement_type|' +
+        'ocibindbyname|ocicancel|ocicloselob|ocicollappend|ocicollassign|ocicollassignelem|ocicollgetelem|ocicollmax|ocicollsize|ocicolltrim|' +
+        'ocicolumnisnull|ocicolumnname|ocicolumnprecision|ocicolumnscale|ocicolumnsize|ocicolumntype|ocicolumntyperaw|ocicommit|ocidefinebyname|' +
+        'ocierror|ociexecute|ocifetch|ocifetchinto|ocifetchstatement|ocifreecollection|ocifreecursor|ocifreedesc|ocifreestatement|ociinternaldebug|' +
+        'ociloadlob|ocilogoff|ocilogon|ocinewcollection|ocinewcursor|ocinewdescriptor|ocinlogon|ocinumcols|ociparse|ociplogon|ociresult|' +
+        'ocirollback|ocirowcount|ocisavelob|ocisavelobfile|ociserverversion|ocisetprefetch|ocistatementtype|ociwritelobtofile|ociwritetemporarylob|' +
+        'octdec|odbc_autocommit|odbc_binmode|odbc_close|odbc_close_all|odbc_columnprivileges|odbc_columns|odbc_commit|odbc_connect|odbc_cursor|' +
+        'odbc_data_source|odbc_do|odbc_error|odbc_errormsg|odbc_exec|odbc_execute|odbc_fetch_array|odbc_fetch_into|odbc_fetch_object|' +
+        'odbc_fetch_row|odbc_field_len|odbc_field_name|odbc_field_num|odbc_field_precision|odbc_field_scale|odbc_field_type|odbc_foreignkeys|' +
+        'odbc_free_result|odbc_gettypeinfo|odbc_longreadlen|odbc_next_result|odbc_num_fields|odbc_num_rows|odbc_pconnect|odbc_prepare|' +
+        'odbc_primarykeys|odbc_procedurecolumns|odbc_procedures|odbc_result|odbc_result_all|odbc_rollback|odbc_setoption|odbc_specialcolumns|' +
+        'odbc_statistics|odbc_tableprivileges|odbc_tables|openal_buffer_create|openal_buffer_data|openal_buffer_destroy|openal_buffer_get|' +
+        'openal_buffer_loadwav|openal_context_create|openal_context_current|openal_context_destroy|openal_context_process|openal_context_suspend|' +
+        'openal_device_close|openal_device_open|openal_listener_get|openal_listener_set|openal_source_create|openal_source_destroy|' +
+        'openal_source_get|openal_source_pause|openal_source_play|openal_source_rewind|openal_source_set|openal_source_stop|openal_stream|opendir|' +
+        'openlog|openssl_cipher_iv_length|openssl_csr_export|openssl_csr_export_to_file|openssl_csr_get_public_key|openssl_csr_get_subject|' +
+        'openssl_csr_new|openssl_csr_sign|openssl_decrypt|openssl_dh_compute_key|openssl_digest|openssl_encrypt|openssl_error_string|' +
+        'openssl_free_key|openssl_get_cipher_methods|openssl_get_md_methods|openssl_get_privatekey|openssl_get_publickey|openssl_open|' +
+        'openssl_pkcs12_export|openssl_pkcs12_export_to_file|openssl_pkcs12_read|openssl_pkcs7_decrypt|openssl_pkcs7_encrypt|openssl_pkcs7_sign|' +
+        'openssl_pkcs7_verify|openssl_pkey_export|openssl_pkey_export_to_file|openssl_pkey_free|openssl_pkey_get_details|openssl_pkey_get_private|' +
+        'openssl_pkey_get_public|openssl_pkey_new|openssl_private_decrypt|openssl_private_encrypt|openssl_public_decrypt|openssl_public_encrypt|' +
+        'openssl_random_pseudo_bytes|openssl_seal|openssl_sign|openssl_verify|openssl_x509_check_private_key|openssl_x509_checkpurpose|' +
+        'openssl_x509_export|openssl_x509_export_to_file|openssl_x509_free|openssl_x509_parse|openssl_x509_read|ord|outeriterator|' +
+        'outofboundsexception|outofrangeexception|output_add_rewrite_var|output_reset_rewrite_vars|overflowexception|overload|override_function|' +
+        'ovrimos_close|ovrimos_commit|ovrimos_connect|ovrimos_cursor|ovrimos_exec|ovrimos_execute|ovrimos_fetch_into|ovrimos_fetch_row|' +
+        'ovrimos_field_len|ovrimos_field_name|ovrimos_field_num|ovrimos_field_type|ovrimos_free_result|ovrimos_longreadlen|ovrimos_num_fields|' +
+        'ovrimos_num_rows|ovrimos_prepare|ovrimos_result|ovrimos_result_all|ovrimos_rollback|pack|parentiterator|parse_ini_file|parse_ini_string|' +
+        'parse_str|parse_url|parsekit_compile_file|parsekit_compile_string|parsekit_func_arginfo|passthru|pathinfo|pclose|pcntl_alarm|pcntl_exec|' +
+        'pcntl_fork|pcntl_getpriority|pcntl_setpriority|pcntl_signal|pcntl_signal_dispatch|pcntl_sigprocmask|pcntl_sigtimedwait|pcntl_sigwaitinfo|' +
+        'pcntl_wait|pcntl_waitpid|pcntl_wexitstatus|pcntl_wifexited|pcntl_wifsignaled|pcntl_wifstopped|pcntl_wstopsig|pcntl_wtermsig|' +
+        'pdf_activate_item|pdf_add_annotation|pdf_add_bookmark|pdf_add_launchlink|pdf_add_locallink|pdf_add_nameddest|pdf_add_note|pdf_add_outline|' +
+        'pdf_add_pdflink|pdf_add_table_cell|pdf_add_textflow|pdf_add_thumbnail|pdf_add_weblink|pdf_arc|pdf_arcn|pdf_attach_file|pdf_begin_document|' +
+        'pdf_begin_font|pdf_begin_glyph|pdf_begin_item|pdf_begin_layer|pdf_begin_page|pdf_begin_page_ext|pdf_begin_pattern|pdf_begin_template|' +
+        'pdf_begin_template_ext|pdf_circle|pdf_clip|pdf_close|pdf_close_image|pdf_close_pdi|pdf_close_pdi_page|pdf_closepath|' +
+        'pdf_closepath_fill_stroke|pdf_closepath_stroke|pdf_concat|pdf_continue_text|pdf_create_3dview|pdf_create_action|pdf_create_annotation|' +
+        'pdf_create_bookmark|pdf_create_field|pdf_create_fieldgroup|pdf_create_gstate|pdf_create_pvf|pdf_create_textflow|pdf_curveto|' +
+        'pdf_define_layer|pdf_delete|pdf_delete_pvf|pdf_delete_table|pdf_delete_textflow|pdf_encoding_set_char|pdf_end_document|pdf_end_font|' +
+        'pdf_end_glyph|pdf_end_item|pdf_end_layer|pdf_end_page|pdf_end_page_ext|pdf_end_pattern|pdf_end_template|pdf_endpath|pdf_fill|' +
+        'pdf_fill_imageblock|pdf_fill_pdfblock|pdf_fill_stroke|pdf_fill_textblock|pdf_findfont|pdf_fit_image|pdf_fit_pdi_page|pdf_fit_table|' +
+        'pdf_fit_textflow|pdf_fit_textline|pdf_get_apiname|pdf_get_buffer|pdf_get_errmsg|pdf_get_errnum|pdf_get_font|pdf_get_fontname|' +
+        'pdf_get_fontsize|pdf_get_image_height|pdf_get_image_width|pdf_get_majorversion|pdf_get_minorversion|pdf_get_parameter|' +
+        'pdf_get_pdi_parameter|pdf_get_pdi_value|pdf_get_value|pdf_info_font|pdf_info_matchbox|pdf_info_table|pdf_info_textflow|pdf_info_textline|' +
+        'pdf_initgraphics|pdf_lineto|pdf_load_3ddata|pdf_load_font|pdf_load_iccprofile|pdf_load_image|pdf_makespotcolor|pdf_moveto|pdf_new|' +
+        'pdf_open_ccitt|pdf_open_file|pdf_open_gif|pdf_open_image|pdf_open_image_file|pdf_open_jpeg|pdf_open_memory_image|pdf_open_pdi|' +
+        'pdf_open_pdi_document|pdf_open_pdi_page|pdf_open_tiff|pdf_pcos_get_number|pdf_pcos_get_stream|pdf_pcos_get_string|pdf_place_image|' +
+        'pdf_place_pdi_page|pdf_process_pdi|pdf_rect|pdf_restore|pdf_resume_page|pdf_rotate|pdf_save|pdf_scale|pdf_set_border_color|' +
+        'pdf_set_border_dash|pdf_set_border_style|pdf_set_char_spacing|pdf_set_duration|pdf_set_gstate|pdf_set_horiz_scaling|pdf_set_info|' +
+        'pdf_set_info_author|pdf_set_info_creator|pdf_set_info_keywords|pdf_set_info_subject|pdf_set_info_title|pdf_set_layer_dependency|' +
+        'pdf_set_leading|pdf_set_parameter|pdf_set_text_matrix|pdf_set_text_pos|pdf_set_text_rendering|pdf_set_text_rise|pdf_set_value|' +
+        'pdf_set_word_spacing|pdf_setcolor|pdf_setdash|pdf_setdashpattern|pdf_setflat|pdf_setfont|pdf_setgray|pdf_setgray_fill|pdf_setgray_stroke|' +
+        'pdf_setlinecap|pdf_setlinejoin|pdf_setlinewidth|pdf_setmatrix|pdf_setmiterlimit|pdf_setpolydash|pdf_setrgbcolor|pdf_setrgbcolor_fill|' +
+        'pdf_setrgbcolor_stroke|pdf_shading|pdf_shading_pattern|pdf_shfill|pdf_show|pdf_show_boxed|pdf_show_xy|pdf_skew|pdf_stringwidth|pdf_stroke|' +
+        'pdf_suspend_page|pdf_translate|pdf_utf16_to_utf8|pdf_utf32_to_utf16|pdf_utf8_to_utf16|pdo|pdo_cubrid_schema|pdo_pgsqllobcreate|' +
+        'pdo_pgsqllobopen|pdo_pgsqllobunlink|pdo_sqlitecreateaggregate|pdo_sqlitecreatefunction|pdoexception|pdostatement|pfsockopen|' +
+        'pg_affected_rows|pg_cancel_query|pg_client_encoding|pg_close|pg_connect|pg_connection_busy|pg_connection_reset|pg_connection_status|' +
+        'pg_convert|pg_copy_from|pg_copy_to|pg_dbname|pg_delete|pg_end_copy|pg_escape_bytea|pg_escape_string|pg_execute|pg_fetch_all|' +
+        'pg_fetch_all_columns|pg_fetch_array|pg_fetch_assoc|pg_fetch_object|pg_fetch_result|pg_fetch_row|pg_field_is_null|pg_field_name|' +
+        'pg_field_num|pg_field_prtlen|pg_field_size|pg_field_table|pg_field_type|pg_field_type_oid|pg_free_result|pg_get_notify|pg_get_pid|' +
+        'pg_get_result|pg_host|pg_insert|pg_last_error|pg_last_notice|pg_last_oid|pg_lo_close|pg_lo_create|pg_lo_export|pg_lo_import|pg_lo_open|' +
+        'pg_lo_read|pg_lo_read_all|pg_lo_seek|pg_lo_tell|pg_lo_unlink|pg_lo_write|pg_meta_data|pg_num_fields|pg_num_rows|pg_options|' +
+        'pg_parameter_status|pg_pconnect|pg_ping|pg_port|pg_prepare|pg_put_line|pg_query|pg_query_params|pg_result_error|pg_result_error_field|' +
+        'pg_result_seek|pg_result_status|pg_select|pg_send_execute|pg_send_prepare|pg_send_query|pg_send_query_params|pg_set_client_encoding|' +
+        'pg_set_error_verbosity|pg_trace|pg_transaction_status|pg_tty|pg_unescape_bytea|pg_untrace|pg_update|pg_version|php_check_syntax|' +
+        'php_ini_loaded_file|php_ini_scanned_files|php_logo_guid|php_sapi_name|php_strip_whitespace|php_uname|phpcredits|phpinfo|phpversion|pi|' +
+        'png2wbmp|popen|pos|posix_access|posix_ctermid|posix_errno|posix_get_last_error|posix_getcwd|posix_getegid|posix_geteuid|posix_getgid|' +
+        'posix_getgrgid|posix_getgrnam|posix_getgroups|posix_getlogin|posix_getpgid|posix_getpgrp|posix_getpid|posix_getppid|posix_getpwnam|' +
+        'posix_getpwuid|posix_getrlimit|posix_getsid|posix_getuid|posix_initgroups|posix_isatty|posix_kill|posix_mkfifo|posix_mknod|posix_setegid|' +
+        'posix_seteuid|posix_setgid|posix_setpgid|posix_setsid|posix_setuid|posix_strerror|posix_times|posix_ttyname|posix_uname|pow|preg_filter|' +
+        'preg_grep|preg_last_error|preg_match|preg_match_all|preg_quote|preg_replace|preg_replace_callback|preg_split|prev|print|print_r|' +
+        'printer_abort|printer_close|printer_create_brush|printer_create_dc|printer_create_font|printer_create_pen|printer_delete_brush|' +
+        'printer_delete_dc|printer_delete_font|printer_delete_pen|printer_draw_bmp|printer_draw_chord|printer_draw_elipse|printer_draw_line|' +
+        'printer_draw_pie|printer_draw_rectangle|printer_draw_roundrect|printer_draw_text|printer_end_doc|printer_end_page|printer_get_option|' +
+        'printer_list|printer_logical_fontheight|printer_open|printer_select_brush|printer_select_font|printer_select_pen|printer_set_option|' +
+        'printer_start_doc|printer_start_page|printer_write|printf|proc_close|proc_get_status|proc_nice|proc_open|proc_terminate|property_exists|' +
+        'ps_add_bookmark|ps_add_launchlink|ps_add_locallink|ps_add_note|ps_add_pdflink|ps_add_weblink|ps_arc|ps_arcn|ps_begin_page|' +
+        'ps_begin_pattern|ps_begin_template|ps_circle|ps_clip|ps_close|ps_close_image|ps_closepath|ps_closepath_stroke|ps_continue_text|ps_curveto|' +
+        'ps_delete|ps_end_page|ps_end_pattern|ps_end_template|ps_fill|ps_fill_stroke|ps_findfont|ps_get_buffer|ps_get_parameter|ps_get_value|' +
+        'ps_hyphenate|ps_include_file|ps_lineto|ps_makespotcolor|ps_moveto|ps_new|ps_open_file|ps_open_image|ps_open_image_file|' +
+        'ps_open_memory_image|ps_place_image|ps_rect|ps_restore|ps_rotate|ps_save|ps_scale|ps_set_border_color|ps_set_border_dash|' +
+        'ps_set_border_style|ps_set_info|ps_set_parameter|ps_set_text_pos|ps_set_value|ps_setcolor|ps_setdash|ps_setflat|ps_setfont|ps_setgray|' +
+        'ps_setlinecap|ps_setlinejoin|ps_setlinewidth|ps_setmiterlimit|ps_setoverprintmode|ps_setpolydash|ps_shading|ps_shading_pattern|ps_shfill|' +
+        'ps_show|ps_show2|ps_show_boxed|ps_show_xy|ps_show_xy2|ps_string_geometry|ps_stringwidth|ps_stroke|ps_symbol|ps_symbol_name|' +
+        'ps_symbol_width|ps_translate|pspell_add_to_personal|pspell_add_to_session|pspell_check|pspell_clear_session|pspell_config_create|' +
+        'pspell_config_data_dir|pspell_config_dict_dir|pspell_config_ignore|pspell_config_mode|pspell_config_personal|pspell_config_repl|' +
+        'pspell_config_runtogether|pspell_config_save_repl|pspell_new|pspell_new_config|pspell_new_personal|pspell_save_wordlist|' +
+        'pspell_store_replacement|pspell_suggest|putenv|px_close|px_create_fp|px_date2string|px_delete|px_delete_record|px_get_field|px_get_info|' +
+        'px_get_parameter|px_get_record|px_get_schema|px_get_value|px_insert_record|px_new|px_numfields|px_numrecords|px_open_fp|px_put_record|' +
+        'px_retrieve_record|px_set_blob_file|px_set_parameter|px_set_tablename|px_set_targetencoding|px_set_value|px_timestamp2string|' +
+        'px_update_record|qdom_error|qdom_tree|quoted_printable_decode|quoted_printable_encode|quotemeta|rad2deg|radius_acct_open|' +
+        'radius_add_server|radius_auth_open|radius_close|radius_config|radius_create_request|radius_cvt_addr|radius_cvt_int|radius_cvt_string|' +
+        'radius_demangle|radius_demangle_mppe_key|radius_get_attr|radius_get_vendor_attr|radius_put_addr|radius_put_attr|radius_put_int|' +
+        'radius_put_string|radius_put_vendor_addr|radius_put_vendor_attr|radius_put_vendor_int|radius_put_vendor_string|' +
+        'radius_request_authenticator|radius_send_request|radius_server_secret|radius_strerror|rand|range|rangeexception|rar_wrapper_cache_stats|' +
+        'rararchive|rarentry|rarexception|rawurldecode|rawurlencode|read_exif_data|readdir|readfile|readgzfile|readline|readline_add_history|' +
+        'readline_callback_handler_install|readline_callback_handler_remove|readline_callback_read_char|readline_clear_history|' +
+        'readline_completion_function|readline_info|readline_list_history|readline_on_new_line|readline_read_history|readline_redisplay|' +
+        'readline_write_history|readlink|realpath|realpath_cache_get|realpath_cache_size|recode|recode_file|recode_string|recursivearrayiterator|' +
+        'recursivecachingiterator|recursivecallbackfilteriterator|recursivedirectoryiterator|recursivefilteriterator|recursiveiterator|' +
+        'recursiveiteratoriterator|recursiveregexiterator|recursivetreeiterator|reflection|reflectionclass|reflectionexception|reflectionextension|' +
+        'reflectionfunction|reflectionfunctionabstract|reflectionmethod|reflectionobject|reflectionparameter|reflectionproperty|reflector|' +
+        'regexiterator|register_shutdown_function|register_tick_function|rename|rename_function|require|require_once|reset|resetValue|' +
+        'resourcebundle|restore_error_handler|restore_exception_handler|restore_include_path|return|rewind|rewinddir|rmdir|round|rpm_close|' +
+        'rpm_get_tag|rpm_is_valid|rpm_open|rpm_version|rrd_create|rrd_error|rrd_fetch|rrd_first|rrd_graph|rrd_info|rrd_last|rrd_lastupdate|' +
+        'rrd_restore|rrd_tune|rrd_update|rrd_xport|rrdcreator|rrdgraph|rrdupdater|rsort|rtrim|runkit_class_adopt|runkit_class_emancipate|' +
+        'runkit_constant_add|runkit_constant_redefine|runkit_constant_remove|runkit_function_add|runkit_function_copy|runkit_function_redefine|' +
+        'runkit_function_remove|runkit_function_rename|runkit_import|runkit_lint|runkit_lint_file|runkit_method_add|runkit_method_copy|' +
+        'runkit_method_redefine|runkit_method_remove|runkit_method_rename|runkit_return_value_used|runkit_sandbox_output_handler|' +
+        'runkit_superglobals|runtimeexception|samconnection_commit|samconnection_connect|samconnection_constructor|samconnection_disconnect|' +
+        'samconnection_errno|samconnection_error|samconnection_isconnected|samconnection_peek|samconnection_peekall|samconnection_receive|' +
+        'samconnection_remove|samconnection_rollback|samconnection_send|samconnection_setDebug|samconnection_subscribe|samconnection_unsubscribe|' +
+        'sammessage_body|sammessage_constructor|sammessage_header|sca_createdataobject|sca_getservice|sca_localproxy_createdataobject|' +
+        'sca_soapproxy_createdataobject|scandir|sdo_das_changesummary_beginlogging|sdo_das_changesummary_endlogging|' +
+        'sdo_das_changesummary_getchangeddataobjects|sdo_das_changesummary_getchangetype|sdo_das_changesummary_getoldcontainer|' +
+        'sdo_das_changesummary_getoldvalues|sdo_das_changesummary_islogging|sdo_das_datafactory_addpropertytotype|sdo_das_datafactory_addtype|' +
+        'sdo_das_datafactory_getdatafactory|sdo_das_dataobject_getchangesummary|sdo_das_relational_applychanges|sdo_das_relational_construct|' +
+        'sdo_das_relational_createrootdataobject|sdo_das_relational_executepreparedquery|sdo_das_relational_executequery|' +
+        'sdo_das_setting_getlistindex|sdo_das_setting_getpropertyindex|sdo_das_setting_getpropertyname|sdo_das_setting_getvalue|' +
+        'sdo_das_setting_isset|sdo_das_xml_addtypes|sdo_das_xml_create|sdo_das_xml_createdataobject|sdo_das_xml_createdocument|' +
+        'sdo_das_xml_document_getrootdataobject|sdo_das_xml_document_getrootelementname|sdo_das_xml_document_getrootelementuri|' +
+        'sdo_das_xml_document_setencoding|sdo_das_xml_document_setxmldeclaration|sdo_das_xml_document_setxmlversion|sdo_das_xml_loadfile|' +
+        'sdo_das_xml_loadstring|sdo_das_xml_savefile|sdo_das_xml_savestring|sdo_datafactory_create|sdo_dataobject_clear|' +
+        'sdo_dataobject_createdataobject|sdo_dataobject_getcontainer|sdo_dataobject_getsequence|sdo_dataobject_gettypename|' +
+        'sdo_dataobject_gettypenamespaceuri|sdo_exception_getcause|sdo_list_insert|sdo_model_property_getcontainingtype|' +
+        'sdo_model_property_getdefault|sdo_model_property_getname|sdo_model_property_gettype|sdo_model_property_iscontainment|' +
+        'sdo_model_property_ismany|sdo_model_reflectiondataobject_construct|sdo_model_reflectiondataobject_export|' +
+        'sdo_model_reflectiondataobject_getcontainmentproperty|sdo_model_reflectiondataobject_getinstanceproperties|' +
+        'sdo_model_reflectiondataobject_gettype|sdo_model_type_getbasetype|sdo_model_type_getname|sdo_model_type_getnamespaceuri|' +
+        'sdo_model_type_getproperties|sdo_model_type_getproperty|sdo_model_type_isabstracttype|sdo_model_type_isdatatype|sdo_model_type_isinstance|' +
+        'sdo_model_type_isopentype|sdo_model_type_issequencedtype|sdo_sequence_getproperty|sdo_sequence_insert|sdo_sequence_move|seekableiterator|' +
+        'sem_acquire|sem_get|sem_release|sem_remove|serializable|serialize|session_cache_expire|session_cache_limiter|session_commit|' +
+        'session_decode|session_destroy|session_encode|session_get_cookie_params|session_id|session_is_registered|session_module_name|session_name|' +
+        'session_pgsql_add_error|session_pgsql_get_error|session_pgsql_get_field|session_pgsql_reset|session_pgsql_set_field|session_pgsql_status|' +
+        'session_regenerate_id|session_register|session_save_path|session_set_cookie_params|session_set_save_handler|session_start|' +
+        'session_unregister|session_unset|session_write_close|setCounterClass|set_error_handler|set_exception_handler|set_file_buffer|' +
+        'set_include_path|set_magic_quotes_runtime|set_socket_blocking|set_time_limit|setcookie|setlocale|setproctitle|setrawcookie|' +
+        'setstaticpropertyvalue|setthreadtitle|settype|sha1|sha1_file|shell_exec|shm_attach|shm_detach|shm_get_var|shm_has_var|shm_put_var|' +
+        'shm_remove|shm_remove_var|shmop_close|shmop_delete|shmop_open|shmop_read|shmop_size|shmop_write|show_source|shuffle|signeurlpaiement|' +
+        'similar_text|simplexml_import_dom|simplexml_load_file|simplexml_load_string|simplexmlelement|simplexmliterator|sin|sinh|sizeof|sleep|snmp|' +
+        'snmp2_get|snmp2_getnext|snmp2_real_walk|snmp2_set|snmp2_walk|snmp3_get|snmp3_getnext|snmp3_real_walk|snmp3_set|snmp3_walk|' +
+        'snmp_get_quick_print|snmp_get_valueretrieval|snmp_read_mib|snmp_set_enum_print|snmp_set_oid_numeric_print|snmp_set_oid_output_format|' +
+        'snmp_set_quick_print|snmp_set_valueretrieval|snmpget|snmpgetnext|snmprealwalk|snmpset|snmpwalk|snmpwalkoid|soapclient|soapfault|' +
+        'soapheader|soapparam|soapserver|soapvar|socket_accept|socket_bind|socket_clear_error|socket_close|socket_connect|socket_create|' +
+        'socket_create_listen|socket_create_pair|socket_get_option|socket_get_status|socket_getpeername|socket_getsockname|socket_last_error|' +
+        'socket_listen|socket_read|socket_recv|socket_recvfrom|socket_select|socket_send|socket_sendto|socket_set_block|socket_set_blocking|' +
+        'socket_set_nonblock|socket_set_option|socket_set_timeout|socket_shutdown|socket_strerror|socket_write|solr_get_version|solrclient|' +
+        'solrclientexception|solrdocument|solrdocumentfield|solrexception|solrgenericresponse|solrillegalargumentexception|' +
+        'solrillegaloperationexception|solrinputdocument|solrmodifiableparams|solrobject|solrparams|solrpingresponse|solrquery|solrqueryresponse|' +
+        'solrresponse|solrupdateresponse|solrutils|sort|soundex|sphinxclient|spl_autoload|spl_autoload_call|spl_autoload_extensions|' +
+        'spl_autoload_functions|spl_autoload_register|spl_autoload_unregister|spl_classes|spl_object_hash|splbool|spldoublylinkedlist|splenum|' +
+        'splfileinfo|splfileobject|splfixedarray|splfloat|splheap|splint|split|spliti|splmaxheap|splminheap|splobjectstorage|splobserver|' +
+        'splpriorityqueue|splqueue|splstack|splstring|splsubject|spltempfileobject|spoofchecker|sprintf|sql_regcase|sqlite3|sqlite3result|' +
+        'sqlite3stmt|sqlite_array_query|sqlite_busy_timeout|sqlite_changes|sqlite_close|sqlite_column|sqlite_create_aggregate|' +
+        'sqlite_create_function|sqlite_current|sqlite_error_string|sqlite_escape_string|sqlite_exec|sqlite_factory|sqlite_fetch_all|' +
+        'sqlite_fetch_array|sqlite_fetch_column_types|sqlite_fetch_object|sqlite_fetch_single|sqlite_fetch_string|sqlite_field_name|' +
+        'sqlite_has_more|sqlite_has_prev|sqlite_key|sqlite_last_error|sqlite_last_insert_rowid|sqlite_libencoding|sqlite_libversion|sqlite_next|' +
+        'sqlite_num_fields|sqlite_num_rows|sqlite_open|sqlite_popen|sqlite_prev|sqlite_query|sqlite_rewind|sqlite_seek|sqlite_single_query|' +
+        'sqlite_udf_decode_binary|sqlite_udf_encode_binary|sqlite_unbuffered_query|sqlite_valid|sqrt|srand|sscanf|ssdeep_fuzzy_compare|' +
+        'ssdeep_fuzzy_hash|ssdeep_fuzzy_hash_filename|ssh2_auth_hostbased_file|ssh2_auth_none|ssh2_auth_password|ssh2_auth_pubkey_file|' +
+        'ssh2_connect|ssh2_exec|ssh2_fetch_stream|ssh2_fingerprint|ssh2_methods_negotiated|ssh2_publickey_add|ssh2_publickey_init|' +
+        'ssh2_publickey_list|ssh2_publickey_remove|ssh2_scp_recv|ssh2_scp_send|ssh2_sftp|ssh2_sftp_lstat|ssh2_sftp_mkdir|ssh2_sftp_readlink|' +
+        'ssh2_sftp_realpath|ssh2_sftp_rename|ssh2_sftp_rmdir|ssh2_sftp_stat|ssh2_sftp_symlink|ssh2_sftp_unlink|ssh2_shell|ssh2_tunnel|stat|' +
+        'stats_absolute_deviation|stats_cdf_beta|stats_cdf_binomial|stats_cdf_cauchy|stats_cdf_chisquare|stats_cdf_exponential|stats_cdf_f|' +
+        'stats_cdf_gamma|stats_cdf_laplace|stats_cdf_logistic|stats_cdf_negative_binomial|stats_cdf_noncentral_chisquare|stats_cdf_noncentral_f|' +
+        'stats_cdf_poisson|stats_cdf_t|stats_cdf_uniform|stats_cdf_weibull|stats_covariance|stats_den_uniform|stats_dens_beta|stats_dens_cauchy|' +
+        'stats_dens_chisquare|stats_dens_exponential|stats_dens_f|stats_dens_gamma|stats_dens_laplace|stats_dens_logistic|' +
+        'stats_dens_negative_binomial|stats_dens_normal|stats_dens_pmf_binomial|stats_dens_pmf_hypergeometric|stats_dens_pmf_poisson|stats_dens_t|' +
+        'stats_dens_weibull|stats_harmonic_mean|stats_kurtosis|stats_rand_gen_beta|stats_rand_gen_chisquare|stats_rand_gen_exponential|' +
+        'stats_rand_gen_f|stats_rand_gen_funiform|stats_rand_gen_gamma|stats_rand_gen_ibinomial|stats_rand_gen_ibinomial_negative|' +
+        'stats_rand_gen_int|stats_rand_gen_ipoisson|stats_rand_gen_iuniform|stats_rand_gen_noncenral_chisquare|stats_rand_gen_noncentral_f|' +
+        'stats_rand_gen_noncentral_t|stats_rand_gen_normal|stats_rand_gen_t|stats_rand_get_seeds|stats_rand_phrase_to_seeds|stats_rand_ranf|' +
+        'stats_rand_setall|stats_skew|stats_standard_deviation|stats_stat_binomial_coef|stats_stat_correlation|stats_stat_gennch|' +
+        'stats_stat_independent_t|stats_stat_innerproduct|stats_stat_noncentral_t|stats_stat_paired_t|stats_stat_percentile|stats_stat_powersum|' +
+        'stats_variance|stomp|stomp_connect_error|stomp_version|stompexception|stompframe|str_getcsv|str_ireplace|str_pad|str_repeat|str_replace|' +
+        'str_rot13|str_shuffle|str_split|str_word_count|strcasecmp|strchr|strcmp|strcoll|strcspn|stream_bucket_append|stream_bucket_make_writeable|' +
+        'stream_bucket_new|stream_bucket_prepend|stream_context_create|stream_context_get_default|stream_context_get_options|' +
+        'stream_context_get_params|stream_context_set_default|stream_context_set_option|stream_context_set_params|stream_copy_to_stream|' +
+        'stream_encoding|stream_filter_append|stream_filter_prepend|stream_filter_register|stream_filter_remove|stream_get_contents|' +
+        'stream_get_filters|stream_get_line|stream_get_meta_data|stream_get_transports|stream_get_wrappers|stream_is_local|' +
+        'stream_notification_callback|stream_register_wrapper|stream_resolve_include_path|stream_select|stream_set_blocking|stream_set_read_buffer|' +
+        'stream_set_timeout|stream_set_write_buffer|stream_socket_accept|stream_socket_client|stream_socket_enable_crypto|stream_socket_get_name|' +
+        'stream_socket_pair|stream_socket_recvfrom|stream_socket_sendto|stream_socket_server|stream_socket_shutdown|stream_supports_lock|' +
+        'stream_wrapper_register|stream_wrapper_restore|stream_wrapper_unregister|streamwrapper|strftime|strip_tags|stripcslashes|stripos|' +
+        'stripslashes|stristr|strlen|strnatcasecmp|strnatcmp|strncasecmp|strncmp|strpbrk|strpos|strptime|strrchr|strrev|strripos|strrpos|strspn|' +
+        'strstr|strtok|strtolower|strtotime|strtoupper|strtr|strval|substr|substr_compare|substr_count|substr_replace|svm|svmmodel|svn_add|' +
+        'svn_auth_get_parameter|svn_auth_set_parameter|svn_blame|svn_cat|svn_checkout|svn_cleanup|svn_client_version|svn_commit|svn_delete|' +
+        'svn_diff|svn_export|svn_fs_abort_txn|svn_fs_apply_text|svn_fs_begin_txn2|svn_fs_change_node_prop|svn_fs_check_path|' +
+        'svn_fs_contents_changed|svn_fs_copy|svn_fs_delete|svn_fs_dir_entries|svn_fs_file_contents|svn_fs_file_length|svn_fs_is_dir|svn_fs_is_file|' +
+        'svn_fs_make_dir|svn_fs_make_file|svn_fs_node_created_rev|svn_fs_node_prop|svn_fs_props_changed|svn_fs_revision_prop|svn_fs_revision_root|' +
+        'svn_fs_txn_root|svn_fs_youngest_rev|svn_import|svn_log|svn_ls|svn_mkdir|svn_repos_create|svn_repos_fs|svn_repos_fs_begin_txn_for_commit|' +
+        'svn_repos_fs_commit_txn|svn_repos_hotcopy|svn_repos_open|svn_repos_recover|svn_revert|svn_status|svn_update|swf_actiongeturl|' +
+        'swf_actiongotoframe|swf_actiongotolabel|swf_actionnextframe|swf_actionplay|swf_actionprevframe|swf_actionsettarget|swf_actionstop|' +
+        'swf_actiontogglequality|swf_actionwaitforframe|swf_addbuttonrecord|swf_addcolor|swf_closefile|swf_definebitmap|swf_definefont|' +
+        'swf_defineline|swf_definepoly|swf_definerect|swf_definetext|swf_endbutton|swf_enddoaction|swf_endshape|swf_endsymbol|swf_fontsize|' +
+        'swf_fontslant|swf_fonttracking|swf_getbitmapinfo|swf_getfontinfo|swf_getframe|swf_labelframe|swf_lookat|swf_modifyobject|swf_mulcolor|' +
+        'swf_nextid|swf_oncondition|swf_openfile|swf_ortho|swf_ortho2|swf_perspective|swf_placeobject|swf_polarview|swf_popmatrix|swf_posround|' +
+        'swf_pushmatrix|swf_removeobject|swf_rotate|swf_scale|swf_setfont|swf_setframe|swf_shapearc|swf_shapecurveto|swf_shapecurveto3|' +
+        'swf_shapefillbitmapclip|swf_shapefillbitmaptile|swf_shapefilloff|swf_shapefillsolid|swf_shapelinesolid|swf_shapelineto|swf_shapemoveto|' +
+        'swf_showframe|swf_startbutton|swf_startdoaction|swf_startshape|swf_startsymbol|swf_textwidth|swf_translate|swf_viewport|swfaction|' +
+        'swfbitmap|swfbutton|swfdisplayitem|swffill|swffont|swffontchar|swfgradient|swfmorph|swfmovie|swfprebuiltclip|swfshape|swfsound|' +
+        'swfsoundinstance|swfsprite|swftext|swftextfield|swfvideostream|swish_construct|swish_getmetalist|swish_getpropertylist|swish_prepare|' +
+        'swish_query|swishresult_getmetalist|swishresult_stem|swishresults_getparsedwords|swishresults_getremovedstopwords|swishresults_nextresult|' +
+        'swishresults_seekresult|swishsearch_execute|swishsearch_resetlimit|swishsearch_setlimit|swishsearch_setphrasedelimiter|' +
+        'swishsearch_setsort|swishsearch_setstructure|sybase_affected_rows|sybase_close|sybase_connect|sybase_data_seek|' +
+        'sybase_deadlock_retry_count|sybase_fetch_array|sybase_fetch_assoc|sybase_fetch_field|sybase_fetch_object|sybase_fetch_row|' +
+        'sybase_field_seek|sybase_free_result|sybase_get_last_message|sybase_min_client_severity|sybase_min_error_severity|' +
+        'sybase_min_message_severity|sybase_min_server_severity|sybase_num_fields|sybase_num_rows|sybase_pconnect|sybase_query|sybase_result|' +
+        'sybase_select_db|sybase_set_message_handler|sybase_unbuffered_query|symlink|sys_get_temp_dir|sys_getloadavg|syslog|system|tag|tan|tanh|' +
+        'tcpwrap_check|tempnam|textdomain|tidy|tidy_access_count|tidy_config_count|tidy_diagnose|tidy_error_count|tidy_get_error_buffer|' +
+        'tidy_get_output|tidy_load_config|tidy_reset_config|tidy_save_config|tidy_set_encoding|tidy_setopt|tidy_warning_count|tidynode|time|' +
+        'time_nanosleep|time_sleep_until|timezone_abbreviations_list|timezone_identifiers_list|timezone_location_get|timezone_name_from_abbr|' +
+        'timezone_name_get|timezone_offset_get|timezone_open|timezone_transitions_get|timezone_version_get|tmpfile|token_get_all|token_name|' +
+        'tokyotyrant|tokyotyrantquery|tokyotyranttable|tostring|tostring|touch|transliterator|traversable|trigger_error|trim|uasort|ucfirst|' +
+        'ucwords|udm_add_search_limit|udm_alloc_agent|udm_alloc_agent_array|udm_api_version|udm_cat_list|udm_cat_path|udm_check_charset|' +
+        'udm_check_stored|udm_clear_search_limits|udm_close_stored|udm_crc32|udm_errno|udm_error|udm_find|udm_free_agent|udm_free_ispell_data|' +
+        'udm_free_res|udm_get_doc_count|udm_get_res_field|udm_get_res_param|udm_hash32|udm_load_ispell_data|udm_open_stored|udm_set_agent_param|' +
+        'uksort|umask|underflowexception|unexpectedvalueexception|uniqid|unixtojd|unlink|unpack|unregister_tick_function|unserialize|unset|' +
+        'urldecode|urlencode|use_soap_error_handler|user_error|usleep|usort|utf8_decode|utf8_encode|v8js|v8jsexception|var_dump|var_export|variant|' +
+        'variant_abs|variant_add|variant_and|variant_cast|variant_cat|variant_cmp|variant_date_from_timestamp|variant_date_to_timestamp|' +
+        'variant_div|variant_eqv|variant_fix|variant_get_type|variant_idiv|variant_imp|variant_int|variant_mod|variant_mul|variant_neg|variant_not|' +
+        'variant_or|variant_pow|variant_round|variant_set|variant_set_type|variant_sub|variant_xor|version_compare|vfprintf|virtual|' +
+        'vpopmail_add_alias_domain|vpopmail_add_alias_domain_ex|vpopmail_add_domain|vpopmail_add_domain_ex|vpopmail_add_user|vpopmail_alias_add|' +
+        'vpopmail_alias_del|vpopmail_alias_del_domain|vpopmail_alias_get|vpopmail_alias_get_all|vpopmail_auth_user|vpopmail_del_domain|' +
+        'vpopmail_del_domain_ex|vpopmail_del_user|vpopmail_error|vpopmail_passwd|vpopmail_set_user_quota|vprintf|vsprintf|w32api_deftype|' +
+        'w32api_init_dtype|w32api_invoke_function|w32api_register_function|w32api_set_call_method|wddx_add_vars|wddx_deserialize|wddx_packet_end|' +
+        'wddx_packet_start|wddx_serialize_value|wddx_serialize_vars|win32_continue_service|win32_create_service|win32_delete_service|' +
+        'win32_get_last_control_message|win32_pause_service|win32_ps_list_procs|win32_ps_stat_mem|win32_ps_stat_proc|win32_query_service_status|' +
+        'win32_set_service_status|win32_start_service|win32_start_service_ctrl_dispatcher|win32_stop_service|wincache_fcache_fileinfo|' +
+        'wincache_fcache_meminfo|wincache_lock|wincache_ocache_fileinfo|wincache_ocache_meminfo|wincache_refresh_if_changed|' +
+        'wincache_rplist_fileinfo|wincache_rplist_meminfo|wincache_scache_info|wincache_scache_meminfo|wincache_ucache_add|wincache_ucache_cas|' +
+        'wincache_ucache_clear|wincache_ucache_dec|wincache_ucache_delete|wincache_ucache_exists|wincache_ucache_get|wincache_ucache_inc|' +
+        'wincache_ucache_info|wincache_ucache_meminfo|wincache_ucache_set|wincache_unlock|wordwrap|xattr_get|xattr_list|xattr_remove|xattr_set|' +
+        'xattr_supported|xdiff_file_bdiff|xdiff_file_bdiff_size|xdiff_file_bpatch|xdiff_file_diff|xdiff_file_diff_binary|xdiff_file_merge3|' +
+        'xdiff_file_patch|xdiff_file_patch_binary|xdiff_file_rabdiff|xdiff_string_bdiff|xdiff_string_bdiff_size|xdiff_string_bpatch|' +
+        'xdiff_string_diff|xdiff_string_diff_binary|xdiff_string_merge3|xdiff_string_patch|xdiff_string_patch_binary|xdiff_string_rabdiff|' +
+        'xhprof_disable|xhprof_enable|xhprof_sample_disable|xhprof_sample_enable|xml_error_string|xml_get_current_byte_index|' +
+        'xml_get_current_column_number|xml_get_current_line_number|xml_get_error_code|xml_parse|xml_parse_into_struct|xml_parser_create|' +
+        'xml_parser_create_ns|xml_parser_free|xml_parser_get_option|xml_parser_set_option|xml_set_character_data_handler|xml_set_default_handler|' +
+        'xml_set_element_handler|xml_set_end_namespace_decl_handler|xml_set_external_entity_ref_handler|xml_set_notation_decl_handler|' +
+        'xml_set_object|xml_set_processing_instruction_handler|xml_set_start_namespace_decl_handler|xml_set_unparsed_entity_decl_handler|xmlreader|' +
+        'xmlrpc_decode|xmlrpc_decode_request|xmlrpc_encode|xmlrpc_encode_request|xmlrpc_get_type|xmlrpc_is_fault|xmlrpc_parse_method_descriptions|' +
+        'xmlrpc_server_add_introspection_data|xmlrpc_server_call_method|xmlrpc_server_create|xmlrpc_server_destroy|' +
+        'xmlrpc_server_register_introspection_callback|xmlrpc_server_register_method|xmlrpc_set_type|xmlwriter_end_attribute|xmlwriter_end_cdata|' +
+        'xmlwriter_end_comment|xmlwriter_end_document|xmlwriter_end_dtd|xmlwriter_end_dtd_attlist|xmlwriter_end_dtd_element|' +
+        'xmlwriter_end_dtd_entity|xmlwriter_end_element|xmlwriter_end_pi|xmlwriter_flush|xmlwriter_full_end_element|xmlwriter_open_memory|' +
+        'xmlwriter_open_uri|xmlwriter_output_memory|xmlwriter_set_indent|xmlwriter_set_indent_string|xmlwriter_start_attribute|' +
+        'xmlwriter_start_attribute_ns|xmlwriter_start_cdata|xmlwriter_start_comment|xmlwriter_start_document|xmlwriter_start_dtd|' +
+        'xmlwriter_start_dtd_attlist|xmlwriter_start_dtd_element|xmlwriter_start_dtd_entity|xmlwriter_start_element|xmlwriter_start_element_ns|' +
+        'xmlwriter_start_pi|xmlwriter_text|xmlwriter_write_attribute|xmlwriter_write_attribute_ns|xmlwriter_write_cdata|xmlwriter_write_comment|' +
+        'xmlwriter_write_dtd|xmlwriter_write_dtd_attlist|xmlwriter_write_dtd_element|xmlwriter_write_dtd_entity|xmlwriter_write_element|' +
+        'xmlwriter_write_element_ns|xmlwriter_write_pi|xmlwriter_write_raw|xpath_eval|xpath_eval_expression|xpath_new_context|xpath_register_ns|' +
+        'xpath_register_ns_auto|xptr_eval|xptr_new_context|xslt_backend_info|xslt_backend_name|xslt_backend_version|xslt_create|xslt_errno|' +
+        'xslt_error|xslt_free|xslt_getopt|xslt_process|xslt_set_base|xslt_set_encoding|xslt_set_error_handler|xslt_set_log|xslt_set_object|' +
+        'xslt_set_sax_handler|xslt_set_sax_handlers|xslt_set_scheme_handler|xslt_set_scheme_handlers|xslt_setopt|xsltprocessor|yaml_emit|' +
+        'yaml_emit_file|yaml_parse|yaml_parse_file|yaml_parse_url|yaz_addinfo|yaz_ccl_conf|yaz_ccl_parse|yaz_close|yaz_connect|yaz_database|' +
+        'yaz_element|yaz_errno|yaz_error|yaz_es|yaz_es_result|yaz_get_option|yaz_hits|yaz_itemorder|yaz_present|yaz_range|yaz_record|yaz_scan|' +
+        'yaz_scan_result|yaz_schema|yaz_search|yaz_set_option|yaz_sort|yaz_syntax|yaz_wait|yp_all|yp_cat|yp_err_string|yp_errno|yp_first|' +
+        'yp_get_default_domain|yp_master|yp_match|yp_next|yp_order|zend_logo_guid|zend_thread_id|zend_version|zip_close|zip_entry_close|' +
+        'zip_entry_compressedsize|zip_entry_compressionmethod|zip_entry_filesize|zip_entry_name|zip_entry_open|zip_entry_read|zip_open|zip_read|' +
+        'ziparchive|ziparchive_addemptydir|ziparchive_addfile|ziparchive_addfromstring|ziparchive_close|ziparchive_deleteindex|' +
+        'ziparchive_deletename|ziparchive_extractto|ziparchive_getarchivecomment|ziparchive_getcommentindex|ziparchive_getcommentname|' +
+        'ziparchive_getfromindex|ziparchive_getfromname|ziparchive_getnameindex|ziparchive_getstatusstring|ziparchive_getstream|' +
+        'ziparchive_locatename|ziparchive_open|ziparchive_renameindex|ziparchive_renamename|ziparchive_setCommentName|ziparchive_setarchivecomment|' +
+        'ziparchive_setcommentindex|ziparchive_statindex|ziparchive_statname|ziparchive_unchangeall|ziparchive_unchangearchive|' +
+        'ziparchive_unchangeindex|ziparchive_unchangename|zlib_get_coding_type').split('|')
+    );
+
+    // http://php.net/manual/en/reserved.keywords.php
+    var keywords = lang.arrayToMap(
+        ('abstract|and|array|as|break|case|catch|class|clone|const|continue|declare|default|do|else|elseif|enddeclare|endfor|endforeach|endif|' +
+        'endswitch|endwhile|extends|final|for|foreach|function|global|goto|if|implements|interface|instanceof|namespace|new|or|private|protected|' +
+        'public|static|switch|throw|try|use|var|while|xor').split('|')
+    );
+
+    // http://php.net/manual/en/reserved.keywords.php
+    var languageConstructs = lang.arrayToMap(
+        ('die|echo|empty|exit|eval|include|include_once|isset|list|require|require_once|return|print|unset').split('|')
+    );
+
+    var builtinConstants = lang.arrayToMap(
+        ('true|false|null|__CLASS__|__DIR__|__FILE__|__LINE__|__METHOD__|__FUNCTION__|__NAMESPACE__').split('|')
+    );
+
+    var builtinVariables = lang.arrayToMap(
+        ('$GLOBALS|$_SERVER|$_GET|$_POST|$_FILES|$_REQUEST|$_SESSION|$_ENV|$_COOKIE|$php_errormsg|$HTTP_RAW_POST_DATA|' +
+        '$http_response_header|$argc|$argv').split('|')
+    );
+
+    // Discovery done by downloading 'Many HTML files' from:  http://php.net/download-docs.php
+    // Then search for files containing 'deprecated' (case-insensitive) and look at each file that turns up.
+    var builtinFunctionsDeprecated = lang.arrayToMap(
+        ('key_exists|cairo_matrix_create_scale|cairo_matrix_create_translate|call_user_method|call_user_method_array|com_addref|com_get|' +
+        'com_invoke|com_isenum|com_load|com_release|com_set|connection_timeout|cubrid_load_from_glo|cubrid_new_glo|cubrid_save_to_glo|' +
+        'cubrid_send_glo|define_syslog_variables|dl|ereg|ereg_replace|eregi|eregi_replace|hw_documentattributes|hw_documentbodytag|' +
+        'hw_documentsize|hw_outputdocument|imagedashedline|maxdb_bind_param|maxdb_bind_result|maxdb_client_encoding|maxdb_close_long_data|' +
+        'maxdb_execute|maxdb_fetch|maxdb_get_metadata|maxdb_param_count|maxdb_send_long_data|mcrypt_ecb|mcrypt_generic_end|mime_content_type|' +
+        'mysql_createdb|mysql_dbname|mysql_db_query|mysql_drop_db|mysql_dropdb|mysql_escape_string|mysql_fieldflags|mysql_fieldflags|' +
+        'mysql_fieldname|mysql_fieldtable|mysql_fieldtype|mysql_freeresult|mysql_listdbs|mysql_list_fields|mysql_listfields|mysql_list_tables|' +
+        'mysql_listtables|mysql_numfields|mysql_numrows|mysql_selectdb|mysql_tablename|mysqli_bind_param|mysqli_bind_result|' +
+        'mysqli_disable_reads_from_master|mysqli_disable_rpl_parse|mysqli_enable_reads_from_master|mysqli_enable_rpl_parse|mysqli_execute|' +
+        'mysqli_fetch|mysqli_get_metadata|mysqli_master_query|mysqli_param_count|mysqli_rpl_parse_enabled|mysqli_rpl_probe|mysqli_rpl_query_type|' +
+        'mysqli_send_long_data|mysqli_send_query|mysqli_slave_query|ocibindbyname|ocicancel|ocicloselob|ocicollappend|ocicollassign|' +
+        'ocicollassignelem|ocicollgetelem|ocicollmax|ocicollsize|ocicolltrim|ocicolumnisnull|ocicolumnname|ocicolumnprecision|ocicolumnscale|' +
+        'ocicolumnsize|ocicolumntype|ocicolumntyperaw|ocicommit|ocidefinebyname|ocierror|ociexecute|ocifetch|ocifetchinto|ocifetchstatement|' +
+        'ocifreecollection|ocifreecursor|ocifreedesc|ocifreestatement|ociinternaldebug|ociloadlob|ocilogoff|ocilogon|ocinewcollection|' +
+        'ocinewcursor|ocinewdescriptor|ocinlogon|ocinumcols|ociparse|ociplogon|ociresult|ocirollback|ocirowcount|ocisavelob|ocisavelobfile|' +
+        'ociserverversion|ocisetprefetch|ocistatementtype|ociwritelobtofile|ociwritetemporarylob|PDF_add_annotation|PDF_add_bookmark|' +
+        'PDF_add_launchlink|PDF_add_locallink|PDF_add_note|PDF_add_outline|PDF_add_pdflink|PDF_add_weblink|PDF_attach_file|PDF_begin_page|' +
+        'PDF_begin_template|PDF_close_pdi|PDF_close|PDF_findfont|PDF_get_font|PDF_get_fontname|PDF_get_fontsize|PDF_get_image_height|' +
+        'PDF_get_image_width|PDF_get_majorversion|PDF_get_minorversion|PDF_get_pdi_parameter|PDF_get_pdi_value|PDF_open_ccitt|PDF_open_file|' +
+        'PDF_open_gif|PDF_open_image_file|PDF_open_image|PDF_open_jpeg|PDF_open_pdi|PDF_open_tiff|PDF_place_image|PDF_place_pdi_page|' +
+        'PDF_set_border_color|PDF_set_border_dash|PDF_set_border_style|PDF_set_char_spacing|PDF_set_duration|PDF_set_horiz_scaling|' +
+        'PDF_set_info_author|PDF_set_info_creator|PDF_set_info_keywords|PDF_set_info_subject|PDF_set_info_title|PDF_set_leading|' +
+        'PDF_set_text_matrix|PDF_set_text_rendering|PDF_set_text_rise|PDF_set_word_spacing|PDF_setgray_fill|PDF_setgray_stroke|PDF_setgray|' +
+        'PDF_setpolydash|PDF_setrgbcolor_fill|PDF_setrgbcolor_stroke|PDF_setrgbcolor|PDF_show_boxed|php_check_syntax|px_set_tablename|' +
+        'px_set_targetencoding|runkit_sandbox_output_handler|session_is_registered|session_register|session_unregister' +
+        'set_magic_quotes_runtime|magic_quotes_runtime|set_socket_blocking|socket_set_blocking|set_socket_timeout|socket_set_timeout|split|spliti|' +
+        'sql_regcase').split('|')
+    );
+
+    var keywordsDeprecated = lang.arrayToMap(
+        ('cfunction|old_function').split('|')
+    );
+
+    var futureReserved = lang.arrayToMap([]);
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "support.php_tag", // php open tag
+                regex : "<\\?(?:php|\\=)"
+            },
+            {
+                token : "support.php_tag", // php close tag
+                regex : "\\?>"
+            },
+            {
+                token : "comment",
+                regex : "<\\!--",
+                next : "htmlcomment"
+            }, 
+            {
+                token : "meta.tag",
+                regex : "<style",
+                next : "css"
+            },
+            {
+                token : "meta.tag", // opening tag
+                regex : "<\\/?[-_a-zA-Z0-9:]+",
+                next : "htmltag"
+            },
+            {
+                token : 'meta.tag',
+                regex : '<\!DOCTYPE.*?>'
+            },
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            {
+               token : "comment",
+               regex : "#.*$"
+            },
+            docComment.getStartRule("doc-start"),
+            {
+                token : "comment", // multi line comment
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
+                token : "string.regexp",
+                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/][gimy]*\\s*(?=[).,;]|$)"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // multi line string start
+                regex : '["].*\\\\$',
+                next : "qqstring"
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "string", // multi line string start
+                regex : "['].*\\\\$",
+                next : "qstring"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : "constant.language", // constants
+                regex : "\\b(?:DEFAULT_INCLUDE_PATH|E_(?:ALL|CO(?:MPILE_(?:ERROR|WARNING)|RE_(?:ERROR|WARNING))|" +
+                        "ERROR|NOTICE|PARSE|STRICT|USER_(?:ERROR|NOTICE|WARNING)|WARNING)|P(?:EAR_(?:EXTENSION_DIR|INSTALL_DIR)|" +
+                        "HP_(?:BINDIR|CONFIG_FILE_(?:PATH|SCAN_DIR)|DATADIR|E(?:OL|XTENSION_DIR)|INT_(?:MAX|SIZE)|" +
+                        "L(?:IBDIR|OCALSTATEDIR)|O(?:S|UTPUT_HANDLER_(?:CONT|END|START))|PREFIX|S(?:API|HLIB_SUFFIX|YSCONFDIR)|" +
+                        "VERSION))|__COMPILER_HALT_OFFSET__)\\b"
+            }, {
+                token : "constant.language", // constants
+                regex : "\\b(?:A(?:B(?:DAY_(?:1|2|3|4|5|6|7)|MON_(?:1(?:0|1|2|)|2|3|4|5|6|7|8|9))|LT_DIGITS|M_STR|" +
+                        "SSERT_(?:ACTIVE|BAIL|CALLBACK|QUIET_EVAL|WARNING))|C(?:ASE_(?:LOWER|UPPER)|HAR_MAX|" +
+                        "O(?:DESET|NNECTION_(?:ABORTED|NORMAL|TIMEOUT)|UNT_(?:NORMAL|RECURSIVE))|" +
+                        "R(?:EDITS_(?:ALL|DOCS|FULLPAGE|G(?:ENERAL|ROUP)|MODULES|QA|SAPI)|NCYSTR|" +
+                        "YPT_(?:BLOWFISH|EXT_DES|MD5|S(?:ALT_LENGTH|TD_DES)))|URRENCY_SYMBOL)|D(?:AY_(?:1|2|3|4|5|6|7)|" +
+                        "ECIMAL_POINT|IRECTORY_SEPARATOR|_(?:FMT|T_FMT))|E(?:NT_(?:COMPAT|NOQUOTES|QUOTES)|RA(?:_(?:D_(?:FMT|T_FMT)|" +
+                        "T_FMT|YEAR)|)|XTR_(?:IF_EXISTS|OVERWRITE|PREFIX_(?:ALL|I(?:F_EXISTS|NVALID)|SAME)|SKIP))|FRAC_DIGITS|GROUPING|" +
+                        "HTML_(?:ENTITIES|SPECIALCHARS)|IN(?:FO_(?:ALL|C(?:ONFIGURATION|REDITS)|ENVIRONMENT|GENERAL|LICENSE|MODULES|VARIABLES)|" +
+                        "I_(?:ALL|PERDIR|SYSTEM|USER)|T_(?:CURR_SYMBOL|FRAC_DIGITS))|L(?:C_(?:ALL|C(?:OLLATE|TYPE)|M(?:ESSAGES|ONETARY)|NUMERIC|TIME)|" +
+                        "O(?:CK_(?:EX|NB|SH|UN)|G_(?:A(?:LERT|UTH(?:PRIV|))|C(?:ONS|R(?:IT|ON))|D(?:AEMON|EBUG)|E(?:MERG|RR)|INFO|KERN|" +
+                        "L(?:OCAL(?:0|1|2|3|4|5|6|7)|PR)|MAIL|N(?:DELAY|EWS|O(?:TICE|WAIT))|ODELAY|P(?:ERROR|ID)|SYSLOG|U(?:SER|UCP)|WARNING)))|" +
+                        "M(?:ON_(?:1(?:0|1|2|)|2|3|4|5|6|7|8|9|DECIMAL_POINT|GROUPING|THOUSANDS_SEP)|_(?:1_PI|2_(?:PI|SQRTPI)|E|L(?:N(?:10|2)|" +
+                        "OG(?:10E|2E))|PI(?:_(?:2|4)|)|SQRT(?:1_2|2)))|N(?:EGATIVE_SIGN|O(?:EXPR|STR)|_(?:CS_PRECEDES|S(?:EP_BY_SPACE|IGN_POSN)))|" +
+                        "P(?:ATH(?:INFO_(?:BASENAME|DIRNAME|EXTENSION)|_SEPARATOR)|M_STR|OSITIVE_SIGN|_(?:CS_PRECEDES|S(?:EP_BY_SPACE|IGN_POSN)))|" +
+                        "RADIXCHAR|S(?:EEK_(?:CUR|END|SET)|ORT_(?:ASC|DESC|NUMERIC|REGULAR|STRING)|TR_PAD_(?:BOTH|LEFT|RIGHT))|" +
+                        "T(?:HOUS(?:ANDS_SEP|EP)|_FMT(?:_AMPM|))|YES(?:EXPR|STR)|STD(?:IN|OUT|ERR))\\b"
+            }, {
+                token : function(value) {
+                    if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (builtinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else if (builtinVariables.hasOwnProperty(value))
+                        return "variable.language";
+                    else if (futureReserved.hasOwnProperty(value))
+                        return "invalid.illegal";
+                    else if (builtinFunctions.hasOwnProperty(value))
+                        return "support.function";
+                    else if (value == "debugger")
+                        return "invalid.deprecated";
+                    else
+                        if(value.match(/^(\$[a-zA-Z][a-zA-Z0-9_]*|self|parent)$/))
+                            return "variable";
+                        return "identifier";
+                },
+                // TODO: Unicode escape sequences
+                // TODO: Unicode identifiers
+                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+            }, {
+                token : "keyword.operator",
+                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+            }, {
+                token : "lparen",
+                regex : "[[({]"
+            }, {
+                token : "rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                regex : ".+"
+            }
+        ],
+        "qqstring" : [
+            {
+                token : "string",
+                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
+                next : "start"
+            }, {
+                token : "string",
+                regex : '.+'
+            }
+        ],
+        "qstring" : [
+            {
+                token : "string",
+                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
+                next : "start"
+            }, {
+                token : "string",
+                regex : '.+'
+            }
+        ],
+        "htmlcomment" : [
+             {
+                 token : "comment",
+                 regex : ".*?-->",
+                 next : "start"
+             }, {
+                 token : "comment",
+                 regex : ".+"
+             } 
+         ],
+         "htmltag" : [ 
+             {
+                 token : "meta.tag",
+                 regex : ">",
+                 next : "start"
+             }, {
+                 token : "text",
+                 regex : "[-_a-zA-Z0-9:]+"
+             }, {
+                 token : "text",
+                 regex : "\\s+"
+             }, {
+                 token : "string",
+                 regex : '".*?"'
+             }, {
+                 token : "string",
+                 regex : "'.*?'"
+             } 
+         ],
+        "css" : [ 
+             {
+                 token : "meta.tag",
+                 regex : "<\/style>",
+                 next : "htmltag"
+             }, {
+                 token : "meta.tag",
+                 regex : ">",
+             }, {
+                 token : 'text',
+                 regex : "(?:media|type|href)"
+             }, {
+                 token : 'string',
+                 regex : '=".*?"'
+             }, {
+                 token : "paren.lparen",
+                 regex : "\{",
+                 next : "cssdeclaration",
+             }, {
+                 token : "keyword",
+                 regex : "#[A-Za-z0-9\-\_\.]+"
+             }, {
+                 token : "variable",
+                 regex : "\\.[A-Za-z0-9\-\_\.]+"
+             }, {
+                 token : "constant",
+                 regex : "[A-Za-z0-9]+"
+             }
+         ],
+         "cssdeclaration" : [
+             {
+                 token : "support.type",
+                 regex : "[\-a-zA-Z]+",
+                 next  : "cssvalue"
+             }, 
+             {
+                 token : "paren.rparen",
+                 regex : '\}',
+                 next : "css"
+             }
+         ],
+         "cssvalue" : [
+               {
+                   token : "text",
+                   regex : "\:"
+               }, 
+               {
+                   token : "constant",
+                   regex : "#[0-9a-zA-Z]+"
+               },
+               {
+                   token : "text",
+                   regex : "[\-\_0-9a-zA-Z\"' ,%]+"
+               },
+               {
+                   token : "text",
+                   regex : ";",
+                   next : "cssdeclaration"
+               }
+         ],
+    };
+
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ new DocCommentHighlightRules().getEndRule("start") ]);
+};
+
+oop.inherits(PhpHighlightRules, TextHighlightRules);
+
+exports.PhpHighlightRules = PhpHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var DocCommentHighlightRules = function() {
+
+    this.$rules = {
+        "start" : [ {
+            token : "comment.doc.tag",
+            regex : "@[\\w\\d_]+" // TODO: fix email addresses
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "\\s+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "TODO"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "[^@\\*]+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "."
+        }]
+    };
+};
+
+oop.inherits(DocCommentHighlightRules, TextHighlightRules);
+
+(function() {
+
+    this.getStartRule = function(start) {
+        return {
+            token : "comment.doc", // doc comment
+            merge : true,
+            regex : "\\/\\*(?=\\*)",
+            next  : start
+        };
+    };
+    
+    this.getEndRule = function (start) {
+        return {
+            token : "comment.doc", // closing comment
+            merge : true,
+            regex : "\\*\\/",
+            next  : start
+        };
+    };
+
+}).call(DocCommentHighlightRules.prototype);
+
+exports.DocCommentHighlightRules = DocCommentHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require('../behaviour').Behaviour;
+
+var CstyleBehaviour = function () {
+
+    this.add("braces", "insertion", function (state, action, editor, session, text) {
+        if (text == '{') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '}') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return null;
+
+                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
+                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+
+    this.add("braces", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '{') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.end.column, range.end.column + 1);
+            if (rightChar == '}') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("parens", "insertion", function (state, action, editor, session, text) {
+        if (text == '(') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '()',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == ')') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == ')') {
+                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("parens", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '(') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == ')') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '"' + selected + '"',
+                    selection: false
+                }
+            } else {
+                var cursor = editor.getCursorPosition();
+                var line = session.doc.getLine(cursor.row);
+                var leftChar = line.substring(cursor.column-1, cursor.column);
+
+                // We're escaped.
+                if (leftChar == '\\') {
+                    return null;
+                }
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf('"');
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
+                    return {
+                        text: '""',
+                        selection: [1,1]
+                    }
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == '"') {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '"') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == '"') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+}
+oop.inherits(CstyleBehaviour, Behaviour);
+
+exports.CstyleBehaviour = CstyleBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-powershell-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-powershell-uncompressed.js
new file mode 100755
index 00000000000..e5877f62373
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-powershell-uncompressed.js
@@ -0,0 +1,716 @@
+define('ace/mode/powershell', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/powershell_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var PowershellHighlightRules = require("./powershell_highlight_rules").PowershellHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new PowershellHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+      
+        if (state == "start") {
+            var match = line.match(/^.*[\{\(\[]\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+
+
+    this.createWorker = function(session) {
+        return null;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+define('ace/mode/powershell_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var PowershellHighlightRules = function() {
+    
+    var keywords = lang.arrayToMap(
+      ("function|if|else|elseif|switch|while|default|for|do|until|break|continue|" + 
+       "foreach|return|filter|in|trap|throw|param|begin|process|end").split("|")
+    );
+
+    var builtinFunctions = lang.arrayToMap(
+      ("Get-Alias|Import-Alias|New-Alias|Set-Alias|Get-AuthenticodeSignature|Set-AuthenticodeSignature|" +
+       "Set-Location|Get-ChildItem|Clear-Item|Get-Command|Measure-Command|Trace-Command|" +
+       "Add-Computer|Checkpoint-Computer|Remove-Computer|Restart-Computer|Restore-Computer|Stop-Computer|" +
+       "Reset-ComputerMachinePassword|Test-ComputerSecureChannel|Add-Content|Get-Content|Set-Content|Clear-Content|" +
+       "Get-Command|Invoke-Command|Enable-ComputerRestore|Disable-ComputerRestore|Get-ComputerRestorePoint|Test-Connection|" +
+       "ConvertFrom-CSV|ConvertTo-CSV|ConvertTo-Html|ConvertTo-Xml|ConvertFrom-SecureString|ConvertTo-SecureString|" +
+       "Copy-Item|Export-Counter|Get-Counter|Import-Counter|Get-Credential|Get-Culture|" +
+       "Get-ChildItem|Get-Date|Set-Date|Remove-Item|Compare-Object|Get-Event|" +
+       "Get-WinEvent|New-Event|Remove-Event|Unregister-Event|Wait-Event|Clear-EventLog|" +
+       "Get-Eventlog|Limit-EventLog|New-Eventlog|Remove-EventLog|Show-EventLog|Write-EventLog|" +
+       "Get-EventSubscriber|Register-EngineEvent|Register-ObjectEvent|Register-WmiEvent|Get-ExecutionPolicy|Set-ExecutionPolicy|" +
+       "Export-Alias|Export-Clixml|Export-Console|Export-Csv|ForEach-Object|Format-Custom|" +
+       "Format-List|Format-Table|Format-Wide|Export-FormatData|Get-FormatData|Get-Item|" +
+       "Get-ChildItem|Get-Help|Add-History|Clear-History|Get-History|Invoke-History|" +
+       "Get-Host|Read-Host|Write-Host|Get-HotFix|Import-Clixml|Import-Csv|" +
+       "Invoke-Command|Invoke-Expression|Get-Item|Invoke-Item|New-Item|Remove-Item|" +
+       "Set-Item|Clear-ItemProperty|Copy-ItemProperty|Get-ItemProperty|Move-ItemProperty|New-ItemProperty|" +
+       "Remove-ItemProperty|Rename-ItemProperty|Set-ItemProperty|Get-Job|Receive-Job|Remove-Job|" +
+       "Start-Job|Stop-Job|Wait-Job|Stop-Process|Update-List|Get-Location|" +
+       "Pop-Location|Push-Location|Set-Location|Send-MailMessage|Add-Member|Get-Member|" +
+       "Move-Item|Compare-Object|Group-Object|Measure-Object|New-Object|Select-Object|" +
+       "Sort-Object|Where-Object|Out-Default|Out-File|Out-GridView|Out-Host|" +
+       "Out-Null|Out-Printer|Out-String|Convert-Path|Join-Path|Resolve-Path|" +
+       "Split-Path|Test-Path|Get-Pfxcertificate|Pop-Location|Push-Location|Get-Process|" +
+       "Start-Process|Stop-Process|Wait-Process|Enable-PSBreakpoint|Disable-PSBreakpoint|Get-PSBreakpoint|" +
+       "Set-PSBreakpoint|Remove-PSBreakpoint|Get-PSDrive|New-PSDrive|Remove-PSDrive|Get-PSProvider|" +
+       "Set-PSdebug|Enter-PSSession|Exit-PSSession|Export-PSSession|Get-PSSession|Import-PSSession|" +
+       "New-PSSession|Remove-PSSession|Disable-PSSessionConfiguration|Enable-PSSessionConfiguration|Get-PSSessionConfiguration|Register-PSSessionConfiguration|" +
+       "Set-PSSessionConfiguration|Unregister-PSSessionConfiguration|New-PSSessionOption|Add-PsSnapIn|Get-PsSnapin|Remove-PSSnapin|" +
+       "Get-Random|Read-Host|Remove-Item|Rename-Item|Rename-ItemProperty|Select-Object|" +
+       "Select-XML|Send-MailMessage|Get-Service|New-Service|Restart-Service|Resume-Service|" +
+       "Set-Service|Start-Service|Stop-Service|Suspend-Service|Sort-Object|Start-Sleep|" +
+       "ConvertFrom-StringData|Select-String|Tee-Object|New-Timespan|Trace-Command|Get-Tracesource|" +
+       "Set-Tracesource|Start-Transaction|Complete-Transaction|Get-Transaction|Use-Transaction|Undo-Transaction|" +
+       "Start-Transcript|Stop-Transcript|Add-Type|Update-TypeData|Get-Uiculture|Get-Unique|" +
+       "Update-Formatdata|Update-Typedata|Clear-Variable|Get-Variable|New-Variable|Remove-Variable|" +
+       "Set-Variable|New-WebServiceProxy|Where-Object|Write-Debug|Write-Error|Write-Host|" +
+       "Write-Output|Write-Progress|Write-Verbose|Write-Warning|Set-WmiInstance|Invoke-WmiMethod|" +
+       "Get-WmiObject|Remove-WmiObject|Connect-WSMan|Disconnect-WSMan|Test-WSMan|Invoke-WSManAction|" +
+       "Disable-WSManCredSSP|Enable-WSManCredSSP|Get-WSManCredSSP|New-WSManInstance|Get-WSManInstance|Set-WSManInstance|" +
+       "Remove-WSManInstance|Set-WSManQuickConfig|New-WSManSessionOption").split("|"));
+
+    var binaryOperatorsRe = "eq|ne|ge|gt|lt|le|like|notlike|match|notmatch|replace|contains|notcontains|" +
+                            "ieq|ine|ige|igt|ile|ilt|ilike|inotlike|imatch|inotmatch|ireplace|icontains|inotcontains|" +
+                            "is|isnot|as|" +
+                            "and|or|band|bor|not"; 
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "#.*$"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : "constant.language.boolean",
+                regex : "[$](?:[Tt]rue|[Ff]alse)\\b"
+            }, {
+                token : "constant.language",
+                regex : "[$][Nn]ull\\b"
+            }, {
+                token : "variable.instance",
+                regex : "[$][a-zA-Z][a-zA-Z0-9_]*\\b"
+            }, {
+                token : function(value) {
+                    if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (builtinFunctions.hasOwnProperty(value))
+                        return "support.function";
+                    else
+                        return "identifier";
+                },
+                // TODO: Unicode escape sequences
+                // TODO: Unicode identifiers
+                regex : "[a-zA-Z_$][a-zA-Z0-9_$\\-]*\\b"
+            }, {
+                token : "keyword.operator",
+                regex : "\\-(?:" + binaryOperatorsRe + ")"
+            }, {
+                token : "keyword.operator",
+                regex : "&|\\*|\\+|\\-|\\=|\\+=|\\-="
+            }, {
+                token : "lparen",
+                regex : "[[({]"
+            }, {
+                token : "rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ]
+    };
+};
+
+oop.inherits(PowershellHighlightRules, TextHighlightRules);
+
+exports.PowershellHighlightRules = PowershellHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require('../behaviour').Behaviour;
+
+var CstyleBehaviour = function () {
+
+    this.add("braces", "insertion", function (state, action, editor, session, text) {
+        if (text == '{') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '}') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return null;
+
+                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
+                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+
+    this.add("braces", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '{') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.end.column, range.end.column + 1);
+            if (rightChar == '}') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("parens", "insertion", function (state, action, editor, session, text) {
+        if (text == '(') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '()',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == ')') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == ')') {
+                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("parens", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '(') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == ')') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '"' + selected + '"',
+                    selection: false
+                }
+            } else {
+                var cursor = editor.getCursorPosition();
+                var line = session.doc.getLine(cursor.row);
+                var leftChar = line.substring(cursor.column-1, cursor.column);
+
+                // We're escaped.
+                if (leftChar == '\\') {
+                    return null;
+                }
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf('"');
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
+                    return {
+                        text: '""',
+                        selection: [1,1]
+                    }
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == '"') {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '"') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == '"') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+}
+oop.inherits(CstyleBehaviour, Behaviour);
+
+exports.CstyleBehaviour = CstyleBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-python-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-python-uncompressed.js
new file mode 100755
index 00000000000..ad0add6d775
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-python-uncompressed.js
@@ -0,0 +1,516 @@
+/* ***** BEGIN LICENSE BLOCK *****
+* Version: MPL 1.1/GPL 2.0/LGPL 2.1
+*
+* The contents of this file are subject to the Mozilla Public License Version
+* 1.1 (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+* http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS IS" basis,
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+* for the specific language governing rights and limitations under the
+* License.
+*
+* The Original Code is Ajax.org Code Editor (ACE).
+*
+* The Initial Developer of the Original Code is
+* Ajax.org B.V.
+* Portions created by the Initial Developer are Copyright (C) 2010
+* the Initial Developer. All Rights Reserved.
+*
+* Contributor(s):
+*      Fabian Jakobs <fabian AT ajax DOT org>
+*      Colin Gourlay <colin DOT j DOT gourlay AT gmail DOT com>
+*
+* Alternatively, the contents of this file may be used under the terms of
+* either the GNU General Public License Version 2 or later (the "GPL"), or
+* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+* in which case the provisions of the GPL or the LGPL are applicable instead
+* of those above. If you wish to allow use of your version of this file only
+* under the terms of either the GPL or the LGPL, and not to allow others to
+* use your version of this file under the terms of the MPL, indicate your
+* decision by deleting the provisions above and replace them with the notice
+* and other provisions required by the GPL or the LGPL. If you do not delete
+* the provisions above, a recipient may use your version of this file under
+* the terms of any one of the MPL, the GPL or the LGPL.
+*
+* ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/python', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/python_highlight_rules', 'ace/mode/folding/pythonic', 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var PythonHighlightRules = require("./python_highlight_rules").PythonHighlightRules;
+var PythonFoldMode = require("./folding/pythonic").FoldMode;
+var Range = require("../range").Range;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new PythonHighlightRules().getRules());
+    this.foldingRules = new PythonFoldMode("\\:");
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var re = /^(\s*)#/;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i);
+                var m = line.match(re);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, "#");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+
+        if (state == "start") {
+            var match = line.match(/^.*[\{\(\[\:]\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        }
+
+        return indent;
+    };
+
+    var outdents = {
+        "pass": 1,
+        "return": 1,
+        "raise": 1,
+        "break": 1,
+        "continue": 1
+    };
+    
+    this.checkOutdent = function(state, line, input) {
+        if (input !== "\r\n" && input !== "\r" && input !== "\n")
+            return false;
+
+        var tokens = this.$tokenizer.getLineTokens(line.trim(), state).tokens;
+        
+        if (!tokens)
+            return false;
+        
+        // ignore trailing comments
+        do {
+            var last = tokens.pop();
+        } while (last && (last.type == "comment" || (last.type == "text" && last.value.match(/^\s+$/))));
+        
+        if (!last)
+            return false;
+        
+        return (last.type == "keyword" && outdents[last.value]);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        // outdenting in python is slightly different because it always applies
+        // to the next line and only of a new line is inserted
+        
+        row += 1;
+        var indent = this.$getIndent(doc.getLine(row));
+        var tab = doc.getTabString();
+        if (indent.slice(-tab.length) == tab)
+            doc.remove(new Range(row, indent.length-tab.length, row, indent.length));
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Colin Gourlay <colin DOT j DOT gourlay AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK *****
+ *
+ * TODO: python delimiters
+ */
+
+define('ace/mode/python_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var PythonHighlightRules = function() {
+
+    var keywords = lang.arrayToMap(
+        ("and|as|assert|break|class|continue|def|del|elif|else|except|exec|" +
+        "finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|" +
+        "raise|return|try|while|with|yield").split("|")
+    );
+
+    var builtinConstants = lang.arrayToMap(
+        ("True|False|None|NotImplemented|Ellipsis|__debug__").split("|")
+    );
+
+    var builtinFunctions = lang.arrayToMap(
+        ("abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|" +
+        "eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|" +
+        "binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|" +
+        "float|list|raw_input|unichr|callable|format|locals|reduce|unicode|" +
+        "chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|" +
+        "cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|" +
+        "__import__|complex|hash|min|set|apply|delattr|help|next|setattr|" +
+        "buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern").split("|")
+    );
+
+    var futureReserved = lang.arrayToMap(
+        ("").split("|")
+    );
+
+    var strPre = "(?:r|u|ur|R|U|UR|Ur|uR)?";
+
+    var decimalInteger = "(?:(?:[1-9]\\d*)|(?:0))";
+    var octInteger = "(?:0[oO]?[0-7]+)";
+    var hexInteger = "(?:0[xX][\\dA-Fa-f]+)";
+    var binInteger = "(?:0[bB][01]+)";
+    var integer = "(?:" + decimalInteger + "|" + octInteger + "|" + hexInteger + "|" + binInteger + ")";
+
+    var exponent = "(?:[eE][+-]?\\d+)";
+    var fraction = "(?:\\.\\d+)";
+    var intPart = "(?:\\d+)";
+    var pointFloat = "(?:(?:" + intPart + "?" + fraction + ")|(?:" + intPart + "\\.))";
+    var exponentFloat = "(?:(?:" + pointFloat + "|" +  intPart + ")" + exponent + ")";
+    var floatNumber = "(?:" + exponentFloat + "|" + pointFloat + ")";
+
+    this.$rules = {
+        "start" : [ {
+            token : "comment",
+            regex : "#.*$"
+        }, {
+            token : "string",           // """ string
+            regex : strPre + '"{3}(?:[^\\\\]|\\\\.)*?"{3}'
+        }, {
+            token : "string",           // multi line """ string start
+            merge : true,
+            regex : strPre + '"{3}.*$',
+            next : "qqstring"
+        }, {
+            token : "string",           // " string
+            regex : strPre + '"(?:[^\\\\]|\\\\.)*?"'
+        }, {
+            token : "string",           // ''' string
+            regex : strPre + "'{3}(?:[^\\\\]|\\\\.)*?'{3}"
+        }, {
+            token : "string",           // multi line ''' string start
+            merge : true,
+            regex : strPre + "'{3}.*$",
+            next : "qstring"
+        }, {
+            token : "string",           // ' string
+            regex : strPre + "'(?:[^\\\\]|\\\\.)*?'"
+        }, {
+            token : "constant.numeric", // imaginary
+            regex : "(?:" + floatNumber + "|\\d+)[jJ]\\b"
+        }, {
+            token : "constant.numeric", // float
+            regex : floatNumber
+        }, {
+            token : "constant.numeric", // long integer
+            regex : integer + "[lL]\\b"
+        }, {
+            token : "constant.numeric", // integer
+            regex : integer + "\\b"
+        }, {
+            token : function(value) {
+                if (keywords.hasOwnProperty(value))
+                    return "keyword";
+                else if (builtinConstants.hasOwnProperty(value))
+                    return "constant.language";
+                else if (futureReserved.hasOwnProperty(value))
+                    return "invalid.illegal";
+                else if (builtinFunctions.hasOwnProperty(value))
+                    return "support.function";
+                else if (value == "debugger")
+                    return "invalid.deprecated";
+                else
+                    return "identifier";
+            },
+            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+        }, {
+            token : "keyword.operator",
+            regex : "\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="
+        }, {
+            token : "lparen.paren",
+            regex : "[\\[\\(\\{]"
+        }, {
+            token : "paren.rparen",
+            regex : "[\\]\\)\\}]"
+        }, {
+            token : "text",
+            regex : "\\s+"
+        } ],
+        "qqstring" : [ {
+            token : "string", // multi line """ string end
+            regex : '(?:[^\\\\]|\\\\.)*?"{3}',
+            next : "start"
+        }, {
+            token : "string",
+            merge : true,
+            regex : '.+'
+        } ],
+        "qstring" : [ {
+            token : "string",  // multi line ''' string end
+            regex : "(?:[^\\\\]|\\\\.)*?'{3}",
+            next : "start"
+        }, {
+            token : "string",
+            merge : true,
+            regex : '.+'
+        } ]
+    };
+};
+
+oop.inherits(PythonHighlightRules, TextHighlightRules);
+
+exports.PythonHighlightRules = PythonHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/pythonic', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function(markers) {
+    this.foldingStartMarker = new RegExp("(?:([\\[{])|(" + markers + "))(?:\\s*)(?:#.*)?$");
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, match.index);
+            if (match[2])
+                return this.indentationBlock(session, row, match.index + match[2].length);
+            return this.indentationBlock(session, row);
+        }
+    }
+
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-ruby-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-ruby-uncompressed.js
new file mode 100755
index 00000000000..96de75ef8ba
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-ruby-uncompressed.js
@@ -0,0 +1,401 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Shlomo Zalman Heigh <shlomozalmanheigh AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/ruby', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/ruby_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var RubyHighlightRules = require("./ruby_highlight_rules").RubyHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var Range = require("../range").Range;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new RubyHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var re = /^(\s*)#/;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i);
+                var m = line.match(re);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, "#");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+        
+        if (state == "start") {
+            var match = line.match(/^.*[\{\(\[]\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Shlomo Zalman Heigh <shlomozalmanheigh AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/ruby_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var RubyHighlightRules = function() {
+
+    var builtinFunctions = lang.arrayToMap(
+        ("abort|Array|assert|assert_equal|assert_not_equal|assert_same|assert_not_same|" +
+        "assert_nil|assert_not_nil|assert_match|assert_no_match|assert_in_delta|assert_throws|" + 
+        "assert_raise|assert_nothing_raised|assert_instance_of|assert_kind_of|assert_respond_to|" +
+        "assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|" +
+        "assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|" +
+        "assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|" +
+        "attr|attr_writer|attr_reader|attr_accessor|attr_accessible|autoload|binding|block_given?|callcc|" +
+        "caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|" +
+        "exit!|fail|Float|flunk|follow_redirect!|fork|form_for|form_tag|format|gets|global_variables|gsub|" +
+        "gsub!|get_via_redirect|h|host!|https?|https!|include|Integer|lambda|link_to|" +
+        "link_to_unless_current|link_to_function|link_to_remote|load|local_variables|loop|open|open_session|" +
+        "p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|" +
+        "raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|" +
+        "set_trace_func|sleep|split|sprintf|srand|String|stylesheet_link_tag|syscall|system|sub|sub!|test|" +
+        "throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan|" +
+        "render|javascript_include_tag|csrf_meta_tag|label_tag|text_field_tag|submit_tag|check_box_tag|" +
+        "content_tag|radio_button_tag|text_area_tag|password_field_tag|hidden_field_tag|" +
+        "fields_for|select_tag|options_for_select|options_from_collection_for_select|collection_select|" +
+        "time_zone_select|select_date|select_time|select_datetime|date_select|time_select|datetime_select|" +
+        "select_year|select_month|select_day|select_hour|select_minute|select_second|file_field_tag|" +
+        "file_field|respond_to|skip_before_filter|around_filter|after_filter|verify|" +
+        "protect_from_forgery|rescue_from|helper_method|redirect_to|before_filter|" +
+        "send_data|send_file|validates_presence_of|validates_uniqueness_of|validates_length_of|" +
+        "validates_format_of|validates_acceptance_of|validates_associated|validates_exclusion_of|" +
+        "validates_inclusion_of|validates_numericality_of|validates_with|validates_each|" +
+        "authenticate_or_request_with_http_basic|authenticate_or_request_with_http_digest|" +
+        "filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|" +
+        "translate|localize|extract_locale_from_tld|t|l|caches_page|expire_page|caches_action|expire_action|" +
+        "cache|expire_fragment|expire_cache_for|observe|cache_sweeper|" +
+        "has_many|has_one|belongs_to|has_and_belongs_to_many").split("|")
+    );
+
+    var keywords = lang.arrayToMap(
+        ("alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|" +
+        "__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|" + 
+        "redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield").split("|")
+    );
+
+    var buildinConstants = lang.arrayToMap(
+        ("true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|" +
+        "RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING").split("|")
+    );
+
+    var builtinVariables = lang.arrayToMap(
+        ("\$DEBUG|\$defout|\$FILENAME|\$LOAD_PATH|\$SAFE|\$stdin|\$stdout|\$stderr|\$VERBOSE|" +
+        "$!|root_url|flash|session|cookies|params|request|response|logger").split("|")
+    );
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "#.*$"
+            }, {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "^\=begin$",
+                next : "comment"
+            }, {
+                token : "string.regexp",
+                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "string", // backtick string
+                regex : "[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"
+            }, {
+                token : "text", // namespaces aren't symbols
+                regex : "::"
+            }, {
+                token : "variable.instancce", // instance variable
+                regex : "@{1,2}(?:[a-zA-Z_]|\d)+"
+            }, {
+                token : "variable.class", // class name
+                regex : "[A-Z](?:[a-zA-Z_]|\d)+"
+            }, {
+                token : "string", // symbol
+                regex : "[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"
+           }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : "constant.language.boolean",
+                regex : "(?:true|false)\\b"
+            }, {
+                token : function(value) {
+                    if (value == "self")
+                        return "variable.language";
+                    else if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else if (builtinVariables.hasOwnProperty(value))
+                        return "variable.language";
+                    else if (builtinFunctions.hasOwnProperty(value))
+                        return "support.function";
+                    else if (value == "debugger")
+                        return "invalid.deprecated";
+                    else
+                        return "identifier";
+                },
+                // TODO: Unicode escape sequences
+                // TODO: Unicode identifiers
+                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+            }, {
+                token : "keyword.operator",
+                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+            }, {
+                token : "paren.lparen",
+                regex : "[[({]"
+            }, {
+                token : "paren.rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : "^\=end$",
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ]
+    };
+};
+
+oop.inherits(RubyHighlightRules, TextHighlightRules);
+
+exports.RubyHighlightRules = RubyHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-scad-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-scad-uncompressed.js
new file mode 100755
index 00000000000..07e368130ef
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-scad-uncompressed.js
@@ -0,0 +1,916 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Gastón Kleiman <gaston.kleiman AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/scad', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/scad_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var scadHighlightRules = require("./scad_highlight_rules").scadHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var Range = require("../range").Range;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new scadHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var re = /^(\s*)\/\//;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i);
+                var m = line.match(re);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, "//");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+        var endState = tokenizedLine.state;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+
+        if (state == "start") {
+            var match = line.match(/^.*[\{\(\[]\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        } else if (state == "doc-start") {
+            if (endState == "start") {
+                return "";
+            }
+            var match = line.match(/^\s*(\/?)\*/);
+            if (match) {
+                if (match[1]) {
+                    indent += " ";
+                }
+                indent += "* ";
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Gastón Kleiman <gaston.kleiman AT gmail DOT com>
+ *
+ * Based on Bespin's C/C++ Syntax Plugin by Marc McIntyre.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/scad_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var scadHighlightRules = function() {
+
+    var keywords = lang.arrayToMap(
+        ("module|if|else|for").split("|")
+    );
+
+    var buildinConstants = lang.arrayToMap(
+        ("NULL").split("|")
+    );
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            new DocCommentHighlightRules().getStartRule("start"),
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // multi line string start
+                regex : '["].*\\\\$',
+                next : "qqstring"
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "string", // multi line string start
+                regex : "['].*\\\\$",
+                next : "qstring"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+              token : "constant", // <CONSTANT>
+              regex : "<[a-zA-Z0-9.]+>"
+            }, {
+              token : "keyword", // pre-compiler directivs
+              regex : "(?:use|include)"
+          }, {
+                token : function(value) {
+                    if (value == "this")
+                        return "variable.language";
+                    else if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else
+                        return "identifier";
+                },
+                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+            }, {
+                token : "keyword.operator",
+                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"
+            }, {
+                token : "paren.lparen",
+                regex : "[[({]"
+            }, {
+                token : "paren.rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "qqstring" : [
+            {
+                token : "string",
+                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ],
+        "qstring" : [
+            {
+                token : "string",
+                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ]
+    };
+    
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ new DocCommentHighlightRules().getEndRule("start") ]);
+};
+
+oop.inherits(scadHighlightRules, TextHighlightRules);
+
+exports.scadHighlightRules = scadHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var DocCommentHighlightRules = function() {
+
+    this.$rules = {
+        "start" : [ {
+            token : "comment.doc.tag",
+            regex : "@[\\w\\d_]+" // TODO: fix email addresses
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "\\s+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "TODO"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "[^@\\*]+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "."
+        }]
+    };
+};
+
+oop.inherits(DocCommentHighlightRules, TextHighlightRules);
+
+(function() {
+
+    this.getStartRule = function(start) {
+        return {
+            token : "comment.doc", // doc comment
+            merge : true,
+            regex : "\\/\\*(?=\\*)",
+            next  : start
+        };
+    };
+    
+    this.getEndRule = function (start) {
+        return {
+            token : "comment.doc", // closing comment
+            merge : true,
+            regex : "\\*\\/",
+            next  : start
+        };
+    };
+
+}).call(DocCommentHighlightRules.prototype);
+
+exports.DocCommentHighlightRules = DocCommentHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require('../behaviour').Behaviour;
+
+var CstyleBehaviour = function () {
+
+    this.add("braces", "insertion", function (state, action, editor, session, text) {
+        if (text == '{') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '}') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return null;
+
+                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
+                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+
+    this.add("braces", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '{') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.end.column, range.end.column + 1);
+            if (rightChar == '}') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("parens", "insertion", function (state, action, editor, session, text) {
+        if (text == '(') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '()',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == ')') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == ')') {
+                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("parens", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '(') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == ')') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '"' + selected + '"',
+                    selection: false
+                }
+            } else {
+                var cursor = editor.getCursorPosition();
+                var line = session.doc.getLine(cursor.row);
+                var leftChar = line.substring(cursor.column-1, cursor.column);
+
+                // We're escaped.
+                if (leftChar == '\\') {
+                    return null;
+                }
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf('"');
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
+                    return {
+                        text: '""',
+                        selection: [1,1]
+                    }
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == '"') {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '"') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == '"') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+}
+oop.inherits(CstyleBehaviour, Behaviour);
+
+exports.CstyleBehaviour = CstyleBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-scala-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-scala-uncompressed.js
new file mode 100755
index 00000000000..098b14e066c
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-scala-uncompressed.js
@@ -0,0 +1,1464 @@
+define('ace/mode/scala', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/javascript', 'ace/tokenizer', 'ace/mode/scala_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var JavaScriptMode = require("./javascript").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var ScalaHighlightRules = require("./scala_highlight_rules").ScalaHighlightRules;
+
+var Mode = function() {
+    JavaScriptMode.call(this);
+    
+    this.$tokenizer = new Tokenizer(new ScalaHighlightRules().getRules());
+};
+oop.inherits(Mode, JavaScriptMode);
+
+(function() {
+
+    this.createWorker = function(session) {
+        return null;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var Range = require("../range").Range;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var re = /^(\s*)\/\//;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i);
+                var m = line.match(re);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, "//");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+        var endState = tokenizedLine.state;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+        
+        if (state == "start" || state == "regex_allowed") {
+            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        } else if (state == "doc-start") {
+            if (endState == "start" || state == "regex_allowed") {
+                return "";
+            }
+            var match = line.match(/^\s*(\/?)\*/);
+            if (match) {
+                if (match[1]) {
+                    indent += " ";
+                }
+                indent += "* ";
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+    
+    this.createWorker = function(session) {
+        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
+        worker.attachToDocument(session.getDocument());
+            
+        worker.on("jslint", function(results) {
+            var errors = [];
+            for (var i=0; i<results.data.length; i++) {
+                var error = results.data[i];
+                if (error)
+                    errors.push({
+                        row: error.line-1,
+                        column: error.character-1,
+                        text: error.reason,
+                        type: "warning",
+                        lint: error
+                    });
+            }
+            session.setAnnotations(errors);
+        });
+        
+        worker.on("narcissus", function(e) {
+            session.setAnnotations([e.data]);
+        });
+        
+        worker.on("terminate", function() {
+            session.clearAnnotations();
+        });
+        
+        return worker;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var unicode = require("../unicode");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var JavaScriptHighlightRules = function() {
+
+    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
+    var globals = lang.arrayToMap(
+      // Constructors
+        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
+      // E4X
+         "Namespace|QName|XML|XMLList|" +
+         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
+         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
+      // Errors
+        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
+        "SyntaxError|TypeError|URIError|" +
+      //  Non-constructor functions
+        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
+        "isNaN|parseFloat|parseInt|" +
+      // Other
+        "JSON|Math|" +
+      // Pseudo
+        "this|arguments|prototype|window|document"
+      ).split("|")
+    );
+
+    var keywords = lang.arrayToMap(
+        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
+        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
+        "const|yield|import|get|set").split("|")
+    );
+
+    // keywords which can be followed by regular expressions
+    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
+
+    var deprecated = lang.arrayToMap(
+        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
+    );
+
+    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
+
+    var buildinConstants = lang.arrayToMap(
+        ("null|Infinity|NaN|undefined").split("|")
+    );
+
+    var futureReserved = lang.arrayToMap(
+        ("class|enum|extends|super|export|implements|private|" +
+        "public|interface|package|protected|static").split("|")
+    );
+
+    // TODO: Unicode escape sequences
+    var identifierRe = "[" + unicode.packages.L + "\\$_][" 
+        + unicode.packages.L
+        + unicode.packages.Mn + unicode.packages.Mc
+        + unicode.packages.Nd
+        + unicode.packages.Pc + "\\$_]*\\b";
+        
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            new DocCommentHighlightRules().getStartRule("doc-start"),
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : '["].*\\\\$',
+                next : "qqstring"
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : "['].*\\\\$",
+                next : "qstring"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : ["keyword.definition", "text", "entity.name.function"],
+                regex : "(function)(\\s+)(" + identifierRe + ")"
+            }, {
+                token : "constant.language.boolean",
+                regex : "(?:true|false)\\b"
+            }, {
+                token : "keyword",
+                regex : "(?:" + kwBeforeRe + ")\\b",
+                next : "regex_allowed"
+            }, {
+                token : function(value) {
+                    if (globals.hasOwnProperty(value))
+                        return "variable.language";
+                    else if (deprecated.hasOwnProperty(value))
+                        return "invalid.deprecated";
+                    else if (definitions.hasOwnProperty(value))
+                        return "keyword.definition";
+                    else if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else if (futureReserved.hasOwnProperty(value))
+                        return "invalid.illegal";
+                    else if (value == "debugger")
+                        return "invalid.deprecated";
+                    else
+                        return "identifier";
+                },
+                regex : identifierRe
+            }, {
+                token : "keyword.operator",
+                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",
+                next  : "regex_allowed"
+            }, {
+                token : "punctuation.operator",
+                regex : "\\?|\\:|\\,|\\;|\\.",
+                next  : "regex_allowed"
+            }, {
+                token : "paren.lparen",
+                regex : "[[({]",
+                next  : "regex_allowed"
+            }, {
+                token : "paren.rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "keyword.operator",
+                regex : "\\/=?",
+                next  : "regex_allowed"
+            }, {
+                token: "comment",
+                regex: "^#!.*$" 
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        // regular expressions are only allowed after certain tokens. This
+        // makes sure we don't mix up regexps with the divison operator
+        "regex_allowed": [
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment_regex_allowed"
+            }, {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            }, {
+                token: "string.regexp",
+                regex: "\\/",
+                next: "regex",
+                merge: true
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }, {
+                // immediately return to the start mode without matching
+                // anything
+                token: "empty", 
+                regex: "",
+                next: "start"
+            }
+        ],
+        "regex": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
+                next: "regex"
+            }, {
+				// flag
+                token: "string.regexp", 
+                regex: "/\\w*",
+                next: "start",
+                merge: true 
+            }, {
+                token: "string.regexp",
+                regex: "[^\\\\/\\[]+",
+                next: "regex",
+                merge: true
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "\\[",
+                next: "regex_character_class",
+                merge: true
+            }, {
+                token: "empty", 
+                regex: "",
+                next: "start" 
+            }
+        ],
+        "regex_character_class": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
+                next: "regex_character_class"
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "]",
+                next: "regex",
+                merge: true
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "[^\\\\\\]]+",
+                next: "regex_character_class",
+                merge: true
+            }, {
+                token: "empty", 
+                regex: "",
+                next: "start" 
+            }
+        ],
+        "comment_regex_allowed" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                merge : true,
+                next : "regex_allowed"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                merge : true,
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "qqstring" : [
+            {
+                token : "string",
+                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ],
+        "qstring" : [
+            {
+                token : "string",
+                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ]
+    };
+    
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ new DocCommentHighlightRules().getEndRule("start") ]);
+};
+
+oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
+
+exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var DocCommentHighlightRules = function() {
+
+    this.$rules = {
+        "start" : [ {
+            token : "comment.doc.tag",
+            regex : "@[\\w\\d_]+" // TODO: fix email addresses
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "\\s+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "TODO"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "[^@\\*]+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "."
+        }]
+    };
+};
+
+oop.inherits(DocCommentHighlightRules, TextHighlightRules);
+
+(function() {
+
+    this.getStartRule = function(start) {
+        return {
+            token : "comment.doc", // doc comment
+            merge : true,
+            regex : "\\/\\*(?=\\*)",
+            next  : start
+        };
+    };
+    
+    this.getEndRule = function (start) {
+        return {
+            token : "comment.doc", // closing comment
+            merge : true,
+            regex : "\\*\\/",
+            next  : start
+        };
+    };
+
+}).call(DocCommentHighlightRules.prototype);
+
+exports.DocCommentHighlightRules = DocCommentHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/worker/worker_client', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var EventEmitter = require("../lib/event_emitter").EventEmitter;
+
+var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
+
+    this.changeListener = this.changeListener.bind(this);
+
+    if (module.packaged) {
+        var base = this.$guessBasePath();
+        this.$worker = new Worker(base + packagedJs);
+    }
+    else {
+        var workerUrl = this.$normalizePath(require.nameToUrl("ace/worker/worker", null, "_"));
+        this.$worker = new Worker(workerUrl);
+
+        var tlns = {};
+        for (var i=0; i<topLevelNamespaces.length; i++) {
+            var ns = topLevelNamespaces[i];
+            var path = this.$normalizePath(require.nameToUrl(ns, null, "_").replace(/.js$/, ""));
+
+            tlns[ns] = path;
+        }
+    }
+
+    this.$worker.postMessage({
+        init : true,
+        tlns: tlns,
+        module: mod,
+        classname: classname
+    });
+
+    this.callbackId = 1;
+    this.callbacks = {};
+
+    var _self = this;
+    this.$worker.onerror = function(e) {
+        window.console && console.log && console.log(e);
+        throw e;
+    };
+    this.$worker.onmessage = function(e) {
+        var msg = e.data;
+        switch(msg.type) {
+            case "log":
+                window.console && console.log && console.log(msg.data);
+                break;
+
+            case "event":
+                _self._emit(msg.name, {data: msg.data});
+                break;
+
+            case "call":
+                var callback = _self.callbacks[msg.id];
+                if (callback) {
+                    callback(msg.data);
+                    delete _self.callbacks[msg.id];
+                }
+                break;
+        }
+    };
+};
+
+(function(){
+
+    oop.implement(this, EventEmitter);
+
+    this.$normalizePath = function(path) {
+        path = path.replace(/^[a-z]+:\/\/[^\/]+\//, ""); // Remove domain name and rebuild it
+        path = location.protocol + "//" + location.host
+            // paths starting with a slash are relative to the root (host)
+            + (path.charAt(0) == "/" ? "" : location.pathname.replace(/\/[^\/]*$/, ""))
+            + "/" + path.replace(/^[\/]+/, "");
+        return path;
+    };
+
+    this.$guessBasePath = function() {
+        if (require.aceBaseUrl)
+            return require.aceBaseUrl;
+
+        var scripts = document.getElementsByTagName("script");
+        for (var i=0; i<scripts.length; i++) {
+            var script = scripts[i];
+
+            var base = script.getAttribute("data-ace-base");
+            if (base)
+                return base.replace(/\/*$/, "/");
+
+            var src = script.src || script.getAttribute("src");
+            if (!src) {
+                continue;
+            }
+            var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);
+            if (m)
+                return m[1] || m[2];
+        }
+        return "";
+    };
+
+    this.terminate = function() {
+        this._emit("terminate", {});
+        this.$worker.terminate();
+        this.$worker = null;
+        this.$doc.removeEventListener("change", this.changeListener);
+        this.$doc = null;
+    };
+
+    this.send = function(cmd, args) {
+        this.$worker.postMessage({command: cmd, args: args});
+    };
+
+    this.call = function(cmd, args, callback) {
+        if (callback) {
+            var id = this.callbackId++;
+            this.callbacks[id] = callback;
+            args.push(id);
+        }
+        this.send(cmd, args);
+    };
+
+    this.emit = function(event, data) {
+        try {
+            // firefox refuses to clone objects which have function properties
+            // TODO: cleanup event
+            this.$worker.postMessage({event: event, data: {data: data.data}});
+        }
+        catch(ex) {}
+    };
+
+    this.attachToDocument = function(doc) {
+        if(this.$doc)
+            this.terminate();
+
+        this.$doc = doc;
+        this.call("setValue", [doc.getValue()]);
+        doc.on("change", this.changeListener);
+    };
+
+    this.changeListener = function(e) {
+        e.range = {
+            start: e.data.range.start,
+            end: e.data.range.end
+        };
+        this.emit("change", e);
+    };
+
+}).call(WorkerClient.prototype);
+
+exports.WorkerClient = WorkerClient;
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require('../behaviour').Behaviour;
+
+var CstyleBehaviour = function () {
+
+    this.add("braces", "insertion", function (state, action, editor, session, text) {
+        if (text == '{') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '}') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return null;
+
+                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
+                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+
+    this.add("braces", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '{') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.end.column, range.end.column + 1);
+            if (rightChar == '}') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("parens", "insertion", function (state, action, editor, session, text) {
+        if (text == '(') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '()',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == ')') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == ')') {
+                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("parens", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '(') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == ')') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '"' + selected + '"',
+                    selection: false
+                }
+            } else {
+                var cursor = editor.getCursorPosition();
+                var line = session.doc.getLine(cursor.row);
+                var leftChar = line.substring(cursor.column-1, cursor.column);
+
+                // We're escaped.
+                if (leftChar == '\\') {
+                    return null;
+                }
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf('"');
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
+                    return {
+                        text: '""',
+                        selection: [1,1]
+                    }
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == '"') {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '"') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == '"') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+}
+oop.inherits(CstyleBehaviour, Behaviour);
+
+exports.CstyleBehaviour = CstyleBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+define('ace/mode/scala_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var ScalaHighlightRules = function() {
+
+    // taken from http://download.oracle.com/javase/tutorial/java/nutsandbolts/_keywords.html
+    var keywords = lang.arrayToMap(
+        (
+            "case|default|do|else|for|if|match|while|throw|return|try|catch|finally|yield|" +
+            "abstract|class|def|extends|final|forSome|implicit|implicits|import|lazy|new|object|" +
+            "override|package|private|protected|sealed|super|this|trait|type|val|var|with"
+        ).split("|")
+    );
+
+    var buildinConstants = lang.arrayToMap(
+        ("true|false").split("|")
+    );
+    
+    var langClasses = lang.arrayToMap(
+        ("AbstractMethodError|AssertionError|ClassCircularityError|"+
+        "ClassFormatError|Deprecated|EnumConstantNotPresentException|"+
+        "ExceptionInInitializerError|IllegalAccessError|"+
+        "IllegalThreadStateException|InstantiationError|InternalError|"+
+
+        "NegativeArraySizeException|NoSuchFieldError|Override|Process|"+
+        "ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|"+
+        "SuppressWarnings|TypeNotPresentException|UnknownError|"+
+        "UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|"+
+        "InstantiationException|IndexOutOfBoundsException|"+
+        "ArrayIndexOutOfBoundsException|CloneNotSupportedException|"+
+        "NoSuchFieldException|IllegalArgumentException|NumberFormatException|"+
+        "SecurityException|Void|InheritableThreadLocal|IllegalStateException|"+
+        "InterruptedException|NoSuchMethodException|IllegalAccessException|"+
+        "UnsupportedOperationException|Enum|StrictMath|Package|Compiler|"+
+        "Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|"+
+        "NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|"+
+        "NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|"+
+        "Character|Boolean|StackTraceElement|Appendable|StringBuffer|"+
+        "Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|"+
+        "StackOverflowError|OutOfMemoryError|VirtualMachineError|"+
+        "ArrayStoreException|ClassCastException|LinkageError|"+
+        "NoClassDefFoundError|ClassNotFoundException|RuntimeException|"+
+        "Exception|ThreadDeath|Error|Throwable|System|ClassLoader|"+
+        "Cloneable|Class|CharSequence|Comparable|String|Object|" +
+        "Unit|Any|AnyVal|AnyRef|Null|ScalaObject|Singleton|Seq|Iterable|List|" +
+        "Option|Array|Char|Byte|Short|Int|Long|Nothing"
+        
+        ).split("|")
+    );
+    
+    var importClasses = lang.arrayToMap(
+        ("").split("|")
+    );
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            new DocCommentHighlightRules().getStartRule("doc-start"),
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
+                token : "string.regexp",
+                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : "constant.language.boolean",
+                regex : "(?:true|false)\\b"
+            }, {
+                token : function(value) {
+                    if (value == "this")
+                        return "variable.language";
+                    else if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (langClasses.hasOwnProperty(value))
+                        return "support.function";
+                    else if (importClasses.hasOwnProperty(value))
+                        return "support.function";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else
+                        return "identifier";
+                },
+                // TODO: Unicode escape sequences
+                // TODO: Unicode identifiers
+                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+            }, {
+                token : "keyword.operator",
+                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+            }, {
+                token : "paren.lparen",
+                regex : "[[({]"
+            }, {
+                token : "paren.rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ]
+    };
+    
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ new DocCommentHighlightRules().getEndRule("start") ]);
+};
+
+oop.inherits(ScalaHighlightRules, TextHighlightRules);
+
+exports.ScalaHighlightRules = ScalaHighlightRules;
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-scss-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-scss-uncompressed.js
new file mode 100755
index 00000000000..9639f0d4d2a
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-scss-uncompressed.js
@@ -0,0 +1,688 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/scss', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/scss_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var ScssHighlightRules = require("./scss_highlight_rules").ScssHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new ScssHighlightRules().getRules(), "i");
+    this.$outdent = new MatchingBraceOutdent();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+    
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        // ignore braces in comments
+        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+
+        var match = line.match(/^.*\{\s*$/);
+        if (match) {
+            indent += tab;
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/scss_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var ScssHighlightRules = function() {
+    
+    var properties = lang.arrayToMap( (function () {
+
+        var browserPrefix = ("-webkit-|-moz-|-o-|-ms-|-svg-|-pie-|-khtml-").split("|");
+        
+        var prefixProperties = ("appearance|background-clip|background-inline-policy|background-origin|" + 
+             "background-size|binding|border-bottom-colors|border-left-colors|" + 
+             "border-right-colors|border-top-colors|border-end|border-end-color|" + 
+             "border-end-style|border-end-width|border-image|border-start|" + 
+             "border-start-color|border-start-style|border-start-width|box-align|" + 
+             "box-direction|box-flex|box-flexgroup|box-ordinal-group|box-orient|" + 
+             "box-pack|box-sizing|column-count|column-gap|column-width|column-rule|" + 
+             "column-rule-width|column-rule-style|column-rule-color|float-edge|" + 
+             "font-feature-settings|font-language-override|force-broken-image-icon|" + 
+             "image-region|margin-end|margin-start|opacity|outline|outline-color|" + 
+             "outline-offset|outline-radius|outline-radius-bottomleft|" + 
+             "outline-radius-bottomright|outline-radius-topleft|outline-radius-topright|" + 
+             "outline-style|outline-width|padding-end|padding-start|stack-sizing|" + 
+             "tab-size|text-blink|text-decoration-color|text-decoration-line|" + 
+             "text-decoration-style|transform|transform-origin|transition|" + 
+             "transition-delay|transition-duration|transition-property|" + 
+             "transition-timing-function|user-focus|user-input|user-modify|user-select|" +
+             "window-shadow|border-radius").split("|");
+        
+        var properties = ("azimuth|background-attachment|background-color|background-image|" +
+            "background-position|background-repeat|background|border-bottom-color|" +
+            "border-bottom-style|border-bottom-width|border-bottom|border-collapse|" +
+            "border-color|border-left-color|border-left-style|border-left-width|" +
+            "border-left|border-right-color|border-right-style|border-right-width|" +
+            "border-right|border-spacing|border-style|border-top-color|" +
+            "border-top-style|border-top-width|border-top|border-width|border|" +
+            "bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|" +
+            "counter-reset|cue-after|cue-before|cue|cursor|direction|display|" +
+            "elevation|empty-cells|float|font-family|font-size-adjust|font-size|" +
+            "font-stretch|font-style|font-variant|font-weight|font|height|left|" +
+            "letter-spacing|line-height|list-style-image|list-style-position|" +
+            "list-style-type|list-style|margin-bottom|margin-left|margin-right|" +
+            "margin-top|marker-offset|margin|marks|max-height|max-width|min-height|" +
+            "min-width|opacity|orphans|outline-color|" +
+            "outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|" +
+            "padding-left|padding-right|padding-top|padding|page-break-after|" +
+            "page-break-before|page-break-inside|page|pause-after|pause-before|" +
+            "pause|pitch-range|pitch|play-during|position|quotes|richness|right|" +
+            "size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|" +
+            "stress|table-layout|text-align|text-decoration|text-indent|" +
+            "text-shadow|text-transform|top|unicode-bidi|vertical-align|" +
+            "visibility|voice-family|volume|white-space|widows|width|word-spacing|" +
+            "z-index").split("|");
+          
+        //The return array     
+        var ret = [];
+        
+        //All prefixProperties will get the browserPrefix in
+        //the begning by join the prefixProperties array with the value of browserPrefix
+        for (var i=0, ln=browserPrefix.length; i<ln; i++) {
+            Array.prototype.push.apply(
+                ret,
+                (( browserPrefix[i] + prefixProperties.join("|" + browserPrefix[i]) ).split("|"))
+            );
+        }
+        
+        //Add also prefixProperties and properties without any browser prefix
+        Array.prototype.push.apply(ret, prefixProperties);
+        Array.prototype.push.apply(ret, properties);
+        
+        return ret;
+        
+    })() );
+    
+
+
+    var functions = lang.arrayToMap(
+        ("hsl|hsla|rgb|rgba|url|attr|counter|counters|abs|adjust_color|adjust_hue|" +
+         "alpha|join|blue|ceil|change_color|comparable|complement|darken|desaturate|" + 
+         "floor|grayscale|green|hue|if|invert|join|length|lighten|lightness|mix|" + 
+         "nth|opacify|opacity|percentage|quote|red|round|saturate|saturation|" +
+         "scale_color|transparentize|type_of|unit|unitless|unqoute").split("|")
+    );
+
+    var constants = lang.arrayToMap(
+        ("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|" +
+        "block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|" +
+        "char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|" +
+        "decimal-leading-zero|decimal|default|disabled|disc|" +
+        "distribute-all-lines|distribute-letter|distribute-space|" +
+        "distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|" +
+        "hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|" +
+        "ideograph-alpha|ideograph-numeric|ideograph-parenthesis|" +
+        "ideograph-space|inactive|inherit|inline-block|inline|inset|inside|" +
+        "inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|" +
+        "keep-all|left|lighter|line-edge|line-through|line|list-item|loose|" +
+        "lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|" +
+        "medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|" +
+        "nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|" +
+        "overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|" +
+        "ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|" +
+        "solid|square|static|strict|super|sw-resize|table-footer-group|" +
+        "table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|" +
+        "transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|" +
+        "vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|" +
+        "zero").split("|")
+    );
+
+    var colors = lang.arrayToMap(
+        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
+        "purple|red|silver|teal|white|yellow").split("|")
+    );
+    
+    var keywords = lang.arrayToMap(
+        ("@mixin|@extend|@include|@import|@media|@debug|@warn|@if|@for|@each|@while|@else|@font-face|@-webkit-keyframes|if|and|!default|module|def|end|declare").split("|")
+    )
+    
+    var tags = lang.arrayToMap(
+        ("a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdo|" + 
+         "big|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|" + 
+         "command|datalist|dd|del|details|dfn|dir|div|dl|dt|em|embed|fieldset|" + 
+         "figcaption|figure|font|footer|form|frame|frameset|h1|h2|h3|h4|h5|h6|head|" + 
+         "header|hgroup|hr|html|i|iframe|img|input|ins|keygen|kbd|label|legend|li|" + 
+         "link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|" + 
+         "option|output|p|param|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|" + 
+         "small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|" + 
+         "textarea|tfoot|th|thead|time|title|tr|tt|u|ul|var|video|wbr|xmp").split("|")
+    );
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
+
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : '["].*\\\\$',
+                next : "qqstring"
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : "['].*\\\\$",
+                next : "qstring"
+            }, {
+                token : "constant.numeric",
+                regex : numRe + "(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"
+            }, {
+                token : "constant.numeric", // hex6 color
+                regex : "#[a-f0-9]{6}"
+            }, {
+                token : "constant.numeric", // hex3 color
+                regex : "#[a-f0-9]{3}"
+            }, {
+                token : "constant.numeric",
+                regex : numRe
+            }, {
+                token : function(value) {
+                    if (properties.hasOwnProperty(value.toLowerCase()))
+                        return "support.type";
+                    if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (constants.hasOwnProperty(value))
+                        return "constant.language";
+                    else if (functions.hasOwnProperty(value))
+                        return "support.function";
+                    else if (colors.hasOwnProperty(value.toLowerCase()))
+                        return "support.constant.color";
+                    else if (tags.hasOwnProperty(value.toLowerCase()))
+                        return "variable.language";
+                    else
+                        return "text";
+                },
+                regex : "\\-?[@a-z_][@a-z0-9_\\-]*"
+            }, {
+                token : "variable",
+                regex : "[a-z_\\-$][a-z0-9_\\-$]*\\b"
+            }, {
+                token: "variable.language",
+                regex: "#[a-z0-9-_]+"
+            }, {
+                token: "variable.language",
+                regex: "\\.[a-z0-9-_]+"
+            }, {
+                token: "variable.language",
+                regex: ":[a-z0-9-_]+"
+            }, {
+                token: "constant",
+                regex: "[a-z0-9-_]+"
+            }, {
+                token : "keyword.operator",
+                regex : "<|>|<=|>=|==|!=|-|%|#|\\+|\\$|\\+|\\*"
+            }, {
+                token : "paren.lparen",
+                regex : "[[({]"
+            }, {
+                token : "paren.rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "qqstring" : [
+            {
+                token : "string",
+                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ],
+        "qstring" : [
+            {
+                token : "string",
+                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ]
+    };
+};
+
+oop.inherits(ScssHighlightRules, TextHighlightRules);
+
+exports.ScssHighlightRules = ScssHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-sql-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-sql-uncompressed.js
new file mode 100755
index 00000000000..61195988d98
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-sql-uncompressed.js
@@ -0,0 +1,169 @@
+/* ***** BEGIN LICENSE BLOCK *****
+* The Original Code is Ajax.org Code Editor (ACE).
+*
+* Contributor(s):
+*      Jonathan Camile <jonathan.camile AT gmail DOT com>
+*
+* Alternatively, the contents of this file may be used under the terms of
+* either the GNU General Public License Version 2 or later (the "GPL"), or
+* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+* in which case the provisions of the GPL or the LGPL are applicable instead
+* of those above. If you wish to allow use of your version of this file only
+* under the terms of either the GPL or the LGPL, and not to allow others to
+* use your version of this file under the terms of the MPL, indicate your
+* decision by deleting the provisions above and replace them with the notice
+* and other provisions required by the GPL or the LGPL. If you do not delete
+* the provisions above, a recipient may use your version of this file under
+* the terms of any one of the MPL, the GPL or the LGPL.
+*
+* ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/sql', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/sql_highlight_rules', 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var SqlHighlightRules = require("./sql_highlight_rules").SqlHighlightRules;
+var Range = require("../range").Range;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new SqlHighlightRules().getRules());
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var outentedRows = [];
+        var re = /^(\s*)--/;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i);
+                var m = line.match(re);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, "--");
+        }
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * Contributor(s):
+ *      Jonathan Camile <jonathan.camile AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/sql_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var SqlHighlightRules = function() {
+
+    var keywords = lang.arrayToMap(
+        ("select|from|where|and|or|group|by|order|limit|offset|having|as|case|" +
+        "when|else|end|type|left|right|join|on|outer|desc|asc").split("|")
+    );
+
+    var builtinConstants = lang.arrayToMap(
+        ("true|false|null").split("|")
+    );
+
+    var builtinFunctions = lang.arrayToMap(
+        ("count|min|max|avg|sum|rank|now|coalesce").split("|")
+    );
+
+    this.$rules = {
+        "start" : [ {
+            token : "comment",
+            regex : "--.*$"
+        }, {
+            token : "string",           // " string
+            regex : '".*"'
+        }, {
+            token : "string",           // ' string
+            regex : "'.*'"
+        }, {
+            token : "constant.numeric", // float
+            regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+        }, {
+            token : function(value) {
+                value = value.toLowerCase();
+                if (keywords.hasOwnProperty(value))
+                    return "keyword";
+                else if (builtinConstants.hasOwnProperty(value))
+                    return "constant.language";
+                else if (builtinFunctions.hasOwnProperty(value))
+                    return "support.function";
+                else
+                    return "identifier";
+            },
+            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+        }, {
+            token : "keyword.operator",
+            regex : "\\+|\\-|\\/|\\/\\/|%|<@>|@>|<@|&|\\^|~|<|>|<=|=>|==|!=|<>|="
+        }, {
+            token : "lparen.paren",
+            regex : "[\\(]"
+        }, {
+            token : "paren.rparen",
+            regex : "[\\)]"
+        }, {
+            token : "text",
+            regex : "\\s+"
+        } ]
+    };
+};
+
+oop.inherits(SqlHighlightRules, TextHighlightRules);
+
+exports.SqlHighlightRules = SqlHighlightRules;
+});
+
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-svg-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-svg-uncompressed.js
new file mode 100755
index 00000000000..8d3bb3b873a
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-svg-uncompressed.js
@@ -0,0 +1,2197 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/svg', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml', 'ace/mode/javascript', 'ace/tokenizer', 'ace/mode/svg_highlight_rules', 'ace/mode/folding/mixed', 'ace/mode/folding/xml', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var XmlMode = require("./xml").Mode;
+var JavaScriptMode = require("./javascript").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var SvgHighlightRules = require("./svg_highlight_rules").SvgHighlightRules;
+var MixedFoldMode = require("./folding/mixed").FoldMode;
+var XmlFoldMode = require("./folding/xml").FoldMode;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    XmlMode.call(this);
+    
+    this.highlighter = new SvgHighlightRules();
+    this.$tokenizer = new Tokenizer(this.highlighter.getRules());
+    
+    this.$embeds = this.highlighter.getEmbeds();
+    this.createModeDelegates({
+        "js-": JavaScriptMode
+    });
+    
+    this.foldingRules = new MixedFoldMode(new XmlFoldMode({}), {
+        "js-": new CStyleFoldMode()
+    });
+};
+
+oop.inherits(Mode, XmlMode);
+
+(function() {
+
+    this.getNextLineIndent = function(state, line, tab) {
+        return this.$getIndent(line);
+    };
+    
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xml_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/xml'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
+var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
+var XmlFoldMode = require("./folding/xml").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new XmlHighlightRules().getRules());
+    this.$behaviour = new XmlBehaviour();
+    this.foldingRules = new XmlFoldMode();
+};
+
+oop.inherits(Mode, TextMode);
+
+(function() {
+    
+    this.getNextLineIndent = function(state, line, tab) {
+        return this.$getIndent(line);
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/xml_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var xmlUtil = require("./xml_util");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var XmlHighlightRules = function() {
+
+    // regexp must not have capturing parentheses
+    // regexps are ordered -> the first match is used
+    this.$rules = {
+        start : [{
+            token : "text",
+            regex : "<\\!\\[CDATA\\[",
+            next : "cdata"
+        }, {
+            token : "xml_pe",
+            regex : "<\\?.*?\\?>"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : "<\\!--",
+            next : "comment"
+        }, {
+            token : "meta.tag", // opening tag
+            regex : "<\\/?",
+            next : "tag"
+        }, {
+            token : "text",
+            regex : "\\s+"
+        }, {
+            token : "text",
+            regex : "[^<]+"
+        }],
+        
+        cdata : [{
+            token : "text",
+            regex : "\\]\\]>",
+            next : "start"
+        }, {
+            token : "text",
+            regex : "\\s+"
+        }, {
+            token : "text",
+            regex : "(?:[^\\]]|\\](?!\\]>))+"
+        }],
+
+        comment : [{
+            token : "comment",
+            regex : ".*?-->",
+            next : "start"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : ".+"
+        }]
+    };
+    
+    xmlUtil.tag(this.$rules, "tag", "start");
+};
+
+oop.inherits(XmlHighlightRules, TextHighlightRules);
+
+exports.XmlHighlightRules = XmlHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
+"use strict";
+
+var lang = require("../lib/lang");
+
+var formTags = lang.arrayToMap(
+    ("button|form|input|label|select|textarea").split("|")
+);
+
+var tableTags = lang.arrayToMap(
+    ("table|tbody|td|tfoot|th|tr").split("|")
+);
+
+function string(state) {
+    return [{
+        token : "string",
+        regex : '".*?"'
+    }, {
+        token : "string", // multi line string start
+        merge : true,
+        regex : '["].*',
+        next : state + "-qqstring"
+    }, {
+        token : "string",
+        regex : "'.*?'"
+    }, {
+        token : "string", // multi line string start
+        merge : true,
+        regex : "['].*",
+        next : state + "-qstring"
+    }];
+}
+
+function multiLineString(quote, state) {
+    return [{
+        token : "string",
+        merge : true,
+        regex : ".*?" + quote,
+        next : state
+    }, {
+        token : "string",
+        merge : true,
+        regex : '.+'
+    }];
+}
+
+exports.tag = function(states, name, nextState) {
+    states[name] = [{
+        token : "text",
+        regex : "\\s+"
+    }, {
+        //token : "meta.tag",
+        
+    token : function(value) {
+            if ( value==='a' ) {
+                return "meta.tag.anchor";
+            }
+            else if ( value==='img' ) {
+                return "meta.tag.image";
+            }
+            else if ( value==='script' ) {
+                return "meta.tag.script";
+            }
+            else if ( value==='style' ) {
+                return "meta.tag.style";
+            }
+            else if (formTags.hasOwnProperty(value.toLowerCase())) {
+                return "meta.tag.form";
+            }
+            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
+                return "meta.tag.table";
+            }
+            else {
+                return "meta.tag";
+            }
+        },        
+        merge : true,
+        regex : "[-_a-zA-Z0-9:!]+",
+        next : name + "embed-attribute-list" 
+    }, {
+        token: "empty",
+        regex: "",
+        next : name + "embed-attribute-list"
+    }];
+
+    states[name + "-qstring"] = multiLineString("'", name + "embed-attribute-list");
+    states[name + "-qqstring"] = multiLineString("\"", name + "embed-attribute-list");
+    
+    states[name + "embed-attribute-list"] = [{
+        token : "meta.tag",
+        merge : true,
+        regex : "\/?>",
+        next : nextState
+    }, {
+        token : "keyword.operator",
+        regex : "="
+    }, {
+        token : "entity.other.attribute-name",
+        regex : "[-_a-zA-Z0-9:]+"
+    }, {
+        token : "constant.numeric", // float
+        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+    }, {
+        token : "text",
+        regex : "\\s+"
+    }].concat(string(name));
+};
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require("../behaviour").Behaviour;
+var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
+
+var XmlBehaviour = function () {
+    
+    this.inherit(CstyleBehaviour, ["string_dquotes"]); // Get string behaviour
+    
+    this.add("brackets", "insertion", function (state, action, editor, session, text) {
+        if (text == '<') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return false;
+            } else {
+                return {
+                    text: '<>',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '>') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '>') { // need some kind of matching check here
+                return {
+                    text: '',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChars = line.substring(cursor.column, cursor.column + 2);
+            if (rightChars == '</') {
+                var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
+                var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+    
+}
+oop.inherits(XmlBehaviour, Behaviour);
+
+exports.XmlBehaviour = XmlBehaviour;
+});/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require('../behaviour').Behaviour;
+
+var CstyleBehaviour = function () {
+
+    this.add("braces", "insertion", function (state, action, editor, session, text) {
+        if (text == '{') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '}') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return null;
+
+                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
+                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+
+    this.add("braces", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '{') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.end.column, range.end.column + 1);
+            if (rightChar == '}') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("parens", "insertion", function (state, action, editor, session, text) {
+        if (text == '(') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '()',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == ')') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == ')') {
+                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("parens", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '(') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == ')') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '"' + selected + '"',
+                    selection: false
+                }
+            } else {
+                var cursor = editor.getCursorPosition();
+                var line = session.doc.getLine(cursor.row);
+                var leftChar = line.substring(cursor.column-1, cursor.column);
+
+                // We're escaped.
+                if (leftChar == '\\') {
+                    return null;
+                }
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf('"');
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
+                    return {
+                        text: '""',
+                        selection: [1,1]
+                    }
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == '"') {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '"') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == '"') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+}
+oop.inherits(CstyleBehaviour, Behaviour);
+
+exports.CstyleBehaviour = CstyleBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/range', 'ace/mode/folding/fold_mode', 'ace/token_iterator'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var lang = require("../../lib/lang");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+var TokenIterator = require("../../token_iterator").TokenIterator;
+
+var FoldMode = exports.FoldMode = function(voidElements) {
+    BaseFoldMode.call(this);
+    this.voidElements = voidElements || {};
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var tag = this._getFirstTagInLine(session, row);
+
+        if (tag.closing)
+            return foldStyle == "markbeginend" ? "end" : "";
+
+        if (!tag.tagName || this.voidElements[tag.tagName.toLowerCase()])
+            return "";
+
+        if (tag.selfClosing)
+            return "";
+
+        if (tag.value.indexOf("/" + tag.tagName) !== -1)
+            return "";
+
+        return "start";
+    };
+    
+    this._getFirstTagInLine = function(session, row) {
+        var tokens = session.getTokens(row, row)[0].tokens;
+        var value = "";
+        for (var i = 0; i < tokens.length; i++) {
+            var token = tokens[i];
+            if (token.type.indexOf("meta.tag") === 0)
+                value += token.value;
+            else
+                value += lang.stringRepeat(" ", token.value.length);
+        }
+        
+        return this._parseTag(value);
+    };
+
+    this.tagRe = /^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/;
+    this._parseTag = function(tag) {
+        
+        var match = this.tagRe.exec(tag);
+        var column = this.tagRe.lastIndex || 0;
+        this.tagRe.lastIndex = 0;
+
+        return {
+            value: tag,
+            match: match ? match[2] : "",
+            closing: match ? !!match[3] : false,
+            selfClosing: match ? !!match[5] || match[2] == "/>" : false,
+            tagName: match ? match[4] : "",
+            column: match[1] ? column + match[1].length : column
+        };
+    };
+    
+    /**
+     * reads a full tag and places the iterator after the tag
+     */
+    this._readTagForward = function(iterator) {
+        var token = iterator.getCurrentToken();
+        if (!token)
+            return null;
+            
+        var value = "";
+        var start;
+        
+        do {
+            if (token.type.indexOf("meta.tag") === 0) {
+                if (!start) {
+                    var start = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn()
+                    };
+                }
+                value += token.value;
+                if (value.indexOf(">") !== -1) {
+                    var tag = this._parseTag(value);
+                    tag.start = start;
+                    tag.end = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn() + token.value.length
+                    };
+                    iterator.stepForward();
+                    return tag;
+                }
+            }
+        } while(token = iterator.stepForward());
+        
+        return null;
+    };
+    
+    this._readTagBackward = function(iterator) {
+        var token = iterator.getCurrentToken();
+        if (!token)
+            return null;
+            
+        var value = "";
+        var end;
+
+        do {
+            if (token.type.indexOf("meta.tag") === 0) {
+                if (!end) {
+                    end = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn() + token.value.length
+                    };
+                }
+                value = token.value + value;
+                if (value.indexOf("<") !== -1) {
+                    var tag = this._parseTag(value);
+                    tag.end = end;
+                    tag.start = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn()
+                    };
+                    iterator.stepBackward();
+                    return tag;
+                }
+            }
+        } while(token = iterator.stepBackward());
+        
+        return null;
+    };
+    
+    this._pop = function(stack, tag) {
+        while (stack.length) {
+            
+            var top = stack[stack.length-1];
+            if (!tag || top.tagName == tag.tagName) {
+                return stack.pop();
+            }
+            else if (this.voidElements[tag.tagName]) {
+                return;
+            }
+            else if (this.voidElements[top.tagName]) {
+                stack.pop();
+                continue;
+            } else {
+                return null;
+            }
+        }
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var firstTag = this._getFirstTagInLine(session, row);
+        
+        if (!firstTag.match)
+            return null;
+        
+        var isBackward = firstTag.closing || firstTag.selfClosing;
+        var stack = [];
+        var tag;
+        
+        if (!isBackward) {
+            var iterator = new TokenIterator(session, row, firstTag.column);
+            var start = {
+                row: row,
+                column: firstTag.column + firstTag.tagName.length + 2
+            };
+            while (tag = this._readTagForward(iterator)) {
+                if (tag.selfClosing) {
+                    if (!stack.length) {
+                        tag.start.column += tag.tagName.length + 2;
+                        tag.end.column -= 2;
+                        return Range.fromPoints(tag.start, tag.end);
+                    } else
+                        continue;
+                }
+                
+                if (tag.closing) {
+                    this._pop(stack, tag);
+                    if (stack.length == 0)
+                        return Range.fromPoints(start, tag.start);
+                }
+                else {
+                    stack.push(tag)
+                }
+            }
+        }
+        else {
+            var iterator = new TokenIterator(session, row, firstTag.column + firstTag.match.length);
+            var end = {
+                row: row,
+                column: firstTag.column
+            };
+            
+            while (tag = this._readTagBackward(iterator)) {
+                if (tag.selfClosing) {
+                    if (!stack.length) {
+                        tag.start.column += tag.tagName.length + 2;
+                        tag.end.column -= 2;
+                        return Range.fromPoints(tag.start, tag.end);
+                    } else
+                        continue;
+                }
+                
+                if (!tag.closing) {
+                    this._pop(stack, tag);
+                    if (stack.length == 0) {
+                        tag.start.column += tag.tagName.length + 2;
+                        return Range.fromPoints(tag.start, end);
+                    }
+                }
+                else {
+                    stack.push(tag)
+                }
+            }
+        }
+        
+    };
+
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var Range = require("../range").Range;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+
+    this.toggleCommentLines = function(state, doc, startRow, endRow) {
+        var outdent = true;
+        var re = /^(\s*)\/\//;
+
+        for (var i=startRow; i<= endRow; i++) {
+            if (!re.test(doc.getLine(i))) {
+                outdent = false;
+                break;
+            }
+        }
+
+        if (outdent) {
+            var deleteRange = new Range(0, 0, 0, 0);
+            for (var i=startRow; i<= endRow; i++)
+            {
+                var line = doc.getLine(i);
+                var m = line.match(re);
+                deleteRange.start.row = i;
+                deleteRange.end.row = i;
+                deleteRange.end.column = m[0].length;
+                doc.replace(deleteRange, m[1]);
+            }
+        }
+        else {
+            doc.indentRows(startRow, endRow, "//");
+        }
+    };
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+        var endState = tokenizedLine.state;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+        
+        if (state == "start" || state == "regex_allowed") {
+            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        } else if (state == "doc-start") {
+            if (endState == "start" || state == "regex_allowed") {
+                return "";
+            }
+            var match = line.match(/^\s*(\/?)\*/);
+            if (match) {
+                if (match[1]) {
+                    indent += " ";
+                }
+                indent += "* ";
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+    
+    this.createWorker = function(session) {
+        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
+        worker.attachToDocument(session.getDocument());
+            
+        worker.on("jslint", function(results) {
+            var errors = [];
+            for (var i=0; i<results.data.length; i++) {
+                var error = results.data[i];
+                if (error)
+                    errors.push({
+                        row: error.line-1,
+                        column: error.character-1,
+                        text: error.reason,
+                        type: "warning",
+                        lint: error
+                    });
+            }
+            session.setAnnotations(errors);
+        });
+        
+        worker.on("narcissus", function(e) {
+            session.setAnnotations([e.data]);
+        });
+        
+        worker.on("terminate", function() {
+            session.clearAnnotations();
+        });
+        
+        return worker;
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var unicode = require("../unicode");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var JavaScriptHighlightRules = function() {
+
+    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
+    var globals = lang.arrayToMap(
+      // Constructors
+        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
+      // E4X
+         "Namespace|QName|XML|XMLList|" +
+         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
+         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
+      // Errors
+        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
+        "SyntaxError|TypeError|URIError|" +
+      //  Non-constructor functions
+        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
+        "isNaN|parseFloat|parseInt|" +
+      // Other
+        "JSON|Math|" +
+      // Pseudo
+        "this|arguments|prototype|window|document"
+      ).split("|")
+    );
+
+    var keywords = lang.arrayToMap(
+        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
+        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
+        "const|yield|import|get|set").split("|")
+    );
+
+    // keywords which can be followed by regular expressions
+    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
+
+    var deprecated = lang.arrayToMap(
+        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
+    );
+
+    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
+
+    var buildinConstants = lang.arrayToMap(
+        ("null|Infinity|NaN|undefined").split("|")
+    );
+
+    var futureReserved = lang.arrayToMap(
+        ("class|enum|extends|super|export|implements|private|" +
+        "public|interface|package|protected|static").split("|")
+    );
+
+    // TODO: Unicode escape sequences
+    var identifierRe = "[" + unicode.packages.L + "\\$_][" 
+        + unicode.packages.L
+        + unicode.packages.Mn + unicode.packages.Mc
+        + unicode.packages.Nd
+        + unicode.packages.Pc + "\\$_]*\\b";
+        
+    // regexp must not have capturing parentheses. Use (?:) instead.
+    // regexps are ordered -> the first match is used
+
+    this.$rules = {
+        "start" : [
+            {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            },
+            new DocCommentHighlightRules().getStartRule("doc-start"),
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment"
+            }, {
+                token : "string", // single line
+                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : '["].*\\\\$',
+                next : "qqstring"
+            }, {
+                token : "string", // single line
+                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+            }, {
+                token : "string", // multi line string start
+                merge : true,
+                regex : "['].*\\\\$",
+                next : "qstring"
+            }, {
+                token : "constant.numeric", // hex
+                regex : "0[xX][0-9a-fA-F]+\\b"
+            }, {
+                token : "constant.numeric", // float
+                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+            }, {
+                token : ["keyword.definition", "text", "entity.name.function"],
+                regex : "(function)(\\s+)(" + identifierRe + ")"
+            }, {
+                token : "constant.language.boolean",
+                regex : "(?:true|false)\\b"
+            }, {
+                token : "keyword",
+                regex : "(?:" + kwBeforeRe + ")\\b",
+                next : "regex_allowed"
+            }, {
+                token : function(value) {
+                    if (globals.hasOwnProperty(value))
+                        return "variable.language";
+                    else if (deprecated.hasOwnProperty(value))
+                        return "invalid.deprecated";
+                    else if (definitions.hasOwnProperty(value))
+                        return "keyword.definition";
+                    else if (keywords.hasOwnProperty(value))
+                        return "keyword";
+                    else if (buildinConstants.hasOwnProperty(value))
+                        return "constant.language";
+                    else if (futureReserved.hasOwnProperty(value))
+                        return "invalid.illegal";
+                    else if (value == "debugger")
+                        return "invalid.deprecated";
+                    else
+                        return "identifier";
+                },
+                regex : identifierRe
+            }, {
+                token : "keyword.operator",
+                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)",
+                next  : "regex_allowed"
+            }, {
+                token : "punctuation.operator",
+                regex : "\\?|\\:|\\,|\\;|\\.",
+                next  : "regex_allowed"
+            }, {
+                token : "paren.lparen",
+                regex : "[[({]",
+                next  : "regex_allowed"
+            }, {
+                token : "paren.rparen",
+                regex : "[\\])}]"
+            }, {
+                token : "keyword.operator",
+                regex : "\\/=?",
+                next  : "regex_allowed"
+            }, {
+                token: "comment",
+                regex: "^#!.*$" 
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }
+        ],
+        // regular expressions are only allowed after certain tokens. This
+        // makes sure we don't mix up regexps with the divison operator
+        "regex_allowed": [
+            {
+                token : "comment", // multi line comment
+                merge : true,
+                regex : "\\/\\*",
+                next : "comment_regex_allowed"
+            }, {
+                token : "comment",
+                regex : "\\/\\/.*$"
+            }, {
+                token: "string.regexp",
+                regex: "\\/",
+                next: "regex",
+                merge: true
+            }, {
+                token : "text",
+                regex : "\\s+"
+            }, {
+                // immediately return to the start mode without matching
+                // anything
+                token: "empty", 
+                regex: "",
+                next: "start"
+            }
+        ],
+        "regex": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
+                next: "regex"
+            }, {
+				// flag
+                token: "string.regexp", 
+                regex: "/\\w*",
+                next: "start",
+                merge: true 
+            }, {
+                token: "string.regexp",
+                regex: "[^\\\\/\\[]+",
+                next: "regex",
+                merge: true
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "\\[",
+                next: "regex_character_class",
+                merge: true
+            }, {
+                token: "empty", 
+                regex: "",
+                next: "start" 
+            }
+        ],
+        "regex_character_class": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
+                next: "regex_character_class"
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "]",
+                next: "regex",
+                merge: true
+            }, {
+                token: "string.regexp.charachterclass",
+                regex: "[^\\\\\\]]+",
+                next: "regex_character_class",
+                merge: true
+            }, {
+                token: "empty", 
+                regex: "",
+                next: "start" 
+            }
+        ],
+        "comment_regex_allowed" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                merge : true,
+                next : "regex_allowed"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "comment" : [
+            {
+                token : "comment", // closing comment
+                regex : ".*?\\*\\/",
+                merge : true,
+                next : "start"
+            }, {
+                token : "comment", // comment spanning whole line
+                merge : true,
+                regex : ".+"
+            }
+        ],
+        "qqstring" : [
+            {
+                token : "string",
+                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ],
+        "qstring" : [
+            {
+                token : "string",
+                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
+                next : "start"
+            }, {
+                token : "string",
+                merge : true,
+                regex : '.+'
+            }
+        ]
+    };
+    
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ new DocCommentHighlightRules().getEndRule("start") ]);
+};
+
+oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
+
+exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var DocCommentHighlightRules = function() {
+
+    this.$rules = {
+        "start" : [ {
+            token : "comment.doc.tag",
+            regex : "@[\\w\\d_]+" // TODO: fix email addresses
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "\\s+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "TODO"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "[^@\\*]+"
+        }, {
+            token : "comment.doc",
+            merge : true,
+            regex : "."
+        }]
+    };
+};
+
+oop.inherits(DocCommentHighlightRules, TextHighlightRules);
+
+(function() {
+
+    this.getStartRule = function(start) {
+        return {
+            token : "comment.doc", // doc comment
+            merge : true,
+            regex : "\\/\\*(?=\\*)",
+            next  : start
+        };
+    };
+    
+    this.getEndRule = function (start) {
+        return {
+            token : "comment.doc", // closing comment
+            merge : true,
+            regex : "\\*\\/",
+            next  : start
+        };
+    };
+
+}).call(DocCommentHighlightRules.prototype);
+
+exports.DocCommentHighlightRules = DocCommentHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/worker/worker_client', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var EventEmitter = require("../lib/event_emitter").EventEmitter;
+
+var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
+
+    this.changeListener = this.changeListener.bind(this);
+
+    if (module.packaged) {
+        var base = this.$guessBasePath();
+        this.$worker = new Worker(base + packagedJs);
+    }
+    else {
+        var workerUrl = this.$normalizePath(require.nameToUrl("ace/worker/worker", null, "_"));
+        this.$worker = new Worker(workerUrl);
+
+        var tlns = {};
+        for (var i=0; i<topLevelNamespaces.length; i++) {
+            var ns = topLevelNamespaces[i];
+            var path = this.$normalizePath(require.nameToUrl(ns, null, "_").replace(/.js$/, ""));
+
+            tlns[ns] = path;
+        }
+    }
+
+    this.$worker.postMessage({
+        init : true,
+        tlns: tlns,
+        module: mod,
+        classname: classname
+    });
+
+    this.callbackId = 1;
+    this.callbacks = {};
+
+    var _self = this;
+    this.$worker.onerror = function(e) {
+        window.console && console.log && console.log(e);
+        throw e;
+    };
+    this.$worker.onmessage = function(e) {
+        var msg = e.data;
+        switch(msg.type) {
+            case "log":
+                window.console && console.log && console.log(msg.data);
+                break;
+
+            case "event":
+                _self._emit(msg.name, {data: msg.data});
+                break;
+
+            case "call":
+                var callback = _self.callbacks[msg.id];
+                if (callback) {
+                    callback(msg.data);
+                    delete _self.callbacks[msg.id];
+                }
+                break;
+        }
+    };
+};
+
+(function(){
+
+    oop.implement(this, EventEmitter);
+
+    this.$normalizePath = function(path) {
+        path = path.replace(/^[a-z]+:\/\/[^\/]+\//, ""); // Remove domain name and rebuild it
+        path = location.protocol + "//" + location.host
+            // paths starting with a slash are relative to the root (host)
+            + (path.charAt(0) == "/" ? "" : location.pathname.replace(/\/[^\/]*$/, ""))
+            + "/" + path.replace(/^[\/]+/, "");
+        return path;
+    };
+
+    this.$guessBasePath = function() {
+        if (require.aceBaseUrl)
+            return require.aceBaseUrl;
+
+        var scripts = document.getElementsByTagName("script");
+        for (var i=0; i<scripts.length; i++) {
+            var script = scripts[i];
+
+            var base = script.getAttribute("data-ace-base");
+            if (base)
+                return base.replace(/\/*$/, "/");
+
+            var src = script.src || script.getAttribute("src");
+            if (!src) {
+                continue;
+            }
+            var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);
+            if (m)
+                return m[1] || m[2];
+        }
+        return "";
+    };
+
+    this.terminate = function() {
+        this._emit("terminate", {});
+        this.$worker.terminate();
+        this.$worker = null;
+        this.$doc.removeEventListener("change", this.changeListener);
+        this.$doc = null;
+    };
+
+    this.send = function(cmd, args) {
+        this.$worker.postMessage({command: cmd, args: args});
+    };
+
+    this.call = function(cmd, args, callback) {
+        if (callback) {
+            var id = this.callbackId++;
+            this.callbacks[id] = callback;
+            args.push(id);
+        }
+        this.send(cmd, args);
+    };
+
+    this.emit = function(event, data) {
+        try {
+            // firefox refuses to clone objects which have function properties
+            // TODO: cleanup event
+            this.$worker.postMessage({event: event, data: {data: data.data}});
+        }
+        catch(ex) {}
+    };
+
+    this.attachToDocument = function(doc) {
+        if(this.$doc)
+            this.terminate();
+
+        this.$doc = doc;
+        this.call("setValue", [doc.getValue()]);
+        doc.on("change", this.changeListener);
+    };
+
+    this.changeListener = function(e) {
+        e.range = {
+            start: e.data.range.start,
+            end: e.data.range.end
+        };
+        this.emit("change", e);
+    };
+
+}).call(WorkerClient.prototype);
+
+exports.WorkerClient = WorkerClient;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+
+            var range = session.getCommentFoldRange(row, i + match[0].length);
+            range.end.column -= 2;
+            return range;
+        }
+
+        if (foldStyle !== "markbeginend")
+            return;
+            
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[2]) {
+                var range = session.getCommentFoldRange(row, i);
+                range.end.column -= 2;
+                return range;
+            }
+
+            var end = {row: row, column: i};
+            var start = session.$findOpeningBracket(match[1], end);
+            
+            if (!start)
+                return;
+
+            start.column++;
+            end.column--;
+
+            return  Range.fromPoints(start, end);
+        }
+    };
+    
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/svg_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/javascript_highlight_rules', 'ace/mode/xml_highlight_rules', 'ace/mode/xml_util'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
+var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
+var xmlUtil = require("./xml_util");
+
+var SvgHighlightRules = function() {
+    XmlHighlightRules.call(this);
+
+    this.$rules.start.splice(3, 0, {
+        token : "meta.tag",
+        regex : "<(?=\s*script)",
+        next : "script"
+    });
+    
+    xmlUtil.tag(this.$rules, "script", "js-start");
+    
+    this.embedRules(JavaScriptHighlightRules, "js-", [{
+        token: "comment",
+        regex: "\\/\\/.*(?=<\\/script>)",
+        next: "tag"
+    }, {
+        token: "meta.tag",
+        regex: "<\\/(?=script)",
+        next: "tag"
+    }]);
+};
+
+oop.inherits(SvgHighlightRules, XmlHighlightRules);
+
+exports.SvgHighlightRules = SvgHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/mixed', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function(defaultMode, subModes) {
+    this.defaultMode = defaultMode;
+    this.subModes = subModes;
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+
+    this.$getMode = function(state) {
+        for (var key in this.subModes) {
+            if (state.indexOf(key) === 0)
+                return this.subModes[key];
+        }
+        return null;
+    };
+    
+    this.$tryMode = function(state, session, foldStyle, row) {
+        var mode = this.$getMode(state);
+        return (mode ? mode.getFoldWidget(session, foldStyle, row) : "");
+    };
+
+    this.getFoldWidget = function(session, foldStyle, row) {
+        return (
+            this.$tryMode(session.getState(row-1), session, foldStyle, row) ||
+            this.$tryMode(session.getState(row), session, foldStyle, row) ||
+            this.defaultMode.getFoldWidget(session, foldStyle, row)
+        );
+    };
+
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var mode = this.$getMode(session.getState(row-1));
+        
+        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
+            mode = this.$getMode(session.getState(row));
+        
+        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
+            mode = this.defaultMode;
+        
+        return mode.getFoldWidgetRange(session, foldStyle, row);
+    };
+
+}).call(FoldMode.prototype);
+
+});;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-textile-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-textile-uncompressed.js
new file mode 100755
index 00000000000..8512479596e
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-textile-uncompressed.js
@@ -0,0 +1,264 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Kelley van Evert <kelley.vanevert@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/textile', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/textile_highlight_rules', 'ace/mode/matching_brace_outdent'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var TextileHighlightRules = require("./textile_highlight_rules").TextileHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new TextileHighlightRules().getRules());
+    this.$outdent = new MatchingBraceOutdent();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+    this.getNextLineIndent = function(state, line, tab) {
+        if (state == "intag")
+            return tab;
+        
+        return "";
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+    
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Kelley van Evert <kelley.vanevert@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/textile_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var TextileHighlightRules = function() {
+    this.$rules = {
+        "start" : [
+            {
+                token : function(value) {
+                    if (value.match(/^h\d$/))
+                        return "markup.heading." + value.charAt(1);
+                    else
+                        return "markup.heading";
+                },
+                regex : "h1|h2|h3|h4|h5|h6|bq|p|bc|pre",
+                next  : "blocktag"
+            },
+            {
+                token : "keyword",
+                regex : "[\\*]+|[#]+"
+            },
+            {
+                token : "text",
+                regex : ".+"
+            }
+        ],
+        "blocktag" : [
+            {
+                token : "keyword",
+                regex : "\\. ",
+                next  : "start"
+            },
+            {
+                token : "keyword",
+                regex : "\\(",
+                next  : "blocktagproperties"
+            }
+        ],
+        "blocktagproperties" : [
+            {
+                token : "keyword",
+                regex : "\\)",
+                next  : "blocktag"
+            },
+            {
+                token : "string",
+                regex : "[a-zA-Z0-9\\-_]+"
+            },
+            {
+                token : "keyword",
+                regex : "#"
+            }
+        ]
+    };
+};
+
+oop.inherits(TextileHighlightRules, TextHighlightRules);
+
+exports.TextileHighlightRules = TextileHighlightRules;
+
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        var match = line.match(/^(\s+)/);
+        if (match) {
+            return match[1];
+        }
+
+        return "";
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-xml-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-xml-uncompressed.js
new file mode 100755
index 00000000000..bc27c17f55b
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/mode-xml-uncompressed.js
@@ -0,0 +1,1011 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xml_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/xml'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
+var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
+var XmlFoldMode = require("./folding/xml").FoldMode;
+
+var Mode = function() {
+    this.$tokenizer = new Tokenizer(new XmlHighlightRules().getRules());
+    this.$behaviour = new XmlBehaviour();
+    this.foldingRules = new XmlFoldMode();
+};
+
+oop.inherits(Mode, TextMode);
+
+(function() {
+    
+    this.getNextLineIndent = function(state, line, tab) {
+        return this.$getIndent(line);
+    };
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/xml_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var xmlUtil = require("./xml_util");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var XmlHighlightRules = function() {
+
+    // regexp must not have capturing parentheses
+    // regexps are ordered -> the first match is used
+    this.$rules = {
+        start : [{
+            token : "text",
+            regex : "<\\!\\[CDATA\\[",
+            next : "cdata"
+        }, {
+            token : "xml_pe",
+            regex : "<\\?.*?\\?>"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : "<\\!--",
+            next : "comment"
+        }, {
+            token : "meta.tag", // opening tag
+            regex : "<\\/?",
+            next : "tag"
+        }, {
+            token : "text",
+            regex : "\\s+"
+        }, {
+            token : "text",
+            regex : "[^<]+"
+        }],
+        
+        cdata : [{
+            token : "text",
+            regex : "\\]\\]>",
+            next : "start"
+        }, {
+            token : "text",
+            regex : "\\s+"
+        }, {
+            token : "text",
+            regex : "(?:[^\\]]|\\](?!\\]>))+"
+        }],
+
+        comment : [{
+            token : "comment",
+            regex : ".*?-->",
+            next : "start"
+        }, {
+            token : "comment",
+            merge : true,
+            regex : ".+"
+        }]
+    };
+    
+    xmlUtil.tag(this.$rules, "tag", "start");
+};
+
+oop.inherits(XmlHighlightRules, TextHighlightRules);
+
+exports.XmlHighlightRules = XmlHighlightRules;
+});
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
+"use strict";
+
+var lang = require("../lib/lang");
+
+var formTags = lang.arrayToMap(
+    ("button|form|input|label|select|textarea").split("|")
+);
+
+var tableTags = lang.arrayToMap(
+    ("table|tbody|td|tfoot|th|tr").split("|")
+);
+
+function string(state) {
+    return [{
+        token : "string",
+        regex : '".*?"'
+    }, {
+        token : "string", // multi line string start
+        merge : true,
+        regex : '["].*',
+        next : state + "-qqstring"
+    }, {
+        token : "string",
+        regex : "'.*?'"
+    }, {
+        token : "string", // multi line string start
+        merge : true,
+        regex : "['].*",
+        next : state + "-qstring"
+    }];
+}
+
+function multiLineString(quote, state) {
+    return [{
+        token : "string",
+        merge : true,
+        regex : ".*?" + quote,
+        next : state
+    }, {
+        token : "string",
+        merge : true,
+        regex : '.+'
+    }];
+}
+
+exports.tag = function(states, name, nextState) {
+    states[name] = [{
+        token : "text",
+        regex : "\\s+"
+    }, {
+        //token : "meta.tag",
+        
+    token : function(value) {
+            if ( value==='a' ) {
+                return "meta.tag.anchor";
+            }
+            else if ( value==='img' ) {
+                return "meta.tag.image";
+            }
+            else if ( value==='script' ) {
+                return "meta.tag.script";
+            }
+            else if ( value==='style' ) {
+                return "meta.tag.style";
+            }
+            else if (formTags.hasOwnProperty(value.toLowerCase())) {
+                return "meta.tag.form";
+            }
+            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
+                return "meta.tag.table";
+            }
+            else {
+                return "meta.tag";
+            }
+        },        
+        merge : true,
+        regex : "[-_a-zA-Z0-9:!]+",
+        next : name + "embed-attribute-list" 
+    }, {
+        token: "empty",
+        regex: "",
+        next : name + "embed-attribute-list"
+    }];
+
+    states[name + "-qstring"] = multiLineString("'", name + "embed-attribute-list");
+    states[name + "-qqstring"] = multiLineString("\"", name + "embed-attribute-list");
+    
+    states[name + "embed-attribute-list"] = [{
+        token : "meta.tag",
+        merge : true,
+        regex : "\/?>",
+        next : nextState
+    }, {
+        token : "keyword.operator",
+        regex : "="
+    }, {
+        token : "entity.other.attribute-name",
+        regex : "[-_a-zA-Z0-9:]+"
+    }, {
+        token : "constant.numeric", // float
+        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+    }, {
+        token : "text",
+        regex : "\\s+"
+    }].concat(string(name));
+};
+
+});
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require("../behaviour").Behaviour;
+var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
+
+var XmlBehaviour = function () {
+    
+    this.inherit(CstyleBehaviour, ["string_dquotes"]); // Get string behaviour
+    
+    this.add("brackets", "insertion", function (state, action, editor, session, text) {
+        if (text == '<') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return false;
+            } else {
+                return {
+                    text: '<>',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '>') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '>') { // need some kind of matching check here
+                return {
+                    text: '',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChars = line.substring(cursor.column, cursor.column + 2);
+            if (rightChars == '</') {
+                var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
+                var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+    
+}
+oop.inherits(XmlBehaviour, Behaviour);
+
+exports.XmlBehaviour = XmlBehaviour;
+});/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require('../behaviour').Behaviour;
+
+var CstyleBehaviour = function () {
+
+    this.add("braces", "insertion", function (state, action, editor, session, text) {
+        if (text == '{') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == '}') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        } else if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == '}') {
+                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
+                if (!openBracePos)
+                     return null;
+
+                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
+                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
+
+                return {
+                    text: '\n' + indent + '\n' + next_indent,
+                    selection: [1, indent.length, 1, indent.length]
+                }
+            }
+        }
+    });
+
+    this.add("braces", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '{') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.end.column, range.end.column + 1);
+            if (rightChar == '}') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("parens", "insertion", function (state, action, editor, session, text) {
+        if (text == '(') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                }
+            } else {
+                return {
+                    text: '()',
+                    selection: [1, 1]
+                }
+            }
+        } else if (text == ')') {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar == ')') {
+                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
+                if (matching !== null) {
+                    return {
+                        text: '',
+                        selection: [1, 1]
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("parens", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '(') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == ')') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"') {
+            var selection = editor.getSelectionRange();
+            var selected = session.doc.getTextRange(selection);
+            if (selected !== "") {
+                return {
+                    text: '"' + selected + '"',
+                    selection: false
+                }
+            } else {
+                var cursor = editor.getCursorPosition();
+                var line = session.doc.getLine(cursor.row);
+                var leftChar = line.substring(cursor.column-1, cursor.column);
+
+                // We're escaped.
+                if (leftChar == '\\') {
+                    return null;
+                }
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf('"');
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
+                    return {
+                        text: '""',
+                        selection: [1,1]
+                    }
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == '"') {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected == '"') {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == '"') {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+}
+oop.inherits(CstyleBehaviour, Behaviour);
+
+exports.CstyleBehaviour = CstyleBehaviour;
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/range', 'ace/mode/folding/fold_mode', 'ace/token_iterator'], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var lang = require("../../lib/lang");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+var TokenIterator = require("../../token_iterator").TokenIterator;
+
+var FoldMode = exports.FoldMode = function(voidElements) {
+    BaseFoldMode.call(this);
+    this.voidElements = voidElements || {};
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var tag = this._getFirstTagInLine(session, row);
+
+        if (tag.closing)
+            return foldStyle == "markbeginend" ? "end" : "";
+
+        if (!tag.tagName || this.voidElements[tag.tagName.toLowerCase()])
+            return "";
+
+        if (tag.selfClosing)
+            return "";
+
+        if (tag.value.indexOf("/" + tag.tagName) !== -1)
+            return "";
+
+        return "start";
+    };
+    
+    this._getFirstTagInLine = function(session, row) {
+        var tokens = session.getTokens(row, row)[0].tokens;
+        var value = "";
+        for (var i = 0; i < tokens.length; i++) {
+            var token = tokens[i];
+            if (token.type.indexOf("meta.tag") === 0)
+                value += token.value;
+            else
+                value += lang.stringRepeat(" ", token.value.length);
+        }
+        
+        return this._parseTag(value);
+    };
+
+    this.tagRe = /^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/;
+    this._parseTag = function(tag) {
+        
+        var match = this.tagRe.exec(tag);
+        var column = this.tagRe.lastIndex || 0;
+        this.tagRe.lastIndex = 0;
+
+        return {
+            value: tag,
+            match: match ? match[2] : "",
+            closing: match ? !!match[3] : false,
+            selfClosing: match ? !!match[5] || match[2] == "/>" : false,
+            tagName: match ? match[4] : "",
+            column: match[1] ? column + match[1].length : column
+        };
+    };
+    
+    /**
+     * reads a full tag and places the iterator after the tag
+     */
+    this._readTagForward = function(iterator) {
+        var token = iterator.getCurrentToken();
+        if (!token)
+            return null;
+            
+        var value = "";
+        var start;
+        
+        do {
+            if (token.type.indexOf("meta.tag") === 0) {
+                if (!start) {
+                    var start = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn()
+                    };
+                }
+                value += token.value;
+                if (value.indexOf(">") !== -1) {
+                    var tag = this._parseTag(value);
+                    tag.start = start;
+                    tag.end = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn() + token.value.length
+                    };
+                    iterator.stepForward();
+                    return tag;
+                }
+            }
+        } while(token = iterator.stepForward());
+        
+        return null;
+    };
+    
+    this._readTagBackward = function(iterator) {
+        var token = iterator.getCurrentToken();
+        if (!token)
+            return null;
+            
+        var value = "";
+        var end;
+
+        do {
+            if (token.type.indexOf("meta.tag") === 0) {
+                if (!end) {
+                    end = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn() + token.value.length
+                    };
+                }
+                value = token.value + value;
+                if (value.indexOf("<") !== -1) {
+                    var tag = this._parseTag(value);
+                    tag.end = end;
+                    tag.start = {
+                        row: iterator.getCurrentTokenRow(),
+                        column: iterator.getCurrentTokenColumn()
+                    };
+                    iterator.stepBackward();
+                    return tag;
+                }
+            }
+        } while(token = iterator.stepBackward());
+        
+        return null;
+    };
+    
+    this._pop = function(stack, tag) {
+        while (stack.length) {
+            
+            var top = stack[stack.length-1];
+            if (!tag || top.tagName == tag.tagName) {
+                return stack.pop();
+            }
+            else if (this.voidElements[tag.tagName]) {
+                return;
+            }
+            else if (this.voidElements[top.tagName]) {
+                stack.pop();
+                continue;
+            } else {
+                return null;
+            }
+        }
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var firstTag = this._getFirstTagInLine(session, row);
+        
+        if (!firstTag.match)
+            return null;
+        
+        var isBackward = firstTag.closing || firstTag.selfClosing;
+        var stack = [];
+        var tag;
+        
+        if (!isBackward) {
+            var iterator = new TokenIterator(session, row, firstTag.column);
+            var start = {
+                row: row,
+                column: firstTag.column + firstTag.tagName.length + 2
+            };
+            while (tag = this._readTagForward(iterator)) {
+                if (tag.selfClosing) {
+                    if (!stack.length) {
+                        tag.start.column += tag.tagName.length + 2;
+                        tag.end.column -= 2;
+                        return Range.fromPoints(tag.start, tag.end);
+                    } else
+                        continue;
+                }
+                
+                if (tag.closing) {
+                    this._pop(stack, tag);
+                    if (stack.length == 0)
+                        return Range.fromPoints(start, tag.start);
+                }
+                else {
+                    stack.push(tag)
+                }
+            }
+        }
+        else {
+            var iterator = new TokenIterator(session, row, firstTag.column + firstTag.match.length);
+            var end = {
+                row: row,
+                column: firstTag.column
+            };
+            
+            while (tag = this._readTagBackward(iterator)) {
+                if (tag.selfClosing) {
+                    if (!stack.length) {
+                        tag.start.column += tag.tagName.length + 2;
+                        tag.end.column -= 2;
+                        return Range.fromPoints(tag.start, tag.end);
+                    } else
+                        continue;
+                }
+                
+                if (!tag.closing) {
+                    this._pop(stack, tag);
+                    if (stack.length == 0) {
+                        tag.start.column += tag.tagName.length + 2;
+                        return Range.fromPoints(tag.start, end);
+                    }
+                }
+                else {
+                    stack.push(tag)
+                }
+            }
+        }
+        
+    };
+
+}).call(FoldMode.prototype);
+
+});/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
+"use strict";
+
+var Range = require("../../range").Range;
+
+var FoldMode = exports.FoldMode = function() {};
+
+(function() {
+
+    this.foldingStartMarker = null;
+    this.foldingStopMarker = null;
+
+    // must return "" if there's no fold, to enable caching
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        if (this.foldingStartMarker.test(line))
+            return "start";
+        if (foldStyle == "markbeginend"
+                && this.foldingStopMarker
+                && this.foldingStopMarker.test(line))
+            return "end";
+        return "";
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        return null;
+    };
+
+    this.indentationBlock = function(session, row, column) {
+        var re = /^\s*/;
+        var startRow = row;
+        var endRow = row;
+        var line = session.getLine(row);
+        var startColumn = column || line.length;
+        var startLevel = line.match(re)[0].length;
+        var maxRow = session.getLength()
+        
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var level = line.match(re)[0].length;
+
+            if (level == line.length)
+                continue;
+
+            if (level <= startLevel)
+                break;
+
+            endRow = row;
+        }
+
+        if (endRow > startRow) {
+            var endColumn = session.getLine(endRow).length;
+            return new Range(startRow, startColumn, endRow, endColumn);
+        }
+    };
+
+    this.openingBracketBlock = function(session, bracket, row, column) {
+        var start = {row: row, column: column + 1};
+        var end = session.$findClosingBracket(bracket, start);
+        if (!end)
+            return;
+
+        var fw = session.foldWidgets[end.row];
+        if (fw == null)
+            fw = this.getFoldWidget(session, end.row);
+
+        if (fw == "start") {
+            end.row --;
+            end.column = session.getLine(end.row).length;
+        }
+        return Range.fromPoints(start, end);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/theme-clouds-uncompressed.js b/apps/files_texteditor/js/aceeditor/theme-clouds-uncompressed.js
new file mode 100755
index 00000000000..0c0445151b5
--- /dev/null
+++ b/apps/files_texteditor/js/aceeditor/theme-clouds-uncompressed.js
@@ -0,0 +1,162 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('ace/theme/clouds', ['require', 'exports', 'module' ], function(require, exports, module) {
+
+exports.isDark = false;
+exports.cssClass = "ace-clouds";
+exports.cssText = "\
+.ace-clouds .ace_editor {\
+  border: 2px solid rgb(159, 159, 159);\
+}\
+\
+.ace-clouds .ace_editor.ace_focus {\
+  border: 2px solid #327fbd;\
+}\
+\
+.ace-clouds .ace_gutter {\
+  background: #e8e8e8;\
+  color: #333;\
+}\
+\
+.ace-clouds .ace_print_margin {\
+  width: 1px;\
+  background: #e8e8e8;\
+}\
+\
+.ace-clouds .ace_scroller {\
+  background-color: #FFFFFF;\
+}\
+\
+.ace-clouds .ace_text-layer {\
+  cursor: text;\
+  color: #000000;\
+}\
+\
+.ace-clouds .ace_cursor {\
+  border-left: 2px solid #000000;\
+}\
+\
+.ace-clouds .ace_cursor.ace_overwrite {\
+  border-left: 0px;\
+  border-bottom: 1px solid #000000;\
+}\
+ \
+.ace-clouds .ace_marker-layer .ace_selection {\
+  background: #BDD5FC;\
+}\
+\
+.ace-clouds .ace_marker-layer .ace_step {\
+  background: rgb(198, 219, 174);\
+}\
+\
+.ace-clouds .ace_marker-layer .ace_bracket {\
+  margin: -1px 0 0 -1px;\
+  border: 1px solid #BFBFBF;\
+}\
+\
+.ace-clouds .ace_marker-layer .ace_active_line {\
+  background: #FFFBD1;\
+}\
+\
+.ace-clouds .ace_marker-layer .ace_selected_word {\
+  border: 1px solid #BDD5FC;\
+}\
+       \
+.ace-clouds .ace_invisible {\
+  color: #BFBFBF;\
+}\
+\
+.ace-clouds .ace_keyword {\
+  color:#AF956F;\
+}\
+\
+.ace-clouds .ace_keyword.ace_operator {\
+  color:#484848;\
+}\
+\
+.ace-clouds .ace_constant.ace_language {\
+  color:#39946A;\
+}\
+\
+.ace-clouds .ace_constant.ace_numeric {\
+  color:#46A609;\
+}\
+\
+.ace-clouds .ace_invalid {\
+  background-color:#FF002A;\
+}\
+\
+.ace-clouds .ace_fold {\
+    background-color: #AF956F;\
+    border-color: #000000;\
+}\
+\
+.ace-clouds .ace_support.ace_function {\
+  color:#C52727;\
+}\
+\
+.ace-clouds .ace_string {\
+  color:#5D90CD;\
+}\
+\
+.ace-clouds .ace_comment {\
+  color:#BCC8BA;\
+}\
+\
+.ace-clouds .ace_entity.ace_other.ace_attribute-name {\
+  color:#606060;\
+}\
+\
+.ace-clouds .ace_markup.ace_underline {\
+    text-decoration:underline;\
+}";
+
+var dom = require("../lib/dom");
+dom.importCssString(exports.cssText, exports.cssClass);
+
+});
+;
+            (function() {
+                window.require(["ace/ace"], function(a) {
+                    if (!window.ace)
+                        window.ace = {};
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        ace[key] = a[key];
+                });
+            })();
+        
\ No newline at end of file
-- 
GitLab


From a9bab168f5e43bfa5fe1523aab80faf1bc02cd58 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sun, 1 Jan 2012 18:40:32 -0500
Subject: [PATCH 125/546] Replace canRead()/canWrite() with
 is_readable()/is_writeable() for proper permission checks

---
 lib/filestorage/local.php |  4 +--
 lib/filesystem.php        | 61 +++++++++++++++------------------------
 2 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 9e29f85071a..02746fa6c6f 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -50,10 +50,10 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		}
 	}
 	public function is_readable($path){
-		return is_readable($this->datadir.$path);
+		return true;
 	}
 	public function is_writeable($path){
-		return is_writeable($this->datadir.$path);
+		return true;
 	}
 	public function file_exists($path){
 		return file_exists($this->datadir.$path);
diff --git a/lib/filesystem.php b/lib/filesystem.php
index cae8ead5b16..9b3dde1ae07 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -130,35 +130,6 @@ class OC_Filesystem{
 		return $internalPath;
 	}
 	
-	/**
-	* check if the current users has the right premissions to read a file
-	* @param  string  path
-	* @return bool
-	*/
-	static private function canRead($path){
-		if(substr($path,0,1)!=='/'){
-			$path='/'.$path;
-		}
-		if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
-			return false;
-		}
-		return true;//dummy untill premissions are correctly implemented, also the correcty value because for now users are locked in their seperate data dir and can read/write everything in there
-	}
-	/**
-	* check if the current users has the right premissions to write a file
-	* @param  string  path
-	* @return bool
-	*/
-	static private function canWrite($path){
-		if(substr($path,0,1)!=='/'){
-			$path='/'.$path;
-		}
-		if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
-			return false;
-		}
-		return true;//dummy untill premissions are correctly implemented, also the correcty value because for now users are locked in their seperate data dir and can read/write everything in there
-	}
-	
 	/**
 	* mount an OC_Filestorage in our virtual filesystem
 	* @param OC_Filestorage storage
@@ -228,7 +199,7 @@ class OC_Filesystem{
 	*/
 	static public function getLocalFile($path){
 		$parent=substr($path,0,strrpos($path,'/'));
-		if(self::canRead($parent) and $storage=self::getStorage($path)){
+		if(self::is_readable($parent) and $storage=self::getStorage($path)){
 			return $storage->getLocalFile(self::getInternalPath($path));
 		}
 	}
@@ -267,10 +238,24 @@ class OC_Filesystem{
 		return self::basicOperation('readfile',$path,array('read'));
 	}
 	static public function is_readable($path){
-		return self::basicOperation('is_readable',$path);
+		if(substr($path,0,1)!=='/'){
+			$path='/'.$path;
+		}
+		if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
+			return false;
+		}
+		$storage=self::getStorage($path);
+		return $storage->is_readable($path);
 	}
 	static public function is_writeable($path){
-		return self::basicOperation('is_writeable',$path);
+		if(substr($path,0,1)!=='/'){
+			$path='/'.$path;
+		}
+		if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
+			return false;
+		}
+		$storage=self::getStorage($path);
+		return $storage->is_writeable($path);
 	}
 	static public function file_exists($path){
 		if($path=='/'){
@@ -297,7 +282,7 @@ class OC_Filesystem{
 		return self::basicOperation('unlink',$path,array('delete'));
 	}
 	static public function rename($path1,$path2){
-		if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and self::canWrite($path1) and self::canWrite($path2)){
+		if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and self::is_writeable($path1) and self::is_writeable($path2)){
 			$run=true;
 			OC_Hook::emit( 'OC_Filesystem', 'rename', array( 'oldpath' => $path1 ,'newpath'=>$path2, 'run' => &$run));
 			if($run){
@@ -318,7 +303,7 @@ class OC_Filesystem{
 		}
 	}
 	static public function copy($path1,$path2){
-		if(OC_FileProxy::runPreProxies('copy',$path1,$path2) and self::canRead($path1) and self::canWrite($path2)){
+		if(OC_FileProxy::runPreProxies('copy',$path1,$path2) and self::is_readable($path1) and self::is_writeable($path2)){
 			$run=true;
 			OC_Hook::emit( 'OC_Filesystem', 'copy', array( 'oldpath' => $path1 ,'newpath'=>$path2, 'run' => &$run));
 			$exists=self::file_exists($path2);
@@ -373,13 +358,13 @@ class OC_Filesystem{
 		return self::basicOperation('fopen',$path,$hooks,$mode);
 	}
 	static public function toTmpFile($path){
-		if(OC_FileProxy::runPreProxies('toTmpFile',$path) and self::canRead($path) and $storage=self::getStorage($path)){
+		if(OC_FileProxy::runPreProxies('toTmpFile',$path) and self::is_readable($path) and $storage=self::getStorage($path)){
 			OC_Hook::emit( 'OC_Filesystem', 'read', array( 'path' => $path));
 			return $storage->toTmpFile(self::getInternalPath($path));
 		}
 	}
 	static public function fromTmpFile($tmpFile,$path){
-		if(OC_FileProxy::runPreProxies('copy',$tmpFile,$path) and self::canWrite($path) and $storage=self::getStorage($path)){
+		if(OC_FileProxy::runPreProxies('copy',$tmpFile,$path) and self::is_writeable($path) and $storage=self::getStorage($path)){
 			$run=true;
 			$exists=self::file_exists($path);
 			if(!$exists){
@@ -399,7 +384,7 @@ class OC_Filesystem{
 		}
 	}
 	static public function fromUploadedFile($tmpFile,$path){
-		if(OC_FileProxy::runPreProxies('fromUploadedFile',$tmpFile,$path) and self::canWrite($path) and $storage=self::getStorage($path)){
+		if(OC_FileProxy::runPreProxies('fromUploadedFile',$tmpFile,$path) and self::is_writeable($path) and $storage=self::getStorage($path)){
 			$run=true;
 			$exists=self::file_exists($path);
 			if(!$exists){
@@ -462,7 +447,7 @@ class OC_Filesystem{
 	 * @return mixed
 	 */
 	private static function basicOperation($operation,$path,$hooks=array(),$extraParam=null){
-		if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and self::canRead($path) and $storage=self::getStorage($path)){
+		if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and self::is_readable($path) and $storage=self::getStorage($path)){
 			$interalPath=self::getInternalPath($path);
 			$run=true;
 			foreach($hooks as $hook){
-- 
GitLab


From a8789ebe2975564bee851b895d636d7503135257 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 2 Jan 2012 00:43:27 +0100
Subject: [PATCH 126/546] Removed static declaration from loadFrom* methods.

---
 lib/image.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index a8948956bf4..21580f40b8b 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -160,7 +160,7 @@ class OC_Image {
 	*					If a resource is passed it is the job of the caller to destroy it using imagedestroy($var)
 	* @returns An image resource or false on error
 	*/
-	static public function load($imageref) {
+	public function load($imageref) {
 		if(self::loadFromFile($imageref) !== false) {
 			return self::$resource;
 		} elseif(self::loadFromBase64($imageref) !== false) {
@@ -180,7 +180,7 @@ class OC_Image {
 	* @param $imageref The path to a local file.
 	* @returns An image resource or false on error
 	*/
-	static public function loadFromFile($imagepath=false) {
+	public function loadFromFile($imagepath=false) {
 		if(!is_file($imagepath) || !file_exists($imagepath) || !is_readable($imagepath)) {
 			OC_Log::write('core','OC_Image::loadFromFile, couldn\'t load', OC_Log::DEBUG);
 			return false;
@@ -243,8 +243,7 @@ class OC_Image {
 				OC_Log::write('core','OC_Image::loadFromFile, Default', OC_Log::DEBUG);
 				break;
 		}
-		// if($this->valid()) { // FIXME: I get an error: "PHP Fatal error:  Using $this when not in object context..." WTF?
-		if(self::valid()) { // And here I get a warning: "PHP Strict Standards:  Non-static method OC_Image::valid() should not be called statically..." valid() shouldn't be a static member as it would fail on a non-instantiated class.
+		if($this->valid()) {
 			self::$imagetype = $itype;
 			self::$destroy = true;
 		}
@@ -256,7 +255,7 @@ class OC_Image {
 	* @param $str A string of image data as read from a file.
 	* @returns An image resource or false on error
 	*/
-	static public function loadFromData($str) {
+	public function loadFromData($str) {
 		if(is_resource($str)) {
 			return false;
 		}
@@ -274,7 +273,7 @@ class OC_Image {
 	* @param $str A string base64 encoded string of image data.
 	* @returns An image resource or false on error
 	*/
-	static public function loadFromBase64($str) {
+	public function loadFromBase64($str) {
 		if(!is_string($str)) {
 			return false;
 		}
@@ -297,7 +296,7 @@ class OC_Image {
 	* @param $res An image resource.
 	* @returns An image resource or false on error
 	*/
-	static public function loadFromResource($res) {
+	public function loadFromResource($res) {
 		if(!is_resource($res)) {
 			return false;
 		}
-- 
GitLab


From 470bab9c682fdbe4dcb331f2f6a00b3a9aefc929 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sun, 1 Jan 2012 18:45:26 -0500
Subject: [PATCH 127/546] Fix typo in move error message

---
 files/ajax/move.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/ajax/move.php b/files/ajax/move.php
index 8a56a015486..3517901c6cf 100644
--- a/files/ajax/move.php
+++ b/files/ajax/move.php
@@ -14,7 +14,7 @@ $target = $_GET["target"];
 if(OC_Files::move($dir,$file,$target,$file)){
 	OC_JSON::success(array("data" => array( "dir" => $dir, "files" => $file )));
 }else{
-	OC_JSON::error(array("data" => array( "message" => "Could move $file" )));
+	OC_JSON::error(array("data" => array( "message" => "Could not move $file" )));
 }
 
 ?>
-- 
GitLab


From 4374d55e5e020a1f2673a18991be6f2560e9f2c3 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sun, 1 Jan 2012 19:59:24 -0500
Subject: [PATCH 128/546] Correct local permissions checks

---
 lib/filestorage/local.php | 4 ++--
 lib/filesystem.php        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 02746fa6c6f..cfc27159786 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -50,10 +50,10 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		}
 	}
 	public function is_readable($path){
-		return true;
+		return is_readable($this->datadir.$path);
 	}
 	public function is_writeable($path){
-		return true;
+		return is_writable($this->datadir.$path);
 	}
 	public function file_exists($path){
 		return file_exists($this->datadir.$path);
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 9b3dde1ae07..1205a6aa51b 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -245,7 +245,7 @@ class OC_Filesystem{
 			return false;
 		}
 		$storage=self::getStorage($path);
-		return $storage->is_readable($path);
+		return $storage->is_readable(self::getInternalPath($path));
 	}
 	static public function is_writeable($path){
 		if(substr($path,0,1)!=='/'){
@@ -255,7 +255,7 @@ class OC_Filesystem{
 			return false;
 		}
 		$storage=self::getStorage($path);
-		return $storage->is_writeable($path);
+		return $storage->is_writeable(self::getInternalPath($path));
 	}
 	static public function file_exists($path){
 		if($path=='/'){
-- 
GitLab


From e6739d230eec61af1ee99c4c17b53195552fe809 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Mon, 2 Jan 2012 11:35:50 +0100
Subject: [PATCH 129/546] add function to detect always the timezone

---
 apps/calendar/ajax/gettimezonedetection.php | 11 +++++++++++
 apps/calendar/ajax/guesstimezone.php        | 13 +++++++++++--
 apps/calendar/ajax/timezonedetection.php    | 17 +++++++++++++++++
 apps/calendar/index.php                     |  2 +-
 apps/calendar/js/geo.js                     |  2 +-
 apps/calendar/js/settings.js                | 11 +++++++++++
 apps/calendar/templates/settings.php        |  2 +-
 7 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 apps/calendar/ajax/gettimezonedetection.php
 create mode 100644 apps/calendar/ajax/timezonedetection.php

diff --git a/apps/calendar/ajax/gettimezonedetection.php b/apps/calendar/ajax/gettimezonedetection.php
new file mode 100644
index 00000000000..ae58370712d
--- /dev/null
+++ b/apps/calendar/ajax/gettimezonedetection.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2011, 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+require_once ("../../../lib/base.php");
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('calendar');
+OC_JSON::success(array('detection' => OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezonedetection')));
\ No newline at end of file
diff --git a/apps/calendar/ajax/guesstimezone.php b/apps/calendar/ajax/guesstimezone.php
index 07aadc5cb12..41aea26985f 100755
--- a/apps/calendar/ajax/guesstimezone.php
+++ b/apps/calendar/ajax/guesstimezone.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * Copyright (c) 2011, 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
@@ -24,10 +24,19 @@ OC_JSON::checkAppEnabled('calendar');
 $l = new OC_L10N('calendar');
 $lat = $_GET['lat'];
 $long = $_GET['long'];
+if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'position') == $lat . '-' . $long && OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone') != null){
+	OC_JSON::success();
+	exit;
+}
+OC_Preferences::setValue(OC_USER::getUser(), 'calendar', 'position', $lat . '-' . $long);
 $geolocation = file_get_contents('http://ws.geonames.org/timezone?lat=' . $lat . '&lng=' . $long);
 //Information are by Geonames (http://www.geonames.org) and licensed under the Creative Commons Attribution 3.0 License
 $geoxml = simplexml_load_string($geolocation);
 $geoarray = make_array_out_of_xml($geoxml);
+if($geoarray['timezone']['timezoneId'] == OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone')){
+	OC_JSON::success();
+	exit;
+}
 if(in_array($geoarray['timezone']['timezoneId'], DateTimeZone::listIdentifiers())){
 	OC_Preferences::setValue(OC_USER::getUser(), 'calendar', 'timezone', $geoarray['timezone']['timezoneId']);
 	$message = array('message'=> $l->t('New Timezone:') . $geoarray['timezone']['timezoneId']);
@@ -36,4 +45,4 @@ if(in_array($geoarray['timezone']['timezoneId'], DateTimeZone::listIdentifiers()
 	OC_JSON::error();
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/apps/calendar/ajax/timezonedetection.php b/apps/calendar/ajax/timezonedetection.php
new file mode 100644
index 00000000000..77e4c4f6ebe
--- /dev/null
+++ b/apps/calendar/ajax/timezonedetection.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright (c) 2011, 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+require_once ("../../../lib/base.php");
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('calendar');
+if($_POST['timezonedetection'] == 'on'){
+	OC_Preferences::setValue(OC_USER::getUser(), 'calendar', 'timezonedetection', 'true');
+}else{
+	OC_Preferences::setValue(OC_USER::getUser(), 'calendar', 'timezonedetection', 'false');
+}
+OC_JSON::success();
+
diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index 7561f987b21..a2042afddf1 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -32,7 +32,7 @@ if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'mont
 
 OC_Util::addScript('3rdparty/fullcalendar', 'fullcalendar');
 OC_Util::addStyle('3rdparty/fullcalendar', 'fullcalendar');
-if(OC_Preferences::getValue(OC_USER::getUser(), "calendar", "timezone") == null){
+if(OC_Preferences::getValue(OC_USER::getUser(), "calendar", "timezone") == null || OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezonedetection') == 'true'){
 	OC_UTIL::addScript('calendar', 'geo');
 }
 OC_Util::addScript('calendar', 'calendar');
diff --git a/apps/calendar/js/geo.js b/apps/calendar/js/geo.js
index 744d960b75f..ae6a971e938 100755
--- a/apps/calendar/js/geo.js
+++ b/apps/calendar/js/geo.js
@@ -8,7 +8,7 @@ if (navigator.geolocation) {
 	navigator.geolocation.getCurrentPosition(function(position) {
 		$.getJSON(OC.filePath('calendar', 'ajax', 'guesstimezone.php?lat=' + position.coords.latitude + '&long=' + position.coords.longitude + ''),
 		function(data){
-			if (data.status == 'success'){
+			if (data.status == 'success' && typeof(data.message) != 'undefined'){
 				$('#notification').html(data.message);
 				$('#notification').attr('title', 'CC BY 3.0 by Geonames.org');
 				$('#notification').slideDown();
diff --git a/apps/calendar/js/settings.js b/apps/calendar/js/settings.js
index 6c00be06b39..613e2d030db 100644
--- a/apps/calendar/js/settings.js
+++ b/apps/calendar/js/settings.js
@@ -8,6 +8,12 @@ $(document).ready(function(){
 		});
 		return false;
 	});
+	$('#timezonedetection').change( function(){
+		var post = $('#timezonedetection').serialize();
+		$.post( OC.filePath('calendar', 'ajax', 'timezonedetection.php'), post, function(data){
+			
+		});
+	});
 	$("#timezone").chosen();
 	$("#firstdayofweek").change( function(){
 		var data = $("#firstdayofweek").serialize();
@@ -52,6 +58,11 @@ $(document).ready(function(){
 	$.getJSON(OC.filePath('calendar', 'ajax', 'duration.php'), function(jsondata, status) {
 		$("#duration").val(jsondata.duration);
 	});
+	$.getJSON(OC.filePath('calendar', 'ajax', 'gettimezonedetection.php'), function(jsondata, status){
+		if(jsondata.detection == 'true'){
+			$('#timezonedetection').attr('checked', 'checked');
+		}
+	});
 	$("#weekend").change( function(){
 		var data = $("#weekend").serialize();
 		$.post( OC.filePath('calendar', 'ajax', 'setdaysofweekend.php'), data, function(data){
diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
index 56fb55d235c..fc8e0e061d9 100644
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@ -27,7 +27,7 @@
                     $continent=$ex[0];
                     echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>';
                 endforeach;?>
-            </select></td></tr>
+            </select><input type="checkbox" name="timezonedetection" id="timezonedetection"><label for="timezonedetection"><?php echo $l->t('Check always for changes of the timezone'); ?></label></td></tr>
 
             <tr><td><label for="timeformat" class="bold"><?php echo $l->t('Timeformat');?></label></td><td>
                 <select style="display: none;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat">
-- 
GitLab


From 5ccd26959f5727bfad49bbfc6b6735dfed997fef Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Mon, 2 Jan 2012 11:39:23 +0100
Subject: [PATCH 130/546] remove unused js

---
 apps/calendar/js/settings.js | 65 ++++++++----------------------------
 1 file changed, 13 insertions(+), 52 deletions(-)

diff --git a/apps/calendar/js/settings.js b/apps/calendar/js/settings.js
index 613e2d030db..73300885565 100644
--- a/apps/calendar/js/settings.js
+++ b/apps/calendar/js/settings.js
@@ -1,74 +1,35 @@
 $(document).ready(function(){
-	$("#timezone").change( function(){
+	$('#timezone').change( function(){
 		OC.msg.startSaving('#calendar .msg')
 		// Serialize the data
-		var post = $( "#timezone" ).serialize();
+		var post = $( '#timezone' ).serialize();
 		$.post( OC.filePath('calendar', 'ajax', 'settimezone.php'), post, function(data){
 			//OC.msg.finishedSaving('#calendar .msg', data);
 		});
 		return false;
 	});
+	$('#timezone').chosen();
+	$('#timeformat').change( function(){
+		var data = $('#timeformat').serialize();
+		$.post( OC.filePath('calendar', 'ajax', 'settimeformat.php'), data, function(data){
+			if(data == 'error'){
+				console.log('saving timeformat failed');
+			}
+		});
+	});
 	$('#timezonedetection').change( function(){
 		var post = $('#timezonedetection').serialize();
 		$.post( OC.filePath('calendar', 'ajax', 'timezonedetection.php'), post, function(data){
 			
 		});
 	});
-	$("#timezone").chosen();
-	$("#firstdayofweek").change( function(){
-		var data = $("#firstdayofweek").serialize();
-		$.post( OC.filePath('calendar', 'ajax', 'setfirstdayofweek.php'), data, function(data){
-			if(data == "error"){
-				console.log("saving first day of week failed");
-			}
-		});
-	});
-	$.getJSON(OC.filePath('calendar', 'ajax', 'firstdayofweek.php'), function(jsondata, status) {
-		$("#select_" + jsondata.firstdayofweek).attr('selected',true);
-		$("#firstdayofweek").chosen();
-	});
-	$.getJSON(OC.filePath('calendar', 'ajax', 'daysofweekend.php'), function(jsondata, status) {
-		for(day in jsondata){
-			if(jsondata[day] == "true"){
-				$("#selectweekend_" + day).attr('selected',true);
-			}
-		}
-		$("#weekend").chosen();
-	});
-	$("#timeformat").change( function(){
-		var data = $("#timeformat").serialize();
-		$.post( OC.filePath('calendar', 'ajax', 'settimeformat.php'), data, function(data){
-			if(data == "error"){
-				console.log("saving timeformat failed");
-			}
-		});
-	});
 	$.getJSON(OC.filePath('calendar', 'ajax', 'timeformat.php'), function(jsondata, status) {
-		$("#" + jsondata.timeformat).attr('selected',true);
-		$("#timeformat").chosen();
-	});
-	$("#duration").blur( function(){
-		var data = $("#duration").val();
-		$.post( OC.filePath('calendar', 'ajax', 'setduration.php'), {duration: data}, function(data){
-			if(data == "error"){
-				console.log("saving duration failed");
-			}
-		});
-	});
-	$.getJSON(OC.filePath('calendar', 'ajax', 'duration.php'), function(jsondata, status) {
-		$("#duration").val(jsondata.duration);
+		$('#' + jsondata.timeformat).attr('selected',true);
+		$('#timeformat').chosen();
 	});
 	$.getJSON(OC.filePath('calendar', 'ajax', 'gettimezonedetection.php'), function(jsondata, status){
 		if(jsondata.detection == 'true'){
 			$('#timezonedetection').attr('checked', 'checked');
 		}
 	});
-	$("#weekend").change( function(){
-		var data = $("#weekend").serialize();
-		$.post( OC.filePath('calendar', 'ajax', 'setdaysofweekend.php'), data, function(data){
-			if(data == "error"){
-				console.log("saving days of weekend failed");
-			}
-		});
-	});
 });
-- 
GitLab


From 534b6f3a098c8f2bb5993592e73f5af75c3c86bc Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Mon, 2 Jan 2012 11:49:53 +0100
Subject: [PATCH 131/546] Fix whitespace username

---
 lib/user.php         | 2 +-
 settings/js/users.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/user.php b/lib/user.php
index 241d9aa8b10..0a5881ec0f8 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -120,7 +120,7 @@ class OC_User {
 			return false;
 		}
 		// No empty username
-		if( !$uid ){
+		if(trim($uid) == ''){
 			return false;
 		}
 		// Check if user already exists
diff --git a/settings/js/users.js b/settings/js/users.js
index 4fea52e4a1f..79b4e80870a 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -126,7 +126,7 @@ $(document).ready(function(){
 	$('#newuser').submit(function(event){
 		event.preventDefault();
 		var username=$('#newusername').val();
-		if(username == '') {
+		if($.trim(username) == '') {
 			alert('Please provide a username!');
 			return false;
 		}
-- 
GitLab


From c62c55fb81ced8710ab0290c272a1c0922640afd Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 2 Jan 2012 12:09:45 +0100
Subject: [PATCH 132/546] Added save() to OC_Image.

---
 lib/image.php | 53 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index 21580f40b8b..57a0caa140b 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -42,6 +42,7 @@ class OC_Image {
 	static private $resource = false; // tmp resource.
 	static private $destroy = false; // if the resource is created withing the object.
 	static private $imagetype = IMAGETYPE_PNG; // Default to png if file type isn't evident.
+	static private $filepath = null;
 	/**
 	* @brief Constructor.
 	* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
@@ -49,7 +50,7 @@ class OC_Image {
 	* @returns bool False on error
 	*/
 	function __construct($imageref = null) {
-		OC_Log::write('core','OC_Image::__construct, start', OC_Log::DEBUG);
+		//OC_Log::write('core','OC_Image::__construct, start', OC_Log::DEBUG);
 		if(!function_exists('imagecreatefromjpeg')) { // FIXME: Find a better way to check for GD
 			OC_Log::write('core','OC_Image::__construct, GD module not installed', OC_Log::ERROR);
 			return false;
@@ -102,30 +103,63 @@ class OC_Image {
 	}
 
 	/**
-	* @brief Prints the image.
+	* @brief Outputs the image.
+	* @returns bool
 	*/
 	public function show() {
+		return $this->_output();
+	}
+
+	/**
+	* @brief Saves the image.
+	* @returns bool
+	*/
+	public function save($filepath=null) {
+		if($filepath === null && $this->filepath === null) {
+			OC_Log::write('core','OC_Image::save. save() called with no path.', OC_Log::ERROR);
+			return false;
+		} elseif($filepath === null && $this->filepath !== null) {
+			$filepath = $this->filepath;
+		}
+		return $this->_output($filepath, true);
+	}
+
+	/**
+	* @brief Outputs/saves the image.
+	*/
+	private function _output($filepath=null, $really=false) {
 		header('Content-Type: '.self::mimeType());
+		if($really === false) {
+			$filepath = null; // Just being cautious ;-)
+		} else {
+			// TODO: Check for writability etc.
+			if(!is_writable($filepath)) {
+				OC_Log::write('core','OC_Image::save. \''.$filepath.'\' is not writable.', OC_Log::ERROR);
+				return false;
+			}
+		}
+		$retval = false;
 		switch(self::$imagetype) {
 			case IMAGETYPE_GIF:
-				imagegif(self::$resource);
+				$retval = imagegif(self::$resource, $filepath);
 				break;
 			case IMAGETYPE_JPEG:
-				imagejpeg(self::$resource);
+				$retval = imagejpeg(self::$resource, $filepath);
 				break;
 			case IMAGETYPE_PNG:
-				imagepng(self::$resource);
+				$retval = imagepng(self::$resource, $filepath);
 				break;
 			case IMAGETYPE_XBM:
-				imagexbm(self::$resource);
+				$retval = imagexbm(self::$resource, $filepath);
 				break;
 			case IMAGETYPE_WBMP:
 			case IMAGETYPE_BMP:
-				imagewbmp(self::$resource);
+				$retval = imagewbmp(self::$resource, $filepath);
 				break;
 			default:
-				imagepng(self::$resource);
+				$retval = imagepng(self::$resource, $filepath);
 		}
+		return $retval;
 	}
 
 	/**
@@ -186,7 +220,7 @@ class OC_Image {
 			return false;
 		}
 		$itype = exif_imagetype($imagepath);
-		switch($itype) {
+		switch($itype) { // TODO: Log if image type is not supported.
 			case IMAGETYPE_GIF:
 				if (imagetypes() & IMG_GIF) {
 					self::$resource = imagecreatefromgif($imagepath);
@@ -245,6 +279,7 @@ class OC_Image {
 		}
 		if($this->valid()) {
 			self::$imagetype = $itype;
+			self::$filepath = $imagepath;
 			self::$destroy = true;
 		}
 		return self::$resource;
-- 
GitLab


From 6a7fbf9d136c44c7bdb9fab80354cbf44fadc105 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 2 Jan 2012 13:40:23 +0100
Subject: [PATCH 133/546] Added more error checking and debug on missing image
 support.

---
 lib/image.php | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index 57a0caa140b..b797f331f45 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -33,6 +33,14 @@ if ( ! function_exists( 'exif_imagetype' ) ) {
 }
 */
 
+function ellipsis($str, $maxlen) {
+	if (strlen($str) > $maxlen) {
+		$characters = floor($maxlen / 2);
+		return substr($str, 0, $characters) . '...' . substr($str, -1 * $characters);
+	}
+	return $str;
+}
+
 /**
  * Class for image manipulation
  * Ideas: imagerotate, chunk_split(base64_encode())
@@ -51,7 +59,8 @@ class OC_Image {
 	*/
 	function __construct($imageref = null) {
 		//OC_Log::write('core','OC_Image::__construct, start', OC_Log::DEBUG);
-		if(!function_exists('imagecreatefromjpeg')) { // FIXME: Find a better way to check for GD
+		if(!extension_loaded('gd') || !function_exists('gd_info')) {
+		//if(!function_exists('imagecreatefromjpeg')) {
 			OC_Log::write('core','OC_Image::__construct, GD module not installed', OC_Log::ERROR);
 			return false;
 		}
@@ -114,6 +123,7 @@ class OC_Image {
 	* @brief Saves the image.
 	* @returns bool
 	*/
+
 	public function save($filepath=null) {
 		if($filepath === null && $this->filepath === null) {
 			OC_Log::write('core','OC_Image::save. save() called with no path.', OC_Log::ERROR);
@@ -132,9 +142,11 @@ class OC_Image {
 		if($really === false) {
 			$filepath = null; // Just being cautious ;-)
 		} else {
-			// TODO: Check for writability etc.
-			if(!is_writable($filepath)) {
-				OC_Log::write('core','OC_Image::save. \''.$filepath.'\' is not writable.', OC_Log::ERROR);
+			if(!is_writable(dirname($filepath))) {
+				OC_Log::write('core','OC_Image::save. Directory \''.dirname($filepath).'\' is not writable.', OC_Log::ERROR);
+				return false;
+			} elseif(is_writable(dirname($filepath)) && !is_writable($filepath)) {
+				OC_Log::write('core','OC_Image::save. File \''.$filepath.'\' is not writable.', OC_Log::ERROR);
 				return false;
 			}
 		}
@@ -216,35 +228,46 @@ class OC_Image {
 	*/
 	public function loadFromFile($imagepath=false) {
 		if(!is_file($imagepath) || !file_exists($imagepath) || !is_readable($imagepath)) {
-			OC_Log::write('core','OC_Image::loadFromFile, couldn\'t load', OC_Log::DEBUG);
+			// Debug output disabled because this method is tried before loadFromBase64?
+			OC_Log::write('core','OC_Image::loadFromFile, couldn\'t load: '.ellipsis($imagepath, 50), OC_Log::DEBUG);
 			return false;
 		}
 		$itype = exif_imagetype($imagepath);
-		switch($itype) { // TODO: Log if image type is not supported.
+		switch($itype) {
 			case IMAGETYPE_GIF:
 				if (imagetypes() & IMG_GIF) {
 					self::$resource = imagecreatefromgif($imagepath);
+				} else {
+					OC_Log::write('core','OC_Image::loadFromFile, GIF images not supported: '.$imagepath, OC_Log::DEBUG);
 				}
 				break;
 			case IMAGETYPE_JPEG:
 				if (imagetypes() & IMG_JPG) {
 					self::$resource = imagecreatefromjpeg($imagepath);
+				} else {
+					OC_Log::write('core','OC_Image::loadFromFile, JPG images not supported: '.$imagepath, OC_Log::DEBUG);
 				}
 				break;
 			case IMAGETYPE_PNG:
 				if (imagetypes() & IMG_PNG) {
 					self::$resource = imagecreatefrompng($imagepath);
+				} else {
+					OC_Log::write('core','OC_Image::loadFromFile, PNG images not supported: '.$imagepath, OC_Log::DEBUG);
 				}
 				break;
 			case IMAGETYPE_XBM:
 				if (imagetypes() & IMG_XPM) {
 					self::$resource = imagecreatefromxbm($imagepath);
+				} else {
+					OC_Log::write('core','OC_Image::loadFromFile, XBM/XPM images not supported: '.$imagepath, OC_Log::DEBUG);
 				}
 				break;
 			case IMAGETYPE_WBMP:
 			case IMAGETYPE_BMP:
 				if (imagetypes() & IMG_WBMP) {
 					self::$resource = imagecreatefromwbmp($imagepath);
+				} else {
+					OC_Log::write('core','OC_Image::loadFromFile, (W)BMP images not supported: '.$imagepath, OC_Log::DEBUG);
 				}
 				break;
 			/*
-- 
GitLab


From a1af757ef6e99fc17d635ab05470671b41fc44db Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Mon, 2 Jan 2012 14:21:46 +0100
Subject: [PATCH 134/546] Fix whitespace username in the installation form

---
 core/js/setup.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/js/setup.js b/core/js/setup.js
index b765d41ba35..94097785e42 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -7,7 +7,9 @@ $(document).ready(function() {
 		$('#dbhost').hide();
 		$('#dbhostlabel').hide();
 	}
-
+	$('#adminlogin').change(function(){
+		$('#adminlogin').val($.trim($('#adminlogin').val()));
+	});
 	$('#sqlite').click(function() {
 		$('#use_other_db').slideUp(250);
 		$('#dbhost').hide(250);
-- 
GitLab


From cc55f00481dd00c4db54714d79e1f13158a87850 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Mon, 2 Jan 2012 16:38:10 +0100
Subject: [PATCH 135/546] fix is_readable and is_writable

---
 lib/filesystem.php | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 1205a6aa51b..627f494c937 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -199,11 +199,26 @@ class OC_Filesystem{
 	*/
 	static public function getLocalFile($path){
 		$parent=substr($path,0,strrpos($path,'/'));
-		if(self::is_readable($parent) and $storage=self::getStorage($path)){
+		if(self::isValidPath($parent) and $storage=self::getStorage($path)){
 			return $storage->getLocalFile(self::getInternalPath($path));
 		}
 	}
 	
+	/**
+	 * check if the requested path is valid
+	 * @param string path
+	 * @return bool
+	 */
+	static public function isValidPath($path){
+		if(substr($path,0,1)!=='/'){
+			$path='/'.$path;
+		}
+		if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
+			return false;
+		}
+		return true;
+	}
+	
 	static public function mkdir($path){
 		return self::basicOperation('mkdir',$path,array('create','write'));
 	}
@@ -238,24 +253,10 @@ class OC_Filesystem{
 		return self::basicOperation('readfile',$path,array('read'));
 	}
 	static public function is_readable($path){
-		if(substr($path,0,1)!=='/'){
-			$path='/'.$path;
-		}
-		if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
-			return false;
-		}
-		$storage=self::getStorage($path);
-		return $storage->is_readable(self::getInternalPath($path));
+		return self::basicOperation('is_readable',$path);
 	}
 	static public function is_writeable($path){
-		if(substr($path,0,1)!=='/'){
-			$path='/'.$path;
-		}
-		if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
-			return false;
-		}
-		$storage=self::getStorage($path);
-		return $storage->is_writeable(self::getInternalPath($path));
+		return self::basicOperation('is_writeable',$path);
 	}
 	static public function file_exists($path){
 		if($path=='/'){
@@ -358,7 +359,7 @@ class OC_Filesystem{
 		return self::basicOperation('fopen',$path,$hooks,$mode);
 	}
 	static public function toTmpFile($path){
-		if(OC_FileProxy::runPreProxies('toTmpFile',$path) and self::is_readable($path) and $storage=self::getStorage($path)){
+		if(OC_FileProxy::runPreProxies('toTmpFile',$path) and self::isValidPath($path) and $storage=self::getStorage($path)){
 			OC_Hook::emit( 'OC_Filesystem', 'read', array( 'path' => $path));
 			return $storage->toTmpFile(self::getInternalPath($path));
 		}
@@ -447,7 +448,7 @@ class OC_Filesystem{
 	 * @return mixed
 	 */
 	private static function basicOperation($operation,$path,$hooks=array(),$extraParam=null){
-		if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and self::is_readable($path) and $storage=self::getStorage($path)){
+		if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and self::isValidPath($path) and $storage=self::getStorage($path)){
 			$interalPath=self::getInternalPath($path);
 			$run=true;
 			foreach($hooks as $hook){
-- 
GitLab


From 39a7bd9c00a66ef82c709eeba72ec71c23e462e6 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 2 Jan 2012 17:02:30 +0000
Subject: [PATCH 136/546] Added data-read and data-write attributes to file
 list

---
 files/templates/part.list.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index ae3f32b2e9f..81ba24dac9f 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -1,4 +1,6 @@
 		<?php foreach($_['files'] as $file):
+			$read = ($file['readable']) ? 'true' : 'false';
+			$write = ($file['writeable']) ? 'true' : 'false';
 			$simple_file_size = simple_file_size($file['size']);
 			$simple_size_color = intval(200-$file['size']/(1024*1024)*2); // the bigger the file, the darker the shade of grey; megabytes*2
 			if($simple_size_color<0) $simple_size_color = 0;
@@ -9,7 +11,7 @@
 			$name = str_replace('%2F','/', $name);
 			$directory = str_replace('+','%20',urlencode($file['directory']));
 			$directory = str_replace('%2F','/', $directory); ?>
-			<tr data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>'>
+			<tr data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>' data-read='<?php echo $read;?>' data-write='<?php echo $write;?>'>
 				<td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo mimetype_icon('dir'); else echo mimetype_icon($file['mime']); ?>)">
 					<?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" /><?php } ?>
 					<a class="name" href="<?php if($file['type'] == 'dir') echo $_['baseURL'].$directory.'/'.$name; else echo $_['downloadURL'].$directory.'/'.$name; ?>" title="">
-- 
GitLab


From 0730077840a82a67a491780257089dfe7c7f64e2 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 2 Jan 2012 17:07:10 +0000
Subject: [PATCH 137/546] Used data-read and data-wite when binding drag and
 drop events

---
 files/js/files.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/js/files.js b/files/js/files.js
index 88a07a0776e..6044541d4aa 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -11,8 +11,8 @@ $(document).ready(function() {
 	$('#file_action_panel').attr('activeAction', false);
 
 	//drag/drop of files
-	$('#fileList tr[data-file!="Shared"] td.filename').draggable(dragOptions);
-	$('#fileList tr[data-type="dir"][data-file!="Shared"] td.filename').droppable(folderDropOptions);
+	$('#fileList tr td.filename').draggable(dragOptions);
+	$('#fileList tr[data-type="dir"][data-read="false"][data-write="false"] td.filename').droppable(folderDropOptions);
 	$('div.crumb').droppable(crumbDropOptions);
 	$('ul#apps>li:first-child').data('dir','');
 	$('ul#apps>li:first-child').droppable(crumbDropOptions);
-- 
GitLab


From ebe3ae58cffa8c16ef2b1b74c5b7a9228a5495ff Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 2 Jan 2012 18:08:20 +0000
Subject: [PATCH 138/546] removed data-read and fixed droppable logic

---
 files/js/files.js             | 2 +-
 files/templates/part.list.php | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/files/js/files.js b/files/js/files.js
index 6044541d4aa..7c04245c223 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -12,7 +12,7 @@ $(document).ready(function() {
 
 	//drag/drop of files
 	$('#fileList tr td.filename').draggable(dragOptions);
-	$('#fileList tr[data-type="dir"][data-read="false"][data-write="false"] td.filename').droppable(folderDropOptions);
+	$('#fileList tr[data-type="dir"][data-write="true"] td.filename').droppable(folderDropOptions);
 	$('div.crumb').droppable(crumbDropOptions);
 	$('ul#apps>li:first-child').data('dir','');
 	$('ul#apps>li:first-child').droppable(crumbDropOptions);
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index 81ba24dac9f..a364862119d 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -1,5 +1,4 @@
 		<?php foreach($_['files'] as $file):
-			$read = ($file['readable']) ? 'true' : 'false';
 			$write = ($file['writeable']) ? 'true' : 'false';
 			$simple_file_size = simple_file_size($file['size']);
 			$simple_size_color = intval(200-$file['size']/(1024*1024)*2); // the bigger the file, the darker the shade of grey; megabytes*2
@@ -11,7 +10,7 @@
 			$name = str_replace('%2F','/', $name);
 			$directory = str_replace('+','%20',urlencode($file['directory']));
 			$directory = str_replace('%2F','/', $directory); ?>
-			<tr data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>' data-read='<?php echo $read;?>' data-write='<?php echo $write;?>'>
+			<tr data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>' data-write='<?php echo $write;?>'>
 				<td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo mimetype_icon('dir'); else echo mimetype_icon($file['mime']); ?>)">
 					<?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" /><?php } ?>
 					<a class="name" href="<?php if($file['type'] == 'dir') echo $_['baseURL'].$directory.'/'.$name; else echo $_['downloadURL'].$directory.'/'.$name; ?>" title="">
-- 
GitLab


From b8cffbc0eec099e0fb7ffbb53e7fc1dc5bbc4035 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 2 Jan 2012 23:17:15 +0100
Subject: [PATCH 139/546] OC_Image::__invoke didn't return anything thus
 causing contacts/thumbnail.php to spit out lots of error messages.

---
 lib/image.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/image.php b/lib/image.php
index b797f331f45..e09486be081 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -178,7 +178,7 @@ class OC_Image {
 	* @brief Prints the image when called as $image().
 	*/
 	public function __invoke() {
-		self::show();
+		return self::show();
 	}
 
 	/**
-- 
GitLab


From 4c8f17ad4747592cc01525c663de32962552cf18 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 3 Jan 2012 04:55:19 +0100
Subject: [PATCH 140/546] don't try to use mod_rewrite when it isn't enabled

having a broken web/card/caldav is much better as having no ownCloud at all :)
---
 .htaccess     | 2 ++
 lib/setup.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index b181f8b8452..86a2de6b946 100644
--- a/.htaccess
+++ b/.htaccess
@@ -5,6 +5,8 @@ php_value post_max_size 512M
 php_value memory_limit 512M
 SetEnv htaccessWorking true
 </IfModule>
+<IfModule mod_rewrite.c>
 RewriteEngine on
 RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]
+</IfModule>
 Options -Indexes
diff --git a/lib/setup.php b/lib/setup.php
index 8afe0070e9b..b53c626c9a7 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -275,7 +275,7 @@ class OC_Setup {
 		$content.= "php_value post_max_size 512M\n";
 		$content.= "SetEnv htaccessWorking true\n";
 		$content.= "</IfModule>\n";
-		$content.= "<IfModule !mod_php5.c>\n";
+		$content.= "<IfModule mod_rewrite.c>";
 		$content.= "RewriteEngine on\n";
 		$content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]\n";
 		$content.= "</IfModule>\n";
-- 
GitLab


From 9e9bc1430b6b31be67a346421c1989c2d44fad11 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 3 Jan 2012 15:55:38 +0100
Subject: [PATCH 141/546] don't check if the target path is writable for
 operations that can create a new file

fixes file upload
---
 lib/filesystem.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 627f494c937..44401260c5e 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -283,7 +283,7 @@ class OC_Filesystem{
 		return self::basicOperation('unlink',$path,array('delete'));
 	}
 	static public function rename($path1,$path2){
-		if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and self::is_writeable($path1) and self::is_writeable($path2)){
+		if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and self::is_writeable($path1) and self::isValidPath($path2)){
 			$run=true;
 			OC_Hook::emit( 'OC_Filesystem', 'rename', array( 'oldpath' => $path1 ,'newpath'=>$path2, 'run' => &$run));
 			if($run){
@@ -304,7 +304,7 @@ class OC_Filesystem{
 		}
 	}
 	static public function copy($path1,$path2){
-		if(OC_FileProxy::runPreProxies('copy',$path1,$path2) and self::is_readable($path1) and self::is_writeable($path2)){
+		if(OC_FileProxy::runPreProxies('copy',$path1,$path2) and self::is_readable($path1) and self::isValidPath($path2)){
 			$run=true;
 			OC_Hook::emit( 'OC_Filesystem', 'copy', array( 'oldpath' => $path1 ,'newpath'=>$path2, 'run' => &$run));
 			$exists=self::file_exists($path2);
@@ -365,7 +365,7 @@ class OC_Filesystem{
 		}
 	}
 	static public function fromTmpFile($tmpFile,$path){
-		if(OC_FileProxy::runPreProxies('copy',$tmpFile,$path) and self::is_writeable($path) and $storage=self::getStorage($path)){
+		if(OC_FileProxy::runPreProxies('copy',$tmpFile,$path) and self::isValidPath($path) and $storage=self::getStorage($path)){
 			$run=true;
 			$exists=self::file_exists($path);
 			if(!$exists){
@@ -385,7 +385,7 @@ class OC_Filesystem{
 		}
 	}
 	static public function fromUploadedFile($tmpFile,$path){
-		if(OC_FileProxy::runPreProxies('fromUploadedFile',$tmpFile,$path) and self::is_writeable($path) and $storage=self::getStorage($path)){
+		if(OC_FileProxy::runPreProxies('fromUploadedFile',$tmpFile,$path) and self::isValidPath($path) and $storage=self::getStorage($path)){
 			$run=true;
 			$exists=self::file_exists($path);
 			if(!$exists){
-- 
GitLab


From 868a3b5364af550492794f2093ce0aa07b938c6c Mon Sep 17 00:00:00 2001
From: prcrst <prcrst@hush.com>
Date: Tue, 3 Jan 2012 12:37:33 +0100
Subject: [PATCH 142/546] Fix sqlite detection for Ubuntu 11.10

---
 lib/util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util.php b/lib/util.php
index 9cf78da6e90..009119b54a9 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -175,7 +175,7 @@ class OC_Util {
 		$errors=array();
 
 		//check for database drivers
-		if(!is_callable('sqlite_open') and !is_callable('mysql_connect') and !is_callable('pg_connect')){
+		if(!(is_callable('sqlite_open') or class_exists('SQLite3')) and !is_callable('mysql_connect') and !is_callable('pg_connect')){
 			$errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.<br/>','hint'=>'');//TODO: sane hint
 		}
 		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
-- 
GitLab


From e0a058c732cc9d1f279cd6604623d9bf7c196744 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Tue, 3 Jan 2012 17:23:50 +0100
Subject: [PATCH 143/546] remove error output if symlink already exists. this
 can happen if a user removed config.php to trigger the setup wizzard

---
 apps/user_webfinger/appinfo/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_webfinger/appinfo/install.php b/apps/user_webfinger/appinfo/install.php
index 079043cd102..f570a3a249b 100644
--- a/apps/user_webfinger/appinfo/install.php
+++ b/apps/user_webfinger/appinfo/install.php
@@ -3,4 +3,4 @@ $appInfoDir = __DIR__;
 $thisAppDir = dirname($appInfoDir);
 $appsDir = dirname($thisAppDir);
 $ownCloudDir = dirname($appsDir);
-symlink($thisAppDir, $ownCloudDir.'/.well-known');
+@symlink($thisAppDir, $ownCloudDir.'/.well-known');
-- 
GitLab


From b6d66c4727e50ab9e9ade0e804e3fda98a120dd3 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Wed, 4 Jan 2012 15:19:16 -0500
Subject: [PATCH 144/546] Remove the keys in preferences when a user is deleted
 - Thanks rogerc

---
 lib/user.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/user.php b/lib/user.php
index 0a5881ec0f8..34f44f572e0 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -169,7 +169,8 @@ class OC_User {
 			foreach( OC_Group::getUserGroups( $uid ) as $i ){
 				OC_Group::removeFromGroup( $uid, $i );
 			}
-
+			// Delete the user's keys in preferences
+			OC_Preferences::deleteUser($uid);
 			// Emit and exit
 			OC_Hook::emit( "OC_User", "post_deleteUser", array( "uid" => $uid ));
 			return true;
-- 
GitLab


From 48a8f2a793d2154c7f9d963fda679e0c380cb273 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 4 Jan 2012 22:56:58 +0100
Subject: [PATCH 145/546] Content type header was sent when saving image to
 disk.

---
 lib/image.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index e09486be081..32568a25406 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -125,7 +125,7 @@ class OC_Image {
 	*/
 
 	public function save($filepath=null) {
-		if($filepath === null && $this->filepath === null) {
+		if($filepath === null && self::$filepath === null) {
 			OC_Log::write('core','OC_Image::save. save() called with no path.', OC_Log::ERROR);
 			return false;
 		} elseif($filepath === null && $this->filepath !== null) {
@@ -138,8 +138,8 @@ class OC_Image {
 	* @brief Outputs/saves the image.
 	*/
 	private function _output($filepath=null, $really=false) {
-		header('Content-Type: '.self::mimeType());
 		if($really === false) {
+			header('Content-Type: '.self::mimeType());
 			$filepath = null; // Just being cautious ;-)
 		} else {
 			if(!is_writable(dirname($filepath))) {
-- 
GitLab


From d80b477ab55c459cc80cf091c80f81082b7d78f9 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 4 Jan 2012 23:31:32 +0100
Subject: [PATCH 146/546] Wrong permission checking on file save.

---
 lib/image.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index 32568a25406..f120328b0e4 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -143,10 +143,10 @@ class OC_Image {
 			$filepath = null; // Just being cautious ;-)
 		} else {
 			if(!is_writable(dirname($filepath))) {
-				OC_Log::write('core','OC_Image::save. Directory \''.dirname($filepath).'\' is not writable.', OC_Log::ERROR);
+				OC_Log::write('core','OC_Image::_output. Directory \''.dirname($filepath).'\' is not writable.', OC_Log::ERROR);
 				return false;
-			} elseif(is_writable(dirname($filepath)) && !is_writable($filepath)) {
-				OC_Log::write('core','OC_Image::save. File \''.$filepath.'\' is not writable.', OC_Log::ERROR);
+			} elseif(is_writable(dirname($filepath)) && file_exists($filepath) && !is_writable($filepath)) {
+				OC_Log::write('core','OC_Image::_output. File \''.$filepath.'\' is not writable.', OC_Log::ERROR);
 				return false;
 			}
 		}
-- 
GitLab


From a88cc91ad923e6d7d128cf08e25bca645dfade00 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 5 Jan 2012 17:05:30 +0100
Subject: [PATCH 147/546] fix end for repeating events

---
 apps/calendar/ajax/editeventform.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/calendar/ajax/editeventform.php b/apps/calendar/ajax/editeventform.php
index 4783fcca897..f605f33edbb 100644
--- a/apps/calendar/ajax/editeventform.php
+++ b/apps/calendar/ajax/editeventform.php
@@ -163,16 +163,16 @@ if($data['repeating'] == 1){
 	}
 	$repeat['interval'] = $rrulearr['INTERVAL'];
 	if(array_key_exists('COUNT', $rrulearr)){
-		$end = 'count';
-		$count = $rrulearr['COUNT'];
+		$repeat['end'] = 'count';
+		$repeat['count'] = $rrulearr['COUNT'];
 	}elseif(array_key_exists('UNTIL', $rrulearr)){
-		$end = 'date';
+		$repeat['end'] = 'date';
 		$endbydate_day = substr($rrulearr['UNTIL'], 6, 2);
 		$endbydate_month = substr($rrulearr['UNTIL'], 4, 2);
 		$endbydate_year = substr($rrulearr['UNTIL'], 0, 4);
-		$endbydate = $endbydate_day . $endbydate_month . $endbydate_year;
+		$repeat['date'] = $endbydate_day . '-' .  $endbydate_month . '-' . $endbydate_year;
 	}else{
-		$end = 'never';
+		$repeat['end'] = 'never';
 	}
 	if(array_key_exists('weekdays', $repeat)){
 		$repeat_weekdays_ = array();
-- 
GitLab


From d3a0c7354c710f21cadd64493419aab73874649e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 5 Jan 2012 17:09:01 +0100
Subject: [PATCH 148/546] fix repeat rule for every weekday

---
 apps/calendar/lib/object.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index b53feb0bf0e..c834dad0f4b 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -670,7 +670,7 @@ class OC_Calendar_Object{
 					}
 					break;
 				case 'weekday':
-					$rrule .= 'FREQ=DAILY';
+					$rrule .= 'FREQ=WEEKLY';
 					$rrule .= ';BYDAY=MO,TU,WE,TH,FR';
 					break;
 				case 'biweekly':
-- 
GitLab


From 2f86a6203adc82e1221873ed72a0ac60c340d65b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 5 Jan 2012 17:42:40 +0100
Subject: [PATCH 149/546] Added fixOrientation method which rotates the image
 based on EXIF data.

---
 lib/image.php | 84 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 82 insertions(+), 2 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index f120328b0e4..45b6ad3918d 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -42,8 +42,7 @@ function ellipsis($str, $maxlen) {
 }
 
 /**
- * Class for image manipulation
- * Ideas: imagerotate, chunk_split(base64_encode())
+ * Class for basic image manipulation
  *
  */
 class OC_Image {
@@ -200,6 +199,87 @@ class OC_Image {
 		return chunk_split(base64_encode(ob_get_clean()));
 	}
 
+	/**
+	* @brief Fixes orientation based on EXIF data.
+	* @returns bool.
+	*/
+	public function fixOrientation() {
+		if(!is_resource(self::$resource)) {
+			OC_Log::write('core','OC_Image::fixOrientation() No image loaded.', OC_Log::DEBUG);
+			return false;
+		}
+		if(is_null(self::$filepath) || !is_readable(self::$filepath)) {
+			OC_Log::write('core','OC_Image::fixOrientation() No readable file path set.', OC_Log::DEBUG);
+			return false;
+		}
+		$exif = exif_read_data(self::$filepath, 'IFD0');
+		if(!$exif) {
+			return false;
+		}
+		if(!isset($exif['Orientation'])) {
+			return true; // Nothing to fix
+		}
+		$o = $exif['Orientation'];
+		OC_Log::write('core','OC_Image::fixOrientation() Orientation: '.$o, OC_Log::DEBUG);
+		$rotate = 0;
+		$flip = false;
+		switch($o) {
+			case 1:
+				$rotate = 0;
+				$flip = false;
+				break;
+			case 2: // Not tested
+				$rotate = 0;
+				$flip = true;
+				break;
+			case 3:
+				$rotate = 180;
+				$flip = false;
+				break;
+			case 4: // Not tested
+				$rotate = 180;
+				$flip = true;
+				break;
+			case 5: // Not tested
+				$rotate = 90;
+				$flip = true;
+				break;
+			case 6:
+				//$rotate = 90;
+				$rotate = 270;
+				$flip = false;
+				break;
+			case 7: // Not tested
+				$rotate = 270;
+				$flip = true;
+				break;
+			case 8:
+				$rotate = 270;
+				$flip = false;
+				break;
+		}
+		if($rotate) {
+			$res = imagerotate(self::$resource, $rotate, -1);
+			if($res) {
+				if(imagealphablending($res, true)) {
+					if(imagesavealpha($res, true)) {
+						self::$resource = $res;
+						return true;
+					} else {
+						OC_Log::write('core','OC_Image::fixOrientation() Error during alphasaving.', OC_Log::DEBUG);
+						return false;
+					}
+				} else {
+					OC_Log::write('core','OC_Image::fixOrientation() Error during alphablending.', OC_Log::DEBUG);
+					return false;
+				}
+			} else {
+				OC_Log::write('core','OC_Image::fixOrientation() Error during oriention fixing.', OC_Log::DEBUG);
+				return false;
+			}
+		}
+	}
+
 	/**
 	* @brief Loads an image from a local file, a base64 encoded string or a resource created by an imagecreate* function.
 	* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
-- 
GitLab


From edc9a150aa5cbf6898e9fadf1fdb6ba4babe8ed8 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 5 Jan 2012 17:49:09 +0100
Subject: [PATCH 150/546] fix editeventdialog for monthly repeating events with
 a specific weekday and weeknumber combination

---
 apps/calendar/ajax/editeventform.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/calendar/ajax/editeventform.php b/apps/calendar/ajax/editeventform.php
index f605f33edbb..a3870626326 100644
--- a/apps/calendar/ajax/editeventform.php
+++ b/apps/calendar/ajax/editeventform.php
@@ -67,22 +67,22 @@ if($data['repeating'] == 1){
 			if(strlen($rrulearr['BYDAY']) == 2){
 				$repeat['weekdays'] = array($rrulearr['BYDAY']);
 			}elseif(strlen($rrulearr['BYDAY']) == 3){
-				$repeat['weekofmonth'] = substr($rrulearr['BYDAY'] , 0, 1);
-				$repeat['weekdays'] = array(substr($rrulearr['BYDAY'] , 1, 2));
+				$repeat['weekofmonth'] = substr($rrulearr['BYDAY'], 0, 1);
+				$repeat['weekdays'] = array(substr($rrulearr['BYDAY'], 1, 2));
 			}elseif(strlen($rrulearr['BYDAY']) == 4){
-				$repeat['weekofmonth'] = substr($rrulearr['BYDAY'] , 0, 2);
-				$repeat['weekdays'] = array(substr($rrulearr['BYDAY'] , 2, 2));
+				$repeat['weekofmonth'] = substr($rrulearr['BYDAY'], 0, 2);
+				$repeat['weekdays'] = array(substr($rrulearr['BYDAY'], 2, 2));
 			}
 		}else{
 			$byday_days = explode(',', $rrulearr['BYDAY']);
 			foreach($byday_days as $byday_day){
 				if(strlen($byday_day) == 2){
 					$repeat['weekdays'][] = $byday_day;
-				}elseif(strlen($rrulearr['BYDAY']) == 3){
+				}elseif(strlen($byday_day) == 3){
 					$repeat['weekofmonth'] = substr($byday_day , 0, 1);
 					$repeat['weekdays'][] = substr($byday_day , 1, 2);
-				}elseif(strlen($rrulearr['BYDAY']) == 4){
-					$repeat['byweekno'] = substr($byday_day , 0, 2);
+				}elseif(strlen($byday_day) == 4){
+					$repeat['weekofmonth'] = substr($byday_day , 0, 2);
 					$repeat['weekdays'][] = substr($byday_day , 2, 2);
 				}
 			}
-- 
GitLab


From a01a3d412c9dff2f3221b0b60307026a027ae5e8 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 5 Jan 2012 17:53:13 +0100
Subject: [PATCH 151/546] fix autodetection for the week of the month

---
 apps/calendar/lib/object.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index c834dad0f4b..cbb1badf802 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -683,7 +683,8 @@ class OC_Calendar_Object{
 						break;
 					}elseif($request['advanced_month_select'] == 'weekday'){
 						if($request['weekofmonthoptions'] == 'auto'){
-							$weekofmonth = floor($request['weekofmonthoptions']/7);
+							list($_day, $_month, $_year) = explode('-', $from);
+							$weekofmonth = floor($_day/7);
 						}else{
 							$weekofmonth = $request['weekofmonthoptions'];
 						}
-- 
GitLab


From be9ca44d07a129671bd5ce53d64ef22da93d5ae9 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 5 Jan 2012 20:19:07 +0100
Subject: [PATCH 152/546] fix bug in 3rdparty lib

---
 3rdparty/when/When.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/3rdparty/when/When.php b/3rdparty/when/When.php
index 5f97f0eb9bf..f8bb9db0f67 100755
--- a/3rdparty/when/When.php
+++ b/3rdparty/when/When.php
@@ -586,7 +586,7 @@ class When
 				}
 			}
 		}
-		elseif($this->gobyday || $interval == "month")
+		elseif($this->gobyday && $interval == "month")
 		{
 			$_mdays = range(1, date('t',mktime(0,0,0,$month,1,$year)));
 			foreach($_mdays as $_mday)
@@ -621,7 +621,7 @@ class When
 		
 		if($interval == "month")
 		{
-			$this->try_date->modify('last day of ' . $this->interval . ' ' . $interval);
+			$this->try_date->modify('+1 month');
 		}
 		else
 		{
-- 
GitLab


From 486694c2ec63d9164c43c66946473fc9403c5343 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 5 Jan 2012 20:54:44 +0100
Subject: [PATCH 153/546] fix js for repeating events

---
 apps/calendar/js/calendar.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index d776f5c3fb5..ae586661ccc 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -279,9 +279,9 @@ Calendar={
 					minWidth:'auto'
 				});
 				Calendar.UI.repeat('end');
-				Calendar.UI.repeat('repeat');
 				Calendar.UI.repeat('month');
 				Calendar.UI.repeat('year');
+				Calendar.UI.repeat('repeat');
 			}
 			if(task == 'end'){
 				$('#byoccurrences').css('display', 'none');
@@ -304,12 +304,14 @@ Calendar={
 				$('#advanced_bymonthday').css('display', 'none');
 				if($('#repeat option:selected').val() == 'monthly'){
 					$('#advanced_month').css('display', 'block');
+					Calendar.UI.repeat('month');
 				}
 				if($('#repeat option:selected').val() == 'weekly'){
 					$('#advanced_weekday').css('display', 'block');
 				}
 				if($('#repeat option:selected').val() == 'yearly'){
 					$('#advanced_year').css('display', 'block');
+					Calendar.UI.repeat('year');
 				}
 				if($('#repeat option:selected').val() == 'doesnotrepeat'){
 					$('#advanced_options_repeating').slideUp('slow');
@@ -341,6 +343,7 @@ Calendar={
 					$('#advanced_weekday').css('display', 'block');
 				}
 			}
+			
 		},
 		Calendar:{
 			overview:function(){
-- 
GitLab


From cb445deb5f986da3a785999225d28ece4d043ec5 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 5 Jan 2012 21:02:11 +0100
Subject: [PATCH 154/546] fix login check in ajax files

---
 apps/calendar/ajax/editeventform.php | 4 +++-
 apps/calendar/ajax/importdialog.php  | 4 +++-
 apps/calendar/ajax/neweventform.php  | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/calendar/ajax/editeventform.php b/apps/calendar/ajax/editeventform.php
index a3870626326..95cae39c1c2 100644
--- a/apps/calendar/ajax/editeventform.php
+++ b/apps/calendar/ajax/editeventform.php
@@ -8,7 +8,9 @@
 
 require_once('../../../lib/base.php');
 
-OC_JSON::checkLoggedIn();
+if(!OC_USER::isLoggedIn()) {
+	die('<script type="text/javascript">document.location = oc_webroot;</script>');
+}
 OC_JSON::checkAppEnabled('calendar');
 
 $id = $_GET['id'];
diff --git a/apps/calendar/ajax/importdialog.php b/apps/calendar/ajax/importdialog.php
index 8d8430da7aa..983a3d95a84 100644
--- a/apps/calendar/ajax/importdialog.php
+++ b/apps/calendar/ajax/importdialog.php
@@ -10,7 +10,9 @@ require_once('../../../lib/base.php');
 
 $l10n = new OC_L10N('calendar');
 
-OC_JSON::checkLoggedIn();
+if(!OC_USER::isLoggedIn()) {
+	die('<script type="text/javascript">document.location = oc_webroot;</script>');
+}
 OC_JSON::checkAppEnabled('calendar');
 
 $tmpl = new OC_Template('calendar', 'part.import');
diff --git a/apps/calendar/ajax/neweventform.php b/apps/calendar/ajax/neweventform.php
index 88468dd3dbf..3870c879b0e 100644
--- a/apps/calendar/ajax/neweventform.php
+++ b/apps/calendar/ajax/neweventform.php
@@ -8,7 +8,9 @@
 
 require_once('../../../lib/base.php');
 
-OC_JSON::checkLoggedIn();
+if(!OC_USER::isLoggedIn()) {
+	die('<script type="text/javascript">document.location = oc_webroot;</script>');
+}
 OC_JSON::checkAppEnabled('calendar');
 
 if (!isset($_POST['start'])){
-- 
GitLab


From f18e866a1e152a1fb13cb883d89d8efde413cea9 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Fri, 6 Jan 2012 14:36:24 +0100
Subject: [PATCH 155/546] improve search function

---
 apps/calendar/index.php              |  3 +++
 apps/calendar/lib/search.php         | 27 ++++++++++++++++++++++++---
 apps/calendar/templates/calendar.php | 10 ++++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index a2042afddf1..e8e214c0b75 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -42,4 +42,7 @@ OC_Util::addStyle('', 'jquery.multiselect');
 OC_App::setActiveNavigationEntry('calendar_index');
 $tmpl = new OC_Template('calendar', 'calendar', 'user');
 $tmpl->assign('eventSources', $eventSources);
+if(array_key_exists('showevent', $_GET)){
+	$tmpl->assign('showevent', $_GET['showevent']);
+}
 $tmpl->printPage();
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
index 41faf49a519..425c93c7338 100644
--- a/apps/calendar/lib/search.php
+++ b/apps/calendar/lib/search.php
@@ -12,15 +12,36 @@ class OC_Search_Provider_Calendar extends OC_Search_Provider{
 		}else{
 			$searchquery[] = $query;
 		}
+		$user_timezone = OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
+		$l = new OC_l10n('calendar');
 		foreach($calendars as $calendar){
 			$objects = OC_Calendar_Object::all($calendar['id']);
 			foreach($objects as $object){
-				if(substr_count(strtolower($object['summary']), strtolower($query)) > 0){//$name,$text,$link,$type
-					$results[]=new OC_Search_Result($object['summary'],'','#','Cal.');
+				if(substr_count(strtolower($object['summary']), strtolower($query)) > 0){
+					$calendardata = OC_VObject::parse($object['calendardata']);
+					$vevent = $calendardata->VEVENT;
+					$dtstart = $vevent->DTSTART;
+					$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
+					$start_dt = $dtstart->getDateTime();
+					$start_dt->setTimezone(new DateTimeZone($user_timezone));
+					$end_dt = $dtend->getDateTime();
+					$end_dt->setTimezone(new DateTimeZone($user_timezone));
+					if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
+						$end_dt->modify('-1 sec');
+						if($start_dt->format('d.m.Y') != $end_dt->format('d.m.Y')){
+							$info = $l->t('Date') . ': ' . $start_dt->format('d.m.Y') . ' - ' . $end_dt->format('d.m.Y');
+						}else{
+							$info = $l->t('Date') . ': ' . $start_dt->format('d.m.Y');
+						}
+					}else{
+						$info = $l->t('Date') . ': ' . $start_dt->format('d.m.y H:i') . ' - ' . $end_dt->format('d.m.y H:i');
+					}
+					$link = OC_Helper::linkTo('apps/calendar', 'index.php?showevent='.urlencode($object['id']));
+					$results[]=new OC_Search_Result($object['summary'],$info, $link,$l->t('Cal.'));//$name,$text,$link,$type
 				}
 			}
 		}
 		return $results;
 	}
 }
-new OC_Search_Provider_Calendar();
\ No newline at end of file
+new OC_Search_Provider_Calendar();
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 13bc8bc1bb1..92c1b8a778a 100755
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -18,6 +18,16 @@
 				var missing_field_startsbeforeends = '<?php echo $l->t('The event ends before it starts') ?>';
 				var missing_field_dberror = '<?php echo $l->t('There was a database fail') ?>';
 				var totalurl = '<?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?>/calendars';
+				$(document).ready(function() {
+				<?php
+				if(array_key_exists('showevent', $_)){
+					$data = OC_Calendar_App::getEventObject($_['showevent']);
+					$date = substr($data['startdate'], 0, 10);
+					list($year, $month, $day) = explode('-', $date);
+					echo '$(\'#calendar_holder\').fullCalendar(\'gotoDate\', ' . $year . ', ' . --$month . ', ' . $day . ');';
+				}
+				?>
+				});
 				</script>
 				<div id="loading"><img src="<?php echo OC_Helper::imagePath('core', 'loading.gif'); ?>" /></div>
 				<div id="controls">
-- 
GitLab


From f9db4249a3a7b73f6c712cfa32b029e6d09595f5 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Fri, 6 Jan 2012 17:21:24 +0100
Subject: [PATCH 156/546] add a formfactor session variable which is
 autodetected but can also manually overwritten via a get variable. currently
 we have:          * default -> the normal desktop browser interface         
 * mobile -> interface for smartphones          * tablet -> interface for
 tablets          * standalone -> the default interface but without header,
 footer and sidebar. just the application. useful to use just a specific app
 on the desktop in a standalone window. In the future we should adapt the
 userinterface to the specific formfactor.

---
 lib/base.php | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/lib/base.php b/lib/base.php
index 700236c96c6..0954e3615bd 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -70,6 +70,31 @@ class OC{
 		}
 	}
 
+	/**
+	 * autodetects the formfactor of the used device
+	 * default -> the normal desktop browser interface
+	 * mobile -> interface for smartphones
+	 * tablet -> interface for tablets
+	 * standalone -> the default interface but without header, footer and sidebar. just the application. useful to ue just a specific app on the desktop in a standalone window.
+	 */
+	public static function detectFormfactor(){
+		// please add more useragent strings for other devices
+		if(isset($_SERVER['HTTP_USER_AGENT'])){
+			if(stripos($_SERVER['HTTP_USER_AGENT'],'ipad')>0) {
+				$mode='tablet';
+			}elseif(stripos($_SERVER['HTTP_USER_AGENT'],'iphone')>0){
+				$mode='mobile';
+			}elseif((stripos($_SERVER['HTTP_USER_AGENT'],'N9')>0) and (stripos($_SERVER['HTTP_USER_AGENT'],'nokia')>0)){
+				$mode='mobile';
+			}else{
+				$mode='default';
+			}
+		}else{
+			$mode='default';
+		}
+		return($mode);
+	}
+
 	public static function init(){
 		// register autoloader
 		spl_autoload_register(array('OC','autoload'));
@@ -130,6 +155,16 @@ class OC{
 		ini_set('session.cookie_httponly','1;');
 		session_start();
 
+		// if the formfactor is not yet autodetected do the autodetection now. For possible forfactors check the detectFormfactor documentation
+		if(!isset($_SESSION['formfactor'])){
+			$_SESSION['formfactor']=OC::detectFormfactor();
+		}
+		// allow manual override via GET parameter
+		if(isset($_GET['formfactor'])){
+			$_SESSION['formfactor']=$_GET['formfactor'];
+		}
+
+
 		// Add the stuff we need always
 		OC_Util::addScript( "jquery-1.6.4.min" );
 		OC_Util::addScript( "jquery-ui-1.8.14.custom.min" );
@@ -214,5 +249,7 @@ if(!function_exists('get_temp_dir')) {
 
 require_once('fakedirstream.php');
 
+
+
 // FROM search.php
 new OC_Search_Provider_File();
-- 
GitLab


From 47a275f3897bef9bb766f5b19c017f5072afef78 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Fri, 6 Jan 2012 18:04:24 +0000
Subject: [PATCH 157/546] Use  parameter

---
 lib/db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/db.php b/lib/db.php
index bcfe320665f..c7085a975ef 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -279,7 +279,7 @@ class OC_DB {
 			'output' => $file,
 			'end_of_line' => "\n"
 		);
-		self::$schema->dumpDatabase( $definition, $dump_options, MDB2_SCHEMA_DUMP_STRUCTURE );
+		self::$schema->dumpDatabase( $definition, $dump_options, $mode );
 
 		return true;
 	}
-- 
GitLab


From d485a70e7df602e85506ad94103df00f8bb3f765 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Fri, 6 Jan 2012 19:08:35 +0100
Subject: [PATCH 158/546] finish the application store feature so that users
 can download and install ownCloud apps from our website. there is still a
 small problem with write permissions. will look into this later

---
 lib/app.php       | 11 ++++++++++-
 lib/ocsclient.php | 27 +++++++++++++++++++++++++++
 settings/apps.php | 32 ++++++++++++++++----------------
 3 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index b1aa8ba354d..1873e1136cd 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -94,7 +94,15 @@ class OC_App{
 	 */
 	public static function enable( $app ){
 		if(!OC_Installer::isInstalled($app)){
-			OC_Installer::installShippedApp($app);
+			// check if app is a shipped app or not. OCS apps have an integer as id, shipped apps use a string
+			if(!is_numeric($app)){
+				OC_Installer::installShippedApp($app);
+			}else{
+                                $download=OC_OCSClient::getApplicationDownload($app,1);
+				if(isset($download['downloadlink']) and $download['downloadlink']<>'') {
+					OC_Installer::installApp(array('source'=>'http','href'=>$download['downloadlink']));
+				}
+			}
 		}
 		OC_Appconfig::setValue( $app, 'enabled', 'yes' );
 	}
@@ -107,6 +115,7 @@ class OC_App{
 	 * This function set an app as disabled in appconfig.
 	 */
 	public static function disable( $app ){
+		// check if app is a shiped app or not. if not delete
 		OC_Appconfig::setValue( $app, 'enabled', 'no' );
 	}
 
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 072fd236fee..9d5932fb720 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -130,6 +130,33 @@ class OC_OCSClient{
 		return $app;
 	}
 
+        /**
+         * @brief Get the download url for an application from the OCS server
+         * @returns array with application data
+         *
+         * This function returns an download url for an applications from the OCS server
+         */
+        public static function getApplicationDownload($id,$item){
+                $url='http://api.apps.owncloud.com/v1/content/download/'.urlencode($id).'/'.urlencode($item);
+
+                $xml=@file_get_contents($url);
+                if($xml==FALSE){
+                        OC_Log::write('core','Unable to parse OCS content',OC_Log::FATAL);
+                        return NULL;
+                }
+                $data=simplexml_load_string($xml);
+
+                $tmp=$data->data->content;
+                $app=array();
+                if(isset($tmp->downloadlink)) { 
+	 		$app['downloadlink']=$tmp->downloadlink;
+		}else{
+	 		$app['downloadlink']='';
+		}
+                return $app;
+        }
+
+
 	/**
 	 * @brief Get all the knowledgebase entries from the OCS server
 	 * @returns array with q and a data
diff --git a/settings/apps.php b/settings/apps.php
index 12a7bf77202..40b72639cd6 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -51,22 +51,22 @@ function app_sort($a, $b){
 }
 usort($apps, 'app_sort');
 
-// dissabled for now
-// $catagoryNames=OC_OCSClient::getCategories();
-// if(is_array($catagoryNames)){
-// 	$categories=array_keys($catagoryNames);
-// 	$externalApps=OC_OCSClient::getApplications($categories);
-// 	foreach($externalApps as $app){
-// 		$apps[]=array(
-// 			'name'=>$app['name'],
-// 			'id'=>$app['id'],
-// 			'active'=>false,
-// 			'description'=>$app['description'],
-// 			'author'=>$app['personid'],
-// 			'license'=>$app['license'],
-// 		);
-// 	}
-// }
+// apps from external repo via OCS
+ $catagoryNames=OC_OCSClient::getCategories();
+ if(is_array($catagoryNames)){
+ 	$categories=array_keys($catagoryNames);
+ 	$externalApps=OC_OCSClient::getApplications($categories);
+ 	foreach($externalApps as $app){
+ 		$apps[]=array(
+ 			'name'=>$app['name'],
+ 			'id'=>$app['id'],
+ 			'active'=>false,
+ 			'description'=>$app['description'],
+ 			'author'=>$app['personid'],
+ 			'license'=>$app['license'],
+ 		);
+ 	}
+ }
 
 
 
-- 
GitLab


From 064d6b8a2cbb4d1c25f5c762eac2d8cf373b526e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 6 Jan 2012 21:56:47 +0100
Subject: [PATCH 159/546] update calendar pot file

---
 l10n/templates/calendar.pot | 312 +++++++++++++++++++++++++++++-------
 1 file changed, 250 insertions(+), 62 deletions(-)

diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 56fce2285ec..ce255816ed5 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-22 13:05+0200\n"
+"POT-Creation-Date: 2012-01-06 21:55+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ajax/editeventform.php:26
-msgid "Wrong calendar"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
 msgstr ""
 
 #: ajax/settimezone.php:22
@@ -29,168 +29,312 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:21 templates/calendar.php:11
-#: templates/part.eventform.php:21
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:153
-msgid "ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}"
-msgstr ""
-
-#: js/calendar.js:155
-msgid "ddd d MMMM[ yyyy] HH:mm{ -[ ddd d MMMM yyyy] HH:mm}"
+#: lib/app.php:19
+msgid "Wrong calendar"
 msgstr ""
 
-#: lib/object.php:344
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
 msgstr ""
 
-#: lib/object.php:346
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
 msgstr ""
 
-#: lib/object.php:347
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
 msgstr ""
 
-#: lib/object.php:348
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
 msgstr ""
 
-#: lib/object.php:349
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
 msgstr ""
 
-#: lib/object.php:350
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
 msgstr ""
 
-#: lib/object.php:351
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
 msgstr ""
 
-#: lib/object.php:354
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
 msgstr ""
 
-#: lib/object.php:355
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
 msgstr ""
 
-#: lib/object.php:356
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
 msgstr ""
 
-#: lib/object.php:357
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
 msgstr ""
 
-#: lib/object.php:358
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
 msgstr ""
 
-#: lib/object.php:365
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr ""
 
-#: lib/object.php:366
+#: lib/object.php:354
 msgid "Daily"
 msgstr ""
 
-#: lib/object.php:367
+#: lib/object.php:355
 msgid "Weekly"
 msgstr ""
 
-#: lib/object.php:368
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr ""
 
-#: lib/object.php:369
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr ""
 
-#: lib/object.php:370
+#: lib/object.php:358
 msgid "Monthly"
 msgstr ""
 
-#: lib/object.php:371
+#: lib/object.php:359
 msgid "Yearly"
 msgstr ""
 
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388
+msgid "Saturday"
+msgstr ""
+
 #: lib/object.php:389
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
 msgid "Not an array"
 msgstr ""
 
-#: templates/calendar.php:8
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
 msgid "All day"
 msgstr ""
 
-#: templates/calendar.php:9
+#: templates/calendar.php:11
 msgid "Missing fields"
 msgstr ""
 
-#: templates/calendar.php:10 templates/part.eventform.php:3
+#: templates/calendar.php:12 templates/part.eventform.php:3
 msgid "Title"
 msgstr ""
 
-#: templates/calendar.php:12
+#: templates/calendar.php:14
 msgid "From Date"
 msgstr ""
 
-#: templates/calendar.php:13
+#: templates/calendar.php:15
 msgid "From Time"
 msgstr ""
 
-#: templates/calendar.php:14
+#: templates/calendar.php:16
 msgid "To Date"
 msgstr ""
 
-#: templates/calendar.php:15
+#: templates/calendar.php:17
 msgid "To Time"
 msgstr ""
 
-#: templates/calendar.php:16
+#: templates/calendar.php:18
 msgid "The event ends before it starts"
 msgstr ""
 
-#: templates/calendar.php:17
+#: templates/calendar.php:19
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:23
+#: templates/calendar.php:37
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:24
+#: templates/calendar.php:38
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:25
+#: templates/calendar.php:39
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:30
+#: templates/calendar.php:44
 msgid "Today"
 msgstr ""
 
-#: templates/calendar.php:31
+#: templates/calendar.php:45
 msgid "Calendars"
 msgstr ""
 
-#: templates/calendar.php:48
+#: templates/calendar.php:63
 msgid "There was a fail, while parsing the file."
 msgstr ""
 
@@ -216,7 +360,7 @@ msgid "Edit"
 msgstr ""
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
 msgstr ""
 
@@ -244,7 +388,7 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/part.editcalendar.php:42 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr ""
@@ -257,7 +401,7 @@ msgstr ""
 msgid "Edit an event"
 msgstr ""
 
-#: templates/part.editevent.php:9
+#: templates/part.editevent.php:10
 msgid "Export"
 msgstr ""
 
@@ -273,43 +417,83 @@ msgstr ""
 msgid "Select category"
 msgstr ""
 
-#: templates/part.eventform.php:39
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr ""
 
-#: templates/part.eventform.php:43
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr ""
 
-#: templates/part.eventform.php:51
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr ""
 
-#: templates/part.eventform.php:59
+#: templates/part.eventform.php:57
 msgid "Advanced options"
 msgstr ""
 
-#: templates/part.eventform.php:64
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr ""
 
-#: templates/part.eventform.php:80
-msgid "Attendees"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:87
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
 msgid "Location"
 msgstr ""
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:210
 msgid "Location of the Event"
 msgstr ""
 
-#: templates/part.eventform.php:95
+#: templates/part.eventform.php:216
 msgid "Description"
 msgstr ""
 
-#: templates/part.eventform.php:96
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr ""
 
@@ -353,6 +537,10 @@ msgstr ""
 msgid "Timezone"
 msgstr ""
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
 #: templates/settings.php:32
 msgid "Timeformat"
 msgstr ""
-- 
GitLab


From 33847dd1018bc21ac5b3b2b646e10c2a549828fc Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Sat, 7 Jan 2012 13:33:53 +0100
Subject: [PATCH 160/546] enable gallery and admin_export by default at least
 for the alpha and beta.

---
 apps/admin_export/appinfo/info.xml | 1 +
 apps/gallery/appinfo/info.xml      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/admin_export/appinfo/info.xml b/apps/admin_export/appinfo/info.xml
index c4a2a9b398c..df8a07c2f5b 100644
--- a/apps/admin_export/appinfo/info.xml
+++ b/apps/admin_export/appinfo/info.xml
@@ -7,4 +7,5 @@
 	<licence>AGPL</licence>
 	<author>Thomas Schmidt</author>
 	<require>2</require>
+	<default_enable/>
 </info>
diff --git a/apps/gallery/appinfo/info.xml b/apps/gallery/appinfo/info.xml
index 054ddb6f139..154b5fcf7ae 100644
--- a/apps/gallery/appinfo/info.xml
+++ b/apps/gallery/appinfo/info.xml
@@ -7,4 +7,5 @@
 	<author>Bartosz Przybylski</author>
 	<require>2</require>
 	<description></description>
-</info>
\ No newline at end of file
+	<default_enable/>
+</info>
-- 
GitLab


From 67a8ae084a6d755d27b8b936bee572c91dd84ac4 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 7 Jan 2012 14:31:47 +0100
Subject: [PATCH 161/546] fix search function

---
 apps/calendar/templates/calendar.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 92c1b8a778a..50d3d70347a 100755
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -25,6 +25,7 @@
 					$date = substr($data['startdate'], 0, 10);
 					list($year, $month, $day) = explode('-', $date);
 					echo '$(\'#calendar_holder\').fullCalendar(\'gotoDate\', ' . $year . ', ' . --$month . ', ' . $day . ');';
+					echo '$(\'#dialog_holder\').load(OC.filePath(\'calendar\', \'ajax\', \'editeventform.php\') + \'?id=\' +  ' . $_['showevent'] . ' , Calendar.UI.startEventDialog);';
 				}
 				?>
 				});
-- 
GitLab


From c3cda81577a396960fa69b651f27bad2828e0c30 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 7 Jan 2012 18:30:32 +0100
Subject: [PATCH 162/546] update calendar pot file

---
 apps/calendar/l10n/xgettextfiles  |   3 +-
 apps/calendar/templates/lAfix.php |  39 +++++++++
 l10n/templates/calendar.pot       | 128 ++++++++++++++++++++++++------
 3 files changed, 143 insertions(+), 27 deletions(-)
 create mode 100644 apps/calendar/templates/lAfix.php

diff --git a/apps/calendar/l10n/xgettextfiles b/apps/calendar/l10n/xgettextfiles
index 27b8e457193..a8c2601045f 100644
--- a/apps/calendar/l10n/xgettextfiles
+++ b/apps/calendar/l10n/xgettextfiles
@@ -8,4 +8,5 @@
 ../templates/part.eventform.php
 ../templates/part.import.php
 ../templates/part.newevent.php
-../templates/settings.php
\ No newline at end of file
+../templates/settings.php
+../templates/lAfix.php
\ No newline at end of file
diff --git a/apps/calendar/templates/lAfix.php b/apps/calendar/templates/lAfix.php
new file mode 100644
index 00000000000..61025ae6dea
--- /dev/null
+++ b/apps/calendar/templates/lAfix.php
@@ -0,0 +1,39 @@
+<?php
+$l->t('Sunday');
+$l->t('Monday');
+$l->t('Tuesday');
+$l->t('Wednesday');
+$l->t('Thursday');
+$l->t('Friday');
+$l->t('Saturday');
+$l->t('Sun.');
+$l->t('Mon.');
+$l->t('Tue.');
+$l->t('Wed.');
+$l->t('Thu.');
+$l->t('Fri.');
+$l->t('Sat.');
+$l->t('January');
+$l->t('February');
+$l->t('March');
+$l->t('April');
+$l->t('May');
+$l->t('June');
+$l->t('July');
+$l->t('August');
+$l->t('September');
+$l->t('October');
+$l->t('November');
+$l->t('December');
+$l->t('Jan.');
+$l->t('Feb.');
+$l->t('Mar.');
+$l->t('Apr.');
+$l->t('May.');
+$l->t('Jun.');
+$l->t('Jul.');
+$l->t('Aug.');
+$l->t('Sep.');
+$l->t('Oct.');
+$l->t('Nov.');
+$l->t('Dec.');
\ No newline at end of file
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index ce255816ed5..7941082926b 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-06 21:55+0100\n"
+"POT-Creation-Date: 2012-01-07 18:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -146,31 +146,31 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:383
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
 msgstr ""
 
-#: lib/object.php:384
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
 msgstr ""
 
-#: lib/object.php:385
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
 msgstr ""
 
-#: lib/object.php:386
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
 msgstr ""
 
-#: lib/object.php:387
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
 msgstr ""
 
-#: lib/object.php:388
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:389
+#: lib/object.php:389 templates/lAfix.php:2
 msgid "Sunday"
 msgstr ""
 
@@ -202,51 +202,51 @@ msgstr ""
 msgid "last"
 msgstr ""
 
-#: lib/object.php:424
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
 msgstr ""
 
-#: lib/object.php:425
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
 msgstr ""
 
-#: lib/object.php:426
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
 msgstr ""
 
-#: lib/object.php:427
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
 msgstr ""
 
-#: lib/object.php:428
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
 msgstr ""
 
-#: lib/object.php:429
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
 msgstr ""
 
-#: lib/object.php:430
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
 msgstr ""
 
-#: lib/object.php:431
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
 msgstr ""
 
-#: lib/object.php:432
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
 msgstr ""
 
-#: lib/object.php:433
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
 msgstr ""
 
-#: lib/object.php:434
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
 msgstr ""
 
-#: lib/object.php:435
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
 msgstr ""
 
@@ -314,30 +314,106 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:37
+#: templates/calendar.php:38
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr ""
 
-#: templates/calendar.php:45
+#: templates/calendar.php:46
 msgid "Calendars"
 msgstr ""
 
-#: templates/calendar.php:63
+#: templates/calendar.php:64
 msgid "There was a fail, while parsing the file."
 msgstr ""
 
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr ""
-- 
GitLab


From 9ed3c31fc99fbd33576363a79d51f5be66dc2969 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 8 Jan 2012 00:14:34 +0100
Subject: [PATCH 163/546] automatic adding of photo to album, feedback for user
 while scanning, general cleanup

---
 apps/gallery/ajax/galleryOp.php     |  4 +-
 apps/gallery/ajax/scanForAlbums.php |  2 +-
 apps/gallery/appinfo/app.php        |  3 ++
 apps/gallery/appinfo/database.xml   |  6 +++
 apps/gallery/css/styles.css         | 69 +++++------------------------
 apps/gallery/js/album_cover.js      |  4 ++
 apps/gallery/lib/album.php          | 17 ++++---
 apps/gallery/lib/hooks_handlers.php | 36 +++++++++++++++
 apps/gallery/lib/photo.php          |  2 +
 apps/gallery/lib/scanner.php        |  6 +--
 apps/gallery/templates/index.php    |  5 ++-
 11 files changed, 82 insertions(+), 72 deletions(-)
 create mode 100644 apps/gallery/lib/hooks_handlers.php

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index cd7cab202b1..8a006dda637 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -1,6 +1,6 @@
 <?
 require_once('../../../lib/base.php');
-require_once('../lib/album.php');
+require_once(OC::$CLASSPATH['OC_Gallery_Album']);
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
 
@@ -26,4 +26,4 @@ if ($_GET['operation']) {
      OC_JSON::error(array('cause' => "Unknown operation"));
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/apps/gallery/ajax/scanForAlbums.php b/apps/gallery/ajax/scanForAlbums.php
index f603cbb4971..b1f0a433a42 100644
--- a/apps/gallery/ajax/scanForAlbums.php
+++ b/apps/gallery/ajax/scanForAlbums.php
@@ -5,6 +5,6 @@ OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
 
 OC_Gallery_Scanner::cleanUp();
-OC_JSON::success(array('albums' => OC_Gallery_Scanner::scan('')));
+OC_JSON::success(array('albums' => OC_Gallery_Scanner::scan('/')));
 
 ?>
diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index 2b1ab857afc..3a2dbcb43ad 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -2,6 +2,7 @@
 OC::$CLASSPATH['OC_Gallery_Album'] = 'apps/gallery/lib/album.php';
 OC::$CLASSPATH['OC_Gallery_Photo'] = 'apps/gallery/lib/photo.php';
 OC::$CLASSPATH['OC_Gallery_Scanner'] = 'apps/gallery/lib/scanner.php';
+OC::$CLASSPATH['OC_Gallery_Hooks_Handlers'] = 'apps/gallery/lib/hooks_handlers.php';
 
 OC_App::register(array(
   'order' => 20,
@@ -28,4 +29,6 @@ OC_App::addNavigationEntry( array(
 }
 
 new OC_GallerySearchProvider();
+
+require_once('apps/gallery/lib/hooks_handlers.php');
 ?>
diff --git a/apps/gallery/appinfo/database.xml b/apps/gallery/appinfo/database.xml
index fd55b3a6fb4..db88e4c1b5a 100644
--- a/apps/gallery/appinfo/database.xml
+++ b/apps/gallery/appinfo/database.xml
@@ -27,6 +27,12 @@
 				<notnull>true</notnull>
 				<length>100</length>
 			</field>
+      <field>
+        <name>album_path</name>
+        <type>text</type>
+        <notnull>true</notnull>
+        <length>100</length>
+      </field>
 		</declaration>
 	</table>
 	<table>
diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index 53c3c0901d9..cc343ba0d08 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -1,60 +1,11 @@
-div#gallery_list {
-  margin: 90pt 20pt;
-}
-div#gallery_list.leftcontent {
-  padding-top: 15px;
-  margin: 0;
-  text-align: center;
-}
+div#gallery_list { margin: 90pt 20pt; }
+div#gallery_list.leftcontent { padding-top: 15px; margin: 0; text-align: center; }
+div#gallery_album_box { width: 200px; text-align: center; border: 0; display: inline-block; margin: 5pt; vertical-align: top; padding: 10px; border: solid 1px black; position: relative; overflow: hidden; color: #999; }
+div#gallery_album_box:hover { color: black; }
+.leftcontent div#gallery_album_box { margin: 5px; }
+div#gallery_album_box h1 { font-size: 12pt; font-family: Verdana; }
+div#gallery_album_cover { width: 199px; height: 199px; border: solid 1pt #999; padding: 0; }
+div#gallery_control_overlay { border: 0; position:absolute; right: 10pt; background-color: #333; opacity: 0.5; visibility:hidden; padding: 0 5pt; }
+div#gallery_control_overlay a { color:white; }
+#gallery_images { padding:10px 5px; }
 
-div#gallery_album_box {
-  width: 200px;
-  text-align: center;
-  border: 0;
-  display: inline-block;
-  margin: 5pt;
-  vertical-align: top;
-  padding: 10px;
-  border: solid 1px black;
-  position: relative;
-  overflow: hidden;
-  color: #999;
-}
-
-div#gallery_album_box:hover {
-  color: black; 
-}
-
-.leftcontent div#gallery_album_box {
-  margin: 5px;
-}
-
-div#gallery_album_box h1 {
-  font-size: 12pt;
-  font-family: Verdana;
-}
-
-div#gallery_album_cover {
-  width: 199px;
-  height: 199px;
-  border: solid 1pt #999;
-  padding: 0;
-}
-
-div#gallery_control_overlay {
-  border: 0;
-  position:absolute;
-  right: 10pt;
-  background-color: #333;
-  opacity: 0.5;
-  visibility:hidden;
-  padding: 0 5pt;
-}
-
-div#gallery_control_overlay a {
-  color:white;
-}
-
-#gallery_images {
-padding:10px 5px;
-}
diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index 619aa391c56..f6cb2da3103 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -31,7 +31,11 @@ function createNewAlbum() {
 }
 
 function scanForAlbums() {
+  $("#notification").fadeIn();
+  $("#notification").slideDown();
   $.getJSON('ajax/scanForAlbums.php', function(r) {
+    $("#notification").fadeOut();
+    $("#notification").slideUp();
     if (r.status == 'success') {
       window.location.reload(true);
     } else {
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 0999429c5d5..98876b891c5 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -1,9 +1,9 @@
 <?php
 
 class OC_Gallery_Album {
-	public static function create($owner, $name){
-		$stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_albums (uid_owner, album_name) VALUES (?, ?)');
-		$stmt->execute(array($owner, $name));
+	public static function create($owner, $name, $path){
+		$stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_albums (uid_owner, album_name, album_path) VALUES (?, ?, ?)');
+		$stmt->execute(array($owner, $name, $path));
 	}
 	
 	public static function rename($oldname, $newname, $owner) {
@@ -22,14 +22,21 @@ class OC_Gallery_Album {
 		return $stmt->execute($args);
 	}
 	
-	public static function find($owner, $name=null){
+  public static function find($owner, $name=null, $path=null){
 		$sql = 'SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner = ?';
 		$args = array($owner);
 		if (!is_null($name)){
 			$sql .= ' AND album_name = ?';
 			$args[] = $name;
-		}
+    }
+    if (!is_null($path)){
+      $sql .= ' AND album_path = ?';
+      $args[] = $path;
+    }
 		$stmt = OC_DB::prepare($sql);
 		return $stmt->execute($args);
 	}
+
 }
+
+?>
diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
new file mode 100644
index 00000000000..5d1e7502aa3
--- /dev/null
+++ b/apps/gallery/lib/hooks_handlers.php
@@ -0,0 +1,36 @@
+<?php
+
+OC_Hook::connect("OC_Filesystem", "post_write", "OC_Gallery_Hooks_Handlers", "addPhotoFromPath");
+
+require_once(OC::$CLASSPATH['OC_Gallery_Album']);
+require_once(OC::$CLASSPATH['OC_Gallery_Photo']);
+
+class OC_Gallery_Hooks_Handlers {
+  private static $APP_TAG = "Gallery";
+
+  private static function isPhoto($filename) {
+    if (substr(OC_Filesystem::getMimeType($filename), 0, 6) == "image/")
+      return 1;
+    return 0;
+  }
+
+  public static function addPhotoFromPath($params) {
+    if (!self::isPhoto($params['path'])) return;
+    $fullpath = $params['path'];
+    OC_Log::write(self::$APP_TAG, 'Adding file with path '. $fullpath, OC_Log::DEBUG);
+    $path = substr($fullpath, 0, strrpos($fullpath, '/'));
+    $album = OC_Gallery_Album::find(OC_User::getUser(), null, $path);
+    if ($album->numRows() == 0) {
+      $new_album_name = trim(str_replace('/', '.', $fullpath));
+      if ($new_album_name == '.') $new_album_name = 'main';
+      OC_Gallery_Album::create(OC_User::getUser(), $new_album_name, $path);
+      $album = OC_Gallery_Album::find(OC_User::getUser(), null, $path);
+    }
+    $album = $album->fetchRow();
+    $albumId = $album['album_id'];
+    OC_Gallery_Photo::create($albumId, $fullpath);
+
+  }
+}
+
+?>
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index 97d159935f5..a89a56981f5 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -25,4 +25,6 @@ class OC_Gallery_Photo{
 				.' AND photos.album_id = albums.album_id');
 		return $stmt->execute(array($owner, $album_name));
 	}
+
 }
+
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index 59c34b8e69a..f754f913001 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -21,13 +21,13 @@ class OC_Gallery_Scanner {
   public static function scanDir($path, &$albums) {
     $current_album = array('name'=> $path, 'imagesCount' => 0, 'images' => array());
     $current_album['name'] = str_replace('/', '.', str_replace(OC::$CONFIG_DATADIRECTORY, '', $current_album['name']));
-    $current_album['name'] = ($current_album['name']==='') ?
+    $current_album['name'] = ($current_album['name']==='.') ?
                              'main' :
                              trim($current_album['name'],'.');
 
     if ($dh = OC_Filesystem::opendir($path)) {
       while (($filename = readdir($dh)) !== false) {
-        $filepath = $path.'/'.$filename;
+        $filepath = ($path[strlen($path)-1]=='/'?$path:$path.'/').$filename;
         if (substr($filename, 0, 1) == '.') continue;
         if (OC_Filesystem::is_dir($filepath)) {
           self::scanDir($filepath, $albums);
@@ -41,7 +41,7 @@ class OC_Gallery_Scanner {
 
     $result = OC_Gallery_Album::find(OC_User::getUser(), $current_album['name']);
     if ($result->numRows() == 0 && count($current_album['images'])) {
-	    OC_Gallery_Album::create(OC_User::getUser(), $current_album['name']);
+	    OC_Gallery_Album::create(OC_User::getUser(), $current_album['name'], $path);
 	    $result = OC_Gallery_Album::find(OC_User::getUser(), $current_album['name']);
     }
     $albumId = $result->fetchRow();
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 0e89e448768..7c6e91a468e 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -4,9 +4,10 @@ OC_Util::addScript('gallery', 'albums');
 OC_Util::addScript('gallery', 'album_cover');
 ?>
 
+<div id="notification"><div id="gallery_notification_text">Creating thumbnails</div></div>
 <div id="controls">
-  <!--  <input type="button" value="New album" onclick="javascript:createNewAlbum();" />-->
-  <input type="button" value="Rescan" onclick="javascript:scanForAlbums();" /><br/>
+  <input type="button" value="Rescan" onclick="javascript:scanForAlbums();" />
+  <br/>
 </div>
 <div id="gallery_list">
 </div>
-- 
GitLab


From e51957b4ded8f538180e55581f4c757d2688aaa5 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 8 Jan 2012 00:22:28 +0100
Subject: [PATCH 164/546] gallery version bump to force db update

---
 apps/gallery/appinfo/info.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/gallery/appinfo/info.xml b/apps/gallery/appinfo/info.xml
index 154b5fcf7ae..ba51bf0bd55 100644
--- a/apps/gallery/appinfo/info.xml
+++ b/apps/gallery/appinfo/info.xml
@@ -2,9 +2,9 @@
 <info>
 	<id>gallery</id>
 	<name>Gallery</name>
-	<version>0.1</version>
+	<version>0.2</version>
 	<licence>AGPL</licence>
-	<author>Bartosz Przybylski</author>
+	<author>Bartek Przybylski</author>
 	<require>2</require>
 	<description></description>
 	<default_enable/>
-- 
GitLab


From 6b95d7427a7d29dd60bc8f464a04b2a004de9eaf Mon Sep 17 00:00:00 2001
From: Cloud Dumper <clouddumper@gmail.com>
Date: Fri, 6 Jan 2012 11:01:32 +0100
Subject: [PATCH 165/546] Sort results from music collection getters.

Albums and artists are now ordered by name, song by track number and name.
---
 apps/media/lib_collection.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php
index caa3ac3f479..1240f1de2f0 100644
--- a/apps/media/lib_collection.php
+++ b/apps/media/lib_collection.php
@@ -127,7 +127,7 @@ class OC_MEDIA_COLLECTION{
 			$search='%';
 		}
 		$query=OC_DB::prepare("SELECT DISTINCT *PREFIX*media_artists.artist_name AS artist_name , *PREFIX*media_artists.artist_id AS artist_id FROM *PREFIX*media_artists
-			INNER JOIN *PREFIX*media_songs ON *PREFIX*media_artists.artist_id=*PREFIX*media_songs.song_artist WHERE artist_name LIKE ? AND *PREFIX*media_songs.song_user=?");
+			INNER JOIN *PREFIX*media_songs ON *PREFIX*media_artists.artist_id=*PREFIX*media_songs.song_artist WHERE artist_name LIKE ? AND *PREFIX*media_songs.song_user=? ORDER BY artist_name");
 		return $query->execute(array($search,self::$uid))->fetchAll();
 	}
 	
@@ -160,7 +160,7 @@ class OC_MEDIA_COLLECTION{
 	*/
 	static public function getAlbums($artist=0,$search='%',$exact=false){
 		$cmd="SELECT DISTINCT *PREFIX*media_albums.album_name AS album_name , *PREFIX*media_albums.album_artist AS album_artist , *PREFIX*media_albums.album_id AS album_id
-			FROM *PREFIX*media_albums INNER JOIN *PREFIX*media_songs ON *PREFIX*media_albums.album_id=*PREFIX*media_songs.song_album WHERE *PREFIX*media_songs.song_user=? ";
+			FROM *PREFIX*media_albums INNER JOIN *PREFIX*media_songs ON *PREFIX*media_albums.album_id=*PREFIX*media_songs.song_album WHERE *PREFIX*media_songs.song_user=? ORDER BY album_name";
 		$params=array(self::$uid);
 		if($artist!=0){
 			$cmd.="AND *PREFIX*media_albums.album_artist = ? ";
@@ -233,7 +233,7 @@ class OC_MEDIA_COLLECTION{
 		}else{
 			$searchString='';
 		}
-		$query=OC_DB::prepare("SELECT * FROM *PREFIX*media_songs WHERE song_user=? $artistString $albumString $searchString");
+		$query=OC_DB::prepare("SELECT * FROM *PREFIX*media_songs WHERE song_user=? $artistString $albumString $searchString ORDER BY song_track, song_name");
 		return $query->execute($params)->fetchAll();
 	}
 	
@@ -378,4 +378,4 @@ class OC_MEDIA_COLLECTION{
 	}
 }
 
-?>
\ No newline at end of file
+?>
-- 
GitLab


From 5b57cd310e08b00c7bfc3821a3c2d6d8b48405b5 Mon Sep 17 00:00:00 2001
From: Cloud Dumper <clouddumper@gmail.com>
Date: Fri, 6 Jan 2012 11:29:15 +0100
Subject: [PATCH 166/546] Also use track_number to retrieve song track.

This adds support for id3v2 tags such as TRACK/TOTAL.
---
 apps/media/lib_scanner.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
index c2bea2d836d..320b1f79199 100644
--- a/apps/media/lib_scanner.php
+++ b/apps/media/lib_scanner.php
@@ -120,7 +120,20 @@ class OC_MEDIA_SCANNER{
 				$title=stripslashes($data['comments']['title'][0]);
 			}
 			$size=$data['filesize'];
-			$track=(isset($data['comments']['track']))?$data['comments']['track'][0]:0;
+			if (isset($data['comments']['track']))
+			{
+				$track = $data['comments']['track'][0];
+			}
+			else if (isset($data['comments']['track_number']))
+			{
+				$track = $data['comments']['track_number'][0];
+				$track = explode('/',$track);
+				$track = $track[0];
+			}
+			else
+			{
+				$track = 0;
+			}
 			$length=isset($data['playtime_seconds'])?round($data['playtime_seconds']):0;
 		}
 		if(!isset(self::$artists[$artist])){
-- 
GitLab


From 2de3b4bd1738cfce48d7c003316e13e988819898 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 8 Jan 2012 01:32:11 +0100
Subject: [PATCH 167/546] rename and delete hooks

---
 apps/gallery/lib/hooks_handlers.php | 65 ++++++++++++++++++++++++++---
 apps/gallery/lib/photo.php          | 15 ++++++-
 2 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
index 5d1e7502aa3..1bddaf363e3 100644
--- a/apps/gallery/lib/hooks_handlers.php
+++ b/apps/gallery/lib/hooks_handlers.php
@@ -1,6 +1,8 @@
 <?php
 
 OC_Hook::connect("OC_Filesystem", "post_write", "OC_Gallery_Hooks_Handlers", "addPhotoFromPath");
+OC_Hook::connect("OC_Filesystem", "delete", "OC_Gallery_Hooks_Handlers", "removePhoto");
+OC_Hook::connect("OC_Filesystem", "post_rename", "OC_Gallery_Hooks_Handlers", "renamePhoto");
 
 require_once(OC::$CLASSPATH['OC_Gallery_Album']);
 require_once(OC::$CLASSPATH['OC_Gallery_Photo']);
@@ -14,23 +16,76 @@ class OC_Gallery_Hooks_Handlers {
     return 0;
   }
 
+  private static function createAlbum($path) {
+    $new_album_name = trim(str_replace('/', '.', $path), '.');
+    if ($new_album_name == '') $new_album_name = 'main';
+
+    OC_Log::write(self::$APP_TAG, 'Creating new album '.$new_album_name, OC_Log::DEBUG);
+    OC_Gallery_Album::create(OC_User::getUser(), $new_album_name, $path);
+
+    return OC_Gallery_Album::find(OC_User::getUser(), null, $path);
+  }
+
   public static function addPhotoFromPath($params) {
     if (!self::isPhoto($params['path'])) return;
     $fullpath = $params['path'];
     OC_Log::write(self::$APP_TAG, 'Adding file with path '. $fullpath, OC_Log::DEBUG);
     $path = substr($fullpath, 0, strrpos($fullpath, '/'));
     $album = OC_Gallery_Album::find(OC_User::getUser(), null, $path);
+
     if ($album->numRows() == 0) {
-      $new_album_name = trim(str_replace('/', '.', $fullpath));
-      if ($new_album_name == '.') $new_album_name = 'main';
-      OC_Gallery_Album::create(OC_User::getUser(), $new_album_name, $path);
-      $album = OC_Gallery_Album::find(OC_User::getUser(), null, $path);
+      $album = self::createAlbum($path);
     }
     $album = $album->fetchRow();
     $albumId = $album['album_id'];
-    OC_Gallery_Photo::create($albumId, $fullpath);
+    $photo = OC_Gallery_Photo::find($albumId, $fullpath);
+    if ($photo->numRows() == 0) { // don't duplicate photo entries
+      OC_Log::write(self::$APP_TAG, 'Adding new photo to album', OC_Log::DEBUG);
+      OC_Gallery_Photo::create($albumId, $fullpath);
+    }
 
   }
+
+  public static function removePhoto($params) {
+    $path = $params['path'];
+    if (!self::isPhoto($path)) return;
+    OC_Gallery_Photo::removeByPath($path);
+  }
+
+  public static function renamePhoto($params) {
+    $olddir = substr($params['oldpath'], 0, strrpos($params['oldpath'], '/'));
+    $newdir = substr($params['newpath'], 0, strrpos($params['newpath'], '/'));
+    if (!self::isPhoto($params['newpath'])) return;
+    $album;
+    $newAlbumId;
+    $oldAlbumId;
+    if ($olddir == $newdir) {
+      // album changing is not needed
+      $album = OC_Gallery_Album::find(OC_User::getUser(), null, $olddir);
+      if ($album->numRows() == 0) {
+        $album = self::createAlbum($newdir);
+      }
+      $album = $album->fetchRow();
+      $newAlbumId = $oldAlbumId = $album['album_id'];
+    } else {
+      $newalbum = OC_Gallery_Album::find(OC_User::getUser(), null, $newdir);
+      $oldalbum = OC_Gallery_Album::find(OC_User::getUser(), null, $olddir);
+
+      if ($newalbum->numRows() == 0) {
+        $newalbum = self::createAlbum($newdir);
+      }
+      $newalbum = $newalbum->fetchRow();
+      if ($oldalbum->numRows() == 0) {
+        OC_Gallery_Photo::create($newalbum['album_id'], $params['newpath']);
+        return;
+      }
+      $oldalbum = $oldalbum->fetchRow();
+      $newAlbumId = $newalbum['album_id'];
+      $oldAlbumId = $oldalbum['album_id'];
+
+    }
+    OC_Gallery_Photo::changePath($oldAlbumId, $newAlbumId, $params['oldpath'], $params['newpath']);
+  }
 }
 
 ?>
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index a89a56981f5..f8a640819a1 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -8,7 +8,6 @@ class OC_Gallery_Photo{
 	public static function find($albumId, $img=null){
 		$sql = 'SELECT * FROM *PREFIX*gallery_photos WHERE album_id = ?';
 		$args = array($albumId);
-		$args = array($albumId);
 		if (!is_null($img)){
 			$sql .= ' AND file_path = ?';
 			$args[] = $img;
@@ -26,5 +25,19 @@ class OC_Gallery_Photo{
 		return $stmt->execute(array($owner, $album_name));
 	}
 
+  public static function removeByPath($path) {
+    $stmt = OC_DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE file_path = ?');
+    $stmt->execute(array($path));
+  }
+
+  public static function removeById($id) {
+    $stmt = OC_DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE photo_id = ?');
+    $stmt->execute(array($id));
+  }
+
+  public static function changePath($oldAlbumId, $newAlbumId, $oldpath, $newpath) {
+    $stmt = OC_DB::prepare("UPDATE *PREFIX*gallery_photos SET file_path = ?, album_id = ? WHERE album_id = ? and file_path = ?");
+    $stmt->execute(array($newpath, $newAlbumId, $oldAlbumId, $oldpath));
+  }
 }
 
-- 
GitLab


From 6c09d9e0f8a22c77ff6ebf83e4e44de3aeb6be3e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sat, 12 Nov 2011 18:06:07 +0100
Subject: [PATCH 168/546] some fixes in the sqlite3 driver

---
 lib/MDB2/Driver/Manager/sqlite3.php |  2 +-
 lib/MDB2/Driver/Reverse/sqlite3.php | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/MDB2/Driver/Manager/sqlite3.php b/lib/MDB2/Driver/Manager/sqlite3.php
index c5c19a90fb5..7e30755fc3a 100644
--- a/lib/MDB2/Driver/Manager/sqlite3.php
+++ b/lib/MDB2/Driver/Manager/sqlite3.php
@@ -798,7 +798,7 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
             return $db;
         }
 
-        $query = "SELECT name FROM sqlite_master WHERE type='table' AND sql NOT NULL ORDER BY name";
+        $query = "SELECT name FROM sqlite_master WHERE type='table' AND sql NOT NULL AND name!='sqlite_sequence' ORDER BY name";
         $table_names = $db->queryCol($query);
         if (PEAR::isError($table_names)) {
             return $table_names;
diff --git a/lib/MDB2/Driver/Reverse/sqlite3.php b/lib/MDB2/Driver/Reverse/sqlite3.php
index d5595da84c5..33e5b590268 100644
--- a/lib/MDB2/Driver/Reverse/sqlite3.php
+++ b/lib/MDB2/Driver/Reverse/sqlite3.php
@@ -69,7 +69,7 @@ class MDB2_Driver_Reverse_sqlite3 extends MDB2_Driver_Reverse_Common
             return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
                 'unexpected empty table column definition list', __FUNCTION__);
         }
-        $regexp = '/^\s*([^\s]+) +(CHAR|VARCHAR|VARCHAR2|TEXT|BOOLEAN|SMALLINT|INT|INTEGER|DECIMAL|BIGINT|DOUBLE|FLOAT|DATETIME|DATE|TIME|LONGTEXT|LONGBLOB)( ?\(([1-9][0-9]*)(:([1-9][0-9]*))?\))?( NULL| NOT NULL)?( UNSIGNED)?( NULL| NOT NULL)?( PRIMARY KEY)?( DEFAULT (\'[^\']*\'|[^ ]+))?( NULL| NOT NULL)?( PRIMARY KEY)?(\s*\-\-.*)?$/i';
+        $regexp = '/^\s*([^\s]+) +(CHAR|VARCHAR|VARCHAR2|TEXT|BOOLEAN|SMALLINT|INT|INTEGER|DECIMAL|BIGINT|DOUBLE|FLOAT|DATETIME|DATE|TIME|LONGTEXT|LONGBLOB)( ?\(([1-9][0-9]*)(:([1-9][0-9]*))?\))?( NULL| NOT NULL)?( UNSIGNED)?( NULL| NOT NULL)?( PRIMARY KEY)?( AUTOINCREMENT)?( DEFAULT (\'[^\']*\'|[^ ]+))?( NULL| NOT NULL)?( PRIMARY KEY)?(\s*\-\-.*)?$/i';
         $regexp2 = '/^\s*([^ ]+) +(PRIMARY|UNIQUE|CHECK)$/i';
         for ($i=0, $j=0; $i<$count; ++$i) {
             if (!preg_match($regexp, trim($column_sql[$i]), $matches)) {
@@ -90,11 +90,16 @@ class MDB2_Driver_Reverse_sqlite3 extends MDB2_Driver_Reverse_Common
             if (isset($matches[8]) && strlen($matches[8])) {
                 $columns[$j]['unsigned'] = true;
             }
-            if (isset($matches[9]) && strlen($matches[9])) {
+            if (isset($matches[10]) && strlen($matches[10])) {
                 $columns[$j]['autoincrement'] = true;
+                $columns[$j]['notnull']=true;
             }
-            if (isset($matches[12]) && strlen($matches[12])) {
-                $default = $matches[12];
+            if (isset($matches[10]) && strlen($matches[10])) {
+                $columns[$j]['autoincrement'] = true;
+                $columns[$j]['notnull']=true;
+            }
+            if (isset($matches[13]) && strlen($matches[13])) {
+                $default = $matches[13];
                 if (strlen($default) && $default[0]=="'") {
                     $default = str_replace("''", "'", substr($default, 1, strlen($default)-2));
                 }
@@ -107,8 +112,8 @@ class MDB2_Driver_Reverse_sqlite3 extends MDB2_Driver_Reverse_Common
                 $columns[$j]['notnull'] = ($matches[7] === ' NOT NULL');
             } else if (isset($matches[9]) && strlen($matches[9])) {
                 $columns[$j]['notnull'] = ($matches[9] === ' NOT NULL');
-            } else if (isset($matches[13]) && strlen($matches[13])) {
-                $columns[$j]['notnull'] = ($matches[13] === ' NOT NULL');
+            } else if (isset($matches[14]) && strlen($matches[14])) {
+                $columns[$j]['notnull'] = ($matches[14] === ' NOT NULL');
             }
             ++$j;
         }
-- 
GitLab


From 91a9688d0742b5c1af7d0b52da7a57e49e1e3e45 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 13 Nov 2011 16:06:29 +0100
Subject: [PATCH 169/546] minor changes to mysql setup

---
 lib/setup.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/setup.php b/lib/setup.php
index b53c626c9a7..d454c17599d 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -160,8 +160,8 @@ class OC_Setup {
 
 						//add prefix to the postgresql user name to prevent collissions
 						$dbusername='oc_'.$username;
-						//hash the password so we don't need to store the admin config in the config file
-						$dbpassword=md5(time().$password);
+						//create a new password so we don't need to store the admin config in the config file
+						$dbpassword=md5(time());
 						
 						self::pg_createDBUser($dbusername, $dbpassword, $connection);
 						
@@ -221,7 +221,7 @@ class OC_Setup {
 	}
 
 	public static function createDatabase($name,$user,$connection) {
-		//we cant user OC_BD functions here because we need to connect as the administrative user.
+		//we cant use OC_BD functions here because we need to connect as the administrative user.
 		$query = "CREATE DATABASE IF NOT EXISTS  `$name`";
 		$result = mysql_query($query, $connection);
 		if(!$result) {
@@ -243,7 +243,7 @@ class OC_Setup {
 	}
 
 	public static function pg_createDatabase($name,$user,$connection) {
-		//we cant user OC_BD functions here because we need to connect as the administrative user.
+		//we cant use OC_BD functions here because we need to connect as the administrative user.
 		$query = "CREATE DATABASE $name OWNER $user";
 		$result = pg_query($connection, $query);
 		if(!$result) {
-- 
GitLab


From 9a4e37483b9c6d7c6e287a9c95a408fc0249e8f9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 13 Nov 2011 16:08:47 +0100
Subject: [PATCH 170/546] small fix in sqlite3 driver

---
 lib/MDB2/Driver/Manager/sqlite3.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/MDB2/Driver/Manager/sqlite3.php b/lib/MDB2/Driver/Manager/sqlite3.php
index 7e30755fc3a..71b9597d202 100644
--- a/lib/MDB2/Driver/Manager/sqlite3.php
+++ b/lib/MDB2/Driver/Manager/sqlite3.php
@@ -168,9 +168,6 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
         if (PEAR::isError($query_fields)) {
             return $query_fields;
         }
-        if (!empty($options['primary'])) {
-            $query_fields.= ', PRIMARY KEY ('.implode(', ', array_keys($options['primary'])).')';
-        }
         if (!empty($options['foreign_keys'])) {
             foreach ($options['foreign_keys'] as $fkname => $fkdef) {
                 if (empty($fkdef)) {
-- 
GitLab


From ecf6f2ca2f74abbfdc72788c502ef5a015dc890a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 13 Nov 2011 16:16:21 +0100
Subject: [PATCH 171/546] automatically upgrade the main database on version
 number increase (doesnt work with sqlite for now)

---
 lib/base.php | 10 ++++++++--
 lib/db.php   |  9 ++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 0954e3615bd..803c0118e20 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -152,6 +152,12 @@ class OC{
 			}
 		}
 
+		$installedVersion=OC_Config::getValue('version','0.0.0');
+		$currentVersion=implode('.',OC_Util::getVersion());
+		if (version_compare($currentVersion, $installedVersion, '>')) {
+			OC_DB::updateDbFromStructure('../db_structure.xml');
+		}
+
 		ini_set('session.cookie_httponly','1;');
 		session_start();
 
@@ -230,8 +236,6 @@ if( !isset( $RUNTIME_NOAPPS )){
 	$RUNTIME_NOAPPS = false;
 }
 
-OC::init();
-
 if(!function_exists('get_temp_dir')) {
 	function get_temp_dir() {
 		if( $temp=ini_get('upload_tmp_dir') )        return $temp;
@@ -247,6 +251,8 @@ if(!function_exists('get_temp_dir')) {
 	}
 }
 
+OC::init();
+
 require_once('fakedirstream.php');
 
 
diff --git a/lib/db.php b/lib/db.php
index c7085a975ef..05ed8398b7b 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -338,7 +338,6 @@ class OC_DB {
 	 * @param $file file to read structure from
 	 */
 	public static function updateDbFromStructure($file){
-		$CONFIG_DBNAME  = OC_Config::getValue( "dbname", "owncloud" );
 		$CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
 		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
 
@@ -347,17 +346,17 @@ class OC_DB {
 		// read file
 		$content = file_get_contents( $file );
 		
+		$previousSchema = self::$schema->getDefinitionFromDatabase();
+
 		// Make changes and save them to a temporary file
 		$file2 = tempnam( get_temp_dir(), 'oc_db_scheme_' );
-		$content = str_replace( '*dbname*', $CONFIG_DBNAME, $content );
+		$content = str_replace( '*dbname*', $previousSchema['name'], $content );
 		$content = str_replace( '*dbprefix*', $CONFIG_DBTABLEPREFIX, $content );
 		if( $CONFIG_DBTYPE == 'pgsql' ){ //mysql support it too but sqlite doesn't
 			$content = str_replace( '<default>0000-00-00 00:00:00</default>', '<default>CURRENT_TIMESTAMP</default>', $content );
 		}
 		file_put_contents( $file2, $content );
-		$previousSchema = self::$schema->getDefinitionFromDatabase();
-		$op = $schema->updateDatabase($file2, $previousSchema, array(), false);
-
+		$op = self::$schema->updateDatabase($file2, $previousSchema, array(), false);
 		if (PEAR::isError($op)) {
 		    $error = $op->getMessage();
 		    OC_Log::write('core','Failed to update database structure ('.$error.')',OC_Log::FATAL);
-- 
GitLab


From 09a53170a309677b344b25d9820ef038a0e87929 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 15 Nov 2011 15:58:12 +0100
Subject: [PATCH 172/546] fixes in the sqlite manager driver

---
 lib/MDB2/Driver/Manager/sqlite3.php | 72 ++++++++++++++++++++---------
 1 file changed, 49 insertions(+), 23 deletions(-)

diff --git a/lib/MDB2/Driver/Manager/sqlite3.php b/lib/MDB2/Driver/Manager/sqlite3.php
index 71b9597d202..a6fde69d6c4 100644
--- a/lib/MDB2/Driver/Manager/sqlite3.php
+++ b/lib/MDB2/Driver/Manager/sqlite3.php
@@ -531,9 +531,26 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
             return MDB2_OK;
         }
 
+        if (empty($changes['remove']) and empty($changes['rename']) and empty($changes['change']) ){//if only rename or add changes are required, we can use ALTER TABLE
+			$query = '';
+			if (!empty($changes['name'])) {
+				$change_name = $db->quoteIdentifier($changes['name'], true);
+				$query = 'RENAME TO ' . $change_name;
+				$db->exec("ALTER TABLE $name $query");
+			}
+
+			if (!empty($changes['add']) && is_array($changes['add'])) {
+				foreach ($changes['add'] as $field_name => $field) {
+					$query= 'ADD ' . $db->getDeclaration($field['type'], $field_name, $field);
+					$db->exec("ALTER TABLE $name $query");
+				}
+			}
+			return MDB2_OK;
+        }
+
         $db->loadModule('Reverse', null, true);
 
-        // actually sqlite 2.x supports no ALTER TABLE at all .. so we emulate it
+        // for other operations we need to emulate them with sqlite3
         $fields = $db->manager->listTableFields($name);
         if (PEAR::isError($fields)) {
             return $fields;
@@ -633,16 +650,10 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
             }
         }
 
+		//rename the old table so we can create the new one
+        $db->exec("ALTER TABLE $name RENAME TO __$name");
         $data = null;
-        if (!empty($select_fields)) {
-            $query = 'SELECT '.implode(', ', $select_fields).' FROM '.$db->quoteIdentifier($name, true);
-            $data = $db->queryAll($query, null, MDB2_FETCHMODE_ORDERED);
-        }
 
-        $result = $this->dropTable($name);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
 
         $result = $this->createTable($name_new, $fields, $options);
         if (PEAR::isError($result)) {
@@ -657,20 +668,35 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
             $this->createConstraint($name_new, $constraint, $definition);
         }
 
-        if (!empty($select_fields) && !empty($data)) {
-            $query = 'INSERT INTO '.$db->quoteIdentifier($name_new, true);
-            $query.= '('.implode(', ', array_slice(array_keys($fields), 0, count($select_fields))).')';
-            $query.=' VALUES (?'.str_repeat(', ?', (count($select_fields) - 1)).')';
-            $stmt =$db->prepare($query, null, MDB2_PREPARE_MANIP);
-            if (PEAR::isError($stmt)) {
-                return $stmt;
-            }
-            foreach ($data as $row) {
-                $result = $stmt->execute($row);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
+        //fill the new table with data from the old one
+        if (!empty($select_fields)) {
+			$query = 'INSERT INTO '.$db->quoteIdentifier($name_new, true);
+			$query.= '('.implode(', ', array_slice(array_keys($fields), 0, count($select_fields))).')';
+            $query .= ' SELECT '.implode(', ', $select_fields).' FROM '.$db->quoteIdentifier('__'.$name, true);
+            $db->exec($query);
+        }
+
+//         if (!empty($select_fields) && !empty($data)) {
+//             $query = 'INSERT INTO '.$db->quoteIdentifier($name_new, true);
+//             $query.= '('.implode(', ', array_slice(array_keys($fields), 0, count($select_fields))).')';
+//             $query.=' VALUES (?'.str_repeat(', ?', (count($select_fields) - 1)).')';
+//             $stmt =$db->prepare($query, null, MDB2_PREPARE_MANIP);
+//             if (PEAR::isError($stmt)) {
+//                 return $stmt;
+//             }
+//             foreach ($data as $row) {
+//                 $result = $stmt->execute($row);
+//                 if (PEAR::isError($result)) {
+//                     return $result;
+//                 }
+//             }
+//         }
+        echo "changes $name";
+
+        //remove the old table
+        $result = $this->dropTable('__'.$name);
+        if (PEAR::isError($result)) {
+            return $result;
         }
         return MDB2_OK;
     }
-- 
GitLab


From c6aa0f9854a2e598c6bb2cd2d0b6ffce7a9c6e64 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 15 Nov 2011 15:59:01 +0100
Subject: [PATCH 173/546] set the installed version after updating the database

---
 lib/base.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/base.php b/lib/base.php
index 803c0118e20..7b42d56f522 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -156,6 +156,7 @@ class OC{
 		$currentVersion=implode('.',OC_Util::getVersion());
 		if (version_compare($currentVersion, $installedVersion, '>')) {
 			OC_DB::updateDbFromStructure('../db_structure.xml');
+			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
 		}
 
 		ini_set('session.cookie_httponly','1;');
-- 
GitLab


From 001d06f2ff4a641ff76b4d67a3a33cbdbf5b2bb5 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 15 Nov 2011 16:08:08 +0100
Subject: [PATCH 174/546] fix errors during database migration

---
 lib/MDB2/Driver/Manager/sqlite3.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/MDB2/Driver/Manager/sqlite3.php b/lib/MDB2/Driver/Manager/sqlite3.php
index a6fde69d6c4..8f4e1312eb8 100644
--- a/lib/MDB2/Driver/Manager/sqlite3.php
+++ b/lib/MDB2/Driver/Manager/sqlite3.php
@@ -660,13 +660,15 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
             return $result;
         }
 
-        foreach ($indexes as $index => $definition) {
-            $this->createIndex($name_new, $index, $definition);
-        }
+        //these seem to only give errors
 
-        foreach ($constraints as $constraint => $definition) {
-            $this->createConstraint($name_new, $constraint, $definition);
-        }
+//         foreach ($indexes as $index => $definition) {
+//             $this->createIndex($name_new, $index, $definition);
+//         }
+
+//         foreach ($constraints as $constraint => $definition) {
+//             $this->createConstraint($name_new, $constraint, $definition);
+//         }
 
         //fill the new table with data from the old one
         if (!empty($select_fields)) {
@@ -691,7 +693,6 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
 //                 }
 //             }
 //         }
-        echo "changes $name";
 
         //remove the old table
         $result = $this->dropTable('__'.$name);
-- 
GitLab


From fea68e08b4f0aa52ebd051e4428ff5abd8284f5c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 11 Dec 2011 22:08:01 +0100
Subject: [PATCH 175/546] update apps when their version number increases

---
 lib/app.php  | 29 +++++++++++++++++++++++++++++
 lib/base.php |  2 ++
 2 files changed, 31 insertions(+)

diff --git a/lib/app.php b/lib/app.php
index 1873e1136cd..6b35cdffec9 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -371,4 +371,33 @@ class OC_App{
 		}
 		return $apps;
 	}
+	
+	/**
+	 * check if any apps need updating and update those
+	 */
+	public static function updateApps(){
+		// The rest comes here
+		$apps = OC_Appconfig::getApps();
+		foreach( $apps as $app ){
+			$installedVersion=OC_Appconfig::getValue($app,'installed_version');
+			$appInfo=OC_App::getAppInfo($app);
+			$currentVersion=$appInfo['version'];
+			if (version_compare($currentVersion, $installedVersion, '>')) {
+				OC_App::updateApp($app);
+			}
+		}
+	}
+	
+	/**
+	 * update the database for the app and call the update script
+	 * @param string appid
+	 */
+	public static function updateApp($appid){
+		if(file_exists(OC::$SERVERROOT.'/apps/'.$file.'/appinfo/database.xml')){
+			OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/apps/'.$file.'/appinfo/database.xml');
+		}
+		if(file_exists(OC::$SERVERROOT.'/apps/'.$file.'/appinfo/update.php')){
+			include OC::$SERVERROOT.'/apps/'.$file.'/appinfo/update.php';
+		}
+	}
 }
diff --git a/lib/base.php b/lib/base.php
index 7b42d56f522..c3965c9cd39 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -159,6 +159,8 @@ class OC{
 			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
 		}
 
+		OC_App::updateApps();
+
 		ini_set('session.cookie_httponly','1;');
 		session_start();
 
-- 
GitLab


From 010bfa11e363928f4c3a6d8518cbab0e79e28149 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sun, 1 Jan 2012 16:58:51 -0500
Subject: [PATCH 176/546] Fix updateApp() and add extra check to updateApps()

---
 lib/app.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index 6b35cdffec9..13c4cef32b4 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -381,9 +381,11 @@ class OC_App{
 		foreach( $apps as $app ){
 			$installedVersion=OC_Appconfig::getValue($app,'installed_version');
 			$appInfo=OC_App::getAppInfo($app);
-			$currentVersion=$appInfo['version'];
-			if (version_compare($currentVersion, $installedVersion, '>')) {
-				OC_App::updateApp($app);
+			if (isset($appInfo['version'])) {
+				$currentVersion=$appInfo['version'];
+				if (version_compare($currentVersion, $installedVersion, '>')) {
+					OC_App::updateApp($app);
+				}
 			}
 		}
 	}
@@ -393,11 +395,11 @@ class OC_App{
 	 * @param string appid
 	 */
 	public static function updateApp($appid){
-		if(file_exists(OC::$SERVERROOT.'/apps/'.$file.'/appinfo/database.xml')){
-			OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/apps/'.$file.'/appinfo/database.xml');
+		if(file_exists(OC::$SERVERROOT.'/apps/'.$appid.'/appinfo/database.xml')){
+			OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/apps/'.$appid.'/appinfo/database.xml');
 		}
-		if(file_exists(OC::$SERVERROOT.'/apps/'.$file.'/appinfo/update.php')){
-			include OC::$SERVERROOT.'/apps/'.$file.'/appinfo/update.php';
+		if(file_exists(OC::$SERVERROOT.'/apps/'.$appid.'/appinfo/update.php')){
+			include OC::$SERVERROOT.'/apps/'.$appid.'/appinfo/update.php';
 		}
 	}
 }
-- 
GitLab


From 034cf19159c828d242fbb3128fda6db815a75ca6 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 8 Jan 2012 02:57:52 +0100
Subject: [PATCH 177/546] allow changing database backends between PDO and MDB2

---
 lib/db.php | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/lib/db.php b/lib/db.php
index 05ed8398b7b..58a478ba0c0 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -71,7 +71,14 @@ class OC_DB {
 	/**
 	 * connect to the database using pdo
 	 */
-	private static function connectPDO(){
+	public static function connectPDO(){
+		if(self::$connection){
+			if(self::$backend==self::BACKEND_MDB2){
+				self::disconnect();
+			}else{
+				return;
+			}
+		}
 		// The global data we need
 		$name = OC_Config::getValue( "dbname", "owncloud" );
 		$host = OC_Config::getValue( "dbhost", "" );
@@ -113,7 +120,14 @@ class OC_DB {
 	/**
 	 * connect to the database using mdb2
 	 */
-	static private function connectMDB2(){
+	public static function connectMDB2(){
+		if(self::$connection){
+			if(self::$backend==self::BACKEND_PDO){
+				self::disconnect();
+			}else{
+				return;
+			}
+		}
 		// The global data we need
 		$name = OC_Config::getValue( "dbname", "owncloud" );
 		$host = OC_Config::getValue( "dbhost", "" );
@@ -255,8 +269,8 @@ class OC_DB {
 				self::$connection->disconnect();
 			}
 			self::$connection=false;
-			self::$mdb2=false;
-			self::$pdo=false;
+			self::$MDB2=false;
+			self::$PDO=false;
 		}
 
 		return true;
@@ -374,6 +388,7 @@ class OC_DB {
 	private static function connectScheme(){
 		// We need a mdb2 database connection
 		self::connectMDB2();
+		self::$MDB2->loadModule('Manager');
 
 		// Connect if this did not happen before
 		if(!self::$schema){
-- 
GitLab


From 21c4515465748f4ed38a4dc14382d22649711c08 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 8 Jan 2012 11:01:25 +0100
Subject: [PATCH 178/546] rename fix, licence header added

---
 apps/gallery/ajax/cover.php         | 22 ++++++++++++++++++++++
 apps/gallery/ajax/createAlbum.php   | 22 ++++++++++++++++++++++
 apps/gallery/ajax/galleryOp.php     | 22 ++++++++++++++++++++++
 apps/gallery/ajax/getAlbums.php     | 22 ++++++++++++++++++++++
 apps/gallery/ajax/getCovers.php     | 22 ++++++++++++++++++++++
 apps/gallery/ajax/scanForAlbums.php | 21 +++++++++++++++++++++
 apps/gallery/ajax/thumbnail.php     | 22 ++++++++++++++++++++++
 apps/gallery/appinfo/app.php        | 22 ++++++++++++++++++++++
 apps/gallery/appinfo/info.xml       |  2 +-
 apps/gallery/index.php              | 22 ++++++++++++++++++++++
 apps/gallery/lib/album.php          | 21 +++++++++++++++++++++
 apps/gallery/lib/hooks_handlers.php | 28 +++++++++++++++++++++++++---
 apps/gallery/lib/images_utils.php   | 22 ++++++++++++++++++++++
 apps/gallery/lib/photo.php          | 21 +++++++++++++++++++++
 apps/gallery/lib/scanner.php        | 21 +++++++++++++++++++++
 15 files changed, 308 insertions(+), 4 deletions(-)

diff --git a/apps/gallery/ajax/cover.php b/apps/gallery/ajax/cover.php
index d83f4daaa52..181a919375d 100644
--- a/apps/gallery/ajax/cover.php
+++ b/apps/gallery/ajax/cover.php
@@ -1,4 +1,26 @@
 <?php
+
+/**
+* ownCloud - gallery application
+*
+* @author Bartek Przybylski
+* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*  
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
 require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
diff --git a/apps/gallery/ajax/createAlbum.php b/apps/gallery/ajax/createAlbum.php
index 9413b54718a..152f5834bcb 100644
--- a/apps/gallery/ajax/createAlbum.php
+++ b/apps/gallery/ajax/createAlbum.php
@@ -1,4 +1,26 @@
 <?php
+
+/**
+* ownCloud - gallery application
+*
+* @author Bartek Przybylski
+* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*  
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
 require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index 8a006dda637..3d1ed1f33cb 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -1,4 +1,26 @@
 <?
+
+/**
+* ownCloud - gallery application
+*
+* @author Bartek Przybylski
+* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*  
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
 require_once('../../../lib/base.php');
 require_once(OC::$CLASSPATH['OC_Gallery_Album']);
 OC_JSON::checkLoggedIn();
diff --git a/apps/gallery/ajax/getAlbums.php b/apps/gallery/ajax/getAlbums.php
index e4736076fed..9e9c6ef496c 100644
--- a/apps/gallery/ajax/getAlbums.php
+++ b/apps/gallery/ajax/getAlbums.php
@@ -1,4 +1,26 @@
 <?php
+
+/**
+* ownCloud - gallery application
+*
+* @author Bartek Przybylski
+* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*  
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
 require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
diff --git a/apps/gallery/ajax/getCovers.php b/apps/gallery/ajax/getCovers.php
index db7c8e9fcde..4db73d0fbf3 100644
--- a/apps/gallery/ajax/getCovers.php
+++ b/apps/gallery/ajax/getCovers.php
@@ -1,4 +1,26 @@
 <?php
+
+/**
+* ownCloud - gallery application
+*
+* @author Bartek Przybylski
+* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*  
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
 require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
diff --git a/apps/gallery/ajax/scanForAlbums.php b/apps/gallery/ajax/scanForAlbums.php
index b1f0a433a42..b8ed639d9dc 100644
--- a/apps/gallery/ajax/scanForAlbums.php
+++ b/apps/gallery/ajax/scanForAlbums.php
@@ -1,5 +1,26 @@
 <?php
 
+/**
+* ownCloud - gallery application
+*
+* @author Bartek Przybylski
+* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*  
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
 require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
diff --git a/apps/gallery/ajax/thumbnail.php b/apps/gallery/ajax/thumbnail.php
index d937691fa03..6d25c7a2536 100644
--- a/apps/gallery/ajax/thumbnail.php
+++ b/apps/gallery/ajax/thumbnail.php
@@ -1,4 +1,26 @@
 <?php
+
+/**
+* ownCloud - gallery application
+*
+* @author Bartek Przybylski
+* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*  
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
 require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index 3a2dbcb43ad..9c665fd3500 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -1,4 +1,26 @@
 <?php
+
+/**
+* ownCloud - gallery application
+*
+* @author Bartek Przybylski
+* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*  
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
 OC::$CLASSPATH['OC_Gallery_Album'] = 'apps/gallery/lib/album.php';
 OC::$CLASSPATH['OC_Gallery_Photo'] = 'apps/gallery/lib/photo.php';
 OC::$CLASSPATH['OC_Gallery_Scanner'] = 'apps/gallery/lib/scanner.php';
diff --git a/apps/gallery/appinfo/info.xml b/apps/gallery/appinfo/info.xml
index ba51bf0bd55..c275f39bb25 100644
--- a/apps/gallery/appinfo/info.xml
+++ b/apps/gallery/appinfo/info.xml
@@ -6,6 +6,6 @@
 	<licence>AGPL</licence>
 	<author>Bartek Przybylski</author>
 	<require>2</require>
-	<description></description>
+	<description>Gallery application for ownCloud</description>
 	<default_enable/>
 </info>
diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index 0cd795bac01..822a5b8e143 100644
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -1,4 +1,26 @@
 <?php
+
+/**
+* ownCloud - gallery application
+*
+* @author Bartek Przybylski
+* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*  
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
 require_once('../../lib/base.php');
 
 OC_Util::checkLoggedIn();
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 98876b891c5..a94eff3acd7 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -1,5 +1,26 @@
 <?php
 
+/**
+* ownCloud - gallery application
+*
+* @author Bartek Przybylski
+* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*  
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
 class OC_Gallery_Album {
 	public static function create($owner, $name, $path){
 		$stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_albums (uid_owner, album_name, album_path) VALUES (?, ?, ?)');
diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
index 1bddaf363e3..b6aa8a400cf 100644
--- a/apps/gallery/lib/hooks_handlers.php
+++ b/apps/gallery/lib/hooks_handlers.php
@@ -1,5 +1,26 @@
 <?php
 
+/**
+* ownCloud - gallery application
+*
+* @author Bartek Przybylski
+* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*  
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
 OC_Hook::connect("OC_Filesystem", "post_write", "OC_Gallery_Hooks_Handlers", "addPhotoFromPath");
 OC_Hook::connect("OC_Filesystem", "delete", "OC_Gallery_Hooks_Handlers", "removePhoto");
 OC_Hook::connect("OC_Filesystem", "post_rename", "OC_Gallery_Hooks_Handlers", "renamePhoto");
@@ -18,7 +39,8 @@ class OC_Gallery_Hooks_Handlers {
 
   private static function createAlbum($path) {
     $new_album_name = trim(str_replace('/', '.', $path), '.');
-    if ($new_album_name == '') $new_album_name = 'main';
+    if ($new_album_name == '')
+      $new_album_name = 'main';
 
     OC_Log::write(self::$APP_TAG, 'Creating new album '.$new_album_name, OC_Log::DEBUG);
     OC_Gallery_Album::create(OC_User::getUser(), $new_album_name, $path);
@@ -53,8 +75,8 @@ class OC_Gallery_Hooks_Handlers {
   }
 
   public static function renamePhoto($params) {
-    $olddir = substr($params['oldpath'], 0, strrpos($params['oldpath'], '/'));
-    $newdir = substr($params['newpath'], 0, strrpos($params['newpath'], '/'));
+    $olddir = substr($params['oldpath'], 0, strrpos($params['oldpath'], '/')+1);
+    $newdir = substr($params['newpath'], 0, strrpos($params['newpath'], '/')+1);
     if (!self::isPhoto($params['newpath'])) return;
     $album;
     $newAlbumId;
diff --git a/apps/gallery/lib/images_utils.php b/apps/gallery/lib/images_utils.php
index cb46bf3f160..0cfa52eb564 100644
--- a/apps/gallery/lib/images_utils.php
+++ b/apps/gallery/lib/images_utils.php
@@ -1,4 +1,26 @@
 <?php
+
+/**
+* ownCloud - gallery application
+*
+* @author Bartek Przybylski
+* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*  
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
 require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index f8a640819a1..23887098e0f 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -1,5 +1,26 @@
 <?php
 
+/**
+* ownCloud - gallery application
+*
+* @author Bartek Przybylski
+* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*  
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
 class OC_Gallery_Photo{
 	public static function create($albumId, $img){
 		$stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_photos (album_id, file_path) VALUES (?, ?)');
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index f754f913001..3eba9260ac7 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -1,5 +1,26 @@
 <?php
 
+/**
+* ownCloud - gallery application
+*
+* @author Bartek Przybylski
+* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*  
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
 require_once('base.php'); // base lib
 require_once('images_utils.php');
 
-- 
GitLab


From c2392bbace7511dfa424513ba88a8d76f3ee620c Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 8 Jan 2012 11:25:08 +0100
Subject: [PATCH 179/546] db overwriting, gallery creating fix

---
 apps/gallery/appinfo/database.xml   | 2 +-
 apps/gallery/lib/hooks_handlers.php | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/gallery/appinfo/database.xml b/apps/gallery/appinfo/database.xml
index db88e4c1b5a..ccdfad9433a 100644
--- a/apps/gallery/appinfo/database.xml
+++ b/apps/gallery/appinfo/database.xml
@@ -2,7 +2,7 @@
 <database>
 	 <name>*dbname*</name>
 	 <create>true</create>
-	 <overwrite>false</overwrite>
+	 <overwrite>true</overwrite>
 	 <charset>latin1</charset>
 	 <table>
 		<name>*dbprefix*gallery_albums</name>
diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
index b6aa8a400cf..65f3faaeeaf 100644
--- a/apps/gallery/lib/hooks_handlers.php
+++ b/apps/gallery/lib/hooks_handlers.php
@@ -32,6 +32,7 @@ class OC_Gallery_Hooks_Handlers {
   private static $APP_TAG = "Gallery";
 
   private static function isPhoto($filename) {
+    OC_Log::write(self::$APP_TAG, "Checking file ".$filename." with mimetype ".OC_Filesystem::getMimeType($filename), OC_Log::DEBUG);
     if (substr(OC_Filesystem::getMimeType($filename), 0, 6) == "image/")
       return 1;
     return 0;
@@ -53,6 +54,7 @@ class OC_Gallery_Hooks_Handlers {
     $fullpath = $params['path'];
     OC_Log::write(self::$APP_TAG, 'Adding file with path '. $fullpath, OC_Log::DEBUG);
     $path = substr($fullpath, 0, strrpos($fullpath, '/'));
+    if ($path == '') $path = '/';
     $album = OC_Gallery_Album::find(OC_User::getUser(), null, $path);
 
     if ($album->numRows() == 0) {
@@ -75,9 +77,12 @@ class OC_Gallery_Hooks_Handlers {
   }
 
   public static function renamePhoto($params) {
-    $olddir = substr($params['oldpath'], 0, strrpos($params['oldpath'], '/')+1);
-    $newdir = substr($params['newpath'], 0, strrpos($params['newpath'], '/')+1);
+    $olddir = substr($params['oldpath'], 0, strrpos($params['oldpath'], '/'));
+    $newdir = substr($params['newpath'], 0, strrpos($params['newpath'], '/'));
+    if ($olddir == '') $olddir = '/';
+    if ($newdir == '') $newdir = '/';
     if (!self::isPhoto($params['newpath'])) return;
+    OC_Log::write(self::$APP_TAG, 'Moving photo from '.$params['oldpath'].' to '.$params['newpath'], OC_Log::DEBUG);
     $album;
     $newAlbumId;
     $oldAlbumId;
-- 
GitLab


From 76b193c69818187b5d52fdcd3d07873c343aa5d9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 8 Jan 2012 13:01:41 +0100
Subject: [PATCH 180/546] don't try to upgrade what isn't installed

---
 lib/base.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index c3965c9cd39..854b91b0c1d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -152,14 +152,16 @@ class OC{
 			}
 		}
 
-		$installedVersion=OC_Config::getValue('version','0.0.0');
-		$currentVersion=implode('.',OC_Util::getVersion());
-		if (version_compare($currentVersion, $installedVersion, '>')) {
-			OC_DB::updateDbFromStructure('../db_structure.xml');
-			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
-		}
+		if(OC_Config::getValue('installed', false)){
+			$installedVersion=OC_Config::getValue('version','0.0.0');
+			$currentVersion=implode('.',OC_Util::getVersion());
+			if (version_compare($currentVersion, $installedVersion, '>')) {
+				OC_DB::updateDbFromStructure('../db_structure.xml');
+				OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
+			}
 
-		OC_App::updateApps();
+			OC_App::updateApps();
+		}
 
 		ini_set('session.cookie_httponly','1;');
 		session_start();
-- 
GitLab


From a4e14b49b14b2215037806ded362b2ded0e61465 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 8 Jan 2012 13:16:11 +0100
Subject: [PATCH 181/546] load reverse driver when updating database

---
 lib/db.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/db.php b/lib/db.php
index 58a478ba0c0..b901cc8b513 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -389,6 +389,7 @@ class OC_DB {
 		// We need a mdb2 database connection
 		self::connectMDB2();
 		self::$MDB2->loadModule('Manager');
+		self::$MDB2->loadModule('Reverse');
 
 		// Connect if this did not happen before
 		if(!self::$schema){
-- 
GitLab


From 4d1ed7e05f5efc589b7fb6031661ccda496cee76 Mon Sep 17 00:00:00 2001
From: Cloud Dumper <clouddumper@gmail.com>
Date: Sat, 7 Jan 2012 23:41:51 +0100
Subject: [PATCH 182/546] Improve music playlist rendering.

This change:
* bolds currently playing song in playlist;
* forces song names in playlist to one line, ellipsize after (...);
* adds jQuery tipsies to get the whole song name, along with the
  artist name, and the album the song is coming from.

No need to split this changeset into three different ones for the sake
of atomicity.

Two first elements were on the priorities / bug list available there:
   http://gitorious.org/owncloud/pages/Home
---
 apps/media/css/music.css  |  4 ++--
 apps/media/js/playlist.js | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index a6738058be3..41ade44a66f 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -22,11 +22,11 @@ div.jp-volume-bar-value { background:#ccc; width:0; height:0.4em; }
 #collection li.album,#collection li.song { margin-left:3em; }
 #leftcontent img.remove { display:none; float:right; cursor:pointer; }
 #leftcontent li:hover img.remove { display:inline; }
-#leftcontent li {white-space: normal; }
+#leftcontent li div.label { float: left; width: 200px; overflow: hidden; text-overflow: ellipsis; }
 #collection li button { float:right; }
 #collection li,#playlist li { list-style-type:none; }
 .template { display:none; }
-.collection_playing { background:#eee; }
+.collection_playing { background:#eee; font-weight: bold; }
 
 #collection li { padding-right:10px; }
 #searchresults input.play, #searchresults input.add { float:left; height:1em; width:1em; }
diff --git a/apps/media/js/playlist.js b/apps/media/js/playlist.js
index 57180b3be7b..089065989ae 100644
--- a/apps/media/js/playlist.js
+++ b/apps/media/js/playlist.js
@@ -1,11 +1,23 @@
 PlayList.render=function(){
 	$('#playlist').show();
+
+	/*
+	 * We should not empty() PlayList.parent() but thorougly manage its
+	 * elements instead because some code might be attached to those.
+	 * JQuery tipsies are one of them. The following line make sure they
+	 * are all removed before we delete the associated <li/>.
+	 */
+	$(".tipsy").remove();
+
 	PlayList.parent.empty();
 	for(var i=0;i<PlayList.items.length;i++){
 		var item=PlayList.items[i];
 		var li=$('<li/>');
-		li.append(item.name);
-                li.attr('class', 'jp-playlist-' + i);
+		li.attr('class', 'jp-playlist-' + i);
+		li.attr('title', item.artist + ' - ' + item.name + '<br/>(' + item.album + ')');
+		var div = $('<div class="label">' + item.name + '</div>');
+		li.append(div);
+		$('.jp-playlist-' + i).tipsy({gravity:'w', fade:true, live:true, html:true});
 		var img=$('<img class="remove svg action" src="'+OC.imagePath('core','actions/delete')+'"/>');
 		img.click(function(event){
 			event.stopPropagation();
-- 
GitLab


From ae711168c3308e013c0d24cc7f832ff91077e911 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 8 Jan 2012 14:07:12 +0100
Subject: [PATCH 183/546] improve detection for mysql databases

---
 lib/setup.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/setup.php b/lib/setup.php
index d454c17599d..a65dc9453c2 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -103,7 +103,7 @@ class OC_Setup {
 						//use the admin login data for the new database user
 
 						//add prefix to the mysql user name to prevent collissions
-						$dbusername=substr('oc_mysql_'.$username,0,16);
+						$dbusername=substr('oc_'.$username,0,16);
 						//hash the password so we don't need to store the admin config in the config file
 						$dbpassword=md5(time().$password);
 						
@@ -124,9 +124,12 @@ class OC_Setup {
 					}
 
 					//fill the database if needed
-					$query="SELECT * FROM $dbname.{$dbtableprefix}users";
+					$query="select count(*) from information_schema.tables where table_schema='$dbname' AND table_name = '{$dbtableprefix}users';";
 					$result = mysql_query($query,$connection);
-					if(!$result) {
+					if($result){
+						$row=mysql_fetch_row($result);
+					}
+					if(!$result or $row[0]==0) {
 						OC_DB::createDbFromStructure('db_structure.xml');
 					}
 					mysql_close($connection);
-- 
GitLab


From 49337e0ad1db8ecf8244f057f729241d923ac2ff Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 8 Jan 2012 14:25:38 +0100
Subject: [PATCH 184/546] dont create a new user when it already exists

---
 lib/setup.php | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/lib/setup.php b/lib/setup.php
index a65dc9453c2..ebe7a45a1f6 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -98,26 +98,33 @@ class OC_Setup {
 					);
 				}
 				else {
+					$oldUser=OC_Config::getValue('dbuser', false);
+					$oldPassword=OC_Config::getValue('dbpassword', false);
+					
 					$query="SELECT user FROM mysql.user WHERE user='$dbuser'"; //this should be enough to check for admin rights in mysql
 					if(mysql_query($query, $connection)) {
 						//use the admin login data for the new database user
 
 						//add prefix to the mysql user name to prevent collissions
 						$dbusername=substr('oc_'.$username,0,16);
-						//hash the password so we don't need to store the admin config in the config file
-						$dbpassword=md5(time().$password);
-						
-						self::createDBUser($dbusername, $dbpassword, $connection);
-						
-						OC_Config::setValue('dbuser', $dbusername);
-						OC_Config::setValue('dbpassword', $dbpassword);
+						if($dbusername!=$oldUser){
+							//hash the password so we don't need to store the admin config in the config file
+							$dbpassword=md5(time().$password);
+
+							self::createDBUser($dbusername, $dbpassword, $connection);
+
+							OC_Config::setValue('dbuser', $dbusername);
+							OC_Config::setValue('dbpassword', $dbpassword);
+						}
 
 						//create the database
 						self::createDatabase($dbname, $dbusername, $connection);
 					}
 					else {
-						OC_Config::setValue('dbuser', $dbuser);
-						OC_Config::setValue('dbpassword', $dbpass);
+						if($dbuser!=$oldUser){
+							OC_Config::setValue('dbuser', $dbuser);
+							OC_Config::setValue('dbpassword', $dbpass);
+						}
 
 						//create the database
 						self::createDatabase($dbname, $dbuser, $connection);
-- 
GitLab


From 9c6248443adf4be29cf9e85a8f7baca846bcb1d9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 8 Jan 2012 14:35:23 +0100
Subject: [PATCH 185/546] dont overwrite the database with the gallery database

---
 apps/gallery/appinfo/database.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/gallery/appinfo/database.xml b/apps/gallery/appinfo/database.xml
index ccdfad9433a..db88e4c1b5a 100644
--- a/apps/gallery/appinfo/database.xml
+++ b/apps/gallery/appinfo/database.xml
@@ -2,7 +2,7 @@
 <database>
 	 <name>*dbname*</name>
 	 <create>true</create>
-	 <overwrite>true</overwrite>
+	 <overwrite>false</overwrite>
 	 <charset>latin1</charset>
 	 <table>
 		<name>*dbprefix*gallery_albums</name>
-- 
GitLab


From a9aabd1c8d8acce429a66779d1fe69025a317a83 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 8 Jan 2012 16:41:36 +0100
Subject: [PATCH 186/546] 3rdparty: fix bug in when

---
 3rdparty/when/When.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/3rdparty/when/When.php b/3rdparty/when/When.php
index f8bb9db0f67..5eaf3dec69d 100755
--- a/3rdparty/when/When.php
+++ b/3rdparty/when/When.php
@@ -621,7 +621,19 @@ class When
 		
 		if($interval == "month")
 		{
-			$this->try_date->modify('+1 month');
+			
+			$this->try_date->modify('first day of next month');
+			if((int) date('t', $this->try_date->format('U')) > (int) $this->start_date->format('j')){
+				$this->try_date->modify('+' . (int) $this->start_date->format('j') - 1 . ' day'); 
+			}else{
+				$this->try_date->modify('+' . (int) date('t', $this->try_date->format('U')) - 1 . ' day'); 
+			}
+			//$this->try_date->setDate(date('y/n/j', mktime(0,0,0,$this->try_date->format('j'), $this->try_date->format('n') + 1, $year = $this->try_date->format('Y'))));
+			//echo date('t', $this->try_date->format('U')) . '-' . $this->try_date->format('U') . ' ';
+			/*$month_day = $this->try_date->format('j');
+		$month = $this->try_date->format('n');
+		$year = $this->try_date->format('Y');*/
+		
 		}
 		else
 		{
-- 
GitLab


From 9e105d9bd756ef079c407772cba4d67f1a5193fe Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 8 Jan 2012 16:44:15 +0100
Subject: [PATCH 187/546] remove old code in comments

---
 3rdparty/when/When.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/3rdparty/when/When.php b/3rdparty/when/When.php
index 5eaf3dec69d..d54f296ed61 100755
--- a/3rdparty/when/When.php
+++ b/3rdparty/when/When.php
@@ -628,12 +628,6 @@ class When
 			}else{
 				$this->try_date->modify('+' . (int) date('t', $this->try_date->format('U')) - 1 . ' day'); 
 			}
-			//$this->try_date->setDate(date('y/n/j', mktime(0,0,0,$this->try_date->format('j'), $this->try_date->format('n') + 1, $year = $this->try_date->format('Y'))));
-			//echo date('t', $this->try_date->format('U')) . '-' . $this->try_date->format('U') . ' ';
-			/*$month_day = $this->try_date->format('j');
-		$month = $this->try_date->format('n');
-		$year = $this->try_date->format('Y');*/
-		
 		}
 		else
 		{
-- 
GitLab


From 041e3575d157e1ac0886473c962af10726ae7e67 Mon Sep 17 00:00:00 2001
From: Kshitij Parajuli <kshitijparajuli@gmail.com>
Date: Sun, 8 Jan 2012 11:00:30 -0500
Subject: [PATCH 188/546] When a music file is playing, the page title gets
 modified.

---
 apps/media/js/player.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/media/js/player.js b/apps/media/js/player.js
index 3c022e9f8c4..1f76356fd97 100644
--- a/apps/media/js/player.js
+++ b/apps/media/js/player.js
@@ -93,9 +93,11 @@ var PlayList={
 			ended:PlayList.next,
 			pause:function(){
 				localStorage.setItem(oc_current_user+'oc_playlist_playing','false');
+				document.title = "ownCloud";
 			},
-			play:function(){
+			play:function(event){
 				localStorage.setItem(oc_current_user+'oc_playlist_playing','true');
+				document.title = "\u25b8 " + event.jPlayer.status.media.name + " - " + event.jPlayer.status.media.artist + " - ownCloud";
 			},
 			supplied:type,
 			ready:function(){
-- 
GitLab


From 13784bee18ace83adc10d869e949420b797ac03f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 8 Jan 2012 17:29:35 +0100
Subject: [PATCH 189/546] mp3info is giving to much trouble, get rid of it

---
 apps/media/lib_scanner.php | 110 ++++++++++++++++---------------------
 1 file changed, 46 insertions(+), 64 deletions(-)

diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
index 320b1f79199..4039cce09ee 100644
--- a/apps/media/lib_scanner.php
+++ b/apps/media/lib_scanner.php
@@ -30,7 +30,6 @@ class OC_MEDIA_SCANNER{
 	//these are used to store which artists and albums we found, it can save a lot of addArtist/addAlbum calls
 	static private $artists=array();
 	static private $albums=array();//stored as "$artist/$album" to allow albums with the same name from different artists
-	static private $useMp3Info=null;
 	
 	/**
 	 * scan a folder for music
@@ -70,72 +69,55 @@ class OC_MEDIA_SCANNER{
 	 * @return boolean
 	 */
 	public static function scanFile($path){
-		if(is_null(self::$useMp3Info)){
-			self::$useMp3Info=OC_Helper::canExecute("mp3info");
-		}
 		$file=OC_Filesystem::getLocalFile($path);
-		if(substr($path,-3)=='mp3' and self::$useMp3Info){//use the command line tool id3info if possible
-			$output=array();
-			$size=filesize($file);
-			exec('mp3info -p "%a\n%l\n%t\n%n\n%S" "'.$file.'"',$output);
-			if(count($output)>4){
-				$artist=$output[0];
-				$album=$output[1];
-				$title=$output[2];
-				$track=$output[3];
-				$length=$output[4];
-			}else{
-				return; //invalid mp3 file
-			}
+		if(!self::isMusic($path)){
+			return;
+		}
+		if(!self::$getID3){
+			self::$getID3=@new getID3();
+			self::$getID3->encoding='UTF-8';
+		}
+		$data=@self::$getID3->analyze($file);
+		getid3_lib::CopyTagsToComments($data);
+		if(!isset($data['comments'])){
+			OC_Log::write('media',"error reading id3 tags in '$file'",OC_Log::WARN);
+			return;
+		}
+		if(!isset($data['comments']['artist'])){
+			OC_Log::write('media',"error reading artist tag in '$file'",OC_Log::WARN);
+			$artist='unknown';
 		}else{
-			if(!self::isMusic($path)){
-				return;
-			}
-			if(!self::$getID3){
-				self::$getID3=@new getID3();
-				self::$getID3->encoding='UTF-8';
-			}
-			$data=@self::$getID3->analyze($file);
-			getid3_lib::CopyTagsToComments($data);
-			if(!isset($data['comments'])){
-				OC_Log::write('media',"error reading id3 tags in '$file'",OC_Log::WARN);
-				return;
-			}
-			if(!isset($data['comments']['artist'])){
-				OC_Log::write('media',"error reading artist tag in '$file'",OC_Log::WARN);
-				$artist='unknown';
-			}else{
-				$artist=stripslashes($data['comments']['artist'][0]);
-			}
-			if(!isset($data['comments']['album'])){
-				OC_Log::write('media',"error reading album tag in '$file'",OC_Log::WARN);
-				$album='unknown';
-			}else{
-				$album=stripslashes($data['comments']['album'][0]);
-			}
-			if(!isset($data['comments']['title'])){
-				OC_Log::write('media',"error reading title tag in '$file'",OC_Log::WARN);
-				$title='unknown';
-			}else{
-				$title=stripslashes($data['comments']['title'][0]);
-			}
-			$size=$data['filesize'];
-			if (isset($data['comments']['track']))
-			{
-				$track = $data['comments']['track'][0];
-			}
-			else if (isset($data['comments']['track_number']))
-			{
-				$track = $data['comments']['track_number'][0];
-				$track = explode('/',$track);
-				$track = $track[0];
-			}
-			else
-			{
-				$track = 0;
-			}
-			$length=isset($data['playtime_seconds'])?round($data['playtime_seconds']):0;
+			$artist=stripslashes($data['comments']['artist'][0]);
 		}
+		if(!isset($data['comments']['album'])){
+			OC_Log::write('media',"error reading album tag in '$file'",OC_Log::WARN);
+			$album='unknown';
+		}else{
+			$album=stripslashes($data['comments']['album'][0]);
+		}
+		if(!isset($data['comments']['title'])){
+			OC_Log::write('media',"error reading title tag in '$file'",OC_Log::WARN);
+			$title='unknown';
+		}else{
+			$title=stripslashes($data['comments']['title'][0]);
+		}
+		$size=$data['filesize'];
+		if (isset($data['comments']['track']))
+		{
+			$track = $data['comments']['track'][0];
+		}
+		else if (isset($data['comments']['track_number']))
+		{
+			$track = $data['comments']['track_number'][0];
+			$track = explode('/',$track);
+			$track = $track[0];
+		}
+		else
+		{
+			$track = 0;
+		}
+		$length=isset($data['playtime_seconds'])?round($data['playtime_seconds']):0;
+
 		if(!isset(self::$artists[$artist])){
 			$artistId=OC_MEDIA_COLLECTION::addArtist($artist);
 			self::$artists[$artist]=$artistId;
-- 
GitLab


From ed5fb902bd1391d2fc2adb3c4e5cb25fcb16b93e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 8 Jan 2012 17:30:33 +0100
Subject: [PATCH 190/546] remove mp3info from dependency check

---
 apps/admin_dependencies_chk/settings.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/apps/admin_dependencies_chk/settings.php b/apps/admin_dependencies_chk/settings.php
index 34028056dbe..ce90dd604ca 100644
--- a/apps/admin_dependencies_chk/settings.php
+++ b/apps/admin_dependencies_chk/settings.php
@@ -44,12 +44,6 @@ $modules[] =array(
 	'modules'=> array('gallery'),
 	'message'=> $l->t('The php-gd module is needed to create thumbnails of your images'));
 
-$modules[] =array(
-	'status' => OC_Helper::canExecute("mp3info") ? 'ok' : 'warning',
-	'part'=> 'mp3info',
-	'modules'=> array('media'),
-	'message'=> $l->t('The program mp3info is useful to discover ID3 tags of your music files'));
-
 $modules[] =array(
 	'status' => function_exists("ldap_bind") ? 'ok' : 'error',
 	'part'=> 'php-ldap',
-- 
GitLab


From 37f5a8cdb4d2486982117c5d5984a253c2192e0b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 8 Jan 2012 17:49:53 +0100
Subject: [PATCH 191/546] improve pgsql database detection

---
 lib/setup.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/setup.php b/lib/setup.php
index ebe7a45a1f6..1b74e945196 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -190,9 +190,12 @@ class OC_Setup {
 					}
 
 					//fill the database if needed
-					$query = "SELECT relname FROM pg_class WHERE relname='{$dbtableprefix}users' limit 1";
+					$query = "select count(*) FROM pg_class WHERE relname='{$dbtableprefix}users' limit 1";
 					$result = pg_query($connection, $query);
-					if(!$result) {
+					if($result){
+						$row = pg_fetch_row($result);
+					}
+					if(!$result or $row[0]==0) {
 						OC_DB::createDbFromStructure('db_structure.xml');
 					}
 					pg_close($connection);
-- 
GitLab


From fbb126cdd9c2fd790ed23be3b370b1ae3efb8ba8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 8 Jan 2012 19:58:08 +0100
Subject: [PATCH 192/546] save updated version number of apps after updating

---
 lib/app.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/app.php b/lib/app.php
index 13c4cef32b4..de7d82ce959 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -385,6 +385,7 @@ class OC_App{
 				$currentVersion=$appInfo['version'];
 				if (version_compare($currentVersion, $installedVersion, '>')) {
 					OC_App::updateApp($app);
+					OC_Appconfig::setValue($app,'installed_version',$appInfo['version']);
 				}
 			}
 		}
-- 
GitLab


From 5e40653713eed01d96841dc93e11534b46a443ee Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 8 Jan 2012 21:18:21 +0000
Subject: [PATCH 193/546] Missing line return

---
 lib/setup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/setup.php b/lib/setup.php
index 1b74e945196..9a40c36f62c 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -288,7 +288,7 @@ class OC_Setup {
 		$content.= "php_value post_max_size 512M\n";
 		$content.= "SetEnv htaccessWorking true\n";
 		$content.= "</IfModule>\n";
-		$content.= "<IfModule mod_rewrite.c>";
+		$content.= "<IfModule mod_rewrite.c>\n";
 		$content.= "RewriteEngine on\n";
 		$content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]\n";
 		$content.= "</IfModule>\n";
-- 
GitLab


From f7f19af8164aa78c3d1a143c40098e48f00145b8 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 8 Jan 2012 23:30:50 +0000
Subject: [PATCH 194/546] Handles file permissions. Protect against overwriting
 changes.

---
 apps/files_texteditor/ajax/loadfile.php |  28 +++--
 apps/files_texteditor/ajax/mtime.php    |  49 ++++++++
 apps/files_texteditor/ajax/savefile.php |  67 +++++------
 apps/files_texteditor/js/editor.js      | 145 ++++++++++--------------
 4 files changed, 154 insertions(+), 135 deletions(-)
 create mode 100644 apps/files_texteditor/ajax/mtime.php

diff --git a/apps/files_texteditor/ajax/loadfile.php b/apps/files_texteditor/ajax/loadfile.php
index b06b0fa83d2..64e016be8c2 100644
--- a/apps/files_texteditor/ajax/loadfile.php
+++ b/apps/files_texteditor/ajax/loadfile.php
@@ -28,13 +28,23 @@ require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 
 // Set the session key for the file we are about to edit.
-$path = isset($_GET['path']) ? $_GET['path'] : false;
-
-if($path){
-	$sessionname = md5('oc_file_hash_'.$path);
-	$filecontents = OC_Filesystem::file_get_contents($path);
-	OC_Filesystem::update_session_file_hash($sessionname,sha1(htmlspecialchars($filecontents)));
-	OC_JSON::success();
+$dir = isset($_GET['dir']) ? $_GET['dir'] : '';
+$filename = isset($_GET['file']) ? $_GET['file'] : '';
+if(!empty($filename))
+{	
+	$path = $dir.'/'.$filename;
+	if(OC_Filesystem::is_writeable($path))
+	{
+		$mtime = OC_Filesystem::filemtime($path);
+		$filecontents = OC_Filesystem::file_get_contents($path);
+		OC_JSON::success(array('data' => array('filecontents' => $filecontents, 'write' => 'true', 'mtime' => $mtime)));
+	}
+	else
+	{
+		$mtime = OC_Filesystem::filemtime($path);
+		$filecontents = OC_Filesystem::file_get_contents($path);
+		OC_JSON::success(array('data' => array('filecontents' => $filecontents, 'write' => 'false', 'mtime' => $mtime)));	
+	}	
 } else {
-	OC_JSON::error();
-}	
\ No newline at end of file
+	OC_JSON::error(array('data' => array( 'message' => 'Invalid file path supplied.')));	
+}
\ No newline at end of file
diff --git a/apps/files_texteditor/ajax/mtime.php b/apps/files_texteditor/ajax/mtime.php
new file mode 100644
index 00000000000..df90a68ca7a
--- /dev/null
+++ b/apps/files_texteditor/ajax/mtime.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * ownCloud - files_texteditor
+ *
+ * @author Tom Needham
+ * @copyright 2011 Tom Needham contact@tomneedham.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+
+// Get the path from GET
+$path = isset($_GEt['path']) ? $_GET['path'] : '';
+
+if($path != '')
+{
+	// Find the mtime
+	$mtime = OC_Filesystem::filemtime($path);
+	if($mtime)
+	{
+		OC_JSON::success(array('data' => array('path' => $path, 'mtime' => $mtime)));
+	}
+	else
+	{
+		OC_JSON::error();
+	}	
+}
+else
+{
+	OC_JSON::error();	
+}
\ No newline at end of file
diff --git a/apps/files_texteditor/ajax/savefile.php b/apps/files_texteditor/ajax/savefile.php
index f1a2bafc12b..1e073f3ba24 100644
--- a/apps/files_texteditor/ajax/savefile.php
+++ b/apps/files_texteditor/ajax/savefile.php
@@ -27,47 +27,36 @@ require_once('../../../lib/base.php');
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 
-// Save the file data
+// Get paramteres
 $filecontents = htmlspecialchars_decode($_POST['filecontents']);
-$file = $_POST['file'];
-$dir = $_POST['dir'];
-$path = $dir.'/'.$file;
-$force = isset($_POST['force']) ? $_POST['force'] : false;
-$sessionname = sha1('oc_file_hash_'.$path);
+$path = isset($_POST['path']) ? $_POST['path'] : '';
+$mtime = isset($_POST['mtime']) ? $_POST['mtime'] : '';
 
-function do_save($path,$filecontents){
-	$sessionname = md5('oc_file_hash_'.$path);
-	OC_Filesystem::update_session_file_hash($sessionname,sha1(htmlspecialchars($filecontents)));
-	OC_Filesystem::file_put_contents($path, $filecontents);
-}
 
-// Check if file modified whilst editing?
-if(isset($_SESSION[$sessionname])){
-    if(!empty($_SESSION[$sessionname])){
-        // Compare to current hash of file.
-        $savedfilecontents = htmlspecialchars(OC_Filesystem::file_get_contents($path));
-        $hash = md5($savedfilecontents);
-        $originalhash = $_SESSION[$sessionname];
-        // Compare with hash taken when file was opened
-        if($hash != $originalhash){
-            // Someone has played with the file while you were editing
-            // Force save?
-            if($force){
-            	do_save($path, $filecontents);
-            	OC_JSON::success();
-            } else {	
-            	// No force
-            	OC_JSON::error(array('data' => array( 'message' => $l10n->t('The file has been edited since you opened it. Overwrite the file?'))));
-            }
-        } else  {
-            // No body has edited it whilst you were, so save the file
-            // Update the session hash.
-            do_save($path,$filecontents);
-            OC_JSON::success();
-        }
+if($path != '' && $mtime != '')
+{
+	// Get file mtime
+	$filemtime = OC_Filesystem::filemtime($path);
+	if($mtime != $filemtime)
+	{
+		// Then the file has changed since opening
+		OC_JSON::error();	
+	}
+	else
+	{
+		// File same as when opened
+		// Save file
+		if(OC_Filesystem::is_writeable($path))	
+		{
+			OC_Filesystem::file_put_contents($path, $filecontents);
+			OC_JSON::success();
+		}
+		else
+		{
+			// Not writeable!
+			OC_JSON::error(array('data' => array( 'message' => 'Insufficient permissions')));	
+		}
 	}
 } else {
-    // No session value set for soem reason, just save the file.
-	do_save($path,$filecontents);
-	OC_JSON::success();
-}
\ No newline at end of file
+	OC_JSON::error(array('data' => array( 'message' => 'File path or mtime not supplied')));	
+}
diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 63e67460a3b..060c76705a1 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -77,81 +77,42 @@ function editorIsShown(){
 	return is_editor_shown;
 }
 
-function updateSessionFileHash(path){
-	$.get(OC.filePath('files_texteditor','ajax','loadfile.php'),
-		{ path: path },
-   		function(jsondata){
-   			if(jsondata.status=='failure'){
-   				alert('Failed to update session file hash.');	
-   			}
-   	}, "json");}
-
 function doFileSave(){
 	if(editorIsShown()){
+		// Get file path
+		var path = $('#editor').attr('data-dir')+'/'+$('#editor').attr('data-filename');
+		// Get original mtime
+		var mtime = $('#editor').attr('data-mtime');
+		// Show saving spinner
 		$("#editor_save").die('click',doFileSave);
 		$('#editor_save').after('<img id="saving_icon" src="'+OC.filePath('core','img','loading.gif')+'"></img>');
-			var filecontents = window.aceEditor.getSession().getValue();
-			var dir =  $('#editor').attr('data-dir');
-			var file =  $('#editor').attr('data-filename');
-			$.post(OC.filePath('files_texteditor','ajax','savefile.php'), { filecontents: filecontents, file: file, dir: dir },function(jsondata){
-			
-				if(jsondata.status == 'failure'){
-					var answer = confirm(jsondata.data.message);
-					if(answer){
-						$.post(OC.filePath('files_texteditor','ajax','savefile.php'),{ filecontents: filecontents, file: file, dir: dir, force: 'true' },function(jsondata){
-							if(jsondata.status =='success'){
-								$('#saving_icon').remove();
-								$('#editor_save').after('<p id="save_result" style="float: left">Saved!</p>')
-								setTimeout(function() {
-  									$('#save_result').fadeOut('slow',function(){
-  										$(this).remove();	
-  										$("#editor_save").live('click',doFileSave);
-  									});
-								}, 2000);
-							} 
-							else {
-								// Save error
-								$('#saving_icon').remove();
-								$('#editor_save').after('<p id="save_result" style="float: left">Failed!</p>');
-								setTimeout(function() {
-									$('#save_result').fadeOut('slow',function(){ 
-										$(this).remove();
-										$("#editor_save").live('click',doFileSave); 
-									});
-								}, 2000);	
-							}
-						}, 'json');
-					} 
-		   			else {
-						// Don't save!
-						$('#saving_icon').remove();
-						// Temporary measure until we get a tick icon
-						$('#editor_save').after('<p id="save_result" style="float: left">Saved!</p>');
-						setTimeout(function() {
-									$('#save_result').fadeOut('slow',function(){ 
-										$(this).remove(); 
-										$("#editor_save").live('click',doFileSave);
-									});
-						}, 2000);
-			   		}
-				} 
-				else if(jsondata.status == 'success'){
-					// Success
-					$('#saving_icon').remove();
-					// Temporary measure until we get a tick icon
-					$('#editor_save').after('<p id="save_result" style="float: left">Saved!</p>');
-					setTimeout(function() {
-						$('#save_result').fadeOut('slow',function(){ 
-							$(this).remove(); 
-							$("#editor_save").live('click',doFileSave);
-						});
-					}, 2000);
-				}
-			}, 'json');
-		giveEditorFocus();
-	} else {
-		return;	
-	}	
+		// Get the data
+		var filecontents = window.aceEditor.getSession().getValue();
+		// Send the data
+		$.post(OC.filePath('files_texteditor','ajax','savefile.php'), { filecontents: filecontents, path: path, mtime: mtime },function(jsondata){
+			if(jsondata.status!='success'){
+				// Save failed
+				$('#saving_icon').remove();
+				$('#editor_save').after('<p id="save_result" style="float: left">Failed to save file</p>');
+				setTimeout(function() {
+					$('#save_result').fadeOut('slow',function(){ 
+						$(this).remove();
+						$("#editor_save").live('click',doFileSave); 
+					});
+				}, 2000);  	
+			} else {
+				// Save OK	
+				$('#saving_icon').remove();
+				$('#editor_save').after('<p id="save_result" style="float: left">Saved</p>')
+				setTimeout(function() {
+					$('#save_result').fadeOut('slow',function(){
+						$(this).remove();       
+						$("#editor_save").live('click',doFileSave);
+					});
+				}, 2000);
+			}
+		},'json');
+	}
 };
 
 function giveEditorFocus(){
@@ -162,24 +123,34 @@ function showFileEditor(dir,filename){
 	if(!editorIsShown()){
 		// Loads the file editor and display it.
 		var data = $.ajax({
-				url: OC.filePath('files','ajax','download.php')+'?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent(dir),
+				url: OC.filePath('files_texteditor','ajax','loadfile.php'),
+				data: 'file='+encodeURIComponent(filename)+'&dir='+encodeURIComponent(dir),
 				complete: function(data){
-					// Initialise the editor
-					updateSessionFileHash(dir+'/'+filename);
-					showControls(filename);
-					$('table').fadeOut('slow', function() {
-						$('#editor').text(data.responseText);
-						// encodeURIComponenet?
-						$('#editor').attr('data-dir', dir);
-						$('#editor').attr('data-filename', filename);
-						window.aceEditor = ace.edit("editor");  
-						aceEditor.setShowPrintMargin(false);
-						setEditorSize();
-						setSyntaxMode(getFileExtension(filename));
-						OC.addScript('files_texteditor','aceeditor/theme-clouds', function(){
-							window.aceEditor.setTheme("ace/theme/clouds");
+					result = jQuery.parseJSON(data.responseText);
+					if(result.status == 'success'){
+						// Save mtime
+						$('#editor').attr('data-mtime', result.data.mtime);
+						// Initialise the editor
+						showControls(filename);
+						$('table').fadeOut('slow', function() {
+							$('#editor').text(result.data.filecontents);
+							$('#editor').attr('data-dir', dir);
+							$('#editor').attr('data-filename', filename);
+							window.aceEditor = ace.edit("editor");  
+							aceEditor.setShowPrintMargin(false);
+							if(result.data.write=='false'){
+								aceEditor.setReadOnly(true);	
+							}
+							setEditorSize();
+							setSyntaxMode(getFileExtension(filename));
+							OC.addScript('files_texteditor','aceeditor/theme-clouds', function(){
+								window.aceEditor.setTheme("ace/theme/clouds");
+							});
 						});
-					});
+					} else {
+						// Failed to get the file.
+						alert(result.data.message);	
+					}
 				// End success
 				}
 				// End ajax
-- 
GitLab


From 18b8dc1c2120b7d7ab6e4a7f23c33a6019e1587b Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 9 Jan 2012 17:03:19 +0000
Subject: [PATCH 195/546] fixed saving bug

---
 apps/files_texteditor/ajax/savefile.php | 13 ++++++++++---
 apps/files_texteditor/js/editor.js      |  3 +++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/apps/files_texteditor/ajax/savefile.php b/apps/files_texteditor/ajax/savefile.php
index 1e073f3ba24..3d0771ea983 100644
--- a/apps/files_texteditor/ajax/savefile.php
+++ b/apps/files_texteditor/ajax/savefile.php
@@ -40,7 +40,8 @@ if($path != '' && $mtime != '')
 	if($mtime != $filemtime)
 	{
 		// Then the file has changed since opening
-		OC_JSON::error();	
+		OC_JSON::error();
+		OC_Log::write('files_texteditor',"File: ".$path." modified since opening.",OC_Log::ERROR);	
 	}
 	else
 	{
@@ -49,14 +50,20 @@ if($path != '' && $mtime != '')
 		if(OC_Filesystem::is_writeable($path))	
 		{
 			OC_Filesystem::file_put_contents($path, $filecontents);
-			OC_JSON::success();
+			// Clear statcache
+			clearstatcache();
+			// Get new mtime
+			$newmtime = OC_Filesystem::filemtime($path);
+			OC_JSON::success(array('data' => array('mtime' => $newmtime)));
 		}
 		else
 		{
 			// Not writeable!
 			OC_JSON::error(array('data' => array( 'message' => 'Insufficient permissions')));	
+			OC_Log::write('files_texteditor',"User does not have permission to write to file: ".$path,OC_Log::ERROR);
 		}
 	}
 } else {
-	OC_JSON::error(array('data' => array( 'message' => 'File path or mtime not supplied')));	
+	OC_JSON::error(array('data' => array( 'message' => 'File path or mtime not supplied')));
+	OC_Log::write('files_texteditor',"Invalid path supplied:".$path,OC_Log::ERROR);	
 }
diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 060c76705a1..3c1e1542806 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -102,6 +102,9 @@ function doFileSave(){
 				}, 2000);  	
 			} else {
 				// Save OK	
+				// Update mtime
+				$('#editor').attr('data-mtime',jsondata.data.mtime);
+				// Show result
 				$('#saving_icon').remove();
 				$('#editor_save').after('<p id="save_result" style="float: left">Saved</p>')
 				setTimeout(function() {
-- 
GitLab


From 19186bf37b131c76146b27f15c337c49e54d42cd Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 9 Jan 2012 17:22:51 +0000
Subject: [PATCH 196/546] hide save button for read-only files

---
 apps/files_texteditor/js/editor.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 3c1e1542806..664dd0f1e6e 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -54,11 +54,14 @@ function setSyntaxMode(ext){
 	}	
 }
 
-function showControls(filename){
+function showControls(filename,writeperms){
 	// Loads the control bar at the top.
 	$('.actions,#file_action_panel').fadeOut('slow').promise().done(function() {
 		// Load the new toolbar.
-		var savebtnhtml = '<input type="button" id="editor_save" value="'+t('files_texteditor','Save')+'">';
+		var savebtnhtml;
+		if(writeperms=="true"){
+			var savebtnhtml = '<input type="button" id="editor_save" value="'+t('files_texteditor','Save')+'">';
+		}
 		var html = '<input type="button" id="editor_close" value="Close">';
 		$('#controls').append(html);
 		$('#editorbar').fadeIn('slow');	
@@ -134,7 +137,7 @@ function showFileEditor(dir,filename){
 						// Save mtime
 						$('#editor').attr('data-mtime', result.data.mtime);
 						// Initialise the editor
-						showControls(filename);
+						showControls(filename,result.data.write);
 						$('table').fadeOut('slow', function() {
 							$('#editor').text(result.data.filecontents);
 							$('#editor').attr('data-dir', dir);
-- 
GitLab


From 3be056404049d8a567c174a72d2864deeb81b39c Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 9 Jan 2012 18:17:26 +0000
Subject: [PATCH 197/546] improved ui and save button action

---
 apps/files_texteditor/css/style.css |  2 +-
 apps/files_texteditor/js/editor.js  | 27 ++++++++-------------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/apps/files_texteditor/css/style.css b/apps/files_texteditor/css/style.css
index 9ad6eeaa814..6d730af7262 100644
--- a/apps/files_texteditor/css/style.css
+++ b/apps/files_texteditor/css/style.css
@@ -14,7 +14,7 @@
 }
 #editor_close{
 	margin-left: auto;
-	margin-right: 167px;	
+	margin-right: 170px;	
 	display: block;
 }
 #editor_save{
diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 664dd0f1e6e..2934dcf8bb3 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -60,9 +60,9 @@ function showControls(filename,writeperms){
 		// Load the new toolbar.
 		var savebtnhtml;
 		if(writeperms=="true"){
-			var savebtnhtml = '<input type="button" id="editor_save" value="'+t('files_texteditor','Save')+'">';
+			var savebtnhtml = '<button id="editor_save">'+t('files_texteditor','Save')+'</button>';
 		}
-		var html = '<input type="button" id="editor_close" value="Close">';
+		var html = '<button id="editor_close">X</button>';
 		$('#controls').append(html);
 		$('#editorbar').fadeIn('slow');	
 		var breadcrumbhtml = '<div class="crumb svg" id="breadcrumb_file" style="background-image:url(&quot;../core/img/breadcrumb.png&quot;)"><p>'+filename+'</p></div>';
@@ -88,34 +88,23 @@ function doFileSave(){
 		var mtime = $('#editor').attr('data-mtime');
 		// Show saving spinner
 		$("#editor_save").die('click',doFileSave);
-		$('#editor_save').after('<img id="saving_icon" src="'+OC.filePath('core','img','loading.gif')+'"></img>');
+		$('#save_result').remove();
+		$('#editor_save').text(t('files_texteditor','Saving...'));//after('<img id="saving_icon" src="'+OC.filePath('core','img','loading.gif')+'"></img>');
 		// Get the data
 		var filecontents = window.aceEditor.getSession().getValue();
 		// Send the data
 		$.post(OC.filePath('files_texteditor','ajax','savefile.php'), { filecontents: filecontents, path: path, mtime: mtime },function(jsondata){
 			if(jsondata.status!='success'){
 				// Save failed
-				$('#saving_icon').remove();
+				$('#editor_save').text(t('files_texteditor','Save'));
 				$('#editor_save').after('<p id="save_result" style="float: left">Failed to save file</p>');
-				setTimeout(function() {
-					$('#save_result').fadeOut('slow',function(){ 
-						$(this).remove();
-						$("#editor_save").live('click',doFileSave); 
-					});
-				}, 2000);  	
+				$("#editor_save").live('click',doFileSave); 
 			} else {
 				// Save OK	
 				// Update mtime
 				$('#editor').attr('data-mtime',jsondata.data.mtime);
-				// Show result
-				$('#saving_icon').remove();
-				$('#editor_save').after('<p id="save_result" style="float: left">Saved</p>')
-				setTimeout(function() {
-					$('#save_result').fadeOut('slow',function(){
-						$(this).remove();       
-						$("#editor_save").live('click',doFileSave);
-					});
-				}, 2000);
+				$('#editor_save').text(t('files_texteditor','Save'));     
+				$("#editor_save").live('click',doFileSave);
 			}
 		},'json');
 	}
-- 
GitLab


From 6c78cd2765cf7ee22ea988fe9ed70af6ad191073 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 9 Jan 2012 18:39:09 +0000
Subject: [PATCH 198/546] Moved .separator to core css

---
 apps/files_pdfviewer/css/viewer.css | 9 ---------
 core/css/styles.css                 | 3 ++-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/apps/files_pdfviewer/css/viewer.css b/apps/files_pdfviewer/css/viewer.css
index cbab9e70dc2..b735dbfedfc 100755
--- a/apps/files_pdfviewer/css/viewer.css
+++ b/apps/files_pdfviewer/css/viewer.css
@@ -13,15 +13,6 @@
   display: none;
 }
 
-.separator {
-  display: inline;
-  border-left: 1px solid #d3d3d3;
-  border-right: 1px solid #fff;
-  height: 10px;
-  width:0px;
-  margin: 4px;
-}
-
 #controls2 > a > img {
     margin: 4px;
     height: 10px;
diff --git a/core/css/styles.css b/core/css/styles.css
index d1c648383c0..b0f83c9b065 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -125,4 +125,5 @@ div.jp-play-bar, div.jp-seek-bar { padding:0; }
 
 li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; color: #FF3B3B; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow: hidden; text-overflow: ellipsis; }
-.hint { background-image: url('/core/img/actions/info.png'); background-repeat:no-repeat; color: #777777; padding-left: 25px; background-position: 0 0.3em;}
\ No newline at end of file
+.hint { background-image: url('/core/img/actions/info.png'); background-repeat:no-repeat; color: #777777; padding-left: 25px; background-position: 0 0.3em;}
+.separator { display: inline; border-left: 1px solid #d3d3d3; border-right: 1px solid #fff; height: 10px; width:0px; margin: 4px; }
\ No newline at end of file
-- 
GitLab


From d91a4fcaf3ffc0783f7aef6767d7b15773808eb5 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 2 Jan 2012 20:24:05 +0100
Subject: [PATCH 199/546] Changed SQL queries for looking up contacts to only
 query once and sort at the same time.

---
 apps/contacts/ajax/addcard.php  |  1 -
 apps/contacts/ajax/contacts.php | 15 ---------------
 apps/contacts/index.php         | 17 -----------------
 3 files changed, 33 deletions(-)

diff --git a/apps/contacts/ajax/addcard.php b/apps/contacts/ajax/addcard.php
index 54c455e515f..9d782246a0a 100644
--- a/apps/contacts/ajax/addcard.php
+++ b/apps/contacts/ajax/addcard.php
@@ -61,6 +61,5 @@ foreach( $add as $propname){
 	$vcard->addProperty($propname, $value, $prop_parameters);
 }
 $id = OC_Contacts_VCard::add($aid,$vcard->serialize());
-OC_Log::write('contacts','ajax/addcard.php - adding id: '.$id,OC_Log::DEBUG);
 
 OC_Contacts_App::renderDetails($id, $vcard);
diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
index 54ad3e4c103..cf86764105f 100644
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@@ -12,21 +12,6 @@ OC_JSON::checkAppEnabled('contacts');
 
 $ids = OC_Contacts_Addressbook::activeIds(OC_User::getUser());
 $contacts = OC_Contacts_VCard::all($ids);
-//OC_Log::write('contacts','contacts.php: '.count($contacts).' contacts.',OC_Log::DEBUG);
-/*
-$addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());
-$contacts = array();
-foreach( $addressbooks as $addressbook ){
-	$addressbookcontacts = OC_Contacts_VCard::all($addressbook['id']);
-	foreach( $addressbookcontacts as $contact ){
-		if(is_null($contact['fullname'])){
-			continue;
-		}
-		$contacts[] = $contact;
-	}
-}
-usort($contacts,'contacts_namesort');
-*/
 $tmpl = new OC_TEMPLATE("contacts", "part.contacts");
 $tmpl->assign('contacts', $contacts);
 $page = $tmpl->fetchPage();
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 5ab6f293ab4..b392b195a9c 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -42,23 +42,6 @@ OC_App::setActiveNavigationEntry( 'contacts_index' );
 
 // Load a specific user?
 $id = isset( $_GET['id'] ) ? $_GET['id'] : null;
-/*
-// sort addressbooks  (use contactsort)
-usort($addressbooks,'contacts_namesort');
-
-$contacts = array();
-foreach( $addressbooks as $addressbook ){
-	$addressbookcontacts = OC_Contacts_VCard::all($addressbook['id']);
-	foreach( $addressbookcontacts as $contact ){
-		if(is_null($contact['fullname'])){
-			continue;
-		}
-		$contacts[] = $contact;
-	}
-}
-
-usort($contacts,'contacts_namesort');
-*/
 $details = array();
 
 // FIXME: This cannot work..?
-- 
GitLab


From 85ab3b3924b0e66f3cb3f4e84222b08dd3d882bc Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 2 Jan 2012 22:34:52 +0100
Subject: [PATCH 200/546] Modified thumbnail.php to use OC_Image. Cut out 50
 loc ;-)

---
 apps/contacts/thumbnail.php | 104 +++++++++++-------------------------
 1 file changed, 31 insertions(+), 73 deletions(-)

diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index bf0a6e96a5d..622718d65c6 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -2,8 +2,8 @@
 /**
  * ownCloud - Addressbook
  *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
+ * @author Thomas Tanghus
+ * @copyright 2011-2012 Thomas Tanghus <thomas@tanghus.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -26,7 +26,7 @@ OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 
 if(!function_exists('imagecreatefromjpeg')) {
-	OC_Log::write('contacts','GD module not installed',OC_Log::ERROR);
+	OC_Log::write('contacts','thumbnail.php. GD module not installed',OC_Log::DEBUG);
 	header('Content-Type: image/png');
 	// TODO: Check if it works to read the file and echo the content.
 	return 'img/person.png';
@@ -46,13 +46,16 @@ $l10n = new OC_L10N('contacts');
 
 $card = OC_Contacts_VCard::find( $id );
 if( $card === false ){
-	echo $l10n->t('Contact could not be found.');
+	OC_Log::write('contacts','thumbnail.php. Contact could not be found.',OC_Log::ERROR);
+	//echo $l10n->t('Contact could not be found.');
 	exit();
 }
 
+// FIXME: Is this check necessary? It just takes up CPU time.
 $addressbook = OC_Contacts_Addressbook::find( $card['addressbookid'] );
 if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
-	echo $l10n->t('This is not your contact.'); // This is a weird error, why would it come up? (Better feedback for users?)
+	OC_Log::write('contacts','thumbnail.php. Wrong contact/addressbook - WTF?',OC_Log::ERROR);
+	//echo $l10n->t('This is not your contact.'); // This is a weird error, why would it come up? (Better feedback for users?)
 	exit();
 }
 
@@ -60,17 +63,14 @@ $content = OC_VObject::parse($card['carddata']);
 
 // invalid vcard
 if( is_null($content)){
-	echo $l10n->t('This card is not RFC compatible.');
+	OC_Log::write('contacts','thumbnail.php. The VCard for ID '.$id.' is not RFC compatible',OC_Log::ERROR);
+	getStandardImage();
 	exit();
 }
 
-// define the width and height for the thumbnail
-// note that theese dimmensions are considered the maximum dimmension and are not fixed,
-// because we have to keep the image ratio intact or it will be deformed
-$thumbnail_width = 23;
-$thumbnail_height = 23;
+$thumbnail_size = 23;
 
-// Photo :-)
+// Finf the photo from VCard.
 foreach($content->children as $child){
 	if($child->name == 'PHOTO'){
 		foreach($child->parameters as $parameter){
@@ -78,73 +78,31 @@ foreach($content->children as $child){
 				$mime = $parameter->value;
 			}
 		}
-		$data = base64_decode($child->value);
-		$src_img = imagecreatefromstring($data);
-		if ($src_img !== false) {
-			//gets the dimmensions of the image
-			$width_orig=imageSX($src_img);
-			$height_orig=imageSY($src_img);
-			$ratio_orig = $width_orig/$height_orig;
-			
-			if ($thumbnail_width/$thumbnail_height > $ratio_orig) {
-				$new_height = $thumbnail_width/$ratio_orig;
-				$new_width = $thumbnail_width;
-			} else {
-				$new_width = $thumbnail_height*$ratio_orig;
-				$new_height = $thumbnail_height;
-			}
-			
-			$x_mid = $new_width/2;  //horizontal middle
-			$y_mid = $new_height/2; //vertical middle
-			
-			$process = imagecreatetruecolor(round($new_width), round($new_height)); 
-			if ($process == false) {
-				getStandardImage();
-				//echo 'Error creating process image: '.$new_width.'x'.$new_height;
-				OC_Log::write('contacts','Error creating process image for '.$id.' '.$new_width.'x'.$new_height,OC_Log::ERROR);
-				imagedestroy($process);
-				imagedestroy($src_img);
-				exit();
-			}
-
-			imagecopyresampled($process, $src_img, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
-			if ($process == false) {
-				getStandardImage();
-				//echo 'Error resampling process image: '.$new_width.'x'.$new_height;
-				OC_Log::write('contacts','Error resampling process image for '.$id.' '.$new_width.'x'.$new_height,OC_Log::ERROR);
-				imagedestroy($process);
-				imagedestroy($src_img);
-				exit();
-			}
-			$thumb = imagecreatetruecolor($thumbnail_width, $thumbnail_height); 
-			if ($process == false) {
+		$image = new OC_Image();
+		if($image->loadFromBase64($child->value)) {
+			if($image->centerCrop()) {
+				if($image->resize($thumbnail_size)) {
+					if(!$image()) {
+						OC_Log::write('contacts','thumbnail.php. Couldn\'t display thumbnail for ID '.$id,OC_Log::ERROR);
+						getStandardImage();
+						exit();
+					}
+				} else {
+					OC_Log::write('contacts','thumbnail.php. Couldn\'t resize thumbnail for ID '.$id,OC_Log::ERROR);
+					getStandardImage();
+					exit();
+				}
+			}else{
+				OC_Log::write('contacts','thumbnail.php. Couldn\'t crop thumbnail for ID '.$id,OC_Log::ERROR);
 				getStandardImage();
-				//echo 'Error creating thumb image: '.$thumbnail_width.'x'.$thumbnail_height;
-				OC_Log::write('contacts','Error creating thumb image for '.$id.' '.$thumbnail_width.'x'.$thumbnail_height,OC_Log::ERROR);
-				imagedestroy($process);
-				imagedestroy($src_img);
 				exit();
 			}
-			imagecopyresampled($thumb, $process, 0, 0, ($x_mid-($thumbnail_width/2)), ($y_mid-($thumbnail_height/2)), $thumbnail_width, $thumbnail_height, $thumbnail_width, $thumbnail_height);
-			if ($thumb !== false) {
-				header('Content-Type: image/png');
-				imagepng($thumb);
-			} else {
-				getStandardImage();
-				OC_Log::write('contacts','Error resampling thumb image for '.$id.' '.$thumbnail_width.'x'.$thumbnail_height,OC_Log::ERROR);
-				//echo 'An error occurred resampling thumb.';
-			}
-			imagedestroy($thumb);
-			imagedestroy($process);
-			imagedestroy($src_img);
-		}
-		else {
+		} else {
+			OC_Log::write('contacts','thumbnail.php. Couldn\'t load image string for ID '.$id,OC_Log::ERROR);
 			getStandardImage();
+			exit();
 		}
 		exit();
 	}
 }
 getStandardImage();
-
-// Not found :-(
-//echo $l10n->t('This card does not contain a photo.');
-- 
GitLab


From 47548fb8c612b5a61b00b03b525fd168fe940451 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 2 Jan 2012 23:14:58 +0100
Subject: [PATCH 201/546] Fixed showing first contact if non is selected.

---
 apps/contacts/index.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index b392b195a9c..b7c88236a80 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -45,11 +45,17 @@ $id = isset( $_GET['id'] ) ? $_GET['id'] : null;
 $details = array();
 
 // FIXME: This cannot work..?
-if( !is_null($id)/* || count($contacts)*/){
-	if(is_null($id)) $id = $contacts[0]['id'];
-	$vcard = OC_Contacts_App::getContactVCard($id);
-	$details = OC_Contacts_VCard::structureContact($vcard);
+if(is_null($id) && count($contacts) > 0) {
+	$id = $contacts[0]['id'];
 }
+$vcard = OC_Contacts_App::getContactVCard($id);
+$details = OC_Contacts_VCard::structureContact($vcard);
+
+// if( !is_null($id)/* || count($contacts)*/){
+// 	if(is_null($id)) $id = $contacts[0]['id'];
+// 	$vcard = OC_Contacts_App::getContactVCard($id);
+// 	$details = OC_Contacts_VCard::structureContact($vcard);
+// }
 
 // Include Style and Script
 OC_Util::addScript('contacts','interface');
-- 
GitLab


From 604ca61d78881e3a1a0a41e4b50ef4cb7c1eeaf0 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 4 Jan 2012 22:36:34 +0100
Subject: [PATCH 202/546] Some cleanup, better error messages and such.

---
 apps/contacts/index.php       |  7 ++++---
 apps/contacts/js/interface.js | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index b7c88236a80..0b705e71b5d 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -48,9 +48,10 @@ $details = array();
 if(is_null($id) && count($contacts) > 0) {
 	$id = $contacts[0]['id'];
 }
-$vcard = OC_Contacts_App::getContactVCard($id);
-$details = OC_Contacts_VCard::structureContact($vcard);
-
+if(!is_null($id)) {
+	$vcard = OC_Contacts_App::getContactVCard($id);
+	$details = OC_Contacts_VCard::structureContact($vcard);
+}
 // if( !is_null($id)/* || count($contacts)*/){
 // 	if(is_null($id)) $id = $contacts[0]['id'];
 // 	$vcard = OC_Contacts_App::getContactVCard($id);
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index 35639ef6cc7..b9f75bdf71a 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -1,3 +1,29 @@
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Jakob Sack
+ * @copyright 2011 Jakob Sack mail@jakobsack.de
+ * @copyright 2011-2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * TODO:  
+ * If you add a contact, its thumbnail doesnt show in the list. But when you add another one it shows up, but not for the second contact added.
+ *  Place a new contact in correct alphabetic order
+ */
+
+
 Contacts={
 	UI:{
 		showCardDAVUrl:function(username, bookname){
-- 
GitLab


From 978a08ab1c5e425210e8128e6d8efa432d593571 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 9 Jan 2012 01:17:04 +0100
Subject: [PATCH 203/546] Fixed Phone types not being saved correctly when
 adding them.

---
 apps/contacts/ajax/addproperty.php            | 20 ++++++++++++++++++-
 apps/contacts/templates/part.property.php     |  5 ++---
 .../templates/part.setpropertyform.php        |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 98877805b46..0122cf019c7 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -34,13 +34,31 @@ $name = $_POST['name'];
 $value = $_POST['value'];
 $parameters = isset($_POST['parameters'])?$_POST['parameters']:array();
 
-$property = $vcard->addProperty($name, $value, $parameters);
+$property = $vcard->addProperty($name, $value); //, $parameters);
 
 $line = count($vcard->children) - 1;
 
+// Apparently Sabre_VObject_Parameter doesn't do well with multiple values or I don't know how to do it. Tanghus.
+foreach ($parameters as $key=>$element) {
+	if(is_array($element) && strtoupper($key) == 'TYPE') { 
+		// FIXME: Maybe this doesn't only apply for TYPE?
+		// And it probably shouldn't be done here anyways :-/
+		foreach($element as $e){
+			if($e != '' && !is_null($e)){
+				$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key,$e);
+			}
+		}
+	}
+}
+
 OC_Contacts_VCard::edit($id,$vcard->serialize());
 
+$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
+$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
+
 $tmpl = new OC_Template('contacts','part.property');
+$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
 $tmpl->assign('property',OC_Contacts_VCard::structureProperty($property,$line));
 $page = $tmpl->fetchPage();
 
diff --git a/apps/contacts/templates/part.property.php b/apps/contacts/templates/part.property.php
index d930a9ca99d..e4010397500 100644
--- a/apps/contacts/templates/part.property.php
+++ b/apps/contacts/templates/part.property.php
@@ -25,15 +25,14 @@
 			<?php echo $_['property']['value']; ?>
 			<?php if(isset($_['property']['parameters']['TYPE']) && !empty($_['property']['parameters']['TYPE'])): ?>
 <?php
-	$types = array();
-	foreach($_['property']['parameters']['TYPE'] as $type):
+	foreach($_['property']['parameters']['TYPE'] as $type) {
 		if (isset($_['phone_types'][strtoupper($type)])){
 			$types[]=$_['phone_types'][strtoupper($type)];
 		}
 		else{
 			$types[]=$l->t(ucwords(strtolower($type)));
 		}
-	endforeach;
+	}
 	$label = join(' ', $types);
 ?>
 				(<?php echo $label; ?>)
diff --git a/apps/contacts/templates/part.setpropertyform.php b/apps/contacts/templates/part.setpropertyform.php
index 8635d7db1ce..3e0b8d49b52 100644
--- a/apps/contacts/templates/part.setpropertyform.php
+++ b/apps/contacts/templates/part.setpropertyform.php
@@ -45,7 +45,7 @@
 			<p class="contacts_property_name"><label for="tel"><?php echo $l->t('Phone'); ?></label></p>
 			<p class="contacts_property_data"><input id="tel" type="phone" name="value" value="<?php echo $_['property']['value'] ?>">
 				<select id="tel_type<?php echo $_['property']['checksum'] ?>" name="parameters[TYPE][]" multiple="multiple" data-placeholder="<?php echo $l->t('Type') ?>">
-					<?php echo html_select_options($_['phone_types'], isset($_['property']['parameters']['TYPE'])?$_['property']['parameters']['TYPE']:'') ?>
+					<?php echo html_select_options($_['phone_types'], isset($_['property']['parameters']['TYPE'])?$_['property']['parameters']['TYPE']:array()) ?>
 				</select></p>
 		<?php elseif($_['property']['name']=='EMAIL'): ?>
 			<p class="contacts_property_name"><label for="email"><?php echo $l->t('Email'); ?></label></p>
-- 
GitLab


From 5f04b41ea6085ee8ab9cfc58ecfc4dd5290a57d6 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jan 2012 15:35:29 +0100
Subject: [PATCH 204/546] Just a comment ;-)

---
 lib/image.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/image.php b/lib/image.php
index 45b6ad3918d..bdfa1fefd7d 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -200,6 +200,7 @@ class OC_Image {
 	}
 
 	/**
+	* (I'm open for suggestions on better method name ;)
 	* @brief Fixes orientation based on EXIF data.
 	* @returns bool.
 	*/
-- 
GitLab


From ac63afbd95b87475f9f6bf4eae76540cb70d05fb Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 9 Jan 2012 22:05:28 +0100
Subject: [PATCH 205/546] Insert new contacts alphabetically correct in the
 list. Added some tipsys to the editor.

---
 apps/contacts/css/styles.css             |  2 +-
 apps/contacts/js/interface.js            | 27 ++++++++++++++++++++----
 apps/contacts/templates/part.details.php |  5 +++++
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/apps/contacts/css/styles.css b/apps/contacts/css/styles.css
index c890be85824..7b56767bab0 100644
--- a/apps/contacts/css/styles.css
+++ b/apps/contacts/css/styles.css
@@ -4,7 +4,7 @@
 #contacts_details_name { font-weight:bold;font-size:1.1em;margin-left:25%;}
 #contacts_details_photo { margin:.5em 0em .5em 25%; }
 
-#contacts_deletecard {position:absolute;top:15px;right:0;}
+#contacts_deletecard {position:absolute;top:15px;right:15px;}
 #contacts_details_list { list-style:none; }
 #contacts_details_list li { overflow:visible; }
 #contacts_details_list li p.contacts_property_name { width:25%; float:left;text-align:right;padding-right:0.3em;color:#666; }
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index b9f75bdf71a..187c8941dcf 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -236,7 +236,10 @@ $(document).ready(function(){
 		Contacts.UI.Addressbooks.overview();
 		return false;
 	});
-	
+
+	/**
+	 * Open blank form to add new contact.
+	 */
 	$('#contacts_newcontact').click(function(){
 		$.getJSON('ajax/showaddcard.php',{},function(jsondata){
 			if(jsondata.status == 'success'){
@@ -250,14 +253,28 @@ $(document).ready(function(){
 		});
 		return false;
 	});
-
+	
+	/**
+	 * Add and insert a new contact into the list.
+	 */
 	$('#contacts_addcardform input[type="submit"]').live('click',function(){
 		$.post('ajax/addcard.php',$('#contacts_addcardform').serialize(),function(jsondata){
 			if(jsondata.status == 'success'){
 				$('#rightcontent').data('id',jsondata.data.id);
 				$('#rightcontent').html(jsondata.data.page);
 				$('#leftcontent .active').removeClass('active');
-				$('#leftcontent ul').append('<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'">'+jsondata.data.name+'</a></li>');
+				var item = '<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'"  style="background: url(thumbnail.php?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+jsondata.data.name+'</a></li>';
+				var added = false;
+				$('#leftcontent ul li').each(function(){
+					if ($(this).text().toLowerCase() > jsondata.data.name.toLowerCase()) {
+						$(this).before(item).fadeIn('fast');
+						added = true;
+						return false;
+					}
+				});
+				if(!added) {
+					$('#leftcontent ul').append(item);
+				}
 			}
 			else{
 				alert(jsondata.data.message);
@@ -265,7 +282,6 @@ $(document).ready(function(){
 		}, 'json');
 		return false;
 	});
-
 	$('.contacts_property [data-use="edit"]').live('click',function(){
 		var id = $('#rightcontent').data('id');
 		var checksum = $(this).parents('.contacts_property').first().data('checksum');
@@ -338,4 +354,7 @@ $(document).ready(function(){
 			// element has gone out of viewport
 		}
 	});
+	
+	$('.action').tipsy();
+	$('.button').tipsy();
 });
diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php
index afad0b7f64c..1482c063685 100644
--- a/apps/contacts/templates/part.details.php
+++ b/apps/contacts/templates/part.details.php
@@ -86,3 +86,8 @@
 		</li>
 	</ul>
 <?php endif; ?>
+<script language="Javascript">
+/* Re-tipsify ;-)*/
+	$('.action').tipsy();
+	$('.button').tipsy();
+</script>
-- 
GitLab


From 27d9cbd8c0f53b1859716b32aa5ca33eee4749a5 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 9 Jan 2012 21:16:41 +0000
Subject: [PATCH 206/546] Added 'Go to line' functionality

---
 apps/files_texteditor/css/style.css | 10 ++++------
 apps/files_texteditor/js/editor.js  | 28 ++++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/apps/files_texteditor/css/style.css b/apps/files_texteditor/css/style.css
index 6d730af7262..cf24950232f 100644
--- a/apps/files_texteditor/css/style.css
+++ b/apps/files_texteditor/css/style.css
@@ -12,11 +12,6 @@
 	left: 160px;
 	display: none;
 }
-#editor_close{
-	margin-left: auto;
-	margin-right: 170px;	
-	display: block;
-}
 #editor_save{
 	margin-left: 7px;
 	float: left;	
@@ -24,4 +19,7 @@
 #saving_icon{
 	margin-top: 3px;
 	float: left;	
-}
\ No newline at end of file
+}
+#gotolineval{
+	width: 30px;
+}
diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 2934dcf8bb3..081ecb75a87 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -60,26 +60,36 @@ function showControls(filename,writeperms){
 		// Load the new toolbar.
 		var savebtnhtml;
 		if(writeperms=="true"){
-			var savebtnhtml = '<button id="editor_save">'+t('files_texteditor','Save')+'</button>';
+			var editorcontrols = '<button id="editor_save">'+t('files_texteditor','Save')+'</button><div class="separator"></div><button id="gotolinebtn">Go to line:</button><input type="text" id="gotolineval">';
 		}
 		var html = '<button id="editor_close">X</button>';
 		$('#controls').append(html);
 		$('#editorbar').fadeIn('slow');	
 		var breadcrumbhtml = '<div class="crumb svg" id="breadcrumb_file" style="background-image:url(&quot;../core/img/breadcrumb.png&quot;)"><p>'+filename+'</p></div>';
-		$('.actions').before(breadcrumbhtml).before(savebtnhtml);
+		$('.actions').before(breadcrumbhtml).before(editorcontrols);
 	});
 }
  
 function bindControlEvents(){
 	$("#editor_save").die('click',doFileSave).live('click',doFileSave);	
 	$('#editor_close').die('click',hideFileEditor).live('click',hideFileEditor);
+	$('#gotolinebtn').die('click', goToLine).live('click', goToLine);
 }
 
+// returns true or false if the editor is in view or not
 function editorIsShown(){
 	// Not working as intended. Always returns true.
 	return is_editor_shown;
 }
 
+// Moves the editor view to the line number speificed in #gotolineval
+function goToLine(){
+	// Go to the line specified
+	window.aceEditor.gotoLine($('#gotolineval').val());
+	
+}
+
+// Tries to save the file.
 function doFileSave(){
 	if(editorIsShown()){
 		// Get file path
@@ -110,10 +120,12 @@ function doFileSave(){
 	}
 };
 
+// Gives the editor focus
 function giveEditorFocus(){
 	window.aceEditor.focus();
 };
 
+// Loads the file editor. Accepts two parameters, dir and filename.
 function showFileEditor(dir,filename){
 	if(!editorIsShown()){
 		// Loads the file editor and display it.
@@ -154,11 +166,17 @@ function showFileEditor(dir,filename){
 	}
 }
 
+// Fades out the editor.
 function hideFileEditor(){
 	// Fade out controls
 	$('#editor_close').fadeOut('slow');
 	// Fade out the save button
 	$('#editor_save').fadeOut('slow');
+	// Goto line items
+	$('#gotolinebtn').fadeOut('slow');
+	$('#gotolineval').fadeOut('slow');
+	// Fade out separators
+	$('.separator').fadeOut('slow');
 	// Fade out breadcrumb
 	$('#breadcrumb_file').fadeOut('slow', function(){ $(this).remove();});
 	// Fade out editor
@@ -176,7 +194,8 @@ function hideFileEditor(){
 
 // Keyboard Shortcuts
 var ctrlBtn = false;
-	
+
+// returns true if ctrl+s or cmd+s is being pressed
 function checkForSaveKeyPress(e){
 	if(e.which == 17 || e.which == 91) ctrlBtn=true;
 	if(e.which == 83 && ctrlBtn == true) {
@@ -187,6 +206,7 @@ function checkForSaveKeyPress(e){
 	}
 }
 
+// resizes the editor window
 $(window).resize(function() {
 	setEditorSize();
 });
@@ -213,7 +233,7 @@ $(document).ready(function(){
 			showFileEditor(dir,file);
 		});
 	}
-	// Binds the file save and close editor events
+	// Binds the file save and close editor events, and gotoline button
 	bindControlEvents();
 	
 	// Binds the save keyboard shortcut events
-- 
GitLab


From 9d9f254c789aa4ddced149e2d186131a7cf58c0f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Mon, 9 Jan 2012 16:45:26 -0500
Subject: [PATCH 207/546] Quick fix for file actions inside Shared folder (or
 other readonly folder)

---
 files/templates/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/index.php b/files/templates/index.php
index c4acab25cc4..fd1158a0297 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -1,3 +1,4 @@
+<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
 <div id="controls">
 	<?php echo($_['breadcrumb']); ?>
 	<?php if (!isset($_['readonly']) || !$_['readonly']):?>
@@ -16,7 +17,6 @@
 				<form data-upload-id='1' class="file_upload_form" action="ajax/upload.php" method="post" enctype="multipart/form-data" target="file_upload_target_1">
 					<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
 					<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
-					<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
 					<button class="file_upload_filename"><img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button>
 					<input class="file_upload_start" type="file" name='files[]'/>
 						<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo  ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
-- 
GitLab


From aadb81a32ac521058cb4bafe052f39f24ac9dc8e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 9 Jan 2012 23:14:11 +0100
Subject: [PATCH 208/546] OC_DB::insertid was being called too late to get the
 correct result.

---
 apps/contacts/lib/vcard.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index beb291b481e..6a248ff59e4 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -130,10 +130,11 @@ class OC_Contacts_VCard{
 
 		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*contacts_cards (addressbookid,fullname,carddata,uri,lastmodified) VALUES(?,?,?,?,?)' );
 		$result = $stmt->execute(array($id,$fn,$data,$uri,time()));
+		$newid = OC_DB::insertid('*PREFIX*contacts_cards');
 
 		OC_Contacts_Addressbook::touch($id);
 
-		return OC_DB::insertid('*PREFIX*contacts_cards');
+		return $newid;
 	}
 
 	/**
-- 
GitLab


From 60653c05440121a149a2709d719060cf77c2c58d Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 9 Jan 2012 23:16:07 +0100
Subject: [PATCH 209/546] Return standard thumbnail even if contact couldn't be
 found as it could be because it was just added,

---
 apps/contacts/thumbnail.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index 622718d65c6..e49098ce820 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -46,8 +46,8 @@ $l10n = new OC_L10N('contacts');
 
 $card = OC_Contacts_VCard::find( $id );
 if( $card === false ){
-	OC_Log::write('contacts','thumbnail.php. Contact could not be found.',OC_Log::ERROR);
-	//echo $l10n->t('Contact could not be found.');
+	OC_Log::write('contacts','thumbnail.php. Contact could not be found: '.$id,OC_Log::ERROR);
+	getStandardImage();
 	exit();
 }
 
@@ -55,7 +55,6 @@ if( $card === false ){
 $addressbook = OC_Contacts_Addressbook::find( $card['addressbookid'] );
 if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
 	OC_Log::write('contacts','thumbnail.php. Wrong contact/addressbook - WTF?',OC_Log::ERROR);
-	//echo $l10n->t('This is not your contact.'); // This is a weird error, why would it come up? (Better feedback for users?)
 	exit();
 }
 
-- 
GitLab


From 6d37c7d351200bef15c71bd44e2182d0f5b5ccec Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 9 Jan 2012 22:22:12 +0000
Subject: [PATCH 210/546] Added live search

---
 apps/files_texteditor/js/editor.js | 68 +++++++++++++++++++++++-------
 1 file changed, 52 insertions(+), 16 deletions(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 081ecb75a87..cf6d8217c67 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -60,9 +60,9 @@ function showControls(filename,writeperms){
 		// Load the new toolbar.
 		var savebtnhtml;
 		if(writeperms=="true"){
-			var editorcontrols = '<button id="editor_save">'+t('files_texteditor','Save')+'</button><div class="separator"></div><button id="gotolinebtn">Go to line:</button><input type="text" id="gotolineval">';
+			var editorcontrols = '<button id="editor_save">'+t('files_texteditor','Save')+'</button><div class="separator"></div><button id="gotolinebtn">Go to line:</button><input type="text" id="gotolineval"><div class="separator"></div>';
 		}
-		var html = '<button id="editor_close">X</button>';
+		var html = '<label for="editorseachval">Search:</label><input type="text" name="editorsearchval" id="editorsearchval"><div class="separator"></div><button id="editor_close">'+t('files_texteditor','Close')+'</button>';
 		$('#controls').append(html);
 		$('#editorbar').fadeIn('slow');	
 		var breadcrumbhtml = '<div class="crumb svg" id="breadcrumb_file" style="background-image:url(&quot;../core/img/breadcrumb.png&quot;)"><p>'+filename+'</p></div>';
@@ -74,6 +74,9 @@ function bindControlEvents(){
 	$("#editor_save").die('click',doFileSave).live('click',doFileSave);	
 	$('#editor_close').die('click',hideFileEditor).live('click',hideFileEditor);
 	$('#gotolinebtn').die('click', goToLine).live('click', goToLine);
+	$('#editorsearchval').die('keyup', doSearch).live('keyup', doSearch);
+	$('#clearsearchbtn').die('click', resetSearch).live('click', resetSearch);
+	$('#nextsearchbtn').die('click', nextSearchResult).live('click', nextSearchResult);
 }
 
 // returns true or false if the editor is in view or not
@@ -89,6 +92,48 @@ function goToLine(){
 	
 }
 
+//resets the search
+function resetSearch(){
+	$('#editorsearchval').val('');
+	$('#nextsearchbtn').remove();
+	$('#clearsearchbtn').remove();
+	window.aceEditor.gotoLine(0);	
+}
+
+// moves the cursor to the next search resukt
+function nextSearchResult(){
+	window.aceEditor.findNext();
+}
+// Performs the initial search
+function doSearch(){	
+	// check if search box empty?
+	if($('#editorsearchval').val()==''){
+		// Hide clear button	
+		window.aceEditor.gotoLine(0);
+		$('#nextsearchbtn').remove();
+		$('#clearsearchbtn').remove();
+	} else {
+		// New search
+		// Reset cursor
+		window.aceEditor.gotoLine(0);
+		// Do search
+		window.aceEditor.find($('#editorsearchval').val(),{
+			backwards: false,
+			wrap: false,
+			caseSensitive: false,
+			wholeWord: false,
+			regExp: false
+		});	
+		// Show next and clear buttons
+		// check if already there
+		if($('#nextsearchbtn').length==0){
+			var nextbtnhtml = '<button id="nextsearchbtn">Next</button>';
+			var clearbtnhtml = '<button id="clearsearchbtn">Clear</button>';
+			$('#editorsearchval').after(nextbtnhtml).after(clearbtnhtml);
+		}
+	}
+}
+
 // Tries to save the file.
 function doFileSave(){
 	if(editorIsShown()){
@@ -168,22 +213,13 @@ function showFileEditor(dir,filename){
 
 // Fades out the editor.
 function hideFileEditor(){
-	// Fade out controls
-	$('#editor_close').fadeOut('slow');
-	// Fade out the save button
-	$('#editor_save').fadeOut('slow');
-	// Goto line items
-	$('#gotolinebtn').fadeOut('slow');
-	$('#gotolineval').fadeOut('slow');
-	// Fade out separators
-	$('.separator').fadeOut('slow');
-	// Fade out breadcrumb
-	$('#breadcrumb_file').fadeOut('slow', function(){ $(this).remove();});
+	// Fades out editor controls
+	$('#controls > :not(.actions,#file_access_panel),#breadcrumb_file').fadeOut('slow',function(){
+		$(this).remove();
+	});
 	// Fade out editor
 	$('#editor').fadeOut('slow', function(){
-		$('#editor_close').remove();
-		$('#editor_save').remove();
-		$('#editor').remove();
+		$(this).remove();
 		var editorhtml = '<div id="editor"></div>';
 		$('table').after(editorhtml);
 		$('.actions,#file_access_panel').fadeIn('slow');
-- 
GitLab


From 66020c5d44d456055215734c50bcc0b8d836d3f1 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 9 Jan 2012 22:38:19 +0000
Subject: [PATCH 211/546] update page title

---
 apps/files_texteditor/js/editor.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index cf6d8217c67..ff5615518af 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -185,6 +185,8 @@ function showFileEditor(dir,filename){
 						// Initialise the editor
 						showControls(filename,result.data.write);
 						$('table').fadeOut('slow', function() {
+							// Update document title
+							document.title = filename;
 							$('#editor').text(result.data.filecontents);
 							$('#editor').attr('data-dir', dir);
 							$('#editor').attr('data-filename', filename);
@@ -220,6 +222,8 @@ function hideFileEditor(){
 	// Fade out editor
 	$('#editor').fadeOut('slow', function(){
 		$(this).remove();
+		// Reset document title
+		document.title = "ownCloud";
 		var editorhtml = '<div id="editor"></div>';
 		$('table').after(editorhtml);
 		$('.actions,#file_access_panel').fadeIn('slow');
-- 
GitLab


From 2a0ed930ef681a488d1b7f13e6f71b3d12318860 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 9 Jan 2012 22:42:28 +0000
Subject: [PATCH 212/546] improved ui for go to line button

---
 apps/files_texteditor/js/editor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index ff5615518af..54f781cd9b3 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -60,7 +60,7 @@ function showControls(filename,writeperms){
 		// Load the new toolbar.
 		var savebtnhtml;
 		if(writeperms=="true"){
-			var editorcontrols = '<button id="editor_save">'+t('files_texteditor','Save')+'</button><div class="separator"></div><button id="gotolinebtn">Go to line:</button><input type="text" id="gotolineval"><div class="separator"></div>';
+			var editorcontrols = '<button id="editor_save">'+t('files_texteditor','Save')+'</button><div class="separator"></div><label for="gotolineval">Go to line:</label><input type="text" id="gotolineval"><div class="separator"></div>';
 		}
 		var html = '<label for="editorseachval">Search:</label><input type="text" name="editorsearchval" id="editorsearchval"><div class="separator"></div><button id="editor_close">'+t('files_texteditor','Close')+'</button>';
 		$('#controls').append(html);
@@ -73,7 +73,7 @@ function showControls(filename,writeperms){
 function bindControlEvents(){
 	$("#editor_save").die('click',doFileSave).live('click',doFileSave);	
 	$('#editor_close').die('click',hideFileEditor).live('click',hideFileEditor);
-	$('#gotolinebtn').die('click', goToLine).live('click', goToLine);
+	$('#gotolineval').die('keyup', goToLine).live('keyup', goToLine);
 	$('#editorsearchval').die('keyup', doSearch).live('keyup', doSearch);
 	$('#clearsearchbtn').die('click', resetSearch).live('click', resetSearch);
 	$('#nextsearchbtn').die('click', nextSearchResult).live('click', nextSearchResult);
-- 
GitLab


From e316cddf650379b5b6cde600dd058d33169ddbb1 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 10 Jan 2012 14:59:31 +0100
Subject: [PATCH 213/546] More fixes on saving TYPE parameters. Use jQuery
 Dialog for error messages instead of alert()

---
 apps/contacts/ajax/addcard.php     | 17 ++++++-
 apps/contacts/ajax/addproperty.php |  2 +
 apps/contacts/js/interface.js      | 76 ++++++++++++++++++------------
 apps/contacts/templates/index.php  |  3 --
 4 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/apps/contacts/ajax/addcard.php b/apps/contacts/ajax/addcard.php
index 9d782246a0a..54e4faa6ed9 100644
--- a/apps/contacts/ajax/addcard.php
+++ b/apps/contacts/ajax/addcard.php
@@ -54,11 +54,24 @@ foreach( $add as $propname){
 	$value = $values[$propname];
 	if( isset( $parameters[$propname] ) && count( $parameters[$propname] )){
 		$prop_parameters = $parameters[$propname];
-	}
 	else{
 		$prop_parameters = array();
 	}
-	$vcard->addProperty($propname, $value, $prop_parameters);
+	$vcard->addProperty($propname, $value); //, $prop_parameters);
+	$line = count($vcard->children) - 1;
+	foreach ($prop_parameters as $key=>$element) {
+		if(is_array($element) && strtoupper($key) == 'TYPE') { 
+			// FIXME: Maybe this doesn't only apply for TYPE?
+			// And it probably shouldn't be done here anyways :-/
+			foreach($element as $e){
+				if($e != '' && !is_null($e)){
+					$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key,$e);
+				}
+			}
+		} else {
+			$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key,$element);
+		}
+	}
 }
 $id = OC_Contacts_VCard::add($aid,$vcard->serialize());
 
diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 0122cf019c7..0f76add3c9b 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -48,6 +48,8 @@ foreach ($parameters as $key=>$element) {
 				$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key,$e);
 			}
 		}
+	} else {
+			$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key,$element);
 	}
 }
 
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index 187c8941dcf..4a27073c156 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -18,9 +18,6 @@
  * You should have received a copy of the GNU Affero General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
- * TODO:  
- * If you add a contact, its thumbnail doesnt show in the list. But when you add another one it shows up, but not for the second contact added.
- *  Place a new contact in correct alphabetic order
  */
 
 
@@ -31,6 +28,20 @@ Contacts={
 			$('#carddav_url').show();
 			$('#carddav_url_close').show();
 		},
+		messageBox:function(title, msg) {
+			var $dialog = $('<div></div>')
+				.html(msg)
+				.dialog({
+					autoOpen: true,
+					title: title,buttons: [
+						{
+							text: "Ok",
+							click: function() { $(this).dialog("close"); }
+						}
+					]
+				}
+			);			
+		},
 		Addressbooks:{
 			overview:function(){
 				if($('#chooseaddressbook_dialog').dialog('isOpen') == true){
@@ -85,7 +96,8 @@ Contacts={
 							Contacts.UI.Contacts.update();
 							Contacts.UI.Addressbooks.overview();
 						} else {
-							alert('Error: ' + data.message);
+							Contacts.UI.messageBox('Error', data.message);
+							//alert('Error: ' + data.message);
 						}
 					  });
 				}
@@ -114,37 +126,29 @@ Contacts={
 			}
 		},
 		Contacts:{
+			/**
+			 * Reload the contacts list.
+			 */
 			update:function(){
 				$.getJSON('ajax/contacts.php',{},function(jsondata){
 					if(jsondata.status == 'success'){
 						$('#contacts').html(jsondata.data.page);
 					}
 					else{
-						alert(jsondata.data.message);
+						Contacts.UI.messageBox('Error',jsondata.data.message);
+						//alert(jsondata.data.message);
 					}
 				});
-				/*
-				var contactlist = $('#contacts');
-				var contacts = contactlist.children('li').get();
-				//alert(contacts);
-				contacts.sort(function(a, b) {
-					var compA = $(a).text().toUpperCase();
-					var compB = $(b).text().toUpperCase();
-					return (compA < compB) ? -1 : (compA > compB) ? 1 : 0;
-				})
-				$.each(contacts, function(idx, itm) { contactlist.append(itm); });
-				*/
-				setTimeout(Contacts.UI.Contacts.lazyupdate(), 500);
+				setTimeout(Contacts.UI.Contacts.lazyupdate, 500);
 			},
+			/**
+			 * Add thumbnails to the contact list as they become visible in the viewport.
+			 */
 			lazyupdate:function(){
-				//alert('lazyupdate');
 				$('#contacts li').live('inview', function(){
 					if (!$(this).find('a').attr('style')) {
-						//alert($(this).data('id') + ' has background: ' + $(this).attr('style'));
 						$(this).find('a').css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
-					}/* else {
-						alert($(this).data('id') + ' has style ' + $(this).attr('style').match('url'));
-					}*/
+					}
 				});
 			}
 		}
@@ -168,7 +172,8 @@ $(document).ready(function(){
 				$('#leftcontent li[data-id="'+jsondata.data.id+'"]').addClass('active');
 			}
 			else{
-				alert(jsondata.data.message);
+				Contacts.UI.messageBox('Error', jsondata.data.message);
+				//alert(jsondata.data.message);
 			}
 		});
 		return false;
@@ -183,7 +188,8 @@ $(document).ready(function(){
 				$('#rightcontent').empty();
 			}
 			else{
-				alert(jsondata.data.message);
+				Contacts.UI.messageBox('Error', jsondata.data.message);
+				//alert(jsondata.data.message);
 			}
 		});
 		return false;
@@ -197,7 +203,8 @@ $(document).ready(function(){
 				$('#contacts_addproperty').hide();
 			}
 			else{
-				alert(jsondata.data.message);
+				Contacts.UI.messageBox('Error', jsondata.data.message);
+				//alert(jsondata.data.message);
 			}
 		});
 		return false;
@@ -226,7 +233,8 @@ $(document).ready(function(){
 				$('#contacts_addpropertyform').before(jsondata.data.page);
 			}
 			else{
-				alert(jsondata.data.message);
+				Contacts.UI.messageBox('Error', jsondata.data.message);
+				//alert(jsondata.data.message);
 			}
 		}, 'json');
 		return false;
@@ -248,7 +256,8 @@ $(document).ready(function(){
 					.find('select').chosen();
 			}
 			else{
-				alert(jsondata.data.message);
+				Contacts.UI.messageBox('Error', jsondata.data.message);
+				//alert(jsondata.data.message);
 			}
 		});
 		return false;
@@ -277,7 +286,8 @@ $(document).ready(function(){
 				}
 			}
 			else{
-				alert(jsondata.data.message);
+				Contacts.UI.messageBox('Error', jsondata.data.message);
+				//alert(jsondata.data.message);
 			}
 		}, 'json');
 		return false;
@@ -291,7 +301,8 @@ $(document).ready(function(){
 					.find('select').chosen();
 			}
 			else{
-				alert(jsondata.data.message);
+				Contacts.UI.messageBox('Error', jsondata.data.message);
+				//alert(jsondata.data.message);
 			}
 		});
 		return false;
@@ -303,7 +314,8 @@ $(document).ready(function(){
 				$('.contacts_property[data-checksum="'+jsondata.data.oldchecksum+'"]').replaceWith(jsondata.data.page);
 			}
 			else{
-				alert(jsondata.data.message);
+				Contacts.UI.messageBox('Error', jsondata.data.message);
+				//alert(jsondata.data.message);
 			}
 		},'json');
 		return false;
@@ -317,7 +329,8 @@ $(document).ready(function(){
 				$('.contacts_property[data-checksum="'+checksum+'"]').remove();
 			}
 			else{
-				alert(jsondata.data.message);
+				Contacts.UI.messageBox('Error', jsondata.data.message);
+				//alert(jsondata.data.message);
 			}
 		});
 		return false;
@@ -357,4 +370,5 @@ $(document).ready(function(){
 	
 	$('.action').tipsy();
 	$('.button').tipsy();
+	//Contacts.UI.messageBox('Hello','Sailor');
 });
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 90143f25fa6..24484231af4 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -31,7 +31,4 @@ OC_Util::addStyle('contacts','formtastic');
 </div>
 <!-- Dialogs -->
 <div id="dialog_holder"></div>
-<div id="parsingfail_dialog" title="Parsing Fail">
-	<?php echo $l->t("There was a fail, while parsing the file."); ?>
-</div>
 <!-- End of Dialogs -->
-- 
GitLab


From fd4b63810d1276e4cc34dd18d5cf01eb0db63c98 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Tue, 10 Jan 2012 14:41:08 +0000
Subject: [PATCH 214/546] default table prefix to oc_ if not set

---
 lib/setup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/setup.php b/lib/setup.php
index 9a40c36f62c..ce7ee24e134 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -84,7 +84,7 @@ class OC_Setup {
 				$dbpass = $options['dbpass'];
 				$dbname = $options['dbname'];
 				$dbhost = $options['dbhost'];
-				$dbtableprefix = $options['dbtableprefix'];
+				$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
 				OC_Config::setValue('dbname', $dbname);
 				OC_Config::setValue('dbhost', $dbhost);
 				OC_Config::setValue('dbtableprefix', $dbtableprefix);
-- 
GitLab


From 125731cab092a724c52b60621a6ff42a5d0d8fdb Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 10 Jan 2012 16:47:52 +0100
Subject: [PATCH 215/546] fix uploading to subfolders

---
 files/templates/index.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/files/templates/index.php b/files/templates/index.php
index fd1158a0297..9ebfa41cef2 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -1,4 +1,3 @@
-<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
 <div id="controls">
 	<?php echo($_['breadcrumb']); ?>
 	<?php if (!isset($_['readonly']) || !$_['readonly']):?>
@@ -17,6 +16,7 @@
 				<form data-upload-id='1' class="file_upload_form" action="ajax/upload.php" method="post" enctype="multipart/form-data" target="file_upload_target_1">
 					<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
 					<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
+					<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
 					<button class="file_upload_filename"><img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button>
 					<input class="file_upload_start" type="file" name='files[]'/>
 						<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo  ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
@@ -25,6 +25,8 @@
 			</div>
 		</div>
 		<div id="file_action_panel"></div>
+	<?php else:?>
+		<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
 	<?php endif;?>
 </div>
 <div id='notification'></div>
-- 
GitLab


From f67e5d18e7d1c363f4d3822afa6f3d4d06f23be8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Wed, 11 Jan 2012 01:06:59 +0100
Subject: [PATCH 216/546] update translations

---
 apps/calendar/l10n/ar.php       |  86 +++++
 apps/calendar/l10n/eo.php       | 136 +++++++
 apps/calendar/l10n/eu.php       |  86 +++++
 apps/calendar/l10n/he.php       |  67 ++++
 apps/calendar/l10n/hr.php       |  86 +++++
 apps/calendar/l10n/hu_HU.php    |  84 +++++
 apps/calendar/l10n/hy.php       |  11 +
 apps/calendar/l10n/ia.php       |  27 ++
 apps/calendar/l10n/ja_JP.php    |  86 +++++
 apps/calendar/l10n/lt_LT.php    |  77 ++++
 apps/calendar/l10n/nl.php       |   2 +-
 apps/calendar/l10n/nn_NO.php    |  65 ++++
 apps/calendar/l10n/sk_SK.php    |  86 +++++
 apps/calendar/l10n/sl.php       |  86 +++++
 apps/calendar/l10n/tr.php       |  86 +++++
 apps/contacts/l10n/ar.php       |  36 ++
 apps/contacts/l10n/ca.php       |  36 ++
 apps/contacts/l10n/cs_CZ.php    |  36 ++
 apps/contacts/l10n/da.php       |  36 +-
 apps/contacts/l10n/de.php       |  29 +-
 apps/contacts/l10n/el.php       |  36 ++
 apps/contacts/l10n/eo.php       |  36 ++
 apps/contacts/l10n/es.php       |  36 ++
 apps/contacts/l10n/et_EE.php    |  36 ++
 apps/contacts/l10n/eu.php       |  36 ++
 apps/contacts/l10n/fr.php       |  36 ++
 apps/contacts/l10n/he.php       |  36 ++
 apps/contacts/l10n/hr.php       |  36 ++
 apps/contacts/l10n/hu_HU.php    |  36 ++
 apps/contacts/l10n/ia.php       |  32 ++
 apps/contacts/l10n/it.php       |  34 +-
 apps/contacts/l10n/ja_JP.php    |  36 ++
 apps/contacts/l10n/lb.php       |  36 ++
 apps/contacts/l10n/lt_LT.php    |  33 ++
 apps/contacts/l10n/nl.php       |  53 +++
 apps/contacts/l10n/nn_NO.php    |  36 ++
 apps/contacts/l10n/pl.php       |  36 ++
 apps/contacts/l10n/pt_BR.php    |  36 ++
 apps/contacts/l10n/pt_PT.php    |  36 ++
 apps/contacts/l10n/ro.php       |  36 ++
 apps/contacts/l10n/ru.php       |  36 ++
 apps/contacts/l10n/sk_SK.php    |  36 ++
 apps/contacts/l10n/sl.php       |  36 ++
 apps/contacts/l10n/sr.php       |  36 ++
 apps/contacts/l10n/sr@latin.php |  36 ++
 apps/contacts/l10n/sv.php       |  36 ++
 apps/contacts/l10n/tr.php       |  36 ++
 apps/contacts/l10n/zh_CN.php    |  36 ++
 apps/media/l10n/ar.php          |  13 +
 apps/media/l10n/bg_BG.php       |   1 -
 apps/media/l10n/ca.php          |   3 +-
 apps/media/l10n/cs_CZ.php       |   3 +-
 apps/media/l10n/da.php          |   6 +-
 apps/media/l10n/de.php          |   8 +-
 apps/media/l10n/el.php          |   1 -
 apps/media/l10n/eo.php          |  13 +
 apps/media/l10n/es.php          |   1 -
 apps/media/l10n/et_EE.php       |   1 -
 apps/media/l10n/eu.php          |  13 +
 apps/media/l10n/fr.php          |   6 +-
 apps/media/l10n/he.php          |  13 +
 apps/media/l10n/hr.php          |  13 +
 apps/media/l10n/hu_HU.php       |  13 +
 apps/media/l10n/ia.php          |  13 +
 apps/media/l10n/id.php          |   6 +-
 apps/media/l10n/it.php          |   3 +-
 apps/media/l10n/ja_JP.php       |  13 +
 apps/media/l10n/lb.php          |   1 -
 apps/media/l10n/lt_LT.php       |  13 +
 apps/media/l10n/ms_MY.php       |   1 -
 apps/media/l10n/nb_NO.php       |   1 -
 apps/media/l10n/nl.php          |   8 +-
 apps/media/l10n/nn_NO.php       |  13 +
 apps/media/l10n/pl.php          |   6 +-
 apps/media/l10n/pt_BR.php       |   1 -
 apps/media/l10n/ro.php          |   1 -
 apps/media/l10n/ru.php          |   1 -
 apps/media/l10n/sk_SK.php       |  13 +
 apps/media/l10n/sl.php          |  13 +
 apps/media/l10n/sr.php          |   1 -
 apps/media/l10n/sr@latin.php    |   1 -
 apps/media/l10n/sv.php          |   1 -
 apps/media/l10n/tr.php          |  13 +
 apps/media/l10n/zh_CN.php       |   1 -
 core/l10n/ar.php                |  34 ++
 core/l10n/bg_BG.php             |  24 +-
 core/l10n/ca.php                |  24 +-
 core/l10n/cs_CZ.php             |  16 +-
 core/l10n/da.php                |  38 +-
 core/l10n/de.php                |  24 +-
 core/l10n/el.php                |  24 +-
 core/l10n/eo.php                |  34 ++
 core/l10n/es.php                |  24 +-
 core/l10n/et_EE.php             |  24 +-
 core/l10n/eu.php                |  34 ++
 core/l10n/fr.php                |  24 +-
 core/l10n/he.php                |  34 ++
 core/l10n/hr.php                |  34 ++
 core/l10n/hu_HU.php             |  33 ++
 core/l10n/ia.php                |  27 ++
 core/l10n/id.php                |  17 +-
 core/l10n/it.php                |  26 +-
 core/l10n/ja_JP.php             |  34 ++
 core/l10n/lb.php                |  24 +-
 core/l10n/lt_LT.php             |  33 ++
 core/l10n/ms_MY.php             |  17 +-
 core/l10n/nb_NO.php             |   7 +-
 core/l10n/nl.php                |  24 +-
 core/l10n/nn_NO.php             |  34 ++
 core/l10n/pl.php                |  24 +-
 core/l10n/pt_BR.php             |  24 +-
 core/l10n/pt_PT.php             |   3 +
 core/l10n/ro.php                |  24 +-
 core/l10n/ru.php                |  24 +-
 core/l10n/sk_SK.php             |  34 ++
 core/l10n/sl.php                |  34 ++
 core/l10n/sr.php                |  24 +-
 core/l10n/sr@latin.php          |  24 +-
 core/l10n/sv.php                |  26 +-
 core/l10n/tr.php                |  34 ++
 core/l10n/zh_CN.php             |  24 +-
 files/l10n/ar.php               |  19 +
 files/l10n/bg_BG.php            |   7 +-
 files/l10n/ca.php               |   7 +-
 files/l10n/cs_CZ.php            |   7 +-
 files/l10n/da.php               |   9 +-
 files/l10n/de.php               |   7 +-
 files/l10n/el.php               |   7 +-
 files/l10n/eo.php               |  19 +
 files/l10n/es.php               |   7 +-
 files/l10n/et_EE.php            |   7 +-
 files/l10n/eu.php               |  19 +
 files/l10n/fr.php               |   7 +-
 files/l10n/he.php               |  19 +
 files/l10n/hr.php               |  19 +
 files/l10n/hu_HU.php            |  19 +
 files/l10n/ia.php               |  14 +
 files/l10n/id.php               |   1 -
 files/l10n/it.php               |   7 +-
 files/l10n/ja_JP.php            |  19 +
 files/l10n/lb.php               |   7 +-
 files/l10n/lt_LT.php            |  19 +
 files/l10n/ms_MY.php            |   1 -
 files/l10n/nb_NO.php            |   1 -
 files/l10n/nl.php               |   7 +-
 files/l10n/nn_NO.php            |  19 +
 files/l10n/pl.php               |   7 +-
 files/l10n/pt_BR.php            |   7 +-
 files/l10n/ro.php               |   7 +-
 files/l10n/ru.php               |   7 +-
 files/l10n/sk_SK.php            |  19 +
 files/l10n/sl.php               |  19 +
 files/l10n/sr.php               |   7 +-
 files/l10n/sr@latin.php         |   7 +-
 files/l10n/sv.php               |  15 +-
 files/l10n/tr.php               |  19 +
 files/l10n/zh_CN.php            |   7 +-
 l10n/.tx/config                 |  33 ++
 l10n/ar/calendar.po             | 637 +++++++++++++++++++++++++++++++
 l10n/ar/contacts.po             | 239 ++++++++++++
 l10n/ar/core.po                 | 171 +++++++++
 l10n/ar/files.po                | 112 ++++++
 l10n/ar/media.po                |  65 ++++
 l10n/ar/settings.po             | 153 ++++++++
 l10n/bg_BG/contacts.po          | 220 +++++++----
 l10n/bg_BG/core.po              | 133 ++++---
 l10n/bg_BG/files.po             |  68 ++--
 l10n/bg_BG/media.po             |  20 +-
 l10n/bg_BG/settings.po          |  70 ++--
 l10n/ca/contacts.po             | 261 ++++++++-----
 l10n/ca/core.po                 | 133 ++++---
 l10n/ca/files.po                |  68 ++--
 l10n/ca/media.po                |  25 +-
 l10n/ca/settings.po             |  77 ++--
 l10n/cs_CZ/contacts.po          | 262 ++++++++-----
 l10n/cs_CZ/core.po              | 137 ++++---
 l10n/cs_CZ/files.po             |  67 ++--
 l10n/cs_CZ/media.po             |  26 +-
 l10n/cs_CZ/settings.po          |  74 ++--
 l10n/da/contacts.po             | 254 ++++++++-----
 l10n/da/core.po                 | 148 ++++----
 l10n/da/files.po                |  72 ++--
 l10n/da/media.po                |  34 +-
 l10n/da/settings.po             |  81 ++--
 l10n/de/contacts.po             | 273 ++++++++------
 l10n/de/core.po                 | 135 ++++---
 l10n/de/files.po                |  69 ++--
 l10n/de/media.po                |  36 +-
 l10n/de/settings.po             |  74 ++--
 l10n/el/contacts.po             | 262 ++++++++-----
 l10n/el/core.po                 | 137 +++----
 l10n/el/files.po                |  68 ++--
 l10n/el/media.po                |  23 +-
 l10n/el/settings.po             |  75 ++--
 l10n/eo/calendar.po             | 637 +++++++++++++++++++++++++++++++
 l10n/eo/contacts.po             | 239 ++++++++++++
 l10n/eo/core.po                 | 171 +++++++++
 l10n/eo/files.po                | 113 ++++++
 l10n/eo/media.po                |  65 ++++
 l10n/eo/settings.po             | 154 ++++++++
 l10n/es/contacts.po             | 262 ++++++++-----
 l10n/es/core.po                 | 135 ++++---
 l10n/es/files.po                |  68 ++--
 l10n/es/media.po                |  23 +-
 l10n/es/settings.po             |  82 ++--
 l10n/et_EE/contacts.po          | 261 ++++++++-----
 l10n/et_EE/core.po              | 134 ++++---
 l10n/et_EE/files.po             |  67 ++--
 l10n/et_EE/media.po             |  20 +-
 l10n/et_EE/settings.po          |  70 ++--
 l10n/eu/calendar.po             | 637 +++++++++++++++++++++++++++++++
 l10n/eu/contacts.po             | 240 ++++++++++++
 l10n/eu/core.po                 | 171 +++++++++
 l10n/eu/files.po                | 115 ++++++
 l10n/eu/media.po                |  65 ++++
 l10n/eu/settings.po             | 155 ++++++++
 l10n/fr/contacts.po             | 262 ++++++++-----
 l10n/fr/core.po                 | 137 +++----
 l10n/fr/files.po                |  68 ++--
 l10n/fr/media.po                |  33 +-
 l10n/fr/settings.po             |  76 ++--
 l10n/he/calendar.po             | 639 ++++++++++++++++++++++++++++++++
 l10n/he/contacts.po             | 239 ++++++++++++
 l10n/he/core.po                 | 172 +++++++++
 l10n/he/files.po                | 109 ++++++
 l10n/he/media.po                |  65 ++++
 l10n/he/settings.po             | 153 ++++++++
 l10n/hr/calendar.po             | 637 +++++++++++++++++++++++++++++++
 l10n/hr/contacts.po             | 239 ++++++++++++
 l10n/hr/core.po                 | 172 +++++++++
 l10n/hr/files.po                | 115 ++++++
 l10n/hr/media.po                |  65 ++++
 l10n/hr/settings.po             | 154 ++++++++
 l10n/hu_HU/calendar.po          | 637 +++++++++++++++++++++++++++++++
 l10n/hu_HU/contacts.po          | 240 ++++++++++++
 l10n/hu_HU/core.po              | 171 +++++++++
 l10n/hu_HU/files.po             | 116 ++++++
 l10n/hu_HU/media.po             |  65 ++++
 l10n/hu_HU/settings.po          | 155 ++++++++
 l10n/hy/calendar.po             | 637 +++++++++++++++++++++++++++++++
 l10n/hy/contacts.po             | 238 ++++++++++++
 l10n/hy/core.po                 | 170 +++++++++
 l10n/hy/files.po                | 108 ++++++
 l10n/hy/media.po                |  64 ++++
 l10n/hy/settings.po             | 152 ++++++++
 l10n/ia/calendar.po             | 637 +++++++++++++++++++++++++++++++
 l10n/ia/contacts.po             | 240 ++++++++++++
 l10n/ia/core.po                 | 171 +++++++++
 l10n/ia/files.po                | 109 ++++++
 l10n/ia/media.po                |  65 ++++
 l10n/ia/settings.po             | 153 ++++++++
 l10n/id/contacts.po             | 220 +++++++----
 l10n/id/core.po                 | 133 ++++---
 l10n/id/files.po                |  56 +--
 l10n/id/media.po                |  33 +-
 l10n/id/settings.po             |  75 ++--
 l10n/it/contacts.po             | 251 ++++++++-----
 l10n/it/core.po                 | 136 ++++---
 l10n/it/files.po                |  68 ++--
 l10n/it/media.po                |  26 +-
 l10n/it/settings.po             |  76 ++--
 l10n/ja_JP/calendar.po          | 636 +++++++++++++++++++++++++++++++
 l10n/ja_JP/contacts.po          | 238 ++++++++++++
 l10n/ja_JP/core.po              | 170 +++++++++
 l10n/ja_JP/files.po             | 108 ++++++
 l10n/ja_JP/media.po             |  64 ++++
 l10n/ja_JP/settings.po          | 152 ++++++++
 l10n/lb/contacts.po             | 261 ++++++++-----
 l10n/lb/core.po                 | 135 ++++---
 l10n/lb/files.po                |  68 ++--
 l10n/lb/media.po                |  23 +-
 l10n/lb/settings.po             |  70 ++--
 l10n/lt_LT/calendar.po          | 637 +++++++++++++++++++++++++++++++
 l10n/lt_LT/contacts.po          | 239 ++++++++++++
 l10n/lt_LT/core.po              | 173 +++++++++
 l10n/lt_LT/files.po             | 112 ++++++
 l10n/lt_LT/media.po             |  65 ++++
 l10n/lt_LT/settings.po          | 154 ++++++++
 l10n/ms_MY/contacts.po          | 220 +++++++----
 l10n/ms_MY/core.po              | 135 +++----
 l10n/ms_MY/files.po             |  56 +--
 l10n/ms_MY/media.po             |  20 +-
 l10n/ms_MY/settings.po          |  70 ++--
 l10n/nb_NO/contacts.po          | 220 +++++++----
 l10n/nb_NO/core.po              | 132 ++++---
 l10n/nb_NO/files.po             |  56 +--
 l10n/nb_NO/media.po             |  23 +-
 l10n/nb_NO/settings.po          |  73 ++--
 l10n/nl/contacts.po             | 291 +++++++++------
 l10n/nl/core.po                 | 134 ++++---
 l10n/nl/files.po                |  70 ++--
 l10n/nl/media.po                |  37 +-
 l10n/nl/settings.po             |  91 +++--
 l10n/nn_NO/calendar.po          | 637 +++++++++++++++++++++++++++++++
 l10n/nn_NO/contacts.po          | 239 ++++++++++++
 l10n/nn_NO/core.po              | 171 +++++++++
 l10n/nn_NO/files.po             | 112 ++++++
 l10n/nn_NO/media.po             |  65 ++++
 l10n/nn_NO/settings.po          | 153 ++++++++
 l10n/pl/contacts.po             | 261 ++++++++-----
 l10n/pl/core.po                 | 133 ++++---
 l10n/pl/files.po                |  68 ++--
 l10n/pl/media.po                |  34 +-
 l10n/pl/settings.po             |  78 ++--
 l10n/pt_BR/contacts.po          | 261 ++++++++-----
 l10n/pt_BR/core.po              | 133 ++++---
 l10n/pt_BR/files.po             |  68 ++--
 l10n/pt_BR/media.po             |  25 +-
 l10n/pt_BR/settings.po          |  70 ++--
 l10n/pt_PT/contacts.po          | 260 ++++++++-----
 l10n/pt_PT/core.po              | 130 ++++---
 l10n/pt_PT/files.po             |  54 +--
 l10n/pt_PT/media.po             |  20 +-
 l10n/pt_PT/settings.po          |  64 ++--
 l10n/ro/contacts.po             | 261 ++++++++-----
 l10n/ro/core.po                 | 134 ++++---
 l10n/ro/files.po                |  68 ++--
 l10n/ro/media.po                |  23 +-
 l10n/ro/settings.po             |  73 ++--
 l10n/ru/contacts.po             | 261 ++++++++-----
 l10n/ru/core.po                 | 133 ++++---
 l10n/ru/files.po                |  68 ++--
 l10n/ru/media.po                |  23 +-
 l10n/ru/settings.po             |  71 ++--
 l10n/sk_SK/calendar.po          | 637 +++++++++++++++++++++++++++++++
 l10n/sk_SK/contacts.po          | 238 ++++++++++++
 l10n/sk_SK/core.po              | 171 +++++++++
 l10n/sk_SK/files.po             | 112 ++++++
 l10n/sk_SK/media.po             |  64 ++++
 l10n/sk_SK/settings.po          | 153 ++++++++
 l10n/sl/calendar.po             | 637 +++++++++++++++++++++++++++++++
 l10n/sl/contacts.po             | 240 ++++++++++++
 l10n/sl/core.po                 | 172 +++++++++
 l10n/sl/files.po                | 114 ++++++
 l10n/sl/media.po                |  65 ++++
 l10n/sl/settings.po             | 153 ++++++++
 l10n/sr/contacts.po             | 261 ++++++++-----
 l10n/sr/core.po                 | 133 ++++---
 l10n/sr/files.po                |  68 ++--
 l10n/sr/media.po                |  20 +-
 l10n/sr/settings.po             |  70 ++--
 l10n/sr@latin/contacts.po       | 261 ++++++++-----
 l10n/sr@latin/core.po           | 133 ++++---
 l10n/sr@latin/files.po          |  68 ++--
 l10n/sr@latin/media.po          |  20 +-
 l10n/sr@latin/settings.po       |  70 ++--
 l10n/sv/contacts.po             | 261 ++++++++-----
 l10n/sv/core.po                 | 136 ++++---
 l10n/sv/files.po                |  76 ++--
 l10n/sv/media.po                |  21 +-
 l10n/sv/settings.po             |  74 ++--
 l10n/templates/calendar.pot     |   2 +-
 l10n/templates/contacts.pot     | 216 +++++++----
 l10n/templates/core.pot         | 125 ++++---
 l10n/templates/files.pot        |  50 ++-
 l10n/templates/media.pot        |  16 +-
 l10n/templates/settings.pot     |  60 ++-
 l10n/tr/calendar.po             | 637 +++++++++++++++++++++++++++++++
 l10n/tr/contacts.po             | 239 ++++++++++++
 l10n/tr/core.po                 | 171 +++++++++
 l10n/tr/files.po                | 112 ++++++
 l10n/tr/media.po                |  65 ++++
 l10n/tr/settings.po             | 153 ++++++++
 l10n/zh_CN/contacts.po          | 261 ++++++++-----
 l10n/zh_CN/core.po              | 133 ++++---
 l10n/zh_CN/files.po             |  68 ++--
 l10n/zh_CN/media.po             |  23 +-
 l10n/zh_CN/settings.po          |  73 ++--
 settings/l10n/ar.php            |  28 ++
 settings/l10n/bg_BG.php         |   4 +-
 settings/l10n/ca.php            |   7 +-
 settings/l10n/cs_CZ.php         |   4 +-
 settings/l10n/da.php            |   9 +-
 settings/l10n/de.php            |   5 +-
 settings/l10n/el.php            |   6 +-
 settings/l10n/eo.php            |  28 ++
 settings/l10n/es.php            |   7 +-
 settings/l10n/et_EE.php         |   4 +-
 settings/l10n/eu.php            |  28 ++
 settings/l10n/fr.php            |   6 +-
 settings/l10n/he.php            |  28 ++
 settings/l10n/hr.php            |  28 ++
 settings/l10n/hu_HU.php         |  25 ++
 settings/l10n/ia.php            |  21 ++
 settings/l10n/id.php            |   5 +-
 settings/l10n/it.php            |   6 +-
 settings/l10n/ja_JP.php         |  28 ++
 settings/l10n/lb.php            |   4 +-
 settings/l10n/lt_LT.php         |  26 ++
 settings/l10n/ms_MY.php         |   4 +-
 settings/l10n/nb_NO.php         |   4 +-
 settings/l10n/nl.php            |  16 +-
 settings/l10n/nn_NO.php         |  28 ++
 settings/l10n/pl.php            |   5 +-
 settings/l10n/pt_BR.php         |   4 +-
 settings/l10n/ro.php            |   4 +-
 settings/l10n/ru.php            |   4 +-
 settings/l10n/sk_SK.php         |  28 ++
 settings/l10n/sl.php            |  28 ++
 settings/l10n/sr.php            |   4 +-
 settings/l10n/sr@latin.php      |   4 +-
 settings/l10n/sv.php            |   6 +-
 settings/l10n/tr.php            |  28 ++
 settings/l10n/zh_CN.php         |   4 +-
 404 files changed, 31418 insertions(+), 6043 deletions(-)
 create mode 100644 apps/calendar/l10n/ar.php
 create mode 100644 apps/calendar/l10n/eo.php
 create mode 100644 apps/calendar/l10n/eu.php
 create mode 100644 apps/calendar/l10n/he.php
 create mode 100644 apps/calendar/l10n/hr.php
 create mode 100644 apps/calendar/l10n/hu_HU.php
 create mode 100644 apps/calendar/l10n/hy.php
 create mode 100644 apps/calendar/l10n/ia.php
 create mode 100644 apps/calendar/l10n/ja_JP.php
 create mode 100644 apps/calendar/l10n/lt_LT.php
 create mode 100644 apps/calendar/l10n/nn_NO.php
 create mode 100644 apps/calendar/l10n/sk_SK.php
 create mode 100644 apps/calendar/l10n/sl.php
 create mode 100644 apps/calendar/l10n/tr.php
 create mode 100644 apps/contacts/l10n/ar.php
 create mode 100644 apps/contacts/l10n/ca.php
 create mode 100644 apps/contacts/l10n/cs_CZ.php
 create mode 100644 apps/contacts/l10n/el.php
 create mode 100644 apps/contacts/l10n/eo.php
 create mode 100644 apps/contacts/l10n/es.php
 create mode 100644 apps/contacts/l10n/et_EE.php
 create mode 100644 apps/contacts/l10n/eu.php
 create mode 100644 apps/contacts/l10n/fr.php
 create mode 100644 apps/contacts/l10n/he.php
 create mode 100644 apps/contacts/l10n/hr.php
 create mode 100644 apps/contacts/l10n/hu_HU.php
 create mode 100644 apps/contacts/l10n/ia.php
 create mode 100644 apps/contacts/l10n/ja_JP.php
 create mode 100644 apps/contacts/l10n/lb.php
 create mode 100644 apps/contacts/l10n/lt_LT.php
 create mode 100644 apps/contacts/l10n/nl.php
 create mode 100644 apps/contacts/l10n/nn_NO.php
 create mode 100644 apps/contacts/l10n/pl.php
 create mode 100644 apps/contacts/l10n/pt_BR.php
 create mode 100644 apps/contacts/l10n/pt_PT.php
 create mode 100644 apps/contacts/l10n/ro.php
 create mode 100644 apps/contacts/l10n/ru.php
 create mode 100644 apps/contacts/l10n/sk_SK.php
 create mode 100644 apps/contacts/l10n/sl.php
 create mode 100644 apps/contacts/l10n/sr.php
 create mode 100644 apps/contacts/l10n/sr@latin.php
 create mode 100644 apps/contacts/l10n/sv.php
 create mode 100644 apps/contacts/l10n/tr.php
 create mode 100644 apps/contacts/l10n/zh_CN.php
 create mode 100644 apps/media/l10n/ar.php
 create mode 100644 apps/media/l10n/eo.php
 create mode 100644 apps/media/l10n/eu.php
 create mode 100644 apps/media/l10n/he.php
 create mode 100644 apps/media/l10n/hr.php
 create mode 100644 apps/media/l10n/hu_HU.php
 create mode 100644 apps/media/l10n/ia.php
 create mode 100644 apps/media/l10n/ja_JP.php
 create mode 100644 apps/media/l10n/lt_LT.php
 create mode 100644 apps/media/l10n/nn_NO.php
 create mode 100644 apps/media/l10n/sk_SK.php
 create mode 100644 apps/media/l10n/sl.php
 create mode 100644 apps/media/l10n/tr.php
 create mode 100644 core/l10n/ar.php
 create mode 100644 core/l10n/eo.php
 create mode 100644 core/l10n/eu.php
 create mode 100644 core/l10n/he.php
 create mode 100644 core/l10n/hr.php
 create mode 100644 core/l10n/hu_HU.php
 create mode 100644 core/l10n/ia.php
 create mode 100644 core/l10n/ja_JP.php
 create mode 100644 core/l10n/lt_LT.php
 create mode 100644 core/l10n/nn_NO.php
 create mode 100644 core/l10n/pt_PT.php
 create mode 100644 core/l10n/sk_SK.php
 create mode 100644 core/l10n/sl.php
 create mode 100644 core/l10n/tr.php
 create mode 100644 files/l10n/ar.php
 create mode 100644 files/l10n/eo.php
 create mode 100644 files/l10n/eu.php
 create mode 100644 files/l10n/he.php
 create mode 100644 files/l10n/hr.php
 create mode 100644 files/l10n/hu_HU.php
 create mode 100644 files/l10n/ia.php
 create mode 100644 files/l10n/ja_JP.php
 create mode 100644 files/l10n/lt_LT.php
 create mode 100644 files/l10n/nn_NO.php
 create mode 100644 files/l10n/sk_SK.php
 create mode 100644 files/l10n/sl.php
 create mode 100644 files/l10n/tr.php
 create mode 100644 l10n/.tx/config
 create mode 100644 l10n/ar/calendar.po
 create mode 100644 l10n/ar/contacts.po
 create mode 100644 l10n/ar/core.po
 create mode 100644 l10n/ar/files.po
 create mode 100644 l10n/ar/media.po
 create mode 100644 l10n/ar/settings.po
 create mode 100644 l10n/eo/calendar.po
 create mode 100644 l10n/eo/contacts.po
 create mode 100644 l10n/eo/core.po
 create mode 100644 l10n/eo/files.po
 create mode 100644 l10n/eo/media.po
 create mode 100644 l10n/eo/settings.po
 create mode 100644 l10n/eu/calendar.po
 create mode 100644 l10n/eu/contacts.po
 create mode 100644 l10n/eu/core.po
 create mode 100644 l10n/eu/files.po
 create mode 100644 l10n/eu/media.po
 create mode 100644 l10n/eu/settings.po
 create mode 100644 l10n/he/calendar.po
 create mode 100644 l10n/he/contacts.po
 create mode 100644 l10n/he/core.po
 create mode 100644 l10n/he/files.po
 create mode 100644 l10n/he/media.po
 create mode 100644 l10n/he/settings.po
 create mode 100644 l10n/hr/calendar.po
 create mode 100644 l10n/hr/contacts.po
 create mode 100644 l10n/hr/core.po
 create mode 100644 l10n/hr/files.po
 create mode 100644 l10n/hr/media.po
 create mode 100644 l10n/hr/settings.po
 create mode 100644 l10n/hu_HU/calendar.po
 create mode 100644 l10n/hu_HU/contacts.po
 create mode 100644 l10n/hu_HU/core.po
 create mode 100644 l10n/hu_HU/files.po
 create mode 100644 l10n/hu_HU/media.po
 create mode 100644 l10n/hu_HU/settings.po
 create mode 100644 l10n/hy/calendar.po
 create mode 100644 l10n/hy/contacts.po
 create mode 100644 l10n/hy/core.po
 create mode 100644 l10n/hy/files.po
 create mode 100644 l10n/hy/media.po
 create mode 100644 l10n/hy/settings.po
 create mode 100644 l10n/ia/calendar.po
 create mode 100644 l10n/ia/contacts.po
 create mode 100644 l10n/ia/core.po
 create mode 100644 l10n/ia/files.po
 create mode 100644 l10n/ia/media.po
 create mode 100644 l10n/ia/settings.po
 create mode 100644 l10n/ja_JP/calendar.po
 create mode 100644 l10n/ja_JP/contacts.po
 create mode 100644 l10n/ja_JP/core.po
 create mode 100644 l10n/ja_JP/files.po
 create mode 100644 l10n/ja_JP/media.po
 create mode 100644 l10n/ja_JP/settings.po
 create mode 100644 l10n/lt_LT/calendar.po
 create mode 100644 l10n/lt_LT/contacts.po
 create mode 100644 l10n/lt_LT/core.po
 create mode 100644 l10n/lt_LT/files.po
 create mode 100644 l10n/lt_LT/media.po
 create mode 100644 l10n/lt_LT/settings.po
 create mode 100644 l10n/nn_NO/calendar.po
 create mode 100644 l10n/nn_NO/contacts.po
 create mode 100644 l10n/nn_NO/core.po
 create mode 100644 l10n/nn_NO/files.po
 create mode 100644 l10n/nn_NO/media.po
 create mode 100644 l10n/nn_NO/settings.po
 create mode 100644 l10n/sk_SK/calendar.po
 create mode 100644 l10n/sk_SK/contacts.po
 create mode 100644 l10n/sk_SK/core.po
 create mode 100644 l10n/sk_SK/files.po
 create mode 100644 l10n/sk_SK/media.po
 create mode 100644 l10n/sk_SK/settings.po
 create mode 100644 l10n/sl/calendar.po
 create mode 100644 l10n/sl/contacts.po
 create mode 100644 l10n/sl/core.po
 create mode 100644 l10n/sl/files.po
 create mode 100644 l10n/sl/media.po
 create mode 100644 l10n/sl/settings.po
 create mode 100644 l10n/tr/calendar.po
 create mode 100644 l10n/tr/contacts.po
 create mode 100644 l10n/tr/core.po
 create mode 100644 l10n/tr/files.po
 create mode 100644 l10n/tr/media.po
 create mode 100644 l10n/tr/settings.po
 create mode 100644 settings/l10n/ar.php
 create mode 100644 settings/l10n/eo.php
 create mode 100644 settings/l10n/eu.php
 create mode 100644 settings/l10n/he.php
 create mode 100644 settings/l10n/hr.php
 create mode 100644 settings/l10n/hu_HU.php
 create mode 100644 settings/l10n/ia.php
 create mode 100644 settings/l10n/ja_JP.php
 create mode 100644 settings/l10n/lt_LT.php
 create mode 100644 settings/l10n/nn_NO.php
 create mode 100644 settings/l10n/sk_SK.php
 create mode 100644 settings/l10n/sl.php
 create mode 100644 settings/l10n/tr.php

diff --git a/apps/calendar/l10n/ar.php b/apps/calendar/l10n/ar.php
new file mode 100644
index 00000000000..c22d816640b
--- /dev/null
+++ b/apps/calendar/l10n/ar.php
@@ -0,0 +1,86 @@
+<?php $TRANSLATIONS = array(
+"Timezone changed" => "تم تغيير المنطقة الزمنية",
+"Invalid request" => "طلب غير م�هوم",
+"Calendar" => "الجدول الزمني",
+"Wrong calendar" => "جدول زمني خاطئ",
+"Birthday" => "عيد ميلاد",
+"Business" => "عمل",
+"Call" => "إتصال",
+"Clients" => "الزبائن",
+"Deliverer" => "المرسل",
+"Holidays" => "عطلة",
+"Ideas" => "أ�كار",
+"Journey" => "رحلة",
+"Jubilee" => "يوبيل",
+"Meeting" => "إجتماع",
+"Other" => "شيء آخر",
+"Personal" => "شخصي",
+"Projects" => "مشاريع",
+"Questions" => "اسئلة",
+"Work" => "العمل",
+"Does not repeat" => "لا يعاد",
+"Daily" => "يومي",
+"Weekly" => "أسبوعي",
+"Every Weekday" => "كل نهاية الأسبوع",
+"Bi-Weekly" => "كل اسبوعين",
+"Monthly" => "شهري",
+"Yearly" => "سنوي",
+"Not an array" => "ليس ص�ي�",
+"All day" => "كل النهار",
+"Missing fields" => "خانات خالية من المعلومات",
+"Title" => "عنوان",
+"From Date" => "من تاريخ",
+"From Time" => "إلى تاريخ",
+"To Date" => "إلى يوم",
+"To Time" => "إلى وقت",
+"The event ends before it starts" => "هذا الحدث ينتهي قبل أن يبدأ",
+"There was a database fail" => "خطأ �ي قاعدة البيانات",
+"Week" => "إسبوع",
+"Month" => "شهر",
+"List" => "قائمة",
+"Today" => "اليوم",
+"Calendars" => "الجداول الزمنية",
+"There was a fail, while parsing the file." => "لم يتم قراءة المل� بنجاح.",
+"Choose active calendars" => "إختر الجدول الزمني الرئيسي",
+"New Calendar" => "جدول زمني جديد",
+"CalDav Link" => "وصلة CalDav",
+"Download" => "تحميل",
+"Edit" => "تعديل",
+"Delete" => "حذ�",
+"New calendar" => "جدول زمني جديد",
+"Edit calendar" => "عادل الجدول الزمني",
+"Displayname" => "الاسم المرئي",
+"Active" => "حالي",
+"Calendar color" => "لون الجدول الزمني",
+"Save" => "إح�ظ",
+"Submit" => "أرسل",
+"Cancel" => "إلغاء",
+"Edit an event" => "عادل حدث",
+"Export" => "تصدير المعلومات",
+"Title of the Event" => "عنوان الحدث",
+"Category" => "�ئة",
+"Select category" => "اختر ال�ئة",
+"All Day Event" => "حدث �ي يوم كامل",
+"From" => "من",
+"To" => "إلى",
+"Advanced options" => "خيارات متقدمة",
+"Repeat" => "إعادة",
+"Location" => "مكان",
+"Location of the Event" => "مكان الحدث",
+"Description" => "مواص�ات",
+"Description of the Event" => "وص� الحدث",
+"Import Ical File" => "إدخال مل� Ical",
+"How to import the new calendar?" => "كي�ية إدخال مل� جدول زمني ؟",
+"Import into an existing calendar" => "إدخال معلومات إلى جدول زمني حالي",
+"Import into a new calendar" => "إدخال معلومات إلى جدول زمني جديد",
+"Please choose the calendar" => "الرجاء إختر الجدول الزمني",
+"Import" => "إدخال",
+"Back" => "الرجوع",
+"Please fill out the form" => "الرجاء إملء الخانات",
+"Create a new event" => "إضا�ة حدث جديد",
+"Timezone" => "المنطقة الزمنية",
+"Timeformat" => "شكل الوقت",
+"24h" => "24 ساعة",
+"12h" => "12 ساعة",
+"Calendar CalDAV syncing address:" => "عنوان لتحديث ال CalDAV الجدول الزمني"
+);
diff --git a/apps/calendar/l10n/eo.php b/apps/calendar/l10n/eo.php
new file mode 100644
index 00000000000..ba4ec43d811
--- /dev/null
+++ b/apps/calendar/l10n/eo.php
@@ -0,0 +1,136 @@
+<?php $TRANSLATIONS = array(
+"New Timezone:" => "Nova horzono:",
+"Timezone changed" => "La horozono estas �an�ita",
+"Invalid request" => "Nevalida peto",
+"Calendar" => "Kalendaro",
+"Wrong calendar" => "Mal�usta kalendaro",
+"Birthday" => "Naski�otago",
+"Business" => "Negoco",
+"Call" => "Voko",
+"Clients" => "Klientoj",
+"Deliverer" => "Livero",
+"Holidays" => "Ferioj",
+"Ideas" => "Ideoj",
+"Journey" => "Voja�o",
+"Jubilee" => "Jubileo",
+"Meeting" => "Rendevuo",
+"Other" => "Alia",
+"Personal" => "Persona",
+"Projects" => "Projektoj",
+"Questions" => "Demandoj",
+"Work" => "Laboro",
+"Does not repeat" => "Ĉi tio ne ripeti�as",
+"Daily" => "Tage",
+"Weekly" => "Semajne",
+"Every Weekday" => "Tage",
+"Bi-Weekly" => "Semajnduope",
+"Monthly" => "Monate",
+"Yearly" => "Jare",
+"never" => "neniam",
+"by occurrences" => "laÅ­ aperoj",
+"by date" => "laÅ­ dato",
+"by monthday" => "laÅ­ monattago",
+"by weekday" => "laÅ­ semajntago",
+"Monday" => "lundo",
+"Tuesday" => "mardo",
+"Wednesday" => "merkredo",
+"Thursday" => "ĵaŭdo",
+"Friday" => "vendredo",
+"Saturday" => "sabato",
+"Sunday" => "dimanĉo",
+"events week of month" => "la monatsemajno de la okazaĵo",
+"first" => "unua",
+"second" => "dua",
+"third" => "tria",
+"fourth" => "kvara",
+"fifth" => "kvina",
+"last" => "lasta",
+"January" => "Januaro",
+"February" => "Februaro",
+"March" => "Marto",
+"April" => "Aprilo",
+"May" => "Majo",
+"June" => "Junio",
+"July" => "Julio",
+"August" => "AÅ­gusto",
+"September" => "Septembro",
+"October" => "Oktobro",
+"November" => "Novembro",
+"December" => "Decembro",
+"by events date" => "laŭ okazaĵdato",
+"by yearday(s)" => "laÅ­ jartago(j)",
+"by weeknumber(s)" => "laÅ­ semajnnumero(j)",
+"by day and month" => "laÅ­ tago kaj monato",
+"Not an array" => "Ĉi tio ne estas tabeltipa",
+"Date" => "Dato",
+"Cal." => "Kal.",
+"All day" => "La tuta tago",
+"Missing fields" => "Mankas iuj kampoj",
+"Title" => "Titolo",
+"From Date" => "ekde la dato",
+"From Time" => "ekde la horo",
+"To Date" => "�is la dato",
+"To Time" => "�is la horo",
+"The event ends before it starts" => "La okazaĵo finas antaŭ komenci",
+"There was a database fail" => "Datumbaza malsukceso okazis",
+"Week" => "Semajno",
+"Month" => "Monato",
+"List" => "Listo",
+"Today" => "HodiaÅ­",
+"Calendars" => "Kalendaroj",
+"There was a fail, while parsing the file." => "Malsukceso okazis dum analizo de la dosiero.",
+"Choose active calendars" => "Elektu aktivajn kalendarojn",
+"New Calendar" => "Nova kalendaro",
+"CalDav Link" => "CalDav-a ligilo",
+"Download" => "El�uti",
+"Edit" => "Redakti",
+"Delete" => "Forigi",
+"New calendar" => "Nova kalendaro",
+"Edit calendar" => "Redakti la kalendaron",
+"Displayname" => "Montrota nomo",
+"Active" => "Aktiva",
+"Calendar color" => "Kalendarokoloro",
+"Save" => "Konservi",
+"Submit" => "Sendi",
+"Cancel" => "Nuligi",
+"Edit an event" => "Redakti okazaĵon",
+"Export" => "Elporti",
+"Title of the Event" => "Okazaĵotitolo",
+"Category" => "Kategorio",
+"Select category" => "Elekti kategorion",
+"All Day Event" => "La tuta tago",
+"From" => "Ekde",
+"To" => "Äœis",
+"Advanced options" => "Altnivela agordo",
+"Repeat" => "Ripeti",
+"Advanced" => "Altnivelo",
+"Select weekdays" => "Elekti semajntagojn",
+"Select days" => "Elekti tagojn",
+"and the events day of year." => "kaj la jartago de la okazaĵo.",
+"and the events day of month." => "kaj la monattago de la okazaĵo.",
+"Select months" => "Elekti monatojn",
+"Select weeks" => "Elekti semajnojn",
+"and the events week of year." => "kaj la jarsemajno de la okazaĵo.",
+"Interval" => "Intervalo",
+"End" => "Fino",
+"occurrences" => "aperoj",
+"Location" => "Loko",
+"Location of the Event" => "Okazaĵoloko",
+"Description" => "Priskribo",
+"Description of the Event" => "Okazaĵopriskribo",
+"Import Ical File" => "Enporti Ical-dosieron",
+"How to import the new calendar?" => "Kiel enporti la novan kalendaron?",
+"Import into an existing calendar" => "Enporti en estantan kalendaron",
+"Import into a new calendar" => "Enporti en novan kalendaron",
+"Please choose the calendar" => "Bonvolu elekti kalendaron",
+"Import" => "Enporti",
+"Back" => "AntaÅ­eniri",
+"Please fill out the form" => "Bonvolu plenigi la formularon",
+"Create a new event" => "Krei okazaĵon",
+"Timezone" => "Horozono",
+"Check always for changes of the timezone" => "Ĉiam kontroli ĉu la horzono �an�i�is",
+"Timeformat" => "Tempoformo",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Adreso de kalendarosinkronigo per CalDAV:"
+);
diff --git a/apps/calendar/l10n/eu.php b/apps/calendar/l10n/eu.php
new file mode 100644
index 00000000000..b7ac1e1b59d
--- /dev/null
+++ b/apps/calendar/l10n/eu.php
@@ -0,0 +1,86 @@
+<?php $TRANSLATIONS = array(
+"Timezone changed" => "Ordu-zona aldatuta",
+"Invalid request" => "Baligabeko eskaera",
+"Calendar" => "Egutegia",
+"Wrong calendar" => "Egutegi okerra",
+"Birthday" => "Jaioteguna",
+"Business" => "Negozioa",
+"Call" => "Deia",
+"Clients" => "Bezeroak",
+"Deliverer" => "Banatzailea",
+"Holidays" => "Oporrak",
+"Ideas" => "Ideiak",
+"Journey" => "Bidaia",
+"Jubilee" => "Urteurrena",
+"Meeting" => "Bilera",
+"Other" => "Bestelakoa",
+"Personal" => "Pertsonala",
+"Projects" => "Proiektuak",
+"Questions" => "Galderak",
+"Work" => "Lana",
+"Does not repeat" => "Ez da errepikatzen",
+"Daily" => "Egunero",
+"Weekly" => "Astero",
+"Every Weekday" => "Asteko egun guztietan",
+"Bi-Weekly" => "Bi-Astero",
+"Monthly" => "Hilabetero",
+"Yearly" => "Urtero",
+"Not an array" => "Ez da bektore bat",
+"All day" => "Egun guztia",
+"Missing fields" => "Eremuak faltan",
+"Title" => "Izenburua",
+"From Date" => "Hasierako Data",
+"From Time" => "Hasierako Ordua",
+"To Date" => "Bukaerako Data",
+"To Time" => "Bukaerako Ordua",
+"The event ends before it starts" => "Gertaera hasi baino lehen bukatzen da",
+"There was a database fail" => "Datu baseak huts egin du",
+"Week" => "Astea",
+"Month" => "Hilabetea",
+"List" => "Zerrenda",
+"Today" => "Gaur",
+"Calendars" => "Egutegiak",
+"There was a fail, while parsing the file." => "Huts bat egon da, fitxategia aztertzen zen bitartea.",
+"Choose active calendars" => "Aukeratu egutegi aktiboak",
+"New Calendar" => "Egutegi berria",
+"CalDav Link" => "CalDav Lotura",
+"Download" => "Deskargatu",
+"Edit" => "Editatu",
+"Delete" => "Ezabatu",
+"New calendar" => "Egutegi berria",
+"Edit calendar" => "Editatu egutegia",
+"Displayname" => "Bistaratzeko izena",
+"Active" => "Aktiboa",
+"Calendar color" => "Egutegiaren kolorea",
+"Save" => "Gorde",
+"Submit" => "Bidali",
+"Cancel" => "Ezeztatu",
+"Edit an event" => "Editatu gertaera",
+"Export" => "Exportatu",
+"Title of the Event" => "Gertaeraren izenburua",
+"Category" => "Kategoria",
+"Select category" => "Aukeratu kategoria",
+"All Day Event" => "Egun osoko gertaera",
+"From" => "Hasiera",
+"To" => "Bukaera",
+"Advanced options" => "Aukera aurreratuak",
+"Repeat" => "Errepikatu",
+"Location" => "Kokalekua",
+"Location of the Event" => "Gertaeraren kokalekua",
+"Description" => "Deskribapena",
+"Description of the Event" => "Gertaeraren deskribapena",
+"Import Ical File" => "inportatu ical fitxategia",
+"How to import the new calendar?" => "Nola inportatu egutegi berria?",
+"Import into an existing calendar" => "inportatu existitzen den egutegi batera",
+"Import into a new calendar" => "inportatu egutegi berri batera",
+"Please choose the calendar" => "Mesedez aukeratu egutegia",
+"Import" => "Importatu",
+"Back" => "Atzera",
+"Please fill out the form" => "Mesedez inprimakia bete",
+"Create a new event" => "Sortu gertaera berria",
+"Timezone" => "Ordu-zona",
+"Timeformat" => "Ordu formatua",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Egutegiaren CalDAV sinkronizazio helbidea"
+);
diff --git a/apps/calendar/l10n/he.php b/apps/calendar/l10n/he.php
new file mode 100644
index 00000000000..a399a9ff676
--- /dev/null
+++ b/apps/calendar/l10n/he.php
@@ -0,0 +1,67 @@
+<?php $TRANSLATIONS = array(
+"Timezone changed" => "�זור זמן השתנה",
+"Invalid request" => "בקשה ל� חוקית",
+"Calendar" => "ח שנה",
+"Wrong calendar" => "לוח שנה ל� נכון",
+"Birthday" => "יו� הולדת",
+"Business" => "עסקי�",
+"Call" => "שיחה",
+"Clients" => "לקוחות",
+"Deliverer" => "משלוח",
+"Holidays" => "חגי�",
+"Ideas" => "רעיונות",
+"Journey" => "מסע",
+"Jubilee" => "יובל",
+"Meeting" => "פגישה",
+"Other" => "�חר",
+"Personal" => "�ישי",
+"Projects" => "פרוייקטי�",
+"Questions" => "ש�לות",
+"Work" => "עבודה",
+"Does not repeat" => "לל� חזרה",
+"Daily" => "יומי",
+"Weekly" => "שבועי",
+"Every Weekday" => "כל יו� עבודה",
+"Bi-Weekly" => "דו שבועי",
+"Monthly" => "חודשי",
+"Yearly" => "שנתי",
+"Not an array" => "ל� מערך",
+"All day" => "היו�",
+"Title" => "כותרת",
+"Week" => "שבוע",
+"Month" => "חודש",
+"List" => "רשימה",
+"Today" => "היו�",
+"Calendars" => "לוחות שנה",
+"There was a fail, while parsing the file." => "�ירעה שגי�ה בעת פענוח הקובץ.",
+"Choose active calendars" => "בחר לוחות שנה פעילי�",
+"New Calendar" => "לוח שנה חדש",
+"CalDav Link" => "קישור CalDav",
+"Download" => "הורדה",
+"Edit" => "עריכה",
+"Delete" => "מחיקה",
+"New calendar" => "לוח שנה חדש",
+"Edit calendar" => "עריכת לוח שנה",
+"Displayname" => "ש� תצוגה",
+"Active" => "פעיל",
+"Calendar color" => "צבע לוח שנה",
+"Save" => "שמירה",
+"Submit" => "שליחה",
+"Cancel" => "ביטול",
+"Edit an event" => "עריכת �ירוע",
+"Export" => "יצו�",
+"Title of the Event" => "כותרת ה�ירוע",
+"Category" => "קטגוריה",
+"Select category" => "בחר קטגוריה",
+"All Day Event" => "�ירוע של כל היו�",
+"From" => "מ�ת",
+"To" => "עבור",
+"Repeat" => "חזרה",
+"Location" => "מיקו�",
+"Location of the Event" => "מיקו� ה�ירוע",
+"Description" => "תי�ור",
+"Description of the Event" => "תי�ור ה�ירוע",
+"Import" => "יבו�",
+"Create a new event" => "יצירת �ירוע חדש",
+"Timezone" => "�זור זמן"
+);
diff --git a/apps/calendar/l10n/hr.php b/apps/calendar/l10n/hr.php
new file mode 100644
index 00000000000..7cdda27770a
--- /dev/null
+++ b/apps/calendar/l10n/hr.php
@@ -0,0 +1,86 @@
+<?php $TRANSLATIONS = array(
+"Timezone changed" => "Vremenska zona promijenjena",
+"Invalid request" => "Neispravan zahtjev",
+"Calendar" => "Kalendar",
+"Wrong calendar" => "Pogrešan kalendar",
+"Birthday" => "Rođendan",
+"Business" => "Poslovno",
+"Call" => "Poziv",
+"Clients" => "Klijenti",
+"Deliverer" => "Dostavlja�",
+"Holidays" => "Odmori",
+"Ideas" => "Ideje",
+"Journey" => "Putovanje",
+"Jubilee" => "Obljetnica",
+"Meeting" => "Sastanak",
+"Other" => "Ostalo",
+"Personal" => "Osobno",
+"Projects" => "Projekti",
+"Questions" => "Pitanja",
+"Work" => "Posao",
+"Does not repeat" => "Ne ponavlja se",
+"Daily" => "Dnevno",
+"Weekly" => "Tjedno",
+"Every Weekday" => "Svakog radnog dana",
+"Bi-Weekly" => "Dvotjedno",
+"Monthly" => "Mjese�no",
+"Yearly" => "Godišnje",
+"Not an array" => "Nije niz",
+"All day" => "Cijeli dan",
+"Missing fields" => "Nedostaju polja",
+"Title" => "Naslov",
+"From Date" => "Datum Od",
+"From Time" => "Vrijeme Od",
+"To Date" => "Datum Do",
+"To Time" => "Vrijeme Do",
+"The event ends before it starts" => "Događaj završava prije nego po�inje",
+"There was a database fail" => "Pogreška u bazi podataka",
+"Week" => "Tjedan",
+"Month" => "Mjesec",
+"List" => "Lista",
+"Today" => "Danas",
+"Calendars" => "Kalendari",
+"There was a fail, while parsing the file." => "Pogreška pri �itanju datoteke.",
+"Choose active calendars" => "Odaberite aktive kalendare",
+"New Calendar" => "Novi Kalendar",
+"CalDav Link" => "CalDav Poveznica",
+"Download" => "Spremi lokalno",
+"Edit" => "Uredi",
+"Delete" => "Briši",
+"New calendar" => "Novi kalendar",
+"Edit calendar" => "Uredi kalendar",
+"Displayname" => "Naziv",
+"Active" => "Aktivan",
+"Calendar color" => "Boja kalendara",
+"Save" => "Spremi",
+"Submit" => "Potvrdi",
+"Cancel" => "Odustani",
+"Edit an event" => "Uredi događaj",
+"Export" => "Izvoz",
+"Title of the Event" => "Naslov Događaja",
+"Category" => "Kategorija",
+"Select category" => "Odabir kategorije",
+"All Day Event" => "Cjelodnevni događaj",
+"From" => "Od",
+"To" => "Za",
+"Advanced options" => "Napredne mogućnosti",
+"Repeat" => "Ponavljanje",
+"Location" => "Lokacija",
+"Location of the Event" => "Lokacija Događaja",
+"Description" => "Opis",
+"Description of the Event" => "Opis događaja",
+"Import Ical File" => "Uvoz Ical datoteke",
+"How to import the new calendar?" => "Kako uvesti novi kalendar?",
+"Import into an existing calendar" => "Uvoz u postojeći kalendar",
+"Import into a new calendar" => "Uvoz u novi kalendar",
+"Please choose the calendar" => "Odaberite kalendar",
+"Import" => "Uvoz",
+"Back" => "Natrag",
+"Please fill out the form" => "Molimo popunite obrazac",
+"Create a new event" => "Unesi novi događaj",
+"Timezone" => "Vremenska zona",
+"Timeformat" => "Format vremena",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Adresa za CalDAV sinkronizaciju kalendara"
+);
diff --git a/apps/calendar/l10n/hu_HU.php b/apps/calendar/l10n/hu_HU.php
new file mode 100644
index 00000000000..0e61307794f
--- /dev/null
+++ b/apps/calendar/l10n/hu_HU.php
@@ -0,0 +1,84 @@
+<?php $TRANSLATIONS = array(
+"Timezone changed" => "Időzóna megváltozott",
+"Invalid request" => "Érvénytelen kérés",
+"Calendar" => "Naptár",
+"Wrong calendar" => "Hibás naptár",
+"Birthday" => "Születésap",
+"Business" => "Ãœzlet",
+"Call" => "Hívás",
+"Clients" => "Kliensek",
+"Deliverer" => "Szállító",
+"Holidays" => "Ãœnnepek",
+"Ideas" => "Ötletek",
+"Journey" => "Utazás",
+"Jubilee" => "Évforduló",
+"Meeting" => "Találkozó",
+"Other" => "Egyéb",
+"Personal" => "Személyes",
+"Projects" => "Projektek",
+"Questions" => "Kérdések",
+"Work" => "Munka",
+"Does not repeat" => "Nem ismétlődik",
+"Daily" => "Napi",
+"Weekly" => "Heti",
+"Every Weekday" => "Minden hétköznap",
+"Bi-Weekly" => "Kéthetente",
+"Monthly" => "Havi",
+"Yearly" => "Évi",
+"Not an array" => "Nem egy tömb",
+"All day" => "Egész nap",
+"Missing fields" => "Hiányzó mezők",
+"Title" => "Cím",
+"From Date" => "Napjától",
+"From Time" => "Időtől",
+"To Date" => "Napig",
+"To Time" => "Ideig",
+"The event ends before it starts" => "Az esemény véget ér a kezdés előtt.",
+"There was a database fail" => "Adatbázis hiba történt",
+"Week" => "Hét",
+"Month" => "Hónap",
+"List" => "Lista",
+"Today" => "Ma",
+"Calendars" => "Naptárak",
+"There was a fail, while parsing the file." => "Probléma volt a fájl elemzése közben.",
+"Choose active calendars" => "Aktív naptár kiválasztása",
+"New Calendar" => "Új naptár",
+"CalDav Link" => "CalDAV link",
+"Download" => "Letöltés",
+"Edit" => "Szerkesztés",
+"Delete" => "Törlés",
+"New calendar" => "Új naptár",
+"Edit calendar" => "Naptár szerkesztése",
+"Displayname" => "Megjelenítési név",
+"Active" => "Aktív",
+"Calendar color" => "Naptár szín",
+"Save" => "Mentés",
+"Submit" => "Beküldés",
+"Cancel" => "Mégse",
+"Edit an event" => "Esemény szerkesztése",
+"Export" => "Export",
+"Title of the Event" => "Az esemény címe",
+"Category" => "Kategória",
+"Select category" => "Kategória kiválasztása",
+"All Day Event" => "Egész napos esemény",
+"Advanced options" => "Haladó beállítások",
+"Repeat" => "Ismétlés",
+"Location" => "Hely",
+"Location of the Event" => "Az esemény helyszíne",
+"Description" => "Leírás",
+"Description of the Event" => "Az esemény leírása",
+"Import Ical File" => "Ical fájl importálása",
+"How to import the new calendar?" => "Hogyan legyen importálva az új naptár?",
+"Import into an existing calendar" => "Létező naptárba importálás",
+"Import into a new calendar" => "Új naptárba importálás",
+"Please choose the calendar" => "Válassz naptárat",
+"Import" => "Importálás",
+"Back" => "Vissza",
+"Please fill out the form" => "Töltsd ki az űrlapot",
+"Create a new event" => "Új esemény létrehozása",
+"Timezone" => "Időzóna",
+"Timeformat" => "Időformátum",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Naptár CalDAV szinkronizálási cím:"
+);
diff --git a/apps/calendar/l10n/hy.php b/apps/calendar/l10n/hy.php
new file mode 100644
index 00000000000..3b675693b0f
--- /dev/null
+++ b/apps/calendar/l10n/hy.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Calendar" => "Õ•Ö€Õ¡Ö�Õ¸Ö‚ÕµÖ�",
+"Other" => "Ô±ÕµÕ¬",
+"Month" => "Ô±Õ´Õ«Õ½",
+"Today" => "Ô±ÕµÕ½Ö…Ö€",
+"Download" => "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬",
+"Delete" => "Õ‹Õ¶Õ»Õ¥Õ¬",
+"Save" => "ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬",
+"Submit" => "Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬",
+"Description" => "Õ†Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶"
+);
diff --git a/apps/calendar/l10n/ia.php b/apps/calendar/l10n/ia.php
new file mode 100644
index 00000000000..547c96e5a07
--- /dev/null
+++ b/apps/calendar/l10n/ia.php
@@ -0,0 +1,27 @@
+<?php $TRANSLATIONS = array(
+"Calendar" => "Calendario",
+"Projects" => "Projectos",
+"Work" => "Travalio",
+"All day" => "Omne die",
+"Title" => "Titulo",
+"Week" => "Septimana",
+"Month" => "Mense",
+"List" => "Lista",
+"Today" => "Hodie",
+"Calendars" => "Calendarios",
+"Choose active calendars" => "Selectionar calendarios active",
+"New Calendar" => "Nove calendario",
+"Download" => "Discarga",
+"Edit" => "Modificar",
+"Delete" => "Deler",
+"Edit calendar" => "Modificar calendario",
+"Active" => "Active",
+"Calendar color" => "Color de calendario",
+"Save" => "Salveguardar",
+"Submit" => "Inviar",
+"Cancel" => "Cancellar",
+"Select category" => "Selectionar categoria",
+"From" => "Ab",
+"To" => "A",
+"Description" => "Description"
+);
diff --git a/apps/calendar/l10n/ja_JP.php b/apps/calendar/l10n/ja_JP.php
new file mode 100644
index 00000000000..90653c1d6f2
--- /dev/null
+++ b/apps/calendar/l10n/ja_JP.php
@@ -0,0 +1,86 @@
+<?php $TRANSLATIONS = array(
+"Timezone changed" => "タイムゾーン�変更�れ���",
+"Invalid request" => "無効�リクエスト��",
+"Calendar" => "カレンダー",
+"Wrong calendar" => "誤��カレンダー��",
+"Birthday" => "誕生日",
+"Business" => "ビジ�ス",
+"Call" => "電話を��る",
+"Clients" => "顧客",
+"Deliverer" => "��会社",
+"Holidays" => "休日",
+"Ideas" => "アイデア",
+"Journey" => "旅行",
+"Jubilee" => "記念祭",
+"Meeting" => "ミーティング",
+"Other" => "��他",
+"Personal" => "個人",
+"Projects" => "プロジェクト",
+"Questions" => "質�事項",
+"Work" => "仕事",
+"Does not repeat" => "繰り返���",
+"Daily" => "毎日",
+"Weekly" => "毎週",
+"Every Weekday" => "毎平日",
+"Bi-Weekly" => "2週間��",
+"Monthly" => "毎月",
+"Yearly" => "毎年",
+"Not an array" => "�列���り��ん",
+"All day" => "終日",
+"Missing fields" => "項目��り��ん",
+"Title" => "タイトル",
+"From Date" => "開始日",
+"From Time" => "開始時間",
+"To Date" => "終了日",
+"To Time" => "終了時間",
+"The event ends before it starts" => "イベント終了時間�開始時間より先��",
+"There was a database fail" => "データベースフェイル��り���",
+"Week" => "週",
+"Month" => "月",
+"List" => "リスト",
+"Today" => "今日",
+"Calendars" => "カレンダー",
+"There was a fail, while parsing the file." => "ファイルを構文解��る際�失敗����",
+"Choose active calendars" => "アクティブ�カレンダーを�択������",
+"New Calendar" => "新��カレンダーを作��る",
+"CalDav Link" => "CalDav��リンク",
+"Download" => "ダウンロード",
+"Edit" => "編集",
+"Delete" => "削除",
+"New calendar" => "新��カレンダーを作��る",
+"Edit calendar" => "カレンダーを編集",
+"Displayname" => "表示�",
+"Active" => "アクティブ",
+"Calendar color" => "カレンダー�色",
+"Save" => "�存",
+"Submit" => "完了",
+"Cancel" => "キャンセル",
+"Edit an event" => "イベントを編集",
+"Export" => "エクス�ート",
+"Title of the Event" => "イベント�タイトル",
+"Category" => "カテゴリー",
+"Select category" => "カテゴリーを�択������",
+"All Day Event" => "終日イベント",
+"From" => "開始",
+"To" => "終了",
+"Advanced options" => "詳細設定",
+"Repeat" => "繰り返�",
+"Location" => "場所",
+"Location of the Event" => "イベント�場所",
+"Description" => "メモ",
+"Description of the Event" => "イベント�メモ",
+"Import Ical File" => "iCalファイル�イン�ート",
+"How to import the new calendar?" => "新��カレンダー�イン�ート方法�？",
+"Import into an existing calendar" => "既存カレンダー�イン�ート���",
+"Import into a new calendar" => "新��カレンダー�イン�ート���",
+"Please choose the calendar" => "カレンダーを�択������",
+"Import" => "イン�ート",
+"Back" => "戻る",
+"Please fill out the form" => "フォーム�入力������",
+"Create a new event" => "新��イベントを作��る",
+"Timezone" => "タイムゾーン",
+"Timeformat" => "時刻�フォーマット",
+"24h" => "24時間制",
+"12h" => "12時間制",
+"Calendar CalDAV syncing address:" => "カレンダー�CalDAVシンクアドレス"
+);
diff --git a/apps/calendar/l10n/lt_LT.php b/apps/calendar/l10n/lt_LT.php
new file mode 100644
index 00000000000..6baff16abfe
--- /dev/null
+++ b/apps/calendar/l10n/lt_LT.php
@@ -0,0 +1,77 @@
+<?php $TRANSLATIONS = array(
+"Timezone changed" => "Laiko zona pakeista",
+"Invalid request" => "Klaidinga užklausa",
+"Calendar" => "Kalendorius",
+"Wrong calendar" => "Ne tas kalendorius",
+"Birthday" => "Gimtadienis",
+"Business" => "Verslas",
+"Call" => "Skambu�iai",
+"Clients" => "Klientai",
+"Holidays" => "IÅ¡eiginÄ—s",
+"Ideas" => "IdÄ—jos",
+"Journey" => "KelionÄ—",
+"Jubilee" => "Jubiliejus",
+"Meeting" => "Susitikimas",
+"Does not repeat" => "Nekartoti",
+"Daily" => "Kasdien",
+"Weekly" => "KiekvienÄ… savaitÄ™",
+"Every Weekday" => "KiekvienÄ… savaitÄ—s dienÄ…",
+"Bi-Weekly" => "Kas dvi savaites",
+"Monthly" => "Kiekvieną mėnesį",
+"Yearly" => "Kiekvienais metais",
+"Not an array" => "Ne masyvas",
+"All day" => "Visa diena",
+"Missing fields" => "Trūkstami laukai",
+"Title" => "Pavadinimas",
+"To Date" => "Iki datos",
+"To Time" => "Iki laiko",
+"The event ends before it starts" => "Įvykis baigiasi anks�iau nei jis prasideda",
+"There was a database fail" => "Įvyko duomenų bazės klaida",
+"Week" => "SavaitÄ—",
+"Month" => "MÄ—nuo",
+"List" => "Sąrašas",
+"Today" => "Å iandien",
+"Calendars" => "Kalendoriai",
+"There was a fail, while parsing the file." => "Apdorojant failą įvyko klaida.",
+"Choose active calendars" => "Pasirinkite naudojamus kalendorius",
+"New Calendar" => "Naujas kalendorius",
+"CalDav Link" => "CalDav adresas",
+"Download" => "Atsisiųsti",
+"Edit" => "Keisti",
+"Delete" => "Trinti",
+"New calendar" => "Naujas kalendorius",
+"Edit calendar" => "Taisyti kalendorių",
+"Displayname" => "Pavadinimas",
+"Active" => "Naudojamas",
+"Save" => "IÅ¡saugoti",
+"Submit" => "IÅ¡saugoti",
+"Cancel" => "Atšaukti",
+"Edit an event" => "Taisyti įvykį",
+"Export" => "Eksportuoti",
+"Title of the Event" => "Įvykio pavadinimas",
+"Category" => "Kategorija",
+"Select category" => "Pasirinkite kategorijÄ…",
+"All Day Event" => "Visos dienos įvykis",
+"From" => "Nuo",
+"To" => "Iki",
+"Advanced options" => "Papildomi nustatymai",
+"Repeat" => "Kartoti",
+"Location" => "Vieta",
+"Location of the Event" => "Įvykio vieta",
+"Description" => "Aprašymas",
+"Description of the Event" => "Įvykio aprašymas",
+"Import Ical File" => "Importuoti Ical failÄ…",
+"How to import the new calendar?" => "Kaip importuoti naują kalendorių?",
+"Import into an existing calendar" => "Importuoti į esantį katalogą",
+"Import into a new calendar" => "Importuoti į naują kalendorių",
+"Please choose the calendar" => "Pasirinkite kalendorių",
+"Import" => "Importuoti",
+"Back" => "Atgal",
+"Please fill out the form" => "Užpildykite formą",
+"Create a new event" => "Sukurti naują įvykį",
+"Timezone" => "Laiko juosta",
+"Timeformat" => "Laiko formatas",
+"24h" => "24val",
+"12h" => "12val",
+"Calendar CalDAV syncing address:" => "CalDAV kalendoriaus synchronizavimo adresas:"
+);
diff --git a/apps/calendar/l10n/nl.php b/apps/calendar/l10n/nl.php
index 3f7ebfe274e..03211b6cba9 100644
--- a/apps/calendar/l10n/nl.php
+++ b/apps/calendar/l10n/nl.php
@@ -2,7 +2,7 @@
 "Authentication error" => "Foute aanvraag",
 "Timezone changed" => "U kunt maar een venster tegelijk openen.",
 "Invalid request" => "Ongeldige aanvraag",
-"Calendar" => "Weergavenaam",
+"Calendar" => "Kalender",
 "Does not repeat" => "Wordt niet herhaald",
 "Daily" => "Dagelijks",
 "Weekly" => "Wekelijks",
diff --git a/apps/calendar/l10n/nn_NO.php b/apps/calendar/l10n/nn_NO.php
new file mode 100644
index 00000000000..be1c7a02940
--- /dev/null
+++ b/apps/calendar/l10n/nn_NO.php
@@ -0,0 +1,65 @@
+<?php $TRANSLATIONS = array(
+"Timezone changed" => "Endra tidssone",
+"Invalid request" => "Ugyldig førespurnad",
+"Calendar" => "Kalender",
+"Wrong calendar" => "Feil kalender",
+"Birthday" => "Bursdag",
+"Business" => "Forretning",
+"Call" => "Telefonsamtale",
+"Clients" => "Klientar",
+"Deliverer" => "Forsending",
+"Holidays" => "Høgtid",
+"Ideas" => "Idear",
+"Journey" => "Reise",
+"Jubilee" => "Jubileum",
+"Meeting" => "Møte",
+"Other" => "Anna",
+"Personal" => "Personleg",
+"Projects" => "Prosjekt",
+"Questions" => "Spørsmål",
+"Work" => "Arbeid",
+"Does not repeat" => "Ikkje gjenta",
+"Daily" => "Kvar dag",
+"Weekly" => "Kvar veke",
+"Every Weekday" => "Kvar vekedag",
+"Bi-Weekly" => "Annakvar veke",
+"Monthly" => "Kvar månad",
+"Yearly" => "Kvart år",
+"Not an array" => "Ikkje ein matrise",
+"All day" => "Heile dagen",
+"Title" => "Tittel",
+"Week" => "Veke",
+"Month" => "MÃ¥nad",
+"List" => "Liste",
+"Today" => "I dag",
+"Calendars" => "Kalendarar",
+"There was a fail, while parsing the file." => "Feil ved tolking av fila.",
+"Choose active calendars" => "Vel aktive kalendarar",
+"New Calendar" => "Ny kalender",
+"CalDav Link" => "CalDav-lenkje",
+"Download" => "Last ned",
+"Edit" => "Endra",
+"Delete" => "Slett",
+"New calendar" => "Ny kalender",
+"Edit calendar" => "Endra kalendarar",
+"Displayname" => "Visingsnamn",
+"Active" => "Aktiv",
+"Calendar color" => "Kalenderfarge",
+"Save" => "Lagra",
+"Submit" => "Lagra",
+"Cancel" => "Avbryt",
+"Edit an event" => "Endra ein hending",
+"Title of the Event" => "Tittel på hendinga",
+"Category" => "Kategori",
+"Select category" => "Vel kategori",
+"All Day Event" => "Heildagshending",
+"From" => "Frå",
+"To" => "Til",
+"Repeat" => "Gjenta",
+"Location" => "Stad",
+"Location of the Event" => "Stad for hendinga",
+"Description" => "Skildring",
+"Description of the Event" => "Skildring av hendinga",
+"Create a new event" => "Opprett ei ny hending",
+"Timezone" => "Tidssone"
+);
diff --git a/apps/calendar/l10n/sk_SK.php b/apps/calendar/l10n/sk_SK.php
new file mode 100644
index 00000000000..0268143792c
--- /dev/null
+++ b/apps/calendar/l10n/sk_SK.php
@@ -0,0 +1,86 @@
+<?php $TRANSLATIONS = array(
+"Timezone changed" => "Časové pásmo zmenené",
+"Invalid request" => "Neplatná požiadavka",
+"Calendar" => "Kalendár",
+"Wrong calendar" => "Zlý kalendár",
+"Birthday" => "Narodeniny",
+"Business" => "Podnikanie",
+"Call" => "Hovor",
+"Clients" => "Klienti",
+"Deliverer" => "Doru�ovateľ",
+"Holidays" => "Prázdniny",
+"Ideas" => "Nápady",
+"Journey" => "Cesta",
+"Jubilee" => "Jubileá",
+"Meeting" => "Stretnutia",
+"Other" => "Ostatné",
+"Personal" => "Osobné",
+"Projects" => "Projekty",
+"Questions" => "Otázky",
+"Work" => "Práca",
+"Does not repeat" => "Neopakovať",
+"Daily" => "Denne",
+"Weekly" => "Týždenne",
+"Every Weekday" => "Každý výkend",
+"Bi-Weekly" => "Každý druhý týždeň",
+"Monthly" => "Mesa�ne",
+"Yearly" => "Ro�ne",
+"Not an array" => "Nie je pole",
+"All day" => "Celý deň",
+"Missing fields" => "Nevyplnené položky",
+"Title" => "Nadpis",
+"From Date" => "Od Dátumu",
+"From Time" => "Od ÄŒasu",
+"To Date" => "Do Dátumu",
+"To Time" => "Do ÄŒasu",
+"The event ends before it starts" => "Udalosť kon�í ešte pred tým než za�ne",
+"There was a database fail" => "Nastala chyba databázy",
+"Week" => "Týždeň",
+"Month" => "Mesiac",
+"List" => "Zoznam",
+"Today" => "Dnes",
+"Calendars" => "Kalendáre",
+"There was a fail, while parsing the file." => "Nastala chyba po�as parsovania súboru.",
+"Choose active calendars" => "Zvoľte aktívne kalendáre",
+"New Calendar" => "Nový kalendár",
+"CalDav Link" => "CalDav odkaz",
+"Download" => "Stiahnuť",
+"Edit" => "Upraviť",
+"Delete" => "Odstrániť",
+"New calendar" => "Nový kalendár",
+"Edit calendar" => "Upraviť kalendár",
+"Displayname" => "Zobrazené meno",
+"Active" => "Aktívne",
+"Calendar color" => "Farba kalendáru",
+"Save" => "Uložiť",
+"Submit" => "Odoslať",
+"Cancel" => "Zrušiť",
+"Edit an event" => "Upraviť udalosť",
+"Export" => "Exportovať",
+"Title of the Event" => "Nadpis Udalosti",
+"Category" => "Kategória",
+"Select category" => "Vybrať kategóriu",
+"All Day Event" => "Celodenná udalosť",
+"From" => "Od",
+"To" => "Do",
+"Advanced options" => "Pokro�ilé možnosti",
+"Repeat" => "Opakovať",
+"Location" => "Poloha",
+"Location of the Event" => "Poloha Udalosti",
+"Description" => "Popis",
+"Description of the Event" => "Popis Udalosti",
+"Import Ical File" => "Importovať Ical súbor",
+"How to import the new calendar?" => "Ako importovať nový kalendár?",
+"Import into an existing calendar" => "Importovať do existujúceho kalendára",
+"Import into a new calendar" => "Importovať do nového kalendára",
+"Please choose the calendar" => "Prosím zvoľte kalendár",
+"Import" => "Importovať",
+"Back" => "Späť",
+"Please fill out the form" => "Prosím vyplňte formulár",
+"Create a new event" => "Vytvoriť udalosť",
+"Timezone" => "Časová zóna",
+"Timeformat" => "Formát �asu",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Synchroniza�ná adresa kalendára CalDAV: "
+);
diff --git a/apps/calendar/l10n/sl.php b/apps/calendar/l10n/sl.php
new file mode 100644
index 00000000000..4f091ac39d1
--- /dev/null
+++ b/apps/calendar/l10n/sl.php
@@ -0,0 +1,86 @@
+<?php $TRANSLATIONS = array(
+"Timezone changed" => "ÄŒasovna Cona spremenjena",
+"Invalid request" => "Neveljavna zahteva",
+"Calendar" => "Kolendar",
+"Wrong calendar" => "Napa�en Kolendar",
+"Birthday" => "Rojstni Dan",
+"Business" => "Poslovno",
+"Call" => "Pokli�i",
+"Clients" => "Stranke",
+"Deliverer" => "Dobavitelj",
+"Holidays" => "Dopust",
+"Ideas" => "Ideje",
+"Journey" => "Potovanje",
+"Jubilee" => "Obletnica",
+"Meeting" => "Sestanek",
+"Other" => "Ostalo",
+"Personal" => "Osebno",
+"Projects" => "Projekt",
+"Questions" => "Vprašanja",
+"Work" => "Delo",
+"Does not repeat" => "Se ne ponavlja",
+"Daily" => "Dnevno",
+"Weekly" => "Tedensko",
+"Every Weekday" => "Vsak dan v tednu",
+"Bi-Weekly" => "Dvakrat Tedensko",
+"Monthly" => "Mese�no",
+"Yearly" => "Letno",
+"Not an array" => "Not an array",
+"All day" => "Cel dan",
+"Missing fields" => "Mankajo�a polja",
+"Title" => "Naslov",
+"From Date" => "od Datum",
+"From Time" => "od ÄŒas",
+"To Date" => "do Datum",
+"To Time" => "do ÄŒas",
+"The event ends before it starts" => "Dogodek se kon�a preden se za�ne",
+"There was a database fail" => "Napaka v podatkovni bazi. Kontaktirajte Administratorja",
+"Week" => "Teden",
+"Month" => "Mesec",
+"List" => "Seznam",
+"Today" => "Danes",
+"Calendars" => "Kolendarji",
+"There was a fail, while parsing the file." => "Pri raz�lenjevanju datoteke je prišlo do napake.",
+"Choose active calendars" => "Izberi aktivni Kolendar",
+"New Calendar" => "Nov Kolendar",
+"CalDav Link" => "CalDav Povezava",
+"Download" => "Naloži dol",
+"Edit" => "Uredi",
+"Delete" => "Izbriši",
+"New calendar" => "Nov Kolendar",
+"Edit calendar" => "Uredi Kolendar",
+"Displayname" => "Prikazano Ime",
+"Active" => "Aktivno",
+"Calendar color" => "Barva Kolendarja",
+"Save" => "Shrani",
+"Submit" => "Potrdi",
+"Cancel" => "Prekli�i",
+"Edit an event" => "Uredi Dogodek",
+"Export" => "Izvozi",
+"Title of the Event" => "Naslov",
+"Category" => "Kategorija",
+"Select category" => "Izberi Kategorijo",
+"All Day Event" => "Celodnevni Dogodek",
+"From" => "Od",
+"To" => "Za",
+"Advanced options" => "Napredne Možnosti",
+"Repeat" => "Ponovi",
+"Location" => "Lokacija",
+"Location of the Event" => "Lokacija dogodka",
+"Description" => "Opis",
+"Description of the Event" => "Opis Dogodka",
+"Import Ical File" => "Uvozi iCal datoteko",
+"How to import the new calendar?" => "Koko uvozim nov kolendar?",
+"Import into an existing calendar" => "Uvozi v obstoje�i kolendar",
+"Import into a new calendar" => "Uvozi v nov Kolendar",
+"Please choose the calendar" => "Izberi kolendar",
+"Import" => "Uvozi",
+"Back" => "Nazaj",
+"Please fill out the form" => "Prosim izpolnite obrazec",
+"Create a new event" => "Ustvari nov dogodek",
+"Timezone" => "ÄŒasovna Cona",
+"Timeformat" => "ÄŒasovni format",
+"24h" => "24ur",
+"12h" => "12ur",
+"Calendar CalDAV syncing address:" => "Kolendarjev CalDAV sinhronizacijski naslov"
+);
diff --git a/apps/calendar/l10n/tr.php b/apps/calendar/l10n/tr.php
new file mode 100644
index 00000000000..64264c5a8ba
--- /dev/null
+++ b/apps/calendar/l10n/tr.php
@@ -0,0 +1,86 @@
+<?php $TRANSLATIONS = array(
+"Timezone changed" => "Zaman dilimi deÄŸiÅŸtirildi",
+"Invalid request" => "Geçersiz istek",
+"Calendar" => "Takvim",
+"Wrong calendar" => "Yanlış takvim",
+"Birthday" => "Doğum günü",
+"Business" => "Ä°ÅŸ",
+"Call" => "Arama",
+"Clients" => "Müşteriler",
+"Deliverer" => "Teslimatçı",
+"Holidays" => "Tatil günleri",
+"Ideas" => "Fikirler",
+"Journey" => "Seyahat",
+"Jubilee" => "Yıl dönümü",
+"Meeting" => "Toplantı",
+"Other" => "DiÄŸer",
+"Personal" => "KiÅŸisel",
+"Projects" => "Projeler",
+"Questions" => "Sorular",
+"Work" => "Ä°ÅŸ",
+"Does not repeat" => "Tekrar etmiyor",
+"Daily" => "Günlük",
+"Weekly" => "Haftalı",
+"Every Weekday" => "Haftaiçi Her gün",
+"Bi-Weekly" => "Ä°ki haftada bir",
+"Monthly" => "Aylık",
+"Yearly" => "Yıllı",
+"Not an array" => "Bir dizi deÄŸil",
+"All day" => "Tüm gün",
+"Missing fields" => "Eksik alanlar",
+"Title" => "Başlık",
+"From Date" => "Bu Tarihten",
+"From Time" => "Bu Saatten",
+"To Date" => "Bu Tarihe",
+"To Time" => "Bu Saate",
+"The event ends before it starts" => "Olay başlamadan önce bitiyor",
+"There was a database fail" => "Bir veritabanı başarısızlığı oluştu",
+"Week" => "Hafta",
+"Month" => "Ay",
+"List" => "Liste",
+"Today" => "Bugün",
+"Calendars" => "Takvimler",
+"There was a fail, while parsing the file." => "Dosya okunurken başarısızlık oldu.",
+"Choose active calendars" => "Aktif takvimleri seçin",
+"New Calendar" => "Yeni Takvim",
+"CalDav Link" => "CalDav Bağlantısı",
+"Download" => "Ä°ndir",
+"Edit" => "Düzenle",
+"Delete" => "Sil",
+"New calendar" => "Yeni takvim",
+"Edit calendar" => "Takvimi düzenle",
+"Displayname" => "Görünümadı",
+"Active" => "Aktif",
+"Calendar color" => "Takvim rengi",
+"Save" => "Kaydet",
+"Submit" => "Gönder",
+"Cancel" => "Ä°ptal",
+"Edit an event" => "Bir olay düzenle",
+"Export" => "Dışa aktar",
+"Title of the Event" => "Olayın Başlığı",
+"Category" => "Kategori",
+"Select category" => "Kategori seçin",
+"All Day Event" => "Tüm Gün Olay",
+"From" => "Kimden",
+"To" => "Kime",
+"Advanced options" => "GeliÅŸmiÅŸ opsiyonlar",
+"Repeat" => "Tekrar",
+"Location" => "Konum",
+"Location of the Event" => "Olayın Konumu",
+"Description" => "Açıklama",
+"Description of the Event" => "Olayın Açıklaması",
+"Import Ical File" => "Ical Dosyası Al",
+"How to import the new calendar?" => "Yeni takvim nasıl alınsın?",
+"Import into an existing calendar" => "Mevcut bir takvimin içine al",
+"Import into a new calendar" => "Yeni bir takvim içine al",
+"Please choose the calendar" => "Lütfen takvimi seçin",
+"Import" => "İçe Al",
+"Back" => "Geri",
+"Please fill out the form" => "Lütfen formu doldurun",
+"Create a new event" => "Yeni olay oluÅŸtur",
+"Timezone" => "Zaman dilimi",
+"Timeformat" => "Saat biçimi",
+"24h" => "24s",
+"12h" => "12s",
+"Calendar CalDAV syncing address:" => "CalDAV Takvim senkron adresi:"
+);
diff --git a/apps/contacts/l10n/ar.php b/apps/contacts/l10n/ar.php
new file mode 100644
index 00000000000..662c657797b
--- /dev/null
+++ b/apps/contacts/l10n/ar.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "هذا ليس د�تر عناوينك.",
+"Contact could not be found." => "لم يتم العثور على الشخص.",
+"vCard could not be read." => "لم يتم قراءة ال vCard بنجاح.",
+"Information about vCard is incorrect. Please reload the page." => "المعلومات الموجودة �ي ال vCard غير صحيحة. الرجاء إعادة تحديث الص�حة.",
+"Address" => "عنوان",
+"Telephone" => "الهات�",
+"Email" => "البريد الالكتروني",
+"Organization" => "المؤسسة",
+"Work" => "الوظي�ة",
+"Home" => "البيت",
+"Mobile" => "الهات� المحمول",
+"Text" => "معلومات إضا�ية",
+"Voice" => "صوت",
+"Fax" => "ال�اكس",
+"Video" => "ال�يديو",
+"Pager" => "الرنان",
+"This is not your contact." => ".هذا ليس من معار�ي",
+"This card is not RFC compatible." => "هذا الكرت ليس متلائم مع نظام ال RFC.",
+"This card does not contain a photo." => "لا يحتوي هذا الكرت على صورة.",
+"Add Contact" => "أض� شخص ",
+"Group" => "مجموعة",
+"Name" => "الاسم",
+"PO Box" => "العنوان البريدي",
+"Extended" => "إضا�ة",
+"Street" => "شارع",
+"City" => "المدينة",
+"Region" => "المنطقة",
+"Zipcode" => "رقم المنطقة",
+"Country" => "البلد",
+"Create Contact" => "أض� شخص ",
+"Edit" => "تعديل",
+"Delete" => "حذ�",
+"Birthday" => "تاريخ الميلاد",
+"Phone" => "الهات�"
+);
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
new file mode 100644
index 00000000000..4b917ef21f6
--- /dev/null
+++ b/apps/contacts/l10n/ca.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Aquesta no és la vostra llibreta d'adreces",
+"Contact could not be found." => "No s'ha trobat el contacte.",
+"vCard could not be read." => "No s'ha pogut llegir la vCard",
+"Information about vCard is incorrect. Please reload the page." => "La informació de la vCard és incorrecta. Carregueu la pàgina de nou.",
+"Address" => "Adreça",
+"Telephone" => "Telèfon",
+"Email" => "Correu electrònic",
+"Organization" => "Organització",
+"Work" => "Feina",
+"Home" => "Casa",
+"Mobile" => "Mòbil",
+"Text" => "Text",
+"Voice" => "Veu",
+"Fax" => "Fax",
+"Video" => "Vídeo",
+"Pager" => "Paginador",
+"This is not your contact." => "Aquest contacte no és vostre.",
+"This card is not RFC compatible." => "Aquesta targeta no és compatible amb RFC.",
+"This card does not contain a photo." => "Aquesta targeta no conté foto.",
+"Add Contact" => "Afegeix un contacte",
+"Group" => "Grup",
+"Name" => "Nom",
+"PO Box" => "Adreça Postal",
+"Extended" => "Addicional",
+"Street" => "Carrer",
+"City" => "Ciutat",
+"Region" => "Comarca",
+"Zipcode" => "Codi postal",
+"Country" => "País",
+"Create Contact" => "Crea un contacte",
+"Edit" => "Edita",
+"Delete" => "Elimina",
+"Birthday" => "Aniversari",
+"Phone" => "Telèfon"
+);
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
new file mode 100644
index 00000000000..7cdf8e427b7
--- /dev/null
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Toto není Váš adresář.",
+"Contact could not be found." => "Kontakt nebyl nalezen.",
+"vCard could not be read." => "vCard nelze pře�íst.",
+"Information about vCard is incorrect. Please reload the page." => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
+"Address" => "Adresa",
+"Telephone" => "Telefon",
+"Email" => "Email",
+"Organization" => "Organizace",
+"Work" => "Pracovní",
+"Home" => "Domácí",
+"Mobile" => "Mobil",
+"Text" => "Text",
+"Voice" => "Hlas",
+"Fax" => "Fax",
+"Video" => "Video",
+"Pager" => "Pager",
+"This is not your contact." => "Toto není Váš kontakt.",
+"This card is not RFC compatible." => "Tato karta není kompatibilní s RFC.",
+"This card does not contain a photo." => "Tato karta neobsahuje foto",
+"Add Contact" => "Přidat kontakt",
+"Group" => "Skupina",
+"Name" => "Jméno",
+"PO Box" => "PO box",
+"Extended" => "Rozšířené",
+"Street" => "Ulice",
+"City" => "Město",
+"Region" => "Kraj",
+"Zipcode" => "PSČ",
+"Country" => "ZemÄ›",
+"Create Contact" => "Vytvořit kontakt",
+"Edit" => "Editovat",
+"Delete" => "Odstranit",
+"Birthday" => "Narozeniny",
+"Phone" => "Telefon"
+);
diff --git a/apps/contacts/l10n/da.php b/apps/contacts/l10n/da.php
index 2ab382f714a..f4defa28f20 100644
--- a/apps/contacts/l10n/da.php
+++ b/apps/contacts/l10n/da.php
@@ -1,22 +1,26 @@
 <?php $TRANSLATIONS = array(
-"You need to log in." => "Du skal logge ind.",
 "This is not your addressbook." => "Dette er ikke din adressebog.",
-"Contact could not be found." => "Kontakt kunne ikke findes.",
-"This is not your contact." => "Dette er ikke din kontakt.",
+"Contact could not be found." => "Kontaktperson kunne ikke findes.",
 "vCard could not be read." => "Kunne ikke læse vCard.",
 "Information about vCard is incorrect. Please reload the page." => "Informationen om vCard er forkert. Genindlæs siden.",
-"This card is not RFC compatible." => "Dette kort er ikke RFC-kompatibelt.",
-"This card does not contain a photo." => "Dette kort indeholder ikke et foto.",
-"Add Contact" => "Tilføj kontakt",
-"Group" => "Gruppe",
-"Name" => "Navn",
-"Create Contact" => "Ny Kontakt",
 "Address" => "Adresse",
 "Telephone" => "Telefon",
 "Email" => "Email",
 "Organization" => "Organisation",
 "Work" => "Arbejde",
-"Home" => "Hjem",
+"Home" => "Hjemme",
+"Mobile" => "Mobil",
+"Text" => "SMS",
+"Voice" => "Telefonsvarer",
+"Fax" => "Fax",
+"Video" => "Video",
+"Pager" => "Personsøger",
+"This is not your contact." => "Dette er ikke din kontaktperson.",
+"This card is not RFC compatible." => "Dette kort er ikke RFC-kompatibelt.",
+"This card does not contain a photo." => "Dette kort indeholder ikke et foto.",
+"Add Contact" => "Tilføj kontaktperson",
+"Group" => "Gruppe",
+"Name" => "Navn",
 "PO Box" => "Postboks",
 "Extended" => "Udvidet",
 "Street" => "Vej",
@@ -24,15 +28,9 @@
 "Region" => "Region",
 "Zipcode" => "Postnummer",
 "Country" => "Land",
-"Mobile" => "Mobil",
-"Text" => "SMS",
-"Voice" => "Telefonsvarer",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Personsøger",
+"Create Contact" => "Ny kontaktperson",
+"Edit" => "Rediger",
 "Delete" => "Slet",
-"Add Property" => "Tilføj Egenskab",
 "Birthday" => "Fødselsdag",
-"Phone" => "Telefon",
-"Edit" => "Redigér"
+"Phone" => "Telefon"
 );
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index 04a7402442a..f98cabcb5ed 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -1,9 +1,36 @@
 <?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Dies ist nicht dein Adressbuch.",
+"Contact could not be found." => "Kontakt konnte nicht gefunden werden.",
+"vCard could not be read." => "vCard konnte nicht gelesen werden.",
+"Information about vCard is incorrect. Please reload the page." => "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite.",
+"Address" => "Adresse",
+"Telephone" => "Telefon",
+"Email" => "Email",
+"Organization" => "Organisation",
+"Work" => "Arbeit",
+"Home" => "Zuhause",
 "Mobile" => "Mobil",
 "Text" => "Text",
+"Voice" => "Anruf",
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Pager",
+"This is not your contact." => "Dies ist nicht dein Kontakt.",
+"This card is not RFC compatible." => "Diese Karte ist nicht RFC-kompatibel.",
+"This card does not contain a photo." => "Diese Karte enthält kein Foto.",
+"Add Contact" => "Kontakt hinzufügen",
+"Group" => "Gruppe",
+"Name" => "Name",
+"PO Box" => "Postfach",
+"Extended" => "Erweitert",
+"Street" => "Straße",
+"City" => "Stadt",
+"Region" => "Region",
+"Zipcode" => "Postleitzahl",
+"Country" => "Land",
+"Create Contact" => "Kontakt erstellen",
+"Edit" => "Bearbeiten",
+"Delete" => "Löschen",
 "Birthday" => "Geburtstag",
-"Edit" => "Bearbeiten"
+"Phone" => "Telefon"
 );
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
new file mode 100644
index 00000000000..3a0b24eae8e
--- /dev/null
+++ b/apps/contacts/l10n/el.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Αυτό δεν είναι βιβλίο διευθ�νσεων σας.",
+"Contact could not be found." => "Η επαφή δεν μπ�ό�εσε να β�εθεί.",
+"vCard could not be read." => "Η vCard δεν μπο�εί να διαβαστεί.",
+"Information about vCard is incorrect. Please reload the page." => "Οι πλη�οφο�ίες σχετικά με vCard είναι εσφαλμένες. Πα�ακαλώ επαναφο�τώστε τη σελίδα.",
+"Address" => "Διε�θυνση",
+"Telephone" => "Τηλέφωνο",
+"Email" => "Email",
+"Organization" => "Ο�γανισμός",
+"Work" => "Ε�γασία",
+"Home" => "Σπίτι",
+"Mobile" => "Κινητό",
+"Text" => "Κείμενο",
+"Voice" => "Φωνή",
+"Fax" => "Φαξ",
+"Video" => "Βίντεο",
+"Pager" => "Βομβητής",
+"This is not your contact." => "Αυτή δεν είναι επαφή σας.",
+"This card is not RFC compatible." => "Αυτή η κά�τα δεν είναι RFC συμβατή.",
+"This card does not contain a photo." => "Αυτή η κά�τα δεν πε�ιέχει φωτογ�αφία.",
+"Add Contact" => "Π�οσθήκη επαφής",
+"Group" => "Ομάδα",
+"Name" => "Όνομα",
+"PO Box" => "Ταχ. Θυ�ίδα",
+"Extended" => "Εκτεταμένη",
+"Street" => "Οδός",
+"City" => "Πόλη",
+"Region" => "Πε�ιοχή",
+"Zipcode" => "Τ.Κ.",
+"Country" => "Χώ�α",
+"Create Contact" => "Δημιου�γία επαφής",
+"Edit" => "Επεξε�γασία",
+"Delete" => "Διαγ�αφή",
+"Birthday" => "Γενέθλια",
+"Phone" => "Τηλέφωνο"
+);
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
new file mode 100644
index 00000000000..1b9fe8c1a14
--- /dev/null
+++ b/apps/contacts/l10n/eo.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Ĉi tiu ne estas via adresaro.",
+"Contact could not be found." => "Ne eblis trovi la kontakton.",
+"vCard could not be read." => "Ne eblis legi vCard-on.",
+"Information about vCard is incorrect. Please reload the page." => "Informo pri vCard estas mal�usta. Bonvolu re�argi la pa�on.",
+"Address" => "Adreso",
+"Telephone" => "Telefono",
+"Email" => "Retpo�tadreso",
+"Organization" => "Organizaĵo",
+"Work" => "Laboro",
+"Home" => "Hejmo",
+"Mobile" => "Po�telefono",
+"Text" => "Teksto",
+"Voice" => "Voĉo",
+"Fax" => "Fakso",
+"Video" => "Videaĵo",
+"Pager" => "Televokilo",
+"This is not your contact." => "Tiu ĉi ne estas via kontakto.",
+"This card is not RFC compatible." => "Ĉi tiu karto ne kongruas kun RFC.",
+"This card does not contain a photo." => "Ĉi tiu karto ne havas foton.",
+"Add Contact" => "Aldoni kontakton",
+"Group" => "Grupo",
+"Name" => "Nomo",
+"PO Box" => "Abonkesto",
+"Extended" => "Etendita",
+"Street" => "Strato",
+"City" => "Urbo",
+"Region" => "Regiono",
+"Zipcode" => "Po�tokodo",
+"Country" => "Lando",
+"Create Contact" => "Krei kontakton",
+"Edit" => "Redakti",
+"Delete" => "Forigi",
+"Birthday" => "Naski�otago",
+"Phone" => "Telefono"
+);
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
new file mode 100644
index 00000000000..30dedf89fd6
--- /dev/null
+++ b/apps/contacts/l10n/es.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Esta no es tu agenda de contactos.",
+"Contact could not be found." => "No se pudo encontrar el contacto.",
+"vCard could not be read." => "No se pudo leer el vCard.",
+"Information about vCard is incorrect. Please reload the page." => "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la página.",
+"Address" => "Dirección",
+"Telephone" => "Teléfono",
+"Email" => "Correo electrónico",
+"Organization" => "Organización",
+"Work" => "Trabajo",
+"Home" => "Particular",
+"Mobile" => "Móvil",
+"Text" => "Texto",
+"Voice" => "Voz",
+"Fax" => "Fax",
+"Video" => "Video",
+"Pager" => "Localizador",
+"This is not your contact." => "Este no es tu contacto.",
+"This card is not RFC compatible." => "Esta tarjeta no es compatible con RFC.",
+"This card does not contain a photo." => "Esta tarjeta no contiene ninguna foto.",
+"Add Contact" => "Agregar contacto",
+"Group" => "Grupo",
+"Name" => "Nombre",
+"PO Box" => "Código postal",
+"Extended" => "Extendido",
+"Street" => "Calle",
+"City" => "Ciudad",
+"Region" => "Región",
+"Zipcode" => "Código Postal",
+"Country" => "País",
+"Create Contact" => "Crear contacto",
+"Edit" => "Editar",
+"Delete" => "Borrar",
+"Birthday" => "Cumpleaños",
+"Phone" => "Teléfono"
+);
diff --git a/apps/contacts/l10n/et_EE.php b/apps/contacts/l10n/et_EE.php
new file mode 100644
index 00000000000..341a74cf778
--- /dev/null
+++ b/apps/contacts/l10n/et_EE.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "See pole sinu aadressiraamat.",
+"Contact could not be found." => "Kontakti ei leitud.",
+"vCard could not be read." => "Visiitkaardi lugemine ebaõnnestus,",
+"Information about vCard is incorrect. Please reload the page." => "Visiitkaardi info pole korrektne. Palun lae leht uuesti.",
+"Address" => "Aadress",
+"Telephone" => "Telefon",
+"Email" => "E-post",
+"Organization" => "Organisatsioon",
+"Work" => "Töö",
+"Home" => "Kodu",
+"Mobile" => "Mobiil",
+"Text" => "Tekst",
+"Voice" => "Hääl",
+"Fax" => "Faks",
+"Video" => "Video",
+"Pager" => "Piipar",
+"This is not your contact." => "See pole sinu kontakt.",
+"This card is not RFC compatible." => "See kaart ei ühildu RFC-ga.",
+"This card does not contain a photo." => "Sellel kaardil pole fotot.",
+"Add Contact" => "Lisa kontakt",
+"Group" => "Grupp",
+"Name" => "Nimi",
+"PO Box" => "Postkontori postkast",
+"Extended" => "Laiendatud",
+"Street" => "Tänav",
+"City" => "Linn",
+"Region" => "Piirkond",
+"Zipcode" => "Postiindeks",
+"Country" => "Riik",
+"Create Contact" => "Lisa kontakt",
+"Edit" => "Muuda",
+"Delete" => "Kustuta",
+"Birthday" => "Sünnipäev",
+"Phone" => "Telefon"
+);
diff --git a/apps/contacts/l10n/eu.php b/apps/contacts/l10n/eu.php
new file mode 100644
index 00000000000..19b7ddb3e43
--- /dev/null
+++ b/apps/contacts/l10n/eu.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Hau ez da zure helbide liburua.",
+"Contact could not be found." => "Ezin izan da kontaktua aurkitu.",
+"vCard could not be read." => "Ezin izan da vCard-a irakurri.",
+"Information about vCard is incorrect. Please reload the page." => "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea.",
+"Address" => "Helbidea",
+"Telephone" => "Telefonoa",
+"Email" => "Eposta",
+"Organization" => "Erakundea",
+"Work" => "Lana",
+"Home" => "Etxea",
+"Mobile" => "Mugikorra",
+"Text" => "Testua",
+"Voice" => "Ahotsa",
+"Fax" => "Fax-a",
+"Video" => "Bideoa",
+"Pager" => "Bilagailua",
+"This is not your contact." => "Hau ez da zure kontaktua.",
+"This card is not RFC compatible." => "Txartel hau ez da RFC bateragarria.",
+"This card does not contain a photo." => "Txartel honek ez dauka argazkirik.",
+"Add Contact" => "Gehitu Kontaktua",
+"Group" => "Taldea",
+"Name" => "Izena",
+"PO Box" => "Posta kutxa",
+"Extended" => "Hedatua",
+"Street" => "Kalea",
+"City" => "Hiria",
+"Region" => "Eskualdea",
+"Zipcode" => "Posta Kodea",
+"Country" => "Herrialdea",
+"Create Contact" => "Sortu Kontaktua",
+"Edit" => "Editatu",
+"Delete" => "Ezabatu",
+"Birthday" => "Jaioteguna",
+"Phone" => "Telefonoa"
+);
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
new file mode 100644
index 00000000000..2b9cdc77a0a
--- /dev/null
+++ b/apps/contacts/l10n/fr.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Ce n'est pas votre carnet d'adresses.",
+"Contact could not be found." => "Ce contact n'a pas été trouvé.",
+"vCard could not be read." => "Cette vCard n'a pas pu être lue.",
+"Information about vCard is incorrect. Please reload the page." => "Les informations relatives à cette vCard sont incorrectes. Veuillez recharger la page.",
+"Address" => "Adresse",
+"Telephone" => "Téléphone",
+"Email" => "Email",
+"Organization" => "Société",
+"Work" => "Travail",
+"Home" => "Maison",
+"Mobile" => "Mobile",
+"Text" => "Texte",
+"Voice" => "Voix",
+"Fax" => "Fax",
+"Video" => "Vidéo",
+"Pager" => "Bipeur",
+"This is not your contact." => "Ce n'est pas votre contact.",
+"This card is not RFC compatible." => "Cette fiche n'est pas compatible RFC.",
+"This card does not contain a photo." => "Cette fiche ne contient pas de photo.",
+"Add Contact" => "Ajouter un Contact",
+"Group" => "Groupe",
+"Name" => "Nom",
+"PO Box" => "Boîte postale",
+"Extended" => "Étendu",
+"Street" => "Rue",
+"City" => "Ville",
+"Region" => "Région",
+"Zipcode" => "Code postal",
+"Country" => "Pays",
+"Create Contact" => "Créer le Contact",
+"Edit" => "Modifier",
+"Delete" => "Effacer",
+"Birthday" => "Anniversaire",
+"Phone" => "Téléphone"
+);
diff --git a/apps/contacts/l10n/he.php b/apps/contacts/l10n/he.php
new file mode 100644
index 00000000000..22275f77e59
--- /dev/null
+++ b/apps/contacts/l10n/he.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "זהו �ינו ספר הכתובות שלך",
+"Contact could not be found." => "ל� ניתן ל�תר �יש קשר",
+"vCard could not be read." => "ל� ניתן לקרו� vCard.",
+"Information about vCard is incorrect. Please reload the page." => "המידע �ודות vCard �ינו נכון. נ� לטעון מחדש �ת הדף.",
+"Address" => "כתובת",
+"Telephone" => "טלפון",
+"Email" => "דו�ר �לקטרוני",
+"Organization" => "�רגון",
+"Work" => "עבודה",
+"Home" => "בית",
+"Mobile" => "נייד",
+"Text" => "טקסט",
+"Voice" => "קולי",
+"Fax" => "פקס",
+"Video" => "ויד�ו",
+"Pager" => "זימונית",
+"This is not your contact." => "זהו �ינו �יש קשר שלך",
+"This card is not RFC compatible." => "כרטיס זה �ינו תו�� ל־RFC",
+"This card does not contain a photo." => "כרטיס זה �ינו כולל תמונה",
+"Add Contact" => "הוספת �יש קשר",
+"Group" => "קבוצה",
+"Name" => "ש�",
+"PO Box" => "ת� דו�ר",
+"Extended" => "מורחב",
+"Street" => "רחוב",
+"City" => "עיר",
+"Region" => "�זור",
+"Zipcode" => "מיקוד",
+"Country" => "מדינה",
+"Create Contact" => "יצירת �יש קשר",
+"Edit" => "עריכה",
+"Delete" => "מחיקה",
+"Birthday" => "יו� הולדת",
+"Phone" => "טלפון"
+);
diff --git a/apps/contacts/l10n/hr.php b/apps/contacts/l10n/hr.php
new file mode 100644
index 00000000000..4b62b292acf
--- /dev/null
+++ b/apps/contacts/l10n/hr.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Ovo nije vaš adresar.",
+"Contact could not be found." => "Kontakt ne postoji.",
+"vCard could not be read." => "Nemoguće pro�itati vCard.",
+"Information about vCard is incorrect. Please reload the page." => "Informacija o vCard je neispravna. Osvježite stranicu.",
+"Address" => "Adresa",
+"Telephone" => "Telefon",
+"Email" => "E-mail",
+"Organization" => "Organizacija",
+"Work" => "Posao",
+"Home" => "Kuća",
+"Mobile" => "Mobitel",
+"Text" => "Tekst",
+"Voice" => "Glasovno",
+"Fax" => "Fax",
+"Video" => "Video",
+"Pager" => "Pager",
+"This is not your contact." => "Ovo nije vaš kontakt.",
+"This card is not RFC compatible." => "Ova kartica nije sukladna prema RFC direktivama.",
+"This card does not contain a photo." => "Ova kartica ne sadrži fotografiju.",
+"Add Contact" => "Dodaj kontakt",
+"Group" => "Grupa",
+"Name" => "Naziv",
+"PO Box" => "Poštanski Pretinac",
+"Extended" => "Prošireno",
+"Street" => "Ulica",
+"City" => "Grad",
+"Region" => "Regija",
+"Zipcode" => "Poštanski broj",
+"Country" => "Država",
+"Create Contact" => "Izradi Kontakt",
+"Edit" => "Uredi",
+"Delete" => "Obriši",
+"Birthday" => "Rođendan",
+"Phone" => "Telefon"
+);
diff --git a/apps/contacts/l10n/hu_HU.php b/apps/contacts/l10n/hu_HU.php
new file mode 100644
index 00000000000..21123645ddb
--- /dev/null
+++ b/apps/contacts/l10n/hu_HU.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Ez nem a te címjegyzéked.",
+"Contact could not be found." => "Kapcsolat nem található.",
+"vCard could not be read." => "A vCard-ot nem lehet olvasni.",
+"Information about vCard is incorrect. Please reload the page." => "A vCardról szóló információ helytelen. Töltsd újra az oldalt.",
+"Address" => "Cím",
+"Telephone" => "Telefonszám",
+"Email" => "E-mail",
+"Organization" => "Organizáció",
+"Work" => "Munka",
+"Home" => "Otthon",
+"Mobile" => "Mobiltelefonszám",
+"Text" => "Szöveg",
+"Voice" => "Hang",
+"Fax" => "Fax",
+"Video" => "Video",
+"Pager" => "Lapozó",
+"This is not your contact." => "Nem a te kapcsolatod.",
+"This card is not RFC compatible." => "A kártya nem RFC kompatibilis.",
+"This card does not contain a photo." => "A kártya nem tartlmaz fényképet.",
+"Add Contact" => "Kontakt hozzáadása",
+"Group" => "Csoport",
+"Name" => "Név",
+"PO Box" => "Postafiók",
+"Extended" => "Kiterjesztett",
+"Street" => "Utca",
+"City" => "Helység",
+"Region" => "Megye",
+"Zipcode" => "Irányítószám",
+"Country" => "Ország",
+"Create Contact" => "Kontakt létrehozása",
+"Edit" => "Szerkesztés",
+"Delete" => "Törlés",
+"Birthday" => "Születésnap",
+"Phone" => "Telefonszám"
+);
diff --git a/apps/contacts/l10n/ia.php b/apps/contacts/l10n/ia.php
new file mode 100644
index 00000000000..2bd53255e85
--- /dev/null
+++ b/apps/contacts/l10n/ia.php
@@ -0,0 +1,32 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Iste non es tu libro de adresses",
+"Contact could not be found." => "Contacto non poterea esser legite",
+"vCard could not be read." => "vCard non poterea esser legite.",
+"Address" => "Adresse",
+"Telephone" => "Telephono",
+"Email" => "E-posta",
+"Organization" => "Organisation",
+"Work" => "Travalio",
+"Home" => "Domo",
+"Text" => "Texto",
+"Voice" => "Voce",
+"Fax" => "Fax",
+"Video" => "Video",
+"Pager" => "Pager",
+"This is not your contact." => "Iste non es tu contacto",
+"This card is not RFC compatible." => "Iste carta non es compatibile con RFC",
+"Add Contact" => "Adder contacto",
+"Group" => "Gruppo",
+"Name" => "Nomine",
+"PO Box" => "Cassa postal",
+"Street" => "Strata",
+"City" => "Citate",
+"Region" => "Region",
+"Zipcode" => "Codice postal",
+"Country" => "Pais",
+"Create Contact" => "Crear contacto",
+"Edit" => "Modificar",
+"Delete" => "Deler",
+"Birthday" => "Anniversario",
+"Phone" => "Phono"
+);
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index 7a57d6fc5d2..c06a2b2a156 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -1,38 +1,36 @@
 <?php $TRANSLATIONS = array(
-"You need to log in." => "Bisogna effettuare il login.",
 "This is not your addressbook." => "Questa non è la tua rubrica.",
 "Contact could not be found." => "Il contatto non può essere trovato",
-"This is not your contact." => "Questo non è un tuo contatto.",
 "vCard could not be read." => "La vCard non può essere letta",
 "Information about vCard is incorrect. Please reload the page." => "Informazioni sulla vCard incorrette. Ricaricare la pagina.",
-"This card is not RFC compatible." => "Questa card non è compatibile con il protocollo RFC.",
-"This card does not contain a photo." => "Questa card non contiene una foto.",
-"Add Contact" => "Aggiungi contatto",
-"Group" => "Gruppo",
-"Name" => "Nome",
-"Create Contact" => "Crea contatto",
 "Address" => "Indirizzo",
 "Telephone" => "Telefono",
 "Email" => "Email",
 "Organization" => "Organizzazione",
 "Work" => "Lavoro",
 "Home" => "Casa",
-"PO Box" => "PO Box",
+"Mobile" => "Cellulare",
+"Text" => "Testo",
+"Voice" => "Voce",
+"Fax" => "Fax",
+"Video" => "Video",
+"Pager" => "Cercapersone",
+"This is not your contact." => "Questo non è un tuo contatto.",
+"This card is not RFC compatible." => "Questa card non è compatibile con il protocollo RFC.",
+"This card does not contain a photo." => "Questa card non contiene una foto.",
+"Add Contact" => "Aggiungi contatto",
+"Group" => "Gruppo",
+"Name" => "Nome",
+"PO Box" => "Casella postale",
 "Extended" => "Estendi",
 "Street" => "Via",
 "City" => "Città",
 "Region" => "Regione",
 "Zipcode" => "CAP",
 "Country" => "Stato",
-"Mobile" => "Cellulare",
-"Text" => "Testo",
-"Voice" => "Voce",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Pager",
+"Create Contact" => "Crea contatto",
+"Edit" => "Modifica",
 "Delete" => "Cancella",
-"Add Property" => "Aggiungi proprietà",
 "Birthday" => "Compleanno",
-"Phone" => "Telefono",
-"Edit" => "Modifica"
+"Phone" => "Telefono"
 );
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
new file mode 100644
index 00000000000..d5ae4b632dd
--- /dev/null
+++ b/apps/contacts/l10n/ja_JP.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "�れ�����電話帳���り��ん。",
+"Contact could not be found." => "連絡先を見��る事�����ん。",
+"vCard could not be read." => "vCard�読�込��失敗����。",
+"Information about vCard is incorrect. Please reload the page." => "vCard�情報�誤り��り��。ページをリロード��下��。",
+"Address" => "�所",
+"Telephone" => "電話番�",
+"Email" => "メールアドレス",
+"Organization" => "所属",
+"Work" => "勤務先",
+"Home" => "�居",
+"Mobile" => "�帯電話",
+"Text" => "TTY TDD",
+"Voice" => "音声番�",
+"Fax" => "FAX",
+"Video" => "テレビ電話",
+"Pager" => "�ケベル",
+"This is not your contact." => "����連絡先���り��ん。",
+"This card is not RFC compatible." => "��カード�RFC�準拠�����ん。",
+"This card does not contain a photo." => "��カード�写真を�ん��り��ん。",
+"Add Contact" => "連絡先�追加",
+"Group" => "グループ",
+"Name" => "��",
+"PO Box" => "�書箱",
+"Extended" => "拡張番地",
+"Street" => "街路番地",
+"City" => "都市",
+"Region" => "地域",
+"Zipcode" => "郵便番�",
+"Country" => "国�",
+"Create Contact" => "追加",
+"Edit" => "編集",
+"Delete" => "削除",
+"Birthday" => "生年月日",
+"Phone" => "電話番�"
+);
diff --git a/apps/contacts/l10n/lb.php b/apps/contacts/l10n/lb.php
new file mode 100644
index 00000000000..df6e22bfab9
--- /dev/null
+++ b/apps/contacts/l10n/lb.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Dat do ass net däin Adressbuch.",
+"Contact could not be found." => "Konnt den Kontakt net fannen.",
+"vCard could not be read." => "vCard konnt net gelies ginn.",
+"Information about vCard is incorrect. Please reload the page." => "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei.",
+"Address" => "Adress",
+"Telephone" => "Telefon's Nummer",
+"Email" => "Email",
+"Organization" => "Firma",
+"Work" => "Aarbecht",
+"Home" => "Doheem",
+"Mobile" => "GSM",
+"Text" => "SMS",
+"Voice" => "Voice",
+"Fax" => "Fax",
+"Video" => "Video",
+"Pager" => "Pager",
+"This is not your contact." => "Dat do ass net däin Kontakt.",
+"This card is not RFC compatible." => "Déi do Kaart ass net RFC kompatibel.",
+"This card does not contain a photo." => "Déi do Kaart huet keng Foto.",
+"Add Contact" => "Kontakt bäisetzen",
+"Group" => "Grupp",
+"Name" => "Numm",
+"PO Box" => "Postleetzuel",
+"Extended" => "Erweidert",
+"Street" => "Strooss",
+"City" => "Staat",
+"Region" => "Regioun",
+"Zipcode" => "Postleetzuel",
+"Country" => "Land",
+"Create Contact" => "Kontakt erstellen",
+"Edit" => "Editéieren",
+"Delete" => "Läschen",
+"Birthday" => "Gebuertsdag",
+"Phone" => "Telefon"
+);
diff --git a/apps/contacts/l10n/lt_LT.php b/apps/contacts/l10n/lt_LT.php
new file mode 100644
index 00000000000..ad92ebf9cce
--- /dev/null
+++ b/apps/contacts/l10n/lt_LT.php
@@ -0,0 +1,33 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Tai ne jūsų adresų knygelė.",
+"Contact could not be found." => "Kontaktas nerastas",
+"vCard could not be read." => "Nenuskaitoma vCard.",
+"Information about vCard is incorrect. Please reload the page." => "Informacija apie vCard yra neteisinga. ",
+"Address" => "Adresas",
+"Telephone" => "Telefonas",
+"Email" => "El. paštas",
+"Organization" => "Organizacija",
+"Work" => "Darbo",
+"Home" => "Namų",
+"Mobile" => "Mobilusis",
+"Text" => "Tekstas",
+"Voice" => "Balso",
+"Fax" => "Faksas",
+"Video" => "Vaizdo",
+"Pager" => "Pranešimų gaviklis",
+"This is not your contact." => "Tai ne jūsų kontaktas",
+"Add Contact" => "PridÄ—ti kontaktÄ…",
+"Group" => "GrupÄ—",
+"Name" => "Vardas",
+"PO Box" => "Pašto dėžutė",
+"Street" => "GatvÄ—",
+"City" => "Miestas",
+"Region" => "Regionas",
+"Zipcode" => "Pašto indeksas",
+"Country" => "Å alis",
+"Create Contact" => "Sukurti kontaktÄ…",
+"Edit" => "Keisti",
+"Delete" => "Trinti",
+"Birthday" => "Gimtadienis",
+"Phone" => "Telefonas"
+);
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
new file mode 100644
index 00000000000..0113eb9df78
--- /dev/null
+++ b/apps/contacts/l10n/nl.php
@@ -0,0 +1,53 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Dit is niet uw adresboek.",
+"Contact could not be found." => "Contact kon niet worden gevonden.",
+"vCard could not be read." => "vCard kon niet worden gelezen.",
+"Information about vCard is incorrect. Please reload the page." => "Informatie over de vCard is onjuist. Herlaad de pagina.",
+"Address" => "Adres",
+"Telephone" => "Telefoon",
+"Email" => "E-mail",
+"Organization" => "Organisatie",
+"Work" => "Werk",
+"Home" => "Thuis",
+"Mobile" => "Mobiel",
+"Text" => "Tekst",
+"Voice" => "Stem",
+"Fax" => "Fax",
+"Video" => "Video",
+"Pager" => "Pieper",
+"This is not your contact." => "Dit is niet uw contactpersoon.",
+"This card is not RFC compatible." => "Deze kaart is niet RFC compatibel.",
+"This card does not contain a photo." => "Deze contact bevat geen foto.",
+"Add Contact" => "Contact toevoegen",
+"Address Books" => "Adresboeken",
+"Group" => "Groep",
+"Name" => "Naam",
+"Number" => "Nummer",
+"Type" => "Type",
+"PO Box" => "Postbus",
+"Extended" => "Uitgebreide",
+"Street" => "Straat",
+"City" => "Stad",
+"Region" => "Regio",
+"Zipcode" => "Postcode",
+"Country" => "Land",
+"Create Contact" => "Contact aanmaken",
+"Choose active Address Books" => "Kies actief Adresboek",
+"New Address Book" => "Nieuw Adresboek",
+"CardDav Link" => "CardDav Link",
+"Download" => "Download",
+"Edit" => "Bewerken",
+"Delete" => "Verwijderen",
+"Delete contact" => "Verwijder contact",
+"Add" => "Voeg toe",
+"Edit Address Book" => "Bewerk Adresboek",
+"Displayname" => "Weergavenaam",
+"Active" => "Actief",
+"Save" => "Opslaan",
+"Submit" => "Opslaan",
+"Cancel" => "Anuleren",
+"Birthday" => "Verjaardag",
+"Preferred" => "Voorkeur",
+"Phone" => "Telefoon",
+"Update" => "Vernieuwe"
+);
diff --git a/apps/contacts/l10n/nn_NO.php b/apps/contacts/l10n/nn_NO.php
new file mode 100644
index 00000000000..98db59d9751
--- /dev/null
+++ b/apps/contacts/l10n/nn_NO.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Dette er ikkje di adressebok.",
+"Contact could not be found." => "Fann ikkje kontakten.",
+"vCard could not be read." => "Klarte ikkje å lesa vCard-et.",
+"Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt.",
+"Address" => "Adresse",
+"Telephone" => "Telefonnummer",
+"Email" => "Epost",
+"Organization" => "Organisasjon",
+"Work" => "Arbeid",
+"Home" => "Heime",
+"Mobile" => "Mobil",
+"Text" => "Tekst",
+"Voice" => "Tale",
+"Fax" => "Faks",
+"Video" => "Video",
+"Pager" => "Personsøkjar",
+"This is not your contact." => "Dette er ikkje din kontakt.",
+"This card is not RFC compatible." => "Dette kortet er ikkje RFC-kompatibelt",
+"This card does not contain a photo." => "Dette kortet har ingen bilete.",
+"Add Contact" => "Legg til kontakt",
+"Group" => "Gruppe",
+"Name" => "Namn",
+"PO Box" => "Postboks",
+"Extended" => "Utvida",
+"Street" => "Gate",
+"City" => "Stad",
+"Region" => "Region/fylke",
+"Zipcode" => "Postnummer",
+"Country" => "Land",
+"Create Contact" => "Opprett kontakt",
+"Edit" => "Endra",
+"Delete" => "Slett",
+"Birthday" => "Bursdag",
+"Phone" => "Telefonnummer"
+);
diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
new file mode 100644
index 00000000000..0302b0e3eea
--- /dev/null
+++ b/apps/contacts/l10n/pl.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "To nie jest twoja książka adresowa.",
+"Contact could not be found." => "Kontakt nie znaleziony.",
+"vCard could not be read." => "Nie można odczytać vCard.",
+"Information about vCard is incorrect. Please reload the page." => "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę.",
+"Address" => "Adres",
+"Telephone" => "Telefon",
+"Email" => "E-mail",
+"Organization" => "Organizacja",
+"Work" => "Praca",
+"Home" => "Dom",
+"Mobile" => "Komórka",
+"Text" => "Tekst",
+"Voice" => "Połączenie głosowe",
+"Fax" => "Faks",
+"Video" => "Połączenie wideo",
+"Pager" => "Pager",
+"This is not your contact." => "To nie jest twój kontakt.",
+"This card is not RFC compatible." => "Ta karta nie jest zgodna ze specyfikacjÄ… RFC.",
+"This card does not contain a photo." => "Ta karta nie zawiera zdjęć.",
+"Add Contact" => "Dodaj kontakt",
+"Group" => "Grupa",
+"Name" => "Nazwisko",
+"PO Box" => "PO Box",
+"Extended" => "Rozszerzony",
+"Street" => "Ulica",
+"City" => "Miasto",
+"Region" => "Region",
+"Zipcode" => "Kod pocztowy",
+"Country" => "Kraj",
+"Create Contact" => "Utwórz kontakt",
+"Edit" => "Edytuj",
+"Delete" => "Usuń",
+"Birthday" => "Urodziny",
+"Phone" => "Telefon"
+);
diff --git a/apps/contacts/l10n/pt_BR.php b/apps/contacts/l10n/pt_BR.php
new file mode 100644
index 00000000000..42d37451b7a
--- /dev/null
+++ b/apps/contacts/l10n/pt_BR.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Este não é o seu agenda de endereços.",
+"Contact could not be found." => "Contato não pôde ser encontrado.",
+"vCard could not be read." => "vCard não pôde ser lida.",
+"Information about vCard is incorrect. Please reload the page." => "Informações sobre vCard é incorreta. Por favor, recarregue a página.",
+"Address" => "Endereço",
+"Telephone" => "Telefone",
+"Email" => "E-mail",
+"Organization" => "Organização",
+"Work" => "Trabalho",
+"Home" => "Home",
+"Mobile" => "Móvel",
+"Text" => "Texto",
+"Voice" => "Voz",
+"Fax" => "Fax",
+"Video" => "Vídeo",
+"Pager" => "Pager",
+"This is not your contact." => "Este não é o seu contato.",
+"This card is not RFC compatible." => "Este cartão não é compatível com RFC.",
+"This card does not contain a photo." => "Este cartão não contém uma foto.",
+"Add Contact" => "Adicionar Contato",
+"Group" => "Grupo",
+"Name" => "Nome",
+"PO Box" => "Caixa Postal",
+"Extended" => "Estendido",
+"Street" => "Rua",
+"City" => "Cidade",
+"Region" => "Região",
+"Zipcode" => "CEP",
+"Country" => "País",
+"Create Contact" => "Criar Contato",
+"Edit" => "Editar",
+"Delete" => "Excluir",
+"Birthday" => "Aniversário",
+"Phone" => "Telefone"
+);
diff --git a/apps/contacts/l10n/pt_PT.php b/apps/contacts/l10n/pt_PT.php
new file mode 100644
index 00000000000..b354272a3c7
--- /dev/null
+++ b/apps/contacts/l10n/pt_PT.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Esta não é a sua lista de contactos",
+"Contact could not be found." => "O contacto não foi encontrado",
+"vCard could not be read." => "o vCard não pode ser lido",
+"Information about vCard is incorrect. Please reload the page." => "A informação sobre o vCard está incorreta. Por favor refresque a página",
+"Address" => "Morada",
+"Telephone" => "Telefone",
+"Email" => "Email",
+"Organization" => "Organização",
+"Work" => "Trabalho",
+"Home" => "Casa",
+"Mobile" => "Telemovel",
+"Text" => "Texto",
+"Voice" => "Voz",
+"Fax" => "Fax",
+"Video" => "Vídeo",
+"Pager" => "Pager",
+"This is not your contact." => "Este não é o seu contacto",
+"This card is not RFC compatible." => "Este cartão não é compativel com RFC",
+"This card does not contain a photo." => "Este cartão não possui foto",
+"Add Contact" => "Adicionar Contacto",
+"Group" => "Grupo",
+"Name" => "Nome",
+"PO Box" => "Apartado",
+"Extended" => "Extendido",
+"Street" => "Rua",
+"City" => "Cidade",
+"Region" => "Região",
+"Zipcode" => "Código Postal",
+"Country" => "País",
+"Create Contact" => "Criar Contacto",
+"Edit" => "Editar",
+"Delete" => "Apagar",
+"Birthday" => "Aniversário",
+"Phone" => "Telefone"
+);
diff --git a/apps/contacts/l10n/ro.php b/apps/contacts/l10n/ro.php
new file mode 100644
index 00000000000..2a89edc4ec7
--- /dev/null
+++ b/apps/contacts/l10n/ro.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Nu se găsește în agendă.",
+"Contact could not be found." => "Contactul nu a putut fi găsit.",
+"vCard could not be read." => "vCard nu poate fi citit.",
+"Information about vCard is incorrect. Please reload the page." => "Informațiile despre vCard sunt incorecte. Reîncărcați pagina.",
+"Address" => "Adresă",
+"Telephone" => "Telefon",
+"Email" => "Email",
+"Organization" => "Organizație",
+"Work" => "Servici",
+"Home" => "Acasă",
+"Mobile" => "Mobil",
+"Text" => "Text",
+"Voice" => "Voce",
+"Fax" => "Fax",
+"Video" => "Video",
+"Pager" => "Pager",
+"This is not your contact." => "Nu este contactul tău",
+"This card is not RFC compatible." => "Nu este compatibil RFC",
+"This card does not contain a photo." => "Nu conține o fotografie",
+"Add Contact" => "Adaugă contact",
+"Group" => "Grup",
+"Name" => "Nume",
+"PO Box" => "CP",
+"Extended" => "Extins",
+"Street" => "Stradă",
+"City" => "OraÈ™",
+"Region" => "Regiune",
+"Zipcode" => "Cod poștal",
+"Country" => "Țară",
+"Create Contact" => "Crează contact",
+"Edit" => "Editează",
+"Delete" => "Șterge",
+"Birthday" => "Zi de naștere",
+"Phone" => "Telefon"
+);
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
new file mode 100644
index 00000000000..c3b66a83d8f
--- /dev/null
+++ b/apps/contacts/l10n/ru.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Это не ваша адре�на� книга.",
+"Contact could not be found." => "Контакт не найден.",
+"vCard could not be read." => "�е удало�ь проче�ть vCard.",
+"Information about vCard is incorrect. Please reload the page." => "Информаци� о vCard некорректна. Пожалуй�та, обновите �траницу.",
+"Address" => "�дре�",
+"Telephone" => "Телефон",
+"Email" => "Ящик �л. почты",
+"Organization" => "Организаци�",
+"Work" => "Рабочий",
+"Home" => "Домашний",
+"Mobile" => "Мобильный",
+"Text" => "Тек�т",
+"Voice" => "Голо�",
+"Fax" => "Фак�",
+"Video" => "Видео",
+"Pager" => "Пейджер",
+"This is not your contact." => "Это не контакт.",
+"This card is not RFC compatible." => "Эта карточка не �оответ�твует RFC.",
+"This card does not contain a photo." => "Эта карточка не �одержит фотографии.",
+"Add Contact" => "Добавить Контакт",
+"Group" => "Группа",
+"Name" => "Им�",
+"PO Box" => "�О",
+"Extended" => "Ра�ширенный",
+"Street" => "Улица",
+"City" => "Город",
+"Region" => "Обла�ть",
+"Zipcode" => "Почтовый индек�",
+"Country" => "Страна",
+"Create Contact" => "Создать Контакт",
+"Edit" => "Редактировать",
+"Delete" => "Удалить",
+"Birthday" => "День рождени�",
+"Phone" => "Телефон"
+);
diff --git a/apps/contacts/l10n/sk_SK.php b/apps/contacts/l10n/sk_SK.php
new file mode 100644
index 00000000000..acc19672595
--- /dev/null
+++ b/apps/contacts/l10n/sk_SK.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Toto nie je váš adresár.",
+"Contact could not be found." => "Kontakt nebol nájdený.",
+"vCard could not be read." => "vCard nemôže byť pre�ítaná.",
+"Information about vCard is incorrect. Please reload the page." => "Informácie o vCard sú neplatné. Prosím obnovte stránku.",
+"Address" => "Adresa",
+"Telephone" => "Telefón",
+"Email" => "E-mail",
+"Organization" => "Organizácia",
+"Work" => "Práca",
+"Home" => "Domov",
+"Mobile" => "Mobil",
+"Text" => "SMS",
+"Voice" => "Odkazová schránka",
+"Fax" => "Fax",
+"Video" => "Video",
+"Pager" => "Pager",
+"This is not your contact." => "Toto nie je váš kontakt.",
+"This card is not RFC compatible." => "Táto karta nie je kompatibilná s RFC.",
+"This card does not contain a photo." => "Táto karta neobsahuje fotografiu.",
+"Add Contact" => "Pridať Kontakt.",
+"Group" => "Skupina",
+"Name" => "Meno",
+"PO Box" => "PO Box",
+"Extended" => "Rozšírené",
+"Street" => "Ulica",
+"City" => "Mesto",
+"Region" => "Región",
+"Zipcode" => "PSČ",
+"Country" => "Krajina",
+"Create Contact" => "Vytvoriť Kontakt.",
+"Edit" => "Upraviť",
+"Delete" => "Odstrániť",
+"Birthday" => "Narodeniny",
+"Phone" => "Telefón"
+);
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
new file mode 100644
index 00000000000..bce43a7a2c8
--- /dev/null
+++ b/apps/contacts/l10n/sl.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "To ni vaš adresar.",
+"Contact could not be found." => "Kontakta ni bilo mogo�e najti.",
+"vCard could not be read." => "vVizitko (vCard) ni bilo mogo�e prebrati.",
+"Information about vCard is incorrect. Please reload the page." => "Informacije o vVizitki (vCard) niso pravilne, Prosimo ponovno naložite okno.",
+"Address" => "Naslov",
+"Telephone" => "Telefon",
+"Email" => "Email",
+"Organization" => "Organizacija",
+"Work" => "Delo",
+"Home" => "Doma",
+"Mobile" => "Mobitel",
+"Text" => "Tekst",
+"Voice" => "Glas- Voice",
+"Fax" => "Faks",
+"Video" => "Video",
+"Pager" => "Pager",
+"This is not your contact." => "To ni vaš kontakt",
+"This card is not RFC compatible." => "Ta karta ni RFC kopatibilna.",
+"This card does not contain a photo." => "Ta karta ne vsebuje slike.",
+"Add Contact" => "Dodaj Kontakt",
+"Group" => "Skupina",
+"Name" => "Ime",
+"PO Box" => "PO Box",
+"Extended" => "Razširjeno.",
+"Street" => "Ulica",
+"City" => "Mesto",
+"Region" => "Regija",
+"Zipcode" => "Poštna št.",
+"Country" => "Dežela",
+"Create Contact" => "Ustvari Kontakt",
+"Edit" => "Uredi",
+"Delete" => "Izbriši",
+"Birthday" => "Rojstni Dan",
+"Phone" => "Telefon"
+);
diff --git a/apps/contacts/l10n/sr.php b/apps/contacts/l10n/sr.php
new file mode 100644
index 00000000000..f0775f0afda
--- /dev/null
+++ b/apps/contacts/l10n/sr.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Ово није ваш адре�ар.",
+"Contact could not be found." => "Контакт �е не може наћи.",
+"vCard could not be read." => "вКарта �е не може читати.",
+"Information about vCard is incorrect. Please reload the page." => "Подаци о вКарти �у неи�правни. Поново учитајте �траницу.",
+"Address" => "�дре�а",
+"Telephone" => "Телефон",
+"Email" => "Е-маил",
+"Organization" => "Организација",
+"Work" => "По�ао",
+"Home" => "Кућа",
+"Mobile" => "Мобилни",
+"Text" => "Тек�т",
+"Voice" => "Гла�",
+"Fax" => "Фак�",
+"Video" => "Видео",
+"Pager" => "Пејџер",
+"This is not your contact." => "Ово није ваш контакт.",
+"This card is not RFC compatible." => "Ова карта није �агла�на �а РФЦ-ом.",
+"This card does not contain a photo." => "Ова карта не �адржи фотографију.",
+"Add Contact" => "Додај контакт",
+"Group" => "Група",
+"Name" => "Име",
+"PO Box" => "Поштан�ки број",
+"Extended" => "Прошири",
+"Street" => "Улица",
+"City" => "Град",
+"Region" => "Регија",
+"Zipcode" => "Зип код",
+"Country" => "Земља",
+"Create Contact" => "�аправи контакт",
+"Edit" => "Уреди",
+"Delete" => "Обриши",
+"Birthday" => "Рођендан",
+"Phone" => "Телефон"
+);
diff --git a/apps/contacts/l10n/sr@latin.php b/apps/contacts/l10n/sr@latin.php
new file mode 100644
index 00000000000..a4e70daf99c
--- /dev/null
+++ b/apps/contacts/l10n/sr@latin.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Ovo nije vaš adresar.",
+"Contact could not be found." => "Kontakt se ne može naći.",
+"vCard could not be read." => "vKarta se ne može �itati.",
+"Information about vCard is incorrect. Please reload the page." => "Podaci o vKarti su neispravni. Ponovo u�itajte stranicu.",
+"Address" => "Adresa",
+"Telephone" => "Telefon",
+"Email" => "E-mail",
+"Organization" => "Organizacija",
+"Work" => "Posao",
+"Home" => "Kuća",
+"Mobile" => "Mobilni",
+"Text" => "Tekst",
+"Voice" => "Glas",
+"Fax" => "Faks",
+"Video" => "Video",
+"Pager" => "Pejdžer",
+"This is not your contact." => "Ovo nije vaš kontakt.",
+"This card is not RFC compatible." => "Ova karta nije saglasna sa RFC-om.",
+"This card does not contain a photo." => "Ova karta ne sadrži fotografiju.",
+"Add Contact" => "Dodaj kontakt",
+"Group" => "Grupa",
+"Name" => "Ime",
+"PO Box" => "Poštanski broj",
+"Extended" => "Proširi",
+"Street" => "Ulica",
+"City" => "Grad",
+"Region" => "Regija",
+"Zipcode" => "Zip kod",
+"Country" => "Zemlja",
+"Create Contact" => "Napravi kontakt",
+"Edit" => "Uredi",
+"Delete" => "Obriši",
+"Birthday" => "Rođendan",
+"Phone" => "Telefon"
+);
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
new file mode 100644
index 00000000000..d90f0693b3b
--- /dev/null
+++ b/apps/contacts/l10n/sv.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Det här är inte din adressbok.",
+"Contact could not be found." => "Kontakt kunde inte hittas.",
+"vCard could not be read." => "vCard kunde inte läsas in.",
+"Information about vCard is incorrect. Please reload the page." => "Information om vCard är felaktigt. Vänligen ladda om sidan.",
+"Address" => "Adress",
+"Telephone" => "Telefon",
+"Email" => "E-post",
+"Organization" => "Organisation",
+"Work" => "Arbete",
+"Home" => "Hem",
+"Mobile" => "Mobil",
+"Text" => "Text",
+"Voice" => "Röst",
+"Fax" => "Fax",
+"Video" => "Video",
+"Pager" => "Personsökare",
+"This is not your contact." => "Det här är inte din kontakt.",
+"This card is not RFC compatible." => "Detta kort är inte RFC-kompatibelt.",
+"This card does not contain a photo." => "Detta kort innehåller inte något foto.",
+"Add Contact" => "Lägg till kontakt",
+"Group" => "Grupp",
+"Name" => "Namn",
+"PO Box" => "Postbox",
+"Extended" => "Utökad",
+"Street" => "Gata",
+"City" => "Stad",
+"Region" => "Län",
+"Zipcode" => "Postnummer",
+"Country" => "Land",
+"Create Contact" => "Skapa kontakt",
+"Edit" => "Redigera",
+"Delete" => "Radera",
+"Birthday" => "Födelsedag",
+"Phone" => "Telefon"
+);
diff --git a/apps/contacts/l10n/tr.php b/apps/contacts/l10n/tr.php
new file mode 100644
index 00000000000..4ba41a3422c
--- /dev/null
+++ b/apps/contacts/l10n/tr.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "Bu sizin adres defteriniz deÄŸil.",
+"Contact could not be found." => "Kişi bulunamadı.",
+"vCard could not be read." => "vCard okunamadı.",
+"Information about vCard is incorrect. Please reload the page." => "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin.",
+"Address" => "Adres",
+"Telephone" => "Telefon",
+"Email" => "Eposta",
+"Organization" => "Organizasyon",
+"Work" => "Ä°ÅŸ",
+"Home" => "Ev",
+"Mobile" => "Mobil",
+"Text" => "Metin",
+"Voice" => "Ses",
+"Fax" => "Faks",
+"Video" => "Video",
+"Pager" => "Sayfalayıcı",
+"This is not your contact." => "Bu sizin kiÅŸiniz deÄŸil.",
+"This card is not RFC compatible." => "Bu kart RFC uyumlu deÄŸil.",
+"This card does not contain a photo." => "Bu kart resim içermiyor.",
+"Add Contact" => "KiÅŸi Ekle",
+"Group" => "Grup",
+"Name" => "Ad",
+"PO Box" => "Posta Kutusu",
+"Extended" => "Uzatılmış",
+"Street" => "Sokak",
+"City" => "Åžehir",
+"Region" => "Bölge",
+"Zipcode" => "Posta kodu",
+"Country" => "Ãœlke",
+"Create Contact" => "KiÅŸi OluÅŸtur",
+"Edit" => "Düzenle",
+"Delete" => "Sil",
+"Birthday" => "Doğum günü",
+"Phone" => "Telefon"
+);
diff --git a/apps/contacts/l10n/zh_CN.php b/apps/contacts/l10n/zh_CN.php
new file mode 100644
index 00000000000..5ebf2d862fb
--- /dev/null
+++ b/apps/contacts/l10n/zh_CN.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"This is not your addressbook." => "这�是您的地�簿。",
+"Contact could not be found." => "无法找到�系人。",
+"vCard could not be read." => "vCard 无法读�。",
+"Information about vCard is incorrect. Please reload the page." => "vCard 的信��正确。请�新加载页�。",
+"Address" => "地�",
+"Telephone" => "电�",
+"Email" => "电�邮件",
+"Organization" => "组织",
+"Work" => "工作",
+"Home" => "家庭",
+"Mobile" => "移动电�",
+"Text" => "文本",
+"Voice" => "语音",
+"Fax" => "传真",
+"Video" => "视频",
+"Pager" => "传呼机",
+"This is not your contact." => "这�是您的�系人。",
+"This card is not RFC compatible." => "这张�片和RFC 标准�兼容。",
+"This card does not contain a photo." => "这张�片�包�照片。",
+"Add Contact" => "添加�系人",
+"Group" => "分组",
+"Name" => "�称",
+"PO Box" => "邮箱",
+"Extended" => "扩展",
+"Street" => "街�",
+"City" => "城市",
+"Region" => "地区",
+"Zipcode" => "邮编",
+"Country" => "国家",
+"Create Contact" => "创建�系人",
+"Edit" => "编辑",
+"Delete" => "删除",
+"Birthday" => "生日",
+"Phone" => "电�"
+);
diff --git a/apps/media/l10n/ar.php b/apps/media/l10n/ar.php
new file mode 100644
index 00000000000..a335f36a1f2
--- /dev/null
+++ b/apps/media/l10n/ar.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "الموسيقى",
+"Play" => "إلعب",
+"Pause" => "تجميد",
+"Previous" => "السابق",
+"Next" => "التالي",
+"Mute" => "إلغاء الصوت",
+"Unmute" => "تشغيل الصوت",
+"Rescan Collection" => "إعادة البحث عن مل�ات الموسيقى",
+"Artist" => "ال�نان",
+"Album" => "الألبوم",
+"Title" => "العنوان"
+);
diff --git a/apps/media/l10n/bg_BG.php b/apps/media/l10n/bg_BG.php
index 411ab0a8956..1b71b26a165 100644
--- a/apps/media/l10n/bg_BG.php
+++ b/apps/media/l10n/bg_BG.php
@@ -6,7 +6,6 @@
 "Next" => "Следваща",
 "Mute" => "Отнеми",
 "Unmute" => "Върни",
-"Songs scanned" => "Сканирани пе�ни",
 "Rescan Collection" => "Повторно �каниране",
 "Artist" => "�рти�т",
 "Album" => "�лбум",
diff --git a/apps/media/l10n/ca.php b/apps/media/l10n/ca.php
index f0e24d8514d..6c0a1855f3d 100644
--- a/apps/media/l10n/ca.php
+++ b/apps/media/l10n/ca.php
@@ -6,8 +6,7 @@
 "Next" => "Següent",
 "Mute" => "Mut",
 "Unmute" => "Activa el so",
-"Songs scanned" => "Cançons escanejades",
-"Rescan Collection" => "Escaneja de nou la col·lecció",
+"Rescan Collection" => "Explora de nou la col·lecció",
 "Artist" => "Artista",
 "Album" => "Àlbum",
 "Title" => "Títol"
diff --git a/apps/media/l10n/cs_CZ.php b/apps/media/l10n/cs_CZ.php
index 46b3a7e0940..074b44c03b5 100644
--- a/apps/media/l10n/cs_CZ.php
+++ b/apps/media/l10n/cs_CZ.php
@@ -1,12 +1,11 @@
 <?php $TRANSLATIONS = array(
-"Music" => "hudba",
+"Music" => "Hudba",
 "Play" => "Přehrát",
 "Pause" => "Pauza",
 "Previous" => "Předchozí",
 "Next" => "Další",
 "Mute" => "Ztišit",
 "Unmute" => "Zesílit",
-"Songs scanned" => "Skladby jsou prohledány",
 "Rescan Collection" => "Znovu prohledat ",
 "Artist" => "Umělec",
 "Album" => "Album",
diff --git a/apps/media/l10n/da.php b/apps/media/l10n/da.php
index 64cdc59ded5..776081842c3 100644
--- a/apps/media/l10n/da.php
+++ b/apps/media/l10n/da.php
@@ -1,7 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Musik",
+"Play" => "Afspil",
 "Pause" => "Pause",
-"Songs scanned" => "Sange skannet",
+"Previous" => "Forrige",
+"Next" => "Næste",
+"Mute" => "Lydløs",
+"Unmute" => "Lyd til",
 "Rescan Collection" => "Genskan Samling",
 "Artist" => "Kunstner",
 "Album" => "Album",
diff --git a/apps/media/l10n/de.php b/apps/media/l10n/de.php
index 7a87f6dcb35..021a7e9bfe4 100644
--- a/apps/media/l10n/de.php
+++ b/apps/media/l10n/de.php
@@ -1,8 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Musik",
+"Play" => "Abspielen",
 "Pause" => "Pause",
-"Songs scanned" => "Lieder gescannt",
-"Rescan Collection" => "Sammlung scannen",
+"Previous" => "Vorheriges",
+"Next" => "Nächstes",
+"Mute" => "Ton aus",
+"Unmute" => "Ton an",
+"Rescan Collection" => "Sammlung noch einmal scannen",
 "Artist" => "Künstler",
 "Album" => "Album",
 "Title" => "Titel"
diff --git a/apps/media/l10n/el.php b/apps/media/l10n/el.php
index 6d4b781b78f..9996180c03e 100644
--- a/apps/media/l10n/el.php
+++ b/apps/media/l10n/el.php
@@ -6,7 +6,6 @@
 "Next" => "Επόμενο",
 "Mute" => "Σίγαση",
 "Unmute" => "Επαναφο�ά ήχου",
-"Songs scanned" => "Σα�ωμένα τ�αγο�για",
 "Rescan Collection" => "Επανασά�ωση συλλογής",
 "Artist" => "Καλλιτέχνης",
 "Album" => "Άλμπουμ",
diff --git a/apps/media/l10n/eo.php b/apps/media/l10n/eo.php
new file mode 100644
index 00000000000..a572c15cb4c
--- /dev/null
+++ b/apps/media/l10n/eo.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Muziko",
+"Play" => "Ludi",
+"Pause" => "PaÅ­zi",
+"Previous" => "Maljena",
+"Next" => "Jena",
+"Mute" => "Silentigi",
+"Unmute" => "Malsilentigi",
+"Rescan Collection" => "Reskani la aron",
+"Artist" => "Verkinto",
+"Album" => "Albumo",
+"Title" => "Titolo"
+);
diff --git a/apps/media/l10n/es.php b/apps/media/l10n/es.php
index b97fb0bf157..8d654fd36cd 100644
--- a/apps/media/l10n/es.php
+++ b/apps/media/l10n/es.php
@@ -6,7 +6,6 @@
 "Next" => "Siguiente",
 "Mute" => "Silenciar",
 "Unmute" => "Sonar",
-"Songs scanned" => "Canciones encontradas",
 "Rescan Collection" => "Buscar música nueva",
 "Artist" => "Artista",
 "Album" => "�lbum",
diff --git a/apps/media/l10n/et_EE.php b/apps/media/l10n/et_EE.php
index c516ca64f26..4133cb84a98 100644
--- a/apps/media/l10n/et_EE.php
+++ b/apps/media/l10n/et_EE.php
@@ -6,7 +6,6 @@
 "Next" => "Järgmine",
 "Mute" => "Vaikseks",
 "Unmute" => "Hääl tagasi",
-"Songs scanned" => "Skännitud lood",
 "Rescan Collection" => "Skänni kollekttsiooni uuesti",
 "Artist" => "Esitaja",
 "Album" => "Album",
diff --git a/apps/media/l10n/eu.php b/apps/media/l10n/eu.php
new file mode 100644
index 00000000000..d30e3519161
--- /dev/null
+++ b/apps/media/l10n/eu.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Musika",
+"Play" => "Erreproduzitu",
+"Pause" => "Pausarazi",
+"Previous" => "Aurrekoa",
+"Next" => "Hurrengoa",
+"Mute" => "Mututu",
+"Unmute" => "Ez Mututu",
+"Rescan Collection" => "Bireskaneatu Bilduma",
+"Artist" => "Artista",
+"Album" => "Albuma",
+"Title" => "Izenburua"
+);
diff --git a/apps/media/l10n/fr.php b/apps/media/l10n/fr.php
index 3e4e0f19283..c96e84d73fd 100644
--- a/apps/media/l10n/fr.php
+++ b/apps/media/l10n/fr.php
@@ -1,7 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Musique",
+"Play" => "Play",
 "Pause" => "Pause",
-"Songs scanned" => "Pistes scannées",
+"Previous" => "Précédent",
+"Next" => "Suivant",
+"Mute" => "Muet",
+"Unmute" => "Audible",
 "Rescan Collection" => "Réanalyser la Collection",
 "Artist" => "Artiste",
 "Album" => "Album",
diff --git a/apps/media/l10n/he.php b/apps/media/l10n/he.php
new file mode 100644
index 00000000000..772bfb90281
--- /dev/null
+++ b/apps/media/l10n/he.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "מוזיקה",
+"Play" => "נגן",
+"Pause" => "השהה",
+"Previous" => "קוד�",
+"Next" => "הב�",
+"Mute" => "השתק",
+"Unmute" => "בטל השתקה",
+"Rescan Collection" => "סריקת �וסף מחדש",
+"Artist" => "מבצע",
+"Album" => "�לבו�",
+"Title" => "כותרת"
+);
diff --git a/apps/media/l10n/hr.php b/apps/media/l10n/hr.php
new file mode 100644
index 00000000000..bab149743cf
--- /dev/null
+++ b/apps/media/l10n/hr.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Glazba",
+"Play" => "Reprodukcija",
+"Pause" => "Pauza",
+"Previous" => "Prethodna",
+"Next" => "Sljedeća",
+"Mute" => "Utišaj zvuk",
+"Unmute" => "Uklju�i zvuk",
+"Rescan Collection" => "Ponovi skeniranje kolekcije",
+"Artist" => "Izvođa�",
+"Album" => "Album",
+"Title" => "Naslov"
+);
diff --git a/apps/media/l10n/hu_HU.php b/apps/media/l10n/hu_HU.php
new file mode 100644
index 00000000000..299e0af0287
--- /dev/null
+++ b/apps/media/l10n/hu_HU.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Zene",
+"Play" => "Lejátszás",
+"Pause" => "Szünet",
+"Previous" => "Előző",
+"Next" => "Következő",
+"Mute" => "Némítás",
+"Unmute" => "Némítás megszüntetése",
+"Rescan Collection" => "Gyűjtemény újraolvasása",
+"Artist" => "Előadó",
+"Album" => "Album",
+"Title" => "Cím"
+);
diff --git a/apps/media/l10n/ia.php b/apps/media/l10n/ia.php
new file mode 100644
index 00000000000..597b36e10fa
--- /dev/null
+++ b/apps/media/l10n/ia.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Musica",
+"Play" => "Reproducer",
+"Pause" => "Pausa",
+"Previous" => "Previe",
+"Next" => "Proxime",
+"Mute" => "Mute",
+"Unmute" => "Con sono",
+"Rescan Collection" => "Rescannar collection",
+"Artist" => "Artista",
+"Album" => "Album",
+"Title" => "Titulo"
+);
diff --git a/apps/media/l10n/id.php b/apps/media/l10n/id.php
index 7127f85fbf0..52b0bae0eea 100644
--- a/apps/media/l10n/id.php
+++ b/apps/media/l10n/id.php
@@ -1,7 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Musik",
+"Play" => "Mainkan",
 "Pause" => "Jeda",
-"Songs scanned" => "Lagu-lagu yang telah dipindai",
+"Previous" => "Sebelumnya",
+"Next" => "Selanjutnya",
+"Mute" => "Nonaktifkan suara",
+"Unmute" => "Aktifkan suara",
 "Rescan Collection" => "Pindai ulang Koleksi",
 "Artist" => "Artis",
 "Album" => "Album",
diff --git a/apps/media/l10n/it.php b/apps/media/l10n/it.php
index f0d9c606e74..d4bad14a4bb 100644
--- a/apps/media/l10n/it.php
+++ b/apps/media/l10n/it.php
@@ -6,8 +6,7 @@
 "Next" => "Successiva",
 "Mute" => "Disattiva audio",
 "Unmute" => "Riattiva audio",
-"Songs scanned" => "Canzoni analizzate",
-"Rescan Collection" => "Rianalizza colezione",
+"Rescan Collection" => "Rianalizza collezione",
 "Artist" => "Artista",
 "Album" => "Album",
 "Title" => "Titolo"
diff --git a/apps/media/l10n/ja_JP.php b/apps/media/l10n/ja_JP.php
new file mode 100644
index 00000000000..395ebe792eb
--- /dev/null
+++ b/apps/media/l10n/ja_JP.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "ミュージック",
+"Play" => "�生",
+"Pause" => "一時�止",
+"Previous" => "�",
+"Next" => "次",
+"Mute" => "ミュート",
+"Unmute" => "ミュート解除",
+"Rescan Collection" => "コレクションを�読�込��る",
+"Artist" => "アーティスト",
+"Album" => "アル�ム",
+"Title" => "曲�"
+);
diff --git a/apps/media/l10n/lb.php b/apps/media/l10n/lb.php
index 2c127cf83ed..4a2727fcb11 100644
--- a/apps/media/l10n/lb.php
+++ b/apps/media/l10n/lb.php
@@ -6,7 +6,6 @@
 "Next" => "Weider",
 "Mute" => "Toun ausmaachen",
 "Unmute" => "Toun umaachen",
-"Songs scanned" => "Lidder gescannt",
 "Rescan Collection" => "Kollektioun nei scannen",
 "Artist" => "Artist",
 "Album" => "Album",
diff --git a/apps/media/l10n/lt_LT.php b/apps/media/l10n/lt_LT.php
new file mode 100644
index 00000000000..1761ffdc3b2
--- /dev/null
+++ b/apps/media/l10n/lt_LT.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Muzika",
+"Play" => "Groti",
+"Pause" => "Pristabdyti",
+"Previous" => "Atgal",
+"Next" => "Kitas",
+"Mute" => "Nutildyti",
+"Unmute" => "Įjungti garsą",
+"Rescan Collection" => "Atnaujinti kolekcijÄ…",
+"Artist" => "AtlikÄ—jas",
+"Album" => "Albumas",
+"Title" => "Pavadinimas"
+);
diff --git a/apps/media/l10n/ms_MY.php b/apps/media/l10n/ms_MY.php
index 43cc47c81d7..aaa1c3edfb9 100644
--- a/apps/media/l10n/ms_MY.php
+++ b/apps/media/l10n/ms_MY.php
@@ -6,7 +6,6 @@
 "Next" => "Seterus",
 "Mute" => "Bisu",
 "Unmute" => "Nyahbisu",
-"Songs scanned" => "Lagu telah diimbas",
 "Rescan Collection" => "Imbas semula koleksi",
 "Artist" => "Artis",
 "Album" => "Album",
diff --git a/apps/media/l10n/nb_NO.php b/apps/media/l10n/nb_NO.php
index 7afe796bb2c..dbed1526b76 100644
--- a/apps/media/l10n/nb_NO.php
+++ b/apps/media/l10n/nb_NO.php
@@ -6,7 +6,6 @@
 "Next" => "Neste",
 "Mute" => "Demp",
 "Unmute" => "Skru på lyd",
-"Songs scanned" => "Sanger skannet",
 "Rescan Collection" => "Skan samling på nytt",
 "Artist" => "Artist",
 "Album" => "Album",
diff --git a/apps/media/l10n/nl.php b/apps/media/l10n/nl.php
index 7ae0a761af0..705bf2a613c 100644
--- a/apps/media/l10n/nl.php
+++ b/apps/media/l10n/nl.php
@@ -1,7 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Muziek",
-"Pause" => "Pauze",
-"Songs scanned" => "nummers gescanned",
+"Play" => "Afspelen",
+"Pause" => "Pauzeer",
+"Previous" => "Vorige",
+"Next" => "Volgende",
+"Mute" => "Dempen",
+"Unmute" => "Dempen uit",
 "Rescan Collection" => "Collectie opnieuw scannen",
 "Artist" => "Artiest",
 "Album" => "Album",
diff --git a/apps/media/l10n/nn_NO.php b/apps/media/l10n/nn_NO.php
new file mode 100644
index 00000000000..2579c7b6ba0
--- /dev/null
+++ b/apps/media/l10n/nn_NO.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Musikk",
+"Play" => "Spel",
+"Pause" => "Pause",
+"Previous" => "Førre",
+"Next" => "Neste",
+"Mute" => "Demp",
+"Unmute" => "Skru på lyd",
+"Rescan Collection" => "Skann samlinga på nytt",
+"Artist" => "Artist",
+"Album" => "Album",
+"Title" => "Tittel"
+);
diff --git a/apps/media/l10n/pl.php b/apps/media/l10n/pl.php
index bb74d6d578a..3612d714eca 100644
--- a/apps/media/l10n/pl.php
+++ b/apps/media/l10n/pl.php
@@ -1,7 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Muzyka",
+"Play" => "Odtwarzaj",
 "Pause" => "Zatrzymaj",
-"Songs scanned" => "Przeskanowane utwory",
+"Previous" => "Poprzedni",
+"Next" => "Następny",
+"Mute" => "Wycisz",
+"Unmute" => "WÅ‚Ä…cz",
 "Rescan Collection" => "Przeskanuj kolekcjÄ™",
 "Artist" => "Artysta",
 "Album" => "Album",
diff --git a/apps/media/l10n/pt_BR.php b/apps/media/l10n/pt_BR.php
index ac5b1c22d7d..6a1289cfa83 100644
--- a/apps/media/l10n/pt_BR.php
+++ b/apps/media/l10n/pt_BR.php
@@ -6,7 +6,6 @@
 "Next" => "Próximo",
 "Mute" => "Mudo",
 "Unmute" => "Não Mudo",
-"Songs scanned" => "Músicas encontradas",
 "Rescan Collection" => "Atualizar a Coleção",
 "Artist" => "Artista",
 "Album" => "�lbum",
diff --git a/apps/media/l10n/ro.php b/apps/media/l10n/ro.php
index a185a958f71..17711d61dc9 100644
--- a/apps/media/l10n/ro.php
+++ b/apps/media/l10n/ro.php
@@ -6,7 +6,6 @@
 "Next" => "Următor",
 "Mute" => "Fără sonor",
 "Unmute" => "Cu sonor",
-"Songs scanned" => "Melodii scanate",
 "Rescan Collection" => "Rescanează colecția",
 "Artist" => "Artist",
 "Album" => "Album",
diff --git a/apps/media/l10n/ru.php b/apps/media/l10n/ru.php
index d0934a73363..5426332a1b0 100644
--- a/apps/media/l10n/ru.php
+++ b/apps/media/l10n/ru.php
@@ -6,7 +6,6 @@
 "Next" => "Следующий",
 "Mute" => "Отключить звук",
 "Unmute" => "Включить звук",
-"Songs scanned" => "Пе�ен про�канировано",
 "Rescan Collection" => "Пере�канировать коллекцию",
 "Artist" => "И�полнитель",
 "Album" => "�льбом",
diff --git a/apps/media/l10n/sk_SK.php b/apps/media/l10n/sk_SK.php
new file mode 100644
index 00000000000..05f52d76d88
--- /dev/null
+++ b/apps/media/l10n/sk_SK.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Hudba",
+"Play" => "Prehrať",
+"Pause" => "Pauza",
+"Previous" => "Predchádzajúce",
+"Next" => "Ďalšie",
+"Mute" => "Stlmiť",
+"Unmute" => "Nahlas",
+"Rescan Collection" => "Znovu skenovať Zbierku",
+"Artist" => "Umelec",
+"Album" => "Album",
+"Title" => "Názov"
+);
diff --git a/apps/media/l10n/sl.php b/apps/media/l10n/sl.php
new file mode 100644
index 00000000000..e7c0dd0c57b
--- /dev/null
+++ b/apps/media/l10n/sl.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Glasba",
+"Play" => "Predvajaj",
+"Pause" => "Pavza",
+"Previous" => "Prejšnja",
+"Next" => "Naslednja",
+"Mute" => "Izklju�i zvok",
+"Unmute" => "Vklju�i zvok",
+"Rescan Collection" => "Skeniraj zbirko",
+"Artist" => "Izvajalec",
+"Album" => "Album",
+"Title" => "Naslov"
+);
diff --git a/apps/media/l10n/sr.php b/apps/media/l10n/sr.php
index 7440bf43019..dff0daf4358 100644
--- a/apps/media/l10n/sr.php
+++ b/apps/media/l10n/sr.php
@@ -6,7 +6,6 @@
 "Next" => "Следећа",
 "Mute" => "И�кључи звук",
 "Unmute" => "Укључи звук",
-"Songs scanned" => "Претражених пе�ама",
 "Rescan Collection" => "Поново претражи збирку",
 "Artist" => "Извођач",
 "Album" => "�лбум",
diff --git a/apps/media/l10n/sr@latin.php b/apps/media/l10n/sr@latin.php
index fecdb0a5a74..6476898387b 100644
--- a/apps/media/l10n/sr@latin.php
+++ b/apps/media/l10n/sr@latin.php
@@ -6,7 +6,6 @@
 "Next" => "Sledeća",
 "Mute" => "Isklju�i zvuk",
 "Unmute" => "Uklju�i zvuk",
-"Songs scanned" => "Pretraženih pesama",
 "Rescan Collection" => "Ponovo pretraži zbirku",
 "Artist" => "Izvođa�",
 "Album" => "Album",
diff --git a/apps/media/l10n/sv.php b/apps/media/l10n/sv.php
index f20fb2c6a57..75670a48515 100644
--- a/apps/media/l10n/sv.php
+++ b/apps/media/l10n/sv.php
@@ -6,7 +6,6 @@
 "Next" => "Nästa",
 "Mute" => "Ljudlös",
 "Unmute" => "Ljud på",
-"Songs scanned" => "Skannade låtar",
 "Rescan Collection" => "Sök igenom samlingen",
 "Artist" => "Artist",
 "Album" => "Album",
diff --git a/apps/media/l10n/tr.php b/apps/media/l10n/tr.php
new file mode 100644
index 00000000000..1eaf98145ac
--- /dev/null
+++ b/apps/media/l10n/tr.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Müzik",
+"Play" => "Oynat",
+"Pause" => "Beklet",
+"Previous" => "Önceki",
+"Next" => "Sonraki",
+"Mute" => "Sesi kapat",
+"Unmute" => "Sesi aç",
+"Rescan Collection" => "Koleksiyonu Tara",
+"Artist" => "Sanatç",
+"Album" => "Albüm",
+"Title" => "Başlık"
+);
diff --git a/apps/media/l10n/zh_CN.php b/apps/media/l10n/zh_CN.php
index 4747dfd30e7..0b24cf3fe0d 100644
--- a/apps/media/l10n/zh_CN.php
+++ b/apps/media/l10n/zh_CN.php
@@ -6,7 +6,6 @@
 "Next" => "�一首",
 "Mute" => "�音",
 "Unmute" => "�消�音",
-"Songs scanned" => "歌曲已扫�",
 "Rescan Collection" => "�新扫�收�",
 "Artist" => "艺术家",
 "Album" => "专辑",
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
new file mode 100644
index 00000000000..02b8bcda2ca
--- /dev/null
+++ b/core/l10n/ar.php
@@ -0,0 +1,34 @@
+<?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "سو� نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
+"Requested" => "تم طلب",
+"Login failed!" => "محاولة دخول �اشلة!",
+"Username" => "إسم المستخدم",
+"Request reset" => "طلب تعديل",
+"Your password was reset" => "لقد تم تعديل كلمة السر",
+"New password" => "كلمة سر جديدة",
+"Reset password" => "تعديل كلمة السر",
+"Personal" => "خصوصيات",
+"Users" => "المستخدم",
+"Apps" => "التطبيقات",
+"Admin" => "مستخدم رئيسي",
+"Help" => "المساعدة",
+"Cloud not found" => "لم يتم إيجاد",
+"Create an <strong>admin account</strong>" => "أض� </strong>مستخدم رئيسي <strong>",
+"Password" => "كلمة السر",
+"Advanced" => "خيارات متقدمة",
+"Data folder" => "مجلد المعلومات",
+"Configure the database" => "أسس قاعدة البيانات",
+"will be used" => "سيتم استخدمه",
+"Database user" => "مستخدم قاعدة البيانات",
+"Database password" => "كلمة سر مستخدم قاعدة البيانات",
+"Database name" => "إسم قاعدة البيانات",
+"Database host" => "خادم قاعدة البيانات",
+"Finish setup" => "انهاء التعديلات",
+"Log out" => "الخروج",
+"Settings" => "تعديلات",
+"Lost your password?" => "هل نسيت كلمة السر؟",
+"remember" => "تذكر",
+"You are logged out." => "تم الخروج بنجاح.",
+"prev" => "السابق",
+"next" => "التالي"
+);
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 6bf25e5598b..46047a35350 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Ще получите връзка за нулиране на паролата Ви.",
+"Requested" => "За�вено",
+"Login failed!" => "Входа пропадна!",
+"Username" => "Потребител",
+"Request reset" => "�улиране на за�вка",
+"Your password was reset" => "Вашата парола е нулирана",
+"New password" => "�ова парола",
+"Reset password" => "�улиране на парола",
 "Personal" => "Лични",
 "Users" => "Потребители",
 "Apps" => "Програми",
@@ -6,31 +14,21 @@
 "Help" => "Помощ",
 "Cloud not found" => "облакът не намерен",
 "Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>",
-"Username" => "Потребител",
 "Password" => "Парола",
+"Advanced" => "Разширено",
+"Data folder" => "Директори� за данни",
 "Configure the database" => "Конфигуриране на базата",
 "will be used" => "ще �е ползва",
 "Database user" => "Потребител за базата",
 "Database password" => "Парола за базата",
 "Database name" => "Име на базата",
-"Advanced" => "Разширено",
 "Database host" => "Хо�т за базата",
-"Data folder" => "Директори� за данни",
 "Finish setup" => "Завършване на на�тройките",
-"gives you freedom and control over your own data" => "дава Ви �вобода и контрол на Вашите лични данни",
 "Log out" => "Изход",
 "Settings" => "�а�тройки",
 "Lost your password?" => "Забравена парола?",
 "remember" => "запомни",
 "You are logged out." => "Вие изл�зохте.",
-"You will receive a link to reset your password via Email." => "Ще получите връзка за да нулирате паролата �и.",
-"Requested" => "За�вено",
-"Login failed!" => "Входа пропадна!",
-"Username or Email" => "Потребител�ко име или Email",
-"Request reset" => "За�вка за нулиране",
 "prev" => "пред.",
-"next" => "�ледващо",
-"Your password was reset" => "Вашата парола е нулирана",
-"New password" => "�ова парола",
-"Reset password" => "�улиране на парола"
+"next" => "�ледващо"
 );
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 3ecd041ad01..2f9017822eb 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
+"Requested" => "Sol·licitat",
+"Login failed!" => "No s'ha pogut entrar",
+"Username" => "Nom d'usuari",
+"Request reset" => "Sol·licita reinicialització",
+"Your password was reset" => "La vostra contrasenya s'ha reinicialitzat",
+"New password" => "Contrasenya nova",
+"Reset password" => "Reinicialitza contrasenya",
 "Personal" => "Personal",
 "Users" => "Usuaris",
 "Apps" => "Aplicacions",
@@ -6,31 +14,21 @@
 "Help" => "Ajuda",
 "Cloud not found" => "No s'ha trobat el núvol",
 "Create an <strong>admin account</strong>" => "Crea un <strong>compte d'administrador</strong>",
-"Username" => "Nom d'usuari",
 "Password" => "Contrasenya",
+"Advanced" => "Avançat",
+"Data folder" => "Carpeta de dades",
 "Configure the database" => "Configura la base de dades",
 "will be used" => "s'usarà",
 "Database user" => "Usuari de la base de dades",
 "Database password" => "Contrasenya de la base de dades",
 "Database name" => "Nom de la base de dades",
-"Advanced" => "Avançat",
 "Database host" => "Ordinador central de la base de dades",
-"Data folder" => "Carpeta de dades",
 "Finish setup" => "Acaba la configuració",
-"gives you freedom and control over your own data" => "us dóna llibertat i control sobre les seves dades",
 "Log out" => "Sortir",
 "Settings" => "Arranjament",
 "Lost your password?" => "Heu perdut la contrasenya?",
 "remember" => "recorda'm",
 "You are logged out." => "Heu tancat la sessió.",
-"You will receive a link to reset your password via Email." => "Rebreu un enllaç per correu electrònic per restablir la contrasenya",
-"Requested" => "Sol·licitat",
-"Login failed!" => "L'inici de sessió ha fallat!",
-"Username or Email" => "Nom d'usuari o correu electrònic",
-"Request reset" => "Sol.licitud de restabliment",
 "prev" => "anterior",
-"next" => "següent",
-"Your password was reset" => "La vostra contrasenya s'ha restablert",
-"New password" => "Nova contrasenya",
-"Reset password" => "Restabliment de la contrasenya"
+"next" => "següent"
 );
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 08a90ba4a0f..ad2b34e7a70 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Bude Vám zaslán odkaz pro obnovu hesla",
+"Requested" => "Požadováno",
+"Login failed!" => "Přihlášení selhalo",
+"Username" => "Uživatelské jméno",
+"Request reset" => "Vyžádat obnovu",
+"Your password was reset" => "Vaše heslo bylo obnoveno",
+"New password" => "Nové heslo",
+"Reset password" => "Obnovit heslo",
 "Personal" => "Osobní",
 "Users" => "Uživatelé",
 "Apps" => "Aplikace",
@@ -6,21 +14,21 @@
 "Help" => "Nápověda",
 "Cloud not found" => "Cloud nebyl nalezen",
 "Create an <strong>admin account</strong>" => "Vytvořit <strong>ú�et správce</strong>",
-"Username" => "Uživatelské jméno",
 "Password" => "Heslo",
+"Advanced" => "Rozšířené volby",
+"Data folder" => "Datový adresář",
 "Configure the database" => "Konfigurace databáze",
 "will be used" => "bude použito",
 "Database user" => "Uživatel databáze",
 "Database password" => "Heslo k databázi",
 "Database name" => "Název databáze",
-"Advanced" => "Rozšířené volby",
-"Data folder" => "Datový adresář",
+"Database host" => "Hostitel databáze",
 "Finish setup" => "Dokon�it instalaci",
 "Log out" => "Odhlásit se",
 "Settings" => "Nastavení",
+"Lost your password?" => "Zapomenuté heslo?",
 "remember" => "zapamatovat si",
 "You are logged out." => "Jste odhlášeni.",
-"Login failed!" => "Přihlášení se nezdařilo!",
 "prev" => "zpět",
 "next" => "vpřed"
 );
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 5c1ca0dc211..298ee69ec22 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,36 +1,34 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
+"Requested" => "Forespugt",
+"Login failed!" => "Login fejlede!",
+"Username" => "Brugernavn",
+"Request reset" => "Anmod om nulstilling",
+"Your password was reset" => "Dit kodeord blev nulstillet",
+"New password" => "Nyt kodeord",
+"Reset password" => "Nulstil kodeord",
 "Personal" => "Personlig",
 "Users" => "Brugere",
 "Apps" => "Apps",
 "Admin" => "Admin",
 "Help" => "Hjælp",
 "Cloud not found" => "Sky ikke fundet",
-"Create an <strong>admin account</strong>" => "Lav en <strong>administrator konto</strong>",
-"Username" => "Brugernavn",
+"Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
 "Password" => "Kodeord",
+"Advanced" => "Avanceret",
+"Data folder" => "Datamappe",
 "Configure the database" => "Konfigurer databasen",
 "will be used" => "vil blive brugt",
-"Database user" => "Database-bruger",
-"Database password" => "Database-kodeord",
-"Database name" => "Database-navn",
-"Advanced" => "Avanceret",
-"Database host" => "Database host",
-"Data folder" => "Data mappe",
-"Finish setup" => "Afslut installation",
-"gives you freedom and control over your own data" => "giver dig frihed og kontrol over dine egne data",
+"Database user" => "Databasebruger",
+"Database password" => "Databasekodeord",
+"Database name" => "Navn på database",
+"Database host" => "Databasehost",
+"Finish setup" => "Afslut opsætning",
 "Log out" => "Log ud",
 "Settings" => "Indstillinger",
 "Lost your password?" => "Mistet dit kodeord?",
 "remember" => "husk",
-"You are logged out." => "Du er nu logget ud",
-"You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille din adgangskode via e-mail.",
-"Requested" => "Anmodet",
-"Login failed!" => "Login mislykkedes!",
-"Username or Email" => "Brugernavn eller E-mail",
-"Request reset" => "Anmod om nulstilling",
+"You are logged out." => "Du er nu logget ud.",
 "prev" => "forrige",
-"next" => "næste",
-"Your password was reset" => "Din adgangskode blev nulstillet",
-"New password" => "Ny adgangskode",
-"Reset password" => "Nulstil adgangskode"
+"next" => "næste"
 );
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 0b5a0e13cea..0bbfa406fad 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen.",
+"Requested" => "Angefragt",
+"Login failed!" => "Login fehlgeschlagen!",
+"Username" => "Nutzername",
+"Request reset" => "Anfrage zurückgesetzt",
+"Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
+"New password" => "Neues Passwort",
+"Reset password" => "Passwort zurücksetzen",
 "Personal" => "Persönlich",
 "Users" => "Nutzer",
 "Apps" => "Anwendungen",
@@ -6,31 +14,21 @@
 "Help" => "Hilfe",
 "Cloud not found" => "Cloud nicht verfügbar",
 "Create an <strong>admin account</strong>" => "<strong>Admin-Konto</strong> anlegen",
-"Username" => "Nutzername",
 "Password" => "Passwort",
+"Advanced" => "Erweitert",
+"Data folder" => "Datenverzeichnis",
 "Configure the database" => "Datenbank einrichten",
 "will be used" => "wird genutzt",
 "Database user" => "Datenbanknutzer",
 "Database password" => "Datenbankpasswort",
 "Database name" => "Datenbankname",
-"Advanced" => "Erweitert",
 "Database host" => "Datenbank-Host",
-"Data folder" => "Datenverzeichnis",
 "Finish setup" => "Installation abschließen",
-"gives you freedom and control over your own data" => "gibt dir Freiheit und Kontrolle über deine eigenen Daten",
 "Log out" => "Abmelden",
 "Settings" => "Einstellungen",
 "Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
 "You are logged out." => "Abgemeldet",
-"You will receive a link to reset your password via Email." => "Du wirst per Email einen Link zum Zurücksetzen deines Passworts erhalten.",
-"Requested" => "zurückgesetzt",
-"Login failed!" => "Anmeldung fehlgeschlagen!",
-"Username or Email" => "Nutzername oder Email",
-"Request reset" => "Zurücksetzen",
 "prev" => "Zurück",
-"next" => "Weiter",
-"Your password was reset" => "Dein Passwort wurde zurückgesetzt.",
-"New password" => "Neues Passwort",
-"Reset password" => "Zurücksetzen"
+"next" => "Weiter"
 );
diff --git a/core/l10n/el.php b/core/l10n/el.php
index c75227f8aad..c831f5a64e3 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Θα λάβετε ένα σ�νδεσμο για να επαναφέ�ετε τον κωδικό π�όσβασής σας μέσω ηλεκτ�ονικο� ταχυδ�ομείου.",
+"Requested" => "Ζητήθησαν",
+"Login failed!" => "Η σ�νδεση απέτυχε!",
+"Username" => "Όνομα Χ�ήστη",
+"Request reset" => "Επαναφο�ά αίτησης",
+"Your password was reset" => "Ο κωδικός π�όσβασής σας επαναφέ�θηκε",
+"New password" => "�έος κωδικός",
+"Reset password" => "Επαναφο�ά κωδικο� π�όσβασης",
 "Personal" => "Π�οσωπικά",
 "Users" => "Χ�ήστες",
 "Apps" => "Εφα�μογές",
@@ -6,31 +14,21 @@
 "Help" => "Βοήθεια",
 "Cloud not found" => "Δεν β�έθηκε σ�ννεφο",
 "Create an <strong>admin account</strong>" => "Δημιου�γήστε έναν <strong>λογα�ιασμό διαχει�ιστή</strong>",
-"Username" => "Όνομα Χ�ήστη",
 "Password" => "Κωδικός",
+"Advanced" => "Για π�οχω�ημένους",
+"Data folder" => "Φάκελος δεδομένων",
 "Configure the database" => "Διαμό�φωση της βάσης δεδομένων",
 "will be used" => "θα χ�ησιμοποιηθο�ν",
 "Database user" => "Χ�ήστης της βάσης δεδομένων",
 "Database password" => "Κωδικός π�όσβασης βάσης δεδομένων",
 "Database name" => "Όνομα βάσης δεδομένων",
-"Advanced" => "Για π�οχω�ημένους",
 "Database host" => "Διακομιστής βάσης δεδομένων",
-"Data folder" => "Φάκελος δεδομένων",
 "Finish setup" => "Ολοκλή�ωση εγκατάστασης",
-"gives you freedom and control over your own data" => "σας δίνει την ελευθε�ία και τον έλεγχο επί των δικών σας δεδομένων",
 "Log out" => "Αποσ�νδεση",
 "Settings" => "Ρυθμίσεις",
 "Lost your password?" => "Ξεχάσατε τον κωδικό σας;",
 "remember" => "να με θυμάσαι",
 "You are logged out." => "Έχετε αποσυνδεθεί.",
-"You will receive a link to reset your password via Email." => "Θα λάβετε ένα σ�νδεσμο για να επαναφέ�ετε τον κωδικό π�όσβασής σας, μέσω ηλεκτ�ονικο� ταχυδ�ομείου.",
-"Requested" => "Αιτήθησαν",
-"Login failed!" => "Η σ�νδεση απέτυχε!",
-"Username or Email" => "Όνομα Χ�ήστη ή Email",
-"Request reset" => "Επαναφο�άς αίτησης",
 "prev" => "π�οηγο�μενο",
-"next" => "επόμενο",
-"Your password was reset" => "Έγινε επαναφο�ά του κωδικο� π�όσβασής σας",
-"New password" => "�έος κωδικός",
-"Reset password" => "Επαναφο�ά κωδικο� π�όσβασης"
+"next" => "επόμενο"
 );
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
new file mode 100644
index 00000000000..9719ab39c19
--- /dev/null
+++ b/core/l10n/eo.php
@@ -0,0 +1,34 @@
+<?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpo�te por rekomencigi vian pasvorton.",
+"Requested" => "Petita",
+"Login failed!" => "Ensaluto malsukcesis!",
+"Username" => "Uzantonomo",
+"Request reset" => "Peti rekomencigon",
+"Your password was reset" => "Via pasvorto rekomencis",
+"New password" => "Nova pasvorto",
+"Reset password" => "Rekomenci la pasvorton",
+"Personal" => "Persona",
+"Users" => "Uzantoj",
+"Apps" => "Aplikaĵoj",
+"Admin" => "Administranto",
+"Help" => "Helpo",
+"Cloud not found" => "La nubo ne estas trovita",
+"Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>",
+"Password" => "Pasvorto",
+"Advanced" => "Porsperta",
+"Data folder" => "Datuma dosierujo",
+"Configure the database" => "Agordi la datumbazon",
+"will be used" => "estos uzata",
+"Database user" => "Datumbaza uzanto",
+"Database password" => "Datumbaza pasvorto",
+"Database name" => "Datumbaza nomo",
+"Database host" => "Datumbaza gastigo",
+"Finish setup" => "Fini la instalon",
+"Log out" => "Elsaluti",
+"Settings" => "Agordo",
+"Lost your password?" => "Ĉu vi perdis vian pasvorton?",
+"remember" => "memori",
+"You are logged out." => "Vi elsalutis.",
+"prev" => "maljena",
+"next" => "jena"
+);
diff --git a/core/l10n/es.php b/core/l10n/es.php
index e997a17002f..20a92b51e8b 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña",
+"Requested" => "Pedido",
+"Login failed!" => "¡Fallo al iniciar sesión!",
+"Username" => "Nombre de usuario",
+"Request reset" => "Solicitar restablecimiento",
+"Your password was reset" => "Tu contraseña se ha restablecido",
+"New password" => "Nueva contraseña",
+"Reset password" => "Restablecer contraseña",
 "Personal" => "Personal",
 "Users" => "Usuarios",
 "Apps" => "Aplicaciones",
@@ -6,31 +14,21 @@
 "Help" => "Ayuda",
 "Cloud not found" => "No se encontró la nube",
 "Create an <strong>admin account</strong>" => "Crea una <strong>cuenta de administrador</strong>",
-"Username" => "Nombre de usuario",
 "Password" => "Contraseña",
+"Advanced" => "Avanzado",
+"Data folder" => "Directorio de almacenamiento",
 "Configure the database" => "Configurar la base de datos",
 "will be used" => "serán utilizados",
 "Database user" => "Usuario de la base de datos",
 "Database password" => "Contraseña de la base de datos",
 "Database name" => "Nombre de la base de datos",
-"Advanced" => "Avanzado",
 "Database host" => "Host de la base de datos",
-"Data folder" => "Directorio de almacenamiento",
 "Finish setup" => "Completar la instalación",
-"gives you freedom and control over your own data" => "te da la libertad y el control sobre tus propios datos",
 "Log out" => "Salir",
 "Settings" => "Ajustes",
 "Lost your password?" => "¿Has perdido tu contraseña?",
 "remember" => "recuérdame",
 "You are logged out." => "Has cerrado sesión.",
-"You will receive a link to reset your password via Email." => "Recibirás un link para restablecer tu contraseña vía Email.",
-"Requested" => "Solicitado",
-"Login failed!" => "¡No se pudo iniciar sesión!",
-"Username or Email" => "Nombre de usuario o Email",
-"Request reset" => "Solicitar restablecimiento",
 "prev" => "anterior",
-"next" => "siguiente",
-"Your password was reset" => "Tu contraseña se ha restablecido",
-"New password" => "Nueva contraseña",
-"Reset password" => "Restablecer contraseña"
+"next" => "siguiente"
 );
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 84d05d17ba7..ba70a6a0c42 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
+"Requested" => "Kohustuslik",
+"Login failed!" => "Sisselogimine ebaõnnestus!",
+"Username" => "Kasutajanimi",
+"Request reset" => "Päringu taastamine",
+"Your password was reset" => "Sinu parool on taastatud",
+"New password" => "Uus parool",
+"Reset password" => "Nulli parool",
 "Personal" => "isiklik",
 "Users" => "Kasutajad",
 "Apps" => "Programmid",
@@ -6,31 +14,21 @@
 "Help" => "Abiinfo",
 "Cloud not found" => "Pilve ei leitud",
 "Create an <strong>admin account</strong>" => "Loo <strong>admini konto</strong>",
-"Username" => "Kasutajanimi",
 "Password" => "Parool",
+"Advanced" => "Lisavalikud",
+"Data folder" => "Andmete kaust",
 "Configure the database" => "Seadista andmebaasi",
 "will be used" => "kasutatakse",
 "Database user" => "Andmebaasi kasutaja",
 "Database password" => "Andmebaasi parool",
 "Database name" => "Andmebasi nimi",
-"Advanced" => "Lisavalikud",
 "Database host" => "Andmebaasi host",
-"Data folder" => "Andmete kaust",
 "Finish setup" => "Lõpeta seadistamine",
-"gives you freedom and control over your own data" => "Annab sulle vabaduse ja kontrolli sinu enda andmete üle",
 "Log out" => "Logi välja",
 "Settings" => "Seaded",
 "Lost your password?" => "Kaotasid oma parooli?",
 "remember" => "pea meeles",
 "You are logged out." => "Sa oled välja loginud",
-"You will receive a link to reset your password via Email." => "Sulle saadetakse e-postile link, millelt sa saad oma parooli taastada.",
-"Requested" => "Kohustuslik",
-"Login failed!" => "Sisselogimine ebaõnnestus",
-"Username or Email" => "Kasutajanimi või e-post",
-"Request reset" => "Palu taastamist",
 "prev" => "eelm",
-"next" => "järgm",
-"Your password was reset" => "Sinu parool on taastatud",
-"New password" => "Uus parool",
-"Reset password" => "Nulli parool"
+"next" => "järgm"
 );
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
new file mode 100644
index 00000000000..bc1993c024c
--- /dev/null
+++ b/core/l10n/eu.php
@@ -0,0 +1,34 @@
+<?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
+"Requested" => "Eskatuta",
+"Login failed!" => "Saio hasierak huts egin du!",
+"Username" => "Erabiltzaile izena",
+"Request reset" => "Eskaera berrezarri da",
+"Your password was reset" => "Zure pasahitza berrezarri da",
+"New password" => "Pasahitz berria",
+"Reset password" => "Berrezarri pasahitza",
+"Personal" => "Pertsonala",
+"Users" => "Erabiltzaileak",
+"Apps" => "Aplikazioak",
+"Admin" => "Kudeatzailea",
+"Help" => "Laguntza",
+"Cloud not found" => "Ez da hodeia aurkitu",
+"Create an <strong>admin account</strong>" => "Sortu <strong>kudeatzaile kontu<strong> bat",
+"Password" => "Pasahitza",
+"Advanced" => "Aurreratua",
+"Data folder" => "Datuen karpeta",
+"Configure the database" => "Konfiguratu datu basea",
+"will be used" => "erabiliko da",
+"Database user" => "Datubasearen erabiltzailea",
+"Database password" => "Datubasearen pasahitza",
+"Database name" => "Datubasearen izena",
+"Database host" => "Datubasearen hostalaria",
+"Finish setup" => "Bukatu konfigurazioa",
+"Log out" => "Saioa bukatu",
+"Settings" => "Ezarpenak",
+"Lost your password?" => "Galdu duzu pasahitza?",
+"remember" => "gogoratu",
+"You are logged out." => "Zure saioa bukatu da.",
+"prev" => "aurrekoa",
+"next" => "hurrengoa"
+);
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 15e7846efbb..a736cf89745 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe",
+"Requested" => "Demande envoyée",
+"Login failed!" => "Nom d'utilisateur ou e-mail invalide",
+"Username" => "Nom d'utilisateur",
+"Request reset" => "Demander la réinitialisation",
+"Your password was reset" => "Votre mot de passe a été réinitialisé",
+"New password" => "Nouveau mot de passe",
+"Reset password" => "Réinitialiser le mot de passe",
 "Personal" => "Personnels",
 "Users" => "Utilisateurs",
 "Apps" => "Applications",
@@ -6,31 +14,21 @@
 "Help" => "Aide",
 "Cloud not found" => "Introuvable",
 "Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>",
-"Username" => "Nom d'utilisateur",
 "Password" => "Mot de passe",
+"Advanced" => "Avancé",
+"Data folder" => "Répertoire des données",
 "Configure the database" => "Configurer la base de données",
 "will be used" => "sera utilisé",
 "Database user" => "Utilisateur de la base de données",
 "Database password" => "Mot de passe de la base de données",
 "Database name" => "Nom de la base de données",
-"Advanced" => "Avancé",
 "Database host" => "Serveur de la base de données",
-"Data folder" => "Répertoire des données",
 "Finish setup" => "Terminer l'installation",
-"gives you freedom and control over your own data" => "vous donne la liberté et le contrôle de vos propres données",
 "Log out" => "Se déconnecter",
 "Settings" => "Paramètres",
 "Lost your password?" => "Mot de passe perdu ?",
 "remember" => "se souvenir de moi",
 "You are logged out." => "Vous êtes désormais déconnecté.",
-"You will receive a link to reset your password via Email." => "Vous allez recevoir un lien par email qui vous permettra de réinitialiser votre mot de passe.",
-"Requested" => "Nécessaire",
-"Login failed!" => "Échec de la connexion !",
-"Username or Email" => "Nom d'utilisateur ou Email",
-"Request reset" => "Demande de réinitialisation",
 "prev" => "précédent",
-"next" => "suivant",
-"Your password was reset" => "Votre mot de passe a été réinitialisé",
-"New password" => "Nouveau mot de passe",
-"Reset password" => "Réinitialisation du mot de passe"
+"next" => "suivant"
 );
diff --git a/core/l10n/he.php b/core/l10n/he.php
new file mode 100644
index 00000000000..f91d283118e
--- /dev/null
+++ b/core/l10n/he.php
@@ -0,0 +1,34 @@
+<?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "יישלח לתיבת הדו�״ל שלך קישור ל�יפוס הססמה.",
+"Requested" => "נדרש",
+"Login failed!" => "הכניסה נכשלה!",
+"Username" => "ש� משתמש",
+"Request reset" => "בקשת �יפוס",
+"Your password was reset" => "הססמה שלך �ופסה",
+"New password" => "ססמה חדשה",
+"Reset password" => "�יפוס ססמה",
+"Personal" => "�ישי",
+"Users" => "משתמשי�",
+"Apps" => "יישומי�",
+"Admin" => "מנהל",
+"Help" => "עזרה",
+"Cloud not found" => "ענן ל� נמצ�",
+"Create an <strong>admin account</strong>" => "יצירת <strong>חשבון מנהל</strong>",
+"Password" => "ססמה",
+"Advanced" => "מתקד�",
+"Data folder" => "תיקיית נתוני�",
+"Configure the database" => "הגדרת מסד הנתוני�",
+"will be used" => "ינוצלו",
+"Database user" => "ש� משתמש במסד הנתוני�",
+"Database password" => "ססמת מסד הנתוני�",
+"Database name" => "ש� מסד הנתוני�",
+"Database host" => "שרת בסיס נתוני�",
+"Finish setup" => "סיו� התקנה",
+"Log out" => "התנתקות",
+"Settings" => "הגדרות",
+"Lost your password?" => "שכחת �ת ססמתך?",
+"remember" => "שמירת הססמה",
+"You are logged out." => "�ינך מחובר.",
+"prev" => "קוד�",
+"next" => "הב�"
+);
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
new file mode 100644
index 00000000000..f129ca70608
--- /dev/null
+++ b/core/l10n/hr.php
@@ -0,0 +1,34 @@
+<?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Primit ćete link kako biste poništili zaporku putem e-maila.",
+"Requested" => "Zahtijevano",
+"Login failed!" => "Prijava nije uspjela!",
+"Username" => "Korisni�ko ime",
+"Request reset" => "Zahtjev za resetiranjem",
+"Your password was reset" => "Vaša lozinka je resetirana",
+"New password" => "nova lozinka",
+"Reset password" => "poništavanje lozinke",
+"Personal" => "Osobno",
+"Users" => "korisnici",
+"Apps" => "aplikacije",
+"Admin" => "administrator",
+"Help" => "pomoć",
+"Cloud not found" => "Cloud nije pronađen",
+"Create an <strong>admin account</strong>" => "stvoriti <strong>Administratorski ra�un</strong>",
+"Password" => "Lozinka",
+"Advanced" => "Dodatno",
+"Data folder" => "Mapa baze podataka",
+"Configure the database" => "konfigurirati baze podataka",
+"will be used" => "će se koristiti",
+"Database user" => "korisnik baze podataka",
+"Database password" => "lozinka baze podataka",
+"Database name" => "ime baze podataka",
+"Database host" => "Poslužitelj baze podataka",
+"Finish setup" => "završiti postavljanje",
+"Log out" => "odjaviti",
+"Settings" => "postavke",
+"Lost your password?" => "Izgubili ste lozinku?",
+"remember" => "zapamtiti",
+"You are logged out." => "Vi ste odjavljeni.",
+"prev" => "prethodan",
+"next" => "sljedeći"
+);
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
new file mode 100644
index 00000000000..9a7d2bc5395
--- /dev/null
+++ b/core/l10n/hu_HU.php
@@ -0,0 +1,33 @@
+<?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Egy e-mailben kap értesítést a jelszóváltoztatás módjáról.",
+"Requested" => "Kért",
+"Login failed!" => "Belépés sikertelen!",
+"Username" => "Felhasználói név",
+"Your password was reset" => "Jelszó megváltoztatásra került",
+"New password" => "Új jelszó",
+"Reset password" => "Jelszó beállítás",
+"Personal" => "Személyes",
+"Users" => "Felhasználók",
+"Apps" => "Alkalmazások",
+"Admin" => "Adminisztráció",
+"Help" => "Súgó",
+"Cloud not found" => "Nem talált felhő",
+"Create an <strong>admin account</strong>" => "<strong>Adminisztrációs fiók</strong> létrehozása",
+"Password" => "Jelszó",
+"Advanced" => "Fejlett",
+"Data folder" => "Adat könyvtár",
+"Configure the database" => "Adatbázis konfigurálása",
+"will be used" => "használva lesz",
+"Database user" => "Adatbázis felhasználó",
+"Database password" => "Adatbázis jelszó",
+"Database name" => "Adatbázis név",
+"Database host" => "Adatbázis szerver",
+"Finish setup" => "Beállítások befejezése",
+"Log out" => "Kilépés",
+"Settings" => "Beállítások",
+"Lost your password?" => "Elfelejtett jelszó?",
+"remember" => "emlékezni",
+"You are logged out." => "Kilépés sikerült.",
+"prev" => "Előző",
+"next" => "Következő"
+);
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
new file mode 100644
index 00000000000..2d41601d69a
--- /dev/null
+++ b/core/l10n/ia.php
@@ -0,0 +1,27 @@
+<?php $TRANSLATIONS = array(
+"Requested" => "Requestate",
+"Login failed!" => "Initio de session fallate!",
+"Username" => "Nomine de usator",
+"Request reset" => "Requestar reinitialisation",
+"Your password was reset" => "Tu contrasigno esseva reinitialisate",
+"New password" => "Nove contrasigno",
+"Reset password" => "Reinitialisar contrasigno",
+"Users" => "Usatores",
+"Apps" => "Applicationes",
+"Help" => "Adjuta",
+"Cloud not found" => "Nube non trovate",
+"Create an <strong>admin account</strong>" => "Crear un <strong>conto de administration</strong>",
+"Password" => "Contrasigno",
+"Advanced" => "Avantiate",
+"Data folder" => "Dossier de datos",
+"Configure the database" => "Configurar le base de datos",
+"will be used" => "essera usate",
+"Database user" => "Usator de base de datos",
+"Database password" => "Contrasigno de base de datos",
+"Database name" => "Nomine de base de datos",
+"Log out" => "Clauder le session",
+"Settings" => "Configurationes",
+"remember" => "memora",
+"prev" => "prev",
+"next" => "prox"
+);
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 56221fafb96..eb20a4209c5 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Username" => "Username",
 "Personal" => "Pribadi",
 "Users" => "Pengguna",
 "Apps" => "Aplikasi",
@@ -6,31 +7,21 @@
 "Help" => "Bantuan",
 "Cloud not found" => "Cloud tidak ditemukan",
 "Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
-"Username" => "Username",
 "Password" => "Password",
+"Advanced" => "Tingkat Lanjut",
+"Data folder" => "Folder data",
 "Configure the database" => "Konfigurasi database",
 "will be used" => "akan digunakan",
 "Database user" => "Pengguna database",
 "Database password" => "Password database",
 "Database name" => "Nama database",
-"Advanced" => "Tingkat Lanjut",
 "Database host" => "Host database",
-"Data folder" => "Folder data",
 "Finish setup" => "Selesaikan instalasi",
-"gives you freedom and control over your own data" => "memberikan anda kebebasan dan kendali atas data anda sendiri",
 "Log out" => "Keluar",
 "Settings" => "Setelan",
 "Lost your password?" => "Lupa password anda?",
 "remember" => "selalu login",
 "You are logged out." => "Anda telah keluar.",
-"You will receive a link to reset your password via Email." => "Anda akan menerima tautan untuk menset ulang password anda via Email.",
-"Requested" => "Telah diminta",
-"Login failed!" => "Gagal masuk!",
-"Username or Email" => "Nama Pengguna atau Email",
-"Request reset" => "Meminta set ulang",
 "prev" => "sebelum",
-"next" => "selanjutnya",
-"Your password was reset" => "Password anda telah diset ulang",
-"New password" => "Password Baru",
-"Reset password" => "Set Ulang Password"
+"next" => "selanjutnya"
 );
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 1d743fa87ed..893e41e407e 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -1,36 +1,34 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Riceverai un link per resettare la tua password via Email",
+"Requested" => "Richiesto",
+"Login failed!" => "Login fallito!",
+"Username" => "Nome utente",
+"Request reset" => "Richiesta di ripristino",
+"Your password was reset" => "La password è stata reimpostata",
+"New password" => "Nuova password",
+"Reset password" => "Reimposta password",
 "Personal" => "Personale",
 "Users" => "Utenti",
 "Apps" => "Applicazioni",
 "Admin" => "Admin",
 "Help" => "Aiuto",
 "Cloud not found" => "Cloud non trovata",
-"Create an <strong>admin account</strong>" => "Crea un &lt;strong&gt;account amministratore&lt;/strong&gt;",
-"Username" => "Nome utente",
+"Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
 "Password" => "Password",
+"Advanced" => "Opzioni avanzate",
+"Data folder" => "Cartella dati",
 "Configure the database" => "Configura il database",
 "will be used" => "sarà usato",
 "Database user" => "Utente database",
 "Database password" => "Password database",
 "Database name" => "Nome database",
-"Advanced" => "Opzioni avanzate",
 "Database host" => "Host del database",
-"Data folder" => "Cartella dati",
 "Finish setup" => "Termina",
-"gives you freedom and control over your own data" => "Libertà e controllo dei propri dati",
 "Log out" => "Log out",
 "Settings" => "Impostazioni",
 "Lost your password?" => "Password persa?",
 "remember" => "ricorda",
 "You are logged out." => "Sei uscito.",
-"You will receive a link to reset your password via Email." => "Riceverai via email un link per il reset della tua password",
-"Requested" => "Richiesto",
-"Login failed!" => "Login fallito!",
-"Username or Email" => "Username o email",
-"Request reset" => "Reset richiesta",
 "prev" => "precedente",
-"next" => "successivo",
-"Your password was reset" => "tua password è stata resettata",
-"New password" => "Nuova password",
-"Reset password" => "Reset password"
+"next" => "successivo"
 );
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
new file mode 100644
index 00000000000..ae2b47253cc
--- /dev/null
+++ b/core/l10n/ja_JP.php
@@ -0,0 +1,34 @@
+<?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "パスワードをリセット�るリンク�メール�届���。",
+"Requested" => "�信�れ���",
+"Login failed!" => "ログイン�失敗����。",
+"Username" => "ユーザ�",
+"Request reset" => "リセットを�求�る。",
+"Your password was reset" => "����パスワード�リセット�れ���。",
+"New password" => "新��パスワードを入力",
+"Reset password" => "パスワードをリセット",
+"Personal" => "個人設定",
+"Users" => "ユーザ",
+"Apps" => "アプリ",
+"Admin" => "管�者",
+"Help" => "ヘルプ",
+"Cloud not found" => "見��られ��ん",
+"Create an <strong>admin account</strong>" => "<strong>管�者アカウント</strong>を作�������",
+"Password" => "パスワード",
+"Advanced" => "詳細設定",
+"Data folder" => "データフォルダ",
+"Configure the database" => "データベースを設定������",
+"will be used" => "�使用�れ��",
+"Database user" => "データベース�ユーザ�",
+"Database password" => "データベース�パスワード",
+"Database name" => "データベース�",
+"Database host" => "データベース�ホスト�",
+"Finish setup" => "セットアップを完了���",
+"Log out" => "ログアウト",
+"Settings" => "設定",
+"Lost your password?" => "パスワード���ら���り����？",
+"remember" => "パスワードを記憶�る",
+"You are logged out." => "ログアウト����。",
+"prev" => "�",
+"next" => "次"
+);
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 40bd86d6a3a..d663b6dc424 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Du kriss en Link fir däin Passwuert nei ze setzen via Email geschéckt.",
+"Requested" => "Gefrot",
+"Login failed!" => "Falschen Login!",
+"Username" => "Benotzernumm",
+"Request reset" => "Reset ufroen",
+"Your password was reset" => "Dän Passwuert ass zeréck gesat gin",
+"New password" => "Neit Passwuert",
+"Reset password" => "Passwuert zeréck setzen",
 "Personal" => "Perséinlech",
 "Users" => "Benotzer",
 "Apps" => "Applicatiounen",
@@ -6,31 +14,21 @@
 "Help" => "Hëllef",
 "Cloud not found" => "Cloud net fonnt",
 "Create an <strong>admin account</strong>" => "En <strong>Admin Account</strong> uleeën",
-"Username" => "Benotzernumm",
 "Password" => "Passwuert",
+"Advanced" => "Erweidert",
+"Data folder" => "Daten Dossier",
 "Configure the database" => "Datebank konfiguréieren",
 "will be used" => "wärt benotzt ginn",
 "Database user" => "Datebank Benotzer",
 "Database password" => "Datebank Passwuert",
 "Database name" => "Datebank Numm",
-"Advanced" => "Erweidert",
 "Database host" => "Datebank Server",
-"Data folder" => "Daten Dossier",
 "Finish setup" => "Installatioun ofschléissen",
-"gives you freedom and control over your own data" => "gëtt dir Fräiheet an Kontroll iwwert deng eegen Daten",
 "Log out" => "Ausloggen",
 "Settings" => "Astellungen",
 "Lost your password?" => "Passwuert vergiess?",
 "remember" => "verhalen",
 "You are logged out." => "Du bass ausgeloggt.",
-"You will receive a link to reset your password via Email." => "Du kriss per E-mail en Link geschéckt fir däin Passwuert nei ze setzen.",
-"Requested" => "Verlaangt",
-"Login failed!" => "Aloggen feelgeschloen!",
-"Username or Email" => "Benotzernumm oder E-Mail",
-"Request reset" => "Reset ufroen",
 "prev" => "zeréck",
-"next" => "weider",
-"Your password was reset" => "Dän Passwuert ass nei gesat ginn",
-"New password" => "Neit Passwuert",
-"Reset password" => "Passwuert nei setzen"
+"next" => "weider"
 );
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
new file mode 100644
index 00000000000..0d5306321c2
--- /dev/null
+++ b/core/l10n/lt_LT.php
@@ -0,0 +1,33 @@
+<?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
+"Requested" => "Užklausta",
+"Login failed!" => "Prisijungti nepavyko!",
+"Username" => "Prisijungimo vardas",
+"Request reset" => "Prašyti nustatymo iš najo",
+"Your password was reset" => "Jūsų slaptažodis buvo nustatytas iš naujo",
+"New password" => "Naujas slaptažodis",
+"Reset password" => "Atkurti slaptažodį",
+"Personal" => "Asmeniniai",
+"Users" => "Vartotojai",
+"Apps" => "Programos",
+"Admin" => "Administravimas",
+"Help" => "Pagalba",
+"Cloud not found" => "Negalima rasti",
+"Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrÄ…</strong>",
+"Password" => "Slaptažodis",
+"Data folder" => "Duomenų katalogas",
+"Configure the database" => "Nustatyti duomenų bazę",
+"will be used" => "bus naudojama",
+"Database user" => "Duomenų bazės vartotojas",
+"Database password" => "Duomenų bazės slaptažodis",
+"Database name" => "Duomenų bazės pavadinimas",
+"Database host" => "Duomenų bazės serveris",
+"Finish setup" => "Baigti diegimÄ…",
+"Log out" => "Atsijungti",
+"Settings" => "Nustatymai",
+"Lost your password?" => "Pamiršote slaptažodį?",
+"remember" => "prisiminti",
+"You are logged out." => "JÅ«s atsijungÄ—te.",
+"prev" => "atgal",
+"next" => "kitas"
+);
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index e7551a30bb8..b2e68c53658 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Username" => "Nama pengguna",
 "Personal" => "Peribadi",
 "Users" => "Pengguna",
 "Apps" => "Aplikasi",
@@ -6,31 +7,21 @@
 "Help" => "Bantuan",
 "Cloud not found" => "Awan tidak dijumpai",
 "Create an <strong>admin account</strong>" => "buat <strong>akaun admin</strong>",
-"Username" => "Nama pengguna",
 "Password" => "Kata laluan",
+"Advanced" => "Maju",
+"Data folder" => "Fail data",
 "Configure the database" => "Konfigurasi pangkalan data",
 "will be used" => "akan digunakan",
 "Database user" => "Nama pengguna pangkalan data",
 "Database password" => "Kata laluan pangkalan data",
 "Database name" => "Nama pangkalan data",
-"Advanced" => "Maju",
 "Database host" => "Hos pangkalan data",
-"Data folder" => "Fail data",
 "Finish setup" => "Setup selesai",
-"gives you freedom and control over your own data" => "memberikan anda kebebasan dan kendalian keatas data anda",
 "Log out" => "Log keluar",
 "Settings" => "Tetapan",
 "Lost your password?" => "Hilang kata laluan?",
 "remember" => "ingat",
 "You are logged out." => "Anda telah log keluar.",
-"You will receive a link to reset your password via Email." => "Anda akan menerima link untuk menetapkan semula kata laluan anda melalui emel",
-"Requested" => "diminta",
-"Login failed!" => "Log in gagal!",
-"Username or Email" => "Nama pengguna atau Emel",
-"Request reset" => "Minta set semula",
 "prev" => "sebelum",
-"next" => "seterus",
-"Your password was reset" => "Kata laluan anda diset semula",
-"New password" => "Kata laluan baru",
-"Reset password" => "Set semula kata laluan"
+"next" => "seterus"
 );
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 07b176e4985..e276d570f69 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Username" => "Brukernavn",
 "Personal" => "Personlig",
 "Users" => "Brukere",
 "Apps" => "Apper",
@@ -6,21 +7,19 @@
 "Help" => "Hjelp",
 "Cloud not found" => "Sky ikke funnet",
 "Create an <strong>admin account</strong>" => "opprett en <strong>administrator-konto</strong>",
-"Username" => "Brukernavn",
 "Password" => "Passord",
+"Advanced" => "Avansert",
+"Data folder" => "Datamappe",
 "Configure the database" => "Konfigurer databasen",
 "will be used" => "vil bli brukt",
 "Database user" => "Databasebruker",
 "Database password" => "Databasepassord",
 "Database name" => "Databasenavn",
-"Advanced" => "Avansert",
-"Data folder" => "Datamappe",
 "Finish setup" => "Fullfør oppsetting",
 "Log out" => "Logg ut",
 "Settings" => "Innstillinger",
 "remember" => "husk",
 "You are logged out." => "Du er logget ut",
-"Login failed!" => "Klarte ikke å logge inn!",
 "prev" => "forrige",
 "next" => "neste"
 );
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 98ad267ff51..22b751aaa15 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "U ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail.",
+"Requested" => "Gevraagd",
+"Login failed!" => "Login mislukt!",
+"Username" => "Gebruikersnaam",
+"Request reset" => "Resetaanvraag",
+"Your password was reset" => "Je wachtwoord is geweizigd",
+"New password" => "Nieuw wachtwoord",
+"Reset password" => "Reset wachtwoord",
 "Personal" => "Persoonlijk",
 "Users" => "Gebruikers",
 "Apps" => "Apps",
@@ -6,31 +14,21 @@
 "Help" => "Help",
 "Cloud not found" => "Cloud niet gevonden",
 "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
-"Username" => "Gebruikersnaam",
 "Password" => "Wachtwoord",
+"Advanced" => "Geavanceerd",
+"Data folder" => "Gegevensmap",
 "Configure the database" => "Configureer de databank",
 "will be used" => "zal gebruikt worden",
 "Database user" => "Gebruiker databank",
 "Database password" => "Wachtwoord databank",
 "Database name" => "Naam databank",
-"Advanced" => "Geavanceerd",
 "Database host" => "Database server",
-"Data folder" => "Gegevensmap",
 "Finish setup" => "Installatie afronden",
-"gives you freedom and control over your own data" => "geeft u vrijheid en controle over uw eigen data",
 "Log out" => "Afmelden",
 "Settings" => "Instellingen",
 "Lost your password?" => "Uw wachtwoord vergeten?",
 "remember" => "onthoud gegevens",
 "You are logged out." => "U bent afgemeld.",
-"You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord te wijzigen via Email",
-"Requested" => "Aangevraagd",
-"Login failed!" => "Aanmelden mislukt!",
-"Username or Email" => "Gebruikersnaam of Email",
-"Request reset" => "Wachtwoordreset aanvragen",
 "prev" => "vorige",
-"next" => "volgende",
-"Your password was reset" => "Uw wachtwoord is opnieuw ingesteld",
-"New password" => "Nieuw wachtwoord",
-"Reset password" => "Reset wachtwoord"
+"next" => "volgende"
 );
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
new file mode 100644
index 00000000000..c62302b3bc4
--- /dev/null
+++ b/core/l10n/nn_NO.php
@@ -0,0 +1,34 @@
+<?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Du vil få ei lenkje for å nullstilla passordet via epost.",
+"Requested" => "Førespurt",
+"Login failed!" => "Feil ved innlogging!",
+"Username" => "Brukarnamn",
+"Request reset" => "Be om nullstilling",
+"Your password was reset" => "Passordet ditt er nullstilt",
+"New password" => "Nytt passord",
+"Reset password" => "Nullstill passord",
+"Personal" => "Personleg",
+"Users" => "Brukarar",
+"Apps" => "Applikasjonar",
+"Admin" => "Administrer",
+"Help" => "Hjelp",
+"Cloud not found" => "Fann ikkje skyen",
+"Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
+"Password" => "Passord",
+"Advanced" => "Avansert",
+"Data folder" => "Datamappe",
+"Configure the database" => "Konfigurer databasen",
+"will be used" => "vil bli nytta",
+"Database user" => "Databasebrukar",
+"Database password" => "Databasepassord",
+"Database name" => "Databasenamn",
+"Database host" => "Databasetenar",
+"Finish setup" => "Fullfør oppsettet",
+"Log out" => "Logg ut",
+"Settings" => "Innstillingar",
+"Lost your password?" => "Gløymt passordet?",
+"remember" => "hugs",
+"You are logged out." => "Du er logga ut.",
+"prev" => "førre",
+"next" => "neste"
+);
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index b4d9fbe9248..d972bed54e1 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Otrzymasz link do resetowania hasła poprzez e-mail.",
+"Requested" => "Żądane",
+"Login failed!" => "Logowanie nie powiodło się!",
+"Username" => "Użytkownik",
+"Request reset" => "Żądanie resetowania",
+"Your password was reset" => "Twoje hasło zostało zresetowane",
+"New password" => "Nowe hasło",
+"Reset password" => "Zresetuj hasło",
 "Personal" => "Ustawienia osobiste",
 "Users" => "Użytkownicy",
 "Apps" => "Aplikacje",
@@ -6,31 +14,21 @@
 "Help" => "Pomoc",
 "Cloud not found" => "Konta nie znaleziono ",
 "Create an <strong>admin account</strong>" => "Stwórz jako <strong>konto administratora</strong>",
-"Username" => "Użytkownik",
 "Password" => "Hasło",
+"Advanced" => "Zaawansowane",
+"Data folder" => "Katalog danych",
 "Configure the database" => "Konfiguracja bazy danych",
 "will be used" => "zostanie użyte",
 "Database user" => "Użytkownik bazy danych",
 "Database password" => "Hasło do bazy danych",
 "Database name" => "Nazwa bazy danych",
-"Advanced" => "Zaawansowane",
 "Database host" => "Host bazy danych",
-"Data folder" => "Katalog danych",
 "Finish setup" => "Zakończ instalację",
-"gives you freedom and control over your own data" => "zapewnia Ci wolność i kontrolę nad własnymi danymi",
 "Log out" => "Wyloguj siÄ™",
 "Settings" => "Ustawienia",
 "Lost your password?" => "Nie pamiętasz hasła?",
 "remember" => "zapamiętaj",
 "You are logged out." => "Zostałeś wylogowany.",
-"You will receive a link to reset your password via Email." => "Otrzymasz link do resetowania hasła poprzez e-mail.",
-"Requested" => "Żądane",
-"Login failed!" => "Nie udało się zalogować!",
-"Username or Email" => "Użytkownik lub email",
-"Request reset" => "Zresetuj hasło",
 "prev" => "wstecz",
-"next" => "dalej",
-"Your password was reset" => "Twoje hasło zostało zresetowane",
-"New password" => "Nowe hasło",
-"Reset password" => "Zresetuj hasło"
+"next" => "dalej"
 );
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 229d60f65c4..4f1a31ae3e7 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha via e-mail.",
+"Requested" => "Solicitado",
+"Login failed!" => "Falha ao fazer o login!",
+"Username" => "Nome de Usuário",
+"Request reset" => "Pedido de reposição",
+"Your password was reset" => "Sua senha foi mudada",
+"New password" => "Nova senha",
+"Reset password" => "Mudar senha",
 "Personal" => "Pessoal",
 "Users" => "Usuários",
 "Apps" => "Apps",
@@ -6,31 +14,21 @@
 "Help" => "Ajuda",
 "Cloud not found" => "Cloud não encontrado",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta</strong> de <strong>administrador</strong>",
-"Username" => "Nome de Usuário",
 "Password" => "Senha",
+"Advanced" => "Avançado",
+"Data folder" => "Pasta de dados",
 "Configure the database" => "Configurar o banco de dados",
 "will be used" => "será usado",
 "Database user" => "Usuário de banco de dados",
 "Database password" => "Senha do banco de dados",
 "Database name" => "Nome do banco de dados",
-"Advanced" => "Avançado",
 "Database host" => "Banco de dados do host",
-"Data folder" => "Pasta de dados",
 "Finish setup" => "Concluir configuração",
-"gives you freedom and control over your own data" => "proporciona  liberdade e controle sobre seus próprios dados",
 "Log out" => "Sair",
 "Settings" => "Configurações",
 "Lost your password?" => "Esqueçeu sua senha?",
 "remember" => "lembrete",
 "You are logged out." => "Você está desconectado.",
-"You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha via e-mail.",
-"Requested" => "Solicitado",
-"Login failed!" => "Login sem sucesso",
-"Username or Email" => "Nome de usuário ou e-mail",
-"Request reset" => "Pedido de troca",
 "prev" => "anterior",
-"next" => "próximo",
-"Your password was reset" => "Sua senha foi trocada",
-"New password" => "Nova senha",
-"Reset password" => "Toca de senha"
+"next" => "próximo"
 );
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
new file mode 100644
index 00000000000..e41152bcbbc
--- /dev/null
+++ b/core/l10n/pt_PT.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Advanced" => "Avançado"
+);
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 8440c44d1d8..86c03478096 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Veți primi la adresa de email un link prin care veți putea reseta parola",
+"Requested" => "Cerută",
+"Login failed!" => "Autentificare eșuată",
+"Username" => "Utilizator",
+"Request reset" => "Cerere trimisă",
+"Your password was reset" => "Parola a fost resetată",
+"New password" => "Noua parolă",
+"Reset password" => "Resetează parola",
 "Personal" => "Personal",
 "Users" => "Utilizatori",
 "Apps" => "Aplicații",
@@ -6,31 +14,21 @@
 "Help" => "Ajutor",
 "Cloud not found" => "Nu s-a găsit",
 "Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
-"Username" => "Utilizator",
 "Password" => "Parola",
+"Advanced" => "Avansat",
+"Data folder" => "Directorul cu date",
 "Configure the database" => "Configurează baza de date",
 "will be used" => "vor fi folosite",
 "Database user" => "Utilizatorul bazei de date",
 "Database password" => "Parola bazei de date",
 "Database name" => "Numele bazei de date",
-"Advanced" => "Avansat",
 "Database host" => "Baza de date",
-"Data folder" => "Directorul cu date",
 "Finish setup" => "Finalizează instalarea",
-"gives you freedom and control over your own data" => "îți oferă libertatea de a-ți controla datele",
 "Log out" => "Ieșire",
 "Settings" => "Setări",
 "Lost your password?" => "Ai uitat parola?",
 "remember" => "ține minte",
 "You are logged out." => "Ai ieșit",
-"You will receive a link to reset your password via Email." => "Vei primi prin email un link pentru resetarea parolei",
-"Requested" => "Cerută",
-"Login failed!" => "Autentificare eșuată!",
-"Username or Email" => "Utilizator sau email",
-"Request reset" => "Cere schimbarea parolei",
 "prev" => "precedentul",
-"next" => "următorul",
-"Your password was reset" => "Parola a fost schimbată",
-"New password" => "Parola nouă",
-"Reset password" => "Schimbă parola"
+"next" => "următorul"
 );
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 45f0f4aef9d..12dd26a3507 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "�а ваш адре� Email вы�лана ��ылка дл� �бро�а парол�.",
+"Requested" => "Запрошено",
+"Login failed!" => "�е удало�ь войти!",
+"Username" => "Им� пользовател�",
+"Request reset" => "Запро�ить �бро�",
+"Your password was reset" => "Ваш пароль был �брошен",
+"New password" => "�овый пароль",
+"Reset password" => "Сбро�ить пароль",
 "Personal" => "Личное",
 "Users" => "Пользователи",
 "Apps" => "Приложени�",
@@ -6,31 +14,21 @@
 "Help" => "Помощь",
 "Cloud not found" => "Облако не найдено",
 "Create an <strong>admin account</strong>" => "Создать <strong>учётную запи�ь админи�тратора</strong>",
-"Username" => "Им� пользовател�",
 "Password" => "Пароль",
+"Advanced" => "Дополнительно",
+"Data folder" => "Директори� � данными",
 "Configure the database" => "�а�тройка базы данных",
 "will be used" => "будет и�пользовано",
 "Database user" => "Им� пользовател� дл� базы данных",
 "Database password" => "Пароль дл� базы данных",
 "Database name" => "�азвание базы данных",
-"Advanced" => "Дополнительно",
 "Database host" => "Хо�т базы данных",
-"Data folder" => "Директори� � данными",
 "Finish setup" => "Завершить у�тановку",
-"gives you freedom and control over your own data" => "даёт Вам �вободу и контроль над Вашими данными",
 "Log out" => "Выйти",
 "Settings" => "�а�тройки",
 "Lost your password?" => "Забыли пароль?",
 "remember" => "запомнить",
 "You are logged out." => "Вы вышли.",
-"You will receive a link to reset your password via Email." => "Вы получите ��ылку дл� �бро�а парол� на Ваш e-mail.",
-"Requested" => "Запрошено",
-"Login failed!" => "Войти не удало�ь!",
-"Username or Email" => "Им� пользовател� или e-mail",
-"Request reset" => "Запро�ить �бро�",
 "prev" => "пред",
-"next" => "�лед",
-"Your password was reset" => "Пароль был �брошен",
-"New password" => "�овый пароль",
-"Reset password" => "Сбро�ить пароль"
+"next" => "�лед"
 );
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
new file mode 100644
index 00000000000..43d8ca7d5e0
--- /dev/null
+++ b/core/l10n/sk_SK.php
@@ -0,0 +1,34 @@
+<?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte E-mailom.",
+"Requested" => "Požiadané",
+"Login failed!" => "Prihlásenie zlyhalo!",
+"Username" => "Prihlasovacie meno",
+"Request reset" => "Požiadať o obnovenie",
+"Your password was reset" => "Vaše heslo bolo obnovené",
+"New password" => "Nové heslo",
+"Reset password" => "Obnova hesla",
+"Personal" => "Osobné",
+"Users" => "Používatelia",
+"Apps" => "Aplikácie",
+"Admin" => "Administrácia",
+"Help" => "Pomoc",
+"Cloud not found" => "Nedokážem nájsť",
+"Create an <strong>admin account</strong>" => "Vytvoriť <strong>administrátorský ú�et</strong>",
+"Password" => "Heslo",
+"Advanced" => "Pokro�ilé",
+"Data folder" => "Prie�inok dát",
+"Configure the database" => "Nastaviť databázu",
+"will be used" => "bude použité",
+"Database user" => "Hostiteľ databázy",
+"Database password" => "Heslo databázy",
+"Database name" => "Meno databázy",
+"Database host" => "Server databázy",
+"Finish setup" => "Dokon�iť inštaláciu",
+"Log out" => "Odhlásiť",
+"Settings" => "Nastavenia",
+"Lost your password?" => "Zabudli ste heslo?",
+"remember" => "zapamätať",
+"You are logged out." => "Ste odhlásený.",
+"prev" => "späť",
+"next" => "�alej"
+);
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
new file mode 100644
index 00000000000..62d5412a22a
--- /dev/null
+++ b/core/l10n/sl.php
@@ -0,0 +1,34 @@
+<?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Preko email sporo�ila boste prejeli povezavo s katero lahko ponovno nastavite geslo",
+"Requested" => "Zahtevano",
+"Login failed!" => "Prijava ni Uspela!",
+"Username" => "Uporabniško Ime",
+"Request reset" => "Zahtevaj ponastavitev",
+"Your password was reset" => "Vaše geslo je bilo ponastavljeno",
+"New password" => "novo geslo",
+"Reset password" => "Ponastavi Geslo",
+"Personal" => "Osebno",
+"Users" => "Uporabniki",
+"Apps" => "Apps",
+"Admin" => "Admin",
+"Help" => "Pomo�",
+"Cloud not found" => "Ni najdeno",
+"Create an <strong>admin account</strong>" => "Ustvari <strong>admin ra�un</strong>",
+"Password" => "Geslo",
+"Advanced" => "Napredno",
+"Data folder" => "Data Mapa",
+"Configure the database" => "Nastavi Podatkovno Bazo",
+"will be used" => "Bo uporabljeno",
+"Database user" => "Podatkovna Baza Uporabnik",
+"Database password" => "Podatkovna Baza Geslo",
+"Database name" => "Ime Podatkovne Baze",
+"Database host" => "Database host",
+"Finish setup" => "Kon�aj instalacijo",
+"Log out" => "Odjava",
+"Settings" => "Nastavitve",
+"Lost your password?" => "Ste pozabili vaše geslo?",
+"remember" => "zapomni",
+"You are logged out." => "Odjavljeni ste",
+"prev" => "nazaj",
+"next" => "naprej"
+);
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 0fd43c7b0a4..667a7b054c3 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Добићете везу за ре�етовање лозинке путем е-поште.",
+"Requested" => "Захтевано",
+"Login failed!" => "�е�упела пријава!",
+"Username" => "Кори�ничко име",
+"Request reset" => "Захтевај ре�етовање",
+"Your password was reset" => "Ваша лозинка је ре�етована",
+"New password" => "�ова лозинка",
+"Reset password" => "Ре�етуј лозинку",
 "Personal" => "Лична",
 "Users" => "Кори�ници",
 "Apps" => "Програми",
@@ -6,31 +14,21 @@
 "Help" => "Помоћ",
 "Cloud not found" => "Облак није нађен",
 "Create an <strong>admin account</strong>" => "�аправи <strong>админи�тративни налог</strong>",
-"Username" => "Кори�ничко име",
 "Password" => "Лозинка",
+"Advanced" => "�апредно",
+"Data folder" => "Фацикла података",
 "Configure the database" => "Подешавање базе",
 "will be used" => "ће бити коришћен",
 "Database user" => "Кори�ник базе",
 "Database password" => "Лозинка базе",
 "Database name" => "Име базе",
-"Advanced" => "�апредно",
 "Database host" => "Домаћин базе",
-"Data folder" => "Фацикла података",
 "Finish setup" => "Заврши подешавање",
-"gives you freedom and control over your own data" => "вам даје �лободу и контролу над вашим подацима",
 "Log out" => "Одјава",
 "Settings" => "Подешавања",
 "Lost your password?" => "Изгубили �те лозинку?",
 "remember" => "упамти",
 "You are logged out." => "Одјављени �те.",
-"You will receive a link to reset your password via Email." => "Добићете везу за ре�етовање лозинке путем е-поште.",
-"Requested" => "Захтев по�лат",
-"Login failed!" => "�еу�пешно пријављивање!",
-"Username or Email" => "Кори�ничко име или адре�а е-поште",
-"Request reset" => "Захтев за ре�етовање",
 "prev" => "претходно",
-"next" => "�ледеће",
-"Your password was reset" => "Ваша лозинка је ре�етована",
-"New password" => "�ова лозинка",
-"Reset password" => "Ре�етуј лозинку"
+"next" => "�ледеће"
 );
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index f8565f6ee4e..e240de011ee 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.",
+"Requested" => "Zahtevano",
+"Login failed!" => "Nesupela prijava!",
+"Username" => "Korisni�ko ime",
+"Request reset" => "Zahtevaj resetovanje",
+"Your password was reset" => "Vaša lozinka je resetovana",
+"New password" => "Nova lozinka",
+"Reset password" => "Resetuj lozinku",
 "Personal" => "Li�na",
 "Users" => "Korisnici",
 "Apps" => "Programi",
@@ -6,31 +14,21 @@
 "Help" => "Pomoć",
 "Cloud not found" => "Oblak nije nađen",
 "Create an <strong>admin account</strong>" => "Napravi <strong>administrativni nalog</strong>",
-"Username" => "Korisni�ko ime",
 "Password" => "Lozinka",
+"Advanced" => "Napredno",
+"Data folder" => "Facikla podataka",
 "Configure the database" => "Podešavanje baze",
 "will be used" => "će biti korišćen",
 "Database user" => "Korisnik baze",
 "Database password" => "Lozinka baze",
 "Database name" => "Ime baze",
-"Advanced" => "Napredno",
 "Database host" => "Domaćin baze",
-"Data folder" => "Facikla podataka",
 "Finish setup" => "Završi podešavanje",
-"gives you freedom and control over your own data" => "vam daje slobodu i kontrolu nad vašim podacima",
 "Log out" => "Odjava",
 "Settings" => "Podešavanja",
 "Lost your password?" => "Izgubili ste lozinku?",
 "remember" => "upamti",
 "You are logged out." => "Odjavljeni ste.",
-"You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.",
-"Requested" => "Zahtev poslat",
-"Login failed!" => "Neuspešno prijavljivanje!",
-"Username or Email" => "Korisni�ko ime ili adresa e-pošte",
-"Request reset" => "Zahtev za resetovanje",
 "prev" => "prethodno",
-"next" => "sledeće",
-"Your password was reset" => "Vaša lozinka je resetovana",
-"New password" => "Nova lozinka",
-"Reset password" => "Resetuj lozinku"
+"next" => "sledeće"
 );
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index d7e1c240378..2b4bb2b9511 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Du får en länk att återställa ditt lösenord via e-post.",
+"Requested" => "Begärd",
+"Login failed!" => "Inloggning misslyckades!",
+"Username" => "Användarnamn",
+"Request reset" => "Begär återställning",
+"Your password was reset" => "Ditt lösenord har återställts",
+"New password" => "Nytt lösenord",
+"Reset password" => "Återställ lösenordet",
 "Personal" => "Personlig",
 "Users" => "Användare",
 "Apps" => "Program",
@@ -6,31 +14,21 @@
 "Help" => "Hjälp",
 "Cloud not found" => "Hittade inget moln",
 "Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
-"Username" => "Användarnamn",
 "Password" => "Lösenord",
+"Advanced" => "Avancerat",
+"Data folder" => "Datamapp",
 "Configure the database" => "Konfigurera databasen",
 "will be used" => "kommer att användas",
 "Database user" => "Databas-användare",
 "Database password" => "Lösenord för databasen",
 "Database name" => "Databasens namn",
-"Advanced" => "Avancerat",
 "Database host" => "Databasserver",
-"Data folder" => "Datamapp",
 "Finish setup" => "Avsluta installation",
-"gives you freedom and control over your own data" => "ger dig frihet och kontroll över din egen data",
 "Log out" => "Logga ut",
 "Settings" => "Inställningar",
-"Lost your password?" => "Tappat bort ditt lösenord?",
+"Lost your password?" => "Glömt ditt lösenord?",
 "remember" => "kom ihåg",
 "You are logged out." => "Du är utloggad",
-"You will receive a link to reset your password via Email." => "Du kommer få en länk, via e-post, där du kan återställ ditt lösenord",
-"Requested" => "Begärd",
-"Login failed!" => "Inloggning misslyckades!",
-"Username or Email" => "Användarnamn eller e-post",
-"Request reset" => "Begär återställning",
 "prev" => "föregående",
-"next" => "nästa",
-"Your password was reset" => "Ditt lösenord har återställts",
-"New password" => "Nytt lösenord",
-"Reset password" => "Återställ lösenord"
+"next" => "nästa"
 );
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
new file mode 100644
index 00000000000..100fa9960cb
--- /dev/null
+++ b/core/l10n/tr.php
@@ -0,0 +1,34 @@
+<?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek.",
+"Requested" => "Ä°stendi",
+"Login failed!" => "Giriş başarısız!",
+"Username" => "Kullanıcı adı",
+"Request reset" => "Sıfırlama iste",
+"Your password was reset" => "Parolanız sıfırlandı",
+"New password" => "Yeni parola",
+"Reset password" => "Parolayı sıfırla",
+"Personal" => "KiÅŸisel",
+"Users" => "Kullanıcılar",
+"Apps" => "Uygulamalar",
+"Admin" => "Yönetici",
+"Help" => "Yardı",
+"Cloud not found" => "Bulut bulunamadı",
+"Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun",
+"Password" => "Parola",
+"Advanced" => "GeliÅŸmiÅŸ",
+"Data folder" => "Veri klasörü",
+"Configure the database" => "Veritabanını ayarla",
+"will be used" => "kullanılacak",
+"Database user" => "Veritabanı kullanıcı adı",
+"Database password" => "Veritabanı parolası",
+"Database name" => "Veritabanı adı",
+"Database host" => "Veritabanı sunucusu",
+"Finish setup" => "Kurulumu tamamla",
+"Log out" => "Çıkış yap",
+"Settings" => "Ayarlar",
+"Lost your password?" => "Parolanızı mı unuttunuz?",
+"remember" => "hatırla",
+"You are logged out." => "Çıkış yaptınız.",
+"prev" => "önceki",
+"next" => "sonraki"
+);
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 4c9f197346c..8ab1419fed2 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"You will receive a link to reset your password via Email." => "您将会收到包��以�置密�链接的邮件。",
+"Requested" => "已请求",
+"Login failed!" => "登录失败�",
+"Username" => "用户�",
+"Request reset" => "请求�置",
+"Your password was reset" => "您的密�已�置",
+"New password" => "新密�",
+"Reset password" => "�置密�",
 "Personal" => "个人",
 "Users" => "用户",
 "Apps" => "应用",
@@ -6,31 +14,21 @@
 "Help" => "帮助",
 "Cloud not found" => "未找到云",
 "Create an <strong>admin account</strong>" => "创建<strong>管�员账�</strong>",
-"Username" => "用户�",
 "Password" => "密�",
+"Advanced" => "高级",
+"Data folder" => "数�目录",
 "Configure the database" => "�置数�库",
 "will be used" => "将被使用",
 "Database user" => "数�库用户",
 "Database password" => "数�库密�",
 "Database name" => "数�库�",
-"Advanced" => "高级",
 "Database host" => "数�库主机",
-"Data folder" => "数�目录",
 "Finish setup" => "安装完�",
-"gives you freedom and control over your own data" => "自由掌控您的数�",
 "Log out" => "注销",
 "Settings" => "设置",
 "Lost your password?" => "忘记密�？",
 "remember" => "记�",
 "You are logged out." => "您已注销。",
-"You will receive a link to reset your password via Email." => "您将通过邮件收到一个用于�置密�的链接",
-"Requested" => "请求已��",
-"Login failed!" => "登陆失败�",
-"Username or Email" => "用户�或电�邮件",
-"Request reset" => "请求�置",
 "prev" => "上一页",
-"next" => "下一页",
-"Your password was reset" => "您的密�已�置",
-"New password" => "新密�",
-"Reset password" => "�置密�"
+"next" => "下一页"
 );
diff --git a/files/l10n/ar.php b/files/l10n/ar.php
new file mode 100644
index 00000000000..afdc0a89201
--- /dev/null
+++ b/files/l10n/ar.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "تم تر�يع المل�ات بنجاح.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "حجم المل� الذي تريد تر�يعه أعلى مما upload_max_filesize يسمح به �ي مل� php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "حجم المل� الذي تريد تر�يعه أعلى مما MAX_FILE_SIZE يسمح به �ي واجهة ال HTML.",
+"The uploaded file was only partially uploaded" => "تم تر�يع جزء من المل�ات الذي تريد تر�يعها �قط",
+"No file was uploaded" => "لم يتم تر�يع أي من المل�ات",
+"Missing a temporary folder" => "المجلد المؤقت غير موجود",
+"Files" => "المل�ات",
+"Maximum upload size" => "الحد الأقصى لحجم المل�ات التي يمكن ر�عها",
+"Upload" => "إر�ع",
+"Nothing in here. Upload something!" => "لا يوجد شيء هنا. إر�ع بعض المل�ات!",
+"Name" => "الاسم",
+"Download" => "تحميل",
+"Size" => "حجم",
+"Modified" => "معدل",
+"Delete" => "محذو�",
+"Upload too large" => "حجم التر�يع أعلى من المسموح",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "حجم المل�ات التي تريد تر�يعها أعلى من المسموح على الخادم."
+);
diff --git a/files/l10n/bg_BG.php b/files/l10n/bg_BG.php
index db5a095c2cb..027a7698203 100644
--- a/files/l10n/bg_BG.php
+++ b/files/l10n/bg_BG.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Файлът е качен у�пешно",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Файлът който �е опитвате да качите, надвишава зададените �тойно�ти в upload_max_filesize в PHP.INI",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Файлът който �е опитвате да качите надвишава �тойно�тите в MAX_FILE_SIZE в HTML формата.",
+"The uploaded file was only partially uploaded" => "Файлът е качен ча�тично",
+"No file was uploaded" => "Фахлът не бе качен",
+"Missing a temporary folder" => "Лип�ва временната папка",
 "Files" => "Файлове",
 "Maximum upload size" => "Мак�. размер за качване",
 "Upload" => "Качване",
-"New Folder" => "�ова папка",
 "Nothing in here. Upload something!" => "��ма нищо, качете нещо!",
 "Name" => "Име",
 "Download" => "Изтегл�не",
diff --git a/files/l10n/ca.php b/files/l10n/ca.php
index 8515ab35f27..cb685e543fd 100644
--- a/files/l10n/ca.php
+++ b/files/l10n/ca.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "El fitxer s'ha pujat correctament",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "El fitxer de pujada excedeix la directiva upload_max_filesize establerta a php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El fitxer de pujada excedeix la directiva MAX_FILE_SIZE especificada al formulari HTML",
+"The uploaded file was only partially uploaded" => "El fitxer només s'ha pujat parcialment",
+"No file was uploaded" => "El fitxer no s'ha pujat",
+"Missing a temporary folder" => "S'ha perdut un fitxer temporal",
 "Files" => "Fitxers",
 "Maximum upload size" => "Mida màxima de pujada",
 "Upload" => "Puja",
-"New Folder" => "Carpeta nova",
 "Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!",
 "Name" => "Nom",
 "Download" => "Descarrega",
diff --git a/files/l10n/cs_CZ.php b/files/l10n/cs_CZ.php
index c5430deaeb6..d0ebace2d89 100644
--- a/files/l10n/cs_CZ.php
+++ b/files/l10n/cs_CZ.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Soubor byl odeslán úspěšně",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Odeslaný soubor přesáhl velikostí parametr upload_max_filesize v php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Odeslaný soubor přesáhl velikostí parametr MAX_FILE_SIZE specifikovaný v HTML formuláři",
+"The uploaded file was only partially uploaded" => "Soubor byl odeslán pouze �áste�ně",
+"No file was uploaded" => "Soubor nebyl odeslán",
+"Missing a temporary folder" => "Chybí adresář pro so�asné soubory",
 "Files" => "Soubory",
 "Maximum upload size" => "Maximální velikost ukládaných souborů",
 "Upload" => "Uložit",
-"New Folder" => "Nový adresář",
 "Nothing in here. Upload something!" => "Žádný obsah. Uložte si něco!",
 "Name" => "Název",
 "Download" => "Stáhnout",
diff --git a/files/l10n/da.php b/files/l10n/da.php
index bc909a92331..0bffc6a63e1 100644
--- a/files/l10n/da.php
+++ b/files/l10n/da.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Der er ingen fejl, filen blev uploadet med success",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uploadede fil overskrider upload_max_filesize direktivet i php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen",
+"The uploaded file was only partially uploaded" => "Den uploadede file blev kun delvist uploadet",
+"No file was uploaded" => "Ingen fil blev uploadet",
+"Missing a temporary folder" => "Mangler en midlertidig mappe",
 "Files" => "Filer",
 "Maximum upload size" => "Maksimal upload-størrelse",
 "Upload" => "Upload",
-"New Folder" => "Ny Mappe",
 "Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
 "Name" => "Navn",
 "Download" => "Download",
@@ -10,5 +15,5 @@
 "Modified" => "Ændret",
 "Delete" => "Slet",
 "Upload too large" => "Upload for stor",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne du prøver at uploade er større end den maksimale størrelse for fil-upload på denne server."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server."
 );
diff --git a/files/l10n/de.php b/files/l10n/de.php
index 0259dd02e84..ea229b5dd73 100644
--- a/files/l10n/de.php
+++ b/files/l10n/de.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Datei hochgeladen.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Die hochgeladene Datei ist zu groß.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die hochgeladene Datei ist zu groß.",
+"The uploaded file was only partially uploaded" => "Die Datei wurde nur teilweise hochgeladen.",
+"No file was uploaded" => "Es wurde keine Datei hochgeladen.",
+"Missing a temporary folder" => "Temporärer Ordner fehlt.",
 "Files" => "Dateien",
 "Maximum upload size" => "Maximale Größe",
 "Upload" => "Hochladen",
-"New Folder" => "Neuer Ordner",
 "Nothing in here. Upload something!" => "Alles leer. Lad’ was hoch!",
 "Name" => "Name",
 "Download" => "Herunterladen",
diff --git a/files/l10n/el.php b/files/l10n/el.php
index 14b95e69ca6..151527c7890 100644
--- a/files/l10n/el.php
+++ b/files/l10n/el.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Δεν υπά�χει λάθος, το α�χείο που μεταφο�τώθηκε επιτυχώς",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Το α�χείο που μεταφο�τώθηκε υπε�βαίνει την οδηγία μέγιστου επιτ�επτο� μεγέθους \"upload_max_filesize\" του php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Το α�χείο υπε�βαίνει την οδηγία μέγιστου επιτ�επτο� μεγέθους \"MAX_FILE_SIZE\" που έχει ο�ιστεί στην html φό�μα",
+"The uploaded file was only partially uploaded" => "Το α�χείο μεταφο�ώθηκε μόνο εν μέ�ει",
+"No file was uploaded" => "Το α�χείο δεν μεταφο�τώθηκε",
+"Missing a temporary folder" => "Λείπει ένας π�οσω�ινός φάκελος",
 "Files" => "Α�χεία",
 "Maximum upload size" => "Μέγιστο μέγεθος μεταφό�τωσης",
 "Upload" => "Μεταφό�τωση",
-"New Folder" => "�έος φάκελος",
 "Nothing in here. Upload something!" => "Δεν υπά�χει τίποτα εδώ. Ανέβασε κάτι!",
 "Name" => "Όνομα",
 "Download" => "Λήψη",
diff --git a/files/l10n/eo.php b/files/l10n/eo.php
new file mode 100644
index 00000000000..42dc4f1280e
--- /dev/null
+++ b/files/l10n/eo.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero al�uti�is sukcese",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "La dosiero al�utita superas la regulon upload_max_filesize el php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "La dosiero al�utita superas laregulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo",
+"The uploaded file was only partially uploaded" => "La al�utita dosiero nur parte al�uti�is",
+"No file was uploaded" => "Neniu dosiero estas al�utita",
+"Missing a temporary folder" => "Mankas tempa dosierujo",
+"Files" => "Dosieroj",
+"Maximum upload size" => "Maksimuma al�utogrando",
+"Upload" => "Al�uti",
+"Nothing in here. Upload something!" => "Nenio estas ĉi tie. Al�utu ion!",
+"Name" => "Nomo",
+"Download" => "El�uti",
+"Size" => "Grando",
+"Modified" => "Modifita",
+"Delete" => "Forigi",
+"Upload too large" => "El�uto tro lar�a",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas al�uti, transpasas la maksimuman grandon por dosieral�utoj en ĉi tiu servilo."
+);
diff --git a/files/l10n/es.php b/files/l10n/es.php
index 28dc17af761..14086d3f6ce 100644
--- a/files/l10n/es.php
+++ b/files/l10n/es.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "No hubo ningún error, el archivo se subió con éxito",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "El archivo que intentas subir sobrepasa el tamaño definido por la variable upload_max_filesize en php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo que intentas subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML",
+"The uploaded file was only partially uploaded" => "El archivo que intentas subir solo se subió parcialmente",
+"No file was uploaded" => "No se subió ningún archivo",
+"Missing a temporary folder" => "Falta un directorio temporal",
 "Files" => "Archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
 "Upload" => "Subir",
-"New Folder" => "Crear Carpeta",
 "Nothing in here. Upload something!" => "Aquí no hay nada. ¡Sube algo!",
 "Name" => "Nombre",
 "Download" => "Descargar",
diff --git a/files/l10n/et_EE.php b/files/l10n/et_EE.php
index 29c44dac106..c8604b14dd0 100644
--- a/files/l10n/et_EE.php
+++ b/files/l10n/et_EE.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Ühtegi viga pole, fail on üles laetud",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Üles laetud faili suurus ületab php.ini määratud upload_max_filesize suuruse",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Üles laetud faili suurus ületab HTML vormis määratud upload_max_filesize suuruse",
+"The uploaded file was only partially uploaded" => "Fail laeti üles ainult osaliselt",
+"No file was uploaded" => "Ühtegi faili ei laetud üles",
+"Missing a temporary folder" => "Ajutiste failide kaust puudub",
 "Files" => "Failid",
 "Maximum upload size" => "Maksimaalne üleslaadimise suurus",
 "Upload" => "Lae üles",
-"New Folder" => "Uus kaust",
 "Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",
 "Name" => "Nimi",
 "Download" => "Lae alla",
diff --git a/files/l10n/eu.php b/files/l10n/eu.php
new file mode 100644
index 00000000000..b9873e6c3fa
--- /dev/null
+++ b/files/l10n/eu.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Ez da arazorik izan, fitxategia ongi igo da",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Igotako fitxategiaren tamaina php.ini-ko upload_max_filesize direktiban adierazitakoa  baino handiagoa da",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da",
+"The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat baino gehiago ez da igo",
+"No file was uploaded" => "Ez da fitxategirik igo",
+"Missing a temporary folder" => "Aldi baterako karpeta falta da",
+"Files" => "Fitxategiak",
+"Maximum upload size" => "Igo daitekeen gehienezko tamaina",
+"Upload" => "Igo",
+"Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
+"Name" => "Izena",
+"Download" => "Deskargatu",
+"Size" => "Tamaina",
+"Modified" => "Aldatuta",
+"Delete" => "Ezabatu",
+"Upload too large" => "Igotakoa handiegia da",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira."
+);
diff --git a/files/l10n/fr.php b/files/l10n/fr.php
index fa58f073d66..6cc15896e21 100644
--- a/files/l10n/fr.php
+++ b/files/l10n/fr.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Aucune erreur, le fichier a été téléversé avec succès",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Le fichier téléversé excède la valeur de upload_max_filesize spécifiée dans php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier téléversé excède la valeur de MAX_FILE_SIZE spécifiée dans le formulaire HTML",
+"The uploaded file was only partially uploaded" => "Le fichier n'a été que partiellement téléversé",
+"No file was uploaded" => "Aucun fichier n'a été téléversé",
+"Missing a temporary folder" => "Il manque un répertoire temporaire",
 "Files" => "Fichiers",
 "Maximum upload size" => "Taille max. d'envoi",
 "Upload" => "Envoyer",
-"New Folder" => "Nouveau dossier",
 "Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
 "Name" => "Nom",
 "Download" => "Téléchargement",
diff --git a/files/l10n/he.php b/files/l10n/he.php
new file mode 100644
index 00000000000..79ae1edb7a5
--- /dev/null
+++ b/files/l10n/he.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "ל� �ירעה תקלה, הקבצי� הועלו בהצלחה",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "הקובץ שהועלה חרג מההנחיה upload_max_filesize בקובץ php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "הקובץ שהועלה חרג מההנחיה MAX_FILE_SIZE שצוינה בטופס ה־HTML",
+"The uploaded file was only partially uploaded" => "הקובץ שהועלה הועלה בצורה חלקית",
+"No file was uploaded" => "ל� הועלו קבצי�",
+"Missing a temporary folder" => "תיקייה זמנית חסרה",
+"Files" => "קבצי�",
+"Maximum upload size" => "גודל העל�ה מקסימלי",
+"Upload" => "העל�ה",
+"Nothing in here. Upload something!" => "�ין כ�ן שו� דבר. �ולי ברצונך להעלות משהו?",
+"Name" => "ש�",
+"Download" => "הורדה",
+"Size" => "גודל",
+"Modified" => "זמן שינוי",
+"Delete" => "מחיקה",
+"Upload too large" => "העל�ה גדולה מידי",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצי� שניסית להעלות חרגו מהגודל המקסימלי להעל�ת קבצי� על שרת זה."
+);
diff --git a/files/l10n/hr.php b/files/l10n/hr.php
new file mode 100644
index 00000000000..670e87f6557
--- /dev/null
+++ b/files/l10n/hr.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Datoteka je poslana uspješno i bez pogrešaka",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Poslana datoteka izlazi iz okvira upload_max_size direktive postavljene u php.ini konfiguracijskoj datoteci",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka izlazi iz okvira MAX_FILE_SIZE direktive postavljene u HTML obrascu",
+"The uploaded file was only partially uploaded" => "Datoteka je poslana samo djelomi�no",
+"No file was uploaded" => "Ni jedna datoteka nije poslana",
+"Missing a temporary folder" => "Nedostaje privremena mapa",
+"Files" => "Datoteke",
+"Maximum upload size" => "Maksimalna veli�ina prijenosa",
+"Upload" => "Pošalji",
+"Nothing in here. Upload something!" => "Nema ni�ega u ovoj mapi. Pošalji nešto!",
+"Name" => "Naziv",
+"Download" => "Preuzmi",
+"Size" => "Veli�ina",
+"Modified" => "Zadnja promjena",
+"Delete" => "Briši",
+"Upload too large" => "Prijenos je preobiman",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veli�inu za prijenos datoteka na ovom poslužitelju."
+);
diff --git a/files/l10n/hu_HU.php b/files/l10n/hu_HU.php
new file mode 100644
index 00000000000..a176ffce647
--- /dev/null
+++ b/files/l10n/hu_HU.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Nincs hiba, a fájl sikeresen feltöltve.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "A feltöltött file meghaladja az upload_max_filesize direktívát a php.ini-ben.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "A feltöltött fájl meghaladja a MAX_FILE_SIZE direktívát ami meghatározott a HTML form-ban.",
+"The uploaded file was only partially uploaded" => "Az eredeti fájl csak részlegesen van feltöltve.",
+"No file was uploaded" => "Nem lett fájl feltöltve.",
+"Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár",
+"Files" => "Fájlok",
+"Maximum upload size" => "Maximális feltölthető fájlméret",
+"Upload" => "Feltöltés",
+"Nothing in here. Upload something!" => "Töltsön fel egy fájlt.",
+"Name" => "Név",
+"Download" => "Letöltés",
+"Size" => "Méret",
+"Modified" => "Módosítva",
+"Delete" => "Törlés",
+"Upload too large" => "Feltöltés túl nagy",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "A fájlokat amit próbálsz feltölteni meghaladta a legnagyobb fájlméretet ezen a szerveren."
+);
diff --git a/files/l10n/ia.php b/files/l10n/ia.php
new file mode 100644
index 00000000000..852fb8794ac
--- /dev/null
+++ b/files/l10n/ia.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The uploaded file was only partially uploaded" => "Le file incargate solmente esseva incargate partialmente",
+"No file was uploaded" => "Nulle file esseva incargate",
+"Files" => "Files",
+"Maximum upload size" => "Dimension maxime de incargamento",
+"Upload" => "Incargar",
+"Nothing in here. Upload something!" => "Nihil hic. Incarga alcun cosa!",
+"Name" => "Nomine",
+"Download" => "Discargar",
+"Size" => "Dimension",
+"Modified" => "Modificate",
+"Delete" => "Deler",
+"Upload too large" => "Incargamento troppo longe"
+);
diff --git a/files/l10n/id.php b/files/l10n/id.php
index feb5c6d8631..902eeeb4ec2 100644
--- a/files/l10n/id.php
+++ b/files/l10n/id.php
@@ -2,7 +2,6 @@
 "Files" => "Berkas",
 "Maximum upload size" => "Ukuran unggah maksimum",
 "Upload" => "Unggah",
-"New Folder" => "Folder Baru",
 "Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
 "Name" => "Nama",
 "Download" => "Unduh",
diff --git a/files/l10n/it.php b/files/l10n/it.php
index 4c958924ceb..15ade733b97 100644
--- a/files/l10n/it.php
+++ b/files/l10n/it.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Non ci sono errori, file caricato con successo",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Il file caricato supera il valore upload_max_filesize in php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Il file caricato supera il valore MAX_FILE_SIZE definito nel form HTML",
+"The uploaded file was only partially uploaded" => "Il file è stato parzialmente caricato",
+"No file was uploaded" => "Nessun file è stato caricato",
+"Missing a temporary folder" => "Cartella temporanea mancante",
 "Files" => "File",
 "Maximum upload size" => "Dimensione massima upload",
 "Upload" => "Carica",
-"New Folder" => "Nuova Cartella",
 "Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
 "Name" => "Nome",
 "Download" => "Scarica",
diff --git a/files/l10n/ja_JP.php b/files/l10n/ja_JP.php
new file mode 100644
index 00000000000..d41e7e119a2
--- /dev/null
+++ b/files/l10n/ja_JP.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "エラー��り��ん。ファイル�アップロード��功����。",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "アップロード�れ�ファイル�php.ini�upload_max_filesize�設定�れ�サイズを超�����",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップロード�れ�ファイル�HTML�フォーム�設定�れ�MAX_FILE_SIZE�設定�れ�サイズを超�����",
+"The uploaded file was only partially uploaded" => "ファイル�一部分��アップロード�れ��ん���",
+"No file was uploaded" => "ファイル�アップロード�れ��ん���",
+"Missing a temporary folder" => "テン�ラリフォルダ�見��り��ん",
+"Files" => "ファイル",
+"Maximum upload size" => "最大アップロードサイズ",
+"Upload" => "アップロード",
+"Nothing in here. Upload something!" => "����何も�り��ん。何�アップロード������。",
+"Name" => "��",
+"Download" => "ダウンロード",
+"Size" => "サイズ",
+"Modified" => "更新日時",
+"Delete" => "削除",
+"Upload too large" => "ファイルサイズ�大�����",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロード�よ�����るファイル�サー���定�れ�最大サイズを超�����"
+);
diff --git a/files/l10n/lb.php b/files/l10n/lb.php
index 3f8a4af0bd9..43956fcd63e 100644
--- a/files/l10n/lb.php
+++ b/files/l10n/lb.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Keen Feeler, Datei ass komplett ropgelueden ginn",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Déi ropgelueden Datei ass méi grouss wei d'upload_max_filesize Eegenschaft an der php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Déi ropgelueden Datei ass méi grouss wei d'MAX_FILE_SIZE Eegenschaft déi an der HTML form uginn ass",
+"The uploaded file was only partially uploaded" => "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn",
+"No file was uploaded" => "Et ass keng Datei ropgelueden ginn",
+"Missing a temporary folder" => "Et feelt en temporären Dossier",
 "Files" => "Dateien",
 "Maximum upload size" => "Maximum Upload Gréisst ",
 "Upload" => "Eroplueden",
-"New Folder" => "Neien Dossier",
 "Nothing in here. Upload something!" => "Hei ass näischt. Lued eppes rop!",
 "Name" => "Numm",
 "Download" => "Eroflueden",
diff --git a/files/l10n/lt_LT.php b/files/l10n/lt_LT.php
new file mode 100644
index 00000000000..1bec35e0f8c
--- /dev/null
+++ b/files/l10n/lt_LT.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Klaidų nėra, failas įkeltas sėkmingai",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Įkeliamo failo dydis viršija upload_max_filesize parametrą php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Įkeliamo failo dydis viršija MAX_FILE_SIZE parametrą, kuris yra nustatytas HTML formoje",
+"The uploaded file was only partially uploaded" => "Failas buvo įkeltas tik dalinai",
+"No file was uploaded" => "Nebuvo įkeltas nė vienas failas",
+"Missing a temporary folder" => "NÄ—ra laikinojo katalogo",
+"Files" => "Failai",
+"Maximum upload size" => "Maksimalus failo dydis",
+"Upload" => "Įkelti",
+"Nothing in here. Upload something!" => "Čia tuš�ia. Įkelkite ką nors!",
+"Name" => "Pavadinimas",
+"Download" => "Atsisiųsti",
+"Size" => "Dydis",
+"Modified" => "Pakeista",
+"Delete" => "IÅ¡trinti",
+"Upload too large" => "Įkėlimui failas per didelis",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame serveryje"
+);
diff --git a/files/l10n/ms_MY.php b/files/l10n/ms_MY.php
index 3b654cccdaf..038ffd521a0 100644
--- a/files/l10n/ms_MY.php
+++ b/files/l10n/ms_MY.php
@@ -2,7 +2,6 @@
 "Files" => "fail",
 "Maximum upload size" => "Saiz maksimum muat naik",
 "Upload" => "Muat naik",
-"New Folder" => "Folder baru",
 "Nothing in here. Upload something!" => "Tiada apa-apa di sini. Muat naik sesuatu!",
 "Name" => "Nama ",
 "Download" => "Muat turun",
diff --git a/files/l10n/nb_NO.php b/files/l10n/nb_NO.php
index 49c6c158f47..c4ef4989a58 100644
--- a/files/l10n/nb_NO.php
+++ b/files/l10n/nb_NO.php
@@ -2,7 +2,6 @@
 "Files" => "Filer",
 "Maximum upload size" => "Maksimum opplastingsstørrelse",
 "Upload" => "Last opp",
-"New Folder" => "Ny mappe",
 "Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
 "Name" => "Navn",
 "Download" => "Last ned",
diff --git a/files/l10n/nl.php b/files/l10n/nl.php
index c474d9a4ca2..9d470bdf2ff 100644
--- a/files/l10n/nl.php
+++ b/files/l10n/nl.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Geen fout opgetreden, bestand successvol geupload.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Het geüploade bestand is groter dan de upload_max_filesize instelling in php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Het geüploade bestand is groter dan de MAX_FILE_SIZE richtlijn die is opgegeven in de HTML-formulier",
+"The uploaded file was only partially uploaded" => "Het bestand is slechts gedeeltelijk geupload",
+"No file was uploaded" => "Geen bestand geüpload",
+"Missing a temporary folder" => "Een tijdelijke map mist",
 "Files" => "Bestanden",
 "Maximum upload size" => "Maximale bestandsgrootte voor uploads",
 "Upload" => "Upload",
-"New Folder" => "Nieuwe map",
 "Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!",
 "Name" => "Naam",
 "Download" => "Download",
diff --git a/files/l10n/nn_NO.php b/files/l10n/nn_NO.php
new file mode 100644
index 00000000000..34f2f6be960
--- /dev/null
+++ b/files/l10n/nn_NO.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Ingen feil, fila vart lasta opp",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den opplasta fila er større enn variabelen upload_max_filesize i php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den opplasta fila er større enn variabelen MAX_FILE_SIZE i HTML-skjemaet",
+"The uploaded file was only partially uploaded" => "Fila vart berre delvis lasta opp",
+"No file was uploaded" => "Ingen filer vart lasta opp",
+"Missing a temporary folder" => "Manglar ei mellombels mappe",
+"Files" => "Filer",
+"Maximum upload size" => "Maksimal opplastingsstorleik",
+"Upload" => "Last opp",
+"Nothing in here. Upload something!" => "Ingenting her. Last noko opp!",
+"Name" => "Namn",
+"Download" => "Last ned",
+"Size" => "Storleik",
+"Modified" => "Endra",
+"Delete" => "Slett",
+"Upload too large" => "For stor opplasting",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren."
+);
diff --git a/files/l10n/pl.php b/files/l10n/pl.php
index 6cd60267fc8..075a3da07fe 100644
--- a/files/l10n/pl.php
+++ b/files/l10n/pl.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Brak błędu, plik przesłany z sukcesem",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Przesłany plik przekracza ustawienie upload_max_filesize w pliku php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Przesłany plik przekracza MAX_FILE_SIZE ustawienia, które zostało określono w formularzu HTML",
+"The uploaded file was only partially uploaded" => "Plik został przesłany tylko częściowo.",
+"No file was uploaded" => "Żaden plik nie został przesłany",
+"Missing a temporary folder" => "Brakuje folderu tymczasowego",
 "Files" => "Pliki",
 "Maximum upload size" => "Maksymalna wielkość przesyłanego pliku",
 "Upload" => "Prześlij",
-"New Folder" => "Nowy katalog",
 "Nothing in here. Upload something!" => "Nic tu nie ma. Prześlij jakieś pliki!",
 "Name" => "Nazwa",
 "Download" => "ÅšciÄ…ganie",
diff --git a/files/l10n/pt_BR.php b/files/l10n/pt_BR.php
index efaefe51655..57b1af2ae6d 100644
--- a/files/l10n/pt_BR.php
+++ b/files/l10n/pt_BR.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Não houve nenhum erro, o arquivo foi transferido com sucesso",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O tamanho do arquivo excede o limed especifiicado em upload_max_filesize no php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O arquivo carregado excede o MAX_FILE_SIZE que foi especificado no formulário HTML",
+"The uploaded file was only partially uploaded" => "O arquivo foi transferido parcialmente",
+"No file was uploaded" => "Nenhum arquivo foi transferido",
+"Missing a temporary folder" => "Pasta temporária não encontrada",
 "Files" => "Arquivos",
 "Maximum upload size" => "Tamanho máximo para carregar",
 "Upload" => "Carregar",
-"New Folder" => "Nova Pasta",
 "Nothing in here. Upload something!" => "Nada aqui.Carregar alguma coisa!",
 "Name" => "Nome",
 "Download" => "Baixar",
diff --git a/files/l10n/ro.php b/files/l10n/ro.php
index a54b011d109..65ce6953ad0 100644
--- a/files/l10n/ro.php
+++ b/files/l10n/ro.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Nu am întâmpinat nici eroare, fișierul a fost încărcat cu success",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Fișierul are o dimensiune mai mare decât cea specificată în variabila upload_max_filesize din php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată în formularul HTML",
+"The uploaded file was only partially uploaded" => "Fișierul a fost încărcat doar parțial",
+"No file was uploaded" => "Nu a fost încărcat nici un fișier",
+"Missing a temporary folder" => "Lipsă folder temporar",
 "Files" => "Fișiere",
 "Maximum upload size" => "Dimensiunea maximă",
 "Upload" => "Încarcă",
-"New Folder" => "Director nou",
 "Nothing in here. Upload something!" => "Nici un fișier, încarcă ceva!",
 "Name" => "Nume",
 "Download" => "Descarcă",
diff --git a/files/l10n/ru.php b/files/l10n/ru.php
index ff1c05ce8ee..a77e6e370b4 100644
--- a/files/l10n/ru.php
+++ b/files/l10n/ru.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Файл у�пешно загружен",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Файл превышает допу�тимые размеры (опи�аны как upload_max_filesize в php.ini)",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Файл превышает размер MAX_FILE_SIZE, указаный в HTML-форме",
+"The uploaded file was only partially uploaded" => "Файл был ча�тично загружен",
+"No file was uploaded" => "Файл не был загружен",
+"Missing a temporary folder" => "�евозможно найти временную директорию",
 "Files" => "Файлы",
 "Maximum upload size" => "Мак�имальный размер файла",
 "Upload" => "Закачать",
-"New Folder" => "�ова� папка",
 "Nothing in here. Upload something!" => "Зде�ь ничего нет. Закачайте что-нибудь!",
 "Name" => "�азвание",
 "Download" => "Скачать",
diff --git a/files/l10n/sk_SK.php b/files/l10n/sk_SK.php
new file mode 100644
index 00000000000..840d924fbee
--- /dev/null
+++ b/files/l10n/sk_SK.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Nenastala žiadna chyba, súbor bol úspešne nahraný",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Nahraný súbor presiahol direktívu upload_max_filesize v php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Nahrávaný súbor presiahol MAX_FILE_SIZE direktívu, ktorá bola špecifikovaná v HTML formulári",
+"The uploaded file was only partially uploaded" => "Nahrávaný súbor bol iba �iasto�ne nahraný",
+"No file was uploaded" => "Žiaden súbor nebol nahraný",
+"Missing a temporary folder" => "Chýbajúci do�asný prie�inok",
+"Files" => "Súbory",
+"Maximum upload size" => "Maximálna veľkosť nahratia",
+"Upload" => "Nahrať",
+"Nothing in here. Upload something!" => "Ni� tu nie je. Nahrakte nie�o!",
+"Name" => "Meno",
+"Download" => "Stiahnuť",
+"Size" => "Veľkosť",
+"Modified" => "Upravené",
+"Delete" => "Odstrániť",
+"Upload too large" => "Nahrávanie príliš veľké",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory ktoré sa snažíte nahrať presahujú maximálnu veľkosť pre nahratie súborov na tento server."
+);
diff --git a/files/l10n/sl.php b/files/l10n/sl.php
new file mode 100644
index 00000000000..5a09e0fe20b
--- /dev/null
+++ b/files/l10n/sl.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "datoteka je bila naložena uspešno.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Velikost željene naložene datoteke je prevelika. (upload_max_filesize - php.ini) Kontaktirajte Administratorja.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Velikost željene naložene datoteke je prevelika. (MAX_FILE_SIZE - html formi) Kontaktirajte Administratorja.",
+"The uploaded file was only partially uploaded" => "Datoteka je bila le delno naložena.",
+"No file was uploaded" => "Naloženih ni bilo ni� Datotek.",
+"Missing a temporary folder" => "Ni potrebne za�asne datoteke. (temporary folder)",
+"Files" => "Datoteke",
+"Maximum upload size" => "Maksimalna velikost",
+"Upload" => "Naloži gor",
+"Nothing in here. Upload something!" => "Naloženih še ni bilo ni� datotek.",
+"Name" => "Ime",
+"Download" => "Naloži dol",
+"Size" => "Velikost",
+"Modified" => "Urejeno",
+"Delete" => "Izbriši",
+"Upload too large" => "Nalaganje ni mogo�e, ker je preveliko.",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke ki jih želiš naložiti presegajo maksimalno velikost na tem strežniku. Kontaktirajte Administratorja."
+);
diff --git a/files/l10n/sr.php b/files/l10n/sr.php
index 445387ffa2f..9c5dbae2a23 100644
--- a/files/l10n/sr.php
+++ b/files/l10n/sr.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "�ема грешке, фајл је у�пешно по�лат",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "По�лати фајл превазилази директиву upload_max_filesize из ",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "По�лати фајл превазилази директиву MAX_FILE_SIZE која је наведена у ХТМЛ форми",
+"The uploaded file was only partially uploaded" => "По�лати фајл је �амо делимично отпремљен!",
+"No file was uploaded" => "�иједан фајл није по�лат",
+"Missing a temporary folder" => "�едо�таје привремена фа�цикла",
 "Files" => "Фајлови",
 "Maximum upload size" => "Мак�имална величина пошиљке",
 "Upload" => "Пошаљи",
-"New Folder" => "�ова фа�цикла",
 "Nothing in here. Upload something!" => "Овде нема ничег. Пошаљите нешто!",
 "Name" => "Име",
 "Download" => "Преузми",
diff --git a/files/l10n/sr@latin.php b/files/l10n/sr@latin.php
index 3cc0ee0f150..1b5addbc571 100644
--- a/files/l10n/sr@latin.php
+++ b/files/l10n/sr@latin.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Nema greške, fajl je uspešno poslat",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Poslati fajl prevazilazi direktivu upload_max_filesize iz ",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML formi",
+"The uploaded file was only partially uploaded" => "Poslati fajl je samo delimi�no otpremljen!",
+"No file was uploaded" => "Nijedan fajl nije poslat",
+"Missing a temporary folder" => "Nedostaje privremena fascikla",
 "Files" => "Fajlovi",
 "Maximum upload size" => "Maksimalna veli�ina pošiljke",
 "Upload" => "Pošalji",
-"New Folder" => "Nova fascikla",
 "Nothing in here. Upload something!" => "Ovde nema ni�eg. Pošaljite nešto!",
 "Name" => "Ime",
 "Download" => "Preuzmi",
diff --git a/files/l10n/sv.php b/files/l10n/sv.php
index dd1ac479366..dfd32f3f5c2 100644
--- a/files/l10n/sv.php
+++ b/files/l10n/sv.php
@@ -1,14 +1,19 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uppladdade filen överstiger MAX_FILE_SIZE direktivet som anges i HTML-formulär",
+"The uploaded file was only partially uploaded" => "Den uppladdade filen var endast delvist uppladdad",
+"No file was uploaded" => "Ingen fil blev uppladdad",
+"Missing a temporary folder" => "Saknar en tillfällig mapp",
 "Files" => "Filer",
 "Maximum upload size" => "Maximal storlek att lägga upp",
-"Upload" => "Lägg upp",
-"New Folder" => "Ny katalog",
-"Nothing in here. Upload something!" => "Ingenting här. Lägg upp något!",
+"Upload" => "Ladda upp",
+"Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
 "Name" => "Namn",
 "Download" => "Ladda ned",
 "Size" => "Storlek",
 "Modified" => "Ändrad",
 "Delete" => "Ta bort",
-"Upload too large" => "För stor överföring",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker lägga upp överstiger den maximala storleken för filöverföringar på servern."
+"Upload too large" => "För stor uppladdning",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern."
 );
diff --git a/files/l10n/tr.php b/files/l10n/tr.php
new file mode 100644
index 00000000000..5fc46056175
--- /dev/null
+++ b/files/l10n/tr.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Bir hata yok, dosya başarıyla yüklendi",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Yüklenen dosya php.ini de belirtilen upload_max_filesize sınırını aşıyor",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklenen dosya HTML formundaki MAX_FILE_SIZE sınırını aşıyor",
+"The uploaded file was only partially uploaded" => "Yüklenen dosyanın sadece bir kısmı yüklendi",
+"No file was uploaded" => "Hiç dosya yüklenmedi",
+"Missing a temporary folder" => "Geçici bir klasör eksik",
+"Files" => "Dosyalar",
+"Maximum upload size" => "Maksimum yükleme boyutu",
+"Upload" => "Yükle",
+"Nothing in here. Upload something!" => "Burada hiçbir şey yok. Birşeyler yükleyin!",
+"Name" => "Ad",
+"Download" => "Ä°ndir",
+"Size" => "Boyut",
+"Modified" => "DeÄŸiÅŸtirilme",
+"Delete" => "Sil",
+"Upload too large" => "Yüklemeniz çok büyük",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor."
+);
diff --git a/files/l10n/zh_CN.php b/files/l10n/zh_CN.php
index abb2f9db232..a4d7283df87 100644
--- a/files/l10n/zh_CN.php
+++ b/files/l10n/zh_CN.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "没有�生错误，文件上传�功。",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "上传的文件大�超过了php.ini 中指定的upload_max_filesize",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件超过了在HTML 表�中指定的MAX_FILE_SIZE",
+"The uploaded file was only partially uploaded" => "�上传了文件的一部分",
+"No file was uploaded" => "文件没有上传",
+"Missing a temporary folder" => "缺少临时目录",
 "Files" => "文件",
 "Maximum upload size" => "最大上传大�",
 "Upload" => "上传",
-"New Folder" => "新建文件夹",
 "Nothing in here. Upload something!" => "这里还什么都没有。上传些东西��",
 "Name" => "�称",
 "Download" => "下载",
diff --git a/l10n/.tx/config b/l10n/.tx/config
new file mode 100644
index 00000000000..b75b28bf1cd
--- /dev/null
+++ b/l10n/.tx/config
@@ -0,0 +1,33 @@
+[main]
+host = https://www.transifex.net
+
+[owncloud.core]
+file_filter = <lang>/core.po
+source_file = templates/core.pot
+source_lang = en
+
+[owncloud.calendar]
+file_filter = <lang>/calendar.po
+source_file = templates/calendar.pot
+source_lang = en
+
+[owncloud.contacts]
+file_filter = <lang>/contacts.po
+source_file = templates/contacts.pot
+source_lang = en
+
+[owncloud.files]
+file_filter = <lang>/files.po
+source_file = templates/files.pot
+source_lang = en
+
+[owncloud.media]
+file_filter = <lang>/media.po
+source_file = templates/media.pot
+source_lang = en
+
+[owncloud.settings]
+file_filter = <lang>/settings.po
+source_file = templates/settings.pot
+source_lang = en
+
diff --git a/l10n/ar/calendar.po b/l10n/ar/calendar.po
new file mode 100644
index 00000000000..c24233afb29
--- /dev/null
+++ b/l10n/ar/calendar.po
@@ -0,0 +1,637 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <tarek.taha@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-07 18:29+0100\n"
+"PO-Revision-Date: 2012-01-08 08:41+0000\n"
+"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr "تم تغيير المنطقة الزمنية"
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr "طلب غير م�هوم"
+
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr "الجدول الزمني"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "جدول زمني خاطئ"
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr "عيد ميلاد"
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr "عمل"
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr "إتصال"
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr "الزبائن"
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr "المرسل"
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr "عطلة"
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr "أ�كار"
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr "رحلة"
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr "يوبيل"
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr "إجتماع"
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr "شيء آخر"
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr "شخصي"
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr "مشاريع"
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr "اسئلة"
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr "العمل"
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr "لا يعاد"
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr "يومي"
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr "أسبوعي"
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr "كل نهاية الأسبوع"
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr "كل اسبوعين"
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr "شهري"
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr "سنوي"
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "ليس ص�ي�"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "كل النهار"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "خانات خالية من المعلومات"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "عنوان"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "من تاريخ"
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "إلى تاريخ"
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "إلى يوم"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "إلى وقت"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "هذا الحدث ينتهي قبل أن يبدأ"
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "خطأ �ي قاعدة البيانات"
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr "إسبوع"
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr "شهر"
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr "قائمة"
+
+#: templates/calendar.php:45
+msgid "Today"
+msgstr "اليوم"
+
+#: templates/calendar.php:46
+msgid "Calendars"
+msgstr "الجداول الزمنية"
+
+#: templates/calendar.php:64
+msgid "There was a fail, while parsing the file."
+msgstr "لم يتم قراءة المل� بنجاح."
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr "إختر الجدول الزمني الرئيسي"
+
+#: templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "جدول زمني جديد"
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr "وصلة CalDav"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr "تحميل"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr "تعديل"
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "حذ�"
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr "جدول زمني جديد"
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr "عادل الجدول الزمني"
+
+#: templates/part.editcalendar.php:12 templates/part.import.php:29
+msgid "Displayname"
+msgstr "الاسم المرئي"
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr "حالي"
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr "لون الجدول الزمني"
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "إح�ظ"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "أرسل"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr "إلغاء"
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr "عادل حدث"
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "تصدير المعلومات"
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr "عنوان الحدث"
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr "�ئة"
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr "اختر ال�ئة"
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr "حدث �ي يوم كامل"
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr "من"
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr "إلى"
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "خيارات متقدمة"
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr "إعادة"
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "مكان"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "مكان الحدث"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "مواص�ات"
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr "وص� الحدث"
+
+#: templates/part.import.php:1
+msgid "Import Ical File"
+msgstr "إدخال مل� Ical"
+
+#: templates/part.import.php:4
+msgid "How to import the new calendar?"
+msgstr "كي�ية إدخال مل� جدول زمني ؟"
+
+#: templates/part.import.php:6
+msgid "Import into an existing calendar"
+msgstr "إدخال معلومات إلى جدول زمني حالي"
+
+#: templates/part.import.php:7
+msgid "Import into a new calendar"
+msgstr "إدخال معلومات إلى جدول زمني جديد"
+
+#: templates/part.import.php:10
+msgid "Please choose the calendar"
+msgstr "الرجاء إختر الجدول الزمني"
+
+#: templates/part.import.php:20 templates/part.import.php:37
+msgid "Import"
+msgstr "إدخال"
+
+#: templates/part.import.php:22 templates/part.import.php:39
+msgid "Back"
+msgstr "الرجوع"
+
+#: templates/part.import.php:25
+msgid "Please fill out the form"
+msgstr "الرجاء إملء الخانات"
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr "إضا�ة حدث جديد"
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr "المنطقة الزمنية"
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "شكل الوقت"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24 ساعة"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12 ساعة"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "عنوان لتحديث ال CalDAV الجدول الزمني"
+
+
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
new file mode 100644
index 00000000000..5f67130cd91
--- /dev/null
+++ b/l10n/ar/contacts.po
@@ -0,0 +1,239 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <tarek.taha@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: lib/app.php:42
+msgid "This is not your addressbook."
+msgstr "هذا ليس د�تر عناوينك."
+
+#: lib/app.php:51 photo.php:34
+msgid "Contact could not be found."
+msgstr "لم يتم العثور على الشخص."
+
+#: lib/app.php:65
+msgid "vCard could not be read."
+msgstr "لم يتم قراءة ال vCard بنجاح."
+
+#: lib/app.php:79
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr "المعلومات الموجودة �ي ال vCard غير صحيحة. الرجاء إعادة تحديث الص�حة."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "عنوان"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "الهات�"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "البريد الالكتروني"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "المؤسسة"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "الوظي�ة"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "البيت"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "الهات� المحمول"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "معلومات إضا�ية"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "صوت"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "ال�اكس"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "ال�يديو"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "الرنان"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr ".هذا ليس من معار�ي"
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr "هذا الكرت ليس متلائم مع نظام ال RFC."
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr "لا يحتوي هذا الكرت على صورة."
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "أض� شخص "
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "مجموعة"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "الاسم"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "العنوان البريدي"
+
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "إضا�ة"
+
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "شارع"
+
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "المدينة"
+
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "المنطقة"
+
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "رقم المنطقة"
+
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "البلد"
+
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "أض� شخص "
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "تعديل"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "حذ�"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr "تاريخ الميلاد"
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr "الهات�"
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
+
+
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
new file mode 100644
index 00000000000..058ad6fbd7f
--- /dev/null
+++ b/l10n/ar/core.po
@@ -0,0 +1,171 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <tarek.taha@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "سو� نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "تم طلب"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "محاولة دخول �اشلة!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "إسم المستخدم"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "طلب تعديل"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "لقد تم تعديل كلمة السر"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "كلمة سر جديدة"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "تعديل كلمة السر"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "خصوصيات"
+
+#: strings.php:6
+msgid "Users"
+msgstr "المستخدم"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "التطبيقات"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "مستخدم رئيسي"
+
+#: strings.php:9
+msgid "Help"
+msgstr "المساعدة"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "لم يتم إيجاد"
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr "أض� </strong>مستخدم رئيسي <strong>"
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr "كلمة السر"
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "خيارات متقدمة"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "مجلد المعلومات"
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr "أسس قاعدة البيانات"
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr "سيتم استخدمه"
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr "مستخدم قاعدة البيانات"
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr "كلمة سر مستخدم قاعدة البيانات"
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr "إسم قاعدة البيانات"
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr "خادم قاعدة البيانات"
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr "انهاء التعديلات"
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr "الخروج"
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr "تعديلات"
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr "هل نسيت كلمة السر؟"
+
+#: templates/login.php:15
+msgid "remember"
+msgstr "تذكر"
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "تم الخروج بنجاح."
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "السابق"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "التالي"
+
+
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
new file mode 100644
index 00000000000..d557d0039c8
--- /dev/null
+++ b/l10n/ar/files.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <tarek.taha@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr "تم تر�يع المل�ات بنجاح."
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+"حجم المل� الذي تريد تر�يعه أعلى مما upload_max_filesize يسمح به �ي مل� "
+"php.ini"
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+"حجم المل� الذي تريد تر�يعه أعلى مما MAX_FILE_SIZE يسمح به �ي واجهة ال HTML."
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr "تم تر�يع جزء من المل�ات الذي تريد تر�يعها �قط"
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr "لم يتم تر�يع أي من المل�ات"
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr "المجلد المؤقت غير موجود"
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr "المل�ات"
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr "الحد الأقصى لحجم المل�ات التي يمكن ر�عها"
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr "إر�ع"
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr "لا يوجد شيء هنا. إر�ع بعض المل�ات!"
+
+#: templates/index.php:43
+msgid "Name"
+msgstr "الاسم"
+
+#: templates/index.php:45
+msgid "Download"
+msgstr "تحميل"
+
+#: templates/index.php:49
+msgid "Size"
+msgstr "حجم"
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr "معدل"
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr "محذو�"
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr "حجم التر�يع أعلى من المسموح"
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "حجم المل�ات التي تريد تر�يعها أعلى من المسموح على الخادم."
+
+
diff --git a/l10n/ar/media.po b/l10n/ar/media.po
new file mode 100644
index 00000000000..7438bf29e3f
--- /dev/null
+++ b/l10n/ar/media.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <tarek.taha@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: appinfo/app.php:32
+msgid "Music"
+msgstr "الموسيقى"
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr "إلعب"
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr "تجميد"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr "السابق"
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr "التالي"
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr "إلغاء الصوت"
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr "تشغيل الصوت"
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr "إعادة البحث عن مل�ات الموسيقى"
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr "ال�نان"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "الألبوم"
+
+#: templates/music.php:39
+msgid "Title"
+msgstr "العنوان"
+
+
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
new file mode 100644
index 00000000000..ed62562f685
--- /dev/null
+++ b/l10n/ar/settings.po
@@ -0,0 +1,153 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <tarek.taha@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr "طلبك غير م�هوم"
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "تم تغيير ال OpenID"
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr "تم تغيير اللغة"
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr "أض� تطبيقاتك"
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr "إختر تطبيقاً"
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr "-مسجل"
+
+#: templates/apps.php:23
+msgid "by"
+msgstr "من قبل"
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr "إسأل سؤال"
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr "الاتصال بقاعدة بيانات المساعدة لم يتم بنجاح"
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr "إذهب هنالك بن�سك"
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr "الجواب"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr "أنت تستخدم"
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr "من الموجود"
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr "لقد تم تغيير كلمات السر"
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "لم يتم تعديل كلمة السر بنجاح"
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr "كلمات السر الحالية"
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr "كلمات سر جديدة"
+
+#: templates/personal.php:17
+msgid "show"
+msgstr "أظهر"
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr "عدل كلمة السر"
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr "اللغة"
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr "إستخدم هذا العنوان للإتصال ب ownCloud داخل نظام المل�ات "
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr "الاسم"
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr "كلمات السر"
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr "مجموعات"
+
+#: templates/users.php:23
+msgid "Create"
+msgstr "انشئ"
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr "حذ�"
+
+
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index 4b6ca8fc510..ebddb139140 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:10+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +17,222 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr ""
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
 msgstr ""
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
 msgstr ""
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: photo.php:53
-msgid "This card is not RFC compatible."
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
 msgstr ""
 
-#: photo.php:90
-msgid "This card does not contain a photo."
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
 msgstr ""
 
-#: templates/index.php:8
-msgid "Add Contact"
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
 msgstr ""
 
-#: templates/part.addcardform.php:5
-msgid "Group"
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
 msgstr ""
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
-msgid "Name"
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
 msgstr ""
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: lib/app.php:112
+msgid "Mobile"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
+#: lib/app.php:114
+msgid "Text"
 msgstr ""
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
+#: lib/app.php:115
+msgid "Voice"
 msgstr ""
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
+#: lib/app.php:116
+msgid "Fax"
 msgstr ""
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
+#: lib/app.php:117
+msgid "Video"
 msgstr ""
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
+#: lib/app.php:118
+msgid "Pager"
+msgstr ""
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr ""
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr ""
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr ""
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr ""
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr ""
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr ""
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr ""
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Delete"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
 msgid "Birthday"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
 msgstr ""
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index f23044c9878..c7db7403c9f 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-06 19:20+0000\n"
-"Last-Translator: adin <adn.adin@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +20,51 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Ще получите връзка за нулиране на паролата Ви."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "За�вено"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Входа пропадна!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Потребител"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "�улиране на за�вка"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Вашата парола е нулирана"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "�ова парола"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "�улиране на парола"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Лични"
@@ -48,54 +93,50 @@ msgstr "облакът не намерен"
 msgid "Create an <strong>admin account</strong>"
 msgstr "Създаване на <strong>админ профил</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Потребител"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Парола"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Разширено"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Директори� за данни"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Конфигуриране на базата"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "ще �е ползва"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Потребител за базата"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Парола за базата"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Име на базата"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Разширено"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Хо�т за базата"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Директори� за данни"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Завършване на на�тройките"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "дава Ви �вобода и контрол на Вашите лични данни"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -105,38 +146,22 @@ msgstr "Изход"
 msgid "Settings"
 msgstr "�а�тройки"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Забравена парола?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "запомни"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Вие изл�зохте."
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Ще получите връзка за да нулирате паролата �и."
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "За�вено"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Входа пропадна!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Потребител�ко име или Email"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "За�вка за нулиране"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "пред."
@@ -145,16 +170,4 @@ msgstr "пред."
 msgid "next"
 msgstr "�ледващо"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Вашата парола е нулирана"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "�ова парола"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "�улиране на парола"
-
 
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 475f6dc3fae..3ed53c3a4b0 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,37 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Файлът е качен у�пешно"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
+"Файлът който �е опитвате да качите, надвишава зададените �тойно�ти в "
+"upload_max_filesize в PHP.INI"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"Файлът който �е опитвате да качите надвишава �тойно�тите в MAX_FILE_SIZE в "
+"HTML формата."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Файлът е качен ча�тично"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Фахлът не бе качен"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Лип�ва временната папка"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Файлове"
 
@@ -52,43 +56,55 @@ msgstr "Файлове"
 msgid "Maximum upload size"
 msgstr "Мак�. размер за качване"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Качване"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "�ова папка"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "��ма нищо, качете нещо!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Име"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Изтегл�не"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Размер"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Променено"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Изтриване"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Файлът е прекалено гол�м"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/bg_BG/media.po b/l10n/bg_BG/media.po
index e8fa24bbe50..b06ecc85d90 100644
--- a/l10n/bg_BG/media.po
+++ b/l10n/bg_BG/media.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-06 08:43+0000\n"
-"Last-Translator: ep98 <ilivanov@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Музика"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "Пу�ни"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Пауза"
 
@@ -34,7 +34,7 @@ msgstr "Пауза"
 msgid "Previous"
 msgstr "Предишна"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "Следваща"
 
@@ -46,11 +46,7 @@ msgstr "Отнеми"
 msgid "Unmute"
 msgstr "Върни"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Сканирани пе�ни"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Повторно �каниране"
 
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 9f23a84787f..c5a72e79d81 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-06 19:21+0000\n"
-"Last-Translator: adin <adn.adin@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,26 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Проблем � идентификаци�та"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID е �менено"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "�евалидна за�вка"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID е �менено"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Езика е �менен"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Добавете Ваша програма"
@@ -55,15 +59,15 @@ msgstr "от"
 msgid "Ask a question"
 msgstr "Задайте въпро�"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Проблеми при �вързване � помощната база"
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Отидете ръчно."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Отговор"
 
@@ -99,35 +103,51 @@ msgstr "показва"
 msgid "Change password"
 msgstr "Пром�на на парола"
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Език"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Помогнете � превода"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "ползвай този адре� за връзка � Ваши� ownCloud във файлови� мениджър"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Име"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Парола"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Групи"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "�ово"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Изтриване"
 
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index a9a23483bc3..f463226b436 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <rcalvoi@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:11+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +18,222 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Aquesta no és la vostra llibreta d'adreces"
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "No s'ha trobat el contacte."
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "No s'ha pogut llegir la vCard"
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
-msgstr ""
+msgstr "La informació de la vCard és incorrecta. Carregueu la pàgina de nou."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Adreça"
 
-#: photo.php:53
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telèfon"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "Correu electrònic"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organització"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Feina"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Casa"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mòbil"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Text"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Veu"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Vídeo"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Paginador"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Aquest contacte no és vostre."
+
+#: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Aquesta targeta no és compatible amb RFC."
 
-#: photo.php:90
+#: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Aquesta targeta no conté foto."
 
-#: templates/index.php:8
+#: templates/index.php:13
 msgid "Add Contact"
+msgstr "Afegeix un contacte"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addcardform.php:5
+#: templates/part.addcardform.php:8
 msgid "Group"
-msgstr ""
+msgstr "Grup"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
+#: templates/part.addcardform.php:19
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Adreça Postal"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Addicional"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
-msgstr ""
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Carrer"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
-msgstr ""
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Ciutat"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
-msgstr ""
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Comarca"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
-msgid "PO Box"
-msgstr ""
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Codi postal"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
-msgid "Extended"
-msgstr ""
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "País"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
-msgid "Street"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Crea un contacte"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
-msgid "City"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
-msgid "Region"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
-msgid "Zipcode"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
-msgid "Country"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Edita"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Elimina"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.details.php:33
+msgid "Add"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.editaddressbook.php:29
+msgid "Save"
 msgstr ""
 
-#: templates/part.details.php:33
-msgid "Delete"
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
+msgstr "Aniversari"
+
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Telèfon"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index cfbd4678f9f..cf30bb6af45 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-05 13:54+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,51 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Sol·licitat"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "No s'ha pogut entrar"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Nom d'usuari"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Sol·licita reinicialització"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "La vostra contrasenya s'ha reinicialitzat"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Contrasenya nova"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Reinicialitza contrasenya"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personal"
@@ -46,54 +91,50 @@ msgstr "No s'ha trobat el núvol"
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>compte d'administrador</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Nom d'usuari"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Avançat"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Carpeta de dades"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Configura la base de dades"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "s'usarà"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Usuari de la base de dades"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Contrasenya de la base de dades"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Nom de la base de dades"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Avançat"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Ordinador central de la base de dades"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Carpeta de dades"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Acaba la configuració"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "us dóna llibertat i control sobre les seves dades"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -103,38 +144,22 @@ msgstr "Sortir"
 msgid "Settings"
 msgstr "Arranjament"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Heu perdut la contrasenya?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "recorda'm"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Heu tancat la sessió."
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Rebreu un enllaç per correu electrònic per restablir la contrasenya"
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Sol·licitat"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "L'inici de sessió ha fallat!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Nom d'usuari o correu electrònic"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Sol.licitud de restabliment"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
@@ -143,16 +168,4 @@ msgstr "anterior"
 msgid "next"
 msgstr "següent"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "La vostra contrasenya s'ha restablert"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "Nova contrasenya"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Restabliment de la contrasenya"
-
 
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index faf3ca5063e..8427ff069a7 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,37 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "El fitxer s'ha pujat correctament"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
+"El fitxer de pujada excedeix la directiva upload_max_filesize establerta a "
+"php.ini"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"El fitxer de pujada excedeix la directiva MAX_FILE_SIZE especificada al "
+"formulari HTML"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "El fitxer només s'ha pujat parcialment"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "El fitxer no s'ha pujat"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "S'ha perdut un fitxer temporal"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Fitxers"
 
@@ -52,43 +56,55 @@ msgstr "Fitxers"
 msgid "Maximum upload size"
 msgstr "Mida màxima de pujada"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Puja"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Carpeta nova"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Res per aquí. Pugeu alguna cosa!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Nom"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Descarrega"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Mida"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Modificat"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Esborra"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "La pujada és massa gran"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/ca/media.po b/l10n/ca/media.po
index b0754f01964..7f400afcfd1 100644
--- a/l10n/ca/media.po
+++ b/l10n/ca/media.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 #   <rcalvoi@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-23 11:09+0200\n"
-"PO-Revision-Date: 2011-08-21 10:56+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,15 +18,15 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Música"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "Reprodueix"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Pausa"
 
@@ -33,7 +34,7 @@ msgstr "Pausa"
 msgid "Previous"
 msgstr "Anterior"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "Següent"
 
@@ -45,13 +46,9 @@ msgstr "Mut"
 msgid "Unmute"
 msgstr "Activa el so"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Cançons escanejades"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
-msgstr "Escaneja de nou la col·lecció"
+msgstr "Explora de nou la col·lecció"
 
 #: templates/music.php:37
 msgid "Artist"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index e976e434c85..16747902ae7 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 #   <rcalvoi@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-28 01:11+0200\n"
-"PO-Revision-Date: 2011-08-23 15:33+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,29 +18,33 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Error d'autenticació"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID ha canviat"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Sol.licitud no vàlida"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID ha canviat"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "S'ha canviat l'idioma"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Afegir una aplicació"
 
 #: templates/apps.php:21
 msgid "Select an App"
-msgstr "Sel·leccioneu una aplicació"
+msgstr "Seleccioneu una aplicació"
 
 #: templates/apps.php:23
 msgid "-licensed"
@@ -53,15 +58,15 @@ msgstr "per"
 msgid "Ask a question"
 msgstr "Feu una pregunta"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Problemes per connectar-se a la base de dades d'ajuda."
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Vés-hi manualment."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Resposta"
 
@@ -77,6 +82,10 @@ msgstr "del disponible"
 msgid "Your password got changed"
 msgstr "La contrasenya ha canviat"
 
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "No s'ha pogut canviar la contrasenya"
+
 #: templates/personal.php:15
 msgid "Current password"
 msgstr "contrasenya actual"
@@ -94,35 +103,51 @@ msgid "Change password"
 msgstr "canvia la contrasenya"
 
 #: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Ajudeu amb la traducció"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:36
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "useu aquesta adreça per connectar-vos a ownCloud des del gestor de fitxers"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Nom"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Grups"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Crea"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Esborra"
 
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 76af9f7e5ca..3bf09f0a1af 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jan Krejci <krejca85@gmail.com>, 2011.
+# Martin  <fireball@atlas.cz>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:11+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +19,222 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Toto není Váš adresář."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "Kontakt nebyl nalezen."
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "vCard nelze pře�íst."
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
-msgstr ""
+msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Adresa"
 
-#: photo.php:53
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "Email"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organizace"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Pracovní"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Domácí"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Text"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Hlas"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Pager"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Toto není Váš kontakt."
+
+#: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Tato karta není kompatibilní s RFC."
 
-#: photo.php:90
+#: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Tato karta neobsahuje foto"
 
-#: templates/index.php:8
+#: templates/index.php:13
 msgid "Add Contact"
+msgstr "Přidat kontakt"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addcardform.php:5
+#: templates/part.addcardform.php:8
 msgid "Group"
-msgstr ""
+msgstr "Skupina"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
+#: templates/part.addcardform.php:19
 msgid "Name"
-msgstr ""
+msgstr "Jméno"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "PO box"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Rozšířené"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
-msgstr ""
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Ulice"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
-msgstr ""
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Město"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
-msgstr ""
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Kraj"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
-msgid "PO Box"
-msgstr ""
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "PSČ"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
-msgid "Extended"
-msgstr ""
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "ZemÄ›"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
-msgid "Street"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Vytvořit kontakt"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
-msgid "City"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
-msgid "Region"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
-msgid "Zipcode"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
-msgid "Country"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Editovat"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Odstranit"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.details.php:33
+msgid "Add"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.editaddressbook.php:29
+msgid "Save"
 msgstr ""
 
-#: templates/part.details.php:33
-msgid "Delete"
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
+msgstr "Narozeniny"
+
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index f13d48f0b08..1aa44c40cd7 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -2,14 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# Jan Krejci <krejca85@gmail.com>, 2011.
 # Martin  <fireball@atlas.cz>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-04 18:14+0200\n"
-"PO-Revision-Date: 2011-09-04 16:14+0000\n"
-"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +19,51 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Bude Vám zaslán odkaz pro obnovu hesla"
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Požadováno"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Přihlášení selhalo"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Uživatelské jméno"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Vyžádat obnovu"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Vaše heslo bylo obnoveno"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Nové heslo"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Obnovit heslo"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Osobní"
@@ -45,53 +92,49 @@ msgstr "Cloud nebyl nalezen"
 msgid "Create an <strong>admin account</strong>"
 msgstr "Vytvořit <strong>ú�et správce</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Uživatelské jméno"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Rozšířené volby"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Datový adresář"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Konfigurace databáze"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "bude použito"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Uživatel databáze"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Heslo k databázi"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Název databáze"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Rozšířené volby"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
-msgstr ""
+msgstr "Hostitel databáze"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Datový adresář"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Dokon�it instalaci"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
+msgid "web services under your control"
 msgstr ""
 
 #: templates/layout.user.php:34
@@ -102,38 +145,22 @@ msgstr "Odhlásit se"
 msgid "Settings"
 msgstr "Nastavení"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
-msgstr ""
+msgstr "Zapomenuté heslo?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "zapamatovat si"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Jste odhlášeni."
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr ""
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr ""
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Přihlášení se nezdařilo!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr ""
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr ""
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "zpět"
@@ -142,16 +169,4 @@ msgstr "zpět"
 msgid "next"
 msgstr "vpřed"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr ""
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr ""
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr ""
-
 
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 6dc49c6a5d5..883d1a427f9 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,36 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Soubor byl odeslán úspěšně"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
+"Odeslaný soubor přesáhl velikostí parametr upload_max_filesize v php.ini"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"Odeslaný soubor přesáhl velikostí parametr MAX_FILE_SIZE specifikovaný v "
+"HTML formuláři"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Soubor byl odeslán pouze �áste�ně"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Soubor nebyl odeslán"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Chybí adresář pro so�asné soubory"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Soubory"
 
@@ -52,43 +55,55 @@ msgstr "Soubory"
 msgid "Maximum upload size"
 msgstr "Maximální velikost ukládaných souborů"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Uložit"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Nový adresář"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Žádný obsah. Uložte si něco!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Název"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Velikost"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Změněno"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Vymazat"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Příliš velký soubor"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/cs_CZ/media.po b/l10n/cs_CZ/media.po
index f27aab19c88..896bb88c3f7 100644
--- a/l10n/cs_CZ/media.po
+++ b/l10n/cs_CZ/media.po
@@ -2,14 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# Jan Krejci <krejca85@gmail.com>, 2011.
 # Martin  <fireball@atlas.cz>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-01 14:09+0000\n"
-"Last-Translator: Fireball <fireball@atlas.cz>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,15 +19,15 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
-msgstr "hudba"
+msgstr "Hudba"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "Přehrát"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Pauza"
 
@@ -33,7 +35,7 @@ msgstr "Pauza"
 msgid "Previous"
 msgstr "Předchozí"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "Další"
 
@@ -45,11 +47,7 @@ msgstr "Ztišit"
 msgid "Unmute"
 msgstr "Zesílit"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Skladby jsou prohledány"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Znovu prohledat "
 
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index f9863f56d18..dbcea3a216b 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -2,14 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# Jan Krejci <krejca85@gmail.com>, 2011.
 # Martin  <fireball@atlas.cz>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-01 14:15+0000\n"
-"Last-Translator: Fireball <fireball@atlas.cz>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +19,26 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Chyba při ověření"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID změněn"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Chybný dotaz"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID změněn"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Jazyk byl změněn"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Přidejte svou aplikaci"
@@ -53,15 +59,15 @@ msgstr "podle"
 msgid "Ask a question"
 msgstr "Zeptat se"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Problémy s připojením k databázi s nápovědou."
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Přejít ru�ně."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Odpově�"
 
@@ -97,36 +103,52 @@ msgstr "zobrazit"
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Pomozte s překladem"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:36
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "tuto adresu použijte pro připojení k ownCloud ve Vašem správci souborů"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Jméno"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Vytvořit"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Vymazat"
 
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index c65bf62822a..9d69617ac47 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <mikkelbjerglarsen@gmail.com>, 2011.
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 20:41+0000\n"
-"Last-Translator: pascal_a <pascal@dhermilly.dk>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,164 +20,222 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr "Du skal logge ind."
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Dette er ikke din adressebog."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr "Kontakt kunne ikke findes."
-
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr "Dette er ikke din kontakt."
+msgstr "Kontaktperson kunne ikke findes."
 
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
 msgstr "Kunne ikke læse vCard."
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informationen om vCard er forkert. Genindlæs siden."
 
-#: photo.php:53
-msgid "This card is not RFC compatible."
-msgstr "Dette kort er ikke RFC-kompatibelt."
-
-#: photo.php:90
-msgid "This card does not contain a photo."
-msgstr "Dette kort indeholder ikke et foto."
-
-#: templates/index.php:8
-msgid "Add Contact"
-msgstr "Tilføj kontakt"
-
-#: templates/part.addcardform.php:5
-msgid "Group"
-msgstr "Gruppe"
-
-#: templates/part.addcardform.php:12 templates/part.property.php:3
-msgid "Name"
-msgstr "Navn"
-
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
-msgstr "Ny Kontakt"
-
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresse"
 
-#: templates/part.addpropertyform.php:5
+#: lib/app.php:92 templates/part.addcardform.php:37
 msgid "Telephone"
 msgstr "Telefon"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organisation"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
+#: lib/app.php:106 lib/app.php:113
 msgid "Work"
 msgstr "Arbejde"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
+#: lib/app.php:107 lib/app.php:111
 msgid "Home"
-msgstr "Hjem"
+msgstr "Hjemme"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "SMS"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Telefonsvarer"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Personsøger"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Dette er ikke din kontaktperson."
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr "Dette kort er ikke RFC-kompatibelt."
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr "Dette kort indeholder ikke et foto."
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "Tilføj kontaktperson"
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "Gruppe"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "Navn"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Postboks"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Udvidet"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Vej"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "By"
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Region"
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Postnummer"
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Land"
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
-msgstr "Mobil"
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Ny kontaktperson"
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
-msgstr "SMS"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
-msgstr "Telefonsvarer"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
-msgstr "Fax"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
-msgstr "Video"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
-msgstr "Personsøger"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Rediger"
 
-#: templates/part.details.php:31
+#: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/part.details.php:32
-msgid "Add Property"
-msgstr "Tilføj Egenskab"
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
-msgstr "Redigér"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
 
 
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 90f79622ab2..e2a57581e7f 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 #   <mikkelbjerglarsen@gmail.com>, 2011.
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-14 07:41+0000\n"
-"Last-Translator: mikkel_ilu <mikkelbjerglarsen@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +20,51 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Du vil modtage et link til at nulstille dit kodeord via email."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Forespugt"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Login fejlede!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Brugernavn"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Anmod om nulstilling"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Dit kodeord blev nulstillet"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Nyt kodeord"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Nulstil kodeord"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personlig"
@@ -45,56 +91,52 @@ msgstr "Sky ikke fundet"
 
 #: templates/installation.php:20
 msgid "Create an <strong>admin account</strong>"
-msgstr "Lav en <strong>administrator konto</strong>"
+msgstr "Opret en <strong>administratorkonto</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Brugernavn"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Avanceret"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Datamappe"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "vil blive brugt"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
-msgstr "Database-bruger"
+msgstr "Databasebruger"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
-msgstr "Database-kodeord"
+msgstr "Databasekodeord"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
-msgstr "Database-navn"
+msgstr "Navn på database"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Avanceret"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
-msgstr "Database host"
+msgstr "Databasehost"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Data mappe"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
-msgstr "Afslut installation"
+msgstr "Afslut opsætning"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "giver dig frihed og kontrol over dine egne data"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -104,37 +146,21 @@ msgstr "Log ud"
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Mistet dit kodeord?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "husk"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr "Du er nu logget ud"
-
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Du vil modtage et link til at nulstille din adgangskode via e-mail."
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Anmodet"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Login mislykkedes!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Brugernavn eller E-mail"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Anmod om nulstilling"
+msgstr "Du er nu logget ud."
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -144,16 +170,4 @@ msgstr "forrige"
 msgid "next"
 msgstr "næste"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Din adgangskode blev nulstillet"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "Ny adgangskode"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Nulstil adgangskode"
-
 
diff --git a/l10n/da/files.po b/l10n/da/files.po
index ac9da46eefa..af2561b7e24 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +19,36 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Der er ingen fejl, filen blev uploadet med success"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
+"Den uploadede fil overskrider upload_max_filesize direktivet i php.ini"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret "
+"i HTML-formularen"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Den uploadede file blev kun delvist uploadet"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Ingen fil blev uploadet"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Mangler en midlertidig mappe"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Filer"
 
@@ -52,48 +56,60 @@ msgstr "Filer"
 msgid "Maximum upload size"
 msgstr "Maksimal upload-størrelse"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Upload"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Ny Mappe"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Her er tomt. Upload noget!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Navn"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Størrelse"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Ændret"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Upload for stor"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
-"Filerne du prøver at uploade er større end den maksimale størrelse for fil-"
-"upload på denne server."
+"Filerne, du prøver at uploade, er større end den maksimale størrelse for "
+"fil-upload på denne server."
 
 
diff --git a/l10n/da/media.po b/l10n/da/media.po
index 7c12df9653a..b73d59a6cfd 100644
--- a/l10n/da/media.po
+++ b/l10n/da/media.po
@@ -2,14 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-20 05:08+0200\n"
-"PO-Revision-Date: 2011-08-20 03:08+0000\n"
-"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,39 +19,35 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Musik"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
-msgstr ""
+msgstr "Afspil"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Pause"
 
 #: templates/music.php:5
 msgid "Previous"
-msgstr ""
+msgstr "Forrige"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
-msgstr ""
+msgstr "Næste"
 
 #: templates/music.php:7
 msgid "Mute"
-msgstr ""
+msgstr "Lydløs"
 
 #: templates/music.php:8
 msgid "Unmute"
-msgstr ""
-
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Sange skannet"
+msgstr "Lyd til"
 
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Genskan Samling"
 
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 7921a74708a..ee508eab264 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -2,14 +2,17 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+#   <mikkelbjerglarsen@gmail.com>, 2011.
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-28 01:11+0200\n"
-"PO-Revision-Date: 2011-08-26 13:49+0000\n"
-"Last-Translator: pascal_a <pascal@dhermilly.dk>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +20,26 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Godkendelsesfejl"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID ændret"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Ugyldig forespørgsel"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID ændret"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Sprog ændret"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Tilføj dit program"
@@ -53,15 +60,15 @@ msgstr "af"
 msgid "Ask a question"
 msgstr "Stil et spørgsmål"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
-msgstr "Problemer med at forbinde til hjælpe-databasen"
+msgstr "Problemer med at forbinde til hjælpe-databasen."
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "GÃ¥ derhen manuelt."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Svar"
 
@@ -77,6 +84,10 @@ msgstr "af det tilgængelige"
 msgid "Your password got changed"
 msgstr "Din adgangskode er blevet ændret"
 
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "Ude af stand til at ændre dit kodeord"
+
 #: templates/personal.php:15
 msgid "Current password"
 msgstr "Nuværende adgangskode"
@@ -91,37 +102,53 @@ msgstr "vis"
 
 #: templates/personal.php:18
 msgid "Change password"
-msgstr "Skift password"
+msgstr "Skift kodeord"
 
 #: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Sprog"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Hjælp med at oversætte"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:36
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "benyt denne adresse til at forbinde til din ownCloud i din filbrowser"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Navn"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Ny"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Slet"
 
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 75f737b0135..a85b6c5f1e4 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <georg.stefan.germany@googlemail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+# Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:11+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,164 +20,223 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Dies ist nicht dein Adressbuch."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
-
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
+msgstr "Kontakt konnte nicht gefunden werden."
 
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "vCard konnte nicht gelesen werden."
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
+"Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite."
 
-#: photo.php:53
-msgid "This card is not RFC compatible."
-msgstr ""
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Adresse"
 
-#: photo.php:90
-msgid "This card does not contain a photo."
-msgstr ""
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefon"
 
-#: templates/index.php:8
-msgid "Add Contact"
-msgstr ""
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "Email"
 
-#: templates/part.addcardform.php:5
-msgid "Group"
-msgstr ""
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organisation"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
-msgid "Name"
-msgstr ""
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Arbeit"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
-msgstr ""
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Zuhause"
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
-msgstr ""
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mobil"
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: lib/app.php:114
+msgid "Text"
+msgstr "Text"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Anruf"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Pager"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Dies ist nicht dein Kontakt."
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr "Diese Karte ist nicht RFC-kompatibel."
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr "Diese Karte enthält kein Foto."
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "Kontakt hinzufügen"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "Gruppe"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "Name"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
 msgid "PO Box"
-msgstr ""
+msgstr "Postfach"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
 msgid "Extended"
-msgstr ""
+msgstr "Erweitert"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
 msgid "Street"
-msgstr ""
+msgstr "Straße"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
 msgid "City"
-msgstr ""
+msgstr "Stadt"
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
 msgid "Region"
-msgstr ""
+msgstr "Region"
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
 msgid "Zipcode"
-msgstr ""
+msgstr "Postleitzahl"
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
 msgid "Country"
+msgstr "Land"
+
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Kontakt erstellen"
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
-msgstr "Mobil"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
-msgstr "Text"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
-msgstr "Fax"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Bearbeiten"
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
-msgstr "Video"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Löschen"
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
-msgstr "Pager"
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
 
 #: templates/part.details.php:33
-msgid "Delete"
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: templates/part.property.php:29
-msgid "Phone"
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
-msgstr "Bearbeiten"
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
 
 
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 893b8acc4a7..26675dbd954 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <admin@s-goecker.de>, 2011.
 #   <alex.hotz@gmail.com>, 2011.
 #   <georg.stefan.germany@googlemail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-07 22:59+0000\n"
-"Last-Translator: infinity8 <alex.hotz@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +21,51 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Angefragt"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Login fehlgeschlagen!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Nutzername"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Anfrage zurückgesetzt"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Ihr Passwort wurde zurückgesetzt."
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Neues Passwort"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Passwort zurücksetzen"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Persönlich"
@@ -48,54 +94,50 @@ msgstr "Cloud nicht verfügbar"
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Admin-Konto</strong> anlegen"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Nutzername"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Erweitert"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Datenverzeichnis"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "wird genutzt"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Datenbanknutzer"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Datenbankpasswort"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Datenbankname"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Erweitert"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Datenverzeichnis"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "gibt dir Freiheit und Kontrolle über deine eigenen Daten"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -105,39 +147,22 @@ msgstr "Abmelden"
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "merken"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Abgemeldet"
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr ""
-"Du wirst per Email einen Link zum Zurücksetzen deines Passworts erhalten."
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "zurückgesetzt"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Anmeldung fehlgeschlagen!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Nutzername oder Email"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Zurücksetzen"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "Zurück"
@@ -146,16 +171,4 @@ msgstr "Zurück"
 msgid "next"
 msgstr "Weiter"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Dein Passwort wurde zurückgesetzt."
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "Neues Passwort"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Zurücksetzen"
-
 
diff --git a/l10n/de/files.po b/l10n/de/files.po
index b0d31fb286c..97a3d576211 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+# Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +19,33 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Datei hochgeladen."
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Die hochgeladene Datei ist zu groß."
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Die hochgeladene Datei ist zu groß."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Die Datei wurde nur teilweise hochgeladen."
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Es wurde keine Datei hochgeladen."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Temporärer Ordner fehlt."
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Dateien"
 
@@ -52,43 +53,55 @@ msgstr "Dateien"
 msgid "Maximum upload size"
 msgstr "Maximale Größe"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Hochladen"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Neuer Ordner"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Lad’ was hoch!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Name"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Größe"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Bearbeitet"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Upload zu groß"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/de/media.po b/l10n/de/media.po
index 437d50939d7..6e4584a979d 100644
--- a/l10n/de/media.po
+++ b/l10n/de/media.po
@@ -2,14 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+#   <admin@s-goecker.de>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-20 05:08+0200\n"
-"PO-Revision-Date: 2011-08-20 03:08+0000\n"
-"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +19,37 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Musik"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
-msgstr ""
+msgstr "Abspielen"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Pause"
 
 #: templates/music.php:5
 msgid "Previous"
-msgstr ""
+msgstr "Vorheriges"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
-msgstr ""
+msgstr "Nächstes"
 
 #: templates/music.php:7
 msgid "Mute"
-msgstr ""
+msgstr "Ton aus"
 
 #: templates/music.php:8
 msgid "Unmute"
-msgstr ""
-
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Lieder gescannt"
+msgstr "Ton an"
 
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
-msgstr "Sammlung scannen"
+msgstr "Sammlung noch einmal scannen"
 
 #: templates/music.php:37
 msgid "Artist"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 2998d93e0f7..33f745e2687 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -2,14 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+#   <admin@s-goecker.de>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-28 01:13+0200\n"
-"PO-Revision-Date: 2011-08-27 23:13+0000\n"
-"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +19,26 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Berechtigungsfehler"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID geändert"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Ungültige Anfrage"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID geändert"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Sprache geändert"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Eigene Anwendung hinzufügen"
@@ -53,15 +59,15 @@ msgstr "von"
 msgid "Ask a question"
 msgstr "Stell eine Frage"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Probleme bei der Verbindung zur Hilfe-Datenbank."
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Datenbank direkt besuchen."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Antwort"
 
@@ -79,7 +85,7 @@ msgstr "Dein Passwort wurde geändert"
 
 #: templates/personal.php:14
 msgid "Unable to change your password"
-msgstr ""
+msgstr "Passwort konnte nicht geändert werden"
 
 #: templates/personal.php:15
 msgid "Current password"
@@ -98,36 +104,52 @@ msgid "Change password"
 msgstr "Passwort ändern"
 
 #: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Hilf bei der Ãœbersetzung"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:36
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "benutze diese Adresse, um deine ownCloud mit deinem Dateiverwalter zu "
 "verbinden"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Name"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Anlegen"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Löschen"
 
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index bdd775c8ba2..ab36ccdfd3e 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <christosvas@in.gr>, 2011.
+# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:11+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +19,224 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Αυτό δεν είναι βιβλίο διευθ�νσεων σας."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "Η επαφή δεν μπ�ό�εσε να β�εθεί."
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "Η vCard δεν μπο�εί να διαβαστεί."
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
+"Οι πλη�οφο�ίες σχετικά με vCard είναι εσφαλμένες. Πα�ακαλώ επαναφο�τώστε τη "
+"σελίδα."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Διε�θυνση"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Τηλέφωνο"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "Email"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Ο�γανισμός"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Ε�γασία"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Σπίτι"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Κινητό"
 
-#: photo.php:53
+#: lib/app.php:114
+msgid "Text"
+msgstr "Κείμενο"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Φωνή"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Φαξ"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Βίντεο"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Βομβητής"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Αυτή δεν είναι επαφή σας."
+
+#: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Αυτή η κά�τα δεν είναι RFC συμβατή."
 
-#: photo.php:90
+#: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Αυτή η κά�τα δεν πε�ιέχει φωτογ�αφία."
 
-#: templates/index.php:8
+#: templates/index.php:13
 msgid "Add Contact"
+msgstr "Π�οσθήκη επαφής"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addcardform.php:5
+#: templates/part.addcardform.php:8
 msgid "Group"
-msgstr ""
+msgstr "Ομάδα"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
+#: templates/part.addcardform.php:19
 msgid "Name"
-msgstr ""
+msgstr "Όνομα"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Ταχ. Θυ�ίδα"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Εκτεταμένη"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
-msgstr ""
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Οδός"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
-msgstr ""
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Πόλη"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
-msgstr ""
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Πε�ιοχή"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
-msgid "PO Box"
-msgstr ""
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Τ.Κ."
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
-msgid "Extended"
-msgstr ""
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Χώ�α"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
-msgid "Street"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Δημιου�γία επαφής"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
-msgid "City"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
-msgid "Region"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
-msgid "Zipcode"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
-msgid "Country"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Επεξε�γασία"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Διαγ�αφή"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.details.php:33
+msgid "Add"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.editaddressbook.php:29
+msgid "Save"
 msgstr ""
 
-#: templates/part.details.php:33
-msgid "Delete"
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
+msgstr "Γενέθλια"
+
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Τηλέφωνο"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/el/core.po b/l10n/el/core.po
index f7d9f565555..bf36969732a 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-07 09:13+0000\n"
-"Last-Translator: multipetros <petros.kyladitis@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,53 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+"Θα λάβετε ένα σ�νδεσμο για να επαναφέ�ετε τον κωδικό π�όσβασής σας μέσω "
+"ηλεκτ�ονικο� ταχυδ�ομείου."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Ζητήθησαν"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Η σ�νδεση απέτυχε!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Όνομα Χ�ήστη"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Επαναφο�ά αίτησης"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Ο κωδικός π�όσβασής σας επαναφέ�θηκε"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "�έος κωδικός"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Επαναφο�ά κωδικο� π�όσβασης"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Π�οσωπικά"
@@ -47,54 +94,50 @@ msgstr "Δεν β�έθηκε σ�ννεφο"
 msgid "Create an <strong>admin account</strong>"
 msgstr "Δημιου�γήστε έναν <strong>λογα�ιασμό διαχει�ιστή</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Όνομα Χ�ήστη"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Κωδικός"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Για π�οχω�ημένους"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Φάκελος δεδομένων"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Διαμό�φωση της βάσης δεδομένων"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "θα χ�ησιμοποιηθο�ν"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Χ�ήστης της βάσης δεδομένων"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Κωδικός π�όσβασης βάσης δεδομένων"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Όνομα βάσης δεδομένων"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Για π�οχω�ημένους"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Διακομιστής βάσης δεδομένων"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Φάκελος δεδομένων"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Ολοκλή�ωση εγκατάστασης"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "σας δίνει την ελευθε�ία και τον έλεγχο επί των δικών σας δεδομένων"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -104,40 +147,22 @@ msgstr "Αποσ�νδεση"
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Ξεχάσατε τον κωδικό σας;"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "να με θυμάσαι"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Έχετε αποσυνδεθεί."
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr ""
-"Θα λάβετε ένα σ�νδεσμο για να επαναφέ�ετε τον κωδικό π�όσβασής σας, μέσω "
-"ηλεκτ�ονικο� ταχυδ�ομείου."
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Αιτήθησαν"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Η σ�νδεση απέτυχε!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Όνομα Χ�ήστη ή Email"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Επαναφο�άς αίτησης"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "π�οηγο�μενο"
@@ -146,16 +171,4 @@ msgstr "π�οηγο�μενο"
 msgid "next"
 msgstr "επόμενο"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Έγινε επαναφο�ά του κωδικο� π�όσβασής σας"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "�έος κωδικός"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Επαναφο�ά κωδικο� π�όσβασης"
-
 
diff --git a/l10n/el/files.po b/l10n/el/files.po
index da78a25356e..5f2920a2114 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,37 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Δεν υπά�χει λάθος, το α�χείο που μεταφο�τώθηκε επιτυχώς"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
+"Το α�χείο που μεταφο�τώθηκε υπε�βαίνει την οδηγία μέγιστου επιτ�επτο� "
+"μεγέθους \"upload_max_filesize\" του php.ini"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"Το α�χείο υπε�βαίνει την οδηγία μέγιστου επιτ�επτο� μεγέθους "
+"\"MAX_FILE_SIZE\" που έχει ο�ιστεί στην html φό�μα"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Το α�χείο μεταφο�ώθηκε μόνο εν μέ�ει"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Το α�χείο δεν μεταφο�τώθηκε"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Λείπει ένας π�οσω�ινός φάκελος"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Α�χεία"
 
@@ -52,43 +56,55 @@ msgstr "Α�χεία"
 msgid "Maximum upload size"
 msgstr "Μέγιστο μέγεθος μεταφό�τωσης"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Μεταφό�τωση"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "�έος φάκελος"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Δεν υπά�χει τίποτα εδώ. Ανέβασε κάτι!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Όνομα"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Τ�οποποιήθηκε"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Διαγ�αφή"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Πολ� μεγάλο το α�χείο π�ος μεταφό�τωση"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/el/media.po b/l10n/el/media.po
index c5bd96407cb..cb05fad3c96 100644
--- a/l10n/el/media.po
+++ b/l10n/el/media.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Petros Kyladitis <petros.kyladitis@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-23 11:09+0200\n"
-"PO-Revision-Date: 2011-08-21 22:51+0000\n"
-"Last-Translator: multipetros <petros.kyladitis@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,15 +18,15 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Μουσική"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "Αναπα�αγωγή"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Πα�ση"
 
@@ -33,7 +34,7 @@ msgstr "Πα�ση"
 msgid "Previous"
 msgstr "Π�οηγο�μενο"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "Επόμενο"
 
@@ -45,11 +46,7 @@ msgstr "Σίγαση"
 msgid "Unmute"
 msgstr "Επαναφο�ά ήχου"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Σα�ωμένα τ�αγο�για"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Επανασά�ωση συλλογής"
 
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 03240ac6c73..ea32c35f4fd 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -2,15 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 #   <petros.kyladitis@gmail.com>, 2011.
 # Petros Kyladitis <petros.kyladitis@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-28 01:13+0200\n"
-"PO-Revision-Date: 2011-08-27 23:13+0000\n"
-"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,25 +19,29 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Σφάλμα ταυτοποίησης"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "Το OpenID άλλαξε"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Άκυ�α αίτημα"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "Το OpenID άλλαξε"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Η γλώσσα άλλαξε"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
-msgstr ""
+msgstr "Π�οσθέστε την δική σας εφα�μογή"
 
 #: templates/apps.php:21
 msgid "Select an App"
@@ -54,15 +59,15 @@ msgstr "με"
 msgid "Ask a question"
 msgstr "Κάντε μια ε�ώτηση"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Π�οβλήματα κατά τη σ�νδεση με τη βάση δεδομένων βοήθειας."
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Χει�οκίνητη μετάβαση."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Απάντηση"
 
@@ -80,7 +85,7 @@ msgstr "Ο κωδικός π�όσβασής σας άλαλαξε"
 
 #: templates/personal.php:14
 msgid "Unable to change your password"
-msgstr ""
+msgstr "Δεν ήταν δυνατή η αλλαγή του κωδικο� π�όσβασης"
 
 #: templates/personal.php:15
 msgid "Current password"
@@ -99,36 +104,52 @@ msgid "Change password"
 msgstr "Αλλαγή κωδικο� π�όσβασης"
 
 #: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Βοηθήστε στη μετάφ�αση"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:36
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "χ�ησιμοποιήστε αυτή τη διε�θυνση για να συνδεθείτε στο ownCloud σας από το "
 "διαχει�ιστή α�χείων σας"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Όνομα"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Κωδικός"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Ομάδες"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Δημιου�γία"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Διαγ�αφή"
 
diff --git a/l10n/eo/calendar.po b/l10n/eo/calendar.po
new file mode 100644
index 00000000000..a3701a03348
--- /dev/null
+++ b/l10n/eo/calendar.po
@@ -0,0 +1,637 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <mstreet@kde.org.ar>, 2011, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-07 18:29+0100\n"
+"PO-Revision-Date: 2012-01-08 08:41+0000\n"
+"Last-Translator: mctpyt <mstreet@kde.org.ar>\n"
+"Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/team/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr "Nova horzono:"
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr "La horozono estas �an�ita"
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr "Nevalida peto"
+
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr "Kalendaro"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Mal�usta kalendaro"
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr "Naski�otago"
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr "Negoco"
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr "Voko"
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr "Klientoj"
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr "Livero"
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr "Ferioj"
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr "Ideoj"
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr "Voja�o"
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr "Jubileo"
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr "Rendevuo"
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr "Alia"
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr "Persona"
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr "Projektoj"
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr "Demandoj"
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr "Laboro"
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr "Ĉi tio ne ripeti�as"
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr "Tage"
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr "Semajne"
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr "Tage"
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr "Semajnduope"
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr "Monate"
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr "Jare"
+
+#: lib/object.php:366
+msgid "never"
+msgstr "neniam"
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr "laÅ­ aperoj"
+
+#: lib/object.php:368
+msgid "by date"
+msgstr "laÅ­ dato"
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr "laÅ­ monattago"
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr "laÅ­ semajntago"
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr "lundo"
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr "mardo"
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr "merkredo"
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr "ĵaŭdo"
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr "vendredo"
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr "sabato"
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr "dimanĉo"
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr "la monatsemajno de la okazaĵo"
+
+#: lib/object.php:397
+msgid "first"
+msgstr "unua"
+
+#: lib/object.php:398
+msgid "second"
+msgstr "dua"
+
+#: lib/object.php:399
+msgid "third"
+msgstr "tria"
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr "kvara"
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr "kvina"
+
+#: lib/object.php:402
+msgid "last"
+msgstr "lasta"
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr "Januaro"
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr "Februaro"
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr "Marto"
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr "Aprilo"
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr "Majo"
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr "Junio"
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr "Julio"
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr "AÅ­gusto"
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr "Septembro"
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr "Oktobro"
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr "Novembro"
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr "Decembro"
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr "laŭ okazaĵdato"
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr "laÅ­ jartago(j)"
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr "laÅ­ semajnnumero(j)"
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr "laÅ­ tago kaj monato"
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Ĉi tio ne estas tabeltipa"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr "Dato"
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr "Kal."
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "La tuta tago"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Mankas iuj kampoj"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Titolo"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "ekde la dato"
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "ekde la horo"
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "�is la dato"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "�is la horo"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "La okazaĵo finas antaŭ komenci"
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Datumbaza malsukceso okazis"
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr "Semajno"
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr "Monato"
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr "Listo"
+
+#: templates/calendar.php:45
+msgid "Today"
+msgstr "HodiaÅ­"
+
+#: templates/calendar.php:46
+msgid "Calendars"
+msgstr "Kalendaroj"
+
+#: templates/calendar.php:64
+msgid "There was a fail, while parsing the file."
+msgstr "Malsukceso okazis dum analizo de la dosiero."
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr "Elektu aktivajn kalendarojn"
+
+#: templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Nova kalendaro"
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr "CalDav-a ligilo"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr "El�uti"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr "Redakti"
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "Forigi"
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr "Nova kalendaro"
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr "Redakti la kalendaron"
+
+#: templates/part.editcalendar.php:12 templates/part.import.php:29
+msgid "Displayname"
+msgstr "Montrota nomo"
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr "Aktiva"
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr "Kalendarokoloro"
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "Konservi"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "Sendi"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr "Nuligi"
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr "Redakti okazaĵon"
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Elporti"
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr "Okazaĵotitolo"
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr "Kategorio"
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr "Elekti kategorion"
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr "La tuta tago"
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr "Ekde"
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr "Äœis"
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Altnivela agordo"
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr "Ripeti"
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr "Altnivelo"
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr "Elekti semajntagojn"
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr "Elekti tagojn"
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr "kaj la jartago de la okazaĵo."
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr "kaj la monattago de la okazaĵo."
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr "Elekti monatojn"
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr "Elekti semajnojn"
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr "kaj la jarsemajno de la okazaĵo."
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr "Intervalo"
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr "Fino"
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr "aperoj"
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Loko"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Okazaĵoloko"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Priskribo"
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr "Okazaĵopriskribo"
+
+#: templates/part.import.php:1
+msgid "Import Ical File"
+msgstr "Enporti Ical-dosieron"
+
+#: templates/part.import.php:4
+msgid "How to import the new calendar?"
+msgstr "Kiel enporti la novan kalendaron?"
+
+#: templates/part.import.php:6
+msgid "Import into an existing calendar"
+msgstr "Enporti en estantan kalendaron"
+
+#: templates/part.import.php:7
+msgid "Import into a new calendar"
+msgstr "Enporti en novan kalendaron"
+
+#: templates/part.import.php:10
+msgid "Please choose the calendar"
+msgstr "Bonvolu elekti kalendaron"
+
+#: templates/part.import.php:20 templates/part.import.php:37
+msgid "Import"
+msgstr "Enporti"
+
+#: templates/part.import.php:22 templates/part.import.php:39
+msgid "Back"
+msgstr "AntaÅ­eniri"
+
+#: templates/part.import.php:25
+msgid "Please fill out the form"
+msgstr "Bonvolu plenigi la formularon"
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr "Krei okazaĵon"
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr "Horozono"
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr "Ĉiam kontroli ĉu la horzono �an�i�is"
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Tempoformo"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Adreso de kalendarosinkronigo per CalDAV:"
+
+
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
new file mode 100644
index 00000000000..7ab063d4d8f
--- /dev/null
+++ b/l10n/eo/contacts.po
@@ -0,0 +1,239 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <mstreet@kde.org.ar>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/team/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: lib/app.php:42
+msgid "This is not your addressbook."
+msgstr "Ĉi tiu ne estas via adresaro."
+
+#: lib/app.php:51 photo.php:34
+msgid "Contact could not be found."
+msgstr "Ne eblis trovi la kontakton."
+
+#: lib/app.php:65
+msgid "vCard could not be read."
+msgstr "Ne eblis legi vCard-on."
+
+#: lib/app.php:79
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr "Informo pri vCard estas mal�usta. Bonvolu re�argi la pa�on."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Adreso"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefono"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "Retpo�tadreso"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organizaĵo"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Laboro"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Hejmo"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Po�telefono"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Teksto"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Voĉo"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fakso"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Videaĵo"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Televokilo"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Tiu ĉi ne estas via kontakto."
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr "Ĉi tiu karto ne kongruas kun RFC."
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr "Ĉi tiu karto ne havas foton."
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "Aldoni kontakton"
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "Grupo"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "Nomo"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Abonkesto"
+
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Etendita"
+
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Strato"
+
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Urbo"
+
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Regiono"
+
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Po�tokodo"
+
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Lando"
+
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Krei kontakton"
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Redakti"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Forigi"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr "Naski�otago"
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr "Telefono"
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
+
+
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
new file mode 100644
index 00000000000..af35e74b74e
--- /dev/null
+++ b/l10n/eo/core.po
@@ -0,0 +1,171 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <mstreet@kde.org.ar>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/team/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Vi ricevos ligilon retpo�te por rekomencigi vian pasvorton."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Petita"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Ensaluto malsukcesis!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Uzantonomo"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Peti rekomencigon"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Via pasvorto rekomencis"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Nova pasvorto"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Rekomenci la pasvorton"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "Persona"
+
+#: strings.php:6
+msgid "Users"
+msgstr "Uzantoj"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "Aplikaĵoj"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "Administranto"
+
+#: strings.php:9
+msgid "Help"
+msgstr "Helpo"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "La nubo ne estas trovita"
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr "Krei <strong>administran konton</strong>"
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr "Pasvorto"
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Porsperta"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Datuma dosierujo"
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr "Agordi la datumbazon"
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr "estos uzata"
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr "Datumbaza uzanto"
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr "Datumbaza pasvorto"
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr "Datumbaza nomo"
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr "Datumbaza gastigo"
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr "Fini la instalon"
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr "Elsaluti"
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr "Agordo"
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr "Ĉu vi perdis vian pasvorton?"
+
+#: templates/login.php:15
+msgid "remember"
+msgstr "memori"
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "Vi elsalutis."
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "maljena"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "jena"
+
+
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
new file mode 100644
index 00000000000..9bfe7d92ab3
--- /dev/null
+++ b/l10n/eo/files.po
@@ -0,0 +1,113 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <mstreet@kde.org.ar>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/team/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr "Ne estas eraro, la dosiero al�uti�is sukcese"
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr "La dosiero al�utita superas la regulon upload_max_filesize el php.ini"
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+"La dosiero al�utita superas laregulon MAX_FILE_SIZE, kiu estas difinita en "
+"la HTML-formularo"
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr "La al�utita dosiero nur parte al�uti�is"
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr "Neniu dosiero estas al�utita"
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr "Mankas tempa dosierujo"
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr "Dosieroj"
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr "Maksimuma al�utogrando"
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr "Al�uti"
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr "Nenio estas ĉi tie. Al�utu ion!"
+
+#: templates/index.php:43
+msgid "Name"
+msgstr "Nomo"
+
+#: templates/index.php:45
+msgid "Download"
+msgstr "El�uti"
+
+#: templates/index.php:49
+msgid "Size"
+msgstr "Grando"
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr "Modifita"
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr "Forigi"
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr "El�uto tro lar�a"
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+"La dosieroj, kiujn vi provas al�uti, transpasas la maksimuman grandon por "
+"dosieral�utoj en ĉi tiu servilo."
+
+
diff --git a/l10n/eo/media.po b/l10n/eo/media.po
new file mode 100644
index 00000000000..c7eeddac865
--- /dev/null
+++ b/l10n/eo/media.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <mstreet@kde.org.ar>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/team/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:32
+msgid "Music"
+msgstr "Muziko"
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr "Ludi"
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr "PaÅ­zi"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr "Maljena"
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr "Jena"
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr "Silentigi"
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr "Malsilentigi"
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr "Reskani la aron"
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr "Verkinto"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "Albumo"
+
+#: templates/music.php:39
+msgid "Title"
+msgstr "Titolo"
+
+
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
new file mode 100644
index 00000000000..d99fbc60bd9
--- /dev/null
+++ b/l10n/eo/settings.po
@@ -0,0 +1,154 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <mstreet@kde.org.ar>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/team/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr "Nevalida peto"
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "La agordo de OpenID estas �an�ita"
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr "La lingvo estas �an�ita"
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr "Aldonu vian aplikaĵon"
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr "Elekti aplikaĵon"
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr "-permesila"
+
+#: templates/apps.php:23
+msgid "by"
+msgstr "de"
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr "Faru demandon"
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr "Problemoj okazis dum konektado al la helpa datumbazo."
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr "Iri tien mane."
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr "Respondi"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr "Vi uzas"
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr "el la disponeblaj"
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr "Via pasvorto �an�i�is"
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "Ne eblis �an�i vian pasvorton"
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr "Nuna pasvorto"
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr "Nova pasvorto"
+
+#: templates/personal.php:17
+msgid "show"
+msgstr "montri"
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr "Ŝan�i la pasvorton"
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr "Lingvo"
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+"uzu ĉi tiun adreson por konekti�i al via ownCloud per via dosieradministrilo"
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr "Nomo"
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr "Pasvorto"
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr "Grupoj"
+
+#: templates/users.php:23
+msgid "Create"
+msgstr "Krei"
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr "Forigi"
+
+
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index 08f4ae29109..0591daf015a 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <juanma@kde.org.ar>, 2011.
+#   <sergioballesterossolanas@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:11+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +19,224 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Esta no es tu agenda de contactos."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "No se pudo encontrar el contacto."
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "No se pudo leer el vCard."
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
+"La información sobre el vCard es incorrecta. Por favor vuelve a cargar la "
+"página."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Dirección"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Teléfono"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "Correo electrónico"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organización"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Trabajo"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Particular"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Móvil"
 
-#: photo.php:53
+#: lib/app.php:114
+msgid "Text"
+msgstr "Texto"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Voz"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Localizador"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Este no es tu contacto."
+
+#: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Esta tarjeta no es compatible con RFC."
 
-#: photo.php:90
+#: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Esta tarjeta no contiene ninguna foto."
 
-#: templates/index.php:8
+#: templates/index.php:13
 msgid "Add Contact"
+msgstr "Agregar contacto"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addcardform.php:5
+#: templates/part.addcardform.php:8
 msgid "Group"
-msgstr ""
+msgstr "Grupo"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
+#: templates/part.addcardform.php:19
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Código postal"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Extendido"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
-msgstr ""
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Calle"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
-msgstr ""
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Ciudad"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
-msgstr ""
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Región"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
-msgid "PO Box"
-msgstr ""
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Código Postal"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
-msgid "Extended"
-msgstr ""
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "País"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
-msgid "Street"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Crear contacto"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
-msgid "City"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
-msgid "Region"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
-msgid "Zipcode"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
-msgid "Country"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Borrar"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.details.php:33
+msgid "Add"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.editaddressbook.php:29
+msgid "Save"
 msgstr ""
 
-#: templates/part.details.php:33
-msgid "Delete"
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
+msgstr "Cumpleaños"
+
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Teléfono"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 2fe3fcaa783..40f9f0ab4e8 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <juanma@kde.org.ar>, 2011.
 #   <rom1dep@gmail.com>, 2011.
 #   <sergioballesterossolanas@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-04 17:01+0000\n"
-"Last-Translator: xsergiolpx <sergioballesterossolanas@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +20,52 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+"Recibirás un enlace por correo electrónico para restablecer tu contraseña"
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Pedido"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "¡Fallo al iniciar sesión!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Solicitar restablecimiento"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Tu contraseña se ha restablecido"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Nueva contraseña"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Restablecer contraseña"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personal"
@@ -47,54 +94,50 @@ msgstr "No se encontró la nube"
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea una <strong>cuenta de administrador</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Nombre de usuario"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Directorio de almacenamiento"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "serán utilizados"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Contraseña de la base de datos"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Host de la base de datos"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Directorio de almacenamiento"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "te da la libertad y el control sobre tus propios datos"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -104,38 +147,22 @@ msgstr "Salir"
 msgid "Settings"
 msgstr "Ajustes"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "¿Has perdido tu contraseña?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "recuérdame"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Has cerrado sesión."
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Recibirás un link para restablecer tu contraseña vía Email."
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Solicitado"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "¡No se pudo iniciar sesión!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Nombre de usuario o Email"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Solicitar restablecimiento"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
@@ -144,16 +171,4 @@ msgstr "anterior"
 msgid "next"
 msgstr "siguiente"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Tu contraseña se ha restablecido"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "Nueva contraseña"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Restablecer contraseña"
-
 
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 2c2bed5cdc4..0349f481b1d 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,37 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "No hubo ningún error, el archivo se subió con éxito"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
+"El archivo que intentas subir sobrepasa el tamaño definido por la variable "
+"upload_max_filesize en php.ini"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"El archivo que intentas subir sobrepasa el tamaño definido por la variable "
+"MAX_FILE_SIZE especificada en el formulario HTML"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "El archivo que intentas subir solo se subió parcialmente"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "No se subió ningún archivo"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Falta un directorio temporal"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Archivos"
 
@@ -52,43 +56,55 @@ msgstr "Archivos"
 msgid "Maximum upload size"
 msgstr "Tamaño máximo de subida"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Subir"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Crear Carpeta"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Aquí no hay nada. ¡Sube algo!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Nombre"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Tamaño"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Modificado"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Eliminado"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "El archivo es demasiado grande"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/es/media.po b/l10n/es/media.po
index 3a159198a26..e03322be6ae 100644
--- a/l10n/es/media.po
+++ b/l10n/es/media.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 #   <sergioballesterossolanas@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-23 11:09+0200\n"
-"PO-Revision-Date: 2011-08-21 22:27+0000\n"
-"Last-Translator: xsergiolpx <sergioballesterossolanas@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,15 +18,15 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Música"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "Reproducir"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Pausa"
 
@@ -33,7 +34,7 @@ msgstr "Pausa"
 msgid "Previous"
 msgstr "Anterior"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "Siguiente"
 
@@ -45,11 +46,7 @@ msgstr "Silenciar"
 msgid "Unmute"
 msgstr "Sonar"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Canciones encontradas"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Buscar música nueva"
 
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 27e14d97249..9be0c001e36 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -2,15 +2,18 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
-#   <sergioballesterossolanas@gmail.com>, 2011.
+# Translators:
+#   <juanma@kde.org.ar>, 2011.
+#   <monty_2731@hotmail.com>, 2011.
 #   <rom1dep@gmail.com>, 2011.
+#   <sergioballesterossolanas@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-28 01:11+0200\n"
-"PO-Revision-Date: 2011-08-24 23:20+0000\n"
-"Last-Translator: xsergiolpx <sergioballesterossolanas@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +21,26 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Error de autentificación"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID Cambiado"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Solicitud no válida"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID Cambiado"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Idioma cambiado"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Añadir tu aplicación"
@@ -54,15 +61,15 @@ msgstr "por"
 msgid "Ask a question"
 msgstr "Hacer una pregunta"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Problemas al conectar con la base de datos de ayuda."
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Ir manualmente"
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Respuesta"
 
@@ -78,6 +85,10 @@ msgstr "del total disponible de"
 msgid "Your password got changed"
 msgstr "Tu contraseña ha sido cambiada"
 
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "No se pudo cambiar su contraseña"
+
 #: templates/personal.php:15
 msgid "Current password"
 msgstr "Contraseña actual"
@@ -95,35 +106,52 @@ msgid "Change password"
 msgstr "Cambiar contraseña"
 
 #: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Ayuda a traducir"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:36
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
-"usar esta dirección para conectar tu ownCloud en tu explorador de archivos"
+"utiliza esta dirección para conectar a tu ownCloud desde tu explorador de "
+"archivos"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Nombre"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Eliminar"
 
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index 119d01b09f0..b7034000524 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:11+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +18,222 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "See pole sinu aadressiraamat."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "Kontakti ei leitud."
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "Visiitkaardi lugemine ebaõnnestus,"
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
-msgstr ""
+msgstr "Visiitkaardi info pole korrektne. Palun lae leht uuesti."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Aadress"
 
-#: photo.php:53
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "E-post"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organisatsioon"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Töö"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Kodu"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mobiil"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Tekst"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Hääl"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Faks"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Piipar"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "See pole sinu kontakt."
+
+#: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "See kaart ei ühildu RFC-ga."
 
-#: photo.php:90
+#: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Sellel kaardil pole fotot."
 
-#: templates/index.php:8
+#: templates/index.php:13
 msgid "Add Contact"
+msgstr "Lisa kontakt"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addcardform.php:5
+#: templates/part.addcardform.php:8
 msgid "Group"
-msgstr ""
+msgstr "Grupp"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
+#: templates/part.addcardform.php:19
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Postkontori postkast"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Laiendatud"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
-msgstr ""
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Tänav"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
-msgstr ""
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Linn"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
-msgstr ""
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Piirkond"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
-msgid "PO Box"
-msgstr ""
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Postiindeks"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
-msgid "Extended"
-msgstr ""
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Riik"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
-msgid "Street"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Lisa kontakt"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
-msgid "City"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
-msgid "Region"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
-msgid "Zipcode"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
-msgid "Country"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Muuda"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Kustuta"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.details.php:33
+msgid "Add"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.editaddressbook.php:29
+msgid "Save"
 msgstr ""
 
-#: templates/part.details.php:33
-msgid "Delete"
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
+msgstr "Sünnipäev"
+
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 02b3782f220..18831a8a35f 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-05 14:48+0000\n"
-"Last-Translator: Eraser <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,51 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Sinu parooli taastamise link saadetakse sulle e-postile."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Kohustuslik"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Sisselogimine ebaõnnestus!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Kasutajanimi"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Päringu taastamine"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Sinu parool on taastatud"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Uus parool"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Nulli parool"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "isiklik"
@@ -46,54 +91,50 @@ msgstr "Pilve ei leitud"
 msgid "Create an <strong>admin account</strong>"
 msgstr "Loo <strong>admini konto</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Kasutajanimi"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Parool"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Lisavalikud"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Andmete kaust"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Seadista andmebaasi"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "kasutatakse"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Andmebaasi kasutaja"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Andmebaasi parool"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Andmebasi nimi"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Lisavalikud"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Andmebaasi host"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Andmete kaust"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Lõpeta seadistamine"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "Annab sulle vabaduse ja kontrolli sinu enda andmete üle"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -103,39 +144,22 @@ msgstr "Logi välja"
 msgid "Settings"
 msgstr "Seaded"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Kaotasid oma parooli?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "pea meeles"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Sa oled välja loginud"
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr ""
-"Sulle saadetakse e-postile link, millelt sa saad oma parooli taastada."
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Kohustuslik"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Sisselogimine ebaõnnestus"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Kasutajanimi või e-post"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Palu taastamist"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "eelm"
@@ -144,16 +168,4 @@ msgstr "eelm"
 msgid "next"
 msgstr "järgm"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Sinu parool on taastatud"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "Uus parool"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Nulli parool"
-
 
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 92f9fa8d855..49191aa3a92 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,36 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Ühtegi viga pole, fail on üles laetud"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
+"Üles laetud faili suurus ületab php.ini määratud upload_max_filesize suuruse"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"Üles laetud faili suurus ületab HTML vormis määratud upload_max_filesize "
+"suuruse"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Fail laeti üles ainult osaliselt"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Ühtegi faili ei laetud üles"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Ajutiste failide kaust puudub"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Failid"
 
@@ -52,43 +55,55 @@ msgstr "Failid"
 msgid "Maximum upload size"
 msgstr "Maksimaalne üleslaadimise suurus"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Lae üles"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Uus kaust"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Siin pole midagi. Lae midagi üles!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Nimi"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Suurus"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Muudetud"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Kustuta"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Ãœleslaadimine on liiga suur"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/et_EE/media.po b/l10n/et_EE/media.po
index 7d40f8a4ffa..a0e33794bfd 100644
--- a/l10n/et_EE/media.po
+++ b/l10n/et_EE/media.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-05 14:54+0000\n"
-"Last-Translator: Eraser <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Muusika"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "Esita"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Paus"
 
@@ -34,7 +34,7 @@ msgstr "Paus"
 msgid "Previous"
 msgstr "Eelmine"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "Järgmine"
 
@@ -46,11 +46,7 @@ msgstr "Vaikseks"
 msgid "Unmute"
 msgstr "Hääl tagasi"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Skännitud lood"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Skänni kollekttsiooni uuesti"
 
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 3fad92d9479..9de62de218d 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-05 14:59+0000\n"
-"Last-Translator: Eraser <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,26 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Autentimise viga"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID on muudetud"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Vigane päring"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID on muudetud"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Keel on muudetud"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Lisa oma programm"
@@ -54,15 +58,15 @@ msgstr "kelle poolt"
 msgid "Ask a question"
 msgstr "Küsi küsimus"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Probleemid abiinfo andmebaasiga ühendumisel."
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Mine sinna käsitsi."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Vasta"
 
@@ -98,35 +102,51 @@ msgstr "näita"
 msgid "Change password"
 msgstr "Muuda parooli"
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Keel"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Abiinfo tõlkimine"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "kasuta seda aadressi oma ownCloudiga ühendamiseks failihalduriga"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Nimi"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Parool"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Grupid"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Lisa"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Kustuta"
 
diff --git a/l10n/eu/calendar.po b/l10n/eu/calendar.po
new file mode 100644
index 00000000000..93fd3c27f37
--- /dev/null
+++ b/l10n/eu/calendar.po
@@ -0,0 +1,637 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Asier Urio Larrea <asieriko@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-07 18:29+0100\n"
+"PO-Revision-Date: 2012-01-08 08:41+0000\n"
+"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/team/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr "Ordu-zona aldatuta"
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr "Baligabeko eskaera"
+
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr "Egutegia"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Egutegi okerra"
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr "Jaioteguna"
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr "Negozioa"
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr "Deia"
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr "Bezeroak"
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr "Banatzailea"
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr "Oporrak"
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr "Ideiak"
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr "Bidaia"
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr "Urteurrena"
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr "Bilera"
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr "Bestelakoa"
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr "Pertsonala"
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr "Proiektuak"
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr "Galderak"
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr "Lana"
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr "Ez da errepikatzen"
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr "Egunero"
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr "Astero"
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr "Asteko egun guztietan"
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr "Bi-Astero"
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr "Hilabetero"
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr "Urtero"
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Ez da bektore bat"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Egun guztia"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Eremuak faltan"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Izenburua"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Hasierako Data"
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Hasierako Ordua"
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Bukaerako Data"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Bukaerako Ordua"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Gertaera hasi baino lehen bukatzen da"
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Datu baseak huts egin du"
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr "Astea"
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr "Hilabetea"
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr "Zerrenda"
+
+#: templates/calendar.php:45
+msgid "Today"
+msgstr "Gaur"
+
+#: templates/calendar.php:46
+msgid "Calendars"
+msgstr "Egutegiak"
+
+#: templates/calendar.php:64
+msgid "There was a fail, while parsing the file."
+msgstr "Huts bat egon da, fitxategia aztertzen zen bitartea."
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr "Aukeratu egutegi aktiboak"
+
+#: templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Egutegi berria"
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr "CalDav Lotura"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr "Deskargatu"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr "Editatu"
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr "Egutegi berria"
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr "Editatu egutegia"
+
+#: templates/part.editcalendar.php:12 templates/part.import.php:29
+msgid "Displayname"
+msgstr "Bistaratzeko izena"
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr "Aktiboa"
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr "Egutegiaren kolorea"
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "Gorde"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "Bidali"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr "Ezeztatu"
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr "Editatu gertaera"
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Exportatu"
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr "Gertaeraren izenburua"
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr "Kategoria"
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr "Aukeratu kategoria"
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr "Egun osoko gertaera"
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr "Hasiera"
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr "Bukaera"
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Aukera aurreratuak"
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr "Errepikatu"
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Kokalekua"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Gertaeraren kokalekua"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Deskribapena"
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr "Gertaeraren deskribapena"
+
+#: templates/part.import.php:1
+msgid "Import Ical File"
+msgstr "inportatu ical fitxategia"
+
+#: templates/part.import.php:4
+msgid "How to import the new calendar?"
+msgstr "Nola inportatu egutegi berria?"
+
+#: templates/part.import.php:6
+msgid "Import into an existing calendar"
+msgstr "inportatu existitzen den egutegi batera"
+
+#: templates/part.import.php:7
+msgid "Import into a new calendar"
+msgstr "inportatu egutegi berri batera"
+
+#: templates/part.import.php:10
+msgid "Please choose the calendar"
+msgstr "Mesedez aukeratu egutegia"
+
+#: templates/part.import.php:20 templates/part.import.php:37
+msgid "Import"
+msgstr "Importatu"
+
+#: templates/part.import.php:22 templates/part.import.php:39
+msgid "Back"
+msgstr "Atzera"
+
+#: templates/part.import.php:25
+msgid "Please fill out the form"
+msgstr "Mesedez inprimakia bete"
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr "Sortu gertaera berria"
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr "Ordu-zona"
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Ordu formatua"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Egutegiaren CalDAV sinkronizazio helbidea"
+
+
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
new file mode 100644
index 00000000000..c7023773dd0
--- /dev/null
+++ b/l10n/eu/contacts.po
@@ -0,0 +1,240 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Asier Urio Larrea <asieriko@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/team/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: lib/app.php:42
+msgid "This is not your addressbook."
+msgstr "Hau ez da zure helbide liburua."
+
+#: lib/app.php:51 photo.php:34
+msgid "Contact could not be found."
+msgstr "Ezin izan da kontaktua aurkitu."
+
+#: lib/app.php:65
+msgid "vCard could not be read."
+msgstr "Ezin izan da vCard-a irakurri."
+
+#: lib/app.php:79
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr ""
+"vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Helbidea"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefonoa"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "Eposta"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Erakundea"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Lana"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Etxea"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mugikorra"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Testua"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Ahotsa"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax-a"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Bideoa"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Bilagailua"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Hau ez da zure kontaktua."
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr "Txartel hau ez da RFC bateragarria."
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr "Txartel honek ez dauka argazkirik."
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "Gehitu Kontaktua"
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "Taldea"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "Izena"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Posta kutxa"
+
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Hedatua"
+
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Kalea"
+
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Hiria"
+
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Eskualdea"
+
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Posta Kodea"
+
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Herrialdea"
+
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Sortu Kontaktua"
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Editatu"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr "Jaioteguna"
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr "Telefonoa"
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
+
+
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
new file mode 100644
index 00000000000..4508c5380f0
--- /dev/null
+++ b/l10n/eu/core.po
@@ -0,0 +1,171 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Asier Urio Larrea <asieriko@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/team/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Eskatuta"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Saio hasierak huts egin du!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Erabiltzaile izena"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Eskaera berrezarri da"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Zure pasahitza berrezarri da"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Pasahitz berria"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Berrezarri pasahitza"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "Pertsonala"
+
+#: strings.php:6
+msgid "Users"
+msgstr "Erabiltzaileak"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "Aplikazioak"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "Kudeatzailea"
+
+#: strings.php:9
+msgid "Help"
+msgstr "Laguntza"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "Ez da hodeia aurkitu"
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr "Sortu <strong>kudeatzaile kontu<strong> bat"
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr "Pasahitza"
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Aurreratua"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Datuen karpeta"
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr "Konfiguratu datu basea"
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr "erabiliko da"
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr "Datubasearen erabiltzailea"
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr "Datubasearen pasahitza"
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr "Datubasearen izena"
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr "Datubasearen hostalaria"
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr "Bukatu konfigurazioa"
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr "Saioa bukatu"
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr "Ezarpenak"
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr "Galdu duzu pasahitza?"
+
+#: templates/login.php:15
+msgid "remember"
+msgstr "gogoratu"
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "Zure saioa bukatu da."
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "aurrekoa"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "hurrengoa"
+
+
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
new file mode 100644
index 00000000000..d2af4c2d58f
--- /dev/null
+++ b/l10n/eu/files.po
@@ -0,0 +1,115 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Asier Urio Larrea <asieriko@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/team/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr "Ez da arazorik izan, fitxategia ongi igo da"
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+"Igotako fitxategiaren tamaina php.ini-ko upload_max_filesize direktiban "
+"adierazitakoa  baino handiagoa da"
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+"Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban "
+"adierazitakoa baino handiagoa da"
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr "Igotako fitxategiaren zati bat baino gehiago ez da igo"
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr "Ez da fitxategirik igo"
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr "Aldi baterako karpeta falta da"
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr "Fitxategiak"
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr "Igo daitekeen gehienezko tamaina"
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr "Igo"
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr "Ez dago ezer. Igo zerbait!"
+
+#: templates/index.php:43
+msgid "Name"
+msgstr "Izena"
+
+#: templates/index.php:45
+msgid "Download"
+msgstr "Deskargatu"
+
+#: templates/index.php:49
+msgid "Size"
+msgstr "Tamaina"
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr "Aldatuta"
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr "Igotakoa handiegia da"
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+"Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen "
+"duena baino handiagoak dira."
+
+
diff --git a/l10n/eu/media.po b/l10n/eu/media.po
new file mode 100644
index 00000000000..8fbf9e464f4
--- /dev/null
+++ b/l10n/eu/media.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Asier Urio Larrea <asieriko@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/team/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:32
+msgid "Music"
+msgstr "Musika"
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr "Erreproduzitu"
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr "Pausarazi"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr "Aurrekoa"
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr "Hurrengoa"
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr "Mututu"
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr "Ez Mututu"
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr "Bireskaneatu Bilduma"
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr "Artista"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "Albuma"
+
+#: templates/music.php:39
+msgid "Title"
+msgstr "Izenburua"
+
+
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
new file mode 100644
index 00000000000..e4655b60a08
--- /dev/null
+++ b/l10n/eu/settings.po
@@ -0,0 +1,155 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Asier Urio Larrea <asieriko@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/team/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr "Baliogabeko eskaria"
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID aldatuta"
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr "Hizkuntza aldatuta"
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr "Gehitu zure programa"
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr "Aukeratu Programa bat"
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr "lizentziarekin."
+
+#: templates/apps.php:23
+msgid "by"
+msgstr " Egilea:"
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr "Egin galdera bat"
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr "Arazoak daude laguntza datubasera konektatzeko."
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr "Joan hara eskuz."
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr "Erantzun"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr "Erabiltzen ari zara "
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr "eta guztira erabil dezakezu "
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr "Zure pasahitza aldatu da"
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "Ezin izan da zure pasahitza aldatu"
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr "Uneko pasahitza"
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr "Pasahitz berria"
+
+#: templates/personal.php:17
+msgid "show"
+msgstr "erakutsi"
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr "Aldatu pasahitza"
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr "Hizkuntza"
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+"erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera "
+"konektatzeko"
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr "Izena"
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr "Pasahitza"
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr "Taldeak"
+
+#: templates/users.php:23
+msgid "Create"
+msgstr "Sortu"
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr "Ezabatu"
+
+
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 1a7dea24d8d..2f2dd572cd9 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <gp4004@arghh.org>, 2011.
+#   <rom1dep@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:11+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +19,224 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Ce n'est pas votre carnet d'adresses."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "Ce contact n'a pas été trouvé."
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "Cette vCard n'a pas pu être lue."
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
+"Les informations relatives à cette vCard sont incorrectes. Veuillez "
+"recharger la page."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Adresse"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Téléphone"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "Email"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Société"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Travail"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Maison"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mobile"
 
-#: photo.php:53
+#: lib/app.php:114
+msgid "Text"
+msgstr "Texte"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Voix"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Vidéo"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Bipeur"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Ce n'est pas votre contact."
+
+#: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Cette fiche n'est pas compatible RFC."
 
-#: photo.php:90
+#: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Cette fiche ne contient pas de photo."
 
-#: templates/index.php:8
+#: templates/index.php:13
 msgid "Add Contact"
+msgstr "Ajouter un Contact"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addcardform.php:5
+#: templates/part.addcardform.php:8
 msgid "Group"
-msgstr ""
+msgstr "Groupe"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
+#: templates/part.addcardform.php:19
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Boîte postale"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Étendu"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
-msgstr ""
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Rue"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
-msgstr ""
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Ville"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
-msgstr ""
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Région"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
-msgid "PO Box"
-msgstr ""
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Code postal"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
-msgid "Extended"
-msgstr ""
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Pays"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
-msgid "Street"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Créer le Contact"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
-msgid "City"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
-msgid "Region"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
-msgid "Zipcode"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
-msgid "Country"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Modifier"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Effacer"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.details.php:33
+msgid "Add"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.editaddressbook.php:29
+msgid "Save"
 msgstr ""
 
-#: templates/part.details.php:33
-msgid "Delete"
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
+msgstr "Anniversaire"
+
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Téléphone"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index b1e286ce6ea..2760dfdeb9d 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-05 15:01+0000\n"
-"Last-Translator: bibzor <borjan@tchaka.fr>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,53 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+"Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot"
+" de passe"
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Demande envoyée"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Nom d'utilisateur ou e-mail invalide"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Demander la réinitialisation"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Votre mot de passe a été réinitialisé"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Nouveau mot de passe"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Réinitialiser le mot de passe"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personnels"
@@ -46,54 +93,50 @@ msgstr "Introuvable"
 msgid "Create an <strong>admin account</strong>"
 msgstr "Créer un <strong>compte administrateur</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Nom d'utilisateur"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Avancé"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Répertoire des données"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Configurer la base de données"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "sera utilisé"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Utilisateur de la base de données"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Mot de passe de la base de données"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Nom de la base de données"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Avancé"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Serveur de la base de données"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Répertoire des données"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Terminer l'installation"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "vous donne la liberté et le contrôle de vos propres données"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -103,40 +146,22 @@ msgstr "Se déconnecter"
 msgid "Settings"
 msgstr "Paramètres"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Mot de passe perdu ?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "se souvenir de moi"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Vous êtes désormais déconnecté."
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr ""
-"Vous allez recevoir un lien par email qui vous permettra de réinitialiser "
-"votre mot de passe."
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Nécessaire"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Échec de la connexion !"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Nom d'utilisateur ou Email"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Demande de réinitialisation"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "précédent"
@@ -145,16 +170,4 @@ msgstr "précédent"
 msgid "next"
 msgstr "suivant"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Votre mot de passe a été réinitialisé"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "Nouveau mot de passe"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Réinitialisation du mot de passe"
-
 
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index b898f187030..8f1ba975395 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,37 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Aucune erreur, le fichier a été téléversé avec succès"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
+"Le fichier téléversé excède la valeur de upload_max_filesize spécifiée dans "
+"php.ini"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"Le fichier téléversé excède la valeur de MAX_FILE_SIZE spécifiée dans le "
+"formulaire HTML"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Le fichier n'a été que partiellement téléversé"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Aucun fichier n'a été téléversé"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Il manque un répertoire temporaire"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Fichiers"
 
@@ -52,43 +56,55 @@ msgstr "Fichiers"
 msgid "Maximum upload size"
 msgstr "Taille max. d'envoi"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Envoyer"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Nouveau dossier"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Nom"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Téléchargement"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Taille"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Modifié"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Supprimer"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Fichier trop volumineux"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/fr/media.po b/l10n/fr/media.po
index 5cdf1cd9036..62c9e525cf3 100644
--- a/l10n/fr/media.po
+++ b/l10n/fr/media.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 #   <rom1dep@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-20 05:08+0200\n"
-"PO-Revision-Date: 2011-08-20 03:08+0000\n"
-"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,39 +18,35 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Musique"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
-msgstr ""
+msgstr "Play"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Pause"
 
 #: templates/music.php:5
 msgid "Previous"
-msgstr ""
+msgstr "Précédent"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
-msgstr ""
+msgstr "Suivant"
 
 #: templates/music.php:7
 msgid "Mute"
-msgstr ""
+msgstr "Muet"
 
 #: templates/music.php:8
 msgid "Unmute"
-msgstr ""
-
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Pistes scannées"
+msgstr "Audible"
 
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Réanalyser la Collection"
 
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 46f9713e9cb..c3737d58524 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -2,15 +2,17 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
-#   <rom1dep@gmail.com>, 2011.
+# Translators:
+#   <fboulogne@april.org>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+#   <rom1dep@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-04 16:48+0200\n"
-"PO-Revision-Date: 2011-09-03 18:25+0000\n"
-"Last-Translator: bibzor <borjan@tchaka.fr>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +20,26 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Erreur d'authentification"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "Identifiant OpenID changé"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Requête invalide"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "Identifiant OpenID changé"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Langue changée"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Ajoutez votre application"
@@ -54,15 +60,15 @@ msgstr "par"
 msgid "Ask a question"
 msgstr "Poser une question"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Problème de connexion à la base de données d'aide."
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "S'y rendre manuellement."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Réponse"
 
@@ -72,7 +78,7 @@ msgstr "Vous utilisez"
 
 #: templates/personal.php:8
 msgid "of the available"
-msgstr "sur un total de"
+msgstr "d'espace de stockage sur un total de"
 
 #: templates/personal.php:13
 msgid "Your password got changed"
@@ -98,37 +104,53 @@ msgstr "Afficher"
 msgid "Change password"
 msgstr "Changer de mot de passe"
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Langue"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Aider à traduire"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "utilisez cette adresse pour vous connecter à votre ownCloud depuis un "
 "explorateur de fichiers"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Nom"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Groupes"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Créer"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Supprimer"
 
diff --git a/l10n/he/calendar.po b/l10n/he/calendar.po
new file mode 100644
index 00000000000..39d8b244769
--- /dev/null
+++ b/l10n/he/calendar.po
@@ -0,0 +1,639 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Elad Alfassa <elad@fedoraproject.org>, 2011.
+#   <tomerc+transifex.net@gmail.com>, 2011.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-07 18:29+0100\n"
+"PO-Revision-Date: 2012-01-08 08:41+0000\n"
+"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/team/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr "�זור זמן השתנה"
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr "בקשה ל� חוקית"
+
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr "ח שנה"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "לוח שנה ל� נכון"
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr "יו� הולדת"
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr "עסקי�"
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr "שיחה"
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr "לקוחות"
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr "משלוח"
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr "חגי�"
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr "רעיונות"
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr "מסע"
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr "יובל"
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr "פגישה"
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr "�חר"
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr "�ישי"
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr "פרוייקטי�"
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr "ש�לות"
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr "עבודה"
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr "לל� חזרה"
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr "יומי"
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr "שבועי"
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr "כל יו� עבודה"
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr "דו שבועי"
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr "חודשי"
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr "שנתי"
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "ל� מערך"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "היו�"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr ""
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "כותרת"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr ""
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr ""
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr ""
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr ""
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr ""
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr "שבוע"
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr "חודש"
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr "רשימה"
+
+#: templates/calendar.php:45
+msgid "Today"
+msgstr "היו�"
+
+#: templates/calendar.php:46
+msgid "Calendars"
+msgstr "לוחות שנה"
+
+#: templates/calendar.php:64
+msgid "There was a fail, while parsing the file."
+msgstr "�ירעה שגי�ה בעת פענוח הקובץ."
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr "בחר לוחות שנה פעילי�"
+
+#: templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "לוח שנה חדש"
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr "קישור CalDav"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr "הורדה"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr "עריכה"
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "מחיקה"
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr "לוח שנה חדש"
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr "עריכת לוח שנה"
+
+#: templates/part.editcalendar.php:12 templates/part.import.php:29
+msgid "Displayname"
+msgstr "ש� תצוגה"
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr "פעיל"
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr "צבע לוח שנה"
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "שמירה"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "שליחה"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr "ביטול"
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr "עריכת �ירוע"
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "יצו�"
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr "כותרת ה�ירוע"
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr "קטגוריה"
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr "בחר קטגוריה"
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr "�ירוע של כל היו�"
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr "מ�ת"
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr "עבור"
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr "חזרה"
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "מיקו�"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "מיקו� ה�ירוע"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "תי�ור"
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr "תי�ור ה�ירוע"
+
+#: templates/part.import.php:1
+msgid "Import Ical File"
+msgstr ""
+
+#: templates/part.import.php:4
+msgid "How to import the new calendar?"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Import into an existing calendar"
+msgstr ""
+
+#: templates/part.import.php:7
+msgid "Import into a new calendar"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "Please choose the calendar"
+msgstr ""
+
+#: templates/part.import.php:20 templates/part.import.php:37
+msgid "Import"
+msgstr "יבו�"
+
+#: templates/part.import.php:22 templates/part.import.php:39
+msgid "Back"
+msgstr ""
+
+#: templates/part.import.php:25
+msgid "Please fill out the form"
+msgstr ""
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr "יצירת �ירוע חדש"
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr "�זור זמן"
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr ""
+
+
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
new file mode 100644
index 00000000000..3932aca9797
--- /dev/null
+++ b/l10n/he/contacts.po
@@ -0,0 +1,239 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <tomerc+transifex.net@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/team/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: lib/app.php:42
+msgid "This is not your addressbook."
+msgstr "זהו �ינו ספר הכתובות שלך"
+
+#: lib/app.php:51 photo.php:34
+msgid "Contact could not be found."
+msgstr "ל� ניתן ל�תר �יש קשר"
+
+#: lib/app.php:65
+msgid "vCard could not be read."
+msgstr "ל� ניתן לקרו� vCard."
+
+#: lib/app.php:79
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr "המידע �ודות vCard �ינו נכון. נ� לטעון מחדש �ת הדף."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "כתובת"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "טלפון"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "דו�ר �לקטרוני"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "�רגון"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "עבודה"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "בית"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "נייד"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "טקסט"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "קולי"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "פקס"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "ויד�ו"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "זימונית"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "זהו �ינו �יש קשר שלך"
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr "כרטיס זה �ינו תו�� ל־RFC"
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr "כרטיס זה �ינו כולל תמונה"
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "הוספת �יש קשר"
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "קבוצה"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "ש�"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "ת� דו�ר"
+
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "מורחב"
+
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "רחוב"
+
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "עיר"
+
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "�זור"
+
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "מיקוד"
+
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "מדינה"
+
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "יצירת �יש קשר"
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "עריכה"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "מחיקה"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr "יו� הולדת"
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr "טלפון"
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
+
+
diff --git a/l10n/he/core.po b/l10n/he/core.po
new file mode 100644
index 00000000000..705a03e4d94
--- /dev/null
+++ b/l10n/he/core.po
@@ -0,0 +1,172 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <tomerc+transifex.net@gmail.com>, 2011.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/team/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "יישלח לתיבת הדו�״ל שלך קישור ל�יפוס הססמה."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "נדרש"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "הכניסה נכשלה!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "ש� משתמש"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "בקשת �יפוס"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "הססמה שלך �ופסה"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "ססמה חדשה"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "�יפוס ססמה"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "�ישי"
+
+#: strings.php:6
+msgid "Users"
+msgstr "משתמשי�"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "יישומי�"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "מנהל"
+
+#: strings.php:9
+msgid "Help"
+msgstr "עזרה"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "ענן ל� נמצ�"
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr "יצירת <strong>חשבון מנהל</strong>"
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr "ססמה"
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "מתקד�"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "תיקיית נתוני�"
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr "הגדרת מסד הנתוני�"
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr "ינוצלו"
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr "ש� משתמש במסד הנתוני�"
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr "ססמת מסד הנתוני�"
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr "ש� מסד הנתוני�"
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr "שרת בסיס נתוני�"
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr "סיו� התקנה"
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr "התנתקות"
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr "הגדרות"
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr "שכחת �ת ססמתך?"
+
+#: templates/login.php:15
+msgid "remember"
+msgstr "שמירת הססמה"
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "�ינך מחובר."
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "קוד�"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "הב�"
+
+
diff --git a/l10n/he/files.po b/l10n/he/files.po
new file mode 100644
index 00000000000..1147b3e49d7
--- /dev/null
+++ b/l10n/he/files.po
@@ -0,0 +1,109 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <tomerc+transifex.net@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/team/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr "ל� �ירעה תקלה, הקבצי� הועלו בהצלחה"
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr "הקובץ שהועלה חרג מההנחיה upload_max_filesize בקובץ php.ini"
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "הקובץ שהועלה חרג מההנחיה MAX_FILE_SIZE שצוינה בטופס ה־HTML"
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr "הקובץ שהועלה הועלה בצורה חלקית"
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr "ל� הועלו קבצי�"
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr "תיקייה זמנית חסרה"
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr "קבצי�"
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr "גודל העל�ה מקסימלי"
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr "העל�ה"
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr "�ין כ�ן שו� דבר. �ולי ברצונך להעלות משהו?"
+
+#: templates/index.php:43
+msgid "Name"
+msgstr "ש�"
+
+#: templates/index.php:45
+msgid "Download"
+msgstr "הורדה"
+
+#: templates/index.php:49
+msgid "Size"
+msgstr "גודל"
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr "זמן שינוי"
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr "מחיקה"
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr "העל�ה גדולה מידי"
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "הקבצי� שניסית להעלות חרגו מהגודל המקסימלי להעל�ת קבצי� על שרת זה."
+
+
diff --git a/l10n/he/media.po b/l10n/he/media.po
new file mode 100644
index 00000000000..e578ad99185
--- /dev/null
+++ b/l10n/he/media.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <tomerc+transifex.net@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/team/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:32
+msgid "Music"
+msgstr "מוזיקה"
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr "נגן"
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr "השהה"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr "קוד�"
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr "הב�"
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr "השתק"
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr "בטל השתקה"
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr "סריקת �וסף מחדש"
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr "מבצע"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "�לבו�"
+
+#: templates/music.php:39
+msgid "Title"
+msgstr "כותרת"
+
+
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
new file mode 100644
index 00000000000..7941f186486
--- /dev/null
+++ b/l10n/he/settings.po
@@ -0,0 +1,153 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <tomerc+transifex.net@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/team/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr "בקשה ל� חוקית"
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID השתנה"
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr "שפה השתנתה"
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr "הוספת היישו� שלך"
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr "בחירת יישו�"
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr "רשיון"
+
+#: templates/apps.php:23
+msgid "by"
+msgstr "מ�ת"
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr "ש�ל ש�לה"
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr "בעיות בהתחברות לבסיס נתוני העזרה"
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr "גש לש� ב�ופן ידני"
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr "מענה"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr "הנך משתמש "
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr "מתוך "
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr "הססמה שלך שונתה"
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "ל� ניתן לשנות �ת הססמה שלך"
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr "ססמה נוכחית"
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr "ססמה חדשה"
+
+#: templates/personal.php:17
+msgid "show"
+msgstr "הצגה"
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr "שינוי ססמה"
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr "פה"
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr "השתמש בכתובת זו כדי להתחבר ל־ownCloude שלך ממנהל הקבצי�"
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr "ש�"
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr "ססמה"
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr "קבוצות"
+
+#: templates/users.php:23
+msgid "Create"
+msgstr "יצירה"
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr "מחיקה"
+
+
diff --git a/l10n/hr/calendar.po b/l10n/hr/calendar.po
new file mode 100644
index 00000000000..c4ea31f3c0a
--- /dev/null
+++ b/l10n/hr/calendar.po
@@ -0,0 +1,637 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Davor Kustec <dkustec@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-07 18:29+0100\n"
+"PO-Revision-Date: 2012-01-08 08:41+0000\n"
+"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/team/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr "Vremenska zona promijenjena"
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr "Neispravan zahtjev"
+
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr "Kalendar"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Pogrešan kalendar"
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr "Rođendan"
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr "Poslovno"
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr "Poziv"
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr "Klijenti"
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr "Dostavlja�"
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr "Odmori"
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr "Ideje"
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr "Putovanje"
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr "Obljetnica"
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr "Sastanak"
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr "Ostalo"
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr "Osobno"
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr "Projekti"
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr "Pitanja"
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr "Posao"
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr "Ne ponavlja se"
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr "Dnevno"
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr "Tjedno"
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr "Svakog radnog dana"
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr "Dvotjedno"
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr "Mjese�no"
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr "Godišnje"
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Nije niz"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Cijeli dan"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Nedostaju polja"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Naslov"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Datum Od"
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Vrijeme Od"
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Datum Do"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Vrijeme Do"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Događaj završava prije nego po�inje"
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Pogreška u bazi podataka"
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr "Tjedan"
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr "Mjesec"
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr "Lista"
+
+#: templates/calendar.php:45
+msgid "Today"
+msgstr "Danas"
+
+#: templates/calendar.php:46
+msgid "Calendars"
+msgstr "Kalendari"
+
+#: templates/calendar.php:64
+msgid "There was a fail, while parsing the file."
+msgstr "Pogreška pri �itanju datoteke."
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr "Odaberite aktive kalendare"
+
+#: templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Novi Kalendar"
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr "CalDav Poveznica"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr "Spremi lokalno"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr "Uredi"
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "Briši"
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr "Novi kalendar"
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr "Uredi kalendar"
+
+#: templates/part.editcalendar.php:12 templates/part.import.php:29
+msgid "Displayname"
+msgstr "Naziv"
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr "Aktivan"
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr "Boja kalendara"
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "Spremi"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "Potvrdi"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr "Odustani"
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr "Uredi događaj"
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Izvoz"
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr "Naslov Događaja"
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr "Kategorija"
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr "Odabir kategorije"
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr "Cjelodnevni događaj"
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr "Od"
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr "Za"
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Napredne mogućnosti"
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr "Ponavljanje"
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Lokacija"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Lokacija Događaja"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Opis"
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr "Opis događaja"
+
+#: templates/part.import.php:1
+msgid "Import Ical File"
+msgstr "Uvoz Ical datoteke"
+
+#: templates/part.import.php:4
+msgid "How to import the new calendar?"
+msgstr "Kako uvesti novi kalendar?"
+
+#: templates/part.import.php:6
+msgid "Import into an existing calendar"
+msgstr "Uvoz u postojeći kalendar"
+
+#: templates/part.import.php:7
+msgid "Import into a new calendar"
+msgstr "Uvoz u novi kalendar"
+
+#: templates/part.import.php:10
+msgid "Please choose the calendar"
+msgstr "Odaberite kalendar"
+
+#: templates/part.import.php:20 templates/part.import.php:37
+msgid "Import"
+msgstr "Uvoz"
+
+#: templates/part.import.php:22 templates/part.import.php:39
+msgid "Back"
+msgstr "Natrag"
+
+#: templates/part.import.php:25
+msgid "Please fill out the form"
+msgstr "Molimo popunite obrazac"
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr "Unesi novi događaj"
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr "Vremenska zona"
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Format vremena"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Adresa za CalDAV sinkronizaciju kalendara"
+
+
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
new file mode 100644
index 00000000000..e722369c0d5
--- /dev/null
+++ b/l10n/hr/contacts.po
@@ -0,0 +1,239 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Davor Kustec <dkustec@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/team/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: lib/app.php:42
+msgid "This is not your addressbook."
+msgstr "Ovo nije vaš adresar."
+
+#: lib/app.php:51 photo.php:34
+msgid "Contact could not be found."
+msgstr "Kontakt ne postoji."
+
+#: lib/app.php:65
+msgid "vCard could not be read."
+msgstr "Nemoguće pro�itati vCard."
+
+#: lib/app.php:79
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr "Informacija o vCard je neispravna. Osvježite stranicu."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Adresa"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "E-mail"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organizacija"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Posao"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Kuća"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mobitel"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Tekst"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Glasovno"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Pager"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Ovo nije vaš kontakt."
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr "Ova kartica nije sukladna prema RFC direktivama."
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr "Ova kartica ne sadrži fotografiju."
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "Dodaj kontakt"
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "Grupa"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "Naziv"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Poštanski Pretinac"
+
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Prošireno"
+
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Ulica"
+
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Grad"
+
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Regija"
+
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Poštanski broj"
+
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Država"
+
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Izradi Kontakt"
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Uredi"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Obriši"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr "Rođendan"
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
+
+
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
new file mode 100644
index 00000000000..0ddb082dd54
--- /dev/null
+++ b/l10n/hr/core.po
@@ -0,0 +1,172 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Davor Kustec <dkustec@gmail.com>, 2011.
+# Thomas Silađi <thomas.siladi@net.hr>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/team/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Primit ćete link kako biste poništili zaporku putem e-maila."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Zahtijevano"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Prijava nije uspjela!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Korisni�ko ime"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Zahtjev za resetiranjem"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Vaša lozinka je resetirana"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "nova lozinka"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "poništavanje lozinke"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "Osobno"
+
+#: strings.php:6
+msgid "Users"
+msgstr "korisnici"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "aplikacije"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "administrator"
+
+#: strings.php:9
+msgid "Help"
+msgstr "pomoć"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "Cloud nije pronađen"
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr "stvoriti <strong>Administratorski ra�un</strong>"
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr "Lozinka"
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Dodatno"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Mapa baze podataka"
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr "konfigurirati baze podataka"
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr "će se koristiti"
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr "korisnik baze podataka"
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr "lozinka baze podataka"
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr "ime baze podataka"
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr "Poslužitelj baze podataka"
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr "završiti postavljanje"
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr "odjaviti"
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr "postavke"
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr "Izgubili ste lozinku?"
+
+#: templates/login.php:15
+msgid "remember"
+msgstr "zapamtiti"
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "Vi ste odjavljeni."
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "prethodan"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "sljedeći"
+
+
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
new file mode 100644
index 00000000000..4109098bdcc
--- /dev/null
+++ b/l10n/hr/files.po
@@ -0,0 +1,115 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Davor Kustec <dkustec@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/team/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr "Datoteka je poslana uspješno i bez pogrešaka"
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+"Poslana datoteka izlazi iz okvira upload_max_size direktive postavljene u "
+"php.ini konfiguracijskoj datoteci"
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+"Poslana datoteka izlazi iz okvira MAX_FILE_SIZE direktive postavljene u HTML"
+" obrascu"
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr "Datoteka je poslana samo djelomi�no"
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr "Ni jedna datoteka nije poslana"
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr "Nedostaje privremena mapa"
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr "Datoteke"
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr "Maksimalna veli�ina prijenosa"
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr "Pošalji"
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr "Nema ni�ega u ovoj mapi. Pošalji nešto!"
+
+#: templates/index.php:43
+msgid "Name"
+msgstr "Naziv"
+
+#: templates/index.php:45
+msgid "Download"
+msgstr "Preuzmi"
+
+#: templates/index.php:49
+msgid "Size"
+msgstr "Veli�ina"
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr "Zadnja promjena"
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr "Briši"
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr "Prijenos je preobiman"
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+"Datoteke koje pokušavate prenijeti prelaze maksimalnu veli�inu za prijenos "
+"datoteka na ovom poslužitelju."
+
+
diff --git a/l10n/hr/media.po b/l10n/hr/media.po
new file mode 100644
index 00000000000..dd2823a5ae5
--- /dev/null
+++ b/l10n/hr/media.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Davor Kustec <dkustec@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/team/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: appinfo/app.php:32
+msgid "Music"
+msgstr "Glazba"
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr "Reprodukcija"
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr "Pauza"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr "Prethodna"
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr "Sljedeća"
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr "Utišaj zvuk"
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr "Uklju�i zvuk"
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr "Ponovi skeniranje kolekcije"
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr "Izvođa�"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "Album"
+
+#: templates/music.php:39
+msgid "Title"
+msgstr "Naslov"
+
+
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
new file mode 100644
index 00000000000..c40085592cb
--- /dev/null
+++ b/l10n/hr/settings.po
@@ -0,0 +1,154 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Davor Kustec <dkustec@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/team/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr "Neispravan zahtjev"
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID promijenjen"
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr "Jezik promijenjen"
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr "Dodajte vašu aplikaciju"
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr "Odaberite Aplikaciju"
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr "-licencirano"
+
+#: templates/apps.php:23
+msgid "by"
+msgstr "od"
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr "Postavite pitanje"
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr "Problem pri spajanju na bazu podataka pomoći"
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr "Idite tamo ru�no."
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr "Odgovor"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr "Koristite"
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr "od dostupno"
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr "Vaša lozinka je promijenjena"
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "Nemoguće promijeniti lozinku"
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr "Trenutna lozinka"
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr "Nova lozinka"
+
+#: templates/personal.php:17
+msgid "show"
+msgstr "prikaz"
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr "Izmjena lozinke"
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr "Jezik"
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+"koristite ovu adresu za spajanje na Cloud u vašem upravitelju datoteka"
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr "Ime"
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr "Lozinka"
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr "Grupe"
+
+#: templates/users.php:23
+msgid "Create"
+msgstr "Izradi"
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr "Obriši"
+
+
diff --git a/l10n/hu_HU/calendar.po b/l10n/hu_HU/calendar.po
new file mode 100644
index 00000000000..aee11c9a501
--- /dev/null
+++ b/l10n/hu_HU/calendar.po
@@ -0,0 +1,637 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Peter Borsa <peter.borsa@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-07 18:29+0100\n"
+"PO-Revision-Date: 2012-01-08 08:41+0000\n"
+"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/team/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr "Időzóna megváltozott"
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr "Érvénytelen kérés"
+
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr "Naptár"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Hibás naptár"
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr "Születésap"
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr "Ãœzlet"
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr "Hívás"
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr "Kliensek"
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr "Szállító"
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr "Ãœnnepek"
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr "Ötletek"
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr "Utazás"
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr "Évforduló"
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr "Találkozó"
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr "Egyéb"
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr "Személyes"
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr "Projektek"
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr "Kérdések"
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr "Munka"
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr "Nem ismétlődik"
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr "Napi"
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr "Heti"
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr "Minden hétköznap"
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr "Kéthetente"
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr "Havi"
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr "Évi"
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Nem egy tömb"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Egész nap"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Hiányzó mezők"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Cím"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Napjától"
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Időtől"
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Napig"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Ideig"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Az esemény véget ér a kezdés előtt."
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Adatbázis hiba történt"
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr "Hét"
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr "Hónap"
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr "Lista"
+
+#: templates/calendar.php:45
+msgid "Today"
+msgstr "Ma"
+
+#: templates/calendar.php:46
+msgid "Calendars"
+msgstr "Naptárak"
+
+#: templates/calendar.php:64
+msgid "There was a fail, while parsing the file."
+msgstr "Probléma volt a fájl elemzése közben."
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr "Aktív naptár kiválasztása"
+
+#: templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Új naptár"
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr "CalDAV link"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr "Letöltés"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr "Szerkesztés"
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "Törlés"
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr "Új naptár"
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr "Naptár szerkesztése"
+
+#: templates/part.editcalendar.php:12 templates/part.import.php:29
+msgid "Displayname"
+msgstr "Megjelenítési név"
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr "Aktív"
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr "Naptár szín"
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "Mentés"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "Beküldés"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr "Mégse"
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr "Esemény szerkesztése"
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Export"
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr "Az esemény címe"
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr "Kategória"
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr "Kategória kiválasztása"
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr "Egész napos esemény"
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr ""
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr ""
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Haladó beállítások"
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr "Ismétlés"
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Hely"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Az esemény helyszíne"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Leírás"
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr "Az esemény leírása"
+
+#: templates/part.import.php:1
+msgid "Import Ical File"
+msgstr "Ical fájl importálása"
+
+#: templates/part.import.php:4
+msgid "How to import the new calendar?"
+msgstr "Hogyan legyen importálva az új naptár?"
+
+#: templates/part.import.php:6
+msgid "Import into an existing calendar"
+msgstr "Létező naptárba importálás"
+
+#: templates/part.import.php:7
+msgid "Import into a new calendar"
+msgstr "Új naptárba importálás"
+
+#: templates/part.import.php:10
+msgid "Please choose the calendar"
+msgstr "Válassz naptárat"
+
+#: templates/part.import.php:20 templates/part.import.php:37
+msgid "Import"
+msgstr "Importálás"
+
+#: templates/part.import.php:22 templates/part.import.php:39
+msgid "Back"
+msgstr "Vissza"
+
+#: templates/part.import.php:25
+msgid "Please fill out the form"
+msgstr "Töltsd ki az űrlapot"
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr "Új esemény létrehozása"
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr "Időzóna"
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Időformátum"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Naptár CalDAV szinkronizálási cím:"
+
+
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
new file mode 100644
index 00000000000..463190e33fc
--- /dev/null
+++ b/l10n/hu_HU/contacts.po
@@ -0,0 +1,240 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <mail@tamas-nagy.net>, 2011.
+# Peter Borsa <peter.borsa@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/team/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: lib/app.php:42
+msgid "This is not your addressbook."
+msgstr "Ez nem a te címjegyzéked."
+
+#: lib/app.php:51 photo.php:34
+msgid "Contact could not be found."
+msgstr "Kapcsolat nem található."
+
+#: lib/app.php:65
+msgid "vCard could not be read."
+msgstr "A vCard-ot nem lehet olvasni."
+
+#: lib/app.php:79
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr "A vCardról szóló információ helytelen. Töltsd újra az oldalt."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Cím"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefonszám"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "E-mail"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organizáció"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Munka"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Otthon"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mobiltelefonszám"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Szöveg"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Hang"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Lapozó"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Nem a te kapcsolatod."
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr "A kártya nem RFC kompatibilis."
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr "A kártya nem tartlmaz fényképet."
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "Kontakt hozzáadása"
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "Csoport"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "Név"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Postafiók"
+
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Kiterjesztett"
+
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Utca"
+
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Helység"
+
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Megye"
+
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Irányítószám"
+
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Ország"
+
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Kontakt létrehozása"
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Szerkesztés"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Törlés"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr "Születésnap"
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr "Telefonszám"
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
+
+
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
new file mode 100644
index 00000000000..a6a15a1bf9e
--- /dev/null
+++ b/l10n/hu_HU/core.po
@@ -0,0 +1,171 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <mail@tamas-nagy.net>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/team/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Egy e-mailben kap értesítést a jelszóváltoztatás módjáról."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Kért"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Belépés sikertelen!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Felhasználói név"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Jelszó megváltoztatásra került"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Új jelszó"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Jelszó beállítás"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "Személyes"
+
+#: strings.php:6
+msgid "Users"
+msgstr "Felhasználók"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "Alkalmazások"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "Adminisztráció"
+
+#: strings.php:9
+msgid "Help"
+msgstr "Súgó"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "Nem talált felhő"
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr "<strong>Adminisztrációs fiók</strong> létrehozása"
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr "Jelszó"
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Fejlett"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Adat könyvtár"
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr "Adatbázis konfigurálása"
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr "használva lesz"
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr "Adatbázis felhasználó"
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr "Adatbázis jelszó"
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr "Adatbázis név"
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr "Adatbázis szerver"
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr "Beállítások befejezése"
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr "Kilépés"
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr "Beállítások"
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr "Elfelejtett jelszó?"
+
+#: templates/login.php:15
+msgid "remember"
+msgstr "emlékezni"
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "Kilépés sikerült."
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "Előző"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "Következő"
+
+
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
new file mode 100644
index 00000000000..2dfe1c33917
--- /dev/null
+++ b/l10n/hu_HU/files.po
@@ -0,0 +1,116 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <mail@tamas-nagy.net>, 2011.
+# Peter Borsa <peter.borsa@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/team/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr "Nincs hiba, a fájl sikeresen feltöltve."
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+"A feltöltött file meghaladja az upload_max_filesize direktívát a php.ini-"
+"ben."
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+"A feltöltött fájl meghaladja a MAX_FILE_SIZE direktívát ami meghatározott a "
+"HTML form-ban."
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr "Az eredeti fájl csak részlegesen van feltöltve."
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr "Nem lett fájl feltöltve."
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr "Hiányzik az ideiglenes könyvtár"
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr "Fájlok"
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr "Maximális feltölthető fájlméret"
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr "Feltöltés"
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr "Töltsön fel egy fájlt."
+
+#: templates/index.php:43
+msgid "Name"
+msgstr "Név"
+
+#: templates/index.php:45
+msgid "Download"
+msgstr "Letöltés"
+
+#: templates/index.php:49
+msgid "Size"
+msgstr "Méret"
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr "Módosítva"
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr "Törlés"
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr "Feltöltés túl nagy"
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+"A fájlokat amit próbálsz feltölteni meghaladta a legnagyobb fájlméretet ezen"
+" a szerveren."
+
+
diff --git a/l10n/hu_HU/media.po b/l10n/hu_HU/media.po
new file mode 100644
index 00000000000..d11eeca2ef4
--- /dev/null
+++ b/l10n/hu_HU/media.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Peter Borsa <peter.borsa@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/team/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:32
+msgid "Music"
+msgstr "Zene"
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr "Lejátszás"
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr "Szünet"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr "Előző"
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr "Következő"
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr "Némítás"
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr "Némítás megszüntetése"
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr "Gyűjtemény újraolvasása"
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr "Előadó"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "Album"
+
+#: templates/music.php:39
+msgid "Title"
+msgstr "Cím"
+
+
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
new file mode 100644
index 00000000000..d91ad225434
--- /dev/null
+++ b/l10n/hu_HU/settings.po
@@ -0,0 +1,155 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Peter Borsa <peter.borsa@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/team/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr "Érvénytelen kérés"
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID megváltozott"
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr "A nyelv megváltozott"
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr "Alkalmazásod hozzáadása"
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr "Egy App kiválasztása"
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr "-licenszelt"
+
+#: templates/apps.php:23
+msgid "by"
+msgstr ""
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr "Tégy fel egy kérdést"
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr "Menj oda kézzel"
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr "Válasz"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr "a rendelkezésre álló"
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr "A jelszó megváltozott"
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "Nem lehet megváltoztatni a jelszavad"
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr "Jelenlegi jelszó"
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr "Új jelszó"
+
+#: templates/personal.php:17
+msgid "show"
+msgstr "Mutatás"
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr "Jelszó megváltoztatása"
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr "Nyelv"
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+"Használd ezt a címet hogy csatlakozz a saját ownCloud rendszeredhez a "
+"fájlkezelődben"
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr "Név"
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr "Jelszó"
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr "Csoportok"
+
+#: templates/users.php:23
+msgid "Create"
+msgstr "Létrehozás"
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr "Törlés"
+
+
diff --git a/l10n/hy/calendar.po b/l10n/hy/calendar.po
new file mode 100644
index 00000000000..b3a8dbbe07b
--- /dev/null
+++ b/l10n/hy/calendar.po
@@ -0,0 +1,637 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Arman Poghosyan <armpogart@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-07 18:29+0100\n"
+"PO-Revision-Date: 2012-01-08 08:41+0000\n"
+"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/team/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr ""
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr ""
+
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr "Õ•Ö€Õ¡Ö�Õ¸Ö‚ÕµÖ�"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr ""
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr "Ô±ÕµÕ¬"
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr ""
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr ""
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr ""
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr ""
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr ""
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr ""
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr ""
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr ""
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr ""
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr ""
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr ""
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr ""
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr ""
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr ""
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr ""
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr ""
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr ""
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr ""
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr "Ô±Õ´Õ«Õ½"
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr ""
+
+#: templates/calendar.php:45
+msgid "Today"
+msgstr "Ô±ÕµÕ½Ö…Ö€"
+
+#: templates/calendar.php:46
+msgid "Calendars"
+msgstr ""
+
+#: templates/calendar.php:64
+msgid "There was a fail, while parsing the file."
+msgstr ""
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr ""
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:12 templates/part.import.php:29
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr ""
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr ""
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr ""
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr ""
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr ""
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr ""
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr ""
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr ""
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr ""
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Õ†Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶"
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr ""
+
+#: templates/part.import.php:1
+msgid "Import Ical File"
+msgstr ""
+
+#: templates/part.import.php:4
+msgid "How to import the new calendar?"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Import into an existing calendar"
+msgstr ""
+
+#: templates/part.import.php:7
+msgid "Import into a new calendar"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "Please choose the calendar"
+msgstr ""
+
+#: templates/part.import.php:20 templates/part.import.php:37
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:22 templates/part.import.php:39
+msgid "Back"
+msgstr ""
+
+#: templates/part.import.php:25
+msgid "Please fill out the form"
+msgstr ""
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr ""
+
+
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
new file mode 100644
index 00000000000..f4a8aac2cd5
--- /dev/null
+++ b/l10n/hy/contacts.po
@@ -0,0 +1,238 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/team/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: lib/app.php:42
+msgid "This is not your addressbook."
+msgstr ""
+
+#: lib/app.php:51 photo.php:34
+msgid "Contact could not be found."
+msgstr ""
+
+#: lib/app.php:65
+msgid "vCard could not be read."
+msgstr ""
+
+#: lib/app.php:79
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr ""
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr ""
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr ""
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr ""
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr ""
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr ""
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:114
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:117
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr ""
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr ""
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr ""
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr ""
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr ""
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr ""
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr ""
+
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr ""
+
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr ""
+
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr ""
+
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr ""
+
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr ""
+
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr ""
+
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr ""
+
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr ""
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr ""
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
+
+
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
new file mode 100644
index 00000000000..df17a143a65
--- /dev/null
+++ b/l10n/hy/core.po
@@ -0,0 +1,170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/team/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr ""
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:15
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
+
+
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
new file mode 100644
index 00000000000..77b97fc34df
--- /dev/null
+++ b/l10n/hy/files.po
@@ -0,0 +1,108 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/team/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr ""
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:43
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Size"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+
diff --git a/l10n/hy/media.po b/l10n/hy/media.po
new file mode 100644
index 00000000000..8fe3c57905b
--- /dev/null
+++ b/l10n/hy/media.po
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/team/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:32
+msgid "Music"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr ""
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr ""
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr ""
+
+#: templates/music.php:38
+msgid "Album"
+msgstr ""
+
+#: templates/music.php:39
+msgid "Title"
+msgstr ""
+
+
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
new file mode 100644
index 00000000000..7712776cd67
--- /dev/null
+++ b/l10n/hy/settings.po
@@ -0,0 +1,152 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/team/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr ""
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr ""
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr ""
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr ""
+
+#: templates/apps.php:23
+msgid "by"
+msgstr ""
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr ""
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:17
+msgid "show"
+msgstr ""
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr ""
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr ""
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr ""
+
+#: templates/users.php:23
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr ""
+
+
diff --git a/l10n/ia/calendar.po b/l10n/ia/calendar.po
new file mode 100644
index 00000000000..da2e4a59022
--- /dev/null
+++ b/l10n/ia/calendar.po
@@ -0,0 +1,637 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Emilio Sepúlveda <djfunkinmixer@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-07 18:29+0100\n"
+"PO-Revision-Date: 2012-01-08 08:41+0000\n"
+"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/team/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr ""
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr ""
+
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr "Calendario"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr ""
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr "Projectos"
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr "Travalio"
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr ""
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr ""
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr ""
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr ""
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr ""
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr ""
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr ""
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr ""
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Omne die"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr ""
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Titulo"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr ""
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr ""
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr ""
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr ""
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr ""
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr "Septimana"
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr "Mense"
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr "Lista"
+
+#: templates/calendar.php:45
+msgid "Today"
+msgstr "Hodie"
+
+#: templates/calendar.php:46
+msgid "Calendars"
+msgstr "Calendarios"
+
+#: templates/calendar.php:64
+msgid "There was a fail, while parsing the file."
+msgstr ""
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr "Selectionar calendarios active"
+
+#: templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Nove calendario"
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr "Discarga"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr "Modificar"
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "Deler"
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr "Modificar calendario"
+
+#: templates/part.editcalendar.php:12 templates/part.import.php:29
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr "Active"
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr "Color de calendario"
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "Salveguardar"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "Inviar"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr "Cancellar"
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr ""
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr ""
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr "Selectionar categoria"
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr ""
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr "Ab"
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr "A"
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr ""
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr ""
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Description"
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr ""
+
+#: templates/part.import.php:1
+msgid "Import Ical File"
+msgstr ""
+
+#: templates/part.import.php:4
+msgid "How to import the new calendar?"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Import into an existing calendar"
+msgstr ""
+
+#: templates/part.import.php:7
+msgid "Import into a new calendar"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "Please choose the calendar"
+msgstr ""
+
+#: templates/part.import.php:20 templates/part.import.php:37
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:22 templates/part.import.php:39
+msgid "Back"
+msgstr ""
+
+#: templates/part.import.php:25
+msgid "Please fill out the form"
+msgstr ""
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr ""
+
+
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
new file mode 100644
index 00000000000..89f2366ca88
--- /dev/null
+++ b/l10n/ia/contacts.po
@@ -0,0 +1,240 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Emilio Sepúlveda <djfunkinmixer@gmail.com>, 2011.
+# Emilio Sepúlveda <emisepulvedam@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/team/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: lib/app.php:42
+msgid "This is not your addressbook."
+msgstr "Iste non es tu libro de adresses"
+
+#: lib/app.php:51 photo.php:34
+msgid "Contact could not be found."
+msgstr "Contacto non poterea esser legite"
+
+#: lib/app.php:65
+msgid "vCard could not be read."
+msgstr "vCard non poterea esser legite."
+
+#: lib/app.php:79
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr ""
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Adresse"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telephono"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "E-posta"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organisation"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Travalio"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Domo"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Texto"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Voce"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Pager"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Iste non es tu contacto"
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr "Iste carta non es compatibile con RFC"
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr ""
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "Adder contacto"
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "Gruppo"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "Nomine"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Cassa postal"
+
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr ""
+
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Strata"
+
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Citate"
+
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Region"
+
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Codice postal"
+
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Pais"
+
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Crear contacto"
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Modificar"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Deler"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr "Anniversario"
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr "Phono"
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
+
+
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
new file mode 100644
index 00000000000..f3f5f87ceea
--- /dev/null
+++ b/l10n/ia/core.po
@@ -0,0 +1,171 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Emilio Sepúlveda <djfunkinmixer@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/team/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Requestate"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Initio de session fallate!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Nomine de usator"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Requestar reinitialisation"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Tu contrasigno esseva reinitialisate"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Nove contrasigno"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Reinitialisar contrasigno"
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr "Usatores"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "Applicationes"
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr "Adjuta"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "Nube non trovate"
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr "Crear un <strong>conto de administration</strong>"
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr "Contrasigno"
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Avantiate"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Dossier de datos"
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr "Configurar le base de datos"
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr "essera usate"
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr "Usator de base de datos"
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr "Contrasigno de base de datos"
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr "Nomine de base de datos"
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr "Clauder le session"
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr "Configurationes"
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:15
+msgid "remember"
+msgstr "memora"
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "prev"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "prox"
+
+
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
new file mode 100644
index 00000000000..8ecc6217302
--- /dev/null
+++ b/l10n/ia/files.po
@@ -0,0 +1,109 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Emilio Sepúlveda <djfunkinmixer@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/team/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr "Le file incargate solmente esseva incargate partialmente"
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr "Nulle file esseva incargate"
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr "Files"
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr "Dimension maxime de incargamento"
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr "Incargar"
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr "Nihil hic. Incarga alcun cosa!"
+
+#: templates/index.php:43
+msgid "Name"
+msgstr "Nomine"
+
+#: templates/index.php:45
+msgid "Download"
+msgstr "Discargar"
+
+#: templates/index.php:49
+msgid "Size"
+msgstr "Dimension"
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr "Modificate"
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr "Deler"
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr "Incargamento troppo longe"
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+
diff --git a/l10n/ia/media.po b/l10n/ia/media.po
new file mode 100644
index 00000000000..0a64e175db4
--- /dev/null
+++ b/l10n/ia/media.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Emilio Sepúlveda <djfunkinmixer@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/team/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:32
+msgid "Music"
+msgstr "Musica"
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr "Reproducer"
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr "Pausa"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr "Previe"
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr "Proxime"
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr "Mute"
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr "Con sono"
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr "Rescannar collection"
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr "Artista"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "Album"
+
+#: templates/music.php:39
+msgid "Title"
+msgstr "Titulo"
+
+
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
new file mode 100644
index 00000000000..b05a2f18bb6
--- /dev/null
+++ b/l10n/ia/settings.po
@@ -0,0 +1,153 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Emilio Sepúlveda <djfunkinmixer@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/team/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID cambiate"
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr "Linguage cambiate"
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr "Adder tu application"
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr "Selectionar un app"
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr ""
+
+#: templates/apps.php:23
+msgid "by"
+msgstr "per"
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr "Facer un question"
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr "Responsa"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr "Tu contrasigno esseva cambiate"
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "Non pote cambiar tu contrasigno"
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr "Contrasigno currente"
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr "Nove contrasigno"
+
+#: templates/personal.php:17
+msgid "show"
+msgstr "monstrar"
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr "Cambiar contrasigno"
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr "Linguage"
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr "Nomine"
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr "Contrasigno"
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr "Gruppos"
+
+#: templates/users.php:23
+msgid "Create"
+msgstr "Crear"
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr "Deler"
+
+
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index 3a6360c599f..5ae316e2e11 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:10+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +17,222 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr ""
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
 msgstr ""
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
 msgstr ""
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: photo.php:53
-msgid "This card is not RFC compatible."
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
 msgstr ""
 
-#: photo.php:90
-msgid "This card does not contain a photo."
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
 msgstr ""
 
-#: templates/index.php:8
-msgid "Add Contact"
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
 msgstr ""
 
-#: templates/part.addcardform.php:5
-msgid "Group"
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
 msgstr ""
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
-msgid "Name"
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
 msgstr ""
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: lib/app.php:112
+msgid "Mobile"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
+#: lib/app.php:114
+msgid "Text"
 msgstr ""
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
+#: lib/app.php:115
+msgid "Voice"
 msgstr ""
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
+#: lib/app.php:116
+msgid "Fax"
 msgstr ""
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
+#: lib/app.php:117
+msgid "Video"
 msgstr ""
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
+#: lib/app.php:118
+msgid "Pager"
+msgstr ""
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr ""
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr ""
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr ""
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr ""
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr ""
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr ""
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr ""
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Delete"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
 msgid "Birthday"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
 msgstr ""
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/id/core.po b/l10n/id/core.po
index d19793d98a1..b2751d7daa3 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-05 01:19+0000\n"
-"Last-Translator: radifar <m_radifar05@yahoo.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,51 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Username"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Pribadi"
@@ -46,54 +91,50 @@ msgstr "Cloud tidak ditemukan"
 msgid "Create an <strong>admin account</strong>"
 msgstr "Buat sebuah <strong>akun admin</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Username"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Password"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Tingkat Lanjut"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Folder data"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Konfigurasi database"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "akan digunakan"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Pengguna database"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Password database"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Nama database"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Tingkat Lanjut"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Host database"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Folder data"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "memberikan anda kebebasan dan kendali atas data anda sendiri"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -103,38 +144,22 @@ msgstr "Keluar"
 msgid "Settings"
 msgstr "Setelan"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Lupa password anda?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "selalu login"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Anda telah keluar."
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Anda akan menerima tautan untuk menset ulang password anda via Email."
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Telah diminta"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Gagal masuk!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Nama Pengguna atau Email"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Meminta set ulang"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "sebelum"
@@ -143,16 +168,4 @@ msgstr "sebelum"
 msgid "next"
 msgstr "selanjutnya"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Password anda telah diset ulang"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "Password Baru"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Set Ulang Password"
-
 
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 8b116d05259..7a7d4ce4b33 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,33 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Berkas"
 
@@ -52,43 +52,55 @@ msgstr "Berkas"
 msgid "Maximum upload size"
 msgstr "Ukuran unggah maksimum"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Unggah"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Folder Baru"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Nama"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Ukuran"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Hapus"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Unggahan terlalu besar"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/id/media.po b/l10n/id/media.po
index 5e833cc559b..16f3ae710a1 100644
--- a/l10n/id/media.po
+++ b/l10n/id/media.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-20 05:08+0200\n"
-"PO-Revision-Date: 2011-08-20 03:08+0000\n"
-"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,39 +18,35 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Musik"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
-msgstr ""
+msgstr "Mainkan"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Jeda"
 
 #: templates/music.php:5
 msgid "Previous"
-msgstr ""
+msgstr "Sebelumnya"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
-msgstr ""
+msgstr "Selanjutnya"
 
 #: templates/music.php:7
 msgid "Mute"
-msgstr ""
+msgstr "Nonaktifkan suara"
 
 #: templates/music.php:8
 msgid "Unmute"
-msgstr ""
-
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Lagu-lagu yang telah dipindai"
+msgstr "Aktifkan suara"
 
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Pindai ulang Koleksi"
 
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 890bf7b34af..19c8fb9ec9c 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-28 01:11+0200\n"
-"PO-Revision-Date: 2011-08-23 09:45+0000\n"
-"Last-Translator: radifar <m_radifar05@yahoo.com>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +18,26 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Otentikasi bermasalah"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID telah dirubah"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Permintaan tidak valid"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID telah dirubah"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Bahasa telah diganti"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Tambahkan aplikasi anda"
@@ -53,15 +58,15 @@ msgstr "oleh"
 msgid "Ask a question"
 msgstr "Ajukan pertanyaan"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Bermasalah saat menghubungi database bantuan."
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Pergi kesana secara manual."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Jawab"
 
@@ -77,6 +82,10 @@ msgstr "dari yang tersedia"
 msgid "Your password got changed"
 msgstr "Password anda telah dirubah"
 
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "Tidak dapat merubah password anda"
+
 #: templates/personal.php:15
 msgid "Current password"
 msgstr "Password saat ini"
@@ -94,36 +103,52 @@ msgid "Change password"
 msgstr "Rubah password"
 
 #: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Bantu terjemahkan"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:36
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "gunakan alamat ini untuk terhubung dengan ownCloud anda dalam file manager "
 "anda"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Nama"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Password"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Group"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Buat"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Hapus"
 
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 3f8e3bd1696..9a88c328e49 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
+#   <marco@carnazzo.it>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:10+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,164 +19,222 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr "Bisogna effettuare il login."
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Questa non è la tua rubrica."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
 msgstr "Il contatto non può essere trovato"
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr "Questo non è un tuo contatto."
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
 msgstr "La vCard non può essere letta"
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informazioni sulla vCard incorrette. Ricaricare la pagina."
 
-#: photo.php:53
-msgid "This card is not RFC compatible."
-msgstr "Questa card non è compatibile con il protocollo RFC."
-
-#: photo.php:90
-msgid "This card does not contain a photo."
-msgstr "Questa card non contiene una foto."
-
-#: templates/index.php:8
-msgid "Add Contact"
-msgstr "Aggiungi contatto"
-
-#: templates/part.addcardform.php:5
-msgid "Group"
-msgstr "Gruppo"
-
-#: templates/part.addcardform.php:12 templates/part.property.php:3
-msgid "Name"
-msgstr "Nome"
-
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
-msgstr "Crea contatto"
-
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Indirizzo"
 
-#: templates/part.addpropertyform.php:5
+#: lib/app.php:92 templates/part.addcardform.php:37
 msgid "Telephone"
 msgstr "Telefono"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
+#: lib/app.php:106 lib/app.php:113
 msgid "Work"
 msgstr "Lavoro"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
+#: lib/app.php:107 lib/app.php:111
 msgid "Home"
 msgstr "Casa"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Cellulare"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Testo"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Voce"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Cercapersone"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Questo non è un tuo contatto."
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr "Questa card non è compatibile con il protocollo RFC."
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr "Questa card non contiene una foto."
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "Aggiungi contatto"
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "Gruppo"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "Nome"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
 msgid "PO Box"
-msgstr "PO Box"
+msgstr "Casella postale"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Estendi"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Via"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Città"
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Regione"
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "CAP"
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Stato"
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
-msgstr "Cellulare"
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Crea contatto"
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
-msgstr "Testo"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
-msgstr "Voce"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
-msgstr "Fax"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
-msgstr "Video"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
-msgstr "Pager"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Modifica"
 
-#: templates/part.details.php:33
+#: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Delete"
 msgstr "Cancella"
 
-#: templates/part.details.php:34
-msgid "Add Property"
-msgstr "Aggiungi proprietà"
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
 msgid "Birthday"
 msgstr "Compleanno"
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
 msgstr "Telefono"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
-msgstr "Modifica"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
 
 
diff --git a/l10n/it/core.po b/l10n/it/core.po
index cd840405802..369e41fd05b 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -5,14 +5,15 @@
 # Translators:
 #   <cosenal@gmail.com>, 2011.
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
+#   <marco@carnazzo.it>, 2011.
 #   <rb.colombo@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-23 08:17+0000\n"
-"Last-Translator: OpenCode <cescoap@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +21,51 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Riceverai un link per resettare la tua password via Email"
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Richiesto"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Login fallito!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Nome utente"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Richiesta di ripristino"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "La password è stata reimpostata"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Nuova password"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Reimposta password"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personale"
@@ -46,56 +92,52 @@ msgstr "Cloud non trovata"
 
 #: templates/installation.php:20
 msgid "Create an <strong>admin account</strong>"
-msgstr "Crea un &lt;strong&gt;account amministratore&lt;/strong&gt;"
-
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Nome utente"
+msgstr "Crea un <strong>account amministratore</strong>"
 
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Password"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Opzioni avanzate"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Cartella dati"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Configura il database"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "sarà usato"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Utente database"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Password database"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Nome database"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Opzioni avanzate"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Host del database"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Cartella dati"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Termina"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "Libertà e controllo dei propri dati"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -105,38 +147,22 @@ msgstr "Log out"
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Password persa?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "ricorda"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Sei uscito."
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Riceverai via email un link per il reset della tua password"
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Richiesto"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Login fallito!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Username o email"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Reset richiesta"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "precedente"
@@ -145,16 +171,4 @@ msgstr "precedente"
 msgid "next"
 msgstr "successivo"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "tua password è stata resettata"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "Nuova password"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Reset password"
-
 
diff --git a/l10n/it/files.po b/l10n/it/files.po
index ee66302f62f..30aeedd1997 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <cosenal@gmail.com>, 2011.
+# Francesco Apruzzese <cescoap@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +19,34 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Non ci sono errori, file caricato con successo"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Il file caricato supera il valore upload_max_filesize in php.ini"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"Il file caricato supera il valore MAX_FILE_SIZE definito nel form HTML"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Il file è stato parzialmente caricato"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Nessun file è stato caricato"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Cartella temporanea mancante"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "File"
 
@@ -52,43 +54,55 @@ msgstr "File"
 msgid "Maximum upload size"
 msgstr "Dimensione massima upload"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Carica"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Nuova Cartella"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Non c'è niente qui. Carica qualcosa!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Nome"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Dimensione"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Modificato"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Cancella"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Il file caricato è troppo grande"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/it/media.po b/l10n/it/media.po
index 7f27ceaf216..573b9775417 100644
--- a/l10n/it/media.po
+++ b/l10n/it/media.po
@@ -2,14 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
+#   <marco@carnazzo.it>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-23 11:09+0200\n"
-"PO-Revision-Date: 2011-08-21 23:18+0000\n"
-"Last-Translator: OpenCode <cescoap@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,15 +19,15 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Musica"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "Play"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Pausa"
 
@@ -33,7 +35,7 @@ msgstr "Pausa"
 msgid "Previous"
 msgstr "Precedente"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "Successiva"
 
@@ -45,13 +47,9 @@ msgstr "Disattiva audio"
 msgid "Unmute"
 msgstr "Riattiva audio"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Canzoni analizzate"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
-msgstr "Rianalizza colezione"
+msgstr "Rianalizza collezione"
 
 #: templates/music.php:37
 msgid "Artist"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 8e0042ea43d..64402b03520 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -2,16 +2,18 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
-#   <rb.colombo@gmail.com>, 2011.
+# Translators:
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+#   <marco@carnazzo.it>, 2011.
+#   <rb.colombo@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-04 16:48+0200\n"
-"PO-Revision-Date: 2011-09-04 12:49+0000\n"
-"Last-Translator: RColombo <rb.colombo@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +21,26 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Errore nell'autenticazione"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID Modificato"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Richiesta non valida"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID Modificato"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Lingua modificata"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Aggiungi un applicazione"
@@ -45,7 +51,7 @@ msgstr "Seleziona un applicazione"
 
 #: templates/apps.php:23
 msgid "-licensed"
-msgstr "-licensed"
+msgstr "-rilasciato"
 
 #: templates/apps.php:23
 msgid "by"
@@ -55,15 +61,15 @@ msgstr "da"
 msgid "Ask a question"
 msgstr "Fai una domanda"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Problemi di connessione al database di aiuto"
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Vai lì manualmente."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Risposta"
 
@@ -99,37 +105,53 @@ msgstr "mostra"
 msgid "Change password"
 msgstr "Modifica password"
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Lingua"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Aiuta nella traduzione"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "usa questo indirizzo per connettersi al proprio ownCloud nel tuo file "
 "manager"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Nome"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Password"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Gruppi"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Crea"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Cancella"
 
diff --git a/l10n/ja_JP/calendar.po b/l10n/ja_JP/calendar.po
new file mode 100644
index 00000000000..31c287da115
--- /dev/null
+++ b/l10n/ja_JP/calendar.po
@@ -0,0 +1,636 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-07 18:29+0100\n"
+"PO-Revision-Date: 2012-01-08 08:41+0000\n"
+"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr "タイムゾーン�変更�れ���"
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr "無効�リクエスト��"
+
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr "カレンダー"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "誤��カレンダー��"
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr "誕生日"
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr "ビジ�ス"
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr "電話を��る"
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr "顧客"
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr "��会社"
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr "休日"
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr "アイデア"
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr "旅行"
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr "記念祭"
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr "ミーティング"
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr "��他"
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr "個人"
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr "プロジェクト"
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr "質�事項"
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr "仕事"
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr "繰り返���"
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr "毎日"
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr "毎週"
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr "毎平日"
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr "2週間��"
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr "毎月"
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr "毎年"
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "�列���り��ん"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "終日"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "項目��り��ん"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "タイトル"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "開始日"
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "開始時間"
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "終了日"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "終了時間"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "イベント終了時間�開始時間より先��"
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "データベースフェイル��り���"
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr "週"
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr "月"
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr "リスト"
+
+#: templates/calendar.php:45
+msgid "Today"
+msgstr "今日"
+
+#: templates/calendar.php:46
+msgid "Calendars"
+msgstr "カレンダー"
+
+#: templates/calendar.php:64
+msgid "There was a fail, while parsing the file."
+msgstr "ファイルを構文解��る際�失敗����"
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr "アクティブ�カレンダーを�択������"
+
+#: templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "新��カレンダーを作��る"
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr "CalDav��リンク"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr "ダウンロード"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr "編集"
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "削除"
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr "新��カレンダーを作��る"
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr "カレンダーを編集"
+
+#: templates/part.editcalendar.php:12 templates/part.import.php:29
+msgid "Displayname"
+msgstr "表示�"
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr "アクティブ"
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr "カレンダー�色"
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "�存"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "完了"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr "イベントを編集"
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "エクス�ート"
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr "イベント�タイトル"
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr "カテゴリー"
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr "カテゴリーを�択������"
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr "終日イベント"
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr "開始"
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr "終了"
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "詳細設定"
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr "繰り返�"
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "場所"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "イベント�場所"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "メモ"
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr "イベント�メモ"
+
+#: templates/part.import.php:1
+msgid "Import Ical File"
+msgstr "iCalファイル�イン�ート"
+
+#: templates/part.import.php:4
+msgid "How to import the new calendar?"
+msgstr "新��カレンダー�イン�ート方法�？"
+
+#: templates/part.import.php:6
+msgid "Import into an existing calendar"
+msgstr "既存カレンダー�イン�ート���"
+
+#: templates/part.import.php:7
+msgid "Import into a new calendar"
+msgstr "新��カレンダー�イン�ート���"
+
+#: templates/part.import.php:10
+msgid "Please choose the calendar"
+msgstr "カレンダーを�択������"
+
+#: templates/part.import.php:20 templates/part.import.php:37
+msgid "Import"
+msgstr "イン�ート"
+
+#: templates/part.import.php:22 templates/part.import.php:39
+msgid "Back"
+msgstr "戻る"
+
+#: templates/part.import.php:25
+msgid "Please fill out the form"
+msgstr "フォーム�入力������"
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr "新��イベントを作��る"
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr "タイムゾーン"
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "時刻�フォーマット"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24時間制"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12時間制"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "カレンダー�CalDAVシンクアドレス"
+
+
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
new file mode 100644
index 00000000000..c0c91102cd9
--- /dev/null
+++ b/l10n/ja_JP/contacts.po
@@ -0,0 +1,238 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: lib/app.php:42
+msgid "This is not your addressbook."
+msgstr "�れ�����電話帳���り��ん。"
+
+#: lib/app.php:51 photo.php:34
+msgid "Contact could not be found."
+msgstr "連絡先を見��る事�����ん。"
+
+#: lib/app.php:65
+msgid "vCard could not be read."
+msgstr "vCard�読�込��失敗����。"
+
+#: lib/app.php:79
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr "vCard�情報�誤り��り��。ページをリロード��下��。"
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "�所"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "電話番�"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "メールアドレス"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "所属"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "勤務先"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "�居"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "�帯電話"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "TTY TDD"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "音声番�"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "FAX"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "テレビ電話"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "�ケベル"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "����連絡先���り��ん。"
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr "��カード�RFC�準拠�����ん。"
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr "��カード�写真を�ん��り��ん。"
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "連絡先�追加"
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "グループ"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "��"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "�書箱"
+
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "拡張番地"
+
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "街路番地"
+
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "都市"
+
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "地域"
+
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "郵便番�"
+
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "国�"
+
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "追加"
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "編集"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "削除"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr "生年月日"
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr "電話番�"
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
+
+
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
new file mode 100644
index 00000000000..9511997e083
--- /dev/null
+++ b/l10n/ja_JP/core.po
@@ -0,0 +1,170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "パスワードをリセット�るリンク�メール�届���。"
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "�信�れ���"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "ログイン�失敗����。"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "ユーザ�"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "リセットを�求�る。"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "����パスワード�リセット�れ���。"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "新��パスワードを入力"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "パスワードをリセット"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "個人設定"
+
+#: strings.php:6
+msgid "Users"
+msgstr "ユーザ"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "アプリ"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "管�者"
+
+#: strings.php:9
+msgid "Help"
+msgstr "ヘルプ"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "見��られ��ん"
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr "<strong>管�者アカウント</strong>を作�������"
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr "パスワード"
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "詳細設定"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "データフォルダ"
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr "データベースを設定������"
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr "�使用�れ��"
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr "データベース�ユーザ�"
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr "データベース�パスワード"
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr "データベース�"
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr "データベース�ホスト�"
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr "セットアップを完了���"
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr "ログアウト"
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr "設定"
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr "パスワード���ら���り����？"
+
+#: templates/login.php:15
+msgid "remember"
+msgstr "パスワードを記憶�る"
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "ログアウト����。"
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "�"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "次"
+
+
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
new file mode 100644
index 00000000000..f4097681b60
--- /dev/null
+++ b/l10n/ja_JP/files.po
@@ -0,0 +1,108 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr "エラー��り��ん。ファイル�アップロード��功����。"
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr "アップロード�れ�ファイル�php.ini�upload_max_filesize�設定�れ�サイズを超�����"
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "アップロード�れ�ファイル�HTML�フォーム�設定�れ�MAX_FILE_SIZE�設定�れ�サイズを超�����"
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr "ファイル�一部分��アップロード�れ��ん���"
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr "ファイル�アップロード�れ��ん���"
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr "テン�ラリフォルダ�見��り��ん"
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr "ファイル"
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr "最大アップロードサイズ"
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr "アップロード"
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr "����何も�り��ん。何�アップロード������。"
+
+#: templates/index.php:43
+msgid "Name"
+msgstr "��"
+
+#: templates/index.php:45
+msgid "Download"
+msgstr "ダウンロード"
+
+#: templates/index.php:49
+msgid "Size"
+msgstr "サイズ"
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr "更新日時"
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr "削除"
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr "ファイルサイズ�大�����"
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "アップロード�よ�����るファイル�サー���定�れ�最大サイズを超�����"
+
+
diff --git a/l10n/ja_JP/media.po b/l10n/ja_JP/media.po
new file mode 100644
index 00000000000..7288c83d3a2
--- /dev/null
+++ b/l10n/ja_JP/media.po
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:32
+msgid "Music"
+msgstr "ミュージック"
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr "�生"
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr "一時�止"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr "�"
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr "次"
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr "ミュート"
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr "ミュート解除"
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr "コレクションを�読�込��る"
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr "アーティスト"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "アル�ム"
+
+#: templates/music.php:39
+msgid "Title"
+msgstr "曲�"
+
+
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
new file mode 100644
index 00000000000..24ad0f09c5d
--- /dev/null
+++ b/l10n/ja_JP/settings.po
@@ -0,0 +1,152 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr "無効�リクエスト��"
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID�変更�れ���"
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr "言語�変更�れ���"
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr "アプリを追加������"
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr "アプリを�択������"
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr "権利を���れ����"
+
+#: templates/apps.php:23
+msgid "by"
+msgstr "�よ��"
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr "質�������"
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr "ヘルプ用データベース接続��題�生����"
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr "手動�移動������"
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr "解答"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr "����使���る��"
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr "��。利用�能容��"
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr "パスワード�変更�れ���"
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "パスワードを変更�る�������ん"
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr "�在�パスワード"
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr "新��パスワード"
+
+#: templates/personal.php:17
+msgid "show"
+msgstr "表示"
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr "パスワードを変更�る"
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr "言語"
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr "ファイルマ�ージャー�����ownCloud�接続�る�����アドレスを使用������"
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr "��"
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr "パスワード"
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr "グループ"
+
+#: templates/users.php:23
+msgid "Create"
+msgstr "作�"
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr "削除"
+
+
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index 63d22e6f7c8..f0dae69e7d1 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <sim0n@trypill.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:11+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/team/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +18,222 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Dat do ass net däin Adressbuch."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "Konnt den Kontakt net fannen."
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "vCard konnt net gelies ginn."
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
-msgstr ""
+msgstr "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Adress"
 
-#: photo.php:53
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefon's Nummer"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "Email"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Firma"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Aarbecht"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Doheem"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "GSM"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "SMS"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Voice"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Pager"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Dat do ass net däin Kontakt."
+
+#: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Déi do Kaart ass net RFC kompatibel."
 
-#: photo.php:90
+#: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Déi do Kaart huet keng Foto."
 
-#: templates/index.php:8
+#: templates/index.php:13
 msgid "Add Contact"
+msgstr "Kontakt bäisetzen"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addcardform.php:5
+#: templates/part.addcardform.php:8
 msgid "Group"
-msgstr ""
+msgstr "Grupp"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
+#: templates/part.addcardform.php:19
 msgid "Name"
-msgstr ""
+msgstr "Numm"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Postleetzuel"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Erweidert"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
-msgstr ""
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Strooss"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
-msgstr ""
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Staat"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
-msgstr ""
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Regioun"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
-msgid "PO Box"
-msgstr ""
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Postleetzuel"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
-msgid "Extended"
-msgstr ""
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Land"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
-msgid "Street"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Kontakt erstellen"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
-msgid "City"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
-msgid "Region"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
-msgid "Zipcode"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
-msgid "Country"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Editéieren"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Läschen"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.details.php:33
+msgid "Add"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.editaddressbook.php:29
+msgid "Save"
 msgstr ""
 
-#: templates/part.details.php:33
-msgid "Delete"
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
+msgstr "Gebuertsdag"
+
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 9e0db1c821d..325db00a595 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-17 14:32+0000\n"
-"Last-Translator: sim0n <sim0n@trypill.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/team/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,52 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+"Du kriss en Link fir däin Passwuert nei ze setzen via Email geschéckt."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Gefrot"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Falschen Login!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Benotzernumm"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Reset ufroen"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Dän Passwuert ass zeréck gesat gin"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Neit Passwuert"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Passwuert zeréck setzen"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Perséinlech"
@@ -46,54 +92,50 @@ msgstr "Cloud net fonnt"
 msgid "Create an <strong>admin account</strong>"
 msgstr "En <strong>Admin Account</strong> uleeën"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Benotzernumm"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Passwuert"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Erweidert"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Daten Dossier"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Datebank konfiguréieren"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "wärt benotzt ginn"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Datebank Benotzer"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Datebank Passwuert"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Datebank Numm"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Erweidert"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Datebank Server"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Daten Dossier"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Installatioun ofschléissen"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "gëtt dir Fräiheet an Kontroll iwwert deng eegen Daten"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -103,39 +145,22 @@ msgstr "Ausloggen"
 msgid "Settings"
 msgstr "Astellungen"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Passwuert vergiess?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "verhalen"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Du bass ausgeloggt."
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr ""
-"Du kriss per E-mail en Link geschéckt fir däin Passwuert nei ze setzen."
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Verlaangt"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Aloggen feelgeschloen!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Benotzernumm oder E-Mail"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Reset ufroen"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "zeréck"
@@ -144,16 +169,4 @@ msgstr "zeréck"
 msgid "next"
 msgstr "weider"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Dän Passwuert ass nei gesat ginn"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "Neit Passwuert"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Passwuert nei setzen"
-
 
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 795847eb7ab..2580734d259 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/team/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,37 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Keen Feeler, Datei ass komplett ropgelueden ginn"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
+"Déi ropgelueden Datei ass méi grouss wei d'upload_max_filesize Eegenschaft "
+"an der php.ini"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"Déi ropgelueden Datei ass méi grouss wei d'MAX_FILE_SIZE Eegenschaft déi an "
+"der HTML form uginn ass"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Et ass keng Datei ropgelueden ginn"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Et feelt en temporären Dossier"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Dateien"
 
@@ -52,43 +56,55 @@ msgstr "Dateien"
 msgid "Maximum upload size"
 msgstr "Maximum Upload Gréisst "
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Eroplueden"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Neien Dossier"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Hei ass näischt. Lued eppes rop!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Numm"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Eroflueden"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Gréisst"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Geännert"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Läschen"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Upload ze grouss"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/lb/media.po b/l10n/lb/media.po
index a6123404729..57de6b20880 100644
--- a/l10n/lb/media.po
+++ b/l10n/lb/media.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 #   <sim0n@trypill.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-08-25 14:24+0000\n"
-"Last-Translator: sim0n <sim0n@trypill.org>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/team/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,15 +18,15 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Musek"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "Ofspillen"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Paus"
 
@@ -33,7 +34,7 @@ msgstr "Paus"
 msgid "Previous"
 msgstr "Zeréck"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "Weider"
 
@@ -45,11 +46,7 @@ msgstr "Toun ausmaachen"
 msgid "Unmute"
 msgstr "Toun umaachen"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Lidder gescannt"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Kollektioun nei scannen"
 
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 3f8ef7ff305..ae3884d073b 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-17 14:28+0000\n"
-"Last-Translator: sim0n <sim0n@trypill.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/team/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,26 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Authentifikatioun's Feeler"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID huet geännert"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Ongülteg Requête"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID huet geännert"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Sprooch huet geännert"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Sätz deng Applikatioun bäi"
@@ -54,17 +58,17 @@ msgstr "vun"
 msgid "Ask a question"
 msgstr "Stell eng Fro"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr ""
 "Problemer sinn opgetrueden beim Versuch sech un d'Hëllef Datebank ze "
 "verbannen."
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Gei manuell dohinner."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Äntwert"
 
@@ -100,37 +104,53 @@ msgstr "weisen"
 msgid "Change password"
 msgstr "Passwuert änneren"
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Sprooch"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Hëllef ze Iwwersetzen"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "benotz dës Adress fir dech un deng ownCloud iwwert däin Datei Manager ze "
 "verbannen"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Numm"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Passwuert"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Erstellen"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Läschen"
 
diff --git a/l10n/lt_LT/calendar.po b/l10n/lt_LT/calendar.po
new file mode 100644
index 00000000000..0a1fbf9cd30
--- /dev/null
+++ b/l10n/lt_LT/calendar.po
@@ -0,0 +1,637 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-07 18:29+0100\n"
+"PO-Revision-Date: 2012-01-08 08:41+0000\n"
+"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/team/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr "Laiko zona pakeista"
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr "Klaidinga užklausa"
+
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr "Kalendorius"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Ne tas kalendorius"
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr "Gimtadienis"
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr "Verslas"
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr "Skambu�iai"
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr "Klientai"
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr "IÅ¡eiginÄ—s"
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr "IdÄ—jos"
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr "KelionÄ—"
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr "Jubiliejus"
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr "Susitikimas"
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr ""
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr "Nekartoti"
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr "Kasdien"
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr "KiekvienÄ… savaitÄ™"
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr "KiekvienÄ… savaitÄ—s dienÄ…"
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr "Kas dvi savaites"
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr "Kiekvieną mėnesį"
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr "Kiekvienais metais"
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Ne masyvas"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Visa diena"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Trūkstami laukai"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Pavadinimas"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr ""
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr ""
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Iki datos"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Iki laiko"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Įvykis baigiasi anks�iau nei jis prasideda"
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Įvyko duomenų bazės klaida"
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr "SavaitÄ—"
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr "MÄ—nuo"
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr "Sąrašas"
+
+#: templates/calendar.php:45
+msgid "Today"
+msgstr "Å iandien"
+
+#: templates/calendar.php:46
+msgid "Calendars"
+msgstr "Kalendoriai"
+
+#: templates/calendar.php:64
+msgid "There was a fail, while parsing the file."
+msgstr "Apdorojant failą įvyko klaida."
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr "Pasirinkite naudojamus kalendorius"
+
+#: templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Naujas kalendorius"
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr "CalDav adresas"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr "Atsisiųsti"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr "Keisti"
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "Trinti"
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr "Naujas kalendorius"
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr "Taisyti kalendorių"
+
+#: templates/part.editcalendar.php:12 templates/part.import.php:29
+msgid "Displayname"
+msgstr "Pavadinimas"
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr "Naudojamas"
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr ""
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "IÅ¡saugoti"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "IÅ¡saugoti"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr "Atšaukti"
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr "Taisyti įvykį"
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Eksportuoti"
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr "Įvykio pavadinimas"
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr "Kategorija"
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr "Pasirinkite kategorijÄ…"
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr "Visos dienos įvykis"
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr "Nuo"
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr "Iki"
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Papildomi nustatymai"
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr "Kartoti"
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Vieta"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Įvykio vieta"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Aprašymas"
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr "Įvykio aprašymas"
+
+#: templates/part.import.php:1
+msgid "Import Ical File"
+msgstr "Importuoti Ical failÄ…"
+
+#: templates/part.import.php:4
+msgid "How to import the new calendar?"
+msgstr "Kaip importuoti naują kalendorių?"
+
+#: templates/part.import.php:6
+msgid "Import into an existing calendar"
+msgstr "Importuoti į esantį katalogą"
+
+#: templates/part.import.php:7
+msgid "Import into a new calendar"
+msgstr "Importuoti į naują kalendorių"
+
+#: templates/part.import.php:10
+msgid "Please choose the calendar"
+msgstr "Pasirinkite kalendorių"
+
+#: templates/part.import.php:20 templates/part.import.php:37
+msgid "Import"
+msgstr "Importuoti"
+
+#: templates/part.import.php:22 templates/part.import.php:39
+msgid "Back"
+msgstr "Atgal"
+
+#: templates/part.import.php:25
+msgid "Please fill out the form"
+msgstr "Užpildykite formą"
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr "Sukurti naują įvykį"
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr "Laiko juosta"
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Laiko formatas"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24val"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12val"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "CalDAV kalendoriaus synchronizavimo adresas:"
+
+
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
new file mode 100644
index 00000000000..4e57c2a6575
--- /dev/null
+++ b/l10n/lt_LT/contacts.po
@@ -0,0 +1,239 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/team/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: lib/app.php:42
+msgid "This is not your addressbook."
+msgstr "Tai ne jūsų adresų knygelė."
+
+#: lib/app.php:51 photo.php:34
+msgid "Contact could not be found."
+msgstr "Kontaktas nerastas"
+
+#: lib/app.php:65
+msgid "vCard could not be read."
+msgstr "Nenuskaitoma vCard."
+
+#: lib/app.php:79
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr "Informacija apie vCard yra neteisinga. "
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Adresas"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefonas"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "El. paštas"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organizacija"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Darbo"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Namų"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mobilusis"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Tekstas"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Balso"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Faksas"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Vaizdo"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Pranešimų gaviklis"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Tai ne jūsų kontaktas"
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr ""
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr ""
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "PridÄ—ti kontaktÄ…"
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "GrupÄ—"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "Vardas"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Pašto dėžutė"
+
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr ""
+
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "GatvÄ—"
+
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Miestas"
+
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Regionas"
+
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Pašto indeksas"
+
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Å alis"
+
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Sukurti kontaktÄ…"
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Keisti"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Trinti"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr "Gimtadienis"
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr "Telefonas"
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
+
+
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
new file mode 100644
index 00000000000..0f9ca6992ca
--- /dev/null
+++ b/l10n/lt_LT/core.po
@@ -0,0 +1,173 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/team/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+"Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti "
+"slaptažodį."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Užklausta"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Prisijungti nepavyko!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Prisijungimo vardas"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Prašyti nustatymo iš najo"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Jūsų slaptažodis buvo nustatytas iš naujo"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Naujas slaptažodis"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Atkurti slaptažodį"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "Asmeniniai"
+
+#: strings.php:6
+msgid "Users"
+msgstr "Vartotojai"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "Programos"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "Administravimas"
+
+#: strings.php:9
+msgid "Help"
+msgstr "Pagalba"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "Negalima rasti"
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr "Sukurti <strong>administratoriaus paskyrÄ…</strong>"
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr "Slaptažodis"
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Duomenų katalogas"
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr "Nustatyti duomenų bazę"
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr "bus naudojama"
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr "Duomenų bazės vartotojas"
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr "Duomenų bazės slaptažodis"
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr "Duomenų bazės pavadinimas"
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr "Duomenų bazės serveris"
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr "Baigti diegimÄ…"
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr "Atsijungti"
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr "Nustatymai"
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr "Pamiršote slaptažodį?"
+
+#: templates/login.php:15
+msgid "remember"
+msgstr "prisiminti"
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "JÅ«s atsijungÄ—te."
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "atgal"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "kitas"
+
+
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
new file mode 100644
index 00000000000..6ad89a67524
--- /dev/null
+++ b/l10n/lt_LT/files.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/team/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr "Klaidų nėra, failas įkeltas sėkmingai"
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr "Įkeliamo failo dydis viršija upload_max_filesize parametrą php.ini"
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+"Įkeliamo failo dydis viršija MAX_FILE_SIZE parametrą, kuris yra nustatytas "
+"HTML formoje"
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr "Failas buvo įkeltas tik dalinai"
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr "Nebuvo įkeltas nė vienas failas"
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr "NÄ—ra laikinojo katalogo"
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr "Failai"
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr "Maksimalus failo dydis"
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr "Įkelti"
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr "Čia tuš�ia. Įkelkite ką nors!"
+
+#: templates/index.php:43
+msgid "Name"
+msgstr "Pavadinimas"
+
+#: templates/index.php:45
+msgid "Download"
+msgstr "Atsisiųsti"
+
+#: templates/index.php:49
+msgid "Size"
+msgstr "Dydis"
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr "Pakeista"
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr "IÅ¡trinti"
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr "Įkėlimui failas per didelis"
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+"Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame serveryje"
+
+
diff --git a/l10n/lt_LT/media.po b/l10n/lt_LT/media.po
new file mode 100644
index 00000000000..3cf68998f16
--- /dev/null
+++ b/l10n/lt_LT/media.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/team/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: appinfo/app.php:32
+msgid "Music"
+msgstr "Muzika"
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr "Groti"
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr "Pristabdyti"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr "Atgal"
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr "Kitas"
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr "Nutildyti"
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr "Įjungti garsą"
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr "Atnaujinti kolekcijÄ…"
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr "AtlikÄ—jas"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "Albumas"
+
+#: templates/music.php:39
+msgid "Title"
+msgstr "Pavadinimas"
+
+
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
new file mode 100644
index 00000000000..ec0f1bd45cb
--- /dev/null
+++ b/l10n/lt_LT/settings.po
@@ -0,0 +1,154 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Dr. ROX  <to.dr.rox@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/team/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr "Klaidinga užklausa"
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID pakeistas"
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr "Kalba pakeista"
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr "Pridėti jūsų programą"
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr "Pasirinkite programÄ…"
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr "-licencijuota"
+
+#: templates/apps.php:23
+msgid "by"
+msgstr ""
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr "Užduoti klausimą"
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr "Problemos jungiantis prie duomenų bazės"
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr "Atsakyti"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr "JÅ«s naudojate"
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr "iš galimų"
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr "Jūsų slaptažodis buvo pakeistas"
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "Neįmanoma pakeisti slaptažodžio"
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr "Dabartinis slaptažodis"
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr "Naujas slaptažodis"
+
+#: templates/personal.php:17
+msgid "show"
+msgstr "rodyti"
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr "Pakeisti slaptažodį"
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr "Kalba"
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+"naudokite šį adresą, jei norite pasiekti savo ownCloud per failų tvarkyklę"
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr "Vardas"
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr "Slaptažodis"
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr "GrupÄ—s"
+
+#: templates/users.php:23
+msgid "Create"
+msgstr "Sukurti"
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr "IÅ¡trinti"
+
+
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index 59b737d3660..bf358898d49 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:10+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/team/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +17,222 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr ""
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
 msgstr ""
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
 msgstr ""
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: photo.php:53
-msgid "This card is not RFC compatible."
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
 msgstr ""
 
-#: photo.php:90
-msgid "This card does not contain a photo."
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
 msgstr ""
 
-#: templates/index.php:8
-msgid "Add Contact"
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
 msgstr ""
 
-#: templates/part.addcardform.php:5
-msgid "Group"
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
 msgstr ""
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
-msgid "Name"
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
 msgstr ""
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: lib/app.php:112
+msgid "Mobile"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
+#: lib/app.php:114
+msgid "Text"
 msgstr ""
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
+#: lib/app.php:115
+msgid "Voice"
 msgstr ""
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
+#: lib/app.php:116
+msgid "Fax"
 msgstr ""
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
+#: lib/app.php:117
+msgid "Video"
 msgstr ""
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
+#: lib/app.php:118
+msgid "Pager"
+msgstr ""
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr ""
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr ""
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr ""
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr ""
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr ""
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr ""
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr ""
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Delete"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
 msgid "Birthday"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
 msgstr ""
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index fdd7e66e3ae..7425a4e2781 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-15 13:57+0000\n"
-"Last-Translator: hadrihilmi <hadri.hilmi@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/team/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,51 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Nama pengguna"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Peribadi"
@@ -46,54 +91,50 @@ msgstr "Awan tidak dijumpai"
 msgid "Create an <strong>admin account</strong>"
 msgstr "buat <strong>akaun admin</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Nama pengguna"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Kata laluan"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Maju"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Fail data"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Konfigurasi pangkalan data"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "akan digunakan"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Nama pengguna pangkalan data"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Kata laluan pangkalan data"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Nama pangkalan data"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Maju"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Hos pangkalan data"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Fail data"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Setup selesai"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "memberikan anda kebebasan dan kendalian keatas data anda"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -103,40 +144,22 @@ msgstr "Log keluar"
 msgid "Settings"
 msgstr "Tetapan"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Hilang kata laluan?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "ingat"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Anda telah log keluar."
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr ""
-"Anda akan menerima link untuk menetapkan semula kata laluan anda melalui "
-"emel"
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "diminta"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Log in gagal!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Nama pengguna atau Emel"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Minta set semula"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "sebelum"
@@ -145,16 +168,4 @@ msgstr "sebelum"
 msgid "next"
 msgstr "seterus"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Kata laluan anda diset semula"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "Kata laluan baru"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Set semula kata laluan"
-
 
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 2e340c01696..1d35a713693 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/team/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,33 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "fail"
 
@@ -52,43 +52,55 @@ msgstr "fail"
 msgid "Maximum upload size"
 msgstr "Saiz maksimum muat naik"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Muat naik"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Folder baru"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Nama "
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Saiz"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Padam"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Muat naik terlalu besar"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/ms_MY/media.po b/l10n/ms_MY/media.po
index f6c41264bc1..b0ee4ec4540 100644
--- a/l10n/ms_MY/media.po
+++ b/l10n/ms_MY/media.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-09 00:01+0000\n"
-"Last-Translator: hadrihilmi <hadri.hilmi@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/team/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Muzik"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "Main"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Jeda"
 
@@ -34,7 +34,7 @@ msgstr "Jeda"
 msgid "Previous"
 msgstr "Sebelum"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "Seterus"
 
@@ -46,11 +46,7 @@ msgstr "Bisu"
 msgid "Unmute"
 msgstr "Nyahbisu"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Lagu telah diimbas"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Imbas semula koleksi"
 
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index dda63fafd8d..d8166d0823a 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-15 14:00+0000\n"
-"Last-Translator: hadrihilmi <hadri.hilmi@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/team/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,26 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Ralat pengesahan"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID ditukar"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Permintaan tidak sah"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID ditukar"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Bahasa ditukar"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Tambah aplikasi anda"
@@ -54,15 +58,15 @@ msgstr "oleh"
 msgid "Ask a question"
 msgstr "Tanya soalan"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Masalah menghubung untuk membantu pengkalan data"
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Pergi ke sana secara manual"
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Jawapan"
 
@@ -98,36 +102,52 @@ msgstr "Papar"
 msgid "Change password"
 msgstr "Tukar kata laluan"
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Bantu perterjemahan"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "guna alamat ini untuk menyambung owncloud anda dalam pengurus fail anda"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Nama"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Kata laluan "
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Kumpulan"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Buat"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Padam"
 
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index 430819ce1c9..4107b2438ac 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:11+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/team/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +17,222 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr ""
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
 msgstr ""
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
 msgstr ""
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: photo.php:53
-msgid "This card is not RFC compatible."
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
 msgstr ""
 
-#: photo.php:90
-msgid "This card does not contain a photo."
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
 msgstr ""
 
-#: templates/index.php:8
-msgid "Add Contact"
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
 msgstr ""
 
-#: templates/part.addcardform.php:5
-msgid "Group"
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
 msgstr ""
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
-msgid "Name"
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
 msgstr ""
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: lib/app.php:112
+msgid "Mobile"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
+#: lib/app.php:114
+msgid "Text"
 msgstr ""
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
+#: lib/app.php:115
+msgid "Voice"
 msgstr ""
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
+#: lib/app.php:116
+msgid "Fax"
 msgstr ""
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
+#: lib/app.php:117
+msgid "Video"
 msgstr ""
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
+#: lib/app.php:118
+msgid "Pager"
+msgstr ""
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr ""
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr ""
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr ""
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr ""
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr ""
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr ""
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr ""
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Delete"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
 msgid "Birthday"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
 msgstr ""
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 018c1d81e7a..f29376cf89e 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 #   <ajarmund@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-04 18:14+0200\n"
-"PO-Revision-Date: 2011-09-04 16:14+0000\n"
-"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/team/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,51 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Brukernavn"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personlig"
@@ -45,53 +91,49 @@ msgstr "Sky ikke funnet"
 msgid "Create an <strong>admin account</strong>"
 msgstr "opprett en <strong>administrator-konto</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Brukernavn"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Passord"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Avansert"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Datamappe"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "vil bli brukt"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Databasebruker"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Databasenavn"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Avansert"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Datamappe"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Fullfør oppsetting"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
+msgid "web services under your control"
 msgstr ""
 
 #: templates/layout.user.php:34
@@ -102,38 +144,22 @@ msgstr "Logg ut"
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "husk"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Du er logget ut"
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr ""
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr ""
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Klarte ikke å logge inn!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr ""
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr ""
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "forrige"
@@ -142,16 +168,4 @@ msgstr "forrige"
 msgid "next"
 msgstr "neste"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr ""
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr ""
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr ""
-
 
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index c3bfd2ffbfc..67190d755f6 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/team/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,33 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Filer"
 
@@ -52,43 +52,55 @@ msgstr "Filer"
 msgid "Maximum upload size"
 msgstr "Maksimum opplastingsstørrelse"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Last opp"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Ny mappe"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last opp noe!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Navn"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Størrelse"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Endret"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Opplasting for stor"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/nb_NO/media.po b/l10n/nb_NO/media.po
index 490bdb6f40f..7d52e2bc2b8 100644
--- a/l10n/nb_NO/media.po
+++ b/l10n/nb_NO/media.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 #   <ajarmund@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-08-28 19:34+0000\n"
-"Last-Translator: anjar <ajarmund@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/team/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,15 +18,15 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Musikk"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "Spill"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Pause"
 
@@ -33,7 +34,7 @@ msgstr "Pause"
 msgid "Previous"
 msgstr "Forrige"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "Neste"
 
@@ -45,11 +46,7 @@ msgstr "Demp"
 msgid "Unmute"
 msgstr "Skru på lyd"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Sanger skannet"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Skan samling på nytt"
 
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 46743d594a2..70ffa14920e 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 #   <ajarmund@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-08-28 19:31+0000\n"
-"Last-Translator: anjar <ajarmund@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/team/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +18,26 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Autentifikasjonsfeil"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID endret"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Ugyldig forespørsel"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID endret"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Språk endret"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Legg til din applikasjon"
@@ -53,15 +58,15 @@ msgstr "av"
 msgid "Ask a question"
 msgstr "Still et spørsmål"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Problemer med å koble til hjelp-databasen"
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "GÃ¥ dit manuelt"
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Svar"
 
@@ -97,36 +102,52 @@ msgstr "vis"
 msgid "Change password"
 msgstr "Endre passord"
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Hjelp oss å oversett"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:36
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "bruk denne adressen for å koble til din ownCloud gjennom filhåndtereren"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Navn"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Passord"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Opprett"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Slett"
 
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index 48de047d7a4..fcdf92add2b 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -3,13 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <bart.formosus@gmail.com>, 2011.
+#   <bartv@thisnet.nl>, 2011.
+#   <icewind1991@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:11+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:53+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +20,222 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Dit is niet uw adresboek."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
-
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
+msgstr "Contact kon niet worden gevonden."
 
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "vCard kon niet worden gelezen."
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
-msgstr ""
-
-#: photo.php:53
-msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Informatie over de vCard is onjuist. Herlaad de pagina."
 
-#: photo.php:90
-msgid "This card does not contain a photo."
-msgstr ""
-
-#: templates/index.php:8
-msgid "Add Contact"
-msgstr ""
-
-#: templates/part.addcardform.php:5
-msgid "Group"
-msgstr ""
-
-#: templates/part.addcardform.php:12 templates/part.property.php:3
-msgid "Name"
-msgstr ""
-
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
-msgstr ""
-
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
-msgstr ""
+msgstr "Adres"
 
-#: templates/part.addpropertyform.php:5
+#: lib/app.php:92 templates/part.addcardform.php:37
 msgid "Telephone"
-msgstr ""
+msgstr "Telefoon"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
-msgstr ""
+msgstr "E-mail"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
-msgstr ""
+msgstr "Organisatie"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
+#: lib/app.php:106 lib/app.php:113
 msgid "Work"
-msgstr ""
+msgstr "Werk"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
+#: lib/app.php:107 lib/app.php:111
 msgid "Home"
-msgstr ""
+msgstr "Thuis"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mobiel"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Tekst"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Stem"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Pieper"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Dit is niet uw contactpersoon."
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr "Deze kaart is niet RFC compatibel."
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr "Deze contact bevat geen foto."
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "Contact toevoegen"
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr "Adresboeken"
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "Groep"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "Naam"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr "Nummer"
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr "Type"
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
 msgid "PO Box"
-msgstr ""
+msgstr "Postbus"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
 msgid "Extended"
-msgstr ""
+msgstr "Uitgebreide"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
 msgid "Street"
-msgstr ""
+msgstr "Straat"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
 msgid "City"
-msgstr ""
+msgstr "Stad"
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
 msgid "Region"
-msgstr ""
+msgstr "Regio"
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
 msgid "Zipcode"
-msgstr ""
+msgstr "Postcode"
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
 msgid "Country"
-msgstr ""
+msgstr "Land"
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Contact aanmaken"
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
-msgstr ""
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr "Kies actief Adresboek"
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
-msgstr ""
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr "Nieuw Adresboek"
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
-msgstr ""
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr "CardDav Link"
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
-msgstr ""
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr "Download"
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
-msgstr ""
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Bewerken"
 
-#: templates/part.details.php:33
+#: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Delete"
-msgstr ""
+msgstr "Verwijderen"
 
-#: templates/part.details.php:34
-msgid "Add Property"
-msgstr ""
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr "Verwijder contact"
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr "Voeg toe"
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr "Bewerk Adresboek"
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr "Weergavenaam"
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr "Actief"
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr "Opslaan"
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr "Opslaan"
 
-#: templates/part.property.php:9
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr "Anuleren"
+
+#: templates/part.property.php:3
 msgid "Birthday"
-msgstr ""
+msgstr "Verjaardag"
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr "Voorkeur"
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Telefoon"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
-msgstr ""
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr "Vernieuwe"
 
 
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 0a296a3685d..82059730f37 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-15 09:12+0000\n"
-"Last-Translator: isama <bart.formosus@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +20,52 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+"U ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Gevraagd"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Login mislukt!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Resetaanvraag"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Je wachtwoord is geweizigd"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Nieuw wachtwoord"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Reset wachtwoord"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Persoonlijk"
@@ -48,54 +94,50 @@ msgstr "Cloud niet gevonden"
 msgid "Create an <strong>admin account</strong>"
 msgstr "Maak een <strong>beheerdersaccount</strong> aan"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Gebruikersnaam"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Gegevensmap"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Configureer de databank"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "zal gebruikt worden"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Gebruiker databank"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Wachtwoord databank"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Naam databank"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Geavanceerd"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Database server"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Gegevensmap"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Installatie afronden"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "geeft u vrijheid en controle over uw eigen data"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -105,38 +147,22 @@ msgstr "Afmelden"
 msgid "Settings"
 msgstr "Instellingen"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Uw wachtwoord vergeten?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "onthoud gegevens"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "U bent afgemeld."
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "U ontvangt een link om uw wachtwoord te wijzigen via Email"
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Aangevraagd"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Aanmelden mislukt!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Gebruikersnaam of Email"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Wachtwoordreset aanvragen"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "vorige"
@@ -145,16 +171,4 @@ msgstr "vorige"
 msgid "next"
 msgstr "volgende"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Uw wachtwoord is opnieuw ingesteld"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "Nieuw wachtwoord"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Reset wachtwoord"
-
 
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 67178beb961..b3133780235 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -3,15 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <bart.formosus@gmail.com>, 2011.
+#   <bartv@thisnet.nl>, 2011.
 #   <icewind1991@gmail.com>, 2011.
 #   <koen@vervloesem.eu>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +21,37 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Geen fout opgetreden, bestand successvol geupload."
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
+"Het geüploade bestand is groter dan de upload_max_filesize instelling in "
+"php.ini"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"Het geüploade bestand is groter dan de MAX_FILE_SIZE richtlijn die is "
+"opgegeven in de HTML-formulier"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Het bestand is slechts gedeeltelijk geupload"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Geen bestand geüpload"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Een tijdelijke map mist"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Bestanden"
 
@@ -53,43 +59,55 @@ msgstr "Bestanden"
 msgid "Maximum upload size"
 msgstr "Maximale bestandsgrootte voor uploads"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Upload"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Nieuwe map"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Er bevindt zich hier niets. Upload een bestand!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Naam"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Bestandsgrootte"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Laatst aangepast"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Verwijder"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Bestanden te groot"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/nl/media.po b/l10n/nl/media.po
index 21a797fe700..2a84b3f1689 100644
--- a/l10n/nl/media.po
+++ b/l10n/nl/media.po
@@ -2,14 +2,17 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+#   <bart.formosus@gmail.com>, 2011.
 #   <icewind1991@gmail.com>, 2011.
+#   <koen@vervloesem.eu>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-20 05:08+0200\n"
-"PO-Revision-Date: 2011-08-20 03:08+0000\n"
-"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,39 +20,35 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Muziek"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
-msgstr ""
+msgstr "Afspelen"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
-msgstr "Pauze"
+msgstr "Pauzeer"
 
 #: templates/music.php:5
 msgid "Previous"
-msgstr ""
+msgstr "Vorige"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
-msgstr ""
+msgstr "Volgende"
 
 #: templates/music.php:7
 msgid "Mute"
-msgstr ""
+msgstr "Dempen"
 
 #: templates/music.php:8
 msgid "Unmute"
-msgstr ""
-
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "nummers gescanned"
+msgstr "Dempen uit"
 
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Collectie opnieuw scannen"
 
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 174daa75507..4502ab58169 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -2,14 +2,17 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+#   <bart.formosus@gmail.com>, 2011.
 #   <icewind1991@gmail.com>, 2011.
+#   <koen@vervloesem.eu>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-28 01:13+0200\n"
-"PO-Revision-Date: 2011-08-27 23:13+0000\n"
-"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,33 +20,37 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Authenticatiefout."
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID is aangepast"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Ongeldig verzoek"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID is aangepast"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Taal aangepast"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
-msgstr ""
+msgstr "Voeg uw applicatie toe"
 
 #: templates/apps.php:21
 msgid "Select an App"
-msgstr "Selecteer een App"
+msgstr "Selecteer een app"
 
 #: templates/apps.php:23
 msgid "-licensed"
-msgstr "-gelicenseerd"
+msgstr "-gelicentieerd"
 
 #: templates/apps.php:23
 msgid "by"
@@ -53,15 +60,15 @@ msgstr "door"
 msgid "Ask a question"
 msgstr "Stel een vraag"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
-msgstr ""
+msgstr "Problemen bij het verbinden met de helpdatabank."
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
-msgstr ""
+msgstr "Ga er zelf heen."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Beantwoord"
 
@@ -79,7 +86,7 @@ msgstr "Uw wachtwoord is aangepast"
 
 #: templates/personal.php:14
 msgid "Unable to change your password"
-msgstr ""
+msgstr "Niet in staat om uw wachtwoord te wijzigen"
 
 #: templates/personal.php:15
 msgid "Current password"
@@ -95,39 +102,55 @@ msgstr "weergeven"
 
 #: templates/personal.php:18
 msgid "Change password"
-msgstr "Verander wachtwoord"
+msgstr "Wijzig wachtwoord"
 
 #: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Taal"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Help met vertalen"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:36
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
-"gebruik dit adres om verbinding te maken met ownCloud in uw bestandsbeheer "
-"programa"
+"gebruik dit adres om verbinding te maken met ownCloud in uw "
+"bestandsbeheerprogramma"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Naam"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Groepen"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Creëer"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "verwijderen"
 
diff --git a/l10n/nn_NO/calendar.po b/l10n/nn_NO/calendar.po
new file mode 100644
index 00000000000..faff7c6243c
--- /dev/null
+++ b/l10n/nn_NO/calendar.po
@@ -0,0 +1,637 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <p.ixiemotion@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-07 18:29+0100\n"
+"PO-Revision-Date: 2012-01-08 08:41+0000\n"
+"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/team/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr "Endra tidssone"
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr "Ugyldig førespurnad"
+
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr "Kalender"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Feil kalender"
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr "Bursdag"
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr "Forretning"
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr "Telefonsamtale"
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr "Klientar"
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr "Forsending"
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr "Høgtid"
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr "Idear"
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr "Reise"
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr "Jubileum"
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr "Møte"
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr "Anna"
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr "Personleg"
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr "Prosjekt"
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr "Spørsmål"
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr "Arbeid"
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr "Ikkje gjenta"
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr "Kvar dag"
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr "Kvar veke"
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr "Kvar vekedag"
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr "Annakvar veke"
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr "Kvar månad"
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr "Kvart år"
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Ikkje ein matrise"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Heile dagen"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr ""
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Tittel"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr ""
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr ""
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr ""
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr ""
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr ""
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr "Veke"
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr "MÃ¥nad"
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr "Liste"
+
+#: templates/calendar.php:45
+msgid "Today"
+msgstr "I dag"
+
+#: templates/calendar.php:46
+msgid "Calendars"
+msgstr "Kalendarar"
+
+#: templates/calendar.php:64
+msgid "There was a fail, while parsing the file."
+msgstr "Feil ved tolking av fila."
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr "Vel aktive kalendarar"
+
+#: templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Ny kalender"
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr "CalDav-lenkje"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr "Last ned"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr "Endra"
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "Slett"
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr "Ny kalender"
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr "Endra kalendarar"
+
+#: templates/part.editcalendar.php:12 templates/part.import.php:29
+msgid "Displayname"
+msgstr "Visingsnamn"
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr "Aktiv"
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr "Kalenderfarge"
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "Lagra"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "Lagra"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr "Endra ein hending"
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr "Tittel på hendinga"
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr "Kategori"
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr "Vel kategori"
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr "Heildagshending"
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr "Frå"
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr "Til"
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr "Gjenta"
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Stad"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Stad for hendinga"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Skildring"
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr "Skildring av hendinga"
+
+#: templates/part.import.php:1
+msgid "Import Ical File"
+msgstr ""
+
+#: templates/part.import.php:4
+msgid "How to import the new calendar?"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Import into an existing calendar"
+msgstr ""
+
+#: templates/part.import.php:7
+msgid "Import into a new calendar"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "Please choose the calendar"
+msgstr ""
+
+#: templates/part.import.php:20 templates/part.import.php:37
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:22 templates/part.import.php:39
+msgid "Back"
+msgstr ""
+
+#: templates/part.import.php:25
+msgid "Please fill out the form"
+msgstr ""
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr "Opprett ei ny hending"
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr "Tidssone"
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr ""
+
+
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
new file mode 100644
index 00000000000..fdf1c5d4c38
--- /dev/null
+++ b/l10n/nn_NO/contacts.po
@@ -0,0 +1,239 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <p.ixiemotion@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/team/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: lib/app.php:42
+msgid "This is not your addressbook."
+msgstr "Dette er ikkje di adressebok."
+
+#: lib/app.php:51 photo.php:34
+msgid "Contact could not be found."
+msgstr "Fann ikkje kontakten."
+
+#: lib/app.php:65
+msgid "vCard could not be read."
+msgstr "Klarte ikkje å lesa vCard-et."
+
+#: lib/app.php:79
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Adresse"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefonnummer"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "Epost"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organisasjon"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Arbeid"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Heime"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Tekst"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Tale"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Faks"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Personsøkjar"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Dette er ikkje din kontakt."
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr "Dette kortet er ikkje RFC-kompatibelt"
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr "Dette kortet har ingen bilete."
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "Legg til kontakt"
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "Gruppe"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "Namn"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Postboks"
+
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Utvida"
+
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Gate"
+
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Stad"
+
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Region/fylke"
+
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Postnummer"
+
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Land"
+
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Opprett kontakt"
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Endra"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Slett"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr "Bursdag"
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr "Telefonnummer"
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
+
+
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
new file mode 100644
index 00000000000..fe829fc91d3
--- /dev/null
+++ b/l10n/nn_NO/core.po
@@ -0,0 +1,171 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <p.ixiemotion@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/team/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Du vil få ei lenkje for å nullstilla passordet via epost."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Førespurt"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Feil ved innlogging!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Brukarnamn"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Be om nullstilling"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Passordet ditt er nullstilt"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Nytt passord"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Nullstill passord"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "Personleg"
+
+#: strings.php:6
+msgid "Users"
+msgstr "Brukarar"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "Applikasjonar"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "Administrer"
+
+#: strings.php:9
+msgid "Help"
+msgstr "Hjelp"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "Fann ikkje skyen"
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr "Lag ein <strong>admin-konto</strong>"
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr "Passord"
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Avansert"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Datamappe"
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr "Konfigurer databasen"
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr "vil bli nytta"
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr "Databasebrukar"
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr "Databasepassord"
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr "Databasenamn"
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr "Databasetenar"
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr "Fullfør oppsettet"
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr "Logg ut"
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr "Innstillingar"
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr "Gløymt passordet?"
+
+#: templates/login.php:15
+msgid "remember"
+msgstr "hugs"
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "Du er logga ut."
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "førre"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "neste"
+
+
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
new file mode 100644
index 00000000000..eb6d21f3b66
--- /dev/null
+++ b/l10n/nn_NO/files.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <p.ixiemotion@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/team/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr "Ingen feil, fila vart lasta opp"
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+"Den opplasta fila er større enn variabelen upload_max_filesize i php.ini"
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+"Den opplasta fila er større enn variabelen MAX_FILE_SIZE i HTML-skjemaet"
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr "Fila vart berre delvis lasta opp"
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr "Ingen filer vart lasta opp"
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr "Manglar ei mellombels mappe"
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr "Filer"
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr "Maksimal opplastingsstorleik"
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr "Last opp"
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr "Ingenting her. Last noko opp!"
+
+#: templates/index.php:43
+msgid "Name"
+msgstr "Namn"
+
+#: templates/index.php:45
+msgid "Download"
+msgstr "Last ned"
+
+#: templates/index.php:49
+msgid "Size"
+msgstr "Storleik"
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr "Endra"
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr "Slett"
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr "For stor opplasting"
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+"Filene du prøver å laste opp er større enn maksgrensa til denne tenaren."
+
+
diff --git a/l10n/nn_NO/media.po b/l10n/nn_NO/media.po
new file mode 100644
index 00000000000..8ea54227031
--- /dev/null
+++ b/l10n/nn_NO/media.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <p.ixiemotion@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/team/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:32
+msgid "Music"
+msgstr "Musikk"
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr "Spel"
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr "Pause"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr "Førre"
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr "Neste"
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr "Demp"
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr "Skru på lyd"
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr "Skann samlinga på nytt"
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr "Artist"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "Album"
+
+#: templates/music.php:39
+msgid "Title"
+msgstr "Tittel"
+
+
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
new file mode 100644
index 00000000000..7e87bd41237
--- /dev/null
+++ b/l10n/nn_NO/settings.po
@@ -0,0 +1,153 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <p.ixiemotion@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/team/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr "Ugyldig førespurnad"
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID endra"
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr "Språk endra"
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr "Legg til applikasjonen din"
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr "Vel ein applikasjon"
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr "-lisensiert"
+
+#: templates/apps.php:23
+msgid "by"
+msgstr "av"
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr "Spør om noko"
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr "Problem ved tilkopling til hjelpedatabasen."
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr "Gå der på eigen hand."
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr "Svar"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr "Du bruker"
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr "av dei tilgjengelege"
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr "Passordet ditt er endra"
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "Klarte ikkje å endra passordet"
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr "Passord"
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr "Nytt passord"
+
+#: templates/personal.php:17
+msgid "show"
+msgstr "vis"
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr "Endra passord"
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr "Språk"
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr "bruk denne adressa for å kopla til ownCloud i filhandsamaren din"
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr "Namn"
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr "Passord"
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr "Grupper"
+
+#: templates/users.php:23
+msgid "Create"
+msgstr "Lag"
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr "Slett"
+
+
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index a8793db4831..c0266c5da55 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Marcin Małecki <gerber@tkdami.net>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:11+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +18,222 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "To nie jest twoja książka adresowa."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "Kontakt nie znaleziony."
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "Nie można odczytać vCard."
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
-msgstr ""
+msgstr "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Adres"
 
-#: photo.php:53
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "E-mail"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organizacja"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Praca"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Dom"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Komórka"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Tekst"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Połączenie głosowe"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Faks"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Połączenie wideo"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Pager"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "To nie jest twój kontakt."
+
+#: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Ta karta nie jest zgodna ze specyfikacjÄ… RFC."
 
-#: photo.php:90
+#: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Ta karta nie zawiera zdjęć."
 
-#: templates/index.php:8
+#: templates/index.php:13
 msgid "Add Contact"
+msgstr "Dodaj kontakt"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addcardform.php:5
+#: templates/part.addcardform.php:8
 msgid "Group"
-msgstr ""
+msgstr "Grupa"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
+#: templates/part.addcardform.php:19
 msgid "Name"
-msgstr ""
+msgstr "Nazwisko"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "PO Box"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Rozszerzony"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
-msgstr ""
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Ulica"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
-msgstr ""
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Miasto"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
-msgstr ""
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Region"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
-msgid "PO Box"
-msgstr ""
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Kod pocztowy"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
-msgid "Extended"
-msgstr ""
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Kraj"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
-msgid "Street"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Utwórz kontakt"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
-msgid "City"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
-msgid "Region"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
-msgid "Zipcode"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
-msgid "Country"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Edytuj"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Usuń"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.details.php:33
+msgid "Add"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.editaddressbook.php:29
+msgid "Save"
 msgstr ""
 
-#: templates/part.details.php:33
-msgid "Delete"
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
+msgstr "Urodziny"
+
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 4883af328b9..e8dd97a81f8 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-05 09:18+0000\n"
-"Last-Translator: mosslar <gerber@tkdami.net>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,6 +21,51 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Otrzymasz link do resetowania hasła poprzez e-mail."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Żądane"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Logowanie nie powiodło się!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Użytkownik"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Żądanie resetowania"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Twoje hasło zostało zresetowane"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Nowe hasło"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Zresetuj hasło"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Ustawienia osobiste"
@@ -49,54 +94,50 @@ msgstr "Konta nie znaleziono "
 msgid "Create an <strong>admin account</strong>"
 msgstr "Stwórz jako <strong>konto administratora</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Użytkownik"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Zaawansowane"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Katalog danych"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Konfiguracja bazy danych"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "zostanie użyte"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Użytkownik bazy danych"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Hasło do bazy danych"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Nazwa bazy danych"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Zaawansowane"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Host bazy danych"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Katalog danych"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Zakończ instalację"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "zapewnia Ci wolność i kontrolę nad własnymi danymi"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -106,38 +147,22 @@ msgstr "Wyloguj siÄ™"
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Nie pamiętasz hasła?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "zapamiętaj"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Zostałeś wylogowany."
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Otrzymasz link do resetowania hasła poprzez e-mail."
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Żądane"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Nie udało się zalogować!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Użytkownik lub email"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Zresetuj hasło"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "wstecz"
@@ -146,16 +171,4 @@ msgstr "wstecz"
 msgid "next"
 msgstr "dalej"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Twoje hasło zostało zresetowane"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "Nowe hasło"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Zresetuj hasło"
-
 
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index f7bf94df142..090e8b0a8f4 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Marcin Małecki <gerber@tkdami.net>, 2011.
 #   <mosslar@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +19,36 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Brak błędu, plik przesłany z sukcesem"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
+"Przesłany plik przekracza ustawienie upload_max_filesize w pliku php.ini"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"Przesłany plik przekracza MAX_FILE_SIZE ustawienia, które zostało określono "
+"w formularzu HTML"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Plik został przesłany tylko częściowo."
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Żaden plik nie został przesłany"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Brakuje folderu tymczasowego"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Pliki"
 
@@ -52,43 +56,55 @@ msgstr "Pliki"
 msgid "Maximum upload size"
 msgstr "Maksymalna wielkość przesyłanego pliku"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Prześlij"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Nowy katalog"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Nic tu nie ma. Prześlij jakieś pliki!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Nazwa"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "ÅšciÄ…ganie"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Wielkość"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Zmodyfikowano"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Skasuj"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Przesyłany plik jest za duży"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/pl/media.po b/l10n/pl/media.po
index 237da744eec..425dc07722e 100644
--- a/l10n/pl/media.po
+++ b/l10n/pl/media.po
@@ -2,14 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# Marcin Małecki <gerber@tkdami.net>, 2011.
 #   <mosslar@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-20 05:08+0200\n"
-"PO-Revision-Date: 2011-08-20 03:08+0000\n"
-"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,39 +19,35 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Muzyka"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
-msgstr ""
+msgstr "Odtwarzaj"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Zatrzymaj"
 
 #: templates/music.php:5
 msgid "Previous"
-msgstr ""
+msgstr "Poprzedni"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
-msgstr ""
+msgstr "Następny"
 
 #: templates/music.php:7
 msgid "Mute"
-msgstr ""
+msgstr "Wycisz"
 
 #: templates/music.php:8
 msgid "Unmute"
-msgstr ""
-
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Przeskanowane utwory"
+msgstr "WÅ‚Ä…cz"
 
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Przeskanuj kolekcjÄ™"
 
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index dde3d9a7edf..713839d5ba3 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -2,16 +2,18 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Kamil Domański <kdomanski@kdemail.net>, 2011.
-#   <mosslar@gmail.com>, 2011.
+# Marcin Małecki <gerber@tkdami.net>, 2011.
 # Marcin Małecki <mosslar@gmail.com>, 2011.
+#   <mosslar@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-28 01:11+0200\n"
-"PO-Revision-Date: 2011-08-23 10:15+0000\n"
-"Last-Translator: mosslar <gerber@tkdami.net>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +21,26 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "BÅ‚Ä…d uwierzytelniania"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "Zmieniono OpenID"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Nieprawidłowe żądanie"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "Zmieniono OpenID"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Język zmieniony"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Dodaj własną aplikacje"
@@ -55,15 +61,15 @@ msgstr "przez"
 msgid "Ask a question"
 msgstr "Zadaj pytanie"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Problem z połączeniem z bazą danych."
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Przejdź na stronę ręcznie."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Odpowiedź"
 
@@ -79,6 +85,10 @@ msgstr "z dostępnych"
 msgid "Your password got changed"
 msgstr "Twoje hasło zostało zmienione"
 
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "Nie można zmienić hasła"
+
 #: templates/personal.php:15
 msgid "Current password"
 msgstr "Bieżące hasło"
@@ -96,36 +106,52 @@ msgid "Change password"
 msgstr "Zmień hasło"
 
 #: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Język"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Pomóż w tłumaczeniu"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:36
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "użyj tego adresu żeby połączyć się z twoim kontem ownCloud w menedżerze "
 "plików."
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Nazwa"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Grupy"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Stwórz"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Skasuj"
 
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index 4b44d17178d..39bf29a3f76 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Van Der Fran <transifex@vanderland.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:10+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +18,222 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Este não é o seu agenda de endereços."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "Contato não pôde ser encontrado."
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "vCard não pôde ser lida."
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
-msgstr ""
+msgstr "Informações sobre vCard é incorreta. Por favor, recarregue a página."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Endereço"
 
-#: photo.php:53
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefone"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "E-mail"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organização"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Trabalho"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Home"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Móvel"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Texto"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Voz"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Vídeo"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Pager"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Este não é o seu contato."
+
+#: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Este cartão não é compatível com RFC."
 
-#: photo.php:90
+#: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Este cartão não contém uma foto."
 
-#: templates/index.php:8
+#: templates/index.php:13
 msgid "Add Contact"
+msgstr "Adicionar Contato"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addcardform.php:5
+#: templates/part.addcardform.php:8
 msgid "Group"
-msgstr ""
+msgstr "Grupo"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
+#: templates/part.addcardform.php:19
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Caixa Postal"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Estendido"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
-msgstr ""
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Rua"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
-msgstr ""
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Cidade"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
-msgstr ""
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Região"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
-msgid "PO Box"
-msgstr ""
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "CEP"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
-msgid "Extended"
-msgstr ""
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "País"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
-msgid "Street"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Criar Contato"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
-msgid "City"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
-msgid "Region"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
-msgid "Zipcode"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
-msgid "Country"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Excluir"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.details.php:33
+msgid "Add"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.editaddressbook.php:29
+msgid "Save"
 msgstr ""
 
-#: templates/part.details.php:33
-msgid "Delete"
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
+msgstr "Aniversário"
+
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Telefone"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 4fbf39e1fff..c1bac3b5b54 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-06 12:04+0000\n"
-"Last-Translator: vanderland <transifex@vanderland.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,51 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Você receberá um link para redefinir sua senha via e-mail."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Solicitado"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Falha ao fazer o login!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Nome de Usuário"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Pedido de reposição"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Sua senha foi mudada"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Nova senha"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Mudar senha"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Pessoal"
@@ -47,54 +92,50 @@ msgstr "Cloud não encontrado"
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta</strong> de <strong>administrador</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Nome de Usuário"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Senha"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Avançado"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Pasta de dados"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Configurar o banco de dados"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "será usado"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Usuário de banco de dados"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Senha do banco de dados"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Nome do banco de dados"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Avançado"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Banco de dados do host"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Pasta de dados"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Concluir configuração"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "proporciona  liberdade e controle sobre seus próprios dados"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -104,38 +145,22 @@ msgstr "Sair"
 msgid "Settings"
 msgstr "Configurações"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Esqueçeu sua senha?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "lembrete"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Você está desconectado."
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Você receberá um link para redefinir sua senha via e-mail."
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Solicitado"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Login sem sucesso"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Nome de usuário ou e-mail"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Pedido de troca"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
@@ -144,16 +169,4 @@ msgstr "anterior"
 msgid "next"
 msgstr "próximo"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Sua senha foi trocada"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "Nova senha"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Toca de senha"
-
 
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index e4fba97298b..2d41a6af2b3 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,37 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Não houve nenhum erro, o arquivo foi transferido com sucesso"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
+"O tamanho do arquivo excede o limed especifiicado em upload_max_filesize no "
+"php.ini"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"O arquivo carregado excede o MAX_FILE_SIZE que foi especificado no "
+"formulário HTML"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "O arquivo foi transferido parcialmente"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Nenhum arquivo foi transferido"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Pasta temporária não encontrada"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Arquivos"
 
@@ -52,43 +56,55 @@ msgstr "Arquivos"
 msgid "Maximum upload size"
 msgstr "Tamanho máximo para carregar"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Carregar"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Nova Pasta"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Nada aqui.Carregar alguma coisa!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Nome"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Tamanho"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Modificado"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Excluir"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Arquivo muito grande"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/pt_BR/media.po b/l10n/pt_BR/media.po
index 86ebcc103ff..30318ebf843 100644
--- a/l10n/pt_BR/media.po
+++ b/l10n/pt_BR/media.po
@@ -2,15 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
-# Van Der Fran <transifex@vanderland.com>, 2011.
+# Translators:
 #   <duda.nogueira@metasys.com.br>, 2011.
+# Van Der Fran <transifex@vanderland.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-28 01:11+0200\n"
-"PO-Revision-Date: 2011-08-24 12:52+0000\n"
-"Last-Translator: dudanogueira <duda.nogueira@metasys.com.br>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,15 +19,15 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Música"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "Tocar"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Pausa"
 
@@ -34,7 +35,7 @@ msgstr "Pausa"
 msgid "Previous"
 msgstr "Anterior"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "Próximo"
 
@@ -46,11 +47,7 @@ msgstr "Mudo"
 msgid "Unmute"
 msgstr "Não Mudo"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Músicas encontradas"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Atualizar a Coleção"
 
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 987459779e9..ab2a8825dd0 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-06 12:01+0000\n"
-"Last-Translator: vanderland <transifex@vanderland.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,26 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Erro de autenticação"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "Mudou OpenID"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Pedido inválido"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "Mudou OpenID"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Mudou Idioma"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Adicionar o seu aplicativo"
@@ -55,15 +59,15 @@ msgstr "por"
 msgid "Ask a question"
 msgstr "Faça uma pergunta"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Problemas ao conectar na base de dados."
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Ir manualmente."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Resposta"
 
@@ -99,37 +103,53 @@ msgstr "mostrar"
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Ajuda na Tradução"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "use este endereço para se conectar ao seu ownCloud no seu gerenciador de "
 "arquvos"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Nome"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Senha"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Criar"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Apagar"
 
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index fcc5bb2f7ed..2e93a42246f 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <helder.meneses@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:11+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/team/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +18,223 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Esta não é a sua lista de contactos"
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "O contacto não foi encontrado"
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "o vCard não pode ser lido"
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
+"A informação sobre o vCard está incorreta. Por favor refresque a página"
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Morada"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefone"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "Email"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organização"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Trabalho"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Casa"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Telemovel"
 
-#: photo.php:53
+#: lib/app.php:114
+msgid "Text"
+msgstr "Texto"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Voz"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Vídeo"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Pager"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Este não é o seu contacto"
+
+#: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Este cartão não é compativel com RFC"
 
-#: photo.php:90
+#: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Este cartão não possui foto"
 
-#: templates/index.php:8
+#: templates/index.php:13
 msgid "Add Contact"
+msgstr "Adicionar Contacto"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addcardform.php:5
+#: templates/part.addcardform.php:8
 msgid "Group"
-msgstr ""
+msgstr "Grupo"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
+#: templates/part.addcardform.php:19
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Apartado"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Extendido"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
-msgstr ""
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Rua"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
-msgstr ""
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Cidade"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
-msgstr ""
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Região"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
-msgid "PO Box"
-msgstr ""
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Código Postal"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
-msgid "Extended"
-msgstr ""
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "País"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
-msgid "Street"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Criar Contacto"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
-msgid "City"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
-msgid "Region"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
-msgid "Zipcode"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
-msgid "Country"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Apagar"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.details.php:33
+msgid "Add"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.editaddressbook.php:29
+msgid "Save"
 msgstr ""
 
-#: templates/part.details.php:33
-msgid "Delete"
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
+msgstr "Aniversário"
+
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Telefone"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 8c79bfcd9c5..aaab9779385 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <helder.meneses@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-23 16:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/team/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,51 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -45,53 +91,49 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:21
-msgid "Username"
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
 msgstr ""
 
-#: templates/installation.php:22
-msgid "Password"
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Avançado"
+
+#: templates/installation.php:34
+msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:27
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr ""
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr ""
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr ""
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
+msgid "web services under your control"
 msgstr ""
 
 #: templates/layout.user.php:34
@@ -102,36 +144,20 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr ""
 
-#: templates/logout.php:1
-msgid "You are logged out."
-msgstr ""
-
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr ""
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr ""
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr ""
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
+#: templates/login.php:16
+msgid "Log in"
 msgstr ""
 
-#: templates/lostpassword.php:11
-msgid "Request reset"
+#: templates/logout.php:1
+msgid "You are logged out."
 msgstr ""
 
 #: templates/part.pagenavi.php:3
@@ -142,16 +168,4 @@ msgstr ""
 msgid "next"
 msgstr ""
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr ""
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr ""
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr ""
-
 
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index b41320ef456..7fd44b4f725 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/team/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,33 +17,33 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr ""
 
@@ -51,43 +51,55 @@ msgstr ""
 msgid "Maximum upload size"
 msgstr ""
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
-msgid "Upload"
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
 msgstr ""
 
-#: templates/index.php:17
-msgid "New Folder"
+#: templates/index.php:22
+msgid "Upload"
 msgstr ""
 
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/pt_PT/media.po b/l10n/pt_PT/media.po
index ae7c1aba234..b248284c3dd 100644
--- a/l10n/pt_PT/media.po
+++ b/l10n/pt_PT/media.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-23 16:42+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/team/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr ""
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr ""
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr ""
 
@@ -33,7 +33,7 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr ""
 
@@ -45,11 +45,7 @@ msgstr ""
 msgid "Unmute"
 msgstr ""
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr ""
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr ""
 
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index ba8649456a4..5b55ea33a78 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-23 16:42+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/team/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,26 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
 msgstr ""
 
-#: ajax/openid.php:21
-msgid "OpenID Changed"
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
 msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
-msgid "Invalid request"
+#: ajax/openid.php:15
+msgid "OpenID Changed"
 msgstr ""
 
-#: ajax/setlanguage.php:21
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr ""
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr ""
@@ -53,15 +57,15 @@ msgstr ""
 msgid "Ask a question"
 msgstr ""
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr ""
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr ""
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr ""
 
@@ -97,35 +101,51 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:30
-msgid "Help translating"
+#: templates/personal.php:38
+msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr ""
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr ""
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr ""
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index 95b3d705a3d..9464014f041 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Claudiu  <claudiu@tanaselia.ro>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:11+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +18,222 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Nu se găsește în agendă."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "Contactul nu a putut fi găsit."
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "vCard nu poate fi citit."
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
-msgstr ""
+msgstr "Informațiile despre vCard sunt incorecte. Reîncărcați pagina."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Adresă"
 
-#: photo.php:53
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "Email"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organizație"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Servici"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Acasă"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Text"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Voce"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Pager"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Nu este contactul tău"
+
+#: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Nu este compatibil RFC"
 
-#: photo.php:90
+#: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Nu conține o fotografie"
 
-#: templates/index.php:8
+#: templates/index.php:13
 msgid "Add Contact"
+msgstr "Adaugă contact"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addcardform.php:5
+#: templates/part.addcardform.php:8
 msgid "Group"
-msgstr ""
+msgstr "Grup"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
+#: templates/part.addcardform.php:19
 msgid "Name"
-msgstr ""
+msgstr "Nume"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "CP"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Extins"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
-msgstr ""
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Stradă"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
-msgstr ""
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "OraÈ™"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
-msgstr ""
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Regiune"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
-msgid "PO Box"
-msgstr ""
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Cod poștal"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
-msgid "Extended"
-msgstr ""
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Țară"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
-msgid "Street"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Crează contact"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
-msgid "City"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
-msgid "Region"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
-msgid "Zipcode"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
-msgid "Country"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Editează"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Șterge"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.details.php:33
+msgid "Add"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.editaddressbook.php:29
+msgid "Save"
 msgstr ""
 
-#: templates/part.details.php:33
-msgid "Delete"
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
+msgstr "Zi de naștere"
+
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index df95994f468..e2733bcd92c 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-05 11:11+0000\n"
-"Last-Translator: rawbeef64 <claudiu@tanaselia.ro>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,52 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+"Veți primi la adresa de email un link prin care veți putea reseta parola"
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Cerută"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Autentificare eșuată"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Utilizator"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Cerere trimisă"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Parola a fost resetată"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Noua parolă"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Resetează parola"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personal"
@@ -46,54 +92,50 @@ msgstr "Nu s-a găsit"
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crează un <strong>cont de administrator</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Utilizator"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Parola"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Avansat"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Directorul cu date"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Configurează baza de date"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "vor fi folosite"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Utilizatorul bazei de date"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Parola bazei de date"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Numele bazei de date"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Avansat"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Baza de date"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Directorul cu date"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Finalizează instalarea"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "îți oferă libertatea de a-ți controla datele"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -103,38 +145,22 @@ msgstr "Ieșire"
 msgid "Settings"
 msgstr "Setări"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Ai uitat parola?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "ține minte"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Ai ieșit"
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Vei primi prin email un link pentru resetarea parolei"
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Cerută"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Autentificare eșuată!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Utilizator sau email"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Cere schimbarea parolei"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "precedentul"
@@ -143,16 +169,4 @@ msgstr "precedentul"
 msgid "next"
 msgstr "următorul"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Parola a fost schimbată"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "Parola nouă"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Schimbă parola"
-
 
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 00676c5fca6..75238faf59a 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,37 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Nu am întâmpinat nici eroare, fișierul a fost încărcat cu success"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
+"Fișierul are o dimensiune mai mare decât cea specificată în variabila "
+"upload_max_filesize din php.ini"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată"
+" în formularul HTML"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Fișierul a fost încărcat doar parțial"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Nu a fost încărcat nici un fișier"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Lipsă folder temporar"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Fișiere"
 
@@ -52,43 +56,55 @@ msgstr "Fișiere"
 msgid "Maximum upload size"
 msgstr "Dimensiunea maximă"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Încarcă"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Director nou"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Nici un fișier, încarcă ceva!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Nume"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Dimensiune"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Modificat"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Șterge"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Fișierul este prea mare"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/ro/media.po b/l10n/ro/media.po
index f6c99afa9b2..17f7d45cd18 100644
--- a/l10n/ro/media.po
+++ b/l10n/ro/media.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Claudiu  <claudiu@tanaselia.ro>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-08-31 08:19+0000\n"
-"Last-Translator: rawbeef64 <claudiu@tanaselia.ro>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,15 +18,15 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Muzică"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "Play"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Pauză"
 
@@ -33,7 +34,7 @@ msgstr "Pauză"
 msgid "Previous"
 msgstr "Precedent"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "Următor"
 
@@ -45,11 +46,7 @@ msgstr "Fără sonor"
 msgid "Unmute"
 msgstr "Cu sonor"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Melodii scanate"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Rescanează colecția"
 
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 76980cd737e..1dac0ec035e 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Claudiu  <claudiu@tanaselia.ro>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-08-31 08:24+0000\n"
-"Last-Translator: rawbeef64 <claudiu@tanaselia.ro>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +18,26 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Eroare autentificare"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID schimbat"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Cerere eronată"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID schimbat"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Limba a fost schimbată"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Adaugă propria ta aplicație"
@@ -53,15 +58,15 @@ msgstr "de"
 msgid "Ask a question"
 msgstr "Întreabă"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Sunt probleme cu conectarea la baza de date"
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Manual"
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Răspuns"
 
@@ -97,37 +102,53 @@ msgstr "arată"
 msgid "Change password"
 msgstr "Schimbă parola"
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Limba"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Ajută la traducere"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:36
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "folosește această adresă pentru a te conecta la managerul tău de fișiere din"
 " ownCloud"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Nume"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Parola"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Grupuri"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Crează"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Șterge"
 
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index d571caba891..b61240bf43b 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <tony.mccourin@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:10+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +18,222 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Это не ваша адре�на� книга."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "Контакт не найден."
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "�е удало�ь проче�ть vCard."
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
-msgstr ""
+msgstr "Информаци� о vCard некорректна. Пожалуй�та, обновите �траницу."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "�дре�"
 
-#: photo.php:53
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Телефон"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "Ящик �л. почты"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Организаци�"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Рабочий"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Домашний"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Мобильный"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Тек�т"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Голо�"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Фак�"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Видео"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Пейджер"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Это не контакт."
+
+#: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Эта карточка не �оответ�твует RFC."
 
-#: photo.php:90
+#: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Эта карточка не �одержит фотографии."
 
-#: templates/index.php:8
+#: templates/index.php:13
 msgid "Add Contact"
+msgstr "Добавить Контакт"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addcardform.php:5
+#: templates/part.addcardform.php:8
 msgid "Group"
-msgstr ""
+msgstr "Группа"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
+#: templates/part.addcardform.php:19
 msgid "Name"
-msgstr ""
+msgstr "Им�"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "�О"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Ра�ширенный"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
-msgstr ""
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Улица"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
-msgstr ""
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Город"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
-msgstr ""
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Обла�ть"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
-msgid "PO Box"
-msgstr ""
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Почтовый индек�"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
-msgid "Extended"
-msgstr ""
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Страна"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
-msgid "Street"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Создать Контакт"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
-msgid "City"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
-msgid "Region"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
-msgid "Zipcode"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
-msgid "Country"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Редактировать"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Удалить"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.details.php:33
+msgid "Add"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.editaddressbook.php:29
+msgid "Save"
 msgstr ""
 
-#: templates/part.details.php:33
-msgid "Delete"
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
+msgstr "День рождени�"
+
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Телефон"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 49a8891db3b..550baa3e729 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-04 17:42+0000\n"
-"Last-Translator: jekader <jekader@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,51 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "�а ваш адре� Email вы�лана ��ылка дл� �бро�а парол�."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Запрошено"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "�е удало�ь войти!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Им� пользовател�"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Запро�ить �бро�"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Ваш пароль был �брошен"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "�овый пароль"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Сбро�ить пароль"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Личное"
@@ -47,54 +92,50 @@ msgstr "Облако не найдено"
 msgid "Create an <strong>admin account</strong>"
 msgstr "Создать <strong>учётную запи�ь админи�тратора</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Им� пользовател�"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Дополнительно"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Директори� � данными"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "�а�тройка базы данных"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "будет и�пользовано"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Им� пользовател� дл� базы данных"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Пароль дл� базы данных"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "�азвание базы данных"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Дополнительно"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Хо�т базы данных"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Директори� � данными"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Завершить у�тановку"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "даёт Вам �вободу и контроль над Вашими данными"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -104,38 +145,22 @@ msgstr "Выйти"
 msgid "Settings"
 msgstr "�а�тройки"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Забыли пароль?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "запомнить"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Вы вышли."
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Вы получите ��ылку дл� �бро�а парол� на Ваш e-mail."
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Запрошено"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Войти не удало�ь!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Им� пользовател� или e-mail"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Запро�ить �бро�"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "пред"
@@ -144,16 +169,4 @@ msgstr "пред"
 msgid "next"
 msgstr "�лед"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Пароль был �брошен"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "�овый пароль"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Сбро�ить пароль"
-
 
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 2345bd74ead..55cec9ff4f8 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,35 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Файл у�пешно загружен"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
+"Файл превышает допу�тимые размеры (опи�аны как upload_max_filesize в "
+"php.ini)"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Файл превышает размер MAX_FILE_SIZE, указаный в HTML-форме"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Файл был ча�тично загружен"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Файл не был загружен"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "�евозможно найти временную директорию"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Файлы"
 
@@ -52,43 +54,55 @@ msgstr "Файлы"
 msgid "Maximum upload size"
 msgstr "Мак�имальный размер файла"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Закачать"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "�ова� папка"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Зде�ь ничего нет. Закачайте что-нибудь!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "�азвание"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Размер"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Изменен"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Файл �лишком большой"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/ru/media.po b/l10n/ru/media.po
index 966ac2e46a7..7beb05be078 100644
--- a/l10n/ru/media.po
+++ b/l10n/ru/media.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 #   <tony.mccourin@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:59+0000\n"
-"Last-Translator: tonymc <tony.mccourin@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,15 +18,15 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Музыка"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "Проиграть"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Пауза"
 
@@ -33,7 +34,7 @@ msgstr "Пауза"
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "Следующий"
 
@@ -45,11 +46,7 @@ msgstr "Отключить звук"
 msgid "Unmute"
 msgstr "Включить звук"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Пе�ен про�канировано"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Пере�канировать коллекцию"
 
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 42149eb309a..54ecbef38e2 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 #   <tony.mccourin@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-04 16:48+0200\n"
-"PO-Revision-Date: 2011-09-03 13:59+0000\n"
-"Last-Translator: tonymc <tony.mccourin@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +18,26 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Ошибка аутентификации"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID был изменён"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "�еверный запро�"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID был изменён"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Язык изменён"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Добавить ваше приложение"
@@ -53,15 +58,15 @@ msgstr "от"
 msgid "Ask a question"
 msgstr "Задать вопро�"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Проблема �оединени� � базой данных помощи."
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Войти �амо�то�тельно."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Ответ"
 
@@ -97,37 +102,53 @@ msgstr "показать"
 msgid "Change password"
 msgstr "Сменить пароль"
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Язык"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Помощь � переводом"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "и�пользуйте данный адре� дл� подключени� к ownCloud в вашем файловом "
 "менеджере"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Им�"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Группы"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Создать"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Удалить"
 
diff --git a/l10n/sk_SK/calendar.po b/l10n/sk_SK/calendar.po
new file mode 100644
index 00000000000..b1866548904
--- /dev/null
+++ b/l10n/sk_SK/calendar.po
@@ -0,0 +1,637 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <intense.feel@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-07 18:29+0100\n"
+"PO-Revision-Date: 2012-01-08 08:41+0000\n"
+"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr "Časové pásmo zmenené"
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr "Neplatná požiadavka"
+
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr "Kalendár"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Zlý kalendár"
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr "Narodeniny"
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr "Podnikanie"
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr "Hovor"
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr "Klienti"
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr "Doru�ovateľ"
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr "Prázdniny"
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr "Nápady"
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr "Cesta"
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr "Jubileá"
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr "Stretnutia"
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr "Ostatné"
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr "Osobné"
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr "Projekty"
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr "Otázky"
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr "Práca"
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr "Neopakovať"
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr "Denne"
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr "Týždenne"
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr "Každý výkend"
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr "Každý druhý týždeň"
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr "Mesa�ne"
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr "Ro�ne"
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Nie je pole"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Celý deň"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Nevyplnené položky"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Nadpis"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Od Dátumu"
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Od ÄŒasu"
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Do Dátumu"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Do ÄŒasu"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Udalosť kon�í ešte pred tým než za�ne"
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Nastala chyba databázy"
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr "Týždeň"
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr "Mesiac"
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr "Zoznam"
+
+#: templates/calendar.php:45
+msgid "Today"
+msgstr "Dnes"
+
+#: templates/calendar.php:46
+msgid "Calendars"
+msgstr "Kalendáre"
+
+#: templates/calendar.php:64
+msgid "There was a fail, while parsing the file."
+msgstr "Nastala chyba po�as parsovania súboru."
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr "Zvoľte aktívne kalendáre"
+
+#: templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Nový kalendár"
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr "CalDav odkaz"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr "Stiahnuť"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr "Upraviť"
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "Odstrániť"
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr "Nový kalendár"
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr "Upraviť kalendár"
+
+#: templates/part.editcalendar.php:12 templates/part.import.php:29
+msgid "Displayname"
+msgstr "Zobrazené meno"
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr "Aktívne"
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr "Farba kalendáru"
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "Uložiť"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "Odoslať"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr "Upraviť udalosť"
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Exportovať"
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr "Nadpis Udalosti"
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr "Kategória"
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr "Vybrať kategóriu"
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr "Celodenná udalosť"
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr "Od"
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr "Do"
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Pokro�ilé možnosti"
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr "Opakovať"
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Poloha"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Poloha Udalosti"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Popis"
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr "Popis Udalosti"
+
+#: templates/part.import.php:1
+msgid "Import Ical File"
+msgstr "Importovať Ical súbor"
+
+#: templates/part.import.php:4
+msgid "How to import the new calendar?"
+msgstr "Ako importovať nový kalendár?"
+
+#: templates/part.import.php:6
+msgid "Import into an existing calendar"
+msgstr "Importovať do existujúceho kalendára"
+
+#: templates/part.import.php:7
+msgid "Import into a new calendar"
+msgstr "Importovať do nového kalendára"
+
+#: templates/part.import.php:10
+msgid "Please choose the calendar"
+msgstr "Prosím zvoľte kalendár"
+
+#: templates/part.import.php:20 templates/part.import.php:37
+msgid "Import"
+msgstr "Importovať"
+
+#: templates/part.import.php:22 templates/part.import.php:39
+msgid "Back"
+msgstr "Späť"
+
+#: templates/part.import.php:25
+msgid "Please fill out the form"
+msgstr "Prosím vyplňte formulár"
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr "Vytvoriť udalosť"
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr "Časová zóna"
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Formát �asu"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Synchroniza�ná adresa kalendára CalDAV: "
+
+
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
new file mode 100644
index 00000000000..f4c36ea5054
--- /dev/null
+++ b/l10n/sk_SK/contacts.po
@@ -0,0 +1,238 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: lib/app.php:42
+msgid "This is not your addressbook."
+msgstr "Toto nie je váš adresár."
+
+#: lib/app.php:51 photo.php:34
+msgid "Contact could not be found."
+msgstr "Kontakt nebol nájdený."
+
+#: lib/app.php:65
+msgid "vCard could not be read."
+msgstr "vCard nemôže byť pre�ítaná."
+
+#: lib/app.php:79
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr "Informácie o vCard sú neplatné. Prosím obnovte stránku."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Adresa"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefón"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "E-mail"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organizácia"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Práca"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Domov"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "SMS"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Odkazová schránka"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Pager"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Toto nie je váš kontakt."
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr "Táto karta nie je kompatibilná s RFC."
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr "Táto karta neobsahuje fotografiu."
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "Pridať Kontakt."
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "Skupina"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "Meno"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "PO Box"
+
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Rozšírené"
+
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Ulica"
+
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Mesto"
+
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Región"
+
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "PSČ"
+
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Krajina"
+
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Vytvoriť Kontakt."
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Upraviť"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Odstrániť"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr "Narodeniny"
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr "Telefón"
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
+
+
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
new file mode 100644
index 00000000000..51034c15311
--- /dev/null
+++ b/l10n/sk_SK/core.po
@@ -0,0 +1,171 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <intense.feel@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Odkaz pre obnovenie hesla obdržíte E-mailom."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Požiadané"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Prihlásenie zlyhalo!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Prihlasovacie meno"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Požiadať o obnovenie"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Vaše heslo bolo obnovené"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Nové heslo"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Obnova hesla"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "Osobné"
+
+#: strings.php:6
+msgid "Users"
+msgstr "Používatelia"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "Aplikácie"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "Administrácia"
+
+#: strings.php:9
+msgid "Help"
+msgstr "Pomoc"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "Nedokážem nájsť"
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr "Vytvoriť <strong>administrátorský ú�et</strong>"
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr "Heslo"
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Pokro�ilé"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Prie�inok dát"
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr "Nastaviť databázu"
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr "bude použité"
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr "Hostiteľ databázy"
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr "Heslo databázy"
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr "Meno databázy"
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr "Server databázy"
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr "Dokon�iť inštaláciu"
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr "Odhlásiť"
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr "Nastavenia"
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr "Zabudli ste heslo?"
+
+#: templates/login.php:15
+msgid "remember"
+msgstr "zapamätať"
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "Ste odhlásený."
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "späť"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "�alej"
+
+
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
new file mode 100644
index 00000000000..645e9a11f2a
--- /dev/null
+++ b/l10n/sk_SK/files.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr "Nenastala žiadna chyba, súbor bol úspešne nahraný"
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr "Nahraný súbor presiahol direktívu upload_max_filesize v php.ini"
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+"Nahrávaný súbor presiahol MAX_FILE_SIZE direktívu, ktorá bola špecifikovaná "
+"v HTML formulári"
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr "Nahrávaný súbor bol iba �iasto�ne nahraný"
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr "Žiaden súbor nebol nahraný"
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr "Chýbajúci do�asný prie�inok"
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr "Súbory"
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr "Maximálna veľkosť nahratia"
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr "Nahrať"
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr "Ni� tu nie je. Nahrakte nie�o!"
+
+#: templates/index.php:43
+msgid "Name"
+msgstr "Meno"
+
+#: templates/index.php:45
+msgid "Download"
+msgstr "Stiahnuť"
+
+#: templates/index.php:49
+msgid "Size"
+msgstr "Veľkosť"
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr "Upravené"
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr "Odstrániť"
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr "Nahrávanie príliš veľké"
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+"Súbory ktoré sa snažíte nahrať presahujú maximálnu veľkosť pre nahratie "
+"súborov na tento server."
+
+
diff --git a/l10n/sk_SK/media.po b/l10n/sk_SK/media.po
new file mode 100644
index 00000000000..2718867142a
--- /dev/null
+++ b/l10n/sk_SK/media.po
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: appinfo/app.php:32
+msgid "Music"
+msgstr "Hudba"
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr "Prehrať"
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr "Pauza"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr "Predchádzajúce"
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr "Ďalšie"
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr "Stlmiť"
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr "Nahlas"
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr "Znovu skenovať Zbierku"
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr "Umelec"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "Album"
+
+#: templates/music.php:39
+msgid "Title"
+msgstr "Názov"
+
+
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
new file mode 100644
index 00000000000..17dd38a23ba
--- /dev/null
+++ b/l10n/sk_SK/settings.po
@@ -0,0 +1,153 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <intense.feel@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr "Neplatná požiadavka"
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID zmenené"
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr "Jazyk zmenený"
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr "Pridajte svoju aplikáciu"
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr "Vyberte Aplikáciu"
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr "-licencované"
+
+#: templates/apps.php:23
+msgid "by"
+msgstr "od"
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr "Opýtajte sa otázku"
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr "Problémy spojené s pomocnou databázou."
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr "Prejsť tam ru�ne."
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr "Odpove�"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr "Používate"
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr "z dostupných"
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr "Vaše heslo sa zmenilo"
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "Nedokážem zmeniť vaše heslo"
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr "Aktuálne heslo"
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr "Nové heslo"
+
+#: templates/personal.php:17
+msgid "show"
+msgstr "zobraziť"
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr "Zmeniť heslo"
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr "Jazyk"
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr "použite túto adresu pre spojenie s vaším ownCloud v správcovi súborov"
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr "Meno"
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr "Heslo"
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr "Skupiny"
+
+#: templates/users.php:23
+msgid "Create"
+msgstr "Vytvoriť"
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr "Odstrániť"
+
+
diff --git a/l10n/sl/calendar.po b/l10n/sl/calendar.po
new file mode 100644
index 00000000000..e0d14a1c09e
--- /dev/null
+++ b/l10n/sl/calendar.po
@@ -0,0 +1,637 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <urossolar@hotmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-07 18:29+0100\n"
+"PO-Revision-Date: 2012-01-08 08:41+0000\n"
+"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/team/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr "ÄŒasovna Cona spremenjena"
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr "Neveljavna zahteva"
+
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr "Kolendar"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Napa�en Kolendar"
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr "Rojstni Dan"
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr "Poslovno"
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr "Pokli�i"
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr "Stranke"
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr "Dobavitelj"
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr "Dopust"
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr "Ideje"
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr "Potovanje"
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr "Obletnica"
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr "Sestanek"
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr "Ostalo"
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr "Osebno"
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr "Projekt"
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr "Vprašanja"
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr "Delo"
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr "Se ne ponavlja"
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr "Dnevno"
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr "Tedensko"
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr "Vsak dan v tednu"
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr "Dvakrat Tedensko"
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr "Mese�no"
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr "Letno"
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Not an array"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Cel dan"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Mankajo�a polja"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Naslov"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "od Datum"
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "od ÄŒas"
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "do Datum"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "do ÄŒas"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Dogodek se kon�a preden se za�ne"
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Napaka v podatkovni bazi. Kontaktirajte Administratorja"
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr "Teden"
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr "Mesec"
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr "Seznam"
+
+#: templates/calendar.php:45
+msgid "Today"
+msgstr "Danes"
+
+#: templates/calendar.php:46
+msgid "Calendars"
+msgstr "Kolendarji"
+
+#: templates/calendar.php:64
+msgid "There was a fail, while parsing the file."
+msgstr "Pri raz�lenjevanju datoteke je prišlo do napake."
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr "Izberi aktivni Kolendar"
+
+#: templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Nov Kolendar"
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr "CalDav Povezava"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr "Naloži dol"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr "Uredi"
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "Izbriši"
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr "Nov Kolendar"
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr "Uredi Kolendar"
+
+#: templates/part.editcalendar.php:12 templates/part.import.php:29
+msgid "Displayname"
+msgstr "Prikazano Ime"
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr "Aktivno"
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr "Barva Kolendarja"
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "Shrani"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "Potrdi"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr "Prekli�i"
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr "Uredi Dogodek"
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Izvozi"
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr "Naslov"
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr "Kategorija"
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr "Izberi Kategorijo"
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr "Celodnevni Dogodek"
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr "Od"
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr "Za"
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Napredne Možnosti"
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr "Ponovi"
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Lokacija"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Lokacija dogodka"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Opis"
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr "Opis Dogodka"
+
+#: templates/part.import.php:1
+msgid "Import Ical File"
+msgstr "Uvozi iCal datoteko"
+
+#: templates/part.import.php:4
+msgid "How to import the new calendar?"
+msgstr "Koko uvozim nov kolendar?"
+
+#: templates/part.import.php:6
+msgid "Import into an existing calendar"
+msgstr "Uvozi v obstoje�i kolendar"
+
+#: templates/part.import.php:7
+msgid "Import into a new calendar"
+msgstr "Uvozi v nov Kolendar"
+
+#: templates/part.import.php:10
+msgid "Please choose the calendar"
+msgstr "Izberi kolendar"
+
+#: templates/part.import.php:20 templates/part.import.php:37
+msgid "Import"
+msgstr "Uvozi"
+
+#: templates/part.import.php:22 templates/part.import.php:39
+msgid "Back"
+msgstr "Nazaj"
+
+#: templates/part.import.php:25
+msgid "Please fill out the form"
+msgstr "Prosim izpolnite obrazec"
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr "Ustvari nov dogodek"
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr "ÄŒasovna Cona"
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "ÄŒasovni format"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24ur"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12ur"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Kolendarjev CalDAV sinhronizacijski naslov"
+
+
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
new file mode 100644
index 00000000000..b492c8bb676
--- /dev/null
+++ b/l10n/sl/contacts.po
@@ -0,0 +1,240 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <urossolar@hotmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/team/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: lib/app.php:42
+msgid "This is not your addressbook."
+msgstr "To ni vaš adresar."
+
+#: lib/app.php:51 photo.php:34
+msgid "Contact could not be found."
+msgstr "Kontakta ni bilo mogo�e najti."
+
+#: lib/app.php:65
+msgid "vCard could not be read."
+msgstr "vVizitko (vCard) ni bilo mogo�e prebrati."
+
+#: lib/app.php:79
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr ""
+"Informacije o vVizitki (vCard) niso pravilne, Prosimo ponovno naložite okno."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Naslov"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "Email"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organizacija"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Delo"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Doma"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mobitel"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Tekst"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Glas- Voice"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Faks"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Pager"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "To ni vaš kontakt"
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr "Ta karta ni RFC kopatibilna."
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr "Ta karta ne vsebuje slike."
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "Dodaj Kontakt"
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "Skupina"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "Ime"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "PO Box"
+
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Razširjeno."
+
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Ulica"
+
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Mesto"
+
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Regija"
+
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Poštna št."
+
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Dežela"
+
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Ustvari Kontakt"
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Uredi"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Izbriši"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr "Rojstni Dan"
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
+
+
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
new file mode 100644
index 00000000000..616829d650b
--- /dev/null
+++ b/l10n/sl/core.po
@@ -0,0 +1,172 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/team/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+"Preko email sporo�ila boste prejeli povezavo s katero lahko ponovno "
+"nastavite geslo"
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Zahtevano"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Prijava ni Uspela!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Uporabniško Ime"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Zahtevaj ponastavitev"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Vaše geslo je bilo ponastavljeno"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "novo geslo"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Ponastavi Geslo"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "Osebno"
+
+#: strings.php:6
+msgid "Users"
+msgstr "Uporabniki"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "Apps"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "Admin"
+
+#: strings.php:9
+msgid "Help"
+msgstr "Pomo�"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "Ni najdeno"
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr "Ustvari <strong>admin ra�un</strong>"
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr "Geslo"
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Napredno"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Data Mapa"
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr "Nastavi Podatkovno Bazo"
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr "Bo uporabljeno"
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr "Podatkovna Baza Uporabnik"
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr "Podatkovna Baza Geslo"
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr "Ime Podatkovne Baze"
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr "Database host"
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr "Kon�aj instalacijo"
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr "Odjava"
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr "Nastavitve"
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr "Ste pozabili vaše geslo?"
+
+#: templates/login.php:15
+msgid "remember"
+msgstr "zapomni"
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "Odjavljeni ste"
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "nazaj"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "naprej"
+
+
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
new file mode 100644
index 00000000000..22dd51da6b1
--- /dev/null
+++ b/l10n/sl/files.po
@@ -0,0 +1,114 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/team/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr "datoteka je bila naložena uspešno."
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+"Velikost željene naložene datoteke je prevelika. (upload_max_filesize - "
+"php.ini) Kontaktirajte Administratorja."
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+"Velikost željene naložene datoteke je prevelika. (MAX_FILE_SIZE - html "
+"formi) Kontaktirajte Administratorja."
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr "Datoteka je bila le delno naložena."
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr "Naloženih ni bilo ni� Datotek."
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr "Ni potrebne za�asne datoteke. (temporary folder)"
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr "Datoteke"
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr "Maksimalna velikost"
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr "Naloži gor"
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr "Naloženih še ni bilo ni� datotek."
+
+#: templates/index.php:43
+msgid "Name"
+msgstr "Ime"
+
+#: templates/index.php:45
+msgid "Download"
+msgstr "Naloži dol"
+
+#: templates/index.php:49
+msgid "Size"
+msgstr "Velikost"
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr "Urejeno"
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr "Izbriši"
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr "Nalaganje ni mogo�e, ker je preveliko."
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+"Datoteke ki jih želiš naložiti presegajo maksimalno velikost na tem "
+"strežniku. Kontaktirajte Administratorja."
+
+
diff --git a/l10n/sl/media.po b/l10n/sl/media.po
new file mode 100644
index 00000000000..d9049fe094f
--- /dev/null
+++ b/l10n/sl/media.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <urossolar@hotmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/team/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: appinfo/app.php:32
+msgid "Music"
+msgstr "Glasba"
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr "Predvajaj"
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr "Pavza"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr "Prejšnja"
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr "Naslednja"
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr "Izklju�i zvok"
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr "Vklju�i zvok"
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr "Skeniraj zbirko"
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr "Izvajalec"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "Album"
+
+#: templates/music.php:39
+msgid "Title"
+msgstr "Naslov"
+
+
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
new file mode 100644
index 00000000000..13af55c4a9a
--- /dev/null
+++ b/l10n/sl/settings.po
@@ -0,0 +1,153 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <urossolar@hotmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/team/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr "Neveljavna zahteva"
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID spremenjen"
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr "Jezik je bil spremenjen"
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr "Dodaj vašo aplikacijo"
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr "Izberi aplikacijo"
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr "-licenca"
+
+#: templates/apps.php:23
+msgid "by"
+msgstr "od"
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr "Vprašaj"
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr "Težave pri povezovanju z zbirko podatkov."
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr "Pojdi tja ro�no."
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr "Odgovor"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr "Uporabljate"
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr "od narazpolago"
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr "Vaše geslo je bilo spremenjeno."
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "Vašega geslo ni bilo mogo�e spremeniti."
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr "Trenutno Geslo"
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr "Novo geslo"
+
+#: templates/personal.php:17
+msgid "show"
+msgstr "prikaži"
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr "Spremeni Geslo"
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr "Jezik"
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr "uporabi ta naslov za povezavo k \"mojoblak\" v vašem urejevalniku datotek"
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr "Ime"
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr "Geslo"
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr "Skupine"
+
+#: templates/users.php:23
+msgid "Create"
+msgstr "Ustvari"
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr "Izbriši"
+
+
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 780af00702d..5f2a473f540 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Slobodan Terzić <githzerai06@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:10+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +18,222 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Ово није ваш адре�ар."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "Контакт �е не може наћи."
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "вКарта �е не може читати."
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
-msgstr ""
+msgstr "Подаци о вКарти �у неи�правни. Поново учитајте �траницу."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "�дре�а"
 
-#: photo.php:53
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Телефон"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "Е-маил"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Организација"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "По�ао"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Кућа"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Мобилни"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Тек�т"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Гла�"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Фак�"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Видео"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Пејџер"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Ово није ваш контакт."
+
+#: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Ова карта није �агла�на �а РФЦ-ом."
 
-#: photo.php:90
+#: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Ова карта не �адржи фотографију."
 
-#: templates/index.php:8
+#: templates/index.php:13
 msgid "Add Contact"
+msgstr "Додај контакт"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addcardform.php:5
+#: templates/part.addcardform.php:8
 msgid "Group"
-msgstr ""
+msgstr "Група"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
+#: templates/part.addcardform.php:19
 msgid "Name"
-msgstr ""
+msgstr "Име"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Поштан�ки број"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Прошири"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
-msgstr ""
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Улица"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
-msgstr ""
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Град"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
-msgstr ""
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Регија"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
-msgid "PO Box"
-msgstr ""
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Зип код"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
-msgid "Extended"
-msgstr ""
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Земља"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
-msgid "Street"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "�аправи контакт"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
-msgid "City"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
-msgid "Region"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
-msgid "Zipcode"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
-msgid "Country"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Уреди"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Обриши"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.details.php:33
+msgid "Add"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.editaddressbook.php:29
+msgid "Save"
 msgstr ""
 
-#: templates/part.details.php:33
-msgid "Delete"
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
+msgstr "Рођендан"
+
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Телефон"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 77abd798989..9bf02eedf6e 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-14 11:23+0000\n"
-"Last-Translator: Xabre <githzerai06@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,51 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Добићете везу за ре�етовање лозинке путем е-поште."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Захтевано"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "�е�упела пријава!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Кори�ничко име"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Захтевај ре�етовање"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Ваша лозинка је ре�етована"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "�ова лозинка"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Ре�етуј лозинку"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Лична"
@@ -46,54 +91,50 @@ msgstr "Облак није нађен"
 msgid "Create an <strong>admin account</strong>"
 msgstr "�аправи <strong>админи�тративни налог</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Кори�ничко име"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "�апредно"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Фацикла података"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Подешавање базе"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "ће бити коришћен"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Кори�ник базе"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Лозинка базе"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Име базе"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "�апредно"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Домаћин базе"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Фацикла података"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Заврши подешавање"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "вам даје �лободу и контролу над вашим подацима"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -103,38 +144,22 @@ msgstr "Одјава"
 msgid "Settings"
 msgstr "Подешавања"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Изгубили �те лозинку?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "упамти"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Одјављени �те."
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Добићете везу за ре�етовање лозинке путем е-поште."
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Захтев по�лат"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "�еу�пешно пријављивање!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Кори�ничко име или адре�а е-поште"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Захтев за ре�етовање"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "претходно"
@@ -143,16 +168,4 @@ msgstr "претходно"
 msgid "next"
 msgstr "�ледеће"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Ваша лозинка је ре�етована"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "�ова лозинка"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Ре�етуј лозинку"
-
 
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 778a30135e7..9dc152c94aa 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,35 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "�ема грешке, фајл је у�пешно по�лат"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "По�лати фајл превазилази директиву upload_max_filesize из "
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"По�лати фајл превазилази директиву MAX_FILE_SIZE која је наведена у ХТМЛ "
+"форми"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "По�лати фајл је �амо делимично отпремљен!"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "�иједан фајл није по�лат"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "�едо�таје привремена фа�цикла"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Фајлови"
 
@@ -52,43 +54,55 @@ msgstr "Фајлови"
 msgid "Maximum upload size"
 msgstr "Мак�имална величина пошиљке"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Пошаљи"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "�ова фа�цикла"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Овде нема ничег. Пошаљите нешто!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Име"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Величина"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Задња измена"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Обриши"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Пошиљка је превелика"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/sr/media.po b/l10n/sr/media.po
index aaab3c163d9..331a8bc9f06 100644
--- a/l10n/sr/media.po
+++ b/l10n/sr/media.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-13 22:01+0000\n"
-"Last-Translator: Xabre <githzerai06@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Музика"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "Пу�ти"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Паузирај"
 
@@ -34,7 +34,7 @@ msgstr "Паузирај"
 msgid "Previous"
 msgstr "Претходна"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "Следећа"
 
@@ -46,11 +46,7 @@ msgstr "И�кључи звук"
 msgid "Unmute"
 msgstr "Укључи звук"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Претражених пе�ама"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Поново претражи збирку"
 
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index a81b25b9474..dd68b115b43 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-13 22:02+0000\n"
-"Last-Translator: Xabre <githzerai06@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,26 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Грешка аутентификације"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID је измењен"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "�еи�праван захтев"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID је измењен"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Језик је измењен"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Додајте �вој програм"
@@ -54,15 +58,15 @@ msgstr "од"
 msgid "Ask a question"
 msgstr "По�тавите питање"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Проблем у повезивању �а базом помоћи"
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Отиђите тамо ручно."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Одговор"
 
@@ -98,36 +102,52 @@ msgstr "прикажи"
 msgid "Change password"
 msgstr "Измени лозинку"
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Језик"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Помозите у превођењу"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "кори�тите ову адре�у да би �е повезали на ownCloud путем менаџњера фајлова"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Име"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Групе"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "�аправи"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Обриши"
 
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index 3066a8fc090..428c4453ead 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Slobodan Terzić <githzerai06@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:10+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/team/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +18,222 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Ovo nije vaš adresar."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "Kontakt se ne može naći."
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "vKarta se ne može �itati."
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
-msgstr ""
+msgstr "Podaci o vKarti su neispravni. Ponovo u�itajte stranicu."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Adresa"
 
-#: photo.php:53
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "E-mail"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organizacija"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Posao"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Kuća"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mobilni"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Tekst"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Glas"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Faks"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Pejdžer"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Ovo nije vaš kontakt."
+
+#: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Ova karta nije saglasna sa RFC-om."
 
-#: photo.php:90
+#: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Ova karta ne sadrži fotografiju."
 
-#: templates/index.php:8
+#: templates/index.php:13
 msgid "Add Contact"
+msgstr "Dodaj kontakt"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addcardform.php:5
+#: templates/part.addcardform.php:8
 msgid "Group"
-msgstr ""
+msgstr "Grupa"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
+#: templates/part.addcardform.php:19
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Poštanski broj"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Proširi"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
-msgstr ""
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Ulica"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
-msgstr ""
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Grad"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
-msgstr ""
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Regija"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
-msgid "PO Box"
-msgstr ""
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Zip kod"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
-msgid "Extended"
-msgstr ""
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Zemlja"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
-msgid "Street"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Napravi kontakt"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
-msgid "City"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
-msgid "Region"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
-msgid "Zipcode"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
-msgid "Country"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Uredi"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Obriši"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.details.php:33
+msgid "Add"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.editaddressbook.php:29
+msgid "Save"
 msgstr ""
 
-#: templates/part.details.php:33
-msgid "Delete"
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
+msgstr "Rođendan"
+
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 33bd96a4c3d..93b14cb49ad 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-14 11:23+0000\n"
-"Last-Translator: Xabre <githzerai06@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/team/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,51 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Dobićete vezu za resetovanje lozinke putem e-pošte."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Zahtevano"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Nesupela prijava!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Korisni�ko ime"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Zahtevaj resetovanje"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Vaša lozinka je resetovana"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Nova lozinka"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Resetuj lozinku"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Li�na"
@@ -46,54 +91,50 @@ msgstr "Oblak nije nađen"
 msgid "Create an <strong>admin account</strong>"
 msgstr "Napravi <strong>administrativni nalog</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Korisni�ko ime"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Napredno"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Facikla podataka"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Podešavanje baze"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "će biti korišćen"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Korisnik baze"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Lozinka baze"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Ime baze"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Napredno"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Domaćin baze"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Facikla podataka"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Završi podešavanje"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "vam daje slobodu i kontrolu nad vašim podacima"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -103,38 +144,22 @@ msgstr "Odjava"
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "upamti"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Odjavljeni ste."
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Dobićete vezu za resetovanje lozinke putem e-pošte."
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Zahtev poslat"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Neuspešno prijavljivanje!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Korisni�ko ime ili adresa e-pošte"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Zahtev za resetovanje"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "prethodno"
@@ -143,16 +168,4 @@ msgstr "prethodno"
 msgid "next"
 msgstr "sledeće"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Vaša lozinka je resetovana"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "Nova lozinka"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Resetuj lozinku"
-
 
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index f9af37cbada..261d61c800d 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/team/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,35 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Nema greške, fajl je uspešno poslat"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Poslati fajl prevazilazi direktivu upload_max_filesize iz "
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML "
+"formi"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Poslati fajl je samo delimi�no otpremljen!"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Nijedan fajl nije poslat"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Nedostaje privremena fascikla"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Fajlovi"
 
@@ -52,43 +54,55 @@ msgstr "Fajlovi"
 msgid "Maximum upload size"
 msgstr "Maksimalna veli�ina pošiljke"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "Pošalji"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Nova fascikla"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "Ovde nema ni�eg. Pošaljite nešto!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Ime"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Veli�ina"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "Pošiljka je prevelika"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/sr@latin/media.po b/l10n/sr@latin/media.po
index a647feac32c..e9d968b7493 100644
--- a/l10n/sr@latin/media.po
+++ b/l10n/sr@latin/media.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-13 22:12+0000\n"
-"Last-Translator: Xabre <githzerai06@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/team/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Muzika"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "Pusti"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Pauziraj"
 
@@ -34,7 +34,7 @@ msgstr "Pauziraj"
 msgid "Previous"
 msgstr "Prethodna"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "Sledeća"
 
@@ -46,11 +46,7 @@ msgstr "Isklju�i zvuk"
 msgid "Unmute"
 msgstr "Uklju�i zvuk"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Pretraženih pesama"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Ponovo pretraži zbirku"
 
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index cb8b76399c1..d70e5ea94a6 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-13 22:13+0000\n"
-"Last-Translator: Xabre <githzerai06@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/team/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,26 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Greška autentifikacije"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID je izmenjen"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Neispravan zahtev"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID je izmenjen"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Jezik je izmenjen"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Dodajte svoj program"
@@ -54,15 +58,15 @@ msgstr "od"
 msgid "Ask a question"
 msgstr "Postavite pitanje"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Problem u povezivanju sa bazom pomoći"
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "Otiđite tamo ru�no."
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Odgovor"
 
@@ -98,36 +102,52 @@ msgstr "prikaži"
 msgid "Change password"
 msgstr "Izmeni lozinku"
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Pomozite u prevođenju"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "koristite ovu adresu da bi se povezali na ownCloud putem menadžnjera fajlova"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Ime"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Grupe"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Napravi"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Obriši"
 
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index f492fa61d7d..ad78ed44871 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <revoltism@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:10+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +18,222 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Det här är inte din adressbok."
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "Kontakt kunde inte hittas."
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "vCard kunde inte läsas in."
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
-msgstr ""
+msgstr "Information om vCard är felaktigt. Vänligen ladda om sidan."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Adress"
 
-#: photo.php:53
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "E-post"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organisation"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Arbete"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Hem"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Text"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Röst"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Fax"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Personsökare"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Det här är inte din kontakt."
+
+#: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Detta kort är inte RFC-kompatibelt."
 
-#: photo.php:90
+#: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Detta kort innehåller inte något foto."
 
-#: templates/index.php:8
+#: templates/index.php:13
 msgid "Add Contact"
+msgstr "Lägg till kontakt"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addcardform.php:5
+#: templates/part.addcardform.php:8
 msgid "Group"
-msgstr ""
+msgstr "Grupp"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
+#: templates/part.addcardform.php:19
 msgid "Name"
-msgstr ""
+msgstr "Namn"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Postbox"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Utökad"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
-msgstr ""
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Gata"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
-msgstr ""
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Stad"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
-msgstr ""
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Län"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
-msgid "PO Box"
-msgstr ""
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Postnummer"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
-msgid "Extended"
-msgstr ""
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Land"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
-msgid "Street"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "Skapa kontakt"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
-msgid "City"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
-msgid "Region"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
-msgid "Zipcode"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
-msgid "Country"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Redigera"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Radera"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.details.php:33
+msgid "Add"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.editaddressbook.php:29
+msgid "Save"
 msgstr ""
 
-#: templates/part.details.php:33
-msgid "Delete"
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
+msgstr "Födelsedag"
+
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 0870f7efb7e..1d822e5fbd8 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <hakan.thn@gmail.com>, 2011.
+#   <revoltism@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-12 07:50+0000\n"
-"Last-Translator: HakanS <hakan.thn@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +19,51 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Du får en länk att återställa ditt lösenord via e-post."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Begärd"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Inloggning misslyckades!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Användarnamn"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Begär återställning"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Ditt lösenord har återställts"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Nytt lösenord"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Återställ lösenordet"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personlig"
@@ -46,54 +92,50 @@ msgstr "Hittade inget moln"
 msgid "Create an <strong>admin account</strong>"
 msgstr "Skapa ett <strong>administratörskonto</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "Användarnamn"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "Avancerat"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Datamapp"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "Konfigurera databasen"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "kommer att användas"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "Databas-användare"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "Lösenord för databasen"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "Databasens namn"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "Avancerat"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "Databasserver"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "Datamapp"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "Avsluta installation"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "ger dig frihet och kontroll över din egen data"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -103,38 +145,22 @@ msgstr "Logga ut"
 msgid "Settings"
 msgstr "Inställningar"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
-msgstr "Tappat bort ditt lösenord?"
+msgstr "Glömt ditt lösenord?"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "kom ihåg"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "Du är utloggad"
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Du kommer få en länk, via e-post, där du kan återställ ditt lösenord"
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "Begärd"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "Inloggning misslyckades!"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "Användarnamn eller e-post"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "Begär återställning"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "föregående"
@@ -143,16 +169,4 @@ msgstr "föregående"
 msgid "next"
 msgstr "nästa"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Ditt lösenord har återställts"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "Nytt lösenord"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "Återställ lösenord"
-
 
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 64566d0b29b..a43ea6cdb9d 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <revoltism@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,33 +18,36 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Inga fel uppstod. Filen laddades upp utan problem"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
+"Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"Den uppladdade filen överstiger MAX_FILE_SIZE direktivet som anges i HTML-"
+"formulär"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Den uppladdade filen var endast delvist uppladdad"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Ingen fil blev uppladdad"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Saknar en tillfällig mapp"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "Filer"
 
@@ -51,48 +55,60 @@ msgstr "Filer"
 msgid "Maximum upload size"
 msgstr "Maximal storlek att lägga upp"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
-msgid "Upload"
-msgstr "Lägg upp"
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "Ny katalog"
+#: templates/index.php:22
+msgid "Upload"
+msgstr "Ladda upp"
 
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
-msgstr "Ingenting här. Lägg upp något!"
+msgstr "Ingenting här. Ladda upp något!"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "Namn"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "Ladda ned"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "Storlek"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "Ändrad"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "Ta bort"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
-msgstr "För stor överföring"
+msgstr "För stor uppladdning"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
-"Filerna du försöker lägga upp överstiger den maximala storleken för "
+"Filerna du försöker ladda upp överstiger den maximala storleken för "
 "filöverföringar på servern."
 
 
diff --git a/l10n/sv/media.po b/l10n/sv/media.po
index 9c01948ed29..31728e350b8 100644
--- a/l10n/sv/media.po
+++ b/l10n/sv/media.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <revoltism@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-12 06:24+0000\n"
-"Last-Translator: HakanS <hakan.thn@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,15 +18,15 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "Musik"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "Spela"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "Paus"
 
@@ -33,7 +34,7 @@ msgstr "Paus"
 msgid "Previous"
 msgstr "Föregående"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "Nästa"
 
@@ -45,11 +46,7 @@ msgstr "Ljudlös"
 msgid "Unmute"
 msgstr "Ljud på"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "Skannade låtar"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "Sök igenom samlingen"
 
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 4ffc833e868..95b886d8c72 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <hakan.thn@gmail.com>, 2011.
+#   <revoltism@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-12 07:57+0000\n"
-"Last-Translator: HakanS <hakan.thn@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +19,26 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "Autentiseringsfel"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID ändrat"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "Ogiltig begäran"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID ändrat"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "Språk ändrades"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "Lägg till din applikation"
@@ -54,15 +59,15 @@ msgstr "av"
 msgid "Ask a question"
 msgstr "Ställ en fråga"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "Problem med att ansluta till hjälp-databasen."
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "GÃ¥ dit manuellt"
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "Svar"
 
@@ -98,36 +103,51 @@ msgstr "visa"
 msgid "Change password"
 msgstr "Ändra lösenord"
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "Hjälp till att översätta"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
-msgstr ""
-"använd denna adress för att ansluta till ditt ownCloud i din filhanterare"
+msgstr "använd denna adress för att ansluta ownCloud till din filhanterare"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "Namn"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "Skapa"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "Ta bort"
 
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 7941082926b..9bcac2da988 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-07 18:29+0100\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index b0426f2bb59..bc72053cd50 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,162 +17,220 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr ""
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
 msgstr ""
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
 msgstr ""
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: photo.php:53
-msgid "This card is not RFC compatible."
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
 msgstr ""
 
-#: photo.php:90
-msgid "This card does not contain a photo."
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
 msgstr ""
 
-#: templates/index.php:8
-msgid "Add Contact"
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
 msgstr ""
 
-#: templates/part.addcardform.php:5
-msgid "Group"
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
 msgstr ""
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
-msgid "Name"
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
 msgstr ""
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: lib/app.php:112
+msgid "Mobile"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
+#: lib/app.php:114
+msgid "Text"
 msgstr ""
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
+#: lib/app.php:115
+msgid "Voice"
 msgstr ""
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
+#: lib/app.php:116
+msgid "Fax"
 msgstr ""
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
+#: lib/app.php:117
+msgid "Video"
 msgstr ""
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
+#: lib/app.php:118
+msgid "Pager"
+msgstr ""
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr ""
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr ""
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr ""
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr ""
+
+#: templates/part.addcardform.php:19
+msgid "Name"
 msgstr ""
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr ""
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr ""
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
 msgstr ""
 
-#: templates/part.details.php:31
+#: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Delete"
 msgstr ""
 
-#: templates/part.details.php:32
-msgid "Add Property"
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
 msgid "Birthday"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
 msgstr ""
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 98b310f2d14..cf13c461196 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,51 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -45,53 +90,49 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:21
-msgid "Username"
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
 msgstr ""
 
-#: templates/installation.php:22
-msgid "Password"
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:34
+msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:27
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr ""
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr ""
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr ""
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
+msgid "web services under your control"
 msgstr ""
 
 #: templates/layout.user.php:34
@@ -102,36 +143,20 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr ""
 
-#: templates/logout.php:1
-msgid "You are logged out."
-msgstr ""
-
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr ""
-
-#: templates/lostpassword.php:5
-msgid "Requested"
+#: templates/login.php:16
+msgid "Log in"
 msgstr ""
 
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr ""
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr ""
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
+#: templates/logout.php:1
+msgid "You are logged out."
 msgstr ""
 
 #: templates/part.pagenavi.php:3
@@ -141,15 +166,3 @@ msgstr ""
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr ""
-
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr ""
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr ""
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 5b57ccec9a2..82e2f1832f1 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,33 +17,33 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr ""
 
@@ -51,43 +51,55 @@ msgstr ""
 msgid "Maximum upload size"
 msgstr ""
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
-msgid "Upload"
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
 msgstr ""
 
-#: templates/index.php:17
-msgid "New Folder"
+#: templates/index.php:22
+msgid "Upload"
 msgstr ""
 
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 0a2757a306e..400e39c3f24 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr ""
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr ""
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr ""
 
@@ -33,7 +33,7 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr ""
 
@@ -45,11 +45,7 @@ msgstr ""
 msgid "Unmute"
 msgstr ""
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr ""
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr ""
 
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index b1444319153..6f5b1a4daae 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,22 +17,26 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
 msgstr ""
 
-#: ajax/openid.php:21
-msgid "OpenID Changed"
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
 msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
-msgid "Invalid request"
+#: ajax/openid.php:15
+msgid "OpenID Changed"
 msgstr ""
 
-#: ajax/setlanguage.php:21
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr ""
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr ""
@@ -53,15 +57,15 @@ msgstr ""
 msgid "Ask a question"
 msgstr ""
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr ""
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr ""
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr ""
 
@@ -97,34 +101,50 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:30
-msgid "Help translating"
+#: templates/personal.php:38
+msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:37
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr ""
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr ""
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr ""
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr ""
diff --git a/l10n/tr/calendar.po b/l10n/tr/calendar.po
new file mode 100644
index 00000000000..6b98fe02158
--- /dev/null
+++ b/l10n/tr/calendar.po
@@ -0,0 +1,637 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Aranel Surion <aranel@aranelsurion.org>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-07 18:29+0100\n"
+"PO-Revision-Date: 2012-01-08 08:41+0000\n"
+"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/team/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr "Zaman dilimi deÄŸiÅŸtirildi"
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr "Geçersiz istek"
+
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr "Takvim"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Yanlış takvim"
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr "Doğum günü"
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr "Ä°ÅŸ"
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr "Arama"
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr "Müşteriler"
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr "Teslimatçı"
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr "Tatil günleri"
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr "Fikirler"
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr "Seyahat"
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr "Yıl dönümü"
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr "Toplantı"
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr "DiÄŸer"
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr "KiÅŸisel"
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr "Projeler"
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr "Sorular"
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr "Ä°ÅŸ"
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr "Tekrar etmiyor"
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr "Günlük"
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr "Haftalı"
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr "Haftaiçi Her gün"
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr "Ä°ki haftada bir"
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr "Aylık"
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr "Yıllı"
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Bir dizi deÄŸil"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Tüm gün"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Eksik alanlar"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Başlık"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Bu Tarihten"
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Bu Saatten"
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Bu Tarihe"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Bu Saate"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Olay başlamadan önce bitiyor"
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Bir veritabanı başarısızlığı oluştu"
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr "Hafta"
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr "Ay"
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr "Liste"
+
+#: templates/calendar.php:45
+msgid "Today"
+msgstr "Bugün"
+
+#: templates/calendar.php:46
+msgid "Calendars"
+msgstr "Takvimler"
+
+#: templates/calendar.php:64
+msgid "There was a fail, while parsing the file."
+msgstr "Dosya okunurken başarısızlık oldu."
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr "Aktif takvimleri seçin"
+
+#: templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Yeni Takvim"
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr "CalDav Bağlantısı"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr "Ä°ndir"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr "Düzenle"
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "Sil"
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr "Yeni takvim"
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr "Takvimi düzenle"
+
+#: templates/part.editcalendar.php:12 templates/part.import.php:29
+msgid "Displayname"
+msgstr "Görünümadı"
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr "Aktif"
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr "Takvim rengi"
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "Kaydet"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "Gönder"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr "Ä°ptal"
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr "Bir olay düzenle"
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Dışa aktar"
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr "Olayın Başlığı"
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr "Kategori"
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr "Kategori seçin"
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr "Tüm Gün Olay"
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr "Kimden"
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr "Kime"
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "GeliÅŸmiÅŸ opsiyonlar"
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr "Tekrar"
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Konum"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Olayın Konumu"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Açıklama"
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr "Olayın Açıklaması"
+
+#: templates/part.import.php:1
+msgid "Import Ical File"
+msgstr "Ical Dosyası Al"
+
+#: templates/part.import.php:4
+msgid "How to import the new calendar?"
+msgstr "Yeni takvim nasıl alınsın?"
+
+#: templates/part.import.php:6
+msgid "Import into an existing calendar"
+msgstr "Mevcut bir takvimin içine al"
+
+#: templates/part.import.php:7
+msgid "Import into a new calendar"
+msgstr "Yeni bir takvim içine al"
+
+#: templates/part.import.php:10
+msgid "Please choose the calendar"
+msgstr "Lütfen takvimi seçin"
+
+#: templates/part.import.php:20 templates/part.import.php:37
+msgid "Import"
+msgstr "İçe Al"
+
+#: templates/part.import.php:22 templates/part.import.php:39
+msgid "Back"
+msgstr "Geri"
+
+#: templates/part.import.php:25
+msgid "Please fill out the form"
+msgstr "Lütfen formu doldurun"
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr "Yeni olay oluÅŸtur"
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr "Zaman dilimi"
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Saat biçimi"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24s"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12s"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "CalDAV Takvim senkron adresi:"
+
+
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
new file mode 100644
index 00000000000..b512c14d33f
--- /dev/null
+++ b/l10n/tr/contacts.po
@@ -0,0 +1,239 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Aranel Surion <aranel@aranelsurion.org>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/team/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: lib/app.php:42
+msgid "This is not your addressbook."
+msgstr "Bu sizin adres defteriniz deÄŸil."
+
+#: lib/app.php:51 photo.php:34
+msgid "Contact could not be found."
+msgstr "Kişi bulunamadı."
+
+#: lib/app.php:65
+msgid "vCard could not be read."
+msgstr "vCard okunamadı."
+
+#: lib/app.php:79
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin."
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "Adres"
+
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "Telefon"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "Eposta"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "Organizasyon"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "Ä°ÅŸ"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "Ev"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "Mobil"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "Metin"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "Ses"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "Faks"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "Video"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "Sayfalayıcı"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "Bu sizin kiÅŸiniz deÄŸil."
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr "Bu kart RFC uyumlu deÄŸil."
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr "Bu kart resim içermiyor."
+
+#: templates/index.php:13
+msgid "Add Contact"
+msgstr "KiÅŸi Ekle"
+
+#: templates/index.php:14
+msgid "Address Books"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Group"
+msgstr "Grup"
+
+#: templates/part.addcardform.php:19
+msgid "Name"
+msgstr "Ad"
+
+#: templates/part.addcardform.php:41
+msgid "Number"
+msgstr ""
+
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "Posta Kutusu"
+
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "Uzatılmış"
+
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "Sokak"
+
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "Åžehir"
+
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "Bölge"
+
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "Posta kodu"
+
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "Ãœlke"
+
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "KiÅŸi OluÅŸtur"
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "Düzenle"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "Sil"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:33
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr "Doğum günü"
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr "Telefon"
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
+
+
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
new file mode 100644
index 00000000000..64d503eecf2
--- /dev/null
+++ b/l10n/tr/core.po
@@ -0,0 +1,171 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Aranel Surion <aranel@aranelsurion.org>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/team/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek."
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "Ä°stendi"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "Giriş başarısız!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "Kullanıcı adı"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "Sıfırlama iste"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Parolanız sıfırlandı"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Yeni parola"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Parolayı sıfırla"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "KiÅŸisel"
+
+#: strings.php:6
+msgid "Users"
+msgstr "Kullanıcılar"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "Uygulamalar"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "Yönetici"
+
+#: strings.php:9
+msgid "Help"
+msgstr "Yardı"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "Bulut bulunamadı"
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr "Bir <strong>yönetici hesabı</strong> oluşturun"
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr "Parola"
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "GeliÅŸmiÅŸ"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "Veri klasörü"
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr "Veritabanını ayarla"
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr "kullanılacak"
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr "Veritabanı kullanıcı adı"
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr "Veritabanı parolası"
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr "Veritabanı adı"
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr "Veritabanı sunucusu"
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr "Kurulumu tamamla"
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr "Çıkış yap"
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr "Ayarlar"
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr "Parolanızı mı unuttunuz?"
+
+#: templates/login.php:15
+msgid "remember"
+msgstr "hatırla"
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "Çıkış yaptınız."
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "önceki"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "sonraki"
+
+
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
new file mode 100644
index 00000000000..3330007801e
--- /dev/null
+++ b/l10n/tr/files.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Aranel Surion <aranel@aranelsurion.org>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/team/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr "Bir hata yok, dosya başarıyla yüklendi"
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+"Yüklenen dosya php.ini de belirtilen upload_max_filesize sınırını aşıyor"
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "Yüklenen dosya HTML formundaki MAX_FILE_SIZE sınırını aşıyor"
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr "Yüklenen dosyanın sadece bir kısmı yüklendi"
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr "Hiç dosya yüklenmedi"
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr "Geçici bir klasör eksik"
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr "Dosyalar"
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr "Maksimum yükleme boyutu"
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr "Yükle"
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr "Burada hiçbir şey yok. Birşeyler yükleyin!"
+
+#: templates/index.php:43
+msgid "Name"
+msgstr "Ad"
+
+#: templates/index.php:45
+msgid "Download"
+msgstr "Ä°ndir"
+
+#: templates/index.php:49
+msgid "Size"
+msgstr "Boyut"
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr "DeÄŸiÅŸtirilme"
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr "Sil"
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr "Yüklemeniz çok büyük"
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+"Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu "
+"aşıyor."
+
+
diff --git a/l10n/tr/media.po b/l10n/tr/media.po
new file mode 100644
index 00000000000..03f15722ccd
--- /dev/null
+++ b/l10n/tr/media.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Aranel Surion <aranel@aranelsurion.org>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/team/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:32
+msgid "Music"
+msgstr "Müzik"
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr "Oynat"
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr "Beklet"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr "Önceki"
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr "Sonraki"
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr "Sesi kapat"
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr "Sesi aç"
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr "Koleksiyonu Tara"
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr "Sanatç"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "Albüm"
+
+#: templates/music.php:39
+msgid "Title"
+msgstr "Başlık"
+
+
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
new file mode 100644
index 00000000000..58aefca15f5
--- /dev/null
+++ b/l10n/tr/settings.po
@@ -0,0 +1,153 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Aranel Surion <aranel@aranelsurion.org>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/team/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr "Geçersiz istek"
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID DeÄŸiÅŸtirildi"
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr "Dil deÄŸiÅŸtirildi"
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr "Uygulamanızı ekleyin"
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr "Bir uygulama seçin"
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr "-lisanslı"
+
+#: templates/apps.php:23
+msgid "by"
+msgstr "yapan"
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr "Bir soru sorun"
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr "Yardım veritabanına bağlanmada sorunlar var."
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr "Oraya elle gidin."
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr "Cevap"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr "Kullanıyorsunuz"
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr "mevcut olandan"
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr "Parolanız değiştirildi"
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "Parolanız değiştirilemiyor"
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr "Mevcut parola"
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr "Yeni parola"
+
+#: templates/personal.php:17
+msgid "show"
+msgstr "göster"
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr "Parola deÄŸiÅŸtir"
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr "Dil"
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr "bu adresi kullanarak ownCloud unuza dosya yöneticinizle bağlanın"
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr "Ad"
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr "Parola"
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr "Gruplar"
+
+#: templates/users.php:23
+msgid "Create"
+msgstr "OluÅŸtur"
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr "Sil"
+
+
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index 1fd7ecb9646..ead574ce084 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <wengxt@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 20:10+0200\n"
-"PO-Revision-Date: 2011-09-23 18:10+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,164 +18,222 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/addcard.php:31 ajax/addproperty.php:31 ajax/deletebook.php:32
-#: ajax/deletecard.php:32 ajax/deleteproperty.php:34 ajax/getdetails.php:32
-#: ajax/setproperty.php:32 ajax/showaddcard.php:30 ajax/showaddproperty.php:31
-#: ajax/showsetproperty.php:32 photo.php:32
-msgid "You need to log in."
-msgstr ""
-
-#: ajax/addcard.php:37
+#: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "这�是您的地�簿。"
 
-#: ajax/addproperty.php:37 ajax/deletecard.php:39 ajax/deleteproperty.php:41
-#: ajax/getdetails.php:39 ajax/setproperty.php:38 ajax/showaddproperty.php:37
-#: ajax/showsetproperty.php:38 photo.php:39
+#: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "无法找到�系人。"
 
-#: ajax/addproperty.php:43 ajax/deletebook.php:38 ajax/deletecard.php:45
-#: ajax/deleteproperty.php:47 ajax/getdetails.php:45 ajax/setproperty.php:44
-#: ajax/showaddproperty.php:43 ajax/showsetproperty.php:44 photo.php:45
-msgid "This is not your contact."
-msgstr ""
-
-#: ajax/addproperty.php:50 ajax/deleteproperty.php:54 ajax/getdetails.php:52
-#: ajax/setproperty.php:51 ajax/showsetproperty.php:51
+#: lib/app.php:65
 msgid "vCard could not be read."
-msgstr ""
+msgstr "vCard 无法读�。"
 
-#: ajax/deleteproperty.php:65 ajax/setproperty.php:62
-#: ajax/showsetproperty.php:62
+#: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
-msgstr ""
+msgstr "vCard 的信��正确。请�新加载页�。"
+
+#: lib/app.php:91 templates/part.addcardform.php:56
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "地�"
 
-#: photo.php:53
+#: lib/app.php:92 templates/part.addcardform.php:37
+msgid "Telephone"
+msgstr "电�"
+
+#: lib/app.php:93 templates/part.addcardform.php:31
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "电�邮件"
+
+#: lib/app.php:94 templates/part.addcardform.php:23
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "组织"
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr "工作"
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr "家庭"
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr "移动电�"
+
+#: lib/app.php:114
+msgid "Text"
+msgstr "文本"
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr "语音"
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr "传真"
+
+#: lib/app.php:117
+msgid "Video"
+msgstr "视频"
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr "传呼机"
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr "这�是您的�系人。"
+
+#: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "这张�片和RFC 标准�兼容。"
 
-#: photo.php:90
+#: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "这张�片�包�照片。"
 
-#: templates/index.php:8
+#: templates/index.php:13
 msgid "Add Contact"
+msgstr "添加�系人"
+
+#: templates/index.php:14
+msgid "Address Books"
 msgstr ""
 
-#: templates/part.addcardform.php:5
+#: templates/part.addcardform.php:8
 msgid "Group"
-msgstr ""
+msgstr "分组"
 
-#: templates/part.addcardform.php:12 templates/part.property.php:3
+#: templates/part.addcardform.php:19
 msgid "Name"
-msgstr ""
+msgstr "�称"
 
-#: templates/part.addcardform.php:14
-msgid "Create Contact"
+#: templates/part.addcardform.php:41
+msgid "Number"
 msgstr ""
 
-#: templates/part.addpropertyform.php:4 templates/part.property.php:40
-msgid "Address"
+#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
+#: templates/part.details.php:42 templates/part.details.php:78
+#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+msgid "Type"
 msgstr ""
 
-#: templates/part.addpropertyform.php:5
-msgid "Telephone"
-msgstr ""
+#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "邮箱"
 
-#: templates/part.addpropertyform.php:6 templates/part.property.php:22
-msgid "Email"
-msgstr ""
+#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "扩展"
 
-#: templates/part.addpropertyform.php:7 templates/part.property.php:15
-msgid "Organization"
-msgstr ""
+#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "街�"
 
-#: templates/part.addpropertyform.php:17 templates/part.addpropertyform.php:32
-msgid "Work"
-msgstr ""
+#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "城市"
 
-#: templates/part.addpropertyform.php:18 templates/part.addpropertyform.php:30
-msgid "Home"
-msgstr ""
+#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "地区"
 
-#: templates/part.addpropertyform.php:20 templates/part.property.php:48
-#: templates/part.setpropertyform.php:5
-msgid "PO Box"
-msgstr ""
+#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "邮编"
 
-#: templates/part.addpropertyform.php:21 templates/part.property.php:51
-#: templates/part.setpropertyform.php:6
-msgid "Extended"
-msgstr ""
+#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "国家"
 
-#: templates/part.addpropertyform.php:22 templates/part.property.php:54
-#: templates/part.setpropertyform.php:7
-msgid "Street"
-msgstr ""
+#: templates/part.addcardform.php:97
+msgid "Create Contact"
+msgstr "创建�系人"
 
-#: templates/part.addpropertyform.php:23 templates/part.property.php:57
-#: templates/part.setpropertyform.php:8
-msgid "City"
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
 msgstr ""
 
-#: templates/part.addpropertyform.php:24 templates/part.property.php:60
-#: templates/part.setpropertyform.php:9
-msgid "Region"
+#: templates/part.chooseaddressbook.php:16
+#: templates/part.editaddressbook.php:9
+msgid "New Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:25 templates/part.property.php:63
-#: templates/part.setpropertyform.php:10
-msgid "Zipcode"
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
 msgstr ""
 
-#: templates/part.addpropertyform.php:26 templates/part.property.php:66
-#: templates/part.setpropertyform.php:11
-msgid "Country"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
 msgstr ""
 
-#: templates/part.addpropertyform.php:31
-msgid "Mobile"
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "编辑"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "删除"
+
+#: templates/part.details.php:3
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.addpropertyform.php:33
-msgid "Text"
+#: templates/part.details.php:33
+msgid "Add"
 msgstr ""
 
-#: templates/part.addpropertyform.php:34
-msgid "Voice"
+#: templates/part.editaddressbook.php:9
+msgid "Edit Address Book"
 msgstr ""
 
-#: templates/part.addpropertyform.php:35
-msgid "Fax"
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
 msgstr ""
 
-#: templates/part.addpropertyform.php:36
-msgid "Video"
+#: templates/part.editaddressbook.php:23
+msgid "Active"
 msgstr ""
 
-#: templates/part.addpropertyform.php:37
-msgid "Pager"
+#: templates/part.editaddressbook.php:29
+msgid "Save"
 msgstr ""
 
-#: templates/part.details.php:33
-msgid "Delete"
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
 msgstr ""
 
-#: templates/part.details.php:34
-msgid "Add Property"
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
 msgstr ""
 
-#: templates/part.property.php:9
+#: templates/part.property.php:3
 msgid "Birthday"
+msgstr "生日"
+
+#: templates/part.property.php:23
+msgid "Preferred"
 msgstr ""
 
-#: templates/part.property.php:29
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "电�"
 
-#: templates/part.setpropertyform.php:17
-msgid "Edit"
+#: templates/part.setpropertyform.php:57
+msgid "Update"
 msgstr ""
 
 
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 1d6281a1f51..147d4a8dd65 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-23 18:17+0200\n"
-"PO-Revision-Date: 2011-09-04 17:07+0000\n"
-"Last-Translator: csslayer <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,51 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "您将会收到包��以�置密�链接的邮件。"
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "已请求"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "登录失败�"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "用户�"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "请求�置"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "您的密�已�置"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "新密�"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "�置密�"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "个人"
@@ -46,54 +91,50 @@ msgstr "未找到云"
 msgid "Create an <strong>admin account</strong>"
 msgstr "创建<strong>管�员账�</strong>"
 
-#: templates/installation.php:21
-msgid "Username"
-msgstr "用户�"
-
-#: templates/installation.php:22
+#: templates/installation.php:26 templates/login.php:12
 msgid "Password"
 msgstr "密�"
 
-#: templates/installation.php:27
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "高级"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "数�目录"
+
+#: templates/installation.php:41
 msgid "Configure the database"
 msgstr "�置数�库"
 
-#: templates/installation.php:32 templates/installation.php:43
-#: templates/installation.php:53
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
 msgid "will be used"
 msgstr "将被使用"
 
-#: templates/installation.php:64
+#: templates/installation.php:79
 msgid "Database user"
 msgstr "数�库用户"
 
-#: templates/installation.php:65
+#: templates/installation.php:83
 msgid "Database password"
 msgstr "数�库密�"
 
-#: templates/installation.php:66
+#: templates/installation.php:87
 msgid "Database name"
 msgstr "数�库�"
 
-#: templates/installation.php:72
-msgid "Advanced"
-msgstr "高级"
-
-#: templates/installation.php:75
+#: templates/installation.php:93
 msgid "Database host"
 msgstr "数�库主机"
 
-#: templates/installation.php:76
-msgid "Data folder"
-msgstr "数�目录"
-
-#: templates/installation.php:79
+#: templates/installation.php:98
 msgid "Finish setup"
 msgstr "安装完�"
 
 #: templates/layout.guest.php:35
-msgid "gives you freedom and control over your own data"
-msgstr "自由掌控您的数�"
+msgid "web services under your control"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -103,38 +144,22 @@ msgstr "注销"
 msgid "Settings"
 msgstr "设置"
 
-#: templates/login.php:4
+#: templates/login.php:5
 msgid "Lost your password?"
 msgstr "忘记密�？"
 
-#: templates/login.php:9 templates/login.php:13
+#: templates/login.php:15
 msgid "remember"
 msgstr "记�"
 
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
 #: templates/logout.php:1
 msgid "You are logged out."
 msgstr "您已注销。"
 
-#: templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "您将通过邮件收到一个用于�置密�的链接"
-
-#: templates/lostpassword.php:5
-msgid "Requested"
-msgstr "请求已��"
-
-#: templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr "登陆失败�"
-
-#: templates/lostpassword.php:10
-msgid "Username or Email"
-msgstr "用户�或电�邮件"
-
-#: templates/lostpassword.php:11
-msgid "Request reset"
-msgstr "请求�置"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "上一页"
@@ -143,16 +168,4 @@ msgstr "上一页"
 msgid "next"
 msgstr "下一页"
 
-#: templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "您的密�已�置"
-
-#: templates/resetpassword.php:6
-msgid "New password"
-msgstr "新密�"
-
-#: templates/resetpassword.php:7
-msgid "Reset password"
-msgstr "�置密�"
-
 
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 4a30d9d0c1f..89831a4b081 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,33 +18,33 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "没有�生错误，文件上传�功。"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "上传的文件大�超过了php.ini 中指定的upload_max_filesize"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "上传的文件超过了在HTML 表�中指定的MAX_FILE_SIZE"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "�上传了文件的一部分"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "文件没有上传"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "缺少临时目录"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:8
 msgid "Files"
 msgstr "文件"
 
@@ -52,43 +52,55 @@ msgstr "文件"
 msgid "Maximum upload size"
 msgstr "最大上传大�"
 
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
 msgid "Upload"
 msgstr "上传"
 
-#: templates/index.php:17
-msgid "New Folder"
-msgstr "新建文件夹"
-
-#: templates/index.php:31
+#: templates/index.php:35
 msgid "Nothing in here. Upload something!"
 msgstr "这里还什么都没有。上传些东西��"
 
-#: templates/index.php:39
+#: templates/index.php:43
 msgid "Name"
 msgstr "�称"
 
-#: templates/index.php:41
+#: templates/index.php:45
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:45
+#: templates/index.php:49
 msgid "Size"
 msgstr "大�"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Modified"
 msgstr "修改日期"
 
-#: templates/index.php:46
+#: templates/index.php:50
 msgid "Delete"
 msgstr "删除"
 
-#: templates/index.php:54
+#: templates/index.php:58
 msgid "Upload too large"
 msgstr "上传文件过大"
 
-#: templates/index.php:56
+#: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/zh_CN/media.po b/l10n/zh_CN/media.po
index f80f1839a1d..868e222190d 100644
--- a/l10n/zh_CN/media.po
+++ b/l10n/zh_CN/media.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 #   <wengxt@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:53+0000\n"
-"Last-Translator: csslayer <wengxt@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,15 +18,15 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:31
+#: appinfo/app.php:32
 msgid "Music"
 msgstr "音�"
 
-#: templates/music.php:3
+#: templates/music.php:3 templates/player.php:13
 msgid "Play"
 msgstr "播放"
 
-#: templates/music.php:4 templates/music.php:30
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
 msgstr "暂�"
 
@@ -33,7 +34,7 @@ msgstr "暂�"
 msgid "Previous"
 msgstr "�一首"
 
-#: templates/music.php:6
+#: templates/music.php:6 templates/player.php:15
 msgid "Next"
 msgstr "�一首"
 
@@ -45,11 +46,7 @@ msgstr "�音"
 msgid "Unmute"
 msgstr "�消�音"
 
-#: templates/music.php:28
-msgid "Songs scanned"
-msgstr "歌曲已扫�"
-
-#: templates/music.php:29
+#: templates/music.php:25
 msgid "Rescan Collection"
 msgstr "�新扫�收�"
 
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index f960000e2fc..7a6daf187ec 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 #   <wengxt@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 15:07+0200\n"
-"PO-Revision-Date: 2011-09-03 13:29+0000\n"
-"Last-Translator: csslayer <wengxt@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +18,26 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/openid.php:13 ajax/setlanguage.php:13
-msgid "Authentication error"
-msgstr "验�错误"
-
-#: ajax/openid.php:21
-msgid "OpenID Changed"
-msgstr "OpenID 已修改"
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
 
-#: ajax/openid.php:23 ajax/setlanguage.php:23
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
 msgstr "�法请求"
 
-#: ajax/setlanguage.php:21
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "OpenID 已修改"
+
+#: ajax/setlanguage.php:14
 msgid "Language changed"
 msgstr "语言已修改"
 
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
 #: templates/apps.php:8
 msgid "Add your application"
 msgstr "加入您的应用程�"
@@ -53,15 +58,15 @@ msgstr "ç”±"
 msgid "Ask a question"
 msgstr "�问"
 
-#: templates/help.php:17
+#: templates/help.php:20
 msgid "Problems connecting to help database."
 msgstr "连接帮助数�库错误 "
 
-#: templates/help.php:18
+#: templates/help.php:21
 msgid "Go there manually."
 msgstr "手动访问"
 
-#: templates/help.php:26
+#: templates/help.php:29
 msgid "Answer"
 msgstr "回答"
 
@@ -97,35 +102,51 @@ msgstr "显示"
 msgid "Change password"
 msgstr "修改密�"
 
-#: templates/personal.php:24 templates/personal.php:25
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
 msgstr "语言"
 
-#: templates/personal.php:30
-msgid "Help translating"
-msgstr "帮助翻译"
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
 
-#: templates/personal.php:36
+#: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr "在文件管�器中使用这个地��连接到您的 ownCloud"
 
-#: templates/users.php:16
+#: templates/users.php:15 templates/users.php:30
 msgid "Name"
 msgstr "�称"
 
-#: templates/users.php:17
+#: templates/users.php:16 templates/users.php:31
 msgid "Password"
 msgstr "密�"
 
-#: templates/users.php:18 templates/users.php:36
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
 msgstr "组"
 
-#: templates/users.php:24
+#: templates/users.php:23
 msgid "Create"
 msgstr "创建"
 
-#: templates/users.php:48
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
 msgid "Delete"
 msgstr "删除"
 
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
new file mode 100644
index 00000000000..a65dc2fe9bd
--- /dev/null
+++ b/settings/l10n/ar.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Invalid request" => "طلبك غير م�هوم",
+"OpenID Changed" => "تم تغيير ال OpenID",
+"Language changed" => "تم تغيير اللغة",
+"Add your application" => "أض� تطبيقاتك",
+"Select an App" => "إختر تطبيقاً",
+"-licensed" => "-مسجل",
+"by" => "من قبل",
+"Ask a question" => "إسأل سؤال",
+"Problems connecting to help database." => "الاتصال بقاعدة بيانات المساعدة لم يتم بنجاح",
+"Go there manually." => "إذهب هنالك بن�سك",
+"Answer" => "الجواب",
+"You use" => "أنت تستخدم",
+"of the available" => "من الموجود",
+"Your password got changed" => "لقد تم تغيير كلمات السر",
+"Unable to change your password" => "لم يتم تعديل كلمة السر بنجاح",
+"Current password" => "كلمات السر الحالية",
+"New password" => "كلمات سر جديدة",
+"show" => "أظهر",
+"Change password" => "عدل كلمة السر",
+"Language" => "اللغة",
+"use this address to connect to your ownCloud in your file manager" => "إستخدم هذا العنوان للإتصال ب ownCloud داخل نظام المل�ات ",
+"Name" => "الاسم",
+"Password" => "كلمات السر",
+"Groups" => "مجموعات",
+"Create" => "انشئ",
+"Delete" => "حذ�"
+);
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 31afbf93485..0e8c79010a4 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Проблем � идентификаци�та",
-"OpenID Changed" => "OpenID е �менено",
 "Invalid request" => "�евалидна за�вка",
+"OpenID Changed" => "OpenID е �менено",
 "Language changed" => "Езика е �менен",
 "Add your application" => "Добавете Ваша програма",
 "Select an App" => "Изберете програма",
@@ -20,7 +19,6 @@
 "show" => "показва",
 "Change password" => "Пром�на на парола",
 "Language" => "Език",
-"Help translating" => "Помогнете � превода",
 "use this address to connect to your ownCloud in your file manager" => "ползвай този адре� за връзка � Ваши� ownCloud във файлови� мениджър",
 "Name" => "Име",
 "Password" => "Парола",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 95d84eeed9f..5f584c9b6c1 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,10 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Error d'autenticació",
-"OpenID Changed" => "OpenID ha canviat",
 "Invalid request" => "Sol.licitud no vàlida",
+"OpenID Changed" => "OpenID ha canviat",
 "Language changed" => "S'ha canviat l'idioma",
 "Add your application" => "Afegir una aplicació",
-"Select an App" => "Sel·leccioneu una aplicació",
+"Select an App" => "Seleccioneu una aplicació",
 "-licensed" => "- amb llicència",
 "by" => "per",
 "Ask a question" => "Feu una pregunta",
@@ -14,12 +13,12 @@
 "You use" => "Esteu usant",
 "of the available" => "del disponible",
 "Your password got changed" => "La contrasenya ha canviat",
+"Unable to change your password" => "No s'ha pogut canviar la contrasenya",
 "Current password" => "contrasenya actual",
 "New password" => "Contrasenya nova",
 "show" => "mostra",
 "Change password" => "canvia la contrasenya",
 "Language" => "Idioma",
-"Help translating" => "Ajudeu amb la traducció",
 "use this address to connect to your ownCloud in your file manager" => "useu aquesta adreça per connectar-vos a ownCloud des del gestor de fitxers",
 "Name" => "Nom",
 "Password" => "Contrasenya",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 8bbef78c038..3da0ef58525 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Chyba při ověření",
-"OpenID Changed" => "OpenID změněn",
 "Invalid request" => "Chybný dotaz",
+"OpenID Changed" => "OpenID změněn",
 "Language changed" => "Jazyk byl změněn",
 "Add your application" => "Přidejte svou aplikaci",
 "Select an App" => "Vyberte aplikaci",
@@ -20,7 +19,6 @@
 "show" => "zobrazit",
 "Change password" => "Změnit heslo",
 "Language" => "Jazyk",
-"Help translating" => "Pomozte s překladem",
 "use this address to connect to your ownCloud in your file manager" => "tuto adresu použijte pro připojení k ownCloud ve Vašem správci souborů",
 "Name" => "Jméno",
 "Password" => "Heslo",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index cb51f709a47..2362159f07f 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,25 +1,24 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Godkendelsesfejl",
-"OpenID Changed" => "OpenID ændret",
 "Invalid request" => "Ugyldig forespørgsel",
+"OpenID Changed" => "OpenID ændret",
 "Language changed" => "Sprog ændret",
 "Add your application" => "Tilføj dit program",
 "Select an App" => "Vælg en App",
 "-licensed" => "-licenseret",
 "by" => "af",
 "Ask a question" => "Stil et spørgsmål",
-"Problems connecting to help database." => "Problemer med at forbinde til hjælpe-databasen",
+"Problems connecting to help database." => "Problemer med at forbinde til hjælpe-databasen.",
 "Go there manually." => "GÃ¥ derhen manuelt.",
 "Answer" => "Svar",
 "You use" => "Du benytter",
 "of the available" => "af det tilgængelige",
 "Your password got changed" => "Din adgangskode er blevet ændret",
+"Unable to change your password" => "Ude af stand til at ændre dit kodeord",
 "Current password" => "Nuværende adgangskode",
 "New password" => "Ny adgangskode",
 "show" => "vis",
-"Change password" => "Skift password",
+"Change password" => "Skift kodeord",
 "Language" => "Sprog",
-"Help translating" => "Hjælp med at oversætte",
 "use this address to connect to your ownCloud in your file manager" => "benyt denne adresse til at forbinde til din ownCloud i din filbrowser",
 "Name" => "Navn",
 "Password" => "Kodeord",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 21f3a8f8aa0..ccc84a988a6 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Berechtigungsfehler",
-"OpenID Changed" => "OpenID geändert",
 "Invalid request" => "Ungültige Anfrage",
+"OpenID Changed" => "OpenID geändert",
 "Language changed" => "Sprache geändert",
 "Add your application" => "Eigene Anwendung hinzufügen",
 "Select an App" => "Wähle eine Anwendung aus",
@@ -14,12 +13,12 @@
 "You use" => "Du nutzt",
 "of the available" => "der verfügbaren",
 "Your password got changed" => "Dein Passwort wurde geändert",
+"Unable to change your password" => "Passwort konnte nicht geändert werden",
 "Current password" => "Aktuelles Passwort",
 "New password" => "Neues Passwort",
 "show" => "zeigen",
 "Change password" => "Passwort ändern",
 "Language" => "Sprache",
-"Help translating" => "Hilf bei der Ãœbersetzung",
 "use this address to connect to your ownCloud in your file manager" => "benutze diese Adresse, um deine ownCloud mit deinem Dateiverwalter zu verbinden",
 "Name" => "Name",
 "Password" => "Passwort",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 8d55698e0aa..cebc56d1200 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Σφάλμα ταυτοποίησης",
-"OpenID Changed" => "Το OpenID άλλαξε",
 "Invalid request" => "Άκυ�α αίτημα",
+"OpenID Changed" => "Το OpenID άλλαξε",
 "Language changed" => "Η γλώσσα άλλαξε",
+"Add your application" => "Π�οσθέστε την δική σας εφα�μογή",
 "Select an App" => "Επιλέξτε μια εφα�μογή",
 "-licensed" => "-με άδεια",
 "by" => "με",
@@ -13,12 +13,12 @@
 "You use" => "Χ�ησιμοποιείτε",
 "of the available" => "από τα διαθέσιμα",
 "Your password got changed" => "Ο κωδικός π�όσβασής σας άλαλαξε",
+"Unable to change your password" => "Δεν ήταν δυνατή η αλλαγή του κωδικο� π�όσβασης",
 "Current password" => "Τ�έχοντα κωδικό π�όσβασης",
 "New password" => "�έος κωδικός",
 "show" => "Εμφάνιση",
 "Change password" => "Αλλαγή κωδικο� π�όσβασης",
 "Language" => "Γλώσσα",
-"Help translating" => "Βοηθήστε στη μετάφ�αση",
 "use this address to connect to your ownCloud in your file manager" => "χ�ησιμοποιήστε αυτή τη διε�θυνση για να συνδεθείτε στο ownCloud σας από το διαχει�ιστή α�χείων σας",
 "Name" => "Όνομα",
 "Password" => "Κωδικός",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
new file mode 100644
index 00000000000..e1af753798d
--- /dev/null
+++ b/settings/l10n/eo.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Invalid request" => "Nevalida peto",
+"OpenID Changed" => "La agordo de OpenID estas �an�ita",
+"Language changed" => "La lingvo estas �an�ita",
+"Add your application" => "Aldonu vian aplikaĵon",
+"Select an App" => "Elekti aplikaĵon",
+"-licensed" => "-permesila",
+"by" => "de",
+"Ask a question" => "Faru demandon",
+"Problems connecting to help database." => "Problemoj okazis dum konektado al la helpa datumbazo.",
+"Go there manually." => "Iri tien mane.",
+"Answer" => "Respondi",
+"You use" => "Vi uzas",
+"of the available" => "el la disponeblaj",
+"Your password got changed" => "Via pasvorto �an�i�is",
+"Unable to change your password" => "Ne eblis �an�i vian pasvorton",
+"Current password" => "Nuna pasvorto",
+"New password" => "Nova pasvorto",
+"show" => "montri",
+"Change password" => "Ŝan�i la pasvorton",
+"Language" => "Lingvo",
+"use this address to connect to your ownCloud in your file manager" => "uzu ĉi tiun adreson por konekti�i al via ownCloud per via dosieradministrilo",
+"Name" => "Nomo",
+"Password" => "Pasvorto",
+"Groups" => "Grupoj",
+"Create" => "Krei",
+"Delete" => "Forigi"
+);
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 0459ae45366..526dc75793b 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Error de autentificación",
-"OpenID Changed" => "OpenID Cambiado",
 "Invalid request" => "Solicitud no válida",
+"OpenID Changed" => "OpenID Cambiado",
 "Language changed" => "Idioma cambiado",
 "Add your application" => "Añadir tu aplicación",
 "Select an App" => "Seleccionar una aplicación",
@@ -14,13 +13,13 @@
 "You use" => "Estás utilizando",
 "of the available" => "del total disponible de",
 "Your password got changed" => "Tu contraseña ha sido cambiada",
+"Unable to change your password" => "No se pudo cambiar su contraseña",
 "Current password" => "Contraseña actual",
 "New password" => "Nueva contraseña:",
 "show" => "mostrar",
 "Change password" => "Cambiar contraseña",
 "Language" => "Idioma",
-"Help translating" => "Ayuda a traducir",
-"use this address to connect to your ownCloud in your file manager" => "usar esta dirección para conectar tu ownCloud en tu explorador de archivos",
+"use this address to connect to your ownCloud in your file manager" => "utiliza esta dirección para conectar a tu ownCloud desde tu explorador de archivos",
 "Name" => "Nombre",
 "Password" => "Contraseña",
 "Groups" => "Grupos",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 0e849f9d82f..c01c8400ca8 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Autentimise viga",
-"OpenID Changed" => "OpenID on muudetud",
 "Invalid request" => "Vigane päring",
+"OpenID Changed" => "OpenID on muudetud",
 "Language changed" => "Keel on muudetud",
 "Add your application" => "Lisa oma programm",
 "Select an App" => "Vali programm",
@@ -20,7 +19,6 @@
 "show" => "näita",
 "Change password" => "Muuda parooli",
 "Language" => "Keel",
-"Help translating" => "Abiinfo tõlkimine",
 "use this address to connect to your ownCloud in your file manager" => "kasuta seda aadressi oma ownCloudiga ühendamiseks failihalduriga",
 "Name" => "Nimi",
 "Password" => "Parool",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
new file mode 100644
index 00000000000..9926393dec3
--- /dev/null
+++ b/settings/l10n/eu.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Invalid request" => "Baliogabeko eskaria",
+"OpenID Changed" => "OpenID aldatuta",
+"Language changed" => "Hizkuntza aldatuta",
+"Add your application" => "Gehitu zure programa",
+"Select an App" => "Aukeratu Programa bat",
+"-licensed" => "lizentziarekin.",
+"by" => " Egilea:",
+"Ask a question" => "Egin galdera bat",
+"Problems connecting to help database." => "Arazoak daude laguntza datubasera konektatzeko.",
+"Go there manually." => "Joan hara eskuz.",
+"Answer" => "Erantzun",
+"You use" => "Erabiltzen ari zara ",
+"of the available" => "eta guztira erabil dezakezu ",
+"Your password got changed" => "Zure pasahitza aldatu da",
+"Unable to change your password" => "Ezin izan da zure pasahitza aldatu",
+"Current password" => "Uneko pasahitza",
+"New password" => "Pasahitz berria",
+"show" => "erakutsi",
+"Change password" => "Aldatu pasahitza",
+"Language" => "Hizkuntza",
+"use this address to connect to your ownCloud in your file manager" => "erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko",
+"Name" => "Izena",
+"Password" => "Pasahitza",
+"Groups" => "Taldeak",
+"Create" => "Sortu",
+"Delete" => "Ezabatu"
+);
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 74efb60fca2..10b4b703e75 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Erreur d'authentification",
-"OpenID Changed" => "Identifiant OpenID changé",
 "Invalid request" => "Requête invalide",
+"OpenID Changed" => "Identifiant OpenID changé",
 "Language changed" => "Langue changée",
 "Add your application" => "Ajoutez votre application",
 "Select an App" => "Sélectionner une Application",
@@ -12,7 +11,7 @@
 "Go there manually." => "S'y rendre manuellement.",
 "Answer" => "Réponse",
 "You use" => "Vous utilisez",
-"of the available" => "sur un total de",
+"of the available" => "d'espace de stockage sur un total de",
 "Your password got changed" => "Votre mot de passe a été changé",
 "Unable to change your password" => "Impossible de changer votre mot de passe",
 "Current password" => "Mot de passe actuel",
@@ -20,7 +19,6 @@
 "show" => "Afficher",
 "Change password" => "Changer de mot de passe",
 "Language" => "Langue",
-"Help translating" => "Aider à traduire",
 "use this address to connect to your ownCloud in your file manager" => "utilisez cette adresse pour vous connecter à votre ownCloud depuis un explorateur de fichiers",
 "Name" => "Nom",
 "Password" => "Mot de passe",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
new file mode 100644
index 00000000000..beec6ed4eb9
--- /dev/null
+++ b/settings/l10n/he.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Invalid request" => "בקשה ל� חוקית",
+"OpenID Changed" => "OpenID השתנה",
+"Language changed" => "שפה השתנתה",
+"Add your application" => "הוספת היישו� שלך",
+"Select an App" => "בחירת יישו�",
+"-licensed" => "רשיון",
+"by" => "מ�ת",
+"Ask a question" => "ש�ל ש�לה",
+"Problems connecting to help database." => "בעיות בהתחברות לבסיס נתוני העזרה",
+"Go there manually." => "גש לש� ב�ופן ידני",
+"Answer" => "מענה",
+"You use" => "הנך משתמש ",
+"of the available" => "מתוך ",
+"Your password got changed" => "הססמה שלך שונתה",
+"Unable to change your password" => "ל� ניתן לשנות �ת הססמה שלך",
+"Current password" => "ססמה נוכחית",
+"New password" => "ססמה חדשה",
+"show" => "הצגה",
+"Change password" => "שינוי ססמה",
+"Language" => "פה",
+"use this address to connect to your ownCloud in your file manager" => "השתמש בכתובת זו כדי להתחבר ל־ownCloude שלך ממנהל הקבצי�",
+"Name" => "ש�",
+"Password" => "ססמה",
+"Groups" => "קבוצות",
+"Create" => "יצירה",
+"Delete" => "מחיקה"
+);
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
new file mode 100644
index 00000000000..4e5ed4bc1bc
--- /dev/null
+++ b/settings/l10n/hr.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Invalid request" => "Neispravan zahtjev",
+"OpenID Changed" => "OpenID promijenjen",
+"Language changed" => "Jezik promijenjen",
+"Add your application" => "Dodajte vašu aplikaciju",
+"Select an App" => "Odaberite Aplikaciju",
+"-licensed" => "-licencirano",
+"by" => "od",
+"Ask a question" => "Postavite pitanje",
+"Problems connecting to help database." => "Problem pri spajanju na bazu podataka pomoći",
+"Go there manually." => "Idite tamo ru�no.",
+"Answer" => "Odgovor",
+"You use" => "Koristite",
+"of the available" => "od dostupno",
+"Your password got changed" => "Vaša lozinka je promijenjena",
+"Unable to change your password" => "Nemoguće promijeniti lozinku",
+"Current password" => "Trenutna lozinka",
+"New password" => "Nova lozinka",
+"show" => "prikaz",
+"Change password" => "Izmjena lozinke",
+"Language" => "Jezik",
+"use this address to connect to your ownCloud in your file manager" => "koristite ovu adresu za spajanje na Cloud u vašem upravitelju datoteka",
+"Name" => "Ime",
+"Password" => "Lozinka",
+"Groups" => "Grupe",
+"Create" => "Izradi",
+"Delete" => "Obriši"
+);
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
new file mode 100644
index 00000000000..a2e468e5170
--- /dev/null
+++ b/settings/l10n/hu_HU.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Invalid request" => "Érvénytelen kérés",
+"OpenID Changed" => "OpenID megváltozott",
+"Language changed" => "A nyelv megváltozott",
+"Add your application" => "Alkalmazásod hozzáadása",
+"Select an App" => "Egy App kiválasztása",
+"-licensed" => "-licenszelt",
+"Ask a question" => "Tégy fel egy kérdést",
+"Go there manually." => "Menj oda kézzel",
+"Answer" => "Válasz",
+"of the available" => "a rendelkezésre álló",
+"Your password got changed" => "A jelszó megváltozott",
+"Unable to change your password" => "Nem lehet megváltoztatni a jelszavad",
+"Current password" => "Jelenlegi jelszó",
+"New password" => "Új jelszó",
+"show" => "Mutatás",
+"Change password" => "Jelszó megváltoztatása",
+"Language" => "Nyelv",
+"use this address to connect to your ownCloud in your file manager" => "Használd ezt a címet hogy csatlakozz a saját ownCloud rendszeredhez a fájlkezelődben",
+"Name" => "Név",
+"Password" => "Jelszó",
+"Groups" => "Csoportok",
+"Create" => "Létrehozás",
+"Delete" => "Törlés"
+);
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
new file mode 100644
index 00000000000..85ff0696ef8
--- /dev/null
+++ b/settings/l10n/ia.php
@@ -0,0 +1,21 @@
+<?php $TRANSLATIONS = array(
+"OpenID Changed" => "OpenID cambiate",
+"Language changed" => "Linguage cambiate",
+"Add your application" => "Adder tu application",
+"Select an App" => "Selectionar un app",
+"by" => "per",
+"Ask a question" => "Facer un question",
+"Answer" => "Responsa",
+"Your password got changed" => "Tu contrasigno esseva cambiate",
+"Unable to change your password" => "Non pote cambiar tu contrasigno",
+"Current password" => "Contrasigno currente",
+"New password" => "Nove contrasigno",
+"show" => "monstrar",
+"Change password" => "Cambiar contrasigno",
+"Language" => "Linguage",
+"Name" => "Nomine",
+"Password" => "Contrasigno",
+"Groups" => "Gruppos",
+"Create" => "Crear",
+"Delete" => "Deler"
+);
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index b6909f914f9..c361b504d74 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Otentikasi bermasalah",
-"OpenID Changed" => "OpenID telah dirubah",
 "Invalid request" => "Permintaan tidak valid",
+"OpenID Changed" => "OpenID telah dirubah",
 "Language changed" => "Bahasa telah diganti",
 "Add your application" => "Tambahkan aplikasi anda",
 "Select an App" => "Pilih satu aplikasi",
@@ -14,12 +13,12 @@
 "You use" => "Anda menggunakan",
 "of the available" => "dari yang tersedia",
 "Your password got changed" => "Password anda telah dirubah",
+"Unable to change your password" => "Tidak dapat merubah password anda",
 "Current password" => "Password saat ini",
 "New password" => "Password baru",
 "show" => "perlihatkan",
 "Change password" => "Rubah password",
 "Language" => "Bahasa",
-"Help translating" => "Bantu terjemahkan",
 "use this address to connect to your ownCloud in your file manager" => "gunakan alamat ini untuk terhubung dengan ownCloud anda dalam file manager anda",
 "Name" => "Nama",
 "Password" => "Password",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 54f6c019ba2..59b341851e6 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,11 +1,10 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Errore nell'autenticazione",
-"OpenID Changed" => "OpenID Modificato",
 "Invalid request" => "Richiesta non valida",
+"OpenID Changed" => "OpenID Modificato",
 "Language changed" => "Lingua modificata",
 "Add your application" => "Aggiungi un applicazione",
 "Select an App" => "Seleziona un applicazione",
-"-licensed" => "-licensed",
+"-licensed" => "-rilasciato",
 "by" => "da",
 "Ask a question" => "Fai una domanda",
 "Problems connecting to help database." => "Problemi di connessione al database di aiuto",
@@ -20,7 +19,6 @@
 "show" => "mostra",
 "Change password" => "Modifica password",
 "Language" => "Lingua",
-"Help translating" => "Aiuta nella traduzione",
 "use this address to connect to your ownCloud in your file manager" => "usa questo indirizzo per connettersi al proprio ownCloud nel tuo file manager",
 "Name" => "Nome",
 "Password" => "Password",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
new file mode 100644
index 00000000000..fe4eda3a13a
--- /dev/null
+++ b/settings/l10n/ja_JP.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Invalid request" => "無効�リクエスト��",
+"OpenID Changed" => "OpenID�変更�れ���",
+"Language changed" => "言語�変更�れ���",
+"Add your application" => "アプリを追加������",
+"Select an App" => "アプリを�択������",
+"-licensed" => "権利を���れ����",
+"by" => "�よ��",
+"Ask a question" => "質�������",
+"Problems connecting to help database." => "ヘルプ用データベース接続��題�生����",
+"Go there manually." => "手動�移動������",
+"Answer" => "解答",
+"You use" => "����使���る��",
+"of the available" => "��。利用�能容��",
+"Your password got changed" => "パスワード�変更�れ���",
+"Unable to change your password" => "パスワードを変更�る�������ん",
+"Current password" => "�在�パスワード",
+"New password" => "新��パスワード",
+"show" => "表示",
+"Change password" => "パスワードを変更�る",
+"Language" => "言語",
+"use this address to connect to your ownCloud in your file manager" => "ファイルマ�ージャー�����ownCloud�接続�る�����アドレスを使用������",
+"Name" => "��",
+"Password" => "パスワード",
+"Groups" => "グループ",
+"Create" => "作�",
+"Delete" => "削除"
+);
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index f6188cec626..03d15e31184 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Authentifikatioun's Feeler",
-"OpenID Changed" => "OpenID huet geännert",
 "Invalid request" => "Ongülteg Requête",
+"OpenID Changed" => "OpenID huet geännert",
 "Language changed" => "Sprooch huet geännert",
 "Add your application" => "Sätz deng Applikatioun bäi",
 "Select an App" => "Wiel eng Applikatioun aus",
@@ -20,7 +19,6 @@
 "show" => "weisen",
 "Change password" => "Passwuert änneren",
 "Language" => "Sprooch",
-"Help translating" => "Hëllef ze Iwwersetzen",
 "use this address to connect to your ownCloud in your file manager" => "benotz dës Adress fir dech un deng ownCloud iwwert däin Datei Manager ze verbannen",
 "Name" => "Numm",
 "Password" => "Passwuert",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
new file mode 100644
index 00000000000..3d01d0788ac
--- /dev/null
+++ b/settings/l10n/lt_LT.php
@@ -0,0 +1,26 @@
+<?php $TRANSLATIONS = array(
+"Invalid request" => "Klaidinga užklausa",
+"OpenID Changed" => "OpenID pakeistas",
+"Language changed" => "Kalba pakeista",
+"Add your application" => "Pridėti jūsų programą",
+"Select an App" => "Pasirinkite programÄ…",
+"-licensed" => "-licencijuota",
+"Ask a question" => "Užduoti klausimą",
+"Problems connecting to help database." => "Problemos jungiantis prie duomenų bazės",
+"Answer" => "Atsakyti",
+"You use" => "JÅ«s naudojate",
+"of the available" => "iš galimų",
+"Your password got changed" => "Jūsų slaptažodis buvo pakeistas",
+"Unable to change your password" => "Neįmanoma pakeisti slaptažodžio",
+"Current password" => "Dabartinis slaptažodis",
+"New password" => "Naujas slaptažodis",
+"show" => "rodyti",
+"Change password" => "Pakeisti slaptažodį",
+"Language" => "Kalba",
+"use this address to connect to your ownCloud in your file manager" => "naudokite šį adresą, jei norite pasiekti savo ownCloud per failų tvarkyklę",
+"Name" => "Vardas",
+"Password" => "Slaptažodis",
+"Groups" => "GrupÄ—s",
+"Create" => "Sukurti",
+"Delete" => "IÅ¡trinti"
+);
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index fbe910ff219..3533a804d20 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Ralat pengesahan",
-"OpenID Changed" => "OpenID ditukar",
 "Invalid request" => "Permintaan tidak sah",
+"OpenID Changed" => "OpenID ditukar",
 "Language changed" => "Bahasa ditukar",
 "Add your application" => "Tambah aplikasi anda",
 "Select an App" => "Pilih aplikasi",
@@ -20,7 +19,6 @@
 "show" => "Papar",
 "Change password" => "Tukar kata laluan",
 "Language" => "Bahasa",
-"Help translating" => "Bantu perterjemahan",
 "use this address to connect to your ownCloud in your file manager" => "guna alamat ini untuk menyambung owncloud anda dalam pengurus fail anda",
 "Name" => "Nama",
 "Password" => "Kata laluan ",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 8d2d1506327..c27124bde0d 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Autentifikasjonsfeil",
-"OpenID Changed" => "OpenID endret",
 "Invalid request" => "Ugyldig forespørsel",
+"OpenID Changed" => "OpenID endret",
 "Language changed" => "Språk endret",
 "Add your application" => "Legg til din applikasjon",
 "Select an App" => "Velg en app",
@@ -20,7 +19,6 @@
 "show" => "vis",
 "Change password" => "Endre passord",
 "Language" => "Språk",
-"Help translating" => "Hjelp oss å oversett",
 "use this address to connect to your ownCloud in your file manager" => "bruk denne adressen for å koble til din ownCloud gjennom filhåndtereren",
 "Name" => "Navn",
 "Password" => "Passord",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 36b37ca720b..2061e8f6f6d 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,23 +1,25 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Authenticatiefout.",
-"OpenID Changed" => "OpenID is aangepast",
 "Invalid request" => "Ongeldig verzoek",
+"OpenID Changed" => "OpenID is aangepast",
 "Language changed" => "Taal aangepast",
-"Select an App" => "Selecteer een App",
-"-licensed" => "-gelicenseerd",
+"Add your application" => "Voeg uw applicatie toe",
+"Select an App" => "Selecteer een app",
+"-licensed" => "-gelicentieerd",
 "by" => "door",
 "Ask a question" => "Stel een vraag",
+"Problems connecting to help database." => "Problemen bij het verbinden met de helpdatabank.",
+"Go there manually." => "Ga er zelf heen.",
 "Answer" => "Beantwoord",
 "You use" => "U gebruikt",
 "of the available" => "van de beschikbare",
 "Your password got changed" => "Uw wachtwoord is aangepast",
+"Unable to change your password" => "Niet in staat om uw wachtwoord te wijzigen",
 "Current password" => "Huidig wachtwoord",
 "New password" => "Nieuw wachtwoord",
 "show" => "weergeven",
-"Change password" => "Verander wachtwoord",
+"Change password" => "Wijzig wachtwoord",
 "Language" => "Taal",
-"Help translating" => "Help met vertalen",
-"use this address to connect to your ownCloud in your file manager" => "gebruik dit adres om verbinding te maken met ownCloud in uw bestandsbeheer programa",
+"use this address to connect to your ownCloud in your file manager" => "gebruik dit adres om verbinding te maken met ownCloud in uw bestandsbeheerprogramma",
 "Name" => "Naam",
 "Password" => "Wachtwoord",
 "Groups" => "Groepen",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
new file mode 100644
index 00000000000..8ce46caa89a
--- /dev/null
+++ b/settings/l10n/nn_NO.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Invalid request" => "Ugyldig førespurnad",
+"OpenID Changed" => "OpenID endra",
+"Language changed" => "Språk endra",
+"Add your application" => "Legg til applikasjonen din",
+"Select an App" => "Vel ein applikasjon",
+"-licensed" => "-lisensiert",
+"by" => "av",
+"Ask a question" => "Spør om noko",
+"Problems connecting to help database." => "Problem ved tilkopling til hjelpedatabasen.",
+"Go there manually." => "Gå der på eigen hand.",
+"Answer" => "Svar",
+"You use" => "Du bruker",
+"of the available" => "av dei tilgjengelege",
+"Your password got changed" => "Passordet ditt er endra",
+"Unable to change your password" => "Klarte ikkje å endra passordet",
+"Current password" => "Passord",
+"New password" => "Nytt passord",
+"show" => "vis",
+"Change password" => "Endra passord",
+"Language" => "Språk",
+"use this address to connect to your ownCloud in your file manager" => "bruk denne adressa for å kopla til ownCloud i filhandsamaren din",
+"Name" => "Namn",
+"Password" => "Passord",
+"Groups" => "Grupper",
+"Create" => "Lag",
+"Delete" => "Slett"
+);
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index cfd52cb3475..3f65a6b928e 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "BÅ‚Ä…d uwierzytelniania",
-"OpenID Changed" => "Zmieniono OpenID",
 "Invalid request" => "Nieprawidłowe żądanie",
+"OpenID Changed" => "Zmieniono OpenID",
 "Language changed" => "Język zmieniony",
 "Add your application" => "Dodaj własną aplikacje",
 "Select an App" => "Zaznacz aplikacje",
@@ -14,12 +13,12 @@
 "You use" => "Używasz",
 "of the available" => "z dostępnych",
 "Your password got changed" => "Twoje hasło zostało zmienione",
+"Unable to change your password" => "Nie można zmienić hasła",
 "Current password" => "Bieżące hasło",
 "New password" => "Nowe hasło",
 "show" => "pokaż",
 "Change password" => "Zmień hasło",
 "Language" => "Język",
-"Help translating" => "Pomóż w tłumaczeniu",
 "use this address to connect to your ownCloud in your file manager" => "użyj tego adresu żeby połączyć się z twoim kontem ownCloud w menedżerze plików.",
 "Name" => "Nazwa",
 "Password" => "Hasło",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index f0988e9a8e6..51fa7e65a2c 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Erro de autenticação",
-"OpenID Changed" => "Mudou OpenID",
 "Invalid request" => "Pedido inválido",
+"OpenID Changed" => "Mudou OpenID",
 "Language changed" => "Mudou Idioma",
 "Add your application" => "Adicionar o seu aplicativo",
 "Select an App" => "Selecione uma Aplicação",
@@ -20,7 +19,6 @@
 "show" => "mostrar",
 "Change password" => "Alterar senha",
 "Language" => "Idioma",
-"Help translating" => "Ajuda na Tradução",
 "use this address to connect to your ownCloud in your file manager" => "use este endereço para se conectar ao seu ownCloud no seu gerenciador de arquvos",
 "Name" => "Nome",
 "Password" => "Senha",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 861bd42961b..e8fe39a2fa6 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Eroare autentificare",
-"OpenID Changed" => "OpenID schimbat",
 "Invalid request" => "Cerere eronată",
+"OpenID Changed" => "OpenID schimbat",
 "Language changed" => "Limba a fost schimbată",
 "Add your application" => "Adaugă propria ta aplicație",
 "Select an App" => "Selectează o aplicație",
@@ -20,7 +19,6 @@
 "show" => "arată",
 "Change password" => "Schimbă parola",
 "Language" => "Limba",
-"Help translating" => "Ajută la traducere",
 "use this address to connect to your ownCloud in your file manager" => "folosește această adresă pentru a te conecta la managerul tău de fișiere din ownCloud",
 "Name" => "Nume",
 "Password" => "Parola",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 96ca95e583f..a8faeb780f8 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Ошибка аутентификации",
-"OpenID Changed" => "OpenID был изменён",
 "Invalid request" => "�еверный запро�",
+"OpenID Changed" => "OpenID был изменён",
 "Language changed" => "Язык изменён",
 "Add your application" => "Добавить ваше приложение",
 "Select an App" => "Выберите приложение",
@@ -20,7 +19,6 @@
 "show" => "показать",
 "Change password" => "Сменить пароль",
 "Language" => "Язык",
-"Help translating" => "Помощь � переводом",
 "use this address to connect to your ownCloud in your file manager" => "и�пользуйте данный адре� дл� подключени� к ownCloud в вашем файловом менеджере",
 "Name" => "Им�",
 "Password" => "Пароль",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
new file mode 100644
index 00000000000..08424ab24c8
--- /dev/null
+++ b/settings/l10n/sk_SK.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Invalid request" => "Neplatná požiadavka",
+"OpenID Changed" => "OpenID zmenené",
+"Language changed" => "Jazyk zmenený",
+"Add your application" => "Pridajte svoju aplikáciu",
+"Select an App" => "Vyberte Aplikáciu",
+"-licensed" => "-licencované",
+"by" => "od",
+"Ask a question" => "Opýtajte sa otázku",
+"Problems connecting to help database." => "Problémy spojené s pomocnou databázou.",
+"Go there manually." => "Prejsť tam ru�ne.",
+"Answer" => "Odpove�",
+"You use" => "Používate",
+"of the available" => "z dostupných",
+"Your password got changed" => "Vaše heslo sa zmenilo",
+"Unable to change your password" => "Nedokážem zmeniť vaše heslo",
+"Current password" => "Aktuálne heslo",
+"New password" => "Nové heslo",
+"show" => "zobraziť",
+"Change password" => "Zmeniť heslo",
+"Language" => "Jazyk",
+"use this address to connect to your ownCloud in your file manager" => "použite túto adresu pre spojenie s vaším ownCloud v správcovi súborov",
+"Name" => "Meno",
+"Password" => "Heslo",
+"Groups" => "Skupiny",
+"Create" => "Vytvoriť",
+"Delete" => "Odstrániť"
+);
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
new file mode 100644
index 00000000000..9cd2d99fe3b
--- /dev/null
+++ b/settings/l10n/sl.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Invalid request" => "Neveljavna zahteva",
+"OpenID Changed" => "OpenID spremenjen",
+"Language changed" => "Jezik je bil spremenjen",
+"Add your application" => "Dodaj vašo aplikacijo",
+"Select an App" => "Izberi aplikacijo",
+"-licensed" => "-licenca",
+"by" => "od",
+"Ask a question" => "Vprašaj",
+"Problems connecting to help database." => "Težave pri povezovanju z zbirko podatkov.",
+"Go there manually." => "Pojdi tja ro�no.",
+"Answer" => "Odgovor",
+"You use" => "Uporabljate",
+"of the available" => "od narazpolago",
+"Your password got changed" => "Vaše geslo je bilo spremenjeno.",
+"Unable to change your password" => "Vašega geslo ni bilo mogo�e spremeniti.",
+"Current password" => "Trenutno Geslo",
+"New password" => "Novo geslo",
+"show" => "prikaži",
+"Change password" => "Spremeni Geslo",
+"Language" => "Jezik",
+"use this address to connect to your ownCloud in your file manager" => "uporabi ta naslov za povezavo k \"mojoblak\" v vašem urejevalniku datotek",
+"Name" => "Ime",
+"Password" => "Geslo",
+"Groups" => "Skupine",
+"Create" => "Ustvari",
+"Delete" => "Izbriši"
+);
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 33bd039a2fc..ea61815a619 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Грешка аутентификације",
-"OpenID Changed" => "OpenID је измењен",
 "Invalid request" => "�еи�праван захтев",
+"OpenID Changed" => "OpenID је измењен",
 "Language changed" => "Језик је измењен",
 "Add your application" => "Додајте �вој програм",
 "Select an App" => "Изаберите програм",
@@ -20,7 +19,6 @@
 "show" => "прикажи",
 "Change password" => "Измени лозинку",
 "Language" => "Језик",
-"Help translating" => "Помозите у превођењу",
 "use this address to connect to your ownCloud in your file manager" => "кори�тите ову адре�у да би �е повезали на ownCloud путем менаџњера фајлова",
 "Name" => "Име",
 "Password" => "Лозинка",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 4787dd3fa71..ba3572802f3 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Greška autentifikacije",
-"OpenID Changed" => "OpenID je izmenjen",
 "Invalid request" => "Neispravan zahtev",
+"OpenID Changed" => "OpenID je izmenjen",
 "Language changed" => "Jezik je izmenjen",
 "Add your application" => "Dodajte svoj program",
 "Select an App" => "Izaberite program",
@@ -20,7 +19,6 @@
 "show" => "prikaži",
 "Change password" => "Izmeni lozinku",
 "Language" => "Jezik",
-"Help translating" => "Pomozite u prevođenju",
 "use this address to connect to your ownCloud in your file manager" => "koristite ovu adresu da bi se povezali na ownCloud putem menadžnjera fajlova",
 "Name" => "Ime",
 "Password" => "Lozinka",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 13ccd3826e3..7a39a1a9437 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Autentiseringsfel",
-"OpenID Changed" => "OpenID ändrat",
 "Invalid request" => "Ogiltig begäran",
+"OpenID Changed" => "OpenID ändrat",
 "Language changed" => "Språk ändrades",
 "Add your application" => "Lägg till din applikation",
 "Select an App" => "Välj en App",
@@ -20,8 +19,7 @@
 "show" => "visa",
 "Change password" => "Ändra lösenord",
 "Language" => "Språk",
-"Help translating" => "Hjälp till att översätta",
-"use this address to connect to your ownCloud in your file manager" => "använd denna adress för att ansluta till ditt ownCloud i din filhanterare",
+"use this address to connect to your ownCloud in your file manager" => "använd denna adress för att ansluta ownCloud till din filhanterare",
 "Name" => "Namn",
 "Password" => "Lösenord",
 "Groups" => "Grupper",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
new file mode 100644
index 00000000000..7d6b25612f2
--- /dev/null
+++ b/settings/l10n/tr.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Invalid request" => "Geçersiz istek",
+"OpenID Changed" => "OpenID DeÄŸiÅŸtirildi",
+"Language changed" => "Dil deÄŸiÅŸtirildi",
+"Add your application" => "Uygulamanızı ekleyin",
+"Select an App" => "Bir uygulama seçin",
+"-licensed" => "-lisanslı",
+"by" => "yapan",
+"Ask a question" => "Bir soru sorun",
+"Problems connecting to help database." => "Yardım veritabanına bağlanmada sorunlar var.",
+"Go there manually." => "Oraya elle gidin.",
+"Answer" => "Cevap",
+"You use" => "Kullanıyorsunuz",
+"of the available" => "mevcut olandan",
+"Your password got changed" => "Parolanız değiştirildi",
+"Unable to change your password" => "Parolanız değiştirilemiyor",
+"Current password" => "Mevcut parola",
+"New password" => "Yeni parola",
+"show" => "göster",
+"Change password" => "Parola deÄŸiÅŸtir",
+"Language" => "Dil",
+"use this address to connect to your ownCloud in your file manager" => "bu adresi kullanarak ownCloud unuza dosya yöneticinizle bağlanın",
+"Name" => "Ad",
+"Password" => "Parola",
+"Groups" => "Gruplar",
+"Create" => "OluÅŸtur",
+"Delete" => "Sil"
+);
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index dc9ffeafe7b..22ffce3b57e 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "验�错误",
-"OpenID Changed" => "OpenID 已修改",
 "Invalid request" => "�法请求",
+"OpenID Changed" => "OpenID 已修改",
 "Language changed" => "语言已修改",
 "Add your application" => "加入您的应用程�",
 "Select an App" => "选择一个应用",
@@ -20,7 +19,6 @@
 "show" => "显示",
 "Change password" => "修改密�",
 "Language" => "语言",
-"Help translating" => "帮助翻译",
 "use this address to connect to your ownCloud in your file manager" => "在文件管�器中使用这个地��连接到您的 ownCloud",
 "Name" => "�称",
 "Password" => "密�",
-- 
GitLab


From 3c910b812bd044109691627b493639f8663572ff Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Wed, 11 Jan 2012 01:26:27 +0100
Subject: [PATCH 217/546] also use translated string for music navigation entry
 when showing inline controls

---
 apps/media/templates/player.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/media/templates/player.php b/apps/media/templates/player.php
index 295f33ab9e0..146c743250e 100644
--- a/apps/media/templates/player.php
+++ b/apps/media/templates/player.php
@@ -6,7 +6,7 @@ if(!isset($_)){//allow the template to be loaded standalone
 	exit;
 }
 ?>
-Music
+<?php echo $l->t('Music');?>
 <div class='player-controls' id="playercontrols">
 	<div class="player" id="jp-player"></div>
 	<ul class="jp-controls">
-- 
GitLab


From d92b083c1d50ac8fd763493add9bf947c1ca0267 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Wed, 11 Jan 2012 01:53:25 +0100
Subject: [PATCH 218/546] fix old calendar name and color not being preserved
 when editing a calendar

---
 apps/calendar/lib/calendar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index ea60526a5bd..4199ab5a7cc 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -151,11 +151,11 @@ class OC_Calendar_Calendar{
 		$calendar = self::find($id);
 
 		// Keep old stuff
-		if(is_null($name)) $name = $calendar['name'];
+		if(is_null($name)) $name = $calendar['displayname'];
 		if(is_null($components)) $components = $calendar['components'];
 		if(is_null($timezone)) $timezone = $calendar['timezone'];
 		if(is_null($order)) $order = $calendar['calendarorder'];
-		if(is_null($color)) $color = $calendar['color'];
+		if(is_null($color)) $color = $calendar['calendarcolor'];
 
 		$stmt = OC_DB::prepare( 'UPDATE *PREFIX*calendar_calendars SET displayname=?,calendarorder=?,calendarcolor=?,timezone=?,components=?,ctag=ctag+1 WHERE id=?' );
 		$result = $stmt->execute(array($name,$order,$color,$timezone,$components,$id));
-- 
GitLab


From 5500041ccab0fb7664a06ffa40fe3532d11bacb4 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 10 Jan 2012 18:07:01 +0100
Subject: [PATCH 219/546] Added missing }

---
 apps/contacts/ajax/addcard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/ajax/addcard.php b/apps/contacts/ajax/addcard.php
index 54e4faa6ed9..9d9a99de33c 100644
--- a/apps/contacts/ajax/addcard.php
+++ b/apps/contacts/ajax/addcard.php
@@ -54,7 +54,7 @@ foreach( $add as $propname){
 	$value = $values[$propname];
 	if( isset( $parameters[$propname] ) && count( $parameters[$propname] )){
 		$prop_parameters = $parameters[$propname];
-	else{
+	} else {
 		$prop_parameters = array();
 	}
 	$vcard->addProperty($propname, $value); //, $prop_parameters);
-- 
GitLab


From 1a6ad816a32eb9d4813b66457f8bcdc9c46e2141 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 11 Jan 2012 03:56:53 +0100
Subject: [PATCH 220/546] CSS cleanup, more error checking, better error
 messages, general cleanup.

---
 apps/contacts/ajax/addproperty.php           |  10 +-
 apps/contacts/css/styles.css                 |  39 ++++++-
 apps/contacts/export.php                     |   8 +-
 apps/contacts/index.php                      |   6 +-
 apps/contacts/js/interface.js                |  59 +++++++---
 apps/contacts/lib/addressbook.php            |  10 +-
 apps/contacts/lib/app.php                    |   1 +
 apps/contacts/lib/vcard.php                  |   3 +
 apps/contacts/templates/index.php            |   7 --
 apps/contacts/templates/part.addcardform.php | 117 +++++++++++--------
 10 files changed, 171 insertions(+), 89 deletions(-)

diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 0f76add3c9b..74f1c3d0e9e 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -26,13 +26,21 @@ require_once('../../../lib/base.php');
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
 
 $id = $_POST['id'];
 $vcard = OC_Contacts_App::getContactVCard( $id );
 
 $name = $_POST['name'];
 $value = $_POST['value'];
-$parameters = isset($_POST['parameters'])?$_POST['parameters']:array();
+if(!is_array($value)){
+	$value = trim($value);
+	if(!$value && in_array($name, array('TEL', 'EMAIL'))) {
+		OC_JSON::error(array('data' => array('message' => $l->t('Cannot add empty property.'))));
+		exit();
+	}
+}
+$parameters = isset($_POST['parameters']) ? $_POST['parameters'] : array();
 
 $property = $vcard->addProperty($name, $value); //, $parameters);
 
diff --git a/apps/contacts/css/styles.css b/apps/contacts/css/styles.css
index 7b56767bab0..dfc296a221b 100644
--- a/apps/contacts/css/styles.css
+++ b/apps/contacts/css/styles.css
@@ -8,9 +8,46 @@
 #contacts_details_list { list-style:none; }
 #contacts_details_list li { overflow:visible; }
 #contacts_details_list li p.contacts_property_name { width:25%; float:left;text-align:right;padding-right:0.3em;color:#666; }
-#contacts_details_list li p.contacts_property_data, #contacts_details_list li ul.contacts_property_data { width:72%;float:left; }
+#contacts_details_list li p.contacts_property_data, #contacts_details_list li ul.contacts_property_data { width:72%;float:left; clear: right; }
 #contacts_setproperty_button { margin-left:25%; }
 
+dl.form
+{
+	width: 100%;
+	float: left;
+	clear: right;
+	margin: 1em;
+	padding: 0;
+}
+
+.form dt
+{
+	display: table-cell;
+	clear: left;
+	float: left;
+	min-width: 10em;
+	margin: 0;
+	padding-top: 0.5em;
+	padding-right: 1em;
+	font-weight: bold;
+	text-align:right;
+	vertical-align: text-bottom;
+	bottom: 0px;
+}
+
+.form dd
+{
+	display: table-cell;
+	clear: right;
+	float: left;
+	min-width: 20em;
+	margin: 0;
+	padding: 0;
+	white-space: nowrap;
+	top: 0px;
+}
+.form input { position: relative; width: 20em; }
+
 .contacts_property_data ul, ol.contacts_property_data { list-style:none; }
 .contacts_property_data li { overflow: hidden; }
 .contacts_property_data li label { width:20%; float:left; text-align:right;padding-right:0.3em; }
diff --git a/apps/contacts/export.php b/apps/contacts/export.php
index fd2d7da1750..a1e974c962b 100644
--- a/apps/contacts/export.php
+++ b/apps/contacts/export.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * Copyright (c) 2011-2012 Thomas Tanghus <thomas@tanghus.net>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
@@ -20,9 +20,9 @@ if(isset($book)){
 	$cardobjects = OC_Contacts_VCard::all($book);
 	header('Content-Type: text/directory');
 	header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $addressbook['displayname']) . '.vcf'); 
-	for($i = 0;$i <= count($cardobjects); $i++){
-		echo $cardobjects[$i]['carddata'];
-		//echo '\r\n';
+
+	foreach($cardobjects as $card) {
+		echo $card['carddata'];
 	}
 }elseif(isset($contact)){	
 	$data = OC_Contacts_App::getContactObject($contact);
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 0b705e71b5d..6f65ac1c605 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -60,10 +60,10 @@ if(!is_null($id)) {
 
 // Include Style and Script
 OC_Util::addScript('contacts','interface');
-OC_Util::addStyle('contacts','styles');
-OC_Util::addStyle('contacts','formtastic');
+OC_Util::addScript('contacts','jquery.inview');
 OC_Util::addScript('', 'jquery.multiselect');
-OC_Util::addStyle('', 'jquery.multiselect');
+OC_Util::addStyle('contacts','styles');
+//OC_Util::addStyle('contacts','formtastic');
 
 $property_types = OC_Contacts_App::getAddPropertyOptions();
 $adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index 4a27073c156..9547c581c87 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -29,18 +29,28 @@ Contacts={
 			$('#carddav_url_close').show();
 		},
 		messageBox:function(title, msg) {
-			var $dialog = $('<div></div>')
-				.html(msg)
-				.dialog({
-					autoOpen: true,
-					title: title,buttons: [
+			if($('#messagebox').dialog('isOpen') == true){
+				// NOTE: Do we ever get here?
+				$('#messagebox').dialog('moveToTop');
+			}else{
+				$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'messagebox.php'), function(){
+					$('#messagebox').dialog(
 						{
-							text: "Ok",
-							click: function() { $(this).dialog("close"); }
-						}
-					]
-				}
-			);			
+							autoOpen: true,
+							title: title,
+							buttons: [{
+										text: "Ok",
+										click: function() { $(this).dialog("close"); }
+									}],
+							close: function(event, ui) {
+								$(this).dialog('destroy').remove();
+							},
+							open: function(event, ui) {
+								$('#messagebox_msg').html(msg);
+							}
+					});
+				});
+			}
 		},
 		Addressbooks:{
 			overview:function(){
@@ -159,6 +169,10 @@ $(document).ready(function(){
 	/*-------------------------------------------------------------------------
 	 * Event handlers
 	 *-----------------------------------------------------------------------*/
+	
+	/**
+	 * Load the details view for a contact.
+	 */
 	$('#leftcontent li').live('click',function(){
 		var id = $(this).data('id');
 		var oldid = $('#rightcontent').data('id');
@@ -179,6 +193,9 @@ $(document).ready(function(){
 		return false;
 	});
 
+	/**
+	 * Delete currently selected contact (and clear form?)
+	 */
 	$('#contacts_deletecard').live('click',function(){
 		var id = $('#rightcontent').data('id');
 		$.getJSON('ajax/deletecard.php',{'id':id},function(jsondata){
@@ -195,6 +212,10 @@ $(document).ready(function(){
 		return false;
 	});
 
+	/**
+	 * Add a property to the contact.
+	 * NOTE: Where does 'contacts_addproperty' exist?
+	 */
 	$('#contacts_addproperty').live('click',function(){
 		var id = $('#rightcontent').data('id');
 		$.getJSON('ajax/showaddproperty.php',{'id':id},function(jsondata){
@@ -204,12 +225,15 @@ $(document).ready(function(){
 			}
 			else{
 				Contacts.UI.messageBox('Error', jsondata.data.message);
-				//alert(jsondata.data.message);
+				alert('From handler: '+jsondata.data.message);
 			}
 		});
 		return false;
 	});
 
+	/**
+	 * Change the inputs based on which type of property is selected for addition.
+	 */
 	$('#contacts_addpropertyform [name="name"]').live('change',function(){
 		$('#contacts_addpropertyform #contacts_addresspart').remove();
 		$('#contacts_addpropertyform #contacts_phonepart').remove();
@@ -234,12 +258,14 @@ $(document).ready(function(){
 			}
 			else{
 				Contacts.UI.messageBox('Error', jsondata.data.message);
-				//alert(jsondata.data.message);
 			}
 		}, 'json');
 		return false;
 	});
 
+	/**
+	 * Show the Addressbook chooser
+	 */
 	$('#chooseaddressbook').click(function(){
 		Contacts.UI.Addressbooks.overview();
 		return false;
@@ -292,6 +318,10 @@ $(document).ready(function(){
 		}, 'json');
 		return false;
 	});
+	
+	/**
+	 * Show inputs for editing a property.
+	 */
 	$('.contacts_property [data-use="edit"]').live('click',function(){
 		var id = $('#rightcontent').data('id');
 		var checksum = $(this).parents('.contacts_property').first().data('checksum');
@@ -308,6 +338,9 @@ $(document).ready(function(){
 		return false;
 	});
 
+	/**
+	 * Save the edited property
+	 */
 	$('#contacts_setpropertyform input[type="submit"]').live('click',function(){
 		$.post('ajax/setproperty.php',$(this).parents('form').first().serialize(),function(jsondata){
 			if(jsondata.status == 'success'){
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 78792f5f948..41d488c09f9 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -203,15 +203,6 @@ class OC_Contacts_Addressbook{
 		while( $row = $result->fetchRow()){
 			$addressbooks[] = $row;
 		}
-		/*
-		foreach( $active as $aid ){
-			$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id = ? ORDER BY displayname' );
-			$result = $stmt->execute(array($aid,));
-
-			while( $row = $result->fetchRow()){
-				$addressbooks[] = $row;
-			}
-		}*/
 
 		return $addressbooks;
 	}
@@ -240,6 +231,7 @@ class OC_Contacts_Addressbook{
 				unset($openaddressbooks[array_search($id, $openaddressbooks)]);
 			}
 		}
+		// NOTE: Ugly hack...
 		$openaddressbooks = self::cleanArray($openaddressbooks, false);
 		sort($openaddressbooks, SORT_NUMERIC);
 		// FIXME: I alway end up with a ';' prepending when imploding the array..?
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 79e00920a65..907ce82c76a 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -73,6 +73,7 @@ class OC_Contacts_App{
 		for($i=0;$i<count($vcard->children);$i++){
 			if(md5($vcard->children[$i]->serialize()) == $checksum ){
 				$line = $i;
+				break;
 			}
 		}
 		if(is_null($line)){
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 6a248ff59e4..401f9622547 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -151,6 +151,7 @@ class OC_Contacts_VCard{
 			foreach($card->children as $property){
 				if($property->name == 'FN'){
 					$fn = $property->value;
+					break;
 				}
 			}
 		}
@@ -178,6 +179,7 @@ class OC_Contacts_VCard{
 			foreach($card->children as $property){
 				if($property->name == 'FN'){
 					$fn = $property->value;
+					break;
 				}
 			}
 		}
@@ -206,6 +208,7 @@ class OC_Contacts_VCard{
 			foreach($card->children as $property){
 				if($property->name == 'FN'){
 					$fn = $property->value;
+					break;
 				}
 			}
 		}
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 24484231af4..d548f17172d 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -1,10 +1,3 @@
-<?php // Include Style and Script
-//OC_Util::addScript('contacts','interface'); // this line caused entry duplication, cause contacts/index.php already inlcudes it
-OC_Util::addScript('contacts','jquery.inview');
-OC_Util::addStyle('contacts','styles');
-OC_Util::addStyle('contacts','formtastic');
-?>
-
 <script type='text/javascript'>
 	var totalurl = '<?php echo OC_Helper::linkTo('contacts', 'carddav.php', null, true); ?>/addressbooks';
 </script>
diff --git a/apps/contacts/templates/part.addcardform.php b/apps/contacts/templates/part.addcardform.php
index 627053547ad..510096a9e81 100644
--- a/apps/contacts/templates/part.addcardform.php
+++ b/apps/contacts/templates/part.addcardform.php
@@ -3,93 +3,108 @@
 		<input type="hidden" name="id" value="<?php echo $_['addressbooks'][0]['id']; ?>">
 	<?php else: ?>
 		<fieldset class="inputs">
-			<ol>
-				<li class="input stringish">
+			<dl class="form">
+				<dt>
 					<label class="label" for="id"><?php echo $l->t('Group'); ?></label>
+				</dt>
+				<dd>
 					<select name="id" size="1">
 						<?php echo html_select_options($_['addressbooks'], null, array('value'=>'id', 'label'=>'displayname')); ?>
 					</select>
-				</li>
-			</ol>
+				</dd>
+			</dl>
 		</fieldset>
 	<?php endif; ?>
 	<fieldset class="inputs">
-		<ol>
-			<li class="input stringish">
+		<dl class="form">
+			<dt>
 				<label class="label" for="fn"><?php echo $l->t('Name'); ?></label>
+			</dd>
+			<dd>
 				<input id="fn" type="text" name="fn" value=""><br>
-			</li>
-			<li class="input stringish">
+			</dd>
+			<dt>
 				<label class="label" for="org"><?php echo $l->t('Organization'); ?></label>
+			</dt>
+			<dd>
 				<input id="org" type="text" name="value[ORG]" value="">
-			</li>
-		</ol>
+			</dd>
+		</dl>
 	</fieldset>
 	<fieldset class="inputs">
-		<ol>
-			<li class="input stringish">
+		<dl class="form">
+			<dt>
 				<label class="label" for="email"><?php echo $l->t('Email'); ?></label>
+			</dt>
+			<dd>
 				<input id="email" type="text" name="value[EMAIL]" value="">
-			</li>
-			<li class="input">
-				<fieldset class="fragments">
-					<legend class="label">
-						<label for="tel"><?php echo $l->t('Telephone'); ?></label>
-					</legend>
-					<ol class="fragments-group">
-						<li class="fragment">
-							<label for="tel"><?php echo $l->t('Number'); ?></label>
-							<input type="phone" id="tel" name="value[TEL]" value="">
-						</li>
-						<li class="fragment">
-							<label for="tel_type"><?php echo $l->t('Type'); ?></label>
-							<select id="TEL" name="parameters[TEL][TYPE][]" multiple="multiple">
-								<?php echo html_select_options($_['phone_types'], 'CELL') ?>
-							</select>
-						</li>
-					</ol>
-				</fieldset>
-			</li>
-		</ol>
+			</dd>
+			<dt>
+				<label for="tel"><?php echo $l->t('Telephone'); ?></label>
+			</dt>
+			<dd>
+				<input type="phone" id="tel" name="value[TEL]" value="">
+				<select id="TEL" name="parameters[TEL][TYPE][]" multiple="multiple">
+					<?php echo html_select_options($_['phone_types'], 'CELL') ?>
+				</select>
+			</dd>
+		</dl>
 	</fieldset>
 	<fieldset class="inputs">
 		<legend><?php echo $l->t('Address'); ?></legend>
-		<ol>
-			<li class="input">
+		<dl class="form">
+			<dt>
 				<label class="label" for="adr_type"><?php echo $l->t('Type'); ?></label>
+			</dt>
+			<dd>
 				<select id="adr_type" name="parameters[ADR][TYPE]" size="1">
 					<?php echo html_select_options($_['adr_types'], 'HOME') ?>
 				</select>
-			</li>
-			<li class="input stringish">
+			</dd>
+			<dt>
 				<label class="label" for="adr_pobox"><?php echo $l->t('PO Box'); ?></label>
+			</dt>
+			<dd>
 				<input type="text" id="adr_pobox" name="value[ADR][0]" value="">
-			</li>
-			<li class="input stringish">
+			</dd>
+			<dd>
+			<dt>
 				<label class="label" for="adr_extended"><?php echo $l->t('Extended'); ?></label>
+			</dt>
+			<dd>
 				<input type="text" id="adr_extended" name="value[ADR][1]" value="">
-			</li>
-			<li class="input stringish">
+			</dd>
+			<dt>
 				<label class="label" for="adr_street"><?php echo $l->t('Street'); ?></label>
+			</dt>
+			<dd>
 				<input type="text" id="adr_street" name="value[ADR][2]" value="">
-			</li>
-			<li class="input stringish">
+			</dd>
+			<dt>
 				<label class="label" for="adr_city"><?php echo $l->t('City'); ?></label>
+			</dt>
+			<dd>
 				<input type="text" id="adr_city" name="value[ADR][3]" value="">
-			</li>
-			<li class="input stringish">
+			</dd>
+			<dt>
 				<label class="label" for="adr_region"><?php echo $l->t('Region'); ?></label>
+			</dt>
+			<dd>
 				<input type="text" id="adr_region" name="value[ADR][4]" value="">
-			</li>
-			<li class="input stringish">
+			</dd>
+			<dt>
 				<label class="label" for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
+			</dtl>
+			<dd>
 				<input type="text" id="adr_zipcode" name="value[ADR][5]" value="">
-			</li>
-			<li class="input stringish">
+			</dd>
+			<dt>
 				<label class="label" for="adr_country"><?php echo $l->t('Country'); ?></label>
+			</dt>
+			<dd>
 				<input type="text" id="adr_country" name="value[ADR][6]" value="">
-			</li>
-		</ol>
+			</dd>
+		</dl>
 	</fieldset>
 	<fieldset class="buttons">
 		<ol>
-- 
GitLab


From d93a5a0774a53456b7b0f5a64b22c798d4682801 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 11 Jan 2012 04:02:55 +0100
Subject: [PATCH 221/546] Added files for error messages, removed old syle
 sheet.

---
 apps/contacts/ajax/messagebox.php           |  16 ++
 apps/contacts/css/formtastic.css            | 270 --------------------
 apps/contacts/templates/part.messagebox.php |   7 +
 3 files changed, 23 insertions(+), 270 deletions(-)
 create mode 100644 apps/contacts/ajax/messagebox.php
 delete mode 100644 apps/contacts/css/formtastic.css
 create mode 100644 apps/contacts/templates/part.messagebox.php

diff --git a/apps/contacts/ajax/messagebox.php b/apps/contacts/ajax/messagebox.php
new file mode 100644
index 00000000000..b3cad947674
--- /dev/null
+++ b/apps/contacts/ajax/messagebox.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once('../../../lib/base.php');
+$l10n = new OC_L10N('contacts');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+
+$output = new OC_TEMPLATE("contacts", "part.messagebox");
+$output -> printpage();
+?>
diff --git a/apps/contacts/css/formtastic.css b/apps/contacts/css/formtastic.css
deleted file mode 100644
index fede92b61ca..00000000000
--- a/apps/contacts/css/formtastic.css
+++ /dev/null
@@ -1,270 +0,0 @@
-/* -------------------------------------------------------------------------------------------------
-
-ownCloud changes: search for OWNCLOUD
-
-Based on formtastic style sheet
-This stylesheet forms part of the Formtastic Rails Plugin
-(c) 2008-2011 Justin French
-
---------------------------------------------------------------------------------------------------*/
-/* NORMALIZE AND RESET - obviously inspired by Yahoo's reset.css, but scoped to just .formtastic
---------------------------------------------------------------------------------------------------*/
-.formtastic,
-.formtastic ul,
-.formtastic ol,
-.formtastic li,
-.formtastic fieldset,
-.formtastic legend,
-/*.formtastic input,
-.formtastic textarea,
-.formtastic select, COMMENTED BY OWNCLOUD */
-.formtastic p {
-  margin:0;
-  padding:0;
-}
-
-.formtastic fieldset {
-  border:0;
-}
-
-.formtastic em,
-.formtastic strong {
-  font-style:normal;
-  font-weight:normal;
-}
-
-.formtastic ol,
-.formtastic ul {
-  list-style:none;
-}
-
-.formtastic abbr,
-.formtastic acronym {
-  border:0;
-  font-variant:normal;
-}
-
-/*.formtastic input,
-.formtastic textarea {
-  font-family:sans-serif;
-  font-size:inherit;
-  font-weight:inherit;
-}
-
-.formtastic input,
-.formtastic textarea,
-.formtastic select {
-  font-size:100%;
-} COMMENTED BY OWNCLOUD */
-
-.formtastic legend {
-  white-space:normal;
-  color:#000;
-}
-
-/* SEMANTIC ERRORS
---------------------------------------------------------------------------------------------------*/
-.formtastic .errors {
-  color:#cc0000;
-  margin:0.5em 0 1.5em 25%;
-  list-style:square;
-}
-
-.formtastic .errors li {
-  padding:0;
-  border:none;
-  display:list-item;
-}
-
-
-/* BUTTONS
---------------------------------------------------------------------------------------------------*/
-.formtastic .buttons {
-  overflow:hidden; /* clear containing floats */
-  padding-left:25%;
-}
-
-.formtastic .button {
-  float:left;
-  padding-right:0.5em;
-  border:none;  /* ADDED BY OWNCLOUD */
-}
-
-
-/* INPUTS
---------------------------------------------------------------------------------------------------*/
-.formtastic .inputs {
-  padding:0.5em 0; /* padding and negative margin juggling is for Firefox */
-  margin-top:-0.5em;
-  margin-bottom:1em;
-}
-
-.formtastic .input {
-}
-
-
-/* LEFT ALIGNED LABELS
---------------------------------------------------------------------------------------------------*/
-.formtastic .input .label {
-  display:block;
-  width:25%;
-  float:left;
-  padding-top:.2em;
-}
-
-.formtastic .fragments .label,
-.formtastic .choices .label {
-  position:absolute;
-  width:95%;
-  left:0px;
-}
-
-.formtastic .fragments .label label,
-.formtastic .choices .label label {
-  position:absolute;
-}
-
-/* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
---------------------------------------------------------------------------------------------------*/
-.formtastic .choices {
-  position:relative;
-}
-
-.formtastic .choices-group {
-  float:left;
-  width:74%;
-  margin:0;
-  padding:0 0 0 25%;
-}
-
-.formtastic .choice {
-  padding:0;
-  border:0;
-}
-
-
-/* INLINE HINTS
---------------------------------------------------------------------------------------------------*/
-.formtastic .input .inline-hints {
-  color:#666;
-  margin:0.5em 0 0 25%;
-}
-
-
-/* INLINE ERRORS
---------------------------------------------------------------------------------------------------*/
-.formtastic .inline-errors {
-  color:#cc0000;
-  margin:0.5em 0 0 25%;
-}
-
-.formtastic .errors {
-  color:#cc0000;
-  margin:0.5em 0 0 25%;
-  list-style:square;
-}
-
-.formtastic .errors li {
-  padding:0;
-  border:none;
-  display:list-item;
-}
-
-
-/* STRING, NUMERIC, PASSWORD, EMAIL, URL, PHONE, SEARCH (ETC) OVERRIDES
---------------------------------------------------------------------------------------------------*/
-.formtastic .stringish input {
-  width:72%;
-}
-
-.formtastic .stringish input[size] {
-  width:auto;
-  max-width:72%;
-}
-
-
-/* TEXTAREA OVERRIDES
---------------------------------------------------------------------------------------------------*/
-.formtastic .text textarea {
-  width:72%;
-}
-
-.formtastic .text textarea[cols] {
-  width:auto;
-  max-width:72%;
-}
-
-
-/* HIDDEN OVERRIDES
---------------------------------------------------------------------------------------------------*/
-.formtastic .hidden {
-  display:none;
-}
-
-
-/* BOOLEAN LABELS
---------------------------------------------------------------------------------------------------*/
-.formtastic .boolean label {
-  padding-left:25%;
-  display:block;
-}
-
-
-/* CHOICE GROUPS
---------------------------------------------------------------------------------------------------*/
-.formtastic .choices-group {
-  margin-bottom:-0.5em;
-}
-
-.formtastic .choice {
-  margin:0.1em 0 0.5em 0;
-}
-
-.formtastic .choice label {
-  float:none;
-  width:100%;
-  line-height:100%;
-  padding-top:0;
-  margin-bottom:0.6em;
-}
-
-
-/* ADJUSTMENTS FOR INPUTS INSIDE LABELS (boolean input, radio input, check_boxes input)
---------------------------------------------------------------------------------------------------*/
-.formtastic .choice label input,
-.formtastic .boolean label input {
-  margin:0 0.3em 0 0.1em;
-  line-height:100%;
-}
-
-
-/* FRAGMENTED INPUTS (DATE/TIME/DATETIME)
---------------------------------------------------------------------------------------------------*/
-.formtastic .fragments {
-  position:relative;
-}
-
-.formtastic .fragments-group {
-  float:left;
-  width:74%;
-  margin:0;
-  padding:0 0 0 25%;
-}
-
-.formtastic .fragment {
-  float:left;
-  width:auto;
-  margin:0 .3em 0 0;
-  padding:0;
-  border:0;
-}
-
-.formtastic .fragment label {
-  display:none;
-}
-
-.formtastic .fragment label input {
-  display:inline;
-  margin:0;
-  padding:0;
-}
diff --git a/apps/contacts/templates/part.messagebox.php b/apps/contacts/templates/part.messagebox.php
new file mode 100644
index 00000000000..3681bb6e3f3
--- /dev/null
+++ b/apps/contacts/templates/part.messagebox.php
@@ -0,0 +1,7 @@
+<div id="messagebox">
+<table width="100%" style="border: 0;">
+<tr>
+	<th id="messagebox_msg"></th>
+</tr>
+</table>
+</di>
-- 
GitLab


From eae3e134ff9005e50ea4e611b2c2daba94ad49ea Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 11 Jan 2012 06:20:06 +0100
Subject: [PATCH 222/546] Make sure VERSION is set. Set REV for each edit.
 Download single VCard.

---
 apps/contacts/css/styles.css             |  3 ++-
 apps/contacts/export.php                 |  2 +-
 apps/contacts/js/interface.js            |  4 +++-
 apps/contacts/lib/vcard.php              | 21 +++++++++++++++++----
 apps/contacts/templates/part.details.php |  1 +
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/apps/contacts/css/styles.css b/apps/contacts/css/styles.css
index dfc296a221b..4fcd8fc1131 100644
--- a/apps/contacts/css/styles.css
+++ b/apps/contacts/css/styles.css
@@ -4,7 +4,8 @@
 #contacts_details_name { font-weight:bold;font-size:1.1em;margin-left:25%;}
 #contacts_details_photo { margin:.5em 0em .5em 25%; }
 
-#contacts_deletecard {position:absolute;top:15px;right:15px;}
+#contacts_deletecard {position:absolute;top:15px;right:25px;}
+#contacts_downloadcard {position:absolute;top:15px;right:50px;}
 #contacts_details_list { list-style:none; }
 #contacts_details_list li { overflow:visible; }
 #contacts_details_list li p.contacts_property_name { width:25%; float:left;text-align:right;padding-right:0.3em;color:#666; }
diff --git a/apps/contacts/export.php b/apps/contacts/export.php
index a1e974c962b..735d1c5b631 100644
--- a/apps/contacts/export.php
+++ b/apps/contacts/export.php
@@ -33,7 +33,7 @@ if(isset($book)){
 		exit;
 	}
 	header('Content-Type: text/directory');
-	header('Content-Disposition: inline; filename=' . $data['fullname'] . '.vcf'); 
+	header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $data['fullname']) . '.vcf'); 
 	echo $data['carddata'];
 }
 ?>
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index 9547c581c87..741483633da 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -197,6 +197,7 @@ $(document).ready(function(){
 	 * Delete currently selected contact (and clear form?)
 	 */
 	$('#contacts_deletecard').live('click',function(){
+		$('#contacts_deletecard').tipsy('hide');
 		var id = $('#rightcontent').data('id');
 		$.getJSON('ajax/deletecard.php',{'id':id},function(jsondata){
 			if(jsondata.status == 'success'){
@@ -401,7 +402,8 @@ $(document).ready(function(){
 		}
 	});
 	
-	$('.action').tipsy();
+	$('#contacts_deletecard').tipsy();
+	$('#contacts_downloadcard').tipsy();
 	$('.button').tipsy();
 	//Contacts.UI.messageBox('Hello','Sailor');
 });
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 401f9622547..726927013c6 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -111,16 +111,21 @@ class OC_Contacts_VCard{
 			if(is_null($uid)){
 				$card->setUID();
 				$uid = $card->getAsString('UID');
-				$data = $card->serialize();
+				//$data = $card->serialize();
 			};
 			$uri = $uid.'.vcf';
 			// VCARD must have a version
 			$version = $card->getAsString('VERSION');
 			// Add version if needed
-			if(is_null($version)){
+			if(!$version){
 				$card->add(new Sabre_VObject_Property('VERSION','3.0'));
-				$data = $card->serialize();
-			}
+				//$data = $card->serialize();
+			}/* else {
+				OC_Log::write('contacts','OC_Contacts_VCard::add. Version already set as: '.$version,OC_Log::DEBUG);
+			}*/
+			$now = new DateTime;
+			$card->setString('REV', $now->format(DateTime::W3C));
+			$data = $card->serialize();
 		}
 		else{
 			// that's hard. Creating a UID and not saving it
@@ -182,7 +187,12 @@ class OC_Contacts_VCard{
 					break;
 				}
 			}
+		} else {
+			return false;
 		}
+		$now = new DateTime;
+		$card->setString('REV', $now->format(DateTime::W3C));
+		$data = $card->serialize();
 
 		$stmt = OC_DB::prepare( 'UPDATE *PREFIX*contacts_cards SET fullname = ?,carddata = ?, lastmodified = ? WHERE id = ?' );
 		$result = $stmt->execute(array($fn,$data,time(),$id));
@@ -212,6 +222,9 @@ class OC_Contacts_VCard{
 				}
 			}
 		}
+		$now = new DateTime;
+		$card->setString('REV', $now->format(DateTime::W3C));
+		$data = $card->serialize();
 
 		$stmt = OC_DB::prepare( 'UPDATE *PREFIX*contacts_cards SET fullname = ?,carddata = ?, lastmodified = ? WHERE id = ?' );
 		$result = $stmt->execute(array($fn,$data,time(),$oldcard['id']));
diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php
index 1482c063685..fe0dac235b8 100644
--- a/apps/contacts/templates/part.details.php
+++ b/apps/contacts/templates/part.details.php
@@ -1,5 +1,6 @@
 <?php if(array_key_exists('FN',$_['details'])): ?>
 	<?php echo $this->inc('part.property.FN', array('property' => $_['details']['FN'][0])); ?>
+	<a href="export?contactid=<?php echo $_['id']; ?>"><img class="svg action" id="contacts_downloadcard" src="<?php echo image_path('', 'actions/download.svg'); ?>" title="<?php echo $l->t('Download contact');?>" /></a>
 	<img class="svg action" id="contacts_deletecard" src="<?php echo image_path('', 'actions/delete.svg'); ?>" title="<?php echo $l->t('Delete contact');?>" />
 
 	<?php if(isset($_['details']['PHOTO'])): // Emails first ?>
-- 
GitLab


From 237ba65a20edfbd346405e03583a96808602a2ca Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 11 Jan 2012 20:07:15 +0100
Subject: [PATCH 223/546] Localizin strings and adding error checking.

---
 apps/contacts/ajax/activation.php             |  9 +++++++-
 apps/contacts/ajax/addcard.php                |  7 ++++++
 apps/contacts/ajax/addproperty.php            |  6 ++++-
 apps/contacts/ajax/createaddressbook.php      | 14 ++++++++++--
 apps/contacts/ajax/deleteproperty.php         |  8 ++++++-
 apps/contacts/ajax/setproperty.php            |  7 +++++-
 apps/contacts/ajax/updateaddressbook.php      | 17 +++++++++++---
 apps/contacts/js/interface.js                 | 22 +++++++++----------
 apps/contacts/l10n/xgettextfiles              | 21 ++++++++++++++++++
 apps/contacts/lib/addressbook.php             |  1 +
 apps/contacts/lib/vcard.php                   |  2 ++
 apps/contacts/templates/index.php             |  2 +-
 apps/contacts/templates/part.addcardform.php  | 10 ++-------
 .../part.chooseaddressbook.rowfields.php      |  2 +-
 .../templates/part.editaddressbook.php        |  2 +-
 apps/contacts/templates/settings.php          |  4 ++--
 16 files changed, 101 insertions(+), 33 deletions(-)
 create mode 100644 apps/contacts/l10n/xgettextfiles

diff --git a/apps/contacts/ajax/activation.php b/apps/contacts/ajax/activation.php
index f4a2c94a148..fda63a528a4 100644
--- a/apps/contacts/ajax/activation.php
+++ b/apps/contacts/ajax/activation.php
@@ -10,10 +10,17 @@
 require_once ("../../../lib/base.php");
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
+
 $bookid = $_POST['bookid'];
-OC_Contacts_Addressbook::setActive($bookid, $_POST['active']);
+if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) {
+	OC_JSON::error(array('data' => array('message' => $l->t('Error (de)activating addressbook.'))));
+	OC_Log::write('contacts','ajax/activation.php: Error activating addressbook: '.$bookid, OC_Log::ERROR);
+	exit();
+}
 $book = OC_Contacts_App::getAddressbook($bookid);
 
+
 /* is there an OC_JSON::error() ? */
 OC_JSON::success(array(
 	'active' => OC_Contacts_Addressbook::isActive($bookid),
diff --git a/apps/contacts/ajax/addcard.php b/apps/contacts/ajax/addcard.php
index 9d9a99de33c..7e47659d23b 100644
--- a/apps/contacts/ajax/addcard.php
+++ b/apps/contacts/ajax/addcard.php
@@ -26,6 +26,7 @@ require_once('../../../lib/base.php');
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
 
 $aid = $_POST['id'];
 $addressbook = OC_Contacts_App::getAddressbook( $aid );
@@ -74,5 +75,11 @@ foreach( $add as $propname){
 	}
 }
 $id = OC_Contacts_VCard::add($aid,$vcard->serialize());
+if(!$id) {
+	OC_JSON::error(array('data' => array('message' => $l->t('There was an error adding the contact.'))));
+	OC_Log::write('contacts','ajax/addcard.php: Recieved non-positive ID on adding card: '.$name, OC_Log::ERROR);
+	exit();
+}
 
+// NOTE: Why is this in OC_Contacts_App?
 OC_Contacts_App::renderDetails($id, $vcard);
diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 74f1c3d0e9e..6e3ba3566c0 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -61,7 +61,11 @@ foreach ($parameters as $key=>$element) {
 	}
 }
 
-OC_Contacts_VCard::edit($id,$vcard->serialize());
+if(!OC_Contacts_VCard::edit($id,$vcard->serialize())) {
+	OC_JSON::error(array('data' => array('message' => $l->t('Error adding contact property.'))));
+	OC_Log::write('contacts','ajax/addproperty.php: Error updating contact property: '.$name, OC_Log::ERROR);
+	exit();
+}
 
 $adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
 $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php
index f94ad34e8dc..edcf794f497 100644
--- a/apps/contacts/ajax/createaddressbook.php
+++ b/apps/contacts/ajax/createaddressbook.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
+ * Copyright (c) 2011-2012 Thomas Tanghus <thomas@tanghus.net>
  * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
@@ -16,7 +16,17 @@ OC_JSON::checkAppEnabled('contacts');
 
 $userid = OC_User::getUser();
 $bookid = OC_Contacts_Addressbook::add($userid, $_POST['name'], null);
-OC_Contacts_Addressbook::setActive($bookid, 1);
+if(!$bookid) {
+	OC_JSON::error(array('data' => array('message' => $l->t('Error adding addressbook.'))));
+	OC_Log::write('contacts','ajax/createaddressbook.php: Error adding addressbook: '.$_POST['name'], OC_Log::ERROR);
+	exit();
+}
+
+if(!OC_Contacts_Addressbook::setActive($bookid, 1)) {
+	OC_JSON::error(array('data' => array('message' => $l->t('Error activating addressbook.'))));
+	OC_Log::write('contacts','ajax/createaddressbook.php: Error activating addressbook: '.$bookid, OC_Log::ERROR);
+	//exit();
+}
 $addressbook = OC_Contacts_App::getAddressbook($bookid);
 $tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields');
 $tmpl->assign('addressbook', $addressbook);
diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php
index f69735e61c6..89cf292f4f8 100644
--- a/apps/contacts/ajax/deleteproperty.php
+++ b/apps/contacts/ajax/deleteproperty.php
@@ -26,6 +26,7 @@ require_once('../../../lib/base.php');
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
+$l10n = new OC_L10N('contacts');
 
 $id = $_GET['id'];
 $checksum = $_GET['checksum'];
@@ -35,5 +36,10 @@ $line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
 
 unset($vcard->children[$line]);
 
-OC_Contacts_VCard::edit($id,$vcard->serialize());
+if(!OC_Contacts_VCard::edit($id,$vcard->serialize())) {
+	OC_JSON::error(array('data' => array('message' => $l->t('Error deleting contact property.'))));
+	OC_Log::write('contacts','ajax/deleteproperty.php: Error deleting contact property', OC_Log::ERROR);
+	exit();
+}
+
 OC_JSON::success(array('data' => array( 'id' => $id )));
diff --git a/apps/contacts/ajax/setproperty.php b/apps/contacts/ajax/setproperty.php
index bcc4c161cc0..e0cd70236c8 100644
--- a/apps/contacts/ajax/setproperty.php
+++ b/apps/contacts/ajax/setproperty.php
@@ -72,9 +72,14 @@ foreach($missingparameters as $i){
 }
 
 // Do checksum and be happy
+// NOTE: This checksum is not used..?
 $checksum = md5($vcard->children[$line]->serialize());
 
-OC_Contacts_VCard::edit($id,$vcard->serialize());
+if(!OC_Contacts_VCard::edit($id,$vcard->serialize())) {
+	OC_JSON::error(array('data' => array('message' => $l->t('Error updating contact property.'))));
+	OC_Log::write('contacts','ajax/setproperty.php: Error updating contact property: '.$value, OC_Log::ERROR);
+	exit();
+}
 
 $adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
 $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
diff --git a/apps/contacts/ajax/updateaddressbook.php b/apps/contacts/ajax/updateaddressbook.php
index 516736cc502..7d9e2aea917 100644
--- a/apps/contacts/ajax/updateaddressbook.php
+++ b/apps/contacts/ajax/updateaddressbook.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
+ * Copyright (c) 2011-2012 Thomas Tanghus <thomas@tanghus.net>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
@@ -15,8 +15,19 @@ OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 
 $bookid = $_POST['id'];
-OC_Contacts_Addressbook::edit($bookid, $_POST['name'], null);
-OC_Contacts_Addressbook::setActive($bookid, $_POST['active']);
+
+if(!OC_Contacts_Addressbook::edit($bookid, $_POST['name'], null)) {
+	OC_JSON::error(array('data' => array('message' => $l->t('Error updating addressbook.'))));
+	OC_Log::write('contacts','ajax/updateaddressbook.php: Error adding addressbook: ', OC_Log::ERROR);
+	//exit();
+}
+
+if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) {
+	OC_JSON::error(array('data' => array('message' => $l->t('Error (de)activating addressbook.'))));
+	OC_Log::write('contacts','ajax/updateaddressbook.php: Error (de)activating addressbook: '.$bookid, OC_Log::ERROR);
+	//exit();
+}
+
 $addressbook = OC_Contacts_App::getAddressbook($bookid);
 $tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields');
 $tmpl->assign('addressbook', $addressbook);
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index 741483633da..8a1de3051a6 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -106,7 +106,7 @@ Contacts={
 							Contacts.UI.Contacts.update();
 							Contacts.UI.Addressbooks.overview();
 						} else {
-							Contacts.UI.messageBox('Error', data.message);
+							Contacts.UI.messageBox(t('contacts', 'Error'), data.message);
 							//alert('Error: ' + data.message);
 						}
 					  });
@@ -145,7 +145,7 @@ Contacts={
 						$('#contacts').html(jsondata.data.page);
 					}
 					else{
-						Contacts.UI.messageBox('Error',jsondata.data.message);
+						Contacts.UI.messageBox(t('contacts', 'Error'),jsondata.data.message);
 						//alert(jsondata.data.message);
 					}
 				});
@@ -186,7 +186,7 @@ $(document).ready(function(){
 				$('#leftcontent li[data-id="'+jsondata.data.id+'"]').addClass('active');
 			}
 			else{
-				Contacts.UI.messageBox('Error', jsondata.data.message);
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
 				//alert(jsondata.data.message);
 			}
 		});
@@ -206,7 +206,7 @@ $(document).ready(function(){
 				$('#rightcontent').empty();
 			}
 			else{
-				Contacts.UI.messageBox('Error', jsondata.data.message);
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
 				//alert(jsondata.data.message);
 			}
 		});
@@ -225,7 +225,7 @@ $(document).ready(function(){
 				$('#contacts_addproperty').hide();
 			}
 			else{
-				Contacts.UI.messageBox('Error', jsondata.data.message);
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
 				alert('From handler: '+jsondata.data.message);
 			}
 		});
@@ -258,7 +258,7 @@ $(document).ready(function(){
 				$('#contacts_addpropertyform').before(jsondata.data.page);
 			}
 			else{
-				Contacts.UI.messageBox('Error', jsondata.data.message);
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
 			}
 		}, 'json');
 		return false;
@@ -283,7 +283,7 @@ $(document).ready(function(){
 					.find('select').chosen();
 			}
 			else{
-				Contacts.UI.messageBox('Error', jsondata.data.message);
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
 				//alert(jsondata.data.message);
 			}
 		});
@@ -313,7 +313,7 @@ $(document).ready(function(){
 				}
 			}
 			else{
-				Contacts.UI.messageBox('Error', jsondata.data.message);
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
 				//alert(jsondata.data.message);
 			}
 		}, 'json');
@@ -332,7 +332,7 @@ $(document).ready(function(){
 					.find('select').chosen();
 			}
 			else{
-				Contacts.UI.messageBox('Error', jsondata.data.message);
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
 				//alert(jsondata.data.message);
 			}
 		});
@@ -348,7 +348,7 @@ $(document).ready(function(){
 				$('.contacts_property[data-checksum="'+jsondata.data.oldchecksum+'"]').replaceWith(jsondata.data.page);
 			}
 			else{
-				Contacts.UI.messageBox('Error', jsondata.data.message);
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
 				//alert(jsondata.data.message);
 			}
 		},'json');
@@ -363,7 +363,7 @@ $(document).ready(function(){
 				$('.contacts_property[data-checksum="'+checksum+'"]').remove();
 			}
 			else{
-				Contacts.UI.messageBox('Error', jsondata.data.message);
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
 				//alert(jsondata.data.message);
 			}
 		});
diff --git a/apps/contacts/l10n/xgettextfiles b/apps/contacts/l10n/xgettextfiles
new file mode 100644
index 00000000000..91d5da46db0
--- /dev/null
+++ b/apps/contacts/l10n/xgettextfiles
@@ -0,0 +1,21 @@
+../appinfo/app.php
+../ajax/activation.php
+../ajax/addbook.php
+../ajax/addcard.php
+../ajax/addproperty.php
+../ajax/createaddressbook.php
+../ajax/deletebook.php
+../ajax/deleteproperty.php
+../ajax/getdetails.php
+../ajax/setproperty.php
+../ajax/updateaddressbook.php
+../lib/app.php
+../templates/index.php
+../templates/part.addcardform.php
+../templates/part.chooseaddressbook.php
+../templates/part.chooseaddressbook.rowfields.php
+../templates/part.details.php
+../templates/part.editaddressbook.php
+../templates/part.property.php
+../templates/part.setpropertyform.php
+../templates/settings.php
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 41d488c09f9..052c19e55fe 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -256,6 +256,7 @@ class OC_Contacts_Addressbook{
 	 * @return boolean
 	 */
 	public static function delete($id){
+		// FIXME: There's no error checking at all.
 		self::setActive($id, false);
 		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_addressbooks WHERE id = ?' );
 		$stmt->execute(array($id));
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 726927013c6..c61f0dfc114 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -240,6 +240,7 @@ class OC_Contacts_VCard{
 	 * @return boolean
 	 */
 	public static function delete($id){
+		// FIXME: Add error checking.
 		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE id = ?' );
 		$stmt->execute(array($id));
 
@@ -261,6 +262,7 @@ class OC_Contacts_VCard{
 	 * @return boolean
 	 */
 	public static function deleteFromDAVData($aid,$uri){
+		// FIXME: Add error checking. Deleting a card gives an Kontact/Akonadi error.
 		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri=?' );
 		$stmt->execute(array($aid,$uri));
 
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index d548f17172d..5d9c312712f 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -4,7 +4,7 @@
 <div id="controls">
 	<form>
 		<input type="button" id="contacts_newcontact" value="<?php echo $l->t('Add Contact'); ?>">
-		<input type="button" id="chooseaddressbook" value="<?php echo $l->t('Address Books'); ?>">
+		<input type="button" id="chooseaddressbook" value="<?php echo $l->t('Addressbooks'); ?>">
 	</form>
 </div>
 <div id="leftcontent" class="leftcontent">
diff --git a/apps/contacts/templates/part.addcardform.php b/apps/contacts/templates/part.addcardform.php
index 510096a9e81..53b32188ddf 100644
--- a/apps/contacts/templates/part.addcardform.php
+++ b/apps/contacts/templates/part.addcardform.php
@@ -5,7 +5,7 @@
 		<fieldset class="inputs">
 			<dl class="form">
 				<dt>
-					<label class="label" for="id"><?php echo $l->t('Group'); ?></label>
+					<label class="label" for="id"><?php echo $l->t('Addressbook'); ?></label>
 				</dt>
 				<dd>
 					<select name="id" size="1">
@@ -106,11 +106,5 @@
 			</dd>
 		</dl>
 	</fieldset>
-	<fieldset class="buttons">
-		<ol>
-			<li class="commit button">
-				<input class="create" type="submit" name="submit" value="<?php echo $l->t('Create Contact'); ?>">
-			</li>
-		</ol>
-	</fieldset>
+	<input class="create" type="submit" name="submit" value="<?php echo $l->t('Create Contact'); ?>">
 </form>
diff --git a/apps/contacts/templates/part.chooseaddressbook.rowfields.php b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
index f612e39ecaf..0cbfe2bf803 100644
--- a/apps/contacts/templates/part.chooseaddressbook.rowfields.php
+++ b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
@@ -1,5 +1,5 @@
 <?php
-
+	// FIXME: Make this readable.
 	echo "<td width=\"20px\"><input id=\"active_" . $_['addressbook']["id"] . "\" type=\"checkbox\" onClick=\"Contacts.UI.Addressbooks.activation(this, " . $_['addressbook']["id"] . ")\"" . (OC_Contacts_Addressbook::isActive($_['addressbook']["id"]) ? ' checked="checked"' : '') . "></td>";
 	echo "<td><label for=\"active_" . $_['addressbook']["id"] . "\">" . $_['addressbook']["displayname"] . "</label></td>";
 	echo "<td width=\"20px\"><a href=\"#\" onclick=\"Contacts.UI.showCardDAVUrl('" . OC_User::getUser() . "', '" . $_['addressbook']["uri"] . "');\" title=\"" . $l->t("CardDav Link") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/public.svg\"></a></td><td width=\"20px\"><a href=\"export.php?bookid=" . $_['addressbook']["id"] . "\" title=\"" . $l->t("Download") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/download.svg\"></a></td><td width=\"20px\"><a  href=\"#\" title=\"" . $l->t("Edit") . "\" class=\"action\" onclick=\"Contacts.UI.Addressbooks.editAddressbook(this, " . $_['addressbook']["id"] . ");\"><img class=\"svg action\" src=\"../../core/img/actions/rename.svg\"></a></td><td width=\"20px\"><a href=\"#\" onclick=\"Contacts.UI.Addressbooks.deleteAddressbook('" . $_['addressbook']["id"] . "');\" title=\"" . $l->t("Delete") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/delete.svg\"></a></td>";
diff --git a/apps/contacts/templates/part.editaddressbook.php b/apps/contacts/templates/part.editaddressbook.php
index cb1371731b1..48fe5c3b378 100644
--- a/apps/contacts/templates/part.editaddressbook.php
+++ b/apps/contacts/templates/part.editaddressbook.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 ?>
-<td id="<?php echo $_['new'] ? 'new' : 'edit' ?>addressbook_dialog" title="<?php echo $_['new'] ? $l->t("New Address Book") : $l->t("Edit Address Book"); ?>" colspan="6">
+<td id="<?php echo $_['new'] ? 'new' : 'edit' ?>addressbook_dialog" title="<?php echo $_['new'] ? $l->t("New Addressbook") : $l->t("Edit Addressbook"); ?>" colspan="6">
 <table width="100%" style="border: 0;">
 <tr>
 	<th><?php echo $l->t('Displayname') ?></th>
diff --git a/apps/contacts/templates/settings.php b/apps/contacts/templates/settings.php
index d9130625200..c647e44c25b 100644
--- a/apps/contacts/templates/settings.php
+++ b/apps/contacts/templates/settings.php
@@ -1,7 +1,7 @@
 <form id="mediaform">
 	<fieldset class="personalblock">
-		<strong>Contacts</strong><br />
-		CardDAV syncing address:
+		<strong><?php echo $l->t('Contacts'); ?></strong><br />
+		<?php echo $l->t('CardDAV syncing address:'); ?>
   		<?php echo OC_Helper::linkTo('apps/contacts', 'carddav.php', null, true); ?><br />
 	</fieldset>
 </form>
-- 
GitLab


From dddcd66ead1aa5d528180d96a95ed876eaaa6093 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 11 Jan 2012 22:06:23 +0100
Subject: [PATCH 224/546] using new image backend, moving ajax calls to one
 file, using generated thumnails to speedup covers loading

---
 apps/gallery/ajax/galleryOp.php     | 29 ++++++++-
 apps/gallery/ajax/getCovers.php     | 99 -----------------------------
 apps/gallery/ajax/scanForAlbums.php | 31 ---------
 apps/gallery/css/styles.css         |  2 +-
 apps/gallery/js/album_cover.js      |  2 +-
 apps/gallery/js/albums.js           |  2 +-
 6 files changed, 29 insertions(+), 136 deletions(-)
 delete mode 100644 apps/gallery/ajax/getCovers.php
 delete mode 100644 apps/gallery/ajax/scanForAlbums.php

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index 3d1ed1f33cb..5686c0faa78 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -23,17 +23,34 @@
 
 require_once('../../../lib/base.php');
 require_once(OC::$CLASSPATH['OC_Gallery_Album']);
-OC_JSON::checkLoggedIn();
+require_once(OC::$CLASSPATH['OC_Gallery_Scanner']);
 OC_JSON::checkAppEnabled('gallery');
 
 function handleRename($oldname, $newname) {
+  OC_JSON::checkLoggedIn();
   OC_Gallery_Album::rename($oldname, $newname, OC_User::getUser());
 }
 
 function handleRemove($name) {
+  OC_JSON::checkLoggedIn();
   OC_Gallery_Album::remove(OC_User::getUser(), $name);
 }
 
+function handleGetThumbnails($albumname)
+{
+  OC_JSON::checkLoggedIn();
+  $photo = new OC_Image();
+  $photo->loadFromFile(OC::$CONFIG_DATADIRECTORY.'/../gallery/'.$albumname.'.png');
+  $photo->show();
+}
+
+function handleGalleryScanning()
+{
+  OC_JSON::checkLoggedIn();
+  OC_Gallery_Scanner::cleanup();
+  OC_JSON::success(array('albums' => OC_Gallery_Scanner::scan('/')));
+}
+
 if ($_GET['operation']) {
   switch($_GET['operation']) {
 	case "rename":
@@ -43,8 +60,14 @@ if ($_GET['operation']) {
 	case "remove":
 	  handleRemove($_GET['name']);
 	  OC_JSON::success();
-	  break;
-    default:
+    break;
+  case "get_covers":
+    handleGetThumbnails($_GET['albumname']);
+    break;
+  case "scan":
+    handleGalleryScanning();
+    break;
+  default:
      OC_JSON::error(array('cause' => "Unknown operation"));
   }
 }
diff --git a/apps/gallery/ajax/getCovers.php b/apps/gallery/ajax/getCovers.php
deleted file mode 100644
index 4db73d0fbf3..00000000000
--- a/apps/gallery/ajax/getCovers.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-require_once('../../../lib/base.php');
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('gallery');
-
-function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height, $tgtImg, $shift) { 
-    //getting the image dimensions
-    list($width_orig, $height_orig) = getimagesize($imgSrc); 
-    switch (strtolower(substr($imgSrc, strrpos($imgSrc, '.')+1))) {
-      case "jpeg":
-      case "jpg":
-      case "tiff":
-        $myImage = imagecreatefromjpeg($imgSrc);
-        break;
-      case "png":
-        $myImage = imagecreatefrompng($imgSrc);
-        break;
-      default:
-        exit();
-    }
-    if(!$myImage) exit();
-    $ratio_orig = $width_orig/$height_orig;
-    
-    if ($thumbnail_width/$thumbnail_height > $ratio_orig) {
-       $new_height = $thumbnail_width/$ratio_orig;
-       $new_width = $thumbnail_width;
-    } else {
-       $new_width = $thumbnail_height*$ratio_orig;
-       $new_height = $thumbnail_height;
-    }
-    
-    $x_mid = $new_width/2;  //horizontal middle
-    $y_mid = $new_height/2; //vertical middle
-    
-    $process = imagecreatetruecolor(round($new_width), round($new_height)); 
-
-    imagecopyresampled($process, $myImage, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
-    imagecopyresampled($tgtImg, $process, $shift, 0, ($x_mid-($thumbnail_width/2)), ($y_mid-($thumbnail_height/2)), $thumbnail_width, $thumbnail_height, $thumbnail_width, $thumbnail_height);
-
-    imagedestroy($process);
-    imagedestroy($myImage);
-}
-
-$box_size = 200;
-$album_name= $_GET['album_name'];
-
-$result = OC_Gallery_Photo::findForAlbum(OC_User::getUser(), $album_name);
-
-$numOfItems = min($result->numRows(),10);
-
-if ($numOfItems){
-	$targetImg = imagecreatetruecolor($numOfItems*$box_size, $box_size);
-}
-else{
-	$targetImg = imagecreatetruecolor($box_size, $box_size);
-}
-$counter = 0;
-while (($i = $result->fetchRow()) && $counter < $numOfItems) {
-	$imagePath = OC_Filesystem::getLocalFile($i['file_path']);
-	if(file_exists($imagePath))
-	{
-		CroppedThumbnail($imagePath, $box_size, $box_size, $targetImg, $counter*$box_size);
-		$counter++;
-	}
-}
-
-header('Content-Type: image/png');
-
-$offset = 3600 * 24;
-// calc the string in GMT not localtime and add the offset
-header("Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT");
-header('Cache-Control: max-age='.$offset.', must-revalidate');
-header('Pragma: public');
-
-imagepng($targetImg);
-imagedestroy($targetImg);
-?>
diff --git a/apps/gallery/ajax/scanForAlbums.php b/apps/gallery/ajax/scanForAlbums.php
deleted file mode 100644
index b8ed639d9dc..00000000000
--- a/apps/gallery/ajax/scanForAlbums.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-require_once('../../../lib/base.php');
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('gallery');
-
-OC_Gallery_Scanner::cleanUp();
-OC_JSON::success(array('albums' => OC_Gallery_Scanner::scan('/')));
-
-?>
diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index cc343ba0d08..b253eeef223 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -1,5 +1,5 @@
 div#gallery_list { margin: 90pt 20pt; }
-div#gallery_list.leftcontent { padding-top: 15px; margin: 0; text-align: center; }
+div#gallery_list.leftcontent { padding-top: 15pt; margin: 0; height: 80%; text-align: center; overflow: scroll; }
 div#gallery_album_box { width: 200px; text-align: center; border: 0; display: inline-block; margin: 5pt; vertical-align: top; padding: 10px; border: solid 1px black; position: relative; overflow: hidden; color: #999; }
 div#gallery_album_box:hover { color: black; }
 .leftcontent div#gallery_album_box { margin: 5px; }
diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index f6cb2da3103..84a89c5a91f 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -33,7 +33,7 @@ function createNewAlbum() {
 function scanForAlbums() {
   $("#notification").fadeIn();
   $("#notification").slideDown();
-  $.getJSON('ajax/scanForAlbums.php', function(r) {
+  $.getJSON('ajax/galleryOp.php?operation=scan', function(r) {
     $("#notification").fadeOut();
     $("#notification").slideUp();
     if (r.status == 'success') {
diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index ae7d1fac500..2fb1ac89bab 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -63,7 +63,7 @@ Albums={
       var local = $(displayTemplate.replace(/\*NAME\*/g, a.name));
       $("#gallery_album_cover", local).css('background-repeat', 'no-repeat');
       $("#gallery_album_cover", local).css('background-position', '0');
-      $("#gallery_album_cover", local).css('background-image','url("ajax/getCovers.php?album_name='+a.name+'")');
+      $("#gallery_album_cover", local).css('background-image','url("ajax/galleryOp.php?operation=get_covers&albumname='+a.name+'")');
       local.mouseover(function(e) {
 	    $("#gallery_control_overlay", this).css('visibility','visible');
       });
-- 
GitLab


From 24dc1aec8e68e6d588a56e1ebc9bd1bd62785ae0 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 11 Jan 2012 23:03:55 +0100
Subject: [PATCH 225/546] Tweaked some tipsys.

---
 apps/contacts/js/interface.js            | 2 --
 apps/contacts/templates/part.details.php | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index 8a1de3051a6..fe58a46d247 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -402,8 +402,6 @@ $(document).ready(function(){
 		}
 	});
 	
-	$('#contacts_deletecard').tipsy();
-	$('#contacts_downloadcard').tipsy();
 	$('.button').tipsy();
 	//Contacts.UI.messageBox('Hello','Sailor');
 });
diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php
index fe0dac235b8..9af7f0654dd 100644
--- a/apps/contacts/templates/part.details.php
+++ b/apps/contacts/templates/part.details.php
@@ -89,6 +89,7 @@
 <?php endif; ?>
 <script language="Javascript">
 /* Re-tipsify ;-)*/
-	$('.action').tipsy();
+	$('#contacts_deletecard').tipsy({gravity: 'ne'});
+	$('#contacts_downloadcard').tipsy({gravity: 'ne'});
 	$('.button').tipsy();
 </script>
-- 
GitLab


From afa07beda01dbdc0530ad172cbb22067da522c38 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 11 Jan 2012 23:41:24 +0100
Subject: [PATCH 226/546] resolving depricated script opening

---
 apps/gallery/ajax/galleryOp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index 5686c0faa78..0224977e633 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /**
 * ownCloud - gallery application
-- 
GitLab


From 118cbf84003bce66309beb41c0b46860d20db686 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 11 Jan 2012 23:54:02 +0100
Subject: [PATCH 227/546] user suggested style change

---
 apps/gallery/css/styles.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index b253eeef223..6bfd756e5f1 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -1,9 +1,9 @@
 div#gallery_list { margin: 90pt 20pt; }
 div#gallery_list.leftcontent { padding-top: 15pt; margin: 0; height: 80%; text-align: center; overflow: scroll; }
-div#gallery_album_box { width: 200px; text-align: center; border: 0; display: inline-block; margin: 5pt; vertical-align: top; padding: 10px; border: solid 1px black; position: relative; overflow: hidden; color: #999; }
+div#gallery_album_box { width: 200px; text-align: center; border: 0; display: inline-block; margin: 5pt; vertical-align: top; padding: 10px; position: relative; overflow: hidden; color: #999; }
 div#gallery_album_box:hover { color: black; }
 .leftcontent div#gallery_album_box { margin: 5px; }
-div#gallery_album_box h1 { font-size: 12pt; font-family: Verdana; }
+div#gallery_album_box h1 { font-size: 9pt; font-family: Verdana; }
 div#gallery_album_cover { width: 199px; height: 199px; border: solid 1pt #999; padding: 0; }
 div#gallery_control_overlay { border: 0; position:absolute; right: 10pt; background-color: #333; opacity: 0.5; visibility:hidden; padding: 0 5pt; }
 div#gallery_control_overlay a { color:white; }
-- 
GitLab


From f4338f631b40868fbcec99c35a6f1b405d15d866 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Thu, 12 Jan 2012 00:54:29 +0100
Subject: [PATCH 228/546] fix searching music

---
 apps/media/lib_collection.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php
index 1240f1de2f0..ed8aebb6328 100644
--- a/apps/media/lib_collection.php
+++ b/apps/media/lib_collection.php
@@ -159,20 +159,21 @@ class OC_MEDIA_COLLECTION{
 	* @return array the list of albums found
 	*/
 	static public function getAlbums($artist=0,$search='%',$exact=false){
-		$cmd="SELECT DISTINCT *PREFIX*media_albums.album_name AS album_name , *PREFIX*media_albums.album_artist AS album_artist , *PREFIX*media_albums.album_id AS album_id
-			FROM *PREFIX*media_albums INNER JOIN *PREFIX*media_songs ON *PREFIX*media_albums.album_id=*PREFIX*media_songs.song_album WHERE *PREFIX*media_songs.song_user=? ORDER BY album_name";
+		$cmd="SELECT DISTINCT album_name, album_artist, album_id
+			FROM *PREFIX*media_albums INNER JOIN *PREFIX*media_songs ON album_id=song_album WHERE song_user=? ";
 		$params=array(self::$uid);
 		if($artist!=0){
-			$cmd.="AND *PREFIX*media_albums.album_artist = ? ";
+			$cmd.="AND album_artist = ? ";
 			array_push($params,$artist);
 		}
 		if($search!='%'){
-			$cmd.="AND *PREFIX*media_albums.album_name LIKE ? ";
+			$cmd.="AND album_name LIKE ? ";
 			if(!$exact){
 				$search="%$search%";
 			}
 			array_push($params,$search);
 		}
+		$cmd.=' ORDER BY album_name';
 		$query=OC_DB::prepare($cmd);
 		return $query->execute($params)->fetchAll();
 	}
-- 
GitLab


From 1b5d206ca77c68542ab381fb6529a5648ddf9713 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Thu, 12 Jan 2012 01:14:16 +0100
Subject: [PATCH 229/546] fix expending artists and albums in collection view

---
 apps/media/js/collection.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index 576f567faef..b55bbe5107c 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -132,7 +132,7 @@ Collection={
 	},
 	showArtist:function(artist){
 		var tr=Collection.parent.find('tr[data-artist="'+artist+'"]');
-		var nextRow=tr.next();
+		var lastRow=tr;
 		var artist=tr.data('artistData');
 		var first=true;
 		$.each(artist.albums,function(j,album){
@@ -185,9 +185,10 @@ Collection={
 				newRow.attr('data-artist',artist.name);
 				newRow.data('albumData',album);
 				if(!first){
-					nextRow.before(newRow);
+					lastRow.after(newRow);
 				}
 				first=false;
+				lastRow=newRow;
 			});
 		});
 		tr.removeClass('collapsed');
@@ -215,11 +216,11 @@ Collection={
 	},
 	showAlbum:function(artist,album){
 		var tr = Collection.parent.find('tr[data-artist="'+artist+'"][data-album="'+album+'"]');
+		var lastRow=tr;
 		var albumData=tr.data('albumData');
 		tr.find('td.album a.expander').data('expanded',true);
 		tr.find('td.album a.expander').addClass('expanded');
 		tr.find('td.album a.expander').text('v');
-		var nextRow=tr.next();
 		$.each(albumData.songs,function(i,song){
 			if(i>0){
 				var newRow=tr.clone();
@@ -231,8 +232,9 @@ Collection={
 			}
 			newRow.find('td.title a').text(song.name);
 			if(i>0){
-				nextRow.before(newRow);
+				lastRow.after(newRow);
 			}
+			lastRow=newRow;
 		});
 	},
 	hideAlbum:function(artist,album){
-- 
GitLab


From 25213a790d79c7d8f5c35c757ffd531243b2bc99 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Thu, 12 Jan 2012 01:18:27 +0100
Subject: [PATCH 230/546] fix event handler after re-expanding an artist in
 collection view

---
 apps/media/js/collection.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index b55bbe5107c..6525df55c71 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -231,6 +231,13 @@ Collection={
 				var newRow=tr;
 			}
 			newRow.find('td.title a').text(song.name);
+			newRow.find('td.title a').click(function(event){
+				event.preventDefault();
+				PlayList.add(song);
+				PlayList.play(0);
+				Collection.parent.find('tr').removeClass('active');
+				$('tr[data-title="'+song.name+'"]').addClass('active');
+			});
 			if(i>0){
 				lastRow.after(newRow);
 			}
-- 
GitLab


From 8de4163ba234a2eca124e2f389e9d4c999f06c00 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Thu, 12 Jan 2012 02:01:59 +0100
Subject: [PATCH 231/546] fix searching artists and albums

---
 apps/media/lib_collection.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php
index ed8aebb6328..d8dda1212e4 100644
--- a/apps/media/lib_collection.php
+++ b/apps/media/lib_collection.php
@@ -121,14 +121,19 @@ class OC_MEDIA_COLLECTION{
 	* @return array the list of artists found
 	*/
 	static public function getArtists($search='%',$exact=false){
+		$uid=self::$uid;
+		if(empty($uid)){
+			$uid=self::$uid=$_SESSION['user_id'];
+		}
 		if(!$exact and $search!='%'){
 			$search="%$search%";
 		}elseif($search==''){
 			$search='%';
 		}
-		$query=OC_DB::prepare("SELECT DISTINCT *PREFIX*media_artists.artist_name AS artist_name , *PREFIX*media_artists.artist_id AS artist_id FROM *PREFIX*media_artists
-			INNER JOIN *PREFIX*media_songs ON *PREFIX*media_artists.artist_id=*PREFIX*media_songs.song_artist WHERE artist_name LIKE ? AND *PREFIX*media_songs.song_user=? ORDER BY artist_name");
-		return $query->execute(array($search,self::$uid))->fetchAll();
+		$query=OC_DB::prepare("SELECT DISTINCT artist_name, artist_id FROM *PREFIX*media_artists
+			INNER JOIN *PREFIX*media_songs ON artist_id=song_artist WHERE artist_name LIKE ? AND song_user=? ORDER BY artist_name");
+		$result=$query->execute(array($search,self::$uid));
+		return $result->fetchAll();
 	}
 	
 	/**
@@ -159,6 +164,10 @@ class OC_MEDIA_COLLECTION{
 	* @return array the list of albums found
 	*/
 	static public function getAlbums($artist=0,$search='%',$exact=false){
+		$uid=self::$uid;
+		if(empty($uid)){
+			$uid=self::$uid=$_SESSION['user_id'];
+		}
 		$cmd="SELECT DISTINCT album_name, album_artist, album_id
 			FROM *PREFIX*media_albums INNER JOIN *PREFIX*media_songs ON album_id=song_album WHERE song_user=? ";
 		$params=array(self::$uid);
-- 
GitLab


From b71ea287aac37237c948ae9f8c825ddda0601857 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Thu, 12 Jan 2012 02:02:45 +0100
Subject: [PATCH 232/546] reimplement auto playing music from location hash
 (like from search results)

---
 apps/media/js/music.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/apps/media/js/music.js b/apps/media/js/music.js
index bf082207829..3373cbac257 100644
--- a/apps/media/js/music.js
+++ b/apps/media/js/music.js
@@ -26,18 +26,25 @@ $(document).ready(function(){
 		button.tipsy({gravity:'n', fade:true, delayIn: 400, live:true});
 	}
 	Collection.display();
+
+	Collection.load(function(){
+		var urlVars=getUrlVars();
+		if(urlVars.artist){
+			var song=Collection.find(urlVars.artist,urlVars.album,urlVars.song);
+			PlayList.add(song);
+			PlayList.play(0);
+		}
+	})
 });
 
 
 
 function getUrlVars(){
-	var vars = [], hash;
-	var hashes = window.location.href.slice(window.location.href.indexOf('#') + 1).split('&');
-	for(var i = 0; i < hashes.length; i++)
-	{
+	var vars = {}, hash;
+	var hashes = window.location.hash.substr(1).split('&');
+	for(var i = 0; i < hashes.length; i++){
 		hash = hashes[i].split('=');
-		vars.push(hash[0]);
-		vars[hash[0]] = hash[1].replace(/\+/g,' ');
+		vars[hash[0]] = decodeURIComponent(hash[1]).replace(/\+/g,' ');
 	}
 	return vars;
 }
-- 
GitLab


From c6eeb4a8080487075fca587653879a3308f7597a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 12 Jan 2012 02:34:22 +0100
Subject: [PATCH 233/546] Don't add address if none of the fields are filled
 out.

---
 apps/contacts/ajax/addproperty.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 6e3ba3566c0..0050f5f49aa 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -35,10 +35,22 @@ $name = $_POST['name'];
 $value = $_POST['value'];
 if(!is_array($value)){
 	$value = trim($value);
-	if(!$value && in_array($name, array('TEL', 'EMAIL'))) {
+	if(!$value && in_array($name, array('TEL', 'EMAIL', 'ORG'))) {
 		OC_JSON::error(array('data' => array('message' => $l->t('Cannot add empty property.'))));
 		exit();
 	}
+} elseif($name === 'ADR') { // only add if non-empty elements.
+	$empty = true;
+	foreach($value as $part) {
+		if(trim($part) != '') {
+			$empty = false;
+			break;
+		}
+	}
+	if($empty) {
+		OC_JSON::error(array('data' => array('message' => $l->t('At least one of the address fields has to be filled out.'))));
+		exit();
+	}
 }
 $parameters = isset($_POST['parameters']) ? $_POST['parameters'] : array();
 
@@ -49,7 +61,7 @@ $line = count($vcard->children) - 1;
 // Apparently Sabre_VObject_Parameter doesn't do well with multiple values or I don't know how to do it. Tanghus.
 foreach ($parameters as $key=>$element) {
 	if(is_array($element) && strtoupper($key) == 'TYPE') { 
-		// FIXME: Maybe this doesn't only apply for TYPE?
+		// NOTE: Maybe this doesn't only apply for TYPE?
 		// And it probably shouldn't be done here anyways :-/
 		foreach($element as $e){
 			if($e != '' && !is_null($e)){
-- 
GitLab


From 0b45d19ea0af15a440c0d39725ab34f9d70d7528 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 12 Jan 2012 16:50:49 +0100
Subject: [PATCH 234/546] change app icon

---
 apps/calendar/img/Icon License |   2 ++
 apps/calendar/img/icon.png     | Bin 398 -> 423 bytes
 apps/calendar/img/icon.svg     |  14 ++++++++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 apps/calendar/img/Icon License
 create mode 100755 apps/calendar/img/icon.svg

diff --git a/apps/calendar/img/Icon License b/apps/calendar/img/Icon License
new file mode 100644
index 00000000000..b1b292ace66
--- /dev/null
+++ b/apps/calendar/img/Icon License	
@@ -0,0 +1,2 @@
+http://thenounproject.com/noun/calendar/#icon-No404
+Creative Commons BY 3.0
\ No newline at end of file
diff --git a/apps/calendar/img/icon.png b/apps/calendar/img/icon.png
index ee0249b2c9be86e86b9951b1a1876d5e1c9af579..eb9e07cbb10df41ae8439c4475ca585a6f36445f 100644
GIT binary patch
delta 412
zcmV;N0b~A-1E&KaiBL{Q4GJ0x0000DNk~Le0000E0000G2nGNE049`9I*}n3fByjg
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru+yM*?8YjbHJRbl60VhdB
zK~yNuozlHZTwxH#@t^Biuo3)-g`mwUNQ_0$PA$EG^ww7P7Ft+Z>Me+OAa=IiKm=2{
z%|Z}FO>l*Py4pMkUOyn{z;Mp|f9HA6%$aw1X?s}o)|Rkaf-28RG%<x)T)aB?71L<p
z9vwKsQ@|Nc6PNxIzwnUw5PAu2u#T;F4sIs*CvmS28%0Z(7{tJ<R{x=kFE!}HwNF|X
z!|@%==Y2Ik9JW*Fx>fOibxVH}--X>^B)MAmROK4h0v0meOMDL-i!T(qa%PpOwu`TK
z@EhY{?Npm7biE3XI1X6G3C=TJ$xY?*Yu#goM%s`na~O)aZhs=VTGyzub}Ip`?Bx}{
zh4o`Jxs`HNZ;PwhE-L+q3)?Pqw~Y+vqt=6icXsoCzW)rO9$6M)1lltI0000<MNUMn
GLSTYV1+HxX

delta 387
zcmZ3^+{dig8Q|y6%O%Cdz`(%k>ERLtqy<2jgAGW^fBv61QBkZO$Yfyn>AV}n;4JWn
zEM{Qf76xHPhFNnYfP(BLp1!W^x7j5*C5;(m3r_%rI7(b2N}Tg^b5rw57`~mEwjU_=
z%hSa%#NzbYNgK0T97J5-`-r)in>8MB@QOWnD=J{aH}gNsezF`q<(HGA^S9})mg1Rn
zOFS&4d+KMMde9~iP`o;PPqpRuj}5&_3<;6f3VS0t3Kv9kmN7i2lnWDjP|u-ubKBnU
zwg1l<^vo4-+M4@YZ|NV8%U5QWNhB}d`Mm2uq0Hu0tBR+ko}csCTY%;J<d@4ohBs}}
zInS^lQ|j&SI+?b_m=Hz=wV0(>(gQ`-cQZ>QtH)l?kGZ}#viI>1!}Fh~?`K+<C*XRq
zIdj(ig|XLpyE!bLYk5vm_tKmg6gO*G<?QRT&R-7XWN1m;@oMVpUHAT-VqrK|7~|@|
eVVT2vK)h&v{G;3YJ^8?JVDNPHb6Mw<&;$TVDVwtZ

diff --git a/apps/calendar/img/icon.svg b/apps/calendar/img/icon.svg
new file mode 100755
index 00000000000..a624db3a487
--- /dev/null
+++ b/apps/calendar/img/icon.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="88px" height="100px" viewBox="0 0 88 100" enable-background="new 0 0 88 100" xml:space="preserve">
+<path d="M0,32v59.906C0,96.377,3.582,100,8,100h72c4.418,0,8-3.623,8-8.094V32H0z M22,94H6V78h16V94z M22,74H6V58h16V74z M22,54H6
+	V38h16V54z M42,94H26V78h16V94z M42,74H26V58h16V74z M42,54H26V38h16V54z M62,94H46V78h16V94z M62,74H46V58h16V74z M62,54H46V38h16
+	V54z M82,94H66V78h16V94z M82,74H66V58h16V74z M82,54H66V38h16V54z"/>
+<path d="M80,12H67V3c0-1.657-1.344-3-3-3c-1.657,0-3,1.343-3,3v9H27V3c0-1.657-1.344-3-3-3c-1.657,0-3,1.343-3,3v9H8
+	c-4.418,0-8,3.623-8,8.093V27v0v1h88v-1v0v-6.907C88,15.623,84.418,12,80,12z M24,26c-3.313,0-6-2.687-6-6
+	c0-2.219,1.209-4.152,3-5.19V20c0,1.657,1.343,3,3,3c1.656,0,3-1.343,3-3v-5.191c1.792,1.038,3,2.972,3,5.191
+	C30,23.313,27.314,26,24,26z M64,26c-3.313,0-6-2.687-6-6c0-2.219,1.209-4.152,3-5.19V20c0,1.657,1.343,3,3,3c1.656,0,3-1.343,3-3
+	v-5.191c1.792,1.038,3,2.972,3,5.191C70,23.313,67.314,26,64,26z"/>
+</svg>
-- 
GitLab


From a0ff21a2326e415bb1c0147ba2d96179d4036ca2 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 12 Jan 2012 18:26:13 +0100
Subject: [PATCH 235/546] added a file to fix wrong recognised mime-types

---
 lib/filestorage/local.php |  9 ++++++++-
 lib/mimetypes.fixlist.php | 12 ++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 lib/mimetypes.fixlist.php

diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index cfc27159786..1261bd3aa83 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -132,6 +132,13 @@ class OC_Filestorage_Local extends OC_Filestorage{
 	public function getMimeType($fspath){
 		if($this->is_readable($fspath)){
 			$mimeType='application/octet-stream';
+			if ($mimeType=='application/octet-stream') {
+				self::$mimetypes = include('mimetypes.fixlist.php');
+				$extention=strtolower(strrchr(basename($fspath), "."));
+				$extention=substr($extention,1);//remove leading .
+				$mimeType=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream';
+				
+			}
 			if (@is_dir($this->datadir.$fspath)) {
 				// directories are easy
 				return "httpd/unix-directory";
@@ -158,7 +165,7 @@ class OC_Filestorage_Local extends OC_Filestorage{
 			}
 			if ($mimeType=='application/octet-stream') {
 				// Fallback solution: (try to guess the type by the file extension
-				if(!self::$mimetypes){
+				if(!self::$mimetypes || self::$mimetypes == include('mimetypes.list.php')){
 					self::$mimetypes=include('mimetypes.list.php');
 				}
 				$extention=strtolower(strrchr(basename($fspath), "."));
diff --git a/lib/mimetypes.fixlist.php b/lib/mimetypes.fixlist.php
new file mode 100644
index 00000000000..f2d86d0db1e
--- /dev/null
+++ b/lib/mimetypes.fixlist.php
@@ -0,0 +1,12 @@
+<?php
+return array(
+	'ics'=>'text/calendar',
+	'ical'=>'text/calendar',
+	'js'=>'application/javascript',
+	'odt'=>'application/vnd.oasis.opendocument.text',
+	'ods'=>'application/vnd.oasis.opendocument.spreadsheet',
+	'odg'=>'application/vnd.oasis.opendocument.graphics',
+	'odp'=>'application/vnd.oasis.opendocument.presentation',
+	'pl'=>'text/x-script.perl',
+	'py'=>'text/x-script.phyton',
+);
-- 
GitLab


From 0fb73ec49d4adb3272b2939f10498ca446f7ffb6 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 12 Jan 2012 21:54:58 +0100
Subject: [PATCH 236/546] fix previous change

---
 lib/filestorage/local.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 1261bd3aa83..b8a0563c134 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -165,7 +165,7 @@ class OC_Filestorage_Local extends OC_Filestorage{
 			}
 			if ($mimeType=='application/octet-stream') {
 				// Fallback solution: (try to guess the type by the file extension
-				if(!self::$mimetypes || self::$mimetypes == include('mimetypes.list.php')){
+				if(!self::$mimetypes || self::$mimetypes != include('mimetypes.list.php')){
 					self::$mimetypes=include('mimetypes.list.php');
 				}
 				$extention=strtolower(strrchr(basename($fspath), "."));
-- 
GitLab


From cd8f54ade2a961c5f55d0b137caa7f707c2d73e8 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 12 Jan 2012 22:06:53 +0100
Subject: [PATCH 237/546] update js of calendar import

---
 apps/calendar/js/loader.js | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
index 6eafec8b10d..c21c20275e2 100644
--- a/apps/calendar/js/loader.js
+++ b/apps/calendar/js/loader.js
@@ -1,16 +1,19 @@
-function importdialog(directory, filename){
-	$("body").append("<div id=\"importdialogholder\"></div>");
-	$("#importdialogholder").load(OC.filePath('calendar', 'ajax', 'importdialog.php?filename=' + filename + '&path=' + directory));
+Calendar_Import={
+	importdialog: function(filename){
+		var path = $('#dir').val();
+		$('body').append('<div id="calendar_import"></div>');
+		$('#calendar_import').load(OC.filePath('calendar', 'ajax', 'importdialog.php'), {filename:filename, path:path},	Calendar_Import.initdialog());
+	},
+	initdialog: function(){
+		
+	},
+	getimportstatus: function(){
+		
+	}
 }
-
 $(document).ready(function(){
-	$('tr[data-file$=".ics"]').attr("data-mime", "text/calendar");
-	$('tr[data-file$=".vcs"]').attr("data-mime", "text/calendar");
-	$('tr[data-file$=".ical"]').attr("data-mime", "text/calendar");
-	if(typeof FileActions!=='undefined'){
-		FileActions.register('text/calendar','Import to Calendar','',function(filename){
-			importdialog($('#dir').val(),filename);
-		});
-		FileActions.setDefault('text/calendar','Import to Calendar');
-	}
+	if(typeof FileActions !== 'undefined'){
+		FileActions.register('text/calendar','importcal', '', Calendar_Import.importdialog); 
+		FileActions.setDefault('text/calendar','importcal');
+	};
 });
\ No newline at end of file
-- 
GitLab


From 0d120efda591a8405373309b0ac887415c5e94a6 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 12 Jan 2012 11:26:11 +0100
Subject: [PATCH 238/546] Add PRODID to vcards created by ownCloud.

---
 apps/contacts/lib/vcard.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index c61f0dfc114..04b59a040fb 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -114,6 +114,14 @@ class OC_Contacts_VCard{
 				//$data = $card->serialize();
 			};
 			$uri = $uid.'.vcf';
+
+			// Add product ID.
+			$prodid = trim($card->getAsString('PRODID'));
+			if(!$prodid) {
+				$appinfo = $info=OC_App::getAppInfo('contacts');
+				$prodid = 'PRODID:-//ownCloud//NONSGML '.$appinfo['name'].' '.$appinfo['version'].'//EN';
+				$card->setString('PRODID', $prodid);
+			}
 			// VCARD must have a version
 			$version = $card->getAsString('VERSION');
 			// Add version if needed
-- 
GitLab


From 22356533a0529197d8a4c383307b566f94ed6fc4 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 12 Jan 2012 16:06:27 +0100
Subject: [PATCH 239/546] Added search. Thanks to icewind it was mostly
 copy/paste :-)

---
 apps/contacts/appinfo/app.php |  4 +++-
 apps/contacts/lib/search.php  | 29 +++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 apps/contacts/lib/search.php

diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index 524cc640bc9..1e9f8811722 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -1,4 +1,5 @@
 <?php
+$l=new OC_L10N('calendar');
 
 OC::$CLASSPATH['OC_Contacts_App'] = 'apps/contacts/lib/app.php';
 OC::$CLASSPATH['OC_Contacts_Addressbook'] = 'apps/contacts/lib/addressbook.php';
@@ -17,7 +18,8 @@ OC_App::addNavigationEntry( array(
   'order' => 10,
   'href' => OC_Helper::linkTo( 'contacts', 'index.php' ),
   'icon' => OC_Helper::imagePath( 'settings', 'users.svg' ),
-  'name' => 'Contacts' ));
+  'name' => $l->t('Contacts') ));
 
 
 OC_APP::registerPersonal('contacts','settings');
+require_once('apps/contacts/lib/search.php');
\ No newline at end of file
diff --git a/apps/contacts/lib/search.php b/apps/contacts/lib/search.php
new file mode 100644
index 00000000000..97638821007
--- /dev/null
+++ b/apps/contacts/lib/search.php
@@ -0,0 +1,29 @@
+<?php
+class OC_Search_Provider_Contacts extends OC_Search_Provider{
+	function search($query){
+		$addressbooks = OC_Contacts_Addressbook::all(OC_User::getUser(), 1);
+// 		if(count($calendars)==0 || !OC_App::isEnabled('contacts')){
+// 			//return false;
+// 		}
+		// NOTE: Does the following do anything
+		$results=array();
+		$searchquery=array();
+		if(substr_count($query, ' ') > 0){
+			$searchquery = explode(' ', $query);
+		}else{
+			$searchquery[] = $query;
+		}
+		$l = new OC_l10n('contacts');
+		foreach($addressbooks as $addressbook){
+			$vcards = OC_Contacts_VCard::all($addressbook['id']);
+			foreach($vcards as $vcard){
+				if(substr_count(strtolower($vcard['fullname']), strtolower($query)) > 0){
+					$link = OC_Helper::linkTo('apps/contacts', 'index.php?id='.urlencode($vcard['id']));
+					$results[]=new OC_Search_Result($vcard['fullname'],'', $link,$l->t('Contact'));//$name,$text,$link,$type
+				}
+			}
+		}
+		return $results;
+	}
+}
+new OC_Search_Provider_Contacts();
-- 
GitLab


From e60860148cbe9e97cd898712b63302da3df82ed0 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 12 Jan 2012 18:04:23 +0100
Subject: [PATCH 240/546] Don't chunk_split encoded image string. Don't return
 json error but null if card can't be parsed. Small check for non-parsable
 card in index.php.

---
 apps/contacts/index.php   | 12 +++++-------
 apps/contacts/lib/app.php |  9 ++++-----
 lib/image.php             |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 6f65ac1c605..b179d9bbfe5 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -44,19 +44,17 @@ OC_App::setActiveNavigationEntry( 'contacts_index' );
 $id = isset( $_GET['id'] ) ? $_GET['id'] : null;
 $details = array();
 
-// FIXME: This cannot work..?
 if(is_null($id) && count($contacts) > 0) {
 	$id = $contacts[0]['id'];
 }
+$vcard = null;
+$details = null;
 if(!is_null($id)) {
 	$vcard = OC_Contacts_App::getContactVCard($id);
-	$details = OC_Contacts_VCard::structureContact($vcard);
+	if(!is_null($vcard) {
+		$details = OC_Contacts_VCard::structureContact($vcard);
+	}
 }
-// if( !is_null($id)/* || count($contacts)*/){
-// 	if(is_null($id)) $id = $contacts[0]['id'];
-// 	$vcard = OC_Contacts_App::getContactVCard($id);
-// 	$details = OC_Contacts_VCard::structureContact($vcard);
-// }
 
 // Include Style and Script
 OC_Util::addScript('contacts','interface');
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 907ce82c76a..00a830d5e5f 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -56,15 +56,14 @@ class OC_Contacts_App{
 		return $card;
 	}
 
+	/**
+	 * @brief Gets the VCard as text
+	 * @returns The card or null if the card could not be parsed.
+	 */
 	public static function getContactVCard($id){
 		$card = self::getContactObject( $id );
 
 		$vcard = OC_VObject::parse($card['carddata']);
-		// Check if the card is valid
-		if(is_null($vcard)){
-			OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('vCard could not be read.'))));
-			exit();
-		}
 		return $vcard;
 	}
 
diff --git a/lib/image.php b/lib/image.php
index bdfa1fefd7d..70ad3f5969e 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -196,7 +196,7 @@ class OC_Image {
 		if (!$res) {
 			OC_Log::write('core','OC_Image::_string. Error writing image',OC_Log::ERROR);
 		}
-		return chunk_split(base64_encode(ob_get_clean()));
+		return base64_encode(ob_get_clean());
 	}
 
 	/**
-- 
GitLab


From 16973470457b31398c3a8b582e04b587e5b9862a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 12 Jan 2012 22:55:43 +0100
Subject: [PATCH 241/546] Oops. Missing ')' :-P

---
 apps/contacts/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index b179d9bbfe5..9012e5d8af8 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -51,7 +51,7 @@ $vcard = null;
 $details = null;
 if(!is_null($id)) {
 	$vcard = OC_Contacts_App::getContactVCard($id);
-	if(!is_null($vcard) {
+	if(!is_null($vcard)) {
 		$details = OC_Contacts_VCard::structureContact($vcard);
 	}
 }
-- 
GitLab


From 0ba472c18a0dee5404b9b8a458bf571ea6e8fec0 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 12 Jan 2012 23:43:00 +0100
Subject: [PATCH 242/546] Too quick on the copy/paste trigger...

---
 apps/contacts/appinfo/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index 1e9f8811722..df7e8cec6e0 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -1,5 +1,5 @@
 <?php
-$l=new OC_L10N('calendar');
+$l=new OC_L10N('contacts');
 
 OC::$CLASSPATH['OC_Contacts_App'] = 'apps/contacts/lib/app.php';
 OC::$CLASSPATH['OC_Contacts_Addressbook'] = 'apps/contacts/lib/addressbook.php';
-- 
GitLab


From 37dbf48434525b008c5201136e38eee1aac16c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20K=C3=B6b?= <daniel.koeb@peony.at>
Date: Thu, 12 Jan 2012 20:35:50 +0100
Subject: [PATCH 243/546] Connect to the newly created database when checking
 if it needs to be filled.

---
 lib/setup.php | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/lib/setup.php b/lib/setup.php
index ce7ee24e134..eb32e84713f 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -189,16 +189,29 @@ class OC_Setup {
 						self::pg_createDatabase($dbname, $dbuser, $connection);
 					}
 
-					//fill the database if needed
-					$query = "select count(*) FROM pg_class WHERE relname='{$dbtableprefix}users' limit 1";
-					$result = pg_query($connection, $query);
-					if($result){
-						$row = pg_fetch_row($result);
-					}
-					if(!$result or $row[0]==0) {
-						OC_DB::createDbFromStructure('db_structure.xml');
-					}
+					// the connection to dbname=postgres is not needed anymore
 					pg_close($connection);
+
+					// connect to the ownCloud database (dbname=$dbname) an check if it needs to be filled
+					$dbuser = OC_CONFIG::getValue('dbuser');
+					$dbpass = OC_CONFIG::getValue('dbpassword');
+					$connection_string = "host=$dbhost dbname=$dbname user=$dbuser password=$dbpass";
+					$connection = @pg_connect($connection_string);
+					if(!$connection) {
+						$error[] = array(
+							'error' => 'PostgreSQL username and/or password not valid',
+							'hint' => 'You need to enter either an existing account or the administrator.'
+						);
+					} else {
+						$query = "select count(*) FROM pg_class WHERE relname='{$dbtableprefix}users' limit 1";
+						$result = pg_query($connection, $query);
+						if($result) {
+							$row = pg_fetch_row($result);
+						}
+						if(!$result or $row[0]==0) {
+							OC_DB::createDbFromStructure('db_structure.xml');
+						}
+					}
 				}
 			}
 			else {
-- 
GitLab


From f9c4975a456940bb24cacd6723a37f2857fbc65c Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Fri, 13 Jan 2012 13:57:46 +0100
Subject: [PATCH 244/546] improve import form for calendar

---
 apps/calendar/js/loader.js              | 39 ++++++++++++-
 apps/calendar/templates/part.import.php | 75 ++++---------------------
 2 files changed, 48 insertions(+), 66 deletions(-)

diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
index c21c20275e2..50a7b082d98 100644
--- a/apps/calendar/js/loader.js
+++ b/apps/calendar/js/loader.js
@@ -2,10 +2,43 @@ Calendar_Import={
 	importdialog: function(filename){
 		var path = $('#dir').val();
 		$('body').append('<div id="calendar_import"></div>');
-		$('#calendar_import').load(OC.filePath('calendar', 'ajax', 'importdialog.php'), {filename:filename, path:path},	Calendar_Import.initdialog());
+		$('#calendar_import').load(OC.filePath('calendar', 'ajax', 'importdialog.php'), {filename:filename, path:path},	function(){Calendar_Import.initdialog(filename);});
 	},
-	initdialog: function(){
-		
+	initdialog: function(filename){
+		$("#calendar_import_dialog").dialog({
+			width : 500,
+			close : function() {
+				$(this).dialog('destroy').remove();
+				$("#calendar_import").remove();
+			}
+		});
+		$('#progressbar').progressbar({value: 87});
+		$('#startimport').click(function(){
+			var filename = $('#filename').val();
+			var path = $('#path').val();
+			if($('#calendar option:selected').val() == 'newcal'){
+				var method = 'new';
+				var calname = $('#newcalendar').val();
+				var calname = $.trim(calname);
+				if(calname == ''){
+					$('#newcalendar').css('background-color', '#FF2626');
+					return false;
+				}
+			}else{
+				var method = 'old';
+			}
+			$('#newcalendar').attr('readonly', 'readonly');
+			$('#calendar').attr('disabled', 'disabled');
+			$.post(OC.filePath('calendar', '', 'import.php'), {'method':method, 'calname':calname, 'path':path, 'file':filename}, function(){});
+			$('#progressbar').slideDown('slow');
+		});
+		$('#calendar').change(function(){
+			if($('#calendar option:selected').val() == 'newcal'){
+				$('#newcalform').slideDown('slow');
+			}else{
+				$('#newcalform').slideUp('slow');
+			}
+		});
 	},
 	getimportstatus: function(){
 		
diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php
index b8805e6b6ef..13685cfb273 100644
--- a/apps/calendar/templates/part.import.php
+++ b/apps/calendar/templates/part.import.php
@@ -1,69 +1,18 @@
-<div id="importdialog" title="<?php echo $l->t("Import Ical File"); ?>">
+<div id="calendar_import_dialog" title="<?php echo $l->t("Import a calendar file"); ?>">
 <input type="hidden" id="filename" value="<?php echo $_GET["filename"];?>">
 <input type="hidden" id="path" value="<?php echo $_GET["path"];?>">
-<div id="first"><strong style="text-align: center;margin: 0 auto;"><?php echo $l->t("How to import the new calendar?");?></strong>
-<br><br>
-<input style="float: left;" type="button" value="<?php echo $l->t("Import into an existing calendar"); ?>" onclick="$('#first').css('display', 'none');$('#existingcal').css('display', 'block');">
-<input style="float: right;" type="button" value="<?php echo $l->t("Import into a new calendar");?>" onclick="$('#first').css('display', 'none');$('#newcal').css('display', 'block');">
-</div>
-<div id="existingcal" style="display: none;">
-<strong><?php echo $l->t("Please choose the calendar"); ?></strong><br><br>
-<form id="inputradioform">
+<p style="text-align:center;"><b><?php echo $l->t('Please choose the calendar'); ?></b></h2>
+<select style="width:100%;" id="calendar" name="calendar">
 <?php
-$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
-foreach($calendars as $calendar){
-	echo '<input type="radio" style="width: 20px;" name="calendar" id="radio_' . $calendar["id"] . '" value="' . $calendar["id"] . '">' . $calendar["displayname"] . '<br>';
-}
+$calendar_options = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
+$calendar_options[] = array('id'=>'newcal', 'displayname'=>$l->t('create a new calendar'));
+echo html_select_options($calendar_options, $calendar_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
 ?>
-</form>
-<br><br>
-<input type="button" value="<?php echo $l->t("Import");?>!" onclick="importcal('existing');">
-<br><br>
-<input type="button" value="<?php echo $l->t("Back");?>" onclick="$('#existingcal').css('display', 'none');$('#first').css('display', 'block');">
+</select>
+<div id="newcalform" style="display: none;">
+	<input type="text" style="width: 97%;" placeholder="<?php echo $l->t('Name of new calendar'); ?>" id="newcalendar" name="newcalendar">
 </div>
-<div id="newcal" style="display: none;">
-<strong><?php echo $l->t("Please fill out the form"); ?></strong>
-<!-- modified part of part.editcalendar.php -->
-<table width="100%" style="border: 0;">
-<tr>
-<th><?php echo $l->t('Displayname') ?></th>
-<td>
-<input id="displayname" type="text" value="">
-</td>
-</tr>
-</table>
-<!-- end of modified part -->
+<input type="button" value="<?php echo $l->t("Import");?>!" id="startimport">
 <br><br>
-<input type="button" value="<?php echo $l->t("Import");?>!" onclick="importcal('new');">
-<br><br>
-<input type="button" value="<?php echo $l->t("Back");?>" onclick="$('#newcal').css('display', 'none');$('#first').css('display', 'block');">
-</div>
-</div>
-<script type="text/javascript">
-$("input:radio[name='calendar']:first").attr("checked","checked");
-$("#importdialog").dialog({
-	width : 500,
-	close : function(event, ui) {
-		$(this).dialog('destroy').remove();
-		$("#importdialogholder").remove();
-	}
-});
-function importcal(importtype){
-	var path = $("#path").val();
-	var file = $("#filename").val();
-	if(importtype == "existing"){
-		var calid = $("input:radio[name='calendar']:checked").val();
-		$.getJSON(OC.filePath('calendar', '', 'import.php') + "?import=existing&calid=" + calid + "&path=" + path + "&file=" + file, function(){
-			$("#importdialog").dialog('destroy').remove();
-			$("#importdialogholder").remove();
-		});
-	}
-	if(importtype == "new"){
-		var calname = $("#displayname").val();
-		$.post(OC.filePath('calendar', '', 'import.php'), {'import':'new', 'calname':calname, 'path':path, 'file':file}, function(){
-			$("#importdialog").dialog('destroy').remove();
-			$("#importdialogholder").remove();
-		});
-	}
-}
-</script>
\ No newline at end of file
+<div id="progressbar" style="display: none;"></div>
+</div>
\ No newline at end of file
-- 
GitLab


From 1b1c4889fc249e8cd27e2c3357868990abb2aa1e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Fri, 13 Jan 2012 20:04:59 +0100
Subject: [PATCH 245/546] fix some warning in the pgsql driver

---
 3rdparty/MDB2/Driver/Manager/pgsql.php | 6 +++---
 3rdparty/MDB2/Driver/pgsql.php         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/3rdparty/MDB2/Driver/Manager/pgsql.php b/3rdparty/MDB2/Driver/Manager/pgsql.php
index 490f697aa5b..7542e9e8329 100644
--- a/3rdparty/MDB2/Driver/Manager/pgsql.php
+++ b/3rdparty/MDB2/Driver/Manager/pgsql.php
@@ -499,7 +499,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      * @return mixed array of view names on success, a MDB2 error on failure
      * @access public
      */
-    function listViews()
+    function listViews($database = null)
     {
         $db =& $this->getDBInstance();
         if (PEAR::isError($db)) {
@@ -631,7 +631,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      * @return mixed array of table names on success, a MDB2 error on failure
      * @access public
      */
-    function listTables()
+    function listTables($database = null)
     {
         $db =& $this->getDBInstance();
         if (PEAR::isError($db)) {
@@ -922,7 +922,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      * @return mixed array of sequence names on success, a MDB2 error on failure
      * @access public
      */
-    function listSequences()
+    function listSequences($database = null)
     {
         $db =& $this->getDBInstance();
         if (PEAR::isError($db)) {
diff --git a/3rdparty/MDB2/Driver/pgsql.php b/3rdparty/MDB2/Driver/pgsql.php
index 6108f18dec1..13fea690680 100644
--- a/3rdparty/MDB2/Driver/pgsql.php
+++ b/3rdparty/MDB2/Driver/pgsql.php
@@ -1193,7 +1193,7 @@ class MDB2_Result_pgsql extends MDB2_Result_Common
             if ($object_class == 'stdClass') {
                 $row = (object) $row;
             } else {
-                $row = &new $object_class($row);
+                $row = new $object_class($row);
             }
         }
         ++$this->rownum;
-- 
GitLab


From 6e0ea7aaaef50b7d7a48477995094da7aa745e4a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Fri, 13 Jan 2012 20:05:24 +0100
Subject: [PATCH 246/546] use absolute path for db_structure.xml when updating

---
 lib/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index e0f14b703dc..9531f7ed74f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -156,7 +156,7 @@ class OC{
 			$installedVersion=OC_Config::getValue('version','0.0.0');
 			$currentVersion=implode('.',OC_Util::getVersion());
 			if (version_compare($currentVersion, $installedVersion, '>')) {
-				OC_DB::updateDbFromStructure('../db_structure.xml');
+				OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml');
 				OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
 			}
 
-- 
GitLab


From 7d53b6f106fe7e6f0c56820ea18da4ac270b27a8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Fri, 13 Jan 2012 20:05:44 +0100
Subject: [PATCH 247/546] remove temporary files after updating

---
 lib/db.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/db.php b/lib/db.php
index b901cc8b513..f6eddf7825c 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -371,6 +371,10 @@ class OC_DB {
 		}
 		file_put_contents( $file2, $content );
 		$op = self::$schema->updateDatabase($file2, $previousSchema, array(), false);
+		
+		// Delete our temporary file
+		unlink( $file2 );
+		
 		if (PEAR::isError($op)) {
 		    $error = $op->getMessage();
 		    OC_Log::write('core','Failed to update database structure ('.$error.')',OC_Log::FATAL);
-- 
GitLab


From a9878dca6d16258ac7ce3d1e7415b88ef30e9491 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 14 Jan 2012 11:19:24 +0100
Subject: [PATCH 248/546] content divs alignment

---
 apps/gallery/css/styles.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index 6bfd756e5f1..4ada23b0b06 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -1,5 +1,5 @@
 div#gallery_list { margin: 90pt 20pt; }
-div#gallery_list.leftcontent { padding-top: 15pt; margin: 0; height: 80%; text-align: center; overflow: scroll; }
+div#gallery_list.leftcontent { padding-top: 15pt; margin: 0; position: absolute; bottom:0px; text-align: center; overflow: scroll; }
 div#gallery_album_box { width: 200px; text-align: center; border: 0; display: inline-block; margin: 5pt; vertical-align: top; padding: 10px; position: relative; overflow: hidden; color: #999; }
 div#gallery_album_box:hover { color: black; }
 .leftcontent div#gallery_album_box { margin: 5px; }
@@ -7,5 +7,5 @@ div#gallery_album_box h1 { font-size: 9pt; font-family: Verdana; }
 div#gallery_album_cover { width: 199px; height: 199px; border: solid 1pt #999; padding: 0; }
 div#gallery_control_overlay { border: 0; position:absolute; right: 10pt; background-color: #333; opacity: 0.5; visibility:hidden; padding: 0 5pt; }
 div#gallery_control_overlay a { color:white; }
-#gallery_images { padding:10px 5px; }
+#gallery_images.rightcontent { padding:10px 5px; position:absolute; bottom: 0px; overflow: scroll; }
 
-- 
GitLab


From 06388e13394e026c5dd70b36c1ab65238d1cc254 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 14 Jan 2012 13:52:24 +0100
Subject: [PATCH 249/546] handling directory renaming and thumbnail move on
 gallery name chenge

---
 apps/gallery/ajax/galleryOp.php     |  1 +
 apps/gallery/js/album_cover.js      |  2 +-
 apps/gallery/lib/album.php          | 11 ++++
 apps/gallery/lib/hooks_handlers.php | 85 +++++++++++++++++------------
 4 files changed, 63 insertions(+), 36 deletions(-)

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index 0224977e633..a62f0fe3f5b 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -29,6 +29,7 @@ OC_JSON::checkAppEnabled('gallery');
 function handleRename($oldname, $newname) {
   OC_JSON::checkLoggedIn();
   OC_Gallery_Album::rename($oldname, $newname, OC_User::getUser());
+  OC_Gallery_Album::changeThumbnailPath($oldname, $newname);
 }
 
 function handleRemove($name) {
diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index 84a89c5a91f..0009eb04e4f 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -58,7 +58,7 @@ function galleryRemove(albumName) {
 }
 
 function galleryRename(name) {
-  var result = window.prompt("Input new gallery name", "");
+  var result = window.prompt("Input new gallery name", name);
   if (result) {
 	if (Albums.find(result)) {
 	  alert("Album named '" + result + "' already exists");
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index a94eff3acd7..a708ba83ea4 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -58,6 +58,17 @@ class OC_Gallery_Album {
 		return $stmt->execute($args);
 	}
 
+  public static function changePath($oldname, $newname, $owner) {
+    $stmt = OC_DB::prepare('UPDATE OR IGNORE *PREFIX*gallery_albums SET album_path=? WHERE uid_owner=? AND album_path=?');
+    $stmt->execute(array($newname, $owner, $oldname));
+  }
+
+  public static function changeThumbnailPath($oldname, $newname) {
+    require_once('../../../lib/base.php');
+    $thumbpath = OC::$CONFIG_DATADIRECTORY.'/../gallery/';
+    rename($thumbpath.$oldname.'.png', $thumbpath.$newname.'.png');
+  }
+
 }
 
 ?>
diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
index 65f3faaeeaf..ee17c0df7df 100644
--- a/apps/gallery/lib/hooks_handlers.php
+++ b/apps/gallery/lib/hooks_handlers.php
@@ -34,8 +34,19 @@ class OC_Gallery_Hooks_Handlers {
   private static function isPhoto($filename) {
     OC_Log::write(self::$APP_TAG, "Checking file ".$filename." with mimetype ".OC_Filesystem::getMimeType($filename), OC_Log::DEBUG);
     if (substr(OC_Filesystem::getMimeType($filename), 0, 6) == "image/")
-      return 1;
-    return 0;
+      return true;
+    return false;
+  }
+
+  private static function directoryContainsPhotos($dirpath) {
+    $dirhandle = opendir(OC::$CONFIG_DATADIRECTORY.$dirpath);
+    if ($dirhandle != FALSE) {
+      while (($filename = readdir($dirhandle)) != FALSE) {
+        if ($filename[0] == '.') continue;
+        if (self::isPhoto($dirpath.'/'.$filename)) return true;
+      }
+    }
+    return false;
   }
 
   private static function createAlbum($path) {
@@ -77,41 +88,45 @@ class OC_Gallery_Hooks_Handlers {
   }
 
   public static function renamePhoto($params) {
-    $olddir = substr($params['oldpath'], 0, strrpos($params['oldpath'], '/'));
-    $newdir = substr($params['newpath'], 0, strrpos($params['newpath'], '/'));
-    if ($olddir == '') $olddir = '/';
-    if ($newdir == '') $newdir = '/';
-    if (!self::isPhoto($params['newpath'])) return;
-    OC_Log::write(self::$APP_TAG, 'Moving photo from '.$params['oldpath'].' to '.$params['newpath'], OC_Log::DEBUG);
-    $album;
-    $newAlbumId;
-    $oldAlbumId;
-    if ($olddir == $newdir) {
-      // album changing is not needed
-      $album = OC_Gallery_Album::find(OC_User::getUser(), null, $olddir);
-      if ($album->numRows() == 0) {
-        $album = self::createAlbum($newdir);
-      }
-      $album = $album->fetchRow();
-      $newAlbumId = $oldAlbumId = $album['album_id'];
-    } else {
-      $newalbum = OC_Gallery_Album::find(OC_User::getUser(), null, $newdir);
-      $oldalbum = OC_Gallery_Album::find(OC_User::getUser(), null, $olddir);
-
-      if ($newalbum->numRows() == 0) {
-        $newalbum = self::createAlbum($newdir);
-      }
-      $newalbum = $newalbum->fetchRow();
-      if ($oldalbum->numRows() == 0) {
-        OC_Gallery_Photo::create($newalbum['album_id'], $params['newpath']);
-        return;
-      }
-      $oldalbum = $oldalbum->fetchRow();
-      $newAlbumId = $newalbum['album_id'];
-      $oldAlbumId = $oldalbum['album_id'];
+    if (OC_Filesystem::is_dir($params['newpath']) && self::directoryContainsPhotos($params['newpath'])) {
+      OC_Gallery_Album::changePath($params['oldpath'], $params['newpath'], OC_User::getUser());
+    } elseif (!self::isPhoto($params['newpath'])) {
+      $olddir = substr($params['oldpath'], 0, strrpos($params['oldpath'], '/'));
+      $newdir = substr($params['newpath'], 0, strrpos($params['newpath'], '/'));
+      if ($olddir == '') $olddir = '/';
+      if ($newdir == '') $newdir = '/';
+      if (!self::isPhoto($params['newpath'])) return;
+      OC_Log::write(self::$APP_TAG, 'Moving photo from '.$params['oldpath'].' to '.$params['newpath'], OC_Log::DEBUG);
+      $album;
+      $newAlbumId;
+      $oldAlbumId;
+      if ($olddir == $newdir) {
+        // album changing is not needed
+        $album = OC_Gallery_Album::find(OC_User::getUser(), null, $olddir);
+        if ($album->numRows() == 0) {
+          $album = self::createAlbum($newdir);
+        }
+        $album = $album->fetchRow();
+        $newAlbumId = $oldAlbumId = $album['album_id'];
+      } else {
+        $newalbum = OC_Gallery_Album::find(OC_User::getUser(), null, $newdir);
+        $oldalbum = OC_Gallery_Album::find(OC_User::getUser(), null, $olddir);
+
+        if ($newalbum->numRows() == 0) {
+          $newalbum = self::createAlbum($newdir);
+        }
+        $newalbum = $newalbum->fetchRow();
+        if ($oldalbum->numRows() == 0) {
+          OC_Gallery_Photo::create($newalbum['album_id'], $params['newpath']);
+          return;
+        }
+        $oldalbum = $oldalbum->fetchRow();
+        $newAlbumId = $newalbum['album_id'];
+        $oldAlbumId = $oldalbum['album_id'];
 
+      }
+      OC_Gallery_Photo::changePath($oldAlbumId, $newAlbumId, $params['oldpath'], $params['newpath']);
     }
-    OC_Gallery_Photo::changePath($oldAlbumId, $newAlbumId, $params['oldpath'], $params['newpath']);
   }
 }
 
-- 
GitLab


From 868cf4629051c557312b63acbb3e6facd8f0f86e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Sat, 14 Jan 2012 14:22:30 +0100
Subject: [PATCH 250/546] improve import function

---
 apps/calendar/ajax/importdialog.php     |  13 +--
 apps/calendar/import.php                | 132 +++++++++++++++++++-----
 apps/calendar/import_tmp/Info           |   2 +
 apps/calendar/js/loader.js              |  43 ++++++--
 apps/calendar/templates/part.import.php |  19 +++-
 5 files changed, 161 insertions(+), 48 deletions(-)
 create mode 100644 apps/calendar/import_tmp/Info

diff --git a/apps/calendar/ajax/importdialog.php b/apps/calendar/ajax/importdialog.php
index 983a3d95a84..f6b8453fc22 100644
--- a/apps/calendar/ajax/importdialog.php
+++ b/apps/calendar/ajax/importdialog.php
@@ -1,20 +1,17 @@
 <?php
 /**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
  */
 
 require_once('../../../lib/base.php');
-
+OC_JSON::checkLoggedIn();
+OC_Util::checkAppEnabled('calendar');
 $l10n = new OC_L10N('calendar');
-
-if(!OC_USER::isLoggedIn()) {
-	die('<script type="text/javascript">document.location = oc_webroot;</script>');
-}
-OC_JSON::checkAppEnabled('calendar');
-
 $tmpl = new OC_Template('calendar', 'part.import');
+$tmpl->assign('path', $_POST['path']);
+$tmpl->assign('filename', $_POST['filename']);
 $tmpl->printpage();
 ?>
diff --git a/apps/calendar/import.php b/apps/calendar/import.php
index 759726b8d10..d1186e691e5 100644
--- a/apps/calendar/import.php
+++ b/apps/calendar/import.php
@@ -1,46 +1,122 @@
 <?php
 /**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
  */
-
+//check for calendar rights or create new one
+ob_start();
 require_once ('../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_Util::checkAppEnabled('calendar');
-
-if($_GET["import"] == "existing"){
-	$calid = $_GET["calid"];
-	$calendar = OC_Calendar_App::getCalendar($calid);
-	if($_GET["path"] != ""){
-		$filename = $_GET["path"] . "/" . $_GET["file"];
-	}else{
-		$filename = "/" . $_GET["file"];
-	}
-}else{
+$progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '10');
+	fclose($progressfopen);
+}
+$file = OC_Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']);
+if($_POST['method'] == 'new'){
 	$id = OC_Calendar_Calendar::addCalendar(OC_User::getUser(), $_POST['calname']);
 	OC_Calendar_Calendar::setCalendarActive($id, 1);
-	$calid = $id;
-	if($_POST["path"] != ""){
-		$filename = $_POST["path"] . "/" . $_POST["file"];
+}else{
+	$calendar = OC_Calendar_App::getCalendar($_POST['id']);
+	if($calendar['userid'] != OC_USER::getUser()){
+		OC_JSON::error();
+		exit();
+	}
+	$id = $_POST['id'];
+}
+//analyse the calendar file
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '20');
+	fclose($progressfopen);
+}
+$searchfor = array('VEVENT', 'VTODO', 'VJOURNAL');
+$parts = $searchfor;
+$filearr = explode('
+', $file);
+$inelement = false;
+$parts = array();
+$i = 0;
+foreach($filearr as $line){
+	foreach($searchfor as $search){
+		if(substr_count($line, $search) == 1){
+			list($attr, $val) = explode(':', $line);
+			if($attr == 'BEGIN'){
+				$parts[]['begin'] = $i;
+				$inelement = true;
+			}
+			if($attr == 'END'){
+				$parts[count($parts) - 1]['end'] = $i;
+				$inelement = false;
+			}
+		}
+	}
+	$i++;
+}
+//import the calendar
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '40');
+	fclose($progressfopen);
+}
+$start = '';
+$nl = '
+';
+for ($i = 0; $i < $parts[0]['begin']; $i++) { 
+	if($i == 0){
+		$start = $filearr[0];
 	}else{
-		$filename = "/" . $_POST["file"];
+		$start .= $nl . $filearr[$i];
 	}
 }
-$vcalendar = OC_Filesystem::file_get_contents($filename);
-$vcalendar = explode("BEGIN:VEVENT", $vcalendar);
-for($i = 1;$i < count($vcalendar);$i++){
-	$vcalendar[$i] = "BEGIN:VEVENT" . $vcalendar[$i];
+$end = '';
+for($i = $parts[count($parts) - 1]['end'] + 1;$i <= count($filearr) - 1; $i++){
+	if($i == $parts[count($parts) - 1]['end'] + 1){
+		$end = $filearr[$parts[count($parts) - 1]['end'] + 1];
+	}else{
+		$end .= $nl . $filearr[$i];
+	}
 }
-for($i = 1;$i < count($vcalendar) - 1;$i++){
-	$vcalendar[$i] = $vcalendar[$i] . "END:VCALENDAR";
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '50');
+	fclose($progressfopen);
+}
+$importready = array();
+foreach($parts as $part){
+	for($i = $part['begin']; $i <= $part['end'];$i++){
+		if($i == $part['begin']){
+			$content = $filearr[$i];
+		}else{
+			$content .= $nl . $filearr[$i];
+		}
+	}
+	$importready[] = $start . $nl . $content . $nl . $end;
+}
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '70');
+	fclose($progressfopen);
+}
+if(count($parts) == 1){
+	OC_Calendar_Object::add($id, $file);
+}else{
+	foreach($importready as $import){
+		OC_Calendar_Object::add($id, $import);
+	}
 }
-for($i = 1;$i < count($vcalendar);$i++){
-	$vcalendar[$i] = $vcalendar[0] . $vcalendar[$i];
+//done the import
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '100');
+	fclose($progressfopen);
 }
-for($i = 1;$i < count($vcalendar);$i++){
-	OC_Calendar_Object::add($calid, $vcalendar[$i]);
+sleep(3);
+if(is_writable('import_tmp/')){
+	unlink($progressfile);
 }
-OC_JSON::success();
-?>
+OC_JSON::success();
\ No newline at end of file
diff --git a/apps/calendar/import_tmp/Info b/apps/calendar/import_tmp/Info
new file mode 100644
index 00000000000..abafbce435c
--- /dev/null
+++ b/apps/calendar/import_tmp/Info
@@ -0,0 +1,2 @@
+This folder contains static files with the percentage of the import.
+Requires write permission
diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
index 50a7b082d98..4e483f9864e 100644
--- a/apps/calendar/js/loader.js
+++ b/apps/calendar/js/loader.js
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
 Calendar_Import={
 	importdialog: function(filename){
 		var path = $('#dir').val();
@@ -5,23 +11,31 @@ Calendar_Import={
 		$('#calendar_import').load(OC.filePath('calendar', 'ajax', 'importdialog.php'), {filename:filename, path:path},	function(){Calendar_Import.initdialog(filename);});
 	},
 	initdialog: function(filename){
-		$("#calendar_import_dialog").dialog({
+		$('#calendar_import_dialog').dialog({
 			width : 500,
 			close : function() {
 				$(this).dialog('destroy').remove();
-				$("#calendar_import").remove();
+				$('#calendar_import').remove();
 			}
 		});
-		$('#progressbar').progressbar({value: 87});
+		$('#import_done_button').click(function(){
+			$('#calendar_import_dialog').dialog('destroy').remove();
+			$('#calendar_import').remove();
+		});
+		$('#progressbar').progressbar({value: 0});
 		$('#startimport').click(function(){
 			var filename = $('#filename').val();
 			var path = $('#path').val();
+			var calid = $('#calendar option:selected').val();
 			if($('#calendar option:selected').val() == 'newcal'){
 				var method = 'new';
 				var calname = $('#newcalendar').val();
 				var calname = $.trim(calname);
 				if(calname == ''){
 					$('#newcalendar').css('background-color', '#FF2626');
+					$('#newcalendar').focus(function(){
+						$('#newcalendar').css('background-color', '#F8F8F8');
+					});
 					return false;
 				}
 			}else{
@@ -29,8 +43,16 @@ Calendar_Import={
 			}
 			$('#newcalendar').attr('readonly', 'readonly');
 			$('#calendar').attr('disabled', 'disabled');
-			$.post(OC.filePath('calendar', '', 'import.php'), {'method':method, 'calname':calname, 'path':path, 'file':filename}, function(){});
-			$('#progressbar').slideDown('slow');
+			var progressfile = $('#progressfile').val();
+			$.post(OC.filePath('calendar', '', 'import.php'), {method: String (method), calname: String (calname), path: String (path), file: String (filename), id: String (calid)}, function(data){
+				if(data.status == 'success'){
+					$('#progressbar').progressbar('option', 'value', 100);
+					$('#import_done').css('display', 'block');
+				}
+			});
+			$('#form_container').css('display', 'none');
+			$('#progressbar_container').css('display', 'block');
+			window.setTimeout('Calendar_Import.getimportstatus(\'' + progressfile + '\')', 500);
 		});
 		$('#calendar').change(function(){
 			if($('#calendar option:selected').val() == 'newcal'){
@@ -40,8 +62,15 @@ Calendar_Import={
 			}
 		});
 	},
-	getimportstatus: function(){
-		
+	getimportstatus: function(progressfile){
+		$.get(OC.filePath('calendar', 'import_tmp', progressfile), function(percent){
+			$('#progressbar').progressbar('option', 'value', parseInt(percent));
+			if(percent < 100){
+				window.setTimeout('Calendar_Import.getimportstatus(\'' + progressfile + '\')', 500);
+			}else{
+				$('#import_done').css('display', 'block');
+			}
+		});
 	}
 }
 $(document).ready(function(){
diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php
index 13685cfb273..8f46484b42b 100644
--- a/apps/calendar/templates/part.import.php
+++ b/apps/calendar/templates/part.import.php
@@ -1,7 +1,9 @@
 <div id="calendar_import_dialog" title="<?php echo $l->t("Import a calendar file"); ?>">
-<input type="hidden" id="filename" value="<?php echo $_GET["filename"];?>">
-<input type="hidden" id="path" value="<?php echo $_GET["path"];?>">
-<p style="text-align:center;"><b><?php echo $l->t('Please choose the calendar'); ?></b></h2>
+<div id="form_container">
+<input type="hidden" id="filename" value="<?php echo $_['filename'];?>">
+<input type="hidden" id="path" value="<?php echo $_['path'];?>">
+<input type="hidden" id="progressfile" value="<?php echo md5(session_id()) . '.txt';?>">
+<p style="text-align:center;"><b><?php echo $l->t('Please choose the calendar'); ?></b>
 <select style="width:100%;" id="calendar" name="calendar">
 <?php
 $calendar_options = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
@@ -13,6 +15,13 @@ echo html_select_options($calendar_options, $calendar_options[0]['id'], array('v
 	<input type="text" style="width: 97%;" placeholder="<?php echo $l->t('Name of new calendar'); ?>" id="newcalendar" name="newcalendar">
 </div>
 <input type="button" value="<?php echo $l->t("Import");?>!" id="startimport">
-<br><br>
-<div id="progressbar" style="display: none;"></div>
+</div>
+<div id="progressbar_container" style="display: none">
+<p style="text-align:center;"><b><?php echo $l->t('Importing calendar'); ?></b>
+<div id="progressbar"></div>
+<div id="import_done" style="display: none;">
+<p style="text-align:center;"><b><?php echo $l->t('Calendar imported successfully'); ?></b></p>
+<input type="button" value="<?php echo $l->t('Close Dialog'); ?>" id="import_done_button">
+</div>
+</div>
 </div>
\ No newline at end of file
-- 
GitLab


From e0dc8b8ab2c1803357e6bd4fbb477effe5d4c599 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 14 Jan 2012 14:59:18 +0100
Subject: [PATCH 251/546] handle gallery remove when removing dir via
 webinterface

---
 apps/gallery/lib/album.php          | 7 +++++++
 apps/gallery/lib/hooks_handlers.php | 7 +++++--
 apps/gallery/lib/photo.php          | 5 +++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index a708ba83ea4..6adff196071 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -42,6 +42,13 @@ class OC_Gallery_Album {
 		$stmt = OC_DB::prepare($sql);
 		return $stmt->execute($args);
 	}
+
+  public static function removeByPath($path, $owner) {
+    $album = self::find($owner, null, $path);
+    $album = $album->fetchRow();
+    self::remove($owner, $album['album_name']);
+    OC_Gallery_Photo::removeByAlbumId($album['album_id']);
+  }
 	
   public static function find($owner, $name=null, $path=null){
 		$sql = 'SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner = ?';
diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
index ee17c0df7df..534f76896d7 100644
--- a/apps/gallery/lib/hooks_handlers.php
+++ b/apps/gallery/lib/hooks_handlers.php
@@ -83,8 +83,11 @@ class OC_Gallery_Hooks_Handlers {
 
   public static function removePhoto($params) {
     $path = $params['path'];
-    if (!self::isPhoto($path)) return;
-    OC_Gallery_Photo::removeByPath($path);
+    if (OC_Filesystem::is_dir($path) && self::directoryContainsPhotos($path)) {
+      OC_Gallery_Album::removeByPath($path, OC_User::getUser());
+    } elseif (self::isPhoto($path)) {
+      OC_Gallery_Photo::removeByPath($path);
+    }
   }
 
   public static function renamePhoto($params) {
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index 23887098e0f..14b0c4b2a07 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -56,6 +56,11 @@ class OC_Gallery_Photo{
     $stmt->execute(array($id));
   }
 
+  public static function removeByAlbumId($albumid) {
+    $stmt = OC_DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE album_id = ?');
+    $stmt->execute(array($albumid));
+  }
+
   public static function changePath($oldAlbumId, $newAlbumId, $oldpath, $newpath) {
     $stmt = OC_DB::prepare("UPDATE *PREFIX*gallery_photos SET file_path = ?, album_id = ? WHERE album_id = ? and file_path = ?");
     $stmt->execute(array($newpath, $newAlbumId, $oldAlbumId, $oldpath));
-- 
GitLab


From 34a47840778240612a2c970cf0de89827794fe2d Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Sat, 14 Jan 2012 15:41:02 +0100
Subject: [PATCH 252/546] =?UTF-8?q?don=C2=B4t=20show=20warnings=20for=20mi?=
 =?UTF-8?q?ssing=20language=20name=20definitions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings/personal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 settings/personal.php

diff --git a/settings/personal.php b/settings/personal.php
old mode 100644
new mode 100755
index c27ca0aed63..7035f1b07d4
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -31,7 +31,7 @@ array_unshift($languageCodes,$lang);
 $languageNames=include 'languageCodes.php';
 $languages=array();
 foreach($languageCodes as $lang){
-	$languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]);
+	$languages[]=array('code'=>$lang,'name'=>@$languageNames[$lang]);
 }
 
 // Return template
-- 
GitLab


From e979aa0c323481c68c0328f4ec0d790583be3e47 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sat, 14 Jan 2012 15:36:57 +0000
Subject: [PATCH 253/546] fix editor js

---
 apps/files_texteditor/js/editor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 54f781cd9b3..72e4c0e4c41 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -58,7 +58,7 @@ function showControls(filename,writeperms){
 	// Loads the control bar at the top.
 	$('.actions,#file_action_panel').fadeOut('slow').promise().done(function() {
 		// Load the new toolbar.
-		var savebtnhtml;
+		var editorcontrols;
 		if(writeperms=="true"){
 			var editorcontrols = '<button id="editor_save">'+t('files_texteditor','Save')+'</button><div class="separator"></div><label for="gotolineval">Go to line:</label><input type="text" id="gotolineval"><div class="separator"></div>';
 		}
@@ -181,7 +181,7 @@ function showFileEditor(dir,filename){
 					result = jQuery.parseJSON(data.responseText);
 					if(result.status == 'success'){
 						// Save mtime
-						$('#editor').attr('data-mtime', result.data.mtime);
+						$('#editor').attr('data-mtime', result.data.mtime);	
 						// Initialise the editor
 						showControls(filename,result.data.write);
 						$('table').fadeOut('slow', function() {
-- 
GitLab


From bfdbcbee127062d1e9415047617370e424ab9631 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sat, 14 Jan 2012 15:45:19 +0000
Subject: [PATCH 254/546] Fix breadcrumb issue when closing editor

---
 apps/files_texteditor/js/editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 72e4c0e4c41..b36a3a692cd 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -216,7 +216,7 @@ function showFileEditor(dir,filename){
 // Fades out the editor.
 function hideFileEditor(){
 	// Fades out editor controls
-	$('#controls > :not(.actions,#file_access_panel),#breadcrumb_file').fadeOut('slow',function(){
+	$('#controls > :not(.actions,#file_access_panel,.crumb),#breadcrumb_file').fadeOut('slow',function(){
 		$(this).remove();
 	});
 	// Fade out editor
-- 
GitLab


From 5c179e6255141f33eae6a1520651bec0131127fb Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 14 Jan 2012 18:10:22 +0100
Subject: [PATCH 255/546] fix another warning in pgsql

---
 3rdparty/MDB2/Driver/Manager/pgsql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty/MDB2/Driver/Manager/pgsql.php b/3rdparty/MDB2/Driver/Manager/pgsql.php
index 7542e9e8329..a2e80caa5ce 100644
--- a/3rdparty/MDB2/Driver/Manager/pgsql.php
+++ b/3rdparty/MDB2/Driver/Manager/pgsql.php
@@ -633,7 +633,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function listTables($database = null)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
-- 
GitLab


From 469a80ac09d3dac7674c0dae9a7bb3d2e6aed0b6 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 14 Jan 2012 18:11:21 +0100
Subject: [PATCH 256/546] fix some sqlite2 upgrade issues

---
 3rdparty/MDB2/Driver/Manager/sqlite.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/3rdparty/MDB2/Driver/Manager/sqlite.php b/3rdparty/MDB2/Driver/Manager/sqlite.php
index 650910174e7..1b7239876f1 100644
--- a/3rdparty/MDB2/Driver/Manager/sqlite.php
+++ b/3rdparty/MDB2/Driver/Manager/sqlite.php
@@ -600,7 +600,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
         }
         $constraints = array_flip($constraints);
         foreach ($constraints as $constraint => $value) {
-            if (!empty($definition['primary'])) {
+			if (!empty($definition['primary'])) {
                 if (!array_key_exists('primary', $options)) {
                     $options['primary'] = $definition['fields'];
                     //remove from the $constraint array, it's already handled by createTable()
@@ -682,7 +682,9 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
         }
 
         foreach ($constraints as $constraint => $definition) {
-            $this->createConstraint($name_new, $constraint, $definition);
+			if(empty($definition['primary']) and empty($definition['foreign'])){
+				$this->createConstraint($name_new, $constraint, $definition);
+			}
         }
 
         if (!empty($select_fields) && !empty($data)) {
-- 
GitLab


From f4ce399162b2708fd72ea21be9d1f8dc8da15217 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 14 Jan 2012 21:13:46 +0100
Subject: [PATCH 257/546] fix issue with moving music files

---
 lib/files.php | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/files.php b/lib/files.php
index 88b559059f0..9ae5320ad1d 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -183,8 +183,8 @@ class OC_Files {
 	*/
 	public static function move($sourceDir,$source,$targetDir,$target){
 		if(OC_User::isLoggedIn()){
-			$targetFile=$targetDir.'/'.$target;
-			$sourceFile=$sourceDir.'/'.$source;
+			$targetFile=self::normalizePath($targetDir.'/'.$target);
+			$sourceFile=self::normalizePath($sourceDir.'/'.$source);
 			return OC_Filesystem::rename($sourceFile,$targetFile);
 		}
 	}
@@ -305,4 +305,19 @@ class OC_Files {
 		$content.= "Options -Indexes\n";
 		@file_put_contents(OC::$SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it
 	}
+
+	/**
+	 * normalize a path, removing any double, add leading /, etc
+	 * @param string $path
+	 * @return string
+	 */
+	static public function normalizePath($path){
+		$path='/'.$path;
+		$old='';
+		while($old!=$path){//replace any multiplicity of slashes with a single one
+			$old=$path;
+			$path=str_replace('//','/',$path);
+		}
+		return $path;
+	}
 }
-- 
GitLab


From 4cc68eac6d132f31782800efc4b8742ad7a72598 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 14 Jan 2012 21:38:33 +0100
Subject: [PATCH 258/546] make pdf viewer work a bit better with the rest of
 owncloud

---
 apps/files_pdfviewer/appinfo/app.php |  2 --
 apps/files_pdfviewer/js/pdfview.js   | 25 +++++++++++++++++++++++++
 apps/files_pdfviewer/js/viewer.js    | 21 +++++++++++++++++----
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/apps/files_pdfviewer/appinfo/app.php b/apps/files_pdfviewer/appinfo/app.php
index a446b4caa41..0f0b40764d9 100755
--- a/apps/files_pdfviewer/appinfo/app.php
+++ b/apps/files_pdfviewer/appinfo/app.php
@@ -1,7 +1,5 @@
 <?php
 //load the required files
-//OC_Util::addStyle( 'files_texteditor', 'style' );
-//OC_Util::addScript( 'files_texteditor', 'editor');
 OC_Util::addScript( 'files_pdfviewer', 'viewer');
 OC_Util::addStyle( 'files_pdfviewer', 'viewer');
 OC_Util::addScript( 'files_pdfviewer', 'pdfjs/build/pdf');
diff --git a/apps/files_pdfviewer/js/pdfview.js b/apps/files_pdfviewer/js/pdfview.js
index 5e546fd5580..51f6e169f72 100755
--- a/apps/files_pdfviewer/js/pdfview.js
+++ b/apps/files_pdfviewer/js/pdfview.js
@@ -31,6 +31,7 @@ var cache = new Cache(kCacheSize);
 var currentPageNumber = 1;
 
 var PDFView = {
+  active: false,
   pages: [],
   thumbnails: [],
   currentScale: kDefaultScale,
@@ -146,6 +147,9 @@ var PDFView = {
 
   navigateTo: function pdfViewNavigateTo(dest) {
     if (typeof dest === 'string')
+		if(!this.destinations || ! this.destinations[dest]){
+			return; // invalid destination
+		}
       dest = this.destinations[dest];
     if (!(dest instanceof Array))
       return; // invalid destination
@@ -628,10 +632,16 @@ function updateViewarea() {
 }
 
 window.addEventListener('scroll', function webViewerScroll(evt) {
+	if(!PDFView.active){
+		return;
+	}
   updateViewarea();
 }, true);
 
 window.addEventListener('resize', function webViewerResize(evt) {
+	if(!PDFView.active){
+		return;
+	}
   if (document.getElementById('pageWidthOption').selected ||
       document.getElementById('pageFitOption').selected)
       PDFView.parseScale(document.getElementById('scaleSelect').value);
@@ -639,10 +649,16 @@ window.addEventListener('resize', function webViewerResize(evt) {
 });
 
 window.addEventListener('hashchange', function webViewerHashchange(evt) {
+	if(!PDFView.active){
+		return;
+	}
   PDFView.setHash(document.location.hash.substring(1));
 });
 
 window.addEventListener('change', function webViewerChange(evt) {
+	if(!PDFView.active){
+		return;
+	}
   var files = evt.target.files;
   if (!files || files.length == 0)
     return;
@@ -671,6 +687,9 @@ window.addEventListener('change', function webViewerChange(evt) {
 }, true);
 
 window.addEventListener('scalechange', function scalechange(evt) {
+	if(!PDFView.active){
+		return;
+	}
   var customScaleOption = document.getElementById('customScaleOption');
   customScaleOption.selected = false;
 
@@ -703,6 +722,9 @@ window.addEventListener('scalechange', function scalechange(evt) {
 }, true);
 
 window.addEventListener('pagechange', function pagechange(evt) {
+	if(!PDFView.active){
+		return;
+	}
   var page = evt.pageNumber;
   if (document.getElementById('pageNumber').value != page)
     document.getElementById('pageNumber').value = page;
@@ -711,6 +733,9 @@ window.addEventListener('pagechange', function pagechange(evt) {
 }, true);
 
 window.addEventListener('keydown', function keydown(evt) {
+	if(!PDFView.active){
+		return;
+	}
   var curElement = document.activeElement;
   var controlsElement = document.getElementById('controls2');
   while (curElement) {
diff --git a/apps/files_pdfviewer/js/viewer.js b/apps/files_pdfviewer/js/viewer.js
index 314a08b27e6..03288ebe420 100755
--- a/apps/files_pdfviewer/js/viewer.js
+++ b/apps/files_pdfviewer/js/viewer.js
@@ -5,6 +5,7 @@ function hidePDFviewer() {
 	$("#viewer").remove();
 	$("#loading").remove()
 	document.title = showPDFviewer.lastTitle;
+	PDFView.active=false;
 }
 
 function showPDFviewer(dir,filename){
@@ -21,8 +22,21 @@ function showPDFviewer(dir,filename){
 		var oldcontent = $("#content").html();
 		$("#content").html(oldcontent+'<div id="loading">Loading... 0%</div><div id="viewer"></div>');
 		showPDFviewer.lastTitle = document.title;
-		PDFView.Ptitle = filename;
-		PDFView.open(url,1.00);
+		if(!showPDFviewer.loaded){
+			OC.addScript( 'files_pdfviewer', 'pdfjs/build/pdf',function(){
+				OC.addScript( 'files_pdfviewer', 'pdfview',function(){
+					showPDFviewer.loaded=true;
+					PDFJS.workerSrc = OC.filePath('files_pdfviewer','js','pdfjs/build/pdf.js');
+					PDFView.Ptitle = filename;
+					PDFView.open(url,1.00);
+					PDFView.active=true;
+				});
+			});
+		}else{
+			PDFView.Ptitle = filename;
+			PDFView.open(url,1.00);
+			PDFView.active=true;
+		}
 		$("#pageWidthOption").attr("selected","selected");
 		showPDFviewer.shown = true;
 	}
@@ -30,8 +44,7 @@ function showPDFviewer(dir,filename){
 showPDFviewer.shown=false;
 showPDFviewer.oldCode='';
 showPDFviewer.lastTitle='';
-
-var extrahtml = '<li id="extra" style="display:none;"><a title="" href="'+OC.webroot+"/apps/files_pdfviewer/lastopened.php"+'" style="background-image:url(/owncloud/apps/files_pdfviewer/css/history.png)">Last opened</a></li>';
+showPDFviewer.loaded=false;
 
 $(document).ready(function(){
 	if(location.href.indexOf("files")!=-1) {
-- 
GitLab


From 352d73f1e077c2687be15fe1fab409d9a2283dae Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 14 Jan 2012 21:58:16 +0100
Subject: [PATCH 259/546] some minor changes to the text editor loading

---
 apps/files_texteditor/js/editor.js | 65 +++++++++++++++---------------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index b36a3a692cd..cb1af3dd6db 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -174,41 +174,40 @@ function giveEditorFocus(){
 function showFileEditor(dir,filename){
 	if(!editorIsShown()){
 		// Loads the file editor and display it.
-		var data = $.ajax({
-				url: OC.filePath('files_texteditor','ajax','loadfile.php'),
-				data: 'file='+encodeURIComponent(filename)+'&dir='+encodeURIComponent(dir),
-				complete: function(data){
-					result = jQuery.parseJSON(data.responseText);
-					if(result.status == 'success'){
-						// Save mtime
-						$('#editor').attr('data-mtime', result.data.mtime);	
-						// Initialise the editor
-						showControls(filename,result.data.write);
-						$('table').fadeOut('slow', function() {
-							// Update document title
-							document.title = filename;
-							$('#editor').text(result.data.filecontents);
-							$('#editor').attr('data-dir', dir);
-							$('#editor').attr('data-filename', filename);
-							window.aceEditor = ace.edit("editor");  
-							aceEditor.setShowPrintMargin(false);
-							if(result.data.write=='false'){
-								aceEditor.setReadOnly(true);	
-							}
-							setEditorSize();
-							setSyntaxMode(getFileExtension(filename));
-							OC.addScript('files_texteditor','aceeditor/theme-clouds', function(){
-								window.aceEditor.setTheme("ace/theme/clouds");
-							});
+		var data = $.getJSON(
+			OC.filePath('files_texteditor','ajax','loadfile.php'),
+			{file:filename,dir:dir},
+			function(result){
+				if(result.status == 'success'){
+					// Save mtime
+					$('#editor').attr('data-mtime', result.data.mtime);
+					// Initialise the editor
+					showControls(filename,result.data.write);
+					$('table').fadeOut('slow', function() {
+						// Update document title
+						document.title = filename;
+						$('#editor').text(result.data.filecontents);
+						$('#editor').attr('data-dir', dir);
+						$('#editor').attr('data-filename', filename);
+						window.aceEditor = ace.edit("editor");
+						aceEditor.setShowPrintMargin(false);
+						if(result.data.write=='false'){
+							aceEditor.setReadOnly(true);
+						}
+						setEditorSize();
+						setSyntaxMode(getFileExtension(filename));
+						OC.addScript('files_texteditor','aceeditor/theme-clouds', function(){
+							window.aceEditor.setTheme("ace/theme/clouds");
 						});
-					} else {
-						// Failed to get the file.
-						alert(result.data.message);	
-					}
-				// End success
+					});
+				} else {
+					// Failed to get the file.
+					alert(result.data.message);
 				}
-				// End ajax
-				});
+			// End success
+			}
+		// End ajax
+		);
 		is_editor_shown = true;
 	}
 }
-- 
GitLab


From 36a2649e371093eb9961c5ee95fd75ded98c9394 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 14 Jan 2012 22:02:26 +0100
Subject: [PATCH 260/546] use admin icon for log menu enty untill we have a
 proper icon

---
 lib/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/app.php b/lib/app.php
index de7d82ce959..3cf00464d37 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -232,7 +232,7 @@ class OC_App{
 				// admin apps menu
 				$settings[] = array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "settings", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" ));
 				// admin log menu
-				$settings[] = array( "id" => "core_log", "order" => 4, "href" => OC_Helper::linkTo( "settings", "log.php" ), "name" => $l->t("Log"), "icon" => OC_Helper::imagePath( "settings", "log.svg" ));
+				$settings[] = array( "id" => "core_log", "order" => 4, "href" => OC_Helper::linkTo( "settings", "log.php" ), "name" => $l->t("Log"), "icon" => OC_Helper::imagePath( "settings", "admin.svg" ));
 
 				$settings[]=array( "id" => "admin", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "admin.php" ), "name" => $l->t("Admin"), "icon" => OC_Helper::imagePath( "settings", "admin.svg" ));
 			}
-- 
GitLab


From 0615d096cea5af65291f040bb287e45ea1b0d02c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 14 Jan 2012 22:25:07 +0100
Subject: [PATCH 261/546] make pdf viewer work with text editor

---
 apps/files_pdfviewer/js/viewer.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/files_pdfviewer/js/viewer.js b/apps/files_pdfviewer/js/viewer.js
index 03288ebe420..7f6766c67dd 100755
--- a/apps/files_pdfviewer/js/viewer.js
+++ b/apps/files_pdfviewer/js/viewer.js
@@ -4,8 +4,10 @@ function hidePDFviewer() {
 	$('#controls').html(showPDFviewer.oldcode);
 	$("#viewer").remove();
 	$("#loading").remove()
+	$("#editor").show();
 	document.title = showPDFviewer.lastTitle;
 	PDFView.active=false;
+	$('iframe').remove();
 }
 
 function showPDFviewer(dir,filename){
-- 
GitLab


From b10668638250196b5d86865e68606f6d1d24fc22 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 14 Jan 2012 22:27:20 +0100
Subject: [PATCH 262/546] remove ununsed copy-paste leftovers

---
 apps/files_pdfviewer/css/style.css | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100755 apps/files_pdfviewer/css/style.css

diff --git a/apps/files_pdfviewer/css/style.css b/apps/files_pdfviewer/css/style.css
deleted file mode 100755
index 9ad6eeaa814..00000000000
--- a/apps/files_pdfviewer/css/style.css
+++ /dev/null
@@ -1,27 +0,0 @@
-#editor{
-	position: absoloute;
-	display: block;
-	top: 80px;
-	left: 160px;
-}
-#editorwrapper{
-	position: absoloute;
-	height: 0;
-	width: 0;
-	top: 41px;
-	left: 160px;
-	display: none;
-}
-#editor_close{
-	margin-left: auto;
-	margin-right: 167px;	
-	display: block;
-}
-#editor_save{
-	margin-left: 7px;
-	float: left;	
-}
-#saving_icon{
-	margin-top: 3px;
-	float: left;	
-}
\ No newline at end of file
-- 
GitLab


From 5eb6071b049bf67ebbbcd99c3424f4635134b864 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 14 Jan 2012 22:38:00 +0100
Subject: [PATCH 263/546] make the minimum width of the multiselect
 configurable

---
 core/css/multiselect.css |  1 +
 core/js/multiselect.js   | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index ee426351769..1202ea18427 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -1,4 +1,5 @@
 ul.multiselectoptions { z-index:49; position:absolute; background-color:#fff; padding-top:.5em; border:1px solid #ddd; border-top:none; -moz-border-radius-bottomleft:.5em; -webkit-border-bottom-left-radius:.5em; border-bottom-left-radius:.5em; -moz-border-radius-bottomright:.5em; -webkit-border-bottom-right-radius:.5em; border-bottom-right-radius:.5em; -moz-box-shadow:0 1px 1px #ddd; -webkit-box-shadow:0 1px 1px #ddd; box-shadow:0 1px 1px #ddd; }
+ul.multiselectoptions>li{ white-space:nowrap; overflow: hidden; }
 div.multiselect { padding-right:.6em; display:inline; position:relative; display:inline-block; vertical-align: bottom; }
 div.multiselect.active { background-color:#fff; border-bottom:none; border-bottom-left-radius:0; border-bottom-right-radius:0; z-index:50; position:relative }
 div.multiselect>span:first-child { margin-right:2em; float:left; }
diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 26380824047..610e9193bb7 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -9,23 +9,26 @@
 			'checked':[],
 			'oncheck':false,
 			'onuncheck':false,
+			'minWidth': 'default;',
 		};
-		$.extend(settings,options);			
+		$.extend(settings,options);
 		var button=$('<div class="multiselect button"><span>'+settings.title+'</span><span>â–¾</span></div>');
-		if(settings.checked.length>0){
-			button.children('span').first().text(settings.checked.join(', '));
-		}
 		var span=$('<span/>');
 		span.append(button);
 		button.data('id',multiSelectId);
 		button.selectedItems=[];
 		this.hide();
 		this.before(span);
-		settings.minWidth=button.width();
+		if(settings.minWidth=='default'){
+			settings.minWidth=button.width();
+		}
 		button.css('min-width',settings.minWidth);
 		settings.minOuterWidth=button.outerWidth()-2;
 		button.data('settings',settings);
-		
+		if(settings.checked.length>0){
+			button.children('span').first().text(settings.checked.join(', '));
+		}
+
 		button.click(function(event){
 			var button=$(this);
 			if(button.parent().children('ul').length>0){
@@ -83,13 +86,14 @@
 					}
 					var newOuterWidth=Math.max((button.outerWidth()-2),settings.minOuterWidth)+'px';
 					var newWidth=Math.max(button.width(),settings.minWidth);
+					var pos=button.position();
 					button.css('height',button.height());
 					button.css('white-space','nowrap');
 					button.css('width',oldWidth);
 					button.animate({'width':newWidth},undefined,undefined,function(){
 						button.css('width','');
 					});
-					list.animate({'width':newOuterWidth});
+					list.animate({'width':newOuterWidth,'left':pos.left+3});
 				});
 				var li=$('<li></li>');
 				li.append(input).append(label);
-- 
GitLab


From 2d25bb3b0104ca9150fbf316517f686fa89729a3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 14 Jan 2012 23:10:38 +0100
Subject: [PATCH 264/546] add min width to multiselect in user management

---
 settings/js/users.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index 79b4e80870a..b45038e5b04 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -30,9 +30,10 @@ $(document).ready(function(){
 		}
 		element.multiSelect({
 			createText:'add group',
-			 checked:checked,
-			 oncheck:checkHandeler,
-			 onuncheck:checkHandeler
+			checked:checked,
+			oncheck:checkHandeler,
+			onuncheck:checkHandeler,
+			minWidth: 100,
 		});
 	}
 	$('select[multiple]').each(function(index,element){
-- 
GitLab


From ef69abd4dc696305474e45d7cd2661dcb51bdb8a Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 14 Jan 2012 23:12:32 +0100
Subject: [PATCH 265/546] constans for signals handling

---
 apps/gallery/lib/hooks_handlers.php |  34 ++++----
 lib/filesystem.php                  | 125 +++++++++++++++++++++++-----
 2 files changed, 124 insertions(+), 35 deletions(-)

diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
index 534f76896d7..7248e67f0a2 100644
--- a/apps/gallery/lib/hooks_handlers.php
+++ b/apps/gallery/lib/hooks_handlers.php
@@ -21,9 +21,9 @@
 * 
 */
 
-OC_Hook::connect("OC_Filesystem", "post_write", "OC_Gallery_Hooks_Handlers", "addPhotoFromPath");
-OC_Hook::connect("OC_Filesystem", "delete", "OC_Gallery_Hooks_Handlers", "removePhoto");
-OC_Hook::connect("OC_Filesystem", "post_rename", "OC_Gallery_Hooks_Handlers", "renamePhoto");
+OC_Hook::connect(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, "OC_Gallery_Hooks_Handlers", "addPhotoFromPath");
+OC_Hook::connect(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_delete, "OC_Gallery_Hooks_Handlers", "removePhoto");
+OC_Hook::connect(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_rename, "OC_Gallery_Hooks_Handlers", "renamePhoto");
 
 require_once(OC::$CLASSPATH['OC_Gallery_Album']);
 require_once(OC::$CLASSPATH['OC_Gallery_Photo']);
@@ -61,8 +61,10 @@ class OC_Gallery_Hooks_Handlers {
   }
 
   public static function addPhotoFromPath($params) {
-    if (!self::isPhoto($params['path'])) return;
-    $fullpath = $params['path'];
+    $fullpath = $params[OC_Filesystem::signal_param_path];
+
+    if (!self::isPhoto($fullpath)) return;
+
     OC_Log::write(self::$APP_TAG, 'Adding file with path '. $fullpath, OC_Log::DEBUG);
     $path = substr($fullpath, 0, strrpos($fullpath, '/'));
     if ($path == '') $path = '/';
@@ -82,7 +84,7 @@ class OC_Gallery_Hooks_Handlers {
   }
 
   public static function removePhoto($params) {
-    $path = $params['path'];
+    $path = $params[OC_Filesystem::signal_param_path];
     if (OC_Filesystem::is_dir($path) && self::directoryContainsPhotos($path)) {
       OC_Gallery_Album::removeByPath($path, OC_User::getUser());
     } elseif (self::isPhoto($path)) {
@@ -91,15 +93,17 @@ class OC_Gallery_Hooks_Handlers {
   }
 
   public static function renamePhoto($params) {
-    if (OC_Filesystem::is_dir($params['newpath']) && self::directoryContainsPhotos($params['newpath'])) {
-      OC_Gallery_Album::changePath($params['oldpath'], $params['newpath'], OC_User::getUser());
-    } elseif (!self::isPhoto($params['newpath'])) {
-      $olddir = substr($params['oldpath'], 0, strrpos($params['oldpath'], '/'));
-      $newdir = substr($params['newpath'], 0, strrpos($params['newpath'], '/'));
+    $oldpath = $params[OC_Filesystem::signal_param_oldpath];
+    $newpath = $params[OC_Filesystem::signal_param_newpath];
+    if (OC_Filesystem::is_dir($newpath) && self::directoryContainsPhotos($newpath)) {
+      OC_Gallery_Album::changePath($oldpath, $newpath, OC_User::getUser());
+    } elseif (!self::isPhoto($newpath)) {
+      $olddir = substr($oldpath, 0, strrpos($oldpath, '/'));
+      $newdir = substr($newpath, 0, strrpos($newpath, '/'));
       if ($olddir == '') $olddir = '/';
       if ($newdir == '') $newdir = '/';
-      if (!self::isPhoto($params['newpath'])) return;
-      OC_Log::write(self::$APP_TAG, 'Moving photo from '.$params['oldpath'].' to '.$params['newpath'], OC_Log::DEBUG);
+      if (!self::isPhoto($newpath)) return;
+      OC_Log::write(self::$APP_TAG, 'Moving photo from '.$oldpath.' to '.$newpath, OC_Log::DEBUG);
       $album;
       $newAlbumId;
       $oldAlbumId;
@@ -120,7 +124,7 @@ class OC_Gallery_Hooks_Handlers {
         }
         $newalbum = $newalbum->fetchRow();
         if ($oldalbum->numRows() == 0) {
-          OC_Gallery_Photo::create($newalbum['album_id'], $params['newpath']);
+          OC_Gallery_Photo::create($newalbum['album_id'], $newpath);
           return;
         }
         $oldalbum = $oldalbum->fetchRow();
@@ -128,7 +132,7 @@ class OC_Gallery_Hooks_Handlers {
         $oldAlbumId = $oldalbum['album_id'];
 
       }
-      OC_Gallery_Photo::changePath($oldAlbumId, $newAlbumId, $params['oldpath'], $params['newpath']);
+      OC_Gallery_Photo::changePath($oldAlbumId, $newAlbumId, $oldpath, $newpath);
     }
   }
 }
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 44401260c5e..fd0ac3b6215 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -47,8 +47,93 @@ class OC_Filesystem{
 	static private $mounts=array();
 	static private $fakeRoot='';
 	static private $storageTypes=array();
+
+  /**
+   * classname which used for hooks handling
+   * used as signalclass in OC_Hooks::emit()
+   */
+  const CLASSNAME = 'OC_Filesystem';
+
+  /**
+   * signalname emited before file renaming
+   * @param oldpath
+   * @param newpath
+   */
+  const signal_rename = 'rename';
+
+  /**
+   * signal emited after file renaming
+   * @param oldpath
+   * @param newpath
+   */
+  const signal_post_rename = 'post_rename';
 	
+  /**
+   * signal emited before file/dir creation
+   * @param path
+   * @param run changing this flag to false in hook handler will cancel event
+   */
+  const signal_create = 'create';
+
+  /**
+   * signal emited after file/dir creation
+   * @param path
+   * @param run changing this flag to false in hook handler will cancel event
+   */
+  const signal_post_create = 'post_create';
+
+  /**
+   * signal emits before file/dir copy
+   * @param oldpath
+   * @param newpath
+   * @param run changing this flag to false in hook handler will cancel event
+   */
+  const signal_copy = 'copy';
+
+  /**
+   * signal emits after file/dir copy
+   * @param oldpath
+   * @param newpath
+   */
+  const signal_post_copy = 'post_copy';
+
+  /**
+   * signal emits before file/dir save
+   * @param path
+   * @param run changing this flag to false in hook handler will cancel event
+   */
+  const signal_write = 'write';
+
+  /**
+   * signal emits after file/dir save
+   * @param path
+   */
+  const signal_post_write = 'post_write';
 	
+  /**
+   * signal emits when reading file/dir
+   * @param path
+   */
+  const signal_read = 'read';
+
+  /**
+   * signal emits when removing file/dir
+   * @param path
+   */
+  const signal_delete = 'delete';
+
+  /**
+   * parameters definitions for signals
+   */
+  const signal_param_path = 'path';
+  const signal_param_oldpath = 'oldpath';
+  const signal_param_newpath = 'newpath';
+
+  /**
+   * run - changing this flag to false in hook handler will cancel event
+   */
+  const signal_param_run = 'run';
+
 	/**
 	* register a storage type
 	* @param  string  type
@@ -285,7 +370,7 @@ class OC_Filesystem{
 	static public function rename($path1,$path2){
 		if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and self::is_writeable($path1) and self::isValidPath($path2)){
 			$run=true;
-			OC_Hook::emit( 'OC_Filesystem', 'rename', array( 'oldpath' => $path1 ,'newpath'=>$path2, 'run' => &$run));
+      OC_Hook::emit( self::CLASSNAME, self::signal_rename, array( self::signal_param_oldpath => $path1 , self::signal_param_newpath=>$path2, self::signal_param_run => &$run));
 			if($run){
 				$mp1=self::getMountPoint($path1);
 				$mp2=self::getMountPoint($path2);
@@ -298,7 +383,7 @@ class OC_Filesystem{
 					$result=$storage2->fromTmpFile($tmpFile,self::getInternalPath($path2));
 					$storage1->unlink(self::getInternalPath($path1));
 				}
-				OC_Hook::emit( 'OC_Filesystem', 'post_rename', array( 'oldpath' => $path1, 'newpath'=>$path2));
+        OC_Hook::emit( self::CLASSNAME, self::signal_post_rename, array( self::signal_param_oldpath => $path1, self::signal_param_newpath=>$path2));
 				return $result;
 			}
 		}
@@ -306,13 +391,13 @@ class OC_Filesystem{
 	static public function copy($path1,$path2){
 		if(OC_FileProxy::runPreProxies('copy',$path1,$path2) and self::is_readable($path1) and self::isValidPath($path2)){
 			$run=true;
-			OC_Hook::emit( 'OC_Filesystem', 'copy', array( 'oldpath' => $path1 ,'newpath'=>$path2, 'run' => &$run));
+      OC_Hook::emit( self::CLASSNAME, self::signal_copy, array( self::signal_param_oldpath => $path1 , self::signal_param_newpath=>$path2, self::signal_param_run => &$run));
 			$exists=self::file_exists($path2);
 			if($run and !$exists){
-				OC_Hook::emit( 'OC_Filesystem', 'create', array( 'path' => $path2, 'run' => &$run));
+        OC_Hook::emit( self::CLASSNAME, self::signal_create, array( self::signal_param_path => $path2, self::signal_param_run => &$run));
 			}
 			if($run){
-				OC_Hook::emit( 'OC_Filesystem', 'write', array( 'path' => $path2, 'run' => &$run));
+        OC_Hook::emit( self::CLASSNAME, self::signal_write, array( self::signal_param_path => $path2, self::signal_param_run => &$run));
 			}
 			if($run){
 				$mp1=self::getMountPoint($path1);
@@ -325,11 +410,11 @@ class OC_Filesystem{
 					$tmpFile=$storage1->toTmpFile(self::getInternalPath($path1));
 					$result=$storage2->fromTmpFile($tmpFile,self::getInternalPath($path2));
 				}
-				OC_Hook::emit( 'OC_Filesystem', 'post_copy', array( 'oldpath' => $path1 ,'newpath'=>$path2));
+        OC_Hook::emit( self::CLASSNAME, self::signal_post_copy, array( self::signal_param_oldpath => $path1 , self::signal_param_newpath=>$path2));
 				if(!$exists){
-					OC_Hook::emit( 'OC_Filesystem', 'post_create', array( 'path' => $path2));
+          OC_Hook::emit( self::CLASSNAME, self::signal_post_create, array( self::signal_param_path => $path2));
 				}
-				OC_Hook::emit( 'OC_Filesystem', 'post_write', array( 'path' => $path2));
+        OC_Hook::emit( self::CLASSNAME, self::signal_post_write, array( self::signal_param_path => $path2));
 				return $result;
 			}
 		}
@@ -360,7 +445,7 @@ class OC_Filesystem{
 	}
 	static public function toTmpFile($path){
 		if(OC_FileProxy::runPreProxies('toTmpFile',$path) and self::isValidPath($path) and $storage=self::getStorage($path)){
-			OC_Hook::emit( 'OC_Filesystem', 'read', array( 'path' => $path));
+      OC_Hook::emit( self::CLASSNAME, self::signal_read, array( self::signal_param_path => $path));
 			return $storage->toTmpFile(self::getInternalPath($path));
 		}
 	}
@@ -369,17 +454,17 @@ class OC_Filesystem{
 			$run=true;
 			$exists=self::file_exists($path);
 			if(!$exists){
-				OC_Hook::emit( 'OC_Filesystem', 'create', array( 'path' => $path, 'run' => &$run));
+        OC_Hook::emit( self::CLASSNAME, self::signal_create, array( self::signal_param_path => $path, self::signal_param_run => &$run));
 			}
 			if($run){
-				OC_Hook::emit( 'OC_Filesystem', 'write', array( 'path' => $path, 'run' => &$run));
+        OC_Hook::emit( self::CLASSNAME, self::signal_write, array( self::signal_param_path => $path, self::signal_param_run => &$run));
 			}
 			if($run){
 				$result=$storage->fromTmpFile($tmpFile,self::getInternalPath($path));
 				if(!$exists){
-					OC_Hook::emit( 'OC_Filesystem', 'post_create', array( 'path' => $path));
+          OC_Hook::emit( self::CLASSNAME, self::signal_post_create, array( self::signal_param_path => $path));
 				}
-				OC_Hook::emit( 'OC_Filesystem', 'post_write', array( 'path' => $path));
+        OC_Hook::emit( self::CLASSNAME, self::signal_post_write, array( self::signal_param_path => $path));
 				return $result;
 			}
 		}
@@ -389,17 +474,17 @@ class OC_Filesystem{
 			$run=true;
 			$exists=self::file_exists($path);
 			if(!$exists){
-				OC_Hook::emit( 'OC_Filesystem', 'create', array( 'path' => $path, 'run' => &$run));
+        OC_Hook::emit( self::CLASSNAME, self::signal_create, array( self::signal_param_path => $path, self::signal_param_run => &$run));
 			}
 			if($run){
-				OC_Hook::emit( 'OC_Filesystem', 'write', array( 'path' => $path, 'run' => &$run));
+        OC_Hook::emit( self::CLASSNAME, self::signal_write, array( self::signal_param_path => $path, self::signal_param_run => &$run));
 			}
 			if($run){
 				$result=$storage->fromUploadedFile($tmpFile,self::getInternalPath($path));
 				if(!$exists){
-					OC_Hook::emit( 'OC_Filesystem', 'post_create', array( 'path' => $path));
+          OC_Hook::emit( self::CLASSNAME, self::signal_post_create, array( self::signal_param_path => $path));
 				}
-				OC_Hook::emit( 'OC_Filesystem', 'post_write', array( 'path' => $path));
+        OC_Hook::emit( self::CLASSNAME, self::signal_post_write, array( self::signal_param_path => $path));
 				return $result;
 			}
 		}
@@ -453,9 +538,9 @@ class OC_Filesystem{
 			$run=true;
 			foreach($hooks as $hook){
 				if($hook!='read'){
-					OC_Hook::emit( 'OC_Filesystem', $hook, array( 'path' => $path, 'run' => &$run));
+          OC_Hook::emit( self::CLASSNAME, $hook, array( self::signal_param_path => $path, self::signal_param_run => &$run));
 				}else{
-					OC_Hook::emit( 'OC_Filesystem', $hook, array( 'path' => $path));
+          OC_Hook::emit( self::CLASSNAME, $hook, array( self::signal_param_path => $path));
 				}
 			}
 			if($run){
@@ -467,7 +552,7 @@ class OC_Filesystem{
 				$result=OC_FileProxy::runPostProxies($operation,$path,$result);
 				foreach($hooks as $hook){
 					if($hook!='read'){
-						OC_Hook::emit( 'OC_Filesystem', 'post_'.$hook, array( 'path' => $path));
+            OC_Hook::emit( self::CLASSNAME, 'post_'.$hook, array( self::signal_param_path => $path));
 					}
 				}
 				return $result;
-- 
GitLab


From 0c76884f9884fe0bbc0479f7380a0429adba80c3 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 14 Jan 2012 23:39:05 +0100
Subject: [PATCH 266/546] add icon for log app

---
 lib/app.php                   |   2 +-
 settings/img/log Icon License |   2 +
 settings/img/log.png          | Bin 0 -> 441 bytes
 settings/img/log.svg          |  86 ++++++++++++++++++++++++++++++++++
 4 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 settings/img/log Icon License
 create mode 100644 settings/img/log.png
 create mode 100755 settings/img/log.svg

diff --git a/lib/app.php b/lib/app.php
index 3cf00464d37..de7d82ce959 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -232,7 +232,7 @@ class OC_App{
 				// admin apps menu
 				$settings[] = array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "settings", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" ));
 				// admin log menu
-				$settings[] = array( "id" => "core_log", "order" => 4, "href" => OC_Helper::linkTo( "settings", "log.php" ), "name" => $l->t("Log"), "icon" => OC_Helper::imagePath( "settings", "admin.svg" ));
+				$settings[] = array( "id" => "core_log", "order" => 4, "href" => OC_Helper::linkTo( "settings", "log.php" ), "name" => $l->t("Log"), "icon" => OC_Helper::imagePath( "settings", "log.svg" ));
 
 				$settings[]=array( "id" => "admin", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "admin.php" ), "name" => $l->t("Admin"), "icon" => OC_Helper::imagePath( "settings", "admin.svg" ));
 			}
diff --git a/settings/img/log Icon License b/settings/img/log Icon License
new file mode 100644
index 00000000000..b5c3167d733
--- /dev/null
+++ b/settings/img/log Icon License	
@@ -0,0 +1,2 @@
+CC BY 3.0
+http://thenounproject.com/en-us/noun/printer/#icon-No109
\ No newline at end of file
diff --git a/settings/img/log.png b/settings/img/log.png
new file mode 100644
index 0000000000000000000000000000000000000000..c84b3b29f19419f271756505087250057f1bb9dd
GIT binary patch
literal 441
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=f!eQwFr$;k><XYDdx@v7EBhTrJ~0I=`z>5cfu>k`x;TbdoL)M4
zqZhNIK-+%H^^<p>GkGNJQFXd`%e$wHA#1h>2hIEzC9V5L$K?Y11mB5XJ`cG)IK=E4
zBbMB7TC`JoHg`;)sQ#07&9wA?_2vKPifVaW{?f>{;hJ0(w=c^pTgGgstS-iYKZiLR
zoI>jxGFPl(ci^j8zvHL40Ux8wlWS4cySS`<FH48oM&54TFiRp?Z*KAPK#{MtXV2~I
zw&;srv$Z;oF(KPT>TIuJxLxC>Yf)9K$vsTT4>&U{pZ6`+u=@R&<$9sa{?)IPFEHNX
z=D+3OAKI+q$t76%*>#di>ngv7xRZ(uX5xxUpLI@~od4_}pAxz3KuKq?@khVV?c$a5
zp8r1lupsR9PI(?S_c&qKCGk}oxdqxDvhg0<^y{>p%MxZEssF6^leXW!tJ(EPvO@Rx
ep03ERT>CwoCdS8a(#ZmbD}$%2pUXO@geCwCKdX@d

literal 0
HcmV?d00001

diff --git a/settings/img/log.svg b/settings/img/log.svg
new file mode 100755
index 00000000000..72d4758aceb
--- /dev/null
+++ b/settings/img/log.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 100 100"
+   enable-background="new 0 0 100 100"
+   xml:space="preserve"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="log.svg"><metadata
+   id="metadata21"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs19" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1680"
+   inkscape:window-height="1004"
+   id="namedview17"
+   showgrid="false"
+   inkscape:zoom="3.06"
+   inkscape:cx="50"
+   inkscape:cy="50"
+   inkscape:window-x="-2"
+   inkscape:window-y="23"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<rect
+   x="75"
+   y="45"
+   width="4"
+   height="19"
+   id="rect3"
+   style="fill:#4d4d4d" />
+<polygon
+   points="21,0 21,19 25,19 25,4 75,4 75,19 79,19 79,0 "
+   id="polygon5"
+   style="fill:#4d4d4d" />
+<polygon
+   points="75,45 75,96 44,96 44,77 25,77 25,45 21,45 21,80 41,100 79,100 79,45 "
+   id="polygon7"
+   style="fill:#4d4d4d" />
+<rect
+   x="31"
+   y="45"
+   width="38"
+   height="3"
+   id="rect9"
+   style="fill:#4d4d4d" />
+<rect
+   x="31"
+   y="56"
+   width="38"
+   height="3"
+   id="rect11"
+   style="fill:#4d4d4d" />
+<rect
+   x="31"
+   y="67"
+   width="38"
+   height="3"
+   id="rect13"
+   style="fill:#4d4d4d" />
+<path
+   d="M0,21v48h19V59h-9V31h80v28h-9v10h19V21H0z M97,28h-4v-4h4V28z"
+   id="path15"
+   style="fill:#4d4d4d" />
+</svg>
\ No newline at end of file
-- 
GitLab


From 0ac9e56da929fdac9507b386139c7e24f131cdf1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 14 Jan 2012 23:37:50 +0100
Subject: [PATCH 267/546] small fix for server svg mimetype detection

---
 core/js/js.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index 5846d289880..2bb6cff0cb0 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -191,11 +191,13 @@ SVGSupport.checkMimeType=function(){
 			$.each(headerParts,function(i,text){
 				if(text){
 					var parts=text.split(':',2);
-					var value=parts[1].trim();
-					if(value[0]=='"'){
-						value=value.substr(1,value.length-2);
+					if(parts.length==2){
+						var value=parts[1].trim();
+						if(value[0]=='"'){
+							value=value.substr(1,value.length-2);
+						}
+						headers[parts[0]]=value;
 					}
-					headers[parts[0]]=value;
 				}
 			});
 			if(headers["Content-Type"]!='image/svg+xml'){
-- 
GitLab


From 56af6ee752bc2e15a87b44f724d37e2622d675ca Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 14 Jan 2012 23:47:31 +0100
Subject: [PATCH 268/546] fix some of the styling issues on opera

---
 core/css/styles.css | 2 +-
 files/css/files.css | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index b0f83c9b065..76e1e5760b8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -57,7 +57,7 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
 #controls .button { display:inline-block; }
 #content { margin:3.5em 0 0 12.5em; }
 #leftcontent, .leftcontent { position:fixed; overflow: auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; }
-#leftcontent li, .leftcontent li { padding:.3em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
+#leftcontent li, .leftcontent li { background:#f8f8f8; padding:.3em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
 #leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; }
 #rightcontent, .rightcontent { position:absolute; top:6.4em; left:33em; }
 
diff --git a/files/css/files.css b/files/css/files.css
index 22f4810d0a6..b384fef0b78 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -36,6 +36,7 @@
 #emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; }
 table { position:relative; top:37px; width:100%; }
 tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; height:1em; }
+tbody tr { background-color:#fff; }
 tbody tr.selected { background-color:#eee; }
 tbody a { color:#000; }
 span.extention, td.date { color:#999; }
-- 
GitLab


From b1433119cc0abf4bffed1a901bace0ca9e92e328 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 15 Jan 2012 00:06:26 +0100
Subject: [PATCH 269/546] highlight the current view

---
 apps/calendar/js/calendar.js         | 13 ++++++++++++-
 apps/calendar/templates/calendar.php | 14 ++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index ae586661ccc..33a78b3e322 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
  * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
@@ -345,6 +345,11 @@ Calendar={
 			}
 			
 		},
+		reseticonhighlight: function(){
+			$('#oneweekview_radio').css('color', '#000000');
+			$('#onemonthview_radio').css('color', '#000000');
+			$('#listview_radio').css('color', '#000000');
+		},
 		Calendar:{
 			overview:function(){
 				if($('#choosecalendar_dialog').dialog('isOpen') == true){
@@ -669,12 +674,18 @@ $(document).ready(function(){
 	});
 	$('#oneweekview_radio').click(function(){
 		$('#calendar_holder').fullCalendar('changeView', 'agendaWeek');
+		Calendar.UI.reseticonhighlight();
+		$('#oneweekview_radio').css('color', '#6193CF');
 	});
 	$('#onemonthview_radio').click(function(){
 		$('#calendar_holder').fullCalendar('changeView', 'month');
+		Calendar.UI.reseticonhighlight();
+		$('#onemonthview_radio').css('color', '#6193CF');
 	});
 	$('#listview_radio').click(function(){
 		$('#calendar_holder').fullCalendar('changeView', 'list');
+		Calendar.UI.reseticonhighlight();
+		$('#listview_radio').css('color', '#6193CF');
 	});
 	$('#today_input').click(function(){
 		$('#calendar_holder').fullCalendar('today');
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 50d3d70347a..6b2cd68c6fb 100755
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -27,6 +27,20 @@
 					echo '$(\'#calendar_holder\').fullCalendar(\'gotoDate\', ' . $year . ', ' . --$month . ', ' . $day . ');';
 					echo '$(\'#dialog_holder\').load(OC.filePath(\'calendar\', \'ajax\', \'editeventform.php\') + \'?id=\' +  ' . $_['showevent'] . ' , Calendar.UI.startEventDialog);';
 				}
+				
+				switch(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month')){
+					case 'agendaWeek':
+						echo '$(\'#oneweekview_radio\').css(\'color\', \'#6193CF\');';
+						break;
+					case 'month':
+						echo '$(\'#onemonthview_radio\').css(\'color\', \'#6193CF\');';
+						break;
+					case 'list':
+						echo '$(\'#listview_radio\').css(\'color\', \'#6193CF\');';
+						break;
+					default:
+						break;
+				}
 				?>
 				});
 				</script>
-- 
GitLab


From 5cd6e0f4d98b98809eb17366ca90e79b09a05115 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 15 Jan 2012 00:11:26 +0100
Subject: [PATCH 270/546] remove some of the flickering in opera

---
 apps/media/css/music.css |  4 ++--
 core/css/styles.css      |  1 +
 files/css/files.css      |  1 +
 files/js/fileactions.js  | 12 ++++++++----
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index 41ade44a66f..da0407fca58 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -20,8 +20,8 @@ div.jp-volume-bar-value { background:#ccc; width:0; height:0.4em; }
 
 #collection { padding-top:1em; position:relative; width:100%; float:left; }
 #collection li.album,#collection li.song { margin-left:3em; }
-#leftcontent img.remove { display:none; float:right; cursor:pointer; }
-#leftcontent li:hover img.remove { display:inline; }
+#leftcontent img.remove { display:none; float:right; cursor:pointer; opacity: 0; }
+#leftcontent li:hover img.remove { display:inline; opacity: .3; }
 #leftcontent li div.label { float: left; width: 200px; overflow: hidden; text-overflow: ellipsis; }
 #collection li button { float:right; }
 #collection li,#playlist li { list-style-type:none; }
diff --git a/core/css/styles.css b/core/css/styles.css
index 76e1e5760b8..53af8b383e3 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -106,6 +106,7 @@ label.infield { cursor: text !important; }
 #notification { z-index:101; cursor:pointer; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
 
 .action, .selectedActions a, #logout { opacity:.3; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
+.action { width: 16px; height: 16px; }
 .action:hover, .selectedActions a:hover, #logout:hover { opacity:1; }
 
 table:not(.nostyle) tr { -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
diff --git a/files/css/files.css b/files/css/files.css
index b384fef0b78..6c4d603b4a6 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -70,6 +70,7 @@ table thead.fixed { height:2em; }
 #select_all { float:left; margin:.3em 0.6em 0 .5em; }
 #uploadsize-message,#delete-confirm { display:none; }
 .selectedActions a,#fileList a.action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; }
+a.action>img{ max-height:16px; max-width:16px; }
 .selectedActions { display:none; }
 
 /* add breadcrumb divider to the File item in navigation panel */
diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index 6f0729e43b6..b5dd3982803 100644
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -66,7 +66,7 @@ FileActions={
 				if(img.call){
 					img=img(file);
 				}
-				var html='<a href="#" title="'+name+'" class="action" />';
+				var html='<a href="#" title="'+name+'" class="action" style="display:none" />';
 				var element=$(html);
 				if(img){
 					element.append($('<img src="'+img+'"/>'));
@@ -80,6 +80,7 @@ FileActions={
 					FileActions.hide();
 					action(currentFile);
 				});
+				element.hide();
 				parent.children('a.name').append(element);
 			}
 		}
@@ -88,7 +89,7 @@ FileActions={
 			if(img.call){
 				img=img(file);
 			}
-			var html='<a href="#" title="Delete" class="action" />';
+			var html='<a href="#" title="Delete" class="action" style="display:none" />';
 			var element=$(html);
 			if(img){
 				element.append($('<img src="'+img+'"/>'));
@@ -102,10 +103,13 @@ FileActions={
 				FileActions.hide();
 				action(currentFile);
 			});
+			element.hide();
 			parent.parent().children().last().append(element);
 		}
-		$('#fileList .action').hide();
-		$('#fileList .action').fadeIn(200);
+		$('#fileList .action').css('-o-transition-property','none');//temporarly disable 
+		$('#fileList .action').fadeIn(200,function(){
+			$('#fileList .action').css('-o-transition-property','opacity');
+		});
 		return false;
 	},
 	hide:function(){
-- 
GitLab


From 87b46decfa4add1a87d5f46f693a3601a07ef3f0 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 15 Jan 2012 00:30:04 +0100
Subject: [PATCH 271/546] added bart to the authors in info.xml

---
 apps/calendar/appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/appinfo/info.xml b/apps/calendar/appinfo/info.xml
index 6b1ecd2337f..46292af3db1 100644
--- a/apps/calendar/appinfo/info.xml
+++ b/apps/calendar/appinfo/info.xml
@@ -4,7 +4,7 @@
 	<name>Calendar</name>
 	<version>0.2</version>
 	<licence>AGPL</licence>
-	<author>Georg Ehrke (Userinterface), Jakob Sack</author>
+	<author>Georg Ehrke, Bart Visscher, Jakob Sack</author>
 	<require>2</require>
 	<description>Calendar with CalDAV support</description>
 	<default_enable/>
-- 
GitLab


From 43f7b2fd2d874cbd15a5b181782096b364fe0993 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 15 Jan 2012 00:45:27 +0100
Subject: [PATCH 272/546] fix newline problem in calendar

---
 apps/calendar/export.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/export.php b/apps/calendar/export.php
index ce1a4aa046f..ce36116c4cb 100644
--- a/apps/calendar/export.php
+++ b/apps/calendar/export.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
@@ -11,13 +11,15 @@ OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('calendar');
 $cal = isset($_GET['calid']) ? $_GET['calid'] : NULL;
 $event = isset($_GET['eventid']) ? $_GET['eventid'] : NULL;
+$nl = '
+';
 if(isset($cal)){
 	$calendar = OC_Calendar_App::getCalendar($cal);
 	$calobjects = OC_Calendar_Object::all($cal);
 	header('Content-Type: text/Calendar');
 	header('Content-Disposition: inline; filename=' . $calendar['displayname'] . '.ics'); 
 	foreach($calobjects as $calobject){
-		echo $calobject['calendardata'] . '\n';
+		echo $calobject['calendardata'] . $nl;
 	}
 }elseif(isset($event)){
 	$data = OC_Calendar_App::getEventObject($_GET['eventid']);
-- 
GitLab


From 0e428ec595777ef5f70b408763ccef7be340799b Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 15 Jan 2012 00:47:50 +0100
Subject: [PATCH 273/546] fix newline problem in contacts

---
 apps/contacts/export.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/export.php b/apps/contacts/export.php
index 735d1c5b631..d17b5e55146 100644
--- a/apps/contacts/export.php
+++ b/apps/contacts/export.php
@@ -11,6 +11,8 @@ OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 $book = isset($_GET['bookid']) ? $_GET['bookid'] : NULL;
 $contact = isset($_GET['contactid']) ? $_GET['contactid'] : NULL;
+$nl = '
+';
 if(isset($book)){
 	$addressbook = OC_Contacts_App::getAddressbook($book);
 	if($addressbook['userid'] != OC_User::getUser()){
@@ -22,7 +24,7 @@ if(isset($book)){
 	header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $addressbook['displayname']) . '.vcf'); 
 
 	foreach($cardobjects as $card) {
-		echo $card['carddata'];
+		echo $card['carddata'] . $nl;
 	}
 }elseif(isset($contact)){	
 	$data = OC_Contacts_App::getContactObject($contact);
-- 
GitLab


From 872d301af3a69c7dc4493cf335638f66affabf24 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 15 Jan 2012 00:49:48 +0100
Subject: [PATCH 274/546] fix inconsitent behaviour when trying to remove
 yourself from the admin group

---
 core/js/multiselect.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 610e9193bb7..96fc09a0759 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -61,22 +61,22 @@
 				input.change(function(){
 					var groupname=$(this).next().text();
 					if($(this).is(':checked')){
-						settings.checked.push(groupname);
 						if(settings.oncheck){
 							if(settings.oncheck(groupname)===false){
 								$(this).attr('checked', false);
 								return;
 							}
 						}
+						settings.checked.push(groupname);
 					}else{
 						var index=settings.checked.indexOf(groupname);
-						settings.checked.splice(index,1);
 						if(settings.onuncheck){
 							if(settings.onuncheck(groupname)===false){
 								$(this).attr('checked',true);
 								return;
 							}
 						}
+						settings.checked.splice(index,1);
 					}
 					var oldWidth=button.width();
 					if(settings.checked.length>0){
-- 
GitLab


From 360778e5208ac3cfb55c5a5f025a8449ecb6cf0b Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 15 Jan 2012 00:55:02 +0100
Subject: [PATCH 275/546] use backslash n instead of a real new line

---
 apps/calendar/export.php | 3 +--
 apps/calendar/import.php | 6 ++----
 apps/contacts/export.php | 3 +--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/apps/calendar/export.php b/apps/calendar/export.php
index ce36116c4cb..9886ad8e8cc 100644
--- a/apps/calendar/export.php
+++ b/apps/calendar/export.php
@@ -11,8 +11,7 @@ OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('calendar');
 $cal = isset($_GET['calid']) ? $_GET['calid'] : NULL;
 $event = isset($_GET['eventid']) ? $_GET['eventid'] : NULL;
-$nl = '
-';
+$nl = "\n";
 if(isset($cal)){
 	$calendar = OC_Calendar_App::getCalendar($cal);
 	$calobjects = OC_Calendar_Object::all($cal);
diff --git a/apps/calendar/import.php b/apps/calendar/import.php
index d1186e691e5..b1c6f91df84 100644
--- a/apps/calendar/import.php
+++ b/apps/calendar/import.php
@@ -10,6 +10,7 @@ ob_start();
 require_once ('../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_Util::checkAppEnabled('calendar');
+$nl = "\n";
 $progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
 if(is_writable('import_tmp/')){
 	$progressfopen = fopen($progressfile, 'w');
@@ -36,8 +37,7 @@ if(is_writable('import_tmp/')){
 }
 $searchfor = array('VEVENT', 'VTODO', 'VJOURNAL');
 $parts = $searchfor;
-$filearr = explode('
-', $file);
+$filearr = explode($nl, $file);
 $inelement = false;
 $parts = array();
 $i = 0;
@@ -64,8 +64,6 @@ if(is_writable('import_tmp/')){
 	fclose($progressfopen);
 }
 $start = '';
-$nl = '
-';
 for ($i = 0; $i < $parts[0]['begin']; $i++) { 
 	if($i == 0){
 		$start = $filearr[0];
diff --git a/apps/contacts/export.php b/apps/contacts/export.php
index d17b5e55146..fc2aa86500f 100644
--- a/apps/contacts/export.php
+++ b/apps/contacts/export.php
@@ -11,8 +11,7 @@ OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 $book = isset($_GET['bookid']) ? $_GET['bookid'] : NULL;
 $contact = isset($_GET['contactid']) ? $_GET['contactid'] : NULL;
-$nl = '
-';
+$nl = "\n";
 if(isset($book)){
 	$addressbook = OC_Contacts_App::getAddressbook($book);
 	if($addressbook['userid'] != OC_User::getUser()){
-- 
GitLab


From cf1023567b24ea1ace6a85a049dfa4457ce52c66 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 15 Jan 2012 10:52:07 +0100
Subject: [PATCH 276/546] change calendar colors

---
 apps/calendar/lib/calendar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 4199ab5a7cc..e9e509bfa86 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -231,13 +231,13 @@ class OC_Calendar_Calendar{
 	public static function getCalendarColorOptions(){
 		return array(
 			'ff0000', // "Red"
-			'00ff00', // "Green"
+			'b3dc6c', // "Green"
 			'ffff00', // "Yellow"
 			'808000', // "Olive"
 			'ffa500', // "Orange"
 			'ff7f50', // "Coral"
 			'ee82ee', // "Violet"
-			'ecc255', // dark yellow
+			'9fc6e7', // dark yellow
 		);
 	}
 	public static function getEventSourceInfo($calendar){
-- 
GitLab


From ec3955b158b9b15f25392c6ec099c7e36493a469 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 15 Jan 2012 10:58:39 +0100
Subject: [PATCH 277/546] change description of the changed colors (calendar)

---
 apps/calendar/lib/calendar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index e9e509bfa86..5e272991f20 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -237,7 +237,7 @@ class OC_Calendar_Calendar{
 			'ffa500', // "Orange"
 			'ff7f50', // "Coral"
 			'ee82ee', // "Violet"
-			'9fc6e7', // dark yellow
+			'9fc6e7', // "light blue"
 		);
 	}
 	public static function getEventSourceInfo($calendar){
-- 
GitLab


From 9c048586318f7d34544b5996e80afea8249a54bf Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 15 Jan 2012 11:02:08 +0100
Subject: [PATCH 278/546] added vcards to the mimetype fix list and renamed the
 icon for vcards

---
 core/img/filetypes/{vcf.png => text-vcard.png} | Bin
 lib/mimetypes.fixlist.php                      |   2 ++
 2 files changed, 2 insertions(+)
 rename core/img/filetypes/{vcf.png => text-vcard.png} (100%)

diff --git a/core/img/filetypes/vcf.png b/core/img/filetypes/text-vcard.png
similarity index 100%
rename from core/img/filetypes/vcf.png
rename to core/img/filetypes/text-vcard.png
diff --git a/lib/mimetypes.fixlist.php b/lib/mimetypes.fixlist.php
index f2d86d0db1e..1c6acbc4438 100644
--- a/lib/mimetypes.fixlist.php
+++ b/lib/mimetypes.fixlist.php
@@ -9,4 +9,6 @@ return array(
 	'odp'=>'application/vnd.oasis.opendocument.presentation',
 	'pl'=>'text/x-script.perl',
 	'py'=>'text/x-script.phyton',
+	'vcf' => 'text/vcard',
+	'vcard' => 'text/vcard'
 );
-- 
GitLab


From 5ecc10b7567910e4cfee40aa2feea20090107f04 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 15 Jan 2012 11:51:01 +0100
Subject: [PATCH 279/546] recursive gallery removing on parent dir remove

---
 apps/gallery/lib/album.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 6adff196071..72653c8de15 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -48,6 +48,14 @@ class OC_Gallery_Album {
     $album = $album->fetchRow();
     self::remove($owner, $album['album_name']);
     OC_Gallery_Photo::removeByAlbumId($album['album_id']);
+    // find and remove any gallery which might be stored lower in dir hierarchy
+    $path = $path.'/%';
+    $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE album_path LIKE ? AND uid_owner = ?');
+    $result = $stmt->execute(array($path, $owner));
+    while (($album = $result->fetchRow())) {
+      OC_Gallery_Photo::removeByAlbumId($album['album_id']);
+      self::remove($owner, $album['album_name']);
+    }
   }
 	
   public static function find($owner, $name=null, $path=null){
-- 
GitLab


From 3ec5ffe24e9d1c50dcfedc1d18af01be500f8df5 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 15 Jan 2012 12:11:04 +0100
Subject: [PATCH 280/546] Simple translation for gallery

---
 apps/contacts/l10n/pl.php             | 3 +++
 apps/gallery/appinfo/app.php          | 4 +++-
 apps/gallery/l10n/de.php              | 5 +++++
 apps/gallery/l10n/pl.php              | 6 ++++++
 apps/gallery/templates/index.php      | 3 ++-
 apps/gallery/templates/view_album.php | 3 ++-
 6 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 apps/gallery/l10n/de.php
 create mode 100644 apps/gallery/l10n/pl.php

diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
index 0302b0e3eea..43ee14f930e 100644
--- a/apps/contacts/l10n/pl.php
+++ b/apps/contacts/l10n/pl.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Contacts" => "Kontakty",
+"Addressbooks" => "Książki adresowe",
+"Add" => "Dodaj",
 "This is not your addressbook." => "To nie jest twoja książka adresowa.",
 "Contact could not be found." => "Kontakt nie znaleziony.",
 "vCard could not be read." => "Nie można odczytać vCard.",
diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index 9c665fd3500..da872274497 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -26,6 +26,8 @@ OC::$CLASSPATH['OC_Gallery_Photo'] = 'apps/gallery/lib/photo.php';
 OC::$CLASSPATH['OC_Gallery_Scanner'] = 'apps/gallery/lib/scanner.php';
 OC::$CLASSPATH['OC_Gallery_Hooks_Handlers'] = 'apps/gallery/lib/hooks_handlers.php';
 
+$l = new OC_L10N('gallery');
+
 OC_App::register(array(
   'order' => 20,
   'id' => 'gallery',
@@ -36,7 +38,7 @@ OC_App::addNavigationEntry( array(
  'order' => 20,
  'href' => OC_Helper::linkTo('gallery', 'index.php'),
  'icon' => OC_Helper::imagePath('core', 'places/picture.svg'),
- 'name' => 'Gallery'));
+ 'name' => $l->t('Gallery')));
 
  class OC_GallerySearchProvider extends OC_Search_Provider{
 	function search($query){
diff --git a/apps/gallery/l10n/de.php b/apps/gallery/l10n/de.php
new file mode 100644
index 00000000000..4ca5c83249c
--- /dev/null
+++ b/apps/gallery/l10n/de.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+  "Gallery" => "Galerie",
+  "Back" => "Zurück"
+);
+?>
diff --git a/apps/gallery/l10n/pl.php b/apps/gallery/l10n/pl.php
new file mode 100644
index 00000000000..d0c51c0f814
--- /dev/null
+++ b/apps/gallery/l10n/pl.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+  "Gallery" => "Galeria",
+  "Rescan" => "Przeskanuj",
+  "Back" => "Wróć"
+);
+?>
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 7c6e91a468e..eb6ebd1bb7b 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -2,11 +2,12 @@
 OC_Util::addStyle('gallery', 'styles');
 OC_Util::addScript('gallery', 'albums');
 OC_Util::addScript('gallery', 'album_cover');
+$l = new OC_L10N('gallery');
 ?>
 
 <div id="notification"><div id="gallery_notification_text">Creating thumbnails</div></div>
 <div id="controls">
-  <input type="button" value="Rescan" onclick="javascript:scanForAlbums();" />
+  <input type="button" value="<?php echo $l->t('Rescan');?>" onclick="javascript:scanForAlbums();" />
   <br/>
 </div>
 <div id="gallery_list">
diff --git a/apps/gallery/templates/view_album.php b/apps/gallery/templates/view_album.php
index 4acc965269c..7e3a67df4e4 100644
--- a/apps/gallery/templates/view_album.php
+++ b/apps/gallery/templates/view_album.php
@@ -5,6 +5,7 @@ OC_Util::addScript('gallery', 'album_cover');
 OC_Util::addScript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack');
 OC_Util::addScript('files_imageviewer', 'jquery.fancybox-1.3.4.pack');
 OC_Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' );
+$l = new OC_L10N('gallery');
 ?>
 <script type="text/javascript">
   $(document).ready(function() {
@@ -15,7 +16,7 @@ OC_Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' );
 </script>
 
 <div id="controls">
-  <a href="?"><input type="button" value="Back" /></a>
+  <a href="?"><input type="button" value="<? echo $l->t('Back');?>" /></a>
 <br/>
 </div>
 
-- 
GitLab


From 7cd809b286aee9d90e8a7d01f3a21e8e65978d28 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 15 Jan 2012 15:12:58 +0100
Subject: [PATCH 281/546] update translations

---
 apps/calendar/l10n/ar.php       |   6 -
 apps/calendar/l10n/bg_BG.php    |  51 +--
 apps/calendar/l10n/ca.php       | 120 ++++--
 apps/calendar/l10n/cs_CZ.php    | 149 +++++++
 apps/calendar/l10n/da.php       | 112 ++++--
 apps/calendar/l10n/de.php       |  92 +++--
 apps/calendar/l10n/el.php       | 111 ++++--
 apps/calendar/l10n/eo.php       |   6 -
 apps/calendar/l10n/es.php       | 106 +++--
 apps/calendar/l10n/et_EE.php    |  93 +++--
 apps/calendar/l10n/eu.php       |   6 -
 apps/calendar/l10n/fr.php       | 123 +++---
 apps/calendar/l10n/hr.php       |   6 -
 apps/calendar/l10n/hu_HU.php    |   6 -
 apps/calendar/l10n/id.php       |  51 +--
 apps/calendar/l10n/it.php       |  84 ++--
 apps/calendar/l10n/ja_JP.php    |   6 -
 apps/calendar/l10n/lb.php       |  93 +++--
 apps/calendar/l10n/lt_LT.php    |   6 -
 apps/calendar/l10n/ms_MY.php    |  51 +--
 apps/calendar/l10n/nb_NO.php    |  51 +--
 apps/calendar/l10n/nl.php       | 129 ++++--
 apps/calendar/l10n/pl.php       |  99 +++--
 apps/calendar/l10n/pt_BR.php    |  93 +++--
 apps/calendar/l10n/pt_PT.php    |   8 +
 apps/calendar/l10n/ro.php       | 118 ++++--
 apps/calendar/l10n/ru.php       |  74 ++--
 apps/calendar/l10n/sk_SK.php    |   6 -
 apps/calendar/l10n/sl.php       |   6 -
 apps/calendar/l10n/sr.php       |  76 ++--
 apps/calendar/l10n/sr@latin.php |  76 ++--
 apps/calendar/l10n/sv.php       |  80 ++++
 apps/calendar/l10n/tr.php       |   6 -
 apps/calendar/l10n/zh_CN.php    |  93 +++--
 apps/contacts/l10n/ar.php       |   2 -
 apps/contacts/l10n/ca.php       |  20 +-
 apps/contacts/l10n/cs_CZ.php    |  18 +-
 apps/contacts/l10n/da.php       |  18 +-
 apps/contacts/l10n/de.php       |  18 +-
 apps/contacts/l10n/el.php       |  18 +-
 apps/contacts/l10n/eo.php       |   2 -
 apps/contacts/l10n/es.php       |  16 +-
 apps/contacts/l10n/et_EE.php    |   2 -
 apps/contacts/l10n/eu.php       |   2 -
 apps/contacts/l10n/fr.php       |  22 +-
 apps/contacts/l10n/he.php       |   2 -
 apps/contacts/l10n/hr.php       |   2 -
 apps/contacts/l10n/hu_HU.php    |   2 -
 apps/contacts/l10n/ia.php       |   2 -
 apps/contacts/l10n/it.php       |  18 +-
 apps/contacts/l10n/ja_JP.php    |   2 -
 apps/contacts/l10n/lb.php       |   2 -
 apps/contacts/l10n/lt_LT.php    |   2 -
 apps/contacts/l10n/nl.php       |   5 -
 apps/contacts/l10n/nn_NO.php    |   2 -
 apps/contacts/l10n/pl.php       |  39 +-
 apps/contacts/l10n/pt_BR.php    |   2 -
 apps/contacts/l10n/pt_PT.php    |   2 -
 apps/contacts/l10n/ro.php       |  18 +-
 apps/contacts/l10n/ru.php       |   2 -
 apps/contacts/l10n/sk_SK.php    |   2 -
 apps/contacts/l10n/sl.php       |   2 -
 apps/contacts/l10n/sr.php       |   2 -
 apps/contacts/l10n/sr@latin.php |   2 -
 apps/contacts/l10n/sv.php       |   2 -
 apps/contacts/l10n/tr.php       |   2 -
 apps/contacts/l10n/zh_CN.php    |   2 -
 core/l10n/ca.php                |  11 +-
 core/l10n/cs_CZ.php             |   5 +
 core/l10n/da.php                |   5 +
 core/l10n/el.php                |   5 +
 core/l10n/es.php                |   5 +
 core/l10n/fr.php                |   5 +
 core/l10n/it.php                |   5 +
 core/l10n/nl.php                |   5 +
 core/l10n/pl.php                |   5 +
 core/l10n/ro.php                |   5 +
 files/l10n/ca.php               |   8 +-
 files/l10n/cs_CZ.php            |   4 +
 files/l10n/da.php               |   4 +
 files/l10n/de.php               |   2 +
 files/l10n/el.php               |   4 +
 files/l10n/es.php               |   4 +
 files/l10n/fr.php               |   4 +
 files/l10n/it.php               |   4 +
 files/l10n/nl.php               |   4 +
 files/l10n/pl.php               |   4 +
 files/l10n/ro.php               |   4 +
 l10n/.tx/config                 |   5 +
 l10n/ar/calendar.po             |  62 +--
 l10n/ar/contacts.po             | 119 ++++--
 l10n/ar/gallery.po              |  32 ++
 l10n/bg_BG/calendar.po          | 562 +++++++++++++++++---------
 l10n/bg_BG/contacts.po          | 117 ++++--
 l10n/bg_BG/gallery.po           |  32 ++
 l10n/ca/calendar.po             | 580 +++++++++++++++++----------
 l10n/ca/contacts.po             | 147 ++++---
 l10n/ca/core.po                 |  24 +-
 l10n/ca/files.po                |  20 +-
 l10n/ca/gallery.po              |  32 ++
 l10n/ca/settings.po             |  30 +-
 l10n/cs_CZ/calendar.po          | 678 ++++++++++++++++++++------------
 l10n/cs_CZ/contacts.po          | 145 ++++---
 l10n/cs_CZ/core.po              |  18 +-
 l10n/cs_CZ/files.po             |  16 +-
 l10n/cs_CZ/gallery.po           |  32 ++
 l10n/cs_CZ/settings.po          |  22 +-
 l10n/da/calendar.po             | 551 +++++++++++++++++---------
 l10n/da/contacts.po             | 145 ++++---
 l10n/da/core.po                 |  18 +-
 l10n/da/files.po                |  16 +-
 l10n/da/gallery.po              |  32 ++
 l10n/da/settings.po             |  22 +-
 l10n/de/calendar.po             | 540 ++++++++++++++++---------
 l10n/de/contacts.po             | 144 ++++---
 l10n/de/files.po                |  11 +-
 l10n/de/gallery.po              |  32 ++
 l10n/de/settings.po             |  17 +-
 l10n/el/calendar.po             | 553 +++++++++++++++++---------
 l10n/el/contacts.po             | 145 ++++---
 l10n/el/core.po                 |  17 +-
 l10n/el/files.po                |  16 +-
 l10n/el/gallery.po              |  32 ++
 l10n/el/settings.po             |  22 +-
 l10n/eo/calendar.po             |  62 +--
 l10n/eo/contacts.po             | 119 ++++--
 l10n/eo/gallery.po              |  32 ++
 l10n/es/calendar.po             | 546 ++++++++++++++++---------
 l10n/es/contacts.po             | 141 ++++---
 l10n/es/core.po                 |  20 +-
 l10n/es/files.po                |  16 +-
 l10n/es/gallery.po              |  32 ++
 l10n/es/settings.po             |  22 +-
 l10n/et_EE/calendar.po          | 612 +++++++++++++++++-----------
 l10n/et_EE/contacts.po          | 119 ++++--
 l10n/et_EE/gallery.po           |  32 ++
 l10n/eu/calendar.po             |  62 +--
 l10n/eu/contacts.po             | 119 ++++--
 l10n/eu/gallery.po              |  32 ++
 l10n/fr/calendar.po             | 564 +++++++++++++++++---------
 l10n/fr/contacts.po             | 149 ++++---
 l10n/fr/core.po                 |  15 +-
 l10n/fr/files.po                |  14 +-
 l10n/fr/gallery.po              |  32 ++
 l10n/fr/settings.po             |  19 +-
 l10n/gl/calendar.po             | 636 ++++++++++++++++++++++++++++++
 l10n/gl/contacts.po             | 289 ++++++++++++++
 l10n/gl/core.po                 | 170 ++++++++
 l10n/gl/files.po                | 108 +++++
 l10n/gl/gallery.po              |  32 ++
 l10n/gl/media.po                |  64 +++
 l10n/gl/settings.po             | 152 +++++++
 l10n/he/calendar.po             |  50 +--
 l10n/he/contacts.po             | 119 ++++--
 l10n/he/gallery.po              |  32 ++
 l10n/hr/calendar.po             |  62 +--
 l10n/hr/contacts.po             | 119 ++++--
 l10n/hr/gallery.po              |  32 ++
 l10n/hu_HU/calendar.po          |  62 +--
 l10n/hu_HU/contacts.po          | 119 ++++--
 l10n/hu_HU/gallery.po           |  32 ++
 l10n/hy/calendar.po             |  50 +--
 l10n/hy/contacts.po             | 117 ++++--
 l10n/hy/gallery.po              |  32 ++
 l10n/ia/calendar.po             |  50 +--
 l10n/ia/contacts.po             | 119 ++++--
 l10n/ia/gallery.po              |  32 ++
 l10n/id/calendar.po             | 562 +++++++++++++++++---------
 l10n/id/contacts.po             | 117 ++++--
 l10n/id/gallery.po              |  32 ++
 l10n/it/calendar.po             | 545 ++++++++++++++++---------
 l10n/it/contacts.po             | 145 ++++---
 l10n/it/core.po                 |  18 +-
 l10n/it/files.po                |  15 +-
 l10n/it/gallery.po              |  32 ++
 l10n/it/settings.po             |  22 +-
 l10n/ja_JP/calendar.po          |  62 +--
 l10n/ja_JP/contacts.po          | 119 ++++--
 l10n/ja_JP/gallery.po           |  32 ++
 l10n/lb/calendar.po             | 612 +++++++++++++++++-----------
 l10n/lb/contacts.po             | 119 ++++--
 l10n/lb/gallery.po              |  32 ++
 l10n/lt_LT/calendar.po          |  62 +--
 l10n/lt_LT/contacts.po          | 119 ++++--
 l10n/lt_LT/gallery.po           |  32 ++
 l10n/ms_MY/calendar.po          | 562 +++++++++++++++++---------
 l10n/ms_MY/contacts.po          | 117 ++++--
 l10n/ms_MY/gallery.po           |  32 ++
 l10n/nb_NO/calendar.po          | 562 +++++++++++++++++---------
 l10n/nb_NO/contacts.po          | 117 ++++--
 l10n/nb_NO/gallery.po           |  32 ++
 l10n/nl/calendar.po             | 594 ++++++++++++++++++----------
 l10n/nl/contacts.po             | 123 ++++--
 l10n/nl/core.po                 |  17 +-
 l10n/nl/files.po                |  15 +-
 l10n/nl/gallery.po              |  32 ++
 l10n/nl/settings.po             |  21 +-
 l10n/nn_NO/calendar.po          |  50 +--
 l10n/nn_NO/contacts.po          | 119 ++++--
 l10n/nn_NO/gallery.po           |  32 ++
 l10n/pl/calendar.po             | 534 ++++++++++++++++---------
 l10n/pl/contacts.po             | 158 +++++---
 l10n/pl/core.po                 |  18 +-
 l10n/pl/files.po                |  16 +-
 l10n/pl/gallery.po              |  32 ++
 l10n/pl/settings.po             |  22 +-
 l10n/pt_BR/calendar.po          | 612 +++++++++++++++++-----------
 l10n/pt_BR/contacts.po          | 119 ++++--
 l10n/pt_BR/gallery.po           |  32 ++
 l10n/pt_PT/calendar.po          | 479 +++++++++++++++-------
 l10n/pt_PT/contacts.po          | 119 ++++--
 l10n/pt_PT/gallery.po           |  32 ++
 l10n/ro/calendar.po             | 579 +++++++++++++++++----------
 l10n/ro/contacts.po             | 145 ++++---
 l10n/ro/core.po                 |  18 +-
 l10n/ro/files.po                |  16 +-
 l10n/ro/gallery.po              |  32 ++
 l10n/ro/settings.po             |  22 +-
 l10n/ru/calendar.po             | 574 +++++++++++++++++----------
 l10n/ru/contacts.po             | 119 ++++--
 l10n/ru/gallery.po              |  32 ++
 l10n/sk_SK/calendar.po          |  62 +--
 l10n/sk_SK/contacts.po          | 119 ++++--
 l10n/sk_SK/gallery.po           |  32 ++
 l10n/sl/calendar.po             |  62 +--
 l10n/sl/contacts.po             | 119 ++++--
 l10n/sl/gallery.po              |  32 ++
 l10n/sr/calendar.po             | 608 ++++++++++++++++++----------
 l10n/sr/contacts.po             | 119 ++++--
 l10n/sr/gallery.po              |  32 ++
 l10n/sr@latin/calendar.po       | 608 ++++++++++++++++++----------
 l10n/sr@latin/contacts.po       | 119 ++++--
 l10n/sr@latin/gallery.po        |  32 ++
 l10n/sv/calendar.po             | 569 +++++++++++++++++----------
 l10n/sv/contacts.po             | 119 ++++--
 l10n/sv/gallery.po              |  32 ++
 l10n/templates/calendar.pot     |  46 +--
 l10n/templates/contacts.pot     | 115 ++++--
 l10n/templates/core.pot         |   2 +-
 l10n/templates/files.pot        |   2 +-
 l10n/templates/gallery.pot      |  30 ++
 l10n/templates/media.pot        |   4 +-
 l10n/templates/settings.pot     |   2 +-
 l10n/tr/calendar.po             |  62 +--
 l10n/tr/contacts.po             | 119 ++++--
 l10n/tr/gallery.po              |  32 ++
 l10n/zh_CN/calendar.po          | 612 +++++++++++++++++-----------
 l10n/zh_CN/contacts.po          | 119 ++++--
 l10n/zh_CN/gallery.po           |  32 ++
 settings/l10n/ca.php            |  15 +-
 settings/l10n/cs_CZ.php         |   7 +
 settings/l10n/da.php            |   7 +
 settings/l10n/de.php            |   5 +
 settings/l10n/el.php            |   7 +
 settings/l10n/es.php            |   7 +
 settings/l10n/fr.php            |   7 +
 settings/l10n/it.php            |   7 +
 settings/l10n/nl.php            |   7 +
 settings/l10n/pl.php            |   7 +
 settings/l10n/ro.php            |   7 +
 260 files changed, 17481 insertions(+), 8027 deletions(-)
 create mode 100644 apps/calendar/l10n/cs_CZ.php
 create mode 100644 apps/calendar/l10n/pt_PT.php
 create mode 100644 apps/calendar/l10n/sv.php
 create mode 100644 l10n/ar/gallery.po
 create mode 100644 l10n/bg_BG/gallery.po
 create mode 100644 l10n/ca/gallery.po
 create mode 100644 l10n/cs_CZ/gallery.po
 create mode 100644 l10n/da/gallery.po
 create mode 100644 l10n/de/gallery.po
 create mode 100644 l10n/el/gallery.po
 create mode 100644 l10n/eo/gallery.po
 create mode 100644 l10n/es/gallery.po
 create mode 100644 l10n/et_EE/gallery.po
 create mode 100644 l10n/eu/gallery.po
 create mode 100644 l10n/fr/gallery.po
 create mode 100644 l10n/gl/calendar.po
 create mode 100644 l10n/gl/contacts.po
 create mode 100644 l10n/gl/core.po
 create mode 100644 l10n/gl/files.po
 create mode 100644 l10n/gl/gallery.po
 create mode 100644 l10n/gl/media.po
 create mode 100644 l10n/gl/settings.po
 create mode 100644 l10n/he/gallery.po
 create mode 100644 l10n/hr/gallery.po
 create mode 100644 l10n/hu_HU/gallery.po
 create mode 100644 l10n/hy/gallery.po
 create mode 100644 l10n/ia/gallery.po
 create mode 100644 l10n/id/gallery.po
 create mode 100644 l10n/it/gallery.po
 create mode 100644 l10n/ja_JP/gallery.po
 create mode 100644 l10n/lb/gallery.po
 create mode 100644 l10n/lt_LT/gallery.po
 create mode 100644 l10n/ms_MY/gallery.po
 create mode 100644 l10n/nb_NO/gallery.po
 create mode 100644 l10n/nl/gallery.po
 create mode 100644 l10n/nn_NO/gallery.po
 create mode 100644 l10n/pl/gallery.po
 create mode 100644 l10n/pt_BR/gallery.po
 create mode 100644 l10n/pt_PT/gallery.po
 create mode 100644 l10n/ro/gallery.po
 create mode 100644 l10n/ru/gallery.po
 create mode 100644 l10n/sk_SK/gallery.po
 create mode 100644 l10n/sl/gallery.po
 create mode 100644 l10n/sr/gallery.po
 create mode 100644 l10n/sr@latin/gallery.po
 create mode 100644 l10n/sv/gallery.po
 create mode 100644 l10n/templates/gallery.pot
 create mode 100644 l10n/tr/gallery.po
 create mode 100644 l10n/zh_CN/gallery.po

diff --git a/apps/calendar/l10n/ar.php b/apps/calendar/l10n/ar.php
index c22d816640b..7dc30ced856 100644
--- a/apps/calendar/l10n/ar.php
+++ b/apps/calendar/l10n/ar.php
@@ -69,14 +69,8 @@
 "Location of the Event" => "مكان الحدث",
 "Description" => "مواص�ات",
 "Description of the Event" => "وص� الحدث",
-"Import Ical File" => "إدخال مل� Ical",
-"How to import the new calendar?" => "كي�ية إدخال مل� جدول زمني ؟",
-"Import into an existing calendar" => "إدخال معلومات إلى جدول زمني حالي",
-"Import into a new calendar" => "إدخال معلومات إلى جدول زمني جديد",
 "Please choose the calendar" => "الرجاء إختر الجدول الزمني",
 "Import" => "إدخال",
-"Back" => "الرجوع",
-"Please fill out the form" => "الرجاء إملء الخانات",
 "Create a new event" => "إضا�ة حدث جديد",
 "Timezone" => "المنطقة الزمنية",
 "Timeformat" => "شكل الوقت",
diff --git a/apps/calendar/l10n/bg_BG.php b/apps/calendar/l10n/bg_BG.php
index 0c0b8604fb6..47610dcf67a 100644
--- a/apps/calendar/l10n/bg_BG.php
+++ b/apps/calendar/l10n/bg_BG.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Проблем � идентификаци�та",
 "Timezone changed" => "Ча�овата зона е �менена",
 "Invalid request" => "�евалидна за�вка",
 "Calendar" => "Календар",
@@ -11,50 +10,11 @@
 "Monthly" => "Ме�ечно",
 "Yearly" => "Годишно",
 "All day" => "В�ички дни",
-"Sunday" => "�едел�",
-"Monday" => "Понеделник",
-"Tuesday" => "Вторник",
-"Wednesday" => "Ср�да",
-"Thursday" => "Четвъртък",
-"Friday" => "Петък",
-"Saturday" => "Събота",
-"Sun." => "�ед.",
-"Mon." => "Пон.",
-"Tue." => "Ð’Ñ‚Ñ€.",
-"Wed." => "Ср�.",
-"Thu." => "Чет.",
-"Fri." => "Пет.",
-"Sat." => "Съб.",
-"January" => "Януари",
-"February" => "Февруари",
-"March" => "Март",
-"April" => "�прил",
-"May" => "Май",
-"June" => "Юни",
-"July" => "Юли",
-"August" => "�вгу�т",
-"September" => "Септември",
-"October" => "Октомври",
-"November" => "�оември",
-"December" => "Декември",
-"Jan." => "Ян.",
-"Feb." => "Фв.",
-"Mar." => "Март",
-"Apr." => "�пр.",
-"Jun." => "Юни",
-"Jul." => "Юли",
-"Aug." => "�вг.",
-"Sep." => "Сеп.",
-"Oct." => "Окт.",
-"Nov." => "�ое.",
-"Dec." => "Дек.",
+"Title" => "Заглавие",
 "Week" => "Седмица",
-"Weeks" => "Седмици",
-"Day" => "Ден",
 "Month" => "Ме�ец",
 "Today" => "Дне�",
 "Calendars" => "Календари",
-"Time" => "Ча�",
 "There was a fail, while parsing the file." => "Възникна проблем � разли�тването на файла.",
 "Choose active calendars" => "Изберете активен календар",
 "Download" => "Изтегл�не",
@@ -62,22 +22,19 @@
 "Edit calendar" => "Промени календар",
 "Displayname" => "Екранно име",
 "Active" => "�ктивен",
-"Description" => "Опи�ание",
 "Calendar color" => "Цв�т на календара",
 "Submit" => "Продължи",
 "Edit an event" => "Пром�на на �ъбитие",
-"Title" => "Заглавие",
 "Title of the Event" => "�аименование",
-"Location" => "Локаци�",
-"Location of the Event" => "Локаци�",
 "Category" => "Категори�",
 "All Day Event" => "Целодневно �ъбитие",
 "From" => "От",
 "To" => "До",
 "Repeat" => "Повтори",
-"Attendees" => "При�ъ�тващи",
+"Location" => "Локаци�",
+"Location of the Event" => "Локаци�",
+"Description" => "Опи�ание",
 "Description of the Event" => "Опи�ание",
-"Close" => "Затвори",
 "Create a new event" => "�ово �ъбитие",
 "Timezone" => "Ча�ова зона"
 );
diff --git a/apps/calendar/l10n/ca.php b/apps/calendar/l10n/ca.php
index 13affe320f0..19934baa0bd 100644
--- a/apps/calendar/l10n/ca.php
+++ b/apps/calendar/l10n/ca.php
@@ -1,8 +1,24 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Error d'autenticació",
+"New Timezone:" => "Nova zona horària:",
 "Timezone changed" => "La zona horària ha canviat",
 "Invalid request" => "Sol.licitud no vàlida",
 "Calendar" => "Calendari",
+"Wrong calendar" => "Calendari erroni",
+"Birthday" => "Aniversari",
+"Business" => "Feina",
+"Call" => "Trucada",
+"Clients" => "Clients",
+"Deliverer" => "Remitent",
+"Holidays" => "Vacances",
+"Ideas" => "Idees",
+"Journey" => "Viatge",
+"Jubilee" => "Sant",
+"Meeting" => "Reunió",
+"Other" => "Altres",
+"Personal" => "Personal",
+"Projects" => "Projectes",
+"Questions" => "Preguntes",
+"Work" => "Feina",
 "Does not repeat" => "No es repeteix",
 "Daily" => "Diari",
 "Weekly" => "Mensual",
@@ -10,21 +26,25 @@
 "Bi-Weekly" => "Bisetmanalment",
 "Monthly" => "Mensualment",
 "Yearly" => "Cada any",
-"All day" => "Tot el dia",
-"Sunday" => "Diumenge",
+"never" => "mai",
+"by occurrences" => "per aparicions",
+"by date" => "per data",
+"by monthday" => "per dia del mes",
+"by weekday" => "per dia de la setmana",
 "Monday" => "Dilluns",
 "Tuesday" => "Dimarts",
 "Wednesday" => "Dimecres",
 "Thursday" => "Dijous",
 "Friday" => "Divendres",
 "Saturday" => "Dissabte",
-"Sun." => "dg.",
-"Mon." => "dl.",
-"Tue." => "dm.",
-"Wed." => "dc.",
-"Thu." => "dj.",
-"Fri." => "dv.",
-"Sat." => "ds.",
+"Sunday" => "Diumenge",
+"events week of month" => "esdeveniments la setmana del mes",
+"first" => "primer",
+"second" => "segon",
+"third" => "tercer",
+"fourth" => "quart",
+"fifth" => "cinquè",
+"last" => "últim",
 "January" => "Gener",
 "February" => "Febrer",
 "March" => "Març",
@@ -37,10 +57,40 @@
 "October" => "Octubre",
 "November" => "Novembre",
 "December" => "Desembre",
+"by events date" => "per data d'esdeveniments",
+"by yearday(s)" => "per ahir(s)",
+"by weeknumber(s)" => "per número(s) de la setmana",
+"by day and month" => "per dia del mes",
+"Not an array" => "No és una sèrie",
+"Date" => "Data",
+"Cal." => "Cal.",
+"All day" => "Tot el dia",
+"Missing fields" => "Els camps que falten",
+"Title" => "Títol",
+"From Date" => "Des de la data",
+"From Time" => "Des de l'hora",
+"To Date" => "Fins a la data",
+"To Time" => "Fins a l'hora",
+"The event ends before it starts" => "L'esdeveniment acaba abans que comenci",
+"There was a database fail" => "Hi ha un error de base de dades",
+"Week" => "Setmana",
+"Month" => "Mes",
+"List" => "Llista",
+"Today" => "Avui",
+"Calendars" => "Calendaris",
+"There was a fail, while parsing the file." => "S'ha produït un error en analitzar el fitxer.",
+"Sun." => "dg.",
+"Mon." => "dl.",
+"Tue." => "dt.",
+"Wed." => "dc.",
+"Thu." => "dj.",
+"Fri." => "dv.",
+"Sat." => "ds.",
 "Jan." => "gen.",
 "Feb." => "febr.",
 "Mar." => "març",
 "Apr." => "abr.",
+"May." => "maig",
 "Jun." => "juny",
 "Jul." => "jul.",
 "Aug." => "ag.",
@@ -48,36 +98,52 @@
 "Oct." => "oct.",
 "Nov." => "nov.",
 "Dec." => "des.",
-"Week" => "Setmana",
-"Weeks" => "Setmanes",
-"Day" => "Dia",
-"Month" => "Mes",
-"Today" => "Avui",
-"Calendars" => "Calendaris",
-"Time" => "Hora",
-"There was a fail, while parsing the file." => "S'ha produït un error en analitzar el fitxer.",
 "Choose active calendars" => "Seleccioneu calendaris actius",
+"New Calendar" => "Calendari nou",
+"CalDav Link" => "Enllaç CalDav",
 "Download" => "Baixa",
 "Edit" => "Edita",
+"Delete" => "Esborra",
+"New calendar" => "Calendari nou",
 "Edit calendar" => "Edita el calendari",
 "Displayname" => "Mostra el nom",
 "Active" => "Actiu",
-"Description" => "Descripció",
 "Calendar color" => "Color del calendari",
-"Submit" => "Tramet",
+"Save" => "Desa",
+"Submit" => "Envia",
+"Cancel" => "Cancel·la",
 "Edit an event" => "Edició d'un esdeveniment",
-"Title" => "Títol",
+"Export" => "Exporta",
 "Title of the Event" => "Títol de l'esdeveniment",
-"Location" => "Ubicació",
-"Location of the Event" => "Ubicació de l'esdeveniment",
 "Category" => "Categoria",
+"Select category" => "Seleccioneu categoria",
 "All Day Event" => "Esdeveniment de tot el dia",
 "From" => "Des de",
 "To" => "Fins a",
-"Repeat" => "Repeteix",
-"Attendees" => "Assistents",
+"Advanced options" => "Opcions avançades",
+"Repeat" => "Repetició",
+"Advanced" => "Avançat",
+"Select weekdays" => "Dies de la setmana seleccionats",
+"Select days" => "Seleccionar dies",
+"and the events day of year." => "i dies d'esdeveniment de l'any.",
+"and the events day of month." => "i dies d'esdeveniment del mes.",
+"Select months" => "Seleccionar mesos",
+"Select weeks" => "Seleccionar setmanes",
+"and the events week of year." => "i setmanes d'esdeveniment de l'any.",
+"Interval" => "Interval",
+"End" => "Final",
+"occurrences" => "aparicions",
+"Location" => "Ubicació",
+"Location of the Event" => "Ubicació de l'esdeveniment",
+"Description" => "Descripció",
 "Description of the Event" => "Descripció de l'esdeveniment",
-"Close" => "Tanca",
+"Please choose the calendar" => "Escolliu el calendari",
+"Import" => "Importa",
 "Create a new event" => "Crea un nou esdeveniment",
-"Timezone" => "Zona horària"
+"Timezone" => "Zona horària",
+"Check always for changes of the timezone" => "Comprova sempre en els canvis de zona horària",
+"Timeformat" => "Format de temps",
+"24h" => "24",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Adreça de sincronització del calendari CalDAV:"
 );
diff --git a/apps/calendar/l10n/cs_CZ.php b/apps/calendar/l10n/cs_CZ.php
new file mode 100644
index 00000000000..f55cd0f01ae
--- /dev/null
+++ b/apps/calendar/l10n/cs_CZ.php
@@ -0,0 +1,149 @@
+<?php $TRANSLATIONS = array(
+"New Timezone:" => "Nová �asová zóna:",
+"Timezone changed" => "Časová zóna byla změněna",
+"Invalid request" => "Chybný požadavek",
+"Calendar" => "Kalendář",
+"Wrong calendar" => "Nesprávný kalendář",
+"Birthday" => "Narozeniny",
+"Business" => "Pracovní",
+"Call" => "Volat",
+"Clients" => "Klienti",
+"Deliverer" => "Doru�ovatel",
+"Holidays" => "Prázdniny",
+"Ideas" => "Nápady",
+"Journey" => "Cesta",
+"Jubilee" => "Jubileum",
+"Meeting" => "Schůzka",
+"Other" => "Další",
+"Personal" => "Osobní",
+"Projects" => "Projekty",
+"Questions" => "Dotazy",
+"Work" => "Práce",
+"Does not repeat" => "Neopakuje se",
+"Daily" => "DennÄ›",
+"Weekly" => "Týdně",
+"Every Weekday" => "Každý všední den",
+"Bi-Weekly" => "Jednou za dva týdny",
+"Monthly" => "Měsí�ně",
+"Yearly" => "Ro�ně",
+"never" => "nikdy",
+"by occurrences" => "podle výskytu",
+"by date" => "podle data",
+"by monthday" => "podle dne v měsíci",
+"by weekday" => "podle dne v týdnu",
+"Monday" => "Pondělí",
+"Tuesday" => "Úterý",
+"Wednesday" => "Středa",
+"Thursday" => "ÄŒtvrtek",
+"Friday" => "Pátek",
+"Saturday" => "Sobota",
+"Sunday" => "Neděle",
+"events week of month" => "týdenní události v měsíci",
+"first" => "první",
+"second" => "druhý",
+"third" => "třetí",
+"fourth" => "�tvrtý",
+"fifth" => "pátý",
+"last" => "poslední",
+"January" => "Leden",
+"February" => "Únor",
+"March" => "Břeyen",
+"April" => "Duben",
+"May" => "Květen",
+"June" => "ÄŒerven",
+"July" => "ÄŒervenec",
+"August" => "Srpen",
+"September" => "Září",
+"October" => "Říjen",
+"November" => "Listopad",
+"December" => "Prosinec",
+"by events date" => "podle data události",
+"by yearday(s)" => "po dni (dnech)",
+"by weeknumber(s)" => "podle �ísel týdnů",
+"by day and month" => "podle dne a měsíce",
+"Not an array" => "Není zařazeno",
+"Date" => "Datum",
+"Cal." => "Kal.",
+"All day" => "Celý den",
+"Missing fields" => "Chybějící pole",
+"Title" => "Název",
+"From Date" => "Od data",
+"From Time" => "Od",
+"To Date" => "Do data",
+"To Time" => "Do",
+"The event ends before it starts" => "Akce kon�í před zahájením",
+"There was a database fail" => "Chyba v databázi",
+"Week" => "týden",
+"Month" => "měsíc",
+"List" => "Seznam",
+"Today" => "dnes",
+"Calendars" => "Kalendáře",
+"There was a fail, while parsing the file." => "Chyba při převodu souboru",
+"Sun." => "Ne",
+"Mon." => "Po",
+"Tue." => "Út",
+"Wed." => "St",
+"Thu." => "ÄŒt",
+"Fri." => "Pá",
+"Sat." => "So",
+"Jan." => "Led.",
+"Feb." => "Úno.",
+"Mar." => "Bře.",
+"Apr." => "Dub.",
+"May." => "KvÄ›.",
+"Jun." => "ÄŒer.",
+"Jul." => "ÄŒec.",
+"Aug." => "Srp.",
+"Sep." => "Zář.",
+"Oct." => "Říj.",
+"Nov." => "Lis.",
+"Dec." => "Pro.",
+"Choose active calendars" => "Vybrat aktivní kalendář",
+"New Calendar" => "Nový kalendář",
+"CalDav Link" => "Odkaz CalDav",
+"Download" => "Stáhnout",
+"Edit" => "Editovat",
+"Delete" => "Odstranit",
+"New calendar" => "Nový kalendář",
+"Edit calendar" => "Editovat kalendář",
+"Displayname" => "Zobrazené jméno",
+"Active" => "Aktivní",
+"Calendar color" => "Barva kalendáře",
+"Save" => "Uložit",
+"Submit" => "Potvrdit",
+"Cancel" => "Storno",
+"Edit an event" => "Editovat událost",
+"Export" => "Export",
+"Title of the Event" => "Název události",
+"Category" => "Kategorie",
+"Select category" => "Vyberte kategorii",
+"All Day Event" => "Celodenní událost",
+"From" => "od",
+"To" => "do",
+"Advanced options" => "Pokro�ilé volby",
+"Repeat" => "Opakovat",
+"Advanced" => "Pokro�ilé",
+"Select weekdays" => "Vybrat dny v týdnu",
+"Select days" => "Vybrat dny",
+"and the events day of year." => "a denní události v roce",
+"and the events day of month." => "a denní události v měsíci",
+"Select months" => "Vybrat měsíce",
+"Select weeks" => "Vybrat týdny",
+"and the events week of year." => "a týden s událostmi v roce",
+"Interval" => "Interval",
+"End" => "Konec",
+"occurrences" => "výskyty",
+"Location" => "Umístění",
+"Location of the Event" => "Místo konání události",
+"Description" => "Popis",
+"Description of the Event" => "Popis události",
+"Please choose the calendar" => "Zvolte prosím kalendář",
+"Import" => "Import",
+"Create a new event" => "Vytvořit novou událost",
+"Timezone" => "Časové pásmo",
+"Check always for changes of the timezone" => "Zkontrolujte vždy změny �asového pásma",
+"Timeformat" => "Formát �asu",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Adresa pro synchronizaci kalendáře CalDAV:"
+);
diff --git a/apps/calendar/l10n/da.php b/apps/calendar/l10n/da.php
index 46af5cb43ab..b43c89a6dd3 100644
--- a/apps/calendar/l10n/da.php
+++ b/apps/calendar/l10n/da.php
@@ -1,13 +1,14 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Godkendelsesfejl",
-"Wrong calendar" => "Forkert kalender",
+"New Timezone:" => "Ny tidszone:",
 "Timezone changed" => "Tidszone ændret",
 "Invalid request" => "Ugyldig forespørgsel",
 "Calendar" => "Kalender",
+"Wrong calendar" => "Forkert kalender",
 "Birthday" => "Fødselsdag",
 "Business" => "Forretning",
 "Call" => "Ring",
 "Clients" => "Kunder",
+"Deliverer" => "Leverance",
 "Holidays" => "Helligdage",
 "Ideas" => "Ideér",
 "Journey" => "Rejse",
@@ -22,24 +23,27 @@
 "Daily" => "Daglig",
 "Weekly" => "Ugentlig",
 "Every Weekday" => "Alle hverdage",
-"Bi-Weekly" => "Bi-Ugentligt",
-"Monthly" => "MÃ¥nedlige",
+"Bi-Weekly" => "Hver anden uge",
+"Monthly" => "MÃ¥nedlig",
 "Yearly" => "Ã…rlig",
-"All day" => "Hele dagen",
-"Sunday" => "Søndag",
+"never" => "aldrig",
+"by occurrences" => "efter forekomster",
+"by date" => "efter dato",
+"by monthday" => "efter dag i måneden",
+"by weekday" => "efter ugedag",
 "Monday" => "Mandag",
 "Tuesday" => "Tirsdag",
 "Wednesday" => "Onsdag",
 "Thursday" => "Torsdag",
 "Friday" => "Fredag",
 "Saturday" => "Lørdag",
-"Sun." => "Søn.",
-"Mon." => "Man.",
-"Tue." => "Tir.",
-"Wed." => "Ons.",
-"Thu." => "Tor.",
-"Fri." => "Fre.",
-"Sat." => "Lør.",
+"Sunday" => "øndag",
+"first" => "første",
+"second" => "anden",
+"third" => "tredje",
+"fourth" => "fjerde",
+"fifth" => "femte",
+"last" => "sidste",
 "January" => "Januar",
 "February" => "Februar",
 "March" => "Marts",
@@ -52,6 +56,34 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "December",
+"by events date" => "efter begivenheders dato",
+"by weeknumber(s)" => "efter ugenummer/-numre",
+"by day and month" => "efter dag og måned",
+"Not an array" => "Ikke en array",
+"Date" => "Dato",
+"Cal." => "Kal.",
+"All day" => "Hele dagen",
+"Missing fields" => "Manglende felter",
+"Title" => "Titel",
+"From Date" => "Fra dato",
+"From Time" => "Fra tidspunkt",
+"To Date" => "Til dato",
+"To Time" => "Til tidspunkt",
+"The event ends before it starts" => "Begivenheden slutter, inden den begynder",
+"There was a database fail" => "Der var en fejl i databasen",
+"Week" => "Uge",
+"Month" => "MÃ¥ned",
+"List" => "Liste",
+"Today" => "I dag",
+"Calendars" => "Kalendere",
+"There was a fail, while parsing the file." => "Der opstod en fejl under gennemlæsning af filen.",
+"Sun." => "Søn.",
+"Mon." => "Man.",
+"Tue." => "Tir.",
+"Wed." => "Ons.",
+"Thu." => "Tor.",
+"Fri." => "Fre.",
+"Sat." => "Lør.",
 "Jan." => "Jan.",
 "Feb." => "Feb.",
 "Mar." => "Mar.",
@@ -60,49 +92,53 @@
 "Jun." => "Jun.",
 "Jul." => "Jul.",
 "Aug." => "Aug.",
-"Sep." => "Sep.",
-"Oct." => "Oct.",
+"Sep." => "Sept.",
+"Oct." => "Okt.",
 "Nov." => "Nov.",
 "Dec." => "Dec.",
-"Week" => "Uge",
-"Weeks" => "Uger",
-"More before {startdate}" => "Mere før {startdate}",
-"More after {enddate}" => "Mere efter {enddate}",
-"Day" => "Dag",
-"Month" => "MÃ¥ned",
-"List" => "Liste",
-"Today" => "I dag",
-"Calendars" => "Kalendere",
-"Time" => "Tid",
-"There was a fail, while parsing the file." => "Der opstod en fejl under gennemlæsning af filen.",
-"Choose active calendars" => "Vælg aktiv kalendere",
+"Choose active calendars" => "Vælg aktive kalendere",
 "New Calendar" => "Ny Kalender",
-"CalDav Link" => "CalDav Link",
+"CalDav Link" => "CalDav-link",
 "Download" => "Hent",
 "Edit" => "Rediger",
+"Delete" => "Slet",
 "New calendar" => "Ny kalender",
 "Edit calendar" => "Rediger kalender",
-"Displayname" => "Visningsnavn",
+"Displayname" => "Vist navn",
 "Active" => "Aktiv",
-"Description" => "Beskrivelse",
-"Calendar color" => "Kalender farve",
+"Calendar color" => "Kalenderfarve",
 "Save" => "Gem",
 "Submit" => "Send",
-"Cancel" => "Annullér",
+"Cancel" => "Annuller",
 "Edit an event" => "Redigér en begivenhed",
-"Title" => "Titel",
+"Export" => "Eksporter",
 "Title of the Event" => "Titel på begivenheden",
-"Location" => "Sted",
-"Location of the Event" => "Placering af begivenheden",
 "Category" => "Kategori",
 "Select category" => "Vælg kategori",
 "All Day Event" => "Heldagsarrangement",
 "From" => "Fra",
 "To" => "Til",
+"Advanced options" => "Avancerede indstillinger",
 "Repeat" => "Gentag",
-"Attendees" => "Deltagere",
+"Advanced" => "Avanceret",
+"Select weekdays" => "Vælg ugedage",
+"Select days" => "Vælg dage",
+"Select months" => "Vælg måneder",
+"Select weeks" => "Vælg uger",
+"Interval" => "Interval",
+"End" => "Afslutning",
+"occurrences" => "forekomster",
+"Location" => "Sted",
+"Location of the Event" => "Placering af begivenheden",
+"Description" => "Beskrivelse",
 "Description of the Event" => "Beskrivelse af begivenheden",
-"Close" => "Luk",
+"Please choose the calendar" => "Vælg venligst kalender",
+"Import" => "Importer",
 "Create a new event" => "Opret en ny begivenhed",
-"Timezone" => "Tidszone"
+"Timezone" => "Tidszone",
+"Check always for changes of the timezone" => "Check altid efter ændringer i tidszone",
+"Timeformat" => "Tidsformat",
+"24h" => "24T",
+"12h" => "12T",
+"Calendar CalDAV syncing address:" => "Synkroniseringsadresse til CalDAV:"
 );
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index 44bab2a5c35..617fc2a2ff0 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Anmeldefehler",
-"Wrong calendar" => "Falscher Kalender",
+"New Timezone:" => "Neue Zeitzone:",
 "Timezone changed" => "Zeitzone geändert",
 "Invalid request" => "Anfragefehler",
 "Calendar" => "Kalender",
+"Wrong calendar" => "Falscher Kalender",
 "Birthday" => "Geburtstag",
 "Business" => "Geschäftlich",
 "Call" => "Anruf",
@@ -26,22 +26,25 @@
 "Bi-Weekly" => "jede zweite Woche",
 "Monthly" => "monatlich",
 "Yearly" => "jährlich",
-"Not an array" => "Kein Feld",
-"All day" => "Ganztags",
-"Sunday" => "Sonntag",
+"never" => "niemals",
+"by occurrences" => "nach Vorkommen",
+"by date" => "nach Datum",
+"by monthday" => "an einem Monatstag",
+"by weekday" => "an einem Wochentag",
 "Monday" => "Montag",
 "Tuesday" => "Dienstag",
 "Wednesday" => "Mittwoch",
 "Thursday" => "Donnerstag",
 "Friday" => "Freitag",
 "Saturday" => "Samstag",
-"Sun." => "Son.",
-"Mon." => "Mon.",
-"Tue." => "Die.",
-"Wed." => "Mit.",
-"Thu." => "Don.",
-"Fri." => "Fre.",
-"Sat." => "Sam.",
+"Sunday" => "Sonntag",
+"events week of month" => "Woche des Monats vom Termin",
+"first" => "erste",
+"second" => "zweite",
+"third" => "dritte",
+"fourth" => "vierte",
+"fifth" => "fünfte",
+"last" => "letzte",
 "January" => "Januar",
 "February" => "Februar",
 "March" => "März",
@@ -54,57 +57,74 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "Dezember",
-"Jan." => "Jan.",
-"Feb." => "Feb.",
-"Mar." => "Mär.",
-"Apr." => "Apr.",
-"May." => "Mai",
-"Jun." => "Jun.",
-"Jul." => "Jul.",
-"Aug." => "Aug.",
-"Sep." => "Sep.",
-"Oct." => "Okt.",
-"Nov." => "Nov.",
-"Dec." => "Dez.",
+"by events date" => "bei Tag des Termins",
+"by yearday(s)" => "an einem Tag des Jahres",
+"by weeknumber(s)" => "an einer Wochennummer",
+"by day and month" => "an einer Tag und Monats Kombination",
+"Not an array" => "Kein Feld",
+"Date" => "Datum",
+"Cal." => "Kal.",
+"All day" => "Ganztags",
+"Missing fields" => "fehlende Felder",
+"Title" => "Titel",
+"From Date" => "Startdatum",
+"From Time" => "Startzeit",
+"To Date" => "Enddatum",
+"To Time" => "Endzeit",
+"The event ends before it starts" => "Der Termin hört auf, bevor er angefangen hat.",
+"There was a database fail" => "Datenbankfehler",
 "Week" => "Woche",
-"Weeks" => "Wochen",
-"More before {startdate}" => "Mehr vor {startdate}",
-"More after {enddate}" => "Mehr nach {enddate}",
-"Day" => "Tag",
 "Month" => "Monat",
 "List" => "Liste",
 "Today" => "Heute",
 "Calendars" => "Kalender",
-"Time" => "Zeit",
 "There was a fail, while parsing the file." => "Fehler beim Einlesen der Datei.",
 "Choose active calendars" => "Aktive Kalender wählen",
 "New Calendar" => "Neuer Kalender",
 "CalDav Link" => "CalDAV-Link",
 "Download" => "Herunterladen",
 "Edit" => "Bearbeiten",
+"Delete" => "Löschen",
 "New calendar" => "Neuer Kalender",
 "Edit calendar" => "Kalender bearbeiten",
 "Displayname" => "Anzeigename",
 "Active" => "Aktiv",
-"Description" => "Beschreibung",
 "Calendar color" => "Kalenderfarbe",
 "Save" => "Speichern",
 "Submit" => "Bestätigen",
 "Cancel" => "Abbrechen",
 "Edit an event" => "Ereignis bearbeiten",
-"Title" => "Titel",
+"Export" => "Exportieren",
 "Title of the Event" => "Name",
-"Location" => "Ort",
-"Location of the Event" => "Ort",
 "Category" => "Kategorie",
 "Select category" => "Kategorie auswählen",
 "All Day Event" => "Ganztägiges Ereignis",
 "From" => "von",
 "To" => "bis",
+"Advanced options" => "Erweiterte Optionen",
 "Repeat" => "wiederholen",
-"Attendees" => "Teilnehmer",
+"Advanced" => "Erweitert",
+"Select weekdays" => "Wochentage auswählen",
+"Select days" => "Tage auswählen",
+"and the events day of year." => "und den Tag des Jahres vom Termin",
+"and the events day of month." => "und den Tag des Monats vom Termin",
+"Select months" => "Monate auswählen",
+"Select weeks" => "Wochen auswählen",
+"and the events week of year." => "und den Tag des Jahres vom Termin",
+"Interval" => "Intervall",
+"End" => "Ende",
+"occurrences" => "Vorkommen",
+"Location" => "Ort",
+"Location of the Event" => "Ort",
+"Description" => "Beschreibung",
 "Description of the Event" => "Beschreibung",
-"Close" => "Schließen",
+"Please choose the calendar" => "Bitte wählen Sie den Kalender.",
+"Import" => "Importieren",
 "Create a new event" => "Neues Ereignis",
-"Timezone" => "Zeitzone"
+"Timezone" => "Zeitzone",
+"Check always for changes of the timezone" => "immer die Zeitzone überprüfen",
+"Timeformat" => "Zeitformat",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Kalender CalDAV Synchronisationsadresse:"
 );
diff --git a/apps/calendar/l10n/el.php b/apps/calendar/l10n/el.php
index e2c26502cef..edc2635b8c7 100644
--- a/apps/calendar/l10n/el.php
+++ b/apps/calendar/l10n/el.php
@@ -1,16 +1,19 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Σφάλμα ταυτοποίησης",
-"Wrong calendar" => "Λάθος ημε�ολόγιο",
+"New Timezone:" => "�έα ζώνη ώ�ας:",
 "Timezone changed" => "Η ζώνη ώ�ας άλλαξε",
 "Invalid request" => "Μη έγκυ�ο αίτημα",
 "Calendar" => "Ημε�ολόγιο",
+"Wrong calendar" => "Λάθος ημε�ολόγιο",
 "Birthday" => "Γενέθλια",
 "Business" => "Επιχεί�ηση",
 "Call" => "Κλήση",
 "Clients" => "Πελάτες",
+"Deliverer" => "Πα�αδώσας",
 "Holidays" => "Διακοπές",
 "Ideas" => "Ιδέες",
 "Journey" => "Ταξίδι",
+"Jubilee" => "Γιο�τή",
+"Meeting" => "Συνάντηση",
 "Other" => "Άλλο",
 "Personal" => "Π�οσωπικό",
 "Projects" => "Έ�γα",
@@ -23,27 +26,30 @@
 "Bi-Weekly" => "Δ�ο φο�ές την εβδομάδα",
 "Monthly" => "Μηνιαία",
 "Yearly" => "Ετήσια",
-"Not an array" => "Δεν είναι μια σει�ά",
-"All day" => "Ολοήμε�ο",
-"Sunday" => "Κυ�ιακή",
+"never" => "ποτέ",
+"by occurrences" => "κατά συχνότητα π�όσβασης",
+"by date" => "κατά ημε�ομηνία",
+"by monthday" => "κατά ημέ�α",
+"by weekday" => "κατά εβδομάδα",
 "Monday" => "Δευτέ�α",
 "Tuesday" => "Τ�ίτη",
 "Wednesday" => "Τετά�τη",
 "Thursday" => "Πέμπτη",
 "Friday" => "Πα�ασκευή",
 "Saturday" => "Σάββατο",
-"Sun." => "Κυ�.",
-"Mon." => "Δευτ.",
-"Tue." => "Τ�.",
-"Wed." => "Τετ.",
-"Thu." => "Πέμ.",
-"Fri." => "Πα�.",
-"Sat." => "Σάβ.",
+"Sunday" => "Κυ�ιακή",
+"events week of month" => "συμβάντα της εβδομάδας του μήνα",
+"first" => "π�ώτο",
+"second" => "δε�τε�ο",
+"third" => "τ�ίτο",
+"fourth" => "τέτα�το",
+"fifth" => "πέμπτο",
+"last" => "τελευταίο",
 "January" => "Ιανουά�ιος",
 "February" => "Φεβ�ουά�ιος",
 "March" => "Μά�τιος",
 "April" => "Απ�ίλιος",
-"May" => "Μάιος",
+"May" => "Μάϊος",
 "June" => "Ιο�νιος",
 "July" => "Ιο�λιος",
 "August" => "Α�γουστος",
@@ -51,52 +57,93 @@
 "October" => "Οκτώβ�ιος",
 "November" => "�οέμβ�ιος",
 "December" => "Δεκέμβ�ιος",
+"by events date" => "κατά ημε�ομηνία συμβάντων",
+"by yearday(s)" => "κατά ημέ�α(ες) του έτους",
+"by weeknumber(s)" => "κατά εβδομάδα(ες)",
+"by day and month" => "κατά ημέ�α και μήνα",
+"Not an array" => "Δεν είναι μια σει�ά",
+"Date" => "Ημε�ομηνία",
+"Cal." => "Ημε�.",
+"All day" => "Ολοήμε�ο",
+"Missing fields" => "Πεδία που λείπουν",
+"Title" => "Τίτλος",
+"From Date" => "Από Ημε�ομηνία",
+"From Time" => "Από ��α",
+"To Date" => "Έως Ημε�ομηνία",
+"To Time" => "Έως ��α",
+"The event ends before it starts" => "Το γεγονός ολοκλη�ώνεται π�ιν από την ένα�ξή του",
+"There was a database fail" => "Υπή�ξε σφάλμα στη βάση δεδομένων",
+"Week" => "Εβδομάδα",
+"Month" => "Μήνας",
+"List" => "Λίστα",
+"Today" => "Σήμε�α",
+"Calendars" => "Ημε�ολόγια",
+"There was a fail, while parsing the file." => "Υπή�ξε μια αποτυχία, κατά την αξιολόγηση του α�χείου.",
+"Sun." => "Κυ�.",
+"Mon." => "Δευτ.",
+"Tue." => "Τ�ι.",
+"Wed." => "Τετ.",
+"Thu." => "Πέμ.",
+"Fri." => "Πα�.",
+"Sat." => "Σαβ.",
 "Jan." => "Ιαν.",
 "Feb." => "Φεβ.",
 "Mar." => "Μα�.",
 "Apr." => "Απ�.",
-"Jun." => "Ιο�ν.",
-"Jul." => "Ιο�λ.",
+"May." => "Μάϊ.",
+"Jun." => "Ιον.",
+"Jul." => "Ιολ.",
 "Aug." => "Α�γ.",
 "Sep." => "Σεπ.",
 "Oct." => "Οκτ.",
-"Nov." => "�οέ.",
+"Nov." => "�οε.",
 "Dec." => "Δεκ.",
-"Week" => "Εβδομάδα",
-"Weeks" => "Εβδομάδες",
-"Day" => "Ημέ�α",
-"Month" => "Μήνας",
-"List" => "Λίστα",
-"Today" => "Σήμε�α",
-"Calendars" => "Ημε�ολόγια",
-"Time" => "��α",
-"There was a fail, while parsing the file." => "Υπή�χε μια αποτυχία, κατά την ανάλυση του α�χείου.",
 "Choose active calendars" => "Επιλέξτε τα ενε�γά ημε�ολόγια",
 "New Calendar" => "�έα Ημε�ολόγιο",
+"CalDav Link" => "Σ�νδεση CalDAV",
 "Download" => "Λήψη",
 "Edit" => "Επεξε�γασία",
+"Delete" => "Διαγ�αφή",
 "New calendar" => "�έο ημε�ολόγιο",
 "Edit calendar" => "Επεξε�γασία ημε�ολογίου",
 "Displayname" => "Π�οβολή ονόματος",
 "Active" => "Ενε�γό",
-"Description" => "Πε�ιγ�αφή",
 "Calendar color" => "Χ�ώμα ημε�ολογίου",
+"Save" => "Αποθήκευση",
 "Submit" => "Υποβολή",
 "Cancel" => "Ακ��ωση",
 "Edit an event" => "Επεξε�γασία ενός γεγονότος",
-"Title" => "Τίτλος",
+"Export" => "Εξαγωγή",
 "Title of the Event" => "Τίτλος συμβάντος",
-"Location" => "Τοποθεσία",
-"Location of the Event" => "Τοποθεσία συμβάντος",
 "Category" => "Κατηγο�ία",
 "Select category" => "Επιλέξτε κατηγο�ία",
 "All Day Event" => "Ολοήμε�ο συμβάν",
 "From" => "Από",
 "To" => "Έως",
+"Advanced options" => "Επιλογές για π�οχω�ημένους",
 "Repeat" => "Επαναλαμβανόμενο",
-"Attendees" => "Πα�ευ�ισκόμενοι",
+"Advanced" => "Για π�οχω�ημένους",
+"Select weekdays" => "Επιλογή ημε�ών εβδομάδας",
+"Select days" => "Επιλογή ημε�ών",
+"and the events day of year." => "και των ημε�ών του χ�όνου που υπά�χουν συμβάντα.",
+"and the events day of month." => "και των ημε�ών του μήνα που υπά�χουν συμβάντα.",
+"Select months" => "Επιλογή μηνών",
+"Select weeks" => "Επιλογή εβδομάδων",
+"and the events week of year." => "και των εβδομάδων του χ�όνου που υπά�ουν συμβάντα.",
+"Interval" => "Διάστημα",
+"End" => "Τέλος",
+"occurrences" => "πε�ιστατικά",
+"Location" => "Τοποθεσία",
+"Location of the Event" => "Τοποθεσία συμβάντος",
+"Description" => "Πε�ιγ�αφή",
 "Description of the Event" => "Πε�ιγ�αφή του συμβάντος",
-"Close" => "Κλείσιμο",
+"Please choose the calendar" => "Πα�ακαλώ επιλέξτε το ημε�ολόγιο",
+"Import" => "Εισαγωγή",
 "Create a new event" => "Δημιου�γήστε ένα νέο συμβάν",
-"Timezone" => "Ζώνη ώ�ας"
+"Timezone" => "Ζώνη ώ�ας",
+"Check always for changes of the timezone" => "Έλεγοχς πάντα για τις αλλαγές της ζώνης ώ�ας",
+"Timeformat" => "Μο�φή ώ�ας",
+"24h" => "24ω",
+"12h" => "12ω",
+"Calendar CalDAV syncing address:" => "Διε�θυνση για το συγχ�ονισμο� του ημε�ολογίου CalDAV:"
 );
diff --git a/apps/calendar/l10n/eo.php b/apps/calendar/l10n/eo.php
index ba4ec43d811..7c1cc97b9ee 100644
--- a/apps/calendar/l10n/eo.php
+++ b/apps/calendar/l10n/eo.php
@@ -118,14 +118,8 @@
 "Location of the Event" => "Okazaĵoloko",
 "Description" => "Priskribo",
 "Description of the Event" => "Okazaĵopriskribo",
-"Import Ical File" => "Enporti Ical-dosieron",
-"How to import the new calendar?" => "Kiel enporti la novan kalendaron?",
-"Import into an existing calendar" => "Enporti en estantan kalendaron",
-"Import into a new calendar" => "Enporti en novan kalendaron",
 "Please choose the calendar" => "Bonvolu elekti kalendaron",
 "Import" => "Enporti",
-"Back" => "AntaÅ­eniri",
-"Please fill out the form" => "Bonvolu plenigi la formularon",
 "Create a new event" => "Krei okazaĵon",
 "Timezone" => "Horozono",
 "Check always for changes of the timezone" => "Ĉiam kontroli ĉu la horzono �an�i�is",
diff --git a/apps/calendar/l10n/es.php b/apps/calendar/l10n/es.php
index 2d2d1d377ef..5f4097709da 100644
--- a/apps/calendar/l10n/es.php
+++ b/apps/calendar/l10n/es.php
@@ -1,12 +1,14 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Error de autentificación",
-"Wrong calendar" => "Calendario incorrecto",
+"New Timezone:" => "Nueva zona horaria:",
 "Timezone changed" => "Zona horaria cambiada",
 "Invalid request" => "Petición no válida",
 "Calendar" => "Calendario",
+"Wrong calendar" => "Calendario incorrecto",
 "Birthday" => "Cumpleaños",
 "Business" => "Negocios",
+"Call" => "LLamada",
 "Clients" => "Clientes",
+"Deliverer" => "Entrega",
 "Holidays" => "Feriados",
 "Ideas" => "Ideas",
 "Journey" => "Viaje",
@@ -14,31 +16,35 @@
 "Meeting" => "Reunión",
 "Other" => "Otro",
 "Personal" => "Personal",
-"Projects" => "Projectos",
+"Projects" => "Proyectos",
 "Questions" => "Preguntas",
 "Work" => "Trabajo",
 "Does not repeat" => "No se repite",
 "Daily" => "Diariamente",
 "Weekly" => "Semanalmente",
-"Every Weekday" => "Una vez a la semana",
-"Bi-Weekly" => "Dos veces a la semana",
+"Every Weekday" => "Días de semana laboral",
+"Bi-Weekly" => "Cada 2 semanas",
 "Monthly" => "Mensualmente",
 "Yearly" => "Anualmente",
-"All day" => "Todo el día",
-"Sunday" => "Domingo",
+"never" => "nunca",
+"by occurrences" => "por ocurrencias",
+"by date" => "por fecha",
+"by monthday" => "por día del mes",
+"by weekday" => "por día de la semana",
 "Monday" => "Lunes",
 "Tuesday" => "Martes",
 "Wednesday" => "Miércoles",
 "Thursday" => "Jueves",
 "Friday" => "Viernes",
 "Saturday" => "Sábado",
-"Sun." => "Dom.",
-"Mon." => "Lun.",
-"Tue." => "Mar.",
-"Wed." => "Mie.",
-"Thu." => "Jue.",
-"Fri." => "Vie.",
-"Sat." => "Sáb.",
+"Sunday" => "Domingo",
+"events week of month" => "eventos de la semana del mes",
+"first" => "primer",
+"second" => "segundo",
+"third" => "tercer",
+"fourth" => "cuarto",
+"fifth" => "quinto",
+"last" => "último",
 "January" => "Enero",
 "February" => "Febrero",
 "March" => "Marzo",
@@ -51,10 +57,40 @@
 "October" => "Octubre",
 "November" => "Noviembre",
 "December" => "Diciembre",
+"by events date" => "por fecha de los eventos",
+"by yearday(s)" => "por día(s) del año",
+"by weeknumber(s)" => "por número(s) de semana",
+"by day and month" => "por día y mes",
+"Not an array" => "No es una serie",
+"Date" => "Fecha",
+"Cal." => "Cal.",
+"All day" => "Todo el día",
+"Missing fields" => "Los campos que faltan",
+"Title" => "Título",
+"From Date" => "Desde la fecha",
+"From Time" => "Desde la hora",
+"To Date" => "Hasta la fecha",
+"To Time" => "Hasta la hora",
+"The event ends before it starts" => "El evento termina antes de que comience",
+"There was a database fail" => "Hubo un error en la base de datos",
+"Week" => "Semana",
+"Month" => "Mes",
+"List" => "Lista",
+"Today" => "Hoy",
+"Calendars" => "Calendarios",
+"There was a fail, while parsing the file." => "Hubo un fallo al analizar el archivo.",
+"Sun." => "Dom.",
+"Mon." => "Lun.",
+"Tue." => "Mar.",
+"Wed." => "Mié.",
+"Thu." => "Jue.",
+"Fri." => "Vie.",
+"Sat." => "Sáb.",
 "Jan." => "Ene.",
 "Feb." => "Feb.",
 "Mar." => "Mar.",
 "Apr." => "Abr.",
+"May." => "May.",
 "Jun." => "Jun.",
 "Jul." => "Jul.",
 "Aug." => "Ago.",
@@ -62,42 +98,52 @@
 "Oct." => "Oct.",
 "Nov." => "Nov.",
 "Dec." => "Dic.",
-"Week" => "Semana",
-"Weeks" => "Semanas",
-"Day" => "Día",
-"Month" => "Mes",
-"List" => "Lista",
-"Today" => "Hoy",
-"Calendars" => "Calendarios",
-"Time" => "Hora",
-"There was a fail, while parsing the file." => "Hubo un fallo al analizar el archivo.",
 "Choose active calendars" => "Elige los calendarios activos",
 "New Calendar" => "Nuevo calendario",
+"CalDav Link" => "Enlace a CalDav",
 "Download" => "Descargar",
 "Edit" => "Editar",
+"Delete" => "Eliminar",
 "New calendar" => "Nuevo calendario",
 "Edit calendar" => "Editar calendario",
 "Displayname" => "Nombre",
 "Active" => "Activo",
-"Description" => "Descripción",
 "Calendar color" => "Color del calendario",
 "Save" => "Guardar",
 "Submit" => "Guardar",
 "Cancel" => "Cancelar",
 "Edit an event" => "Editar un evento",
-"Title" => "Título",
+"Export" => "Exportar",
 "Title of the Event" => "Título del evento",
-"Location" => "Lugar",
-"Location of the Event" => "Lugar del Evento",
 "Category" => "Categoría",
 "Select category" => "Seleccionar categoría",
 "All Day Event" => "Todo el día",
 "From" => "Desde",
 "To" => "Hasta",
+"Advanced options" => "Opciones avanzadas",
 "Repeat" => "Repetir",
-"Attendees" => "Asistentes",
+"Advanced" => "Avanzado",
+"Select weekdays" => "Seleccionar días de la semana",
+"Select days" => "Seleccionar días",
+"and the events day of year." => "y el día del año de los eventos.",
+"and the events day of month." => "y el día del mes de los eventos.",
+"Select months" => "Seleccionar meses",
+"Select weeks" => "Seleccionar semanas",
+"and the events week of year." => "y la semana del año de los eventos.",
+"Interval" => "Intervalo",
+"End" => "Fin",
+"occurrences" => "ocurrencias",
+"Location" => "Lugar",
+"Location of the Event" => "Lugar del Evento",
+"Description" => "Descripción",
 "Description of the Event" => "Descripción del evento",
-"Close" => "Cerrar",
+"Please choose the calendar" => "Elija el calendario",
+"Import" => "Importar",
 "Create a new event" => "Crear un nuevo evento",
-"Timezone" => "Zona horaria"
+"Timezone" => "Zona horaria",
+"Check always for changes of the timezone" => "Comprobar siempre por cambios en la zona horaria",
+"Timeformat" => "Formato de hora",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Dirección de sincronización de calendario CalDAV:"
 );
diff --git a/apps/calendar/l10n/et_EE.php b/apps/calendar/l10n/et_EE.php
index c66638f2b4c..7144ea763c4 100644
--- a/apps/calendar/l10n/et_EE.php
+++ b/apps/calendar/l10n/et_EE.php
@@ -1,8 +1,23 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Autentimise viga",
 "Timezone changed" => "Ajavöönd on muudetud",
 "Invalid request" => "Vigane päring",
 "Calendar" => "Kalender",
+"Wrong calendar" => "Vale kalender",
+"Birthday" => "Sünnipäev",
+"Business" => "Äri",
+"Call" => "Helista",
+"Clients" => "Kliendid",
+"Deliverer" => "Kohaletoimetaja",
+"Holidays" => "Pühad",
+"Ideas" => "Ideed",
+"Journey" => "Reis",
+"Jubilee" => "Juubel",
+"Meeting" => "Kohtumine",
+"Other" => "Muu",
+"Personal" => "Isiklik",
+"Projects" => "Projektid",
+"Questions" => "Küsimused",
+"Work" => "Töö",
 "Does not repeat" => "Ei kordu",
 "Daily" => "Iga päev",
 "Weekly" => "Iga nädal",
@@ -10,74 +25,56 @@
 "Bi-Weekly" => "Üle nädala",
 "Monthly" => "Igal kuul",
 "Yearly" => "Igal aastal",
+"Not an array" => "Pole andmemassiiv",
 "All day" => "Kogu päev",
-"Sunday" => "Pühapäev",
-"Monday" => "Esmaspäev",
-"Tuesday" => "Teisipäev",
-"Wednesday" => "Kolmapäev",
-"Thursday" => "Neljapäev",
-"Friday" => "Reede",
-"Saturday" => "Laupäev",
-"Sun." => "Pü.",
-"Mon." => "Esm.",
-"Tue." => "Teisip.",
-"Wed." => "Kolmap.",
-"Thu." => "Neljap.",
-"Fri." => "Reede",
-"Sat." => "Laup.",
-"January" => "Jaanuar",
-"February" => "Veebruar",
-"March" => "Märts",
-"April" => "Aprill",
-"May" => "Mai",
-"June" => "Juuni",
-"July" => "Juuli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktoober",
-"November" => "November",
-"December" => "Detsember",
-"Jan." => "Jan.",
-"Feb." => "Veebr.",
-"Mar." => "Märts",
-"Apr." => "Apr.",
-"Jun." => "Jun.",
-"Jul." => "Jul.",
-"Aug." => "Aug.",
-"Sep." => "Sept.",
-"Oct." => "Okt.",
-"Nov." => "Nov.",
-"Dec." => "Dets.",
+"Missing fields" => "Puuduvad väljad",
+"Title" => "Pealkiri",
+"From Date" => "Alates kuupäevast",
+"From Time" => "Alates kellaajast",
+"To Date" => "Kuni kuupäevani",
+"To Time" => "Kuni kellaajani",
+"The event ends before it starts" => "Üritus lõpeb enne, kui see algab",
+"There was a database fail" => "Tekkis andmebaasi viga",
 "Week" => "Nädal",
-"Weeks" => "Nädalat",
-"Day" => "Päev",
 "Month" => "Kuu",
+"List" => "Nimekiri",
 "Today" => "Täna",
 "Calendars" => "Kalendrid",
-"Time" => "Kellaaeg",
 "There was a fail, while parsing the file." => "Faili parsimisel tekkis viga.",
 "Choose active calendars" => "Vali aktiivsed kalendrid",
+"New Calendar" => "Uus kalender",
+"CalDav Link" => "CalDav Link",
 "Download" => "Lae alla",
 "Edit" => "Muuda",
+"Delete" => "Kustuta",
+"New calendar" => "Uus kalender",
 "Edit calendar" => "Muuda kalendrit",
 "Displayname" => "Näidatav nimi",
 "Active" => "Aktiivne",
-"Description" => "Kirjeldus",
 "Calendar color" => "Kalendri värv",
+"Save" => "Salvesta",
 "Submit" => "OK",
+"Cancel" => "Loobu",
 "Edit an event" => "Muuda sündmust",
-"Title" => "Pealkiri",
+"Export" => "Ekspordi",
 "Title of the Event" => "Sündmuse pealkiri",
-"Location" => "Asukoht",
-"Location of the Event" => "Sündmuse toimumiskoht",
 "Category" => "Kategooria",
+"Select category" => "Salvesta kategooria",
 "All Day Event" => "Kogu päeva sündmus",
 "From" => "Alates",
 "To" => "Kuni",
+"Advanced options" => "Lisavalikud",
 "Repeat" => "Korda",
-"Attendees" => "Osalejad",
+"Location" => "Asukoht",
+"Location of the Event" => "Sündmuse toimumiskoht",
+"Description" => "Kirjeldus",
 "Description of the Event" => "Sündmuse kirjeldus",
-"Close" => "Sulge",
+"Please choose the calendar" => "Palun vali kalender",
+"Import" => "Impordi",
 "Create a new event" => "Loo sündmus",
-"Timezone" => "Ajavöönd"
+"Timezone" => "Ajavöönd",
+"Timeformat" => "Aja vorming",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Kalendri CalDAV sünkroniseerimise aadress:"
 );
diff --git a/apps/calendar/l10n/eu.php b/apps/calendar/l10n/eu.php
index b7ac1e1b59d..be5b3f2203d 100644
--- a/apps/calendar/l10n/eu.php
+++ b/apps/calendar/l10n/eu.php
@@ -69,14 +69,8 @@
 "Location of the Event" => "Gertaeraren kokalekua",
 "Description" => "Deskribapena",
 "Description of the Event" => "Gertaeraren deskribapena",
-"Import Ical File" => "inportatu ical fitxategia",
-"How to import the new calendar?" => "Nola inportatu egutegi berria?",
-"Import into an existing calendar" => "inportatu existitzen den egutegi batera",
-"Import into a new calendar" => "inportatu egutegi berri batera",
 "Please choose the calendar" => "Mesedez aukeratu egutegia",
 "Import" => "Importatu",
-"Back" => "Atzera",
-"Please fill out the form" => "Mesedez inprimakia bete",
 "Create a new event" => "Sortu gertaera berria",
 "Timezone" => "Ordu-zona",
 "Timeformat" => "Ordu formatua",
diff --git a/apps/calendar/l10n/fr.php b/apps/calendar/l10n/fr.php
index c12d773a67a..82b58f6ad61 100644
--- a/apps/calendar/l10n/fr.php
+++ b/apps/calendar/l10n/fr.php
@@ -1,17 +1,17 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Erreur d'authentification",
-"Wrong calendar" => "Mauvais calendrier",
+"New Timezone:" => "Nouveau fuseau horaire :",
 "Timezone changed" => "Fuseau horaire modifié",
 "Invalid request" => "Requête invalide",
 "Calendar" => "Calendrier",
+"Wrong calendar" => "Mauvais calendrier",
 "Birthday" => "Anniversaire",
-"Business" => "Business",
+"Business" => "Professionnel",
 "Call" => "Appel",
-"Clients" => "Clients",
-"Deliverer" => "Livreur",
+"Clients" => "Clientèle",
+"Deliverer" => "Livraison",
 "Holidays" => "Vacances",
 "Ideas" => "Idées",
-"Journey" => "Journée",
+"Journey" => "Déplacement",
 "Jubilee" => "Jubilé",
 "Meeting" => "Meeting",
 "Other" => "Autre",
@@ -21,27 +21,29 @@
 "Work" => "Travail",
 "Does not repeat" => "Pas de répétition",
 "Daily" => "Tous les jours",
-"Weekly" => "Toutes les semaines",
-"Every Weekday" => "Chaque jour de la semaine",
-"Bi-Weekly" => "Bimestriel",
-"Monthly" => "Tous les mois",
-"Yearly" => "Tous les ans",
-"Not an array" => "Ce n'est pas un tableau",
-"All day" => "Tous les jours",
-"Sunday" => "Dimanche",
+"Weekly" => "Hebdomadaire",
+"Every Weekday" => "Quotidien",
+"Bi-Weekly" => "Bi-hebdomadaire",
+"Monthly" => "Mensuel",
+"Yearly" => "Annuel",
+"never" => "jamais",
+"by occurrences" => "par occurrences",
+"by date" => "par date",
+"by monthday" => "par jour du mois",
+"by weekday" => "par jour de la semaine",
 "Monday" => "Lundi",
 "Tuesday" => "Mardi",
 "Wednesday" => "Mercredi",
 "Thursday" => "Jeudi",
 "Friday" => "Vendredi",
 "Saturday" => "Samedi",
-"Sun." => "Dim.",
-"Mon." => "Lun.",
-"Tue." => "Mar.",
-"Wed." => "Mer.",
-"Thu." => "Jeu.",
-"Fri." => "Ven.",
-"Sat." => "Sam.",
+"Sunday" => "Dimanche",
+"first" => "premier",
+"second" => "second",
+"third" => "troisième",
+"fourth" => "quatrième",
+"fifth" => "cinquième",
+"last" => "dernier",
 "January" => "Janvier",
 "February" => "Février",
 "March" => "Mars",
@@ -54,57 +56,90 @@
 "October" => "Octobre",
 "November" => "Novembre",
 "December" => "Décembre",
+"by events date" => "par date d’événements",
+"by yearday(s)" => "par jour(s) de l'année",
+"by weeknumber(s)" => "par numéro de semaine(s)",
+"by day and month" => "par jour et mois",
+"Not an array" => "Ce n'est pas un tableau",
+"Date" => "Date",
+"Cal." => "Cal.",
+"All day" => "Journée entière",
+"Missing fields" => "Champs manquants",
+"Title" => "Titre",
+"From Date" => "De la date",
+"From Time" => "De l'heure",
+"To Date" => "A la date",
+"To Time" => "A l'heure",
+"The event ends before it starts" => "L'évènement s'est terminé avant qu'il ne commence",
+"There was a database fail" => "Il y a eu un échec dans la base de donnée",
+"Week" => "Semaine",
+"Month" => "Mois",
+"List" => "Liste",
+"Today" => "Aujourd'hui",
+"Calendars" => "Calendriers",
+"There was a fail, while parsing the file." => "Une erreur est survenue pendant la lecture du fichier.",
+"Sun." => "Dim.",
+"Mon." => "Lun.",
+"Tue." => "Mar.",
+"Wed." => "Mer.",
+"Thu." => "Jeu.",
+"Fri." => "Ven.",
+"Sat." => "Sam.",
 "Jan." => "Jan.",
 "Feb." => "Fév.",
 "Mar." => "Mar.",
 "Apr." => "Avr.",
-"May." => "Peut-être *****",
-"Jun." => "Juin",
-"Jul." => "Juil.",
-"Aug." => "Aoû.",
+"May." => "Mai.",
+"Jun." => "Jui.",
+"Jul." => "Jit.",
+"Aug." => "Aou.",
 "Sep." => "Sep.",
 "Oct." => "Oct.",
 "Nov." => "Nov.",
 "Dec." => "Déc.",
-"Week" => "Semaine",
-"Weeks" => "Semaines",
-"More before {startdate}" => "Voir plus avant {startdate}",
-"More after {enddate}" => "Voir plus après {enddate}",
-"Day" => "Jour",
-"Month" => "Mois",
-"List" => "Liste",
-"Today" => "Aujourd'hui",
-"Calendars" => "Calendriers",
-"Time" => "Heure",
-"There was a fail, while parsing the file." => "Une erreur est survenue pendant la lecture du fichier.",
 "Choose active calendars" => "Choix des calendriers actifs",
 "New Calendar" => "Nouveau Calendrier",
 "CalDav Link" => "Lien CalDav",
 "Download" => "Télécharger",
 "Edit" => "Éditer",
+"Delete" => "Supprimer",
 "New calendar" => "Nouveau calendrier",
 "Edit calendar" => "Éditer le calendrier",
 "Displayname" => "Nom d'affichage",
 "Active" => "Actif",
-"Description" => "Description",
 "Calendar color" => "Couleur du calendrier",
 "Save" => "Sauvegarder",
 "Submit" => "Soumettre",
 "Cancel" => "Annuler",
 "Edit an event" => "Éditer un événement",
-"Title" => "Titre",
+"Export" => "Exporter",
 "Title of the Event" => "Titre de l'événement",
-"Location" => "Localisation",
-"Location of the Event" => "Localisation de l'événement",
 "Category" => "Catégorie",
 "Select category" => "Sélectionner une catégorie",
-"All Day Event" => "Événement de toute une journée",
+"All Day Event" => "Journée entière",
 "From" => "De",
 "To" => "À",
+"Advanced options" => "Options avancées",
 "Repeat" => "Répétition",
-"Attendees" => "Personnes présentes",
+"Advanced" => "Avancé",
+"Select weekdays" => "Sélection des jours de la semaine",
+"Select days" => "Sélection des jours",
+"Select months" => "Sélection des mois",
+"Select weeks" => "Sélection des semaines",
+"Interval" => "Intervalle",
+"End" => "Fin",
+"occurrences" => "occurrences",
+"Location" => "Emplacement",
+"Location of the Event" => "Emplacement de l'événement",
+"Description" => "Description",
 "Description of the Event" => "Description de l'événement",
-"Close" => "Fermer",
+"Please choose the calendar" => "Choisissez le calendrier svp",
+"Import" => "Importer",
 "Create a new event" => "Créer un nouvel événement",
-"Timezone" => "Fuseau horaire"
+"Timezone" => "Fuseau horaire",
+"Check always for changes of the timezone" => "Toujours vérifier d'éventuels changements de fuseau horaire",
+"Timeformat" => "Format de l'heure",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Adresse de synchronisation du calendrier CalDAV :"
 );
diff --git a/apps/calendar/l10n/hr.php b/apps/calendar/l10n/hr.php
index 7cdda27770a..1778511edee 100644
--- a/apps/calendar/l10n/hr.php
+++ b/apps/calendar/l10n/hr.php
@@ -69,14 +69,8 @@
 "Location of the Event" => "Lokacija Događaja",
 "Description" => "Opis",
 "Description of the Event" => "Opis događaja",
-"Import Ical File" => "Uvoz Ical datoteke",
-"How to import the new calendar?" => "Kako uvesti novi kalendar?",
-"Import into an existing calendar" => "Uvoz u postojeći kalendar",
-"Import into a new calendar" => "Uvoz u novi kalendar",
 "Please choose the calendar" => "Odaberite kalendar",
 "Import" => "Uvoz",
-"Back" => "Natrag",
-"Please fill out the form" => "Molimo popunite obrazac",
 "Create a new event" => "Unesi novi događaj",
 "Timezone" => "Vremenska zona",
 "Timeformat" => "Format vremena",
diff --git a/apps/calendar/l10n/hu_HU.php b/apps/calendar/l10n/hu_HU.php
index 0e61307794f..3c52551abb3 100644
--- a/apps/calendar/l10n/hu_HU.php
+++ b/apps/calendar/l10n/hu_HU.php
@@ -67,14 +67,8 @@
 "Location of the Event" => "Az esemény helyszíne",
 "Description" => "Leírás",
 "Description of the Event" => "Az esemény leírása",
-"Import Ical File" => "Ical fájl importálása",
-"How to import the new calendar?" => "Hogyan legyen importálva az új naptár?",
-"Import into an existing calendar" => "Létező naptárba importálás",
-"Import into a new calendar" => "Új naptárba importálás",
 "Please choose the calendar" => "Válassz naptárat",
 "Import" => "Importálás",
-"Back" => "Vissza",
-"Please fill out the form" => "Töltsd ki az űrlapot",
 "Create a new event" => "Új esemény létrehozása",
 "Timezone" => "Időzóna",
 "Timeformat" => "Időformátum",
diff --git a/apps/calendar/l10n/id.php b/apps/calendar/l10n/id.php
index 5cb95d0b358..a52891813c9 100644
--- a/apps/calendar/l10n/id.php
+++ b/apps/calendar/l10n/id.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Kesalahan otentikasi",
 "Timezone changed" => "Zona waktu telah diubah",
 "Invalid request" => "Permintaan tidak sah",
 "Calendar" => "Kalender",
@@ -11,50 +10,11 @@
 "Monthly" => "Bulanan",
 "Yearly" => "Tahunan",
 "All day" => "Semua Hari",
-"Sunday" => "Minggu",
-"Monday" => "Senin",
-"Tuesday" => "Selasa",
-"Wednesday" => "Rabu",
-"Thursday" => "Kamis",
-"Friday" => "Jumat",
-"Saturday" => "Sabtu",
-"Sun." => "Min.",
-"Mon." => "Sen.",
-"Tue." => "Sel.",
-"Wed." => "Rab.",
-"Thu." => "Kam.",
-"Fri." => "Jum.",
-"Sat." => "Sab.",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Maret",
-"April" => "April",
-"May" => "Mei",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "Agustus",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Desember",
-"Jan." => "Jan.",
-"Feb." => "Feb.",
-"Mar." => "Mar.",
-"Apr." => "Apr.",
-"Jun." => "Jun.",
-"Jul." => "Jul.",
-"Aug." => "Agu.",
-"Sep." => "Sep.",
-"Oct." => "Okt.",
-"Nov." => "Nov.",
-"Dec." => "Des.",
+"Title" => "Judul",
 "Week" => "Minggu",
-"Weeks" => "Minggu",
-"Day" => "Hari",
 "Month" => "Bulan",
 "Today" => "Hari ini",
 "Calendars" => "Kalender",
-"Time" => "Waktu",
 "There was a fail, while parsing the file." => "Terjadi kesalahan, saat mengurai berkas.",
 "Choose active calendars" => "Pilih kalender aktif",
 "Download" => "Unduh",
@@ -62,22 +22,19 @@
 "Edit calendar" => "Sunting kalender",
 "Displayname" => "Namatampilan",
 "Active" => "Aktif",
-"Description" => "Deskripsi",
 "Calendar color" => "Warna kalender",
 "Submit" => "Sampaikan",
 "Edit an event" => "Sunting agenda",
-"Title" => "Judul",
 "Title of the Event" => "Judul Agenda",
-"Location" => "Lokasi",
-"Location of the Event" => "Lokasi Agenda",
 "Category" => "Kategori",
 "All Day Event" => "Agenda di Semua Hari",
 "From" => "Dari",
 "To" => "Ke",
 "Repeat" => "Ulangi",
-"Attendees" => "Yang menghadiri",
+"Location" => "Lokasi",
+"Location of the Event" => "Lokasi Agenda",
+"Description" => "Deskripsi",
 "Description of the Event" => "Deskripsi dari Agenda",
-"Close" => "Tutup",
 "Create a new event" => "Buat agenda baru",
 "Timezone" => "Zonawaktu"
 );
diff --git a/apps/calendar/l10n/it.php b/apps/calendar/l10n/it.php
index dcb6799b04c..71cfa6c8464 100644
--- a/apps/calendar/l10n/it.php
+++ b/apps/calendar/l10n/it.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Errore di autenticazione",
-"Wrong calendar" => "Calendario sbagliato",
+"New Timezone:" => "Nuovo fuso orario:",
 "Timezone changed" => "Fuso orario cambiato",
-"Invalid request" => "Richiesta non validia",
+"Invalid request" => "Richiesta non valida",
 "Calendar" => "Calendario",
+"Wrong calendar" => "Calendario sbagliato",
 "Birthday" => "Compleanno",
 "Business" => "Azienda",
 "Call" => "Chiama",
@@ -26,22 +26,24 @@
 "Bi-Weekly" => "Ogni due settimane",
 "Monthly" => "Mensile",
 "Yearly" => "Annuale",
-"Not an array" => "Non è un array",
-"All day" => "Tutti i giorni",
-"Sunday" => "Domenica",
+"never" => "mai",
+"by occurrences" => "per occorrenze",
+"by date" => "per data",
+"by monthday" => "per giorno del mese",
+"by weekday" => "per giorno della settimana",
 "Monday" => "Lunedì",
 "Tuesday" => "Martedì",
 "Wednesday" => "Mercoledì",
 "Thursday" => "Giovedì",
 "Friday" => "Venerdì",
 "Saturday" => "Sabato",
-"Sun." => "Dom.",
-"Mon." => "Lun.",
-"Tue." => "Mar.",
-"Wed." => "Mer.",
-"Thu." => "Gio.",
-"Fri." => "Ven.",
-"Sat." => "Sab.",
+"Sunday" => "Domenica",
+"first" => "primo",
+"second" => "secondo",
+"third" => "terzo",
+"fourth" => "quarto",
+"fifth" => "quinto",
+"last" => "ultimo",
 "January" => "Gennaio",
 "February" => "Febbraio",
 "March" => "Marzo",
@@ -54,57 +56,65 @@
 "October" => "Ottobre",
 "November" => "Novembre",
 "December" => "Dicembre",
-"Jan." => "Gen.",
-"Feb." => "Feb.",
-"Mar." => "Mar.",
-"Apr." => "Apr.",
-"May." => "Maggio.",
-"Jun." => "Giu.",
-"Jul." => "Lug.",
-"Aug." => "Ago.",
-"Sep." => "Set.",
-"Oct." => "Ott.",
-"Nov." => "Nov.",
-"Dec." => "Dic.",
+"Not an array" => "Non è un array",
+"Date" => "Data",
+"Cal." => "Cal.",
+"All day" => "Tutti i giorni",
+"Missing fields" => "Campi mancanti",
+"Title" => "Titolo",
+"From Date" => "Dal giorno",
+"From Time" => "Ora inizio",
+"To Date" => "al giorno",
+"To Time" => "Ora fine",
+"The event ends before it starts" => "L'evento finisce prima d'iniziare",
+"There was a database fail" => "C'è stato un errore col database",
 "Week" => "Settimana",
-"Weeks" => "Settimane",
-"More before {startdate}" => "Prima di {startdate}",
-"More after {enddate}" => "Dopo {enddate}",
-"Day" => "Giorno",
 "Month" => "Mese",
 "List" => "Lista",
 "Today" => "Oggi",
 "Calendars" => "Calendari",
-"Time" => "Ora",
 "There was a fail, while parsing the file." => "C'è stato un errore nel parsing del file.",
 "Choose active calendars" => "Selezionare calendari attivi",
 "New Calendar" => "Nuovo Calendario",
 "CalDav Link" => "CalDav Link",
 "Download" => "Download",
 "Edit" => "Modifica",
+"Delete" => "Elimina",
 "New calendar" => "Nuovo calendario",
 "Edit calendar" => "Modifica calendario",
 "Displayname" => "Mostra nome",
 "Active" => "Attivo",
-"Description" => "Descrizione",
 "Calendar color" => "Colore calendario",
 "Save" => "Salva",
 "Submit" => "Invia",
 "Cancel" => "Annulla",
 "Edit an event" => "Modifica evento",
-"Title" => "Titolo",
+"Export" => "Esporta",
 "Title of the Event" => "Titolo evento",
-"Location" => "Luogo",
-"Location of the Event" => "Luogo evento",
 "Category" => "Categoria",
 "Select category" => "Seleziona categoria",
 "All Day Event" => "Tutti gli eventi del giorno",
 "From" => "Da",
 "To" => "A",
+"Advanced options" => "Opzioni avanzate",
 "Repeat" => "Ripeti",
-"Attendees" => "Partecipanti",
+"Select weekdays" => "Seleziona i giorni della settimana",
+"Select days" => "Seleziona i giorni",
+"Select months" => "Seleziona i mesi",
+"Select weeks" => "Seleziona le settimane",
+"Interval" => "Intervallo",
+"End" => "Fine",
+"Location" => "Luogo",
+"Location of the Event" => "Luogo evento",
+"Description" => "Descrizione",
 "Description of the Event" => "Descrizione evento",
-"Close" => "Chiuso",
+"Please choose the calendar" => "Per favore scegli il calendario",
+"Import" => "Importa",
 "Create a new event" => "Crea evento",
-"Timezone" => "Timezone"
+"Timezone" => "Fuso orario",
+"Check always for changes of the timezone" => "Controlla sempre i cambiamenti di fuso orario",
+"Timeformat" => "Formato ora",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Indirizzo sincronizzazione calendario CalDAV:"
 );
diff --git a/apps/calendar/l10n/ja_JP.php b/apps/calendar/l10n/ja_JP.php
index 90653c1d6f2..ef83f5d5a65 100644
--- a/apps/calendar/l10n/ja_JP.php
+++ b/apps/calendar/l10n/ja_JP.php
@@ -69,14 +69,8 @@
 "Location of the Event" => "イベント�場所",
 "Description" => "メモ",
 "Description of the Event" => "イベント�メモ",
-"Import Ical File" => "iCalファイル�イン�ート",
-"How to import the new calendar?" => "新��カレンダー�イン�ート方法�？",
-"Import into an existing calendar" => "既存カレンダー�イン�ート���",
-"Import into a new calendar" => "新��カレンダー�イン�ート���",
 "Please choose the calendar" => "カレンダーを�択������",
 "Import" => "イン�ート",
-"Back" => "戻る",
-"Please fill out the form" => "フォーム�入力������",
 "Create a new event" => "新��イベントを作��る",
 "Timezone" => "タイムゾーン",
 "Timeformat" => "時刻�フォーマット",
diff --git a/apps/calendar/l10n/lb.php b/apps/calendar/l10n/lb.php
index 82cdac133fa..08b8d88f2a2 100644
--- a/apps/calendar/l10n/lb.php
+++ b/apps/calendar/l10n/lb.php
@@ -1,8 +1,23 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Authentifizéierung's Feeler",
 "Timezone changed" => "Zäitzon geännert",
 "Invalid request" => "Ongülteg Requête",
 "Calendar" => "Kalenner",
+"Wrong calendar" => "Falschen Kalenner",
+"Birthday" => "Gebuertsdag",
+"Business" => "Geschäftlech",
+"Call" => "Uruff",
+"Clients" => "Clienten",
+"Deliverer" => "Liwwerant",
+"Holidays" => "Vakanzen",
+"Ideas" => "Ideeën",
+"Journey" => "Dag",
+"Jubilee" => "Jubiläum",
+"Meeting" => "Meeting",
+"Other" => "Aner",
+"Personal" => "Perséinlech",
+"Projects" => "Projeten",
+"Questions" => "Froen",
+"Work" => "Aarbecht",
 "Does not repeat" => "Widderhëlt sech net",
 "Daily" => "Deeglech",
 "Weekly" => "All Woch",
@@ -10,74 +25,56 @@
 "Bi-Weekly" => "All zweet Woch",
 "Monthly" => "All Mount",
 "Yearly" => "All Joer",
+"Not an array" => "Keen array",
 "All day" => "All Dag",
-"Sunday" => "Sonnden",
-"Monday" => "Méinden",
-"Tuesday" => "Dënschden",
-"Wednesday" => "Mëttwoch",
-"Thursday" => "Donneschden",
-"Friday" => "Freiden",
-"Saturday" => "Samschden",
-"Sun." => "So. ",
-"Mon." => "Méin. ",
-"Tue." => "Dën.",
-"Wed." => "Mëtt.",
-"Thu." => "Do.",
-"Fri." => "Fr.",
-"Sat." => "Sam.",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mäerz",
-"April" => "Abrëll",
-"May" => "Mäi",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Dezember",
-"Jan." => "Jan.",
-"Feb." => "Feb.",
-"Mar." => "Mär.",
-"Apr." => "Abr.",
-"Jun." => "Jun.",
-"Jul." => "Jul.",
-"Aug." => "Aug.",
-"Sep." => "Sep.",
-"Oct." => "Okt.",
-"Nov." => "Nov.",
-"Dec." => "Dez.",
+"Missing fields" => "Felder déi feelen",
+"Title" => "Titel",
+"From Date" => "Vun Datum",
+"From Time" => "Vun Zäit",
+"To Date" => "Bis Datum",
+"To Time" => "Bis Zäit",
+"The event ends before it starts" => "D'Evenement hält op ier et ufänkt",
+"There was a database fail" => "En Datebank Feeler ass opgetrueden",
 "Week" => "Woch",
-"Weeks" => "Wochen",
-"Day" => "Dag",
 "Month" => "Mount",
+"List" => "Lescht",
 "Today" => "Haut",
 "Calendars" => "Kalenneren",
-"Time" => "Zäit",
 "There was a fail, while parsing the file." => "Feeler beim lueden vum Fichier.",
 "Choose active calendars" => "Wiel aktiv Kalenneren aus",
+"New Calendar" => "Neien Kalenner",
+"CalDav Link" => "CalDav Link",
 "Download" => "Eroflueden",
 "Edit" => "Editéieren",
+"Delete" => "Läschen",
+"New calendar" => "Neien Kalenner",
 "Edit calendar" => "Kalenner editéieren",
 "Displayname" => "Numm",
 "Active" => "Aktiv",
-"Description" => "Beschreiwung",
 "Calendar color" => "Fuerf vum Kalenner",
+"Save" => "Späicheren",
 "Submit" => "Fortschécken",
+"Cancel" => "Ofbriechen",
 "Edit an event" => "Evenement editéieren",
-"Title" => "Titel",
+"Export" => "Export",
 "Title of the Event" => "Titel vum Evenement",
-"Location" => "Uert",
-"Location of the Event" => "Uert vum Evenement",
 "Category" => "Kategorie",
+"Select category" => "Kategorie auswielen",
 "All Day Event" => "Ganz-Dag Evenement",
 "From" => "Vun",
 "To" => "Fir",
+"Advanced options" => "Avancéiert Optiounen",
 "Repeat" => "Widderhuelen",
-"Attendees" => "Participanten",
+"Location" => "Uert",
+"Location of the Event" => "Uert vum Evenement",
+"Description" => "Beschreiwung",
 "Description of the Event" => "Beschreiwung vum Evenement",
-"Close" => "Zoumaachen",
+"Please choose the calendar" => "Wiel den Kalenner aus",
+"Import" => "Import",
 "Create a new event" => "En Evenement maachen",
-"Timezone" => "Zäitzon"
+"Timezone" => "Zäitzon",
+"Timeformat" => "Zäit Format",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "CalDAV Kalenner Synchronisatioun's Adress:"
 );
diff --git a/apps/calendar/l10n/lt_LT.php b/apps/calendar/l10n/lt_LT.php
index 6baff16abfe..7cc74887f75 100644
--- a/apps/calendar/l10n/lt_LT.php
+++ b/apps/calendar/l10n/lt_LT.php
@@ -60,14 +60,8 @@
 "Location of the Event" => "Įvykio vieta",
 "Description" => "Aprašymas",
 "Description of the Event" => "Įvykio aprašymas",
-"Import Ical File" => "Importuoti Ical failÄ…",
-"How to import the new calendar?" => "Kaip importuoti naują kalendorių?",
-"Import into an existing calendar" => "Importuoti į esantį katalogą",
-"Import into a new calendar" => "Importuoti į naują kalendorių",
 "Please choose the calendar" => "Pasirinkite kalendorių",
 "Import" => "Importuoti",
-"Back" => "Atgal",
-"Please fill out the form" => "Užpildykite formą",
 "Create a new event" => "Sukurti naują įvykį",
 "Timezone" => "Laiko juosta",
 "Timeformat" => "Laiko formatas",
diff --git a/apps/calendar/l10n/ms_MY.php b/apps/calendar/l10n/ms_MY.php
index 625422a8582..663cc6a6468 100644
--- a/apps/calendar/l10n/ms_MY.php
+++ b/apps/calendar/l10n/ms_MY.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Ralat pengesahan",
 "Timezone changed" => "Zon waktu diubah",
 "Invalid request" => "Permintaan tidak sah",
 "Calendar" => "Kalendar",
@@ -11,50 +10,11 @@
 "Monthly" => "Bulanan",
 "Yearly" => "Tahunan",
 "All day" => "Sepanjang hari",
-"Sunday" => "Ahad",
-"Monday" => "Isnin",
-"Tuesday" => "Selasa",
-"Wednesday" => "Rabu",
-"Thursday" => "Khamis",
-"Friday" => "Jumaat",
-"Saturday" => "Sabtu",
-"Sun." => "Ahad",
-"Mon." => "Isnin",
-"Tue." => "Selasa",
-"Wed." => "Rabu",
-"Thu." => "Khamis",
-"Fri." => "Jumaat",
-"Sat." => "Sabtu",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Mac",
-"April" => "April ",
-"May" => "Mei",
-"June" => "Jun",
-"July" => "Julai",
-"August" => "Ogos",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Disember",
-"Jan." => "Jan",
-"Feb." => "Feb",
-"Mar." => "Mac",
-"Apr." => "Apr",
-"Jun." => "Jun",
-"Jul." => "Jul",
-"Aug." => "Ogos",
-"Sep." => "Sep",
-"Oct." => "Okt",
-"Nov." => "Nov",
-"Dec." => "Dis",
+"Title" => "Tajuk",
 "Week" => "Minggu",
-"Weeks" => "Minggu",
-"Day" => "Hari",
 "Month" => "Bulan",
 "Today" => "Hari ini",
 "Calendars" => "Kalendar",
-"Time" => "Waktu",
 "There was a fail, while parsing the file." => "Berlaku kegagalan ketika penguraian fail. ",
 "Choose active calendars" => "Pilih kalendar yang aktif",
 "Download" => "Muat turun",
@@ -62,22 +22,19 @@
 "Edit calendar" => "Edit kalendar",
 "Displayname" => "Paparan nama",
 "Active" => "Aktif",
-"Description" => "Huraian",
 "Calendar color" => "Warna kalendar",
 "Submit" => "Hantar",
 "Edit an event" => "Edit agenda",
-"Title" => "Tajuk",
 "Title of the Event" => "Tajuk agenda",
-"Location" => "Lokasi",
-"Location of the Event" => "Lokasi agenda",
 "Category" => "kategori",
 "All Day Event" => "Agenda di sepanjang hari ",
 "From" => "Dari",
 "To" => "ke",
 "Repeat" => "Ulang",
-"Attendees" => "Hadirin",
+"Location" => "Lokasi",
+"Location of the Event" => "Lokasi agenda",
+"Description" => "Huraian",
 "Description of the Event" => "Huraian agenda",
-"Close" => "Tutup",
 "Create a new event" => "Buat agenda baru",
 "Timezone" => "Zon waktu"
 );
diff --git a/apps/calendar/l10n/nb_NO.php b/apps/calendar/l10n/nb_NO.php
index 95e555bc852..e7ecf47b6ed 100644
--- a/apps/calendar/l10n/nb_NO.php
+++ b/apps/calendar/l10n/nb_NO.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Autentifikasjonsfeil",
 "Timezone changed" => "Tidssone endret",
 "Invalid request" => "Ugyldig forespørsel",
 "Calendar" => "Kalender",
@@ -10,72 +9,30 @@
 "Monthly" => "MÃ¥nedlig",
 "Yearly" => "Ã…rlig",
 "All day" => "Hele dagen ",
-"Sunday" => "Søndag",
-"Monday" => "Mandag",
-"Tuesday" => "Tirsdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Lørdag",
-"Sun." => "Sø.",
-"Mon." => "Ma.",
-"Tue." => "Ti.",
-"Wed." => "On.",
-"Thu." => "To.",
-"Fri." => "Fr.",
-"Sat." => "Lø.",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mars",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Desember",
-"Jan." => "jan.",
-"Feb." => "feb.",
-"Mar." => "mar.",
-"Apr." => "apr.",
-"Jun." => "jun.",
-"Jul." => "jul.",
-"Aug." => "aug.",
-"Sep." => "sep.",
-"Oct." => "okt.",
-"Nov." => "nov.",
-"Dec." => "des.",
+"Title" => "Tittel",
 "Week" => "Uke",
-"Weeks" => "Uke",
-"Day" => "Dag",
 "Month" => "ned",
 "Today" => "I dag",
 "Calendars" => "Kalendre",
-"Time" => "Tid",
 "Choose active calendars" => "Velg en aktiv kalender",
 "Download" => "Last ned",
 "Edit" => "Endre",
 "Edit calendar" => "Rediger kalender",
 "Displayname" => "Visningsnavn",
 "Active" => "Aktiv",
-"Description" => "Beskrivelse",
 "Calendar color" => "Kalenderfarge",
 "Submit" => "Lagre",
 "Edit an event" => "Rediger en hendelse",
-"Title" => "Tittel",
 "Title of the Event" => "Hendelsestittel",
-"Location" => "Sted",
-"Location of the Event" => "Hendelsessted",
 "Category" => "Kategori",
 "All Day Event" => "Hele dagen-hendelse",
 "From" => "Fra",
 "To" => "Til",
 "Repeat" => "Gjenta",
-"Attendees" => "Deltakere",
+"Location" => "Sted",
+"Location of the Event" => "Hendelsessted",
+"Description" => "Beskrivelse",
 "Description of the Event" => "Hendelesebeskrivelse",
-"Close" => "Lukk",
 "Create a new event" => "Opprett en ny hendelse",
 "Timezone" => "Tidssone"
 );
diff --git a/apps/calendar/l10n/nl.php b/apps/calendar/l10n/nl.php
index 03211b6cba9..3efb869042d 100644
--- a/apps/calendar/l10n/nl.php
+++ b/apps/calendar/l10n/nl.php
@@ -1,8 +1,24 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Foute aanvraag",
-"Timezone changed" => "U kunt maar een venster tegelijk openen.",
+"New Timezone:" => "Nieuwe tijdszone:",
+"Timezone changed" => "Tijdzone is veranderd",
 "Invalid request" => "Ongeldige aanvraag",
 "Calendar" => "Kalender",
+"Wrong calendar" => "Verkeerde kalender",
+"Birthday" => "Verjaardag",
+"Business" => "Zakelijk",
+"Call" => "Bellen",
+"Clients" => "Klanten",
+"Deliverer" => "Leverancier",
+"Holidays" => "Vakantie",
+"Ideas" => "Ideeën",
+"Journey" => "Reis",
+"Jubilee" => "Jubileum",
+"Meeting" => "Vergadering",
+"Other" => "Ander",
+"Personal" => "Persoonlijk",
+"Projects" => "Projecten",
+"Questions" => "Vragen",
+"Work" => "Werk",
 "Does not repeat" => "Wordt niet herhaald",
 "Daily" => "Dagelijks",
 "Weekly" => "Wekelijks",
@@ -10,21 +26,23 @@
 "Bi-Weekly" => "Tweewekelijks",
 "Monthly" => "Maandelijks",
 "Yearly" => "Jaarlijks",
-"All day" => "Tweewekelijks",
-"Sunday" => "Zondag",
+"never" => "nooit meer",
+"by occurrences" => "volgens gebeurtenissen",
+"by date" => "op datum",
+"by weekday" => "op weekdag",
 "Monday" => "Maandag",
 "Tuesday" => "Dinsdag",
 "Wednesday" => "Woensdag",
 "Thursday" => "Donderdag",
 "Friday" => "Vrijdag",
 "Saturday" => "Zaterdag",
-"Sun." => "Zo",
-"Mon." => "Ma",
-"Tue." => "Di",
-"Wed." => "Wo",
-"Thu." => "Do",
-"Fri." => "Vr",
-"Sat." => "Za",
+"Sunday" => "Zondag",
+"first" => "eerste",
+"second" => "tweede",
+"third" => "derde",
+"fourth" => "vierde",
+"fifth" => "vijfde",
+"last" => "laatste",
 "January" => "Januari",
 "February" => "Februari",
 "March" => "Maart",
@@ -37,47 +55,88 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "December",
-"Jan." => "Jan",
-"Feb." => "Feb",
-"Mar." => "Maa",
-"Apr." => "Apr",
-"Jun." => "Jun",
-"Jul." => "Jul",
-"Aug." => "Aug",
-"Sep." => "Sept",
-"Oct." => "Okt",
-"Nov." => "Nov",
-"Dec." => "Dec",
+"by events date" => "volgens evenementsdatum",
+"by yearday(s)" => "volgens jaardag(en)",
+"by weeknumber(s)" => "volgens weeknummer(s)",
+"by day and month" => "per dag en maand",
+"Not an array" => "Geen array",
+"Date" => "Datum",
+"All day" => "Hele dag",
+"Missing fields" => "missende velden",
+"Title" => "Titel",
+"From Date" => "Begindatum",
+"From Time" => "Begintijd",
+"To Date" => "Einddatum",
+"To Time" => "Eindtijd",
+"The event ends before it starts" => "Het evenement eindigt voordat het begint",
+"There was a database fail" => "Er was een databasefout",
 "Week" => "Week",
-"Weeks" => "Weken",
-"Day" => "Dag",
 "Month" => "Maand",
+"List" => "Lijst",
 "Today" => "Vandaag",
 "Calendars" => "Kalenders",
-"Time" => "Tijd",
 "There was a fail, while parsing the file." => "Er is een fout opgetreden bij het verwerken van het bestand.",
+"Sun." => "Zo.",
+"Mon." => "Ma.",
+"Tue." => "Di.",
+"Wed." => "Woe.",
+"Thu." => "Do.",
+"Fri." => "Vrij.",
+"Sat." => "Zat.",
+"Jan." => "Jan.",
+"Feb." => "Feb.",
+"Mar." => "Maart",
+"Apr." => "April",
+"May." => "Mei",
+"Jun." => "Jun.",
+"Jul." => "Jul.",
+"Aug." => "Aug.",
+"Sep." => "Sept.",
+"Oct." => "Okt.",
+"Nov." => "Nov.",
+"Dec." => "Dec.",
 "Choose active calendars" => "Kies actieve kalenders",
+"New Calendar" => "Nieuwe Kalender",
+"CalDav Link" => "CalDav Link",
 "Download" => "Download",
 "Edit" => "Bewerken",
+"Delete" => "Verwijderen",
+"New calendar" => "Nieuwe kalender",
 "Edit calendar" => "Bewerk kalender",
 "Displayname" => "Weergavenaam",
 "Active" => "Actief",
-"Description" => "Beschrijving",
 "Calendar color" => "Kalender kleur",
+"Save" => "Opslaan",
 "Submit" => "Opslaan",
-"Edit an event" => "Bewerken een evenement",
-"Title" => "Titel",
-"Title of the Event" => "Titel van het evenement",
-"Location" => "Locatie",
-"Location of the Event" => "Locatie van het evenement",
+"Cancel" => "Annuleren",
+"Edit an event" => "Bewerken van een afspraak",
+"Export" => "Exporteren",
+"Title of the Event" => "Titel van de afspraak",
 "Category" => "Categorie",
+"Select category" => "Kies een categorie",
 "All Day Event" => "Hele dag",
 "From" => "Van",
 "To" => "Aan",
+"Advanced options" => "Geavanceerde opties",
 "Repeat" => "Herhalen",
-"Attendees" => "Deelnemers",
+"Advanced" => "Geavanceerd",
+"Select weekdays" => "Selecteer weekdagen",
+"Select days" => "Selecteer dagen",
+"Select months" => "Selecteer maanden",
+"Select weeks" => "Selecteer weken",
+"End" => "Einde",
+"occurrences" => "gebeurtenissen",
+"Location" => "Locatie",
+"Location of the Event" => "Locatie van de afspraak",
+"Description" => "Beschrijving",
 "Description of the Event" => "Beschrijving van het evenement",
-"Close" => "Sluiten",
-"Create a new event" => "Maak een nieuw evenement",
-"Timezone" => "Tijdzone"
+"Please choose the calendar" => "Kies de kalender",
+"Import" => "Importeer",
+"Create a new event" => "Maak een nieuwe afspraak",
+"Timezone" => "Tijdzone",
+"Check always for changes of the timezone" => "Controleer altijd op aanpassingen van de tijdszone",
+"Timeformat" => "Tijdformaat",
+"24h" => "24uur",
+"12h" => "12uur",
+"Calendar CalDAV syncing address:" => "CalDAV kalender synchronisatie adres:"
 );
diff --git a/apps/calendar/l10n/pl.php b/apps/calendar/l10n/pl.php
index 2201cc397ab..a654c878d3c 100644
--- a/apps/calendar/l10n/pl.php
+++ b/apps/calendar/l10n/pl.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "BÅ‚Ä…d uwierzytelniania",
-"Wrong calendar" => "ZÅ‚y kalendarz",
+"New Timezone:" => "Nowa strefa czasowa:",
 "Timezone changed" => "Strefa czasowa została zmieniona",
 "Invalid request" => "Nieprawidłowe żądanie",
 "Calendar" => "Kalendarz",
+"Wrong calendar" => "ZÅ‚y kalendarz",
 "Birthday" => "Urodziny",
 "Business" => "Interes",
 "Call" => "Rozmowa",
@@ -26,22 +26,24 @@
 "Bi-Weekly" => "Dwa razy w tygodniu",
 "Monthly" => "Miesięcznie",
 "Yearly" => "Rocznie",
-"Not an array" => "Nie ma w tablicy",
-"All day" => "Cały dzień",
-"Sunday" => "Niedziela",
+"never" => "nigdy",
+"by occurrences" => "przez wydarzenia",
+"by date" => "po dacie",
+"by monthday" => "miesięcznie",
+"by weekday" => "tygodniowo",
 "Monday" => "Poniedziałek",
 "Tuesday" => "Wtorek",
 "Wednesday" => "Åšroda",
 "Thursday" => "Czwartek",
 "Friday" => "PiÄ…tek",
 "Saturday" => "Sobota",
-"Sun." => "Nie.",
-"Mon." => "Po.",
-"Tue." => "Wt.",
-"Wed." => "Åšr.",
-"Thu." => "Cz..",
-"Fri." => "PiÄ….",
-"Sat." => "So.",
+"Sunday" => "Niedziela",
+"first" => "pierwszy",
+"second" => "drugi",
+"third" => "trzeci",
+"fourth" => "czwarty",
+"fifth" => "piÄ…ty",
+"last" => "ostatni",
 "January" => "Styczeń",
 "February" => "Luty",
 "March" => "Marzec",
@@ -54,11 +56,39 @@
 "October" => "Październik",
 "November" => "Listopad",
 "December" => "Grudzień",
+"by events date" => "po datach wydarzeń",
+"by yearday(s)" => "po dniach roku",
+"by weeknumber(s)" => "po tygodniach",
+"Not an array" => "Nie ma w tablicy",
+"Date" => "Data",
+"Cal." => "Kal.",
+"All day" => "Cały dzień",
+"Missing fields" => "BrakujÄ…ce pola",
+"Title" => "Tytuł",
+"From Date" => "Od dnia",
+"From Time" => "Od czasu",
+"To Date" => "Do daty",
+"To Time" => "Do czasu",
+"The event ends before it starts" => "Wydarzenie kończy się przed rozpoczęciem",
+"There was a database fail" => "Awaria bazy danych",
+"Week" => "Tydzień",
+"Month" => "MiesiÄ…c",
+"List" => "Lista",
+"Today" => "Dzisiaj",
+"Calendars" => "Kalendarze",
+"There was a fail, while parsing the file." => "Nastąpił problem przy parsowaniu pliku..",
+"Sun." => "Nie.",
+"Mon." => "Poń.",
+"Tue." => "Wto.",
+"Wed." => "Åšro.",
+"Thu." => "Czw.",
+"Fri." => "PiÄ….",
+"Sat." => "So.",
 "Jan." => "Sty.",
 "Feb." => "Lut.",
 "Mar." => "Mar.",
 "Apr." => "Kwi.",
-"May." => "Może.",
+"May." => "Maj",
 "Jun." => "Cze.",
 "Jul." => "Lip.",
 "Aug." => "Sie.",
@@ -66,45 +96,52 @@
 "Oct." => "Paź.",
 "Nov." => "Lis.",
 "Dec." => "Gru.",
-"Week" => "Tydzień",
-"Weeks" => "Tygodnie",
-"More before {startdate}" => "Więcej przed {startdate}",
-"More after {enddate}" => "Więcej po {enddate}",
-"Day" => "Dzień",
-"Month" => "MiesiÄ…c",
-"List" => "Lista",
-"Today" => "Dzisiaj",
-"Calendars" => "Kalendarze",
-"Time" => "Czas",
-"There was a fail, while parsing the file." => "Nastąpił problem przy parsowaniu pliku..",
 "Choose active calendars" => "Wybierz aktywne kalendarze",
 "New Calendar" => "Nowy kalendarz",
 "CalDav Link" => "Link do CalDAV",
 "Download" => "Pobierz",
 "Edit" => "Edytuj",
+"Delete" => "Usuń",
 "New calendar" => "Nowy kalendarz",
 "Edit calendar" => "Edycja kalendarza",
 "Displayname" => "Displayname",
 "Active" => "Aktywny",
-"Description" => "Opis",
 "Calendar color" => "Kalendarz kolor",
 "Save" => "Zapisz",
 "Submit" => "Prześlij",
 "Cancel" => "Anuluj",
 "Edit an event" => "Edycja zdarzenia",
-"Title" => "Tytuł",
+"Export" => "Wyeksportuj",
 "Title of the Event" => "Tytuł zdarzenia",
-"Location" => "Lokalizacja",
-"Location of the Event" => "Lokalizacja zdarzenia",
 "Category" => "Kategoria",
 "Select category" => "Wybierz kategoriÄ™",
 "All Day Event" => "Całodniowe wydarzenie",
 "From" => "Z",
 "To" => "Do",
+"Advanced options" => "Opcje zaawansowane",
 "Repeat" => "Powtórz",
-"Attendees" => "Uczestnicy",
+"Advanced" => "Zaawansowane",
+"Select weekdays" => "Wybierz dni powszechne",
+"Select days" => "Wybierz dni",
+"and the events day of year." => "oraz wydarzenia roku",
+"and the events day of month." => "oraz wydarzenia miesiÄ…ca",
+"Select months" => "Wybierz miesiÄ…ce",
+"Select weeks" => "Wybierz tygodnie",
+"and the events week of year." => "oraz wydarzenia roku.",
+"Interval" => "Przedział",
+"End" => "Koniec",
+"occurrences" => "wystÄ…pienia",
+"Location" => "Lokalizacja",
+"Location of the Event" => "Lokalizacja zdarzenia",
+"Description" => "Opis",
 "Description of the Event" => "Opis zdarzenia",
-"Close" => "Zamknij",
+"Please choose the calendar" => "Proszę wybrać kalendarz",
+"Import" => "Import",
 "Create a new event" => "Stwórz nowe wydarzenie",
-"Timezone" => "Strefa czasowa"
+"Timezone" => "Strefa czasowa",
+"Check always for changes of the timezone" => "Zawsze sprawdzaj zmiany strefy czasowej",
+"Timeformat" => "Format czasu",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Adres synchronizacji kalendarza CalDAV:"
 );
diff --git a/apps/calendar/l10n/pt_BR.php b/apps/calendar/l10n/pt_BR.php
index 91db5210438..324a85aa136 100644
--- a/apps/calendar/l10n/pt_BR.php
+++ b/apps/calendar/l10n/pt_BR.php
@@ -1,8 +1,23 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Erro de autenticação",
 "Timezone changed" => "Fuso horário alterado",
 "Invalid request" => "Pedido inválido",
 "Calendar" => "Calendário",
+"Wrong calendar" => "Calendário incorreto",
+"Birthday" => "Aniversário",
+"Business" => "Negócio",
+"Call" => "Chamada",
+"Clients" => "Clientes",
+"Deliverer" => "Entrega",
+"Holidays" => "Feriados",
+"Ideas" => "Idéias",
+"Journey" => "Jornada",
+"Jubilee" => "Jubileu",
+"Meeting" => "Reunião",
+"Other" => "Outros",
+"Personal" => "Pessoal",
+"Projects" => "Projetos",
+"Questions" => "Perguntas",
+"Work" => "Trabalho",
 "Does not repeat" => "Não repetir",
 "Daily" => "Diariamente",
 "Weekly" => "Semanal",
@@ -10,74 +25,56 @@
 "Bi-Weekly" => "De duas em duas semanas",
 "Monthly" => "Mensal",
 "Yearly" => "Anual",
+"Not an array" => "Não é um array",
 "All day" => "Todo o dia",
-"Sunday" => "Domingo",
-"Monday" => "Segunda-feira",
-"Tuesday" => "Terça-feira",
-"Wednesday" => "Quarta-feira",
-"Thursday" => "Quinta-feira",
-"Friday" => "Sexta-feira",
-"Saturday" => "Sábado",
-"Sun." => "Dom.",
-"Mon." => "Seg.",
-"Tue." => "Ter.",
-"Wed." => "Qua.",
-"Thu." => "Qui.",
-"Fri." => "Sex.",
-"Sat." => "Sáb.",
-"January" => "Janeiro",
-"February" => "Fevereiro",
-"March" => "Março",
-"April" => "Abril",
-"May" => "Maio",
-"June" => "Junho",
-"July" => "Julho",
-"August" => "Agosto",
-"September" => "Setembro",
-"October" => "Outubro",
-"November" => "Novembro",
-"December" => "Dezembro",
-"Jan." => "Jan.",
-"Feb." => "Fev.",
-"Mar." => "Mar.",
-"Apr." => "Abr.",
-"Jun." => "Jun.",
-"Jul." => "Jul.",
-"Aug." => "Ago.",
-"Sep." => "Set.",
-"Oct." => "Out.",
-"Nov." => "Nov.",
-"Dec." => "Dez.",
+"Missing fields" => "Campos incompletos",
+"Title" => "Título",
+"From Date" => "Desde a Data",
+"From Time" => "Desde a Hora",
+"To Date" => "Até a Data",
+"To Time" => "Até a Hora",
+"The event ends before it starts" => "O evento termina antes de começar",
+"There was a database fail" => "Houve uma falha de banco de dados",
 "Week" => "Semana",
-"Weeks" => "Semanas",
-"Day" => "Dia",
 "Month" => "Mês",
+"List" => "Lista",
 "Today" => "Hoje",
 "Calendars" => "Calendários",
-"Time" => "Tempo",
 "There was a fail, while parsing the file." => "Houve uma falha, ao analisar o arquivo.",
 "Choose active calendars" => "Escolha calendários ativos",
+"New Calendar" => "Novo Calendário",
+"CalDav Link" => "Link para CalDav",
 "Download" => "Baixar",
 "Edit" => "Editar",
+"Delete" => "Excluir",
+"New calendar" => "Novo calendário",
 "Edit calendar" => "Editar calendário",
 "Displayname" => "Mostrar Nome",
 "Active" => "Ativo",
-"Description" => "Descrição",
 "Calendar color" => "Cor do Calendário",
+"Save" => "Salvar",
 "Submit" => "Submeter",
+"Cancel" => "Cancelar",
 "Edit an event" => "Editar um evento",
-"Title" => "Título",
+"Export" => "Exportar",
 "Title of the Event" => "Título do evento",
-"Location" => "Local",
-"Location of the Event" => "Local do evento",
 "Category" => "Categoria",
+"Select category" => "Selecionar categoria",
 "All Day Event" => "Evento de dia inteiro",
 "From" => "De",
 "To" => "Para",
+"Advanced options" => "Opções avançadas",
 "Repeat" => "Repetir",
-"Attendees" => "Participantes",
+"Location" => "Local",
+"Location of the Event" => "Local do evento",
+"Description" => "Descrição",
 "Description of the Event" => "Descrição do Evento",
-"Close" => "Fechar",
+"Please choose the calendar" => "Por favor, escolha o calendário",
+"Import" => "Importar",
 "Create a new event" => "Criar um novo evento",
-"Timezone" => "Fuso horário"
+"Timezone" => "Fuso horário",
+"Timeformat" => "Formato da Hora",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Sincronização de endereço do calendário CalDAV :"
 );
diff --git a/apps/calendar/l10n/pt_PT.php b/apps/calendar/l10n/pt_PT.php
new file mode 100644
index 00000000000..fd6ba7b9a60
--- /dev/null
+++ b/apps/calendar/l10n/pt_PT.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Calendar" => "Calendário",
+"All day" => "Todo o dia",
+"Week" => "Semana",
+"Month" => "Mês",
+"Today" => "Hoje",
+"Calendars" => "Calendários"
+);
diff --git a/apps/calendar/l10n/ro.php b/apps/calendar/l10n/ro.php
index 75e8a715ea0..5e16c344eef 100644
--- a/apps/calendar/l10n/ro.php
+++ b/apps/calendar/l10n/ro.php
@@ -1,8 +1,24 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Eroare de autentificare",
+"New Timezone:" => "Fus orar nou:",
 "Timezone changed" => "A fost schimbat fusul orar",
 "Invalid request" => "Cerere eronată",
 "Calendar" => "Calendar",
+"Wrong calendar" => "Calendar greșit",
+"Birthday" => "Zi de naștere",
+"Business" => "Afaceri",
+"Call" => "Sună",
+"Clients" => "Clienți",
+"Deliverer" => "Curier",
+"Holidays" => "Sărbători",
+"Ideas" => "Idei",
+"Journey" => "Călătorie",
+"Jubilee" => "Aniversare",
+"Meeting" => "Întâlnire",
+"Other" => "Altele",
+"Personal" => "Personal",
+"Projects" => "Proiecte",
+"Questions" => "Întrebări",
+"Work" => "Servici",
 "Does not repeat" => "Nu se repetă",
 "Daily" => "Zilnic",
 "Weekly" => "Săptămânal",
@@ -10,21 +26,25 @@
 "Bi-Weekly" => "Din două în două săptămâni",
 "Monthly" => "Lunar",
 "Yearly" => "Anual",
-"All day" => "Toată ziua",
-"Sunday" => "Duminică",
+"never" => "niciodată",
+"by occurrences" => "după repetiție",
+"by date" => "după dată",
+"by monthday" => "după ziua lunii",
+"by weekday" => "după ziua săptămânii",
 "Monday" => "Luni",
 "Tuesday" => "Marți",
 "Wednesday" => "Miercuri",
 "Thursday" => "Joi",
 "Friday" => "Vineri",
 "Saturday" => "Sâmbătă",
-"Sun." => "Dum.",
-"Mon." => "Lun.",
-"Tue." => "Mar.",
-"Wed." => "Mie.",
-"Thu." => "Joi.",
-"Fri." => "Vin.",
-"Sat." => "Sâm.",
+"Sunday" => "Duminică",
+"events week of month" => "evenimentele săptămânii din luna.",
+"first" => "primul",
+"second" => "al doilea",
+"third" => "al treilea",
+"fourth" => "al patrulea",
+"fifth" => "al cincilea",
+"last" => "ultimul",
 "January" => "Ianuarie",
 "February" => "Februarie",
 "March" => "Martie",
@@ -37,47 +57,93 @@
 "October" => "Octombrie",
 "November" => "Noiembrie",
 "December" => "Decembrie",
+"by events date" => "după data evenimentului",
+"by yearday(s)" => "după ziua(zilele) anului",
+"by weeknumber(s)" => "după numărul săptămânii",
+"by day and month" => "după zi și lună",
+"Not an array" => "Not an array",
+"Date" => "Data",
+"Cal." => "Cal.",
+"All day" => "Toată ziua",
+"Missing fields" => "Câmpuri lipsă",
+"Title" => "Titlu",
+"From Date" => "Începând cu",
+"From Time" => "De la",
+"To Date" => "Până pe",
+"To Time" => "La",
+"The event ends before it starts" => "Evenimentul se termină înainte să înceapă",
+"There was a database fail" => "A avut loc o eroare a bazei de date",
+"Week" => "Săptămâna",
+"Month" => "Luna",
+"List" => "Listă",
+"Today" => "Astăzi",
+"Calendars" => "Calendare",
+"There was a fail, while parsing the file." => "A fost întâmpinată o eroare în procesarea fișierului",
+"Sun." => "D",
+"Mon." => "L",
+"Tue." => "M",
+"Wed." => "M",
+"Thu." => "J",
+"Fri." => "V",
+"Sat." => "S",
 "Jan." => "Ian.",
 "Feb." => "Feb.",
 "Mar." => "Mar.",
 "Apr." => "Apr.",
+"May." => "Mai.",
 "Jun." => "Iun.",
 "Jul." => "Iul.",
 "Aug." => "Aug.",
-"Sep." => "Sep.",
+"Sep." => "Sept.",
 "Oct." => "Oct.",
 "Nov." => "Nov.",
 "Dec." => "Dec.",
-"Week" => "Săptămâna",
-"Weeks" => "Săptămâni",
-"Day" => "Zi",
-"Month" => "Luna",
-"Today" => "Astăzi",
-"Calendars" => "Calendare",
-"Time" => "Ora",
-"There was a fail, while parsing the file." => "A fost întâmpinată o eroare în procesarea fișierului",
 "Choose active calendars" => "Alege activitățile din calendar",
+"New Calendar" => "Calendar nou",
+"CalDav Link" => "Link CalDav",
 "Download" => "Descarcă",
 "Edit" => "Modifică",
+"Delete" => "Șterge",
+"New calendar" => "Calendar nou",
 "Edit calendar" => "Modifcă acest calendar",
 "Displayname" => "Nume",
 "Active" => "Activ",
-"Description" => "Descriere",
 "Calendar color" => "Culoare calendar",
+"Save" => "Salveză",
 "Submit" => "Trimite",
+"Cancel" => "Anulează",
 "Edit an event" => "Modifică un eveniment",
-"Title" => "Titlu",
+"Export" => "Exportă",
 "Title of the Event" => "Numele evenimentului",
-"Location" => "Localizare",
-"Location of the Event" => "Localizarea evenimentului",
 "Category" => "Categorie",
+"Select category" => "Alege categoria",
 "All Day Event" => "Toată ziua",
 "From" => "De la",
 "To" => "Către",
+"Advanced options" => "Opțiuni avansate",
 "Repeat" => "Repetă",
-"Attendees" => "Participanți",
+"Advanced" => "Avansat",
+"Select weekdays" => "Selectează zilele săptămânii",
+"Select days" => "Selectează zilele",
+"and the events day of year." => "și evenimentele zilei.",
+"and the events day of month." => "și evenimentele zilei din lună.",
+"Select months" => "Selectează lunile",
+"Select weeks" => "Selectează săptămânile",
+"and the events week of year." => "și evenimentele săptămânii.",
+"Interval" => "Interval",
+"End" => "Sfârșit",
+"occurrences" => "repetiții",
+"Location" => "Localizare",
+"Location of the Event" => "Localizarea evenimentului",
+"Description" => "Descriere",
 "Description of the Event" => "Descrierea evenimentului",
-"Close" => "ÃŽnchide",
+"Please choose the calendar" => "Alegeți calendarul",
+"Import" => "Importă",
 "Create a new event" => "Crează un evenimetn nou",
-"Timezone" => "Fus orar"
+"Timezone" => "Fus orar",
+"Check always for changes of the timezone" => "Verifică mereu pentru schimbări ale fusului orar",
+"Timeformat" => "Format de timp",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Adresa pentru sincronizarea calendarului CalDAV"
 );
diff --git a/apps/calendar/l10n/ru.php b/apps/calendar/l10n/ru.php
index 170344dca8e..87366771867 100644
--- a/apps/calendar/l10n/ru.php
+++ b/apps/calendar/l10n/ru.php
@@ -1,9 +1,8 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Ошибка аутентификации",
-"Wrong calendar" => "�еверный календарь",
 "Timezone changed" => "Ча�овой по�� изменён",
 "Invalid request" => "�еверный запро�",
 "Calendar" => "Календарь",
+"Wrong calendar" => "�еверный календарь",
 "Birthday" => "День рождени�",
 "Business" => "Бизне�",
 "Call" => "Звонить",
@@ -28,83 +27,54 @@
 "Yearly" => "Каждый год",
 "Not an array" => "�е ма��ив",
 "All day" => "Ве�ь день",
-"Sunday" => "Во�кре�енье",
-"Monday" => "Понедельник",
-"Tuesday" => "Вторник",
-"Wednesday" => "Среда",
-"Thursday" => "Четверг",
-"Friday" => "П�тница",
-"Saturday" => "Суббота",
-"Sun." => "В�.",
-"Mon." => "Пн.",
-"Tue." => "Ð’Ñ‚.",
-"Wed." => "Ср.",
-"Thu." => "Чт.",
-"Fri." => "Пт.",
-"Sat." => "Сб.",
-"January" => "Январь",
-"February" => "Февраль",
-"March" => "Март",
-"April" => "�прель",
-"May" => "Май",
-"June" => "Июнь",
-"July" => "Июль",
-"August" => "�вгу�т",
-"September" => "Сент�брь",
-"October" => "Окт�брь",
-"November" => "�о�брь",
-"December" => "Декабрь",
-"Jan." => "Янв.",
-"Feb." => "Фев.",
-"Mar." => "Мар.",
-"Apr." => "�пр.",
-"May." => "Май.",
-"Jun." => "Июн.",
-"Jul." => "Июл.",
-"Aug." => "�вг.",
-"Sep." => "Сен.",
-"Oct." => "Окт.",
-"Nov." => "�о�.",
-"Dec." => "Дек.",
+"Missing fields" => "�езаполненные пол�",
+"Title" => "�азвание",
+"From Date" => "Дата начала",
+"From Time" => "Врем� начала",
+"To Date" => "Дата окончани�",
+"To Time" => "Врем� окончани�",
+"The event ends before it starts" => "Окончание �обыти� раньше, чем его начало",
+"There was a database fail" => "Ошибка базы данных",
 "Week" => "�едел�",
-"Weeks" => "�едели",
-"More before {startdate}" => "Еще до {startdate}",
-"More after {enddate}" => "Больше по�ле {startdate}",
-"Day" => "День",
 "Month" => "Ме��ц",
 "List" => "Спи�ок",
 "Today" => "Сегодн�",
 "Calendars" => "Календари",
-"Time" => "Врем�",
 "There was a fail, while parsing the file." => "�е удало�ь обработать файл.",
 "Choose active calendars" => "Выберите активные календари",
 "New Calendar" => "�овый Календарь",
 "CalDav Link" => "С�ылка дл� CalDav",
 "Download" => "Скачать",
 "Edit" => "Редактировать",
+"Delete" => "Удалить",
 "New calendar" => "�овый календарь",
 "Edit calendar" => "Редактировать календарь",
 "Displayname" => "Отображаемое им�",
 "Active" => "�ктивен",
-"Description" => "Опи�ание",
 "Calendar color" => "Цвет календар�",
 "Save" => "Сохранить",
 "Submit" => "Отправить",
 "Cancel" => "Отмена",
 "Edit an event" => "Редактировать �обытие",
-"Title" => "�азвание",
+"Export" => "Эк�портировать",
 "Title of the Event" => "�азвание �обытие",
-"Location" => "Ме�то",
-"Location of the Event" => "Ме�то �обыти�",
 "Category" => "Категори�",
 "Select category" => "Выбрать категорию",
 "All Day Event" => "Событие на ве�ь день",
 "From" => "От",
 "To" => "До",
+"Advanced options" => "Дополнительные параметры",
 "Repeat" => "Повтор",
-"Attendees" => "При�ут�твующие",
+"Location" => "Ме�то",
+"Location of the Event" => "Ме�то �обыти�",
+"Description" => "Опи�ание",
 "Description of the Event" => "Опи�ание �обыти�",
-"Close" => "Закрыть",
+"Please choose the calendar" => "Пожалуй�та, выберите календарь",
+"Import" => "Импортировать",
 "Create a new event" => "Создать новое �обытие",
-"Timezone" => "Ча�овой по��"
+"Timezone" => "Ча�овой по��",
+"Timeformat" => "Формат времени",
+"24h" => "24ч",
+"12h" => "12ч",
+"Calendar CalDAV syncing address:" => "�дре� �инхронизации календар� CalDAV:"
 );
diff --git a/apps/calendar/l10n/sk_SK.php b/apps/calendar/l10n/sk_SK.php
index 0268143792c..ec0485bfc9a 100644
--- a/apps/calendar/l10n/sk_SK.php
+++ b/apps/calendar/l10n/sk_SK.php
@@ -69,14 +69,8 @@
 "Location of the Event" => "Poloha Udalosti",
 "Description" => "Popis",
 "Description of the Event" => "Popis Udalosti",
-"Import Ical File" => "Importovať Ical súbor",
-"How to import the new calendar?" => "Ako importovať nový kalendár?",
-"Import into an existing calendar" => "Importovať do existujúceho kalendára",
-"Import into a new calendar" => "Importovať do nového kalendára",
 "Please choose the calendar" => "Prosím zvoľte kalendár",
 "Import" => "Importovať",
-"Back" => "Späť",
-"Please fill out the form" => "Prosím vyplňte formulár",
 "Create a new event" => "Vytvoriť udalosť",
 "Timezone" => "Časová zóna",
 "Timeformat" => "Formát �asu",
diff --git a/apps/calendar/l10n/sl.php b/apps/calendar/l10n/sl.php
index 4f091ac39d1..753a31ac665 100644
--- a/apps/calendar/l10n/sl.php
+++ b/apps/calendar/l10n/sl.php
@@ -69,14 +69,8 @@
 "Location of the Event" => "Lokacija dogodka",
 "Description" => "Opis",
 "Description of the Event" => "Opis Dogodka",
-"Import Ical File" => "Uvozi iCal datoteko",
-"How to import the new calendar?" => "Koko uvozim nov kolendar?",
-"Import into an existing calendar" => "Uvozi v obstoje�i kolendar",
-"Import into a new calendar" => "Uvozi v nov Kolendar",
 "Please choose the calendar" => "Izberi kolendar",
 "Import" => "Uvozi",
-"Back" => "Nazaj",
-"Please fill out the form" => "Prosim izpolnite obrazec",
 "Create a new event" => "Ustvari nov dogodek",
 "Timezone" => "ÄŒasovna Cona",
 "Timeformat" => "ÄŒasovni format",
diff --git a/apps/calendar/l10n/sr.php b/apps/calendar/l10n/sr.php
index 67027204953..f006c9ec8e6 100644
--- a/apps/calendar/l10n/sr.php
+++ b/apps/calendar/l10n/sr.php
@@ -1,8 +1,23 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Грешка аутентификације",
 "Timezone changed" => "Времен�ка зона је промењена",
 "Invalid request" => "�еи�праван захтев",
 "Calendar" => "Календар",
+"Wrong calendar" => "Погрешан календар",
+"Birthday" => "Рођендан",
+"Business" => "По�ао",
+"Call" => "Позив",
+"Clients" => "Клијенти",
+"Deliverer" => "До�тављач",
+"Holidays" => "Празници",
+"Ideas" => "Идеје",
+"Journey" => "путовање",
+"Jubilee" => "јубилеј",
+"Meeting" => "Са�танак",
+"Other" => "Друго",
+"Personal" => "Лично",
+"Projects" => "Пројекти",
+"Questions" => "Питања",
+"Work" => "По�ао",
 "Does not repeat" => "�е понавља �е",
 "Daily" => "дневно",
 "Weekly" => "недељно",
@@ -10,74 +25,41 @@
 "Bi-Weekly" => "двонедељно",
 "Monthly" => "ме�ечно",
 "Yearly" => "годишње",
+"Not an array" => "�ије обла�т",
 "All day" => "Цео дан",
-"Sunday" => "�едеља",
-"Monday" => "Понедељак",
-"Tuesday" => "Уторак",
-"Wednesday" => "Среда",
-"Thursday" => "Четвртак",
-"Friday" => "Петак",
-"Saturday" => "Субота",
-"Sun." => "�ед",
-"Mon." => "Пон",
-"Tue." => "Уто",
-"Wed." => "Сре",
-"Thu." => "Чет",
-"Fri." => "Пет",
-"Sat." => "Суб",
-"January" => "Јануар",
-"February" => "Фебруар",
-"March" => "Март",
-"April" => "�прил",
-"May" => "Мај",
-"June" => "Јун",
-"July" => "Јул",
-"August" => "�вгу�т",
-"September" => "Септембар",
-"October" => "Октобар",
-"November" => "�овембар",
-"December" => "Децембар",
-"Jan." => "Јан",
-"Feb." => "Феб",
-"Mar." => "Мар",
-"Apr." => "�пр",
-"Jun." => "Јун",
-"Jul." => "Јул",
-"Aug." => "�вг",
-"Sep." => "Сеп",
-"Oct." => "Окт",
-"Nov." => "�ов",
-"Dec." => "Дец",
+"Title" => "�а�лов",
 "Week" => "�едеља",
-"Weeks" => "�едеља",
-"Day" => "Дан",
 "Month" => "Ме�ец",
+"List" => "Спи�ак",
 "Today" => "Дана�",
 "Calendars" => "Календари",
-"Time" => "Време",
 "There was a fail, while parsing the file." => "дошло је до грешке при ра�члањивању фајла.",
 "Choose active calendars" => "Изаберите активне календаре",
+"New Calendar" => "�ови календар",
+"CalDav Link" => "КалДав веза",
 "Download" => "Преузми",
 "Edit" => "Уреди",
+"Delete" => "Обриши",
+"New calendar" => "�ови календар",
 "Edit calendar" => "Уреди календар",
 "Displayname" => "Приказаноиме",
 "Active" => "�ктиван",
-"Description" => "Опи�",
 "Calendar color" => "Боја календара",
+"Save" => "Сними",
 "Submit" => "Пошаљи",
+"Cancel" => "Откажи",
 "Edit an event" => "Уреди догађај",
-"Title" => "�а�лов",
 "Title of the Event" => "�а�лов догађаја",
-"Location" => "Локација",
-"Location of the Event" => "Локација догађаја",
 "Category" => "Категорија",
+"Select category" => "Изаберите категорију",
 "All Day Event" => "Целодневни догађај",
 "From" => "Од",
 "To" => "До",
 "Repeat" => "Понављај",
-"Attendees" => "При�утни",
+"Location" => "Локација",
+"Location of the Event" => "Локација догађаја",
+"Description" => "Опи�",
 "Description of the Event" => "Опи� догађаја",
-"Close" => "Затвори",
 "Create a new event" => "�аправи нови догађај",
 "Timezone" => "Времен�ка зона"
 );
diff --git a/apps/calendar/l10n/sr@latin.php b/apps/calendar/l10n/sr@latin.php
index 55df4e21ba8..ea0181919d9 100644
--- a/apps/calendar/l10n/sr@latin.php
+++ b/apps/calendar/l10n/sr@latin.php
@@ -1,8 +1,23 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Greška autentifikacije",
 "Timezone changed" => "Vremenska zona je promenjena",
 "Invalid request" => "Neispravan zahtev",
 "Calendar" => "Kalendar",
+"Wrong calendar" => "Pogrešan kalendar",
+"Birthday" => "Rođendan",
+"Business" => "Posao",
+"Call" => "Poziv",
+"Clients" => "Klijenti",
+"Deliverer" => "Dostavlja�",
+"Holidays" => "Praznici",
+"Ideas" => "Ideje",
+"Journey" => "putovanje",
+"Jubilee" => "jubilej",
+"Meeting" => "Sastanak",
+"Other" => "Drugo",
+"Personal" => "Li�no",
+"Projects" => "Projekti",
+"Questions" => "Pitanja",
+"Work" => "Posao",
 "Does not repeat" => "Ne ponavlja se",
 "Daily" => "dnevno",
 "Weekly" => "nedeljno",
@@ -10,74 +25,41 @@
 "Bi-Weekly" => "dvonedeljno",
 "Monthly" => "mese�no",
 "Yearly" => "godišnje",
+"Not an array" => "Nije oblast",
 "All day" => "Ceo dan",
-"Sunday" => "Nedelja",
-"Monday" => "Ponedeljak",
-"Tuesday" => "Utorak",
-"Wednesday" => "Sreda",
-"Thursday" => "ÄŒetvrtak",
-"Friday" => "Petak",
-"Saturday" => "Subota",
-"Sun." => "Ned",
-"Mon." => "Pon",
-"Tue." => "Uto",
-"Wed." => "Sre",
-"Thu." => "ÄŒet",
-"Fri." => "Pet",
-"Sat." => "Sub",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mart",
-"April" => "April",
-"May" => "Maj",
-"June" => "Jun",
-"July" => "Jul",
-"August" => "Avgust",
-"September" => "Septembar",
-"October" => "Oktobar",
-"November" => "Novembar",
-"December" => "Decembar",
-"Jan." => "Jan",
-"Feb." => "Feb",
-"Mar." => "Mar",
-"Apr." => "Apr",
-"Jun." => "Jun",
-"Jul." => "Jul",
-"Aug." => "Avg",
-"Sep." => "Sep",
-"Oct." => "Okt",
-"Nov." => "Nov",
-"Dec." => "Dec",
+"Title" => "Naslov",
 "Week" => "Nedelja",
-"Weeks" => "Nedelja",
-"Day" => "Dan",
 "Month" => "Mesec",
+"List" => "Spisak",
 "Today" => "Danas",
 "Calendars" => "Kalendari",
-"Time" => "Vreme",
 "There was a fail, while parsing the file." => "došlo je do greške pri ras�lanjivanju fajla.",
 "Choose active calendars" => "Izaberite aktivne kalendare",
+"New Calendar" => "Novi kalendar",
+"CalDav Link" => "KalDav veza",
 "Download" => "Preuzmi",
 "Edit" => "Uredi",
+"Delete" => "Obriši",
+"New calendar" => "Novi kalendar",
 "Edit calendar" => "Uredi kalendar",
 "Displayname" => "Prikazanoime",
 "Active" => "Aktivan",
-"Description" => "Opis",
 "Calendar color" => "Boja kalendara",
+"Save" => "Snimi",
 "Submit" => "Pošalji",
+"Cancel" => "Otkaži",
 "Edit an event" => "Uredi događaj",
-"Title" => "Naslov",
 "Title of the Event" => "Naslov događaja",
-"Location" => "Lokacija",
-"Location of the Event" => "Lokacija događaja",
 "Category" => "Kategorija",
+"Select category" => "Izaberite kategoriju",
 "All Day Event" => "Celodnevni događaj",
 "From" => "Od",
 "To" => "Do",
 "Repeat" => "Ponavljaj",
-"Attendees" => "Prisutni",
+"Location" => "Lokacija",
+"Location of the Event" => "Lokacija događaja",
+"Description" => "Opis",
 "Description of the Event" => "Opis događaja",
-"Close" => "Zatvori",
 "Create a new event" => "Napravi novi događaj",
 "Timezone" => "Vremenska zona"
 );
diff --git a/apps/calendar/l10n/sv.php b/apps/calendar/l10n/sv.php
new file mode 100644
index 00000000000..8923395a34d
--- /dev/null
+++ b/apps/calendar/l10n/sv.php
@@ -0,0 +1,80 @@
+<?php $TRANSLATIONS = array(
+"Timezone changed" => "Tidszon ändrad",
+"Invalid request" => "Ogiltig begäran",
+"Calendar" => "Kalender",
+"Wrong calendar" => "Fel kalender",
+"Birthday" => "Födelsedag",
+"Business" => "Företag",
+"Call" => "Ringa",
+"Clients" => "Klienter",
+"Deliverer" => "Leverantör",
+"Holidays" => "Semester",
+"Ideas" => "Idéer",
+"Journey" => "Resa",
+"Jubilee" => "Jubileum",
+"Meeting" => "Möte",
+"Other" => "Annat",
+"Personal" => "Personlig",
+"Projects" => "Projekt",
+"Questions" => "Frågor",
+"Work" => "Arbetet",
+"Does not repeat" => "Upprepas inte",
+"Daily" => "Dagligen",
+"Weekly" => "Varje vecka",
+"Every Weekday" => "Varje vardag",
+"Bi-Weekly" => "Varannan vecka",
+"Monthly" => "Varje månad",
+"Yearly" => "Ã…rligen",
+"Not an array" => "ingen rad",
+"All day" => "Hela dagen",
+"Missing fields" => "Saknade fält",
+"Title" => "Rubrik",
+"From Date" => "Från datum",
+"From Time" => "Från tid",
+"To Date" => "Till datum",
+"To Time" => "Till tid",
+"The event ends before it starts" => "Händelsen slutar innan den börjar",
+"There was a database fail" => "Det blev ett databasfel",
+"Week" => "Vecka",
+"Month" => "MÃ¥nad",
+"List" => "Lista",
+"Today" => "Idag",
+"Calendars" => "Kalendrar",
+"There was a fail, while parsing the file." => "Det blev ett fel medan filen analyserades.",
+"Choose active calendars" => "Välj aktiva kalendrar",
+"New Calendar" => "Ny kalender",
+"CalDav Link" => "CalDAV-länk",
+"Download" => "Ladda ner",
+"Edit" => "Redigera",
+"Delete" => "Radera",
+"New calendar" => "Nya kalender",
+"Edit calendar" => "Redigera kalender",
+"Displayname" => "Visningsnamn",
+"Active" => "Aktiv",
+"Calendar color" => "Kalender-färg",
+"Save" => "Spara",
+"Submit" => "Lägg till",
+"Cancel" => "Avbryt",
+"Edit an event" => "Redigera en händelse",
+"Export" => "Exportera",
+"Title of the Event" => "Rubrik för händelsen",
+"Category" => "Kategori",
+"Select category" => "Välj kategori",
+"All Day Event" => "Hela dagen",
+"From" => "Från",
+"To" => "Till",
+"Advanced options" => "Avancerade alternativ",
+"Repeat" => "Upprepa",
+"Location" => "Plats",
+"Location of the Event" => "Platsen för händelsen",
+"Description" => "Beskrivning",
+"Description of the Event" => "Beskrivning av händelse",
+"Please choose the calendar" => "Välj kalender",
+"Import" => "Importera",
+"Create a new event" => "Skapa en ny händelse",
+"Timezone" => "Tidszon",
+"Timeformat" => "Tidsformat",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Synkroniseringsadress för CalDAV kalender:"
+);
diff --git a/apps/calendar/l10n/tr.php b/apps/calendar/l10n/tr.php
index 64264c5a8ba..6a46c239c7d 100644
--- a/apps/calendar/l10n/tr.php
+++ b/apps/calendar/l10n/tr.php
@@ -69,14 +69,8 @@
 "Location of the Event" => "Olayın Konumu",
 "Description" => "Açıklama",
 "Description of the Event" => "Olayın Açıklaması",
-"Import Ical File" => "Ical Dosyası Al",
-"How to import the new calendar?" => "Yeni takvim nasıl alınsın?",
-"Import into an existing calendar" => "Mevcut bir takvimin içine al",
-"Import into a new calendar" => "Yeni bir takvim içine al",
 "Please choose the calendar" => "Lütfen takvimi seçin",
 "Import" => "İçe Al",
-"Back" => "Geri",
-"Please fill out the form" => "Lütfen formu doldurun",
 "Create a new event" => "Yeni olay oluÅŸtur",
 "Timezone" => "Zaman dilimi",
 "Timeformat" => "Saat biçimi",
diff --git a/apps/calendar/l10n/zh_CN.php b/apps/calendar/l10n/zh_CN.php
index 2b7dc5677a4..480b4530299 100644
--- a/apps/calendar/l10n/zh_CN.php
+++ b/apps/calendar/l10n/zh_CN.php
@@ -1,8 +1,23 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "验�错误",
 "Timezone changed" => "时区已修改",
 "Invalid request" => "�法请求",
 "Calendar" => "日历",
+"Wrong calendar" => "错误的日历",
+"Birthday" => "生日",
+"Business" => "商务",
+"Call" => "呼�",
+"Clients" => "客户",
+"Deliverer" => "派�",
+"Holidays" => "节日",
+"Ideas" => "想法",
+"Journey" => "旅行",
+"Jubilee" => "周年纪念",
+"Meeting" => "会议",
+"Other" => "其他",
+"Personal" => "个人",
+"Projects" => "项目",
+"Questions" => "问题",
+"Work" => "工作",
 "Does not repeat" => "���",
 "Daily" => "�天",
 "Weekly" => "�周",
@@ -10,74 +25,56 @@
 "Bi-Weekly" => "�两周",
 "Monthly" => "�月",
 "Yearly" => "�年",
+"Not an array" => "�是一个数组",
 "All day" => "全天",
-"Sunday" => "星期日",
-"Monday" => "星期一",
-"Tuesday" => "星期二",
-"Wednesday" => "星期三",
-"Thursday" => "星期四",
-"Friday" => "星期五",
-"Saturday" => "星期六",
-"Sun." => "æ—¥",
-"Mon." => "一",
-"Tue." => "二",
-"Wed." => "三",
-"Thu." => "å››",
-"Fri." => "五",
-"Sat." => "å…­",
-"January" => "1月",
-"February" => "2月",
-"March" => "3月",
-"April" => "4月",
-"May" => "5月",
-"June" => "6月",
-"July" => "7月",
-"August" => "8月",
-"September" => "9月",
-"October" => "10月",
-"November" => "11月",
-"December" => "12月",
-"Jan." => "1月",
-"Feb." => "2月",
-"Mar." => "3月",
-"Apr." => "4月",
-"Jun." => "6月",
-"Jul." => "7月",
-"Aug." => "8月",
-"Sep." => "9月",
-"Oct." => "10月",
-"Nov." => "11月",
-"Dec." => "12月",
+"Missing fields" => "缺少字段",
+"Title" => "标题",
+"From Date" => "从",
+"From Time" => "从",
+"To Date" => "至",
+"To Time" => "至",
+"The event ends before it starts" => "事件在开始�已结�",
+"There was a database fail" => "数�库访问失败",
 "Week" => "星期",
-"Weeks" => "星期",
-"Day" => "天",
 "Month" => "月",
+"List" => "列表",
 "Today" => "今天",
 "Calendars" => "日历",
-"Time" => "时间",
 "There was a fail, while parsing the file." => "解�文件失败",
 "Choose active calendars" => "选择活动日历",
+"New Calendar" => "新日历",
+"CalDav Link" => "CalDav 链接",
 "Download" => "下载",
 "Edit" => "编辑",
+"Delete" => "删除",
+"New calendar" => "新日历",
 "Edit calendar" => "编辑日历",
 "Displayname" => "显示�称",
 "Active" => "激活",
-"Description" => "�述",
 "Calendar color" => "日历颜色",
+"Save" => "�存",
 "Submit" => "�交",
+"Cancel" => "�消",
 "Edit an event" => "编辑事件",
-"Title" => "标题",
+"Export" => "导出",
 "Title of the Event" => "事件标题",
-"Location" => "地点",
-"Location of the Event" => "事件地点",
 "Category" => "分类",
+"Select category" => "选择分类",
 "All Day Event" => "全天事件",
 "From" => "自",
 "To" => "至",
+"Advanced options" => "高级选项",
 "Repeat" => "��",
-"Attendees" => "�加者",
+"Location" => "地点",
+"Location of the Event" => "事件地点",
+"Description" => "�述",
 "Description of the Event" => "事件�述",
-"Close" => "关闭",
+"Please choose the calendar" => "请选择日历",
+"Import" => "导入",
 "Create a new event" => "创建新事件",
-"Timezone" => "时区"
+"Timezone" => "时区",
+"Timeformat" => "时间格�",
+"24h" => "24�时",
+"12h" => "12�时",
+"Calendar CalDAV syncing address:" => "日历CalDAV �步地�："
 );
diff --git a/apps/contacts/l10n/ar.php b/apps/contacts/l10n/ar.php
index 662c657797b..935ac27dd0d 100644
--- a/apps/contacts/l10n/ar.php
+++ b/apps/contacts/l10n/ar.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "هذا ليس د�تر عناوينك.",
 "Contact could not be found." => "لم يتم العثور على الشخص.",
-"vCard could not be read." => "لم يتم قراءة ال vCard بنجاح.",
 "Information about vCard is incorrect. Please reload the page." => "المعلومات الموجودة �ي ال vCard غير صحيحة. الرجاء إعادة تحديث الص�حة.",
 "Address" => "عنوان",
 "Telephone" => "الهات�",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "هذا الكرت ليس متلائم مع نظام ال RFC.",
 "This card does not contain a photo." => "لا يحتوي هذا الكرت على صورة.",
 "Add Contact" => "أض� شخص ",
-"Group" => "مجموعة",
 "Name" => "الاسم",
 "PO Box" => "العنوان البريدي",
 "Extended" => "إضا�ة",
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 4b917ef21f6..1b3fc607729 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Aquesta no és la vostra llibreta d'adreces",
 "Contact could not be found." => "No s'ha trobat el contacte.",
-"vCard could not be read." => "No s'ha pogut llegir la vCard",
 "Information about vCard is incorrect. Please reload the page." => "La informació de la vCard és incorrecta. Carregueu la pàgina de nou.",
 "Address" => "Adreça",
 "Telephone" => "Telèfon",
@@ -18,9 +17,9 @@
 "This is not your contact." => "Aquest contacte no és vostre.",
 "This card is not RFC compatible." => "Aquesta targeta no és compatible amb RFC.",
 "This card does not contain a photo." => "Aquesta targeta no conté foto.",
-"Add Contact" => "Afegeix un contacte",
-"Group" => "Grup",
+"Add Contact" => "Afegiu un contacte",
 "Name" => "Nom",
+"Type" => "Tipus",
 "PO Box" => "Adreça Postal",
 "Extended" => "Addicional",
 "Street" => "Carrer",
@@ -29,8 +28,21 @@
 "Zipcode" => "Codi postal",
 "Country" => "País",
 "Create Contact" => "Crea un contacte",
+"Choose active Address Books" => "Escolliu una llibreda d'adreces activa",
+"New Address Book" => "Nova llibreta d'adreces",
+"CardDav Link" => "Enllaç CardDav",
+"Download" => "Baixa",
 "Edit" => "Edita",
 "Delete" => "Elimina",
+"Delete contact" => "Elimina el contacte",
+"Add" => "Afegeix",
+"Displayname" => "Nom a mostrar",
+"Active" => "Actiu",
+"Save" => "Desa",
+"Submit" => "Envia",
+"Cancel" => "Cancel·la",
 "Birthday" => "Aniversari",
-"Phone" => "Telèfon"
+"Preferred" => "Preferit",
+"Phone" => "Telèfon",
+"Update" => "Actualitza"
 );
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
index 7cdf8e427b7..0ccf9de8d0e 100644
--- a/apps/contacts/l10n/cs_CZ.php
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Toto není Váš adresář.",
 "Contact could not be found." => "Kontakt nebyl nalezen.",
-"vCard could not be read." => "vCard nelze pře�íst.",
 "Information about vCard is incorrect. Please reload the page." => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
 "Address" => "Adresa",
 "Telephone" => "Telefon",
@@ -19,8 +18,8 @@
 "This card is not RFC compatible." => "Tato karta není kompatibilní s RFC.",
 "This card does not contain a photo." => "Tato karta neobsahuje foto",
 "Add Contact" => "Přidat kontakt",
-"Group" => "Skupina",
 "Name" => "Jméno",
+"Type" => "Typ",
 "PO Box" => "PO box",
 "Extended" => "Rozšířené",
 "Street" => "Ulice",
@@ -29,8 +28,21 @@
 "Zipcode" => "PSČ",
 "Country" => "ZemÄ›",
 "Create Contact" => "Vytvořit kontakt",
+"Choose active Address Books" => "Zvolte aktivní adresář",
+"New Address Book" => "Nový adresář",
+"CardDav Link" => "Odkaz CardDav",
+"Download" => "Stažení",
 "Edit" => "Editovat",
 "Delete" => "Odstranit",
+"Delete contact" => "Odstranit kontakt",
+"Add" => "Přidat",
+"Displayname" => "Zobrazené jméno",
+"Active" => "Aktivní",
+"Save" => "Uložit",
+"Submit" => "Potvrdit",
+"Cancel" => "Storno",
 "Birthday" => "Narozeniny",
-"Phone" => "Telefon"
+"Preferred" => "Preferovaný",
+"Phone" => "Telefon",
+"Update" => "Aktualizovat"
 );
diff --git a/apps/contacts/l10n/da.php b/apps/contacts/l10n/da.php
index f4defa28f20..2c597d1993b 100644
--- a/apps/contacts/l10n/da.php
+++ b/apps/contacts/l10n/da.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Dette er ikke din adressebog.",
 "Contact could not be found." => "Kontaktperson kunne ikke findes.",
-"vCard could not be read." => "Kunne ikke læse vCard.",
 "Information about vCard is incorrect. Please reload the page." => "Informationen om vCard er forkert. Genindlæs siden.",
 "Address" => "Adresse",
 "Telephone" => "Telefon",
@@ -19,8 +18,8 @@
 "This card is not RFC compatible." => "Dette kort er ikke RFC-kompatibelt.",
 "This card does not contain a photo." => "Dette kort indeholder ikke et foto.",
 "Add Contact" => "Tilføj kontaktperson",
-"Group" => "Gruppe",
 "Name" => "Navn",
+"Type" => "Type",
 "PO Box" => "Postboks",
 "Extended" => "Udvidet",
 "Street" => "Vej",
@@ -29,8 +28,21 @@
 "Zipcode" => "Postnummer",
 "Country" => "Land",
 "Create Contact" => "Ny kontaktperson",
+"Choose active Address Books" => "Vælg aktive adressebøger",
+"New Address Book" => "Ny adressebog",
+"CardDav Link" => "CardDav-link",
+"Download" => "Download",
 "Edit" => "Rediger",
 "Delete" => "Slet",
+"Delete contact" => "Slet kontaktperson",
+"Add" => "Tilføj",
+"Displayname" => "Vist navn",
+"Active" => "Aktiv",
+"Save" => "Gem",
+"Submit" => "Gem",
+"Cancel" => "Fortryd",
 "Birthday" => "Fødselsdag",
-"Phone" => "Telefon"
+"Preferred" => "Foretrukken",
+"Phone" => "Telefon",
+"Update" => "Opdater"
 );
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index f98cabcb5ed..53f8a9e6648 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Dies ist nicht dein Adressbuch.",
 "Contact could not be found." => "Kontakt konnte nicht gefunden werden.",
-"vCard could not be read." => "vCard konnte nicht gelesen werden.",
 "Information about vCard is incorrect. Please reload the page." => "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite.",
 "Address" => "Adresse",
 "Telephone" => "Telefon",
@@ -19,8 +18,8 @@
 "This card is not RFC compatible." => "Diese Karte ist nicht RFC-kompatibel.",
 "This card does not contain a photo." => "Diese Karte enthält kein Foto.",
 "Add Contact" => "Kontakt hinzufügen",
-"Group" => "Gruppe",
 "Name" => "Name",
+"Type" => "Typ",
 "PO Box" => "Postfach",
 "Extended" => "Erweitert",
 "Street" => "Straße",
@@ -29,8 +28,21 @@
 "Zipcode" => "Postleitzahl",
 "Country" => "Land",
 "Create Contact" => "Kontakt erstellen",
+"Choose active Address Books" => "Aktive Adressbücher auswählen",
+"New Address Book" => "Neues Adressbuch",
+"CardDav Link" => "CardDav Link",
+"Download" => "Herunterladen",
 "Edit" => "Bearbeiten",
 "Delete" => "Löschen",
+"Delete contact" => "Kontakt löschen",
+"Add" => "Hinzufügen",
+"Displayname" => "Anzeigename",
+"Active" => "Aktiv",
+"Save" => "Speichern",
+"Submit" => "Eintragen",
+"Cancel" => "Abbrechen",
 "Birthday" => "Geburtstag",
-"Phone" => "Telefon"
+"Preferred" => "Bevorzugt",
+"Phone" => "Telefon",
+"Update" => "Aktualisieren"
 );
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
index 3a0b24eae8e..8f2b1e30464 100644
--- a/apps/contacts/l10n/el.php
+++ b/apps/contacts/l10n/el.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Αυτό δεν είναι βιβλίο διευθ�νσεων σας.",
 "Contact could not be found." => "Η επαφή δεν μπ�ό�εσε να β�εθεί.",
-"vCard could not be read." => "Η vCard δεν μπο�εί να διαβαστεί.",
 "Information about vCard is incorrect. Please reload the page." => "Οι πλη�οφο�ίες σχετικά με vCard είναι εσφαλμένες. Πα�ακαλώ επαναφο�τώστε τη σελίδα.",
 "Address" => "Διε�θυνση",
 "Telephone" => "Τηλέφωνο",
@@ -19,8 +18,8 @@
 "This card is not RFC compatible." => "Αυτή η κά�τα δεν είναι RFC συμβατή.",
 "This card does not contain a photo." => "Αυτή η κά�τα δεν πε�ιέχει φωτογ�αφία.",
 "Add Contact" => "Π�οσθήκη επαφής",
-"Group" => "Ομάδα",
 "Name" => "Όνομα",
+"Type" => "Τ�πος",
 "PO Box" => "Ταχ. Θυ�ίδα",
 "Extended" => "Εκτεταμένη",
 "Street" => "Οδός",
@@ -29,8 +28,21 @@
 "Zipcode" => "Τ.Κ.",
 "Country" => "Χώ�α",
 "Create Contact" => "Δημιου�γία επαφής",
+"Choose active Address Books" => "Επιλέξτε τα ενε�γά βιβλία διευθ�νσεων",
+"New Address Book" => "�έο βιβλίο διευθ�νσεων",
+"CardDav Link" => "Σ�νδεσμος CardDav",
+"Download" => "Μεταφό�τωση",
 "Edit" => "Επεξε�γασία",
 "Delete" => "Διαγ�αφή",
+"Delete contact" => "Διαγ�αφή επαφής",
+"Add" => "Π�οσθήκη",
+"Displayname" => "Π�οβαλόμενο όνομα",
+"Active" => "Ενε�γό",
+"Save" => "Αποθήκευση",
+"Submit" => "Καταχώ�ηση",
+"Cancel" => "Ακ��ωση",
 "Birthday" => "Γενέθλια",
-"Phone" => "Τηλέφωνο"
+"Preferred" => "Π�οτιμώμενο",
+"Phone" => "Τηλέφωνο",
+"Update" => "Ενημέ�ωση"
 );
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
index 1b9fe8c1a14..ef55bbebbb9 100644
--- a/apps/contacts/l10n/eo.php
+++ b/apps/contacts/l10n/eo.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Ĉi tiu ne estas via adresaro.",
 "Contact could not be found." => "Ne eblis trovi la kontakton.",
-"vCard could not be read." => "Ne eblis legi vCard-on.",
 "Information about vCard is incorrect. Please reload the page." => "Informo pri vCard estas mal�usta. Bonvolu re�argi la pa�on.",
 "Address" => "Adreso",
 "Telephone" => "Telefono",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "Ĉi tiu karto ne kongruas kun RFC.",
 "This card does not contain a photo." => "Ĉi tiu karto ne havas foton.",
 "Add Contact" => "Aldoni kontakton",
-"Group" => "Grupo",
 "Name" => "Nomo",
 "PO Box" => "Abonkesto",
 "Extended" => "Etendita",
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
index 30dedf89fd6..260fe2ac976 100644
--- a/apps/contacts/l10n/es.php
+++ b/apps/contacts/l10n/es.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Esta no es tu agenda de contactos.",
 "Contact could not be found." => "No se pudo encontrar el contacto.",
-"vCard could not be read." => "No se pudo leer el vCard.",
 "Information about vCard is incorrect. Please reload the page." => "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la página.",
 "Address" => "Dirección",
 "Telephone" => "Teléfono",
@@ -19,8 +18,8 @@
 "This card is not RFC compatible." => "Esta tarjeta no es compatible con RFC.",
 "This card does not contain a photo." => "Esta tarjeta no contiene ninguna foto.",
 "Add Contact" => "Agregar contacto",
-"Group" => "Grupo",
 "Name" => "Nombre",
+"Type" => "Tipo",
 "PO Box" => "Código postal",
 "Extended" => "Extendido",
 "Street" => "Calle",
@@ -29,8 +28,19 @@
 "Zipcode" => "Código Postal",
 "Country" => "País",
 "Create Contact" => "Crear contacto",
+"New Address Book" => "Nueva libreta de direcciones",
+"CardDav Link" => "Link Card Dav",
+"Download" => "Descargar",
 "Edit" => "Editar",
 "Delete" => "Borrar",
+"Delete contact" => "Eliminar contacto",
+"Add" => "Añadir",
+"Active" => "Activo",
+"Save" => "Guardar",
+"Submit" => "Aceptar",
+"Cancel" => "Cancelar",
 "Birthday" => "Cumpleaños",
-"Phone" => "Teléfono"
+"Preferred" => "Preferido",
+"Phone" => "Teléfono",
+"Update" => "Actualizar"
 );
diff --git a/apps/contacts/l10n/et_EE.php b/apps/contacts/l10n/et_EE.php
index 341a74cf778..f57190bddcc 100644
--- a/apps/contacts/l10n/et_EE.php
+++ b/apps/contacts/l10n/et_EE.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "See pole sinu aadressiraamat.",
 "Contact could not be found." => "Kontakti ei leitud.",
-"vCard could not be read." => "Visiitkaardi lugemine ebaõnnestus,",
 "Information about vCard is incorrect. Please reload the page." => "Visiitkaardi info pole korrektne. Palun lae leht uuesti.",
 "Address" => "Aadress",
 "Telephone" => "Telefon",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "See kaart ei ühildu RFC-ga.",
 "This card does not contain a photo." => "Sellel kaardil pole fotot.",
 "Add Contact" => "Lisa kontakt",
-"Group" => "Grupp",
 "Name" => "Nimi",
 "PO Box" => "Postkontori postkast",
 "Extended" => "Laiendatud",
diff --git a/apps/contacts/l10n/eu.php b/apps/contacts/l10n/eu.php
index 19b7ddb3e43..c37b6f2762f 100644
--- a/apps/contacts/l10n/eu.php
+++ b/apps/contacts/l10n/eu.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Hau ez da zure helbide liburua.",
 "Contact could not be found." => "Ezin izan da kontaktua aurkitu.",
-"vCard could not be read." => "Ezin izan da vCard-a irakurri.",
 "Information about vCard is incorrect. Please reload the page." => "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea.",
 "Address" => "Helbidea",
 "Telephone" => "Telefonoa",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "Txartel hau ez da RFC bateragarria.",
 "This card does not contain a photo." => "Txartel honek ez dauka argazkirik.",
 "Add Contact" => "Gehitu Kontaktua",
-"Group" => "Taldea",
 "Name" => "Izena",
 "PO Box" => "Posta kutxa",
 "Extended" => "Hedatua",
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 2b9cdc77a0a..465e2d5456a 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -1,11 +1,10 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Ce n'est pas votre carnet d'adresses.",
 "Contact could not be found." => "Ce contact n'a pas été trouvé.",
-"vCard could not be read." => "Cette vCard n'a pas pu être lue.",
 "Information about vCard is incorrect. Please reload the page." => "Les informations relatives à cette vCard sont incorrectes. Veuillez recharger la page.",
 "Address" => "Adresse",
 "Telephone" => "Téléphone",
-"Email" => "Email",
+"Email" => "E-mail",
 "Organization" => "Société",
 "Work" => "Travail",
 "Home" => "Maison",
@@ -19,8 +18,8 @@
 "This card is not RFC compatible." => "Cette fiche n'est pas compatible RFC.",
 "This card does not contain a photo." => "Cette fiche ne contient pas de photo.",
 "Add Contact" => "Ajouter un Contact",
-"Group" => "Groupe",
 "Name" => "Nom",
+"Type" => "Type",
 "PO Box" => "Boîte postale",
 "Extended" => "Étendu",
 "Street" => "Rue",
@@ -29,8 +28,21 @@
 "Zipcode" => "Code postal",
 "Country" => "Pays",
 "Create Contact" => "Créer le Contact",
+"Choose active Address Books" => "Choisissez le Carnet d'adresses actif",
+"New Address Book" => "Nouveau Carnet d'adresses",
+"CardDav Link" => "Lien CardDav",
+"Download" => "Télécharger",
 "Edit" => "Modifier",
-"Delete" => "Effacer",
+"Delete" => "Supprimer",
+"Delete contact" => "Supprimer le contact",
+"Add" => "Ajouter",
+"Displayname" => "Nom",
+"Active" => "Carnet actif",
+"Save" => "Sauvegarder",
+"Submit" => "Envoyer",
+"Cancel" => "Annuler",
 "Birthday" => "Anniversaire",
-"Phone" => "Téléphone"
+"Preferred" => "Préféré",
+"Phone" => "Téléphone",
+"Update" => "Enregistrer"
 );
diff --git a/apps/contacts/l10n/he.php b/apps/contacts/l10n/he.php
index 22275f77e59..b16eeac2ba8 100644
--- a/apps/contacts/l10n/he.php
+++ b/apps/contacts/l10n/he.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "זהו �ינו ספר הכתובות שלך",
 "Contact could not be found." => "ל� ניתן ל�תר �יש קשר",
-"vCard could not be read." => "ל� ניתן לקרו� vCard.",
 "Information about vCard is incorrect. Please reload the page." => "המידע �ודות vCard �ינו נכון. נ� לטעון מחדש �ת הדף.",
 "Address" => "כתובת",
 "Telephone" => "טלפון",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "כרטיס זה �ינו תו�� ל־RFC",
 "This card does not contain a photo." => "כרטיס זה �ינו כולל תמונה",
 "Add Contact" => "הוספת �יש קשר",
-"Group" => "קבוצה",
 "Name" => "ש�",
 "PO Box" => "ת� דו�ר",
 "Extended" => "מורחב",
diff --git a/apps/contacts/l10n/hr.php b/apps/contacts/l10n/hr.php
index 4b62b292acf..dfeab8bdea9 100644
--- a/apps/contacts/l10n/hr.php
+++ b/apps/contacts/l10n/hr.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Ovo nije vaš adresar.",
 "Contact could not be found." => "Kontakt ne postoji.",
-"vCard could not be read." => "Nemoguće pro�itati vCard.",
 "Information about vCard is incorrect. Please reload the page." => "Informacija o vCard je neispravna. Osvježite stranicu.",
 "Address" => "Adresa",
 "Telephone" => "Telefon",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "Ova kartica nije sukladna prema RFC direktivama.",
 "This card does not contain a photo." => "Ova kartica ne sadrži fotografiju.",
 "Add Contact" => "Dodaj kontakt",
-"Group" => "Grupa",
 "Name" => "Naziv",
 "PO Box" => "Poštanski Pretinac",
 "Extended" => "Prošireno",
diff --git a/apps/contacts/l10n/hu_HU.php b/apps/contacts/l10n/hu_HU.php
index 21123645ddb..74d66e9f7d3 100644
--- a/apps/contacts/l10n/hu_HU.php
+++ b/apps/contacts/l10n/hu_HU.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Ez nem a te címjegyzéked.",
 "Contact could not be found." => "Kapcsolat nem található.",
-"vCard could not be read." => "A vCard-ot nem lehet olvasni.",
 "Information about vCard is incorrect. Please reload the page." => "A vCardról szóló információ helytelen. Töltsd újra az oldalt.",
 "Address" => "Cím",
 "Telephone" => "Telefonszám",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "A kártya nem RFC kompatibilis.",
 "This card does not contain a photo." => "A kártya nem tartlmaz fényképet.",
 "Add Contact" => "Kontakt hozzáadása",
-"Group" => "Csoport",
 "Name" => "Név",
 "PO Box" => "Postafiók",
 "Extended" => "Kiterjesztett",
diff --git a/apps/contacts/l10n/ia.php b/apps/contacts/l10n/ia.php
index 2bd53255e85..d4203ce8f04 100644
--- a/apps/contacts/l10n/ia.php
+++ b/apps/contacts/l10n/ia.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Iste non es tu libro de adresses",
 "Contact could not be found." => "Contacto non poterea esser legite",
-"vCard could not be read." => "vCard non poterea esser legite.",
 "Address" => "Adresse",
 "Telephone" => "Telephono",
 "Email" => "E-posta",
@@ -16,7 +15,6 @@
 "This is not your contact." => "Iste non es tu contacto",
 "This card is not RFC compatible." => "Iste carta non es compatibile con RFC",
 "Add Contact" => "Adder contacto",
-"Group" => "Gruppo",
 "Name" => "Nomine",
 "PO Box" => "Cassa postal",
 "Street" => "Strata",
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index c06a2b2a156..c4360d89133 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Questa non è la tua rubrica.",
 "Contact could not be found." => "Il contatto non può essere trovato",
-"vCard could not be read." => "La vCard non può essere letta",
 "Information about vCard is incorrect. Please reload the page." => "Informazioni sulla vCard incorrette. Ricaricare la pagina.",
 "Address" => "Indirizzo",
 "Telephone" => "Telefono",
@@ -19,8 +18,8 @@
 "This card is not RFC compatible." => "Questa card non è compatibile con il protocollo RFC.",
 "This card does not contain a photo." => "Questa card non contiene una foto.",
 "Add Contact" => "Aggiungi contatto",
-"Group" => "Gruppo",
 "Name" => "Nome",
+"Type" => "Tipo",
 "PO Box" => "Casella postale",
 "Extended" => "Estendi",
 "Street" => "Via",
@@ -29,8 +28,21 @@
 "Zipcode" => "CAP",
 "Country" => "Stato",
 "Create Contact" => "Crea contatto",
+"Choose active Address Books" => "Seleziona le rubriche attive",
+"New Address Book" => "Nuova rubrica",
+"CardDav Link" => "Link CardDav",
+"Download" => "Scarica",
 "Edit" => "Modifica",
 "Delete" => "Cancella",
+"Delete contact" => "Cancella contatto",
+"Add" => "Aggiungi",
+"Displayname" => "Nome da mostrare",
+"Active" => "Attiva",
+"Save" => "Salva",
+"Submit" => "Conferma",
+"Cancel" => "Annulla",
 "Birthday" => "Compleanno",
-"Phone" => "Telefono"
+"Preferred" => "Preferito",
+"Phone" => "Telefono",
+"Update" => "Aggiorna"
 );
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index d5ae4b632dd..c8711e963f3 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "�れ�����電話帳���り��ん。",
 "Contact could not be found." => "連絡先を見��る事�����ん。",
-"vCard could not be read." => "vCard�読�込��失敗����。",
 "Information about vCard is incorrect. Please reload the page." => "vCard�情報�誤り��り��。ページをリロード��下��。",
 "Address" => "�所",
 "Telephone" => "電話番�",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "��カード�RFC�準拠�����ん。",
 "This card does not contain a photo." => "��カード�写真を�ん��り��ん。",
 "Add Contact" => "連絡先�追加",
-"Group" => "グループ",
 "Name" => "��",
 "PO Box" => "�書箱",
 "Extended" => "拡張番地",
diff --git a/apps/contacts/l10n/lb.php b/apps/contacts/l10n/lb.php
index df6e22bfab9..4190072171a 100644
--- a/apps/contacts/l10n/lb.php
+++ b/apps/contacts/l10n/lb.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Dat do ass net däin Adressbuch.",
 "Contact could not be found." => "Konnt den Kontakt net fannen.",
-"vCard could not be read." => "vCard konnt net gelies ginn.",
 "Information about vCard is incorrect. Please reload the page." => "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei.",
 "Address" => "Adress",
 "Telephone" => "Telefon's Nummer",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "Déi do Kaart ass net RFC kompatibel.",
 "This card does not contain a photo." => "Déi do Kaart huet keng Foto.",
 "Add Contact" => "Kontakt bäisetzen",
-"Group" => "Grupp",
 "Name" => "Numm",
 "PO Box" => "Postleetzuel",
 "Extended" => "Erweidert",
diff --git a/apps/contacts/l10n/lt_LT.php b/apps/contacts/l10n/lt_LT.php
index ad92ebf9cce..8dc61e3621f 100644
--- a/apps/contacts/l10n/lt_LT.php
+++ b/apps/contacts/l10n/lt_LT.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Tai ne jūsų adresų knygelė.",
 "Contact could not be found." => "Kontaktas nerastas",
-"vCard could not be read." => "Nenuskaitoma vCard.",
 "Information about vCard is incorrect. Please reload the page." => "Informacija apie vCard yra neteisinga. ",
 "Address" => "Adresas",
 "Telephone" => "Telefonas",
@@ -17,7 +16,6 @@
 "Pager" => "Pranešimų gaviklis",
 "This is not your contact." => "Tai ne jūsų kontaktas",
 "Add Contact" => "PridÄ—ti kontaktÄ…",
-"Group" => "GrupÄ—",
 "Name" => "Vardas",
 "PO Box" => "Pašto dėžutė",
 "Street" => "GatvÄ—",
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
index 0113eb9df78..0bfa86c8c44 100644
--- a/apps/contacts/l10n/nl.php
+++ b/apps/contacts/l10n/nl.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Dit is niet uw adresboek.",
 "Contact could not be found." => "Contact kon niet worden gevonden.",
-"vCard could not be read." => "vCard kon niet worden gelezen.",
 "Information about vCard is incorrect. Please reload the page." => "Informatie over de vCard is onjuist. Herlaad de pagina.",
 "Address" => "Adres",
 "Telephone" => "Telefoon",
@@ -19,10 +18,7 @@
 "This card is not RFC compatible." => "Deze kaart is niet RFC compatibel.",
 "This card does not contain a photo." => "Deze contact bevat geen foto.",
 "Add Contact" => "Contact toevoegen",
-"Address Books" => "Adresboeken",
-"Group" => "Groep",
 "Name" => "Naam",
-"Number" => "Nummer",
 "Type" => "Type",
 "PO Box" => "Postbus",
 "Extended" => "Uitgebreide",
@@ -40,7 +36,6 @@
 "Delete" => "Verwijderen",
 "Delete contact" => "Verwijder contact",
 "Add" => "Voeg toe",
-"Edit Address Book" => "Bewerk Adresboek",
 "Displayname" => "Weergavenaam",
 "Active" => "Actief",
 "Save" => "Opslaan",
diff --git a/apps/contacts/l10n/nn_NO.php b/apps/contacts/l10n/nn_NO.php
index 98db59d9751..12d914a805c 100644
--- a/apps/contacts/l10n/nn_NO.php
+++ b/apps/contacts/l10n/nn_NO.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Dette er ikkje di adressebok.",
 "Contact could not be found." => "Fann ikkje kontakten.",
-"vCard could not be read." => "Klarte ikkje å lesa vCard-et.",
 "Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt.",
 "Address" => "Adresse",
 "Telephone" => "Telefonnummer",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "Dette kortet er ikkje RFC-kompatibelt",
 "This card does not contain a photo." => "Dette kortet har ingen bilete.",
 "Add Contact" => "Legg til kontakt",
-"Group" => "Gruppe",
 "Name" => "Namn",
 "PO Box" => "Postboks",
 "Extended" => "Utvida",
diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
index 43ee14f930e..72bdf967a4e 100644
--- a/apps/contacts/l10n/pl.php
+++ b/apps/contacts/l10n/pl.php
@@ -1,10 +1,17 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Błąd podczas (de)aktywacji książki",
+"There was an error adding the contact." => "Wystąpił błąd podczas dodawania kontaktu",
+"Cannot add empty property." => "Nie można dodać pustego elementu",
+"At least one of the address fields has to be filled out." => "Przynajmniej jedno pole adresu musi być wypełnione",
+"Error adding contact property." => "BÅ‚Ä…d podczas dodawania elementu",
+"Error adding addressbook." => "Błąd podczas dodawania książki",
+"Error activating addressbook." => "Błąd podczas aktywacji książki adresowej",
+"Error deleting contact property." => "BÅ‚Ä…d podczas kasowania elementu",
+"Error updating contact property." => "BÅ‚Ä…d podczas aktualizacji elementu",
+"Error updating addressbook." => "Błąd podczas aktualizacji książki",
 "Contacts" => "Kontakty",
-"Addressbooks" => "Książki adresowe",
-"Add" => "Dodaj",
 "This is not your addressbook." => "To nie jest twoja książka adresowa.",
 "Contact could not be found." => "Kontakt nie znaleziony.",
-"vCard could not be read." => "Nie można odczytać vCard.",
 "Information about vCard is incorrect. Please reload the page." => "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę.",
 "Address" => "Adres",
 "Telephone" => "Telefon",
@@ -18,22 +25,42 @@
 "Fax" => "Faks",
 "Video" => "Połączenie wideo",
 "Pager" => "Pager",
+"Contact" => "Kontakt",
 "This is not your contact." => "To nie jest twój kontakt.",
 "This card is not RFC compatible." => "Ta karta nie jest zgodna ze specyfikacjÄ… RFC.",
 "This card does not contain a photo." => "Ta karta nie zawiera zdjęć.",
 "Add Contact" => "Dodaj kontakt",
-"Group" => "Grupa",
+"Addressbooks" => "Książki adresowe",
+"Addressbook" => "Książka adresowa",
 "Name" => "Nazwisko",
+"Type" => "Typ",
 "PO Box" => "PO Box",
 "Extended" => "Rozszerzony",
 "Street" => "Ulica",
 "City" => "Miasto",
 "Region" => "Region",
-"Zipcode" => "Kod pocztowy",
+"Zipcode" => "BÅ‚Ä…d podczas dodawania elementu",
 "Country" => "Kraj",
 "Create Contact" => "Utwórz kontakt",
+"Choose active Address Books" => "Wybierz aktywną książkę adresową",
+"New Address Book" => "Nowa książka adresowa",
+"CardDav Link" => "Link CardDav",
+"Download" => "SciÄ…gaj",
 "Edit" => "Edytuj",
 "Delete" => "Usuń",
+"Download contact" => "Pobierz kontakt",
+"Delete contact" => "Skasuj kontakt",
+"Add" => "Dodaj",
+"New Addressbook" => "Nowa książka adresowa",
+"Edit Addressbook" => "Edytuj książkę",
+"Displayname" => "Nazwa wyświetlana",
+"Active" => "Aktywny",
+"Save" => "Zapisz",
+"Submit" => "Potwierdź",
+"Cancel" => "Skasuj",
 "Birthday" => "Urodziny",
-"Phone" => "Telefon"
+"Preferred" => "Preferowane",
+"Phone" => "Telefon",
+"Update" => "Aktualizuj",
+"CardDAV syncing address:" => "Adres synchronizacji CardDAV:"
 );
diff --git a/apps/contacts/l10n/pt_BR.php b/apps/contacts/l10n/pt_BR.php
index 42d37451b7a..db9e98d6fe0 100644
--- a/apps/contacts/l10n/pt_BR.php
+++ b/apps/contacts/l10n/pt_BR.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Este não é o seu agenda de endereços.",
 "Contact could not be found." => "Contato não pôde ser encontrado.",
-"vCard could not be read." => "vCard não pôde ser lida.",
 "Information about vCard is incorrect. Please reload the page." => "Informações sobre vCard é incorreta. Por favor, recarregue a página.",
 "Address" => "Endereço",
 "Telephone" => "Telefone",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "Este cartão não é compatível com RFC.",
 "This card does not contain a photo." => "Este cartão não contém uma foto.",
 "Add Contact" => "Adicionar Contato",
-"Group" => "Grupo",
 "Name" => "Nome",
 "PO Box" => "Caixa Postal",
 "Extended" => "Estendido",
diff --git a/apps/contacts/l10n/pt_PT.php b/apps/contacts/l10n/pt_PT.php
index b354272a3c7..d5916838dbe 100644
--- a/apps/contacts/l10n/pt_PT.php
+++ b/apps/contacts/l10n/pt_PT.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Esta não é a sua lista de contactos",
 "Contact could not be found." => "O contacto não foi encontrado",
-"vCard could not be read." => "o vCard não pode ser lido",
 "Information about vCard is incorrect. Please reload the page." => "A informação sobre o vCard está incorreta. Por favor refresque a página",
 "Address" => "Morada",
 "Telephone" => "Telefone",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "Este cartão não é compativel com RFC",
 "This card does not contain a photo." => "Este cartão não possui foto",
 "Add Contact" => "Adicionar Contacto",
-"Group" => "Grupo",
 "Name" => "Nome",
 "PO Box" => "Apartado",
 "Extended" => "Extendido",
diff --git a/apps/contacts/l10n/ro.php b/apps/contacts/l10n/ro.php
index 2a89edc4ec7..4fc10abddb0 100644
--- a/apps/contacts/l10n/ro.php
+++ b/apps/contacts/l10n/ro.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Nu se găsește în agendă.",
 "Contact could not be found." => "Contactul nu a putut fi găsit.",
-"vCard could not be read." => "vCard nu poate fi citit.",
 "Information about vCard is incorrect. Please reload the page." => "Informațiile despre vCard sunt incorecte. Reîncărcați pagina.",
 "Address" => "Adresă",
 "Telephone" => "Telefon",
@@ -19,8 +18,8 @@
 "This card is not RFC compatible." => "Nu este compatibil RFC",
 "This card does not contain a photo." => "Nu conține o fotografie",
 "Add Contact" => "Adaugă contact",
-"Group" => "Grup",
 "Name" => "Nume",
+"Type" => "Tip",
 "PO Box" => "CP",
 "Extended" => "Extins",
 "Street" => "Stradă",
@@ -29,8 +28,21 @@
 "Zipcode" => "Cod poștal",
 "Country" => "Țară",
 "Create Contact" => "Crează contact",
+"Choose active Address Books" => "Alegeți una din agendele active",
+"New Address Book" => "Agendă nouă",
+"CardDav Link" => "Link CardDev",
+"Download" => "Descarcă",
 "Edit" => "Editează",
 "Delete" => "Șterge",
+"Delete contact" => "Șterge contact",
+"Add" => "Adaugă",
+"Displayname" => "Numele afișat",
+"Active" => "Activ",
+"Save" => "Salvează",
+"Submit" => "Trimite",
+"Cancel" => "Anulează",
 "Birthday" => "Zi de naștere",
-"Phone" => "Telefon"
+"Preferred" => "Preferat",
+"Phone" => "Telefon",
+"Update" => "Update"
 );
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
index c3b66a83d8f..5eb765f222e 100644
--- a/apps/contacts/l10n/ru.php
+++ b/apps/contacts/l10n/ru.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Это не ваша адре�на� книга.",
 "Contact could not be found." => "Контакт не найден.",
-"vCard could not be read." => "�е удало�ь проче�ть vCard.",
 "Information about vCard is incorrect. Please reload the page." => "Информаци� о vCard некорректна. Пожалуй�та, обновите �траницу.",
 "Address" => "�дре�",
 "Telephone" => "Телефон",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "Эта карточка не �оответ�твует RFC.",
 "This card does not contain a photo." => "Эта карточка не �одержит фотографии.",
 "Add Contact" => "Добавить Контакт",
-"Group" => "Группа",
 "Name" => "Им�",
 "PO Box" => "�О",
 "Extended" => "Ра�ширенный",
diff --git a/apps/contacts/l10n/sk_SK.php b/apps/contacts/l10n/sk_SK.php
index acc19672595..16876cc59b2 100644
--- a/apps/contacts/l10n/sk_SK.php
+++ b/apps/contacts/l10n/sk_SK.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Toto nie je váš adresár.",
 "Contact could not be found." => "Kontakt nebol nájdený.",
-"vCard could not be read." => "vCard nemôže byť pre�ítaná.",
 "Information about vCard is incorrect. Please reload the page." => "Informácie o vCard sú neplatné. Prosím obnovte stránku.",
 "Address" => "Adresa",
 "Telephone" => "Telefón",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "Táto karta nie je kompatibilná s RFC.",
 "This card does not contain a photo." => "Táto karta neobsahuje fotografiu.",
 "Add Contact" => "Pridať Kontakt.",
-"Group" => "Skupina",
 "Name" => "Meno",
 "PO Box" => "PO Box",
 "Extended" => "Rozšírené",
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index bce43a7a2c8..2c81567eae0 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "To ni vaš adresar.",
 "Contact could not be found." => "Kontakta ni bilo mogo�e najti.",
-"vCard could not be read." => "vVizitko (vCard) ni bilo mogo�e prebrati.",
 "Information about vCard is incorrect. Please reload the page." => "Informacije o vVizitki (vCard) niso pravilne, Prosimo ponovno naložite okno.",
 "Address" => "Naslov",
 "Telephone" => "Telefon",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "Ta karta ni RFC kopatibilna.",
 "This card does not contain a photo." => "Ta karta ne vsebuje slike.",
 "Add Contact" => "Dodaj Kontakt",
-"Group" => "Skupina",
 "Name" => "Ime",
 "PO Box" => "PO Box",
 "Extended" => "Razširjeno.",
diff --git a/apps/contacts/l10n/sr.php b/apps/contacts/l10n/sr.php
index f0775f0afda..882381c37c2 100644
--- a/apps/contacts/l10n/sr.php
+++ b/apps/contacts/l10n/sr.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Ово није ваш адре�ар.",
 "Contact could not be found." => "Контакт �е не може наћи.",
-"vCard could not be read." => "вКарта �е не може читати.",
 "Information about vCard is incorrect. Please reload the page." => "Подаци о вКарти �у неи�правни. Поново учитајте �траницу.",
 "Address" => "�дре�а",
 "Telephone" => "Телефон",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "Ова карта није �агла�на �а РФЦ-ом.",
 "This card does not contain a photo." => "Ова карта не �адржи фотографију.",
 "Add Contact" => "Додај контакт",
-"Group" => "Група",
 "Name" => "Име",
 "PO Box" => "Поштан�ки број",
 "Extended" => "Прошири",
diff --git a/apps/contacts/l10n/sr@latin.php b/apps/contacts/l10n/sr@latin.php
index a4e70daf99c..1ae38e32922 100644
--- a/apps/contacts/l10n/sr@latin.php
+++ b/apps/contacts/l10n/sr@latin.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Ovo nije vaš adresar.",
 "Contact could not be found." => "Kontakt se ne može naći.",
-"vCard could not be read." => "vKarta se ne može �itati.",
 "Information about vCard is incorrect. Please reload the page." => "Podaci o vKarti su neispravni. Ponovo u�itajte stranicu.",
 "Address" => "Adresa",
 "Telephone" => "Telefon",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "Ova karta nije saglasna sa RFC-om.",
 "This card does not contain a photo." => "Ova karta ne sadrži fotografiju.",
 "Add Contact" => "Dodaj kontakt",
-"Group" => "Grupa",
 "Name" => "Ime",
 "PO Box" => "Poštanski broj",
 "Extended" => "Proširi",
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index d90f0693b3b..f62ca30b5f2 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Det här är inte din adressbok.",
 "Contact could not be found." => "Kontakt kunde inte hittas.",
-"vCard could not be read." => "vCard kunde inte läsas in.",
 "Information about vCard is incorrect. Please reload the page." => "Information om vCard är felaktigt. Vänligen ladda om sidan.",
 "Address" => "Adress",
 "Telephone" => "Telefon",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "Detta kort är inte RFC-kompatibelt.",
 "This card does not contain a photo." => "Detta kort innehåller inte något foto.",
 "Add Contact" => "Lägg till kontakt",
-"Group" => "Grupp",
 "Name" => "Namn",
 "PO Box" => "Postbox",
 "Extended" => "Utökad",
diff --git a/apps/contacts/l10n/tr.php b/apps/contacts/l10n/tr.php
index 4ba41a3422c..285adac8d6a 100644
--- a/apps/contacts/l10n/tr.php
+++ b/apps/contacts/l10n/tr.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "Bu sizin adres defteriniz deÄŸil.",
 "Contact could not be found." => "Kişi bulunamadı.",
-"vCard could not be read." => "vCard okunamadı.",
 "Information about vCard is incorrect. Please reload the page." => "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin.",
 "Address" => "Adres",
 "Telephone" => "Telefon",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "Bu kart RFC uyumlu deÄŸil.",
 "This card does not contain a photo." => "Bu kart resim içermiyor.",
 "Add Contact" => "KiÅŸi Ekle",
-"Group" => "Grup",
 "Name" => "Ad",
 "PO Box" => "Posta Kutusu",
 "Extended" => "Uzatılmış",
diff --git a/apps/contacts/l10n/zh_CN.php b/apps/contacts/l10n/zh_CN.php
index 5ebf2d862fb..829f1b0e073 100644
--- a/apps/contacts/l10n/zh_CN.php
+++ b/apps/contacts/l10n/zh_CN.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This is not your addressbook." => "这�是您的地�簿。",
 "Contact could not be found." => "无法找到�系人。",
-"vCard could not be read." => "vCard 无法读�。",
 "Information about vCard is incorrect. Please reload the page." => "vCard 的信��正确。请�新加载页�。",
 "Address" => "地�",
 "Telephone" => "电�",
@@ -19,7 +18,6 @@
 "This card is not RFC compatible." => "这张�片和RFC 标准�兼容。",
 "This card does not contain a photo." => "这张�片�包�照片。",
 "Add Contact" => "添加�系人",
-"Group" => "分组",
 "Name" => "�称",
 "PO Box" => "邮箱",
 "Extended" => "扩展",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 2f9017822eb..bb121cd4f77 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -1,18 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Restableix la contrasenya d'Owncloud",
+"Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {enllaç}",
 "You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
 "Requested" => "Sol·licitat",
-"Login failed!" => "No s'ha pogut entrar",
+"Login failed!" => "No s'ha pogut iniciar la sessió",
 "Username" => "Nom d'usuari",
 "Request reset" => "Sol·licita reinicialització",
 "Your password was reset" => "La vostra contrasenya s'ha reinicialitzat",
+"To login page" => "A la pàgina d'inici de sessió",
 "New password" => "Contrasenya nova",
-"Reset password" => "Reinicialitza contrasenya",
+"Reset password" => "Reinicialitza la contrasenya",
 "Personal" => "Personal",
 "Users" => "Usuaris",
 "Apps" => "Aplicacions",
 "Admin" => "Administrador",
 "Help" => "Ajuda",
-"Cloud not found" => "No s'ha trobat el núvol",
+"Cloud not found" => "No s'ha trobat al núvol",
 "Create an <strong>admin account</strong>" => "Crea un <strong>compte d'administrador</strong>",
 "Password" => "Contrasenya",
 "Advanced" => "Avançat",
@@ -24,10 +27,12 @@
 "Database name" => "Nom de la base de dades",
 "Database host" => "Ordinador central de la base de dades",
 "Finish setup" => "Acaba la configuració",
+"web services under your control" => "serveis web controlats per vós",
 "Log out" => "Sortir",
 "Settings" => "Arranjament",
 "Lost your password?" => "Heu perdut la contrasenya?",
 "remember" => "recorda'm",
+"Log in" => "Inici de sessió",
 "You are logged out." => "Heu tancat la sessió.",
 "prev" => "anterior",
 "next" => "següent"
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index ad2b34e7a70..b3e57981a6d 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Reset hesla Owncloud",
+"Use the following link to reset your password: {link}" => "Heslo vyresetujete použitím následujícího odkazu: {link}",
 "You will receive a link to reset your password via Email." => "Bude Vám zaslán odkaz pro obnovu hesla",
 "Requested" => "Požadováno",
 "Login failed!" => "Přihlášení selhalo",
 "Username" => "Uživatelské jméno",
 "Request reset" => "Vyžádat obnovu",
 "Your password was reset" => "Vaše heslo bylo obnoveno",
+"To login page" => "Na stránku přihlášení",
 "New password" => "Nové heslo",
 "Reset password" => "Obnovit heslo",
 "Personal" => "Osobní",
@@ -24,10 +27,12 @@
 "Database name" => "Název databáze",
 "Database host" => "Hostitel databáze",
 "Finish setup" => "Dokon�it instalaci",
+"web services under your control" => "webové služby pod Vaší kontrolou",
 "Log out" => "Odhlásit se",
 "Settings" => "Nastavení",
 "Lost your password?" => "Zapomenuté heslo?",
 "remember" => "zapamatovat si",
+"Log in" => "Login",
 "You are logged out." => "Jste odhlášeni.",
 "prev" => "zpět",
 "next" => "vpřed"
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 298ee69ec22..97ebb27baca 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Nulstil adgangskode til Owncloud",
+"Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
 "You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
 "Requested" => "Forespugt",
 "Login failed!" => "Login fejlede!",
 "Username" => "Brugernavn",
 "Request reset" => "Anmod om nulstilling",
 "Your password was reset" => "Dit kodeord blev nulstillet",
+"To login page" => "Til login-side",
 "New password" => "Nyt kodeord",
 "Reset password" => "Nulstil kodeord",
 "Personal" => "Personlig",
@@ -24,10 +27,12 @@
 "Database name" => "Navn på database",
 "Database host" => "Databasehost",
 "Finish setup" => "Afslut opsætning",
+"web services under your control" => "Webtjenester under din kontrol",
 "Log out" => "Log ud",
 "Settings" => "Indstillinger",
 "Lost your password?" => "Mistet dit kodeord?",
 "remember" => "husk",
+"Log in" => "Log ind",
 "You are logged out." => "Du er nu logget ud.",
 "prev" => "forrige",
 "next" => "næste"
diff --git a/core/l10n/el.php b/core/l10n/el.php
index c831f5a64e3..b1330684e5e 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Επανέκδοση κωδικο� για το Qwncloud",
+"Use the following link to reset your password: {link}" => "Χ�ησιμοποιήστε τον ακόλουθο σ�νδεσμο για να επανεκδόσετε τον κωδικό: {link}",
 "You will receive a link to reset your password via Email." => "Θα λάβετε ένα σ�νδεσμο για να επαναφέ�ετε τον κωδικό π�όσβασής σας μέσω ηλεκτ�ονικο� ταχυδ�ομείου.",
 "Requested" => "Ζητήθησαν",
 "Login failed!" => "Η σ�νδεση απέτυχε!",
 "Username" => "Όνομα Χ�ήστη",
 "Request reset" => "Επαναφο�ά αίτησης",
 "Your password was reset" => "Ο κωδικός π�όσβασής σας επαναφέ�θηκε",
+"To login page" => "Σελίδα εισόδου",
 "New password" => "�έος κωδικός",
 "Reset password" => "Επαναφο�ά κωδικο� π�όσβασης",
 "Personal" => "Π�οσωπικά",
@@ -24,10 +27,12 @@
 "Database name" => "Όνομα βάσης δεδομένων",
 "Database host" => "Διακομιστής βάσης δεδομένων",
 "Finish setup" => "Ολοκλή�ωση εγκατάστασης",
+"web services under your control" => "Υπη�εσίες web υπό τον έλεγχό σας",
 "Log out" => "Αποσ�νδεση",
 "Settings" => "Ρυθμίσεις",
 "Lost your password?" => "Ξεχάσατε τον κωδικό σας;",
 "remember" => "να με θυμάσαι",
+"Log in" => "Είσοδος",
 "You are logged out." => "Έχετε αποσυνδεθεί.",
 "prev" => "π�οηγο�μενο",
 "next" => "επόμενο"
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 20a92b51e8b..4ce42a645e2 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Restablecer contraseña de ownCloud",
+"Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}",
 "You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña",
 "Requested" => "Pedido",
 "Login failed!" => "¡Fallo al iniciar sesión!",
 "Username" => "Nombre de usuario",
 "Request reset" => "Solicitar restablecimiento",
 "Your password was reset" => "Tu contraseña se ha restablecido",
+"To login page" => "A la página de inicio de sesión",
 "New password" => "Nueva contraseña",
 "Reset password" => "Restablecer contraseña",
 "Personal" => "Personal",
@@ -24,10 +27,12 @@
 "Database name" => "Nombre de la base de datos",
 "Database host" => "Host de la base de datos",
 "Finish setup" => "Completar la instalación",
+"web services under your control" => "servicios web bajo tu control",
 "Log out" => "Salir",
 "Settings" => "Ajustes",
 "Lost your password?" => "¿Has perdido tu contraseña?",
 "remember" => "recuérdame",
+"Log in" => "Entrar",
 "You are logged out." => "Has cerrado sesión.",
 "prev" => "anterior",
 "next" => "siguiente"
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index a736cf89745..64215442d89 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
+"Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
 "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe",
 "Requested" => "Demande envoyée",
 "Login failed!" => "Nom d'utilisateur ou e-mail invalide",
 "Username" => "Nom d'utilisateur",
 "Request reset" => "Demander la réinitialisation",
 "Your password was reset" => "Votre mot de passe a été réinitialisé",
+"To login page" => "Retour à la page d'authentification",
 "New password" => "Nouveau mot de passe",
 "Reset password" => "Réinitialiser le mot de passe",
 "Personal" => "Personnels",
@@ -24,10 +27,12 @@
 "Database name" => "Nom de la base de données",
 "Database host" => "Serveur de la base de données",
 "Finish setup" => "Terminer l'installation",
+"web services under your control" => "services web sous votre contrôle",
 "Log out" => "Se déconnecter",
 "Settings" => "Paramètres",
 "Lost your password?" => "Mot de passe perdu ?",
 "remember" => "se souvenir de moi",
+"Log in" => "Connexion",
 "You are logged out." => "Vous êtes désormais déconnecté.",
 "prev" => "précédent",
 "next" => "suivant"
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 893e41e407e..1a63e7ea36e 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Azzera la password di Owncloud",
+"Use the following link to reset your password: {link}" => "Usa il link seguente per azzerare la password: {link}",
 "You will receive a link to reset your password via Email." => "Riceverai un link per resettare la tua password via Email",
 "Requested" => "Richiesto",
 "Login failed!" => "Login fallito!",
 "Username" => "Nome utente",
 "Request reset" => "Richiesta di ripristino",
 "Your password was reset" => "La password è stata reimpostata",
+"To login page" => "Alla pagina di ingresso",
 "New password" => "Nuova password",
 "Reset password" => "Reimposta password",
 "Personal" => "Personale",
@@ -24,10 +27,12 @@
 "Database name" => "Nome database",
 "Database host" => "Host del database",
 "Finish setup" => "Termina",
+"web services under your control" => "Servizi web nelle tue mani",
 "Log out" => "Log out",
 "Settings" => "Impostazioni",
 "Lost your password?" => "Password persa?",
 "remember" => "ricorda",
+"Log in" => "Entra",
 "You are logged out." => "Sei uscito.",
 "prev" => "precedente",
 "next" => "successivo"
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 22b751aaa15..3d444c92604 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "reset je Owncloud wachtwoord",
+"Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
 "You will receive a link to reset your password via Email." => "U ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail.",
 "Requested" => "Gevraagd",
 "Login failed!" => "Login mislukt!",
 "Username" => "Gebruikersnaam",
 "Request reset" => "Resetaanvraag",
 "Your password was reset" => "Je wachtwoord is geweizigd",
+"To login page" => "Naar de login-pagina",
 "New password" => "Nieuw wachtwoord",
 "Reset password" => "Reset wachtwoord",
 "Personal" => "Persoonlijk",
@@ -24,10 +27,12 @@
 "Database name" => "Naam databank",
 "Database host" => "Database server",
 "Finish setup" => "Installatie afronden",
+"web services under your control" => "webdiensten die je beheerst",
 "Log out" => "Afmelden",
 "Settings" => "Instellingen",
 "Lost your password?" => "Uw wachtwoord vergeten?",
 "remember" => "onthoud gegevens",
+"Log in" => "Meld je aan",
 "You are logged out." => "U bent afgemeld.",
 "prev" => "vorige",
 "next" => "volgende"
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index d972bed54e1..d06bbf22154 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Resetowani hasła",
+"Use the following link to reset your password: {link}" => "Użyj tego linku do zresetowania hasła: {link}",
 "You will receive a link to reset your password via Email." => "Otrzymasz link do resetowania hasła poprzez e-mail.",
 "Requested" => "Żądane",
 "Login failed!" => "Logowanie nie powiodło się!",
 "Username" => "Użytkownik",
 "Request reset" => "Żądanie resetowania",
 "Your password was reset" => "Twoje hasło zostało zresetowane",
+"To login page" => "Do strony logowania",
 "New password" => "Nowe hasło",
 "Reset password" => "Zresetuj hasło",
 "Personal" => "Ustawienia osobiste",
@@ -24,10 +27,12 @@
 "Database name" => "Nazwa bazy danych",
 "Database host" => "Host bazy danych",
 "Finish setup" => "Zakończ instalację",
+"web services under your control" => "usługi internetowe twoją pod kontrolą",
 "Log out" => "Wyloguj siÄ™",
 "Settings" => "Ustawienia",
 "Lost your password?" => "Nie pamiętasz hasła?",
 "remember" => "zapamiętaj",
+"Log in" => "Zaloguj siÄ™",
 "You are logged out." => "Zostałeś wylogowany.",
 "prev" => "wstecz",
 "next" => "dalej"
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 86c03478096..7a8b289de5a 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Resetare parolă Owncloud",
+"Use the following link to reset your password: {link}" => "Folosiți următorul link pentru a reseta parola: {link}",
 "You will receive a link to reset your password via Email." => "Veți primi la adresa de email un link prin care veți putea reseta parola",
 "Requested" => "Cerută",
 "Login failed!" => "Autentificare eșuată",
 "Username" => "Utilizator",
 "Request reset" => "Cerere trimisă",
 "Your password was reset" => "Parola a fost resetată",
+"To login page" => "Spre pagina de login",
 "New password" => "Noua parolă",
 "Reset password" => "Resetează parola",
 "Personal" => "Personal",
@@ -24,10 +27,12 @@
 "Database name" => "Numele bazei de date",
 "Database host" => "Baza de date",
 "Finish setup" => "Finalizează instalarea",
+"web services under your control" => "Servicii web sub controlul tău",
 "Log out" => "Ieșire",
 "Settings" => "Setări",
 "Lost your password?" => "Ai uitat parola?",
 "remember" => "ține minte",
+"Log in" => "Autentificare",
 "You are logged out." => "Ai ieșit",
 "prev" => "precedentul",
 "next" => "următorul"
diff --git a/files/l10n/ca.php b/files/l10n/ca.php
index cb685e543fd..b85b36f5c02 100644
--- a/files/l10n/ca.php
+++ b/files/l10n/ca.php
@@ -7,13 +7,17 @@
 "Missing a temporary folder" => "S'ha perdut un fitxer temporal",
 "Files" => "Fitxers",
 "Maximum upload size" => "Mida màxima de pujada",
+"New" => "Nou",
+"Text file" => "Fitxer de text",
+"Folder" => "Carpeta",
+"From the web" => "Des de la web",
 "Upload" => "Puja",
 "Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!",
 "Name" => "Nom",
-"Download" => "Descarrega",
+"Download" => "Baixa",
 "Size" => "Mida",
 "Modified" => "Modificat",
 "Delete" => "Esborra",
 "Upload too large" => "La pujada és massa gran",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada d'aquest servidor"
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor"
 );
diff --git a/files/l10n/cs_CZ.php b/files/l10n/cs_CZ.php
index d0ebace2d89..5d26b26604a 100644
--- a/files/l10n/cs_CZ.php
+++ b/files/l10n/cs_CZ.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "Chybí adresář pro so�asné soubory",
 "Files" => "Soubory",
 "Maximum upload size" => "Maximální velikost ukládaných souborů",
+"New" => "Nový",
+"Text file" => "Textový soubor",
+"Folder" => "Adresář",
+"From the web" => "Z webu",
 "Upload" => "Uložit",
 "Nothing in here. Upload something!" => "Žádný obsah. Uložte si něco!",
 "Name" => "Název",
diff --git a/files/l10n/da.php b/files/l10n/da.php
index 0bffc6a63e1..f86a98d44c1 100644
--- a/files/l10n/da.php
+++ b/files/l10n/da.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "Mangler en midlertidig mappe",
 "Files" => "Filer",
 "Maximum upload size" => "Maksimal upload-størrelse",
+"New" => "Ny",
+"Text file" => "Tekstfil",
+"Folder" => "Mappe",
+"From the web" => "Fra nettet",
 "Upload" => "Upload",
 "Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
 "Name" => "Navn",
diff --git a/files/l10n/de.php b/files/l10n/de.php
index ea229b5dd73..ed76de649ab 100644
--- a/files/l10n/de.php
+++ b/files/l10n/de.php
@@ -7,6 +7,8 @@
 "Missing a temporary folder" => "Temporärer Ordner fehlt.",
 "Files" => "Dateien",
 "Maximum upload size" => "Maximale Größe",
+"Text file" => "Text Datei",
+"Folder" => "Ordner",
 "Upload" => "Hochladen",
 "Nothing in here. Upload something!" => "Alles leer. Lad’ was hoch!",
 "Name" => "Name",
diff --git a/files/l10n/el.php b/files/l10n/el.php
index 151527c7890..27a80fcc98c 100644
--- a/files/l10n/el.php
+++ b/files/l10n/el.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "Λείπει ένας π�οσω�ινός φάκελος",
 "Files" => "Α�χεία",
 "Maximum upload size" => "Μέγιστο μέγεθος μεταφό�τωσης",
+"New" => "�έο",
+"Text file" => "Α�χείο κειμένου",
+"Folder" => "Φάκελος",
+"From the web" => "Από τον ιστό",
 "Upload" => "Μεταφό�τωση",
 "Nothing in here. Upload something!" => "Δεν υπά�χει τίποτα εδώ. Ανέβασε κάτι!",
 "Name" => "Όνομα",
diff --git a/files/l10n/es.php b/files/l10n/es.php
index 14086d3f6ce..11665ac3c32 100644
--- a/files/l10n/es.php
+++ b/files/l10n/es.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "Falta un directorio temporal",
 "Files" => "Archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
+"New" => "Nuevo",
+"Text file" => "Archivo de texto",
+"Folder" => "Carpeta",
+"From the web" => "Desde la web",
 "Upload" => "Subir",
 "Nothing in here. Upload something!" => "Aquí no hay nada. ¡Sube algo!",
 "Name" => "Nombre",
diff --git a/files/l10n/fr.php b/files/l10n/fr.php
index 6cc15896e21..cf90223a06a 100644
--- a/files/l10n/fr.php
+++ b/files/l10n/fr.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "Il manque un répertoire temporaire",
 "Files" => "Fichiers",
 "Maximum upload size" => "Taille max. d'envoi",
+"New" => "Nouveau",
+"Text file" => "Fichier texte",
+"Folder" => "Dossier",
+"From the web" => "Depuis le web",
 "Upload" => "Envoyer",
 "Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
 "Name" => "Nom",
diff --git a/files/l10n/it.php b/files/l10n/it.php
index 15ade733b97..919ff0b5aae 100644
--- a/files/l10n/it.php
+++ b/files/l10n/it.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "Cartella temporanea mancante",
 "Files" => "File",
 "Maximum upload size" => "Dimensione massima upload",
+"New" => "Nuovo",
+"Text file" => "File di testo",
+"Folder" => "Cartella",
+"From the web" => "Dal web",
 "Upload" => "Carica",
 "Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
 "Name" => "Nome",
diff --git a/files/l10n/nl.php b/files/l10n/nl.php
index 9d470bdf2ff..36b4695a476 100644
--- a/files/l10n/nl.php
+++ b/files/l10n/nl.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "Een tijdelijke map mist",
 "Files" => "Bestanden",
 "Maximum upload size" => "Maximale bestandsgrootte voor uploads",
+"New" => "Nieuw",
+"Text file" => "Tekstbestand",
+"Folder" => "Map",
+"From the web" => "Van het internet",
 "Upload" => "Upload",
 "Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!",
 "Name" => "Naam",
diff --git a/files/l10n/pl.php b/files/l10n/pl.php
index 075a3da07fe..d110f52ab1d 100644
--- a/files/l10n/pl.php
+++ b/files/l10n/pl.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "Brakuje folderu tymczasowego",
 "Files" => "Pliki",
 "Maximum upload size" => "Maksymalna wielkość przesyłanego pliku",
+"New" => "Nowy",
+"Text file" => "Plik tekstowy",
+"Folder" => "Katalog",
+"From the web" => "Z Internetu",
 "Upload" => "Prześlij",
 "Nothing in here. Upload something!" => "Nic tu nie ma. Prześlij jakieś pliki!",
 "Name" => "Nazwa",
diff --git a/files/l10n/ro.php b/files/l10n/ro.php
index 65ce6953ad0..9d8d6e2d5df 100644
--- a/files/l10n/ro.php
+++ b/files/l10n/ro.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "Lipsă folder temporar",
 "Files" => "Fișiere",
 "Maximum upload size" => "Dimensiunea maximă",
+"New" => "Nou",
+"Text file" => "Fișier text",
+"Folder" => "Dosar",
+"From the web" => "De pe internet",
 "Upload" => "Încarcă",
 "Nothing in here. Upload something!" => "Nici un fișier, încarcă ceva!",
 "Name" => "Nume",
diff --git a/l10n/.tx/config b/l10n/.tx/config
index b75b28bf1cd..3a0c6c28dc6 100644
--- a/l10n/.tx/config
+++ b/l10n/.tx/config
@@ -31,3 +31,8 @@ file_filter = <lang>/settings.po
 source_file = templates/settings.pot
 source_lang = en
 
+[owncloud.gallery]
+file_filter = <lang>/gallery.po
+source_file = templates/gallery.pot
+source_lang = en
+
diff --git a/l10n/ar/calendar.po b/l10n/ar/calendar.po
index c24233afb29..ae7fed1101f 100644
--- a/l10n/ar/calendar.po
+++ b/l10n/ar/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-07 18:29+0100\n"
-"PO-Revision-Date: 2012-01-08 08:41+0000\n"
-"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -315,27 +315,27 @@ msgstr "هذا الحدث ينتهي قبل أن يبدأ"
 msgid "There was a database fail"
 msgstr "خطأ �ي قاعدة البيانات"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:52
 msgid "Week"
 msgstr "إسبوع"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "شهر"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:54
 msgid "List"
 msgstr "قائمة"
 
-#: templates/calendar.php:45
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "اليوم"
 
-#: templates/calendar.php:46
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "الجداول الزمنية"
 
-#: templates/calendar.php:64
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "لم يتم قراءة المل� بنجاح."
 
@@ -449,7 +449,7 @@ msgstr "جدول زمني جديد"
 msgid "Edit calendar"
 msgstr "عادل الجدول الزمني"
 
-#: templates/part.editcalendar.php:12 templates/part.import.php:29
+#: templates/part.editcalendar.php:12
 msgid "Displayname"
 msgstr "الاسم المرئي"
 
@@ -575,36 +575,36 @@ msgid "Description of the Event"
 msgstr "وص� الحدث"
 
 #: templates/part.import.php:1
-msgid "Import Ical File"
-msgstr "إدخال مل� Ical"
-
-#: templates/part.import.php:4
-msgid "How to import the new calendar?"
-msgstr "كي�ية إدخال مل� جدول زمني ؟"
+msgid "Import a calendar file"
+msgstr ""
 
 #: templates/part.import.php:6
-msgid "Import into an existing calendar"
-msgstr "إدخال معلومات إلى جدول زمني حالي"
-
-#: templates/part.import.php:7
-msgid "Import into a new calendar"
-msgstr "إدخال معلومات إلى جدول زمني جديد"
-
-#: templates/part.import.php:10
 msgid "Please choose the calendar"
 msgstr "الرجاء إختر الجدول الزمني"
 
-#: templates/part.import.php:20 templates/part.import.php:37
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
 msgid "Import"
 msgstr "إدخال"
 
-#: templates/part.import.php:22 templates/part.import.php:39
-msgid "Back"
-msgstr "الرجوع"
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
 
-#: templates/part.import.php:25
-msgid "Please fill out the form"
-msgstr "الرجاء إملء الخانات"
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 5f67130cd91..1a01a858a48 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "هذا ليس د�تر عناوينك."
@@ -26,29 +70,25 @@ msgstr "هذا ليس د�تر عناوينك."
 msgid "Contact could not be found."
 msgstr "لم يتم العثور على الشخص."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "لم يتم قراءة ال vCard بنجاح."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "المعلومات الموجودة �ي ال vCard غير صحيحة. الرجاء إعادة تحديث الص�حة."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "عنوان"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "الهات�"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "البريد الالكتروني"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "المؤسسة"
@@ -85,6 +125,10 @@ msgstr "ال�يديو"
 msgid "Pager"
 msgstr "الرنان"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr ".هذا ليس من معار�ي"
@@ -97,68 +141,64 @@ msgstr "هذا الكرت ليس متلائم مع نظام ال RFC."
 msgid "This card does not contain a photo."
 msgstr "لا يحتوي هذا الكرت على صورة."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "أض� شخص "
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "مجموعة"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "الاسم"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "العنوان البريدي"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "إضا�ة"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "شارع"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "المدينة"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "المنطقة"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "رقم المنطقة"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "البلد"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "أض� شخص "
 
@@ -167,7 +207,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -189,15 +228,23 @@ msgid "Delete"
 msgstr "حذ�"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -236,4 +283,8 @@ msgstr "الهات�"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/ar/gallery.po b/l10n/ar/gallery.po
new file mode 100644
index 00000000000..71c534aaeb8
--- /dev/null
+++ b/l10n/ar/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/bg_BG/calendar.po b/l10n/bg_BG/calendar.po
index 7369aa68358..9da48896a4c 100644
--- a/l10n/bg_BG/calendar.po
+++ b/l10n/bg_BG/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,321 +18,403 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Проблем � идентификаци�та"
-
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Ча�овата зона е �менена"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "�евалидна за�вка"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Календар"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr ""
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
 msgstr ""
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
 msgstr ""
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
 msgstr ""
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
 msgstr ""
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
 msgstr ""
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
 msgstr ""
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
 msgstr ""
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
 msgstr ""
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
 msgstr ""
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
 msgstr ""
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
 msgstr ""
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
 msgstr ""
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
 msgstr ""
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
 msgstr ""
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
 msgstr ""
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "�е �е повтар�"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Дневно"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "Седмично"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "В�еки делничен ден"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "Дву�едмично"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "Ме�ечно"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "Годишно"
 
-#: lib/object.php:337
-msgid "Not an array"
+#: lib/object.php:366
+msgid "never"
 msgstr ""
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "В�ички дни"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "�едел�"
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr "Понеделник"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr "Вторник"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr "Ср�да"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr "Четвъртък"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr "Петък"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr "Събота"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "�ед."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Пон."
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Ð’Ñ‚Ñ€."
+#: lib/object.php:397
+msgid "first"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Ср�."
+#: lib/object.php:398
+msgid "second"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Чет."
+#: lib/object.php:399
+msgid "third"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Пет."
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Съб."
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr "Януари"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr "Февруари"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr "Март"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr "�прил"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr "Май"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr "Юни"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr "Юли"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr "�вгу�т"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr "Септември"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr "Октомври"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr "�оември"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr "Декември"
-
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr "Ян."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr "Фв."
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr "Март"
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr "�пр."
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "May."
+#: lib/object.php:444
+msgid "by day and month"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jun."
-msgstr "Юни"
+#: lib/object.php:467
+msgid "Not an array"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jul."
-msgstr "Юли"
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Aug."
-msgstr "�вг."
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Sep."
-msgstr "Сеп."
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "В�ички дни"
 
-#: templates/calendar.php:35
-msgid "Oct."
-msgstr "Окт."
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Nov."
-msgstr "�ое."
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Заглавие"
 
-#: templates/calendar.php:35
-msgid "Dec."
-msgstr "Дек."
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr ""
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Седмица"
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr ""
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Седмици"
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr ""
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
+#: templates/calendar.php:17
+msgid "To Time"
 msgstr ""
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
 msgstr ""
 
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Ден"
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr ""
 
 #: templates/calendar.php:52
+msgid "Week"
+msgstr "Седмица"
+
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Ме�ец"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:54
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:58
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Дне�"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Календари"
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Ча�"
-
-#: templates/calendar.php:169
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Възникна проблем � разли�тването на файла."
 
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Изберете активен календар"
@@ -351,12 +433,11 @@ msgid "Download"
 msgstr "Изтегл�не"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Пром�на"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
 msgstr ""
 
@@ -376,90 +457,181 @@ msgstr "Екранно име"
 msgid "Active"
 msgstr "�ктивен"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Опи�ание"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Цв�т на календара"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
 msgstr ""
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Продължи"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
 msgstr ""
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Пром�на на �ъбитие"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Заглавие"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "�аименование"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Локаци�"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Локаци�"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Категори�"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
 msgstr ""
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Целодневно �ъбитие"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "От"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "До"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Повтори"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "При�ъ�тващи"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Локаци�"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Локаци�"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Опи�ание"
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Опи�ание"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Затвори"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "�ово �ъбитие"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Ча�ова зона"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index ebddb139140..35a16c1e213 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr ""
@@ -25,29 +69,25 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr ""
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr ""
@@ -84,6 +124,10 @@ msgstr ""
 msgid "Pager"
 msgstr ""
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr ""
@@ -96,68 +140,64 @@ msgstr ""
 msgid "This card does not contain a photo."
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
+msgid "Addressbook"
 msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr ""
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr ""
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr ""
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr ""
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr ""
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr ""
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr ""
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr ""
 
@@ -166,7 +206,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -188,15 +227,23 @@ msgid "Delete"
 msgstr ""
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -235,4 +282,8 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/bg_BG/gallery.po b/l10n/bg_BG/gallery.po
new file mode 100644
index 00000000000..e52c69a7719
--- /dev/null
+++ b/l10n/bg_BG/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/ca/calendar.po b/l10n/ca/calendar.po
index f535d8d1170..a91a65cac49 100644
--- a/l10n/ca/calendar.po
+++ b/l10n/ca/calendar.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <rcalvoi@yahoo.com>, 2011.
+#   <rcalvoi@yahoo.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,351 +18,432 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Error d'autenticació"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr "Nova zona horària:"
 
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
-msgstr ""
-
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "La zona horària ha canviat"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "Sol.licitud no vàlida"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Calendari"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Calendari erroni"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
-msgstr ""
+msgstr "Aniversari"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
-msgstr ""
+msgstr "Feina"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
-msgstr ""
+msgstr "Trucada"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
-msgstr ""
+msgstr "Clients"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
-msgstr ""
+msgstr "Remitent"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
-msgstr ""
+msgstr "Vacances"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
-msgstr ""
+msgstr "Idees"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
-msgstr ""
+msgstr "Viatge"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
-msgstr ""
+msgstr "Sant"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
-msgstr ""
+msgstr "Reunió"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
-msgstr ""
+msgstr "Altres"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
-msgstr ""
+msgstr "Personal"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
-msgstr ""
+msgstr "Projectes"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
-msgstr ""
+msgstr "Preguntes"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
-msgstr ""
+msgstr "Feina"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "No es repeteix"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Diari"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "Mensual"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "Cada setmana"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "Bisetmanalment"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "Mensualment"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "Cada any"
 
-#: lib/object.php:337
-msgid "Not an array"
-msgstr ""
+#: lib/object.php:366
+msgid "never"
+msgstr "mai"
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Tot el dia"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr "per aparicions"
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Diumenge"
+#: lib/object.php:368
+msgid "by date"
+msgstr "per data"
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr "per dia del mes"
 
-#: templates/calendar.php:32
+#: lib/object.php:376
+msgid "by weekday"
+msgstr "per dia de la setmana"
+
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
 msgstr "Dilluns"
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
 msgstr "Dijous"
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
 msgstr "Divendres"
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "dg."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr "Diumenge"
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "dl."
+#: lib/object.php:396
+msgid "events week of month"
+msgstr "esdeveniments la setmana del mes"
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "dm."
+#: lib/object.php:397
+msgid "first"
+msgstr "primer"
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "dc."
+#: lib/object.php:398
+msgid "second"
+msgstr "segon"
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "dj."
+#: lib/object.php:399
+msgid "third"
+msgstr "tercer"
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "dv."
+#: lib/object.php:400
+msgid "fourth"
+msgstr "quart"
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "ds."
+#: lib/object.php:401
+msgid "fifth"
+msgstr "cinquè"
+
+#: lib/object.php:402
+msgid "last"
+msgstr "últim"
 
-#: templates/calendar.php:34
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
 msgstr "Gener"
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
 msgstr "Febrer"
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
 msgstr "Març"
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
 msgstr "Abril"
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
 msgstr "Maig"
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
 msgstr "Juny"
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
 msgstr "Juliol"
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
 msgstr "Agost"
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
 msgstr "Setembre"
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
 msgstr "Octubre"
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
 msgstr "Novembre"
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
 msgstr "Desembre"
 
-#: templates/calendar.php:35
+#: lib/object.php:441
+msgid "by events date"
+msgstr "per data d'esdeveniments"
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr "per ahir(s)"
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr "per número(s) de la setmana"
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr "per dia del mes"
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "No és una sèrie"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr "Data"
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr "Cal."
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Tot el dia"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Els camps que falten"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Títol"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Des de la data"
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Des de l'hora"
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Fins a la data"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Fins a l'hora"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "L'esdeveniment acaba abans que comenci"
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Hi ha un error de base de dades"
+
+#: templates/calendar.php:52
+msgid "Week"
+msgstr "Setmana"
+
+#: templates/calendar.php:53
+msgid "Month"
+msgstr "Mes"
+
+#: templates/calendar.php:54
+msgid "List"
+msgstr "Llista"
+
+#: templates/calendar.php:59
+msgid "Today"
+msgstr "Avui"
+
+#: templates/calendar.php:60
+msgid "Calendars"
+msgstr "Calendaris"
+
+#: templates/calendar.php:78
+msgid "There was a fail, while parsing the file."
+msgstr "S'ha produït un error en analitzar el fitxer."
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr "dg."
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr "dl."
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr "dt."
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr "dc."
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr "dj."
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr "dv."
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr "ds."
+
+#: templates/lAfix.php:28
 msgid "Jan."
 msgstr "gen."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:29
 msgid "Feb."
 msgstr "febr."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:30
 msgid "Mar."
 msgstr "març"
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:31
 msgid "Apr."
 msgstr "abr."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:32
 msgid "May."
-msgstr ""
+msgstr "maig"
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:33
 msgid "Jun."
 msgstr "juny"
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:34
 msgid "Jul."
 msgstr "jul."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:35
 msgid "Aug."
 msgstr "ag."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:36
 msgid "Sep."
 msgstr "set."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:37
 msgid "Oct."
 msgstr "oct."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:38
 msgid "Nov."
 msgstr "nov."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:39
 msgid "Dec."
 msgstr "des."
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Setmana"
-
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Setmanes"
-
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr ""
-
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr ""
-
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Dia"
-
-#: templates/calendar.php:52
-msgid "Month"
-msgstr "Mes"
-
-#: templates/calendar.php:53
-msgid "List"
-msgstr ""
-
-#: templates/calendar.php:58
-msgid "Today"
-msgstr "Avui"
-
-#: templates/calendar.php:59
-msgid "Calendars"
-msgstr "Calendaris"
-
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Hora"
-
-#: templates/calendar.php:169
-msgid "There was a fail, while parsing the file."
-msgstr "S'ha produït un error en analitzar el fitxer."
-
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Seleccioneu calendaris actius"
 
 #: templates/part.choosecalendar.php:15
 msgid "New Calendar"
-msgstr ""
+msgstr "Calendari nou"
 
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr ""
+msgstr "Enllaç CalDav"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
 msgstr "Baixa"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Edita"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Esborra"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "Calendari nou"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
@@ -376,90 +457,181 @@ msgstr "Mostra el nom"
 msgid "Active"
 msgstr "Actiu"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Descripció"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Color del calendari"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Desa"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
-msgstr "Tramet"
+msgstr "Envia"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel·la"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Edició d'un esdeveniment"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Títol"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Exporta"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "Títol de l'esdeveniment"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Ubicació"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Ubicació de l'esdeveniment"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Categoria"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
-msgstr ""
+msgstr "Seleccioneu categoria"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Esdeveniment de tot el dia"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "Des de"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "Fins a"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Opcions avançades"
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
-msgstr "Repeteix"
+msgstr "Repetició"
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr "Avançat"
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr "Dies de la setmana seleccionats"
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr "Seleccionar dies"
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr "i dies d'esdeveniment de l'any."
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr "i dies d'esdeveniment del mes."
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr "Seleccionar mesos"
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr "Seleccionar setmanes"
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr "i setmanes d'esdeveniment de l'any."
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr "Interval"
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr "Final"
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr "aparicions"
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Ubicació"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Ubicació de l'esdeveniment"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Assistents"
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Descripció"
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Descripció de l'esdeveniment"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Tanca"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "Escolliu el calendari"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "Importa"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Crea un nou esdeveniment"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Zona horària"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr "Comprova sempre en els canvis de zona horària"
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Format de temps"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Adreça de sincronització del calendari CalDAV:"
+
 
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index f463226b436..28a7aa018f8 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <rcalvoi@yahoo.com>, 2011.
+#   <rcalvoi@yahoo.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Aquesta no és la vostra llibreta d'adreces"
@@ -26,29 +70,25 @@ msgstr "Aquesta no és la vostra llibreta d'adreces"
 msgid "Contact could not be found."
 msgstr "No s'ha trobat el contacte."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "No s'ha pogut llegir la vCard"
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "La informació de la vCard és incorrecta. Carregueu la pàgina de nou."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adreça"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telèfon"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organització"
@@ -85,6 +125,10 @@ msgstr "Vídeo"
 msgid "Pager"
 msgstr "Paginador"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Aquest contacte no és vostre."
@@ -97,88 +141,83 @@ msgstr "Aquesta targeta no és compatible amb RFC."
 msgid "This card does not contain a photo."
 msgstr "Aquesta targeta no conté foto."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
-msgstr "Afegeix un contacte"
+msgstr "Afegiu un contacte"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Grup"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Nom"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Tipus"
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Adreça Postal"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Addicional"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Carrer"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Ciutat"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Comarca"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Codi postal"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "País"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Crea un contacte"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Escolliu una llibreda d'adreces activa"
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
-msgstr ""
+msgstr "Nova llibreta d'adreces"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "Enllaç CardDav"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "Baixa"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -189,36 +228,44 @@ msgid "Delete"
 msgstr "Elimina"
 
 #: templates/part.details.php:3
-msgid "Delete contact"
+msgid "Download contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:4
+msgid "Delete contact"
+msgstr "Elimina el contacte"
+
+#: templates/part.details.php:34
 msgid "Add"
+msgstr "Afegeix"
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Nom a mostrar"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Actiu"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Desa"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Envia"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel·la"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -226,7 +273,7 @@ msgstr "Aniversari"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Preferit"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -234,6 +281,10 @@ msgstr "Telèfon"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
+msgstr "Actualitza"
+
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
 msgstr ""
 
 
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index cf30bb6af45..adce94682bf 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <rcalvoi@yahoo.com>, 2011.
+#   <rcalvoi@yahoo.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 08:41+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Restableix la contrasenya d'Owncloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Useu l'enllaç següent per restablir la contrasenya: {enllaç}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -36,7 +36,7 @@ msgstr "Sol·licitat"
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Login failed!"
-msgstr "No s'ha pogut entrar"
+msgstr "No s'ha pogut iniciar la sessió"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
 #: templates/login.php:8
@@ -53,7 +53,7 @@ msgstr "La vostra contrasenya s'ha reinicialitzat"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "A la pàgina d'inici de sessió"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -61,7 +61,7 @@ msgstr "Contrasenya nova"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr "Reinicialitza contrasenya"
+msgstr "Reinicialitza la contrasenya"
 
 #: strings.php:5
 msgid "Personal"
@@ -85,7 +85,7 @@ msgstr "Ajuda"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "No s'ha trobat el núvol"
+msgstr "No s'ha trobat al núvol"
 
 #: templates/installation.php:20
 msgid "Create an <strong>admin account</strong>"
@@ -134,7 +134,7 @@ msgstr "Acaba la configuració"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "serveis web controlats per vós"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -154,7 +154,7 @@ msgstr "recorda'm"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Inici de sessió"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 8427ff069a7..5fe59dd672a 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <rcalvoi@yahoo.com>, 2011.
+#   <rcalvoi@yahoo.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 08:48+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,19 +58,19 @@ msgstr "Mida màxima de pujada"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Nou"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "Fitxer de text"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Carpeta"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "Des de la web"
 
 #: templates/index.php:22
 msgid "Upload"
@@ -86,7 +86,7 @@ msgstr "Nom"
 
 #: templates/index.php:45
 msgid "Download"
-msgstr "Descarrega"
+msgstr "Baixa"
 
 #: templates/index.php:49
 msgid "Size"
@@ -110,6 +110,6 @@ msgid ""
 "on this server."
 msgstr ""
 "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada "
-"d'aquest servidor"
+"del servidor"
 
 
diff --git a/l10n/ca/gallery.po b/l10n/ca/gallery.po
new file mode 100644
index 00000000000..b2c6ad5819a
--- /dev/null
+++ b/l10n/ca/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 16747902ae7..9467158bd2f 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <rcalvoi@yahoo.com>, 2011.
+#   <rcalvoi@yahoo.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 09:47+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "el correu electrònic ha canviat"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -36,7 +36,7 @@ msgstr "S'ha canviat l'idioma"
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Nivell de registres"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -52,7 +52,7 @@ msgstr "- amb llicència"
 
 #: templates/apps.php:23
 msgid "by"
-msgstr "per"
+msgstr "de"
 
 #: templates/help.php:8
 msgid "Ask a question"
@@ -60,7 +60,7 @@ msgstr "Feu una pregunta"
 
 #: templates/help.php:20
 msgid "Problems connecting to help database."
-msgstr "Problemes per connectar-se a la base de dades d'ajuda."
+msgstr "Problemes per connectar amb la base de dades d'ajuda."
 
 #: templates/help.php:21
 msgid "Go there manually."
@@ -88,7 +88,7 @@ msgstr "No s'ha pogut canviar la contrasenya"
 
 #: templates/personal.php:15
 msgid "Current password"
-msgstr "contrasenya actual"
+msgstr "Contrasenya actual"
 
 #: templates/personal.php:16
 msgid "New password"
@@ -100,19 +100,19 @@ msgstr "mostra"
 
 #: templates/personal.php:18
 msgid "Change password"
-msgstr "canvia la contrasenya"
+msgstr "Canvia la contrasenya"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "Correu electrònic"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Correu electrònic"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Ompliu el correu electrònic per activar la recuperació de contrasenya"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -120,7 +120,7 @@ msgstr "Idioma"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Ajudeu-nos amb la traducció"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -145,7 +145,7 @@ msgstr "Crea"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Quota"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/cs_CZ/calendar.po b/l10n/cs_CZ/calendar.po
index 071b0bde711..fc658fb75fa 100644
--- a/l10n/cs_CZ/calendar.po
+++ b/l10n/cs_CZ/calendar.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jan Krejci <krejca85@gmail.com>, 2011, 2012.
+# Martin  <fireball@atlas.cz>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,448 +19,620 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr ""
-
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
-msgstr ""
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr "Nová �asová zóna:"
 
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
-msgstr ""
+msgstr "Časová zóna byla změněna"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
-msgstr ""
+msgstr "Chybný požadavek"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
-msgstr ""
+msgstr "Kalendář"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Nesprávný kalendář"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
-msgstr ""
+msgstr "Narozeniny"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
-msgstr ""
+msgstr "Pracovní"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
-msgstr ""
+msgstr "Volat"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
-msgstr ""
+msgstr "Klienti"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
-msgstr ""
+msgstr "Doru�ovatel"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
-msgstr ""
+msgstr "Prázdniny"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
-msgstr ""
+msgstr "Nápady"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
-msgstr ""
+msgstr "Cesta"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
-msgstr ""
+msgstr "Jubileum"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
-msgstr ""
+msgstr "Schůzka"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
-msgstr ""
+msgstr "Další"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
-msgstr ""
+msgstr "Osobní"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
-msgstr ""
+msgstr "Projekty"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
-msgstr ""
+msgstr "Dotazy"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
-msgstr ""
+msgstr "Práce"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
-msgstr ""
+msgstr "Neopakuje se"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
-msgstr ""
+msgstr "DennÄ›"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
-msgstr ""
+msgstr "Týdně"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
-msgstr ""
+msgstr "Každý všední den"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
-msgstr ""
+msgstr "Jednou za dva týdny"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
-msgstr ""
+msgstr "Měsí�ně"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
-msgstr ""
+msgstr "Ro�ně"
 
-#: lib/object.php:337
-msgid "Not an array"
-msgstr ""
+#: lib/object.php:366
+msgid "never"
+msgstr "nikdy"
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr ""
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr "podle výskytu"
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr ""
+#: lib/object.php:368
+msgid "by date"
+msgstr "podle data"
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr "podle dne v měsíci"
 
-#: templates/calendar.php:32
+#: lib/object.php:376
+msgid "by weekday"
+msgstr "podle dne v týdnu"
+
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr ""
+msgstr "Pondělí"
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr ""
+msgstr "Úterý"
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr ""
+msgstr "Středa"
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr ""
+msgstr "ÄŒtvrtek"
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr ""
+msgstr "Pátek"
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr ""
+msgstr "Sobota"
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr ""
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr "Neděle"
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr ""
+#: lib/object.php:396
+msgid "events week of month"
+msgstr "týdenní události v měsíci"
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr ""
+#: lib/object.php:397
+msgid "first"
+msgstr "první"
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr ""
+#: lib/object.php:398
+msgid "second"
+msgstr "druhý"
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr ""
+#: lib/object.php:399
+msgid "third"
+msgstr "třetí"
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr ""
+#: lib/object.php:400
+msgid "fourth"
+msgstr "�tvrtý"
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr ""
+#: lib/object.php:401
+msgid "fifth"
+msgstr "pátý"
+
+#: lib/object.php:402
+msgid "last"
+msgstr "poslední"
 
-#: templates/calendar.php:34
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr ""
+msgstr "Leden"
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr ""
+msgstr "Únor"
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr ""
+msgstr "Břeyen"
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr ""
+msgstr "Duben"
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr ""
+msgstr "Květen"
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr ""
+msgstr "ÄŒerven"
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr ""
+msgstr "ÄŒervenec"
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr ""
+msgstr "Srpen"
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr ""
+msgstr "Září"
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr ""
+msgstr "Říjen"
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr ""
+msgstr "Prosinec"
 
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr ""
+#: lib/object.php:441
+msgid "by events date"
+msgstr "podle data události"
 
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr ""
-
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr ""
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr "po dni (dnech)"
 
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr ""
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr "podle �ísel týdnů"
 
-#: templates/calendar.php:35
-msgid "May."
-msgstr ""
+#: lib/object.php:444
+msgid "by day and month"
+msgstr "podle dne a měsíce"
 
-#: templates/calendar.php:35
-msgid "Jun."
-msgstr ""
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Není zařazeno"
 
-#: templates/calendar.php:35
-msgid "Jul."
-msgstr ""
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr "Datum"
 
-#: templates/calendar.php:35
-msgid "Aug."
-msgstr ""
+#: lib/search.php:40
+msgid "Cal."
+msgstr "Kal."
 
-#: templates/calendar.php:35
-msgid "Sep."
-msgstr ""
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Celý den"
 
-#: templates/calendar.php:35
-msgid "Oct."
-msgstr ""
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Chybějící pole"
 
-#: templates/calendar.php:35
-msgid "Nov."
-msgstr ""
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Název"
 
-#: templates/calendar.php:35
-msgid "Dec."
-msgstr ""
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Od data"
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr ""
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Od"
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr ""
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Do data"
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr ""
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Do"
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr ""
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Akce kon�í před zahájením"
 
-#: templates/calendar.php:49
-msgid "Day"
-msgstr ""
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Chyba v databázi"
 
 #: templates/calendar.php:52
-msgid "Month"
-msgstr ""
+msgid "Week"
+msgstr "týden"
 
 #: templates/calendar.php:53
+msgid "Month"
+msgstr "měsíc"
+
+#: templates/calendar.php:54
 msgid "List"
-msgstr ""
+msgstr "Seznam"
 
-#: templates/calendar.php:58
+#: templates/calendar.php:59
 msgid "Today"
-msgstr ""
+msgstr "dnes"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:60
 msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr ""
+msgstr "Kalendáře"
 
-#: templates/calendar.php:169
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
-msgstr ""
+msgstr "Chyba při převodu souboru"
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr "Ne"
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr "Po"
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr "Út"
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr "St"
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr "ÄŒt"
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr "Pá"
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr "So"
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr "Led."
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr "Úno."
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr "Bře."
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr "Dub."
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr "KvÄ›."
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr "ÄŒer."
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr "ÄŒec."
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr "Srp."
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr "Zář."
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr "Říj."
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr "Lis."
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr "Pro."
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
-msgstr ""
+msgstr "Vybrat aktivní kalendář"
 
 #: templates/part.choosecalendar.php:15
 msgid "New Calendar"
-msgstr ""
+msgstr "Nový kalendář"
 
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr ""
+msgstr "Odkaz CalDav"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
-msgstr ""
+msgstr "Stáhnout"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
-msgstr ""
+msgstr "Editovat"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Odstranit"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "Nový kalendář"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
-msgstr ""
+msgstr "Editovat kalendář"
 
 #: templates/part.editcalendar.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Zobrazené jméno"
 
 #: templates/part.editcalendar.php:23
 msgid "Active"
-msgstr ""
-
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr ""
+msgstr "Aktivní"
 
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
-msgstr ""
+msgstr "Barva kalendáře"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Uložit"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Potvrdit"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Storno"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
-msgstr ""
+msgstr "Editovat událost"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr ""
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Export"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
-msgstr ""
-
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr ""
+msgstr "Název události"
 
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr ""
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
-msgstr ""
+msgstr "Kategorie"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
-msgstr ""
+msgstr "Vyberte kategorii"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
-msgstr ""
+msgstr "Celodenní událost"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
-msgstr ""
+msgstr "od"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
-msgstr ""
+msgstr "do"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Pokro�ilé volby"
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
+msgstr "Opakovat"
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr "Pokro�ilé"
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr "Vybrat dny v týdnu"
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr "Vybrat dny"
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr "a denní události v roce"
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr "a denní události v měsíci"
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr "Vybrat měsíce"
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr "Vybrat týdny"
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr "a týden s událostmi v roce"
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr "Interval"
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr "Konec"
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr "výskyty"
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Umístění"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Místo konání události"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Popis"
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr "Popis události"
+
+#: templates/part.import.php:1
+msgid "Import a calendar file"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "Zvolte prosím kalendář"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.eventform.php:89
-msgid "Description of the Event"
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "Import"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
 msgstr ""
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
+#: templates/part.import.php:24
+msgid "Close Dialog"
 msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
-msgstr ""
+msgstr "Vytvořit novou událost"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
-msgstr ""
+msgstr "Časové pásmo"
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr "Zkontrolujte vždy změny �asového pásma"
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Formát �asu"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Adresa pro synchronizaci kalendáře CalDAV:"
 
 
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 3bf09f0a1af..8470cde9daa 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Jan Krejci <krejca85@gmail.com>, 2011.
-# Martin  <fireball@atlas.cz>, 2011.
+# Martin  <fireball@atlas.cz>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,50 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Toto není Váš adresář."
@@ -27,29 +71,25 @@ msgstr "Toto není Váš adresář."
 msgid "Contact could not be found."
 msgstr "Kontakt nebyl nalezen."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "vCard nelze pře�íst."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizace"
@@ -86,6 +126,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Pager"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Toto není Váš kontakt."
@@ -98,88 +142,83 @@ msgstr "Tato karta není kompatibilní s RFC."
 msgid "This card does not contain a photo."
 msgstr "Tato karta neobsahuje foto"
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Přidat kontakt"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Skupina"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Jméno"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "PO box"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Rozšířené"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Ulice"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Město"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Kraj"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "PSČ"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "ZemÄ›"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Vytvořit kontakt"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Zvolte aktivní adresář"
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
-msgstr ""
+msgstr "Nový adresář"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "Odkaz CardDav"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "Stažení"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -190,36 +229,44 @@ msgid "Delete"
 msgstr "Odstranit"
 
 #: templates/part.details.php:3
-msgid "Delete contact"
+msgid "Download contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:4
+msgid "Delete contact"
+msgstr "Odstranit kontakt"
+
+#: templates/part.details.php:34
 msgid "Add"
+msgstr "Přidat"
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Zobrazené jméno"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Aktivní"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Uložit"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Potvrdit"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Storno"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -227,7 +274,7 @@ msgstr "Narozeniny"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Preferovaný"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -235,6 +282,10 @@ msgstr "Telefon"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
+msgstr "Aktualizovat"
+
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
 msgstr ""
 
 
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 1aa44c40cd7..d395875fb84 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Jan Krejci <krejca85@gmail.com>, 2011.
-# Martin  <fireball@atlas.cz>, 2011.
+# Martin  <fireball@atlas.cz>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 11:30+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,11 +21,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Reset hesla Owncloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Heslo vyresetujete použitím následujícího odkazu: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -54,7 +54,7 @@ msgstr "Vaše heslo bylo obnoveno"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Na stránku přihlášení"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -135,7 +135,7 @@ msgstr "Dokon�it instalaci"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "webové služby pod Vaší kontrolou"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -155,7 +155,7 @@ msgstr "zapamatovat si"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Login"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 883d1a427f9..6c775ed9703 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Martin  <fireball@atlas.cz>, 2011.
+# Martin  <fireball@atlas.cz>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 11:31+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,19 +57,19 @@ msgstr "Maximální velikost ukládaných souborů"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Nový"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "Textový soubor"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Adresář"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "Z webu"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/cs_CZ/gallery.po b/l10n/cs_CZ/gallery.po
new file mode 100644
index 00000000000..0f3acea06ec
--- /dev/null
+++ b/l10n/cs_CZ/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index dbcea3a216b..0787bfd9ebd 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Jan Krejci <krejca85@gmail.com>, 2011.
-# Martin  <fireball@atlas.cz>, 2011.
+# Martin  <fireball@atlas.cz>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 11:33+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "email změněn"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -37,7 +37,7 @@ msgstr "Jazyk byl změněn"
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Úroveň logu"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -105,15 +105,15 @@ msgstr "Změnit heslo"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Vaše email adresa"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Pro povolení změny hesla vyplňte email adresu"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -121,7 +121,7 @@ msgstr "Jazyk"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Pomoc s překladem"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -146,7 +146,7 @@ msgstr "Vytvořit"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Kvóta"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/da/calendar.po b/l10n/da/calendar.po
index f78c8d1a810..607272c5aea 100644
--- a/l10n/da/calendar.po
+++ b/l10n/da/calendar.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 #   <mikkelbjerglarsen@gmail.com>, 2011.
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,324 +20,406 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Godkendelsesfejl"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr "Ny tidszone:"
 
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
-msgstr "Forkert kalender"
-
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Tidszone ændret"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "Ugyldig forespørgsel"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Kalender"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Forkert kalender"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
 msgstr "Forretning"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
 msgstr "Ring"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
 msgstr "Kunder"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
-msgstr ""
+msgstr "Leverance"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
 msgstr "Helligdage"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
 msgstr "Ideér"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
 msgstr "Rejse"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
 msgstr "Jubilæum"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
 msgstr "Møde"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
 msgstr "Andet"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
 msgstr "Privat"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
 msgstr "Projekter"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
 msgstr "Spørgsmål"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
 msgstr "Arbejde"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "Gentages ikke"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Daglig"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "Ugentlig"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "Alle hverdage"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
-msgstr "Bi-Ugentligt"
+msgstr "Hver anden uge"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
-msgstr "MÃ¥nedlige"
+msgstr "MÃ¥nedlig"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "Ã…rlig"
 
-#: lib/object.php:337
-msgid "Not an array"
-msgstr ""
+#: lib/object.php:366
+msgid "never"
+msgstr "aldrig"
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Hele dagen"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr "efter forekomster"
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Søndag"
+#: lib/object.php:368
+msgid "by date"
+msgstr "efter dato"
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr "efter dag i måneden"
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr "efter ugedag"
 
-#: templates/calendar.php:32
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
 msgstr "Mandag"
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
 msgstr "Fredag"
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "Søn."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr "øndag"
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Man."
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Tir."
+#: lib/object.php:397
+msgid "first"
+msgstr "første"
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Ons."
+#: lib/object.php:398
+msgid "second"
+msgstr "anden"
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Tor."
+#: lib/object.php:399
+msgid "third"
+msgstr "tredje"
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Fre."
+#: lib/object.php:400
+msgid "fourth"
+msgstr "fjerde"
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Lør."
+#: lib/object.php:401
+msgid "fifth"
+msgstr "femte"
+
+#: lib/object.php:402
+msgid "last"
+msgstr "sidste"
 
-#: templates/calendar.php:34
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
 msgstr "Januar"
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
 msgstr "Februar"
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
 msgstr "Marts"
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
 msgstr "April"
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
 msgstr "Maj"
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
 msgstr "Juni"
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
 msgstr "Juli"
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
 msgstr "August"
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
 msgstr "September"
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
 msgstr "Oktober"
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
 msgstr "November"
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
 msgstr "December"
 
-#: templates/calendar.php:35
+#: lib/object.php:441
+msgid "by events date"
+msgstr "efter begivenheders dato"
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr "efter ugenummer/-numre"
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr "efter dag og måned"
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Ikke en array"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr "Dato"
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr "Kal."
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Hele dagen"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Manglende felter"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Titel"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Fra dato"
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Fra tidspunkt"
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Til dato"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Til tidspunkt"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Begivenheden slutter, inden den begynder"
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Der var en fejl i databasen"
+
+#: templates/calendar.php:52
+msgid "Week"
+msgstr "Uge"
+
+#: templates/calendar.php:53
+msgid "Month"
+msgstr "MÃ¥ned"
+
+#: templates/calendar.php:54
+msgid "List"
+msgstr "Liste"
+
+#: templates/calendar.php:59
+msgid "Today"
+msgstr "I dag"
+
+#: templates/calendar.php:60
+msgid "Calendars"
+msgstr "Kalendere"
+
+#: templates/calendar.php:78
+msgid "There was a fail, while parsing the file."
+msgstr "Der opstod en fejl under gennemlæsning af filen."
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr "Søn."
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr "Man."
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr "Tir."
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr "Ons."
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr "Tor."
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr "Fre."
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr "Lør."
+
+#: templates/lAfix.php:28
 msgid "Jan."
 msgstr "Jan."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:29
 msgid "Feb."
 msgstr "Feb."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:30
 msgid "Mar."
 msgstr "Mar."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:31
 msgid "Apr."
 msgstr "Apr."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:32
 msgid "May."
 msgstr "Maj."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:33
 msgid "Jun."
 msgstr "Jun."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:34
 msgid "Jul."
 msgstr "Jul."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:35
 msgid "Aug."
 msgstr "Aug."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:36
 msgid "Sep."
-msgstr "Sep."
+msgstr "Sept."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:37
 msgid "Oct."
-msgstr "Oct."
+msgstr "Okt."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:38
 msgid "Nov."
 msgstr "Nov."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:39
 msgid "Dec."
 msgstr "Dec."
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Uge"
-
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Uger"
-
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr "Mere før {startdate}"
-
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr "Mere efter {enddate}"
-
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Dag"
-
-#: templates/calendar.php:52
-msgid "Month"
-msgstr "MÃ¥ned"
-
-#: templates/calendar.php:53
-msgid "List"
-msgstr "Liste"
-
-#: templates/calendar.php:58
-msgid "Today"
-msgstr "I dag"
-
-#: templates/calendar.php:59
-msgid "Calendars"
-msgstr "Kalendere"
-
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Tid"
-
-#: templates/calendar.php:169
-msgid "There was a fail, while parsing the file."
-msgstr "Der opstod en fejl under gennemlæsning af filen."
-
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
-msgstr "Vælg aktiv kalendere"
+msgstr "Vælg aktive kalendere"
 
 #: templates/part.choosecalendar.php:15
 msgid "New Calendar"
@@ -345,21 +428,20 @@ msgstr "Ny Kalender"
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr "CalDav Link"
+msgstr "CalDav-link"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
 msgstr "Hent"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Rediger"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Slet"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -371,96 +453,187 @@ msgstr "Rediger kalender"
 
 #: templates/part.editcalendar.php:12
 msgid "Displayname"
-msgstr "Visningsnavn"
+msgstr "Vist navn"
 
 #: templates/part.editcalendar.php:23
 msgid "Active"
 msgstr "Aktiv"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
-msgstr "Kalender farve"
+msgstr "Kalenderfarve"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
 msgstr "Gem"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Send"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr "Annullér"
+msgstr "Annuller"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Redigér en begivenhed"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Titel"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Eksporter"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "Titel på begivenheden"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Sted"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Placering af begivenheden"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Kategori"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
 msgstr "Vælg kategori"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Heldagsarrangement"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "Fra"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "Til"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Avancerede indstillinger"
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Gentag"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Deltagere"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr "Avanceret"
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr "Vælg ugedage"
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr "Vælg dage"
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr "Vælg måneder"
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr "Vælg uger"
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr "Interval"
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr "Afslutning"
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr "forekomster"
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Sted"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Placering af begivenheden"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Beskrivelse"
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Beskrivelse af begivenheden"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Luk"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "Vælg venligst kalender"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "Importer"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Opret en ny begivenhed"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Tidszone"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr "Check altid efter ændringer i tidszone"
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Tidsformat"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24T"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12T"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Synkroniseringsadresse til CalDAV:"
+
 
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index 9d69617ac47..7a69003bd97 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 #   <mikkelbjerglarsen@gmail.com>, 2011.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011.
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,50 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Dette er ikke din adressebog."
@@ -28,29 +72,25 @@ msgstr "Dette er ikke din adressebog."
 msgid "Contact could not be found."
 msgstr "Kontaktperson kunne ikke findes."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "Kunne ikke læse vCard."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informationen om vCard er forkert. Genindlæs siden."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organisation"
@@ -87,6 +127,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Personsøger"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Dette er ikke din kontaktperson."
@@ -99,88 +143,83 @@ msgstr "Dette kort er ikke RFC-kompatibelt."
 msgid "This card does not contain a photo."
 msgstr "Dette kort indeholder ikke et foto."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Tilføj kontaktperson"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Gruppe"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Navn"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Postboks"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Udvidet"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Vej"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "By"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Region"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Postnummer"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Land"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Ny kontaktperson"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Vælg aktive adressebøger"
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
-msgstr ""
+msgstr "Ny adressebog"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "CardDav-link"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "Download"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -191,36 +230,44 @@ msgid "Delete"
 msgstr "Slet"
 
 #: templates/part.details.php:3
-msgid "Delete contact"
+msgid "Download contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:4
+msgid "Delete contact"
+msgstr "Slet kontaktperson"
+
+#: templates/part.details.php:34
 msgid "Add"
+msgstr "Tilføj"
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Vist navn"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Gem"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Gem"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Fortryd"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -228,7 +275,7 @@ msgstr "Fødselsdag"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Foretrukken"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -236,6 +283,10 @@ msgstr "Telefon"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
+msgstr "Opdater"
+
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
 msgstr ""
 
 
diff --git a/l10n/da/core.po b/l10n/da/core.po
index e2a57581e7f..f24a20c6b16 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 #   <mikkelbjerglarsen@gmail.com>, 2011.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011.
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-13 22:14+0000\n"
+"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,11 +22,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Nulstil adgangskode til Owncloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Anvend følgende link til at nulstille din adgangskode: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -55,7 +55,7 @@ msgstr "Dit kodeord blev nulstillet"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Til login-side"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -136,7 +136,7 @@ msgstr "Afslut opsætning"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "Webtjenester under din kontrol"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -156,7 +156,7 @@ msgstr "husk"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Log ind"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/da/files.po b/l10n/da/files.po
index af2561b7e24..c7fc915834a 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011.
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-13 22:05+0000\n"
+"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,19 +58,19 @@ msgstr "Maksimal upload-størrelse"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "Tekstfil"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Mappe"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "Fra nettet"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/da/gallery.po b/l10n/da/gallery.po
new file mode 100644
index 00000000000..f763cf822d6
--- /dev/null
+++ b/l10n/da/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index ee508eab264..0882ebc94e7 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 #   <mikkelbjerglarsen@gmail.com>, 2011.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011.
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-13 22:44+0000\n"
+"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "email ændret"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -38,7 +38,7 @@ msgstr "Sprog ændret"
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Log-niveau"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -106,15 +106,15 @@ msgstr "Skift kodeord"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Din emailadresse"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Indtast en emailadresse for at kunne få påmindelse om adgangskode"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -122,7 +122,7 @@ msgstr "Sprog"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Hjælp med oversættelsen"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -146,7 +146,7 @@ msgstr "Ny"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Kvote"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/de/calendar.po b/l10n/de/calendar.po
index a75ca864a1b..786f0329267 100644
--- a/l10n/de/calendar.po
+++ b/l10n/de/calendar.po
@@ -3,15 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <admin@s-goecker.de>, 2011.
+#   <georg.stefan.germany@googlemail.com>, 2011, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,321 +21,403 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Anmeldefehler"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr "Neue Zeitzone:"
 
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
-msgstr "Falscher Kalender"
-
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Zeitzone geändert"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "Anfragefehler"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Kalender"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Falscher Kalender"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
 msgstr "Anruf"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
 msgstr "Kunden"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
 msgstr "Lieferant"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
 msgstr "Urlaub"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
 msgstr "Ideen"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
 msgstr "Reise"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
 msgstr "Jubiläum"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
 msgstr "Treffen"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
 msgstr "Anderes"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
 msgstr "Persönlich"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
 msgstr "Projekte"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
 msgstr "Fragen"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
 msgstr "Arbeit"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "einmalig"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "täglich"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "wöchentlich"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "jeden Wochentag"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "jede zweite Woche"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "monatlich"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "jährlich"
 
-#: lib/object.php:337
-msgid "Not an array"
-msgstr "Kein Feld"
+#: lib/object.php:366
+msgid "never"
+msgstr "niemals"
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Ganztags"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr "nach Vorkommen"
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Sonntag"
+#: lib/object.php:368
+msgid "by date"
+msgstr "nach Datum"
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr "an einem Monatstag"
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr "an einem Wochentag"
 
-#: templates/calendar.php:32
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
 msgstr "Montag"
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
 msgstr "Freitag"
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
 msgstr "Samstag"
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "Son."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr "Sonntag"
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Mon."
+#: lib/object.php:396
+msgid "events week of month"
+msgstr "Woche des Monats vom Termin"
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Die."
+#: lib/object.php:397
+msgid "first"
+msgstr "erste"
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Mit."
+#: lib/object.php:398
+msgid "second"
+msgstr "zweite"
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Don."
+#: lib/object.php:399
+msgid "third"
+msgstr "dritte"
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Fre."
+#: lib/object.php:400
+msgid "fourth"
+msgstr "vierte"
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Sam."
+#: lib/object.php:401
+msgid "fifth"
+msgstr "fünfte"
+
+#: lib/object.php:402
+msgid "last"
+msgstr "letzte"
 
-#: templates/calendar.php:34
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
 msgstr "Januar"
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
 msgstr "Februar"
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
 msgstr "März"
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
 msgstr "April"
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
 msgstr "Mai"
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
 msgstr "Juni"
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
 msgstr "Juli"
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
 msgstr "August"
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
 msgstr "September"
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
 msgstr "Oktober"
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
 msgstr "November"
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
 msgstr "Dezember"
 
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr "Jan."
-
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr "Feb."
+#: lib/object.php:441
+msgid "by events date"
+msgstr "bei Tag des Termins"
 
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr "Mär."
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr "an einem Tag des Jahres"
 
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr "Apr."
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr "an einer Wochennummer"
 
-#: templates/calendar.php:35
-msgid "May."
-msgstr "Mai"
+#: lib/object.php:444
+msgid "by day and month"
+msgstr "an einer Tag und Monats Kombination"
 
-#: templates/calendar.php:35
-msgid "Jun."
-msgstr "Jun."
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Kein Feld"
 
-#: templates/calendar.php:35
-msgid "Jul."
-msgstr "Jul."
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr "Datum"
 
-#: templates/calendar.php:35
-msgid "Aug."
-msgstr "Aug."
+#: lib/search.php:40
+msgid "Cal."
+msgstr "Kal."
 
-#: templates/calendar.php:35
-msgid "Sep."
-msgstr "Sep."
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Ganztags"
 
-#: templates/calendar.php:35
-msgid "Oct."
-msgstr "Okt."
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "fehlende Felder"
 
-#: templates/calendar.php:35
-msgid "Nov."
-msgstr "Nov."
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Titel"
 
-#: templates/calendar.php:35
-msgid "Dec."
-msgstr "Dez."
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Startdatum"
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Woche"
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Startzeit"
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Wochen"
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Enddatum"
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr "Mehr vor {startdate}"
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Endzeit"
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr "Mehr nach {enddate}"
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Der Termin hört auf, bevor er angefangen hat."
 
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Tag"
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Datenbankfehler"
 
 #: templates/calendar.php:52
+msgid "Week"
+msgstr "Woche"
+
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Monat"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:54
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:58
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Heute"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Kalender"
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Zeit"
-
-#: templates/calendar.php:169
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Fehler beim Einlesen der Datei."
 
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Aktive Kalender wählen"
@@ -352,14 +436,13 @@ msgid "Download"
 msgstr "Herunterladen"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Löschen"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -377,90 +460,181 @@ msgstr "Anzeigename"
 msgid "Active"
 msgstr "Aktiv"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Beschreibung"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Kalenderfarbe"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Bestätigen"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Ereignis bearbeiten"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Titel"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Exportieren"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "Name"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Ort"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Ort"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Kategorie"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
 msgstr "Kategorie auswählen"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Ganztägiges Ereignis"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "von"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "bis"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Erweiterte Optionen"
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "wiederholen"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Teilnehmer"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr "Erweitert"
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr "Wochentage auswählen"
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr "Tage auswählen"
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr "und den Tag des Jahres vom Termin"
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr "und den Tag des Monats vom Termin"
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr "Monate auswählen"
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr "Wochen auswählen"
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr "und den Tag des Jahres vom Termin"
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr "Intervall"
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr "Ende"
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr "Vorkommen"
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Ort"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Ort"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Beschreibung"
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Beschreibung"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Schließen"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "Bitte wählen Sie den Kalender."
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "Importieren"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Neues Ereignis"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Zeitzone"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr "immer die Zeitzone überprüfen"
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Zeitformat"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Kalender CalDAV Synchronisationsadresse:"
+
 
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index a85b6c5f1e4..97bc43aa3d5 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -6,12 +6,13 @@
 #   <georg.stefan.germany@googlemail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
+#   <nelsonfritsch@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +21,50 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Dies ist nicht dein Adressbuch."
@@ -28,30 +73,26 @@ msgstr "Dies ist nicht dein Adressbuch."
 msgid "Contact could not be found."
 msgstr "Kontakt konnte nicht gefunden werden."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "vCard konnte nicht gelesen werden."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organisation"
@@ -88,6 +129,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Pager"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Dies ist nicht dein Kontakt."
@@ -100,88 +145,83 @@ msgstr "Diese Karte ist nicht RFC-kompatibel."
 msgid "This card does not contain a photo."
 msgstr "Diese Karte enthält kein Foto."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Kontakt hinzufügen"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Gruppe"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Name"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Postfach"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Erweitert"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Straße"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Stadt"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Region"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Postleitzahl"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Land"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Kontakt erstellen"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Aktive Adressbücher auswählen"
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
-msgstr ""
+msgstr "Neues Adressbuch"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "CardDav Link"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "Herunterladen"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -192,36 +232,44 @@ msgid "Delete"
 msgstr "Löschen"
 
 #: templates/part.details.php:3
-msgid "Delete contact"
+msgid "Download contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:4
+msgid "Delete contact"
+msgstr "Kontakt löschen"
+
+#: templates/part.details.php:34
 msgid "Add"
+msgstr "Hinzufügen"
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Anzeigename"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Speichern"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Eintragen"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Abbrechen"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -229,7 +277,7 @@ msgstr "Geburtstag"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Bevorzugt"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -237,6 +285,10 @@ msgstr "Telefon"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
+msgstr "Aktualisieren"
+
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
 msgstr ""
 
 
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 97a3d576211..b9769babd01 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -5,13 +5,14 @@
 # Translators:
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
+#   <nelsonfritsch@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 12:33+0000\n"
+"Last-Translator: piccobello <nelsonfritsch@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,11 +60,11 @@ msgstr ""
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "Text Datei"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Ordner"
 
 #: templates/index.php:12
 msgid "From the web"
diff --git a/l10n/de/gallery.po b/l10n/de/gallery.po
new file mode 100644
index 00000000000..64f9f997230
--- /dev/null
+++ b/l10n/de/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 33f745e2687..9db3b4cec9d 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <admin@s-goecker.de>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+#   <nelsonfritsch@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-12 15:43+0000\n"
+"Last-Translator: piccobello <nelsonfritsch@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "E-Mail wurde geändert"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -105,15 +106,17 @@ msgstr "Passwort ändern"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "E-Mail"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Ihre E-Mail Adresse"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
+"Tragen Sie eine E-Mail Adresse ein, um die Passwort-Wiederherstellung zu "
+"aktivieren"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -121,7 +124,7 @@ msgstr "Sprache"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Helfen Sie bei der Ãœbersetzung"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
diff --git a/l10n/el/calendar.po b/l10n/el/calendar.po
index 15e4e959f34..dd0c8352f9b 100644
--- a/l10n/el/calendar.po
+++ b/l10n/el/calendar.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011.
+#   <christosvas@in.gr>, 2011.
+# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,321 +19,403 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Σφάλμα ταυτοποίησης"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr "�έα ζώνη ώ�ας:"
 
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
-msgstr "Λάθος ημε�ολόγιο"
-
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Η ζώνη ώ�ας άλλαξε"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "Μη έγκυ�ο αίτημα"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Ημε�ολόγιο"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Λάθος ημε�ολόγιο"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
 msgstr "Γενέθλια"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
 msgstr "Επιχεί�ηση"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
 msgstr "Κλήση"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
 msgstr "Πελάτες"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
-msgstr ""
+msgstr "Πα�αδώσας"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
 msgstr "Διακοπές"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
 msgstr "Ιδέες"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
 msgstr "Ταξίδι"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
-msgstr ""
+msgstr "Γιο�τή"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
-msgstr ""
+msgstr "Συνάντηση"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
 msgstr "Άλλο"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
 msgstr "Π�οσωπικό"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
 msgstr "Έ�γα"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
 msgstr "Ε�ωτήσεις"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
 msgstr "Ε�γασία"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "Μη επαναλαμβανόμενο"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Καθημε�ινά"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "Εβδομαδιαία"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "Κάθε μέ�α"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "Δ�ο φο�ές την εβδομάδα"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "Μηνιαία"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "Ετήσια"
 
-#: lib/object.php:337
-msgid "Not an array"
-msgstr "Δεν είναι μια σει�ά"
+#: lib/object.php:366
+msgid "never"
+msgstr "ποτέ"
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Ολοήμε�ο"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr "κατά συχνότητα π�όσβασης"
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Κυ�ιακή"
+#: lib/object.php:368
+msgid "by date"
+msgstr "κατά ημε�ομηνία"
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr "κατά ημέ�α"
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr "κατά εβδομάδα"
 
-#: templates/calendar.php:32
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
 msgstr "Δευτέ�α"
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
 msgstr "Τ�ίτη"
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
 msgstr "Τετά�τη"
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
 msgstr "Πέμπτη"
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
 msgstr "Πα�ασκευή"
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "Κυ�."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr "Κυ�ιακή"
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Δευτ."
+#: lib/object.php:396
+msgid "events week of month"
+msgstr "συμβάντα της εβδομάδας του μήνα"
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Τ�."
+#: lib/object.php:397
+msgid "first"
+msgstr "π�ώτο"
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Τετ."
+#: lib/object.php:398
+msgid "second"
+msgstr "δε�τε�ο"
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Πέμ."
+#: lib/object.php:399
+msgid "third"
+msgstr "τ�ίτο"
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Πα�."
+#: lib/object.php:400
+msgid "fourth"
+msgstr "τέτα�το"
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Σάβ."
+#: lib/object.php:401
+msgid "fifth"
+msgstr "πέμπτο"
 
-#: templates/calendar.php:34
+#: lib/object.php:402
+msgid "last"
+msgstr "τελευταίο"
+
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
 msgstr "Ιανουά�ιος"
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
 msgstr "Φεβ�ουά�ιος"
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
 msgstr "Μά�τιος"
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
 msgstr "Απ�ίλιος"
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr "Μάιος"
+msgstr "Μάϊος"
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
 msgstr "Ιο�νιος"
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
 msgstr "Ιο�λιος"
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
 msgstr "Α�γουστος"
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
 msgstr "Σεπτέμβ�ιος"
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
 msgstr "Οκτώβ�ιος"
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
 msgstr "�οέμβ�ιος"
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
 msgstr "Δεκέμβ�ιος"
 
-#: templates/calendar.php:35
+#: lib/object.php:441
+msgid "by events date"
+msgstr "κατά ημε�ομηνία συμβάντων"
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr "κατά ημέ�α(ες) του έτους"
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr "κατά εβδομάδα(ες)"
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr "κατά ημέ�α και μήνα"
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Δεν είναι μια σει�ά"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr "Ημε�ομηνία"
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr "Ημε�."
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Ολοήμε�ο"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Πεδία που λείπουν"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Τίτλος"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Από Ημε�ομηνία"
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Από ��α"
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Έως Ημε�ομηνία"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Έως ��α"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Το γεγονός ολοκλη�ώνεται π�ιν από την ένα�ξή του"
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Υπή�ξε σφάλμα στη βάση δεδομένων"
+
+#: templates/calendar.php:52
+msgid "Week"
+msgstr "Εβδομάδα"
+
+#: templates/calendar.php:53
+msgid "Month"
+msgstr "Μήνας"
+
+#: templates/calendar.php:54
+msgid "List"
+msgstr "Λίστα"
+
+#: templates/calendar.php:59
+msgid "Today"
+msgstr "Σήμε�α"
+
+#: templates/calendar.php:60
+msgid "Calendars"
+msgstr "Ημε�ολόγια"
+
+#: templates/calendar.php:78
+msgid "There was a fail, while parsing the file."
+msgstr "Υπή�ξε μια αποτυχία, κατά την αξιολόγηση του α�χείου."
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr "Κυ�."
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr "Δευτ."
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr "Τ�ι."
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr "Τετ."
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr "Πέμ."
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr "Πα�."
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr "Σαβ."
+
+#: templates/lAfix.php:28
 msgid "Jan."
 msgstr "Ιαν."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:29
 msgid "Feb."
 msgstr "Φεβ."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:30
 msgid "Mar."
 msgstr "Μα�."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:31
 msgid "Apr."
 msgstr "Απ�."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:32
 msgid "May."
-msgstr ""
+msgstr "Μάϊ."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:33
 msgid "Jun."
-msgstr "Ιο�ν."
+msgstr "Ιον."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:34
 msgid "Jul."
-msgstr "Ιο�λ."
+msgstr "Ιολ."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:35
 msgid "Aug."
 msgstr "Α�γ."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:36
 msgid "Sep."
 msgstr "Σεπ."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:37
 msgid "Oct."
 msgstr "Οκτ."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:38
 msgid "Nov."
-msgstr "�οέ."
+msgstr "�οε."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:39
 msgid "Dec."
 msgstr "Δεκ."
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Εβδομάδα"
-
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Εβδομάδες"
-
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr ""
-
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr ""
-
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Ημέ�α"
-
-#: templates/calendar.php:52
-msgid "Month"
-msgstr "Μήνας"
-
-#: templates/calendar.php:53
-msgid "List"
-msgstr "Λίστα"
-
-#: templates/calendar.php:58
-msgid "Today"
-msgstr "Σήμε�α"
-
-#: templates/calendar.php:59
-msgid "Calendars"
-msgstr "Ημε�ολόγια"
-
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "��α"
-
-#: templates/calendar.php:169
-msgid "There was a fail, while parsing the file."
-msgstr "Υπή�χε μια αποτυχία, κατά την ανάλυση του α�χείου."
-
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Επιλέξτε τα ενε�γά ημε�ολόγια"
@@ -344,21 +427,20 @@ msgstr "�έα Ημε�ολόγιο"
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr ""
+msgstr "Σ�νδεση CalDAV"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
 msgstr "Λήψη"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Επεξε�γασία"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Διαγ�αφή"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -376,90 +458,181 @@ msgstr "Π�οβολή ονόματος"
 msgid "Active"
 msgstr "Ενε�γό"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Πε�ιγ�αφή"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Χ�ώμα ημε�ολογίου"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Αποθήκευση"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Υποβολή"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
 msgstr "Ακ��ωση"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Επεξε�γασία ενός γεγονότος"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Τίτλος"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Εξαγωγή"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "Τίτλος συμβάντος"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Τοποθεσία"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Τοποθεσία συμβάντος"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Κατηγο�ία"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
 msgstr "Επιλέξτε κατηγο�ία"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Ολοήμε�ο συμβάν"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "Από"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "Έως"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Επιλογές για π�οχω�ημένους"
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Επαναλαμβανόμενο"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Πα�ευ�ισκόμενοι"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr "Για π�οχω�ημένους"
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr "Επιλογή ημε�ών εβδομάδας"
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr "Επιλογή ημε�ών"
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr "και των ημε�ών του χ�όνου που υπά�χουν συμβάντα."
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr "και των ημε�ών του μήνα που υπά�χουν συμβάντα."
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr "Επιλογή μηνών"
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr "Επιλογή εβδομάδων"
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr "και των εβδομάδων του χ�όνου που υπά�ουν συμβάντα."
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr "Διάστημα"
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr "Τέλος"
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr "πε�ιστατικά"
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Τοποθεσία"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Τοποθεσία συμβάντος"
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Πε�ιγ�αφή"
+
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Πε�ιγ�αφή του συμβάντος"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Κλείσιμο"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "Πα�ακαλώ επιλέξτε το ημε�ολόγιο"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "Εισαγωγή"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Δημιου�γήστε ένα νέο συμβάν"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Ζώνη ώ�ας"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr "Έλεγοχς πάντα για τις αλλαγές της ζώνης ώ�ας"
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Μο�φή ώ�ας"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24ω"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12ω"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Διε�θυνση για το συγχ�ονισμο� του ημε�ολογίου CalDAV:"
+
 
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index ab36ccdfd3e..1eaa6a34b85 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 #   <christosvas@in.gr>, 2011.
-# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011.
+# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,50 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Αυτό δεν είναι βιβλίο διευθ�νσεων σας."
@@ -27,31 +71,27 @@ msgstr "Αυτό δεν είναι βιβλίο διευθ�νσεων σας."
 msgid "Contact could not be found."
 msgstr "Η επαφή δεν μπ�ό�εσε να β�εθεί."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "Η vCard δεν μπο�εί να διαβαστεί."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 "Οι πλη�οφο�ίες σχετικά με vCard είναι εσφαλμένες. Πα�ακαλώ επαναφο�τώστε τη "
 "σελίδα."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Διε�θυνση"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Τηλέφωνο"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Ο�γανισμός"
@@ -88,6 +128,10 @@ msgstr "Βίντεο"
 msgid "Pager"
 msgstr "Βομβητής"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Αυτή δεν είναι επαφή σας."
@@ -100,88 +144,83 @@ msgstr "Αυτή η κά�τα δεν είναι RFC συμβατή."
 msgid "This card does not contain a photo."
 msgstr "Αυτή η κά�τα δεν πε�ιέχει φωτογ�αφία."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Π�οσθήκη επαφής"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Ομάδα"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Όνομα"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Τ�πος"
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Ταχ. Θυ�ίδα"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Εκτεταμένη"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Οδός"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Πόλη"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Πε�ιοχή"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Τ.Κ."
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Χώ�α"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Δημιου�γία επαφής"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Επιλέξτε τα ενε�γά βιβλία διευθ�νσεων"
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
-msgstr ""
+msgstr "�έο βιβλίο διευθ�νσεων"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "Σ�νδεσμος CardDav"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "Μεταφό�τωση"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -192,36 +231,44 @@ msgid "Delete"
 msgstr "Διαγ�αφή"
 
 #: templates/part.details.php:3
-msgid "Delete contact"
+msgid "Download contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:4
+msgid "Delete contact"
+msgstr "Διαγ�αφή επαφής"
+
+#: templates/part.details.php:34
 msgid "Add"
+msgstr "Π�οσθήκη"
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Π�οβαλόμενο όνομα"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Ενε�γό"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Αποθήκευση"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Καταχώ�ηση"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Ακ��ωση"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -229,7 +276,7 @@ msgstr "Γενέθλια"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Π�οτιμώμενο"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -237,6 +284,10 @@ msgstr "Τηλέφωνο"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
+msgstr "Ενημέ�ωση"
+
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
 msgstr ""
 
 
diff --git a/l10n/el/core.po b/l10n/el/core.po
index bf36969732a..1b3f42e1e0b 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 #   <petros.kyladitis@gmail.com>, 2011.
-# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011.
+# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 17:25+0000\n"
+"Last-Translator: Petros Kyladitis <petros.kyladitis@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,11 +21,12 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Επανέκδοση κωδικο� για το Qwncloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
+"Χ�ησιμοποιήστε τον ακόλουθο σ�νδεσμο για να επανεκδόσετε τον κωδικό: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -56,7 +57,7 @@ msgstr "Ο κωδικός π�όσβασής σας επαναφέ�θηκε"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Σελίδα εισόδου"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -137,7 +138,7 @@ msgstr "Ολοκλή�ωση εγκατάστασης"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "Υπη�εσίες web υπό τον έλεγχό σας"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -157,7 +158,7 @@ msgstr "να με θυμάσαι"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Είσοδος"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 5f2920a2114..aa0c2bd13a4 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011.
+# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 17:17+0000\n"
+"Last-Translator: Petros Kyladitis <petros.kyladitis@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,19 +58,19 @@ msgstr "Μέγιστο μέγεθος μεταφό�τωσης"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "�έο"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "Α�χείο κειμένου"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Φάκελος"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "Από τον ιστό"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/el/gallery.po b/l10n/el/gallery.po
new file mode 100644
index 00000000000..f2a75835b34
--- /dev/null
+++ b/l10n/el/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index ea32c35f4fd..3ca09077e0b 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 #   <petros.kyladitis@gmail.com>, 2011.
-# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011.
+# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 17:35+0000\n"
+"Last-Translator: Petros Kyladitis <petros.kyladitis@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "το email άλλαξε"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -37,7 +37,7 @@ msgstr "Η γλώσσα άλλαξε"
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Επίπεδο καταγ�αφής"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -105,15 +105,17 @@ msgstr "Αλλαγή κωδικο� π�όσβασης"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Το διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου σας"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
+"Συμπλη�ώστε μια διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου για να ενε�γοποιηθεί ή "
+"ανάκτηση κωδικο� π�όσβασης"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -121,7 +123,7 @@ msgstr "Γλώσσα"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Βοηθήστε στην μετάφ�αση"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -147,7 +149,7 @@ msgstr "Δημιου�γία"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Αναλογία χώ�ου"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/eo/calendar.po b/l10n/eo/calendar.po
index a3701a03348..94b0b0af305 100644
--- a/l10n/eo/calendar.po
+++ b/l10n/eo/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-07 18:29+0100\n"
-"PO-Revision-Date: 2012-01-08 08:41+0000\n"
-"Last-Translator: mctpyt <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/team/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -315,27 +315,27 @@ msgstr "La okazaĵo finas antaŭ komenci"
 msgid "There was a database fail"
 msgstr "Datumbaza malsukceso okazis"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:52
 msgid "Week"
 msgstr "Semajno"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Monato"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:54
 msgid "List"
 msgstr "Listo"
 
-#: templates/calendar.php:45
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "HodiaÅ­"
 
-#: templates/calendar.php:46
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Kalendaroj"
 
-#: templates/calendar.php:64
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Malsukceso okazis dum analizo de la dosiero."
 
@@ -449,7 +449,7 @@ msgstr "Nova kalendaro"
 msgid "Edit calendar"
 msgstr "Redakti la kalendaron"
 
-#: templates/part.editcalendar.php:12 templates/part.import.php:29
+#: templates/part.editcalendar.php:12
 msgid "Displayname"
 msgstr "Montrota nomo"
 
@@ -575,36 +575,36 @@ msgid "Description of the Event"
 msgstr "Okazaĵopriskribo"
 
 #: templates/part.import.php:1
-msgid "Import Ical File"
-msgstr "Enporti Ical-dosieron"
-
-#: templates/part.import.php:4
-msgid "How to import the new calendar?"
-msgstr "Kiel enporti la novan kalendaron?"
+msgid "Import a calendar file"
+msgstr ""
 
 #: templates/part.import.php:6
-msgid "Import into an existing calendar"
-msgstr "Enporti en estantan kalendaron"
-
-#: templates/part.import.php:7
-msgid "Import into a new calendar"
-msgstr "Enporti en novan kalendaron"
-
-#: templates/part.import.php:10
 msgid "Please choose the calendar"
 msgstr "Bonvolu elekti kalendaron"
 
-#: templates/part.import.php:20 templates/part.import.php:37
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
 msgid "Import"
 msgstr "Enporti"
 
-#: templates/part.import.php:22 templates/part.import.php:39
-msgid "Back"
-msgstr "AntaÅ­eniri"
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
 
-#: templates/part.import.php:25
-msgid "Please fill out the form"
-msgstr "Bonvolu plenigi la formularon"
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index 7ab063d4d8f..1a7cb0f8329 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/team/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Ĉi tiu ne estas via adresaro."
@@ -26,29 +70,25 @@ msgstr "Ĉi tiu ne estas via adresaro."
 msgid "Contact could not be found."
 msgstr "Ne eblis trovi la kontakton."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "Ne eblis legi vCard-on."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informo pri vCard estas mal�usta. Bonvolu re�argi la pa�on."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adreso"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Retpo�tadreso"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizaĵo"
@@ -85,6 +125,10 @@ msgstr "Videaĵo"
 msgid "Pager"
 msgstr "Televokilo"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Tiu ĉi ne estas via kontakto."
@@ -97,68 +141,64 @@ msgstr "Ĉi tiu karto ne kongruas kun RFC."
 msgid "This card does not contain a photo."
 msgstr "Ĉi tiu karto ne havas foton."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Aldoni kontakton"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Grupo"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Nomo"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Abonkesto"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Etendita"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Strato"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Urbo"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Regiono"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Po�tokodo"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Lando"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Krei kontakton"
 
@@ -167,7 +207,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -189,15 +228,23 @@ msgid "Delete"
 msgstr "Forigi"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -236,4 +283,8 @@ msgstr "Telefono"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/eo/gallery.po b/l10n/eo/gallery.po
new file mode 100644
index 00000000000..8c86c3094a1
--- /dev/null
+++ b/l10n/eo/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/team/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/es/calendar.po b/l10n/es/calendar.po
index 6b98beb81a5..7e3a85379e6 100644
--- a/l10n/es/calendar.po
+++ b/l10n/es/calendar.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <juanma@kde.org.ar>, 2011.
+#   <juanma@kde.org.ar>, 2011, 2012.
 #   <sergioballesterossolanas@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,321 +19,403 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Error de autentificación"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr "Nueva zona horaria:"
 
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
-msgstr "Calendario incorrecto"
-
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Zona horaria cambiada"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "Petición no válida"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Calendario"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Calendario incorrecto"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
 msgstr "Negocios"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
-msgstr ""
+msgstr "LLamada"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
 msgstr "Clientes"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
-msgstr ""
+msgstr "Entrega"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
 msgstr "Feriados"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
 msgstr "Ideas"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
 msgstr "Viaje"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
 msgstr "Aniversario"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
 msgstr "Reunión"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
 msgstr "Otro"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
-msgstr "Projectos"
+msgstr "Proyectos"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
 msgstr "Preguntas"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
 msgstr "Trabajo"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "No se repite"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Diariamente"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
-msgstr "Una vez a la semana"
+msgstr "Días de semana laboral"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
-msgstr "Dos veces a la semana"
+msgstr "Cada 2 semanas"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "Mensualmente"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "Anualmente"
 
-#: lib/object.php:337
-msgid "Not an array"
-msgstr ""
+#: lib/object.php:366
+msgid "never"
+msgstr "nunca"
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Todo el día"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr "por ocurrencias"
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Domingo"
+#: lib/object.php:368
+msgid "by date"
+msgstr "por fecha"
 
-#: templates/calendar.php:32
+#: lib/object.php:375
+msgid "by monthday"
+msgstr "por día del mes"
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr "por día de la semana"
+
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
 msgstr "Lunes"
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
 msgstr "Martes"
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
 msgstr "Jueves"
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
 msgstr "Viernes"
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
 msgstr "Sábado"
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "Dom."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr "Domingo"
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Lun."
+#: lib/object.php:396
+msgid "events week of month"
+msgstr "eventos de la semana del mes"
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Mar."
+#: lib/object.php:397
+msgid "first"
+msgstr "primer"
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Mie."
+#: lib/object.php:398
+msgid "second"
+msgstr "segundo"
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Jue."
+#: lib/object.php:399
+msgid "third"
+msgstr "tercer"
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Vie."
+#: lib/object.php:400
+msgid "fourth"
+msgstr "cuarto"
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Sáb."
+#: lib/object.php:401
+msgid "fifth"
+msgstr "quinto"
 
-#: templates/calendar.php:34
+#: lib/object.php:402
+msgid "last"
+msgstr "último"
+
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
 msgstr "Enero"
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
 msgstr "Febrero"
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
 msgstr "Marzo"
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
 msgstr "Abril"
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
 msgstr "Mayo"
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
 msgstr "Junio"
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
 msgstr "Julio"
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
 msgstr "Agosto"
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
 msgstr "Septiembre"
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
 msgstr "Octubre"
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
 msgstr "Noviembre"
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
 msgstr "Diciembre"
 
-#: templates/calendar.php:35
+#: lib/object.php:441
+msgid "by events date"
+msgstr "por fecha de los eventos"
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr "por día(s) del año"
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr "por número(s) de semana"
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr "por día y mes"
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "No es una serie"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr "Fecha"
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr "Cal."
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Todo el día"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Los campos que faltan"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Título"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Desde la fecha"
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Desde la hora"
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Hasta la fecha"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Hasta la hora"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "El evento termina antes de que comience"
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Hubo un error en la base de datos"
+
+#: templates/calendar.php:52
+msgid "Week"
+msgstr "Semana"
+
+#: templates/calendar.php:53
+msgid "Month"
+msgstr "Mes"
+
+#: templates/calendar.php:54
+msgid "List"
+msgstr "Lista"
+
+#: templates/calendar.php:59
+msgid "Today"
+msgstr "Hoy"
+
+#: templates/calendar.php:60
+msgid "Calendars"
+msgstr "Calendarios"
+
+#: templates/calendar.php:78
+msgid "There was a fail, while parsing the file."
+msgstr "Hubo un fallo al analizar el archivo."
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr "Dom."
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr "Lun."
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr "Mar."
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr "Mié."
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr "Jue."
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr "Vie."
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr "Sáb."
+
+#: templates/lAfix.php:28
 msgid "Jan."
 msgstr "Ene."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:29
 msgid "Feb."
 msgstr "Feb."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:30
 msgid "Mar."
 msgstr "Mar."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:31
 msgid "Apr."
 msgstr "Abr."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:32
 msgid "May."
-msgstr ""
+msgstr "May."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:33
 msgid "Jun."
 msgstr "Jun."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:34
 msgid "Jul."
 msgstr "Jul."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:35
 msgid "Aug."
 msgstr "Ago."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:36
 msgid "Sep."
 msgstr "Sep."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:37
 msgid "Oct."
 msgstr "Oct."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:38
 msgid "Nov."
 msgstr "Nov."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:39
 msgid "Dec."
 msgstr "Dic."
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Semana"
-
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Semanas"
-
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr ""
-
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr ""
-
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Día"
-
-#: templates/calendar.php:52
-msgid "Month"
-msgstr "Mes"
-
-#: templates/calendar.php:53
-msgid "List"
-msgstr "Lista"
-
-#: templates/calendar.php:58
-msgid "Today"
-msgstr "Hoy"
-
-#: templates/calendar.php:59
-msgid "Calendars"
-msgstr "Calendarios"
-
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Hora"
-
-#: templates/calendar.php:169
-msgid "There was a fail, while parsing the file."
-msgstr "Hubo un fallo al analizar el archivo."
-
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Elige los calendarios activos"
@@ -345,21 +427,20 @@ msgstr "Nuevo calendario"
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr ""
+msgstr "Enlace a CalDav"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
 msgstr "Descargar"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Editar"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Eliminar"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -377,90 +458,181 @@ msgstr "Nombre"
 msgid "Active"
 msgstr "Activo"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Descripción"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Color del calendario"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Guardar"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Editar un evento"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Título"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Exportar"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "Título del evento"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Lugar"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Lugar del Evento"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Categoría"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
 msgstr "Seleccionar categoría"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Todo el día"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "Desde"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "Hasta"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Opciones avanzadas"
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Repetir"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Asistentes"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr "Seleccionar días de la semana"
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr "Seleccionar días"
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr "y el día del año de los eventos."
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr "y el día del mes de los eventos."
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr "Seleccionar meses"
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr "Seleccionar semanas"
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr "y la semana del año de los eventos."
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr "Intervalo"
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr "Fin"
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr "ocurrencias"
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Lugar"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Lugar del Evento"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Descripción"
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Descripción del evento"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Cerrar"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "Elija el calendario"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "Importar"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Crear un nuevo evento"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Zona horaria"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr "Comprobar siempre por cambios en la zona horaria"
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Formato de hora"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Dirección de sincronización de calendario CalDAV:"
+
 
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index 0591daf015a..df296d498f3 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 #   <juanma@kde.org.ar>, 2011.
-#   <sergioballesterossolanas@gmail.com>, 2011.
+#   <sergioballesterossolanas@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,50 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Esta no es tu agenda de contactos."
@@ -27,31 +71,27 @@ msgstr "Esta no es tu agenda de contactos."
 msgid "Contact could not be found."
 msgstr "No se pudo encontrar el contacto."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "No se pudo leer el vCard."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la "
 "página."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Dirección"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organización"
@@ -88,6 +128,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Localizador"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Este no es tu contacto."
@@ -100,68 +144,64 @@ msgstr "Esta tarjeta no es compatible con RFC."
 msgid "This card does not contain a photo."
 msgstr "Esta tarjeta no contiene ninguna foto."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Agregar contacto"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Grupo"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Nombre"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Código postal"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Extendido"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Calle"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Ciudad"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Región"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Código Postal"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "País"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Crear contacto"
 
@@ -170,18 +210,17 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
-msgstr ""
+msgstr "Nueva libreta de direcciones"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "Link Card Dav"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "Descargar"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -192,15 +231,23 @@ msgid "Delete"
 msgstr "Borrar"
 
 #: templates/part.details.php:3
-msgid "Delete contact"
+msgid "Download contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:4
+msgid "Delete contact"
+msgstr "Eliminar contacto"
+
+#: templates/part.details.php:34
 msgid "Add"
+msgstr "Añadir"
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -209,19 +256,19 @@ msgstr ""
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Guardar"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Aceptar"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -229,7 +276,7 @@ msgstr "Cumpleaños"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Preferido"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -237,6 +284,10 @@ msgstr "Teléfono"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
+msgstr "Actualizar"
+
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
 msgstr ""
 
 
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 40f9f0ab4e8..fac043ed1e2 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <juanma@kde.org.ar>, 2011.
+#   <juanma@kde.org.ar>, 2011, 2012.
 #   <rom1dep@gmail.com>, 2011.
-#   <sergioballesterossolanas@gmail.com>, 2011.
+#   <sergioballesterossolanas@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 19:08+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,11 +22,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Restablecer contraseña de ownCloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Utiliza el siguiente enlace para restablecer tu contraseña: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -56,7 +56,7 @@ msgstr "Tu contraseña se ha restablecido"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "A la página de inicio de sesión"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -137,7 +137,7 @@ msgstr "Completar la instalación"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "servicios web bajo tu control"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -157,7 +157,7 @@ msgstr "recuérdame"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Entrar"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 0349f481b1d..f58a6b308f5 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sergioballesterossolanas@gmail.com>, 2011.
+#   <sergioballesterossolanas@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 18:52+0000\n"
+"Last-Translator: xsergiolpx <sergioballesterossolanas@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,19 +58,19 @@ msgstr "Tamaño máximo de subida"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Nuevo"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "Archivo de texto"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Carpeta"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "Desde la web"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/es/gallery.po b/l10n/es/gallery.po
new file mode 100644
index 00000000000..848b07026f8
--- /dev/null
+++ b/l10n/es/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 9be0c001e36..9114f621f8c 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -6,14 +6,14 @@
 #   <juanma@kde.org.ar>, 2011.
 #   <monty_2731@hotmail.com>, 2011.
 #   <rom1dep@gmail.com>, 2011.
-#   <sergioballesterossolanas@gmail.com>, 2011.
+#   <sergioballesterossolanas@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 19:01+0000\n"
+"Last-Translator: xsergiolpx <sergioballesterossolanas@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +23,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "Email actualizado"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -39,7 +39,7 @@ msgstr "Idioma cambiado"
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Nivel de log"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -107,15 +107,15 @@ msgstr "Cambiar contraseña"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Tu dirección de email"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Escribe una dirección de email para restablecer la contraseña"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -123,7 +123,7 @@ msgstr "Idioma"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Ayudar a traducir"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -149,7 +149,7 @@ msgstr "Crear"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Cuota"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/et_EE/calendar.po b/l10n/et_EE/calendar.po
index 8f1f95b962a..cc00b225d3e 100644
--- a/l10n/et_EE/calendar.po
+++ b/l10n/et_EE/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,351 +18,432 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Autentimise viga"
-
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Ajavöönd on muudetud"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "Vigane päring"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Kalender"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Vale kalender"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
-msgstr ""
+msgstr "Sünnipäev"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
-msgstr ""
+msgstr "Äri"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
-msgstr ""
+msgstr "Helista"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
-msgstr ""
+msgstr "Kliendid"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
-msgstr ""
+msgstr "Kohaletoimetaja"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
-msgstr ""
+msgstr "Pühad"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
-msgstr ""
+msgstr "Ideed"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
-msgstr ""
+msgstr "Reis"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
-msgstr ""
+msgstr "Juubel"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
-msgstr ""
+msgstr "Kohtumine"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
-msgstr ""
+msgstr "Muu"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
-msgstr ""
+msgstr "Isiklik"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
-msgstr ""
+msgstr "Projektid"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
-msgstr ""
+msgstr "Küsimused"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
-msgstr ""
+msgstr "Töö"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "Ei kordu"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Iga päev"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "Iga nädal"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "Igal nädalapäeval"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "Üle nädala"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "Igal kuul"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "Igal aastal"
 
-#: lib/object.php:337
-msgid "Not an array"
+#: lib/object.php:366
+msgid "never"
 msgstr ""
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Kogu päev"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Pühapäev"
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr "Esmaspäev"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr "Teisipäev"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr "Kolmapäev"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr "Neljapäev"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr "Reede"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr "Laupäev"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "Pü."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Esm."
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Teisip."
+#: lib/object.php:397
+msgid "first"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Kolmap."
+#: lib/object.php:398
+msgid "second"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Neljap."
+#: lib/object.php:399
+msgid "third"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Reede"
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Laup."
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr "Jaanuar"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr "Veebruar"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr "Märts"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr "Aprill"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr "Mai"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr "Juuni"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr "Juuli"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr "August"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr "September"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr "Oktoober"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr "November"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr "Detsember"
-
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr "Jan."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr "Veebr."
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr "Märts"
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr "Apr."
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "May."
+#: lib/object.php:444
+msgid "by day and month"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jun."
-msgstr "Jun."
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Pole andmemassiiv"
 
-#: templates/calendar.php:35
-msgid "Jul."
-msgstr "Jul."
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Aug."
-msgstr "Aug."
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Sep."
-msgstr "Sept."
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Kogu päev"
 
-#: templates/calendar.php:35
-msgid "Oct."
-msgstr "Okt."
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Puuduvad väljad"
 
-#: templates/calendar.php:35
-msgid "Nov."
-msgstr "Nov."
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Pealkiri"
 
-#: templates/calendar.php:35
-msgid "Dec."
-msgstr "Dets."
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Alates kuupäevast"
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Nädal"
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Alates kellaajast"
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Nädalat"
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Kuni kuupäevani"
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr ""
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Kuni kellaajani"
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr ""
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Üritus lõpeb enne, kui see algab"
 
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Päev"
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Tekkis andmebaasi viga"
 
 #: templates/calendar.php:52
+msgid "Week"
+msgstr "Nädal"
+
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Kuu"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:54
 msgid "List"
-msgstr ""
+msgstr "Nimekiri"
 
-#: templates/calendar.php:58
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Täna"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Kalendrid"
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Kellaaeg"
-
-#: templates/calendar.php:169
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Faili parsimisel tekkis viga."
 
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Vali aktiivsed kalendrid"
 
 #: templates/part.choosecalendar.php:15
 msgid "New Calendar"
-msgstr ""
+msgstr "Uus kalender"
 
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr ""
+msgstr "CalDav Link"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
 msgstr "Lae alla"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Muuda"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Kustuta"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "Uus kalender"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
@@ -376,90 +457,181 @@ msgstr "Näidatav nimi"
 msgid "Active"
 msgstr "Aktiivne"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Kirjeldus"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Kalendri värv"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Salvesta"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "OK"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Loobu"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Muuda sündmust"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Pealkiri"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Ekspordi"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "Sündmuse pealkiri"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Asukoht"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Sündmuse toimumiskoht"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Kategooria"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
-msgstr ""
+msgstr "Salvesta kategooria"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Kogu päeva sündmus"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "Alates"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "Kuni"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Lisavalikud"
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Korda"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Osalejad"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Asukoht"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Sündmuse toimumiskoht"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Kirjeldus"
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Sündmuse kirjeldus"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Sulge"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "Palun vali kalender"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "Impordi"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Loo sündmus"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Ajavöönd"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Aja vorming"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Kalendri CalDAV sünkroniseerimise aadress:"
+
 
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index b7034000524..8b6c2c6873c 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "See pole sinu aadressiraamat."
@@ -26,29 +70,25 @@ msgstr "See pole sinu aadressiraamat."
 msgid "Contact could not be found."
 msgstr "Kontakti ei leitud."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "Visiitkaardi lugemine ebaõnnestus,"
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Visiitkaardi info pole korrektne. Palun lae leht uuesti."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Aadress"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organisatsioon"
@@ -85,6 +125,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Piipar"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "See pole sinu kontakt."
@@ -97,68 +141,64 @@ msgstr "See kaart ei ühildu RFC-ga."
 msgid "This card does not contain a photo."
 msgstr "Sellel kaardil pole fotot."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Lisa kontakt"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Grupp"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Nimi"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Postkontori postkast"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Laiendatud"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Tänav"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Linn"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Piirkond"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Postiindeks"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Riik"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Lisa kontakt"
 
@@ -167,7 +207,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -189,15 +228,23 @@ msgid "Delete"
 msgstr "Kustuta"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -236,4 +283,8 @@ msgstr "Telefon"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/et_EE/gallery.po b/l10n/et_EE/gallery.po
new file mode 100644
index 00000000000..fb623745150
--- /dev/null
+++ b/l10n/et_EE/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/eu/calendar.po b/l10n/eu/calendar.po
index 93fd3c27f37..7ef03022a17 100644
--- a/l10n/eu/calendar.po
+++ b/l10n/eu/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-07 18:29+0100\n"
-"PO-Revision-Date: 2012-01-08 08:41+0000\n"
-"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/team/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -315,27 +315,27 @@ msgstr "Gertaera hasi baino lehen bukatzen da"
 msgid "There was a database fail"
 msgstr "Datu baseak huts egin du"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:52
 msgid "Week"
 msgstr "Astea"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Hilabetea"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:54
 msgid "List"
 msgstr "Zerrenda"
 
-#: templates/calendar.php:45
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Gaur"
 
-#: templates/calendar.php:46
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Egutegiak"
 
-#: templates/calendar.php:64
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Huts bat egon da, fitxategia aztertzen zen bitartea."
 
@@ -449,7 +449,7 @@ msgstr "Egutegi berria"
 msgid "Edit calendar"
 msgstr "Editatu egutegia"
 
-#: templates/part.editcalendar.php:12 templates/part.import.php:29
+#: templates/part.editcalendar.php:12
 msgid "Displayname"
 msgstr "Bistaratzeko izena"
 
@@ -575,36 +575,36 @@ msgid "Description of the Event"
 msgstr "Gertaeraren deskribapena"
 
 #: templates/part.import.php:1
-msgid "Import Ical File"
-msgstr "inportatu ical fitxategia"
-
-#: templates/part.import.php:4
-msgid "How to import the new calendar?"
-msgstr "Nola inportatu egutegi berria?"
+msgid "Import a calendar file"
+msgstr ""
 
 #: templates/part.import.php:6
-msgid "Import into an existing calendar"
-msgstr "inportatu existitzen den egutegi batera"
-
-#: templates/part.import.php:7
-msgid "Import into a new calendar"
-msgstr "inportatu egutegi berri batera"
-
-#: templates/part.import.php:10
 msgid "Please choose the calendar"
 msgstr "Mesedez aukeratu egutegia"
 
-#: templates/part.import.php:20 templates/part.import.php:37
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
 msgid "Import"
 msgstr "Importatu"
 
-#: templates/part.import.php:22 templates/part.import.php:39
-msgid "Back"
-msgstr "Atzera"
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
 
-#: templates/part.import.php:25
-msgid "Please fill out the form"
-msgstr "Mesedez inprimakia bete"
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index c7023773dd0..5eba801b1bf 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/team/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Hau ez da zure helbide liburua."
@@ -26,30 +70,26 @@ msgstr "Hau ez da zure helbide liburua."
 msgid "Contact could not be found."
 msgstr "Ezin izan da kontaktua aurkitu."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "Ezin izan da vCard-a irakurri."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Helbidea"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefonoa"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Eposta"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Erakundea"
@@ -86,6 +126,10 @@ msgstr "Bideoa"
 msgid "Pager"
 msgstr "Bilagailua"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Hau ez da zure kontaktua."
@@ -98,68 +142,64 @@ msgstr "Txartel hau ez da RFC bateragarria."
 msgid "This card does not contain a photo."
 msgstr "Txartel honek ez dauka argazkirik."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Gehitu Kontaktua"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Taldea"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Izena"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Posta kutxa"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Hedatua"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Kalea"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Hiria"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Eskualdea"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Posta Kodea"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Herrialdea"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Sortu Kontaktua"
 
@@ -168,7 +208,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -190,15 +229,23 @@ msgid "Delete"
 msgstr "Ezabatu"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -237,4 +284,8 @@ msgstr "Telefonoa"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/eu/gallery.po b/l10n/eu/gallery.po
new file mode 100644
index 00000000000..e2dc7b08f2a
--- /dev/null
+++ b/l10n/eu/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/team/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/fr/calendar.po b/l10n/fr/calendar.po
index 3c961b669c8..2b5623cf569 100644
--- a/l10n/fr/calendar.po
+++ b/l10n/fr/calendar.po
@@ -3,14 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <rom1dep@gmail.com>, 2011.
+#   <fboulogne@april.org>, 2011.
+#   <gp4004@arghh.org>, 2011.
+# Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
+#   <rom1dep@gmail.com>, 2011, 2012.
+# Yann Yann <chezyann@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,321 +22,403 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Erreur d'authentification"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr "Nouveau fuseau horaire :"
 
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
-msgstr "Mauvais calendrier"
-
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Fuseau horaire modifié"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "Requête invalide"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Mauvais calendrier"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
 msgstr "Anniversaire"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
-msgstr "Business"
+msgstr "Professionnel"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
 msgstr "Appel"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
-msgstr "Clients"
+msgstr "Clientèle"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
-msgstr "Livreur"
+msgstr "Livraison"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
 msgstr "Vacances"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
 msgstr "Idées"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
-msgstr "Journée"
+msgstr "Déplacement"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
 msgstr "Jubilé"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
 msgstr "Meeting"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
 msgstr "Autre"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
 msgstr "Personnel"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
 msgstr "Projets"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
 msgstr "Questions"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
 msgstr "Travail"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "Pas de répétition"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Tous les jours"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
-msgstr "Toutes les semaines"
+msgstr "Hebdomadaire"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
-msgstr "Chaque jour de la semaine"
+msgstr "Quotidien"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
-msgstr "Bimestriel"
+msgstr "Bi-hebdomadaire"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
-msgstr "Tous les mois"
+msgstr "Mensuel"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
-msgstr "Tous les ans"
+msgstr "Annuel"
 
-#: lib/object.php:337
-msgid "Not an array"
-msgstr "Ce n'est pas un tableau"
+#: lib/object.php:366
+msgid "never"
+msgstr "jamais"
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Tous les jours"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr "par occurrences"
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Dimanche"
+#: lib/object.php:368
+msgid "by date"
+msgstr "par date"
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr "par jour du mois"
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr "par jour de la semaine"
 
-#: templates/calendar.php:32
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
 msgstr "Lundi"
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
 msgstr "Vendredi"
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
 msgstr "Samedi"
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "Dim."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr "Dimanche"
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Lun."
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Mar."
+#: lib/object.php:397
+msgid "first"
+msgstr "premier"
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Mer."
+#: lib/object.php:398
+msgid "second"
+msgstr "second"
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Jeu."
+#: lib/object.php:399
+msgid "third"
+msgstr "troisième"
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Ven."
+#: lib/object.php:400
+msgid "fourth"
+msgstr "quatrième"
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Sam."
+#: lib/object.php:401
+msgid "fifth"
+msgstr "cinquième"
 
-#: templates/calendar.php:34
+#: lib/object.php:402
+msgid "last"
+msgstr "dernier"
+
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
 msgstr "Janvier"
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
 msgstr "Février"
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
 msgstr "Mars"
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
 msgstr "Avril"
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
 msgstr "Mai"
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
 msgstr "Juin"
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
 msgstr "Juillet"
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
 msgstr "Août"
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
 msgstr "Septembre"
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
 msgstr "Octobre"
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
 msgstr "Novembre"
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
 msgstr "Décembre"
 
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr "Jan."
-
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr "Fév."
+#: lib/object.php:441
+msgid "by events date"
+msgstr "par date d’événements"
 
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr "Mar."
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr "par jour(s) de l'année"
 
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr "Avr."
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr "par numéro de semaine(s)"
 
-#: templates/calendar.php:35
-msgid "May."
-msgstr "Peut-être *****"
+#: lib/object.php:444
+msgid "by day and month"
+msgstr "par jour et mois"
 
-#: templates/calendar.php:35
-msgid "Jun."
-msgstr "Juin"
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Ce n'est pas un tableau"
 
-#: templates/calendar.php:35
-msgid "Jul."
-msgstr "Juil."
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr "Date"
 
-#: templates/calendar.php:35
-msgid "Aug."
-msgstr "Aoû."
+#: lib/search.php:40
+msgid "Cal."
+msgstr "Cal."
 
-#: templates/calendar.php:35
-msgid "Sep."
-msgstr "Sep."
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Journée entière"
 
-#: templates/calendar.php:35
-msgid "Oct."
-msgstr "Oct."
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Champs manquants"
 
-#: templates/calendar.php:35
-msgid "Nov."
-msgstr "Nov."
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Titre"
 
-#: templates/calendar.php:35
-msgid "Dec."
-msgstr "Déc."
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "De la date"
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Semaine"
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "De l'heure"
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Semaines"
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "A la date"
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr "Voir plus avant {startdate}"
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "A l'heure"
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr "Voir plus après {enddate}"
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "L'évènement s'est terminé avant qu'il ne commence"
 
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Jour"
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Il y a eu un échec dans la base de donnée"
 
 #: templates/calendar.php:52
+msgid "Week"
+msgstr "Semaine"
+
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Mois"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:54
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:58
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Calendriers"
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Heure"
-
-#: templates/calendar.php:169
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Une erreur est survenue pendant la lecture du fichier."
 
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr "Dim."
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr "Lun."
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr "Mar."
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr "Mer."
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr "Jeu."
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr "Ven."
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr "Sam."
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr "Jan."
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr "Fév."
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr "Mar."
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr "Avr."
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr "Mai."
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr "Jui."
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr "Jit."
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr "Aou."
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr "Sep."
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr "Oct."
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr "Nov."
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr "Déc."
+
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Choix des calendriers actifs"
@@ -351,14 +437,13 @@ msgid "Download"
 msgstr "Télécharger"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Éditer"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Supprimer"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -376,90 +461,181 @@ msgstr "Nom d'affichage"
 msgid "Active"
 msgstr "Actif"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Description"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Couleur du calendrier"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Soumettre"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
 msgstr "Annuler"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Éditer un événement"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Titre"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Exporter"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "Titre de l'événement"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Localisation"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Localisation de l'événement"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Catégorie"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
 msgstr "Sélectionner une catégorie"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
-msgstr "Événement de toute une journée"
+msgstr "Journée entière"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "De"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "À"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Options avancées"
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Répétition"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Personnes présentes"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr "Avancé"
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr "Sélection des jours de la semaine"
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr "Sélection des jours"
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr "Sélection des mois"
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr "Sélection des semaines"
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr "Intervalle"
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr "Fin"
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr "occurrences"
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Emplacement"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Emplacement de l'événement"
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Description"
+
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Description de l'événement"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Fermer"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "Choisissez le calendrier svp"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "Importer"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Créer un nouvel événement"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr "Toujours vérifier d'éventuels changements de fuseau horaire"
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Format de l'heure"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Adresse de synchronisation du calendrier CalDAV :"
+
 
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 2f2dd572cd9..90e4474072b 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <fboulogne@april.org>, 2011.
 #   <gp4004@arghh.org>, 2011.
+# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 #   <rom1dep@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +21,50 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Ce n'est pas votre carnet d'adresses."
@@ -27,31 +73,27 @@ msgstr "Ce n'est pas votre carnet d'adresses."
 msgid "Contact could not be found."
 msgstr "Ce contact n'a pas été trouvé."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "Cette vCard n'a pas pu être lue."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 "Les informations relatives à cette vCard sont incorrectes. Veuillez "
 "recharger la page."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
-msgstr "Email"
+msgstr "E-mail"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Société"
@@ -88,6 +130,10 @@ msgstr "Vidéo"
 msgid "Pager"
 msgstr "Bipeur"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Ce n'est pas votre contact."
@@ -100,88 +146,83 @@ msgstr "Cette fiche n'est pas compatible RFC."
 msgid "This card does not contain a photo."
 msgstr "Cette fiche ne contient pas de photo."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Ajouter un Contact"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Groupe"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Nom"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Boîte postale"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Étendu"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Rue"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Ville"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Région"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Code postal"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Pays"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Créer le Contact"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Choisissez le Carnet d'adresses actif"
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
-msgstr ""
+msgstr "Nouveau Carnet d'adresses"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "Lien CardDav"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "Télécharger"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -189,39 +230,47 @@ msgstr "Modifier"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Delete"
-msgstr "Effacer"
+msgstr "Supprimer"
 
 #: templates/part.details.php:3
-msgid "Delete contact"
+msgid "Download contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:4
+msgid "Delete contact"
+msgstr "Supprimer le contact"
+
+#: templates/part.details.php:34
 msgid "Add"
+msgstr "Ajouter"
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Nom"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Carnet actif"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Sauvegarder"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Envoyer"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -229,7 +278,7 @@ msgstr "Anniversaire"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Préféré"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -237,6 +286,10 @@ msgstr "Téléphone"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
+msgstr "Enregistrer"
+
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
 msgstr ""
 
 
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 2760dfdeb9d..87746ef79bb 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 20:14+0000\n"
+"Last-Translator: Borjan Tchakaloff <borjan@tchaka.fr>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,12 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Réinitialisation de votre mot de passe Owncloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
+"Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -55,7 +56,7 @@ msgstr "Votre mot de passe a été réinitialisé"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Retour à la page d'authentification"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -136,7 +137,7 @@ msgstr "Terminer l'installation"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "services web sous votre contrôle"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -156,7 +157,7 @@ msgstr "se souvenir de moi"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Connexion"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 8f1ba975395..4bdbb70bc56 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 20:06+0000\n"
+"Last-Translator: Borjan Tchakaloff <borjan@tchaka.fr>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,19 +58,19 @@ msgstr "Taille max. d'envoi"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Nouveau"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "Fichier texte"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Dossier"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "Depuis le web"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/fr/gallery.po b/l10n/fr/gallery.po
new file mode 100644
index 00000000000..f2a196d96b9
--- /dev/null
+++ b/l10n/fr/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index c3737d58524..a0a3373fba9 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 20:18+0000\n"
+"Last-Translator: Borjan Tchakaloff <borjan@tchaka.fr>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "e-mail modifié"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -38,7 +38,7 @@ msgstr "Langue changée"
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Niveau de log"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -106,15 +106,16 @@ msgstr "Changer de mot de passe"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "E-mail"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Votre adresse e-mail"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
+"Entrez votre adresse e-mail pour activer la réinitialisation de mot de passe"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -122,7 +123,7 @@ msgstr "Langue"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Aidez à traduire"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -148,7 +149,7 @@ msgstr "Créer"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Quota"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/gl/calendar.po b/l10n/gl/calendar.po
new file mode 100644
index 00000000000..e4607d2f7d8
--- /dev/null
+++ b/l10n/gl/calendar.po
@@ -0,0 +1,636 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr ""
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr ""
+
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr ""
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr ""
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr ""
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr ""
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr ""
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr ""
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr ""
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr ""
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr ""
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr ""
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr ""
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr ""
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr ""
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr ""
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr ""
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr ""
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr ""
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr ""
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr ""
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:52
+msgid "Week"
+msgstr ""
+
+#: templates/calendar.php:53
+msgid "Month"
+msgstr ""
+
+#: templates/calendar.php:54
+msgid "List"
+msgstr ""
+
+#: templates/calendar.php:59
+msgid "Today"
+msgstr ""
+
+#: templates/calendar.php:60
+msgid "Calendars"
+msgstr ""
+
+#: templates/calendar.php:78
+msgid "There was a fail, while parsing the file."
+msgstr ""
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr ""
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr ""
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr ""
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr ""
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr ""
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr ""
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr ""
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr ""
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr ""
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr ""
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr ""
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr ""
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr ""
+
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr ""
+
+
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
new file mode 100644
index 00000000000..a5df9ac8e9a
--- /dev/null
+++ b/l10n/gl/contacts.po
@@ -0,0 +1,289 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
+#: lib/app.php:42
+msgid "This is not your addressbook."
+msgstr ""
+
+#: lib/app.php:51 photo.php:34
+msgid "Contact could not be found."
+msgstr ""
+
+#: lib/app.php:79
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr ""
+
+#: lib/app.php:91 templates/part.addcardform.php:54
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr ""
+
+#: lib/app.php:92 templates/part.addcardform.php:43
+msgid "Telephone"
+msgstr ""
+
+#: lib/app.php:93 templates/part.addcardform.php:37
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr ""
+
+#: lib/app.php:94 templates/part.addcardform.php:27
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr ""
+
+#: lib/app.php:106 lib/app.php:113
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:107 lib/app.php:111
+msgid "Home"
+msgstr ""
+
+#: lib/app.php:112
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:114
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:115
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:116
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:117
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:118
+msgid "Pager"
+msgstr ""
+
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
+#: photo.php:40
+msgid "This is not your contact."
+msgstr ""
+
+#: photo.php:48
+msgid "This card is not RFC compatible."
+msgstr ""
+
+#: photo.php:85
+msgid "This card does not contain a photo."
+msgstr ""
+
+#: templates/index.php:6
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Addressbooks"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Addressbook"
+msgstr ""
+
+#: templates/part.addcardform.php:21
+msgid "Name"
+msgstr ""
+
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:49
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr ""
+
+#: templates/part.addcardform.php:72 templates/part.details.php:53
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr ""
+
+#: templates/part.addcardform.php:78 templates/part.details.php:57
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr ""
+
+#: templates/part.addcardform.php:84 templates/part.details.php:61
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr ""
+
+#: templates/part.addcardform.php:90 templates/part.details.php:65
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr ""
+
+#: templates/part.addcardform.php:96 templates/part.details.php:69
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr ""
+
+#: templates/part.addcardform.php:102 templates/part.details.php:73
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr ""
+
+#: templates/part.addcardform.php:109
+msgid "Create Contact"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr ""
+
+#: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:34
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr ""
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr ""
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
+
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
new file mode 100644
index 00000000000..aabdef11038
--- /dev/null
+++ b/l10n/gl/core.po
@@ -0,0 +1,170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr ""
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:15
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
+
+
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
new file mode 100644
index 00000000000..164a7125e91
--- /dev/null
+++ b/l10n/gl/files.po
@@ -0,0 +1,108 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr ""
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:43
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Size"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+
diff --git a/l10n/gl/gallery.po b/l10n/gl/gallery.po
new file mode 100644
index 00000000000..ec369f59cb9
--- /dev/null
+++ b/l10n/gl/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/gl/media.po b/l10n/gl/media.po
new file mode 100644
index 00000000000..66a58f40a80
--- /dev/null
+++ b/l10n/gl/media.po
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:32 templates/player.php:9
+msgid "Music"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr ""
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr ""
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr ""
+
+#: templates/music.php:38
+msgid "Album"
+msgstr ""
+
+#: templates/music.php:39
+msgid "Title"
+msgstr ""
+
+
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
new file mode 100644
index 00000000000..2cb16dd7c32
--- /dev/null
+++ b/l10n/gl/settings.po
@@ -0,0 +1,152 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr ""
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr ""
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr ""
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr ""
+
+#: templates/apps.php:23
+msgid "by"
+msgstr ""
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr ""
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:17
+msgid "show"
+msgstr ""
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr ""
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr ""
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr ""
+
+#: templates/users.php:23
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr ""
+
+
diff --git a/l10n/he/calendar.po b/l10n/he/calendar.po
index 39d8b244769..fd3ee1ab0f4 100644
--- a/l10n/he/calendar.po
+++ b/l10n/he/calendar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-07 18:29+0100\n"
-"PO-Revision-Date: 2012-01-08 08:41+0000\n"
-"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/team/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -317,27 +317,27 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:52
 msgid "Week"
 msgstr "שבוע"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "חודש"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:54
 msgid "List"
 msgstr "רשימה"
 
-#: templates/calendar.php:45
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "היו�"
 
-#: templates/calendar.php:46
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "לוחות שנה"
 
-#: templates/calendar.php:64
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "�ירעה שגי�ה בעת פענוח הקובץ."
 
@@ -451,7 +451,7 @@ msgstr "לוח שנה חדש"
 msgid "Edit calendar"
 msgstr "עריכת לוח שנה"
 
-#: templates/part.editcalendar.php:12 templates/part.import.php:29
+#: templates/part.editcalendar.php:12
 msgid "Displayname"
 msgstr "ש� תצוגה"
 
@@ -577,35 +577,35 @@ msgid "Description of the Event"
 msgstr "תי�ור ה�ירוע"
 
 #: templates/part.import.php:1
-msgid "Import Ical File"
-msgstr ""
-
-#: templates/part.import.php:4
-msgid "How to import the new calendar?"
+msgid "Import a calendar file"
 msgstr ""
 
 #: templates/part.import.php:6
-msgid "Import into an existing calendar"
+msgid "Please choose the calendar"
 msgstr ""
 
-#: templates/part.import.php:7
-msgid "Import into a new calendar"
+#: templates/part.import.php:10
+msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.import.php:10
-msgid "Please choose the calendar"
+#: templates/part.import.php:15
+msgid "Name of new calendar"
 msgstr ""
 
-#: templates/part.import.php:20 templates/part.import.php:37
+#: templates/part.import.php:17
 msgid "Import"
 msgstr "יבו�"
 
-#: templates/part.import.php:22 templates/part.import.php:39
-msgid "Back"
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
 msgstr ""
 
-#: templates/part.import.php:25
-msgid "Please fill out the form"
+#: templates/part.import.php:24
+msgid "Close Dialog"
 msgstr ""
 
 #: templates/part.newevent.php:1
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index 3932aca9797..3779134461c 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/team/he/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "זהו �ינו ספר הכתובות שלך"
@@ -26,29 +70,25 @@ msgstr "זהו �ינו ספר הכתובות שלך"
 msgid "Contact could not be found."
 msgstr "ל� ניתן ל�תר �יש קשר"
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "ל� ניתן לקרו� vCard."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "המידע �ודות vCard �ינו נכון. נ� לטעון מחדש �ת הדף."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "כתובת"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "טלפון"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "דו�ר �לקטרוני"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "�רגון"
@@ -85,6 +125,10 @@ msgstr "ויד�ו"
 msgid "Pager"
 msgstr "זימונית"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "זהו �ינו �יש קשר שלך"
@@ -97,68 +141,64 @@ msgstr "כרטיס זה �ינו תו�� ל־RFC"
 msgid "This card does not contain a photo."
 msgstr "כרטיס זה �ינו כולל תמונה"
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "הוספת �יש קשר"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "קבוצה"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "ש�"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "ת� דו�ר"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "מורחב"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "רחוב"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "עיר"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "�זור"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "מיקוד"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "מדינה"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "יצירת �יש קשר"
 
@@ -167,7 +207,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -189,15 +228,23 @@ msgid "Delete"
 msgstr "מחיקה"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -236,4 +283,8 @@ msgstr "טלפון"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/he/gallery.po b/l10n/he/gallery.po
new file mode 100644
index 00000000000..5b80974785c
--- /dev/null
+++ b/l10n/he/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/team/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/hr/calendar.po b/l10n/hr/calendar.po
index c4ea31f3c0a..9aac8b76f34 100644
--- a/l10n/hr/calendar.po
+++ b/l10n/hr/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-07 18:29+0100\n"
-"PO-Revision-Date: 2012-01-08 08:41+0000\n"
-"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/team/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -315,27 +315,27 @@ msgstr "Događaj završava prije nego po�inje"
 msgid "There was a database fail"
 msgstr "Pogreška u bazi podataka"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:52
 msgid "Week"
 msgstr "Tjedan"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Mjesec"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:54
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:45
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Danas"
 
-#: templates/calendar.php:46
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Kalendari"
 
-#: templates/calendar.php:64
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Pogreška pri �itanju datoteke."
 
@@ -449,7 +449,7 @@ msgstr "Novi kalendar"
 msgid "Edit calendar"
 msgstr "Uredi kalendar"
 
-#: templates/part.editcalendar.php:12 templates/part.import.php:29
+#: templates/part.editcalendar.php:12
 msgid "Displayname"
 msgstr "Naziv"
 
@@ -575,36 +575,36 @@ msgid "Description of the Event"
 msgstr "Opis događaja"
 
 #: templates/part.import.php:1
-msgid "Import Ical File"
-msgstr "Uvoz Ical datoteke"
-
-#: templates/part.import.php:4
-msgid "How to import the new calendar?"
-msgstr "Kako uvesti novi kalendar?"
+msgid "Import a calendar file"
+msgstr ""
 
 #: templates/part.import.php:6
-msgid "Import into an existing calendar"
-msgstr "Uvoz u postojeći kalendar"
-
-#: templates/part.import.php:7
-msgid "Import into a new calendar"
-msgstr "Uvoz u novi kalendar"
-
-#: templates/part.import.php:10
 msgid "Please choose the calendar"
 msgstr "Odaberite kalendar"
 
-#: templates/part.import.php:20 templates/part.import.php:37
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
 msgid "Import"
 msgstr "Uvoz"
 
-#: templates/part.import.php:22 templates/part.import.php:39
-msgid "Back"
-msgstr "Natrag"
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
 
-#: templates/part.import.php:25
-msgid "Please fill out the form"
-msgstr "Molimo popunite obrazac"
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index e722369c0d5..3df2758e0ca 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/team/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
@@ -26,29 +70,25 @@ msgstr "Ovo nije vaš adresar."
 msgid "Contact could not be found."
 msgstr "Kontakt ne postoji."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "Nemoguće pro�itati vCard."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacija o vCard je neispravna. Osvježite stranicu."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizacija"
@@ -85,6 +125,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Pager"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Ovo nije vaš kontakt."
@@ -97,68 +141,64 @@ msgstr "Ova kartica nije sukladna prema RFC direktivama."
 msgid "This card does not contain a photo."
 msgstr "Ova kartica ne sadrži fotografiju."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Grupa"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Naziv"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Poštanski Pretinac"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Prošireno"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Ulica"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Grad"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Regija"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Poštanski broj"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Država"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Izradi Kontakt"
 
@@ -167,7 +207,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -189,15 +228,23 @@ msgid "Delete"
 msgstr "Obriši"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -236,4 +283,8 @@ msgstr "Telefon"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/hr/gallery.po b/l10n/hr/gallery.po
new file mode 100644
index 00000000000..fba00795844
--- /dev/null
+++ b/l10n/hr/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/team/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/hu_HU/calendar.po b/l10n/hu_HU/calendar.po
index aee11c9a501..5e36feb430d 100644
--- a/l10n/hu_HU/calendar.po
+++ b/l10n/hu_HU/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-07 18:29+0100\n"
-"PO-Revision-Date: 2012-01-08 08:41+0000\n"
-"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/team/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -315,27 +315,27 @@ msgstr "Az esemény véget ér a kezdés előtt."
 msgid "There was a database fail"
 msgstr "Adatbázis hiba történt"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:52
 msgid "Week"
 msgstr "Hét"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Hónap"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:54
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:45
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Ma"
 
-#: templates/calendar.php:46
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Naptárak"
 
-#: templates/calendar.php:64
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Probléma volt a fájl elemzése közben."
 
@@ -449,7 +449,7 @@ msgstr "Új naptár"
 msgid "Edit calendar"
 msgstr "Naptár szerkesztése"
 
-#: templates/part.editcalendar.php:12 templates/part.import.php:29
+#: templates/part.editcalendar.php:12
 msgid "Displayname"
 msgstr "Megjelenítési név"
 
@@ -575,36 +575,36 @@ msgid "Description of the Event"
 msgstr "Az esemény leírása"
 
 #: templates/part.import.php:1
-msgid "Import Ical File"
-msgstr "Ical fájl importálása"
-
-#: templates/part.import.php:4
-msgid "How to import the new calendar?"
-msgstr "Hogyan legyen importálva az új naptár?"
+msgid "Import a calendar file"
+msgstr ""
 
 #: templates/part.import.php:6
-msgid "Import into an existing calendar"
-msgstr "Létező naptárba importálás"
-
-#: templates/part.import.php:7
-msgid "Import into a new calendar"
-msgstr "Új naptárba importálás"
-
-#: templates/part.import.php:10
 msgid "Please choose the calendar"
 msgstr "Válassz naptárat"
 
-#: templates/part.import.php:20 templates/part.import.php:37
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
 msgid "Import"
 msgstr "Importálás"
 
-#: templates/part.import.php:22 templates/part.import.php:39
-msgid "Back"
-msgstr "Vissza"
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
 
-#: templates/part.import.php:25
-msgid "Please fill out the form"
-msgstr "Töltsd ki az űrlapot"
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index 463190e33fc..b4e5d034ecb 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/team/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,50 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Ez nem a te címjegyzéked."
@@ -27,29 +71,25 @@ msgstr "Ez nem a te címjegyzéked."
 msgid "Contact could not be found."
 msgstr "Kapcsolat nem található."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "A vCard-ot nem lehet olvasni."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A vCardról szóló információ helytelen. Töltsd újra az oldalt."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Cím"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefonszám"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizáció"
@@ -86,6 +126,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Lapozó"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Nem a te kapcsolatod."
@@ -98,68 +142,64 @@ msgstr "A kártya nem RFC kompatibilis."
 msgid "This card does not contain a photo."
 msgstr "A kártya nem tartlmaz fényképet."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Kontakt hozzáadása"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Csoport"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Név"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Postafiók"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Kiterjesztett"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Utca"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Helység"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Megye"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Irányítószám"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Ország"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Kontakt létrehozása"
 
@@ -168,7 +208,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -190,15 +229,23 @@ msgid "Delete"
 msgstr "Törlés"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -237,4 +284,8 @@ msgstr "Telefonszám"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/hu_HU/gallery.po b/l10n/hu_HU/gallery.po
new file mode 100644
index 00000000000..96eb6168cac
--- /dev/null
+++ b/l10n/hu_HU/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/team/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/hy/calendar.po b/l10n/hy/calendar.po
index b3a8dbbe07b..c89b61f035d 100644
--- a/l10n/hy/calendar.po
+++ b/l10n/hy/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-07 18:29+0100\n"
-"PO-Revision-Date: 2012-01-08 08:41+0000\n"
-"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/team/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -315,27 +315,27 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:52
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Ô±Õ´Õ«Õ½"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:54
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:45
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Ô±ÕµÕ½Ö…Ö€"
 
-#: templates/calendar.php:46
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr ""
 
-#: templates/calendar.php:64
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr ""
 
@@ -449,7 +449,7 @@ msgstr ""
 msgid "Edit calendar"
 msgstr ""
 
-#: templates/part.editcalendar.php:12 templates/part.import.php:29
+#: templates/part.editcalendar.php:12
 msgid "Displayname"
 msgstr ""
 
@@ -575,35 +575,35 @@ msgid "Description of the Event"
 msgstr ""
 
 #: templates/part.import.php:1
-msgid "Import Ical File"
-msgstr ""
-
-#: templates/part.import.php:4
-msgid "How to import the new calendar?"
+msgid "Import a calendar file"
 msgstr ""
 
 #: templates/part.import.php:6
-msgid "Import into an existing calendar"
+msgid "Please choose the calendar"
 msgstr ""
 
-#: templates/part.import.php:7
-msgid "Import into a new calendar"
+#: templates/part.import.php:10
+msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.import.php:10
-msgid "Please choose the calendar"
+#: templates/part.import.php:15
+msgid "Name of new calendar"
 msgstr ""
 
-#: templates/part.import.php:20 templates/part.import.php:37
+#: templates/part.import.php:17
 msgid "Import"
 msgstr ""
 
-#: templates/part.import.php:22 templates/part.import.php:39
-msgid "Back"
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
 msgstr ""
 
-#: templates/part.import.php:25
-msgid "Please fill out the form"
+#: templates/part.import.php:24
+msgid "Close Dialog"
 msgstr ""
 
 #: templates/part.newevent.php:1
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index f4a8aac2cd5..53d8557da1b 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/team/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr ""
@@ -25,29 +69,25 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr ""
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr ""
@@ -84,6 +124,10 @@ msgstr ""
 msgid "Pager"
 msgstr ""
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr ""
@@ -96,68 +140,64 @@ msgstr ""
 msgid "This card does not contain a photo."
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
+msgid "Addressbook"
 msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr ""
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr ""
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr ""
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr ""
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr ""
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr ""
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr ""
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr ""
 
@@ -166,7 +206,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -188,15 +227,23 @@ msgid "Delete"
 msgstr ""
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -235,4 +282,8 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/hy/gallery.po b/l10n/hy/gallery.po
new file mode 100644
index 00000000000..c1a1f43fe7d
--- /dev/null
+++ b/l10n/hy/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/team/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/ia/calendar.po b/l10n/ia/calendar.po
index da2e4a59022..9cdf15555b7 100644
--- a/l10n/ia/calendar.po
+++ b/l10n/ia/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-07 18:29+0100\n"
-"PO-Revision-Date: 2012-01-08 08:41+0000\n"
-"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/team/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -315,27 +315,27 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:52
 msgid "Week"
 msgstr "Septimana"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Mense"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:54
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:45
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Hodie"
 
-#: templates/calendar.php:46
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Calendarios"
 
-#: templates/calendar.php:64
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr ""
 
@@ -449,7 +449,7 @@ msgstr ""
 msgid "Edit calendar"
 msgstr "Modificar calendario"
 
-#: templates/part.editcalendar.php:12 templates/part.import.php:29
+#: templates/part.editcalendar.php:12
 msgid "Displayname"
 msgstr ""
 
@@ -575,35 +575,35 @@ msgid "Description of the Event"
 msgstr ""
 
 #: templates/part.import.php:1
-msgid "Import Ical File"
-msgstr ""
-
-#: templates/part.import.php:4
-msgid "How to import the new calendar?"
+msgid "Import a calendar file"
 msgstr ""
 
 #: templates/part.import.php:6
-msgid "Import into an existing calendar"
+msgid "Please choose the calendar"
 msgstr ""
 
-#: templates/part.import.php:7
-msgid "Import into a new calendar"
+#: templates/part.import.php:10
+msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.import.php:10
-msgid "Please choose the calendar"
+#: templates/part.import.php:15
+msgid "Name of new calendar"
 msgstr ""
 
-#: templates/part.import.php:20 templates/part.import.php:37
+#: templates/part.import.php:17
 msgid "Import"
 msgstr ""
 
-#: templates/part.import.php:22 templates/part.import.php:39
-msgid "Back"
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
 msgstr ""
 
-#: templates/part.import.php:25
-msgid "Please fill out the form"
+#: templates/part.import.php:24
+msgid "Close Dialog"
 msgstr ""
 
 #: templates/part.newevent.php:1
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index 89f2366ca88..6958d64a4b9 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/team/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,50 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Iste non es tu libro de adresses"
@@ -27,29 +71,25 @@ msgstr "Iste non es tu libro de adresses"
 msgid "Contact could not be found."
 msgstr "Contacto non poterea esser legite"
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "vCard non poterea esser legite."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telephono"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-posta"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organisation"
@@ -86,6 +126,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Pager"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Iste non es tu contacto"
@@ -98,68 +142,64 @@ msgstr "Iste carta non es compatibile con RFC"
 msgid "This card does not contain a photo."
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Adder contacto"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Gruppo"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Nomine"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Cassa postal"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr ""
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Strata"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Citate"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Region"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Codice postal"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Pais"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Crear contacto"
 
@@ -168,7 +208,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -190,15 +229,23 @@ msgid "Delete"
 msgstr "Deler"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -237,4 +284,8 @@ msgstr "Phono"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/ia/gallery.po b/l10n/ia/gallery.po
new file mode 100644
index 00000000000..76db89533ff
--- /dev/null
+++ b/l10n/ia/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/team/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/id/calendar.po b/l10n/id/calendar.po
index 56e64399dd0..ac9956f71b3 100644
--- a/l10n/id/calendar.po
+++ b/l10n/id/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,321 +18,403 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Kesalahan otentikasi"
-
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Zona waktu telah diubah"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "Permintaan tidak sah"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Kalender"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr ""
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
 msgstr ""
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
 msgstr ""
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
 msgstr ""
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
 msgstr ""
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
 msgstr ""
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
 msgstr ""
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
 msgstr ""
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
 msgstr ""
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
 msgstr ""
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
 msgstr ""
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
 msgstr ""
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
 msgstr ""
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
 msgstr ""
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
 msgstr ""
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
 msgstr ""
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "Tidak akan mengulangi"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Harian"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "Mingguan"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "Setiap Hari Minggu"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "Dwi-mingguan"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "Bulanan"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "Tahunan"
 
-#: lib/object.php:337
-msgid "Not an array"
+#: lib/object.php:366
+msgid "never"
 msgstr ""
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Semua Hari"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Minggu"
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr "Senin"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr "Selasa"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr "Rabu"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr "Kamis"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr "Jumat"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr "Sabtu"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "Min."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Sen."
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Sel."
+#: lib/object.php:397
+msgid "first"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Rab."
+#: lib/object.php:398
+msgid "second"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Kam."
+#: lib/object.php:399
+msgid "third"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Jum."
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Sab."
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr "Januari"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr "Februari"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr "Maret"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr "April"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr "Mei"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr "Juni"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr "Juli"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr "Agustus"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr "September"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr "Oktober"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr "November"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr "Desember"
-
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr "Jan."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr "Feb."
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr "Mar."
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr "Apr."
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "May."
+#: lib/object.php:444
+msgid "by day and month"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jun."
-msgstr "Jun."
+#: lib/object.php:467
+msgid "Not an array"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jul."
-msgstr "Jul."
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Aug."
-msgstr "Agu."
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Sep."
-msgstr "Sep."
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Semua Hari"
 
-#: templates/calendar.php:35
-msgid "Oct."
-msgstr "Okt."
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Nov."
-msgstr "Nov."
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Judul"
 
-#: templates/calendar.php:35
-msgid "Dec."
-msgstr "Des."
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr ""
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Minggu"
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr ""
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Minggu"
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr ""
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
+#: templates/calendar.php:17
+msgid "To Time"
 msgstr ""
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
 msgstr ""
 
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Hari"
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr ""
 
 #: templates/calendar.php:52
+msgid "Week"
+msgstr "Minggu"
+
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Bulan"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:54
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:58
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Hari ini"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Kalender"
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Waktu"
-
-#: templates/calendar.php:169
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Terjadi kesalahan, saat mengurai berkas."
 
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Pilih kalender aktif"
@@ -351,12 +433,11 @@ msgid "Download"
 msgstr "Unduh"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Sunting"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
 msgstr ""
 
@@ -376,90 +457,181 @@ msgstr "Namatampilan"
 msgid "Active"
 msgstr "Aktif"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Deskripsi"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Warna kalender"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
 msgstr ""
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Sampaikan"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
 msgstr ""
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Sunting agenda"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Judul"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "Judul Agenda"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Lokasi"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Lokasi Agenda"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Kategori"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
 msgstr ""
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Agenda di Semua Hari"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "Dari"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "Ke"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Ulangi"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Yang menghadiri"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Lokasi"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Lokasi Agenda"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Deskripsi"
+
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Deskripsi dari Agenda"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Tutup"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Buat agenda baru"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Zonawaktu"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index 5ae316e2e11..d78cbcd9b18 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr ""
@@ -25,29 +69,25 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr ""
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr ""
@@ -84,6 +124,10 @@ msgstr ""
 msgid "Pager"
 msgstr ""
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr ""
@@ -96,68 +140,64 @@ msgstr ""
 msgid "This card does not contain a photo."
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
+msgid "Addressbook"
 msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr ""
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr ""
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr ""
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr ""
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr ""
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr ""
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr ""
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr ""
 
@@ -166,7 +206,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -188,15 +227,23 @@ msgid "Delete"
 msgstr ""
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -235,4 +282,8 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/id/gallery.po b/l10n/id/gallery.po
new file mode 100644
index 00000000000..058bc22ba9b
--- /dev/null
+++ b/l10n/id/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/it/calendar.po b/l10n/it/calendar.po
index fab6060c487..cd96af7425d 100644
--- a/l10n/it/calendar.po
+++ b/l10n/it/calendar.po
@@ -3,16 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Andrea Scarpino <andrea@archlinux.org>, 2011.
 #   <cosenal@gmail.com>, 2011.
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
+# Lorenzo Beltrami <lorenzo.beba@gmail.com>, 2011.
+#   <marco@carnazzo.it>, 2011, 2012.
 #   <rb.colombo@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,321 +23,403 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Errore di autenticazione"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr "Nuovo fuso orario:"
 
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
-msgstr "Calendario sbagliato"
-
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Fuso orario cambiato"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
-msgstr "Richiesta non validia"
+msgstr "Richiesta non valida"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Calendario"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Calendario sbagliato"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
 msgstr "Compleanno"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
 msgstr "Azienda"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
 msgstr "Chiama"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
 msgstr "Clienti"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
 msgstr "Consegna"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
 msgstr "Vacanze"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
 msgstr "Idee"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
 msgstr "Viaggio"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
 msgstr "Anniversario"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
 msgstr "Riunione"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
 msgstr "Altro"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
 msgstr "Personale"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
 msgstr "Progetti"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
 msgstr "Domande"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
 msgstr "Lavoro"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "Non ripetere"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Giornaliero"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "Settimanale"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "Ogni settimana"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "Ogni due settimane"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "Mensile"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "Annuale"
 
-#: lib/object.php:337
-msgid "Not an array"
-msgstr "Non è un array"
+#: lib/object.php:366
+msgid "never"
+msgstr "mai"
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Tutti i giorni"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr "per occorrenze"
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Domenica"
+#: lib/object.php:368
+msgid "by date"
+msgstr "per data"
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr "per giorno del mese"
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr "per giorno della settimana"
 
-#: templates/calendar.php:32
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
 msgstr "Lunedì"
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
 msgstr "Martedì"
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
 msgstr "Mercoledì"
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
 msgstr "Venerdì"
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
 msgstr "Sabato"
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "Dom."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr "Domenica"
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Lun."
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Mar."
+#: lib/object.php:397
+msgid "first"
+msgstr "primo"
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Mer."
+#: lib/object.php:398
+msgid "second"
+msgstr "secondo"
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Gio."
+#: lib/object.php:399
+msgid "third"
+msgstr "terzo"
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Ven."
+#: lib/object.php:400
+msgid "fourth"
+msgstr "quarto"
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Sab."
+#: lib/object.php:401
+msgid "fifth"
+msgstr "quinto"
+
+#: lib/object.php:402
+msgid "last"
+msgstr "ultimo"
 
-#: templates/calendar.php:34
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
 msgstr "Gennaio"
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
 msgstr "Febbraio"
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
 msgstr "Marzo"
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
 msgstr "Aprile"
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
 msgstr "Maggio"
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
 msgstr "Giugno"
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
 msgstr "Luglio"
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
 msgstr "Agosto"
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
 msgstr "Settembre"
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
 msgstr "Ottobre"
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
 msgstr "Novembre"
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
 msgstr "Dicembre"
 
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr "Gen."
-
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr "Feb."
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr "Mar."
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr "Apr."
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "May."
-msgstr "Maggio."
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jun."
-msgstr "Giu."
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Non è un array"
 
-#: templates/calendar.php:35
-msgid "Jul."
-msgstr "Lug."
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr "Data"
 
-#: templates/calendar.php:35
-msgid "Aug."
-msgstr "Ago."
+#: lib/search.php:40
+msgid "Cal."
+msgstr "Cal."
 
-#: templates/calendar.php:35
-msgid "Sep."
-msgstr "Set."
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Tutti i giorni"
 
-#: templates/calendar.php:35
-msgid "Oct."
-msgstr "Ott."
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Campi mancanti"
 
-#: templates/calendar.php:35
-msgid "Nov."
-msgstr "Nov."
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Titolo"
 
-#: templates/calendar.php:35
-msgid "Dec."
-msgstr "Dic."
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Dal giorno"
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Settimana"
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Ora inizio"
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Settimane"
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "al giorno"
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr "Prima di {startdate}"
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Ora fine"
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr "Dopo {enddate}"
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "L'evento finisce prima d'iniziare"
 
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Giorno"
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "C'è stato un errore col database"
 
 #: templates/calendar.php:52
+msgid "Week"
+msgstr "Settimana"
+
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Mese"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:54
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:58
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Oggi"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Calendari"
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Ora"
-
-#: templates/calendar.php:169
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "C'è stato un errore nel parsing del file."
 
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Selezionare calendari attivi"
@@ -353,14 +438,13 @@ msgid "Download"
 msgstr "Download"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Modifica"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Elimina"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -378,90 +462,181 @@ msgstr "Mostra nome"
 msgid "Active"
 msgstr "Attivo"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Descrizione"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Colore calendario"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
 msgstr "Salva"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Invia"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
 msgstr "Annulla"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Modifica evento"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Titolo"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Esporta"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "Titolo evento"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Luogo"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Luogo evento"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Categoria"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
 msgstr "Seleziona categoria"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Tutti gli eventi del giorno"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "Da"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "A"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Opzioni avanzate"
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Ripeti"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Partecipanti"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr "Seleziona i giorni della settimana"
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr "Seleziona i giorni"
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr "Seleziona i mesi"
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr "Seleziona le settimane"
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr "Intervallo"
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr "Fine"
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Luogo"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Luogo evento"
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Descrizione"
+
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Descrizione evento"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Chiuso"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "Per favore scegli il calendario"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "Importa"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Crea evento"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
-msgstr "Timezone"
+msgstr "Fuso orario"
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr "Controlla sempre i cambiamenti di fuso orario"
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Formato ora"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Indirizzo sincronizzazione calendario CalDAV:"
 
 
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 9a88c328e49..cee00f2bbdc 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
-#   <marco@carnazzo.it>, 2011.
+#   <marco@carnazzo.it>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,50 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Questa non è la tua rubrica."
@@ -27,29 +71,25 @@ msgstr "Questa non è la tua rubrica."
 msgid "Contact could not be found."
 msgstr "Il contatto non può essere trovato"
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "La vCard non può essere letta"
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informazioni sulla vCard incorrette. Ricaricare la pagina."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Indirizzo"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizzazione"
@@ -86,6 +126,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Cercapersone"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Questo non è un tuo contatto."
@@ -98,88 +142,83 @@ msgstr "Questa card non è compatibile con il protocollo RFC."
 msgid "This card does not contain a photo."
 msgstr "Questa card non contiene una foto."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Aggiungi contatto"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Gruppo"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Nome"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Casella postale"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Estendi"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Via"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Città"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Regione"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "CAP"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Stato"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Crea contatto"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Seleziona le rubriche attive"
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
-msgstr ""
+msgstr "Nuova rubrica"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "Link CardDav"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "Scarica"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -190,36 +229,44 @@ msgid "Delete"
 msgstr "Cancella"
 
 #: templates/part.details.php:3
-msgid "Delete contact"
+msgid "Download contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:4
+msgid "Delete contact"
+msgstr "Cancella contatto"
+
+#: templates/part.details.php:34
 msgid "Add"
+msgstr "Aggiungi"
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Nome da mostrare"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Attiva"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Salva"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Conferma"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Annulla"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -227,7 +274,7 @@ msgstr "Compleanno"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Preferito"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -235,6 +282,10 @@ msgstr "Telefono"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
+msgstr "Aggiorna"
+
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
 msgstr ""
 
 
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 369e41fd05b..addabc52510 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -5,15 +5,15 @@
 # Translators:
 #   <cosenal@gmail.com>, 2011.
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
-#   <marco@carnazzo.it>, 2011.
+#   <marco@carnazzo.it>, 2011, 2012.
 #   <rb.colombo@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-12 20:51+0000\n"
+"Last-Translator: ufic <marco@carnazzo.it>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,11 +23,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Azzera la password di Owncloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Usa il link seguente per azzerare la password: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -56,7 +56,7 @@ msgstr "La password è stata reimpostata"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Alla pagina di ingresso"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -137,7 +137,7 @@ msgstr "Termina"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "Servizi web nelle tue mani"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -157,7 +157,7 @@ msgstr "ricorda"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Entra"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 30aeedd1997..55c4e07c0ec 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <cosenal@gmail.com>, 2011.
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
+#   <marco@carnazzo.it>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-12 20:53+0000\n"
+"Last-Translator: ufic <marco@carnazzo.it>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,19 +57,19 @@ msgstr "Dimensione massima upload"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Nuovo"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "File di testo"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Cartella"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "Dal web"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/it/gallery.po b/l10n/it/gallery.po
new file mode 100644
index 00000000000..4dffa1257dc
--- /dev/null
+++ b/l10n/it/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 64402b03520..6f2cf988163 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -5,15 +5,15 @@
 # Translators:
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
-#   <marco@carnazzo.it>, 2011.
+#   <marco@carnazzo.it>, 2011, 2012.
 #   <rb.colombo@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-12 20:56+0000\n"
+"Last-Translator: ufic <marco@carnazzo.it>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +23,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "email modificata"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -39,7 +39,7 @@ msgstr "Lingua modificata"
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Livello di log"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -107,15 +107,15 @@ msgstr "Modifica password"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Il tuo indirizzo email"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Inserici il tuo indirizzo email per abilitare il recupero password"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -123,7 +123,7 @@ msgstr "Lingua"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Migliora la traduzione"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -149,7 +149,7 @@ msgstr "Crea"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Quota"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/ja_JP/calendar.po b/l10n/ja_JP/calendar.po
index 31c287da115..fc03639a996 100644
--- a/l10n/ja_JP/calendar.po
+++ b/l10n/ja_JP/calendar.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-07 18:29+0100\n"
-"PO-Revision-Date: 2012-01-08 08:41+0000\n"
-"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -314,27 +314,27 @@ msgstr "イベント終了時間�開始時間より先��"
 msgid "There was a database fail"
 msgstr "データベースフェイル��り���"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:52
 msgid "Week"
 msgstr "週"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "月"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:54
 msgid "List"
 msgstr "リスト"
 
-#: templates/calendar.php:45
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "今日"
 
-#: templates/calendar.php:46
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "カレンダー"
 
-#: templates/calendar.php:64
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "ファイルを構文解��る際�失敗����"
 
@@ -448,7 +448,7 @@ msgstr "新��カレンダーを作��る"
 msgid "Edit calendar"
 msgstr "カレンダーを編集"
 
-#: templates/part.editcalendar.php:12 templates/part.import.php:29
+#: templates/part.editcalendar.php:12
 msgid "Displayname"
 msgstr "表示�"
 
@@ -574,36 +574,36 @@ msgid "Description of the Event"
 msgstr "イベント�メモ"
 
 #: templates/part.import.php:1
-msgid "Import Ical File"
-msgstr "iCalファイル�イン�ート"
-
-#: templates/part.import.php:4
-msgid "How to import the new calendar?"
-msgstr "新��カレンダー�イン�ート方法�？"
+msgid "Import a calendar file"
+msgstr ""
 
 #: templates/part.import.php:6
-msgid "Import into an existing calendar"
-msgstr "既存カレンダー�イン�ート���"
-
-#: templates/part.import.php:7
-msgid "Import into a new calendar"
-msgstr "新��カレンダー�イン�ート���"
-
-#: templates/part.import.php:10
 msgid "Please choose the calendar"
 msgstr "カレンダーを�択������"
 
-#: templates/part.import.php:20 templates/part.import.php:37
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
 msgid "Import"
 msgstr "イン�ート"
 
-#: templates/part.import.php:22 templates/part.import.php:39
-msgid "Back"
-msgstr "戻る"
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
 
-#: templates/part.import.php:25
-msgid "Please fill out the form"
-msgstr "フォーム�入力������"
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index c0c91102cd9..e9ae1beecf7 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "�れ�����電話帳���り��ん。"
@@ -25,29 +69,25 @@ msgstr "�れ�����電話帳���り��ん。"
 msgid "Contact could not be found."
 msgstr "連絡先を見��る事�����ん。"
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "vCard�読�込��失敗����。"
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard�情報�誤り��り��。ページをリロード��下��。"
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "�所"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "電話番�"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "メールアドレス"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "所属"
@@ -84,6 +124,10 @@ msgstr "テレビ電話"
 msgid "Pager"
 msgstr "�ケベル"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "����連絡先���り��ん。"
@@ -96,68 +140,64 @@ msgstr "��カード�RFC�準拠�����ん。"
 msgid "This card does not contain a photo."
 msgstr "��カード�写真を�ん��り��ん。"
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "連絡先�追加"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "グループ"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "��"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "�書箱"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "拡張番地"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "街路番地"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "都市"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "地域"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "郵便番�"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "国�"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "追加"
 
@@ -166,7 +206,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -188,15 +227,23 @@ msgid "Delete"
 msgstr "削除"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -235,4 +282,8 @@ msgstr "電話番�"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/ja_JP/gallery.po b/l10n/ja_JP/gallery.po
new file mode 100644
index 00000000000..d6ba590cba6
--- /dev/null
+++ b/l10n/ja_JP/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/lb/calendar.po b/l10n/lb/calendar.po
index 9aea18b69ac..b65ae8ac132 100644
--- a/l10n/lb/calendar.po
+++ b/l10n/lb/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/team/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,351 +18,432 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Authentifizéierung's Feeler"
-
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Zäitzon geännert"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "Ongülteg Requête"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Kalenner"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Falschen Kalenner"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
-msgstr ""
+msgstr "Gebuertsdag"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
-msgstr ""
+msgstr "Geschäftlech"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
-msgstr ""
+msgstr "Uruff"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
-msgstr ""
+msgstr "Clienten"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
-msgstr ""
+msgstr "Liwwerant"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
-msgstr ""
+msgstr "Vakanzen"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
-msgstr ""
+msgstr "Ideeën"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
-msgstr ""
+msgstr "Dag"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
-msgstr ""
+msgstr "Jubiläum"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
-msgstr ""
+msgstr "Meeting"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
-msgstr ""
+msgstr "Aner"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
-msgstr ""
+msgstr "Perséinlech"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
-msgstr ""
+msgstr "Projeten"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
-msgstr ""
+msgstr "Froen"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
-msgstr ""
+msgstr "Aarbecht"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "Widderhëlt sech net"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Deeglech"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "All Woch"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "All Wochendag"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "All zweet Woch"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "All Mount"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "All Joer"
 
-#: lib/object.php:337
-msgid "Not an array"
+#: lib/object.php:366
+msgid "never"
 msgstr ""
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "All Dag"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Sonnden"
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr "Méinden"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr "Dënschden"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr "Mëttwoch"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr "Donneschden"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr "Freiden"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr "Samschden"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "So. "
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Méin. "
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Dën."
+#: lib/object.php:397
+msgid "first"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Mëtt."
+#: lib/object.php:398
+msgid "second"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Do."
+#: lib/object.php:399
+msgid "third"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Fr."
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Sam."
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr "Januar"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr "Februar"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr "Mäerz"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr "Abrëll"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr "Mäi"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr "Juni"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr "Juli"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr "August"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr "September"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr "Oktober"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr "November"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr "Dezember"
-
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr "Jan."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr "Feb."
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr "Mär."
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr "Abr."
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "May."
+#: lib/object.php:444
+msgid "by day and month"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jun."
-msgstr "Jun."
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Keen array"
 
-#: templates/calendar.php:35
-msgid "Jul."
-msgstr "Jul."
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Aug."
-msgstr "Aug."
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Sep."
-msgstr "Sep."
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "All Dag"
 
-#: templates/calendar.php:35
-msgid "Oct."
-msgstr "Okt."
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Felder déi feelen"
 
-#: templates/calendar.php:35
-msgid "Nov."
-msgstr "Nov."
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Titel"
 
-#: templates/calendar.php:35
-msgid "Dec."
-msgstr "Dez."
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Vun Datum"
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Woch"
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Vun Zäit"
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Wochen"
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Bis Datum"
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr ""
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Bis Zäit"
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr ""
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "D'Evenement hält op ier et ufänkt"
 
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Dag"
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "En Datebank Feeler ass opgetrueden"
 
 #: templates/calendar.php:52
+msgid "Week"
+msgstr "Woch"
+
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Mount"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:54
 msgid "List"
-msgstr ""
+msgstr "Lescht"
 
-#: templates/calendar.php:58
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Haut"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Kalenneren"
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Zäit"
-
-#: templates/calendar.php:169
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Feeler beim lueden vum Fichier."
 
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Wiel aktiv Kalenneren aus"
 
 #: templates/part.choosecalendar.php:15
 msgid "New Calendar"
-msgstr ""
+msgstr "Neien Kalenner"
 
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr ""
+msgstr "CalDav Link"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
 msgstr "Eroflueden"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Editéieren"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Läschen"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "Neien Kalenner"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
@@ -376,90 +457,181 @@ msgstr "Numm"
 msgid "Active"
 msgstr "Aktiv"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Beschreiwung"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Fuerf vum Kalenner"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Späicheren"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Fortschécken"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Ofbriechen"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Evenement editéieren"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Titel"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Export"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "Titel vum Evenement"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Uert"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Uert vum Evenement"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Kategorie"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
-msgstr ""
+msgstr "Kategorie auswielen"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Ganz-Dag Evenement"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "Vun"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "Fir"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Avancéiert Optiounen"
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Widderhuelen"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Participanten"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Uert"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Uert vum Evenement"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Beschreiwung"
+
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Beschreiwung vum Evenement"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Zoumaachen"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "Wiel den Kalenner aus"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "Import"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "En Evenement maachen"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Zäitzon"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Zäit Format"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "CalDAV Kalenner Synchronisatioun's Adress:"
+
 
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index f0dae69e7d1..54489a11088 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/team/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Dat do ass net däin Adressbuch."
@@ -26,29 +70,25 @@ msgstr "Dat do ass net däin Adressbuch."
 msgid "Contact could not be found."
 msgstr "Konnt den Kontakt net fannen."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "vCard konnt net gelies ginn."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon's Nummer"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Firma"
@@ -85,6 +125,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Pager"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Dat do ass net däin Kontakt."
@@ -97,68 +141,64 @@ msgstr "Déi do Kaart ass net RFC kompatibel."
 msgid "This card does not contain a photo."
 msgstr "Déi do Kaart huet keng Foto."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Kontakt bäisetzen"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Grupp"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Numm"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Postleetzuel"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Erweidert"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Strooss"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Staat"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Regioun"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Postleetzuel"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Land"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Kontakt erstellen"
 
@@ -167,7 +207,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -189,15 +228,23 @@ msgid "Delete"
 msgstr "Läschen"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -236,4 +283,8 @@ msgstr "Telefon"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/lb/gallery.po b/l10n/lb/gallery.po
new file mode 100644
index 00000000000..6479414e17a
--- /dev/null
+++ b/l10n/lb/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/team/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/lt_LT/calendar.po b/l10n/lt_LT/calendar.po
index 0a1fbf9cd30..d26b774fbbb 100644
--- a/l10n/lt_LT/calendar.po
+++ b/l10n/lt_LT/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-07 18:29+0100\n"
-"PO-Revision-Date: 2012-01-08 08:41+0000\n"
-"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/team/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -315,27 +315,27 @@ msgstr "Įvykis baigiasi anks�iau nei jis prasideda"
 msgid "There was a database fail"
 msgstr "Įvyko duomenų bazės klaida"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:52
 msgid "Week"
 msgstr "SavaitÄ—"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "MÄ—nuo"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:54
 msgid "List"
 msgstr "Sąrašas"
 
-#: templates/calendar.php:45
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Å iandien"
 
-#: templates/calendar.php:46
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Kalendoriai"
 
-#: templates/calendar.php:64
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Apdorojant failą įvyko klaida."
 
@@ -449,7 +449,7 @@ msgstr "Naujas kalendorius"
 msgid "Edit calendar"
 msgstr "Taisyti kalendorių"
 
-#: templates/part.editcalendar.php:12 templates/part.import.php:29
+#: templates/part.editcalendar.php:12
 msgid "Displayname"
 msgstr "Pavadinimas"
 
@@ -575,36 +575,36 @@ msgid "Description of the Event"
 msgstr "Įvykio aprašymas"
 
 #: templates/part.import.php:1
-msgid "Import Ical File"
-msgstr "Importuoti Ical failÄ…"
-
-#: templates/part.import.php:4
-msgid "How to import the new calendar?"
-msgstr "Kaip importuoti naują kalendorių?"
+msgid "Import a calendar file"
+msgstr ""
 
 #: templates/part.import.php:6
-msgid "Import into an existing calendar"
-msgstr "Importuoti į esantį katalogą"
-
-#: templates/part.import.php:7
-msgid "Import into a new calendar"
-msgstr "Importuoti į naują kalendorių"
-
-#: templates/part.import.php:10
 msgid "Please choose the calendar"
 msgstr "Pasirinkite kalendorių"
 
-#: templates/part.import.php:20 templates/part.import.php:37
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
 msgid "Import"
 msgstr "Importuoti"
 
-#: templates/part.import.php:22 templates/part.import.php:39
-msgid "Back"
-msgstr "Atgal"
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
 
-#: templates/part.import.php:25
-msgid "Please fill out the form"
-msgstr "Užpildykite formą"
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index 4e57c2a6575..1180c2251c5 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/team/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Tai ne jūsų adresų knygelė."
@@ -26,29 +70,25 @@ msgstr "Tai ne jūsų adresų knygelė."
 msgid "Contact could not be found."
 msgstr "Kontaktas nerastas"
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "Nenuskaitoma vCard."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacija apie vCard yra neteisinga. "
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresas"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefonas"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "El. paštas"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizacija"
@@ -85,6 +125,10 @@ msgstr "Vaizdo"
 msgid "Pager"
 msgstr "Pranešimų gaviklis"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Tai ne jūsų kontaktas"
@@ -97,68 +141,64 @@ msgstr ""
 msgid "This card does not contain a photo."
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "PridÄ—ti kontaktÄ…"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "GrupÄ—"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Vardas"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Pašto dėžutė"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr ""
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "GatvÄ—"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Miestas"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Regionas"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Pašto indeksas"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Å alis"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Sukurti kontaktÄ…"
 
@@ -167,7 +207,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -189,15 +228,23 @@ msgid "Delete"
 msgstr "Trinti"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -236,4 +283,8 @@ msgstr "Telefonas"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/lt_LT/gallery.po b/l10n/lt_LT/gallery.po
new file mode 100644
index 00000000000..19ed976cf7a
--- /dev/null
+++ b/l10n/lt_LT/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/team/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/ms_MY/calendar.po b/l10n/ms_MY/calendar.po
index 24fa26eeda3..6ad7fe344e0 100644
--- a/l10n/ms_MY/calendar.po
+++ b/l10n/ms_MY/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/team/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,321 +18,403 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Ralat pengesahan"
-
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Zon waktu diubah"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "Permintaan tidak sah"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr ""
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
 msgstr ""
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
 msgstr ""
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
 msgstr ""
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
 msgstr ""
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
 msgstr ""
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
 msgstr ""
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
 msgstr ""
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
 msgstr ""
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
 msgstr ""
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
 msgstr ""
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
 msgstr ""
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
 msgstr ""
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
 msgstr ""
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
 msgstr ""
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
 msgstr ""
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "Tidak berulang"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Harian"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "Mingguan"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "Setiap hari minggu"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "Dua kali seminggu"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "Bulanan"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "Tahunan"
 
-#: lib/object.php:337
-msgid "Not an array"
+#: lib/object.php:366
+msgid "never"
 msgstr ""
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Sepanjang hari"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Ahad"
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr "Isnin"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr "Selasa"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr "Rabu"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr "Khamis"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr "Jumaat"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr "Sabtu"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "Ahad"
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Isnin"
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Selasa"
+#: lib/object.php:397
+msgid "first"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Rabu"
+#: lib/object.php:398
+msgid "second"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Khamis"
+#: lib/object.php:399
+msgid "third"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Jumaat"
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Sabtu"
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr "Januari"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr "Februari"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr "Mac"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr "April "
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr "Mei"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr "Jun"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr "Julai"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr "Ogos"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr "September"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr "Oktober"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr "November"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr "Disember"
-
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr "Jan"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr "Feb"
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr "Mac"
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr "Apr"
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "May."
+#: lib/object.php:444
+msgid "by day and month"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jun."
-msgstr "Jun"
+#: lib/object.php:467
+msgid "Not an array"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jul."
-msgstr "Jul"
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Aug."
-msgstr "Ogos"
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Sep."
-msgstr "Sep"
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Sepanjang hari"
 
-#: templates/calendar.php:35
-msgid "Oct."
-msgstr "Okt"
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Nov."
-msgstr "Nov"
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Tajuk"
 
-#: templates/calendar.php:35
-msgid "Dec."
-msgstr "Dis"
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr ""
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Minggu"
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr ""
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Minggu"
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr ""
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
+#: templates/calendar.php:17
+msgid "To Time"
 msgstr ""
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
 msgstr ""
 
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Hari"
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr ""
 
 #: templates/calendar.php:52
+msgid "Week"
+msgstr "Minggu"
+
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Bulan"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:54
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:58
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Hari ini"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Kalendar"
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Waktu"
-
-#: templates/calendar.php:169
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Berlaku kegagalan ketika penguraian fail. "
 
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Pilih kalendar yang aktif"
@@ -351,12 +433,11 @@ msgid "Download"
 msgstr "Muat turun"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Edit"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
 msgstr ""
 
@@ -376,90 +457,181 @@ msgstr "Paparan nama"
 msgid "Active"
 msgstr "Aktif"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Huraian"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Warna kalendar"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
 msgstr ""
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Hantar"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
 msgstr ""
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Edit agenda"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Tajuk"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "Tajuk agenda"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Lokasi"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Lokasi agenda"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "kategori"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
 msgstr ""
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Agenda di sepanjang hari "
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "Dari"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "ke"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Ulang"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Hadirin"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Lokasi"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Lokasi agenda"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Huraian"
+
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Huraian agenda"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Tutup"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Buat agenda baru"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Zon waktu"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index bf358898d49..56ebea52bbb 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/team/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr ""
@@ -25,29 +69,25 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr ""
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr ""
@@ -84,6 +124,10 @@ msgstr ""
 msgid "Pager"
 msgstr ""
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr ""
@@ -96,68 +140,64 @@ msgstr ""
 msgid "This card does not contain a photo."
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
+msgid "Addressbook"
 msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr ""
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr ""
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr ""
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr ""
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr ""
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr ""
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr ""
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr ""
 
@@ -166,7 +206,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -188,15 +227,23 @@ msgid "Delete"
 msgstr ""
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -235,4 +282,8 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/ms_MY/gallery.po b/l10n/ms_MY/gallery.po
new file mode 100644
index 00000000000..2aa2b4a3905
--- /dev/null
+++ b/l10n/ms_MY/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/team/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/nb_NO/calendar.po b/l10n/nb_NO/calendar.po
index b80bf9cbb76..3021b6bb4cb 100644
--- a/l10n/nb_NO/calendar.po
+++ b/l10n/nb_NO/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/team/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,321 +18,403 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Autentifikasjonsfeil"
-
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Tidssone endret"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "Ugyldig forespørsel"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Kalender"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr ""
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
 msgstr ""
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
 msgstr ""
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
 msgstr ""
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
 msgstr ""
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
 msgstr ""
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
 msgstr ""
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
 msgstr ""
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
 msgstr ""
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
 msgstr ""
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
 msgstr ""
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
 msgstr ""
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
 msgstr ""
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
 msgstr ""
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
 msgstr ""
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
 msgstr ""
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "Gjentas ikke"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Daglig"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "Ukentlig"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "Hver ukedag"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr ""
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "MÃ¥nedlig"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "Ã…rlig"
 
-#: lib/object.php:337
-msgid "Not an array"
+#: lib/object.php:366
+msgid "never"
 msgstr ""
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Hele dagen "
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Søndag"
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr "Mandag"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr "Tirsdag"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr "Onsdag"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr "Torsdag"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr "Fredag"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr "Lørdag"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "Sø."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Ma."
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Ti."
+#: lib/object.php:397
+msgid "first"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "On."
+#: lib/object.php:398
+msgid "second"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "To."
+#: lib/object.php:399
+msgid "third"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Fr."
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Lø."
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr "Januar"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr "Februar"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr "Mars"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr "April"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr "Mai"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr "Juni"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr "Juli"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr "August"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr "September"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr "Oktober"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr "November"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr "Desember"
-
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr "jan."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr "feb."
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr "mar."
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr "apr."
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "May."
+#: lib/object.php:444
+msgid "by day and month"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jun."
-msgstr "jun."
+#: lib/object.php:467
+msgid "Not an array"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jul."
-msgstr "jul."
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Aug."
-msgstr "aug."
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Sep."
-msgstr "sep."
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Hele dagen "
 
-#: templates/calendar.php:35
-msgid "Oct."
-msgstr "okt."
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Nov."
-msgstr "nov."
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Tittel"
 
-#: templates/calendar.php:35
-msgid "Dec."
-msgstr "des."
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr ""
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Uke"
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr ""
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Uke"
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr ""
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
+#: templates/calendar.php:17
+msgid "To Time"
 msgstr ""
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
 msgstr ""
 
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Dag"
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr ""
 
 #: templates/calendar.php:52
+msgid "Week"
+msgstr "Uke"
+
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "ned"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:54
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:58
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "I dag"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Kalendre"
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Tid"
-
-#: templates/calendar.php:169
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr ""
 
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Velg en aktiv kalender"
@@ -351,12 +433,11 @@ msgid "Download"
 msgstr "Last ned"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Endre"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
 msgstr ""
 
@@ -376,90 +457,181 @@ msgstr "Visningsnavn"
 msgid "Active"
 msgstr "Aktiv"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Kalenderfarge"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
 msgstr ""
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Lagre"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
 msgstr ""
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Rediger en hendelse"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Tittel"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "Hendelsestittel"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Sted"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Hendelsessted"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Kategori"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
 msgstr ""
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Hele dagen-hendelse"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "Fra"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "Til"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Gjenta"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Deltakere"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Sted"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Hendelsessted"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Hendelesebeskrivelse"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Lukk"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Opprett en ny hendelse"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Tidssone"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index 4107b2438ac..47e67f25b32 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/team/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr ""
@@ -25,29 +69,25 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr ""
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr ""
@@ -84,6 +124,10 @@ msgstr ""
 msgid "Pager"
 msgstr ""
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr ""
@@ -96,68 +140,64 @@ msgstr ""
 msgid "This card does not contain a photo."
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
+msgid "Addressbook"
 msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr ""
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr ""
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr ""
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr ""
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr ""
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr ""
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr ""
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr ""
 
@@ -166,7 +206,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -188,15 +227,23 @@ msgid "Delete"
 msgstr ""
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -235,4 +282,8 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/nb_NO/gallery.po b/l10n/nb_NO/gallery.po
new file mode 100644
index 00000000000..b8cf83673a1
--- /dev/null
+++ b/l10n/nb_NO/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/team/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/nl/calendar.po b/l10n/nl/calendar.po
index 8688a7d55f4..ca5e835d59a 100644
--- a/l10n/nl/calendar.po
+++ b/l10n/nl/calendar.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 #   <bart.formosus@gmail.com>, 2011.
+#   <bartv@thisnet.nl>, 2011.
+#   <pietje8501@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,351 +20,432 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Foute aanvraag"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr "Nieuwe tijdszone:"
 
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
-msgstr ""
-
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
-msgstr "U kunt maar een venster tegelijk openen."
+msgstr "Tijdzone is veranderd"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "Ongeldige aanvraag"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
-msgstr "Weergavenaam"
+msgstr "Kalender"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Verkeerde kalender"
 
-#: lib/object.php:292
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
-msgstr ""
+msgstr "Verjaardag"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
-msgstr ""
+msgstr "Zakelijk"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
-msgstr ""
+msgstr "Bellen"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
-msgstr ""
+msgstr "Klanten"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
-msgstr ""
+msgstr "Leverancier"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
-msgstr ""
+msgstr "Vakantie"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
-msgstr ""
+msgstr "Ideeën"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
-msgstr ""
+msgstr "Reis"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
-msgstr ""
+msgstr "Jubileum"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
-msgstr ""
+msgstr "Vergadering"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
-msgstr ""
+msgstr "Ander"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
-msgstr ""
+msgstr "Persoonlijk"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
-msgstr ""
+msgstr "Projecten"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
-msgstr ""
+msgstr "Vragen"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
-msgstr ""
+msgstr "Werk"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "Wordt niet herhaald"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Dagelijks"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "Wekelijks"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "Elke weekdag"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "Tweewekelijks"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "Maandelijks"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "Jaarlijks"
 
-#: lib/object.php:337
-msgid "Not an array"
-msgstr ""
+#: lib/object.php:366
+msgid "never"
+msgstr "nooit meer"
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Tweewekelijks"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr "volgens gebeurtenissen"
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Zondag"
+#: lib/object.php:368
+msgid "by date"
+msgstr "op datum"
 
-#: templates/calendar.php:32
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr "op weekdag"
+
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
 msgstr "Maandag"
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "Zo"
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr "Zondag"
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Ma"
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Di"
+#: lib/object.php:397
+msgid "first"
+msgstr "eerste"
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Wo"
+#: lib/object.php:398
+msgid "second"
+msgstr "tweede"
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Do"
+#: lib/object.php:399
+msgid "third"
+msgstr "derde"
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Vr"
+#: lib/object.php:400
+msgid "fourth"
+msgstr "vierde"
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Za"
+#: lib/object.php:401
+msgid "fifth"
+msgstr "vijfde"
+
+#: lib/object.php:402
+msgid "last"
+msgstr "laatste"
 
-#: templates/calendar.php:34
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
 msgstr "Januari"
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
 msgstr "Februari"
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
 msgstr "Maart"
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
 msgstr "April"
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
 msgstr "Mei"
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
 msgstr "Juni"
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
 msgstr "Juli"
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
 msgstr "Augustus"
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
 msgstr "September"
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
 msgstr "Oktober"
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
 msgstr "November"
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
 msgstr "December"
 
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr "Jan"
-
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr "Feb"
+#: lib/object.php:441
+msgid "by events date"
+msgstr "volgens evenementsdatum"
 
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr "Maa"
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr "volgens jaardag(en)"
 
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr "Apr"
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr "volgens weeknummer(s)"
 
-#: templates/calendar.php:35
-msgid "May."
-msgstr ""
+#: lib/object.php:444
+msgid "by day and month"
+msgstr "per dag en maand"
 
-#: templates/calendar.php:35
-msgid "Jun."
-msgstr "Jun"
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Geen array"
 
-#: templates/calendar.php:35
-msgid "Jul."
-msgstr "Jul"
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr "Datum"
 
-#: templates/calendar.php:35
-msgid "Aug."
-msgstr "Aug"
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Sep."
-msgstr "Sept"
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Hele dag"
 
-#: templates/calendar.php:35
-msgid "Oct."
-msgstr "Okt"
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "missende velden"
 
-#: templates/calendar.php:35
-msgid "Nov."
-msgstr "Nov"
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Titel"
 
-#: templates/calendar.php:35
-msgid "Dec."
-msgstr "Dec"
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Begindatum"
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Week"
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Begintijd"
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Weken"
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Einddatum"
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr ""
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Eindtijd"
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr ""
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Het evenement eindigt voordat het begint"
 
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Dag"
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Er was een databasefout"
 
 #: templates/calendar.php:52
+msgid "Week"
+msgstr "Week"
+
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Maand"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:54
 msgid "List"
-msgstr ""
+msgstr "Lijst"
 
-#: templates/calendar.php:58
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Vandaag"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Kalenders"
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Tijd"
-
-#: templates/calendar.php:169
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Er is een fout opgetreden bij het verwerken van het bestand."
 
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr "Zo."
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr "Ma."
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr "Di."
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr "Woe."
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr "Do."
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr "Vrij."
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr "Zat."
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr "Jan."
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr "Feb."
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr "Maart"
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr "April"
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr "Mei"
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr "Jun."
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr "Jul."
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr "Aug."
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr "Sept."
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr "Okt."
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr "Nov."
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr "Dec."
+
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Kies actieve kalenders"
 
 #: templates/part.choosecalendar.php:15
 msgid "New Calendar"
-msgstr ""
+msgstr "Nieuwe Kalender"
 
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr ""
+msgstr "CalDav Link"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
 msgstr "Download"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Bewerken"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Verwijderen"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "Nieuwe kalender"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
@@ -376,90 +459,181 @@ msgstr "Weergavenaam"
 msgid "Active"
 msgstr "Actief"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Beschrijving"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Kalender kleur"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Opslaan"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Opslaan"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
-msgstr "Bewerken een evenement"
+msgstr "Bewerken van een afspraak"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Titel"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Exporteren"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
-msgstr "Titel van het evenement"
-
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Locatie"
+msgstr "Titel van de afspraak"
 
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Locatie van het evenement"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Categorie"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
-msgstr ""
+msgstr "Kies een categorie"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Hele dag"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "Van"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "Aan"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Geavanceerde opties"
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Herhalen"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Deelnemers"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr "Selecteer weekdagen"
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr "Selecteer dagen"
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr "Selecteer maanden"
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr "Selecteer weken"
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr "Einde"
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr "gebeurtenissen"
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Locatie"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Locatie van de afspraak"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Beschrijving"
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Beschrijving van het evenement"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Sluiten"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "Kies de kalender"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "Importeer"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
-msgstr "Maak een nieuw evenement"
+msgstr "Maak een nieuwe afspraak"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Tijdzone"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr "Controleer altijd op aanpassingen van de tijdszone"
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Tijdformaat"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24uur"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12uur"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "CalDAV kalender synchronisatie adres:"
+
 
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index fcdf92add2b..12666934764 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:53+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,50 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Dit is niet uw adresboek."
@@ -28,29 +72,25 @@ msgstr "Dit is niet uw adresboek."
 msgid "Contact could not be found."
 msgstr "Contact kon niet worden gevonden."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "vCard kon niet worden gelezen."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informatie over de vCard is onjuist. Herlaad de pagina."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organisatie"
@@ -87,6 +127,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Pieper"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Dit is niet uw contactpersoon."
@@ -99,68 +143,64 @@ msgstr "Deze kaart is niet RFC compatibel."
 msgid "This card does not contain a photo."
 msgstr "Deze contact bevat geen foto."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Contact toevoegen"
 
-#: templates/index.php:14
-msgid "Address Books"
-msgstr "Adresboeken"
+#: templates/index.php:7
+msgid "Addressbooks"
+msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Groep"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Naam"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr "Nummer"
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr "Type"
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Postbus"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Uitgebreide"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Straat"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Stad"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Regio"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Postcode"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Land"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Contact aanmaken"
 
@@ -169,7 +209,6 @@ msgid "Choose active Address Books"
 msgstr "Kies actief Adresboek"
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr "Nieuw Adresboek"
 
@@ -191,16 +230,24 @@ msgid "Delete"
 msgstr "Verwijderen"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr "Verwijder contact"
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr "Voeg toe"
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
-msgstr "Bewerk Adresboek"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
+msgstr ""
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -238,4 +285,8 @@ msgstr "Telefoon"
 msgid "Update"
 msgstr "Vernieuwe"
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 82059730f37..cca07cade19 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -6,13 +6,14 @@
 #   <bart.formosus@gmail.com>, 2011.
 #   <icewind1991@gmail.com>, 2011.
 #   <koen@vervloesem.eu>, 2011.
+#   <pietje8501@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:00+0000\n"
+"Last-Translator: Pietje8501 <pietje8501@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,11 +23,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "reset je Owncloud wachtwoord"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Gebruik de volgende link om je wachtwoord te resetten: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -56,7 +57,7 @@ msgstr "Je wachtwoord is geweizigd"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Naar de login-pagina"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -137,7 +138,7 @@ msgstr "Installatie afronden"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "webdiensten die je beheerst"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -157,7 +158,7 @@ msgstr "onthoud gegevens"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Meld je aan"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index b3133780235..df8a6a366d0 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -7,13 +7,14 @@
 #   <bartv@thisnet.nl>, 2011.
 #   <icewind1991@gmail.com>, 2011.
 #   <koen@vervloesem.eu>, 2011.
+#   <pietje8501@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-12 18:11+0000\n"
+"Last-Translator: Pietje8501 <pietje8501@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,19 +62,19 @@ msgstr "Maximale bestandsgrootte voor uploads"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Nieuw"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "Tekstbestand"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Map"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "Van het internet"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/nl/gallery.po b/l10n/nl/gallery.po
new file mode 100644
index 00000000000..25d5097b363
--- /dev/null
+++ b/l10n/nl/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 4502ab58169..eacedbd0379 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -6,13 +6,14 @@
 #   <bart.formosus@gmail.com>, 2011.
 #   <icewind1991@gmail.com>, 2011.
 #   <koen@vervloesem.eu>, 2011.
+#   <pietje8501@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-12 18:13+0000\n"
+"Last-Translator: Pietje8501 <pietje8501@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "mailadres aangepast"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -38,7 +39,7 @@ msgstr "Taal aangepast"
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Logniveau"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -106,15 +107,15 @@ msgstr "Wijzig wachtwoord"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "mailadres"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Jouw mailadres"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Vul een mailadres in om je wachtwoord te kunnen herstellen"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -122,7 +123,7 @@ msgstr "Taal"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Help met vertalen"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -148,7 +149,7 @@ msgstr "Creëer"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Limieten"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/nn_NO/calendar.po b/l10n/nn_NO/calendar.po
index faff7c6243c..202075af678 100644
--- a/l10n/nn_NO/calendar.po
+++ b/l10n/nn_NO/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-07 18:29+0100\n"
-"PO-Revision-Date: 2012-01-08 08:41+0000\n"
-"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/team/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -315,27 +315,27 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:52
 msgid "Week"
 msgstr "Veke"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "MÃ¥nad"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:54
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:45
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "I dag"
 
-#: templates/calendar.php:46
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Kalendarar"
 
-#: templates/calendar.php:64
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Feil ved tolking av fila."
 
@@ -449,7 +449,7 @@ msgstr "Ny kalender"
 msgid "Edit calendar"
 msgstr "Endra kalendarar"
 
-#: templates/part.editcalendar.php:12 templates/part.import.php:29
+#: templates/part.editcalendar.php:12
 msgid "Displayname"
 msgstr "Visingsnamn"
 
@@ -575,35 +575,35 @@ msgid "Description of the Event"
 msgstr "Skildring av hendinga"
 
 #: templates/part.import.php:1
-msgid "Import Ical File"
-msgstr ""
-
-#: templates/part.import.php:4
-msgid "How to import the new calendar?"
+msgid "Import a calendar file"
 msgstr ""
 
 #: templates/part.import.php:6
-msgid "Import into an existing calendar"
+msgid "Please choose the calendar"
 msgstr ""
 
-#: templates/part.import.php:7
-msgid "Import into a new calendar"
+#: templates/part.import.php:10
+msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.import.php:10
-msgid "Please choose the calendar"
+#: templates/part.import.php:15
+msgid "Name of new calendar"
 msgstr ""
 
-#: templates/part.import.php:20 templates/part.import.php:37
+#: templates/part.import.php:17
 msgid "Import"
 msgstr ""
 
-#: templates/part.import.php:22 templates/part.import.php:39
-msgid "Back"
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
 msgstr ""
 
-#: templates/part.import.php:25
-msgid "Please fill out the form"
+#: templates/part.import.php:24
+msgid "Close Dialog"
 msgstr ""
 
 #: templates/part.newevent.php:1
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index fdf1c5d4c38..a5a29115d11 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/team/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Dette er ikkje di adressebok."
@@ -26,29 +70,25 @@ msgstr "Dette er ikkje di adressebok."
 msgid "Contact could not be found."
 msgstr "Fann ikkje kontakten."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "Klarte ikkje å lesa vCard-et."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefonnummer"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Epost"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organisasjon"
@@ -85,6 +125,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Personsøkjar"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Dette er ikkje din kontakt."
@@ -97,68 +141,64 @@ msgstr "Dette kortet er ikkje RFC-kompatibelt"
 msgid "This card does not contain a photo."
 msgstr "Dette kortet har ingen bilete."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Legg til kontakt"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Gruppe"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Namn"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Postboks"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Utvida"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Gate"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Stad"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Region/fylke"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Postnummer"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Land"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Opprett kontakt"
 
@@ -167,7 +207,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -189,15 +228,23 @@ msgid "Delete"
 msgstr "Slett"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -236,4 +283,8 @@ msgstr "Telefonnummer"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/nn_NO/gallery.po b/l10n/nn_NO/gallery.po
new file mode 100644
index 00000000000..a0aca6b59dc
--- /dev/null
+++ b/l10n/nn_NO/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/team/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/pl/calendar.po b/l10n/pl/calendar.po
index d1010cebe43..cdb4d794fb1 100644
--- a/l10n/pl/calendar.po
+++ b/l10n/pl/calendar.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Marcin Małecki <gerber@tkdami.net>, 2011.
+# Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,321 +18,403 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "BÅ‚Ä…d uwierzytelniania"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr "Nowa strefa czasowa:"
 
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
-msgstr "ZÅ‚y kalendarz"
-
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Strefa czasowa została zmieniona"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "Nieprawidłowe żądanie"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "ZÅ‚y kalendarz"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
 msgstr "Urodziny"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
 msgstr "Interes"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
 msgstr "Rozmowa"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
 msgstr "Klienci"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
 msgstr "Przesyłka"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
 msgstr "Święta"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
 msgstr "Pomysły"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
 msgstr "Podróż"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
 msgstr "Jubileusz"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
 msgstr "Spotkanie"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
 msgstr "Inne"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
 msgstr "Osobisty"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
 msgstr "Pytania"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
 msgstr "Praca"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "Nie powtarza siÄ™"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Codziennie"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "Tygodniowo"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "Każdy dzień tygodnia"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "Dwa razy w tygodniu"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "Miesięcznie"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "Rocznie"
 
-#: lib/object.php:337
-msgid "Not an array"
-msgstr "Nie ma w tablicy"
+#: lib/object.php:366
+msgid "never"
+msgstr "nigdy"
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Cały dzień"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr "przez wydarzenia"
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Niedziela"
+#: lib/object.php:368
+msgid "by date"
+msgstr "po dacie"
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr "miesięcznie"
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr "tygodniowo"
 
-#: templates/calendar.php:32
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
 msgstr "Åšroda"
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
 msgstr "PiÄ…tek"
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
 msgstr "Sobota"
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "Nie."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr "Niedziela"
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Po."
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Wt."
+#: lib/object.php:397
+msgid "first"
+msgstr "pierwszy"
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Åšr."
+#: lib/object.php:398
+msgid "second"
+msgstr "drugi"
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Cz.."
+#: lib/object.php:399
+msgid "third"
+msgstr "trzeci"
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "PiÄ…."
+#: lib/object.php:400
+msgid "fourth"
+msgstr "czwarty"
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "So."
+#: lib/object.php:401
+msgid "fifth"
+msgstr "piÄ…ty"
 
-#: templates/calendar.php:34
+#: lib/object.php:402
+msgid "last"
+msgstr "ostatni"
+
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
 msgstr "Styczeń"
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
 msgstr "Luty"
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
 msgstr "Marzec"
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
 msgstr "Kwiecień"
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
 msgstr "Maj"
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
 msgstr "Czerwiec"
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
 msgstr "Lipiec"
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
 msgstr "Sierpień"
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
 msgstr "Wrzesień"
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
 msgstr "Październik"
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
 msgstr "Listopad"
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
 msgstr "Grudzień"
 
-#: templates/calendar.php:35
+#: lib/object.php:441
+msgid "by events date"
+msgstr "po datach wydarzeń"
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr "po dniach roku"
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr "po tygodniach"
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Nie ma w tablicy"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr "Data"
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr "Kal."
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Cały dzień"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "BrakujÄ…ce pola"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Tytuł"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Od dnia"
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Od czasu"
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Do daty"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Do czasu"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Wydarzenie kończy się przed rozpoczęciem"
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Awaria bazy danych"
+
+#: templates/calendar.php:52
+msgid "Week"
+msgstr "Tydzień"
+
+#: templates/calendar.php:53
+msgid "Month"
+msgstr "MiesiÄ…c"
+
+#: templates/calendar.php:54
+msgid "List"
+msgstr "Lista"
+
+#: templates/calendar.php:59
+msgid "Today"
+msgstr "Dzisiaj"
+
+#: templates/calendar.php:60
+msgid "Calendars"
+msgstr "Kalendarze"
+
+#: templates/calendar.php:78
+msgid "There was a fail, while parsing the file."
+msgstr "Nastąpił problem przy parsowaniu pliku.."
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr "Nie."
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr "Poń."
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr "Wto."
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr "Åšro."
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr "Czw."
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr "PiÄ…."
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr "So."
+
+#: templates/lAfix.php:28
 msgid "Jan."
 msgstr "Sty."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:29
 msgid "Feb."
 msgstr "Lut."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:30
 msgid "Mar."
 msgstr "Mar."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:31
 msgid "Apr."
 msgstr "Kwi."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:32
 msgid "May."
-msgstr "Może."
+msgstr "Maj"
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:33
 msgid "Jun."
 msgstr "Cze."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:34
 msgid "Jul."
 msgstr "Lip."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:35
 msgid "Aug."
 msgstr "Sie."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:36
 msgid "Sep."
 msgstr "Wrz."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:37
 msgid "Oct."
 msgstr "Paź."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:38
 msgid "Nov."
 msgstr "Lis."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:39
 msgid "Dec."
 msgstr "Gru."
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Tydzień"
-
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Tygodnie"
-
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr "Więcej przed {startdate}"
-
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr "Więcej po {enddate}"
-
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Dzień"
-
-#: templates/calendar.php:52
-msgid "Month"
-msgstr "MiesiÄ…c"
-
-#: templates/calendar.php:53
-msgid "List"
-msgstr "Lista"
-
-#: templates/calendar.php:58
-msgid "Today"
-msgstr "Dzisiaj"
-
-#: templates/calendar.php:59
-msgid "Calendars"
-msgstr "Kalendarze"
-
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Czas"
-
-#: templates/calendar.php:169
-msgid "There was a fail, while parsing the file."
-msgstr "Nastąpił problem przy parsowaniu pliku.."
-
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Wybierz aktywne kalendarze"
@@ -351,14 +433,13 @@ msgid "Download"
 msgstr "Pobierz"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Edytuj"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Usuń"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -376,90 +457,181 @@ msgstr "Displayname"
 msgid "Active"
 msgstr "Aktywny"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Opis"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Kalendarz kolor"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
 msgstr "Zapisz"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Prześlij"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Edycja zdarzenia"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Tytuł"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Wyeksportuj"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "Tytuł zdarzenia"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Lokalizacja"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Lokalizacja zdarzenia"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Kategoria"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
 msgstr "Wybierz kategoriÄ™"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Całodniowe wydarzenie"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "Z"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "Do"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Opcje zaawansowane"
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Powtórz"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Uczestnicy"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr "Zaawansowane"
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr "Wybierz dni powszechne"
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr "Wybierz dni"
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr "oraz wydarzenia roku"
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr "oraz wydarzenia miesiÄ…ca"
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr "Wybierz miesiÄ…ce"
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr "Wybierz tygodnie"
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr "oraz wydarzenia roku."
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr "Przedział"
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr "Koniec"
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr "wystÄ…pienia"
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Lokalizacja"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Lokalizacja zdarzenia"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Opis"
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Opis zdarzenia"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Zamknij"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "Proszę wybrać kalendarz"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "Import"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Stwórz nowe wydarzenie"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Strefa czasowa"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr "Zawsze sprawdzaj zmiany strefy czasowej"
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Format czasu"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Adres synchronizacji kalendarza CalDAV:"
+
 
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index c0266c5da55..15faa87da87 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Marcin Małecki <gerber@tkdami.net>, 2011.
+# Bartek  <bart.p.pl@gmail.com>, 2012.
+# Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 14:05+0000\n"
+"Last-Translator: Bartek <bart.p.pl@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +19,50 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr "Błąd podczas (de)aktywacji książki"
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr "Wystąpił błąd podczas dodawania kontaktu"
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr "Nie można dodać pustego elementu"
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr "Przynajmniej jedno pole adresu musi być wypełnione"
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr "BÅ‚Ä…d podczas dodawania elementu"
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr "Błąd podczas dodawania książki"
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr "Błąd podczas aktywacji książki adresowej"
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr "BÅ‚Ä…d podczas kasowania elementu"
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr "BÅ‚Ä…d podczas aktualizacji elementu"
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr "Błąd podczas aktualizacji książki"
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr "Kontakty"
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "To nie jest twoja książka adresowa."
@@ -26,29 +71,25 @@ msgstr "To nie jest twoja książka adresowa."
 msgid "Contact could not be found."
 msgstr "Kontakt nie znaleziony."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "Nie można odczytać vCard."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizacja"
@@ -85,6 +126,10 @@ msgstr "Połączenie wideo"
 msgid "Pager"
 msgstr "Pager"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr "Kontakt"
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "To nie jest twój kontakt."
@@ -97,88 +142,83 @@ msgstr "Ta karta nie jest zgodna ze specyfikacjÄ… RFC."
 msgid "This card does not contain a photo."
 msgstr "Ta karta nie zawiera zdjęć."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
 
-#: templates/index.php:14
-msgid "Address Books"
-msgstr ""
+#: templates/index.php:7
+msgid "Addressbooks"
+msgstr "Książki adresowe"
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Grupa"
+msgid "Addressbook"
+msgstr "Książka adresowa"
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Nazwisko"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "PO Box"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Rozszerzony"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Ulica"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Miasto"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Region"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
-msgstr "Kod pocztowy"
+msgstr "BÅ‚Ä…d podczas dodawania elementu"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Kraj"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Utwórz kontakt"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Wybierz aktywną książkę adresową"
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
-msgstr ""
+msgstr "Nowa książka adresowa"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "Link CardDav"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "SciÄ…gaj"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -189,36 +229,44 @@ msgid "Delete"
 msgstr "Usuń"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr "Pobierz kontakt"
+
+#: templates/part.details.php:4
 msgid "Delete contact"
-msgstr ""
+msgstr "Skasuj kontakt"
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
-msgstr ""
+msgid "New Addressbook"
+msgstr "Nowa książka adresowa"
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
+msgstr "Edytuj książkę"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Nazwa wyświetlana"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Aktywny"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Zapisz"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Potwierdź"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Skasuj"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -226,7 +274,7 @@ msgstr "Urodziny"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Preferowane"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -234,6 +282,10 @@ msgstr "Telefon"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
-msgstr ""
+msgstr "Aktualizuj"
+
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr "Adres synchronizacji CardDAV:"
 
 
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index e8dd97a81f8..d18a657d96a 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -4,16 +4,16 @@
 # 
 # Translators:
 # Kamil Domański <kdomanski@kdemail.net>, 2011.
-# Marcin Małecki <gerber@tkdami.net>, 2011.
+# Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 # Marcin Małecki <mosslar@gmail.com>, 2011.
 #   <mosslar@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 13:08+0000\n"
+"Last-Translator: Marcin Małecki <gerber@tkdami.net>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,11 +23,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Resetowani hasła"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Użyj tego linku do zresetowania hasła: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -56,7 +56,7 @@ msgstr "Twoje hasło zostało zresetowane"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Do strony logowania"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -137,7 +137,7 @@ msgstr "Zakończ instalację"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "usługi internetowe twoją pod kontrolą"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -157,7 +157,7 @@ msgstr "zapamiętaj"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Zaloguj siÄ™"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 090e8b0a8f4..f9d6ec7b31e 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Marcin Małecki <gerber@tkdami.net>, 2011.
+# Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 #   <mosslar@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 13:09+0000\n"
+"Last-Translator: Marcin Małecki <gerber@tkdami.net>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,19 +58,19 @@ msgstr "Maksymalna wielkość przesyłanego pliku"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Nowy"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "Plik tekstowy"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Katalog"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "Z Internetu"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/pl/gallery.po b/l10n/pl/gallery.po
new file mode 100644
index 00000000000..2beaf9b81ef
--- /dev/null
+++ b/l10n/pl/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 713839d5ba3..1fa60a77fd9 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -4,16 +4,16 @@
 # 
 # Translators:
 # Kamil Domański <kdomanski@kdemail.net>, 2011.
-# Marcin Małecki <gerber@tkdami.net>, 2011.
+# Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 # Marcin Małecki <mosslar@gmail.com>, 2011.
 #   <mosslar@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-11 13:11+0000\n"
+"Last-Translator: Marcin Małecki <gerber@tkdami.net>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +23,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "email zmieniony"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -39,7 +39,7 @@ msgstr "Język zmieniony"
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Poziom logowania"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -107,15 +107,15 @@ msgstr "Zmień hasło"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Twój adres email"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Podaj adres email żeby odzyskać hasło"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -123,7 +123,7 @@ msgstr "Język"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Pomóż w tłumaczeniu"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -149,7 +149,7 @@ msgstr "Stwórz"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Udział"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/pt_BR/calendar.po b/l10n/pt_BR/calendar.po
index 12e2e31f03b..7c0b13f20c2 100644
--- a/l10n/pt_BR/calendar.po
+++ b/l10n/pt_BR/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,351 +18,432 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Erro de autenticação"
-
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Fuso horário alterado"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "Pedido inválido"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Calendário"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Calendário incorreto"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
-msgstr ""
+msgstr "Aniversário"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
-msgstr ""
+msgstr "Negócio"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
-msgstr ""
+msgstr "Chamada"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
-msgstr ""
+msgstr "Clientes"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
-msgstr ""
+msgstr "Entrega"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
-msgstr ""
+msgstr "Feriados"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
-msgstr ""
+msgstr "Idéias"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
-msgstr ""
+msgstr "Jornada"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
-msgstr ""
+msgstr "Jubileu"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
-msgstr ""
+msgstr "Reunião"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
-msgstr ""
+msgstr "Outros"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
-msgstr ""
+msgstr "Pessoal"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
-msgstr ""
+msgstr "Projetos"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
-msgstr ""
+msgstr "Perguntas"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
-msgstr ""
+msgstr "Trabalho"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "Não repetir"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Diariamente"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "Semanal"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "Cada dia da semana"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "De duas em duas semanas"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "Mensal"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "Anual"
 
-#: lib/object.php:337
-msgid "Not an array"
+#: lib/object.php:366
+msgid "never"
 msgstr ""
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Todo o dia"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Domingo"
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr "Segunda-feira"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr "Terça-feira"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr "Quarta-feira"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr "Quinta-feira"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr "Sexta-feira"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr "Sábado"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "Dom."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Seg."
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Ter."
+#: lib/object.php:397
+msgid "first"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Qua."
+#: lib/object.php:398
+msgid "second"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Qui."
+#: lib/object.php:399
+msgid "third"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Sex."
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Sáb."
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr "Janeiro"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr "Fevereiro"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr "Março"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr "Abril"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr "Maio"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr "Junho"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr "Julho"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr "Agosto"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr "Setembro"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr "Outubro"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr "Novembro"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr "Dezembro"
-
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr "Jan."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr "Fev."
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr "Mar."
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr "Abr."
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "May."
+#: lib/object.php:444
+msgid "by day and month"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jun."
-msgstr "Jun."
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Não é um array"
 
-#: templates/calendar.php:35
-msgid "Jul."
-msgstr "Jul."
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Aug."
-msgstr "Ago."
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Sep."
-msgstr "Set."
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Todo o dia"
 
-#: templates/calendar.php:35
-msgid "Oct."
-msgstr "Out."
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Campos incompletos"
 
-#: templates/calendar.php:35
-msgid "Nov."
-msgstr "Nov."
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Título"
 
-#: templates/calendar.php:35
-msgid "Dec."
-msgstr "Dez."
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Desde a Data"
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Semana"
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Desde a Hora"
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Semanas"
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Até a Data"
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr ""
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Até a Hora"
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr ""
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "O evento termina antes de começar"
 
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Dia"
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Houve uma falha de banco de dados"
 
 #: templates/calendar.php:52
+msgid "Week"
+msgstr "Semana"
+
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Mês"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:54
 msgid "List"
-msgstr ""
+msgstr "Lista"
 
-#: templates/calendar.php:58
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Hoje"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Calendários"
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Tempo"
-
-#: templates/calendar.php:169
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Houve uma falha, ao analisar o arquivo."
 
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Escolha calendários ativos"
 
 #: templates/part.choosecalendar.php:15
 msgid "New Calendar"
-msgstr ""
+msgstr "Novo Calendário"
 
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr ""
+msgstr "Link para CalDav"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
 msgstr "Baixar"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Editar"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Excluir"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "Novo calendário"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
@@ -376,90 +457,181 @@ msgstr "Mostrar Nome"
 msgid "Active"
 msgstr "Ativo"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Descrição"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Cor do Calendário"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Salvar"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Submeter"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Editar um evento"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Título"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Exportar"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "Título do evento"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Local"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Local do evento"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Categoria"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
-msgstr ""
+msgstr "Selecionar categoria"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Evento de dia inteiro"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "De"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "Para"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Opções avançadas"
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Repetir"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Participantes"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Local"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Local do evento"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Descrição"
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Descrição do Evento"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Fechar"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "Por favor, escolha o calendário"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "Importar"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Criar um novo evento"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Fuso horário"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Formato da Hora"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Sincronização de endereço do calendário CalDAV :"
+
 
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index 39bf29a3f76..6872b053b84 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Este não é o seu agenda de endereços."
@@ -26,29 +70,25 @@ msgstr "Este não é o seu agenda de endereços."
 msgid "Contact could not be found."
 msgstr "Contato não pôde ser encontrado."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "vCard não pôde ser lida."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informações sobre vCard é incorreta. Por favor, recarregue a página."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Endereço"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefone"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organização"
@@ -85,6 +125,10 @@ msgstr "Vídeo"
 msgid "Pager"
 msgstr "Pager"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Este não é o seu contato."
@@ -97,68 +141,64 @@ msgstr "Este cartão não é compatível com RFC."
 msgid "This card does not contain a photo."
 msgstr "Este cartão não contém uma foto."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Adicionar Contato"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Grupo"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Nome"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Caixa Postal"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Estendido"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Rua"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Cidade"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Região"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "CEP"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "País"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Criar Contato"
 
@@ -167,7 +207,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -189,15 +228,23 @@ msgid "Delete"
 msgstr "Excluir"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -236,4 +283,8 @@ msgstr "Telefone"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/pt_BR/gallery.po b/l10n/pt_BR/gallery.po
new file mode 100644
index 00000000000..0d4da064608
--- /dev/null
+++ b/l10n/pt_BR/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/pt_PT/calendar.po b/l10n/pt_PT/calendar.po
index b3ee449d891..ef2e86fa585 100644
--- a/l10n/pt_PT/calendar.po
+++ b/l10n/pt_PT/calendar.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <helder.meneses@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/team/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,319 +18,401 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
 msgstr ""
 
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
-msgstr ""
-
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr ""
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
+msgstr "Calendário"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
 msgstr ""
 
-#: lib/object.php:292
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
 msgstr ""
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
 msgstr ""
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
 msgstr ""
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
 msgstr ""
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
 msgstr ""
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
 msgstr ""
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
 msgstr ""
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
 msgstr ""
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
 msgstr ""
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
 msgstr ""
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
 msgstr ""
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
 msgstr ""
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
 msgstr ""
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
 msgstr ""
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
 msgstr ""
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr ""
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr ""
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr ""
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr ""
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr ""
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr ""
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr ""
 
-#: lib/object.php:337
-msgid "Not an array"
+#: lib/object.php:366
+msgid "never"
 msgstr ""
 
-#: templates/calendar.php:3
-msgid "All day"
+#: lib/object.php:367
+msgid "by occurrences"
 msgstr ""
 
-#: templates/calendar.php:32
-msgid "Sunday"
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
 msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
 msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
 msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
 msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
 msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
 msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
 msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sun."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
 msgstr ""
 
-#: templates/calendar.php:33
-msgid "Mon."
+#: lib/object.php:396
+msgid "events week of month"
 msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
+#: lib/object.php:397
+msgid "first"
 msgstr ""
 
-#: templates/calendar.php:33
-msgid "Wed."
+#: lib/object.php:398
+msgid "second"
 msgstr ""
 
-#: templates/calendar.php:33
-msgid "Thu."
+#: lib/object.php:399
+msgid "third"
 msgstr ""
 
-#: templates/calendar.php:33
-msgid "Fri."
+#: lib/object.php:400
+msgid "fourth"
 msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sat."
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jan."
+#: lib/object.php:441
+msgid "by events date"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Feb."
+#: lib/object.php:442
+msgid "by yearday(s)"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Mar."
+#: lib/object.php:443
+msgid "by weeknumber(s)"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Apr."
+#: lib/object.php:444
+msgid "by day and month"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "May."
+#: lib/object.php:467
+msgid "Not an array"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jun."
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jul."
+#: lib/search.php:40
+msgid "Cal."
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Aug."
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Todo o dia"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Sep."
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Oct."
+#: templates/calendar.php:14
+msgid "From Date"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Nov."
+#: templates/calendar.php:15
+msgid "From Time"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Dec."
+#: templates/calendar.php:16
+msgid "To Date"
 msgstr ""
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr ""
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr ""
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:52
 msgid "Week"
+msgstr "Semana"
+
+#: templates/calendar.php:53
+msgid "Month"
+msgstr "Mês"
+
+#: templates/calendar.php:54
+msgid "List"
 msgstr ""
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
+#: templates/calendar.php:59
+msgid "Today"
+msgstr "Hoje"
+
+#: templates/calendar.php:60
+msgid "Calendars"
+msgstr "Calendários"
+
+#: templates/calendar.php:78
+msgid "There was a fail, while parsing the file."
 msgstr ""
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
+#: templates/lAfix.php:9
+msgid "Sun."
 msgstr ""
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
+#: templates/lAfix.php:10
+msgid "Mon."
 msgstr ""
 
-#: templates/calendar.php:49
-msgid "Day"
+#: templates/lAfix.php:11
+msgid "Tue."
 msgstr ""
 
-#: templates/calendar.php:52
-msgid "Month"
+#: templates/lAfix.php:12
+msgid "Wed."
 msgstr ""
 
-#: templates/calendar.php:53
-msgid "List"
+#: templates/lAfix.php:13
+msgid "Thu."
 msgstr ""
 
-#: templates/calendar.php:58
-msgid "Today"
+#: templates/lAfix.php:14
+msgid "Fri."
 msgstr ""
 
-#: templates/calendar.php:59
-msgid "Calendars"
+#: templates/lAfix.php:15
+msgid "Sat."
 msgstr ""
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
+#: templates/lAfix.php:28
+msgid "Jan."
 msgstr ""
 
-#: templates/calendar.php:169
-msgid "There was a fail, while parsing the file."
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
 msgstr ""
 
 #: templates/part.choosecalendar.php:1
@@ -350,12 +433,11 @@ msgid "Download"
 msgstr ""
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr ""
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
 msgstr ""
 
@@ -375,90 +457,181 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr ""
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr ""
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
 msgstr ""
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
 msgstr ""
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr ""
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
+#: templates/part.editevent.php:10
+msgid "Export"
 msgstr ""
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr ""
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr ""
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr ""
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr ""
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
 msgstr ""
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr ""
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr ""
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr ""
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
+#: templates/part.eventform.php:68
+msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr ""
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr ""
+
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr ""
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
 msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr ""
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index 2e93a42246f..e29627a2db4 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/team/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Esta não é a sua lista de contactos"
@@ -26,30 +70,26 @@ msgstr "Esta não é a sua lista de contactos"
 msgid "Contact could not be found."
 msgstr "O contacto não foi encontrado"
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "o vCard não pode ser lido"
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 "A informação sobre o vCard está incorreta. Por favor refresque a página"
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Morada"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefone"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organização"
@@ -86,6 +126,10 @@ msgstr "Vídeo"
 msgid "Pager"
 msgstr "Pager"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Este não é o seu contacto"
@@ -98,68 +142,64 @@ msgstr "Este cartão não é compativel com RFC"
 msgid "This card does not contain a photo."
 msgstr "Este cartão não possui foto"
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Adicionar Contacto"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Grupo"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Nome"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Apartado"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Extendido"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Rua"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Cidade"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Região"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Código Postal"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "País"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Criar Contacto"
 
@@ -168,7 +208,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -190,15 +229,23 @@ msgid "Delete"
 msgstr "Apagar"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -237,4 +284,8 @@ msgstr "Telefone"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/pt_PT/gallery.po b/l10n/pt_PT/gallery.po
new file mode 100644
index 00000000000..19f5d97278c
--- /dev/null
+++ b/l10n/pt_PT/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/team/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/ro/calendar.po b/l10n/ro/calendar.po
index e87d6c47a95..ff06c8671a1 100644
--- a/l10n/ro/calendar.po
+++ b/l10n/ro/calendar.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Claudiu  <claudiu@tanaselia.ro>, 2011.
+# Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
+# Ovidiu Tache <ovidiutache@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,351 +19,432 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Eroare de autentificare"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr "Fus orar nou:"
 
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
-msgstr ""
-
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "A fost schimbat fusul orar"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "Cerere eronată"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Calendar"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Calendar greșit"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
-msgstr ""
+msgstr "Zi de naștere"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
-msgstr ""
+msgstr "Afaceri"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
-msgstr ""
+msgstr "Sună"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
-msgstr ""
+msgstr "Clienți"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
-msgstr ""
+msgstr "Curier"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
-msgstr ""
+msgstr "Sărbători"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
-msgstr ""
+msgstr "Idei"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
-msgstr ""
+msgstr "Călătorie"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
-msgstr ""
+msgstr "Aniversare"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
-msgstr ""
+msgstr "Întâlnire"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
-msgstr ""
+msgstr "Altele"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
-msgstr ""
+msgstr "Personal"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
-msgstr ""
+msgstr "Proiecte"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
-msgstr ""
+msgstr "Întrebări"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
-msgstr ""
+msgstr "Servici"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "Nu se repetă"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Zilnic"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "Săptămânal"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "În fiecare săptămână"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "Din două în două săptămâni"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "Lunar"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "Anual"
 
-#: lib/object.php:337
-msgid "Not an array"
-msgstr ""
+#: lib/object.php:366
+msgid "never"
+msgstr "niciodată"
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Toată ziua"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr "după repetiție"
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Duminică"
+#: lib/object.php:368
+msgid "by date"
+msgstr "după dată"
 
-#: templates/calendar.php:32
+#: lib/object.php:375
+msgid "by monthday"
+msgstr "după ziua lunii"
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr "după ziua săptămânii"
+
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
 msgstr "Luni"
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
 msgstr "Marți"
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
 msgstr "Joi"
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
 msgstr "Vineri"
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
 msgstr "Sâmbătă"
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "Dum."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr "Duminică"
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Lun."
+#: lib/object.php:396
+msgid "events week of month"
+msgstr "evenimentele săptămânii din luna."
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Mar."
+#: lib/object.php:397
+msgid "first"
+msgstr "primul"
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Mie."
+#: lib/object.php:398
+msgid "second"
+msgstr "al doilea"
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Joi."
+#: lib/object.php:399
+msgid "third"
+msgstr "al treilea"
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Vin."
+#: lib/object.php:400
+msgid "fourth"
+msgstr "al patrulea"
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Sâm."
+#: lib/object.php:401
+msgid "fifth"
+msgstr "al cincilea"
 
-#: templates/calendar.php:34
+#: lib/object.php:402
+msgid "last"
+msgstr "ultimul"
+
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
 msgstr "Ianuarie"
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
 msgstr "Februarie"
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
 msgstr "Martie"
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
 msgstr "Aprilie"
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
 msgstr "Mai"
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
 msgstr "Iunie"
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
 msgstr "Iulie"
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
 msgstr "August"
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
 msgstr "Septembrie"
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
 msgstr "Octombrie"
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
 msgstr "Noiembrie"
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
 msgstr "Decembrie"
 
-#: templates/calendar.php:35
+#: lib/object.php:441
+msgid "by events date"
+msgstr "după data evenimentului"
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr "după ziua(zilele) anului"
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr "după numărul săptămânii"
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr "după zi și lună"
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Not an array"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr "Data"
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr "Cal."
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Toată ziua"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Câmpuri lipsă"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Titlu"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Începând cu"
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "De la"
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Până pe"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "La"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Evenimentul se termină înainte să înceapă"
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "A avut loc o eroare a bazei de date"
+
+#: templates/calendar.php:52
+msgid "Week"
+msgstr "Săptămâna"
+
+#: templates/calendar.php:53
+msgid "Month"
+msgstr "Luna"
+
+#: templates/calendar.php:54
+msgid "List"
+msgstr "Listă"
+
+#: templates/calendar.php:59
+msgid "Today"
+msgstr "Astăzi"
+
+#: templates/calendar.php:60
+msgid "Calendars"
+msgstr "Calendare"
+
+#: templates/calendar.php:78
+msgid "There was a fail, while parsing the file."
+msgstr "A fost întâmpinată o eroare în procesarea fișierului"
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr "D"
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr "L"
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr "M"
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr "M"
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr "J"
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr "V"
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr "S"
+
+#: templates/lAfix.php:28
 msgid "Jan."
 msgstr "Ian."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:29
 msgid "Feb."
 msgstr "Feb."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:30
 msgid "Mar."
 msgstr "Mar."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:31
 msgid "Apr."
 msgstr "Apr."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:32
 msgid "May."
-msgstr ""
+msgstr "Mai."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:33
 msgid "Jun."
 msgstr "Iun."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:34
 msgid "Jul."
 msgstr "Iul."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:35
 msgid "Aug."
 msgstr "Aug."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:36
 msgid "Sep."
-msgstr "Sep."
+msgstr "Sept."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:37
 msgid "Oct."
 msgstr "Oct."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:38
 msgid "Nov."
 msgstr "Nov."
 
-#: templates/calendar.php:35
+#: templates/lAfix.php:39
 msgid "Dec."
 msgstr "Dec."
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Săptămâna"
-
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Săptămâni"
-
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr ""
-
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr ""
-
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Zi"
-
-#: templates/calendar.php:52
-msgid "Month"
-msgstr "Luna"
-
-#: templates/calendar.php:53
-msgid "List"
-msgstr ""
-
-#: templates/calendar.php:58
-msgid "Today"
-msgstr "Astăzi"
-
-#: templates/calendar.php:59
-msgid "Calendars"
-msgstr "Calendare"
-
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Ora"
-
-#: templates/calendar.php:169
-msgid "There was a fail, while parsing the file."
-msgstr "A fost întâmpinată o eroare în procesarea fișierului"
-
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Alege activitățile din calendar"
 
 #: templates/part.choosecalendar.php:15
 msgid "New Calendar"
-msgstr ""
+msgstr "Calendar nou"
 
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr ""
+msgstr "Link CalDav"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
 msgstr "Descarcă"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Modifică"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Șterge"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "Calendar nou"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
@@ -376,90 +458,181 @@ msgstr "Nume"
 msgid "Active"
 msgstr "Activ"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Descriere"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Culoare calendar"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Salveză"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Trimite"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Anulează"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Modifică un eveniment"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Titlu"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Exportă"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "Numele evenimentului"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Localizare"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Localizarea evenimentului"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Categorie"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
-msgstr ""
+msgstr "Alege categoria"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Toată ziua"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "De la"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "Către"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Opțiuni avansate"
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Repetă"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Participanți"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr "Avansat"
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr "Selectează zilele săptămânii"
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr "Selectează zilele"
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr "și evenimentele zilei."
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr "și evenimentele zilei din lună."
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr "Selectează lunile"
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr "Selectează săptămânile"
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr "și evenimentele săptămânii."
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr "Interval"
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr "Sfârșit"
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr "repetiții"
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Localizare"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Localizarea evenimentului"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Descriere"
+
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Descrierea evenimentului"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "ÃŽnchide"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "Alegeți calendarul"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "Importă"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Crează un evenimetn nou"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Fus orar"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr "Verifică mereu pentru schimbări ale fusului orar"
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Format de timp"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Adresa pentru sincronizarea calendarului CalDAV"
+
 
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index 9464014f041..6d7ec2c5c2f 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Claudiu  <claudiu@tanaselia.ro>, 2011.
+# Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Nu se găsește în agendă."
@@ -26,29 +70,25 @@ msgstr "Nu se găsește în agendă."
 msgid "Contact could not be found."
 msgstr "Contactul nu a putut fi găsit."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "vCard nu poate fi citit."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informațiile despre vCard sunt incorecte. Reîncărcați pagina."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresă"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizație"
@@ -85,6 +125,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Pager"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Nu este contactul tău"
@@ -97,88 +141,83 @@ msgstr "Nu este compatibil RFC"
 msgid "This card does not contain a photo."
 msgstr "Nu conține o fotografie"
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Adaugă contact"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Grup"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Nume"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "CP"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Extins"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Stradă"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "OraÈ™"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Regiune"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Cod poștal"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Țară"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Crează contact"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Alegeți una din agendele active"
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
-msgstr ""
+msgstr "Agendă nouă"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "Link CardDev"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "Descarcă"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -189,36 +228,44 @@ msgid "Delete"
 msgstr "Șterge"
 
 #: templates/part.details.php:3
-msgid "Delete contact"
+msgid "Download contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:4
+msgid "Delete contact"
+msgstr "Șterge contact"
+
+#: templates/part.details.php:34
 msgid "Add"
+msgstr "Adaugă"
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Numele afișat"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Activ"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Salvează"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Trimite"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Anulează"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -226,7 +273,7 @@ msgstr "Zi de naștere"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Preferat"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -234,6 +281,10 @@ msgstr "Telefon"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
+msgstr "Update"
+
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
 msgstr ""
 
 
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index e2733bcd92c..a1d3e867b1b 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Claudiu  <claudiu@tanaselia.ro>, 2011.
+# Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-12 13:20+0000\n"
+"Last-Translator: Claudiu <claudiu@tanaselia.ro>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Resetare parolă Owncloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Folosiți următorul link pentru a reseta parola: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -54,7 +54,7 @@ msgstr "Parola a fost resetată"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Spre pagina de login"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -135,7 +135,7 @@ msgstr "Finalizează instalarea"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "Servicii web sub controlul tău"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -155,7 +155,7 @@ msgstr "ține minte"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Autentificare"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 75238faf59a..c66c38c8c2e 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Claudiu  <claudiu@tanaselia.ro>, 2011.
+# Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-12 13:21+0000\n"
+"Last-Translator: Claudiu <claudiu@tanaselia.ro>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,19 +58,19 @@ msgstr "Dimensiunea maximă"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Nou"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "Fișier text"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Dosar"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "De pe internet"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/ro/gallery.po b/l10n/ro/gallery.po
new file mode 100644
index 00000000000..decdaf40924
--- /dev/null
+++ b/l10n/ro/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 1dac0ec035e..b6151572e85 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Claudiu  <claudiu@tanaselia.ro>, 2011.
+# Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-12 13:22+0000\n"
+"Last-Translator: Claudiu <claudiu@tanaselia.ro>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "email schimbat"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -36,7 +36,7 @@ msgstr "Limba a fost schimbată"
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Nivel log-uri"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -104,15 +104,15 @@ msgstr "Schimbă parola"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Adresa ta de email"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Completați adresa de mail pentru a vă putea recupera parola"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -120,7 +120,7 @@ msgstr "Limba"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Ajutați la traducere"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -146,7 +146,7 @@ msgstr "Crează"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Quota"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/ru/calendar.po b/l10n/ru/calendar.po
index f2879ad1504..ced4bad48e3 100644
--- a/l10n/ru/calendar.po
+++ b/l10n/ru/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,321 +19,403 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Ошибка аутентификации"
-
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
-msgstr "�еверный календарь"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
 
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Ча�овой по�� изменён"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "�еверный запро�"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Календарь"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "�еверный календарь"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
 msgstr "День рождени�"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
 msgstr "Бизне�"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
 msgstr "Звонить"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
 msgstr "Клиенты"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
 msgstr "До�тавщик"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
 msgstr "Праздники"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
 msgstr "Идеи"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
 msgstr "Поездка"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
 msgstr "Юбилей"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
 msgstr "В�треча"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
 msgstr "Другое"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
 msgstr "Личное"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
 msgstr "Проекты"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
 msgstr "Вопро�ы"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
 msgstr "Работа"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "�е повтор�ет��"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "Ежедневно"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "Еженедельно"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "По будн�м"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "Каждые две недели"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "Каждый ме��ц"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "Каждый год"
 
-#: lib/object.php:337
-msgid "Not an array"
-msgstr "�е ма��ив"
+#: lib/object.php:366
+msgid "never"
+msgstr ""
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Ве�ь день"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Во�кре�енье"
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr "Понедельник"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr "Вторник"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr "Среда"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr "Четверг"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr "П�тница"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr "Суббота"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "В�."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Пн."
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Ð’Ñ‚."
+#: lib/object.php:397
+msgid "first"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Ср."
+#: lib/object.php:398
+msgid "second"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Чт."
+#: lib/object.php:399
+msgid "third"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Пт."
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Сб."
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr "Январь"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr "Февраль"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr "Март"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr "�прель"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr "Май"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr "Июнь"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr "Июль"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr "�вгу�т"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr "Сент�брь"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr "Окт�брь"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr "�о�брь"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr "Декабрь"
-
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr "Янв."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr "Фев."
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr "Мар."
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr "�пр."
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "May."
-msgstr "Май."
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jun."
-msgstr "Июн."
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "�е ма��ив"
 
-#: templates/calendar.php:35
-msgid "Jul."
-msgstr "Июл."
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Aug."
-msgstr "�вг."
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Sep."
-msgstr "Сен."
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Ве�ь день"
 
-#: templates/calendar.php:35
-msgid "Oct."
-msgstr "Окт."
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "�езаполненные пол�"
 
-#: templates/calendar.php:35
-msgid "Nov."
-msgstr "�о�."
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "�азвание"
 
-#: templates/calendar.php:35
-msgid "Dec."
-msgstr "Дек."
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Дата начала"
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "�едел�"
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Врем� начала"
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "�едели"
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Дата окончани�"
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr "Еще до {startdate}"
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Врем� окончани�"
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr "Больше по�ле {startdate}"
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Окончание �обыти� раньше, чем его начало"
 
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "День"
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Ошибка базы данных"
 
 #: templates/calendar.php:52
+msgid "Week"
+msgstr "�едел�"
+
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Ме��ц"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:54
 msgid "List"
 msgstr "Спи�ок"
 
-#: templates/calendar.php:58
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Сегодн�"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Календари"
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Врем�"
-
-#: templates/calendar.php:169
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "�е удало�ь обработать файл."
 
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Выберите активные календари"
@@ -352,14 +434,13 @@ msgid "Download"
 msgstr "Скачать"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Редактировать"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Удалить"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -377,90 +458,181 @@ msgstr "Отображаемое им�"
 msgid "Active"
 msgstr "�ктивен"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Опи�ание"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Цвет календар�"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
 msgstr "Сохранить"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Отправить"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
 msgstr "Отмена"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Редактировать �обытие"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "�азвание"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Эк�портировать"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "�азвание �обытие"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Ме�то"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Ме�то �обыти�"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Категори�"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
 msgstr "Выбрать категорию"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Событие на ве�ь день"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "От"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "До"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Дополнительные параметры"
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Повтор"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "При�ут�твующие"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Ме�то"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Ме�то �обыти�"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Опи�ание"
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Опи�ание �обыти�"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Закрыть"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "Пожалуй�та, выберите календарь"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "Импортировать"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Создать новое �обытие"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Ча�овой по��"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Формат времени"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24ч"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12ч"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "�дре� �инхронизации календар� CalDAV:"
+
 
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index b61240bf43b..9dad5b14158 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Это не ваша адре�на� книга."
@@ -26,29 +70,25 @@ msgstr "Это не ваша адре�на� книга."
 msgid "Contact could not be found."
 msgstr "Контакт не найден."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "�е удало�ь проче�ть vCard."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Информаци� о vCard некорректна. Пожалуй�та, обновите �траницу."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "�дре�"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Ящик �л. почты"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Организаци�"
@@ -85,6 +125,10 @@ msgstr "Видео"
 msgid "Pager"
 msgstr "Пейджер"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Это не контакт."
@@ -97,68 +141,64 @@ msgstr "Эта карточка не �оответ�твует RFC."
 msgid "This card does not contain a photo."
 msgstr "Эта карточка не �одержит фотографии."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Добавить Контакт"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Группа"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Им�"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "�О"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Ра�ширенный"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Улица"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Город"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Обла�ть"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Почтовый индек�"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Страна"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Создать Контакт"
 
@@ -167,7 +207,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -189,15 +228,23 @@ msgid "Delete"
 msgstr "Удалить"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -236,4 +283,8 @@ msgstr "Телефон"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/ru/gallery.po b/l10n/ru/gallery.po
new file mode 100644
index 00000000000..edfc8f026a3
--- /dev/null
+++ b/l10n/ru/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/sk_SK/calendar.po b/l10n/sk_SK/calendar.po
index b1866548904..4f64b09a236 100644
--- a/l10n/sk_SK/calendar.po
+++ b/l10n/sk_SK/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-07 18:29+0100\n"
-"PO-Revision-Date: 2012-01-08 08:41+0000\n"
-"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -315,27 +315,27 @@ msgstr "Udalosť kon�í ešte pred tým než za�ne"
 msgid "There was a database fail"
 msgstr "Nastala chyba databázy"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:52
 msgid "Week"
 msgstr "Týždeň"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Mesiac"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:54
 msgid "List"
 msgstr "Zoznam"
 
-#: templates/calendar.php:45
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Dnes"
 
-#: templates/calendar.php:46
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Kalendáre"
 
-#: templates/calendar.php:64
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Nastala chyba po�as parsovania súboru."
 
@@ -449,7 +449,7 @@ msgstr "Nový kalendár"
 msgid "Edit calendar"
 msgstr "Upraviť kalendár"
 
-#: templates/part.editcalendar.php:12 templates/part.import.php:29
+#: templates/part.editcalendar.php:12
 msgid "Displayname"
 msgstr "Zobrazené meno"
 
@@ -575,36 +575,36 @@ msgid "Description of the Event"
 msgstr "Popis Udalosti"
 
 #: templates/part.import.php:1
-msgid "Import Ical File"
-msgstr "Importovať Ical súbor"
-
-#: templates/part.import.php:4
-msgid "How to import the new calendar?"
-msgstr "Ako importovať nový kalendár?"
+msgid "Import a calendar file"
+msgstr ""
 
 #: templates/part.import.php:6
-msgid "Import into an existing calendar"
-msgstr "Importovať do existujúceho kalendára"
-
-#: templates/part.import.php:7
-msgid "Import into a new calendar"
-msgstr "Importovať do nového kalendára"
-
-#: templates/part.import.php:10
 msgid "Please choose the calendar"
 msgstr "Prosím zvoľte kalendár"
 
-#: templates/part.import.php:20 templates/part.import.php:37
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
 msgid "Import"
 msgstr "Importovať"
 
-#: templates/part.import.php:22 templates/part.import.php:39
-msgid "Back"
-msgstr "Späť"
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
 
-#: templates/part.import.php:25
-msgid "Please fill out the form"
-msgstr "Prosím vyplňte formulár"
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index f4c36ea5054..a24a03a3c1f 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Toto nie je váš adresár."
@@ -25,29 +69,25 @@ msgstr "Toto nie je váš adresár."
 msgid "Contact could not be found."
 msgstr "Kontakt nebol nájdený."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "vCard nemôže byť pre�ítaná."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informácie o vCard sú neplatné. Prosím obnovte stránku."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefón"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizácia"
@@ -84,6 +124,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Pager"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Toto nie je váš kontakt."
@@ -96,68 +140,64 @@ msgstr "Táto karta nie je kompatibilná s RFC."
 msgid "This card does not contain a photo."
 msgstr "Táto karta neobsahuje fotografiu."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Pridať Kontakt."
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Skupina"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Meno"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "PO Box"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Rozšírené"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Ulica"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Mesto"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Región"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "PSČ"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Krajina"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Vytvoriť Kontakt."
 
@@ -166,7 +206,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -188,15 +227,23 @@ msgid "Delete"
 msgstr "Odstrániť"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -235,4 +282,8 @@ msgstr "Telefón"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/sk_SK/gallery.po b/l10n/sk_SK/gallery.po
new file mode 100644
index 00000000000..ec1dd850cd0
--- /dev/null
+++ b/l10n/sk_SK/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/sl/calendar.po b/l10n/sl/calendar.po
index e0d14a1c09e..0c9761508e9 100644
--- a/l10n/sl/calendar.po
+++ b/l10n/sl/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-07 18:29+0100\n"
-"PO-Revision-Date: 2012-01-08 08:41+0000\n"
-"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/team/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -315,27 +315,27 @@ msgstr "Dogodek se kon�a preden se za�ne"
 msgid "There was a database fail"
 msgstr "Napaka v podatkovni bazi. Kontaktirajte Administratorja"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:52
 msgid "Week"
 msgstr "Teden"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Mesec"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:54
 msgid "List"
 msgstr "Seznam"
 
-#: templates/calendar.php:45
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Danes"
 
-#: templates/calendar.php:46
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Kolendarji"
 
-#: templates/calendar.php:64
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Pri raz�lenjevanju datoteke je prišlo do napake."
 
@@ -449,7 +449,7 @@ msgstr "Nov Kolendar"
 msgid "Edit calendar"
 msgstr "Uredi Kolendar"
 
-#: templates/part.editcalendar.php:12 templates/part.import.php:29
+#: templates/part.editcalendar.php:12
 msgid "Displayname"
 msgstr "Prikazano Ime"
 
@@ -575,36 +575,36 @@ msgid "Description of the Event"
 msgstr "Opis Dogodka"
 
 #: templates/part.import.php:1
-msgid "Import Ical File"
-msgstr "Uvozi iCal datoteko"
-
-#: templates/part.import.php:4
-msgid "How to import the new calendar?"
-msgstr "Koko uvozim nov kolendar?"
+msgid "Import a calendar file"
+msgstr ""
 
 #: templates/part.import.php:6
-msgid "Import into an existing calendar"
-msgstr "Uvozi v obstoje�i kolendar"
-
-#: templates/part.import.php:7
-msgid "Import into a new calendar"
-msgstr "Uvozi v nov Kolendar"
-
-#: templates/part.import.php:10
 msgid "Please choose the calendar"
 msgstr "Izberi kolendar"
 
-#: templates/part.import.php:20 templates/part.import.php:37
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
 msgid "Import"
 msgstr "Uvozi"
 
-#: templates/part.import.php:22 templates/part.import.php:39
-msgid "Back"
-msgstr "Nazaj"
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
 
-#: templates/part.import.php:25
-msgid "Please fill out the form"
-msgstr "Prosim izpolnite obrazec"
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index b492c8bb676..a57a3548574 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/team/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "To ni vaš adresar."
@@ -26,30 +70,26 @@ msgstr "To ni vaš adresar."
 msgid "Contact could not be found."
 msgstr "Kontakta ni bilo mogo�e najti."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "vVizitko (vCard) ni bilo mogo�e prebrati."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 "Informacije o vVizitki (vCard) niso pravilne, Prosimo ponovno naložite okno."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Naslov"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizacija"
@@ -86,6 +126,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Pager"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "To ni vaš kontakt"
@@ -98,68 +142,64 @@ msgstr "Ta karta ni RFC kopatibilna."
 msgid "This card does not contain a photo."
 msgstr "Ta karta ne vsebuje slike."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Dodaj Kontakt"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Skupina"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Ime"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "PO Box"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Razširjeno."
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Ulica"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Mesto"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Regija"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Poštna št."
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Dežela"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Ustvari Kontakt"
 
@@ -168,7 +208,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -190,15 +229,23 @@ msgid "Delete"
 msgstr "Izbriši"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -237,4 +284,8 @@ msgstr "Telefon"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/sl/gallery.po b/l10n/sl/gallery.po
new file mode 100644
index 00000000000..e4201f2eb23
--- /dev/null
+++ b/l10n/sl/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/team/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/sr/calendar.po b/l10n/sr/calendar.po
index 31a841e957b..8bfff379dec 100644
--- a/l10n/sr/calendar.po
+++ b/l10n/sr/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,351 +18,432 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Грешка аутентификације"
-
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Времен�ка зона је промењена"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "�еи�праван захтев"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Календар"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Погрешан календар"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
-msgstr ""
+msgstr "Рођендан"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
-msgstr ""
+msgstr "По�ао"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
-msgstr ""
+msgstr "Позив"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
-msgstr ""
+msgstr "Клијенти"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
-msgstr ""
+msgstr "До�тављач"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
-msgstr ""
+msgstr "Празници"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
-msgstr ""
+msgstr "Идеје"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
-msgstr ""
+msgstr "путовање"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
-msgstr ""
+msgstr "јубилеј"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
-msgstr ""
+msgstr "Са�танак"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
-msgstr ""
+msgstr "Друго"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
-msgstr ""
+msgstr "Лично"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
-msgstr ""
+msgstr "Пројекти"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
-msgstr ""
+msgstr "Питања"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
-msgstr ""
+msgstr "По�ао"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "�е понавља �е"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "дневно"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "недељно"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "�ваког дана у недељи"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "двонедељно"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "ме�ечно"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "годишње"
 
-#: lib/object.php:337
-msgid "Not an array"
+#: lib/object.php:366
+msgid "never"
 msgstr ""
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Цео дан"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "�едеља"
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr "Понедељак"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr "Уторак"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr "Среда"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr "Четвртак"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr "Петак"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr "Субота"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "�ед"
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Пон"
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Уто"
+#: lib/object.php:397
+msgid "first"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Сре"
+#: lib/object.php:398
+msgid "second"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "Чет"
+#: lib/object.php:399
+msgid "third"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Пет"
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Суб"
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr "Јануар"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr "Фебруар"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr "Март"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr "�прил"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr "Мај"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr "Јун"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr "Јул"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr "�вгу�т"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr "Септембар"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr "Октобар"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr "�овембар"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr "Децембар"
-
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr "Јан"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr "Феб"
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr "Мар"
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr "�пр"
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "May."
+#: lib/object.php:444
+msgid "by day and month"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jun."
-msgstr "Јун"
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "�ије обла�т"
 
-#: templates/calendar.php:35
-msgid "Jul."
-msgstr "Јул"
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Aug."
-msgstr "�вг"
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Sep."
-msgstr "Сеп"
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Цео дан"
 
-#: templates/calendar.php:35
-msgid "Oct."
-msgstr "Окт"
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Nov."
-msgstr "�ов"
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "�а�лов"
 
-#: templates/calendar.php:35
-msgid "Dec."
-msgstr "Дец"
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr ""
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "�едеља"
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr ""
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "�едеља"
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr ""
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
+#: templates/calendar.php:17
+msgid "To Time"
 msgstr ""
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
 msgstr ""
 
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Дан"
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr ""
 
 #: templates/calendar.php:52
+msgid "Week"
+msgstr "�едеља"
+
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Ме�ец"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:54
 msgid "List"
-msgstr ""
+msgstr "Спи�ак"
 
-#: templates/calendar.php:58
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Дана�"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Календари"
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Време"
-
-#: templates/calendar.php:169
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "дошло је до грешке при ра�члањивању фајла."
 
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Изаберите активне календаре"
 
 #: templates/part.choosecalendar.php:15
 msgid "New Calendar"
-msgstr ""
+msgstr "�ови календар"
 
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr ""
+msgstr "КалДав веза"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
 msgstr "Преузми"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Уреди"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Обриши"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "�ови календар"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
@@ -376,90 +457,181 @@ msgstr "Приказаноиме"
 msgid "Active"
 msgstr "�ктиван"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Опи�"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Боја календара"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Сними"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Пошаљи"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Откажи"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Уреди догађај"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "�а�лов"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "�а�лов догађаја"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Локација"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Локација догађаја"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Категорија"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
-msgstr ""
+msgstr "Изаберите категорију"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Целодневни догађај"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "Од"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "До"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Понављај"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "При�утни"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Локација"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Локација догађаја"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Опи�"
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Опи� догађаја"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Затвори"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "�аправи нови догађај"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Времен�ка зона"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 5f2a473f540..5ea7d2b6d3f 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Ово није ваш адре�ар."
@@ -26,29 +70,25 @@ msgstr "Ово није ваш адре�ар."
 msgid "Contact could not be found."
 msgstr "Контакт �е не може наћи."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "вКарта �е не може читати."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Подаци о вКарти �у неи�правни. Поново учитајте �траницу."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "�дре�а"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Е-маил"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Организација"
@@ -85,6 +125,10 @@ msgstr "Видео"
 msgid "Pager"
 msgstr "Пејџер"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Ово није ваш контакт."
@@ -97,68 +141,64 @@ msgstr "Ова карта није �агла�на �а РФЦ-ом."
 msgid "This card does not contain a photo."
 msgstr "Ова карта не �адржи фотографију."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Додај контакт"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Група"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Име"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Поштан�ки број"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Прошири"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Улица"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Град"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Регија"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Зип код"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Земља"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "�аправи контакт"
 
@@ -167,7 +207,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -189,15 +228,23 @@ msgid "Delete"
 msgstr "Обриши"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -236,4 +283,8 @@ msgstr "Телефон"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/sr/gallery.po b/l10n/sr/gallery.po
new file mode 100644
index 00000000000..01a1cbaae8c
--- /dev/null
+++ b/l10n/sr/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/sr@latin/calendar.po b/l10n/sr@latin/calendar.po
index 30f68f4e4d7..9d94f4adbb7 100644
--- a/l10n/sr@latin/calendar.po
+++ b/l10n/sr@latin/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/team/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,351 +18,432 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "Greška autentifikacije"
-
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "Vremenska zona je promenjena"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "Neispravan zahtev"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Pogrešan kalendar"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
-msgstr ""
+msgstr "Rođendan"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
-msgstr ""
+msgstr "Posao"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
-msgstr ""
+msgstr "Poziv"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
-msgstr ""
+msgstr "Klijenti"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
-msgstr ""
+msgstr "Dostavlja�"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
-msgstr ""
+msgstr "Praznici"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
-msgstr ""
+msgstr "Ideje"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
-msgstr ""
+msgstr "putovanje"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
-msgstr ""
+msgstr "jubilej"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
-msgstr ""
+msgstr "Sastanak"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
-msgstr ""
+msgstr "Drugo"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
-msgstr ""
+msgstr "Li�no"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
-msgstr ""
+msgstr "Projekti"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
-msgstr ""
+msgstr "Pitanja"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
-msgstr ""
+msgstr "Posao"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "Ne ponavlja se"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "dnevno"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "nedeljno"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "svakog dana u nedelji"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "dvonedeljno"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "mese�no"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "godišnje"
 
-#: lib/object.php:337
-msgid "Not an array"
+#: lib/object.php:366
+msgid "never"
 msgstr ""
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "Ceo dan"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "Nedelja"
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr "Ponedeljak"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr "Utorak"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr "Sreda"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr "ÄŒetvrtak"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr "Petak"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr "Subota"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "Ned"
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "Pon"
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "Uto"
+#: lib/object.php:397
+msgid "first"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "Sre"
+#: lib/object.php:398
+msgid "second"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "ÄŒet"
+#: lib/object.php:399
+msgid "third"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "Pet"
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "Sub"
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr "Januar"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr "Februar"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr "Mart"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr "April"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr "Maj"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr "Jun"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr "Jul"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr "Avgust"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr "Septembar"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr "Oktobar"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr "Novembar"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr "Decembar"
-
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr "Jan"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr "Feb"
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr "Mar"
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr "Apr"
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "May."
+#: lib/object.php:444
+msgid "by day and month"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jun."
-msgstr "Jun"
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "Nije oblast"
 
-#: templates/calendar.php:35
-msgid "Jul."
-msgstr "Jul"
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Aug."
-msgstr "Avg"
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Sep."
-msgstr "Sep"
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Ceo dan"
 
-#: templates/calendar.php:35
-msgid "Oct."
-msgstr "Okt"
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Nov."
-msgstr "Nov"
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Naslov"
 
-#: templates/calendar.php:35
-msgid "Dec."
-msgstr "Dec"
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr ""
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "Nedelja"
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr ""
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "Nedelja"
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr ""
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
+#: templates/calendar.php:17
+msgid "To Time"
 msgstr ""
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
 msgstr ""
 
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "Dan"
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr ""
 
 #: templates/calendar.php:52
+msgid "Week"
+msgstr "Nedelja"
+
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Mesec"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:54
 msgid "List"
-msgstr ""
+msgstr "Spisak"
 
-#: templates/calendar.php:58
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Danas"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Kalendari"
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "Vreme"
-
-#: templates/calendar.php:169
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "došlo je do greške pri ras�lanjivanju fajla."
 
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Izaberite aktivne kalendare"
 
 #: templates/part.choosecalendar.php:15
 msgid "New Calendar"
-msgstr ""
+msgstr "Novi kalendar"
 
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr ""
+msgstr "KalDav veza"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
 msgstr "Preuzmi"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "Uredi"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Obriši"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "Novi kalendar"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
@@ -376,90 +457,181 @@ msgstr "Prikazanoime"
 msgid "Active"
 msgstr "Aktivan"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "Opis"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "Boja kalendara"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Snimi"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "Pošalji"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "Uredi događaj"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "Naslov"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "Naslov događaja"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "Lokacija"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "Lokacija događaja"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "Kategorija"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
-msgstr ""
+msgstr "Izaberite kategoriju"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "Celodnevni događaj"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "Od"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "Do"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "Ponavljaj"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "Prisutni"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Lokacija"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Lokacija događaja"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Opis"
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "Opis događaja"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "Zatvori"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "Napravi novi događaj"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "Vremenska zona"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index 428c4453ead..6021f675d90 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/team/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
@@ -26,29 +70,25 @@ msgstr "Ovo nije vaš adresar."
 msgid "Contact could not be found."
 msgstr "Kontakt se ne može naći."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "vKarta se ne može �itati."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Podaci o vKarti su neispravni. Ponovo u�itajte stranicu."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizacija"
@@ -85,6 +125,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Pejdžer"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Ovo nije vaš kontakt."
@@ -97,68 +141,64 @@ msgstr "Ova karta nije saglasna sa RFC-om."
 msgid "This card does not contain a photo."
 msgstr "Ova karta ne sadrži fotografiju."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Grupa"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Ime"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Poštanski broj"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Proširi"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Ulica"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Grad"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Regija"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Zip kod"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Zemlja"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Napravi kontakt"
 
@@ -167,7 +207,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -189,15 +228,23 @@ msgid "Delete"
 msgstr "Obriši"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -236,4 +283,8 @@ msgstr "Telefon"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/sr@latin/gallery.po b/l10n/sr@latin/gallery.po
new file mode 100644
index 00000000000..c0517c438fa
--- /dev/null
+++ b/l10n/sr@latin/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/team/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/sv/calendar.po b/l10n/sv/calendar.po
index db5536fcbc9..4d3e02d4eff 100644
--- a/l10n/sv/calendar.po
+++ b/l10n/sv/calendar.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <revoltism@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,448 +18,620 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
 msgstr ""
 
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
-msgstr ""
-
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
-msgstr ""
+msgstr "Tidszon ändrad"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
-msgstr ""
+msgstr "Ogiltig begäran"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
-msgstr ""
+msgstr "Kalender"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "Fel kalender"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
-msgstr ""
+msgstr "Födelsedag"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
-msgstr ""
+msgstr "Företag"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
-msgstr ""
+msgstr "Ringa"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
-msgstr ""
+msgstr "Klienter"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
-msgstr ""
+msgstr "Leverantör"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
-msgstr ""
+msgstr "Semester"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
-msgstr ""
+msgstr "Idéer"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
-msgstr ""
+msgstr "Resa"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
-msgstr ""
+msgstr "Jubileum"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
-msgstr ""
+msgstr "Möte"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
-msgstr ""
+msgstr "Annat"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
-msgstr ""
+msgstr "Personlig"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
-msgstr ""
+msgstr "Projekt"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
-msgstr ""
+msgstr "Frågor"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
-msgstr ""
+msgstr "Arbetet"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
-msgstr ""
+msgstr "Upprepas inte"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
-msgstr ""
+msgstr "Dagligen"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
-msgstr ""
+msgstr "Varje vecka"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
-msgstr ""
+msgstr "Varje vardag"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
-msgstr ""
+msgstr "Varannan vecka"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
-msgstr ""
+msgstr "Varje månad"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
+msgstr "Ã…rligen"
+
+#: lib/object.php:366
+msgid "never"
 msgstr ""
 
-#: lib/object.php:337
-msgid "Not an array"
+#: lib/object.php:367
+msgid "by occurrences"
 msgstr ""
 
-#: templates/calendar.php:3
-msgid "All day"
+#: lib/object.php:368
+msgid "by date"
 msgstr ""
 
-#: templates/calendar.php:32
-msgid "Sunday"
+#: lib/object.php:375
+msgid "by monthday"
 msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
 msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
 msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
 msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
 msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
 msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
 msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sun."
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
 msgstr ""
 
-#: templates/calendar.php:33
-msgid "Mon."
+#: lib/object.php:396
+msgid "events week of month"
 msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
+#: lib/object.php:397
+msgid "first"
 msgstr ""
 
-#: templates/calendar.php:33
-msgid "Wed."
+#: lib/object.php:398
+msgid "second"
 msgstr ""
 
-#: templates/calendar.php:33
-msgid "Thu."
+#: lib/object.php:399
+msgid "third"
 msgstr ""
 
-#: templates/calendar.php:33
-msgid "Fri."
+#: lib/object.php:400
+msgid "fourth"
 msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sat."
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
 msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jan."
+#: lib/object.php:441
+msgid "by events date"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Feb."
+#: lib/object.php:442
+msgid "by yearday(s)"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Mar."
+#: lib/object.php:443
+msgid "by weeknumber(s)"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Apr."
+#: lib/object.php:444
+msgid "by day and month"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "May."
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "ingen rad"
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jun."
+#: lib/search.php:40
+msgid "Cal."
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jul."
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "Hela dagen"
+
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "Saknade fält"
+
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "Rubrik"
+
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "Från datum"
+
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "Från tid"
+
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "Till datum"
+
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "Till tid"
+
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "Händelsen slutar innan den börjar"
+
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "Det blev ett databasfel"
+
+#: templates/calendar.php:52
+msgid "Week"
+msgstr "Vecka"
+
+#: templates/calendar.php:53
+msgid "Month"
+msgstr "MÃ¥nad"
+
+#: templates/calendar.php:54
+msgid "List"
+msgstr "Lista"
+
+#: templates/calendar.php:59
+msgid "Today"
+msgstr "Idag"
+
+#: templates/calendar.php:60
+msgid "Calendars"
+msgstr "Kalendrar"
+
+#: templates/calendar.php:78
+msgid "There was a fail, while parsing the file."
+msgstr "Det blev ett fel medan filen analyserades."
+
+#: templates/lAfix.php:9
+msgid "Sun."
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Aug."
+#: templates/lAfix.php:10
+msgid "Mon."
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Sep."
+#: templates/lAfix.php:11
+msgid "Tue."
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Oct."
+#: templates/lAfix.php:12
+msgid "Wed."
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Nov."
+#: templates/lAfix.php:13
+msgid "Thu."
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Dec."
+#: templates/lAfix.php:14
+msgid "Fri."
 msgstr ""
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
 msgstr ""
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
+#: templates/lAfix.php:29
+msgid "Feb."
 msgstr ""
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
+#: templates/lAfix.php:30
+msgid "Mar."
 msgstr ""
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
+#: templates/lAfix.php:31
+msgid "Apr."
 msgstr ""
 
-#: templates/calendar.php:49
-msgid "Day"
+#: templates/lAfix.php:32
+msgid "May."
 msgstr ""
 
-#: templates/calendar.php:52
-msgid "Month"
+#: templates/lAfix.php:33
+msgid "Jun."
 msgstr ""
 
-#: templates/calendar.php:53
-msgid "List"
+#: templates/lAfix.php:34
+msgid "Jul."
 msgstr ""
 
-#: templates/calendar.php:58
-msgid "Today"
+#: templates/lAfix.php:35
+msgid "Aug."
 msgstr ""
 
-#: templates/calendar.php:59
-msgid "Calendars"
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
 msgstr ""
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
+#: templates/lAfix.php:38
+msgid "Nov."
 msgstr ""
 
-#: templates/calendar.php:169
-msgid "There was a fail, while parsing the file."
+#: templates/lAfix.php:39
+msgid "Dec."
 msgstr ""
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
-msgstr ""
+msgstr "Välj aktiva kalendrar"
 
 #: templates/part.choosecalendar.php:15
 msgid "New Calendar"
-msgstr ""
+msgstr "Ny kalender"
 
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr ""
+msgstr "CalDAV-länk"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
-msgstr ""
+msgstr "Ladda ner"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
-msgstr ""
+msgstr "Redigera"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Radera"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "Nya kalender"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
-msgstr ""
+msgstr "Redigera kalender"
 
 #: templates/part.editcalendar.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Visningsnamn"
 
 #: templates/part.editcalendar.php:23
 msgid "Active"
-msgstr ""
-
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr ""
+msgstr "Aktiv"
 
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
-msgstr ""
+msgstr "Kalender-färg"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Spara"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Lägg till"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
-msgstr ""
+msgstr "Redigera en händelse"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr ""
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "Exportera"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
+msgstr "Rubrik för händelsen"
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr "Kategori"
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr "Välj kategori"
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr "Hela dagen"
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr "Från"
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr "Till"
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "Avancerade alternativ"
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr "Upprepa"
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
 msgstr ""
 
-#: templates/part.eventform.php:11
-msgid "Location of the Event"
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
 msgstr ""
 
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
-msgid "Category"
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:19
-msgid "Select category"
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
-msgid "All Day Event"
+#: templates/part.eventform.php:151
+msgid "Select months"
 msgstr ""
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
-msgid "From"
+#: templates/part.eventform.php:164
+msgid "Select weeks"
 msgstr ""
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
-msgid "To"
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
-msgid "Repeat"
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
+#: templates/part.eventform.php:193
+msgid "occurrences"
 msgstr ""
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "Plats"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "Platsen för händelsen"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "Beskrivning"
+
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
+msgstr "Beskrivning av händelse"
+
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "Välj kalender"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "Importera"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
 msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
-msgstr ""
+msgstr "Skapa en ny händelse"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
+msgstr "Tidszon"
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
 msgstr ""
 
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "Tidsformat"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24h"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12h"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "Synkroniseringsadress för CalDAV kalender:"
+
 
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index ad78ed44871..a60e600c6d4 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Det här är inte din adressbok."
@@ -26,29 +70,25 @@ msgstr "Det här är inte din adressbok."
 msgid "Contact could not be found."
 msgstr "Kontakt kunde inte hittas."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "vCard kunde inte läsas in."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Information om vCard är felaktigt. Vänligen ladda om sidan."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organisation"
@@ -85,6 +125,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Personsökare"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Det här är inte din kontakt."
@@ -97,68 +141,64 @@ msgstr "Detta kort är inte RFC-kompatibelt."
 msgid "This card does not contain a photo."
 msgstr "Detta kort innehåller inte något foto."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "Lägg till kontakt"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Grupp"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Namn"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Postbox"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Utökad"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Gata"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Stad"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Län"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Postnummer"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Land"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "Skapa kontakt"
 
@@ -167,7 +207,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -189,15 +228,23 @@ msgid "Delete"
 msgstr "Radera"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -236,4 +283,8 @@ msgstr "Telefon"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/sv/gallery.po b/l10n/sv/gallery.po
new file mode 100644
index 00000000000..623b3fe1aeb
--- /dev/null
+++ b/l10n/sv/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 9bcac2da988..2ccfc8c0f92 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -314,27 +314,27 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:52
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:53
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:54
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:45
+#: templates/calendar.php:59
 msgid "Today"
 msgstr ""
 
-#: templates/calendar.php:46
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr ""
 
-#: templates/calendar.php:64
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr ""
 
@@ -448,7 +448,7 @@ msgstr ""
 msgid "Edit calendar"
 msgstr ""
 
-#: templates/part.editcalendar.php:12 templates/part.import.php:29
+#: templates/part.editcalendar.php:12
 msgid "Displayname"
 msgstr ""
 
@@ -574,35 +574,35 @@ msgid "Description of the Event"
 msgstr ""
 
 #: templates/part.import.php:1
-msgid "Import Ical File"
-msgstr ""
-
-#: templates/part.import.php:4
-msgid "How to import the new calendar?"
+msgid "Import a calendar file"
 msgstr ""
 
 #: templates/part.import.php:6
-msgid "Import into an existing calendar"
+msgid "Please choose the calendar"
 msgstr ""
 
-#: templates/part.import.php:7
-msgid "Import into a new calendar"
+#: templates/part.import.php:10
+msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.import.php:10
-msgid "Please choose the calendar"
+#: templates/part.import.php:15
+msgid "Name of new calendar"
 msgstr ""
 
-#: templates/part.import.php:20 templates/part.import.php:37
+#: templates/part.import.php:17
 msgid "Import"
 msgstr ""
 
-#: templates/part.import.php:22 templates/part.import.php:39
-msgid "Back"
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
 msgstr ""
 
-#: templates/part.import.php:25
-msgid "Please fill out the form"
+#: templates/part.import.php:24
+msgid "Close Dialog"
 msgstr ""
 
 #: templates/part.newevent.php:1
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index bc72053cd50..f2d99d896d9 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,50 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr ""
@@ -25,29 +69,25 @@ msgstr ""
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr ""
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr ""
@@ -84,6 +124,10 @@ msgstr ""
 msgid "Pager"
 msgstr ""
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr ""
@@ -96,68 +140,64 @@ msgstr ""
 msgid "This card does not contain a photo."
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
+msgid "Addressbook"
 msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr ""
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr ""
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr ""
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr ""
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr ""
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr ""
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr ""
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr ""
 
@@ -166,7 +206,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -188,15 +227,23 @@ msgid "Delete"
 msgstr ""
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -234,3 +281,7 @@ msgstr ""
 #: templates/part.setpropertyform.php:57
 msgid "Update"
 msgstr ""
+
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index cf13c461196..16f328aea2a 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 82e2f1832f1..d5f6e43db87 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
new file mode 100644
index 00000000000..255295569da
--- /dev/null
+++ b/l10n/templates/gallery.pot
@@ -0,0 +1,30 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 400e39c3f24..e1a750f3b6e 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: appinfo/app.php:32
+#: appinfo/app.php:32 templates/player.php:9
 msgid "Music"
 msgstr ""
 
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 6f5b1a4daae..0142d2a8378 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/tr/calendar.po b/l10n/tr/calendar.po
index 6b98fe02158..6025d7e6bb6 100644
--- a/l10n/tr/calendar.po
+++ b/l10n/tr/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-07 18:29+0100\n"
-"PO-Revision-Date: 2012-01-08 08:41+0000\n"
-"Last-Translator: george <georg.stefan.germany@googlemail.com>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/team/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -315,27 +315,27 @@ msgstr "Olay başlamadan önce bitiyor"
 msgid "There was a database fail"
 msgstr "Bir veritabanı başarısızlığı oluştu"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:52
 msgid "Week"
 msgstr "Hafta"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "Ay"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:54
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:45
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "Bugün"
 
-#: templates/calendar.php:46
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "Takvimler"
 
-#: templates/calendar.php:64
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "Dosya okunurken başarısızlık oldu."
 
@@ -449,7 +449,7 @@ msgstr "Yeni takvim"
 msgid "Edit calendar"
 msgstr "Takvimi düzenle"
 
-#: templates/part.editcalendar.php:12 templates/part.import.php:29
+#: templates/part.editcalendar.php:12
 msgid "Displayname"
 msgstr "Görünümadı"
 
@@ -575,36 +575,36 @@ msgid "Description of the Event"
 msgstr "Olayın Açıklaması"
 
 #: templates/part.import.php:1
-msgid "Import Ical File"
-msgstr "Ical Dosyası Al"
-
-#: templates/part.import.php:4
-msgid "How to import the new calendar?"
-msgstr "Yeni takvim nasıl alınsın?"
+msgid "Import a calendar file"
+msgstr ""
 
 #: templates/part.import.php:6
-msgid "Import into an existing calendar"
-msgstr "Mevcut bir takvimin içine al"
-
-#: templates/part.import.php:7
-msgid "Import into a new calendar"
-msgstr "Yeni bir takvim içine al"
-
-#: templates/part.import.php:10
 msgid "Please choose the calendar"
 msgstr "Lütfen takvimi seçin"
 
-#: templates/part.import.php:20 templates/part.import.php:37
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
 msgid "Import"
 msgstr "İçe Al"
 
-#: templates/part.import.php:22 templates/part.import.php:39
-msgid "Back"
-msgstr "Geri"
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
 
-#: templates/part.import.php:25
-msgid "Please fill out the form"
-msgstr "Lütfen formu doldurun"
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index b512c14d33f..68f1eb542f3 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/team/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "Bu sizin adres defteriniz deÄŸil."
@@ -26,29 +70,25 @@ msgstr "Bu sizin adres defteriniz deÄŸil."
 msgid "Contact could not be found."
 msgstr "Kişi bulunamadı."
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "vCard okunamadı."
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin."
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Eposta"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizasyon"
@@ -85,6 +125,10 @@ msgstr "Video"
 msgid "Pager"
 msgstr "Sayfalayıcı"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "Bu sizin kiÅŸiniz deÄŸil."
@@ -97,68 +141,64 @@ msgstr "Bu kart RFC uyumlu deÄŸil."
 msgid "This card does not contain a photo."
 msgstr "Bu kart resim içermiyor."
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "KiÅŸi Ekle"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "Grup"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "Ad"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "Posta Kutusu"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "Uzatılmış"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "Sokak"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "Åžehir"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "Bölge"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "Posta kodu"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "Ãœlke"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "KiÅŸi OluÅŸtur"
 
@@ -167,7 +207,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -189,15 +228,23 @@ msgid "Delete"
 msgstr "Sil"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -236,4 +283,8 @@ msgstr "Telefon"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/tr/gallery.po b/l10n/tr/gallery.po
new file mode 100644
index 00000000000..7e1f517fbb7
--- /dev/null
+++ b/l10n/tr/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/team/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/zh_CN/calendar.po b/l10n/zh_CN/calendar.po
index 7e2d49b529b..a6e29f7bd02 100644
--- a/l10n/zh_CN/calendar.po
+++ b/l10n/zh_CN/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2011-09-24 23:05+0200\n"
-"PO-Revision-Date: 2011-09-24 21:05+0000\n"
-"Last-Translator: JanCBorchardt <jan@unhosted.org>\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,351 +18,432 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/createcalendar.php:18 ajax/settimezone.php:19
-#: ajax/updatecalendar.php:18
-msgid "Authentication error"
-msgstr "验�错误"
-
-#: ajax/editeventform.php:25
-msgid "Wrong calendar"
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settimezone.php:27
+#: ajax/settimezone.php:22
 msgid "Timezone changed"
 msgstr "时区已修改"
 
-#: ajax/settimezone.php:29
+#: ajax/settimezone.php:24
 msgid "Invalid request"
 msgstr "�法请求"
 
-#: appinfo/app.php:19 templates/part.eventform.php:27
-#: templates/part.eventinfo.php:18
+#: appinfo/app.php:20 templates/calendar.php:13
+#: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "日历"
 
-#: lib/object.php:292
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "错误的日历"
+
+#: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
-msgstr ""
+msgstr "生日"
 
-#: lib/object.php:293
+#: lib/app.php:61 lib/object.php:333
 msgid "Business"
-msgstr ""
+msgstr "商务"
 
-#: lib/object.php:294
+#: lib/app.php:62 lib/object.php:334
 msgid "Call"
-msgstr ""
+msgstr "呼�"
 
-#: lib/object.php:295
+#: lib/app.php:63 lib/object.php:335
 msgid "Clients"
-msgstr ""
+msgstr "客户"
 
-#: lib/object.php:296
+#: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
-msgstr ""
+msgstr "派�"
 
-#: lib/object.php:297
+#: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
-msgstr ""
+msgstr "节日"
 
-#: lib/object.php:298
+#: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
-msgstr ""
+msgstr "想法"
 
-#: lib/object.php:299
+#: lib/app.php:67 lib/object.php:339
 msgid "Journey"
-msgstr ""
+msgstr "旅行"
 
-#: lib/object.php:300
+#: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
-msgstr ""
+msgstr "周年纪念"
 
-#: lib/object.php:301
+#: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
-msgstr ""
+msgstr "会议"
 
-#: lib/object.php:302
+#: lib/app.php:70 lib/object.php:342
 msgid "Other"
-msgstr ""
+msgstr "其他"
 
-#: lib/object.php:303
+#: lib/app.php:71 lib/object.php:343
 msgid "Personal"
-msgstr ""
+msgstr "个人"
 
-#: lib/object.php:304
+#: lib/app.php:72 lib/object.php:344
 msgid "Projects"
-msgstr ""
+msgstr "项目"
 
-#: lib/object.php:305
+#: lib/app.php:73 lib/object.php:345
 msgid "Questions"
-msgstr ""
+msgstr "问题"
 
-#: lib/object.php:306
+#: lib/app.php:74 lib/object.php:346
 msgid "Work"
-msgstr ""
+msgstr "工作"
 
-#: lib/object.php:313
+#: lib/object.php:353
 msgid "Does not repeat"
 msgstr "���"
 
-#: lib/object.php:314
+#: lib/object.php:354
 msgid "Daily"
 msgstr "�天"
 
-#: lib/object.php:315
+#: lib/object.php:355
 msgid "Weekly"
 msgstr "�周"
 
-#: lib/object.php:316
+#: lib/object.php:356
 msgid "Every Weekday"
 msgstr "�个工作日"
 
-#: lib/object.php:317
+#: lib/object.php:357
 msgid "Bi-Weekly"
 msgstr "�两周"
 
-#: lib/object.php:318
+#: lib/object.php:358
 msgid "Monthly"
 msgstr "�月"
 
-#: lib/object.php:319
+#: lib/object.php:359
 msgid "Yearly"
 msgstr "�年"
 
-#: lib/object.php:337
-msgid "Not an array"
+#: lib/object.php:366
+msgid "never"
 msgstr ""
 
-#: templates/calendar.php:3
-msgid "All day"
-msgstr "全天"
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
 
-#: templates/calendar.php:32
-msgid "Sunday"
-msgstr "星期日"
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr "星期一"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr "星期二"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr "星期三"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr "星期四"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr "星期五"
+msgstr ""
 
-#: templates/calendar.php:32
+#: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr "星期六"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sun."
-msgstr "æ—¥"
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Mon."
-msgstr "一"
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Tue."
-msgstr "二"
+#: lib/object.php:397
+msgid "first"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Wed."
-msgstr "三"
+#: lib/object.php:398
+msgid "second"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Thu."
-msgstr "å››"
+#: lib/object.php:399
+msgid "third"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Fri."
-msgstr "五"
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
 
-#: templates/calendar.php:33
-msgid "Sat."
-msgstr "å…­"
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr "1月"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr "2月"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr "3月"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr "4月"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr "5月"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr "6月"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr "7月"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr "8月"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr "9月"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr "10月"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr "11月"
+msgstr ""
 
-#: templates/calendar.php:34
+#: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr "12月"
-
-#: templates/calendar.php:35
-msgid "Jan."
-msgstr "1月"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Feb."
-msgstr "2月"
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Mar."
-msgstr "3月"
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Apr."
-msgstr "4月"
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "May."
+#: lib/object.php:444
+msgid "by day and month"
 msgstr ""
 
-#: templates/calendar.php:35
-msgid "Jun."
-msgstr "6月"
+#: lib/object.php:467
+msgid "Not an array"
+msgstr "�是一个数组"
 
-#: templates/calendar.php:35
-msgid "Jul."
-msgstr "7月"
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Aug."
-msgstr "8月"
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
 
-#: templates/calendar.php:35
-msgid "Sep."
-msgstr "9月"
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "全天"
 
-#: templates/calendar.php:35
-msgid "Oct."
-msgstr "10月"
+#: templates/calendar.php:11
+msgid "Missing fields"
+msgstr "缺少字段"
 
-#: templates/calendar.php:35
-msgid "Nov."
-msgstr "11月"
+#: templates/calendar.php:12 templates/part.eventform.php:3
+msgid "Title"
+msgstr "标题"
 
-#: templates/calendar.php:35
-msgid "Dec."
-msgstr "12月"
+#: templates/calendar.php:14
+msgid "From Date"
+msgstr "从"
 
-#: templates/calendar.php:36 templates/calendar.php:50
-#: templates/calendar.php:116
-msgid "Week"
-msgstr "星期"
+#: templates/calendar.php:15
+msgid "From Time"
+msgstr "从"
 
-#: templates/calendar.php:37 templates/calendar.php:51
-msgid "Weeks"
-msgstr "星期"
+#: templates/calendar.php:16
+msgid "To Date"
+msgstr "至"
 
-#: templates/calendar.php:38
-msgid "More before {startdate}"
-msgstr ""
+#: templates/calendar.php:17
+msgid "To Time"
+msgstr "至"
 
-#: templates/calendar.php:39
-msgid "More after {enddate}"
-msgstr ""
+#: templates/calendar.php:18
+msgid "The event ends before it starts"
+msgstr "事件在开始�已结�"
 
-#: templates/calendar.php:49
-msgid "Day"
-msgstr "天"
+#: templates/calendar.php:19
+msgid "There was a database fail"
+msgstr "数�库访问失败"
 
 #: templates/calendar.php:52
+msgid "Week"
+msgstr "星期"
+
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "月"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:54
 msgid "List"
-msgstr ""
+msgstr "列表"
 
-#: templates/calendar.php:58
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "今天"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "日历"
 
-#: templates/calendar.php:76 templates/calendar.php:94
-msgid "Time"
-msgstr "时间"
-
-#: templates/calendar.php:169
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "解�文件失败"
 
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "选择活动日历"
 
 #: templates/part.choosecalendar.php:15
 msgid "New Calendar"
-msgstr ""
+msgstr "新日历"
 
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr ""
+msgstr "CalDav 链接"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
 msgstr "下载"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.eventinfo.php:64
 msgid "Edit"
 msgstr "编辑"
 
 #: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:8
+#: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "删除"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "新日历"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
@@ -376,90 +457,181 @@ msgstr "显示�称"
 msgid "Active"
 msgstr "激活"
 
-#: templates/part.editcalendar.php:29 templates/part.eventform.php:88
-#: templates/part.eventinfo.php:58
-msgid "Description"
-msgstr "�述"
-
-#: templates/part.editcalendar.php:35
+#: templates/part.editcalendar.php:29
 msgid "Calendar color"
 msgstr "日历颜色"
 
-#: templates/part.editcalendar.php:41
+#: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "�存"
 
-#: templates/part.editcalendar.php:41 templates/part.editevent.php:7
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
 msgstr "�交"
 
-#: templates/part.editcalendar.php:42
+#: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "�消"
 
-#: templates/part.editevent.php:1 templates/part.eventinfo.php:1
+#: templates/part.editevent.php:1
 msgid "Edit an event"
 msgstr "编辑事件"
 
-#: templates/part.eventform.php:3 templates/part.eventinfo.php:4
-msgid "Title"
-msgstr "标题"
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "导出"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
 msgstr "事件标题"
 
-#: templates/part.eventform.php:9 templates/part.eventinfo.php:9
-msgid "Location"
-msgstr "地点"
-
 #: templates/part.eventform.php:11
-msgid "Location of the Event"
-msgstr "事件地点"
-
-#: templates/part.eventform.php:17 templates/part.eventinfo.php:16
 msgid "Category"
 msgstr "分类"
 
-#: templates/part.eventform.php:19
+#: templates/part.eventform.php:13
 msgid "Select category"
-msgstr ""
+msgstr "选择分类"
 
-#: templates/part.eventform.php:45 templates/part.eventinfo.php:28
+#: templates/part.eventform.php:37
 msgid "All Day Event"
 msgstr "全天事件"
 
-#: templates/part.eventform.php:49 templates/part.eventinfo.php:31
+#: templates/part.eventform.php:41
 msgid "From"
 msgstr "自"
 
-#: templates/part.eventform.php:57 templates/part.eventinfo.php:38
+#: templates/part.eventform.php:49
 msgid "To"
 msgstr "至"
 
-#: templates/part.eventform.php:65 templates/part.eventinfo.php:44
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "高级选项"
+
+#: templates/part.eventform.php:61
 msgid "Repeat"
 msgstr "��"
 
-#: templates/part.eventform.php:81 templates/part.eventinfo.php:51
-msgid "Attendees"
-msgstr "�加者"
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
 
-#: templates/part.eventform.php:89
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "地点"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "事件地点"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "�述"
+
+#: templates/part.eventform.php:218
 msgid "Description of the Event"
 msgstr "事件�述"
 
-#: templates/part.eventinfo.php:63
-msgid "Close"
-msgstr "关闭"
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "请选择日历"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "导入"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
 msgstr "创建新事件"
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Timezone"
 msgstr "时区"
 
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "时间格�"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24�时"
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12�时"
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr "日历CalDAV �步地�："
+
 
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index ead574ce084..99e69919079 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:18+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:45+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,50 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:77
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
 #: lib/app.php:42
 msgid "This is not your addressbook."
 msgstr "这�是您的地�簿。"
@@ -26,29 +70,25 @@ msgstr "这�是您的地�簿。"
 msgid "Contact could not be found."
 msgstr "无法找到�系人。"
 
-#: lib/app.php:65
-msgid "vCard could not be read."
-msgstr "vCard 无法读�。"
-
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard 的信��正确。请�新加载页�。"
 
-#: lib/app.php:91 templates/part.addcardform.php:56
+#: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "地�"
 
-#: lib/app.php:92 templates/part.addcardform.php:37
+#: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "电�"
 
-#: lib/app.php:93 templates/part.addcardform.php:31
+#: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "电�邮件"
 
-#: lib/app.php:94 templates/part.addcardform.php:23
+#: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "组织"
@@ -85,6 +125,10 @@ msgstr "视频"
 msgid "Pager"
 msgstr "传呼机"
 
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
 #: photo.php:40
 msgid "This is not your contact."
 msgstr "这�是您的�系人。"
@@ -97,68 +141,64 @@ msgstr "这张�片和RFC 标准�兼容。"
 msgid "This card does not contain a photo."
 msgstr "这张�片�包�照片。"
 
-#: templates/index.php:13
+#: templates/index.php:6
 msgid "Add Contact"
 msgstr "添加�系人"
 
-#: templates/index.php:14
-msgid "Address Books"
+#: templates/index.php:7
+msgid "Addressbooks"
 msgstr ""
 
 #: templates/part.addcardform.php:8
-msgid "Group"
-msgstr "分组"
+msgid "Addressbook"
+msgstr ""
 
-#: templates/part.addcardform.php:19
+#: templates/part.addcardform.php:21
 msgid "Name"
 msgstr "�称"
 
-#: templates/part.addcardform.php:41
-msgid "Number"
-msgstr ""
-
-#: templates/part.addcardform.php:45 templates/part.addcardform.php:59
-#: templates/part.details.php:42 templates/part.details.php:78
-#: templates/part.setpropertyform.php:10 templates/part.setpropertyform.php:47
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
 msgid "Type"
 msgstr ""
 
-#: templates/part.addcardform.php:65 templates/part.details.php:48
+#: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
 msgstr "邮箱"
 
-#: templates/part.addcardform.php:69 templates/part.details.php:52
+#: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
 msgstr "扩展"
 
-#: templates/part.addcardform.php:73 templates/part.details.php:56
+#: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
 msgstr "街�"
 
-#: templates/part.addcardform.php:77 templates/part.details.php:60
+#: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
 msgstr "城市"
 
-#: templates/part.addcardform.php:81 templates/part.details.php:64
+#: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
 msgstr "地区"
 
-#: templates/part.addcardform.php:85 templates/part.details.php:68
+#: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
 msgstr "邮编"
 
-#: templates/part.addcardform.php:89 templates/part.details.php:72
+#: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
 msgstr "国家"
 
-#: templates/part.addcardform.php:97
+#: templates/part.addcardform.php:109
 msgid "Create Contact"
 msgstr "创建�系人"
 
@@ -167,7 +207,6 @@ msgid "Choose active Address Books"
 msgstr ""
 
 #: templates/part.chooseaddressbook.php:16
-#: templates/part.editaddressbook.php:9
 msgid "New Address Book"
 msgstr ""
 
@@ -189,15 +228,23 @@ msgid "Delete"
 msgstr "删除"
 
 #: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
 msgid "Delete contact"
 msgstr ""
 
-#: templates/part.details.php:33
+#: templates/part.details.php:34
 msgid "Add"
 msgstr ""
 
 #: templates/part.editaddressbook.php:9
-msgid "Edit Address Book"
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
 msgstr ""
 
 #: templates/part.editaddressbook.php:12
@@ -236,4 +283,8 @@ msgstr "电�"
 msgid "Update"
 msgstr ""
 
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
 
diff --git a/l10n/zh_CN/gallery.po b/l10n/zh_CN/gallery.po
new file mode 100644
index 00000000000..e3e2d897cd0
--- /dev/null
+++ b/l10n/zh_CN/gallery.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 5f584c9b6c1..43d1b8ba1fd 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,28 +1,35 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "el correu electrònic ha canviat",
 "Invalid request" => "Sol.licitud no vàlida",
 "OpenID Changed" => "OpenID ha canviat",
 "Language changed" => "S'ha canviat l'idioma",
+"Log level" => "Nivell de registres",
 "Add your application" => "Afegir una aplicació",
 "Select an App" => "Seleccioneu una aplicació",
 "-licensed" => "- amb llicència",
-"by" => "per",
+"by" => "de",
 "Ask a question" => "Feu una pregunta",
-"Problems connecting to help database." => "Problemes per connectar-se a la base de dades d'ajuda.",
+"Problems connecting to help database." => "Problemes per connectar amb la base de dades d'ajuda.",
 "Go there manually." => "Vés-hi manualment.",
 "Answer" => "Resposta",
 "You use" => "Esteu usant",
 "of the available" => "del disponible",
 "Your password got changed" => "La contrasenya ha canviat",
 "Unable to change your password" => "No s'ha pogut canviar la contrasenya",
-"Current password" => "contrasenya actual",
+"Current password" => "Contrasenya actual",
 "New password" => "Contrasenya nova",
 "show" => "mostra",
-"Change password" => "canvia la contrasenya",
+"Change password" => "Canvia la contrasenya",
+"Email" => "Correu electrònic",
+"Your email address" => "Correu electrònic",
+"Fill in an email address to enable password recovery" => "Ompliu el correu electrònic per activar la recuperació de contrasenya",
 "Language" => "Idioma",
+"Help translate" => "Ajudeu-nos amb la traducció",
 "use this address to connect to your ownCloud in your file manager" => "useu aquesta adreça per connectar-vos a ownCloud des del gestor de fitxers",
 "Name" => "Nom",
 "Password" => "Contrasenya",
 "Groups" => "Grups",
 "Create" => "Crea",
+"Quota" => "Quota",
 "Delete" => "Esborra"
 );
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 3da0ef58525..3ddebf0cd99 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "email změněn",
 "Invalid request" => "Chybný dotaz",
 "OpenID Changed" => "OpenID změněn",
 "Language changed" => "Jazyk byl změněn",
+"Log level" => "Úroveň logu",
 "Add your application" => "Přidejte svou aplikaci",
 "Select an App" => "Vyberte aplikaci",
 "-licensed" => "-licencováno",
@@ -18,11 +20,16 @@
 "New password" => "Nové heslo",
 "show" => "zobrazit",
 "Change password" => "Změnit heslo",
+"Email" => "Email",
+"Your email address" => "Vaše email adresa",
+"Fill in an email address to enable password recovery" => "Pro povolení změny hesla vyplňte email adresu",
 "Language" => "Jazyk",
+"Help translate" => "Pomoc s překladem",
 "use this address to connect to your ownCloud in your file manager" => "tuto adresu použijte pro připojení k ownCloud ve Vašem správci souborů",
 "Name" => "Jméno",
 "Password" => "Heslo",
 "Groups" => "Skupiny",
 "Create" => "Vytvořit",
+"Quota" => "Kvóta",
 "Delete" => "Vymazat"
 );
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 2362159f07f..05b5e579a78 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "email ændret",
 "Invalid request" => "Ugyldig forespørgsel",
 "OpenID Changed" => "OpenID ændret",
 "Language changed" => "Sprog ændret",
+"Log level" => "Log-niveau",
 "Add your application" => "Tilføj dit program",
 "Select an App" => "Vælg en App",
 "-licensed" => "-licenseret",
@@ -18,11 +20,16 @@
 "New password" => "Ny adgangskode",
 "show" => "vis",
 "Change password" => "Skift kodeord",
+"Email" => "Email",
+"Your email address" => "Din emailadresse",
+"Fill in an email address to enable password recovery" => "Indtast en emailadresse for at kunne få påmindelse om adgangskode",
 "Language" => "Sprog",
+"Help translate" => "Hjælp med oversættelsen",
 "use this address to connect to your ownCloud in your file manager" => "benyt denne adresse til at forbinde til din ownCloud i din filbrowser",
 "Name" => "Navn",
 "Password" => "Kodeord",
 "Groups" => "Grupper",
 "Create" => "Ny",
+"Quota" => "Kvote",
 "Delete" => "Slet"
 );
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index ccc84a988a6..cb1f4bd0817 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "E-Mail wurde geändert",
 "Invalid request" => "Ungültige Anfrage",
 "OpenID Changed" => "OpenID geändert",
 "Language changed" => "Sprache geändert",
@@ -18,7 +19,11 @@
 "New password" => "Neues Passwort",
 "show" => "zeigen",
 "Change password" => "Passwort ändern",
+"Email" => "E-Mail",
+"Your email address" => "Ihre E-Mail Adresse",
+"Fill in an email address to enable password recovery" => "Tragen Sie eine E-Mail Adresse ein, um die Passwort-Wiederherstellung zu aktivieren",
 "Language" => "Sprache",
+"Help translate" => "Helfen Sie bei der Ãœbersetzung",
 "use this address to connect to your ownCloud in your file manager" => "benutze diese Adresse, um deine ownCloud mit deinem Dateiverwalter zu verbinden",
 "Name" => "Name",
 "Password" => "Passwort",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index cebc56d1200..f7b703d6462 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "το email άλλαξε",
 "Invalid request" => "Άκυ�α αίτημα",
 "OpenID Changed" => "Το OpenID άλλαξε",
 "Language changed" => "Η γλώσσα άλλαξε",
+"Log level" => "Επίπεδο καταγ�αφής",
 "Add your application" => "Π�οσθέστε την δική σας εφα�μογή",
 "Select an App" => "Επιλέξτε μια εφα�μογή",
 "-licensed" => "-με άδεια",
@@ -18,11 +20,16 @@
 "New password" => "�έος κωδικός",
 "show" => "Εμφάνιση",
 "Change password" => "Αλλαγή κωδικο� π�όσβασης",
+"Email" => "Email",
+"Your email address" => "Το διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου σας",
+"Fill in an email address to enable password recovery" => "Συμπλη�ώστε μια διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου για να ενε�γοποιηθεί ή ανάκτηση κωδικο� π�όσβασης",
 "Language" => "Γλώσσα",
+"Help translate" => "Βοηθήστε στην μετάφ�αση",
 "use this address to connect to your ownCloud in your file manager" => "χ�ησιμοποιήστε αυτή τη διε�θυνση για να συνδεθείτε στο ownCloud σας από το διαχει�ιστή α�χείων σας",
 "Name" => "Όνομα",
 "Password" => "Κωδικός",
 "Groups" => "Ομάδες",
 "Create" => "Δημιου�γία",
+"Quota" => "Αναλογία χώ�ου",
 "Delete" => "Διαγ�αφή"
 );
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 526dc75793b..0c55f462ba3 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "Email actualizado",
 "Invalid request" => "Solicitud no válida",
 "OpenID Changed" => "OpenID Cambiado",
 "Language changed" => "Idioma cambiado",
+"Log level" => "Nivel de log",
 "Add your application" => "Añadir tu aplicación",
 "Select an App" => "Seleccionar una aplicación",
 "-licensed" => "-autorizado",
@@ -18,11 +20,16 @@
 "New password" => "Nueva contraseña:",
 "show" => "mostrar",
 "Change password" => "Cambiar contraseña",
+"Email" => "Email",
+"Your email address" => "Tu dirección de email",
+"Fill in an email address to enable password recovery" => "Escribe una dirección de email para restablecer la contraseña",
 "Language" => "Idioma",
+"Help translate" => "Ayudar a traducir",
 "use this address to connect to your ownCloud in your file manager" => "utiliza esta dirección para conectar a tu ownCloud desde tu explorador de archivos",
 "Name" => "Nombre",
 "Password" => "Contraseña",
 "Groups" => "Grupos",
 "Create" => "Crear",
+"Quota" => "Cuota",
 "Delete" => "Eliminar"
 );
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 10b4b703e75..5773b51206c 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "e-mail modifié",
 "Invalid request" => "Requête invalide",
 "OpenID Changed" => "Identifiant OpenID changé",
 "Language changed" => "Langue changée",
+"Log level" => "Niveau de log",
 "Add your application" => "Ajoutez votre application",
 "Select an App" => "Sélectionner une Application",
 "-licensed" => "sous licence",
@@ -18,11 +20,16 @@
 "New password" => "Nouveau mot de passe",
 "show" => "Afficher",
 "Change password" => "Changer de mot de passe",
+"Email" => "E-mail",
+"Your email address" => "Votre adresse e-mail",
+"Fill in an email address to enable password recovery" => "Entrez votre adresse e-mail pour activer la réinitialisation de mot de passe",
 "Language" => "Langue",
+"Help translate" => "Aidez à traduire",
 "use this address to connect to your ownCloud in your file manager" => "utilisez cette adresse pour vous connecter à votre ownCloud depuis un explorateur de fichiers",
 "Name" => "Nom",
 "Password" => "Mot de passe",
 "Groups" => "Groupes",
 "Create" => "Créer",
+"Quota" => "Quota",
 "Delete" => "Supprimer"
 );
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 59b341851e6..41cb6ea9625 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "email modificata",
 "Invalid request" => "Richiesta non valida",
 "OpenID Changed" => "OpenID Modificato",
 "Language changed" => "Lingua modificata",
+"Log level" => "Livello di log",
 "Add your application" => "Aggiungi un applicazione",
 "Select an App" => "Seleziona un applicazione",
 "-licensed" => "-rilasciato",
@@ -18,11 +20,16 @@
 "New password" => "Nuova password",
 "show" => "mostra",
 "Change password" => "Modifica password",
+"Email" => "Email",
+"Your email address" => "Il tuo indirizzo email",
+"Fill in an email address to enable password recovery" => "Inserici il tuo indirizzo email per abilitare il recupero password",
 "Language" => "Lingua",
+"Help translate" => "Migliora la traduzione",
 "use this address to connect to your ownCloud in your file manager" => "usa questo indirizzo per connettersi al proprio ownCloud nel tuo file manager",
 "Name" => "Nome",
 "Password" => "Password",
 "Groups" => "Gruppi",
 "Create" => "Crea",
+"Quota" => "Quota",
 "Delete" => "Cancella"
 );
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 2061e8f6f6d..34af604ecef 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "mailadres aangepast",
 "Invalid request" => "Ongeldig verzoek",
 "OpenID Changed" => "OpenID is aangepast",
 "Language changed" => "Taal aangepast",
+"Log level" => "Logniveau",
 "Add your application" => "Voeg uw applicatie toe",
 "Select an App" => "Selecteer een app",
 "-licensed" => "-gelicentieerd",
@@ -18,11 +20,16 @@
 "New password" => "Nieuw wachtwoord",
 "show" => "weergeven",
 "Change password" => "Wijzig wachtwoord",
+"Email" => "mailadres",
+"Your email address" => "Jouw mailadres",
+"Fill in an email address to enable password recovery" => "Vul een mailadres in om je wachtwoord te kunnen herstellen",
 "Language" => "Taal",
+"Help translate" => "Help met vertalen",
 "use this address to connect to your ownCloud in your file manager" => "gebruik dit adres om verbinding te maken met ownCloud in uw bestandsbeheerprogramma",
 "Name" => "Naam",
 "Password" => "Wachtwoord",
 "Groups" => "Groepen",
 "Create" => "Creëer",
+"Quota" => "Limieten",
 "Delete" => "verwijderen"
 );
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 3f65a6b928e..88e51a0706b 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "email zmieniony",
 "Invalid request" => "Nieprawidłowe żądanie",
 "OpenID Changed" => "Zmieniono OpenID",
 "Language changed" => "Język zmieniony",
+"Log level" => "Poziom logowania",
 "Add your application" => "Dodaj własną aplikacje",
 "Select an App" => "Zaznacz aplikacje",
 "-licensed" => "-licencjonowany",
@@ -18,11 +20,16 @@
 "New password" => "Nowe hasło",
 "show" => "pokaż",
 "Change password" => "Zmień hasło",
+"Email" => "Email",
+"Your email address" => "Twój adres email",
+"Fill in an email address to enable password recovery" => "Podaj adres email żeby odzyskać hasło",
 "Language" => "Język",
+"Help translate" => "Pomóż w tłumaczeniu",
 "use this address to connect to your ownCloud in your file manager" => "użyj tego adresu żeby połączyć się z twoim kontem ownCloud w menedżerze plików.",
 "Name" => "Nazwa",
 "Password" => "Hasło",
 "Groups" => "Grupy",
 "Create" => "Stwórz",
+"Quota" => "Udział",
 "Delete" => "Skasuj"
 );
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index e8fe39a2fa6..715081f0a85 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "email schimbat",
 "Invalid request" => "Cerere eronată",
 "OpenID Changed" => "OpenID schimbat",
 "Language changed" => "Limba a fost schimbată",
+"Log level" => "Nivel log-uri",
 "Add your application" => "Adaugă propria ta aplicație",
 "Select an App" => "Selectează o aplicație",
 "-licensed" => "-autorizat",
@@ -18,11 +20,16 @@
 "New password" => "Noua parolă",
 "show" => "arată",
 "Change password" => "Schimbă parola",
+"Email" => "Email",
+"Your email address" => "Adresa ta de email",
+"Fill in an email address to enable password recovery" => "Completați adresa de mail pentru a vă putea recupera parola",
 "Language" => "Limba",
+"Help translate" => "Ajutați la traducere",
 "use this address to connect to your ownCloud in your file manager" => "folosește această adresă pentru a te conecta la managerul tău de fișiere din ownCloud",
 "Name" => "Nume",
 "Password" => "Parola",
 "Groups" => "Grupuri",
 "Create" => "Crează",
+"Quota" => "Quota",
 "Delete" => "Șterge"
 );
-- 
GitLab


From 37c0b97b3c4c429b2bea73f4abf8f7179b1a00e8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 15 Jan 2012 15:25:58 +0100
Subject: [PATCH 282/546] make language name translatable and fallback to
 language code if we dont have the language name

---
 settings/personal.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/settings/personal.php b/settings/personal.php
index 7035f1b07d4..8d05b14a353 100755
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -28,10 +28,18 @@ $languageCodes=OC_L10N::findAvailableLanguages();
 //put the current language in the front
 unset($languageCodes[array_search($lang,$languageCodes)]);
 array_unshift($languageCodes,$lang);
+
 $languageNames=include 'languageCodes.php';
 $languages=array();
 foreach($languageCodes as $lang){
-	$languages[]=array('code'=>$lang,'name'=>@$languageNames[$lang]);
+	$l=new OC_L10N('core',$lang);
+	if($l->t('__language_name__')!='__language_name__'){//first check if the language name is in the translation file
+		$languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__'));
+	}elseif(isset($languageNames[$lang])){
+		$languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]);
+	}else{//fallback to language code
+		$languages[]=array('code'=>$lang,'name'=>$lang);
+	}
 }
 
 // Return template
-- 
GitLab


From 63d9c1a8179bdefa6c4b6f089af6ce91cd11a46a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 15 Jan 2012 15:30:08 +0100
Subject: [PATCH 283/546] read language name from the right resource

---
 settings/personal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/personal.php b/settings/personal.php
index 8d05b14a353..44b4c2f594d 100755
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -32,7 +32,7 @@ array_unshift($languageCodes,$lang);
 $languageNames=include 'languageCodes.php';
 $languages=array();
 foreach($languageCodes as $lang){
-	$l=new OC_L10N('core',$lang);
+	$l=new OC_L10N('settings',$lang);
 	if($l->t('__language_name__')!='__language_name__'){//first check if the language name is in the translation file
 		$languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__'));
 	}elseif(isset($languageNames[$lang])){
-- 
GitLab


From 07cf709eeb0be12376a1e471aa37bfd2cd8a9caf Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 15 Jan 2012 15:31:17 +0100
Subject: [PATCH 284/546] better scanning model for gallery, more feedback to
 user while scanning

---
 apps/gallery/ajax/galleryOp.php | 40 +++++++++++++++++++++++-------
 apps/gallery/js/album_cover.js  | 43 +++++++++++++++++++++++++++------
 apps/gallery/js/albums.js       | 24 +++---------------
 apps/gallery/lib/scanner.php    | 25 ++++++++++++++++---
 4 files changed, 92 insertions(+), 40 deletions(-)

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index a62f0fe3f5b..f162fe2bc46 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -37,39 +37,61 @@ function handleRemove($name) {
   OC_Gallery_Album::remove(OC_User::getUser(), $name);
 }
 
-function handleGetThumbnails($albumname)
-{
+function handleGetThumbnails($albumname) {
   OC_JSON::checkLoggedIn();
   $photo = new OC_Image();
   $photo->loadFromFile(OC::$CONFIG_DATADIRECTORY.'/../gallery/'.$albumname.'.png');
   $photo->show();
 }
 
-function handleGalleryScanning()
-{
+function handleGalleryScanning() {
   OC_JSON::checkLoggedIn();
   OC_Gallery_Scanner::cleanup();
   OC_JSON::success(array('albums' => OC_Gallery_Scanner::scan('/')));
 }
 
+function handleFilescan() {
+  OC_JSON::checkLoggedIn();
+  $pathlist = OC_Gallery_Scanner::find_paths('/');
+  sort($pathlist);
+  OC_JSON::success(array('paths' => $pathlist));
+}
+
+function handlePartialCreate($path) {
+  OC_JSON::checkLoggedIn();
+  if (empty($path)) OC_JSON::error(array('cause' => 'No path specified'));
+  if (!OC_Filesystem::is_dir($path)) OC_JSON::error(array('cause' => 'Invalid path given'));
+
+  $album = OC_Gallery_Album::find(OC_User::getUser(), null, $path);
+  $albums;
+  OC_Gallery_Scanner::scanDir($path, $albums);
+  OC_JSON::success(array('album_details' => $albums));
+}
+
 if ($_GET['operation']) {
   switch($_GET['operation']) {
-	case "rename":
+  case 'rename':
 	  handleRename($_GET['oldname'], $_GET['newname']);
 	  OC_JSON::success(array('newname' => $_GET['newname']));
 	break;
-	case "remove":
+  case 'remove':
 	  handleRemove($_GET['name']);
 	  OC_JSON::success();
     break;
-  case "get_covers":
+  case 'get_covers':
     handleGetThumbnails($_GET['albumname']);
     break;
-  case "scan":
+  case 'scan':
     handleGalleryScanning();
     break;
+  case 'filescan':
+    handleFilescan();
+    break;
+  case 'partial_create':
+    handlePartialCreate($_GET['path']);
+    break;
   default:
-     OC_JSON::error(array('cause' => "Unknown operation"));
+    OC_JSON::error(array('cause' => 'Unknown operation'));
   }
 }
 ?>
diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index 0009eb04e4f..e50593c0087 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -4,10 +4,11 @@ $(document).ready(function() {
     if (r.status == 'success') {
       for (var i in r.albums) {
         var a = r.albums[i];
-        Albums.add(a.name, a.numOfItems, a.bgPath);
+        Albums.add(a.name, a.numOfItems);
       }
       var targetDiv = document.getElementById('gallery_list');
       if (targetDiv) {
+        $(targetDiv).html('');
         Albums.display(targetDiv);
       } else {
         alert('Error occured: no such layer `gallery_list`');
@@ -30,14 +31,42 @@ function createNewAlbum() {
   }
 }
 
+var albumCounter = 0;
+var totalAlbums = 0;
+
 function scanForAlbums() {
+  var albumCounter = 0;
+  var totalAlbums = 0;
+  $('#notification').text("Scanning directories");
   $("#notification").fadeIn();
   $("#notification").slideDown();
-  $.getJSON('ajax/galleryOp.php?operation=scan', function(r) {
-    $("#notification").fadeOut();
-    $("#notification").slideUp();
+  $.getJSON('ajax/galleryOp.php?operation=filescan', function(r) {
+
     if (r.status == 'success') {
-      window.location.reload(true);
+      totalAlbums = r.paths.length;
+      $('#notification').text("Creating thumbnails ... " + Math.floor((albumCounter/totalAlbums)*100) + "%");
+      for(var a in r.paths) {
+        $.getJSON('ajax/galleryOp.php?operation=partial_create&path='+r.paths[a], function(r) {
+
+          if (r.status == 'success') {
+            Albums.add(r.album_details.albumName, r.album_details.imagesCount);
+          }
+
+          albumCounter++;
+          $('#notification').text("Creating thumbnails ... " + Math.floor((albumCounter/totalAlbums)*100) + "%");
+          if (albumCounter == totalAlbums) {
+            $("#notification").fadeOut();
+            $("#notification").slideUp();
+            var targetDiv = document.getElementById('gallery_list');
+            if (targetDiv) {
+              targetDiv.innerHTML = '';
+              Albums.display(targetDiv);
+            } else {
+              alert('Error occured: no such layer `gallery_list`');
+            }
+          }
+        });
+      }
     } else {
       alert('Error occured: ' + r.message);
     }
@@ -48,8 +77,8 @@ function galleryRemove(albumName) {
   if (confirm("Do you wan't to remove album " + albumName + "?")) {
 	$.getJSON("ajax/galleryOp.php", {operation: "remove", name: albumName}, function(r) {
 	  if (r.status == "success") {
-		$("#gallery_album_box[title='"+albumName+"']").remove();
-		Albums.remove(albumName);
+      $("#gallery_album_box[title='"+albumName+"']").remove();
+      Albums.remove(albumName);
 	  } else {
 		alert("Error: " + r.cause);
 	  }
diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index 2fb1ac89bab..546aadba49f 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -12,13 +12,9 @@ Albums={
   // album with the same name wont be insered,
   // and false will be returned
   // true on success
-  add: function(album_name, num, bgPath) {
-    for (var a in Albums.albums) {
-      if (a.name == album_name) {
-        return false;
-      }
-    }
-    Albums.albums.push({name: album_name, numOfCovers: num, backgroundPath: bgPath});
+  add: function(album_name, num) {
+    if (Albums.albums[album_name] != undefined) return false;
+    Albums.albums[album_name] = {name: album_name, numOfCovers: num};
     return true;
   },
   // remove element with given name
@@ -40,19 +36,7 @@ Albums={
   // return element which match given name
   // of undefined if such element do not exist
   find: function(name) {
-    var i = -1, tmp = 0;
-    for (var k in Albums.albums) {
-      var a = Albums.albums[k];
-      if (a.name == name) {
-        i = tmp;
-        break;
-      }
-      tmp++;
-    }
-    if (i != -1) {
-      return Albums.albums[i];
-    }
-    return undefined;
+    return Albums.albums[name];
   },
   // displays gallery in linear representation
   // on given element, and apply default styles for gallery
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index 3eba9260ac7..4ce38a99531 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -50,15 +50,14 @@ class OC_Gallery_Scanner {
       while (($filename = readdir($dh)) !== false) {
         $filepath = ($path[strlen($path)-1]=='/'?$path:$path.'/').$filename;
         if (substr($filename, 0, 1) == '.') continue;
-        if (OC_Filesystem::is_dir($filepath)) {
-          self::scanDir($filepath, $albums);
-        } elseif (self::isPhoto($path.'/'.$filename)) {
+        if (self::isPhoto($path.'/'.$filename)) {
           $current_album['images'][] = $filepath;
         }
       }
     }
     $current_album['imagesCount'] = count($current_album['images']);
-    $albums[] = $current_album;
+    $albums['imagesCount'] = $current_album['imagesCount'];
+    $albums['albumName'] = $current_album['name'];
 
     $result = OC_Gallery_Album::find(OC_User::getUser(), $current_album['name']);
     if ($result->numRows() == 0 && count($current_album['images'])) {
@@ -92,5 +91,23 @@ class OC_Gallery_Scanner {
       return 1;
     return 0;
   }
+
+  public static function find_paths($path) {
+    $ret = array();
+    $dirres;
+    $addpath = FALSE;
+    if (($dirres = OC_Filesystem::opendir($path)) == FALSE) return $ret;
+
+    while (($file = readdir($dirres)) != FALSE) {
+      if ($file[0] == '.') continue;
+      if (OC_Filesystem::is_dir($path.$file))
+        $ret = array_merge($ret, self::find_paths($path.$file.'/'));
+      if (self::isPhoto($path.$file)) $addpath = TRUE;
+    }
+
+    if ($addpath) $ret[] = $path;
+
+    return $ret;
+  }
 }
 ?>
-- 
GitLab


From 3364502f0015844512b46b0f116e12e8f7072dd3 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 15 Jan 2012 18:29:44 +0100
Subject: [PATCH 285/546] use svg icon for calendar

---
 apps/calendar/appinfo/app.php |  2 +-
 apps/calendar/img/icon.svg    | 68 +++++++++++++++++++++++++++--------
 2 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 267a74bf29a..908a22856ba 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -16,7 +16,7 @@ if(version_compare(PHP_VERSION, '5.3.0', '>')){
 	  'id' => 'calendar_index',
 	  'order' => 10,
 	  'href' => OC_Helper::linkTo( 'calendar', 'index.php' ),
-	  'icon' => OC_Helper::imagePath( 'calendar', 'icon.png' ),
+	  'icon' => OC_Helper::imagePath( 'calendar', 'icon.svg' ),
 	  'name' => $l->t('Calendar')));
 	OC_App::registerPersonal('calendar', 'settings');
 	require_once('apps/calendar/lib/search.php');
diff --git a/apps/calendar/img/icon.svg b/apps/calendar/img/icon.svg
index a624db3a487..211f74df066 100755
--- a/apps/calendar/img/icon.svg
+++ b/apps/calendar/img/icon.svg
@@ -1,14 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="88px" height="100px" viewBox="0 0 88 100" enable-background="new 0 0 88 100" xml:space="preserve">
-<path d="M0,32v59.906C0,96.377,3.582,100,8,100h72c4.418,0,8-3.623,8-8.094V32H0z M22,94H6V78h16V94z M22,74H6V58h16V74z M22,54H6
-	V38h16V54z M42,94H26V78h16V94z M42,74H26V58h16V74z M42,54H26V38h16V54z M62,94H46V78h16V94z M62,74H46V58h16V74z M62,54H46V38h16
-	V54z M82,94H66V78h16V94z M82,74H66V58h16V74z M82,54H66V38h16V54z"/>
-<path d="M80,12H67V3c0-1.657-1.344-3-3-3c-1.657,0-3,1.343-3,3v9H27V3c0-1.657-1.344-3-3-3c-1.657,0-3,1.343-3,3v9H8
-	c-4.418,0-8,3.623-8,8.093V27v0v1h88v-1v0v-6.907C88,15.623,84.418,12,80,12z M24,26c-3.313,0-6-2.687-6-6
-	c0-2.219,1.209-4.152,3-5.19V20c0,1.657,1.343,3,3,3c1.656,0,3-1.343,3-3v-5.191c1.792,1.038,3,2.972,3,5.191
-	C30,23.313,27.314,26,24,26z M64,26c-3.313,0-6-2.687-6-6c0-2.219,1.209-4.152,3-5.19V20c0,1.657,1.343,3,3,3c1.656,0,3-1.343,3-3
-	v-5.191c1.792,1.038,3,2.972,3,5.191C70,23.313,67.314,26,64,26z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="14px"
+   height="16px"
+   viewBox="0 0 88 100"
+   enable-background="new 0 0 88 100"
+   xml:space="preserve"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="icon.svg"><metadata
+   id="metadata11"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs9" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1680"
+   inkscape:window-height="1004"
+   id="namedview7"
+   showgrid="false"
+   inkscape:zoom="19.125"
+   inkscape:cx="7"
+   inkscape:cy="8"
+   inkscape:window-x="-2"
+   inkscape:window-y="23"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<path
+   d="M0,32v59.906C0,96.377,3.582,100,8,100h72c4.418,0,8-3.623,8-8.094V32H0z M22,94H6V78h16V94z M22,74H6V58h16V74z M22,54H6  V38h16V54z M42,94H26V78h16V94z M42,74H26V58h16V74z M42,54H26V38h16V54z M62,94H46V78h16V94z M62,74H46V58h16V74z M62,54H46V38h16  V54z M82,94H66V78h16V94z M82,74H66V58h16V74z M82,54H66V38h16V54z"
+   id="path3"
+   style="fill:#4d4d4d" />
+<path
+   d="M80,12H67V3c0-1.657-1.344-3-3-3c-1.657,0-3,1.343-3,3v9H27V3c0-1.657-1.344-3-3-3c-1.657,0-3,1.343-3,3v9H8  c-4.418,0-8,3.623-8,8.093V27v0v1h88v-1v0v-6.907C88,15.623,84.418,12,80,12z M24,26c-3.313,0-6-2.687-6-6  c0-2.219,1.209-4.152,3-5.19V20c0,1.657,1.343,3,3,3c1.656,0,3-1.343,3-3v-5.191c1.792,1.038,3,2.972,3,5.191  C30,23.313,27.314,26,24,26z M64,26c-3.313,0-6-2.687-6-6c0-2.219,1.209-4.152,3-5.19V20c0,1.657,1.343,3,3,3c1.656,0,3-1.343,3-3  v-5.191c1.792,1.038,3,2.972,3,5.191C70,23.313,67.314,26,64,26z"
+   id="path5"
+   style="fill:#4d4d4d" />
+</svg>
\ No newline at end of file
-- 
GitLab


From 6b50980469feb1b40347b9e1679371b201c3a739 Mon Sep 17 00:00:00 2001
From: Cloud Dumper <clouddumper@gmail.com>
Date: Sun, 8 Jan 2012 12:03:15 +0100
Subject: [PATCH 286/546] Remove reference to unexisting file in music.css.

`img/pbar-ani.gif' is not on the repository.
---
 apps/media/css/music.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index da0407fca58..bcd8cf9178b 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -8,7 +8,6 @@ a.jp-next { left:5em; }
 div.jp-progress { position:absolute; overflow:hidden; top:.5em; left:8em; width:15em; height:1.2em; padding:0; }
 div.jp-seek-bar { background:#eee; width:0; height:100%; cursor:pointer; }
 div.jp-play-bar { background:#ccc; width:0; height:100%; }
-div.jp-seeking-bg { background:url("../img/pbar-ani.gif"); }
 div.jp-current-time,div.jp-duration { position:absolute; font-size:.64em; font-style:oblique; top:0.9em; left:13.5em; }
 div.jp-duration { display: none }
 div.jp-current-song { left: 33em; position: absolute; top: 0.9em; }
-- 
GitLab


From a44bbd80052bd597c0387299f657b950412ad8b9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 15 Jan 2012 18:58:08 +0100
Subject: [PATCH 287/546] don't use depricated <? use the full <?php

---
 apps/gallery/templates/view_album.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/gallery/templates/view_album.php b/apps/gallery/templates/view_album.php
index 7e3a67df4e4..55a2ee09e4a 100644
--- a/apps/gallery/templates/view_album.php
+++ b/apps/gallery/templates/view_album.php
@@ -16,7 +16,7 @@ $l = new OC_L10N('gallery');
 </script>
 
 <div id="controls">
-  <a href="?"><input type="button" value="<? echo $l->t('Back');?>" /></a>
+  <a href="?"><input type="button" value="<?php echo $l->t('Back');?>" /></a>
 <br/>
 </div>
 
-- 
GitLab


From a883fcca3c93e866a08d69748780c65cbfde4306 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 15 Jan 2012 19:11:25 +0100
Subject: [PATCH 288/546] add user and instance awere localstorage to prevent
 collisions when using localstorage

---
 core/js/js.js | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/core/js/js.js b/core/js/js.js
index 2bb6cff0cb0..56ce87f1c21 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -130,6 +130,35 @@ OC.search.lastResults={};
 OC.addStyle.loaded=[];
 OC.addScript.loaded=[];
 
+if(typeof localStorage !='undefined'){
+	//user and instance awere localstorage
+	OC.localStorage={
+		namespace:'oc_'+OC.currentUser+'_'+OC.webroot+'_',
+		hasItem:function(name){
+			return OC.localStorage.getItem(name)!=null;
+		},
+		setItem:function(name,item){
+			return localStorage.setItem(OC.localStorage.namespace+name,JSON.stringify(item));
+		},
+		getItem:function(name){
+			return JSON.parse(localStorage.getItem(OC.localStorage.namespace+name));
+		}
+	}
+}else{
+	//dummy localstorage
+	OC.localStorage={
+		hasItem:function(name){
+			return false;
+		},
+		setItem:function(name,item){
+			return false;
+		},
+		getItem:function(name){
+			return null;
+		}
+	}
+}
+
 /**
  * implement Array.filter for browsers without native support
  */
@@ -410,3 +439,5 @@ if (!Array.prototype.map){
 $.fn.filterAttr = function(attr_name, attr_value) {  
    return this.filter(function() { return $(this).attr(attr_name) === attr_value; });
 };
+
+
-- 
GitLab


From 15ea83834de200194d387f0b5054969ac6711f46 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 15 Jan 2012 19:25:55 +0100
Subject: [PATCH 289/546] prevent multiply owncloud instances on the same
 domain intefering with each others playlists

---
 apps/media/js/loader.js |  6 ++--
 apps/media/js/player.js | 77 +++++++++++++++++++----------------------
 2 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js
index dff4163897f..055f858ae16 100644
--- a/apps/media/js/loader.js
+++ b/apps/media/js/loader.js
@@ -52,10 +52,8 @@ $(document).ready(function() {
 	}
 	var oc_current_user=OC.currentUser;
 	if(typeof PlayList==='undefined'){
-		if(typeof localStorage !== 'undefined' && localStorage){
-			if(localStorage.getItem(oc_current_user+'oc_playlist_items') && localStorage.getItem(oc_current_user+'oc_playlist_items')!='[]' && localStorage.getItem(oc_current_user+'oc_playlist_active')!='true'){
-				loadPlayer();
-			}
+		if(OC.localStorage.getItem('playlist_items') && OC.localStorage.getItem('playlist_items').length && OC.localStorage.getItem('playlist_active')!=true){
+			loadPlayer();
 		}
 	}
 });
\ No newline at end of file
diff --git a/apps/media/js/player.js b/apps/media/js/player.js
index 1f76356fd97..ad406830833 100644
--- a/apps/media/js/player.js
+++ b/apps/media/js/player.js
@@ -34,7 +34,7 @@ var PlayList={
 			if(PlayList.player){
 				if(PlayList.player.data('jPlayer').options.supplied!=items[index].type){//the the audio type changes we need to reinitialize jplayer
 					PlayList.player.jPlayer("play",time);
-					localStorage.setItem(oc_current_user+'oc_playlist_time',time);
+					OC.localStorage.setItem('playlist_time',time);
 					PlayList.player.jPlayer("destroy");
 // 					PlayList.save(); // so that the init don't lose the playlist
 					PlayList.init(items[index].type,null); // init calls load that calls play
@@ -64,9 +64,8 @@ var PlayList={
 					}
 				}
 			}else{
-				localStorage.setItem(oc_current_user+'oc_playlist_time',time);
-				localStorage.setItem(oc_current_user+'oc_playlist_playing','true');
-//                 PlayList.save(); // so that the init don't lose the playlist
+				OC.localStorage.setItem('playlist_time',time);
+				OC.localStorage.setItem('playlist_playing',true);
 				PlayList.init(items[index].type,null); // init calls load that calls play
 			}
 		}
@@ -92,11 +91,11 @@ var PlayList={
 		$(PlayList.player).jPlayer({
 			ended:PlayList.next,
 			pause:function(){
-				localStorage.setItem(oc_current_user+'oc_playlist_playing','false');
+				OC.localStorage.setItem('playlist_playing',false);
 				document.title = "ownCloud";
 			},
 			play:function(event){
-				localStorage.setItem(oc_current_user+'oc_playlist_playing','true');
+				OC.localStorage.setItem('playlist_playing',true);
 				document.title = "\u25b8 " + event.jPlayer.status.media.name + " - " + event.jPlayer.status.media.artist + " - ownCloud";
 			},
 			supplied:type,
@@ -161,46 +160,42 @@ var PlayList={
 		}
 	},
 	save:function(){
-		if(typeof localStorage !== 'undefined' && localStorage){
-			localStorage.setItem(oc_current_user+'oc_playlist_items',JSON.stringify(PlayList.items));
-			localStorage.setItem(oc_current_user+'oc_playlist_current',PlayList.current);
-			if(PlayList.player) {
-				if(PlayList.player.data('jPlayer')) {
-					var time=Math.round(PlayList.player.data('jPlayer').status.currentTime);
-					localStorage.setItem(oc_current_user+'oc_playlist_time',time);
-					var volume=PlayList.player.data('jPlayer').options.volume*100;
-					localStorage.setItem(oc_current_user+'oc_playlist_volume',volume);
-				}
+		OC.localStorage.setItem('playlist_items',PlayList.items);
+		OC.localStorage.setItem('playlist_current',PlayList.current);
+		if(PlayList.player) {
+			if(PlayList.player.data('jPlayer')) {
+				var time=Math.round(PlayList.player.data('jPlayer').status.currentTime);
+				OC.localStorage.setItem('playlist_time',time);
+				var volume=PlayList.player.data('jPlayer').options.volume*100;
+				OC.localStorage.setItem('playlist_volume',volume);
 			}
-			localStorage.setItem(oc_current_user+'oc_playlist_active','true');
 		}
+		OC.localStorage.setItem('playlist_active',true);
 	},
 	load:function(){
-		if(typeof localStorage !== 'undefined' && localStorage){
-			PlayList.active=true;
-			localStorage.setItem(oc_current_user+'oc_playlist_active','true');
-			if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_items')){
-				PlayList.items=JSON.parse(localStorage.getItem(oc_current_user+'oc_playlist_items'));
-				if(PlayList.items.length>0){
-					PlayList.current=parseInt(localStorage.getItem(oc_current_user+'oc_playlist_current'));
-					var time=parseInt(localStorage.getItem(oc_current_user+'oc_playlist_time'));
-					if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_volume')){
-						var volume=localStorage.getItem(oc_current_user+'oc_playlist_volume');
-						PlayList.volume=volume/100;
-						$('.jp-volume-bar-value').css('width',volume+'%');
-						if(PlayList.player.data('jPlayer')){
-							PlayList.player.jPlayer("option",'volume',volume/100);
-						}
-					}
-					if(JSON.parse(localStorage.getItem(oc_current_user+'oc_playlist_playing'))){
-						PlayList.play(null,time);
-					}else{
-						PlayList.play(null,time,function(){
-							PlayList.player.jPlayer("pause");
-						});
+		PlayList.active=true;
+		OC.localStorage.setItem('playlist_active',true);
+		if(OC.localStorage.hasItem('playlist_items')){
+			PlayList.items=OC.localStorage.getItem('playlist_items');
+			if(PlayList.items && PlayList.items.length>0){
+				PlayList.current=OC.localStorage.getItem('playlist_current');
+				var time=OC.localStorage.getItem('playlist_time');
+				if(OC.localStorage.hasItem('playlist_volume')){
+					var volume=OC.localStorage.getItem('playlist_volume');
+					PlayList.volume=volume/100;
+					$('.jp-volume-bar-value').css('width',volume+'%');
+					if(PlayList.player.data('jPlayer')){
+						PlayList.player.jPlayer("option",'volume',volume/100);
 					}
-					PlayList.render();
 				}
+				if(OC.localStorage.getItem('playlist_playing')){
+					PlayList.play(null,time);
+				}else{
+					PlayList.play(null,time,function(){
+						PlayList.player.jPlayer("pause");
+					});
+				}
+				PlayList.render();
 			}
 		}
 	}
@@ -210,7 +205,7 @@ $(document).ready(function(){
 	$(window).bind('beforeunload', function (){
 		PlayList.save();
 		if(PlayList.active){
-			localStorage.setItem(oc_current_user+'oc_playlist_active','false');
+			OC.localStorage.setItem('playlist_active',false);
 		}
 	});
 
-- 
GitLab


From 3210fe25649cf8c60e3d3c22cd86f9320115e5b2 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 15 Jan 2012 20:48:38 +0100
Subject: [PATCH 290/546] fix creating/moving/renaming/deleting files/dirs with
 ' in name

---
 files/ajax/delete.php    | 4 ++--
 files/ajax/move.php      | 6 +++---
 files/ajax/newfile.php   | 6 +++---
 files/ajax/newfolder.php | 6 +++---
 files/ajax/rename.php    | 6 +++---
 files/index.php          | 2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/files/ajax/delete.php b/files/ajax/delete.php
index 48df5862db2..1725201fdd9 100644
--- a/files/ajax/delete.php
+++ b/files/ajax/delete.php
@@ -6,8 +6,8 @@ require_once('../../lib/base.php');
 OC_JSON::checkLoggedIn();
 
 // Get data
-$dir = $_GET["dir"];
-$files = isset($_GET["file"]) ? $_GET["file"] : $_GET["files"];
+$dir = stripslashes($_GET["dir"]);
+$files = isset($_GET["file"]) ? stripslashes($_GET["file"]) : stripslashes($_GET["files"]);
 
 $files = explode(';', $files);
 $filesWithError = '';
diff --git a/files/ajax/move.php b/files/ajax/move.php
index 3517901c6cf..9af3f80208f 100644
--- a/files/ajax/move.php
+++ b/files/ajax/move.php
@@ -6,9 +6,9 @@ require_once('../../lib/base.php');
 OC_JSON::checkLoggedIn();
 
 // Get data
-$dir = $_GET["dir"];
-$file = $_GET["file"];
-$target = $_GET["target"];
+$dir = stripslashes($_GET["dir"]);
+$file = stripslashes($_GET["file"]);
+$target = stripslashes($_GET["target"]);
 
 
 if(OC_Files::move($dir,$file,$target,$file)){
diff --git a/files/ajax/newfile.php b/files/ajax/newfile.php
index 5c4f49a3675..afc444bc0ac 100644
--- a/files/ajax/newfile.php
+++ b/files/ajax/newfile.php
@@ -6,8 +6,8 @@ require_once('../../lib/base.php');
 OC_JSON::checkLoggedIn();
 
 // Get the params
-$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
-$filename = isset( $_GET['filename'] ) ? $_GET['filename'] : '';
+$dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
+$filename = isset( $_GET['filename'] ) ? stripslashes($_GET['filename']) : '';
 $content = isset( $_GET['content'] ) ? $_GET['content'] : '';
 
 if($filename == '') {
@@ -24,4 +24,4 @@ if(OC_Files::newFile($dir, $filename, 'file')) {
 }
 
 
-OC_JSON::error(array("data" => array( "message" => "Error when creating the file" )));
\ No newline at end of file
+OC_JSON::error(array("data" => array( "message" => "Error when creating the file" )));
diff --git a/files/ajax/newfolder.php b/files/ajax/newfolder.php
index d244fb7be19..6db045c4e17 100644
--- a/files/ajax/newfolder.php
+++ b/files/ajax/newfolder.php
@@ -6,15 +6,15 @@ require_once('../../lib/base.php');
 OC_JSON::checkLoggedIn();
 
 // Get the params
-$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
-$foldername = isset( $_GET['foldername'] ) ? $_GET['foldername'] : '';
+$dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
+$foldername = isset( $_GET['foldername'] ) ? stripslashes($_GET['foldername']) : '';
 
 if(trim($foldername) == '') {
 	OC_JSON::error(array("data" => array( "message" => "Empty Foldername" )));
 	exit();
 }
 
-if(OC_Files::newFile($dir, $foldername, 'dir')) {
+if(OC_Files::newFile($dir, stripslashes($foldername), 'dir')) {
 	OC_JSON::success(array("data" => array()));
 	exit();
 }
diff --git a/files/ajax/rename.php b/files/ajax/rename.php
index 87ffbc3ada0..a51b36635b3 100644
--- a/files/ajax/rename.php
+++ b/files/ajax/rename.php
@@ -6,9 +6,9 @@ require_once('../../lib/base.php');
 OC_JSON::checkLoggedIn();
 
 // Get data
-$dir = $_GET["dir"];
-$file = $_GET["file"];
-$newname = $_GET["newname"];
+$dir = stripslashes($_GET["dir"]);
+$file = stripslashes($_GET["file"]);
+$newname = stripslashes($_GET["newname"]);
 
 // Delete
 if( OC_Files::move( $dir, $file, $dir, $newname )) {
diff --git a/files/index.php b/files/index.php
index 7f3c5c579e7..fbf7a4901a1 100644
--- a/files/index.php
+++ b/files/index.php
@@ -38,7 +38,7 @@ if(!isset($_SESSION['timezone'])){
 }
 OC_App::setActiveNavigationEntry( "files_index" );
 // Load the files
-$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
+$dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
 // Redirect if directory does not exist
 if(!OC_Filesystem::is_dir($dir)) {
 	header("Location: ".$_SERVER['PHP_SELF']."");
-- 
GitLab


From ac188ec74baa758cd990a203ce0bbc317f92963e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 15 Jan 2012 23:57:40 +0100
Subject: [PATCH 291/546] properly check for write permissions to the config
 file

---
 lib/util.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/util.php b/lib/util.php
index 009119b54a9..20197d65b00 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -226,6 +226,10 @@ class OC_Util {
 			$errors[]=array('error'=>'PHP module ctype is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
 		}
 
+		if(!is_writeable(OC::$SERVERROOT."/config/config.php")){
+			$errors[]=array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver use write access to the config directory in owncloud");
+		}
+
 		return $errors;
 	}
 
-- 
GitLab


From b366b0eb521163c2d10322c3e7567970a23c20f9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Jan 2012 00:09:43 +0100
Subject: [PATCH 292/546] quick fix for javascript translations

---
 core/js/js.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index 56ce87f1c21..c6cde3cea95 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -6,10 +6,14 @@
  */
 function t(app,text){
 	if( !( app in t.cache )){
-		
-		$.post( OC.filePath('core','ajax','translations.php'), {'app': app}, function(jsondata){
-			t.cache[app] = jsondata.data;
-		});
+		$.ajax(OC.filePath('core','ajax','translations.php'),{
+			async:false,//todo a proper sollution for this without sync ajax calls
+			data:{'app': app},
+			type:'POST',
+			success:function(jsondata){
+				t.cache[app] = jsondata.data;
+			},
+		})
 
 		// Bad answer ...
 		if( !( app in t.cache )){
-- 
GitLab


From da33229dab7aefee6f2de0ac6f128feaf767388b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Jan 2012 01:11:58 +0100
Subject: [PATCH 293/546] fix some pgsql strict warnings

---
 3rdparty/MDB2/Driver/Manager/pgsql.php | 32 +++++++++++++-------------
 3rdparty/MDB2/Driver/Reverse/pgsql.php | 10 ++++----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/3rdparty/MDB2/Driver/Manager/pgsql.php b/3rdparty/MDB2/Driver/Manager/pgsql.php
index a2e80caa5ce..a61821ef053 100644
--- a/3rdparty/MDB2/Driver/Manager/pgsql.php
+++ b/3rdparty/MDB2/Driver/Manager/pgsql.php
@@ -68,7 +68,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function createDatabase($name, $options = array())
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -95,7 +95,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function alterDatabase($name, $options = array())
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -122,7 +122,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function dropDatabase($name)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -181,7 +181,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function truncateTable($name)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -209,7 +209,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function vacuum($table = null, $options = array())
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -326,7 +326,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function alterTable($name, $changes, $check)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -441,7 +441,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function listDatabases()
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -474,7 +474,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function listUsers()
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -501,7 +501,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function listViews($database = null)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -680,7 +680,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function listTableFields($table)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -716,7 +716,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function listTableIndexes($table)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -769,7 +769,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function dropConstraint($table, $name, $primary = false)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -817,7 +817,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function listTableConstraints($table)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -882,7 +882,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function createSequence($seq_name, $start = 1)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -904,7 +904,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function dropSequence($seq_name)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -924,7 +924,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function listSequences($database = null)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
diff --git a/3rdparty/MDB2/Driver/Reverse/pgsql.php b/3rdparty/MDB2/Driver/Reverse/pgsql.php
index 649c1cad9ee..8669c2b919b 100644
--- a/3rdparty/MDB2/Driver/Reverse/pgsql.php
+++ b/3rdparty/MDB2/Driver/Reverse/pgsql.php
@@ -69,7 +69,7 @@ class MDB2_Driver_Reverse_pgsql extends MDB2_Driver_Reverse_Common
      */
     function getTableFieldDefinition($table_name, $field_name)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -198,7 +198,7 @@ class MDB2_Driver_Reverse_pgsql extends MDB2_Driver_Reverse_Common
      */
     function getTableIndexDefinition($table_name, $index_name)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -256,7 +256,7 @@ class MDB2_Driver_Reverse_pgsql extends MDB2_Driver_Reverse_Common
      */
     function getTableConstraintDefinition($table_name, $constraint_name)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -443,7 +443,7 @@ class MDB2_Driver_Reverse_pgsql extends MDB2_Driver_Reverse_Common
      */
     function getTriggerDefinition($trigger)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -517,7 +517,7 @@ class MDB2_Driver_Reverse_pgsql extends MDB2_Driver_Reverse_Common
            return parent::tableInfo($result, $mode);
         }
 
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
-- 
GitLab


From 907dd4d24da80fa4f4ad5d6d469cd11d7c215f02 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Jan 2012 01:13:54 +0100
Subject: [PATCH 294/546] some aditional feedback during database upgrade

---
 lib/base.php |  6 +++++-
 lib/db.php   | 11 ++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 9531f7ed74f..ab7cb2990ed 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -156,7 +156,11 @@ class OC{
 			$installedVersion=OC_Config::getValue('version','0.0.0');
 			$currentVersion=implode('.',OC_Util::getVersion());
 			if (version_compare($currentVersion, $installedVersion, '>')) {
-				OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml');
+				$result=OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml');
+				if(!$result){
+					echo 'Error while upgrading the database';
+					die();
+				}
 				OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
 			}
 
diff --git a/lib/db.php b/lib/db.php
index f6eddf7825c..1a5f9874bd5 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -361,6 +361,11 @@ class OC_DB {
 		$content = file_get_contents( $file );
 		
 		$previousSchema = self::$schema->getDefinitionFromDatabase();
+		if (PEAR::isError($previousSchema)) {
+			$error = $previousSchema->getMessage();
+			OC_Log::write('core','Failed to get existing database structure for upgrading ('.$error.')',OC_Log::FATAL);
+			return false;
+		}
 
 		// Make changes and save them to a temporary file
 		$file2 = tempnam( get_temp_dir(), 'oc_db_scheme_' );
@@ -376,9 +381,9 @@ class OC_DB {
 		unlink( $file2 );
 		
 		if (PEAR::isError($op)) {
-		    $error = $op->getMessage();
-		    OC_Log::write('core','Failed to update database structure ('.$error.')',OC_Log::FATAL);
-		    return false;
+			$error = $op->getMessage();
+			OC_Log::write('core','Failed to update database structure ('.$error.')',OC_Log::FATAL);
+			return false;
 		}
 		return true;
 	}
-- 
GitLab


From ebe10870cfe3c59edb4b2924297b6e495977eea0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Jan 2012 02:06:19 +0100
Subject: [PATCH 295/546] fix database upgrading for pgsql

---
 3rdparty/MDB2/Driver/Manager/pgsql.php | 5 ++++-
 lib/db.php                             | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/3rdparty/MDB2/Driver/Manager/pgsql.php b/3rdparty/MDB2/Driver/Manager/pgsql.php
index a61821ef053..c99dd08e8ef 100644
--- a/3rdparty/MDB2/Driver/Manager/pgsql.php
+++ b/3rdparty/MDB2/Driver/Manager/pgsql.php
@@ -396,6 +396,9 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
                     }
                     $db->loadModule('Datatype', null, true);
                     $type = $db->datatype->getTypeDeclaration($field['definition']);
+                    if($type=='SERIAL PRIMARY KEY'){//not correct when altering a table
+						$type='integer';//use this instead
+                    }
                     $query = "ALTER $field_name TYPE $type USING CAST($field_name AS $type)";
                     $result = $db->exec("ALTER TABLE $name $query");
                     if (PEAR::isError($result)) {
@@ -692,7 +695,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
             $table = $db->quoteIdentifier($schema, true) . '.' .$table;
         }
         $db->setLimit(1);
-        $result2 = $db->query("SELECT * FROM $table");
+        $result2 = $db->query("SELECT * FROM $table LIMIT 1");
         if (PEAR::isError($result2)) {
             return $result2;
         }
diff --git a/lib/db.php b/lib/db.php
index 1a5f9874bd5..4860651b323 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -144,7 +144,7 @@ class OC_DB {
 
 			// Prepare options array
 			$options = array(
-			  'portability' => MDB2_PORTABILITY_ALL,
+			  'portability' => MDB2_PORTABILITY_ALL & (!MDB2_PORTABILITY_FIX_CASE),
 			  'log_line_break' => '<br>',
 			  'idxname_format' => '%s',
 			  'debug' => true,
-- 
GitLab


From 011732a0835d04748514b3676f1b2f324fa2d922 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Jan 2012 02:20:29 +0100
Subject: [PATCH 296/546] small documentation improvement

---
 3rdparty/MDB2/Driver/Manager/pgsql.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/3rdparty/MDB2/Driver/Manager/pgsql.php b/3rdparty/MDB2/Driver/Manager/pgsql.php
index c99dd08e8ef..b2252bce1ca 100644
--- a/3rdparty/MDB2/Driver/Manager/pgsql.php
+++ b/3rdparty/MDB2/Driver/Manager/pgsql.php
@@ -396,8 +396,8 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
                     }
                     $db->loadModule('Datatype', null, true);
                     $type = $db->datatype->getTypeDeclaration($field['definition']);
-                    if($type=='SERIAL PRIMARY KEY'){//not correct when altering a table
-						$type='integer';//use this instead
+                    if($type=='SERIAL PRIMARY KEY'){//not correct when altering a table, since serials arent a real type
+						$type='INTERGER';//use integer instead
                     }
                     $query = "ALTER $field_name TYPE $type USING CAST($field_name AS $type)";
                     $result = $db->exec("ALTER TABLE $name $query");
-- 
GitLab


From 757e6cd0aaf3d9f651446bd063002b3fbf1f4b2e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Jan 2012 02:22:23 +0100
Subject: [PATCH 297/546] typos....

---
 3rdparty/MDB2/Driver/Manager/pgsql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty/MDB2/Driver/Manager/pgsql.php b/3rdparty/MDB2/Driver/Manager/pgsql.php
index b2252bce1ca..44a611d399d 100644
--- a/3rdparty/MDB2/Driver/Manager/pgsql.php
+++ b/3rdparty/MDB2/Driver/Manager/pgsql.php
@@ -397,7 +397,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
                     $db->loadModule('Datatype', null, true);
                     $type = $db->datatype->getTypeDeclaration($field['definition']);
                     if($type=='SERIAL PRIMARY KEY'){//not correct when altering a table, since serials arent a real type
-						$type='INTERGER';//use integer instead
+						$type='INTEGER';//use integer instead
                     }
                     $query = "ALTER $field_name TYPE $type USING CAST($field_name AS $type)";
                     $result = $db->exec("ALTER TABLE $name $query");
-- 
GitLab


From b0dbca0cc7f2d07dbf01c54861b932d8dc9fe2df Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Jan 2012 02:27:59 +0100
Subject: [PATCH 298/546] fix export link for contacts

---
 apps/contacts/templates/part.details.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php
index 9af7f0654dd..679ae5ede2f 100644
--- a/apps/contacts/templates/part.details.php
+++ b/apps/contacts/templates/part.details.php
@@ -1,6 +1,6 @@
 <?php if(array_key_exists('FN',$_['details'])): ?>
 	<?php echo $this->inc('part.property.FN', array('property' => $_['details']['FN'][0])); ?>
-	<a href="export?contactid=<?php echo $_['id']; ?>"><img class="svg action" id="contacts_downloadcard" src="<?php echo image_path('', 'actions/download.svg'); ?>" title="<?php echo $l->t('Download contact');?>" /></a>
+	<a href="export.php?contactid=<?php echo $_['id']; ?>"><img class="svg action" id="contacts_downloadcard" src="<?php echo image_path('', 'actions/download.svg'); ?>" title="<?php echo $l->t('Download contact');?>" /></a>
 	<img class="svg action" id="contacts_deletecard" src="<?php echo image_path('', 'actions/delete.svg'); ?>" title="<?php echo $l->t('Delete contact');?>" />
 
 	<?php if(isset($_['details']['PHOTO'])): // Emails first ?>
-- 
GitLab


From d7ed456f965a8fbc3cf44ebf026f6f828cca2242 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Jan 2012 14:36:11 +0100
Subject: [PATCH 299/546] forgot to merge something

---
 lib/filesystem.php | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 6568a07a59c..eeca27d3a9a 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -446,29 +446,7 @@ class OC_Filesystem{
 			}
 		}
 	}
-<<<<<<< HEAD
-=======
-	static public function fromUploadedFile($tmpFile,$path){
-		if(OC_FileProxy::runPreProxies('fromUploadedFile',$tmpFile,$path) and self::isValidPath($path) and $storage=self::getStorage($path)){
-			$run=true;
-			$exists=self::file_exists($path);
-			if(!$exists){
-        OC_Hook::emit( self::CLASSNAME, self::signal_create, array( self::signal_param_path => $path, self::signal_param_run => &$run));
-			}
-			if($run){
-        OC_Hook::emit( self::CLASSNAME, self::signal_write, array( self::signal_param_path => $path, self::signal_param_run => &$run));
-			}
-			if($run){
-				$result=$storage->fromUploadedFile($tmpFile,self::getInternalPath($path));
-				if(!$exists){
-          OC_Hook::emit( self::CLASSNAME, self::signal_post_create, array( self::signal_param_path => $path));
-				}
-        OC_Hook::emit( self::CLASSNAME, self::signal_post_write, array( self::signal_param_path => $path));
-				return $result;
-			}
-		}
-	}
->>>>>>> master
+
 	static public function getMimeType($path){
 		return self::basicOperation('getMimeType',$path);
 	}
-- 
GitLab


From a1dfe16d0a130c4d27bad8418a3801fdd5774735 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Jan 2012 14:36:47 +0100
Subject: [PATCH 300/546] postgresql needs contraint names to be unque across
 the database, not only the table

---
 db_structure.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db_structure.xml b/db_structure.xml
index 39dea564b0f..36ee35b544d 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -143,7 +143,7 @@
    </field>
 
    <index>
-    <name>path_index</name>
+    <name>fscache_path_index</name>
 	<unique>true</unique>
     <field>
      <name>path</name>
-- 
GitLab


From 965ea964392cff4d48c5e5896f5c3eb7be00fbee Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Jan 2012 17:34:42 +0100
Subject: [PATCH 301/546] update translations

---
 apps/calendar/l10n/de.php   |  19 +++
 apps/calendar/l10n/fr.php   |   6 +
 apps/calendar/l10n/gl.php   | 154 ++++++++++++++++++
 apps/calendar/l10n/it.php   |  35 ++++
 apps/contacts/l10n/ca.php   |  20 ++-
 apps/contacts/l10n/fr.php   |  20 ++-
 apps/contacts/l10n/gl.php   |  66 ++++++++
 apps/contacts/l10n/it.php   |  20 ++-
 apps/contacts/l10n/sr.php   |  22 ++-
 apps/gallery/l10n/ca.php    |   5 +
 apps/gallery/l10n/de.php    |   6 +-
 apps/gallery/l10n/fr.php    |   5 +
 apps/gallery/l10n/gl.php    |   5 +
 apps/gallery/l10n/it.php    |   5 +
 apps/gallery/l10n/sk_SK.php |   5 +
 apps/gallery/l10n/sr.php    |   5 +
 apps/gallery/l10n/zh_CN.php |   5 +
 apps/media/l10n/gl.php      |  13 ++
 core/l10n/gl.php            |  39 +++++
 core/l10n/it.php            |  10 +-
 core/l10n/sk_SK.php         |   5 +
 core/l10n/sr.php            |   5 +
 files/l10n/gl.php           |  23 +++
 files/l10n/sr.php           |   4 +
 l10n/ar/settings.po         |   8 +-
 l10n/bg_BG/settings.po      |   8 +-
 l10n/ca/contacts.po         |  42 ++---
 l10n/ca/gallery.po          |  13 +-
 l10n/ca/settings.po         |  10 +-
 l10n/cs_CZ/settings.po      |  10 +-
 l10n/da/settings.po         |  10 +-
 l10n/de/calendar.po         |  46 +++---
 l10n/de/gallery.po          |  13 +-
 l10n/de/settings.po         |  10 +-
 l10n/el/settings.po         |  10 +-
 l10n/eo/settings.po         |   8 +-
 l10n/es/settings.po         |  10 +-
 l10n/et_EE/settings.po      |   8 +-
 l10n/eu/settings.po         |   8 +-
 l10n/fr/calendar.po         |  18 +--
 l10n/fr/contacts.po         |  44 ++---
 l10n/fr/gallery.po          |  13 +-
 l10n/fr/settings.po         |  10 +-
 l10n/gl/calendar.po         | 311 ++++++++++++++++++------------------
 l10n/gl/contacts.po         | 134 ++++++++--------
 l10n/gl/core.po             |  80 +++++-----
 l10n/gl/files.po            |  49 +++---
 l10n/gl/gallery.po          |  13 +-
 l10n/gl/media.po            |  29 ++--
 l10n/gl/settings.po         |  74 +++++----
 l10n/he/settings.po         |   8 +-
 l10n/hr/settings.po         |   8 +-
 l10n/hu_HU/settings.po      |   8 +-
 l10n/hy/settings.po         |   8 +-
 l10n/ia/settings.po         |   8 +-
 l10n/id/settings.po         |   8 +-
 l10n/it/calendar.po         |  77 ++++-----
 l10n/it/contacts.po         |  43 ++---
 l10n/it/core.po             |  18 +--
 l10n/it/gallery.po          |  13 +-
 l10n/it/settings.po         |  12 +-
 l10n/ja_JP/settings.po      |   8 +-
 l10n/lb/settings.po         |   8 +-
 l10n/lt_LT/settings.po      |   8 +-
 l10n/ms_MY/settings.po      |   8 +-
 l10n/nb_NO/settings.po      |   8 +-
 l10n/nl/settings.po         |  10 +-
 l10n/nn_NO/settings.po      |   8 +-
 l10n/pl/settings.po         |  10 +-
 l10n/pt_BR/settings.po      |   8 +-
 l10n/pt_PT/settings.po      |   8 +-
 l10n/ro/settings.po         |  10 +-
 l10n/ru/settings.po         |   8 +-
 l10n/sk_SK/core.po          |  18 +--
 l10n/sk_SK/gallery.po       |  13 +-
 l10n/sk_SK/settings.po      |  24 +--
 l10n/sl/settings.po         |   8 +-
 l10n/sr/contacts.po         |  48 +++---
 l10n/sr/core.po             |  18 +--
 l10n/sr/files.po            |  16 +-
 l10n/sr/gallery.po          |  13 +-
 l10n/sr/settings.po         |  16 +-
 l10n/sr@latin/settings.po   |   8 +-
 l10n/sv/settings.po         |   8 +-
 l10n/templates/calendar.pot |   2 +-
 l10n/templates/contacts.pot |   2 +-
 l10n/templates/core.pot     |   2 +-
 l10n/templates/files.pot    |   2 +-
 l10n/templates/gallery.pot  |   2 +-
 l10n/templates/media.pot    |   2 +-
 l10n/templates/settings.pot |   6 +-
 l10n/tr/settings.po         |   8 +-
 l10n/zh_CN/gallery.po       |  13 +-
 l10n/zh_CN/settings.po      |   8 +-
 settings/l10n/gl.php        |  35 ++++
 settings/l10n/sk_SK.php     |   7 +
 settings/l10n/sr.php        |   3 +
 97 files changed, 1399 insertions(+), 687 deletions(-)
 create mode 100644 apps/calendar/l10n/gl.php
 create mode 100644 apps/contacts/l10n/gl.php
 create mode 100644 apps/gallery/l10n/ca.php
 create mode 100644 apps/gallery/l10n/fr.php
 create mode 100644 apps/gallery/l10n/gl.php
 create mode 100644 apps/gallery/l10n/it.php
 create mode 100644 apps/gallery/l10n/sk_SK.php
 create mode 100644 apps/gallery/l10n/sr.php
 create mode 100644 apps/gallery/l10n/zh_CN.php
 create mode 100644 apps/media/l10n/gl.php
 create mode 100644 core/l10n/gl.php
 create mode 100644 files/l10n/gl.php
 create mode 100644 settings/l10n/gl.php

diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index 617fc2a2ff0..aae6f235fc4 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -79,6 +79,25 @@
 "Today" => "Heute",
 "Calendars" => "Kalender",
 "There was a fail, while parsing the file." => "Fehler beim Einlesen der Datei.",
+"Sun." => "So",
+"Mon." => "Mo",
+"Tue." => "Die",
+"Wed." => "Mi",
+"Thu." => "Do",
+"Fri." => "Fr",
+"Sat." => "Sa",
+"Jan." => "Jan",
+"Feb." => "Feb",
+"Mar." => "Mär",
+"Apr." => "Apr",
+"May." => "Mai",
+"Jun." => "Juni",
+"Jul." => "Juli",
+"Aug." => "Aug",
+"Sep." => "Sep",
+"Oct." => "Okt",
+"Nov." => "Nov",
+"Dec." => "Dez",
 "Choose active calendars" => "Aktive Kalender wählen",
 "New Calendar" => "Neuer Kalender",
 "CalDav Link" => "CalDAV-Link",
diff --git a/apps/calendar/l10n/fr.php b/apps/calendar/l10n/fr.php
index 82b58f6ad61..36ce1ad875c 100644
--- a/apps/calendar/l10n/fr.php
+++ b/apps/calendar/l10n/fr.php
@@ -133,8 +133,14 @@
 "Location of the Event" => "Emplacement de l'événement",
 "Description" => "Description",
 "Description of the Event" => "Description de l'événement",
+"Import a calendar file" => "Importer un fichier de calendriers",
 "Please choose the calendar" => "Choisissez le calendrier svp",
+"create a new calendar" => "Créer un nouveau calendrier",
+"Name of new calendar" => "Nom pour le nouveau calendrier",
 "Import" => "Importer",
+"Importing calendar" => "Import du calendrier",
+"Calendar imported successfully" => "Calendrier importé avec succès",
+"Close Dialog" => "Fermer la fenêtre",
 "Create a new event" => "Créer un nouvel événement",
 "Timezone" => "Fuseau horaire",
 "Check always for changes of the timezone" => "Toujours vérifier d'éventuels changements de fuseau horaire",
diff --git a/apps/calendar/l10n/gl.php b/apps/calendar/l10n/gl.php
new file mode 100644
index 00000000000..6cdaa98e96b
--- /dev/null
+++ b/apps/calendar/l10n/gl.php
@@ -0,0 +1,154 @@
+<?php $TRANSLATIONS = array(
+"New Timezone:" => "Novo fuso horario:",
+"Timezone changed" => "Fuso horario trocado",
+"Invalid request" => "Petición non válida",
+"Calendar" => "Calendario",
+"Wrong calendar" => "Calendario equivocado",
+"Birthday" => "Cumpleanos",
+"Business" => "Traballo",
+"Call" => "Chamada",
+"Clients" => "Clientes",
+"Holidays" => "Vacacións",
+"Ideas" => "Ideas",
+"Journey" => "Viaxe",
+"Jubilee" => "Aniversario",
+"Meeting" => "Reunión",
+"Other" => "Outro",
+"Personal" => "Personal",
+"Projects" => "Proxectos",
+"Questions" => "Preguntas",
+"Work" => "Traballo",
+"Does not repeat" => "Non se repite",
+"Daily" => "A diario",
+"Weekly" => "Semanalmente",
+"Every Weekday" => "Tódalas semanas",
+"Bi-Weekly" => "Cada dúas semanas",
+"Monthly" => "Mensualmente",
+"Yearly" => "Anual",
+"never" => "nunca",
+"by occurrences" => "por acontecementos",
+"by date" => "por data",
+"by monthday" => "por día do mes",
+"by weekday" => "por día da semana",
+"Monday" => "Luns",
+"Tuesday" => "Martes",
+"Wednesday" => "Mércores",
+"Thursday" => "Xoves",
+"Friday" => "Venres",
+"Saturday" => "Sábado",
+"Sunday" => "Domingo",
+"events week of month" => "semana dos eventos no mes",
+"first" => "primeiro",
+"second" => "segundo",
+"third" => "terceiro",
+"fourth" => "cuarto",
+"fifth" => "quinto",
+"last" => "último",
+"January" => "Xaneiro",
+"February" => "Febreiro",
+"March" => "Marzo",
+"April" => "Abril",
+"May" => "Maio",
+"June" => "Xuño",
+"July" => "Xullo",
+"August" => "Agosto",
+"September" => "Setembro",
+"October" => "Outubro",
+"November" => "Novembro",
+"December" => "Nadal",
+"by events date" => "por data dos eventos",
+"by yearday(s)" => "por dia(s) do ano",
+"by weeknumber(s)" => "por número(s) de semana",
+"by day and month" => "por día e mes",
+"Not an array" => "Non é un conxunto",
+"Date" => "Data",
+"Cal." => "Cal.",
+"All day" => "Todo o dia",
+"Missing fields" => "Faltan campos",
+"Title" => "Título",
+"From Date" => "Desde Data",
+"From Time" => "Desde Hora",
+"To Date" => "a Data",
+"To Time" => "a Hora",
+"The event ends before it starts" => "O evento remata antes de iniciarse",
+"There was a database fail" => "Houbo un erro na base de datos",
+"Week" => "Semana",
+"Month" => "Mes",
+"List" => "Lista",
+"Today" => "Hoxe",
+"Calendars" => "Calendarios",
+"There was a fail, while parsing the file." => "Houbo un erro ao procesar o ficheiro",
+"Sun." => "Dom.",
+"Mon." => "Lun.",
+"Tue." => "Mar.",
+"Wed." => "Mer.",
+"Thu." => "Xov.",
+"Fri." => "Ven.",
+"Sat." => "Sáb.",
+"Jan." => "Xan.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Abr.",
+"May." => "Mai.",
+"Jun." => "Xuñ.",
+"Jul." => "Xul.",
+"Aug." => "Ago.",
+"Sep." => "Set.",
+"Oct." => "Out.",
+"Nov." => "Nov.",
+"Dec." => "Nad.",
+"Choose active calendars" => "Escolla os calendarios activos",
+"New Calendar" => "Novo calendario",
+"CalDav Link" => "Ligazón CalDav",
+"Download" => "Baixar",
+"Edit" => "Editar",
+"Delete" => "Borrar",
+"New calendar" => "Novo calendario",
+"Edit calendar" => "Editar calendario",
+"Displayname" => "Mostrar nome",
+"Active" => "Activo",
+"Calendar color" => "Cor do calendario",
+"Save" => "Gardar",
+"Submit" => "Enviar",
+"Cancel" => "Cancelar",
+"Edit an event" => "Editar un evento",
+"Export" => "Exportar",
+"Title of the Event" => "Título do evento",
+"Category" => "Categoría",
+"Select category" => "Seleccionar categoría",
+"All Day Event" => "Evento para todo o día",
+"From" => "Desde",
+"To" => "Para",
+"Advanced options" => "Opcións avanzadas",
+"Repeat" => "Repetir",
+"Advanced" => "Avanzado",
+"Select weekdays" => "Seleccionar días da semana",
+"Select days" => "Seleccionar días",
+"and the events day of year." => "e día dos eventos no ano.",
+"and the events day of month." => "e día dos eventos no mes.",
+"Select months" => "Seleccione meses",
+"Select weeks" => "Seleccione semanas",
+"and the events week of year." => "e semana dos eventos no ano.",
+"Interval" => "Intervalo",
+"End" => "Fin",
+"occurrences" => "acontecementos",
+"Location" => "Localización",
+"Location of the Event" => "Localización do evento",
+"Description" => "Descripción",
+"Description of the Event" => "Descripción do evento",
+"Import a calendar file" => "Importar ficheiro de calendario",
+"Please choose the calendar" => "Por favor, seleccione o calendario",
+"create a new calendar" => "crear un novo calendario",
+"Name of new calendar" => "Nome do novo calendario",
+"Import" => "Importar",
+"Importing calendar" => "Importar calendario",
+"Calendar imported successfully" => "Calendario importado con éxito",
+"Close Dialog" => "Pechar cadro",
+"Create a new event" => "Crear un novo evento",
+"Timezone" => "Fuso horario",
+"Check always for changes of the timezone" => "Comprobar sempre cambios de fuso horario",
+"Timeformat" => "Formato de hora",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Dirección de sincronización do calendario CalDAV:"
+);
diff --git a/apps/calendar/l10n/it.php b/apps/calendar/l10n/it.php
index 71cfa6c8464..cb125043593 100644
--- a/apps/calendar/l10n/it.php
+++ b/apps/calendar/l10n/it.php
@@ -38,6 +38,7 @@
 "Friday" => "Venerdì",
 "Saturday" => "Sabato",
 "Sunday" => "Domenica",
+"events week of month" => "settimana del mese degli eventi",
 "first" => "primo",
 "second" => "secondo",
 "third" => "terzo",
@@ -56,6 +57,10 @@
 "October" => "Ottobre",
 "November" => "Novembre",
 "December" => "Dicembre",
+"by events date" => "per data evento",
+"by yearday(s)" => "per giorno/i dell'anno",
+"by weeknumber(s)" => "per numero/i settimana",
+"by day and month" => "per giorno e mese",
 "Not an array" => "Non è un array",
 "Date" => "Data",
 "Cal." => "Cal.",
@@ -74,6 +79,25 @@
 "Today" => "Oggi",
 "Calendars" => "Calendari",
 "There was a fail, while parsing the file." => "C'è stato un errore nel parsing del file.",
+"Sun." => "Dom.",
+"Mon." => "Lun.",
+"Tue." => "Mar.",
+"Wed." => "Mer.",
+"Thu." => "Gio.",
+"Fri." => "Ven.",
+"Sat." => "Sab.",
+"Jan." => "Gen.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Apr.",
+"May." => "Mag.",
+"Jun." => "Giu.",
+"Jul." => "Lug.",
+"Aug." => "Ago.",
+"Sep." => "Set.",
+"Oct." => "Ott.",
+"Nov." => "Nov.",
+"Dec." => "Dic.",
 "Choose active calendars" => "Selezionare calendari attivi",
 "New Calendar" => "Nuovo Calendario",
 "CalDav Link" => "CalDav Link",
@@ -98,18 +122,29 @@
 "To" => "A",
 "Advanced options" => "Opzioni avanzate",
 "Repeat" => "Ripeti",
+"Advanced" => "Avanzato",
 "Select weekdays" => "Seleziona i giorni della settimana",
 "Select days" => "Seleziona i giorni",
+"and the events day of year." => "e il giorno dell'anno degli eventi",
+"and the events day of month." => "e il giorno del mese degli eventi",
 "Select months" => "Seleziona i mesi",
 "Select weeks" => "Seleziona le settimane",
+"and the events week of year." => "e la settimana dell'anno degli eventi",
 "Interval" => "Intervallo",
 "End" => "Fine",
+"occurrences" => "occorrenze",
 "Location" => "Luogo",
 "Location of the Event" => "Luogo evento",
 "Description" => "Descrizione",
 "Description of the Event" => "Descrizione evento",
+"Import a calendar file" => "Importa un file calendario",
 "Please choose the calendar" => "Per favore scegli il calendario",
+"create a new calendar" => "Crea un nuovo calendario",
+"Name of new calendar" => "Nome del nuovo calendario",
 "Import" => "Importa",
+"Importing calendar" => "Sto importando il calendario",
+"Calendar imported successfully" => "Calendario importato con successo",
+"Close Dialog" => "Chiudi la finestra di dialogo",
 "Create a new event" => "Crea evento",
 "Timezone" => "Fuso orario",
 "Check always for changes of the timezone" => "Controlla sempre i cambiamenti di fuso orario",
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 1b3fc607729..f421651671d 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Error en (des)activar la llibreta d'adreces.",
+"There was an error adding the contact." => "S'ha produït un error en afegir el contacte.",
+"Cannot add empty property." => "No es pot afegir una propietat buida.",
+"At least one of the address fields has to be filled out." => "Almenys heu d'omplir un dels camps d'adreça.",
+"Error adding contact property." => "Error en afegir la propietat del contacte.",
+"Error adding addressbook." => "Error en afegir la llibreta d'adreces.",
+"Error activating addressbook." => "Error en activar la llibreta d'adreces.",
+"Error deleting contact property." => "Error en eliminar la propietat del contacte.",
+"Error updating contact property." => "Error en actualitzar la propietat del contacte.",
+"Error updating addressbook." => "Error en actualitzar la llibreta d'adreces.",
+"Contacts" => "Contactes",
 "This is not your addressbook." => "Aquesta no és la vostra llibreta d'adreces",
 "Contact could not be found." => "No s'ha trobat el contacte.",
 "Information about vCard is incorrect. Please reload the page." => "La informació de la vCard és incorrecta. Carregueu la pàgina de nou.",
@@ -14,10 +25,13 @@
 "Fax" => "Fax",
 "Video" => "Vídeo",
 "Pager" => "Paginador",
+"Contact" => "Contacte",
 "This is not your contact." => "Aquest contacte no és vostre.",
 "This card is not RFC compatible." => "Aquesta targeta no és compatible amb RFC.",
 "This card does not contain a photo." => "Aquesta targeta no conté foto.",
 "Add Contact" => "Afegiu un contacte",
+"Addressbooks" => "Llibretes d'adreces",
+"Addressbook" => "Llibreta d'adreces",
 "Name" => "Nom",
 "Type" => "Tipus",
 "PO Box" => "Adreça Postal",
@@ -34,8 +48,11 @@
 "Download" => "Baixa",
 "Edit" => "Edita",
 "Delete" => "Elimina",
+"Download contact" => "Baixa el contacte",
 "Delete contact" => "Elimina el contacte",
 "Add" => "Afegeix",
+"New Addressbook" => "Nova llibreta d'adreces",
+"Edit Addressbook" => "Edita la llibreta d'adreces",
 "Displayname" => "Nom a mostrar",
 "Active" => "Actiu",
 "Save" => "Desa",
@@ -44,5 +61,6 @@
 "Birthday" => "Aniversari",
 "Preferred" => "Preferit",
 "Phone" => "Telèfon",
-"Update" => "Actualitza"
+"Update" => "Actualitza",
+"CardDAV syncing address:" => "Adreça de sincronització CardDAV:"
 );
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 465e2d5456a..8970d716b0e 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses.",
+"There was an error adding the contact." => "Une erreur s'est produite lors de l'ajout du contact.",
+"Cannot add empty property." => "Impossible d'ajouter un champ vide.",
+"At least one of the address fields has to be filled out." => "Au moins un des champs d'adresses doit être complété.",
+"Error adding contact property." => "Erreur lors de l'ajout du champ.",
+"Error adding addressbook." => "Erreur lors de l'ajout du carnet d'adresses.",
+"Error activating addressbook." => "Erreur lors de l'activation du carnet d'adresses.",
+"Error deleting contact property." => "Erreur lors de la suppression du champ.",
+"Error updating contact property." => "Erreur lors de la mise à jour du champ.",
+"Error updating addressbook." => "Erreur lors de la mise à jour du carnet d'adresses.",
+"Contacts" => "Contacts",
 "This is not your addressbook." => "Ce n'est pas votre carnet d'adresses.",
 "Contact could not be found." => "Ce contact n'a pas été trouvé.",
 "Information about vCard is incorrect. Please reload the page." => "Les informations relatives à cette vCard sont incorrectes. Veuillez recharger la page.",
@@ -14,10 +25,13 @@
 "Fax" => "Fax",
 "Video" => "Vidéo",
 "Pager" => "Bipeur",
+"Contact" => "Contact",
 "This is not your contact." => "Ce n'est pas votre contact.",
 "This card is not RFC compatible." => "Cette fiche n'est pas compatible RFC.",
 "This card does not contain a photo." => "Cette fiche ne contient pas de photo.",
 "Add Contact" => "Ajouter un Contact",
+"Addressbooks" => "Carnets d'adresses",
+"Addressbook" => "Carnet d'adresses",
 "Name" => "Nom",
 "Type" => "Type",
 "PO Box" => "Boîte postale",
@@ -34,8 +48,11 @@
 "Download" => "Télécharger",
 "Edit" => "Modifier",
 "Delete" => "Supprimer",
+"Download contact" => "Télécharger le contact",
 "Delete contact" => "Supprimer le contact",
 "Add" => "Ajouter",
+"New Addressbook" => "Nouveau carnet d'adresses",
+"Edit Addressbook" => "Éditer le carnet d'adresses",
 "Displayname" => "Nom",
 "Active" => "Carnet actif",
 "Save" => "Sauvegarder",
@@ -44,5 +61,6 @@
 "Birthday" => "Anniversaire",
 "Preferred" => "Préféré",
 "Phone" => "Téléphone",
-"Update" => "Enregistrer"
+"Update" => "Enregistrer",
+"CardDAV syncing address:" => "Adresse de synchronisation CardDAV :"
 );
diff --git a/apps/contacts/l10n/gl.php b/apps/contacts/l10n/gl.php
new file mode 100644
index 00000000000..0fd88ead191
--- /dev/null
+++ b/apps/contacts/l10n/gl.php
@@ -0,0 +1,66 @@
+<?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Erro (des)activando o directorio",
+"There was an error adding the contact." => "Houbo un erro engadindo o contacto",
+"Cannot add empty property." => "Non se pode engadir unha propiedade baldeira",
+"At least one of the address fields has to be filled out." => "A lo menos un dos campos de dirección ten que ser cuberto",
+"Error adding contact property." => "Erro engadindo unha propiedade do contacto.",
+"Error adding addressbook." => "Erro engadindo directorio.",
+"Error activating addressbook." => "Erro activando o directorio.",
+"Error deleting contact property." => "Erro borrando propiedade do contacto.",
+"Error updating contact property." => "Erro actualizando a propiedade do contacto.",
+"Error updating addressbook." => "Erro actualizando o directorio.",
+"Contacts" => "Contactos",
+"This is not your addressbook." => "Este non é o seu directorio",
+"Contact could not be found." => "Non se atopou o contacto",
+"Information about vCard is incorrect. Please reload the page." => "A información sobre a vCard é incorrecta. Por favor volte a cargar a páxina.",
+"Address" => "Dirección",
+"Telephone" => "Teléfono",
+"Email" => "Correo electrónico",
+"Organization" => "Organización",
+"Work" => "Emprego",
+"Home" => "Casa",
+"Mobile" => "Móbil",
+"Text" => "Texto",
+"Voice" => "Voz",
+"Fax" => "Fax",
+"Video" => "Vídeo",
+"Pager" => "Paxinador",
+"Contact" => "Contacto",
+"This is not your contact." => "Este non é un dos seus contactos",
+"This card is not RFC compatible." => "Esta tarxeta non é compatible con RFC",
+"This card does not contain a photo." => "Esta tarxeta non ten fotografía",
+"Add Contact" => "Engadir contacto",
+"Addressbooks" => "Directorios",
+"Addressbook" => "Directorio",
+"Name" => "Nome",
+"Type" => "Escriba",
+"PO Box" => "Apartado de Correos",
+"Extended" => "Extendido",
+"Street" => "Rúa",
+"City" => "Cidade",
+"Region" => "Rexión",
+"Zipcode" => "Código Postal",
+"Country" => "País",
+"Create Contact" => "Crear contacto",
+"Choose active Address Books" => "Escolla os Directorios Activos",
+"New Address Book" => "Novo Directorio",
+"CardDav Link" => "Ligazón CardDav",
+"Download" => "Baixar",
+"Edit" => "Editar",
+"Delete" => "Eliminar",
+"Download contact" => "Descargar contacto",
+"Delete contact" => "Borrar contacto",
+"Add" => "Engadir",
+"New Addressbook" => "Novo Directorio",
+"Edit Addressbook" => "Editar Directorio",
+"Displayname" => "Mostrar nome",
+"Active" => "Activo",
+"Save" => "Gardar",
+"Submit" => "Enviar",
+"Cancel" => "Cancelar",
+"Birthday" => "Cumpleanos",
+"Preferred" => "Preferido",
+"Phone" => "Teléfono",
+"Update" => "Actualizar",
+"CardDAV syncing address:" => "Dirección de sincronización CardDAV:"
+);
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index c4360d89133..6ac1677e3c0 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Errore nel (dis)attivare la rubrica",
+"There was an error adding the contact." => "Si è verificato un errore nell'aggiunta del contatto.",
+"Cannot add empty property." => "Impossibile aggiungere una proprietà vuota.",
+"At least one of the address fields has to be filled out." => "Deve essere riempito almeno un indirizzo .",
+"Error adding contact property." => "Errore durante l'aggiunta della proprietà del contatto.",
+"Error adding addressbook." => "Errore nell'aggiunta della rubrica.",
+"Error activating addressbook." => "Errore nell'attivazione della rubrica.",
+"Error deleting contact property." => "Errore nella cancellazione della proprietà del contatto.",
+"Error updating contact property." => "Errore nell'aggiornamento della proprietà del contatto.",
+"Error updating addressbook." => "Errore nell'aggiornamento della rubrica.",
+"Contacts" => "Contatti",
 "This is not your addressbook." => "Questa non è la tua rubrica.",
 "Contact could not be found." => "Il contatto non può essere trovato",
 "Information about vCard is incorrect. Please reload the page." => "Informazioni sulla vCard incorrette. Ricaricare la pagina.",
@@ -14,10 +25,13 @@
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Cercapersone",
+"Contact" => "Contatto",
 "This is not your contact." => "Questo non è un tuo contatto.",
 "This card is not RFC compatible." => "Questa card non è compatibile con il protocollo RFC.",
 "This card does not contain a photo." => "Questa card non contiene una foto.",
 "Add Contact" => "Aggiungi contatto",
+"Addressbooks" => "Rubriche",
+"Addressbook" => "Rubrica",
 "Name" => "Nome",
 "Type" => "Tipo",
 "PO Box" => "Casella postale",
@@ -34,8 +48,11 @@
 "Download" => "Scarica",
 "Edit" => "Modifica",
 "Delete" => "Cancella",
+"Download contact" => "Scarica contatto",
 "Delete contact" => "Cancella contatto",
 "Add" => "Aggiungi",
+"New Addressbook" => "Nuova Rubrica",
+"Edit Addressbook" => "Modifica Rubrica",
 "Displayname" => "Nome da mostrare",
 "Active" => "Attiva",
 "Save" => "Salva",
@@ -44,5 +61,6 @@
 "Birthday" => "Compleanno",
 "Preferred" => "Preferito",
 "Phone" => "Telefono",
-"Update" => "Aggiorna"
+"Update" => "Aggiorna",
+"CardDAV syncing address:" => "Indirizzo di sincronizzazione CarDAV:"
 );
diff --git a/apps/contacts/l10n/sr.php b/apps/contacts/l10n/sr.php
index 882381c37c2..d09bac430f2 100644
--- a/apps/contacts/l10n/sr.php
+++ b/apps/contacts/l10n/sr.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Contacts" => "Контакти",
 "This is not your addressbook." => "Ово није ваш адре�ар.",
 "Contact could not be found." => "Контакт �е не може наћи.",
 "Information about vCard is incorrect. Please reload the page." => "Подаци о вКарти �у неи�правни. Поново учитајте �траницу.",
@@ -14,11 +15,15 @@
 "Fax" => "Фак�",
 "Video" => "Видео",
 "Pager" => "Пејџер",
+"Contact" => "Контакт",
 "This is not your contact." => "Ово није ваш контакт.",
 "This card is not RFC compatible." => "Ова карта није �агла�на �а РФЦ-ом.",
 "This card does not contain a photo." => "Ова карта не �адржи фотографију.",
 "Add Contact" => "Додај контакт",
+"Addressbooks" => "�дре�ар",
+"Addressbook" => "�дре�ар",
 "Name" => "Име",
+"Type" => "Тип",
 "PO Box" => "Поштан�ки број",
 "Extended" => "Прошири",
 "Street" => "Улица",
@@ -27,8 +32,23 @@
 "Zipcode" => "Зип код",
 "Country" => "Земља",
 "Create Contact" => "�аправи контакт",
+"Choose active Address Books" => "Изаберите активне адре�аре",
+"New Address Book" => "�ови адре�ар",
+"Download" => "Преузимање",
 "Edit" => "Уреди",
 "Delete" => "Обриши",
+"Download contact" => "Преузми контакт",
+"Delete contact" => "Обриши контакт",
+"Add" => "Додај",
+"New Addressbook" => "�ови адре�ар",
+"Edit Addressbook" => "Уреди адре�ар",
+"Displayname" => "Приказано име",
+"Active" => "�ктиван",
+"Save" => "Сними",
+"Submit" => "Пошаљи",
+"Cancel" => "Откажи",
 "Birthday" => "Рођендан",
-"Phone" => "Телефон"
+"Preferred" => "Пожељан",
+"Phone" => "Телефон",
+"Update" => "�журирај"
 );
diff --git a/apps/gallery/l10n/ca.php b/apps/gallery/l10n/ca.php
new file mode 100644
index 00000000000..f3eb40df553
--- /dev/null
+++ b/apps/gallery/l10n/ca.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galeria",
+"Rescan" => "Escaneja de nou",
+"Back" => "Enrera"
+);
diff --git a/apps/gallery/l10n/de.php b/apps/gallery/l10n/de.php
index 4ca5c83249c..b7f1934189a 100644
--- a/apps/gallery/l10n/de.php
+++ b/apps/gallery/l10n/de.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-  "Gallery" => "Galerie",
-  "Back" => "Zurück"
+"Gallery" => "Galerie",
+"Rescan" => "Rescan",
+"Back" => "Zurück"
 );
-?>
diff --git a/apps/gallery/l10n/fr.php b/apps/gallery/l10n/fr.php
new file mode 100644
index 00000000000..17902bd70c9
--- /dev/null
+++ b/apps/gallery/l10n/fr.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galerie",
+"Rescan" => "Analyser à nouveau",
+"Back" => "Retour"
+);
diff --git a/apps/gallery/l10n/gl.php b/apps/gallery/l10n/gl.php
new file mode 100644
index 00000000000..b4f9885a525
--- /dev/null
+++ b/apps/gallery/l10n/gl.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galería",
+"Rescan" => "Voltar a analizar",
+"Back" => "Atrás"
+);
diff --git a/apps/gallery/l10n/it.php b/apps/gallery/l10n/it.php
new file mode 100644
index 00000000000..0f95cc3af66
--- /dev/null
+++ b/apps/gallery/l10n/it.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galleria",
+"Rescan" => "Rileggi",
+"Back" => "Indietro"
+);
diff --git a/apps/gallery/l10n/sk_SK.php b/apps/gallery/l10n/sk_SK.php
new file mode 100644
index 00000000000..d8ae41af96e
--- /dev/null
+++ b/apps/gallery/l10n/sk_SK.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galéria",
+"Rescan" => "Znovu oskenovať",
+"Back" => "Späť"
+);
diff --git a/apps/gallery/l10n/sr.php b/apps/gallery/l10n/sr.php
new file mode 100644
index 00000000000..c6976b56a9f
--- /dev/null
+++ b/apps/gallery/l10n/sr.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Галерија",
+"Rescan" => "Претражи поново",
+"Back" => "�азад"
+);
diff --git a/apps/gallery/l10n/zh_CN.php b/apps/gallery/l10n/zh_CN.php
new file mode 100644
index 00000000000..c506600c4c0
--- /dev/null
+++ b/apps/gallery/l10n/zh_CN.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "画廊",
+"Rescan" => "�新扫�",
+"Back" => "返回"
+);
diff --git a/apps/media/l10n/gl.php b/apps/media/l10n/gl.php
new file mode 100644
index 00000000000..b2d0bc78355
--- /dev/null
+++ b/apps/media/l10n/gl.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Música",
+"Play" => "Reproducir",
+"Pause" => "Pausa",
+"Previous" => "Anterior",
+"Next" => "Seguinte",
+"Mute" => "Silenciar",
+"Unmute" => "Restaurar volume",
+"Rescan Collection" => "Voltar a analizar a Colección",
+"Artist" => "Artista",
+"Album" => "Album",
+"Title" => "Título"
+);
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
new file mode 100644
index 00000000000..4ac995756ca
--- /dev/null
+++ b/core/l10n/gl.php
@@ -0,0 +1,39 @@
+<?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Restablecemento do contrasinal de Owncloud",
+"Use the following link to reset your password: {link}" => "Use a seguinte ligazón para restablecer o contrasinal: {link}",
+"You will receive a link to reset your password via Email." => "Recibirás unha ligazón por correo electrónico para restablecer o contrasinal",
+"Requested" => "Solicitado",
+"Login failed!" => "Fallou a conexión!",
+"Username" => "Nome de usuario",
+"Request reset" => "Petición de restablecemento",
+"Your password was reset" => "O contrasinal foi restablecido",
+"To login page" => "A páxina de conexión",
+"New password" => "Novo contrasinal",
+"Reset password" => "Restablecer contrasinal",
+"Personal" => "Personal",
+"Users" => "Usuarios",
+"Apps" => "Aplicativos",
+"Admin" => "Admin",
+"Help" => "Axuda",
+"Cloud not found" => "Nube non atopada",
+"Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
+"Password" => "Contrasinal",
+"Advanced" => "Avanzado",
+"Data folder" => "Cartafol de datos",
+"Configure the database" => "Configurar a base de datos",
+"will be used" => "será utilizado",
+"Database user" => "Usuario da base de datos",
+"Database password" => "Contrasinal da base de datos",
+"Database name" => "Nome da base de datos",
+"Database host" => "Servidor da base de datos",
+"Finish setup" => "Rematar configuración",
+"web services under your control" => "servizos web baixo o seu control",
+"Log out" => "Desconectar",
+"Settings" => "Preferencias",
+"Lost your password?" => "Perdéchelo contrasinal?",
+"remember" => "lembrar",
+"Log in" => "Conectar",
+"You are logged out." => "Está desconectado",
+"prev" => "anterior",
+"next" => "seguinte"
+);
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 1a63e7ea36e..02b7cb81078 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -7,7 +7,7 @@
 "Username" => "Nome utente",
 "Request reset" => "Richiesta di ripristino",
 "Your password was reset" => "La password è stata reimpostata",
-"To login page" => "Alla pagina di ingresso",
+"To login page" => "Alla pagina di login",
 "New password" => "Nuova password",
 "Reset password" => "Reimposta password",
 "Personal" => "Personale",
@@ -26,11 +26,11 @@
 "Database password" => "Password database",
 "Database name" => "Nome database",
 "Database host" => "Host del database",
-"Finish setup" => "Termina",
-"web services under your control" => "Servizi web nelle tue mani",
-"Log out" => "Log out",
+"Finish setup" => "Termina Configurazione",
+"web services under your control" => "servizi web nelle tue mani",
+"Log out" => "Esci",
 "Settings" => "Impostazioni",
-"Lost your password?" => "Password persa?",
+"Lost your password?" => "Hai perso la password?",
 "remember" => "ricorda",
 "Log in" => "Entra",
 "You are logged out." => "Sei uscito.",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 43d8ca7d5e0..11ad408b8e5 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Obnova Owncloud hesla",
+"Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
 "You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte E-mailom.",
 "Requested" => "Požiadané",
 "Login failed!" => "Prihlásenie zlyhalo!",
 "Username" => "Prihlasovacie meno",
 "Request reset" => "Požiadať o obnovenie",
 "Your password was reset" => "Vaše heslo bolo obnovené",
+"To login page" => "Na prihlasovaciu stránku",
 "New password" => "Nové heslo",
 "Reset password" => "Obnova hesla",
 "Personal" => "Osobné",
@@ -24,10 +27,12 @@
 "Database name" => "Meno databázy",
 "Database host" => "Server databázy",
 "Finish setup" => "Dokon�iť inštaláciu",
+"web services under your control" => "webové služby pod vašou kontrolou",
 "Log out" => "Odhlásiť",
 "Settings" => "Nastavenia",
 "Lost your password?" => "Zabudli ste heslo?",
 "remember" => "zapamätať",
+"Log in" => "Prihlásiť sa",
 "You are logged out." => "Ste odhlásený.",
 "prev" => "späť",
 "next" => "�alej"
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 667a7b054c3..6bd6275df4b 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Ре�етовање лозинке за Оунклауд",
+"Use the following link to reset your password: {link}" => "Овом везом ре�етујте �воју лозинку: {link}",
 "You will receive a link to reset your password via Email." => "Добићете везу за ре�етовање лозинке путем е-поште.",
 "Requested" => "Захтевано",
 "Login failed!" => "�е�упела пријава!",
 "Username" => "Кори�ничко име",
 "Request reset" => "Захтевај ре�етовање",
 "Your password was reset" => "Ваша лозинка је ре�етована",
+"To login page" => "�а �траницу за пријаву",
 "New password" => "�ова лозинка",
 "Reset password" => "Ре�етуј лозинку",
 "Personal" => "Лична",
@@ -24,10 +27,12 @@
 "Database name" => "Име базе",
 "Database host" => "Домаћин базе",
 "Finish setup" => "Заврши подешавање",
+"web services under your control" => "веб �ерви�и под контролом",
 "Log out" => "Одјава",
 "Settings" => "Подешавања",
 "Lost your password?" => "Изгубили �те лозинку?",
 "remember" => "упамти",
+"Log in" => "Пријава",
 "You are logged out." => "Одјављени �те.",
 "prev" => "претходно",
 "next" => "�ледеће"
diff --git a/files/l10n/gl.php b/files/l10n/gl.php
new file mode 100644
index 00000000000..83cf93be795
--- /dev/null
+++ b/files/l10n/gl.php
@@ -0,0 +1,23 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Non hai erros, o ficheiro subeuse con éxito",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O ficheiro subido supera a directiva upload_max_filesize no php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro subido supera a directiva MAX_FILE_SIZE que foi indicada no formulario HTML",
+"The uploaded file was only partially uploaded" => "O ficheiro subido foi só parcialmente subido",
+"No file was uploaded" => "Non se subeu ningún ficheiro",
+"Missing a temporary folder" => "Falta un cartafol temporal",
+"Files" => "Ficheiros",
+"Maximum upload size" => "Tamaño máximo de subida",
+"New" => "Novo",
+"Text file" => "Ficheiro de texto",
+"Folder" => "Cartafol",
+"From the web" => "Desde a rede",
+"Upload" => "Subir",
+"Nothing in here. Upload something!" => "Nada por aquí. Sube algo!",
+"Name" => "Nome",
+"Download" => "Baixar",
+"Size" => "Tamaño",
+"Modified" => "Modificado",
+"Delete" => "Eliminar",
+"Upload too large" => "Subida demasiado grande",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que tratas de subir superan o tamaño máximo permitido neste servidor"
+);
diff --git a/files/l10n/sr.php b/files/l10n/sr.php
index 9c5dbae2a23..7e2ac3b1366 100644
--- a/files/l10n/sr.php
+++ b/files/l10n/sr.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "�едо�таје привремена фа�цикла",
 "Files" => "Фајлови",
 "Maximum upload size" => "Мак�имална величина пошиљке",
+"New" => "�ови",
+"Text file" => "тек�туални фајл",
+"Folder" => "фа�цикла",
+"From the web" => "�а веба",
 "Upload" => "Пошаљи",
 "Nothing in here. Upload something!" => "Овде нема ничег. Пошаљите нешто!",
 "Name" => "Име",
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index ed62562f685..fc1c9e63f49 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "تم تغيير ال OpenID"
 msgid "Language changed"
 msgstr "تم تغيير اللغة"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index c5a72e79d81..7d72967afd9 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -35,6 +35,10 @@ msgstr "OpenID е �менено"
 msgid "Language changed"
 msgstr "Езика е �менен"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index 28a7aa018f8..95dd499ad42 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 21:19+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,47 +20,47 @@ msgstr ""
 
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "Error en (des)activar la llibreta d'adreces."
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "S'ha produït un error en afegir el contacte."
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "No es pot afegir una propietat buida."
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "Almenys heu d'omplir un dels camps d'adreça."
 
 #: ajax/addproperty.php:77
 msgid "Error adding contact property."
-msgstr ""
+msgstr "Error en afegir la propietat del contacte."
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "Error en afegir la llibreta d'adreces."
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Error en activar la llibreta d'adreces."
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Error en eliminar la propietat del contacte."
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Error en actualitzar la propietat del contacte."
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Error en actualitzar la llibreta d'adreces."
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Contactes"
 
 #: lib/app.php:42
 msgid "This is not your addressbook."
@@ -127,7 +127,7 @@ msgstr "Paginador"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Contacte"
 
 #: photo.php:40
 msgid "This is not your contact."
@@ -147,11 +147,11 @@ msgstr "Afegiu un contacte"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "Llibretes d'adreces"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "Llibreta d'adreces"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -229,7 +229,7 @@ msgstr "Elimina"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Baixa el contacte"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
@@ -241,11 +241,11 @@ msgstr "Afegeix"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Nova llibreta d'adreces"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Edita la llibreta d'adreces"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -285,6 +285,6 @@ msgstr "Actualitza"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "Adreça de sincronització CardDAV:"
 
 
diff --git a/l10n/ca/gallery.po b/l10n/ca/gallery.po
index b2c6ad5819a..f670a71c643 100644
--- a/l10n/ca/gallery.po
+++ b/l10n/ca/gallery.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <rcalvoi@yahoo.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 21:20+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "Galeria"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Escaneja de nou"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Enrera"
 
 
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 9467158bd2f..2a6ff9d93c4 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-11 09:47+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,6 +34,10 @@ msgstr "OpenID ha canviat"
 msgid "Language changed"
 msgstr "S'ha canviat l'idioma"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Nivell de registres"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 0787bfd9ebd..c7a83f2562d 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-11 11:33+0000\n"
-"Last-Translator: Martin <fireball@atlas.cz>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,6 +35,10 @@ msgstr "OpenID změněn"
 msgid "Language changed"
 msgstr "Jazyk byl změněn"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Úroveň logu"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 0882ebc94e7..16570895369 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-13 22:44+0000\n"
-"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,6 +36,10 @@ msgstr "OpenID ændret"
 msgid "Language changed"
 msgstr "Sprog ændret"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Log-niveau"
diff --git a/l10n/de/calendar.po b/l10n/de/calendar.po
index 786f0329267..69e449ad01d 100644
--- a/l10n/de/calendar.po
+++ b/l10n/de/calendar.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <admin@s-goecker.de>, 2011.
+#   <admin@s-goecker.de>, 2011, 2012.
 #   <georg.stefan.germany@googlemail.com>, 2011, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: goeck <admin@s-goecker.de>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -344,79 +344,79 @@ msgstr "Fehler beim Einlesen der Datei."
 
 #: templates/lAfix.php:9
 msgid "Sun."
-msgstr ""
+msgstr "So"
 
 #: templates/lAfix.php:10
 msgid "Mon."
-msgstr ""
+msgstr "Mo"
 
 #: templates/lAfix.php:11
 msgid "Tue."
-msgstr ""
+msgstr "Die"
 
 #: templates/lAfix.php:12
 msgid "Wed."
-msgstr ""
+msgstr "Mi"
 
 #: templates/lAfix.php:13
 msgid "Thu."
-msgstr ""
+msgstr "Do"
 
 #: templates/lAfix.php:14
 msgid "Fri."
-msgstr ""
+msgstr "Fr"
 
 #: templates/lAfix.php:15
 msgid "Sat."
-msgstr ""
+msgstr "Sa"
 
 #: templates/lAfix.php:28
 msgid "Jan."
-msgstr ""
+msgstr "Jan"
 
 #: templates/lAfix.php:29
 msgid "Feb."
-msgstr ""
+msgstr "Feb"
 
 #: templates/lAfix.php:30
 msgid "Mar."
-msgstr ""
+msgstr "Mär"
 
 #: templates/lAfix.php:31
 msgid "Apr."
-msgstr ""
+msgstr "Apr"
 
 #: templates/lAfix.php:32
 msgid "May."
-msgstr ""
+msgstr "Mai"
 
 #: templates/lAfix.php:33
 msgid "Jun."
-msgstr ""
+msgstr "Juni"
 
 #: templates/lAfix.php:34
 msgid "Jul."
-msgstr ""
+msgstr "Juli"
 
 #: templates/lAfix.php:35
 msgid "Aug."
-msgstr ""
+msgstr "Aug"
 
 #: templates/lAfix.php:36
 msgid "Sep."
-msgstr ""
+msgstr "Sep"
 
 #: templates/lAfix.php:37
 msgid "Oct."
-msgstr ""
+msgstr "Okt"
 
 #: templates/lAfix.php:38
 msgid "Nov."
-msgstr ""
+msgstr "Nov"
 
 #: templates/lAfix.php:39
 msgid "Dec."
-msgstr ""
+msgstr "Dez"
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
diff --git a/l10n/de/gallery.po b/l10n/de/gallery.po
index 64f9f997230..0b37124c43c 100644
--- a/l10n/de/gallery.po
+++ b/l10n/de/gallery.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Bartek  <bart.p.pl@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 21:46+0000\n"
+"Last-Translator: Bartek <bart.p.pl@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "Galerie"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Rescan"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Zurück"
 
 
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 9db3b4cec9d..ffceebc7631 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-12 15:43+0000\n"
-"Last-Translator: piccobello <nelsonfritsch@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,6 +36,10 @@ msgstr "OpenID geändert"
 msgid "Language changed"
 msgstr "Sprache geändert"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 3ca09077e0b..f0eb55301ce 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-11 17:35+0000\n"
-"Last-Translator: Petros Kyladitis <petros.kyladitis@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,6 +35,10 @@ msgstr "Το OpenID άλλαξε"
 msgid "Language changed"
 msgstr "Η γλώσσα άλλαξε"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Επίπεδο καταγ�αφής"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index d99fbc60bd9..d328f0e09ee 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/team/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "La agordo de OpenID estas �an�ita"
 msgid "Language changed"
 msgstr "La lingvo estas �an�ita"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 9114f621f8c..10cfe0b5cb9 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-11 19:01+0000\n"
-"Last-Translator: xsergiolpx <sergioballesterossolanas@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,6 +37,10 @@ msgstr "OpenID Cambiado"
 msgid "Language changed"
 msgstr "Idioma cambiado"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Nivel de log"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 9de62de218d..a34a2a17c2b 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID on muudetud"
 msgid "Language changed"
 msgstr "Keel on muudetud"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index e4655b60a08..f70d37fbbd5 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/team/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID aldatuta"
 msgid "Language changed"
 msgstr "Hizkuntza aldatuta"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/fr/calendar.po b/l10n/fr/calendar.po
index 2b5623cf569..042d62856ad 100644
--- a/l10n/fr/calendar.po
+++ b/l10n/fr/calendar.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 14:20+0000\n"
+"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -580,7 +580,7 @@ msgstr "Description de l'événement"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Importer un fichier de calendriers"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -588,11 +588,11 @@ msgstr "Choisissez le calendrier svp"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "Créer un nouveau calendrier"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Nom pour le nouveau calendrier"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -600,15 +600,15 @@ msgstr "Importer"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Import du calendrier"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Calendrier importé avec succès"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Fermer la fenêtre"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 90e4474072b..df10fd6b44e 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -6,14 +6,14 @@
 #   <fboulogne@april.org>, 2011.
 #   <gp4004@arghh.org>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
-#   <rom1dep@gmail.com>, 2011.
+#   <rom1dep@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 14:18+0000\n"
+"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,46 +24,48 @@ msgstr ""
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
 msgstr ""
+"Des erreurs se sont produites lors de l'activation/désactivation du carnet "
+"d'adresses."
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "Une erreur s'est produite lors de l'ajout du contact."
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "Impossible d'ajouter un champ vide."
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "Au moins un des champs d'adresses doit être complété."
 
 #: ajax/addproperty.php:77
 msgid "Error adding contact property."
-msgstr ""
+msgstr "Erreur lors de l'ajout du champ."
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "Erreur lors de l'ajout du carnet d'adresses."
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Erreur lors de l'activation du carnet d'adresses."
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Erreur lors de la suppression du champ."
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Erreur lors de la mise à jour du champ."
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Erreur lors de la mise à jour du carnet d'adresses."
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Contacts"
 
 #: lib/app.php:42
 msgid "This is not your addressbook."
@@ -132,7 +134,7 @@ msgstr "Bipeur"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Contact"
 
 #: photo.php:40
 msgid "This is not your contact."
@@ -152,11 +154,11 @@ msgstr "Ajouter un Contact"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "Carnets d'adresses"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "Carnet d'adresses"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -234,7 +236,7 @@ msgstr "Supprimer"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Télécharger le contact"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
@@ -246,11 +248,11 @@ msgstr "Ajouter"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Nouveau carnet d'adresses"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Éditer le carnet d'adresses"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -290,6 +292,6 @@ msgstr "Enregistrer"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "Adresse de synchronisation CardDAV :"
 
 
diff --git a/l10n/fr/gallery.po b/l10n/fr/gallery.po
index f2a196d96b9..2d662af6e80 100644
--- a/l10n/fr/gallery.po
+++ b/l10n/fr/gallery.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 14:12+0000\n"
+"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "Galerie"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Analyser à nouveau"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Retour"
 
 
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index a0a3373fba9..ca7d7a2b70e 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-11 20:18+0000\n"
-"Last-Translator: Borjan Tchakaloff <borjan@tchaka.fr>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,6 +36,10 @@ msgstr "Identifiant OpenID changé"
 msgid "Language changed"
 msgstr "Langue changée"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Niveau de log"
diff --git a/l10n/gl/calendar.po b/l10n/gl/calendar.po
index e4607d2f7d8..169607e0e8d 100644
--- a/l10n/gl/calendar.po
+++ b/l10n/gl/calendar.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 07:09+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,40 +20,40 @@ msgstr ""
 
 #: ajax/guesstimezone.php:42
 msgid "New Timezone:"
-msgstr ""
+msgstr "Novo fuso horario:"
 
 #: ajax/settimezone.php:22
 msgid "Timezone changed"
-msgstr ""
+msgstr "Fuso horario trocado"
 
 #: ajax/settimezone.php:24
 msgid "Invalid request"
-msgstr ""
+msgstr "Petición non válida"
 
 #: appinfo/app.php:20 templates/calendar.php:13
 #: templates/part.eventform.php:20
 msgid "Calendar"
-msgstr ""
+msgstr "Calendario"
 
 #: lib/app.php:19
 msgid "Wrong calendar"
-msgstr ""
+msgstr "Calendario equivocado"
 
 #: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
-msgstr ""
+msgstr "Cumpleanos"
 
 #: lib/app.php:61 lib/object.php:333
 msgid "Business"
-msgstr ""
+msgstr "Traballo"
 
 #: lib/app.php:62 lib/object.php:334
 msgid "Call"
-msgstr ""
+msgstr "Chamada"
 
 #: lib/app.php:63 lib/object.php:335
 msgid "Clients"
-msgstr ""
+msgstr "Clientes"
 
 #: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
@@ -60,577 +61,577 @@ msgstr ""
 
 #: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
-msgstr ""
+msgstr "Vacacións"
 
 #: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
-msgstr ""
+msgstr "Ideas"
 
 #: lib/app.php:67 lib/object.php:339
 msgid "Journey"
-msgstr ""
+msgstr "Viaxe"
 
 #: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
-msgstr ""
+msgstr "Aniversario"
 
 #: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
-msgstr ""
+msgstr "Reunión"
 
 #: lib/app.php:70 lib/object.php:342
 msgid "Other"
-msgstr ""
+msgstr "Outro"
 
 #: lib/app.php:71 lib/object.php:343
 msgid "Personal"
-msgstr ""
+msgstr "Personal"
 
 #: lib/app.php:72 lib/object.php:344
 msgid "Projects"
-msgstr ""
+msgstr "Proxectos"
 
 #: lib/app.php:73 lib/object.php:345
 msgid "Questions"
-msgstr ""
+msgstr "Preguntas"
 
 #: lib/app.php:74 lib/object.php:346
 msgid "Work"
-msgstr ""
+msgstr "Traballo"
 
 #: lib/object.php:353
 msgid "Does not repeat"
-msgstr ""
+msgstr "Non se repite"
 
 #: lib/object.php:354
 msgid "Daily"
-msgstr ""
+msgstr "A diario"
 
 #: lib/object.php:355
 msgid "Weekly"
-msgstr ""
+msgstr "Semanalmente"
 
 #: lib/object.php:356
 msgid "Every Weekday"
-msgstr ""
+msgstr "Tódalas semanas"
 
 #: lib/object.php:357
 msgid "Bi-Weekly"
-msgstr ""
+msgstr "Cada dúas semanas"
 
 #: lib/object.php:358
 msgid "Monthly"
-msgstr ""
+msgstr "Mensualmente"
 
 #: lib/object.php:359
 msgid "Yearly"
-msgstr ""
+msgstr "Anual"
 
 #: lib/object.php:366
 msgid "never"
-msgstr ""
+msgstr "nunca"
 
 #: lib/object.php:367
 msgid "by occurrences"
-msgstr ""
+msgstr "por acontecementos"
 
 #: lib/object.php:368
 msgid "by date"
-msgstr ""
+msgstr "por data"
 
 #: lib/object.php:375
 msgid "by monthday"
-msgstr ""
+msgstr "por día do mes"
 
 #: lib/object.php:376
 msgid "by weekday"
-msgstr ""
+msgstr "por día da semana"
 
 #: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr ""
+msgstr "Luns"
 
 #: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr ""
+msgstr "Martes"
 
 #: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr ""
+msgstr "Mércores"
 
 #: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr ""
+msgstr "Xoves"
 
 #: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr ""
+msgstr "Venres"
 
 #: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr ""
+msgstr "Sábado"
 
 #: lib/object.php:389 templates/lAfix.php:2
 msgid "Sunday"
-msgstr ""
+msgstr "Domingo"
 
 #: lib/object.php:396
 msgid "events week of month"
-msgstr ""
+msgstr "semana dos eventos no mes"
 
 #: lib/object.php:397
 msgid "first"
-msgstr ""
+msgstr "primeiro"
 
 #: lib/object.php:398
 msgid "second"
-msgstr ""
+msgstr "segundo"
 
 #: lib/object.php:399
 msgid "third"
-msgstr ""
+msgstr "terceiro"
 
 #: lib/object.php:400
 msgid "fourth"
-msgstr ""
+msgstr "cuarto"
 
 #: lib/object.php:401
 msgid "fifth"
-msgstr ""
+msgstr "quinto"
 
 #: lib/object.php:402
 msgid "last"
-msgstr ""
+msgstr "último"
 
 #: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr ""
+msgstr "Xaneiro"
 
 #: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr ""
+msgstr "Febreiro"
 
 #: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
 #: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr ""
+msgstr "Xuño"
 
 #: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr ""
+msgstr "Xullo"
 
 #: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
 #: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
 #: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
 #: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr ""
+msgstr "Nadal"
 
 #: lib/object.php:441
 msgid "by events date"
-msgstr ""
+msgstr "por data dos eventos"
 
 #: lib/object.php:442
 msgid "by yearday(s)"
-msgstr ""
+msgstr "por dia(s) do ano"
 
 #: lib/object.php:443
 msgid "by weeknumber(s)"
-msgstr ""
+msgstr "por número(s) de semana"
 
 #: lib/object.php:444
 msgid "by day and month"
-msgstr ""
+msgstr "por día e mes"
 
 #: lib/object.php:467
 msgid "Not an array"
-msgstr ""
+msgstr "Non é un conxunto"
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #: lib/search.php:40
 msgid "Cal."
-msgstr ""
+msgstr "Cal."
 
 #: templates/calendar.php:10
 msgid "All day"
-msgstr ""
+msgstr "Todo o dia"
 
 #: templates/calendar.php:11
 msgid "Missing fields"
-msgstr ""
+msgstr "Faltan campos"
 
 #: templates/calendar.php:12 templates/part.eventform.php:3
 msgid "Title"
-msgstr ""
+msgstr "Título"
 
 #: templates/calendar.php:14
 msgid "From Date"
-msgstr ""
+msgstr "Desde Data"
 
 #: templates/calendar.php:15
 msgid "From Time"
-msgstr ""
+msgstr "Desde Hora"
 
 #: templates/calendar.php:16
 msgid "To Date"
-msgstr ""
+msgstr "a Data"
 
 #: templates/calendar.php:17
 msgid "To Time"
-msgstr ""
+msgstr "a Hora"
 
 #: templates/calendar.php:18
 msgid "The event ends before it starts"
-msgstr ""
+msgstr "O evento remata antes de iniciarse"
 
 #: templates/calendar.php:19
 msgid "There was a database fail"
-msgstr ""
+msgstr "Houbo un erro na base de datos"
 
 #: templates/calendar.php:52
 msgid "Week"
-msgstr ""
+msgstr "Semana"
 
 #: templates/calendar.php:53
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #: templates/calendar.php:54
 msgid "List"
-msgstr ""
+msgstr "Lista"
 
 #: templates/calendar.php:59
 msgid "Today"
-msgstr ""
+msgstr "Hoxe"
 
 #: templates/calendar.php:60
 msgid "Calendars"
-msgstr ""
+msgstr "Calendarios"
 
 #: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
-msgstr ""
+msgstr "Houbo un erro ao procesar o ficheiro"
 
 #: templates/lAfix.php:9
 msgid "Sun."
-msgstr ""
+msgstr "Dom."
 
 #: templates/lAfix.php:10
 msgid "Mon."
-msgstr ""
+msgstr "Lun."
 
 #: templates/lAfix.php:11
 msgid "Tue."
-msgstr ""
+msgstr "Mar."
 
 #: templates/lAfix.php:12
 msgid "Wed."
-msgstr ""
+msgstr "Mer."
 
 #: templates/lAfix.php:13
 msgid "Thu."
-msgstr ""
+msgstr "Xov."
 
 #: templates/lAfix.php:14
 msgid "Fri."
-msgstr ""
+msgstr "Ven."
 
 #: templates/lAfix.php:15
 msgid "Sat."
-msgstr ""
+msgstr "Sáb."
 
 #: templates/lAfix.php:28
 msgid "Jan."
-msgstr ""
+msgstr "Xan."
 
 #: templates/lAfix.php:29
 msgid "Feb."
-msgstr ""
+msgstr "Feb."
 
 #: templates/lAfix.php:30
 msgid "Mar."
-msgstr ""
+msgstr "Mar."
 
 #: templates/lAfix.php:31
 msgid "Apr."
-msgstr ""
+msgstr "Abr."
 
 #: templates/lAfix.php:32
 msgid "May."
-msgstr ""
+msgstr "Mai."
 
 #: templates/lAfix.php:33
 msgid "Jun."
-msgstr ""
+msgstr "Xuñ."
 
 #: templates/lAfix.php:34
 msgid "Jul."
-msgstr ""
+msgstr "Xul."
 
 #: templates/lAfix.php:35
 msgid "Aug."
-msgstr ""
+msgstr "Ago."
 
 #: templates/lAfix.php:36
 msgid "Sep."
-msgstr ""
+msgstr "Set."
 
 #: templates/lAfix.php:37
 msgid "Oct."
-msgstr ""
+msgstr "Out."
 
 #: templates/lAfix.php:38
 msgid "Nov."
-msgstr ""
+msgstr "Nov."
 
 #: templates/lAfix.php:39
 msgid "Dec."
-msgstr ""
+msgstr "Nad."
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
-msgstr ""
+msgstr "Escolla os calendarios activos"
 
 #: templates/part.choosecalendar.php:15
 msgid "New Calendar"
-msgstr ""
+msgstr "Novo calendario"
 
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr ""
+msgstr "Ligazón CalDav"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
-msgstr ""
+msgstr "Baixar"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Edit"
-msgstr ""
+msgstr "Editar"
 
 #: templates/part.choosecalendar.rowfields.php:4
 #: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Borrar"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "Novo calendario"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
-msgstr ""
+msgstr "Editar calendario"
 
 #: templates/part.editcalendar.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Mostrar nome"
 
 #: templates/part.editcalendar.php:23
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #: templates/part.editcalendar.php:29
 msgid "Calendar color"
-msgstr ""
+msgstr "Cor do calendario"
 
 #: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Gardar"
 
 #: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Enviar"
 
 #: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #: templates/part.editevent.php:1
 msgid "Edit an event"
-msgstr ""
+msgstr "Editar un evento"
 
 #: templates/part.editevent.php:10
 msgid "Export"
-msgstr ""
+msgstr "Exportar"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
-msgstr ""
+msgstr "Título do evento"
 
 #: templates/part.eventform.php:11
 msgid "Category"
-msgstr ""
+msgstr "Categoría"
 
 #: templates/part.eventform.php:13
 msgid "Select category"
-msgstr ""
+msgstr "Seleccionar categoría"
 
 #: templates/part.eventform.php:37
 msgid "All Day Event"
-msgstr ""
+msgstr "Evento para todo o día"
 
 #: templates/part.eventform.php:41
 msgid "From"
-msgstr ""
+msgstr "Desde"
 
 #: templates/part.eventform.php:49
 msgid "To"
-msgstr ""
+msgstr "Para"
 
 #: templates/part.eventform.php:57
 msgid "Advanced options"
-msgstr ""
+msgstr "Opcións avanzadas"
 
 #: templates/part.eventform.php:61
 msgid "Repeat"
-msgstr ""
+msgstr "Repetir"
 
 #: templates/part.eventform.php:68
 msgid "Advanced"
-msgstr ""
+msgstr "Avanzado"
 
 #: templates/part.eventform.php:112
 msgid "Select weekdays"
-msgstr ""
+msgstr "Seleccionar días da semana"
 
 #: templates/part.eventform.php:125 templates/part.eventform.php:138
 msgid "Select days"
-msgstr ""
+msgstr "Seleccionar días"
 
 #: templates/part.eventform.php:130
 msgid "and the events day of year."
-msgstr ""
+msgstr "e día dos eventos no ano."
 
 #: templates/part.eventform.php:143
 msgid "and the events day of month."
-msgstr ""
+msgstr "e día dos eventos no mes."
 
 #: templates/part.eventform.php:151
 msgid "Select months"
-msgstr ""
+msgstr "Seleccione meses"
 
 #: templates/part.eventform.php:164
 msgid "Select weeks"
-msgstr ""
+msgstr "Seleccione semanas"
 
 #: templates/part.eventform.php:169
 msgid "and the events week of year."
-msgstr ""
+msgstr "e semana dos eventos no ano."
 
 #: templates/part.eventform.php:175
 msgid "Interval"
-msgstr ""
+msgstr "Intervalo"
 
 #: templates/part.eventform.php:181
 msgid "End"
-msgstr ""
+msgstr "Fin"
 
 #: templates/part.eventform.php:193
 msgid "occurrences"
-msgstr ""
+msgstr "acontecementos"
 
 #: templates/part.eventform.php:208
 msgid "Location"
-msgstr ""
+msgstr "Localización"
 
 #: templates/part.eventform.php:210
 msgid "Location of the Event"
-msgstr ""
+msgstr "Localización do evento"
 
 #: templates/part.eventform.php:216
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #: templates/part.eventform.php:218
 msgid "Description of the Event"
-msgstr ""
+msgstr "Descripción do evento"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Importar ficheiro de calendario"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
-msgstr ""
+msgstr "Por favor, seleccione o calendario"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "crear un novo calendario"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Nome do novo calendario"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Importar"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Importar calendario"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Calendario importado con éxito"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Pechar cadro"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
-msgstr ""
+msgstr "Crear un novo evento"
 
 #: templates/settings.php:13
 msgid "Timezone"
-msgstr ""
+msgstr "Fuso horario"
 
 #: templates/settings.php:30
 msgid "Check always for changes of the timezone"
-msgstr ""
+msgstr "Comprobar sempre cambios de fuso horario"
 
 #: templates/settings.php:32
 msgid "Timeformat"
-msgstr ""
+msgstr "Formato de hora"
 
 #: templates/settings.php:34
 msgid "24h"
-msgstr ""
+msgstr "24h"
 
 #: templates/settings.php:35
 msgid "12h"
-msgstr ""
+msgstr "12h"
 
 #: templates/settings.php:41
 msgid "Calendar CalDAV syncing address:"
-msgstr ""
+msgstr "Dirección de sincronización do calendario CalDAV:"
 
 
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index a5df9ac8e9a..cfec12a1886 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 06:44+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,271 +20,272 @@ msgstr ""
 
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "Erro (des)activando o directorio"
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "Houbo un erro engadindo o contacto"
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "Non se pode engadir unha propiedade baldeira"
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "A lo menos un dos campos de dirección ten que ser cuberto"
 
 #: ajax/addproperty.php:77
 msgid "Error adding contact property."
-msgstr ""
+msgstr "Erro engadindo unha propiedade do contacto."
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "Erro engadindo directorio."
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Erro activando o directorio."
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Erro borrando propiedade do contacto."
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Erro actualizando a propiedade do contacto."
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Erro actualizando o directorio."
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Contactos"
 
 #: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Este non é o seu directorio"
 
 #: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "Non se atopou o contacto"
 
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
+"A información sobre a vCard é incorrecta. Por favor volte a cargar a páxina."
 
 #: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
-msgstr ""
+msgstr "Dirección"
 
 #: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
-msgstr ""
+msgstr "Teléfono"
 
 #: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
-msgstr ""
+msgstr "Correo electrónico"
 
 #: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
-msgstr ""
+msgstr "Organización"
 
 #: lib/app.php:106 lib/app.php:113
 msgid "Work"
-msgstr ""
+msgstr "Emprego"
 
 #: lib/app.php:107 lib/app.php:111
 msgid "Home"
-msgstr ""
+msgstr "Casa"
 
 #: lib/app.php:112
 msgid "Mobile"
-msgstr ""
+msgstr "Móbil"
 
 #: lib/app.php:114
 msgid "Text"
-msgstr ""
+msgstr "Texto"
 
 #: lib/app.php:115
 msgid "Voice"
-msgstr ""
+msgstr "Voz"
 
 #: lib/app.php:116
 msgid "Fax"
-msgstr ""
+msgstr "Fax"
 
 #: lib/app.php:117
 msgid "Video"
-msgstr ""
+msgstr "Vídeo"
 
 #: lib/app.php:118
 msgid "Pager"
-msgstr ""
+msgstr "Paxinador"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
 #: photo.php:40
 msgid "This is not your contact."
-msgstr ""
+msgstr "Este non é un dos seus contactos"
 
 #: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Esta tarxeta non é compatible con RFC"
 
 #: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Esta tarxeta non ten fotografía"
 
 #: templates/index.php:6
 msgid "Add Contact"
-msgstr ""
+msgstr "Engadir contacto"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "Directorios"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "Directorio"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #: templates/part.addcardform.php:57 templates/part.details.php:43
 #: templates/part.details.php:79 templates/part.setpropertyform.php:10
 #: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Escriba"
 
 #: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
-msgstr ""
+msgstr "Apartado de Correos"
 
 #: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
-msgstr ""
+msgstr "Extendido"
 
 #: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
-msgstr ""
+msgstr "Rúa"
 
 #: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
-msgstr ""
+msgstr "Cidade"
 
 #: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
-msgstr ""
+msgstr "Rexión"
 
 #: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
-msgstr ""
+msgstr "Código Postal"
 
 #: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #: templates/part.addcardform.php:109
 msgid "Create Contact"
-msgstr ""
+msgstr "Crear contacto"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Escolla os Directorios Activos"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "Novo Directorio"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "Ligazón CardDav"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "Baixar"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
-msgstr ""
+msgstr "Editar"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Delete"
-msgstr ""
+msgstr "Eliminar"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Descargar contacto"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
-msgstr ""
+msgstr "Borrar contacto"
 
 #: templates/part.details.php:34
 msgid "Add"
-msgstr ""
+msgstr "Engadir"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Novo Directorio"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Editar Directorio"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Mostrar nome"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Gardar"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Enviar"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #: templates/part.property.php:3
 msgid "Birthday"
-msgstr ""
+msgstr "Cumpleanos"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Preferido"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Teléfono"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
-msgstr ""
+msgstr "Actualizar"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "Dirección de sincronización CardDAV:"
 
 
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index aabdef11038..f2ae34598d4 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 05:42+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,152 +20,153 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Restablecemento do contrasinal de Owncloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Use a seguinte ligazón para restablecer o contrasinal: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
+"Recibirás unha ligazón por correo electrónico para restablecer o contrasinal"
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Requested"
-msgstr ""
+msgstr "Solicitado"
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Login failed!"
-msgstr ""
+msgstr "Fallou a conexión!"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
 #: templates/login.php:8
 msgid "Username"
-msgstr ""
+msgstr "Nome de usuario"
 
 #: lostpassword/templates/lostpassword.php:14
 msgid "Request reset"
-msgstr ""
+msgstr "Petición de restablecemento"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr ""
+msgstr "O contrasinal foi restablecido"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "A páxina de conexión"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr ""
+msgstr "Novo contrasinal"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr ""
+msgstr "Restablecer contrasinal"
 
 #: strings.php:5
 msgid "Personal"
-msgstr ""
+msgstr "Personal"
 
 #: strings.php:6
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #: strings.php:7
 msgid "Apps"
-msgstr ""
+msgstr "Aplicativos"
 
 #: strings.php:8
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: strings.php:9
 msgid "Help"
-msgstr ""
+msgstr "Axuda"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr ""
+msgstr "Nube non atopada"
 
 #: templates/installation.php:20
 msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "Crear unha <strong>contra de administrador</strong>"
 
 #: templates/installation.php:26 templates/login.php:12
 msgid "Password"
-msgstr ""
+msgstr "Contrasinal"
 
 #: templates/installation.php:32
 msgid "Advanced"
-msgstr ""
+msgstr "Avanzado"
 
 #: templates/installation.php:34
 msgid "Data folder"
-msgstr ""
+msgstr "Cartafol de datos"
 
 #: templates/installation.php:41
 msgid "Configure the database"
-msgstr ""
+msgstr "Configurar a base de datos"
 
 #: templates/installation.php:46 templates/installation.php:57
 #: templates/installation.php:67
 msgid "will be used"
-msgstr ""
+msgstr "será utilizado"
 
 #: templates/installation.php:79
 msgid "Database user"
-msgstr ""
+msgstr "Usuario da base de datos"
 
 #: templates/installation.php:83
 msgid "Database password"
-msgstr ""
+msgstr "Contrasinal da base de datos"
 
 #: templates/installation.php:87
 msgid "Database name"
-msgstr ""
+msgstr "Nome da base de datos"
 
 #: templates/installation.php:93
 msgid "Database host"
-msgstr ""
+msgstr "Servidor da base de datos"
 
 #: templates/installation.php:98
 msgid "Finish setup"
-msgstr ""
+msgstr "Rematar configuración"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "servizos web baixo o seu control"
 
 #: templates/layout.user.php:34
 msgid "Log out"
-msgstr ""
+msgstr "Desconectar"
 
 #: templates/layout.user.php:46 templates/layout.user.php:47
 msgid "Settings"
-msgstr ""
+msgstr "Preferencias"
 
 #: templates/login.php:5
 msgid "Lost your password?"
-msgstr ""
+msgstr "Perdéchelo contrasinal?"
 
 #: templates/login.php:15
 msgid "remember"
-msgstr ""
+msgstr "lembrar"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Conectar"
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr ""
+msgstr "Está desconectado"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
-msgstr ""
+msgstr "anterior"
 
 #: templates/part.pagenavi.php:20
 msgid "next"
-msgstr ""
+msgstr "seguinte"
 
 
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 164a7125e91..9b2c1ab8fb5 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 05:52+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,90 +20,94 @@ msgstr ""
 
 #: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Non hai erros, o ficheiro subeuse con éxito"
 
 #: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "O ficheiro subido supera a directiva upload_max_filesize no php.ini"
 
 #: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"O ficheiro subido supera a directiva MAX_FILE_SIZE que foi indicada no "
+"formulario HTML"
 
 #: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "O ficheiro subido foi só parcialmente subido"
 
 #: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Non se subeu ningún ficheiro"
 
 #: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Falta un cartafol temporal"
 
 #: appinfo/app.php:8
 msgid "Files"
-msgstr ""
+msgstr "Ficheiros"
 
 #: templates/admin.php:5
 msgid "Maximum upload size"
-msgstr ""
+msgstr "Tamaño máximo de subida"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "Ficheiro de texto"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Cartafol"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "Desde a rede"
 
 #: templates/index.php:22
 msgid "Upload"
-msgstr ""
+msgstr "Subir"
 
 #: templates/index.php:35
 msgid "Nothing in here. Upload something!"
-msgstr ""
+msgstr "Nada por aquí. Sube algo!"
 
 #: templates/index.php:43
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #: templates/index.php:45
 msgid "Download"
-msgstr ""
+msgstr "Baixar"
 
 #: templates/index.php:49
 msgid "Size"
-msgstr ""
+msgstr "Tamaño"
 
 #: templates/index.php:50
 msgid "Modified"
-msgstr ""
+msgstr "Modificado"
 
 #: templates/index.php:50
 msgid "Delete"
-msgstr ""
+msgstr "Eliminar"
 
 #: templates/index.php:58
 msgid "Upload too large"
-msgstr ""
+msgstr "Subida demasiado grande"
 
 #: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
+"Os ficheiros que tratas de subir superan o tamaño máximo permitido neste "
+"servidor"
 
 
diff --git a/l10n/gl/gallery.po b/l10n/gl/gallery.po
index ec369f59cb9..4c8e3d36824 100644
--- a/l10n/gl/gallery.po
+++ b/l10n/gl/gallery.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 05:44+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "Galería"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Voltar a analizar"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Atrás"
 
 
diff --git a/l10n/gl/media.po b/l10n/gl/media.po
index 66a58f40a80..dfd0987c76a 100644
--- a/l10n/gl/media.po
+++ b/l10n/gl/media.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 06:13+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,46 +20,46 @@ msgstr ""
 
 #: appinfo/app.php:32 templates/player.php:9
 msgid "Music"
-msgstr ""
+msgstr "Música"
 
 #: templates/music.php:3 templates/player.php:13
 msgid "Play"
-msgstr ""
+msgstr "Reproducir"
 
 #: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
-msgstr ""
+msgstr "Pausa"
 
 #: templates/music.php:5
 msgid "Previous"
-msgstr ""
+msgstr "Anterior"
 
 #: templates/music.php:6 templates/player.php:15
 msgid "Next"
-msgstr ""
+msgstr "Seguinte"
 
 #: templates/music.php:7
 msgid "Mute"
-msgstr ""
+msgstr "Silenciar"
 
 #: templates/music.php:8
 msgid "Unmute"
-msgstr ""
+msgstr "Restaurar volume"
 
 #: templates/music.php:25
 msgid "Rescan Collection"
-msgstr ""
+msgstr "Voltar a analizar a Colección"
 
 #: templates/music.php:37
 msgid "Artist"
-msgstr ""
+msgstr "Artista"
 
 #: templates/music.php:38
 msgid "Album"
-msgstr ""
+msgstr "Album"
 
 #: templates/music.php:39
 msgid "Title"
-msgstr ""
+msgstr "Título"
 
 
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 2cb16dd7c32..89e3031013f 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,134 +20,141 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "Correo electrónico mudado"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
-msgstr ""
+msgstr "Petición non correcta"
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
-msgstr ""
+msgstr "Mudou o OpenID"
 
 #: ajax/setlanguage.php:14
 msgid "Language changed"
+msgstr "O idioma mudou"
+
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
 msgstr ""
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Nivel de rexistro"
 
 #: templates/apps.php:8
 msgid "Add your application"
-msgstr ""
+msgstr "Engada o seu aplicativo"
 
 #: templates/apps.php:21
 msgid "Select an App"
-msgstr ""
+msgstr "Escolla un Aplicativo"
 
 #: templates/apps.php:23
 msgid "-licensed"
-msgstr ""
+msgstr "-autorizado"
 
 #: templates/apps.php:23
 msgid "by"
-msgstr ""
+msgstr "por"
 
 #: templates/help.php:8
 msgid "Ask a question"
-msgstr ""
+msgstr "Pregunte"
 
 #: templates/help.php:20
 msgid "Problems connecting to help database."
-msgstr ""
+msgstr "Problemas conectando coa base de datos de axuda"
 
 #: templates/help.php:21
 msgid "Go there manually."
-msgstr ""
+msgstr "Ir manualmente"
 
 #: templates/help.php:29
 msgid "Answer"
-msgstr ""
+msgstr "Resposta"
 
 #: templates/personal.php:8
 msgid "You use"
-msgstr ""
+msgstr "Vostede usa"
 
 #: templates/personal.php:8
 msgid "of the available"
-msgstr ""
+msgstr "dun total de"
 
 #: templates/personal.php:13
 msgid "Your password got changed"
-msgstr ""
+msgstr "O seu contrasinal mudou"
 
 #: templates/personal.php:14
 msgid "Unable to change your password"
-msgstr ""
+msgstr "Incapaz de trocar o seu contrasinal"
 
 #: templates/personal.php:15
 msgid "Current password"
-msgstr ""
+msgstr "Contrasinal actual"
 
 #: templates/personal.php:16
 msgid "New password"
-msgstr ""
+msgstr "Novo contrasinal"
 
 #: templates/personal.php:17
 msgid "show"
-msgstr ""
+msgstr "amosar"
 
 #: templates/personal.php:18
 msgid "Change password"
-msgstr ""
+msgstr "Mudar contrasinal"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "Correo electrónico"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "A súa dirección de correo electrónico"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
+"Escriba unha dirección de correo electrónico para habilitar a recuperación "
+"do contrasinal"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
-msgstr ""
+msgstr "Idioma"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Axude na tradución"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
+"utilice esta dirección para conectar o teu ownCloud no xestor de ficheiros"
 
 #: templates/users.php:15 templates/users.php:30
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #: templates/users.php:16 templates/users.php:31
 msgid "Password"
-msgstr ""
+msgstr "Contrasinal"
 
 #: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
-msgstr ""
+msgstr "Grupos"
 
 #: templates/users.php:23
 msgid "Create"
-msgstr ""
+msgstr "Crear"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Quota"
 
 #: templates/users.php:58
 msgid "Delete"
-msgstr ""
+msgstr "Borrar"
 
 
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 7941f186486..18942597800 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/team/he/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID השתנה"
 msgid "Language changed"
 msgstr "שפה השתנתה"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index c40085592cb..ddbabacd91e 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/team/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID promijenjen"
 msgid "Language changed"
 msgstr "Jezik promijenjen"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index d91ad225434..6ef3e534c2e 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/team/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID megváltozott"
 msgid "Language changed"
 msgstr "A nyelv megváltozott"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 7712776cd67..b2f41ef5227 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/team/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -33,6 +33,10 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index b05a2f18bb6..22d5293baea 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/team/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID cambiate"
 msgid "Language changed"
 msgstr "Linguage cambiate"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 19c8fb9ec9c..f27ff1d979a 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID telah dirubah"
 msgid "Language changed"
 msgstr "Bahasa telah diganti"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/it/calendar.po b/l10n/it/calendar.po
index cd96af7425d..8cd693ff57f 100644
--- a/l10n/it/calendar.po
+++ b/l10n/it/calendar.po
@@ -5,6 +5,7 @@
 # Translators:
 # Andrea Scarpino <andrea@archlinux.org>, 2011.
 #   <cosenal@gmail.com>, 2011.
+#   <formalist@email.it>, 2012.
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
 # Lorenzo Beltrami <lorenzo.beba@gmail.com>, 2011.
 #   <marco@carnazzo.it>, 2011, 2012.
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 17:18+0000\n"
+"Last-Translator: formalist <formalist@email.it>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -182,7 +183,7 @@ msgstr "Domenica"
 
 #: lib/object.php:396
 msgid "events week of month"
-msgstr ""
+msgstr "settimana del mese degli eventi"
 
 #: lib/object.php:397
 msgid "first"
@@ -258,19 +259,19 @@ msgstr "Dicembre"
 
 #: lib/object.php:441
 msgid "by events date"
-msgstr ""
+msgstr "per data evento"
 
 #: lib/object.php:442
 msgid "by yearday(s)"
-msgstr ""
+msgstr "per giorno/i dell'anno"
 
 #: lib/object.php:443
 msgid "by weeknumber(s)"
-msgstr ""
+msgstr "per numero/i settimana"
 
 #: lib/object.php:444
 msgid "by day and month"
-msgstr ""
+msgstr "per giorno e mese"
 
 #: lib/object.php:467
 msgid "Not an array"
@@ -346,79 +347,79 @@ msgstr "C'è stato un errore nel parsing del file."
 
 #: templates/lAfix.php:9
 msgid "Sun."
-msgstr ""
+msgstr "Dom."
 
 #: templates/lAfix.php:10
 msgid "Mon."
-msgstr ""
+msgstr "Lun."
 
 #: templates/lAfix.php:11
 msgid "Tue."
-msgstr ""
+msgstr "Mar."
 
 #: templates/lAfix.php:12
 msgid "Wed."
-msgstr ""
+msgstr "Mer."
 
 #: templates/lAfix.php:13
 msgid "Thu."
-msgstr ""
+msgstr "Gio."
 
 #: templates/lAfix.php:14
 msgid "Fri."
-msgstr ""
+msgstr "Ven."
 
 #: templates/lAfix.php:15
 msgid "Sat."
-msgstr ""
+msgstr "Sab."
 
 #: templates/lAfix.php:28
 msgid "Jan."
-msgstr ""
+msgstr "Gen."
 
 #: templates/lAfix.php:29
 msgid "Feb."
-msgstr ""
+msgstr "Feb."
 
 #: templates/lAfix.php:30
 msgid "Mar."
-msgstr ""
+msgstr "Mar."
 
 #: templates/lAfix.php:31
 msgid "Apr."
-msgstr ""
+msgstr "Apr."
 
 #: templates/lAfix.php:32
 msgid "May."
-msgstr ""
+msgstr "Mag."
 
 #: templates/lAfix.php:33
 msgid "Jun."
-msgstr ""
+msgstr "Giu."
 
 #: templates/lAfix.php:34
 msgid "Jul."
-msgstr ""
+msgstr "Lug."
 
 #: templates/lAfix.php:35
 msgid "Aug."
-msgstr ""
+msgstr "Ago."
 
 #: templates/lAfix.php:36
 msgid "Sep."
-msgstr ""
+msgstr "Set."
 
 #: templates/lAfix.php:37
 msgid "Oct."
-msgstr ""
+msgstr "Ott."
 
 #: templates/lAfix.php:38
 msgid "Nov."
-msgstr ""
+msgstr "Nov."
 
 #: templates/lAfix.php:39
 msgid "Dec."
-msgstr ""
+msgstr "Dic."
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
@@ -521,7 +522,7 @@ msgstr "Ripeti"
 
 #: templates/part.eventform.php:68
 msgid "Advanced"
-msgstr ""
+msgstr "Avanzato"
 
 #: templates/part.eventform.php:112
 msgid "Select weekdays"
@@ -533,11 +534,11 @@ msgstr "Seleziona i giorni"
 
 #: templates/part.eventform.php:130
 msgid "and the events day of year."
-msgstr ""
+msgstr "e il giorno dell'anno degli eventi"
 
 #: templates/part.eventform.php:143
 msgid "and the events day of month."
-msgstr ""
+msgstr "e il giorno del mese degli eventi"
 
 #: templates/part.eventform.php:151
 msgid "Select months"
@@ -549,7 +550,7 @@ msgstr "Seleziona le settimane"
 
 #: templates/part.eventform.php:169
 msgid "and the events week of year."
-msgstr ""
+msgstr "e la settimana dell'anno degli eventi"
 
 #: templates/part.eventform.php:175
 msgid "Interval"
@@ -561,7 +562,7 @@ msgstr "Fine"
 
 #: templates/part.eventform.php:193
 msgid "occurrences"
-msgstr ""
+msgstr "occorrenze"
 
 #: templates/part.eventform.php:208
 msgid "Location"
@@ -581,7 +582,7 @@ msgstr "Descrizione evento"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Importa un file calendario"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -589,11 +590,11 @@ msgstr "Per favore scegli il calendario"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "Crea un nuovo calendario"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Nome del nuovo calendario"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -601,15 +602,15 @@ msgstr "Importa"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Sto importando il calendario"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Calendario importato con successo"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Chiudi la finestra di dialogo"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index cee00f2bbdc..7eee067d6eb 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <formalist@email.it>, 2012.
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
 #   <marco@carnazzo.it>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 17:11+0000\n"
+"Last-Translator: formalist <formalist@email.it>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,47 +22,47 @@ msgstr ""
 
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "Errore nel (dis)attivare la rubrica"
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "Si è verificato un errore nell'aggiunta del contatto."
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "Impossibile aggiungere una proprietà vuota."
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "Deve essere riempito almeno un indirizzo ."
 
 #: ajax/addproperty.php:77
 msgid "Error adding contact property."
-msgstr ""
+msgstr "Errore durante l'aggiunta della proprietà del contatto."
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "Errore nell'aggiunta della rubrica."
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Errore nell'attivazione della rubrica."
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Errore nella cancellazione della proprietà del contatto."
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Errore nell'aggiornamento della proprietà del contatto."
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Errore nell'aggiornamento della rubrica."
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Contatti"
 
 #: lib/app.php:42
 msgid "This is not your addressbook."
@@ -128,7 +129,7 @@ msgstr "Cercapersone"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Contatto"
 
 #: photo.php:40
 msgid "This is not your contact."
@@ -148,11 +149,11 @@ msgstr "Aggiungi contatto"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "Rubriche"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "Rubrica"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -230,7 +231,7 @@ msgstr "Cancella"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Scarica contatto"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
@@ -242,11 +243,11 @@ msgstr "Aggiungi"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Nuova Rubrica"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Modifica Rubrica"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -286,6 +287,6 @@ msgstr "Aggiorna"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "Indirizzo di sincronizzazione CarDAV:"
 
 
diff --git a/l10n/it/core.po b/l10n/it/core.po
index addabc52510..1546b2da31c 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -4,16 +4,16 @@
 # 
 # Translators:
 #   <cosenal@gmail.com>, 2011.
-# Francesco Apruzzese <cescoap@gmail.com>, 2011.
+# Francesco Apruzzese <cescoap@gmail.com>, 2011, 2012.
 #   <marco@carnazzo.it>, 2011, 2012.
 #   <rb.colombo@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-12 20:51+0000\n"
-"Last-Translator: ufic <marco@carnazzo.it>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 08:55+0000\n"
+"Last-Translator: Francesco Apruzzese <cescoap@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,7 +56,7 @@ msgstr "La password è stata reimpostata"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr "Alla pagina di ingresso"
+msgstr "Alla pagina di login"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -133,15 +133,15 @@ msgstr "Host del database"
 
 #: templates/installation.php:98
 msgid "Finish setup"
-msgstr "Termina"
+msgstr "Termina Configurazione"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr "Servizi web nelle tue mani"
+msgstr "servizi web nelle tue mani"
 
 #: templates/layout.user.php:34
 msgid "Log out"
-msgstr "Log out"
+msgstr "Esci"
 
 #: templates/layout.user.php:46 templates/layout.user.php:47
 msgid "Settings"
@@ -149,7 +149,7 @@ msgstr "Impostazioni"
 
 #: templates/login.php:5
 msgid "Lost your password?"
-msgstr "Password persa?"
+msgstr "Hai perso la password?"
 
 #: templates/login.php:15
 msgid "remember"
diff --git a/l10n/it/gallery.po b/l10n/it/gallery.po
index 4dffa1257dc..1e65c8e50ed 100644
--- a/l10n/it/gallery.po
+++ b/l10n/it/gallery.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <formalist@email.it>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 17:13+0000\n"
+"Last-Translator: formalist <formalist@email.it>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "Galleria"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Rileggi"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Indietro"
 
 
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 6f2cf988163..f4bcbf38d4e 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -3,7 +3,9 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <formalist@email.it>, 2012.
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
+#   <icewind1991@gmail.com>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 #   <marco@carnazzo.it>, 2011, 2012.
 #   <rb.colombo@gmail.com>, 2011.
@@ -11,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-12 20:56+0000\n"
-"Last-Translator: ufic <marco@carnazzo.it>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,6 +39,10 @@ msgstr "OpenID Modificato"
 msgid "Language changed"
 msgstr "Lingua modificata"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Livello di log"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 24ad0f09c5d..6b3cde7791c 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -33,6 +33,10 @@ msgstr "OpenID�変更�れ���"
 msgid "Language changed"
 msgstr "言語�変更�れ���"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index ae3884d073b..98eb2381dd2 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/team/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID huet geännert"
 msgid "Language changed"
 msgstr "Sprooch huet geännert"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index ec0f1bd45cb..066f574751c 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/team/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID pakeistas"
 msgid "Language changed"
 msgstr "Kalba pakeista"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index d8166d0823a..4d30c8454be 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/team/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID ditukar"
 msgid "Language changed"
 msgstr "Bahasa ditukar"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 70ffa14920e..e0b31f5828b 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/team/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID endret"
 msgid "Language changed"
 msgstr "Språk endret"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index eacedbd0379..a52b7a06484 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-12 18:13+0000\n"
-"Last-Translator: Pietje8501 <pietje8501@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,6 +37,10 @@ msgstr "OpenID is aangepast"
 msgid "Language changed"
 msgstr "Taal aangepast"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Logniveau"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 7e87bd41237..ea0de894d5a 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/team/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID endra"
 msgid "Language changed"
 msgstr "Språk endra"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 1fa60a77fd9..22ec18316b8 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-11 13:11+0000\n"
-"Last-Translator: Marcin Małecki <gerber@tkdami.net>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,6 +37,10 @@ msgstr "Zmieniono OpenID"
 msgid "Language changed"
 msgstr "Język zmieniony"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Poziom logowania"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index ab2a8825dd0..047d0f21e5e 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -35,6 +35,10 @@ msgstr "Mudou OpenID"
 msgid "Language changed"
 msgstr "Mudou Idioma"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 5b55ea33a78..e9a2cc34a36 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/team/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -33,6 +33,10 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index b6151572e85..8e54463bb00 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-12 13:22+0000\n"
-"Last-Translator: Claudiu <claudiu@tanaselia.ro>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,6 +34,10 @@ msgstr "OpenID schimbat"
 msgid "Language changed"
 msgstr "Limba a fost schimbată"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Nivel log-uri"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 54ecbef38e2..802e2953a87 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID был изменён"
 msgid "Language changed"
 msgstr "Язык изменён"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 51034c15311..c71317d6089 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <intense.feel@gmail.com>, 2011.
+#   <intense.feel@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 15:49+0000\n"
+"Last-Translator: intense <intense.feel@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Obnova Owncloud hesla"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -53,7 +53,7 @@ msgstr "Vaše heslo bolo obnovené"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Na prihlasovaciu stránku"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -134,7 +134,7 @@ msgstr "Dokon�iť inštaláciu"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "webové služby pod vašou kontrolou"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -154,7 +154,7 @@ msgstr "zapamätať"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Prihlásiť sa"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/sk_SK/gallery.po b/l10n/sk_SK/gallery.po
index ec1dd850cd0..25fdcd74040 100644
--- a/l10n/sk_SK/gallery.po
+++ b/l10n/sk_SK/gallery.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <intense.feel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 15:07+0000\n"
+"Last-Translator: intense <intense.feel@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "Galéria"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Znovu oskenovať"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Späť"
 
 
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 17dd38a23ba..358e67ce2f2 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <intense.feel@gmail.com>, 2011.
+#   <intense.feel@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "email Zmenený"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -34,9 +34,13 @@ msgstr "OpenID zmenené"
 msgid "Language changed"
 msgstr "Jazyk zmenený"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Úroveň záznamov"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -104,15 +108,15 @@ msgstr "Zmeniť heslo"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Vaša emailová adresa"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Vyplňte emailovú adresu pre aktivovanie obnovy hesla"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -120,7 +124,7 @@ msgstr "Jazyk"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Pomôcť s prekladom"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -144,7 +148,7 @@ msgstr "Vytvoriť"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Kvóta"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 13af55c4a9a..011b0cbd9ff 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/team/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID spremenjen"
 msgid "Language changed"
 msgstr "Jezik je bil spremenjen"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 5ea7d2b6d3f..e0ba581a210 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Slobodan Terzić <githzerai06@gmail.com>, 2011.
+# Slobodan Terzić <githzerai06@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 01:59+0000\n"
+"Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +60,7 @@ msgstr ""
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Контакти"
 
 #: lib/app.php:42
 msgid "This is not your addressbook."
@@ -127,7 +127,7 @@ msgstr "Пејџер"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Контакт"
 
 #: photo.php:40
 msgid "This is not your contact."
@@ -147,11 +147,11 @@ msgstr "Додај контакт"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "�дре�ар"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "�дре�ар"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -161,7 +161,7 @@ msgstr "Име"
 #: templates/part.details.php:79 templates/part.setpropertyform.php:10
 #: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 
 #: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
@@ -204,11 +204,11 @@ msgstr "�аправи контакт"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Изаберите активне адре�аре"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "�ови адре�ар"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
@@ -217,7 +217,7 @@ msgstr ""
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "Преузимање"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -229,43 +229,43 @@ msgstr "Обриши"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Преузми контакт"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
-msgstr ""
+msgstr "Обриши контакт"
 
 #: templates/part.details.php:34
 msgid "Add"
-msgstr ""
+msgstr "Додај"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "�ови адре�ар"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Уреди адре�ар"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Приказано име"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "�ктиван"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Сними"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Пошаљи"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Откажи"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -273,7 +273,7 @@ msgstr "Рођендан"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Пожељан"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -281,7 +281,7 @@ msgstr "Телефон"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
-msgstr ""
+msgstr "�журирај"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 9bf02eedf6e..fa3a4996d57 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Slobodan Terzić <githzerai06@gmail.com>, 2011.
+# Slobodan Terzić <githzerai06@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 02:01+0000\n"
+"Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Ре�етовање лозинке за Оунклауд"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Овом везом ре�етујте �воју лозинку: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -53,7 +53,7 @@ msgstr "Ваша лозинка је ре�етована"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "�а �траницу за пријаву"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -134,7 +134,7 @@ msgstr "Заврши подешавање"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "веб �ерви�и под контролом"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -154,7 +154,7 @@ msgstr "упамти"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Пријава"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 9dc152c94aa..807dfc57678 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Slobodan Terzić <githzerai06@gmail.com>, 2011.
+# Slobodan Terzić <githzerai06@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 02:03+0000\n"
+"Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,19 +56,19 @@ msgstr "Мак�имална величина пошиљке"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "�ови"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "тек�туални фајл"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "фа�цикла"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "�а веба"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/sr/gallery.po b/l10n/sr/gallery.po
index 01a1cbaae8c..b30e34c7237 100644
--- a/l10n/sr/gallery.po
+++ b/l10n/sr/gallery.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Slobodan Terzić <githzerai06@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 01:56+0000\n"
+"Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "Галерија"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Претражи поново"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "�азад"
 
 
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index dd68b115b43..123642508b3 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Slobodan Terzić <githzerai06@gmail.com>, 2011.
+# Slobodan Terzić <githzerai06@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID је измењен"
 msgid "Language changed"
 msgstr "Језик је измењен"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
@@ -104,11 +108,11 @@ msgstr "Измени лозинку"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "Е-пошта"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Ваша адре�а е-поште"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
@@ -120,7 +124,7 @@ msgstr "Језик"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr " Помозите у превођењу"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index d70e5ea94a6..439bcd298a7 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/team/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID je izmenjen"
 msgid "Language changed"
 msgstr "Jezik je izmenjen"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 95b886d8c72..f123e1a317d 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -35,6 +35,10 @@ msgstr "OpenID ändrat"
 msgid "Language changed"
 msgstr "Språk ändrades"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 2ccfc8c0f92..aeb0607e4a9 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index f2d99d896d9..3a63204b84c 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 16f328aea2a..61eafa21548 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index d5f6e43db87..097e5749953 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 255295569da..3f50792c81b 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index e1a750f3b6e..9693dc4eee9 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 0142d2a8378..8c896ec83e7 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,6 +33,10 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 58aefca15f5..8763b746c4d 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/team/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID DeÄŸiÅŸtirildi"
 msgid "Language changed"
 msgstr "Dil deÄŸiÅŸtirildi"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/zh_CN/gallery.po b/l10n/zh_CN/gallery.po
index e3e2d897cd0..d791cd35906 100644
--- a/l10n/zh_CN/gallery.po
+++ b/l10n/zh_CN/gallery.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Bartek  <bart.p.pl@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 21:45+0000\n"
+"Last-Translator: Bartek <bart.p.pl@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "画廊"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "�新扫�"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "返回"
 
 
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 7a6daf187ec..126f0973d0e 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID 已修改"
 msgid "Language changed"
 msgstr "语言已修改"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
new file mode 100644
index 00000000000..43fbc22085b
--- /dev/null
+++ b/settings/l10n/gl.php
@@ -0,0 +1,35 @@
+<?php $TRANSLATIONS = array(
+"email Changed" => "Correo electrónico mudado",
+"Invalid request" => "Petición non correcta",
+"OpenID Changed" => "Mudou o OpenID",
+"Language changed" => "O idioma mudou",
+"Log level" => "Nivel de rexistro",
+"Add your application" => "Engada o seu aplicativo",
+"Select an App" => "Escolla un Aplicativo",
+"-licensed" => "-autorizado",
+"by" => "por",
+"Ask a question" => "Pregunte",
+"Problems connecting to help database." => "Problemas conectando coa base de datos de axuda",
+"Go there manually." => "Ir manualmente",
+"Answer" => "Resposta",
+"You use" => "Vostede usa",
+"of the available" => "dun total de",
+"Your password got changed" => "O seu contrasinal mudou",
+"Unable to change your password" => "Incapaz de trocar o seu contrasinal",
+"Current password" => "Contrasinal actual",
+"New password" => "Novo contrasinal",
+"show" => "amosar",
+"Change password" => "Mudar contrasinal",
+"Email" => "Correo electrónico",
+"Your email address" => "A súa dirección de correo electrónico",
+"Fill in an email address to enable password recovery" => "Escriba unha dirección de correo electrónico para habilitar a recuperación do contrasinal",
+"Language" => "Idioma",
+"Help translate" => "Axude na tradución",
+"use this address to connect to your ownCloud in your file manager" => "utilice esta dirección para conectar o teu ownCloud no xestor de ficheiros",
+"Name" => "Nome",
+"Password" => "Contrasinal",
+"Groups" => "Grupos",
+"Create" => "Crear",
+"Quota" => "Quota",
+"Delete" => "Borrar"
+);
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 08424ab24c8..502247d34f8 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "email Zmenený",
 "Invalid request" => "Neplatná požiadavka",
 "OpenID Changed" => "OpenID zmenené",
 "Language changed" => "Jazyk zmenený",
+"Log level" => "Úroveň záznamov",
 "Add your application" => "Pridajte svoju aplikáciu",
 "Select an App" => "Vyberte Aplikáciu",
 "-licensed" => "-licencované",
@@ -18,11 +20,16 @@
 "New password" => "Nové heslo",
 "show" => "zobraziť",
 "Change password" => "Zmeniť heslo",
+"Email" => "Email",
+"Your email address" => "Vaša emailová adresa",
+"Fill in an email address to enable password recovery" => "Vyplňte emailovú adresu pre aktivovanie obnovy hesla",
 "Language" => "Jazyk",
+"Help translate" => "Pomôcť s prekladom",
 "use this address to connect to your ownCloud in your file manager" => "použite túto adresu pre spojenie s vaším ownCloud v správcovi súborov",
 "Name" => "Meno",
 "Password" => "Heslo",
 "Groups" => "Skupiny",
 "Create" => "Vytvoriť",
+"Quota" => "Kvóta",
 "Delete" => "Odstrániť"
 );
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index ea61815a619..6612b314c67 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -18,7 +18,10 @@
 "New password" => "�ова лозинка",
 "show" => "прикажи",
 "Change password" => "Измени лозинку",
+"Email" => "Е-пошта",
+"Your email address" => "Ваша адре�а е-поште",
 "Language" => "Језик",
+"Help translate" => " Помозите у превођењу",
 "use this address to connect to your ownCloud in your file manager" => "кори�тите ову адре�у да би �е повезали на ownCloud путем менаџњера фајлова",
 "Name" => "Име",
 "Password" => "Лозинка",
-- 
GitLab


From 941f199caf99c75c322c0d4892b2e2a5d45f384d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Jan 2012 20:17:45 +0100
Subject: [PATCH 302/546] dont complain about non existing config files

---
 lib/util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util.php b/lib/util.php
index 20197d65b00..09513d32328 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -226,7 +226,7 @@ class OC_Util {
 			$errors[]=array('error'=>'PHP module ctype is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
 		}
 
-		if(!is_writeable(OC::$SERVERROOT."/config/config.php")){
+		if(file_exists(OC::$SERVERROOT."/config/config.php") and !is_writeable(OC::$SERVERROOT."/config/config.php")){
 			$errors[]=array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver use write access to the config directory in owncloud");
 		}
 
-- 
GitLab


From 21794377260d483141f4bd5a9bb90b49ee83486b Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 16 Jan 2012 20:22:54 +0100
Subject: [PATCH 303/546] use timepicker to force users to use HH:MM

---
 3rdparty/timepicker/GPL-LICENSE.txt           |  278 ++++
 3rdparty/timepicker/MIT-LICENSE.txt           |   20 +
 .../ui-bg_diagonals-thick_18_b81900_40x40.png |  Bin 0 -> 260 bytes
 .../ui-bg_diagonals-thick_20_666666_40x40.png |  Bin 0 -> 251 bytes
 .../images/ui-bg_flat_10_000000_40x100.png    |  Bin 0 -> 178 bytes
 .../images/ui-bg_glass_100_f6f6f6_1x400.png   |  Bin 0 -> 104 bytes
 .../images/ui-bg_glass_100_fdf5ce_1x400.png   |  Bin 0 -> 125 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png    |  Bin 0 -> 105 bytes
 .../ui-bg_gloss-wave_35_f6a828_500x100.png    |  Bin 0 -> 3762 bytes
 .../ui-bg_highlight-soft_100_eeeeee_1x100.png |  Bin 0 -> 90 bytes
 .../ui-bg_highlight-soft_75_ffe45c_1x100.png  |  Bin 0 -> 129 bytes
 .../images/ui-icons_222222_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_228ef1_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_ef8c08_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_ffd27a_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_ffffff_256x240.png        |  Bin 0 -> 4369 bytes
 .../css/include/jquery-1.5.1.min.js           |   16 +
 .../css/include/jquery-ui-1.8.14.custom.css   |  568 +++++++
 .../css/include/jquery.ui.core.min.js         |   17 +
 .../css/include/jquery.ui.position.min.js     |   16 +
 .../css/include/jquery.ui.tabs.min.js         |   35 +
 .../css/include/jquery.ui.widget.min.js       |   15 +
 .../ui-bg_diagonals-thick_18_b81900_40x40.png |  Bin 0 -> 260 bytes
 .../ui-bg_diagonals-thick_20_666666_40x40.png |  Bin 0 -> 251 bytes
 .../images/ui-bg_flat_10_000000_40x100.png    |  Bin 0 -> 178 bytes
 .../images/ui-bg_glass_100_f6f6f6_1x400.png   |  Bin 0 -> 104 bytes
 .../images/ui-bg_glass_100_fdf5ce_1x400.png   |  Bin 0 -> 125 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png    |  Bin 0 -> 105 bytes
 .../ui-bg_gloss-wave_35_f6a828_500x100.png    |  Bin 0 -> 3762 bytes
 .../ui-bg_highlight-soft_100_eeeeee_1x100.png |  Bin 0 -> 90 bytes
 .../ui-bg_highlight-soft_75_ffe45c_1x100.png  |  Bin 0 -> 129 bytes
 .../images/ui-icons_222222_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_228ef1_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_ef8c08_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_ffd27a_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_ffffff_256x240.png        |  Bin 0 -> 4369 bytes
 .../timepicker/css/jquery.ui.timepicker.css   |   69 +
 3rdparty/timepicker/js/i18n/i18n.html         |   73 +
 .../js/i18n/jquery.ui.timepicker-de.js        |    9 +
 .../js/i18n/jquery.ui.timepicker-fr.js        |   13 +
 .../js/i18n/jquery.ui.timepicker-ja.js        |    9 +
 .../timepicker/js/jquery.ui.timepicker.js     | 1345 +++++++++++++++++
 3rdparty/timepicker/releases.txt              |  105 ++
 apps/calendar/index.php                       |    2 +
 apps/calendar/js/calendar.js                  |    6 +
 45 files changed, 2596 insertions(+)
 create mode 100644 3rdparty/timepicker/GPL-LICENSE.txt
 create mode 100644 3rdparty/timepicker/MIT-LICENSE.txt
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_20_666666_40x40.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_flat_10_000000_40x100.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_glass_100_f6f6f6_1x400.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_glass_100_fdf5ce_1x400.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_glass_65_ffffff_1x400.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_gloss-wave_35_f6a828_500x100.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-icons_222222_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-icons_228ef1_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-icons_ef8c08_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-icons_ffd27a_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-icons_ffffff_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/jquery-1.5.1.min.js
 create mode 100644 3rdparty/timepicker/css/include/jquery-ui-1.8.14.custom.css
 create mode 100644 3rdparty/timepicker/css/include/jquery.ui.core.min.js
 create mode 100644 3rdparty/timepicker/css/include/jquery.ui.position.min.js
 create mode 100644 3rdparty/timepicker/css/include/jquery.ui.tabs.min.js
 create mode 100644 3rdparty/timepicker/css/include/jquery.ui.widget.min.js
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_222222_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_228ef1_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ef8c08_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffd27a_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffffff_256x240.png
 create mode 100644 3rdparty/timepicker/css/jquery.ui.timepicker.css
 create mode 100644 3rdparty/timepicker/js/i18n/i18n.html
 create mode 100644 3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js
 create mode 100644 3rdparty/timepicker/js/i18n/jquery.ui.timepicker-fr.js
 create mode 100644 3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js
 create mode 100644 3rdparty/timepicker/js/jquery.ui.timepicker.js
 create mode 100644 3rdparty/timepicker/releases.txt

diff --git a/3rdparty/timepicker/GPL-LICENSE.txt b/3rdparty/timepicker/GPL-LICENSE.txt
new file mode 100644
index 00000000000..932f11115fe
--- /dev/null
+++ b/3rdparty/timepicker/GPL-LICENSE.txt
@@ -0,0 +1,278 @@
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+        the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+        this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+    distribute and/or modify the software.
+
+    Also, for each author's protection and ours, we want to make certain
+    that everyone understands that there is no warranty for this free
+    software.  If the software is modified by someone else and passed on, we
+    want its recipients to know that what they have is not the original, so
+    that any problems introduced by others will not reflect on the original
+    authors' reputations.
+
+    Finally, any free program is threatened constantly by software
+    patents.  We wish to avoid the danger that redistributors of a free
+    program will individually obtain patent licenses, in effect making the
+    program proprietary.  To prevent this, we have made it clear that any
+    patent must be licensed for everyone's free use or not licensed at all.
+
+    The precise terms and conditions for copying, distribution and
+    modification follow.
+
+    GNU GENERAL PUBLIC LICENSE
+    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+    0. This License applies to any program or other work which contains
+    a notice placed by the copyright holder saying it may be distributed
+    under the terms of this General Public License.  The "Program", below,
+    refers to any such program or work, and a "work based on the Program"
+    means either the Program or any derivative work under copyright law:
+    that is to say, a work containing the Program or a portion of it,
+    either verbatim or with modifications and/or translated into another
+    language.  (Hereinafter, translation is included without limitation in
+            the term "modification".)  Each licensee is addressed as "you".
+
+    Activities other than copying, distribution and modification are not
+    covered by this License; they are outside its scope.  The act of
+    running the Program is not restricted, and the output from the Program
+    is covered only if its contents constitute a work based on the
+    Program (independent of having been made by running the Program).
+    Whether that is true depends on what the Program does.
+
+    1. You may copy and distribute verbatim copies of the Program's
+    source code as you receive it, in any medium, provided that you
+    conspicuously and appropriately publish on each copy an appropriate
+    copyright notice and disclaimer of warranty; keep intact all the
+    notices that refer to this License and to the absence of any warranty;
+    and give any other recipients of the Program a copy of this License
+    along with the Program.
+
+    You may charge a fee for the physical act of transferring a copy, and
+    you may at your option offer warranty protection in exchange for a fee.
+
+    2. You may modify your copy or copies of the Program or any portion
+    of it, thus forming a work based on the Program, and copy and
+    distribute such modifications or work under the terms of Section 1
+    above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+            a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+            does not normally print such an announcement, your work based on
+            the Program is not required to print an announcement.)
+
+    These requirements apply to the modified work as a whole.  If
+    identifiable sections of that work are not derived from the Program,
+    and can be reasonably considered independent and separate works in
+    themselves, then this License, and its terms, do not apply to those
+    sections when you distribute them as separate works.  But when you
+    distribute the same sections as part of a whole which is a work based
+    on the Program, the distribution of the whole must be on the terms of
+    this License, whose permissions for other licensees extend to the
+    entire whole, and thus to each and every part regardless of who wrote it.
+
+    Thus, it is not the intent of this section to claim rights or contest
+    your rights to work written entirely by you; rather, the intent is to
+    exercise the right to control the distribution of derivative or
+    collective works based on the Program.
+
+    In addition, mere aggregation of another work not based on the Program
+    with the Program (or with a work based on the Program) on a volume of
+    a storage or distribution medium does not bring the other work under
+    the scope of this License.
+
+    3. You may copy and distribute the Program (or a work based on it,
+            under Section 2) in object code or executable form under the terms of
+    Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+            allowed only for noncommercial distribution and only if you
+            received the program in object code or executable form with such
+            an offer, in accord with Subsection b above.)
+
+    The source code for a work means the preferred form of the work for
+    making modifications to it.  For an executable work, complete source
+    code means all the source code for all modules it contains, plus any
+    associated interface definition files, plus the scripts used to
+    control compilation and installation of the executable.  However, as a
+    special exception, the source code distributed need not include
+    anything that is normally distributed (in either source or binary
+            form) with the major components (compiler, kernel, and so on) of the
+    operating system on which the executable runs, unless that component
+    itself accompanies the executable.
+
+    If distribution of executable or object code is made by offering
+    access to copy from a designated place, then offering equivalent
+    access to copy the source code from the same place counts as
+    distribution of the source code, even though third parties are not
+    compelled to copy the source along with the object code.
+
+    4. You may not copy, modify, sublicense, or distribute the Program
+    except as expressly provided under this License.  Any attempt
+    otherwise to copy, modify, sublicense or distribute the Program is
+    void, and will automatically terminate your rights under this License.
+    However, parties who have received copies, or rights, from you under
+    this License will not have their licenses terminated so long as such
+    parties remain in full compliance.
+
+    5. You are not required to accept this License, since you have not
+    signed it.  However, nothing else grants you permission to modify or
+    distribute the Program or its derivative works.  These actions are
+    prohibited by law if you do not accept this License.  Therefore, by
+    modifying or distributing the Program (or any work based on the
+            Program), you indicate your acceptance of this License to do so, and
+    all its terms and conditions for copying, distributing or modifying
+    the Program or works based on it.
+
+    6. Each time you redistribute the Program (or any work based on the
+            Program), the recipient automatically receives a license from the
+    original licensor to copy, distribute or modify the Program subject to
+    these terms and conditions.  You may not impose any further
+    restrictions on the recipients' exercise of the rights granted herein.
+    You are not responsible for enforcing compliance by third parties to
+    this License.
+
+    7. If, as a consequence of a court judgment or allegation of patent
+    infringement or for any other reason (not limited to patent issues),
+    conditions are imposed on you (whether by court order, agreement or
+            otherwise) that contradict the conditions of this License, they do not
+    excuse you from the conditions of this License.  If you cannot
+    distribute so as to satisfy simultaneously your obligations under this
+    License and any other pertinent obligations, then as a consequence you
+    may not distribute the Program at all.  For example, if a patent
+    license would not permit royalty-free redistribution of the Program by
+    all those who receive copies directly or indirectly through you, then
+    the only way you could satisfy both it and this License would be to
+    refrain entirely from distribution of the Program.
+
+    If any portion of this section is held invalid or unenforceable under
+    any particular circumstance, the balance of the section is intended to
+    apply and the section as a whole is intended to apply in other
+    circumstances.
+
+    It is not the purpose of this section to induce you to infringe any
+    patents or other property right claims or to contest validity of any
+    such claims; this section has the sole purpose of protecting the
+    integrity of the free software distribution system, which is
+    implemented by public license practices.  Many people have made
+    generous contributions to the wide range of software distributed
+    through that system in reliance on consistent application of that
+    system; it is up to the author/donor to decide if he or she is willing
+    to distribute software through any other system and a licensee cannot
+    impose that choice.
+
+    This section is intended to make thoroughly clear what is believed to
+    be a consequence of the rest of this License.
+
+    8. If the distribution and/or use of the Program is restricted in
+    certain countries either by patents or by copyrighted interfaces, the
+    original copyright holder who places the Program under this License
+    may add an explicit geographical distribution limitation excluding
+    those countries, so that distribution is permitted only in or among
+    countries not thus excluded.  In such case, this License incorporates
+    the limitation as if written in the body of this License.
+
+    9. The Free Software Foundation may publish revised and/or new versions
+    of the General Public License from time to time.  Such new versions will
+    be similar in spirit to the present version, but may differ in detail to
+    address new problems or concerns.
+
+    Each version is given a distinguishing version number.  If the Program
+    specifies a version number of this License which applies to it and "any
+    later version", you have the option of following the terms and conditions
+    either of that version or of any later version published by the Free
+    Software Foundation.  If the Program does not specify a version number of
+    this License, you may choose any version ever published by the Free Software
+    Foundation.
+
+    10. If you wish to incorporate parts of the Program into other free
+    programs whose distribution conditions are different, write to the author
+    to ask for permission.  For software which is copyrighted by the Free
+    Software Foundation, write to the Free Software Foundation; we sometimes
+    make exceptions for this.  Our decision will be guided by the two goals
+    of preserving the free status of all derivatives of our free software and
+    of promoting the sharing and reuse of software generally.
+
+    NO WARRANTY
+
+    11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+    FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+    PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+    OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+    TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+    PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+    REPAIR OR CORRECTION.
+
+    12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+    WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+    REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+    INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+    OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+            TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+            YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+            PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGES.""''''''
diff --git a/3rdparty/timepicker/MIT-LICENSE.txt b/3rdparty/timepicker/MIT-LICENSE.txt
new file mode 100644
index 00000000000..532704636b7
--- /dev/null
+++ b/3rdparty/timepicker/MIT-LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2011 John Resig, http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_18_b81900_40x40.png
new file mode 100644
index 0000000000000000000000000000000000000000..954e22dbd99e8c6dd7091335599abf2d10bf8003
GIT binary patch
literal 260
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEr#)R9Ln2z=UU%d=WFXS=@V?HT
z#xG*`>Yvsgk=}99w^d^D^d*@m74oMo<%#FcopJf?u00-~YVKV2wzrI*_R6;UORMea
zBFVSEnN~eiVA6V&z`E)YLz5Aok^D)In}Yn=OzDpgR5Wv0XfT8pOkmV{sKAJ-PO9#T
zZK}IXj&Q-V!U)!LcB_3K<j6=ku*!%uXjy#leKdQ?`ZvP&RiaPVOzxQ$`O)`M(6sLS
yN%J;Y?DO0<r7?ff#!c6LsA*2U`f2*?C%gsKpMo6zvorv`#o+1c=d#Wzp$Py>0&C*{

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_20_666666_40x40.png b/3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_20_666666_40x40.png
new file mode 100644
index 0000000000000000000000000000000000000000..64ece5707d91a6edf9fad4bfcce0c4dbcafcf58d
GIT binary patch
literal 251
zcmV<X00jSuP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70002ONkl<ZScUD^
zT?&IR7(~(AY#^)6!n1<<Vj)fQYm^M-n@5r1C}@~h2;ohZ7-N3vC*J$+J$LlEJIhL0
z?fU|%;UEDj;@||T;sBg74hkR1O4$<++XU{$LE{Z7;GhCj!9fA2go6yIhJysCh=UWT
ziUV-UI2ia*&y+p!utUI|$6*(^`>bvPcjKS|RKP(6sDcCAB(_QB%0978a<$Ah$!b|E
zwn;|HO0i8cQ<lay$(1s&O|n)t8rvkbvR?jjlN@>j@~)s!ajF0S002ovPDHLkV1oEp
BYH0uf

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_flat_10_000000_40x100.png b/3rdparty/timepicker/css/include/images/ui-bg_flat_10_000000_40x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..abdc01082bf3534eafecc5819d28c9574d44ea89
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FsY*{5$B>N1x91EQ4=4yQY-ImG
zFPf9b{J;c_6SHRK%WcbN_hZpM=(Ry;4Rxv2@@2Y=$K57eF$X$=!PC{xWt~$(69B)$
BI)4BF

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_glass_100_f6f6f6_1x400.png b/3rdparty/timepicker/css/include/images/ui-bg_glass_100_f6f6f6_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b383f4d2eab09c0f2a739d6b232c32934bc620b
GIT binary patch
literal 104
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnour1U*q978O6-yYw{%b*}|_(02F
z@qbE9)0CJMo;*v*PWv`Vh2h6EmG8IS-Cm{3U~`<YvxSSFU3)<QP%DF{tDnm{r-UW|
Dvd<uf

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_glass_100_fdf5ce_1x400.png b/3rdparty/timepicker/css/include/images/ui-bg_glass_100_fdf5ce_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..a23baad25b1d1ff36e17361eab24271f2e9b7326
GIT binary patch
literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouq+C2*978O6lYjjF{IFh)jg74>
zFlmZ}YMcJY=eo?o%*@I?2`NblNeMudl#t?<YIry`QK*OGr~otD9plAEGz`5G6d9zp
Wa55e{GUW=;JO)o!KbLh*2~7a@&m@!p

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_glass_65_ffffff_1x400.png b/3rdparty/timepicker/css/include/images/ui-bg_glass_65_ffffff_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..42ccba269b6e91bef12ad0fa18be651b5ef0ee68
GIT binary patch
literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouqzpV=978O6-=0?FV^9z|eBtf=
z|7WztIJ;WT>{+tN>ySr~=F{k$>;_x^_y?afmf9pRKH0)6?eSP?3s5hEr>mdKI;Vst
E0O<Z9>;M1&

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/3rdparty/timepicker/css/include/images/ui-bg_gloss-wave_35_f6a828_500x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..39d5824d6af5456f1e89fc7847ea3599ea5fd815
GIT binary patch
literal 3762
zcmb_eYgiKKwx-=Q?P<E4nMM;$eWu2m#PU%`&Ae^LOv^6gctJ3vM8!lUG!aCxQ#0eJ
zq?xIqDJi9<fFp>di0+w!yaC|_1uvA>yaxz|iX3eB<LqajpXblFzRUBi^{w~$)_UKp
zpDz0D*=4#5008Vc>v#HR0ASmSVIKMS&kf`CSAV4g0DJLgPkRO79xj%J<(hH6`bTGj
zrr^$JeiHJI?;s&<5pRw-^kj}=E;X0OX+pgz+f5GVt0NQv_gbu0>-8J+F$O>HpW?Lx
z+YFO`CV&6VV9fsEwG#js0_-|v*!ujZ*M=jfo457?0Do-z<^}+8bI+qk+W~+$zz%Z&
z;L7&@&ns`l8Ofh*Wd<Cp_>U0pO%RP^?Xa_h7I}7K#}4Xt`s%-(m-enaPWX<H>$O&-
zX~a1aOzn?!r?5wJVBNPJ_o8-(9Fz<_c1LYGxUl(E+Wdx?wkNHH2T%eWq9Kz00h#RB
zYKI~=a<9_QqC^n<>hyWlS66waWgyAP#t&TfTWP=Sxa)ukRY%j7WH}(@r=B^W_;b&M
zRzPYsb*j^Kou%%`K6VP+dKtR@x~qEHq4rXMxoX-gcSf&->lMY%TMXF!Gw_A)(tp6}
z2A%kN3twbr%KyUrrmw24V3d%wzK<-q(M;MTr41}un`P!!xejADEv_CJ{CTif907B&
zEP`pDJIZHVgnmxh$EZnBOUxz~Ap+ZzKbFmg39_n-)$wY!Q@i~5aGmHbN7&*gk<HNQ
z!$-sS))5(#?qPW$1C^3#;cFvQMWTd)d(I_4awE^ZjGC%XcnSGez>q9zWgV|2(Zhxl
zoDqJp&MxW(qX#C@oF8L)*r$RdSjVFSc$%z?*9%YoZ6sOZ!vtxXtBM<*r82<p7}?1@
zveQI&tiNm{;57jipQbO}b?9l*l4nGAT4Y=-w()@*#J1?%2{)nY^{|NO=xM)s?jR6<
ziJ!fSOOPs*$8->vyC}_Eiz1PJ2L$bttko`=+fH{Ne@G#lMDxkKt_y)O(J5&Ak)w-I
znm!vzYX3$kLDG$hOp-KJg~7}M;73BFWA{!a61fe?NJkjR_}Xw+*`O0=AGg7&dU<kQ
zA;d%-zM*iwS2t8Y)Gu@JK&A)fV=HHvbW`6mV+EZrtJSauApMCndBS~F>A`A?9`whW
zM{fkFf`G`P^9j*|-q9KLvS<191z9a^mK3Lss}W8O=sZ}N$V4Fh*SWF5NbZQ>p{0>$
z0pe}d$*s!y<I6P@1-n$GE>*R&NSXbjmld6{4Y;O89MuDTK0Hn0C?QdL9z1qGegXs!
z7$MIGkPkwdHF2os-Z-e85B?5An>yc|m<}>!Iirg%H-<NQ%ws0uIi51-a5phDmp{k5
zD(zjPC;t}@{w)+0&{l~FS*>%F11XY{{>@kgL>a#6fM9JzBE&an&F>eWh|b0^kJ<?n
zs=7WyuX=fIhvAjTTX`c}HUH)bTTI;OJGlyB{(NK&G;Htmn6^?c?TaAsOV}uBUtAa>
zNBM5*nCa~(xwn~rG~<cfPp*ub4V(WF)lGbJpS(|MvAA83yV}}9bfbt(>>GSG9mz3h
z9F~64y}giIrz^lfl|_5HpUsG}?Wpr*&f?bS=|9biqivN)-a~u>uK<{Lfcng{663QL
zLXzO@*N5)q4C=j6E8nC+P%lEwI#~0wkt;M4Y8!+DYzN2rBuYao1*HRIa^NC9nFeep
z+ns5$X9Bh48S-`ss!k&!J#Ddd=j1O-9}?`v(B|<M1@-U18t+Js;ZNHIk3$u$U;Eyu
z3exyGipUQbO;S|Bzp(hX{&!NB@oq*gb}e^)68}5#!kH$BhK<@5!ubu^XDa&d1C#@|
z3yY}&(~QVLCVdv){)I_ECxKsIlmW8LZ!;=rtk4ZaX!xm*=*Z(|P+Uqf*Rg<I!Tau&
z85{4>>R7wD97BV;nK~quUHx^mj^G6K2GZ1*uSN?iLm!7vHB7_1^TGbKhmnK+K`GYA
zocp2=on8LxJH^`7^1ch0ft(MTU$vJB!R@gQ^R`qoX>(=iY#u++3K>oqSpG={?#YVw
zp3m99FXk^~<6#X9X1oKYXEH%8t2btG65(u0zF-J)^>8dj0Evc+9_Bd^Y)k9AfW~FV
z%iDV(ClS6)TC7eVzh{ml;p4cx8)$TV&qhRWp+dqiw>i32?1;5d>HLrNj=^OdJ<}L)
zWxqw8aFI<~_TkMDQHS?`z+KQ?+{ASoy%}RBu6i9?BXbh%OEx1OuZ}?n(VjrT(!B1;
zQ!#WA0NBx=^6rJrFVsDCuT4)OTG<Ikaz*O8tFTZ)QL^`qbYu)jq*kTD>zZ3$Z4Yqz
z&c9+7%g!%zxtv#p2fhHbo98KBwfE<e9Z<Yr%uRWj-5Hd3hTYY<&ve`je8y8RV)knu
zYCT0K`*JrRv<nx%jAf>&Y(&2#=}qEEU`ECEjlCp=X^_tIoMx>%kBT5k)^c=zyV5w3
zc>DLKY6%=y0igWi9B@4hB}bR6K|+jYBt+}i6Ld|b`*s62c6Ge?zGYvdW)=p90~$Ad
zxGB>c<3Dy~hPJ#vNXierOl41xBn_0L<5NhK6JO-LvtS&Z{xjGKfIC6*9%*?tv*?+!
zv;Q{?mHN2b|3DEJO}R9w11ZT5QVC(H0u|0n9cVK_@2r%C<)OnZ(3aS0Ux^6G$ja*<
z9R~o~9XjhPL)w@vYi6r;H$tR>wW`0-Z&Qed`X0LZY9-~mfso!@dt?5Q;@|K6$mAB&
z$J41&y)<{N;QATPeU}BC{lM_<D4HZA)B)i-;gJ1pwusq$h>@-LlQ2hjX;}6~qdglT
zGm%qJm*F^in=w*?j;@C_P<fNuR>CMnXK5Fd^wXV**pZOdS1KbSJsC~s#R;tmXIMb`
zHB>sx<rNDl@4+*>Qg&E5Yf@}d#~Z9D4R{}ZpLm7S=bY0x#k<=H?=R+=W$=Bm2aU*n
z)qgD*0#4>GGlHhQ`bx#k=Njc;+9D@{F5`xI^tMkBf{XIzwB=b9KbuuLF7jMTR~Mwt
zN#!)9J4&^V@JRe9Y!b2!;$rCLPWZfG`C;Qz`u~TJdCzv->e`=R8uHX_2{Fp&pWJ*h
z#A60&bY(j(^P@t_`_pktBV7{tFVoeNWlNA|zgNr&DMjJ_!k2%2s2~F@la$M6k%hWi
z7}}hoDuoaN7?lchVk@4DunpEIS$72&uuF&F;&4uhC$L)6IzHHUryR9emzpxwsRXmj
zfc}pI#oRCB7Y1;t=*58Gsv7x3PGuW^spn6V&dWf#?*TQ0(|*rr=EeE1o~y1<q=XbB
zH7M1n6!fSD?pm#tnQqCt>wyQi%)e*oX6iX@$m0F1R<jp2X5!4xYkF7J+;bthC|!^_
zfGt{`v`5@+vH^moN%0^eXsq^fv|D%^4d2~y%?^q=-Nv+wR>tKUT0vgg!8^fWhYLqS
zF@EOpFld7>f^kprb~YwMq=^<<pan6S!*H@g7t}eQJLhuWeLGTkT2P+Ck3!Te1lk%)
zt9TCz)oC3>e|gw?QFyf8ck|ZC^>)3c`b$^C>jCB4Fne_1e$Cqt=4Ud#K~~8Nfa91W
zwk17&D?X?4FRzR+5qCiIqPf0};K4$tW$}l~A?u_E=JSe;*f_DO>r{z=U4_<)dY)M!
z7O#mizC+GN&#;)k)vkBU<tXnqP_^|-tGmZcT8Dlxt6Pn?`uypBX@1fVrNePVd#ALp
zF4$80+@AG;7xl5W_sE^yNYES$<C6}`Zb1&JCZx~nYEbc%r#1d%Mn0pgS$5QlwG(ot
z!Za{>S@fZesb{v?YuFlCPRjsT5bxB4@+sqdq}xvvBhTngZ(N1LUCS-ei=5sgE-Tbc
z7HK+A_O23MP@sUoc?I?*ZB|F)&%us|2<oRU<$~ApQ%f%RU*aE`VmGrB<J4ieMCirV
zP_~OQ;txr2WBgPQtAbapRV&BoULc}?@}z*gAAJEFNo(?(iOCZhqe)W78eZ*UvaN@7
zhKKGvt0!}(rjB;qc0K^%h|5n7(;vc+uHx|Dg@=F~<I;s3VT_=D#he%5p2SoOly<_w
z*HKrz@ej3W?Y+xd+RJZ;9WZCGEGI{ETYg8h6;=d~Oi`<7@VfdE&iUPi>O$#G7V$6z
zq>G%6!cu7OEf+_#^A=23Hd6Db9-yK*NQ#<PGnv3oz%Gl*Ib##q`dB%MvY>S+kjJI7
zhLiLz{>zKKtHH>H;B-cALzj`>@+-~?X2aP7ypf9WMf8q0m)wS!Nkf+&R&&zEjFOUx
zlq^>v#VAq}=)?dKRMe+010g9O;qAiaTA4dV+==mw%i3Re)DwZ$Wd5CK1m4Ivy&&Ef
zO8W!SpcgA>zfTGAE!{IPJMhdZ`T4{K#7ndDT8K2&*jf=J8O>H*iDJ}ZK}z|$C3U62
z$nZhk4v$QIYzMaV+0`B8S!=9RSYzi*QG#tp>ZY|lY_`}A-zI7)(tV$B9G-tC#zt8m
z<!M@MT<43;wMNmuo-kSmPm5UQboY7uH(`#(7slpt#=BnL_;t>re~pD7oIFkmIAM=s
zw+Iili%nSC?yks)t~q4lTlZW(#5^yUV@+^KvIuQzZDO^*TBz!<CtQh2rfO<z=TS{H
zzIH*$V56H0{EnCR^XrG!ZG7AjD4r}Q(t2l9(P&QU6M<44;NxCby12gE#~t-zco3A+
rQq8KZ5e*fKEaO{0Ke0s~Qmy6Xh5m%FO!wV}CE%>j#nX%*uiW|{x9q0w

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1273672d253263b7564e9e21d69d7d9d0b337d9
GIT binary patch
literal 90
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l%l7LV~E7m<R2d&AFo$qV`FPm
oboulDzr6KyA+fs7hb{~ZQx+&qVC9&67pR!Q)78&qol`;+0H8b=ng9R*

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..359397acffdd84bd102f0e8a951c9d744f278db5
GIT binary patch
literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l!vE_V~E7mtNjN#8yp0f)nD%C
z{k^&2ZZH4W#qke67#j$%IepV*`yn{#P|600IVRJjChwXe(ssyZ>xPQ=F85a&M@g_{
d|GeK{$Y5lo%PMu^>wln`44$rjF6*2UngE4^EGqy2

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-icons_222222_256x240.png b/3rdparty/timepicker/css/include/images/ui-icons_222222_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..b273ff111d219c9b9a8b96d57683d0075fb7871a
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{;aID?ElVL?Rdohw{Ucz9r_YL7=D6<&8F>PmYTG^FX}c%
zl<zAi(m>GE{DS1Q;~I7<vD)$Yj(fd>-6ze&TN@+F-xsI6sd%SwK#*O5K|pDRZqEy<
zJg0Nd8F@!OxqElm`~U#piM22@u@8B<<ecI*S<egUH7}csd8!)jLBD2s`p(8v&--KE
z71^q9MglFywkSt_5FCr2F%o&UR(5j7-O>moyKE%ct`B(jysxK+1m?G)UyIFs1t0}L
zemGR&?jGaM1YQblj?v&@0iXS#fi-VbR9zLEnHLP?xQ|=%Ihrc7^yPWR!tW$yH!zrw
z#I2}_!JnT^(qk)VgJr`NGdPtT^dmQIZc%=6nTAyJDXk+^3}wUOilJuwq>s=T_!9V)
zr1)DT6VQ2~rgd@!Jlrte3}}m~j}juCS`J4(d-5+e-3@EzzTJNCE2z)w(kJ90z*QE)
zBtnV@4mM>jTrZZ*$01SnGov0&=A-JrX5Ge%Pce1Vj}=5YQqBD^W@n4KmFxxpFK`uH
zP;(xKV+6VJ2|g+?_Lct7`uElL<&jzGS8Gfva2+=8A@#V+xsAj9|Dkg)vL5yhX@~B=
zN2KZSAUD%QH`x>H+@Ou(D1~Pyv#0nc&$!1kI?IO01yw3jD0@80qvc?T*Nr8?-%rC8
z@5$|WY?Hqp`ixmEkzeJTz_`_<!oE0dsO`po1=$i_1k<Um_}caMZcrpqA*x-}Rw(fX
z3Qyh8;-4^Fe)UICI@ayzmyV?48GbR;1*s>wsSRi1%Zivd`#+T{Aib6-rf$}M8sz6v
zb6ERbr-SniO2wbOv!M4)nb}6UVzoVZEh5kQWh_5x4rYy3<sHrHJLqL+DcLT5`t$L@
z5_J8#H;PWO1GW@oId1Y>c!871NeaM(_p=4(kbS6U#x<*k8Wg^KHs2ttCz<+pBxQ$Z
zQMv;kVm5_fF_vH`Mzrq$Y&6u?j6~f<juy`C^I0O`4mfXK0lrRY*VoeJX&k$9aL;Hl
zlp63sf~-1z_419)A8^j|LeQSmK&T8R7nA=Ki3^H;YaeL&hF6>tIV0Yg)Nw7JysIN_
z-_n*K_v1c&D}-1{NbBwS2h#m1y0a5RiEcYil+58$8IDh49bPnzE7R8In6P%V{2IZU
z7#clr=V4<zT-gP2u}DD>yyrRe@oXNqbqo^^LvlLE?%8XaI&N(Np90-psU}7kqmbWk
zZ;YBwJNnNs<m6GqjV2(cCX2e+#tSOgIGm~J&Djknhy!e`&p)NTq>$~d!mx9oMGyT(
znaBoj0d}gpQ^aRr?6nW)$4god*`@Uh2e+YpS@0(Mw{|z|6ko3NbTvDiCu3YO+)egL
z>uW(^ahKFj>iJ-JF!^KhKQyPTznJa;xyHYwxJgr16&Wid_9)-%*mEwo{B_|M9t@S1
zf@T@q?b2Qgl!~_(Roe;fdK)y|XG0;ls;ZbT)w-aOVttk#daQcY7$cpY496H*`m@+L
zeP#$&yRbBjFWv}B)|5-1v=(66M_;V1SWv6MHnO}}1=vby&9l+gaP?|pXwp0AFDe#L
z&MRJ^*qX6wgxhA_`*o=LGZ>G_NTX%AKHPz4bO^R72ZYK}ale3lffDgM8H!Wrw{B7A
z{?c_|dh2J*y<H{`M3l!HEtOc{;H{lJx}(C|*lvPQ+RAcV`>8b04c37OmqUw;#;G<*
z@nz@dV`;7&^$)e!B}cd5tl<nF(??uM#|`*5pIKe!DEUl5-&9M=s_3Yn@-P(czyPQ~
zTU3I3bk%z<*w;9V(oQvt^2H`kBAW;=2oA<L1<qVIK(Z{Hk@5&E&_2mS+|}+?g@FBu
zK+e=OWg<)e?RO;llNw00>0{g(Q>5_7H^@bEJi7;fQ4B$NGZerH#Ae1#8WDTH`iB&)
zC6Et3BYY#mcJxh&)b2C^{aLq~psFN)Q1SucCaBaBUr%5PYX{~-q{KGEh)*;n;?75k
z=hq%i^I}rd;z-#YyI`8-OfMpWz5kgJE3<X7ptj0dmPk5UrEf%nVD%<Giiw4wVh!K0
zFjy-VAnpOFJIDm=jqqahP0Wam<9qv4UMIazx8J<YJz>I!3ean6=UZi!BxG7i(YBk?
z02HM7wS0)Wni{dWbQMRtd-A)_Az!t>F;IwWf~!*)-Az4}yryNkz&9)w>ElA80Oc`6
zHo#9H!Y3*Qx9n@Jn)!w6G^hb;e_n8zpIyXCN`JFkPc)^Q?2MsLNFhMgrcZI-<#1ne
zjH;KFf?4eAT9<t<iUSC5BsF-<$q+H@@j%Yk>mQZ}ZfHLGA#d%s;SZK4p0FwZT2S^{
zQ2BG1xJsbK6?yrHTjJi|5C0u=!|r!?*4FL%y%3q#(d+e>b_2I9!*iI!30}42Ia0bq
zUf`Z?LGSEvtz8s``Tg5o_CP(FbR0X$FlE0yCnB7su<mcL>DPmI2=yOg^*2#cY9o`X
z;NY-3VBHZjnVcGS){GZ98{e+l<X|f4%S*+x526SE1mJ%6M<Nt*!}czEQf{?H1U0br
z^Y7cXNxH@=Ve^#j3H@BPU>q~O$u6pEcgd0CrnIsWffN1MbCZDH<7c^hv+Z0Ucf0{w
zSzi^qKuUHD9Dgp0EAGg@@$zr32dQx>N=ws`MESEsmzgT2&L;?MSTo&ky&!-JR3g~1
zPGTt515X)wr+Bx(G9lWd;@Y3^Vl}50Wb&6-Tiy;HPS0drF`rC}qYq22K4)G#AoD0X
zYw$E+Bz@Zr^50MAwu@$?%f9$r4WHH?*2|67&FXFhXBrVFGmg)6?h3^-1?t;UzH0*I
zNVf9wQLNLnG2@q>6CGm>&y|lC`iCFfYd}9i%+xkl^5oBJ?<;aneCfcHqJh7Yl5uLS
z9Fx-(kMdcNyZejXh22N{mCw_rX1O!cOE&3>e(ZH81PR95wQC37En4O{w;{3q9n1<A
zPC{;HRD3#A!@Lk)+k!~onQ0|-U%#uGd$&L?ZhNC&R)V(mb`NhUqrYysoMQ;Z)sq!y
zW_WwV!+jO*nGT8-Hx_JVmFK^=>t&;p)D%&Z%Nw$gSPa!nz8Slh7=ko2am)XARwOWw
zpsz0~K!s{(dM$NB=(A=kkp>T(*yU6<_dwIx>cH4+LWl282hXa6-EUq>R3t?G2623<
z*RwTN%-fgBmD{fu*ejNn)1@KG?Sg<bw3hQ~jCP9_dLp#J9Fi#nX3wGv<cLwQ;8x0`
zA<%pA%E0S;<5FJhw8e#?n&IA5g19Fv!v7YC%Gxqd<x1=+hht1t>*8z3hYtkQJQjB6
zQ|x>wA=o$=O)+nLmgTXW3<g>_6diA;b4EY{*i<HxX2Q~PA|R-tJ=V1~4KO3h7H~CG
ztNFL#J=a@4Q5K7Ogvj-+3N_IJUjc}x34}a7@bDE3!)Kj4s7ME<v)`yP${V~G_J@6l
zp{&i)CGxx1)X`lnwc}#g;g<(rA1#7Ez8@J}tuMD3bB{Wifbe~LWT0zYNjgb_qn|+G
z2TCDZw1rV|wPx@~-H8<4^MGxfR0aLq+_k+{JT<mckxWLsw*J%G%YH0>*R%6dO2EMg
z@6g?M3rpbnfB@hOdUeb9<OD{Zt&T^7p>6=~I?OIA3@BWAGmTwiQ{x5Cqq<8c10L!P
zd@Qk^BseTX%$Q7^s}5n%HB|)gKx}H$d8Sb$bBnq9-AglT2dGR2(+I;_fL|R4p$odJ
zllfb0NqI)7=^z~qAm1V{(PkpxXsQ#4*NH9yYZ`Vf@)?#ueGgtCmGGY|9U#v|hRdg-
zQ%0#cGIfXCd{Y)JB~qykO;KPvHu|5Ck&(Hn%DF~cct@}j+87xhs2ew;fLm5#2+mb|
z8{9e*YI(u|gt|{x1G+U=DA3y)9s2w7@cvQ($ZJIA)x$e~5_3L<r=v~@?aZ+642@!3
z&nTpp8p^rR@IEsq`uhzfD&i>KFV~ASci8W}jF&VeJoPDUy(BB>ExJpck;%;!`0AAo
zAcHgcnT8%OX&UW_n|%{2B|<6Wp2MMGvd5`T2KKv;ltt_~H+w00x6+SlAD`{K4!9zx
z*1?EpQ%Lwiik){3n{-+YNrT;fH_niD_Ng9|58@m8RsKFVF!6pk@qxa{BH-&8tsim0
zdAQ(GyC^9ane7_KW*#^vMIoeQdpJqmPp%%px3GIftbwESu#+vPyI*YTuJ6+4`z{s?
zpkv~0x4c_PFH`-tqafw5)>4AuQ78SkZ!$8}INLK;Egr;2tS18hEO5=t;QDmZ-qu?I
zG+=DN`nR72Xto{{bJp||`k}-2G;5#xg8E~xgz22)^_Z;=K|4@(E&5J)SY2of=olcw
z5)@L)_Ntcm!*5nEy0M9v0`S33;pO4T<mv%0Rx6?c2H~TA%zOO^T2$@D<Cut3{ae}|
zAT@Uzc>N;>4(Z+<j5j2DQ*r;U|6a;YfP1jST$I3mSn3aNn!?<=B-XkzG?hQH;@bu%
zmFYDDgbC%Wt{6LBrs%88L}deF9pse}dmIp4lmp@Tir9q)JKESa=h>19p_0>u#e-vE
zXCU(6gAvu~I7Cw(xd%0e59MNLw^U37ZDbsBrj%eDCexw8a3G`nTcXVNL6{B7Hj@i&
zbVB{;ApEtHk76q08DJ48dSxd$C(;$K6=FpU<~l9pVoT9arW^Vu{%Bcn4`eIpkOVC|
z$)AKYG_`ypM{0@BUb3^9lqi_c?ONH|4UJMJWDowMVjacycX7}9g={O7swOB+{;+?;
zjBo!9?+nd)ie#x5IbFW-zBOo0c4q@9wGVt5;pNt`=-~Zgcw#*`m($6ibxtZ`H=e=}
zF#GZ~5$%AUn};8U#tRem0J(JTR}<qii}wxmUzVwVIg2$uE2;GN{hhT&GE1i;_fi(_
z9KKXP)ds1Q)XnUhr?uXO-HbKE%5f%+-C>d4vR(dgK2ML~lZsPhayJ2h1%sD4FVst|
zKF)+@`iNzLRjg4=K8@**0=5cE>%?FDc({I^+g9USk<8$&^qD~@%W0i4b|yMG*p4`N
zh}I!ltTRI8Ex$+@V{02Br%xq#O?UlhO{r8WsaZnZCZq0MK9%AXU%MDLT;3=0A9(BV
z9VxxxJd7jo$hw3q;3o?yBLmA=azBUrd9>-<_ANs0n3?-Ic*6&ytb@H~?0E(*d>T5n
z-HiH2jsDf6uWhID%#n>SzOqrFCPDfUcu5QPd?<(=w6pv1BE#nsxS{n!UnC9qAha1<
z;3cpZ9A-e$+Y)%b;w@!!YRA9p%Kf9IHGGg^{+p`mh;q8i7}&e@V3EQaMsItEMS&=X
plT@$;k0WcB_jb;cn%_Idz4HO$QU*abf4}+wi?e96N>fbq{{i|W0@(ln

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-icons_228ef1_256x240.png b/3rdparty/timepicker/css/include/images/ui-icons_228ef1_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..a641a371afa0fbb08ba599dc7ddf14b9bfc3c84f
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{;X{3=KszyL1xbWEgT(ahrR?5hM!<zvuS&nr6z6fi@J>w
z<@?HsG!Qg3zaV+-xQ3ldtad!U<6iGz_enGH*2akP_r)o1D&8p^5M)<i5Kvm7+w+1d
z&*|KAM&6N6?%o|XKL7xDVlB)}>_c8IIj6Wy*7HJo&CBLuo~nj>(63pZzO(Vv^ZuB3
zMYigjkwA;FEy|G}1jpiMj6|NTm7Uyiw=@FDE*nX<>jR!W@9XIyf%$Fd*J5*D0Z0Lm
z9}ZQxyT|x5ftNy?V>EbJz-K>bV9gs9RaXUP<^=;e?&Fqxj;6{ieR-a-@H<J_4GiWZ
zaVu(K@aJcf^w<j8VA*iR3{E8n{m4z5Ta=$%rXkgQO6v#}L)oynVyGEE=_51-z65?H
zDgGA81aw}gX`NgF4>ycA1KMKhql8GOmcx<Hp8QKqcf*>wZ?_-(3hMK^^a*(gaFvBH
ziIC!fgH4$W*NbKIaY&T?%&13``KbD@S-0`xQ%v3TV+B!;RC7O!+1a9QCA$H@3tR;k
z)SSoR7(s4)f{zM}eWgFN{(ZH5d1O}l)f$ruT!)Q&NImXyZsTzOf9TwctcSfr+M)aJ
z5otO+$jvm-P4)ykH)x|cO5xeb>?!`qGw$(>&axqLL6yoB${vsMXgL_-bz@2J_tS92
zdvZG-+vKl@K4Vr(<X8D7Fm5%eurE#<YP<1YLAHb!!E~xCzIMI68x%=Yh-w$L6-vB;
z!c#Z2_$LgPU;Po3j&(cwr6cKhhF=VILF!3vYQvfMvLYtV{!ir!NUtS|shjnm2Kl+v
z9M*o<>EL{WQt@Z+Ea-hxX0}nTSZxnpi^#Kn8Ox8FgIS|hc}KJQ4tm*HO16ui{(O9}
z1YN)GjiQt6fGq`Cj+^`zUf?8hk^(T{{cOQGWFP98am}is28A!5%{R#ENv8fCN!j69
zl<vTXm`x#Aj3pR~5$!tw8x6HJBT;veqlI((e3l5f1J0XQfUi^9^|f?)8pp02+%sAX
zr3QSEAghjFy?kTy2b}Y~5VYqs5GsSo#pFLl;)0^z+6P*`;T5Mu&WLv=bzI9Q@9K!#
zx3ne5{kTux3L#b!(t3OTfpmY0?(76nqT7xWC3Cn`hU1f1hZjxb%CxmPCafJTzecbo
zhDHzEdDz$vS9U>MEK(2z?|BY=Je$XD9mB-Kkem*(d-j^9j$2#6r$Dz?s)-TCDCGCs
z8>6Pvj{Y+YIeFA@qY22V$)awy@q!9A4rgk5b9TcC;s9Ig^G|6nDP+5=Fzg&?(L=vc
zCbGd>fSu~@6!94td+o#d@sid<c4_^>!EI<?7QBi6t=$bf#g{8RUCj>X$rx7*cawe6
z`dScJ+$HssdOjE)O#Ybs56vm-FQ$7yuJJD^Zqk%hMaIgAJ<2yb_MFQte_i;62ScT$
zpjifYyR_E=rQ+>H)pmlr-Udzg*-!|ssw(D7wJvC+Sf8bb9;;q8#z?0p!!bsd{wy|5
zpBaMHE-Ve>i#LLjHRaMLtp%9&(HCng7Sw96jVv!#0k%?F^K7&=T)mnYn)D9(i;4x5
z^NJTJwq~pv;kH@#ejTd*48~(J(r6j34|m`h9fEDj0im)~+%I5XphWymhT;_Zty|Q&
zzjPg#-ufAHZ<omf5#{klOC=UKcxxw*?x^rKwwoZ7wz3@8eku)ggLNRn<<KIdajH#H
zeA)T=Seh$G{X;Ew$<Zx1YdFKl^buFmaRdI%XI9raN<LH2H`S7|Dmv<?JPd_9FaRph
z7M0*0UG<&|_BGC;v{TKZe6h)s$R@%If`c(mfiu?)kSq&lq&xx(v`_L7ceQ&}Az*(Z
zkTW$+naI+A`yGk?qy`dg`WSb{6e&FN4RX;O&+frr6hjc+3<Yokv6*p`M#SE){vkzc
z3FL#%2;YdX9eq<GwL48ff7Y!gs4B@Hlzc$A2`aV3*Atk++JX5HDY4Bk;uB4Yxbu<X
z`L&1ByqMIqI8t`UE|_LH(~F2;?|){*%50r1sI9V=C6bO-=^K$CSiOmlVqzhvSi?6g
z4AzPTh<iZl4l)6IBfJ=W6EkAt_}>1M*Gccw?Kf|8Pnhtb0`!{N`Bqsa37J+>wC$!e
z00k+2Egzz;rbcWoUB%Jvp8W1}$XD%e3>4y;;OZ1ccT-O#uW6Ys@C}Pa`nZrNKzR(2
z4e%3)@QI4SE&E!lW`5y14QhbepBG%_XBV-O(%<aX6HVzRJ7ee*QV3AB=~LWyIoy{V
zqv~a)U>5tj)@9#|;sC-MNev!zGDHk}JdpGC`iJF#8=8-P$Xoku_=Dw%Cv3{U7L>gf
zRQ?<$t`cZ*MP5GQmbmx#!+*!zu>0MewRO9GFGS{b^m_fJ-N0?j@EqoFf>$khj+E|@
z7r3We&^tR^YZrxKe*d<YJy4G(9mh^GOxZ8bi3n#Ytos{m`t{%)Lj8wW{Y{jV+Q_6T
zI5_MMSa-xsCZ~p-HRDCj#<#0BIhacN@>22agXqCO0l44&kqCv{u)T|(lv`~PK@DvE
z{QI_TlCH5z*gR!>LO)k67{^R+vWx24U2^2ODXpwT;6y+6+$5m)_*w4WY&#do9dCeE
z)>p+Ykdhq($DhmMiaYXey!@N%L26uz($aJ!QT{B^Wu}U$^9e#5)=c+XF9@Ill?ZmM
zlNgHiz*9!vDc&uxOo;ZVxb`Q!Sk0*gnfxWzmbZh4(=%CD%qP?0=);n$&zaW_$UKV9
z8axdcN#AyZ{P)wj?V{P}vM)YY!>6@}^>U+iv$`9>nMTCPjN>z%yF&3yf%>+T@0vh4
zlC8Xa6zeo?%=o3}M8{aebLHcO{^1Ar8qiM=Gquf?Jo)q5`-+?sUpg?QXyEUpWSm+n
z$K-UyqkI<R?*3wTVfWE~<@2<uS?-MVl1;jzAA8*iL4xsi?b?BNi<UXgZAh$t2eX2O
zlaSjP6`u~(FfWAHwjdICW?Bi|*YB$4-Yt-e+urDxm7s0C-NReT=&xHY=NLk9^<)K_
z8Qvc8a9@Rcrh{U|jRjj-<@xXJdfDhCHAU3q@`fxV7DF|YZ^rH=h9J#M-17gO6$#8E
z=<ACLP@x){UQ68&`mEVXq`?Cxb~%;JJ<xQvIxsey(BZq&!Lur1_nVgz6$w$lK^&jz
z^=yq5^Y*23<@W0Z_KKzDbZLlkyC5J9t>wHLquru~o(OF)hhz$Y*|X>ZIbswnxRvr~
z2=rdOGVuD|xRlpAZE<0!X1F(%Anpl^@V^D3vbM}qxe|NI;TTiZy7(IM;R69RkA>a&
z6gwYE2sREzQ_LHmWqB+ogMk(fMaSFeoDq-!HkFB_nXt5+2ncFuk9BQL1I&oB1zZi)
zYW{6_&-Ip1l*OVRA##1ILQS;5R{-K^0wGTiJbVSi@LA^$D$;@J>^G{6@&+%4{b3(s
zC~LEHiTv(0b#zxt?YJ0r_~pUZM~mQ(??(n#>&tD%+@nq=Abj5*8R!~Ul1`G~=qFJ4
zfl|m8ZDCYgtr`4LcOpgiJYX9qRY5;DcWti~PmS$VB$E-Zt^f4)vLDOe_3XTq5^ylW
zJ9PKm!V-8sAOJXnUfuFNIf0R9tK-pNs2hO04zr620}5B(Ok>yB)Of-3sP59qfQNbm
zA4{w!2@cB;GbR(~szVrbO%(w=5S!X`o@o@x++wbN_tMPT0V<QhG{UeJ;8({%=z{L*
zWd0UgQl1fNI!H$Y$hXK#w3!Gvn(74Nb)t*FnucAAe1;`Z--B03CHyB#2gq}g;qs~I
zlu;^<Ox+<j-;_m5iBxJsQxuqvjs7QOWMpota<0)9-Vv;XHb%w=>c)*I;Fgsbf^*g0
z2Di?HTApwKq3+YwfNsqd3iP%{hyK1iyuVZc@*0tO_3+N0#GFsz>8MjeJ2UJ%L!%hi
zGYYAthH`E+ywA*u{(eJ=ia3h*%k?779rk-K<0VZAPkl;TFUbmei|$fqWO8!_zIvqt
z$ly$VrlH46nnpX~X5Yk0iBJl;=WuA4>~X4-f&K0yWf42h&0b30t@NYX$7egQ1Fp!a
zbui-D6cWCWV&|R1CY@G8(qOmWjWeX3eX7UggZPGimA}soOuQdXe4uZ#2>5zN>qlI0
z9xk}lE=tNpX1m6*nFr2EQ3xs79!^sCldDJYE$m(qYv3q7>}1R7?iZW7>$~*%zKaC|
z=$N?ME$>#+%T&MZC`dW1wUl6Z)JgyCn~V%K&i0H|iwE%$>xsZW3tTfZxIUe<xAj&4
z4Hz4+{_ST0nym-LoHhM~e(110&D!U_p#In^VLIn{J!Y#z&<>Pci@p;cRu|d=ItIwF
z1clVHy{hH?@SD|(Zfqi^0DQ1hczHN7xq85h)rzQqLHMX2^IkuK7FB!kI40s$|CY7~
zNX^{_UjN8}L%Med;|+=4RNTMozn8KT;2tb77bUPCmioh+rZBfIiM6f_P34cQ__o1G
zWqQp3VL~~pE5?qODf%iiQQ3f42YF@09tQ*$<v=*TB6gv{jy879dA6iNsN{5E@!(k4
z8HhaiU_^B~4$+iH?m^ArL%A5*Efo_%8ySb3DJ2+($#iHi9LOmDmMF7*5N3n2&E!HG
zolrkI2!HM5qnOHg23Q1&UfD^`iFCzlg;)`TxlRkY*i!V9>4v_EKUx;t1KCPCBtgqg
z@+Tn;O)a0uky_%jm+WjNB?=~VyH>V#L!*=l*@OS6SVyt_UEH&NA=?V2stHPyKkVNy
z<J*73J43UcB3bH1PM2@IZw;E0-Pr(2?E_y%c)4{fI(WYro>&jg<#cjros){#ji)dK
z%)We0L_478=HZ8-@xnwsKrWs8)x`MB;(Y`Cmu2c-&SH(vN-F(*e`l?c%+l$|y_AJJ
zhcDGnwLvN+bu;_sX|1<mH)GAPa-4}{cUWY%Y?nWr&(mZ0q~a8r+)V&r!Qf@i3-wZ~
zk29f}K4Mv56>AiePh<L{fUUyPI`J1j9<HC~w$=DnBr|v`eP$5Ka$0AMorz8kwj<6R
zqIF0X>x@u&%P$hf*xE+O=~D?_(_KGWQ!158YL-y9$*6mmPo;Rp*Dl5lm-mVM2i`h-
zM@nxv590_tvMwPD_{l=b$iOm|+|S{D9&P%zeT$GgX6Akl-tfUF>tL@Ld!B&{pN39t
zH>3Vhqkr}2Yul+jb7UiouWVGPNsxX7Ueba+9|~dz?d*QM$ng0DZfO0`7fAy?2yMm|
zcnRzUhZ&IcwgjH9cuU!w+VStYa{p*)4IgBf|E8)sqMYtB2KH_}SfsFq(c9i(Q6S3U
oBo%DI<H*|Oy`A%<=J$?q?|gu`ltGZq->*Kv;w;*%(i9W@e{{5C=l}o!

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-icons_ef8c08_256x240.png b/3rdparty/timepicker/css/include/images/ui-icons_ef8c08_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..85e63e9f604ce042d59eb06a8428eeb7cb7896c9
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{wzI}^MB`Dm+sH{TR1w<4t)tA3_robX4CdCOHJC|7j+vW
z%J-EMX&`87enIluaSc0_SnYUx$GzUc?vrNXt&I`o?~7C3RJ>C-Ajq!3AfU8Dx90^_
zp3}MKjJzYC+`T(&egFXQ#9Ek{*oVAaa!zrZtmlRFnwQPRJXH<%pkK2*eP`pT=lwD7
zifq+4BY_rUTa+U|2#&?i7>PVvD?7R4ZfOLPT{e<z*9Sa%-q+JZ0`uF@uf^uR0+0eA
zKOCxXcaQOB0xyL&$7t}dfX{x=z?wHIs;&yo%nJr`+{Z2X98Hy3`tm$u;dhd<8yL(-
z;#Sne;Lpz{>9G~G!Ls3s8JtQE`jMM9w<tfkOhc;ql-3a{hO%LC#ZWVT(nn|vd<pzY
zQv5BF3Fy2~(>l2V9&Q+K2DHW0M+uQmEr%nYJ^7cK?uIpU-)=wn71ZZ-=@ar0;3^AY
z5+TI{2b(e%t{2PZ<B%x(nNg1>^HKF*vu@+Xr<l6w#|okxspftdv$I9rN_GQ)7q|*8
zs5y_rF@oIq1RoU``$~Uk{rhVB^2n_8t2HJSxDFflkb2zZ+{WSl|IoP?Sr2=Mv_tpb
zBhqwukeg|uo9qd8ZqP<?l)|%<*;D+JXWZi%on=Ghf-03Mlsz8h(Q+`v>&BAc@2BC4
z_vCgww#i=)ea5Vo$glEEVBBg_VPBj!)OO>)f@}#dg6ULOeC>LBHz<;*5Y;YfE0lNx
zg{N+4@lO~ozxpF69qV@VOGnc248Iuag4C1T)P^(hWkpP!{h!JekX}m^Q#b2B4f1oT
zIjsGz)4}-$rQ*-tS<w5Y%xt4vvDzNI7LjNDGL|1T2eU@2@{VTp9rUuZlx!D2{rUJ{
z3A%pW8$~DC0b2^P95?wbyueB1Bn4o?``LnX$Uf9F<C;}N4GLdAn{SZSlT7_PlCs0I
zDBXb%F`GiL7)vk|BieTWHX3ScMxyQ_M+@in`79A|2b?#r0AHuH>uc%qG>%<4xM#E&
zN)7lRK~^2VdiloY4>;#}A!yHOAXEmEi^+eA#05pawGXs>!z)gSoDuI#>bRCq-qjJe
zZ)r=A`*EMX6+)~er1kdv1L^)0-PsAEM7JF$O6G8>496$24lkO<m1%2pOjtWwevM#F
z42>SR^RTfUuIz%iSfn5b-t!##cs7sQI);gdAvqmn_v|%I9k;fCPl0Z)R1+hNQONJN
zH%3jT9sOq*a`LF*MiY=zlSSQZ;{_FL9M07A=In+O!~wR}=bzGEQpk2!Vc0p)qKAH?
zOk{(%06W#)DdICQ_S%Q@<0Y+!?9%#$gWJ%)EO-<BTe}-}iZ54sx|$u%lQFIs?k4-B
z^|c_dxJ&9M^?WcqnEWyMADUCvUrhIaT;pF-+@vY1ij0*Jdz5c>>^YZP{<`oB4~9xh
zL9-0*c4@B#O2ylYs_g`Ky$zb~v!M`NRaMNFYF*Gsu|7)=JyyMHjFC=HhGUE@{aI|B
zJ~ITXU052%7jFb5Ys#fhS_?4kqc7H0EU49B8(Chg0&JzU=Gka#xOz1)H0d4m7ZnRA
z=M^tdY|U6T!fmte{W?_r8H~qdq|q{5AMU_2It1I4143n~xL?4&K#BOB48<w*Teqll
zf9X0fz4bHZ-Y$~|BFf{9mP#ye@YYTq-BICfY&StDZDl#G{Ztz02J1kC%b`U^<5ZiZ
z__Fi!u{2kX`iENVlA~L2)^LW8=_9VB;|Bbj&#bO<lzgV3Z>l9_Rdm!(c^C?JU;tF0
zEh@o1y6Qa_>}#AwX{VY+`C^kNkxhgb1P5cB0%xupAXyg9NO=SnXrJUE?rQg{Lcsn+
zAZKctGLfbK_B#^&Nev|0^fB&?DN=ak8|0!np524LD25=s84BP8Vl(3=jflNp{X>e@
z637Ri5xx;&JNl+XYImA|{;XR~P*svYDEWYJ6I5!6uO~2twFC1ZQevB7#3z~(apxn&
z^J@>Mc`>PJair{yT`<jZrWX;x-v7*qmDxI3P+Mg!OC%kw(l;VOuzC|8#l%8Tv4(G0
z7_1cw5ch!89b^LbMtCv$CT7IO@xA>iuan-V+i%|Ho-pA<1?V-k^R2Q<5;Co%XxmL`
z018t4T0TTwO^w)Gx{9OSJ^9_|kgwX`7%0Rw!PO~@?xvnfUehvN;2Rc;^l>3kfbtk3
z8{j7p;S&{uTlTe9&HTc38q@%_KQFk<&n{vmrN7y&Cz{etcE->rq!6HL)2F!aa=0%!
zM%Bwo!7TQ5t;@a_#Q}sjk{UebWQZ8{cp&HN^$*JfH#8spkhk{R@CVBiPuP@yEhu{}
zsQfuhTqV%rioATpEphMfhyRYbVfVW`YwLFXUWm-===J(byMf!5;W^CV1g~2194Xx)
zFK|z{pm%n-)-DRe{Qhk(d!QaoI*y%Wn6h7<6A{i*Sob&B^y|Spg!&J$`kN>zwUJ3x
zaB$ciu<nSNOim3uYsQP5jc-?Naxj(j<)z};2hoFn0&u_kBM}O@VS5)nDYx1pf*RQR
z`S)$xBwb^buzAY%gnq7CFpintWEa)7yX44mQ(9Sxz=?kBxk*6p@w42$*>*0FJKg}T
ztgnh)ASF8njz5>h6?f#{c=<QigVeYbrKRaeqWoE+%S;th=M#iBteNh&UJyV9DiQ2h
zCovT3fv1eTQ@mSXnGo$!aqUldv6@p0GWkoaEpG=8r)RRRm`|p~(T62hpEIu=ka-lH
zHFz2@lD_Q*`R}K5+eNd{WnX-*hEHn`>*Yr4W_34$GmVIo8OLWjcZK4a0`+Yv-!*}9
zBwKm;DAsA(nDI-`iH@;`=gP+m{lgFLHK3m$W@?)&dGhDA_Z2xOzI0$p(ZJtH$vCxE
zj>+kYNBJzs-TlSx!tSH}%I9fQv)mc!C7X0bKlZv4f&}C3+O-4k7A<p}+mKlQ4rT=l
zCn2{pDn1>mVO|KYZ9ydP%(N1^uisV8y;~p`x4qFXD?!_OyN9=w(O<V*&M}1I>d6W;
zGrT?G;l2v@Ob5k^8w<9w%Jbjb^|H}PYKo}I<qcU#EQV?(-;CW$3_+TixaI#lD-xJT
z(AO6gph7h?y_UKm^jWi&NP`DX>~bobd!XrTbzp2Zp~H8lgJ)I3?l&(bDiWf8gE&6b
z>)9GB=Iu-6%I((+>=jGP>CzD8c0oWITFZGgM!Q7|JrUYq4#^Y(vuDu-a>OWDa4Y4}
z5a_*lW#IL_aVf8L+Ty}c&2VojLEIA-;eQK6Wo?<KawYbZ!!f3+b@4Ui!v_Lt9t*qk
zDRw@T5NsTbrkFQA%ko%G1_Lb|ijKF_IU^teY$_8;Ght~t5fIeS9_!kg2AC0L3%DAp
z)%@G=p6e~2D2qisLge~Zg_>xAuK>i;1VWx3c=!s2;j_*iRHOsb*>6-C<qcj8`@=rO
zP}XMY68YV0>gcYP+Ho=L@XLd*j~2ln-;WHg)|cCixksH$K={5rGSD@yB%LI|(NCc8
z1Er8H+QO)~S~K{g?nH|2dB8SKs)BxQ?%G}}o*LV!NG2m*TmR|pWj~g`>)ClJCE#F$
zcj)fBg(dKOKmc$Cy}IRlasngIR>z~kP&WW~9cC951{AKmnZ~ZMsqup6QQf7J0T1;C
zK9*Qd5*(HxW=tl|RfjO>nkoW#AU3t>JkuzWxy4-l?xmTv15_r1X@p@dz^{&j&;{Mq
z$^0$0q&y?kbdZh)kZ+NfXfqLTG}Q^j>qHlUH4VEK`3y^-z6Y<6O88Hf4v^;}!{t-a
zDWg;znYu%6zA1~A5~<XNrYJBS8~snn$jIDO<y@mJydzi%ZH$Z$)QuZaz%45=1m~)~
z4Q`zYwLIYfLfxmU0o|G_6zFY@4*h+3cz>w?<TWDm>fxO~i8-Ib(^02{c4pXjhDI^2
zXB1LP4dvWuc%PXQ{r!d#6>${rm+M8EJM8yf#!H$Kp8AxwUXm5`7Tu-J$mHe<eDz8P
zkinV!Ohb>CG>vw|&Ay415}_1w&*9K8+2d3v1N+@a$|820o4u60Tj@u&kI!~q2V9X;
z>tMvQDI|O$#m+m2O**ZHq`_{#8)ry6`&5s~2k{O4Du16Fn0P;&_(0!e5%Bel){nU0
zJX~<8U6hoI%yx}qGY_1Tq7YKDJ)ETOCs&W)TiCrK*1%DE*vXdD-7hwE*LUgjeHRM`
z&@pkhTi&gtm#Kc+QIK+2Ybn9-sFVKNHyIgfob4H_77yYh))Rq$7Pw|+aD6&yZ|ki9
z8Zb6s{oBt1G+PgfIcxd}{m@~1nzhe;LH)5;!gS8@ddyabpdBc?7JVl?tS+<#bPSMT
z2@0uYdsWN(;Ww)n-PlA-0r+62@bYkEa`k{0s})fJgYZ#5=DmIdEvok7aZJRi{w-|}
zkea&<y#A2`hji}_#v2m7skndFe=lVxz&%)EE=piOEcJ&sO<`_b5^G%<n#vzp@oj^X
z%JiB6!h~{GSBxDmQ}k74qOt+84)V%~Jq`#i%7JivMeIU@9c}EI^K40lP|4}S;=!@7
zGZ1<3!HDW~9HJ?Y+=H6KhjKBrTPh}kHZl%5Q%W!nlj+c4IFM2PEm3CsAj}43o5_VX
zI-!1a5dPZ9M=_Q046q0ky|R;>6X}ZA3b7&vbDb7)v8CuI(+zzSf3z&P2eOrPNP?D~
z<WE8xnp!@QBele5FWK2lN)$}!cCBpfhDIq9vIqZBv5sQ<ySQilLber3RTGpZf7ria
z#<%~5cZOy?MY7b3oG#yZ-x@S0yR!k5+6TUj@N(-|bnt#LJh2{}%jx9MIwuve8&6>f
zn0@)0h;~5F&BG5v<AsTOfLuEFtBLWM#rp>OFU!=woW&ZSl~nrs{?1w>nWfW_dnpTd
z4qvLDYJ*ft>Sp%M(^_xCZpNBn<v0_^?y$&i*)D%LpQp$0NyRBLxtjpMg2Bt27wV-}
zA7?@{eZ;cBD%L0_pT_h@0b7Nob>c66JX}A|ZL9IENM`U>`ph7d<+RQiI}@E8Y)70s
zMC*_&))}GlmR}@{v9*nm)29-=rn`Q$rc^4G)GVQHlTr6BpGxtHuU(8AF7Ffh54?5w
zj+EYT9>x)PWL-iQ@RNm<k%46_xu3)RJlgba`xYU0%*_29yy1gU*1=vg_B;a@J`J7P
zZbtp1M*r&3*S1r6=Ez1EU)iWolOX*FyrcztJ`}_b+S&bhk>T?R+|c@=FOmj)5Za6_
z@DkVy4l^L>Z3#SI@s_eVwd3D)<^Ivq8a~J{|4mhOL^<7M4D8){ut;GIqqn`oqCk|x
pNh;Wa$C0(mdpqYz&F>xK-uVD=DT5%Jzh8ZT#aXmjr70%*{{RacS`YvL

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-icons_ffd27a_256x240.png b/3rdparty/timepicker/css/include/images/ui-icons_ffd27a_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..e117effa3dca24e7978cfc5f8b967f661e81044f
GIT binary patch
literal 4369
zcmd^?`8O2)_s3@pGmLE*`#M>&Z`mr_kcwz5Nh&g=McJ3E!;CE1E0ryV5Ro;>nvtvt
zk&I==Xd;cVGZ@>q_xtnx{1u<ad7XP-_m_Llz31NZdcG2EQRlg#Vo(48z-?(^ZVvze
z|6T#B?4ZAvXnA4xuUoRUb~w8~68XP#e)ZtVe+x$i*`qE2L|`Xa*=^e&W~<9M_#tnj
z#rVH+Aq<7gEG|f0JFaQ38mE(h>%7-D)N|5YqOB>i;(bZ#o62{J2Y9&^D3~R^$o+X?
zwbxAEIb)xwCwK3TSR4QVym6N1rVgPmmt0caryBUceHP_&u}{?^Jn7f0PT$#h>UDqI
zr!q(F&1jJ2_!jxdAB<)7H$foI*2zuncvu;;$SoU7br=AiJ@4=BC4vNO>DS`&UIB=K
z;2)0F*t^FBvVfPuT4FVMSwUw%Xksjyl+;#*DDy%=ocFOyzDLvLR(`zCSOuJ=?FWYn
z5ZD!UaoF>-$@=Vt?a&;UQYM$Oqe0ZB?Je?8ZnMxDe&uzzs*zlHd<n!{fcOy-3tIxc
zl9G6fU;?@>)V58nfJPc8S^({_4bj5HQ_B&EXHWj6wx@B;!mr04b_Mx)UFL)W7`V!c
zpMp#C!a!!sh3h491y}^qfimXVY%!+sYu0_D<P=jc<5*#|6V<{WZGN`6N7;T5@B&-O
z4YA;LJcgH_nB=Dd<6apIuYX_dSRS2~d9}u*0@tAvp3;xIUD`Q4{vSHeBHLl#uuj<i
zdw9AoFJd!YY?C9=-W}2;fmD2UGG|&~>WoJMqpN(FR9LM#jdZ{vJzEck`P^9(1N=4J
za9%u4$2J8TAkUaJk_FX%iHuv#svL_mMmp{SR}ifc#ZcXv%CFsT?*>N^6r(%D?1YnU
zAaT?UZGlOn<yU`%Wa8Y9e(6d%oe>a6UXXs0m)3YDp}d%hb@)@Y!lK_A&D6{OPlNnj
zYY*$b>vnRzL8=CDbQSi!DL3D!P^xhNtwrYByo?h-&OvQZYJ6ka{Re#<tfku}Pk%l>
zSc0ry_d(K$_Q2M{Y^O~DOK(szDOnMi_<pwV9HJlj%%pbJNR!N8!0s1p{Upoaj+ETU
zEK+aqL+qw7G}a0PL5uYtfQ*ORTM)>*h_Rx%eSRxA%n|FuC&=F=<MvvnBAs(r9_AGz
zj#LLeNR-pStzN#d`2)svUKrAQ8VHd^=b;OpBCx?RZykcH-tb9~qbL$x$(`2<NV~cc
z4z2Bp@;~m=w?YY3`1HQse<0qUrn@+UmFad91gTtZ)sci`wvk1%_;MW`&Pf|5tFMu4
zNntUAcOEu%z*Jn}7mF2zKzm-pAJ69V*u*k%Pz0Bw+@6D$nbX!5@F~#!m0D7y2@>)B
z_Qsgmj8g!GA+LZOX)<MTZnmtSZMvX}iN~6m-JIQU20KF6`U6rsN{iU<Dvr1WS@zOz
zl#6cg6=J4)x<q{k$6xz$eY~XokVD3xXlNVKpABoKf9r6^O!Mc-%+zqecrz!IBHZPk
zw7nJrmUK)1q@E9fg^)g`{6kCX`iq%f7Po|#WOo_zsuE*m)B)+26L-$_R)8Mt!h_+m
zGL~5ePlt^60=e?-MYRsRhyDgl@7ZuDwz@j@ON}1OXo&%9FFj79dYq9#Pl2J0tpZqW
zoj)^#YFt?xCl+r6r)bG%OxXxB9bzulRW7L4VwzZAtOD$$wddJsYuE;LaTM_#<QEkK
zsNj<*RBFpyHO6kU?fp7b`x$~mXQtCK-5&11GCPIZRRY80sMue?{vgSOolK=^)LZxH
zbARbRFuV0L_TDa&7c9o>gOW}vbo9|l8QW3iYw9qCD{o~xt^HIU>;dV5MJgc0#uHTA
z<b?9`^Kmpc&W4BD98zOjFt!MWuh}E+<l}|{o6oGTbC!N4qi(7vXIFMMOnVxMbfN)N
zpdB*NBc}R2H}q?~Wm%WHWyNB%7lB=rj|B!oI|os&8zNX2&PaO(73!SiCG6_-sewTO
z1Rz&hx(b1H;PyKr{Yfo2#_Tcnj2S{?^c(o11&+g0pg0yUvKa>80%Ee_r;G`GUjssm
z*AhtwpW%Ly;X4Lq1Zq#ZpuwzrZE$sR087dN{w7PA6|Mo#6wwJP085K+h7+D>NyeX#
zk|?M<oZ&;KrN<L<I(I=dD@q?cl4IbRF&ndOs<5uwMvg!{TBUD9u|OM4eU*}mSV}bg
z!o#6$7=VN)xc(puus6zwHZV0OG)?U7PkW#AIo)ydHqWFfKQd6ixr2X|O$wi7Elt~Q
zP6v<?64wgA8tUqVma<hW?e59%zK8rZ0VY6U?n&-05mXQLRLYvR*#iHFc$BXzkqlHo
z6W9SifpFjGSnRT&jat?h?$a!d5Qp<Z%K{vt*3t%>J^Es)JtP-2eNr0EQe*ZM`&}OU
zCD*uSSviE&p}uX|@1g_%|3*ra*MbBV#~cshdcFQ(dGLnTqaO-3{u==x1;Pp2im!#`
zuZ2`ThfAmiSzb|4h`c4?^ZoGOF*oXYcV}(ge!v@^bse?daA`Ma+bSZLIg;pIN17vM
zIOYfK=@s_Pj?~#lqnY2o?d1$MpoqsYQw%eX%X6Y4*^27{hMWGqILEMnVYUEMW#x7f
zu^I*nzXQ@6HJ8n;<zUNvk-PEjs%<X1ioU#5GW#HA=uaT__dpa}F)w`Yq8IsAdt`7U
z`+&f{UAvT9oH8a~#Q{IST?fK4Gn(zAyLXqIIB&|RDC4<MkG(eWs67GJyEog<1@R;p
zqErmjFbl*Kr=W@Fa@dm2f*UXY=6aA8pQ^kx6Gc!sOK_!BGj%_KX(L)0{_BN-RG>26
zo^1+Ewi$fN$Unum1(FTb8I#cYgcGklwIExt#Mb(D=x~OTeZ^ubJ)S-ywfdZS?SRCq
z<f6&jh?er}Ff4dKlh+}ZgDU^xdo^N4XGA|QMlZXk36y0_n94j(>Dm=eU<x+0r+(K0
z$`kDr6r$N?XyYa?y(T-y8=tEjFA9h_xYvk!0;klqRPh$f>+CCWO@8S_m!W{alT)zj
zZJbjxm5&No5xe_~Jw-i7`&G}=r)POGGfFq<O8y-6Cxq}O+jVOPKCRjoSodM^fgSV;
z21Z0|XI6eXR7bxMS=$0j;+W~BbU**AT6?!xT;2D^zN`dq>+c@kQbB#)ay`coj&C3-
z(#&xV@Q3@VJd{qdH4g@4ZJi&mx9e@Io7@~(o5vTrkW>QEO1T-gmlTRHH+3)gcUC0P
zk07rvDnf*7Y5J}8!>F_7D^Z3IoH^uGH}_a(ax{Q(IrvV$olf3WN&DY?<mf1{#tp*6
zbe~sSoVbr4l{;@hKd4VUJ-1s^jK>uYZfvXI(;Vv&EAoQtfH<X6@yy;uSMU*|aKXKd
zS5vU>;+4VI_a>yh*J+Cj!?h!QX?O`QXk@@G7AjloJe51Cw*rPXQ>#y?B^^ExRQFui
zolmv*C5K|-p){rZiCNai^0H`1(Qr(Hz3v%7NnmriXu2tD>xsbN#*R3*wsZhRj6Lvb
zn0Cu=qkC?*e4{NF_3=^bTb1f!g?@ryFH<mSX7J%FD4O3UZ%By_%;30DZJa-JG5in5
zFhfO$wOjOepP7?~dRphj@WU?;zCKz6eSAMUwAxT%JMIyEG7;|g_Q+7rq>6Zw2tz%A
zzz&o{w`dDv66!6Wk9w1-dglS#Sm{doxw&h5Z8&ONmlBBte{J)puaDzc!LC==rPRQK
zQNH23?-rIo^MQdt3Tk!B@8l#}fxVtrlc8Y<>ORaVE($DKc{77qV^`+`%_DotrUD=8
z4}L7QnZi3RgUy*tteY-=$SqA2@IZWe(}mI`nzhAT{qC)my#rJsfoS*<ZNRV2gRlj?
z)v1Cl_T+qH<V>)xCXj!Tk6=3)cr@Jw#OcNqgS3pg7x|4!A$|w15X!huR*vB3q9Ya4
zF{xuzEQz{9YPl(gk`}Gffut%jotgqp$jZvzRO4EsExf~93vY~04AxH=lR>R3v3Qs2
zy$v4SN%ee@Kz#kDtARaQD`d!R%}#@T1=v8DAow*r>+0d1KS{ZtA~KMtgm)+$JHumW
zw=;@qWk&MuG@LKx#K3@&WMw?r=jD2_)(*$LmkCm4_@};QZI|SPe8hIC6xqBy!LQyK
z01_xmfNA9UlBU@Kzu7;zQYxHE>OCADA$gwaVqm`eN?XQF@NkrocB}lU4hcCf>wqir
z>Ya=PcE!Xm#JG8v@G0lj&~)hScM}X57vGw3g<$^SUls53f|Bk>5FQwqE&{%u(f$!1
zl8+53vyYZ`mEEp&YT<=(krhKrw?~pS{N)?q{0qBR#2Y!w4!hWMdj`a(@A@r$zVB+u
z06Hb@_9(cQ_AxbXI|-2w>#QUhp7k<+`z9+(jkh~v-Renr#C9U+&jL4vg6-E$f7@UU
z(1fxB8{U2vq}h3rE!Z+n7=(>D&}@9~3mJ^R5}|WVG@!RSh3r{!>QHwg!t29YS&jiR
ztyn_q*k9H0efZ7hO*b(WR|G!TDY`rol~Ob4&1OwdM8kbGj`^$~L5gd<d7YB5YJW@H
z1El3`1FwJN#3DR;LU2X|A1e0W_1{a~3G@h&oQoFR4^R8yLsOhvm%`Xog{28ZResyx
zqB6ZHK&Wu;>WYceWwL=PB{~NX=cu3p-{S;hqaE?bSHv$g+SA6bxy+VU3YVTPDj6CN
zKLb_(9gM2Y#KW8ONxjH9To^Y)r?ql2cq8+WE438uIF$hjfdLs6-;!jv55jGcc3Ipg
z;}aT32NAEGeU;J}&j5=+u`4?%xlwL7?NDn%2={4WS39yn3f;&r=|}5=M-Y2yrxeSw
zv%*PmV{_{#Qk1sD>?M2KDapb~z3!E*-LPmCe9q86D%MGSe;4~~K-jKQxq6b^902_{
z%>4G>@Xqk8muR*|vGe5{@7sds<aRcI()+-dk>2i|i;g}oMkd!o^0=HG+vcPrcN54A
zLGv$PlTePRxp~-OSb_*aACO1qc{MpfS-fv(@UmRv%UO)cSt;ee@9(S)f>|~bwU@eZ
z=kTS*sdjLclwMZ<Jgx0E^k$qnMxHBa{0^(!mfiA)^ZEJ=-!!ZelcyN~EF8Mbb)i9e
z^>G#?%U3)bq-uj?@@vj~6tq)ZS||Jxz`+di-M5<Fie`muWl)A7tfzIyIhd%F5PQPh
zAxf8Mxy}evu=*ltf~ji)pFWl7J=6W8EwxIyv~~%3n}ob~`BbWRLfvBgNJYQsf8eXf
zb*A=3@G_1-qwA7#fS;_y%uEbp$>SXM=h3EL`?pB>W9A;`V2vM)vk&%KFy|TAh#AQA
zb_?<!HTqYNzP6jrw?H&O`OC+In}z5{pe1eS^Wk6)mYv;?7a6{vK#gr5`lD#T2VpIk
zLT|ynkZ?ny{+8hL6(4EaQ#%3OSMDDzt>J==3f@%LL{`vU$3Z@A2a9C3aC-YY43dR>
pI7J0n@;b3~`)ubvsr|iU(l;L{A#E6J`}eC4usn-0uQEf&{2ws1m(l<L

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-icons_ffffff_256x240.png b/3rdparty/timepicker/css/include/images/ui-icons_ffffff_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..42f8f992c727ddaa617da224a522e463df690387
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^p#%>t<I$5%B*(%$RifAlJDl()+*_W)tj4atJl`V!4ku}Mhk*o=k
zjAh1XB8{;#7~8k^`}6($6`#j>oqJ#RmwV2==ic*rz7lOw=eaq=H~;_ux21)-Jpcgw
zdj+hrf&W^f<%Qk9Zpqf#;q3n5{{POY;f!wmTR1An9(4&I0z1LNX50QSTV2M%4|y9c
z#{ZQIVJKu~aY5?ZaZP*GIGqGs=e@q6o|EPhZB3CC?@LnORK8O@z{{<0KtSn5?#~OW
zy=L;x8T&*%xqElS;s5~Pjk7d2bqIaA<dW(>)xZbovnZd7eX17WNxx=w`p(8vulwUZ
zl{so}MuRNJx5!8S5G;$o2?BApPHt+)!^#*Ww`?rcVE}mcyuY`X2o|uVUyI9o1t11O
zemGWR?;aD#0$vJhiPhv~0iXS#iLq!>Qd<?G%nJo^-p4Na9!-~9`SCtu5pb5a9~>$`
zU{}<|Vb9Md>$4TMbL7C3GP#r;4Wc$}Z;^j;n}yc!E3d;<jpV}POQ7Zg#E;Ne*b?}a
zl*C&E6VP>`wry$!JkmJP0%(tIh!!TET8=<Gd-5-}J&kJ?em(xME6C65GA9%uz*QFf
z6kM7Y1~y|ZTrZI;z#@<ilrhg{i!qH~v+ffmr<i&f#|opJs22Wc^RvZ0%JzeR7uZT}
zs0FX%F}(c5BtI1x_sU>+{rhUi^60G0t2HJSxXv-*DgC(HrJd8`|Dp3NvL5yg>xAvU
zho|fEA~w^-HrW&H-JwkqNX2I-bEXBR&Uhp+y2^)1h1IIlNCzC!v-Mz@&z&VPz+cl1
z=f&f6Y*U~C`ixm4Sy1hl$hg(4%Dy;bq~k7d1<@K&%%NLT`L+A)-QXyKVswX?op90(
zB#yeFEih@c{OXU8Oq~1CFI_38GXmns3(`;W(i+bslovCx4u7gvK>DrGOug*?G|1nz
z_OR}|ZYS3pq-p?rS7G0qa`TM}r5XqDT4cV>%Qyk#9ES}`jc+Ww|DcbZrF6UG>CeXp
zOVIV}K1e#z9@tu#?X)Ri=?zXMB`X3G-_I7FL-Zq`nbfWtX_EO1*!+U6pJW-_k&+vk
zMd}THh}{(Ch_wPk(PI4vVB_KT76kGxVytLxpWg}&bHw`a3G#QzxV@ICNax&@hk3<_
zBh`Tq66G{-tCw$V{(y0v7l!tp20~@gdFX<t2yAf7TZbU4H+&N0D2hZ^a_6-I(yp$A
zLu-4Y{Ez$etx!T0KE1E^ABgv-=`PL?WxCx2K`NJ9btEB~b!5>jzFbF#bJE7i>T4ux
zQdrF3org^wFcnw$#bQMv@SfN3$Fuo7HnB_`2ZGB{ZqGr>%xP;2_!Q{=N-ZhU1c~^5
zdt=OO#wmcpkXJyCG?{{&n=R{Sn=Ytg;<09CH)l7TA&wkt{Q;>RrA2Ia6-QixEPLrU
z%0)N$3Nh0?U825&<F9?WK3>v($Sz}0G_(!v&xSSAzje4{rup+^W@^}ByqOb95$<wN
z+FlC*OS+|hQqPCLLP#G|{-Gsx{l!c#$SvU|*<FUbs>E0sbwK*%#GP}!6`%*Z@L;&C
z3^dE&>5%bWAXmP<sMdk^(BGixJsS?iR#(S<snG+CmKd<~(&IF$#~B&)6d2mrDuBh-
z`7=YP#+9XUV(~_Bik5uFl#L+MA?9LT<$`)GritanD!@)!d!CK9hHX$6M-ksae^D`j
z3O<QKrMApfW9&BT-mgQopCLGOW;!j??cokAvs0*DB`{2miv0!b50XsS$yAy~y>*X1
z_m}Pivs*u7@9i>qA!58fDCwj^M<1P(u^m;urVdlM@>aIf+E3-d9<VM%qyk!OJVCWh
zPAES=A4hZJY<Q^6E;Y6VV~t?=nmyu9K5i(m`ONw{XX$4$>ZW>fc4cS7w5O3sCmKKn
z+94A?VyfSBb9{}rEbCIYtXORJBCv__fnZ>?a}edaA%bP$jI?J^q0UKO!mduA8U!3b
z0CJ_Js}NWQZoebapVUHP%pPOUm?1<)zd<fq;MhF{ievF2n_&PhASNq*%9zmiH6XNj
zEs=Ea8SWPuzGGlUp!TE-8qB)a23IEsfKm?dH$i1qxCT5^L?@^KA}zidPI#gv8Gk-X
zqM+_@h7X;V9#72a+y&FDD1Goq_JL={tjxBl!n$f3IRf!$mA(-L;%G4SRZ1!Xm1z2f
zhjX-H01}>%`hzUM-Y6g1z|@@3G_kio?S0bcbjQuxJd>vU$Uyz(4*peEDSVc-G;O;%
z9Y97%Tq}TRsH+oN%2u(oyC=W<9`e@&m;i;jC%L;sP(9RBDQnth3;ZMEQNFH3GEf0c
zU<3RF!hNG-vCDooYFS^nPlFnv4(ElI1=vNcr42TF^u<zpNG@plq%<5<WA+sLT^{=-
z*SKa`IfTWbzHQm>q67f{MoN>{f&>xA91r4pz5Zc&@P^i-9||`98v$Si!U@}ouZ88W
zg;YL=OQ;4}UQtkpyd~lD{qWy0H|lwJXKmenz#E=*9kt$YX*X!wDk7ITlIUGWnj>a7
z<_GQR752@J)Y(U)ncu(d<qS5Uh{rKg3^Vr2bD|>Iit7P}oBq8x$FP85)&Nsw<#rOW
z8U_x(1J)Zgm(8tZXU%+(yYcO+Z7#ZszPwa2`ygiMPayX9KondtFMRK!7x`9uWN;(f
zfWW?8yOdj;GA3We0YAW92gWipn(d>zcbA+vZ_21B<GE0ey*BZvJpq=xH`~tz@gx|c
zR1DNG3&a$spo!;l*pkkI8!!LndXN^Ms=PE4MNl|PaHUi;bw5F9BU%~$>xF?-pfcW`
zbqY<k8GOpfKgG8NmJQVzlhFBu6R$nBAX~7++WL0raE6k7#bPQwo<1VA`kZ;~fW)ih
zqRHEcmh$T`EO<YY*CCdJD*xhpHDX3*L_aS^FT1A+oMlXy$~;c#+7(V<3O2N-e%AuZ
z6YUffqFHBX<0db?COgL)pQ{`%3Wzwk*NA!or_{An@fOVM>??6ie(6M)p@6@WQ?Tl7
zoKrKEj|x~2yZehhMLkFRRnOC>XL&L+N;m0B{_OQ9gzzTYb!!Jct=bk?_hIpY9rOwY
zMnr69R(?8EN52qR+k!~qnCYc-KmV&*d$&NY?t5cjR)V+ncMor=puTRoo?{5dH;@!*
z<~RrV!+ljAN+;Qx2LraY&JWnz^|sYbZjP+Y;|pC#DuHUH+>F~x3PqTkx)=OAE0X9(
z(AO6gp~AH^{nq+n)LHYDD8mQN?DDFcd!U&d4PaajzSD1~lXq3p{x=^vItrq3gD^4O
z=hYS`?&C-0&KuAV>Jv}T?ba0IafL$~+bZ}p$9lwyyx=-uPN`Hpvv<)Ia>OWHa4+N4
z6zscrW$^XA32E<j+Ty}+?MPo5Uc!qbGT;`7%Gx?l<xc9YfT7LQ>Jw^7hYtkRJr{Q8
zQ|*1pp_q6Mno|D6EX!kgSv0h0I3~ef_l%$<u(@0`-IS&EL||}ZN1R(*I)Ea^7I-yG
zyXCjhJ-1uF(Uyz)_^9=*N_DY9KS79>DTFjL`0y16n%^dGNQn;2V82mqoIi9i{15vu
zLq&(BTl9CInUjZlTIa>^!!HlMK3W8Sd_Ow0+E8IT?h$=55$^Z)$WYIuig=O;Lp_1Q
z4wOT;XbWQ!>Mh`pdXuSo=K<ST=}P*!xodlEIBHy%5{U$VZS$wEkNsG|u2<Kk)WCyL
zzTvy?7M8&Cfq_5@YIV!+<Rn^wt)5qtp<xK_KFldD3M^WAGlN-UQ|ANEBYVoG0w3xR
zek`?_!aFWQ%$ZEAn=XFHElm{gKzw@Bh0-LNwZ&Zh?yZ%*15_b_Y4{Osz^~4Oum!!<
zse&!G<a}e~Ot7vdkbjYnU^^LjG~ETn>Bba;wT!wK`Hf1Ueh04*%D7Kfj*#b~BNfvz
zsbf?uiMm5-xhaQ|7Om2OrYbU>ngUM9%F5nU<65IFyu(`yZ;Vb1)=wCd!L2K?c$ezE
z4IbS|^?Z>)eEp}ZfjwF)Waw?pPJ?{~*g%;e<TX6&>fxO~Nx7dQGLWZ)cPQ*T!((W-
zGm2?tM)K}7oG<0Xz<`ltWjxvE<$AH!4*R{A2~uYGr@m!vm*j+e#CE9^*}Oc#uihB|
z5;#kMY2^8mrr80%*+02bDx6B{Jsch(d7kQGV7~iGTgFZBu$Pf`tNf`B2{|t7fGhIq
zos0xF#l$bfxOtcGDd*MDbdKBaCKxg<zBS_t!TiI&D&FS>CEbr8JTNd_1bjWC{Ubgk
z9~)9;A1&=FyIt$l!VBXfD~6VCk0fjO%QwLJ7k00RH*%I8cCqF542VzP^;`OU-_?=<
zbV}OoQE)HqV`|)X5+WbgSxGWH>t+7-O;(l~Z+FJJ)sygu^+eF01#Suj+pnAcw!s>p
z$-xF}c>7t9X6H$^V9hvT5H{jKv+=zzWHA0pgw8e5fZpm9vIphVq3%S4*N3%&jsY^Q
zK%sSPuj=?d{ATs0o0y6#0w3%YT^@-_sTuTUwI(Q{;l3KjeAbVk#Wmi%PDxm`zoqQ~
z((<-}*FSP%5gt7uI3t1&75ne{@1^bpdW1;MMGNkSr~UAuDbB4+VQi|x(gdO^zin_)
zncfs2hj8xdiiy)@vVkfkItLKvsGtJh<Ah+N9r4Fk#4j}3)5fp4%$8OPm!2*v85$2i
z15p4UjH=DV!<+L-y~sIS7&k+wwQ@3eBlD0ewG{0*l>rTb0T~tFl4Q3J!flauS==b&
z6B<Vc5wD$nmC_i`0E<AeD?2H<QEoWxP-{X6_i15QJF-Cv-N-NLN9%$|5L;=d6lmF5
z;UuK7x%Cq%N?T&~lD+MeWZ|S<_sZ68ShNa0XXqal>m<Ivi+wgAY*(pVJxOj3;P^Mp
z{Py4Q&hV_4XtqYN^W_`w+k)rhb~b?0`@olx-tL`?jy^9&Cf7sqxSSo^=A<Kc6UYof
z^DkeMP>!g%dDvlCf(St$kVofvH90|9yl-gmvRvcKS&Ye9DdoTK@2m}iSvC{3m%4E0
z@TJD7c1V?!URM7+t?f3)%{X(6JXg~A9TvGQyX6n(^Yt0NX;>vDPcr~mICPooLWA_`
z<1A>FuXr|C)dtDr*PQt%Xs5WePWUB&gBj$zZ#BIY%?jDdpbSA-PV0`dGf^oa_Jp}Z
zlrGV7oe`#B^+nPIQ`ZDJeJas=ru#=*YL#+n?Go}f33>1GsZ{TTy2bdBihj}mz*mp!
zOzn%{WgLM=*CpiuKUs*GnHa{B$2siJqfNi|Z;|rH%stM*8b26kAMCYY&NHwPGtlYn
z7UVx_^sgR$Z8x27foS63FCP<b7NQ@4m$W&a4+pb@c6L8rWcYppH@1D~kD>t|gtcG_
zy#@C|!VQV~TY}G5e57qp?F4jRxqq~@h6^?-cvD>ySwVLl2m7=gERtEn>Fw_@ND%pO
oiVC*mbz<%I+0K1Z`+LWvZ$3~$+A!Gm?^hpSc@||}WrmLVKLvuzv;Y7A

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/jquery-1.5.1.min.js b/3rdparty/timepicker/css/include/jquery-1.5.1.min.js
new file mode 100644
index 00000000000..6437874c699
--- /dev/null
+++ b/3rdparty/timepicker/css/include/jquery-1.5.1.min.js
@@ -0,0 +1,16 @@
+/*!
+ * jQuery JavaScript Library v1.5.1
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Wed Feb 23 13:55:29 2011 -0500
+ */
+(function(a,b){function cg(a){return d.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cd(a){if(!bZ[a]){var b=d("<"+a+">").appendTo("body"),c=b.css("display");b.remove();if(c==="none"||c==="")c="block";bZ[a]=c}return bZ[a]}function cc(a,b){var c={};d.each(cb.concat.apply([],cb.slice(0,b)),function(){c[this]=a});return c}function bY(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function bX(){try{return new a.XMLHttpRequest}catch(b){}}function bW(){d(a).unload(function(){for(var a in bU)bU[a](0,1)})}function bQ(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var e=a.dataTypes,f={},g,h,i=e.length,j,k=e[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h==="string"&&(f[h.toLowerCase()]=a.converters[h]);l=k,k=e[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=f[m]||f["* "+k];if(!n){p=b;for(o in f){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=f[j[1]+" "+k];if(p){o=f[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&d.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bP(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bO(a,b,c,e){if(d.isArray(b)&&b.length)d.each(b,function(b,f){c||bq.test(a)?e(a,f):bO(a+"["+(typeof f==="object"||d.isArray(f)?b:"")+"]",f,c,e)});else if(c||b==null||typeof b!=="object")e(a,b);else if(d.isArray(b)||d.isEmptyObject(b))e(a,"");else for(var f in b)bO(a+"["+f+"]",b[f],c,e)}function bN(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bH,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l==="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bN(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bN(a,c,d,e,"*",g));return l}function bM(a){return function(b,c){typeof b!=="string"&&(c=b,b="*");if(d.isFunction(c)){var e=b.toLowerCase().split(bB),f=0,g=e.length,h,i,j;for(;f<g;f++)h=e[f],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bo(a,b,c){var e=b==="width"?bi:bj,f=b==="width"?a.offsetWidth:a.offsetHeight;if(c==="border")return f;d.each(e,function(){c||(f-=parseFloat(d.css(a,"padding"+this))||0),c==="margin"?f+=parseFloat(d.css(a,"margin"+this))||0:f-=parseFloat(d.css(a,"border"+this+"Width"))||0});return f}function ba(a,b){b.src?d.ajax({url:b.src,async:!1,dataType:"script"}):d.globalEval(b.text||b.textContent||b.innerHTML||""),b.parentNode&&b.parentNode.removeChild(b)}function _(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function $(a,b){if(b.nodeType===1){var c=b.nodeName.toLowerCase();b.clearAttributes(),b.mergeAttributes(a);if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(d.expando)}}function Z(a,b){if(b.nodeType===1&&d.hasData(a)){var c=d.expando,e=d.data(a),f=d.data(b,e);if(e=e[c]){var g=e.events;f=f[c]=d.extend({},e);if(g){delete f.handle,f.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)d.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function Y(a,b){return d.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function O(a,b,c){if(d.isFunction(b))return d.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return d.grep(a,function(a,d){return a===b===c});if(typeof b==="string"){var e=d.grep(a,function(a){return a.nodeType===1});if(J.test(b))return d.filter(b,e,!c);b=d.filter(b,e)}return d.grep(a,function(a,e){return d.inArray(a,b)>=0===c})}function N(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function F(a,b){return(a&&a!=="*"?a+".":"")+b.replace(r,"`").replace(s,"&")}function E(a){var b,c,e,f,g,h,i,j,k,l,m,n,o,q=[],r=[],s=d._data(this,"events");if(a.liveFired!==this&&s&&s.live&&!a.target.disabled&&(!a.button||a.type!=="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var t=s.live.slice(0);for(i=0;i<t.length;i++)g=t[i],g.origType.replace(p,"")===a.type?r.push(g.selector):t.splice(i--,1);f=d(a.target).closest(r,a.currentTarget);for(j=0,k=f.length;j<k;j++){m=f[j];for(i=0;i<t.length;i++){g=t[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,e=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,e=d(a.relatedTarget).closest(g.selector)[0];(!e||e!==h)&&q.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=q.length;j<k;j++){f=q[j];if(c&&f.level>c)break;a.currentTarget=f.elem,a.data=f.handleObj.data,a.handleObj=f.handleObj,o=f.handleObj.origHandler.apply(f.elem,arguments);if(o===!1||a.isPropagationStopped()){c=f.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function C(a,c,e){var f=d.extend({},e[0]);f.type=a,f.originalEvent={},f.liveFired=b,d.event.handle.call(c,f),f.isDefaultPrevented()&&e[0].preventDefault()}function w(){return!0}function v(){return!1}function g(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function f(a,c,f){if(f===b&&a.nodeType===1){f=a.getAttribute("data-"+c);if(typeof f==="string"){try{f=f==="true"?!0:f==="false"?!1:f==="null"?null:d.isNaN(f)?e.test(f)?d.parseJSON(f):f:parseFloat(f)}catch(g){}d.data(a,c,f)}else f=b}return f}var c=a.document,d=function(){function I(){if(!d.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(I,1);return}d.ready()}}var d=function(a,b){return new d.fn.init(a,b,g)},e=a.jQuery,f=a.$,g,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,i=/\S/,j=/^\s+/,k=/\s+$/,l=/\d/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=navigator.userAgent,w,x=!1,y,z="then done fail isResolved isRejected promise".split(" "),A,B=Object.prototype.toString,C=Object.prototype.hasOwnProperty,D=Array.prototype.push,E=Array.prototype.slice,F=String.prototype.trim,G=Array.prototype.indexOf,H={};d.fn=d.prototype={constructor:d,init:function(a,e,f){var g,i,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!e&&c.body){this.context=c,this[0]=c.body,this.selector="body",this.length=1;return this}if(typeof a==="string"){g=h.exec(a);if(!g||!g[1]&&e)return!e||e.jquery?(e||f).find(a):this.constructor(e).find(a);if(g[1]){e=e instanceof d?e[0]:e,k=e?e.ownerDocument||e:c,j=m.exec(a),j?d.isPlainObject(e)?(a=[c.createElement(j[1])],d.fn.attr.call(a,e,!0)):a=[k.createElement(j[1])]:(j=d.buildFragment([g[1]],[k]),a=(j.cacheable?d.clone(j.fragment):j.fragment).childNodes);return d.merge(this,a)}i=c.getElementById(g[2]);if(i&&i.parentNode){if(i.id!==g[2])return f.find(a);this.length=1,this[0]=i}this.context=c,this.selector=a;return this}if(d.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return d.makeArray(a,this)},selector:"",jquery:"1.5.1",length:0,size:function(){return this.length},toArray:function(){return E.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var e=this.constructor();d.isArray(a)?D.apply(e,a):d.merge(e,a),e.prevObject=this,e.context=this.context,b==="find"?e.selector=this.selector+(this.selector?" ":"")+c:b&&(e.selector=this.selector+"."+b+"("+c+")");return e},each:function(a,b){return d.each(this,a,b)},ready:function(a){d.bindReady(),y.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(E.apply(this,arguments),"slice",E.call(arguments).join(","))},map:function(a){return this.pushStack(d.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:D,sort:[].sort,splice:[].splice},d.fn.init.prototype=d.fn,d.extend=d.fn.extend=function(){var a,c,e,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i==="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!=="object"&&!d.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){e=i[c],f=a[c];if(i===f)continue;l&&f&&(d.isPlainObject(f)||(g=d.isArray(f)))?(g?(g=!1,h=e&&d.isArray(e)?e:[]):h=e&&d.isPlainObject(e)?e:{},i[c]=d.extend(l,h,f)):f!==b&&(i[c]=f)}return i},d.extend({noConflict:function(b){a.$=f,b&&(a.jQuery=e);return d},isReady:!1,readyWait:1,ready:function(a){a===!0&&d.readyWait--;if(!d.readyWait||a!==!0&&!d.isReady){if(!c.body)return setTimeout(d.ready,1);d.isReady=!0;if(a!==!0&&--d.readyWait>0)return;y.resolveWith(c,[d]),d.fn.trigger&&d(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!x){x=!0;if(c.readyState==="complete")return setTimeout(d.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",A,!1),a.addEventListener("load",d.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",A),a.attachEvent("onload",d.ready);var b=!1;try{b=a.frameElement==null}catch(e){}c.documentElement.doScroll&&b&&I()}}},isFunction:function(a){return d.type(a)==="function"},isArray:Array.isArray||function(a){return d.type(a)==="array"},isWindow:function(a){return a&&typeof a==="object"&&"setInterval"in a},isNaN:function(a){return a==null||!l.test(a)||isNaN(a)},type:function(a){return a==null?String(a):H[B.call(a)]||"object"},isPlainObject:function(a){if(!a||d.type(a)!=="object"||a.nodeType||d.isWindow(a))return!1;if(a.constructor&&!C.call(a,"constructor")&&!C.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a){}return c===b||C.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!=="string"||!b)return null;b=d.trim(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return a.JSON&&a.JSON.parse?a.JSON.parse(b):(new Function("return "+b))();d.error("Invalid JSON: "+b)},parseXML:function(b,c,e){a.DOMParser?(e=new DOMParser,c=e.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),e=c.documentElement,(!e||!e.nodeName||e.nodeName==="parsererror")&&d.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(a){if(a&&i.test(a)){var b=c.head||c.getElementsByTagName("head")[0]||c.documentElement,e=c.createElement("script");d.support.scriptEval()?e.appendChild(c.createTextNode(a)):e.text=a,b.insertBefore(e,b.firstChild),b.removeChild(e)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,e){var f,g=0,h=a.length,i=h===b||d.isFunction(a);if(e){if(i){for(f in a)if(c.apply(a[f],e)===!1)break}else for(;g<h;)if(c.apply(a[g++],e)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(var j=a[0];g<h&&c.call(j,g,j)!==!1;j=a[++g]){}return a},trim:F?function(a){return a==null?"":F.call(a)}:function(a){return a==null?"":(a+"").replace(j,"").replace(k,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var e=d.type(a);a.length==null||e==="string"||e==="function"||e==="regexp"||d.isWindow(a)?D.call(c,a):d.merge(c,a)}return c},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length==="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,b,c){var d=[],e;for(var f=0,g=a.length;f<g;f++)e=b(a[f],f,c),e!=null&&(d[d.length]=e);return d.concat.apply([],d)},guid:1,proxy:function(a,c,e){arguments.length===2&&(typeof c==="string"?(e=a,a=e[c],c=b):c&&!d.isFunction(c)&&(e=c,c=b)),!c&&a&&(c=function(){return a.apply(e||this,arguments)}),a&&(c.guid=a.guid=a.guid||c.guid||d.guid++);return c},access:function(a,c,e,f,g,h){var i=a.length;if(typeof c==="object"){for(var j in c)d.access(a,j,c[j],f,g,e);return a}if(e!==b){f=!h&&f&&d.isFunction(e);for(var k=0;k<i;k++)g(a[k],c,f?e.call(a[k],k,g(a[k],c)):e,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},_Deferred:function(){var a=[],b,c,e,f={done:function(){if(!e){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=d.type(i),j==="array"?f.done.apply(f,i):j==="function"&&a.push(i);k&&f.resolveWith(k[0],k[1])}return this},resolveWith:function(d,f){if(!e&&!b&&!c){c=1;try{while(a[0])a.shift().apply(d,f)}catch(g){throw g}finally{b=[d,f],c=0}}return this},resolve:function(){f.resolveWith(d.isFunction(this.promise)?this.promise():this,arguments);return this},isResolved:function(){return c||b},cancel:function(){e=1,a=[];return this}};return f},Deferred:function(a){var b=d._Deferred(),c=d._Deferred(),e;d.extend(b,{then:function(a,c){b.done(a).fail(c);return this},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,promise:function(a){if(a==null){if(e)return e;e=a={}}var c=z.length;while(c--)a[z[c]]=b[z[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){var b=arguments.length,c=b<=1&&a&&d.isFunction(a.promise)?a:d.Deferred(),e=c.promise();if(b>1){var f=E.call(arguments,0),g=b,h=function(a){return function(b){f[a]=arguments.length>1?E.call(arguments,0):b,--g||c.resolveWith(e,f)}};while(b--)a=f[b],a&&d.isFunction(a.promise)?a.promise().then(h(b),c.reject):--g;g||c.resolveWith(e,f)}else c!==a&&c.resolve(a);return e},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}d.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.subclass=this.subclass,a.fn.init=function b(b,c){c&&c instanceof d&&!(c instanceof a)&&(c=a(c));return d.fn.init.call(this,b,c,e)},a.fn.init.prototype=a.fn;var e=a(c);return a},browser:{}}),y=d._Deferred(),d.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){H["[object "+b+"]"]=b.toLowerCase()}),w=d.uaMatch(v),w.browser&&(d.browser[w.browser]=!0,d.browser.version=w.version),d.browser.webkit&&(d.browser.safari=!0),G&&(d.inArray=function(a,b){return G.call(b,a)}),i.test(" ")&&(j=/^[\s\xA0]+/,k=/[\s\xA0]+$/),g=d(c),c.addEventListener?A=function(){c.removeEventListener("DOMContentLoaded",A,!1),d.ready()}:c.attachEvent&&(A=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",A),d.ready())});return d}();(function(){d.support={};var b=c.createElement("div");b.style.display="none",b.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var e=b.getElementsByTagName("*"),f=b.getElementsByTagName("a")[0],g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=b.getElementsByTagName("input")[0];if(e&&e.length&&f){d.support={leadingWhitespace:b.firstChild.nodeType===3,tbody:!b.getElementsByTagName("tbody").length,htmlSerialize:!!b.getElementsByTagName("link").length,style:/red/.test(f.getAttribute("style")),hrefNormalized:f.getAttribute("href")==="/a",opacity:/^0.55$/.test(f.style.opacity),cssFloat:!!f.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,deleteExpando:!0,optDisabled:!1,checkClone:!1,noCloneEvent:!0,noCloneChecked:!0,boxModel:null,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableHiddenOffsets:!0},i.checked=!0,d.support.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,d.support.optDisabled=!h.disabled;var j=null;d.support.scriptEval=function(){if(j===null){var b=c.documentElement,e=c.createElement("script"),f="script"+d.now();try{e.appendChild(c.createTextNode("window."+f+"=1;"))}catch(g){}b.insertBefore(e,b.firstChild),a[f]?(j=!0,delete a[f]):j=!1,b.removeChild(e),b=e=f=null}return j};try{delete b.test}catch(k){d.support.deleteExpando=!1}!b.addEventListener&&b.attachEvent&&b.fireEvent&&(b.attachEvent("onclick",function l(){d.support.noCloneEvent=!1,b.detachEvent("onclick",l)}),b.cloneNode(!0).fireEvent("onclick")),b=c.createElement("div"),b.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";var m=c.createDocumentFragment();m.appendChild(b.firstChild),d.support.checkClone=m.cloneNode(!0).cloneNode(!0).lastChild.checked,d(function(){var a=c.createElement("div"),b=c.getElementsByTagName("body")[0];if(b){a.style.width=a.style.paddingLeft="1px",b.appendChild(a),d.boxModel=d.support.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,d.support.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",d.support.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";var e=a.getElementsByTagName("td");d.support.reliableHiddenOffsets=e[0].offsetHeight===0,e[0].style.display="",e[1].style.display="none",d.support.reliableHiddenOffsets=d.support.reliableHiddenOffsets&&e[0].offsetHeight===0,a.innerHTML="",b.removeChild(a).style.display="none",a=e=null}});var n=function(a){var b=c.createElement("div");a="on"+a;if(!b.attachEvent)return!0;var d=a in b;d||(b.setAttribute(a,"return;"),d=typeof b[a]==="function"),b=null;return d};d.support.submitBubbles=n("submit"),d.support.changeBubbles=n("change"),b=e=f=null}})();var e=/^(?:\{.*\}|\[.*\])$/;d.extend({cache:{},uuid:0,expando:"jQuery"+(d.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?d.cache[a[d.expando]]:a[d.expando];return!!a&&!g(a)},data:function(a,c,e,f){if(d.acceptData(a)){var g=d.expando,h=typeof c==="string",i,j=a.nodeType,k=j?d.cache:a,l=j?a[d.expando]:a[d.expando]&&d.expando;if((!l||f&&l&&!k[l][g])&&h&&e===b)return;l||(j?a[d.expando]=l=++d.uuid:l=d.expando),k[l]||(k[l]={},j||(k[l].toJSON=d.noop));if(typeof c==="object"||typeof c==="function")f?k[l][g]=d.extend(k[l][g],c):k[l]=d.extend(k[l],c);i=k[l],f&&(i[g]||(i[g]={}),i=i[g]),e!==b&&(i[c]=e);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[c]:i}},removeData:function(b,c,e){if(d.acceptData(b)){var f=d.expando,h=b.nodeType,i=h?d.cache:b,j=h?b[d.expando]:d.expando;if(!i[j])return;if(c){var k=e?i[j][f]:i[j];if(k){delete k[c];if(!g(k))return}}if(e){delete i[j][f];if(!g(i[j]))return}var l=i[j][f];d.support.deleteExpando||i!=a?delete i[j]:i[j]=null,l?(i[j]={},h||(i[j].toJSON=d.noop),i[j][f]=l):h&&(d.support.deleteExpando?delete b[d.expando]:b.removeAttribute?b.removeAttribute(d.expando):b[d.expando]=null)}},_data:function(a,b,c){return d.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=d.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),d.fn.extend({data:function(a,c){var e=null;if(typeof a==="undefined"){if(this.length){e=d.data(this[0]);if(this[0].nodeType===1){var g=this[0].attributes,h;for(var i=0,j=g.length;i<j;i++)h=g[i].name,h.indexOf("data-")===0&&(h=h.substr(5),f(this[0],h,e[h]))}}return e}if(typeof a==="object")return this.each(function(){d.data(this,a)});var k=a.split(".");k[1]=k[1]?"."+k[1]:"";if(c===b){e=this.triggerHandler("getData"+k[1]+"!",[k[0]]),e===b&&this.length&&(e=d.data(this[0],a),e=f(this[0],a,e));return e===b&&k[1]?this.data(k[0]):e}return this.each(function(){var b=d(this),e=[k[0],c];b.triggerHandler("setData"+k[1]+"!",e),d.data(this,a,c),b.triggerHandler("changeData"+k[1]+"!",e)})},removeData:function(a){return this.each(function(){d.removeData(this,a)})}}),d.extend({queue:function(a,b,c){if(a){b=(b||"fx")+"queue";var e=d._data(a,b);if(!c)return e||[];!e||d.isArray(c)?e=d._data(a,b,d.makeArray(c)):e.push(c);return e}},dequeue:function(a,b){b=b||"fx";var c=d.queue(a,b),e=c.shift();e==="inprogress"&&(e=c.shift()),e&&(b==="fx"&&c.unshift("inprogress"),e.call(a,function(){d.dequeue(a,b)})),c.length||d.removeData(a,b+"queue",!0)}}),d.fn.extend({queue:function(a,c){typeof a!=="string"&&(c=a,a="fx");if(c===b)return d.queue(this[0],a);return this.each(function(b){var e=d.queue(this,a,c);a==="fx"&&e[0]!=="inprogress"&&d.dequeue(this,a)})},dequeue:function(a){return this.each(function(){d.dequeue(this,a)})},delay:function(a,b){a=d.fx?d.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){d.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var h=/[\n\t\r]/g,i=/\s+/,j=/\r/g,k=/^(?:href|src|style)$/,l=/^(?:button|input)$/i,m=/^(?:button|input|object|select|textarea)$/i,n=/^a(?:rea)?$/i,o=/^(?:radio|checkbox)$/i;d.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"},d.fn.extend({attr:function(a,b){return d.access(this,a,b,!0,d.attr)},removeAttr:function(a,b){return this.each(function(){d.attr(this,a,""),this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.addClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"){var b=(a||"").split(i);for(var c=0,e=this.length;c<e;c++){var f=this[c];if(f.nodeType===1)if(f.className){var g=" "+f.className+" ",h=f.className;for(var j=0,k=b.length;j<k;j++)g.indexOf(" "+b[j]+" ")<0&&(h+=" "+b[j]);f.className=d.trim(h)}else f.className=a}}return this},removeClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.removeClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"||a===b){var c=(a||"").split(i);for(var e=0,f=this.length;e<f;e++){var g=this[e];if(g.nodeType===1&&g.className)if(a){var j=(" "+g.className+" ").replace(h," ");for(var k=0,l=c.length;k<l;k++)j=j.replace(" "+c[k]+" "," ");g.className=d.trim(j)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,e=typeof b==="boolean";if(d.isFunction(a))return this.each(function(c){var e=d(this);e.toggleClass(a.call(this,c,e.attr("class"),b),b)});return this.each(function(){if(c==="string"){var f,g=0,h=d(this),j=b,k=a.split(i);while(f=k[g++])j=e?j:!h.hasClass(f),h[j?"addClass":"removeClass"](f)}else if(c==="undefined"||c==="boolean")this.className&&d._data(this,"__className__",this.className),this.className=this.className||a===!1?"":d._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(h," ").indexOf(b)>-1)return!0;return!1},val:function(a){if(!arguments.length){var c=this[0];if(c){if(d.nodeName(c,"option")){var e=c.attributes.value;return!e||e.specified?c.value:c.text}if(d.nodeName(c,"select")){var f=c.selectedIndex,g=[],h=c.options,i=c.type==="select-one";if(f<0)return null;for(var k=i?f:0,l=i?f+1:h.length;k<l;k++){var m=h[k];if(m.selected&&(d.support.optDisabled?!m.disabled:m.getAttribute("disabled")===null)&&(!m.parentNode.disabled||!d.nodeName(m.parentNode,"optgroup"))){a=d(m).val();if(i)return a;g.push(a)}}if(i&&!g.length&&h.length)return d(h[f]).val();return g}if(o.test(c.type)&&!d.support.checkOn)return c.getAttribute("value")===null?"on":c.value;return(c.value||"").replace(j,"")}return b}var n=d.isFunction(a);return this.each(function(b){var c=d(this),e=a;if(this.nodeType===1){n&&(e=a.call(this,b,c.val())),e==null?e="":typeof e==="number"?e+="":d.isArray(e)&&(e=d.map(e,function(a){return a==null?"":a+""}));if(d.isArray(e)&&o.test(this.type))this.checked=d.inArray(c.val(),e)>=0;else if(d.nodeName(this,"select")){var f=d.makeArray(e);d("option",this).each(function(){this.selected=d.inArray(d(this).val(),f)>=0}),f.length||(this.selectedIndex=-1)}else this.value=e}})}}),d.extend({attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,e,f){if(!a||a.nodeType===3||a.nodeType===8||a.nodeType===2)return b;if(f&&c in d.attrFn)return d(a)[c](e);var g=a.nodeType!==1||!d.isXMLDoc(a),h=e!==b;c=g&&d.props[c]||c;if(a.nodeType===1){var i=k.test(c);if(c==="selected"&&!d.support.optSelected){var j=a.parentNode;j&&(j.selectedIndex,j.parentNode&&j.parentNode.selectedIndex)}if((c in a||a[c]!==b)&&g&&!i){h&&(c==="type"&&l.test(a.nodeName)&&a.parentNode&&d.error("type property can't be changed"),e===null?a.nodeType===1&&a.removeAttribute(c):a[c]=e);if(d.nodeName(a,"form")&&a.getAttributeNode(c))return a.getAttributeNode(c).nodeValue;if(c==="tabIndex"){var o=a.getAttributeNode("tabIndex");return o&&o.specified?o.value:m.test(a.nodeName)||n.test(a.nodeName)&&a.href?0:b}return a[c]}if(!d.support.style&&g&&c==="style"){h&&(a.style.cssText=""+e);return a.style.cssText}h&&a.setAttribute(c,""+e);if(!a.attributes[c]&&(a.hasAttribute&&!a.hasAttribute(c)))return b;var p=!d.support.hrefNormalized&&g&&i?a.getAttribute(c,2):a.getAttribute(c);return p===null?b:p}h&&(a[c]=e);return a[c]}});var p=/\.(.*)$/,q=/^(?:textarea|input|select)$/i,r=/\./g,s=/ /g,t=/[^\w\s.|`]/g,u=function(a){return a.replace(t,"\\$&")};d.event={add:function(c,e,f,g){if(c.nodeType!==3&&c.nodeType!==8){try{d.isWindow(c)&&(c!==a&&!c.frameElement)&&(c=a)}catch(h){}if(f===!1)f=v;else if(!f)return;var i,j;f.handler&&(i=f,f=i.handler),f.guid||(f.guid=d.guid++);var k=d._data(c);if(!k)return;var l=k.events,m=k.handle;l||(k.events=l={}),m||(k.handle=m=function(){return typeof d!=="undefined"&&!d.event.triggered?d.event.handle.apply(m.elem,arguments):b}),m.elem=c,e=e.split(" ");var n,o=0,p;while(n=e[o++]){j=i?d.extend({},i):{handler:f,data:g},n.indexOf(".")>-1?(p=n.split("."),n=p.shift(),j.namespace=p.slice(0).sort().join(".")):(p=[],j.namespace=""),j.type=n,j.guid||(j.guid=f.guid);var q=l[n],r=d.event.special[n]||{};if(!q){q=l[n]=[];if(!r.setup||r.setup.call(c,g,p,m)===!1)c.addEventListener?c.addEventListener(n,m,!1):c.attachEvent&&c.attachEvent("on"+n,m)}r.add&&(r.add.call(c,j),j.handler.guid||(j.handler.guid=f.guid)),q.push(j),d.event.global[n]=!0}c=null}},global:{},remove:function(a,c,e,f){if(a.nodeType!==3&&a.nodeType!==8){e===!1&&(e=v);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=d.hasData(a)&&d._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(e=c.handler,c=c.type);if(!c||typeof c==="string"&&c.charAt(0)==="."){c=c||"";for(h in t)d.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+d.map(m.slice(0).sort(),u).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!e){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))d.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=d.event.special[h]||{};for(j=f||0;j<p.length;j++){q=p[j];if(e.guid===q.guid){if(l||n.test(q.namespace))f==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(f!=null)break}}if(p.length===0||f!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&d.removeEvent(a,h,s.handle),g=null,delete t[h]}if(d.isEmptyObject(t)){var w=s.handle;w&&(w.elem=null),delete s.events,delete s.handle,d.isEmptyObject(s)&&d.removeData(a,b,!0)}}},trigger:function(a,c,e){var f=a.type||a,g=arguments[3];if(!g){a=typeof a==="object"?a[d.expando]?a:d.extend(d.Event(f),a):d.Event(f),f.indexOf("!")>=0&&(a.type=f=f.slice(0,-1),a.exclusive=!0),e||(a.stopPropagation(),d.event.global[f]&&d.each(d.cache,function(){var b=d.expando,e=this[b];e&&e.events&&e.events[f]&&d.event.trigger(a,c,e.handle.elem)}));if(!e||e.nodeType===3||e.nodeType===8)return b;a.result=b,a.target=e,c=d.makeArray(c),c.unshift(a)}a.currentTarget=e;var h=d._data(e,"handle");h&&h.apply(e,c);var i=e.parentNode||e.ownerDocument;try{e&&e.nodeName&&d.noData[e.nodeName.toLowerCase()]||e["on"+f]&&e["on"+f].apply(e,c)===!1&&(a.result=!1,a.preventDefault())}catch(j){}if(!a.isPropagationStopped()&&i)d.event.trigger(a,c,i,!0);else if(!a.isDefaultPrevented()){var k,l=a.target,m=f.replace(p,""),n=d.nodeName(l,"a")&&m==="click",o=d.event.special[m]||{};if((!o._default||o._default.call(e,a)===!1)&&!n&&!(l&&l.nodeName&&d.noData[l.nodeName.toLowerCase()])){try{l[m]&&(k=l["on"+m],k&&(l["on"+m]=null),d.event.triggered=!0,l[m]())}catch(q){}k&&(l["on"+m]=k),d.event.triggered=!1}}},handle:function(c){var e,f,g,h,i,j=[],k=d.makeArray(arguments);c=k[0]=d.event.fix(c||a.event),c.currentTarget=this,e=c.type.indexOf(".")<0&&!c.exclusive,e||(g=c.type.split("."),c.type=g.shift(),j=g.slice(0).sort(),h=new RegExp("(^|\\.)"+j.join("\\.(?:.*\\.)?")+"(\\.|$)")),c.namespace=c.namespace||j.join("."),i=d._data(this,"events"),f=(i||{})[c.type];if(i&&f){f=f.slice(0);for(var l=0,m=f.length;l<m;l++){var n=f[l];if(e||h.test(n.namespace)){c.handler=n.handler,c.data=n.data,c.handleObj=n;var o=n.handler.apply(this,k);o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[d.expando])return a;var e=a;a=d.Event(e);for(var f=this.props.length,g;f;)g=this.props[--f],a[g]=e[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=c.documentElement,i=c.body;a.pageX=a.clientX+(h&&h.scrollLeft||i&&i.scrollLeft||0)-(h&&h.clientLeft||i&&i.clientLeft||0),a.pageY=a.clientY+(h&&h.scrollTop||i&&i.scrollTop||0)-(h&&h.clientTop||i&&i.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:d.proxy,special:{ready:{setup:d.bindReady,teardown:d.noop},live:{add:function(a){d.event.add(this,F(a.origType,a.selector),d.extend({},a,{handler:E,guid:a.handler.guid}))},remove:function(a){d.event.remove(this,F(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){d.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},d.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},d.Event=function(a){if(!this.preventDefault)return new d.Event(a);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?w:v):this.type=a,this.timeStamp=d.now(),this[d.expando]=!0},d.Event.prototype={preventDefault:function(){this.isDefaultPrevented=w;var a=this.originalEvent;a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=w;var a=this.originalEvent;a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=w,this.stopPropagation()},isDefaultPrevented:v,isPropagationStopped:v,isImmediatePropagationStopped:v};var x=function(a){var b=a.relatedTarget;try{if(b!==c&&!b.parentNode)return;while(b&&b!==this)b=b.parentNode;b!==this&&(a.type=a.data,d.event.handle.apply(this,arguments))}catch(e){}},y=function(a){a.type=a.data,d.event.handle.apply(this,arguments)};d.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){d.event.special[a]={setup:function(c){d.event.add(this,b,c&&c.selector?y:x,a)},teardown:function(a){d.event.remove(this,b,a&&a.selector?y:x)}}}),d.support.submitBubbles||(d.event.special.submit={setup:function(a,b){if(this.nodeName&&this.nodeName.toLowerCase()!=="form")d.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&d(b).closest("form").length&&C("submit",this,arguments)}),d.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&d(b).closest("form").length&&a.keyCode===13&&C("submit",this,arguments)});else return!1},teardown:function(a){d.event.remove(this,".specialSubmit")}});if(!d.support.changeBubbles){var z,A=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?d.map(a.options,function(a){return a.selected}).join("-"):"":a.nodeName.toLowerCase()==="select"&&(c=a.selectedIndex);return c},B=function B(a){var c=a.target,e,f;if(q.test(c.nodeName)&&!c.readOnly){e=d._data(c,"_change_data"),f=A(c),(a.type!=="focusout"||c.type!=="radio")&&d._data(c,"_change_data",f);if(e===b||f===e)return;if(e!=null||f)a.type="change",a.liveFired=b,d.event.trigger(a,arguments[1],c)}};d.event.special.change={filters:{focusout:B,beforedeactivate:B,click:function(a){var b=a.target,c=b.type;(c==="radio"||c==="checkbox"||b.nodeName.toLowerCase()==="select")&&B.call(this,a)},keydown:function(a){var b=a.target,c=b.type;(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&B.call(this,a)},beforeactivate:function(a){var b=a.target;d._data(b,"_change_data",A(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in z)d.event.add(this,c+".specialChange",z[c]);return q.test(this.nodeName)},teardown:function(a){d.event.remove(this,".specialChange");return q.test(this.nodeName)}},z=d.event.special.change.filters,z.focus=z.beforeactivate}c.addEventListener&&d.each({focus:"focusin",blur:"focusout"},function(a,b){function c(a){a=d.event.fix(a),a.type=b;return d.event.handle.call(this,a)}d.event.special[b]={setup:function(){this.addEventListener(a,c,!0)},teardown:function(){this.removeEventListener(a,c,!0)}}}),d.each(["bind","one"],function(a,c){d.fn[c]=function(a,e,f){if(typeof a==="object"){for(var g in a)this[c](g,e,a[g],f);return this}if(d.isFunction(e)||e===!1)f=e,e=b;var h=c==="one"?d.proxy(f,function(a){d(this).unbind(a,h);return f.apply(this,arguments)}):f;if(a==="unload"&&c!=="one")this.one(a,e,f);else for(var i=0,j=this.length;i<j;i++)d.event.add(this[i],a,h,e);return this}}),d.fn.extend({unbind:function(a,b){if(typeof a!=="object"||a.preventDefault)for(var e=0,f=this.length;e<f;e++)d.event.remove(this[e],a,b);else for(var c in a)this.unbind(c,a[c]);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){d.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){var c=d.Event(a);c.preventDefault(),c.stopPropagation(),d.event.trigger(c,b,this[0]);return c.result}},toggle:function(a){var b=arguments,c=1;while(c<b.length)d.proxy(a,b[c++]);return this.click(d.proxy(a,function(e){var f=(d._data(this,"lastToggle"+a.guid)||0)%c;d._data(this,"lastToggle"+a.guid,f+1),e.preventDefault();return b[f].apply(this,arguments)||!1}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var D={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};d.each(["live","die"],function(a,c){d.fn[c]=function(a,e,f,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:d(this.context);if(typeof a==="object"&&!a.preventDefault){for(var o in a)n[c](o,e,a[o],m);return this}d.isFunction(e)&&(f=e,e=b),a=(a||"").split(" ");while((h=a[i++])!=null){j=p.exec(h),k="",j&&(k=j[0],h=h.replace(p,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,h==="focus"||h==="blur"?(a.push(D[h]+k),h=h+k):h=(D[h]||h)+k;if(c==="live")for(var q=0,r=n.length;q<r;q++)d.event.add(n[q],"live."+F(h,m),{data:e,selector:m,handler:f,origType:h,origHandler:f,preType:l});else n.unbind("live."+F(h,m),f)}return this}}),d.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){d.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},d.attrFn&&(d.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!=="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,e,g){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!=="string")return e;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(f.call(n)==="[object Array]")if(u)if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&e.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&e.push(j[t]);else e.push.apply(e,n);else p(n,e);o&&(k(o,h,e,g),k.uniqueSort(e));return e};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!=="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(f){if(f===!0)continue}else g=o=!0}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b==="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1){}a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b==="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!=="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!=="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!=="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){return"text"===a.getAttribute("type")},radio:function(a){return"radio"===a.type},checkbox:function(a){return"checkbox"===a.type},file:function(a){return"file"===a.type},password:function(a){return"password"===a.type},submit:function(a){return"submit"===a.type},image:function(a){return"image"===a.type},reset:function(a){return"reset"===a.type},button:function(a){return"button"===a.type||a.nodeName.toLowerCase()==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(f.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length==="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(a===b){g=!0;return 0}if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!=="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!=="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!=="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!=="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector,d=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(e){d=!0}b&&(k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(d||!l.match.PSEUDO.test(c)&&!/!=/.test(c))return b.call(a,c)}catch(e){}return k(c,null,null,[a]).length>0})}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!=="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};d.find=k,d.expr=k.selectors,d.expr[":"]=d.expr.filters,d.unique=k.uniqueSort,d.text=k.getText,d.isXMLDoc=k.isXML,d.contains=k.contains}();var G=/Until$/,H=/^(?:parents|prevUntil|prevAll)/,I=/,/,J=/^.[^:#\[\.,]*$/,K=Array.prototype.slice,L=d.expr.match.POS,M={children:!0,contents:!0,next:!0,prev:!0};d.fn.extend({find:function(a){var b=this.pushStack("","find",a),c=0;for(var e=0,f=this.length;e<f;e++){c=b.length,d.find(a,this[e],b);if(e>0)for(var g=c;g<b.length;g++)for(var h=0;h<c;h++)if(b[h]===b[g]){b.splice(g--,1);break}}return b},has:function(a){var b=d(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(d.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(O(this,a,!1),"not",a)},filter:function(a){return this.pushStack(O(this,a,!0),"filter",a)},is:function(a){return!!a&&d.filter(a,this).length>0},closest:function(a,b){var c=[],e,f,g=this[0];if(d.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(e=0,f=a.length;e<f;e++)i=a[e],j[i]||(j[i]=d.expr.match.POS.test(i)?d(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:d(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=L.test(a)?d(a,b||this.context):null;for(e=0,f=this.length;e<f;e++){g=this[e];while(g){if(l?l.index(g)>-1:d.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b)break}}c=c.length>1?d.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a==="string")return d.inArray(this[0],a?d(a):this.parent().children());return d.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a==="string"?d(a,b):d.makeArray(a),e=d.merge(this.get(),c);return this.pushStack(N(c[0])||N(e[0])?e:d.unique(e))},andSelf:function(){return this.add(this.prevObject)}}),d.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return d.dir(a,"parentNode")},parentsUntil:function(a,b,c){return d.dir(a,"parentNode",c)},next:function(a){return d.nth(a,2,"nextSibling")},prev:function(a){return d.nth(a,2,"previousSibling")},nextAll:function(a){return d.dir(a,"nextSibling")},prevAll:function(a){return d.dir(a,"previousSibling")},nextUntil:function(a,b,c){return d.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return d.dir(a,"previousSibling",c)},siblings:function(a){return d.sibling(a.parentNode.firstChild,a)},children:function(a){return d.sibling(a.firstChild)},contents:function(a){return d.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:d.makeArray(a.childNodes)}},function(a,b){d.fn[a]=function(c,e){var f=d.map(this,b,c),g=K.call(arguments);G.test(a)||(e=c),e&&typeof e==="string"&&(f=d.filter(e,f)),f=this.length>1&&!M[a]?d.unique(f):f,(this.length>1||I.test(e))&&H.test(a)&&(f=f.reverse());return this.pushStack(f,a,g.join(","))}}),d.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?d.find.matchesSelector(b[0],a)?[b[0]]:[]:d.find.matches(a,b)},dir:function(a,c,e){var f=[],g=a[c];while(g&&g.nodeType!==9&&(e===b||g.nodeType!==1||!d(g).is(e)))g.nodeType===1&&f.push(g),g=g[c];return f},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var P=/ jQuery\d+="(?:\d+|null)"/g,Q=/^\s+/,R=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,S=/<([\w:]+)/,T=/<tbody/i,U=/<|&#?\w+;/,V=/<(?:script|object|embed|option|style)/i,W=/checked\s*(?:[^=]|=\s*.checked.)/i,X={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};X.optgroup=X.option,X.tbody=X.tfoot=X.colgroup=X.caption=X.thead,X.th=X.td,d.support.htmlSerialize||(X._default=[1,"div<div>","</div>"]),d.fn.extend({text:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.text(a.call(this,b,c.text()))});if(typeof a!=="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return d.text(this)},wrapAll:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapAll(a.call(this,b))});if(this[0]){var b=d(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapInner(a.call(this,b))});return this.each(function(){var b=d(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){d(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){d.nodeName(this,"body")||d(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=d(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,d(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,e;(e=this[c])!=null;c++)if(!a||d.filter(a,[e]).length)!b&&e.nodeType===1&&(d.cleanData(e.getElementsByTagName("*")),d.cleanData([e])),e.parentNode&&e.parentNode.removeChild(e);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&d.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return d.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(P,""):null;if(typeof a!=="string"||V.test(a)||!d.support.leadingWhitespace&&Q.test(a)||X[(S.exec(a)||["",""])[1].toLowerCase()])d.isFunction(a)?this.each(function(b){var c=d(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);else{a=a.replace(R,"<$1></$2>");try{for(var c=0,e=this.length;c<e;c++)this[c].nodeType===1&&(d.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(f){this.empty().append(a)}}return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(d.isFunction(a))return this.each(function(b){var c=d(this),e=c.html();c.replaceWith(a.call(this,b,e))});typeof a!=="string"&&(a=d(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;d(this).remove(),b?d(b).before(a):d(c).append(a)})}return this.pushStack(d(d.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,e){var f,g,h,i,j=a[0],k=[];if(!d.support.checkClone&&arguments.length===3&&typeof j==="string"&&W.test(j))return this.each(function(){d(this).domManip(a,c,e,!0)});if(d.isFunction(j))return this.each(function(f){var g=d(this);a[0]=j.call(this,f,c?g.html():b),g.domManip(a,c,e)});if(this[0]){i=j&&j.parentNode,d.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?f={fragment:i}:f=d.buildFragment(a,this,k),h=f.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&d.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)e.call(c?Y(this[l],g):this[l],f.cacheable||m>1&&l<n?d.clone(h,!0,!0):h)}k.length&&d.each(k,ba)}return this}}),d.buildFragment=function(a,b,e){var f,g,h,i=b&&b[0]?b[0].ownerDocument||b[0]:c;a.length===1&&typeof a[0]==="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!V.test(a[0])&&(d.support.checkClone||!W.test(a[0]))&&(g=!0,h=d.fragments[a[0]],h&&(h!==1&&(f=h))),f||(f=i.createDocumentFragment(),d.clean(a,i,f,e)),g&&(d.fragments[a[0]]=h?f:1);return{fragment:f,cacheable:g}},d.fragments={},d.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){d.fn[a]=function(c){var e=[],f=d(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&f.length===1){f[b](this[0]);return this}for(var h=0,i=f.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();d(f[h])[b](j),e=e.concat(j)}return this.pushStack(e,a,f.selector)}}),d.extend({clone:function(a,b,c){var e=a.cloneNode(!0),f,g,h;if((!d.support.noCloneEvent||!d.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!d.isXMLDoc(a)){$(a,e),f=_(a),g=_(e);for(h=0;f[h];++h)$(f[h],g[h])}if(b){Z(a,e);if(c){f=_(a),g=_(e);for(h=0;f[h];++h)Z(f[h],g[h])}}return e},clean:function(a,b,e,f){b=b||c,typeof b.createElement==="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var g=[];for(var h=0,i;(i=a[h])!=null;h++){typeof i==="number"&&(i+="");if(!i)continue;if(typeof i!=="string"||U.test(i)){if(typeof i==="string"){i=i.replace(R,"<$1></$2>");var j=(S.exec(i)||["",""])[1].toLowerCase(),k=X[j]||X._default,l=k[0],m=b.createElement("div");m.innerHTML=k[1]+i+k[2];while(l--)m=m.lastChild;if(!d.support.tbody){var n=T.test(i),o=j==="table"&&!n?m.firstChild&&m.firstChild.childNodes:k[1]==="<table>"&&!n?m.childNodes:[];for(var p=o.length-1;p>=0;--p)d.nodeName(o[p],"tbody")&&!o[p].childNodes.length&&o[p].parentNode.removeChild(o[p])}!d.support.leadingWhitespace&&Q.test(i)&&m.insertBefore(b.createTextNode(Q.exec(i)[0]),m.firstChild),i=m.childNodes}}else i=b.createTextNode(i);i.nodeType?g.push(i):g=d.merge(g,i)}if(e)for(h=0;g[h];h++)!f||!d.nodeName(g[h],"script")||g[h].type&&g[h].type.toLowerCase()!=="text/javascript"?(g[h].nodeType===1&&g.splice.apply(g,[h+1,0].concat(d.makeArray(g[h].getElementsByTagName("script")))),e.appendChild(g[h])):f.push(g[h].parentNode?g[h].parentNode.removeChild(g[h]):g[h]);return g},cleanData:function(a){var b,c,e=d.cache,f=d.expando,g=d.event.special,h=d.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&d.noData[j.nodeName.toLowerCase()])continue;c=j[d.expando];if(c){b=e[c]&&e[c][f];if(b&&b.events){for(var k in b.events)g[k]?d.event.remove(j,k):d.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[d.expando]:j.removeAttribute&&j.removeAttribute(d.expando),delete e[c]}}}});var bb=/alpha\([^)]*\)/i,bc=/opacity=([^)]*)/,bd=/-([a-z])/ig,be=/([A-Z])/g,bf=/^-?\d+(?:px)?$/i,bg=/^-?\d/,bh={position:"absolute",visibility:"hidden",display:"block"},bi=["Left","Right"],bj=["Top","Bottom"],bk,bl,bm,bn=function(a,b){return b.toUpperCase()};d.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return d.access(this,a,c,!0,function(a,c,e){return e!==b?d.style(a,c,e):d.css(a,c)})},d.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bk(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{zIndex:!0,fontWeight:!0,opacity:!0,zoom:!0,lineHeight:!0},cssProps:{"float":d.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,e,f){if(a&&a.nodeType!==3&&a.nodeType!==8&&a.style){var g,h=d.camelCase(c),i=a.style,j=d.cssHooks[h];c=d.cssProps[h]||h;if(e===b){if(j&&"get"in j&&(g=j.get(a,!1,f))!==b)return g;return i[c]}if(typeof e==="number"&&isNaN(e)||e==null)return;typeof e==="number"&&!d.cssNumber[h]&&(e+="px");if(!j||!("set"in j)||(e=j.set(a,e))!==b)try{i[c]=e}catch(k){}}},css:function(a,c,e){var f,g=d.camelCase(c),h=d.cssHooks[g];c=d.cssProps[g]||g;if(h&&"get"in h&&(f=h.get(a,!0,e))!==b)return f;if(bk)return bk(a,c,g)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]},camelCase:function(a){return a.replace(bd,bn)}}),d.curCSS=d.css,d.each(["height","width"],function(a,b){d.cssHooks[b]={get:function(a,c,e){var f;if(c){a.offsetWidth!==0?f=bo(a,b,e):d.swap(a,bh,function(){f=bo(a,b,e)});if(f<=0){f=bk(a,b,b),f==="0px"&&bm&&(f=bm(a,b,b));if(f!=null)return f===""||f==="auto"?"0px":f}if(f<0||f==null){f=a.style[b];return f===""||f==="auto"?"0px":f}return typeof f==="string"?f:f+"px"}},set:function(a,b){if(!bf.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),d.support.opacity||(d.cssHooks.opacity={get:function(a,b){return bc.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style;c.zoom=1;var e=d.isNaN(b)?"":"alpha(opacity="+b*100+")",f=c.filter||"";c.filter=bb.test(f)?f.replace(bb,e):c.filter+" "+e}}),c.defaultView&&c.defaultView.getComputedStyle&&(bl=function(a,c,e){var f,g,h;e=e.replace(be,"-$1").toLowerCase();if(!(g=a.ownerDocument.defaultView))return b;if(h=g.getComputedStyle(a,null))f=h.getPropertyValue(e),f===""&&!d.contains(a.ownerDocument.documentElement,a)&&(f=d.style(a,e));return f}),c.documentElement.currentStyle&&(bm=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bf.test(d)&&bg.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bk=bl||bm,d.expr&&d.expr.filters&&(d.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!d.support.reliableHiddenOffsets&&(a.style.display||d.css(a,"display"))==="none"},d.expr.filters.visible=function(a){return!d.expr.filters.hidden(a)});var bp=/%20/g,bq=/\[\]$/,br=/\r?\n/g,bs=/#.*$/,bt=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bu=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bv=/(?:^file|^widget|\-extension):$/,bw=/^(?:GET|HEAD)$/,bx=/^\/\//,by=/\?/,bz=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bA=/^(?:select|textarea)/i,bB=/\s+/,bC=/([?&])_=[^&]*/,bD=/(^|\-)([a-z])/g,bE=function(a,b,c){return b+c.toUpperCase()},bF=/^([\w\+\.\-]+:)\/\/([^\/?#:]*)(?::(\d+))?/,bG=d.fn.load,bH={},bI={},bJ,bK;try{bJ=c.location.href}catch(bL){bJ=c.createElement("a"),bJ.href="",bJ=bJ.href}bK=bF.exec(bJ.toLowerCase()),d.fn.extend({load:function(a,c,e){if(typeof a!=="string"&&bG)return bG.apply(this,arguments);if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var g=a.slice(f,a.length);a=a.slice(0,f)}var h="GET";c&&(d.isFunction(c)?(e=c,c=b):typeof c==="object"&&(c=d.param(c,d.ajaxSettings.traditional),h="POST"));var i=this;d.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?d("<div>").append(c.replace(bz,"")).find(g):c)),e&&i.each(e,[c,b,a])}});return this},serialize:function(){return d.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?d.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bA.test(this.nodeName)||bu.test(this.type))}).map(function(a,b){var c=d(this).val();return c==null?null:d.isArray(c)?d.map(c,function(a,c){return{name:b.name,value:a.replace(br,"\r\n")}}):{name:b.name,value:c.replace(br,"\r\n")}}).get()}}),d.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){d.fn[b]=function(a){return this.bind(b,a)}}),d.each(["get","post"],function(a,c){d[c]=function(a,e,f,g){d.isFunction(e)&&(g=g||f,f=e,e=b);return d.ajax({type:c,url:a,data:e,success:f,dataType:g})}}),d.extend({getScript:function(a,c){return d.get(a,b,c,"script")},getJSON:function(a,b,c){return d.get(a,b,c,"json")},ajaxSetup:function(a,b){b?d.extend(!0,a,d.ajaxSettings,b):(b=a,a=d.extend(!0,d.ajaxSettings,b));for(var c in {context:1,url:1})c in b?a[c]=b[c]:c in d.ajaxSettings&&(a[c]=d.ajaxSettings[c]);return a},ajaxSettings:{url:bJ,isLocal:bv.test(bK[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":d.parseJSON,"text xml":d.parseXML}},ajaxPrefilter:bM(bH),ajaxTransport:bM(bI),ajax:function(a,c){function v(a,c,l,n){if(r!==2){r=2,p&&clearTimeout(p),o=b,m=n||"",u.readyState=a?4:0;var q,t,v,w=l?bP(e,u,l):b,x,y;if(a>=200&&a<300||a===304){if(e.ifModified){if(x=u.getResponseHeader("Last-Modified"))d.lastModified[k]=x;if(y=u.getResponseHeader("Etag"))d.etag[k]=y}if(a===304)c="notmodified",q=!0;else try{t=bQ(e,w),c="success",q=!0}catch(z){c="parsererror",v=z}}else{v=c;if(!c||a)c="error",a<0&&(a=0)}u.status=a,u.statusText=c,q?h.resolveWith(f,[t,c,u]):h.rejectWith(f,[u,c,v]),u.statusCode(j),j=b,s&&g.trigger("ajax"+(q?"Success":"Error"),[u,e,q?t:v]),i.resolveWith(f,[u,c]),s&&(g.trigger("ajaxComplete",[u,e]),--d.active||d.event.trigger("ajaxStop"))}}typeof a==="object"&&(c=a,a=b),c=c||{};var e=d.ajaxSetup({},c),f=e.context||e,g=f!==e&&(f.nodeType||f instanceof d)?d(f):d.event,h=d.Deferred(),i=d._Deferred(),j=e.statusCode||{},k,l={},m,n,o,p,q,r=0,s,t,u={readyState:0,setRequestHeader:function(a,b){r||(l[a.toLowerCase().replace(bD,bE)]=b);return this},getAllResponseHeaders:function(){return r===2?m:null},getResponseHeader:function(a){var c;if(r===2){if(!n){n={};while(c=bt.exec(m))n[c[1].toLowerCase()]=c[2]}c=n[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){r||(e.mimeType=a);return this},abort:function(a){a=a||"abort",o&&o.abort(a),v(0,a);return this}};h.promise(u),u.success=u.done,u.error=u.fail,u.complete=i.done,u.statusCode=function(a){if(a){var b;if(r<2)for(b in a)j[b]=[j[b],a[b]];else b=a[u.status],u.then(b,b)}return this},e.url=((a||e.url)+"").replace(bs,"").replace(bx,bK[1]+"//"),e.dataTypes=d.trim(e.dataType||"*").toLowerCase().split(bB),e.crossDomain||(q=bF.exec(e.url.toLowerCase()),e.crossDomain=q&&(q[1]!=bK[1]||q[2]!=bK[2]||(q[3]||(q[1]==="http:"?80:443))!=(bK[3]||(bK[1]==="http:"?80:443)))),e.data&&e.processData&&typeof e.data!=="string"&&(e.data=d.param(e.data,e.traditional)),bN(bH,e,c,u);if(r===2)return!1;s=e.global,e.type=e.type.toUpperCase(),e.hasContent=!bw.test(e.type),s&&d.active++===0&&d.event.trigger("ajaxStart");if(!e.hasContent){e.data&&(e.url+=(by.test(e.url)?"&":"?")+e.data),k=e.url;if(e.cache===!1){var w=d.now(),x=e.url.replace(bC,"$1_="+w);e.url=x+(x===e.url?(by.test(e.url)?"&":"?")+"_="+w:"")}}if(e.data&&e.hasContent&&e.contentType!==!1||c.contentType)l["Content-Type"]=e.contentType;e.ifModified&&(k=k||e.url,d.lastModified[k]&&(l["If-Modified-Since"]=d.lastModified[k]),d.etag[k]&&(l["If-None-Match"]=d.etag[k])),l.Accept=e.dataTypes[0]&&e.accepts[e.dataTypes[0]]?e.accepts[e.dataTypes[0]]+(e.dataTypes[0]!=="*"?", */*; q=0.01":""):e.accepts["*"];for(t in e.headers)u.setRequestHeader(t,e.headers[t]);if(e.beforeSend&&(e.beforeSend.call(f,u,e)===!1||r===2)){u.abort();return!1}for(t in {success:1,error:1,complete:1})u[t](e[t]);o=bN(bI,e,c,u);if(o){u.readyState=1,s&&g.trigger("ajaxSend",[u,e]),e.async&&e.timeout>0&&(p=setTimeout(function(){u.abort("timeout")},e.timeout));try{r=1,o.send(l,v)}catch(y){status<2?v(-1,y):d.error(y)}}else v(-1,"No Transport");return u},param:function(a,c){var e=[],f=function(a,b){b=d.isFunction(b)?b():b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=d.ajaxSettings.traditional);if(d.isArray(a)||a.jquery&&!d.isPlainObject(a))d.each(a,function(){f(this.name,this.value)});else for(var g in a)bO(g,a[g],c,f);return e.join("&").replace(bp,"+")}}),d.extend({active:0,lastModified:{},etag:{}});var bR=d.now(),bS=/(\=)\?(&|$)|()\?\?()/i;d.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return d.expando+"_"+bR++}}),d.ajaxPrefilter("json jsonp",function(b,c,e){var f=typeof b.data==="string";if(b.dataTypes[0]==="jsonp"||c.jsonpCallback||c.jsonp!=null||b.jsonp!==!1&&(bS.test(b.url)||f&&bS.test(b.data))){var g,h=b.jsonpCallback=d.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2",m=function(){a[h]=i,g&&d.isFunction(i)&&a[h](g[0])};b.jsonp!==!1&&(j=j.replace(bS,l),b.url===j&&(f&&(k=k.replace(bS,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},e.then(m,m),b.converters["script json"]=function(){g||d.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),d.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){d.globalEval(a);return a}}}),d.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),d.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var bT=d.now(),bU,bV;d.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&bX()||bY()}:bX,bV=d.ajaxSettings.xhr(),d.support.ajax=!!bV,d.support.cors=bV&&"withCredentials"in bV,bV=b,d.support.ajax&&d.ajaxTransport(function(a){if(!a.crossDomain||d.support.cors){var c;return{send:function(e,f){var g=a.xhr(),h,i;a.username?g.open(a.type,a.url,a.async,a.username,a.password):g.open(a.type,a.url,a.async);if(a.xhrFields)for(i in a.xhrFields)g[i]=a.xhrFields[i];a.mimeType&&g.overrideMimeType&&g.overrideMimeType(a.mimeType),(!a.crossDomain||a.hasContent)&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(i in e)g.setRequestHeader(i,e[i])}catch(j){}g.send(a.hasContent&&a.data||null),c=function(e,i){var j,k,l,m,n;try{if(c&&(i||g.readyState===4)){c=b,h&&(g.onreadystatechange=d.noop,delete bU[h]);if(i)g.readyState!==4&&g.abort();else{j=g.status,l=g.getAllResponseHeaders(),m={},n=g.responseXML,n&&n.documentElement&&(m.xml=n),m.text=g.responseText;try{k=g.statusText}catch(o){k=""}j||!a.isLocal||a.crossDomain?j===1223&&(j=204):j=m.text?200:404}}}catch(p){i||f(-1,p)}m&&f(j,k,m,l)},a.async&&g.readyState!==4?(bU||(bU={},bW()),h=bT++,g.onreadystatechange=bU[h]=c):c()},abort:function(){c&&c(0,1)}}}});var bZ={},b$=/^(?:toggle|show|hide)$/,b_=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,ca,cb=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];d.fn.extend({show:function(a,b,c){var e,f;if(a||a===0)return this.animate(cc("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)e=this[g],f=e.style.display,!d._data(e,"olddisplay")&&f==="none"&&(f=e.style.display=""),f===""&&d.css(e,"display")==="none"&&d._data(e,"olddisplay",cd(e.nodeName));for(g=0;g<h;g++){e=this[g],f=e.style.display;if(f===""||f==="none")e.style.display=d._data(e,"olddisplay")||""}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cc("hide",3),a,b,c);for(var e=0,f=this.length;e<f;e++){var g=d.css(this[e],"display");g!=="none"&&!d._data(this[e],"olddisplay")&&d._data(this[e],"olddisplay",g)}for(e=0;e<f;e++)this[e].style.display="none";return this},_toggle:d.fn.toggle,toggle:function(a,b,c){var e=typeof a==="boolean";d.isFunction(a)&&d.isFunction(b)?this._toggle.apply(this,arguments):a==null||e?this.each(function(){var b=e?a:d(this).is(":hidden");d(this)[b?"show":"hide"]()}):this.animate(cc("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,e){var f=d.speed(b,c,e);if(d.isEmptyObject(a))return this.each(f.complete);return this[f.queue===!1?"each":"queue"](function(){var b=d.extend({},f),c,e=this.nodeType===1,g=e&&d(this).is(":hidden"),h=this;for(c in a){var i=d.camelCase(c);c!==i&&(a[i]=a[c],delete a[c],c=i);if(a[c]==="hide"&&g||a[c]==="show"&&!g)return b.complete.call(this);if(e&&(c==="height"||c==="width")){b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY];if(d.css(this,"display")==="inline"&&d.css(this,"float")==="none")if(d.support.inlineBlockNeedsLayout){var j=cd(this.nodeName);j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)}else this.style.display="inline-block"}d.isArray(a[c])&&((b.specialEasing=b.specialEasing||{})[c]=a[c][1],a[c]=a[c][0])}b.overflow!=null&&(this.style.overflow="hidden"),b.curAnim=d.extend({},a),d.each(a,function(c,e){var f=new d.fx(h,b,c);if(b$.test(e))f[e==="toggle"?g?"show":"hide":e](a);else{var i=b_.exec(e),j=f.cur();if(i){var k=parseFloat(i[2]),l=i[3]||(d.cssNumber[c]?"":"px");l!=="px"&&(d.style(h,c,(k||1)+l),j=(k||1)/f.cur()*j,d.style(h,c,j+l)),i[1]&&(k=(i[1]==="-="?-1:1)*k+j),f.custom(j,k,l)}else f.custom(j,e,"")}});return!0})},stop:function(a,b){var c=d.timers;a&&this.queue([]),this.each(function(){for(var a=c.length-1;a>=0;a--)c[a].elem===this&&(b&&c[a](!0),c.splice(a,1))}),b||this.dequeue();return this}}),d.each({slideDown:cc("show",1),slideUp:cc("hide",1),slideToggle:cc("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){d.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),d.extend({speed:function(a,b,c){var e=a&&typeof a==="object"?d.extend({},a):{complete:c||!c&&b||d.isFunction(a)&&a,duration:a,easing:c&&b||b&&!d.isFunction(b)&&b};e.duration=d.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in d.fx.speeds?d.fx.speeds[e.duration]:d.fx.speeds._default,e.old=e.complete,e.complete=function(){e.queue!==!1&&d(this).dequeue(),d.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig||(b.orig={})}}),d.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(d.fx.step[this.prop]||d.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=d.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function g(a){return e.step(a)}var e=this,f=d.fx;this.startTime=d.now(),this.start=a,this.end=b,this.unit=c||this.unit||(d.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,g.elem=this.elem,g()&&d.timers.push(g)&&!ca&&(ca=setInterval(f.tick,f.interval))},show:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),d(this.elem).show()},hide:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=d.now(),c=!0;if(a||b>=this.options.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),this.options.curAnim[this.prop]=!0;for(var e in this.options.curAnim)this.options.curAnim[e]!==!0&&(c=!1);if(c){if(this.options.overflow!=null&&!d.support.shrinkWrapBlocks){var f=this.elem,g=this.options;d.each(["","X","Y"],function(a,b){f.style["overflow"+b]=g.overflow[a]})}this.options.hide&&d(this.elem).hide();if(this.options.hide||this.options.show)for(var h in this.options.curAnim)d.style(this.elem,h,this.options.orig[h]);this.options.complete.call(this.elem)}return!1}var i=b-this.startTime;this.state=i/this.options.duration;var j=this.options.specialEasing&&this.options.specialEasing[this.prop],k=this.options.easing||(d.easing.swing?"swing":"linear");this.pos=d.easing[j||k](this.state,i,0,1,this.options.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update();return!0}},d.extend(d.fx,{tick:function(){var a=d.timers;for(var b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||d.fx.stop()},interval:13,stop:function(){clearInterval(ca),ca=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){d.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),d.expr&&d.expr.filters&&(d.expr.filters.animated=function(a){return d.grep(d.timers,function(b){return a===b.elem}).length});var ce=/^t(?:able|d|h)$/i,cf=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?d.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(e){}var f=b.ownerDocument,g=f.documentElement;if(!c||!d.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=f.body,i=cg(f),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||d.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||d.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:d.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);d.offset.initialize();var c,e=b.offsetParent,f=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(d.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===e&&(l+=b.offsetTop,m+=b.offsetLeft,d.offset.doesNotAddBorder&&(!d.offset.doesAddBorderForTableAndCells||!ce.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),f=e,e=b.offsetParent),d.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;d.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},d.offset={initialize:function(){var a=c.body,b=c.createElement("div"),e,f,g,h,i=parseFloat(d.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";d.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),e=b.firstChild,f=e.firstChild,h=e.nextSibling.firstChild.firstChild,this.doesNotAddBorder=f.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,f.style.position="fixed",f.style.top="20px",this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15,f.style.position=f.style.top="",e.style.overflow="hidden",e.style.position="relative",this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),a=b=e=f=g=h=null,d.offset.initialize=d.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;d.offset.initialize(),d.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(d.css(a,"marginTop"))||0,c+=parseFloat(d.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var e=d.css(a,"position");e==="static"&&(a.style.position="relative");var f=d(a),g=f.offset(),h=d.css(a,"top"),i=d.css(a,"left"),j=e==="absolute"&&d.inArray("auto",[h,i])>-1,k={},l={},m,n;j&&(l=f.position()),m=j?l.top:parseInt(h,10)||0,n=j?l.left:parseInt(i,10)||0,d.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):f.css(k)}},d.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),e=cf.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(d.css(a,"marginTop"))||0,c.left-=parseFloat(d.css(a,"marginLeft"))||0,e.top+=parseFloat(d.css(b[0],"borderTopWidth"))||0,e.left+=parseFloat(d.css(b[0],"borderLeftWidth"))||0;return{top:c.top-e.top,left:c.left-e.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&(!cf.test(a.nodeName)&&d.css(a,"position")==="static"))a=a.offsetParent;return a})}}),d.each(["Left","Top"],function(a,c){var e="scroll"+c;d.fn[e]=function(c){var f=this[0],g;if(!f)return null;if(c!==b)return this.each(function(){g=cg(this),g?g.scrollTo(a?d(g).scrollLeft():c,a?c:d(g).scrollTop()):this[e]=c});g=cg(f);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:d.support.boxModel&&g.document.documentElement[e]||g.document.body[e]:f[e]}}),d.each(["Height","Width"],function(a,c){var e=c.toLowerCase();d.fn["inner"+c]=function(){return this[0]?parseFloat(d.css(this[0],e,"padding")):null},d.fn["outer"+c]=function(a){return this[0]?parseFloat(d.css(this[0],e,a?"margin":"border")):null},d.fn[e]=function(a){var f=this[0];if(!f)return a==null?null:this;if(d.isFunction(a))return this.each(function(b){var c=d(this);c[e](a.call(this,b,c[e]()))});if(d.isWindow(f)){var g=f.document.documentElement["client"+c];return f.document.compatMode==="CSS1Compat"&&g||f.document.body["client"+c]||g}if(f.nodeType===9)return Math.max(f.documentElement["client"+c],f.body["scroll"+c],f.documentElement["scroll"+c],f.body["offset"+c],f.documentElement["offset"+c]);if(a===b){var h=d.css(f,e),i=parseFloat(h);return d.isNaN(i)?h:i}return this.css(e,typeof a==="string"?a:a+"px")}}),a.jQuery=a.$=d})(window);
\ No newline at end of file
diff --git a/3rdparty/timepicker/css/include/jquery-ui-1.8.14.custom.css b/3rdparty/timepicker/css/include/jquery-ui-1.8.14.custom.css
new file mode 100644
index 00000000000..fe310705756
--- /dev/null
+++ b/3rdparty/timepicker/css/include/jquery-ui-1.8.14.custom.css
@@ -0,0 +1,568 @@
+/*
+ * jQuery UI CSS Framework 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS,%20Tahoma,%20Verdana,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; }
+.ui-widget-content a { color: #333333; }
+.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+.ui-widget-header a { color: #ffffff; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fed22f; background: #ffe45c url(images/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_ef8c08_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_228ef1_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffd27a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); }
+.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/*
+ * jQuery UI Resizable 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Accordion 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordion .ui-accordion-content-active { display: block; }
+/*
+ * jQuery UI Autocomplete 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete { position: absolute; cursor: default; }	
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.14
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+	float: left;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/*
+ * jQuery UI Button 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+/*
+ * jQuery UI Dialog 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/*
+ * jQuery UI Slider 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+ * jQuery UI Tabs 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs#theming
+ */
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/*
+ * jQuery UI Datepicker 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/*
+ * jQuery UI Progressbar 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
diff --git a/3rdparty/timepicker/css/include/jquery.ui.core.min.js b/3rdparty/timepicker/css/include/jquery.ui.core.min.js
new file mode 100644
index 00000000000..577548e7882
--- /dev/null
+++ b/3rdparty/timepicker/css/include/jquery.ui.core.min.js
@@ -0,0 +1,17 @@
+/*!
+ * jQuery UI 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function(c,j){function k(a,b){var d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function l(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.14",
+keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus();
+b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,
+"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",
+function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,m,n){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(m)g-=parseFloat(c.curCSS(f,"border"+this+"Width",true))||0;if(n)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth,
+outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){return k(a,!isNaN(c.attr(a,"tabindex")))},tabbable:function(a){var b=c.attr(a,"tabindex"),d=isNaN(b);
+return(d||b>=0)&&k(a,!d)}});c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e=
+0;e<b.length;e++)a.options[b[e][0]]&&b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&c.ui.isOverAxis(b,e,i)}})}})(jQuery);
diff --git a/3rdparty/timepicker/css/include/jquery.ui.position.min.js b/3rdparty/timepicker/css/include/jquery.ui.position.min.js
new file mode 100644
index 00000000000..9f550be8e21
--- /dev/null
+++ b/3rdparty/timepicker/css/include/jquery.ui.position.min.js
@@ -0,0 +1,16 @@
+/*
+ * jQuery UI Position 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Position
+ */
+(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY,
+left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+=
+k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-=
+m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left=
+d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+=
+a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b),
+g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
diff --git a/3rdparty/timepicker/css/include/jquery.ui.tabs.min.js b/3rdparty/timepicker/css/include/jquery.ui.tabs.min.js
new file mode 100644
index 00000000000..11a67c144a6
--- /dev/null
+++ b/3rdparty/timepicker/css/include/jquery.ui.tabs.min.js
@@ -0,0 +1,35 @@
+/*
+ * jQuery UI Tabs 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(d,p){function u(){return++v}function w(){return++x}var v=0,x=0;d.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(b,e){if(b=="selected")this.options.collapsible&&
+e==this.options.selected||this.select(e);else{this.options[b]=e;this._tabify()}},_tabId:function(b){return b.title&&b.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+u()},_sanitizeSelector:function(b){return b.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+w());return d.cookie.apply(null,[b].concat(d.makeArray(arguments)))},_ui:function(b,e){return{tab:b,panel:e,index:this.anchors.index(b)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b=
+d(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(b){function e(g,f){g.css("display","");!d.support.opacity&&f.opacity&&g[0].style.removeAttribute("filter")}var a=this,c=this.options,h=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=d(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return d("a",this)[0]});this.panels=d([]);this.anchors.each(function(g,f){var i=d(f).attr("href"),l=i.split("#")[0],q;if(l&&(l===location.toString().split("#")[0]||
+(q=d("base")[0])&&l===q.href)){i=f.hash;f.href=i}if(h.test(i))a.panels=a.panels.add(a.element.find(a._sanitizeSelector(i)));else if(i&&i!=="#"){d.data(f,"href.tabs",i);d.data(f,"load.tabs",i.replace(/#.*$/,""));i=a._tabId(f);f.href="#"+i;f=a.element.find("#"+i);if(!f.length){f=d(c.panelTemplate).attr("id",i).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(a.panels[g-1]||a.list);f.data("destroy.tabs",true)}a.panels=a.panels.add(f)}else c.disabled.push(g)});if(b){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");
+this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(c.selected===p){location.hash&&this.anchors.each(function(g,f){if(f.hash==location.hash){c.selected=g;return false}});if(typeof c.selected!=="number"&&c.cookie)c.selected=parseInt(a._cookie(),10);if(typeof c.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)c.selected=
+this.lis.index(this.lis.filter(".ui-tabs-selected"));c.selected=c.selected||(this.lis.length?0:-1)}else if(c.selected===null)c.selected=-1;c.selected=c.selected>=0&&this.anchors[c.selected]||c.selected<0?c.selected:0;c.disabled=d.unique(c.disabled.concat(d.map(this.lis.filter(".ui-state-disabled"),function(g){return a.lis.index(g)}))).sort();d.inArray(c.selected,c.disabled)!=-1&&c.disabled.splice(d.inArray(c.selected,c.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");
+if(c.selected>=0&&this.anchors.length){a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(c.selected).addClass("ui-tabs-selected ui-state-active");a.element.queue("tabs",function(){a._trigger("show",null,a._ui(a.anchors[c.selected],a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash))[0]))});this.load(c.selected)}d(window).bind("unload",function(){a.lis.add(a.anchors).unbind(".tabs");a.lis=a.anchors=a.panels=null})}else c.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));
+this.element[c.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");c.cookie&&this._cookie(c.selected,c.cookie);b=0;for(var j;j=this.lis[b];b++)d(j)[d.inArray(b,c.disabled)!=-1&&!d(j).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");c.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(c.event!=="mouseover"){var k=function(g,f){f.is(":not(.ui-state-disabled)")&&f.addClass("ui-state-"+g)},n=function(g,f){f.removeClass("ui-state-"+
+g)};this.lis.bind("mouseover.tabs",function(){k("hover",d(this))});this.lis.bind("mouseout.tabs",function(){n("hover",d(this))});this.anchors.bind("focus.tabs",function(){k("focus",d(this).closest("li"))});this.anchors.bind("blur.tabs",function(){n("focus",d(this).closest("li"))})}var m,o;if(c.fx)if(d.isArray(c.fx)){m=c.fx[0];o=c.fx[1]}else m=o=c.fx;var r=o?function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.hide().removeClass("ui-tabs-hide").animate(o,o.duration||"normal",
+function(){e(f,o);a._trigger("show",null,a._ui(g,f[0]))})}:function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.removeClass("ui-tabs-hide");a._trigger("show",null,a._ui(g,f[0]))},s=m?function(g,f){f.animate(m,m.duration||"normal",function(){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");e(f,m);a.element.dequeue("tabs")})}:function(g,f){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");a.element.dequeue("tabs")};
+this.anchors.bind(c.event+".tabs",function(){var g=this,f=d(g).closest("li"),i=a.panels.filter(":not(.ui-tabs-hide)"),l=a.element.find(a._sanitizeSelector(g.hash));if(f.hasClass("ui-tabs-selected")&&!c.collapsible||f.hasClass("ui-state-disabled")||f.hasClass("ui-state-processing")||a.panels.filter(":animated").length||a._trigger("select",null,a._ui(this,l[0]))===false){this.blur();return false}c.selected=a.anchors.index(this);a.abort();if(c.collapsible)if(f.hasClass("ui-tabs-selected")){c.selected=
+-1;c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){s(g,i)}).dequeue("tabs");this.blur();return false}else if(!i.length){c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this));this.blur();return false}c.cookie&&a._cookie(c.selected,c.cookie);if(l.length){i.length&&a.element.queue("tabs",function(){s(g,i)});a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier.";
+d.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(b){if(typeof b=="string")b=this.anchors.index(this.anchors.filter("[href$="+b+"]"));return b},destroy:function(){var b=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var e=
+d.data(this,"href.tabs");if(e)this.href=e;var a=d(this).unbind(".tabs");d.each(["href","load","cache"],function(c,h){a.removeData(h+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){d.data(this,"destroy.tabs")?d(this).remove():d(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});b.cookie&&this._cookie(null,b.cookie);return this},add:function(b,
+e,a){if(a===p)a=this.anchors.length;var c=this,h=this.options;e=d(h.tabTemplate.replace(/#\{href\}/g,b).replace(/#\{label\}/g,e));b=!b.indexOf("#")?b.replace("#",""):this._tabId(d("a",e)[0]);e.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var j=c.element.find("#"+b);j.length||(j=d(h.panelTemplate).attr("id",b).data("destroy.tabs",true));j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(a>=this.lis.length){e.appendTo(this.list);j.appendTo(this.list[0].parentNode)}else{e.insertBefore(this.lis[a]);
+j.insertBefore(this.panels[a])}h.disabled=d.map(h.disabled,function(k){return k>=a?++k:k});this._tabify();if(this.anchors.length==1){h.selected=0;e.addClass("ui-tabs-selected ui-state-active");j.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){c._trigger("show",null,c._ui(c.anchors[0],c.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[a],this.panels[a]));return this},remove:function(b){b=this._getIndex(b);var e=this.options,a=this.lis.eq(b).remove(),c=this.panels.eq(b).remove();
+if(a.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(b+(b+1<this.anchors.length?1:-1));e.disabled=d.map(d.grep(e.disabled,function(h){return h!=b}),function(h){return h>=b?--h:h});this._tabify();this._trigger("remove",null,this._ui(a.find("a")[0],c[0]));return this},enable:function(b){b=this._getIndex(b);var e=this.options;if(d.inArray(b,e.disabled)!=-1){this.lis.eq(b).removeClass("ui-state-disabled");e.disabled=d.grep(e.disabled,function(a){return a!=b});this._trigger("enable",null,
+this._ui(this.anchors[b],this.panels[b]));return this}},disable:function(b){b=this._getIndex(b);var e=this.options;if(b!=e.selected){this.lis.eq(b).addClass("ui-state-disabled");e.disabled.push(b);e.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[b],this.panels[b]))}return this},select:function(b){b=this._getIndex(b);if(b==-1)if(this.options.collapsible&&this.options.selected!=-1)b=this.options.selected;else return this;this.anchors.eq(b).trigger(this.options.event+".tabs");return this},
+load:function(b){b=this._getIndex(b);var e=this,a=this.options,c=this.anchors.eq(b)[0],h=d.data(c,"load.tabs");this.abort();if(!h||this.element.queue("tabs").length!==0&&d.data(c,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(b).addClass("ui-state-processing");if(a.spinner){var j=d("span",c);j.data("label.tabs",j.html()).html(a.spinner)}this.xhr=d.ajax(d.extend({},a.ajaxOptions,{url:h,success:function(k,n){e.element.find(e._sanitizeSelector(c.hash)).html(k);e._cleanup();a.cache&&d.data(c,
+"cache.tabs",true);e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.success(k,n)}catch(m){}},error:function(k,n){e._cleanup();e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.error(k,n,b,c)}catch(m){}}}));e.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},
+url:function(b,e){this.anchors.eq(b).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.14"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(b,e){var a=this,c=this.options,h=a._rotate||(a._rotate=function(j){clearTimeout(a.rotation);a.rotation=setTimeout(function(){var k=c.selected;a.select(++k<a.anchors.length?k:0)},b);j&&j.stopPropagation()});e=a._unrotate||(a._unrotate=!e?function(j){j.clientX&&
+a.rotate(null)}:function(){t=c.selected;h()});if(b){this.element.bind("tabsshow",h);this.anchors.bind(c.event+".tabs",e);h()}else{clearTimeout(a.rotation);this.element.unbind("tabsshow",h);this.anchors.unbind(c.event+".tabs",e);delete this._rotate;delete this._unrotate}return this}})})(jQuery);
diff --git a/3rdparty/timepicker/css/include/jquery.ui.widget.min.js b/3rdparty/timepicker/css/include/jquery.ui.widget.min.js
new file mode 100644
index 00000000000..39ab91a0963
--- /dev/null
+++ b/3rdparty/timepicker/css/include/jquery.ui.widget.min.js
@@ -0,0 +1,15 @@
+/*!
+ * jQuery UI Widget 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */
+(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)b(d).triggerHandler("remove");k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){b(this).triggerHandler("remove")});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h,
+a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.charAt(0)==="_")return h;
+e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options,
+this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")},
+widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this},
+enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
new file mode 100644
index 0000000000000000000000000000000000000000..954e22dbd99e8c6dd7091335599abf2d10bf8003
GIT binary patch
literal 260
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEr#)R9Ln2z=UU%d=WFXS=@V?HT
z#xG*`>Yvsgk=}99w^d^D^d*@m74oMo<%#FcopJf?u00-~YVKV2wzrI*_R6;UORMea
zBFVSEnN~eiVA6V&z`E)YLz5Aok^D)In}Yn=OzDpgR5Wv0XfT8pOkmV{sKAJ-PO9#T
zZK}IXj&Q-V!U)!LcB_3K<j6=ku*!%uXjy#leKdQ?`ZvP&RiaPVOzxQ$`O)`M(6sLS
yN%J;Y?DO0<r7?ff#!c6LsA*2U`f2*?C%gsKpMo6zvorv`#o+1c=d#Wzp$Py>0&C*{

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
new file mode 100644
index 0000000000000000000000000000000000000000..64ece5707d91a6edf9fad4bfcce0c4dbcafcf58d
GIT binary patch
literal 251
zcmV<X00jSuP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70002ONkl<ZScUD^
zT?&IR7(~(AY#^)6!n1<<Vj)fQYm^M-n@5r1C}@~h2;ohZ7-N3vC*J$+J$LlEJIhL0
z?fU|%;UEDj;@||T;sBg74hkR1O4$<++XU{$LE{Z7;GhCj!9fA2go6yIhJysCh=UWT
ziUV-UI2ia*&y+p!utUI|$6*(^`>bvPcjKS|RKP(6sDcCAB(_QB%0978a<$Ah$!b|E
zwn;|HO0i8cQ<lay$(1s&O|n)t8rvkbvR?jjlN@>j@~)s!ajF0S002ovPDHLkV1oEp
BYH0uf

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..abdc01082bf3534eafecc5819d28c9574d44ea89
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FsY*{5$B>N1x91EQ4=4yQY-ImG
zFPf9b{J;c_6SHRK%WcbN_hZpM=(Ry;4Rxv2@@2Y=$K57eF$X$=!PC{xWt~$(69B)$
BI)4BF

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b383f4d2eab09c0f2a739d6b232c32934bc620b
GIT binary patch
literal 104
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnour1U*q978O6-yYw{%b*}|_(02F
z@qbE9)0CJMo;*v*PWv`Vh2h6EmG8IS-Cm{3U~`<YvxSSFU3)<QP%DF{tDnm{r-UW|
Dvd<uf

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..a23baad25b1d1ff36e17361eab24271f2e9b7326
GIT binary patch
literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouq+C2*978O6lYjjF{IFh)jg74>
zFlmZ}YMcJY=eo?o%*@I?2`NblNeMudl#t?<YIry`QK*OGr~otD9plAEGz`5G6d9zp
Wa55e{GUW=;JO)o!KbLh*2~7a@&m@!p

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..42ccba269b6e91bef12ad0fa18be651b5ef0ee68
GIT binary patch
literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouqzpV=978O6-=0?FV^9z|eBtf=
z|7WztIJ;WT>{+tN>ySr~=F{k$>;_x^_y?afmf9pRKH0)6?eSP?3s5hEr>mdKI;Vst
E0O<Z9>;M1&

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..39d5824d6af5456f1e89fc7847ea3599ea5fd815
GIT binary patch
literal 3762
zcmb_eYgiKKwx-=Q?P<E4nMM;$eWu2m#PU%`&Ae^LOv^6gctJ3vM8!lUG!aCxQ#0eJ
zq?xIqDJi9<fFp>di0+w!yaC|_1uvA>yaxz|iX3eB<LqajpXblFzRUBi^{w~$)_UKp
zpDz0D*=4#5008Vc>v#HR0ASmSVIKMS&kf`CSAV4g0DJLgPkRO79xj%J<(hH6`bTGj
zrr^$JeiHJI?;s&<5pRw-^kj}=E;X0OX+pgz+f5GVt0NQv_gbu0>-8J+F$O>HpW?Lx
z+YFO`CV&6VV9fsEwG#js0_-|v*!ujZ*M=jfo457?0Do-z<^}+8bI+qk+W~+$zz%Z&
z;L7&@&ns`l8Ofh*Wd<Cp_>U0pO%RP^?Xa_h7I}7K#}4Xt`s%-(m-enaPWX<H>$O&-
zX~a1aOzn?!r?5wJVBNPJ_o8-(9Fz<_c1LYGxUl(E+Wdx?wkNHH2T%eWq9Kz00h#RB
zYKI~=a<9_QqC^n<>hyWlS66waWgyAP#t&TfTWP=Sxa)ukRY%j7WH}(@r=B^W_;b&M
zRzPYsb*j^Kou%%`K6VP+dKtR@x~qEHq4rXMxoX-gcSf&->lMY%TMXF!Gw_A)(tp6}
z2A%kN3twbr%KyUrrmw24V3d%wzK<-q(M;MTr41}un`P!!xejADEv_CJ{CTif907B&
zEP`pDJIZHVgnmxh$EZnBOUxz~Ap+ZzKbFmg39_n-)$wY!Q@i~5aGmHbN7&*gk<HNQ
z!$-sS))5(#?qPW$1C^3#;cFvQMWTd)d(I_4awE^ZjGC%XcnSGez>q9zWgV|2(Zhxl
zoDqJp&MxW(qX#C@oF8L)*r$RdSjVFSc$%z?*9%YoZ6sOZ!vtxXtBM<*r82<p7}?1@
zveQI&tiNm{;57jipQbO}b?9l*l4nGAT4Y=-w()@*#J1?%2{)nY^{|NO=xM)s?jR6<
ziJ!fSOOPs*$8->vyC}_Eiz1PJ2L$bttko`=+fH{Ne@G#lMDxkKt_y)O(J5&Ak)w-I
znm!vzYX3$kLDG$hOp-KJg~7}M;73BFWA{!a61fe?NJkjR_}Xw+*`O0=AGg7&dU<kQ
zA;d%-zM*iwS2t8Y)Gu@JK&A)fV=HHvbW`6mV+EZrtJSauApMCndBS~F>A`A?9`whW
zM{fkFf`G`P^9j*|-q9KLvS<191z9a^mK3Lss}W8O=sZ}N$V4Fh*SWF5NbZQ>p{0>$
z0pe}d$*s!y<I6P@1-n$GE>*R&NSXbjmld6{4Y;O89MuDTK0Hn0C?QdL9z1qGegXs!
z7$MIGkPkwdHF2os-Z-e85B?5An>yc|m<}>!Iirg%H-<NQ%ws0uIi51-a5phDmp{k5
zD(zjPC;t}@{w)+0&{l~FS*>%F11XY{{>@kgL>a#6fM9JzBE&an&F>eWh|b0^kJ<?n
zs=7WyuX=fIhvAjTTX`c}HUH)bTTI;OJGlyB{(NK&G;Htmn6^?c?TaAsOV}uBUtAa>
zNBM5*nCa~(xwn~rG~<cfPp*ub4V(WF)lGbJpS(|MvAA83yV}}9bfbt(>>GSG9mz3h
z9F~64y}giIrz^lfl|_5HpUsG}?Wpr*&f?bS=|9biqivN)-a~u>uK<{Lfcng{663QL
zLXzO@*N5)q4C=j6E8nC+P%lEwI#~0wkt;M4Y8!+DYzN2rBuYao1*HRIa^NC9nFeep
z+ns5$X9Bh48S-`ss!k&!J#Ddd=j1O-9}?`v(B|<M1@-U18t+Js;ZNHIk3$u$U;Eyu
z3exyGipUQbO;S|Bzp(hX{&!NB@oq*gb}e^)68}5#!kH$BhK<@5!ubu^XDa&d1C#@|
z3yY}&(~QVLCVdv){)I_ECxKsIlmW8LZ!;=rtk4ZaX!xm*=*Z(|P+Uqf*Rg<I!Tau&
z85{4>>R7wD97BV;nK~quUHx^mj^G6K2GZ1*uSN?iLm!7vHB7_1^TGbKhmnK+K`GYA
zocp2=on8LxJH^`7^1ch0ft(MTU$vJB!R@gQ^R`qoX>(=iY#u++3K>oqSpG={?#YVw
zp3m99FXk^~<6#X9X1oKYXEH%8t2btG65(u0zF-J)^>8dj0Evc+9_Bd^Y)k9AfW~FV
z%iDV(ClS6)TC7eVzh{ml;p4cx8)$TV&qhRWp+dqiw>i32?1;5d>HLrNj=^OdJ<}L)
zWxqw8aFI<~_TkMDQHS?`z+KQ?+{ASoy%}RBu6i9?BXbh%OEx1OuZ}?n(VjrT(!B1;
zQ!#WA0NBx=^6rJrFVsDCuT4)OTG<Ikaz*O8tFTZ)QL^`qbYu)jq*kTD>zZ3$Z4Yqz
z&c9+7%g!%zxtv#p2fhHbo98KBwfE<e9Z<Yr%uRWj-5Hd3hTYY<&ve`je8y8RV)knu
zYCT0K`*JrRv<nx%jAf>&Y(&2#=}qEEU`ECEjlCp=X^_tIoMx>%kBT5k)^c=zyV5w3
zc>DLKY6%=y0igWi9B@4hB}bR6K|+jYBt+}i6Ld|b`*s62c6Ge?zGYvdW)=p90~$Ad
zxGB>c<3Dy~hPJ#vNXierOl41xBn_0L<5NhK6JO-LvtS&Z{xjGKfIC6*9%*?tv*?+!
zv;Q{?mHN2b|3DEJO}R9w11ZT5QVC(H0u|0n9cVK_@2r%C<)OnZ(3aS0Ux^6G$ja*<
z9R~o~9XjhPL)w@vYi6r;H$tR>wW`0-Z&Qed`X0LZY9-~mfso!@dt?5Q;@|K6$mAB&
z$J41&y)<{N;QATPeU}BC{lM_<D4HZA)B)i-;gJ1pwusq$h>@-LlQ2hjX;}6~qdglT
zGm%qJm*F^in=w*?j;@C_P<fNuR>CMnXK5Fd^wXV**pZOdS1KbSJsC~s#R;tmXIMb`
zHB>sx<rNDl@4+*>Qg&E5Yf@}d#~Z9D4R{}ZpLm7S=bY0x#k<=H?=R+=W$=Bm2aU*n
z)qgD*0#4>GGlHhQ`bx#k=Njc;+9D@{F5`xI^tMkBf{XIzwB=b9KbuuLF7jMTR~Mwt
zN#!)9J4&^V@JRe9Y!b2!;$rCLPWZfG`C;Qz`u~TJdCzv->e`=R8uHX_2{Fp&pWJ*h
z#A60&bY(j(^P@t_`_pktBV7{tFVoeNWlNA|zgNr&DMjJ_!k2%2s2~F@la$M6k%hWi
z7}}hoDuoaN7?lchVk@4DunpEIS$72&uuF&F;&4uhC$L)6IzHHUryR9emzpxwsRXmj
zfc}pI#oRCB7Y1;t=*58Gsv7x3PGuW^spn6V&dWf#?*TQ0(|*rr=EeE1o~y1<q=XbB
zH7M1n6!fSD?pm#tnQqCt>wyQi%)e*oX6iX@$m0F1R<jp2X5!4xYkF7J+;bthC|!^_
zfGt{`v`5@+vH^moN%0^eXsq^fv|D%^4d2~y%?^q=-Nv+wR>tKUT0vgg!8^fWhYLqS
zF@EOpFld7>f^kprb~YwMq=^<<pan6S!*H@g7t}eQJLhuWeLGTkT2P+Ck3!Te1lk%)
zt9TCz)oC3>e|gw?QFyf8ck|ZC^>)3c`b$^C>jCB4Fne_1e$Cqt=4Ud#K~~8Nfa91W
zwk17&D?X?4FRzR+5qCiIqPf0};K4$tW$}l~A?u_E=JSe;*f_DO>r{z=U4_<)dY)M!
z7O#mizC+GN&#;)k)vkBU<tXnqP_^|-tGmZcT8Dlxt6Pn?`uypBX@1fVrNePVd#ALp
zF4$80+@AG;7xl5W_sE^yNYES$<C6}`Zb1&JCZx~nYEbc%r#1d%Mn0pgS$5QlwG(ot
z!Za{>S@fZesb{v?YuFlCPRjsT5bxB4@+sqdq}xvvBhTngZ(N1LUCS-ei=5sgE-Tbc
z7HK+A_O23MP@sUoc?I?*ZB|F)&%us|2<oRU<$~ApQ%f%RU*aE`VmGrB<J4ieMCirV
zP_~OQ;txr2WBgPQtAbapRV&BoULc}?@}z*gAAJEFNo(?(iOCZhqe)W78eZ*UvaN@7
zhKKGvt0!}(rjB;qc0K^%h|5n7(;vc+uHx|Dg@=F~<I;s3VT_=D#he%5p2SoOly<_w
z*HKrz@ej3W?Y+xd+RJZ;9WZCGEGI{ETYg8h6;=d~Oi`<7@VfdE&iUPi>O$#G7V$6z
zq>G%6!cu7OEf+_#^A=23Hd6Db9-yK*NQ#<PGnv3oz%Gl*Ib##q`dB%MvY>S+kjJI7
zhLiLz{>zKKtHH>H;B-cALzj`>@+-~?X2aP7ypf9WMf8q0m)wS!Nkf+&R&&zEjFOUx
zlq^>v#VAq}=)?dKRMe+010g9O;qAiaTA4dV+==mw%i3Re)DwZ$Wd5CK1m4Ivy&&Ef
zO8W!SpcgA>zfTGAE!{IPJMhdZ`T4{K#7ndDT8K2&*jf=J8O>H*iDJ}ZK}z|$C3U62
z$nZhk4v$QIYzMaV+0`B8S!=9RSYzi*QG#tp>ZY|lY_`}A-zI7)(tV$B9G-tC#zt8m
z<!M@MT<43;wMNmuo-kSmPm5UQboY7uH(`#(7slpt#=BnL_;t>re~pD7oIFkmIAM=s
zw+Iili%nSC?yks)t~q4lTlZW(#5^yUV@+^KvIuQzZDO^*TBz!<CtQh2rfO<z=TS{H
zzIH*$V56H0{EnCR^XrG!ZG7AjD4r}Q(t2l9(P&QU6M<44;NxCby12gE#~t-zco3A+
rQq8KZ5e*fKEaO{0Ke0s~Qmy6Xh5m%FO!wV}CE%>j#nX%*uiW|{x9q0w

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1273672d253263b7564e9e21d69d7d9d0b337d9
GIT binary patch
literal 90
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l%l7LV~E7m<R2d&AFo$qV`FPm
oboulDzr6KyA+fs7hb{~ZQx+&qVC9&67pR!Q)78&qol`;+0H8b=ng9R*

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..359397acffdd84bd102f0e8a951c9d744f278db5
GIT binary patch
literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l!vE_V~E7mtNjN#8yp0f)nD%C
z{k^&2ZZH4W#qke67#j$%IepV*`yn{#P|600IVRJjChwXe(ssyZ>xPQ=F85a&M@g_{
d|GeK{$Y5lo%PMu^>wln`44$rjF6*2UngE4^EGqy2

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_222222_256x240.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_222222_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..b273ff111d219c9b9a8b96d57683d0075fb7871a
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{;aID?ElVL?Rdohw{Ucz9r_YL7=D6<&8F>PmYTG^FX}c%
zl<zAi(m>GE{DS1Q;~I7<vD)$Yj(fd>-6ze&TN@+F-xsI6sd%SwK#*O5K|pDRZqEy<
zJg0Nd8F@!OxqElm`~U#piM22@u@8B<<ecI*S<egUH7}csd8!)jLBD2s`p(8v&--KE
z71^q9MglFywkSt_5FCr2F%o&UR(5j7-O>moyKE%ct`B(jysxK+1m?G)UyIFs1t0}L
zemGR&?jGaM1YQblj?v&@0iXS#fi-VbR9zLEnHLP?xQ|=%Ihrc7^yPWR!tW$yH!zrw
z#I2}_!JnT^(qk)VgJr`NGdPtT^dmQIZc%=6nTAyJDXk+^3}wUOilJuwq>s=T_!9V)
zr1)DT6VQ2~rgd@!Jlrte3}}m~j}juCS`J4(d-5+e-3@EzzTJNCE2z)w(kJ90z*QE)
zBtnV@4mM>jTrZZ*$01SnGov0&=A-JrX5Ge%Pce1Vj}=5YQqBD^W@n4KmFxxpFK`uH
zP;(xKV+6VJ2|g+?_Lct7`uElL<&jzGS8Gfva2+=8A@#V+xsAj9|Dkg)vL5yhX@~B=
zN2KZSAUD%QH`x>H+@Ou(D1~Pyv#0nc&$!1kI?IO01yw3jD0@80qvc?T*Nr8?-%rC8
z@5$|WY?Hqp`ixmEkzeJTz_`_<!oE0dsO`po1=$i_1k<Um_}caMZcrpqA*x-}Rw(fX
z3Qyh8;-4^Fe)UICI@ayzmyV?48GbR;1*s>wsSRi1%Zivd`#+T{Aib6-rf$}M8sz6v
zb6ERbr-SniO2wbOv!M4)nb}6UVzoVZEh5kQWh_5x4rYy3<sHrHJLqL+DcLT5`t$L@
z5_J8#H;PWO1GW@oId1Y>c!871NeaM(_p=4(kbS6U#x<*k8Wg^KHs2ttCz<+pBxQ$Z
zQMv;kVm5_fF_vH`Mzrq$Y&6u?j6~f<juy`C^I0O`4mfXK0lrRY*VoeJX&k$9aL;Hl
zlp63sf~-1z_419)A8^j|LeQSmK&T8R7nA=Ki3^H;YaeL&hF6>tIV0Yg)Nw7JysIN_
z-_n*K_v1c&D}-1{NbBwS2h#m1y0a5RiEcYil+58$8IDh49bPnzE7R8In6P%V{2IZU
z7#clr=V4<zT-gP2u}DD>yyrRe@oXNqbqo^^LvlLE?%8XaI&N(Np90-psU}7kqmbWk
zZ;YBwJNnNs<m6GqjV2(cCX2e+#tSOgIGm~J&Djknhy!e`&p)NTq>$~d!mx9oMGyT(
znaBoj0d}gpQ^aRr?6nW)$4god*`@Uh2e+YpS@0(Mw{|z|6ko3NbTvDiCu3YO+)egL
z>uW(^ahKFj>iJ-JF!^KhKQyPTznJa;xyHYwxJgr16&Wid_9)-%*mEwo{B_|M9t@S1
zf@T@q?b2Qgl!~_(Roe;fdK)y|XG0;ls;ZbT)w-aOVttk#daQcY7$cpY496H*`m@+L
zeP#$&yRbBjFWv}B)|5-1v=(66M_;V1SWv6MHnO}}1=vby&9l+gaP?|pXwp0AFDe#L
z&MRJ^*qX6wgxhA_`*o=LGZ>G_NTX%AKHPz4bO^R72ZYK}ale3lffDgM8H!Wrw{B7A
z{?c_|dh2J*y<H{`M3l!HEtOc{;H{lJx}(C|*lvPQ+RAcV`>8b04c37OmqUw;#;G<*
z@nz@dV`;7&^$)e!B}cd5tl<nF(??uM#|`*5pIKe!DEUl5-&9M=s_3Yn@-P(czyPQ~
zTU3I3bk%z<*w;9V(oQvt^2H`kBAW;=2oA<L1<qVIK(Z{Hk@5&E&_2mS+|}+?g@FBu
zK+e=OWg<)e?RO;llNw00>0{g(Q>5_7H^@bEJi7;fQ4B$NGZerH#Ae1#8WDTH`iB&)
zC6Et3BYY#mcJxh&)b2C^{aLq~psFN)Q1SucCaBaBUr%5PYX{~-q{KGEh)*;n;?75k
z=hq%i^I}rd;z-#YyI`8-OfMpWz5kgJE3<X7ptj0dmPk5UrEf%nVD%<Giiw4wVh!K0
zFjy-VAnpOFJIDm=jqqahP0Wam<9qv4UMIazx8J<YJz>I!3ean6=UZi!BxG7i(YBk?
z02HM7wS0)Wni{dWbQMRtd-A)_Az!t>F;IwWf~!*)-Az4}yryNkz&9)w>ElA80Oc`6
zHo#9H!Y3*Qx9n@Jn)!w6G^hb;e_n8zpIyXCN`JFkPc)^Q?2MsLNFhMgrcZI-<#1ne
zjH;KFf?4eAT9<t<iUSC5BsF-<$q+H@@j%Yk>mQZ}ZfHLGA#d%s;SZK4p0FwZT2S^{
zQ2BG1xJsbK6?yrHTjJi|5C0u=!|r!?*4FL%y%3q#(d+e>b_2I9!*iI!30}42Ia0bq
zUf`Z?LGSEvtz8s``Tg5o_CP(FbR0X$FlE0yCnB7su<mcL>DPmI2=yOg^*2#cY9o`X
z;NY-3VBHZjnVcGS){GZ98{e+l<X|f4%S*+x526SE1mJ%6M<Nt*!}czEQf{?H1U0br
z^Y7cXNxH@=Ve^#j3H@BPU>q~O$u6pEcgd0CrnIsWffN1MbCZDH<7c^hv+Z0Ucf0{w
zSzi^qKuUHD9Dgp0EAGg@@$zr32dQx>N=ws`MESEsmzgT2&L;?MSTo&ky&!-JR3g~1
zPGTt515X)wr+Bx(G9lWd;@Y3^Vl}50Wb&6-Tiy;HPS0drF`rC}qYq22K4)G#AoD0X
zYw$E+Bz@Zr^50MAwu@$?%f9$r4WHH?*2|67&FXFhXBrVFGmg)6?h3^-1?t;UzH0*I
zNVf9wQLNLnG2@q>6CGm>&y|lC`iCFfYd}9i%+xkl^5oBJ?<;aneCfcHqJh7Yl5uLS
z9Fx-(kMdcNyZejXh22N{mCw_rX1O!cOE&3>e(ZH81PR95wQC37En4O{w;{3q9n1<A
zPC{;HRD3#A!@Lk)+k!~onQ0|-U%#uGd$&L?ZhNC&R)V(mb`NhUqrYysoMQ;Z)sq!y
zW_WwV!+jO*nGT8-Hx_JVmFK^=>t&;p)D%&Z%Nw$gSPa!nz8Slh7=ko2am)XARwOWw
zpsz0~K!s{(dM$NB=(A=kkp>T(*yU6<_dwIx>cH4+LWl282hXa6-EUq>R3t?G2623<
z*RwTN%-fgBmD{fu*ejNn)1@KG?Sg<bw3hQ~jCP9_dLp#J9Fi#nX3wGv<cLwQ;8x0`
zA<%pA%E0S;<5FJhw8e#?n&IA5g19Fv!v7YC%Gxqd<x1=+hht1t>*8z3hYtkQJQjB6
zQ|x>wA=o$=O)+nLmgTXW3<g>_6diA;b4EY{*i<HxX2Q~PA|R-tJ=V1~4KO3h7H~CG
ztNFL#J=a@4Q5K7Ogvj-+3N_IJUjc}x34}a7@bDE3!)Kj4s7ME<v)`yP${V~G_J@6l
zp{&i)CGxx1)X`lnwc}#g;g<(rA1#7Ez8@J}tuMD3bB{Wifbe~LWT0zYNjgb_qn|+G
z2TCDZw1rV|wPx@~-H8<4^MGxfR0aLq+_k+{JT<mckxWLsw*J%G%YH0>*R%6dO2EMg
z@6g?M3rpbnfB@hOdUeb9<OD{Zt&T^7p>6=~I?OIA3@BWAGmTwiQ{x5Cqq<8c10L!P
zd@Qk^BseTX%$Q7^s}5n%HB|)gKx}H$d8Sb$bBnq9-AglT2dGR2(+I;_fL|R4p$odJ
zllfb0NqI)7=^z~qAm1V{(PkpxXsQ#4*NH9yYZ`Vf@)?#ueGgtCmGGY|9U#v|hRdg-
zQ%0#cGIfXCd{Y)JB~qykO;KPvHu|5Ck&(Hn%DF~cct@}j+87xhs2ew;fLm5#2+mb|
z8{9e*YI(u|gt|{x1G+U=DA3y)9s2w7@cvQ($ZJIA)x$e~5_3L<r=v~@?aZ+642@!3
z&nTpp8p^rR@IEsq`uhzfD&i>KFV~ASci8W}jF&VeJoPDUy(BB>ExJpck;%;!`0AAo
zAcHgcnT8%OX&UW_n|%{2B|<6Wp2MMGvd5`T2KKv;ltt_~H+w00x6+SlAD`{K4!9zx
z*1?EpQ%Lwiik){3n{-+YNrT;fH_niD_Ng9|58@m8RsKFVF!6pk@qxa{BH-&8tsim0
zdAQ(GyC^9ane7_KW*#^vMIoeQdpJqmPp%%px3GIftbwESu#+vPyI*YTuJ6+4`z{s?
zpkv~0x4c_PFH`-tqafw5)>4AuQ78SkZ!$8}INLK;Egr;2tS18hEO5=t;QDmZ-qu?I
zG+=DN`nR72Xto{{bJp||`k}-2G;5#xg8E~xgz22)^_Z;=K|4@(E&5J)SY2of=olcw
z5)@L)_Ntcm!*5nEy0M9v0`S33;pO4T<mv%0Rx6?c2H~TA%zOO^T2$@D<Cut3{ae}|
zAT@Uzc>N;>4(Z+<j5j2DQ*r;U|6a;YfP1jST$I3mSn3aNn!?<=B-XkzG?hQH;@bu%
zmFYDDgbC%Wt{6LBrs%88L}deF9pse}dmIp4lmp@Tir9q)JKESa=h>19p_0>u#e-vE
zXCU(6gAvu~I7Cw(xd%0e59MNLw^U37ZDbsBrj%eDCexw8a3G`nTcXVNL6{B7Hj@i&
zbVB{;ApEtHk76q08DJ48dSxd$C(;$K6=FpU<~l9pVoT9arW^Vu{%Bcn4`eIpkOVC|
z$)AKYG_`ypM{0@BUb3^9lqi_c?ONH|4UJMJWDowMVjacycX7}9g={O7swOB+{;+?;
zjBo!9?+nd)ie#x5IbFW-zBOo0c4q@9wGVt5;pNt`=-~Zgcw#*`m($6ibxtZ`H=e=}
zF#GZ~5$%AUn};8U#tRem0J(JTR}<qii}wxmUzVwVIg2$uE2;GN{hhT&GE1i;_fi(_
z9KKXP)ds1Q)XnUhr?uXO-HbKE%5f%+-C>d4vR(dgK2ML~lZsPhayJ2h1%sD4FVst|
zKF)+@`iNzLRjg4=K8@**0=5cE>%?FDc({I^+g9USk<8$&^qD~@%W0i4b|yMG*p4`N
zh}I!ltTRI8Ex$+@V{02Br%xq#O?UlhO{r8WsaZnZCZq0MK9%AXU%MDLT;3=0A9(BV
z9VxxxJd7jo$hw3q;3o?yBLmA=azBUrd9>-<_ANs0n3?-Ic*6&ytb@H~?0E(*d>T5n
z-HiH2jsDf6uWhID%#n>SzOqrFCPDfUcu5QPd?<(=w6pv1BE#nsxS{n!UnC9qAha1<
z;3cpZ9A-e$+Y)%b;w@!!YRA9p%Kf9IHGGg^{+p`mh;q8i7}&e@V3EQaMsItEMS&=X
plT@$;k0WcB_jb;cn%_Idz4HO$QU*abf4}+wi?e96N>fbq{{i|W0@(ln

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_228ef1_256x240.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_228ef1_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..a641a371afa0fbb08ba599dc7ddf14b9bfc3c84f
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{;X{3=KszyL1xbWEgT(ahrR?5hM!<zvuS&nr6z6fi@J>w
z<@?HsG!Qg3zaV+-xQ3ldtad!U<6iGz_enGH*2akP_r)o1D&8p^5M)<i5Kvm7+w+1d
z&*|KAM&6N6?%o|XKL7xDVlB)}>_c8IIj6Wy*7HJo&CBLuo~nj>(63pZzO(Vv^ZuB3
zMYigjkwA;FEy|G}1jpiMj6|NTm7Uyiw=@FDE*nX<>jR!W@9XIyf%$Fd*J5*D0Z0Lm
z9}ZQxyT|x5ftNy?V>EbJz-K>bV9gs9RaXUP<^=;e?&Fqxj;6{ieR-a-@H<J_4GiWZ
zaVu(K@aJcf^w<j8VA*iR3{E8n{m4z5Ta=$%rXkgQO6v#}L)oynVyGEE=_51-z65?H
zDgGA81aw}gX`NgF4>ycA1KMKhql8GOmcx<Hp8QKqcf*>wZ?_-(3hMK^^a*(gaFvBH
ziIC!fgH4$W*NbKIaY&T?%&13``KbD@S-0`xQ%v3TV+B!;RC7O!+1a9QCA$H@3tR;k
z)SSoR7(s4)f{zM}eWgFN{(ZH5d1O}l)f$ruT!)Q&NImXyZsTzOf9TwctcSfr+M)aJ
z5otO+$jvm-P4)ykH)x|cO5xeb>?!`qGw$(>&axqLL6yoB${vsMXgL_-bz@2J_tS92
zdvZG-+vKl@K4Vr(<X8D7Fm5%eurE#<YP<1YLAHb!!E~xCzIMI68x%=Yh-w$L6-vB;
z!c#Z2_$LgPU;Po3j&(cwr6cKhhF=VILF!3vYQvfMvLYtV{!ir!NUtS|shjnm2Kl+v
z9M*o<>EL{WQt@Z+Ea-hxX0}nTSZxnpi^#Kn8Ox8FgIS|hc}KJQ4tm*HO16ui{(O9}
z1YN)GjiQt6fGq`Cj+^`zUf?8hk^(T{{cOQGWFP98am}is28A!5%{R#ENv8fCN!j69
zl<vTXm`x#Aj3pR~5$!tw8x6HJBT;veqlI((e3l5f1J0XQfUi^9^|f?)8pp02+%sAX
zr3QSEAghjFy?kTy2b}Y~5VYqs5GsSo#pFLl;)0^z+6P*`;T5Mu&WLv=bzI9Q@9K!#
zx3ne5{kTux3L#b!(t3OTfpmY0?(76nqT7xWC3Cn`hU1f1hZjxb%CxmPCafJTzecbo
zhDHzEdDz$vS9U>MEK(2z?|BY=Je$XD9mB-Kkem*(d-j^9j$2#6r$Dz?s)-TCDCGCs
z8>6Pvj{Y+YIeFA@qY22V$)awy@q!9A4rgk5b9TcC;s9Ig^G|6nDP+5=Fzg&?(L=vc
zCbGd>fSu~@6!94td+o#d@sid<c4_^>!EI<?7QBi6t=$bf#g{8RUCj>X$rx7*cawe6
z`dScJ+$HssdOjE)O#Ybs56vm-FQ$7yuJJD^Zqk%hMaIgAJ<2yb_MFQte_i;62ScT$
zpjifYyR_E=rQ+>H)pmlr-Udzg*-!|ssw(D7wJvC+Sf8bb9;;q8#z?0p!!bsd{wy|5
zpBaMHE-Ve>i#LLjHRaMLtp%9&(HCng7Sw96jVv!#0k%?F^K7&=T)mnYn)D9(i;4x5
z^NJTJwq~pv;kH@#ejTd*48~(J(r6j34|m`h9fEDj0im)~+%I5XphWymhT;_Zty|Q&
zzjPg#-ufAHZ<omf5#{klOC=UKcxxw*?x^rKwwoZ7wz3@8eku)ggLNRn<<KIdajH#H
zeA)T=Seh$G{X;Ew$<Zx1YdFKl^buFmaRdI%XI9raN<LH2H`S7|Dmv<?JPd_9FaRph
z7M0*0UG<&|_BGC;v{TKZe6h)s$R@%If`c(mfiu?)kSq&lq&xx(v`_L7ceQ&}Az*(Z
zkTW$+naI+A`yGk?qy`dg`WSb{6e&FN4RX;O&+frr6hjc+3<Yokv6*p`M#SE){vkzc
z3FL#%2;YdX9eq<GwL48ff7Y!gs4B@Hlzc$A2`aV3*Atk++JX5HDY4Bk;uB4Yxbu<X
z`L&1ByqMIqI8t`UE|_LH(~F2;?|){*%50r1sI9V=C6bO-=^K$CSiOmlVqzhvSi?6g
z4AzPTh<iZl4l)6IBfJ=W6EkAt_}>1M*Gccw?Kf|8Pnhtb0`!{N`Bqsa37J+>wC$!e
z00k+2Egzz;rbcWoUB%Jvp8W1}$XD%e3>4y;;OZ1ccT-O#uW6Ys@C}Pa`nZrNKzR(2
z4e%3)@QI4SE&E!lW`5y14QhbepBG%_XBV-O(%<aX6HVzRJ7ee*QV3AB=~LWyIoy{V
zqv~a)U>5tj)@9#|;sC-MNev!zGDHk}JdpGC`iJF#8=8-P$Xoku_=Dw%Cv3{U7L>gf
zRQ?<$t`cZ*MP5GQmbmx#!+*!zu>0MewRO9GFGS{b^m_fJ-N0?j@EqoFf>$khj+E|@
z7r3We&^tR^YZrxKe*d<YJy4G(9mh^GOxZ8bi3n#Ytos{m`t{%)Lj8wW{Y{jV+Q_6T
zI5_MMSa-xsCZ~p-HRDCj#<#0BIhacN@>22agXqCO0l44&kqCv{u)T|(lv`~PK@DvE
z{QI_TlCH5z*gR!>LO)k67{^R+vWx24U2^2ODXpwT;6y+6+$5m)_*w4WY&#do9dCeE
z)>p+Ykdhq($DhmMiaYXey!@N%L26uz($aJ!QT{B^Wu}U$^9e#5)=c+XF9@Ill?ZmM
zlNgHiz*9!vDc&uxOo;ZVxb`Q!Sk0*gnfxWzmbZh4(=%CD%qP?0=);n$&zaW_$UKV9
z8axdcN#AyZ{P)wj?V{P}vM)YY!>6@}^>U+iv$`9>nMTCPjN>z%yF&3yf%>+T@0vh4
zlC8Xa6zeo?%=o3}M8{aebLHcO{^1Ar8qiM=Gquf?Jo)q5`-+?sUpg?QXyEUpWSm+n
z$K-UyqkI<R?*3wTVfWE~<@2<uS?-MVl1;jzAA8*iL4xsi?b?BNi<UXgZAh$t2eX2O
zlaSjP6`u~(FfWAHwjdICW?Bi|*YB$4-Yt-e+urDxm7s0C-NReT=&xHY=NLk9^<)K_
z8Qvc8a9@Rcrh{U|jRjj-<@xXJdfDhCHAU3q@`fxV7DF|YZ^rH=h9J#M-17gO6$#8E
z=<ACLP@x){UQ68&`mEVXq`?Cxb~%;JJ<xQvIxsey(BZq&!Lur1_nVgz6$w$lK^&jz
z^=yq5^Y*23<@W0Z_KKzDbZLlkyC5J9t>wHLquru~o(OF)hhz$Y*|X>ZIbswnxRvr~
z2=rdOGVuD|xRlpAZE<0!X1F(%Anpl^@V^D3vbM}qxe|NI;TTiZy7(IM;R69RkA>a&
z6gwYE2sREzQ_LHmWqB+ogMk(fMaSFeoDq-!HkFB_nXt5+2ncFuk9BQL1I&oB1zZi)
zYW{6_&-Ip1l*OVRA##1ILQS;5R{-K^0wGTiJbVSi@LA^$D$;@J>^G{6@&+%4{b3(s
zC~LEHiTv(0b#zxt?YJ0r_~pUZM~mQ(??(n#>&tD%+@nq=Abj5*8R!~Ul1`G~=qFJ4
zfl|m8ZDCYgtr`4LcOpgiJYX9qRY5;DcWti~PmS$VB$E-Zt^f4)vLDOe_3XTq5^ylW
zJ9PKm!V-8sAOJXnUfuFNIf0R9tK-pNs2hO04zr620}5B(Ok>yB)Of-3sP59qfQNbm
zA4{w!2@cB;GbR(~szVrbO%(w=5S!X`o@o@x++wbN_tMPT0V<QhG{UeJ;8({%=z{L*
zWd0UgQl1fNI!H$Y$hXK#w3!Gvn(74Nb)t*FnucAAe1;`Z--B03CHyB#2gq}g;qs~I
zlu;^<Ox+<j-;_m5iBxJsQxuqvjs7QOWMpota<0)9-Vv;XHb%w=>c)*I;Fgsbf^*g0
z2Di?HTApwKq3+YwfNsqd3iP%{hyK1iyuVZc@*0tO_3+N0#GFsz>8MjeJ2UJ%L!%hi
zGYYAthH`E+ywA*u{(eJ=ia3h*%k?779rk-K<0VZAPkl;TFUbmei|$fqWO8!_zIvqt
z$ly$VrlH46nnpX~X5Yk0iBJl;=WuA4>~X4-f&K0yWf42h&0b30t@NYX$7egQ1Fp!a
zbui-D6cWCWV&|R1CY@G8(qOmWjWeX3eX7UggZPGimA}soOuQdXe4uZ#2>5zN>qlI0
z9xk}lE=tNpX1m6*nFr2EQ3xs79!^sCldDJYE$m(qYv3q7>}1R7?iZW7>$~*%zKaC|
z=$N?ME$>#+%T&MZC`dW1wUl6Z)JgyCn~V%K&i0H|iwE%$>xsZW3tTfZxIUe<xAj&4
z4Hz4+{_ST0nym-LoHhM~e(110&D!U_p#In^VLIn{J!Y#z&<>Pci@p;cRu|d=ItIwF
z1clVHy{hH?@SD|(Zfqi^0DQ1hczHN7xq85h)rzQqLHMX2^IkuK7FB!kI40s$|CY7~
zNX^{_UjN8}L%Med;|+=4RNTMozn8KT;2tb77bUPCmioh+rZBfIiM6f_P34cQ__o1G
zWqQp3VL~~pE5?qODf%iiQQ3f42YF@09tQ*$<v=*TB6gv{jy879dA6iNsN{5E@!(k4
z8HhaiU_^B~4$+iH?m^ArL%A5*Efo_%8ySb3DJ2+($#iHi9LOmDmMF7*5N3n2&E!HG
zolrkI2!HM5qnOHg23Q1&UfD^`iFCzlg;)`TxlRkY*i!V9>4v_EKUx;t1KCPCBtgqg
z@+Tn;O)a0uky_%jm+WjNB?=~VyH>V#L!*=l*@OS6SVyt_UEH&NA=?V2stHPyKkVNy
z<J*73J43UcB3bH1PM2@IZw;E0-Pr(2?E_y%c)4{fI(WYro>&jg<#cjros){#ji)dK
z%)We0L_478=HZ8-@xnwsKrWs8)x`MB;(Y`Cmu2c-&SH(vN-F(*e`l?c%+l$|y_AJJ
zhcDGnwLvN+bu;_sX|1<mH)GAPa-4}{cUWY%Y?nWr&(mZ0q~a8r+)V&r!Qf@i3-wZ~
zk29f}K4Mv56>AiePh<L{fUUyPI`J1j9<HC~w$=DnBr|v`eP$5Ka$0AMorz8kwj<6R
zqIF0X>x@u&%P$hf*xE+O=~D?_(_KGWQ!158YL-y9$*6mmPo;Rp*Dl5lm-mVM2i`h-
zM@nxv590_tvMwPD_{l=b$iOm|+|S{D9&P%zeT$GgX6Akl-tfUF>tL@Ld!B&{pN39t
zH>3Vhqkr}2Yul+jb7UiouWVGPNsxX7Ueba+9|~dz?d*QM$ng0DZfO0`7fAy?2yMm|
zcnRzUhZ&IcwgjH9cuU!w+VStYa{p*)4IgBf|E8)sqMYtB2KH_}SfsFq(c9i(Q6S3U
oBo%DI<H*|Oy`A%<=J$?q?|gu`ltGZq->*Kv;w;*%(i9W@e{{5C=l}o!

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ef8c08_256x240.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ef8c08_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..85e63e9f604ce042d59eb06a8428eeb7cb7896c9
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{wzI}^MB`Dm+sH{TR1w<4t)tA3_robX4CdCOHJC|7j+vW
z%J-EMX&`87enIluaSc0_SnYUx$GzUc?vrNXt&I`o?~7C3RJ>C-Ajq!3AfU8Dx90^_
zp3}MKjJzYC+`T(&egFXQ#9Ek{*oVAaa!zrZtmlRFnwQPRJXH<%pkK2*eP`pT=lwD7
zifq+4BY_rUTa+U|2#&?i7>PVvD?7R4ZfOLPT{e<z*9Sa%-q+JZ0`uF@uf^uR0+0eA
zKOCxXcaQOB0xyL&$7t}dfX{x=z?wHIs;&yo%nJr`+{Z2X98Hy3`tm$u;dhd<8yL(-
z;#Sne;Lpz{>9G~G!Ls3s8JtQE`jMM9w<tfkOhc;ql-3a{hO%LC#ZWVT(nn|vd<pzY
zQv5BF3Fy2~(>l2V9&Q+K2DHW0M+uQmEr%nYJ^7cK?uIpU-)=wn71ZZ-=@ar0;3^AY
z5+TI{2b(e%t{2PZ<B%x(nNg1>^HKF*vu@+Xr<l6w#|okxspftdv$I9rN_GQ)7q|*8
zs5y_rF@oIq1RoU``$~Uk{rhVB^2n_8t2HJSxDFflkb2zZ+{WSl|IoP?Sr2=Mv_tpb
zBhqwukeg|uo9qd8ZqP<?l)|%<*;D+JXWZi%on=Ghf-03Mlsz8h(Q+`v>&BAc@2BC4
z_vCgww#i=)ea5Vo$glEEVBBg_VPBj!)OO>)f@}#dg6ULOeC>LBHz<;*5Y;YfE0lNx
zg{N+4@lO~ozxpF69qV@VOGnc248Iuag4C1T)P^(hWkpP!{h!JekX}m^Q#b2B4f1oT
zIjsGz)4}-$rQ*-tS<w5Y%xt4vvDzNI7LjNDGL|1T2eU@2@{VTp9rUuZlx!D2{rUJ{
z3A%pW8$~DC0b2^P95?wbyueB1Bn4o?``LnX$Uf9F<C;}N4GLdAn{SZSlT7_PlCs0I
zDBXb%F`GiL7)vk|BieTWHX3ScMxyQ_M+@in`79A|2b?#r0AHuH>uc%qG>%<4xM#E&
zN)7lRK~^2VdiloY4>;#}A!yHOAXEmEi^+eA#05pawGXs>!z)gSoDuI#>bRCq-qjJe
zZ)r=A`*EMX6+)~er1kdv1L^)0-PsAEM7JF$O6G8>496$24lkO<m1%2pOjtWwevM#F
z42>SR^RTfUuIz%iSfn5b-t!##cs7sQI);gdAvqmn_v|%I9k;fCPl0Z)R1+hNQONJN
zH%3jT9sOq*a`LF*MiY=zlSSQZ;{_FL9M07A=In+O!~wR}=bzGEQpk2!Vc0p)qKAH?
zOk{(%06W#)DdICQ_S%Q@<0Y+!?9%#$gWJ%)EO-<BTe}-}iZ54sx|$u%lQFIs?k4-B
z^|c_dxJ&9M^?WcqnEWyMADUCvUrhIaT;pF-+@vY1ij0*Jdz5c>>^YZP{<`oB4~9xh
zL9-0*c4@B#O2ylYs_g`Ky$zb~v!M`NRaMNFYF*Gsu|7)=JyyMHjFC=HhGUE@{aI|B
zJ~ITXU052%7jFb5Ys#fhS_?4kqc7H0EU49B8(Chg0&JzU=Gka#xOz1)H0d4m7ZnRA
z=M^tdY|U6T!fmte{W?_r8H~qdq|q{5AMU_2It1I4143n~xL?4&K#BOB48<w*Teqll
zf9X0fz4bHZ-Y$~|BFf{9mP#ye@YYTq-BICfY&StDZDl#G{Ztz02J1kC%b`U^<5ZiZ
z__Fi!u{2kX`iENVlA~L2)^LW8=_9VB;|Bbj&#bO<lzgV3Z>l9_Rdm!(c^C?JU;tF0
zEh@o1y6Qa_>}#AwX{VY+`C^kNkxhgb1P5cB0%xupAXyg9NO=SnXrJUE?rQg{Lcsn+
zAZKctGLfbK_B#^&Nev|0^fB&?DN=ak8|0!np524LD25=s84BP8Vl(3=jflNp{X>e@
z637Ri5xx;&JNl+XYImA|{;XR~P*svYDEWYJ6I5!6uO~2twFC1ZQevB7#3z~(apxn&
z^J@>Mc`>PJair{yT`<jZrWX;x-v7*qmDxI3P+Mg!OC%kw(l;VOuzC|8#l%8Tv4(G0
z7_1cw5ch!89b^LbMtCv$CT7IO@xA>iuan-V+i%|Ho-pA<1?V-k^R2Q<5;Co%XxmL`
z018t4T0TTwO^w)Gx{9OSJ^9_|kgwX`7%0Rw!PO~@?xvnfUehvN;2Rc;^l>3kfbtk3
z8{j7p;S&{uTlTe9&HTc38q@%_KQFk<&n{vmrN7y&Cz{etcE->rq!6HL)2F!aa=0%!
zM%Bwo!7TQ5t;@a_#Q}sjk{UebWQZ8{cp&HN^$*JfH#8spkhk{R@CVBiPuP@yEhu{}
zsQfuhTqV%rioATpEphMfhyRYbVfVW`YwLFXUWm-===J(byMf!5;W^CV1g~2194Xx)
zFK|z{pm%n-)-DRe{Qhk(d!QaoI*y%Wn6h7<6A{i*Sob&B^y|Spg!&J$`kN>zwUJ3x
zaB$ciu<nSNOim3uYsQP5jc-?Naxj(j<)z};2hoFn0&u_kBM}O@VS5)nDYx1pf*RQR
z`S)$xBwb^buzAY%gnq7CFpintWEa)7yX44mQ(9Sxz=?kBxk*6p@w42$*>*0FJKg}T
ztgnh)ASF8njz5>h6?f#{c=<QigVeYbrKRaeqWoE+%S;th=M#iBteNh&UJyV9DiQ2h
zCovT3fv1eTQ@mSXnGo$!aqUldv6@p0GWkoaEpG=8r)RRRm`|p~(T62hpEIu=ka-lH
zHFz2@lD_Q*`R}K5+eNd{WnX-*hEHn`>*Yr4W_34$GmVIo8OLWjcZK4a0`+Yv-!*}9
zBwKm;DAsA(nDI-`iH@;`=gP+m{lgFLHK3m$W@?)&dGhDA_Z2xOzI0$p(ZJtH$vCxE
zj>+kYNBJzs-TlSx!tSH}%I9fQv)mc!C7X0bKlZv4f&}C3+O-4k7A<p}+mKlQ4rT=l
zCn2{pDn1>mVO|KYZ9ydP%(N1^uisV8y;~p`x4qFXD?!_OyN9=w(O<V*&M}1I>d6W;
zGrT?G;l2v@Ob5k^8w<9w%Jbjb^|H}PYKo}I<qcU#EQV?(-;CW$3_+TixaI#lD-xJT
z(AO6gph7h?y_UKm^jWi&NP`DX>~bobd!XrTbzp2Zp~H8lgJ)I3?l&(bDiWf8gE&6b
z>)9GB=Iu-6%I((+>=jGP>CzD8c0oWITFZGgM!Q7|JrUYq4#^Y(vuDu-a>OWDa4Y4}
z5a_*lW#IL_aVf8L+Ty}c&2VojLEIA-;eQK6Wo?<KawYbZ!!f3+b@4Ui!v_Lt9t*qk
zDRw@T5NsTbrkFQA%ko%G1_Lb|ijKF_IU^teY$_8;Ght~t5fIeS9_!kg2AC0L3%DAp
z)%@G=p6e~2D2qisLge~Zg_>xAuK>i;1VWx3c=!s2;j_*iRHOsb*>6-C<qcj8`@=rO
zP}XMY68YV0>gcYP+Ho=L@XLd*j~2ln-;WHg)|cCixksH$K={5rGSD@yB%LI|(NCc8
z1Er8H+QO)~S~K{g?nH|2dB8SKs)BxQ?%G}}o*LV!NG2m*TmR|pWj~g`>)ClJCE#F$
zcj)fBg(dKOKmc$Cy}IRlasngIR>z~kP&WW~9cC951{AKmnZ~ZMsqup6QQf7J0T1;C
zK9*Qd5*(HxW=tl|RfjO>nkoW#AU3t>JkuzWxy4-l?xmTv15_r1X@p@dz^{&j&;{Mq
z$^0$0q&y?kbdZh)kZ+NfXfqLTG}Q^j>qHlUH4VEK`3y^-z6Y<6O88Hf4v^;}!{t-a
zDWg;znYu%6zA1~A5~<XNrYJBS8~snn$jIDO<y@mJydzi%ZH$Z$)QuZaz%45=1m~)~
z4Q`zYwLIYfLfxmU0o|G_6zFY@4*h+3cz>w?<TWDm>fxO~i8-Ib(^02{c4pXjhDI^2
zXB1LP4dvWuc%PXQ{r!d#6>${rm+M8EJM8yf#!H$Kp8AxwUXm5`7Tu-J$mHe<eDz8P
zkinV!Ohb>CG>vw|&Ay415}_1w&*9K8+2d3v1N+@a$|820o4u60Tj@u&kI!~q2V9X;
z>tMvQDI|O$#m+m2O**ZHq`_{#8)ry6`&5s~2k{O4Du16Fn0P;&_(0!e5%Bel){nU0
zJX~<8U6hoI%yx}qGY_1Tq7YKDJ)ETOCs&W)TiCrK*1%DE*vXdD-7hwE*LUgjeHRM`
z&@pkhTi&gtm#Kc+QIK+2Ybn9-sFVKNHyIgfob4H_77yYh))Rq$7Pw|+aD6&yZ|ki9
z8Zb6s{oBt1G+PgfIcxd}{m@~1nzhe;LH)5;!gS8@ddyabpdBc?7JVl?tS+<#bPSMT
z2@0uYdsWN(;Ww)n-PlA-0r+62@bYkEa`k{0s})fJgYZ#5=DmIdEvok7aZJRi{w-|}
zkea&<y#A2`hji}_#v2m7skndFe=lVxz&%)EE=piOEcJ&sO<`_b5^G%<n#vzp@oj^X
z%JiB6!h~{GSBxDmQ}k74qOt+84)V%~Jq`#i%7JivMeIU@9c}EI^K40lP|4}S;=!@7
zGZ1<3!HDW~9HJ?Y+=H6KhjKBrTPh}kHZl%5Q%W!nlj+c4IFM2PEm3CsAj}43o5_VX
zI-!1a5dPZ9M=_Q046q0ky|R;>6X}ZA3b7&vbDb7)v8CuI(+zzSf3z&P2eOrPNP?D~
z<WE8xnp!@QBele5FWK2lN)$}!cCBpfhDIq9vIqZBv5sQ<ySQilLber3RTGpZf7ria
z#<%~5cZOy?MY7b3oG#yZ-x@S0yR!k5+6TUj@N(-|bnt#LJh2{}%jx9MIwuve8&6>f
zn0@)0h;~5F&BG5v<AsTOfLuEFtBLWM#rp>OFU!=woW&ZSl~nrs{?1w>nWfW_dnpTd
z4qvLDYJ*ft>Sp%M(^_xCZpNBn<v0_^?y$&i*)D%LpQp$0NyRBLxtjpMg2Bt27wV-}
zA7?@{eZ;cBD%L0_pT_h@0b7Nob>c66JX}A|ZL9IENM`U>`ph7d<+RQiI}@E8Y)70s
zMC*_&))}GlmR}@{v9*nm)29-=rn`Q$rc^4G)GVQHlTr6BpGxtHuU(8AF7Ffh54?5w
zj+EYT9>x)PWL-iQ@RNm<k%46_xu3)RJlgba`xYU0%*_29yy1gU*1=vg_B;a@J`J7P
zZbtp1M*r&3*S1r6=Ez1EU)iWolOX*FyrcztJ`}_b+S&bhk>T?R+|c@=FOmj)5Za6_
z@DkVy4l^L>Z3#SI@s_eVwd3D)<^Ivq8a~J{|4mhOL^<7M4D8){ut;GIqqn`oqCk|x
pNh;Wa$C0(mdpqYz&F>xK-uVD=DT5%Jzh8ZT#aXmjr70%*{{RacS`YvL

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffd27a_256x240.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffd27a_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..e117effa3dca24e7978cfc5f8b967f661e81044f
GIT binary patch
literal 4369
zcmd^?`8O2)_s3@pGmLE*`#M>&Z`mr_kcwz5Nh&g=McJ3E!;CE1E0ryV5Ro;>nvtvt
zk&I==Xd;cVGZ@>q_xtnx{1u<ad7XP-_m_Llz31NZdcG2EQRlg#Vo(48z-?(^ZVvze
z|6T#B?4ZAvXnA4xuUoRUb~w8~68XP#e)ZtVe+x$i*`qE2L|`Xa*=^e&W~<9M_#tnj
z#rVH+Aq<7gEG|f0JFaQ38mE(h>%7-D)N|5YqOB>i;(bZ#o62{J2Y9&^D3~R^$o+X?
zwbxAEIb)xwCwK3TSR4QVym6N1rVgPmmt0caryBUceHP_&u}{?^Jn7f0PT$#h>UDqI
zr!q(F&1jJ2_!jxdAB<)7H$foI*2zuncvu;;$SoU7br=AiJ@4=BC4vNO>DS`&UIB=K
z;2)0F*t^FBvVfPuT4FVMSwUw%Xksjyl+;#*DDy%=ocFOyzDLvLR(`zCSOuJ=?FWYn
z5ZD!UaoF>-$@=Vt?a&;UQYM$Oqe0ZB?Je?8ZnMxDe&uzzs*zlHd<n!{fcOy-3tIxc
zl9G6fU;?@>)V58nfJPc8S^({_4bj5HQ_B&EXHWj6wx@B;!mr04b_Mx)UFL)W7`V!c
zpMp#C!a!!sh3h491y}^qfimXVY%!+sYu0_D<P=jc<5*#|6V<{WZGN`6N7;T5@B&-O
z4YA;LJcgH_nB=Dd<6apIuYX_dSRS2~d9}u*0@tAvp3;xIUD`Q4{vSHeBHLl#uuj<i
zdw9AoFJd!YY?C9=-W}2;fmD2UGG|&~>WoJMqpN(FR9LM#jdZ{vJzEck`P^9(1N=4J
za9%u4$2J8TAkUaJk_FX%iHuv#svL_mMmp{SR}ifc#ZcXv%CFsT?*>N^6r(%D?1YnU
zAaT?UZGlOn<yU`%Wa8Y9e(6d%oe>a6UXXs0m)3YDp}d%hb@)@Y!lK_A&D6{OPlNnj
zYY*$b>vnRzL8=CDbQSi!DL3D!P^xhNtwrYByo?h-&OvQZYJ6ka{Re#<tfku}Pk%l>
zSc0ry_d(K$_Q2M{Y^O~DOK(szDOnMi_<pwV9HJlj%%pbJNR!N8!0s1p{Upoaj+ETU
zEK+aqL+qw7G}a0PL5uYtfQ*ORTM)>*h_Rx%eSRxA%n|FuC&=F=<MvvnBAs(r9_AGz
zj#LLeNR-pStzN#d`2)svUKrAQ8VHd^=b;OpBCx?RZykcH-tb9~qbL$x$(`2<NV~cc
z4z2Bp@;~m=w?YY3`1HQse<0qUrn@+UmFad91gTtZ)sci`wvk1%_;MW`&Pf|5tFMu4
zNntUAcOEu%z*Jn}7mF2zKzm-pAJ69V*u*k%Pz0Bw+@6D$nbX!5@F~#!m0D7y2@>)B
z_Qsgmj8g!GA+LZOX)<MTZnmtSZMvX}iN~6m-JIQU20KF6`U6rsN{iU<Dvr1WS@zOz
zl#6cg6=J4)x<q{k$6xz$eY~XokVD3xXlNVKpABoKf9r6^O!Mc-%+zqecrz!IBHZPk
zw7nJrmUK)1q@E9fg^)g`{6kCX`iq%f7Po|#WOo_zsuE*m)B)+26L-$_R)8Mt!h_+m
zGL~5ePlt^60=e?-MYRsRhyDgl@7ZuDwz@j@ON}1OXo&%9FFj79dYq9#Pl2J0tpZqW
zoj)^#YFt?xCl+r6r)bG%OxXxB9bzulRW7L4VwzZAtOD$$wddJsYuE;LaTM_#<QEkK
zsNj<*RBFpyHO6kU?fp7b`x$~mXQtCK-5&11GCPIZRRY80sMue?{vgSOolK=^)LZxH
zbARbRFuV0L_TDa&7c9o>gOW}vbo9|l8QW3iYw9qCD{o~xt^HIU>;dV5MJgc0#uHTA
z<b?9`^Kmpc&W4BD98zOjFt!MWuh}E+<l}|{o6oGTbC!N4qi(7vXIFMMOnVxMbfN)N
zpdB*NBc}R2H}q?~Wm%WHWyNB%7lB=rj|B!oI|os&8zNX2&PaO(73!SiCG6_-sewTO
z1Rz&hx(b1H;PyKr{Yfo2#_Tcnj2S{?^c(o11&+g0pg0yUvKa>80%Ee_r;G`GUjssm
z*AhtwpW%Ly;X4Lq1Zq#ZpuwzrZE$sR087dN{w7PA6|Mo#6wwJP085K+h7+D>NyeX#
zk|?M<oZ&;KrN<L<I(I=dD@q?cl4IbRF&ndOs<5uwMvg!{TBUD9u|OM4eU*}mSV}bg
z!o#6$7=VN)xc(puus6zwHZV0OG)?U7PkW#AIo)ydHqWFfKQd6ixr2X|O$wi7Elt~Q
zP6v<?64wgA8tUqVma<hW?e59%zK8rZ0VY6U?n&-05mXQLRLYvR*#iHFc$BXzkqlHo
z6W9SifpFjGSnRT&jat?h?$a!d5Qp<Z%K{vt*3t%>J^Es)JtP-2eNr0EQe*ZM`&}OU
zCD*uSSviE&p}uX|@1g_%|3*ra*MbBV#~cshdcFQ(dGLnTqaO-3{u==x1;Pp2im!#`
zuZ2`ThfAmiSzb|4h`c4?^ZoGOF*oXYcV}(ge!v@^bse?daA`Ma+bSZLIg;pIN17vM
zIOYfK=@s_Pj?~#lqnY2o?d1$MpoqsYQw%eX%X6Y4*^27{hMWGqILEMnVYUEMW#x7f
zu^I*nzXQ@6HJ8n;<zUNvk-PEjs%<X1ioU#5GW#HA=uaT__dpa}F)w`Yq8IsAdt`7U
z`+&f{UAvT9oH8a~#Q{IST?fK4Gn(zAyLXqIIB&|RDC4<MkG(eWs67GJyEog<1@R;p
zqErmjFbl*Kr=W@Fa@dm2f*UXY=6aA8pQ^kx6Gc!sOK_!BGj%_KX(L)0{_BN-RG>26
zo^1+Ewi$fN$Unum1(FTb8I#cYgcGklwIExt#Mb(D=x~OTeZ^ubJ)S-ywfdZS?SRCq
z<f6&jh?er}Ff4dKlh+}ZgDU^xdo^N4XGA|QMlZXk36y0_n94j(>Dm=eU<x+0r+(K0
z$`kDr6r$N?XyYa?y(T-y8=tEjFA9h_xYvk!0;klqRPh$f>+CCWO@8S_m!W{alT)zj
zZJbjxm5&No5xe_~Jw-i7`&G}=r)POGGfFq<O8y-6Cxq}O+jVOPKCRjoSodM^fgSV;
z21Z0|XI6eXR7bxMS=$0j;+W~BbU**AT6?!xT;2D^zN`dq>+c@kQbB#)ay`coj&C3-
z(#&xV@Q3@VJd{qdH4g@4ZJi&mx9e@Io7@~(o5vTrkW>QEO1T-gmlTRHH+3)gcUC0P
zk07rvDnf*7Y5J}8!>F_7D^Z3IoH^uGH}_a(ax{Q(IrvV$olf3WN&DY?<mf1{#tp*6
zbe~sSoVbr4l{;@hKd4VUJ-1s^jK>uYZfvXI(;Vv&EAoQtfH<X6@yy;uSMU*|aKXKd
zS5vU>;+4VI_a>yh*J+Cj!?h!QX?O`QXk@@G7AjloJe51Cw*rPXQ>#y?B^^ExRQFui
zolmv*C5K|-p){rZiCNai^0H`1(Qr(Hz3v%7NnmriXu2tD>xsbN#*R3*wsZhRj6Lvb
zn0Cu=qkC?*e4{NF_3=^bTb1f!g?@ryFH<mSX7J%FD4O3UZ%By_%;30DZJa-JG5in5
zFhfO$wOjOepP7?~dRphj@WU?;zCKz6eSAMUwAxT%JMIyEG7;|g_Q+7rq>6Zw2tz%A
zzz&o{w`dDv66!6Wk9w1-dglS#Sm{doxw&h5Z8&ONmlBBte{J)puaDzc!LC==rPRQK
zQNH23?-rIo^MQdt3Tk!B@8l#}fxVtrlc8Y<>ORaVE($DKc{77qV^`+`%_DotrUD=8
z4}L7QnZi3RgUy*tteY-=$SqA2@IZWe(}mI`nzhAT{qC)my#rJsfoS*<ZNRV2gRlj?
z)v1Cl_T+qH<V>)xCXj!Tk6=3)cr@Jw#OcNqgS3pg7x|4!A$|w15X!huR*vB3q9Ya4
zF{xuzEQz{9YPl(gk`}Gffut%jotgqp$jZvzRO4EsExf~93vY~04AxH=lR>R3v3Qs2
zy$v4SN%ee@Kz#kDtARaQD`d!R%}#@T1=v8DAow*r>+0d1KS{ZtA~KMtgm)+$JHumW
zw=;@qWk&MuG@LKx#K3@&WMw?r=jD2_)(*$LmkCm4_@};QZI|SPe8hIC6xqBy!LQyK
z01_xmfNA9UlBU@Kzu7;zQYxHE>OCADA$gwaVqm`eN?XQF@NkrocB}lU4hcCf>wqir
z>Ya=PcE!Xm#JG8v@G0lj&~)hScM}X57vGw3g<$^SUls53f|Bk>5FQwqE&{%u(f$!1
zl8+53vyYZ`mEEp&YT<=(krhKrw?~pS{N)?q{0qBR#2Y!w4!hWMdj`a(@A@r$zVB+u
z06Hb@_9(cQ_AxbXI|-2w>#QUhp7k<+`z9+(jkh~v-Renr#C9U+&jL4vg6-E$f7@UU
z(1fxB8{U2vq}h3rE!Z+n7=(>D&}@9~3mJ^R5}|WVG@!RSh3r{!>QHwg!t29YS&jiR
ztyn_q*k9H0efZ7hO*b(WR|G!TDY`rol~Ob4&1OwdM8kbGj`^$~L5gd<d7YB5YJW@H
z1El3`1FwJN#3DR;LU2X|A1e0W_1{a~3G@h&oQoFR4^R8yLsOhvm%`Xog{28ZResyx
zqB6ZHK&Wu;>WYceWwL=PB{~NX=cu3p-{S;hqaE?bSHv$g+SA6bxy+VU3YVTPDj6CN
zKLb_(9gM2Y#KW8ONxjH9To^Y)r?ql2cq8+WE438uIF$hjfdLs6-;!jv55jGcc3Ipg
z;}aT32NAEGeU;J}&j5=+u`4?%xlwL7?NDn%2={4WS39yn3f;&r=|}5=M-Y2yrxeSw
zv%*PmV{_{#Qk1sD>?M2KDapb~z3!E*-LPmCe9q86D%MGSe;4~~K-jKQxq6b^902_{
z%>4G>@Xqk8muR*|vGe5{@7sds<aRcI()+-dk>2i|i;g}oMkd!o^0=HG+vcPrcN54A
zLGv$PlTePRxp~-OSb_*aACO1qc{MpfS-fv(@UmRv%UO)cSt;ee@9(S)f>|~bwU@eZ
z=kTS*sdjLclwMZ<Jgx0E^k$qnMxHBa{0^(!mfiA)^ZEJ=-!!ZelcyN~EF8Mbb)i9e
z^>G#?%U3)bq-uj?@@vj~6tq)ZS||Jxz`+di-M5<Fie`muWl)A7tfzIyIhd%F5PQPh
zAxf8Mxy}evu=*ltf~ji)pFWl7J=6W8EwxIyv~~%3n}ob~`BbWRLfvBgNJYQsf8eXf
zb*A=3@G_1-qwA7#fS;_y%uEbp$>SXM=h3EL`?pB>W9A;`V2vM)vk&%KFy|TAh#AQA
zb_?<!HTqYNzP6jrw?H&O`OC+In}z5{pe1eS^Wk6)mYv;?7a6{vK#gr5`lD#T2VpIk
zLT|ynkZ?ny{+8hL6(4EaQ#%3OSMDDzt>J==3f@%LL{`vU$3Z@A2a9C3aC-YY43dR>
pI7J0n@;b3~`)ubvsr|iU(l;L{A#E6J`}eC4usn-0uQEf&{2ws1m(l<L

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffffff_256x240.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffffff_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..42f8f992c727ddaa617da224a522e463df690387
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^p#%>t<I$5%B*(%$RifAlJDl()+*_W)tj4atJl`V!4ku}Mhk*o=k
zjAh1XB8{;#7~8k^`}6($6`#j>oqJ#RmwV2==ic*rz7lOw=eaq=H~;_ux21)-Jpcgw
zdj+hrf&W^f<%Qk9Zpqf#;q3n5{{POY;f!wmTR1An9(4&I0z1LNX50QSTV2M%4|y9c
z#{ZQIVJKu~aY5?ZaZP*GIGqGs=e@q6o|EPhZB3CC?@LnORK8O@z{{<0KtSn5?#~OW
zy=L;x8T&*%xqElS;s5~Pjk7d2bqIaA<dW(>)xZbovnZd7eX17WNxx=w`p(8vulwUZ
zl{so}MuRNJx5!8S5G;$o2?BApPHt+)!^#*Ww`?rcVE}mcyuY`X2o|uVUyI9o1t11O
zemGWR?;aD#0$vJhiPhv~0iXS#iLq!>Qd<?G%nJo^-p4Na9!-~9`SCtu5pb5a9~>$`
zU{}<|Vb9Md>$4TMbL7C3GP#r;4Wc$}Z;^j;n}yc!E3d;<jpV}POQ7Zg#E;Ne*b?}a
zl*C&E6VP>`wry$!JkmJP0%(tIh!!TET8=<Gd-5-}J&kJ?em(xME6C65GA9%uz*QFf
z6kM7Y1~y|ZTrZI;z#@<ilrhg{i!qH~v+ffmr<i&f#|opJs22Wc^RvZ0%JzeR7uZT}
zs0FX%F}(c5BtI1x_sU>+{rhUi^60G0t2HJSxXv-*DgC(HrJd8`|Dp3NvL5yg>xAvU
zho|fEA~w^-HrW&H-JwkqNX2I-bEXBR&Uhp+y2^)1h1IIlNCzC!v-Mz@&z&VPz+cl1
z=f&f6Y*U~C`ixm4Sy1hl$hg(4%Dy;bq~k7d1<@K&%%NLT`L+A)-QXyKVswX?op90(
zB#yeFEih@c{OXU8Oq~1CFI_38GXmns3(`;W(i+bslovCx4u7gvK>DrGOug*?G|1nz
z_OR}|ZYS3pq-p?rS7G0qa`TM}r5XqDT4cV>%Qyk#9ES}`jc+Ww|DcbZrF6UG>CeXp
zOVIV}K1e#z9@tu#?X)Ri=?zXMB`X3G-_I7FL-Zq`nbfWtX_EO1*!+U6pJW-_k&+vk
zMd}THh}{(Ch_wPk(PI4vVB_KT76kGxVytLxpWg}&bHw`a3G#QzxV@ICNax&@hk3<_
zBh`Tq66G{-tCw$V{(y0v7l!tp20~@gdFX<t2yAf7TZbU4H+&N0D2hZ^a_6-I(yp$A
zLu-4Y{Ez$etx!T0KE1E^ABgv-=`PL?WxCx2K`NJ9btEB~b!5>jzFbF#bJE7i>T4ux
zQdrF3org^wFcnw$#bQMv@SfN3$Fuo7HnB_`2ZGB{ZqGr>%xP;2_!Q{=N-ZhU1c~^5
zdt=OO#wmcpkXJyCG?{{&n=R{Sn=Ytg;<09CH)l7TA&wkt{Q;>RrA2Ia6-QixEPLrU
z%0)N$3Nh0?U825&<F9?WK3>v($Sz}0G_(!v&xSSAzje4{rup+^W@^}ByqOb95$<wN
z+FlC*OS+|hQqPCLLP#G|{-Gsx{l!c#$SvU|*<FUbs>E0sbwK*%#GP}!6`%*Z@L;&C
z3^dE&>5%bWAXmP<sMdk^(BGixJsS?iR#(S<snG+CmKd<~(&IF$#~B&)6d2mrDuBh-
z`7=YP#+9XUV(~_Bik5uFl#L+MA?9LT<$`)GritanD!@)!d!CK9hHX$6M-ksae^D`j
z3O<QKrMApfW9&BT-mgQopCLGOW;!j??cokAvs0*DB`{2miv0!b50XsS$yAy~y>*X1
z_m}Pivs*u7@9i>qA!58fDCwj^M<1P(u^m;urVdlM@>aIf+E3-d9<VM%qyk!OJVCWh
zPAES=A4hZJY<Q^6E;Y6VV~t?=nmyu9K5i(m`ONw{XX$4$>ZW>fc4cS7w5O3sCmKKn
z+94A?VyfSBb9{}rEbCIYtXORJBCv__fnZ>?a}edaA%bP$jI?J^q0UKO!mduA8U!3b
z0CJ_Js}NWQZoebapVUHP%pPOUm?1<)zd<fq;MhF{ievF2n_&PhASNq*%9zmiH6XNj
zEs=Ea8SWPuzGGlUp!TE-8qB)a23IEsfKm?dH$i1qxCT5^L?@^KA}zidPI#gv8Gk-X
zqM+_@h7X;V9#72a+y&FDD1Goq_JL={tjxBl!n$f3IRf!$mA(-L;%G4SRZ1!Xm1z2f
zhjX-H01}>%`hzUM-Y6g1z|@@3G_kio?S0bcbjQuxJd>vU$Uyz(4*peEDSVc-G;O;%
z9Y97%Tq}TRsH+oN%2u(oyC=W<9`e@&m;i;jC%L;sP(9RBDQnth3;ZMEQNFH3GEf0c
zU<3RF!hNG-vCDooYFS^nPlFnv4(ElI1=vNcr42TF^u<zpNG@plq%<5<WA+sLT^{=-
z*SKa`IfTWbzHQm>q67f{MoN>{f&>xA91r4pz5Zc&@P^i-9||`98v$Si!U@}ouZ88W
zg;YL=OQ;4}UQtkpyd~lD{qWy0H|lwJXKmenz#E=*9kt$YX*X!wDk7ITlIUGWnj>a7
z<_GQR752@J)Y(U)ncu(d<qS5Uh{rKg3^Vr2bD|>Iit7P}oBq8x$FP85)&Nsw<#rOW
z8U_x(1J)Zgm(8tZXU%+(yYcO+Z7#ZszPwa2`ygiMPayX9KondtFMRK!7x`9uWN;(f
zfWW?8yOdj;GA3We0YAW92gWipn(d>zcbA+vZ_21B<GE0ey*BZvJpq=xH`~tz@gx|c
zR1DNG3&a$spo!;l*pkkI8!!LndXN^Ms=PE4MNl|PaHUi;bw5F9BU%~$>xF?-pfcW`
zbqY<k8GOpfKgG8NmJQVzlhFBu6R$nBAX~7++WL0raE6k7#bPQwo<1VA`kZ;~fW)ih
zqRHEcmh$T`EO<YY*CCdJD*xhpHDX3*L_aS^FT1A+oMlXy$~;c#+7(V<3O2N-e%AuZ
z6YUffqFHBX<0db?COgL)pQ{`%3Wzwk*NA!or_{An@fOVM>??6ie(6M)p@6@WQ?Tl7
zoKrKEj|x~2yZehhMLkFRRnOC>XL&L+N;m0B{_OQ9gzzTYb!!Jct=bk?_hIpY9rOwY
zMnr69R(?8EN52qR+k!~qnCYc-KmV&*d$&NY?t5cjR)V+ncMor=puTRoo?{5dH;@!*
z<~RrV!+ljAN+;Qx2LraY&JWnz^|sYbZjP+Y;|pC#DuHUH+>F~x3PqTkx)=OAE0X9(
z(AO6gp~AH^{nq+n)LHYDD8mQN?DDFcd!U&d4PaajzSD1~lXq3p{x=^vItrq3gD^4O
z=hYS`?&C-0&KuAV>Jv}T?ba0IafL$~+bZ}p$9lwyyx=-uPN`Hpvv<)Ia>OWHa4+N4
z6zscrW$^XA32E<j+Ty}+?MPo5Uc!qbGT;`7%Gx?l<xc9YfT7LQ>Jw^7hYtkRJr{Q8
zQ|*1pp_q6Mno|D6EX!kgSv0h0I3~ef_l%$<u(@0`-IS&EL||}ZN1R(*I)Ea^7I-yG
zyXCjhJ-1uF(Uyz)_^9=*N_DY9KS79>DTFjL`0y16n%^dGNQn;2V82mqoIi9i{15vu
zLq&(BTl9CInUjZlTIa>^!!HlMK3W8Sd_Ow0+E8IT?h$=55$^Z)$WYIuig=O;Lp_1Q
z4wOT;XbWQ!>Mh`pdXuSo=K<ST=}P*!xodlEIBHy%5{U$VZS$wEkNsG|u2<Kk)WCyL
zzTvy?7M8&Cfq_5@YIV!+<Rn^wt)5qtp<xK_KFldD3M^WAGlN-UQ|ANEBYVoG0w3xR
zek`?_!aFWQ%$ZEAn=XFHElm{gKzw@Bh0-LNwZ&Zh?yZ%*15_b_Y4{Osz^~4Oum!!<
zse&!G<a}e~Ot7vdkbjYnU^^LjG~ETn>Bba;wT!wK`Hf1Ueh04*%D7Kfj*#b~BNfvz
zsbf?uiMm5-xhaQ|7Om2OrYbU>ngUM9%F5nU<65IFyu(`yZ;Vb1)=wCd!L2K?c$ezE
z4IbS|^?Z>)eEp}ZfjwF)Waw?pPJ?{~*g%;e<TX6&>fxO~Nx7dQGLWZ)cPQ*T!((W-
zGm2?tM)K}7oG<0Xz<`ltWjxvE<$AH!4*R{A2~uYGr@m!vm*j+e#CE9^*}Oc#uihB|
z5;#kMY2^8mrr80%*+02bDx6B{Jsch(d7kQGV7~iGTgFZBu$Pf`tNf`B2{|t7fGhIq
zos0xF#l$bfxOtcGDd*MDbdKBaCKxg<zBS_t!TiI&D&FS>CEbr8JTNd_1bjWC{Ubgk
z9~)9;A1&=FyIt$l!VBXfD~6VCk0fjO%QwLJ7k00RH*%I8cCqF542VzP^;`OU-_?=<
zbV}OoQE)HqV`|)X5+WbgSxGWH>t+7-O;(l~Z+FJJ)sygu^+eF01#Suj+pnAcw!s>p
z$-xF}c>7t9X6H$^V9hvT5H{jKv+=zzWHA0pgw8e5fZpm9vIphVq3%S4*N3%&jsY^Q
zK%sSPuj=?d{ATs0o0y6#0w3%YT^@-_sTuTUwI(Q{;l3KjeAbVk#Wmi%PDxm`zoqQ~
z((<-}*FSP%5gt7uI3t1&75ne{@1^bpdW1;MMGNkSr~UAuDbB4+VQi|x(gdO^zin_)
zncfs2hj8xdiiy)@vVkfkItLKvsGtJh<Ah+N9r4Fk#4j}3)5fp4%$8OPm!2*v85$2i
z15p4UjH=DV!<+L-y~sIS7&k+wwQ@3eBlD0ewG{0*l>rTb0T~tFl4Q3J!flauS==b&
z6B<Vc5wD$nmC_i`0E<AeD?2H<QEoWxP-{X6_i15QJF-Cv-N-NLN9%$|5L;=d6lmF5
z;UuK7x%Cq%N?T&~lD+MeWZ|S<_sZ68ShNa0XXqal>m<Ivi+wgAY*(pVJxOj3;P^Mp
z{Py4Q&hV_4XtqYN^W_`w+k)rhb~b?0`@olx-tL`?jy^9&Cf7sqxSSo^=A<Kc6UYof
z^DkeMP>!g%dDvlCf(St$kVofvH90|9yl-gmvRvcKS&Ye9DdoTK@2m}iSvC{3m%4E0
z@TJD7c1V?!URM7+t?f3)%{X(6JXg~A9TvGQyX6n(^Yt0NX;>vDPcr~mICPooLWA_`
z<1A>FuXr|C)dtDr*PQt%Xs5WePWUB&gBj$zZ#BIY%?jDdpbSA-PV0`dGf^oa_Jp}Z
zlrGV7oe`#B^+nPIQ`ZDJeJas=ru#=*YL#+n?Go}f33>1GsZ{TTy2bdBihj}mz*mp!
zOzn%{WgLM=*CpiuKUs*GnHa{B$2siJqfNi|Z;|rH%stM*8b26kAMCYY&NHwPGtlYn
z7UVx_^sgR$Z8x27foS63FCP<b7NQ@4m$W&a4+pb@c6L8rWcYppH@1D~kD>t|gtcG_
zy#@C|!VQV~TY}G5e57qp?F4jRxqq~@h6^?-cvD>ySwVLl2m7=gERtEn>Fw_@ND%pO
oiVC*mbz<%I+0K1Z`+LWvZ$3~$+A!Gm?^hpSc@||}WrmLVKLvuzv;Y7A

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/jquery.ui.timepicker.css b/3rdparty/timepicker/css/jquery.ui.timepicker.css
new file mode 100644
index 00000000000..08b442a7e53
--- /dev/null
+++ b/3rdparty/timepicker/css/jquery.ui.timepicker.css
@@ -0,0 +1,69 @@
+/*
+ * Timepicker stylesheet
+ * Highly inspired from datepicker
+ * FG - Nov 2010 - Web3R 
+ *
+ * version 0.0.3 : Fixed some settings, more dynamic
+ * version 0.0.4 : Removed width:100% on tables
+ * version 0.1.1 : set width 0 on tables to fix an ie6 bug
+ */
+
+.ui-timepicker-inline { display: inline; }
+
+#ui-timepicker-div { padding: 0.2em }
+.ui-timepicker-table { display: inline-table; width: 0; }
+.ui-timepicker-table table { margin:0.15em 0 0 0; border-collapse: collapse; }
+
+.ui-timepicker-hours, .ui-timepicker-minutes { padding: 0.2em;  }
+
+.ui-timepicker-table .ui-timepicker-title { line-height: 1.8em; text-align: center; }
+.ui-timepicker-table td { padding: 0.1em; width: 2.2em; }
+.ui-timepicker-table th.periods { padding: 0.1em; width: 2.2em; }
+
+/* span for disabled cells */
+.ui-timepicker-table td span {
+	display:block;
+    padding:0.2em 0.3em 0.2em 0.5em;
+    width: 1.2em;
+
+    text-align:right;
+    text-decoration:none;
+}
+/* anchors for clickable cells */
+.ui-timepicker-table td a {
+    display:block;
+    padding:0.2em 0.3em 0.2em 0.5em;
+    width: 1.2em;
+    cursor: pointer;
+    text-align:right;
+    text-decoration:none;
+}
+
+
+/* buttons and button pane styling */
+.ui-timepicker .ui-timepicker-buttonpane {
+    background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0;
+}
+.ui-timepicker .ui-timepicker-buttonpane button { margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+/* The close button */
+.ui-timepicker .ui-timepicker-close { float: right }
+
+/* the now button */
+.ui-timepicker .ui-timepicker-now { float: left; }
+
+/* the deselect button */
+.ui-timepicker .ui-timepicker-deselect { float: left; }
+
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-timepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}
\ No newline at end of file
diff --git a/3rdparty/timepicker/js/i18n/i18n.html b/3rdparty/timepicker/js/i18n/i18n.html
new file mode 100644
index 00000000000..83cb5e3f30c
--- /dev/null
+++ b/3rdparty/timepicker/js/i18n/i18n.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<title>Internationalisation page for the jquery ui timepicker</title>
+
+    <script src="../include/jquery-1.5.1.min.js"></script>
+    <script src="../include/jquery.ui.core.min.js"></script>
+    <script src="../include/jquery.ui.widget.min.js"></script>
+    <script src="../jquery.ui.timepicker.js"></script>
+    
+    <link rel="stylesheet" href="../include/jquery-ui-1.8.14.custom.css" />
+    <link rel="stylesheet" href="../jquery.ui.timepicker.css" />
+    <style>
+        #timepicker { font-size: 10px }
+    </style>
+
+    <script src='jquery.ui.timepicker-de.js'></script>
+    <script src='jquery.ui.timepicker-fr.js'></script>
+    <script src='jquery.ui.timepicker-ja.js'></script>
+</head>
+<body>
+
+    <script type="text/javascript">
+        $(document).ready(function() {
+
+            $.timepicker.setDefaults( $.timepicker.regional[ "" ] );
+
+            $('#timepicker').timepicker({
+                showCloseButton: true,
+                showNowButton: true,
+                showDeselectButton: true
+            });
+
+            $('#locale').change(function() {
+                $('#timepicker').timepicker( "option",
+                				$.timepicker.regional[ $( this ).val() ] );
+            });
+        });
+    </script>
+
+    Select a localisation :
+    <select id='locale'>
+        <option value='fr'>Fran&ccedil;ais</option>
+        <option value='de'>Deutsch</option>
+        <option value='ja'>Japanese</option>
+    </select>
+
+    <br>
+
+    <div id="timepicker">
+
+    </div>
+
+    <br>
+
+    List of localisations : 
+<ul>
+    <li>
+        <a href="jquery.ui.timepicker-de.js">Deutsch (jquery.ui.timepicker-de.js</a>
+    </li>
+    
+    <li>
+        <a href="jquery.ui.timepicker-fr.js">Fran&ccedil;ais (jquery.ui.timepicker-fr.js</a>
+    </li>
+
+    <li>
+        <a href="jquery.ui.timepicker-ja.js">Japanese (jquery.ui.timepicker-ja.js</a>
+    </li>
+
+</ul>
+
+</body>
\ No newline at end of file
diff --git a/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js b/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js
new file mode 100644
index 00000000000..c010a498e15
--- /dev/null
+++ b/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js
@@ -0,0 +1,9 @@
+/* Deutsch initialisation for the timepicker plugin */
+/* Written by Bernd Plagge (bplagge@choicenet.ne.jp). */
+jQuery(function($){
+    $.timepicker.regional['de'] = {
+                hourText: 'Stunde',
+                minuteText: 'Minuten',
+                amPmText: ['AM', 'PM'] }
+    $.timepicker.setDefaults($.timepicker.regional['de']);
+});
\ No newline at end of file
diff --git a/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-fr.js b/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-fr.js
new file mode 100644
index 00000000000..bd37d731c8d
--- /dev/null
+++ b/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-fr.js
@@ -0,0 +1,13 @@
+/* French initialisation for the jQuery time picker plugin. */
+/* Written by Bernd Plagge (bplagge@choicenet.ne.jp),
+              Francois Gelinas (frank@fgelinas.com) */
+jQuery(function($){
+    $.timepicker.regional['fr'] = {
+                hourText: 'Heures',
+                minuteText: 'Minutes',
+                amPmText: ['AM', 'PM'],
+                closeButtonText: 'Fermer',
+                nowButtonText: 'Maintenant',
+                deselectButtonText: 'Désélectionner' }
+    $.timepicker.setDefaults($.timepicker.regional['fr']);
+});
\ No newline at end of file
diff --git a/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js b/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js
new file mode 100644
index 00000000000..01b2c8a3de5
--- /dev/null
+++ b/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js
@@ -0,0 +1,9 @@
+/* Japanese initialisation for the jQuery time picker plugin. */
+/* Written by Bernd Plagge (bplagge@choicenet.ne.jp). */
+jQuery(function($){
+    $.timepicker.regional['ja'] = {
+                hourText: '時間',
+                minuteText: '分',
+                amPmText: ['��', '�後'] }
+    $.timepicker.setDefaults($.timepicker.regional['ja']);
+});
diff --git a/3rdparty/timepicker/js/jquery.ui.timepicker.js b/3rdparty/timepicker/js/jquery.ui.timepicker.js
new file mode 100644
index 00000000000..d086b674b7b
--- /dev/null
+++ b/3rdparty/timepicker/js/jquery.ui.timepicker.js
@@ -0,0 +1,1345 @@
+/*
+ * jQuery UI Timepicker 0.2.9
+ *
+ * Copyright 2010-2011, Francois Gelinas
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://fgelinas.com/code/timepicker
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *  jquery.ui.position.js (only if position settngs are used)
+ *
+ * Change version 0.1.0 - moved the t-rex up here
+ *
+                                                  ____
+       ___                                      .-~. /_"-._
+      `-._~-.                                  / /_ "~o\  :Y
+          \  \                                / : \~x.  ` ')
+           ]  Y                              /  |  Y< ~-.__j
+          /   !                        _.--~T : l  l<  /.-~
+         /   /                 ____.--~ .   ` l /~\ \<|Y
+        /   /             .-~~"        /| .    ',-~\ \L|
+       /   /             /     .^   \ Y~Y \.^>/l_   "--'
+      /   Y           .-"(  .  l__  j_j l_/ /~_.-~    .
+     Y    l          /    \  )    ~~~." / `/"~ / \.__/l_
+     |     \     _.-"      ~-{__     l  :  l._Z~-.___.--~
+     |      ~---~           /   ~~"---\_  ' __[>
+     l  .                _.^   ___     _>-y~
+      \  \     .      .-~   .-~   ~>--"  /
+       \  ~---"            /     ./  _.-'
+        "-.,_____.,_  _.--~\     _.-~
+                    ~~     (   _}       -Row
+                           `. ~(
+                             )  \
+                            /,`--'~\--'~\
+                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                             ->T-Rex<-
+*/
+
+(function ($, undefined) {
+
+    $.extend($.ui, { timepicker: { version: "0.2.9"} });
+
+    var PROP_NAME = 'timepicker';
+    var tpuuid = new Date().getTime();
+
+    /* Time picker manager.
+    Use the singleton instance of this class, $.timepicker, to interact with the time picker.
+    Settings for (groups of) time pickers are maintained in an instance object,
+    allowing multiple different settings on the same page. */
+
+    function Timepicker() {
+        this.debug = true; // Change this to true to start debugging
+        this._curInst = null; // The current instance in use
+        this._isInline = false; // true if the instance is displayed inline
+        this._disabledInputs = []; // List of time picker inputs that have been disabled
+        this._timepickerShowing = false; // True if the popup picker is showing , false if not
+        this._inDialog = false; // True if showing within a "dialog", false if not
+        this._dialogClass = 'ui-timepicker-dialog'; // The name of the dialog marker class
+        this._mainDivId = 'ui-timepicker-div'; // The ID of the main timepicker division
+        this._inlineClass = 'ui-timepicker-inline'; // The name of the inline marker class
+        this._currentClass = 'ui-timepicker-current'; // The name of the current hour / minutes marker class
+        this._dayOverClass = 'ui-timepicker-days-cell-over'; // The name of the day hover marker class
+
+        this.regional = []; // Available regional settings, indexed by language code
+        this.regional[''] = { // Default regional settings
+            hourText: 'Hour',           // Display text for hours section
+            minuteText: 'Minute',       // Display text for minutes link
+            amPmText: ['AM', 'PM'],     // Display text for AM PM
+            closeButtonText: 'Done',        // Text for the confirmation button (ok button)
+            nowButtonText: 'Now',           // Text for the now button
+            deselectButtonText: 'Deselect'  // Text for the deselect button
+        };
+        this._defaults = { // Global defaults for all the time picker instances
+            showOn: 'focus',    // 'focus' for popup on focus,
+                                // 'button' for trigger button, or 'both' for either (not yet implemented)
+            button: null,                   // 'button' element that will trigger the timepicker
+            showAnim: 'fadeIn',             // Name of jQuery animation for popup
+            showOptions: {},                // Options for enhanced animations
+            appendText: '',                 // Display text following the input box, e.g. showing the format
+
+            beforeShow: null,               // Define a callback function executed before the timepicker is shown
+            onSelect: null,                 // Define a callback function when a hour / minutes is selected
+            onClose: null,                  // Define a callback function when the timepicker is closed
+
+            timeSeparator: ':',             // The character to use to separate hours and minutes.
+            periodSeparator: ' ',           // The character to use to separate the time from the time period.
+            showPeriod: false,              // Define whether or not to show AM/PM with selected time
+            showPeriodLabels: true,         // Show the AM/PM labels on the left of the time picker
+            showLeadingZero: true,          // Define whether or not to show a leading zero for hours < 10. [true/false]
+            showMinutesLeadingZero: true,   // Define whether or not to show a leading zero for minutes < 10.
+            altField: '',                   // Selector for an alternate field to store selected time into
+            defaultTime: 'now',             // Used as default time when input field is empty or for inline timePicker
+                                            // (set to 'now' for the current time, '' for no highlighted time)
+            myPosition: 'left top',         // Position of the dialog relative to the input.
+                                            // see the position utility for more info : http://jqueryui.com/demos/position/
+            atPosition: 'left bottom',      // Position of the input element to match
+                                            // Note : if the position utility is not loaded, the timepicker will attach left top to left bottom
+            //NEW: 2011-02-03
+            onHourShow: null,			    // callback for enabling / disabling on selectable hours  ex : function(hour) { return true; }
+            onMinuteShow: null,             // callback for enabling / disabling on time selection  ex : function(hour,minute) { return true; }
+
+            hours: {
+                starts: 0,                  // first displayed hour
+                ends: 23                    // last displayed hour
+            },
+            minutes: {
+                starts: 0,                  // first displayed minute
+                ends: 55,                   // last displayed minute
+                interval: 5                 // interval of displayed minutes
+            },
+            rows: 4,                        // number of rows for the input tables, minimum 2, makes more sense if you use multiple of 2
+            // 2011-08-05 0.2.4
+            showHours: true,                // display the hours section of the dialog
+            showMinutes: true,              // display the minute section of the dialog
+            optionalMinutes: false,         // optionally parse inputs of whole hours with minutes omitted
+						
+            // buttons
+            showCloseButton: false,         // shows an OK button to confirm the edit
+            showNowButton: false,           // Shows the 'now' button
+            showDeselectButton: false       // Shows the deselect time button
+
+        };
+        $.extend(this._defaults, this.regional['']);
+
+        this.tpDiv = $('<div id="' + this._mainDivId + '" class="ui-timepicker ui-widget ui-helper-clearfix ui-corner-all " style="display: none"></div>');
+    }
+
+    $.extend(Timepicker.prototype, {
+        /* Class name added to elements to indicate already configured with a time picker. */
+        markerClassName: 'hasTimepicker',
+
+        /* Debug logging (if enabled). */
+        log: function () {
+            if (this.debug)
+                console.log.apply('', arguments);
+        },
+
+        _widgetTimepicker: function () {
+            return this.tpDiv;
+        },
+
+        /* Override the default settings for all instances of the time picker.
+        @param  settings  object - the new settings to use as defaults (anonymous object)
+        @return the manager object */
+        setDefaults: function (settings) {
+            extendRemove(this._defaults, settings || {});
+            return this;
+        },
+
+        /* Attach the time picker to a jQuery selection.
+        @param  target    element - the target input field or division or span
+        @param  settings  object - the new settings to use for this time picker instance (anonymous) */
+        _attachTimepicker: function (target, settings) {
+            // check for settings on the control itself - in namespace 'time:'
+            var inlineSettings = null;
+            for (var attrName in this._defaults) {
+                var attrValue = target.getAttribute('time:' + attrName);
+                if (attrValue) {
+                    inlineSettings = inlineSettings || {};
+                    try {
+                        inlineSettings[attrName] = eval(attrValue);
+                    } catch (err) {
+                        inlineSettings[attrName] = attrValue;
+                    }
+                }
+            }
+            var nodeName = target.nodeName.toLowerCase();
+            var inline = (nodeName == 'div' || nodeName == 'span');
+
+            if (!target.id) {
+                this.uuid += 1;
+                target.id = 'tp' + this.uuid;
+            }
+            var inst = this._newInst($(target), inline);
+            inst.settings = $.extend({}, settings || {}, inlineSettings || {});
+            if (nodeName == 'input') {
+                this._connectTimepicker(target, inst);
+                // init inst.hours and inst.minutes from the input value
+                this._setTimeFromField(inst);
+            } else if (inline) {
+                this._inlineTimepicker(target, inst);
+            }
+
+
+        },
+
+        /* Create a new instance object. */
+        _newInst: function (target, inline) {
+            var id = target[0].id.replace(/([^A-Za-z0-9_-])/g, '\\\\$1'); // escape jQuery meta chars
+            return {
+                id: id, input: target, // associated target
+                inline: inline, // is timepicker inline or not :
+                tpDiv: (!inline ? this.tpDiv : // presentation div
+                    $('<div class="' + this._inlineClass + ' ui-timepicker ui-widget  ui-helper-clearfix"></div>'))
+            };
+        },
+
+        /* Attach the time picker to an input field. */
+        _connectTimepicker: function (target, inst) {
+            var input = $(target);
+            inst.append = $([]);
+            inst.trigger = $([]);
+            if (input.hasClass(this.markerClassName)) { return; }
+            this._attachments(input, inst);
+            input.addClass(this.markerClassName).
+                keydown(this._doKeyDown).
+                keyup(this._doKeyUp).
+                bind("setData.timepicker", function (event, key, value) {
+                    inst.settings[key] = value;
+                }).
+                bind("getData.timepicker", function (event, key) {
+                    return this._get(inst, key);
+                });
+            $.data(target, PROP_NAME, inst);
+        },
+
+        /* Handle keystrokes. */
+        _doKeyDown: function (event) {
+            var inst = $.timepicker._getInst(event.target);
+            var handled = true;
+            inst._keyEvent = true;
+            if ($.timepicker._timepickerShowing) {
+                switch (event.keyCode) {
+                    case 9: $.timepicker._hideTimepicker();
+                        handled = false;
+                        break; // hide on tab out
+                    case 13:
+                        $.timepicker._updateSelectedValue(inst);
+                        $.timepicker._hideTimepicker();
+                            
+						return false; // don't submit the form
+						break; // select the value on enter
+                    case 27: $.timepicker._hideTimepicker();
+                        break; // hide on escape
+                    default: handled = false;
+                }
+            }
+            else if (event.keyCode == 36 && event.ctrlKey) { // display the time picker on ctrl+home
+                $.timepicker._showTimepicker(this);
+            }
+            else {
+                handled = false;
+            }
+            if (handled) {
+                event.preventDefault();
+                event.stopPropagation();
+            }
+        },
+
+        /* Update selected time on keyUp */
+        /* Added verion 0.0.5 */
+        _doKeyUp: function (event) {
+            var inst = $.timepicker._getInst(event.target);
+            $.timepicker._setTimeFromField(inst);
+            $.timepicker._updateTimepicker(inst);
+        },
+
+        /* Make attachments based on settings. */
+        _attachments: function (input, inst) {
+            var appendText = this._get(inst, 'appendText');
+            var isRTL = this._get(inst, 'isRTL');
+            if (inst.append) { inst.append.remove(); }
+            if (appendText) {
+                inst.append = $('<span class="' + this._appendClass + '">' + appendText + '</span>');
+                input[isRTL ? 'before' : 'after'](inst.append);
+            }
+            input.unbind('focus.timepicker', this._showTimepicker);
+            if (inst.trigger) { inst.trigger.remove(); }
+
+            var showOn = this._get(inst, 'showOn');
+            if (showOn == 'focus' || showOn == 'both') { // pop-up time picker when in the marked field
+                input.bind("focus.timepicker", this._showTimepicker);
+            }
+            if (showOn == 'button' || showOn == 'both') { // pop-up time picker when 'button' element is clicked
+                var button = this._get(inst, 'button');
+                $(button).bind("click.timepicker", function () {
+                    if ($.timepicker._timepickerShowing && $.timepicker._lastInput == input[0]) { $.timepicker._hideTimepicker(); }
+                    else { $.timepicker._showTimepicker(input[0]); }
+                    return false;
+                });
+
+            }
+        },
+
+
+        /* Attach an inline time picker to a div. */
+        _inlineTimepicker: function(target, inst) {
+            var divSpan = $(target);
+            if (divSpan.hasClass(this.markerClassName))
+                return;
+            divSpan.addClass(this.markerClassName).append(inst.tpDiv).
+                bind("setData.timepicker", function(event, key, value){
+                    inst.settings[key] = value;
+                }).bind("getData.timepicker", function(event, key){
+                    return this._get(inst, key);
+                });
+            $.data(target, PROP_NAME, inst);
+
+            this._setTimeFromField(inst);
+            this._updateTimepicker(inst);
+            inst.tpDiv.show();
+        },
+
+        /* Pop-up the time picker for a given input field.
+        @param  input  element - the input field attached to the time picker or
+        event - if triggered by focus */
+        _showTimepicker: function (input) {
+            input = input.target || input;
+            if (input.nodeName.toLowerCase() != 'input') { input = $('input', input.parentNode)[0]; } // find from button/image trigger
+            if ($.timepicker._isDisabledTimepicker(input) || $.timepicker._lastInput == input) { return; } // already here
+
+            // fix v 0.0.8 - close current timepicker before showing another one
+            $.timepicker._hideTimepicker();
+
+            var inst = $.timepicker._getInst(input);
+            if ($.timepicker._curInst && $.timepicker._curInst != inst) {
+                $.timepicker._curInst.tpDiv.stop(true, true);
+            }
+            var beforeShow = $.timepicker._get(inst, 'beforeShow');
+            extendRemove(inst.settings, (beforeShow ? beforeShow.apply(input, [input, inst]) : {}));
+            inst.lastVal = null;
+            $.timepicker._lastInput = input;
+
+            $.timepicker._setTimeFromField(inst);
+
+            // calculate default position
+            if ($.timepicker._inDialog) { input.value = ''; } // hide cursor
+            if (!$.timepicker._pos) { // position below input
+                $.timepicker._pos = $.timepicker._findPos(input);
+                $.timepicker._pos[1] += input.offsetHeight; // add the height
+            }
+            var isFixed = false;
+            $(input).parents().each(function () {
+                isFixed |= $(this).css('position') == 'fixed';
+                return !isFixed;
+            });
+            if (isFixed && $.browser.opera) { // correction for Opera when fixed and scrolled
+                $.timepicker._pos[0] -= document.documentElement.scrollLeft;
+                $.timepicker._pos[1] -= document.documentElement.scrollTop;
+            }
+
+            var offset = { left: $.timepicker._pos[0], top: $.timepicker._pos[1] };
+
+            $.timepicker._pos = null;
+            // determine sizing offscreen
+            inst.tpDiv.css({ position: 'absolute', display: 'block', top: '-1000px' });
+            $.timepicker._updateTimepicker(inst);
+
+
+            // position with the ui position utility, if loaded
+            if ( ( ! inst.inline )  && ( typeof $.ui.position == 'object' ) ) {
+                inst.tpDiv.position({
+                    of: inst.input,
+                    my: $.timepicker._get( inst, 'myPosition' ),
+                    at: $.timepicker._get( inst, 'atPosition' ),
+                    // offset: $( "#offset" ).val(),
+                    // using: using,
+                    collision: 'flip'
+                });
+                var offset = inst.tpDiv.offset();
+                $.timepicker._pos = [offset.top, offset.left];
+            }
+
+
+            // reset clicked state
+            inst._hoursClicked = false;
+            inst._minutesClicked = false;
+
+            // fix width for dynamic number of time pickers
+            // and adjust position before showing
+            offset = $.timepicker._checkOffset(inst, offset, isFixed);
+            inst.tpDiv.css({ position: ($.timepicker._inDialog && $.blockUI ?
+			    'static' : (isFixed ? 'fixed' : 'absolute')), display: 'none',
+                left: offset.left + 'px', top: offset.top + 'px'
+            });
+            if ( ! inst.inline ) {
+                var showAnim = $.timepicker._get(inst, 'showAnim');
+                var duration = $.timepicker._get(inst, 'duration');
+
+                var postProcess = function () {
+                    $.timepicker._timepickerShowing = true;
+                    var borders = $.timepicker._getBorders(inst.tpDiv);
+                    inst.tpDiv.find('iframe.ui-timepicker-cover'). // IE6- only
+					css({ left: -borders[0], top: -borders[1],
+					    width: inst.tpDiv.outerWidth(), height: inst.tpDiv.outerHeight()
+					});
+                };
+
+                // Fixed the zIndex problem for real (I hope) - FG - v 0.2.9
+                inst.tpDiv.css('zIndex', $.timepicker._getZIndex(input) +1);
+
+                if ($.effects && $.effects[showAnim]) {
+                    inst.tpDiv.show(showAnim, $.timepicker._get(inst, 'showOptions'), duration, postProcess);
+                }
+                else {
+                    inst.tpDiv[showAnim || 'show']((showAnim ? duration : null), postProcess);
+                }
+                if (!showAnim || !duration) { postProcess(); }
+                if (inst.input.is(':visible') && !inst.input.is(':disabled')) { inst.input.focus(); }
+                $.timepicker._curInst = inst;
+            }
+        },
+
+        // This is a copy of the zIndex function of UI core 1.8.??
+        // Copied in the timepicker to stay backward compatible.
+        _getZIndex: function (target) {
+            var elem = $( target ), position, value;
+            while ( elem.length && elem[ 0 ] !== document ) {
+                position = elem.css( "position" );
+                if ( position === "absolute" || position === "relative" || position === "fixed" ) {
+                    value = parseInt( elem.css( "zIndex" ), 10 );
+                    if ( !isNaN( value ) && value !== 0 ) {
+                        return value;
+                    }
+                }
+                elem = elem.parent();
+            }
+        },
+
+        /* Generate the time picker content. */
+        _updateTimepicker: function (inst) {
+            inst.tpDiv.empty().append(this._generateHTML(inst));
+            this._rebindDialogEvents(inst);
+
+        },
+
+        _rebindDialogEvents: function (inst) {
+            var borders = $.timepicker._getBorders(inst.tpDiv),
+                self = this;
+            inst.tpDiv
+			.find('iframe.ui-timepicker-cover') // IE6- only
+				.css({ left: -borders[0], top: -borders[1],
+				    width: inst.tpDiv.outerWidth(), height: inst.tpDiv.outerHeight()
+				})
+			.end()
+            // after the picker html is appended bind the click & double click events (faster in IE this way
+            // then letting the browser interpret the inline events)
+            // the binding for the minute cells also exists in _updateMinuteDisplay
+            .find('.ui-timepicker-minute-cell')
+                .unbind()
+                .bind("click", { fromDoubleClick:false }, $.proxy($.timepicker.selectMinutes, this))
+                .bind("dblclick", { fromDoubleClick:true }, $.proxy($.timepicker.selectMinutes, this))
+            .end()
+            .find('.ui-timepicker-hour-cell')
+                .unbind()
+                .bind("click", { fromDoubleClick:false }, $.proxy($.timepicker.selectHours, this))
+                .bind("dblclick", { fromDoubleClick:true }, $.proxy($.timepicker.selectHours, this))
+            .end()
+			.find('.ui-timepicker td a')
+                .unbind()
+				.bind('mouseout', function () {
+				    $(this).removeClass('ui-state-hover');
+				    if (this.className.indexOf('ui-timepicker-prev') != -1) $(this).removeClass('ui-timepicker-prev-hover');
+				    if (this.className.indexOf('ui-timepicker-next') != -1) $(this).removeClass('ui-timepicker-next-hover');
+				})
+				.bind('mouseover', function () {
+				    if ( ! self._isDisabledTimepicker(inst.inline ? inst.tpDiv.parent()[0] : inst.input[0])) {
+				        $(this).parents('.ui-timepicker-calendar').find('a').removeClass('ui-state-hover');
+				        $(this).addClass('ui-state-hover');
+				        if (this.className.indexOf('ui-timepicker-prev') != -1) $(this).addClass('ui-timepicker-prev-hover');
+				        if (this.className.indexOf('ui-timepicker-next') != -1) $(this).addClass('ui-timepicker-next-hover');
+				    }
+				})
+			.end()
+			.find('.' + this._dayOverClass + ' a')
+				.trigger('mouseover')
+			.end()
+            .find('.ui-timepicker-now').bind("click",function(e) {
+                    $.timepicker.selectNow(e);
+            }).end()
+            .find('.ui-timepicker-deselect').bind("click",function(e) {
+                    $.timepicker.deselectTime(e);
+            }).end()
+            .find('.ui-timepicker-close').bind("click",function(e) {
+                    $.timepicker._hideTimepicker();
+            }).end();
+        },
+
+        /* Generate the HTML for the current state of the time picker. */
+        _generateHTML: function (inst) {
+
+            var h, m, row, col, html, hoursHtml, minutesHtml = '',
+                showPeriod = (this._get(inst, 'showPeriod') == true),
+                showPeriodLabels = (this._get(inst, 'showPeriodLabels') == true),
+                showLeadingZero = (this._get(inst, 'showLeadingZero') == true),
+                showHours = (this._get(inst, 'showHours') == true),
+                showMinutes = (this._get(inst, 'showMinutes') == true),
+                amPmText = this._get(inst, 'amPmText'),
+                rows = this._get(inst, 'rows'),
+                amRows = 0,
+                pmRows = 0,
+                amItems = 0,
+                pmItems = 0,
+                amFirstRow = 0,
+                pmFirstRow = 0,
+                hours = Array(),
+                hours_options = this._get(inst, 'hours'),
+                hoursPerRow = null,
+                hourCounter = 0,
+                hourLabel = this._get(inst, 'hourText'),
+                showCloseButton = this._get(inst, 'showCloseButton'),
+                closeButtonText = this._get(inst, 'closeButtonText'),
+                showNowButton = this._get(inst, 'showNowButton'),
+                nowButtonText = this._get(inst, 'nowButtonText'),
+                showDeselectButton = this._get(inst, 'showDeselectButton'),
+                deselectButtonText = this._get(inst, 'deselectButtonText'),
+                showButtonPanel = showCloseButton || showNowButton || showDeselectButton;
+            
+
+
+            // prepare all hours and minutes, makes it easier to distribute by rows
+            for (h = hours_options.starts; h <= hours_options.ends; h++) {
+                hours.push (h);
+            }
+            hoursPerRow = Math.ceil(hours.length / rows); // always round up
+
+            if (showPeriodLabels) {
+                for (hourCounter = 0; hourCounter < hours.length; hourCounter++) {
+                    if (hours[hourCounter] < 12) {
+                        amItems++;
+                    }
+                    else {
+                        pmItems++;
+                    }
+                }
+                hourCounter = 0; 
+
+                amRows = Math.floor(amItems / hours.length * rows);
+                pmRows = Math.floor(pmItems / hours.length * rows);
+
+                // assign the extra row to the period that is more densly populated
+                if (rows != amRows + pmRows) {
+                    // Make sure: AM Has Items and either PM Does Not, AM has no rows yet, or AM is more dense
+                    if (amItems && (!pmItems || !amRows || (pmRows && amItems / amRows >= pmItems / pmRows))) {
+                        amRows++;
+                    } else {
+                        pmRows++;
+                    }
+                }
+                amFirstRow = Math.min(amRows, 1);
+                pmFirstRow = amRows + 1;
+                hoursPerRow = Math.ceil(Math.max(amItems / amRows, pmItems / pmRows));
+            }
+
+
+            html = '<table class="ui-timepicker-table ui-widget-content ui-corner-all"><tr>';
+
+            if (showHours) {
+
+                html += '<td class="ui-timepicker-hours">' +
+                        '<div class="ui-timepicker-title ui-widget-header ui-helper-clearfix ui-corner-all">' +
+                        hourLabel +
+                        '</div>' +
+                        '<table class="ui-timepicker">';
+
+                for (row = 1; row <= rows; row++) {
+                    html += '<tr>';
+                    // AM
+                    if (row == amFirstRow && showPeriodLabels) {
+                        html += '<th rowspan="' + amRows.toString() + '" class="periods" scope="row">' + amPmText[0] + '</th>';
+                    }
+                    // PM
+                    if (row == pmFirstRow && showPeriodLabels) {
+                        html += '<th rowspan="' + pmRows.toString() + '" class="periods" scope="row">' + amPmText[1] + '</th>';
+                    }
+                    for (col = 1; col <= hoursPerRow; col++) {
+                        if (showPeriodLabels && row < pmFirstRow && hours[hourCounter] >= 12) {
+                            html += this._generateHTMLHourCell(inst, undefined, showPeriod, showLeadingZero);
+                        } else {
+                            html += this._generateHTMLHourCell(inst, hours[hourCounter], showPeriod, showLeadingZero);
+                            hourCounter++;
+                        }
+                    }
+                    html += '</tr>';
+                }
+                html += '</tr></table>' + // Close the hours cells table
+                        '</td>';          // Close the Hour td
+            }
+
+            if (showMinutes) {
+                html += '<td class="ui-timepicker-minutes">';
+                html += this._generateHTMLMinutes(inst);
+                html += '</td>';
+            }
+            
+            html += '</tr>';
+
+
+            if (showButtonPanel) {
+                var buttonPanel = '<tr><td colspan="3"><div class="ui-timepicker-buttonpane ui-widget-content">';
+                if (showNowButton) {
+                    buttonPanel += '<button type="button" class="ui-timepicker-now ui-state-default ui-corner-all" '
+                                   + ' data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" >'
+                                   + nowButtonText + '</button>';
+                }
+                if (showDeselectButton) {
+                    buttonPanel += '<button type="button" class="ui-timepicker-deselect ui-state-default ui-corner-all" '
+                                   + ' data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" >'
+                                   + deselectButtonText + '</button>';
+                }
+                if (showCloseButton) {
+                    buttonPanel += '<button type="button" class="ui-timepicker-close ui-state-default ui-corner-all" '
+                                   + ' data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" >'
+                                   + closeButtonText + '</button>';
+                }
+
+                html += buttonPanel + '</div></td></tr>';
+            }
+            html += '</table>';
+
+             /* IE6 IFRAME FIX (taken from datepicker 1.5.3, fixed in 0.1.2 */
+            html += ($.browser.msie && parseInt($.browser.version,10) < 7 && !inst.inline ?
+                '<iframe src="javascript:false;" class="ui-timepicker-cover" frameborder="0"></iframe>' : '');
+
+            return html;
+        },
+
+        /* Special function that update the minutes selection in currently visible timepicker
+         * called on hour selection when onMinuteShow is defined  */
+        _updateMinuteDisplay: function (inst) {
+            var newHtml = this._generateHTMLMinutes(inst);
+            inst.tpDiv.find('td.ui-timepicker-minutes').html(newHtml);
+            this._rebindDialogEvents(inst);
+                // after the picker html is appended bind the click & double click events (faster in IE this way
+                // then letting the browser interpret the inline events)
+                // yes I know, duplicate code, sorry
+/*                .find('.ui-timepicker-minute-cell')
+                    .bind("click", { fromDoubleClick:false }, $.proxy($.timepicker.selectMinutes, this))
+                    .bind("dblclick", { fromDoubleClick:true }, $.proxy($.timepicker.selectMinutes, this));
+*/
+
+        },
+
+        /*
+         * Generate the minutes table
+         * This is separated from the _generateHTML function because is can be called separately (when hours changes)
+         */
+        _generateHTMLMinutes: function (inst) {
+
+            var m, row, html = '',
+                rows = this._get(inst, 'rows'),
+                minutes = Array(),
+                minutes_options = this._get(inst, 'minutes'),
+                minutesPerRow = null,
+                minuteCounter = 0,
+                showMinutesLeadingZero = (this._get(inst, 'showMinutesLeadingZero') == true),
+                onMinuteShow = this._get(inst, 'onMinuteShow'),
+                minuteLabel = this._get(inst, 'minuteText');
+
+            if ( ! minutes_options.starts) {
+                minutes_options.starts = 0;
+            }
+            if ( ! minutes_options.ends) {
+                minutes_options.ends = 59;
+            }
+            for (m = minutes_options.starts; m <= minutes_options.ends; m += minutes_options.interval) {
+                minutes.push(m);
+            }
+            minutesPerRow = Math.round(minutes.length / rows + 0.49); // always round up
+
+            /*
+             * The minutes table
+             */
+            // if currently selected minute is not enabled, we have a problem and need to select a new minute.
+            if (onMinuteShow &&
+                (onMinuteShow.apply((inst.input ? inst.input[0] : null), [inst.hours , inst.minutes]) == false) ) {
+                // loop minutes and select first available
+                for (minuteCounter = 0; minuteCounter < minutes.length; minuteCounter += 1) {
+                    m = minutes[minuteCounter];
+                    if (onMinuteShow.apply((inst.input ? inst.input[0] : null), [inst.hours, m])) {
+                        inst.minutes = m;
+                        break;
+                    }
+                }
+            }
+
+
+
+            html += '<div class="ui-timepicker-title ui-widget-header ui-helper-clearfix ui-corner-all">' +
+                    minuteLabel +
+                    '</div>' +
+                    '<table class="ui-timepicker">';
+            
+            minuteCounter = 0;
+            for (row = 1; row <= rows; row++) {
+                html += '<tr>';
+                while (minuteCounter < row * minutesPerRow) {
+                    var m = minutes[minuteCounter];
+                    var displayText = '';
+                    if (m !== undefined ) {
+                        displayText = (m < 10) && showMinutesLeadingZero ? "0" + m.toString() : m.toString();
+                    }
+                    html += this._generateHTMLMinuteCell(inst, m, displayText);
+                    minuteCounter++;
+                }
+                html += '</tr>';
+            }
+
+            html += '</table>';
+
+            return html;
+        },
+
+        /* Generate the content of a "Hour" cell */
+        _generateHTMLHourCell: function (inst, hour, showPeriod, showLeadingZero) {
+
+            var displayHour = hour;
+            if ((hour > 12) && showPeriod) {
+                displayHour = hour - 12;
+            }
+            if ((displayHour == 0) && showPeriod) {
+                displayHour = 12;
+            }
+            if ((displayHour < 10) && showLeadingZero) {
+                displayHour = '0' + displayHour;
+            }
+
+            var html = "";
+            var enabled = true;
+            var onHourShow = this._get(inst, 'onHourShow');		//custom callback
+
+            if (hour == undefined) {
+                html = '<td><span class="ui-state-default ui-state-disabled">&nbsp;</span></td>';
+                return html;
+            }
+
+            if (onHourShow) {
+            	enabled = onHourShow.apply((inst.input ? inst.input[0] : null), [hour]);
+            }
+
+            if (enabled) {
+                html = '<td class="ui-timepicker-hour-cell" data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" data-hour="' + hour.toString() + '">' +
+                   '<a class="ui-state-default ' +
+                   (hour == inst.hours ? 'ui-state-active' : '') +
+                   '">' +
+                   displayHour.toString() +
+                   '</a></td>';
+            }
+            else {
+            	html =
+            		'<td>' +
+		                '<span class="ui-state-default ui-state-disabled ' +
+		                (hour == inst.hours ? ' ui-state-active ' : ' ') +
+		                '">' +
+		                displayHour.toString() +
+		                '</span>' +
+		            '</td>';
+            }
+            return html;
+        },
+
+        /* Generate the content of a "Hour" cell */
+        _generateHTMLMinuteCell: function (inst, minute, displayText) {
+        	 var html = "";
+             var enabled = true;
+             var onMinuteShow = this._get(inst, 'onMinuteShow');		//custom callback
+             if (onMinuteShow) {
+            	 //NEW: 2011-02-03  we should give the hour as a parameter as well!
+             	enabled = onMinuteShow.apply((inst.input ? inst.input[0] : null), [inst.hours,minute]);		//trigger callback
+             }
+
+             if (minute == undefined) {
+                 html = '<td><span class="ui-state-default ui-state-disabled">&nbsp;</span></td>';
+                 return html;
+             }
+
+             if (enabled) {
+	             html = '<td class="ui-timepicker-minute-cell" data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" data-minute="' + minute.toString() + '" >' +
+	                   '<a class="ui-state-default ' +
+	                   (minute == inst.minutes ? 'ui-state-active' : '') +
+	                   '" >' +
+	                   displayText +
+	                   '</a></td>';
+             }
+             else {
+
+            	html = '<td>' +
+	                 '<span class="ui-state-default ui-state-disabled" >' +
+	                 	displayText +
+	                 '</span>' +
+                 '</td>';
+             }
+             return html;
+        },
+
+
+        /* Enable the date picker to a jQuery selection.
+           @param  target    element - the target input field or division or span */
+        _enableTimepicker: function(target) {
+            var $target = $(target),
+                target_id = $target.attr('id'),
+                inst = $.data(target, PROP_NAME);
+            
+            if (!$target.hasClass(this.markerClassName)) {
+                return;
+            }
+            var nodeName = target.nodeName.toLowerCase();
+            if (nodeName == 'input') {
+                target.disabled = false;
+                inst.trigger.filter('button').
+                    each(function() { this.disabled = false; }).end();
+            }
+            else if (nodeName == 'div' || nodeName == 'span') {
+                var inline = $target.children('.' + this._inlineClass);
+                inline.children().removeClass('ui-state-disabled');
+            }
+            this._disabledInputs = $.map(this._disabledInputs,
+                function(value) { return (value == target_id ? null : value); }); // delete entry
+        },
+
+        /* Disable the time picker to a jQuery selection.
+           @param  target    element - the target input field or division or span */
+        _disableTimepicker: function(target) {
+            var $target = $(target);
+            var inst = $.data(target, PROP_NAME);
+            if (!$target.hasClass(this.markerClassName)) {
+                return;
+            }
+            var nodeName = target.nodeName.toLowerCase();
+            if (nodeName == 'input') {
+                target.disabled = true;
+
+                inst.trigger.filter('button').
+                    each(function() { this.disabled = true; }).end();
+
+            }
+            else if (nodeName == 'div' || nodeName == 'span') {
+                var inline = $target.children('.' + this._inlineClass);
+                inline.children().addClass('ui-state-disabled');
+            }
+            this._disabledInputs = $.map(this._disabledInputs,
+                function(value) { return (value == target ? null : value); }); // delete entry
+            this._disabledInputs[this._disabledInputs.length] = $target.attr('id');
+        },
+
+        /* Is the first field in a jQuery collection disabled as a timepicker?
+        @param  target_id element - the target input field or division or span
+        @return boolean - true if disabled, false if enabled */
+        _isDisabledTimepicker: function (target_id) {
+            if ( ! target_id) { return false; }
+            for (var i = 0; i < this._disabledInputs.length; i++) {
+                if (this._disabledInputs[i] == target_id) { return true; }
+            }
+            return false;
+        },
+
+        /* Check positioning to remain on screen. */
+        _checkOffset: function (inst, offset, isFixed) {
+            var tpWidth = inst.tpDiv.outerWidth();
+            var tpHeight = inst.tpDiv.outerHeight();
+            var inputWidth = inst.input ? inst.input.outerWidth() : 0;
+            var inputHeight = inst.input ? inst.input.outerHeight() : 0;
+            var viewWidth = document.documentElement.clientWidth + $(document).scrollLeft();
+            var viewHeight = document.documentElement.clientHeight + $(document).scrollTop();
+
+            offset.left -= (this._get(inst, 'isRTL') ? (tpWidth - inputWidth) : 0);
+            offset.left -= (isFixed && offset.left == inst.input.offset().left) ? $(document).scrollLeft() : 0;
+            offset.top -= (isFixed && offset.top == (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0;
+
+            // now check if datepicker is showing outside window viewport - move to a better place if so.
+            offset.left -= Math.min(offset.left, (offset.left + tpWidth > viewWidth && viewWidth > tpWidth) ?
+			Math.abs(offset.left + tpWidth - viewWidth) : 0);
+            offset.top -= Math.min(offset.top, (offset.top + tpHeight > viewHeight && viewHeight > tpHeight) ?
+			Math.abs(tpHeight + inputHeight) : 0);
+
+            return offset;
+        },
+
+        /* Find an object's position on the screen. */
+        _findPos: function (obj) {
+            var inst = this._getInst(obj);
+            var isRTL = this._get(inst, 'isRTL');
+            while (obj && (obj.type == 'hidden' || obj.nodeType != 1)) {
+                obj = obj[isRTL ? 'previousSibling' : 'nextSibling'];
+            }
+            var position = $(obj).offset();
+            return [position.left, position.top];
+        },
+
+        /* Retrieve the size of left and top borders for an element.
+        @param  elem  (jQuery object) the element of interest
+        @return  (number[2]) the left and top borders */
+        _getBorders: function (elem) {
+            var convert = function (value) {
+                return { thin: 1, medium: 2, thick: 3}[value] || value;
+            };
+            return [parseFloat(convert(elem.css('border-left-width'))),
+			parseFloat(convert(elem.css('border-top-width')))];
+        },
+
+
+        /* Close time picker if clicked elsewhere. */
+        _checkExternalClick: function (event) {
+            if (!$.timepicker._curInst) { return; }
+            var $target = $(event.target);
+            if ($target[0].id != $.timepicker._mainDivId &&
+				$target.parents('#' + $.timepicker._mainDivId).length == 0 &&
+				!$target.hasClass($.timepicker.markerClassName) &&
+				!$target.hasClass($.timepicker._triggerClass) &&
+				$.timepicker._timepickerShowing && !($.timepicker._inDialog && $.blockUI))
+                $.timepicker._hideTimepicker();
+        },
+
+        /* Hide the time picker from view.
+        @param  input  element - the input field attached to the time picker */
+        _hideTimepicker: function (input) {
+            var inst = this._curInst;
+            if (!inst || (input && inst != $.data(input, PROP_NAME))) { return; }
+            if (this._timepickerShowing) {
+                var showAnim = this._get(inst, 'showAnim');
+                var duration = this._get(inst, 'duration');
+                var postProcess = function () {
+                    $.timepicker._tidyDialog(inst);
+                    this._curInst = null;
+                };
+                if ($.effects && $.effects[showAnim]) {
+                    inst.tpDiv.hide(showAnim, $.timepicker._get(inst, 'showOptions'), duration, postProcess);
+                }
+                else {
+                    inst.tpDiv[(showAnim == 'slideDown' ? 'slideUp' :
+					    (showAnim == 'fadeIn' ? 'fadeOut' : 'hide'))]((showAnim ? duration : null), postProcess);
+                }
+                if (!showAnim) { postProcess(); }
+                var onClose = this._get(inst, 'onClose');
+                if (onClose) {
+                    onClose.apply(
+                        (inst.input ? inst.input[0] : null),
+					    [(inst.input ? inst.input.val() : ''), inst]);  // trigger custom callback
+                }
+                this._timepickerShowing = false;
+                this._lastInput = null;
+                if (this._inDialog) {
+                    this._dialogInput.css({ position: 'absolute', left: '0', top: '-100px' });
+                    if ($.blockUI) {
+                        $.unblockUI();
+                        $('body').append(this.tpDiv);
+                    }
+                }
+                this._inDialog = false;
+            }
+        },
+
+
+
+        /* Tidy up after a dialog display. */
+        _tidyDialog: function (inst) {
+            inst.tpDiv.removeClass(this._dialogClass).unbind('.ui-timepicker');
+        },
+
+        /* Retrieve the instance data for the target control.
+        @param  target  element - the target input field or division or span
+        @return  object - the associated instance data
+        @throws  error if a jQuery problem getting data */
+        _getInst: function (target) {
+            try {
+                return $.data(target, PROP_NAME);
+            }
+            catch (err) {
+                throw 'Missing instance data for this timepicker';
+            }
+        },
+
+        /* Get a setting value, defaulting if necessary. */
+        _get: function (inst, name) {
+            return inst.settings[name] !== undefined ?
+			inst.settings[name] : this._defaults[name];
+        },
+
+        /* Parse existing time and initialise time picker. */
+        _setTimeFromField: function (inst) {
+            if (inst.input.val() == inst.lastVal) { return; }
+            var defaultTime = this._get(inst, 'defaultTime');
+
+            var timeToParse = defaultTime == 'now' ? this._getCurrentTimeRounded(inst) : defaultTime;
+            if ((inst.inline == false) && (inst.input.val() != '')) { timeToParse = inst.input.val() }
+
+            if (timeToParse instanceof Date) {
+                inst.hours = timeToParse.getHours();
+                inst.minutes = timeToParse.getMinutes();
+            } else {
+                var timeVal = inst.lastVal = timeToParse;
+                if (timeToParse == '') {
+                    inst.hours = -1;
+                    inst.minutes = -1;
+                } else {
+                    var time = this.parseTime(inst, timeVal);
+                    inst.hours = time.hours;
+                    inst.minutes = time.minutes;
+                }
+            }
+
+
+            $.timepicker._updateTimepicker(inst);
+        },
+
+        /* Update or retrieve the settings for an existing time picker.
+           @param  target  element - the target input field or division or span
+           @param  name    object - the new settings to update or
+                           string - the name of the setting to change or retrieve,
+                           when retrieving also 'all' for all instance settings or
+                           'defaults' for all global defaults
+           @param  value   any - the new value for the setting
+                       (omit if above is an object or to retrieve a value) */
+        _optionTimepicker: function(target, name, value) {
+            var inst = this._getInst(target);
+            if (arguments.length == 2 && typeof name == 'string') {
+                return (name == 'defaults' ? $.extend({}, $.timepicker._defaults) :
+                    (inst ? (name == 'all' ? $.extend({}, inst.settings) :
+                    this._get(inst, name)) : null));
+            }
+            var settings = name || {};
+            if (typeof name == 'string') {
+                settings = {};
+                settings[name] = value;
+            }
+            if (inst) {
+                if (this._curInst == inst) {
+                    this._hideTimepicker();
+                }
+                extendRemove(inst.settings, settings);
+                this._updateTimepicker(inst);
+            }
+        },
+
+
+        /* Set the time for a jQuery selection.
+	    @param  target  element - the target input field or division or span
+	    @param  time    String - the new time */
+	    _setTimeTimepicker: function(target, time) {
+		    var inst = this._getInst(target);
+		    if (inst) {
+			    this._setTime(inst, time);
+    			this._updateTimepicker(inst);
+	    		this._updateAlternate(inst, time);
+		    }
+	    },
+
+        /* Set the time directly. */
+        _setTime: function(inst, time, noChange) {
+            var origHours = inst.hours;
+            var origMinutes = inst.minutes;
+            var time = this.parseTime(inst, time);
+            inst.hours = time.hours;
+            inst.minutes = time.minutes;
+
+            if ((origHours != inst.hours || origMinutes != inst.minuts) && !noChange) {
+                inst.input.trigger('change');
+            }
+            this._updateTimepicker(inst);
+            this._updateSelectedValue(inst);
+        },
+
+        /* Return the current time, ready to be parsed, rounded to the closest 5 minute */
+        _getCurrentTimeRounded: function (inst) {
+            var currentTime = new Date(),
+                currentMinutes = currentTime.getMinutes(),
+                // round to closest 5
+                adjustedMinutes = Math.round( currentMinutes / 5 ) * 5;
+            currentTime.setMinutes(adjustedMinutes);
+            return currentTime;
+        },
+
+        /*
+        * Parse a time string into hours and minutes
+        */
+        parseTime: function (inst, timeVal) {
+            var retVal = new Object();
+            retVal.hours = -1;
+            retVal.minutes = -1;
+
+            var timeSeparator = this._get(inst, 'timeSeparator'),
+                amPmText = this._get(inst, 'amPmText'),
+                showHours = this._get(inst, 'showHours'),
+                showMinutes = this._get(inst, 'showMinutes'),
+                optionalMinutes = this._get(inst, 'optionalMinutes'),
+                showPeriod = (this._get(inst, 'showPeriod') == true),
+                p = timeVal.indexOf(timeSeparator);
+
+            // check if time separator found
+            if (p != -1) {
+                retVal.hours = parseInt(timeVal.substr(0, p), 10);
+                retVal.minutes = parseInt(timeVal.substr(p + 1), 10);
+            }
+            // check for hours only
+            else if ( (showHours) && ( !showMinutes || optionalMinutes ) ) {
+                retVal.hours = parseInt(timeVal, 10);
+            }
+            // check for minutes only
+            else if ( ( ! showHours) && (showMinutes) ) {
+                retVal.minutes = parseInt(timeVal, 10);
+            }
+
+            if (showHours) {
+                var timeValUpper = timeVal.toUpperCase();
+                if ((retVal.hours < 12) && (showPeriod) && (timeValUpper.indexOf(amPmText[1].toUpperCase()) != -1)) {
+                    retVal.hours += 12;
+                }
+                // fix for 12 AM
+                if ((retVal.hours == 12) && (showPeriod) && (timeValUpper.indexOf(amPmText[0].toUpperCase()) != -1)) {
+                    retVal.hours = 0;
+                }
+            }
+            
+            return retVal;
+        },
+
+        selectNow: function(e) {
+
+            var id = $(e.target).attr("data-timepicker-instance-id"),
+                $target = $(id),
+                inst = this._getInst($target[0]);
+
+            //if (!inst || (input && inst != $.data(input, PROP_NAME))) { return; }
+            var currentTime = new Date();
+            inst.hours = currentTime.getHours();
+            inst.minutes = currentTime.getMinutes();
+            this._updateSelectedValue(inst);
+            this._updateTimepicker(inst);
+            this._hideTimepicker();
+        },
+
+        deselectTime: function(e) {
+            var id = $(e.target).attr("data-timepicker-instance-id"),
+                $target = $(id),
+                inst = this._getInst($target[0]);
+            inst.hours = -1;
+            inst.minutes = -1;
+            this._updateSelectedValue(inst);
+            this._hideTimepicker();
+        },
+
+
+        selectHours: function (event) {
+            var $td = $(event.currentTarget),
+                id = $td.attr("data-timepicker-instance-id"),
+                newHours = $td.attr("data-hour"),
+                fromDoubleClick = event.data.fromDoubleClick,
+                $target = $(id),
+                inst = this._getInst($target[0]),
+                showMinutes = (this._get(inst, 'showMinutes') == true);
+
+            // don't select if disabled
+            if ( $.timepicker._isDisabledTimepicker($target.attr('id')) ) { return false }
+
+            $td.parents('.ui-timepicker-hours:first').find('a').removeClass('ui-state-active');
+            $td.children('a').addClass('ui-state-active');
+            inst.hours = newHours;
+
+            // added for onMinuteShow callback
+            var onMinuteShow = this._get(inst, 'onMinuteShow');
+            if (onMinuteShow) {
+                // this will trigger a callback on selected hour to make sure selected minute is allowed. 
+                this._updateMinuteDisplay(inst);
+            }
+
+            this._updateSelectedValue(inst);
+
+            inst._hoursClicked = true;
+            if ((inst._minutesClicked) || (fromDoubleClick) || (showMinutes == false)) {
+                $.timepicker._hideTimepicker();
+            }
+            // return false because if used inline, prevent the url to change to a hashtag
+            return false;
+        },
+
+        selectMinutes: function (event) {
+            var $td = $(event.currentTarget),
+                id = $td.attr("data-timepicker-instance-id"),
+                newMinutes = $td.attr("data-minute"),
+                fromDoubleClick = event.data.fromDoubleClick,
+                $target = $(id),
+                inst = this._getInst($target[0]),
+                showHours = (this._get(inst, 'showHours') == true);
+
+            // don't select if disabled
+            if ( $.timepicker._isDisabledTimepicker($target.attr('id')) ) { return false }
+
+            $td.parents('.ui-timepicker-minutes:first').find('a').removeClass('ui-state-active');
+            $td.children('a').addClass('ui-state-active');
+
+            inst.minutes = newMinutes;
+            this._updateSelectedValue(inst);
+
+            inst._minutesClicked = true;
+            if ((inst._hoursClicked) || (fromDoubleClick) || (showHours == false)) {
+                $.timepicker._hideTimepicker();
+                // return false because if used inline, prevent the url to change to a hashtag
+                return false;
+            }
+
+            // return false because if used inline, prevent the url to change to a hashtag
+            return false;
+        },
+
+        _updateSelectedValue: function (inst) {
+            var newTime = this._getParsedTime(inst);
+            if (inst.input) {
+                inst.input.val(newTime);
+                inst.input.trigger('change');
+            }
+            var onSelect = this._get(inst, 'onSelect');
+            if (onSelect) { onSelect.apply((inst.input ? inst.input[0] : null), [newTime, inst]); } // trigger custom callback
+            this._updateAlternate(inst, newTime);
+            return newTime;
+        },
+        
+        /* this function process selected time and return it parsed according to instance options */
+        _getParsedTime: function(inst) {
+
+            if (inst.hours == -1 && inst.minutes == -1) {
+                return '';
+            }
+
+            if ((inst.hours < 0) || (inst.hours > 23)) { inst.hours = 12; }
+            if ((inst.minutes < 0) || (inst.minutes > 59)) { inst.minutes = 0; }
+
+            var period = "",
+                showPeriod = (this._get(inst, 'showPeriod') == true),
+                showLeadingZero = (this._get(inst, 'showLeadingZero') == true),
+                showHours = (this._get(inst, 'showHours') == true),
+                showMinutes = (this._get(inst, 'showMinutes') == true),
+                optionalMinutes = (this._get(inst, 'optionalMinutes') == true),
+                amPmText = this._get(inst, 'amPmText'),
+                selectedHours = inst.hours ? inst.hours : 0,
+                selectedMinutes = inst.minutes ? inst.minutes : 0,
+                displayHours = selectedHours ? selectedHours : 0,
+                parsedTime = '';
+
+            if (showPeriod) { 
+                if (inst.hours == 0) {
+                    displayHours = 12;
+                }
+                if (inst.hours < 12) {
+                    period = amPmText[0];
+                }
+                else {
+                    period = amPmText[1];
+                    if (displayHours > 12) {
+                        displayHours -= 12;
+                    }
+                }
+            }
+
+            var h = displayHours.toString();
+            if (showLeadingZero && (displayHours < 10)) { h = '0' + h; }
+
+            var m = selectedMinutes.toString();
+            if (selectedMinutes < 10) { m = '0' + m; }
+
+            if (showHours) {
+                parsedTime += h;
+            }
+            if (showHours && showMinutes && (!optionalMinutes || m != 0)) {
+                parsedTime += this._get(inst, 'timeSeparator');
+            }
+            if (showMinutes && (!optionalMinutes || m != 0)) {
+                parsedTime += m;
+            }
+            if (showHours) {
+                if (period.length > 0) { parsedTime += this._get(inst, 'periodSeparator') + period; }
+            }
+            
+            return parsedTime;
+        },
+        
+        /* Update any alternate field to synchronise with the main field. */
+        _updateAlternate: function(inst, newTime) {
+            var altField = this._get(inst, 'altField');
+            if (altField) { // update alternate field too
+                $(altField).each(function(i,e) {
+                    $(e).val(newTime);
+                });
+            }
+        },
+
+        /* This might look unused but it's called by the $.fn.timepicker function with param getTime */
+        /* added v 0.2.3 - gitHub issue #5 - Thanks edanuff */
+        _getTimeTimepicker : function(input) {
+            var inst = this._getInst(input);
+            return this._getParsedTime(inst);
+        },
+        _getHourTimepicker: function(input) {
+            var inst = this._getInst(input);
+            if ( inst == undefined) { return -1; }
+            return inst.hours;
+        },
+        _getMinuteTimepicker: function(input) {
+            var inst= this._getInst(input);
+            if ( inst == undefined) { return -1; }
+            return inst.minutes;
+        }
+
+    });
+
+
+
+    /* Invoke the timepicker functionality.
+    @param  options  string - a command, optionally followed by additional parameters or
+    Object - settings for attaching new timepicker functionality
+    @return  jQuery object */
+    $.fn.timepicker = function (options) {
+
+        /* Initialise the time picker. */
+        if (!$.timepicker.initialized) {
+            $(document).mousedown($.timepicker._checkExternalClick).
+			find('body').append($.timepicker.tpDiv);
+            $.timepicker.initialized = true;
+        }
+
+        var otherArgs = Array.prototype.slice.call(arguments, 1);
+        if (typeof options == 'string' && (options == 'getTime' || options == 'getHour' || options == 'getMinute' ))
+            return $.timepicker['_' + options + 'Timepicker'].
+			    apply($.timepicker, [this[0]].concat(otherArgs));
+        if (options == 'option' && arguments.length == 2 && typeof arguments[1] == 'string')
+            return $.timepicker['_' + options + 'Timepicker'].
+                apply($.timepicker, [this[0]].concat(otherArgs));
+        return this.each(function () {
+            typeof options == 'string' ?
+			$.timepicker['_' + options + 'Timepicker'].
+				apply($.timepicker, [this].concat(otherArgs)) :
+			$.timepicker._attachTimepicker(this, options);
+        });
+    };
+
+    /* jQuery extend now ignores nulls! */
+    function extendRemove(target, props) {
+        $.extend(target, props);
+        for (var name in props)
+            if (props[name] == null || props[name] == undefined)
+                target[name] = props[name];
+        return target;
+    };
+
+    $.timepicker = new Timepicker(); // singleton instance
+    $.timepicker.initialized = false;
+    $.timepicker.uuid = new Date().getTime();
+    $.timepicker.version = "0.2.9";
+
+    // Workaround for #4055
+    // Add another global to avoid noConflict issues with inline event handlers
+    window['TP_jQuery_' + tpuuid] = $;
+
+})(jQuery);
diff --git a/3rdparty/timepicker/releases.txt b/3rdparty/timepicker/releases.txt
new file mode 100644
index 00000000000..64622d49429
--- /dev/null
+++ b/3rdparty/timepicker/releases.txt
@@ -0,0 +1,105 @@
+Release 0.2.9 - November 13, 2011
+Fixed the zIndex problem and removed the zIndex option (Thanks everyone who reported the problem)
+Fix a bug where repeatedly clicking on hour cells made the timepicker very slow.
+Added Italian translation, thanks to Serge Margarita.
+
+Release 0.2.8 - November 5, 2011
+Updated "defaultTime" to allow for Date object (github issue #26)
+Fixed the now and deselect buttons in IE
+
+Release 0.2.7 - October 19, 2011
+Added option to omit minutes in parsed time when user select 0 for minutes. (Thanks tribalvibes, Github issue #23)
+Added support for internationalisation (fr, de and ja, Thanks Bernd Plagge).
+
+Release 0.2.6 - October 12, 2011
+Fixed a bug when input ID have more then one special char. (Thamks Jacqueline Krijnen)
+Fixed a bug when parsing hours only or minutes only time. (Thanks protron, <a href="https://github.com/fgelinas/timepicker/issues/20">github issue #20</a>)
+Added 'Now', 'Deselect' and 'Close' buttons. (Thanks Christian Grobmeier for the close button code, <a href="https://github.com/fgelinas/timepicker/issues/20">github issue #22</a>)
+
+Release 0.2.5 - September 13, 2011
+Added support for disable and enable. (Suggested by danielrex, github issue #17)
+Added an example for 2 timepicker to behave as a period selector (start time and end time). (Thanks Bill Pellowe)
+Renamed the stylesheet to jquery.ui.timepicker.css to be more consistent with jQuery UI file name convention.
+
+Release 0.2.4 - August 5, 2011
+Fixed the hand cursor in the css file. (Thanks Mike Neumegen)
+Added position option to use with the jquery ui position utility.
+Added option to display only hours or only minutes.
+
+Release 0.2.3 - July 11, 2011
+Fix github issue #3 : Bug when hours or minutes choices does not divide by number of rows (thanks wukimus)
+Changed default behavior of the defaultTime option, if set to '' and input is empty, there will be no highlighted time in the popup (Thanks Rasmus Schultz)
+Fix github issue #4 : Error when generating empty minute cell. (Thanks 123Haynes)
+Fix github issue #5 : Add functionality for "getTime" option. (Thanks edanuff)
+Added the periodSeparator option. (thanks jrchamp)
+Fixed "getTime" for inline timepickers. (thanks Mike Neumegen)
+Added "getHour" and "getMinute" to get individual values.
+
+Release 0.2.2 - June 16, 2011
+Fixed a "console.log" line that I forgot to remove before release 0.2.1
+
+Release 0.2.1 - June 12, 2011
+Timepicker does not give the focus back to the input any more after time selection. This is similar to the datepicker behaviour and is more natural to the user because it shows the dialog again when the user click on the input again, as expected.
+Added options to customize the hours and minutes ranges and interval for more customization.
+
+Release 0.2 - May 28, 2011
+So in the previous release I mixed up versions and lost some changes, I guess that's what happen when you drink and code.
+
+Release 0.1.2 - May 26, 2011
+Fixed a bug with inline timepickers that would append a #timepickr hashtag when selecting hours and minutes.
+Fixed z-index problem with IE6 (Thanks Graham Bentley)
+Added selection of highlighted text when enter is pressed on the input field (Thanks Glen Chiacchieri)
+Adjusted some focus problems, now the input gets the focus back when the used click on hours / minutes.
+
+Release 0.1.something aka the lost release - around April 11
+Fixed a bug for when input Id had a dot in it, it was getting double escaped when it should not. (Thanks Zdenek Machac)
+So in 0.1.1 I created a bug that made timepicker changes the location hash, well now it's fixed. (Thanks Lucas Falk)
+
+Release 0.1.1 - April 6, 2011
+Changed the cells click and dblclick binding for faster rendering in IE6/7 (Thanks Blair Parsons)
+Fixed a class naming bug created in 0.1.0 (Thanks Morlion Peter)
+
+Release 0.1.0 - March 23, 2011
+Fixed some bugs with release 0.0.9
+
+Release 0.0.9 - March 22, 2011
+Added zIndex option (Thanks Frank Enderle)
+Added option showPeriodLabels that defines if the AM/PM labels are displayed on the left (Thanks Frank Enderle)
+Added showOn ['focus'|'button'|'both'] and button options for alternate trigger method
+
+Release 0.0.8 - Fev 17, 2011
+Fixed close event not triggered when switching to another input with time picker (thanks Stuart Gregg)
+
+Release 0.0.7 - Fev 10, 2011
+Added function to set time after initialisation :$('#timepicker').timepicker('setTime',newTime);
+Added support for disabled period of time : onHourShow and onMinuteShow (thanks Rene Felgentr�ger)
+
+Release 0.0.6 - Jan 19, 2011
+Added standard "change" event being triggered on the input when the content changes. (Thanks Rasmus Schultz)
+Added support for inline timePicker, attached to div or span
+Added altField that receive the parsed time value when selected time changes
+Added defaultTime value to use when input field is missing (inline) or input value is empty
+      if defaultTime is missing, current time is used
+
+Release 0.0.5 - Jan 18, 2011
+Now updating time picker selected value when manually typing in the text field (thanks Rasmus Schultz)
+Fixed : with showPeriod: true and showLeadingZero: true, PM hours did not show leading zeros (thanks Chandler May)
+Fixed : with showPeriod: true and showLeadingZero: true, Selecting 12 AM shows as 00 AM in the input field, also parsing 12AM did not work correctly (thanks Rasmus Schultz)
+
+Release 0.0.4 - jan 10, 2011
+changed showLeadingZero to affect only hours, added showMinutesLeadingZero for minutes display
+Removed width:100% for tables in css
+
+Release 0.0.3 - Jan 8, 2011
+Re-added a display:none on the main div (fix a small empty div visible at the bottom of the page before timepicker is called) (Thanks Gertjan van Roekel)
+Fixed a problem where the timepicker was never displayed with jquery ui 1.8.7 css,
+    the problem was the class ui-helper-hidden-accessible, witch I removed.
+    Thanks Alexander Fietz and StackOverflow : http://stackoverflow.com/questions/4522274/jquery-timepicker-and-jqueryui-1-8-7-conflict
+
+Release 0.0.2 - Jan 6, 2011
+Updated to include common display options for USA users
+Stephen Commisso - Jan 2011
+
+As it is a timepicker, I inspired most of the code from the datepicker
+Francois Gelinas - Nov 2010
+
diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index e8e214c0b75..12b51f564b4 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -32,6 +32,8 @@ if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'mont
 
 OC_Util::addScript('3rdparty/fullcalendar', 'fullcalendar');
 OC_Util::addStyle('3rdparty/fullcalendar', 'fullcalendar');
+OC_Util::addScript('3rdparty/timepicker', 'jquery.ui.timepicker');
+OC_Util::addStyle('3rdparty/timepicker', 'jquery.ui.timepicker');
 if(OC_Preferences::getValue(OC_USER::getUser(), "calendar", "timezone") == null || OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezonedetection') == 'true'){
 	OC_UTIL::addScript('calendar', 'geo');
 }
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 33a78b3e322..8fb628a205c 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -26,6 +26,12 @@ Calendar={
 			$( "#to" ).datepicker({
 				dateFormat : 'dd-mm-yy'
 			});
+			$('#fromtime').timepicker({
+			    showPeriodLabels: false
+			});
+			$('#totime').timepicker({
+			    showPeriodLabels: false
+			});
 			$('#category').multiselect({
 					header: false,
 					noneSelectedText: $('#category').attr('title'),
-- 
GitLab


From 1f35c94242b1d533f94ab911aecf0f05facebe43 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Mon, 16 Jan 2012 19:52:04 -0500
Subject: [PATCH 304/546] Make media app listen for post_delete instead of
 delete

---
 apps/media/lib_media.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
index 485d616e1aa..0ade0e593dc 100644
--- a/apps/media/lib_media.php
+++ b/apps/media/lib_media.php
@@ -28,7 +28,7 @@ OC_Hook::connect('OC_User','post_login','OC_MEDIA','loginListener');
 OC_Hook::connect('OC_Filesystem','post_write','OC_MEDIA','updateFile');
 
 //listen for file deletions to clean the database if a song is deleted
-OC_Hook::connect('OC_Filesystem','delete','OC_MEDIA','deleteFile');
+OC_Hook::connect('OC_Filesystem','post_delete','OC_MEDIA','deleteFile');
 
 //list for file moves to update the database
 OC_Hook::connect('OC_Filesystem','post_rename','OC_MEDIA','moveFile');
-- 
GitLab


From de165372315a0e00ae84f3104ff3ff905f942b05 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Mon, 16 Jan 2012 20:16:32 -0500
Subject: [PATCH 305/546] Emit hooks in OC_Share when sharing a file and
 forward hooks for deletion and writing of source file

---
 apps/files_sharing/appinfo/app.php |  1 +
 apps/files_sharing/lib_share.php   | 32 ++++++++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index c175142319f..8d589ea5e2e 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -5,6 +5,7 @@ require_once('apps/files_sharing/sharedstorage.php');
 OC::$CLASSPATH['OC_Share'] = "apps/files_sharing/lib_share.php";
 OC_Hook::connect("OC_Filesystem", "post_delete", "OC_Share", "deleteItem");
 OC_Hook::connect("OC_Filesystem", "post_rename", "OC_Share", "renameItem");
+OC_Hook::connect("OC_Filesystem", "post_write", "OC_Share", "updateItem");
 OC_Filesystem::registerStorageType("shared", "OC_Filestorage_Shared", array("datadir" => "string"));
 OC_Util::addScript("files_sharing", "share");
 OC_Util::addScript("3rdparty", "chosen/chosen.jquery.min");
diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index cde33fd1dc5..0eb0e5bf85d 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -91,6 +91,9 @@ class OC_Share {
 				// Clear the folder size cache for the 'Shared' folder
 				$clearFolderSize = OC_DB::prepare("DELETE FROM *PREFIX*foldersize WHERE path = ?");
 				$clearFolderSize->execute(array($sharedFolder));
+				// Emit post_create and post_write hooks to notify of a new file in the user's filesystem
+				OC_Hook::emit("OC_Filesystem", "post_create", array('path' => $target));
+				OC_Hook::emit("OC_Filesystem", "post_write", array('path' => $target));
 			}
 		}
 	}
@@ -263,6 +266,18 @@ class OC_Share {
 		}
 	}
 
+	public static function getTarget($source) {
+		$source = self::cleanPath($source);
+		$query = OC_DB::prepare("SELECT target FROM *PREFIX*sharing WHERE source = ? AND uid_owner = ? LIMIT 1");
+		$result = $query->execute(array($source, OC_User::getUser()))->fetchAll();
+		if (count($result) > 0) {
+			return $result[0]['target'];
+		} else {
+			// TODO Check in folders
+			return false;
+		}
+	}
+
 	/**
 	 * Get the user's permissions for the item at the specified target location
 	 * @param $target The target location of the item
@@ -380,8 +395,13 @@ class OC_Share {
 	*/
 	public static function deleteItem($arguments) {
 		$source = "/".OC_User::getUser()."/files".self::cleanPath($arguments['path']);
-		$query = OC_DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? AND uid_owner = ?");
-		$query->execute(array(strlen($source), $source, OC_User::getUser()));
+		if ($target = self::getTarget($source)) {
+			// Forward hook to notify of changes to target file
+			OC_Hook::emit("OC_Filesystem", "post_delete", array('path' => $target));
+			$query = OC_DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? AND uid_owner = ?");
+			$query->execute(array(strlen($source), $source, OC_User::getUser()));
+		}
+		
 	}
 
 	/**
@@ -395,6 +415,14 @@ class OC_Share {
 		$query->execute(array($oldSource, $newSource, OC_User::getUser()));
 	}
 
+	public static function updateItem($arguments) {
+		$source = "/".OC_User::getUser()."/files".self::cleanPath($arguments['path']);
+		if ($target = self::getTarget($source)) {
+			// Forward hook to notify of changes to target file
+			OC_Hook::emit("OC_Filesystem", "post_write", array('path' => $target));
+		}
+	}
+
 }
 
 ?>
-- 
GitLab


From 7859c1105c4eee8be34fd5e79d381c634fb986d8 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Mon, 16 Jan 2012 22:18:16 -0500
Subject: [PATCH 306/546] Apps need to be enabled in order to search through
 Shared directory for media scanning

---
 apps/media/ajax/api.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php
index 93298c82c55..4a93e84910e 100644
--- a/apps/media/ajax/api.php
+++ b/apps/media/ajax/api.php
@@ -23,9 +23,6 @@
 
 header('Content-type: text/html; charset=UTF-8') ;
 
-//no apps
-$RUNTIME_NOAPPS=true;
-
 require_once('../../../lib/base.php');
 OC_JSON::checkAppEnabled('media');
 require_once('../lib_collection.php');
-- 
GitLab


From 42b1c75a66ebb9b1098693493a6a78f781d8121e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 17 Jan 2012 15:18:01 +0100
Subject: [PATCH 307/546]  fix ocbug 24

---
 apps/calendar/templates/calendar.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 6b2cd68c6fb..b50b2c9b46b 100755
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -7,16 +7,16 @@
 				var monthNamesShort = <?php echo json_encode($l->tA(array('Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.'))) ?>;
 				var agendatime = '<?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>{ - <?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>}';
 				var defaulttime = '<?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>';
-				var allDayText = '<?php echo $l->t('All day') ?>';
-				var missing_field = '<?php echo $l->t('Missing fields') ?>';
-				var missing_field_title = '<?php echo $l->t('Title') ?>';
-				var missing_field_calendar = '<?php echo $l->t('Calendar') ?>';
-				var missing_field_fromdate = '<?php echo $l->t('From Date') ?>';
-				var missing_field_fromtime = '<?php echo $l->t('From Time') ?>';
-				var missing_field_todate = '<?php echo $l->t('To Date') ?>';
-				var missing_field_totime = '<?php echo $l->t('To Time') ?>';
-				var missing_field_startsbeforeends = '<?php echo $l->t('The event ends before it starts') ?>';
-				var missing_field_dberror = '<?php echo $l->t('There was a database fail') ?>';
+				var allDayText = '<?php echo addslashes($l->t('All day')) ?>';
+				var missing_field = '<?php echo addslashes($l->t('Missing fields')) ?>';
+				var missing_field_title = '<?php echo addslashes($l->t('Title')) ?>';
+				var missing_field_calendar = '<?php echo addslashes($l->t('Calendar')) ?>';
+				var missing_field_fromdate = '<?php echo addslashes($l->t('From Date')) ?>';
+				var missing_field_fromtime = '<?php echo addslashes($l->t('From Time')) ?>';
+				var missing_field_todate = '<?php echo addslashes($l->t('To Date')) ?>';
+				var missing_field_totime = '<?php echo addslashes($l->t('To Time')) ?>';
+				var missing_field_startsbeforeends = '<?php echo addslashes($l->t('The event ends before it starts')) ?>';
+				var missing_field_dberror = '<?php echo addslashes($l->t('There was a database fail')) ?>';
 				var totalurl = '<?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?>/calendars';
 				$(document).ready(function() {
 				<?php
-- 
GitLab


From 91016e37d45a6ea05b0e9e3578dd8b0943798630 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 17 Jan 2012 15:38:32 +0100
Subject: [PATCH 308/546] fix ocbug 34

---
 apps/calendar/js/calendar.js         | 1 +
 apps/calendar/templates/calendar.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 33a78b3e322..c5eaeac3cd4 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -429,6 +429,7 @@ Calendar={
 							$(button).closest('tr').prev().html(data.page).show().next().remove();
 							$('#calendar_holder').fullCalendar('removeEventSource', data.eventSource.url);
 							$('#calendar_holder').fullCalendar('addEventSource', data.eventSource);
+							$('#choosecalendar_dialog > table').append('<tr><td colspan="6"><a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);">' + newcalendar + '</a></td></tr>');
 						}
 					}, 'json');
 			},
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index b50b2c9b46b..feafd17635b 100755
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -8,6 +8,7 @@
 				var agendatime = '<?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>{ - <?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>}';
 				var defaulttime = '<?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>';
 				var allDayText = '<?php echo addslashes($l->t('All day')) ?>';
+				var newcalendar = '<?php echo addslashes($l->t('New Calendar')) ?>';
 				var missing_field = '<?php echo addslashes($l->t('Missing fields')) ?>';
 				var missing_field_title = '<?php echo addslashes($l->t('Title')) ?>';
 				var missing_field_calendar = '<?php echo addslashes($l->t('Calendar')) ?>';
-- 
GitLab


From 1f952318019baca4a8c628b2baeb23b82cc85c99 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 17 Jan 2012 19:09:11 +0100
Subject: [PATCH 309/546] use button for new calendar

---
 apps/calendar/js/calendar.js                    | 2 +-
 apps/calendar/templates/part.choosecalendar.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 7b9e5cff0c0..5c0998d4ae2 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -435,7 +435,7 @@ Calendar={
 							$(button).closest('tr').prev().html(data.page).show().next().remove();
 							$('#calendar_holder').fullCalendar('removeEventSource', data.eventSource.url);
 							$('#calendar_holder').fullCalendar('addEventSource', data.eventSource);
-							$('#choosecalendar_dialog > table').append('<tr><td colspan="6"><a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);">' + newcalendar + '</a></td></tr>');
+							$('#choosecalendar_dialog > table').append('<tr><td colspan="6"><a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);"><input type="button" value="' + newcalendar + '"></a></td></tr>');
 						}
 					}, 'json');
 			},
diff --git a/apps/calendar/templates/part.choosecalendar.php b/apps/calendar/templates/part.choosecalendar.php
index 65eb39cbfdf..86f09d62076 100644
--- a/apps/calendar/templates/part.choosecalendar.php
+++ b/apps/calendar/templates/part.choosecalendar.php
@@ -12,7 +12,7 @@ for($i = 0; $i < count($option_calendars); $i++){
 ?>
 <tr>
 	<td colspan="6">
-		<a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);"><?php echo $l->t('New Calendar') ?></a>
+		<a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);"><input type="button" value="<?php echo $l->t('New Calendar') ?>"></a>
 	</td>
 </tr>
 <tr>
-- 
GitLab


From 69ca0ae177ad20b45e630838343527558573064d Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 17 Jan 2012 19:38:38 +0100
Subject: [PATCH 310/546] move loading icon to the top bar

---
 apps/calendar/css/style.css          | 2 +-
 apps/calendar/templates/calendar.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
index 6555c25a767..108bc647a7f 100644
--- a/apps/calendar/css/style.css
+++ b/apps/calendar/css/style.css
@@ -17,7 +17,7 @@
 #editentry_dialog {display: none;}
 #parsingfail_dialog{display: none;}
 
-#loading { display: none; left: 40%; position: fixed; top: 4.4em; z-index: 100; }
+#loading { display: none;margin: 0;padding:0;margin-top:5px;}
 
 #calendar_holder {position: relative;bottom: 0; right: 0; left: 0; top: 3em;}
 .fc-content{padding:2px 4px;}
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index feafd17635b..929f5b72f96 100755
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -45,14 +45,14 @@
 				?>
 				});
 				</script>
-				<div id="loading"><img src="<?php echo OC_Helper::imagePath('core', 'loading.gif'); ?>" /></div>
 				<div id="controls">
 					<div>
 						<form>
 							<div id="view">
 								<input type="button" value="<?php echo $l->t('Week');?>" id="oneweekview_radio"/>
 								<input type="button" value="<?php echo $l->t('Month');?>" id="onemonthview_radio"/>
-								<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>
+								<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>&nbsp;&nbsp;
+								<img id="loading" src="<?php echo OC_Helper::imagePath('core', 'loading.gif'); ?>" />
 							</div>
 						</form>
 						<form>
-- 
GitLab


From 10aa2968957a3937b34c86f565c64324d676dba8 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Tue, 17 Jan 2012 20:00:12 +0100
Subject: [PATCH 311/546] fix: oc-33

---
 apps/gallery/lib/scanner.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index 4ce38a99531..df33369b93b 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -59,9 +59,10 @@ class OC_Gallery_Scanner {
     $albums['imagesCount'] = $current_album['imagesCount'];
     $albums['albumName'] = $current_album['name'];
 
-    $result = OC_Gallery_Album::find(OC_User::getUser(), $current_album['name']);
+    $result = OC_Gallery_Album::find(OC_User::getUser(), /*$current_album['name']*/ null, $path);
+    // don't duplicate galleries with same path (bug oc-33)
     if ($result->numRows() == 0 && count($current_album['images'])) {
-	    OC_Gallery_Album::create(OC_User::getUser(), $current_album['name'], $path);
+      OC_Gallery_Album::create(OC_User::getUser(), $current_album['name'], $path);
 	    $result = OC_Gallery_Album::find(OC_User::getUser(), $current_album['name']);
     }
     $albumId = $result->fetchRow();
-- 
GitLab


From b44a7dc36adbf5716a2d313598ee9305eb5e2651 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Tue, 17 Jan 2012 20:12:26 +0100
Subject: [PATCH 312/546] enhancement: oc-36

---
 apps/gallery/lib/album.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 72653c8de15..d2c420eb9ef 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -69,6 +69,8 @@ class OC_Gallery_Album {
       $sql .= ' AND album_path = ?';
       $args[] = $path;
     }
+    $sql .= ' ORDER BY album_name ASC';
+
 		$stmt = OC_DB::prepare($sql);
 		return $stmt->execute($args);
 	}
-- 
GitLab


From ce13b3b7cdfdfd4c6bef3bbace572c91372286ab Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 19 Jan 2012 12:27:16 +0100
Subject: [PATCH 313/546] fix double new calendar button - bugfix for oc 59

---
 apps/calendar/js/calendar.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 5c0998d4ae2..a4e08b56fa2 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -435,7 +435,9 @@ Calendar={
 							$(button).closest('tr').prev().html(data.page).show().next().remove();
 							$('#calendar_holder').fullCalendar('removeEventSource', data.eventSource.url);
 							$('#calendar_holder').fullCalendar('addEventSource', data.eventSource);
-							$('#choosecalendar_dialog > table').append('<tr><td colspan="6"><a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);"><input type="button" value="' + newcalendar + '"></a></td></tr>');
+							if (calendarid == 'new'){
+								$('#choosecalendar_dialog > table').append('<tr><td colspan="6"><a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);"><input type="button" value="' + newcalendar + '"></a></td></tr>');
+							}
 						}
 					}, 'json');
 			},
-- 
GitLab


From dc942d6f3e5f4845cf1e3588ac6116da783d45c8 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 19 Jan 2012 16:00:41 +0100
Subject: [PATCH 314/546] Added redirecting to static image file and caching
 for contacts with no photo embedded.

---
 apps/contacts/thumbnail.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index e49098ce820..507e1c7b302 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -22,7 +22,8 @@
 
 // Init owncloud
 require_once('../../lib/base.php');
-OC_Util::checkLoggedIn();
+OC_JSON::checkLoggedIn();
+//OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 
 if(!function_exists('imagecreatefromjpeg')) {
@@ -33,10 +34,16 @@ if(!function_exists('imagecreatefromjpeg')) {
 }
 
 function getStandardImage(){
-	$src_img = imagecreatefrompng('img/person.png');
-	header('Content-Type: image/png');
-	imagepng($src_img);
-	imagedestroy($src_img);
+	$date = new DateTime('now');
+	$date->add(new DateInterval('P10D'));
+	header('Expires: '.$date->format(DateTime::RFC850));
+	header('Cache-Control: cache');
+	header('Location: '.OC_Helper::imagePath('contacts', 'person.png'));
+	exit();
+// 	$src_img = imagecreatefrompng('img/person.png');
+// 	header('Content-Type: image/png');
+// 	imagepng($src_img);
+// 	imagedestroy($src_img);
 }
 
 
-- 
GitLab


From 5bd117dd6db9e1ea27404970faf0a94490fce994 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 19 Jan 2012 16:04:39 +0100
Subject: [PATCH 315/546] UI fixes in contact editor and address book dialog.
 Error checking in ajax methods. Localize menu entry.

---
 apps/contacts/ajax/addproperty.php            |  5 +-
 apps/contacts/ajax/getdetails.php             |  3 +-
 apps/contacts/ajax/setproperty.php            |  2 +-
 apps/contacts/lib/app.php                     | 14 ++++-
 apps/contacts/photo.php                       | 55 +++++++++++++------
 apps/contacts/templates/part.addcardform.php  |  2 +-
 .../templates/part.chooseaddressbook.php      |  4 +-
 7 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 0050f5f49aa..f016820ce5f 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -35,7 +35,7 @@ $name = $_POST['name'];
 $value = $_POST['value'];
 if(!is_array($value)){
 	$value = trim($value);
-	if(!$value && in_array($name, array('TEL', 'EMAIL', 'ORG'))) {
+	if(!$value && in_array($name, array('TEL', 'EMAIL', 'ORG', 'BDAY', 'NICKNAME'))) {
 		OC_JSON::error(array('data' => array('message' => $l->t('Cannot add empty property.'))));
 		exit();
 	}
@@ -72,6 +72,7 @@ foreach ($parameters as $key=>$element) {
 			$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key,$element);
 	}
 }
+$checksum = md5($vcard->children[$line]->serialize());
 
 if(!OC_Contacts_VCard::edit($id,$vcard->serialize())) {
 	OC_JSON::error(array('data' => array('message' => $l->t('Error adding contact property.'))));
@@ -88,4 +89,4 @@ $tmpl->assign('phone_types',$phone_types);
 $tmpl->assign('property',OC_Contacts_VCard::structureProperty($property,$line));
 $page = $tmpl->fetchPage();
 
-OC_JSON::success(array('data' => array( 'page' => $page )));
+OC_JSON::success(array('data' => array( 'checksum' => $checksum, 'page' => $page )));
diff --git a/apps/contacts/ajax/getdetails.php b/apps/contacts/ajax/getdetails.php
index 8cc0f9cbb0f..4819916f4c3 100644
--- a/apps/contacts/ajax/getdetails.php
+++ b/apps/contacts/ajax/getdetails.php
@@ -28,6 +28,7 @@ OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 
 $id = $_GET['id'];
+$new = isset($_GET['new']) ? true : false;
 $vcard = OC_Contacts_App::getContactVCard( $id );
 
-OC_Contacts_App::renderDetails($id, $vcard);
+OC_Contacts_App::renderDetails($id, $vcard, $new);
diff --git a/apps/contacts/ajax/setproperty.php b/apps/contacts/ajax/setproperty.php
index e0cd70236c8..cdc6d34c524 100644
--- a/apps/contacts/ajax/setproperty.php
+++ b/apps/contacts/ajax/setproperty.php
@@ -95,4 +95,4 @@ $tmpl->assign('phone_types',$phone_types);
 $tmpl->assign('property',OC_Contacts_VCard::structureProperty($vcard->children[$line],$line));
 $page = $tmpl->fetchPage();
 
-OC_JSON::success(array('data' => array( 'page' => $page, 'line' => $line, 'oldchecksum' => $_POST['checksum'] )));
+OC_JSON::success(array('data' => array( 'page' => $page, 'line' => $line, 'checksum' => $checksum, 'oldchecksum' => $_POST['checksum'] )));
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 00a830d5e5f..bc1e4974b30 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -18,16 +18,26 @@ class OC_Contacts_App{
 	* @param int $id of contact
 	* @param Sabre_VObject_Component $vcard to render
 	*/
-	public static function renderDetails($id, $vcard){
+	public static function renderDetails($id, $vcard, $new=false){
 		$property_types = self::getAddPropertyOptions();
 		$adr_types = self::getTypesOfProperty('ADR');
 		$phone_types = self::getTypesOfProperty('TEL');
+		$upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
+		$post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
+		$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
+
+		$freeSpace=OC_Filesystem::free_space('/');
+		$freeSpace=max($freeSpace,0);
+		$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
 
 		$details = OC_Contacts_VCard::structureContact($vcard);
 		$name = $details['FN'][0]['value'];
-		$tmpl = new OC_Template('contacts','part.details');
+		$t = $new ? 'part.contact' : 'part.details';
+		$tmpl = new OC_Template('contacts',$t);
 		$tmpl->assign('details',$details);
 		$tmpl->assign('id',$id);
+		$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
+		$tmpl->assign( 'uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
 		$tmpl->assign('property_types',$property_types);
 		$tmpl->assign('adr_types',$adr_types);
 		$tmpl->assign('phone_types',$phone_types);
diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index 60dd81140bf..478ef829cae 100644
--- a/apps/contacts/photo.php
+++ b/apps/contacts/photo.php
@@ -26,7 +26,9 @@ OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 
 $id = $_GET['id'];
-
+if(isset($GET['refresh'])) {
+	header("Cache-Control: no-cache, no-store, must-revalidate");
+}
 $l10n = new OC_L10N('contacts');
 
 $card = OC_Contacts_VCard::find( $id );
@@ -42,28 +44,45 @@ if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
 }
 
 $content = OC_VObject::parse($card['carddata']);
-
+$image = new OC_Image();
 // invalid vcard
 if( is_null($content)){
-	echo $l10n->t('This card is not RFC compatible.');
+	$image->loadFromFile('img/person_large.png');
+	header('Content-Type: '.$image->mimeType());
+	$image();
+	//echo $l10n->t('This card is not RFC compatible.');
 	exit();
-}
-// Photo :-)
-foreach($content->children as $child){
-	if($child->name == 'PHOTO'){
-		$mime = 'image/jpeg';
-		foreach($child->parameters as $parameter){
-			if( $parameter->name == 'TYPE' ){
-				$mime = $parameter->value;
+} else {
+	// Photo :-)
+	foreach($content->children as $child){
+		if($child->name == 'PHOTO'){
+			$mime = 'image/jpeg';
+			foreach($child->parameters as $parameter){
+				if( $parameter->name == 'TYPE' ){
+					$mime = $parameter->value;
+				}
+			}
+			if($image->loadFromBase64($child->value)) {
+				header('Content-Type: '.$mime);
+				$image();
+				exit();
+			} else {
+				$image->loadFromFile('img/person_large.png');
+				header('Content-Type: '.$image->mimeType());
+				$image();
 			}
+			//$photo = base64_decode($child->value);
+			//header('Content-Type: '.$mime);
+			//header('Content-Length: ' . strlen($photo));
+			//echo $photo;
+			//exit();
 		}
-		$photo = base64_decode($child->value);
-		header('Content-Type: '.$mime);
-		header('Content-Length: ' . strlen($photo));
-		echo $photo;
-		exit();
 	}
 }
+$image->loadFromFile('img/person_large.png');
+header('Content-Type: '.$image->mimeType());
+$image();
+/*
 // Logo :-/
 foreach($content->children as $child){
 	if($child->name == 'PHOTO'){
@@ -80,6 +99,6 @@ foreach($content->children as $child){
 		exit();
 	}
 }
-
+*/
 // Not found :-(
-echo $l10n->t('This card does not contain a photo.');
+//echo $l10n->t('This card does not contain a photo.');
diff --git a/apps/contacts/templates/part.addcardform.php b/apps/contacts/templates/part.addcardform.php
index 53b32188ddf..11457ff2697 100644
--- a/apps/contacts/templates/part.addcardform.php
+++ b/apps/contacts/templates/part.addcardform.php
@@ -94,7 +94,7 @@
 			</dd>
 			<dt>
 				<label class="label" for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
-			</dtl>
+			</dt>
 			<dd>
 				<input type="text" id="adr_zipcode" name="value[ADR][5]" value="">
 			</dd>
diff --git a/apps/contacts/templates/part.chooseaddressbook.php b/apps/contacts/templates/part.chooseaddressbook.php
index ba008837f0e..90894220ef8 100644
--- a/apps/contacts/templates/part.chooseaddressbook.php
+++ b/apps/contacts/templates/part.chooseaddressbook.php
@@ -12,8 +12,8 @@ for($i = 0; $i < count($option_addressbooks); $i++){
 }
 ?>
 <tr>
-	<td colspan="5">
-		<a href="#" onclick="Contacts.UI.Addressbooks.newAddressbook(this);"><?php echo $l->t('New Address Book') ?></a>
+	<td colspan="5" style="padding: 0.5em;">
+		<a class="button" href="#" onclick="Contacts.UI.Addressbooks.newAddressbook(this);"><?php echo $l->t('New Address Book') ?></a>
 	</td>
 </tr>
 <tr>
-- 
GitLab


From 137c63037704f85ebcba4ce4725750fd68a23c22 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 19 Jan 2012 18:28:17 +0100
Subject: [PATCH 316/546] Optimizations and more aggressive caching.

---
 apps/contacts/thumbnail.php | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index 507e1c7b302..f2b57014785 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -22,22 +22,16 @@
 
 // Init owncloud
 require_once('../../lib/base.php');
-OC_JSON::checkLoggedIn();
-//OC_Util::checkLoggedIn();
+//OC_JSON::checkLoggedIn();
+OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 
-if(!function_exists('imagecreatefromjpeg')) {
-	OC_Log::write('contacts','thumbnail.php. GD module not installed',OC_Log::DEBUG);
-	header('Content-Type: image/png');
-	// TODO: Check if it works to read the file and echo the content.
-	return 'img/person.png';
-}
-
 function getStandardImage(){
 	$date = new DateTime('now');
 	$date->add(new DateInterval('P10D'));
 	header('Expires: '.$date->format(DateTime::RFC850));
 	header('Cache-Control: cache');
+	header('Pragma: cache');
 	header('Location: '.OC_Helper::imagePath('contacts', 'person.png'));
 	exit();
 // 	$src_img = imagecreatefrompng('img/person.png');
@@ -46,6 +40,11 @@ function getStandardImage(){
 // 	imagedestroy($src_img);
 }
 
+if(!function_exists('imagecreatefromjpeg')) {
+	OC_Log::write('contacts','thumbnail.php. GD module not installed',OC_Log::DEBUG);
+	getStandardImage();
+	exit();
+}
 
 $id = $_GET['id'];
 
@@ -76,18 +75,14 @@ if( is_null($content)){
 
 $thumbnail_size = 23;
 
-// Finf the photo from VCard.
+// Find the photo from VCard.
 foreach($content->children as $child){
 	if($child->name == 'PHOTO'){
-		foreach($child->parameters as $parameter){
-			if( $parameter->name == 'TYPE' ){
-				$mime = $parameter->value;
-			}
-		}
 		$image = new OC_Image();
 		if($image->loadFromBase64($child->value)) {
 			if($image->centerCrop()) {
 				if($image->resize($thumbnail_size)) {
+					header('ETag: '.md5($child->value));
 					if(!$image()) {
 						OC_Log::write('contacts','thumbnail.php. Couldn\'t display thumbnail for ID '.$id,OC_Log::ERROR);
 						getStandardImage();
-- 
GitLab


From ca03a26f150f957222aacc99bf5f60b0019b3625 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 19 Jan 2012 19:47:09 +0100
Subject: [PATCH 317/546] - Added fix for empty 'FN' field on import via
 CardDAV clients. - Make sure that the contact in the list has a display name.
 - More tweaks on thumbnail caching.

---
 apps/contacts/lib/vcard.php               | 14 +++++++++++++-
 apps/contacts/templates/part.contacts.php | 14 ++++++++++++--
 apps/contacts/thumbnail.php               |  4 ++--
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 04b59a040fb..c99d53c9716 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -159,15 +159,27 @@ class OC_Contacts_VCard{
 	 */
 	public static function addFromDAVData($id,$uri,$data){
 		$fn = null;
+		$email = null;
 		$card = OC_VObject::parse($data);
 		if(!is_null($card)){
 			foreach($card->children as $property){
 				if($property->name == 'FN'){
 					$fn = $property->value;
-					break;
+				}
+				if($property->name == 'EMAIL' && is_null($email)){
+					$email = $property->value;
 				}
 			}
 		}
+		if(!$fn) {
+			if($email) {
+				$fn = $email;
+			} else {
+				$fn = 'Unknown';
+			}
+			$card->addProperty('EMAIL', $email);
+			$data = $card->serialize();
+		}
 
 		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*contacts_cards (addressbookid,fullname,carddata,uri,lastmodified) VALUES(?,?,?,?,?)' );
 		$result = $stmt->execute(array($id,$fn,$data,$uri,time()));
diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php
index 8d89e9c7ad1..7587670f974 100644
--- a/apps/contacts/templates/part.contacts.php
+++ b/apps/contacts/templates/part.contacts.php
@@ -1,3 +1,13 @@
-<?php foreach( $_['contacts'] as $contact ): ?>
-	<li book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $contact['fullname']; ?></a> </li>
+<?php foreach( $_['contacts'] as $contact ):
+	$display = trim($contact['fullname']);
+	if(!$display) {
+		$vcard = OC_Contacts_App::getContactVCard($contact['id']);
+		if(!is_null($vcard)) {
+			$struct = OC_Contacts_VCard::structureContact($vcard);
+			$display = isset($struct['EMAIL'][0])?$struct['EMAIL'][0]['value']:'[UNKNOWN]';
+		}
+	}
+	echo '<!-- '.$display.' -->';
+?>
+	<li book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $display; ?></a></li>
 <?php endforeach; ?>
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index f2b57014785..36d395171a9 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -22,8 +22,8 @@
 
 // Init owncloud
 require_once('../../lib/base.php');
-//OC_JSON::checkLoggedIn();
-OC_Util::checkLoggedIn();
+OC_JSON::checkLoggedIn();
+//OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 
 function getStandardImage(){
-- 
GitLab


From 838766add085abab914bb405903ced35baddbb74 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 19 Jan 2012 20:26:07 +0100
Subject: [PATCH 318/546] OC-23: [Calendar] Double vertical scrollbar in week
 view

---
 apps/calendar/js/calendar.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index a4e08b56fa2..4d0ca3ba650 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -658,6 +658,12 @@ $(document).ready(function(){
 		viewDisplay: function(view) {
 			$('#datecontrol_date').html(view.title);
 			$.get(OC.filePath('calendar', 'ajax', 'changeview.php') + "?v="+view.name);
+			if (view.name == 'agendaWeek') {
+				$('#calendar_holder').fullCalendar('option', 'aspectRatio', 0.1);
+			}
+			else {
+				$('#calendar_holder').fullCalendar('option', 'aspectRatio', 1.35);
+			}
 		},
 		selectable: true,
 		selectHelper: true,
-- 
GitLab


From ccad24a925b2e610881fceba9fb550f91da24162 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 19 Jan 2012 21:00:19 +0100
Subject: [PATCH 319/546] [Calendar] Use class for active view button

---
 apps/calendar/css/style.css          |  2 +-
 apps/calendar/js/calendar.js         | 26 ++++++++++++++++----------
 apps/calendar/templates/calendar.php | 14 --------------
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
index 108bc647a7f..cffaf356402 100644
--- a/apps/calendar/css/style.css
+++ b/apps/calendar/css/style.css
@@ -43,7 +43,7 @@
 .popup {display: none; position: absolute; z-index: 1000; background: #eeeeee; color: #000000; border: 1px solid #1a1a1a; font-size: 90%;}
 .event_popup {width: 280px; height: 40px; padding: 10px;}
 
-input[type="button"].active {color: #0098E4}
+input[type="button"].active {color: #6193CF}
 #fromtime, #totime {
 color:#333;
 }
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 4d0ca3ba650..228ea97c2da 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -351,10 +351,21 @@ Calendar={
 			}
 			
 		},
-		reseticonhighlight: function(){
-			$('#oneweekview_radio').css('color', '#000000');
-			$('#onemonthview_radio').css('color', '#000000');
-			$('#listview_radio').css('color', '#000000');
+		setViewActive: function(view){
+			$('#view input[type="button"]').removeClass('active');
+			var id;
+			switch (view) {
+				case 'agendaWeek':
+					id = 'oneweekview_radio';
+					break;
+				case 'month':
+					id = 'onemonthview_radio';
+					break;
+				case 'list':
+					id = 'listview_radio';
+					break;
+			}
+			$('#'+id).addClass('active');
 		},
 		Calendar:{
 			overview:function(){
@@ -658,6 +669,7 @@ $(document).ready(function(){
 		viewDisplay: function(view) {
 			$('#datecontrol_date').html(view.title);
 			$.get(OC.filePath('calendar', 'ajax', 'changeview.php') + "?v="+view.name);
+			Calendar.UI.setViewActive(view.name);
 			if (view.name == 'agendaWeek') {
 				$('#calendar_holder').fullCalendar('option', 'aspectRatio', 0.1);
 			}
@@ -689,18 +701,12 @@ $(document).ready(function(){
 	});
 	$('#oneweekview_radio').click(function(){
 		$('#calendar_holder').fullCalendar('changeView', 'agendaWeek');
-		Calendar.UI.reseticonhighlight();
-		$('#oneweekview_radio').css('color', '#6193CF');
 	});
 	$('#onemonthview_radio').click(function(){
 		$('#calendar_holder').fullCalendar('changeView', 'month');
-		Calendar.UI.reseticonhighlight();
-		$('#onemonthview_radio').css('color', '#6193CF');
 	});
 	$('#listview_radio').click(function(){
 		$('#calendar_holder').fullCalendar('changeView', 'list');
-		Calendar.UI.reseticonhighlight();
-		$('#listview_radio').css('color', '#6193CF');
 	});
 	$('#today_input').click(function(){
 		$('#calendar_holder').fullCalendar('today');
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 929f5b72f96..2d5cdea4d74 100755
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -28,20 +28,6 @@
 					echo '$(\'#calendar_holder\').fullCalendar(\'gotoDate\', ' . $year . ', ' . --$month . ', ' . $day . ');';
 					echo '$(\'#dialog_holder\').load(OC.filePath(\'calendar\', \'ajax\', \'editeventform.php\') + \'?id=\' +  ' . $_['showevent'] . ' , Calendar.UI.startEventDialog);';
 				}
-				
-				switch(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month')){
-					case 'agendaWeek':
-						echo '$(\'#oneweekview_radio\').css(\'color\', \'#6193CF\');';
-						break;
-					case 'month':
-						echo '$(\'#onemonthview_radio\').css(\'color\', \'#6193CF\');';
-						break;
-					case 'list':
-						echo '$(\'#listview_radio\').css(\'color\', \'#6193CF\');';
-						break;
-					default:
-						break;
-				}
 				?>
 				});
 				</script>
-- 
GitLab


From 11c848b2215ba00ea5db33690942e1d6df27ae1b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jan 2012 00:40:52 +0100
Subject: [PATCH 320/546] initial work on filesystemview

---
 lib/filesystem.php     | 345 ++++++++++++-----------------------------
 lib/filesystemview.php | 335 +++++++++++++++++++++++++++++++++++++++
 lib/util.php           |   2 +-
 3 files changed, 434 insertions(+), 248 deletions(-)
 create mode 100644 lib/filesystemview.php

diff --git a/lib/filesystem.php b/lib/filesystem.php
index eeca27d3a9a..f17213cd389 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -46,8 +46,10 @@
 class OC_Filesystem{
 	static private $storages=array();
 	static private $mounts=array();
-	static private $fakeRoot='';
 	static private $storageTypes=array();
+	private $fakeRoot='';
+	static private $defaultInstance;
+
 
   /**
    * classname which used for hooks handling
@@ -134,6 +136,71 @@ class OC_Filesystem{
    * run - changing this flag to false in hook handler will cancel event
    */
   const signal_param_run = 'run';
+
+  /**
+	* get the mountpoint of the storage object for a path
+	( note: because a storage is not always mounted inside the fakeroot, the returned mountpoint is relative to the absolute root of the filesystem and doesn't take the chroot into account
+	*
+	* @param string path
+	* @return string
+	*/
+	static public function getMountPoint($path){
+		if(!$path){
+			$path='/';
+		}
+		if(substr($path,0,1)!=='/'){
+			$path='/'.$path;
+		}
+		if(substr($path,-1)!=='/'){
+			$path=$path.'/';
+		}
+		$foundMountPoint='';
+		foreach(OC_Filesystem::$mounts as $mountpoint=>$storage){
+			if(substr($mountpoint,-1)!=='/'){
+				$mountpoint=$mountpoint.'/';
+			}
+			if($mountpoint==$path){
+				return $mountpoint;
+			}
+			if(strpos($path,$mountpoint)===0 and strlen($mountpoint)>strlen($foundMountPoint)){
+				$foundMountPoint=$mountpoint;
+			}
+		}
+		return $foundMountPoint;
+	}
+
+	/**
+	* get the part of the path relative to the mountpoint of the storage it's stored in
+	* @param  string  path
+	* @return bool
+	*/
+	static public function getInternalPath($path){
+		$mountPoint=self::getMountPoint($path);
+		$internalPath=substr($path,strlen($mountPoint));
+		return $internalPath;
+	}
+	/**
+	* get the storage object for a path
+	* @param string path
+	* @return OC_Filestorage
+	*/
+	static public function getStorage($path){
+		$mountpoint=self::getMountPoint($path);
+		if($mountpoint){
+			if(!isset(OC_Filesystem::$storages[$mountpoint])){
+				$mount=OC_Filesystem::$mounts[$mountpoint];
+				OC_Filesystem::$storages[$mountpoint]=OC_Filesystem::createStorage($mount['class'],$mount['arguments']);
+			}
+			return OC_Filesystem::$storages[$mountpoint];
+		}
+	}
+	
+	static public function init($root){
+		if(self::$defaultInstance){
+			return false;
+		}
+		self::$defaultInstance=new OC_FilesystemView($root);
+	}
 	
 	/**
 	 * tear down the filesystem, removing all storage providers
@@ -165,12 +232,7 @@ class OC_Filesystem{
 	* @return bool
 	*/
 	static public function chroot($fakeRoot){
-		if(!$fakeRoot==''){
-			if($fakeRoot[0]!=='/'){
-				$fakeRoot='/'.$fakeRoot;
-			}
-		}
-		self::$fakeRoot=$fakeRoot;
+		return self::$defaultInstance->chroot($path);
 	}
 
 	/**
@@ -178,21 +240,9 @@ class OC_Filesystem{
 	 * @return string
 	 */
 	static public function getRoot(){
-		return self::$fakeRoot;
-	}
-	
-	/**
-	* get the part of the path relative to the mountpoint of the storage it's stored in
-	* @param  string  path
-	* @return bool
-	*/
-	static public function getInternalPath($path){
-		$mountPoint=self::getMountPoint($path);
-		$path=self::$fakeRoot.$path;
-		$internalPath=substr($path,strlen($mountPoint));
-		return $internalPath;
+		return self::$defaultInstance->getRoot();
 	}
-	
+
 	/**
 	* mount an OC_Filestorage in our virtual filesystem
 	* @param OC_Filestorage storage
@@ -205,55 +255,6 @@ class OC_Filesystem{
 		self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments);
 	}
 	
-	/**
-	* get the storage object for a path
-	* @param string path
-	* @return OC_Filestorage
-	*/
-	static public function getStorage($path){
-		$mountpoint=self::getMountPoint($path);
-		if($mountpoint){
-			if(!isset(self::$storages[$mountpoint])){
-				$mount=self::$mounts[$mountpoint];
-				self::$storages[$mountpoint]=self::createStorage($mount['class'],$mount['arguments']);
-			}
-			return self::$storages[$mountpoint];
-		}
-	}
-	
-	/**
-	* get the mountpoint of the storage object for a path
-	( note: because a storage is not always mounted inside the fakeroot, the returned mountpoint is relative to the absolute root of the filesystem and doesn't take the chroot into account
-	*
-	* @param string path
-	* @return string
-	*/
-	static public function getMountPoint($path){
-		if(!$path){
-			$path='/';
-		}
-		if(substr($path,0,1)!=='/'){
-			$path='/'.$path;
-		}
-		if(substr($path,-1)!=='/'){
-			$path=$path.'/';
-		}
-		$path=self::$fakeRoot.$path;
-		$foundMountPoint='';
-		foreach(self::$mounts as $mountpoint=>$storage){
-			if(substr($mountpoint,-1)!=='/'){
-				$mountpoint=$mountpoint.'/';
-			}
-			if($mountpoint==$path){
-				return $mountpoint;
-			}
-			if(strpos($path,$mountpoint)===0 and strlen($mountpoint)>strlen($foundMountPoint)){
-				$foundMountPoint=$mountpoint;
-			}
-		}
-		return $foundMountPoint;
-	}
-	
 	/**
 	* return the path to a local version of the file
 	* we need this because we can't know if a file is stored local or not from outside the filestorage and for some purposes a local file is needed
@@ -261,10 +262,7 @@ class OC_Filesystem{
 	* @return string
 	*/
 	static public function getLocalFile($path){
-		$parent=substr($path,0,strrpos($path,'/'));
-		if(self::isValidPath($parent) and $storage=self::getStorage($path)){
-			return $storage->getLocalFile(self::getInternalPath($path));
-		}
+		return self::$defaultInstance->getLocalFile($path);
 	}
 	
 	/**
@@ -285,232 +283,85 @@ class OC_Filesystem{
 	 * following functions are equivilent to their php buildin equivilents for arguments/return values.
 	 */
 	static public function mkdir($path){
-		return self::basicOperation('mkdir',$path,array('create','write'));
+		return self::$defaultInstance->mkdir($path);
 	}
 	static public function rmdir($path){
-		return self::basicOperation('rmdir',$path,array('delete'));
+		return self::$defaultInstance->rmdir($path);
 	}
 	static public function opendir($path){
-		return self::basicOperation('opendir',$path,array('read'));
+		return self::$defaultInstance->opendir($path);
 	}
 	static public function is_dir($path){
-		if($path=='/'){
-			return true;
-		}
-		return self::basicOperation('is_dir',$path);
+		return self::$defaultInstance->is_dir($path);
 	}
 	static public function is_file($path){
-		if($path=='/'){
-			return false;
-		}
-		return self::basicOperation('is_file',$path);
+		return self::$defaultInstance->is_file($path);
 	}
 	static public function stat($path){
-		return self::basicOperation('stat',$path);
+		return self::$defaultInstance->stat($path);
 	}
 	static public function filetype($path){
-		return self::basicOperation('filetype',$path);
+		return self::$defaultInstance->filetype($path);
 	}
 	static public function filesize($path){
-		return self::basicOperation('filesize',$path);
+		return self::$defaultInstance->filesize($path);
 	}
 	static public function readfile($path){
-		return self::basicOperation('readfile',$path,array('read'));
+		return self::$defaultInstance->readfile($path);
 	}
 	static public function is_readable($path){
-		return self::basicOperation('is_readable',$path);
+		return self::$defaultInstance->is_readable($path);
 	}
 	static public function is_writeable($path){
-		return self::basicOperation('is_writeable',$path);
+		return self::$defaultInstance->is_writeable($path);
 	}
 	static public function file_exists($path){
-		if($path=='/'){
-			return true;
-		}
-		return self::basicOperation('file_exists',$path);
+		return self::$defaultInstance->file_exists($path);
 	}
 	static public function filectime($path){
-		return self::basicOperation('filectime',$path);
+		return self::$defaultInstance->filectime($path);
 	}
 	static public function filemtime($path){
-		return self::basicOperation('filemtime',$path);
+		return self::$defaultInstance->filemtime($path);
 	}
 	static public function file_get_contents($path){
-		return self::basicOperation('file_get_contents',$path,array('read'));
+		return self::$defaultInstance->file_get_contents($path);
 	}
 	static public function file_put_contents($path,$data){
-		return self::basicOperation('file_put_contents',$path,array('create','write'),$data);
+		return self::$defaultInstance->file_put_contents($path,$data);
 	}
 	static public function unlink($path){
-		return self::basicOperation('unlink',$path,array('delete'));
+		return self::$defaultInstance->unlink($path);
 	}
 	static public function rename($path1,$path2){
-		if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and self::is_writeable($path1) and self::isValidPath($path2)){
-			$run=true;
-      OC_Hook::emit( self::CLASSNAME, self::signal_rename, array( self::signal_param_oldpath => $path1 , self::signal_param_newpath=>$path2, self::signal_param_run => &$run));
-			if($run){
-				$mp1=self::getMountPoint($path1);
-				$mp2=self::getMountPoint($path2);
-				if($mp1==$mp2){
-					if($storage=self::getStorage($path1)){
-						$result=$storage->rename(self::getInternalPath($path1),self::getInternalPath($path2));
-					}
-				}elseif($storage1=self::getStorage($path1) and $storage2=self::getStorage($path2)){
-					$tmpFile=$storage1->toTmpFile(self::getInternalPath($path1));
-					$result=$storage2->fromTmpFile($tmpFile,self::getInternalPath($path2));
-					$storage1->unlink(self::getInternalPath($path1));
-				}
-        OC_Hook::emit( self::CLASSNAME, self::signal_post_rename, array( self::signal_param_oldpath => $path1, self::signal_param_newpath=>$path2));
-				return $result;
-			}
-		}
+		return self::$defaultInstance->rename($path1,$path2);
 	}
 	static public function copy($path1,$path2){
-		if(OC_FileProxy::runPreProxies('copy',$path1,$path2) and self::is_readable($path1) and self::isValidPath($path2)){
-			$run=true;
-      OC_Hook::emit( self::CLASSNAME, self::signal_copy, array( self::signal_param_oldpath => $path1 , self::signal_param_newpath=>$path2, self::signal_param_run => &$run));
-			$exists=self::file_exists($path2);
-			if($run and !$exists){
-        OC_Hook::emit( self::CLASSNAME, self::signal_create, array( self::signal_param_path => $path2, self::signal_param_run => &$run));
-			}
-			if($run){
-        OC_Hook::emit( self::CLASSNAME, self::signal_write, array( self::signal_param_path => $path2, self::signal_param_run => &$run));
-			}
-			if($run){
-				$mp1=self::getMountPoint($path1);
-				$mp2=self::getMountPoint($path2);
-				if($mp1==$mp2){
-					if($storage=self::getStorage($path1)){
-						$result=$storage->copy(self::getInternalPath($path1),self::getInternalPath($path2));
-					}
-				}elseif($storage1=self::getStorage($path1) and $storage2=self::getStorage($path2)){
-					$tmpFile=$storage1->toTmpFile(self::getInternalPath($path1));
-					$result=$storage2->fromTmpFile($tmpFile,self::getInternalPath($path2));
-				}
-        OC_Hook::emit( self::CLASSNAME, self::signal_post_copy, array( self::signal_param_oldpath => $path1 , self::signal_param_newpath=>$path2));
-				if(!$exists){
-          OC_Hook::emit( self::CLASSNAME, self::signal_post_create, array( self::signal_param_path => $path2));
-				}
-        OC_Hook::emit( self::CLASSNAME, self::signal_post_write, array( self::signal_param_path => $path2));
-				return $result;
-			}
-		}
+		return self::$defaultInstance->copy($path1,$path2);
 	}
 	static public function fopen($path,$mode){
-		$hooks=array();
-		switch($mode){
-			case 'r':
-				$hooks[]='read';
-				break;
-			case 'r+':
-			case 'w+':
-			case 'x+':
-			case 'a+':
-				$hooks[]='read';
-				$hooks[]='write';
-				break;
-			case 'w':
-			case 'x':
-			case 'a':
-				$hooks[]='write';
-				break;
-			default:
-				OC_Log::write('core','invalid mode ('.$mode.') for '.$path,OC_Log::ERROR);
-		}
-		
-		return self::basicOperation('fopen',$path,$hooks,$mode);
+		return self::$defaultInstance->fopen($path,$mode);
 	}
 	static public function toTmpFile($path){
-		if(OC_FileProxy::runPreProxies('toTmpFile',$path) and self::isValidPath($path) and $storage=self::getStorage($path)){
-      OC_Hook::emit( self::CLASSNAME, self::signal_read, array( self::signal_param_path => $path));
-			return $storage->toTmpFile(self::getInternalPath($path));
-		}
+		return self::$defaultInstance->toTmpFile($path);
 	}
 	static public function fromTmpFile($tmpFile,$path){
-		if(OC_FileProxy::runPreProxies('copy',$tmpFile,$path) and self::isValidPath($path) and $storage=self::getStorage($path)){
-			$run=true;
-			$exists=self::file_exists($path);
-			if(!$exists){
-        OC_Hook::emit( self::CLASSNAME, self::signal_create, array( self::signal_param_path => $path, self::signal_param_run => &$run));
-			}
-			if($run){
-        OC_Hook::emit( self::CLASSNAME, self::signal_write, array( self::signal_param_path => $path, self::signal_param_run => &$run));
-			}
-			if($run){
-				$result=$storage->fromTmpFile($tmpFile,self::getInternalPath($path));
-				if(!$exists){
-          OC_Hook::emit( self::CLASSNAME, self::signal_post_create, array( self::signal_param_path => $path));
-				}
-        OC_Hook::emit( self::CLASSNAME, self::signal_post_write, array( self::signal_param_path => $path));
-				return $result;
-			}
-		}
+		return self::$defaultInstance->fromTmpFile($tmpFile,$path);
 	}
 
 	static public function getMimeType($path){
-		return self::basicOperation('getMimeType',$path);
+		return self::$defaultInstance->getMimeType($path);
 	}
 	static public function hash($type,$path){
-		return self::basicOperation('hash',$path,array('read'));
+		return self::$defaultInstance->hash($type,$path);
 	}
 	
 	static public function free_space($path='/'){
-		return self::basicOperation('free_space',$path);
+		return self::$defaultInstance->free_space($path);
 	}
 	
 	static public function search($query){
-		$files=array();
-		$fakeRoot=self::$fakeRoot;
-		$fakeRootLength=strlen($fakeRoot);
-		$results=OC_FileCache::search($query);
-		if(is_array($results)){
-			foreach($results as $result){
-				$file=str_replace('//','/',$mountpoint.$result);
-				if(substr($file,0,$fakeRootLength)==$fakeRoot){
-					$file=substr($file,$fakeRootLength);
-					$files[]=$file;
-				}
-			}
-		}
-		return $files;
-		
-	}
-	
-	/**
-	 * abstraction for running most basic operations
-	 * @param string $operation
-	 * @param string #path
-	 * @param array (optional) hooks
-	 * @param mixed (optional) $extraParam
-	 * @return mixed
-	 */
-	private static function basicOperation($operation,$path,$hooks=array(),$extraParam=null){
-		if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and self::isValidPath($path) and $storage=self::getStorage($path)){
-			$interalPath=self::getInternalPath($path);
-			$run=true;
-			foreach($hooks as $hook){
-				if($hook!='read'){
-          OC_Hook::emit( self::CLASSNAME, $hook, array( self::signal_param_path => $path, self::signal_param_run => &$run));
-				}else{
-          OC_Hook::emit( self::CLASSNAME, $hook, array( self::signal_param_path => $path));
-				}
-			}
-			if($run){
-				if($extraParam){
-					$result=$storage->$operation($interalPath,$extraParam);
-				}else{
-					$result=$storage->$operation($interalPath);
-				}
-				$result=OC_FileProxy::runPostProxies($operation,$path,$result);
-				foreach($hooks as $hook){
-					if($hook!='read'){
-            OC_Hook::emit( self::CLASSNAME, 'post_'.$hook, array( self::signal_param_path => $path));
-					}
-				}
-				return $result;
-			}
-		}
-		return null;
+		return self::$defaultInstance->search($query);
 	}
 }
 
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
new file mode 100644
index 00000000000..9687a8bceb4
--- /dev/null
+++ b/lib/filesystemview.php
@@ -0,0 +1,335 @@
+<?php
+
+/**
+* ownCloud
+*
+* @author Frank Karlitschek
+* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+class OC_FilesystemView {
+	private $fakeRoot='';
+	
+	public function __construct($root){
+		$this->fakeRoot=$root;
+	}
+	
+	public function getAbsolutePath($path){
+		if(!$path){
+			$path='/';
+		}
+		if(substr($path,0,1)!=='/'){
+			$path='/'.$path;
+		}
+		return $this->fakeRoot.$path;
+	}
+
+
+	/**
+	* change the root to a fake toor
+	* @param  string  fakeRoot
+	* @return bool
+	*/
+	public function chroot($fakeRoot){
+		if(!$fakeRoot==''){
+			if($fakeRoot[0]!=='/'){
+				$fakeRoot='/'.$fakeRoot;
+			}
+		}
+		$this->fakeRoot=$fakeRoot;
+	}
+
+	/**
+	 * get the fake root
+	 * @return string
+	 */
+	public function getRoot(){
+		return $this->fakeRoot;
+	}
+
+	/**
+	* get the part of the path relative to the mountpoint of the storage it's stored in
+	* @param  string  path
+	* @return bool
+	*/
+	public function getInternalPath($path){
+		return OC_Filesystem::getInternalPath($this->getAbsolutePath($path));
+	}
+	/**
+	* get the storage object for a path
+	* @param string path
+	* @return OC_Filestorage
+	*/
+	public function getStorage($path){
+		return OC_Filesystem::getStorage($this->getAbsolutePath($path));
+	}
+
+	/**
+	* get the mountpoint of the storage object for a path
+	( note: because a storage is not always mounted inside the fakeroot, the returned mountpoint is relative to the absolute root of the filesystem and doesn't take the chroot into account
+	*
+	* @param string path
+	* @return string
+	*/
+	public function getMountPoint($path){
+		return OC_Filesystem::getMountPoint($this->getAbsolutePath($path));
+	}
+
+	/**
+	* return the path to a local version of the file
+	* we need this because we can't know if a file is stored local or not from outside the filestorage and for some purposes a local file is needed
+	* @param string path
+	* @return string
+	*/
+	public function getLocalFile($path){
+		$parent=substr($path,0,strrpos($path,'/'));
+		if(OC_Filesystem::isValidPath($parent) and $storage=$this->getStorage($path)){
+			return $storage->getLocalFile($this->getInternalPath($path));
+		}
+	}
+
+	/**
+	 * following functions are equivilent to their php buildin equivilents for arguments/return values.
+	 */
+	public function mkdir($path){
+		return $this->basicOperation('mkdir',$path,array('create','write'));
+	}
+	public function rmdir($path){
+		return $this->basicOperation('rmdir',$path,array('delete'));
+	}
+	public function opendir($path){
+		return $this->basicOperation('opendir',$path,array('read'));
+	}
+	public function is_dir($path){
+		if($path=='/'){
+			return true;
+		}
+		return $this->basicOperation('is_dir',$path);
+	}
+	public function is_file($path){
+		if($path=='/'){
+			return false;
+		}
+		return $this->basicOperation('is_file',$path);
+	}
+	public function stat($path){
+		return $this->basicOperation('stat',$path);
+	}
+	public function filetype($path){
+		return $this->basicOperation('filetype',$path);
+	}
+	public function filesize($path){
+		return $this->basicOperation('filesize',$path);
+	}
+	public function readfile($path){
+		return $this->basicOperation('readfile',$path,array('read'));
+	}
+	public function is_readable($path){
+		return $this->basicOperation('is_readable',$path);
+	}
+	public function is_writeable($path){
+		return $this->basicOperation('is_writeable',$path);
+	}
+	public function file_exists($path){
+		if($path=='/'){
+			return true;
+		}
+		return $this->basicOperation('file_exists',$path);
+	}
+	public function filectime($path){
+		return $this->basicOperation('filectime',$path);
+	}
+	public function filemtime($path){
+		return $this->basicOperation('filemtime',$path);
+	}
+	public function file_get_contents($path){
+		return $this->basicOperation('file_get_contents',$path,array('read'));
+	}
+	public function file_put_contents($path,$data){
+		return $this->basicOperation('file_put_contents',$path,array('create','write'),$data);
+	}
+	public function unlink($path){
+		return $this->basicOperation('unlink',$path,array('delete'));
+	}
+	public function rename($path1,$path2){
+		if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and $this->is_writeable($path1) and OC_Filesystem::isValidPath($path2)){
+			$run=true;
+			OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_rename, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2, OC_Filesystem::signal_param_run => &$run));
+			if($run){
+				$mp1=$this->getMountPoint($path1);
+				$mp2=$this->getMountPoint($path2);
+				if($mp1==$mp2){
+					if($storage=$this->getStorage($path1)){
+						$result=$storage->rename($this->getInternalPath($path1),$this->getInternalPath($path2));
+					}
+				}elseif($storage1=$this->getStorage($path1) and $storage2=$this->getStorage($path2)){
+					$tmpFile=$storage1->toTmpFile($this->getInternalPath($path1));
+					$result=$storage2->fromTmpFile($tmpFile,$this->getInternalPath($path2));
+					$storage1->unlink($this->getInternalPath($path1));
+				}
+				OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_rename, array( OC_Filesystem::signal_param_oldpath => $path1, OC_Filesystem::signal_param_newpath=>$path2));
+				return $result;
+			}
+		}
+	}
+	public function copy($path1,$path2){
+		if(OC_FileProxy::runPreProxies('copy',$path1,$path2) and $this->is_readable($path1) and OC_Filesystem::isValidPath($path2)){
+			$run=true;
+			OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_copy, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2, OC_Filesystem::signal_param_run => &$run));
+			$exists=$this->file_exists($path2);
+			if($run and !$exists){
+				OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_create, array( OC_Filesystem::signal_param_path => $path2, OC_Filesystem::signal_param_run => &$run));
+			}
+			if($run){
+				OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_write, array( OC_Filesystem::signal_param_path => $path2, OC_Filesystem::signal_param_run => &$run));
+			}
+			if($run){
+				$mp1=$this->getMountPoint($path1);
+				$mp2=$this->getMountPoint($path2);
+				if($mp1==$mp2){
+					if($storage=$this->getStorage($path1)){
+						$result=$storage->copy($this->getInternalPath($path1),$this->getInternalPath($path2));
+					}
+				}elseif($storage1=$this->getStorage($path1) and $storage2=$this->getStorage($path2)){
+					$tmpFile=$storage1->toTmpFile($this->getInternalPath($path1));
+					$result=$storage2->fromTmpFile($tmpFile,$this->getInternalPath($path2));
+				}
+        OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_copy, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2));
+				if(!$exists){
+          OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_create, array( OC_Filesystem::signal_param_path => $path2));
+				}
+        OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, array( OC_Filesystem::signal_param_path => $path2));
+				return $result;
+			}
+		}
+	}
+	public function fopen($path,$mode){
+		$hooks=array();
+		switch($mode){
+			case 'r':
+				$hooks[]='read';
+				break;
+			case 'r+':
+			case 'w+':
+			case 'x+':
+			case 'a+':
+				$hooks[]='read';
+				$hooks[]='write';
+				break;
+			case 'w':
+			case 'x':
+			case 'a':
+				$hooks[]='write';
+				break;
+			default:
+				OC_Log::write('core','invalid mode ('.$mode.') for '.$path,OC_Log::ERROR);
+		}
+
+		return $this->basicOperation('fopen',$path,$hooks,$mode);
+	}
+	public function toTmpFile($path){
+		if(OC_FileProxy::runPreProxies('toTmpFile',$path) and OC_Filesystem::isValidPath($path) and $storage=$this->getStorage($path)){
+			OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_read, array( OC_Filesystem::signal_param_path => $path));
+			return $storage->toTmpFile($this->getInternalPath($path));
+		}
+	}
+	public function fromTmpFile($tmpFile,$path){
+		if(OC_FileProxy::runPreProxies('copy',$tmpFile,$path) and OC_Filesystem::isValidPath($path) and $storage=$this->getStorage($path)){
+			$run=true;
+			$exists=$this->file_exists($path);
+			if(!$exists){
+				OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_create, array( OC_Filesystem::signal_param_path => $path, OC_Filesystem::signal_param_run => &$run));
+			}
+			if($run){
+				OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_write, array( OC_Filesystem::signal_param_path => $path, OC_Filesystem::signal_param_run => &$run));
+			}
+			if($run){
+				$result=$storage->fromTmpFile($tmpFile,$this->getInternalPath($path));
+				if(!$exists){
+					OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_create, array( OC_Filesystem::signal_param_path => $path));
+				}
+				OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, array( OC_Filesystem::signal_param_path => $path));
+				return $result;
+			}
+		}
+	}
+
+	public function getMimeType($path){
+		return $this->basicOperation('getMimeType',$path);
+	}
+	public function hash($type,$path){
+		return $this->basicOperation('hash',$path,array('read'));
+	}
+
+	public function free_space($path='/'){
+		return $this->basicOperation('free_space',$path);
+	}
+
+	public function search($query){
+		$files=array();
+		$fakeRoot=$this->$fakeRoot;
+		$fakeRootLength=strlen($fakeRoot);
+		$results=OC_FileCache::search($query);
+		if(is_array($results)){
+			foreach($results as $result){
+				$file=str_replace('//','/',$mountpoint.$result);
+				if(substr($file,0,$fakeRootLength)==$fakeRoot){
+					$file=substr($file,$fakeRootLength);
+					$files[]=$file;
+				}
+			}
+		}
+		return $files;
+	}
+
+	/**
+	 * abstraction for running most basic operations
+	 * @param string $operation
+	 * @param string #path
+	 * @param array (optional) hooks
+	 * @param mixed (optional) $extraParam
+	 * @return mixed
+	 */
+	private function basicOperation($operation,$path,$hooks=array(),$extraParam=null){
+		if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and OC_Filesystem::isValidPath($path) and $storage=$this->getStorage($path)){
+			$interalPath=$this->getInternalPath($path);
+			$run=true;
+			foreach($hooks as $hook){
+				if($hook!='read'){
+					OC_Hook::emit( OC_Filesystem::CLASSNAME, $hook, array( OC_Filesystem::signal_param_path => $path, OC_Filesystem::signal_param_run => &$run));
+				}else{
+					OC_Hook::emit( OC_Filesystem::CLASSNAME, $hook, array( OC_Filesystem::signal_param_path => $path));
+				}
+			}
+			if($run){
+				if($extraParam){
+					$result=$storage->$operation($interalPath,$extraParam);
+				}else{
+					$result=$storage->$operation($interalPath);
+				}
+				$result=OC_FileProxy::runPostProxies($operation,$path,$result);
+				foreach($hooks as $hook){
+					if($hook!='read'){
+						OC_Hook::emit( OC_Filesystem::CLASSNAME, 'post_'.$hook, array( OC_Filesystem::signal_param_path => $path));
+					}
+				}
+				return $result;
+			}
+		}
+		return null;
+	}
+}
diff --git a/lib/util.php b/lib/util.php
index 2fb581aea25..29f2cdd06d4 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -45,7 +45,7 @@ class OC_Util {
 			}
 
 			//jail the user into his "home" directory
-			OC_Filesystem::chroot("/$user/$root");
+			OC_Filesystem::init('/'.$user.'/'.$root);
 			$quotaProxy=new OC_FileProxy_Quota();
 			OC_FileProxy::register($quotaProxy);
 			self::$fsSetup=true;
-- 
GitLab


From d12afe05419c840f6f9eb465b227c25c3d4755f9 Mon Sep 17 00:00:00 2001
From: Cloud Dumper <clouddumper@gmail.com>
Date: Thu, 19 Jan 2012 15:05:41 +0100
Subject: [PATCH 321/546] Sort songs also by path.

Add song_path in the ORDER BY.

Fix oc-31.
---
 apps/media/lib_collection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php
index d8dda1212e4..411acd97506 100644
--- a/apps/media/lib_collection.php
+++ b/apps/media/lib_collection.php
@@ -243,7 +243,7 @@ class OC_MEDIA_COLLECTION{
 		}else{
 			$searchString='';
 		}
-		$query=OC_DB::prepare("SELECT * FROM *PREFIX*media_songs WHERE song_user=? $artistString $albumString $searchString ORDER BY song_track, song_name");
+		$query=OC_DB::prepare("SELECT * FROM *PREFIX*media_songs WHERE song_user=? $artistString $albumString $searchString ORDER BY song_track, song_name, song_path");
 		return $query->execute($params)->fetchAll();
 	}
 	
-- 
GitLab


From 6ccb1187df3c56db4b2b716f4ae03c96ee6067fa Mon Sep 17 00:00:00 2001
From: Cloud Dumper <clouddumper@gmail.com>
Date: Thu, 19 Jan 2012 15:14:24 +0100
Subject: [PATCH 322/546] Don't wrap collection cells.

This change makes sure cells are never wrapped.

If the text is too big for the column, ellipsis is
used instead.
---
 apps/media/css/music.css       | 10 ++++------
 apps/media/js/collection.js    | 32 ++++++++++++++++----------------
 apps/media/templates/music.php |  2 ++
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index bcd8cf9178b..91da9ec40e7 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -17,20 +17,18 @@ a.jp-mute,a.jp-unmute { left:24em; }
 div.jp-volume-bar { position:absolute; overflow:hidden; background:#eee; width:4em; height:0.4em; cursor:pointer; top:1.3em; left:27em; }
 div.jp-volume-bar-value { background:#ccc; width:0; height:0.4em; }
 
-#collection { padding-top:1em; position:relative; width:100%; float:left; }
-#collection li.album,#collection li.song { margin-left:3em; }
+#collection { padding-top:1em; position:relative; width:100%; float:left; table-layout:fixed; }
+#collection td { overflow:hidden; text-overflow:ellipsis; white-space:nowrap; }
 #leftcontent img.remove { display:none; float:right; cursor:pointer; opacity: 0; }
 #leftcontent li:hover img.remove { display:inline; opacity: .3; }
 #leftcontent li div.label { float: left; width: 200px; overflow: hidden; text-overflow: ellipsis; }
-#collection li button { float:right; }
-#collection li,#playlist li { list-style-type:none; }
+#playlist li { list-style-type:none; }
 .template { display:none; }
 .collection_playing { background:#eee; font-weight: bold; }
 
-#collection li { padding-right:10px; }
 #searchresults input.play, #searchresults input.add { float:left; height:1em; width:1em; }
 #collection tr.collapsed td.album, #collection tr.collapsed td.title { color:#ddd; }
-td.artist img, td.artist a, td.album img, td.album a { float: left; }
+#collection td.artist-expander, #collection td.album-expander { width:2em; text-align:center; }
 td.artist a.expander, td.album a.expander { float:right; padding:0 1em; }
 tr.active td { background-color:#eee; font-weight:bold; }
 tr td { border-top:1px solid #eee; height:2.2em; }
diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index 6525df55c71..efd7db8f6aa 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -122,7 +122,7 @@ Collection={
 						}
 						tr.find('td.artist').addClass('buttons');
 						Collection.addButtons(tr,artist);
-						tr.children('td.artist').append(expander);
+						tr.children('td.artist-expander').append(expander);
 						tr.attr('data-artist',artist.name);
 						Collection.parent.find('tbody').append(tr);
 					}
@@ -144,7 +144,7 @@ Collection={
 					newRow.find('td.artist').text('');
 					newRow.find('.expander').remove();
 				}
-				newRow.find('td.album .expander').remove();
+				newRow.find('td.album-expander .expander').remove();
 				if(i==0){
 					newRow.find('td.album a').text(album.name);
 					newRow.find('td.album a').click(function(event){
@@ -165,7 +165,7 @@ Collection={
 								Collection.showAlbum(tr.data('artist'),tr.data('album'));
 							}
 						});
-						newRow.children('td.album').append(expander);
+						newRow.children('td.album-expander').append(expander);
 					}
 					Collection.addButtons(newRow,album);
 				} else {
@@ -192,15 +192,15 @@ Collection={
 			});
 		});
 		tr.removeClass('collapsed');
-		tr.find('td.artist a.expander').data('expanded',true);
-		tr.find('td.artist a.expander').addClass('expanded');
-		tr.find('td.artist a.expander').text('v');
+		tr.find('td.artist-expander a.expander').data('expanded',true);
+		tr.find('td.artist-expander a.expander').addClass('expanded');
+		tr.find('td.artist-expander a.expander').text('v');
 	},
 	hideArtist:function(artist){
 		var tr=Collection.parent.find('tr[data-artist="'+artist+'"]');
 		var artist=tr.first().data('artistData');
 		tr.first().find('td.album a').first().text(artist.albums.length+' '+t('media','albums'));
-		tr.first().find('td.album a.expander').remove();
+		tr.first().find('td.album-expander a.expander').remove();
 		tr.first().find('td.title a').text(artist.songs.length+' '+t('media','songs'));
 		tr.first().find('td.album a').unbind('click');
 		tr.first().find('td.title a').unbind('click');
@@ -209,18 +209,18 @@ Collection={
 				$(row).remove();
 			}
 		});
-		tr.find('td.artist a.expander').data('expanded',false);
-		tr.find('td.artist a.expander').removeClass('expanded');
-		tr.find('td.artist a.expander').text('>');
+		tr.find('td.artist-expander a.expander').data('expanded',false);
+		tr.find('td.artist-expander a.expander').removeClass('expanded');
+		tr.find('td.artist-expander a.expander').text('>');
 		Collection.addButtons(tr,artist);
 	},
 	showAlbum:function(artist,album){
 		var tr = Collection.parent.find('tr[data-artist="'+artist+'"][data-album="'+album+'"]');
 		var lastRow=tr;
 		var albumData=tr.data('albumData');
-		tr.find('td.album a.expander').data('expanded',true);
-		tr.find('td.album a.expander').addClass('expanded');
-		tr.find('td.album a.expander').text('v');
+		tr.find('td.album-expander a.expander').data('expanded',true);
+		tr.find('td.album-expander a.expander').addClass('expanded');
+		tr.find('td.album-expander a.expander').text('v');
 		$.each(albumData.songs,function(i,song){
 			if(i>0){
 				var newRow=tr.clone();
@@ -248,9 +248,9 @@ Collection={
 		var tr = Collection.parent.find('tr[data-artist="'+artist+'"][data-album="'+album+'"]');
 		var albumData=tr.data('albumData');
 		tr.first().find('td.title a').text(albumData.songs.length+' '+t('media','songs'));
-		tr.find('td.album a.expander').data('expanded',false);
-		tr.find('td.album a.expander').removeClass('expanded');
-		tr.find('td.album a.expander').text('> ');
+		tr.find('td.album-expander a.expander').data('expanded',false);
+		tr.find('td.album-expander a.expander').removeClass('expanded');
+		tr.find('td.album-expander a.expander').text('> ');
 		tr.each(function(i,row){
 			if(i>0){
 				$(row).remove();
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
index 7764a315a8f..3959d989472 100644
--- a/apps/media/templates/music.php
+++ b/apps/media/templates/music.php
@@ -42,7 +42,9 @@
 	<tbody>
 		<tr class="template">
 			<td class="artist"><a></a></td>
+			<td class="artist-expander"><a></a></td>
 			<td class="album"><a></a></td>
+			<td class="album-expander"><a></a></td>
 			<td class="title"><a></a></td>
 		</tr>
 	</tbody>
-- 
GitLab


From 42ef44e1b48d753f51a72f71ca22cf283ecf39da Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jan 2012 01:41:37 +0100
Subject: [PATCH 323/546] show proper feedback that collection scanning is done
 and show the collection afterwards

---
 apps/media/js/collection.js | 43 +++++++++++++++++--------------------
 apps/media/js/scanner.js    | 22 ++++++++++++++-----
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index efd7db8f6aa..2249acf3cc4 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -69,7 +69,6 @@ Collection={
 						Collection.loadedListeners[i]();
 					}
 					if(data.songs.length==0){
-						$('#scan input.start').val(t('media','Scan Collection'));
 						$('#scan input.start').click();
 					}
 					
@@ -318,33 +317,31 @@ Collection={
 		}
 	},
 	addSong:function(song){
-		var artist=false
-		var album=false;
-		for(var i=0;i<Collection.artists.length;i++){
-			if(Collection.artists[i].artist_id==song.song_artist){
-				artist=Collection.artists[i];
-				for(var j=0;j<artist.albums.length;j++){
-					if(artist.albums[j].album_id==song.song_album){
-						album=artist.albums[j];
-						break;
-					}
-				}
-				break;
-			}
-		}
+		var artist=Collection.findArtist(song.artist);
 		if(!artist){
-			artist={artist_id:song.song_artist,artist_name:song.artist,albums:[]};
+			artist={name:song.artist,albums:[],songs:[]};
 			Collection.artists.push(artist);
-			if(!Collection.parent || Collection.parent.is(":visible")){
-				Collection.display();
-			}
-			
+			Collection.artistsById[song.song_artist]=artist;
 		}
+		var album=Collection.findAlbum(song.artist,song.album);
 		if(!album){
-			album={album_id:song.song_album,album_name:song.album,album_artist:song.song_artist,songs:[]};
-			artist.albums.push(album)
+			album={name:song.album,artist:song.song_artist,songs:[]};
+			artist.albums.push(album);
+			Collection.albums.push(album);
+			Collection.albumsById[song.song_album]=album;
 		}
-		album.songs.push(song)
+		var songData={
+			name:song.song_name,
+			artist:Collection.artistsById[song.song_artist].name,
+			album:Collection.albumsById[song.song_album].name,
+			lastPlayed:song.song_lastplayed,
+			length:song.song_length,
+			path:song.song_path,
+			playCount:song.song_playcount,
+		};
+		album.songs.push(songData)
+		artist.songs.push(songData);
+		Collection.songs.push(songData);
 	}
 }
 
diff --git a/apps/media/js/scanner.js b/apps/media/js/scanner.js
index 0ebf408e702..ed2046dd7a6 100644
--- a/apps/media/js/scanner.js
+++ b/apps/media/js/scanner.js
@@ -5,13 +5,14 @@ Scanner={
 	startTime:null,
 	endTime:null,
 	stopScanning:false,
-	currentIndex:-1,
+	currentIndex:0,
 	songs:[],
 	findSongs:function(ready){
 		$.getJSON(OC.linkTo('media','ajax/api.php')+'?action=find_music',function(songs){
 			Scanner.songsFound=songs.length;
 			Scanner.currentIndex=-1
 			if(ready){
+				
 				ready(songs)
 			}
 		});
@@ -37,12 +38,22 @@ Scanner={
 		$('#scanprogressbar').progressbar({
 			value:0,
 		});
+		$('#scanprogressbar').show();
 		Scanner.songsChecked=0;
+		Scanner.currentIndex=0;
 		Scanner.songsScanned=0;
 		Scanner.startTime=new Date().getTime()/1000;
 		Scanner.findSongs(function(songs){
 			Scanner.songs=songs;
-			Scanner.start();
+			Scanner.start(function(){
+				$('#scan input.start').show();
+				$('#scan input.stop').hide();
+				$('#scanprogressbar').hide();
+				Collection.display();
+				if(ready){
+					ready();
+				}
+			});
 		});
 	},
 	stop:function(){
@@ -52,15 +63,16 @@ Scanner={
 		Scanner.stopScanning=false;
 		$('#scancount').show();
 		var scanSong=function(){
-			Scanner.currentIndex++;
-			if(!Scanner.stopScanning && Scanner.currentIndex<Scanner.songs.length){
+			if(!Scanner.stopScanning && Scanner.currentIndex<=Scanner.songs.length){
 				Scanner.scanFile(Scanner.songs[Scanner.currentIndex],scanSong)
-			}else{
+			}else if(!Scanner.stopScanning){
 				Scanner.endTime=new Date().getTime()/1000;
 				if(ready){
 					ready();
+					ready=null;//only call ready once
 				}
 			}
+			Scanner.currentIndex++;
 		}
 		scanSong();
 		scanSong();
-- 
GitLab


From 1c311c36bf29304c220489fdb0d1089c8d299149 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jan 2012 17:09:31 +0100
Subject: [PATCH 324/546] add translation wrappers to gallery strings in js

---
 apps/gallery/js/album_cover.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index e50593c0087..4659cd302e8 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -37,14 +37,14 @@ var totalAlbums = 0;
 function scanForAlbums() {
   var albumCounter = 0;
   var totalAlbums = 0;
-  $('#notification').text("Scanning directories");
+  $('#notification').text(t('gallery',"Scanning directories"));
   $("#notification").fadeIn();
   $("#notification").slideDown();
   $.getJSON('ajax/galleryOp.php?operation=filescan', function(r) {
 
     if (r.status == 'success') {
       totalAlbums = r.paths.length;
-      $('#notification').text("Creating thumbnails ... " + Math.floor((albumCounter/totalAlbums)*100) + "%");
+      $('#notification').text(t('gallery','Creating thumbnails')+' ... ' + Math.floor((albumCounter/totalAlbums)*100) + "%");
       for(var a in r.paths) {
         $.getJSON('ajax/galleryOp.php?operation=partial_create&path='+r.paths[a], function(r) {
 
@@ -53,7 +53,7 @@ function scanForAlbums() {
           }
 
           albumCounter++;
-          $('#notification').text("Creating thumbnails ... " + Math.floor((albumCounter/totalAlbums)*100) + "%");
+		  $('#notification').text(t('gallery','Creating thumbnails')+' ... ' + Math.floor((albumCounter/totalAlbums)*100) + "%");
           if (albumCounter == totalAlbums) {
             $("#notification").fadeOut();
             $("#notification").slideUp();
@@ -74,7 +74,7 @@ function scanForAlbums() {
 }
 
 function galleryRemove(albumName) {
-  if (confirm("Do you wan't to remove album " + albumName + "?")) {
+  if (confirm(t('gallery',"Do you wan't to remove album")+' ' + albumName + "?")) {
 	$.getJSON("ajax/galleryOp.php", {operation: "remove", name: albumName}, function(r) {
 	  if (r.status == "success") {
       $("#gallery_album_box[title='"+albumName+"']").remove();
@@ -87,7 +87,7 @@ function galleryRemove(albumName) {
 }
 
 function galleryRename(name) {
-  var result = window.prompt("Input new gallery name", name);
+  var result = window.prompt(t('gallery',"Input new gallery name"), name);
   if (result) {
 	if (Albums.find(result)) {
 	  alert("Album named '" + result + "' already exists");
@@ -102,7 +102,7 @@ function galleryRename(name) {
 	});
 	
   } else {
-    alert("Album name can't be empty")
+	  alert(t('gallery',"Album name can't be empty"))
   }
 }
 
-- 
GitLab


From 6866165a37de338d51abce7bf1651f2a1447bccb Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jan 2012 17:13:49 +0100
Subject: [PATCH 325/546] make oc_image work when php_exif isn't enabled

---
 lib/image.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index 70ad3f5969e..6de3ed9104d 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -21,8 +21,7 @@
 *
 */
 
-/** From user comments at http://dk2.php.net/manual/en/function.exif-imagetype.php
- * Don't know if it can come in handy?
+//From user comments at http://dk2.php.net/manual/en/function.exif-imagetype.php
 if ( ! function_exists( 'exif_imagetype' ) ) {
     function exif_imagetype ( $filename ) {
         if ( ( list($width, $height, $type, $attr) = getimagesize( $filename ) ) !== false ) {
@@ -31,7 +30,6 @@ if ( ! function_exists( 'exif_imagetype' ) ) {
     return false;
     }
 }
-*/
 
 function ellipsis($str, $maxlen) {
 	if (strlen($str) > $maxlen) {
@@ -205,6 +203,10 @@ class OC_Image {
 	* @returns bool.
 	*/
 	public function fixOrientation() {
+		if(!is_callable('exif_read_data')){
+			OC_Log::write('core','OC_Image::fixOrientation() Exif module not enabled.', OC_Log::DEBUG);
+			return false;
+		}
 		if(!is_resource(self::$resource)) {
 			OC_Log::write('core','OC_Image::fixOrientation() No image loaded.', OC_Log::DEBUG);
 			return false;
-- 
GitLab


From 735fcf8bd2739f109d7519aac99d864691c4ba6f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jan 2012 17:47:55 +0100
Subject: [PATCH 326/546] only double quoted string seems to be detected in js

---
 apps/gallery/js/album_cover.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index 4659cd302e8..38b5815775c 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -44,7 +44,7 @@ function scanForAlbums() {
 
     if (r.status == 'success') {
       totalAlbums = r.paths.length;
-      $('#notification').text(t('gallery','Creating thumbnails')+' ... ' + Math.floor((albumCounter/totalAlbums)*100) + "%");
+	  $('#notification').text(t('gallery',"Creating thumbnails")+' ... ' + Math.floor((albumCounter/totalAlbums)*100) + "%");
       for(var a in r.paths) {
         $.getJSON('ajax/galleryOp.php?operation=partial_create&path='+r.paths[a], function(r) {
 
@@ -53,7 +53,7 @@ function scanForAlbums() {
           }
 
           albumCounter++;
-		  $('#notification').text(t('gallery','Creating thumbnails')+' ... ' + Math.floor((albumCounter/totalAlbums)*100) + "%");
+		  $('#notification').text(t('gallery',"Creating thumbnails")+' ... ' + Math.floor((albumCounter/totalAlbums)*100) + "%");
           if (albumCounter == totalAlbums) {
             $("#notification").fadeOut();
             $("#notification").slideUp();
-- 
GitLab


From 7ea2923fa8805d91ee7d69dd19d10d450792bafe Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jan 2012 18:53:45 +0100
Subject: [PATCH 327/546] translation updates

---
 apps/calendar/l10n/ca.php       |   8 +-
 apps/calendar/l10n/cs_CZ.php    |   8 +-
 apps/calendar/l10n/de.php       |  12 +-
 apps/calendar/l10n/el.php       |   8 +-
 apps/calendar/l10n/es.php       |   8 +-
 apps/calendar/l10n/et_EE.php    |  77 +++-
 apps/calendar/l10n/gl.php       |   3 +-
 apps/calendar/l10n/sk_SK.php    |  66 +++-
 apps/calendar/l10n/th_TH.php    | 140 +++++++
 apps/contacts/l10n/ar.php       |   2 -
 apps/contacts/l10n/ca.php       |   4 +-
 apps/contacts/l10n/cs_CZ.php    |  22 +-
 apps/contacts/l10n/da.php       |   2 -
 apps/contacts/l10n/de.php       |  22 +-
 apps/contacts/l10n/el.php       |   2 -
 apps/contacts/l10n/eo.php       |   2 -
 apps/contacts/l10n/es.php       |  24 +-
 apps/contacts/l10n/et_EE.php    |  36 +-
 apps/contacts/l10n/eu.php       |   2 -
 apps/contacts/l10n/fr.php       |   2 -
 apps/contacts/l10n/gl.php       |   2 -
 apps/contacts/l10n/he.php       |   2 -
 apps/contacts/l10n/hr.php       |   2 -
 apps/contacts/l10n/hu_HU.php    |   2 -
 apps/contacts/l10n/ia.php       |   1 -
 apps/contacts/l10n/it.php       |   2 -
 apps/contacts/l10n/ja_JP.php    |   2 -
 apps/contacts/l10n/lb.php       |   2 -
 apps/contacts/l10n/nl.php       |   2 -
 apps/contacts/l10n/nn_NO.php    |   2 -
 apps/contacts/l10n/pl.php       |   2 -
 apps/contacts/l10n/pt_BR.php    |   2 -
 apps/contacts/l10n/pt_PT.php    |   2 -
 apps/contacts/l10n/ro.php       |   2 -
 apps/contacts/l10n/ru.php       |   2 -
 apps/contacts/l10n/sk_SK.php    |  30 +-
 apps/contacts/l10n/sl.php       |   2 -
 apps/contacts/l10n/sr.php       |   2 -
 apps/contacts/l10n/sr@latin.php |   2 -
 apps/contacts/l10n/sv.php       |   2 -
 apps/contacts/l10n/th_TH.php    |  61 +++
 apps/contacts/l10n/tr.php       |   2 -
 apps/contacts/l10n/zh_CN.php    |   2 -
 apps/gallery/l10n/ar.php        |   5 +
 apps/gallery/l10n/cs_CZ.php     |   5 +
 apps/gallery/l10n/es.php        |   5 +
 apps/gallery/l10n/et_EE.php     |   5 +
 apps/gallery/l10n/ia.php        |   3 +
 apps/gallery/l10n/pl.php        |   7 +-
 apps/gallery/l10n/th_TH.php     |   5 +
 apps/media/l10n/th_TH.php       |  13 +
 core/l10n/ar.php                |   5 +
 core/l10n/ca.php                |   2 +-
 core/l10n/de.php                |   5 +
 core/l10n/et_EE.php             |   5 +
 core/l10n/hu_HU.php             |   1 +
 core/l10n/th_TH.php             |  39 ++
 files/l10n/ar.php               |   4 +
 files/l10n/de.php               |   2 +
 files/l10n/et_EE.php            |   4 +
 files/l10n/sk_SK.php            |   4 +
 files/l10n/th_TH.php            |  23 ++
 l10n/ar/contacts.po             |  46 +--
 l10n/ar/core.po                 |  18 +-
 l10n/ar/files.po                |  16 +-
 l10n/ar/gallery.po              |  29 +-
 l10n/ar/settings.po             |  21 +-
 l10n/bg_BG/contacts.po          |  46 +--
 l10n/bg_BG/gallery.po           |  24 +-
 l10n/ca/calendar.po             |  56 +--
 l10n/ca/contacts.po             |  50 ++-
 l10n/ca/core.po                 |   6 +-
 l10n/ca/gallery.po              |  26 +-
 l10n/ca/settings.po             |   8 +-
 l10n/cs_CZ/calendar.po          |  56 +--
 l10n/cs_CZ/contacts.po          |  82 ++--
 l10n/cs_CZ/gallery.po           |  29 +-
 l10n/cs_CZ/settings.po          |   5 +-
 l10n/da/contacts.po             |  46 +--
 l10n/da/gallery.po              |  24 +-
 l10n/de/calendar.po             |  58 +--
 l10n/de/contacts.po             |  83 ++---
 l10n/de/core.po                 |  18 +-
 l10n/de/files.po                |  11 +-
 l10n/de/gallery.po              |  26 +-
 l10n/de/settings.po             |  27 +-
 l10n/el/calendar.po             |  56 +--
 l10n/el/contacts.po             |  46 +--
 l10n/el/gallery.po              |  24 +-
 l10n/el/settings.po             |   5 +-
 l10n/eo/contacts.po             |  46 +--
 l10n/eo/gallery.po              |  24 +-
 l10n/es/calendar.po             |  58 +--
 l10n/es/contacts.po             |  88 ++---
 l10n/es/gallery.po              |  29 +-
 l10n/es/settings.po             |  10 +-
 l10n/et_EE/calendar.po          | 196 +++++-----
 l10n/et_EE/contacts.po          | 112 +++---
 l10n/et_EE/core.po              |  18 +-
 l10n/et_EE/files.po             |  16 +-
 l10n/et_EE/gallery.po           |  29 +-
 l10n/et_EE/settings.po          |  23 +-
 l10n/eu/contacts.po             |  46 +--
 l10n/eu/gallery.po              |  24 +-
 l10n/fr/contacts.po             |  48 +--
 l10n/fr/gallery.po              |  26 +-
 l10n/gl/calendar.po             |  44 +--
 l10n/gl/contacts.po             |  48 +--
 l10n/gl/gallery.po              |  26 +-
 l10n/gl/settings.po             |   8 +-
 l10n/he/contacts.po             |  46 +--
 l10n/he/gallery.po              |  24 +-
 l10n/hr/contacts.po             |  46 +--
 l10n/hr/gallery.po              |  24 +-
 l10n/hu_HU/contacts.po          |  46 +--
 l10n/hu_HU/core.po              |   9 +-
 l10n/hu_HU/gallery.po           |  24 +-
 l10n/hy/contacts.po             |  46 +--
 l10n/hy/gallery.po              |  24 +-
 l10n/ia/contacts.po             |  46 +--
 l10n/ia/gallery.po              |  27 +-
 l10n/id/contacts.po             |  46 +--
 l10n/id/gallery.po              |  24 +-
 l10n/it/contacts.po             |  48 +--
 l10n/it/gallery.po              |  26 +-
 l10n/it/settings.po             |   6 +-
 l10n/ja_JP/contacts.po          |  46 +--
 l10n/ja_JP/gallery.po           |  24 +-
 l10n/lb/contacts.po             |  46 +--
 l10n/lb/gallery.po              |  24 +-
 l10n/lt_LT/contacts.po          |  46 +--
 l10n/lt_LT/gallery.po           |  24 +-
 l10n/ms_MY/contacts.po          |  46 +--
 l10n/ms_MY/gallery.po           |  24 +-
 l10n/nb_NO/contacts.po          |  46 +--
 l10n/nb_NO/gallery.po           |  24 +-
 l10n/nl/contacts.po             |  46 +--
 l10n/nl/gallery.po              |  24 +-
 l10n/nl/settings.po             |   8 +-
 l10n/nn_NO/contacts.po          |  46 +--
 l10n/nn_NO/gallery.po           |  24 +-
 l10n/pl/contacts.po             |  48 +--
 l10n/pl/gallery.po              |  29 +-
 l10n/pl/settings.po             |   7 +-
 l10n/pt_BR/contacts.po          |  48 +--
 l10n/pt_BR/gallery.po           |  26 +-
 l10n/pt_PT/contacts.po          |  46 +--
 l10n/pt_PT/gallery.po           |  24 +-
 l10n/ro/contacts.po             |  46 +--
 l10n/ro/gallery.po              |  24 +-
 l10n/ru/contacts.po             |  46 +--
 l10n/ru/gallery.po              |  24 +-
 l10n/sk_SK/calendar.po          | 174 ++++-----
 l10n/sk_SK/contacts.po          |  99 +++--
 l10n/sk_SK/files.po             |  15 +-
 l10n/sk_SK/gallery.po           |  26 +-
 l10n/sl/contacts.po             |  46 +--
 l10n/sl/gallery.po              |  24 +-
 l10n/sr/contacts.po             |  48 +--
 l10n/sr/gallery.po              |  26 +-
 l10n/sr@latin/contacts.po       |  46 +--
 l10n/sr@latin/gallery.po        |  24 +-
 l10n/sv/contacts.po             |  46 +--
 l10n/sv/gallery.po              |  24 +-
 l10n/templates/calendar.pot     |  40 +-
 l10n/templates/contacts.pot     |  44 +--
 l10n/templates/core.pot         |   2 +-
 l10n/templates/files.pot        |   2 +-
 l10n/templates/gallery.pot      |  22 +-
 l10n/templates/media.pot        |   2 +-
 l10n/templates/settings.pot     |   2 +-
 l10n/th_TH/calendar.po          | 637 ++++++++++++++++++++++++++++++++
 l10n/th_TH/contacts.po          | 282 ++++++++++++++
 l10n/th_TH/core.po              | 171 +++++++++
 l10n/th_TH/files.po             | 114 ++++++
 l10n/th_TH/gallery.po           |  53 +++
 l10n/th_TH/media.po             |  65 ++++
 l10n/th_TH/settings.po          | 160 ++++++++
 l10n/tr/contacts.po             |  46 +--
 l10n/tr/gallery.po              |  24 +-
 l10n/zh_CN/contacts.po          |  46 +--
 l10n/zh_CN/gallery.po           |  26 +-
 settings/l10n/ar.php            |   7 +
 settings/l10n/ca.php            |   1 +
 settings/l10n/de.php            |  11 +-
 settings/l10n/es.php            |   1 +
 settings/l10n/et_EE.php         |   8 +
 settings/l10n/gl.php            |   1 +
 settings/l10n/it.php            |   1 +
 settings/l10n/nl.php            |   1 +
 settings/l10n/pl.php            |   1 +
 settings/l10n/th_TH.php         |  36 ++
 192 files changed, 4479 insertions(+), 1888 deletions(-)
 create mode 100644 apps/calendar/l10n/th_TH.php
 create mode 100644 apps/contacts/l10n/th_TH.php
 create mode 100644 apps/gallery/l10n/ar.php
 create mode 100644 apps/gallery/l10n/cs_CZ.php
 create mode 100644 apps/gallery/l10n/es.php
 create mode 100644 apps/gallery/l10n/et_EE.php
 create mode 100644 apps/gallery/l10n/ia.php
 create mode 100644 apps/gallery/l10n/th_TH.php
 create mode 100644 apps/media/l10n/th_TH.php
 create mode 100644 core/l10n/th_TH.php
 create mode 100644 files/l10n/th_TH.php
 create mode 100644 l10n/th_TH/calendar.po
 create mode 100644 l10n/th_TH/contacts.po
 create mode 100644 l10n/th_TH/core.po
 create mode 100644 l10n/th_TH/files.po
 create mode 100644 l10n/th_TH/gallery.po
 create mode 100644 l10n/th_TH/media.po
 create mode 100644 l10n/th_TH/settings.po
 create mode 100644 settings/l10n/th_TH.php

diff --git a/apps/calendar/l10n/ca.php b/apps/calendar/l10n/ca.php
index 19934baa0bd..3b74e3da64c 100644
--- a/apps/calendar/l10n/ca.php
+++ b/apps/calendar/l10n/ca.php
@@ -65,6 +65,7 @@
 "Date" => "Data",
 "Cal." => "Cal.",
 "All day" => "Tot el dia",
+"New Calendar" => "Calendari nou",
 "Missing fields" => "Els camps que falten",
 "Title" => "Títol",
 "From Date" => "Des de la data",
@@ -99,7 +100,6 @@
 "Nov." => "nov.",
 "Dec." => "des.",
 "Choose active calendars" => "Seleccioneu calendaris actius",
-"New Calendar" => "Calendari nou",
 "CalDav Link" => "Enllaç CalDav",
 "Download" => "Baixa",
 "Edit" => "Edita",
@@ -137,8 +137,14 @@
 "Location of the Event" => "Ubicació de l'esdeveniment",
 "Description" => "Descripció",
 "Description of the Event" => "Descripció de l'esdeveniment",
+"Import a calendar file" => "Importa un fitxer de calendari",
 "Please choose the calendar" => "Escolliu el calendari",
+"create a new calendar" => "crea un nou calendari",
+"Name of new calendar" => "Nom del nou calendari",
 "Import" => "Importa",
+"Importing calendar" => "S'està important el calendari",
+"Calendar imported successfully" => "El calendari s'ha importat amb èxit",
+"Close Dialog" => "Tanca el diàleg",
 "Create a new event" => "Crea un nou esdeveniment",
 "Timezone" => "Zona horària",
 "Check always for changes of the timezone" => "Comprova sempre en els canvis de zona horària",
diff --git a/apps/calendar/l10n/cs_CZ.php b/apps/calendar/l10n/cs_CZ.php
index f55cd0f01ae..a5d7bfcddff 100644
--- a/apps/calendar/l10n/cs_CZ.php
+++ b/apps/calendar/l10n/cs_CZ.php
@@ -65,6 +65,7 @@
 "Date" => "Datum",
 "Cal." => "Kal.",
 "All day" => "Celý den",
+"New Calendar" => "Nový kalendář",
 "Missing fields" => "Chybějící pole",
 "Title" => "Název",
 "From Date" => "Od data",
@@ -99,7 +100,6 @@
 "Nov." => "Lis.",
 "Dec." => "Pro.",
 "Choose active calendars" => "Vybrat aktivní kalendář",
-"New Calendar" => "Nový kalendář",
 "CalDav Link" => "Odkaz CalDav",
 "Download" => "Stáhnout",
 "Edit" => "Editovat",
@@ -137,8 +137,14 @@
 "Location of the Event" => "Místo konání události",
 "Description" => "Popis",
 "Description of the Event" => "Popis události",
+"Import a calendar file" => "Importovat soubor kalendáře",
 "Please choose the calendar" => "Zvolte prosím kalendář",
+"create a new calendar" => "vytvořit nový kalendář",
+"Name of new calendar" => "Název nového kalendáře",
 "Import" => "Import",
+"Importing calendar" => "Kalendář se importuje",
+"Calendar imported successfully" => "Kalendář byl importován úspěšně",
+"Close Dialog" => "Zavřít dialog",
 "Create a new event" => "Vytvořit novou událost",
 "Timezone" => "Časové pásmo",
 "Check always for changes of the timezone" => "Zkontrolujte vždy změny �asového pásma",
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index aae6f235fc4..736294e0f05 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -65,6 +65,7 @@
 "Date" => "Datum",
 "Cal." => "Kal.",
 "All day" => "Ganztags",
+"New Calendar" => "Neuer Kalender",
 "Missing fields" => "fehlende Felder",
 "Title" => "Titel",
 "From Date" => "Startdatum",
@@ -81,14 +82,14 @@
 "There was a fail, while parsing the file." => "Fehler beim Einlesen der Datei.",
 "Sun." => "So",
 "Mon." => "Mo",
-"Tue." => "Die",
+"Tue." => "Di",
 "Wed." => "Mi",
 "Thu." => "Do",
 "Fri." => "Fr",
 "Sat." => "Sa",
 "Jan." => "Jan",
 "Feb." => "Feb",
-"Mar." => "Mär",
+"Mar." => "März",
 "Apr." => "Apr",
 "May." => "Mai",
 "Jun." => "Juni",
@@ -99,7 +100,6 @@
 "Nov." => "Nov",
 "Dec." => "Dez",
 "Choose active calendars" => "Aktive Kalender wählen",
-"New Calendar" => "Neuer Kalender",
 "CalDav Link" => "CalDAV-Link",
 "Download" => "Herunterladen",
 "Edit" => "Bearbeiten",
@@ -137,8 +137,14 @@
 "Location of the Event" => "Ort",
 "Description" => "Beschreibung",
 "Description of the Event" => "Beschreibung",
+"Import a calendar file" => "Kalender Datei Importieren",
 "Please choose the calendar" => "Bitte wählen Sie den Kalender.",
+"create a new calendar" => "Neuen Kalender anlegen",
+"Name of new calendar" => "Kalendername",
 "Import" => "Importieren",
+"Importing calendar" => "Kalender wird importiert.",
+"Calendar imported successfully" => "Kalender erfolgreich importiert",
+"Close Dialog" => "Dialog schließen",
 "Create a new event" => "Neues Ereignis",
 "Timezone" => "Zeitzone",
 "Check always for changes of the timezone" => "immer die Zeitzone überprüfen",
diff --git a/apps/calendar/l10n/el.php b/apps/calendar/l10n/el.php
index edc2635b8c7..af465beeed6 100644
--- a/apps/calendar/l10n/el.php
+++ b/apps/calendar/l10n/el.php
@@ -65,6 +65,7 @@
 "Date" => "Ημε�ομηνία",
 "Cal." => "Ημε�.",
 "All day" => "Ολοήμε�ο",
+"New Calendar" => "�έα Ημε�ολόγιο",
 "Missing fields" => "Πεδία που λείπουν",
 "Title" => "Τίτλος",
 "From Date" => "Από Ημε�ομηνία",
@@ -99,7 +100,6 @@
 "Nov." => "�οε.",
 "Dec." => "Δεκ.",
 "Choose active calendars" => "Επιλέξτε τα ενε�γά ημε�ολόγια",
-"New Calendar" => "�έα Ημε�ολόγιο",
 "CalDav Link" => "Σ�νδεση CalDAV",
 "Download" => "Λήψη",
 "Edit" => "Επεξε�γασία",
@@ -137,8 +137,14 @@
 "Location of the Event" => "Τοποθεσία συμβάντος",
 "Description" => "Πε�ιγ�αφή",
 "Description of the Event" => "Πε�ιγ�αφή του συμβάντος",
+"Import a calendar file" => "Εισαγωγή α�χείου ημε�ολογίου",
 "Please choose the calendar" => "Πα�ακαλώ επιλέξτε το ημε�ολόγιο",
+"create a new calendar" => "δημιου�γία νέου ημε�ολογίου",
+"Name of new calendar" => "Όνομα νέου ημε�ολογίου",
 "Import" => "Εισαγωγή",
+"Importing calendar" => "Εισαγωγή ημε�ολογίου",
+"Calendar imported successfully" => "Το ημε�ολόγιο εισήχθει επιτυχώς",
+"Close Dialog" => "Κλείσιμο Διαλόγου",
 "Create a new event" => "Δημιου�γήστε ένα νέο συμβάν",
 "Timezone" => "Ζώνη ώ�ας",
 "Check always for changes of the timezone" => "Έλεγοχς πάντα για τις αλλαγές της ζώνης ώ�ας",
diff --git a/apps/calendar/l10n/es.php b/apps/calendar/l10n/es.php
index 5f4097709da..100ffc4b220 100644
--- a/apps/calendar/l10n/es.php
+++ b/apps/calendar/l10n/es.php
@@ -65,6 +65,7 @@
 "Date" => "Fecha",
 "Cal." => "Cal.",
 "All day" => "Todo el día",
+"New Calendar" => "Nuevo calendario",
 "Missing fields" => "Los campos que faltan",
 "Title" => "Título",
 "From Date" => "Desde la fecha",
@@ -99,7 +100,6 @@
 "Nov." => "Nov.",
 "Dec." => "Dic.",
 "Choose active calendars" => "Elige los calendarios activos",
-"New Calendar" => "Nuevo calendario",
 "CalDav Link" => "Enlace a CalDav",
 "Download" => "Descargar",
 "Edit" => "Editar",
@@ -137,8 +137,14 @@
 "Location of the Event" => "Lugar del Evento",
 "Description" => "Descripción",
 "Description of the Event" => "Descripción del evento",
+"Import a calendar file" => "Importar un archivo de calendario",
 "Please choose the calendar" => "Elija el calendario",
+"create a new calendar" => "Crear un nuevo calendario",
+"Name of new calendar" => "Nombre del nuevo calendario",
 "Import" => "Importar",
+"Importing calendar" => "Importando calendario",
+"Calendar imported successfully" => "Calendario importado exitosamente",
+"Close Dialog" => "Cerrar diálogo",
 "Create a new event" => "Crear un nuevo evento",
 "Timezone" => "Zona horaria",
 "Check always for changes of the timezone" => "Comprobar siempre por cambios en la zona horaria",
diff --git a/apps/calendar/l10n/et_EE.php b/apps/calendar/l10n/et_EE.php
index 7144ea763c4..7bff7bf42e7 100644
--- a/apps/calendar/l10n/et_EE.php
+++ b/apps/calendar/l10n/et_EE.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"New Timezone:" => "Uus ajavöönd:",
 "Timezone changed" => "Ajavöönd on muudetud",
 "Invalid request" => "Vigane päring",
 "Calendar" => "Kalender",
@@ -25,8 +26,46 @@
 "Bi-Weekly" => "Üle nädala",
 "Monthly" => "Igal kuul",
 "Yearly" => "Igal aastal",
+"never" => "mitte kunagi",
+"by occurrences" => "toimumiskordade järgi",
+"by date" => "kuupäeva järgi",
+"by monthday" => "kuu päeva järgi",
+"by weekday" => "nädalapäeva järgi",
+"Monday" => "Esmaspäev",
+"Tuesday" => "Teisipäev",
+"Wednesday" => "Kolmapäev",
+"Thursday" => "Neljapäev",
+"Friday" => "Reede",
+"Saturday" => "Laupäev",
+"Sunday" => "Pühapäev",
+"events week of month" => "ürituse kuu nädal",
+"first" => "esimene",
+"second" => "teine",
+"third" => "kolmas",
+"fourth" => "neljas",
+"fifth" => "viies",
+"last" => "viimane",
+"January" => "Jaanuar",
+"February" => "Veebruar",
+"March" => "Märts",
+"April" => "Aprill",
+"May" => "Mai",
+"June" => "Juuni",
+"July" => "Juuli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktoober",
+"November" => "November",
+"December" => "Detsember",
+"by events date" => "ürituste kuupäeva järgi",
+"by yearday(s)" => "aasta päeva(de) järgi",
+"by weeknumber(s)" => "nädala numbri(te) järgi",
+"by day and month" => "kuu ja päeva järgi",
 "Not an array" => "Pole andmemassiiv",
+"Date" => "Kuupäev",
+"Cal." => "Kal.",
 "All day" => "Kogu päev",
+"New Calendar" => "Uus kalender",
 "Missing fields" => "Puuduvad väljad",
 "Title" => "Pealkiri",
 "From Date" => "Alates kuupäevast",
@@ -41,8 +80,26 @@
 "Today" => "Täna",
 "Calendars" => "Kalendrid",
 "There was a fail, while parsing the file." => "Faili parsimisel tekkis viga.",
+"Sun." => "Püh.",
+"Mon." => "Esm.",
+"Tue." => "Teisip.",
+"Wed." => "Kolmap.",
+"Thu." => "Meljap.",
+"Fri." => "Reede",
+"Sat." => "Laup.",
+"Jan." => "Jan.",
+"Feb." => "Veebr.",
+"Mar." => "Mär.",
+"Apr." => "Apr.",
+"May." => "Mai",
+"Jun." => "Jun.",
+"Jul." => "Jul.",
+"Aug." => "Aug.",
+"Sep." => "Sept.",
+"Oct." => "Okt.",
+"Nov." => "Nov.",
+"Dec." => "Dets.",
 "Choose active calendars" => "Vali aktiivsed kalendrid",
-"New Calendar" => "Uus kalender",
 "CalDav Link" => "CalDav Link",
 "Download" => "Lae alla",
 "Edit" => "Muuda",
@@ -65,14 +122,32 @@
 "To" => "Kuni",
 "Advanced options" => "Lisavalikud",
 "Repeat" => "Korda",
+"Advanced" => "Täpsem",
+"Select weekdays" => "Vali nädalapäevad",
+"Select days" => "Vali päevad",
+"and the events day of year." => "ja ürituse päev aastas.",
+"and the events day of month." => "ja ürituse päev kuus.",
+"Select months" => "Vali kuud",
+"Select weeks" => "Vali nädalad",
+"and the events week of year." => "ja ürituse nädal aastas.",
+"Interval" => "Intervall",
+"End" => "Lõpp",
+"occurrences" => "toimumiskordi",
 "Location" => "Asukoht",
 "Location of the Event" => "Sündmuse toimumiskoht",
 "Description" => "Kirjeldus",
 "Description of the Event" => "Sündmuse kirjeldus",
+"Import a calendar file" => "Impordi kalendrifail",
 "Please choose the calendar" => "Palun vali kalender",
+"create a new calendar" => "loo uus kalender",
+"Name of new calendar" => "Uue kalendri nimi",
 "Import" => "Impordi",
+"Importing calendar" => "Kalendri importimine",
+"Calendar imported successfully" => "Kalender on imporditud",
+"Close Dialog" => "Sulge dialoogiaken",
 "Create a new event" => "Loo sündmus",
 "Timezone" => "Ajavöönd",
+"Check always for changes of the timezone" => "Kontrolli alati muudatusi ajavööndis",
 "Timeformat" => "Aja vorming",
 "24h" => "24h",
 "12h" => "12h",
diff --git a/apps/calendar/l10n/gl.php b/apps/calendar/l10n/gl.php
index 6cdaa98e96b..6b74a04f923 100644
--- a/apps/calendar/l10n/gl.php
+++ b/apps/calendar/l10n/gl.php
@@ -8,6 +8,7 @@
 "Business" => "Traballo",
 "Call" => "Chamada",
 "Clients" => "Clientes",
+"Deliverer" => "Remitente",
 "Holidays" => "Vacacións",
 "Ideas" => "Ideas",
 "Journey" => "Viaxe",
@@ -64,6 +65,7 @@
 "Date" => "Data",
 "Cal." => "Cal.",
 "All day" => "Todo o dia",
+"New Calendar" => "Novo calendario",
 "Missing fields" => "Faltan campos",
 "Title" => "Título",
 "From Date" => "Desde Data",
@@ -98,7 +100,6 @@
 "Nov." => "Nov.",
 "Dec." => "Nad.",
 "Choose active calendars" => "Escolla os calendarios activos",
-"New Calendar" => "Novo calendario",
 "CalDav Link" => "Ligazón CalDav",
 "Download" => "Baixar",
 "Edit" => "Editar",
diff --git a/apps/calendar/l10n/sk_SK.php b/apps/calendar/l10n/sk_SK.php
index ec0485bfc9a..6023a7af139 100644
--- a/apps/calendar/l10n/sk_SK.php
+++ b/apps/calendar/l10n/sk_SK.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"New Timezone:" => "Nová �asová zóna:",
 "Timezone changed" => "Časové pásmo zmenené",
 "Invalid request" => "Neplatná požiadavka",
 "Calendar" => "Kalendár",
@@ -25,8 +26,40 @@
 "Bi-Weekly" => "Každý druhý týždeň",
 "Monthly" => "Mesa�ne",
 "Yearly" => "Ro�ne",
+"never" => "nikdy",
+"by occurrences" => "podľa výskytu",
+"by date" => "podľa dátumu",
+"Monday" => "Pondelok",
+"Tuesday" => "Utorok",
+"Wednesday" => "Streda",
+"Thursday" => "Å tvrtok",
+"Friday" => "Piatok",
+"Saturday" => "Sobota",
+"Sunday" => "Nedeľa",
+"first" => "prvý",
+"second" => "druhý",
+"third" => "tretí",
+"fourth" => "štvrtý",
+"fifth" => "piaty",
+"last" => "posledný",
+"January" => "Január",
+"February" => "Február",
+"March" => "Marec",
+"April" => "Apríl",
+"May" => "Máj",
+"June" => "Jún",
+"July" => "Júl",
+"August" => "August",
+"September" => "September",
+"October" => "Október",
+"November" => "November",
+"December" => "December",
+"by events date" => "podľa dátumu udalosti",
+"by day and month" => "podľa dňa a mesiaca",
 "Not an array" => "Nie je pole",
+"Date" => "Dátum",
 "All day" => "Celý deň",
+"New Calendar" => "Nový kalendár",
 "Missing fields" => "Nevyplnené položky",
 "Title" => "Nadpis",
 "From Date" => "Od Dátumu",
@@ -41,8 +74,26 @@
 "Today" => "Dnes",
 "Calendars" => "Kalendáre",
 "There was a fail, while parsing the file." => "Nastala chyba po�as parsovania súboru.",
+"Sun." => "Ned.",
+"Mon." => "Pon.",
+"Tue." => "Ut.",
+"Wed." => "Str.",
+"Thu." => "Å tv.",
+"Fri." => "Pia.",
+"Sat." => "So.",
+"Jan." => "Jan.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Apr.",
+"May." => "Máj",
+"Jun." => "Jún",
+"Jul." => "Júl",
+"Aug." => "Aug.",
+"Sep." => "Sep.",
+"Oct." => "Okt.",
+"Nov." => "Nov.",
+"Dec." => "Dec.",
 "Choose active calendars" => "Zvoľte aktívne kalendáre",
-"New Calendar" => "Nový kalendár",
 "CalDav Link" => "CalDav odkaz",
 "Download" => "Stiahnuť",
 "Edit" => "Upraviť",
@@ -65,12 +116,25 @@
 "To" => "Do",
 "Advanced options" => "Pokro�ilé možnosti",
 "Repeat" => "Opakovať",
+"Advanced" => "Pokro�ilé",
+"Select days" => "Vybrať dni",
+"Select months" => "Vybrať mesiace",
+"Select weeks" => "Vybrať týždne",
+"Interval" => "Interval",
+"End" => "Koniec",
+"occurrences" => "výskyty",
 "Location" => "Poloha",
 "Location of the Event" => "Poloha Udalosti",
 "Description" => "Popis",
 "Description of the Event" => "Popis Udalosti",
+"Import a calendar file" => "Importovať súbor kalendára",
 "Please choose the calendar" => "Prosím zvoľte kalendár",
+"create a new calendar" => "vytvoriť nový kalendár",
+"Name of new calendar" => "Meno nového kalendára",
 "Import" => "Importovať",
+"Importing calendar" => "Importujem kalendár",
+"Calendar imported successfully" => "Kalendár úspešne importovaný",
+"Close Dialog" => "Zatvoriť Dialóg",
 "Create a new event" => "Vytvoriť udalosť",
 "Timezone" => "Časová zóna",
 "Timeformat" => "Formát �asu",
diff --git a/apps/calendar/l10n/th_TH.php b/apps/calendar/l10n/th_TH.php
new file mode 100644
index 00000000000..6206e32c105
--- /dev/null
+++ b/apps/calendar/l10n/th_TH.php
@@ -0,0 +1,140 @@
+<?php $TRANSLATIONS = array(
+"New Timezone:" => "สร้างโซนเวลาใหม่:",
+"Timezone changed" => "โซนเวลาถู�เปลี่ยน�ล้ว",
+"Invalid request" => "คำร้องขอไม่ถู�ต้อง",
+"Calendar" => "ป�ิทิน",
+"Wrong calendar" => "ป�ิทินไม่ถู�ต้อง",
+"Birthday" => "วันเ�ิด",
+"Business" => "ธุร�ิจ",
+"Call" => "โทรติดต่อ",
+"Clients" => "ลู�ค้า",
+"Deliverer" => "จัดส่ง",
+"Holidays" => "วันหยุด",
+"Ideas" => "ไอเดีย",
+"Journey" => "�ารเดินทาง",
+"Jubilee" => "งานเลี้ยง",
+"Meeting" => "นัดประชุม",
+"Other" => "อื่นๆ",
+"Personal" => "ส่วนตัว",
+"Projects" => "โครง�าร",
+"Questions" => "คำถาม",
+"Work" => "งาน",
+"Does not repeat" => "ไม่ต้องทำซ้ำ",
+"Daily" => "รายวัน",
+"Weekly" => "รายสัปดาห์",
+"Every Weekday" => "ทุ�วันหยุด",
+"Bi-Weekly" => "รายปั�ษ์",
+"Monthly" => "รายเดือน",
+"Yearly" => "รายปี",
+"by date" => "ตามวันที่",
+"Monday" => "วันจันทร์",
+"Tuesday" => "วันอังคาร",
+"Wednesday" => "วันพุธ",
+"Thursday" => "วันพฤหัสบดี",
+"Friday" => "วันศุ�ร์",
+"Saturday" => "วันเสาร์",
+"Sunday" => "วันอาทิตย์",
+"events week of month" => "สัปดาห์ที่มี�ิจ�รรมของเดือน",
+"first" => "ลำดับ�ร�",
+"second" => "ลำดับที่สอง",
+"third" => "ลำดับที่สาม",
+"fourth" => "ลำดับที่สี่",
+"fifth" => "ลำดับที่ห้า",
+"last" => "ลำดับสุดท้าย",
+"January" => "ม�ราคม",
+"February" => "�ุมภาพันธ์",
+"March" => "มีนาคม",
+"April" => "เมษายน",
+"May" => "พฤษภาคม",
+"June" => "มิถุนายน",
+"July" => "�ร��าคม",
+"August" => "สิงหาคม",
+"September" => "�ันยายน",
+"October" => "ตุลาคม",
+"November" => "พฤศจิ�ายน",
+"December" => "ธันวาคม",
+"by events date" => "ตามวันที่จัด�ิจ�รรม",
+"by yearday(s)" => "ของเมื่อวานนี้",
+"by day and month" => "ตามวัน�ละเดือน",
+"Date" => "วันที่",
+"All day" => "ทั้งวัน",
+"New Calendar" => "สร้างป�ิทินใหม่",
+"Missing fields" => "ช่องฟิลด์เ�ิด�ารสู�หาย",
+"Title" => "ชื่อ�ิจ�รรม",
+"From Date" => "จา�วันที่",
+"From Time" => "ตั้ง�ต่เวลา",
+"To Date" => "ถึงวันที่",
+"To Time" => "ถึงเวลา",
+"The event ends before it starts" => "วันที่สิ้นสุด�ิจ�รรมดัง�ล่าวอยู่�่อนวันเริ่มต้น",
+"There was a database fail" => "เ�ิดความล้มเหลว�ับ�านข้อมูล",
+"Week" => "สัปดาห์",
+"Month" => "เดือน",
+"List" => "ราย�าร",
+"Today" => "วันนี้",
+"Calendars" => "ป�ิทิน",
+"There was a fail, while parsing the file." => "เ�ิดความล้มเหลวใน�าร�ย�ไฟล์",
+"Sun." => "อา.",
+"Mon." => "จ.",
+"Tue." => "อ.",
+"Wed." => "พ.",
+"Thu." => "พฤ.",
+"Fri." => "ศ.",
+"Sat." => "ส.",
+"Jan." => "ม.ค.",
+"Feb." => "�.พ.",
+"Mar." => "มี.ค.",
+"Apr." => "เม.ย.",
+"May." => "พ.ค.",
+"Jun." => "มิ.ย.",
+"Jul." => "�.ค.",
+"Aug." => "ส.ค.",
+"Sep." => "�.ย.",
+"Oct." => "ต.ค.",
+"Nov." => "พ.ย.",
+"Dec." => "ธ.ค.",
+"Choose active calendars" => "เลือ�ป�ิทินที่ต้อง�ารใช้งาน",
+"Download" => "ดาวน์โหลด",
+"Edit" => "��้ไข",
+"Delete" => "ลบ",
+"New calendar" => "สร้างป�ิทินใหม่",
+"Edit calendar" => "��้ไขป�ิทิน",
+"Displayname" => "ชื่อที่ต้อง�ารให้�สดง",
+"Active" => "ใช้งาน",
+"Calendar color" => "สีของป�ิทิน",
+"Save" => "บันทึ�",
+"Submit" => "ส่งข้อมูล",
+"Cancel" => "ย�เลิ�",
+"Edit an event" => "��้ไข�ิจ�รรม",
+"Export" => "ส่งออ�ข้อมูล",
+"Title of the Event" => "ชื่อของ�ิจ�รรม",
+"Category" => "หมวดหมู่",
+"Select category" => "เลือ�หมวดหมู่",
+"All Day Event" => "เป็น�ิจ�รรมตลอดทั้งวัน",
+"From" => "จา�",
+"To" => "ถึง",
+"Advanced options" => "ตัวเลือ�ขั้นสูง",
+"Repeat" => "ทำซ้ำ",
+"Advanced" => "ขั้นสูง",
+"Select days" => "เลือ�วัน",
+"Select months" => "เลือ�เดือน",
+"Select weeks" => "เลือ�สัปดาห์",
+"End" => "สิ้นสุด",
+"Location" => "สถานที่",
+"Location of the Event" => "สถานที่จัด�ิจ�รรม",
+"Description" => "คำอธิบาย",
+"Description of the Event" => "คำอธิบายเ�ี่ยว�ับ�ิจ�รรม",
+"Import a calendar file" => "นำเข้าไฟล์ป�ิทิน",
+"Please choose the calendar" => "�รณาเลือ�ป�ิทิน",
+"create a new calendar" => "สร้างป�ิทินใหม่",
+"Name of new calendar" => "ชื่อของป�ิทิน",
+"Import" => "นำเข้าข้อมูล",
+"Importing calendar" => "นำเข้าข้อมูลป�ิทิน",
+"Calendar imported successfully" => "ป�ิทินถู�นำเข้าข้อมูลเรียบร้อย�ล้ว",
+"Close Dialog" => "ปิด�ล่องข้อความโต้ตอบ",
+"Create a new event" => "สร้าง�ิจ�รรมใหม่",
+"Timezone" => "โซนเวลา",
+"Check always for changes of the timezone" => "ตรวจสอบ�ารเปลี่ยน�ปลงโซนเวลาอยู่เสมอ",
+"Timeformat" => "รูป�บบ�าร�สดงเวลา",
+"24h" => "24 ช.ม.",
+"12h" => "12 ช.ม."
+);
diff --git a/apps/contacts/l10n/ar.php b/apps/contacts/l10n/ar.php
index 935ac27dd0d..29453de9dc7 100644
--- a/apps/contacts/l10n/ar.php
+++ b/apps/contacts/l10n/ar.php
@@ -15,8 +15,6 @@
 "Video" => "ال�يديو",
 "Pager" => "الرنان",
 "This is not your contact." => ".هذا ليس من معار�ي",
-"This card is not RFC compatible." => "هذا الكرت ليس متلائم مع نظام ال RFC.",
-"This card does not contain a photo." => "لا يحتوي هذا الكرت على صورة.",
 "Add Contact" => "أض� شخص ",
 "Name" => "الاسم",
 "PO Box" => "العنوان البريدي",
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index f421651671d..72338cf40d4 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -27,9 +27,7 @@
 "Pager" => "Paginador",
 "Contact" => "Contacte",
 "This is not your contact." => "Aquest contacte no és vostre.",
-"This card is not RFC compatible." => "Aquesta targeta no és compatible amb RFC.",
-"This card does not contain a photo." => "Aquesta targeta no conté foto.",
-"Add Contact" => "Afegiu un contacte",
+"Add Contact" => "Afegir un contacte",
 "Addressbooks" => "Llibretes d'adreces",
 "Addressbook" => "Llibreta d'adreces",
 "Name" => "Nom",
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
index 0ccf9de8d0e..0831a91abcb 100644
--- a/apps/contacts/l10n/cs_CZ.php
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Chyba při (de)aktivaci adresáře.",
+"There was an error adding the contact." => "Během přidávání kontaktu nastala chyba.",
+"Cannot add empty property." => "Nelze přidat prazdný údaj.",
+"At least one of the address fields has to be filled out." => "Musí být uveden nejméně jeden z adresních údajů",
+"Error adding contact property." => "Chyba během přdávání údaje kontaktu.",
+"Error adding addressbook." => "Chyba při přidávání adresáře.",
+"Error activating addressbook." => "Chyba při aktivaci adresáře.",
+"Error deleting contact property." => "Chyba při odstraňování údaje kontaktu.",
+"Error updating contact property." => "Chyba při aktualizaci údaje kontaktu.",
+"Error updating addressbook." => "Chyba při aktualizaci adresáře.",
+"Contacts" => "Kontakty",
 "This is not your addressbook." => "Toto není Váš adresář.",
 "Contact could not be found." => "Kontakt nebyl nalezen.",
 "Information about vCard is incorrect. Please reload the page." => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
@@ -14,10 +25,11 @@
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Pager",
+"Contact" => "Kontakt",
 "This is not your contact." => "Toto není Váš kontakt.",
-"This card is not RFC compatible." => "Tato karta není kompatibilní s RFC.",
-"This card does not contain a photo." => "Tato karta neobsahuje foto",
 "Add Contact" => "Přidat kontakt",
+"Addressbooks" => "Adresáře",
+"Addressbook" => "Adresář",
 "Name" => "Jméno",
 "Type" => "Typ",
 "PO Box" => "PO box",
@@ -34,8 +46,11 @@
 "Download" => "Stažení",
 "Edit" => "Editovat",
 "Delete" => "Odstranit",
+"Download contact" => "Stáhnout kontakt",
 "Delete contact" => "Odstranit kontakt",
 "Add" => "Přidat",
+"New Addressbook" => "Nový adresář",
+"Edit Addressbook" => "Editace adresáře",
 "Displayname" => "Zobrazené jméno",
 "Active" => "Aktivní",
 "Save" => "Uložit",
@@ -44,5 +59,6 @@
 "Birthday" => "Narozeniny",
 "Preferred" => "Preferovaný",
 "Phone" => "Telefon",
-"Update" => "Aktualizovat"
+"Update" => "Aktualizovat",
+"CardDAV syncing address:" => "CardDAV synchronizuje adresu:"
 );
diff --git a/apps/contacts/l10n/da.php b/apps/contacts/l10n/da.php
index 2c597d1993b..c5b4d19cfa5 100644
--- a/apps/contacts/l10n/da.php
+++ b/apps/contacts/l10n/da.php
@@ -15,8 +15,6 @@
 "Video" => "Video",
 "Pager" => "Personsøger",
 "This is not your contact." => "Dette er ikke din kontaktperson.",
-"This card is not RFC compatible." => "Dette kort er ikke RFC-kompatibelt.",
-"This card does not contain a photo." => "Dette kort indeholder ikke et foto.",
 "Add Contact" => "Tilføj kontaktperson",
 "Name" => "Navn",
 "Type" => "Type",
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index 53f8a9e6648..278009092c1 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "(De-)Aktivierung des Adressbuches fehlgeschlagen",
+"There was an error adding the contact." => "Erstellen des Kontakts fehlgeschlagen",
+"Cannot add empty property." => "Feld darf nicht leer sein.",
+"At least one of the address fields has to be filled out." => "Mindestens eines der Adressfelder muss ausgefüllt werden.",
+"Error adding contact property." => "Kontakt ändern fehlgeschlagen",
+"Error adding addressbook." => "Adressbuch hinzufügen fehlgeschlagen",
+"Error activating addressbook." => "Adressbuchaktivierung fehlgeschlagen",
+"Error deleting contact property." => "Kontakteigenschaft löschen fehlgeschlagen",
+"Error updating contact property." => "Kontakteigenschaft aktualisieren fehlgeschlagen",
+"Error updating addressbook." => "Adressbuch aktualisieren fehlgeschlagen",
+"Contacts" => "Kontakte",
 "This is not your addressbook." => "Dies ist nicht dein Adressbuch.",
 "Contact could not be found." => "Kontakt konnte nicht gefunden werden.",
 "Information about vCard is incorrect. Please reload the page." => "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite.",
@@ -14,10 +25,11 @@
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Pager",
+"Contact" => "Kontakt",
 "This is not your contact." => "Dies ist nicht dein Kontakt.",
-"This card is not RFC compatible." => "Diese Karte ist nicht RFC-kompatibel.",
-"This card does not contain a photo." => "Diese Karte enthält kein Foto.",
 "Add Contact" => "Kontakt hinzufügen",
+"Addressbooks" => "Adressbücher",
+"Addressbook" => "Adressbuch",
 "Name" => "Name",
 "Type" => "Typ",
 "PO Box" => "Postfach",
@@ -34,8 +46,11 @@
 "Download" => "Herunterladen",
 "Edit" => "Bearbeiten",
 "Delete" => "Löschen",
+"Download contact" => "Kontakt herunterladen",
 "Delete contact" => "Kontakt löschen",
 "Add" => "Hinzufügen",
+"New Addressbook" => "Neues Adressbuch",
+"Edit Addressbook" => "Adressbuch editieren",
 "Displayname" => "Anzeigename",
 "Active" => "Aktiv",
 "Save" => "Speichern",
@@ -44,5 +59,6 @@
 "Birthday" => "Geburtstag",
 "Preferred" => "Bevorzugt",
 "Phone" => "Telefon",
-"Update" => "Aktualisieren"
+"Update" => "Aktualisieren",
+"CardDAV syncing address:" => "CardDAV Sync-Adresse:"
 );
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
index 8f2b1e30464..d58b199b674 100644
--- a/apps/contacts/l10n/el.php
+++ b/apps/contacts/l10n/el.php
@@ -15,8 +15,6 @@
 "Video" => "Βίντεο",
 "Pager" => "Βομβητής",
 "This is not your contact." => "Αυτή δεν είναι επαφή σας.",
-"This card is not RFC compatible." => "Αυτή η κά�τα δεν είναι RFC συμβατή.",
-"This card does not contain a photo." => "Αυτή η κά�τα δεν πε�ιέχει φωτογ�αφία.",
 "Add Contact" => "Π�οσθήκη επαφής",
 "Name" => "Όνομα",
 "Type" => "Τ�πος",
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
index ef55bbebbb9..121186499b3 100644
--- a/apps/contacts/l10n/eo.php
+++ b/apps/contacts/l10n/eo.php
@@ -15,8 +15,6 @@
 "Video" => "Videaĵo",
 "Pager" => "Televokilo",
 "This is not your contact." => "Tiu ĉi ne estas via kontakto.",
-"This card is not RFC compatible." => "Ĉi tiu karto ne kongruas kun RFC.",
-"This card does not contain a photo." => "Ĉi tiu karto ne havas foton.",
 "Add Contact" => "Aldoni kontakton",
 "Name" => "Nomo",
 "PO Box" => "Abonkesto",
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
index 260fe2ac976..b94c53e90d0 100644
--- a/apps/contacts/l10n/es.php
+++ b/apps/contacts/l10n/es.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Error al (des)activar libreta de direcciones.",
+"There was an error adding the contact." => "Ocurrió un error al agregar el contacto.",
+"Cannot add empty property." => "No se puede agregar una propiedad vacía.",
+"At least one of the address fields has to be filled out." => "Al menos uno de los campos de direcciones tiene que ser llenado.",
+"Error adding contact property." => "Error al agregar una propiedad del contacto.",
+"Error adding addressbook." => "Error al agregar la libreta de direcciones.",
+"Error activating addressbook." => "Error al activar la libreta de direcciones.",
+"Error deleting contact property." => "Error al borrar una propiedad del contacto.",
+"Error updating contact property." => "Error al actualizar una propiedad del contacto.",
+"Error updating addressbook." => "Error al actualizar la libreta de direcciones.",
+"Contacts" => "Contactos",
 "This is not your addressbook." => "Esta no es tu agenda de contactos.",
 "Contact could not be found." => "No se pudo encontrar el contacto.",
 "Information about vCard is incorrect. Please reload the page." => "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la página.",
@@ -14,10 +25,11 @@
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Localizador",
+"Contact" => "Contacto",
 "This is not your contact." => "Este no es tu contacto.",
-"This card is not RFC compatible." => "Esta tarjeta no es compatible con RFC.",
-"This card does not contain a photo." => "Esta tarjeta no contiene ninguna foto.",
 "Add Contact" => "Agregar contacto",
+"Addressbooks" => "Libretas de direcciones",
+"Addressbook" => "Libreta de direcciones",
 "Name" => "Nombre",
 "Type" => "Tipo",
 "PO Box" => "Código postal",
@@ -28,13 +40,18 @@
 "Zipcode" => "Código Postal",
 "Country" => "País",
 "Create Contact" => "Crear contacto",
+"Choose active Address Books" => "Elige libreta de direcciones activa",
 "New Address Book" => "Nueva libreta de direcciones",
 "CardDav Link" => "Link Card Dav",
 "Download" => "Descargar",
 "Edit" => "Editar",
 "Delete" => "Borrar",
+"Download contact" => "Descargar contacto",
 "Delete contact" => "Eliminar contacto",
 "Add" => "Añadir",
+"New Addressbook" => "Nueva libreta de direcciones",
+"Edit Addressbook" => "Editar libreta de direcciones",
+"Displayname" => "Nombre a mostrar",
 "Active" => "Activo",
 "Save" => "Guardar",
 "Submit" => "Aceptar",
@@ -42,5 +59,6 @@
 "Birthday" => "Cumpleaños",
 "Preferred" => "Preferido",
 "Phone" => "Teléfono",
-"Update" => "Actualizar"
+"Update" => "Actualizar",
+"CardDAV syncing address:" => "Dirección de sincronización CardDAV:"
 );
diff --git a/apps/contacts/l10n/et_EE.php b/apps/contacts/l10n/et_EE.php
index f57190bddcc..5054cbfc447 100644
--- a/apps/contacts/l10n/et_EE.php
+++ b/apps/contacts/l10n/et_EE.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Viga aadressiraamatu (de)aktiveerimisel.",
+"There was an error adding the contact." => "Konktakti lisamisel tekkis viga.",
+"Cannot add empty property." => "Tühja omadust ei saa lisada.",
+"At least one of the address fields has to be filled out." => "Vähemalt üks aadressiväljadest peab olema täidetud.",
+"Error adding contact property." => "Viga konktakti korralikul lisamisel.",
+"Error adding addressbook." => "Viga aadressiraamatu lisamisel.",
+"Error activating addressbook." => "Viga aadressiraamatu aktiveerimisel.",
+"Error deleting contact property." => "Viga konktaki korralikul kustutamisel.",
+"Error updating contact property." => "Viga konktaki korralikul uuendamisel.",
+"Error updating addressbook." => "Viga aadressiraamatu uuendamisel.",
+"Contacts" => "Kontaktid",
 "This is not your addressbook." => "See pole sinu aadressiraamat.",
 "Contact could not be found." => "Kontakti ei leitud.",
 "Information about vCard is incorrect. Please reload the page." => "Visiitkaardi info pole korrektne. Palun lae leht uuesti.",
@@ -14,11 +25,13 @@
 "Fax" => "Faks",
 "Video" => "Video",
 "Pager" => "Piipar",
+"Contact" => "Kontakt",
 "This is not your contact." => "See pole sinu kontakt.",
-"This card is not RFC compatible." => "See kaart ei ühildu RFC-ga.",
-"This card does not contain a photo." => "Sellel kaardil pole fotot.",
 "Add Contact" => "Lisa kontakt",
+"Addressbooks" => "Aadressiraamatud",
+"Addressbook" => "Aadressiraamat",
 "Name" => "Nimi",
+"Type" => "Tüüp",
 "PO Box" => "Postkontori postkast",
 "Extended" => "Laiendatud",
 "Street" => "Tänav",
@@ -27,8 +40,25 @@
 "Zipcode" => "Postiindeks",
 "Country" => "Riik",
 "Create Contact" => "Lisa kontakt",
+"Choose active Address Books" => "Vali aktiivsed aadressiraamatud",
+"New Address Book" => "Uus aadressiraamat",
+"CardDav Link" => "CardDav link",
+"Download" => "Lae alla",
 "Edit" => "Muuda",
 "Delete" => "Kustuta",
+"Download contact" => "Lae kontakt alla",
+"Delete contact" => "Kustuta kontakt",
+"Add" => "Lisa",
+"New Addressbook" => "Uus aadressiraamat",
+"Edit Addressbook" => "Muuda aadressiraamatut",
+"Displayname" => "Näidatav nimi",
+"Active" => "Aktiivne",
+"Save" => "Salvesta",
+"Submit" => "Saada",
+"Cancel" => "Loobu",
 "Birthday" => "Sünnipäev",
-"Phone" => "Telefon"
+"Preferred" => "Eelistatud",
+"Phone" => "Telefon",
+"Update" => "Uuenda",
+"CardDAV syncing address:" => "CardDAV sünkroniseerimise aadress:"
 );
diff --git a/apps/contacts/l10n/eu.php b/apps/contacts/l10n/eu.php
index c37b6f2762f..9b3501270ba 100644
--- a/apps/contacts/l10n/eu.php
+++ b/apps/contacts/l10n/eu.php
@@ -15,8 +15,6 @@
 "Video" => "Bideoa",
 "Pager" => "Bilagailua",
 "This is not your contact." => "Hau ez da zure kontaktua.",
-"This card is not RFC compatible." => "Txartel hau ez da RFC bateragarria.",
-"This card does not contain a photo." => "Txartel honek ez dauka argazkirik.",
 "Add Contact" => "Gehitu Kontaktua",
 "Name" => "Izena",
 "PO Box" => "Posta kutxa",
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 8970d716b0e..d14d56d951f 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -27,8 +27,6 @@
 "Pager" => "Bipeur",
 "Contact" => "Contact",
 "This is not your contact." => "Ce n'est pas votre contact.",
-"This card is not RFC compatible." => "Cette fiche n'est pas compatible RFC.",
-"This card does not contain a photo." => "Cette fiche ne contient pas de photo.",
 "Add Contact" => "Ajouter un Contact",
 "Addressbooks" => "Carnets d'adresses",
 "Addressbook" => "Carnet d'adresses",
diff --git a/apps/contacts/l10n/gl.php b/apps/contacts/l10n/gl.php
index 0fd88ead191..8333697fb60 100644
--- a/apps/contacts/l10n/gl.php
+++ b/apps/contacts/l10n/gl.php
@@ -27,8 +27,6 @@
 "Pager" => "Paxinador",
 "Contact" => "Contacto",
 "This is not your contact." => "Este non é un dos seus contactos",
-"This card is not RFC compatible." => "Esta tarxeta non é compatible con RFC",
-"This card does not contain a photo." => "Esta tarxeta non ten fotografía",
 "Add Contact" => "Engadir contacto",
 "Addressbooks" => "Directorios",
 "Addressbook" => "Directorio",
diff --git a/apps/contacts/l10n/he.php b/apps/contacts/l10n/he.php
index b16eeac2ba8..5818cab2074 100644
--- a/apps/contacts/l10n/he.php
+++ b/apps/contacts/l10n/he.php
@@ -15,8 +15,6 @@
 "Video" => "ויד�ו",
 "Pager" => "זימונית",
 "This is not your contact." => "זהו �ינו �יש קשר שלך",
-"This card is not RFC compatible." => "כרטיס זה �ינו תו�� ל־RFC",
-"This card does not contain a photo." => "כרטיס זה �ינו כולל תמונה",
 "Add Contact" => "הוספת �יש קשר",
 "Name" => "ש�",
 "PO Box" => "ת� דו�ר",
diff --git a/apps/contacts/l10n/hr.php b/apps/contacts/l10n/hr.php
index dfeab8bdea9..4937c0bcb2c 100644
--- a/apps/contacts/l10n/hr.php
+++ b/apps/contacts/l10n/hr.php
@@ -15,8 +15,6 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "This is not your contact." => "Ovo nije vaš kontakt.",
-"This card is not RFC compatible." => "Ova kartica nije sukladna prema RFC direktivama.",
-"This card does not contain a photo." => "Ova kartica ne sadrži fotografiju.",
 "Add Contact" => "Dodaj kontakt",
 "Name" => "Naziv",
 "PO Box" => "Poštanski Pretinac",
diff --git a/apps/contacts/l10n/hu_HU.php b/apps/contacts/l10n/hu_HU.php
index 74d66e9f7d3..fa81831f965 100644
--- a/apps/contacts/l10n/hu_HU.php
+++ b/apps/contacts/l10n/hu_HU.php
@@ -15,8 +15,6 @@
 "Video" => "Video",
 "Pager" => "Lapozó",
 "This is not your contact." => "Nem a te kapcsolatod.",
-"This card is not RFC compatible." => "A kártya nem RFC kompatibilis.",
-"This card does not contain a photo." => "A kártya nem tartlmaz fényképet.",
 "Add Contact" => "Kontakt hozzáadása",
 "Name" => "Név",
 "PO Box" => "Postafiók",
diff --git a/apps/contacts/l10n/ia.php b/apps/contacts/l10n/ia.php
index d4203ce8f04..0c1dd6e9632 100644
--- a/apps/contacts/l10n/ia.php
+++ b/apps/contacts/l10n/ia.php
@@ -13,7 +13,6 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "This is not your contact." => "Iste non es tu contacto",
-"This card is not RFC compatible." => "Iste carta non es compatibile con RFC",
 "Add Contact" => "Adder contacto",
 "Name" => "Nomine",
 "PO Box" => "Cassa postal",
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index 6ac1677e3c0..b7f30bc034a 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -27,8 +27,6 @@
 "Pager" => "Cercapersone",
 "Contact" => "Contatto",
 "This is not your contact." => "Questo non è un tuo contatto.",
-"This card is not RFC compatible." => "Questa card non è compatibile con il protocollo RFC.",
-"This card does not contain a photo." => "Questa card non contiene una foto.",
 "Add Contact" => "Aggiungi contatto",
 "Addressbooks" => "Rubriche",
 "Addressbook" => "Rubrica",
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index c8711e963f3..b0ad16d0ae2 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -15,8 +15,6 @@
 "Video" => "テレビ電話",
 "Pager" => "�ケベル",
 "This is not your contact." => "����連絡先���り��ん。",
-"This card is not RFC compatible." => "��カード�RFC�準拠�����ん。",
-"This card does not contain a photo." => "��カード�写真を�ん��り��ん。",
 "Add Contact" => "連絡先�追加",
 "Name" => "��",
 "PO Box" => "�書箱",
diff --git a/apps/contacts/l10n/lb.php b/apps/contacts/l10n/lb.php
index 4190072171a..e8f17a6fa58 100644
--- a/apps/contacts/l10n/lb.php
+++ b/apps/contacts/l10n/lb.php
@@ -15,8 +15,6 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "This is not your contact." => "Dat do ass net däin Kontakt.",
-"This card is not RFC compatible." => "Déi do Kaart ass net RFC kompatibel.",
-"This card does not contain a photo." => "Déi do Kaart huet keng Foto.",
 "Add Contact" => "Kontakt bäisetzen",
 "Name" => "Numm",
 "PO Box" => "Postleetzuel",
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
index 0bfa86c8c44..5719330ba3b 100644
--- a/apps/contacts/l10n/nl.php
+++ b/apps/contacts/l10n/nl.php
@@ -15,8 +15,6 @@
 "Video" => "Video",
 "Pager" => "Pieper",
 "This is not your contact." => "Dit is niet uw contactpersoon.",
-"This card is not RFC compatible." => "Deze kaart is niet RFC compatibel.",
-"This card does not contain a photo." => "Deze contact bevat geen foto.",
 "Add Contact" => "Contact toevoegen",
 "Name" => "Naam",
 "Type" => "Type",
diff --git a/apps/contacts/l10n/nn_NO.php b/apps/contacts/l10n/nn_NO.php
index 12d914a805c..d0e3041d245 100644
--- a/apps/contacts/l10n/nn_NO.php
+++ b/apps/contacts/l10n/nn_NO.php
@@ -15,8 +15,6 @@
 "Video" => "Video",
 "Pager" => "Personsøkjar",
 "This is not your contact." => "Dette er ikkje din kontakt.",
-"This card is not RFC compatible." => "Dette kortet er ikkje RFC-kompatibelt",
-"This card does not contain a photo." => "Dette kortet har ingen bilete.",
 "Add Contact" => "Legg til kontakt",
 "Name" => "Namn",
 "PO Box" => "Postboks",
diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
index 72bdf967a4e..ad1e8c7baa4 100644
--- a/apps/contacts/l10n/pl.php
+++ b/apps/contacts/l10n/pl.php
@@ -27,8 +27,6 @@
 "Pager" => "Pager",
 "Contact" => "Kontakt",
 "This is not your contact." => "To nie jest twój kontakt.",
-"This card is not RFC compatible." => "Ta karta nie jest zgodna ze specyfikacjÄ… RFC.",
-"This card does not contain a photo." => "Ta karta nie zawiera zdjęć.",
 "Add Contact" => "Dodaj kontakt",
 "Addressbooks" => "Książki adresowe",
 "Addressbook" => "Książka adresowa",
diff --git a/apps/contacts/l10n/pt_BR.php b/apps/contacts/l10n/pt_BR.php
index db9e98d6fe0..9f68e50cf9d 100644
--- a/apps/contacts/l10n/pt_BR.php
+++ b/apps/contacts/l10n/pt_BR.php
@@ -15,8 +15,6 @@
 "Video" => "Vídeo",
 "Pager" => "Pager",
 "This is not your contact." => "Este não é o seu contato.",
-"This card is not RFC compatible." => "Este cartão não é compatível com RFC.",
-"This card does not contain a photo." => "Este cartão não contém uma foto.",
 "Add Contact" => "Adicionar Contato",
 "Name" => "Nome",
 "PO Box" => "Caixa Postal",
diff --git a/apps/contacts/l10n/pt_PT.php b/apps/contacts/l10n/pt_PT.php
index d5916838dbe..68c83f02c51 100644
--- a/apps/contacts/l10n/pt_PT.php
+++ b/apps/contacts/l10n/pt_PT.php
@@ -15,8 +15,6 @@
 "Video" => "Vídeo",
 "Pager" => "Pager",
 "This is not your contact." => "Este não é o seu contacto",
-"This card is not RFC compatible." => "Este cartão não é compativel com RFC",
-"This card does not contain a photo." => "Este cartão não possui foto",
 "Add Contact" => "Adicionar Contacto",
 "Name" => "Nome",
 "PO Box" => "Apartado",
diff --git a/apps/contacts/l10n/ro.php b/apps/contacts/l10n/ro.php
index 4fc10abddb0..47a8b59599c 100644
--- a/apps/contacts/l10n/ro.php
+++ b/apps/contacts/l10n/ro.php
@@ -15,8 +15,6 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "This is not your contact." => "Nu este contactul tău",
-"This card is not RFC compatible." => "Nu este compatibil RFC",
-"This card does not contain a photo." => "Nu conține o fotografie",
 "Add Contact" => "Adaugă contact",
 "Name" => "Nume",
 "Type" => "Tip",
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
index 5eb765f222e..dd6cefe1df9 100644
--- a/apps/contacts/l10n/ru.php
+++ b/apps/contacts/l10n/ru.php
@@ -15,8 +15,6 @@
 "Video" => "Видео",
 "Pager" => "Пейджер",
 "This is not your contact." => "Это не контакт.",
-"This card is not RFC compatible." => "Эта карточка не �оответ�твует RFC.",
-"This card does not contain a photo." => "Эта карточка не �одержит фотографии.",
 "Add Contact" => "Добавить Контакт",
 "Name" => "Им�",
 "PO Box" => "�О",
diff --git a/apps/contacts/l10n/sk_SK.php b/apps/contacts/l10n/sk_SK.php
index 16876cc59b2..a28907aac8a 100644
--- a/apps/contacts/l10n/sk_SK.php
+++ b/apps/contacts/l10n/sk_SK.php
@@ -1,4 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Chyba (de)aktivácie adresára.",
+"There was an error adding the contact." => "Vyskytla sa chyba pri pridávaní kontaktu.",
+"Error activating addressbook." => "Chyba aktivovania adresára.",
+"Error updating addressbook." => "Chyba aktualizácie adresára.",
+"Contacts" => "Kontakty",
 "This is not your addressbook." => "Toto nie je váš adresár.",
 "Contact could not be found." => "Kontakt nebol nájdený.",
 "Information about vCard is incorrect. Please reload the page." => "Informácie o vCard sú neplatné. Prosím obnovte stránku.",
@@ -14,11 +19,13 @@
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Pager",
+"Contact" => "Kontakt",
 "This is not your contact." => "Toto nie je váš kontakt.",
-"This card is not RFC compatible." => "Táto karta nie je kompatibilná s RFC.",
-"This card does not contain a photo." => "Táto karta neobsahuje fotografiu.",
 "Add Contact" => "Pridať Kontakt.",
+"Addressbooks" => "Adresáre",
+"Addressbook" => "Adresár",
 "Name" => "Meno",
+"Type" => "Typ",
 "PO Box" => "PO Box",
 "Extended" => "Rozšírené",
 "Street" => "Ulica",
@@ -27,8 +34,25 @@
 "Zipcode" => "PSČ",
 "Country" => "Krajina",
 "Create Contact" => "Vytvoriť Kontakt.",
+"Choose active Address Books" => "Zvoliť aktívny adresár",
+"New Address Book" => "Nový adresár",
+"CardDav Link" => "CardDav odkaz",
+"Download" => "Stiahnuť",
 "Edit" => "Upraviť",
 "Delete" => "Odstrániť",
+"Download contact" => "Stiahnuť kontakt",
+"Delete contact" => "Odstrániť kontakt",
+"Add" => "Pridať",
+"New Addressbook" => "Nový Adresár",
+"Edit Addressbook" => "Upraviť Adresár",
+"Displayname" => "Zobrazené meno",
+"Active" => "Aktívny",
+"Save" => "Uložiť",
+"Submit" => "Odoslať",
+"Cancel" => "Zrušiť",
 "Birthday" => "Narodeniny",
-"Phone" => "Telefón"
+"Preferred" => "Uprednostňované",
+"Phone" => "Telefón",
+"Update" => "Aktualizovať",
+"CardDAV syncing address:" => "Synchroniza�ná adresa CardDAV:"
 );
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index 2c81567eae0..79039c36d63 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -15,8 +15,6 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "This is not your contact." => "To ni vaš kontakt",
-"This card is not RFC compatible." => "Ta karta ni RFC kopatibilna.",
-"This card does not contain a photo." => "Ta karta ne vsebuje slike.",
 "Add Contact" => "Dodaj Kontakt",
 "Name" => "Ime",
 "PO Box" => "PO Box",
diff --git a/apps/contacts/l10n/sr.php b/apps/contacts/l10n/sr.php
index d09bac430f2..6404fb44b18 100644
--- a/apps/contacts/l10n/sr.php
+++ b/apps/contacts/l10n/sr.php
@@ -17,8 +17,6 @@
 "Pager" => "Пејџер",
 "Contact" => "Контакт",
 "This is not your contact." => "Ово није ваш контакт.",
-"This card is not RFC compatible." => "Ова карта није �агла�на �а РФЦ-ом.",
-"This card does not contain a photo." => "Ова карта не �адржи фотографију.",
 "Add Contact" => "Додај контакт",
 "Addressbooks" => "�дре�ар",
 "Addressbook" => "�дре�ар",
diff --git a/apps/contacts/l10n/sr@latin.php b/apps/contacts/l10n/sr@latin.php
index 1ae38e32922..bfd43896455 100644
--- a/apps/contacts/l10n/sr@latin.php
+++ b/apps/contacts/l10n/sr@latin.php
@@ -15,8 +15,6 @@
 "Video" => "Video",
 "Pager" => "Pejdžer",
 "This is not your contact." => "Ovo nije vaš kontakt.",
-"This card is not RFC compatible." => "Ova karta nije saglasna sa RFC-om.",
-"This card does not contain a photo." => "Ova karta ne sadrži fotografiju.",
 "Add Contact" => "Dodaj kontakt",
 "Name" => "Ime",
 "PO Box" => "Poštanski broj",
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index f62ca30b5f2..c4935983f22 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -15,8 +15,6 @@
 "Video" => "Video",
 "Pager" => "Personsökare",
 "This is not your contact." => "Det här är inte din kontakt.",
-"This card is not RFC compatible." => "Detta kort är inte RFC-kompatibelt.",
-"This card does not contain a photo." => "Detta kort innehåller inte något foto.",
 "Add Contact" => "Lägg till kontakt",
 "Name" => "Namn",
 "PO Box" => "Postbox",
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
new file mode 100644
index 00000000000..63a77cc423a
--- /dev/null
+++ b/apps/contacts/l10n/th_TH.php
@@ -0,0 +1,61 @@
+<?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "เ�ิดข้อผิดพลาดใน (ย�เลิ�)�ารเปิดใช้งานสมุดบันทึ�ที่อยู่",
+"There was an error adding the contact." => "เ�ิดข้อผิดพลาดใน�ารเพิ่มรายชื่อผู้ติดต่อใหม่",
+"Cannot add empty property." => "ไม่สามารถเพิ่มรายละเอียดที่ไม่มีข้อมูลได้",
+"At least one of the address fields has to be filled out." => "อย่างน้อยที่สุดช่องข้อมูลที่อยู่จะต้องถู��รอ�ลงไป",
+"Error adding contact property." => "เ�ิดข้อผิดพลาดใน�ารเพิ่มรายละเอียด�ารติดต่อ",
+"Error adding addressbook." => "เ�ิดข้อผิดพลาดใน�ารเพิ่มสมุดบันทึ�ที่อยู่ใหม่",
+"Error activating addressbook." => "เ�ิดข้อผิดพลาดใน�ารเปิดใช้งานสมุดบันทึ�ที่อยู่",
+"Error deleting contact property." => "เ�ิดข้อผิดพลาดใน�ารลบรายละเอียด�ารติดต่อ",
+"Error updating contact property." => "เ�ิดข้อผิดพลาดใน�ารอัพเดทข้อมูล�ารติดต่อ",
+"Error updating addressbook." => "เ�ิดข้อผิดพลาดใน�ารอัพเดทสมุดบันทึ�ที่อยู่",
+"Contacts" => "ข้อมูล�ารติดต่อ",
+"This is not your addressbook." => "นี่ไม่ใช่สมุดบันทึ�ที่อยู่ของคุณ",
+"Contact could not be found." => "ไม่พบข้อมูล�ารติดต่อ",
+"Information about vCard is incorrect. Please reload the page." => "ข้อมูลเ�ี่ยว�ับ vCard ไม่ถู�ต้อง �รุณาโหลดหน้าเวปใหม่อี�ครั้ง",
+"Address" => "ที่อยู่",
+"Telephone" => "โทรศัพท์",
+"Email" => "อีเมล์",
+"Organization" => "หน่วยงาน",
+"Work" => "ที่ทำงาน",
+"Home" => "บ้าน",
+"Mobile" => "มือถือ",
+"Text" => "ข้อความ",
+"Voice" => "เสียงพูด",
+"Fax" => "โทรสาร",
+"Video" => "วีดีโอ",
+"Pager" => "เพจเจอร์",
+"Contact" => "ข้อมูล�ารติดต่อ",
+"This is not your contact." => "นี่ไม่ใช่ข้อมูล�ารติดต่อของคุณ",
+"Add Contact" => "เพิ่มรายชื่อผู้ติดต่อใหม่",
+"Addressbooks" => "สมุดบันทึ�ที่อยู่",
+"Addressbook" => "สมุดบันทึ�ที่อยู่",
+"Name" => "ชื่อ",
+"Type" => "ประเภท",
+"PO Box" => "ตู้ ปณ.",
+"Extended" => "เพิ่ม",
+"Street" => "ถนน",
+"City" => "เมือง",
+"Region" => "ภูมิภาค",
+"Zipcode" => "รหัสไปรษณีย์",
+"Country" => "ประเทศ",
+"Create Contact" => "สร้างข้อมูล�ารติดต่อใหม่",
+"Choose active Address Books" => "เลือ�สมุดบันทึ�ข้อมูลติดต่อที่ต้อง�ารใช้งาน",
+"New Address Book" => "สร้างสมุดบันทึ�ข้อมูล�ารติดต่อใหม่",
+"Download" => "ดาวน์โหลด",
+"Edit" => "��้ไข",
+"Delete" => "ลบ",
+"Download contact" => "ดาวน์โหลดข้อมูล�ารติดต่อ",
+"Delete contact" => "ลบข้อมูล�ารติดต่อ",
+"Add" => "เพิ่ม",
+"New Addressbook" => "สร้างสมุดบันทึ�ที่อยู่ใหม่",
+"Edit Addressbook" => "��้ไขสมุดบันทึ�ที่อยู่",
+"Displayname" => "ชื่อที่ต้อง�ารให้�สดง",
+"Active" => "เปิดใช้",
+"Save" => "บันทึ�",
+"Submit" => "ส่งข้อมูล",
+"Cancel" => "ย�เลิ�",
+"Birthday" => "วันเ�ิด",
+"Phone" => "โทรศัพท์",
+"Update" => "อัพเดท"
+);
diff --git a/apps/contacts/l10n/tr.php b/apps/contacts/l10n/tr.php
index 285adac8d6a..75a48180bdb 100644
--- a/apps/contacts/l10n/tr.php
+++ b/apps/contacts/l10n/tr.php
@@ -15,8 +15,6 @@
 "Video" => "Video",
 "Pager" => "Sayfalayıcı",
 "This is not your contact." => "Bu sizin kiÅŸiniz deÄŸil.",
-"This card is not RFC compatible." => "Bu kart RFC uyumlu deÄŸil.",
-"This card does not contain a photo." => "Bu kart resim içermiyor.",
 "Add Contact" => "KiÅŸi Ekle",
 "Name" => "Ad",
 "PO Box" => "Posta Kutusu",
diff --git a/apps/contacts/l10n/zh_CN.php b/apps/contacts/l10n/zh_CN.php
index 829f1b0e073..5b31e773e2e 100644
--- a/apps/contacts/l10n/zh_CN.php
+++ b/apps/contacts/l10n/zh_CN.php
@@ -15,8 +15,6 @@
 "Video" => "视频",
 "Pager" => "传呼机",
 "This is not your contact." => "这�是您的�系人。",
-"This card is not RFC compatible." => "这张�片和RFC 标准�兼容。",
-"This card does not contain a photo." => "这张�片�包�照片。",
 "Add Contact" => "添加�系人",
 "Name" => "�称",
 "PO Box" => "邮箱",
diff --git a/apps/gallery/l10n/ar.php b/apps/gallery/l10n/ar.php
new file mode 100644
index 00000000000..d0c7d22316a
--- /dev/null
+++ b/apps/gallery/l10n/ar.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "معرض صور",
+"Rescan" => "اعادة البحث",
+"Back" => "رجوع"
+);
diff --git a/apps/gallery/l10n/cs_CZ.php b/apps/gallery/l10n/cs_CZ.php
new file mode 100644
index 00000000000..af70a364048
--- /dev/null
+++ b/apps/gallery/l10n/cs_CZ.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galerie",
+"Rescan" => "Opakované prohledání",
+"Back" => "Zpět"
+);
diff --git a/apps/gallery/l10n/es.php b/apps/gallery/l10n/es.php
new file mode 100644
index 00000000000..0a32faa8477
--- /dev/null
+++ b/apps/gallery/l10n/es.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galería",
+"Rescan" => "Refrescar",
+"Back" => "Atrás"
+);
diff --git a/apps/gallery/l10n/et_EE.php b/apps/gallery/l10n/et_EE.php
new file mode 100644
index 00000000000..1a862db78f7
--- /dev/null
+++ b/apps/gallery/l10n/et_EE.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galerii",
+"Rescan" => "Skänni uuesti",
+"Back" => "Tagasi"
+);
diff --git a/apps/gallery/l10n/ia.php b/apps/gallery/l10n/ia.php
new file mode 100644
index 00000000000..6c65a396d99
--- /dev/null
+++ b/apps/gallery/l10n/ia.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Back" => "Retro"
+);
diff --git a/apps/gallery/l10n/pl.php b/apps/gallery/l10n/pl.php
index d0c51c0f814..eb35732782b 100644
--- a/apps/gallery/l10n/pl.php
+++ b/apps/gallery/l10n/pl.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
-  "Gallery" => "Galeria",
-  "Rescan" => "Przeskanuj",
-  "Back" => "Wróć"
+"Gallery" => "Galeria",
+"Rescan" => "Przeskanuj",
+"Back" => "Wróć"
 );
-?>
diff --git a/apps/gallery/l10n/th_TH.php b/apps/gallery/l10n/th_TH.php
new file mode 100644
index 00000000000..8c729856488
--- /dev/null
+++ b/apps/gallery/l10n/th_TH.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "��ลอรี่",
+"Rescan" => "ตรวจสอบอี�ครั้ง",
+"Back" => "ย้อน�ลับ"
+);
diff --git a/apps/media/l10n/th_TH.php b/apps/media/l10n/th_TH.php
new file mode 100644
index 00000000000..dc448b32681
--- /dev/null
+++ b/apps/media/l10n/th_TH.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "เพลง",
+"Play" => "เล่น",
+"Pause" => "หยุดชั่วคราว",
+"Previous" => "�่อนหน้า",
+"Next" => "ถัดไป",
+"Mute" => "ปิดเสียง",
+"Unmute" => "เปิดเสียง",
+"Rescan Collection" => "ตรวจสอบไฟล์ที่เ�็บไว้อี�ครั้ง",
+"Artist" => "ศิลปิน",
+"Album" => "อัลบั้ม",
+"Title" => "ชื่อ"
+);
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 02b8bcda2ca..8a6ba6e9a78 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "استرجاع كلمة السر",
+"Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
 "You will receive a link to reset your password via Email." => "سو� نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
 "Requested" => "تم طلب",
 "Login failed!" => "محاولة دخول �اشلة!",
 "Username" => "إسم المستخدم",
 "Request reset" => "طلب تعديل",
 "Your password was reset" => "لقد تم تعديل كلمة السر",
+"To login page" => "الى ص�حة الدخول",
 "New password" => "كلمة سر جديدة",
 "Reset password" => "تعديل كلمة السر",
 "Personal" => "خصوصيات",
@@ -24,10 +27,12 @@
 "Database name" => "إسم قاعدة البيانات",
 "Database host" => "خادم قاعدة البيانات",
 "Finish setup" => "انهاء التعديلات",
+"web services under your control" => "خدمات الوب تحت تصر�ك",
 "Log out" => "الخروج",
 "Settings" => "تعديلات",
 "Lost your password?" => "هل نسيت كلمة السر؟",
 "remember" => "تذكر",
+"Log in" => "أدخل",
 "You are logged out." => "تم الخروج بنجاح.",
 "prev" => "السابق",
 "next" => "التالي"
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index bb121cd4f77..70bec66ff56 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -27,7 +27,7 @@
 "Database name" => "Nom de la base de dades",
 "Database host" => "Ordinador central de la base de dades",
 "Finish setup" => "Acaba la configuració",
-"web services under your control" => "serveis web controlats per vós",
+"web services under your control" => "tingueu el control dels serveis web",
 "Log out" => "Sortir",
 "Settings" => "Arranjament",
 "Lost your password?" => "Heu perdut la contrasenya?",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 0bbfa406fad..5e526440758 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "OwnCloud Passwort zurücksetzen",
+"Use the following link to reset your password: {link}" => "Nutze folgenden Link, um dein Passwort zurückzusetzen: {link}",
 "You will receive a link to reset your password via Email." => "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen.",
 "Requested" => "Angefragt",
 "Login failed!" => "Login fehlgeschlagen!",
 "Username" => "Nutzername",
 "Request reset" => "Anfrage zurückgesetzt",
 "Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
+"To login page" => "Zur Login-Seite",
 "New password" => "Neues Passwort",
 "Reset password" => "Passwort zurücksetzen",
 "Personal" => "Persönlich",
@@ -24,10 +27,12 @@
 "Database name" => "Datenbankname",
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschließen",
+"web services under your control" => "web services under your control",
 "Log out" => "Abmelden",
 "Settings" => "Einstellungen",
 "Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
+"Log in" => "Einloggen",
 "You are logged out." => "Abgemeldet",
 "prev" => "Zurück",
 "next" => "Weiter"
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index ba70a6a0c42..82a2e1c1717 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Owncloud parooli taastamine",
+"Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
 "You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
 "Requested" => "Kohustuslik",
 "Login failed!" => "Sisselogimine ebaõnnestus!",
 "Username" => "Kasutajanimi",
 "Request reset" => "Päringu taastamine",
 "Your password was reset" => "Sinu parool on taastatud",
+"To login page" => "Sisselogimise lehele",
 "New password" => "Uus parool",
 "Reset password" => "Nulli parool",
 "Personal" => "isiklik",
@@ -24,10 +27,12 @@
 "Database name" => "Andmebasi nimi",
 "Database host" => "Andmebaasi host",
 "Finish setup" => "Lõpeta seadistamine",
+"web services under your control" => "veebiteenused sinu kontrolli all",
 "Log out" => "Logi välja",
 "Settings" => "Seaded",
 "Lost your password?" => "Kaotasid oma parooli?",
 "remember" => "pea meeles",
+"Log in" => "Logi sisse",
 "You are logged out." => "Sa oled välja loginud",
 "prev" => "eelm",
 "next" => "järgm"
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 9a7d2bc5395..9a3637de61e 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -27,6 +27,7 @@
 "Settings" => "Beállítások",
 "Lost your password?" => "Elfelejtett jelszó?",
 "remember" => "emlékezni",
+"Log in" => "Bejelentkezés",
 "You are logged out." => "Kilépés sikerült.",
 "prev" => "Előző",
 "next" => "Következő"
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
new file mode 100644
index 00000000000..1774d840040
--- /dev/null
+++ b/core/l10n/th_TH.php
@@ -0,0 +1,39 @@
+<?php $TRANSLATIONS = array(
+"Owncloud password reset" => "เปลี่ยนรหัสผ่านใน Owncloud",
+"Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
+"You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่อ�ำหนดรหัสผ่านใหม่ทางอีเมล์",
+"Requested" => "ส่งคำร้องเรียบร้อย�ล้ว",
+"Login failed!" => "ไม่สามารถเข้าสู่ระบบได้!",
+"Username" => "ชื่อผู้ใช้งาน",
+"Request reset" => "ขอเปลี่ยนรหัสใหม่",
+"Your password was reset" => "รหัสผ่านของคุณถู�เปลี่ยนเรียบร้อย�ล้ว",
+"To login page" => "ไปที่หน้าเข้าสู่ระบบ",
+"New password" => "รหัสผ่านใหม่",
+"Reset password" => "เปลี่ยนรหัสผ่าน",
+"Personal" => "ส่วนตัว",
+"Users" => "ผู้ใช้งาน",
+"Apps" => "Apps",
+"Admin" => "ผู้ดู�ลระบบ",
+"Help" => "ช่วยเหลือ",
+"Cloud not found" => "ไม่พบ Cloud",
+"Create an <strong>admin account</strong>" => "สร้าง <strong>บั�ชีผู้ดู�ลระบบ</strong>",
+"Password" => "รหัสผ่าน",
+"Advanced" => "ขั้นสูง",
+"Data folder" => "โฟลเดอร์เ�็บข้อมูล",
+"Configure the database" => "�ำหนดค่า�านข้อมูล",
+"will be used" => "จะถู�ใช้",
+"Database user" => "ชื่อผู้ใช้งาน�านข้อมูล",
+"Database password" => "รหัสผ่าน�านข้อมูล",
+"Database name" => "ชื่อ�านข้อมูล",
+"Database host" => "Database host",
+"Finish setup" => "ติดตั้งเรียบร้อย�ล้ว",
+"web services under your control" => "web services under your control",
+"Log out" => "ออ�จา�ระบบ",
+"Settings" => "ตั้งค่า",
+"Lost your password?" => "ลืมรหัสผ่าน?",
+"remember" => "จำรหัสผ่าน",
+"Log in" => "เข้าสู่ระบบ",
+"You are logged out." => "คุณออ�จา�ระบบเรียบร้อย�ล้ว",
+"prev" => "�่อนหน้า",
+"next" => "ถัดไป"
+);
diff --git a/files/l10n/ar.php b/files/l10n/ar.php
index afdc0a89201..50edc0d6979 100644
--- a/files/l10n/ar.php
+++ b/files/l10n/ar.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "المجلد المؤقت غير موجود",
 "Files" => "المل�ات",
 "Maximum upload size" => "الحد الأقصى لحجم المل�ات التي يمكن ر�عها",
+"New" => "جديد",
+"Text file" => "مل�",
+"Folder" => "مجلد",
+"From the web" => "من الوب",
 "Upload" => "إر�ع",
 "Nothing in here. Upload something!" => "لا يوجد شيء هنا. إر�ع بعض المل�ات!",
 "Name" => "الاسم",
diff --git a/files/l10n/de.php b/files/l10n/de.php
index ed76de649ab..94d312c3e9e 100644
--- a/files/l10n/de.php
+++ b/files/l10n/de.php
@@ -7,8 +7,10 @@
 "Missing a temporary folder" => "Temporärer Ordner fehlt.",
 "Files" => "Dateien",
 "Maximum upload size" => "Maximale Größe",
+"New" => "Neu",
 "Text file" => "Text Datei",
 "Folder" => "Ordner",
+"From the web" => "Aus dem Netz",
 "Upload" => "Hochladen",
 "Nothing in here. Upload something!" => "Alles leer. Lad’ was hoch!",
 "Name" => "Name",
diff --git a/files/l10n/et_EE.php b/files/l10n/et_EE.php
index c8604b14dd0..415eb632312 100644
--- a/files/l10n/et_EE.php
+++ b/files/l10n/et_EE.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "Ajutiste failide kaust puudub",
 "Files" => "Failid",
 "Maximum upload size" => "Maksimaalne üleslaadimise suurus",
+"New" => "Uus",
+"Text file" => "Tekstifail",
+"Folder" => "Kaust",
+"From the web" => "Veebist",
 "Upload" => "Lae üles",
 "Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",
 "Name" => "Nimi",
diff --git a/files/l10n/sk_SK.php b/files/l10n/sk_SK.php
index 840d924fbee..0d91ae35a51 100644
--- a/files/l10n/sk_SK.php
+++ b/files/l10n/sk_SK.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "Chýbajúci do�asný prie�inok",
 "Files" => "Súbory",
 "Maximum upload size" => "Maximálna veľkosť nahratia",
+"New" => "Nový",
+"Text file" => "Textový súbor",
+"Folder" => "Prie�inok",
+"From the web" => "Z webu",
 "Upload" => "Nahrať",
 "Nothing in here. Upload something!" => "Ni� tu nie je. Nahrakte nie�o!",
 "Name" => "Meno",
diff --git a/files/l10n/th_TH.php b/files/l10n/th_TH.php
new file mode 100644
index 00000000000..e7e2fb94b1e
--- /dev/null
+++ b/files/l10n/th_TH.php
@@ -0,0 +1,23 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "ไม่มีข้อผิดพลาดใดๆ ไฟล์ถู�อัพโหลดเรียบร้อย�ล้ว",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "ไฟล์ที่อัพโหลดมีขนาดเ�ินคำสั่ง upload_max_filesize ที่ระบุเอาไว้ในไฟล์ php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ไฟล์ที่อัพโหลดมีขนาดเ�ินคำสั่ง MAX_FILE_SIZE ที่ระบุเอาไว้ในรูป�บบคำสั่งในภาษา HTML",
+"The uploaded file was only partially uploaded" => "ไฟล์ที่อัพโหลดยังไม่ได้ถู�อัพโหลดอย่างสมบูรณ์",
+"No file was uploaded" => "ยังไม่มีไฟล์ที่ถู�อัพโหลด",
+"Missing a temporary folder" => "�ฟ้มเอ�สารชั่วคราวเ�ิด�ารสู�หาย",
+"Files" => "ไฟล์",
+"Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
+"New" => "อัพโหลดไฟล์ใหม่",
+"Text file" => "ไฟล์ข้อความ",
+"Folder" => "�ฟ้มเอ�สาร",
+"From the web" => "จา�เวป",
+"Upload" => "อัพโหลด",
+"Nothing in here. Upload something!" => "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ �รุณาอัพโหลดไฟล์!",
+"Name" => "ชื่อ",
+"Download" => "ดาวน์โหลด",
+"Size" => "ขนาด",
+"Modified" => "ปรับปรุงล่าสุด",
+"Delete" => "ลบ",
+"Upload too large" => "ไฟล์ที่อัพโหลดมีขนาดให�่เ�ินไป",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเ�ิน�ว่าขนาดสูงสุดที่�ำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
+);
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 1a01a858a48..16d1dd7400c 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,66 +62,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "هذا ليس د�تر عناوينك."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "لم يتم العثور على الشخص."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "المعلومات الموجودة �ي ال vCard غير صحيحة. الرجاء إعادة تحديث الص�حة."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "عنوان"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "الهات�"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "البريد الالكتروني"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "المؤسسة"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "الوظي�ة"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "البيت"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "الهات� المحمول"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "معلومات إضا�ية"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "صوت"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "ال�اكس"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "ال�يديو"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "الرنان"
 
@@ -129,18 +129,10 @@ msgstr "الرنان"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr ".هذا ليس من معار�ي"
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "هذا الكرت ليس متلائم مع نظام ال RFC."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "لا يحتوي هذا الكرت على صورة."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "أض� شخص "
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 058ad6fbd7f..637e1a126fa 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <tarek.taha@gmail.com>, 2011.
+#   <tarek.taha@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 12:23+0000\n"
+"Last-Translator: blackcoder <tarek.taha@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "استرجاع كلمة السر"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -53,7 +53,7 @@ msgstr "لقد تم تعديل كلمة السر"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "الى ص�حة الدخول"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -134,7 +134,7 @@ msgstr "انهاء التعديلات"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "خدمات الوب تحت تصر�ك"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -154,7 +154,7 @@ msgstr "تذكر"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "أدخل"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index d557d0039c8..5b3b489fcbe 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <tarek.taha@gmail.com>, 2011.
+#   <tarek.taha@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 12:24+0000\n"
+"Last-Translator: blackcoder <tarek.taha@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,19 +57,19 @@ msgstr "الحد الأقصى لحجم المل�ات التي يمكن ر�عه
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "جديد"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "مل�"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "مجلد"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "من الوب"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/ar/gallery.po b/l10n/ar/gallery.po
index 71c534aaeb8..fdf349f64e9 100644
--- a/l10n/ar/gallery.po
+++ b/l10n/ar/gallery.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <tarek.taha@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -19,14 +20,34 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
+msgstr "معرض صور"
+
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
 msgstr ""
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "اعادة البحث"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "رجوع"
 
 
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index fc1c9e63f49..b7ae3c7b985 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <tarek.taha@gmail.com>, 2011.
+#   <icewind1991@gmail.com>, 2012.
+#   <tarek.taha@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:49+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +21,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "تم تغير العنوان البريدي"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -40,7 +41,7 @@ msgstr ""
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "مستوى المراقبه"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -108,15 +109,15 @@ msgstr "عدل كلمة السر"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "العنوان البريدي"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "عنوانك البريدي"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "أدخل عنوانك البريدي لت�عيل استرجاع كلمة المرور"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -124,7 +125,7 @@ msgstr "اللغة"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "ساعد �ي الترجمه"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -148,7 +149,7 @@ msgstr "انشئ"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "حصه"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index 35a16c1e213..3fc02dc13b7 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:49+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -61,66 +61,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr ""
 
@@ -128,18 +128,10 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr ""
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr ""
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr ""
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr ""
diff --git a/l10n/bg_BG/gallery.po b/l10n/bg_BG/gallery.po
index e52c69a7719..5b1d5ad685b 100644
--- a/l10n/bg_BG/gallery.po
+++ b/l10n/bg_BG/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/ca/calendar.po b/l10n/ca/calendar.po
index a91a65cac49..d73fea2340a 100644
--- a/l10n/ca/calendar.po
+++ b/l10n/ca/calendar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-16 16:46+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +30,7 @@ msgstr "La zona horària ha canviat"
 msgid "Invalid request"
 msgstr "Sol.licitud no vàlida"
 
-#: appinfo/app.php:20 templates/calendar.php:13
+#: appinfo/app.php:20 templates/calendar.php:14
 #: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Calendari"
@@ -283,59 +283,63 @@ msgstr "Cal."
 msgid "All day"
 msgstr "Tot el dia"
 
-#: templates/calendar.php:11
+#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Calendari nou"
+
+#: templates/calendar.php:12
 msgid "Missing fields"
 msgstr "Els camps que falten"
 
-#: templates/calendar.php:12 templates/part.eventform.php:3
+#: templates/calendar.php:13 templates/part.eventform.php:3
 msgid "Title"
 msgstr "Títol"
 
-#: templates/calendar.php:14
+#: templates/calendar.php:15
 msgid "From Date"
 msgstr "Des de la data"
 
-#: templates/calendar.php:15
+#: templates/calendar.php:16
 msgid "From Time"
 msgstr "Des de l'hora"
 
-#: templates/calendar.php:16
+#: templates/calendar.php:17
 msgid "To Date"
 msgstr "Fins a la data"
 
-#: templates/calendar.php:17
+#: templates/calendar.php:18
 msgid "To Time"
 msgstr "Fins a l'hora"
 
-#: templates/calendar.php:18
+#: templates/calendar.php:19
 msgid "The event ends before it starts"
 msgstr "L'esdeveniment acaba abans que comenci"
 
-#: templates/calendar.php:19
+#: templates/calendar.php:20
 msgid "There was a database fail"
 msgstr "Hi ha un error de base de dades"
 
-#: templates/calendar.php:52
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Setmana"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Mes"
 
-#: templates/calendar.php:54
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Llista"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:46
 msgid "Today"
 msgstr "Avui"
 
-#: templates/calendar.php:60
+#: templates/calendar.php:47
 msgid "Calendars"
 msgstr "Calendaris"
 
-#: templates/calendar.php:78
+#: templates/calendar.php:65
 msgid "There was a fail, while parsing the file."
 msgstr "S'ha produït un error en analitzar el fitxer."
 
@@ -419,10 +423,6 @@ msgstr "des."
 msgid "Choose active calendars"
 msgstr "Seleccioneu calendaris actius"
 
-#: templates/part.choosecalendar.php:15
-msgid "New Calendar"
-msgstr "Calendari nou"
-
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
@@ -576,7 +576,7 @@ msgstr "Descripció de l'esdeveniment"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Importa un fitxer de calendari"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -584,11 +584,11 @@ msgstr "Escolliu el calendari"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "crea un nou calendari"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Nom del nou calendari"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -596,15 +596,15 @@ msgstr "Importa"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "S'està important el calendari"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "El calendari s'ha importat amb èxit"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Tanca el diàleg"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index 95dd499ad42..bd1544e0b84 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 15:26+0100\n"
-"PO-Revision-Date: 2012-01-15 21:19+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +34,7 @@ msgstr "No es pot afegir una propietat buida."
 msgid "At least one of the address fields has to be filled out."
 msgstr "Almenys heu d'omplir un dels camps d'adreça."
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr "Error en afegir la propietat del contacte."
 
@@ -62,66 +62,66 @@ msgstr "Error en actualitzar la llibreta d'adreces."
 msgid "Contacts"
 msgstr "Contactes"
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Aquesta no és la vostra llibreta d'adreces"
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "No s'ha trobat el contacte."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "La informació de la vCard és incorrecta. Carregueu la pàgina de nou."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adreça"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telèfon"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organització"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Feina"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mòbil"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Veu"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Paginador"
 
@@ -129,21 +129,13 @@ msgstr "Paginador"
 msgid "Contact"
 msgstr "Contacte"
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Aquest contacte no és vostre."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Aquesta targeta no és compatible amb RFC."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Aquesta targeta no conté foto."
-
 #: templates/index.php:6
 msgid "Add Contact"
-msgstr "Afegiu un contacte"
+msgstr "Afegir un contacte"
 
 #: templates/index.php:7
 msgid "Addressbooks"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index adce94682bf..28fb5cde0e5 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-11 08:41+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-17 08:21+0000\n"
 "Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -134,7 +134,7 @@ msgstr "Acaba la configuració"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr "serveis web controlats per vós"
+msgstr "tingueu el control dels serveis web"
 
 #: templates/layout.user.php:34
 msgid "Log out"
diff --git a/l10n/ca/gallery.po b/l10n/ca/gallery.po
index f670a71c643..93c7325189f 100644
--- a/l10n/ca/gallery.po
+++ b/l10n/ca/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 15:26+0100\n"
-"PO-Revision-Date: 2012-01-15 21:20+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,26 @@ msgstr ""
 msgid "Gallery"
 msgstr "Galeria"
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr "Escaneja de nou"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 2a6ff9d93c4..f8a3f3cd69c 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 16:32+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-16 16:47+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +36,7 @@ msgstr "S'ha canviat l'idioma"
 
 #: personal.php:36 personal.php:37
 msgid "__language_name__"
-msgstr ""
+msgstr "Català"
 
 #: templates/admin.php:13
 msgid "Log level"
diff --git a/l10n/cs_CZ/calendar.po b/l10n/cs_CZ/calendar.po
index fc658fb75fa..322ca625037 100644
--- a/l10n/cs_CZ/calendar.po
+++ b/l10n/cs_CZ/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-18 15:55+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +31,7 @@ msgstr "Časová zóna byla změněna"
 msgid "Invalid request"
 msgstr "Chybný požadavek"
 
-#: appinfo/app.php:20 templates/calendar.php:13
+#: appinfo/app.php:20 templates/calendar.php:14
 #: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Kalendář"
@@ -284,59 +284,63 @@ msgstr "Kal."
 msgid "All day"
 msgstr "Celý den"
 
-#: templates/calendar.php:11
+#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Nový kalendář"
+
+#: templates/calendar.php:12
 msgid "Missing fields"
 msgstr "Chybějící pole"
 
-#: templates/calendar.php:12 templates/part.eventform.php:3
+#: templates/calendar.php:13 templates/part.eventform.php:3
 msgid "Title"
 msgstr "Název"
 
-#: templates/calendar.php:14
+#: templates/calendar.php:15
 msgid "From Date"
 msgstr "Od data"
 
-#: templates/calendar.php:15
+#: templates/calendar.php:16
 msgid "From Time"
 msgstr "Od"
 
-#: templates/calendar.php:16
+#: templates/calendar.php:17
 msgid "To Date"
 msgstr "Do data"
 
-#: templates/calendar.php:17
+#: templates/calendar.php:18
 msgid "To Time"
 msgstr "Do"
 
-#: templates/calendar.php:18
+#: templates/calendar.php:19
 msgid "The event ends before it starts"
 msgstr "Akce kon�í před zahájením"
 
-#: templates/calendar.php:19
+#: templates/calendar.php:20
 msgid "There was a database fail"
 msgstr "Chyba v databázi"
 
-#: templates/calendar.php:52
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "týden"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "měsíc"
 
-#: templates/calendar.php:54
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Seznam"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:46
 msgid "Today"
 msgstr "dnes"
 
-#: templates/calendar.php:60
+#: templates/calendar.php:47
 msgid "Calendars"
 msgstr "Kalendáře"
 
-#: templates/calendar.php:78
+#: templates/calendar.php:65
 msgid "There was a fail, while parsing the file."
 msgstr "Chyba při převodu souboru"
 
@@ -420,10 +424,6 @@ msgstr "Pro."
 msgid "Choose active calendars"
 msgstr "Vybrat aktivní kalendář"
 
-#: templates/part.choosecalendar.php:15
-msgid "New Calendar"
-msgstr "Nový kalendář"
-
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
@@ -577,7 +577,7 @@ msgstr "Popis události"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Importovat soubor kalendáře"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -585,11 +585,11 @@ msgstr "Zvolte prosím kalendář"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "vytvořit nový kalendář"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Název nového kalendáře"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -597,15 +597,15 @@ msgstr "Import"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Kalendář se importuje"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Kalendář byl importován úspěšně"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Zavřít dialog"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 8470cde9daa..7e91e188747 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -21,138 +21,130 @@ msgstr ""
 
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "Chyba při (de)aktivaci adresáře."
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "Během přidávání kontaktu nastala chyba."
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "Nelze přidat prazdný údaj."
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "Musí být uveden nejméně jeden z adresních údajů"
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
-msgstr ""
+msgstr "Chyba během přdávání údaje kontaktu."
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "Chyba při přidávání adresáře."
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Chyba při aktivaci adresáře."
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Chyba při odstraňování údaje kontaktu."
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Chyba při aktualizaci údaje kontaktu."
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Chyba při aktualizaci adresáře."
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Kontakty"
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Toto není Váš adresář."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Kontakt nebyl nalezen."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizace"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Pracovní"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Domácí"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Hlas"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Pager"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Toto není Váš kontakt."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Tato karta není kompatibilní s RFC."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Tato karta neobsahuje foto"
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Přidat kontakt"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "Adresáře"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "Adresář"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -230,7 +222,7 @@ msgstr "Odstranit"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Stáhnout kontakt"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
@@ -242,11 +234,11 @@ msgstr "Přidat"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Nový adresář"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Editace adresáře"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -286,6 +278,6 @@ msgstr "Aktualizovat"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "CardDAV synchronizuje adresu:"
 
 
diff --git a/l10n/cs_CZ/gallery.po b/l10n/cs_CZ/gallery.po
index 0f3acea06ec..e298dfe9d72 100644
--- a/l10n/cs_CZ/gallery.po
+++ b/l10n/cs_CZ/gallery.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Martin  <fireball@atlas.cz>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -19,14 +20,34 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
+msgstr "Galerie"
+
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
 msgstr ""
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Opakované prohledání"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Zpět"
 
 
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index c7a83f2562d..c050e9a5413 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <icewind1991@gmail.com>, 2012.
 # Jan Krejci <krejca85@gmail.com>, 2011.
 # Martin  <fireball@atlas.cz>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-18 22:30+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index 7a69003bd97..ffce17b2942 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -64,66 +64,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Dette er ikke din adressebog."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Kontaktperson kunne ikke findes."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informationen om vCard er forkert. Genindlæs siden."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Arbejde"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Hjemme"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Telefonsvarer"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Personsøger"
 
@@ -131,18 +131,10 @@ msgstr "Personsøger"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Dette er ikke din kontaktperson."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Dette kort er ikke RFC-kompatibelt."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Dette kort indeholder ikke et foto."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Tilføj kontaktperson"
diff --git a/l10n/da/gallery.po b/l10n/da/gallery.po
index f763cf822d6..e765c472b0c 100644
--- a/l10n/da/gallery.po
+++ b/l10n/da/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/de/calendar.po b/l10n/de/calendar.po
index 69e449ad01d..bca2bf109ad 100644
--- a/l10n/de/calendar.po
+++ b/l10n/de/calendar.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-16 16:51+0000\n"
 "Last-Translator: goeck <admin@s-goecker.de>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr "Zeitzone geändert"
 msgid "Invalid request"
 msgstr "Anfragefehler"
 
-#: appinfo/app.php:20 templates/calendar.php:13
+#: appinfo/app.php:20 templates/calendar.php:14
 #: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Kalender"
@@ -286,59 +286,63 @@ msgstr "Kal."
 msgid "All day"
 msgstr "Ganztags"
 
-#: templates/calendar.php:11
+#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Neuer Kalender"
+
+#: templates/calendar.php:12
 msgid "Missing fields"
 msgstr "fehlende Felder"
 
-#: templates/calendar.php:12 templates/part.eventform.php:3
+#: templates/calendar.php:13 templates/part.eventform.php:3
 msgid "Title"
 msgstr "Titel"
 
-#: templates/calendar.php:14
+#: templates/calendar.php:15
 msgid "From Date"
 msgstr "Startdatum"
 
-#: templates/calendar.php:15
+#: templates/calendar.php:16
 msgid "From Time"
 msgstr "Startzeit"
 
-#: templates/calendar.php:16
+#: templates/calendar.php:17
 msgid "To Date"
 msgstr "Enddatum"
 
-#: templates/calendar.php:17
+#: templates/calendar.php:18
 msgid "To Time"
 msgstr "Endzeit"
 
-#: templates/calendar.php:18
+#: templates/calendar.php:19
 msgid "The event ends before it starts"
 msgstr "Der Termin hört auf, bevor er angefangen hat."
 
-#: templates/calendar.php:19
+#: templates/calendar.php:20
 msgid "There was a database fail"
 msgstr "Datenbankfehler"
 
-#: templates/calendar.php:52
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Woche"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Monat"
 
-#: templates/calendar.php:54
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:46
 msgid "Today"
 msgstr "Heute"
 
-#: templates/calendar.php:60
+#: templates/calendar.php:47
 msgid "Calendars"
 msgstr "Kalender"
 
-#: templates/calendar.php:78
+#: templates/calendar.php:65
 msgid "There was a fail, while parsing the file."
 msgstr "Fehler beim Einlesen der Datei."
 
@@ -352,7 +356,7 @@ msgstr "Mo"
 
 #: templates/lAfix.php:11
 msgid "Tue."
-msgstr "Die"
+msgstr "Di"
 
 #: templates/lAfix.php:12
 msgid "Wed."
@@ -380,7 +384,7 @@ msgstr "Feb"
 
 #: templates/lAfix.php:30
 msgid "Mar."
-msgstr "Mär"
+msgstr "März"
 
 #: templates/lAfix.php:31
 msgid "Apr."
@@ -422,10 +426,6 @@ msgstr "Dez"
 msgid "Choose active calendars"
 msgstr "Aktive Kalender wählen"
 
-#: templates/part.choosecalendar.php:15
-msgid "New Calendar"
-msgstr "Neuer Kalender"
-
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
@@ -579,7 +579,7 @@ msgstr "Beschreibung"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Kalender Datei Importieren"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -587,11 +587,11 @@ msgstr "Bitte wählen Sie den Kalender."
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "Neuen Kalender anlegen"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Kalendername"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -599,15 +599,15 @@ msgstr "Importieren"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Kalender wird importiert."
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Kalender erfolgreich importiert"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Dialog schließen"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 97bc43aa3d5..a253810f608 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <admin@s-goecker.de>, 2012.
 #   <georg.stefan.germany@googlemail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
@@ -11,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
@@ -23,139 +24,131 @@ msgstr ""
 
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "(De-)Aktivierung des Adressbuches fehlgeschlagen"
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "Erstellen des Kontakts fehlgeschlagen"
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "Feld darf nicht leer sein."
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "Mindestens eines der Adressfelder muss ausgefüllt werden."
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
-msgstr ""
+msgstr "Kontakt ändern fehlgeschlagen"
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "Adressbuch hinzufügen fehlgeschlagen"
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Adressbuchaktivierung fehlgeschlagen"
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Kontakteigenschaft löschen fehlgeschlagen"
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Kontakteigenschaft aktualisieren fehlgeschlagen"
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Adressbuch aktualisieren fehlgeschlagen"
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Kontakte"
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Dies ist nicht dein Adressbuch."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Kontakt konnte nicht gefunden werden."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Arbeit"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Zuhause"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Anruf"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Pager"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Dies ist nicht dein Kontakt."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Diese Karte ist nicht RFC-kompatibel."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Diese Karte enthält kein Foto."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Kontakt hinzufügen"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "Adressbücher"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "Adressbuch"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -233,7 +226,7 @@ msgstr "Löschen"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Kontakt herunterladen"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
@@ -245,11 +238,11 @@ msgstr "Hinzufügen"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Neues Adressbuch"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Adressbuch editieren"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -289,6 +282,6 @@ msgstr "Aktualisieren"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "CardDAV Sync-Adresse:"
 
 
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 26675dbd954..59452deae0c 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <admin@s-goecker.de>, 2011.
+#   <admin@s-goecker.de>, 2011, 2012.
 #   <alex.hotz@gmail.com>, 2011.
 #   <georg.stefan.germany@googlemail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-16 17:46+0000\n"
+"Last-Translator: goeck <admin@s-goecker.de>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,11 +23,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "OwnCloud Passwort zurücksetzen"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Nutze folgenden Link, um dein Passwort zurückzusetzen: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -56,7 +56,7 @@ msgstr "Ihr Passwort wurde zurückgesetzt."
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Zur Login-Seite"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -137,7 +137,7 @@ msgstr "Installation abschließen"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "web services under your control"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -157,7 +157,7 @@ msgstr "merken"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Einloggen"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/de/files.po b/l10n/de/files.po
index b9769babd01..1c7517eafd6 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <admin@s-goecker.de>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
 #   <nelsonfritsch@gmail.com>, 2012.
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-11 12:33+0000\n"
-"Last-Translator: piccobello <nelsonfritsch@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-16 17:48+0000\n"
+"Last-Translator: goeck <admin@s-goecker.de>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,7 +57,7 @@ msgstr "Maximale Größe"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Neu"
 
 #: templates/index.php:10
 msgid "Text file"
@@ -68,7 +69,7 @@ msgstr "Ordner"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "Aus dem Netz"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/de/gallery.po b/l10n/de/gallery.po
index 0b37124c43c..a13373b37c2 100644
--- a/l10n/de/gallery.po
+++ b/l10n/de/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 15:26+0100\n"
-"PO-Revision-Date: 2012-01-15 21:46+0000\n"
-"Last-Translator: Bartek <bart.p.pl@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,26 @@ msgstr ""
 msgid "Gallery"
 msgstr "Galerie"
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr "Rescan"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index ffceebc7631..edb81adcdb8 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <admin@s-goecker.de>, 2011.
+#   <admin@s-goecker.de>, 2011, 2012.
+#   <icewind1991@gmail.com>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 #   <nelsonfritsch@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 16:32+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-16 17:54+0000\n"
+"Last-Translator: goeck <admin@s-goecker.de>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,11 +39,11 @@ msgstr "Sprache geändert"
 
 #: personal.php:36 personal.php:37
 msgid "__language_name__"
-msgstr ""
+msgstr "Deutsch"
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Log Level"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -86,7 +87,7 @@ msgstr "der verfügbaren"
 
 #: templates/personal.php:13
 msgid "Your password got changed"
-msgstr "Dein Passwort wurde geändert"
+msgstr "Dein Passwort wurde geändert."
 
 #: templates/personal.php:14
 msgid "Unable to change your password"
@@ -119,8 +120,8 @@ msgstr "Ihre E-Mail Adresse"
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
-"Tragen Sie eine E-Mail Adresse ein, um die Passwort-Wiederherstellung zu "
-"aktivieren"
+"Trage eine E-Mail Adresse ein, um die Passwort-Wiederherstellung zu "
+"aktivieren."
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -128,13 +129,13 @@ msgstr "Sprache"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr "Helfen Sie bei der Ãœbersetzung"
+msgstr "Hilf bei der Ãœbersetzung!"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
-"benutze diese Adresse, um deine ownCloud mit deinem Dateiverwalter zu "
-"verbinden"
+"Benutze diese Adresse, um deine ownCloud mit deinem Dateiverwalter zu "
+"verbinden."
 
 #: templates/users.php:15 templates/users.php:30
 msgid "Name"
@@ -154,7 +155,7 @@ msgstr "Anlegen"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Quota"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/el/calendar.po b/l10n/el/calendar.po
index dd0c8352f9b..0b1acf524eb 100644
--- a/l10n/el/calendar.po
+++ b/l10n/el/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-19 00:56+0000\n"
+"Last-Translator: Petros Kyladitis <petros.kyladitis@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +31,7 @@ msgstr "Η ζώνη ώ�ας άλλαξε"
 msgid "Invalid request"
 msgstr "Μη έγκυ�ο αίτημα"
 
-#: appinfo/app.php:20 templates/calendar.php:13
+#: appinfo/app.php:20 templates/calendar.php:14
 #: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Ημε�ολόγιο"
@@ -284,59 +284,63 @@ msgstr "Ημε�."
 msgid "All day"
 msgstr "Ολοήμε�ο"
 
-#: templates/calendar.php:11
+#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "�έα Ημε�ολόγιο"
+
+#: templates/calendar.php:12
 msgid "Missing fields"
 msgstr "Πεδία που λείπουν"
 
-#: templates/calendar.php:12 templates/part.eventform.php:3
+#: templates/calendar.php:13 templates/part.eventform.php:3
 msgid "Title"
 msgstr "Τίτλος"
 
-#: templates/calendar.php:14
+#: templates/calendar.php:15
 msgid "From Date"
 msgstr "Από Ημε�ομηνία"
 
-#: templates/calendar.php:15
+#: templates/calendar.php:16
 msgid "From Time"
 msgstr "Από ��α"
 
-#: templates/calendar.php:16
+#: templates/calendar.php:17
 msgid "To Date"
 msgstr "Έως Ημε�ομηνία"
 
-#: templates/calendar.php:17
+#: templates/calendar.php:18
 msgid "To Time"
 msgstr "Έως ��α"
 
-#: templates/calendar.php:18
+#: templates/calendar.php:19
 msgid "The event ends before it starts"
 msgstr "Το γεγονός ολοκλη�ώνεται π�ιν από την ένα�ξή του"
 
-#: templates/calendar.php:19
+#: templates/calendar.php:20
 msgid "There was a database fail"
 msgstr "Υπή�ξε σφάλμα στη βάση δεδομένων"
 
-#: templates/calendar.php:52
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Εβδομάδα"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Μήνας"
 
-#: templates/calendar.php:54
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Λίστα"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:46
 msgid "Today"
 msgstr "Σήμε�α"
 
-#: templates/calendar.php:60
+#: templates/calendar.php:47
 msgid "Calendars"
 msgstr "Ημε�ολόγια"
 
-#: templates/calendar.php:78
+#: templates/calendar.php:65
 msgid "There was a fail, while parsing the file."
 msgstr "Υπή�ξε μια αποτυχία, κατά την αξιολόγηση του α�χείου."
 
@@ -420,10 +424,6 @@ msgstr "Δεκ."
 msgid "Choose active calendars"
 msgstr "Επιλέξτε τα ενε�γά ημε�ολόγια"
 
-#: templates/part.choosecalendar.php:15
-msgid "New Calendar"
-msgstr "�έα Ημε�ολόγιο"
-
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
@@ -577,7 +577,7 @@ msgstr "Πε�ιγ�αφή του συμβάντος"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Εισαγωγή α�χείου ημε�ολογίου"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -585,11 +585,11 @@ msgstr "Πα�ακαλώ επιλέξτε το ημε�ολόγιο"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "δημιου�γία νέου ημε�ολογίου"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Όνομα νέου ημε�ολογίου"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -597,15 +597,15 @@ msgstr "Εισαγωγή"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Εισαγωγή ημε�ολογίου"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Το ημε�ολόγιο εισήχθει επιτυχώς"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Κλείσιμο Διαλόγου"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 1eaa6a34b85..31381646083 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -63,68 +63,68 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Αυτό δεν είναι βιβλίο διευθ�νσεων σας."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Η επαφή δεν μπ�ό�εσε να β�εθεί."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 "Οι πλη�οφο�ίες σχετικά με vCard είναι εσφαλμένες. Πα�ακαλώ επαναφο�τώστε τη "
 "σελίδα."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Διε�θυνση"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Τηλέφωνο"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Ο�γανισμός"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Ε�γασία"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Σπίτι"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Κινητό"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Κείμενο"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Φωνή"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Φαξ"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Βίντεο"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Βομβητής"
 
@@ -132,18 +132,10 @@ msgstr "Βομβητής"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Αυτή δεν είναι επαφή σας."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Αυτή η κά�τα δεν είναι RFC συμβατή."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Αυτή η κά�τα δεν πε�ιέχει φωτογ�αφία."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Π�οσθήκη επαφής"
diff --git a/l10n/el/gallery.po b/l10n/el/gallery.po
index f2a75835b34..c1f7b2c2707 100644
--- a/l10n/el/gallery.po
+++ b/l10n/el/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index f0eb55301ce..2c5d9245f1e 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <icewind1991@gmail.com>, 2012.
 #   <petros.kyladitis@gmail.com>, 2011.
 # Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-19 12:47+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index 1a7cb0f8329..c4781df1304 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/team/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,66 +62,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Ĉi tiu ne estas via adresaro."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Ne eblis trovi la kontakton."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informo pri vCard estas mal�usta. Bonvolu re�argi la pa�on."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adreso"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Retpo�tadreso"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizaĵo"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Laboro"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Hejmo"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Po�telefono"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Teksto"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voĉo"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fakso"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Videaĵo"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Televokilo"
 
@@ -129,18 +129,10 @@ msgstr "Televokilo"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Tiu ĉi ne estas via kontakto."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Ĉi tiu karto ne kongruas kun RFC."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Ĉi tiu karto ne havas foton."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Aldoni kontakton"
diff --git a/l10n/eo/gallery.po b/l10n/eo/gallery.po
index 8c86c3094a1..177eb810111 100644
--- a/l10n/eo/gallery.po
+++ b/l10n/eo/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/team/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/es/calendar.po b/l10n/es/calendar.po
index 7e3a85379e6..ef0102c6abf 100644
--- a/l10n/es/calendar.po
+++ b/l10n/es/calendar.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 #   <juanma@kde.org.ar>, 2011, 2012.
-#   <sergioballesterossolanas@gmail.com>, 2011.
+#   <sergioballesterossolanas@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-17 03:41+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +31,7 @@ msgstr "Zona horaria cambiada"
 msgid "Invalid request"
 msgstr "Petición no válida"
 
-#: appinfo/app.php:20 templates/calendar.php:13
+#: appinfo/app.php:20 templates/calendar.php:14
 #: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Calendario"
@@ -284,59 +284,63 @@ msgstr "Cal."
 msgid "All day"
 msgstr "Todo el día"
 
-#: templates/calendar.php:11
+#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Nuevo calendario"
+
+#: templates/calendar.php:12
 msgid "Missing fields"
 msgstr "Los campos que faltan"
 
-#: templates/calendar.php:12 templates/part.eventform.php:3
+#: templates/calendar.php:13 templates/part.eventform.php:3
 msgid "Title"
 msgstr "Título"
 
-#: templates/calendar.php:14
+#: templates/calendar.php:15
 msgid "From Date"
 msgstr "Desde la fecha"
 
-#: templates/calendar.php:15
+#: templates/calendar.php:16
 msgid "From Time"
 msgstr "Desde la hora"
 
-#: templates/calendar.php:16
+#: templates/calendar.php:17
 msgid "To Date"
 msgstr "Hasta la fecha"
 
-#: templates/calendar.php:17
+#: templates/calendar.php:18
 msgid "To Time"
 msgstr "Hasta la hora"
 
-#: templates/calendar.php:18
+#: templates/calendar.php:19
 msgid "The event ends before it starts"
 msgstr "El evento termina antes de que comience"
 
-#: templates/calendar.php:19
+#: templates/calendar.php:20
 msgid "There was a database fail"
 msgstr "Hubo un error en la base de datos"
 
-#: templates/calendar.php:52
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Semana"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Mes"
 
-#: templates/calendar.php:54
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:46
 msgid "Today"
 msgstr "Hoy"
 
-#: templates/calendar.php:60
+#: templates/calendar.php:47
 msgid "Calendars"
 msgstr "Calendarios"
 
-#: templates/calendar.php:78
+#: templates/calendar.php:65
 msgid "There was a fail, while parsing the file."
 msgstr "Hubo un fallo al analizar el archivo."
 
@@ -420,10 +424,6 @@ msgstr "Dic."
 msgid "Choose active calendars"
 msgstr "Elige los calendarios activos"
 
-#: templates/part.choosecalendar.php:15
-msgid "New Calendar"
-msgstr "Nuevo calendario"
-
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
@@ -577,7 +577,7 @@ msgstr "Descripción del evento"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Importar un archivo de calendario"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -585,11 +585,11 @@ msgstr "Elija el calendario"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "Crear un nuevo calendario"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Nombre del nuevo calendario"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -597,15 +597,15 @@ msgstr "Importar"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Importando calendario"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Calendario importado exitosamente"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Cerrar diálogo"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index df296d498f3..6db32c1ceeb 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <juanma@kde.org.ar>, 2011.
+#   <juanma@kde.org.ar>, 2011, 2012.
 #   <sergioballesterossolanas@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -21,140 +21,132 @@ msgstr ""
 
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "Error al (des)activar libreta de direcciones."
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "Ocurrió un error al agregar el contacto."
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "No se puede agregar una propiedad vacía."
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "Al menos uno de los campos de direcciones tiene que ser llenado."
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
-msgstr ""
+msgstr "Error al agregar una propiedad del contacto."
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "Error al agregar la libreta de direcciones."
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Error al activar la libreta de direcciones."
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Error al borrar una propiedad del contacto."
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Error al actualizar una propiedad del contacto."
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Error al actualizar la libreta de direcciones."
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Contactos"
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Esta no es tu agenda de contactos."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "No se pudo encontrar el contacto."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la "
 "página."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Dirección"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organización"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Trabajo"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Particular"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Móvil"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Localizador"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Este no es tu contacto."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Esta tarjeta no es compatible con RFC."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Esta tarjeta no contiene ninguna foto."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Agregar contacto"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "Libretas de direcciones"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "Libreta de direcciones"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -207,7 +199,7 @@ msgstr "Crear contacto"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Elige libreta de direcciones activa"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
@@ -232,7 +224,7 @@ msgstr "Borrar"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Descargar contacto"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
@@ -244,15 +236,15 @@ msgstr "Añadir"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Nueva libreta de direcciones"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Editar libreta de direcciones"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Nombre a mostrar"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
@@ -288,6 +280,6 @@ msgstr "Actualizar"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "Dirección de sincronización CardDAV:"
 
 
diff --git a/l10n/es/gallery.po b/l10n/es/gallery.po
index 848b07026f8..112bc746166 100644
--- a/l10n/es/gallery.po
+++ b/l10n/es/gallery.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <sergioballesterossolanas@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -19,14 +20,34 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
+msgstr "Galería"
+
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
 msgstr ""
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Refrescar"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Atrás"
 
 
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 10cfe0b5cb9..e8dc30bb7ee 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <juanma@kde.org.ar>, 2011.
+#   <juanma@kde.org.ar>, 2011, 2012.
 #   <monty_2731@hotmail.com>, 2011.
 #   <rom1dep@gmail.com>, 2011.
 #   <sergioballesterossolanas@gmail.com>, 2011, 2012.
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 16:32+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-17 03:40+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,7 +39,7 @@ msgstr "Idioma cambiado"
 
 #: personal.php:36 personal.php:37
 msgid "__language_name__"
-msgstr ""
+msgstr "Español"
 
 #: templates/admin.php:13
 msgid "Log level"
diff --git a/l10n/et_EE/calendar.po b/l10n/et_EE/calendar.po
index cc00b225d3e..d012d5a9e46 100644
--- a/l10n/et_EE/calendar.po
+++ b/l10n/et_EE/calendar.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Rivo Zängov <eraser@eraser.ee>, 2011.
+# Rivo Zängov <eraser@eraser.ee>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-18 11:14+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ajax/guesstimezone.php:42
 msgid "New Timezone:"
-msgstr ""
+msgstr "Uus ajavöönd:"
 
 #: ajax/settimezone.php:22
 msgid "Timezone changed"
@@ -30,7 +30,7 @@ msgstr "Ajavöönd on muudetud"
 msgid "Invalid request"
 msgstr "Vigane päring"
 
-#: appinfo/app.php:20 templates/calendar.php:13
+#: appinfo/app.php:20 templates/calendar.php:14
 #: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Kalender"
@@ -129,143 +129,143 @@ msgstr "Igal aastal"
 
 #: lib/object.php:366
 msgid "never"
-msgstr ""
+msgstr "mitte kunagi"
 
 #: lib/object.php:367
 msgid "by occurrences"
-msgstr ""
+msgstr "toimumiskordade järgi"
 
 #: lib/object.php:368
 msgid "by date"
-msgstr ""
+msgstr "kuupäeva järgi"
 
 #: lib/object.php:375
 msgid "by monthday"
-msgstr ""
+msgstr "kuu päeva järgi"
 
 #: lib/object.php:376
 msgid "by weekday"
-msgstr ""
+msgstr "nädalapäeva järgi"
 
 #: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr ""
+msgstr "Esmaspäev"
 
 #: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr ""
+msgstr "Teisipäev"
 
 #: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr ""
+msgstr "Kolmapäev"
 
 #: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr ""
+msgstr "Neljapäev"
 
 #: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr ""
+msgstr "Reede"
 
 #: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr ""
+msgstr "Laupäev"
 
 #: lib/object.php:389 templates/lAfix.php:2
 msgid "Sunday"
-msgstr ""
+msgstr "Pühapäev"
 
 #: lib/object.php:396
 msgid "events week of month"
-msgstr ""
+msgstr "ürituse kuu nädal"
 
 #: lib/object.php:397
 msgid "first"
-msgstr ""
+msgstr "esimene"
 
 #: lib/object.php:398
 msgid "second"
-msgstr ""
+msgstr "teine"
 
 #: lib/object.php:399
 msgid "third"
-msgstr ""
+msgstr "kolmas"
 
 #: lib/object.php:400
 msgid "fourth"
-msgstr ""
+msgstr "neljas"
 
 #: lib/object.php:401
 msgid "fifth"
-msgstr ""
+msgstr "viies"
 
 #: lib/object.php:402
 msgid "last"
-msgstr ""
+msgstr "viimane"
 
 #: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr ""
+msgstr "Jaanuar"
 
 #: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr ""
+msgstr "Veebruar"
 
 #: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr ""
+msgstr "Märts"
 
 #: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr ""
+msgstr "Aprill"
 
 #: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
 #: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr ""
+msgstr "Juuni"
 
 #: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr ""
+msgstr "Juuli"
 
 #: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr ""
+msgstr "August"
 
 #: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr ""
+msgstr "Oktoober"
 
 #: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr ""
+msgstr "Detsember"
 
 #: lib/object.php:441
 msgid "by events date"
-msgstr ""
+msgstr "ürituste kuupäeva järgi"
 
 #: lib/object.php:442
 msgid "by yearday(s)"
-msgstr ""
+msgstr "aasta päeva(de) järgi"
 
 #: lib/object.php:443
 msgid "by weeknumber(s)"
-msgstr ""
+msgstr "nädala numbri(te) järgi"
 
 #: lib/object.php:444
 msgid "by day and month"
-msgstr ""
+msgstr "kuu ja päeva järgi"
 
 #: lib/object.php:467
 msgid "Not an array"
@@ -273,156 +273,156 @@ msgstr "Pole andmemassiiv"
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
-msgstr ""
+msgstr "Kuupäev"
 
 #: lib/search.php:40
 msgid "Cal."
-msgstr ""
+msgstr "Kal."
 
 #: templates/calendar.php:10
 msgid "All day"
 msgstr "Kogu päev"
 
-#: templates/calendar.php:11
+#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Uus kalender"
+
+#: templates/calendar.php:12
 msgid "Missing fields"
 msgstr "Puuduvad väljad"
 
-#: templates/calendar.php:12 templates/part.eventform.php:3
+#: templates/calendar.php:13 templates/part.eventform.php:3
 msgid "Title"
 msgstr "Pealkiri"
 
-#: templates/calendar.php:14
+#: templates/calendar.php:15
 msgid "From Date"
 msgstr "Alates kuupäevast"
 
-#: templates/calendar.php:15
+#: templates/calendar.php:16
 msgid "From Time"
 msgstr "Alates kellaajast"
 
-#: templates/calendar.php:16
+#: templates/calendar.php:17
 msgid "To Date"
 msgstr "Kuni kuupäevani"
 
-#: templates/calendar.php:17
+#: templates/calendar.php:18
 msgid "To Time"
 msgstr "Kuni kellaajani"
 
-#: templates/calendar.php:18
+#: templates/calendar.php:19
 msgid "The event ends before it starts"
 msgstr "Üritus lõpeb enne, kui see algab"
 
-#: templates/calendar.php:19
+#: templates/calendar.php:20
 msgid "There was a database fail"
 msgstr "Tekkis andmebaasi viga"
 
-#: templates/calendar.php:52
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Nädal"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Kuu"
 
-#: templates/calendar.php:54
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Nimekiri"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:46
 msgid "Today"
 msgstr "Täna"
 
-#: templates/calendar.php:60
+#: templates/calendar.php:47
 msgid "Calendars"
 msgstr "Kalendrid"
 
-#: templates/calendar.php:78
+#: templates/calendar.php:65
 msgid "There was a fail, while parsing the file."
 msgstr "Faili parsimisel tekkis viga."
 
 #: templates/lAfix.php:9
 msgid "Sun."
-msgstr ""
+msgstr "Püh."
 
 #: templates/lAfix.php:10
 msgid "Mon."
-msgstr ""
+msgstr "Esm."
 
 #: templates/lAfix.php:11
 msgid "Tue."
-msgstr ""
+msgstr "Teisip."
 
 #: templates/lAfix.php:12
 msgid "Wed."
-msgstr ""
+msgstr "Kolmap."
 
 #: templates/lAfix.php:13
 msgid "Thu."
-msgstr ""
+msgstr "Meljap."
 
 #: templates/lAfix.php:14
 msgid "Fri."
-msgstr ""
+msgstr "Reede"
 
 #: templates/lAfix.php:15
 msgid "Sat."
-msgstr ""
+msgstr "Laup."
 
 #: templates/lAfix.php:28
 msgid "Jan."
-msgstr ""
+msgstr "Jan."
 
 #: templates/lAfix.php:29
 msgid "Feb."
-msgstr ""
+msgstr "Veebr."
 
 #: templates/lAfix.php:30
 msgid "Mar."
-msgstr ""
+msgstr "Mär."
 
 #: templates/lAfix.php:31
 msgid "Apr."
-msgstr ""
+msgstr "Apr."
 
 #: templates/lAfix.php:32
 msgid "May."
-msgstr ""
+msgstr "Mai"
 
 #: templates/lAfix.php:33
 msgid "Jun."
-msgstr ""
+msgstr "Jun."
 
 #: templates/lAfix.php:34
 msgid "Jul."
-msgstr ""
+msgstr "Jul."
 
 #: templates/lAfix.php:35
 msgid "Aug."
-msgstr ""
+msgstr "Aug."
 
 #: templates/lAfix.php:36
 msgid "Sep."
-msgstr ""
+msgstr "Sept."
 
 #: templates/lAfix.php:37
 msgid "Oct."
-msgstr ""
+msgstr "Okt."
 
 #: templates/lAfix.php:38
 msgid "Nov."
-msgstr ""
+msgstr "Nov."
 
 #: templates/lAfix.php:39
 msgid "Dec."
-msgstr ""
+msgstr "Dets."
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Vali aktiivsed kalendrid"
 
-#: templates/part.choosecalendar.php:15
-msgid "New Calendar"
-msgstr "Uus kalender"
-
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
@@ -516,47 +516,47 @@ msgstr "Korda"
 
 #: templates/part.eventform.php:68
 msgid "Advanced"
-msgstr ""
+msgstr "Täpsem"
 
 #: templates/part.eventform.php:112
 msgid "Select weekdays"
-msgstr ""
+msgstr "Vali nädalapäevad"
 
 #: templates/part.eventform.php:125 templates/part.eventform.php:138
 msgid "Select days"
-msgstr ""
+msgstr "Vali päevad"
 
 #: templates/part.eventform.php:130
 msgid "and the events day of year."
-msgstr ""
+msgstr "ja ürituse päev aastas."
 
 #: templates/part.eventform.php:143
 msgid "and the events day of month."
-msgstr ""
+msgstr "ja ürituse päev kuus."
 
 #: templates/part.eventform.php:151
 msgid "Select months"
-msgstr ""
+msgstr "Vali kuud"
 
 #: templates/part.eventform.php:164
 msgid "Select weeks"
-msgstr ""
+msgstr "Vali nädalad"
 
 #: templates/part.eventform.php:169
 msgid "and the events week of year."
-msgstr ""
+msgstr "ja ürituse nädal aastas."
 
 #: templates/part.eventform.php:175
 msgid "Interval"
-msgstr ""
+msgstr "Intervall"
 
 #: templates/part.eventform.php:181
 msgid "End"
-msgstr ""
+msgstr "Lõpp"
 
 #: templates/part.eventform.php:193
 msgid "occurrences"
-msgstr ""
+msgstr "toimumiskordi"
 
 #: templates/part.eventform.php:208
 msgid "Location"
@@ -576,7 +576,7 @@ msgstr "Sündmuse kirjeldus"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Impordi kalendrifail"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -584,11 +584,11 @@ msgstr "Palun vali kalender"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "loo uus kalender"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Uue kalendri nimi"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -596,15 +596,15 @@ msgstr "Impordi"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Kalendri importimine"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Kalender on imporditud"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Sulge dialoogiaken"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
@@ -616,7 +616,7 @@ msgstr "Ajavöönd"
 
 #: templates/settings.php:30
 msgid "Check always for changes of the timezone"
-msgstr ""
+msgstr "Kontrolli alati muudatusi ajavööndis"
 
 #: templates/settings.php:32
 msgid "Timeformat"
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index 8b6c2c6873c..6e08cc42cde 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Rivo Zängov <eraser@eraser.ee>, 2011.
+# Rivo Zängov <eraser@eraser.ee>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -20,138 +20,130 @@ msgstr ""
 
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "Viga aadressiraamatu (de)aktiveerimisel."
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "Konktakti lisamisel tekkis viga."
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "Tühja omadust ei saa lisada."
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "Vähemalt üks aadressiväljadest peab olema täidetud."
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
-msgstr ""
+msgstr "Viga konktakti korralikul lisamisel."
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "Viga aadressiraamatu lisamisel."
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Viga aadressiraamatu aktiveerimisel."
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Viga konktaki korralikul kustutamisel."
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Viga konktaki korralikul uuendamisel."
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Viga aadressiraamatu uuendamisel."
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Kontaktid"
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "See pole sinu aadressiraamat."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Kontakti ei leitud."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Visiitkaardi info pole korrektne. Palun lae leht uuesti."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Aadress"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organisatsioon"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Töö"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Kodu"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobiil"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Hääl"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Piipar"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "See pole sinu kontakt."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "See kaart ei ühildu RFC-ga."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Sellel kaardil pole fotot."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Lisa kontakt"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "Aadressiraamatud"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "Aadressiraamat"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -161,7 +153,7 @@ msgstr "Nimi"
 #: templates/part.details.php:79 templates/part.setpropertyform.php:10
 #: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Tüüp"
 
 #: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
@@ -204,20 +196,20 @@ msgstr "Lisa kontakt"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Vali aktiivsed aadressiraamatud"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "Uus aadressiraamat"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "CardDav link"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "Lae alla"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -229,43 +221,43 @@ msgstr "Kustuta"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Lae kontakt alla"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
-msgstr ""
+msgstr "Kustuta kontakt"
 
 #: templates/part.details.php:34
 msgid "Add"
-msgstr ""
+msgstr "Lisa"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Uus aadressiraamat"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Muuda aadressiraamatut"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Näidatav nimi"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Aktiivne"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Salvesta"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Saada"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Loobu"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -273,7 +265,7 @@ msgstr "Sünnipäev"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Eelistatud"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -281,10 +273,10 @@ msgstr "Telefon"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
-msgstr ""
+msgstr "Uuenda"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "CardDAV sünkroniseerimise aadress:"
 
 
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 18831a8a35f..55fd4b8d06a 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Rivo Zängov <eraser@eraser.ee>, 2011.
+# Rivo Zängov <eraser@eraser.ee>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-18 10:37+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Owncloud parooli taastamine"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Kasuta järgnevat linki oma parooli taastamiseks: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -53,7 +53,7 @@ msgstr "Sinu parool on taastatud"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Sisselogimise lehele"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -134,7 +134,7 @@ msgstr "Lõpeta seadistamine"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "veebiteenused sinu kontrolli all"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -154,7 +154,7 @@ msgstr "pea meeles"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Logi sisse"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 49191aa3a92..bda98c95742 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Rivo Zängov <eraser@eraser.ee>, 2011.
+# Rivo Zängov <eraser@eraser.ee>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-18 10:38+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,19 +57,19 @@ msgstr "Maksimaalne üleslaadimise suurus"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Uus"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "Tekstifail"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Kaust"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "Veebist"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/et_EE/gallery.po b/l10n/et_EE/gallery.po
index fb623745150..f0fb20bc18d 100644
--- a/l10n/et_EE/gallery.po
+++ b/l10n/et_EE/gallery.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -19,14 +20,34 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
+msgstr "Galerii"
+
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
 msgstr ""
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Skänni uuesti"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Tagasi"
 
 
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index a34a2a17c2b..885415cc86a 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Rivo Zängov <eraser@eraser.ee>, 2011.
+#   <icewind1991@gmail.com>, 2012.
+# Rivo Zängov <eraser@eraser.ee>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-18 22:29+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +21,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "e-posti on muudetud"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -36,11 +37,11 @@ msgstr "Keel on muudetud"
 
 #: personal.php:36 personal.php:37
 msgid "__language_name__"
-msgstr ""
+msgstr "Eesti"
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Logi tase"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -108,15 +109,15 @@ msgstr "Muuda parooli"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "E-post"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Sinu e-posti aadress"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -124,7 +125,7 @@ msgstr "Keel"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Aita tõlkida"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -148,7 +149,7 @@ msgstr "Lisa"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Mahupiir"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index 5eba801b1bf..9e778db67c2 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/team/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,67 +62,67 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Hau ez da zure helbide liburua."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Ezin izan da kontaktua aurkitu."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Helbidea"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefonoa"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Eposta"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Erakundea"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Lana"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Etxea"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mugikorra"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Testua"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Ahotsa"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax-a"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Bideoa"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Bilagailua"
 
@@ -130,18 +130,10 @@ msgstr "Bilagailua"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Hau ez da zure kontaktua."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Txartel hau ez da RFC bateragarria."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Txartel honek ez dauka argazkirik."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Gehitu Kontaktua"
diff --git a/l10n/eu/gallery.po b/l10n/eu/gallery.po
index e2dc7b08f2a..703db4f8a6f 100644
--- a/l10n/eu/gallery.po
+++ b/l10n/eu/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/team/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index df10fd6b44e..a8803276f8b 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 15:26+0100\n"
-"PO-Revision-Date: 2012-01-15 14:18+0000\n"
-"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,7 +39,7 @@ msgstr "Impossible d'ajouter un champ vide."
 msgid "At least one of the address fields has to be filled out."
 msgstr "Au moins un des champs d'adresses doit être complété."
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr "Erreur lors de l'ajout du champ."
 
@@ -67,68 +67,68 @@ msgstr "Erreur lors de la mise à jour du carnet d'adresses."
 msgid "Contacts"
 msgstr "Contacts"
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Ce n'est pas votre carnet d'adresses."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Ce contact n'a pas été trouvé."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 "Les informations relatives à cette vCard sont incorrectes. Veuillez "
 "recharger la page."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Société"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Travail"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Maison"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texte"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voix"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Vidéo"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Bipeur"
 
@@ -136,18 +136,10 @@ msgstr "Bipeur"
 msgid "Contact"
 msgstr "Contact"
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Ce n'est pas votre contact."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Cette fiche n'est pas compatible RFC."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Cette fiche ne contient pas de photo."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Ajouter un Contact"
diff --git a/l10n/fr/gallery.po b/l10n/fr/gallery.po
index 2d662af6e80..c985ade5242 100644
--- a/l10n/fr/gallery.po
+++ b/l10n/fr/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 15:26+0100\n"
-"PO-Revision-Date: 2012-01-15 14:12+0000\n"
-"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,26 @@ msgstr ""
 msgid "Gallery"
 msgstr "Galerie"
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr "Analyser à nouveau"
diff --git a/l10n/gl/calendar.po b/l10n/gl/calendar.po
index 169607e0e8d..1542672b666 100644
--- a/l10n/gl/calendar.po
+++ b/l10n/gl/calendar.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 07:09+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 06:02+0000\n"
 "Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgstr "Fuso horario trocado"
 msgid "Invalid request"
 msgstr "Petición non válida"
 
-#: appinfo/app.php:20 templates/calendar.php:13
+#: appinfo/app.php:20 templates/calendar.php:14
 #: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Calendario"
@@ -57,7 +57,7 @@ msgstr "Clientes"
 
 #: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
-msgstr ""
+msgstr "Remitente"
 
 #: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
@@ -283,59 +283,63 @@ msgstr "Cal."
 msgid "All day"
 msgstr "Todo o dia"
 
-#: templates/calendar.php:11
+#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Novo calendario"
+
+#: templates/calendar.php:12
 msgid "Missing fields"
 msgstr "Faltan campos"
 
-#: templates/calendar.php:12 templates/part.eventform.php:3
+#: templates/calendar.php:13 templates/part.eventform.php:3
 msgid "Title"
 msgstr "Título"
 
-#: templates/calendar.php:14
+#: templates/calendar.php:15
 msgid "From Date"
 msgstr "Desde Data"
 
-#: templates/calendar.php:15
+#: templates/calendar.php:16
 msgid "From Time"
 msgstr "Desde Hora"
 
-#: templates/calendar.php:16
+#: templates/calendar.php:17
 msgid "To Date"
 msgstr "a Data"
 
-#: templates/calendar.php:17
+#: templates/calendar.php:18
 msgid "To Time"
 msgstr "a Hora"
 
-#: templates/calendar.php:18
+#: templates/calendar.php:19
 msgid "The event ends before it starts"
 msgstr "O evento remata antes de iniciarse"
 
-#: templates/calendar.php:19
+#: templates/calendar.php:20
 msgid "There was a database fail"
 msgstr "Houbo un erro na base de datos"
 
-#: templates/calendar.php:52
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Semana"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Mes"
 
-#: templates/calendar.php:54
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:46
 msgid "Today"
 msgstr "Hoxe"
 
-#: templates/calendar.php:60
+#: templates/calendar.php:47
 msgid "Calendars"
 msgstr "Calendarios"
 
-#: templates/calendar.php:78
+#: templates/calendar.php:65
 msgid "There was a fail, while parsing the file."
 msgstr "Houbo un erro ao procesar o ficheiro"
 
@@ -419,10 +423,6 @@ msgstr "Nad."
 msgid "Choose active calendars"
 msgstr "Escolla os calendarios activos"
 
-#: templates/part.choosecalendar.php:15
-msgid "New Calendar"
-msgstr "Novo calendario"
-
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index cfec12a1886..d0939b6fe50 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 06:44+0000\n"
-"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +34,7 @@ msgstr "Non se pode engadir unha propiedade baldeira"
 msgid "At least one of the address fields has to be filled out."
 msgstr "A lo menos un dos campos de dirección ten que ser cuberto"
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr "Erro engadindo unha propiedade do contacto."
 
@@ -62,67 +62,67 @@ msgstr "Erro actualizando o directorio."
 msgid "Contacts"
 msgstr "Contactos"
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Este non é o seu directorio"
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Non se atopou o contacto"
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 "A información sobre a vCard é incorrecta. Por favor volte a cargar a páxina."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Dirección"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organización"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Emprego"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Móbil"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Paxinador"
 
@@ -130,18 +130,10 @@ msgstr "Paxinador"
 msgid "Contact"
 msgstr "Contacto"
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Este non é un dos seus contactos"
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Esta tarxeta non é compatible con RFC"
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Esta tarxeta non ten fotografía"
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Engadir contacto"
diff --git a/l10n/gl/gallery.po b/l10n/gl/gallery.po
index 4c8e3d36824..6ec6c2dd93e 100644
--- a/l10n/gl/gallery.po
+++ b/l10n/gl/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 05:44+0000\n"
-"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,26 @@ msgstr ""
 msgid "Gallery"
 msgstr "Galería"
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr "Voltar a analizar"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 89e3031013f..eac9a22b6ff 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 16:32+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 06:00+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +36,7 @@ msgstr "O idioma mudou"
 
 #: personal.php:36 personal.php:37
 msgid "__language_name__"
-msgstr ""
+msgstr "Galego"
 
 #: templates/admin.php:13
 msgid "Log level"
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index 3779134461c..afd4507f44d 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/team/he/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,66 +62,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "זהו �ינו ספר הכתובות שלך"
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "ל� ניתן ל�תר �יש קשר"
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "המידע �ודות vCard �ינו נכון. נ� לטעון מחדש �ת הדף."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "כתובת"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "טלפון"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "דו�ר �לקטרוני"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "�רגון"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "עבודה"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "בית"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "נייד"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "טקסט"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "קולי"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "פקס"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "ויד�ו"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "זימונית"
 
@@ -129,18 +129,10 @@ msgstr "זימונית"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "זהו �ינו �יש קשר שלך"
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "כרטיס זה �ינו תו�� ל־RFC"
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "כרטיס זה �ינו כולל תמונה"
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "הוספת �יש קשר"
diff --git a/l10n/he/gallery.po b/l10n/he/gallery.po
index 5b80974785c..c4712e83f0f 100644
--- a/l10n/he/gallery.po
+++ b/l10n/he/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/team/he/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index 3df2758e0ca..4b8a0306558 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/team/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,66 +62,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Kontakt ne postoji."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacija o vCard je neispravna. Osvježite stranicu."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobitel"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Glasovno"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Pager"
 
@@ -129,18 +129,10 @@ msgstr "Pager"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Ovo nije vaš kontakt."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Ova kartica nije sukladna prema RFC direktivama."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Ova kartica ne sadrži fotografiju."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
diff --git a/l10n/hr/gallery.po b/l10n/hr/gallery.po
index fba00795844..b04adb4a774 100644
--- a/l10n/hr/gallery.po
+++ b/l10n/hr/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/team/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index b4e5d034ecb..c0ca509c7a4 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/team/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -63,66 +63,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Ez nem a te címjegyzéked."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Kapcsolat nem található."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A vCardról szóló információ helytelen. Töltsd újra az oldalt."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Cím"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefonszám"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizáció"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Munka"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Otthon"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobiltelefonszám"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Szöveg"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Hang"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Lapozó"
 
@@ -130,18 +130,10 @@ msgstr "Lapozó"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Nem a te kapcsolatod."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "A kártya nem RFC kompatibilis."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "A kártya nem tartlmaz fényképet."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Kontakt hozzáadása"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index a6a15a1bf9e..36e8b3fe068 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <mail@tamas-nagy.net>, 2011.
+# Peter Borsa <peter.borsa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 13:07+0000\n"
+"Last-Translator: Peter Borsa <peter.borsa@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/team/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -154,7 +155,7 @@ msgstr "emlékezni"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Bejelentkezés"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/hu_HU/gallery.po b/l10n/hu_HU/gallery.po
index 96eb6168cac..9e031b3b68a 100644
--- a/l10n/hu_HU/gallery.po
+++ b/l10n/hu_HU/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/team/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index 53d8557da1b..1a819611f28 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/team/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -61,66 +61,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr ""
 
@@ -128,18 +128,10 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr ""
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr ""
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr ""
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr ""
diff --git a/l10n/hy/gallery.po b/l10n/hy/gallery.po
index c1a1f43fe7d..9e34b9bfda2 100644
--- a/l10n/hy/gallery.po
+++ b/l10n/hy/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/team/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index 6958d64a4b9..73b29062dfd 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/team/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -63,66 +63,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Iste non es tu libro de adresses"
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Contacto non poterea esser legite"
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telephono"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-posta"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Travalio"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Domo"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Pager"
 
@@ -130,18 +130,10 @@ msgstr "Pager"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Iste non es tu contacto"
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Iste carta non es compatibile con RFC"
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr ""
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Adder contacto"
diff --git a/l10n/ia/gallery.po b/l10n/ia/gallery.po
index 76db89533ff..4240b743ba3 100644
--- a/l10n/ia/gallery.po
+++ b/l10n/ia/gallery.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Emilio Sepúlveda <emisepulvedam@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/team/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -21,12 +22,32 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Retro"
 
 
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index d78cbcd9b18..3927e42f46d 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:49+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -61,66 +61,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr ""
 
@@ -128,18 +128,10 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr ""
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr ""
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr ""
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr ""
diff --git a/l10n/id/gallery.po b/l10n/id/gallery.po
index 058bc22ba9b..683cb59cbd1 100644
--- a/l10n/id/gallery.po
+++ b/l10n/id/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 7eee067d6eb..245fac94634 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 15:26+0100\n"
-"PO-Revision-Date: 2012-01-15 17:11+0000\n"
-"Last-Translator: formalist <formalist@email.it>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:49+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +36,7 @@ msgstr "Impossibile aggiungere una proprietà vuota."
 msgid "At least one of the address fields has to be filled out."
 msgstr "Deve essere riempito almeno un indirizzo ."
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr "Errore durante l'aggiunta della proprietà del contatto."
 
@@ -64,66 +64,66 @@ msgstr "Errore nell'aggiornamento della rubrica."
 msgid "Contacts"
 msgstr "Contatti"
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Questa non è la tua rubrica."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Il contatto non può essere trovato"
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informazioni sulla vCard incorrette. Ricaricare la pagina."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Indirizzo"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Lavoro"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Testo"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Cercapersone"
 
@@ -131,18 +131,10 @@ msgstr "Cercapersone"
 msgid "Contact"
 msgstr "Contatto"
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Questo non è un tuo contatto."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Questa card non è compatibile con il protocollo RFC."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Questa card non contiene una foto."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Aggiungi contatto"
diff --git a/l10n/it/gallery.po b/l10n/it/gallery.po
index 1e65c8e50ed..548843d3c52 100644
--- a/l10n/it/gallery.po
+++ b/l10n/it/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 15:26+0100\n"
-"PO-Revision-Date: 2012-01-15 17:13+0000\n"
-"Last-Translator: formalist <formalist@email.it>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,26 @@ msgstr ""
 msgid "Gallery"
 msgstr "Galleria"
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr "Rileggi"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index f4bcbf38d4e..c1c04905081 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-16 16:38+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgstr "Lingua modificata"
 
 #: personal.php:36 personal.php:37
 msgid "__language_name__"
-msgstr ""
+msgstr "Italiano"
 
 #: templates/admin.php:13
 msgid "Log level"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index e9ae1beecf7..94ba34dd101 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -61,66 +61,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "�れ�����電話帳���り��ん。"
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "連絡先を見��る事�����ん。"
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard�情報�誤り��り��。ページをリロード��下��。"
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "�所"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "電話番�"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "メールアドレス"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "所属"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "勤務先"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "�居"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "�帯電話"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "TTY TDD"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "音声番�"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "FAX"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "テレビ電話"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "�ケベル"
 
@@ -128,18 +128,10 @@ msgstr "�ケベル"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "����連絡先���り��ん。"
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "��カード�RFC�準拠�����ん。"
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "��カード�写真を�ん��り��ん。"
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "連絡先�追加"
diff --git a/l10n/ja_JP/gallery.po b/l10n/ja_JP/gallery.po
index d6ba590cba6..907b7af802e 100644
--- a/l10n/ja_JP/gallery.po
+++ b/l10n/ja_JP/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index 54489a11088..66e55595cf1 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/team/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,66 +62,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Dat do ass net däin Adressbuch."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Konnt den Kontakt net fannen."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon's Nummer"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Firma"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Aarbecht"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Doheem"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "GSM"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voice"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Pager"
 
@@ -129,18 +129,10 @@ msgstr "Pager"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Dat do ass net däin Kontakt."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Déi do Kaart ass net RFC kompatibel."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Déi do Kaart huet keng Foto."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Kontakt bäisetzen"
diff --git a/l10n/lb/gallery.po b/l10n/lb/gallery.po
index 6479414e17a..f8cf579161e 100644
--- a/l10n/lb/gallery.po
+++ b/l10n/lb/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/team/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index 1180c2251c5..6fd1c8fb819 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/team/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,66 +62,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Tai ne jūsų adresų knygelė."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Kontaktas nerastas"
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacija apie vCard yra neteisinga. "
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresas"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefonas"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "El. paštas"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Darbo"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Namų"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobilusis"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekstas"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Balso"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Faksas"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Vaizdo"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Pranešimų gaviklis"
 
@@ -129,18 +129,10 @@ msgstr "Pranešimų gaviklis"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Tai ne jūsų kontaktas"
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr ""
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr ""
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "PridÄ—ti kontaktÄ…"
diff --git a/l10n/lt_LT/gallery.po b/l10n/lt_LT/gallery.po
index 19ed976cf7a..f6e330988ee 100644
--- a/l10n/lt_LT/gallery.po
+++ b/l10n/lt_LT/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/team/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index 56ebea52bbb..e66eff907d1 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:49+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/team/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -61,66 +61,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr ""
 
@@ -128,18 +128,10 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr ""
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr ""
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr ""
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr ""
diff --git a/l10n/ms_MY/gallery.po b/l10n/ms_MY/gallery.po
index 2aa2b4a3905..c8773806484 100644
--- a/l10n/ms_MY/gallery.po
+++ b/l10n/ms_MY/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/team/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index 47e67f25b32..160d950186a 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/team/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -61,66 +61,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr ""
 
@@ -128,18 +128,10 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr ""
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr ""
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr ""
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr ""
diff --git a/l10n/nb_NO/gallery.po b/l10n/nb_NO/gallery.po
index b8cf83673a1..3a35c810f62 100644
--- a/l10n/nb_NO/gallery.po
+++ b/l10n/nb_NO/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/team/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index 12666934764..56c194dad88 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -64,66 +64,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Dit is niet uw adresboek."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Contact kon niet worden gevonden."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informatie over de vCard is onjuist. Herlaad de pagina."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organisatie"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Werk"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Thuis"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobiel"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Stem"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Pieper"
 
@@ -131,18 +131,10 @@ msgstr "Pieper"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Dit is niet uw contactpersoon."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Deze kaart is niet RFC compatibel."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Deze contact bevat geen foto."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Contact toevoegen"
diff --git a/l10n/nl/gallery.po b/l10n/nl/gallery.po
index 25d5097b363..5f6f14834e8 100644
--- a/l10n/nl/gallery.po
+++ b/l10n/nl/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index a52b7a06484..848d6de4c8f 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 #   <bart.formosus@gmail.com>, 2011.
-#   <icewind1991@gmail.com>, 2011.
+#   <icewind1991@gmail.com>, 2011, 2012.
 #   <koen@vervloesem.eu>, 2011.
 #   <pietje8501@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-16 16:36+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgstr "Taal aangepast"
 
 #: personal.php:36 personal.php:37
 msgid "__language_name__"
-msgstr ""
+msgstr "Nederlands"
 
 #: templates/admin.php:13
 msgid "Log level"
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index a5a29115d11..ec307dd8df3 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/team/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,66 +62,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Dette er ikkje di adressebok."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Fann ikkje kontakten."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefonnummer"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Epost"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Heime"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Tale"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Personsøkjar"
 
@@ -129,18 +129,10 @@ msgstr "Personsøkjar"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Dette er ikkje din kontakt."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Dette kortet er ikkje RFC-kompatibelt"
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Dette kortet har ingen bilete."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Legg til kontakt"
diff --git a/l10n/nn_NO/gallery.po b/l10n/nn_NO/gallery.po
index a0aca6b59dc..f8be7e51655 100644
--- a/l10n/nn_NO/gallery.po
+++ b/l10n/nn_NO/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/team/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index 15faa87da87..c5b3e4afc76 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 14:05+0000\n"
-"Last-Translator: Bartek <bart.p.pl@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +35,7 @@ msgstr "Nie można dodać pustego elementu"
 msgid "At least one of the address fields has to be filled out."
 msgstr "Przynajmniej jedno pole adresu musi być wypełnione"
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr "BÅ‚Ä…d podczas dodawania elementu"
 
@@ -63,66 +63,66 @@ msgstr "Błąd podczas aktualizacji książki"
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "To nie jest twoja książka adresowa."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Kontakt nie znaleziony."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizacja"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Praca"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Dom"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Komórka"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Połączenie głosowe"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Połączenie wideo"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Pager"
 
@@ -130,18 +130,10 @@ msgstr "Pager"
 msgid "Contact"
 msgstr "Kontakt"
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "To nie jest twój kontakt."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Ta karta nie jest zgodna ze specyfikacjÄ… RFC."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Ta karta nie zawiera zdjęć."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
diff --git a/l10n/pl/gallery.po b/l10n/pl/gallery.po
index 2beaf9b81ef..0998336354e 100644
--- a/l10n/pl/gallery.po
+++ b/l10n/pl/gallery.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Bartek  <bart.p.pl@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,14 +20,34 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
+msgstr "Galeria"
+
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
 msgstr ""
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Przeskanuj"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Wróć"
 
 
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 22ec18316b8..4f0569f0332 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <icewind1991@gmail.com>, 2012.
 # Kamil Domański <kdomanski@kdemail.net>, 2011.
 # Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 # Marcin Małecki <mosslar@gmail.com>, 2011.
@@ -11,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-16 18:46+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +40,7 @@ msgstr "Język zmieniony"
 
 #: personal.php:36 personal.php:37
 msgid "__language_name__"
-msgstr ""
+msgstr "Polski"
 
 #: templates/admin.php:13
 msgid "Log level"
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index 6872b053b84..4d172ea0110 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:49+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,66 +62,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Este não é o seu agenda de endereços."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Contato não pôde ser encontrado."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informações sobre vCard é incorreta. Por favor, recarregue a página."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Endereço"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefone"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organização"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Trabalho"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Home"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Móvel"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Pager"
 
@@ -129,18 +129,10 @@ msgstr "Pager"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Este não é o seu contato."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Este cartão não é compatível com RFC."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Este cartão não contém uma foto."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Adicionar Contato"
diff --git a/l10n/pt_BR/gallery.po b/l10n/pt_BR/gallery.po
index 0d4da064608..779ec19b932 100644
--- a/l10n/pt_BR/gallery.po
+++ b/l10n/pt_BR/gallery.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index e29627a2db4..c10cf84d371 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/team/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,67 +62,67 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Esta não é a sua lista de contactos"
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "O contacto não foi encontrado"
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 "A informação sobre o vCard está incorreta. Por favor refresque a página"
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Morada"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefone"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organização"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Trabalho"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Telemovel"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Pager"
 
@@ -130,18 +130,10 @@ msgstr "Pager"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Este não é o seu contacto"
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Este cartão não é compativel com RFC"
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Este cartão não possui foto"
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Adicionar Contacto"
diff --git a/l10n/pt_PT/gallery.po b/l10n/pt_PT/gallery.po
index 19f5d97278c..4db4c8ab61d 100644
--- a/l10n/pt_PT/gallery.po
+++ b/l10n/pt_PT/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/team/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index 6d7ec2c5c2f..d849b4bd444 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,66 +62,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Nu se găsește în agendă."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Contactul nu a putut fi găsit."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informațiile despre vCard sunt incorecte. Reîncărcați pagina."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresă"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizație"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Servici"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Acasă"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Pager"
 
@@ -129,18 +129,10 @@ msgstr "Pager"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Nu este contactul tău"
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Nu este compatibil RFC"
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Nu conține o fotografie"
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Adaugă contact"
diff --git a/l10n/ro/gallery.po b/l10n/ro/gallery.po
index decdaf40924..abadcf580cc 100644
--- a/l10n/ro/gallery.po
+++ b/l10n/ro/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index 9dad5b14158..4a1f7d836e8 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:49+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,66 +62,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Это не ваша адре�на� книга."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Контакт не найден."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Информаци� о vCard некорректна. Пожалуй�та, обновите �траницу."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "�дре�"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Ящик �л. почты"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Организаци�"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Рабочий"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Домашний"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Тек�т"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Голо�"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Фак�"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Пейджер"
 
@@ -129,18 +129,10 @@ msgstr "Пейджер"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Это не контакт."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Эта карточка не �оответ�твует RFC."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Эта карточка не �одержит фотографии."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Добавить Контакт"
diff --git a/l10n/ru/gallery.po b/l10n/ru/gallery.po
index edfc8f026a3..fe42f28fae6 100644
--- a/l10n/ru/gallery.po
+++ b/l10n/ru/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/sk_SK/calendar.po b/l10n/sk_SK/calendar.po
index 4f64b09a236..96bbf6720ad 100644
--- a/l10n/sk_SK/calendar.po
+++ b/l10n/sk_SK/calendar.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <intense.feel@gmail.com>, 2011.
+#   <intense.feel@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-16 21:38+0000\n"
+"Last-Translator: intense <intense.feel@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ajax/guesstimezone.php:42
 msgid "New Timezone:"
-msgstr ""
+msgstr "Nová �asová zóna:"
 
 #: ajax/settimezone.php:22
 msgid "Timezone changed"
@@ -30,7 +30,7 @@ msgstr "Časové pásmo zmenené"
 msgid "Invalid request"
 msgstr "Neplatná požiadavka"
 
-#: appinfo/app.php:20 templates/calendar.php:13
+#: appinfo/app.php:20 templates/calendar.php:14
 #: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Kalendár"
@@ -129,15 +129,15 @@ msgstr "Ro�ne"
 
 #: lib/object.php:366
 msgid "never"
-msgstr ""
+msgstr "nikdy"
 
 #: lib/object.php:367
 msgid "by occurrences"
-msgstr ""
+msgstr "podľa výskytu"
 
 #: lib/object.php:368
 msgid "by date"
-msgstr ""
+msgstr "podľa dátumu"
 
 #: lib/object.php:375
 msgid "by monthday"
@@ -149,31 +149,31 @@ msgstr ""
 
 #: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr ""
+msgstr "Pondelok"
 
 #: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr ""
+msgstr "Utorok"
 
 #: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr ""
+msgstr "Streda"
 
 #: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr ""
+msgstr "Å tvrtok"
 
 #: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr ""
+msgstr "Piatok"
 
 #: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr ""
+msgstr "Sobota"
 
 #: lib/object.php:389 templates/lAfix.php:2
 msgid "Sunday"
-msgstr ""
+msgstr "Nedeľa"
 
 #: lib/object.php:396
 msgid "events week of month"
@@ -181,79 +181,79 @@ msgstr ""
 
 #: lib/object.php:397
 msgid "first"
-msgstr ""
+msgstr "prvý"
 
 #: lib/object.php:398
 msgid "second"
-msgstr ""
+msgstr "druhý"
 
 #: lib/object.php:399
 msgid "third"
-msgstr ""
+msgstr "tretí"
 
 #: lib/object.php:400
 msgid "fourth"
-msgstr ""
+msgstr "štvrtý"
 
 #: lib/object.php:401
 msgid "fifth"
-msgstr ""
+msgstr "piaty"
 
 #: lib/object.php:402
 msgid "last"
-msgstr ""
+msgstr "posledný"
 
 #: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr ""
+msgstr "Január"
 
 #: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr ""
+msgstr "Február"
 
 #: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr ""
+msgstr "Marec"
 
 #: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr ""
+msgstr "Apríl"
 
 #: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr ""
+msgstr "Máj"
 
 #: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr ""
+msgstr "Jún"
 
 #: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr ""
+msgstr "Júl"
 
 #: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr ""
+msgstr "August"
 
 #: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr ""
+msgstr "Október"
 
 #: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #: lib/object.php:441
 msgid "by events date"
-msgstr ""
+msgstr "podľa dátumu udalosti"
 
 #: lib/object.php:442
 msgid "by yearday(s)"
@@ -265,7 +265,7 @@ msgstr ""
 
 #: lib/object.php:444
 msgid "by day and month"
-msgstr ""
+msgstr "podľa dňa a mesiaca"
 
 #: lib/object.php:467
 msgid "Not an array"
@@ -273,7 +273,7 @@ msgstr "Nie je pole"
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
-msgstr ""
+msgstr "Dátum"
 
 #: lib/search.php:40
 msgid "Cal."
@@ -283,146 +283,146 @@ msgstr ""
 msgid "All day"
 msgstr "Celý deň"
 
-#: templates/calendar.php:11
+#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Nový kalendár"
+
+#: templates/calendar.php:12
 msgid "Missing fields"
 msgstr "Nevyplnené položky"
 
-#: templates/calendar.php:12 templates/part.eventform.php:3
+#: templates/calendar.php:13 templates/part.eventform.php:3
 msgid "Title"
 msgstr "Nadpis"
 
-#: templates/calendar.php:14
+#: templates/calendar.php:15
 msgid "From Date"
 msgstr "Od Dátumu"
 
-#: templates/calendar.php:15
+#: templates/calendar.php:16
 msgid "From Time"
 msgstr "Od ÄŒasu"
 
-#: templates/calendar.php:16
+#: templates/calendar.php:17
 msgid "To Date"
 msgstr "Do Dátumu"
 
-#: templates/calendar.php:17
+#: templates/calendar.php:18
 msgid "To Time"
 msgstr "Do ÄŒasu"
 
-#: templates/calendar.php:18
+#: templates/calendar.php:19
 msgid "The event ends before it starts"
 msgstr "Udalosť kon�í ešte pred tým než za�ne"
 
-#: templates/calendar.php:19
+#: templates/calendar.php:20
 msgid "There was a database fail"
 msgstr "Nastala chyba databázy"
 
-#: templates/calendar.php:52
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Týždeň"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Mesiac"
 
-#: templates/calendar.php:54
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Zoznam"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:46
 msgid "Today"
 msgstr "Dnes"
 
-#: templates/calendar.php:60
+#: templates/calendar.php:47
 msgid "Calendars"
 msgstr "Kalendáre"
 
-#: templates/calendar.php:78
+#: templates/calendar.php:65
 msgid "There was a fail, while parsing the file."
 msgstr "Nastala chyba po�as parsovania súboru."
 
 #: templates/lAfix.php:9
 msgid "Sun."
-msgstr ""
+msgstr "Ned."
 
 #: templates/lAfix.php:10
 msgid "Mon."
-msgstr ""
+msgstr "Pon."
 
 #: templates/lAfix.php:11
 msgid "Tue."
-msgstr ""
+msgstr "Ut."
 
 #: templates/lAfix.php:12
 msgid "Wed."
-msgstr ""
+msgstr "Str."
 
 #: templates/lAfix.php:13
 msgid "Thu."
-msgstr ""
+msgstr "Å tv."
 
 #: templates/lAfix.php:14
 msgid "Fri."
-msgstr ""
+msgstr "Pia."
 
 #: templates/lAfix.php:15
 msgid "Sat."
-msgstr ""
+msgstr "So."
 
 #: templates/lAfix.php:28
 msgid "Jan."
-msgstr ""
+msgstr "Jan."
 
 #: templates/lAfix.php:29
 msgid "Feb."
-msgstr ""
+msgstr "Feb."
 
 #: templates/lAfix.php:30
 msgid "Mar."
-msgstr ""
+msgstr "Mar."
 
 #: templates/lAfix.php:31
 msgid "Apr."
-msgstr ""
+msgstr "Apr."
 
 #: templates/lAfix.php:32
 msgid "May."
-msgstr ""
+msgstr "Máj"
 
 #: templates/lAfix.php:33
 msgid "Jun."
-msgstr ""
+msgstr "Jún"
 
 #: templates/lAfix.php:34
 msgid "Jul."
-msgstr ""
+msgstr "Júl"
 
 #: templates/lAfix.php:35
 msgid "Aug."
-msgstr ""
+msgstr "Aug."
 
 #: templates/lAfix.php:36
 msgid "Sep."
-msgstr ""
+msgstr "Sep."
 
 #: templates/lAfix.php:37
 msgid "Oct."
-msgstr ""
+msgstr "Okt."
 
 #: templates/lAfix.php:38
 msgid "Nov."
-msgstr ""
+msgstr "Nov."
 
 #: templates/lAfix.php:39
 msgid "Dec."
-msgstr ""
+msgstr "Dec."
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Zvoľte aktívne kalendáre"
 
-#: templates/part.choosecalendar.php:15
-msgid "New Calendar"
-msgstr "Nový kalendár"
-
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
@@ -516,7 +516,7 @@ msgstr "Opakovať"
 
 #: templates/part.eventform.php:68
 msgid "Advanced"
-msgstr ""
+msgstr "Pokro�ilé"
 
 #: templates/part.eventform.php:112
 msgid "Select weekdays"
@@ -524,7 +524,7 @@ msgstr ""
 
 #: templates/part.eventform.php:125 templates/part.eventform.php:138
 msgid "Select days"
-msgstr ""
+msgstr "Vybrať dni"
 
 #: templates/part.eventform.php:130
 msgid "and the events day of year."
@@ -536,11 +536,11 @@ msgstr ""
 
 #: templates/part.eventform.php:151
 msgid "Select months"
-msgstr ""
+msgstr "Vybrať mesiace"
 
 #: templates/part.eventform.php:164
 msgid "Select weeks"
-msgstr ""
+msgstr "Vybrať týždne"
 
 #: templates/part.eventform.php:169
 msgid "and the events week of year."
@@ -548,15 +548,15 @@ msgstr ""
 
 #: templates/part.eventform.php:175
 msgid "Interval"
-msgstr ""
+msgstr "Interval"
 
 #: templates/part.eventform.php:181
 msgid "End"
-msgstr ""
+msgstr "Koniec"
 
 #: templates/part.eventform.php:193
 msgid "occurrences"
-msgstr ""
+msgstr "výskyty"
 
 #: templates/part.eventform.php:208
 msgid "Location"
@@ -576,7 +576,7 @@ msgstr "Popis Udalosti"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Importovať súbor kalendára"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -584,11 +584,11 @@ msgstr "Prosím zvoľte kalendár"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "vytvoriť nový kalendár"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Meno nového kalendára"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -596,15 +596,15 @@ msgstr "Importovať"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Importujem kalendár"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Kalendár úspešne importovaný"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Zatvoriť Dialóg"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index a24a03a3c1f..d98210cfa3f 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <intense.feel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +20,11 @@ msgstr ""
 
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "Chyba (de)aktivácie adresára."
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "Vyskytla sa chyba pri pridávaní kontaktu."
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
@@ -33,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -43,7 +44,7 @@ msgstr ""
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Chyba aktivovania adresára."
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
@@ -55,102 +56,94 @@ msgstr ""
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Chyba aktualizácie adresára."
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Kontakty"
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Toto nie je váš adresár."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Kontakt nebol nájdený."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informácie o vCard sú neplatné. Prosím obnovte stránku."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefón"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizácia"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Práca"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Domov"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Odkazová schránka"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Pager"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Toto nie je váš kontakt."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Táto karta nie je kompatibilná s RFC."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Táto karta neobsahuje fotografiu."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Pridať Kontakt."
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "Adresáre"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "Adresár"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -160,7 +153,7 @@ msgstr "Meno"
 #: templates/part.details.php:79 templates/part.setpropertyform.php:10
 #: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
@@ -203,20 +196,20 @@ msgstr "Vytvoriť Kontakt."
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Zvoliť aktívny adresár"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "Nový adresár"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "CardDav odkaz"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "Stiahnuť"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -228,43 +221,43 @@ msgstr "Odstrániť"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Stiahnuť kontakt"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
-msgstr ""
+msgstr "Odstrániť kontakt"
 
 #: templates/part.details.php:34
 msgid "Add"
-msgstr ""
+msgstr "Pridať"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Nový Adresár"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Upraviť Adresár"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Zobrazené meno"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Aktívny"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Uložiť"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Odoslať"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušiť"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -272,7 +265,7 @@ msgstr "Narodeniny"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Uprednostňované"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -280,10 +273,10 @@ msgstr "Telefón"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
-msgstr ""
+msgstr "Aktualizovať"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "Synchroniza�ná adresa CardDAV:"
 
 
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 645e9a11f2a..fe5e4d2c92c 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <intense.feel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-16 21:09+0000\n"
+"Last-Translator: intense <intense.feel@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,19 +56,19 @@ msgstr "Maximálna veľkosť nahratia"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Nový"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "Textový súbor"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Prie�inok"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "Z webu"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/sk_SK/gallery.po b/l10n/sk_SK/gallery.po
index 25fdcd74040..9270dc25804 100644
--- a/l10n/sk_SK/gallery.po
+++ b/l10n/sk_SK/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 15:07+0000\n"
-"Last-Translator: intense <intense.feel@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,26 @@ msgstr ""
 msgid "Gallery"
 msgstr "Galéria"
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr "Znovu oskenovať"
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index a57a3548574..fb661130434 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/team/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,67 +62,67 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "To ni vaš adresar."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Kontakta ni bilo mogo�e najti."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 "Informacije o vVizitki (vCard) niso pravilne, Prosimo ponovno naložite okno."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Naslov"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Delo"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Doma"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobitel"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Glas- Voice"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Pager"
 
@@ -130,18 +130,10 @@ msgstr "Pager"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "To ni vaš kontakt"
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Ta karta ni RFC kopatibilna."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Ta karta ne vsebuje slike."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Dodaj Kontakt"
diff --git a/l10n/sl/gallery.po b/l10n/sl/gallery.po
index e4201f2eb23..ed5208a1ae7 100644
--- a/l10n/sl/gallery.po
+++ b/l10n/sl/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/team/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index e0ba581a210..32ce3cfac20 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 01:59+0000\n"
-"Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:49+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,66 +62,66 @@ msgstr ""
 msgid "Contacts"
 msgstr "Контакти"
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Ово није ваш адре�ар."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Контакт �е не може наћи."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Подаци о вКарти �у неи�правни. Поново учитајте �траницу."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "�дре�а"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Е-маил"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Организација"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "По�ао"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Кућа"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Мобилни"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Тек�т"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Гла�"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Фак�"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Пејџер"
 
@@ -129,18 +129,10 @@ msgstr "Пејџер"
 msgid "Contact"
 msgstr "Контакт"
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Ово није ваш контакт."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Ова карта није �агла�на �а РФЦ-ом."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Ова карта не �адржи фотографију."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Додај контакт"
diff --git a/l10n/sr/gallery.po b/l10n/sr/gallery.po
index b30e34c7237..4ffebad8d4a 100644
--- a/l10n/sr/gallery.po
+++ b/l10n/sr/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 01:56+0000\n"
-"Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,26 @@ msgstr ""
 msgid "Gallery"
 msgstr "Галерија"
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr "Претражи поново"
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index 6021f675d90..133eb13f2ba 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:49+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/team/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,66 +62,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Kontakt se ne može naći."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Podaci o vKarti su neispravni. Ponovo u�itajte stranicu."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobilni"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Glas"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Pejdžer"
 
@@ -129,18 +129,10 @@ msgstr "Pejdžer"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Ovo nije vaš kontakt."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Ova karta nije saglasna sa RFC-om."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Ova karta ne sadrži fotografiju."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
diff --git a/l10n/sr@latin/gallery.po b/l10n/sr@latin/gallery.po
index c0517c438fa..6d6f21685bf 100644
--- a/l10n/sr@latin/gallery.po
+++ b/l10n/sr@latin/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/team/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index a60e600c6d4..a12092dc130 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:49+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,66 +62,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Det här är inte din adressbok."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Kontakt kunde inte hittas."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Information om vCard är felaktigt. Vänligen ladda om sidan."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Arbete"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Hem"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Röst"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Personsökare"
 
@@ -129,18 +129,10 @@ msgstr "Personsökare"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Det här är inte din kontakt."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Detta kort är inte RFC-kompatibelt."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Detta kort innehåller inte något foto."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "Lägg till kontakt"
diff --git a/l10n/sv/gallery.po b/l10n/sv/gallery.po
index 623b3fe1aeb..cbd01482855 100644
--- a/l10n/sv/gallery.po
+++ b/l10n/sv/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index aeb0607e4a9..b364cf1b057 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:20 templates/calendar.php:13
+#: appinfo/app.php:20 templates/calendar.php:14
 #: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr ""
@@ -282,59 +282,63 @@ msgstr ""
 msgid "All day"
 msgstr ""
 
-#: templates/calendar.php:11
+#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr ""
+
+#: templates/calendar.php:12
 msgid "Missing fields"
 msgstr ""
 
-#: templates/calendar.php:12 templates/part.eventform.php:3
+#: templates/calendar.php:13 templates/part.eventform.php:3
 msgid "Title"
 msgstr ""
 
-#: templates/calendar.php:14
+#: templates/calendar.php:15
 msgid "From Date"
 msgstr ""
 
-#: templates/calendar.php:15
+#: templates/calendar.php:16
 msgid "From Time"
 msgstr ""
 
-#: templates/calendar.php:16
+#: templates/calendar.php:17
 msgid "To Date"
 msgstr ""
 
-#: templates/calendar.php:17
+#: templates/calendar.php:18
 msgid "To Time"
 msgstr ""
 
-#: templates/calendar.php:18
+#: templates/calendar.php:19
 msgid "The event ends before it starts"
 msgstr ""
 
-#: templates/calendar.php:19
+#: templates/calendar.php:20
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:52
+#: templates/calendar.php:38
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:53
+#: templates/calendar.php:39
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:54
+#: templates/calendar.php:40
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:59
+#: templates/calendar.php:46
 msgid "Today"
 msgstr ""
 
-#: templates/calendar.php:60
+#: templates/calendar.php:47
 msgid "Calendars"
 msgstr ""
 
-#: templates/calendar.php:78
+#: templates/calendar.php:65
 msgid "There was a fail, while parsing the file."
 msgstr ""
 
@@ -418,10 +422,6 @@ msgstr ""
 msgid "Choose active calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.php:15
-msgid "New Calendar"
-msgstr ""
-
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 3a63204b84c..c7d12bbf019 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,7 +33,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -61,66 +61,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr ""
 
@@ -128,18 +128,10 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr ""
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr ""
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr ""
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 61eafa21548..62e429ec5eb 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 097e5749953..86d9b34a670 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 3f50792c81b..f418fa7b3cb 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 9693dc4eee9..4a153f1971a 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 8c896ec83e7..4938623c765 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/calendar.po b/l10n/th_TH/calendar.po
new file mode 100644
index 00000000000..f51c2c89aff
--- /dev/null
+++ b/l10n/th_TH/calendar.po
@@ -0,0 +1,637 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 09:18+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywherer@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/team/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr "สร้างโซนเวลาใหม่:"
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr "โซนเวลาถู�เปลี่ยน�ล้ว"
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr "คำร้องขอไม่ถู�ต้อง"
+
+#: appinfo/app.php:20 templates/calendar.php:14
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr "ป�ิทิน"
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr "ป�ิทินไม่ถู�ต้อง"
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr "วันเ�ิด"
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr "ธุร�ิจ"
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr "โทรติดต่อ"
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr "ลู�ค้า"
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr "จัดส่ง"
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr "วันหยุด"
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr "ไอเดีย"
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr "�ารเดินทาง"
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr "งานเลี้ยง"
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr "นัดประชุม"
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr "อื่นๆ"
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr "ส่วนตัว"
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr "โครง�าร"
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr "คำถาม"
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr "งาน"
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr "ไม่ต้องทำซ้ำ"
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr "รายวัน"
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr "รายสัปดาห์"
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr "ทุ�วันหยุด"
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr "รายปั�ษ์"
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr "รายเดือน"
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr "รายปี"
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr "ตามวันที่"
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr "วันจันทร์"
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr "วันอังคาร"
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr "วันพุธ"
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr "วันพฤหัสบดี"
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr "วันศุ�ร์"
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr "วันเสาร์"
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr "วันอาทิตย์"
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr "สัปดาห์ที่มี�ิจ�รรมของเดือน"
+
+#: lib/object.php:397
+msgid "first"
+msgstr "ลำดับ�ร�"
+
+#: lib/object.php:398
+msgid "second"
+msgstr "ลำดับที่สอง"
+
+#: lib/object.php:399
+msgid "third"
+msgstr "ลำดับที่สาม"
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr "ลำดับที่สี่"
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr "ลำดับที่ห้า"
+
+#: lib/object.php:402
+msgid "last"
+msgstr "ลำดับสุดท้าย"
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr "ม�ราคม"
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr "�ุมภาพันธ์"
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr "มีนาคม"
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr "เมษายน"
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr "พฤษภาคม"
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr "มิถุนายน"
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr "�ร��าคม"
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr "สิงหาคม"
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr "�ันยายน"
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr "ตุลาคม"
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr "พฤศจิ�ายน"
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr "ธันวาคม"
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr "ตามวันที่จัด�ิจ�รรม"
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr "ของเมื่อวานนี้"
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr "ตามวัน�ละเดือน"
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr ""
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr "วันที่"
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr "ทั้งวัน"
+
+#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "สร้างป�ิทินใหม่"
+
+#: templates/calendar.php:12
+msgid "Missing fields"
+msgstr "ช่องฟิลด์เ�ิด�ารสู�หาย"
+
+#: templates/calendar.php:13 templates/part.eventform.php:3
+msgid "Title"
+msgstr "ชื่อ�ิจ�รรม"
+
+#: templates/calendar.php:15
+msgid "From Date"
+msgstr "จา�วันที่"
+
+#: templates/calendar.php:16
+msgid "From Time"
+msgstr "ตั้ง�ต่เวลา"
+
+#: templates/calendar.php:17
+msgid "To Date"
+msgstr "ถึงวันที่"
+
+#: templates/calendar.php:18
+msgid "To Time"
+msgstr "ถึงเวลา"
+
+#: templates/calendar.php:19
+msgid "The event ends before it starts"
+msgstr "วันที่สิ้นสุด�ิจ�รรมดัง�ล่าวอยู่�่อนวันเริ่มต้น"
+
+#: templates/calendar.php:20
+msgid "There was a database fail"
+msgstr "เ�ิดความล้มเหลว�ับ�านข้อมูล"
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr "สัปดาห์"
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr "เดือน"
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr "ราย�าร"
+
+#: templates/calendar.php:46
+msgid "Today"
+msgstr "วันนี้"
+
+#: templates/calendar.php:47
+msgid "Calendars"
+msgstr "ป�ิทิน"
+
+#: templates/calendar.php:65
+msgid "There was a fail, while parsing the file."
+msgstr "เ�ิดความล้มเหลวใน�าร�ย�ไฟล์"
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr "อา."
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr "จ."
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr "อ."
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr "พ."
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr "พฤ."
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr "ศ."
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr "ส."
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr "ม.ค."
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr "�.พ."
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr "มี.ค."
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr "เม.ย."
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr "พ.ค."
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr "มิ.ย."
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr "�.ค."
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr "ส.ค."
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr "�.ย."
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr "ต.ค."
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr "พ.ย."
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr "ธ.ค."
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr "เลือ�ป�ิทินที่ต้อง�ารใช้งาน"
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr "ดาวน์โหลด"
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr "��้ไข"
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "ลบ"
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr "สร้างป�ิทินใหม่"
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr "��้ไขป�ิทิน"
+
+#: templates/part.editcalendar.php:12
+msgid "Displayname"
+msgstr "ชื่อที่ต้อง�ารให้�สดง"
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr "ใช้งาน"
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr "สีของป�ิทิน"
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "บันทึ�"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "ส่งข้อมูล"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr "ย�เลิ�"
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr "��้ไข�ิจ�รรม"
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "ส่งออ�ข้อมูล"
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr "ชื่อของ�ิจ�รรม"
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr "หมวดหมู่"
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr "เลือ�หมวดหมู่"
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr "เป็น�ิจ�รรมตลอดทั้งวัน"
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr "จา�"
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr "ถึง"
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr "ตัวเลือ�ขั้นสูง"
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr "ทำซ้ำ"
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr "ขั้นสูง"
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr "เลือ�วัน"
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr "เลือ�เดือน"
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr "เลือ�สัปดาห์"
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr "สิ้นสุด"
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr "สถานที่"
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr "สถานที่จัด�ิจ�รรม"
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr "คำอธิบาย"
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr "คำอธิบายเ�ี่ยว�ับ�ิจ�รรม"
+
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr "นำเข้าไฟล์ป�ิทิน"
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr "�รณาเลือ�ป�ิทิน"
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr "สร้างป�ิทินใหม่"
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr "ชื่อของป�ิทิน"
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr "นำเข้าข้อมูล"
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr "นำเข้าข้อมูลป�ิทิน"
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr "ป�ิทินถู�นำเข้าข้อมูลเรียบร้อย�ล้ว"
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr "ปิด�ล่องข้อความโต้ตอบ"
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr "สร้าง�ิจ�รรมใหม่"
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr "โซนเวลา"
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr "ตรวจสอบ�ารเปลี่ยน�ปลงโซนเวลาอยู่เสมอ"
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr "รูป�บบ�าร�สดงเวลา"
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr "24 ช.ม."
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr "12 ช.ม."
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr ""
+
+
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
new file mode 100644
index 00000000000..781dc3b586f
--- /dev/null
+++ b/l10n/th_TH/contacts.po
@@ -0,0 +1,282 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/team/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr "เ�ิดข้อผิดพลาดใน (ย�เลิ�)�ารเปิดใช้งานสมุดบันทึ�ที่อยู่"
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr "เ�ิดข้อผิดพลาดใน�ารเพิ่มรายชื่อผู้ติดต่อใหม่"
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr "ไม่สามารถเพิ่มรายละเอียดที่ไม่มีข้อมูลได้"
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr "อย่างน้อยที่สุดช่องข้อมูลที่อยู่จะต้องถู��รอ�ลงไป"
+
+#: ajax/addproperty.php:78
+msgid "Error adding contact property."
+msgstr "เ�ิดข้อผิดพลาดใน�ารเพิ่มรายละเอียด�ารติดต่อ"
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr "เ�ิดข้อผิดพลาดใน�ารเพิ่มสมุดบันทึ�ที่อยู่ใหม่"
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr "เ�ิดข้อผิดพลาดใน�ารเปิดใช้งานสมุดบันทึ�ที่อยู่"
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr "เ�ิดข้อผิดพลาดใน�ารลบรายละเอียด�ารติดต่อ"
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr "เ�ิดข้อผิดพลาดใน�ารอัพเดทข้อมูล�ารติดต่อ"
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr "เ�ิดข้อผิดพลาดใน�ารอัพเดทสมุดบันทึ�ที่อยู่"
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr "ข้อมูล�ารติดต่อ"
+
+#: lib/app.php:52
+msgid "This is not your addressbook."
+msgstr "นี่ไม่ใช่สมุดบันทึ�ที่อยู่ของคุณ"
+
+#: lib/app.php:61 photo.php:36
+msgid "Contact could not be found."
+msgstr "ไม่พบข้อมูล�ารติดต่อ"
+
+#: lib/app.php:89
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr "ข้อมูลเ�ี่ยว�ับ vCard ไม่ถู�ต้อง �รุณาโหลดหน้าเวปใหม่อี�ครั้ง"
+
+#: lib/app.php:101 templates/part.addcardform.php:54
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr "ที่อยู่"
+
+#: lib/app.php:102 templates/part.addcardform.php:43
+msgid "Telephone"
+msgstr "โทรศัพท์"
+
+#: lib/app.php:103 templates/part.addcardform.php:37
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr "อีเมล์"
+
+#: lib/app.php:104 templates/part.addcardform.php:27
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr "หน่วยงาน"
+
+#: lib/app.php:116 lib/app.php:123
+msgid "Work"
+msgstr "ที่ทำงาน"
+
+#: lib/app.php:117 lib/app.php:121
+msgid "Home"
+msgstr "บ้าน"
+
+#: lib/app.php:122
+msgid "Mobile"
+msgstr "มือถือ"
+
+#: lib/app.php:124
+msgid "Text"
+msgstr "ข้อความ"
+
+#: lib/app.php:125
+msgid "Voice"
+msgstr "เสียงพูด"
+
+#: lib/app.php:126
+msgid "Fax"
+msgstr "โทรสาร"
+
+#: lib/app.php:127
+msgid "Video"
+msgstr "วีดีโอ"
+
+#: lib/app.php:128
+msgid "Pager"
+msgstr "เพจเจอร์"
+
+#: lib/search.php:22
+msgid "Contact"
+msgstr "ข้อมูล�ารติดต่อ"
+
+#: photo.php:42
+msgid "This is not your contact."
+msgstr "นี่ไม่ใช่ข้อมูล�ารติดต่อของคุณ"
+
+#: templates/index.php:6
+msgid "Add Contact"
+msgstr "เพิ่มรายชื่อผู้ติดต่อใหม่"
+
+#: templates/index.php:7
+msgid "Addressbooks"
+msgstr "สมุดบันทึ�ที่อยู่"
+
+#: templates/part.addcardform.php:8
+msgid "Addressbook"
+msgstr "สมุดบันทึ�ที่อยู่"
+
+#: templates/part.addcardform.php:21
+msgid "Name"
+msgstr "ชื่อ"
+
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr "ประเภท"
+
+#: templates/part.addcardform.php:65 templates/part.details.php:49
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr "ตู้ ปณ."
+
+#: templates/part.addcardform.php:72 templates/part.details.php:53
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr "เพิ่ม"
+
+#: templates/part.addcardform.php:78 templates/part.details.php:57
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr "ถนน"
+
+#: templates/part.addcardform.php:84 templates/part.details.php:61
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr "เมือง"
+
+#: templates/part.addcardform.php:90 templates/part.details.php:65
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr "ภูมิภาค"
+
+#: templates/part.addcardform.php:96 templates/part.details.php:69
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr "รหัสไปรษณีย์"
+
+#: templates/part.addcardform.php:102 templates/part.details.php:73
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr "ประเทศ"
+
+#: templates/part.addcardform.php:109
+msgid "Create Contact"
+msgstr "สร้างข้อมูล�ารติดต่อใหม่"
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr "เลือ�สมุดบันทึ�ข้อมูลติดต่อที่ต้อง�ารใช้งาน"
+
+#: templates/part.chooseaddressbook.php:16
+msgid "New Address Book"
+msgstr "สร้างสมุดบันทึ�ข้อมูล�ารติดต่อใหม่"
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr "ดาวน์โหลด"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr "��้ไข"
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr "ลบ"
+
+#: templates/part.details.php:3
+msgid "Download contact"
+msgstr "ดาวน์โหลดข้อมูล�ารติดต่อ"
+
+#: templates/part.details.php:4
+msgid "Delete contact"
+msgstr "ลบข้อมูล�ารติดต่อ"
+
+#: templates/part.details.php:34
+msgid "Add"
+msgstr "เพิ่ม"
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
+msgstr "สร้างสมุดบันทึ�ที่อยู่ใหม่"
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
+msgstr "��้ไขสมุดบันทึ�ที่อยู่"
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr "ชื่อที่ต้อง�ารให้�สดง"
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr "เปิดใช้"
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr "บันทึ�"
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr "ส่งข้อมูล"
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr "ย�เลิ�"
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr "วันเ�ิด"
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr "โทรศัพท์"
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr "อัพเดท"
+
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
+
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
new file mode 100644
index 00000000000..4a2a218de33
--- /dev/null
+++ b/l10n/th_TH/core.po
@@ -0,0 +1,171 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-16 19:32+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywherer@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/team/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr "เปลี่ยนรหัสผ่านใน Owncloud"
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}"
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "คุณจะได้รับลิงค์เพื่อ�ำหนดรหัสผ่านใหม่ทางอีเมล์"
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "ส่งคำร้องเรียบร้อย�ล้ว"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "ไม่สามารถเข้าสู่ระบบได้!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr "ชื่อผู้ใช้งาน"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "ขอเปลี่ยนรหัสใหม่"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "รหัสผ่านของคุณถู�เปลี่ยนเรียบร้อย�ล้ว"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr "ไปที่หน้าเข้าสู่ระบบ"
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "รหัสผ่านใหม่"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "เปลี่ยนรหัสผ่าน"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "ส่วนตัว"
+
+#: strings.php:6
+msgid "Users"
+msgstr "ผู้ใช้งาน"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "Apps"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "ผู้ดู�ลระบบ"
+
+#: strings.php:9
+msgid "Help"
+msgstr "ช่วยเหลือ"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "ไม่พบ Cloud"
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr "สร้าง <strong>บั�ชีผู้ดู�ลระบบ</strong>"
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr "รหัสผ่าน"
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr "ขั้นสูง"
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr "โฟลเดอร์เ�็บข้อมูล"
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr "�ำหนดค่า�านข้อมูล"
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr "จะถู�ใช้"
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr "ชื่อผู้ใช้งาน�านข้อมูล"
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr "รหัสผ่าน�านข้อมูล"
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr "ชื่อ�านข้อมูล"
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr "Database host"
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr "ติดตั้งเรียบร้อย�ล้ว"
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr "web services under your control"
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr "ออ�จา�ระบบ"
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr "ตั้งค่า"
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr "ลืมรหัสผ่าน?"
+
+#: templates/login.php:15
+msgid "remember"
+msgstr "จำรหัสผ่าน"
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr "เข้าสู่ระบบ"
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "คุณออ�จา�ระบบเรียบร้อย�ล้ว"
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "�่อนหน้า"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "ถัดไป"
+
+
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
new file mode 100644
index 00000000000..07c3357a301
--- /dev/null
+++ b/l10n/th_TH/files.po
@@ -0,0 +1,114 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-16 18:03+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywherer@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/team/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr "ไม่มีข้อผิดพลาดใดๆ ไฟล์ถู�อัพโหลดเรียบร้อย�ล้ว"
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+"ไฟล์ที่อัพโหลดมีขนาดเ�ินคำสั่ง upload_max_filesize ที่ระบุเอาไว้ในไฟล์ "
+"php.ini"
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+"ไฟล์ที่อัพโหลดมีขนาดเ�ินคำสั่ง MAX_FILE_SIZE "
+"ที่ระบุเอาไว้ในรูป�บบคำสั่งในภาษา HTML"
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr "ไฟล์ที่อัพโหลดยังไม่ได้ถู�อัพโหลดอย่างสมบูรณ์"
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr "ยังไม่มีไฟล์ที่ถู�อัพโหลด"
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr "�ฟ้มเอ�สารชั่วคราวเ�ิด�ารสู�หาย"
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr "ไฟล์"
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr "ขนาดไฟล์สูงสุดที่อัพโหลดได้"
+
+#: templates/index.php:7
+msgid "New"
+msgstr "อัพโหลดไฟล์ใหม่"
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr "ไฟล์ข้อความ"
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr "�ฟ้มเอ�สาร"
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr "จา�เวป"
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr "อัพโหลด"
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ �รุณาอัพโหลดไฟล์!"
+
+#: templates/index.php:43
+msgid "Name"
+msgstr "ชื่อ"
+
+#: templates/index.php:45
+msgid "Download"
+msgstr "ดาวน์โหลด"
+
+#: templates/index.php:49
+msgid "Size"
+msgstr "ขนาด"
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr "ปรับปรุงล่าสุด"
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr "ลบ"
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr "ไฟล์ที่อัพโหลดมีขนาดให�่เ�ินไป"
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+"ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเ�ิน�ว่าขนาดสูงสุดที่�ำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
+
+
diff --git a/l10n/th_TH/gallery.po b/l10n/th_TH/gallery.po
new file mode 100644
index 00000000000..485d27fc0e0
--- /dev/null
+++ b/l10n/th_TH/gallery.po
@@ -0,0 +1,53 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/team/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr "��ลอรี่"
+
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr "ตรวจสอบอี�ครั้ง"
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr "ย้อน�ลับ"
+
+
diff --git a/l10n/th_TH/media.po b/l10n/th_TH/media.po
new file mode 100644
index 00000000000..f486a4609ff
--- /dev/null
+++ b/l10n/th_TH/media.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-16 17:33+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywherer@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/team/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:32 templates/player.php:9
+msgid "Music"
+msgstr "เพลง"
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr "เล่น"
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr "หยุดชั่วคราว"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr "�่อนหน้า"
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr "ถัดไป"
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr "ปิดเสียง"
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr "เปิดเสียง"
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr "ตรวจสอบไฟล์ที่เ�็บไว้อี�ครั้ง"
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr "ศิลปิน"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "อัลบั้ม"
+
+#: templates/music.php:39
+msgid "Title"
+msgstr "ชื่อ"
+
+
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
new file mode 100644
index 00000000000..5444a4182f3
--- /dev/null
+++ b/l10n/th_TH/settings.po
@@ -0,0 +1,160 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
+#   <icewind1991@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-16 20:19+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/team/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr "อีเมล์ถู�เปลี่ยน�ล้ว"
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr "คำร้องขอไม่ถู�ต้อง"
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr "เปลี่ยนชื่อบั�ชี OpenID �ล้ว"
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr "เปลี่ยนภาษาเรียบร้อย�ล้ว"
+
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr "ภาษาไทย"
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr "ระดับ�ารเ�็บบันทึ� log"
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr "เพิ่ม�อพพลิเคชั่นของคุณ"
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr "เลือ� App"
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr "-ได้รับอนุ�าติ�ล้ว"
+
+#: templates/apps.php:23
+msgid "by"
+msgstr "โดย"
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr "สอบถามข้อมูล"
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr "เ�ิดปั�หาใน�ารเชื่อมต่อ�ับ�านข้อมูลช่วยเหลือ"
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr "ไปที่นั่นด้วยตนเอง"
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr "คำตอบ"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr "คุณใช้พื้นที่ไป"
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr "จา�จำนวนที่ใช้ได้"
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr "เปลี่ยนรหัสผ่านเรียบร้อย�ล้ว"
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้"
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr "รหัสผ่านปัจจุบัน"
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr "รหัสผ่านใหม่"
+
+#: templates/personal.php:17
+msgid "show"
+msgstr "�สดง"
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr "เปลี่ยนรหัสผ่าน"
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr "อีเมล์"
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr "ที่อยู่อีเมล์ของคุณ"
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr "�รอ�ที่อยู่อีเมล์ของคุณเพื่อเปิดให้มี�าร�ู้คืนรหัสผ่านได้"
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr "ภาษา"
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr "ช่วย�ัน�ปล"
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+"ใช้ที่อยู่นี้ใน�ารเชื่อมต่อ�ับบั�ชี ownCloud "
+"ของคุณในเครื่องมือจัด�ารไฟล์ของคุณ"
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr "ชื่อ"
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr "รหัสผ่าน"
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr "�ลุ่ม"
+
+#: templates/users.php:23
+msgid "Create"
+msgstr "สร้าง"
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr "พื้นที่"
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr "ลบ"
+
+
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index 68f1eb542f3..25ce26edea0 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/team/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,66 +62,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "Bu sizin adres defteriniz deÄŸil."
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "Kişi bulunamadı."
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin."
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "Eposta"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "Organizasyon"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "Ä°ÅŸ"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "Ev"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "Metin"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "Ses"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "Sayfalayıcı"
 
@@ -129,18 +129,10 @@ msgstr "Sayfalayıcı"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "Bu sizin kiÅŸiniz deÄŸil."
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "Bu kart RFC uyumlu deÄŸil."
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "Bu kart resim içermiyor."
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "KiÅŸi Ekle"
diff --git a/l10n/tr/gallery.po b/l10n/tr/gallery.po
index 7e1f517fbb7..13c1b9e6fe2 100644
--- a/l10n/tr/gallery.po
+++ b/l10n/tr/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/team/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index 99e69919079..6e0afb93e9d 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:49+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:77
+#: ajax/addproperty.php:78
 msgid "Error adding contact property."
 msgstr ""
 
@@ -62,66 +62,66 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: lib/app.php:42
+#: lib/app.php:52
 msgid "This is not your addressbook."
 msgstr "这�是您的地�簿。"
 
-#: lib/app.php:51 photo.php:34
+#: lib/app.php:61 photo.php:36
 msgid "Contact could not be found."
 msgstr "无法找到�系人。"
 
-#: lib/app.php:79
+#: lib/app.php:89
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard 的信��正确。请�新加载页�。"
 
-#: lib/app.php:91 templates/part.addcardform.php:54
+#: lib/app.php:101 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
 msgstr "地�"
 
-#: lib/app.php:92 templates/part.addcardform.php:43
+#: lib/app.php:102 templates/part.addcardform.php:43
 msgid "Telephone"
 msgstr "电�"
 
-#: lib/app.php:93 templates/part.addcardform.php:37
+#: lib/app.php:103 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
 msgstr "电�邮件"
 
-#: lib/app.php:94 templates/part.addcardform.php:27
+#: lib/app.php:104 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
 msgstr "组织"
 
-#: lib/app.php:106 lib/app.php:113
+#: lib/app.php:116 lib/app.php:123
 msgid "Work"
 msgstr "工作"
 
-#: lib/app.php:107 lib/app.php:111
+#: lib/app.php:117 lib/app.php:121
 msgid "Home"
 msgstr "家庭"
 
-#: lib/app.php:112
+#: lib/app.php:122
 msgid "Mobile"
 msgstr "移动电�"
 
-#: lib/app.php:114
+#: lib/app.php:124
 msgid "Text"
 msgstr "文本"
 
-#: lib/app.php:115
+#: lib/app.php:125
 msgid "Voice"
 msgstr "语音"
 
-#: lib/app.php:116
+#: lib/app.php:126
 msgid "Fax"
 msgstr "传真"
 
-#: lib/app.php:117
+#: lib/app.php:127
 msgid "Video"
 msgstr "视频"
 
-#: lib/app.php:118
+#: lib/app.php:128
 msgid "Pager"
 msgstr "传呼机"
 
@@ -129,18 +129,10 @@ msgstr "传呼机"
 msgid "Contact"
 msgstr ""
 
-#: photo.php:40
+#: photo.php:42
 msgid "This is not your contact."
 msgstr "这�是您的�系人。"
 
-#: photo.php:48
-msgid "This card is not RFC compatible."
-msgstr "这张�片和RFC 标准�兼容。"
-
-#: photo.php:85
-msgid "This card does not contain a photo."
-msgstr "这张�片�包�照片。"
-
 #: templates/index.php:6
 msgid "Add Contact"
 msgstr "添加�系人"
diff --git a/l10n/zh_CN/gallery.po b/l10n/zh_CN/gallery.po
index d791cd35906..2cde1e4312b 100644
--- a/l10n/zh_CN/gallery.po
+++ b/l10n/zh_CN/gallery.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 15:26+0100\n"
-"PO-Revision-Date: 2012-01-15 21:45+0000\n"
-"Last-Translator: Bartek <bart.p.pl@gmail.com>\n"
+"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,26 @@ msgstr ""
 msgid "Gallery"
 msgstr "画廊"
 
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:47 js/album_cover.js:56
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:77
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:90
+msgid "Input new gallery name"
+msgstr ""
+
+#: js/album_cover.js:105
+msgid "Album name can't be empty"
+msgstr ""
+
 #: templates/index.php:10
 msgid "Rescan"
 msgstr "�新扫�"
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index a65dc2fe9bd..7f4bb68dcfc 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "تم تغير العنوان البريدي",
 "Invalid request" => "طلبك غير م�هوم",
 "OpenID Changed" => "تم تغيير ال OpenID",
 "Language changed" => "تم تغيير اللغة",
+"Log level" => "مستوى المراقبه",
 "Add your application" => "أض� تطبيقاتك",
 "Select an App" => "إختر تطبيقاً",
 "-licensed" => "-مسجل",
@@ -18,11 +20,16 @@
 "New password" => "كلمات سر جديدة",
 "show" => "أظهر",
 "Change password" => "عدل كلمة السر",
+"Email" => "العنوان البريدي",
+"Your email address" => "عنوانك البريدي",
+"Fill in an email address to enable password recovery" => "أدخل عنوانك البريدي لت�عيل استرجاع كلمة المرور",
 "Language" => "اللغة",
+"Help translate" => "ساعد �ي الترجمه",
 "use this address to connect to your ownCloud in your file manager" => "إستخدم هذا العنوان للإتصال ب ownCloud داخل نظام المل�ات ",
 "Name" => "الاسم",
 "Password" => "كلمات السر",
 "Groups" => "مجموعات",
 "Create" => "انشئ",
+"Quota" => "حصه",
 "Delete" => "حذ�"
 );
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 43d1b8ba1fd..5221bdb4894 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -3,6 +3,7 @@
 "Invalid request" => "Sol.licitud no vàlida",
 "OpenID Changed" => "OpenID ha canviat",
 "Language changed" => "S'ha canviat l'idioma",
+"__language_name__" => "Català",
 "Log level" => "Nivell de registres",
 "Add your application" => "Afegir una aplicació",
 "Select an App" => "Seleccioneu una aplicació",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index cb1f4bd0817..0772b0aef6f 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -3,6 +3,8 @@
 "Invalid request" => "Ungültige Anfrage",
 "OpenID Changed" => "OpenID geändert",
 "Language changed" => "Sprache geändert",
+"__language_name__" => "Deutsch",
+"Log level" => "Log Level",
 "Add your application" => "Eigene Anwendung hinzufügen",
 "Select an App" => "Wähle eine Anwendung aus",
 "-licensed" => "-lizenziert",
@@ -13,7 +15,7 @@
 "Answer" => "Antwort",
 "You use" => "Du nutzt",
 "of the available" => "der verfügbaren",
-"Your password got changed" => "Dein Passwort wurde geändert",
+"Your password got changed" => "Dein Passwort wurde geändert.",
 "Unable to change your password" => "Passwort konnte nicht geändert werden",
 "Current password" => "Aktuelles Passwort",
 "New password" => "Neues Passwort",
@@ -21,13 +23,14 @@
 "Change password" => "Passwort ändern",
 "Email" => "E-Mail",
 "Your email address" => "Ihre E-Mail Adresse",
-"Fill in an email address to enable password recovery" => "Tragen Sie eine E-Mail Adresse ein, um die Passwort-Wiederherstellung zu aktivieren",
+"Fill in an email address to enable password recovery" => "Trage eine E-Mail Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
 "Language" => "Sprache",
-"Help translate" => "Helfen Sie bei der Ãœbersetzung",
-"use this address to connect to your ownCloud in your file manager" => "benutze diese Adresse, um deine ownCloud mit deinem Dateiverwalter zu verbinden",
+"Help translate" => "Hilf bei der Ãœbersetzung!",
+"use this address to connect to your ownCloud in your file manager" => "Benutze diese Adresse, um deine ownCloud mit deinem Dateiverwalter zu verbinden.",
 "Name" => "Name",
 "Password" => "Passwort",
 "Groups" => "Gruppen",
 "Create" => "Anlegen",
+"Quota" => "Quota",
 "Delete" => "Löschen"
 );
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 0c55f462ba3..71659edaad7 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -3,6 +3,7 @@
 "Invalid request" => "Solicitud no válida",
 "OpenID Changed" => "OpenID Cambiado",
 "Language changed" => "Idioma cambiado",
+"__language_name__" => "Español",
 "Log level" => "Nivel de log",
 "Add your application" => "Añadir tu aplicación",
 "Select an App" => "Seleccionar una aplicación",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index c01c8400ca8..97a2887f70a 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,7 +1,10 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "e-posti on muudetud",
 "Invalid request" => "Vigane päring",
 "OpenID Changed" => "OpenID on muudetud",
 "Language changed" => "Keel on muudetud",
+"__language_name__" => "Eesti",
+"Log level" => "Logi tase",
 "Add your application" => "Lisa oma programm",
 "Select an App" => "Vali programm",
 "-licensed" => "-litsenseeritud",
@@ -18,11 +21,16 @@
 "New password" => "Uus parool",
 "show" => "näita",
 "Change password" => "Muuda parooli",
+"Email" => "E-post",
+"Your email address" => "Sinu e-posti aadress",
+"Fill in an email address to enable password recovery" => "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress",
 "Language" => "Keel",
+"Help translate" => "Aita tõlkida",
 "use this address to connect to your ownCloud in your file manager" => "kasuta seda aadressi oma ownCloudiga ühendamiseks failihalduriga",
 "Name" => "Nimi",
 "Password" => "Parool",
 "Groups" => "Grupid",
 "Create" => "Lisa",
+"Quota" => "Mahupiir",
 "Delete" => "Kustuta"
 );
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 43fbc22085b..27b8f7fc3c2 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -3,6 +3,7 @@
 "Invalid request" => "Petición non correcta",
 "OpenID Changed" => "Mudou o OpenID",
 "Language changed" => "O idioma mudou",
+"__language_name__" => "Galego",
 "Log level" => "Nivel de rexistro",
 "Add your application" => "Engada o seu aplicativo",
 "Select an App" => "Escolla un Aplicativo",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 41cb6ea9625..c27f7ed5974 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -3,6 +3,7 @@
 "Invalid request" => "Richiesta non valida",
 "OpenID Changed" => "OpenID Modificato",
 "Language changed" => "Lingua modificata",
+"__language_name__" => "Italiano",
 "Log level" => "Livello di log",
 "Add your application" => "Aggiungi un applicazione",
 "Select an App" => "Seleziona un applicazione",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 34af604ecef..3f75d3f1490 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -3,6 +3,7 @@
 "Invalid request" => "Ongeldig verzoek",
 "OpenID Changed" => "OpenID is aangepast",
 "Language changed" => "Taal aangepast",
+"__language_name__" => "Nederlands",
 "Log level" => "Logniveau",
 "Add your application" => "Voeg uw applicatie toe",
 "Select an App" => "Selecteer een app",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 88e51a0706b..63341156496 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -3,6 +3,7 @@
 "Invalid request" => "Nieprawidłowe żądanie",
 "OpenID Changed" => "Zmieniono OpenID",
 "Language changed" => "Język zmieniony",
+"__language_name__" => "Polski",
 "Log level" => "Poziom logowania",
 "Add your application" => "Dodaj własną aplikacje",
 "Select an App" => "Zaznacz aplikacje",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
new file mode 100644
index 00000000000..ed706ae93ad
--- /dev/null
+++ b/settings/l10n/th_TH.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"email Changed" => "อีเมล์ถู�เปลี่ยน�ล้ว",
+"Invalid request" => "คำร้องขอไม่ถู�ต้อง",
+"OpenID Changed" => "เปลี่ยนชื่อบั�ชี OpenID �ล้ว",
+"Language changed" => "เปลี่ยนภาษาเรียบร้อย�ล้ว",
+"__language_name__" => "ภาษาไทย",
+"Log level" => "ระดับ�ารเ�็บบันทึ� log",
+"Add your application" => "เพิ่ม�อพพลิเคชั่นของคุณ",
+"Select an App" => "เลือ� App",
+"-licensed" => "-ได้รับอนุ�าติ�ล้ว",
+"by" => "โดย",
+"Ask a question" => "สอบถามข้อมูล",
+"Problems connecting to help database." => "เ�ิดปั�หาใน�ารเชื่อมต่อ�ับ�านข้อมูลช่วยเหลือ",
+"Go there manually." => "ไปที่นั่นด้วยตนเอง",
+"Answer" => "คำตอบ",
+"You use" => "คุณใช้พื้นที่ไป",
+"of the available" => "จา�จำนวนที่ใช้ได้",
+"Your password got changed" => "เปลี่ยนรหัสผ่านเรียบร้อย�ล้ว",
+"Unable to change your password" => "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้",
+"Current password" => "รหัสผ่านปัจจุบัน",
+"New password" => "รหัสผ่านใหม่",
+"show" => "�สดง",
+"Change password" => "เปลี่ยนรหัสผ่าน",
+"Email" => "อีเมล์",
+"Your email address" => "ที่อยู่อีเมล์ของคุณ",
+"Fill in an email address to enable password recovery" => "�รอ�ที่อยู่อีเมล์ของคุณเพื่อเปิดให้มี�าร�ู้คืนรหัสผ่านได้",
+"Language" => "ภาษา",
+"Help translate" => "ช่วย�ัน�ปล",
+"use this address to connect to your ownCloud in your file manager" => "ใช้ที่อยู่นี้ใน�ารเชื่อมต่อ�ับบั�ชี ownCloud ของคุณในเครื่องมือจัด�ารไฟล์ของคุณ",
+"Name" => "ชื่อ",
+"Password" => "รหัสผ่าน",
+"Groups" => "�ลุ่ม",
+"Create" => "สร้าง",
+"Quota" => "พื้นที่",
+"Delete" => "ลบ"
+);
-- 
GitLab


From 9dcdf517f5ac9230564cce7c46b14ed8bf4f7523 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jan 2012 19:26:09 +0100
Subject: [PATCH 328/546] fix deleting/renaming albums with a ' in the name

---
 apps/gallery/css/styles.css    | 17 +++++++++--------
 apps/gallery/js/album_cover.js |  6 +++---
 apps/gallery/js/albums.js      | 30 ++++++++++++++++++------------
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index 4ada23b0b06..a0822ddec1e 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -1,11 +1,12 @@
 div#gallery_list { margin: 90pt 20pt; }
-div#gallery_list.leftcontent { padding-top: 15pt; margin: 0; position: absolute; bottom:0px; text-align: center; overflow: scroll; }
-div#gallery_album_box { width: 200px; text-align: center; border: 0; display: inline-block; margin: 5pt; vertical-align: top; padding: 10px; position: relative; overflow: hidden; color: #999; }
-div#gallery_album_box:hover { color: black; }
-.leftcontent div#gallery_album_box { margin: 5px; }
-div#gallery_album_box h1 { font-size: 9pt; font-family: Verdana; }
-div#gallery_album_cover { width: 199px; height: 199px; border: solid 1pt #999; padding: 0; }
-div#gallery_control_overlay { border: 0; position:absolute; right: 10pt; background-color: #333; opacity: 0.5; visibility:hidden; padding: 0 5pt; }
-div#gallery_control_overlay a { color:white; }
+div.gallery_list.leftcontent { padding-top: 15pt; margin: 0; position: absolute; bottom:0px; text-align: center; overflow: scroll; }
+div.gallery_album_box { width: 200px; text-align: center; border: 0; display: inline-block; margin: 5pt; vertical-align: top; padding: 10px; position: relative; overflow: hidden; color: #999; }
+div.gallery_album_box:hover { color: black; }
+.leftcontent div.gallery_album_box { margin: 5px; }
+div.gallery_album_box h1 { font-size: 9pt; font-family: Verdana; }
+div.gallery_album_cover { width: 199px; height: 199px; border: solid 1pt #999; padding: 0; }
+div.gallery_control_overlay { border: 0; position:absolute; right: 10pt; background-color: #333; opacity: 0; padding: 0 5pt; }
+div.gallery_album_box:hover div.gallery_control_overlay { opacity:0.5 }
+div.gallery_control_overlay a { color:white; }
 #gallery_images.rightcontent { padding:10px 5px; position:absolute; bottom: 0px; overflow: scroll; }
 
diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index 38b5815775c..0e791689a1a 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -77,8 +77,8 @@ function galleryRemove(albumName) {
   if (confirm(t('gallery',"Do you wan't to remove album")+' ' + albumName + "?")) {
 	$.getJSON("ajax/galleryOp.php", {operation: "remove", name: albumName}, function(r) {
 	  if (r.status == "success") {
-      $("#gallery_album_box[title='"+albumName+"']").remove();
-      Albums.remove(albumName);
+		$(".gallery_album_box").filterAttr('data-album',albumName).remove();
+		Albums.remove(albumName);
 	  } else {
 		alert("Error: " + r.cause);
 	  }
@@ -95,7 +95,7 @@ function galleryRename(name) {
 	}
 	$.getJSON("ajax/galleryOp.php", {operation: "rename", oldname: name, newname: result}, function(r) {
 	  if (r.status == "success") {
-        Albums.rename($("#gallery_album_box[title='"+name+"']"), result);
+		  Albums.rename($(".gallery_album_box").filterAttr('data-album',albumName), result);
       } else {
 	    alert("Error: " + r.cause);
       }
diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index 546aadba49f..f18d1deca4c 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -41,20 +41,26 @@ Albums={
   // displays gallery in linear representation
   // on given element, and apply default styles for gallery
   display: function(element) {
-    var displayTemplate = '<div id="gallery_album_box" title="*NAME*"><div id="gallery_control_overlay"><a href="#" onclick="galleryRename(\'*NAME*\');return false;">rename</a> | <a href="#" onclick="galleryRemove(\'*NAME*\');">remove</a></div><a href="?view=*NAME*"><div id="gallery_album_cover" title="*NAME*"></div></a><h1>*NAME*</h1></div></div>';
+    var displayTemplate = '<div class="gallery_album_box"><div class="gallery_control_overlay"><a href="#" class="rename">rename</a> | <a href="#" class="remove">remove</a></div><a class="view"><div class="gallery_album_cover"></div></a><h1></h1></div></div>';
     for (var i in Albums.albums) {
       var a = Albums.albums[i];
-      var local = $(displayTemplate.replace(/\*NAME\*/g, a.name));
-      $("#gallery_album_cover", local).css('background-repeat', 'no-repeat');
-      $("#gallery_album_cover", local).css('background-position', '0');
-      $("#gallery_album_cover", local).css('background-image','url("ajax/galleryOp.php?operation=get_covers&albumname='+a.name+'")');
-      local.mouseover(function(e) {
-	    $("#gallery_control_overlay", this).css('visibility','visible');
-      });
-      local.mouseout(function(e) {
-	    $("#gallery_control_overlay", this).css('visibility','hidden');
-	  });
-      $("#gallery_album_cover", local).mousemove(function(e) {
+	  var local=$(displayTemplate);
+	  local.attr('data-album',a.name);
+	  $(".gallery_control_overlay a.rename", local).click(function(name,event){
+			event.preventDefault();
+			galleryRename(name);
+		}.bind(null,a.name));
+	  $(".gallery_control_overlay a.remove", local).click(function(name,event){
+		  event.preventDefault();
+		  galleryRemove(name);
+	  }.bind(null,a.name));
+	  $("a.view", local).attr('href','?view='+a.name);
+	  $('h1',local).text(a.name);
+	  $(".gallery_album_cover", local).attr('title',a.name);
+      $(".gallery_album_cover", local).css('background-repeat', 'no-repeat');
+      $(".gallery_album_cover", local).css('background-position', '0');
+      $(".gallery_album_cover", local).css('background-image','url("ajax/galleryOp.php?operation=get_covers&albumname='+a.name+'")');
+      $(".gallery_album_cover", local).mousemove(function(e) {
 
         var albumMetadata = Albums.find(this.title);
         if (albumMetadata == undefined) {
-- 
GitLab


From b5ae924031d175bf0cadee2375190615ab2edd84 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jan 2012 19:28:57 +0100
Subject: [PATCH 329/546] dont show errors when not renaming an album

---
 apps/gallery/js/album_cover.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index 0e791689a1a..b871c3d89b5 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -88,6 +88,9 @@ function galleryRemove(albumName) {
 
 function galleryRename(name) {
   var result = window.prompt(t('gallery',"Input new gallery name"), name);
+  if(result=='' || result==name){
+	return;
+  }
   if (result) {
 	if (Albums.find(result)) {
 	  alert("Album named '" + result + "' already exists");
@@ -101,8 +104,6 @@ function galleryRename(name) {
       }
 	});
 	
-  } else {
-	  alert(t('gallery',"Album name can't be empty"))
   }
 }
 
-- 
GitLab


From 415e968612aef71dabaa8934117c72090a3fce2d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jan 2012 19:32:08 +0100
Subject: [PATCH 330/546] fix renaming albums

---
 apps/gallery/js/album_cover.js | 2 +-
 apps/gallery/js/albums.js      | 4 ++--
 apps/gallery/lib/album.php     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index b871c3d89b5..44503de28e0 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -98,7 +98,7 @@ function galleryRename(name) {
 	}
 	$.getJSON("ajax/galleryOp.php", {operation: "rename", oldname: name, newname: result}, function(r) {
 	  if (r.status == "success") {
-		  Albums.rename($(".gallery_album_box").filterAttr('data-album',albumName), result);
+		  Albums.rename($(".gallery_album_box").filterAttr('data-album',name), result);
       } else {
 	    alert("Error: " + r.cause);
       }
diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index f18d1deca4c..6150b0daa1e 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -75,8 +75,8 @@ Albums={
   },
   rename: function(element, new_name) {
     if (new_name) {
-		$(element).attr("title", new_name);
-		$("a", element).attr("href", "?view="+new_name);
+		$(element).attr("data-album", new_name);
+		$("a.view", element).attr("href", "?view="+new_name);
 		$("h1", element).text(new_name);
 	}
   }
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index d2c420eb9ef..4eb12cc0b81 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -28,7 +28,7 @@ class OC_Gallery_Album {
 	}
 	
 	public static function rename($oldname, $newname, $owner) {
-	    $stmt = OC_DB::prepare('UPDATE OR IGNORE *PREFIX*gallery_albums SET album_name=? WHERE uid_owner=? AND album_name=?');
+	    $stmt = OC_DB::prepare('UPDATE *PREFIX*gallery_albums SET album_name=? WHERE uid_owner=? AND album_name=?');
 		$stmt->execute(array($newname, $owner, $oldname));
 	}
 	
@@ -76,7 +76,7 @@ class OC_Gallery_Album {
 	}
 
   public static function changePath($oldname, $newname, $owner) {
-    $stmt = OC_DB::prepare('UPDATE OR IGNORE *PREFIX*gallery_albums SET album_path=? WHERE uid_owner=? AND album_path=?');
+    $stmt = OC_DB::prepare('UPDATE *PREFIX*gallery_albums SET album_path=? WHERE uid_owner=? AND album_path=?');
     $stmt->execute(array($newname, $owner, $oldname));
   }
 
-- 
GitLab


From 97901391f473fdb546cce5294530a307bb1d803c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 20 Jan 2012 19:34:34 +0100
Subject: [PATCH 331/546] make media detection based on extention case
 insensitive

---
 apps/media/lib_scanner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
index 4039cce09ee..8b659c73b6e 100644
--- a/apps/media/lib_scanner.php
+++ b/apps/media/lib_scanner.php
@@ -140,7 +140,7 @@ class OC_MEDIA_SCANNER{
 	 * @return bool
 	 */
 	public static function isMusic($filename){
-		$ext=substr($filename,strrpos($filename,'.')+1);
+		$ext=strtolower(substr($filename,strrpos($filename,'.')+1));
 		return $ext=='mp3' || $ext=='flac' || $ext=='m4a' || $ext=='ogg' || $ext=='oga';
 	}
 }
-- 
GitLab


From 437d50c6f6ec5eebf8424e37f4052f90646869c5 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Fri, 20 Jan 2012 23:26:39 +0100
Subject: [PATCH 332/546] recognizing img basing on extension

---
 apps/gallery/lib/hooks_handlers.php | 6 ++----
 apps/gallery/lib/scanner.php        | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
index 7248e67f0a2..53a924ff40a 100644
--- a/apps/gallery/lib/hooks_handlers.php
+++ b/apps/gallery/lib/hooks_handlers.php
@@ -32,10 +32,8 @@ class OC_Gallery_Hooks_Handlers {
   private static $APP_TAG = "Gallery";
 
   private static function isPhoto($filename) {
-    OC_Log::write(self::$APP_TAG, "Checking file ".$filename." with mimetype ".OC_Filesystem::getMimeType($filename), OC_Log::DEBUG);
-    if (substr(OC_Filesystem::getMimeType($filename), 0, 6) == "image/")
-      return true;
-    return false;
+    $ext = strtolower(substr($filename, strrpos($filename, '.')+1));
+    return $ext=='png' || $ext=='jpeg' || $ext=='jpg' || $ext=='gif';
   }
 
   private static function directoryContainsPhotos($dirpath) {
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index df33369b93b..447174e84c0 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -88,9 +88,8 @@ class OC_Gallery_Scanner {
   }
 
   public static function isPhoto($filename) {
-    if (substr(OC_Filesystem::getMimeType($filename), 0, 6) == "image/")
-      return 1;
-    return 0;
+    $ext = strtolower(substr($filename, strrpos($filename, '.')+1));
+    return $ext=='png' || $ext=='jpeg' || $ext=='jpg' || $ext=='gif';
   }
 
   public static function find_paths($path) {
-- 
GitLab


From 01ebb74a3309ccefe6cda778e230094fef98197d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 21 Jan 2012 00:54:02 +0100
Subject: [PATCH 333/546] some gallery css fixes

---
 apps/gallery/css/styles.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index a0822ddec1e..bb8d0607f8c 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -1,5 +1,5 @@
 div#gallery_list { margin: 90pt 20pt; }
-div.gallery_list.leftcontent { padding-top: 15pt; margin: 0; position: absolute; bottom:0px; text-align: center; overflow: scroll; }
+div#gallery_list.leftcontent { padding-top: 15pt; margin: 0; position: absolute; bottom:0px; text-align: center; overflow: auto; }
 div.gallery_album_box { width: 200px; text-align: center; border: 0; display: inline-block; margin: 5pt; vertical-align: top; padding: 10px; position: relative; overflow: hidden; color: #999; }
 div.gallery_album_box:hover { color: black; }
 .leftcontent div.gallery_album_box { margin: 5px; }
@@ -8,5 +8,5 @@ div.gallery_album_cover { width: 199px; height: 199px; border: solid 1pt #999; p
 div.gallery_control_overlay { border: 0; position:absolute; right: 10pt; background-color: #333; opacity: 0; padding: 0 5pt; }
 div.gallery_album_box:hover div.gallery_control_overlay { opacity:0.5 }
 div.gallery_control_overlay a { color:white; }
-#gallery_images.rightcontent { padding:10px 5px; position:absolute; bottom: 0px; overflow: scroll; }
+#gallery_images.rightcontent { padding:10px 5px; bottom: 0px; overflow: auto; right:0px}
 
-- 
GitLab


From 5238a7812c5fac9a8cbeb6784c962a3dde1b53a6 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Sat, 21 Jan 2012 17:33:43 +0100
Subject: [PATCH 334/546] bump version number

---
 lib/util.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 09513d32328..ac969f9aba9 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -62,7 +62,7 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(2,90,0);
+		return array(2,91,0);
 	}
 
 	/**
@@ -70,7 +70,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '3 alpha 1';
+		return '3 RC 1';
 	}
 
 	/**
-- 
GitLab


From 78c5c2e7d574b0d97eea86e2c7a40d65dc58583e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 21 Jan 2012 17:42:10 +0100
Subject: [PATCH 335/546] fix Undefined variable - bugfix for oc-69

---
 apps/calendar/ajax/editeventform.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/ajax/editeventform.php b/apps/calendar/ajax/editeventform.php
index 95cae39c1c2..bac4cc51774 100644
--- a/apps/calendar/ajax/editeventform.php
+++ b/apps/calendar/ajax/editeventform.php
@@ -184,6 +184,8 @@ if($data['repeating'] == 1){
 		}
 		$repeat['weekdays'] = $repeat_weekdays_;
 	}
+}else{
+	$repeat['repeat'] = 'doesnotrepeat';
 }
 
 $calendar_options = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
@@ -241,5 +243,4 @@ $tmpl->assign('repeat_bymonth', $repeat['bymonth']);
 $tmpl->assign('repeat_byweekno', $repeat['byweekno']);
 $tmpl->printpage();
 
-?>
- 
+?>
\ No newline at end of file
-- 
GitLab


From 66f8a0e1a3625102eb8b4aeea9fcb20b7ea45d92 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 21 Jan 2012 17:42:34 +0100
Subject: [PATCH 336/546] validate the calendar name

---
 apps/calendar/ajax/createcalendar.php | 12 ++++++++++++
 apps/calendar/ajax/updatecalendar.php | 12 ++++++++++++
 apps/calendar/js/calendar.js          | 18 ++++++++++++++++--
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/ajax/createcalendar.php b/apps/calendar/ajax/createcalendar.php
index f8b5974f54c..b719b207c74 100644
--- a/apps/calendar/ajax/createcalendar.php
+++ b/apps/calendar/ajax/createcalendar.php
@@ -12,6 +12,18 @@ require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 
+if(trim($_POST['name']) == ''){
+	OC_JSON::error(array('message'=>'empty'));
+	exit;
+}
+$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
+foreach($calendars as $cal){
+	if($cal['displayname'] == $_POST['name']){
+		OC_JSON::error(array('message'=>'namenotavailable'));
+		exit;
+	}
+}
+
 $userid = OC_User::getUser();
 $calendarid = OC_Calendar_Calendar::addCalendar($userid, $_POST['name'], 'VEVENT,VTODO,VJOURNAL', null, 0, $_POST['color']);
 OC_Calendar_Calendar::setCalendarActive($calendarid, 1);
diff --git a/apps/calendar/ajax/updatecalendar.php b/apps/calendar/ajax/updatecalendar.php
index 14f560da5a3..269b7b7ca06 100644
--- a/apps/calendar/ajax/updatecalendar.php
+++ b/apps/calendar/ajax/updatecalendar.php
@@ -12,6 +12,18 @@ require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 
+if(trim($_POST['name']) == ''){
+	OC_JSON::error(array('message'=>'empty'));
+	exit;
+}
+$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
+foreach($calendars as $cal){
+	if($cal['displayname'] == $_POST['name'] && $cal['id'] != $_POST['id']){
+		OC_JSON::error(array('message'=>'namenotavailable'));
+		exit;
+	}
+}
+
 $calendarid = $_POST['id'];
 $calendar = OC_Calendar_App::getCalendar($calendarid);//access check
 OC_Calendar_Calendar::editCalendar($calendarid, $_POST['name'], null, null, null, $_POST['color']);
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 228ea97c2da..afd1b692dd4 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -429,11 +429,17 @@ Calendar={
 				}
 			},
 			submit:function(button, calendarid){
-				var displayname = $("#displayname_"+calendarid).val();
+				var displayname = $.trim($("#displayname_"+calendarid).val());
 				var active = $("#edit_active_"+calendarid+":checked").length;
 				var description = $("#description_"+calendarid).val();
 				var calendarcolor = $("#calendarcolor_"+calendarid).val();
-
+				if(displayname == ''){
+					$("#displayname_"+calendarid).css('background-color', '#FF2626');
+					$("#displayname_"+calendarid).focus(function(){
+						$("#displayname_"+calendarid).css('background-color', '#F8F8F8');
+					});
+				}
+				
 				var url;
 				if (calendarid == 'new'){
 					url = OC.filePath('calendar', 'ajax', 'createcalendar.php');
@@ -449,6 +455,11 @@ Calendar={
 							if (calendarid == 'new'){
 								$('#choosecalendar_dialog > table').append('<tr><td colspan="6"><a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);"><input type="button" value="' + newcalendar + '"></a></td></tr>');
 							}
+						}else{
+							$("#displayname_"+calendarid).css('background-color', '#FF2626');
+							$("#displayname_"+calendarid).focus(function(){
+								$("#displayname_"+calendarid).css('background-color', '#F8F8F8');
+							});
 						}
 					}, 'json');
 			},
@@ -677,6 +688,9 @@ $(document).ready(function(){
 				$('#calendar_holder').fullCalendar('option', 'aspectRatio', 1.35);
 			}
 		},
+		columnFormat: {
+		    week: 'ddd d. MMM'
+		},
 		selectable: true,
 		selectHelper: true,
 		select: Calendar.UI.newEvent,
-- 
GitLab


From b8e01939e9940a53fc3125b2d1f04671e94fb8bd Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 23 Jan 2012 15:05:53 +0100
Subject: [PATCH 337/546] fix undefined indices - bugfix for oc-99

---
 apps/calendar/ajax/editeventform.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/apps/calendar/ajax/editeventform.php b/apps/calendar/ajax/editeventform.php
index bac4cc51774..9ae3ffa8d94 100644
--- a/apps/calendar/ajax/editeventform.php
+++ b/apps/calendar/ajax/editeventform.php
@@ -229,18 +229,20 @@ $tmpl->assign('endtime', $endtime);
 $tmpl->assign('description', $description);
 
 $tmpl->assign('repeat', $repeat['repeat']);
-$tmpl->assign('repeat_month', $repeat['month']);
-$tmpl->assign('repeat_weekdays', $repeat['weekdays']);
-$tmpl->assign('repeat_interval', $repeat['interval']);
-$tmpl->assign('repeat_end', $repeat['end']);
-$tmpl->assign('repeat_count', $repeat['count']);
-$tmpl->assign('repeat_weekofmonth', $repeat['weekofmonth']);
-$tmpl->assign('repeat_date', $repeat['date']);
-$tmpl->assign('repeat_year', $repeat['year']);
-$tmpl->assign('repeat_byyearday', $repeat['byyearday']);
-$tmpl->assign('repeat_bymonthday', $repeat['bymonthday']);
-$tmpl->assign('repeat_bymonth', $repeat['bymonth']);
-$tmpl->assign('repeat_byweekno', $repeat['byweekno']);
+if($repeat['repeat'] != 'doesnotrepeat'){
+	$tmpl->assign('repeat_month', $repeat['month']);
+	$tmpl->assign('repeat_weekdays', $repeat['weekdays']);
+	$tmpl->assign('repeat_interval', $repeat['interval']);
+	$tmpl->assign('repeat_end', $repeat['end']);
+	$tmpl->assign('repeat_count', $repeat['count']);
+	$tmpl->assign('repeat_weekofmonth', $repeat['weekofmonth']);
+	$tmpl->assign('repeat_date', $repeat['date']);
+	$tmpl->assign('repeat_year', $repeat['year']);
+	$tmpl->assign('repeat_byyearday', $repeat['byyearday']);
+	$tmpl->assign('repeat_bymonthday', $repeat['bymonthday']);
+	$tmpl->assign('repeat_bymonth', $repeat['bymonth']);
+	$tmpl->assign('repeat_byweekno', $repeat['byweekno']);
+}
 $tmpl->printpage();
 
 ?>
\ No newline at end of file
-- 
GitLab


From 76ce8c6c6a993a8dd2dbc70417900983484dc211 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 23 Jan 2012 17:33:12 +0100
Subject: [PATCH 338/546] dont show new user when an error occured

---
 settings/js/users.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index b45038e5b04..46ab12b857a 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -133,6 +133,7 @@ $(document).ready(function(){
 		}
 		var password=$('#newuserpassword').val();
 		var groups=$('#newusergroups').prev().children('div').data('settings').checked;
+		var tr
 		$.post(
 			OC.filePath('settings','ajax','createuser.php'),
 			{
@@ -141,10 +142,12 @@ $(document).ready(function(){
 				groups:groups,
 			},
 			function(result){
-				
+				if(result.status!='success'){
+					tr.remove();
+				}
 			}
 		);
-		var tr=$('#content table tbody tr').first().clone();
+		tr=$('#content table tbody tr').first().clone();
 		tr.attr('data-uid',username);
 		tr.find('td.name').text(username);
 		var select=$('<select multiple="multiple" data-placehoder="Groups" title="Groups">');
-- 
GitLab


From c2183427c3ea52a8f0660425b1a063c0a6bfd141 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 23 Jan 2012 17:34:23 +0100
Subject: [PATCH 339/546] dont try to create a user with an already existing
 username

---
 settings/js/users.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/settings/js/users.js b/settings/js/users.js
index 46ab12b857a..c9b1d855db0 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -127,6 +127,9 @@ $(document).ready(function(){
 	$('#newuser').submit(function(event){
 		event.preventDefault();
 		var username=$('#newusername').val();
+		if($('#content table tbody tr').filterAttr('data-uid',username).length>0){
+			return;
+		}
 		if($.trim(username) == '') {
 			alert('Please provide a username!');
 			return false;
-- 
GitLab


From e1a499f65d84aeb11e598ea8d34f4ff5627fc4bd Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 23 Jan 2012 20:59:37 +0000
Subject: [PATCH 340/546] disable keyboard shortcuts as temp fix

---
 apps/files_texteditor/js/editor.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index cb1af3dd6db..6e154bedb9c 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -234,6 +234,7 @@ function hideFileEditor(){
 // Keyboard Shortcuts
 var ctrlBtn = false;
 
+// TODO fix detection of ctrl keyup
 // returns true if ctrl+s or cmd+s is being pressed
 function checkForSaveKeyPress(e){
 	if(e.which == 17 || e.which == 91) ctrlBtn=true;
@@ -276,5 +277,5 @@ $(document).ready(function(){
 	bindControlEvents();
 	
 	// Binds the save keyboard shortcut events
-	$(document).unbind('keydown').bind('keydown',checkForSaveKeyPress);
+	//$(document).unbind('keydown').bind('keydown',checkForSaveKeyPress);
 });
-- 
GitLab


From 456394d3ec03e2e0d582ded9db1c92d037d13d36 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Mon, 23 Jan 2012 23:25:36 +0100
Subject: [PATCH 341/546] oc-89 handling no photos in collection alert

---
 apps/gallery/js/album_cover.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index 44503de28e0..513dd47d351 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -44,7 +44,11 @@ function scanForAlbums() {
 
     if (r.status == 'success') {
       totalAlbums = r.paths.length;
-	  $('#notification').text(t('gallery',"Creating thumbnails")+' ... ' + Math.floor((albumCounter/totalAlbums)*100) + "%");
+      if (totalAlbums == 0) {
+        $('#notification').text(t('gallery', "No photos found")).fadeIn().slideDown().delay(3000).fadeOut().slideUp();
+        return;
+      }
+	    $('#notification').text(t('gallery',"Creating thumbnails")+' ... ' + Math.floor((albumCounter/totalAlbums)*100) + "%");
       for(var a in r.paths) {
         $.getJSON('ajax/galleryOp.php?operation=partial_create&path='+r.paths[a], function(r) {
 
-- 
GitLab


From 6fccf1229997d554a4465530814c5065d373773f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 24 Jan 2012 00:42:08 +0100
Subject: [PATCH 342/546] update translations

---
 apps/calendar/l10n/da.php    |  13 +-
 apps/calendar/l10n/ro.php    |   8 +-
 apps/calendar/l10n/ru.php    |  77 ++++-
 apps/calendar/l10n/th_TH.php |   2 +
 apps/calendar/l10n/zh_CN.php |  77 ++++-
 apps/contacts/l10n/da.php    |  20 +-
 apps/contacts/l10n/ru.php    |  34 +-
 apps/contacts/l10n/zh_CN.php |  34 +-
 apps/gallery/l10n/ca.php     |   4 +
 apps/gallery/l10n/da.php     |   9 +
 apps/gallery/l10n/de.php     |   4 +
 apps/gallery/l10n/es.php     |   4 +
 apps/gallery/l10n/fr.php     |   4 +
 apps/gallery/l10n/pl.php     |   4 +
 apps/gallery/l10n/ru.php     |   9 +
 apps/gallery/l10n/zh_CN.php  |   6 +-
 core/l10n/ru.php             |   5 +
 core/l10n/zh_CN.php          |   5 +
 files/l10n/ru.php            |   4 +
 files/l10n/zh_CN.php         |   4 +
 l10n/ar/contacts.po          |   4 +-
 l10n/ar/gallery.po           |  18 +-
 l10n/bg_BG/contacts.po       |   4 +-
 l10n/bg_BG/gallery.po        |  18 +-
 l10n/ca/contacts.po          |   4 +-
 l10n/ca/gallery.po           |  24 +-
 l10n/cs_CZ/contacts.po       |   4 +-
 l10n/cs_CZ/gallery.po        |  18 +-
 l10n/da/calendar.po          |  66 ++--
 l10n/da/contacts.po          |  40 +--
 l10n/da/gallery.po           |  31 +-
 l10n/da/settings.po          |   5 +-
 l10n/de/contacts.po          |   4 +-
 l10n/de/gallery.po           |  25 +-
 l10n/de_DE/calendar.po       | 636 +++++++++++++++++++++++++++++++++++
 l10n/de_DE/core.po           | 170 ++++++++++
 l10n/de_DE/files.po          | 108 ++++++
 l10n/de_DE/media.po          |  64 ++++
 l10n/de_DE/settings.po       | 156 +++++++++
 l10n/el/contacts.po          |   4 +-
 l10n/el/gallery.po           |  18 +-
 l10n/eo/contacts.po          |   4 +-
 l10n/eo/gallery.po           |  18 +-
 l10n/es/contacts.po          |   4 +-
 l10n/es/gallery.po           |  24 +-
 l10n/et_EE/contacts.po       |   4 +-
 l10n/et_EE/gallery.po        |  18 +-
 l10n/eu/contacts.po          |   4 +-
 l10n/eu/gallery.po           |  18 +-
 l10n/fr/contacts.po          |   4 +-
 l10n/fr/gallery.po           |  24 +-
 l10n/gl/contacts.po          |   4 +-
 l10n/gl/gallery.po           |  18 +-
 l10n/he/contacts.po          |   4 +-
 l10n/he/gallery.po           |  18 +-
 l10n/hr/contacts.po          |   4 +-
 l10n/hr/gallery.po           |  18 +-
 l10n/hu_HU/contacts.po       |   4 +-
 l10n/hu_HU/gallery.po        |  18 +-
 l10n/hy/contacts.po          |   4 +-
 l10n/hy/gallery.po           |  18 +-
 l10n/ia/contacts.po          |   4 +-
 l10n/ia/gallery.po           |  18 +-
 l10n/id/contacts.po          |   4 +-
 l10n/id/gallery.po           |  18 +-
 l10n/it/contacts.po          |   4 +-
 l10n/it/gallery.po           |  18 +-
 l10n/ja_JP/contacts.po       |   4 +-
 l10n/ja_JP/gallery.po        |  18 +-
 l10n/lb/contacts.po          |   4 +-
 l10n/lb/gallery.po           |  18 +-
 l10n/lt_LT/contacts.po       |   4 +-
 l10n/lt_LT/gallery.po        |  18 +-
 l10n/ms_MY/contacts.po       |   4 +-
 l10n/ms_MY/gallery.po        |  18 +-
 l10n/nb_NO/contacts.po       |   4 +-
 l10n/nb_NO/gallery.po        |  18 +-
 l10n/nl/contacts.po          |   4 +-
 l10n/nl/gallery.po           |  18 +-
 l10n/nn_NO/contacts.po       |   4 +-
 l10n/nn_NO/gallery.po        |  18 +-
 l10n/pl/contacts.po          |   4 +-
 l10n/pl/gallery.po           |  25 +-
 l10n/pt_BR/contacts.po       |   4 +-
 l10n/pt_BR/gallery.po        |  18 +-
 l10n/pt_PT/contacts.po       |   4 +-
 l10n/pt_PT/gallery.po        |  18 +-
 l10n/ro/calendar.po          |  56 +--
 l10n/ro/contacts.po          |   4 +-
 l10n/ro/gallery.po           |  18 +-
 l10n/ru/calendar.po          | 196 +++++------
 l10n/ru/contacts.po          |  69 ++--
 l10n/ru/core.po              |  18 +-
 l10n/ru/files.po             |  15 +-
 l10n/ru/gallery.po           |  31 +-
 l10n/ru/settings.po          |  20 +-
 l10n/sk_SK/contacts.po       |   4 +-
 l10n/sk_SK/gallery.po        |  18 +-
 l10n/sl/contacts.po          |   4 +-
 l10n/sl/gallery.po           |  18 +-
 l10n/sr/contacts.po          |   4 +-
 l10n/sr/gallery.po           |  18 +-
 l10n/sr@latin/contacts.po    |   4 +-
 l10n/sr@latin/gallery.po     |  18 +-
 l10n/sv/contacts.po          |   4 +-
 l10n/sv/gallery.po           |  18 +-
 l10n/templates/calendar.pot  |   2 +-
 l10n/templates/contacts.pot  |   2 +-
 l10n/templates/core.pot      |   2 +-
 l10n/templates/files.pot     |   2 +-
 l10n/templates/gallery.pot   |  16 +-
 l10n/templates/media.pot     |   2 +-
 l10n/templates/settings.pot  |   2 +-
 l10n/th_TH/calendar.po       |   8 +-
 l10n/th_TH/contacts.po       |   4 +-
 l10n/th_TH/gallery.po        |  18 +-
 l10n/tr/contacts.po          |   4 +-
 l10n/tr/gallery.po           |  18 +-
 l10n/uk/calendar.po          | 636 +++++++++++++++++++++++++++++++++++
 l10n/uk/contacts.po          | 281 ++++++++++++++++
 l10n/uk/core.po              | 170 ++++++++++
 l10n/uk/files.po             | 108 ++++++
 l10n/uk/gallery.po           |  52 +++
 l10n/uk/media.po             |  64 ++++
 l10n/uk/settings.po          | 156 +++++++++
 l10n/zh_CN/calendar.po       | 196 +++++------
 l10n/zh_CN/contacts.po       |  70 ++--
 l10n/zh_CN/core.po           |  18 +-
 l10n/zh_CN/files.po          |  16 +-
 l10n/zh_CN/gallery.po        |  27 +-
 l10n/zh_CN/settings.po       |  24 +-
 settings/l10n/ru.php         |   7 +
 settings/l10n/zh_CN.php      |   8 +
 133 files changed, 3831 insertions(+), 892 deletions(-)
 create mode 100644 apps/gallery/l10n/da.php
 create mode 100644 apps/gallery/l10n/ru.php
 create mode 100644 l10n/de_DE/calendar.po
 create mode 100644 l10n/de_DE/core.po
 create mode 100644 l10n/de_DE/files.po
 create mode 100644 l10n/de_DE/media.po
 create mode 100644 l10n/de_DE/settings.po
 create mode 100644 l10n/uk/calendar.po
 create mode 100644 l10n/uk/contacts.po
 create mode 100644 l10n/uk/core.po
 create mode 100644 l10n/uk/files.po
 create mode 100644 l10n/uk/gallery.po
 create mode 100644 l10n/uk/media.po
 create mode 100644 l10n/uk/settings.po

diff --git a/apps/calendar/l10n/da.php b/apps/calendar/l10n/da.php
index b43c89a6dd3..c50a1db1d57 100644
--- a/apps/calendar/l10n/da.php
+++ b/apps/calendar/l10n/da.php
@@ -38,6 +38,7 @@
 "Friday" => "Fredag",
 "Saturday" => "Lørdag",
 "Sunday" => "øndag",
+"events week of month" => "begivenhedens uge i måneden",
 "first" => "første",
 "second" => "anden",
 "third" => "tredje",
@@ -57,12 +58,14 @@
 "November" => "November",
 "December" => "December",
 "by events date" => "efter begivenheders dato",
+"by yearday(s)" => "efter dag(e) i året",
 "by weeknumber(s)" => "efter ugenummer/-numre",
 "by day and month" => "efter dag og måned",
 "Not an array" => "Ikke en array",
 "Date" => "Dato",
 "Cal." => "Kal.",
 "All day" => "Hele dagen",
+"New Calendar" => "Ny Kalender",
 "Missing fields" => "Manglende felter",
 "Title" => "Titel",
 "From Date" => "Fra dato",
@@ -97,7 +100,6 @@
 "Nov." => "Nov.",
 "Dec." => "Dec.",
 "Choose active calendars" => "Vælg aktive kalendere",
-"New Calendar" => "Ny Kalender",
 "CalDav Link" => "CalDav-link",
 "Download" => "Hent",
 "Edit" => "Rediger",
@@ -123,8 +125,11 @@
 "Advanced" => "Avanceret",
 "Select weekdays" => "Vælg ugedage",
 "Select days" => "Vælg dage",
+"and the events day of year." => "og begivenhedens dag i året.",
+"and the events day of month." => "og begivenhedens sag på måneden",
 "Select months" => "Vælg måneder",
 "Select weeks" => "Vælg uger",
+"and the events week of year." => "og begivenhedens uge i året.",
 "Interval" => "Interval",
 "End" => "Afslutning",
 "occurrences" => "forekomster",
@@ -132,8 +137,14 @@
 "Location of the Event" => "Placering af begivenheden",
 "Description" => "Beskrivelse",
 "Description of the Event" => "Beskrivelse af begivenheden",
+"Import a calendar file" => "Importer en kalenderfil",
 "Please choose the calendar" => "Vælg venligst kalender",
+"create a new calendar" => "opret en ny kalender",
+"Name of new calendar" => "Navn på ny kalender",
 "Import" => "Importer",
+"Importing calendar" => "Importerer kalender",
+"Calendar imported successfully" => "Kalender importeret korrekt",
+"Close Dialog" => "Luk dialog",
 "Create a new event" => "Opret en ny begivenhed",
 "Timezone" => "Tidszone",
 "Check always for changes of the timezone" => "Check altid efter ændringer i tidszone",
diff --git a/apps/calendar/l10n/ro.php b/apps/calendar/l10n/ro.php
index 5e16c344eef..026c251e53c 100644
--- a/apps/calendar/l10n/ro.php
+++ b/apps/calendar/l10n/ro.php
@@ -65,6 +65,7 @@
 "Date" => "Data",
 "Cal." => "Cal.",
 "All day" => "Toată ziua",
+"New Calendar" => "Calendar nou",
 "Missing fields" => "Câmpuri lipsă",
 "Title" => "Titlu",
 "From Date" => "Începând cu",
@@ -99,7 +100,6 @@
 "Nov." => "Nov.",
 "Dec." => "Dec.",
 "Choose active calendars" => "Alege activitățile din calendar",
-"New Calendar" => "Calendar nou",
 "CalDav Link" => "Link CalDav",
 "Download" => "Descarcă",
 "Edit" => "Modifică",
@@ -137,8 +137,14 @@
 "Location of the Event" => "Localizarea evenimentului",
 "Description" => "Descriere",
 "Description of the Event" => "Descrierea evenimentului",
+"Import a calendar file" => "Importă un calendar",
 "Please choose the calendar" => "Alegeți calendarul",
+"create a new calendar" => "crează un calendar nou",
+"Name of new calendar" => "Numele noului calendar",
 "Import" => "Importă",
+"Importing calendar" => "Importă calendar",
+"Calendar imported successfully" => "Calendarul a fost importat cu succes",
+"Close Dialog" => "ÃŽnchide",
 "Create a new event" => "Crează un evenimetn nou",
 "Timezone" => "Fus orar",
 "Check always for changes of the timezone" => "Verifică mereu pentru schimbări ale fusului orar",
diff --git a/apps/calendar/l10n/ru.php b/apps/calendar/l10n/ru.php
index 87366771867..675fcecf18c 100644
--- a/apps/calendar/l10n/ru.php
+++ b/apps/calendar/l10n/ru.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"New Timezone:" => "�овый ча�овой по��:",
 "Timezone changed" => "Ча�овой по�� изменён",
 "Invalid request" => "�еверный запро�",
 "Calendar" => "Календарь",
@@ -25,8 +26,46 @@
 "Bi-Weekly" => "Каждые две недели",
 "Monthly" => "Каждый ме��ц",
 "Yearly" => "Каждый год",
+"never" => "никогда",
+"by occurrences" => "по чи�лу повторений",
+"by date" => "по дате",
+"by monthday" => "по дню ме��ца",
+"by weekday" => "по дню недели",
+"Monday" => "Понедельник",
+"Tuesday" => "Вторник",
+"Wednesday" => "Среда",
+"Thursday" => "Четверг",
+"Friday" => "П�тница",
+"Saturday" => "Суббота",
+"Sunday" => "Во�кре�енье",
+"events week of month" => "недел� ме��ца",
+"first" => "перва�",
+"second" => "втора�",
+"third" => "треть�",
+"fourth" => "червётра�",
+"fifth" => "п�та�",
+"last" => "по�ледн��",
+"January" => "Январь",
+"February" => "Февраль",
+"March" => "Март",
+"April" => "�прель",
+"May" => "Май",
+"June" => "Июнь",
+"July" => "Июль",
+"August" => "�вгу�т",
+"September" => "Сент�брь",
+"October" => "Окт�брь",
+"November" => "�о�брь",
+"December" => "Декабрь",
+"by events date" => "по дате �обытий",
+"by yearday(s)" => "по дн�м недели",
+"by weeknumber(s)" => "по номерам недели",
+"by day and month" => "по дню и ме��цу",
 "Not an array" => "�е ма��ив",
+"Date" => "Дата",
+"Cal." => "Кал.",
 "All day" => "Ве�ь день",
+"New Calendar" => "�овый Календарь",
 "Missing fields" => "�езаполненные пол�",
 "Title" => "�азвание",
 "From Date" => "Дата начала",
@@ -41,8 +80,26 @@
 "Today" => "Сегодн�",
 "Calendars" => "Календари",
 "There was a fail, while parsing the file." => "�е удало�ь обработать файл.",
+"Sun." => "В�.",
+"Mon." => "Пн.",
+"Tue." => "Ð’Ñ‚.",
+"Wed." => "Ср.",
+"Thu." => "Чт.",
+"Fri." => "Пт.",
+"Sat." => "Сб.",
+"Jan." => "Янв.",
+"Feb." => "Фев.",
+"Mar." => "Мар.",
+"Apr." => "Сен.",
+"May." => "Май.",
+"Jun." => "Июн.",
+"Jul." => "Июл.",
+"Aug." => "�вг.",
+"Sep." => "Сен.",
+"Oct." => "Окт.",
+"Nov." => "�о�.",
+"Dec." => "Дек.",
 "Choose active calendars" => "Выберите активные календари",
-"New Calendar" => "�овый Календарь",
 "CalDav Link" => "С�ылка дл� CalDav",
 "Download" => "Скачать",
 "Edit" => "Редактировать",
@@ -65,14 +122,32 @@
 "To" => "До",
 "Advanced options" => "Дополнительные параметры",
 "Repeat" => "Повтор",
+"Advanced" => "Дополнительно",
+"Select weekdays" => "Выбрать дни недели",
+"Select days" => "Выбрать дни",
+"and the events day of year." => "и день года �обыти�",
+"and the events day of month." => "и день ме��ца �обыти�",
+"Select months" => "Выбрать ме��цы",
+"Select weeks" => "Выбрать недели",
+"and the events week of year." => "и номер недели �обыти�",
+"Interval" => "Интервал",
+"End" => "Окончание",
+"occurrences" => "повторений",
 "Location" => "Ме�то",
 "Location of the Event" => "Ме�то �обыти�",
 "Description" => "Опи�ание",
 "Description of the Event" => "Опи�ание �обыти�",
+"Import a calendar file" => "Импортировать календарь из файла",
 "Please choose the calendar" => "Пожалуй�та, выберите календарь",
+"create a new calendar" => "Создать новый календарь",
+"Name of new calendar" => "�азвание нового календар�",
 "Import" => "Импортировать",
+"Importing calendar" => "Импортирует�� календарь",
+"Calendar imported successfully" => "Календарь у�пешно импортирован",
+"Close Dialog" => "Закрыть Сообщение",
 "Create a new event" => "Создать новое �обытие",
 "Timezone" => "Ча�овой по��",
+"Check always for changes of the timezone" => "В�егда провер�йте изменение ча�ового по��а",
 "Timeformat" => "Формат времени",
 "24h" => "24ч",
 "12h" => "12ч",
diff --git a/apps/calendar/l10n/th_TH.php b/apps/calendar/l10n/th_TH.php
index 6206e32c105..46f673d93a4 100644
--- a/apps/calendar/l10n/th_TH.php
+++ b/apps/calendar/l10n/th_TH.php
@@ -26,6 +26,7 @@
 "Bi-Weekly" => "รายปั�ษ์",
 "Monthly" => "รายเดือน",
 "Yearly" => "รายปี",
+"by occurrences" => "ตามจำนวนที่ปรา��",
 "by date" => "ตามวันที่",
 "Monday" => "วันจันทร์",
 "Tuesday" => "วันอังคาร",
@@ -119,6 +120,7 @@
 "Select months" => "เลือ�เดือน",
 "Select weeks" => "เลือ�สัปดาห์",
 "End" => "สิ้นสุด",
+"occurrences" => "จำนวนที่ปรา��",
 "Location" => "สถานที่",
 "Location of the Event" => "สถานที่จัด�ิจ�รรม",
 "Description" => "คำอธิบาย",
diff --git a/apps/calendar/l10n/zh_CN.php b/apps/calendar/l10n/zh_CN.php
index 480b4530299..bed47610b90 100644
--- a/apps/calendar/l10n/zh_CN.php
+++ b/apps/calendar/l10n/zh_CN.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"New Timezone:" => "新时区：",
 "Timezone changed" => "时区已修改",
 "Invalid request" => "�法请求",
 "Calendar" => "日历",
@@ -25,8 +26,46 @@
 "Bi-Weekly" => "�两周",
 "Monthly" => "�月",
 "Yearly" => "�年",
+"never" => "从�",
+"by occurrences" => "按�生次数",
+"by date" => "按日期",
+"by monthday" => "按月的�天",
+"by weekday" => "按星期的�天",
+"Monday" => "星期一",
+"Tuesday" => "星期二",
+"Wednesday" => "星期三",
+"Thursday" => "星期四",
+"Friday" => "星期五",
+"Saturday" => "星期六",
+"Sunday" => "星期日",
+"events week of month" => "事件在�月的第几个星期",
+"first" => "第一",
+"second" => "第二",
+"third" => "第三",
+"fourth" => "第四",
+"fifth" => "第五",
+"last" => "最�",
+"January" => "一月",
+"February" => "二月",
+"March" => "三月",
+"April" => "四月",
+"May" => "五月",
+"June" => "六月",
+"July" => "七月",
+"August" => "八月",
+"September" => "�月",
+"October" => "�月",
+"November" => "�一月",
+"December" => "�二月",
+"by events date" => "按事件日期",
+"by yearday(s)" => "按�年的�天",
+"by weeknumber(s)" => "按星期数",
+"by day and month" => "按天和月份",
 "Not an array" => "�是一个数组",
+"Date" => "日期",
+"Cal." => "日历",
 "All day" => "全天",
+"New Calendar" => "新日历",
 "Missing fields" => "缺少字段",
 "Title" => "标题",
 "From Date" => "从",
@@ -41,8 +80,26 @@
 "Today" => "今天",
 "Calendars" => "日历",
 "There was a fail, while parsing the file." => "解�文件失败",
+"Sun." => "周日",
+"Mon." => "周一",
+"Tue." => "周二",
+"Wed." => "周三",
+"Thu." => "周四",
+"Fri." => "周五",
+"Sat." => "周六",
+"Jan." => "1月",
+"Feb." => "2月",
+"Mar." => "3月",
+"Apr." => "4月",
+"May." => "5月",
+"Jun." => "6月",
+"Jul." => "7月",
+"Aug." => "8月",
+"Sep." => "9月",
+"Oct." => "10月",
+"Nov." => "11月",
+"Dec." => "12月",
 "Choose active calendars" => "选择活动日历",
-"New Calendar" => "新日历",
 "CalDav Link" => "CalDav 链接",
 "Download" => "下载",
 "Edit" => "编辑",
@@ -65,14 +122,32 @@
 "To" => "至",
 "Advanced options" => "高级选项",
 "Repeat" => "��",
+"Advanced" => "高级",
+"Select weekdays" => "选择星期中的�天",
+"Select days" => "选择�天",
+"and the events day of year." => "选择�年事件�生的日�",
+"and the events day of month." => "选择�月事件�生的日�",
+"Select months" => "选择月份",
+"Select weeks" => "选择星期",
+"and the events week of year." => "选择�年的事件�生的星期",
+"Interval" => "é—´éš”",
+"End" => "结�",
+"occurrences" => "次",
 "Location" => "地点",
 "Location of the Event" => "事件地点",
 "Description" => "�述",
 "Description of the Event" => "事件�述",
+"Import a calendar file" => "导入日历文件",
 "Please choose the calendar" => "请选择日历",
+"create a new calendar" => "创建新日历",
+"Name of new calendar" => "新日历�称",
 "Import" => "导入",
+"Importing calendar" => "导入日历",
+"Calendar imported successfully" => "导入日历�功",
+"Close Dialog" => "关闭对�框",
 "Create a new event" => "创建新事件",
 "Timezone" => "时区",
+"Check always for changes of the timezone" => "选中则总是按照时区�化",
 "Timeformat" => "时间格�",
 "24h" => "24�时",
 "12h" => "12�时",
diff --git a/apps/contacts/l10n/da.php b/apps/contacts/l10n/da.php
index c5b4d19cfa5..a0a3760d013 100644
--- a/apps/contacts/l10n/da.php
+++ b/apps/contacts/l10n/da.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Fejl ved (de)aktivering af adressebogen",
+"There was an error adding the contact." => "Der opstod en fejl ved tilføjelse af kontaktpersonen.",
+"Cannot add empty property." => "Kan ikke tilføje en egenskab uden indhold.",
+"At least one of the address fields has to be filled out." => "Der skal udfyldes mindst et adressefelt.",
+"Error adding contact property." => "Fejl ved tilføjelse af egenskab.",
+"Error adding addressbook." => "Fejl ved tilføjelse af adressebog.",
+"Error activating addressbook." => "Fejl ved aktivering af adressebog.",
+"Error deleting contact property." => "Fejl ved sletning af egenskab for kontaktperson.",
+"Error updating contact property." => "Fejl ved opdatering af egenskab for kontaktperson.",
+"Error updating addressbook." => "Fejl ved opdatering af adressebog",
+"Contacts" => "Kontaktpersoner",
 "This is not your addressbook." => "Dette er ikke din adressebog.",
 "Contact could not be found." => "Kontaktperson kunne ikke findes.",
 "Information about vCard is incorrect. Please reload the page." => "Informationen om vCard er forkert. Genindlæs siden.",
@@ -14,8 +25,11 @@
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Personsøger",
+"Contact" => "Kontaktperson",
 "This is not your contact." => "Dette er ikke din kontaktperson.",
 "Add Contact" => "Tilføj kontaktperson",
+"Addressbooks" => "Adressebøger",
+"Addressbook" => "Adressebog",
 "Name" => "Navn",
 "Type" => "Type",
 "PO Box" => "Postboks",
@@ -32,8 +46,11 @@
 "Download" => "Download",
 "Edit" => "Rediger",
 "Delete" => "Slet",
+"Download contact" => "Download kontaktperson",
 "Delete contact" => "Slet kontaktperson",
 "Add" => "Tilføj",
+"New Addressbook" => "Ny adressebog",
+"Edit Addressbook" => "Rediger adressebog",
 "Displayname" => "Vist navn",
 "Active" => "Aktiv",
 "Save" => "Gem",
@@ -42,5 +59,6 @@
 "Birthday" => "Fødselsdag",
 "Preferred" => "Foretrukken",
 "Phone" => "Telefon",
-"Update" => "Opdater"
+"Update" => "Opdater",
+"CardDAV syncing address:" => "Synkroniseringsadresse for CardDAV:"
 );
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
index dd6cefe1df9..5e48d5776a3 100644
--- a/apps/contacts/l10n/ru.php
+++ b/apps/contacts/l10n/ru.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Ошибка (де)активации адре�ной книги.",
+"There was an error adding the contact." => "Произошла ошибка при добавлении контакта.",
+"Cannot add empty property." => "�евозможно добавить пу�той параметр.",
+"At least one of the address fields has to be filled out." => "Как минимум одно поле адре�а должно быть заполнено.",
+"Error adding contact property." => "Ошибка добавлени� информации к контакту.",
+"Error adding addressbook." => "Ошибка добавлени� адре�ной книги.",
+"Error activating addressbook." => "Ошибка активации адре�ной книги.",
+"Error deleting contact property." => "Ошибка удалени� информации из контакта.",
+"Error updating contact property." => "Ошибка обновлени� информации контакта.",
+"Error updating addressbook." => "Ошибка обновлени� адре�ной книги.",
+"Contacts" => "Контакты",
 "This is not your addressbook." => "Это не ваша адре�на� книга.",
 "Contact could not be found." => "Контакт не найден.",
 "Information about vCard is incorrect. Please reload the page." => "Информаци� о vCard некорректна. Пожалуй�та, обновите �траницу.",
@@ -14,9 +25,13 @@
 "Fax" => "Фак�",
 "Video" => "Видео",
 "Pager" => "Пейджер",
+"Contact" => "Контакт",
 "This is not your contact." => "Это не контакт.",
 "Add Contact" => "Добавить Контакт",
+"Addressbooks" => "�дре�ные книги",
+"Addressbook" => "�дре�на� книга",
 "Name" => "Им�",
+"Type" => "Тип",
 "PO Box" => "�О",
 "Extended" => "Ра�ширенный",
 "Street" => "Улица",
@@ -25,8 +40,25 @@
 "Zipcode" => "Почтовый индек�",
 "Country" => "Страна",
 "Create Contact" => "Создать Контакт",
+"Choose active Address Books" => "Выберите активные адре�ные книги",
+"New Address Book" => "�ова� адре�на� книга",
+"CardDav Link" => "С�ылка CardDAV",
+"Download" => "Скачать",
 "Edit" => "Редактировать",
 "Delete" => "Удалить",
+"Download contact" => "Скачать контакт",
+"Delete contact" => "Удалить контакт",
+"Add" => "Добавить",
+"New Addressbook" => "�ова� адре�на� книга",
+"Edit Addressbook" => "Править адре�ную книгу",
+"Displayname" => "Отображаемое им�",
+"Active" => "�ктивно",
+"Save" => "Сохранить",
+"Submit" => "Отправить",
+"Cancel" => "Отменить",
 "Birthday" => "День рождени�",
-"Phone" => "Телефон"
+"Preferred" => "Предпочитаемый",
+"Phone" => "Телефон",
+"Update" => "Обновить",
+"CardDAV syncing address:" => "�дре� �инхронизации CardDAV:"
 );
diff --git a/apps/contacts/l10n/zh_CN.php b/apps/contacts/l10n/zh_CN.php
index 5b31e773e2e..1904eff65c3 100644
--- a/apps/contacts/l10n/zh_CN.php
+++ b/apps/contacts/l10n/zh_CN.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "(�消)激活地�簿错误。",
+"There was an error adding the contact." => "添加�系人时出错。",
+"Cannot add empty property." => "无法添加空属性。",
+"At least one of the address fields has to be filled out." => "至少需�填写一项地�。",
+"Error adding contact property." => "添加�系人属性错误。",
+"Error adding addressbook." => "添加地�簿错误。",
+"Error activating addressbook." => "激活地�簿错误。",
+"Error deleting contact property." => "删除�系人属性错误。",
+"Error updating contact property." => "更新�系人属性错误。",
+"Error updating addressbook." => "更新地�簿错误",
+"Contacts" => "�系人",
 "This is not your addressbook." => "这�是您的地�簿。",
 "Contact could not be found." => "无法找到�系人。",
 "Information about vCard is incorrect. Please reload the page." => "vCard 的信��正确。请�新加载页�。",
@@ -14,9 +25,13 @@
 "Fax" => "传真",
 "Video" => "视频",
 "Pager" => "传呼机",
+"Contact" => "�系人",
 "This is not your contact." => "这�是您的�系人。",
 "Add Contact" => "添加�系人",
+"Addressbooks" => "地�簿",
+"Addressbook" => "地�簿",
 "Name" => "�称",
+"Type" => "类型",
 "PO Box" => "邮箱",
 "Extended" => "扩展",
 "Street" => "街�",
@@ -25,8 +40,25 @@
 "Zipcode" => "邮编",
 "Country" => "国家",
 "Create Contact" => "创建�系人",
+"Choose active Address Books" => "选择激活地�簿",
+"New Address Book" => "新建地�簿",
+"CardDav Link" => "CardDav 链接",
+"Download" => "下载",
 "Edit" => "编辑",
 "Delete" => "删除",
+"Download contact" => "下载�系人",
+"Delete contact" => "删除�系人",
+"Add" => "添加",
+"New Addressbook" => "新建地�簿",
+"Edit Addressbook" => "编辑地�簿",
+"Displayname" => "显示�称",
+"Active" => "激活",
+"Save" => "�存",
+"Submit" => "�交",
+"Cancel" => "�消",
 "Birthday" => "生日",
-"Phone" => "电�"
+"Preferred" => "�好",
+"Phone" => "电�",
+"Update" => "æ›´æ–°",
+"CardDAV syncing address:" => "CardDAV �步地�："
 );
diff --git a/apps/gallery/l10n/ca.php b/apps/gallery/l10n/ca.php
index f3eb40df553..119562324f4 100644
--- a/apps/gallery/l10n/ca.php
+++ b/apps/gallery/l10n/ca.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Gallery" => "Galeria",
+"Scanning directories" => "S'estan escanejant carpetes",
+"Creating thumbnails" => "S'estan creant miniatures",
+"Do you wan't to remove album" => "Voleu eliminar l'àlbum",
+"Input new gallery name" => "Escriviu el nom nou de la galeria",
 "Rescan" => "Escaneja de nou",
 "Back" => "Enrera"
 );
diff --git a/apps/gallery/l10n/da.php b/apps/gallery/l10n/da.php
new file mode 100644
index 00000000000..b9d11701f8e
--- /dev/null
+++ b/apps/gallery/l10n/da.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galleri",
+"Scanning directories" => "Gennemgår mapper",
+"Creating thumbnails" => "Danner miniaturer",
+"Do you wan't to remove album" => "Ønsker du at fjerne albummet",
+"Input new gallery name" => "Indtast navn på nyt galleri",
+"Rescan" => "Genindlæs",
+"Back" => "Tilbage"
+);
diff --git a/apps/gallery/l10n/de.php b/apps/gallery/l10n/de.php
index b7f1934189a..b229c96ac8e 100644
--- a/apps/gallery/l10n/de.php
+++ b/apps/gallery/l10n/de.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Gallery" => "Galerie",
+"Scanning directories" => "Ordner werden durchsucht.",
+"Creating thumbnails" => "Thumbnails werden erstellt.",
+"Do you wan't to remove album" => "Soll das Album entfernt werden?",
+"Input new gallery name" => "Gib den Albumnamen ein.",
 "Rescan" => "Rescan",
 "Back" => "Zurück"
 );
diff --git a/apps/gallery/l10n/es.php b/apps/gallery/l10n/es.php
index 0a32faa8477..4da953af430 100644
--- a/apps/gallery/l10n/es.php
+++ b/apps/gallery/l10n/es.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Gallery" => "Galería",
+"Scanning directories" => "Escaneando directorios",
+"Creating thumbnails" => "Creando miniaturas",
+"Do you wan't to remove album" => "Quieres eliminar el álbum",
+"Input new gallery name" => "Introduce el nuevo nombre de la galería",
 "Rescan" => "Refrescar",
 "Back" => "Atrás"
 );
diff --git a/apps/gallery/l10n/fr.php b/apps/gallery/l10n/fr.php
index 17902bd70c9..6668ec6da6b 100644
--- a/apps/gallery/l10n/fr.php
+++ b/apps/gallery/l10n/fr.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Gallery" => "Galerie",
+"Scanning directories" => "Analyse des répertoires",
+"Creating thumbnails" => "Création des miniatures",
+"Do you wan't to remove album" => "Voulez-vous supprimer l'album",
+"Input new gallery name" => "Entrez le nom de l'album",
 "Rescan" => "Analyser à nouveau",
 "Back" => "Retour"
 );
diff --git a/apps/gallery/l10n/pl.php b/apps/gallery/l10n/pl.php
index eb35732782b..0b2bf9f3ccb 100644
--- a/apps/gallery/l10n/pl.php
+++ b/apps/gallery/l10n/pl.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Gallery" => "Galeria",
+"Scanning directories" => "Skanuje katalogi",
+"Creating thumbnails" => "Tworzenie miniatur",
+"Do you wan't to remove album" => "Czy chcesz usunąć album",
+"Input new gallery name" => "Wprowadź nową nazwę galerii",
 "Rescan" => "Przeskanuj",
 "Back" => "Wróć"
 );
diff --git a/apps/gallery/l10n/ru.php b/apps/gallery/l10n/ru.php
new file mode 100644
index 00000000000..cc211f6c1e2
--- /dev/null
+++ b/apps/gallery/l10n/ru.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Галере�",
+"Scanning directories" => "Сканирование папок",
+"Creating thumbnails" => "Создание миниатюр",
+"Do you wan't to remove album" => "Вы желаете удалить альбом",
+"Input new gallery name" => "Введите название галереи",
+"Rescan" => "Пере�канировать",
+"Back" => "�азад"
+);
diff --git a/apps/gallery/l10n/zh_CN.php b/apps/gallery/l10n/zh_CN.php
index c506600c4c0..c7d37692ae0 100644
--- a/apps/gallery/l10n/zh_CN.php
+++ b/apps/gallery/l10n/zh_CN.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Gallery" => "画廊",
+"Gallery" => "图库",
+"Scanning directories" => "扫�目录",
+"Creating thumbnails" => "创建缩略图",
+"Do you wan't to remove album" => "您是�想�移除相册",
+"Input new gallery name" => "输入新图库�称",
 "Rescan" => "�新扫�",
 "Back" => "返回"
 );
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 12dd26a3507..0fe8c079f27 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Сбро� парол� OwnCloud",
+"Use the following link to reset your password: {link}" => "И�пользуйте �ледующую ��ылку чтобы �бро�ить пароль: {link}",
 "You will receive a link to reset your password via Email." => "�а ваш адре� Email вы�лана ��ылка дл� �бро�а парол�.",
 "Requested" => "Запрошено",
 "Login failed!" => "�е удало�ь войти!",
 "Username" => "Им� пользовател�",
 "Request reset" => "Запро�ить �бро�",
 "Your password was reset" => "Ваш пароль был �брошен",
+"To login page" => "�а �траницу авторизации",
 "New password" => "�овый пароль",
 "Reset password" => "Сбро�ить пароль",
 "Personal" => "Личное",
@@ -24,10 +27,12 @@
 "Database name" => "�азвание базы данных",
 "Database host" => "Хо�т базы данных",
 "Finish setup" => "Завершить у�тановку",
+"web services under your control" => "Сетевые �лужбы под твоим контролем",
 "Log out" => "Выйти",
 "Settings" => "�а�тройки",
 "Lost your password?" => "Забыли пароль?",
 "remember" => "запомнить",
+"Log in" => "Войти",
 "You are logged out." => "Вы вышли.",
 "prev" => "пред",
 "next" => "�лед"
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 8ab1419fed2..8a3daa097f3 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "�置 Owncloud 密�",
+"Use the following link to reset your password: {link}" => "使用以下链接�置您的密�：{link}",
 "You will receive a link to reset your password via Email." => "您将会收到包��以�置密�链接的邮件。",
 "Requested" => "已请求",
 "Login failed!" => "登录失败�",
 "Username" => "用户�",
 "Request reset" => "请求�置",
 "Your password was reset" => "您的密�已�置",
+"To login page" => "到登录页�",
 "New password" => "新密�",
 "Reset password" => "�置密�",
 "Personal" => "个人",
@@ -24,10 +27,12 @@
 "Database name" => "数�库�",
 "Database host" => "数�库主机",
 "Finish setup" => "安装完�",
+"web services under your control" => "由您掌控的网络�务",
 "Log out" => "注销",
 "Settings" => "设置",
 "Lost your password?" => "忘记密�？",
 "remember" => "记�",
+"Log in" => "登录",
 "You are logged out." => "您已注销。",
 "prev" => "上一页",
 "next" => "下一页"
diff --git a/files/l10n/ru.php b/files/l10n/ru.php
index a77e6e370b4..88a6d8ee19c 100644
--- a/files/l10n/ru.php
+++ b/files/l10n/ru.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "�евозможно найти временную директорию",
 "Files" => "Файлы",
 "Maximum upload size" => "Мак�имальный размер файла",
+"New" => "�овый",
+"Text file" => "Тек�товый файл",
+"Folder" => "Папка",
+"From the web" => "Из интернета",
 "Upload" => "Закачать",
 "Nothing in here. Upload something!" => "Зде�ь ничего нет. Закачайте что-нибудь!",
 "Name" => "�азвание",
diff --git a/files/l10n/zh_CN.php b/files/l10n/zh_CN.php
index a4d7283df87..ab23a55d29e 100644
--- a/files/l10n/zh_CN.php
+++ b/files/l10n/zh_CN.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "缺少临时目录",
 "Files" => "文件",
 "Maximum upload size" => "最大上传大�",
+"New" => "新建",
+"Text file" => "文本文件",
+"Folder" => "文件夹",
+"From the web" => "�自网络",
 "Upload" => "上传",
 "Nothing in here. Upload something!" => "这里还什么都没有。上传些东西��",
 "Name" => "�称",
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 16d1dd7400c..04c2630a1aa 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ar/gallery.po b/l10n/ar/gallery.po
index fdf349f64e9..e423011a523 100644
--- a/l10n/ar/gallery.po
+++ b/l10n/ar/gallery.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -26,22 +26,22 @@ msgstr "معرض صور"
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr "اعادة البحث"
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index 3fc02dc13b7..77a01bae26d 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:49+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/gallery.po b/l10n/bg_BG/gallery.po
index 5b1d5ad685b..342a60c277f 100644
--- a/l10n/bg_BG/gallery.po
+++ b/l10n/bg_BG/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index bd1544e0b84..3caa70ae4af 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ca/gallery.po b/l10n/ca/gallery.po
index 93c7325189f..4beba794f42 100644
--- a/l10n/ca/gallery.po
+++ b/l10n/ca/gallery.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -24,23 +24,23 @@ msgstr "Galeria"
 
 #: js/album_cover.js:40
 msgid "Scanning directories"
+msgstr "S'estan escanejant carpetes"
+
+#: js/album_cover.js:48
+msgid "No photos found"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
-msgstr ""
+msgstr "S'estan creant miniatures"
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
-msgstr ""
+msgstr "Voleu eliminar l'àlbum"
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
-msgstr ""
-
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
+msgstr "Escriviu el nom nou de la galeria"
 
 #: templates/index.php:10
 msgid "Rescan"
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 7e91e188747..ff33e13c356 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/gallery.po b/l10n/cs_CZ/gallery.po
index e298dfe9d72..2c93e04ef97 100644
--- a/l10n/cs_CZ/gallery.po
+++ b/l10n/cs_CZ/gallery.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -26,22 +26,22 @@ msgstr "Galerie"
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr "Opakované prohledání"
diff --git a/l10n/da/calendar.po b/l10n/da/calendar.po
index 607272c5aea..f292f2391c3 100644
--- a/l10n/da/calendar.po
+++ b/l10n/da/calendar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-21 00:41+0000\n"
+"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +32,7 @@ msgstr "Tidszone ændret"
 msgid "Invalid request"
 msgstr "Ugyldig forespørgsel"
 
-#: appinfo/app.php:20 templates/calendar.php:13
+#: appinfo/app.php:20 templates/calendar.php:14
 #: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Kalender"
@@ -179,7 +179,7 @@ msgstr "øndag"
 
 #: lib/object.php:396
 msgid "events week of month"
-msgstr ""
+msgstr "begivenhedens uge i måneden"
 
 #: lib/object.php:397
 msgid "first"
@@ -259,7 +259,7 @@ msgstr "efter begivenheders dato"
 
 #: lib/object.php:442
 msgid "by yearday(s)"
-msgstr ""
+msgstr "efter dag(e) i året"
 
 #: lib/object.php:443
 msgid "by weeknumber(s)"
@@ -285,59 +285,63 @@ msgstr "Kal."
 msgid "All day"
 msgstr "Hele dagen"
 
-#: templates/calendar.php:11
+#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Ny Kalender"
+
+#: templates/calendar.php:12
 msgid "Missing fields"
 msgstr "Manglende felter"
 
-#: templates/calendar.php:12 templates/part.eventform.php:3
+#: templates/calendar.php:13 templates/part.eventform.php:3
 msgid "Title"
 msgstr "Titel"
 
-#: templates/calendar.php:14
+#: templates/calendar.php:15
 msgid "From Date"
 msgstr "Fra dato"
 
-#: templates/calendar.php:15
+#: templates/calendar.php:16
 msgid "From Time"
 msgstr "Fra tidspunkt"
 
-#: templates/calendar.php:16
+#: templates/calendar.php:17
 msgid "To Date"
 msgstr "Til dato"
 
-#: templates/calendar.php:17
+#: templates/calendar.php:18
 msgid "To Time"
 msgstr "Til tidspunkt"
 
-#: templates/calendar.php:18
+#: templates/calendar.php:19
 msgid "The event ends before it starts"
 msgstr "Begivenheden slutter, inden den begynder"
 
-#: templates/calendar.php:19
+#: templates/calendar.php:20
 msgid "There was a database fail"
 msgstr "Der var en fejl i databasen"
 
-#: templates/calendar.php:52
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Uge"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "MÃ¥ned"
 
-#: templates/calendar.php:54
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:46
 msgid "Today"
 msgstr "I dag"
 
-#: templates/calendar.php:60
+#: templates/calendar.php:47
 msgid "Calendars"
 msgstr "Kalendere"
 
-#: templates/calendar.php:78
+#: templates/calendar.php:65
 msgid "There was a fail, while parsing the file."
 msgstr "Der opstod en fejl under gennemlæsning af filen."
 
@@ -421,10 +425,6 @@ msgstr "Dec."
 msgid "Choose active calendars"
 msgstr "Vælg aktive kalendere"
 
-#: templates/part.choosecalendar.php:15
-msgid "New Calendar"
-msgstr "Ny Kalender"
-
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
@@ -530,11 +530,11 @@ msgstr "Vælg dage"
 
 #: templates/part.eventform.php:130
 msgid "and the events day of year."
-msgstr ""
+msgstr "og begivenhedens dag i året."
 
 #: templates/part.eventform.php:143
 msgid "and the events day of month."
-msgstr ""
+msgstr "og begivenhedens sag på måneden"
 
 #: templates/part.eventform.php:151
 msgid "Select months"
@@ -546,7 +546,7 @@ msgstr "Vælg uger"
 
 #: templates/part.eventform.php:169
 msgid "and the events week of year."
-msgstr ""
+msgstr "og begivenhedens uge i året."
 
 #: templates/part.eventform.php:175
 msgid "Interval"
@@ -578,7 +578,7 @@ msgstr "Beskrivelse af begivenheden"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Importer en kalenderfil"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -586,11 +586,11 @@ msgstr "Vælg venligst kalender"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "opret en ny kalender"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Navn på ny kalender"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -598,15 +598,15 @@ msgstr "Importer"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Importerer kalender"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Kalender importeret korrekt"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Luk dialog"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index ffce17b2942..b8891a85cc9 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
@@ -22,47 +22,47 @@ msgstr ""
 
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "Fejl ved (de)aktivering af adressebogen"
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "Der opstod en fejl ved tilføjelse af kontaktpersonen."
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "Kan ikke tilføje en egenskab uden indhold."
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "Der skal udfyldes mindst et adressefelt."
 
 #: ajax/addproperty.php:78
 msgid "Error adding contact property."
-msgstr ""
+msgstr "Fejl ved tilføjelse af egenskab."
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "Fejl ved tilføjelse af adressebog."
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Fejl ved aktivering af adressebog."
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Fejl ved sletning af egenskab for kontaktperson."
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Fejl ved opdatering af egenskab for kontaktperson."
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Fejl ved opdatering af adressebog"
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Kontaktpersoner"
 
 #: lib/app.php:52
 msgid "This is not your addressbook."
@@ -129,7 +129,7 @@ msgstr "Personsøger"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Kontaktperson"
 
 #: photo.php:42
 msgid "This is not your contact."
@@ -141,11 +141,11 @@ msgstr "Tilføj kontaktperson"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "Adressebøger"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "Adressebog"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -223,7 +223,7 @@ msgstr "Slet"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Download kontaktperson"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
@@ -235,11 +235,11 @@ msgstr "Tilføj"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Ny adressebog"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Rediger adressebog"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -279,6 +279,6 @@ msgstr "Opdater"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "Synkroniseringsadresse for CardDAV:"
 
 
diff --git a/l10n/da/gallery.po b/l10n/da/gallery.po
index e765c472b0c..4833f709fb3 100644
--- a/l10n/da/gallery.po
+++ b/l10n/da/gallery.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
@@ -19,34 +20,34 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "Galleri"
 
 #: js/album_cover.js:40
 msgid "Scanning directories"
+msgstr "Gennemgår mapper"
+
+#: js/album_cover.js:48
+msgid "No photos found"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
-msgstr ""
+msgstr "Danner miniaturer"
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
-msgstr ""
+msgstr "Ønsker du at fjerne albummet"
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
-msgstr ""
-
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
+msgstr "Indtast navn på nyt galleri"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Genindlæs"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Tilbage"
 
 
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 16570895369..1cba59ed7e5 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <icewind1991@gmail.com>, 2012.
 #   <mikkelbjerglarsen@gmail.com>, 2011.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
@@ -10,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2012-01-21 23:05+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index a253810f608..84f23b5bd1f 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de/gallery.po b/l10n/de/gallery.po
index a13373b37c2..648a6b28549 100644
--- a/l10n/de/gallery.po
+++ b/l10n/de/gallery.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <admin@s-goecker.de>, 2012.
 # Bartek  <bart.p.pl@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
@@ -24,23 +25,23 @@ msgstr "Galerie"
 
 #: js/album_cover.js:40
 msgid "Scanning directories"
+msgstr "Ordner werden durchsucht."
+
+#: js/album_cover.js:48
+msgid "No photos found"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
-msgstr ""
+msgstr "Thumbnails werden erstellt."
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
-msgstr ""
+msgstr "Soll das Album entfernt werden?"
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
-msgstr ""
-
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
+msgstr "Gib den Albumnamen ein."
 
 #: templates/index.php:10
 msgid "Rescan"
diff --git a/l10n/de_DE/calendar.po b/l10n/de_DE/calendar.po
new file mode 100644
index 00000000000..cc381094ca5
--- /dev/null
+++ b/l10n/de_DE/calendar.po
@@ -0,0 +1,636 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2011-09-03 16:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr ""
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr ""
+
+#: appinfo/app.php:20 templates/calendar.php:14
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr ""
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr ""
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr ""
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr ""
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr ""
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr ""
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr ""
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr ""
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr ""
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr ""
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr ""
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr ""
+
+#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr ""
+
+#: templates/calendar.php:12
+msgid "Missing fields"
+msgstr ""
+
+#: templates/calendar.php:13 templates/part.eventform.php:3
+msgid "Title"
+msgstr ""
+
+#: templates/calendar.php:15
+msgid "From Date"
+msgstr ""
+
+#: templates/calendar.php:16
+msgid "From Time"
+msgstr ""
+
+#: templates/calendar.php:17
+msgid "To Date"
+msgstr ""
+
+#: templates/calendar.php:18
+msgid "To Time"
+msgstr ""
+
+#: templates/calendar.php:19
+msgid "The event ends before it starts"
+msgstr ""
+
+#: templates/calendar.php:20
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr ""
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr ""
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr ""
+
+#: templates/calendar.php:46
+msgid "Today"
+msgstr ""
+
+#: templates/calendar.php:47
+msgid "Calendars"
+msgstr ""
+
+#: templates/calendar.php:65
+msgid "There was a fail, while parsing the file."
+msgstr ""
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr ""
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr ""
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr ""
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr ""
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr ""
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr ""
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr ""
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr ""
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr ""
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr ""
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr ""
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr ""
+
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr ""
+
+
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
new file mode 100644
index 00000000000..22a83603b4c
--- /dev/null
+++ b/l10n/de_DE/core.po
@@ -0,0 +1,170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr ""
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:15
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
+
+
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
new file mode 100644
index 00000000000..b9201beb1d8
--- /dev/null
+++ b/l10n/de_DE/files.po
@@ -0,0 +1,108 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr ""
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:43
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Size"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+
diff --git a/l10n/de_DE/media.po b/l10n/de_DE/media.po
new file mode 100644
index 00000000000..0e994abde23
--- /dev/null
+++ b/l10n/de_DE/media.po
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:32 templates/player.php:9
+msgid "Music"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr ""
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr ""
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr ""
+
+#: templates/music.php:38
+msgid "Album"
+msgstr ""
+
+#: templates/music.php:39
+msgid "Title"
+msgstr ""
+
+
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
new file mode 100644
index 00000000000..53aba4cebaf
--- /dev/null
+++ b/l10n/de_DE/settings.po
@@ -0,0 +1,156 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr ""
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr ""
+
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr ""
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr ""
+
+#: templates/apps.php:23
+msgid "by"
+msgstr ""
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr ""
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:17
+msgid "show"
+msgstr ""
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr ""
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr ""
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr ""
+
+#: templates/users.php:23
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr ""
+
+
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 31381646083..ecfb8c66b05 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/el/gallery.po b/l10n/el/gallery.po
index c1f7b2c2707..395f79389d0 100644
--- a/l10n/el/gallery.po
+++ b/l10n/el/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index c4781df1304..4bd4eeed285 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/team/eo/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eo/gallery.po b/l10n/eo/gallery.po
index 177eb810111..e9f6eea3044 100644
--- a/l10n/eo/gallery.po
+++ b/l10n/eo/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/team/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index 6db32c1ceeb..09e0ee8123a 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/gallery.po b/l10n/es/gallery.po
index 112bc746166..99cae8f48b2 100644
--- a/l10n/es/gallery.po
+++ b/l10n/es/gallery.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -24,23 +24,23 @@ msgstr "Galería"
 
 #: js/album_cover.js:40
 msgid "Scanning directories"
+msgstr "Escaneando directorios"
+
+#: js/album_cover.js:48
+msgid "No photos found"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
-msgstr ""
+msgstr "Creando miniaturas"
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
-msgstr ""
+msgstr "Quieres eliminar el álbum"
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
-msgstr ""
-
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
+msgstr "Introduce el nuevo nombre de la galería"
 
 #: templates/index.php:10
 msgid "Rescan"
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index 6e08cc42cde..3f416bd09f1 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/gallery.po b/l10n/et_EE/gallery.po
index f0fb20bc18d..97c7a893a5c 100644
--- a/l10n/et_EE/gallery.po
+++ b/l10n/et_EE/gallery.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -26,22 +26,22 @@ msgstr "Galerii"
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr "Skänni uuesti"
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index 9e778db67c2..93710a2b352 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/team/eu/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eu/gallery.po b/l10n/eu/gallery.po
index 703db4f8a6f..bc2d60a9fd8 100644
--- a/l10n/eu/gallery.po
+++ b/l10n/eu/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/team/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index a8803276f8b..4346f2a80a5 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fr/gallery.po b/l10n/fr/gallery.po
index c985ade5242..452dc5913bd 100644
--- a/l10n/fr/gallery.po
+++ b/l10n/fr/gallery.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -24,23 +24,23 @@ msgstr "Galerie"
 
 #: js/album_cover.js:40
 msgid "Scanning directories"
+msgstr "Analyse des répertoires"
+
+#: js/album_cover.js:48
+msgid "No photos found"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
-msgstr ""
+msgstr "Création des miniatures"
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
-msgstr ""
+msgstr "Voulez-vous supprimer l'album"
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
-msgstr ""
-
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
+msgstr "Entrez le nom de l'album"
 
 #: templates/index.php:10
 msgid "Rescan"
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index d0939b6fe50..b4590c4696d 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/gl/gallery.po b/l10n/gl/gallery.po
index 6ec6c2dd93e..6b8306e957d 100644
--- a/l10n/gl/gallery.po
+++ b/l10n/gl/gallery.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -26,22 +26,22 @@ msgstr "Galería"
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr "Voltar a analizar"
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index afd4507f44d..3f9ecf49061 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/team/he/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/he/gallery.po b/l10n/he/gallery.po
index c4712e83f0f..e887ef15e04 100644
--- a/l10n/he/gallery.po
+++ b/l10n/he/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/team/he/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index 4b8a0306558..e3c37787276 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/team/hr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hr/gallery.po b/l10n/hr/gallery.po
index b04adb4a774..e06e16b1bf0 100644
--- a/l10n/hr/gallery.po
+++ b/l10n/hr/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/team/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index c0ca509c7a4..3ffb7ba4511 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/team/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/gallery.po b/l10n/hu_HU/gallery.po
index 9e031b3b68a..d0c48004f59 100644
--- a/l10n/hu_HU/gallery.po
+++ b/l10n/hu_HU/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/team/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index 1a819611f28..5a25e75625d 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/team/hy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hy/gallery.po b/l10n/hy/gallery.po
index 9e34b9bfda2..21d7cd873d5 100644
--- a/l10n/hy/gallery.po
+++ b/l10n/hy/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/team/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index 73b29062dfd..3cc77ffc63f 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/team/ia/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ia/gallery.po b/l10n/ia/gallery.po
index 4240b743ba3..fa58412535d 100644
--- a/l10n/ia/gallery.po
+++ b/l10n/ia/gallery.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/team/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -26,22 +26,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index 3927e42f46d..f38c4dbbc2d 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:49+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/id/gallery.po b/l10n/id/gallery.po
index 683cb59cbd1..1858e5d1140 100644
--- a/l10n/id/gallery.po
+++ b/l10n/id/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 245fac94634..89d7850b449 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:49+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/it/gallery.po b/l10n/it/gallery.po
index 548843d3c52..50384155abb 100644
--- a/l10n/it/gallery.po
+++ b/l10n/it/gallery.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
@@ -26,22 +26,22 @@ msgstr "Galleria"
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr "Rileggi"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index 94ba34dd101..1c494aa69bd 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/gallery.po b/l10n/ja_JP/gallery.po
index 907b7af802e..b7a8a1935f7 100644
--- a/l10n/ja_JP/gallery.po
+++ b/l10n/ja_JP/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index 66e55595cf1..558e54c309a 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/team/lb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lb/gallery.po b/l10n/lb/gallery.po
index f8cf579161e..3ed140c2756 100644
--- a/l10n/lb/gallery.po
+++ b/l10n/lb/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/team/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index 6fd1c8fb819..77d85c36edb 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/team/lt_LT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/gallery.po b/l10n/lt_LT/gallery.po
index f6e330988ee..24c6f1f913b 100644
--- a/l10n/lt_LT/gallery.po
+++ b/l10n/lt_LT/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/team/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index e66eff907d1..35b7cc9d4d6 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:49+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/team/ms_MY/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/gallery.po b/l10n/ms_MY/gallery.po
index c8773806484..dcab2af9804 100644
--- a/l10n/ms_MY/gallery.po
+++ b/l10n/ms_MY/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/team/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index 160d950186a..80b66d6d4f3 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/team/nb_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/gallery.po b/l10n/nb_NO/gallery.po
index 3a35c810f62..b975c154278 100644
--- a/l10n/nb_NO/gallery.po
+++ b/l10n/nb_NO/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/team/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index 56c194dad88..a702fa3f1af 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nl/gallery.po b/l10n/nl/gallery.po
index 5f6f14834e8..c513524fe53 100644
--- a/l10n/nl/gallery.po
+++ b/l10n/nl/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index ec307dd8df3..9d2056844ce 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/team/nn_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/gallery.po b/l10n/nn_NO/gallery.po
index f8be7e51655..c5691499d13 100644
--- a/l10n/nn_NO/gallery.po
+++ b/l10n/nn_NO/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/team/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index c5b3e4afc76..aa910256bf5 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pl/gallery.po b/l10n/pl/gallery.po
index 0998336354e..889ea7d452c 100644
--- a/l10n/pl/gallery.po
+++ b/l10n/pl/gallery.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Bartek  <bart.p.pl@gmail.com>, 2012.
+# Marcin Małecki <gerber@tkdami.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -24,23 +25,23 @@ msgstr "Galeria"
 
 #: js/album_cover.js:40
 msgid "Scanning directories"
+msgstr "Skanuje katalogi"
+
+#: js/album_cover.js:48
+msgid "No photos found"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
-msgstr ""
+msgstr "Tworzenie miniatur"
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
-msgstr ""
+msgstr "Czy chcesz usunąć album"
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
-msgstr ""
-
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
+msgstr "Wprowadź nową nazwę galerii"
 
 #: templates/index.php:10
 msgid "Rescan"
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index 4d172ea0110..6e7c01e85fb 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:49+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/gallery.po b/l10n/pt_BR/gallery.po
index 779ec19b932..2044b51b14b 100644
--- a/l10n/pt_BR/gallery.po
+++ b/l10n/pt_BR/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index c10cf84d371..069fcb05c90 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/team/pt_PT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/gallery.po b/l10n/pt_PT/gallery.po
index 4db4c8ab61d..f6cbe83280a 100644
--- a/l10n/pt_PT/gallery.po
+++ b/l10n/pt_PT/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/team/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/ro/calendar.po b/l10n/ro/calendar.po
index ff06c8671a1..7218e65c3f0 100644
--- a/l10n/ro/calendar.po
+++ b/l10n/ro/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 07:11+0000\n"
+"Last-Translator: Claudiu <claudiu@tanaselia.ro>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +31,7 @@ msgstr "A fost schimbat fusul orar"
 msgid "Invalid request"
 msgstr "Cerere eronată"
 
-#: appinfo/app.php:20 templates/calendar.php:13
+#: appinfo/app.php:20 templates/calendar.php:14
 #: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Calendar"
@@ -284,59 +284,63 @@ msgstr "Cal."
 msgid "All day"
 msgstr "Toată ziua"
 
-#: templates/calendar.php:11
+#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "Calendar nou"
+
+#: templates/calendar.php:12
 msgid "Missing fields"
 msgstr "Câmpuri lipsă"
 
-#: templates/calendar.php:12 templates/part.eventform.php:3
+#: templates/calendar.php:13 templates/part.eventform.php:3
 msgid "Title"
 msgstr "Titlu"
 
-#: templates/calendar.php:14
+#: templates/calendar.php:15
 msgid "From Date"
 msgstr "Începând cu"
 
-#: templates/calendar.php:15
+#: templates/calendar.php:16
 msgid "From Time"
 msgstr "De la"
 
-#: templates/calendar.php:16
+#: templates/calendar.php:17
 msgid "To Date"
 msgstr "Până pe"
 
-#: templates/calendar.php:17
+#: templates/calendar.php:18
 msgid "To Time"
 msgstr "La"
 
-#: templates/calendar.php:18
+#: templates/calendar.php:19
 msgid "The event ends before it starts"
 msgstr "Evenimentul se termină înainte să înceapă"
 
-#: templates/calendar.php:19
+#: templates/calendar.php:20
 msgid "There was a database fail"
 msgstr "A avut loc o eroare a bazei de date"
 
-#: templates/calendar.php:52
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Săptămâna"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Luna"
 
-#: templates/calendar.php:54
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Listă"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:46
 msgid "Today"
 msgstr "Astăzi"
 
-#: templates/calendar.php:60
+#: templates/calendar.php:47
 msgid "Calendars"
 msgstr "Calendare"
 
-#: templates/calendar.php:78
+#: templates/calendar.php:65
 msgid "There was a fail, while parsing the file."
 msgstr "A fost întâmpinată o eroare în procesarea fișierului"
 
@@ -420,10 +424,6 @@ msgstr "Dec."
 msgid "Choose active calendars"
 msgstr "Alege activitățile din calendar"
 
-#: templates/part.choosecalendar.php:15
-msgid "New Calendar"
-msgstr "Calendar nou"
-
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
@@ -577,7 +577,7 @@ msgstr "Descrierea evenimentului"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Importă un calendar"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -585,11 +585,11 @@ msgstr "Alegeți calendarul"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "crează un calendar nou"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Numele noului calendar"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -597,15 +597,15 @@ msgstr "Importă"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Importă calendar"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Calendarul a fost importat cu succes"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "ÃŽnchide"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index d849b4bd444..039b7b1f191 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ro/gallery.po b/l10n/ro/gallery.po
index abadcf580cc..38d92f23af2 100644
--- a/l10n/ro/gallery.po
+++ b/l10n/ro/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/ru/calendar.po b/l10n/ru/calendar.po
index ced4bad48e3..48668f7dea8 100644
--- a/l10n/ru/calendar.po
+++ b/l10n/ru/calendar.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <jekader@gmail.com>, 2011.
+#   <jekader@gmail.com>, 2011, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-21 21:02+0000\n"
+"Last-Translator: jekader <jekader@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ajax/guesstimezone.php:42
 msgid "New Timezone:"
-msgstr ""
+msgstr "�овый ча�овой по��:"
 
 #: ajax/settimezone.php:22
 msgid "Timezone changed"
@@ -31,7 +31,7 @@ msgstr "Ча�овой по�� изменён"
 msgid "Invalid request"
 msgstr "�еверный запро�"
 
-#: appinfo/app.php:20 templates/calendar.php:13
+#: appinfo/app.php:20 templates/calendar.php:14
 #: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "Календарь"
@@ -130,143 +130,143 @@ msgstr "Каждый год"
 
 #: lib/object.php:366
 msgid "never"
-msgstr ""
+msgstr "никогда"
 
 #: lib/object.php:367
 msgid "by occurrences"
-msgstr ""
+msgstr "по чи�лу повторений"
 
 #: lib/object.php:368
 msgid "by date"
-msgstr ""
+msgstr "по дате"
 
 #: lib/object.php:375
 msgid "by monthday"
-msgstr ""
+msgstr "по дню ме��ца"
 
 #: lib/object.php:376
 msgid "by weekday"
-msgstr ""
+msgstr "по дню недели"
 
 #: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr ""
+msgstr "Понедельник"
 
 #: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr ""
+msgstr "Вторник"
 
 #: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr ""
+msgstr "Среда"
 
 #: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr ""
+msgstr "Четверг"
 
 #: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr ""
+msgstr "П�тница"
 
 #: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr ""
+msgstr "Суббота"
 
 #: lib/object.php:389 templates/lAfix.php:2
 msgid "Sunday"
-msgstr ""
+msgstr "Во�кре�енье"
 
 #: lib/object.php:396
 msgid "events week of month"
-msgstr ""
+msgstr "недел� ме��ца"
 
 #: lib/object.php:397
 msgid "first"
-msgstr ""
+msgstr "перва�"
 
 #: lib/object.php:398
 msgid "second"
-msgstr ""
+msgstr "втора�"
 
 #: lib/object.php:399
 msgid "third"
-msgstr ""
+msgstr "треть�"
 
 #: lib/object.php:400
 msgid "fourth"
-msgstr ""
+msgstr "червётра�"
 
 #: lib/object.php:401
 msgid "fifth"
-msgstr ""
+msgstr "п�та�"
 
 #: lib/object.php:402
 msgid "last"
-msgstr ""
+msgstr "по�ледн��"
 
 #: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr ""
+msgstr "Март"
 
 #: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr ""
+msgstr "�прель"
 
 #: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr ""
+msgstr "�вгу�т"
 
 #: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr ""
+msgstr "Сент�брь"
 
 #: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr ""
+msgstr "Окт�брь"
 
 #: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr ""
+msgstr "�о�брь"
 
 #: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #: lib/object.php:441
 msgid "by events date"
-msgstr ""
+msgstr "по дате �обытий"
 
 #: lib/object.php:442
 msgid "by yearday(s)"
-msgstr ""
+msgstr "по дн�м недели"
 
 #: lib/object.php:443
 msgid "by weeknumber(s)"
-msgstr ""
+msgstr "по номерам недели"
 
 #: lib/object.php:444
 msgid "by day and month"
-msgstr ""
+msgstr "по дню и ме��цу"
 
 #: lib/object.php:467
 msgid "Not an array"
@@ -274,156 +274,156 @@ msgstr "�е ма��ив"
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
-msgstr ""
+msgstr "Дата"
 
 #: lib/search.php:40
 msgid "Cal."
-msgstr ""
+msgstr "Кал."
 
 #: templates/calendar.php:10
 msgid "All day"
 msgstr "Ве�ь день"
 
-#: templates/calendar.php:11
+#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "�овый Календарь"
+
+#: templates/calendar.php:12
 msgid "Missing fields"
 msgstr "�езаполненные пол�"
 
-#: templates/calendar.php:12 templates/part.eventform.php:3
+#: templates/calendar.php:13 templates/part.eventform.php:3
 msgid "Title"
 msgstr "�азвание"
 
-#: templates/calendar.php:14
+#: templates/calendar.php:15
 msgid "From Date"
 msgstr "Дата начала"
 
-#: templates/calendar.php:15
+#: templates/calendar.php:16
 msgid "From Time"
 msgstr "Врем� начала"
 
-#: templates/calendar.php:16
+#: templates/calendar.php:17
 msgid "To Date"
 msgstr "Дата окончани�"
 
-#: templates/calendar.php:17
+#: templates/calendar.php:18
 msgid "To Time"
 msgstr "Врем� окончани�"
 
-#: templates/calendar.php:18
+#: templates/calendar.php:19
 msgid "The event ends before it starts"
 msgstr "Окончание �обыти� раньше, чем его начало"
 
-#: templates/calendar.php:19
+#: templates/calendar.php:20
 msgid "There was a database fail"
 msgstr "Ошибка базы данных"
 
-#: templates/calendar.php:52
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "�едел�"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Ме��ц"
 
-#: templates/calendar.php:54
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Спи�ок"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:46
 msgid "Today"
 msgstr "Сегодн�"
 
-#: templates/calendar.php:60
+#: templates/calendar.php:47
 msgid "Calendars"
 msgstr "Календари"
 
-#: templates/calendar.php:78
+#: templates/calendar.php:65
 msgid "There was a fail, while parsing the file."
 msgstr "�е удало�ь обработать файл."
 
 #: templates/lAfix.php:9
 msgid "Sun."
-msgstr ""
+msgstr "В�."
 
 #: templates/lAfix.php:10
 msgid "Mon."
-msgstr ""
+msgstr "Пн."
 
 #: templates/lAfix.php:11
 msgid "Tue."
-msgstr ""
+msgstr "Ð’Ñ‚."
 
 #: templates/lAfix.php:12
 msgid "Wed."
-msgstr ""
+msgstr "Ср."
 
 #: templates/lAfix.php:13
 msgid "Thu."
-msgstr ""
+msgstr "Чт."
 
 #: templates/lAfix.php:14
 msgid "Fri."
-msgstr ""
+msgstr "Пт."
 
 #: templates/lAfix.php:15
 msgid "Sat."
-msgstr ""
+msgstr "Сб."
 
 #: templates/lAfix.php:28
 msgid "Jan."
-msgstr ""
+msgstr "Янв."
 
 #: templates/lAfix.php:29
 msgid "Feb."
-msgstr ""
+msgstr "Фев."
 
 #: templates/lAfix.php:30
 msgid "Mar."
-msgstr ""
+msgstr "Мар."
 
 #: templates/lAfix.php:31
 msgid "Apr."
-msgstr ""
+msgstr "Сен."
 
 #: templates/lAfix.php:32
 msgid "May."
-msgstr ""
+msgstr "Май."
 
 #: templates/lAfix.php:33
 msgid "Jun."
-msgstr ""
+msgstr "Июн."
 
 #: templates/lAfix.php:34
 msgid "Jul."
-msgstr ""
+msgstr "Июл."
 
 #: templates/lAfix.php:35
 msgid "Aug."
-msgstr ""
+msgstr "�вг."
 
 #: templates/lAfix.php:36
 msgid "Sep."
-msgstr ""
+msgstr "Сен."
 
 #: templates/lAfix.php:37
 msgid "Oct."
-msgstr ""
+msgstr "Окт."
 
 #: templates/lAfix.php:38
 msgid "Nov."
-msgstr ""
+msgstr "�о�."
 
 #: templates/lAfix.php:39
 msgid "Dec."
-msgstr ""
+msgstr "Дек."
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "Выберите активные календари"
 
-#: templates/part.choosecalendar.php:15
-msgid "New Calendar"
-msgstr "�овый Календарь"
-
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
@@ -517,47 +517,47 @@ msgstr "Повтор"
 
 #: templates/part.eventform.php:68
 msgid "Advanced"
-msgstr ""
+msgstr "Дополнительно"
 
 #: templates/part.eventform.php:112
 msgid "Select weekdays"
-msgstr ""
+msgstr "Выбрать дни недели"
 
 #: templates/part.eventform.php:125 templates/part.eventform.php:138
 msgid "Select days"
-msgstr ""
+msgstr "Выбрать дни"
 
 #: templates/part.eventform.php:130
 msgid "and the events day of year."
-msgstr ""
+msgstr "и день года �обыти�"
 
 #: templates/part.eventform.php:143
 msgid "and the events day of month."
-msgstr ""
+msgstr "и день ме��ца �обыти�"
 
 #: templates/part.eventform.php:151
 msgid "Select months"
-msgstr ""
+msgstr "Выбрать ме��цы"
 
 #: templates/part.eventform.php:164
 msgid "Select weeks"
-msgstr ""
+msgstr "Выбрать недели"
 
 #: templates/part.eventform.php:169
 msgid "and the events week of year."
-msgstr ""
+msgstr "и номер недели �обыти�"
 
 #: templates/part.eventform.php:175
 msgid "Interval"
-msgstr ""
+msgstr "Интервал"
 
 #: templates/part.eventform.php:181
 msgid "End"
-msgstr ""
+msgstr "Окончание"
 
 #: templates/part.eventform.php:193
 msgid "occurrences"
-msgstr ""
+msgstr "повторений"
 
 #: templates/part.eventform.php:208
 msgid "Location"
@@ -577,7 +577,7 @@ msgstr "Опи�ание �обыти�"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Импортировать календарь из файла"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -585,11 +585,11 @@ msgstr "Пожалуй�та, выберите календарь"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "Создать новый календарь"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "�азвание нового календар�"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -597,15 +597,15 @@ msgstr "Импортировать"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Импортирует�� календарь"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Календарь у�пешно импортирован"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Закрыть Сообщение"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
@@ -617,7 +617,7 @@ msgstr "Ча�овой по��"
 
 #: templates/settings.php:30
 msgid "Check always for changes of the timezone"
-msgstr ""
+msgstr "В�егда провер�йте изменение ча�ового по��а"
 
 #: templates/settings.php:32
 msgid "Timeformat"
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index 4a1f7d836e8..051d0da34e3 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <jekader@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:49+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -20,47 +21,47 @@ msgstr ""
 
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "Ошибка (де)активации адре�ной книги."
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "Произошла ошибка при добавлении контакта."
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "�евозможно добавить пу�той параметр."
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "Как минимум одно поле адре�а должно быть заполнено."
 
 #: ajax/addproperty.php:78
 msgid "Error adding contact property."
-msgstr ""
+msgstr "Ошибка добавлени� информации к контакту."
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "Ошибка добавлени� адре�ной книги."
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Ошибка активации адре�ной книги."
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Ошибка удалени� информации из контакта."
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Ошибка обновлени� информации контакта."
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Ошибка обновлени� адре�ной книги."
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Контакты"
 
 #: lib/app.php:52
 msgid "This is not your addressbook."
@@ -127,7 +128,7 @@ msgstr "Пейджер"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Контакт"
 
 #: photo.php:42
 msgid "This is not your contact."
@@ -139,11 +140,11 @@ msgstr "Добавить Контакт"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "�дре�ные книги"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "�дре�на� книга"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -153,7 +154,7 @@ msgstr "Им�"
 #: templates/part.details.php:79 templates/part.setpropertyform.php:10
 #: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 
 #: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
@@ -196,20 +197,20 @@ msgstr "Создать Контакт"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Выберите активные адре�ные книги"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "�ова� адре�на� книга"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "С�ылка CardDAV"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "Скачать"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -221,43 +222,43 @@ msgstr "Удалить"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Скачать контакт"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
-msgstr ""
+msgstr "Удалить контакт"
 
 #: templates/part.details.php:34
 msgid "Add"
-msgstr ""
+msgstr "Добавить"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "�ова� адре�на� книга"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Править адре�ную книгу"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Отображаемое им�"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "�ктивно"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Сохранить"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Отправить"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Отменить"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -265,7 +266,7 @@ msgstr "День рождени�"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Предпочитаемый"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -273,10 +274,10 @@ msgstr "Телефон"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
-msgstr ""
+msgstr "Обновить"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "�дре� �инхронизации CardDAV:"
 
 
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 550baa3e729..0261b8c0697 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <jekader@gmail.com>, 2011.
+#   <jekader@gmail.com>, 2011, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2012-01-21 20:30+0000\n"
+"Last-Translator: jekader <jekader@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,11 +21,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Сбро� парол� OwnCloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "И�пользуйте �ледующую ��ылку чтобы �бро�ить пароль: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -54,7 +54,7 @@ msgstr "Ваш пароль был �брошен"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "�а �траницу авторизации"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -135,7 +135,7 @@ msgstr "Завершить у�тановку"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "Сетевые �лужбы под твоим контролем"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -155,7 +155,7 @@ msgstr "запомнить"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Войти"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 55cec9ff4f8..d29c105d40f 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <jekader@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2012-01-21 20:27+0000\n"
+"Last-Translator: jekader <jekader@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,19 +57,19 @@ msgstr "Мак�имальный размер файла"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "�овый"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "Тек�товый файл"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Папка"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "Из интернета"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/ru/gallery.po b/l10n/ru/gallery.po
index fe42f28fae6..fa5b5be4e20 100644
--- a/l10n/ru/gallery.po
+++ b/l10n/ru/gallery.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <jekader@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -19,34 +20,34 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "Галере�"
 
 #: js/album_cover.js:40
 msgid "Scanning directories"
+msgstr "Сканирование папок"
+
+#: js/album_cover.js:48
+msgid "No photos found"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
-msgstr ""
+msgstr "Создание миниатюр"
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
-msgstr ""
+msgstr "Вы желаете удалить альбом"
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
-msgstr ""
-
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
+msgstr "Введите название галереи"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Пере�канировать"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "�азад"
 
 
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 802e2953a87..aa1550c4e7f 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <icewind1991@gmail.com>, 2012.
+#   <jekader@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2012-01-21 23:05+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +22,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "адре� �лектронной почты изменён"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -40,7 +42,7 @@ msgstr ""
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Уровень детализации журнала"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -108,15 +110,17 @@ msgstr "Сменить пароль"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "e-mail"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Ваш адре� �лектронной почты"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
+"Введите адре� �лектронной почты чтобы по�вила�ь возможно�ть во��тановлени� "
+"парол�"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -124,7 +128,7 @@ msgstr "Язык"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Помочь � переводом"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -150,7 +154,7 @@ msgstr "Создать"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Квота"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index d98210cfa3f..e253d0345f9 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/gallery.po b/l10n/sk_SK/gallery.po
index 9270dc25804..0d40649df6a 100644
--- a/l10n/sk_SK/gallery.po
+++ b/l10n/sk_SK/gallery.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -26,22 +26,22 @@ msgstr "Galéria"
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr "Znovu oskenovať"
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index fb661130434..d4af2dc65cb 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/team/sl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sl/gallery.po b/l10n/sl/gallery.po
index ed5208a1ae7..9f78e9c6c55 100644
--- a/l10n/sl/gallery.po
+++ b/l10n/sl/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/team/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 32ce3cfac20..b9b5d89d5e3 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:49+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr/gallery.po b/l10n/sr/gallery.po
index 4ffebad8d4a..c39d33fb1bf 100644
--- a/l10n/sr/gallery.po
+++ b/l10n/sr/gallery.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -26,22 +26,22 @@ msgstr "Галерија"
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr "Претражи поново"
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index 133eb13f2ba..9953de7e4ba 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:49+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/team/sr@latin/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/gallery.po b/l10n/sr@latin/gallery.po
index 6d6f21685bf..a123809975e 100644
--- a/l10n/sr@latin/gallery.po
+++ b/l10n/sr@latin/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/team/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index a12092dc130..73543943dd9 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:49+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sv/gallery.po b/l10n/sv/gallery.po
index cbd01482855..48c30ca1579 100644
--- a/l10n/sv/gallery.po
+++ b/l10n/sv/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index b364cf1b057..c110dfdc0bc 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index c7d12bbf019..040a5934646 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 62e429ec5eb..6915a1438e0 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 86d9b34a670..ce0f7d8d6f5 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index f418fa7b3cb..899544a3dbc 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 4a153f1971a..ece252e0ead 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 4938623c765..d016d78831b 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/calendar.po b/l10n/th_TH/calendar.po
index f51c2c89aff..17e3ebd979b 100644
--- a/l10n/th_TH/calendar.po
+++ b/l10n/th_TH/calendar.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 09:18+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-22 15:39+0000\n"
 "Last-Translator: AriesAnywhere Anywhere <ariesanywherer@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/team/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -133,7 +133,7 @@ msgstr ""
 
 #: lib/object.php:367
 msgid "by occurrences"
-msgstr ""
+msgstr "ตามจำนวนที่ปรา��"
 
 #: lib/object.php:368
 msgid "by date"
@@ -556,7 +556,7 @@ msgstr "สิ้นสุด"
 
 #: templates/part.eventform.php:193
 msgid "occurrences"
-msgstr ""
+msgstr "จำนวนที่ปรา��"
 
 #: templates/part.eventform.php:208
 msgid "Location"
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index 781dc3b586f..2e89cb76c3b 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/team/th_TH/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/gallery.po b/l10n/th_TH/gallery.po
index 485d27fc0e0..3ca106a7b7d 100644
--- a/l10n/th_TH/gallery.po
+++ b/l10n/th_TH/gallery.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/team/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -26,22 +26,22 @@ msgstr "��ลอรี่"
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr "ตรวจสอบอี�ครั้ง"
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index 25ce26edea0..0d3a4a77619 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/team/tr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/tr/gallery.po b/l10n/tr/gallery.po
index 13c1b9e6fe2..f50e537ef55 100644
--- a/l10n/tr/gallery.po
+++ b/l10n/tr/gallery.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/team/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 msgid "Scanning directories"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
 msgstr ""
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
 msgstr ""
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
 msgstr ""
 
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
-
 #: templates/index.php:10
 msgid "Rescan"
 msgstr ""
diff --git a/l10n/uk/calendar.po b/l10n/uk/calendar.po
new file mode 100644
index 00000000000..e2161b31ea5
--- /dev/null
+++ b/l10n/uk/calendar.po
@@ -0,0 +1,636 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2011-09-03 16:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/team/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/guesstimezone.php:42
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settimezone.php:22
+msgid "Timezone changed"
+msgstr ""
+
+#: ajax/settimezone.php:24
+msgid "Invalid request"
+msgstr ""
+
+#: appinfo/app.php:20 templates/calendar.php:14
+#: templates/part.eventform.php:20
+msgid "Calendar"
+msgstr ""
+
+#: lib/app.php:19
+msgid "Wrong calendar"
+msgstr ""
+
+#: lib/app.php:60 lib/object.php:332
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:61 lib/object.php:333
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:62 lib/object.php:334
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:63 lib/object.php:335
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:64 lib/object.php:336
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:65 lib/object.php:337
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:66 lib/object.php:338
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:67 lib/object.php:339
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:68 lib/object.php:340
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:69 lib/object.php:341
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:70 lib/object.php:342
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:71 lib/object.php:343
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:72 lib/object.php:344
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:73 lib/object.php:345
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:74 lib/object.php:346
+msgid "Work"
+msgstr ""
+
+#: lib/object.php:353
+msgid "Does not repeat"
+msgstr ""
+
+#: lib/object.php:354
+msgid "Daily"
+msgstr ""
+
+#: lib/object.php:355
+msgid "Weekly"
+msgstr ""
+
+#: lib/object.php:356
+msgid "Every Weekday"
+msgstr ""
+
+#: lib/object.php:357
+msgid "Bi-Weekly"
+msgstr ""
+
+#: lib/object.php:358
+msgid "Monthly"
+msgstr ""
+
+#: lib/object.php:359
+msgid "Yearly"
+msgstr ""
+
+#: lib/object.php:366
+msgid "never"
+msgstr ""
+
+#: lib/object.php:367
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:368
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:375
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:383 templates/lAfix.php:3
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:384 templates/lAfix.php:4
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:385 templates/lAfix.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:386 templates/lAfix.php:6
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:387 templates/lAfix.php:7
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:388 templates/lAfix.php:8
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:389 templates/lAfix.php:2
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:396
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:397
+msgid "first"
+msgstr ""
+
+#: lib/object.php:398
+msgid "second"
+msgstr ""
+
+#: lib/object.php:399
+msgid "third"
+msgstr ""
+
+#: lib/object.php:400
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:401
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:402
+msgid "last"
+msgstr ""
+
+#: lib/object.php:424 templates/lAfix.php:16
+msgid "January"
+msgstr ""
+
+#: lib/object.php:425 templates/lAfix.php:17
+msgid "February"
+msgstr ""
+
+#: lib/object.php:426 templates/lAfix.php:18
+msgid "March"
+msgstr ""
+
+#: lib/object.php:427 templates/lAfix.php:19
+msgid "April"
+msgstr ""
+
+#: lib/object.php:428 templates/lAfix.php:20
+msgid "May"
+msgstr ""
+
+#: lib/object.php:429 templates/lAfix.php:21
+msgid "June"
+msgstr ""
+
+#: lib/object.php:430 templates/lAfix.php:22
+msgid "July"
+msgstr ""
+
+#: lib/object.php:431 templates/lAfix.php:23
+msgid "August"
+msgstr ""
+
+#: lib/object.php:432 templates/lAfix.php:24
+msgid "September"
+msgstr ""
+
+#: lib/object.php:433 templates/lAfix.php:25
+msgid "October"
+msgstr ""
+
+#: lib/object.php:434 templates/lAfix.php:26
+msgid "November"
+msgstr ""
+
+#: lib/object.php:435 templates/lAfix.php:27
+msgid "December"
+msgstr ""
+
+#: lib/object.php:441
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:442
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:443
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:444
+msgid "by day and month"
+msgstr ""
+
+#: lib/object.php:467
+msgid "Not an array"
+msgstr ""
+
+#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:40
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:10
+msgid "All day"
+msgstr ""
+
+#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr ""
+
+#: templates/calendar.php:12
+msgid "Missing fields"
+msgstr ""
+
+#: templates/calendar.php:13 templates/part.eventform.php:3
+msgid "Title"
+msgstr ""
+
+#: templates/calendar.php:15
+msgid "From Date"
+msgstr ""
+
+#: templates/calendar.php:16
+msgid "From Time"
+msgstr ""
+
+#: templates/calendar.php:17
+msgid "To Date"
+msgstr ""
+
+#: templates/calendar.php:18
+msgid "To Time"
+msgstr ""
+
+#: templates/calendar.php:19
+msgid "The event ends before it starts"
+msgstr ""
+
+#: templates/calendar.php:20
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr ""
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr ""
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr ""
+
+#: templates/calendar.php:46
+msgid "Today"
+msgstr ""
+
+#: templates/calendar.php:47
+msgid "Calendars"
+msgstr ""
+
+#: templates/calendar.php:65
+msgid "There was a fail, while parsing the file."
+msgstr ""
+
+#: templates/lAfix.php:9
+msgid "Sun."
+msgstr ""
+
+#: templates/lAfix.php:10
+msgid "Mon."
+msgstr ""
+
+#: templates/lAfix.php:11
+msgid "Tue."
+msgstr ""
+
+#: templates/lAfix.php:12
+msgid "Wed."
+msgstr ""
+
+#: templates/lAfix.php:13
+msgid "Thu."
+msgstr ""
+
+#: templates/lAfix.php:14
+msgid "Fri."
+msgstr ""
+
+#: templates/lAfix.php:15
+msgid "Sat."
+msgstr ""
+
+#: templates/lAfix.php:28
+msgid "Jan."
+msgstr ""
+
+#: templates/lAfix.php:29
+msgid "Feb."
+msgstr ""
+
+#: templates/lAfix.php:30
+msgid "Mar."
+msgstr ""
+
+#: templates/lAfix.php:31
+msgid "Apr."
+msgstr ""
+
+#: templates/lAfix.php:32
+msgid "May."
+msgstr ""
+
+#: templates/lAfix.php:33
+msgid "Jun."
+msgstr ""
+
+#: templates/lAfix.php:34
+msgid "Jul."
+msgstr ""
+
+#: templates/lAfix.php:35
+msgid "Aug."
+msgstr ""
+
+#: templates/lAfix.php:36
+msgid "Sep."
+msgstr ""
+
+#: templates/lAfix.php:37
+msgid "Oct."
+msgstr ""
+
+#: templates/lAfix.php:38
+msgid "Nov."
+msgstr ""
+
+#: templates/lAfix.php:39
+msgid "Dec."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:20
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "CalDav Link"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Download"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:4
+msgid "Edit"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr ""
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr ""
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr ""
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
+
+#: templates/part.eventform.php:5
+msgid "Title of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:11
+msgid "Category"
+msgstr ""
+
+#: templates/part.eventform.php:13
+msgid "Select category"
+msgstr ""
+
+#: templates/part.eventform.php:37
+msgid "All Day Event"
+msgstr ""
+
+#: templates/part.eventform.php:41
+msgid "From"
+msgstr ""
+
+#: templates/part.eventform.php:49
+msgid "To"
+msgstr ""
+
+#: templates/part.eventform.php:57
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:61
+msgid "Repeat"
+msgstr ""
+
+#: templates/part.eventform.php:68
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:112
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:125 templates/part.eventform.php:138
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:130
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:143
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:151
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:164
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:169
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:175
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:181
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:193
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.eventform.php:208
+msgid "Location"
+msgstr ""
+
+#: templates/part.eventform.php:210
+msgid "Location of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:216
+msgid "Description"
+msgstr ""
+
+#: templates/part.eventform.php:218
+msgid "Description of the Event"
+msgstr ""
+
+#: templates/part.import.php:1
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the calendar"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing calendar"
+msgstr ""
+
+#: templates/part.import.php:23
+msgid "Calendar imported successfully"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Close Dialog"
+msgstr ""
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Timezone"
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Calendar CalDAV syncing address:"
+msgstr ""
+
+
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
new file mode 100644
index 00000000000..4c495ff147d
--- /dev/null
+++ b/l10n/uk/contacts.po
@@ -0,0 +1,281 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/team/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/activation.php:17 ajax/updateaddressbook.php:26
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcard.php:79
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:51
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:78
+msgid "Error adding contact property."
+msgstr ""
+
+#: ajax/createaddressbook.php:20
+msgid "Error adding addressbook."
+msgstr ""
+
+#: ajax/createaddressbook.php:26
+msgid "Error activating addressbook."
+msgstr ""
+
+#: ajax/deleteproperty.php:40
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/setproperty.php:79
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:20
+msgid "Error updating addressbook."
+msgstr ""
+
+#: appinfo/app.php:21 templates/settings.php:3
+msgid "Contacts"
+msgstr ""
+
+#: lib/app.php:52
+msgid "This is not your addressbook."
+msgstr ""
+
+#: lib/app.php:61 photo.php:36
+msgid "Contact could not be found."
+msgstr ""
+
+#: lib/app.php:89
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr ""
+
+#: lib/app.php:101 templates/part.addcardform.php:54
+#: templates/part.property.php:45 templates/part.setpropertyform.php:7
+msgid "Address"
+msgstr ""
+
+#: lib/app.php:102 templates/part.addcardform.php:43
+msgid "Telephone"
+msgstr ""
+
+#: lib/app.php:103 templates/part.addcardform.php:37
+#: templates/part.property.php:16 templates/part.setpropertyform.php:51
+msgid "Email"
+msgstr ""
+
+#: lib/app.php:104 templates/part.addcardform.php:27
+#: templates/part.property.php:9 templates/part.setpropertyform.php:54
+msgid "Organization"
+msgstr ""
+
+#: lib/app.php:116 lib/app.php:123
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:117 lib/app.php:121
+msgid "Home"
+msgstr ""
+
+#: lib/app.php:122
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:124
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:125
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:126
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:127
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:128
+msgid "Pager"
+msgstr ""
+
+#: lib/search.php:22
+msgid "Contact"
+msgstr ""
+
+#: photo.php:42
+msgid "This is not your contact."
+msgstr ""
+
+#: templates/index.php:6
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Addressbooks"
+msgstr ""
+
+#: templates/part.addcardform.php:8
+msgid "Addressbook"
+msgstr ""
+
+#: templates/part.addcardform.php:21
+msgid "Name"
+msgstr ""
+
+#: templates/part.addcardform.php:57 templates/part.details.php:43
+#: templates/part.details.php:79 templates/part.setpropertyform.php:10
+#: templates/part.setpropertyform.php:47
+msgid "Type"
+msgstr ""
+
+#: templates/part.addcardform.php:65 templates/part.details.php:49
+#: templates/part.setpropertyform.php:16
+msgid "PO Box"
+msgstr ""
+
+#: templates/part.addcardform.php:72 templates/part.details.php:53
+#: templates/part.setpropertyform.php:20
+msgid "Extended"
+msgstr ""
+
+#: templates/part.addcardform.php:78 templates/part.details.php:57
+#: templates/part.setpropertyform.php:24
+msgid "Street"
+msgstr ""
+
+#: templates/part.addcardform.php:84 templates/part.details.php:61
+#: templates/part.setpropertyform.php:28
+msgid "City"
+msgstr ""
+
+#: templates/part.addcardform.php:90 templates/part.details.php:65
+#: templates/part.setpropertyform.php:32
+msgid "Region"
+msgstr ""
+
+#: templates/part.addcardform.php:96 templates/part.details.php:69
+#: templates/part.setpropertyform.php:36
+msgid "Zipcode"
+msgstr ""
+
+#: templates/part.addcardform.php:102 templates/part.details.php:73
+#: templates/part.setpropertyform.php:40
+msgid "Country"
+msgstr ""
+
+#: templates/part.addcardform.php:109
+msgid "Create Contact"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Choose active Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Edit"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:5
+msgid "Delete"
+msgstr ""
+
+#: templates/part.details.php:3
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.details.php:4
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.details.php:34
+msgid "Add"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.property.php:3
+msgid "Birthday"
+msgstr ""
+
+#: templates/part.property.php:23
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.property.php:23 templates/part.setpropertyform.php:45
+msgid "Phone"
+msgstr ""
+
+#: templates/part.setpropertyform.php:57
+msgid "Update"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "CardDAV syncing address:"
+msgstr ""
+
+
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
new file mode 100644
index 00000000000..3ede91110b1
--- /dev/null
+++ b/l10n/uk/core.po
@@ -0,0 +1,170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/team/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: lostpassword/index.php:24
+msgid "Owncloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
+#: templates/login.php:8
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:26 templates/login.php:12
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:32
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:34
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:41
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:46 templates/installation.php:57
+#: templates/installation.php:67
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:79
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:83
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:87
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:93
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:98
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr ""
+
+#: templates/login.php:5
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:15
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:16
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
+
+
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
new file mode 100644
index 00000000000..94b976dd1d6
--- /dev/null
+++ b/l10n/uk/files.po
@@ -0,0 +1,108 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/team/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/upload.php:19
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:20
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:24
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: appinfo/app.php:8
+msgid "Files"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From the web"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Upload"
+msgstr ""
+
+#: templates/index.php:35
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:43
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Size"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Modified"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:60
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+
diff --git a/l10n/uk/gallery.po b/l10n/uk/gallery.po
new file mode 100644
index 00000000000..e39e12e2343
--- /dev/null
+++ b/l10n/uk/gallery.po
@@ -0,0 +1,52 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/team/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: appinfo/app.php:41
+msgid "Gallery"
+msgstr ""
+
+#: js/album_cover.js:40
+msgid "Scanning directories"
+msgstr ""
+
+#: js/album_cover.js:48
+msgid "No photos found"
+msgstr ""
+
+#: js/album_cover.js:51 js/album_cover.js:60
+msgid "Creating thumbnails"
+msgstr ""
+
+#: js/album_cover.js:81
+msgid "Do you wan't to remove album"
+msgstr ""
+
+#: js/album_cover.js:94
+msgid "Input new gallery name"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Rescan"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+
diff --git a/l10n/uk/media.po b/l10n/uk/media.po
new file mode 100644
index 00000000000..5f7b442b171
--- /dev/null
+++ b/l10n/uk/media.po
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/team/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: appinfo/app.php:32 templates/player.php:9
+msgid "Music"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:13
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:14
+msgid "Pause"
+msgstr ""
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6 templates/player.php:15
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr ""
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr ""
+
+#: templates/music.php:38
+msgid "Album"
+msgstr ""
+
+#: templates/music.php:39
+msgid "Title"
+msgstr ""
+
+
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
new file mode 100644
index 00000000000..6fa57d5c321
--- /dev/null
+++ b/l10n/uk/settings.po
@@ -0,0 +1,156 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/team/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/lostpassword.php:14
+msgid "email Changed"
+msgstr ""
+
+#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/openid.php:15
+msgid "OpenID Changed"
+msgstr ""
+
+#: ajax/setlanguage.php:14
+msgid "Language changed"
+msgstr ""
+
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:13
+msgid "Log level"
+msgstr ""
+
+#: templates/apps.php:8
+msgid "Add your application"
+msgstr ""
+
+#: templates/apps.php:21
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:23
+msgid "-licensed"
+msgstr ""
+
+#: templates/apps.php:23
+msgid "by"
+msgstr ""
+
+#: templates/help.php:8
+msgid "Ask a question"
+msgstr ""
+
+#: templates/help.php:20
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:21
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:29
+msgid "Answer"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Your password got changed"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:16
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:17
+msgid "show"
+msgstr ""
+
+#: templates/personal.php:18
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:24
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:25
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:32 templates/personal.php:33
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:38
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:15 templates/users.php:30
+msgid "Name"
+msgstr ""
+
+#: templates/users.php:16 templates/users.php:31
+msgid "Password"
+msgstr ""
+
+#: templates/users.php:17 templates/users.php:32 templates/users.php:46
+msgid "Groups"
+msgstr ""
+
+#: templates/users.php:23
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:33
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:58
+msgid "Delete"
+msgstr ""
+
+
diff --git a/l10n/zh_CN/calendar.po b/l10n/zh_CN/calendar.po
index a6e29f7bd02..a80e877b379 100644
--- a/l10n/zh_CN/calendar.po
+++ b/l10n/zh_CN/calendar.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <wengxt@gmail.com>, 2011.
+#   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-22 07:42+0000\n"
+"Last-Translator: csslayer <wengxt@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ajax/guesstimezone.php:42
 msgid "New Timezone:"
-msgstr ""
+msgstr "新时区："
 
 #: ajax/settimezone.php:22
 msgid "Timezone changed"
@@ -30,7 +30,7 @@ msgstr "时区已修改"
 msgid "Invalid request"
 msgstr "�法请求"
 
-#: appinfo/app.php:20 templates/calendar.php:13
+#: appinfo/app.php:20 templates/calendar.php:14
 #: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "日历"
@@ -129,143 +129,143 @@ msgstr "�年"
 
 #: lib/object.php:366
 msgid "never"
-msgstr ""
+msgstr "从�"
 
 #: lib/object.php:367
 msgid "by occurrences"
-msgstr ""
+msgstr "按�生次数"
 
 #: lib/object.php:368
 msgid "by date"
-msgstr ""
+msgstr "按日期"
 
 #: lib/object.php:375
 msgid "by monthday"
-msgstr ""
+msgstr "按月的�天"
 
 #: lib/object.php:376
 msgid "by weekday"
-msgstr ""
+msgstr "按星期的�天"
 
 #: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr ""
+msgstr "星期一"
 
 #: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr ""
+msgstr "星期二"
 
 #: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr ""
+msgstr "星期三"
 
 #: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr ""
+msgstr "星期四"
 
 #: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr ""
+msgstr "星期五"
 
 #: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr ""
+msgstr "星期六"
 
 #: lib/object.php:389 templates/lAfix.php:2
 msgid "Sunday"
-msgstr ""
+msgstr "星期日"
 
 #: lib/object.php:396
 msgid "events week of month"
-msgstr ""
+msgstr "事件在�月的第几个星期"
 
 #: lib/object.php:397
 msgid "first"
-msgstr ""
+msgstr "第一"
 
 #: lib/object.php:398
 msgid "second"
-msgstr ""
+msgstr "第二"
 
 #: lib/object.php:399
 msgid "third"
-msgstr ""
+msgstr "第三"
 
 #: lib/object.php:400
 msgid "fourth"
-msgstr ""
+msgstr "第四"
 
 #: lib/object.php:401
 msgid "fifth"
-msgstr ""
+msgstr "第五"
 
 #: lib/object.php:402
 msgid "last"
-msgstr ""
+msgstr "最�"
 
 #: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr ""
+msgstr "一月"
 
 #: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr ""
+msgstr "二月"
 
 #: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr ""
+msgstr "三月"
 
 #: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr ""
+msgstr "四月"
 
 #: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr ""
+msgstr "五月"
 
 #: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr ""
+msgstr "六月"
 
 #: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr ""
+msgstr "七月"
 
 #: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr ""
+msgstr "八月"
 
 #: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr ""
+msgstr "�月"
 
 #: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr ""
+msgstr "�月"
 
 #: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr ""
+msgstr "�一月"
 
 #: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr ""
+msgstr "�二月"
 
 #: lib/object.php:441
 msgid "by events date"
-msgstr ""
+msgstr "按事件日期"
 
 #: lib/object.php:442
 msgid "by yearday(s)"
-msgstr ""
+msgstr "按�年的�天"
 
 #: lib/object.php:443
 msgid "by weeknumber(s)"
-msgstr ""
+msgstr "按星期数"
 
 #: lib/object.php:444
 msgid "by day and month"
-msgstr ""
+msgstr "按天和月份"
 
 #: lib/object.php:467
 msgid "Not an array"
@@ -273,156 +273,156 @@ msgstr "�是一个数组"
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #: lib/search.php:40
 msgid "Cal."
-msgstr ""
+msgstr "日历"
 
 #: templates/calendar.php:10
 msgid "All day"
 msgstr "全天"
 
-#: templates/calendar.php:11
+#: templates/calendar.php:11 templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "新日历"
+
+#: templates/calendar.php:12
 msgid "Missing fields"
 msgstr "缺少字段"
 
-#: templates/calendar.php:12 templates/part.eventform.php:3
+#: templates/calendar.php:13 templates/part.eventform.php:3
 msgid "Title"
 msgstr "标题"
 
-#: templates/calendar.php:14
+#: templates/calendar.php:15
 msgid "From Date"
 msgstr "从"
 
-#: templates/calendar.php:15
+#: templates/calendar.php:16
 msgid "From Time"
 msgstr "从"
 
-#: templates/calendar.php:16
+#: templates/calendar.php:17
 msgid "To Date"
 msgstr "至"
 
-#: templates/calendar.php:17
+#: templates/calendar.php:18
 msgid "To Time"
 msgstr "至"
 
-#: templates/calendar.php:18
+#: templates/calendar.php:19
 msgid "The event ends before it starts"
 msgstr "事件在开始�已结�"
 
-#: templates/calendar.php:19
+#: templates/calendar.php:20
 msgid "There was a database fail"
 msgstr "数�库访问失败"
 
-#: templates/calendar.php:52
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "星期"
 
-#: templates/calendar.php:53
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "月"
 
-#: templates/calendar.php:54
+#: templates/calendar.php:40
 msgid "List"
 msgstr "列表"
 
-#: templates/calendar.php:59
+#: templates/calendar.php:46
 msgid "Today"
 msgstr "今天"
 
-#: templates/calendar.php:60
+#: templates/calendar.php:47
 msgid "Calendars"
 msgstr "日历"
 
-#: templates/calendar.php:78
+#: templates/calendar.php:65
 msgid "There was a fail, while parsing the file."
 msgstr "解�文件失败"
 
 #: templates/lAfix.php:9
 msgid "Sun."
-msgstr ""
+msgstr "周日"
 
 #: templates/lAfix.php:10
 msgid "Mon."
-msgstr ""
+msgstr "周一"
 
 #: templates/lAfix.php:11
 msgid "Tue."
-msgstr ""
+msgstr "周二"
 
 #: templates/lAfix.php:12
 msgid "Wed."
-msgstr ""
+msgstr "周三"
 
 #: templates/lAfix.php:13
 msgid "Thu."
-msgstr ""
+msgstr "周四"
 
 #: templates/lAfix.php:14
 msgid "Fri."
-msgstr ""
+msgstr "周五"
 
 #: templates/lAfix.php:15
 msgid "Sat."
-msgstr ""
+msgstr "周六"
 
 #: templates/lAfix.php:28
 msgid "Jan."
-msgstr ""
+msgstr "1月"
 
 #: templates/lAfix.php:29
 msgid "Feb."
-msgstr ""
+msgstr "2月"
 
 #: templates/lAfix.php:30
 msgid "Mar."
-msgstr ""
+msgstr "3月"
 
 #: templates/lAfix.php:31
 msgid "Apr."
-msgstr ""
+msgstr "4月"
 
 #: templates/lAfix.php:32
 msgid "May."
-msgstr ""
+msgstr "5月"
 
 #: templates/lAfix.php:33
 msgid "Jun."
-msgstr ""
+msgstr "6月"
 
 #: templates/lAfix.php:34
 msgid "Jul."
-msgstr ""
+msgstr "7月"
 
 #: templates/lAfix.php:35
 msgid "Aug."
-msgstr ""
+msgstr "8月"
 
 #: templates/lAfix.php:36
 msgid "Sep."
-msgstr ""
+msgstr "9月"
 
 #: templates/lAfix.php:37
 msgid "Oct."
-msgstr ""
+msgstr "10月"
 
 #: templates/lAfix.php:38
 msgid "Nov."
-msgstr ""
+msgstr "11月"
 
 #: templates/lAfix.php:39
 msgid "Dec."
-msgstr ""
+msgstr "12月"
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
 msgstr "选择活动日历"
 
-#: templates/part.choosecalendar.php:15
-msgid "New Calendar"
-msgstr "新日历"
-
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
@@ -516,47 +516,47 @@ msgstr "��"
 
 #: templates/part.eventform.php:68
 msgid "Advanced"
-msgstr ""
+msgstr "高级"
 
 #: templates/part.eventform.php:112
 msgid "Select weekdays"
-msgstr ""
+msgstr "选择星期中的�天"
 
 #: templates/part.eventform.php:125 templates/part.eventform.php:138
 msgid "Select days"
-msgstr ""
+msgstr "选择�天"
 
 #: templates/part.eventform.php:130
 msgid "and the events day of year."
-msgstr ""
+msgstr "选择�年事件�生的日�"
 
 #: templates/part.eventform.php:143
 msgid "and the events day of month."
-msgstr ""
+msgstr "选择�月事件�生的日�"
 
 #: templates/part.eventform.php:151
 msgid "Select months"
-msgstr ""
+msgstr "选择月份"
 
 #: templates/part.eventform.php:164
 msgid "Select weeks"
-msgstr ""
+msgstr "选择星期"
 
 #: templates/part.eventform.php:169
 msgid "and the events week of year."
-msgstr ""
+msgstr "选择�年的事件�生的星期"
 
 #: templates/part.eventform.php:175
 msgid "Interval"
-msgstr ""
+msgstr "é—´éš”"
 
 #: templates/part.eventform.php:181
 msgid "End"
-msgstr ""
+msgstr "结�"
 
 #: templates/part.eventform.php:193
 msgid "occurrences"
-msgstr ""
+msgstr "次"
 
 #: templates/part.eventform.php:208
 msgid "Location"
@@ -576,7 +576,7 @@ msgstr "事件�述"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "导入日历文件"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -584,11 +584,11 @@ msgstr "请选择日历"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "创建新日历"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "新日历�称"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -596,15 +596,15 @@ msgstr "导入"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "导入日历"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "导入日历�功"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "关闭对�框"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
@@ -616,7 +616,7 @@ msgstr "时区"
 
 #: templates/settings.php:30
 msgid "Check always for changes of the timezone"
-msgstr ""
+msgstr "选中则总是按照时区�化"
 
 #: templates/settings.php:32
 msgid "Timeformat"
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index 6e0afb93e9d..e2f1c8d81b8 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <wengxt@gmail.com>, 2011.
+#   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:49+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -20,47 +20,47 @@ msgstr ""
 
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "(�消)激活地�簿错误。"
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "添加�系人时出错。"
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "无法添加空属性。"
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "至少需�填写一项地�。"
 
 #: ajax/addproperty.php:78
 msgid "Error adding contact property."
-msgstr ""
+msgstr "添加�系人属性错误。"
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "添加地�簿错误。"
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "激活地�簿错误。"
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "删除�系人属性错误。"
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "更新�系人属性错误。"
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "更新地�簿错误"
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "�系人"
 
 #: lib/app.php:52
 msgid "This is not your addressbook."
@@ -127,7 +127,7 @@ msgstr "传呼机"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "�系人"
 
 #: photo.php:42
 msgid "This is not your contact."
@@ -139,11 +139,11 @@ msgstr "添加�系人"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "地�簿"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "地�簿"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -153,7 +153,7 @@ msgstr "�称"
 #: templates/part.details.php:79 templates/part.setpropertyform.php:10
 #: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
@@ -196,20 +196,20 @@ msgstr "创建�系人"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "选择激活地�簿"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "新建地�簿"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "CardDav 链接"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "下载"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -221,43 +221,43 @@ msgstr "删除"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "下载�系人"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
-msgstr ""
+msgstr "删除�系人"
 
 #: templates/part.details.php:34
 msgid "Add"
-msgstr ""
+msgstr "添加"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "新建地�簿"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "编辑地�簿"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "显示�称"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "激活"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "�存"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "�交"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "�消"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -265,7 +265,7 @@ msgstr "生日"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "�好"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -273,10 +273,10 @@ msgstr "电�"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
-msgstr ""
+msgstr "æ›´æ–°"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "CardDAV �步地�："
 
 
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 147d4a8dd65..afe32762564 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <wengxt@gmail.com>, 2011.
+#   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2012-01-22 07:23+0000\n"
+"Last-Translator: csslayer <wengxt@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "�置 Owncloud 密�"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "使用以下链接�置您的密�：{link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -53,7 +53,7 @@ msgstr "您的密�已�置"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "到登录页�"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -134,7 +134,7 @@ msgstr "安装完�"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "由您掌控的网络�务"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -154,7 +154,7 @@ msgstr "记�"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "登录"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 89831a4b081..cd794d7514e 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <wengxt@gmail.com>, 2011.
+#   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2012-01-22 07:23+0000\n"
+"Last-Translator: csslayer <wengxt@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,19 +54,19 @@ msgstr "最大上传大�"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "新建"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "文本文件"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "文件夹"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "�自网络"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/zh_CN/gallery.po b/l10n/zh_CN/gallery.po
index 2cde1e4312b..5ba9a6462fb 100644
--- a/l10n/zh_CN/gallery.po
+++ b/l10n/zh_CN/gallery.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Bartek  <bart.p.pl@gmail.com>, 2012.
+#   <wengxt@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:50+0000\n"
+"POT-Creation-Date: 2012-01-24 00:24+0100\n"
+"PO-Revision-Date: 2012-01-23 23:25+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -20,27 +21,27 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr "画廊"
+msgstr "图库"
 
 #: js/album_cover.js:40
 msgid "Scanning directories"
+msgstr "扫�目录"
+
+#: js/album_cover.js:48
+msgid "No photos found"
 msgstr ""
 
-#: js/album_cover.js:47 js/album_cover.js:56
+#: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
-msgstr ""
+msgstr "创建缩略图"
 
-#: js/album_cover.js:77
+#: js/album_cover.js:81
 msgid "Do you wan't to remove album"
-msgstr ""
+msgstr "您是�想�移除相册"
 
-#: js/album_cover.js:90
+#: js/album_cover.js:94
 msgid "Input new gallery name"
-msgstr ""
-
-#: js/album_cover.js:105
-msgid "Album name can't be empty"
-msgstr ""
+msgstr "输入新图库�称"
 
 #: templates/index.php:10
 msgid "Rescan"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 126f0973d0e..25c0fccc72c 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <wengxt@gmail.com>, 2011.
+#   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 16:32+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2012-01-22 07:26+0000\n"
+"Last-Translator: csslayer <wengxt@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "电�邮件已修改"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -36,11 +36,11 @@ msgstr "语言已修改"
 
 #: personal.php:36 personal.php:37
 msgid "__language_name__"
-msgstr ""
+msgstr "简体中文"
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "日志级别"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -108,15 +108,15 @@ msgstr "修改密�"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "电�邮件"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "您的电�邮件"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "填写电�邮件地�以�用密���"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -124,7 +124,7 @@ msgstr "语言"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "帮助翻译"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -148,7 +148,7 @@ msgstr "创建"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "��"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index a8faeb780f8..ef90adb0557 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "адре� �лектронной почты изменён",
 "Invalid request" => "�еверный запро�",
 "OpenID Changed" => "OpenID был изменён",
 "Language changed" => "Язык изменён",
+"Log level" => "Уровень детализации журнала",
 "Add your application" => "Добавить ваше приложение",
 "Select an App" => "Выберите приложение",
 "-licensed" => "-лицензи�",
@@ -18,11 +20,16 @@
 "New password" => "�овый пароль",
 "show" => "показать",
 "Change password" => "Сменить пароль",
+"Email" => "e-mail",
+"Your email address" => "Ваш адре� �лектронной почты",
+"Fill in an email address to enable password recovery" => "Введите адре� �лектронной почты чтобы по�вила�ь возможно�ть во��тановлени� парол�",
 "Language" => "Язык",
+"Help translate" => "Помочь � переводом",
 "use this address to connect to your ownCloud in your file manager" => "и�пользуйте данный адре� дл� подключени� к ownCloud в вашем файловом менеджере",
 "Name" => "Им�",
 "Password" => "Пароль",
 "Groups" => "Группы",
 "Create" => "Создать",
+"Quota" => "Квота",
 "Delete" => "Удалить"
 );
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 22ffce3b57e..cf554ed5ca9 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,7 +1,10 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "电�邮件已修改",
 "Invalid request" => "�法请求",
 "OpenID Changed" => "OpenID 已修改",
 "Language changed" => "语言已修改",
+"__language_name__" => "简体中文",
+"Log level" => "日志级别",
 "Add your application" => "加入您的应用程�",
 "Select an App" => "选择一个应用",
 "-licensed" => "-许��",
@@ -18,11 +21,16 @@
 "New password" => "新密�",
 "show" => "显示",
 "Change password" => "修改密�",
+"Email" => "电�邮件",
+"Your email address" => "您的电�邮件",
+"Fill in an email address to enable password recovery" => "填写电�邮件地�以�用密���",
 "Language" => "语言",
+"Help translate" => "帮助翻译",
 "use this address to connect to your ownCloud in your file manager" => "在文件管�器中使用这个地��连接到您的 ownCloud",
 "Name" => "�称",
 "Password" => "密�",
 "Groups" => "组",
 "Create" => "创建",
+"Quota" => "��",
 "Delete" => "删除"
 );
-- 
GitLab


From a77f3a07a10b074486a0c3a21ae27c5c067ba8b2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 24 Jan 2012 02:56:38 +0100
Subject: [PATCH 343/546] Fix some issues in ampache resonponse

Patch by Markus Germeier
---
 apps/media/lib_ampache.php       | 71 ++++++++++++++++++++++++++++----
 apps/media/server/xml.server.php |  3 ++
 2 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
index bc1f853047f..138b65d1fd7 100644
--- a/apps/media/lib_ampache.php
+++ b/apps/media/lib_ampache.php
@@ -24,6 +24,31 @@
 //implementation of ampache's xml api
 class OC_MEDIA_AMPACHE{
 	
+	/**
+	* fix the string to be XML compatible
+	* @param string name
+	* @return string
+	*/
+	
+	/* this is an ugly hack(tm), this should be: */
+	/* htmlentities($name, ENT_XML1, 'UTF-8');   */
+	/* with PHP 5.4 and later		     */
+	public static function fixXmlString($name){
+	       $result=str_replace("&", "&amp;", $name);
+	       $result=str_replace("'", "&apos;", $result);
+	       $result=str_replace("<", "&lt;", $result);
+	       $result=str_replace(">", "&gt;", $result);
+	       $result=str_replace("\"", "&quot;", $result);
+       	       $result=str_replace("Ä", "&#196;", $result);
+       	       $result=str_replace("Ö", "&#214;", $result);
+       	       $result=str_replace("Ü", "&#220;", $result);
+       	       $result=str_replace("ä", "&#228;", $result);
+       	       $result=str_replace("ö", "&#246;", $result);
+       	       $result=str_replace("ü", "&#252;", $result);
+       	       $result=str_replace("ß", "&#223;", $result);
+	       return $result;
+	}
+	
 	/**
 	* do the initial handshake
 	* @param array params
@@ -34,6 +59,7 @@ class OC_MEDIA_AMPACHE{
 		$time=(isset($params['timestamp']))?$params['timestamp']:false;
 		$now=time();
 		if($now-$time>(10*60)){
+			echo('<?xml version="1.0" encoding="UTF-8"?>');
 			echo("<root>
 	<error code='400'>timestamp is more then 10 minutes old</error>
 </root>");
@@ -54,6 +80,7 @@ class OC_MEDIA_AMPACHE{
 					$query=OC_DB::prepare("INSERT INTO *PREFIX*media_sessions (`session_id`, `token`, `user_id`, `start`) VALUES (NULL, ?, ?, now());");
 					$query->execute(array($token,$user));
 					$expire=date('c',time()+600);
+					echo('<?xml version="1.0" encoding="UTF-8"?>');
 					echo("<root>
 	<auth>$token</auth>
 	<version>350001</version>
@@ -71,10 +98,12 @@ class OC_MEDIA_AMPACHE{
 					return;
 				}
 			}
+			echo('<?xml version="1.0" encoding="UTF-8"?>');
 			echo("<root>
 	<error code='400'>Invalid login</error>
 </root>");
 		}else{
+			echo('<?xml version="1.0" encoding="UTF-8"?>');
 			echo("<root>
 	<error code='400'>Missing arguments</error>
 </root>");
@@ -86,12 +115,14 @@ class OC_MEDIA_AMPACHE{
 			if(self::checkAuth($params['auth'])){
 				self::updateAuth($params['auth']);
 			}else{
+				echo('<?xml version="1.0" encoding="UTF-8"?>');
 				echo("<root>
 	<error code='400'>Invalid login</error>
 </root>");
 				return;
 			}
 		}
+		echo('<?xml version="1.0" encoding="UTF-8"?>');
 		echo('<root>');
 		echo('<version>350001</version>');
 		echo('</root>');
@@ -128,7 +159,7 @@ class OC_MEDIA_AMPACHE{
 		$albums=count(OC_MEDIA_COLLECTION::getAlbums($artist['artist_id']));
 		$songs=count(OC_MEDIA_COLLECTION::getSongs($artist['artist_id']));
 		$id=$artist['artist_id'];
-		$name=htmlentities($artist['artist_name'], ENT_COMPAT, 'UTF-8');
+		$name=self::fixXmlString($artist['artist_name']);
 		echo("\t<artist id='$id'>\n");
 		echo("\t\t<name>$name</name>\n");
 		echo("\t\t<albums>$albums</albums>\n");
@@ -142,16 +173,19 @@ class OC_MEDIA_AMPACHE{
 		if(!$artistName){
 			$artistName=OC_MEDIA_COLLECTION::getArtistName($album['album_artist']);
 		}
-		$artistName=htmlentities($artistName, ENT_COMPAT, 'UTF-8');
+		$artistName=self::fixXmlString($artistName);
 		$songs=count(OC_MEDIA_COLLECTION::getSongs($album['album_artist'],$album['album_id']));
 		$id=$album['album_id'];
-		$name=htmlentities($album['album_name'], ENT_COMPAT, 'UTF-8');
+		$name=self::fixXmlString($album['album_name']);
 		$artist=$album['album_artist'];
 		echo("\t<album id='$id'>\n");
 		echo("\t\t<name>$name</name>\n");
 		echo("\t\t<artist id='$artist'>$artistName</artist>\n");
 		echo("\t\t<tracks>$songs</tracks>\n");
 		echo("\t\t<rating>0</rating>\n");
+		echo("\t\t<year>0</year>\n"); /* make Viridian happy */
+		echo("\t\t<disk>1</disk>\n"); /* make Viridian happy */
+		echo("\t\t<art> </art>\n"); /* single space to make quickplay happy enough */
 		echo("\t\t<preciserating>0</preciserating>\n");
 		echo("\t</album>\n");
 	}
@@ -163,10 +197,10 @@ class OC_MEDIA_AMPACHE{
 		if(!$albumName){
 			$albumName=OC_MEDIA_COLLECTION::getAlbumName($song['song_album']);
 		}
-		$artistName=htmlentities($artistName, ENT_COMPAT, 'UTF-8');
-		$albumName=htmlentities($albumName, ENT_COMPAT, 'UTF-8');
+		$artistName=self::fixXmlString($artistName);
+		$albumName=self::fixXmlString($albumName);
 		$id=$song['song_id'];
-		$name=htmlentities($song['song_name'], ENT_COMPAT, 'UTF-8');
+		$name=self::fixXmlString($song['song_name']);
 		$artist=$song['song_artist'];
 		$album=$song['song_album'];
 		echo("\t<song id='$id'>\n");
@@ -174,12 +208,12 @@ class OC_MEDIA_AMPACHE{
 		echo("\t\t<artist id='$artist'>$artistName</artist>\n");
 		echo("\t\t<album id='$album'>$albumName</album>\n");
 		$url=OC_Helper::linkTo('media', 'server/xml.server.php', null, true)."?action=play&song=$id&auth={$_GET['auth']}";
-		$url=htmlentities($url);
+		$url=self::fixXmlString($url);
 		echo("\t\t<url>$url</url>\n");
 		echo("\t\t<time>{$song['song_length']}</time>\n");
 		echo("\t\t<track>{$song['song_track']}</track>\n");
 		echo("\t\t<size>{$song['song_size']}</size>\n");
-		echo("\t\t<art></art>\n");
+		echo("\t\t<art> </art>\n"); /* single space to make Viridian happy enough */
 		echo("\t\t<rating>0</rating>\n");
 		echo("\t\t<preciserating>0</preciserating>\n");
 		echo("\t</song>\n");
@@ -187,6 +221,7 @@ class OC_MEDIA_AMPACHE{
 	
 	public static function artists($params){
 		if(!self::checkAuth($params)){
+			echo('<?xml version="1.0" encoding="UTF-8"?>');
 			echo("<root>
 	<error code='400'>Invalid login</error>
 </root>");
@@ -195,6 +230,7 @@ class OC_MEDIA_AMPACHE{
 		$filter=isset($params['filter'])?$params['filter']:'';
 		$exact=isset($params['exact'])?($params['exact']=='true'):false;
 		$artists=OC_MEDIA_COLLECTION::getArtists($filter,$exact);
+		echo('<?xml version="1.0" encoding="UTF-8"?>');
 		echo('<root>');
 		foreach($artists as $artist){
 			self::printArtist($artist);
@@ -204,6 +240,7 @@ class OC_MEDIA_AMPACHE{
 	
 	public static function artist_songs($params){
 		if(!self::checkAuth($params)){
+			echo('<?xml version="1.0" encoding="UTF-8"?>');
 			echo("<root>
 	<error code='400'>Invalid login</error>
 </root>");
@@ -212,6 +249,7 @@ class OC_MEDIA_AMPACHE{
 		$filter=isset($params['filter'])?$params['filter']:'';
 		$songs=OC_MEDIA_COLLECTION::getSongs($filter);
 		$artist=OC_MEDIA_COLLECTION::getArtistName($filter);
+		echo('<?xml version="1.0" encoding="UTF-8"?>');
 		echo('<root>');
 		foreach($songs as $song){
 			self::printSong($song,$artist);
@@ -221,6 +259,7 @@ class OC_MEDIA_AMPACHE{
 	
 	public static function artist_albums($params){
 		if(!self::checkAuth($params)){
+			echo('<?xml version="1.0" encoding="UTF-8"?>');
 			echo("<root>
 	<error code='400'>Invalid login</error>
 </root>");
@@ -230,6 +269,7 @@ class OC_MEDIA_AMPACHE{
 		$filter=$params['filter'];
 		$albums=OC_MEDIA_COLLECTION::getAlbums($filter);
 		$artist=OC_MEDIA_COLLECTION::getArtistName($filter);
+		echo('<?xml version="1.0" encoding="UTF-8"?>');
 		echo('<root>');
 		foreach($albums as $album){
 			self::printAlbum($album,$artist);
@@ -239,6 +279,7 @@ class OC_MEDIA_AMPACHE{
 	
 	public static function albums($params){
 		if(!self::checkAuth($params)){
+			echo('<?xml version="1.0" encoding="UTF-8"?>');
 			echo("<root>
 	<error code='400'>Invalid login</error>
 </root>");
@@ -247,15 +288,17 @@ class OC_MEDIA_AMPACHE{
 		$filter=isset($params['filter'])?$params['filter']:'';
 		$exact=isset($params['exact'])?($params['exact']=='true'):false;
 		$albums=OC_MEDIA_COLLECTION::getAlbums(0,$filter,$exact);
+		echo('<?xml version="1.0" encoding="UTF-8"?>');	
 		echo('<root>');
 		foreach($albums as $album){
-			self::printAlbum($album,$artist);
+			self::printAlbum($album,false);
 		}
 		echo('</root>');
 	}
 	
 	public static function album_songs($params){
 		if(!self::checkAuth($params)){
+			echo('<?xml version="1.0" encoding="UTF-8"?>');
 			echo("<root>
 	<error code='400'>Invalid login</error>
 </root>");
@@ -265,6 +308,7 @@ class OC_MEDIA_AMPACHE{
 		if(count($songs)>0){
 			$artist=OC_MEDIA_COLLECTION::getArtistName($songs[0]['song_artist']);
 		}
+		echo('<?xml version="1.0" encoding="UTF-8"?>');
 		echo('<root>');
 		foreach($songs as $song){
 			self::printSong($song,$artist);
@@ -274,6 +318,7 @@ class OC_MEDIA_AMPACHE{
 	
 	public static function songs($params){
 		if(!self::checkAuth($params)){
+			echo('<?xml version="1.0" encoding="UTF-8"?>');
 			echo("<root>
 	<error code='400'>Invalid login</error>
 </root>");
@@ -282,6 +327,7 @@ class OC_MEDIA_AMPACHE{
 		$filter=isset($params['filter'])?$params['filter']:'';
 		$exact=isset($params['exact'])?($params['exact']=='true'):false;
 		$songs=OC_MEDIA_COLLECTION::getSongs(0,0,$filter,$exact);
+		echo('<?xml version="1.0" encoding="UTF-8"?>');
 		echo('<root>');
 		foreach($songs as $song){
 			self::printSong($song);
@@ -291,12 +337,14 @@ class OC_MEDIA_AMPACHE{
 	
 	public static function song($params){
 		if(!self::checkAuth($params)){
+			echo('<?xml version="1.0" encoding="UTF-8"?>');
 			echo("<root>
 	<error code='400'>Invalid login</error>
 </root>");
 			return;
 		}
 		if($song=OC_MEDIA_COLLECTION::getSong($params['filter'])){
+			echo('<?xml version="1.0" encoding="UTF-8"?>');
 			echo('<root>');
 			self::printSong($song);
 			echo('</root>');
@@ -306,6 +354,7 @@ class OC_MEDIA_AMPACHE{
 	public static function play($params){
 		$username=!self::checkAuth($params);
 		if($username){
+			echo('<?xml version="1.0" encoding="UTF-8"?>');
 			echo("<root>
 	<error code='400'>Invalid login</error>
 </root>");
@@ -322,6 +371,7 @@ class OC_MEDIA_AMPACHE{
 	
 	public static function url_to_song($params){
 		if(!self::checkAuth($params)){
+			echo('<?xml version="1.0" encoding="UTF-8"?>');
 			echo("<root>
 	<error code='400'>Invalid login</error>
 </root>");
@@ -330,6 +380,7 @@ class OC_MEDIA_AMPACHE{
 		$url=$params['url'];
 		$songId=substr($url,strrpos($url,'song=')+5);
 		if($song=OC_MEDIA_COLLECTION::getSong($songId)){
+			echo('<?xml version="1.0" encoding="UTF-8"?>');
 			echo('<root>');
 			self::printSong($song);
 			echo('</root>');
@@ -338,6 +389,7 @@ class OC_MEDIA_AMPACHE{
 	
 	public static function search_songs($params){
 		if(!self::checkAuth($params)){
+			echo('<?xml version="1.0" encoding="UTF-8"?>');
 			echo("<root>
 	<error code='400'>Invalid login</error>
 </root>");
@@ -353,6 +405,7 @@ class OC_MEDIA_AMPACHE{
 		foreach($albums as $album){
 			$songs=array_merge($songs,OC_MEDIA_COLLECTION::getSongs($album['album_artist'],$album['album_id']));
 		}
+		echo('<?xml version="1.0" encoding="UTF-8"?>');
 		echo('<root>');
 		foreach($songs as $song){
 			self::printSong($song);
diff --git a/apps/media/server/xml.server.php b/apps/media/server/xml.server.php
index 7e320a7f595..cb9b68fc422 100644
--- a/apps/media/server/xml.server.php
+++ b/apps/media/server/xml.server.php
@@ -69,6 +69,9 @@ if(isset($arguments['action'])){
 		case 'search_songs':
 			OC_MEDIA_AMPACHE::search_songs($arguments);
 			break;
+		case 'song':
+			OC_MEDIA_AMPACHE::song($arguments);
+			break;
 	}
 }
 
-- 
GitLab


From 5458e5293564f432ad2eed0457cbe94321ee7114 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 24 Jan 2012 23:02:02 +0100
Subject: [PATCH 344/546] Fixed
 http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-92 "Character '&' in
 address data causes wrong data". This was also the case for the 'N' property.

---
 apps/contacts/lib/vcard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index c99d53c9716..ceac2dcfad2 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -323,7 +323,7 @@ class OC_Contacts_VCard{
 	 */
 	public static function structureProperty($property){
 		$value = $property->value;
-		$value = htmlspecialchars($value);
+		//$value = htmlspecialchars($value);
 		if($property->name == 'ADR' || $property->name == 'N'){
 			$value = OC_VObject::unescapeSemicolons($value);
 		}
-- 
GitLab


From e6298325f6c67c2913167df5dbdcd8938290f135 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 20 Jan 2012 21:11:34 +0100
Subject: [PATCH 345/546] Removed debug output

---
 apps/contacts/templates/part.contacts.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php
index 7587670f974..a6ac0f1096a 100644
--- a/apps/contacts/templates/part.contacts.php
+++ b/apps/contacts/templates/part.contacts.php
@@ -7,7 +7,6 @@
 			$display = isset($struct['EMAIL'][0])?$struct['EMAIL'][0]['value']:'[UNKNOWN]';
 		}
 	}
-	echo '<!-- '.$display.' -->';
 ?>
 	<li book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $display; ?></a></li>
 <?php endforeach; ?>
-- 
GitLab


From 5172e0a7a388fc2c22c9e10435f0ee2728dc5e36 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 25 Jan 2012 21:07:43 +0100
Subject: [PATCH 346/546] creating thumbnails on upload, recursive remove

---
 apps/gallery/lib/hooks_handlers.php | 16 ++--------------
 apps/gallery/lib/images_utils.php   |  6 +++++-
 apps/gallery/lib/photo.php          |  2 +-
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
index 53a924ff40a..236a4b96a07 100644
--- a/apps/gallery/lib/hooks_handlers.php
+++ b/apps/gallery/lib/hooks_handlers.php
@@ -63,21 +63,8 @@ class OC_Gallery_Hooks_Handlers {
 
     if (!self::isPhoto($fullpath)) return;
 
-    OC_Log::write(self::$APP_TAG, 'Adding file with path '. $fullpath, OC_Log::DEBUG);
     $path = substr($fullpath, 0, strrpos($fullpath, '/'));
-    if ($path == '') $path = '/';
-    $album = OC_Gallery_Album::find(OC_User::getUser(), null, $path);
-
-    if ($album->numRows() == 0) {
-      $album = self::createAlbum($path);
-    }
-    $album = $album->fetchRow();
-    $albumId = $album['album_id'];
-    $photo = OC_Gallery_Photo::find($albumId, $fullpath);
-    if ($photo->numRows() == 0) { // don't duplicate photo entries
-      OC_Log::write(self::$APP_TAG, 'Adding new photo to album', OC_Log::DEBUG);
-      OC_Gallery_Photo::create($albumId, $fullpath);
-    }
+    OC_Gallery_Scanner::scanDir($path, $albums);
 
   }
 
@@ -85,6 +72,7 @@ class OC_Gallery_Hooks_Handlers {
     $path = $params[OC_Filesystem::signal_param_path];
     if (OC_Filesystem::is_dir($path) && self::directoryContainsPhotos($path)) {
       OC_Gallery_Album::removeByPath($path, OC_User::getUser());
+      OC_Gallery_Photo::removeByPath($path.'/%');
     } elseif (self::isPhoto($path)) {
       OC_Gallery_Photo::removeByPath($path);
     }
diff --git a/apps/gallery/lib/images_utils.php b/apps/gallery/lib/images_utils.php
index 0cfa52eb564..126298913be 100644
--- a/apps/gallery/lib/images_utils.php
+++ b/apps/gallery/lib/images_utils.php
@@ -21,7 +21,11 @@
 * 
 */
 
-require_once('../../../lib/base.php');
+if (file_exists('../../../lib/base.php'))
+  require_once('../../../lib/base.php');
+elseif (file_exists('lib/base.php'))
+  require_once('lib/base.php');
+
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
 
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index 14b0c4b2a07..d1fb166aee9 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -47,7 +47,7 @@ class OC_Gallery_Photo{
 	}
 
   public static function removeByPath($path) {
-    $stmt = OC_DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE file_path = ?');
+    $stmt = OC_DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE file_path LIKE ?');
     $stmt->execute(array($path));
   }
 
-- 
GitLab


From 63ae4b3dfc9466b8ba5e392a63b7cfb10d6980fc Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 25 Jan 2012 21:15:27 +0100
Subject: [PATCH 347/546] db cleanup after gallery remove

---
 apps/gallery/ajax/galleryOp.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index f162fe2bc46..0c2674f8859 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -34,7 +34,11 @@ function handleRename($oldname, $newname) {
 
 function handleRemove($name) {
   OC_JSON::checkLoggedIn();
+  $album_id = OC_Gallery_Album::find(OC_User::getUser(), $name);
+  $album_id = $album_id->fetchRow();
+  $album_id = $album_id['album_id'];
   OC_Gallery_Album::remove(OC_User::getUser(), $name);
+  OC_Gallery_Photo::removeByAlbumId($album_id);
 }
 
 function handleGetThumbnails($albumname) {
-- 
GitLab


From 935b828427454cc2e175bf0bb3e3cf168a3257c2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 26 Jan 2012 17:56:13 +0100
Subject: [PATCH 348/546] initialize all storage backends when searching for a
 file, fixed searching in the Shared folder

---
 lib/filesystem.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index fd0ac3b6215..bd953deb210 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -226,6 +226,17 @@ class OC_Filesystem{
 		}
 		self::$mounts[$mountpoint]=array('type'=>$type,'arguments'=>$arguments);
 	}
+
+	/**
+	 * create all storage backends mounted in the filesystem
+	 */
+	static private function mountAll(){
+		foreach(self::$mounts as $mountPoint=>$mount){
+			if(!isset(self::$storages[$mountPoint])){
+				self::$storages[$mountPoint]=self::createStorage($mount['type'],$mount['arguments']);
+			}
+		}
+	}
 	
 	/**
 	* get the storage object for a path
@@ -501,6 +512,7 @@ class OC_Filesystem{
 	}
 	
 	static public function search($query){
+		self::mountAll();
 		$files=array();
 		$fakeRoot=self::$fakeRoot;
 		$fakeRootLength=strlen($fakeRoot);
-- 
GitLab


From 266fbb442ebefbec92d159204833848edf314fcf Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 26 Jan 2012 18:12:59 +0100
Subject: [PATCH 349/546] use oc_filesystem::getlocalfile instead of manually
 trying to get the correct local file when creating album covers

fixes broken album covers on shared files
---
 apps/gallery/ajax/cover.php  | 6 +++---
 apps/gallery/lib/scanner.php | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/gallery/ajax/cover.php b/apps/gallery/ajax/cover.php
index 181a919375d..068a6e9c4ec 100644
--- a/apps/gallery/ajax/cover.php
+++ b/apps/gallery/ajax/cover.php
@@ -70,11 +70,11 @@ $x = min((int)($x/($box_size/$result->numRows())), $result->numRows()-1); // get
 $result->seek($x); // never throws
 $path = $result->fetchRow();
 $path = $path['file_path'];
-$tmp = OC::$CONFIG_DATADIRECTORY . $path;
-$imagesize = getimagesize($tmp);
+$imagePath = OC_Filesystem::getLocalFile($img);
+$imagesize = getimagesize($imagePath);
 
 header('Content-Type: image/png');
-$image = CroppedThumbnail($tmp, $box_size, $box_size);
+$image = CroppedThumbnail($imagePath, $box_size, $box_size);
 
 imagepng($image);
 imagedestroy($image);
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index 447174e84c0..dfb9edebfea 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -82,7 +82,8 @@ class OC_Gallery_Scanner {
     $file_count = min(count($files), 10);
     $thumbnail = imagecreatetruecolor($file_count*200, 200);
     for ($i = 0; $i < $file_count; $i++) {
-      CroppedThumbnail(OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/files/'.$files[$i], 200, 200, $thumbnail, $i*200);
+		$imagePath = OC_Filesystem::getLocalFile($files[$i]);
+      CroppedThumbnail($imagePath, 200, 200, $thumbnail, $i*200);
     }
     imagepng($thumbnail, OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/gallery/' . $albumName.'.png');
   }
-- 
GitLab


From 830cf87697282cac254451079e21d2463cb86c92 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 26 Jan 2012 19:05:46 +0100
Subject: [PATCH 350/546] use the correct hooks to remove contact/calendars of
 remvoed users

---
 apps/calendar/appinfo/app.php | 2 +-
 apps/contacts/appinfo/app.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 908a22856ba..c667a7c0849 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -6,7 +6,7 @@ if(version_compare(PHP_VERSION, '5.3.0', '>')){
 	OC::$CLASSPATH['OC_Calendar_Object'] = 'apps/calendar/lib/object.php';
 	OC::$CLASSPATH['OC_Calendar_Hooks'] = 'apps/calendar/lib/hooks.php';
 	OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/connector_sabre.php';
-	OC_HOOK::connect('OC_User', 'post_createUser', 'OC_Calendar_Hooks', 'deleteUser');
+	OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser');
 	OC_Util::addScript('calendar','loader');
 	OC_App::register( array( 
 	  'order' => 10,
diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index df7e8cec6e0..a5b31006247 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -6,7 +6,7 @@ OC::$CLASSPATH['OC_Contacts_Addressbook'] = 'apps/contacts/lib/addressbook.php';
 OC::$CLASSPATH['OC_Contacts_VCard'] = 'apps/contacts/lib/vcard.php';
 OC::$CLASSPATH['OC_Contacts_Hooks'] = 'apps/contacts/lib/hooks.php';
 OC::$CLASSPATH['OC_Connector_Sabre_CardDAV'] = 'apps/contacts/lib/connector_sabre.php';
-OC_HOOK::connect('OC_User', 'post_createUser', 'OC_Contacts_Hooks', 'deleteUser');
+OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Contacts_Hooks', 'deleteUser');
 
 OC_App::register( array(
   'order' => 10,
-- 
GitLab


From 2f4a289782ae425c8984e982167ae8e523db96eb Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 27 Jan 2012 00:21:15 +0100
Subject: [PATCH 351/546] fix non-absolute symbolic links

---
 lib/filestorage/local.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index b8a0563c134..e846aa420e4 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -38,7 +38,7 @@ class OC_Filestorage_Local extends OC_Filestorage{
 	public function filetype($path){
 		$filetype=filetype($this->datadir.$path);
 		if($filetype=='link'){
-			$filetype=filetype(readlink($this->datadir.$path));
+			$filetype=filetype(realpath($this->datadir.$path));
 		}
 		return $filetype;
 	}
-- 
GitLab


From 500407dbe9751b1c05a7cd3b3920494228a4ad5c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 27 Jan 2012 00:37:11 +0100
Subject: [PATCH 352/546] change https detection a bit, hopefully fixing an
 edge case

---
 lib/helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helper.php b/lib/helper.php
index 24d436225b7..4d1219d78d4 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -56,7 +56,7 @@ class OC_Helper {
 
 		if($absolute){
 			// Checking if the request was made through HTTPS. The last in line is for IIS
-			$protocol = isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!='off');
+			$protocol = isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!='off');
 			$urlLinkTo = ($protocol?'https':'http') . '://'  . $_SERVER['HTTP_HOST'] . $urlLinkTo;
 		}
 
-- 
GitLab


From ad4e305c964bfe159f1898e72359f9ecaf910b2d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 27 Jan 2012 00:59:24 +0100
Subject: [PATCH 353/546] update translations

---
 apps/calendar/l10n/ar.php    |  75 +++++++++++++++++
 apps/calendar/l10n/ja_JP.php |  75 +++++++++++++++++
 apps/calendar/l10n/nl.php    |   1 +
 apps/calendar/l10n/th_TH.php |  17 +++-
 apps/contacts/l10n/ar.php    |  34 +++++++-
 apps/contacts/l10n/ja_JP.php |  34 +++++++-
 apps/contacts/l10n/th_TH.php |   5 +-
 apps/gallery/l10n/ar.php     |   5 ++
 apps/gallery/l10n/ca.php     |   1 +
 apps/gallery/l10n/cs_CZ.php  |   5 ++
 apps/gallery/l10n/da.php     |   1 +
 apps/gallery/l10n/de.php     |   1 +
 apps/gallery/l10n/es.php     |   1 +
 apps/gallery/l10n/it.php     |   5 ++
 apps/gallery/l10n/ja_JP.php  |  10 +++
 apps/gallery/l10n/pl.php     |   1 +
 apps/gallery/l10n/sk_SK.php  |   5 ++
 apps/gallery/l10n/th_TH.php  |   5 ++
 core/l10n/ca.php             |   2 +-
 core/l10n/ja_JP.php          |   5 ++
 files/l10n/ia.php            |   3 +
 files/l10n/ja_JP.php         |   4 +
 l10n/ar/calendar.po          | 158 +++++++++++++++++------------------
 l10n/ar/contacts.po          |  70 ++++++++--------
 l10n/ar/gallery.po           |  14 ++--
 l10n/ar/settings.po          |   8 +-
 l10n/ca/core.po              |   6 +-
 l10n/ca/gallery.po           |   6 +-
 l10n/cs_CZ/gallery.po        |  15 ++--
 l10n/cs_CZ/settings.po       |  10 +--
 l10n/da/gallery.po           |   6 +-
 l10n/da/settings.po          |   6 +-
 l10n/de/gallery.po           |   6 +-
 l10n/es/gallery.po           |   7 +-
 l10n/ia/files.po             |  13 +--
 l10n/it/gallery.po           |  15 ++--
 l10n/ja_JP/calendar.po       | 156 +++++++++++++++++-----------------
 l10n/ja_JP/contacts.po       |  68 +++++++--------
 l10n/ja_JP/core.po           |  16 ++--
 l10n/ja_JP/files.po          |  14 ++--
 l10n/ja_JP/gallery.po        |  20 ++---
 l10n/ja_JP/settings.po       |  22 ++---
 l10n/nl/calendar.po          |   9 +-
 l10n/pl/gallery.po           |   6 +-
 l10n/sk_SK/gallery.po        |  14 ++--
 l10n/th_TH/calendar.po       |  68 +++++++--------
 l10n/th_TH/contacts.po       |  10 +--
 l10n/th_TH/gallery.po        |  14 ++--
 settings/l10n/ar.php         |   1 +
 settings/l10n/cs_CZ.php      |   1 +
 settings/l10n/da.php         |   1 +
 settings/l10n/ja_JP.php      |   8 ++
 52 files changed, 681 insertions(+), 382 deletions(-)
 create mode 100644 apps/gallery/l10n/ja_JP.php

diff --git a/apps/calendar/l10n/ar.php b/apps/calendar/l10n/ar.php
index 7dc30ced856..13df7c7b5fd 100644
--- a/apps/calendar/l10n/ar.php
+++ b/apps/calendar/l10n/ar.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"New Timezone:" => "التوقيت الجديد",
 "Timezone changed" => "تم تغيير المنطقة الزمنية",
 "Invalid request" => "طلب غير م�هوم",
 "Calendar" => "الجدول الزمني",
@@ -25,7 +26,44 @@
 "Bi-Weekly" => "كل اسبوعين",
 "Monthly" => "شهري",
 "Yearly" => "سنوي",
+"never" => "بتاتا",
+"by occurrences" => "حسب تسلسل الحدوث",
+"by date" => "حسب التاريخ",
+"by monthday" => "حسب يوم الشهر",
+"by weekday" => "حسب يوم الاسبوع",
+"Monday" => "الأثنين",
+"Tuesday" => "الثلاثاء",
+"Wednesday" => "الاربعاء",
+"Thursday" => "الخميس",
+"Friday" => "الجمعه",
+"Saturday" => "السبت",
+"Sunday" => "الاحد",
+"events week of month" => "الاحداث باسبوع الشهر",
+"first" => "أول",
+"second" => "ثاني",
+"third" => "ثالث",
+"fourth" => "رابع",
+"fifth" => "خامس",
+"last" => "أخير",
+"January" => "كانون الثاني",
+"February" => "شباط",
+"March" => "آذار",
+"April" => "نيسان",
+"May" => "أيار",
+"June" => "حزيران",
+"July" => "تموز",
+"August" => "آب",
+"September" => "أيلول",
+"October" => "تشرين الاول",
+"November" => "تشرين الثاني",
+"December" => "كانون الاول",
+"by events date" => "حسب تاريخ الحدث",
+"by yearday(s)" => "حسب يوم السنه",
+"by weeknumber(s)" => "حسب رقم الاسبوع",
+"by day and month" => "حسب اليوم و الشهر",
 "Not an array" => "ليس ص�ي�",
+"Date" => "تاريخ",
+"Cal." => "تقويم",
 "All day" => "كل النهار",
 "Missing fields" => "خانات خالية من المعلومات",
 "Title" => "عنوان",
@@ -41,6 +79,25 @@
 "Today" => "اليوم",
 "Calendars" => "الجداول الزمنية",
 "There was a fail, while parsing the file." => "لم يتم قراءة المل� بنجاح.",
+"Sun." => "أحد",
+"Mon." => "أثن.",
+"Tue." => "ثلا.",
+"Wed." => "أرب.",
+"Thu." => "خمي.",
+"Fri." => "جمع.",
+"Sat." => "سبت",
+"Jan." => "Ùƒ2",
+"Feb." => "شبا.",
+"Mar." => "اذار",
+"Apr." => "نيس.",
+"May." => "أيا.",
+"Jun." => "حزي.",
+"Jul." => "تمو.",
+"Aug." => "آب",
+"Sep." => "أيل.",
+"Oct." => "ت1",
+"Nov." => "ت2",
+"Dec." => "Ùƒ1",
 "Choose active calendars" => "إختر الجدول الزمني الرئيسي",
 "New Calendar" => "جدول زمني جديد",
 "CalDav Link" => "وصلة CalDav",
@@ -65,14 +122,32 @@
 "To" => "إلى",
 "Advanced options" => "خيارات متقدمة",
 "Repeat" => "إعادة",
+"Advanced" => "تعديلات متقدمه",
+"Select weekdays" => "اختر ايام الاسبوع",
+"Select days" => "اختر الايام",
+"and the events day of year." => "و التواريخ حسب يوم السنه.",
+"and the events day of month." => "و الاحداث حسب يوم الشهر.",
+"Select months" => "اختر الاشهر",
+"Select weeks" => "اختر الاسابيع",
+"and the events week of year." => "و الاحداث حسب اسبوع السنه",
+"Interval" => "المده ال�اصله",
+"End" => "نهايه",
+"occurrences" => "الاحداث",
 "Location" => "مكان",
 "Location of the Event" => "مكان الحدث",
 "Description" => "مواص�ات",
 "Description of the Event" => "وص� الحدث",
+"Import a calendar file" => "أدخل مل� التقويم",
 "Please choose the calendar" => "الرجاء إختر الجدول الزمني",
+"create a new calendar" => "انشاء جدول زمني جديد",
+"Name of new calendar" => "أسم الجدول الزمني الجديد",
 "Import" => "إدخال",
+"Importing calendar" => "يتم ادخال الجدول الزمني",
+"Calendar imported successfully" => "تم ادخال الجدول الزمني بنجاح",
+"Close Dialog" => "أغلق الحوار",
 "Create a new event" => "إضا�ة حدث جديد",
 "Timezone" => "المنطقة الزمنية",
+"Check always for changes of the timezone" => "راقب دائما تغير التقويم الزمني",
 "Timeformat" => "شكل الوقت",
 "24h" => "24 ساعة",
 "12h" => "12 ساعة",
diff --git a/apps/calendar/l10n/ja_JP.php b/apps/calendar/l10n/ja_JP.php
index ef83f5d5a65..0645f6a2a2c 100644
--- a/apps/calendar/l10n/ja_JP.php
+++ b/apps/calendar/l10n/ja_JP.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"New Timezone:" => "新��タイムゾーン:",
 "Timezone changed" => "タイムゾーン�変更�れ���",
 "Invalid request" => "無効�リクエスト��",
 "Calendar" => "カレンダー",
@@ -25,7 +26,44 @@
 "Bi-Weekly" => "2週間��",
 "Monthly" => "毎月",
 "Yearly" => "毎年",
+"never" => "無�",
+"by occurrences" => "回数�指定",
+"by date" => "日付�指定",
+"by monthday" => "日���指定",
+"by weekday" => "曜日�指定",
+"Monday" => "月曜日",
+"Tuesday" => "�曜日",
+"Wednesday" => "水曜日",
+"Thursday" => "木曜日",
+"Friday" => "金曜日",
+"Saturday" => "土曜日",
+"Sunday" => "日曜日",
+"events week of month" => "予定��る週を指定",
+"first" => "１週目",
+"second" => "２週目",
+"third" => "３週目",
+"fourth" => "４週目",
+"fifth" => "５週目",
+"last" => "最終週",
+"January" => "１月",
+"February" => "２月",
+"March" => "３月",
+"April" => "４月",
+"May" => "５月",
+"June" => "６月",
+"July" => "７月",
+"August" => "８月",
+"September" => "９月",
+"October" => "１�月",
+"November" => "１１月",
+"December" => "１２月",
+"by events date" => "日付�指定",
+"by yearday(s)" => "日番��指定",
+"by weeknumber(s)" => "週番��指定",
+"by day and month" => "月�日�指定",
 "Not an array" => "�列���り��ん",
+"Date" => "日付",
+"Cal." => "カレンダー",
 "All day" => "終日",
 "Missing fields" => "項目��り��ん",
 "Title" => "タイトル",
@@ -41,6 +79,25 @@
 "Today" => "今日",
 "Calendars" => "カレンダー",
 "There was a fail, while parsing the file." => "ファイルを構文解��る際�失敗����",
+"Sun." => "æ—¥",
+"Mon." => "月",
+"Tue." => "�",
+"Wed." => "æ°´",
+"Thu." => "木",
+"Fri." => "金",
+"Sat." => "土",
+"Jan." => "１月",
+"Feb." => "２月",
+"Mar." => "３月",
+"Apr." => "４月",
+"May." => "５月",
+"Jun." => "６月",
+"Jul." => "７月",
+"Aug." => "８月",
+"Sep." => "９月",
+"Oct." => "１�月",
+"Nov." => "１１月",
+"Dec." => "１２月",
 "Choose active calendars" => "アクティブ�カレンダーを�択������",
 "New Calendar" => "新��カレンダーを作��る",
 "CalDav Link" => "CalDav��リンク",
@@ -65,14 +122,32 @@
 "To" => "終了",
 "Advanced options" => "詳細設定",
 "Repeat" => "繰り返�",
+"Advanced" => "詳細設定",
+"Select weekdays" => "曜日を指定",
+"Select days" => "日付を指定",
+"and the events day of year." => "対象�年を�択�る。",
+"and the events day of month." => "対象�月を�択�る。",
+"Select months" => "月を指定�る",
+"Select weeks" => "週を指定�る",
+"and the events week of year." => "対象�週を�択�る。",
+"Interval" => "周期",
+"End" => "繰り返�期間",
+"occurrences" => "回繰り返�",
 "Location" => "場所",
 "Location of the Event" => "イベント�場所",
 "Description" => "メモ",
 "Description of the Event" => "イベント�メモ",
+"Import a calendar file" => "カレンダーファイルをイン�ート",
 "Please choose the calendar" => "カレンダーを�択������",
+"create a new calendar" => "新�カレンダー�作�",
+"Name of new calendar" => "新�カレンダー��称",
 "Import" => "イン�ート",
+"Importing calendar" => "カレンダーを�り込�中",
+"Calendar imported successfully" => "カレンダー��り込���功����",
+"Close Dialog" => "閉�る",
 "Create a new event" => "新��イベントを作��る",
 "Timezone" => "タイムゾーン",
+"Check always for changes of the timezone" => "タイムゾーン変更を常�確��る",
 "Timeformat" => "時刻�フォーマット",
 "24h" => "24時間制",
 "12h" => "12時間制",
diff --git a/apps/calendar/l10n/nl.php b/apps/calendar/l10n/nl.php
index 3efb869042d..e80694d610e 100644
--- a/apps/calendar/l10n/nl.php
+++ b/apps/calendar/l10n/nl.php
@@ -29,6 +29,7 @@
 "never" => "nooit meer",
 "by occurrences" => "volgens gebeurtenissen",
 "by date" => "op datum",
+"by monthday" => "per dag van de maand",
 "by weekday" => "op weekdag",
 "Monday" => "Maandag",
 "Tuesday" => "Dinsdag",
diff --git a/apps/calendar/l10n/th_TH.php b/apps/calendar/l10n/th_TH.php
index 46f673d93a4..60f4701211f 100644
--- a/apps/calendar/l10n/th_TH.php
+++ b/apps/calendar/l10n/th_TH.php
@@ -26,8 +26,11 @@
 "Bi-Weekly" => "รายปั�ษ์",
 "Monthly" => "รายเดือน",
 "Yearly" => "รายปี",
+"never" => "ไม่ต้องเลย",
 "by occurrences" => "ตามจำนวนที่ปรา��",
 "by date" => "ตามวันที่",
+"by monthday" => "จา�เดือน",
+"by weekday" => "จา�สัปดาห์",
 "Monday" => "วันจันทร์",
 "Tuesday" => "วันอังคาร",
 "Wednesday" => "วันพุธ",
@@ -56,10 +59,12 @@
 "December" => "ธันวาคม",
 "by events date" => "ตามวันที่จัด�ิจ�รรม",
 "by yearday(s)" => "ของเมื่อวานนี้",
+"by weeknumber(s)" => "จา�หมายเลขของสัปดาห์",
 "by day and month" => "ตามวัน�ละเดือน",
+"Not an array" => "ไม่ใช่อาเรย์",
 "Date" => "วันที่",
+"Cal." => "คำนวณ",
 "All day" => "ทั้งวัน",
-"New Calendar" => "สร้างป�ิทินใหม่",
 "Missing fields" => "ช่องฟิลด์เ�ิด�ารสู�หาย",
 "Title" => "ชื่อ�ิจ�รรม",
 "From Date" => "จา�วันที่",
@@ -94,6 +99,8 @@
 "Nov." => "พ.ย.",
 "Dec." => "ธ.ค.",
 "Choose active calendars" => "เลือ�ป�ิทินที่ต้อง�ารใช้งาน",
+"New Calendar" => "สร้างป�ิทินใหม่",
+"CalDav Link" => "ลิงค์ CalDav",
 "Download" => "ดาวน์โหลด",
 "Edit" => "��้ไข",
 "Delete" => "ลบ",
@@ -116,9 +123,14 @@
 "Advanced options" => "ตัวเลือ�ขั้นสูง",
 "Repeat" => "ทำซ้ำ",
 "Advanced" => "ขั้นสูง",
+"Select weekdays" => "เลือ�สัปดาห์",
 "Select days" => "เลือ�วัน",
+"and the events day of year." => "�ละวันที่มีเหตุ�ารณ์เ�ิดขึ้นในปี",
+"and the events day of month." => "�ละวันที่มีเหตุ�ารณ์เ�ิดขึ้นในเดือน",
 "Select months" => "เลือ�เดือน",
 "Select weeks" => "เลือ�สัปดาห์",
+"and the events week of year." => "�ละสัปดาห์ที่มีเหตุ�ารณ์เ�ิดขึ้นในปี",
+"Interval" => "ช่วงเวลา",
 "End" => "สิ้นสุด",
 "occurrences" => "จำนวนที่ปรา��",
 "Location" => "สถานที่",
@@ -138,5 +150,6 @@
 "Check always for changes of the timezone" => "ตรวจสอบ�ารเปลี่ยน�ปลงโซนเวลาอยู่เสมอ",
 "Timeformat" => "รูป�บบ�าร�สดงเวลา",
 "24h" => "24 ช.ม.",
-"12h" => "12 ช.ม."
+"12h" => "12 ช.ม.",
+"Calendar CalDAV syncing address:" => "ที่อยู่ใน�ารเชื่อมข้อมูล�ับป�ิทิน CalDav:"
 );
diff --git a/apps/contacts/l10n/ar.php b/apps/contacts/l10n/ar.php
index 29453de9dc7..88671f600ef 100644
--- a/apps/contacts/l10n/ar.php
+++ b/apps/contacts/l10n/ar.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "خطء خلال توقي� كتاب العناوين.",
+"There was an error adding the contact." => "خطء خلال اضا�ة معر�ه جديده.",
+"Cannot add empty property." => "لا يمكنك اضا�ه ص�ه خاليه.",
+"At least one of the address fields has to be filled out." => "يجب ملء على الاقل خانه واحده من العنوان.",
+"Error adding contact property." => "خطء خلال اضا�ة ص�ة المعر�ه.",
+"Error adding addressbook." => "خطء خلال اضا�ة كتاب عناوين.",
+"Error activating addressbook." => "خطء خلال ت�عيل كتاب العناوين.",
+"Error deleting contact property." => "خطء خلال محي الص�ه.",
+"Error updating contact property." => "خطء خلال تعديل الص�ه.",
+"Error updating addressbook." => "خطء خلال تعديل كتاب العناوين",
+"Contacts" => "المعار�",
 "This is not your addressbook." => "هذا ليس د�تر عناوينك.",
 "Contact could not be found." => "لم يتم العثور على الشخص.",
 "Information about vCard is incorrect. Please reload the page." => "المعلومات الموجودة �ي ال vCard غير صحيحة. الرجاء إعادة تحديث الص�حة.",
@@ -14,9 +25,13 @@
 "Fax" => "ال�اكس",
 "Video" => "ال�يديو",
 "Pager" => "الرنان",
+"Contact" => "معر�ه",
 "This is not your contact." => ".هذا ليس من معار�ي",
 "Add Contact" => "أض� شخص ",
+"Addressbooks" => "كتب العناوين",
+"Addressbook" => "كتاب العناوين",
 "Name" => "الاسم",
+"Type" => "نوع",
 "PO Box" => "العنوان البريدي",
 "Extended" => "إضا�ة",
 "Street" => "شارع",
@@ -25,8 +40,25 @@
 "Zipcode" => "رقم المنطقة",
 "Country" => "البلد",
 "Create Contact" => "أض� شخص ",
+"Choose active Address Books" => "أختر كتاب العناوين ال�عال",
+"New Address Book" => "كتاب عناوين جديد",
+"CardDav Link" => "وصلة CardDav",
+"Download" => "انزال",
 "Edit" => "تعديل",
 "Delete" => "حذ�",
+"Download contact" => "انزال المعر�ه",
+"Delete contact" => "امحي المعر�ه",
+"Add" => "أدخل",
+"New Addressbook" => "كتاب عناوين جديد",
+"Edit Addressbook" => "عدل كتاب العناوين",
+"Displayname" => "الاسم المعروض",
+"Active" => "�عال",
+"Save" => "ح�ظ",
+"Submit" => "ارسال",
+"Cancel" => "الغاء",
 "Birthday" => "تاريخ الميلاد",
-"Phone" => "الهات�"
+"Preferred" => "م�ضل",
+"Phone" => "الهات�",
+"Update" => "تعديل",
+"CardDAV syncing address:" => "CardDAV مزامنه العناوين:"
 );
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index b0ad16d0ae2..e8417562b86 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "電話帳�有効/無効化�失敗����。",
+"There was an error adding the contact." => "連絡先�追加�エラー�発生����。",
+"Cannot add empty property." => "項目�新�追加�失敗����。",
+"At least one of the address fields has to be filled out." => "アドレス項目�１��記入��下��。",
+"Error adding contact property." => "連絡先�追加�失敗����。",
+"Error adding addressbook." => "電話帳�追加�失敗����。",
+"Error activating addressbook." => "電話帳�有効化�失敗����。",
+"Error deleting contact property." => "連絡先�削除�失敗����。",
+"Error updating contact property." => "連絡先�更新�失敗����。",
+"Error updating addressbook." => "電話帳�更新�失敗����。",
+"Contacts" => "連絡先",
 "This is not your addressbook." => "�れ�����電話帳���り��ん。",
 "Contact could not be found." => "連絡先を見��る事�����ん。",
 "Information about vCard is incorrect. Please reload the page." => "vCard�情報�誤り��り��。ページをリロード��下��。",
@@ -14,9 +25,13 @@
 "Fax" => "FAX",
 "Video" => "テレビ電話",
 "Pager" => "�ケベル",
+"Contact" => "連絡先",
 "This is not your contact." => "����連絡先���り��ん。",
 "Add Contact" => "連絡先�追加",
+"Addressbooks" => "電話帳",
+"Addressbook" => "電話帳",
 "Name" => "��",
+"Type" => "種類",
 "PO Box" => "�書箱",
 "Extended" => "拡張番地",
 "Street" => "街路番地",
@@ -25,8 +40,25 @@
 "Zipcode" => "郵便番�",
 "Country" => "国�",
 "Create Contact" => "追加",
+"Choose active Address Books" => "有効�電話帳��択",
+"New Address Book" => "新�電話帳",
+"CardDav Link" => "CardDAV リンク",
+"Download" => "ダウンロード",
 "Edit" => "編集",
 "Delete" => "削除",
+"Download contact" => "連絡先�ダウンロード",
+"Delete contact" => "連絡先�削除",
+"Add" => "追加",
+"New Addressbook" => "電話帳�新�作�",
+"Edit Addressbook" => "電話帳�編集",
+"Displayname" => "表示�",
+"Active" => "アクティブ",
+"Save" => "�存",
+"Submit" => "�信",
+"Cancel" => "�り消�",
 "Birthday" => "生年月日",
-"Phone" => "電話番�"
+"Preferred" => "推奨",
+"Phone" => "電話番�",
+"Update" => "æ›´æ–°",
+"CardDAV syncing address:" => "CardDAV �期アドレス:"
 );
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
index 63a77cc423a..06e103bc320 100644
--- a/apps/contacts/l10n/th_TH.php
+++ b/apps/contacts/l10n/th_TH.php
@@ -42,6 +42,7 @@
 "Create Contact" => "สร้างข้อมูล�ารติดต่อใหม่",
 "Choose active Address Books" => "เลือ�สมุดบันทึ�ข้อมูลติดต่อที่ต้อง�ารใช้งาน",
 "New Address Book" => "สร้างสมุดบันทึ�ข้อมูล�ารติดต่อใหม่",
+"CardDav Link" => "ลิงค์ CardDav",
 "Download" => "ดาวน์โหลด",
 "Edit" => "��้ไข",
 "Delete" => "ลบ",
@@ -56,6 +57,8 @@
 "Submit" => "ส่งข้อมูล",
 "Cancel" => "ย�เลิ�",
 "Birthday" => "วันเ�ิด",
+"Preferred" => "พิเศษ",
 "Phone" => "โทรศัพท์",
-"Update" => "อัพเดท"
+"Update" => "อัพเดท",
+"CardDAV syncing address:" => "ที่อยู่ใน�ารเชื่อมข้อมูล�ับระบบบันทึ�ที่อยู่ CardDAV:"
 );
diff --git a/apps/gallery/l10n/ar.php b/apps/gallery/l10n/ar.php
index d0c7d22316a..64eec0f735d 100644
--- a/apps/gallery/l10n/ar.php
+++ b/apps/gallery/l10n/ar.php
@@ -1,5 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Gallery" => "معرض صور",
+"Scanning directories" => "بحث �ي المجلدات",
+"No photos found" => "لم يتم العثور على صور",
+"Creating thumbnails" => "صناعة مصغرات",
+"Do you wan't to remove album" => "هل تريد محي الالبوم",
+"Input new gallery name" => "أدخل اسم معرض جديد",
 "Rescan" => "اعادة البحث",
 "Back" => "رجوع"
 );
diff --git a/apps/gallery/l10n/ca.php b/apps/gallery/l10n/ca.php
index 119562324f4..39463a055e4 100644
--- a/apps/gallery/l10n/ca.php
+++ b/apps/gallery/l10n/ca.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Gallery" => "Galeria",
 "Scanning directories" => "S'estan escanejant carpetes",
+"No photos found" => "No s'han trobat fotos",
 "Creating thumbnails" => "S'estan creant miniatures",
 "Do you wan't to remove album" => "Voleu eliminar l'àlbum",
 "Input new gallery name" => "Escriviu el nom nou de la galeria",
diff --git a/apps/gallery/l10n/cs_CZ.php b/apps/gallery/l10n/cs_CZ.php
index af70a364048..446374389ad 100644
--- a/apps/gallery/l10n/cs_CZ.php
+++ b/apps/gallery/l10n/cs_CZ.php
@@ -1,5 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Gallery" => "Galerie",
+"Scanning directories" => "Prohledávám adresáře",
+"No photos found" => "Nenalezeny žádné fotky",
+"Creating thumbnails" => "Vytvářím náhledy",
+"Do you wan't to remove album" => "Chcete odstranit album?",
+"Input new gallery name" => "Zadejte nový název galerie",
 "Rescan" => "Opakované prohledání",
 "Back" => "Zpět"
 );
diff --git a/apps/gallery/l10n/da.php b/apps/gallery/l10n/da.php
index b9d11701f8e..713ffdbadc9 100644
--- a/apps/gallery/l10n/da.php
+++ b/apps/gallery/l10n/da.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Gallery" => "Galleri",
 "Scanning directories" => "Gennemgår mapper",
+"No photos found" => "Ingen billeder fundet",
 "Creating thumbnails" => "Danner miniaturer",
 "Do you wan't to remove album" => "Ønsker du at fjerne albummet",
 "Input new gallery name" => "Indtast navn på nyt galleri",
diff --git a/apps/gallery/l10n/de.php b/apps/gallery/l10n/de.php
index b229c96ac8e..e72df4e5cb0 100644
--- a/apps/gallery/l10n/de.php
+++ b/apps/gallery/l10n/de.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Gallery" => "Galerie",
 "Scanning directories" => "Ordner werden durchsucht.",
+"No photos found" => "Keine Fotos gefunden",
 "Creating thumbnails" => "Thumbnails werden erstellt.",
 "Do you wan't to remove album" => "Soll das Album entfernt werden?",
 "Input new gallery name" => "Gib den Albumnamen ein.",
diff --git a/apps/gallery/l10n/es.php b/apps/gallery/l10n/es.php
index 4da953af430..96cee7b1d8b 100644
--- a/apps/gallery/l10n/es.php
+++ b/apps/gallery/l10n/es.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Gallery" => "Galería",
 "Scanning directories" => "Escaneando directorios",
+"No photos found" => "No se encontraron fotos",
 "Creating thumbnails" => "Creando miniaturas",
 "Do you wan't to remove album" => "Quieres eliminar el álbum",
 "Input new gallery name" => "Introduce el nuevo nombre de la galería",
diff --git a/apps/gallery/l10n/it.php b/apps/gallery/l10n/it.php
index 0f95cc3af66..789940f0e78 100644
--- a/apps/gallery/l10n/it.php
+++ b/apps/gallery/l10n/it.php
@@ -1,5 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Gallery" => "Galleria",
+"Scanning directories" => "Analisi cartelle in corso",
+"No photos found" => "Nessuna foto trovata",
+"Creating thumbnails" => "Creazione anteprime in corso",
+"Do you wan't to remove album" => "Vuoi rimuovere l'album",
+"Input new gallery name" => "Inserisci il nome della nuova galleria",
 "Rescan" => "Rileggi",
 "Back" => "Indietro"
 );
diff --git a/apps/gallery/l10n/ja_JP.php b/apps/gallery/l10n/ja_JP.php
new file mode 100644
index 00000000000..20916cca85a
--- /dev/null
+++ b/apps/gallery/l10n/ja_JP.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "ギャラリー",
+"Scanning directories" => "ディレクトリをスキャン中",
+"No photos found" => "写真�見��り��ん���",
+"Creating thumbnails" => "サム�イルを作�中",
+"Do you wan't to remove album" => "アル�ムを削除����",
+"Input new gallery name" => "新��ギャラリー�を作る",
+"Rescan" => "�スキャン",
+"Back" => "戻る"
+);
diff --git a/apps/gallery/l10n/pl.php b/apps/gallery/l10n/pl.php
index 0b2bf9f3ccb..20baaf713ab 100644
--- a/apps/gallery/l10n/pl.php
+++ b/apps/gallery/l10n/pl.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Gallery" => "Galeria",
 "Scanning directories" => "Skanuje katalogi",
+"No photos found" => "Nie znaleziono zdjęć",
 "Creating thumbnails" => "Tworzenie miniatur",
 "Do you wan't to remove album" => "Czy chcesz usunąć album",
 "Input new gallery name" => "Wprowadź nową nazwę galerii",
diff --git a/apps/gallery/l10n/sk_SK.php b/apps/gallery/l10n/sk_SK.php
index d8ae41af96e..26301562cfd 100644
--- a/apps/gallery/l10n/sk_SK.php
+++ b/apps/gallery/l10n/sk_SK.php
@@ -1,5 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Gallery" => "Galéria",
+"Scanning directories" => "Prehľadávam prie�inky",
+"No photos found" => "Neboli nájdené žiadne fotografie",
+"Creating thumbnails" => "Vytváram náhľady",
+"Do you wan't to remove album" => "Chcete odstrániť album",
+"Input new gallery name" => "Vložte meno novej galérie",
 "Rescan" => "Znovu oskenovať",
 "Back" => "Späť"
 );
diff --git a/apps/gallery/l10n/th_TH.php b/apps/gallery/l10n/th_TH.php
index 8c729856488..fa6c84f03dc 100644
--- a/apps/gallery/l10n/th_TH.php
+++ b/apps/gallery/l10n/th_TH.php
@@ -1,5 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Gallery" => "��ลอรี่",
+"Scanning directories" => "�ำลังส��นไดเร็�ทอรี่",
+"No photos found" => "ไม่พบรูปภาพที่ต้อง�าร",
+"Creating thumbnails" => "�ารสร้างรูปขนาดย่อ",
+"Do you wan't to remove album" => "คุณต้อง�ารลบอัลบั้มนี้ออ�หรือไม่",
+"Input new gallery name" => "�รอ�ชื่อ��ลอรี่ใหม่",
 "Rescan" => "ตรวจสอบอี�ครั้ง",
 "Back" => "ย้อน�ลับ"
 );
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 70bec66ff56..5a28b80760c 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -27,7 +27,7 @@
 "Database name" => "Nom de la base de dades",
 "Database host" => "Ordinador central de la base de dades",
 "Finish setup" => "Acaba la configuració",
-"web services under your control" => "tingueu el control dels serveis web",
+"web services under your control" => "controleu els vostres serveis web",
 "Log out" => "Sortir",
 "Settings" => "Arranjament",
 "Lost your password?" => "Heu perdut la contrasenya?",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index ae2b47253cc..3584bf6732b 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Owncloud �パスワードをリセット",
+"Use the following link to reset your password: {link}" => "パスワードをリセット�る��次�リンクをクリック��下��: {link}",
 "You will receive a link to reset your password via Email." => "パスワードをリセット�るリンク�メール�届���。",
 "Requested" => "�信�れ���",
 "Login failed!" => "ログイン�失敗����。",
 "Username" => "ユーザ�",
 "Request reset" => "リセットを�求�る。",
 "Your password was reset" => "����パスワード�リセット�れ���。",
+"To login page" => "ログインページ�戻る",
 "New password" => "新��パスワードを入力",
 "Reset password" => "パスワードをリセット",
 "Personal" => "個人設定",
@@ -24,10 +27,12 @@
 "Database name" => "データベース�",
 "Database host" => "データベース�ホスト�",
 "Finish setup" => "セットアップを完了���",
+"web services under your control" => "管�下��るウェブサービス",
 "Log out" => "ログアウト",
 "Settings" => "設定",
 "Lost your password?" => "パスワード���ら���り����？",
 "remember" => "パスワードを記憶�る",
+"Log in" => "ログイン",
 "You are logged out." => "ログアウト����。",
 "prev" => "�",
 "next" => "次"
diff --git a/files/l10n/ia.php b/files/l10n/ia.php
index 852fb8794ac..8753b871c9e 100644
--- a/files/l10n/ia.php
+++ b/files/l10n/ia.php
@@ -3,6 +3,9 @@
 "No file was uploaded" => "Nulle file esseva incargate",
 "Files" => "Files",
 "Maximum upload size" => "Dimension maxime de incargamento",
+"New" => "Nove",
+"Text file" => "File de texto",
+"Folder" => "Dossier",
 "Upload" => "Incargar",
 "Nothing in here. Upload something!" => "Nihil hic. Incarga alcun cosa!",
 "Name" => "Nomine",
diff --git a/files/l10n/ja_JP.php b/files/l10n/ja_JP.php
index d41e7e119a2..24c4e36ee6e 100644
--- a/files/l10n/ja_JP.php
+++ b/files/l10n/ja_JP.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "テン�ラリフォルダ�見��り��ん",
 "Files" => "ファイル",
 "Maximum upload size" => "最大アップロードサイズ",
+"New" => "新�作�",
+"Text file" => "テキストファイル",
+"Folder" => "フォルダ",
+"From the web" => "ウェブ経由",
 "Upload" => "アップロード",
 "Nothing in here. Upload something!" => "����何も�り��ん。何�アップロード������。",
 "Name" => "��",
diff --git a/l10n/ar/calendar.po b/l10n/ar/calendar.po
index ae7fed1101f..4ba4f72625d 100644
--- a/l10n/ar/calendar.po
+++ b/l10n/ar/calendar.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <tarek.taha@gmail.com>, 2011.
+#   <tarek.taha@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-25 09:22+0000\n"
+"Last-Translator: blackcoder <tarek.taha@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ajax/guesstimezone.php:42
 msgid "New Timezone:"
-msgstr ""
+msgstr "التوقيت الجديد"
 
 #: ajax/settimezone.php:22
 msgid "Timezone changed"
@@ -129,143 +129,143 @@ msgstr "سنوي"
 
 #: lib/object.php:366
 msgid "never"
-msgstr ""
+msgstr "بتاتا"
 
 #: lib/object.php:367
 msgid "by occurrences"
-msgstr ""
+msgstr "حسب تسلسل الحدوث"
 
 #: lib/object.php:368
 msgid "by date"
-msgstr ""
+msgstr "حسب التاريخ"
 
 #: lib/object.php:375
 msgid "by monthday"
-msgstr ""
+msgstr "حسب يوم الشهر"
 
 #: lib/object.php:376
 msgid "by weekday"
-msgstr ""
+msgstr "حسب يوم الاسبوع"
 
 #: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr ""
+msgstr "الأثنين"
 
 #: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr ""
+msgstr "الثلاثاء"
 
 #: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr ""
+msgstr "الاربعاء"
 
 #: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr ""
+msgstr "الخميس"
 
 #: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr ""
+msgstr "الجمعه"
 
 #: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr ""
+msgstr "السبت"
 
 #: lib/object.php:389 templates/lAfix.php:2
 msgid "Sunday"
-msgstr ""
+msgstr "الاحد"
 
 #: lib/object.php:396
 msgid "events week of month"
-msgstr ""
+msgstr "الاحداث باسبوع الشهر"
 
 #: lib/object.php:397
 msgid "first"
-msgstr ""
+msgstr "أول"
 
 #: lib/object.php:398
 msgid "second"
-msgstr ""
+msgstr "ثاني"
 
 #: lib/object.php:399
 msgid "third"
-msgstr ""
+msgstr "ثالث"
 
 #: lib/object.php:400
 msgid "fourth"
-msgstr ""
+msgstr "رابع"
 
 #: lib/object.php:401
 msgid "fifth"
-msgstr ""
+msgstr "خامس"
 
 #: lib/object.php:402
 msgid "last"
-msgstr ""
+msgstr "أخير"
 
 #: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr ""
+msgstr "كانون الثاني"
 
 #: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr ""
+msgstr "شباط"
 
 #: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr ""
+msgstr "آذار"
 
 #: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr ""
+msgstr "نيسان"
 
 #: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr ""
+msgstr "أيار"
 
 #: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr ""
+msgstr "حزيران"
 
 #: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr ""
+msgstr "تموز"
 
 #: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr ""
+msgstr "آب"
 
 #: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr ""
+msgstr "أيلول"
 
 #: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr ""
+msgstr "تشرين الاول"
 
 #: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr ""
+msgstr "تشرين الثاني"
 
 #: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr ""
+msgstr "كانون الاول"
 
 #: lib/object.php:441
 msgid "by events date"
-msgstr ""
+msgstr "حسب تاريخ الحدث"
 
 #: lib/object.php:442
 msgid "by yearday(s)"
-msgstr ""
+msgstr "حسب يوم السنه"
 
 #: lib/object.php:443
 msgid "by weeknumber(s)"
-msgstr ""
+msgstr "حسب رقم الاسبوع"
 
 #: lib/object.php:444
 msgid "by day and month"
-msgstr ""
+msgstr "حسب اليوم و الشهر"
 
 #: lib/object.php:467
 msgid "Not an array"
@@ -273,11 +273,11 @@ msgstr "ليس ص�ي�"
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
-msgstr ""
+msgstr "تاريخ"
 
 #: lib/search.php:40
 msgid "Cal."
-msgstr ""
+msgstr "تقويم"
 
 #: templates/calendar.php:10
 msgid "All day"
@@ -341,79 +341,79 @@ msgstr "لم يتم قراءة المل� بنجاح."
 
 #: templates/lAfix.php:9
 msgid "Sun."
-msgstr ""
+msgstr "أحد"
 
 #: templates/lAfix.php:10
 msgid "Mon."
-msgstr ""
+msgstr "أثن."
 
 #: templates/lAfix.php:11
 msgid "Tue."
-msgstr ""
+msgstr "ثلا."
 
 #: templates/lAfix.php:12
 msgid "Wed."
-msgstr ""
+msgstr "أرب."
 
 #: templates/lAfix.php:13
 msgid "Thu."
-msgstr ""
+msgstr "خمي."
 
 #: templates/lAfix.php:14
 msgid "Fri."
-msgstr ""
+msgstr "جمع."
 
 #: templates/lAfix.php:15
 msgid "Sat."
-msgstr ""
+msgstr "سبت"
 
 #: templates/lAfix.php:28
 msgid "Jan."
-msgstr ""
+msgstr "Ùƒ2"
 
 #: templates/lAfix.php:29
 msgid "Feb."
-msgstr ""
+msgstr "شبا."
 
 #: templates/lAfix.php:30
 msgid "Mar."
-msgstr ""
+msgstr "اذار"
 
 #: templates/lAfix.php:31
 msgid "Apr."
-msgstr ""
+msgstr "نيس."
 
 #: templates/lAfix.php:32
 msgid "May."
-msgstr ""
+msgstr "أيا."
 
 #: templates/lAfix.php:33
 msgid "Jun."
-msgstr ""
+msgstr "حزي."
 
 #: templates/lAfix.php:34
 msgid "Jul."
-msgstr ""
+msgstr "تمو."
 
 #: templates/lAfix.php:35
 msgid "Aug."
-msgstr ""
+msgstr "آب"
 
 #: templates/lAfix.php:36
 msgid "Sep."
-msgstr ""
+msgstr "أيل."
 
 #: templates/lAfix.php:37
 msgid "Oct."
-msgstr ""
+msgstr "ت1"
 
 #: templates/lAfix.php:38
 msgid "Nov."
-msgstr ""
+msgstr "ت2"
 
 #: templates/lAfix.php:39
 msgid "Dec."
-msgstr ""
+msgstr "Ùƒ1"
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
@@ -516,47 +516,47 @@ msgstr "إعادة"
 
 #: templates/part.eventform.php:68
 msgid "Advanced"
-msgstr ""
+msgstr "تعديلات متقدمه"
 
 #: templates/part.eventform.php:112
 msgid "Select weekdays"
-msgstr ""
+msgstr "اختر ايام الاسبوع"
 
 #: templates/part.eventform.php:125 templates/part.eventform.php:138
 msgid "Select days"
-msgstr ""
+msgstr "اختر الايام"
 
 #: templates/part.eventform.php:130
 msgid "and the events day of year."
-msgstr ""
+msgstr "و التواريخ حسب يوم السنه."
 
 #: templates/part.eventform.php:143
 msgid "and the events day of month."
-msgstr ""
+msgstr "و الاحداث حسب يوم الشهر."
 
 #: templates/part.eventform.php:151
 msgid "Select months"
-msgstr ""
+msgstr "اختر الاشهر"
 
 #: templates/part.eventform.php:164
 msgid "Select weeks"
-msgstr ""
+msgstr "اختر الاسابيع"
 
 #: templates/part.eventform.php:169
 msgid "and the events week of year."
-msgstr ""
+msgstr "و الاحداث حسب اسبوع السنه"
 
 #: templates/part.eventform.php:175
 msgid "Interval"
-msgstr ""
+msgstr "المده ال�اصله"
 
 #: templates/part.eventform.php:181
 msgid "End"
-msgstr ""
+msgstr "نهايه"
 
 #: templates/part.eventform.php:193
 msgid "occurrences"
-msgstr ""
+msgstr "الاحداث"
 
 #: templates/part.eventform.php:208
 msgid "Location"
@@ -576,7 +576,7 @@ msgstr "وص� الحدث"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "أدخل مل� التقويم"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -584,11 +584,11 @@ msgstr "الرجاء إختر الجدول الزمني"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "انشاء جدول زمني جديد"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "أسم الجدول الزمني الجديد"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -596,15 +596,15 @@ msgstr "إدخال"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "يتم ادخال الجدول الزمني"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "تم ادخال الجدول الزمني بنجاح"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "أغلق الحوار"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
@@ -616,7 +616,7 @@ msgstr "المنطقة الزمنية"
 
 #: templates/settings.php:30
 msgid "Check always for changes of the timezone"
-msgstr ""
+msgstr "راقب دائما تغير التقويم الزمني"
 
 #: templates/settings.php:32
 msgid "Timeformat"
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 04c2630a1aa..311b3f93b6d 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <tarek.taha@gmail.com>, 2011.
+#   <tarek.taha@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
 "POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-23 23:25+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"PO-Revision-Date: 2012-01-25 09:34+0000\n"
+"Last-Translator: blackcoder <tarek.taha@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,47 +20,47 @@ msgstr ""
 
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "خطء خلال توقي� كتاب العناوين."
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "خطء خلال اضا�ة معر�ه جديده."
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "لا يمكنك اضا�ه ص�ه خاليه."
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "يجب ملء على الاقل خانه واحده من العنوان."
 
 #: ajax/addproperty.php:78
 msgid "Error adding contact property."
-msgstr ""
+msgstr "خطء خلال اضا�ة ص�ة المعر�ه."
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "خطء خلال اضا�ة كتاب عناوين."
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "خطء خلال ت�عيل كتاب العناوين."
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "خطء خلال محي الص�ه."
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "خطء خلال تعديل الص�ه."
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "خطء خلال تعديل كتاب العناوين"
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "المعار�"
 
 #: lib/app.php:52
 msgid "This is not your addressbook."
@@ -127,7 +127,7 @@ msgstr "الرنان"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "معر�ه"
 
 #: photo.php:42
 msgid "This is not your contact."
@@ -139,11 +139,11 @@ msgstr "أض� شخص "
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "كتب العناوين"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "كتاب العناوين"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -153,7 +153,7 @@ msgstr "الاسم"
 #: templates/part.details.php:79 templates/part.setpropertyform.php:10
 #: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "نوع"
 
 #: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
@@ -196,20 +196,20 @@ msgstr "أض� شخص "
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "أختر كتاب العناوين ال�عال"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "كتاب عناوين جديد"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "وصلة CardDav"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "انزال"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -221,43 +221,43 @@ msgstr "حذ�"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "انزال المعر�ه"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
-msgstr ""
+msgstr "امحي المعر�ه"
 
 #: templates/part.details.php:34
 msgid "Add"
-msgstr ""
+msgstr "أدخل"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "كتاب عناوين جديد"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "عدل كتاب العناوين"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "الاسم المعروض"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "�عال"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "ح�ظ"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "ارسال"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "الغاء"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -265,7 +265,7 @@ msgstr "تاريخ الميلاد"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "م�ضل"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -273,10 +273,10 @@ msgstr "الهات�"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
-msgstr ""
+msgstr "تعديل"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "CardDAV مزامنه العناوين:"
 
 
diff --git a/l10n/ar/gallery.po b/l10n/ar/gallery.po
index e423011a523..10a1f69b9ee 100644
--- a/l10n/ar/gallery.po
+++ b/l10n/ar/gallery.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
 "POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-23 23:25+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"PO-Revision-Date: 2012-01-25 09:38+0000\n"
+"Last-Translator: blackcoder <tarek.taha@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,23 +24,23 @@ msgstr "معرض صور"
 
 #: js/album_cover.js:40
 msgid "Scanning directories"
-msgstr ""
+msgstr "بحث �ي المجلدات"
 
 #: js/album_cover.js:48
 msgid "No photos found"
-msgstr ""
+msgstr "لم يتم العثور على صور"
 
 #: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
-msgstr ""
+msgstr "صناعة مصغرات"
 
 #: js/album_cover.js:81
 msgid "Do you wan't to remove album"
-msgstr ""
+msgstr "هل تريد محي الالبوم"
 
 #: js/album_cover.js:94
 msgid "Input new gallery name"
-msgstr ""
+msgstr "أدخل اسم معرض جديد"
 
 #: templates/index.php:10
 msgid "Rescan"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index b7ae3c7b985..fe46bfd2d20 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-20 16:49+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2012-01-25 09:39+0000\n"
+"Last-Translator: blackcoder <tarek.taha@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +37,7 @@ msgstr "تم تغيير اللغة"
 
 #: personal.php:36 personal.php:37
 msgid "__language_name__"
-msgstr ""
+msgstr "__language_name__"
 
 #: templates/admin.php:13
 msgid "Log level"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 28fb5cde0e5..093f9097f1a 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-17 08:21+0000\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2012-01-24 14:38+0000\n"
 "Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -134,7 +134,7 @@ msgstr "Acaba la configuració"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr "tingueu el control dels serveis web"
+msgstr "controleu els vostres serveis web"
 
 #: templates/layout.user.php:34
 msgid "Log out"
diff --git a/l10n/ca/gallery.po b/l10n/ca/gallery.po
index 4beba794f42..c452a3c3764 100644
--- a/l10n/ca/gallery.po
+++ b/l10n/ca/gallery.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
 "POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-23 23:25+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"PO-Revision-Date: 2012-01-24 08:21+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +28,7 @@ msgstr "S'estan escanejant carpetes"
 
 #: js/album_cover.js:48
 msgid "No photos found"
-msgstr ""
+msgstr "No s'han trobat fotos"
 
 #: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
diff --git a/l10n/cs_CZ/gallery.po b/l10n/cs_CZ/gallery.po
index 2c93e04ef97..9a7a46c1865 100644
--- a/l10n/cs_CZ/gallery.po
+++ b/l10n/cs_CZ/gallery.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jan Krejci <krejca85@gmail.com>, 2012.
 # Martin  <fireball@atlas.cz>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
 "POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-23 23:25+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"PO-Revision-Date: 2012-01-24 21:39+0000\n"
+"Last-Translator: Jan Krejci <krejca85@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,23 +25,23 @@ msgstr "Galerie"
 
 #: js/album_cover.js:40
 msgid "Scanning directories"
-msgstr ""
+msgstr "Prohledávám adresáře"
 
 #: js/album_cover.js:48
 msgid "No photos found"
-msgstr ""
+msgstr "Nenalezeny žádné fotky"
 
 #: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
-msgstr ""
+msgstr "Vytvářím náhledy"
 
 #: js/album_cover.js:81
 msgid "Do you wan't to remove album"
-msgstr ""
+msgstr "Chcete odstranit album?"
 
 #: js/album_cover.js:94
 msgid "Input new gallery name"
-msgstr ""
+msgstr "Zadejte nový název galerie"
 
 #: templates/index.php:10
 msgid "Rescan"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index c050e9a5413..30df2ed9645 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 #   <icewind1991@gmail.com>, 2012.
-# Jan Krejci <krejca85@gmail.com>, 2011.
+# Jan Krejci <krejca85@gmail.com>, 2011, 2012.
 # Martin  <fireball@atlas.cz>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-20 17:48+0100\n"
-"PO-Revision-Date: 2012-01-18 22:30+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2012-01-24 21:42+0000\n"
+"Last-Translator: Jan Krejci <krejca85@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +38,7 @@ msgstr "Jazyk byl změněn"
 
 #: personal.php:36 personal.php:37
 msgid "__language_name__"
-msgstr ""
+msgstr "ÄŒesky"
 
 #: templates/admin.php:13
 msgid "Log level"
diff --git a/l10n/da/gallery.po b/l10n/da/gallery.po
index 4833f709fb3..ebc0e072ceb 100644
--- a/l10n/da/gallery.po
+++ b/l10n/da/gallery.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
 "POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-23 23:25+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"PO-Revision-Date: 2012-01-24 08:34+0000\n"
+"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +28,7 @@ msgstr "Gennemgår mapper"
 
 #: js/album_cover.js:48
 msgid "No photos found"
-msgstr ""
+msgstr "Ingen billeder fundet"
 
 #: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 1cba59ed7e5..4e8a3c7fffd 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
 "POT-Creation-Date: 2012-01-24 00:25+0100\n"
-"PO-Revision-Date: 2012-01-21 23:05+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"PO-Revision-Date: 2012-01-24 08:35+0000\n"
+"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,7 +39,7 @@ msgstr "Sprog ændret"
 
 #: personal.php:36 personal.php:37
 msgid "__language_name__"
-msgstr ""
+msgstr "Dansk"
 
 #: templates/admin.php:13
 msgid "Log level"
diff --git a/l10n/de/gallery.po b/l10n/de/gallery.po
index 648a6b28549..b805076b5d5 100644
--- a/l10n/de/gallery.po
+++ b/l10n/de/gallery.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
 "POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-23 23:25+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"PO-Revision-Date: 2012-01-25 19:47+0000\n"
+"Last-Translator: Bartek <bart.p.pl@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +29,7 @@ msgstr "Ordner werden durchsucht."
 
 #: js/album_cover.js:48
 msgid "No photos found"
-msgstr ""
+msgstr "Keine Fotos gefunden"
 
 #: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
diff --git a/l10n/es/gallery.po b/l10n/es/gallery.po
index 99cae8f48b2..602efbef7db 100644
--- a/l10n/es/gallery.po
+++ b/l10n/es/gallery.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <juanma@kde.org.ar>, 2012.
 #   <sergioballesterossolanas@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
 "POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-23 23:25+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"PO-Revision-Date: 2012-01-24 19:28+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,7 @@ msgstr "Escaneando directorios"
 
 #: js/album_cover.js:48
 msgid "No photos found"
-msgstr ""
+msgstr "No se encontraron fotos"
 
 #: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 8ecc6217302..8bfa363a1ba 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Emilio Sepúlveda <djfunkinmixer@gmail.com>, 2011.
+# Emilio Sepúlveda <emisepulvedam@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2012-01-26 02:10+0000\n"
+"Last-Translator: Emilio Sepúlveda <emisepulvedam@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/team/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,15 +55,15 @@ msgstr "Dimension maxime de incargamento"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Nove"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "File de texto"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Dossier"
 
 #: templates/index.php:12
 msgid "From the web"
diff --git a/l10n/it/gallery.po b/l10n/it/gallery.po
index 50384155abb..c719316b9c5 100644
--- a/l10n/it/gallery.po
+++ b/l10n/it/gallery.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <formalist@email.it>, 2012.
+#   <marco@carnazzo.it>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
 "POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-23 23:25+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"PO-Revision-Date: 2012-01-26 21:13+0000\n"
+"Last-Translator: ufic <marco@carnazzo.it>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,23 +25,23 @@ msgstr "Galleria"
 
 #: js/album_cover.js:40
 msgid "Scanning directories"
-msgstr ""
+msgstr "Analisi cartelle in corso"
 
 #: js/album_cover.js:48
 msgid "No photos found"
-msgstr ""
+msgstr "Nessuna foto trovata"
 
 #: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
-msgstr ""
+msgstr "Creazione anteprime in corso"
 
 #: js/album_cover.js:81
 msgid "Do you wan't to remove album"
-msgstr ""
+msgstr "Vuoi rimuovere l'album"
 
 #: js/album_cover.js:94
 msgid "Input new gallery name"
-msgstr ""
+msgstr "Inserisci il nome della nuova galleria"
 
 #: templates/index.php:10
 msgid "Rescan"
diff --git a/l10n/ja_JP/calendar.po b/l10n/ja_JP/calendar.po
index fc03639a996..76d8d431e9e 100644
--- a/l10n/ja_JP/calendar.po
+++ b/l10n/ja_JP/calendar.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-25 13:53+0000\n"
+"Last-Translator: nn nn <dev.nnnn@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: ajax/guesstimezone.php:42
 msgid "New Timezone:"
-msgstr ""
+msgstr "新��タイムゾーン:"
 
 #: ajax/settimezone.php:22
 msgid "Timezone changed"
@@ -128,143 +128,143 @@ msgstr "毎年"
 
 #: lib/object.php:366
 msgid "never"
-msgstr ""
+msgstr "無�"
 
 #: lib/object.php:367
 msgid "by occurrences"
-msgstr ""
+msgstr "回数�指定"
 
 #: lib/object.php:368
 msgid "by date"
-msgstr ""
+msgstr "日付�指定"
 
 #: lib/object.php:375
 msgid "by monthday"
-msgstr ""
+msgstr "日���指定"
 
 #: lib/object.php:376
 msgid "by weekday"
-msgstr ""
+msgstr "曜日�指定"
 
 #: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr ""
+msgstr "月曜日"
 
 #: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr ""
+msgstr "�曜日"
 
 #: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr ""
+msgstr "水曜日"
 
 #: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr ""
+msgstr "木曜日"
 
 #: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr ""
+msgstr "金曜日"
 
 #: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr ""
+msgstr "土曜日"
 
 #: lib/object.php:389 templates/lAfix.php:2
 msgid "Sunday"
-msgstr ""
+msgstr "日曜日"
 
 #: lib/object.php:396
 msgid "events week of month"
-msgstr ""
+msgstr "予定��る週を指定"
 
 #: lib/object.php:397
 msgid "first"
-msgstr ""
+msgstr "１週目"
 
 #: lib/object.php:398
 msgid "second"
-msgstr ""
+msgstr "２週目"
 
 #: lib/object.php:399
 msgid "third"
-msgstr ""
+msgstr "３週目"
 
 #: lib/object.php:400
 msgid "fourth"
-msgstr ""
+msgstr "４週目"
 
 #: lib/object.php:401
 msgid "fifth"
-msgstr ""
+msgstr "５週目"
 
 #: lib/object.php:402
 msgid "last"
-msgstr ""
+msgstr "最終週"
 
 #: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr ""
+msgstr "１月"
 
 #: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr ""
+msgstr "２月"
 
 #: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr ""
+msgstr "３月"
 
 #: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr ""
+msgstr "４月"
 
 #: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr ""
+msgstr "５月"
 
 #: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr ""
+msgstr "６月"
 
 #: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr ""
+msgstr "７月"
 
 #: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr ""
+msgstr "８月"
 
 #: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr ""
+msgstr "９月"
 
 #: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr ""
+msgstr "１�月"
 
 #: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr ""
+msgstr "１１月"
 
 #: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr ""
+msgstr "１２月"
 
 #: lib/object.php:441
 msgid "by events date"
-msgstr ""
+msgstr "日付�指定"
 
 #: lib/object.php:442
 msgid "by yearday(s)"
-msgstr ""
+msgstr "日番��指定"
 
 #: lib/object.php:443
 msgid "by weeknumber(s)"
-msgstr ""
+msgstr "週番��指定"
 
 #: lib/object.php:444
 msgid "by day and month"
-msgstr ""
+msgstr "月�日�指定"
 
 #: lib/object.php:467
 msgid "Not an array"
@@ -272,11 +272,11 @@ msgstr "�列���り��ん"
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
-msgstr ""
+msgstr "日付"
 
 #: lib/search.php:40
 msgid "Cal."
-msgstr ""
+msgstr "カレンダー"
 
 #: templates/calendar.php:10
 msgid "All day"
@@ -340,79 +340,79 @@ msgstr "ファイルを構文解��る際�失敗����"
 
 #: templates/lAfix.php:9
 msgid "Sun."
-msgstr ""
+msgstr "æ—¥"
 
 #: templates/lAfix.php:10
 msgid "Mon."
-msgstr ""
+msgstr "月"
 
 #: templates/lAfix.php:11
 msgid "Tue."
-msgstr ""
+msgstr "�"
 
 #: templates/lAfix.php:12
 msgid "Wed."
-msgstr ""
+msgstr "æ°´"
 
 #: templates/lAfix.php:13
 msgid "Thu."
-msgstr ""
+msgstr "木"
 
 #: templates/lAfix.php:14
 msgid "Fri."
-msgstr ""
+msgstr "金"
 
 #: templates/lAfix.php:15
 msgid "Sat."
-msgstr ""
+msgstr "土"
 
 #: templates/lAfix.php:28
 msgid "Jan."
-msgstr ""
+msgstr "１月"
 
 #: templates/lAfix.php:29
 msgid "Feb."
-msgstr ""
+msgstr "２月"
 
 #: templates/lAfix.php:30
 msgid "Mar."
-msgstr ""
+msgstr "３月"
 
 #: templates/lAfix.php:31
 msgid "Apr."
-msgstr ""
+msgstr "４月"
 
 #: templates/lAfix.php:32
 msgid "May."
-msgstr ""
+msgstr "５月"
 
 #: templates/lAfix.php:33
 msgid "Jun."
-msgstr ""
+msgstr "６月"
 
 #: templates/lAfix.php:34
 msgid "Jul."
-msgstr ""
+msgstr "７月"
 
 #: templates/lAfix.php:35
 msgid "Aug."
-msgstr ""
+msgstr "８月"
 
 #: templates/lAfix.php:36
 msgid "Sep."
-msgstr ""
+msgstr "９月"
 
 #: templates/lAfix.php:37
 msgid "Oct."
-msgstr ""
+msgstr "１�月"
 
 #: templates/lAfix.php:38
 msgid "Nov."
-msgstr ""
+msgstr "１１月"
 
 #: templates/lAfix.php:39
 msgid "Dec."
-msgstr ""
+msgstr "１２月"
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
@@ -515,47 +515,47 @@ msgstr "繰り返�"
 
 #: templates/part.eventform.php:68
 msgid "Advanced"
-msgstr ""
+msgstr "詳細設定"
 
 #: templates/part.eventform.php:112
 msgid "Select weekdays"
-msgstr ""
+msgstr "曜日を指定"
 
 #: templates/part.eventform.php:125 templates/part.eventform.php:138
 msgid "Select days"
-msgstr ""
+msgstr "日付を指定"
 
 #: templates/part.eventform.php:130
 msgid "and the events day of year."
-msgstr ""
+msgstr "対象�年を�択�る。"
 
 #: templates/part.eventform.php:143
 msgid "and the events day of month."
-msgstr ""
+msgstr "対象�月を�択�る。"
 
 #: templates/part.eventform.php:151
 msgid "Select months"
-msgstr ""
+msgstr "月を指定�る"
 
 #: templates/part.eventform.php:164
 msgid "Select weeks"
-msgstr ""
+msgstr "週を指定�る"
 
 #: templates/part.eventform.php:169
 msgid "and the events week of year."
-msgstr ""
+msgstr "対象�週を�択�る。"
 
 #: templates/part.eventform.php:175
 msgid "Interval"
-msgstr ""
+msgstr "周期"
 
 #: templates/part.eventform.php:181
 msgid "End"
-msgstr ""
+msgstr "繰り返�期間"
 
 #: templates/part.eventform.php:193
 msgid "occurrences"
-msgstr ""
+msgstr "回繰り返�"
 
 #: templates/part.eventform.php:208
 msgid "Location"
@@ -575,7 +575,7 @@ msgstr "イベント�メモ"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "カレンダーファイルをイン�ート"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -583,11 +583,11 @@ msgstr "カレンダーを�択������"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "新�カレンダー�作�"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "新�カレンダー��称"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -595,15 +595,15 @@ msgstr "イン�ート"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "カレンダーを�り込�中"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "カレンダー��り込���功����"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "閉�る"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
@@ -615,7 +615,7 @@ msgstr "タイムゾーン"
 
 #: templates/settings.php:30
 msgid "Check always for changes of the timezone"
-msgstr ""
+msgstr "タイムゾーン変更を常�確��る"
 
 #: templates/settings.php:32
 msgid "Timeformat"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index 1c494aa69bd..69f4226ff41 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
 "POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-23 23:25+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"PO-Revision-Date: 2012-01-25 14:02+0000\n"
+"Last-Translator: nn nn <dev.nnnn@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,47 +19,47 @@ msgstr ""
 
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "電話帳�有効/無効化�失敗����。"
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "連絡先�追加�エラー�発生����。"
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "項目�新�追加�失敗����。"
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "アドレス項目�１��記入��下��。"
 
 #: ajax/addproperty.php:78
 msgid "Error adding contact property."
-msgstr ""
+msgstr "連絡先�追加�失敗����。"
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "電話帳�追加�失敗����。"
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "電話帳�有効化�失敗����。"
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "連絡先�削除�失敗����。"
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "連絡先�更新�失敗����。"
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "電話帳�更新�失敗����。"
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "連絡先"
 
 #: lib/app.php:52
 msgid "This is not your addressbook."
@@ -126,7 +126,7 @@ msgstr "�ケベル"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "連絡先"
 
 #: photo.php:42
 msgid "This is not your contact."
@@ -138,11 +138,11 @@ msgstr "連絡先�追加"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "電話帳"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "電話帳"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -152,7 +152,7 @@ msgstr "��"
 #: templates/part.details.php:79 templates/part.setpropertyform.php:10
 #: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "種類"
 
 #: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
@@ -195,20 +195,20 @@ msgstr "追加"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "有効�電話帳��択"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "新�電話帳"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "CardDAV リンク"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "ダウンロード"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -220,43 +220,43 @@ msgstr "削除"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "連絡先�ダウンロード"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
-msgstr ""
+msgstr "連絡先�削除"
 
 #: templates/part.details.php:34
 msgid "Add"
-msgstr ""
+msgstr "追加"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "電話帳�新�作�"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "電話帳�編集"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "表示�"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "アクティブ"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "�存"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "�信"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "�り消�"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -264,7 +264,7 @@ msgstr "生年月日"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "推奨"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -272,10 +272,10 @@ msgstr "電話番�"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
-msgstr ""
+msgstr "æ›´æ–°"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "CardDAV �期アドレス:"
 
 
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 9511997e083..ee1a642fc61 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2012-01-25 14:20+0000\n"
+"Last-Translator: nn nn <dev.nnnn@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,11 +19,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Owncloud �パスワードをリセット"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "パスワードをリセット�る��次�リンクをクリック��下��: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -52,7 +52,7 @@ msgstr "����パスワード�リセット�れ���。"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "ログインページ�戻る"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -133,7 +133,7 @@ msgstr "セットアップを完了���"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "管�下��るウェブサービス"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -153,7 +153,7 @@ msgstr "パスワードを記憶�る"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "ログイン"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index f4097681b60..25e82ba37e0 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2012-01-25 15:06+0000\n"
+"Last-Translator: nn nn <dev.nnnn@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,19 +53,19 @@ msgstr "最大アップロードサイズ"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "新�作�"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "テキストファイル"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "フォルダ"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "ウェブ経由"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/ja_JP/gallery.po b/l10n/ja_JP/gallery.po
index b7a8a1935f7..2d2d0898dfc 100644
--- a/l10n/ja_JP/gallery.po
+++ b/l10n/ja_JP/gallery.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
 "POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-23 23:25+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"PO-Revision-Date: 2012-01-25 14:05+0000\n"
+"Last-Translator: nn nn <dev.nnnn@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,34 +19,34 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "ギャラリー"
 
 #: js/album_cover.js:40
 msgid "Scanning directories"
-msgstr ""
+msgstr "ディレクトリをスキャン中"
 
 #: js/album_cover.js:48
 msgid "No photos found"
-msgstr ""
+msgstr "写真�見��り��ん���"
 
 #: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
-msgstr ""
+msgstr "サム�イルを作�中"
 
 #: js/album_cover.js:81
 msgid "Do you wan't to remove album"
-msgstr ""
+msgstr "アル�ムを削除����"
 
 #: js/album_cover.js:94
 msgid "Input new gallery name"
-msgstr ""
+msgstr "新��ギャラリー�を作る"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "�スキャン"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "戻る"
 
 
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 6b3cde7791c..edc1d158660 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-16 17:31+0100\n"
-"PO-Revision-Date: 2012-01-16 16:32+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-24 00:25+0100\n"
+"PO-Revision-Date: 2012-01-25 14:15+0000\n"
+"Last-Translator: nn nn <dev.nnnn@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "メールアドレスを変更����"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -35,11 +35,11 @@ msgstr "言語�変更�れ���"
 
 #: personal.php:36 personal.php:37
 msgid "__language_name__"
-msgstr ""
+msgstr "Japanese(日本語)"
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "ログレベル"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -107,15 +107,15 @@ msgstr "パスワードを変更�る"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "メールアドレス"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "����メールアドレス"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "パスワード�回復を有効��る��メールアドレスを入力������"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -123,7 +123,7 @@ msgstr "言語"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "翻訳を手��"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -147,7 +147,7 @@ msgstr "作�"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "クオータ"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/nl/calendar.po b/l10n/nl/calendar.po
index ca5e835d59a..54a5c245604 100644
--- a/l10n/nl/calendar.po
+++ b/l10n/nl/calendar.po
@@ -5,14 +5,15 @@
 # Translators:
 #   <bart.formosus@gmail.com>, 2011.
 #   <bartv@thisnet.nl>, 2011.
+#   <jos@gelauff.net>, 2012.
 #   <pietje8501@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-25 08:31+0000\n"
+"Last-Translator: jgelauff <jos@gelauff.net>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -143,7 +144,7 @@ msgstr "op datum"
 
 #: lib/object.php:375
 msgid "by monthday"
-msgstr ""
+msgstr "per dag van de maand"
 
 #: lib/object.php:376
 msgid "by weekday"
diff --git a/l10n/pl/gallery.po b/l10n/pl/gallery.po
index 889ea7d452c..18898432ad6 100644
--- a/l10n/pl/gallery.po
+++ b/l10n/pl/gallery.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
 "POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-23 23:25+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"PO-Revision-Date: 2012-01-25 19:46+0000\n"
+"Last-Translator: Bartek <bart.p.pl@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +29,7 @@ msgstr "Skanuje katalogi"
 
 #: js/album_cover.js:48
 msgid "No photos found"
-msgstr ""
+msgstr "Nie znaleziono zdjęć"
 
 #: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
diff --git a/l10n/sk_SK/gallery.po b/l10n/sk_SK/gallery.po
index 0d40649df6a..02b39c332ce 100644
--- a/l10n/sk_SK/gallery.po
+++ b/l10n/sk_SK/gallery.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
 "POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-23 23:25+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"PO-Revision-Date: 2012-01-26 19:12+0000\n"
+"Last-Translator: intense <intense.feel@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,23 +24,23 @@ msgstr "Galéria"
 
 #: js/album_cover.js:40
 msgid "Scanning directories"
-msgstr ""
+msgstr "Prehľadávam prie�inky"
 
 #: js/album_cover.js:48
 msgid "No photos found"
-msgstr ""
+msgstr "Neboli nájdené žiadne fotografie"
 
 #: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
-msgstr ""
+msgstr "Vytváram náhľady"
 
 #: js/album_cover.js:81
 msgid "Do you wan't to remove album"
-msgstr ""
+msgstr "Chcete odstrániť album"
 
 #: js/album_cover.js:94
 msgid "Input new gallery name"
-msgstr ""
+msgstr "Vložte meno novej galérie"
 
 #: templates/index.php:10
 msgid "Rescan"
diff --git a/l10n/th_TH/calendar.po b/l10n/th_TH/calendar.po
index 17e3ebd979b..10fbec8319d 100644
--- a/l10n/th_TH/calendar.po
+++ b/l10n/th_TH/calendar.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-22 15:39+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-26 07:18+0000\n"
 "Last-Translator: AriesAnywhere Anywhere <ariesanywherer@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/team/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgstr "โซนเวลาถู�เปลี่ยน�ล้ว"
 msgid "Invalid request"
 msgstr "คำร้องขอไม่ถู�ต้อง"
 
-#: appinfo/app.php:20 templates/calendar.php:14
+#: appinfo/app.php:20 templates/calendar.php:13
 #: templates/part.eventform.php:20
 msgid "Calendar"
 msgstr "ป�ิทิน"
@@ -129,7 +129,7 @@ msgstr "รายปี"
 
 #: lib/object.php:366
 msgid "never"
-msgstr ""
+msgstr "ไม่ต้องเลย"
 
 #: lib/object.php:367
 msgid "by occurrences"
@@ -141,11 +141,11 @@ msgstr "ตามวันที่"
 
 #: lib/object.php:375
 msgid "by monthday"
-msgstr ""
+msgstr "จา�เดือน"
 
 #: lib/object.php:376
 msgid "by weekday"
-msgstr ""
+msgstr "จา�สัปดาห์"
 
 #: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
@@ -261,7 +261,7 @@ msgstr "ของเมื่อวานนี้"
 
 #: lib/object.php:443
 msgid "by weeknumber(s)"
-msgstr ""
+msgstr "จา�หมายเลขของสัปดาห์"
 
 #: lib/object.php:444
 msgid "by day and month"
@@ -269,7 +269,7 @@ msgstr "ตามวัน�ละเดือน"
 
 #: lib/object.php:467
 msgid "Not an array"
-msgstr ""
+msgstr "ไม่ใช่อาเรย์"
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
@@ -277,69 +277,65 @@ msgstr "วันที่"
 
 #: lib/search.php:40
 msgid "Cal."
-msgstr ""
+msgstr "คำนวณ"
 
 #: templates/calendar.php:10
 msgid "All day"
 msgstr "ทั้งวัน"
 
-#: templates/calendar.php:11 templates/part.choosecalendar.php:15
-msgid "New Calendar"
-msgstr "สร้างป�ิทินใหม่"
-
-#: templates/calendar.php:12
+#: templates/calendar.php:11
 msgid "Missing fields"
 msgstr "ช่องฟิลด์เ�ิด�ารสู�หาย"
 
-#: templates/calendar.php:13 templates/part.eventform.php:3
+#: templates/calendar.php:12 templates/part.eventform.php:3
 msgid "Title"
 msgstr "ชื่อ�ิจ�รรม"
 
-#: templates/calendar.php:15
+#: templates/calendar.php:14
 msgid "From Date"
 msgstr "จา�วันที่"
 
-#: templates/calendar.php:16
+#: templates/calendar.php:15
 msgid "From Time"
 msgstr "ตั้ง�ต่เวลา"
 
-#: templates/calendar.php:17
+#: templates/calendar.php:16
 msgid "To Date"
 msgstr "ถึงวันที่"
 
-#: templates/calendar.php:18
+#: templates/calendar.php:17
 msgid "To Time"
 msgstr "ถึงเวลา"
 
-#: templates/calendar.php:19
+#: templates/calendar.php:18
 msgid "The event ends before it starts"
 msgstr "วันที่สิ้นสุด�ิจ�รรมดัง�ล่าวอยู่�่อนวันเริ่มต้น"
 
-#: templates/calendar.php:20
+#: templates/calendar.php:19
 msgid "There was a database fail"
 msgstr "เ�ิดความล้มเหลว�ับ�านข้อมูล"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:52
 msgid "Week"
 msgstr "สัปดาห์"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:53
 msgid "Month"
 msgstr "เดือน"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:54
 msgid "List"
 msgstr "ราย�าร"
 
-#: templates/calendar.php:46
+#: templates/calendar.php:59
 msgid "Today"
 msgstr "วันนี้"
 
-#: templates/calendar.php:47
+#: templates/calendar.php:60
 msgid "Calendars"
 msgstr "ป�ิทิน"
 
-#: templates/calendar.php:65
+#: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
 msgstr "เ�ิดความล้มเหลวใน�าร�ย�ไฟล์"
 
@@ -423,10 +419,14 @@ msgstr "ธ.ค."
 msgid "Choose active calendars"
 msgstr "เลือ�ป�ิทินที่ต้อง�ารใช้งาน"
 
+#: templates/part.choosecalendar.php:15
+msgid "New Calendar"
+msgstr "สร้างป�ิทินใหม่"
+
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr ""
+msgstr "ลิงค์ CalDav"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
@@ -520,7 +520,7 @@ msgstr "ขั้นสูง"
 
 #: templates/part.eventform.php:112
 msgid "Select weekdays"
-msgstr ""
+msgstr "เลือ�สัปดาห์"
 
 #: templates/part.eventform.php:125 templates/part.eventform.php:138
 msgid "Select days"
@@ -528,11 +528,11 @@ msgstr "เลือ�วัน"
 
 #: templates/part.eventform.php:130
 msgid "and the events day of year."
-msgstr ""
+msgstr "�ละวันที่มีเหตุ�ารณ์เ�ิดขึ้นในปี"
 
 #: templates/part.eventform.php:143
 msgid "and the events day of month."
-msgstr ""
+msgstr "�ละวันที่มีเหตุ�ารณ์เ�ิดขึ้นในเดือน"
 
 #: templates/part.eventform.php:151
 msgid "Select months"
@@ -544,11 +544,11 @@ msgstr "เลือ�สัปดาห์"
 
 #: templates/part.eventform.php:169
 msgid "and the events week of year."
-msgstr ""
+msgstr "�ละสัปดาห์ที่มีเหตุ�ารณ์เ�ิดขึ้นในปี"
 
 #: templates/part.eventform.php:175
 msgid "Interval"
-msgstr ""
+msgstr "ช่วงเวลา"
 
 #: templates/part.eventform.php:181
 msgid "End"
@@ -632,6 +632,6 @@ msgstr "12 ช.ม."
 
 #: templates/settings.php:41
 msgid "Calendar CalDAV syncing address:"
-msgstr ""
+msgstr "ที่อยู่ใน�ารเชื่อมข้อมูล�ับป�ิทิน CalDav:"
 
 
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index 2e89cb76c3b..8eb6719d9c6 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
 "POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-23 23:25+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"PO-Revision-Date: 2012-01-26 07:10+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywherer@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/team/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -205,7 +205,7 @@ msgstr "สร้างสมุดบันทึ�ข้อมูล�าร
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "ลิงค์ CardDav"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
@@ -265,7 +265,7 @@ msgstr "วันเ�ิด"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "พิเศษ"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -277,6 +277,6 @@ msgstr "อัพเดท"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "ที่อยู่ใน�ารเชื่อมข้อมูล�ับระบบบันทึ�ที่อยู่ CardDAV:"
 
 
diff --git a/l10n/th_TH/gallery.po b/l10n/th_TH/gallery.po
index 3ca106a7b7d..ffeb3b04056 100644
--- a/l10n/th_TH/gallery.po
+++ b/l10n/th_TH/gallery.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
 "POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2012-01-23 23:25+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"PO-Revision-Date: 2012-01-26 07:08+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywherer@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/team/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,23 +24,23 @@ msgstr "��ลอรี่"
 
 #: js/album_cover.js:40
 msgid "Scanning directories"
-msgstr ""
+msgstr "�ำลังส��นไดเร็�ทอรี่"
 
 #: js/album_cover.js:48
 msgid "No photos found"
-msgstr ""
+msgstr "ไม่พบรูปภาพที่ต้อง�าร"
 
 #: js/album_cover.js:51 js/album_cover.js:60
 msgid "Creating thumbnails"
-msgstr ""
+msgstr "�ารสร้างรูปขนาดย่อ"
 
 #: js/album_cover.js:81
 msgid "Do you wan't to remove album"
-msgstr ""
+msgstr "คุณต้อง�ารลบอัลบั้มนี้ออ�หรือไม่"
 
 #: js/album_cover.js:94
 msgid "Input new gallery name"
-msgstr ""
+msgstr "�รอ�ชื่อ��ลอรี่ใหม่"
 
 #: templates/index.php:10
 msgid "Rescan"
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 7f4bb68dcfc..7758c9bdfce 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -3,6 +3,7 @@
 "Invalid request" => "طلبك غير م�هوم",
 "OpenID Changed" => "تم تغيير ال OpenID",
 "Language changed" => "تم تغيير اللغة",
+"__language_name__" => "__language_name__",
 "Log level" => "مستوى المراقبه",
 "Add your application" => "أض� تطبيقاتك",
 "Select an App" => "إختر تطبيقاً",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 3ddebf0cd99..c7f537922c6 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -3,6 +3,7 @@
 "Invalid request" => "Chybný dotaz",
 "OpenID Changed" => "OpenID změněn",
 "Language changed" => "Jazyk byl změněn",
+"__language_name__" => "ÄŒesky",
 "Log level" => "Úroveň logu",
 "Add your application" => "Přidejte svou aplikaci",
 "Select an App" => "Vyberte aplikaci",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 05b5e579a78..701768aef65 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -3,6 +3,7 @@
 "Invalid request" => "Ugyldig forespørgsel",
 "OpenID Changed" => "OpenID ændret",
 "Language changed" => "Sprog ændret",
+"__language_name__" => "Dansk",
 "Log level" => "Log-niveau",
 "Add your application" => "Tilføj dit program",
 "Select an App" => "Vælg en App",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index fe4eda3a13a..fecad92a6a0 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,7 +1,10 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "メールアドレスを変更����",
 "Invalid request" => "無効�リクエスト��",
 "OpenID Changed" => "OpenID�変更�れ���",
 "Language changed" => "言語�変更�れ���",
+"__language_name__" => "Japanese(日本語)",
+"Log level" => "ログレベル",
 "Add your application" => "アプリを追加������",
 "Select an App" => "アプリを�択������",
 "-licensed" => "権利を���れ����",
@@ -18,11 +21,16 @@
 "New password" => "新��パスワード",
 "show" => "表示",
 "Change password" => "パスワードを変更�る",
+"Email" => "メールアドレス",
+"Your email address" => "����メールアドレス",
+"Fill in an email address to enable password recovery" => "パスワード�回復を有効��る��メールアドレスを入力������",
 "Language" => "言語",
+"Help translate" => "翻訳を手��",
 "use this address to connect to your ownCloud in your file manager" => "ファイルマ�ージャー�����ownCloud�接続�る�����アドレスを使用������",
 "Name" => "��",
 "Password" => "パスワード",
 "Groups" => "グループ",
 "Create" => "作�",
+"Quota" => "クオータ",
 "Delete" => "削除"
 );
-- 
GitLab


From 05f1fffddc49678768c90104e6aeaeac2419d95d Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Fri, 27 Jan 2012 17:34:47 +0100
Subject: [PATCH 354/546] fix appstore download.

---
 lib/app.php       |  2 +-
 lib/installer.php |  4 ++--
 settings/apps.php | 24 ++++++++++++++++--------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index de7d82ce959..37a99823e3d 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -100,7 +100,7 @@ class OC_App{
 			}else{
                                 $download=OC_OCSClient::getApplicationDownload($app,1);
 				if(isset($download['downloadlink']) and $download['downloadlink']<>'') {
-					OC_Installer::installApp(array('source'=>'http','href'=>$download['downloadlink']));
+					$app=OC_Installer::installApp(array('source'=>'http','href'=>$download['downloadlink']));
 				}
 			}
 		}
diff --git a/lib/installer.php b/lib/installer.php
index 9248f68e011..b2f817e702f 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -152,14 +152,14 @@ class OC_Installer{
 		}
 		
 		//run appinfo/install.php
-		if(!isset($data['noinstall']) or $data['noinstall']==false and is_file($basedir.'/appinfo/install.php')){
+		if((!isset($data['noinstall']) or $data['noinstall']==false) and file_exists($basedir.'/appinfo/install.php')){
 			include($basedir.'/appinfo/install.php');
 		}
 		
 		//set the installed version
 		OC_Appconfig::setValue($info['id'],'installed_version',$info['version']);
 		OC_Appconfig::setValue($info['id'],'enabled','no');
-		return true;
+		return $info['id'];
 	}
 
 	/**
diff --git a/settings/apps.php b/settings/apps.php
index 40b72639cd6..0889b0c45ed 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -57,14 +57,22 @@ usort($apps, 'app_sort');
  	$categories=array_keys($catagoryNames);
  	$externalApps=OC_OCSClient::getApplications($categories);
  	foreach($externalApps as $app){
- 		$apps[]=array(
- 			'name'=>$app['name'],
- 			'id'=>$app['id'],
- 			'active'=>false,
- 			'description'=>$app['description'],
- 			'author'=>$app['personid'],
- 			'license'=>$app['license'],
- 		);
+		// show only external apps that are not exist yet
+		$local=false;
+ 		foreach($apps as $a){
+			if($a['name']==$app['name']) $local=true;			
+		}
+
+		if(!$local) {
+	 		$apps[]=array(
+ 				'name'=>$app['name'],
+ 				'id'=>$app['id'],
+ 				'active'=>false,
+ 				'description'=>$app['description'],
+ 				'author'=>$app['personid'],
+ 				'license'=>$app['license'],
+ 			);
+		}
  	}
  }
 
-- 
GitLab


From 21bf8e99ee7ee632068c7031c59f722ea2527f6e Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Fri, 27 Jan 2012 17:39:55 +0100
Subject: [PATCH 355/546] increase version number to 3.  YeeHaw party!!

---
 lib/util.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index ac969f9aba9..2fba1206bff 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -62,7 +62,7 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(2,91,0);
+		return array(3,00,0);
 	}
 
 	/**
@@ -70,7 +70,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '3 RC 1';
+		return '3';
 	}
 
 	/**
-- 
GitLab


From 57f2bf596935ced0f6cbda93ada19acaf1c13ffb Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 28 Jan 2012 15:13:27 +0100
Subject: [PATCH 356/546] add more language names

---
 settings/languageCodes.php | 14 +++++++++++++-
 settings/personal.php      |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index 81177e0a258..621ee5ab55c 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -29,5 +29,17 @@ return array(
 'sr'=>'Срп�ки',
 'sr@latin'=>'Srpski',
 'sv'=>'Svenska',
-'zh_CN'=>'中文'
+'zh_CN'=>'中文',
+'sk_SK'=>'Sloven�ina',
+'hu_HU'=>'Magyar',
+'eu'=>'Euskara',
+'lt_LT'=>'Lietuvių',
+'eo'=>'Esperanto',
+'tr'=>'Türkçe',
+'hr'=>'Hrvatski',
+'ar'=>'العربية',
+'he'=>'עִבְרִית,',
+'ia'=>'Interlingua',
+'sl'=>'Slovenski',
+'nn_NO'=>'Nynorsk',
 );
diff --git a/settings/personal.php b/settings/personal.php
index 44b4c2f594d..787957f246f 100755
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -33,7 +33,7 @@ $languageNames=include 'languageCodes.php';
 $languages=array();
 foreach($languageCodes as $lang){
 	$l=new OC_L10N('settings',$lang);
-	if($l->t('__language_name__')!='__language_name__'){//first check if the language name is in the translation file
+	if(substr($l->t('__language_name__'),0,1)!='_'){//first check if the language name is in the translation file
 		$languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__'));
 	}elseif(isset($languageNames[$lang])){
 		$languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]);
-- 
GitLab


From 928e9b121b4d6b761084d7b2c58319d6e0225c05 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 29 Jan 2012 10:59:15 +0100
Subject: [PATCH 357/546] fix version-compare in calendars app.php

---
 apps/calendar/appinfo/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index c667a7c0849..9c95768895f 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -1,5 +1,5 @@
 <?php
-if(version_compare(PHP_VERSION, '5.3.0', '>')){
+if(version_compare(PHP_VERSION, '5.3.0', '>=')){
 	$l=new OC_L10N('calendar');
 	OC::$CLASSPATH['OC_Calendar_App'] = 'apps/calendar/lib/app.php';
 	OC::$CLASSPATH['OC_Calendar_Calendar'] = 'apps/calendar/lib/calendar.php';
-- 
GitLab


From 927bf569401c3e4f60837dd7847d39e0ef4044c4 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Sun, 29 Jan 2012 14:45:38 +0100
Subject: [PATCH 358/546] add a link to the credits page. fame for all our
 awesome contributors

---
 settings/templates/personal.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 8c5de5ccf2a..80d2cb0a86f 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -51,6 +51,7 @@
 
 <p class="personalblock">
 	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?><br />
+	developed by the <a href="http://ownCloud.org/credits" target="_blank">ownCloud community</a><br />
 	<?php echo(OC_Updater::ShowUpdatingHint());     ?><br />
 	<a href="http://gitorious.org/owncloud" target="_blank">source code</a> licensed freely under <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank">AGPL</a>
 </p>
-- 
GitLab


From 30f1de71a694bb526b08e4fb6a0333659bd2030e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 29 Jan 2012 16:07:54 +0100
Subject: [PATCH 359/546] remove debug file

---
 apps/calendar/templates/lAfix.php | 39 -------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 apps/calendar/templates/lAfix.php

diff --git a/apps/calendar/templates/lAfix.php b/apps/calendar/templates/lAfix.php
deleted file mode 100644
index 61025ae6dea..00000000000
--- a/apps/calendar/templates/lAfix.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$l->t('Sunday');
-$l->t('Monday');
-$l->t('Tuesday');
-$l->t('Wednesday');
-$l->t('Thursday');
-$l->t('Friday');
-$l->t('Saturday');
-$l->t('Sun.');
-$l->t('Mon.');
-$l->t('Tue.');
-$l->t('Wed.');
-$l->t('Thu.');
-$l->t('Fri.');
-$l->t('Sat.');
-$l->t('January');
-$l->t('February');
-$l->t('March');
-$l->t('April');
-$l->t('May');
-$l->t('June');
-$l->t('July');
-$l->t('August');
-$l->t('September');
-$l->t('October');
-$l->t('November');
-$l->t('December');
-$l->t('Jan.');
-$l->t('Feb.');
-$l->t('Mar.');
-$l->t('Apr.');
-$l->t('May.');
-$l->t('Jun.');
-$l->t('Jul.');
-$l->t('Aug.');
-$l->t('Sep.');
-$l->t('Oct.');
-$l->t('Nov.');
-$l->t('Dec.');
\ No newline at end of file
-- 
GitLab


From 039bbfde2d2e1efc90fa9828811566ea1f328722 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 29 Jan 2012 17:39:54 +0100
Subject: [PATCH 360/546] automatically show advanced options when no sqlite is
 available

---
 core/js/setup.js                | 12 ++++++++++++
 core/templates/installation.php |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/core/js/setup.js b/core/js/setup.js
index 94097785e42..6e056cc90d1 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -1,4 +1,11 @@
+var dbtypes
 $(document).ready(function() {
+	dbtypes={
+		sqlite:!!$('#hasSQLite').val(),
+		mysql:!!$('#hasMySQL').val(),
+		postgresql:!!$('#hasPostgreSQL').val(),
+	}
+	
 	$('#selectDbType').buttonset();
 	$('#datadirContent').hide(250);
 	$('#databaseField').hide(250);
@@ -60,4 +67,9 @@ $(document).ready(function() {
 		form.submit();
 		return false;
 	});
+
+	if(!dbtypes.sqlite){
+		$('#showAdvanced').click();
+		$('input[type="radio"]').first().click();
+	}
 });
diff --git a/core/templates/installation.php b/core/templates/installation.php
index f1cde6b3904..4558f97bc08 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -1,3 +1,6 @@
+<input type='hidden' id='hasMySQL' value='<?php echo $_['hasMySQL'] ?>'></input>
+<input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'></input>
+<input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'></input>
 <form action="index.php" method="post">
 
 <input type="hidden" name="install" value="true" />
-- 
GitLab


From 5574b87e9bbafd10b60dea1696cac31978a24c87 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Mon, 30 Jan 2012 19:36:33 +0100
Subject: [PATCH 361/546] new gallery look and feel

---
 apps/gallery/appinfo/info.xml         |   2 +-
 apps/gallery/css/styles.css           |  16 ++--
 apps/gallery/img/delete.png           | Bin 0 -> 275 bytes
 apps/gallery/img/rename.png           | Bin 0 -> 310 bytes
 apps/gallery/img/share.png            | Bin 0 -> 377 bytes
 apps/gallery/js/album_cover.js        | 105 +++++++++++++++++---------
 apps/gallery/js/albums.js             |  11 +--
 apps/gallery/templates/index.php      |  20 ++++-
 apps/gallery/templates/view_album.php |  13 ++++
 9 files changed, 117 insertions(+), 50 deletions(-)
 create mode 100644 apps/gallery/img/delete.png
 create mode 100644 apps/gallery/img/rename.png
 create mode 100644 apps/gallery/img/share.png

diff --git a/apps/gallery/appinfo/info.xml b/apps/gallery/appinfo/info.xml
index c275f39bb25..9aecb0c781d 100644
--- a/apps/gallery/appinfo/info.xml
+++ b/apps/gallery/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
 	<id>gallery</id>
 	<name>Gallery</name>
-	<version>0.2</version>
+	<version>0.3</version>
 	<licence>AGPL</licence>
 	<author>Bartek Przybylski</author>
 	<require>2</require>
diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index bb8d0607f8c..7872b6445ca 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -1,12 +1,14 @@
-div#gallery_list { margin: 90pt 20pt; }
+div#gallery_list { margin: 70pt 20pt 0 20pt; }
 div#gallery_list.leftcontent { padding-top: 15pt; margin: 0; position: absolute; bottom:0px; text-align: center; overflow: auto; }
-div.gallery_album_box { width: 200px; text-align: center; border: 0; display: inline-block; margin: 5pt; vertical-align: top; padding: 10px; position: relative; overflow: hidden; color: #999; }
-div.gallery_album_box:hover { color: black; }
-.leftcontent div.gallery_album_box { margin: 5px; }
+div.gallery_album_box { width: 200px; position:relative; text-align: center; border: 0; display: inline-block; margin: 5pt; vertical-align: top; padding: 20px 5px 5px 5px; position: relative; -webkit-transition: color 0.5s ease-in-out; -o-transition: color 0.5s ease-in-out; -moz-transition: color 0.5s ease-in-out;color: #BBB;}
 div.gallery_album_box h1 { font-size: 9pt; font-family: Verdana; }
-div.gallery_album_cover { width: 199px; height: 199px; border: solid 1pt #999; padding: 0; }
-div.gallery_control_overlay { border: 0; position:absolute; right: 10pt; background-color: #333; opacity: 0; padding: 0 5pt; }
+div.gallery_album_decoration { width: 200px; position: absolute; border: 0; height: 20px; top: 20px; text-align:right; vertical-align:middle; background-color: #eee; opacity: 0; -webkit-transition: opacity 0.5s ease-in-out; -moz-transition: opacity 0.5s ease-in-out; -o-transition: opacity 0.5s ease-in-out; border-bottom-right-radius: 7px; border-bottom-left-radius: 7px; -moz-border-radius-bottomright: 7px; -moz-border-radius-bottomleft:7px;}
+div.gallery_album_box:hover { color: black; }
+div.gallery_album_box:hover div.gallery_album_decoration { opacity: 0.7;}
+div.gallery_album_decoration a {padding: 0 4pt; cursor: pointer;}
+div.gallery_album_cover { width: 200px; height: 200px; border: 0; padding: 0; position:relative;}
 div.gallery_album_box:hover div.gallery_control_overlay { opacity:0.5 }
 div.gallery_control_overlay a { color:white; }
 #gallery_images.rightcontent { padding:10px 5px; bottom: 0px; overflow: auto; right:0px}
-
+#scan { position:absolute; right:13.5em; top:0em; }
+#scan #scanprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
diff --git a/apps/gallery/img/delete.png b/apps/gallery/img/delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc0c782882deaa4f9ecf1676592ddba0cc9aacbc
GIT binary patch
literal 275
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQlw~x;Tbd
z^j@88&DU%o;BtS-m%ta6{xu?bLeB#hJ`=j)oV@60liIS*rBl~@J$HM)&h0OA+^7F4
zYgpnLG;zu;2T#vS-j_-$HvBbRz`$mAK;Vz_S4j<aUuF-*0@isB>%Pm*(PLD+t=F;b
z*eX3n(MkRcKXtZMbAR7<!S+b}wHxOW81Eg(sOHN(cOXJoCvd_4|31>WZg&GK3{-9d
P-NxYQ>gTe~DWM4f<>O_1

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/rename.png b/apps/gallery/img/rename.png
new file mode 100644
index 0000000000000000000000000000000000000000..9993a092df101d4b2796379ac6f1cbe62f131a3c
GIT binary patch
literal 310
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQmMIx;Tbd
z^e&yem-mo?K<oZ?jUWTYY?jVxVjCH`4VYBp8rnK1WK5n~VWL(f<dO4q$z;E4d*$b!
z-*k3T#8eaSTb{eTt;*WBZ5HNeXf!X_G}m3AG11}EhO<_O%NX)D9xI!`@?q9qr$y7!
zJgWck8HUd5VR}08*LlTh4el&UAILEVF#B>=coeX%YV7tbaA(MAa9*?eMT*!Qy-Sie
zj<Mck7Qg-Wjj)q@0JH9e8+FeZ_Agv||0lB+laHa|8kOTf=QDV^`njxgN@xNA+vRUZ

literal 0
HcmV?d00001

diff --git a/apps/gallery/img/share.png b/apps/gallery/img/share.png
new file mode 100644
index 0000000000000000000000000000000000000000..62c4627f317dc007a1186852c9df294bf1ed34a7
GIT binary patch
literal 377
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQr6(x;Tbd
z^e(-$(90!Jfb~KCwvMA|B9jj$-PX{UA>tz7Bi3xz?fT8}8>>mieLaaai)NT>?rS*O
zT6%m#`O~7<?{PO98|ObfGt)Tz-wB`3E~_;Slx_)L?Cz*@DN#zgGka#Q(D@TV@6ytY
zSp_#X_j*;X4`aMm*d3T!m1J!^^`N%JVXbQgz3Z9&ba~%-z^HCt>-yQSjkO}AYX4&y
z?)p_a9CF&9*mfL9n!8h2m|e8Ft>SR{+QY3)wKXD_)vMLx3OZ)&baLF(!mN`lT&}uE
zea@q-Rh`D?cC`N1RR2?ZOlr|$O_saIST^tbRL^ni#ln8RsF{{!<@0{9@#lsd-TujO
R1~3E|JYD@<);T3K0RX?fll}kz

literal 0
HcmV?d00001

diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index 513dd47d351..e78db221cff 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -10,6 +10,10 @@ $(document).ready(function() {
       if (targetDiv) {
         $(targetDiv).html('');
         Albums.display(targetDiv);
+        $('#gallery_list').sortable({revert:true});
+        $('.gallery_album_box').each(function(i, e) {
+          $(e).draggable({connectToSortable: '#gallery_list', handle: '.dummy'})
+        });
       } else {
         alert('Error occured: no such layer `gallery_list`');
       }
@@ -37,9 +41,6 @@ var totalAlbums = 0;
 function scanForAlbums() {
   var albumCounter = 0;
   var totalAlbums = 0;
-  $('#notification').text(t('gallery',"Scanning directories"));
-  $("#notification").fadeIn();
-  $("#notification").slideDown();
   $.getJSON('ajax/galleryOp.php?operation=filescan', function(r) {
 
     if (r.status == 'success') {
@@ -48,7 +49,7 @@ function scanForAlbums() {
         $('#notification').text(t('gallery', "No photos found")).fadeIn().slideDown().delay(3000).fadeOut().slideUp();
         return;
       }
-	    $('#notification').text(t('gallery',"Creating thumbnails")+' ... ' + Math.floor((albumCounter/totalAlbums)*100) + "%");
+      $('#scanprogressbar').progressbar({ value: (albumCounter/totalAlbums)*100 }).fadeIn();
       for(var a in r.paths) {
         $.getJSON('ajax/galleryOp.php?operation=partial_create&path='+r.paths[a], function(r) {
 
@@ -57,10 +58,9 @@ function scanForAlbums() {
           }
 
           albumCounter++;
-		  $('#notification').text(t('gallery',"Creating thumbnails")+' ... ' + Math.floor((albumCounter/totalAlbums)*100) + "%");
+          $('#scanprogressbar').progressbar({ value: (albumCounter/totalAlbums)*100 });
           if (albumCounter == totalAlbums) {
-            $("#notification").fadeOut();
-            $("#notification").slideUp();
+            $('#scanprogressbar').fadeOut();
             var targetDiv = document.getElementById('gallery_list');
             if (targetDiv) {
               targetDiv.innerHTML = '';
@@ -78,36 +78,71 @@ function scanForAlbums() {
 }
 
 function galleryRemove(albumName) {
-  if (confirm(t('gallery',"Do you wan't to remove album")+' ' + albumName + "?")) {
-	$.getJSON("ajax/galleryOp.php", {operation: "remove", name: albumName}, function(r) {
-	  if (r.status == "success") {
-		$(".gallery_album_box").filterAttr('data-album',albumName).remove();
-		Albums.remove(albumName);
-	  } else {
-		alert("Error: " + r.cause);
-	  }
-	});
-  }
+  // a workaround for a flaw in the demo system (http://dev.jqueryui.com/ticket/4375), ignore!
+  $( "#dialog:ui-dialog" ).dialog( "destroy" );
+  $('#albumName', $("#dialog-confirm")).text(albumName);
+
+  $( '#dialog-confirm' ).dialog({
+    resizable: false,
+    height:150,
+    buttons: [{
+        text: t('gallery', 'OK'),
+        click: function() {
+          $.getJSON("ajax/galleryOp.php", {operation: "remove", name: albumName}, function(r) {
+            if (r.status == "success") {
+            $(".gallery_album_box").filterAttr('data-album',albumName).remove();
+              Albums.remove(albumName);
+            } else {
+              alert("Error: " + r.cause);
+            }
+            $('#dialog-confirm').dialog('close');
+          });
+        }},
+        {
+          text: t('gallery', 'Cancel'),
+          click: function() {
+            $( this ).dialog( 'close' );
+        }}]
+  });
 }
 
 function galleryRename(name) {
-  var result = window.prompt(t('gallery',"Input new gallery name"), name);
-  if(result=='' || result==name){
-	return;
-  }
-  if (result) {
-	if (Albums.find(result)) {
-	  alert("Album named '" + result + "' already exists");
-	  return;
-	}
-	$.getJSON("ajax/galleryOp.php", {operation: "rename", oldname: name, newname: result}, function(r) {
-	  if (r.status == "success") {
-		  Albums.rename($(".gallery_album_box").filterAttr('data-album',name), result);
-      } else {
-	    alert("Error: " + r.cause);
-      }
-	});
-	
-  }
+  $('#name', $('#dialog-form')).val(name);
+  $( "#dialog-form" ).dialog({
+        height: 140,
+        width: 350,
+        modal: false,
+        buttons: [{
+            text: t('gallery', 'Change name'),
+            click: function() {
+              var newname = $('#name', $('#dialog-form')).val();
+              if (newname == name || newname == '') {
+                $(this).dialog("close");
+                return;
+              }
+              if (Albums.find(newname)) {
+                alert("Album ", newname, " exists");
+                $(this).dialog("close");
+                return;
+              }
+              $.getJSON("ajax/galleryOp.php", {operation: "rename", oldname: name, newname: newname}, function(r) {
+                if (r.status == "success") {
+                  Albums.rename($(".gallery_album_box").filterAttr('data-album',name), newname);
+                } else {
+                  alert("Error: " + r.cause);
+                }
+                $('#dialog-form').dialog("close");
+              });
+
+            }
+          },
+          {
+            text: t('gallery', 'Cancel'),
+            click: function() {
+              $( this ).dialog( "close" );
+            }
+          }
+        ],
+  });
 }
 
diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index 6150b0daa1e..59efb5b5659 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -41,16 +41,16 @@ Albums={
   // displays gallery in linear representation
   // on given element, and apply default styles for gallery
   display: function(element) {
-    var displayTemplate = '<div class="gallery_album_box"><div class="gallery_control_overlay"><a href="#" class="rename">rename</a> | <a href="#" class="remove">remove</a></div><a class="view"><div class="gallery_album_cover"></div></a><h1></h1></div></div>';
+    var displayTemplate = '<div class="gallery_album_box"><div class="dummy"></div><a class="view"><div class="gallery_album_cover"></div></a><h1></h1><div class="gallery_album_decoration"><a><img src="img/share.png" title="Share"></a><a class="rename"><img src="img/rename.png" title="Rename"></a><a class="remove"><img src="img/delete.png" title="Delete"></a></div></div>';
     for (var i in Albums.albums) {
       var a = Albums.albums[i];
 	  var local=$(displayTemplate);
 	  local.attr('data-album',a.name);
-	  $(".gallery_control_overlay a.rename", local).click(function(name,event){
+	  $(".gallery_album_decoration a.rename", local).click(function(name,event){
 			event.preventDefault();
 			galleryRename(name);
 		}.bind(null,a.name));
-	  $(".gallery_control_overlay a.remove", local).click(function(name,event){
+	  $(".gallery_album_decoration a.remove", local).click(function(name,event){
 		  event.preventDefault();
 		  galleryRemove(name);
 	  }.bind(null,a.name));
@@ -66,8 +66,9 @@ Albums={
         if (albumMetadata == undefined) {
           return;
         }
-        var x = Math.min(Math.floor((e.layerX - this.offsetLeft)/(this.offsetWidth/albumMetadata.numOfCovers)), albumMetadata.numOfCovers-1);
-        x *= this.offsetWidth-1;
+        var x = Math.floor((e.layerX - this.offsetLeft)/(this.offsetWidth/albumMetadata.numOfCovers));
+        x *= this.offsetWidth;
+        if (x < 0) x=0;
         $(this).css('background-position', -x+'px 0');
       });
       $(element).append(local);
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index eb6ebd1bb7b..4c2fbcfe6c6 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -7,8 +7,24 @@ $l = new OC_L10N('gallery');
 
 <div id="notification"><div id="gallery_notification_text">Creating thumbnails</div></div>
 <div id="controls">
-  <input type="button" value="<?php echo $l->t('Rescan');?>" onclick="javascript:scanForAlbums();" />
-  <br/>
+  <div id="scan">
+    <div id="scanprogressbar"></div>
+    <input type="button" value="<?php echo $l->t('Rescan');?>" onclick="javascript:scanForAlbums();" />
+  </div>
 </div>
 <div id="gallery_list">
 </div>
+
+<div id="dialog-confirm" title="<?php echo $l->t('Remove confirmation');?>" style="display: none">
+  <p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span><?php echo $l->t('Do you want to remove album');?> <span id="albumName"></span>?</p>
+</div>
+
+<div id="dialog-form" title="<?php echo $l->t('Change album name');?>" style="display:none">
+	<form>
+	<fieldset>
+    <label for="name"><?php echo $l->t('New album name');?></label>
+		<input type="text" name="name" id="name" class="text ui-widget-content ui-corner-all" />
+	</fieldset>
+	</form>
+</div>
+
diff --git a/apps/gallery/templates/view_album.php b/apps/gallery/templates/view_album.php
index 55a2ee09e4a..6b513a672d5 100644
--- a/apps/gallery/templates/view_album.php
+++ b/apps/gallery/templates/view_album.php
@@ -32,3 +32,16 @@ foreach ($_['photos'] as $a) {
   }
 ?>
 </div>
+
+<div id="dialog-confirm" title="<?php echo $l->t('Remove confirmation');?>" style="display: none">
+  <p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span><?php echo $l->t('Do you want to remove album');?> <span id="albumName"></span>?</p>
+</div>
+
+<div id="dialog-form" title="<?php echo $l->t('Change album name');?>" style="display:none">
+	<form>
+	<fieldset>
+    <label for="name"><?php echo $l->t('New album name');?></label>
+		<input type="text" name="name" id="name" class="text ui-widget-content ui-corner-all" />
+	</fieldset>
+	</form>
+</div>
-- 
GitLab


From 45038af948cd07ffc74efc8d4b0282fa11b7de7e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 30 Jan 2012 20:19:51 +0100
Subject: [PATCH 362/546] provide small wrapper around server side events and
 provide a fallback for IE

---
 core/js/eventsource.js | 94 ++++++++++++++++++++++++++++++++++++++++++
 lib/base.php           |  1 +
 lib/eventsource.php    | 73 ++++++++++++++++++++++++++++++++
 3 files changed, 168 insertions(+)
 create mode 100644 core/js/eventsource.js
 create mode 100644 lib/eventsource.php

diff --git a/core/js/eventsource.js b/core/js/eventsource.js
new file mode 100644
index 00000000000..422f97657bd
--- /dev/null
+++ b/core/js/eventsource.js
@@ -0,0 +1,94 @@
+/**
+ * ownCloud
+ *
+ * @author Robin Appelman
+ * @copyright 2012 Robin Appelman icewind1991@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * wrapper for server side events (http://en.wikipedia.org/wiki/Server-sent_events)
+ * includes a fallback for older browsers and IE
+ *
+ * use server side events with causion, to many open requests can hang the server
+ */
+
+OC.EventSource=function(src){
+	if(!this.useFallBack && typeof EventSource !='undefined'){
+		this.source=new EventSource(src);
+		this.source.onmessage=function(e){
+			for(var i=0;i<this.typelessListeners.length;i++){
+				this.typelessListeners[i](JSON.parse(e.data));
+			}
+		}
+	}else{
+		iframeId='oc_eventsource_iframe_'+OC.EventSource.iframeCount;
+		OC.EventSource.fallBackSources[OC.EventSource.iframeCount]=this;
+		this.iframe=$('<iframe/>');
+		this.iframe.attr('id',iframeId);
+		this.iframe.hide();
+		this.iframe.attr('src',src+'?fallback=true&fallback_id='+OC.EventSource.iframeCount);
+		$('body').append(this.iframe);
+		this.useFallBack=true;
+		OC.EventSource.iframeCount++
+
+	}
+}
+OC.EventSource.fallBackSources=[];
+OC.EventSource.iframeCount=0;//number of fallback iframes
+OC.EventSource.fallBackCallBack=function(id,type,data){
+	OC.EventSource.fallBackSources[id].fallBackCallBack(type,JSON.parse(data));
+}
+OC.EventSource.prototype={
+	typelessListeners:[],
+	iframe:null,
+	listeners:{},//only for fallback
+	useFallBack:false,
+	fallBackCallBack:function(type,data){
+		if(type){
+			for(var i=0;i<this.listeners[type].length;i++){
+				this.listeners[type][i](data);
+			}
+		}else{
+			for(var i=0;i<this.typelessListeners.length;i++){
+				this.typelessListeners[i](data);
+			}
+		}
+	},
+	lastLength:0,//for fallback
+	listen:function(type,callback){
+		if(callback && callback.call){
+			
+			if(type){
+				if(this.useFallBack){
+					if(!this.listeners[type]){
+						this.listeners[type]=[];
+					}
+					this.listeners[type].push(callback);
+				}else{
+					this.source.addEventListener(type,function(e){
+						callback(JSON.parse(e.data));
+					},false);
+				}
+			}else{
+				typelessListeners.push(callback);
+			}
+		}
+	},
+	close:function(){
+		this.source.close();
+	}
+}
diff --git a/lib/base.php b/lib/base.php
index ab7cb2990ed..4da17c70a57 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -187,6 +187,7 @@ class OC{
 		OC_Util::addScript( "jquery.infieldlabel.min" );
 		OC_Util::addScript( "jquery-tipsy" );
 		OC_Util::addScript( "js" );
+		OC_Util::addScript( "eventsource" );
 		//OC_Util::addScript( "multiselect" );
 		OC_Util::addScript('search','result');
 		OC_Util::addStyle( "styles" );
diff --git a/lib/eventsource.php b/lib/eventsource.php
new file mode 100644
index 00000000000..c123eb4b837
--- /dev/null
+++ b/lib/eventsource.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+* ownCloud
+*
+* @author Robin Appelman
+* @copyright 2012 Robin Appelman icewind1991@gmail.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/**
+ * wrapper for server side events (http://en.wikipedia.org/wiki/Server-sent_events)
+ * includes a fallback for older browsers and IE
+ *
+ * use server side events with causion, to many open requests can hang the server
+ */
+class OC_EventSource{
+	private $fallback;
+	private $fallBackId=0;
+	
+	public function __construct(){
+		ob_end_clean();
+		header('Cache-Control: no-cache');
+		$this->fallback=isset($_GET['fallback']) and $_GET['fallback']=='true';
+		if($this->fallback){
+			$fallBackId=$_GET['fallback_id'];
+			header("Content-Type: text/html");
+			echo str_repeat('<span></span>'.PHP_EOL,10); //dummy data to keep IE happy
+		}else{
+			header("Content-Type: text/event-stream");
+		}
+		flush();
+
+	}
+
+	/**
+	 * send a message to the client
+	 * @param string type
+	 * @param object data
+	 *
+	 * if only one paramater is given, a typeless message will be send with that paramater as data
+	 */
+	public function send($type,$data=null){
+		if(is_null($data)){
+			$data=$type;
+			$type=null;
+		}
+		if($this->fallback){
+			$response='<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('.$this->fallBackId.',"'.$type.'","'.json_encode($data).'")</script>'.PHP_EOL;
+			echo $response;
+		}else{
+			if($type){
+				echo 'event: '.$type.PHP_EOL;
+			}
+			echo 'data: '.json_encode($data).PHP_EOL;
+		}
+		echo PHP_EOL;
+		flush();
+	}
+}
\ No newline at end of file
-- 
GitLab


From 0ba315912ba99c4fb7c30134754846cf7b66c8a0 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Mon, 30 Jan 2012 22:05:31 +0100
Subject: [PATCH 363/546] fix outdated README file

---
 README | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README b/README
index 60b18defd59..cd562b66c6c 100644
--- a/README
+++ b/README
@@ -1,10 +1,9 @@
 ownCloud gives you freedom and control over your own data.
 A personal cloud which runs on your own server.
-It is alpha software in development and should be treated accordingly.
 
 http://ownCloud.org
 
-Installation instructions: http://owncloud.org/install
+Installation instructions: http://owncloud.org/support
 Source code: http://gitorious.org/owncloud
 
 Mailing list: http://mail.kde.org/mailman/listinfo/owncloud
-- 
GitLab


From e0f655fb707e1c632602319a6b989e8f58866953 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Mon, 30 Jan 2012 16:49:24 -0500
Subject: [PATCH 364/546] Sharing app needs to be loaded for public link of
 file in Shared folder - fixes bug 113

---
 apps/files_sharing/get.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
index ca95a68c6ce..c80b0c2ef03 100644
--- a/apps/files_sharing/get.php
+++ b/apps/files_sharing/get.php
@@ -1,5 +1,4 @@
 <?php
-$RUNTIME_NOAPPS=true; //no need to load the apps
 $RUNTIME_NOSETUPFS=true; //don't setup the fs yet
 
 require_once '../../lib/base.php';
-- 
GitLab


From 6a1121ab2e91a362ed1e13e18c44fca40761f97a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 30 Jan 2012 23:19:43 +0100
Subject: [PATCH 365/546] provide server side close option for EventStream

---
 core/js/eventsource.js | 7 ++++++-
 lib/eventsource.php    | 7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/js/eventsource.js b/core/js/eventsource.js
index 422f97657bd..30b942f59e8 100644
--- a/core/js/eventsource.js
+++ b/core/js/eventsource.js
@@ -44,8 +44,13 @@ OC.EventSource=function(src){
 		$('body').append(this.iframe);
 		this.useFallBack=true;
 		OC.EventSource.iframeCount++
-
 	}
+	//add close listener
+	this.listen('__internal__',function(data){
+		if(data=='close'){
+			this.close();
+		}
+	}.bind(this));
 }
 OC.EventSource.fallBackSources=[];
 OC.EventSource.iframeCount=0;//number of fallback iframes
diff --git a/lib/eventsource.php b/lib/eventsource.php
index c123eb4b837..b0450ff3d55 100644
--- a/lib/eventsource.php
+++ b/lib/eventsource.php
@@ -70,4 +70,11 @@ class OC_EventSource{
 		echo PHP_EOL;
 		flush();
 	}
+
+	/**
+	 * close the connection of the even source
+	 */
+	public function close(){
+		$this->send('__internal__','close');//server side closing can be an issue, let the client do it
+	}
 }
\ No newline at end of file
-- 
GitLab


From 8543e797132a0b99127d7813e24dbb9c024a4fe8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 30 Jan 2012 23:26:01 +0100
Subject: [PATCH 366/546] add option to send get data along with an eventsource
 request

---
 core/js/eventsource.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/core/js/eventsource.js b/core/js/eventsource.js
index 30b942f59e8..dece1a69d04 100644
--- a/core/js/eventsource.js
+++ b/core/js/eventsource.js
@@ -26,9 +26,18 @@
  * use server side events with causion, to many open requests can hang the server
  */
 
-OC.EventSource=function(src){
+/**
+ * create a new event source
+ * @param string src
+ * @param object data to be send as GET
+ */
+OC.EventSource=function(src,data){
+	var dataStr='';
+	for(name in data){
+		dataStr+=name+'='+encodeURIComponent(data[name])+'&';
+	}
 	if(!this.useFallBack && typeof EventSource !='undefined'){
-		this.source=new EventSource(src);
+		this.source=new EventSource(src+'?'+dataStr);
 		this.source.onmessage=function(e){
 			for(var i=0;i<this.typelessListeners.length;i++){
 				this.typelessListeners[i](JSON.parse(e.data));
@@ -40,7 +49,7 @@ OC.EventSource=function(src){
 		this.iframe=$('<iframe/>');
 		this.iframe.attr('id',iframeId);
 		this.iframe.hide();
-		this.iframe.attr('src',src+'?fallback=true&fallback_id='+OC.EventSource.iframeCount);
+		this.iframe.attr('src',src+'?fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr);
 		$('body').append(this.iframe);
 		this.useFallBack=true;
 		OC.EventSource.iframeCount++
-- 
GitLab


From ffecc3e4341102714a89ab6b5643c666c1feb0ee Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 30 Jan 2012 23:32:55 +0100
Subject: [PATCH 367/546] start of proper feedback during filessytem scan

---
 files/ajax/scan.php | 11 +++++++----
 files/js/files.js   | 12 ++++++++----
 lib/filecache.php   |  6 ++++--
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/files/ajax/scan.php b/files/ajax/scan.php
index dec949a819b..01236c83da1 100644
--- a/files/ajax/scan.php
+++ b/files/ajax/scan.php
@@ -2,15 +2,18 @@
 
 require_once '../../lib/base.php';
 
+$eventSource=new OC_EventSource();
+
 $force=isset($_GET['force']) and $_GET['force']=='true';
 $checkOnly=isset($_GET['checkonly']) and $_GET['checkonly']=='true';
 
 //create the file cache if necesary
 if($force or !OC_FileCache::inCache('')){
 	if(!$checkOnly){
-		OC_FileCache::scan('');
+		OC_FileCache::scan('',false,$eventSource);
 	}
-	OC_JSON::success(array("data" => array( "done" => true)));
+	$eventSource->send('success',true);
 }else{
-	OC_JSON::success(array("data" => array( "done" => false)));
-}
\ No newline at end of file
+	$eventSource->send('success',false);
+}
+$eventSource->close();
\ No newline at end of file
diff --git a/files/js/files.js b/files/js/files.js
index 649f193aa2d..28259606cea 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -348,13 +348,17 @@ $(document).ready(function() {
 function scanFiles(force){
 	force=!!force; //cast to bool
 	$('#scanning-message').show();
-	$.get(OC.filePath('files','ajax','scan.php'),{force:force}, function(response) {
-		if(response && response.data && response.data.done){
+	var scannerEventSource=new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force});
+	scannerEventSource.listen('scanned',function(file){
+		console.log(file);//TODO: make this into proper feedback
+	});
+	scannerEventSource.listen('success',function(success){
+		if(success){
 			window.location.reload();
 		}else{
-			alert('error')
+			alert('error while scanning');
 		}
-	}, "json");
+	});
 }
 
 function boolOperationFinished(data, callback) {
diff --git a/lib/filecache.php b/lib/filecache.php
index 928fc02e669..4e458ad929a 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -288,8 +288,9 @@ class OC_FileCache{
 	 * recursively scan the filesystem and fill the cache
 	 * @param string $path
 	 * @param bool $onlyChilds
+	 * @param OC_EventSource $enventSource
 	 */
-	public static function scan($path,$onlyChilds=false){//PROBLEM due to the order things are added, all parents are -1
+	public static function scan($path,$onlyChilds,$eventSource){//PROBLEM due to the order things are added, all parents are -1
 		$dh=OC_Filesystem::opendir($path);
 		$stat=OC_Filesystem::stat($path);
 		$mimetype=OC_Filesystem::getMimeType($path);
@@ -305,12 +306,13 @@ class OC_FileCache{
 				if($filename != '.' and $filename != '..'){
 					$file=$path.'/'.$filename;
 					if(OC_Filesystem::is_dir($file)){
-						self::scan($file,true);
+						self::scan($file,true,$eventSource);
 					}else{
 						$stat=OC_Filesystem::stat($file);
 						$mimetype=OC_Filesystem::getMimeType($file);
 						$stat['mimetype']=$mimetype;
 						self::put($file,$stat);
+						$eventSource->send('scanned',$file);
 						$totalSize+=$stat['size'];
 					}
 				}
-- 
GitLab


From 803f86e0fcd77e3888daa387142fd197083d5fd3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 31 Jan 2012 12:44:01 +0100
Subject: [PATCH 368/546] dont try to use the filesystem when it isnt setup yet

---
 apps/files_sharing/sharedstorage.php | 2 +-
 lib/filesystem.php                   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 529a82b830a..fa6fe7913f2 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -22,7 +22,7 @@
 
 require_once( 'lib_share.php' );
 
-if (!OC_Filesystem::is_dir('/Shared')) {
+if (OC_Filesystem::$loaded and !OC_Filesystem::is_dir('/Shared')) {
 	OC_Filesystem::mkdir('/Shared');
 }
 OC_Filesystem::mount('OC_Filestorage_Shared',array('datadir'=>'/'.OC_User::getUser().'/files/Shared'),'/'.OC_User::getUser().'/files/Shared/');
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 60d3f56a24c..8502cfc08bb 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -47,6 +47,7 @@ class OC_Filesystem{
 	static private $storages=array();
 	static private $mounts=array();
 	static private $storageTypes=array();
+	public static $loaded=false;
 	private $fakeRoot='';
 	static private $defaultInstance;
 
@@ -200,6 +201,7 @@ class OC_Filesystem{
 			return false;
 		}
 		self::$defaultInstance=new OC_FilesystemView($root);
+		self::$loaded=true;
 	}
 	
 	/**
-- 
GitLab


From 7ff86cfebe27c6cf3fc1926faeea541b84b5eff9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 31 Jan 2012 13:56:58 +0100
Subject: [PATCH 369/546] provide live feedback while scanning files

---
 files/js/files.js         | 7 ++++++-
 files/templates/index.php | 5 ++++-
 lib/filecache.php         | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/files/js/files.js b/files/js/files.js
index 28259606cea..a896314faf0 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -347,10 +347,15 @@ $(document).ready(function() {
 
 function scanFiles(force){
 	force=!!force; //cast to bool
+	var fileCount=0;
 	$('#scanning-message').show();
+	$('#fileList').remove();
 	var scannerEventSource=new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force});
+	scanFiles.cancel=scannerEventSource.close.bind(scannerEventSource);
 	scannerEventSource.listen('scanned',function(file){
-		console.log(file);//TODO: make this into proper feedback
+		fileCount++;
+		$('#scan-count').text(fileCount+' files scanned');
+		$('#scan-current').text(file);
 	});
 	scannerEventSource.listen('success',function(success){
 		if(success){
diff --git a/files/templates/index.php b/files/templates/index.php
index 92c579c2442..fa4643de75a 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -61,7 +61,10 @@
 	</p>
 </div>
 <div id="scanning-message">
+	<h3>
+		<?php echo $l->t('Files are being scanned, please wait.');?> <span id='scan-count'></spann>
+	</h3>
 	<p>
-		<?php echo $l->t('Files are being scanned, please wait.');?>
+		<?php echo $l->t('Current scanning');?> <span id='scan-current'></spann>
 	</p>
 </div>
diff --git a/lib/filecache.php b/lib/filecache.php
index 4e458ad929a..6dbaef4bbfa 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -290,7 +290,7 @@ class OC_FileCache{
 	 * @param bool $onlyChilds
 	 * @param OC_EventSource $enventSource
 	 */
-	public static function scan($path,$onlyChilds,$eventSource){//PROBLEM due to the order things are added, all parents are -1
+	public static function scan($path,$onlyChilds,$eventSource){
 		$dh=OC_Filesystem::opendir($path);
 		$stat=OC_Filesystem::stat($path);
 		$mimetype=OC_Filesystem::getMimeType($path);
-- 
GitLab


From df67c35017d8794a4b1c83fd4e41658b2e6d0e75 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 31 Jan 2012 16:12:38 +0100
Subject: [PATCH 370/546] some fixes to scanning

---
 db_structure.xml    |  9 +++++++++
 files/ajax/scan.php | 12 ++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/db_structure.xml b/db_structure.xml
index 13d5732a8d5..5ef22b595cf 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -81,6 +81,15 @@
 	   <notnull>true</notnull>
 	   <length>512</length>
    </field>
+
+   <field>
+	   <name>user</name>
+	   <type>text</type>
+	   <default>
+	   </default>
+	   <notnull>true</notnull>
+	   <length>64</length>
+   </field>
    
    <field>
     <name>size</name>
diff --git a/files/ajax/scan.php b/files/ajax/scan.php
index 01236c83da1..37ce7ab71f0 100644
--- a/files/ajax/scan.php
+++ b/files/ajax/scan.php
@@ -2,17 +2,25 @@
 
 require_once '../../lib/base.php';
 
-$eventSource=new OC_EventSource();
+set_time_limit(0);//scanning can take ages
 
 $force=isset($_GET['force']) and $_GET['force']=='true';
 $checkOnly=isset($_GET['checkonly']) and $_GET['checkonly']=='true';
 
+if(!$checkOnly){
+	$eventSource=new OC_EventSource();
+}
+
+
 //create the file cache if necesary
 if($force or !OC_FileCache::inCache('')){
 	if(!$checkOnly){
 		OC_FileCache::scan('',false,$eventSource);
+		$eventSource->send('success',true);
+	}else{
+		OC_JSON::success(array('data'=>array('done'=>true)));
+		exit;
 	}
-	$eventSource->send('success',true);
 }else{
 	$eventSource->send('success',false);
 }
-- 
GitLab


From c46f701771db9285e70a5b1d5a4b641046bf703c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 31 Jan 2012 16:12:49 +0100
Subject: [PATCH 371/546] use filesystem cache for searching

---
 lib/filecache.php            | 25 +++++++++++++++++++------
 lib/filesystem.php           |  2 +-
 lib/filesystemview.php       | 17 -----------------
 lib/search/provider/file.php | 11 ++++++-----
 4 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index 6dbaef4bbfa..689680624a4 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -79,8 +79,9 @@ class OC_FileCache{
 			$data['versioned']=false;
 		}
 		$mimePart=dirname($data['mimetype']);
-		$query=OC_DB::prepare('INSERT INTO *PREFIX*fscache(parent, name, path, size, mtime, ctime, mimetype, mimepart) VALUES(?,?,?,?,?,?,?,?)');
-		$query->execute(array($parent,basename($path),$path,$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart));
+		$user=OC_User::getUser();
+		$query=OC_DB::prepare('INSERT INTO *PREFIX*fscache(parent, name, path, size, mtime, ctime, mimetype, mimepart,user) VALUES(?,?,?,?,?,?,?,?,?)');
+		$query->execute(array($parent,basename($path),$path,$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart,$user));
 		
 	}
 
@@ -133,14 +134,26 @@ class OC_FileCache{
 	/**
 	 * return array of filenames matching the querty
 	 * @param string $query
+	 * @param boolean $returnData
 	 * @return array of filepaths
 	 */
-	public static function search($search){
-		$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE name LIKE ?');
-		$result=$query->execute(array("%$search%"));
+	public static function search($search,$returnData=false){
+		$root=OC_Filesystem::getRoot();
+		$rootLen=strlen($root);
+		if(!$returnData){
+			$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE name LIKE ? AND user=?');
+		}else{
+			$query=OC_DB::prepare('SELECT * FROM *PREFIX*fscache WHERE name LIKE ? AND user=?');
+		}
+		$result=$query->execute(array("%$search%",OC_User::getUser()));
 		$names=array();
 		while($row=$result->fetchRow()){
-			$names[]=$row['path'];
+			if(!$returnData){
+				$names[]=substr($row['path'],$rootLen);
+			}else{
+				$row['path']=substr($row['path'],$rootLen);
+				$names[]=$row;
+			}
 		}
 		return $names;
 	}
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 8502cfc08bb..5062ecf5c18 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -374,7 +374,7 @@ class OC_Filesystem{
 	}
 	
 	static public function search($query){
-		return self::$defaultInstance->search($query);
+		return OC_FileCache::search($query);
 	}
 }
 
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 9687a8bceb4..6c2ca916310 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -279,23 +279,6 @@ class OC_FilesystemView {
 		return $this->basicOperation('free_space',$path);
 	}
 
-	public function search($query){
-		$files=array();
-		$fakeRoot=$this->$fakeRoot;
-		$fakeRootLength=strlen($fakeRoot);
-		$results=OC_FileCache::search($query);
-		if(is_array($results)){
-			foreach($results as $result){
-				$file=str_replace('//','/',$mountpoint.$result);
-				if(substr($file,0,$fakeRootLength)==$fakeRoot){
-					$file=substr($file,$fakeRootLength);
-					$files[]=$file;
-				}
-			}
-		}
-		return $files;
-	}
-
 	/**
 	 * abstraction for running most basic operations
 	 * @param string $operation
diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php
index 5fd35fa3e52..c3dc2942aef 100644
--- a/lib/search/provider/file.php
+++ b/lib/search/provider/file.php
@@ -2,14 +2,15 @@
 
 class OC_Search_Provider_File extends OC_Search_Provider{
 	function search($query){
-		$files=OC_Filesystem::search($query);
+		$files=OC_FileCache::search($query,true);
 		$results=array();
-		foreach($files as $file){
-			if(OC_Filesystem::is_dir($file)){
+		foreach($files as $fileData){
+			$file=$fileData['path'];
+			if($fileData['mime']=='httpd/unix-directory'){
 				$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'index.php?dir='.$file ),'Files');
 			}else{
-				$mime=OC_Filesystem::getMimeType($file);
-				$mimeBase=substr($mime,0,strpos($mime,'/'));
+				$mime=$fileData['mime'];
+				$mimeBase=$fileData['mimepart'];
 				switch($mimeBase){
 					case 'audio':
 						break;
-- 
GitLab


From f1c5dce75c5f1bc2c9d7022a8b43577a3dec9629 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 31 Jan 2012 16:33:16 +0100
Subject: [PATCH 372/546] dont try to use something that isn't there

---
 files/ajax/scan.php | 6 +++++-
 lib/filecache.php   | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/files/ajax/scan.php b/files/ajax/scan.php
index 37ce7ab71f0..f7e75d5f8ba 100644
--- a/files/ajax/scan.php
+++ b/files/ajax/scan.php
@@ -22,6 +22,10 @@ if($force or !OC_FileCache::inCache('')){
 		exit;
 	}
 }else{
-	$eventSource->send('success',false);
+	if(isset($eventSource)){
+		$eventSource->send('success',false);
+	}else{
+		exit;
+	}
 }
 $eventSource->close();
\ No newline at end of file
diff --git a/lib/filecache.php b/lib/filecache.php
index 689680624a4..b4cafe8b311 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -325,7 +325,9 @@ class OC_FileCache{
 						$mimetype=OC_Filesystem::getMimeType($file);
 						$stat['mimetype']=$mimetype;
 						self::put($file,$stat);
-						$eventSource->send('scanned',$file);
+						if($eventSource){
+							$eventSource->send('scanned',$file);
+						}
 						$totalSize+=$stat['size'];
 					}
 				}
-- 
GitLab


From 371b4642bb21697a06424f1440f4b90ad4e59b9d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 31 Jan 2012 16:33:47 +0100
Subject: [PATCH 373/546] proper file sorting

---
 lib/files.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/files.php b/lib/files.php
index 5686287ecc4..457c8ea38f2 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -41,7 +41,7 @@ class OC_Files {
 			$file['directory']=$directory;
 			$file['type']=($file['mimetype']=='httpd/unix-directory')?'dir':'file';
 		}
-		uksort($files, "strnatcasecmp");
+		usort($files, "fileCmp");//TODO: remove this once ajax is merged
 		return $files;
 	}
 
@@ -290,3 +290,13 @@ class OC_Files {
 		return $path;
 	}
 }
+
+function fileCmp($a,$b){
+	if($a['type']=='dir' and $b['type']!='dir'){
+		return -1;
+	}elseif($a['type']!='dir' and $b['type']=='dir'){
+		return 1;
+	}else{
+		return strnatcasecmp($a['name'],$b['name']);
+	}
+}
-- 
GitLab


From fdf3df3de591845df5255b04eabe12e794faa1f1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 30 Jan 2012 23:26:01 +0100
Subject: [PATCH 374/546] add option to send get data along with an eventsource
 request

---
 core/js/eventsource.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/core/js/eventsource.js b/core/js/eventsource.js
index 30b942f59e8..dece1a69d04 100644
--- a/core/js/eventsource.js
+++ b/core/js/eventsource.js
@@ -26,9 +26,18 @@
  * use server side events with causion, to many open requests can hang the server
  */
 
-OC.EventSource=function(src){
+/**
+ * create a new event source
+ * @param string src
+ * @param object data to be send as GET
+ */
+OC.EventSource=function(src,data){
+	var dataStr='';
+	for(name in data){
+		dataStr+=name+'='+encodeURIComponent(data[name])+'&';
+	}
 	if(!this.useFallBack && typeof EventSource !='undefined'){
-		this.source=new EventSource(src);
+		this.source=new EventSource(src+'?'+dataStr);
 		this.source.onmessage=function(e){
 			for(var i=0;i<this.typelessListeners.length;i++){
 				this.typelessListeners[i](JSON.parse(e.data));
@@ -40,7 +49,7 @@ OC.EventSource=function(src){
 		this.iframe=$('<iframe/>');
 		this.iframe.attr('id',iframeId);
 		this.iframe.hide();
-		this.iframe.attr('src',src+'?fallback=true&fallback_id='+OC.EventSource.iframeCount);
+		this.iframe.attr('src',src+'?fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr);
 		$('body').append(this.iframe);
 		this.useFallBack=true;
 		OC.EventSource.iframeCount++
-- 
GitLab


From db1f77e4f51b1172aabe12defdd8228e9dd3b93b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 25 Jan 2012 01:10:56 +0100
Subject: [PATCH 375/546] Some reminders in the code of what I have to change
 post OC3.0

---
 apps/contacts/ajax/addproperty.php | 8 ++++++++
 apps/contacts/lib/app.php          | 1 +
 apps/contacts/lib/vcard.php        | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index f016820ce5f..a4b5c591197 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -74,6 +74,14 @@ foreach ($parameters as $key=>$element) {
 }
 $checksum = md5($vcard->children[$line]->serialize());
 
+/* FIXME: OC_Contacts_App::getPropertyLineByChecksum throws an OC_JSON error when doing this check.
+   Fix for v. 3.1
+if(!is_null(OC_Contacts_App::getPropertyLineByChecksum($id, $checksum))) {
+	OC_JSON::error(array('data' => array('message' => $l->t('Trying to add duplicate property.'))));
+	OC_Log::write('contacts','ajax/addproperty.php: Trying to add duplicate property: '.$name, OC_Log::DEBUG);
+	exit();
+}
+*/
 if(!OC_Contacts_VCard::edit($id,$vcard->serialize())) {
 	OC_JSON::error(array('data' => array('message' => $l->t('Error adding contact property.'))));
 	OC_Log::write('contacts','ajax/addproperty.php: Error updating contact property: '.$name, OC_Log::ERROR);
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index bc1e4974b30..39df497043b 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -85,6 +85,7 @@ class OC_Contacts_App{
 				break;
 			}
 		}
+		// FIXME: I'm not sure this should throw a JSON error as it might just be used to check for dupes. /Tanghus.
 		if(is_null($line)){
 			OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('Information about vCard is incorrect. Please reload the page.'))));
 			exit();
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index ceac2dcfad2..aefa2c74114 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -320,6 +320,8 @@ class OC_Contacts_VCard{
 	 * ['value'] htmlspecialchars escaped value of property
 	 * ['parameters'] associative array name=>value
 	 * ['checksum'] checksum of whole property
+	 * NOTE: $value is not escaped anymore. It shouldn't make any difference
+	 * but we should look out for any problems.
 	 */
 	public static function structureProperty($property){
 		$value = $property->value;
-- 
GitLab


From 3f1486534f687fdcad219b97072ed71a2998de87 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 31 Jan 2012 19:26:26 +0100
Subject: [PATCH 376/546] - Fixed
 http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-93   Property was
 added multiple times. - Fixed
 http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-8   "Missing "N"
 field: Contacts app not compatible with vcard 3.0 format" - Almost sure I've
 fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-27   "Full name
 in Contacts app doesn't sync to iOS 5 contacts" because it is caused by oc-8

---
 apps/contacts/ajax/addcard.php                | 23 +++++-
 apps/contacts/ajax/addproperty.php            | 23 ++++--
 apps/contacts/ajax/deleteproperty.php         |  5 ++
 apps/contacts/ajax/setproperty.php            |  6 +-
 apps/contacts/ajax/showsetproperty.php        |  5 ++
 apps/contacts/css/styles.css                  | 58 +++----------
 apps/contacts/lib/app.php                     |  5 --
 apps/contacts/templates/part.addcardform.php  | 75 ++++++++++++-----
 apps/contacts/templates/part.details.php      |  1 +
 apps/contacts/templates/part.property.N.php   |  4 +
 .../templates/part.setpropertyform.php        | 81 +++++++++++++------
 11 files changed, 175 insertions(+), 111 deletions(-)
 create mode 100644 apps/contacts/templates/part.property.N.php

diff --git a/apps/contacts/ajax/addcard.php b/apps/contacts/ajax/addcard.php
index 7e47659d23b..140d6a48095 100644
--- a/apps/contacts/ajax/addcard.php
+++ b/apps/contacts/ajax/addcard.php
@@ -22,6 +22,11 @@
 
 // Init owncloud
 require_once('../../../lib/base.php');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/addcard.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();
@@ -31,12 +36,22 @@ $l=new OC_L10N('contacts');
 $aid = $_POST['id'];
 $addressbook = OC_Contacts_App::getAddressbook( $aid );
 
-$fn = $_POST['fn'];
+$fn = trim($_POST['fn']);
 $values = $_POST['value'];
 $parameters = $_POST['parameters'];
 
 $vcard = new OC_VObject('VCARD');
 $vcard->setUID();
+
+$n = isset($values['N'][0])?trim($values['N'][0]).';':';';
+$n .= isset($values['N'][1])?trim($values['N'][1]).';':';';
+$n .= isset($values['N'][2])?trim($values['N'][2]).';;':';;';
+
+if(!$fn || ($n == ';;;;')) {
+	bailOut('You have to enter both the extended name and the display name.');
+}
+
+$vcard->setString('N',$n);
 $vcard->setString('FN',$fn);
 
 // Data to add ...
@@ -58,6 +73,10 @@ foreach( $add as $propname){
 	} else {
 		$prop_parameters = array();
 	}
+	if(is_array($value)){
+		ksort($value); // NOTE: Important, otherwise the compound value will be set in the order the fields appear in the form!
+		$value = OC_VObject::escapeSemicolons($value);
+	}
 	$vcard->addProperty($propname, $value); //, $prop_parameters);
 	$line = count($vcard->children) - 1;
 	foreach ($prop_parameters as $key=>$element) {
@@ -77,7 +96,7 @@ foreach( $add as $propname){
 $id = OC_Contacts_VCard::add($aid,$vcard->serialize());
 if(!$id) {
 	OC_JSON::error(array('data' => array('message' => $l->t('There was an error adding the contact.'))));
-	OC_Log::write('contacts','ajax/addcard.php: Recieved non-positive ID on adding card: '.$name, OC_Log::ERROR);
+	OC_Log::write('contacts','ajax/addcard.php: Recieved non-positive ID on adding card: '.$id, OC_Log::ERROR);
 	exit();
 }
 
diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index a4b5c591197..c90af217c87 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -54,6 +54,21 @@ if(!is_array($value)){
 }
 $parameters = isset($_POST['parameters']) ? $_POST['parameters'] : array();
 
+// Prevent setting a duplicate entry
+$current = $vcard->select($name);
+foreach($current as $item) {
+	$tmpvalue = (is_array($value)?implode(';', $value):$value);
+	if($tmpvalue == $item->value) {
+		OC_JSON::error(array('data' => array('message' => $l->t('Trying to add duplicate property: ').$name.': '.$tmpvalue)));
+		OC_Log::write('contacts','ajax/addproperty.php: Trying to add duplicate property: '.$name.': '.$tmpvalue, OC_Log::DEBUG);
+		exit();
+	}
+}
+
+if(is_array($value)) {
+	ksort($value);  // NOTE: Important, otherwise the compound value will be set in the order the fields appear in the form!
+}
+
 $property = $vcard->addProperty($name, $value); //, $parameters);
 
 $line = count($vcard->children) - 1;
@@ -74,14 +89,6 @@ foreach ($parameters as $key=>$element) {
 }
 $checksum = md5($vcard->children[$line]->serialize());
 
-/* FIXME: OC_Contacts_App::getPropertyLineByChecksum throws an OC_JSON error when doing this check.
-   Fix for v. 3.1
-if(!is_null(OC_Contacts_App::getPropertyLineByChecksum($id, $checksum))) {
-	OC_JSON::error(array('data' => array('message' => $l->t('Trying to add duplicate property.'))));
-	OC_Log::write('contacts','ajax/addproperty.php: Trying to add duplicate property: '.$name, OC_Log::DEBUG);
-	exit();
-}
-*/
 if(!OC_Contacts_VCard::edit($id,$vcard->serialize())) {
 	OC_JSON::error(array('data' => array('message' => $l->t('Error adding contact property.'))));
 	OC_Log::write('contacts','ajax/addproperty.php: Error updating contact property: '.$name, OC_Log::ERROR);
diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php
index 89cf292f4f8..d745d3271db 100644
--- a/apps/contacts/ajax/deleteproperty.php
+++ b/apps/contacts/ajax/deleteproperty.php
@@ -33,6 +33,11 @@ $checksum = $_GET['checksum'];
 
 $vcard = OC_Contacts_App::getContactVCard( $id );
 $line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
+if(is_null($line)){
+	$l=new OC_L10N('contacts');
+	OC_JSON::error(array('data' => array( 'message' => $l->t('Information about vCard is incorrect. Please reload the page.'))));
+	exit();
+}
 
 unset($vcard->children[$line]);
 
diff --git a/apps/contacts/ajax/setproperty.php b/apps/contacts/ajax/setproperty.php
index cdc6d34c524..cf3fe582247 100644
--- a/apps/contacts/ajax/setproperty.php
+++ b/apps/contacts/ajax/setproperty.php
@@ -36,8 +36,9 @@ $line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
 // Set the value
 $value = $_POST['value'];
 if(is_array($value)){
-	$value = OC_VObject::escapeSemicolons($value);
+	ksort($value);  // NOTE: Important, otherwise the compound value will be set in the order the fields appear in the form!
 }
+OC_Log::write('contacts','ajax/setproperty.php: setting: '.$vcard->children[$line]->name.': '.$value, OC_Log::DEBUG);
 $vcard->children[$line]->setValue($value);
 
 // Add parameters
@@ -87,6 +88,9 @@ $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
 if ($vcard->children[$line]->name == 'FN'){
 	$tmpl = new OC_Template('contacts','part.property.FN');
 }
+elseif ($vcard->children[$line]->name == 'N'){
+	$tmpl = new OC_Template('contacts','part.property.N');
+}
 else{
 	$tmpl = new OC_Template('contacts','part.property');
 }
diff --git a/apps/contacts/ajax/showsetproperty.php b/apps/contacts/ajax/showsetproperty.php
index e23fa21c56b..577230e4566 100644
--- a/apps/contacts/ajax/showsetproperty.php
+++ b/apps/contacts/ajax/showsetproperty.php
@@ -33,6 +33,11 @@ $checksum = $_GET['checksum'];
 $vcard = OC_Contacts_App::getContactVCard( $id );
 
 $line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
+if(is_null($line)){
+	$l=new OC_L10N('contacts');
+	OC_JSON::error(array('data' => array( 'message' => $l->t('Information about vCard is incorrect. Please reload the page.'))));
+	exit();
+}
 
 $adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
 $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
diff --git a/apps/contacts/css/styles.css b/apps/contacts/css/styles.css
index 4fcd8fc1131..58e1bf6c93e 100644
--- a/apps/contacts/css/styles.css
+++ b/apps/contacts/css/styles.css
@@ -2,6 +2,7 @@
 #leftcontent a { height: 23px; display: block; margin: 0 0 0 0; padding: 0 0 0 25px; }
 #chooseaddressbook {margin-right: 170px; float: right;}
 #contacts_details_name { font-weight:bold;font-size:1.1em;margin-left:25%;}
+#contacts_details_name_n { font-size:0.8em;margin-left:25%;color:#666;}
 #contacts_details_photo { margin:.5em 0em .5em 25%; }
 
 #contacts_deletecard {position:absolute;top:15px;right:25px;}
@@ -12,41 +13,15 @@
 #contacts_details_list li p.contacts_property_data, #contacts_details_list li ul.contacts_property_data { width:72%;float:left; clear: right; }
 #contacts_setproperty_button { margin-left:25%; }
 
-dl.form
-{
-	width: 100%;
-	float: left;
-	clear: right;
-	margin: 1em;
-	padding: 0;
-}
+#contacts_addcardform legend,label { font-weight: bold; width: 10em; overflow: ellipsis; }
+#contacts_addcardform legend { padding-left: 3em; font-size:1.1em; }
+#contacts_addcardform input[type="text"] { width: 25em; }
+#contacts_addcardform input[type="email"] { width: 15em; }
+#contacts_addcardform input[type="tel"] { width: 15em; }
 
-.form dt
-{
-	display: table-cell;
-	clear: left;
-	float: left;
-	min-width: 10em;
-	margin: 0;
-	padding-top: 0.5em;
-	padding-right: 1em;
-	font-weight: bold;
-	text-align:right;
-	vertical-align: text-bottom;
-	bottom: 0px;
-}
-
-.form dd
-{
-	display: table-cell;
-	clear: right;
-	float: left;
-	min-width: 20em;
-	margin: 0;
-	padding: 0;
-	white-space: nowrap;
-	top: 0px;
-}
+dl.form { width: 100%; float: left; clear: right; margin: 1em; padding: 0; }
+.form dt { display: table-cell; clear: left; float: left; min-width: 10em; margin: 0; padding-top: 0.5em; padding-right: 1em;font-weight: bold; text-align:right; vertical-align: text-bottom; bottom: 0px; }
+.form dd { display: table-cell; clear: right; float: left; min-width: 20em; margin: 0; padding: 0; white-space: nowrap; top: 0px; }
 .form input { position: relative; width: 20em; }
 
 .contacts_property_data ul, ol.contacts_property_data { list-style:none; }
@@ -60,18 +35,3 @@ dl.form
 .chzn-container.chzn-container-active .chzn-choices { border-bottom-left-radius: 0;border-bottom-right-radius: 0; }
 .chzn-container .chzn-drop { border-bottom-left-radius: 0.5em;border-bottom-right-radius: 0.5em; }
 
-/* Form setup ----------------------------------------------------------------*/
-/* .forme {} */
-/* .forme ul, .forme ol { list-style:none; } */
-/* .forme .inputs, .forme .buttons { overflow: hidden; } */
-
-/* Labels --------------------------------------------------------------------*/
-/* .forme .input .label { width:25%; float:left; display:block; } */
-
-/* Inputs --------------------------------------------------------------------*/
-/* .forme .stringish input { width:72%; } */
-/* .forme .text textarea { width:72%; } */
-
-/* Buttons -------------------------------------------------------------------*/
-/* .forme .buttons { padding-left:25%; } */
-/* .forme .button { float:left; padding-left:0.5em; } */
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 39df497043b..580cc72d5eb 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -85,11 +85,6 @@ class OC_Contacts_App{
 				break;
 			}
 		}
-		// FIXME: I'm not sure this should throw a JSON error as it might just be used to check for dupes. /Tanghus.
-		if(is_null($line)){
-			OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('Information about vCard is incorrect. Please reload the page.'))));
-			exit();
-		}
 		return $line;
 	}
 
diff --git a/apps/contacts/templates/part.addcardform.php b/apps/contacts/templates/part.addcardform.php
index 11457ff2697..17207d2ebcb 100644
--- a/apps/contacts/templates/part.addcardform.php
+++ b/apps/contacts/templates/part.addcardform.php
@@ -1,11 +1,14 @@
-<form class="formtastic" id="contacts_addcardform">
+<?php
+$l=new OC_L10N('contacts');
+?>
+<form id="contacts_addcardform">
 	<?php if(count($_['addressbooks'])==1): ?>
 		<input type="hidden" name="id" value="<?php echo $_['addressbooks'][0]['id']; ?>">
 	<?php else: ?>
 		<fieldset class="inputs">
 			<dl class="form">
 				<dt>
-					<label class="label" for="id"><?php echo $l->t('Addressbook'); ?></label>
+					<label for="id"><?php echo $l->t('Addressbook'); ?></label>
 				</dt>
 				<dd>
 					<select name="id" size="1">
@@ -18,13 +21,37 @@
 	<fieldset class="inputs">
 		<dl class="form">
 			<dt>
-				<label class="label" for="fn"><?php echo $l->t('Name'); ?></label>
+				<label for="n1"><?php echo $l->t('Given name'); ?></label>
 			</dd>
 			<dd>
-				<input id="fn" type="text" name="fn" value=""><br>
+				<input id="n1" type="text" name="value[N][1]" value="">
 			</dd>
 			<dt>
-				<label class="label" for="org"><?php echo $l->t('Organization'); ?></label>
+				<label for="n0"><?php echo $l->t('Family name'); ?></label>
+			</dd>
+			<dd>
+				<input id="n0" type="text" name="value[N][0]" value="">
+			</dd>
+			<dt>
+				<label for="n2"><?php echo $l->t('Additional names'); ?></label>
+			</dd>
+			<dd>
+				<input id="n2" type="text" name="value[N][2]" value="">
+				<input type="hidden" name="value[N][4]" value="">
+				<input type="hidden" name="value[N][5]" value="">
+			</dd>
+		</dl>
+	</fieldset>
+	<fieldset class="inputs">
+		<dl class="form">
+			<dt>
+				<label for="fn"><?php echo $l->t('Display name'); ?></label>
+			</dd>
+			<dd>
+				<input id="fn" type="text" name="fn" placeholder="<?php echo $l->t('How you want the name displayed in the list'); ?>" value="">
+			</dd>
+			<dt>
+				<label for="org"><?php echo $l->t('Organization'); ?></label>
 			</dt>
 			<dd>
 				<input id="org" type="text" name="value[ORG]" value="">
@@ -34,16 +61,16 @@
 	<fieldset class="inputs">
 		<dl class="form">
 			<dt>
-				<label class="label" for="email"><?php echo $l->t('Email'); ?></label>
+				<label for="email"><?php echo $l->t('Email'); ?></label>
 			</dt>
 			<dd>
-				<input id="email" type="text" name="value[EMAIL]" value="">
+				<input id="email" type="email" name="value[EMAIL]" value="">
 			</dd>
 			<dt>
 				<label for="tel"><?php echo $l->t('Telephone'); ?></label>
 			</dt>
 			<dd>
-				<input type="phone" id="tel" name="value[TEL]" value="">
+				<input type="tel" id="tel" name="value[TEL]" value="">
 				<select id="TEL" name="parameters[TEL][TYPE][]" multiple="multiple">
 					<?php echo html_select_options($_['phone_types'], 'CELL') ?>
 				</select>
@@ -54,7 +81,7 @@
 		<legend><?php echo $l->t('Address'); ?></legend>
 		<dl class="form">
 			<dt>
-				<label class="label" for="adr_type"><?php echo $l->t('Type'); ?></label>
+				<label for="adr_type"><?php echo $l->t('Type'); ?></label>
 			</dt>
 			<dd>
 				<select id="adr_type" name="parameters[ADR][TYPE]" size="1">
@@ -62,44 +89,48 @@
 				</select>
 			</dd>
 			<dt>
-				<label class="label" for="adr_pobox"><?php echo $l->t('PO Box'); ?></label>
+				<label for="adr_pobox"><?php echo $l->t('PO Box'); ?></label>
 			</dt>
 			<dd>
-				<input type="text" id="adr_pobox" name="value[ADR][0]" value="">
+				<input type="text" id="adr_pobox" name="value[ADR][0]" placeholder="<?php echo $l->t('Post Office box'); ?>" value="">
 			</dd>
 			<dd>
-			<dt>
+			<!-- dt>
 				<label class="label" for="adr_extended"><?php echo $l->t('Extended'); ?></label>
 			</dt>
 			<dd>
 				<input type="text" id="adr_extended" name="value[ADR][1]" value="">
-			</dd>
+			</dd -->
 			<dt>
-				<label class="label" for="adr_street"><?php echo $l->t('Street'); ?></label>
+				<label for="adr_street"><?php echo $l->t('Street'); ?></label>
 			</dt>
 			<dd>
-				<input type="text" id="adr_street" name="value[ADR][2]" value="">
+				<input style="width: 12em;" type="text" id="adr_street" name="value[ADR][2]" placeholder="<?php echo $l->t('Street name and no.'); ?>" value="">
+				<label for="adr_extended"><?php echo $l->t('Extended'); ?></label>
+				<input style="width: 7em;" type="text" id="adr_extended" name="value[ADR][1]" placeholder="<?php echo $l->t('Apart. no., floor'); ?>" value="">
 			</dd>
 			<dt>
-				<label class="label" for="adr_city"><?php echo $l->t('City'); ?></label>
+				<label for="adr_city"><?php echo $l->t('City'); ?></label>
 			</dt>
 			<dd>
-				<input type="text" id="adr_city" name="value[ADR][3]" value="">
+				<input style="width: 12em;" type="text" id="adr_city" name="value[ADR][3]" value="">
+				<label for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
+				<input style="width: 5em;" type="text" id="adr_zipcode" name="value[ADR][5]" value="">
 			</dd>
 			<dt>
-				<label class="label" for="adr_region"><?php echo $l->t('Region'); ?></label>
+				<label for="adr_region"><?php echo $l->t('Region'); ?></label>
 			</dt>
 			<dd>
-				<input type="text" id="adr_region" name="value[ADR][4]" value="">
+				<input type="text" id="adr_region" name="value[ADR][4]" placeholder="<?php echo $l->t('E.g. state or province'); ?>" value="">
 			</dd>
-			<dt>
+			<!-- dt>
 				<label class="label" for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
 			</dt>
 			<dd>
 				<input type="text" id="adr_zipcode" name="value[ADR][5]" value="">
-			</dd>
+			</dd -->
 			<dt>
-				<label class="label" for="adr_country"><?php echo $l->t('Country'); ?></label>
+				<label for="adr_country"><?php echo $l->t('Country'); ?></label>
 			</dt>
 			<dd>
 				<input type="text" id="adr_country" name="value[ADR][6]" value="">
diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php
index 679ae5ede2f..5badd816155 100644
--- a/apps/contacts/templates/part.details.php
+++ b/apps/contacts/templates/part.details.php
@@ -1,5 +1,6 @@
 <?php if(array_key_exists('FN',$_['details'])): ?>
 	<?php echo $this->inc('part.property.FN', array('property' => $_['details']['FN'][0])); ?>
+	<?php echo $this->inc('part.property.N', array('property' => $_['details']['N'][0])); ?>
 	<a href="export.php?contactid=<?php echo $_['id']; ?>"><img class="svg action" id="contacts_downloadcard" src="<?php echo image_path('', 'actions/download.svg'); ?>" title="<?php echo $l->t('Download contact');?>" /></a>
 	<img class="svg action" id="contacts_deletecard" src="<?php echo image_path('', 'actions/delete.svg'); ?>" title="<?php echo $l->t('Delete contact');?>" />
 
diff --git a/apps/contacts/templates/part.property.N.php b/apps/contacts/templates/part.property.N.php
new file mode 100644
index 00000000000..73d599ad7b4
--- /dev/null
+++ b/apps/contacts/templates/part.property.N.php
@@ -0,0 +1,4 @@
+<p id="contacts_details_name_n" class="contacts_property" data-checksum="<?php echo $_['property']['checksum']; ?>">
+	(<?php echo $_['property']['value'][0].', '.$_['property']['value'][1].' '.$_['property']['value'][2]; ?>)
+	<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
+</p>
diff --git a/apps/contacts/templates/part.setpropertyform.php b/apps/contacts/templates/part.setpropertyform.php
index 3e0b8d49b52..49fa9662146 100644
--- a/apps/contacts/templates/part.setpropertyform.php
+++ b/apps/contacts/templates/part.setpropertyform.php
@@ -1,46 +1,79 @@
 	<form id="contacts_setpropertyform">
 		<input type="hidden" name="checksum" value="<?php echo $_['property']['checksum']; ?>">
 		<input type="hidden" name="id" value="<?php echo $_['id']; ?>">
-		<?php if($_['property']['name']=='FN'): ?>
+		<?php if($_['property']['name']=='N'): ?>
+			<p class="contacts_property_name">
+			<dl class="contacts_property_data form">
+				<dt><label for="n1"><?php echo $l->t('Given name'); ?></label></dt>
+				<dd><input id="n1" type="text" name="value[1]" value="<?php echo $_['property']['value'][1]; ?>"></dd>
+				<dt><label for="n0"><?php echo $l->t('Family name'); ?></dt>
+				<dd><input id="n0" type="text" name="value[0]" value="<?php echo $_['property']['value'][0]; ?>"></dd>
+				<dt><label for="n2"><?php echo $l->t('Additional names'); ?></dt>
+				<dd><input id="n2" type="text" name="value[2]" value="<?php echo $_['property']['value'][2]; ?>">
+				<input id="n3" type="hidden" name="value[3]" value="<?php echo $_['property']['value'][3]; ?>">
+				<input id="n4" type="hidden" name="value[4]" value="<?php echo $_['property']['value'][4]; ?>">
+				</dd>
+			</dl>
+			</p>
+		<?php elseif($_['property']['name']=='FN'): ?>
 			<p class="contacts_property_data"><input id="fn" type="text" name="value" value="<?php echo $_['property']['value']; ?>"></p>
 		<?php elseif($_['property']['name']=='ADR'): ?>
 			<p class="contacts_property_name"><label for="adr_pobox"><?php echo $l->t('Address'); ?></label></p>
-			<ol class="contacts_property_data" id="contacts_addresspart">
-				<li class="input">
+			<dl class="contacts_property_data form" id="contacts_addresspart">
+				<dt>
 					<label class="label" for="adr_type"><?php echo $l->t('Type'); ?></label>
+				</dt>
+				<dd>
 					<select id="adr_type" name="parameters[TYPE]" size="1">
 						<?php echo html_select_options($_['adr_types'], strtoupper($_['property']['parameters']['TYPE'])) ?>
 					</select>
-				</li>
-				<li>
+				</dd>
+				<dt>
 					<label for="adr_pobox"><?php echo $l->t('PO Box'); ?></label>
+				</dt>
+				<dd>
 					<input id="adr_pobox" type="text" name="value[0]" value="<?php echo $_['property']['value'][0] ?>">
-				</li>
-				<li>
+				</dd>
+				<!-- dt>
 					<label for="adr_extended"><?php echo $l->t('Extended'); ?></label>
-					<input id="adr_extended" type="text" name="value[1]" value="<?php echo $_['property']['value'][1] ?>">
-				</li>
-				<li>
+				</dt>
+				<dd>
+					<input style="width: 7em;" id="adr_extended" type="text" name="value[1]" value="<?php echo $_['property']['value'][1] ?>">
+				</dd -->
+				<dt>
 					<label for="adr_street"><?php echo $l->t('Street'); ?></label>
-					<input id="adr_street" type="text" name="value[2]" value="<?php echo $_['property']['value'][2] ?>">
-				</li>
-				<li>
+				</dt>
+				<dd>
+					<input style="width: 12em;" id="adr_street" type="text" name="value[2]" value="<?php echo $_['property']['value'][2] ?>">
+					<label for="adr_extended"><?php echo $l->t('Extended'); ?></label><input style="width: 7em;" id="adr_extended" type="text" name="value[1]" value="<?php echo $_['property']['value'][1] ?>">
+				</dd>
+				<dt>
 					<label for="adr_city"><?php echo $l->t('City'); ?></label>
-					<input id="adr_city" type="text" name="value[3]" value="<?php echo $_['property']['value'][3] ?>">
-				</li>
-				<li>
+				</dt>
+				<dd>
+					<input style="width: 12em;" id="adr_city" type="text" name="value[3]" value="<?php echo $_['property']['value'][3] ?>">
+					<label for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
+					<input style="width: 5em;" id="adr_zipcode" type="text" name="value[5]" value="<?php echo $_['property']['value'][5] ?>">
+				</dd>
+				<dt>
 					<label for="adr_region"><?php echo $l->t('Region'); ?></label>
+				</dt>
+				<dd>
 					<input id="adr_region" type="text" name="value[4]" value="<?php echo $_['property']['value'][4] ?>">
-				</li>
-				<li>
+				</dd>
+				<!-- dt>
 					<label for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
-					<input id="adr_zipcode" type="text" name="value[5]" value="<?php echo $_['property']['value'][5] ?>">
-				</li>
-				<li>
+				</dt>
+				<dd>
+					<input style="width: 7em;" id="adr_zipcode" type="text" name="value[5]" value="<?php echo $_['property']['value'][5] ?>">
+				</dd -->
+				<dt>
 					<label for="adr_country"><?php echo $l->t('Country'); ?></label>
-					<input id="adr_country" type="text" name="value[6]" value="<?php echo $_['property']['value'][6] ?>">
-				</li>
-			</ol>
+				</dt>
+				<dd>
+					<input style="width: 25em;" id="adr_country" type="text" name="value[6]" value="<?php echo $_['property']['value'][6] ?>">
+				</dd>
+			</dl>
 		<?php elseif($_['property']['name']=='TEL'): ?>
 			<p class="contacts_property_name"><label for="tel"><?php echo $l->t('Phone'); ?></label></p>
 			<p class="contacts_property_data"><input id="tel" type="phone" name="value" value="<?php echo $_['property']['value'] ?>">
-- 
GitLab


From 6c340416d9020f40031119d1d76bf797066895ec Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 27 Jan 2012 21:34:56 +0100
Subject: [PATCH 377/546] Resize profile picture if bigger than 200px on either
 x or y. Bolded text on message box.

---
 apps/contacts/photo.php                     | 3 +++
 apps/contacts/templates/part.messagebox.php | 6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index 478ef829cae..756aae63c4d 100644
--- a/apps/contacts/photo.php
+++ b/apps/contacts/photo.php
@@ -63,6 +63,9 @@ if( is_null($content)){
 				}
 			}
 			if($image->loadFromBase64($child->value)) {
+				if($image->width() > 200 || $image->height() > 200) {
+					$image->resize(200);
+				}
 				header('Content-Type: '.$mime);
 				$image();
 				exit();
diff --git a/apps/contacts/templates/part.messagebox.php b/apps/contacts/templates/part.messagebox.php
index 3681bb6e3f3..5db10e7e6c5 100644
--- a/apps/contacts/templates/part.messagebox.php
+++ b/apps/contacts/templates/part.messagebox.php
@@ -1,7 +1,3 @@
 <div id="messagebox">
-<table width="100%" style="border: 0;">
-<tr>
-	<th id="messagebox_msg"></th>
-</tr>
-</table>
+<div id="messagebox_msg"></div>
 </di>
-- 
GitLab


From 4145e3b2651312b5949de3aae4f34c1be5332eb8 Mon Sep 17 00:00:00 2001
From: Thomas Schmidt <tschmidt@suse.de>
Date: Wed, 1 Feb 2012 12:00:38 +0100
Subject: [PATCH 378/546] pre-select current language, sort available languages

---
 settings/personal.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/settings/personal.php b/settings/personal.php
index 787957f246f..3b90827ed99 100755
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -23,8 +23,10 @@ $relative=round(($used/$total)*10000)/100;
 
 $email=OC_Preferences::getValue(OC_User::getUser(), 'settings','email','');
 
-$lang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', 'en' );
+$lang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
 $languageCodes=OC_L10N::findAvailableLanguages();
+sort ($languageCodes);
+
 //put the current language in the front
 unset($languageCodes[array_search($lang,$languageCodes)]);
 array_unshift($languageCodes,$lang);
-- 
GitLab


From a69d3c3346b7b254e3e0ab6766f40842a4ad3878 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 1 Feb 2012 15:25:00 +0100
Subject: [PATCH 379/546] only show what folder we are scanning to save
 bandwith

---
 files/js/files.js |  8 +++-----
 lib/filecache.php | 11 ++++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/files/js/files.js b/files/js/files.js
index a896314faf0..0eca0959def 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -347,15 +347,13 @@ $(document).ready(function() {
 
 function scanFiles(force){
 	force=!!force; //cast to bool
-	var fileCount=0;
 	$('#scanning-message').show();
 	$('#fileList').remove();
 	var scannerEventSource=new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force});
 	scanFiles.cancel=scannerEventSource.close.bind(scannerEventSource);
-	scannerEventSource.listen('scanned',function(file){
-		fileCount++;
-		$('#scan-count').text(fileCount+' files scanned');
-		$('#scan-current').text(file);
+	scannerEventSource.listen('scanning',function(data){
+		$('#scan-count').text(data.count+' files scanned');
+		$('#scan-current').text(data.file+'/');
 	});
 	scannerEventSource.listen('success',function(success){
 		if(success){
diff --git a/lib/filecache.php b/lib/filecache.php
index b4cafe8b311..a67ac669a76 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -303,7 +303,7 @@ class OC_FileCache{
 	 * @param bool $onlyChilds
 	 * @param OC_EventSource $enventSource
 	 */
-	public static function scan($path,$onlyChilds,$eventSource){
+	public static function scan($path,$onlyChilds=false,$eventSource=false,&$count=0){
 		$dh=OC_Filesystem::opendir($path);
 		$stat=OC_Filesystem::stat($path);
 		$mimetype=OC_Filesystem::getMimeType($path);
@@ -319,15 +319,16 @@ class OC_FileCache{
 				if($filename != '.' and $filename != '..'){
 					$file=$path.'/'.$filename;
 					if(OC_Filesystem::is_dir($file)){
-						self::scan($file,true,$eventSource);
+						if($eventSource){
+							$eventSource->send('scanning',array('file'=>$file,'count'=>$count));
+						}
+						self::scan($file,true,$eventSource,$count);
 					}else{
 						$stat=OC_Filesystem::stat($file);
 						$mimetype=OC_Filesystem::getMimeType($file);
 						$stat['mimetype']=$mimetype;
 						self::put($file,$stat);
-						if($eventSource){
-							$eventSource->send('scanned',$file);
-						}
+						$count++;
 						$totalSize+=$stat['size'];
 					}
 				}
-- 
GitLab


From 0124809a42dd72d9c6d9b550687fa0013a88b6da Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 1 Feb 2012 15:33:12 +0100
Subject: [PATCH 380/546] prevent sharing from making aditional http requests
 while scanning

additional requests to the server can block feedback of scannning depending on server configuration
---
 apps/files_sharing/js/share.js | 1 +
 files/js/files.js              | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 4457dddbe15..d01a07447a6 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -2,6 +2,7 @@ $(document).ready(function() {
 	var shared_status = {};
 	if (typeof FileActions !== 'undefined') {
 		FileActions.register('all', 'Share', function(filename) {
+			if (scanFiles.scanning){return;}//workaround to prevent aditional http request block scanning feedback
 			var icon;
 			var file = $('#dir').val()+'/'+filename;
 			if(shared_status[file])
diff --git a/files/js/files.js b/files/js/files.js
index 0eca0959def..bebcf4e97a4 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -347,6 +347,7 @@ $(document).ready(function() {
 
 function scanFiles(force){
 	force=!!force; //cast to bool
+	scanFiles.scanning=true;
 	$('#scanning-message').show();
 	$('#fileList').remove();
 	var scannerEventSource=new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force});
@@ -356,6 +357,7 @@ function scanFiles(force){
 		$('#scan-current').text(data.file+'/');
 	});
 	scannerEventSource.listen('success',function(success){
+		scanFiles.scanning=false;
 		if(success){
 			window.location.reload();
 		}else{
@@ -363,6 +365,7 @@ function scanFiles(force){
 		}
 	});
 }
+scanFiles.scanning=false;
 
 function boolOperationFinished(data, callback) {
 	result = jQuery.parseJSON(data.responseText);
-- 
GitLab


From e229a6adecde57d919b6b1385729cbf8cd41fe89 Mon Sep 17 00:00:00 2001
From: David Iwanowitsch <david+git@unclouded.de>
Date: Sun, 29 Jan 2012 19:32:33 +0100
Subject: [PATCH 381/546] Added searchprovider for bookmarks, initial l10n
 support for bookmark plugin moved some code from updateList.php to
 bookmarks.php, to make it reusable

---
 apps/bookmarks/ajax/updateList.php  |  60 ++------------
 apps/bookmarks/appinfo/app.php      |   7 +-
 apps/bookmarks/js/bookmarksearch.js |  22 ++++++
 apps/bookmarks/l10n/xgettextfiles   |   5 ++
 apps/bookmarks/lib/bookmarks.php    | 117 ++++++++++++++++++++++++++++
 apps/bookmarks/lib/search.php       |  50 ++++++++++++
 6 files changed, 205 insertions(+), 56 deletions(-)
 create mode 100644 apps/bookmarks/js/bookmarksearch.js
 create mode 100644 apps/bookmarks/l10n/xgettextfiles
 create mode 100644 apps/bookmarks/lib/bookmarks.php
 create mode 100644 apps/bookmarks/lib/search.php

diff --git a/apps/bookmarks/ajax/updateList.php b/apps/bookmarks/ajax/updateList.php
index d2a5397452f..487e0d290e3 100644
--- a/apps/bookmarks/ajax/updateList.php
+++ b/apps/bookmarks/ajax/updateList.php
@@ -5,6 +5,7 @@
 *
 * @author Arthur Schiwon
 * @copyright 2011 Arthur Schiwon blizzz@arthur-schiwon.de
+* @copyright 2012 David Iwanowitsch <david at unclouded dot de>
 * 
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -30,71 +31,20 @@ require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('bookmarks');
 
-$params=array(OC_User::getUser());
-$CONFIG_DBTYPE = OC_Config::getValue( 'dbtype', 'sqlite' );
 
 //Filter for tag?
-$filterTag = isset($_GET['tag']) ? '%' . htmlspecialchars_decode($_GET['tag']) . '%' : false;
-if($filterTag){
-	$sqlFilterTag = 'HAVING tags LIKE ?';
-	$params[] = $filterTag;
-	if($CONFIG_DBTYPE == 'pgsql' ) {
-		$sqlFilterTag = 'HAVING array_to_string(array_agg(tag), \' \')  LIKE ?';
-	}
-} else {
-	$sqlFilterTag = '';
-}
+$filterTag = isset($_GET['tag']) ? htmlspecialchars_decode($_GET['tag']) : false;
 
 $offset = isset($_GET['page']) ? intval($_GET['page']) * 10 : 0;
 
 $sort = isset($_GET['sort']) ? ($_GET['sort']) : 'bookmarks_sorting_recent';
 if($sort == 'bookmarks_sorting_clicks') {
-	$sqlSort = 'clickcount DESC';
+	$sqlSortColumn = 'clickcount';
 } else {
-	$sqlSort = 'id DESC';
+	$sqlSortColumn = 'id';
 }
 
-if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
-	$_gc_separator = ', \' \'';
-} else {
-	$_gc_separator = 'SEPARATOR \' \'';
-}
-
-if($CONFIG_DBTYPE == 'pgsql' ){
-	$params[] = $offset;
-	$query = OC_DB::prepare('
-		SELECT id, url, title, array_to_string(array_agg(tag), \' \') as tags
-		FROM *PREFIX*bookmarks
-		LEFT JOIN *PREFIX*bookmarks_tags ON *PREFIX*bookmarks.id = *PREFIX*bookmarks_tags.bookmark_id 
-		WHERE 
-			*PREFIX*bookmarks.user_id = ?
-		GROUP BY id, url, title
-		'.$sqlFilterTag.'
-		ORDER BY *PREFIX*bookmarks.'.$sqlSort.' 
-		LIMIT 10
-		OFFSET ?');
-} else {
-	$query = OC_DB::prepare('
-		SELECT id, url, title, 
-		CASE WHEN *PREFIX*bookmarks.id = *PREFIX*bookmarks_tags.bookmark_id
-				THEN GROUP_CONCAT( tag ' .$_gc_separator. ' )
-				ELSE \' \'
-			END
-			AS tags
-		FROM *PREFIX*bookmarks
-		LEFT JOIN *PREFIX*bookmarks_tags ON 1=1
-		WHERE (*PREFIX*bookmarks.id = *PREFIX*bookmarks_tags.bookmark_id 
-				OR *PREFIX*bookmarks.id NOT IN (
-					SELECT *PREFIX*bookmarks_tags.bookmark_id FROM *PREFIX*bookmarks_tags
-				)
-			)
-			AND *PREFIX*bookmarks.user_id = ?
-		GROUP BY url
-		'.$sqlFilterTag.'
-		ORDER BY *PREFIX*bookmarks.'.$sqlSort.' 
-		LIMIT '.$offset.',  10');
-}
 
-$bookmarks = $query->execute($params)->fetchAll();
+$bookmarks = OC_Bookmarks_Bookmarks::findBookmarks($offset, $sqlSortColumn, $filterTag, true);
 
 OC_JSON::success(array('data' => $bookmarks));
diff --git a/apps/bookmarks/appinfo/app.php b/apps/bookmarks/appinfo/app.php
index 44a1e47dff9..479d8ed4767 100644
--- a/apps/bookmarks/appinfo/app.php
+++ b/apps/bookmarks/appinfo/app.php
@@ -7,8 +7,13 @@
 * See the COPYING-README file.
 */
 
+OC::$CLASSPATH['OC_Bookmarks_Bookmarks'] = 'apps/bookmarks/lib/bookmarks.php';
+
 OC_App::register( array( 'order' => 70, 'id' => 'bookmark', 'name' => 'Bookmarks' ));
 
-OC_App::addNavigationEntry( array( 'id' => 'bookmarks_index', 'order' => 70, 'href' => OC_Helper::linkTo( 'bookmarks', 'index.php' ), 'icon' => OC_Helper::imagePath( 'bookmarks', 'bookmarks.png' ), 'name' => 'Bookmarks' ));
+$l = new OC_l10n('bookmarks');
+OC_App::addNavigationEntry( array( 'id' => 'bookmarks_index', 'order' => 70, 'href' => OC_Helper::linkTo( 'bookmarks', 'index.php' ), 'icon' => OC_Helper::imagePath( 'bookmarks', 'bookmarks.png' ), 'name' => $l->t('Bookmarks')));
 
 OC_App::registerPersonal('bookmarks', 'settings');
+require_once('apps/bookmarks/lib/search.php');
+OC_Util::addScript('bookmarks','bookmarksearch');
diff --git a/apps/bookmarks/js/bookmarksearch.js b/apps/bookmarks/js/bookmarksearch.js
new file mode 100644
index 00000000000..39874aa0b29
--- /dev/null
+++ b/apps/bookmarks/js/bookmarksearch.js
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) 2012 David Iwanowitsch <david at unclouded dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+$(document).ready(function(){
+	OC.search.customResults.Bookm.=function(row,item){
+		var a=row.find('a');
+		a.attr('target','_blank');
+		a.click(recordClick);
+	}
+});
+
+function recordClick(event) {
+	var jsFileLocation = $('script[src*=bookmarksearch]').attr('src');
+	jsFileLocation = jsFileLocation.replace('js/bookmarksearch.js', '');
+	$.ajax({
+		url: jsFileLocation + 'ajax/recordClick.php',
+		data: 'url=' + encodeURI($(this).attr('href')),
+	});	
+}
diff --git a/apps/bookmarks/l10n/xgettextfiles b/apps/bookmarks/l10n/xgettextfiles
new file mode 100644
index 00000000000..cd555432390
--- /dev/null
+++ b/apps/bookmarks/l10n/xgettextfiles
@@ -0,0 +1,5 @@
+../appinfo/app.php
+../lib/search.php
+../templates/settings.php
+../templates/addBm.php
+../templates/list.php
diff --git a/apps/bookmarks/lib/bookmarks.php b/apps/bookmarks/lib/bookmarks.php
new file mode 100644
index 00000000000..81c1b03981a
--- /dev/null
+++ b/apps/bookmarks/lib/bookmarks.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * ownCloud - bookmarks plugin
+ *
+ * @author Arthur Schiwon
+ * @copyright 2011 Arthur Schiwon blizzz@arthur-schiwon.de
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * This class manages bookmarks
+ */
+class OC_Bookmarks_Bookmarks{
+
+	/**
+	 * @brief Finds all bookmarks, matching the filter
+	 * @param offset result offset
+	 * @param sqlSortColumn sort result with this column
+	 * @param filter can be: empty -> no filter, a string -> filter this, a string array -> filter for all strings
+	 * @param filterTagOnly if true, filter affacts only tags, else filter affects url, title and tags
+	 * @return void
+	 */
+	public static function findBookmarks($offset, $sqlSortColumn, $filter, $filterTagOnly){
+		//OC_Log::write('bookmarks', 'findBookmarks ' .$offset. ' '.$sqlSortColumn.' '. $filter.' '. $filterTagOnly ,OC_Log::DEBUG);
+		$CONFIG_DBTYPE = OC_Config::getValue( 'dbtype', 'sqlite' );
+	
+		$params=array(OC_User::getUser());
+	
+		if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
+			$_gc_separator = ', \' \'';
+		} else {
+			$_gc_separator = 'SEPARATOR \' \'';
+		}
+
+		if($filter){
+			if($CONFIG_DBTYPE == 'pgsql' )
+				$tagString = 'array_to_string(array_agg(tag), \' \')';
+			else
+				$tagString = 'tags';
+
+			$sqlFilterTag = 'HAVING ';
+			if(is_array($filter)){
+				$first = true;
+				$filterstring = '';
+				foreach ($filter as $singleFilter){
+					$filterstring = $filterstring . ($first?'':' AND ') . $tagString.' LIKE ? ';
+					$params[] = '%'.$singleFilter.'%';
+					$first=false;
+				}
+				$sqlFilterTag = $sqlFilterTag . $filterstring;
+			} else{
+				$sqlFilterTag = $sqlFilterTag .$tagString.' LIKE ? ';
+				$params[] = '%'.$filter.'%';
+			}
+		} else {
+			$sqlFilterTag = '';
+		}
+
+		if($CONFIG_DBTYPE == 'pgsql' ){
+			$query = OC_DB::prepare('
+				SELECT id, url, title, '.($filterTagOnly?'':'url || title ||').' array_to_string(array_agg(tag), \' \') as tags
+				FROM *PREFIX*bookmarks
+				LEFT JOIN *PREFIX*bookmarks_tags ON *PREFIX*bookmarks.id = *PREFIX*bookmarks_tags.bookmark_id 
+				WHERE 
+					*PREFIX*bookmarks.user_id = ?
+				GROUP BY id, url, title
+				'.$sqlFilterTag.'
+				ORDER BY *PREFIX*bookmarks.'.$sqlSortColumn.' DESC 
+				LIMIT 10
+				OFFSET '. $offset);
+		} else {
+			if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' )
+				$concatFunction = '(url || title || ';
+			else
+				$concatFunction = 'Concat(Concat( url, title), ';
+		
+			$query = OC_DB::prepare('
+				SELECT id, url, title, '
+				.($filterTagOnly?'':$concatFunction).
+				'CASE WHEN *PREFIX*bookmarks.id = *PREFIX*bookmarks_tags.bookmark_id
+						THEN GROUP_CONCAT( tag ' .$_gc_separator. ' )
+						ELSE \' \'
+					END '
+				.($filterTagOnly?'':')').'
+					AS tags
+				FROM *PREFIX*bookmarks
+				LEFT JOIN *PREFIX*bookmarks_tags ON 1=1
+				WHERE (*PREFIX*bookmarks.id = *PREFIX*bookmarks_tags.bookmark_id 
+						OR *PREFIX*bookmarks.id NOT IN (
+							SELECT *PREFIX*bookmarks_tags.bookmark_id FROM *PREFIX*bookmarks_tags
+						)
+					)
+					AND *PREFIX*bookmarks.user_id = ?
+				GROUP BY url
+				'.$sqlFilterTag.'
+				ORDER BY *PREFIX*bookmarks.'.$sqlSortColumn.' DESC
+				LIMIT '.$offset.',  10');
+		}
+
+		$bookmarks = $query->execute($params)->fetchAll();
+		return $bookmarks;
+	}
+}
+?>
diff --git a/apps/bookmarks/lib/search.php b/apps/bookmarks/lib/search.php
new file mode 100644
index 00000000000..59495db82ea
--- /dev/null
+++ b/apps/bookmarks/lib/search.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * ownCloud - bookmarks plugin
+ *
+ * @author David Iwanowitsch
+ * @copyright 2012 David Iwanowitsch <david at unclouded dot de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+class OC_Search_Provider_Bookmarks extends OC_Search_Provider{
+	function search($query){
+		$results=array();
+		
+		$offset = 0;
+		$sqlSortColumn = 'id';
+		
+		$searchquery=array();
+		if(substr_count($query, ' ') > 0){
+			$searchquery = explode(' ', $query);
+		}else{
+			$searchquery = $query;
+		}
+		
+//		OC_Log::write('bookmarks', 'search ' .$query ,OC_Log::DEBUG);
+		$bookmarks = OC_Bookmarks_Bookmarks::findBookmarks($offset, $sqlSortColumn, $searchquery, false);
+//		OC_Log::write('bookmarks', 'found ' .count($bookmarks) ,OC_Log::DEBUG);
+		//$l = new OC_l10n('bookmarks'); //resulttype can't be localized, javascript relies on that type
+		foreach($bookmarks as $bookmark){
+			$results[]=new OC_Search_Result($bookmark['title'],'', $bookmark['url'],'Bookm.');
+		}
+		
+		return $results;
+	}
+}
+new OC_Search_Provider_Bookmarks();
+
+?>
-- 
GitLab


From 6583d30e26d752c5ddccb1e350e075f59b7ba75d Mon Sep 17 00:00:00 2001
From: David Iwanowitsch <david+git@unclouded.de>
Date: Mon, 30 Jan 2012 18:14:09 +0100
Subject: [PATCH 382/546] fix javascript

---
 apps/bookmarks/js/bookmarksearch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/bookmarks/js/bookmarksearch.js b/apps/bookmarks/js/bookmarksearch.js
index 39874aa0b29..e7a4fb18393 100644
--- a/apps/bookmarks/js/bookmarksearch.js
+++ b/apps/bookmarks/js/bookmarksearch.js
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 $(document).ready(function(){
-	OC.search.customResults.Bookm.=function(row,item){
+	OC.search.customResults['Bookm.'] = function(row,item){
 		var a=row.find('a');
 		a.attr('target','_blank');
 		a.click(recordClick);
-- 
GitLab


From e4faea8f9007667ee77ddd114440747539a0b843 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Wed, 1 Feb 2012 20:58:04 +0100
Subject: [PATCH 383/546] Fixed upload button display error

---
 files/css/files.css       | 3 ++-
 files/templates/index.php | 7 ++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/files/css/files.css b/files/css/files.css
index 6c4d603b4a6..13ed7fb33e4 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -27,7 +27,8 @@
 
 .file_upload_start { opacity:0; filter:alpha(opacity=0); z-index:1; position:absolute; left:0; top:0; width:100%; cursor:pointer;}
 .file_upload_filename.active { border-bottom-right-radius:0 }
-.file_upload_filename { z-index:100; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; padding:.3em; }
+.file_upload_filename { position: relative; z-index:100; padding-left: 0.8em; padding-right: 0.8em; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; }
+.file_upload_filename img { position: absolute; top: 0.4em; left: 0.4em; }
 
 
 .file_upload_form, .file_upload_wrapper, .file_upload_start, .file_upload_filename, #file_upload_submit { cursor:pointer; }
diff --git a/files/templates/index.php b/files/templates/index.php
index 9ebfa41cef2..38a3274ff31 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -3,13 +3,10 @@
 	<?php if (!isset($_['readonly']) || !$_['readonly']):?>
 		<div class="actions">
 			<div id='new' class='button'>
-				<a>
-					<?php echo $l->t('New');?>
-				</a>
+				<a><?php echo $l->t('New');?></a>
 				<ul class="popup popupTop">
 					<li style="background-image:url('<?php echo mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li>
 					<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li>
-	<!-- 				<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='web'><p><?php echo $l->t('From the web');?></p></li> -->
 				</ul>
 			</div>
 			<div class="file_upload_wrapper svg">
@@ -17,7 +14,7 @@
 					<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
 					<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
 					<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
-					<button class="file_upload_filename"><img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button>
+					<button class="file_upload_filename">&nbsp;<img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button>
 					<input class="file_upload_start" type="file" name='files[]'/>
 						<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo  ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
 					<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
-- 
GitLab


From bbd10a3c94fdd0f8ac41d6d60651c7468360e487 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Wed, 1 Feb 2012 21:19:31 +0100
Subject: [PATCH 384/546] Bookmark layout updated

---
 apps/bookmarks/css/bookmarks.css | 33 ++++++++++++++------------------
 apps/bookmarks/js/bookmarks.js   |  4 ++--
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
index 233d4a02944..ef0ec68fcce 100644
--- a/apps/bookmarks/css/bookmarks.css
+++ b/apps/bookmarks/css/bookmarks.css
@@ -18,7 +18,7 @@
 }
 
 .bookmarks_list {
-	margin-top: 45px;
+	margin-top: 2.8em;
 }
 
 .bookmarks_addBml {
@@ -36,38 +36,33 @@
 }
 
 .bookmark_actions {
+	position: absolute;
+	right: 1em;
+	top: 0.7em;
 	display: none;
-	font-size: smaller;
-	color: #666;
-	padding-left: 4em;
-}
-
-.bookmark_actions span:hover {
-	cursor: pointer;
-	text-decoration: underline;
 }
+.bookmark_actions span { margin: 0 0.4em; }
+.bookmark_actions img { opacity: 0.3; }
+.bookmark_actions img:hover { opacity: 1; cursor: pointer; }
 
 .bookmark_single {
+	position: relative;
 	padding: 0.5em 1em;
+	border-bottom: 1px solid #DDD;
+	-webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms;
 }
 
 .bookmark_single:hover {
-	background-color: #EAEAEA;
+	background-color:#f8f8f8
 }
 
 .bookmark_single:hover .bookmark_actions {
 	display: block;
 }
 
-.bookmark_title {
-	font-size: larger;
-	color: blue;
-	text-decoration: underline;
-}
-
-.bookmark_url {
-	color: green;
-}
+.bookmark_title { font-weight: bold; display: inline-block; margin-right: 0.8em; }
+.bookmark_url { display: none; color: #999; }
+.bookmark_single:hover .bookmark_url { display: inline; }
 
 .bookmark_tag {
 	color: #ff3333;
diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index 51646e5382b..86bb71ac725 100644
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -85,10 +85,10 @@ function addOrEditBookmark(event) {
 				$('.bookmarks_add').children('p').children('.bookmarks_input').val(''); 
 				$('.bookmarks_list').prepend(
 				'<div class="bookmark_single" data-id="' + bookmark_id + '" >' +
+					'<p class="bookmark_actions"><span class="bookmark_delete"><img src="img/delete.png" title="Delete"></span>&nbsp;<span class="bookmark_edit"><img src="img/edit.png" title="Edit"></span></p>' +
 					'<p class="bookmark_title"><a href="' + url + '" target="_blank" class="bookmark_link">' + title + '</a></p>' +
 					'<p class="bookmark_url">' + url + '</p>' +
 					'<p class="bookmark_tags">' + tagshtml + '</p>' +
-					'<p class="bookmark_actions"><span class="bookmark_delete">Delete</span>&nbsp;<span class="bookmark_edit">Edit</span></p>' +
 				'</div>'
 				);
 			}
@@ -153,10 +153,10 @@ function updateBookmarksList(bookmark) {
 	}
 	$('.bookmarks_list').append(
 		'<div class="bookmark_single" data-id="' + bookmark.id +'" >' +
+			'<p class="bookmark_actions"><span class="bookmark_delete"><img src="img/delete.png" title="Delete"></span>&nbsp;<span class="bookmark_edit"><img src="img/edit.png" title="Edit"></span></p>' +
 			'<p class="bookmark_title"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a></p>' +
 			'<p class="bookmark_url">' + encodeEntities(bookmark.url) + '</p>' +
 			'<p class="bookmark_tags">' + taglist + '</p>' +
-			'<p class="bookmark_actions"><span class="bookmark_delete">Delete</span>&nbsp;<span class="bookmark_edit">Edit</span></p>' +
 		'</div>'
 	);
 }
-- 
GitLab


From f999fbf81a142b2695bf3fffcf66e430efb71c44 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Wed, 1 Feb 2012 22:02:06 +0100
Subject: [PATCH 385/546] Bookmark layout updated

---
 apps/bookmarks/css/bookmarks.css | 18 +++++++++++++++---
 apps/bookmarks/js/bookmarks.js   | 10 ++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
index ef0ec68fcce..48f0bede110 100644
--- a/apps/bookmarks/css/bookmarks.css
+++ b/apps/bookmarks/css/bookmarks.css
@@ -18,7 +18,7 @@
 }
 
 .bookmarks_list {
-	margin-top: 2.8em;
+	margin-top: 36px;
 }
 
 .bookmarks_addBml {
@@ -63,10 +63,22 @@
 .bookmark_title { font-weight: bold; display: inline-block; margin-right: 0.8em; }
 .bookmark_url { display: none; color: #999; }
 .bookmark_single:hover .bookmark_url { display: inline; }
-
+.bookmark_tags {
+	position: absolute;
+	top: 0.5em;
+	right: 6em;
+	text-align: right;
+}
 .bookmark_tag {
-	color: #ff3333;
+	display: inline-block;
+	color: white;
+	margin: 0 0.2em;
+	padding: 0 0.4em;
+	background-color: #1D2D44;
+	border-radius: 0.4em;
+	opacity: 0.2;
 }
+.bookmark_tag:hover { opacity: 0.5; }
 
 .loading_meta {
 	display: none;
diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index 86bb71ac725..b43c3deb59c 100644
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -87,8 +87,8 @@ function addOrEditBookmark(event) {
 				'<div class="bookmark_single" data-id="' + bookmark_id + '" >' +
 					'<p class="bookmark_actions"><span class="bookmark_delete"><img src="img/delete.png" title="Delete"></span>&nbsp;<span class="bookmark_edit"><img src="img/edit.png" title="Edit"></span></p>' +
 					'<p class="bookmark_title"><a href="' + url + '" target="_blank" class="bookmark_link">' + title + '</a></p>' +
-					'<p class="bookmark_url">' + url + '</p>' +
 					'<p class="bookmark_tags">' + tagshtml + '</p>' +
+					'<p class="bookmark_url">' + url + '</p>' +
 				'</div>'
 				);
 			}
@@ -146,7 +146,8 @@ function updateBookmarksList(bookmark) {
 	var tags = encodeEntities(bookmark.tags).split(' ');
 	var taglist = '';
 	for ( var i=0, len=tags.length; i<len; ++i ){
-		taglist = taglist + '<a class="bookmark_tag" href="?tag=' + encodeURI(tags[i]) + '">' + tags[i] + '</a> ';
+		if(tags[i] != '')
+			taglist = taglist + '<a class="bookmark_tag" href="?tag=' + encodeURI(tags[i]) + '">' + tags[i] + '</a> ';
 	}
 	if(!hasProtocol(bookmark.url)) {
 		bookmark.url = 'http://' + bookmark.url;
@@ -156,9 +157,11 @@ function updateBookmarksList(bookmark) {
 			'<p class="bookmark_actions"><span class="bookmark_delete"><img src="img/delete.png" title="Delete"></span>&nbsp;<span class="bookmark_edit"><img src="img/edit.png" title="Edit"></span></p>' +
 			'<p class="bookmark_title"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a></p>' +
 			'<p class="bookmark_url">' + encodeEntities(bookmark.url) + '</p>' +
-			'<p class="bookmark_tags">' + taglist + '</p>' +
 		'</div>'
 	);
+	if(taglist != '') {
+		$('div[data-id="'+ bookmark.id +'"]').append('<p class="bookmark_tags">' + taglist + '</p>');
+	}
 }
 
 function updateOnBottom() {
@@ -178,7 +181,6 @@ function recordClick(event) {
 function encodeEntities(s){
 	try {
 		return $('<div/>').text(s).html();
-		
 	} catch (ex) {
 		return "";
 	}
-- 
GitLab


From f1982965769ac30f00bb36ab3c672815d1a0d09b Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 1 Feb 2012 22:15:01 +0100
Subject: [PATCH 386/546] gallery works in safari now

---
 apps/gallery/js/albums.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index 59efb5b5659..d2b4d858b55 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -46,14 +46,14 @@ Albums={
       var a = Albums.albums[i];
 	  var local=$(displayTemplate);
 	  local.attr('data-album',a.name);
-	  $(".gallery_album_decoration a.rename", local).click(function(name,event){
+	  $(".gallery_album_decoration a.rename", local).bind('click', {name: a.name},function(event){
 			event.preventDefault();
-			galleryRename(name);
-		}.bind(null,a.name));
-	  $(".gallery_album_decoration a.remove", local).click(function(name,event){
+			galleryRename(event.data.name);
+    });
+	  $(".gallery_album_decoration a.remove", local).bind('click', {name: a.name},function(event){
 		  event.preventDefault();
-		  galleryRemove(name);
-	  }.bind(null,a.name));
+		  galleryRemove(a.data.name);
+    });
 	  $("a.view", local).attr('href','?view='+a.name);
 	  $('h1',local).text(a.name);
 	  $(".gallery_album_cover", local).attr('title',a.name);
-- 
GitLab


From 92b8f3238658782e6eb5a4285185a8fae6665f05 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Thu, 2 Feb 2012 15:01:05 +0100
Subject: [PATCH 387/546] Calendar: Bugfix: better input validation

---
 apps/calendar/ajax/createcalendar.php      | 2 +-
 apps/calendar/ajax/events.php              | 4 ++--
 apps/calendar/ajax/updatecalendar.php      | 2 +-
 apps/calendar/js/calendar.js               | 1 +
 apps/calendar/templates/part.eventform.php | 6 +++---
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/calendar/ajax/createcalendar.php b/apps/calendar/ajax/createcalendar.php
index b719b207c74..08bf7b4ee49 100644
--- a/apps/calendar/ajax/createcalendar.php
+++ b/apps/calendar/ajax/createcalendar.php
@@ -25,7 +25,7 @@ foreach($calendars as $cal){
 }
 
 $userid = OC_User::getUser();
-$calendarid = OC_Calendar_Calendar::addCalendar($userid, $_POST['name'], 'VEVENT,VTODO,VJOURNAL', null, 0, $_POST['color']);
+$calendarid = OC_Calendar_Calendar::addCalendar($userid, htmlspecialchars($_POST['name']), 'VEVENT,VTODO,VJOURNAL', null, 0, $_POST['color']);
 OC_Calendar_Calendar::setCalendarActive($calendarid, 1);
 
 $calendar = OC_Calendar_Calendar::find($calendarid);
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index 998991c2fb4..75fac6838d7 100644
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -11,8 +11,8 @@ require_once('../../../3rdparty/when/When.php');
 
 function addoutput($event, $vevent, $return_event){
 	$return_event['id'] = (int)$event['id'];
-	$return_event['title'] = $event['summary'];
-	$return_event['description'] = isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:'';
+	$return_event['title'] = htmlspecialchars($event['summary']);
+	$return_event['description'] = isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'';
 	$last_modified = $vevent->__get('LAST-MODIFIED');
 	if ($last_modified){
 		$lastmodified = $last_modified->getDateTime()->format('U');
diff --git a/apps/calendar/ajax/updatecalendar.php b/apps/calendar/ajax/updatecalendar.php
index 269b7b7ca06..90dafd35b68 100644
--- a/apps/calendar/ajax/updatecalendar.php
+++ b/apps/calendar/ajax/updatecalendar.php
@@ -26,7 +26,7 @@ foreach($calendars as $cal){
 
 $calendarid = $_POST['id'];
 $calendar = OC_Calendar_App::getCalendar($calendarid);//access check
-OC_Calendar_Calendar::editCalendar($calendarid, $_POST['name'], null, null, null, $_POST['color']);
+OC_Calendar_Calendar::editCalendar($calendarid, htmlspecialchars($_POST['name']), null, null, null, $_POST['color']);
 OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
 
 $calendar = OC_Calendar_App::getCalendar($calendarid);
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index afd1b692dd4..64c029404cb 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -698,6 +698,7 @@ $(document).ready(function(){
 		eventDrop: Calendar.UI.moveEvent,
 		eventResize: Calendar.UI.resizeEvent,
 		eventRender: function(event, element) {
+			element.find('span.fc-event-title').html(element.find('span.fc-event-title').text());
 			element.tipsy({
 				className: 'tipsy-event',
 				opacity: 0.9,
diff --git a/apps/calendar/templates/part.eventform.php b/apps/calendar/templates/part.eventform.php
index 1f2073f4bc7..49214aca77c 100644
--- a/apps/calendar/templates/part.eventform.php
+++ b/apps/calendar/templates/part.eventform.php
@@ -2,7 +2,7 @@
 		<tr>
 			<th width="75px"><?php echo $l->t("Title");?>:</th>
 			<td>
-				<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Title of the Event");?>" value="<?php echo isset($_['title']) ? $_['title'] : '' ?>" maxlength="100" name="title"/>
+				<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Title of the Event");?>" value="<?php echo isset($_['title']) ? htmlspecialchars($_['title']) : '' ?>" maxlength="100" name="title"/>
 			</td>
 		</tr>
 	</table>
@@ -207,7 +207,7 @@
 			<tr>
 				<th width="85px"><?php echo $l->t("Location");?>:</th>
 				<td>
-					<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Location of the Event");?>" value="<?php echo isset($_['location']) ? $_['location'] : '' ?>" maxlength="100"  name="location" />
+					<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Location of the Event");?>" value="<?php echo isset($_['location']) ? htmlspecialchars($_['location']) : '' ?>" maxlength="100"  name="location" />
 				</td>
 			</tr>
 		</table>
@@ -215,7 +215,7 @@
 			<tr>
 				<th width="85px" style="vertical-align: top;"><?php echo $l->t("Description");?>:</th>
 				<td>
-					<textarea style="width:350px;height: 150px;" placeholder="<?php echo $l->t("Description of the Event");?>" name="description"><?php echo isset($_['description']) ? $_['description'] : '' ?></textarea>
+					<textarea style="width:350px;height: 150px;" placeholder="<?php echo $l->t("Description of the Event");?>" name="description"><?php echo isset($_['description']) ? htmlspecialchars($_['description']) : '' ?></textarea>
 				</td>
 			</tr>
 		</table>
-- 
GitLab


From 66b96e4440961483d026473fc6242599b3d51550 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 2 Feb 2012 16:46:38 +0100
Subject: [PATCH 388/546] Sanitize in- and output.

---
 apps/contacts/ajax/addcard.php                |  2 +-
 apps/contacts/ajax/addproperty.php            |  2 ++
 apps/contacts/ajax/setproperty.php            |  6 +++-
 apps/contacts/templates/part.property.FN.php  |  4 +--
 apps/contacts/templates/part.property.php     | 20 +++++------
 .../templates/part.setpropertyform.php        | 36 +++++++++----------
 6 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/apps/contacts/ajax/addcard.php b/apps/contacts/ajax/addcard.php
index 140d6a48095..f15a1685840 100644
--- a/apps/contacts/ajax/addcard.php
+++ b/apps/contacts/ajax/addcard.php
@@ -77,7 +77,7 @@ foreach( $add as $propname){
 		ksort($value); // NOTE: Important, otherwise the compound value will be set in the order the fields appear in the form!
 		$value = OC_VObject::escapeSemicolons($value);
 	}
-	$vcard->addProperty($propname, $value); //, $prop_parameters);
+	$vcard->addProperty($propname, strip_tags($value)); //, $prop_parameters);
 	$line = count($vcard->children) - 1;
 	foreach ($prop_parameters as $key=>$element) {
 		if(is_array($element) && strtoupper($key) == 'TYPE') { 
diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index c90af217c87..a00346c7dff 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -67,6 +67,8 @@ foreach($current as $item) {
 
 if(is_array($value)) {
 	ksort($value);  // NOTE: Important, otherwise the compound value will be set in the order the fields appear in the form!
+} else {
+	$value = strip_tags($value);
 }
 
 $property = $vcard->addProperty($name, $value); //, $parameters);
diff --git a/apps/contacts/ajax/setproperty.php b/apps/contacts/ajax/setproperty.php
index cf3fe582247..f9e2a8e8647 100644
--- a/apps/contacts/ajax/setproperty.php
+++ b/apps/contacts/ajax/setproperty.php
@@ -37,9 +37,13 @@ $line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
 $value = $_POST['value'];
 if(is_array($value)){
 	ksort($value);  // NOTE: Important, otherwise the compound value will be set in the order the fields appear in the form!
+	foreach(array_keys($value) as $key) {
+		OC_Log::write('contacts','ajax/setproperty.php: setting: '.$key.': '.$value[$key], OC_Log::DEBUG);
+	}
+	$value = OC_VObject::escapeSemicolons($value);
 }
 OC_Log::write('contacts','ajax/setproperty.php: setting: '.$vcard->children[$line]->name.': '.$value, OC_Log::DEBUG);
-$vcard->children[$line]->setValue($value);
+$vcard->children[$line]->setValue(strip_tags($value));
 
 // Add parameters
 $postparameters = isset($_POST['parameters'])?$_POST['parameters']:array();
diff --git a/apps/contacts/templates/part.property.FN.php b/apps/contacts/templates/part.property.FN.php
index 83cef94e303..c9e21c20e60 100644
--- a/apps/contacts/templates/part.property.FN.php
+++ b/apps/contacts/templates/part.property.FN.php
@@ -1,9 +1,9 @@
 	<p id="contacts_details_name" class="contacts_property" data-checksum="<?php echo $_['property']['checksum']; ?>">
-		<?php echo $_['property']['value']; ?>
+		<?php echo htmlspecialchars($_['property']['value']); ?>
 		<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
 	</p>
 <?php if (!isset($_['details'])): ?>
 <script>
-$('#leftcontent li.active a').text('<?php echo $_['property']['value']; ?>');
+$('#leftcontent li.active a').text('<?php echo htmlspecialchars($_['property']['value']); ?>');
 </script>
 <?php endif ?>
diff --git a/apps/contacts/templates/part.property.php b/apps/contacts/templates/part.property.php
index e4010397500..7b23fae45b5 100644
--- a/apps/contacts/templates/part.property.php
+++ b/apps/contacts/templates/part.property.php
@@ -8,21 +8,21 @@
 	<?php elseif($_['property']['name'] == 'ORG'): ?>
 		<p class="contacts_property_name"><?php echo $l->t('Organization'); ?></p>
 		<p class="contacts_property_data">
-			<?php echo $_['property']['value']; ?>
+			<?php echo htmlspecialchars($_['property']['value']); ?>
 			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
 			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
 		</p>
 	<?php elseif($_['property']['name'] == 'EMAIL'): ?>
 		<p class="contacts_property_name"><?php echo $l->t('Email'); ?></p>
 		<p class="contacts_property_data">
-			<?php echo $_['property']['value']; ?>
+			<?php echo htmlspecialchars($_['property']['value']); ?>
 			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
 			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
 		</p>
 	<?php elseif($_['property']['name'] == 'TEL'): ?>
 		<p class="contacts_property_name"><?php echo (isset($_['property']['parameters']['PREF']) && $_['property']['parameters']['PREF']) ? $l->t('Preferred').' ' : '' ?><?php echo $l->t('Phone'); ?></p>
 		<p class="contacts_property_data">
-			<?php echo $_['property']['value']; ?>
+			<?php echo htmlspecialchars($_['property']['value']); ?>
 			<?php if(isset($_['property']['parameters']['TYPE']) && !empty($_['property']['parameters']['TYPE'])): ?>
 <?php
 	foreach($_['property']['parameters']['TYPE'] as $type) {
@@ -59,25 +59,25 @@
 		</p>
 		<p class="contacts_property_data">
 			<?php if(!empty($_['property']['value'][0])): ?>
-				<?php echo $_['property']['value'][0]; ?><br>
+				<?php echo htmlspecialchars($_['property']['value'][0]); ?><br>
 			<?php endif; ?>
 			<?php if(!empty($_['property']['value'][1])): ?>
-				<?php echo $_['property']['value'][1]; ?><br>
+				<?php echo htmlspecialchars($_['property']['value'][1]); ?><br>
 			<?php endif; ?>
 			<?php if(!empty($_['property']['value'][2])): ?>
-				<?php echo $_['property']['value'][2]; ?><br>
+				<?php echo htmlspecialchars($_['property']['value'][2]); ?><br>
 			<?php endif; ?>
 			<?php if(!empty($_['property']['value'][3])): ?>
-				<?php echo $_['property']['value'][3]; ?><br>
+				<?php echo htmlspecialchars($_['property']['value'][3]); ?><br>
 			<?php endif; ?>
 			<?php if(!empty($_['property']['value'][4])): ?>
-				<?php echo $_['property']['value'][4]; ?><br>
+				<?php echo htmlspecialchars($_['property']['value'][4]); ?><br>
 			<?php endif; ?>
 			<?php if(!empty($_['property']['value'][5])): ?>
-				<?php echo $_['property']['value'][5]; ?><br>
+				<?php echo htmlspecialchars($_['property']['value'][5]); ?><br>
 			<?php endif; ?>
 			<?php if(!empty($_['property']['value'][6])): ?>
-				<?php echo $_['property']['value'][6]; ?>
+				<?php echo htmlspecialchars($_['property']['value'][6]); ?>
 			<?php endif; ?>
 			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
 			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
diff --git a/apps/contacts/templates/part.setpropertyform.php b/apps/contacts/templates/part.setpropertyform.php
index 49fa9662146..93ade8faaa7 100644
--- a/apps/contacts/templates/part.setpropertyform.php
+++ b/apps/contacts/templates/part.setpropertyform.php
@@ -5,18 +5,18 @@
 			<p class="contacts_property_name">
 			<dl class="contacts_property_data form">
 				<dt><label for="n1"><?php echo $l->t('Given name'); ?></label></dt>
-				<dd><input id="n1" type="text" name="value[1]" value="<?php echo $_['property']['value'][1]; ?>"></dd>
+				<dd><input id="n1" type="text" name="value[1]" value="<?php echo htmlspecialchars($_['property']['value'][1]); ?>"></dd>
 				<dt><label for="n0"><?php echo $l->t('Family name'); ?></dt>
-				<dd><input id="n0" type="text" name="value[0]" value="<?php echo $_['property']['value'][0]; ?>"></dd>
+				<dd><input id="n0" type="text" name="value[0]" value="<?php echo htmlspecialchars($_['property']['value'][0]); ?>"></dd>
 				<dt><label for="n2"><?php echo $l->t('Additional names'); ?></dt>
-				<dd><input id="n2" type="text" name="value[2]" value="<?php echo $_['property']['value'][2]; ?>">
-				<input id="n3" type="hidden" name="value[3]" value="<?php echo $_['property']['value'][3]; ?>">
-				<input id="n4" type="hidden" name="value[4]" value="<?php echo $_['property']['value'][4]; ?>">
+				<dd><input id="n2" type="text" name="value[2]" value="<?php echo htmlspecialchars($_['property']['value'][2]); ?>">
+				<input id="n3" type="hidden" name="value[3]" value="<?php echo htmlspecialchars($_['property']['value'][3]); ?>">
+				<input id="n4" type="hidden" name="value[4]" value="<?php echo htmlspecialchars($_['property']['value'][4]); ?>">
 				</dd>
 			</dl>
 			</p>
 		<?php elseif($_['property']['name']=='FN'): ?>
-			<p class="contacts_property_data"><input id="fn" type="text" name="value" value="<?php echo $_['property']['value']; ?>"></p>
+			<p class="contacts_property_data"><input id="fn" type="text" name="value" value="<?php echo htmlspecialchars($_['property']['value']); ?>"></p>
 		<?php elseif($_['property']['name']=='ADR'): ?>
 			<p class="contacts_property_name"><label for="adr_pobox"><?php echo $l->t('Address'); ?></label></p>
 			<dl class="contacts_property_data form" id="contacts_addresspart">
@@ -32,60 +32,60 @@
 					<label for="adr_pobox"><?php echo $l->t('PO Box'); ?></label>
 				</dt>
 				<dd>
-					<input id="adr_pobox" type="text" name="value[0]" value="<?php echo $_['property']['value'][0] ?>">
+					<input id="adr_pobox" type="text" name="value[0]" value="<?php echo htmlspecialchars($_['property']['value'][0]) ?>">
 				</dd>
 				<!-- dt>
 					<label for="adr_extended"><?php echo $l->t('Extended'); ?></label>
 				</dt>
 				<dd>
-					<input style="width: 7em;" id="adr_extended" type="text" name="value[1]" value="<?php echo $_['property']['value'][1] ?>">
+					<input style="width: 7em;" id="adr_extended" type="text" name="value[1]" value="<?php echo htmlspecialchars($_['property']['value'][1]) ?>">
 				</dd -->
 				<dt>
 					<label for="adr_street"><?php echo $l->t('Street'); ?></label>
 				</dt>
 				<dd>
-					<input style="width: 12em;" id="adr_street" type="text" name="value[2]" value="<?php echo $_['property']['value'][2] ?>">
-					<label for="adr_extended"><?php echo $l->t('Extended'); ?></label><input style="width: 7em;" id="adr_extended" type="text" name="value[1]" value="<?php echo $_['property']['value'][1] ?>">
+					<input style="width: 12em;" id="adr_street" type="text" name="value[2]" value="<?php echo htmlspecialchars($_['property']['value'][2]) ?>">
+					<label for="adr_extended"><?php echo $l->t('Extended'); ?></label><input style="width: 7em;" id="adr_extended" type="text" name="value[1]" value="<?php echo htmlspecialchars($_['property']['value'][1]) ?>">
 				</dd>
 				<dt>
 					<label for="adr_city"><?php echo $l->t('City'); ?></label>
 				</dt>
 				<dd>
-					<input style="width: 12em;" id="adr_city" type="text" name="value[3]" value="<?php echo $_['property']['value'][3] ?>">
+					<input style="width: 12em;" id="adr_city" type="text" name="value[3]" value="<?php echo htmlspecialchars($_['property']['value'][3]) ?>">
 					<label for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
-					<input style="width: 5em;" id="adr_zipcode" type="text" name="value[5]" value="<?php echo $_['property']['value'][5] ?>">
+					<input style="width: 5em;" id="adr_zipcode" type="text" name="value[5]" value="<?php echo htmlspecialchars($_['property']['value'][5]) ?>">
 				</dd>
 				<dt>
 					<label for="adr_region"><?php echo $l->t('Region'); ?></label>
 				</dt>
 				<dd>
-					<input id="adr_region" type="text" name="value[4]" value="<?php echo $_['property']['value'][4] ?>">
+					<input id="adr_region" type="text" name="value[4]" value="<?php echo htmlspecialchars($_['property']['value'][4]) ?>">
 				</dd>
 				<!-- dt>
 					<label for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
 				</dt>
 				<dd>
-					<input style="width: 7em;" id="adr_zipcode" type="text" name="value[5]" value="<?php echo $_['property']['value'][5] ?>">
+					<input style="width: 7em;" id="adr_zipcode" type="text" name="value[5]" value="<?php echo htmlspecialchars($_['property']['value'][5]) ?>">
 				</dd -->
 				<dt>
 					<label for="adr_country"><?php echo $l->t('Country'); ?></label>
 				</dt>
 				<dd>
-					<input style="width: 25em;" id="adr_country" type="text" name="value[6]" value="<?php echo $_['property']['value'][6] ?>">
+					<input style="width: 25em;" id="adr_country" type="text" name="value[6]" value="<?php echo htmlspecialchars($_['property']['value'][6]) ?>">
 				</dd>
 			</dl>
 		<?php elseif($_['property']['name']=='TEL'): ?>
 			<p class="contacts_property_name"><label for="tel"><?php echo $l->t('Phone'); ?></label></p>
-			<p class="contacts_property_data"><input id="tel" type="phone" name="value" value="<?php echo $_['property']['value'] ?>">
+			<p class="contacts_property_data"><input id="tel" type="phone" name="value" value="<?php echo htmlspecialchars($_['property']['value']) ?>">
 				<select id="tel_type<?php echo $_['property']['checksum'] ?>" name="parameters[TYPE][]" multiple="multiple" data-placeholder="<?php echo $l->t('Type') ?>">
 					<?php echo html_select_options($_['phone_types'], isset($_['property']['parameters']['TYPE'])?$_['property']['parameters']['TYPE']:array()) ?>
 				</select></p>
 		<?php elseif($_['property']['name']=='EMAIL'): ?>
 			<p class="contacts_property_name"><label for="email"><?php echo $l->t('Email'); ?></label></p>
-			<p class="contacts_property_data"><input id="email" type="text" name="value" value="<?php echo $_['property']['value']; ?>"></p>
+			<p class="contacts_property_data"><input id="email" type="text" name="value" value="<?php echo htmlspecialchars($_['property']['value']); ?>"></p>
 		<?php elseif($_['property']['name']=='ORG'): ?>
 			<p class="contacts_property_name"><label for="org"><?php echo $l->t('Organization'); ?></label></p>
-			<p class="contacts_property_data"><input id="org" type="text" name="value" value="<?php echo $_['property']['value']; ?>"></p>
+			<p class="contacts_property_data"><input id="org" type="text" name="value" value="<?php echo htmlspecialchars($_['property']['value']); ?>"></p>
 		<?php endif; ?>
 		<input id="contacts_setproperty_button" type="submit" value="<?php echo $l->t('Update'); ?>">
 	</form>
-- 
GitLab


From 6225b5ec869922a8e292610794bfda0f4dfdd77d Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 2 Feb 2012 17:53:46 +0100
Subject: [PATCH 389/546] More in-/output sanitation,

---
 apps/contacts/ajax/createaddressbook.php                     | 2 +-
 apps/contacts/templates/part.chooseaddressbook.rowfields.php | 2 +-
 apps/contacts/templates/part.editaddressbook.php             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php
index edcf794f497..3d766b6a60a 100644
--- a/apps/contacts/ajax/createaddressbook.php
+++ b/apps/contacts/ajax/createaddressbook.php
@@ -15,7 +15,7 @@ OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 
 $userid = OC_User::getUser();
-$bookid = OC_Contacts_Addressbook::add($userid, $_POST['name'], null);
+$bookid = OC_Contacts_Addressbook::add($userid, strip_tags($_POST['name']), null);
 if(!$bookid) {
 	OC_JSON::error(array('data' => array('message' => $l->t('Error adding addressbook.'))));
 	OC_Log::write('contacts','ajax/createaddressbook.php: Error adding addressbook: '.$_POST['name'], OC_Log::ERROR);
diff --git a/apps/contacts/templates/part.chooseaddressbook.rowfields.php b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
index 0cbfe2bf803..95a4b2362aa 100644
--- a/apps/contacts/templates/part.chooseaddressbook.rowfields.php
+++ b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
@@ -1,5 +1,5 @@
 <?php
 	// FIXME: Make this readable.
 	echo "<td width=\"20px\"><input id=\"active_" . $_['addressbook']["id"] . "\" type=\"checkbox\" onClick=\"Contacts.UI.Addressbooks.activation(this, " . $_['addressbook']["id"] . ")\"" . (OC_Contacts_Addressbook::isActive($_['addressbook']["id"]) ? ' checked="checked"' : '') . "></td>";
-	echo "<td><label for=\"active_" . $_['addressbook']["id"] . "\">" . $_['addressbook']["displayname"] . "</label></td>";
+	echo "<td><label for=\"active_" . $_['addressbook']["id"] . "\">" . htmlspecialchars($_['addressbook']["displayname"]) . "</label></td>";
 	echo "<td width=\"20px\"><a href=\"#\" onclick=\"Contacts.UI.showCardDAVUrl('" . OC_User::getUser() . "', '" . $_['addressbook']["uri"] . "');\" title=\"" . $l->t("CardDav Link") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/public.svg\"></a></td><td width=\"20px\"><a href=\"export.php?bookid=" . $_['addressbook']["id"] . "\" title=\"" . $l->t("Download") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/download.svg\"></a></td><td width=\"20px\"><a  href=\"#\" title=\"" . $l->t("Edit") . "\" class=\"action\" onclick=\"Contacts.UI.Addressbooks.editAddressbook(this, " . $_['addressbook']["id"] . ");\"><img class=\"svg action\" src=\"../../core/img/actions/rename.svg\"></a></td><td width=\"20px\"><a href=\"#\" onclick=\"Contacts.UI.Addressbooks.deleteAddressbook('" . $_['addressbook']["id"] . "');\" title=\"" . $l->t("Delete") . "\" class=\"action\"><img  class=\"svg action\" src=\"../../core/img/actions/delete.svg\"></a></td>";
diff --git a/apps/contacts/templates/part.editaddressbook.php b/apps/contacts/templates/part.editaddressbook.php
index 48fe5c3b378..c1c585687c4 100644
--- a/apps/contacts/templates/part.editaddressbook.php
+++ b/apps/contacts/templates/part.editaddressbook.php
@@ -11,7 +11,7 @@
 <tr>
 	<th><?php echo $l->t('Displayname') ?></th>
 	<td>
-		<input id="displayname_<?php echo $_['addressbook']['id'] ?>" type="text" value="<?php echo $_['addressbook']['displayname'] ?>">
+		<input id="displayname_<?php echo $_['addressbook']['id'] ?>" type="text" value="<?php echo htmlspecialchars($_['addressbook']['displayname']) ?>">
 	</td>
 </tr>
 <?php if (!$_['new']): ?>
-- 
GitLab


From bfa69c3e591e0c9f930af7948364e1aae4bdff8b Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Thu, 2 Feb 2012 18:36:37 +0100
Subject: [PATCH 390/546] add a label calendar to the settings page - bugfix
 for oc-157

---
 apps/calendar/templates/settings.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
index fc8e0e061d9..e174378d02d 100644
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@ -9,6 +9,7 @@
 ?>
 <form id="calendar">
         <fieldset class="personalblock">
+	<strong><?php echo $l->t('Calendar'); ?></strong>
         <table class="nostyle">
             <tr><td><label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label></td><td><select style="display: none;" id="timezone" name="timezone">
                 <?php
-- 
GitLab


From 05d76dcd6768dc0b1417916cd24aa10d84c6eeb0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 2 Feb 2012 19:04:13 +0100
Subject: [PATCH 391/546] allow the usage of the filecache outside of the users
 home folder

---
 lib/filecache.php | 68 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 50 insertions(+), 18 deletions(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index a67ac669a76..b9f708951de 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -31,6 +31,7 @@ class OC_FileCache{
 	/**
 	 * get the filesystem info from the cache
 	 * @param string path
+	 * @param string root (optional)
 	 * @return array
 	 *
 	 * returns an assiciative array with the following keys:
@@ -41,8 +42,11 @@ class OC_FileCache{
 	 * - encrypted
 	 * - versioned
 	 */
-	public static function get($path){
-		$path=OC_Filesystem::getRoot().$path;
+	public static function get($path,$root=''){
+		if(!$root){
+			$root=OC_Filesystem::getRoot();
+		}
+		$path=$root.$path;
 		$query=OC_DB::prepare('SELECT ctime,mtime,mimetype,size,encrypted,versioned FROM *PREFIX*fscache WHERE path=?');
 		$result=$query->execute(array($path))->fetchRow();
 		if(is_array($result)){
@@ -57,11 +61,15 @@ class OC_FileCache{
 	 * put filesystem info in the cache
 	 * @param string $path
 	 * @param array data
+	 * @param string root (optional)
 	 *
 	 * $data is an assiciative array in the same format as returned by get
 	 */
-	public static function put($path,$data){
-		$path=OC_Filesystem::getRoot().$path;
+	public static function put($path,$data,$root=''){
+		if(!$root){
+			$root=OC_Filesystem::getRoot();
+		}
+		$path=$root.$path;
 		if($path=='/'){
 			$parent=-1;
 		}else{
@@ -112,10 +120,14 @@ class OC_FileCache{
 	 * register a file move in the cache
 	 * @param string oldPath
 	 * @param string newPath
+	 * @param string root (optional)
 	 */
-	public static function move($oldPath,$newPath){
-		$oldPath=OC_Filesystem::getRoot().$oldPath;
-		$newPath=OC_Filesystem::getRoot().$newPath;
+	public static function move($oldPath,$newPath,$root=''){
+		if(!$root){
+			$root=OC_Filesystem::getRoot();
+		}
+		$oldPath=$root.$oldPath;
+		$newPath=$root.$newPath;
 		$newParent=self::getParentId($newPath);
 		$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET parent=? ,name=?, path=? WHERE path=?');
 		$query->execute(array($newParent,basename($newPath),$newPath,$oldPath));
@@ -124,9 +136,13 @@ class OC_FileCache{
 	/**
 	 * delete info from the cache
 	 * @param string $path
+	 * @param string root (optional)
 	 */
-	public static function delete($path){
-		$path=OC_Filesystem::getRoot().$path;
+	public static function delete($path,$root=''){
+		if(!$root){
+			$root=OC_Filesystem::getRoot();
+		}
+		$path=$root.$path;
 		$query=OC_DB::prepare('DELETE FROM *PREFIX*fscache WHERE path=?');
 		$query->execute(array($path));
 	}
@@ -135,10 +151,13 @@ class OC_FileCache{
 	 * return array of filenames matching the querty
 	 * @param string $query
 	 * @param boolean $returnData
+	 * @param string root (optional)
 	 * @return array of filepaths
 	 */
-	public static function search($search,$returnData=false){
-		$root=OC_Filesystem::getRoot();
+	public static function search($search,$returnData=false,$root=''){
+		if(!$root){
+			$root=OC_Filesystem::getRoot();
+		}
 		$rootLen=strlen($root);
 		if(!$returnData){
 			$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE name LIKE ? AND user=?');
@@ -161,6 +180,7 @@ class OC_FileCache{
 	/**
 	 * get all files and folders in a folder
 	 * @param string path
+	 * @param string root (optional)
 	 * @return array
 	 *
 	 * returns an array of assiciative arrays with the following keys:
@@ -172,8 +192,11 @@ class OC_FileCache{
 	 * - encrypted
 	 * - versioned
 	 */
-	public static function getFolderContent($path){
-		$path=OC_Filesystem::getRoot().$path;
+	public static function getFolderContent($path,$root=''){
+		if(!$root){
+			$root=OC_Filesystem::getRoot();
+		}
+		$path=$root.$path;
 		$parent=self::getFileId($path);
 		$query=OC_DB::prepare('SELECT name,ctime,mtime,mimetype,size,encrypted,versioned FROM *PREFIX*fscache WHERE parent=?');
 		$result=$query->execute(array($parent))->fetchAll();
@@ -188,10 +211,14 @@ class OC_FileCache{
 	/**
 	 * check if a file or folder is in the cache
 	 * @param string $path
+	 * @param string root (optional)
 	 * @return bool
 	 */
-	public static function inCache($path){
-		$path=OC_Filesystem::getRoot().$path;
+	public static function inCache($path,$root=''){
+		if(!$root){
+			$root=OC_Filesystem::getRoot();
+		}
+		$path=$root.$path;
 		$inCache=self::getFileId($path)!=-1;
 		return $inCache;
 	}
@@ -301,9 +328,14 @@ class OC_FileCache{
 	 * recursively scan the filesystem and fill the cache
 	 * @param string $path
 	 * @param bool $onlyChilds
-	 * @param OC_EventSource $enventSource
+	 * @param OC_EventSource $enventSource (optional)
+	 * @param int count (optional)
+	 * @param string root (optional)
 	 */
-	public static function scan($path,$onlyChilds=false,$eventSource=false,&$count=0){
+	public static function scan($path,$onlyChilds=false,$eventSource=false,&$count=0,$root=''){
+		if(!$root){
+			$root=OC_Filesystem::getRoot();
+		}
 		$dh=OC_Filesystem::opendir($path);
 		$stat=OC_Filesystem::stat($path);
 		$mimetype=OC_Filesystem::getMimeType($path);
@@ -312,7 +344,7 @@ class OC_FileCache{
 			$path='';
 		}
 		self::put($path,$stat);
-		$fullPath=OC_Filesystem::getRoot().$path;
+		$fullPath=$root.$path;
 		$totalSize=0;
 		if($dh){
 			while (($filename = readdir($dh)) !== false) {
-- 
GitLab


From ab31a890b6049926f625f075874a86a6bf8e1019 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Thu, 2 Feb 2012 21:23:41 +0100
Subject: [PATCH 392/546] use strip_tags for calendar names

---
 apps/calendar/ajax/createcalendar.php | 2 +-
 apps/calendar/ajax/updatecalendar.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/ajax/createcalendar.php b/apps/calendar/ajax/createcalendar.php
index 08bf7b4ee49..8d7b12f9b89 100644
--- a/apps/calendar/ajax/createcalendar.php
+++ b/apps/calendar/ajax/createcalendar.php
@@ -25,7 +25,7 @@ foreach($calendars as $cal){
 }
 
 $userid = OC_User::getUser();
-$calendarid = OC_Calendar_Calendar::addCalendar($userid, htmlspecialchars($_POST['name']), 'VEVENT,VTODO,VJOURNAL', null, 0, $_POST['color']);
+$calendarid = OC_Calendar_Calendar::addCalendar($userid, strip_tags($_POST['name']), 'VEVENT,VTODO,VJOURNAL', null, 0, $_POST['color']);
 OC_Calendar_Calendar::setCalendarActive($calendarid, 1);
 
 $calendar = OC_Calendar_Calendar::find($calendarid);
diff --git a/apps/calendar/ajax/updatecalendar.php b/apps/calendar/ajax/updatecalendar.php
index 90dafd35b68..5add6d92bfa 100644
--- a/apps/calendar/ajax/updatecalendar.php
+++ b/apps/calendar/ajax/updatecalendar.php
@@ -26,7 +26,7 @@ foreach($calendars as $cal){
 
 $calendarid = $_POST['id'];
 $calendar = OC_Calendar_App::getCalendar($calendarid);//access check
-OC_Calendar_Calendar::editCalendar($calendarid, htmlspecialchars($_POST['name']), null, null, null, $_POST['color']);
+OC_Calendar_Calendar::editCalendar($calendarid, strip_tags($_POST['name']), null, null, null, $_POST['color']);
 OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
 
 $calendar = OC_Calendar_App::getCalendar($calendarid);
-- 
GitLab


From ee01d1a81d561fb41916bb3d231452956317b7bc Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Fri, 3 Feb 2012 21:37:09 +0100
Subject: [PATCH 393/546] removing console error in safari for bookmarks

---
 apps/bookmarks/js/bookmarks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index b43c3deb59c..77f767cdb81 100644
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -137,7 +137,7 @@ function showBookmark(event) {
 		$('.bookmarks_add').slideToggle();
 	}
 	$('html, body').animate({
-			scrollTop: $('.bookmarks_menu').offset().top
+      scrollTop: ($('.bookmarks_menu'))?$('.bookmarks_menu').offset().top:0
 		}, 500);
 
 }
-- 
GitLab


From 8df065065892ecfb1a3e6d31294d332fa8e4daf6 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Fri, 3 Feb 2012 21:38:44 +0100
Subject: [PATCH 394/546] gallery settings, defining scan root and shor order

---
 apps/gallery/ajax/galleryOp.php  | 30 ++++++++++++++++--
 apps/gallery/css/styles.css      |  3 ++
 apps/gallery/js/album_cover.js   | 52 +++++++++++++++++++++++++++++---
 apps/gallery/js/albums.js        |  6 +++-
 apps/gallery/lib/album.php       | 11 ++++++-
 apps/gallery/templates/index.php | 28 ++++++++++++++++-
 6 files changed, 119 insertions(+), 11 deletions(-)

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index 0c2674f8859..187cd8af292 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -54,9 +54,11 @@ function handleGalleryScanning() {
   OC_JSON::success(array('albums' => OC_Gallery_Scanner::scan('/')));
 }
 
-function handleFilescan() {
+function handleFilescan($cleanup) {
   OC_JSON::checkLoggedIn();
-  $pathlist = OC_Gallery_Scanner::find_paths('/');
+  if ($cleanup) OC_Gallery_Album::cleanup();
+  $root = OC_Appconfig::getValue('gallery', 'root', '').'/';
+  $pathlist = OC_Gallery_Scanner::find_paths($root);
   sort($pathlist);
   OC_JSON::success(array('paths' => $pathlist));
 }
@@ -72,6 +74,25 @@ function handlePartialCreate($path) {
   OC_JSON::success(array('album_details' => $albums));
 }
 
+function handleStoreSettings($root, $order) {
+  OC_JSON::checkLoggedIn();
+  if (!OC_Filesystem::file_exists($root)) {
+    OC_JSON::error(array('cause' => 'No such file or directory'));
+    return;
+  }
+  if (!OC_Filesystem::is_dir($root)) {
+    OC_JSON::error(array('cause' => $root . ' is not a directory'));
+    return;
+  }
+
+  $current_root = OC_Appconfig::getValue('gallery', 'root', '/');
+  $root = trim(rtrim($root, '/'));
+  $rescan = $current_root==$root?'no':'yes';
+  OC_Appconfig::setValue('gallery', 'root', $root);
+  OC_Appconfig::setValue('gallery', 'order', $order);
+  OC_JSON::success(array('rescan' => $rescan));
+}
+
 if ($_GET['operation']) {
   switch($_GET['operation']) {
   case 'rename':
@@ -89,11 +110,14 @@ if ($_GET['operation']) {
     handleGalleryScanning();
     break;
   case 'filescan':
-    handleFilescan();
+    handleFilescan($_GET['cleanup']);
     break;
   case 'partial_create':
     handlePartialCreate($_GET['path']);
     break;
+  case 'store_settings':
+    handleStoreSettings($_GET['root'], $_GET['order']);
+    break;
   default:
     OC_JSON::error(array('cause' => 'Unknown operation'));
   }
diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index 7872b6445ca..c039cd5ec02 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -12,3 +12,6 @@ div.gallery_control_overlay a { color:white; }
 #gallery_images.rightcontent { padding:10px 5px; bottom: 0px; overflow: auto; right:0px}
 #scan { position:absolute; right:13.5em; top:0em; }
 #scan #scanprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
+#g-settings {position: absolute; left 13.5em; top: 0;}
+input[type=button] { -webkit-transition: opacity 0.5s ease-in-out; -moz-transition: opacity 0.5s ease-in-out; -o-transition: opacity 0.5s ease-in-out; opacity: 1}
+input[type=button]:disabled { opacity: 0.5 }
diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index e78db221cff..4ddac2f2111 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -38,10 +38,12 @@ function createNewAlbum() {
 var albumCounter = 0;
 var totalAlbums = 0;
 
-function scanForAlbums() {
+function scanForAlbums(cleanup) {
+  cleanup = cleanup?true:false;
   var albumCounter = 0;
   var totalAlbums = 0;
-  $.getJSON('ajax/galleryOp.php?operation=filescan', function(r) {
+  $('#g-scan-button').attr('disabled', 'true');
+  $.getJSON('ajax/galleryOp.php?operation=filescan', {cleanup: cleanup}, function(r) {
 
     if (r.status == 'success') {
       totalAlbums = r.paths.length;
@@ -68,6 +70,7 @@ function scanForAlbums() {
             } else {
               alert('Error occured: no such layer `gallery_list`');
             }
+            $('#g-scan-button').attr('disabled', null);
           }
         });
       }
@@ -125,13 +128,13 @@ function galleryRename(name) {
                 $(this).dialog("close");
                 return;
               }
-              $.getJSON("ajax/galleryOp.php", {operation: "rename", oldname: name, newname: newname}, function(r) {
+              $.getJSON('ajax/galleryOp.php', {operation: 'rename', oldname: name, newname: newname}, function(r) {
                 if (r.status == "success") {
                   Albums.rename($(".gallery_album_box").filterAttr('data-album',name), newname);
                 } else {
                   alert("Error: " + r.cause);
                 }
-                $('#dialog-form').dialog("close");
+                $('#dialog-form').dialog('close');
               });
 
             }
@@ -139,10 +142,49 @@ function galleryRename(name) {
           {
             text: t('gallery', 'Cancel'),
             click: function() {
-              $( this ).dialog( "close" );
+              $( this ).dialog('close');
             }
           }
         ],
   });
 }
 
+function settings() {
+  $( '#g-dialog-settings' ).dialog({
+        height: 180,
+        width: 350,
+        modal: false,
+        buttons: [{
+            text: t('gallery', 'Apply'),
+            click: function() {
+              var scanning_root = $('#g-scanning-root').val();
+              var disp_order = $('#g-display-order option:selected').val();
+              if (scanning_root == '') {
+                alert('Scanning root cannot be empty');
+                return;
+              }
+              $.getJSON('ajax/galleryOp.php', {operation: 'store_settings', root: scanning_root, order: disp_order}, function(r) {
+                if (r.status == 'success') {
+                  if (r.rescan == 'yes') { 
+                    $('#g-dialog-settings').dialog('close');
+                    Albums.clear(document.getElementById('gallery_list'));
+                    scanForAlbums(true);
+                    return;
+                  }
+                } else {
+                  alert('Error: ' + r.cause);
+                  return;
+                }
+                $('#g-dialog-settings').dialog('close');
+              });
+            }
+          },
+          {
+            text: t('gallery', 'Cancel'),
+            click: function() {
+              $(this).dialog('close');
+            }
+          }
+        ],
+  });
+}
diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index d2b4d858b55..01e146a2f12 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -52,7 +52,7 @@ Albums={
     });
 	  $(".gallery_album_decoration a.remove", local).bind('click', {name: a.name},function(event){
 		  event.preventDefault();
-		  galleryRemove(a.data.name);
+		  galleryRemove(event.data.name);
     });
 	  $("a.view", local).attr('href','?view='+a.name);
 	  $('h1',local).text(a.name);
@@ -80,6 +80,10 @@ Albums={
 		$("a.view", element).attr("href", "?view="+new_name);
 		$("h1", element).text(new_name);
 	}
+  },
+  clear: function(element) {
+    Albums.albums = new Array();
+    element.innerHTML = '';
   }
 
 }
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 4eb12cc0b81..502237481a9 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -31,6 +31,14 @@ class OC_Gallery_Album {
 	    $stmt = OC_DB::prepare('UPDATE *PREFIX*gallery_albums SET album_name=? WHERE uid_owner=? AND album_name=?');
 		$stmt->execute(array($newname, $owner, $oldname));
 	}
+
+  public static function cleanup() {
+    $albums = self::find(OC_User::getUser());
+    while ($r = $albums->fetchRow()) {
+      OC_Gallery_Photo::removeByAlbumId($r['album_id']);
+      self::remove(OC_User::getUser(), $r['album_name']);
+    }
+  }
 	
 	public static function remove($owner, $name=null) {
 		$sql = 'DELETE FROM *PREFIX*gallery_albums WHERE uid_owner = ?';
@@ -69,7 +77,8 @@ class OC_Gallery_Album {
       $sql .= ' AND album_path = ?';
       $args[] = $path;
     }
-    $sql .= ' ORDER BY album_name ASC';
+    $order = OC_Appconfig::getValue('gallery', 'order', 'ASC');
+    $sql .= ' ORDER BY album_name ' . $order;
 
 		$stmt = OC_DB::prepare($sql);
 		return $stmt->execute($args);
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 4c2fbcfe6c6..4e74be4c64e 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -9,7 +9,10 @@ $l = new OC_L10N('gallery');
 <div id="controls">
   <div id="scan">
     <div id="scanprogressbar"></div>
-    <input type="button" value="<?php echo $l->t('Rescan');?>" onclick="javascript:scanForAlbums();" />
+    <input type="button" id="g-scan-button" value="<?php echo $l->t('Rescan');?>" onclick="javascript:scanForAlbums();" />
+  </div>
+  <div id="g-settings">
+    <input type="button" id="g-settings-button" value="<?php echo $l->t('Settings');?>" onclick="javascript:settings();"/>
   </div>
 </div>
 <div id="gallery_list">
@@ -28,3 +31,26 @@ $l = new OC_L10N('gallery');
 	</form>
 </div>
 
+<div id="g-dialog-settings" title="<?php echo $l->t('Settings');?>" style="display:none">
+	<form>
+    <fieldset><?php $root = OC_Appconfig::getValue('gallery', 'root', '/'); $order = OC_Appconfig::getValue('gallery', 'order', 'ASC');?>
+    <label for="name"><?php echo $l->t('Scanning root');?></label>
+    <input type="text" name="g-scanning-root" id="g-scanning-root" class="text ui-widget-content ui-corner-all" value="<?php echo $root;?>" /><br/>
+
+    <label for="sort"><?php echo $l->t('Default sorting'); ?></label>
+    <select id="g-display-order">
+      <option value="ASC"<?php echo $order=='ASC'?'selected':'';?>><?php echo $l->t('Ascending'); ?></option>
+      <option value="DESC"<?php echo $order=='DESC'?'selected':'';?>><?php echo $l->t('Descending'); ?></option>
+    </select><br/>
+<!--
+    <label for="sort"><?php echo $l->t('Thumbnails size'); ?></label>
+    <select>
+      <option value="100">100px</option>
+      <option value="150">150px</option>
+      <option value="200">200px</option>
+      </select>
+      -->
+	</fieldset>
+	</form>
+</div>
+
-- 
GitLab


From 5a106d10361865dfd5cffe8809caee73ff410c4c Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 4 Feb 2012 10:30:32 +0100
Subject: [PATCH 395/546] gallery: fix FS hooks

---
 apps/gallery/lib/album.php          |  1 +
 apps/gallery/lib/hooks_handlers.php | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 502237481a9..167813a1a31 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -54,6 +54,7 @@ class OC_Gallery_Album {
   public static function removeByPath($path, $owner) {
     $album = self::find($owner, null, $path);
     $album = $album->fetchRow();
+    error_log($path . '--' . $album['album_name']);
     self::remove($owner, $album['album_name']);
     OC_Gallery_Photo::removeByAlbumId($album['album_id']);
     // find and remove any gallery which might be stored lower in dir hierarchy
diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
index 236a4b96a07..605cb0d0037 100644
--- a/apps/gallery/lib/hooks_handlers.php
+++ b/apps/gallery/lib/hooks_handlers.php
@@ -58,12 +58,18 @@ class OC_Gallery_Hooks_Handlers {
     return OC_Gallery_Album::find(OC_User::getUser(), null, $path);
   }
 
+  public static function pathInRoot($path) {
+    $root = OC_Appconfig::getValue('gallery', 'root', '/');
+    return substr($path, 0, strlen($path)>strlen($root)?strlen($root):strlen($path)) == $root;
+  }
+
   public static function addPhotoFromPath($params) {
     $fullpath = $params[OC_Filesystem::signal_param_path];
 
     if (!self::isPhoto($fullpath)) return;
 
     $path = substr($fullpath, 0, strrpos($fullpath, '/'));
+    if (!self::pathInRoot($path)) return;
     OC_Gallery_Scanner::scanDir($path, $albums);
 
   }
@@ -71,8 +77,8 @@ class OC_Gallery_Hooks_Handlers {
   public static function removePhoto($params) {
     $path = $params[OC_Filesystem::signal_param_path];
     if (OC_Filesystem::is_dir($path) && self::directoryContainsPhotos($path)) {
-      OC_Gallery_Album::removeByPath($path, OC_User::getUser());
-      OC_Gallery_Photo::removeByPath($path.'/%');
+      if(!self::pathInRoot($path)) return;
+      OC_Gallery_Album::removeByPath($path.'/', OC_User::getUser());
     } elseif (self::isPhoto($path)) {
       OC_Gallery_Photo::removeByPath($path);
     }
-- 
GitLab


From f1672d7d10477026cfa4f49a8ec7c71e03f3f6ba Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 4 Feb 2012 11:02:13 +0100
Subject: [PATCH 396/546] handling special chars in dirnames

---
 apps/gallery/ajax/galleryOp.php | 4 ++--
 apps/gallery/js/albums.js       | 4 ++--
 apps/gallery/lib/album.php      | 1 -
 apps/gallery/lib/scanner.php    | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index 187cd8af292..1233b49052f 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -104,7 +104,7 @@ if ($_GET['operation']) {
 	  OC_JSON::success();
     break;
   case 'get_covers':
-    handleGetThumbnails($_GET['albumname']);
+    handleGetThumbnails(urldecode($_GET['albumname']));
     break;
   case 'scan':
     handleGalleryScanning();
@@ -113,7 +113,7 @@ if ($_GET['operation']) {
     handleFilescan($_GET['cleanup']);
     break;
   case 'partial_create':
-    handlePartialCreate($_GET['path']);
+    handlePartialCreate(urldecode($_GET['path']));
     break;
   case 'store_settings':
     handleStoreSettings($_GET['root'], $_GET['order']);
diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index 01e146a2f12..987412f28e0 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -54,12 +54,12 @@ Albums={
 		  event.preventDefault();
 		  galleryRemove(event.data.name);
     });
-	  $("a.view", local).attr('href','?view='+a.name);
+    $("a.view", local).attr('href','?view='+escape(a.name));
 	  $('h1',local).text(a.name);
 	  $(".gallery_album_cover", local).attr('title',a.name);
       $(".gallery_album_cover", local).css('background-repeat', 'no-repeat');
       $(".gallery_album_cover", local).css('background-position', '0');
-      $(".gallery_album_cover", local).css('background-image','url("ajax/galleryOp.php?operation=get_covers&albumname='+a.name+'")');
+      $(".gallery_album_cover", local).css('background-image','url("ajax/galleryOp.php?operation=get_covers&albumname='+escape(a.name)+'")');
       $(".gallery_album_cover", local).mousemove(function(e) {
 
         var albumMetadata = Albums.find(this.title);
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 167813a1a31..502237481a9 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -54,7 +54,6 @@ class OC_Gallery_Album {
   public static function removeByPath($path, $owner) {
     $album = self::find($owner, null, $path);
     $album = $album->fetchRow();
-    error_log($path . '--' . $album['album_name']);
     self::remove($owner, $album['album_name']);
     OC_Gallery_Photo::removeByAlbumId($album['album_id']);
     // find and remove any gallery which might be stored lower in dir hierarchy
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index dfb9edebfea..2af63d8bf0e 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -106,7 +106,7 @@ class OC_Gallery_Scanner {
       if (self::isPhoto($path.$file)) $addpath = TRUE;
     }
 
-    if ($addpath) $ret[] = $path;
+    if ($addpath) $ret[] = urlencode($path);
 
     return $ret;
   }
-- 
GitLab


From f6a27dfa2898ab23527d4efe8063ff32895b52e8 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 4 Feb 2012 15:35:58 +0100
Subject: [PATCH 397/546] stripping root from gallery name

---
 apps/gallery/lib/scanner.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index 2af63d8bf0e..13800f48e69 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -39,12 +39,19 @@ class OC_Gallery_Scanner {
     $stmt->execute(array());
   }
 
+  public static function createName($name) {
+    $root = OC_Appconfig::getValue('gallery', 'root', '/');
+    $name = str_replace('/', '.', str_replace(OC::$CONFIG_DATADIRECTORY, '', $name));
+    if (substr($name, 0, strlen($root)) == str_replace('/','.',$root)) {
+      $name = substr($name, strlen($root));
+    }
+    $name = ($name==='.') ? 'main' : trim($name,'.');
+    return $name;
+  }
+
   public static function scanDir($path, &$albums) {
     $current_album = array('name'=> $path, 'imagesCount' => 0, 'images' => array());
-    $current_album['name'] = str_replace('/', '.', str_replace(OC::$CONFIG_DATADIRECTORY, '', $current_album['name']));
-    $current_album['name'] = ($current_album['name']==='.') ?
-                             'main' :
-                             trim($current_album['name'],'.');
+    $current_album['name'] = self::createName($current_album['name']);
 
     if ($dh = OC_Filesystem::opendir($path)) {
       while (($filename = readdir($dh)) !== false) {
-- 
GitLab


From cfc710e7683a3e16e80fd0f2b6e8bef047e8502c Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 4 Feb 2012 20:15:55 +0100
Subject: [PATCH 398/546] preferences store fix

---
 apps/gallery/ajax/galleryOp.php     | 8 ++++----
 apps/gallery/lib/album.php          | 2 +-
 apps/gallery/lib/hooks_handlers.php | 2 +-
 apps/gallery/lib/scanner.php        | 2 +-
 apps/gallery/templates/index.php    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index 1233b49052f..f819d87f666 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -57,7 +57,7 @@ function handleGalleryScanning() {
 function handleFilescan($cleanup) {
   OC_JSON::checkLoggedIn();
   if ($cleanup) OC_Gallery_Album::cleanup();
-  $root = OC_Appconfig::getValue('gallery', 'root', '').'/';
+  $root = OC_Preferences::getValue(OC_User::getUser(), 'gallery', 'root', '').'/';
   $pathlist = OC_Gallery_Scanner::find_paths($root);
   sort($pathlist);
   OC_JSON::success(array('paths' => $pathlist));
@@ -85,11 +85,11 @@ function handleStoreSettings($root, $order) {
     return;
   }
 
-  $current_root = OC_Appconfig::getValue('gallery', 'root', '/');
+  $current_root = OC_Preferences::getValue(OC_User::getUser(),'gallery', 'root', '/');
   $root = trim(rtrim($root, '/'));
   $rescan = $current_root==$root?'no':'yes';
-  OC_Appconfig::setValue('gallery', 'root', $root);
-  OC_Appconfig::setValue('gallery', 'order', $order);
+  OC_Preferences::setValue(OC_User::getUser(), 'gallery', 'root', $root);
+  OC_Preferences::setValue(OC_User::getUser(), 'gallery', 'order', $order);
   OC_JSON::success(array('rescan' => $rescan));
 }
 
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 502237481a9..d1405333ac7 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -77,7 +77,7 @@ class OC_Gallery_Album {
       $sql .= ' AND album_path = ?';
       $args[] = $path;
     }
-    $order = OC_Appconfig::getValue('gallery', 'order', 'ASC');
+    $order = OC_Preferences::getValue(OC_User::getUser(), 'gallery', 'order', 'ASC');
     $sql .= ' ORDER BY album_name ' . $order;
 
 		$stmt = OC_DB::prepare($sql);
diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
index 605cb0d0037..046866e5c5d 100644
--- a/apps/gallery/lib/hooks_handlers.php
+++ b/apps/gallery/lib/hooks_handlers.php
@@ -59,7 +59,7 @@ class OC_Gallery_Hooks_Handlers {
   }
 
   public static function pathInRoot($path) {
-    $root = OC_Appconfig::getValue('gallery', 'root', '/');
+    $root = OC_Preferences::getValue(OC_User::getUser(), 'gallery', 'root', '/');
     return substr($path, 0, strlen($path)>strlen($root)?strlen($root):strlen($path)) == $root;
   }
 
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index 13800f48e69..3aae94d1a4f 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -40,7 +40,7 @@ class OC_Gallery_Scanner {
   }
 
   public static function createName($name) {
-    $root = OC_Appconfig::getValue('gallery', 'root', '/');
+    $root = OC_Preferences::getValue(OC_User::getUser(), 'gallery', 'root', '/');
     $name = str_replace('/', '.', str_replace(OC::$CONFIG_DATADIRECTORY, '', $name));
     if (substr($name, 0, strlen($root)) == str_replace('/','.',$root)) {
       $name = substr($name, strlen($root));
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 4e74be4c64e..7cc7dad3ac6 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -33,7 +33,7 @@ $l = new OC_L10N('gallery');
 
 <div id="g-dialog-settings" title="<?php echo $l->t('Settings');?>" style="display:none">
 	<form>
-    <fieldset><?php $root = OC_Appconfig::getValue('gallery', 'root', '/'); $order = OC_Appconfig::getValue('gallery', 'order', 'ASC');?>
+    <fieldset><?php $root = OC_Preferences::getValue(OC_User::getUser(), 'gallery', 'root', '/'); $order = OC_Preferences::getValue(OC_User::getUser(), 'gallery', 'order', 'ASC');?>
     <label for="name"><?php echo $l->t('Scanning root');?></label>
     <input type="text" name="g-scanning-root" id="g-scanning-root" class="text ui-widget-content ui-corner-all" value="<?php echo $root;?>" /><br/>
 
-- 
GitLab


From 493ba20734484a29f4cfde5ebbcae06794ea78b9 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sat, 4 Feb 2012 23:40:47 +0000
Subject: [PATCH 399/546] Updated readme url for install instructions

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index cd562b66c6c..4d4be2728e1 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ A personal cloud which runs on your own server.
 
 http://ownCloud.org
 
-Installation instructions: http://owncloud.org/support
+Installation instructions: http://owncloud.org/support/setup-and-installation/
 Source code: http://gitorious.org/owncloud
 
 Mailing list: http://mail.kde.org/mailman/listinfo/owncloud
-- 
GitLab


From 7c00aedc37cf039ec23c54429d5188ab7d219b7e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 5 Feb 2012 01:23:04 +0100
Subject: [PATCH 400/546] some improvements in file scanning

---
 files/ajax/scan.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/files/ajax/scan.php b/files/ajax/scan.php
index f7e75d5f8ba..565275911b4 100644
--- a/files/ajax/scan.php
+++ b/files/ajax/scan.php
@@ -15,13 +15,19 @@ if(!$checkOnly){
 //create the file cache if necesary
 if($force or !OC_FileCache::inCache('')){
 	if(!$checkOnly){
-		OC_FileCache::scan('',false,$eventSource);
+		OC_DB::beginTransaction();
+		OC_FileCache::scan('',$eventSource);
+		OC_DB::commit();
 		$eventSource->send('success',true);
 	}else{
 		OC_JSON::success(array('data'=>array('done'=>true)));
 		exit;
 	}
 }else{
+	if($checkOnly){
+		OC_JSON::success(array('data'=>array('done'=>false)));
+		exit;
+	}
 	if(isset($eventSource)){
 		$eventSource->send('success',false);
 	}else{
-- 
GitLab


From 0bb48d814bff0cfba0606818b36599c000b16a51 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 5 Feb 2012 01:23:41 +0100
Subject: [PATCH 401/546] fix bug in transactions with PDO

---
 lib/db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/db.php b/lib/db.php
index 4860651b323..82d9b67dca8 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -486,7 +486,7 @@ class OC_DB {
 	 */
 	public static function beginTransaction(){
 		self::connect();
-		if (self::$backend=self::BACKEND_MDB2 && !self::$connection->supports('transactions')) {
+		if (self::$backend==self::BACKEND_MDB2 && !self::$connection->supports('transactions')) {
 			return false;
 		}
 		self::$connection->beginTransaction();
-- 
GitLab


From 90c4666b12e0fb2da8f0e15a018d8edd736f4f4f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 5 Feb 2012 01:23:41 +0100
Subject: [PATCH 402/546] fix bug in transactions with PDO

---
 lib/db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/db.php b/lib/db.php
index 4860651b323..82d9b67dca8 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -486,7 +486,7 @@ class OC_DB {
 	 */
 	public static function beginTransaction(){
 		self::connect();
-		if (self::$backend=self::BACKEND_MDB2 && !self::$connection->supports('transactions')) {
+		if (self::$backend==self::BACKEND_MDB2 && !self::$connection->supports('transactions')) {
 			return false;
 		}
 		self::$connection->beginTransaction();
-- 
GitLab


From 25e777ef5e9c68ac45d32b71a0174febf74d47ef Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 5 Feb 2012 01:25:36 +0100
Subject: [PATCH 403/546] watch for changes outside owncloud to the files

---
 lib/filecache.php  | 261 +++++++++++++++++++++++++++++++++++++--------
 lib/filesystem.php |   8 ++
 2 files changed, 222 insertions(+), 47 deletions(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index b9f708951de..c51fee60bfe 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -43,9 +43,19 @@ class OC_FileCache{
 	 * - versioned
 	 */
 	public static function get($path,$root=''){
+		if(self::isUpdated($path,$root)){
+			if(!$root){//filesystem hooks are only valid for the default root
+				OC_Hook::emit('OC_Filesystem','post_write',array('path'=>$path));
+			}else{
+				self::fileSystemWatcherWrite(array('path'=>$path),$root);
+			}
+		}
 		if(!$root){
 			$root=OC_Filesystem::getRoot();
 		}
+		if($root=='/'){
+			$root='';
+		}
 		$path=$root.$path;
 		$query=OC_DB::prepare('SELECT ctime,mtime,mimetype,size,encrypted,versioned FROM *PREFIX*fscache WHERE path=?');
 		$result=$query->execute(array($path))->fetchRow();
@@ -69,6 +79,9 @@ class OC_FileCache{
 		if(!$root){
 			$root=OC_Filesystem::getRoot();
 		}
+		if($root=='/'){
+			$root='';
+		}
 		$path=$root.$path;
 		if($path=='/'){
 			$parent=-1;
@@ -126,6 +139,9 @@ class OC_FileCache{
 		if(!$root){
 			$root=OC_Filesystem::getRoot();
 		}
+		if($root=='/'){
+			$root='';
+		}
 		$oldPath=$root.$oldPath;
 		$newPath=$root.$newPath;
 		$newParent=self::getParentId($newPath);
@@ -142,6 +158,9 @@ class OC_FileCache{
 		if(!$root){
 			$root=OC_Filesystem::getRoot();
 		}
+		if($root=='/'){
+			$root='';
+		}
 		$path=$root.$path;
 		$query=OC_DB::prepare('DELETE FROM *PREFIX*fscache WHERE path=?');
 		$query->execute(array($path));
@@ -158,6 +177,9 @@ class OC_FileCache{
 		if(!$root){
 			$root=OC_Filesystem::getRoot();
 		}
+		if($root=='/'){
+			$root='';
+		}
 		$rootLen=strlen($root);
 		if(!$returnData){
 			$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE name LIKE ? AND user=?');
@@ -193,9 +215,15 @@ class OC_FileCache{
 	 * - versioned
 	 */
 	public static function getFolderContent($path,$root=''){
+		if(self::isUpdated($path,$root)){
+			self::updateFolder($path,$root);
+		}
 		if(!$root){
 			$root=OC_Filesystem::getRoot();
 		}
+		if($root=='/'){
+			$root='';
+		}
 		$path=$root.$path;
 		$parent=self::getFileId($path);
 		$query=OC_DB::prepare('SELECT name,ctime,mtime,mimetype,size,encrypted,versioned FROM *PREFIX*fscache WHERE parent=?');
@@ -218,9 +246,11 @@ class OC_FileCache{
 		if(!$root){
 			$root=OC_Filesystem::getRoot();
 		}
+		if($root=='/'){
+			$root='';
+		}
 		$path=$root.$path;
-		$inCache=self::getFileId($path)!=-1;
-		return $inCache;
+		return self::getFileId($path)!=-1;
 	}
 
 	/**
@@ -254,51 +284,96 @@ class OC_FileCache{
 
 	/**
 	 * called when changes are made to files
+	 * @param array $params
+	 * @param string root (optional)
 	 */
-	public static function fileSystemWatcherWrite($params){
+	public static function fileSystemWatcherWrite($params,$root=''){
+		if(!$root){
+			$view=OC_Filesystem::getView();
+		}else{
+			$view=new OC_FilesystemView(($root=='/')?'':$root);
+		}
 		$path=$params['path'];
-		$fullPath=OC_Filesystem::getRoot().$path;
-		$mimetype=OC_Filesystem::getMimeType($path);
+		$fullPath=$view->getRoot().$path;
+		$mimetype=$view->getMimeType($path);
+		//dont use self::get here, we don't want inifinte loops when a file has changed
+		$cachedSize=self::getCachedSize($path,$root);
 		if($mimetype=='httpd/unix-directory'){
-			$size=0;
-		}else{
-			$id=self::getFileId($fullPath);
-			if($id!=-1){
-				$oldInfo=self::get($path);
-				$oldSize=$oldInfo['size'];
+			if(self::inCache($path,$root)){
+				$size=0;
+				$parent=self::getFileId($fullPath);
+				$query=OC_DB::prepare('SELECT size FROM *PREFIX*fscache WHERE parent=?');
+				$query->execute(array($parent));
+				while($row=$query->fetch()){
+					$size+=$row['size'];
+				}
+				$mtime=$view->filemtime($path);
+				$ctime=$view->filectime($path);
+				self::put($path,array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype));
 			}else{
-				$oldSize=0;
+				self::scan($path,null,0,$root);
 			}
-			$size=OC_Filesystem::filesize($path);
-			self::increaseSize(dirname($fullPath),$size-$oldSize);
+		}else{
+			$size=self::scanFile($path,$root);
+		}
+		self::increaseSize(dirname($fullPath),$size-$cachedSize);
+	}
+
+	private static function getCachedSize($path,$root){
+		if(!$root){
+			$root=OC_Filesystem::getRoot();
+		}else{
+			if($root=='/'){
+				$root='';
+			}
+		}
+		$query=OC_DB::prepare('SELECT size FROM *PREFIX*fscache WHERE path=?');
+		$query->execute(array($path));
+		if($row=$query->fetch()){
+			return $row['size'];
+		}else{//file not in cache
+			return 0;
 		}
-		$mtime=OC_Filesystem::filemtime($path);
-		$ctime=OC_Filesystem::filectime($path);
-		self::put($path,array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype));
 	}
 
 	/**
 	 * called when files are deleted
+	 * @param array $params
+	 * @param string root (optional)
 	 */
-	public static function fileSystemWatcherDelete($params){
+	public static function fileSystemWatcherDelete($params,$root=''){
+		if(!$root){
+			$root=OC_Filesystem::getRoot();
+		}
+		if($root=='/'){
+			$root='';
+		}
 		$path=$params['path'];
-		$fullPath=OC_Filesystem::getRoot().$path;
+		$fullPath=$root.$path;
 		if(self::getFileId($fullPath)==-1){
 			return;
 		}
-		$size=OC_Filesystem::filesize($path);
+		$size=self::getCachedSize($path,$root);
 		self::increaseSize(dirname($fullPath),-$size);
 		self::delete($path);
 	}
 
 	/**
 	 * called when files are deleted
+	 * @param array $params
+	 * @param string root (optional)
 	 */
-	public static function fileSystemWatcherRename($params){
+	public static function fileSystemWatcherRename($params,$root=''){
+		if(!$root){
+			$root=OC_Filesystem::getRoot();
+		}
+		if($root=='/'){
+			$root='';
+		}
 		$oldPath=$params['oldpath'];
 		$newPath=$params['newpath'];
-		$fullOldPath=OC_Filesystem::getRoot().$oldPath;
-		$fullNewPath=OC_Filesystem::getRoot().$newPath;
+		$fullOldPath=$root.$oldPath;
+		$fullNewPath=$root.$newPath;
 		if(($id=self::getFileId($fullOldPath))!=-1){
 			$oldInfo=self::get($fullOldPath);
 			$oldSize=$oldInfo['size'];
@@ -317,7 +392,8 @@ class OC_FileCache{
 	 * @param int $sizeDiff
 	 */
 	private static function increaseSize($path,$sizeDiff){
-		while(($id=self::getFileId($path))!=-1){
+		if($sizeDiff==0) return;
+		while(($id=self::getFileId($path))!=-1){//walk up the filetree increasing the size of all parent folders
 			$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET size=size+? WHERE id=?');
 			$query->execute(array($sizeDiff,$id));
 			$path=dirname($path);
@@ -327,46 +403,59 @@ class OC_FileCache{
 	/**
 	 * recursively scan the filesystem and fill the cache
 	 * @param string $path
-	 * @param bool $onlyChilds
 	 * @param OC_EventSource $enventSource (optional)
 	 * @param int count (optional)
-	 * @param string root (optional)
+	 * @param string root (optionak)
 	 */
-	public static function scan($path,$onlyChilds=false,$eventSource=false,&$count=0,$root=''){
+	public static function scan($path,$eventSource=false,&$count=0,$root=''){
 		if(!$root){
-			$root=OC_Filesystem::getRoot();
-		}
-		$dh=OC_Filesystem::opendir($path);
-		$stat=OC_Filesystem::stat($path);
-		$mimetype=OC_Filesystem::getMimeType($path);
-		$stat['mimetype']=$mimetype;
-		if($path=='/'){
-			$path='';
+			$view=OC_Filesystem::getView();
+		}else{
+			$view=new OC_FilesystemView(($root=='/')?'':$root);
 		}
-		self::put($path,$stat);
-		$fullPath=$root.$path;
+		self::scanFile($path,$root);
+		$dh=$view->opendir($path);
 		$totalSize=0;
 		if($dh){
 			while (($filename = readdir($dh)) !== false) {
 				if($filename != '.' and $filename != '..'){
 					$file=$path.'/'.$filename;
-					if(OC_Filesystem::is_dir($file)){
+					if($view->is_dir($file)){
 						if($eventSource){
 							$eventSource->send('scanning',array('file'=>$file,'count'=>$count));
 						}
-						self::scan($file,true,$eventSource,$count);
+						self::scan($file,$eventSource,$count,$root);
 					}else{
-						$stat=OC_Filesystem::stat($file);
-						$mimetype=OC_Filesystem::getMimeType($file);
-						$stat['mimetype']=$mimetype;
-						self::put($file,$stat);
+						$totalSize+=self::scanFile($file,$root);
 						$count++;
-						$totalSize+=$stat['size'];
 					}
 				}
 			}
 		}
-		self::increaseSize($fullPath,$totalSize);
+		self::increaseSize($view->getRoot().$path,$totalSize);
+	}
+
+	/**
+	 * scan a single file
+	 * @param string path
+	 * @param string root (optional)
+	 * @return int size of the scanned file
+	 */
+	public static function scanFile($path,$root=''){
+		if(!$root){
+			$view=OC_Filesystem::getView();
+		}else{
+			$view=new OC_FilesystemView(($root=='/')?'':$root);
+		}
+		if(!$view->is_readable($path)) return; //cant read, nothing we can do
+		$stat=$view->stat($path);
+		$mimetype=$view->getMimeType($path);
+		$stat['mimetype']=$mimetype;
+		if($path=='/'){
+			$path='';
+		}
+		self::put($path,$stat,$root);
+		return $stat['size'];
 	}
 
 	/**
@@ -395,9 +484,87 @@ class OC_FileCache{
 		}
 		return $names;
 	}
+
+	/**
+	 * check if a file or folder is updated outside owncloud
+	 * @param string path
+	 * @param string root (optional)
+	 * @return bool
+	 */
+	public static function isUpdated($path,$root=''){
+		if(!$root){
+			$root=OC_Filesystem::getRoot();
+			$view=OC_Filesystem::getView();
+		}else{
+			if($root=='/'){
+				$root='';
+			}
+			$view=new OC_FilesystemView($root);
+		}
+		$mtime=$view->filemtime($path);
+		$isDir=$view->is_dir($path);
+		$path=$root.$path;
+		$query=OC_DB::prepare('SELECT mtime FROM *PREFIX*fscache WHERE path=?');
+		$query->execute(array($path));
+		if($row=$query->fetch()){
+			$cachedMTime=$row['mtime'];
+			return ($mtime>$cachedMTime);
+		}else{//file not in cache, so it has to be updated
+			return !($isDir);//new folders are handeled sperate
+		}
+	}
+
+	/**
+	 * update the cache according to changes in the folder
+	 * @param string path
+	 * @param string root (optional)
+	 */
+	private static function updateFolder($path,$root=''){
+		if(!$root){
+			$view=OC_Filesystem::getView();
+		}else{
+			$view=new OC_FilesystemView(($root=='/')?'':$root);
+		}
+		$dh=$view->opendir($path);
+		if($dh){//check for changed/new files
+			while (($filename = readdir($dh)) !== false) {
+				if($filename != '.' and $filename != '..'){
+					$file=$path.'/'.$filename;
+					if(self::isUpdated($file,$root)){
+						if(!$root){//filesystem hooks are only valid for the default root
+							OC_Hook::emit('OC_Filesystem','post_write',array('path'=>$file));
+						}else{
+							self::fileSystemWatcherWrite(array('path'=>$file),$root);
+						}
+					}
+				}
+			}
+		}
+
+		//check for removed files, not using getFolderContent to prevent loops
+		$parent=self::getFileId($view->getRoot().$path);
+		$query=OC_DB::prepare('SELECT name FROM *PREFIX*fscache WHERE parent=?');
+		$result=$query->execute(array($parent));
+		while($row=$result->fetch()){
+			$file=$path.'/'.$row['name'];
+			if(!$view->file_exists($file)){
+				if(!$root){//filesystem hooks are only valid for the default root
+					OC_Hook::emit('OC_Filesystem','post_delete',array('path'=>$file));
+				}else{
+					self::fileSystemWatcherDelete(array('path'=>$file),$root);
+				}
+			}
+		}
+		//update the folder last, so we can calculate the size correctly
+		if(!$root){//filesystem hooks are only valid for the default root
+			OC_Hook::emit('OC_Filesystem','post_write',array('path'=>$path));
+		}else{
+			self::fileSystemWatcherWrite(array('path'=>$path),$root);
+		}
+	}
 }
 
 //watch for changes and try to keep the cache up to date
 OC_Hook::connect('OC_Filesystem','post_write','OC_FileCache','fileSystemWatcherWrite');
-OC_Hook::connect('OC_Filesystem','delete','OC_FileCache','fileSystemWatcherDelete');
-OC_Hook::connect('OC_Filesystem','rename','OC_FileCache','fileSystemWatcherRename');
+OC_Hook::connect('OC_Filesystem','post_delete','OC_FileCache','fileSystemWatcherDelete');
+OC_Hook::connect('OC_Filesystem','post_rename','OC_FileCache','fileSystemWatcherRename');
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 5062ecf5c18..8e55575e665 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -203,6 +203,14 @@ class OC_Filesystem{
 		self::$defaultInstance=new OC_FilesystemView($root);
 		self::$loaded=true;
 	}
+
+	/**
+	 * get the default filesystem view
+	 * @return OC_FilesystemView
+	 */
+	static public function getView(){
+		return self::$defaultInstance;
+	}
 	
 	/**
 	 * tear down the filesystem, removing all storage providers
-- 
GitLab


From 8337eaa1ec3962b185a2fe2e03ccf24fed7020c4 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 15 Jan 2012 11:40:32 +0100
Subject: [PATCH 404/546] add import function for contacts

---
 apps/contacts/ajax/importdialog.php     |  17 ++++
 apps/contacts/appinfo/app.php           |   1 +
 apps/contacts/import.php                | 120 ++++++++++++++++++++++++
 apps/contacts/import_tmp/Info           |   2 +
 apps/contacts/js/loader.js              |  81 ++++++++++++++++
 apps/contacts/templates/part.import.php |  27 ++++++
 6 files changed, 248 insertions(+)
 create mode 100644 apps/contacts/ajax/importdialog.php
 create mode 100644 apps/contacts/import.php
 create mode 100644 apps/contacts/import_tmp/Info
 create mode 100644 apps/contacts/js/loader.js
 create mode 100644 apps/contacts/templates/part.import.php

diff --git a/apps/contacts/ajax/importdialog.php b/apps/contacts/ajax/importdialog.php
new file mode 100644
index 00000000000..17b4cebdbd1
--- /dev/null
+++ b/apps/contacts/ajax/importdialog.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once('../../../lib/base.php');
+OC_JSON::checkLoggedIn();
+OC_Util::checkAppEnabled('contacts');
+$l10n = new OC_L10N('contacts');
+$tmpl = new OC_Template('contacts', 'part.import');
+$tmpl->assign('path', $_POST['path']);
+$tmpl->assign('filename', $_POST['filename']);
+$tmpl->printpage();
+?>
diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index a5b31006247..23a5a4253d0 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -22,4 +22,5 @@ OC_App::addNavigationEntry( array(
 
 
 OC_APP::registerPersonal('contacts','settings');
+OC_UTIL::addScript('contacts', 'loader');
 require_once('apps/contacts/lib/search.php');
\ No newline at end of file
diff --git a/apps/contacts/import.php b/apps/contacts/import.php
new file mode 100644
index 00000000000..f145c9a8822
--- /dev/null
+++ b/apps/contacts/import.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+//check for calendar rights or create new one
+ob_start();
+require_once ('../../lib/base.php');
+OC_JSON::checkLoggedIn();
+OC_Util::checkAppEnabled('calendar');
+$nl = "\n";
+$progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '10');
+	fclose($progressfopen);
+}
+$file = OC_Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']);
+if($_POST['method'] == 'new'){
+	$id = OC_Contacts_Addressbook::add(OC_User::getUser(), $_POST['addressbookname']);
+	OC_Contacts_Addressbook::setActive($id, 1);
+}else{
+	$contacts = OC_Contacts_Addressbook::find($_POST['id']);
+	if($contacts['userid'] != OC_USER::getUser()){
+		OC_JSON::error();
+		exit();
+	}
+	$id = $_POST['id'];
+}
+//analyse the calendar file
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '20');
+	fclose($progressfopen);
+}
+$searchfor = array('VCARD');
+$parts = $searchfor;
+$filearr = explode($nl, $file);
+$inelement = false;
+$parts = array();
+$i = 0;
+foreach($filearr as $line){
+	foreach($searchfor as $search){
+		if(substr_count($line, $search) == 1){
+			list($attr, $val) = explode(':', $line);
+			if($attr == 'BEGIN'){
+				$parts[]['begin'] = $i;
+				$inelement = true;
+			}
+			if($attr == 'END'){
+				$parts[count($parts) - 1]['end'] = $i;
+				$inelement = false;
+			}
+		}
+	}
+	$i++;
+}
+//import the calendar
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '40');
+	fclose($progressfopen);
+}
+$start = '';
+for ($i = 0; $i < $parts[0]['begin']; $i++) { 
+	if($i == 0){
+		$start = $filearr[0];
+	}else{
+		$start .= $nl . $filearr[$i];
+	}
+}
+$end = '';
+for($i = $parts[count($parts) - 1]['end'] + 1;$i <= count($filearr) - 1; $i++){
+	if($i == $parts[count($parts) - 1]['end'] + 1){
+		$end = $filearr[$parts[count($parts) - 1]['end'] + 1];
+	}else{
+		$end .= $nl . $filearr[$i];
+	}
+}
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '50');
+	fclose($progressfopen);
+}
+$importready = array();
+foreach($parts as $part){
+	for($i = $part['begin']; $i <= $part['end'];$i++){
+		if($i == $part['begin']){
+			$content = $filearr[$i];
+		}else{
+			$content .= $nl . $filearr[$i];
+		}
+	}
+	$importready[] = $start . $nl . $content . $nl . $end;
+}
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '70');
+	fclose($progressfopen);
+}
+if(count($parts) == 1){
+	OC_Contacts_VCard::add($id, $file);
+}else{
+	foreach($importready as $import){
+		OC_Contacts_VCard::add($id, $import);
+	}
+}
+//done the import
+if(is_writable('import_tmp/')){
+	$progressfopen = fopen($progressfile, 'w');
+	fwrite($progressfopen, '100');
+	fclose($progressfopen);
+}
+sleep(3);
+if(is_writable('import_tmp/')){
+	unlink($progressfile);
+}
+OC_JSON::success();
\ No newline at end of file
diff --git a/apps/contacts/import_tmp/Info b/apps/contacts/import_tmp/Info
new file mode 100644
index 00000000000..abafbce435c
--- /dev/null
+++ b/apps/contacts/import_tmp/Info
@@ -0,0 +1,2 @@
+This folder contains static files with the percentage of the import.
+Requires write permission
diff --git a/apps/contacts/js/loader.js b/apps/contacts/js/loader.js
new file mode 100644
index 00000000000..eb59185d728
--- /dev/null
+++ b/apps/contacts/js/loader.js
@@ -0,0 +1,81 @@
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+Contacts_Import={
+	importdialog: function(filename){
+		var path = $('#dir').val();
+		$('body').append('<div id="contacts_import"></div>');
+		$('#contacts_import').load(OC.filePath('contacts', 'ajax', 'importdialog.php'), {filename:filename, path:path},	function(){Contacts_Import.initdialog(filename);});
+	},
+	initdialog: function(filename){
+		$('#contacts_import_dialog').dialog({
+			width : 500,
+			close : function() {
+				$(this).dialog('destroy').remove();
+				$('#contacts_import').remove();
+			}
+		});
+		$('#import_done_button').click(function(){
+			$('#contacts_import_dialog').dialog('destroy').remove();
+			$('#contacts_import').remove();
+		});
+		$('#progressbar').progressbar({value: 0});
+		$('#startimport').click(function(){
+			var filename = $('#filename').val();
+			var path = $('#path').val();
+			var addressbookid = $('#contacts option:selected').val();
+			if($('#contacts option:selected').val() == 'newaddressbook'){
+				var method = 'new';
+				var addressbookname = $('#newaddressbook').val();
+				var addressbookname = $.trim(addressbookname);
+				if(newaddressbook == ''){
+					$('#newaddressbook').css('background-color', '#FF2626');
+					$('#newaddressbook').focus(function(){
+						$('#newaddressbook').css('background-color', '#F8F8F8');
+					});
+					return false;
+				}
+			}else{
+				var method = 'old';
+			}
+			$('#newaddressbook').attr('readonly', 'readonly');
+			$('#contacts').attr('disabled', 'disabled');
+			var progressfile = $('#progressfile').val();
+			$.post(OC.filePath('contacts', '', 'import.php'), {method: String (method), addressbookname: String (addressbookname), path: String (path), file: String (filename), id: String (addressbookid)}, function(data){
+				if(data.status == 'success'){
+					$('#progressbar').progressbar('option', 'value', 100);
+					$('#import_done').css('display', 'block');
+				}
+			});
+			$('#form_container').css('display', 'none');
+			$('#progressbar_container').css('display', 'block');
+			window.setTimeout('Contacts_Import.getimportstatus(\'' + progressfile + '\')', 500);
+		});
+		$('#contacts').change(function(){
+			if($('#contacts option:selected').val() == 'newaddressbook'){
+				$('#newaddressbookform').slideDown('slow');
+			}else{
+				$('#newaddressbookform').slideUp('slow');
+			}
+		});
+	},
+	getimportstatus: function(progressfile){
+		$.get(OC.filePath('contacts', 'import_tmp', progressfile), function(percent){
+			$('#progressbar').progressbar('option', 'value', parseInt(percent));
+			if(percent < 100){
+				window.setTimeout('Contacts_Import.getimportstatus(\'' + progressfile + '\')', 500);
+			}else{
+				$('#import_done').css('display', 'block');
+			}
+		});
+	}
+}
+$(document).ready(function(){
+	if(typeof FileActions !== 'undefined'){
+		FileActions.register('text/vcard','importaddressbook', '', Contacts_Import.importdialog); 
+		FileActions.setDefault('text/vcard','importaddressbook');
+	};
+});
\ No newline at end of file
diff --git a/apps/contacts/templates/part.import.php b/apps/contacts/templates/part.import.php
new file mode 100644
index 00000000000..570eda9b07d
--- /dev/null
+++ b/apps/contacts/templates/part.import.php
@@ -0,0 +1,27 @@
+<div id="contacts_import_dialog" title="<?php echo $l->t("Import a contacts file"); ?>">
+<div id="form_container">
+<input type="hidden" id="filename" value="<?php echo $_['filename'];?>">
+<input type="hidden" id="path" value="<?php echo $_['path'];?>">
+<input type="hidden" id="progressfile" value="<?php echo md5(session_id()) . '.txt';?>">
+<p style="text-align:center;"><b><?php echo $l->t('Please choose the addressbook'); ?></b>
+<select style="width:100%;" id="contacts" name="contacts">
+<?php
+$contacts_options = OC_Contacts_Addressbook::all(OC_User::getUser());
+$contacts_options[] = array('id'=>'newaddressbook', 'displayname'=>$l->t('create a new addressbook'));
+echo html_select_options($contacts_options, $contacts_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
+?>
+</select>
+<div id="newaddressbookform" style="display: none;">
+	<input type="text" style="width: 97%;" placeholder="<?php echo $l->t('Name of new addressbook'); ?>" id="newaddressbook" name="newaddressbook">
+</div>
+<input type="button" value="<?php echo $l->t("Import");?>!" id="startimport">
+</div>
+<div id="progressbar_container" style="display: none">
+<p style="text-align:center;"><b><?php echo $l->t('Importing contacts'); ?></b>
+<div id="progressbar"></div>
+<div id="import_done" style="display: none;">
+<p style="text-align:center;"><b><?php echo $l->t('Contacts imported successfully'); ?></b></p>
+<input type="button" value="<?php echo $l->t('Close Dialog'); ?>" id="import_done_button">
+</div>
+</div>
+</div>
\ No newline at end of file
-- 
GitLab


From 89073970d3cb8eeb7283e70babe66af0b0be9a83 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 15 Jan 2012 11:47:35 +0100
Subject: [PATCH 405/546] change comments in import.php

---
 apps/contacts/import.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index f145c9a8822..9008208db59 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -5,7 +5,7 @@
  * later.
  * See the COPYING-README file.
  */
-//check for calendar rights or create new one
+//check for addressbooks rights or create new one
 ob_start();
 require_once ('../../lib/base.php');
 OC_JSON::checkLoggedIn();
@@ -29,7 +29,7 @@ if($_POST['method'] == 'new'){
 	}
 	$id = $_POST['id'];
 }
-//analyse the calendar file
+//analyse the contacts file
 if(is_writable('import_tmp/')){
 	$progressfopen = fopen($progressfile, 'w');
 	fwrite($progressfopen, '20');
@@ -57,7 +57,7 @@ foreach($filearr as $line){
 	}
 	$i++;
 }
-//import the calendar
+//import the contacts
 if(is_writable('import_tmp/')){
 	$progressfopen = fopen($progressfile, 'w');
 	fwrite($progressfopen, '40');
-- 
GitLab


From 30673e478672af316c057f562a8a02babdbd3160 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 5 Feb 2012 14:00:49 +0100
Subject: [PATCH 406/546] writable not writeable

---
 apps/files_sharing/sharedstorage.php    | 10 +++++-----
 apps/files_texteditor/ajax/loadfile.php |  2 +-
 apps/files_texteditor/ajax/savefile.php |  2 +-
 files/index.php                         |  2 +-
 files/templates/part.list.php           |  2 +-
 lib/filestorage.php                     |  2 +-
 lib/filestorage/local.php               |  2 +-
 lib/filestoragecommon.php               |  2 +-
 lib/filesystem.php                      |  4 ++--
 lib/filesystemview.php                  |  6 +++---
 lib/util.php                            |  2 +-
 11 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index fa6fe7913f2..4840cce4c9d 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -259,7 +259,7 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		return true;
 	}
 	
-	public function is_writeable($path) {
+	public function is_writable($path) {
 		if($path == "" || $path == "/"){
 			return false;
 		}elseif (OC_Share::getPermissions($this->datadir.$path) & OC_Share::WRITE) {
@@ -340,7 +340,7 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 	}
 	
 	public function file_put_contents($path, $data) {
-		if ($this->is_writeable($path)) {
+		if ($this->is_writable($path)) {
 			$source = $this->getSource($path);
 			if ($source) {
 				$storage = OC_Filesystem::getStorage($source);
@@ -384,7 +384,7 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 			if ($root1 !== $root2) {
 				return false;
 			// Check if both paths have write permission
-			} else if ($this->is_writeable($path1) && $this->is_writeable($path2)) {
+			} else if ($this->is_writable($path1) && $this->is_writable($path2)) {
 				$oldSource = $this->getSource($path1);
 				$newSource = $folders['source'].substr($newTarget, strlen($folders['target']));
 				if ($oldSource) {
@@ -414,7 +414,7 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		if ($path2 == "" || $path2 == "/") {
 			// TODO Construct new shared item or should this not be allowed?
 		} else {
-			if ($this->is_writeable($path2)) {
+			if ($this->is_writable($path2)) {
 				$tmpFile = $this->toTmpFile($path1);
 				$result = $this->fromTmpFile($tmpFile, $path2);
 				if ($result) {
@@ -444,7 +444,7 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 	}
 	
 	public function fromTmpFile($tmpFile, $path) {
-		if ($this->is_writeable($path)) {
+		if ($this->is_writable($path)) {
 			$source = $this->getSource($path);
 			if ($source) {
 				$storage = OC_Filesystem::getStorage($source);
diff --git a/apps/files_texteditor/ajax/loadfile.php b/apps/files_texteditor/ajax/loadfile.php
index 64e016be8c2..8ece844aa29 100644
--- a/apps/files_texteditor/ajax/loadfile.php
+++ b/apps/files_texteditor/ajax/loadfile.php
@@ -33,7 +33,7 @@ $filename = isset($_GET['file']) ? $_GET['file'] : '';
 if(!empty($filename))
 {	
 	$path = $dir.'/'.$filename;
-	if(OC_Filesystem::is_writeable($path))
+	if(OC_Filesystem::is_writable($path))
 	{
 		$mtime = OC_Filesystem::filemtime($path);
 		$filecontents = OC_Filesystem::file_get_contents($path);
diff --git a/apps/files_texteditor/ajax/savefile.php b/apps/files_texteditor/ajax/savefile.php
index 846159c13b7..589428d1862 100644
--- a/apps/files_texteditor/ajax/savefile.php
+++ b/apps/files_texteditor/ajax/savefile.php
@@ -46,7 +46,7 @@ if($path != '' && $mtime != '')
 	{
 		// File same as when opened
 		// Save file
-		if(OC_Filesystem::is_writeable($path))	
+		if(OC_Filesystem::is_writable($path))
 		{
 			OC_Filesystem::file_put_contents($path, $filecontents);
 			// Clear statcache
diff --git a/files/index.php b/files/index.php
index fbf7a4901a1..f166790ba9c 100644
--- a/files/index.php
+++ b/files/index.php
@@ -94,7 +94,7 @@ $tmpl = new OC_Template( "files", "index", "user" );
 $tmpl->assign( "fileList", $list->fetchPage() );
 $tmpl->assign( "breadcrumb", $breadcrumbNav->fetchPage() );
 $tmpl->assign( 'dir', $dir);
-$tmpl->assign( 'readonly', !OC_Filesystem::is_writeable($dir));
+$tmpl->assign( 'readonly', !OC_Filesystem::is_writable($dir));
 $tmpl->assign( "files", $files );
 $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign( 'uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index 92b6f37d8e7..b117d81a1a5 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -1,5 +1,5 @@
 		<?php foreach($_['files'] as $file):
-			$write = ($file['writeable']) ? 'true' : 'false';
+			$write = ($file['writable']) ? 'true' : 'false';
 			$simple_file_size = simple_file_size($file['size']);
 			$simple_size_color = intval(200-$file['size']/(1024*1024)*2); // the bigger the file, the darker the shade of grey; megabytes*2
 			if($simple_size_color<0) $simple_size_color = 0;
diff --git a/lib/filestorage.php b/lib/filestorage.php
index 70aaf985b8b..4523144f6f4 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -34,7 +34,7 @@ class OC_Filestorage{
 	public function filetype($path){}
 	public function filesize($path){}
 	public function is_readable($path){}
-	public function is_writeable($path){}
+	public function is_writable($path){}
 	public function file_exists($path){}
 	public function readfile($path){}
 	public function filectime($path){}
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 61343652f61..2c1f650cb9f 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -50,7 +50,7 @@ class OC_Filestorage_Local extends OC_Filestorage{
 	public function is_readable($path){
 		return is_readable($this->datadir.$path);
 	}
-	public function is_writeable($path){
+	public function is_writable($path){
 		return is_writable($this->datadir.$path);
 	}
 	public function file_exists($path){
diff --git a/lib/filestoragecommon.php b/lib/filestoragecommon.php
index 35a926ecb07..f522d15c4e9 100644
--- a/lib/filestoragecommon.php
+++ b/lib/filestoragecommon.php
@@ -35,7 +35,7 @@ class OC_Filestorage_Common extends OC_Filestorage {
 		return $stat['size'];
 	}
 	public function is_readable($path){}
-	public function is_writeable($path){}
+	public function is_writable($path){}
 	public function file_exists($path){}
 	public function readfile($path) {
 		$handle = $this->fopen($path, "r");
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 8e55575e665..a18072ecbc2 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -333,8 +333,8 @@ class OC_Filesystem{
 	static public function is_readable($path){
 		return self::$defaultInstance->is_readable($path);
 	}
-	static public function is_writeable($path){
-		return self::$defaultInstance->is_writeable($path);
+	static public function is_writable($path){
+		return self::$defaultInstance->is_writable($path);
 	}
 	static public function file_exists($path){
 		return self::$defaultInstance->file_exists($path);
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 6c2ca916310..4586507a811 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -141,8 +141,8 @@ class OC_FilesystemView {
 	public function is_readable($path){
 		return $this->basicOperation('is_readable',$path);
 	}
-	public function is_writeable($path){
-		return $this->basicOperation('is_writeable',$path);
+	public function is_writable($path){
+		return $this->basicOperation('is_writable',$path);
 	}
 	public function file_exists($path){
 		if($path=='/'){
@@ -166,7 +166,7 @@ class OC_FilesystemView {
 		return $this->basicOperation('unlink',$path,array('delete'));
 	}
 	public function rename($path1,$path2){
-		if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and $this->is_writeable($path1) and OC_Filesystem::isValidPath($path2)){
+		if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and $this->is_writable($path1) and OC_Filesystem::isValidPath($path2)){
 			$run=true;
 			OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_rename, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2, OC_Filesystem::signal_param_run => &$run));
 			if($run){
diff --git a/lib/util.php b/lib/util.php
index 6c19c5416a2..abd918044b5 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -226,7 +226,7 @@ class OC_Util {
 			$errors[]=array('error'=>'PHP module ctype is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
 		}
 
-		if(file_exists(OC::$SERVERROOT."/config/config.php") and !is_writeable(OC::$SERVERROOT."/config/config.php")){
+		if(file_exists(OC::$SERVERROOT."/config/config.php") and !is_writable(OC::$SERVERROOT."/config/config.php")){
 			$errors[]=array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver use write access to the config directory in owncloud");
 		}
 
-- 
GitLab


From 9f3388ecbc7f7269a1df36d22242089f3be731ad Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 5 Feb 2012 14:04:10 +0100
Subject: [PATCH 407/546] store writable flag for files

---
 db_structure.xml  | 12 ++++++++++--
 lib/filecache.php | 15 +++++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/db_structure.xml b/db_structure.xml
index 5ef22b595cf..8e59a59c6e5 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -151,8 +151,16 @@
 	   <length>1</length>
    </field>
 
-<!--   <index>
-    <name>fscache_path_index</name>
+   <field>
+	   <name>writable</name>
+	   <type>integer</type>
+	   <default>0</default>
+	   <notnull>true</notnull>
+	   <length>1</length>
+   </field>
+
+   <!--<index>
+	   <name>fscache_path_index</name>
 	<unique>true</unique>
     <field>
      <name>path</name>
diff --git a/lib/filecache.php b/lib/filecache.php
index c51fee60bfe..e3f7fedeecf 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -57,7 +57,7 @@ class OC_FileCache{
 			$root='';
 		}
 		$path=$root.$path;
-		$query=OC_DB::prepare('SELECT ctime,mtime,mimetype,size,encrypted,versioned FROM *PREFIX*fscache WHERE path=?');
+		$query=OC_DB::prepare('SELECT ctime,mtime,mimetype,size,encrypted,versioned,writable FROM *PREFIX*fscache WHERE path=?');
 		$result=$query->execute(array($path))->fetchRow();
 		if(is_array($result)){
 			return $result;
@@ -101,8 +101,8 @@ class OC_FileCache{
 		}
 		$mimePart=dirname($data['mimetype']);
 		$user=OC_User::getUser();
-		$query=OC_DB::prepare('INSERT INTO *PREFIX*fscache(parent, name, path, size, mtime, ctime, mimetype, mimepart,user) VALUES(?,?,?,?,?,?,?,?,?)');
-		$query->execute(array($parent,basename($path),$path,$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart,$user));
+		$query=OC_DB::prepare('INSERT INTO *PREFIX*fscache(parent, name, path, size, mtime, ctime, mimetype, mimepart,user,writable) VALUES(?,?,?,?,?,?,?,?,?,?)');
+		$query->execute(array($parent,basename($path),$path,$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart,$user,$data['writable']));
 		
 	}
 
@@ -114,7 +114,7 @@ class OC_FileCache{
 	private static function update($id,$data){
 		$arguments=array();
 		$queryParts=array();
-		foreach(array('size','mtime','ctime','mimetype','encrypted','versioned') as $attribute){
+		foreach(array('size','mtime','ctime','mimetype','encrypted','versioned','writable') as $attribute){
 			if(isset($data[$attribute])){
 				$arguments[]=$data[$attribute];
 				$queryParts[]=$attribute.'=?';
@@ -226,7 +226,7 @@ class OC_FileCache{
 		}
 		$path=$root.$path;
 		$parent=self::getFileId($path);
-		$query=OC_DB::prepare('SELECT name,ctime,mtime,mimetype,size,encrypted,versioned FROM *PREFIX*fscache WHERE parent=?');
+		$query=OC_DB::prepare('SELECT name,ctime,mtime,mimetype,size,encrypted,versioned,writable FROM *PREFIX*fscache WHERE parent=?');
 		$result=$query->execute(array($parent))->fetchAll();
 		if(is_array($result)){
 			return $result;
@@ -309,7 +309,8 @@ class OC_FileCache{
 				}
 				$mtime=$view->filemtime($path);
 				$ctime=$view->filectime($path);
-				self::put($path,array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype));
+				$writable=$view->is_writable($path);
+				self::put($path,array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype,'writable'=>$writable));
 			}else{
 				self::scan($path,null,0,$root);
 			}
@@ -450,7 +451,9 @@ class OC_FileCache{
 		if(!$view->is_readable($path)) return; //cant read, nothing we can do
 		$stat=$view->stat($path);
 		$mimetype=$view->getMimeType($path);
+		$writable=$view->is_writable($path);
 		$stat['mimetype']=$mimetype;
+		$stat['writable']=$writable;
 		if($path=='/'){
 			$path='';
 		}
-- 
GitLab


From 89616d81f0b5a54cd9ef514395c2672cb12233d0 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 6 Feb 2012 07:23:44 +0100
Subject: [PATCH 408/546] Modification for adding photos.

---
 apps/contacts/ajax/addproperty.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index a00346c7dff..23f0a9379b2 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -71,6 +71,28 @@ if(is_array($value)) {
 	$value = strip_tags($value);
 }
 
+switch($name) {
+	case 'BDAY':
+		$date = New DateTime($value);
+		$value = $date->format(DateTime::ATOM);
+	case 'FN':
+		if(!$value) {
+			// create a method thats returns an alternative for FN.
+			//$value = getOtherValue();
+		}
+	case 'N':
+	case 'ORG':
+	case 'NICKNAME':
+		break;
+	case 'EMAIL':
+		$value = strtolower($value);
+		break;
+	case 'TEL':
+	case 'ADR': // should I delete the property if empty or throw an error?
+		break;
+}
+
+
 $property = $vcard->addProperty($name, $value); //, $parameters);
 
 $line = count($vcard->children) - 1;
-- 
GitLab


From 3af427fa5470812c3dbfb09b48b85c4e21fd3daa Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 6 Feb 2012 07:32:57 +0100
Subject: [PATCH 409/546] Added files for new contact editor/viewer.

---
 apps/contacts/ajax/addcontact.php             |   60 +
 apps/contacts/ajax/contactdetails.php         |   53 +
 apps/contacts/ajax/cropphoto.php              |   38 +
 apps/contacts/ajax/editaddress.php            |   31 +
 apps/contacts/ajax/editname.php               |   35 +
 apps/contacts/ajax/loadphoto.php              |   53 +
 apps/contacts/ajax/newcontact.php             |   58 +
 apps/contacts/ajax/savecrop.php               |  136 ++
 apps/contacts/ajax/saveproperty.php           |  134 ++
 apps/contacts/ajax/uploadphoto.php            |  133 ++
 apps/contacts/contacts.php                    |   60 +
 apps/contacts/css/Jcrop.gif                   |  Bin 0 -> 329 bytes
 apps/contacts/css/contacts.css                |  213 ++
 apps/contacts/css/jquery.Jcrop.css            |   84 +
 apps/contacts/dynphoto.php                    |   35 +
 apps/contacts/img/globe.svg                   |  102 +
 apps/contacts/img/person_large.png            |  Bin 0 -> 11517 bytes
 apps/contacts/js/contacts.js                  | 1289 ++++++++++++
 apps/contacts/js/jquery.Jcrop.js              | 1765 +++++++++++++++++
 apps/contacts/js/jquery.Jcrop.min.js          |  255 +++
 apps/contacts/js/jquery.jec-1.3.3.js          |  863 ++++++++
 apps/contacts/templates/index2.php            |   27 +
 apps/contacts/templates/part.contact.php      |  210 ++
 apps/contacts/templates/part.contactphoto.php |    9 +
 apps/contacts/templates/part.cropphoto.php    |   62 +
 .../templates/part.edit_address_dialog.php    |   67 +
 .../templates/part.edit_name_dialog.php       |   59 +
 apps/contacts/templates/part.no_contacts.php  |    8 +
 core/img/actions/add.png                      |  Bin 0 -> 488 bytes
 core/img/actions/add.svg                      |  109 +
 core/img/actions/mail.png                     |  Bin 0 -> 548 bytes
 core/img/actions/mail.svg                     |  345 ++++
 32 files changed, 6293 insertions(+)
 create mode 100644 apps/contacts/ajax/addcontact.php
 create mode 100644 apps/contacts/ajax/contactdetails.php
 create mode 100644 apps/contacts/ajax/cropphoto.php
 create mode 100644 apps/contacts/ajax/editaddress.php
 create mode 100644 apps/contacts/ajax/editname.php
 create mode 100644 apps/contacts/ajax/loadphoto.php
 create mode 100644 apps/contacts/ajax/newcontact.php
 create mode 100644 apps/contacts/ajax/savecrop.php
 create mode 100644 apps/contacts/ajax/saveproperty.php
 create mode 100644 apps/contacts/ajax/uploadphoto.php
 create mode 100644 apps/contacts/contacts.php
 create mode 100644 apps/contacts/css/Jcrop.gif
 create mode 100644 apps/contacts/css/contacts.css
 create mode 100644 apps/contacts/css/jquery.Jcrop.css
 create mode 100644 apps/contacts/dynphoto.php
 create mode 100644 apps/contacts/img/globe.svg
 create mode 100644 apps/contacts/img/person_large.png
 create mode 100644 apps/contacts/js/contacts.js
 create mode 100644 apps/contacts/js/jquery.Jcrop.js
 create mode 100644 apps/contacts/js/jquery.Jcrop.min.js
 create mode 100644 apps/contacts/js/jquery.jec-1.3.3.js
 create mode 100644 apps/contacts/templates/index2.php
 create mode 100644 apps/contacts/templates/part.contact.php
 create mode 100644 apps/contacts/templates/part.contactphoto.php
 create mode 100644 apps/contacts/templates/part.cropphoto.php
 create mode 100644 apps/contacts/templates/part.edit_address_dialog.php
 create mode 100644 apps/contacts/templates/part.edit_name_dialog.php
 create mode 100644 apps/contacts/templates/part.no_contacts.php
 create mode 100644 core/img/actions/add.png
 create mode 100644 core/img/actions/add.svg
 create mode 100644 core/img/actions/mail.png
 create mode 100644 core/img/actions/mail.svg

diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php
new file mode 100644
index 00000000000..4bd3df54e39
--- /dev/null
+++ b/apps/contacts/ajax/addcontact.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+}
+foreach ($_POST as $key=>$element) {
+	debug('_POST: '.$key.'=>'.$element);
+}
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
+
+$aid = $_POST['aid'];
+$addressbook = OC_Contacts_App::getAddressbook( $aid );
+
+$fn = trim($_POST['fn']);
+$n = trim($_POST['n']);
+
+$vcard = new OC_VObject('VCARD');
+$vcard->setUID();
+$vcard->setString('N',$n);
+$vcard->setString('FN',$fn);
+
+$id = OC_Contacts_VCard::add($aid,$vcard->serialize());
+if(!$id) {
+	OC_JSON::error(array('data' => array('message' => $l->t('There was an error adding the contact.'))));
+	OC_Log::write('contacts','ajax/addcontact.php: Recieved non-positive ID on adding card: '.$id, OC_Log::ERROR);
+	exit();
+}
+
+OC_JSON::success(array('data' => array( 'id' => $id )));
diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contactdetails.php
new file mode 100644
index 00000000000..f8f78ad3e80
--- /dev/null
+++ b/apps/contacts/ajax/contactdetails.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/contactdetails.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/contactdetails.php: '.$msg, OC_Log::DEBUG);
+}
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
+
+$id = $_GET['id'];
+$vcard = OC_Contacts_App::getContactVCard( $id );
+if(is_null($vcard)) {
+	bailOut($l->t('Error parsing VCard for ID: "'.$id.'"'));
+}
+$details = OC_Contacts_VCard::structureContact($vcard);
+if(isset($details['PHOTO'])) {
+	$details['PHOTO'] = true;
+	//unset($details['PHOTO']);
+} else {
+	$details['PHOTO'] = false;
+}
+$details['id'] = $id;
+
+OC_JSON::success(array('data' => $details));
\ No newline at end of file
diff --git a/apps/contacts/ajax/cropphoto.php b/apps/contacts/ajax/cropphoto.php
new file mode 100644
index 00000000000..878fb5610c6
--- /dev/null
+++ b/apps/contacts/ajax/cropphoto.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+
+$tmp_path = $_GET['tmp_path'];
+$id = $_GET['id'];
+OC_Log::write('contacts','ajax/cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OC_Log::DEBUG);
+$tmpl = new OC_TEMPLATE("contacts", "part.cropphoto");
+$tmpl->assign('tmp_path', $tmp_path);
+$tmpl->assign('id', $id);
+$page = $tmpl->fetchPage();
+
+OC_JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/ajax/editaddress.php b/apps/contacts/ajax/editaddress.php
new file mode 100644
index 00000000000..4e6456f6045
--- /dev/null
+++ b/apps/contacts/ajax/editaddress.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once('../../../lib/base.php');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+
+$id = $_GET['id'];
+$checksum = isset($_GET['checksum'])?$_GET['checksum']:'';
+$vcard = OC_Contacts_App::getContactVCard($id);
+$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
+
+$tmpl = new OC_TEMPLATE("contacts", "part.edit_address_dialog");
+if($checksum) {
+	$line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
+	$element = $vcard->children[$line];
+	$adr = OC_Contacts_VCard::structureProperty($element);
+	$tmpl->assign('adr',$adr);
+}
+
+$tmpl->assign('id',$id);
+$tmpl->assign('adr_types',$adr_types);
+
+$tmpl->printpage();
+
+?>
diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php
new file mode 100644
index 00000000000..6205cc74b0a
--- /dev/null
+++ b/apps/contacts/ajax/editname.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once('../../../lib/base.php');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+
+$tmpl = new OC_TEMPLATE("contacts", "part.edit_name_dialog");
+
+$id = $_GET['id'];
+if($id) {
+	$vcard = OC_Contacts_App::getContactVCard($id);
+
+
+	$name = array('', '', '', '', '');
+	if($vcard->__isset('N')) {
+		$property = $vcard->__get('N');
+		if($property) {
+			$name = OC_Contacts_VCard::structureProperty($property);
+		}
+	}
+	$tmpl->assign('name',$name);
+	$tmpl->assign('id',$id);
+} else {
+	$addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());
+	$tmpl->assign('addressbooks', $addressbooks);
+}
+$tmpl->printpage();
+
+?>
diff --git a/apps/contacts/ajax/loadphoto.php b/apps/contacts/ajax/loadphoto.php
new file mode 100644
index 00000000000..d9f7e737b55
--- /dev/null
+++ b/apps/contacts/ajax/loadphoto.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * TODO: Translatable strings.
+ *       Remember to delete tmp file at some point.
+ */
+// Init owncloud
+require_once('../../../lib/base.php');
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
+
+// foreach ($_POST as $key=>$element) {
+// 	OC_Log::write('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OC_Log::DEBUG);
+// }
+
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/savecrop.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+
+$image = null;
+
+$id = isset($_GET['id']) ? $_GET['id'] : '';
+
+if($id == '') {
+	bailOut('Missing contact id.');
+}
+
+$tmpl = new OC_TEMPLATE("contacts", "part.contactphoto");
+$tmpl->assign('id', $id);
+$page = $tmpl->fetchPage();
+OC_JSON::success(array('data' => array('page'=>$page)));
+?>
diff --git a/apps/contacts/ajax/newcontact.php b/apps/contacts/ajax/newcontact.php
new file mode 100644
index 00000000000..3d1a8e74535
--- /dev/null
+++ b/apps/contacts/ajax/newcontact.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+}
+foreach ($_POST as $key=>$element) {
+	debug('_POST: '.$key.'=>'.$element);
+}
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+
+$addressbooks = OC_Contacts_Addressbook::all(OC_USER::getUser());
+
+$upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
+$post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
+$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
+
+$freeSpace=OC_Filesystem::free_space('/');
+$freeSpace=max($freeSpace,0);
+$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
+
+$tmpl = new OC_Template('contacts','part.contact');
+$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign('uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
+$tmpl->assign('addressbooks',$addressbooks);
+$tmpl->assign('id','');
+$page = $tmpl->fetchPage();
+
+OC_JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
new file mode 100644
index 00000000000..7b7384723cd
--- /dev/null
+++ b/apps/contacts/ajax/savecrop.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * TODO: Translatable strings.
+ *       Remember to delete tmp file at some point.
+ */
+// Init owncloud
+require_once('../../../lib/base.php');
+OC_Log::write('contacts','ajax/savecrop.php: Huzzah!!!', OC_Log::DEBUG);
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
+
+// foreach ($_POST as $key=>$element) {
+// 	OC_Log::write('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OC_Log::DEBUG);
+// }
+
+// Firefox and Konqueror tries to download application/json for me.  --Arthur
+OC_JSON::setContentTypeHeader('text/plain');
+
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/savecrop.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+
+$image = null;
+
+$x1 = (isset($_POST['x1']) && $_POST['x1']) ? $_POST['x1'] : -1;
+//$x2 = isset($_POST['x2']) ? $_POST['x2'] : -1;
+$y1 = (isset($_POST['y1']) && $_POST['y1']) ? $_POST['y1'] : -1;
+//$y2 = isset($_POST['y2']) ? $_POST['y2'] : -1;
+$w = (isset($_POST['w']) && $_POST['w']) ? $_POST['w'] : -1;
+$h = (isset($_POST['h']) && $_POST['h']) ? $_POST['h'] : -1;
+$tmp_path = isset($_POST['tmp_path']) ? $_POST['tmp_path'] : '';
+$id = isset($_POST['id']) ? $_POST['id'] : '';
+
+if(in_array(-1, array($x1, $y1, $w, $h))) {
+	bailOut('Wrong crop dimensions: '.implode(', ', array($x1, $y1, $w, $h)));
+}
+
+if($tmp_path == '') {
+	bailOut('Missing path to temporary file.');
+}
+
+if($id == '') {
+	bailOut('Missing contact id.');
+}
+
+OC_Log::write('contacts','savecrop.php: files: '.$tmp_path.'  exists: '.file_exists($tmp_path), OC_Log::DEBUG);
+
+if(file_exists($tmp_path)) {
+	$image = new OC_Image();
+	if($image->loadFromFile($tmp_path)) {
+		if($image->crop($x1, $y1, $w, $h)) {
+			if($image->resize(200)) {
+				$tmpfname = tempnam("/tmp", "occCropped"); // create a new file because of caching issues.
+				if($image->save($tmpfname)) {
+					unlink($tmp_path);
+					$card = OC_Contacts_App::getContactVCard($id);
+					if(!$card) {
+						unlink($tmpfname);
+						bailOut('Error getting contact object.');
+					}
+					if($card->__isset('PHOTO')) {
+						OC_Log::write('contacts','savecrop.php: files: PHOTO property exists.', OC_Log::DEBUG);
+						$property = $card->__get('PHOTO');
+						if(!$property) {
+							unlink($tmpfname);
+							bailOut('Error getting PHOTO property.');
+						}
+						$property->setValue($image->__toString());
+						$property->parameters[] = new Sabre_VObject_Parameter('ENCODING', 'b');
+						$property->parameters[] = new Sabre_VObject_Parameter('TYPE', $image->mimeType());
+						$card->__set('PHOTO', $property);
+					} else {
+						OC_Log::write('contacts','savecrop.php: files: Adding PHOTO property.', OC_Log::DEBUG);
+						$card->addProperty('PHOTO', $image->__toString(), array('ENCODING' => 'b', 'TYPE' => $image->mimeType()));
+					}
+					if(!OC_Contacts_VCard::edit($id,$card->serialize())) {
+						bailOut('Error saving contact.');
+					}
+					unlink($tmpfname);
+					//$result=array( "status" => "success", 'mime'=>$image->mimeType(), 'tmp'=>$tmp_path);
+					$tmpl = new OC_TEMPLATE("contacts", "part.contactphoto");
+					$tmpl->assign('tmp_path', $tmpfname);
+					$tmpl->assign('mime', $image->mimeType());
+					$tmpl->assign('id', $id);
+					$tmpl->assign('width', $image->width());
+					$tmpl->assign('height', $image->height());
+					$page = $tmpl->fetchPage();
+					OC_JSON::success(array('data' => array('page'=>$page, 'tmp'=>$tmpfname)));
+					exit();
+				} else {
+					if(file_exists($tmpfname)) {
+						unlink($tmpfname);
+					}
+					bailOut('Error saving temporary image');
+				}
+			} else {
+				bailOut('Error resizing image');
+			}
+		} else {
+			bailOut('Error cropping image');
+		}
+	} else {
+		bailOut('Error creating temporary image');
+	}
+} else {
+	bailOut('Error finding image: '.$tmp_path);
+}
+
+if($tmp_path != '' && file_exists($tmp_path)) {
+	unlink($tmp_path);
+}
+
+?>
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
new file mode 100644
index 00000000000..fd1aa9e35f9
--- /dev/null
+++ b/apps/contacts/ajax/saveproperty.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Jakob Sack
+ * @copyright 2011 Jakob Sack mail@jakobsack.de
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
+
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+}
+foreach ($_POST as $key=>$element) {
+	debug('_POST: '.$key.'=>'.$element);
+}
+
+$id = isset($_POST['id'])?$_POST['id']:null;
+$name = isset($_POST['name'])?$_POST['name']:null;
+$value = isset($_POST['value'])?$_POST['value']:null;
+$parameters = isset($_POST['parameters'])?$_POST['parameters']:null;
+$checksum = isset($_POST['checksum'])?$_POST['checksum']:null;
+// if(!is_null($parameters)) {
+// 	debug('parameters: '.count($parameters));
+// 	foreach($parameters as $key=>$val ) {
+// 		debug('parameter: '.$key.'=>'.implode('/',$val));
+// 	}
+// }
+
+if(is_array($value)){ // FIXME: How to strip_tags for compound values?
+	ksort($value); // NOTE: Important, otherwise the compound value will be set in the order the fields appear in the form!
+	$value = OC_VObject::escapeSemicolons($value);
+} else {
+	$value = trim(strip_tags($value));
+}
+if(!$id) {
+	bailOut($l->t('id is not set.'));
+}
+if(!$checksum) {
+	bailOut($l->t('checksum is not set.'));
+}
+if(!$name) {
+	bailOut($l->t('element name is not set.'));
+}
+
+$vcard = OC_Contacts_App::getContactVCard( $id );
+$line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
+if(is_null($line)) {
+	bailOut($l->t('Information about vCard is incorrect. Please reload the page.'.$checksum.' "'.$line.'"'));
+}
+$element = $vcard->children[$line]->name;
+
+if($element != $name) {
+	bailOut($l->t('Something went FUBAR. ').$name.' != '.$element);
+}
+
+switch($element) {
+	case 'BDAY':
+		$date = New DateTime($value);
+		//$vcard->setDateTime('BDAY', $date, Sabre_VObject_Element_DateTime::DATE);
+		$value = $date->format(DateTime::ATOM);
+	case 'FN':
+		if(!$value) {
+			// create a method thats returns an alternative for FN.
+			//$value = getOtherValue();
+		}
+	case 'N':
+	case 'ORG':
+	case 'NICKNAME':
+		debug('Setting string:'.$name.' '.$value);
+		$vcard->setString($name, $value);
+		break;
+	case 'EMAIL':
+		$value = strtolower($value);
+	case 'TEL':
+	case 'ADR': // should I delete the property if empty or throw an error?
+		debug('Setting element: (EMAIL/TEL/ADR)'.$element);
+		if(!$value) {
+			unset($vcard->children[$line]); // Should never happen...
+		} else {
+			$vcard->children[$line]->setValue($value);
+			$vcard->children[$line]->parameters = array();
+			if(!is_null($parameters)) {
+				debug('Setting parameters: '.$parameters);
+				foreach($parameters as $key => $parameter) {
+					debug('Adding parameter: '.$key);
+					foreach($parameter as $val) {
+						debug('Adding parameter: '.$key.'=>'.$val);
+						$vcard->children[$line]->add(new Sabre_VObject_Parameter($key, strtoupper($val)));
+					}
+				}
+			}
+		}
+		break;
+}
+// Do checksum and be happy
+$checksum = md5($vcard->children[$line]->serialize());
+debug('New checksum: '.$checksum);
+
+if(!OC_Contacts_VCard::edit($id,$vcard->serialize())) {
+	OC_JSON::error(array('data' => array('message' => $l->t('Error updating contact property.'))));
+	OC_Log::write('contacts','ajax/setproperty.php: Error updating contact property: '.$value, OC_Log::ERROR);
+	exit();
+}
+
+//$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
+//$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
+
+OC_JSON::success(array('data' => array( 'line' => $line, 'checksum' => $checksum, 'oldchecksum' => $_POST['checksum'] )));
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
new file mode 100644
index 00000000000..62cd32f5dbb
--- /dev/null
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+// Init owncloud
+require_once('../../../lib/base.php');
+
+// Check if we are a user
+// Firefox and Konqueror tries to download application/json for me.  --Arthur
+OC_JSON::setContentTypeHeader('text/plain');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/uploadphoto.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/uploadphoto.php: '.$msg, OC_Log::DEBUG);
+}
+
+// foreach ($_SERVER as $key=>$element) {
+// 	debug('$_SERVER: '.$key.'=>'.$element);
+// }
+// foreach ($_GET as $key=>$element) {
+// 	debug('_GET: '.$key.'=>'.$element);
+// }
+// foreach ($_POST as $key=>$element) {
+// 	debug('_POST: '.$key.'=>'.$element);
+// }
+// foreach ($_FILES as $key=>$element) {
+// 	debug('_FILES: '.$key.'=>'.$element);
+// }
+
+// If it is a Drag'n'Drop transfer it's handled here.
+$fn = (isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : false);
+if ($fn) {
+	// AJAX call
+	if (!isset($_GET['id'])) {
+		OC_Log::write('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OC_Log::DEBUG);
+		OC_JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' )));
+		exit();
+	}
+	$id = $_GET['id'];
+	$tmpfname = tempnam('/tmp', 'occOrig');
+	file_put_contents($tmpfname, file_get_contents('php://input'));
+	debug($tmpfname.' uploaded');
+	$image = new OC_Image();
+	if($image->loadFromFile($tmpfname)) {
+		if($image->width() > 400 || $image->height() > 400) {
+			$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
+		}
+		if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
+			debug('Couldn\'t save correct image orientation: '.$tmpfname);
+		}
+		if($image->save($tmpfname)) {
+			OC_JSON::success(array('data' => array('mime'=>$_SERVER['CONTENT_TYPE'], 'name'=>$fn, 'id'=>$id, 'tmp'=>$tmpfname)));
+			exit();
+		} else {
+			bailOut('Couldn\'t save temporary image: '.$tmpfname);
+		}
+	} else {
+		bailOut('Couldn\'t load temporary image: '.$file['tmp_name']);
+	}
+}
+
+
+if (!isset($_POST['id'])) {
+	OC_Log::write('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OC_Log::DEBUG);
+	OC_JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' )));
+	exit();
+}
+if (!isset($_FILES['imagefile'])) {
+	OC_Log::write('contacts','ajax/uploadphoto.php: No file was uploaded. Unknown error.', OC_Log::DEBUG);
+	OC_JSON::error(array('data' => array( 'message' => 'No file was uploaded. Unknown error' )));
+	exit();
+}
+$error = $_FILES['imagefile']['error'];
+if($error !== UPLOAD_ERR_OK) {
+	$l=new OC_L10N('contacts');
+	$errors = array(
+		0=>$l->t("There is no error, the file uploaded with success"),
+		1=>$l->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'),
+		2=>$l->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
+		3=>$l->t("The uploaded file was only partially uploaded"),
+		4=>$l->t("No file was uploaded"),
+		6=>$l->t("Missing a temporary folder")
+	);
+	bailOut($errors[$error]);
+}
+$file=$_FILES['imagefile'];
+
+$tmpfname = tempnam("/tmp", "occOrig");
+if(file_exists($file['tmp_name'])) {
+	$image = new OC_Image();
+	if($image->loadFromFile($file['tmp_name'])) {
+		if($image->width() > 400 || $image->height() > 400) {
+			$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
+		}
+		if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
+			debug('Couldn\'t save correct image orientation: '.$tmpfname);
+		}
+		if($image->save($tmpfname)) {
+			OC_JSON::success(array('data' => array('mime'=>$file['type'],'size'=>$file['size'],'name'=>$file['name'], 'id'=>$_POST['id'], 'tmp'=>$tmpfname)));
+			exit();
+		} else {
+			bailOut('Couldn\'t save temporary image: '.$tmpfname);
+		}
+	} else {
+		bailOut('Couldn\'t load temporary image: '.$file['tmp_name']);
+	}
+} else {
+	bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');
+}
+
+?>
diff --git a/apps/contacts/contacts.php b/apps/contacts/contacts.php
new file mode 100644
index 00000000000..fded839fed8
--- /dev/null
+++ b/apps/contacts/contacts.php
@@ -0,0 +1,60 @@
+<?php
+require_once('../../lib/base.php');
+
+// Check if we are a user
+OC_Util::checkLoggedIn();
+// Get active address books. This creates a default one if none exists.
+$ids = OC_Contacts_Addressbook::activeIds(OC_User::getUser());
+$contacts = OC_Contacts_VCard::all($ids);
+
+$addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());
+
+// Load the files we need
+OC_App::setActiveNavigationEntry( 'contacts_index' );
+
+// Load a specific user?
+$id = isset( $_GET['id'] ) ? $_GET['id'] : null;
+$details = array();
+
+// FIXME: This cannot work..?
+if(is_null($id) && count($contacts) > 0) {
+	$id = $contacts[0]['id'];
+}
+if(!is_null($id)) {
+	$vcard = OC_Contacts_App::getContactVCard($id);
+	$details = OC_Contacts_VCard::structureContact($vcard);
+}
+$property_types = OC_Contacts_App::getAddPropertyOptions();
+$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
+
+$upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
+$post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
+$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
+
+$freeSpace=OC_Filesystem::free_space('/');
+$freeSpace=max($freeSpace,0);
+$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
+
+OC_Util::addScript('','jquery.multiselect');
+//OC_Util::addScript('contacts','interface');
+OC_Util::addScript('contacts','contacts');
+OC_Util::addScript('contacts','jquery.inview');
+OC_Util::addScript('contacts','jquery.Jcrop');
+OC_Util::addScript('contacts','jquery.jec-1.3.3');
+OC_Util::addStyle('','jquery.multiselect');
+//OC_Util::addStyle('contacts','styles');
+OC_Util::addStyle('contacts','jquery.Jcrop');
+OC_Util::addStyle('contacts','contacts');
+
+$tmpl = new OC_Template( "contacts", "index2", "user" );
+$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign('uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
+$tmpl->assign('property_types',$property_types);
+$tmpl->assign('phone_types',$phone_types);
+$tmpl->assign('addressbooks', $addressbooks);
+$tmpl->assign('contacts', $contacts);
+$tmpl->assign('details', $details );
+$tmpl->assign('id',$id);
+$tmpl->printPage();
+
+?>
diff --git a/apps/contacts/css/Jcrop.gif b/apps/contacts/css/Jcrop.gif
new file mode 100644
index 0000000000000000000000000000000000000000..72ea7ccb5321d5384d70437cfaac73011237901e
GIT binary patch
literal 329
zcmZ?wbhEHb<Y3@nn8?7eYSpU$|Nk?9f#QE|Ki808XU70nBRvCVMxdbLPZmxtAgu#Z
z0Mf$1#5;wRb9wgJ5Fhr7kxzB7so-zXTQDQ*d0g~`g(u!D-HO!|ewLP`>9b#5NV>2k
zBC~b@b~P=nNfWAe-b%_i6tS^-1y(h@EsB~1TqDA_h@fkxG$bHgvj}VxE1JLgr!*!^
ILUxTc0Q$^Q5C8xG

literal 0
HcmV?d00001

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
new file mode 100644
index 00000000000..a48533f85a0
--- /dev/null
+++ b/apps/contacts/css/contacts.css
@@ -0,0 +1,213 @@
+/*dl > dt {
+	font-weight: bold;
+}*/
+
+#contacts { padding-left:2px; padding-top: 5px; background: #fff; }
+#leftcontent a { height: 23px; display: block; margin: 0 0 0 0; padding: 0 0 0 25px; }
+#chooseaddressbook {margin-right: 170px; float: right;}
+#contacts_deletecard {position:absolute;top:15px;right:25px;}
+#contacts_downloadcard {position:absolute;top:15px;right:50px;}
+#contacts_propertymenu_button { position:absolute;top:15px;right:150px; height: 20px; width: 150px; background:url('../../../core/img/actions/add.svg') no-repeat center;	 }
+#contacts_propertymenu { position:absolute;top:35px;right:150px; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; }
+#contacts_propertymenu li { display: block; font-weight: bold; border-left: thin solid #1d2d44;  border-right: thin solid #1d2d44; height: 20px; width: 100px; }
+#contacts_propertymenu li:first-child { border-top: thin solid #1d2d44; -moz-border-radius-topleft:0.5em; -webkit-border-top-left-radius:0.5em; border-top-left-radius:0.5em; -moz-border-radius-topright:0.5em; -webkit-border-top-right-radius:0.5em; border-top-right-radius:0.5em; }
+#contacts_propertymenu li:last-child { border-bottom: thin solid #1d2d44; -moz-border-radius-bottomleft:0.5em; -webkit-border-bottom-left-radius:0.5em; border-bottom-left-radius:0.5em; -moz-border-radius-bottomright:0.5em; -webkit-border-bottom-right-radius:0.5em; border-bottom-right-radius:0.5em; }
+#contacts_propertymenu li a { padding: 3px; display: block }
+#contacts_propertymenu li:hover { background-color: #1d2d44; }
+#contacts_propertymenu li a:hover { color: #fff }
+#actionbar { height: 30px; width: 200px; position: fixed; right: 0px; top: 75px; margin: 0 0 0 0; padding: 0 0 0 0;}
+#card { /*max-width: 70em;*/ border: thin solid lightgray; display: block; }
+#firstrun { /*border: thin solid lightgray;*/ width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777;}
+#firstrun #selections { /*border: thin solid lightgray;*/ font-size:0.8em;  width: 100%; margin: 2em auto auto auto; clear: both; }
+
+#card input[type="text"],input[type="email"],input[type="tel"],input[type="date"], select { background-color: #f8f8f8; border: 0 !important; -webkit-appearance:none !important; -moz-appearance:none  !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; float: left; }
+#card input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,input[type="email"]:hover,input[type="tel"]:hover,input[type="date"]:hover,input[type="date"],input[type="date"]:hover,input[type="date"]:active,input[type="date"]:active,input[type="date"]:active,input[type="email"]:active,input[type="tel"]:active, select:hover, select:focus, select:active { border: 0 !important; -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; float: left; }
+input[type="text"]:invalid,input[type="email"]:invalid,input[type="tel"]:invalid,input[type="date"]:invalid { background-color: #ffc0c0 !important; }
+/*input[type="text"]:valid,input[type="email"]:valid,input[type="tel"]:valid,input[type="date"]:valid { background-color: #b1d28f !important; }*/
+dl.form
+{
+	width: 100%;
+	float: left;
+	clear: right;
+	margin: 0;
+	padding: 0;
+}
+
+.form dt
+{
+	display: table-cell;
+	clear: left;
+	float: left;
+	width: 7em;
+	/*overflow: hidden;*/
+	margin: 0;
+	padding: 0.8em 0.5em 0 0;
+	font-weight: bold;
+	text-align:right;
+	text-overflow:ellipsis;
+	o-text-overflow: ellipsis;
+	vertical-align: text-bottom;
+	/*
+	white-space: pre-wrap;
+	white-space: -moz-pre-wrap !important;
+	white-space: -pre-wrap;
+	white-space: -o-pre-wrap;*/
+}
+
+.form dd
+{
+	display: table-cell;
+	clear: right;
+	float: left;
+	margin: 0;
+	padding: 0px;
+	white-space: nowrap;
+	vertical-align: text-bottom;
+	/*min-width: 20em;*/
+	/*background-color: yellow;*/
+}
+
+.loading { background: url('../../../core/img/loading.gif') no-repeat center !important;}
+
+/*.add { cursor: pointer;  width: 25px; height: 25px; margin: 0px; float: right; position:relative; content: "\+"; font-weight: bold; color: #666; font-size: large; bottom: 0px; right: 0px; clear: both; text-align: center; vertical-align: bottom; display: none; }*/
+
+.listactions { height: 1em; width:60px; float: left; clear: right; }
+.add,.edit,.delete,.mail, .globe { cursor: pointer; width: 20px; height: 20px; margin: 0; float: left; position:relative; display: none; }
+.add { background:url('../../../core/img/actions/add.svg') no-repeat center; clear: both; }
+.delete { background:url('../../../core/img/actions/delete.svg') no-repeat center; }
+.edit { background:url('../../../core/img/actions/rename.svg') no-repeat center; }
+.mail { background:url('../../../core/img/actions/mail.svg') no-repeat center; }
+.globe { background:url('../img/globe.svg') no-repeat center; }
+
+#messagebox_msg { font-weight: bold; font-size: 1.2em; }
+
+/* Name editor */
+#edit_name_dialog {
+	/*width: 25em;*/
+	padding:0;
+}
+#edit_name_dialog > input {
+	width: 15em;
+}
+/* Address editor */
+#edit_address_dialog {
+	/*width: 30em;*/
+}
+#edit_address_dialog > input {
+	width: 15em;
+}
+#edit_photo_dialog_img {
+	display: block;
+	width: 150;
+	height: 200;
+	border: thin solid black;
+}
+#fn {
+	float: left;
+}
+.jecEditableOption {
+	margin: 2px;
+	border-radius: 0.5em;
+	border: thin solid #bbb;
+	content: 'Custom';
+}
+/**
+ * Create classes form, floateven and floatodd which flows left and right respectively.
+ */
+.contactsection { 
+	float: left; 
+	min-width: 30em;
+	max-width: 40em;
+	margin: 0.5em;
+	border: thin solid lightgray;
+	-webkit-border-radius: 0.5em;
+	-moz-border-radius: 0.5em;
+	border-radius: 0.5em;
+	background-color: #f8f8f8;
+}
+
+.contactpart legend {
+	/*background: #fff;
+	font-weight: bold;
+	left: 1em;
+	border: thin solid gray;
+	-webkit-border-radius: 0.5em;
+	-moz-border-radius: 0.5em;
+	border-radius: 0.5em;
+	padding: 3px;*/
+width:auto; padding:.3em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
+}
+/*#contacts_details_photo { 
+	cursor: pointer; 
+	z-index:1; 
+	margin: auto;
+}
+*/
+#cropbox { 
+	margin: auto;
+}
+
+/* Photo editor */
+/*#contacts_details_photo_wrapper {
+	z-index: 1000;
+}*/
+#contacts_details_photo {
+	border-radius: 0.5em;
+	border: thin solid #bbb;
+	padding: 0.5em;
+	margin: 1em 1em 1em 7em;
+	cursor: pointer;
+	/*background: #f8f8f8;*/
+	background: url(../../../core/img/loading.gif) no-repeat center center;
+	clear: right;
+}
+#contacts_details_photo:hover {
+	background: #fff;
+}
+#contacts_details_photo_progress {
+	margin: 0.3em 0.3em 0.3em 7em;
+	clear: left;
+}
+/* Address editor */
+#addressdisplay { padding: 0.5em; }
+dl.addresscard { background-color: #fff; float: left; width: 45%; margin: 0 0.3em 0.3em 0.3em; padding: 0; border: thin solid lightgray; }
+dl.addresscard dd {}
+dl.addresscard dt { padding: 0.3em; border-bottom: thin solid lightgray; font-weight: bold; clear: both;}
+dl.addresscard dd > ul { margin: 0.3em; padding: 0.3em; }
+#adr_type {} /* Select */
+#adr_pobox {}
+#adr_extended {}
+#adr_street {}
+#adr_city {}
+#adr_region {}
+#adr_zipcode {}
+#adr_country {}
+
+.delimiter {
+	height: 10px;
+	clear: both;
+}
+.updatebar {
+	height: 30px;
+	clear: both;
+	padding-right: 170px;
+	border: thin solid lightgray;
+}
+.updatebar button {
+	float: left; margin: 1em;
+}
+
+/*input[type="text"] { float: left; max-width: 15em; }
+input[type="radio"] { float: left; -khtml-appearance: none; width: 20px; height: 20px; vertical-align: middle; }*/
+#file_upload_target, #crop_target { display:none; }
+
+#file_upload_start { opacity:0; filter:alpha(opacity=0); z-index:1; position:absolute; left:0; top:0; cursor:pointer; width:0; height:0;}
+input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
+.propertycontainer dd { float: left; width: 25em; }
+.propertylist { clear: none; max-width: 28em; }
+.propertylist li { /*background-color: cyan; */ min-width: 25em; /*max-width: 30em;*/ display: block; clear: right; }
+.propertylist li > input[type="text"],input[type="email"],input[type="tel"] { float: left; max-width: 15em; }
+.propertylist li > input[type="checkbox"],input[type="radio"] { float: left; clear: left; width: 20px; height: 20px; vertical-align: middle; }
+.propertylist li > select { float: left; max-width: 8em; }
+.typelist { float: left; max-width: 10em; } /* for multiselect */
+.addresslist { clear: both; }
\ No newline at end of file
diff --git a/apps/contacts/css/jquery.Jcrop.css b/apps/contacts/css/jquery.Jcrop.css
new file mode 100644
index 00000000000..554f013fd77
--- /dev/null
+++ b/apps/contacts/css/jquery.Jcrop.css
@@ -0,0 +1,84 @@
+/* jquery.Jcrop.css
+   The code contained in this file is free software under MIT License
+   Copyright (c)2008-2011 Tapmodo Interactive LLC
+*/
+
+/*
+  The outer-most container in a typical Jcrop instance
+  If you are having difficulty with formatting related to styles
+  on a parent element, place any fixes here or in a like selector
+*/
+.jcrop-holder {
+  direction: ltr;
+  text-align: left;
+}
+
+.jcrop-vline, .jcrop-hline {
+	background: white url('Jcrop.gif') top left repeat;
+	font-size: 0px;
+	position: absolute;
+}
+
+.jcrop-vline {
+  height: 100%;
+  width: 1px !important;
+}
+
+.jcrop-hline {
+  width: 100%;
+  height: 1px !important;
+}
+
+.jcrop-vline.right {
+  right: 0px;
+}
+
+.jcrop-hline.bottom {
+  bottom: 0px;
+}
+
+.jcrop-handle {
+	background-color: #333;
+	border: 1px #eee solid;
+	font-size: 1px;
+}
+
+.jcrop-tracker {
+  height: 100%; 
+  -webkit-tap-highlight-color: transparent; /* "turn off" link highlight */
+  -webkit-touch-callout: none;              /* disable callout, image save panel */
+  -webkit-user-select: none;                /* disable cut copy paste */
+  width: 100%;
+}
+
+/*
+*/
+
+.jcrop-light .jcrop-vline, .jcrop-light .jcrop-hline {
+	background: white;
+  filter: Alpha(opacity=70) !important;
+  opacity: .70 !important;
+}
+
+.jcrop-light .jcrop-handle {
+	background-color: black;
+	border-color: white;
+  border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+.jcrop-dark .jcrop-vline, .jcrop-dark .jcrop-hline {
+	background: black;
+  filter: Alpha(opacity=70) !important;
+  opacity: 0.70 !important;
+}
+
+.jcrop-dark .jcrop-handle {
+	background-color: white;
+	border-color: black;
+  border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
diff --git a/apps/contacts/dynphoto.php b/apps/contacts/dynphoto.php
new file mode 100644
index 00000000000..8025f559c37
--- /dev/null
+++ b/apps/contacts/dynphoto.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * ownCloud - Image generator for contacts.
+ *
+ * @author Thomas Tanghus
+ * @copyright 2011 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../lib/base.php');
+$tmp_path = $_GET['tmp_path'];
+$maxsize = isset($_GET['maxsize']) ? $_GET['maxsize'] : -1;
+header("Cache-Control: no-cache, no-store, must-revalidate");
+
+OC_Log::write('contacts','dynphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OC_Log::DEBUG);
+
+$image = new OC_Image($tmp_path);
+if($maxsize != -1) {
+	$image->resize($maxsize);
+}
+$image();
diff --git a/apps/contacts/img/globe.svg b/apps/contacts/img/globe.svg
new file mode 100644
index 00000000000..4e43cfba10a
--- /dev/null
+++ b/apps/contacts/img/globe.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="16"
+   height="16"
+   id="svg2485">
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient3707-319-631">
+      <stop
+         id="stop4637"
+         style="stop-color:#254b6d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4639"
+         style="stop-color:#415b73;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop4641"
+         style="stop-color:#6195b5;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="20"
+       y1="43"
+       x2="20"
+       y2="2.6887112"
+       id="linearGradient2483"
+       xlink:href="#linearGradient3707-319-631"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3769285,0,0,0.3769199,-1.196178,-0.8960149)" />
+    <linearGradient
+       id="linearGradient2867-449-88-871-390-598-476-591-434-148">
+      <stop
+         id="stop4627"
+         style="stop-color:#51cfee;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4629"
+         style="stop-color:#49a3d2;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop4631"
+         style="stop-color:#3470b4;stop-opacity:1"
+         offset="0.704952" />
+      <stop
+         id="stop4633"
+         style="stop-color:#273567;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="61.240059"
+       cy="-8.7256308"
+       r="9.7552834"
+       fx="61.240059"
+       fy="-8.7256308"
+       id="radialGradient2481"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1.3551574,-1.3551567,0,-3.824604,-80.384092)" />
+    <linearGradient
+       id="linearGradient4873">
+      <stop
+         id="stop4875"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4877"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="63.397362"
+       y1="-12.489107"
+       x2="63.397362"
+       y2="5.4675598"
+       id="linearGradient2464"
+       xlink:href="#linearGradient4873"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7432394,0,0,0.7432224,-38.229789,10.609333)" />
+  </defs>
+  <g
+     id="layer1">
+    <path
+       d="M 15.5,7.999735 C 15.5,12.142003 12.141888,15.5 8.000094,15.5 C 3.857922,15.5 0.5,12.141965 0.5,7.999735 C 0.5,3.8576552 3.857922,0.4999997 8.000094,0.4999997 C 12.141888,0.4999997 15.5,3.8576552 15.5,7.999735 L 15.5,7.999735 z"
+       id="path6495"
+       style="fill:url(#radialGradient2481);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2483);stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       d="M 8.1022062,0.95621712 L 7.236144,1.0568701 L 6.2834735,1.3210847 C 6.3646244,1.2921995 6.446834,1.2606694 6.5309208,1.2330132 L 6.4195696,1.0317069 L 6.048401,1.0946151 L 5.8628152,1.2707582 L 5.5782512,1.3085031 L 5.318433,1.4343196 L 5.1947098,1.4972277 L 5.157592,1.5475543 L 4.9720082,1.5852992 L 4.8606579,1.8243504 L 4.712189,1.522391 L 4.6626994,1.6482076 L 4.6874462,1.9879118 L 4.4523728,2.1892181 L 4.3162766,2.5540857 L 4.6008407,2.5540857 L 4.712191,2.3150345 L 4.7493088,2.2269631 C 4.8744282,2.136984 4.9930427,2.0367771 5.1204782,1.9501669 L 5.4174142,2.05082 C 5.6107409,2.1843878 5.8054259,2.3200676 5.9989133,2.4534326 L 6.2834735,2.1892181 L 5.9617936,2.05082 L 5.8133266,1.7488605 L 5.2689442,1.6859524 L 5.2565714,1.6230443 L 5.4916438,1.6733709 L 5.6277409,1.5349726 L 5.9246759,1.4720643 C 5.9949454,1.4373108 6.06407,1.4122795 6.1350055,1.3839929 L 5.9494207,1.560136 L 6.6175262,2.0256568 L 6.6175262,2.302453 L 6.357707,2.5666673 L 6.7041325,3.2712399 L 6.9392071,3.1328408 L 7.2361431,2.6673207 C 7.6536127,2.5360677 8.0298636,2.383337 8.423888,2.2017997 L 8.3991411,2.3779426 L 8.5970969,2.5163408 L 8.9435226,2.2772895 L 8.7703107,2.0759833 L 8.5352353,2.2143814 L 8.4610018,2.1892185 C 8.4780536,2.1812953 8.4933662,2.1721092 8.5104914,2.1640557 L 8.8569181,1.2581766 L 8.1022062,0.95621712 z M 4.712189,2.3150345 L 4.9967521,2.5163408 L 5.2318265,2.5163408 L 5.2318265,2.2772895 L 4.9472634,2.1514733 L 4.712189,2.3150345 L 4.712189,2.3150345 z M 11.281895,2.1514733 L 10.774628,2.2772895 L 10.452951,2.4911776 L 10.452951,2.6799019 L 9.9456829,3.0070243 L 10.044661,3.4977095 L 10.341597,3.2838208 L 10.527183,3.4977095 L 10.737514,3.6235259 L 10.873608,3.2586575 L 10.799375,3.0447699 L 10.873608,2.8937896 L 11.170544,2.6169941 L 11.30664,2.6169941 L 11.170544,2.9189543 L 11.170544,3.1957496 C 11.292932,3.1618717 11.416467,3.1486778 11.541713,3.1328408 L 11.195288,3.3844746 L 11.170543,3.5354537 L 10.774628,3.8751588 L 10.366341,3.7745049 L 10.366341,3.5354537 L 10.180756,3.6612703 L 10.267364,3.8751588 L 9.9704267,3.8751588 L 9.8095868,4.1519548 L 9.61163,4.3784244 L 9.2528324,4.4539139 L 9.463162,4.6678019 L 9.5126507,4.88169 L 9.2528324,4.88169 L 8.9064068,5.0704143 L 8.9064068,5.6240059 L 9.0672458,5.6240059 L 9.2157146,5.7875676 L 9.5497684,5.6240059 L 9.6734907,5.2843013 L 9.920937,5.1333218 L 9.9704267,5.0075057 L 10.366341,4.9068526 L 10.589042,5.1584854 L 10.824117,5.2843013 L 10.688021,5.5610979 L 10.898351,5.49819 L 11.009701,5.2213934 L 10.737512,4.9068526 L 10.848862,4.9068526 L 11.121054,5.1333218 L 11.170543,5.4352821 L 11.405615,5.7120781 L 11.467479,5.3094657 L 11.591202,5.2465566 C 11.722897,5.3855865 11.826706,5.5556097 11.937626,5.7120781 L 12.345913,5.7372433 L 12.580987,5.8882234 L 12.469637,6.0517841 L 12.234564,6.2656727 L 11.888135,6.2656727 L 11.430361,6.1146942 L 11.195287,6.1398593 L 11.022074,6.3411657 L 10.527181,5.8378996 L 10.180756,5.7372462 L 9.6734907,5.8001547 L 9.2280866,5.9259711 C 8.974001,6.2188978 8.7138634,6.5150518 8.4733747,6.8192683 L 8.1888107,7.5238405 L 8.3249076,7.6748196 L 8.0774604,8.0396877 L 8.3496515,8.6813514 C 8.5761437,8.9418962 8.8039678,9.2006825 9.030129,9.461412 L 9.3641827,9.1720348 L 9.5002778,9.3481795 L 9.8590764,9.1091277 L 9.9827973,9.2475248 L 10.341595,9.2475248 L 10.551927,9.4865757 L 10.428203,9.914352 L 10.675649,10.203731 L 10.663275,10.706995 L 10.848861,11.071864 L 10.712766,11.386405 C 10.699498,11.611997 10.68802,11.827605 10.68802,12.053231 C 10.79718,12.358902 10.906621,12.663823 11.0097,12.971693 L 11.083934,13.462375 L 11.083934,13.714009 L 11.281891,13.714009 L 11.566453,13.525283 L 11.91288,13.525283 L 12.432517,12.933947 L 12.370656,12.732639 L 12.717083,12.418101 L 12.457262,12.128722 L 12.76657,11.877089 L 13.063506,11.688364 L 13.199602,11.537384 L 13.112995,11.19768 C 13.112995,10.911684 13.112996,10.628161 13.112995,10.342127 L 13.348069,9.8136993 L 13.645006,9.4865757 L 13.966685,8.6813514 L 13.966685,8.467463 C 13.806607,8.4879689 13.653171,8.506459 13.496537,8.5177905 L 13.818218,8.1906678 L 14.263621,7.8887078 L 14.498696,7.6119125 L 14.498696,7.3099534 C 14.445379,7.2077028 14.391536,7.0976601 14.337854,6.9954116 L 14.127525,7.2470431 L 13.966685,7.0583197 L 13.731609,6.8695964 L 13.731609,6.4795648 L 14.003802,6.7941047 L 14.313111,6.75636 C 14.452648,6.8851798 14.586636,6.9997236 14.709024,7.1463926 L 14.906986,6.9199159 C 14.906986,6.6761022 14.63695,5.4724677 14.053296,4.4539139 C 13.46964,3.4356954 12.444894,2.5037591 12.444895,2.5037591 L 12.370661,2.6421572 L 12.098469,2.9441167 L 11.752043,2.579249 L 12.098469,2.579249 L 12.259308,2.4031061 L 11.615949,2.2772895 L 11.281895,2.1514733 z M 3.8461259,2.3150345 L 3.7224027,2.6421572 C 3.7224027,2.6421572 3.5057941,2.6785236 3.4502116,2.6924839 C 2.7403769,3.3576613 1.3089548,4.8004591 0.97574709,7.5112538 C 0.98894063,7.5741032 1.2108206,7.9390292 1.2108206,7.9390292 L 1.7552039,8.2661509 L 2.2995852,8.417131 L 2.5346596,8.7065091 L 2.8934573,8.9833054 L 3.1037868,8.9455608 L 3.2522558,9.0210508 L 3.2522558,9.0713763 L 3.0542972,9.6375498 L 2.8934573,9.8766016 L 2.942946,9.9898366 L 2.8192238,10.442776 L 3.2769996,11.298327 L 3.7471476,11.713522 L 3.957476,12.015482 L 3.9327303,12.644563 L 4.0811982,12.99685 L 3.9327303,13.67626 C 3.9327303,13.67626 3.9129189,13.670673 3.9327303,13.739167 C 3.9527179,13.807695 4.759781,14.268689 4.8111654,14.22985 C 4.8623746,14.190288 4.9101447,14.154361 4.9101447,14.154361 L 4.860656,14.00338 L 5.0709847,13.802075 L 5.1452191,13.588188 L 5.4792709,13.474953 L 5.7390901,12.820706 L 5.6648567,12.644563 L 5.8380694,12.367767 L 6.2339838,12.279695 L 6.4319415,11.801593 L 6.3824509,11.210255 L 6.6917597,10.769898 L 6.7412484,10.316959 C 6.3168632,10.102948 5.9004921,9.8830534 5.4792709,9.6627135 L 5.2689423,9.2475198 L 4.8853999,9.1594491 L 4.6750703,8.5932746 L 4.1678047,8.6561827 L 3.7224017,8.32906 L 3.2522529,8.7442535 L 3.2522529,8.8071626 C 3.1114329,8.7658292 2.9446126,8.7597462 2.8192238,8.6813464 L 2.7202454,8.3793874 L 2.7202454,8.0522637 L 2.3985655,8.0900083 C 2.4244522,7.8816386 2.4591052,7.6692598 2.485171,7.4609265 L 2.2995852,7.4609265 L 2.1140005,7.6999783 L 1.9407887,7.7880501 L 1.6809694,7.6370692 L 1.6562245,7.3099456 L 1.7057143,6.9576606 L 2.0892557,6.6557005 L 2.3985645,6.6557005 L 2.4604271,6.4795582 L 2.8439686,6.5676288 L 3.1285316,6.932497 L 3.1780203,6.3285781 L 3.672914,5.9133853 L 3.8461259,5.4730269 L 4.2172963,5.3220476 L 4.415253,5.0200879 L 4.8854018,4.9320161 L 5.1204763,4.57973 C 4.8878,4.57973 4.6479303,4.57973 4.415253,4.57973 L 4.8606579,4.3658421 L 5.1699649,4.3658421 L 5.5658793,4.2274443 L 5.6401139,4.6174752 L 5.8133266,4.3406788 L 5.615369,4.2022808 L 5.6648596,4.0387201 L 5.5040187,3.8877395 L 5.3308048,3.8374132 L 5.3802955,3.6486888 L 5.2441994,3.3844746 L 4.9348905,3.5102908 L 4.9843801,3.2712399 L 4.6255827,3.0573516 L 4.3410204,3.5606172 L 4.3657663,3.7367603 L 4.0812032,3.8625768 L 3.9079904,4.2526078 L 3.821384,3.8877395 L 3.3388631,3.6864335 L 3.2522568,3.4096375 L 3.9079904,3.0321885 L 4.1925535,2.755392 L 4.2173002,2.4282694 L 4.0564593,2.3401977 L 3.8461298,2.315035 L 3.8461259,2.3150345 z M 9.1538541,2.9189543 L 9.1538541,3.1202592 L 9.2652062,3.246076 L 9.2652062,3.5480356 L 9.2033438,3.9506479 L 9.5250246,3.8877395 L 9.760098,3.6486888 L 9.5497694,3.4473819 C 9.4815603,3.2626763 9.4124355,3.0961113 9.3270669,2.9189543 L 9.1538541,2.9189543 z M 8.881662,3.3215656 L 8.6837063,3.3844746 L 8.7331959,3.7493421 L 8.9930152,3.6109428 L 8.881662,3.3215656 L 8.881662,3.3215656 z M 12.506754,6.6305386 L 12.803691,6.9828228 L 13.162489,7.7628866 L 13.385189,8.0145183 L 13.273839,8.2787347 L 13.471797,8.5177846 C 13.380952,8.5238987 13.292977,8.5303684 13.199605,8.5303684 C 13.029984,8.1679096 12.895741,7.802374 12.766575,7.4231829 L 12.543871,7.1715503 L 12.420149,6.7186111 L 12.506754,6.6305399 L 12.506754,6.6305386 z"
+       id="path6534"
+       style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <path
+       d="M 14.500001,7.9997709 C 14.500001,11.589737 11.589636,14.5 8.0000818,14.5 C 4.4101984,14.5 1.5000001,11.589705 1.5000001,7.9997709 C 1.5000001,4.4099703 4.4101984,1.5000014 8.0000818,1.5000014 C 11.589636,1.5000014 14.500001,4.4099703 14.500001,7.9997709 L 14.500001,7.9997709 z"
+       id="path2451"
+       style="opacity:0.4;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2464);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/apps/contacts/img/person_large.png b/apps/contacts/img/person_large.png
new file mode 100644
index 0000000000000000000000000000000000000000..f57511e1000690c223bc5de2313ddfface12f29a
GIT binary patch
literal 11517
zcmX|{1yodD)b?Q*B$RMy6zPy|0V$F08bTWB7U>*By1P^91_9}zg&{=#G{OMVARr*E
z@A3QI^|ID**Ua3r@4aWv+535Z=R|3$D-hsQ<6~f85GX0iYJ+1TcunHo1OMHf7mL9G
z`c_6s7Z>~m;95n3_jqoKhHo)2-pT!YVGa&K2*HO`9&!dAI<7Vz-WKlG7~bCA-1aVx
zZ(m!uS#!I(+vfZfr^djb!%&iaq3e@-nCG4NcrI{TO2XIXEhG|Y!k~#^uLVo^t<+eN
zVr7WKz#Br<TbrWpZM~YunPge-*%;V(@S2o)>DN@_M2Ub?+5m1c67t!71mD&uwOTrn
z6z>t#t6|>6e8VY!J}`K!+eX7RVopHfxd7@;&r>a8u5R@#U^~O~@@aNy1HNOf$eVTc
zLY&V~1KU$PH%!WwtAo{s*TWpBrC-+}jmpSYxAlQ27W5p#BxcF4pz;aCkD|3_37iqD
zaXu@t@*67tW_`d5-)e~<00US5GRY8qgVZYY9*(DR)xGo;ifiS<)Bx8IIKDx4R4u1w
zg!~0<<F_l9<15k53P=)G^#kZ1;?Jdv&U|ab$ZfBK`8U;z1cvIJ&bU6emnUW=(w%0t
zUPi{p3CQi*j-TzW`W^JB5Hbzq#&ALp?Ik0+f5s(7;a1{!VIO>5Q29Mk*>Vtee0j2g
zf4mwZg#npyRvXcL`swfeITP>i(YHl<OqdC@QY-k6A-{DyxFpwb-HzM$YgP0*=!0Gl
zK0Kapc&(2)2{F2>6rhfSB@9Q&e~@K(SUgqUjrnofJ`iQa4-Vwy<cej}K|+{l!FuoQ
zi98PW@~&cBpM&{^K%^NY%6$*-Ug)RR*6D=>C4GI0sP~?p(Zv|%7lhl}+f+0()=o~b
zQBiomt^!2IA(=Rm4R5z6TvLs-YRu(`|6L#dm>Hc?GW!re%%CSo!o<V`gd%xx@6M4f
zadJB=Gt=C|BekfA-o4FObmk84xFYYl_v~E)MWq*3K;O$$#coYDSq%*$2?>e!{T3#b
zS8?XNing|_d3kwG-`msv{0X|gxlv(WXAKc_E9j{)4*IVPdT@An$A#uFJraQNz@l_x
zeZ0O3#;LOCa6kNusx|5OvwYOT#k!Y`=<4d4!<xj*KeGlG$a&_<0*fNX<<xjT^i$$K
zL%!(Sa1gz2W-BDe`*88xvhA>nd@uc9qaJ7g4iTXO8|ix9Q2?vsY&AVGZYtOLt)F*x
zX^}lOBO_zy^<I@}$(s0akx7Tw-It6ZPJzATe@$}`!I0U}mFeZ>F}S{o+{>4tpF$gQ
zkK_~GTwLPyO?|_5ckOvv&7dnij&rq5WDcf-n%+=xzcV|=V@C6i1Bpk^T&$K_oXI@-
zJNuNFx7|h6^TY<PPPe;sukIbIba)@-pMMBMh4~#6UvobB((1Xd*W$WrD)b9)#AfB7
zkPW{`GxBh$waK%p%;4G!|ERQ9Qy+G`GxZ?{F&9#<dZohCrJE5DBt0#t3!i!Rg2h7P
z9t6|O85JNoS)o%#NlBU5B}8D{;D7P6U2E{1947#(^sC0ODICSqldD<YS(l00{9@B&
z)nxeVs#BeCgLW=}oALoHN)|Vw9}K%W+j+bYbKWnT8D{EYc{Wy7vZZZW_(wZ>S$)lj
z_9TQt{NpP+?7BI!nwlEp!1Ec|4^zo~oRyWy>SZG~P34vNA|w;LI$ET~Q+7$G8=HAC
zyyF_d*E-2cyA8Osi%qtZ-X*l!a{pmtCOj5}74lkMO1M~)L_z0_-x5U0_PzDauB^1;
zr{d3wC0)y{HB5^e-e7{^%}Iq_J)07Y3k$;zy4|1^kdop#g$La;2H~E-OWlODc+|fP
zC(_X(Tb!37hd1&^GDfU2b8;9{MleVh-dL{Q?qX+`@<~Ze&d+BuN98^yrI%}UUShfV
ze4*)ME0mDUicVrwC`M9Pje?<<-qIrcuD9@0_OxJ}E_(@4UL!;P1FMk=dujmz0j87@
z28AJlUh~A+S-siXG{V3ji<9p&f)4qJ?9xEp=}*mGYY#rKw%bpaG9=6$4#VMT;HKT%
z9!D1&B!5xAZhJUU6TqHk84$4CGS|QNJY0re*m+Twj@T`LB4+88+O*`}nTsQ)kcKo`
zI7{aH_wOyg)5spe;mm2uyYcU&MIC1ElgiN-ObUpKR`}1kypfU90uSur?TwO@-}??H
z5mG}^m<8}bmeG3LPZFBmY{<_gMx5Y~x8zGd)t)3uuB;sW@#A9^HTfaoy-=s+&q+Sw
z+&XszF-P?_TGP;v^{Vn!Mn#_cvq}UNu(|2oPftu6bh=D6f8MnjyC_8tsxz=h%ZNO-
z`QGly4{z1>i4cm(W+^PSZ&jKX^YHLcJokzW(kt@fD6vtg(DzwGKV~KU?V_L%5la(U
zYA;k1?wF3?={%O9{5(}-{PwNDiO*v>t&jg@F6`8O%s%%!Iyg8;_GQ#d*3=@kY@i$;
zALpN0`FzRk2oq9~M(c+Nx5|K&BKO@{T|PiK2fMudi~|S!uFs!W9X-D*8XykF`=sTQ
zAr$qB1s!39@2k}#)Bd0PQ3CG$h2EW5aC=|$Zs?^J_3-}V#1vBN_;0-1-ob%^JVq(Z
zv|2akWV(oEGaw@Qr%H*ooaekK<CI-$X(<cU^W$&HJ+fh1O;D)tXEI`%TlGC<V-oGb
zpEyD!joI4T1FY7$N#Wu5ve->lt(!IHps9JfAMLYO4z0bv6Q#a1-RNpFp74ToEKns;
z{TyV+RC#9$SyUp}NU$#{j-4C5;>7m4h?Z{CAsS)F<apm7LDcGyo$l7;eDH2^i&j-W
zkE?ah(?9;ran+UNYk$V1$XJ3*k$}s3N9i8wawQ1ERRTdozu#~tO?BiB3ufHSCah7{
z-kyR;Q06RJv6!XA{5wpuoVFGF9frb<#`3;=_ognYcwEm}AfE)98f!nxgz4z19_fKV
z;l9o63s_P4QUd#?N$w?FFmoya{ZGZOEKObwra3J*H$v2BB<S~kYhQ2JOZdb0hCG_B
z&FTHXEiW<Oqc&spjCAf}!Rf#@%@inf$Qqw2LKiR13OkE-dN12dyFS%F_qru+TkfJ5
z>fr7<)6P<u*~}utrzhWzsQ&m#%q&{XfZJ-ZqOvl>(@GC-2U8nLifPo*i>>#OV~$Yp
zCrWWzTk0^E<Lz^CVmIv;w0kiNUb+1uX;{hd<FXcO{wxO9sS&!?#yYE+Hx<GbqKQ<d
zEKG$zP93x%vsRQgM=M>_ylZ+BPKb`dtFg_4i3|qpJ2$=90-FkFr;HPWZ}-N2e(%tC
zkU4Sxz`~4X7z*JogKTZ`TQL_t$o-g4@huIX1J6!U4-WTQJIziF(!7CsyibF^FOf}+
zOA~#lY|}&f)DDNW1OC|GO-2vT0P+#nju~?~k_l^JzL0`wVOLa7J#viJG7UlYuGGF3
zDp+M+pY9c;Bz@ZO;Hvs(8hxp%xkSMvN{n7;7xN_nNg_;_cm9GUv#zbT3i_$4NB8Mx
z2P{3>Z|w8&9z&-g(#VtHMn*+ZSxz|qs24}=A|fq}1M~FiHkpj@;0qgxepA)(;XF~!
zSD$fl)Fh$a>gqim{;<lBY-TW1ZLLPf$HodPD>ubWpDlf@%w1~UtjDVv5_v^q%TKi+
zQg}w)gNn;$rgKv+{o2<DS#Z*$&2~``YYnNAPu+{1KSaU4&Ff{^Ds$`MB_B0XmyhHV
zBaB?T&c)H$?sRF&N#i!>`Iw9Yq93$)nha;wJPtmYMf(ZYx!RqN8FT9k22NvFK{+4(
zUDuQTu|rnRm|`$!dQaU-Fr%Tv#(Sbt@>J+lmZM5|(_Pf?#uZb9Ri~c1+?p)5)ZP{2
z?@)y*dm8(z>4lNdv%Sd7qgFBfy>6W@{w*2doSAK+4z!tT$Dy#RnI9F%WwJ7!<(03j
z?q>xPH_@<RQ9b$^Fu~L8WW2Pf1hH*0T!=jostPLljdvNYT9lPVWwiZTl(}$P$S~(C
z=iNa*k9&rq^d61g{bqG(dkv8c)b5D@tHwNm7xX+dl7IVv+~8S(k%2+toj{E;QoG20
zu?K@1J)gy)*G932;vzRt7a7_M5EU-E%1y(v<jz2CW)>8fJ%m=<^IZO3ay64?h|E?m
zi#eb#BaTTSO~o5dB}r~rdX_I>tJCP9BbJv=&|6*&t9Q!v;7CMmdZhheA<JD4vH6@d
zwL5RWYOvz;H*3<cS<VLu6Y;z`Y@Pf<T1~zef{;poYNdL70EdhcYwJN4lg35}NpFTq
zwsL>+vCO{dC9=i`6~Y+{VwcS#hiq#Tb#KdcjOOOacY7*acr}mej=d|h53>$nX8rJ2
zu~bt?>l7-h4Z-hVOHvd`=U^tqa&PE$kF?vwG&%%h1t?Oh9FtR6{TBR~#(S9$YV5`V
z>h4E9a_lQNRZ-!>v}>|qJ!@J0qP$9q0-FdFCKcK`>)nj(IEmZCT5U~YP2>n+DpjU=
zxc(!}$3`YiIz4)u<IX42$c&@U8-x`T>kh?FbnEM}ygO1Yyu4a=a8e98hHANa=593y
zU0!1h{^{#`cR=?(Tfaw>6)O9UFc(z(g2@gW7NUEh*TmdZmus<^3F9|wZu94&m6dx7
zsZ5%ugt*nb5PTudjYyzWjg%UfVZ79F?X_kbQ-4Cmk`SI2SS!BUd7((TR`(%#Wfvn}
z%1`4Rj^Wh;3=<0`txb0aTZqV;LHs()oh+zL`N<RFkajvc(gW#d+9lKW$s->*ilAdL
zxhN4P^@+$>EX!{4IC&Zr<s>L&N$O?Rf6V^|Z0C6^W8+uFwbRqV97GBxQ&d?@bPA}0
zoft6>(BPNz>l+dzk+)}M%FhZIvC{T>;$|`*tZ4?ljZ!VDsCde4+F4#liDto;8|64Q
zgNQxkBgF@@Jw5STr8*o=MN4bzpzP;m{jZIbIxbR0n%r$ng)XRCmZ3MCz?JL4k*o|`
z`D+fWRgH)NyNjsXCoYpfSdEM*4Gj-lcdTk7rNCIi{x1&N3CvBnklIaUY-o~l2_+Sk
zg{5VmRx#CN)F&dB->=(XU)kP_&y9If^`MrQb7K!9O6|?MKpSKKcn56Hmq@u=dO9-P
zoUAMhAD?;m`DB{5_g4HFDa?8B?^~}oZmpZHg^sE!M+ajly2@7skL#V*UP+rgbX)BX
zqzD<d9tA?>zyC<Fu&}PHMYFhwap&)asWjY=8)j%qxq9+p+M?6e$_fPBwWitWS!{J(
zE&Sj14-?Szas2}WP~efKDfp6^i>6*AGUuIiUWt(6b18A{Gr?0vm^L;xO#LLc5IENN
z=kWL95jVdNb7ln(pM8QDk9?}HM_yivfc7as+K@qJhA{Y2xiM>Sozwk>{DGfpb6bPx
z=;)X(1{`$<-Z*$c+G#)tjGK!iDSUAjqaX{5kcI}ni2^B}y9Y01Ub{wJwZ}rC(J*{5
zB?&lu#ESm`0m1H%lz~-D4aML#Y8exl+ryswx6&=gx3}UHJf>DYJ_gFgxRe6!=?s`*
z(-wrhOKG&!)W2YE;WGHO2}i3vX4y5(@7tNtf9`IYkTgC9L0&;Y`D<$y;5U@0*wAGA
zWJO#>5;Y)7e|0d5TfrLXd$KOa!phq9aTW5}|L>nW&oV!3QX<Q4mXl|}r_cNm{hyhd
z`HG8*Lez4Er@nn-xO=QN9X(sfXC~0^^zxOG8Y5^-_4x7Gx(9~1CmI>D)U~YXSZ;*J
z<_6v{B3ZkZ1)e=qFf%ioO5pmCEazhSOsJAA`sYbDye^HMJb9ttFBqc^<8LpDpgFRg
zl@1w#h4bfe0(~S%K@+*6{a_xKINOx5j5qxplhq})R-&zI$fasCjz8U=+?Sw9&V;&%
zxuFrPZwzA$9zu-=jv&DtMh4S@Ha0dQZ?{yZAQ|d}c=IHxNcJE*1x~eTk>Ed_-DCAk
zy66ck9707d3*-HA|3_aVUq%qhAxzPXjTdauGDb#^j9Q!wVHa38FCcnRkg#a4_Q}ZJ
z-WT!;3f4GT_{+h^=-&1{m$!Y<40On%ml4?^M_5P6U97~oUuS2Bw#IWLY6`8#rXN1I
zS3<Im5gQlBCn)&CI#L4JO87+Fr!3=<0}Y1~HkKO*V{e{O%%=U_Q<Lu7j~`5dfr0sr
zuE4Yfp2~CsFBu*Y(Up9}bj-)|>_05MTqvo}^=_GWsdj}a&nge)gKxmn1D-Run5JCf
zb2|R4tNI8h%>2~<-&I;H394Xw_R^KCf<i(x3GyEnfO$&4D|*}Z_``<}Y|(u~agPFB
zb+|J&4i=i)x4B~6L~aX?0DK@*kTeKkH!ug#<P{Ta*U`o0w}+Wzfi3X)y)S|lgn$$q
ze$tg#2L|%$%F3UQb#WE+)dqN<BfAYaz1k`($Hu<!q=2#p@&Y~OgGR5zS7y}wyu8S>
zvrnwQ1}*uhsj2S)u%bmFu&mr0orZ|n!BJ#_2?`7Qwew}5_{7D>c6RI*;y#0^L_$Jh
zdXJKrFv2i(MJUGxMO5vB$L0kBeAzzDZ|`Va-~?F!8v0^!aZ%X;aqJ@z>%anfWpR;R
ze4k7WnZ}KI6N>{9?7+qw4YD7nzJN7k<#~=%w?MO0!@IjBHGb%jh5@(sTHHMi;Tg-^
zpZe<6tH?pieD;w|cfX#717dDCT-5(}^;{AB)2C0Q1m<#<&I5i!%B+Rfwt*@tDpLo~
zs6e;c%S1_<p1Qwrv2$=}ynd_56Y(m+U{|=%T0eB>Z(e5RF;mgj_O__+FQ&M-xB*MP
zzP0+5zd1k-LEi!6nE#j%;UlgNV8ToZ95T!2<bQ>Y2a<_Im|Y?7_WZttI<HTsUgE^a
zzo6{%4NXGCxNhe&`u>Ddmr($x`1^P0nEhhM+^5vu$d$b8CGu;*yF-KxJBE?fyj%SZ
zRV~p5L*UI}^PF<o+w=PX#qbZ9f#-cNXQ*IVJhj;D=sVZ3vT5I9ENTRt7w}R1s}|OT
z`mYASbM7aS^F`sB18AW>fvCF-GrPoII6;(n_Wp;bCkVXK5}m-3a|35|@o`MgWel0C
zzKY6y;7uE2Seo@aU%&^HiTXb)OE-OQ1>->SS5m^))zwKP5;3QRir?AUK{ukfKXi0F
zlGCzM(5i#gn*zCXua#dfemGmm(V)qO;Gg;L@9#f5Kj-7+MccEbNrTA=o&eZd3heAb
zQjMtmWYA}f@ifo9?$@u@<j$yygh<mN!wDW4w7Sq_7`x+*SS5Risj;LyUDSm$14Kj^
z5hcqY`$22A#z+D1Ff}!`mh+tJfW!I=K)Y7w+um;P^M~ydaK!%uJ|;+g#FEu$P6n#^
zT`AdY#GBJsao?)T%7&Xw`6A}A^&wKbhlgFXm(u_g)v(q142sZ$R?4ofM<&S0BqmyP
zHXIMXe|K=~S=qSAOLch@6=i7z<*_wd*44GH%1}$A+#k>9Y-b7syDyOZ^C+sT*IY9i
zk)>Mt#ojIDRikLsqeqV<;?glC@jJc1X$m1chbvu6H*|y4FTbm!{*fhI5sX{H<9O}8
zoxQ#FQI0x~@kU7@p=PTY_STEpsi`%wpS*eMr{7d~e5valkZi}q$7$a?yyu)<mA*eb
z{*uI~g-`P72xpmq>k$~?^?^74rdPDMMb!nLu&~W@C)Ce7Az|V6d(Ed;;$X6MUTx((
zdDRVliKIZ(9WFEtFYU}xOMfT+7ipi3_^1_ezWLwG)Ku^9!=<P}%lHNnzD8dwtAU1C
zGKM5v8XB5fXDxWz)RdNK@SW%6Yh1M*EJ>o<!+Z&U2T84FX*H7LK?<`67|#)Zp$EM<
zIi7dd=balgM{W;#DCq@Ezy74DHEbI4LWExBFDw|E23=XBI$56ZK>`ST*01;L>aMPs
zgp~eajyG7?_7`tPHJjw25KMr6hOW=|CF1-5uQX`HPbaIceI_V4A20NYy<ptN7tAH_
zMWRaq)-U9JWPwTW-TCV84}HpoHn^94_j#a*JkpQfUBo%t_QPvyxobbK<13U&cjCO3
za^lW-?f$EVxqQ5cY@;|;Z#YC65g#AVyhhDxmn{#9UYl1DRh>>`+@EuTXUphSO&3~C
zPe}K1-~C5V726ZAGOi811*tcqIcf{5s;VNH8kfe#RHxd%s>i6kdZ9&1{pitoMWGFB
zagd~_{@uP~UDpsuq6KwU_bwgL9M6{BUaFl{>xLmFrTzvG&&$17JRDH4#|gV!0TpQX
z=g$^ZVaE2!+)~|%u`$vLQz{sBgjdugNEkq&Os%KsK}mi0#_&EV$jgg(?xog+GLWA*
z<7=N>J#y`A;5;gO%*laS5d7zgfK>5<k4e7LM-I>(R619+S<gyC#tTqmZEd-fG64k6
z%bUqK6k27KtXavyl{R`<)6kG)C+MKm4Xy>UT8-bt_UQvcLig*lU3Up<jt3aQn75m8
z&sOY?e(K|*WRQSt{KY>u3o&vVxiG?CKM^r%b=gc-;eJEFe!skO^z2L!SWVVqx&o1w
zQDYZ5ndj@7Bk77v(f>6l#?CJ<AM8*@Z3Actvit7-{^?>UL+FEJrsK^Vm-gL)yV_+!
zGDh@Tf5dB~2{IU~wst@uJ3D*6-ID{b>~8}CGFJcP=H)R18>dp1HN%H4kB<9YlI5{=
zXD3*R(<4{^%F7eZ_%I?o{GXnv=wfrZR6uJWY(ebOXmM$zH$?Jc`K<)f74r9?Tf#s(
zqS<k-(f8B_6q0}}#Z*-mAddc{A!OXGW-3a-7d|o)rD`yU{rS^HWBNr+e#YcB6&2MQ
zsKCrMCX693(7~8yU0{l#%vi=C-4Bo3w(~o3Wiq~UT^{I4_h$ASG@?GAeN!p9NBjjq
z-fz30W6}ZK1<K*|>(?r}^=a(F5mvFk3k<KLq@r+9pPHM22C;W?N=;to=lcRY0_Y=f
z!HV~O>R7ALKR>o|T>nHBkY%VLZ3_au2##+^bMKoe%z^CK-rhc6ZxQ<E!&R6uw}M!n
zspYD5lOYQWOJ-&!U7os8@>e$IxcW!MWKptqj*cHd(qp4)DP{wecBvw(u_vy<7@$l$
zyGX#`C+{;Vt>YdqbopQ8pM7Xd#=AUdniR&kz_@^Pb8-=b8+36gEhz~DJ@;*S+4$T0
zH_vmF6It`rm;6$OF8G9m27zV=e#eYT#Y&AoLx_auNdh47s{a1|Q-x5D2>A#11^)C}
z1yPjoUj^j<)7SYD``(-n@kiXd@oraEy8Kbmnf@$jfk|<akLIg)m~Kj<L=k<6uYl%)
zp<rikKP4eo*OC`Y50U{_KZm@52}wggF#cOxThZYgj<4vMtLC96vB?vaE>(AmOfsD0
z(>)z?UW;j2`T1MRZEyW5U(qIE|9N(NW#rOk{W%q1{NZtyZN5ELK9;1xXg_qoj|~)6
zK|w*{m_Z<Qw7*TLND_t^bGLq!ntPhb>3@)B&VLhKOdKa)Qiks%TA*HbuB7**NubRF
z^HK+$;L^59uCcC{jnI&~JF`aenRm?1;sNw6_WZfMt1Bxk>g(69(hNy%2aH@{ZV;f2
z10;{`FN_VR%|CmB1EeILNSSb3UMu^DN_JpwKq)0V_q;&_W4d&n&l;^JcD;!Hf02cd
zTFBGn6U)HOi3xRB6m-f?_lOL`_nl~(fGNptla=2CcCPW;dElVi{Vsk5T1~vPpqxh{
zF+xK_nbn>*BL(aK&KkK&FzC#uAv7e;|8qebAvX7-yl}&0s*PIXfB*K9DN5|t?)om$
z>CRlZGeXQWwOr-^@6P{CCP)96kR(ptM8WNOUMok+h}A#wcXxNk$(h<kmw_Mfvt`NU
z=5_14cxb?0MOhHdC5QOXxtN&PzZI$f&tgr+-+330JTQa(&V$n#q*nYFB=m)Ci}pD|
z<+-xz#sx_4XfVlw%C}iV625yaIk))6IrsFYXh^n^UkZpP@=(Wp`~F=Gs2`vf<7o~W
zc_YN2@3VzqlWbg_iV|7;{1@C5KyHG<tSEt+7<e06%m%3O*OiqCke$jj3Ty(5#g0Bu
zwd$bfxmqTh9M3@LD+<zgC~Y7KzjX|QarSXeGAS)UW-!_y*F>~c^oja*rx<?FVTMt}
zaV~(j)|ZvK_H2o&ETVze9-^?5*(KMWJF2St>CoHR)^1O-V;!avGjM}P0o%{dXC&`5
zn{4{B;7(7^4SR_u^;?$R4`NDQRQtt^Hd71_5BuJo&#5##<iXHic{5C-Lg`fYE|^5=
zS942?JE(R%hCajbQ1u^fzs$SJDS0ZtsIj-x%u&A($a=8rk!{Xf9`Qz5D0FPK=);H5
zi=MxCxzD}h1#BmLPO^E5cymq?#wa)eWX=8$AB&5N%lPfMQ2Ihdb&vrE43D+%aUI8;
zS8CX5^3?94J4`p$S+LTUo(!cm0%{|QyCW7%I`w?<U2F2yn`(7#t=`q!t!HF(cp?*(
z@v;m7Xe`=#wZKjCR@C<CH5)0_%&REr=9G_TGSaOZujtEhHzLt3)qBm)d2CLU#GaB!
z17xydsJjOH$9(0Dzu?qcqsT2AGOJ#NwJI{`RyRns7$1!rXgs~}ZEJbV<k7D8Q=<5<
z7%}e7_dvage6s3^h<=NeyPw{tAQOI@o3r&Tz&s=^wICgbw=ke>TC)pzXS5P0cZW&m
z<aP?R6SY=17ZW!ZW41On-F?P}860;22VHZ^G~jF*uulraiPrwY9sK*i5cP}2X($d6
z6ZUxO>(|06(^gtjI9$6TwWRVK@?6PLza@9ur)^7K<h1P-LwPA#cqu?cGDXBEKFjXp
zMP#wt{cF5Mnu<1lNE>v=5Q!elEyjq;5*C*gpvPlrVbMEl^s6$cE3uyRbF*AHLT|gW
zraiAVDzK=iZ|yj_AxiI@YLX*bh6$ELh0*ceh*?Rx>S=;rv9E>23!;ikvI?G=t(2O%
z{c}I&5|cJ3VHN(Y{}ebzvIU}UI+$uPFdn%4+Y2CTIRf({H|VQLc0wvLtvg(7o?a!}
zI*llbNk#6!uSfGQUcz${GI9znxekVg<cC*{ay6J>{72Jy2)(c|H^xG{OjW9~;LHbY
z)l79xhK8w*6r=e@+)sCPXFH`NB-D(ImS8EU2O~`A38=WojwZ?1O}&^Tgcm&}6{Nk0
zG-r}Xh{q^{qQcIzJG*jGWx<$xoBBB^y(onTjhILIF1k1L8lq%_$42%JEQ;3>k=(Vq
zxG@@*I7za8X<6ED*2ZOfYgVFUcW#uOU|mYgX(@2rD8j~27<<S1Wa~F$R>$lpycP9A
zR?11H!*O#y5#{UTInIW8NcTFOt1lm+s4Q*BI<QZ)H?wsb8fyyoDw%1VX>(Xg;Gcf<
zu9t4j&47heXMk@KrWxz^R1O<eZp8D^{f6XA>ghY}k!_E09wAPhQeD_6E=j|WNLkkm
z3Cspu(rgP;^8TN4^Fn@YPTiXx@>Zi)YSLA2O%ukq4;I;;AFwAWeo=kLvz}>-m#N6~
zSb^#OXSIlG?3_u0v`=_l`DWY|cG!jy{7({4sT}K>l0i57W`F%KqOg0%`|AY9{lc_f
zNOz38glWGeG-)6WpN=jKay8B0*7Fiwa=!47<jO#C*(Y#X9Y}W+`LdjGx)bm!O4sl{
zKzaVEcz}xgaa!zBR#rx{p|o`xq@=(j^?vT=HaRvZ_dXO7n~<Qg$;0>Z2kPxRRgd?O
zVPVL2p#io^gn4y3i$Gs_(04_)QM>G+`FYA5VdrEP*@}Uu6hWUR?_V8Epz;MQgMzy4
zEHDg#1D{)FfATtH5c(gJd@sTicSx1LX`Jq5A20-~_c(R&O&9g>uX1bCWP~|@29cMS
z|9qzHiic<Q_+f)zsBA|I#wun4jF%LD;T}^QQM0>ru41`8H86N!HSQ^nZQB~f$!Ocp
zIa&eonBAz>F2xsA3bJE5=>}6~+u2$Wzu$-&H0gWcr2vQ}+^>niV!5ul_Otd82b}*p
z%z(4Btms%-nhGeGtSDs_yvX;^R4Vrm_P_b0UsEv_m6nxh!Dpr-o5jrH@)O<n%CS#n
zs*8CA1U9lUS8x|JRT+{Jvyi6Q&{U5mi5k@s`|Ky3XI~2pbQPL454SU-4LFAY%VHJc
zB$>fDYCvKj=emD4+aS-6=wz7GbLN=4f!O%6>E3=;RaRq4ztU_(t|?$;nVq}=c}^j!
zPY0G~a;!~1t8SX&iAYH$l-lR_L#o(lz$z&mo>fqA;ZZQ=y8j~4DZJHB=A$Jdjjm9U
zkg;k-UrX{m3rTR0;g{Q%WEe5IC<R3HhUf=Q@u&<O9(e9cL|`VDMZCxYShI4;$G^Ay
z@sV!sOg@@Sm?oiLU3L%S;!?vh8`~=1WzfoG`e^m@_ta3PGly`Yd+(9bQ%dC#7eU7C
zmG!lJBe~&G6{%uYc>-&AHx5{%rNh50b#QN7;dk6p?-|#bhjTODguvM55gOtrvWc*8
z3&UPVADNHxT+ENYv5$sEwne8}o34krEGoN)8&8sGh(COwMM=Gp-LGG&UH7|ShwsfJ
z>jwP40B3uo0J*51jo|NZWXj9tt>-JWUnHmM;+~e~feLPInJ}Y&F_Pl%9<90x9nh11
zW_}+*S(pPobNCw-T)33l1HVjg6RB1a;E`b9w@C*#MW01!&PJNtI1QHcO38jL)hZ+R
zz=jZFT&N~IO_k*(d)lv>4=;Z3CS?^<Ny|W#+h@MP+-z**HMkjH>r@x>6Jx%H!%K8{
zzx<M(B}s3@v}W9NS@4G@k6399dxgO`>iV!PA(@qxOesopzZ$cNKZd2}60kkOB8_`+
zFH|loc8nNG%EakO)e27~d~4cub>)k4i!EjYR154hD4T#R%rwemmo|5#H7a)>+?%q4
z!(-gffuq}L+Q!D?X!AN_uLcWiT5xzl1Q2+Dm;tdx$TlAdKmt2oG1+qZTO(P2jOpSj
zz0B<F<e+-^OJKx7$pTfr44dq4Hyome!=MvFS5Rsn8ymZWIt=e$YjipVGCIo=3sY@c
zy?u8Nz}WEc@Q(zVRcczKf&8(=+w0jxyD#+D9u5^5$Sm4t4;>%#(j7S&IKO=P5<F;D
zBP$kCsdcDy+Wz|b8i2s3SN8$X2OC{t!q0GTEWwr|O|~DIwk~9Uq!XP30y=jB?<@HL
z5}jq}+yYKt8_N=C+`G0?oc?5r_Rdu<(S8cNj?~|)$t<vFFkPyaALah%)>peicS`$_
zCCUBQt<BB5n<@k+)$3f5u_Z$U_#FB8o*bi8N5Bxi-k+_>*R3zL&z0~`2X=%<D{ci1
zwtY=>0VmZHJCKR|KL-WS+|wgKkN>$O8XA+viJ0R7Sx&d{Y@zGG^{^;J1#hJFG_pI-
zJV?WmWP9w$$;~bCJ_R=?eJPzWONs>;my<zz;h^hG1JB|A*saI#pH+>ZUn#+y^0L8%
zmlyor_OC2pSKuQOz$}3Ybxiuf&rmS=c593(aIr)yn<|gk;+e7UW?HT2)`7N4mek?I
z3}fu-($DGp_i%7BZpn-FWuaxZwzi_cvgap{<ENyg_&r&Jt(<Hl6RVF=W`BN}Vc~Sm
z7PH}ljZGH7t^=?N2@BTb&$4oIQq}KZ;AZRNU(Y?c1gOXgMP5NBqx_D-{aWc&){mIR
zwnWt6&JLRtV2IJ5q75DJ{f(>r7N@3O7#ZcP(1YC+sNLx@&@)`;5;WI`tA7s7BG!F-
z3krF;k5_#wl%@r_jXxv7vW>m7^UP^H)kd()DAi2e%r-||r;MYcqf*tg5v0@pCEf;+
zRuzj3d)j)0)U8F*M*(@p*zKZY39uIi*jQCn)x>cdr4nua7)`M?e<bU`3$6B9p1@rd
zXQUK{e(LFaHxX5U6(oNsC`!?v<T6<Rgz|y*ZfEcD!ve5>YxQcv8<^Dkv;e)~K0S*5
z?a_gKWL?0XPQkb5`58a%2i=|wcZ852f4diyvPI|nt7?%-*cT;5>J0-R5OCQ~TWhGK
zop8A@88ie)h}K8b!$?-Y?r*!F3hvHaF`i4_?P?SV<QvOKBZg^%JMk{1kmErTG+&$e
zqU+-|N92{*TJrOstlX?z)W(x>l4O^jEIQVm{6g_8!PLQ(jBL0wss_-B+lbZ6vofhJ
zD|8VvCT92LAP+kd3%T8(z6&RZp8UEJ&r+4Y7>H$x9o{hZKWzR7U5<u(xOgQb#xJ@r
zx{9THG^;GR<0-|pi+n{z(H97uqwX6QmEr}MCOXFKcHIk|aAHWE4c6z*f(wZ6`sljX
zqd9z5Z&q5x+-9&$eK*O1&OXrYs^`;X?QDasRB6I*^09(0es&xM^;aZvU}8V<KWMms
z5Mk1C_Bj6}7LMe7_hE|d$am5o*!^keQFte|8iy)>L0;bGkC7Brb#)kim?mkMonSlD
zUsvoC6Z9YdpKaUBS$*HYqQybOuovVniBIcA%N3TKmYtp5*H)kz0ciwwn8Q?g%Uu-k
z@vNMj*Ir)fAlU>~xg+na(cU0J{%cd0U#ijw1=>JCjDrv6v@XAlUtrUR2g`lXGTF>b
z7z`45T-(kxL$2^1EIdmn)cLOZ9K2*3aLp|--wxamD7cE<9!isy4*3@VHy{&2bphdG
z*4M+1<V~WiV!Ku!&zTnTaWt>-75MFGWP-A3y8hfL)=zrOc}##lk~+<r{9LE#5ZZ`q
zH^7)64#W1+qT6_4?%5TW7Dnp!9<u9q)OE4)ZP<wl{RlJ8=SPx4c1R9e;>jGsx(T7b
z#_<ceszvvG&Ht#YwOUeyL-##GUi|jB-w|PiFvG6J=C0Vm(%0hV#`sHgDSSK@c=28T
zn#~GNHy2^^@3agoT3)BLM}HdesXFlj%$zR1d$0CzZ}(^9f$z`0zTEeTiJgNS^(D%_
zA?udGHtm)Ed~?(j{5hMTQVet4XQwFQ6(U&0g7^I!qr-&LaC&?!jMycjqn^KizLkmS
zVF)QmKNr75hmIqK(_wEpV1|<VZ2U<3blBm4SVZFJj($zN{|GP-kI|t-_nub&bfc=D
z{bXV}e^eaQc_Pk>Z*08GP5FCp7AMyi9fG4A-#Y`@%SSZ&9QWd2ktUxQBz+2zS>|`R
z{Iv9}AXFxnv+Hw-YJu0yQ*%N`_c)1TB$m+JrWW39@LjoH!-I?BEU;A>LrG3uwpPac
G-Twfpl}P*m

literal 0
HcmV?d00001

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
new file mode 100644
index 00000000000..c2130e08b5b
--- /dev/null
+++ b/apps/contacts/js/contacts.js
@@ -0,0 +1,1289 @@
+function ucwords (str) {
+	return (str + '').replace(/^([a-z])|\s+([a-z])/g, function ($1) {
+		return $1.toUpperCase();
+	});
+}
+
+String.prototype.strip_tags = function(){
+	tags = this;
+	stripped = tags.replace(/[\<\>]/gi, "");
+	return stripped;
+}
+
+
+Contacts={
+	UI:{
+		notImplemented:function() {
+			Contacts.UI.messageBox(t('contacts', 'Not implemented'), t('contacts', 'Sorry, this functionality has not been implemented yet'));
+		},
+		searchOSM:function(obj) {
+			var adr = Contacts.UI.propertyContainerFor(obj).find('.adr').val();
+			console.log('adr 1: ' + adr);
+			if(adr == undefined) {
+				Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', 'Couldn\'t get a valid address.'));
+				return;
+			}
+			// FIXME: I suck at regexp. /Tanghus
+			var adrarr = adr.split(';');
+			var adrstr = '';
+			if(adrarr[2].trim() != '') {
+				adrstr = adrstr + adrarr[2].trim() + ',';
+			}
+			if(adrarr[3].trim() != '') {
+				adrstr = adrstr + adrarr[3].trim() + ',';
+			}
+			if(adrarr[4].trim() != '') {
+				adrstr = adrstr + adrarr[4].trim() + ',';
+			}
+			if(adrarr[5].trim() != '') {
+				adrstr = adrstr + adrarr[5].trim() + ',';
+			}
+			if(adrarr[6].trim() != '') {
+				adrstr = adrstr + adrarr[6].trim();
+			}
+			console.log('adrstr: "' + adrstr + '"');
+			adrstr = encodeURIComponent(adrstr);
+			console.log('adrstr 2: ' + adrstr);
+			var uri = 'http://open.mapquestapi.com/nominatim/v1/search.php?q=' + adrstr + '&limit=10&addressdetails=1&zoom=';
+			console.log('uri: ' + uri);
+			var newWindow = window.open(uri,'_blank');
+			newWindow.focus();
+			//Contacts.UI.notImplemented();
+		},
+		mailTo:function(obj) {
+			var adr = Contacts.UI.propertyContainerFor($(obj)).find('input[type="email"]').val().trim();
+			if(adr == '') {
+				Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', 'Please enter an email address.'));
+				return;
+			}
+			window.location.href='mailto:' + adr;
+		},
+		propertyContainerFor:function(obj) {
+			return $(obj).parents('.propertycontainer').first();
+		},
+		checksumFor:function(obj) {
+			return $(obj).parents('.propertycontainer').first().data('checksum');
+		},
+		propertyTypeFor:function(obj) {
+			return $(obj).parents('.propertycontainer').first().data('element');
+		},
+		checkListFor:function(obj) {
+			var type = $(obj).parents('.propertycontainer').first().data('element');
+			console.log('checkListFor: ' + type);
+			switch (type) {
+				case 'EMAIL':
+					console.log('emails: '+$('#emaillist>li').length);
+					if($('#emaillist>li').length == 1) {
+						$('#emails').hide();
+					}
+					break;
+				case 'TEL':
+					console.log('phones: '+$('#phonelist>li').length);
+					if($('#phonelist>li').length == 1) {
+						$('#phones').hide();
+					}
+					break;
+				case 'ADR':
+					console.log('addresses: '+$('#addressdisplay>dl').length);
+					if($('#addressdisplay>dl').length == 1) {
+						$('#addresses').hide();
+					}
+					break;
+				case 'NICKNAME':
+				case 'ORG':
+				case 'BDAY':
+					break;
+			}
+		},
+		loading:function(obj, state) {
+			if(state) {
+				$(obj).addClass('loading');
+			} else {
+				$(obj).removeClass('loading');
+			}
+		},
+		showCardDAVUrl:function(username, bookname){
+			$('#carddav_url').val(totalurl + '/' + username + '/' + bookname);
+			$('#carddav_url').show();
+			$('#carddav_url_close').show();
+		},
+		messageBox:function(title, msg) {
+			//alert(msg);
+			if($('#messagebox').dialog('isOpen') == true){
+				// NOTE: Do we ever get here?
+				$('#messagebox').dialog('moveToTop');
+			}else{
+				$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'messagebox.php'), function(){
+					$('#messagebox').dialog(
+						{
+							autoOpen: true,
+							title: title,
+							buttons: [{
+										text: "Ok",
+										click: function() { $(this).dialog("close"); }
+									}],
+							close: function(event, ui) {
+								$(this).dialog('destroy').remove();
+							},
+							open: function(event, ui) {
+								$('#messagebox_msg').html(msg);
+							}
+					});
+				});
+			}
+		},
+		loadListHandlers:function() {
+			//$('.add,.delete').hide();
+			$('.globe,.mail,.delete,.edit').tipsy();
+			$('.addresscard,.propertylist li,.propertycontainer').hover(
+				function () {
+					$(this).find('.globe,.mail,.delete,.edit').fadeIn(100);
+				}, 
+				function () {
+					$(this).find('.globe,.mail,.delete,.edit').fadeOut(100);
+				}
+			);
+		},
+		loadHandlers:function() {
+			console.log('loadHandlers');
+			/*
+			$('.formfloat').hover(
+				function () {
+					$(this).find('.add').fadeIn(500);
+				}, 
+				function () {
+					$(this).find('.add').fadeOut(500);
+				}
+			);*/
+			$('#contacts_deletecard').tipsy({gravity: 'ne'});
+			$('#contacts_downloadcard').tipsy({gravity: 'ne'});
+			$('.button').tipsy();
+			$('#fn').jec();
+			$('.jecEditableOption').attr('title', t('contacts','Custom'));
+			$('#fn').tipsy();
+			$('#contacts_details_photo_wrapper').tipsy();
+			$('#bday').datepicker({
+						dateFormat : 'dd-mm-yy'
+			});
+			// Style phone types
+			$('#phonelist').find('select[class*="contacts_property"]').multiselect({
+													noneSelectedText: t('contacts', 'Select type'),
+													header: false,
+													selectedList: 4,
+													classes: 'typelist'
+												});
+			$('#add_email').click(function(){
+				Contacts.UI.Card.addMail();
+			});
+			$('#add_phone').click(function(){
+				Contacts.UI.Card.addPhone();
+			});
+// 			$('#add_address').click(function(){
+// 				Contacts.UI.Card.editAddress();
+// 				return false;
+// 			});
+			$('#n').click(function(){
+				Contacts.UI.Card.editName();
+				//return false;
+			});
+			$('#edit_name').click(function(){
+				Contacts.UI.Card.editName();
+				return false;
+			});
+			
+			/* Initialize the photo edit dialog */
+			$('#edit_photo_dialog').dialog({ autoOpen: false, modal: true, height: 'auto', width: 'auto' });
+			$('#edit_photo_dialog' ).dialog( 'option', 'buttons', [
+				{
+					text: "Ok",
+					click: function() { 
+						Contacts.UI.Card.savePhoto(this);
+						$(this).dialog('close');
+					}
+				},
+				{
+					text: "Cancel",
+					click: function() { $(this).dialog('close'); }
+				}
+			] );
+			Contacts.UI.loadListHandlers();
+		},
+		Card:{
+			id:'',
+			fn:'',
+			fullname:'',
+			shortname:'',
+			famname:'',
+			givname:'',
+			addname:'',
+			honpre:'',
+			honsuf:'',
+			data:undefined,
+			export:function() {
+				document.location.href = OC.linkTo('contacts', 'export.php') + '?contactid=' + this.id;
+				//$.get(OC.linkTo('contacts', 'export.php'),{'contactid':this.id},function(jsondata){
+				//});
+			},
+			delete:function() {
+				$('#contacts_deletecard').tipsy('hide');
+				$.getJSON('ajax/deletecard.php',{'id':this.id},function(jsondata){
+					if(jsondata.status == 'success'){
+						$('#leftcontent [data-id="'+jsondata.data.id+'"]').remove();
+						$('#rightcontent').data('id','');
+						//$('#rightcontent').empty();
+						this.id = this.fn = this.fullname = this.shortname = this.famname = this.givname = this.addname = this.honpre = this.honsuf = '';
+						this.data = undefined;
+						// Load empty page.
+						var firstid = $('#contacts li:first-child').data('id');
+						console.log('trying to load: ' + firstid);
+						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':firstid},function(jsondata){
+							if(jsondata.status == 'success'){
+								Contacts.UI.Card.loadContact(jsondata.data);
+							}
+							else{
+								Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+							}
+						});
+					}
+					else{
+						Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+						//alert(jsondata.data.message);
+					}
+				});
+				return false;
+			},
+			loadContact:function(jsondata){
+				this.data = jsondata;
+				this.id = this.data.id;
+				console.log('loaded: ' + this.data.FN[0]['value']);
+				this.populateNameFields();
+				this.loadPhoto();
+				this.loadMails();
+				this.loadPhones();
+				this.loadAddresses();
+				this.loadSingleProperties();
+			},
+			loadSingleProperties:function() {
+				var props = ['BDAY', 'NICKNAME', 'ORG'];
+				// Clear all elements
+				$('#ident .propertycontainer[class*="propertycontainer"]').each(function(){
+					if(props.indexOf($(this).data('element')) > -1) {
+// 						$('#contacts_propertymenu a[data-type="'+$(this).data('element')+'"]').parent().show();
+						//console.log($(this).html());
+						$(this).data('checksum', '');
+						$(this).find('input').val('');
+						$(this).hide();
+						$(this).prev().hide();
+					}
+				});
+				for(var prop in props) {
+					//console.log('loadSingleProperties: ' + props[prop] + ': ' + this.data[props[prop]]);
+					if(this.data[props[prop]] != undefined) {
+						$('#contacts_propertymenu a[data-type="'+props[prop]+'"]').parent().hide();
+						var property = this.data[props[prop]][0];
+						var value = property['value'], checksum = property['checksum'];
+						//console.log('value: ' + property['value']);
+						//console.log('checksum: ' + property['checksum']);
+						switch(props[prop]) {
+							case 'BDAY':
+								var val = $.datepicker.parseDate('yy-mm-dd', value.substring(0, 10));
+								//console.log('Date: ' + val);
+								value = $.datepicker.formatDate('dd-mm-yy', val);
+								//console.log('Date: ' + value);
+								$('#contact_identity').find('#bday').val(value);
+								$('#contact_identity').find('#bday_value').data('checksum', checksum);
+								$('#contact_identity').find('#bday_label').show();
+								$('#contact_identity').find('#bday_value').show();
+								break;
+							case 'NICKNAME':
+								//console.log('NICKNAME: ' + value);
+								$('#contact_identity').find('#nickname').val(value);
+								$('#contact_identity').find('#nickname_value').data('checksum', checksum);
+								$('#contact_identity').find('#nickname_label').show();
+								$('#contact_identity').find('#nickname_value').show();
+								break;
+							case 'ORG':
+								//console.log('ORG: ' + value);
+								$('#contact_identity').find('#org').val(value);
+								$('#contact_identity').find('#org_value').data('checksum', checksum);
+								$('#contact_identity').find('#org_label').show();
+								$('#contact_identity').find('#org_value').show();
+								break;
+						}
+					}
+				}
+			},
+			populateNameFields:function() {
+				this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = ''
+				var full = '';
+				var narray = undefined;
+				//console.log('splitting: ' + this.data.N[0]['value']);
+				this.fn = this.data.FN[0]['value'];
+				//console.log('FN: ' + this.fn)
+				if(this.data.N == undefined) {
+					narray = [this.fn,'','','','']; // Checking for non-existing 'N' property :-P
+					full = this.fn;
+				} else {
+					narray = this.data.N[0]['value'];
+				}
+				this.famname = narray[0];
+				//console.log('famname: ' + this.famname)
+				this.givname = narray[1];
+				this.addname = narray[2];
+				this.honpre = narray[3];
+				this.honsuf = narray[4];
+				if(this.honpre.length > 0) {
+					this.fullname += this.honpre + ' ';
+				}
+				if(this.givname.length > 0) {
+					this.fullname += ' ' + this.givname;
+				}
+				if(this.addname.length > 0) {
+					this.fullname += ' ' + this.addname;
+				}
+				if(this.famname.length > 0) {
+					this.fullname += ' ' + this.famname;
+				}
+				if(this.honsuf.length > 0) {
+					this.fullname += ', ' + this.honsuf;
+				}
+				//console.log('fullname: ' + this.fullname)
+				$('#n').html(this.fullname);
+				$('.jecEditableOption').attr('title', 'Custom');
+				$('.jecEditableOption').text(this.fn);
+				//$('.jecEditableOption').attr('value', 0);
+				$('#fn').val(0);
+				$('#full').text(this.fullname);
+				$('#short').text(this.givname + ' ' + this.famname);
+				$('#reverse').text(this.famname + ' ' + this.givname);
+				$('#reverse_comma').text(this.famname + ', ' + this.givname);
+				$('#contact_identity').find('*[data-element="N"]').data('checksum', this.data.N[0]['checksum']);
+				$('#contact_identity').find('*[data-element="FN"]').data('checksum', this.data.FN[0]['checksum']);
+			},
+			editNew:function(){ // add a new contact
+				//Contacts.UI.notImplemented();
+				//return false;
+				
+				$.getJSON('ajax/newcontact.php',{},function(jsondata){
+					if(jsondata.status == 'success'){
+						id = '';
+						$('#rightcontent').data('id','');
+						$('#rightcontent').html(jsondata.data.page);
+						console.log('Trying to open name edit dialog');
+						Contacts.UI.Card.editName();
+					}
+					else{
+						Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+						alert(jsondata.data.message);
+					}
+				});
+			},
+			add:function(n, fn, aid){ // add a new contact
+				//Contacts.UI.notImplemented();
+				//return false;
+				console.log('Add contact: ' + n + ', ' + fn + ' ' + aid);
+				$.post(OC.filePath('contacts', 'ajax', 'addcontact.php'), { n: n, fn: fn, aid: aid },
+				  function(jsondata) {
+					/*
+					 * Arguments:
+					 * jsondata.status
+					 * jsondata.data.id
+					 */
+					if (jsondata.status == 'success'){
+						$('#rightcontent').data('id',jsondata.data.id);
+						id = jsondata.data.id;
+						$('#contact_identity').show();
+						$('#actionbar').show();
+						// TODO: Add to contacts list.
+					}
+					else{
+						Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+						//alert(jsondata.data.message);
+					}
+				});
+			},
+			saveProperty:function(obj){
+				// I couldn't get the selector to filter on 'contacts_property' so I filter by hand here :-/
+				if(!$(obj).hasClass('contacts_property')) {
+					//console.log('Filtering out object.' + obj);
+					return false;
+				}
+				console.log('saveProperty. ' + $(obj).val());
+				if($(obj).hasClass('nonempty') && $(obj).val().trim() == '') {
+					Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', 'This property has to be non-empty.'));
+					return false;
+				}
+				//Contacts.UI.loading(obj, false);
+				//return false;
+				container = $(obj).parents('.propertycontainer').first(); // get the parent holding the metadata.
+				Contacts.UI.loading(container, true);
+				//console.log('saveProperty. Container: ' + container.data('checksum'));
+				var checksum = container.data('checksum');
+				var name = container.data('element');
+				var q = container.find('input,select').serialize();
+				if(q == '' || q == undefined) {
+					console.log('Couldn\'t serialize elements.');
+					Contacts.UI.loading(container, false);
+					return false;
+				}
+				q = q + '&id=' + this.id + '&name=' + name;
+				if(checksum != undefined && checksum != '') { // save
+					q = q + '&checksum=' + checksum;
+					console.log('Saving: ' + q);
+					$.post('ajax/saveproperty.php',q,function(jsondata){
+						if(jsondata.status == 'success'){
+							container.data('checksum', jsondata.data.checksum);
+							Contacts.UI.loading(container, false);
+							return true;
+						}
+						else{
+							Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+							Contacts.UI.loading(container, false);
+							return false;
+						}
+					},'json');
+				} else { // add
+					console.log('Adding: ' + q);
+					$.post('ajax/addproperty.php',q,function(jsondata){
+						if(jsondata.status == 'success'){
+							container.data('checksum', jsondata.data.checksum);
+							Contacts.UI.loading(container, false);
+							return true;
+						}
+						else{
+							Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+							Contacts.UI.loading(container, false);
+							return false;
+						}
+					},'json');
+				}
+			},
+			addProperty:function(obj){
+				var type = $(obj).data('type');
+				console.log('addProperty:' + type);
+				switch (type) {
+					case 'PHOTO':
+						$('#contacts_propertymenu a[data-type="PHOTO"]').parent().hide();
+						$('#file_upload_form').show();
+						break;
+					case 'EMAIL':
+						//console.log('emails: '+$('#emaillist>li').length);
+						if($('#emaillist>li').length == 1) {
+							$('#emails').show();
+						}
+						Contacts.UI.Card.addMail();
+						break;
+					case 'TEL':
+						//console.log('phones: '+$('#phonelist>li').length);
+						if($('#phonelist>li').length == 1) {
+							$('#phones').show();
+						}
+						Contacts.UI.Card.addPhone();
+						break;
+					case 'ADR':
+						//console.log('addresses: '+$('#addressdisplay>dl').length);
+						if($('#addressdisplay>dl').length == 1) {
+							$('#addresses').show();
+						}
+						Contacts.UI.Card.editAddress('new', true);
+						break;
+					case 'NICKNAME':
+					case 'ORG':
+					case 'BDAY':
+						$('dl dt[data-element="'+type+'"],dd[data-element="'+type+'"]').show();
+						$('#contacts_propertymenu a[data-type="'+type+'"]').parent().hide();
+						break;
+				}
+			},
+			deleteProperty:function(obj, type){
+				//console.log('deleteProperty, id: ' + this.id);
+				Contacts.UI.loading(obj, true);
+				var checksum = Contacts.UI.checksumFor(obj);
+				//var checksum = $(obj).parent().data('checksum');
+				if(checksum != undefined) {
+					//alert('deleteProperty: ' + $(obj).val() + ' ' + checksum);
+					$.getJSON('ajax/deleteproperty.php',{'id': this.id, 'checksum': checksum },function(jsondata){
+						if(jsondata.status == 'success'){
+							if(type == 'list') {
+								Contacts.UI.propertyContainerFor(obj).remove();
+								Contacts.UI.checkListFor(obj);
+							} else if(type == 'single') {
+								var proptype = Contacts.UI.propertyTypeFor(obj);
+								console.log('deleteProperty, hiding: ' + proptype);
+								$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
+								$('#contacts_propertymenu a[data-type="'+proptype+'"]').parent().show();
+								Contacts.UI.loading(obj, false);
+							} else {
+								Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', '\'deleteProperty\' called without type argument. Please report at bugs.owncloud.org'));
+								Contacts.UI.loading(obj, false);
+							}
+						}
+						else{
+							Contacts.UI.loading(obj, false);
+							Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+						}
+					});
+				} else { // Property hasn't been saved so there's nothing to delete.
+					if(type == 'list') {
+						Contacts.UI.propertyContainerFor(obj).remove();
+						Contacts.UI.checkListFor(obj);
+					} else if(type == 'single') {
+						var proptype = Contacts.UI.propertyTypeFor(obj);
+						console.log('deleteProperty, hiding: ' + proptype);
+						$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
+						$('#contacts_propertymenu a[data-type="'+proptype+'"]').parent().show();
+						Contacts.UI.loading(obj, false);
+					} else {
+						Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', '\'deleteProperty\' called without type argument. Please report at bugs.owncloud.org'));
+					}
+				}
+			},
+			editName:function(){
+				console.log('editName, id: ' + this.id);
+				//console.log('editName');
+				/* Initialize the name edit dialog */
+				if($('#edit_name_dialog').dialog('isOpen') == true){
+					$('#edit_name_dialog').dialog('moveToTop');
+				}else{ // TODO: If id=='' call addcontact.php (or whatever name) instead and reload view with id.
+					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'editname.php')+'?id='+this.id, function(){
+						$('#edit_name_dialog' ).dialog({
+								modal: (this.id == '' && true || false),
+								closeOnEscape: (this.id == '' && false || true),
+								title:  (this.id == '' && t('contacts', 'Add contact') || t('contacts', 'Edit name')),
+								height: 'auto', width: 'auto',
+								buttons: {
+									'Ok':function() { 
+										Contacts.UI.Card.saveName(this);
+										$(this).dialog('destroy').remove();
+									},
+									'Cancel':function() { $(this).dialog('destroy').remove(); }
+								},
+								close : function(event, ui) {
+									//alert('close');
+									$(this).dialog('destroy').remove();
+									//return event;
+								}/*,
+								open : function(event, ui) {
+									// load 'N' property - maybe :-P
+								}*/
+						});
+					});
+				}
+			},
+			saveName:function(dlg){
+				console.log('saveName, id: ' + this.id);
+				// TODO: Check if new, get address book id and call Contacts.UI.Card.add()
+				var n = new Array($(dlg).find('#fam').val(),$(dlg).find('#giv').val(),$(dlg).find('#add').val(),$(dlg).find('#pre').val(),$(dlg).find('#suf').val());
+				this.famname = n[0];
+				this.givname = n[1];
+				this.addname = n[2];
+				this.honpre = n[3];
+				this.honsuf = n[4];
+				//alert('saveName: ' + n);
+				$('#n').val(n.join(';'));
+				/*$('#card > input').each(function(){
+						alert($(this).attr('id') + ' ' + $(this).val());
+				});*/
+				if(n[3].length > 0) {
+					this.fullname = n[3] + ' ';
+				}
+				this.fullname += n[1] + ' ' + n[2] + ' ' + n[0];
+				if(n[4].length > 0) {
+					this.fullname += ', ' + n[4];
+				}
+				$('#short').text(n[1] + ' ' + n[0]);
+				$('#full').text(this.fullname);
+				$('#reverse').text(n[0] + ' ' + n[1]);
+				$('#reverse_comma').text(n[0] + ', ' + n[1]);
+				//$('#n').html(full);
+				$('#fn').val(0);
+				if(this.id == '') {
+					var aid = $(dlg).find('#aid').val();
+					Contacts.UI.Card.add(n, $('#short').text(), aid);
+				} else {
+					Contacts.UI.Card.saveProperty($('#n'));
+				}
+			},
+			loadAddresses:function(){
+				$('#addresses').hide();
+				$('#addressdisplay dl[class*="propertycontainer"]').remove();
+				for(var adr in this.data.ADR) {
+					$('#addressdisplay dl').first().clone().insertAfter($('#addressdisplay dl').last()).show();
+					$('#addressdisplay dl').last().removeClass('template').addClass('propertycontainer');
+					$('#addressdisplay dl').last().data('checksum', this.data.ADR[adr]['checksum']);
+					var adrarray = this.data.ADR[adr]['value'];
+					var adrtxt = '';
+					if(adrarray[0].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[0].strip_tags() + '</li>';
+					}
+					if(adrarray[1].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[1].strip_tags() + '</li>';
+					}
+					if(adrarray[2].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[2].strip_tags() + '</li>';
+					}
+					if(adrarray[3].length > 0 || adrarray[5].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[5].strip_tags() + ' ' + adrarray[3].strip_tags() + '</li>';
+					}
+					if(adrarray[4].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[4].strip_tags() + '</li>';
+					}
+					if(adrarray[6].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[6].strip_tags() + '</li>';
+					}
+					$('#addressdisplay dl').last().find('.addresslist').html(adrtxt);
+					//console.log('ADR: ' + adr);
+					console.log('checksum: ' + this.data.ADR[adr]['checksum']);
+					//console.log('type: ' + jQuery.type(this.data.ADR[adr]['value']));
+					var types = new Array();
+					var ttypes = new Array();
+					for(var param in this.data.ADR[adr]['parameters']) {
+						//console.log('param: ' + param + ': ' + this.data.ADR[adr]['parameters'][param]);
+						if(param.toUpperCase() == 'TYPE') {
+							//console.log('param type: ' + jQuery.type(this.data.ADR[adr]['parameters'][param]));
+							types.push(t('contacts', ucwords(this.data.ADR[adr]['parameters'][param].toLowerCase())));
+							ttypes.push(this.data.ADR[adr]['parameters'][param]);
+							//for(ptype in this.data.ADR[adr]['parameters'][param]) {
+							//	var pt = this.data.ADR[adr]['parameters'][param][ptype];
+							//	// TODO: Create an array with types, translate, ucwords and join.
+							//}
+						}
+					}
+					//console.log('# types: ' + types.length);
+					//console.log('Types:' + types.join('/'));
+					$('#addressdisplay dl').last().find('.adr_type_label').text(types.join('/'));
+					$('#addressdisplay dl').last().find('.adr_type').val(ttypes.join(','));
+					$('#addressdisplay dl').last().find('.adr').val(adrarray.join(';'));
+					$('#addressdisplay dl').last().data('checksum', this.data.ADR[adr]['checksum']);
+				}
+				if($('#addressdisplay dl').length > 1) {
+					$('#addresses').show();
+				}
+				Contacts.UI.loadListHandlers();
+				return false;
+			},
+			editAddress:function(obj, isnew){
+				console.log('editAddress');
+				var container = undefined;
+				var q = q = '?id=' + this.id;
+				if(obj === 'new') {
+					isnew = true;
+					$('#addressdisplay dl').first().clone().insertAfter($('#addressdisplay dl').last()).show();
+					container = $('#addressdisplay dl').last();
+					container.removeClass('template').addClass('propertycontainer');
+					Contacts.UI.loadListHandlers();
+				} else {
+					q = q + '&checksum='+Contacts.UI.checksumFor(obj);
+				}
+				//console.log('editAddress: checksum ' + checksum);
+				/* Initialize the address edit dialog */
+				if($('#edit_address_dialog').dialog('isOpen') == true){
+					$('#edit_address_dialog').dialog('moveToTop');
+				}else{
+					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'editaddress.php')+q, function(){
+						$('#edit_address_dialog' ).dialog({
+								/*modal: true,*/
+								height: 'auto', width: 'auto',
+								buttons: {
+									'Ok':function() {
+										console.log('OK:isnew ' + isnew);
+										console.log('OK:obj ' + obj);
+										if(isnew) {
+											Contacts.UI.Card.saveAddress(this, $('#addressdisplay dl:last-child').find('input').first(), isnew);
+										} else {
+											Contacts.UI.Card.saveAddress(this, obj, isnew);
+										}
+										$(this).dialog('destroy').remove();
+									},
+									'Cancel':function() {
+										$(this).dialog('destroy').remove();
+										if(isnew) {
+											container.remove();
+										}
+									}
+								},
+								close : function(event, ui) {
+									//alert('close');
+									$(this).dialog('destroy').remove();
+									if(isnew) {
+										container.remove();
+									}
+								}/*,
+								open : function(event, ui) {
+									// load 'ADR' property - maybe :-P
+								}*/
+						});
+					});
+				}
+			},
+			saveAddress:function(dlg, obj, isnew){
+				if(isnew) {
+					container = $('#addressdisplay dl').last();
+					obj = $('#addressdisplay dl:last-child').find('input').first();
+				} else {
+					checksum = Contacts.UI.checksumFor(obj);
+					container = Contacts.UI.propertyContainerFor(obj);
+				}
+				var adr = new Array($(dlg).find('#adr_pobox').val(),$(dlg).find('#adr_extended').val(),$(dlg).find('#adr_street').val(),$(dlg).find('#adr_city').val(),$(dlg).find('#adr_region').val(),$(dlg).find('#adr_zipcode').val(),$(dlg).find('#adr_country').val());
+				$(container).find('.adr').val(adr.join(';'));
+				$(container).find('.adr_type').val($(dlg).find('#adr_type').val());
+				$(container).find('.adr_type_label').html(t('contacts',ucwords($(dlg).find('#adr_type').val().toLowerCase())));
+				Contacts.UI.Card.saveProperty($(container).find('input').first());
+				var adrtxt = '';
+				if(adr[0].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[0] + '</li>';
+				}
+				if(adr[1].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[1] + '</li>';
+				}
+				if(adr[2].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[2] + '</li>';
+				}
+				if(adr[3].length > 0 || adr[5].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[5] + ' ' + adr[3] + '</li>';
+				}
+				if(adr[4].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[4] + '</li>';
+				}
+				if(adr[6].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[6] + '</li>';
+				}
+				$(container).find('.addresslist').html(adrtxt);
+			},
+			uploadPhoto:function(filelist) {
+				if(!filelist) {
+					Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts','No files selected for upload.'));
+					return;
+				}
+				//var file = filelist.item(0);
+				var file = filelist[0];
+				var target = $('#file_upload_target');
+				var form = $('#file_upload_form');
+				var totalSize=0;
+				if(file.size > $('#max_upload').val()){
+					Contacts.UI.messageBox(t('Upload too large'), t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'));
+					return;
+				} else {
+					target.load(function(){
+						var response=jQuery.parseJSON(target.contents().text());
+						if(response != undefined && response.status == 'success'){
+							Contacts.UI.Card.editPhoto(response.data.id, response.data.tmp);
+							//alert('File: ' + file.tmp + ' ' + file.name + ' ' + file.mime);
+						}else{
+							Contacts.UI.messageBox(t('contacts', 'Error'), response.data.message);
+						}
+					});
+					form.submit();
+				}
+			},
+			loadPhoto:function(){
+				console.log('loadPhoto: ' + this.data.PHOTO);
+				if(this.data.PHOTO) {
+					$('#file_upload_form').show();
+					$('#contacts_propertymenu a[data-type="PHOTO"]').parent().hide();
+				} else {
+					$('#file_upload_form').hide();
+					$('#contacts_propertymenu a[data-type="PHOTO"]').parent().show();
+				}
+				$.getJSON('ajax/loadphoto.php',{'id':this.id},function(jsondata){
+					if(jsondata.status == 'success'){
+						//alert(jsondata.data.page);
+						$('#contacts_details_photo_wrapper').html(jsondata.data.page);
+					}
+					else{
+						Contacts.UI.messageBox(jsondata.data.message);
+					}
+				});
+			},
+			editPhoto:function(id, tmp_path){
+				//alert('editPhoto: ' + tmp_path);
+				$.getJSON('ajax/cropphoto.php',{'tmp_path':tmp_path,'id':this.id},function(jsondata){
+					if(jsondata.status == 'success'){
+						//alert(jsondata.data.page);
+						$('#edit_photo_dialog_img').html(jsondata.data.page);
+					}
+					else{
+						Contacts.UI.messageBox(jsondata.data.message);
+					}
+				});
+				if($('#edit_photo_dialog').dialog('isOpen') == true){
+					$('#edit_photo_dialog').dialog('moveToTop');
+				} else {
+					$('#edit_photo_dialog').dialog('open');
+				}
+			},
+			savePhoto:function(){
+				var target = $('#crop_target');
+				var form = $('#cropform');
+				form.submit();
+				target.load(function(){
+					var response=jQuery.parseJSON(target.contents().text());
+					if(response != undefined && response.status == 'success'){
+						// load cropped photo.
+						$('#contacts_details_photo_wrapper').html(response.data.page);
+					}else{
+						Contacts.UI.messageBox(t('contacts','Error'), response.data.message);
+					}
+				});
+				$('#contacts [data-id="'+this.id+'"]').find('a').css('background','url(thumbnail.php?id='+this.id+'&refresh=1'+Math.random()+') no-repeat');
+			},
+			addMail:function() {
+				//alert('addMail');
+				$('#emaillist li[class*="template"]:first-child').clone().appendTo($('#emaillist')).show();
+				$('#emaillist li[class*="template"]:last-child').removeClass('template').addClass('propertycontainer');
+				$('#emaillist li:last-child').find('input[type="email"]').focus();
+				Contacts.UI.loadListHandlers();
+				return false;
+			},
+			loadMails:function() {
+				$('#emails').hide();
+				$('#emaillist li[class*="propertycontainer"]').remove();
+				for(var mail in this.data.EMAIL) {
+					this.addMail();
+					//$('#emaillist li:first-child').clone().appendTo($('#emaillist')).show();
+					$('#emaillist li:last-child').data('checksum', this.data.EMAIL[mail]['checksum'])
+					$('#emaillist li:last-child').find('input[type="email"]').val(this.data.EMAIL[mail]['value']);
+					//console.log('EMAIL: ' + mail);
+					//console.log('value: ' + this.data.EMAIL[mail]['value']);
+					//console.log('checksum: ' + this.data.EMAIL[mail]['checksum']);
+					for(var param in this.data.EMAIL[mail]['parameters']) {
+						//console.log('param: ' + param + ': ' + this.data.EMAIL[mail]['parameters'][param]);
+						if(param.toUpperCase() == 'PREF') {
+							$('#emaillist li:last-child').find('input[type="checkbox"]').attr('checked', 'checked')
+						}
+					}
+					//console.log('parameters: ' + jQuery.type(this.data.EMAIL[mail]['parameters']));
+				}
+				if($('#emaillist li').length > 1) {
+					$('#emails').show();
+				}
+
+				$('#emaillist li:last-child').find('input[type="text"]').focus();
+				Contacts.UI.loadListHandlers();
+				return false;
+			},
+			addPhone:function() {
+				$('#phonelist li[class*="template"]:first-child').clone().appendTo($('#phonelist')); //.show();
+				$('#phonelist li[class*="template"]:last-child').find('select').addClass('contacts_property');
+				$('#phonelist li[class*="template"]:last-child').removeClass('template').addClass('propertycontainer');
+				$('#phonelist li:last-child').find('input[type="text"]').focus();
+				Contacts.UI.loadListHandlers();
+				$('#phonelist li:last-child').find('select').multiselect({
+														noneSelectedText: t('contacts', 'Select type'),
+														header: false,
+														selectedList: 4,
+														classes: 'typelist'
+													});
+				$('#phonelist li:last-child').show();
+				return false;
+			},
+			loadPhones:function() {
+				$('#phones').hide();
+				$('#phonelist li[class*="propertycontainer"]').remove();
+				for(var phone in this.data.TEL) {
+					this.addPhone();
+					$('#phonelist li:last-child').find('select').multiselect('destroy');
+					$('#phonelist li:last-child').data('checksum', this.data.TEL[phone]['checksum'])
+					$('#phonelist li:last-child').find('input[type="text"]').val(this.data.TEL[phone]['value']);
+					//console.log('TEL: ' + phone);
+					//console.log('value: ' + this.data.TEL[phone]['value']);
+					//console.log('checksum: ' + this.data.TEL[phone]['checksum']);
+					for(var param in this.data.TEL[phone]['parameters']) {
+						//console.log('param: ' + param + ': ' + this.data.TEL[phone]['parameters'][param]);
+						if(param.toUpperCase() == 'PREF') {
+							$('#phonelist li:last-child').find('input[type="checkbox"]').attr('checked', 'checked');
+						}
+						else if(param.toUpperCase() == 'TYPE') {
+							//console.log('param type: ' + jQuery.type(this.data.TEL[phone]['parameters'][param]));
+							for(ptype in this.data.TEL[phone]['parameters'][param]) {
+								var pt = this.data.TEL[phone]['parameters'][param][ptype];
+								$('#phonelist li:last-child').find('select option').each(function(){
+									//console.log('Test: ' + $(this).val().toUpperCase() + '==' + pt);
+									if ($(this).val().toUpperCase() == pt) {
+										//console.log('Selected: ' + pt);
+										$(this).attr('selected', 'selected');
+									}
+								});
+							}
+						}
+					}
+					$('#phonelist li:last-child').find('select').multiselect({
+														noneSelectedText: t('contacts', 'Select type'),
+														header: false,
+														selectedList: 4,
+														classes: 'typelist'
+													});
+					//console.log('parameters: ' + jQuery.type(this.data.EMAIL[mail]['parameters']));
+				}
+				if($('#phonelist li').length > 1) {
+					$('#phones').show();
+				}
+				return false;
+			},
+		},
+		Addressbooks:{
+			overview:function(){
+				if($('#chooseaddressbook_dialog').dialog('isOpen') == true){
+					$('#chooseaddressbook_dialog').dialog('moveToTop');
+				}else{
+					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(){
+						$('#chooseaddressbook_dialog').dialog({
+							width : 600,
+							close : function(event, ui) {
+								$(this).dialog('destroy').remove();
+							}
+						});
+					});
+				}
+			},
+			activation:function(checkbox, bookid)
+			{
+				$.post(OC.filePath('contacts', 'ajax', 'activation.php'), { bookid: bookid, active: checkbox.checked?1:0 },
+				  function(data) {
+					/*
+					 * Arguments:
+					 * data.status
+					 * data.bookid
+					 * data.active
+					 */
+					if (data.status == 'success'){
+						checkbox.checked = data.active == 1;
+						Contacts.UI.Contacts.update();
+					}
+				  });
+			},
+			newAddressbook:function(object){
+				var tr = $(document.createElement('tr'))
+					.load(OC.filePath('contacts', 'ajax', 'addbook.php'));
+				$(object).closest('tr').after(tr).hide();
+				/* TODO: Shouldn't there be some kinda error checking here? */
+			},
+			editAddressbook:function(object, bookid){
+				var tr = $(document.createElement('tr'))
+					.load(OC.filePath('contacts', 'ajax', 'editaddressbook.php') + "?bookid="+bookid);
+				$(object).closest('tr').after(tr).hide();
+			},
+			deleteAddressbook:function(bookid){
+				var check = confirm("Do you really want to delete this address book?");
+				if(check == false){
+					return false;
+				}else{
+					$.post(OC.filePath('contacts', 'ajax', 'deletebook.php'), { id: bookid},
+					  function(data) {
+						if (data.status == 'success'){
+							$('#chooseaddressbook_dialog').dialog('destroy').remove();
+							Contacts.UI.Contacts.update();
+							Contacts.UI.Addressbooks.overview();
+						} else {
+							Contacts.UI.messageBox(t('contacts', 'Error'), data.message);
+							//alert('Error: ' + data.message);
+						}
+					  });
+				}
+			},
+			import:function(){
+				Contacts.UI.notImplemented();
+			},
+			submit:function(button, bookid){
+				var displayname = $("#displayname_"+bookid).val();
+				var active = $("#edit_active_"+bookid+":checked").length;
+				var description = $("#description_"+bookid).val();
+
+				var url;
+				if (bookid == 'new'){
+					url = OC.filePath('contacts', 'ajax', 'createaddressbook.php');
+				}else{
+					url = OC.filePath('contacts', 'ajax', 'updateaddressbook.php');
+				}
+				$.post(url, { id: bookid, name: displayname, active: active, description: description },
+					function(data){
+						if(data.status == 'success'){
+							$(button).closest('tr').prev().html(data.page).show().next().remove();
+						}
+					});
+				Contacts.UI.Contacts.update();
+			},
+			cancel:function(button, bookid){
+				$(button).closest('tr').prev().show().next().remove();
+			}
+		},
+		Contacts:{
+			/**
+			 * Reload the contacts list.
+			 */
+			update:function(){
+				$.getJSON('ajax/contacts.php',{},function(jsondata){
+					if(jsondata.status == 'success'){
+						$('#contacts').html(jsondata.data.page);
+					}
+					else{
+						Contacts.UI.messageBox(t('contacts', 'Error'),jsondata.data.message);
+						//alert(jsondata.data.message);
+					}
+				});
+				setTimeout(Contacts.UI.Contacts.lazyupdate, 500);
+			},
+			/**
+			 * Add thumbnails to the contact list as they become visible in the viewport.
+			 */
+			lazyupdate:function(){
+				$('#contacts li').live('inview', function(){
+					if (!$(this).find('a').attr('style')) {
+						$(this).find('a').css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
+					}
+				});
+			}
+		}
+	}
+}
+$(document).ready(function(){
+
+	Contacts.UI.loadHandlers();
+
+	/**
+	 * Show the Addressbook chooser
+	 */
+	$('#chooseaddressbook').click(function(){
+		Contacts.UI.Addressbooks.overview();
+		return false;
+	});
+
+	/**
+	 * Open blank form to add new contact.
+	 * FIXME: Load the same page but only show name data and popup the name edit dialog. 
+	 * On save load the page again with an id and show all fields.
+	 * NOTE: Or: Load the full page and popup name dialog modal. On success set the newly aquired ID, on
+	 * Cancel or failure give appropriate message and show ... something else :-P
+	 */
+	$('#contacts_newcontact').click(function(){
+		Contacts.UI.Card.editNew();
+// 		$.getJSON('ajax/addcontact.php',{},function(jsondata){
+// 			if(jsondata.status == 'success'){
+// 				$('#rightcontent').data('id','');
+// 				$('#rightcontent').html(jsondata.data.page)
+// 					.find('select').chosen();
+// 			}
+// 			else{
+// 				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+// 				//alert(jsondata.data.message);
+// 			}
+// 		});
+// 		return false;
+	});
+	
+	/**
+	 * Load the details view for a contact.
+	 */
+	$('#leftcontent li').live('click',function(){
+		var id = $(this).data('id');
+		var oldid = $('#rightcontent').data('id');
+		if(oldid != 0){
+			$('#leftcontent li[data-id="'+oldid+'"]').removeClass('active');
+		}
+		$.getJSON('ajax/contactdetails.php',{'id':id},function(jsondata){
+			if(jsondata.status == 'success'){
+				Contacts.UI.Card.loadContact(jsondata.data);
+			}
+			else{
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+				//alert(jsondata.data.message);
+			}
+		});
+		// NOTE: Deprecated.
+// 		$.getJSON('ajax/getdetails.php',{'id':id, 'new':1},function(jsondata){
+// 			if(jsondata.status == 'success'){
+// 				$('#rightcontent').data('id',jsondata.data.id);
+// 				$('#rightcontent').html(jsondata.data.page);
+// 				$('#leftcontent li[data-id="'+jsondata.data.id+'"]').addClass('active');
+// 				//Contacts.UI.loadHandlers();
+// 			}
+// 			else{
+// 				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+// 				//alert(jsondata.data.message);
+// 			}
+// 		});
+		return false;
+	});
+
+	/**
+	 * Delete currently selected contact TODO: and clear page
+	 */
+	$('#contacts_deletecard').live('click',function(){
+		Contacts.UI.Card.delete();
+	});
+
+	/**
+	 * Add and insert a new contact into the list.
+	 */
+	$('#contacts_addcardform input[type="submit"]').live('click',function(){
+		$.post('ajax/addcontact.php',$('#contact_identity').serialize(),function(jsondata){
+			if(jsondata.status == 'success'){
+				$('#rightcontent').data('id',jsondata.data.id);
+				$('#rightcontent').html(jsondata.data.page);
+				$('#leftcontent .active').removeClass('active');
+				var item = '<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'"  style="background: url(thumbnail.php?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+jsondata.data.name+'</a></li>';
+				var added = false;
+				$('#leftcontent ul li').each(function(){
+					if ($(this).text().toLowerCase() > jsondata.data.name.toLowerCase()) {
+						$(this).before(item).fadeIn('fast');
+						added = true;
+						return false;
+					}
+				});
+				if(!added) {
+					$('#leftcontent ul').append(item);
+				}
+			}
+			else{
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+				//alert(jsondata.data.message);
+			}
+		}, 'json');
+		return false;
+	});
+	
+	$('#contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+		if (isInView) { //NOTE: I've kept all conditions for future reference ;-)
+			// element is now visible in the viewport
+			if (visiblePartY == 'top') {
+				// top part of element is visible
+			} else if (visiblePartY == 'bottom') {
+				// bottom part of element is visible
+			} else {
+				// whole part of element is visible
+				if (!$(this).find('a').attr('style')) {
+					//alert($(this).data('id') + ' has background: ' + $(this).attr('style'));
+					$(this).find('a').css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
+				}/* else {
+					alert($(this).data('id') + ' has style ' + $(this).attr('style').match('url'));
+				}*/
+			}
+		} else {
+			// element has gone out of viewport
+		}
+	});
+	
+	$('.button').tipsy();
+	// Triggers invisible file input
+	$('#contacts_details_photo').live('click', function() {
+		$('#file_upload_start').trigger('click');
+		return false;
+	});
+	
+	// NOTE: For some reason the selector doesn't work when I select by '.contacts_property' too...
+	// I do the filtering in the event handler instead.
+	$('input[type="text"],input[type="checkbox"],input[type="email"],input[type="tel"],input[type="date"], select').live('change', function(){
+		Contacts.UI.Card.saveProperty(this);
+	});
+
+	// Name has changed. Update it and reorder.
+	$('#fn').live('change',function(){
+		var name = $('#fn').val();
+		var item = $('#contacts [data-id="'+Contacts.UI.Card.id+'"]').clone();
+		$('#contacts [data-id="'+Contacts.UI.Card.id+'"]').remove();
+		$(item).find('a').html(name);
+		var added = false;
+		$('#contacts li').each(function(){
+			if ($(this).text().toLowerCase() > name.toLowerCase()) {
+				$(this).before(item).fadeIn('fast');
+				added = true;
+				return false;
+			}
+		});
+		if(!added) {
+			$('#leftcontent ul').append(item);
+		}
+	});
+
+	/**
+	 * Profile picture upload handling
+	 */
+	// New profile picture selected
+	$('#file_upload_start').live('change',function(){
+		Contacts.UI.Card.uploadPhoto(this.files);
+	});
+	$('#contacts_details_photo').bind('dragover',function(event){
+		console.log('dragover');
+		$(event.target).css('background-color','red');
+		event.stopPropagation();
+		event.preventDefault();  
+	});
+	$('#contacts_details_photo').bind('dragleave',function(event){
+		console.log('dragleave');
+		$(event.target).css('background-color','white');
+		//event.stopPropagation();
+		//event.preventDefault();  
+	});
+	$('#contacts_details_photo').bind('drop',function(event){
+		event.stopPropagation();
+		event.preventDefault();
+		console.log('drop');
+		$(event.target).css('background-color','white')
+		$.fileUpload(event.originalEvent.dataTransfer.files);
+	});
+
+	/**
+	 * Upload function for dropped files. Should go in the Contacts class/object.
+	 */
+	$.fileUpload = function(files){
+		var file = files[0];
+		console.log('size: '+file.size);
+		if(file.size > $('#max_upload').val()){
+			Contacts.UI.messageBox(t('contacts','Upload too large'), t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'));
+			return;
+		}
+		if (file.type.indexOf("image") != 0) {
+			Contacts.UI.messageBox(t('contacts','Wrong file type'), t('contacts','Only image files can be used as profile picture.'));
+			return;
+		}
+		var xhr = new XMLHttpRequest();
+
+		if (!xhr.upload) {
+			Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', 'Your browser doesn\'t support AJAX upload. Please click on the profile picture to select a photo to upload.'))
+		}
+		fileUpload = xhr.upload,
+		xhr.onreadystatechange = function() {
+			if (xhr.readyState == 4){
+				response = $.parseJSON(xhr.responseText);
+				if(response.status == 'success') {
+					if(xhr.status == 200) {
+						Contacts.UI.Card.editPhoto(response.data.id, response.data.tmp);
+					} else {
+						Contacts.UI.messageBox(t('contacts', 'Error'), xhr.status + ': ' + xhr.responseText);
+					}
+				} else {
+					//alert(xhr.responseText);
+					Contacts.UI.messageBox(t('contacts', 'Error'), response.data.message);
+				}
+				// stop loading indicator
+				//$('#contacts_details_photo_progress').hide();
+			}
+		};
+	
+		fileUpload.onprogress = function(e){
+			if (e.lengthComputable){
+				var _progress = Math.round((e.loaded * 100) / e.total);
+				if (_progress != 100){
+					$('#contacts_details_photo_progress').text(_progress + '%');
+					$('#contacts_details_photo_progress').val(_progress);
+				}
+			}
+		};
+		// Start loading indicator.
+		//$('#contacts_details_photo_progress').show()();
+		xhr.open("POST", 'ajax/uploadphoto.php?id='+Contacts.UI.Card.id+'&imagefile='+encodeURIComponent(file.name), true);
+		xhr.setRequestHeader('Cache-Control', 'no-cache');
+		xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+		xhr.setRequestHeader('X_FILE_NAME', encodeURIComponent(file.name));
+		//xhr.setRequestHeader("X_FILENAME", file.name);
+		xhr.setRequestHeader('X-File-Size', file.size);
+		xhr.setRequestHeader('Content-Type', file.type);
+		xhr.send(file);
+	}
+
+	$('#contacts_propertymenu a').live('click',function(){
+		Contacts.UI.Card.addProperty(this);
+	});
+
+	
+});
diff --git a/apps/contacts/js/jquery.Jcrop.js b/apps/contacts/js/jquery.Jcrop.js
new file mode 100644
index 00000000000..36f9a0f08f8
--- /dev/null
+++ b/apps/contacts/js/jquery.Jcrop.js
@@ -0,0 +1,1765 @@
+/**
+ * jquery.Jcrop.js v0.9.9 {{{
+ *
+ * jQuery Image Cropping Plugin - released under MIT License 
+ * Author: Kelly Hallman <khallman@gmail.com>
+ * http://github.com/tapmodo/Jcrop
+ *
+ * }}}
+ * Copyright (c) 2008-2012 Tapmodo Interactive LLC {{{
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * }}}
+ */
+
+(function ($) {
+
+  $.Jcrop = function (obj, opt) {
+    var options = $.extend({}, $.Jcrop.defaults),
+        docOffset, lastcurs, ie6mode = false;
+
+    // Internal Methods {{{
+    function px(n) {
+      return parseInt(n, 10) + 'px';
+    }
+    function cssClass(cl) {
+      return options.baseClass + '-' + cl;
+    }
+    function supportsColorFade() {
+      return $.fx.step.hasOwnProperty('backgroundColor');
+    }
+    function getPos(obj) //{{{
+    {
+      var pos = $(obj).offset();
+      return [pos.left, pos.top];
+    }
+    //}}}
+    function mouseAbs(e) //{{{
+    {
+      return [(e.pageX - docOffset[0]), (e.pageY - docOffset[1])];
+    }
+    //}}}
+    function setOptions(opt) //{{{
+    {
+      if (typeof(opt) !== 'object') opt = {};
+      options = $.extend(options, opt);
+
+      $.each(['onChange','onSelect','onRelease','onDblClick'],function(i,e) {
+        if (typeof(options[e]) !== 'function') options[e] = function () {};
+      });
+    }
+    //}}}
+    function startDragMode(mode, pos) //{{{
+    {
+      docOffset = getPos($img);
+      Tracker.setCursor(mode === 'move' ? mode : mode + '-resize');
+
+      if (mode === 'move') {
+        return Tracker.activateHandlers(createMover(pos), doneSelect);
+      }
+
+      var fc = Coords.getFixed();
+      var opp = oppLockCorner(mode);
+      var opc = Coords.getCorner(oppLockCorner(opp));
+
+      Coords.setPressed(Coords.getCorner(opp));
+      Coords.setCurrent(opc);
+
+      Tracker.activateHandlers(dragmodeHandler(mode, fc), doneSelect);
+    }
+    //}}}
+    function dragmodeHandler(mode, f) //{{{
+    {
+      return function (pos) {
+        if (!options.aspectRatio) {
+          switch (mode) {
+          case 'e':
+            pos[1] = f.y2;
+            break;
+          case 'w':
+            pos[1] = f.y2;
+            break;
+          case 'n':
+            pos[0] = f.x2;
+            break;
+          case 's':
+            pos[0] = f.x2;
+            break;
+          }
+        } else {
+          switch (mode) {
+          case 'e':
+            pos[1] = f.y + 1;
+            break;
+          case 'w':
+            pos[1] = f.y + 1;
+            break;
+          case 'n':
+            pos[0] = f.x + 1;
+            break;
+          case 's':
+            pos[0] = f.x + 1;
+            break;
+          }
+        }
+        Coords.setCurrent(pos);
+        Selection.update();
+      };
+    }
+    //}}}
+    function createMover(pos) //{{{
+    {
+      var lloc = pos;
+      KeyManager.watchKeys();
+
+      return function (pos) {
+        Coords.moveOffset([pos[0] - lloc[0], pos[1] - lloc[1]]);
+        lloc = pos;
+
+        Selection.update();
+      };
+    }
+    //}}}
+    function oppLockCorner(ord) //{{{
+    {
+      switch (ord) {
+      case 'n':
+        return 'sw';
+      case 's':
+        return 'nw';
+      case 'e':
+        return 'nw';
+      case 'w':
+        return 'ne';
+      case 'ne':
+        return 'sw';
+      case 'nw':
+        return 'se';
+      case 'se':
+        return 'nw';
+      case 'sw':
+        return 'ne';
+      }
+    }
+    //}}}
+    function createDragger(ord) //{{{
+    {
+      return function (e) {
+        if (options.disabled) {
+          return false;
+        }
+        if ((ord === 'move') && !options.allowMove) {
+          return false;
+        }
+        
+        // Fix position of crop area when dragged the very first time.
+        // Necessary when crop image is in a hidden element when page is loaded.
+        docOffset = getPos($img);
+
+        btndown = true;
+        startDragMode(ord, mouseAbs(e));
+        e.stopPropagation();
+        e.preventDefault();
+        return false;
+      };
+    }
+    //}}}
+    function presize($obj, w, h) //{{{
+    {
+      var nw = $obj.width(),
+          nh = $obj.height();
+      if ((nw > w) && w > 0) {
+        nw = w;
+        nh = (w / $obj.width()) * $obj.height();
+      }
+      if ((nh > h) && h > 0) {
+        nh = h;
+        nw = (h / $obj.height()) * $obj.width();
+      }
+      xscale = $obj.width() / nw;
+      yscale = $obj.height() / nh;
+      $obj.width(nw).height(nh);
+    }
+    //}}}
+    function unscale(c) //{{{
+    {
+      return {
+        x: parseInt(c.x * xscale, 10),
+        y: parseInt(c.y * yscale, 10),
+        x2: parseInt(c.x2 * xscale, 10),
+        y2: parseInt(c.y2 * yscale, 10),
+        w: parseInt(c.w * xscale, 10),
+        h: parseInt(c.h * yscale, 10)
+      };
+    }
+    //}}}
+    function doneSelect(pos) //{{{
+    {
+      var c = Coords.getFixed();
+      if ((c.w > options.minSelect[0]) && (c.h > options.minSelect[1])) {
+        Selection.enableHandles();
+        Selection.done();
+      } else {
+        Selection.release();
+      }
+      Tracker.setCursor(options.allowSelect ? 'crosshair' : 'default');
+    }
+    //}}}
+    function newSelection(e) //{{{
+    {
+      if (options.disabled) {
+        return false;
+      }
+      if (!options.allowSelect) {
+        return false;
+      }
+      btndown = true;
+      docOffset = getPos($img);
+      Selection.disableHandles();
+      Tracker.setCursor('crosshair');
+      var pos = mouseAbs(e);
+      Coords.setPressed(pos);
+      Selection.update();
+      Tracker.activateHandlers(selectDrag, doneSelect);
+      KeyManager.watchKeys();
+
+      e.stopPropagation();
+      e.preventDefault();
+      return false;
+    }
+    //}}}
+    function selectDrag(pos) //{{{
+    {
+      Coords.setCurrent(pos);
+      Selection.update();
+    }
+    //}}}
+    function newTracker() //{{{
+    {
+      var trk = $('<div></div>').addClass(cssClass('tracker'));
+      if ($.browser.msie) {
+        trk.css({
+          opacity: 0,
+          backgroundColor: 'white'
+        });
+      }
+      return trk;
+    }
+    //}}}
+
+    // }}}
+    // Initialization {{{
+    // Sanitize some options {{{
+    if ($.browser.msie && ($.browser.version.split('.')[0] === '6')) {
+      ie6mode = true;
+    }
+    if (typeof(obj) !== 'object') {
+      obj = $(obj)[0];
+    }
+    if (typeof(opt) !== 'object') {
+      opt = {};
+    }
+    // }}}
+    setOptions(opt);
+    // Initialize some jQuery objects {{{
+    // The values are SET on the image(s) for the interface
+    // If the original image has any of these set, they will be reset
+    // However, if you destroy() the Jcrop instance the original image's
+    // character in the DOM will be as you left it.
+    var img_css = {
+      border: 'none',
+      visibility: 'visible',
+      margin: 0,
+      padding: 0,
+      position: 'absolute',
+      top: 0,
+      left: 0
+    };
+
+    var $origimg = $(obj),
+      img_mode = true;
+
+    if (obj.tagName == 'IMG') {
+      // Fix size of crop image.
+      // Necessary when crop image is within a hidden element when page is loaded.
+      if ($origimg[0].width != 0 && $origimg[0].height != 0) {
+        // Obtain dimensions from contained img element.
+        $origimg.width($origimg[0].width);
+        $origimg.height($origimg[0].height);
+      } else {
+        // Obtain dimensions from temporary image in case the original is not loaded yet (e.g. IE 7.0). 
+        var tempImage = new Image();
+        tempImage.src = $origimg[0].src;
+        $origimg.width(tempImage.width);
+        $origimg.height(tempImage.height);
+      } 
+
+      var $img = $origimg.clone().removeAttr('id').css(img_css).show();
+
+      $img.width($origimg.width());
+      $img.height($origimg.height());
+      $origimg.after($img).hide();
+
+    } else {
+      $img = $origimg.css(img_css).show();
+      img_mode = false;
+      if (options.shade === null) { options.shade = true; }
+    }
+
+    presize($img, options.boxWidth, options.boxHeight);
+
+    var boundx = $img.width(),
+        boundy = $img.height(),
+        
+        
+        $div = $('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({
+        position: 'relative',
+        backgroundColor: options.bgColor
+      }).insertAfter($origimg).append($img);
+
+    if (options.addClass) {
+      $div.addClass(options.addClass);
+    }
+
+    var $img2 = $('<div />'),
+
+        $img_holder = $('<div />') 
+        .width('100%').height('100%').css({
+          zIndex: 310,
+          position: 'absolute',
+          overflow: 'hidden'
+        }),
+
+        $hdl_holder = $('<div />') 
+        .width('100%').height('100%').css('zIndex', 320), 
+
+        $sel = $('<div />') 
+        .css({
+          position: 'absolute',
+          zIndex: 600
+        }).dblclick(function(){
+          var c = Coords.getFixed();
+          options.onDblClick.call(api,c);
+        }).insertBefore($img).append($img_holder, $hdl_holder); 
+
+    if (img_mode) {
+
+      $img2 = $('<img />')
+          .attr('src', $img.attr('src')).css(img_css).width(boundx).height(boundy),
+
+      $img_holder.append($img2);
+
+    }
+
+    if (ie6mode) {
+      $sel.css({
+        overflowY: 'hidden'
+      });
+    }
+
+    var bound = options.boundary;
+    var $trk = newTracker().width(boundx + (bound * 2)).height(boundy + (bound * 2)).css({
+      position: 'absolute',
+      top: px(-bound),
+      left: px(-bound),
+      zIndex: 290
+    }).mousedown(newSelection);
+
+    /* }}} */
+    // Set more variables {{{
+    var bgcolor = options.bgColor,
+        bgopacity = options.bgOpacity,
+        xlimit, ylimit, xmin, ymin, xscale, yscale, enabled = true,
+        btndown, animating, shift_down;
+
+    docOffset = getPos($img);
+    // }}}
+    // }}}
+    // Internal Modules {{{
+    // Touch Module {{{ 
+    var Touch = (function () {
+      // Touch support detection function adapted (under MIT License)
+      // from code by Jeffrey Sambells - http://github.com/iamamused/
+      function hasTouchSupport() {
+        var support = {},
+            events = ['touchstart', 'touchmove', 'touchend'],
+            el = document.createElement('div'), i;
+
+        try {
+          for(i=0; i<events.length; i++) {
+            var eventName = events[i];
+            eventName = 'on' + eventName;
+            var isSupported = (eventName in el);
+            if (!isSupported) {
+              el.setAttribute(eventName, 'return;');
+              isSupported = typeof el[eventName] == 'function';
+            }
+            support[events[i]] = isSupported;
+          }
+          return support.touchstart && support.touchend && support.touchmove;
+        }
+        catch(err) {
+          return false;
+        }
+      }
+
+      function detectSupport() {
+        if ((options.touchSupport === true) || (options.touchSupport === false)) return options.touchSupport;
+          else return hasTouchSupport();
+      }
+      return {
+        createDragger: function (ord) {
+          return function (e) {
+            e.pageX = e.originalEvent.changedTouches[0].pageX;
+            e.pageY = e.originalEvent.changedTouches[0].pageY;
+            if (options.disabled) {
+              return false;
+            }
+            if ((ord === 'move') && !options.allowMove) {
+              return false;
+            }
+            btndown = true;
+            startDragMode(ord, mouseAbs(e));
+            e.stopPropagation();
+            e.preventDefault();
+            return false;
+          };
+        },
+        newSelection: function (e) {
+          e.pageX = e.originalEvent.changedTouches[0].pageX;
+          e.pageY = e.originalEvent.changedTouches[0].pageY;
+          return newSelection(e);
+        },
+        isSupported: hasTouchSupport,
+        support: detectSupport()
+      };
+    }());
+    // }}}
+    // Coords Module {{{
+    var Coords = (function () {
+      var x1 = 0,
+          y1 = 0,
+          x2 = 0,
+          y2 = 0,
+          ox, oy;
+
+      function setPressed(pos) //{{{
+      {
+        pos = rebound(pos);
+        x2 = x1 = pos[0];
+        y2 = y1 = pos[1];
+      }
+      //}}}
+      function setCurrent(pos) //{{{
+      {
+        pos = rebound(pos);
+        ox = pos[0] - x2;
+        oy = pos[1] - y2;
+        x2 = pos[0];
+        y2 = pos[1];
+      }
+      //}}}
+      function getOffset() //{{{
+      {
+        return [ox, oy];
+      }
+      //}}}
+      function moveOffset(offset) //{{{
+      {
+        var ox = offset[0],
+            oy = offset[1];
+
+        if (0 > x1 + ox) {
+          ox -= ox + x1;
+        }
+        if (0 > y1 + oy) {
+          oy -= oy + y1;
+        }
+
+        if (boundy < y2 + oy) {
+          oy += boundy - (y2 + oy);
+        }
+        if (boundx < x2 + ox) {
+          ox += boundx - (x2 + ox);
+        }
+
+        x1 += ox;
+        x2 += ox;
+        y1 += oy;
+        y2 += oy;
+      }
+      //}}}
+      function getCorner(ord) //{{{
+      {
+        var c = getFixed();
+        switch (ord) {
+        case 'ne':
+          return [c.x2, c.y];
+        case 'nw':
+          return [c.x, c.y];
+        case 'se':
+          return [c.x2, c.y2];
+        case 'sw':
+          return [c.x, c.y2];
+        }
+      }
+      //}}}
+      function getFixed() //{{{
+      {
+        if (!options.aspectRatio) {
+          return getRect();
+        }
+        // This function could use some optimization I think...
+        var aspect = options.aspectRatio,
+            min_x = options.minSize[0] / xscale,
+            
+            
+            //min_y = options.minSize[1]/yscale,
+            max_x = options.maxSize[0] / xscale,
+            max_y = options.maxSize[1] / yscale,
+            rw = x2 - x1,
+            rh = y2 - y1,
+            rwa = Math.abs(rw),
+            rha = Math.abs(rh),
+            real_ratio = rwa / rha,
+            xx, yy, w, h;
+
+        if (max_x === 0) {
+          max_x = boundx * 10;
+        }
+        if (max_y === 0) {
+          max_y = boundy * 10;
+        }
+        if (real_ratio < aspect) {
+          yy = y2;
+          w = rha * aspect;
+          xx = rw < 0 ? x1 - w : w + x1;
+
+          if (xx < 0) {
+            xx = 0;
+            h = Math.abs((xx - x1) / aspect);
+            yy = rh < 0 ? y1 - h : h + y1;
+          } else if (xx > boundx) {
+            xx = boundx;
+            h = Math.abs((xx - x1) / aspect);
+            yy = rh < 0 ? y1 - h : h + y1;
+          }
+        } else {
+          xx = x2;
+          h = rwa / aspect;
+          yy = rh < 0 ? y1 - h : y1 + h;
+          if (yy < 0) {
+            yy = 0;
+            w = Math.abs((yy - y1) * aspect);
+            xx = rw < 0 ? x1 - w : w + x1;
+          } else if (yy > boundy) {
+            yy = boundy;
+            w = Math.abs(yy - y1) * aspect;
+            xx = rw < 0 ? x1 - w : w + x1;
+          }
+        }
+
+        // Magic %-)
+        if (xx > x1) { // right side
+          if (xx - x1 < min_x) {
+            xx = x1 + min_x;
+          } else if (xx - x1 > max_x) {
+            xx = x1 + max_x;
+          }
+          if (yy > y1) {
+            yy = y1 + (xx - x1) / aspect;
+          } else {
+            yy = y1 - (xx - x1) / aspect;
+          }
+        } else if (xx < x1) { // left side
+          if (x1 - xx < min_x) {
+            xx = x1 - min_x;
+          } else if (x1 - xx > max_x) {
+            xx = x1 - max_x;
+          }
+          if (yy > y1) {
+            yy = y1 + (x1 - xx) / aspect;
+          } else {
+            yy = y1 - (x1 - xx) / aspect;
+          }
+        }
+
+        if (xx < 0) {
+          x1 -= xx;
+          xx = 0;
+        } else if (xx > boundx) {
+          x1 -= xx - boundx;
+          xx = boundx;
+        }
+
+        if (yy < 0) {
+          y1 -= yy;
+          yy = 0;
+        } else if (yy > boundy) {
+          y1 -= yy - boundy;
+          yy = boundy;
+        }
+
+        return makeObj(flipCoords(x1, y1, xx, yy));
+      }
+      //}}}
+      function rebound(p) //{{{
+      {
+        if (p[0] < 0) {
+          p[0] = 0;
+        }
+        if (p[1] < 0) {
+          p[1] = 0;
+        }
+
+        if (p[0] > boundx) {
+          p[0] = boundx;
+        }
+        if (p[1] > boundy) {
+          p[1] = boundy;
+        }
+
+        return [p[0], p[1]];
+      }
+      //}}}
+      function flipCoords(x1, y1, x2, y2) //{{{
+      {
+        var xa = x1,
+            xb = x2,
+            ya = y1,
+            yb = y2;
+        if (x2 < x1) {
+          xa = x2;
+          xb = x1;
+        }
+        if (y2 < y1) {
+          ya = y2;
+          yb = y1;
+        }
+        return [Math.round(xa), Math.round(ya), Math.round(xb), Math.round(yb)];
+      }
+      //}}}
+      function getRect() //{{{
+      {
+        var xsize = x2 - x1,
+            ysize = y2 - y1,
+            delta;
+
+        if (xlimit && (Math.abs(xsize) > xlimit)) {
+          x2 = (xsize > 0) ? (x1 + xlimit) : (x1 - xlimit);
+        }
+        if (ylimit && (Math.abs(ysize) > ylimit)) {
+          y2 = (ysize > 0) ? (y1 + ylimit) : (y1 - ylimit);
+        }
+
+        if (ymin / yscale && (Math.abs(ysize) < ymin / yscale)) {
+          y2 = (ysize > 0) ? (y1 + ymin / yscale) : (y1 - ymin / yscale);
+        }
+        if (xmin / xscale && (Math.abs(xsize) < xmin / xscale)) {
+          x2 = (xsize > 0) ? (x1 + xmin / xscale) : (x1 - xmin / xscale);
+        }
+
+        if (x1 < 0) {
+          x2 -= x1;
+          x1 -= x1;
+        }
+        if (y1 < 0) {
+          y2 -= y1;
+          y1 -= y1;
+        }
+        if (x2 < 0) {
+          x1 -= x2;
+          x2 -= x2;
+        }
+        if (y2 < 0) {
+          y1 -= y2;
+          y2 -= y2;
+        }
+        if (x2 > boundx) {
+          delta = x2 - boundx;
+          x1 -= delta;
+          x2 -= delta;
+        }
+        if (y2 > boundy) {
+          delta = y2 - boundy;
+          y1 -= delta;
+          y2 -= delta;
+        }
+        if (x1 > boundx) {
+          delta = x1 - boundy;
+          y2 -= delta;
+          y1 -= delta;
+        }
+        if (y1 > boundy) {
+          delta = y1 - boundy;
+          y2 -= delta;
+          y1 -= delta;
+        }
+
+        return makeObj(flipCoords(x1, y1, x2, y2));
+      }
+      //}}}
+      function makeObj(a) //{{{
+      {
+        return {
+          x: a[0],
+          y: a[1],
+          x2: a[2],
+          y2: a[3],
+          w: a[2] - a[0],
+          h: a[3] - a[1]
+        };
+      }
+      //}}}
+
+      return {
+        flipCoords: flipCoords,
+        setPressed: setPressed,
+        setCurrent: setCurrent,
+        getOffset: getOffset,
+        moveOffset: moveOffset,
+        getCorner: getCorner,
+        getFixed: getFixed
+      };
+    }());
+
+    //}}}
+    // Shade Module {{{
+    var Shade = (function() {
+      var enabled = false,
+          holder = $('<div />').css({
+            position: 'absolute',
+            zIndex: 240,
+            opacity: 0
+          }),
+          shades = {
+            top: createShade(),
+            left: createShade().height(boundy),
+            right: createShade().height(boundy),
+            bottom: createShade()
+          };
+
+      function resizeShades(w,h) {
+        shades.left.css({ height: px(h) });
+        shades.right.css({ height: px(h) });
+      }
+      function updateAuto()
+      {
+        return updateShade(Coords.getFixed());
+      }
+      function updateShade(c)
+      {
+        shades.top.css({
+          left: px(c.x),
+          width: px(c.w),
+          height: px(c.y)
+        });
+        shades.bottom.css({
+          top: px(c.y2),
+          left: px(c.x),
+          width: px(c.w),
+          height: px(boundy-c.y2)
+        });
+        shades.right.css({
+          left: px(c.x2),
+          width: px(boundx-c.x2)
+        });
+        shades.left.css({
+          width: px(c.x)
+        });
+      }
+      function createShade() {
+        return $('<div />').css({
+          position: 'absolute',
+          backgroundColor: options.shadeColor||options.bgColor
+        }).appendTo(holder);
+      }
+      function enableShade() {
+        if (!enabled) {
+          enabled = true;
+          holder.insertBefore($img);
+          updateAuto();
+          Selection.setBgOpacity(1,0,1);
+          $img2.hide();
+
+          setBgColor(options.shadeColor||options.bgColor,1);
+          if (Selection.isAwake())
+          {
+            setOpacity(options.bgOpacity,1);
+          }
+            else setOpacity(1,1);
+        }
+      }
+      function setBgColor(color,now) {
+        colorChangeMacro(getShades(),color,now);
+      }
+      function disableShade() {
+        if (enabled) {
+          holder.remove();
+          $img2.show();
+          enabled = false;
+          if (Selection.isAwake()) {
+            Selection.setBgOpacity(options.bgOpacity,1,1);
+          } else {
+            Selection.setBgOpacity(1,1,1);
+            Selection.disableHandles();
+          }
+          colorChangeMacro($div,0,1);
+        }
+      }
+      function setOpacity(opacity,now) {
+        if (enabled) {
+          if (options.bgFade && !now) {
+            holder.animate({
+              opacity: 1-opacity
+            },{
+              queue: false,
+              duration: options.fadeTime
+            });
+          }
+          else holder.css({opacity:1-opacity});
+        }
+      }
+      function refreshAll() {
+        options.shade ? enableShade() : disableShade();
+        if (Selection.isAwake()) setOpacity(options.bgOpacity);
+      }
+      function getShades() {
+        return holder.children();
+      }
+
+      return {
+        update: updateAuto,
+        updateRaw: updateShade,
+        getShades: getShades,
+        setBgColor: setBgColor,
+        enable: enableShade,
+        disable: disableShade,
+        resize: resizeShades,
+        refresh: refreshAll,
+        opacity: setOpacity
+      };
+    }());
+    // }}}
+    // Selection Module {{{
+    var Selection = (function () {
+      var awake, hdep = 370;
+      var borders = {};
+      var handle = {};
+      var seehandles = false;
+      var hhs = options.handleOffset;
+
+      // Private Methods
+      function insertBorder(type) //{{{
+      {
+        var jq = $('<div />').css({
+          position: 'absolute',
+          opacity: options.borderOpacity
+        }).addClass(cssClass(type));
+        $img_holder.append(jq);
+        return jq;
+      }
+      //}}}
+      function dragDiv(ord, zi) //{{{
+      {
+        var jq = $('<div />').mousedown(createDragger(ord)).css({
+          cursor: ord + '-resize',
+          position: 'absolute',
+          zIndex: zi
+        }).addClass('ord-'+ord);
+
+        if (Touch.support) {
+          jq.bind('touchstart.jcrop', Touch.createDragger(ord));
+        }
+
+        $hdl_holder.append(jq);
+        return jq;
+      }
+      //}}}
+      function insertHandle(ord) //{{{
+      {
+        var hs = options.handleSize;
+        return dragDiv(ord, hdep++).css({
+          top: px(-hhs + 1),
+          left: px(-hhs + 1),
+          opacity: options.handleOpacity
+        }).width(hs).height(hs).addClass(cssClass('handle'));
+      }
+      //}}}
+      function insertDragbar(ord) //{{{
+      {
+        var s = options.handleSize,
+            h = s,
+            w = s,
+            t = hhs,
+            l = hhs;
+
+        switch (ord) {
+        case 'n':
+        case 's':
+          w = '100%';
+          break;
+        case 'e':
+        case 'w':
+          h = '100%';
+          break;
+        }
+
+        return dragDiv(ord, hdep++).width(w).height(h).css({
+          top: px(-t + 1),
+          left: px(-l + 1)
+        });
+      }
+      //}}}
+      function createHandles(li) //{{{
+      {
+        var i;
+        for (i = 0; i < li.length; i++) {
+          handle[li[i]] = insertHandle(li[i]);
+        }
+      }
+      //}}}
+      function moveHandles(c) //{{{
+      {
+        var midvert = Math.round((c.h / 2) - hhs),
+            midhoriz = Math.round((c.w / 2) - hhs),
+            north = -hhs + 1,
+            west = -hhs + 1,
+            east = c.w - hhs,
+            south = c.h - hhs,
+            x, y;
+
+        if (handle.e) {
+          handle.e.css({
+            top: px(midvert),
+            left: px(east)
+          });
+          handle.w.css({
+            top: px(midvert)
+          });
+          handle.s.css({
+            top: px(south),
+            left: px(midhoriz)
+          });
+          handle.n.css({
+            left: px(midhoriz)
+          });
+        }
+        if (handle.ne) {
+          handle.ne.css({
+            left: px(east)
+          });
+          handle.se.css({
+            top: px(south),
+            left: px(east)
+          });
+          handle.sw.css({
+            top: px(south)
+          });
+        }
+        if (handle.b) {
+          handle.b.css({
+            top: px(south)
+          });
+          handle.r.css({
+            left: px(east)
+          });
+        }
+      }
+      //}}}
+      function moveto(x, y) //{{{
+      {
+        if (!options.shade) {
+          $img2.css({
+            top: px(-y),
+            left: px(-x)
+          });
+        }
+        $sel.css({
+          top: px(y),
+          left: px(x)
+        });
+      }
+      //}}}
+      function resize(w, h) //{{{
+      {
+        $sel.width(w).height(h);
+      }
+      //}}}
+      function refresh() //{{{
+      {
+        var c = Coords.getFixed();
+
+        Coords.setPressed([c.x, c.y]);
+        Coords.setCurrent([c.x2, c.y2]);
+
+        updateVisible();
+      }
+      //}}}
+
+      // Internal Methods
+      function updateVisible(select) //{{{
+      {
+        if (awake) {
+          return update(select);
+        }
+      }
+      //}}}
+      function update(select) //{{{
+      {
+        var c = Coords.getFixed();
+
+        resize(c.w, c.h);
+        moveto(c.x, c.y);
+        if (options.shade) Shade.updateRaw(c);
+
+        if (seehandles) {
+          moveHandles(c);
+        }
+        if (!awake) {
+          show();
+        }
+
+        if (select) {
+          options.onSelect.call(api, unscale(c));
+        } else {
+          options.onChange.call(api, unscale(c));
+        }
+      }
+      //}}}
+      function setBgOpacity(opacity,force,now)
+      {
+        if (!awake && !force) return;
+        if (options.bgFade && !now) {
+          $img.animate({
+            opacity: opacity
+          },{
+            queue: false,
+            duration: options.fadeTime
+          });
+        } else {
+          $img.css('opacity', opacity);
+        }
+      }
+      function show() //{{{
+      {
+        $sel.show();
+
+        if (options.shade) Shade.opacity(bgopacity);
+          else setBgOpacity(bgopacity,true);
+
+        awake = true;
+      }
+      //}}}
+      function release() //{{{
+      {
+        disableHandles();
+        $sel.hide();
+
+        if (options.shade) Shade.opacity(1);
+          else setBgOpacity(1);
+
+        awake = false;
+        options.onRelease.call(api);
+      }
+      //}}}
+      function showHandles() //{{{
+      {
+        if (seehandles) {
+          moveHandles(Coords.getFixed());
+          $hdl_holder.show();
+        }
+      }
+      //}}}
+      function enableHandles() //{{{
+      {
+        seehandles = true;
+        if (options.allowResize) {
+          moveHandles(Coords.getFixed());
+          $hdl_holder.show();
+          return true;
+        }
+      }
+      //}}}
+      function disableHandles() //{{{
+      {
+        seehandles = false;
+        $hdl_holder.hide();
+      } 
+      //}}}
+      function animMode(v) //{{{
+      {
+        if (animating === v) {
+          disableHandles();
+        } else {
+          enableHandles();
+        }
+      } 
+      //}}}
+      function done() //{{{
+      {
+        animMode(false);
+        refresh();
+      } 
+      //}}}
+      /* Insert draggable elements {{{*/
+
+      // Insert border divs for outline
+      if (options.drawBorders) {
+        borders = {
+          top: insertBorder('hline'),
+          bottom: insertBorder('hline bottom'),
+          left: insertBorder('vline'),
+          right: insertBorder('vline right')
+        };
+      }
+
+      // Insert handles on edges
+      if (options.dragEdges) {
+        handle.t = insertDragbar('n');
+        handle.b = insertDragbar('s');
+        handle.r = insertDragbar('e');
+        handle.l = insertDragbar('w');
+      }
+
+      // Insert side and corner handles
+      if (options.sideHandles) {
+        createHandles(['n', 's', 'e', 'w']);
+      }
+      if (options.cornerHandles) {
+        createHandles(['sw', 'nw', 'ne', 'se']);
+      }
+      //}}}
+
+      // This is a hack for iOS5 to support drag/move touch functionality
+      $(document).bind('touchstart.jcrop-ios',function(e) {
+        if ($(e.currentTarget).hasClass('jcrop-tracker')) e.stopPropagation();
+      });
+
+      var $track = newTracker().mousedown(createDragger('move')).css({
+        cursor: 'move',
+        position: 'absolute',
+        zIndex: 360
+      });
+
+      if (Touch.support) {
+        $track.bind('touchstart.jcrop', Touch.createDragger('move'));
+      }
+
+      $img_holder.append($track);
+      disableHandles();
+
+      return {
+        updateVisible: updateVisible,
+        update: update,
+        release: release,
+        refresh: refresh,
+        isAwake: function () {
+          return awake;
+        },
+        setCursor: function (cursor) {
+          $track.css('cursor', cursor);
+        },
+        enableHandles: enableHandles,
+        enableOnly: function () {
+          seehandles = true;
+        },
+        showHandles: showHandles,
+        disableHandles: disableHandles,
+        animMode: animMode,
+        setBgOpacity: setBgOpacity,
+        done: done
+      };
+    }());
+    
+    //}}}
+    // Tracker Module {{{
+    var Tracker = (function () {
+      var onMove = function () {},
+          onDone = function () {},
+          trackDoc = options.trackDocument;
+
+      function toFront() //{{{
+      {
+        $trk.css({
+          zIndex: 450
+        });
+        if (Touch.support) {
+          $(document)
+            .bind('touchmove.jcrop', trackTouchMove)
+            .bind('touchend.jcrop', trackTouchEnd);
+        }
+        if (trackDoc) {
+          $(document)
+            .bind('mousemove.jcrop',trackMove)
+            .bind('mouseup.jcrop',trackUp);
+        }
+      } 
+      //}}}
+      function toBack() //{{{
+      {
+        $trk.css({
+          zIndex: 290
+        });
+        $(document).unbind('.jcrop');
+      } 
+      //}}}
+      function trackMove(e) //{{{
+      {
+        onMove(mouseAbs(e));
+        return false;
+      } 
+      //}}}
+      function trackUp(e) //{{{
+      {
+        e.preventDefault();
+        e.stopPropagation();
+
+        if (btndown) {
+          btndown = false;
+
+          onDone(mouseAbs(e));
+
+          if (Selection.isAwake()) {
+            options.onSelect.call(api, unscale(Coords.getFixed()));
+          }
+
+          toBack();
+          onMove = function () {};
+          onDone = function () {};
+        }
+
+        return false;
+      }
+      //}}}
+      function activateHandlers(move, done) //{{{
+      {
+        btndown = true;
+        onMove = move;
+        onDone = done;
+        toFront();
+        return false;
+      }
+      //}}}
+      function trackTouchMove(e) //{{{
+      {
+        e.pageX = e.originalEvent.changedTouches[0].pageX;
+        e.pageY = e.originalEvent.changedTouches[0].pageY;
+        return trackMove(e);
+      }
+      //}}}
+      function trackTouchEnd(e) //{{{
+      {
+        e.pageX = e.originalEvent.changedTouches[0].pageX;
+        e.pageY = e.originalEvent.changedTouches[0].pageY;
+        return trackUp(e);
+      }
+      //}}}
+      function setCursor(t) //{{{
+      {
+        $trk.css('cursor', t);
+      }
+      //}}}
+
+      if (!trackDoc) {
+        $trk.mousemove(trackMove).mouseup(trackUp).mouseout(trackUp);
+      }
+
+      $img.before($trk);
+      return {
+        activateHandlers: activateHandlers,
+        setCursor: setCursor
+      };
+    }());
+    //}}}
+    // KeyManager Module {{{
+    var KeyManager = (function () {
+      var $keymgr = $('<input type="radio" />').css({
+        position: 'fixed',
+        left: '-120px',
+        width: '12px'
+      }),
+          $keywrap = $('<div />').css({
+          position: 'absolute',
+          overflow: 'hidden'
+        }).append($keymgr);
+
+      function watchKeys() //{{{
+      {
+        if (options.keySupport) {
+          $keymgr.show();
+          $keymgr.focus();
+        }
+      }
+      //}}}
+      function onBlur(e) //{{{
+      {
+        $keymgr.hide();
+      }
+      //}}}
+      function doNudge(e, x, y) //{{{
+      {
+        if (options.allowMove) {
+          Coords.moveOffset([x, y]);
+          Selection.updateVisible(true);
+        }
+        e.preventDefault();
+        e.stopPropagation();
+      }
+      //}}}
+      function parseKey(e) //{{{
+      {
+        if (e.ctrlKey || e.metaKey) {
+          return true;
+        }
+        shift_down = e.shiftKey ? true : false;
+        var nudge = shift_down ? 10 : 1;
+
+        switch (e.keyCode) {
+        case 37:
+          doNudge(e, -nudge, 0);
+          break;
+        case 39:
+          doNudge(e, nudge, 0);
+          break;
+        case 38:
+          doNudge(e, 0, -nudge);
+          break;
+        case 40:
+          doNudge(e, 0, nudge);
+          break;
+        case 27:
+          if (options.allowSelect) Selection.release();
+          break;
+        case 9:
+          return true;
+        }
+
+        return false;
+      }
+      //}}}
+
+      if (options.keySupport) {
+        $keymgr.keydown(parseKey).blur(onBlur);
+        if (ie6mode || !options.fixedSupport) {
+          $keymgr.css({
+            position: 'absolute',
+            left: '-20px'
+          });
+          $keywrap.append($keymgr).insertBefore($img);
+        } else {
+          $keymgr.insertBefore($img);
+        }
+      }
+
+
+      return {
+        watchKeys: watchKeys
+      };
+    }());
+    //}}}
+    // }}}
+    // API methods {{{
+    function setClass(cname) //{{{
+    {
+      $div.removeClass().addClass(cssClass('holder')).addClass(cname);
+    }
+    //}}}
+    function animateTo(a, callback) //{{{
+    {
+      var x1 = parseInt(a[0], 10) / xscale,
+          y1 = parseInt(a[1], 10) / yscale,
+          x2 = parseInt(a[2], 10) / xscale,
+          y2 = parseInt(a[3], 10) / yscale;
+
+      if (animating) {
+        return;
+      }
+
+      var animto = Coords.flipCoords(x1, y1, x2, y2),
+          c = Coords.getFixed(),
+          initcr = [c.x, c.y, c.x2, c.y2],
+          animat = initcr,
+          interv = options.animationDelay,
+          ix1 = animto[0] - initcr[0],
+          iy1 = animto[1] - initcr[1],
+          ix2 = animto[2] - initcr[2],
+          iy2 = animto[3] - initcr[3],
+          pcent = 0,
+          velocity = options.swingSpeed;
+
+      x = animat[0];
+      y = animat[1];
+      x2 = animat[2];
+      y2 = animat[3];
+
+      Selection.animMode(true);
+      var anim_timer;
+
+      function queueAnimator() {
+        window.setTimeout(animator, interv);
+      }
+      var animator = (function () {
+        return function () {
+          pcent += (100 - pcent) / velocity;
+
+          animat[0] = x + ((pcent / 100) * ix1);
+          animat[1] = y + ((pcent / 100) * iy1);
+          animat[2] = x2 + ((pcent / 100) * ix2);
+          animat[3] = y2 + ((pcent / 100) * iy2);
+
+          if (pcent >= 99.8) {
+            pcent = 100;
+          }
+          if (pcent < 100) {
+            setSelectRaw(animat);
+            queueAnimator();
+          } else {
+            Selection.done();
+            if (typeof(callback) === 'function') {
+              callback.call(api);
+            }
+          }
+        };
+      }());
+      queueAnimator();
+    }
+    //}}}
+    function setSelect(rect) //{{{
+    {
+      setSelectRaw([parseInt(rect[0], 10) / xscale, parseInt(rect[1], 10) / yscale, parseInt(rect[2], 10) / xscale, parseInt(rect[3], 10) / yscale]);
+      options.onSelect.call(api, unscale(Coords.getFixed()));
+      Selection.enableHandles();
+    }
+    //}}}
+    function setSelectRaw(l) //{{{
+    {
+      Coords.setPressed([l[0], l[1]]);
+      Coords.setCurrent([l[2], l[3]]);
+      Selection.update();
+    }
+    //}}}
+    function tellSelect() //{{{
+    {
+      return unscale(Coords.getFixed());
+    }
+    //}}}
+    function tellScaled() //{{{
+    {
+      return Coords.getFixed();
+    }
+    //}}}
+    function setOptionsNew(opt) //{{{
+    {
+      setOptions(opt);
+      interfaceUpdate();
+    }
+    //}}}
+    function disableCrop() //{{{
+    {
+      options.disabled = true;
+      Selection.disableHandles();
+      Selection.setCursor('default');
+      Tracker.setCursor('default');
+    }
+    //}}}
+    function enableCrop() //{{{
+    {
+      options.disabled = false;
+      interfaceUpdate();
+    }
+    //}}}
+    function cancelCrop() //{{{
+    {
+      Selection.done();
+      Tracker.activateHandlers(null, null);
+    }
+    //}}}
+    function destroy() //{{{
+    {
+      $div.remove();
+      $origimg.show();
+      $(obj).removeData('Jcrop');
+    }
+    //}}}
+    function setImage(src, callback) //{{{
+    {
+      Selection.release();
+      disableCrop();
+      var img = new Image();
+      img.onload = function () {
+        var iw = img.width;
+        var ih = img.height;
+        var bw = options.boxWidth;
+        var bh = options.boxHeight;
+        $img.width(iw).height(ih);
+        $img.attr('src', src);
+        $img2.attr('src', src);
+        presize($img, bw, bh);
+        boundx = $img.width();
+        boundy = $img.height();
+        $img2.width(boundx).height(boundy);
+        $trk.width(boundx + (bound * 2)).height(boundy + (bound * 2));
+        $div.width(boundx).height(boundy);
+        Shade.resize(boundx,boundy);
+        enableCrop();
+
+        if (typeof(callback) === 'function') {
+          callback.call(api);
+        }
+      };
+      img.src = src;
+    }
+    //}}}
+    function colorChangeMacro($obj,color,now) {
+      var mycolor = color || options.bgColor;
+      if (options.bgFade && supportsColorFade() && options.fadeTime && !now) {
+        $obj.animate({
+          backgroundColor: mycolor
+        }, {
+          queue: false,
+          duration: options.fadeTime
+        });
+      } else {
+        $obj.css('backgroundColor', mycolor);
+      }
+    }
+    function interfaceUpdate(alt) //{{{
+    // This method tweaks the interface based on options object.
+    // Called when options are changed and at end of initialization.
+    {
+      if (options.allowResize) {
+        if (alt) {
+          Selection.enableOnly();
+        } else {
+          Selection.enableHandles();
+        }
+      } else {
+        Selection.disableHandles();
+      }
+
+      Tracker.setCursor(options.allowSelect ? 'crosshair' : 'default');
+      Selection.setCursor(options.allowMove ? 'move' : 'default');
+
+      if (options.hasOwnProperty('trueSize')) {
+        xscale = options.trueSize[0] / boundx;
+        yscale = options.trueSize[1] / boundy;
+      }
+
+      if (options.hasOwnProperty('setSelect')) {
+        setSelect(options.setSelect);
+        Selection.done();
+        delete(options.setSelect);
+      }
+
+      Shade.refresh();
+
+      if (options.bgColor != bgcolor) {
+        colorChangeMacro(
+          options.shade? Shade.getShades(): $div,
+          options.shade?
+            (options.shadeColor || options.bgColor):
+            options.bgColor
+        );
+        bgcolor = options.bgColor;
+      }
+
+      if (bgopacity != options.bgOpacity) {
+        bgopacity = options.bgOpacity;
+        if (options.shade) Shade.refresh();
+          else Selection.setBgOpacity(bgopacity);
+      }
+
+      xlimit = options.maxSize[0] || 0;
+      ylimit = options.maxSize[1] || 0;
+      xmin = options.minSize[0] || 0;
+      ymin = options.minSize[1] || 0;
+
+      if (options.hasOwnProperty('outerImage')) {
+        $img.attr('src', options.outerImage);
+        delete(options.outerImage);
+      }
+
+      Selection.refresh();
+    }
+    //}}}
+    //}}}
+
+    if (Touch.support) $trk.bind('touchstart.jcrop', Touch.newSelection);
+
+    $hdl_holder.hide();
+    interfaceUpdate(true);
+
+    var api = {
+      setImage: setImage,
+      animateTo: animateTo,
+      setSelect: setSelect,
+      setOptions: setOptionsNew,
+      tellSelect: tellSelect,
+      tellScaled: tellScaled,
+      setClass: setClass,
+
+      disable: disableCrop,
+      enable: enableCrop,
+      cancel: cancelCrop,
+      release: Selection.release,
+      destroy: destroy,
+
+      focus: KeyManager.watchKeys,
+
+      getBounds: function () {
+        return [boundx * xscale, boundy * yscale];
+      },
+      getWidgetSize: function () {
+        return [boundx, boundy];
+      },
+      getScaleFactor: function () {
+        return [xscale, yscale];
+      },
+
+      ui: {
+        holder: $div,
+        selection: $sel
+      }
+    };
+
+    if ($.browser.msie) {
+      $div.bind('selectstart', function () {
+        return false;
+      });
+    }
+
+    $origimg.data('Jcrop', api);
+    return api;
+  };
+  $.fn.Jcrop = function (options, callback) //{{{
+  {
+    var api;
+    // Iterate over each object, attach Jcrop
+    this.each(function () {
+      // If we've already attached to this object
+      if ($(this).data('Jcrop')) {
+        // The API can be requested this way (undocumented)
+        if (options === 'api') return $(this).data('Jcrop');
+        // Otherwise, we just reset the options...
+        else $(this).data('Jcrop').setOptions(options);
+      }
+      // If we haven't been attached, preload and attach
+      else {
+        if (this.tagName == 'IMG')
+          $.Jcrop.Loader(this,function(){
+            $(this).css({display:'block',visibility:'hidden'});
+            api = $.Jcrop(this, options);
+            if ($.isFunction(callback)) callback.call(api);
+          });
+        else {
+          $(this).css({display:'block',visibility:'hidden'});
+          api = $.Jcrop(this, options);
+          if ($.isFunction(callback)) callback.call(api);
+        }
+      }
+    });
+
+    // Return "this" so the object is chainable (jQuery-style)
+    return this;
+  };
+  //}}}
+  // $.Jcrop.Loader - basic image loader {{{
+
+  $.Jcrop.Loader = function(imgobj,success,error){
+    var $img = $(imgobj), img = $img[0];
+
+    function completeCheck(){
+      if (img.complete) {
+        $img.unbind('.jcloader');
+        if ($.isFunction(success)) success.call(img);
+      }
+      else window.setTimeout(completeCheck,50);
+    }
+
+    $img
+      .bind('load.jcloader',completeCheck)
+      .bind('error.jcloader',function(e){
+        $img.unbind('.jcloader');
+        if ($.isFunction(error)) error.call(img);
+      });
+
+    if (img.complete && $.isFunction(success)){
+      $img.unbind('.jcloader');
+      success.call(img);
+    }
+  };
+
+  //}}}
+  // Global Defaults {{{
+  $.Jcrop.defaults = {
+
+    // Basic Settings
+    allowSelect: true,
+    allowMove: true,
+    allowResize: true,
+
+    trackDocument: true,
+
+    // Styling Options
+    baseClass: 'jcrop',
+    addClass: null,
+    bgColor: 'black',
+    bgOpacity: 0.6,
+    bgFade: false,
+    borderOpacity: 0.4,
+    handleOpacity: 0.5,
+    handleSize: 7,
+    handleOffset: 5,
+
+    aspectRatio: 0,
+    keySupport: true,
+    cornerHandles: true,
+    sideHandles: true,
+    drawBorders: true,
+    dragEdges: true,
+    fixedSupport: true,
+    touchSupport: null,
+
+    shade: null,
+
+    boxWidth: 0,
+    boxHeight: 0,
+    boundary: 2,
+    fadeTime: 400,
+    animationDelay: 20,
+    swingSpeed: 3,
+
+    minSelect: [0, 0],
+    maxSize: [0, 0],
+    minSize: [0, 0],
+
+    // Callbacks / Event Handlers
+    onChange: function () {},
+    onSelect: function () {},
+    onDblClick: function () {},
+    onRelease: function () {}
+  };
+
+  // }}}
+}(jQuery));
diff --git a/apps/contacts/js/jquery.Jcrop.min.js b/apps/contacts/js/jquery.Jcrop.min.js
new file mode 100644
index 00000000000..0c05d67c22d
--- /dev/null
+++ b/apps/contacts/js/jquery.Jcrop.min.js
@@ -0,0 +1,255 @@
+/**
+ * jquery.Jcrop.min.js v0.9.9 {{{ (build:20120102)
+ * jQuery Image Cropping Plugin - released under MIT License
+ * Copyright (c) 2008-2012 Tapmodo Interactive LLC
+ * https://github.com/tapmodo/Jcrop
+ */
+
+(function($){$.Jcrop=function(obj,opt){var options=$.extend({},$.Jcrop.defaults),docOffset,lastcurs,ie6mode=false;function px(n){return parseInt(n,10)+'px';}
+function cssClass(cl){return options.baseClass+'-'+cl;}
+function supportsColorFade(){return $.fx.step.hasOwnProperty('backgroundColor');}
+function getPos(obj)
+{var pos=$(obj).offset();return[pos.left,pos.top];}
+function mouseAbs(e)
+{return[(e.pageX-docOffset[0]),(e.pageY-docOffset[1])];}
+function setOptions(opt)
+{if(typeof(opt)!=='object')opt={};options=$.extend(options,opt);$.each(['onChange','onSelect','onRelease','onDblClick'],function(i,e){if(typeof(options[e])!=='function')options[e]=function(){};});}
+function startDragMode(mode,pos)
+{docOffset=getPos($img);Tracker.setCursor(mode==='move'?mode:mode+'-resize');if(mode==='move'){return Tracker.activateHandlers(createMover(pos),doneSelect);}
+var fc=Coords.getFixed();var opp=oppLockCorner(mode);var opc=Coords.getCorner(oppLockCorner(opp));Coords.setPressed(Coords.getCorner(opp));Coords.setCurrent(opc);Tracker.activateHandlers(dragmodeHandler(mode,fc),doneSelect);}
+function dragmodeHandler(mode,f)
+{return function(pos){if(!options.aspectRatio){switch(mode){case'e':pos[1]=f.y2;break;case'w':pos[1]=f.y2;break;case'n':pos[0]=f.x2;break;case's':pos[0]=f.x2;break;}}else{switch(mode){case'e':pos[1]=f.y+1;break;case'w':pos[1]=f.y+1;break;case'n':pos[0]=f.x+1;break;case's':pos[0]=f.x+1;break;}}
+Coords.setCurrent(pos);Selection.update();};}
+function createMover(pos)
+{var lloc=pos;KeyManager.watchKeys();return function(pos){Coords.moveOffset([pos[0]-lloc[0],pos[1]-lloc[1]]);lloc=pos;Selection.update();};}
+function oppLockCorner(ord)
+{switch(ord){case'n':return'sw';case's':return'nw';case'e':return'nw';case'w':return'ne';case'ne':return'sw';case'nw':return'se';case'se':return'nw';case'sw':return'ne';}}
+function createDragger(ord)
+{return function(e){if(options.disabled){return false;}
+if((ord==='move')&&!options.allowMove){return false;}
+docOffset=getPos($img);btndown=true;startDragMode(ord,mouseAbs(e));e.stopPropagation();e.preventDefault();return false;};}
+function presize($obj,w,h)
+{var nw=$obj.width(),nh=$obj.height();if((nw>w)&&w>0){nw=w;nh=(w/$obj.width())*$obj.height();}
+if((nh>h)&&h>0){nh=h;nw=(h/$obj.height())*$obj.width();}
+xscale=$obj.width()/nw;yscale=$obj.height()/nh;$obj.width(nw).height(nh);}
+function unscale(c)
+{return{x:parseInt(c.x*xscale,10),y:parseInt(c.y*yscale,10),x2:parseInt(c.x2*xscale,10),y2:parseInt(c.y2*yscale,10),w:parseInt(c.w*xscale,10),h:parseInt(c.h*yscale,10)};}
+function doneSelect(pos)
+{var c=Coords.getFixed();if((c.w>options.minSelect[0])&&(c.h>options.minSelect[1])){Selection.enableHandles();Selection.done();}else{Selection.release();}
+Tracker.setCursor(options.allowSelect?'crosshair':'default');}
+function newSelection(e)
+{if(options.disabled){return false;}
+if(!options.allowSelect){return false;}
+btndown=true;docOffset=getPos($img);Selection.disableHandles();Tracker.setCursor('crosshair');var pos=mouseAbs(e);Coords.setPressed(pos);Selection.update();Tracker.activateHandlers(selectDrag,doneSelect);KeyManager.watchKeys();e.stopPropagation();e.preventDefault();return false;}
+function selectDrag(pos)
+{Coords.setCurrent(pos);Selection.update();}
+function newTracker()
+{var trk=$('<div></div>').addClass(cssClass('tracker'));if($.browser.msie){trk.css({opacity:0,backgroundColor:'white'});}
+return trk;}
+if($.browser.msie&&($.browser.version.split('.')[0]==='6')){ie6mode=true;}
+if(typeof(obj)!=='object'){obj=$(obj)[0];}
+if(typeof(opt)!=='object'){opt={};}
+setOptions(opt);var img_css={border:'none',visibility:'visible',margin:0,padding:0,position:'absolute',top:0,left:0};var $origimg=$(obj),img_mode=true;if(obj.tagName=='IMG'){if($origimg[0].width!=0&&$origimg[0].height!=0){$origimg.width($origimg[0].width);$origimg.height($origimg[0].height);}else{var tempImage=new Image();tempImage.src=$origimg[0].src;$origimg.width(tempImage.width);$origimg.height(tempImage.height);}
+var $img=$origimg.clone().removeAttr('id').css(img_css).show();$img.width($origimg.width());$img.height($origimg.height());$origimg.after($img).hide();}else{$img=$origimg.css(img_css).show();img_mode=false;if(options.shade===null){options.shade=true;}}
+presize($img,options.boxWidth,options.boxHeight);var boundx=$img.width(),boundy=$img.height(),$div=$('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({position:'relative',backgroundColor:options.bgColor}).insertAfter($origimg).append($img);if(options.addClass){$div.addClass(options.addClass);}
+var $img2=$('<div />'),$img_holder=$('<div />').width('100%').height('100%').css({zIndex:310,position:'absolute',overflow:'hidden'}),$hdl_holder=$('<div />').width('100%').height('100%').css('zIndex',320),$sel=$('<div />').css({position:'absolute',zIndex:600}).dblclick(function(){var c=Coords.getFixed();options.onDblClick.call(api,c);}).insertBefore($img).append($img_holder,$hdl_holder);if(img_mode){$img2=$('<img />').attr('src',$img.attr('src')).css(img_css).width(boundx).height(boundy),$img_holder.append($img2);}
+if(ie6mode){$sel.css({overflowY:'hidden'});}
+var bound=options.boundary;var $trk=newTracker().width(boundx+(bound*2)).height(boundy+(bound*2)).css({position:'absolute',top:px(-bound),left:px(-bound),zIndex:290}).mousedown(newSelection);var bgcolor=options.bgColor,bgopacity=options.bgOpacity,xlimit,ylimit,xmin,ymin,xscale,yscale,enabled=true,btndown,animating,shift_down;docOffset=getPos($img);var Touch=(function(){function hasTouchSupport(){var support={},events=['touchstart','touchmove','touchend'],el=document.createElement('div'),i;try{for(i=0;i<events.length;i++){var eventName=events[i];eventName='on'+eventName;var isSupported=(eventName in el);if(!isSupported){el.setAttribute(eventName,'return;');isSupported=typeof el[eventName]=='function';}
+support[events[i]]=isSupported;}
+return support.touchstart&&support.touchend&&support.touchmove;}
+catch(err){return false;}}
+function detectSupport(){if((options.touchSupport===true)||(options.touchSupport===false))return options.touchSupport;else return hasTouchSupport();}
+return{createDragger:function(ord){return function(e){e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;if(options.disabled){return false;}
+if((ord==='move')&&!options.allowMove){return false;}
+btndown=true;startDragMode(ord,mouseAbs(e));e.stopPropagation();e.preventDefault();return false;};},newSelection:function(e){e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return newSelection(e);},isSupported:hasTouchSupport,support:detectSupport()};}());var Coords=(function(){var x1=0,y1=0,x2=0,y2=0,ox,oy;function setPressed(pos)
+{pos=rebound(pos);x2=x1=pos[0];y2=y1=pos[1];}
+function setCurrent(pos)
+{pos=rebound(pos);ox=pos[0]-x2;oy=pos[1]-y2;x2=pos[0];y2=pos[1];}
+function getOffset()
+{return[ox,oy];}
+function moveOffset(offset)
+{var ox=offset[0],oy=offset[1];if(0>x1+ox){ox-=ox+x1;}
+if(0>y1+oy){oy-=oy+y1;}
+if(boundy<y2+oy){oy+=boundy-(y2+oy);}
+if(boundx<x2+ox){ox+=boundx-(x2+ox);}
+x1+=ox;x2+=ox;y1+=oy;y2+=oy;}
+function getCorner(ord)
+{var c=getFixed();switch(ord){case'ne':return[c.x2,c.y];case'nw':return[c.x,c.y];case'se':return[c.x2,c.y2];case'sw':return[c.x,c.y2];}}
+function getFixed()
+{if(!options.aspectRatio){return getRect();}
+var aspect=options.aspectRatio,min_x=options.minSize[0]/xscale,max_x=options.maxSize[0]/xscale,max_y=options.maxSize[1]/yscale,rw=x2-x1,rh=y2-y1,rwa=Math.abs(rw),rha=Math.abs(rh),real_ratio=rwa/rha,xx,yy,w,h;if(max_x===0){max_x=boundx*10;}
+if(max_y===0){max_y=boundy*10;}
+if(real_ratio<aspect){yy=y2;w=rha*aspect;xx=rw<0?x1-w:w+x1;if(xx<0){xx=0;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}else if(xx>boundx){xx=boundx;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}}else{xx=x2;h=rwa/aspect;yy=rh<0?y1-h:y1+h;if(yy<0){yy=0;w=Math.abs((yy-y1)*aspect);xx=rw<0?x1-w:w+x1;}else if(yy>boundy){yy=boundy;w=Math.abs(yy-y1)*aspect;xx=rw<0?x1-w:w+x1;}}
+if(xx>x1){if(xx-x1<min_x){xx=x1+min_x;}else if(xx-x1>max_x){xx=x1+max_x;}
+if(yy>y1){yy=y1+(xx-x1)/aspect;}else{yy=y1-(xx-x1)/aspect;}}else if(xx<x1){if(x1-xx<min_x){xx=x1-min_x;}else if(x1-xx>max_x){xx=x1-max_x;}
+if(yy>y1){yy=y1+(x1-xx)/aspect;}else{yy=y1-(x1-xx)/aspect;}}
+if(xx<0){x1-=xx;xx=0;}else if(xx>boundx){x1-=xx-boundx;xx=boundx;}
+if(yy<0){y1-=yy;yy=0;}else if(yy>boundy){y1-=yy-boundy;yy=boundy;}
+return makeObj(flipCoords(x1,y1,xx,yy));}
+function rebound(p)
+{if(p[0]<0){p[0]=0;}
+if(p[1]<0){p[1]=0;}
+if(p[0]>boundx){p[0]=boundx;}
+if(p[1]>boundy){p[1]=boundy;}
+return[p[0],p[1]];}
+function flipCoords(x1,y1,x2,y2)
+{var xa=x1,xb=x2,ya=y1,yb=y2;if(x2<x1){xa=x2;xb=x1;}
+if(y2<y1){ya=y2;yb=y1;}
+return[Math.round(xa),Math.round(ya),Math.round(xb),Math.round(yb)];}
+function getRect()
+{var xsize=x2-x1,ysize=y2-y1,delta;if(xlimit&&(Math.abs(xsize)>xlimit)){x2=(xsize>0)?(x1+xlimit):(x1-xlimit);}
+if(ylimit&&(Math.abs(ysize)>ylimit)){y2=(ysize>0)?(y1+ylimit):(y1-ylimit);}
+if(ymin/yscale&&(Math.abs(ysize)<ymin/yscale)){y2=(ysize>0)?(y1+ymin/yscale):(y1-ymin/yscale);}
+if(xmin/xscale&&(Math.abs(xsize)<xmin/xscale)){x2=(xsize>0)?(x1+xmin/xscale):(x1-xmin/xscale);}
+if(x1<0){x2-=x1;x1-=x1;}
+if(y1<0){y2-=y1;y1-=y1;}
+if(x2<0){x1-=x2;x2-=x2;}
+if(y2<0){y1-=y2;y2-=y2;}
+if(x2>boundx){delta=x2-boundx;x1-=delta;x2-=delta;}
+if(y2>boundy){delta=y2-boundy;y1-=delta;y2-=delta;}
+if(x1>boundx){delta=x1-boundy;y2-=delta;y1-=delta;}
+if(y1>boundy){delta=y1-boundy;y2-=delta;y1-=delta;}
+return makeObj(flipCoords(x1,y1,x2,y2));}
+function makeObj(a)
+{return{x:a[0],y:a[1],x2:a[2],y2:a[3],w:a[2]-a[0],h:a[3]-a[1]};}
+return{flipCoords:flipCoords,setPressed:setPressed,setCurrent:setCurrent,getOffset:getOffset,moveOffset:moveOffset,getCorner:getCorner,getFixed:getFixed};}());var Shade=(function(){var enabled=false,holder=$('<div />').css({position:'absolute',zIndex:240,opacity:0}),shades={top:createShade(),left:createShade().height(boundy),right:createShade().height(boundy),bottom:createShade()};function resizeShades(w,h){shades.left.css({height:px(h)});shades.right.css({height:px(h)});}
+function updateAuto()
+{return updateShade(Coords.getFixed());}
+function updateShade(c)
+{shades.top.css({left:px(c.x),width:px(c.w),height:px(c.y)});shades.bottom.css({top:px(c.y2),left:px(c.x),width:px(c.w),height:px(boundy-c.y2)});shades.right.css({left:px(c.x2),width:px(boundx-c.x2)});shades.left.css({width:px(c.x)});}
+function createShade(){return $('<div />').css({position:'absolute',backgroundColor:options.shadeColor||options.bgColor}).appendTo(holder);}
+function enableShade(){if(!enabled){enabled=true;holder.insertBefore($img);updateAuto();Selection.setBgOpacity(1,0,1);$img2.hide();setBgColor(options.shadeColor||options.bgColor,1);if(Selection.isAwake())
+{setOpacity(options.bgOpacity,1);}
+else setOpacity(1,1);}}
+function setBgColor(color,now){colorChangeMacro(getShades(),color,now);}
+function disableShade(){if(enabled){holder.remove();$img2.show();enabled=false;if(Selection.isAwake()){Selection.setBgOpacity(options.bgOpacity,1,1);}else{Selection.setBgOpacity(1,1,1);Selection.disableHandles();}
+colorChangeMacro($div,0,1);}}
+function setOpacity(opacity,now){if(enabled){if(options.bgFade&&!now){holder.animate({opacity:1-opacity},{queue:false,duration:options.fadeTime});}
+else holder.css({opacity:1-opacity});}}
+function refreshAll(){options.shade?enableShade():disableShade();if(Selection.isAwake())setOpacity(options.bgOpacity);}
+function getShades(){return holder.children();}
+return{update:updateAuto,updateRaw:updateShade,getShades:getShades,setBgColor:setBgColor,enable:enableShade,disable:disableShade,resize:resizeShades,refresh:refreshAll,opacity:setOpacity};}());var Selection=(function(){var awake,hdep=370;var borders={};var handle={};var seehandles=false;var hhs=options.handleOffset;function insertBorder(type)
+{var jq=$('<div />').css({position:'absolute',opacity:options.borderOpacity}).addClass(cssClass(type));$img_holder.append(jq);return jq;}
+function dragDiv(ord,zi)
+{var jq=$('<div />').mousedown(createDragger(ord)).css({cursor:ord+'-resize',position:'absolute',zIndex:zi}).addClass('ord-'+ord);if(Touch.support){jq.bind('touchstart.jcrop',Touch.createDragger(ord));}
+$hdl_holder.append(jq);return jq;}
+function insertHandle(ord)
+{var hs=options.handleSize;return dragDiv(ord,hdep++).css({top:px(-hhs+1),left:px(-hhs+1),opacity:options.handleOpacity}).width(hs).height(hs).addClass(cssClass('handle'));}
+function insertDragbar(ord)
+{var s=options.handleSize,h=s,w=s,t=hhs,l=hhs;switch(ord){case'n':case's':w='100%';break;case'e':case'w':h='100%';break;}
+return dragDiv(ord,hdep++).width(w).height(h).css({top:px(-t+1),left:px(-l+1)});}
+function createHandles(li)
+{var i;for(i=0;i<li.length;i++){handle[li[i]]=insertHandle(li[i]);}}
+function moveHandles(c)
+{var midvert=Math.round((c.h/2)-hhs),midhoriz=Math.round((c.w/2)-hhs),north=-hhs+1,west=-hhs+1,east=c.w-hhs,south=c.h-hhs,x,y;if(handle.e){handle.e.css({top:px(midvert),left:px(east)});handle.w.css({top:px(midvert)});handle.s.css({top:px(south),left:px(midhoriz)});handle.n.css({left:px(midhoriz)});}
+if(handle.ne){handle.ne.css({left:px(east)});handle.se.css({top:px(south),left:px(east)});handle.sw.css({top:px(south)});}
+if(handle.b){handle.b.css({top:px(south)});handle.r.css({left:px(east)});}}
+function moveto(x,y)
+{if(!options.shade){$img2.css({top:px(-y),left:px(-x)});}
+$sel.css({top:px(y),left:px(x)});}
+function resize(w,h)
+{$sel.width(w).height(h);}
+function refresh()
+{var c=Coords.getFixed();Coords.setPressed([c.x,c.y]);Coords.setCurrent([c.x2,c.y2]);updateVisible();}
+function updateVisible(select)
+{if(awake){return update(select);}}
+function update(select)
+{var c=Coords.getFixed();resize(c.w,c.h);moveto(c.x,c.y);if(options.shade)Shade.updateRaw(c);if(seehandles){moveHandles(c);}
+if(!awake){show();}
+if(select){options.onSelect.call(api,unscale(c));}else{options.onChange.call(api,unscale(c));}}
+function setBgOpacity(opacity,force,now)
+{if(!awake&&!force)return;if(options.bgFade&&!now){$img.animate({opacity:opacity},{queue:false,duration:options.fadeTime});}else{$img.css('opacity',opacity);}}
+function show()
+{$sel.show();if(options.shade)Shade.opacity(bgopacity);else setBgOpacity(bgopacity,true);awake=true;}
+function release()
+{disableHandles();$sel.hide();if(options.shade)Shade.opacity(1);else setBgOpacity(1);awake=false;options.onRelease.call(api);}
+function showHandles()
+{if(seehandles){moveHandles(Coords.getFixed());$hdl_holder.show();}}
+function enableHandles()
+{seehandles=true;if(options.allowResize){moveHandles(Coords.getFixed());$hdl_holder.show();return true;}}
+function disableHandles()
+{seehandles=false;$hdl_holder.hide();}
+function animMode(v)
+{if(animating===v){disableHandles();}else{enableHandles();}}
+function done()
+{animMode(false);refresh();}
+if(options.drawBorders){borders={top:insertBorder('hline'),bottom:insertBorder('hline bottom'),left:insertBorder('vline'),right:insertBorder('vline right')};}
+if(options.dragEdges){handle.t=insertDragbar('n');handle.b=insertDragbar('s');handle.r=insertDragbar('e');handle.l=insertDragbar('w');}
+if(options.sideHandles){createHandles(['n','s','e','w']);}
+if(options.cornerHandles){createHandles(['sw','nw','ne','se']);}
+$(document).bind('touchstart.jcrop-ios',function(e){if($(e.currentTarget).hasClass('jcrop-tracker'))e.stopPropagation();});var $track=newTracker().mousedown(createDragger('move')).css({cursor:'move',position:'absolute',zIndex:360});if(Touch.support){$track.bind('touchstart.jcrop',Touch.createDragger('move'));}
+$img_holder.append($track);disableHandles();return{updateVisible:updateVisible,update:update,release:release,refresh:refresh,isAwake:function(){return awake;},setCursor:function(cursor){$track.css('cursor',cursor);},enableHandles:enableHandles,enableOnly:function(){seehandles=true;},showHandles:showHandles,disableHandles:disableHandles,animMode:animMode,setBgOpacity:setBgOpacity,done:done};}());var Tracker=(function(){var onMove=function(){},onDone=function(){},trackDoc=options.trackDocument;function toFront()
+{$trk.css({zIndex:450});if(Touch.support){$(document).bind('touchmove.jcrop',trackTouchMove).bind('touchend.jcrop',trackTouchEnd);}
+if(trackDoc){$(document).bind('mousemove.jcrop',trackMove).bind('mouseup.jcrop',trackUp);}}
+function toBack()
+{$trk.css({zIndex:290});$(document).unbind('.jcrop');}
+function trackMove(e)
+{onMove(mouseAbs(e));return false;}
+function trackUp(e)
+{e.preventDefault();e.stopPropagation();if(btndown){btndown=false;onDone(mouseAbs(e));if(Selection.isAwake()){options.onSelect.call(api,unscale(Coords.getFixed()));}
+toBack();onMove=function(){};onDone=function(){};}
+return false;}
+function activateHandlers(move,done)
+{btndown=true;onMove=move;onDone=done;toFront();return false;}
+function trackTouchMove(e)
+{e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return trackMove(e);}
+function trackTouchEnd(e)
+{e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return trackUp(e);}
+function setCursor(t)
+{$trk.css('cursor',t);}
+if(!trackDoc){$trk.mousemove(trackMove).mouseup(trackUp).mouseout(trackUp);}
+$img.before($trk);return{activateHandlers:activateHandlers,setCursor:setCursor};}());var KeyManager=(function(){var $keymgr=$('<input type="radio" />').css({position:'fixed',left:'-120px',width:'12px'}),$keywrap=$('<div />').css({position:'absolute',overflow:'hidden'}).append($keymgr);function watchKeys()
+{if(options.keySupport){$keymgr.show();$keymgr.focus();}}
+function onBlur(e)
+{$keymgr.hide();}
+function doNudge(e,x,y)
+{if(options.allowMove){Coords.moveOffset([x,y]);Selection.updateVisible(true);}
+e.preventDefault();e.stopPropagation();}
+function parseKey(e)
+{if(e.ctrlKey||e.metaKey){return true;}
+shift_down=e.shiftKey?true:false;var nudge=shift_down?10:1;switch(e.keyCode){case 37:doNudge(e,-nudge,0);break;case 39:doNudge(e,nudge,0);break;case 38:doNudge(e,0,-nudge);break;case 40:doNudge(e,0,nudge);break;case 27:if(options.allowSelect)Selection.release();break;case 9:return true;}
+return false;}
+if(options.keySupport){$keymgr.keydown(parseKey).blur(onBlur);if(ie6mode||!options.fixedSupport){$keymgr.css({position:'absolute',left:'-20px'});$keywrap.append($keymgr).insertBefore($img);}else{$keymgr.insertBefore($img);}}
+return{watchKeys:watchKeys};}());function setClass(cname)
+{$div.removeClass().addClass(cssClass('holder')).addClass(cname);}
+function animateTo(a,callback)
+{var x1=parseInt(a[0],10)/xscale,y1=parseInt(a[1],10)/yscale,x2=parseInt(a[2],10)/xscale,y2=parseInt(a[3],10)/yscale;if(animating){return;}
+var animto=Coords.flipCoords(x1,y1,x2,y2),c=Coords.getFixed(),initcr=[c.x,c.y,c.x2,c.y2],animat=initcr,interv=options.animationDelay,ix1=animto[0]-initcr[0],iy1=animto[1]-initcr[1],ix2=animto[2]-initcr[2],iy2=animto[3]-initcr[3],pcent=0,velocity=options.swingSpeed;x=animat[0];y=animat[1];x2=animat[2];y2=animat[3];Selection.animMode(true);var anim_timer;function queueAnimator(){window.setTimeout(animator,interv);}
+var animator=(function(){return function(){pcent+=(100-pcent)/velocity;animat[0]=x+((pcent/100)*ix1);animat[1]=y+((pcent/100)*iy1);animat[2]=x2+((pcent/100)*ix2);animat[3]=y2+((pcent/100)*iy2);if(pcent>=99.8){pcent=100;}
+if(pcent<100){setSelectRaw(animat);queueAnimator();}else{Selection.done();if(typeof(callback)==='function'){callback.call(api);}}};}());queueAnimator();}
+function setSelect(rect)
+{setSelectRaw([parseInt(rect[0],10)/xscale,parseInt(rect[1],10)/yscale,parseInt(rect[2],10)/xscale,parseInt(rect[3],10)/yscale]);options.onSelect.call(api,unscale(Coords.getFixed()));Selection.enableHandles();}
+function setSelectRaw(l)
+{Coords.setPressed([l[0],l[1]]);Coords.setCurrent([l[2],l[3]]);Selection.update();}
+function tellSelect()
+{return unscale(Coords.getFixed());}
+function tellScaled()
+{return Coords.getFixed();}
+function setOptionsNew(opt)
+{setOptions(opt);interfaceUpdate();}
+function disableCrop()
+{options.disabled=true;Selection.disableHandles();Selection.setCursor('default');Tracker.setCursor('default');}
+function enableCrop()
+{options.disabled=false;interfaceUpdate();}
+function cancelCrop()
+{Selection.done();Tracker.activateHandlers(null,null);}
+function destroy()
+{$div.remove();$origimg.show();$(obj).removeData('Jcrop');}
+function setImage(src,callback)
+{Selection.release();disableCrop();var img=new Image();img.onload=function(){var iw=img.width;var ih=img.height;var bw=options.boxWidth;var bh=options.boxHeight;$img.width(iw).height(ih);$img.attr('src',src);$img2.attr('src',src);presize($img,bw,bh);boundx=$img.width();boundy=$img.height();$img2.width(boundx).height(boundy);$trk.width(boundx+(bound*2)).height(boundy+(bound*2));$div.width(boundx).height(boundy);Shade.resize(boundx,boundy);enableCrop();if(typeof(callback)==='function'){callback.call(api);}};img.src=src;}
+function colorChangeMacro($obj,color,now){var mycolor=color||options.bgColor;if(options.bgFade&&supportsColorFade()&&options.fadeTime&&!now){$obj.animate({backgroundColor:mycolor},{queue:false,duration:options.fadeTime});}else{$obj.css('backgroundColor',mycolor);}}
+function interfaceUpdate(alt)
+{if(options.allowResize){if(alt){Selection.enableOnly();}else{Selection.enableHandles();}}else{Selection.disableHandles();}
+Tracker.setCursor(options.allowSelect?'crosshair':'default');Selection.setCursor(options.allowMove?'move':'default');if(options.hasOwnProperty('trueSize')){xscale=options.trueSize[0]/boundx;yscale=options.trueSize[1]/boundy;}
+if(options.hasOwnProperty('setSelect')){setSelect(options.setSelect);Selection.done();delete(options.setSelect);}
+Shade.refresh();if(options.bgColor!=bgcolor){colorChangeMacro(options.shade?Shade.getShades():$div,options.shade?(options.shadeColor||options.bgColor):options.bgColor);bgcolor=options.bgColor;}
+if(bgopacity!=options.bgOpacity){bgopacity=options.bgOpacity;if(options.shade)Shade.refresh();else Selection.setBgOpacity(bgopacity);}
+xlimit=options.maxSize[0]||0;ylimit=options.maxSize[1]||0;xmin=options.minSize[0]||0;ymin=options.minSize[1]||0;if(options.hasOwnProperty('outerImage')){$img.attr('src',options.outerImage);delete(options.outerImage);}
+Selection.refresh();}
+if(Touch.support)$trk.bind('touchstart.jcrop',Touch.newSelection);$hdl_holder.hide();interfaceUpdate(true);var api={setImage:setImage,animateTo:animateTo,setSelect:setSelect,setOptions:setOptionsNew,tellSelect:tellSelect,tellScaled:tellScaled,setClass:setClass,disable:disableCrop,enable:enableCrop,cancel:cancelCrop,release:Selection.release,destroy:destroy,focus:KeyManager.watchKeys,getBounds:function(){return[boundx*xscale,boundy*yscale];},getWidgetSize:function(){return[boundx,boundy];},getScaleFactor:function(){return[xscale,yscale];},ui:{holder:$div,selection:$sel}};if($.browser.msie){$div.bind('selectstart',function(){return false;});}
+$origimg.data('Jcrop',api);return api;};$.fn.Jcrop=function(options,callback)
+{var api;this.each(function(){if($(this).data('Jcrop')){if(options==='api')return $(this).data('Jcrop');else $(this).data('Jcrop').setOptions(options);}
+else{if(this.tagName=='IMG')
+$.Jcrop.Loader(this,function(){$(this).css({display:'block',visibility:'hidden'});api=$.Jcrop(this,options);if($.isFunction(callback))callback.call(api);});else{$(this).css({display:'block',visibility:'hidden'});api=$.Jcrop(this,options);if($.isFunction(callback))callback.call(api);}}});return this;};$.Jcrop.Loader=function(imgobj,success,error){var $img=$(imgobj),img=$img[0];function completeCheck(){if(img.complete){$img.unbind('.jcloader');if($.isFunction(success))success.call(img);}
+else window.setTimeout(completeCheck,50);}
+$img.bind('load.jcloader',completeCheck).bind('error.jcloader',function(e){$img.unbind('.jcloader');if($.isFunction(error))error.call(img);});if(img.complete&&$.isFunction(success)){$img.unbind('.jcloader');success.call(img);}};$.Jcrop.defaults={allowSelect:true,allowMove:true,allowResize:true,trackDocument:true,baseClass:'jcrop',addClass:null,bgColor:'black',bgOpacity:0.6,bgFade:false,borderOpacity:0.4,handleOpacity:0.5,handleSize:7,handleOffset:5,aspectRatio:0,keySupport:true,cornerHandles:true,sideHandles:true,drawBorders:true,dragEdges:true,fixedSupport:true,touchSupport:null,shade:null,boxWidth:0,boxHeight:0,boundary:2,fadeTime:400,animationDelay:20,swingSpeed:3,minSelect:[0,0],maxSize:[0,0],minSize:[0,0],onChange:function(){},onSelect:function(){},onDblClick:function(){},onRelease:function(){}};}(jQuery));
\ No newline at end of file
diff --git a/apps/contacts/js/jquery.jec-1.3.3.js b/apps/contacts/js/jquery.jec-1.3.3.js
new file mode 100644
index 00000000000..a0367dac2ae
--- /dev/null
+++ b/apps/contacts/js/jquery.jec-1.3.3.js
@@ -0,0 +1,863 @@
+/**
+ * jQuery jEC (jQuery Editable Combobox) 1.3.3
+ * http://code.google.com/p/jquery-jec
+ *
+ * Copyright (c) 2008-2009 Lukasz Rajchel (lukasz@rajchel.pl | http://rajchel.pl)
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ *
+ * Documentation :  http://code.google.com/p/jquery-jec/wiki/Documentation
+ * Changelog     :  http://code.google.com/p/jquery-jec/wiki/Changelog
+ *
+ * Contributors  :  Lukasz Rajchel, Artem Orlov
+ */
+
+/*jslint maxerr: 50, indent: 4, maxlen: 120*/
+/*global Array, Math, String, clearInterval, document, jQuery, setInterval*/
+/*members ':', Handle, Remove, Set, acceptedKeys, addClass, all, append, appendTo, array, attr, before, bind,
+blinkingCursor, blinkingCursorInterval, blur, bool, browser, ceil, change, charCode, classes, clearCursor, click, css,
+cursorState, data, destroy, disable, each, editable, enable, eq, expr, extend, filter, find, floor, fn, focus,
+focusOnNewOption, fromCharCode, get, getId, handleCursor, ignoredKeys, ignoreOptGroups, inArray, init, initJS, integer,
+isArray, isPlainObject, jEC, jECTimer, jec, jecKill, jecOff, jecOn, jecPref, jecValue, keyCode, keyDown, keyPress,
+keyRange, keyUp, keys, length, max, maxLength, min, msie, object, openedState, optionClasses, optionStyles, parent,
+position, pref, prop, push, random, remove, removeAttr, removeClass, removeData, removeProp, safari, setEditableOption,
+styles, substring, text, trigger, triggerChangeEvent, unbind, uneditable, useExistingOptions, val, value,
+valueIsEditable, which*/
+(function ($) {
+    'use strict';
+
+    $.jEC = (function () {
+        var pluginClass = 'jecEditableOption', cursorClass = 'hasCursor', options = {}, values = {}, lastKeyCode,
+            defaults, Validators, EventHandlers, Combobox, activeCombobox;
+
+        if ($.fn.prop === undefined) {
+            $.fn.extend({
+                'prop': function (key, valueSet) {
+                    if (valueSet) {
+                        $(this).attr(key, key);
+                    } else {
+                        $(this).removeAttr(key);
+                    }
+                },
+                'removeProp': function (key) {
+                    $(this).removeAttr(key);
+                }
+            });
+        }
+
+        defaults = {
+            position: 0,
+            ignoreOptGroups: false,
+            maxLength: 255,
+            classes: [],
+            styles: {},
+            optionClasses: [],
+            optionStyles: {},
+            triggerChangeEvent: false,
+            focusOnNewOption: false,
+            useExistingOptions: false,
+            blinkingCursor: false,
+            blinkingCursorInterval: 1000,
+            ignoredKeys: [],
+            acceptedKeys: [[32, 126], [191, 382]]
+        };
+
+        Validators = (function () {
+            return {
+                integer: function (value) {
+                    return typeof value === 'number' && Math.ceil(value) === Math.floor(value);
+                },
+
+                keyRange: function (value) {
+                    var min, max;
+                    if ($.isPlainObject(value)) {
+                        min = value.min;
+                        max = value.max;
+                    } else if ($.isArray(value) && value.length === 2) {
+                        min = value[0];
+                        max = value[1];
+                    }
+                    return Validators.integer(min) && Validators.integer(max) && min <= max;
+                }
+            };
+        }());
+
+        EventHandlers = (function () {
+            var getKeyCode;
+
+            getKeyCode = function (event) {
+                var charCode = event.charCode;
+                if (charCode !== undefined && charCode !== 0) {
+                    return charCode;
+                } else {
+                    return event.keyCode;
+                }
+            };
+
+            return {
+                // focus event handler
+                // enables blinking cursor
+                focus: function () {
+                    var opt = options[Combobox.getId($(this))];
+                    if (opt.blinkingCursor && $.jECTimer === undefined) {
+                        activeCombobox = $(this);
+                        $.jECTimer = setInterval($.jEC.handleCursor, opt.blinkingCursorInterval);
+                    }
+                },
+
+                // blur event handler
+                // disables blinking cursor
+                blur: function () {
+                    if ($.jECTimer !== undefined) {
+                        clearInterval($.jECTimer);
+                        $.jECTimer = undefined;
+                        activeCombobox = undefined;
+                        Combobox.clearCursor($(this));
+                    }
+                    Combobox.openedState($(this), false);
+                },
+
+                // keydown event handler
+                // handles keys pressed on select (backspace and delete must be handled
+                // in keydown event in order to work in IE)
+                keyDown: function (event) {
+					var keyCode = getKeyCode(event), option, value;
+
+                    lastKeyCode = keyCode;
+
+                    switch (keyCode) {
+                    case 8:  // backspace
+                    case 46: // delete
+                        option = $(this).find('option.' + pluginClass);
+                        if (option.val().length >= 1) {
+                            value = option.text().substring(0, option.text().length - 1);
+                            option.val(value).text(value).prop('selected', true);
+                        }
+                        return (keyCode !== 8);
+                    default:
+                        break;
+                    }
+                },
+
+                // keypress event handler
+                // handles the rest of the keys (keypress event gives more informations
+                // about pressed keys)
+                keyPress: function (event) {
+                    var keyCode = getKeyCode(event), opt = options[Combobox.getId($(this))],
+                        option, value, specialKeys, exit = false, text;
+
+                    Combobox.clearCursor($(this));
+                    if (keyCode !== 9 && keyCode !== 13 && keyCode !== 27) {
+                        // special keys codes
+                        specialKeys = [37, 38, 39, 40, 46];
+                        // handle special keys
+                        $.each(specialKeys, function (i, val) {
+							if (keyCode === val && keyCode === lastKeyCode) {
+                                exit = true;
+                            }
+                        });
+
+                        // don't handle ignored keys
+                        if (!exit && $.inArray(keyCode, opt.ignoredKeys) === -1) {
+                            // remove selection from all options
+                            $(this).find('option:selected').removeProp('selected');
+
+                            if ($.inArray(keyCode, opt.acceptedKeys) !== -1) {
+                                option = $(this).find('option.' + pluginClass);
+                                text = option.text();
+
+                                if (text.length < opt.maxLength) {
+                                    value = text + String.fromCharCode(getKeyCode(event));
+                                    option.val(value).text(value);
+                                }
+
+                                option.prop('selected', true);
+                            }
+                        }
+
+                        return false;
+                    }
+                },
+
+                keyUp: function () {
+					var opt = options[Combobox.getId($(this))];
+                    if (opt.triggerChangeEvent) {
+                        $(this).trigger('change');
+                    }
+                },
+
+                // change event handler
+                // handles editable option changing based on a pre-existing values
+                change: function () {
+                    var opt = options[Combobox.getId($(this))];
+                    if (opt.useExistingOptions) {
+                        Combobox.setEditableOption($(this));
+                    }
+                },
+
+                click: function () {
+                    if (!$.browser.safari) {
+                        Combobox.openedState($(this), !Combobox.openedState($(this)));
+                    }
+                }
+            };
+        }());
+
+        // Combobox
+        Combobox = (function () {
+            var Parameters, EditableOption, generateId, setup;
+
+            // validates and set combobox parameters
+            Parameters = (function () {
+                var Set, Remove, Handle;
+
+                Set = (function () {
+                    var parseKeys, Handles;
+
+                    parseKeys = function (value) {
+                        var keys = [];
+                        if ($.isArray(value)) {
+                            $.each(value, function (i, val) {
+                                var j, min, max;
+                                if (Validators.keyRange(val)) {
+                                    if ($.isArray(val)) {
+                                        min = val[0];
+                                        max = val[1];
+                                    } else {
+                                        min = val.min;
+                                        max = val.max;
+                                    }
+                                    for (j = min; j <= max; j += 1) {
+                                        keys.push(j);
+                                    }
+                                } else if (typeof val === 'number' && Validators.integer(val)) {
+                                    keys.push(val);
+                                }
+                            });
+                        }
+                        return keys;
+                    };
+
+                    Handles = (function () {
+                        return {
+                            integer: function (elem, name, value) {
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (opt !== undefined && Validators.integer(value)) {
+                                    opt[name] = value;
+                                    return true;
+                                }
+                                return false;
+                            },
+                            bool: function (elem, name, value) {
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (opt !== undefined && typeof value === 'boolean') {
+                                    opt[name] = value;
+                                    return true;
+                                }
+                                return false;
+                            },
+                            array: function (elem, name, value) {
+                                if (typeof value === 'string') {
+                                    value = [value];
+                                }
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (opt !== undefined && $.isArray(value)) {
+                                    opt[name] = value;
+                                    return true;
+                                }
+                                return false;
+                            },
+                            object: function (elem, name, value) {
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (opt !== undefined && value !== null && $.isPlainObject(value)) {
+                                    opt[name] = value;
+                                }
+                            },
+                            keys: function (elem, name, value) {
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (opt !== undefined && $.isArray(value)) {
+                                    opt[name] = parseKeys(value);
+                                }
+                            }
+                        };
+                    }());
+
+                    return {
+                        position: function (elem, value) {
+                            if (Handles.integer(elem, 'position', value)) {
+                                var id = Combobox.getId(elem), opt = options[id], optionsCount;
+                                optionsCount =
+                                    elem.find('option:not(.' + pluginClass + ')').length;
+                                if (value > optionsCount) {
+                                    opt.position = optionsCount;
+                                }
+                            }
+                        },
+
+                        ignoreOptGroups: function (elem, value) {
+                            Handles.bool(elem, 'ignoreOptGroups', value);
+                        },
+
+                        maxLength: function (elem, value) {
+                            if (Handles.integer(elem, 'maxLength', value)) {
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (value < 0 || value > 255) {
+                                    opt.maxLength = 255;
+                                }
+                            }
+                        },
+
+                        classes: function (elem, value) {
+                            Handles.array(elem, 'classes', value);
+                        },
+
+                        optionClasses: function (elem, value) {
+                            Handles.array(elem, 'optionClasses', value);
+                        },
+
+                        styles: function (elem, value) {
+                            Handles.object(elem, 'styles', value);
+                        },
+
+                        optionStyles: function (elem, value) {
+                            Handles.object(elem, 'optionStyles', value);
+                        },
+
+                        triggerChangeEvent: function (elem, value) {
+                            Handles.bool(elem, 'triggerChangeEvent', value);
+                        },
+
+                        focusOnNewOption: function (elem, value) {
+                            Handles.bool(elem, 'focusOnNewOption', value);
+                        },
+
+                        useExistingOptions: function (elem, value) {
+                            Handles.bool(elem, 'useExistingOptions', value);
+                        },
+
+                        blinkingCursor: function (elem, value) {
+                            Handles.bool(elem, 'blinkingCursor', value);
+                        },
+
+                        blinkingCursorInterval: function (elem, value) {
+                            Handles.integer(elem, 'blinkingCursorInterval', value);
+                        },
+
+                        ignoredKeys: function (elem, value) {
+                            Handles.keys(elem, 'ignoredKeys', value);
+                        },
+
+                        acceptedKeys: function (elem, value) {
+                            Handles.keys(elem, 'acceptedKeys', value);
+                        }
+                    };
+                }());
+
+                Remove = (function () {
+                    var removeClasses, removeStyles;
+
+                    removeClasses = function (elem, classes) {
+                        $.each(classes, function (i, val) {
+							elem.removeClass(val);
+                        });
+                    };
+
+                    removeStyles = function (elem, styles) {
+                        $.each(styles, function (key) {
+                            elem.css(key, '');
+                        });
+                    };
+
+                    return {
+                        classes: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                removeClasses(elem, opt.classes);
+                            }
+                        },
+
+                        optionClasses: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                removeClasses(elem.find('option.' + pluginClass),
+                                    opt.optionClasses);
+                            }
+                        },
+
+                        styles: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                removeStyles(elem, opt.styles);
+                            }
+                        },
+
+                        optionStyles: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                removeStyles(elem.find('option.' + pluginClass),
+                                    opt.optionStyles);
+                            }
+                        },
+
+                        all: function (elem) {
+                            Remove.classes(elem);
+                            Remove.optionClasses(elem);
+                            Remove.styles(elem);
+                            Remove.optionStyles(elem);
+                        }
+                    };
+                }());
+
+                Handle = (function () {
+                    var setClasses, setStyles;
+
+                    setClasses = function (elem, classes) {
+                        $.each(classes, function (i, val) {
+                            elem.addClass(String(val));
+                        });
+                    };
+
+                    setStyles = function (elem, styles) {
+                        $.each(styles, function (key, val) {
+                            elem.css(key, val);
+                        });
+                    };
+
+                    return {
+                        position: function (elem) {
+                            var opt = options[Combobox.getId(elem)], option, uneditableOptions, container;
+                            option = elem.find('option.' + pluginClass);
+
+                            uneditableOptions = elem.find('option:not(.' + pluginClass + ')');
+                            if (opt.position < uneditableOptions.length) {
+                                container = uneditableOptions.eq(opt.position);
+
+                                if (!opt.ignoreOptGroups && container.parent('optgroup').length > 0) {
+                                    uneditableOptions.eq(opt.position).parent().before(option);
+                                } else {
+                                    uneditableOptions.eq(opt.position).before(option);
+                                }
+                            } else {
+                                elem.append(option);
+                            }
+                        },
+
+                        classes: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                setClasses(elem, opt.classes);
+                            }
+                        },
+
+                        optionClasses: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                setClasses(elem.find('option.' + pluginClass), opt.optionClasses);
+                            }
+                        },
+
+                        styles: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                setStyles(elem, opt.styles);
+                            }
+                        },
+
+                        optionStyles: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                setStyles(elem.find('option.' + pluginClass), opt.optionStyles);
+                            }
+                        },
+
+                        focusOnNewOption: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined && opt.focusOnNewOption) {
+                                elem.find(':not(option.' + pluginClass + ')').removeProp('selected');
+                                elem.find('option.' + pluginClass).prop('selected', true);
+                            }
+                        },
+
+                        useExistingOptions: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined && opt.useExistingOptions) {
+                                Combobox.setEditableOption(elem);
+                            }
+                        },
+
+                        all: function (elem) {
+                            Handle.position(elem);
+                            Handle.classes(elem);
+                            Handle.optionClasses(elem);
+                            Handle.styles(elem);
+                            Handle.optionStyles(elem);
+                            Handle.focusOnNewOption(elem);
+                            Handle.useExistingOptions(elem);
+                        }
+                    };
+                }());
+
+                return {
+                    Set: Set,
+                    Remove: Remove,
+                    Handle: Handle
+                };
+            }());
+
+            EditableOption = (function () {
+                return {
+                    init: function (elem) {
+                        if (!elem.find('option.' + pluginClass).length) {
+                            var editableOption = $('<option>');
+                            editableOption.addClass(pluginClass);
+                            elem.append(editableOption);
+                        }
+
+                        elem.bind('keydown', EventHandlers.keyDown);
+                        elem.bind('keypress', EventHandlers.keyPress);
+                        elem.bind('keyup', EventHandlers.keyUp);
+                        elem.bind('change', EventHandlers.change);
+                        elem.bind('focus', EventHandlers.focus);
+                        elem.bind('blur', EventHandlers.blur);
+                        elem.bind('click', EventHandlers.click);
+                    },
+
+                    destroy: function (elem) {
+                        elem.find('option.' + pluginClass).remove();
+
+                        elem.unbind('keydown', EventHandlers.keyDown);
+                        elem.unbind('keypress', EventHandlers.keyPress);
+                        elem.unbind('keyup', EventHandlers.keyUp);
+                        elem.unbind('change', EventHandlers.change);
+                        elem.unbind('focus', EventHandlers.focus);
+                        elem.unbind('blur', EventHandlers.blur);
+                        elem.unbind('click', EventHandlers.click);
+                    }
+                };
+            }());
+
+            // generates unique identifier
+            generateId = function () {
+                while (true) {
+                    var random = Math.floor(Math.random() * 100000);
+
+                    if (options[random] === undefined) {
+                        return random;
+                    }
+                }
+            };
+
+            // sets combobox
+            setup = function (elem) {
+                EditableOption.init(elem);
+                Parameters.Handle.all(elem);
+            };
+
+            // Combobox public members
+            return {
+                // create editable combobox
+                init: function (settings) {
+                    return $(this).filter(':uneditable').each(function () {
+                        var id = generateId(), elem = $(this);
+
+                        elem.data('jecId', id);
+
+                        // override passed default options
+                        options[id] = $.extend(true, {}, defaults);
+
+                        // parse keys
+                        Parameters.Set.ignoredKeys(elem, options[id].ignoredKeys);
+                        Parameters.Set.acceptedKeys(elem, options[id].acceptedKeys);
+
+                        if ($.isPlainObject(settings)) {
+                            $.each(settings, function (key, val) {
+                                if (val !== undefined) {
+                                    switch (key) {
+                                    case 'position':
+                                        Parameters.Set.position(elem, val);
+                                        break;
+                                    case 'ignoreOptGroups':
+                                        Parameters.Set.ignoreOptGroups(elem, val);
+                                        break;
+                                    case 'maxLength':
+                                        Parameters.Set.maxLength(elem, val);
+                                        break;
+                                    case 'classes':
+                                        Parameters.Set.classes(elem, val);
+                                        break;
+                                    case 'optionClasses':
+                                        Parameters.Set.optionClasses(elem, val);
+                                        break;
+                                    case 'styles':
+                                        Parameters.Set.styles(elem, val);
+                                        break;
+                                    case 'optionStyles':
+                                        Parameters.Set.optionStyles(elem, val);
+                                        break;
+                                    case 'triggerChangeEvent':
+                                        Parameters.Set.triggerChangeEvent(elem, val);
+                                        break;
+                                    case 'focusOnNewOption':
+                                        Parameters.Set.focusOnNewOption(elem, val);
+                                        break;
+                                    case 'useExistingOptions':
+                                        Parameters.Set.useExistingOptions(elem, val);
+                                        break;
+                                    case 'blinkingCursor':
+                                        Parameters.Set.blinkingCursor(elem, val);
+                                        break;
+                                    case 'blinkingCursorInterval':
+                                        Parameters.Set.blinkingCursorInterval(elem, val);
+                                        break;
+                                    case 'ignoredKeys':
+                                        Parameters.Set.ignoredKeys(elem, val);
+                                        break;
+                                    case 'acceptedKeys':
+                                        Parameters.Set.acceptedKeys(elem, val);
+                                        break;
+                                    }
+                                }
+                            });
+                        }
+
+                        setup($(this));
+                    });
+                },
+
+                // creates editable combobox without using existing select elements
+                initJS: function (options, settings) {
+                    var select, addOptions;
+
+                    select = $('<select>');
+
+                    addOptions = function (elem, options) {
+                        if ($.isArray(options)) {
+                            $.each(options, function (i, val) {
+                                if ($.isPlainObject(val)) {
+                                    $.each(val, function (key, value) {
+                                        if ($.isArray(value)) {
+                                            var og = $('<optgroup>').attr('label', key);
+                                            addOptions(og, value);
+                                            og.appendTo(select);
+                                        } else if (typeof value === 'number' || typeof value === 'string') {
+                                            $('<option>').text(value).attr('value', key)
+                                                .appendTo(elem);
+                                        }
+                                    });
+                                } else if (typeof val === 'string' || typeof val === 'number') {
+                                    $('<option>').text(val).attr('value', val).appendTo(elem);
+                                }
+                            });
+                        }
+                    };
+
+                    addOptions(select, options);
+
+                    return select.jec(settings);
+                },
+
+                // destroys editable combobox
+                destroy: function () {
+                    return $(this).filter(':editable').each(function () {
+                        $(this).jecOff();
+                        $.removeData($(this).get(0), 'jecId');
+                        $.removeData($(this).get(0), 'jecCursorState');
+                        $.removeData($(this).get(0), 'jecOpenedState');
+                    });
+                },
+
+                // enable editablecombobox
+                enable: function () {
+                    return $(this).filter(':editable').each(function () {
+                        var id = Combobox.getId($(this)), value = values[id];
+
+                        setup($(this));
+
+                        if (value !== undefined) {
+                            $(this).jecValue(value);
+                        }
+                    });
+                },
+
+                // disable editable combobox
+                disable: function () {
+                    return $(this).filter(':editable').each(function () {
+                        var val = $(this).find('option.' + pluginClass).val();
+                        values[Combobox.getId($(this))] = val;
+                        Parameters.Remove.all($(this));
+                        EditableOption.destroy($(this));
+                    });
+                },
+
+                // gets or sets editable option's value
+                value: function (value, setFocus) {
+                    if ($(this).filter(':editable').length > 0) {
+                        if (value === null || value === undefined) {
+                            // get value
+                            return $(this).find('option.' + pluginClass).val();
+                        } else if (typeof value === 'string' || typeof value === 'number') {
+                            // set value
+                            return $(this).filter(':editable').each(function () {
+                                var option = $(this).find('option.' + pluginClass);
+                                option.val(value).text(value);
+                                if (typeof setFocus !== 'boolean' || setFocus) {
+                                    option.prop('selected', true);
+                                }
+                            });
+                        }
+                    }
+                },
+
+                // gets or sets editable option's preference
+                pref: function (name, value) {
+                    if ($(this).filter(':editable').length > 0) {
+                        if (typeof name === 'string') {
+                            if (value === null || value === undefined) {
+                                // get preference
+                                return options[Combobox.getId($(this))][name];
+                            } else {
+                                // set preference
+                                return $(this).filter(':editable').each(function () {
+                                    switch (name) {
+                                    case 'position':
+                                        Parameters.Set.position($(this), value);
+                                        Parameters.Handle.position($(this));
+                                        break;
+                                    case 'classes':
+                                        Parameters.Remove.classes($(this));
+                                        Parameters.Set.classes($(this), value);
+                                        Parameters.Handle.position($(this));
+                                        break;
+                                    case 'optionClasses':
+                                        Parameters.Remove.optionClasses($(this));
+                                        Parameters.Set.optionClasses($(this), value);
+                                        Parameters.Set.optionClasses($(this));
+                                        break;
+                                    case 'styles':
+                                        Parameters.Remove.styles($(this));
+                                        Parameters.Set.styles($(this), value);
+                                        Parameters.Set.styles($(this));
+                                        break;
+                                    case 'optionStyles':
+                                        Parameters.Remove.optionStyles($(this));
+                                        Parameters.Set.optionStyles($(this), value);
+                                        Parameters.Handle.optionStyles($(this));
+                                        break;
+                                    case 'focusOnNewOption':
+                                        Parameters.Set.focusOnNewOption($(this), value);
+                                        Parameters.Handle.focusOnNewOption($(this));
+                                        break;
+                                    case 'useExistingOptions':
+                                        Parameters.Set.useExistingOptions($(this), value);
+                                        Parameters.Handle.useExistingOptions($(this));
+                                        break;
+                                    case 'blinkingCursor':
+                                        Parameters.Set.blinkingCursor($(this), value);
+                                        break;
+                                    case 'blinkingCursorInterval':
+                                        Parameters.Set.blinkingCursorInterval($(this), value);
+                                        break;
+                                    case 'ignoredKeys':
+                                        Parameters.Set.ignoredKeys($(this), value);
+                                        break;
+                                    case 'acceptedKeys':
+                                        Parameters.Set.acceptedKeys($(this), value);
+                                        break;
+                                    }
+                                });
+                            }
+                        }
+                    }
+                },
+
+                // sets editable option to the value of currently selected option
+                setEditableOption: function (elem) {
+                    var value = elem.find('option:selected').text();
+                    elem.find('option.' + pluginClass).attr('value', elem.val()).text(value).prop('selected', true);
+                },
+
+                // get combobox id
+                getId: function (elem) {
+                    return elem.data('jecId');
+                },
+
+                valueIsEditable: function (elem) {
+                    return elem.find('option.' + pluginClass).get(0) === elem.find('option:selected').get(0);
+                },
+
+                clearCursor: function (elem) {
+                    $(elem).find('option.' + cursorClass).each(function () {
+                        var text = $(this).text();
+                        $(this).removeClass(cursorClass).text(text.substring(0, text.length - 1));
+                    });
+                },
+
+                cursorState: function (elem, state) {
+                    return elem.data('jecCursorState', state);
+                },
+
+                openedState: function (elem, state) {
+                    return elem.data('jecOpenedState', state);
+                },
+
+                //handles editable cursor
+                handleCursor: function () {
+                    if (activeCombobox !== undefined && activeCombobox !== null) {
+                        if ($.browser.msie && Combobox.openedState(activeCombobox)) {
+                            return;
+                        }
+
+                        var state = Combobox.cursorState(activeCombobox), elem;
+                        if (state) {
+                            Combobox.clearCursor(activeCombobox);
+                        } else if (Combobox.valueIsEditable(activeCombobox)) {
+                            elem = activeCombobox.find('option:selected');
+                            elem.addClass(cursorClass).text(elem.text() + '|');
+                        }
+                        Combobox.cursorState(activeCombobox, !state);
+                    }
+                }
+            };
+        }());
+
+        // jEC public members
+        return {
+            init: Combobox.init,
+            enable: Combobox.enable,
+            disable: Combobox.disable,
+            destroy: Combobox.destroy,
+            value: Combobox.value,
+            pref: Combobox.pref,
+            initJS: Combobox.initJS,
+            handleCursor: Combobox.handleCursor
+        };
+    }());
+
+    // register functions
+    $.fn.extend({
+        jec: $.jEC.init,
+        jecOn: $.jEC.enable,
+        jecOff: $.jEC.disable,
+        jecKill: $.jEC.destroy,
+        jecValue: $.jEC.value,
+        jecPref: $.jEC.pref
+    });
+
+    $.extend({
+        jec: $.jEC.initJS
+    });
+
+    // register selectors
+    $.extend($.expr[':'], {
+        editable: function (a) {
+            var data = $(a).data('jecId');
+            return data !== null && data !== undefined;
+        },
+
+        uneditable: function (a) {
+            var data = $(a).data('jecId');
+            return data === null || data === undefined;
+        }
+    });
+
+}(jQuery));
\ No newline at end of file
diff --git a/apps/contacts/templates/index2.php b/apps/contacts/templates/index2.php
new file mode 100644
index 00000000000..4c0dfad6177
--- /dev/null
+++ b/apps/contacts/templates/index2.php
@@ -0,0 +1,27 @@
+<script type='text/javascript'>
+	var totalurl = '<?php echo OC_Helper::linkTo('contacts', 'carddav.php', null, true); ?>/addressbooks';
+</script>
+<div id="controls">
+	<form>
+		<input type="button" id="contacts_newcontact" value="<?php echo $l->t('Add Contact'); ?>">
+		<input type="button" id="chooseaddressbook" value="<?php echo $l->t('Addressbooks'); ?>">
+	</form>
+</div>
+<div id="leftcontent" class="leftcontent">
+	<ul id="contacts">
+		<?php echo $this->inc("part.contacts"); ?>
+	</ul>
+</div>
+<div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>">
+	<?php
+		if ($_['id']){
+			echo $this->inc('part.contact');
+		}
+		else{
+			echo $this->inc('part.no_contacts');
+		}
+	?>
+</div>
+<!-- Dialogs -->
+<div id="dialog_holder"></div>
+<!-- End of Dialogs -->
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
new file mode 100644
index 00000000000..0e3611b2e4c
--- /dev/null
+++ b/apps/contacts/templates/part.contact.php
@@ -0,0 +1,210 @@
+<?php
+$l=new OC_L10N('contacts');
+$id = isset($_['id']) ? $_['id'] : '';
+$card = array();
+$card['id'] = $id;
+$card['FN'] = (array_key_exists('FN',$_['details'])) ? $_['details']['FN'][0] : null;
+$card['N'] = (array_key_exists('N',$_['details'])) ? $_['details']['N'][0] : array('', '', '', '', '');
+$card['ORG'] = (array_key_exists('ORG',$_['details'])) ? $_['details']['ORG'][0] : null;
+$card['PHOTO'] = (array_key_exists('PHOTO',$_['details'])) ? $_['details']['PHOTO'][0] : null;
+$card['BDAY'] = (array_key_exists('BDAY',$_['details'])) ? $_['details']['BDAY'][0] : null;
+if($card['BDAY']) {
+	$bday = new DateTime($card['BDAY']['value']);
+	$card['BDAY']['value'] = $bday->format('d-m-Y');
+}
+$card['NICKNAME'] = (array_key_exists('NICKNAME',$_['details'])) ? $_['details']['NICKNAME'][0] : null;
+$card['EMAIL'] = (array_key_exists('EMAIL',$_['details'])) ? $_['details']['EMAIL'] : array();
+$card['TEL'] = (array_key_exists('TEL',$_['details'])) ? $_['details']['TEL'] : array();
+$card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] : array();
+?>
+<div id="card">
+	<div id="actionbar">
+	<a id="contacts_propertymenu_button"></a>
+	<ul id="contacts_propertymenu">
+		<li <?php echo (!is_null($card['PHOTO'])?'style="display:none;"':''); ?>>
+			<a data-type="PHOTO"><?php echo $l->t('Profile picture'); ?></a>
+		</li>
+		<li <?php echo (!is_null($card['ORG'])?'style="display:none;"':''); ?>>
+			<a data-type="ORG"><?php echo $l->t('Organization'); ?></a>
+		</li>
+		<li <?php echo (!is_null($card['NICKNAME'])?'style="display:none;"':''); ?>>
+			<a data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a>
+		</li>
+		<li <?php echo (!is_null($card['BDAY'])?'style="display:none;"':''); ?>>
+			<a data-type="BDAY"><?php echo $l->t('Birthday'); ?></a>
+		</li>
+		<li><a data-type="TEL"><?php echo $l->t('Phone'); ?></a></li>
+		<li><a data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
+		<li><a data-type="ADR"><?php echo $l->t('Address'); ?></a></li>
+	</ul>
+	<img  onclick="Contacts.UI.Card.export();" class="svg action" id="contacts_downloadcard" src="<?php echo image_path('', 'actions/download.svg'); ?>" title="<?php echo $l->t('Download contact');?>" />
+	<img class="svg action" id="contacts_deletecard" src="<?php echo image_path('', 'actions/delete.svg'); ?>" title="<?php echo $l->t('Delete contact');?>" />
+	</div>
+
+	<div class="contactsection">
+
+	<form <?php echo (is_null($card['PHOTO'])?'style="display:none;"':''); ?> id="file_upload_form" action="ajax/uploadphoto.php" method="post" enctype="multipart/form-data" target="file_upload_target">
+	<fieldset id="photo" class="formfloat">
+		<div id="contacts_details_photo_wrapper" title="<?php echo $l->t('Click or drop to upload picture'); ?> (max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
+		<!-- img style="padding: 1em;" id="contacts_details_photo" alt="Profile picture"  src="photo.php?id=<?php echo $_['id']; ?>" / -->
+		<progress id="contacts_details_photo_progress" style="display:none;" value="0" max="100">0 %</progress>
+		</div>
+		<input type="hidden" name="id" value="<?php echo $_['id'] ?>">
+		<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
+		<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
+		<input id="file_upload_start" type="file" accept="image/*" name="imagefile" />
+		<iframe name="file_upload_target" id='file_upload_target' src=""></iframe>
+	</fieldset>
+	</form>
+	<form id="contact_identity" method="post" <?php echo ($_['id']==''||!isset($_['id'])?'style="display:none;"':''); ?>>
+	<input type="hidden" name="id" value="<?php echo $_['id'] ?>">
+	<fieldset class="propertycontainer" data-element="N"><input type="hidden" id="n" class="contacts_property" name="value" value="" /></fieldset>
+	<fieldset id="ident" class="formfloat">
+	<!-- legend>Name</legend -->
+	<dl class="form">
+		<!-- dt><label for="n"><?php echo $l->t('Name'); ?></label></dt>
+		<dd style="padding-top: 0.8em;vertical-align: text-bottom;"><span id="n" type="text"></span></dd -->
+		<dt><label for="fn"><?php echo $l->t('Display name'); ?></label></dt>
+		<dd class="propertycontainer" data-element="FN">
+		<select id="fn" name="value" required="required" class="contacts_property" title="<?php echo $l->t('Format custom, Short name, Full name, Reverse or Reverse with comma'); ?>" style="width:16em;">
+			<option id="short" title="Short name"></option>
+			<option id="full" title="Full name"></option>
+			<option id="reverse" title="Reverse"></option>
+			<option id="reverse_comma" title="Reverse with comma"></option>
+		</select><a id="edit_name" class="edit" title="<?php echo $l->t('Edit name details'); ?>"></a>
+		</dd>
+		<dt style="display:none;" id="org_label" data-element="ORG"><label for="org"><?php echo $l->t('Organization'); ?></label></dt>
+		<dd style="display:none;" class="propertycontainer" id="org_value" data-element="ORG"><input id="org"  required="required" name="value[ORG]" type="text" class="contacts_property" style="width:16em;" name="value" value="" placeholder="<?php echo $l->t('Organization'); ?>" /><a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'single');" title="<?php echo $l->t('Delete'); ?>"></a></dd>
+		<dt style="display:none;" id="nickname_label" data-element="NICKNAME"><label for="nickname"><?php echo $l->t('Nickname'); ?></label></dt>
+		<dd style="display:none;" class="propertycontainer" id="nickname_value" data-element="NICKNAME"><input id="nickname" required="required" name="value[NICKNAME]" type="text" class="contacts_property" style="width:16em;" name="value" value="" placeholder="<?php echo $l->t('Enter nickname'); ?>" /><a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'single');" title="<?php echo $l->t('Delete'); ?>"></a></dd>
+		<dt style="display:none;" id="bday_label" data-element="BDAY"><label for="bday"><?php echo $l->t('Birthday'); ?></label></dt>
+		<dd style="display:none;" class="propertycontainer" id="bday_value" data-element="BDAY"><input id="bday"  required="required" name="value" type="text" class="contacts_property" value="" placeholder="<?php echo $l->t('dd-mm-yyyy'); ?>" /><a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'single');" title="<?php echo $l->t('Delete'); ?>"></a></dd>
+	</dl>
+	</fieldset>
+	</form>
+	</div>
+
+	<!-- div class="delimiter"></div -->
+	<form id="contact_communication" method="post">
+	<div class="contactsection">
+		<!-- email addresses -->
+		<div id="emails" <?php echo (count($card['EMAIL'])>0?'':'style="display:none;"'); ?>>
+		<fieldset class="contactpart">
+		<legend><?php echo $l->t('Email'); ?></legend>
+			<ul id="emaillist" class="propertylist">
+			<li class="template" style="white-space: nowrap; display: none;" data-element="EMAIL">
+				<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
+				<input type="email" required="required" class="nonempty contacts_property" style="width:15em;" name="value" value="" x-moz-errormessage="<?php echo $l->t('Please specify a valid email address.'); ?>" placeholder="<?php echo $l->t('Enter email address'); ?>" /><span class="listactions"><a onclick="Contacts.UI.mailTo(this)" class="mail" title="<?php echo $l->t('Mail to address'); ?>"></a>
+				<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete email address'); ?>"></a></span></li>
+			<?php
+			if(0) { /*foreach($card['EMAIL'] as $email) {*/
+			?>
+			<li class="propertycontainer" style="white-space: nowrap;" data-checksum="<?php echo $email['checksum'] ?>" data-element="EMAIL">
+				<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" <?php echo (isset($email['parameters']['PREF'])?'checked="checked"':''); ?> />
+				<input type="email" required="required" class="nonempty contacts_property" style="width:15em;" name="value" value="<?php echo $email['value'] ?>" placeholder="<?php echo $l->t('Enter email address'); ?>" /><span class="listactions"><a onclick="Contacts.UI.mailTo(this)" class="mail" title="<?php echo $l->t('Mail to address'); ?>"></a>
+				<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete email address'); ?>"></a></span></li>
+			<?php } ?>
+			</ul><!-- a id="add_email" class="add" title="<?php echo $l->t('Add email address'); ?>"></a -->
+		</div> <!-- email addresses-->
+
+		<!-- Phone numbers -->
+		<div id="phones" <?php echo (count($card['TEL'])>0?'':'style="display:none;"'); ?>>
+		<fieldset class="contactpart">
+		<legend><?php echo $l->t('Phone'); ?></legend>
+			<ul id="phonelist" class="propertylist">
+				<li class="template" style="white-space: nowrap; display: none;" data-element="TEL">
+				<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" /> 
+				<input type="text" required="required" class="nonempty contacts_property" style="width:10em; border: 0px;" name="value" value="" placeholder="<?php echo $l->t('Enter phone number'); ?>" />
+				<select multiple="multiple" name="parameters[TYPE][]">
+					<?php echo html_select_options($_['phone_types'], array()) ?>
+				</select>
+				<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete phone number'); ?>"></a></li>
+			<?php
+			if(0) { /*foreach($card['TEL'] as $phone) {*/
+			?>
+				<li class="propertycontainer" style="white-space: nowrap;" data-checksum="<?php echo $phone['checksum'] ?>" data-element="TEL">
+				<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" <?php echo (isset($phone['parameters']['PREF'])?'checked="checked"':''); ?> /> 
+				<input type="text" required="required" class="nonempty contacts_property" style="width:8em; border: 0px;" name="value" value="<?php echo $phone['value'] ?>" placeholder="<?php echo $l->t('Enter phone number'); ?>" />
+				<select class="contacts_property" multiple="multiple" name="parameters[TYPE][]">
+					<?php echo html_select_options($_['phone_types'], isset($phone['parameters']['TYPE'])?$phone['parameters']['TYPE']:array()) ?>
+				</select>
+				<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete phone number'); ?>"></a></li>
+			<?php } ?>
+			</ul><!-- a id="add_phone" class="add" title="<?php echo $l->t('Add phone number'); ?>"></a -->
+		</div> <!-- Phone numbers -->
+
+		<!-- Addresses -->
+		<div id="addresses" <?php echo (count($card['ADR'])>0?'':'style="display:none;"'); ?>>
+		<fieldset class="contactpart">
+		<legend><?php echo $l->t('Address'); ?></legend>
+		<div id="addressdisplay">
+			<dl class="addresscard template" style="display: none;" data-element="ADR"><dt>
+			<input class="adr contacts_property" name="value" type="hidden" value="" />
+			<input type="hidden" class="adr_type contacts_property" name="parameters[TYPE][]" value="" />
+			<span class="adr_type_label"></span><a class="globe" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.searchOSM(this);" title="<?php echo $l->t('View on map'); ?>"></a><a class="edit" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.Card.editAddress(this, false);" title="<?php echo $l->t('Edit address details'); ?>"></a><a class="delete" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="Delete address"></a>
+			</dt><dd><ul class="addresslist"></ul></dd></dl>
+
+			<?php if(0) { /*foreach($card['ADR'] as $address) {*/ ?>
+			<dl class="addresscard propertycontainer" data-checksum="<?php echo $address['checksum']; ?>" data-element="ADR">
+			<dt>
+			<input class="adr contacts_property" name="value" type="hidden" value="<?php echo implode(';',$address['value']); ?>" />
+				<input type="hidden" class="adr_type contacts_property" name="parameters[TYPE][]" value="<?php echo strtoupper(implode(',',$address['parameters'])); ?>" />
+				<span class="adr_type_label">
+				<?php 
+				if(count($address['parameters']) > 0) {
+					//array_walk($address['parameters'], ) Nah, this wont work...
+					$translated = array();
+					foreach($address['parameters'] as $type) {
+						$translated[] = $l->t(ucwords(strtolower($type)));
+					}
+					echo implode('/', $translated);
+				}
+				?></span><a class="globe" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.searchOSM(this);" title="<?php echo $l->t('View on map'); ?>"></a><a class="edit" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.Card.editAddress(this, false);" title="<?php echo $l->t('Edit address details'); ?>"></a><a class="delete" style="float:right;"  onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="Delete address"></a>
+			</dt>
+			<dd>
+			<ul class="addresslist">
+				<?php
+				$adr = $address['value'];
+				$tmp = ($adr[0]?'<li>'.$adr[0].'</li>':'');
+				$tmp .= ($adr[1]?'<li>'.$adr[1].'</li>':'');
+				$tmp .= ($adr[2]?'<li>'.$adr[2].'</li>':'');
+				$tmp .= ($adr[3]||$adr[5]?'<li>'.$adr[5].' '.$adr[3].'</li>':'');
+				$tmp .= ($adr[4]?'<li>'.$adr[4].'</li>':'');
+				$tmp .= ($adr[6]?'<li>'.$adr[6].'</li>':'');
+				echo $tmp;
+				
+				?>
+			</ul>
+			</dd>
+			</dl>
+			<?php } ?>
+		</fieldset>
+		</div>
+		</div> <!-- Addresses -->
+	</div>
+	<!-- a id="add_address" onclick="Contacts.UI.Card.editAddress('new', true)" class="add" title="<?php echo $l->t('Add address'); ?>"></a -->
+	</div> 
+	</form>
+</div>
+<div class="delimiter"></div>
+<pre>
+<?php /*print_r($card);*/ ?>
+</pre>
+	<!-- div class="updatebar"><input type="button" value="Update" /></div -->
+<div id="edit_photo_dialog" title="Edit photo">
+		<div id="edit_photo_dialog_img"></div>
+</div>
+<script language="Javascript">
+$(document).ready(function(){
+	if('<?php echo $id; ?>'!='') {
+		$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':'<?php echo $id; ?>'},function(jsondata){
+			if(jsondata.status == 'success'){
+				Contacts.UI.Card.loadContact(jsondata.data);
+			}
+			else{
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+			}
+		});
+	}
+});
+</script>
diff --git a/apps/contacts/templates/part.contactphoto.php b/apps/contacts/templates/part.contactphoto.php
new file mode 100644
index 00000000000..7d7ab237561
--- /dev/null
+++ b/apps/contacts/templates/part.contactphoto.php
@@ -0,0 +1,9 @@
+<?php 
+$id = $_['id'];
+$wattr = isset($_['width'])?'width="'.$_['width'].'"':'';
+$hattr = isset($_['height'])?'height="'.$_['height'].'"':'';
+?>
+<img class="loading" id="contacts_details_photo" <?php echo $wattr; ?> <?php echo $hattr; ?> src="<?php echo OC_Helper::linkTo('contacts', 'photo.php', null, true); ?>?id=<?php echo $id; ?>&amp;refresh=<?php echo rand(); ?>" />
+<progress id="contacts_details_photo_progress" style="display:none;" value="0" max="100">0 %</progress>
+
+
diff --git a/apps/contacts/templates/part.cropphoto.php b/apps/contacts/templates/part.cropphoto.php
new file mode 100644
index 00000000000..cb416f0e415
--- /dev/null
+++ b/apps/contacts/templates/part.cropphoto.php
@@ -0,0 +1,62 @@
+<?php 
+$id = $_['id'];
+$tmp_path = $_['tmp_path'];
+OC_Log::write('contacts','templates/part.cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OC_Log::DEBUG);
+?>
+<script language="Javascript">
+	jQuery(function($) {
+		$('#cropbox').Jcrop({
+			onChange:	showCoords,
+			onSelect:	showCoords,
+			onRelease:	clearCoords,
+			maxSize:	[399, 399],
+			bgColor:	'black',
+			bgOpacity:	.4,
+			boxWidth: 	400,
+			boxHeight:	400,
+			setSelect:	[ 100, 130, 50, 50 ]//,
+			//aspectRatio: 0.8
+		});
+	});
+	// Simple event handler, called from onChange and onSelect
+	// event handlers, as per the Jcrop invocation above
+	function showCoords(c) {
+		$('#x1').val(c.x);
+		$('#y1').val(c.y);
+		$('#x2').val(c.x2);
+		$('#y2').val(c.y2);
+		$('#w').val(c.w);
+		$('#h').val(c.h);
+	};
+
+	function clearCoords() {
+		$('#coords input').val('');
+	};
+	/*
+	$('#coords').submit(function() {
+		alert('Handler for .submit() called.');
+		return true;
+	});*/
+</script>
+<img id="cropbox" src="<?php echo OC_Helper::linkTo('contacts', 'dynphoto.php', null, true); ?>?tmp_path=<?php echo urlencode($tmp_path); ?>" />
+<form id="cropform"
+	class="coords"
+	method="post"
+	enctype="multipart/form-data"
+	target="crop_target"
+	action="<?php echo OC_Helper::linkTo('contacts', 'ajax/savecrop.php', null, true); ?>">
+
+	<input type="hidden" id="id" name="id" value="<?php echo $id; ?>" />
+	<input type="hidden" id="tmp_path" name="tmp_path" value="<?php echo $tmp_path; ?>" />
+	<fieldset id="coords">
+	<input type="hidden" id="x1" name="x1" value="" />
+	<input type="hidden" id="y1" name="y1" value="" />
+	<input type="hidden" id="x2" name="x2" value="" />
+	<input type="hidden" id="y2" name="y2" value="" />
+	<input type="hidden" id="w" name="w" value="" />
+	<input type="hidden" id="h" name="h" value="" />
+	</fieldset>
+	<iframe name="crop_target" id='crop_target' src=""></iframe>
+</form>
+
+
diff --git a/apps/contacts/templates/part.edit_address_dialog.php b/apps/contacts/templates/part.edit_address_dialog.php
new file mode 100644
index 00000000000..0ecdc4e1915
--- /dev/null
+++ b/apps/contacts/templates/part.edit_address_dialog.php
@@ -0,0 +1,67 @@
+<?php
+$adr = isset($_['adr'])?$_['adr']:array();
+$id = $_['id'];
+$types = array();
+foreach(isset($adr['parameters']['TYPE'])?array($adr['parameters']['TYPE']):array() as $type) {
+	$types[] = strtoupper($type);
+}
+?>
+<div id="edit_address_dialog" title="<?php echo $l->t('Edit address'); ?>">
+<!-- ?php print_r($types); ? -->
+	<fieldset id="address">
+		<dl class="form">
+			<dt>
+				<label class="label" for="adr_type"><?php echo $l->t('Type'); ?></label>
+			</dt>
+			<dd>
+				<select id="adr_type" name="parameters[ADR][TYPE]" size="1">
+					<?php echo html_select_options($_['adr_types'], $types) ?>
+				</select>
+			</dd>
+			<dt>
+				<label class="label" for="adr_pobox"><?php echo $l->t('PO Box'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_pobox" name="value[ADR][0]" value="<?php echo isset($adr['value'][0])?$adr['value'][0]:''; ?>">
+			</dd>
+			<dd>
+			<dt>
+				<label class="label" for="adr_extended"><?php echo $l->t('Extended'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_extended" name="value[ADR][1]" value="<?php echo isset($adr['value'][1])?$adr['value'][1]:''; ?>">
+			</dd>
+			<dt>
+				<label class="label" for="adr_street"><?php echo $l->t('Street'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_street" name="value[ADR][2]" value="<?php echo isset($adr['value'][2])?$adr['value'][2]:''; ?>">
+			</dd>
+			<dt>
+				<label class="label" for="adr_city"><?php echo $l->t('City'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_city" name="value[ADR][3]" value="<?php echo isset($adr['value'][3])?$adr['value'][3]:''; ?>">
+			</dd>
+			<dt>
+				<label class="label" for="adr_region"><?php echo $l->t('Region'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_region" name="value[ADR][4]" value="<?php echo isset($adr['value'][4])?$adr['value'][4]:''; ?>">
+			</dd>
+			<dt>
+				<label class="label" for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_zipcode" name="value[ADR][5]" value="<?php echo isset($adr['value'][5])?$adr['value'][5]:''; ?>">
+			</dd>
+			<dt>
+				<label class="label" for="adr_country"><?php echo $l->t('Country'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_country" name="value[ADR][6]" value="<?php echo isset($adr['value'][6])?$adr['value'][6]:''; ?>">
+			</dd>
+		</dl>
+	</fieldset>
+	</form>
+</div>
diff --git a/apps/contacts/templates/part.edit_name_dialog.php b/apps/contacts/templates/part.edit_name_dialog.php
new file mode 100644
index 00000000000..d525fd1f99b
--- /dev/null
+++ b/apps/contacts/templates/part.edit_name_dialog.php
@@ -0,0 +1,59 @@
+<?php
+$l=new OC_L10N('contacts');
+$name = isset($_['name'])?$_['name']:'';
+//print_r($name);
+$id = isset($_['id'])?$_['id']:'';
+$addressbooks = isset($_['addressbooks'])?$_['addressbooks']:null;
+?>
+<div id="edit_name_dialog" title="Edit name">
+	<form>
+	<fieldset>
+	<dl class="form">
+		<?php if(!is_null($addressbooks)) { 
+			if(count($_['addressbooks'])==1) {
+		?>
+			<input type="hidden" id="aid" name="aid" value="<?php echo $_['addressbooks'][0]['id']; ?>">
+		<?php } else { ?>
+		<dt><label for="addressbook"><?php echo $l->t('Addressbook'); ?></label></dt>
+		<dd>
+			<select id="aid" name="aid" size="1">
+				<?php echo html_select_options($_['addressbooks'], null, array('value'=>'id', 'label'=>'displayname')); ?>
+			</select>
+		</dd>
+		<?php }} ?>
+		<dt><label for="pre"><?php echo $l->t('Hon. prefixes'); ?></label></dt>
+		<dd>
+			<input name="pre" id="pre" value="<?php echo isset($name['value'][3]) ? $name['value'][3] : ''; ?>" type="text" list="prefixes" />
+			<datalist id="prefixes">
+				<option value="<?php echo $l->t('Miss'); ?>">
+				<option value="<?php echo $l->t('Ms'); ?>">
+				<option value="<?php echo $l->t('Mr'); ?>">
+				<option value="<?php echo $l->t('Sir'); ?>">
+				<option value="<?php echo $l->t('Mrs'); ?>">
+				<option value="<?php echo $l->t('Dr'); ?>">
+			</datalist>
+		</dd>
+		<dt><label for="giv"><?php echo $l->t('Given name'); ?></label></dt>
+		<dd><input name="giv" id="giv" value="<?php echo isset($name['value'][1]) ? $name['value'][1] : ''; ?>" type="text" /></dd>
+		<dt><label for="add"><?php echo $l->t('Additional names'); ?></label></dt>
+		<dd><input name="add" id="add" value="<?php echo isset($name['value'][2]) ? $name['value'][2] : ''; ?>" type="text" /></dd>
+		<dt><label for="fam"><?php echo $l->t('Family name'); ?></label></dt>
+		<dd><input name="fam" id="fam" value="<?php echo isset($name['value'][0]) ? $name['value'][0] : ''; ?>" type="text" /></dd>
+		<dt><label for="suf"><?php echo $l->t('Hon. suffixes'); ?></label></dt>
+		<dd>
+			<input name="suf" id="suf" value="<?php echo isset($name['value'][4]) ? $name['value'][4] : ''; ?>" type="text" list="suffixes" />
+			<datalist id="suffixes">
+				<option value="<?php echo $l->t('J.D.'); ?>">
+				<option value="<?php echo $l->t('M.D.'); ?>">
+				<option value="<?php echo $l->t('D.O.'); ?>">
+				<option value="<?php echo $l->t('D.C.'); ?>">
+				<option value="<?php echo $l->t('Ph.D.'); ?>">
+				<option value="<?php echo $l->t('Esq.'); ?>">
+				<option value="<?php echo $l->t('Jr.'); ?>">
+				<option value="<?php echo $l->t('Sn.'); ?>">
+			</datalist>
+		</dd>
+	</dl>
+	</fieldset>
+	</form>
+</div>
diff --git a/apps/contacts/templates/part.no_contacts.php b/apps/contacts/templates/part.no_contacts.php
new file mode 100644
index 00000000000..ab6129cdde7
--- /dev/null
+++ b/apps/contacts/templates/part.no_contacts.php
@@ -0,0 +1,8 @@
+<div id="firstrun">
+You have no contacts in your list.
+	<div id="selections">
+		<input type="button" value="Import contacts" onclick="Contacts.UI.Addressbooks.import()" />
+		<input type="button" value="Add contact" onclick="Contacts.UI.Card.add()" />
+		<input type="button" value="Edit addressbooks" onclick="Contacts.UI.Addressbooks.overview()" />
+	</div>
+</div>
\ No newline at end of file
diff --git a/core/img/actions/add.png b/core/img/actions/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..db1b1970f17f7b6a35fb22693af492df7c2391df
GIT binary patch
literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000UR000UR0oc(#5&!@I8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10cA-<K~y-6rIRsh!cY{2zr?gP(khj73vPkp?%Kt{E=~of&iw=a
z3TJ<iU8Ep5NH@VPVx_b?<e5axyB$h{*rc@d!W-Uw=N;}noMVUx|0ye{Us@~{w@N7!
zpja%5>$;D?+cD70AutDnf$e!-)$_b+zu!LxPBMWx1QG;6x?3E_0_Z;xY&M&eAc`XL
z2);D9Sglr<U(G_HaH^C_K~WSD1i{sAw<{fBf^xb1Zioou@%Xye>)p)f^Yqhlxnwq*
z0pPkWwOTEGt5hm<yWQtzv-xBJtk-KjnM{~Yr<wcszK`$w>D_T0!Z1uy4Yu2Dk|arv
z9N$Z8of238wr$6qPUj_#V+|l8#%MIE4u``tfO@^YZ?#&lhG7VRX_|&@+n*wdNY*)N
zx7&BX1MtvjH10*Dl!g7355h2nzxqHab?5^DGDDM>1<_h-$8j`(Wm!6J0^^4?9(#YE
eHN{T^zp4*-4#pi%9*bB20000<MNUMnLSTZYj?9|?

literal 0
HcmV?d00001

diff --git a/core/img/actions/add.svg b/core/img/actions/add.svg
new file mode 100644
index 00000000000..29994747c33
--- /dev/null
+++ b/core/img/actions/add.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="22"
+   height="22"
+   id="svg2406"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="add.svg">
+  <metadata
+     id="metadata3125">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3123"
+     showgrid="false"
+     inkscape:zoom="10.727273"
+     inkscape:cx="11.843286"
+     inkscape:cy="14.728814"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2406" />
+  <defs
+     id="defs2408">
+    <linearGradient
+       id="linearGradient2264">
+      <stop
+         id="stop2266"
+         style="stop-color:#d7e866;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2268"
+         style="stop-color:#8cab2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.103895"
+       y1="15.180944"
+       x2="24.103895"
+       y2="34.224861"
+       id="linearGradient2401"
+       xlink:href="#linearGradient2264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8988874,0,0,0.8934652,-10.463705,-9.5659718)" />
+    <linearGradient
+       id="linearGradient4222">
+      <stop
+         id="stop4224"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4226"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.138529"
+       y1="6.5316639"
+       x2="24.138529"
+       y2="45.690399"
+       id="linearGradient2398"
+       xlink:href="#linearGradient4222"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5399382,0,0,0.5366811,-1.8489228,-1.5061978)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4222"
+       id="linearGradient3128"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5399382,0,0,0.5366811,-1.7557025,-1.7858588)"
+       x1="24.138529"
+       y1="6.5316639"
+       x2="24.138529"
+       y2="45.690399" />
+  </defs>
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.40000000000000002;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3128);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+     id="path2272"
+     d="m 8.5932204,8.2151575 0,-5.9948184 4.9999996,0 0,5.9948184 6,0 0,5.0051815 -6,0 0,6 -4.9999996,0 0,-6 -6,0 0,-5.0051815 6,0 z" />
+</svg>
diff --git a/core/img/actions/mail.png b/core/img/actions/mail.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea811ac5453b28affe9e1bed66fc5f472fbc85ba
GIT binary patch
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000UR000UR0oc(#5&!@I8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10ij7mK~y-6rIXFd+E5UNA7hR&8bncyP*Bia!M(WYwinq8_-;gW
zC#ZCxXm=`Zl;BTJP9~>|qS#W}uXSJ+^TIPf%uLQ&%PZyr0r2rZ`LDUrX!J!X_33uI
z>3<=M#iEy{>C!dEeD3vnA4G&wsq`-Rd_LoO9;?-=;-qPsd7g(chW&nzh>&I3Z#_*@
zcDo$_N-5Gb#WBW^Wf|pi8Ko5K^_si(>{@Hq>ovabQ!ExA37sTK5D`R#APA_{YRqOc
zZnxV*zh18_77H4U2EOk<bYqNlj4}4PQV;}OE*Hk*F;Nr|MG@oim^h9pl}bN#l_Ux7
zy#s44BEoz=Ck#XC^*WQugj_DiU@&06-!q*~>G%6Mj)S!pV+`(n-XuxbY&NvpZK~BO
z0K?%BfI^`_r_<qhJhEIa>2|v)rG6xc<JiV=%;9jL-ELDT6c7;r^7%Z#Bd$~`c%H|0
zyQS4?p|!TI)|%_}O0(I-aU8NN`{NBLr3k~2%jJUB8dpRfYxx`e%OxTrxTn+U+uPfl
m`)=~dL?p_+`i;&@H1Hj8cO_z{9a<;=0000<MNUMnLSTYIH}VAl

literal 0
HcmV?d00001

diff --git a/core/img/actions/mail.svg b/core/img/actions/mail.svg
new file mode 100644
index 00000000000..54a24faf85d
--- /dev/null
+++ b/core/img/actions/mail.svg
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="22"
+   height="22"
+   id="svg2575"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="mail_new.svg"
+   inkscape:export-filename="/home/tol/tanghus-owncloud/core/img/actions/mail.png"
+   inkscape:export-xdpi="65.454544"
+   inkscape:export-ydpi="65.454544">
+  <metadata
+     id="metadata59">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview57"
+     showgrid="false"
+     inkscape:zoom="10.727273"
+     inkscape:cx="11"
+     inkscape:cy="11"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2575" />
+  <defs
+     id="defs2577">
+    <linearGradient
+       id="linearGradient3943">
+      <stop
+         id="stop3945"
+         style="stop-color:#ffffff;stop-opacity:0.40000001"
+         offset="0" />
+      <stop
+         id="stop3947"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.138529"
+       y1="7.0478544"
+       x2="24.138529"
+       y2="47.272728"
+       id="linearGradient2560"
+       xlink:href="#linearGradient3943"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2817955,0,0,0.2800956,-16.058706,13.975052)" />
+    <linearGradient
+       id="linearGradient2264">
+      <stop
+         id="stop2266"
+         style="stop-color:#d7e866;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2268"
+         style="stop-color:#8cab2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.103895"
+       y1="15.168831"
+       x2="24.103895"
+       y2="32.485161"
+       id="linearGradient2558"
+       xlink:href="#linearGradient2264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4691323,0,0,0.4663025,-20.554789,9.7686284)" />
+    <linearGradient
+       id="linearGradient3495-841-851-719">
+      <stop
+         id="stop4120"
+         style="stop-color:#1e1e1e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4122"
+         style="stop-color:#1e1e1e;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3333-314-917-262">
+      <stop
+         id="stop4102"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4104"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2490-495-150-777">
+      <stop
+         id="stop4108"
+         style="stop-color:#787878;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4110"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3242-967-12-570-862-307">
+      <stop
+         id="stop4498"
+         style="stop-color:#f2f2f2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4502"
+         style="stop-color:#dbdbdb;stop-opacity:1"
+         offset="0.87426931" />
+      <stop
+         id="stop4504"
+         style="stop-color:#999999;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5060-6-986-342-61">
+      <stop
+         id="stop4080"
+         style="stop-color:#1e1e1e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4082"
+         style="stop-color:#1e1e1e;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="605.71429"
+       cy="486.64789"
+       r="117.14286"
+       fx="605.71429"
+       fy="486.64789"
+       id="radialGradient2724-226-535-494"
+       xlink:href="#linearGradient5060-6-986-342-61"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-6.553443e-2,0,0,2.470588e-2,-21.829255,10.577352)" />
+    <linearGradient
+       id="linearGradient5060-6-252-476-367">
+      <stop
+         id="stop4074"
+         style="stop-color:#1e1e1e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4076"
+         style="stop-color:#1e1e1e;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="605.71429"
+       cy="486.64789"
+       r="117.14286"
+       fx="605.71429"
+       fy="486.64789"
+       id="radialGradient2722-303-187-273"
+       xlink:href="#linearGradient5060-6-252-476-367"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.553443e-2,0,0,2.470588e-2,-69.175497,10.577352)" />
+    <linearGradient
+       id="linearGradient5048-7-668-934-892">
+      <stop
+         id="stop4066"
+         style="stop-color:#1e1e1e;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop4068"
+         style="stop-color:#1e1e1e;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop4070"
+         style="stop-color:#1e1e1e;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507"
+       id="linearGradient2720-766-26-906"
+       xlink:href="#linearGradient5048-7-668-934-892"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.553443e-2,0,0,2.470588e-2,-69.188394,10.577352)" />
+    <linearGradient
+       x1="23.903786"
+       y1="35.75"
+       x2="23.903786"
+       y2="16.00676"
+       id="linearGradient3411"
+       xlink:href="#linearGradient3495-841-851-719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4657385,0,0,0.4850945,0.8223379,-3.5686279)" />
+    <linearGradient
+       x1="23.928667"
+       y1="30.773148"
+       x2="23.928667"
+       y2="45.530704"
+       id="linearGradient3414"
+       xlink:href="#linearGradient3495-841-851-719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4657385,0,0,0.4850945,0.8223378,-4.102232)" />
+    <linearGradient
+       x1="25.57654"
+       y1="15.000002"
+       x2="25.57654"
+       y2="44.00053"
+       id="linearGradient3417"
+       xlink:href="#linearGradient3333-314-917-262"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4418603,0,0,0.4642857,1.3953491,-3.696433)" />
+    <linearGradient
+       x1="19.875452"
+       y1="10.389797"
+       x2="19.875452"
+       y2="45.60001"
+       id="linearGradient3420"
+       xlink:href="#linearGradient3242-967-12-570-862-307"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4666666,0,0,0.4545454,0.7999999,-2.7272752)" />
+    <linearGradient
+       x1="28.103424"
+       y1="45.000065"
+       x2="28.103424"
+       y2="14.038458"
+       id="linearGradient3422"
+       xlink:href="#linearGradient2490-495-150-777"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4666666,0,0,0.5006418,0.7999998,-4.7785529)" />
+    <linearGradient
+       x1="23.903786"
+       y1="35.75"
+       x2="23.903786"
+       y2="16.00676"
+       id="linearGradient2440"
+       xlink:href="#linearGradient3495-841-851-719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4657385,0,0,0.4850945,-0.1776621,-4.5686279)" />
+    <linearGradient
+       x1="23.928667"
+       y1="30.773148"
+       x2="23.928667"
+       y2="45.530704"
+       id="linearGradient2443"
+       xlink:href="#linearGradient3495-841-851-719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4657385,0,0,0.4850945,-0.1776622,-5.102232)" />
+    <linearGradient
+       x1="25.57654"
+       y1="15.000002"
+       x2="25.57654"
+       y2="44.00053"
+       id="linearGradient2446"
+       xlink:href="#linearGradient3333-314-917-262"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4418603,0,0,0.4642857,0.3953491,-4.696433)" />
+    <linearGradient
+       x1="19.875452"
+       y1="10.389797"
+       x2="19.875452"
+       y2="45.60001"
+       id="linearGradient2449"
+       xlink:href="#linearGradient3242-967-12-570-862-307"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4666666,0,0,0.4545454,-0.10677976,-1.5832074)" />
+    <linearGradient
+       x1="28.103424"
+       y1="45.000065"
+       x2="28.103424"
+       y2="14.038458"
+       id="linearGradient2451"
+       xlink:href="#linearGradient2490-495-150-777"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4666666,0,0,0.5006418,-0.10677986,-3.6344851)" />
+    <linearGradient
+       x1="24.103895"
+       y1="15.168831"
+       x2="24.103895"
+       y2="32.485161"
+       id="linearGradient2457"
+       xlink:href="#linearGradient2264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4691323,0,0,0.4663025,-20.554789,9.7686284)" />
+    <linearGradient
+       x1="24.138529"
+       y1="7.0478544"
+       x2="24.138529"
+       y2="47.272728"
+       id="linearGradient2459"
+       xlink:href="#linearGradient3943"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2817955,0,0,0.2800956,-16.058706,13.975052)" />
+  </defs>
+  <rect
+     width="21"
+     height="15"
+     rx="0.46666664"
+     ry="0.45454553"
+     x="0.59322035"
+     y="3.6440678"
+     id="rect2396"
+     style="fill:url(#linearGradient2449);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2451);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="19"
+     height="13"
+     rx="0.036476243"
+     ry="0.035004593"
+     x="1.5"
+     y="2.5"
+     id="rect3331"
+     style="opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2446);stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 8.2139564,10.336975 L 1.1222032,16.468629 M 13.709509,10.325653 L 20.811476,16.468629"
+     id="path3341"
+     style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2443);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 0.8491563,3.0457658 L 11.000062,12.181817 L 20.937208,3.0457658"
+     id="path3493"
+     style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:url(#linearGradient2440);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
-- 
GitLab


From bc79951f336be9ec9ee4880216fbe9b3b0698268 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 6 Feb 2012 08:04:06 +0100
Subject: [PATCH 410/546] Updated copyrights. Element menu didn't update.

---
 apps/contacts/ajax/saveproperty.php      |  4 ++--
 apps/contacts/dynphoto.php               |  2 +-
 apps/contacts/js/contacts.js             |  2 ++
 apps/contacts/templates/part.contact.php | 16 ++++------------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index fd1aa9e35f9..8f575c6b81e 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -2,8 +2,8 @@
 /**
  * ownCloud - Addressbook
  *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/apps/contacts/dynphoto.php b/apps/contacts/dynphoto.php
index 8025f559c37..2beac15e143 100644
--- a/apps/contacts/dynphoto.php
+++ b/apps/contacts/dynphoto.php
@@ -3,7 +3,7 @@
  * ownCloud - Image generator for contacts.
  *
  * @author Thomas Tanghus
- * @copyright 2011 Thomas Tanghus <thomas@tanghus.net>
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index c2130e08b5b..45130dd048f 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -310,6 +310,8 @@ Contacts={
 								$('#contact_identity').find('#org_value').show();
 								break;
 						}
+					} else {
+						$('#contacts_propertymenu a[data-type="'+props[prop]+'"]').parent().show();
 					}
 				}
 			},
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 0e3611b2e4c..1c7b7b9067a 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -21,18 +21,10 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 	<div id="actionbar">
 	<a id="contacts_propertymenu_button"></a>
 	<ul id="contacts_propertymenu">
-		<li <?php echo (!is_null($card['PHOTO'])?'style="display:none;"':''); ?>>
-			<a data-type="PHOTO"><?php echo $l->t('Profile picture'); ?></a>
-		</li>
-		<li <?php echo (!is_null($card['ORG'])?'style="display:none;"':''); ?>>
-			<a data-type="ORG"><?php echo $l->t('Organization'); ?></a>
-		</li>
-		<li <?php echo (!is_null($card['NICKNAME'])?'style="display:none;"':''); ?>>
-			<a data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a>
-		</li>
-		<li <?php echo (!is_null($card['BDAY'])?'style="display:none;"':''); ?>>
-			<a data-type="BDAY"><?php echo $l->t('Birthday'); ?></a>
-		</li>
+		<li><a data-type="PHOTO"><?php echo $l->t('Profile picture'); ?></a></li>
+		<li><a data-type="ORG"><?php echo $l->t('Organization'); ?></a></li>
+		<li><a data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a></li>
+		<li><a data-type="BDAY"><?php echo $l->t('Birthday'); ?></a></li>
 		<li><a data-type="TEL"><?php echo $l->t('Phone'); ?></a></li>
 		<li><a data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
 		<li><a data-type="ADR"><?php echo $l->t('Address'); ?></a></li>
-- 
GitLab


From 5962e66b6dc57c875c3c00e0f86312a6ede8a070 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 6 Feb 2012 08:15:23 +0100
Subject: [PATCH 411/546] Hide container for emails/phones/adresses if there
 are none.

---
 apps/contacts/js/contacts.js             | 4 ++++
 apps/contacts/templates/part.contact.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 45130dd048f..b66dd6949d5 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -253,6 +253,7 @@ Contacts={
 				return false;
 			},
 			loadContact:function(jsondata){
+				$('#contact_communication').hide();
 				this.data = jsondata;
 				this.id = this.data.id;
 				console.log('loaded: ' + this.data.FN[0]['value']);
@@ -660,6 +661,7 @@ Contacts={
 				}
 				if($('#addressdisplay dl').length > 1) {
 					$('#addresses').show();
+					$('#contact_communication').show();
 				}
 				Contacts.UI.loadListHandlers();
 				return false;
@@ -858,6 +860,7 @@ Contacts={
 				}
 				if($('#emaillist li').length > 1) {
 					$('#emails').show();
+					$('#contact_communication').show();
 				}
 
 				$('#emaillist li:last-child').find('input[type="text"]').focus();
@@ -919,6 +922,7 @@ Contacts={
 				}
 				if($('#phonelist li').length > 1) {
 					$('#phones').show();
+					$('#contact_communication').show();
 				}
 				return false;
 			},
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 1c7b7b9067a..8a4faf720de 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -77,7 +77,7 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 	</div>
 
 	<!-- div class="delimiter"></div -->
-	<form id="contact_communication" method="post">
+	<form id="contact_communication" method="post" style="display: none;">
 	<div class="contactsection">
 		<!-- email addresses -->
 		<div id="emails" <?php echo (count($card['EMAIL'])>0?'':'style="display:none;"'); ?>>
-- 
GitLab


From 2cebfb50a4214dd5a856830bf65370f487b746f5 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 6 Feb 2012 14:18:40 +0100
Subject: [PATCH 412/546] Fixed broken "Add new" contact. Possible fix for
 cards with missing 'FN' property added through DAV. Misc. UI cleanups.

---
 apps/contacts/ajax/addcontact.php        |  8 ++-
 apps/contacts/ajax/editname.php          | 13 ++++-
 apps/contacts/ajax/newcontact.php        |  8 ++-
 apps/contacts/css/contacts.css           |  2 +-
 apps/contacts/js/contacts.js             | 70 +++++++++++++++++++-----
 apps/contacts/lib/vcard.php              |  2 +-
 apps/contacts/templates/part.contact.php | 28 ++--------
 7 files changed, 85 insertions(+), 46 deletions(-)

diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php
index 4bd3df54e39..c39d75eff88 100644
--- a/apps/contacts/ajax/addcontact.php
+++ b/apps/contacts/ajax/addcontact.php
@@ -24,11 +24,11 @@
 require_once('../../../lib/base.php');
 function bailOut($msg) {
 	OC_JSON::error(array('data' => array('message' => $msg)));
-	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('contacts','ajax/addcontact.php: '.$msg, OC_Log::DEBUG);
 	exit();
 }
 function debug($msg) {
-	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('contacts','ajax/addcontact.php: '.$msg, OC_Log::DEBUG);
 }
 foreach ($_POST as $key=>$element) {
 	debug('_POST: '.$key.'=>'.$element);
@@ -44,11 +44,13 @@ $addressbook = OC_Contacts_App::getAddressbook( $aid );
 
 $fn = trim($_POST['fn']);
 $n = trim($_POST['n']);
+debug('N: '.$n);
+debug('FN: '.$fn);
 
 $vcard = new OC_VObject('VCARD');
 $vcard->setUID();
-$vcard->setString('N',$n);
 $vcard->setString('FN',$fn);
+$vcard->setString('N',$n);
 
 $id = OC_Contacts_VCard::add($aid,$vcard->serialize());
 if(!$id) {
diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php
index 6205cc74b0a..c7a7bcdeaf8 100644
--- a/apps/contacts/ajax/editname.php
+++ b/apps/contacts/ajax/editname.php
@@ -9,14 +9,23 @@
 require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/editname.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/editname.php: '.$msg, OC_Log::DEBUG);
+}
+foreach ($_GET as $key=>$element) {
+	debug('_GET: '.$key.'=>'.$element);
+}
 
 $tmpl = new OC_TEMPLATE("contacts", "part.edit_name_dialog");
 
 $id = $_GET['id'];
 if($id) {
 	$vcard = OC_Contacts_App::getContactVCard($id);
-
-
 	$name = array('', '', '', '', '');
 	if($vcard->__isset('N')) {
 		$property = $vcard->__get('N');
diff --git a/apps/contacts/ajax/newcontact.php b/apps/contacts/ajax/newcontact.php
index 3d1a8e74535..fcfd12ca80d 100644
--- a/apps/contacts/ajax/newcontact.php
+++ b/apps/contacts/ajax/newcontact.php
@@ -24,11 +24,11 @@
 require_once('../../../lib/base.php');
 function bailOut($msg) {
 	OC_JSON::error(array('data' => array('message' => $msg)));
-	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('contacts','ajax/newcontact.php: '.$msg, OC_Log::DEBUG);
 	exit();
 }
 function debug($msg) {
-	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('contacts','ajax/newcontact.php: '.$msg, OC_Log::DEBUG);
 }
 foreach ($_POST as $key=>$element) {
 	debug('_POST: '.$key.'=>'.$element);
@@ -47,10 +47,14 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 $freeSpace=OC_Filesystem::free_space('/');
 $freeSpace=max($freeSpace,0);
 $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
+$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
+$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
 
 $tmpl = new OC_Template('contacts','part.contact');
 $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign('uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
+$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
 $tmpl->assign('addressbooks',$addressbooks);
 $tmpl->assign('id','');
 $page = $tmpl->fetchPage();
diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index a48533f85a0..d90e93f64e9 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -16,7 +16,7 @@
 #contacts_propertymenu li:hover { background-color: #1d2d44; }
 #contacts_propertymenu li a:hover { color: #fff }
 #actionbar { height: 30px; width: 200px; position: fixed; right: 0px; top: 75px; margin: 0 0 0 0; padding: 0 0 0 0;}
-#card { /*max-width: 70em;*/ border: thin solid lightgray; display: block; }
+#card { /*max-width: 70em; border: thin solid lightgray; display: block;*/ }
 #firstrun { /*border: thin solid lightgray;*/ width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777;}
 #firstrun #selections { /*border: thin solid lightgray;*/ font-size:0.8em;  width: 100%; margin: 2em auto auto auto; clear: both; }
 
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index b66dd6949d5..40f049de3b5 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -67,25 +67,34 @@ Contacts={
 		propertyTypeFor:function(obj) {
 			return $(obj).parents('.propertycontainer').first().data('element');
 		},
+		showHideContactInfo:function() {
+			var show = ($('#emaillist li[class*="propertycontainer"]').length > 0 || $('#phonelist li[class*="propertycontainer"]').length > 0 || $('#addressdisplay dl[class*="propertycontainer"]').length > 0);
+			console.log('showHideContactInfo: ' + show);
+			if(show) {
+				$('#contact_communication').show();
+			} else {
+				$('#contact_communication').hide();
+			}
+		},
 		checkListFor:function(obj) {
 			var type = $(obj).parents('.propertycontainer').first().data('element');
 			console.log('checkListFor: ' + type);
 			switch (type) {
 				case 'EMAIL':
 					console.log('emails: '+$('#emaillist>li').length);
-					if($('#emaillist>li').length == 1) {
+					if($('#emaillist li[class*="propertycontainer"]').length == 0) {
 						$('#emails').hide();
 					}
 					break;
 				case 'TEL':
 					console.log('phones: '+$('#phonelist>li').length);
-					if($('#phonelist>li').length == 1) {
+					if($('#phonelist li[class*="propertycontainer"]').length == 0) {
 						$('#phones').hide();
 					}
 					break;
 				case 'ADR':
 					console.log('addresses: '+$('#addressdisplay>dl').length);
-					if($('#addressdisplay>dl').length == 1) {
+					if($('#addressdisplay dl[class*="propertycontainer"]').length == 0) {
 						$('#addresses').hide();
 					}
 					break;
@@ -317,7 +326,7 @@ Contacts={
 				}
 			},
 			populateNameFields:function() {
-				this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = ''
+				this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
 				var full = '';
 				var narray = undefined;
 				//console.log('splitting: ' + this.data.N[0]['value']);
@@ -366,6 +375,8 @@ Contacts={
 			editNew:function(){ // add a new contact
 				//Contacts.UI.notImplemented();
 				//return false;
+				this.id = ''; this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
+
 				
 				$.getJSON('ajax/newcontact.php',{},function(jsondata){
 					if(jsondata.status == 'success'){
@@ -394,7 +405,31 @@ Contacts={
 					 */
 					if (jsondata.status == 'success'){
 						$('#rightcontent').data('id',jsondata.data.id);
-						id = jsondata.data.id;
+						var id = jsondata.data.id;
+						$.getJSON('ajax/contactdetails.php',{'id':id},function(jsondata){
+							if(jsondata.status == 'success'){
+								Contacts.UI.loadHandlers();
+								Contacts.UI.Card.loadContact(jsondata.data);
+								$('#leftcontent .active').removeClass('active');
+								var item = '<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'"  style="background: url(thumbnail.php?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+Contacts.UI.Card.fn+'</a></li>';
+								var added = false;
+								$('#leftcontent ul li').each(function(){
+									if ($(this).text().toLowerCase() > Contacts.UI.Card.fn.toLowerCase()) {
+										$(this).before(item).fadeIn('fast');
+										added = true;
+										return false;
+									}
+								});
+								if(!added) {
+									$('#leftcontent ul').append(item);
+								}
+								
+							}
+							else{
+								Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+								//alert(jsondata.data.message);
+							}
+						});
 						$('#contact_identity').show();
 						$('#actionbar').show();
 						// TODO: Add to contacts list.
@@ -466,7 +501,8 @@ Contacts={
 				console.log('addProperty:' + type);
 				switch (type) {
 					case 'PHOTO':
-						$('#contacts_propertymenu a[data-type="PHOTO"]').parent().hide();
+						$('#contacts_propertymenu a[data-type="'+type+'"]').parent().hide();
+						this.loadPhoto();
 						$('#file_upload_form').show();
 						break;
 					case 'EMAIL':
@@ -475,6 +511,7 @@ Contacts={
 							$('#emails').show();
 						}
 						Contacts.UI.Card.addMail();
+						Contacts.UI.showHideContactInfo();
 						break;
 					case 'TEL':
 						//console.log('phones: '+$('#phonelist>li').length);
@@ -482,6 +519,7 @@ Contacts={
 							$('#phones').show();
 						}
 						Contacts.UI.Card.addPhone();
+						Contacts.UI.showHideContactInfo();
 						break;
 					case 'ADR':
 						//console.log('addresses: '+$('#addressdisplay>dl').length);
@@ -489,6 +527,7 @@ Contacts={
 							$('#addresses').show();
 						}
 						Contacts.UI.Card.editAddress('new', true);
+						Contacts.UI.showHideContactInfo();
 						break;
 					case 'NICKNAME':
 					case 'ORG':
@@ -509,6 +548,7 @@ Contacts={
 						if(jsondata.status == 'success'){
 							if(type == 'list') {
 								Contacts.UI.propertyContainerFor(obj).remove();
+								Contacts.UI.showHideContactInfo();
 								Contacts.UI.checkListFor(obj);
 							} else if(type == 'single') {
 								var proptype = Contacts.UI.propertyTypeFor(obj);
@@ -529,6 +569,7 @@ Contacts={
 				} else { // Property hasn't been saved so there's nothing to delete.
 					if(type == 'list') {
 						Contacts.UI.propertyContainerFor(obj).remove();
+						Contacts.UI.showHideContactInfo();
 						Contacts.UI.checkListFor(obj);
 					} else if(type == 'single') {
 						var proptype = Contacts.UI.propertyTypeFor(obj);
@@ -542,7 +583,8 @@ Contacts={
 				}
 			},
 			editName:function(){
-				console.log('editName, id: ' + this.id);
+				console.log('editName, id: ' + (this.id == ''));
+				var isnew = (this.id == '');
 				//console.log('editName');
 				/* Initialize the name edit dialog */
 				if($('#edit_name_dialog').dialog('isOpen') == true){
@@ -550,9 +592,9 @@ Contacts={
 				}else{ // TODO: If id=='' call addcontact.php (or whatever name) instead and reload view with id.
 					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'editname.php')+'?id='+this.id, function(){
 						$('#edit_name_dialog' ).dialog({
-								modal: (this.id == '' && true || false),
-								closeOnEscape: (this.id == '' && false || true),
-								title:  (this.id == '' && t('contacts', 'Add contact') || t('contacts', 'Edit name')),
+								modal: (isnew && true || false),
+								closeOnEscape: (isnew == '' && false || true),
+								title:  (isnew && t('contacts', 'Add contact') || t('contacts', 'Edit name')),
 								height: 'auto', width: 'auto',
 								buttons: {
 									'Ok':function() { 
@@ -576,7 +618,7 @@ Contacts={
 			saveName:function(dlg){
 				console.log('saveName, id: ' + this.id);
 				// TODO: Check if new, get address book id and call Contacts.UI.Card.add()
-				var n = new Array($(dlg).find('#fam').val(),$(dlg).find('#giv').val(),$(dlg).find('#add').val(),$(dlg).find('#pre').val(),$(dlg).find('#suf').val());
+				var n = new Array($(dlg).find('#fam').val().strip_tags(),$(dlg).find('#giv').val().strip_tags(),$(dlg).find('#add').val().strip_tags(),$(dlg).find('#pre').val().strip_tags(),$(dlg).find('#suf').val().strip_tags());
 				this.famname = n[0];
 				this.givname = n[1];
 				this.addname = n[2];
@@ -602,7 +644,7 @@ Contacts={
 				$('#fn').val(0);
 				if(this.id == '') {
 					var aid = $(dlg).find('#aid').val();
-					Contacts.UI.Card.add(n, $('#short').text(), aid);
+					Contacts.UI.Card.add(n.join(';'), $('#short').text(), aid);
 				} else {
 					Contacts.UI.Card.saveProperty($('#n'));
 				}
@@ -704,6 +746,7 @@ Contacts={
 										if(isnew) {
 											container.remove();
 										}
+										Contacts.UI.showHideContactInfo();
 									}
 								},
 								close : function(event, ui) {
@@ -712,6 +755,7 @@ Contacts={
 									if(isnew) {
 										container.remove();
 									}
+									Contacts.UI.showHideContactInfo();
 								}/*,
 								open : function(event, ui) {
 									// load 'ADR' property - maybe :-P
@@ -1119,7 +1163,7 @@ $(document).ready(function(){
 	});
 
 	/**
-	 * Add and insert a new contact into the list.
+	 * Add and insert a new contact into the list. NOTE: Deprecated
 	 */
 	$('#contacts_addcardform input[type="submit"]').live('click',function(){
 		$.post('ajax/addcontact.php',$('#contact_identity').serialize(),function(jsondata){
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index aefa2c74114..eee57ec4a12 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -177,7 +177,7 @@ class OC_Contacts_VCard{
 			} else {
 				$fn = 'Unknown';
 			}
-			$card->addProperty('EMAIL', $email);
+			$card->addProperty('FN', $fn);
 			$data = $card->serialize();
 		}
 
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 8a4faf720de..446a9b88ede 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -1,21 +1,6 @@
 <?php
 $l=new OC_L10N('contacts');
 $id = isset($_['id']) ? $_['id'] : '';
-$card = array();
-$card['id'] = $id;
-$card['FN'] = (array_key_exists('FN',$_['details'])) ? $_['details']['FN'][0] : null;
-$card['N'] = (array_key_exists('N',$_['details'])) ? $_['details']['N'][0] : array('', '', '', '', '');
-$card['ORG'] = (array_key_exists('ORG',$_['details'])) ? $_['details']['ORG'][0] : null;
-$card['PHOTO'] = (array_key_exists('PHOTO',$_['details'])) ? $_['details']['PHOTO'][0] : null;
-$card['BDAY'] = (array_key_exists('BDAY',$_['details'])) ? $_['details']['BDAY'][0] : null;
-if($card['BDAY']) {
-	$bday = new DateTime($card['BDAY']['value']);
-	$card['BDAY']['value'] = $bday->format('d-m-Y');
-}
-$card['NICKNAME'] = (array_key_exists('NICKNAME',$_['details'])) ? $_['details']['NICKNAME'][0] : null;
-$card['EMAIL'] = (array_key_exists('EMAIL',$_['details'])) ? $_['details']['EMAIL'] : array();
-$card['TEL'] = (array_key_exists('TEL',$_['details'])) ? $_['details']['TEL'] : array();
-$card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] : array();
 ?>
 <div id="card">
 	<div id="actionbar">
@@ -35,7 +20,7 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 
 	<div class="contactsection">
 
-	<form <?php echo (is_null($card['PHOTO'])?'style="display:none;"':''); ?> id="file_upload_form" action="ajax/uploadphoto.php" method="post" enctype="multipart/form-data" target="file_upload_target">
+	<form style="display:none;" id="file_upload_form" action="ajax/uploadphoto.php" method="post" enctype="multipart/form-data" target="file_upload_target">
 	<fieldset id="photo" class="formfloat">
 		<div id="contacts_details_photo_wrapper" title="<?php echo $l->t('Click or drop to upload picture'); ?> (max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
 		<!-- img style="padding: 1em;" id="contacts_details_photo" alt="Profile picture"  src="photo.php?id=<?php echo $_['id']; ?>" / -->
@@ -80,7 +65,7 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 	<form id="contact_communication" method="post" style="display: none;">
 	<div class="contactsection">
 		<!-- email addresses -->
-		<div id="emails" <?php echo (count($card['EMAIL'])>0?'':'style="display:none;"'); ?>>
+		<div id="emails" style="display:none;">
 		<fieldset class="contactpart">
 		<legend><?php echo $l->t('Email'); ?></legend>
 			<ul id="emaillist" class="propertylist">
@@ -100,7 +85,7 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 		</div> <!-- email addresses-->
 
 		<!-- Phone numbers -->
-		<div id="phones" <?php echo (count($card['TEL'])>0?'':'style="display:none;"'); ?>>
+		<div id="phones" style="display:none;">
 		<fieldset class="contactpart">
 		<legend><?php echo $l->t('Phone'); ?></legend>
 			<ul id="phonelist" class="propertylist">
@@ -126,7 +111,7 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 		</div> <!-- Phone numbers -->
 
 		<!-- Addresses -->
-		<div id="addresses" <?php echo (count($card['ADR'])>0?'':'style="display:none;"'); ?>>
+		<div id="addresses" style="display:none;">
 		<fieldset class="contactpart">
 		<legend><?php echo $l->t('Address'); ?></legend>
 		<div id="addressdisplay">
@@ -178,11 +163,6 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 	</div> 
 	</form>
 </div>
-<div class="delimiter"></div>
-<pre>
-<?php /*print_r($card);*/ ?>
-</pre>
-	<!-- div class="updatebar"><input type="button" value="Update" /></div -->
 <div id="edit_photo_dialog" title="Edit photo">
 		<div id="edit_photo_dialog_img"></div>
 </div>
-- 
GitLab


From e50dfbc2284e170b37735880d0a8694b89234400 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 6 Feb 2012 19:33:37 +0100
Subject: [PATCH 413/546] fix filecache when creating a new folder

---
 lib/filecache.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index e3f7fedeecf..964099c7fcd 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -298,9 +298,9 @@ class OC_FileCache{
 		$mimetype=$view->getMimeType($path);
 		//dont use self::get here, we don't want inifinte loops when a file has changed
 		$cachedSize=self::getCachedSize($path,$root);
+		$size=0;
 		if($mimetype=='httpd/unix-directory'){
 			if(self::inCache($path,$root)){
-				$size=0;
 				$parent=self::getFileId($fullPath);
 				$query=OC_DB::prepare('SELECT size FROM *PREFIX*fscache WHERE parent=?');
 				$query->execute(array($parent));
@@ -312,7 +312,8 @@ class OC_FileCache{
 				$writable=$view->is_writable($path);
 				self::put($path,array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype,'writable'=>$writable));
 			}else{
-				self::scan($path,null,0,$root);
+				$count=0;
+				self::scan($path,null,$count,$root);
 			}
 		}else{
 			$size=self::scanFile($path,$root);
-- 
GitLab


From cdf1cf82baef9764b3211017e7c3e63fb10676d3 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 7 Feb 2012 22:49:23 +0100
Subject: [PATCH 414/546] merge 64a617b2a1016108c946cc533875a40030bbd317 into
 master

---
 apps/calendar/ajax/events.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 apps/calendar/ajax/events.php

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
old mode 100644
new mode 100755
index 75fac6838d7..dd593ddec99
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -39,13 +39,13 @@ foreach($events as $event){
 	$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
 	$return_event = array();
 	$start_dt = $dtstart->getDateTime();
-	$start_dt->setTimezone(new DateTimeZone($user_timezone));
 	$end_dt = $dtend->getDateTime();
-	$end_dt->setTimezone(new DateTimeZone($user_timezone));
 	if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
 		$return_event['allDay'] = true;
 	}else{
 		$return_event['allDay'] = false;
+		$start_dt->setTimezone(new DateTimeZone($user_timezone));
+		$end_dt->setTimezone(new DateTimeZone($user_timezone));
 	}
 	//Repeating Events
 	if($event['repeating'] == 1){
-- 
GitLab


From 90a830babaafb4252bcad0bb6d6966d9e65abe88 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 6 Feb 2012 07:32:57 +0100
Subject: [PATCH 415/546] Added files for new contact editor/viewer.

---
 apps/contacts/ajax/addcontact.php             |   60 +
 apps/contacts/ajax/contactdetails.php         |   53 +
 apps/contacts/ajax/cropphoto.php              |   38 +
 apps/contacts/ajax/editaddress.php            |   31 +
 apps/contacts/ajax/editname.php               |   35 +
 apps/contacts/ajax/loadphoto.php              |   53 +
 apps/contacts/ajax/newcontact.php             |   58 +
 apps/contacts/ajax/savecrop.php               |  136 ++
 apps/contacts/ajax/saveproperty.php           |  134 ++
 apps/contacts/ajax/uploadphoto.php            |  133 ++
 apps/contacts/contacts.php                    |   60 +
 apps/contacts/css/Jcrop.gif                   |  Bin 0 -> 329 bytes
 apps/contacts/css/contacts.css                |  213 ++
 apps/contacts/css/jquery.Jcrop.css            |   84 +
 apps/contacts/dynphoto.php                    |   35 +
 apps/contacts/img/globe.svg                   |  102 +
 apps/contacts/img/person_large.png            |  Bin 0 -> 11517 bytes
 apps/contacts/js/contacts.js                  | 1289 ++++++++++++
 apps/contacts/js/jquery.Jcrop.js              | 1765 +++++++++++++++++
 apps/contacts/js/jquery.Jcrop.min.js          |  255 +++
 apps/contacts/js/jquery.jec-1.3.3.js          |  863 ++++++++
 apps/contacts/templates/index2.php            |   27 +
 apps/contacts/templates/part.contact.php      |  210 ++
 apps/contacts/templates/part.contactphoto.php |    9 +
 apps/contacts/templates/part.cropphoto.php    |   62 +
 .../templates/part.edit_address_dialog.php    |   67 +
 .../templates/part.edit_name_dialog.php       |   59 +
 apps/contacts/templates/part.no_contacts.php  |    8 +
 core/img/actions/add.png                      |  Bin 0 -> 488 bytes
 core/img/actions/add.svg                      |  109 +
 core/img/actions/mail.png                     |  Bin 0 -> 548 bytes
 core/img/actions/mail.svg                     |  345 ++++
 32 files changed, 6293 insertions(+)
 create mode 100644 apps/contacts/ajax/addcontact.php
 create mode 100644 apps/contacts/ajax/contactdetails.php
 create mode 100644 apps/contacts/ajax/cropphoto.php
 create mode 100644 apps/contacts/ajax/editaddress.php
 create mode 100644 apps/contacts/ajax/editname.php
 create mode 100644 apps/contacts/ajax/loadphoto.php
 create mode 100644 apps/contacts/ajax/newcontact.php
 create mode 100644 apps/contacts/ajax/savecrop.php
 create mode 100644 apps/contacts/ajax/saveproperty.php
 create mode 100644 apps/contacts/ajax/uploadphoto.php
 create mode 100644 apps/contacts/contacts.php
 create mode 100644 apps/contacts/css/Jcrop.gif
 create mode 100644 apps/contacts/css/contacts.css
 create mode 100644 apps/contacts/css/jquery.Jcrop.css
 create mode 100644 apps/contacts/dynphoto.php
 create mode 100644 apps/contacts/img/globe.svg
 create mode 100644 apps/contacts/img/person_large.png
 create mode 100644 apps/contacts/js/contacts.js
 create mode 100644 apps/contacts/js/jquery.Jcrop.js
 create mode 100644 apps/contacts/js/jquery.Jcrop.min.js
 create mode 100644 apps/contacts/js/jquery.jec-1.3.3.js
 create mode 100644 apps/contacts/templates/index2.php
 create mode 100644 apps/contacts/templates/part.contact.php
 create mode 100644 apps/contacts/templates/part.contactphoto.php
 create mode 100644 apps/contacts/templates/part.cropphoto.php
 create mode 100644 apps/contacts/templates/part.edit_address_dialog.php
 create mode 100644 apps/contacts/templates/part.edit_name_dialog.php
 create mode 100644 apps/contacts/templates/part.no_contacts.php
 create mode 100644 core/img/actions/add.png
 create mode 100644 core/img/actions/add.svg
 create mode 100644 core/img/actions/mail.png
 create mode 100644 core/img/actions/mail.svg

diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php
new file mode 100644
index 00000000000..4bd3df54e39
--- /dev/null
+++ b/apps/contacts/ajax/addcontact.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+}
+foreach ($_POST as $key=>$element) {
+	debug('_POST: '.$key.'=>'.$element);
+}
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
+
+$aid = $_POST['aid'];
+$addressbook = OC_Contacts_App::getAddressbook( $aid );
+
+$fn = trim($_POST['fn']);
+$n = trim($_POST['n']);
+
+$vcard = new OC_VObject('VCARD');
+$vcard->setUID();
+$vcard->setString('N',$n);
+$vcard->setString('FN',$fn);
+
+$id = OC_Contacts_VCard::add($aid,$vcard->serialize());
+if(!$id) {
+	OC_JSON::error(array('data' => array('message' => $l->t('There was an error adding the contact.'))));
+	OC_Log::write('contacts','ajax/addcontact.php: Recieved non-positive ID on adding card: '.$id, OC_Log::ERROR);
+	exit();
+}
+
+OC_JSON::success(array('data' => array( 'id' => $id )));
diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contactdetails.php
new file mode 100644
index 00000000000..f8f78ad3e80
--- /dev/null
+++ b/apps/contacts/ajax/contactdetails.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/contactdetails.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/contactdetails.php: '.$msg, OC_Log::DEBUG);
+}
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
+
+$id = $_GET['id'];
+$vcard = OC_Contacts_App::getContactVCard( $id );
+if(is_null($vcard)) {
+	bailOut($l->t('Error parsing VCard for ID: "'.$id.'"'));
+}
+$details = OC_Contacts_VCard::structureContact($vcard);
+if(isset($details['PHOTO'])) {
+	$details['PHOTO'] = true;
+	//unset($details['PHOTO']);
+} else {
+	$details['PHOTO'] = false;
+}
+$details['id'] = $id;
+
+OC_JSON::success(array('data' => $details));
\ No newline at end of file
diff --git a/apps/contacts/ajax/cropphoto.php b/apps/contacts/ajax/cropphoto.php
new file mode 100644
index 00000000000..878fb5610c6
--- /dev/null
+++ b/apps/contacts/ajax/cropphoto.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+
+$tmp_path = $_GET['tmp_path'];
+$id = $_GET['id'];
+OC_Log::write('contacts','ajax/cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OC_Log::DEBUG);
+$tmpl = new OC_TEMPLATE("contacts", "part.cropphoto");
+$tmpl->assign('tmp_path', $tmp_path);
+$tmpl->assign('id', $id);
+$page = $tmpl->fetchPage();
+
+OC_JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/ajax/editaddress.php b/apps/contacts/ajax/editaddress.php
new file mode 100644
index 00000000000..4e6456f6045
--- /dev/null
+++ b/apps/contacts/ajax/editaddress.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once('../../../lib/base.php');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+
+$id = $_GET['id'];
+$checksum = isset($_GET['checksum'])?$_GET['checksum']:'';
+$vcard = OC_Contacts_App::getContactVCard($id);
+$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
+
+$tmpl = new OC_TEMPLATE("contacts", "part.edit_address_dialog");
+if($checksum) {
+	$line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
+	$element = $vcard->children[$line];
+	$adr = OC_Contacts_VCard::structureProperty($element);
+	$tmpl->assign('adr',$adr);
+}
+
+$tmpl->assign('id',$id);
+$tmpl->assign('adr_types',$adr_types);
+
+$tmpl->printpage();
+
+?>
diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php
new file mode 100644
index 00000000000..6205cc74b0a
--- /dev/null
+++ b/apps/contacts/ajax/editname.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once('../../../lib/base.php');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+
+$tmpl = new OC_TEMPLATE("contacts", "part.edit_name_dialog");
+
+$id = $_GET['id'];
+if($id) {
+	$vcard = OC_Contacts_App::getContactVCard($id);
+
+
+	$name = array('', '', '', '', '');
+	if($vcard->__isset('N')) {
+		$property = $vcard->__get('N');
+		if($property) {
+			$name = OC_Contacts_VCard::structureProperty($property);
+		}
+	}
+	$tmpl->assign('name',$name);
+	$tmpl->assign('id',$id);
+} else {
+	$addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());
+	$tmpl->assign('addressbooks', $addressbooks);
+}
+$tmpl->printpage();
+
+?>
diff --git a/apps/contacts/ajax/loadphoto.php b/apps/contacts/ajax/loadphoto.php
new file mode 100644
index 00000000000..d9f7e737b55
--- /dev/null
+++ b/apps/contacts/ajax/loadphoto.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * TODO: Translatable strings.
+ *       Remember to delete tmp file at some point.
+ */
+// Init owncloud
+require_once('../../../lib/base.php');
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
+
+// foreach ($_POST as $key=>$element) {
+// 	OC_Log::write('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OC_Log::DEBUG);
+// }
+
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/savecrop.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+
+$image = null;
+
+$id = isset($_GET['id']) ? $_GET['id'] : '';
+
+if($id == '') {
+	bailOut('Missing contact id.');
+}
+
+$tmpl = new OC_TEMPLATE("contacts", "part.contactphoto");
+$tmpl->assign('id', $id);
+$page = $tmpl->fetchPage();
+OC_JSON::success(array('data' => array('page'=>$page)));
+?>
diff --git a/apps/contacts/ajax/newcontact.php b/apps/contacts/ajax/newcontact.php
new file mode 100644
index 00000000000..3d1a8e74535
--- /dev/null
+++ b/apps/contacts/ajax/newcontact.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+}
+foreach ($_POST as $key=>$element) {
+	debug('_POST: '.$key.'=>'.$element);
+}
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+
+$addressbooks = OC_Contacts_Addressbook::all(OC_USER::getUser());
+
+$upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
+$post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
+$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
+
+$freeSpace=OC_Filesystem::free_space('/');
+$freeSpace=max($freeSpace,0);
+$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
+
+$tmpl = new OC_Template('contacts','part.contact');
+$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign('uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
+$tmpl->assign('addressbooks',$addressbooks);
+$tmpl->assign('id','');
+$page = $tmpl->fetchPage();
+
+OC_JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
new file mode 100644
index 00000000000..7b7384723cd
--- /dev/null
+++ b/apps/contacts/ajax/savecrop.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * TODO: Translatable strings.
+ *       Remember to delete tmp file at some point.
+ */
+// Init owncloud
+require_once('../../../lib/base.php');
+OC_Log::write('contacts','ajax/savecrop.php: Huzzah!!!', OC_Log::DEBUG);
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
+
+// foreach ($_POST as $key=>$element) {
+// 	OC_Log::write('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OC_Log::DEBUG);
+// }
+
+// Firefox and Konqueror tries to download application/json for me.  --Arthur
+OC_JSON::setContentTypeHeader('text/plain');
+
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/savecrop.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+
+$image = null;
+
+$x1 = (isset($_POST['x1']) && $_POST['x1']) ? $_POST['x1'] : -1;
+//$x2 = isset($_POST['x2']) ? $_POST['x2'] : -1;
+$y1 = (isset($_POST['y1']) && $_POST['y1']) ? $_POST['y1'] : -1;
+//$y2 = isset($_POST['y2']) ? $_POST['y2'] : -1;
+$w = (isset($_POST['w']) && $_POST['w']) ? $_POST['w'] : -1;
+$h = (isset($_POST['h']) && $_POST['h']) ? $_POST['h'] : -1;
+$tmp_path = isset($_POST['tmp_path']) ? $_POST['tmp_path'] : '';
+$id = isset($_POST['id']) ? $_POST['id'] : '';
+
+if(in_array(-1, array($x1, $y1, $w, $h))) {
+	bailOut('Wrong crop dimensions: '.implode(', ', array($x1, $y1, $w, $h)));
+}
+
+if($tmp_path == '') {
+	bailOut('Missing path to temporary file.');
+}
+
+if($id == '') {
+	bailOut('Missing contact id.');
+}
+
+OC_Log::write('contacts','savecrop.php: files: '.$tmp_path.'  exists: '.file_exists($tmp_path), OC_Log::DEBUG);
+
+if(file_exists($tmp_path)) {
+	$image = new OC_Image();
+	if($image->loadFromFile($tmp_path)) {
+		if($image->crop($x1, $y1, $w, $h)) {
+			if($image->resize(200)) {
+				$tmpfname = tempnam("/tmp", "occCropped"); // create a new file because of caching issues.
+				if($image->save($tmpfname)) {
+					unlink($tmp_path);
+					$card = OC_Contacts_App::getContactVCard($id);
+					if(!$card) {
+						unlink($tmpfname);
+						bailOut('Error getting contact object.');
+					}
+					if($card->__isset('PHOTO')) {
+						OC_Log::write('contacts','savecrop.php: files: PHOTO property exists.', OC_Log::DEBUG);
+						$property = $card->__get('PHOTO');
+						if(!$property) {
+							unlink($tmpfname);
+							bailOut('Error getting PHOTO property.');
+						}
+						$property->setValue($image->__toString());
+						$property->parameters[] = new Sabre_VObject_Parameter('ENCODING', 'b');
+						$property->parameters[] = new Sabre_VObject_Parameter('TYPE', $image->mimeType());
+						$card->__set('PHOTO', $property);
+					} else {
+						OC_Log::write('contacts','savecrop.php: files: Adding PHOTO property.', OC_Log::DEBUG);
+						$card->addProperty('PHOTO', $image->__toString(), array('ENCODING' => 'b', 'TYPE' => $image->mimeType()));
+					}
+					if(!OC_Contacts_VCard::edit($id,$card->serialize())) {
+						bailOut('Error saving contact.');
+					}
+					unlink($tmpfname);
+					//$result=array( "status" => "success", 'mime'=>$image->mimeType(), 'tmp'=>$tmp_path);
+					$tmpl = new OC_TEMPLATE("contacts", "part.contactphoto");
+					$tmpl->assign('tmp_path', $tmpfname);
+					$tmpl->assign('mime', $image->mimeType());
+					$tmpl->assign('id', $id);
+					$tmpl->assign('width', $image->width());
+					$tmpl->assign('height', $image->height());
+					$page = $tmpl->fetchPage();
+					OC_JSON::success(array('data' => array('page'=>$page, 'tmp'=>$tmpfname)));
+					exit();
+				} else {
+					if(file_exists($tmpfname)) {
+						unlink($tmpfname);
+					}
+					bailOut('Error saving temporary image');
+				}
+			} else {
+				bailOut('Error resizing image');
+			}
+		} else {
+			bailOut('Error cropping image');
+		}
+	} else {
+		bailOut('Error creating temporary image');
+	}
+} else {
+	bailOut('Error finding image: '.$tmp_path);
+}
+
+if($tmp_path != '' && file_exists($tmp_path)) {
+	unlink($tmp_path);
+}
+
+?>
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
new file mode 100644
index 00000000000..fd1aa9e35f9
--- /dev/null
+++ b/apps/contacts/ajax/saveproperty.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Jakob Sack
+ * @copyright 2011 Jakob Sack mail@jakobsack.de
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
+
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+}
+foreach ($_POST as $key=>$element) {
+	debug('_POST: '.$key.'=>'.$element);
+}
+
+$id = isset($_POST['id'])?$_POST['id']:null;
+$name = isset($_POST['name'])?$_POST['name']:null;
+$value = isset($_POST['value'])?$_POST['value']:null;
+$parameters = isset($_POST['parameters'])?$_POST['parameters']:null;
+$checksum = isset($_POST['checksum'])?$_POST['checksum']:null;
+// if(!is_null($parameters)) {
+// 	debug('parameters: '.count($parameters));
+// 	foreach($parameters as $key=>$val ) {
+// 		debug('parameter: '.$key.'=>'.implode('/',$val));
+// 	}
+// }
+
+if(is_array($value)){ // FIXME: How to strip_tags for compound values?
+	ksort($value); // NOTE: Important, otherwise the compound value will be set in the order the fields appear in the form!
+	$value = OC_VObject::escapeSemicolons($value);
+} else {
+	$value = trim(strip_tags($value));
+}
+if(!$id) {
+	bailOut($l->t('id is not set.'));
+}
+if(!$checksum) {
+	bailOut($l->t('checksum is not set.'));
+}
+if(!$name) {
+	bailOut($l->t('element name is not set.'));
+}
+
+$vcard = OC_Contacts_App::getContactVCard( $id );
+$line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
+if(is_null($line)) {
+	bailOut($l->t('Information about vCard is incorrect. Please reload the page.'.$checksum.' "'.$line.'"'));
+}
+$element = $vcard->children[$line]->name;
+
+if($element != $name) {
+	bailOut($l->t('Something went FUBAR. ').$name.' != '.$element);
+}
+
+switch($element) {
+	case 'BDAY':
+		$date = New DateTime($value);
+		//$vcard->setDateTime('BDAY', $date, Sabre_VObject_Element_DateTime::DATE);
+		$value = $date->format(DateTime::ATOM);
+	case 'FN':
+		if(!$value) {
+			// create a method thats returns an alternative for FN.
+			//$value = getOtherValue();
+		}
+	case 'N':
+	case 'ORG':
+	case 'NICKNAME':
+		debug('Setting string:'.$name.' '.$value);
+		$vcard->setString($name, $value);
+		break;
+	case 'EMAIL':
+		$value = strtolower($value);
+	case 'TEL':
+	case 'ADR': // should I delete the property if empty or throw an error?
+		debug('Setting element: (EMAIL/TEL/ADR)'.$element);
+		if(!$value) {
+			unset($vcard->children[$line]); // Should never happen...
+		} else {
+			$vcard->children[$line]->setValue($value);
+			$vcard->children[$line]->parameters = array();
+			if(!is_null($parameters)) {
+				debug('Setting parameters: '.$parameters);
+				foreach($parameters as $key => $parameter) {
+					debug('Adding parameter: '.$key);
+					foreach($parameter as $val) {
+						debug('Adding parameter: '.$key.'=>'.$val);
+						$vcard->children[$line]->add(new Sabre_VObject_Parameter($key, strtoupper($val)));
+					}
+				}
+			}
+		}
+		break;
+}
+// Do checksum and be happy
+$checksum = md5($vcard->children[$line]->serialize());
+debug('New checksum: '.$checksum);
+
+if(!OC_Contacts_VCard::edit($id,$vcard->serialize())) {
+	OC_JSON::error(array('data' => array('message' => $l->t('Error updating contact property.'))));
+	OC_Log::write('contacts','ajax/setproperty.php: Error updating contact property: '.$value, OC_Log::ERROR);
+	exit();
+}
+
+//$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
+//$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
+
+OC_JSON::success(array('data' => array( 'line' => $line, 'checksum' => $checksum, 'oldchecksum' => $_POST['checksum'] )));
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
new file mode 100644
index 00000000000..62cd32f5dbb
--- /dev/null
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+// Init owncloud
+require_once('../../../lib/base.php');
+
+// Check if we are a user
+// Firefox and Konqueror tries to download application/json for me.  --Arthur
+OC_JSON::setContentTypeHeader('text/plain');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/uploadphoto.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/uploadphoto.php: '.$msg, OC_Log::DEBUG);
+}
+
+// foreach ($_SERVER as $key=>$element) {
+// 	debug('$_SERVER: '.$key.'=>'.$element);
+// }
+// foreach ($_GET as $key=>$element) {
+// 	debug('_GET: '.$key.'=>'.$element);
+// }
+// foreach ($_POST as $key=>$element) {
+// 	debug('_POST: '.$key.'=>'.$element);
+// }
+// foreach ($_FILES as $key=>$element) {
+// 	debug('_FILES: '.$key.'=>'.$element);
+// }
+
+// If it is a Drag'n'Drop transfer it's handled here.
+$fn = (isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : false);
+if ($fn) {
+	// AJAX call
+	if (!isset($_GET['id'])) {
+		OC_Log::write('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OC_Log::DEBUG);
+		OC_JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' )));
+		exit();
+	}
+	$id = $_GET['id'];
+	$tmpfname = tempnam('/tmp', 'occOrig');
+	file_put_contents($tmpfname, file_get_contents('php://input'));
+	debug($tmpfname.' uploaded');
+	$image = new OC_Image();
+	if($image->loadFromFile($tmpfname)) {
+		if($image->width() > 400 || $image->height() > 400) {
+			$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
+		}
+		if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
+			debug('Couldn\'t save correct image orientation: '.$tmpfname);
+		}
+		if($image->save($tmpfname)) {
+			OC_JSON::success(array('data' => array('mime'=>$_SERVER['CONTENT_TYPE'], 'name'=>$fn, 'id'=>$id, 'tmp'=>$tmpfname)));
+			exit();
+		} else {
+			bailOut('Couldn\'t save temporary image: '.$tmpfname);
+		}
+	} else {
+		bailOut('Couldn\'t load temporary image: '.$file['tmp_name']);
+	}
+}
+
+
+if (!isset($_POST['id'])) {
+	OC_Log::write('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OC_Log::DEBUG);
+	OC_JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' )));
+	exit();
+}
+if (!isset($_FILES['imagefile'])) {
+	OC_Log::write('contacts','ajax/uploadphoto.php: No file was uploaded. Unknown error.', OC_Log::DEBUG);
+	OC_JSON::error(array('data' => array( 'message' => 'No file was uploaded. Unknown error' )));
+	exit();
+}
+$error = $_FILES['imagefile']['error'];
+if($error !== UPLOAD_ERR_OK) {
+	$l=new OC_L10N('contacts');
+	$errors = array(
+		0=>$l->t("There is no error, the file uploaded with success"),
+		1=>$l->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'),
+		2=>$l->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
+		3=>$l->t("The uploaded file was only partially uploaded"),
+		4=>$l->t("No file was uploaded"),
+		6=>$l->t("Missing a temporary folder")
+	);
+	bailOut($errors[$error]);
+}
+$file=$_FILES['imagefile'];
+
+$tmpfname = tempnam("/tmp", "occOrig");
+if(file_exists($file['tmp_name'])) {
+	$image = new OC_Image();
+	if($image->loadFromFile($file['tmp_name'])) {
+		if($image->width() > 400 || $image->height() > 400) {
+			$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
+		}
+		if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
+			debug('Couldn\'t save correct image orientation: '.$tmpfname);
+		}
+		if($image->save($tmpfname)) {
+			OC_JSON::success(array('data' => array('mime'=>$file['type'],'size'=>$file['size'],'name'=>$file['name'], 'id'=>$_POST['id'], 'tmp'=>$tmpfname)));
+			exit();
+		} else {
+			bailOut('Couldn\'t save temporary image: '.$tmpfname);
+		}
+	} else {
+		bailOut('Couldn\'t load temporary image: '.$file['tmp_name']);
+	}
+} else {
+	bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');
+}
+
+?>
diff --git a/apps/contacts/contacts.php b/apps/contacts/contacts.php
new file mode 100644
index 00000000000..fded839fed8
--- /dev/null
+++ b/apps/contacts/contacts.php
@@ -0,0 +1,60 @@
+<?php
+require_once('../../lib/base.php');
+
+// Check if we are a user
+OC_Util::checkLoggedIn();
+// Get active address books. This creates a default one if none exists.
+$ids = OC_Contacts_Addressbook::activeIds(OC_User::getUser());
+$contacts = OC_Contacts_VCard::all($ids);
+
+$addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());
+
+// Load the files we need
+OC_App::setActiveNavigationEntry( 'contacts_index' );
+
+// Load a specific user?
+$id = isset( $_GET['id'] ) ? $_GET['id'] : null;
+$details = array();
+
+// FIXME: This cannot work..?
+if(is_null($id) && count($contacts) > 0) {
+	$id = $contacts[0]['id'];
+}
+if(!is_null($id)) {
+	$vcard = OC_Contacts_App::getContactVCard($id);
+	$details = OC_Contacts_VCard::structureContact($vcard);
+}
+$property_types = OC_Contacts_App::getAddPropertyOptions();
+$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
+
+$upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
+$post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
+$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
+
+$freeSpace=OC_Filesystem::free_space('/');
+$freeSpace=max($freeSpace,0);
+$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
+
+OC_Util::addScript('','jquery.multiselect');
+//OC_Util::addScript('contacts','interface');
+OC_Util::addScript('contacts','contacts');
+OC_Util::addScript('contacts','jquery.inview');
+OC_Util::addScript('contacts','jquery.Jcrop');
+OC_Util::addScript('contacts','jquery.jec-1.3.3');
+OC_Util::addStyle('','jquery.multiselect');
+//OC_Util::addStyle('contacts','styles');
+OC_Util::addStyle('contacts','jquery.Jcrop');
+OC_Util::addStyle('contacts','contacts');
+
+$tmpl = new OC_Template( "contacts", "index2", "user" );
+$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign('uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
+$tmpl->assign('property_types',$property_types);
+$tmpl->assign('phone_types',$phone_types);
+$tmpl->assign('addressbooks', $addressbooks);
+$tmpl->assign('contacts', $contacts);
+$tmpl->assign('details', $details );
+$tmpl->assign('id',$id);
+$tmpl->printPage();
+
+?>
diff --git a/apps/contacts/css/Jcrop.gif b/apps/contacts/css/Jcrop.gif
new file mode 100644
index 0000000000000000000000000000000000000000..72ea7ccb5321d5384d70437cfaac73011237901e
GIT binary patch
literal 329
zcmZ?wbhEHb<Y3@nn8?7eYSpU$|Nk?9f#QE|Ki808XU70nBRvCVMxdbLPZmxtAgu#Z
z0Mf$1#5;wRb9wgJ5Fhr7kxzB7so-zXTQDQ*d0g~`g(u!D-HO!|ewLP`>9b#5NV>2k
zBC~b@b~P=nNfWAe-b%_i6tS^-1y(h@EsB~1TqDA_h@fkxG$bHgvj}VxE1JLgr!*!^
ILUxTc0Q$^Q5C8xG

literal 0
HcmV?d00001

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
new file mode 100644
index 00000000000..a48533f85a0
--- /dev/null
+++ b/apps/contacts/css/contacts.css
@@ -0,0 +1,213 @@
+/*dl > dt {
+	font-weight: bold;
+}*/
+
+#contacts { padding-left:2px; padding-top: 5px; background: #fff; }
+#leftcontent a { height: 23px; display: block; margin: 0 0 0 0; padding: 0 0 0 25px; }
+#chooseaddressbook {margin-right: 170px; float: right;}
+#contacts_deletecard {position:absolute;top:15px;right:25px;}
+#contacts_downloadcard {position:absolute;top:15px;right:50px;}
+#contacts_propertymenu_button { position:absolute;top:15px;right:150px; height: 20px; width: 150px; background:url('../../../core/img/actions/add.svg') no-repeat center;	 }
+#contacts_propertymenu { position:absolute;top:35px;right:150px; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; }
+#contacts_propertymenu li { display: block; font-weight: bold; border-left: thin solid #1d2d44;  border-right: thin solid #1d2d44; height: 20px; width: 100px; }
+#contacts_propertymenu li:first-child { border-top: thin solid #1d2d44; -moz-border-radius-topleft:0.5em; -webkit-border-top-left-radius:0.5em; border-top-left-radius:0.5em; -moz-border-radius-topright:0.5em; -webkit-border-top-right-radius:0.5em; border-top-right-radius:0.5em; }
+#contacts_propertymenu li:last-child { border-bottom: thin solid #1d2d44; -moz-border-radius-bottomleft:0.5em; -webkit-border-bottom-left-radius:0.5em; border-bottom-left-radius:0.5em; -moz-border-radius-bottomright:0.5em; -webkit-border-bottom-right-radius:0.5em; border-bottom-right-radius:0.5em; }
+#contacts_propertymenu li a { padding: 3px; display: block }
+#contacts_propertymenu li:hover { background-color: #1d2d44; }
+#contacts_propertymenu li a:hover { color: #fff }
+#actionbar { height: 30px; width: 200px; position: fixed; right: 0px; top: 75px; margin: 0 0 0 0; padding: 0 0 0 0;}
+#card { /*max-width: 70em;*/ border: thin solid lightgray; display: block; }
+#firstrun { /*border: thin solid lightgray;*/ width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777;}
+#firstrun #selections { /*border: thin solid lightgray;*/ font-size:0.8em;  width: 100%; margin: 2em auto auto auto; clear: both; }
+
+#card input[type="text"],input[type="email"],input[type="tel"],input[type="date"], select { background-color: #f8f8f8; border: 0 !important; -webkit-appearance:none !important; -moz-appearance:none  !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; float: left; }
+#card input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,input[type="email"]:hover,input[type="tel"]:hover,input[type="date"]:hover,input[type="date"],input[type="date"]:hover,input[type="date"]:active,input[type="date"]:active,input[type="date"]:active,input[type="email"]:active,input[type="tel"]:active, select:hover, select:focus, select:active { border: 0 !important; -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; float: left; }
+input[type="text"]:invalid,input[type="email"]:invalid,input[type="tel"]:invalid,input[type="date"]:invalid { background-color: #ffc0c0 !important; }
+/*input[type="text"]:valid,input[type="email"]:valid,input[type="tel"]:valid,input[type="date"]:valid { background-color: #b1d28f !important; }*/
+dl.form
+{
+	width: 100%;
+	float: left;
+	clear: right;
+	margin: 0;
+	padding: 0;
+}
+
+.form dt
+{
+	display: table-cell;
+	clear: left;
+	float: left;
+	width: 7em;
+	/*overflow: hidden;*/
+	margin: 0;
+	padding: 0.8em 0.5em 0 0;
+	font-weight: bold;
+	text-align:right;
+	text-overflow:ellipsis;
+	o-text-overflow: ellipsis;
+	vertical-align: text-bottom;
+	/*
+	white-space: pre-wrap;
+	white-space: -moz-pre-wrap !important;
+	white-space: -pre-wrap;
+	white-space: -o-pre-wrap;*/
+}
+
+.form dd
+{
+	display: table-cell;
+	clear: right;
+	float: left;
+	margin: 0;
+	padding: 0px;
+	white-space: nowrap;
+	vertical-align: text-bottom;
+	/*min-width: 20em;*/
+	/*background-color: yellow;*/
+}
+
+.loading { background: url('../../../core/img/loading.gif') no-repeat center !important;}
+
+/*.add { cursor: pointer;  width: 25px; height: 25px; margin: 0px; float: right; position:relative; content: "\+"; font-weight: bold; color: #666; font-size: large; bottom: 0px; right: 0px; clear: both; text-align: center; vertical-align: bottom; display: none; }*/
+
+.listactions { height: 1em; width:60px; float: left; clear: right; }
+.add,.edit,.delete,.mail, .globe { cursor: pointer; width: 20px; height: 20px; margin: 0; float: left; position:relative; display: none; }
+.add { background:url('../../../core/img/actions/add.svg') no-repeat center; clear: both; }
+.delete { background:url('../../../core/img/actions/delete.svg') no-repeat center; }
+.edit { background:url('../../../core/img/actions/rename.svg') no-repeat center; }
+.mail { background:url('../../../core/img/actions/mail.svg') no-repeat center; }
+.globe { background:url('../img/globe.svg') no-repeat center; }
+
+#messagebox_msg { font-weight: bold; font-size: 1.2em; }
+
+/* Name editor */
+#edit_name_dialog {
+	/*width: 25em;*/
+	padding:0;
+}
+#edit_name_dialog > input {
+	width: 15em;
+}
+/* Address editor */
+#edit_address_dialog {
+	/*width: 30em;*/
+}
+#edit_address_dialog > input {
+	width: 15em;
+}
+#edit_photo_dialog_img {
+	display: block;
+	width: 150;
+	height: 200;
+	border: thin solid black;
+}
+#fn {
+	float: left;
+}
+.jecEditableOption {
+	margin: 2px;
+	border-radius: 0.5em;
+	border: thin solid #bbb;
+	content: 'Custom';
+}
+/**
+ * Create classes form, floateven and floatodd which flows left and right respectively.
+ */
+.contactsection { 
+	float: left; 
+	min-width: 30em;
+	max-width: 40em;
+	margin: 0.5em;
+	border: thin solid lightgray;
+	-webkit-border-radius: 0.5em;
+	-moz-border-radius: 0.5em;
+	border-radius: 0.5em;
+	background-color: #f8f8f8;
+}
+
+.contactpart legend {
+	/*background: #fff;
+	font-weight: bold;
+	left: 1em;
+	border: thin solid gray;
+	-webkit-border-radius: 0.5em;
+	-moz-border-radius: 0.5em;
+	border-radius: 0.5em;
+	padding: 3px;*/
+width:auto; padding:.3em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
+}
+/*#contacts_details_photo { 
+	cursor: pointer; 
+	z-index:1; 
+	margin: auto;
+}
+*/
+#cropbox { 
+	margin: auto;
+}
+
+/* Photo editor */
+/*#contacts_details_photo_wrapper {
+	z-index: 1000;
+}*/
+#contacts_details_photo {
+	border-radius: 0.5em;
+	border: thin solid #bbb;
+	padding: 0.5em;
+	margin: 1em 1em 1em 7em;
+	cursor: pointer;
+	/*background: #f8f8f8;*/
+	background: url(../../../core/img/loading.gif) no-repeat center center;
+	clear: right;
+}
+#contacts_details_photo:hover {
+	background: #fff;
+}
+#contacts_details_photo_progress {
+	margin: 0.3em 0.3em 0.3em 7em;
+	clear: left;
+}
+/* Address editor */
+#addressdisplay { padding: 0.5em; }
+dl.addresscard { background-color: #fff; float: left; width: 45%; margin: 0 0.3em 0.3em 0.3em; padding: 0; border: thin solid lightgray; }
+dl.addresscard dd {}
+dl.addresscard dt { padding: 0.3em; border-bottom: thin solid lightgray; font-weight: bold; clear: both;}
+dl.addresscard dd > ul { margin: 0.3em; padding: 0.3em; }
+#adr_type {} /* Select */
+#adr_pobox {}
+#adr_extended {}
+#adr_street {}
+#adr_city {}
+#adr_region {}
+#adr_zipcode {}
+#adr_country {}
+
+.delimiter {
+	height: 10px;
+	clear: both;
+}
+.updatebar {
+	height: 30px;
+	clear: both;
+	padding-right: 170px;
+	border: thin solid lightgray;
+}
+.updatebar button {
+	float: left; margin: 1em;
+}
+
+/*input[type="text"] { float: left; max-width: 15em; }
+input[type="radio"] { float: left; -khtml-appearance: none; width: 20px; height: 20px; vertical-align: middle; }*/
+#file_upload_target, #crop_target { display:none; }
+
+#file_upload_start { opacity:0; filter:alpha(opacity=0); z-index:1; position:absolute; left:0; top:0; cursor:pointer; width:0; height:0;}
+input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
+.propertycontainer dd { float: left; width: 25em; }
+.propertylist { clear: none; max-width: 28em; }
+.propertylist li { /*background-color: cyan; */ min-width: 25em; /*max-width: 30em;*/ display: block; clear: right; }
+.propertylist li > input[type="text"],input[type="email"],input[type="tel"] { float: left; max-width: 15em; }
+.propertylist li > input[type="checkbox"],input[type="radio"] { float: left; clear: left; width: 20px; height: 20px; vertical-align: middle; }
+.propertylist li > select { float: left; max-width: 8em; }
+.typelist { float: left; max-width: 10em; } /* for multiselect */
+.addresslist { clear: both; }
\ No newline at end of file
diff --git a/apps/contacts/css/jquery.Jcrop.css b/apps/contacts/css/jquery.Jcrop.css
new file mode 100644
index 00000000000..554f013fd77
--- /dev/null
+++ b/apps/contacts/css/jquery.Jcrop.css
@@ -0,0 +1,84 @@
+/* jquery.Jcrop.css
+   The code contained in this file is free software under MIT License
+   Copyright (c)2008-2011 Tapmodo Interactive LLC
+*/
+
+/*
+  The outer-most container in a typical Jcrop instance
+  If you are having difficulty with formatting related to styles
+  on a parent element, place any fixes here or in a like selector
+*/
+.jcrop-holder {
+  direction: ltr;
+  text-align: left;
+}
+
+.jcrop-vline, .jcrop-hline {
+	background: white url('Jcrop.gif') top left repeat;
+	font-size: 0px;
+	position: absolute;
+}
+
+.jcrop-vline {
+  height: 100%;
+  width: 1px !important;
+}
+
+.jcrop-hline {
+  width: 100%;
+  height: 1px !important;
+}
+
+.jcrop-vline.right {
+  right: 0px;
+}
+
+.jcrop-hline.bottom {
+  bottom: 0px;
+}
+
+.jcrop-handle {
+	background-color: #333;
+	border: 1px #eee solid;
+	font-size: 1px;
+}
+
+.jcrop-tracker {
+  height: 100%; 
+  -webkit-tap-highlight-color: transparent; /* "turn off" link highlight */
+  -webkit-touch-callout: none;              /* disable callout, image save panel */
+  -webkit-user-select: none;                /* disable cut copy paste */
+  width: 100%;
+}
+
+/*
+*/
+
+.jcrop-light .jcrop-vline, .jcrop-light .jcrop-hline {
+	background: white;
+  filter: Alpha(opacity=70) !important;
+  opacity: .70 !important;
+}
+
+.jcrop-light .jcrop-handle {
+	background-color: black;
+	border-color: white;
+  border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+.jcrop-dark .jcrop-vline, .jcrop-dark .jcrop-hline {
+	background: black;
+  filter: Alpha(opacity=70) !important;
+  opacity: 0.70 !important;
+}
+
+.jcrop-dark .jcrop-handle {
+	background-color: white;
+	border-color: black;
+  border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
diff --git a/apps/contacts/dynphoto.php b/apps/contacts/dynphoto.php
new file mode 100644
index 00000000000..8025f559c37
--- /dev/null
+++ b/apps/contacts/dynphoto.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * ownCloud - Image generator for contacts.
+ *
+ * @author Thomas Tanghus
+ * @copyright 2011 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../lib/base.php');
+$tmp_path = $_GET['tmp_path'];
+$maxsize = isset($_GET['maxsize']) ? $_GET['maxsize'] : -1;
+header("Cache-Control: no-cache, no-store, must-revalidate");
+
+OC_Log::write('contacts','dynphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OC_Log::DEBUG);
+
+$image = new OC_Image($tmp_path);
+if($maxsize != -1) {
+	$image->resize($maxsize);
+}
+$image();
diff --git a/apps/contacts/img/globe.svg b/apps/contacts/img/globe.svg
new file mode 100644
index 00000000000..4e43cfba10a
--- /dev/null
+++ b/apps/contacts/img/globe.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="16"
+   height="16"
+   id="svg2485">
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient3707-319-631">
+      <stop
+         id="stop4637"
+         style="stop-color:#254b6d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4639"
+         style="stop-color:#415b73;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop4641"
+         style="stop-color:#6195b5;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="20"
+       y1="43"
+       x2="20"
+       y2="2.6887112"
+       id="linearGradient2483"
+       xlink:href="#linearGradient3707-319-631"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3769285,0,0,0.3769199,-1.196178,-0.8960149)" />
+    <linearGradient
+       id="linearGradient2867-449-88-871-390-598-476-591-434-148">
+      <stop
+         id="stop4627"
+         style="stop-color:#51cfee;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4629"
+         style="stop-color:#49a3d2;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop4631"
+         style="stop-color:#3470b4;stop-opacity:1"
+         offset="0.704952" />
+      <stop
+         id="stop4633"
+         style="stop-color:#273567;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="61.240059"
+       cy="-8.7256308"
+       r="9.7552834"
+       fx="61.240059"
+       fy="-8.7256308"
+       id="radialGradient2481"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1.3551574,-1.3551567,0,-3.824604,-80.384092)" />
+    <linearGradient
+       id="linearGradient4873">
+      <stop
+         id="stop4875"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4877"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="63.397362"
+       y1="-12.489107"
+       x2="63.397362"
+       y2="5.4675598"
+       id="linearGradient2464"
+       xlink:href="#linearGradient4873"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7432394,0,0,0.7432224,-38.229789,10.609333)" />
+  </defs>
+  <g
+     id="layer1">
+    <path
+       d="M 15.5,7.999735 C 15.5,12.142003 12.141888,15.5 8.000094,15.5 C 3.857922,15.5 0.5,12.141965 0.5,7.999735 C 0.5,3.8576552 3.857922,0.4999997 8.000094,0.4999997 C 12.141888,0.4999997 15.5,3.8576552 15.5,7.999735 L 15.5,7.999735 z"
+       id="path6495"
+       style="fill:url(#radialGradient2481);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2483);stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       d="M 8.1022062,0.95621712 L 7.236144,1.0568701 L 6.2834735,1.3210847 C 6.3646244,1.2921995 6.446834,1.2606694 6.5309208,1.2330132 L 6.4195696,1.0317069 L 6.048401,1.0946151 L 5.8628152,1.2707582 L 5.5782512,1.3085031 L 5.318433,1.4343196 L 5.1947098,1.4972277 L 5.157592,1.5475543 L 4.9720082,1.5852992 L 4.8606579,1.8243504 L 4.712189,1.522391 L 4.6626994,1.6482076 L 4.6874462,1.9879118 L 4.4523728,2.1892181 L 4.3162766,2.5540857 L 4.6008407,2.5540857 L 4.712191,2.3150345 L 4.7493088,2.2269631 C 4.8744282,2.136984 4.9930427,2.0367771 5.1204782,1.9501669 L 5.4174142,2.05082 C 5.6107409,2.1843878 5.8054259,2.3200676 5.9989133,2.4534326 L 6.2834735,2.1892181 L 5.9617936,2.05082 L 5.8133266,1.7488605 L 5.2689442,1.6859524 L 5.2565714,1.6230443 L 5.4916438,1.6733709 L 5.6277409,1.5349726 L 5.9246759,1.4720643 C 5.9949454,1.4373108 6.06407,1.4122795 6.1350055,1.3839929 L 5.9494207,1.560136 L 6.6175262,2.0256568 L 6.6175262,2.302453 L 6.357707,2.5666673 L 6.7041325,3.2712399 L 6.9392071,3.1328408 L 7.2361431,2.6673207 C 7.6536127,2.5360677 8.0298636,2.383337 8.423888,2.2017997 L 8.3991411,2.3779426 L 8.5970969,2.5163408 L 8.9435226,2.2772895 L 8.7703107,2.0759833 L 8.5352353,2.2143814 L 8.4610018,2.1892185 C 8.4780536,2.1812953 8.4933662,2.1721092 8.5104914,2.1640557 L 8.8569181,1.2581766 L 8.1022062,0.95621712 z M 4.712189,2.3150345 L 4.9967521,2.5163408 L 5.2318265,2.5163408 L 5.2318265,2.2772895 L 4.9472634,2.1514733 L 4.712189,2.3150345 L 4.712189,2.3150345 z M 11.281895,2.1514733 L 10.774628,2.2772895 L 10.452951,2.4911776 L 10.452951,2.6799019 L 9.9456829,3.0070243 L 10.044661,3.4977095 L 10.341597,3.2838208 L 10.527183,3.4977095 L 10.737514,3.6235259 L 10.873608,3.2586575 L 10.799375,3.0447699 L 10.873608,2.8937896 L 11.170544,2.6169941 L 11.30664,2.6169941 L 11.170544,2.9189543 L 11.170544,3.1957496 C 11.292932,3.1618717 11.416467,3.1486778 11.541713,3.1328408 L 11.195288,3.3844746 L 11.170543,3.5354537 L 10.774628,3.8751588 L 10.366341,3.7745049 L 10.366341,3.5354537 L 10.180756,3.6612703 L 10.267364,3.8751588 L 9.9704267,3.8751588 L 9.8095868,4.1519548 L 9.61163,4.3784244 L 9.2528324,4.4539139 L 9.463162,4.6678019 L 9.5126507,4.88169 L 9.2528324,4.88169 L 8.9064068,5.0704143 L 8.9064068,5.6240059 L 9.0672458,5.6240059 L 9.2157146,5.7875676 L 9.5497684,5.6240059 L 9.6734907,5.2843013 L 9.920937,5.1333218 L 9.9704267,5.0075057 L 10.366341,4.9068526 L 10.589042,5.1584854 L 10.824117,5.2843013 L 10.688021,5.5610979 L 10.898351,5.49819 L 11.009701,5.2213934 L 10.737512,4.9068526 L 10.848862,4.9068526 L 11.121054,5.1333218 L 11.170543,5.4352821 L 11.405615,5.7120781 L 11.467479,5.3094657 L 11.591202,5.2465566 C 11.722897,5.3855865 11.826706,5.5556097 11.937626,5.7120781 L 12.345913,5.7372433 L 12.580987,5.8882234 L 12.469637,6.0517841 L 12.234564,6.2656727 L 11.888135,6.2656727 L 11.430361,6.1146942 L 11.195287,6.1398593 L 11.022074,6.3411657 L 10.527181,5.8378996 L 10.180756,5.7372462 L 9.6734907,5.8001547 L 9.2280866,5.9259711 C 8.974001,6.2188978 8.7138634,6.5150518 8.4733747,6.8192683 L 8.1888107,7.5238405 L 8.3249076,7.6748196 L 8.0774604,8.0396877 L 8.3496515,8.6813514 C 8.5761437,8.9418962 8.8039678,9.2006825 9.030129,9.461412 L 9.3641827,9.1720348 L 9.5002778,9.3481795 L 9.8590764,9.1091277 L 9.9827973,9.2475248 L 10.341595,9.2475248 L 10.551927,9.4865757 L 10.428203,9.914352 L 10.675649,10.203731 L 10.663275,10.706995 L 10.848861,11.071864 L 10.712766,11.386405 C 10.699498,11.611997 10.68802,11.827605 10.68802,12.053231 C 10.79718,12.358902 10.906621,12.663823 11.0097,12.971693 L 11.083934,13.462375 L 11.083934,13.714009 L 11.281891,13.714009 L 11.566453,13.525283 L 11.91288,13.525283 L 12.432517,12.933947 L 12.370656,12.732639 L 12.717083,12.418101 L 12.457262,12.128722 L 12.76657,11.877089 L 13.063506,11.688364 L 13.199602,11.537384 L 13.112995,11.19768 C 13.112995,10.911684 13.112996,10.628161 13.112995,10.342127 L 13.348069,9.8136993 L 13.645006,9.4865757 L 13.966685,8.6813514 L 13.966685,8.467463 C 13.806607,8.4879689 13.653171,8.506459 13.496537,8.5177905 L 13.818218,8.1906678 L 14.263621,7.8887078 L 14.498696,7.6119125 L 14.498696,7.3099534 C 14.445379,7.2077028 14.391536,7.0976601 14.337854,6.9954116 L 14.127525,7.2470431 L 13.966685,7.0583197 L 13.731609,6.8695964 L 13.731609,6.4795648 L 14.003802,6.7941047 L 14.313111,6.75636 C 14.452648,6.8851798 14.586636,6.9997236 14.709024,7.1463926 L 14.906986,6.9199159 C 14.906986,6.6761022 14.63695,5.4724677 14.053296,4.4539139 C 13.46964,3.4356954 12.444894,2.5037591 12.444895,2.5037591 L 12.370661,2.6421572 L 12.098469,2.9441167 L 11.752043,2.579249 L 12.098469,2.579249 L 12.259308,2.4031061 L 11.615949,2.2772895 L 11.281895,2.1514733 z M 3.8461259,2.3150345 L 3.7224027,2.6421572 C 3.7224027,2.6421572 3.5057941,2.6785236 3.4502116,2.6924839 C 2.7403769,3.3576613 1.3089548,4.8004591 0.97574709,7.5112538 C 0.98894063,7.5741032 1.2108206,7.9390292 1.2108206,7.9390292 L 1.7552039,8.2661509 L 2.2995852,8.417131 L 2.5346596,8.7065091 L 2.8934573,8.9833054 L 3.1037868,8.9455608 L 3.2522558,9.0210508 L 3.2522558,9.0713763 L 3.0542972,9.6375498 L 2.8934573,9.8766016 L 2.942946,9.9898366 L 2.8192238,10.442776 L 3.2769996,11.298327 L 3.7471476,11.713522 L 3.957476,12.015482 L 3.9327303,12.644563 L 4.0811982,12.99685 L 3.9327303,13.67626 C 3.9327303,13.67626 3.9129189,13.670673 3.9327303,13.739167 C 3.9527179,13.807695 4.759781,14.268689 4.8111654,14.22985 C 4.8623746,14.190288 4.9101447,14.154361 4.9101447,14.154361 L 4.860656,14.00338 L 5.0709847,13.802075 L 5.1452191,13.588188 L 5.4792709,13.474953 L 5.7390901,12.820706 L 5.6648567,12.644563 L 5.8380694,12.367767 L 6.2339838,12.279695 L 6.4319415,11.801593 L 6.3824509,11.210255 L 6.6917597,10.769898 L 6.7412484,10.316959 C 6.3168632,10.102948 5.9004921,9.8830534 5.4792709,9.6627135 L 5.2689423,9.2475198 L 4.8853999,9.1594491 L 4.6750703,8.5932746 L 4.1678047,8.6561827 L 3.7224017,8.32906 L 3.2522529,8.7442535 L 3.2522529,8.8071626 C 3.1114329,8.7658292 2.9446126,8.7597462 2.8192238,8.6813464 L 2.7202454,8.3793874 L 2.7202454,8.0522637 L 2.3985655,8.0900083 C 2.4244522,7.8816386 2.4591052,7.6692598 2.485171,7.4609265 L 2.2995852,7.4609265 L 2.1140005,7.6999783 L 1.9407887,7.7880501 L 1.6809694,7.6370692 L 1.6562245,7.3099456 L 1.7057143,6.9576606 L 2.0892557,6.6557005 L 2.3985645,6.6557005 L 2.4604271,6.4795582 L 2.8439686,6.5676288 L 3.1285316,6.932497 L 3.1780203,6.3285781 L 3.672914,5.9133853 L 3.8461259,5.4730269 L 4.2172963,5.3220476 L 4.415253,5.0200879 L 4.8854018,4.9320161 L 5.1204763,4.57973 C 4.8878,4.57973 4.6479303,4.57973 4.415253,4.57973 L 4.8606579,4.3658421 L 5.1699649,4.3658421 L 5.5658793,4.2274443 L 5.6401139,4.6174752 L 5.8133266,4.3406788 L 5.615369,4.2022808 L 5.6648596,4.0387201 L 5.5040187,3.8877395 L 5.3308048,3.8374132 L 5.3802955,3.6486888 L 5.2441994,3.3844746 L 4.9348905,3.5102908 L 4.9843801,3.2712399 L 4.6255827,3.0573516 L 4.3410204,3.5606172 L 4.3657663,3.7367603 L 4.0812032,3.8625768 L 3.9079904,4.2526078 L 3.821384,3.8877395 L 3.3388631,3.6864335 L 3.2522568,3.4096375 L 3.9079904,3.0321885 L 4.1925535,2.755392 L 4.2173002,2.4282694 L 4.0564593,2.3401977 L 3.8461298,2.315035 L 3.8461259,2.3150345 z M 9.1538541,2.9189543 L 9.1538541,3.1202592 L 9.2652062,3.246076 L 9.2652062,3.5480356 L 9.2033438,3.9506479 L 9.5250246,3.8877395 L 9.760098,3.6486888 L 9.5497694,3.4473819 C 9.4815603,3.2626763 9.4124355,3.0961113 9.3270669,2.9189543 L 9.1538541,2.9189543 z M 8.881662,3.3215656 L 8.6837063,3.3844746 L 8.7331959,3.7493421 L 8.9930152,3.6109428 L 8.881662,3.3215656 L 8.881662,3.3215656 z M 12.506754,6.6305386 L 12.803691,6.9828228 L 13.162489,7.7628866 L 13.385189,8.0145183 L 13.273839,8.2787347 L 13.471797,8.5177846 C 13.380952,8.5238987 13.292977,8.5303684 13.199605,8.5303684 C 13.029984,8.1679096 12.895741,7.802374 12.766575,7.4231829 L 12.543871,7.1715503 L 12.420149,6.7186111 L 12.506754,6.6305399 L 12.506754,6.6305386 z"
+       id="path6534"
+       style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <path
+       d="M 14.500001,7.9997709 C 14.500001,11.589737 11.589636,14.5 8.0000818,14.5 C 4.4101984,14.5 1.5000001,11.589705 1.5000001,7.9997709 C 1.5000001,4.4099703 4.4101984,1.5000014 8.0000818,1.5000014 C 11.589636,1.5000014 14.500001,4.4099703 14.500001,7.9997709 L 14.500001,7.9997709 z"
+       id="path2451"
+       style="opacity:0.4;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2464);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/apps/contacts/img/person_large.png b/apps/contacts/img/person_large.png
new file mode 100644
index 0000000000000000000000000000000000000000..f57511e1000690c223bc5de2313ddfface12f29a
GIT binary patch
literal 11517
zcmX|{1yodD)b?Q*B$RMy6zPy|0V$F08bTWB7U>*By1P^91_9}zg&{=#G{OMVARr*E
z@A3QI^|ID**Ua3r@4aWv+535Z=R|3$D-hsQ<6~f85GX0iYJ+1TcunHo1OMHf7mL9G
z`c_6s7Z>~m;95n3_jqoKhHo)2-pT!YVGa&K2*HO`9&!dAI<7Vz-WKlG7~bCA-1aVx
zZ(m!uS#!I(+vfZfr^djb!%&iaq3e@-nCG4NcrI{TO2XIXEhG|Y!k~#^uLVo^t<+eN
zVr7WKz#Br<TbrWpZM~YunPge-*%;V(@S2o)>DN@_M2Ub?+5m1c67t!71mD&uwOTrn
z6z>t#t6|>6e8VY!J}`K!+eX7RVopHfxd7@;&r>a8u5R@#U^~O~@@aNy1HNOf$eVTc
zLY&V~1KU$PH%!WwtAo{s*TWpBrC-+}jmpSYxAlQ27W5p#BxcF4pz;aCkD|3_37iqD
zaXu@t@*67tW_`d5-)e~<00US5GRY8qgVZYY9*(DR)xGo;ifiS<)Bx8IIKDx4R4u1w
zg!~0<<F_l9<15k53P=)G^#kZ1;?Jdv&U|ab$ZfBK`8U;z1cvIJ&bU6emnUW=(w%0t
zUPi{p3CQi*j-TzW`W^JB5Hbzq#&ALp?Ik0+f5s(7;a1{!VIO>5Q29Mk*>Vtee0j2g
zf4mwZg#npyRvXcL`swfeITP>i(YHl<OqdC@QY-k6A-{DyxFpwb-HzM$YgP0*=!0Gl
zK0Kapc&(2)2{F2>6rhfSB@9Q&e~@K(SUgqUjrnofJ`iQa4-Vwy<cej}K|+{l!FuoQ
zi98PW@~&cBpM&{^K%^NY%6$*-Ug)RR*6D=>C4GI0sP~?p(Zv|%7lhl}+f+0()=o~b
zQBiomt^!2IA(=Rm4R5z6TvLs-YRu(`|6L#dm>Hc?GW!re%%CSo!o<V`gd%xx@6M4f
zadJB=Gt=C|BekfA-o4FObmk84xFYYl_v~E)MWq*3K;O$$#coYDSq%*$2?>e!{T3#b
zS8?XNing|_d3kwG-`msv{0X|gxlv(WXAKc_E9j{)4*IVPdT@An$A#uFJraQNz@l_x
zeZ0O3#;LOCa6kNusx|5OvwYOT#k!Y`=<4d4!<xj*KeGlG$a&_<0*fNX<<xjT^i$$K
zL%!(Sa1gz2W-BDe`*88xvhA>nd@uc9qaJ7g4iTXO8|ix9Q2?vsY&AVGZYtOLt)F*x
zX^}lOBO_zy^<I@}$(s0akx7Tw-It6ZPJzATe@$}`!I0U}mFeZ>F}S{o+{>4tpF$gQ
zkK_~GTwLPyO?|_5ckOvv&7dnij&rq5WDcf-n%+=xzcV|=V@C6i1Bpk^T&$K_oXI@-
zJNuNFx7|h6^TY<PPPe;sukIbIba)@-pMMBMh4~#6UvobB((1Xd*W$WrD)b9)#AfB7
zkPW{`GxBh$waK%p%;4G!|ERQ9Qy+G`GxZ?{F&9#<dZohCrJE5DBt0#t3!i!Rg2h7P
z9t6|O85JNoS)o%#NlBU5B}8D{;D7P6U2E{1947#(^sC0ODICSqldD<YS(l00{9@B&
z)nxeVs#BeCgLW=}oALoHN)|Vw9}K%W+j+bYbKWnT8D{EYc{Wy7vZZZW_(wZ>S$)lj
z_9TQt{NpP+?7BI!nwlEp!1Ec|4^zo~oRyWy>SZG~P34vNA|w;LI$ET~Q+7$G8=HAC
zyyF_d*E-2cyA8Osi%qtZ-X*l!a{pmtCOj5}74lkMO1M~)L_z0_-x5U0_PzDauB^1;
zr{d3wC0)y{HB5^e-e7{^%}Iq_J)07Y3k$;zy4|1^kdop#g$La;2H~E-OWlODc+|fP
zC(_X(Tb!37hd1&^GDfU2b8;9{MleVh-dL{Q?qX+`@<~Ze&d+BuN98^yrI%}UUShfV
ze4*)ME0mDUicVrwC`M9Pje?<<-qIrcuD9@0_OxJ}E_(@4UL!;P1FMk=dujmz0j87@
z28AJlUh~A+S-siXG{V3ji<9p&f)4qJ?9xEp=}*mGYY#rKw%bpaG9=6$4#VMT;HKT%
z9!D1&B!5xAZhJUU6TqHk84$4CGS|QNJY0re*m+Twj@T`LB4+88+O*`}nTsQ)kcKo`
zI7{aH_wOyg)5spe;mm2uyYcU&MIC1ElgiN-ObUpKR`}1kypfU90uSur?TwO@-}??H
z5mG}^m<8}bmeG3LPZFBmY{<_gMx5Y~x8zGd)t)3uuB;sW@#A9^HTfaoy-=s+&q+Sw
z+&XszF-P?_TGP;v^{Vn!Mn#_cvq}UNu(|2oPftu6bh=D6f8MnjyC_8tsxz=h%ZNO-
z`QGly4{z1>i4cm(W+^PSZ&jKX^YHLcJokzW(kt@fD6vtg(DzwGKV~KU?V_L%5la(U
zYA;k1?wF3?={%O9{5(}-{PwNDiO*v>t&jg@F6`8O%s%%!Iyg8;_GQ#d*3=@kY@i$;
zALpN0`FzRk2oq9~M(c+Nx5|K&BKO@{T|PiK2fMudi~|S!uFs!W9X-D*8XykF`=sTQ
zAr$qB1s!39@2k}#)Bd0PQ3CG$h2EW5aC=|$Zs?^J_3-}V#1vBN_;0-1-ob%^JVq(Z
zv|2akWV(oEGaw@Qr%H*ooaekK<CI-$X(<cU^W$&HJ+fh1O;D)tXEI`%TlGC<V-oGb
zpEyD!joI4T1FY7$N#Wu5ve->lt(!IHps9JfAMLYO4z0bv6Q#a1-RNpFp74ToEKns;
z{TyV+RC#9$SyUp}NU$#{j-4C5;>7m4h?Z{CAsS)F<apm7LDcGyo$l7;eDH2^i&j-W
zkE?ah(?9;ran+UNYk$V1$XJ3*k$}s3N9i8wawQ1ERRTdozu#~tO?BiB3ufHSCah7{
z-kyR;Q06RJv6!XA{5wpuoVFGF9frb<#`3;=_ognYcwEm}AfE)98f!nxgz4z19_fKV
z;l9o63s_P4QUd#?N$w?FFmoya{ZGZOEKObwra3J*H$v2BB<S~kYhQ2JOZdb0hCG_B
z&FTHXEiW<Oqc&spjCAf}!Rf#@%@inf$Qqw2LKiR13OkE-dN12dyFS%F_qru+TkfJ5
z>fr7<)6P<u*~}utrzhWzsQ&m#%q&{XfZJ-ZqOvl>(@GC-2U8nLifPo*i>>#OV~$Yp
zCrWWzTk0^E<Lz^CVmIv;w0kiNUb+1uX;{hd<FXcO{wxO9sS&!?#yYE+Hx<GbqKQ<d
zEKG$zP93x%vsRQgM=M>_ylZ+BPKb`dtFg_4i3|qpJ2$=90-FkFr;HPWZ}-N2e(%tC
zkU4Sxz`~4X7z*JogKTZ`TQL_t$o-g4@huIX1J6!U4-WTQJIziF(!7CsyibF^FOf}+
zOA~#lY|}&f)DDNW1OC|GO-2vT0P+#nju~?~k_l^JzL0`wVOLa7J#viJG7UlYuGGF3
zDp+M+pY9c;Bz@ZO;Hvs(8hxp%xkSMvN{n7;7xN_nNg_;_cm9GUv#zbT3i_$4NB8Mx
z2P{3>Z|w8&9z&-g(#VtHMn*+ZSxz|qs24}=A|fq}1M~FiHkpj@;0qgxepA)(;XF~!
zSD$fl)Fh$a>gqim{;<lBY-TW1ZLLPf$HodPD>ubWpDlf@%w1~UtjDVv5_v^q%TKi+
zQg}w)gNn;$rgKv+{o2<DS#Z*$&2~``YYnNAPu+{1KSaU4&Ff{^Ds$`MB_B0XmyhHV
zBaB?T&c)H$?sRF&N#i!>`Iw9Yq93$)nha;wJPtmYMf(ZYx!RqN8FT9k22NvFK{+4(
zUDuQTu|rnRm|`$!dQaU-Fr%Tv#(Sbt@>J+lmZM5|(_Pf?#uZb9Ri~c1+?p)5)ZP{2
z?@)y*dm8(z>4lNdv%Sd7qgFBfy>6W@{w*2doSAK+4z!tT$Dy#RnI9F%WwJ7!<(03j
z?q>xPH_@<RQ9b$^Fu~L8WW2Pf1hH*0T!=jostPLljdvNYT9lPVWwiZTl(}$P$S~(C
z=iNa*k9&rq^d61g{bqG(dkv8c)b5D@tHwNm7xX+dl7IVv+~8S(k%2+toj{E;QoG20
zu?K@1J)gy)*G932;vzRt7a7_M5EU-E%1y(v<jz2CW)>8fJ%m=<^IZO3ay64?h|E?m
zi#eb#BaTTSO~o5dB}r~rdX_I>tJCP9BbJv=&|6*&t9Q!v;7CMmdZhheA<JD4vH6@d
zwL5RWYOvz;H*3<cS<VLu6Y;z`Y@Pf<T1~zef{;poYNdL70EdhcYwJN4lg35}NpFTq
zwsL>+vCO{dC9=i`6~Y+{VwcS#hiq#Tb#KdcjOOOacY7*acr}mej=d|h53>$nX8rJ2
zu~bt?>l7-h4Z-hVOHvd`=U^tqa&PE$kF?vwG&%%h1t?Oh9FtR6{TBR~#(S9$YV5`V
z>h4E9a_lQNRZ-!>v}>|qJ!@J0qP$9q0-FdFCKcK`>)nj(IEmZCT5U~YP2>n+DpjU=
zxc(!}$3`YiIz4)u<IX42$c&@U8-x`T>kh?FbnEM}ygO1Yyu4a=a8e98hHANa=593y
zU0!1h{^{#`cR=?(Tfaw>6)O9UFc(z(g2@gW7NUEh*TmdZmus<^3F9|wZu94&m6dx7
zsZ5%ugt*nb5PTudjYyzWjg%UfVZ79F?X_kbQ-4Cmk`SI2SS!BUd7((TR`(%#Wfvn}
z%1`4Rj^Wh;3=<0`txb0aTZqV;LHs()oh+zL`N<RFkajvc(gW#d+9lKW$s->*ilAdL
zxhN4P^@+$>EX!{4IC&Zr<s>L&N$O?Rf6V^|Z0C6^W8+uFwbRqV97GBxQ&d?@bPA}0
zoft6>(BPNz>l+dzk+)}M%FhZIvC{T>;$|`*tZ4?ljZ!VDsCde4+F4#liDto;8|64Q
zgNQxkBgF@@Jw5STr8*o=MN4bzpzP;m{jZIbIxbR0n%r$ng)XRCmZ3MCz?JL4k*o|`
z`D+fWRgH)NyNjsXCoYpfSdEM*4Gj-lcdTk7rNCIi{x1&N3CvBnklIaUY-o~l2_+Sk
zg{5VmRx#CN)F&dB->=(XU)kP_&y9If^`MrQb7K!9O6|?MKpSKKcn56Hmq@u=dO9-P
zoUAMhAD?;m`DB{5_g4HFDa?8B?^~}oZmpZHg^sE!M+ajly2@7skL#V*UP+rgbX)BX
zqzD<d9tA?>zyC<Fu&}PHMYFhwap&)asWjY=8)j%qxq9+p+M?6e$_fPBwWitWS!{J(
zE&Sj14-?Szas2}WP~efKDfp6^i>6*AGUuIiUWt(6b18A{Gr?0vm^L;xO#LLc5IENN
z=kWL95jVdNb7ln(pM8QDk9?}HM_yivfc7as+K@qJhA{Y2xiM>Sozwk>{DGfpb6bPx
z=;)X(1{`$<-Z*$c+G#)tjGK!iDSUAjqaX{5kcI}ni2^B}y9Y01Ub{wJwZ}rC(J*{5
zB?&lu#ESm`0m1H%lz~-D4aML#Y8exl+ryswx6&=gx3}UHJf>DYJ_gFgxRe6!=?s`*
z(-wrhOKG&!)W2YE;WGHO2}i3vX4y5(@7tNtf9`IYkTgC9L0&;Y`D<$y;5U@0*wAGA
zWJO#>5;Y)7e|0d5TfrLXd$KOa!phq9aTW5}|L>nW&oV!3QX<Q4mXl|}r_cNm{hyhd
z`HG8*Lez4Er@nn-xO=QN9X(sfXC~0^^zxOG8Y5^-_4x7Gx(9~1CmI>D)U~YXSZ;*J
z<_6v{B3ZkZ1)e=qFf%ioO5pmCEazhSOsJAA`sYbDye^HMJb9ttFBqc^<8LpDpgFRg
zl@1w#h4bfe0(~S%K@+*6{a_xKINOx5j5qxplhq})R-&zI$fasCjz8U=+?Sw9&V;&%
zxuFrPZwzA$9zu-=jv&DtMh4S@Ha0dQZ?{yZAQ|d}c=IHxNcJE*1x~eTk>Ed_-DCAk
zy66ck9707d3*-HA|3_aVUq%qhAxzPXjTdauGDb#^j9Q!wVHa38FCcnRkg#a4_Q}ZJ
z-WT!;3f4GT_{+h^=-&1{m$!Y<40On%ml4?^M_5P6U97~oUuS2Bw#IWLY6`8#rXN1I
zS3<Im5gQlBCn)&CI#L4JO87+Fr!3=<0}Y1~HkKO*V{e{O%%=U_Q<Lu7j~`5dfr0sr
zuE4Yfp2~CsFBu*Y(Up9}bj-)|>_05MTqvo}^=_GWsdj}a&nge)gKxmn1D-Run5JCf
zb2|R4tNI8h%>2~<-&I;H394Xw_R^KCf<i(x3GyEnfO$&4D|*}Z_``<}Y|(u~agPFB
zb+|J&4i=i)x4B~6L~aX?0DK@*kTeKkH!ug#<P{Ta*U`o0w}+Wzfi3X)y)S|lgn$$q
ze$tg#2L|%$%F3UQb#WE+)dqN<BfAYaz1k`($Hu<!q=2#p@&Y~OgGR5zS7y}wyu8S>
zvrnwQ1}*uhsj2S)u%bmFu&mr0orZ|n!BJ#_2?`7Qwew}5_{7D>c6RI*;y#0^L_$Jh
zdXJKrFv2i(MJUGxMO5vB$L0kBeAzzDZ|`Va-~?F!8v0^!aZ%X;aqJ@z>%anfWpR;R
ze4k7WnZ}KI6N>{9?7+qw4YD7nzJN7k<#~=%w?MO0!@IjBHGb%jh5@(sTHHMi;Tg-^
zpZe<6tH?pieD;w|cfX#717dDCT-5(}^;{AB)2C0Q1m<#<&I5i!%B+Rfwt*@tDpLo~
zs6e;c%S1_<p1Qwrv2$=}ynd_56Y(m+U{|=%T0eB>Z(e5RF;mgj_O__+FQ&M-xB*MP
zzP0+5zd1k-LEi!6nE#j%;UlgNV8ToZ95T!2<bQ>Y2a<_Im|Y?7_WZttI<HTsUgE^a
zzo6{%4NXGCxNhe&`u>Ddmr($x`1^P0nEhhM+^5vu$d$b8CGu;*yF-KxJBE?fyj%SZ
zRV~p5L*UI}^PF<o+w=PX#qbZ9f#-cNXQ*IVJhj;D=sVZ3vT5I9ENTRt7w}R1s}|OT
z`mYASbM7aS^F`sB18AW>fvCF-GrPoII6;(n_Wp;bCkVXK5}m-3a|35|@o`MgWel0C
zzKY6y;7uE2Seo@aU%&^HiTXb)OE-OQ1>->SS5m^))zwKP5;3QRir?AUK{ukfKXi0F
zlGCzM(5i#gn*zCXua#dfemGmm(V)qO;Gg;L@9#f5Kj-7+MccEbNrTA=o&eZd3heAb
zQjMtmWYA}f@ifo9?$@u@<j$yygh<mN!wDW4w7Sq_7`x+*SS5Risj;LyUDSm$14Kj^
z5hcqY`$22A#z+D1Ff}!`mh+tJfW!I=K)Y7w+um;P^M~ydaK!%uJ|;+g#FEu$P6n#^
zT`AdY#GBJsao?)T%7&Xw`6A}A^&wKbhlgFXm(u_g)v(q142sZ$R?4ofM<&S0BqmyP
zHXIMXe|K=~S=qSAOLch@6=i7z<*_wd*44GH%1}$A+#k>9Y-b7syDyOZ^C+sT*IY9i
zk)>Mt#ojIDRikLsqeqV<;?glC@jJc1X$m1chbvu6H*|y4FTbm!{*fhI5sX{H<9O}8
zoxQ#FQI0x~@kU7@p=PTY_STEpsi`%wpS*eMr{7d~e5valkZi}q$7$a?yyu)<mA*eb
z{*uI~g-`P72xpmq>k$~?^?^74rdPDMMb!nLu&~W@C)Ce7Az|V6d(Ed;;$X6MUTx((
zdDRVliKIZ(9WFEtFYU}xOMfT+7ipi3_^1_ezWLwG)Ku^9!=<P}%lHNnzD8dwtAU1C
zGKM5v8XB5fXDxWz)RdNK@SW%6Yh1M*EJ>o<!+Z&U2T84FX*H7LK?<`67|#)Zp$EM<
zIi7dd=balgM{W;#DCq@Ezy74DHEbI4LWExBFDw|E23=XBI$56ZK>`ST*01;L>aMPs
zgp~eajyG7?_7`tPHJjw25KMr6hOW=|CF1-5uQX`HPbaIceI_V4A20NYy<ptN7tAH_
zMWRaq)-U9JWPwTW-TCV84}HpoHn^94_j#a*JkpQfUBo%t_QPvyxobbK<13U&cjCO3
za^lW-?f$EVxqQ5cY@;|;Z#YC65g#AVyhhDxmn{#9UYl1DRh>>`+@EuTXUphSO&3~C
zPe}K1-~C5V726ZAGOi811*tcqIcf{5s;VNH8kfe#RHxd%s>i6kdZ9&1{pitoMWGFB
zagd~_{@uP~UDpsuq6KwU_bwgL9M6{BUaFl{>xLmFrTzvG&&$17JRDH4#|gV!0TpQX
z=g$^ZVaE2!+)~|%u`$vLQz{sBgjdugNEkq&Os%KsK}mi0#_&EV$jgg(?xog+GLWA*
z<7=N>J#y`A;5;gO%*laS5d7zgfK>5<k4e7LM-I>(R619+S<gyC#tTqmZEd-fG64k6
z%bUqK6k27KtXavyl{R`<)6kG)C+MKm4Xy>UT8-bt_UQvcLig*lU3Up<jt3aQn75m8
z&sOY?e(K|*WRQSt{KY>u3o&vVxiG?CKM^r%b=gc-;eJEFe!skO^z2L!SWVVqx&o1w
zQDYZ5ndj@7Bk77v(f>6l#?CJ<AM8*@Z3Actvit7-{^?>UL+FEJrsK^Vm-gL)yV_+!
zGDh@Tf5dB~2{IU~wst@uJ3D*6-ID{b>~8}CGFJcP=H)R18>dp1HN%H4kB<9YlI5{=
zXD3*R(<4{^%F7eZ_%I?o{GXnv=wfrZR6uJWY(ebOXmM$zH$?Jc`K<)f74r9?Tf#s(
zqS<k-(f8B_6q0}}#Z*-mAddc{A!OXGW-3a-7d|o)rD`yU{rS^HWBNr+e#YcB6&2MQ
zsKCrMCX693(7~8yU0{l#%vi=C-4Bo3w(~o3Wiq~UT^{I4_h$ASG@?GAeN!p9NBjjq
z-fz30W6}ZK1<K*|>(?r}^=a(F5mvFk3k<KLq@r+9pPHM22C;W?N=;to=lcRY0_Y=f
z!HV~O>R7ALKR>o|T>nHBkY%VLZ3_au2##+^bMKoe%z^CK-rhc6ZxQ<E!&R6uw}M!n
zspYD5lOYQWOJ-&!U7os8@>e$IxcW!MWKptqj*cHd(qp4)DP{wecBvw(u_vy<7@$l$
zyGX#`C+{;Vt>YdqbopQ8pM7Xd#=AUdniR&kz_@^Pb8-=b8+36gEhz~DJ@;*S+4$T0
zH_vmF6It`rm;6$OF8G9m27zV=e#eYT#Y&AoLx_auNdh47s{a1|Q-x5D2>A#11^)C}
z1yPjoUj^j<)7SYD``(-n@kiXd@oraEy8Kbmnf@$jfk|<akLIg)m~Kj<L=k<6uYl%)
zp<rikKP4eo*OC`Y50U{_KZm@52}wggF#cOxThZYgj<4vMtLC96vB?vaE>(AmOfsD0
z(>)z?UW;j2`T1MRZEyW5U(qIE|9N(NW#rOk{W%q1{NZtyZN5ELK9;1xXg_qoj|~)6
zK|w*{m_Z<Qw7*TLND_t^bGLq!ntPhb>3@)B&VLhKOdKa)Qiks%TA*HbuB7**NubRF
z^HK+$;L^59uCcC{jnI&~JF`aenRm?1;sNw6_WZfMt1Bxk>g(69(hNy%2aH@{ZV;f2
z10;{`FN_VR%|CmB1EeILNSSb3UMu^DN_JpwKq)0V_q;&_W4d&n&l;^JcD;!Hf02cd
zTFBGn6U)HOi3xRB6m-f?_lOL`_nl~(fGNptla=2CcCPW;dElVi{Vsk5T1~vPpqxh{
zF+xK_nbn>*BL(aK&KkK&FzC#uAv7e;|8qebAvX7-yl}&0s*PIXfB*K9DN5|t?)om$
z>CRlZGeXQWwOr-^@6P{CCP)96kR(ptM8WNOUMok+h}A#wcXxNk$(h<kmw_Mfvt`NU
z=5_14cxb?0MOhHdC5QOXxtN&PzZI$f&tgr+-+330JTQa(&V$n#q*nYFB=m)Ci}pD|
z<+-xz#sx_4XfVlw%C}iV625yaIk))6IrsFYXh^n^UkZpP@=(Wp`~F=Gs2`vf<7o~W
zc_YN2@3VzqlWbg_iV|7;{1@C5KyHG<tSEt+7<e06%m%3O*OiqCke$jj3Ty(5#g0Bu
zwd$bfxmqTh9M3@LD+<zgC~Y7KzjX|QarSXeGAS)UW-!_y*F>~c^oja*rx<?FVTMt}
zaV~(j)|ZvK_H2o&ETVze9-^?5*(KMWJF2St>CoHR)^1O-V;!avGjM}P0o%{dXC&`5
zn{4{B;7(7^4SR_u^;?$R4`NDQRQtt^Hd71_5BuJo&#5##<iXHic{5C-Lg`fYE|^5=
zS942?JE(R%hCajbQ1u^fzs$SJDS0ZtsIj-x%u&A($a=8rk!{Xf9`Qz5D0FPK=);H5
zi=MxCxzD}h1#BmLPO^E5cymq?#wa)eWX=8$AB&5N%lPfMQ2Ihdb&vrE43D+%aUI8;
zS8CX5^3?94J4`p$S+LTUo(!cm0%{|QyCW7%I`w?<U2F2yn`(7#t=`q!t!HF(cp?*(
z@v;m7Xe`=#wZKjCR@C<CH5)0_%&REr=9G_TGSaOZujtEhHzLt3)qBm)d2CLU#GaB!
z17xydsJjOH$9(0Dzu?qcqsT2AGOJ#NwJI{`RyRns7$1!rXgs~}ZEJbV<k7D8Q=<5<
z7%}e7_dvage6s3^h<=NeyPw{tAQOI@o3r&Tz&s=^wICgbw=ke>TC)pzXS5P0cZW&m
z<aP?R6SY=17ZW!ZW41On-F?P}860;22VHZ^G~jF*uulraiPrwY9sK*i5cP}2X($d6
z6ZUxO>(|06(^gtjI9$6TwWRVK@?6PLza@9ur)^7K<h1P-LwPA#cqu?cGDXBEKFjXp
zMP#wt{cF5Mnu<1lNE>v=5Q!elEyjq;5*C*gpvPlrVbMEl^s6$cE3uyRbF*AHLT|gW
zraiAVDzK=iZ|yj_AxiI@YLX*bh6$ELh0*ceh*?Rx>S=;rv9E>23!;ikvI?G=t(2O%
z{c}I&5|cJ3VHN(Y{}ebzvIU}UI+$uPFdn%4+Y2CTIRf({H|VQLc0wvLtvg(7o?a!}
zI*llbNk#6!uSfGQUcz${GI9znxekVg<cC*{ay6J>{72Jy2)(c|H^xG{OjW9~;LHbY
z)l79xhK8w*6r=e@+)sCPXFH`NB-D(ImS8EU2O~`A38=WojwZ?1O}&^Tgcm&}6{Nk0
zG-r}Xh{q^{qQcIzJG*jGWx<$xoBBB^y(onTjhILIF1k1L8lq%_$42%JEQ;3>k=(Vq
zxG@@*I7za8X<6ED*2ZOfYgVFUcW#uOU|mYgX(@2rD8j~27<<S1Wa~F$R>$lpycP9A
zR?11H!*O#y5#{UTInIW8NcTFOt1lm+s4Q*BI<QZ)H?wsb8fyyoDw%1VX>(Xg;Gcf<
zu9t4j&47heXMk@KrWxz^R1O<eZp8D^{f6XA>ghY}k!_E09wAPhQeD_6E=j|WNLkkm
z3Cspu(rgP;^8TN4^Fn@YPTiXx@>Zi)YSLA2O%ukq4;I;;AFwAWeo=kLvz}>-m#N6~
zSb^#OXSIlG?3_u0v`=_l`DWY|cG!jy{7({4sT}K>l0i57W`F%KqOg0%`|AY9{lc_f
zNOz38glWGeG-)6WpN=jKay8B0*7Fiwa=!47<jO#C*(Y#X9Y}W+`LdjGx)bm!O4sl{
zKzaVEcz}xgaa!zBR#rx{p|o`xq@=(j^?vT=HaRvZ_dXO7n~<Qg$;0>Z2kPxRRgd?O
zVPVL2p#io^gn4y3i$Gs_(04_)QM>G+`FYA5VdrEP*@}Uu6hWUR?_V8Epz;MQgMzy4
zEHDg#1D{)FfATtH5c(gJd@sTicSx1LX`Jq5A20-~_c(R&O&9g>uX1bCWP~|@29cMS
z|9qzHiic<Q_+f)zsBA|I#wun4jF%LD;T}^QQM0>ru41`8H86N!HSQ^nZQB~f$!Ocp
zIa&eonBAz>F2xsA3bJE5=>}6~+u2$Wzu$-&H0gWcr2vQ}+^>niV!5ul_Otd82b}*p
z%z(4Btms%-nhGeGtSDs_yvX;^R4Vrm_P_b0UsEv_m6nxh!Dpr-o5jrH@)O<n%CS#n
zs*8CA1U9lUS8x|JRT+{Jvyi6Q&{U5mi5k@s`|Ky3XI~2pbQPL454SU-4LFAY%VHJc
zB$>fDYCvKj=emD4+aS-6=wz7GbLN=4f!O%6>E3=;RaRq4ztU_(t|?$;nVq}=c}^j!
zPY0G~a;!~1t8SX&iAYH$l-lR_L#o(lz$z&mo>fqA;ZZQ=y8j~4DZJHB=A$Jdjjm9U
zkg;k-UrX{m3rTR0;g{Q%WEe5IC<R3HhUf=Q@u&<O9(e9cL|`VDMZCxYShI4;$G^Ay
z@sV!sOg@@Sm?oiLU3L%S;!?vh8`~=1WzfoG`e^m@_ta3PGly`Yd+(9bQ%dC#7eU7C
zmG!lJBe~&G6{%uYc>-&AHx5{%rNh50b#QN7;dk6p?-|#bhjTODguvM55gOtrvWc*8
z3&UPVADNHxT+ENYv5$sEwne8}o34krEGoN)8&8sGh(COwMM=Gp-LGG&UH7|ShwsfJ
z>jwP40B3uo0J*51jo|NZWXj9tt>-JWUnHmM;+~e~feLPInJ}Y&F_Pl%9<90x9nh11
zW_}+*S(pPobNCw-T)33l1HVjg6RB1a;E`b9w@C*#MW01!&PJNtI1QHcO38jL)hZ+R
zz=jZFT&N~IO_k*(d)lv>4=;Z3CS?^<Ny|W#+h@MP+-z**HMkjH>r@x>6Jx%H!%K8{
zzx<M(B}s3@v}W9NS@4G@k6399dxgO`>iV!PA(@qxOesopzZ$cNKZd2}60kkOB8_`+
zFH|loc8nNG%EakO)e27~d~4cub>)k4i!EjYR154hD4T#R%rwemmo|5#H7a)>+?%q4
z!(-gffuq}L+Q!D?X!AN_uLcWiT5xzl1Q2+Dm;tdx$TlAdKmt2oG1+qZTO(P2jOpSj
zz0B<F<e+-^OJKx7$pTfr44dq4Hyome!=MvFS5Rsn8ymZWIt=e$YjipVGCIo=3sY@c
zy?u8Nz}WEc@Q(zVRcczKf&8(=+w0jxyD#+D9u5^5$Sm4t4;>%#(j7S&IKO=P5<F;D
zBP$kCsdcDy+Wz|b8i2s3SN8$X2OC{t!q0GTEWwr|O|~DIwk~9Uq!XP30y=jB?<@HL
z5}jq}+yYKt8_N=C+`G0?oc?5r_Rdu<(S8cNj?~|)$t<vFFkPyaALah%)>peicS`$_
zCCUBQt<BB5n<@k+)$3f5u_Z$U_#FB8o*bi8N5Bxi-k+_>*R3zL&z0~`2X=%<D{ci1
zwtY=>0VmZHJCKR|KL-WS+|wgKkN>$O8XA+viJ0R7Sx&d{Y@zGG^{^;J1#hJFG_pI-
zJV?WmWP9w$$;~bCJ_R=?eJPzWONs>;my<zz;h^hG1JB|A*saI#pH+>ZUn#+y^0L8%
zmlyor_OC2pSKuQOz$}3Ybxiuf&rmS=c593(aIr)yn<|gk;+e7UW?HT2)`7N4mek?I
z3}fu-($DGp_i%7BZpn-FWuaxZwzi_cvgap{<ENyg_&r&Jt(<Hl6RVF=W`BN}Vc~Sm
z7PH}ljZGH7t^=?N2@BTb&$4oIQq}KZ;AZRNU(Y?c1gOXgMP5NBqx_D-{aWc&){mIR
zwnWt6&JLRtV2IJ5q75DJ{f(>r7N@3O7#ZcP(1YC+sNLx@&@)`;5;WI`tA7s7BG!F-
z3krF;k5_#wl%@r_jXxv7vW>m7^UP^H)kd()DAi2e%r-||r;MYcqf*tg5v0@pCEf;+
zRuzj3d)j)0)U8F*M*(@p*zKZY39uIi*jQCn)x>cdr4nua7)`M?e<bU`3$6B9p1@rd
zXQUK{e(LFaHxX5U6(oNsC`!?v<T6<Rgz|y*ZfEcD!ve5>YxQcv8<^Dkv;e)~K0S*5
z?a_gKWL?0XPQkb5`58a%2i=|wcZ852f4diyvPI|nt7?%-*cT;5>J0-R5OCQ~TWhGK
zop8A@88ie)h}K8b!$?-Y?r*!F3hvHaF`i4_?P?SV<QvOKBZg^%JMk{1kmErTG+&$e
zqU+-|N92{*TJrOstlX?z)W(x>l4O^jEIQVm{6g_8!PLQ(jBL0wss_-B+lbZ6vofhJ
zD|8VvCT92LAP+kd3%T8(z6&RZp8UEJ&r+4Y7>H$x9o{hZKWzR7U5<u(xOgQb#xJ@r
zx{9THG^;GR<0-|pi+n{z(H97uqwX6QmEr}MCOXFKcHIk|aAHWE4c6z*f(wZ6`sljX
zqd9z5Z&q5x+-9&$eK*O1&OXrYs^`;X?QDasRB6I*^09(0es&xM^;aZvU}8V<KWMms
z5Mk1C_Bj6}7LMe7_hE|d$am5o*!^keQFte|8iy)>L0;bGkC7Brb#)kim?mkMonSlD
zUsvoC6Z9YdpKaUBS$*HYqQybOuovVniBIcA%N3TKmYtp5*H)kz0ciwwn8Q?g%Uu-k
z@vNMj*Ir)fAlU>~xg+na(cU0J{%cd0U#ijw1=>JCjDrv6v@XAlUtrUR2g`lXGTF>b
z7z`45T-(kxL$2^1EIdmn)cLOZ9K2*3aLp|--wxamD7cE<9!isy4*3@VHy{&2bphdG
z*4M+1<V~WiV!Ku!&zTnTaWt>-75MFGWP-A3y8hfL)=zrOc}##lk~+<r{9LE#5ZZ`q
zH^7)64#W1+qT6_4?%5TW7Dnp!9<u9q)OE4)ZP<wl{RlJ8=SPx4c1R9e;>jGsx(T7b
z#_<ceszvvG&Ht#YwOUeyL-##GUi|jB-w|PiFvG6J=C0Vm(%0hV#`sHgDSSK@c=28T
zn#~GNHy2^^@3agoT3)BLM}HdesXFlj%$zR1d$0CzZ}(^9f$z`0zTEeTiJgNS^(D%_
zA?udGHtm)Ed~?(j{5hMTQVet4XQwFQ6(U&0g7^I!qr-&LaC&?!jMycjqn^KizLkmS
zVF)QmKNr75hmIqK(_wEpV1|<VZ2U<3blBm4SVZFJj($zN{|GP-kI|t-_nub&bfc=D
z{bXV}e^eaQc_Pk>Z*08GP5FCp7AMyi9fG4A-#Y`@%SSZ&9QWd2ktUxQBz+2zS>|`R
z{Iv9}AXFxnv+Hw-YJu0yQ*%N`_c)1TB$m+JrWW39@LjoH!-I?BEU;A>LrG3uwpPac
G-Twfpl}P*m

literal 0
HcmV?d00001

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
new file mode 100644
index 00000000000..c2130e08b5b
--- /dev/null
+++ b/apps/contacts/js/contacts.js
@@ -0,0 +1,1289 @@
+function ucwords (str) {
+	return (str + '').replace(/^([a-z])|\s+([a-z])/g, function ($1) {
+		return $1.toUpperCase();
+	});
+}
+
+String.prototype.strip_tags = function(){
+	tags = this;
+	stripped = tags.replace(/[\<\>]/gi, "");
+	return stripped;
+}
+
+
+Contacts={
+	UI:{
+		notImplemented:function() {
+			Contacts.UI.messageBox(t('contacts', 'Not implemented'), t('contacts', 'Sorry, this functionality has not been implemented yet'));
+		},
+		searchOSM:function(obj) {
+			var adr = Contacts.UI.propertyContainerFor(obj).find('.adr').val();
+			console.log('adr 1: ' + adr);
+			if(adr == undefined) {
+				Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', 'Couldn\'t get a valid address.'));
+				return;
+			}
+			// FIXME: I suck at regexp. /Tanghus
+			var adrarr = adr.split(';');
+			var adrstr = '';
+			if(adrarr[2].trim() != '') {
+				adrstr = adrstr + adrarr[2].trim() + ',';
+			}
+			if(adrarr[3].trim() != '') {
+				adrstr = adrstr + adrarr[3].trim() + ',';
+			}
+			if(adrarr[4].trim() != '') {
+				adrstr = adrstr + adrarr[4].trim() + ',';
+			}
+			if(adrarr[5].trim() != '') {
+				adrstr = adrstr + adrarr[5].trim() + ',';
+			}
+			if(adrarr[6].trim() != '') {
+				adrstr = adrstr + adrarr[6].trim();
+			}
+			console.log('adrstr: "' + adrstr + '"');
+			adrstr = encodeURIComponent(adrstr);
+			console.log('adrstr 2: ' + adrstr);
+			var uri = 'http://open.mapquestapi.com/nominatim/v1/search.php?q=' + adrstr + '&limit=10&addressdetails=1&zoom=';
+			console.log('uri: ' + uri);
+			var newWindow = window.open(uri,'_blank');
+			newWindow.focus();
+			//Contacts.UI.notImplemented();
+		},
+		mailTo:function(obj) {
+			var adr = Contacts.UI.propertyContainerFor($(obj)).find('input[type="email"]').val().trim();
+			if(adr == '') {
+				Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', 'Please enter an email address.'));
+				return;
+			}
+			window.location.href='mailto:' + adr;
+		},
+		propertyContainerFor:function(obj) {
+			return $(obj).parents('.propertycontainer').first();
+		},
+		checksumFor:function(obj) {
+			return $(obj).parents('.propertycontainer').first().data('checksum');
+		},
+		propertyTypeFor:function(obj) {
+			return $(obj).parents('.propertycontainer').first().data('element');
+		},
+		checkListFor:function(obj) {
+			var type = $(obj).parents('.propertycontainer').first().data('element');
+			console.log('checkListFor: ' + type);
+			switch (type) {
+				case 'EMAIL':
+					console.log('emails: '+$('#emaillist>li').length);
+					if($('#emaillist>li').length == 1) {
+						$('#emails').hide();
+					}
+					break;
+				case 'TEL':
+					console.log('phones: '+$('#phonelist>li').length);
+					if($('#phonelist>li').length == 1) {
+						$('#phones').hide();
+					}
+					break;
+				case 'ADR':
+					console.log('addresses: '+$('#addressdisplay>dl').length);
+					if($('#addressdisplay>dl').length == 1) {
+						$('#addresses').hide();
+					}
+					break;
+				case 'NICKNAME':
+				case 'ORG':
+				case 'BDAY':
+					break;
+			}
+		},
+		loading:function(obj, state) {
+			if(state) {
+				$(obj).addClass('loading');
+			} else {
+				$(obj).removeClass('loading');
+			}
+		},
+		showCardDAVUrl:function(username, bookname){
+			$('#carddav_url').val(totalurl + '/' + username + '/' + bookname);
+			$('#carddav_url').show();
+			$('#carddav_url_close').show();
+		},
+		messageBox:function(title, msg) {
+			//alert(msg);
+			if($('#messagebox').dialog('isOpen') == true){
+				// NOTE: Do we ever get here?
+				$('#messagebox').dialog('moveToTop');
+			}else{
+				$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'messagebox.php'), function(){
+					$('#messagebox').dialog(
+						{
+							autoOpen: true,
+							title: title,
+							buttons: [{
+										text: "Ok",
+										click: function() { $(this).dialog("close"); }
+									}],
+							close: function(event, ui) {
+								$(this).dialog('destroy').remove();
+							},
+							open: function(event, ui) {
+								$('#messagebox_msg').html(msg);
+							}
+					});
+				});
+			}
+		},
+		loadListHandlers:function() {
+			//$('.add,.delete').hide();
+			$('.globe,.mail,.delete,.edit').tipsy();
+			$('.addresscard,.propertylist li,.propertycontainer').hover(
+				function () {
+					$(this).find('.globe,.mail,.delete,.edit').fadeIn(100);
+				}, 
+				function () {
+					$(this).find('.globe,.mail,.delete,.edit').fadeOut(100);
+				}
+			);
+		},
+		loadHandlers:function() {
+			console.log('loadHandlers');
+			/*
+			$('.formfloat').hover(
+				function () {
+					$(this).find('.add').fadeIn(500);
+				}, 
+				function () {
+					$(this).find('.add').fadeOut(500);
+				}
+			);*/
+			$('#contacts_deletecard').tipsy({gravity: 'ne'});
+			$('#contacts_downloadcard').tipsy({gravity: 'ne'});
+			$('.button').tipsy();
+			$('#fn').jec();
+			$('.jecEditableOption').attr('title', t('contacts','Custom'));
+			$('#fn').tipsy();
+			$('#contacts_details_photo_wrapper').tipsy();
+			$('#bday').datepicker({
+						dateFormat : 'dd-mm-yy'
+			});
+			// Style phone types
+			$('#phonelist').find('select[class*="contacts_property"]').multiselect({
+													noneSelectedText: t('contacts', 'Select type'),
+													header: false,
+													selectedList: 4,
+													classes: 'typelist'
+												});
+			$('#add_email').click(function(){
+				Contacts.UI.Card.addMail();
+			});
+			$('#add_phone').click(function(){
+				Contacts.UI.Card.addPhone();
+			});
+// 			$('#add_address').click(function(){
+// 				Contacts.UI.Card.editAddress();
+// 				return false;
+// 			});
+			$('#n').click(function(){
+				Contacts.UI.Card.editName();
+				//return false;
+			});
+			$('#edit_name').click(function(){
+				Contacts.UI.Card.editName();
+				return false;
+			});
+			
+			/* Initialize the photo edit dialog */
+			$('#edit_photo_dialog').dialog({ autoOpen: false, modal: true, height: 'auto', width: 'auto' });
+			$('#edit_photo_dialog' ).dialog( 'option', 'buttons', [
+				{
+					text: "Ok",
+					click: function() { 
+						Contacts.UI.Card.savePhoto(this);
+						$(this).dialog('close');
+					}
+				},
+				{
+					text: "Cancel",
+					click: function() { $(this).dialog('close'); }
+				}
+			] );
+			Contacts.UI.loadListHandlers();
+		},
+		Card:{
+			id:'',
+			fn:'',
+			fullname:'',
+			shortname:'',
+			famname:'',
+			givname:'',
+			addname:'',
+			honpre:'',
+			honsuf:'',
+			data:undefined,
+			export:function() {
+				document.location.href = OC.linkTo('contacts', 'export.php') + '?contactid=' + this.id;
+				//$.get(OC.linkTo('contacts', 'export.php'),{'contactid':this.id},function(jsondata){
+				//});
+			},
+			delete:function() {
+				$('#contacts_deletecard').tipsy('hide');
+				$.getJSON('ajax/deletecard.php',{'id':this.id},function(jsondata){
+					if(jsondata.status == 'success'){
+						$('#leftcontent [data-id="'+jsondata.data.id+'"]').remove();
+						$('#rightcontent').data('id','');
+						//$('#rightcontent').empty();
+						this.id = this.fn = this.fullname = this.shortname = this.famname = this.givname = this.addname = this.honpre = this.honsuf = '';
+						this.data = undefined;
+						// Load empty page.
+						var firstid = $('#contacts li:first-child').data('id');
+						console.log('trying to load: ' + firstid);
+						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':firstid},function(jsondata){
+							if(jsondata.status == 'success'){
+								Contacts.UI.Card.loadContact(jsondata.data);
+							}
+							else{
+								Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+							}
+						});
+					}
+					else{
+						Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+						//alert(jsondata.data.message);
+					}
+				});
+				return false;
+			},
+			loadContact:function(jsondata){
+				this.data = jsondata;
+				this.id = this.data.id;
+				console.log('loaded: ' + this.data.FN[0]['value']);
+				this.populateNameFields();
+				this.loadPhoto();
+				this.loadMails();
+				this.loadPhones();
+				this.loadAddresses();
+				this.loadSingleProperties();
+			},
+			loadSingleProperties:function() {
+				var props = ['BDAY', 'NICKNAME', 'ORG'];
+				// Clear all elements
+				$('#ident .propertycontainer[class*="propertycontainer"]').each(function(){
+					if(props.indexOf($(this).data('element')) > -1) {
+// 						$('#contacts_propertymenu a[data-type="'+$(this).data('element')+'"]').parent().show();
+						//console.log($(this).html());
+						$(this).data('checksum', '');
+						$(this).find('input').val('');
+						$(this).hide();
+						$(this).prev().hide();
+					}
+				});
+				for(var prop in props) {
+					//console.log('loadSingleProperties: ' + props[prop] + ': ' + this.data[props[prop]]);
+					if(this.data[props[prop]] != undefined) {
+						$('#contacts_propertymenu a[data-type="'+props[prop]+'"]').parent().hide();
+						var property = this.data[props[prop]][0];
+						var value = property['value'], checksum = property['checksum'];
+						//console.log('value: ' + property['value']);
+						//console.log('checksum: ' + property['checksum']);
+						switch(props[prop]) {
+							case 'BDAY':
+								var val = $.datepicker.parseDate('yy-mm-dd', value.substring(0, 10));
+								//console.log('Date: ' + val);
+								value = $.datepicker.formatDate('dd-mm-yy', val);
+								//console.log('Date: ' + value);
+								$('#contact_identity').find('#bday').val(value);
+								$('#contact_identity').find('#bday_value').data('checksum', checksum);
+								$('#contact_identity').find('#bday_label').show();
+								$('#contact_identity').find('#bday_value').show();
+								break;
+							case 'NICKNAME':
+								//console.log('NICKNAME: ' + value);
+								$('#contact_identity').find('#nickname').val(value);
+								$('#contact_identity').find('#nickname_value').data('checksum', checksum);
+								$('#contact_identity').find('#nickname_label').show();
+								$('#contact_identity').find('#nickname_value').show();
+								break;
+							case 'ORG':
+								//console.log('ORG: ' + value);
+								$('#contact_identity').find('#org').val(value);
+								$('#contact_identity').find('#org_value').data('checksum', checksum);
+								$('#contact_identity').find('#org_label').show();
+								$('#contact_identity').find('#org_value').show();
+								break;
+						}
+					}
+				}
+			},
+			populateNameFields:function() {
+				this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = ''
+				var full = '';
+				var narray = undefined;
+				//console.log('splitting: ' + this.data.N[0]['value']);
+				this.fn = this.data.FN[0]['value'];
+				//console.log('FN: ' + this.fn)
+				if(this.data.N == undefined) {
+					narray = [this.fn,'','','','']; // Checking for non-existing 'N' property :-P
+					full = this.fn;
+				} else {
+					narray = this.data.N[0]['value'];
+				}
+				this.famname = narray[0];
+				//console.log('famname: ' + this.famname)
+				this.givname = narray[1];
+				this.addname = narray[2];
+				this.honpre = narray[3];
+				this.honsuf = narray[4];
+				if(this.honpre.length > 0) {
+					this.fullname += this.honpre + ' ';
+				}
+				if(this.givname.length > 0) {
+					this.fullname += ' ' + this.givname;
+				}
+				if(this.addname.length > 0) {
+					this.fullname += ' ' + this.addname;
+				}
+				if(this.famname.length > 0) {
+					this.fullname += ' ' + this.famname;
+				}
+				if(this.honsuf.length > 0) {
+					this.fullname += ', ' + this.honsuf;
+				}
+				//console.log('fullname: ' + this.fullname)
+				$('#n').html(this.fullname);
+				$('.jecEditableOption').attr('title', 'Custom');
+				$('.jecEditableOption').text(this.fn);
+				//$('.jecEditableOption').attr('value', 0);
+				$('#fn').val(0);
+				$('#full').text(this.fullname);
+				$('#short').text(this.givname + ' ' + this.famname);
+				$('#reverse').text(this.famname + ' ' + this.givname);
+				$('#reverse_comma').text(this.famname + ', ' + this.givname);
+				$('#contact_identity').find('*[data-element="N"]').data('checksum', this.data.N[0]['checksum']);
+				$('#contact_identity').find('*[data-element="FN"]').data('checksum', this.data.FN[0]['checksum']);
+			},
+			editNew:function(){ // add a new contact
+				//Contacts.UI.notImplemented();
+				//return false;
+				
+				$.getJSON('ajax/newcontact.php',{},function(jsondata){
+					if(jsondata.status == 'success'){
+						id = '';
+						$('#rightcontent').data('id','');
+						$('#rightcontent').html(jsondata.data.page);
+						console.log('Trying to open name edit dialog');
+						Contacts.UI.Card.editName();
+					}
+					else{
+						Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+						alert(jsondata.data.message);
+					}
+				});
+			},
+			add:function(n, fn, aid){ // add a new contact
+				//Contacts.UI.notImplemented();
+				//return false;
+				console.log('Add contact: ' + n + ', ' + fn + ' ' + aid);
+				$.post(OC.filePath('contacts', 'ajax', 'addcontact.php'), { n: n, fn: fn, aid: aid },
+				  function(jsondata) {
+					/*
+					 * Arguments:
+					 * jsondata.status
+					 * jsondata.data.id
+					 */
+					if (jsondata.status == 'success'){
+						$('#rightcontent').data('id',jsondata.data.id);
+						id = jsondata.data.id;
+						$('#contact_identity').show();
+						$('#actionbar').show();
+						// TODO: Add to contacts list.
+					}
+					else{
+						Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+						//alert(jsondata.data.message);
+					}
+				});
+			},
+			saveProperty:function(obj){
+				// I couldn't get the selector to filter on 'contacts_property' so I filter by hand here :-/
+				if(!$(obj).hasClass('contacts_property')) {
+					//console.log('Filtering out object.' + obj);
+					return false;
+				}
+				console.log('saveProperty. ' + $(obj).val());
+				if($(obj).hasClass('nonempty') && $(obj).val().trim() == '') {
+					Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', 'This property has to be non-empty.'));
+					return false;
+				}
+				//Contacts.UI.loading(obj, false);
+				//return false;
+				container = $(obj).parents('.propertycontainer').first(); // get the parent holding the metadata.
+				Contacts.UI.loading(container, true);
+				//console.log('saveProperty. Container: ' + container.data('checksum'));
+				var checksum = container.data('checksum');
+				var name = container.data('element');
+				var q = container.find('input,select').serialize();
+				if(q == '' || q == undefined) {
+					console.log('Couldn\'t serialize elements.');
+					Contacts.UI.loading(container, false);
+					return false;
+				}
+				q = q + '&id=' + this.id + '&name=' + name;
+				if(checksum != undefined && checksum != '') { // save
+					q = q + '&checksum=' + checksum;
+					console.log('Saving: ' + q);
+					$.post('ajax/saveproperty.php',q,function(jsondata){
+						if(jsondata.status == 'success'){
+							container.data('checksum', jsondata.data.checksum);
+							Contacts.UI.loading(container, false);
+							return true;
+						}
+						else{
+							Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+							Contacts.UI.loading(container, false);
+							return false;
+						}
+					},'json');
+				} else { // add
+					console.log('Adding: ' + q);
+					$.post('ajax/addproperty.php',q,function(jsondata){
+						if(jsondata.status == 'success'){
+							container.data('checksum', jsondata.data.checksum);
+							Contacts.UI.loading(container, false);
+							return true;
+						}
+						else{
+							Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+							Contacts.UI.loading(container, false);
+							return false;
+						}
+					},'json');
+				}
+			},
+			addProperty:function(obj){
+				var type = $(obj).data('type');
+				console.log('addProperty:' + type);
+				switch (type) {
+					case 'PHOTO':
+						$('#contacts_propertymenu a[data-type="PHOTO"]').parent().hide();
+						$('#file_upload_form').show();
+						break;
+					case 'EMAIL':
+						//console.log('emails: '+$('#emaillist>li').length);
+						if($('#emaillist>li').length == 1) {
+							$('#emails').show();
+						}
+						Contacts.UI.Card.addMail();
+						break;
+					case 'TEL':
+						//console.log('phones: '+$('#phonelist>li').length);
+						if($('#phonelist>li').length == 1) {
+							$('#phones').show();
+						}
+						Contacts.UI.Card.addPhone();
+						break;
+					case 'ADR':
+						//console.log('addresses: '+$('#addressdisplay>dl').length);
+						if($('#addressdisplay>dl').length == 1) {
+							$('#addresses').show();
+						}
+						Contacts.UI.Card.editAddress('new', true);
+						break;
+					case 'NICKNAME':
+					case 'ORG':
+					case 'BDAY':
+						$('dl dt[data-element="'+type+'"],dd[data-element="'+type+'"]').show();
+						$('#contacts_propertymenu a[data-type="'+type+'"]').parent().hide();
+						break;
+				}
+			},
+			deleteProperty:function(obj, type){
+				//console.log('deleteProperty, id: ' + this.id);
+				Contacts.UI.loading(obj, true);
+				var checksum = Contacts.UI.checksumFor(obj);
+				//var checksum = $(obj).parent().data('checksum');
+				if(checksum != undefined) {
+					//alert('deleteProperty: ' + $(obj).val() + ' ' + checksum);
+					$.getJSON('ajax/deleteproperty.php',{'id': this.id, 'checksum': checksum },function(jsondata){
+						if(jsondata.status == 'success'){
+							if(type == 'list') {
+								Contacts.UI.propertyContainerFor(obj).remove();
+								Contacts.UI.checkListFor(obj);
+							} else if(type == 'single') {
+								var proptype = Contacts.UI.propertyTypeFor(obj);
+								console.log('deleteProperty, hiding: ' + proptype);
+								$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
+								$('#contacts_propertymenu a[data-type="'+proptype+'"]').parent().show();
+								Contacts.UI.loading(obj, false);
+							} else {
+								Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', '\'deleteProperty\' called without type argument. Please report at bugs.owncloud.org'));
+								Contacts.UI.loading(obj, false);
+							}
+						}
+						else{
+							Contacts.UI.loading(obj, false);
+							Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+						}
+					});
+				} else { // Property hasn't been saved so there's nothing to delete.
+					if(type == 'list') {
+						Contacts.UI.propertyContainerFor(obj).remove();
+						Contacts.UI.checkListFor(obj);
+					} else if(type == 'single') {
+						var proptype = Contacts.UI.propertyTypeFor(obj);
+						console.log('deleteProperty, hiding: ' + proptype);
+						$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
+						$('#contacts_propertymenu a[data-type="'+proptype+'"]').parent().show();
+						Contacts.UI.loading(obj, false);
+					} else {
+						Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', '\'deleteProperty\' called without type argument. Please report at bugs.owncloud.org'));
+					}
+				}
+			},
+			editName:function(){
+				console.log('editName, id: ' + this.id);
+				//console.log('editName');
+				/* Initialize the name edit dialog */
+				if($('#edit_name_dialog').dialog('isOpen') == true){
+					$('#edit_name_dialog').dialog('moveToTop');
+				}else{ // TODO: If id=='' call addcontact.php (or whatever name) instead and reload view with id.
+					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'editname.php')+'?id='+this.id, function(){
+						$('#edit_name_dialog' ).dialog({
+								modal: (this.id == '' && true || false),
+								closeOnEscape: (this.id == '' && false || true),
+								title:  (this.id == '' && t('contacts', 'Add contact') || t('contacts', 'Edit name')),
+								height: 'auto', width: 'auto',
+								buttons: {
+									'Ok':function() { 
+										Contacts.UI.Card.saveName(this);
+										$(this).dialog('destroy').remove();
+									},
+									'Cancel':function() { $(this).dialog('destroy').remove(); }
+								},
+								close : function(event, ui) {
+									//alert('close');
+									$(this).dialog('destroy').remove();
+									//return event;
+								}/*,
+								open : function(event, ui) {
+									// load 'N' property - maybe :-P
+								}*/
+						});
+					});
+				}
+			},
+			saveName:function(dlg){
+				console.log('saveName, id: ' + this.id);
+				// TODO: Check if new, get address book id and call Contacts.UI.Card.add()
+				var n = new Array($(dlg).find('#fam').val(),$(dlg).find('#giv').val(),$(dlg).find('#add').val(),$(dlg).find('#pre').val(),$(dlg).find('#suf').val());
+				this.famname = n[0];
+				this.givname = n[1];
+				this.addname = n[2];
+				this.honpre = n[3];
+				this.honsuf = n[4];
+				//alert('saveName: ' + n);
+				$('#n').val(n.join(';'));
+				/*$('#card > input').each(function(){
+						alert($(this).attr('id') + ' ' + $(this).val());
+				});*/
+				if(n[3].length > 0) {
+					this.fullname = n[3] + ' ';
+				}
+				this.fullname += n[1] + ' ' + n[2] + ' ' + n[0];
+				if(n[4].length > 0) {
+					this.fullname += ', ' + n[4];
+				}
+				$('#short').text(n[1] + ' ' + n[0]);
+				$('#full').text(this.fullname);
+				$('#reverse').text(n[0] + ' ' + n[1]);
+				$('#reverse_comma').text(n[0] + ', ' + n[1]);
+				//$('#n').html(full);
+				$('#fn').val(0);
+				if(this.id == '') {
+					var aid = $(dlg).find('#aid').val();
+					Contacts.UI.Card.add(n, $('#short').text(), aid);
+				} else {
+					Contacts.UI.Card.saveProperty($('#n'));
+				}
+			},
+			loadAddresses:function(){
+				$('#addresses').hide();
+				$('#addressdisplay dl[class*="propertycontainer"]').remove();
+				for(var adr in this.data.ADR) {
+					$('#addressdisplay dl').first().clone().insertAfter($('#addressdisplay dl').last()).show();
+					$('#addressdisplay dl').last().removeClass('template').addClass('propertycontainer');
+					$('#addressdisplay dl').last().data('checksum', this.data.ADR[adr]['checksum']);
+					var adrarray = this.data.ADR[adr]['value'];
+					var adrtxt = '';
+					if(adrarray[0].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[0].strip_tags() + '</li>';
+					}
+					if(adrarray[1].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[1].strip_tags() + '</li>';
+					}
+					if(adrarray[2].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[2].strip_tags() + '</li>';
+					}
+					if(adrarray[3].length > 0 || adrarray[5].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[5].strip_tags() + ' ' + adrarray[3].strip_tags() + '</li>';
+					}
+					if(adrarray[4].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[4].strip_tags() + '</li>';
+					}
+					if(adrarray[6].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[6].strip_tags() + '</li>';
+					}
+					$('#addressdisplay dl').last().find('.addresslist').html(adrtxt);
+					//console.log('ADR: ' + adr);
+					console.log('checksum: ' + this.data.ADR[adr]['checksum']);
+					//console.log('type: ' + jQuery.type(this.data.ADR[adr]['value']));
+					var types = new Array();
+					var ttypes = new Array();
+					for(var param in this.data.ADR[adr]['parameters']) {
+						//console.log('param: ' + param + ': ' + this.data.ADR[adr]['parameters'][param]);
+						if(param.toUpperCase() == 'TYPE') {
+							//console.log('param type: ' + jQuery.type(this.data.ADR[adr]['parameters'][param]));
+							types.push(t('contacts', ucwords(this.data.ADR[adr]['parameters'][param].toLowerCase())));
+							ttypes.push(this.data.ADR[adr]['parameters'][param]);
+							//for(ptype in this.data.ADR[adr]['parameters'][param]) {
+							//	var pt = this.data.ADR[adr]['parameters'][param][ptype];
+							//	// TODO: Create an array with types, translate, ucwords and join.
+							//}
+						}
+					}
+					//console.log('# types: ' + types.length);
+					//console.log('Types:' + types.join('/'));
+					$('#addressdisplay dl').last().find('.adr_type_label').text(types.join('/'));
+					$('#addressdisplay dl').last().find('.adr_type').val(ttypes.join(','));
+					$('#addressdisplay dl').last().find('.adr').val(adrarray.join(';'));
+					$('#addressdisplay dl').last().data('checksum', this.data.ADR[adr]['checksum']);
+				}
+				if($('#addressdisplay dl').length > 1) {
+					$('#addresses').show();
+				}
+				Contacts.UI.loadListHandlers();
+				return false;
+			},
+			editAddress:function(obj, isnew){
+				console.log('editAddress');
+				var container = undefined;
+				var q = q = '?id=' + this.id;
+				if(obj === 'new') {
+					isnew = true;
+					$('#addressdisplay dl').first().clone().insertAfter($('#addressdisplay dl').last()).show();
+					container = $('#addressdisplay dl').last();
+					container.removeClass('template').addClass('propertycontainer');
+					Contacts.UI.loadListHandlers();
+				} else {
+					q = q + '&checksum='+Contacts.UI.checksumFor(obj);
+				}
+				//console.log('editAddress: checksum ' + checksum);
+				/* Initialize the address edit dialog */
+				if($('#edit_address_dialog').dialog('isOpen') == true){
+					$('#edit_address_dialog').dialog('moveToTop');
+				}else{
+					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'editaddress.php')+q, function(){
+						$('#edit_address_dialog' ).dialog({
+								/*modal: true,*/
+								height: 'auto', width: 'auto',
+								buttons: {
+									'Ok':function() {
+										console.log('OK:isnew ' + isnew);
+										console.log('OK:obj ' + obj);
+										if(isnew) {
+											Contacts.UI.Card.saveAddress(this, $('#addressdisplay dl:last-child').find('input').first(), isnew);
+										} else {
+											Contacts.UI.Card.saveAddress(this, obj, isnew);
+										}
+										$(this).dialog('destroy').remove();
+									},
+									'Cancel':function() {
+										$(this).dialog('destroy').remove();
+										if(isnew) {
+											container.remove();
+										}
+									}
+								},
+								close : function(event, ui) {
+									//alert('close');
+									$(this).dialog('destroy').remove();
+									if(isnew) {
+										container.remove();
+									}
+								}/*,
+								open : function(event, ui) {
+									// load 'ADR' property - maybe :-P
+								}*/
+						});
+					});
+				}
+			},
+			saveAddress:function(dlg, obj, isnew){
+				if(isnew) {
+					container = $('#addressdisplay dl').last();
+					obj = $('#addressdisplay dl:last-child').find('input').first();
+				} else {
+					checksum = Contacts.UI.checksumFor(obj);
+					container = Contacts.UI.propertyContainerFor(obj);
+				}
+				var adr = new Array($(dlg).find('#adr_pobox').val(),$(dlg).find('#adr_extended').val(),$(dlg).find('#adr_street').val(),$(dlg).find('#adr_city').val(),$(dlg).find('#adr_region').val(),$(dlg).find('#adr_zipcode').val(),$(dlg).find('#adr_country').val());
+				$(container).find('.adr').val(adr.join(';'));
+				$(container).find('.adr_type').val($(dlg).find('#adr_type').val());
+				$(container).find('.adr_type_label').html(t('contacts',ucwords($(dlg).find('#adr_type').val().toLowerCase())));
+				Contacts.UI.Card.saveProperty($(container).find('input').first());
+				var adrtxt = '';
+				if(adr[0].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[0] + '</li>';
+				}
+				if(adr[1].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[1] + '</li>';
+				}
+				if(adr[2].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[2] + '</li>';
+				}
+				if(adr[3].length > 0 || adr[5].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[5] + ' ' + adr[3] + '</li>';
+				}
+				if(adr[4].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[4] + '</li>';
+				}
+				if(adr[6].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[6] + '</li>';
+				}
+				$(container).find('.addresslist').html(adrtxt);
+			},
+			uploadPhoto:function(filelist) {
+				if(!filelist) {
+					Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts','No files selected for upload.'));
+					return;
+				}
+				//var file = filelist.item(0);
+				var file = filelist[0];
+				var target = $('#file_upload_target');
+				var form = $('#file_upload_form');
+				var totalSize=0;
+				if(file.size > $('#max_upload').val()){
+					Contacts.UI.messageBox(t('Upload too large'), t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'));
+					return;
+				} else {
+					target.load(function(){
+						var response=jQuery.parseJSON(target.contents().text());
+						if(response != undefined && response.status == 'success'){
+							Contacts.UI.Card.editPhoto(response.data.id, response.data.tmp);
+							//alert('File: ' + file.tmp + ' ' + file.name + ' ' + file.mime);
+						}else{
+							Contacts.UI.messageBox(t('contacts', 'Error'), response.data.message);
+						}
+					});
+					form.submit();
+				}
+			},
+			loadPhoto:function(){
+				console.log('loadPhoto: ' + this.data.PHOTO);
+				if(this.data.PHOTO) {
+					$('#file_upload_form').show();
+					$('#contacts_propertymenu a[data-type="PHOTO"]').parent().hide();
+				} else {
+					$('#file_upload_form').hide();
+					$('#contacts_propertymenu a[data-type="PHOTO"]').parent().show();
+				}
+				$.getJSON('ajax/loadphoto.php',{'id':this.id},function(jsondata){
+					if(jsondata.status == 'success'){
+						//alert(jsondata.data.page);
+						$('#contacts_details_photo_wrapper').html(jsondata.data.page);
+					}
+					else{
+						Contacts.UI.messageBox(jsondata.data.message);
+					}
+				});
+			},
+			editPhoto:function(id, tmp_path){
+				//alert('editPhoto: ' + tmp_path);
+				$.getJSON('ajax/cropphoto.php',{'tmp_path':tmp_path,'id':this.id},function(jsondata){
+					if(jsondata.status == 'success'){
+						//alert(jsondata.data.page);
+						$('#edit_photo_dialog_img').html(jsondata.data.page);
+					}
+					else{
+						Contacts.UI.messageBox(jsondata.data.message);
+					}
+				});
+				if($('#edit_photo_dialog').dialog('isOpen') == true){
+					$('#edit_photo_dialog').dialog('moveToTop');
+				} else {
+					$('#edit_photo_dialog').dialog('open');
+				}
+			},
+			savePhoto:function(){
+				var target = $('#crop_target');
+				var form = $('#cropform');
+				form.submit();
+				target.load(function(){
+					var response=jQuery.parseJSON(target.contents().text());
+					if(response != undefined && response.status == 'success'){
+						// load cropped photo.
+						$('#contacts_details_photo_wrapper').html(response.data.page);
+					}else{
+						Contacts.UI.messageBox(t('contacts','Error'), response.data.message);
+					}
+				});
+				$('#contacts [data-id="'+this.id+'"]').find('a').css('background','url(thumbnail.php?id='+this.id+'&refresh=1'+Math.random()+') no-repeat');
+			},
+			addMail:function() {
+				//alert('addMail');
+				$('#emaillist li[class*="template"]:first-child').clone().appendTo($('#emaillist')).show();
+				$('#emaillist li[class*="template"]:last-child').removeClass('template').addClass('propertycontainer');
+				$('#emaillist li:last-child').find('input[type="email"]').focus();
+				Contacts.UI.loadListHandlers();
+				return false;
+			},
+			loadMails:function() {
+				$('#emails').hide();
+				$('#emaillist li[class*="propertycontainer"]').remove();
+				for(var mail in this.data.EMAIL) {
+					this.addMail();
+					//$('#emaillist li:first-child').clone().appendTo($('#emaillist')).show();
+					$('#emaillist li:last-child').data('checksum', this.data.EMAIL[mail]['checksum'])
+					$('#emaillist li:last-child').find('input[type="email"]').val(this.data.EMAIL[mail]['value']);
+					//console.log('EMAIL: ' + mail);
+					//console.log('value: ' + this.data.EMAIL[mail]['value']);
+					//console.log('checksum: ' + this.data.EMAIL[mail]['checksum']);
+					for(var param in this.data.EMAIL[mail]['parameters']) {
+						//console.log('param: ' + param + ': ' + this.data.EMAIL[mail]['parameters'][param]);
+						if(param.toUpperCase() == 'PREF') {
+							$('#emaillist li:last-child').find('input[type="checkbox"]').attr('checked', 'checked')
+						}
+					}
+					//console.log('parameters: ' + jQuery.type(this.data.EMAIL[mail]['parameters']));
+				}
+				if($('#emaillist li').length > 1) {
+					$('#emails').show();
+				}
+
+				$('#emaillist li:last-child').find('input[type="text"]').focus();
+				Contacts.UI.loadListHandlers();
+				return false;
+			},
+			addPhone:function() {
+				$('#phonelist li[class*="template"]:first-child').clone().appendTo($('#phonelist')); //.show();
+				$('#phonelist li[class*="template"]:last-child').find('select').addClass('contacts_property');
+				$('#phonelist li[class*="template"]:last-child').removeClass('template').addClass('propertycontainer');
+				$('#phonelist li:last-child').find('input[type="text"]').focus();
+				Contacts.UI.loadListHandlers();
+				$('#phonelist li:last-child').find('select').multiselect({
+														noneSelectedText: t('contacts', 'Select type'),
+														header: false,
+														selectedList: 4,
+														classes: 'typelist'
+													});
+				$('#phonelist li:last-child').show();
+				return false;
+			},
+			loadPhones:function() {
+				$('#phones').hide();
+				$('#phonelist li[class*="propertycontainer"]').remove();
+				for(var phone in this.data.TEL) {
+					this.addPhone();
+					$('#phonelist li:last-child').find('select').multiselect('destroy');
+					$('#phonelist li:last-child').data('checksum', this.data.TEL[phone]['checksum'])
+					$('#phonelist li:last-child').find('input[type="text"]').val(this.data.TEL[phone]['value']);
+					//console.log('TEL: ' + phone);
+					//console.log('value: ' + this.data.TEL[phone]['value']);
+					//console.log('checksum: ' + this.data.TEL[phone]['checksum']);
+					for(var param in this.data.TEL[phone]['parameters']) {
+						//console.log('param: ' + param + ': ' + this.data.TEL[phone]['parameters'][param]);
+						if(param.toUpperCase() == 'PREF') {
+							$('#phonelist li:last-child').find('input[type="checkbox"]').attr('checked', 'checked');
+						}
+						else if(param.toUpperCase() == 'TYPE') {
+							//console.log('param type: ' + jQuery.type(this.data.TEL[phone]['parameters'][param]));
+							for(ptype in this.data.TEL[phone]['parameters'][param]) {
+								var pt = this.data.TEL[phone]['parameters'][param][ptype];
+								$('#phonelist li:last-child').find('select option').each(function(){
+									//console.log('Test: ' + $(this).val().toUpperCase() + '==' + pt);
+									if ($(this).val().toUpperCase() == pt) {
+										//console.log('Selected: ' + pt);
+										$(this).attr('selected', 'selected');
+									}
+								});
+							}
+						}
+					}
+					$('#phonelist li:last-child').find('select').multiselect({
+														noneSelectedText: t('contacts', 'Select type'),
+														header: false,
+														selectedList: 4,
+														classes: 'typelist'
+													});
+					//console.log('parameters: ' + jQuery.type(this.data.EMAIL[mail]['parameters']));
+				}
+				if($('#phonelist li').length > 1) {
+					$('#phones').show();
+				}
+				return false;
+			},
+		},
+		Addressbooks:{
+			overview:function(){
+				if($('#chooseaddressbook_dialog').dialog('isOpen') == true){
+					$('#chooseaddressbook_dialog').dialog('moveToTop');
+				}else{
+					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(){
+						$('#chooseaddressbook_dialog').dialog({
+							width : 600,
+							close : function(event, ui) {
+								$(this).dialog('destroy').remove();
+							}
+						});
+					});
+				}
+			},
+			activation:function(checkbox, bookid)
+			{
+				$.post(OC.filePath('contacts', 'ajax', 'activation.php'), { bookid: bookid, active: checkbox.checked?1:0 },
+				  function(data) {
+					/*
+					 * Arguments:
+					 * data.status
+					 * data.bookid
+					 * data.active
+					 */
+					if (data.status == 'success'){
+						checkbox.checked = data.active == 1;
+						Contacts.UI.Contacts.update();
+					}
+				  });
+			},
+			newAddressbook:function(object){
+				var tr = $(document.createElement('tr'))
+					.load(OC.filePath('contacts', 'ajax', 'addbook.php'));
+				$(object).closest('tr').after(tr).hide();
+				/* TODO: Shouldn't there be some kinda error checking here? */
+			},
+			editAddressbook:function(object, bookid){
+				var tr = $(document.createElement('tr'))
+					.load(OC.filePath('contacts', 'ajax', 'editaddressbook.php') + "?bookid="+bookid);
+				$(object).closest('tr').after(tr).hide();
+			},
+			deleteAddressbook:function(bookid){
+				var check = confirm("Do you really want to delete this address book?");
+				if(check == false){
+					return false;
+				}else{
+					$.post(OC.filePath('contacts', 'ajax', 'deletebook.php'), { id: bookid},
+					  function(data) {
+						if (data.status == 'success'){
+							$('#chooseaddressbook_dialog').dialog('destroy').remove();
+							Contacts.UI.Contacts.update();
+							Contacts.UI.Addressbooks.overview();
+						} else {
+							Contacts.UI.messageBox(t('contacts', 'Error'), data.message);
+							//alert('Error: ' + data.message);
+						}
+					  });
+				}
+			},
+			import:function(){
+				Contacts.UI.notImplemented();
+			},
+			submit:function(button, bookid){
+				var displayname = $("#displayname_"+bookid).val();
+				var active = $("#edit_active_"+bookid+":checked").length;
+				var description = $("#description_"+bookid).val();
+
+				var url;
+				if (bookid == 'new'){
+					url = OC.filePath('contacts', 'ajax', 'createaddressbook.php');
+				}else{
+					url = OC.filePath('contacts', 'ajax', 'updateaddressbook.php');
+				}
+				$.post(url, { id: bookid, name: displayname, active: active, description: description },
+					function(data){
+						if(data.status == 'success'){
+							$(button).closest('tr').prev().html(data.page).show().next().remove();
+						}
+					});
+				Contacts.UI.Contacts.update();
+			},
+			cancel:function(button, bookid){
+				$(button).closest('tr').prev().show().next().remove();
+			}
+		},
+		Contacts:{
+			/**
+			 * Reload the contacts list.
+			 */
+			update:function(){
+				$.getJSON('ajax/contacts.php',{},function(jsondata){
+					if(jsondata.status == 'success'){
+						$('#contacts').html(jsondata.data.page);
+					}
+					else{
+						Contacts.UI.messageBox(t('contacts', 'Error'),jsondata.data.message);
+						//alert(jsondata.data.message);
+					}
+				});
+				setTimeout(Contacts.UI.Contacts.lazyupdate, 500);
+			},
+			/**
+			 * Add thumbnails to the contact list as they become visible in the viewport.
+			 */
+			lazyupdate:function(){
+				$('#contacts li').live('inview', function(){
+					if (!$(this).find('a').attr('style')) {
+						$(this).find('a').css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
+					}
+				});
+			}
+		}
+	}
+}
+$(document).ready(function(){
+
+	Contacts.UI.loadHandlers();
+
+	/**
+	 * Show the Addressbook chooser
+	 */
+	$('#chooseaddressbook').click(function(){
+		Contacts.UI.Addressbooks.overview();
+		return false;
+	});
+
+	/**
+	 * Open blank form to add new contact.
+	 * FIXME: Load the same page but only show name data and popup the name edit dialog. 
+	 * On save load the page again with an id and show all fields.
+	 * NOTE: Or: Load the full page and popup name dialog modal. On success set the newly aquired ID, on
+	 * Cancel or failure give appropriate message and show ... something else :-P
+	 */
+	$('#contacts_newcontact').click(function(){
+		Contacts.UI.Card.editNew();
+// 		$.getJSON('ajax/addcontact.php',{},function(jsondata){
+// 			if(jsondata.status == 'success'){
+// 				$('#rightcontent').data('id','');
+// 				$('#rightcontent').html(jsondata.data.page)
+// 					.find('select').chosen();
+// 			}
+// 			else{
+// 				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+// 				//alert(jsondata.data.message);
+// 			}
+// 		});
+// 		return false;
+	});
+	
+	/**
+	 * Load the details view for a contact.
+	 */
+	$('#leftcontent li').live('click',function(){
+		var id = $(this).data('id');
+		var oldid = $('#rightcontent').data('id');
+		if(oldid != 0){
+			$('#leftcontent li[data-id="'+oldid+'"]').removeClass('active');
+		}
+		$.getJSON('ajax/contactdetails.php',{'id':id},function(jsondata){
+			if(jsondata.status == 'success'){
+				Contacts.UI.Card.loadContact(jsondata.data);
+			}
+			else{
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+				//alert(jsondata.data.message);
+			}
+		});
+		// NOTE: Deprecated.
+// 		$.getJSON('ajax/getdetails.php',{'id':id, 'new':1},function(jsondata){
+// 			if(jsondata.status == 'success'){
+// 				$('#rightcontent').data('id',jsondata.data.id);
+// 				$('#rightcontent').html(jsondata.data.page);
+// 				$('#leftcontent li[data-id="'+jsondata.data.id+'"]').addClass('active');
+// 				//Contacts.UI.loadHandlers();
+// 			}
+// 			else{
+// 				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+// 				//alert(jsondata.data.message);
+// 			}
+// 		});
+		return false;
+	});
+
+	/**
+	 * Delete currently selected contact TODO: and clear page
+	 */
+	$('#contacts_deletecard').live('click',function(){
+		Contacts.UI.Card.delete();
+	});
+
+	/**
+	 * Add and insert a new contact into the list.
+	 */
+	$('#contacts_addcardform input[type="submit"]').live('click',function(){
+		$.post('ajax/addcontact.php',$('#contact_identity').serialize(),function(jsondata){
+			if(jsondata.status == 'success'){
+				$('#rightcontent').data('id',jsondata.data.id);
+				$('#rightcontent').html(jsondata.data.page);
+				$('#leftcontent .active').removeClass('active');
+				var item = '<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'"  style="background: url(thumbnail.php?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+jsondata.data.name+'</a></li>';
+				var added = false;
+				$('#leftcontent ul li').each(function(){
+					if ($(this).text().toLowerCase() > jsondata.data.name.toLowerCase()) {
+						$(this).before(item).fadeIn('fast');
+						added = true;
+						return false;
+					}
+				});
+				if(!added) {
+					$('#leftcontent ul').append(item);
+				}
+			}
+			else{
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+				//alert(jsondata.data.message);
+			}
+		}, 'json');
+		return false;
+	});
+	
+	$('#contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+		if (isInView) { //NOTE: I've kept all conditions for future reference ;-)
+			// element is now visible in the viewport
+			if (visiblePartY == 'top') {
+				// top part of element is visible
+			} else if (visiblePartY == 'bottom') {
+				// bottom part of element is visible
+			} else {
+				// whole part of element is visible
+				if (!$(this).find('a').attr('style')) {
+					//alert($(this).data('id') + ' has background: ' + $(this).attr('style'));
+					$(this).find('a').css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
+				}/* else {
+					alert($(this).data('id') + ' has style ' + $(this).attr('style').match('url'));
+				}*/
+			}
+		} else {
+			// element has gone out of viewport
+		}
+	});
+	
+	$('.button').tipsy();
+	// Triggers invisible file input
+	$('#contacts_details_photo').live('click', function() {
+		$('#file_upload_start').trigger('click');
+		return false;
+	});
+	
+	// NOTE: For some reason the selector doesn't work when I select by '.contacts_property' too...
+	// I do the filtering in the event handler instead.
+	$('input[type="text"],input[type="checkbox"],input[type="email"],input[type="tel"],input[type="date"], select').live('change', function(){
+		Contacts.UI.Card.saveProperty(this);
+	});
+
+	// Name has changed. Update it and reorder.
+	$('#fn').live('change',function(){
+		var name = $('#fn').val();
+		var item = $('#contacts [data-id="'+Contacts.UI.Card.id+'"]').clone();
+		$('#contacts [data-id="'+Contacts.UI.Card.id+'"]').remove();
+		$(item).find('a').html(name);
+		var added = false;
+		$('#contacts li').each(function(){
+			if ($(this).text().toLowerCase() > name.toLowerCase()) {
+				$(this).before(item).fadeIn('fast');
+				added = true;
+				return false;
+			}
+		});
+		if(!added) {
+			$('#leftcontent ul').append(item);
+		}
+	});
+
+	/**
+	 * Profile picture upload handling
+	 */
+	// New profile picture selected
+	$('#file_upload_start').live('change',function(){
+		Contacts.UI.Card.uploadPhoto(this.files);
+	});
+	$('#contacts_details_photo').bind('dragover',function(event){
+		console.log('dragover');
+		$(event.target).css('background-color','red');
+		event.stopPropagation();
+		event.preventDefault();  
+	});
+	$('#contacts_details_photo').bind('dragleave',function(event){
+		console.log('dragleave');
+		$(event.target).css('background-color','white');
+		//event.stopPropagation();
+		//event.preventDefault();  
+	});
+	$('#contacts_details_photo').bind('drop',function(event){
+		event.stopPropagation();
+		event.preventDefault();
+		console.log('drop');
+		$(event.target).css('background-color','white')
+		$.fileUpload(event.originalEvent.dataTransfer.files);
+	});
+
+	/**
+	 * Upload function for dropped files. Should go in the Contacts class/object.
+	 */
+	$.fileUpload = function(files){
+		var file = files[0];
+		console.log('size: '+file.size);
+		if(file.size > $('#max_upload').val()){
+			Contacts.UI.messageBox(t('contacts','Upload too large'), t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'));
+			return;
+		}
+		if (file.type.indexOf("image") != 0) {
+			Contacts.UI.messageBox(t('contacts','Wrong file type'), t('contacts','Only image files can be used as profile picture.'));
+			return;
+		}
+		var xhr = new XMLHttpRequest();
+
+		if (!xhr.upload) {
+			Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', 'Your browser doesn\'t support AJAX upload. Please click on the profile picture to select a photo to upload.'))
+		}
+		fileUpload = xhr.upload,
+		xhr.onreadystatechange = function() {
+			if (xhr.readyState == 4){
+				response = $.parseJSON(xhr.responseText);
+				if(response.status == 'success') {
+					if(xhr.status == 200) {
+						Contacts.UI.Card.editPhoto(response.data.id, response.data.tmp);
+					} else {
+						Contacts.UI.messageBox(t('contacts', 'Error'), xhr.status + ': ' + xhr.responseText);
+					}
+				} else {
+					//alert(xhr.responseText);
+					Contacts.UI.messageBox(t('contacts', 'Error'), response.data.message);
+				}
+				// stop loading indicator
+				//$('#contacts_details_photo_progress').hide();
+			}
+		};
+	
+		fileUpload.onprogress = function(e){
+			if (e.lengthComputable){
+				var _progress = Math.round((e.loaded * 100) / e.total);
+				if (_progress != 100){
+					$('#contacts_details_photo_progress').text(_progress + '%');
+					$('#contacts_details_photo_progress').val(_progress);
+				}
+			}
+		};
+		// Start loading indicator.
+		//$('#contacts_details_photo_progress').show()();
+		xhr.open("POST", 'ajax/uploadphoto.php?id='+Contacts.UI.Card.id+'&imagefile='+encodeURIComponent(file.name), true);
+		xhr.setRequestHeader('Cache-Control', 'no-cache');
+		xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+		xhr.setRequestHeader('X_FILE_NAME', encodeURIComponent(file.name));
+		//xhr.setRequestHeader("X_FILENAME", file.name);
+		xhr.setRequestHeader('X-File-Size', file.size);
+		xhr.setRequestHeader('Content-Type', file.type);
+		xhr.send(file);
+	}
+
+	$('#contacts_propertymenu a').live('click',function(){
+		Contacts.UI.Card.addProperty(this);
+	});
+
+	
+});
diff --git a/apps/contacts/js/jquery.Jcrop.js b/apps/contacts/js/jquery.Jcrop.js
new file mode 100644
index 00000000000..36f9a0f08f8
--- /dev/null
+++ b/apps/contacts/js/jquery.Jcrop.js
@@ -0,0 +1,1765 @@
+/**
+ * jquery.Jcrop.js v0.9.9 {{{
+ *
+ * jQuery Image Cropping Plugin - released under MIT License 
+ * Author: Kelly Hallman <khallman@gmail.com>
+ * http://github.com/tapmodo/Jcrop
+ *
+ * }}}
+ * Copyright (c) 2008-2012 Tapmodo Interactive LLC {{{
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * }}}
+ */
+
+(function ($) {
+
+  $.Jcrop = function (obj, opt) {
+    var options = $.extend({}, $.Jcrop.defaults),
+        docOffset, lastcurs, ie6mode = false;
+
+    // Internal Methods {{{
+    function px(n) {
+      return parseInt(n, 10) + 'px';
+    }
+    function cssClass(cl) {
+      return options.baseClass + '-' + cl;
+    }
+    function supportsColorFade() {
+      return $.fx.step.hasOwnProperty('backgroundColor');
+    }
+    function getPos(obj) //{{{
+    {
+      var pos = $(obj).offset();
+      return [pos.left, pos.top];
+    }
+    //}}}
+    function mouseAbs(e) //{{{
+    {
+      return [(e.pageX - docOffset[0]), (e.pageY - docOffset[1])];
+    }
+    //}}}
+    function setOptions(opt) //{{{
+    {
+      if (typeof(opt) !== 'object') opt = {};
+      options = $.extend(options, opt);
+
+      $.each(['onChange','onSelect','onRelease','onDblClick'],function(i,e) {
+        if (typeof(options[e]) !== 'function') options[e] = function () {};
+      });
+    }
+    //}}}
+    function startDragMode(mode, pos) //{{{
+    {
+      docOffset = getPos($img);
+      Tracker.setCursor(mode === 'move' ? mode : mode + '-resize');
+
+      if (mode === 'move') {
+        return Tracker.activateHandlers(createMover(pos), doneSelect);
+      }
+
+      var fc = Coords.getFixed();
+      var opp = oppLockCorner(mode);
+      var opc = Coords.getCorner(oppLockCorner(opp));
+
+      Coords.setPressed(Coords.getCorner(opp));
+      Coords.setCurrent(opc);
+
+      Tracker.activateHandlers(dragmodeHandler(mode, fc), doneSelect);
+    }
+    //}}}
+    function dragmodeHandler(mode, f) //{{{
+    {
+      return function (pos) {
+        if (!options.aspectRatio) {
+          switch (mode) {
+          case 'e':
+            pos[1] = f.y2;
+            break;
+          case 'w':
+            pos[1] = f.y2;
+            break;
+          case 'n':
+            pos[0] = f.x2;
+            break;
+          case 's':
+            pos[0] = f.x2;
+            break;
+          }
+        } else {
+          switch (mode) {
+          case 'e':
+            pos[1] = f.y + 1;
+            break;
+          case 'w':
+            pos[1] = f.y + 1;
+            break;
+          case 'n':
+            pos[0] = f.x + 1;
+            break;
+          case 's':
+            pos[0] = f.x + 1;
+            break;
+          }
+        }
+        Coords.setCurrent(pos);
+        Selection.update();
+      };
+    }
+    //}}}
+    function createMover(pos) //{{{
+    {
+      var lloc = pos;
+      KeyManager.watchKeys();
+
+      return function (pos) {
+        Coords.moveOffset([pos[0] - lloc[0], pos[1] - lloc[1]]);
+        lloc = pos;
+
+        Selection.update();
+      };
+    }
+    //}}}
+    function oppLockCorner(ord) //{{{
+    {
+      switch (ord) {
+      case 'n':
+        return 'sw';
+      case 's':
+        return 'nw';
+      case 'e':
+        return 'nw';
+      case 'w':
+        return 'ne';
+      case 'ne':
+        return 'sw';
+      case 'nw':
+        return 'se';
+      case 'se':
+        return 'nw';
+      case 'sw':
+        return 'ne';
+      }
+    }
+    //}}}
+    function createDragger(ord) //{{{
+    {
+      return function (e) {
+        if (options.disabled) {
+          return false;
+        }
+        if ((ord === 'move') && !options.allowMove) {
+          return false;
+        }
+        
+        // Fix position of crop area when dragged the very first time.
+        // Necessary when crop image is in a hidden element when page is loaded.
+        docOffset = getPos($img);
+
+        btndown = true;
+        startDragMode(ord, mouseAbs(e));
+        e.stopPropagation();
+        e.preventDefault();
+        return false;
+      };
+    }
+    //}}}
+    function presize($obj, w, h) //{{{
+    {
+      var nw = $obj.width(),
+          nh = $obj.height();
+      if ((nw > w) && w > 0) {
+        nw = w;
+        nh = (w / $obj.width()) * $obj.height();
+      }
+      if ((nh > h) && h > 0) {
+        nh = h;
+        nw = (h / $obj.height()) * $obj.width();
+      }
+      xscale = $obj.width() / nw;
+      yscale = $obj.height() / nh;
+      $obj.width(nw).height(nh);
+    }
+    //}}}
+    function unscale(c) //{{{
+    {
+      return {
+        x: parseInt(c.x * xscale, 10),
+        y: parseInt(c.y * yscale, 10),
+        x2: parseInt(c.x2 * xscale, 10),
+        y2: parseInt(c.y2 * yscale, 10),
+        w: parseInt(c.w * xscale, 10),
+        h: parseInt(c.h * yscale, 10)
+      };
+    }
+    //}}}
+    function doneSelect(pos) //{{{
+    {
+      var c = Coords.getFixed();
+      if ((c.w > options.minSelect[0]) && (c.h > options.minSelect[1])) {
+        Selection.enableHandles();
+        Selection.done();
+      } else {
+        Selection.release();
+      }
+      Tracker.setCursor(options.allowSelect ? 'crosshair' : 'default');
+    }
+    //}}}
+    function newSelection(e) //{{{
+    {
+      if (options.disabled) {
+        return false;
+      }
+      if (!options.allowSelect) {
+        return false;
+      }
+      btndown = true;
+      docOffset = getPos($img);
+      Selection.disableHandles();
+      Tracker.setCursor('crosshair');
+      var pos = mouseAbs(e);
+      Coords.setPressed(pos);
+      Selection.update();
+      Tracker.activateHandlers(selectDrag, doneSelect);
+      KeyManager.watchKeys();
+
+      e.stopPropagation();
+      e.preventDefault();
+      return false;
+    }
+    //}}}
+    function selectDrag(pos) //{{{
+    {
+      Coords.setCurrent(pos);
+      Selection.update();
+    }
+    //}}}
+    function newTracker() //{{{
+    {
+      var trk = $('<div></div>').addClass(cssClass('tracker'));
+      if ($.browser.msie) {
+        trk.css({
+          opacity: 0,
+          backgroundColor: 'white'
+        });
+      }
+      return trk;
+    }
+    //}}}
+
+    // }}}
+    // Initialization {{{
+    // Sanitize some options {{{
+    if ($.browser.msie && ($.browser.version.split('.')[0] === '6')) {
+      ie6mode = true;
+    }
+    if (typeof(obj) !== 'object') {
+      obj = $(obj)[0];
+    }
+    if (typeof(opt) !== 'object') {
+      opt = {};
+    }
+    // }}}
+    setOptions(opt);
+    // Initialize some jQuery objects {{{
+    // The values are SET on the image(s) for the interface
+    // If the original image has any of these set, they will be reset
+    // However, if you destroy() the Jcrop instance the original image's
+    // character in the DOM will be as you left it.
+    var img_css = {
+      border: 'none',
+      visibility: 'visible',
+      margin: 0,
+      padding: 0,
+      position: 'absolute',
+      top: 0,
+      left: 0
+    };
+
+    var $origimg = $(obj),
+      img_mode = true;
+
+    if (obj.tagName == 'IMG') {
+      // Fix size of crop image.
+      // Necessary when crop image is within a hidden element when page is loaded.
+      if ($origimg[0].width != 0 && $origimg[0].height != 0) {
+        // Obtain dimensions from contained img element.
+        $origimg.width($origimg[0].width);
+        $origimg.height($origimg[0].height);
+      } else {
+        // Obtain dimensions from temporary image in case the original is not loaded yet (e.g. IE 7.0). 
+        var tempImage = new Image();
+        tempImage.src = $origimg[0].src;
+        $origimg.width(tempImage.width);
+        $origimg.height(tempImage.height);
+      } 
+
+      var $img = $origimg.clone().removeAttr('id').css(img_css).show();
+
+      $img.width($origimg.width());
+      $img.height($origimg.height());
+      $origimg.after($img).hide();
+
+    } else {
+      $img = $origimg.css(img_css).show();
+      img_mode = false;
+      if (options.shade === null) { options.shade = true; }
+    }
+
+    presize($img, options.boxWidth, options.boxHeight);
+
+    var boundx = $img.width(),
+        boundy = $img.height(),
+        
+        
+        $div = $('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({
+        position: 'relative',
+        backgroundColor: options.bgColor
+      }).insertAfter($origimg).append($img);
+
+    if (options.addClass) {
+      $div.addClass(options.addClass);
+    }
+
+    var $img2 = $('<div />'),
+
+        $img_holder = $('<div />') 
+        .width('100%').height('100%').css({
+          zIndex: 310,
+          position: 'absolute',
+          overflow: 'hidden'
+        }),
+
+        $hdl_holder = $('<div />') 
+        .width('100%').height('100%').css('zIndex', 320), 
+
+        $sel = $('<div />') 
+        .css({
+          position: 'absolute',
+          zIndex: 600
+        }).dblclick(function(){
+          var c = Coords.getFixed();
+          options.onDblClick.call(api,c);
+        }).insertBefore($img).append($img_holder, $hdl_holder); 
+
+    if (img_mode) {
+
+      $img2 = $('<img />')
+          .attr('src', $img.attr('src')).css(img_css).width(boundx).height(boundy),
+
+      $img_holder.append($img2);
+
+    }
+
+    if (ie6mode) {
+      $sel.css({
+        overflowY: 'hidden'
+      });
+    }
+
+    var bound = options.boundary;
+    var $trk = newTracker().width(boundx + (bound * 2)).height(boundy + (bound * 2)).css({
+      position: 'absolute',
+      top: px(-bound),
+      left: px(-bound),
+      zIndex: 290
+    }).mousedown(newSelection);
+
+    /* }}} */
+    // Set more variables {{{
+    var bgcolor = options.bgColor,
+        bgopacity = options.bgOpacity,
+        xlimit, ylimit, xmin, ymin, xscale, yscale, enabled = true,
+        btndown, animating, shift_down;
+
+    docOffset = getPos($img);
+    // }}}
+    // }}}
+    // Internal Modules {{{
+    // Touch Module {{{ 
+    var Touch = (function () {
+      // Touch support detection function adapted (under MIT License)
+      // from code by Jeffrey Sambells - http://github.com/iamamused/
+      function hasTouchSupport() {
+        var support = {},
+            events = ['touchstart', 'touchmove', 'touchend'],
+            el = document.createElement('div'), i;
+
+        try {
+          for(i=0; i<events.length; i++) {
+            var eventName = events[i];
+            eventName = 'on' + eventName;
+            var isSupported = (eventName in el);
+            if (!isSupported) {
+              el.setAttribute(eventName, 'return;');
+              isSupported = typeof el[eventName] == 'function';
+            }
+            support[events[i]] = isSupported;
+          }
+          return support.touchstart && support.touchend && support.touchmove;
+        }
+        catch(err) {
+          return false;
+        }
+      }
+
+      function detectSupport() {
+        if ((options.touchSupport === true) || (options.touchSupport === false)) return options.touchSupport;
+          else return hasTouchSupport();
+      }
+      return {
+        createDragger: function (ord) {
+          return function (e) {
+            e.pageX = e.originalEvent.changedTouches[0].pageX;
+            e.pageY = e.originalEvent.changedTouches[0].pageY;
+            if (options.disabled) {
+              return false;
+            }
+            if ((ord === 'move') && !options.allowMove) {
+              return false;
+            }
+            btndown = true;
+            startDragMode(ord, mouseAbs(e));
+            e.stopPropagation();
+            e.preventDefault();
+            return false;
+          };
+        },
+        newSelection: function (e) {
+          e.pageX = e.originalEvent.changedTouches[0].pageX;
+          e.pageY = e.originalEvent.changedTouches[0].pageY;
+          return newSelection(e);
+        },
+        isSupported: hasTouchSupport,
+        support: detectSupport()
+      };
+    }());
+    // }}}
+    // Coords Module {{{
+    var Coords = (function () {
+      var x1 = 0,
+          y1 = 0,
+          x2 = 0,
+          y2 = 0,
+          ox, oy;
+
+      function setPressed(pos) //{{{
+      {
+        pos = rebound(pos);
+        x2 = x1 = pos[0];
+        y2 = y1 = pos[1];
+      }
+      //}}}
+      function setCurrent(pos) //{{{
+      {
+        pos = rebound(pos);
+        ox = pos[0] - x2;
+        oy = pos[1] - y2;
+        x2 = pos[0];
+        y2 = pos[1];
+      }
+      //}}}
+      function getOffset() //{{{
+      {
+        return [ox, oy];
+      }
+      //}}}
+      function moveOffset(offset) //{{{
+      {
+        var ox = offset[0],
+            oy = offset[1];
+
+        if (0 > x1 + ox) {
+          ox -= ox + x1;
+        }
+        if (0 > y1 + oy) {
+          oy -= oy + y1;
+        }
+
+        if (boundy < y2 + oy) {
+          oy += boundy - (y2 + oy);
+        }
+        if (boundx < x2 + ox) {
+          ox += boundx - (x2 + ox);
+        }
+
+        x1 += ox;
+        x2 += ox;
+        y1 += oy;
+        y2 += oy;
+      }
+      //}}}
+      function getCorner(ord) //{{{
+      {
+        var c = getFixed();
+        switch (ord) {
+        case 'ne':
+          return [c.x2, c.y];
+        case 'nw':
+          return [c.x, c.y];
+        case 'se':
+          return [c.x2, c.y2];
+        case 'sw':
+          return [c.x, c.y2];
+        }
+      }
+      //}}}
+      function getFixed() //{{{
+      {
+        if (!options.aspectRatio) {
+          return getRect();
+        }
+        // This function could use some optimization I think...
+        var aspect = options.aspectRatio,
+            min_x = options.minSize[0] / xscale,
+            
+            
+            //min_y = options.minSize[1]/yscale,
+            max_x = options.maxSize[0] / xscale,
+            max_y = options.maxSize[1] / yscale,
+            rw = x2 - x1,
+            rh = y2 - y1,
+            rwa = Math.abs(rw),
+            rha = Math.abs(rh),
+            real_ratio = rwa / rha,
+            xx, yy, w, h;
+
+        if (max_x === 0) {
+          max_x = boundx * 10;
+        }
+        if (max_y === 0) {
+          max_y = boundy * 10;
+        }
+        if (real_ratio < aspect) {
+          yy = y2;
+          w = rha * aspect;
+          xx = rw < 0 ? x1 - w : w + x1;
+
+          if (xx < 0) {
+            xx = 0;
+            h = Math.abs((xx - x1) / aspect);
+            yy = rh < 0 ? y1 - h : h + y1;
+          } else if (xx > boundx) {
+            xx = boundx;
+            h = Math.abs((xx - x1) / aspect);
+            yy = rh < 0 ? y1 - h : h + y1;
+          }
+        } else {
+          xx = x2;
+          h = rwa / aspect;
+          yy = rh < 0 ? y1 - h : y1 + h;
+          if (yy < 0) {
+            yy = 0;
+            w = Math.abs((yy - y1) * aspect);
+            xx = rw < 0 ? x1 - w : w + x1;
+          } else if (yy > boundy) {
+            yy = boundy;
+            w = Math.abs(yy - y1) * aspect;
+            xx = rw < 0 ? x1 - w : w + x1;
+          }
+        }
+
+        // Magic %-)
+        if (xx > x1) { // right side
+          if (xx - x1 < min_x) {
+            xx = x1 + min_x;
+          } else if (xx - x1 > max_x) {
+            xx = x1 + max_x;
+          }
+          if (yy > y1) {
+            yy = y1 + (xx - x1) / aspect;
+          } else {
+            yy = y1 - (xx - x1) / aspect;
+          }
+        } else if (xx < x1) { // left side
+          if (x1 - xx < min_x) {
+            xx = x1 - min_x;
+          } else if (x1 - xx > max_x) {
+            xx = x1 - max_x;
+          }
+          if (yy > y1) {
+            yy = y1 + (x1 - xx) / aspect;
+          } else {
+            yy = y1 - (x1 - xx) / aspect;
+          }
+        }
+
+        if (xx < 0) {
+          x1 -= xx;
+          xx = 0;
+        } else if (xx > boundx) {
+          x1 -= xx - boundx;
+          xx = boundx;
+        }
+
+        if (yy < 0) {
+          y1 -= yy;
+          yy = 0;
+        } else if (yy > boundy) {
+          y1 -= yy - boundy;
+          yy = boundy;
+        }
+
+        return makeObj(flipCoords(x1, y1, xx, yy));
+      }
+      //}}}
+      function rebound(p) //{{{
+      {
+        if (p[0] < 0) {
+          p[0] = 0;
+        }
+        if (p[1] < 0) {
+          p[1] = 0;
+        }
+
+        if (p[0] > boundx) {
+          p[0] = boundx;
+        }
+        if (p[1] > boundy) {
+          p[1] = boundy;
+        }
+
+        return [p[0], p[1]];
+      }
+      //}}}
+      function flipCoords(x1, y1, x2, y2) //{{{
+      {
+        var xa = x1,
+            xb = x2,
+            ya = y1,
+            yb = y2;
+        if (x2 < x1) {
+          xa = x2;
+          xb = x1;
+        }
+        if (y2 < y1) {
+          ya = y2;
+          yb = y1;
+        }
+        return [Math.round(xa), Math.round(ya), Math.round(xb), Math.round(yb)];
+      }
+      //}}}
+      function getRect() //{{{
+      {
+        var xsize = x2 - x1,
+            ysize = y2 - y1,
+            delta;
+
+        if (xlimit && (Math.abs(xsize) > xlimit)) {
+          x2 = (xsize > 0) ? (x1 + xlimit) : (x1 - xlimit);
+        }
+        if (ylimit && (Math.abs(ysize) > ylimit)) {
+          y2 = (ysize > 0) ? (y1 + ylimit) : (y1 - ylimit);
+        }
+
+        if (ymin / yscale && (Math.abs(ysize) < ymin / yscale)) {
+          y2 = (ysize > 0) ? (y1 + ymin / yscale) : (y1 - ymin / yscale);
+        }
+        if (xmin / xscale && (Math.abs(xsize) < xmin / xscale)) {
+          x2 = (xsize > 0) ? (x1 + xmin / xscale) : (x1 - xmin / xscale);
+        }
+
+        if (x1 < 0) {
+          x2 -= x1;
+          x1 -= x1;
+        }
+        if (y1 < 0) {
+          y2 -= y1;
+          y1 -= y1;
+        }
+        if (x2 < 0) {
+          x1 -= x2;
+          x2 -= x2;
+        }
+        if (y2 < 0) {
+          y1 -= y2;
+          y2 -= y2;
+        }
+        if (x2 > boundx) {
+          delta = x2 - boundx;
+          x1 -= delta;
+          x2 -= delta;
+        }
+        if (y2 > boundy) {
+          delta = y2 - boundy;
+          y1 -= delta;
+          y2 -= delta;
+        }
+        if (x1 > boundx) {
+          delta = x1 - boundy;
+          y2 -= delta;
+          y1 -= delta;
+        }
+        if (y1 > boundy) {
+          delta = y1 - boundy;
+          y2 -= delta;
+          y1 -= delta;
+        }
+
+        return makeObj(flipCoords(x1, y1, x2, y2));
+      }
+      //}}}
+      function makeObj(a) //{{{
+      {
+        return {
+          x: a[0],
+          y: a[1],
+          x2: a[2],
+          y2: a[3],
+          w: a[2] - a[0],
+          h: a[3] - a[1]
+        };
+      }
+      //}}}
+
+      return {
+        flipCoords: flipCoords,
+        setPressed: setPressed,
+        setCurrent: setCurrent,
+        getOffset: getOffset,
+        moveOffset: moveOffset,
+        getCorner: getCorner,
+        getFixed: getFixed
+      };
+    }());
+
+    //}}}
+    // Shade Module {{{
+    var Shade = (function() {
+      var enabled = false,
+          holder = $('<div />').css({
+            position: 'absolute',
+            zIndex: 240,
+            opacity: 0
+          }),
+          shades = {
+            top: createShade(),
+            left: createShade().height(boundy),
+            right: createShade().height(boundy),
+            bottom: createShade()
+          };
+
+      function resizeShades(w,h) {
+        shades.left.css({ height: px(h) });
+        shades.right.css({ height: px(h) });
+      }
+      function updateAuto()
+      {
+        return updateShade(Coords.getFixed());
+      }
+      function updateShade(c)
+      {
+        shades.top.css({
+          left: px(c.x),
+          width: px(c.w),
+          height: px(c.y)
+        });
+        shades.bottom.css({
+          top: px(c.y2),
+          left: px(c.x),
+          width: px(c.w),
+          height: px(boundy-c.y2)
+        });
+        shades.right.css({
+          left: px(c.x2),
+          width: px(boundx-c.x2)
+        });
+        shades.left.css({
+          width: px(c.x)
+        });
+      }
+      function createShade() {
+        return $('<div />').css({
+          position: 'absolute',
+          backgroundColor: options.shadeColor||options.bgColor
+        }).appendTo(holder);
+      }
+      function enableShade() {
+        if (!enabled) {
+          enabled = true;
+          holder.insertBefore($img);
+          updateAuto();
+          Selection.setBgOpacity(1,0,1);
+          $img2.hide();
+
+          setBgColor(options.shadeColor||options.bgColor,1);
+          if (Selection.isAwake())
+          {
+            setOpacity(options.bgOpacity,1);
+          }
+            else setOpacity(1,1);
+        }
+      }
+      function setBgColor(color,now) {
+        colorChangeMacro(getShades(),color,now);
+      }
+      function disableShade() {
+        if (enabled) {
+          holder.remove();
+          $img2.show();
+          enabled = false;
+          if (Selection.isAwake()) {
+            Selection.setBgOpacity(options.bgOpacity,1,1);
+          } else {
+            Selection.setBgOpacity(1,1,1);
+            Selection.disableHandles();
+          }
+          colorChangeMacro($div,0,1);
+        }
+      }
+      function setOpacity(opacity,now) {
+        if (enabled) {
+          if (options.bgFade && !now) {
+            holder.animate({
+              opacity: 1-opacity
+            },{
+              queue: false,
+              duration: options.fadeTime
+            });
+          }
+          else holder.css({opacity:1-opacity});
+        }
+      }
+      function refreshAll() {
+        options.shade ? enableShade() : disableShade();
+        if (Selection.isAwake()) setOpacity(options.bgOpacity);
+      }
+      function getShades() {
+        return holder.children();
+      }
+
+      return {
+        update: updateAuto,
+        updateRaw: updateShade,
+        getShades: getShades,
+        setBgColor: setBgColor,
+        enable: enableShade,
+        disable: disableShade,
+        resize: resizeShades,
+        refresh: refreshAll,
+        opacity: setOpacity
+      };
+    }());
+    // }}}
+    // Selection Module {{{
+    var Selection = (function () {
+      var awake, hdep = 370;
+      var borders = {};
+      var handle = {};
+      var seehandles = false;
+      var hhs = options.handleOffset;
+
+      // Private Methods
+      function insertBorder(type) //{{{
+      {
+        var jq = $('<div />').css({
+          position: 'absolute',
+          opacity: options.borderOpacity
+        }).addClass(cssClass(type));
+        $img_holder.append(jq);
+        return jq;
+      }
+      //}}}
+      function dragDiv(ord, zi) //{{{
+      {
+        var jq = $('<div />').mousedown(createDragger(ord)).css({
+          cursor: ord + '-resize',
+          position: 'absolute',
+          zIndex: zi
+        }).addClass('ord-'+ord);
+
+        if (Touch.support) {
+          jq.bind('touchstart.jcrop', Touch.createDragger(ord));
+        }
+
+        $hdl_holder.append(jq);
+        return jq;
+      }
+      //}}}
+      function insertHandle(ord) //{{{
+      {
+        var hs = options.handleSize;
+        return dragDiv(ord, hdep++).css({
+          top: px(-hhs + 1),
+          left: px(-hhs + 1),
+          opacity: options.handleOpacity
+        }).width(hs).height(hs).addClass(cssClass('handle'));
+      }
+      //}}}
+      function insertDragbar(ord) //{{{
+      {
+        var s = options.handleSize,
+            h = s,
+            w = s,
+            t = hhs,
+            l = hhs;
+
+        switch (ord) {
+        case 'n':
+        case 's':
+          w = '100%';
+          break;
+        case 'e':
+        case 'w':
+          h = '100%';
+          break;
+        }
+
+        return dragDiv(ord, hdep++).width(w).height(h).css({
+          top: px(-t + 1),
+          left: px(-l + 1)
+        });
+      }
+      //}}}
+      function createHandles(li) //{{{
+      {
+        var i;
+        for (i = 0; i < li.length; i++) {
+          handle[li[i]] = insertHandle(li[i]);
+        }
+      }
+      //}}}
+      function moveHandles(c) //{{{
+      {
+        var midvert = Math.round((c.h / 2) - hhs),
+            midhoriz = Math.round((c.w / 2) - hhs),
+            north = -hhs + 1,
+            west = -hhs + 1,
+            east = c.w - hhs,
+            south = c.h - hhs,
+            x, y;
+
+        if (handle.e) {
+          handle.e.css({
+            top: px(midvert),
+            left: px(east)
+          });
+          handle.w.css({
+            top: px(midvert)
+          });
+          handle.s.css({
+            top: px(south),
+            left: px(midhoriz)
+          });
+          handle.n.css({
+            left: px(midhoriz)
+          });
+        }
+        if (handle.ne) {
+          handle.ne.css({
+            left: px(east)
+          });
+          handle.se.css({
+            top: px(south),
+            left: px(east)
+          });
+          handle.sw.css({
+            top: px(south)
+          });
+        }
+        if (handle.b) {
+          handle.b.css({
+            top: px(south)
+          });
+          handle.r.css({
+            left: px(east)
+          });
+        }
+      }
+      //}}}
+      function moveto(x, y) //{{{
+      {
+        if (!options.shade) {
+          $img2.css({
+            top: px(-y),
+            left: px(-x)
+          });
+        }
+        $sel.css({
+          top: px(y),
+          left: px(x)
+        });
+      }
+      //}}}
+      function resize(w, h) //{{{
+      {
+        $sel.width(w).height(h);
+      }
+      //}}}
+      function refresh() //{{{
+      {
+        var c = Coords.getFixed();
+
+        Coords.setPressed([c.x, c.y]);
+        Coords.setCurrent([c.x2, c.y2]);
+
+        updateVisible();
+      }
+      //}}}
+
+      // Internal Methods
+      function updateVisible(select) //{{{
+      {
+        if (awake) {
+          return update(select);
+        }
+      }
+      //}}}
+      function update(select) //{{{
+      {
+        var c = Coords.getFixed();
+
+        resize(c.w, c.h);
+        moveto(c.x, c.y);
+        if (options.shade) Shade.updateRaw(c);
+
+        if (seehandles) {
+          moveHandles(c);
+        }
+        if (!awake) {
+          show();
+        }
+
+        if (select) {
+          options.onSelect.call(api, unscale(c));
+        } else {
+          options.onChange.call(api, unscale(c));
+        }
+      }
+      //}}}
+      function setBgOpacity(opacity,force,now)
+      {
+        if (!awake && !force) return;
+        if (options.bgFade && !now) {
+          $img.animate({
+            opacity: opacity
+          },{
+            queue: false,
+            duration: options.fadeTime
+          });
+        } else {
+          $img.css('opacity', opacity);
+        }
+      }
+      function show() //{{{
+      {
+        $sel.show();
+
+        if (options.shade) Shade.opacity(bgopacity);
+          else setBgOpacity(bgopacity,true);
+
+        awake = true;
+      }
+      //}}}
+      function release() //{{{
+      {
+        disableHandles();
+        $sel.hide();
+
+        if (options.shade) Shade.opacity(1);
+          else setBgOpacity(1);
+
+        awake = false;
+        options.onRelease.call(api);
+      }
+      //}}}
+      function showHandles() //{{{
+      {
+        if (seehandles) {
+          moveHandles(Coords.getFixed());
+          $hdl_holder.show();
+        }
+      }
+      //}}}
+      function enableHandles() //{{{
+      {
+        seehandles = true;
+        if (options.allowResize) {
+          moveHandles(Coords.getFixed());
+          $hdl_holder.show();
+          return true;
+        }
+      }
+      //}}}
+      function disableHandles() //{{{
+      {
+        seehandles = false;
+        $hdl_holder.hide();
+      } 
+      //}}}
+      function animMode(v) //{{{
+      {
+        if (animating === v) {
+          disableHandles();
+        } else {
+          enableHandles();
+        }
+      } 
+      //}}}
+      function done() //{{{
+      {
+        animMode(false);
+        refresh();
+      } 
+      //}}}
+      /* Insert draggable elements {{{*/
+
+      // Insert border divs for outline
+      if (options.drawBorders) {
+        borders = {
+          top: insertBorder('hline'),
+          bottom: insertBorder('hline bottom'),
+          left: insertBorder('vline'),
+          right: insertBorder('vline right')
+        };
+      }
+
+      // Insert handles on edges
+      if (options.dragEdges) {
+        handle.t = insertDragbar('n');
+        handle.b = insertDragbar('s');
+        handle.r = insertDragbar('e');
+        handle.l = insertDragbar('w');
+      }
+
+      // Insert side and corner handles
+      if (options.sideHandles) {
+        createHandles(['n', 's', 'e', 'w']);
+      }
+      if (options.cornerHandles) {
+        createHandles(['sw', 'nw', 'ne', 'se']);
+      }
+      //}}}
+
+      // This is a hack for iOS5 to support drag/move touch functionality
+      $(document).bind('touchstart.jcrop-ios',function(e) {
+        if ($(e.currentTarget).hasClass('jcrop-tracker')) e.stopPropagation();
+      });
+
+      var $track = newTracker().mousedown(createDragger('move')).css({
+        cursor: 'move',
+        position: 'absolute',
+        zIndex: 360
+      });
+
+      if (Touch.support) {
+        $track.bind('touchstart.jcrop', Touch.createDragger('move'));
+      }
+
+      $img_holder.append($track);
+      disableHandles();
+
+      return {
+        updateVisible: updateVisible,
+        update: update,
+        release: release,
+        refresh: refresh,
+        isAwake: function () {
+          return awake;
+        },
+        setCursor: function (cursor) {
+          $track.css('cursor', cursor);
+        },
+        enableHandles: enableHandles,
+        enableOnly: function () {
+          seehandles = true;
+        },
+        showHandles: showHandles,
+        disableHandles: disableHandles,
+        animMode: animMode,
+        setBgOpacity: setBgOpacity,
+        done: done
+      };
+    }());
+    
+    //}}}
+    // Tracker Module {{{
+    var Tracker = (function () {
+      var onMove = function () {},
+          onDone = function () {},
+          trackDoc = options.trackDocument;
+
+      function toFront() //{{{
+      {
+        $trk.css({
+          zIndex: 450
+        });
+        if (Touch.support) {
+          $(document)
+            .bind('touchmove.jcrop', trackTouchMove)
+            .bind('touchend.jcrop', trackTouchEnd);
+        }
+        if (trackDoc) {
+          $(document)
+            .bind('mousemove.jcrop',trackMove)
+            .bind('mouseup.jcrop',trackUp);
+        }
+      } 
+      //}}}
+      function toBack() //{{{
+      {
+        $trk.css({
+          zIndex: 290
+        });
+        $(document).unbind('.jcrop');
+      } 
+      //}}}
+      function trackMove(e) //{{{
+      {
+        onMove(mouseAbs(e));
+        return false;
+      } 
+      //}}}
+      function trackUp(e) //{{{
+      {
+        e.preventDefault();
+        e.stopPropagation();
+
+        if (btndown) {
+          btndown = false;
+
+          onDone(mouseAbs(e));
+
+          if (Selection.isAwake()) {
+            options.onSelect.call(api, unscale(Coords.getFixed()));
+          }
+
+          toBack();
+          onMove = function () {};
+          onDone = function () {};
+        }
+
+        return false;
+      }
+      //}}}
+      function activateHandlers(move, done) //{{{
+      {
+        btndown = true;
+        onMove = move;
+        onDone = done;
+        toFront();
+        return false;
+      }
+      //}}}
+      function trackTouchMove(e) //{{{
+      {
+        e.pageX = e.originalEvent.changedTouches[0].pageX;
+        e.pageY = e.originalEvent.changedTouches[0].pageY;
+        return trackMove(e);
+      }
+      //}}}
+      function trackTouchEnd(e) //{{{
+      {
+        e.pageX = e.originalEvent.changedTouches[0].pageX;
+        e.pageY = e.originalEvent.changedTouches[0].pageY;
+        return trackUp(e);
+      }
+      //}}}
+      function setCursor(t) //{{{
+      {
+        $trk.css('cursor', t);
+      }
+      //}}}
+
+      if (!trackDoc) {
+        $trk.mousemove(trackMove).mouseup(trackUp).mouseout(trackUp);
+      }
+
+      $img.before($trk);
+      return {
+        activateHandlers: activateHandlers,
+        setCursor: setCursor
+      };
+    }());
+    //}}}
+    // KeyManager Module {{{
+    var KeyManager = (function () {
+      var $keymgr = $('<input type="radio" />').css({
+        position: 'fixed',
+        left: '-120px',
+        width: '12px'
+      }),
+          $keywrap = $('<div />').css({
+          position: 'absolute',
+          overflow: 'hidden'
+        }).append($keymgr);
+
+      function watchKeys() //{{{
+      {
+        if (options.keySupport) {
+          $keymgr.show();
+          $keymgr.focus();
+        }
+      }
+      //}}}
+      function onBlur(e) //{{{
+      {
+        $keymgr.hide();
+      }
+      //}}}
+      function doNudge(e, x, y) //{{{
+      {
+        if (options.allowMove) {
+          Coords.moveOffset([x, y]);
+          Selection.updateVisible(true);
+        }
+        e.preventDefault();
+        e.stopPropagation();
+      }
+      //}}}
+      function parseKey(e) //{{{
+      {
+        if (e.ctrlKey || e.metaKey) {
+          return true;
+        }
+        shift_down = e.shiftKey ? true : false;
+        var nudge = shift_down ? 10 : 1;
+
+        switch (e.keyCode) {
+        case 37:
+          doNudge(e, -nudge, 0);
+          break;
+        case 39:
+          doNudge(e, nudge, 0);
+          break;
+        case 38:
+          doNudge(e, 0, -nudge);
+          break;
+        case 40:
+          doNudge(e, 0, nudge);
+          break;
+        case 27:
+          if (options.allowSelect) Selection.release();
+          break;
+        case 9:
+          return true;
+        }
+
+        return false;
+      }
+      //}}}
+
+      if (options.keySupport) {
+        $keymgr.keydown(parseKey).blur(onBlur);
+        if (ie6mode || !options.fixedSupport) {
+          $keymgr.css({
+            position: 'absolute',
+            left: '-20px'
+          });
+          $keywrap.append($keymgr).insertBefore($img);
+        } else {
+          $keymgr.insertBefore($img);
+        }
+      }
+
+
+      return {
+        watchKeys: watchKeys
+      };
+    }());
+    //}}}
+    // }}}
+    // API methods {{{
+    function setClass(cname) //{{{
+    {
+      $div.removeClass().addClass(cssClass('holder')).addClass(cname);
+    }
+    //}}}
+    function animateTo(a, callback) //{{{
+    {
+      var x1 = parseInt(a[0], 10) / xscale,
+          y1 = parseInt(a[1], 10) / yscale,
+          x2 = parseInt(a[2], 10) / xscale,
+          y2 = parseInt(a[3], 10) / yscale;
+
+      if (animating) {
+        return;
+      }
+
+      var animto = Coords.flipCoords(x1, y1, x2, y2),
+          c = Coords.getFixed(),
+          initcr = [c.x, c.y, c.x2, c.y2],
+          animat = initcr,
+          interv = options.animationDelay,
+          ix1 = animto[0] - initcr[0],
+          iy1 = animto[1] - initcr[1],
+          ix2 = animto[2] - initcr[2],
+          iy2 = animto[3] - initcr[3],
+          pcent = 0,
+          velocity = options.swingSpeed;
+
+      x = animat[0];
+      y = animat[1];
+      x2 = animat[2];
+      y2 = animat[3];
+
+      Selection.animMode(true);
+      var anim_timer;
+
+      function queueAnimator() {
+        window.setTimeout(animator, interv);
+      }
+      var animator = (function () {
+        return function () {
+          pcent += (100 - pcent) / velocity;
+
+          animat[0] = x + ((pcent / 100) * ix1);
+          animat[1] = y + ((pcent / 100) * iy1);
+          animat[2] = x2 + ((pcent / 100) * ix2);
+          animat[3] = y2 + ((pcent / 100) * iy2);
+
+          if (pcent >= 99.8) {
+            pcent = 100;
+          }
+          if (pcent < 100) {
+            setSelectRaw(animat);
+            queueAnimator();
+          } else {
+            Selection.done();
+            if (typeof(callback) === 'function') {
+              callback.call(api);
+            }
+          }
+        };
+      }());
+      queueAnimator();
+    }
+    //}}}
+    function setSelect(rect) //{{{
+    {
+      setSelectRaw([parseInt(rect[0], 10) / xscale, parseInt(rect[1], 10) / yscale, parseInt(rect[2], 10) / xscale, parseInt(rect[3], 10) / yscale]);
+      options.onSelect.call(api, unscale(Coords.getFixed()));
+      Selection.enableHandles();
+    }
+    //}}}
+    function setSelectRaw(l) //{{{
+    {
+      Coords.setPressed([l[0], l[1]]);
+      Coords.setCurrent([l[2], l[3]]);
+      Selection.update();
+    }
+    //}}}
+    function tellSelect() //{{{
+    {
+      return unscale(Coords.getFixed());
+    }
+    //}}}
+    function tellScaled() //{{{
+    {
+      return Coords.getFixed();
+    }
+    //}}}
+    function setOptionsNew(opt) //{{{
+    {
+      setOptions(opt);
+      interfaceUpdate();
+    }
+    //}}}
+    function disableCrop() //{{{
+    {
+      options.disabled = true;
+      Selection.disableHandles();
+      Selection.setCursor('default');
+      Tracker.setCursor('default');
+    }
+    //}}}
+    function enableCrop() //{{{
+    {
+      options.disabled = false;
+      interfaceUpdate();
+    }
+    //}}}
+    function cancelCrop() //{{{
+    {
+      Selection.done();
+      Tracker.activateHandlers(null, null);
+    }
+    //}}}
+    function destroy() //{{{
+    {
+      $div.remove();
+      $origimg.show();
+      $(obj).removeData('Jcrop');
+    }
+    //}}}
+    function setImage(src, callback) //{{{
+    {
+      Selection.release();
+      disableCrop();
+      var img = new Image();
+      img.onload = function () {
+        var iw = img.width;
+        var ih = img.height;
+        var bw = options.boxWidth;
+        var bh = options.boxHeight;
+        $img.width(iw).height(ih);
+        $img.attr('src', src);
+        $img2.attr('src', src);
+        presize($img, bw, bh);
+        boundx = $img.width();
+        boundy = $img.height();
+        $img2.width(boundx).height(boundy);
+        $trk.width(boundx + (bound * 2)).height(boundy + (bound * 2));
+        $div.width(boundx).height(boundy);
+        Shade.resize(boundx,boundy);
+        enableCrop();
+
+        if (typeof(callback) === 'function') {
+          callback.call(api);
+        }
+      };
+      img.src = src;
+    }
+    //}}}
+    function colorChangeMacro($obj,color,now) {
+      var mycolor = color || options.bgColor;
+      if (options.bgFade && supportsColorFade() && options.fadeTime && !now) {
+        $obj.animate({
+          backgroundColor: mycolor
+        }, {
+          queue: false,
+          duration: options.fadeTime
+        });
+      } else {
+        $obj.css('backgroundColor', mycolor);
+      }
+    }
+    function interfaceUpdate(alt) //{{{
+    // This method tweaks the interface based on options object.
+    // Called when options are changed and at end of initialization.
+    {
+      if (options.allowResize) {
+        if (alt) {
+          Selection.enableOnly();
+        } else {
+          Selection.enableHandles();
+        }
+      } else {
+        Selection.disableHandles();
+      }
+
+      Tracker.setCursor(options.allowSelect ? 'crosshair' : 'default');
+      Selection.setCursor(options.allowMove ? 'move' : 'default');
+
+      if (options.hasOwnProperty('trueSize')) {
+        xscale = options.trueSize[0] / boundx;
+        yscale = options.trueSize[1] / boundy;
+      }
+
+      if (options.hasOwnProperty('setSelect')) {
+        setSelect(options.setSelect);
+        Selection.done();
+        delete(options.setSelect);
+      }
+
+      Shade.refresh();
+
+      if (options.bgColor != bgcolor) {
+        colorChangeMacro(
+          options.shade? Shade.getShades(): $div,
+          options.shade?
+            (options.shadeColor || options.bgColor):
+            options.bgColor
+        );
+        bgcolor = options.bgColor;
+      }
+
+      if (bgopacity != options.bgOpacity) {
+        bgopacity = options.bgOpacity;
+        if (options.shade) Shade.refresh();
+          else Selection.setBgOpacity(bgopacity);
+      }
+
+      xlimit = options.maxSize[0] || 0;
+      ylimit = options.maxSize[1] || 0;
+      xmin = options.minSize[0] || 0;
+      ymin = options.minSize[1] || 0;
+
+      if (options.hasOwnProperty('outerImage')) {
+        $img.attr('src', options.outerImage);
+        delete(options.outerImage);
+      }
+
+      Selection.refresh();
+    }
+    //}}}
+    //}}}
+
+    if (Touch.support) $trk.bind('touchstart.jcrop', Touch.newSelection);
+
+    $hdl_holder.hide();
+    interfaceUpdate(true);
+
+    var api = {
+      setImage: setImage,
+      animateTo: animateTo,
+      setSelect: setSelect,
+      setOptions: setOptionsNew,
+      tellSelect: tellSelect,
+      tellScaled: tellScaled,
+      setClass: setClass,
+
+      disable: disableCrop,
+      enable: enableCrop,
+      cancel: cancelCrop,
+      release: Selection.release,
+      destroy: destroy,
+
+      focus: KeyManager.watchKeys,
+
+      getBounds: function () {
+        return [boundx * xscale, boundy * yscale];
+      },
+      getWidgetSize: function () {
+        return [boundx, boundy];
+      },
+      getScaleFactor: function () {
+        return [xscale, yscale];
+      },
+
+      ui: {
+        holder: $div,
+        selection: $sel
+      }
+    };
+
+    if ($.browser.msie) {
+      $div.bind('selectstart', function () {
+        return false;
+      });
+    }
+
+    $origimg.data('Jcrop', api);
+    return api;
+  };
+  $.fn.Jcrop = function (options, callback) //{{{
+  {
+    var api;
+    // Iterate over each object, attach Jcrop
+    this.each(function () {
+      // If we've already attached to this object
+      if ($(this).data('Jcrop')) {
+        // The API can be requested this way (undocumented)
+        if (options === 'api') return $(this).data('Jcrop');
+        // Otherwise, we just reset the options...
+        else $(this).data('Jcrop').setOptions(options);
+      }
+      // If we haven't been attached, preload and attach
+      else {
+        if (this.tagName == 'IMG')
+          $.Jcrop.Loader(this,function(){
+            $(this).css({display:'block',visibility:'hidden'});
+            api = $.Jcrop(this, options);
+            if ($.isFunction(callback)) callback.call(api);
+          });
+        else {
+          $(this).css({display:'block',visibility:'hidden'});
+          api = $.Jcrop(this, options);
+          if ($.isFunction(callback)) callback.call(api);
+        }
+      }
+    });
+
+    // Return "this" so the object is chainable (jQuery-style)
+    return this;
+  };
+  //}}}
+  // $.Jcrop.Loader - basic image loader {{{
+
+  $.Jcrop.Loader = function(imgobj,success,error){
+    var $img = $(imgobj), img = $img[0];
+
+    function completeCheck(){
+      if (img.complete) {
+        $img.unbind('.jcloader');
+        if ($.isFunction(success)) success.call(img);
+      }
+      else window.setTimeout(completeCheck,50);
+    }
+
+    $img
+      .bind('load.jcloader',completeCheck)
+      .bind('error.jcloader',function(e){
+        $img.unbind('.jcloader');
+        if ($.isFunction(error)) error.call(img);
+      });
+
+    if (img.complete && $.isFunction(success)){
+      $img.unbind('.jcloader');
+      success.call(img);
+    }
+  };
+
+  //}}}
+  // Global Defaults {{{
+  $.Jcrop.defaults = {
+
+    // Basic Settings
+    allowSelect: true,
+    allowMove: true,
+    allowResize: true,
+
+    trackDocument: true,
+
+    // Styling Options
+    baseClass: 'jcrop',
+    addClass: null,
+    bgColor: 'black',
+    bgOpacity: 0.6,
+    bgFade: false,
+    borderOpacity: 0.4,
+    handleOpacity: 0.5,
+    handleSize: 7,
+    handleOffset: 5,
+
+    aspectRatio: 0,
+    keySupport: true,
+    cornerHandles: true,
+    sideHandles: true,
+    drawBorders: true,
+    dragEdges: true,
+    fixedSupport: true,
+    touchSupport: null,
+
+    shade: null,
+
+    boxWidth: 0,
+    boxHeight: 0,
+    boundary: 2,
+    fadeTime: 400,
+    animationDelay: 20,
+    swingSpeed: 3,
+
+    minSelect: [0, 0],
+    maxSize: [0, 0],
+    minSize: [0, 0],
+
+    // Callbacks / Event Handlers
+    onChange: function () {},
+    onSelect: function () {},
+    onDblClick: function () {},
+    onRelease: function () {}
+  };
+
+  // }}}
+}(jQuery));
diff --git a/apps/contacts/js/jquery.Jcrop.min.js b/apps/contacts/js/jquery.Jcrop.min.js
new file mode 100644
index 00000000000..0c05d67c22d
--- /dev/null
+++ b/apps/contacts/js/jquery.Jcrop.min.js
@@ -0,0 +1,255 @@
+/**
+ * jquery.Jcrop.min.js v0.9.9 {{{ (build:20120102)
+ * jQuery Image Cropping Plugin - released under MIT License
+ * Copyright (c) 2008-2012 Tapmodo Interactive LLC
+ * https://github.com/tapmodo/Jcrop
+ */
+
+(function($){$.Jcrop=function(obj,opt){var options=$.extend({},$.Jcrop.defaults),docOffset,lastcurs,ie6mode=false;function px(n){return parseInt(n,10)+'px';}
+function cssClass(cl){return options.baseClass+'-'+cl;}
+function supportsColorFade(){return $.fx.step.hasOwnProperty('backgroundColor');}
+function getPos(obj)
+{var pos=$(obj).offset();return[pos.left,pos.top];}
+function mouseAbs(e)
+{return[(e.pageX-docOffset[0]),(e.pageY-docOffset[1])];}
+function setOptions(opt)
+{if(typeof(opt)!=='object')opt={};options=$.extend(options,opt);$.each(['onChange','onSelect','onRelease','onDblClick'],function(i,e){if(typeof(options[e])!=='function')options[e]=function(){};});}
+function startDragMode(mode,pos)
+{docOffset=getPos($img);Tracker.setCursor(mode==='move'?mode:mode+'-resize');if(mode==='move'){return Tracker.activateHandlers(createMover(pos),doneSelect);}
+var fc=Coords.getFixed();var opp=oppLockCorner(mode);var opc=Coords.getCorner(oppLockCorner(opp));Coords.setPressed(Coords.getCorner(opp));Coords.setCurrent(opc);Tracker.activateHandlers(dragmodeHandler(mode,fc),doneSelect);}
+function dragmodeHandler(mode,f)
+{return function(pos){if(!options.aspectRatio){switch(mode){case'e':pos[1]=f.y2;break;case'w':pos[1]=f.y2;break;case'n':pos[0]=f.x2;break;case's':pos[0]=f.x2;break;}}else{switch(mode){case'e':pos[1]=f.y+1;break;case'w':pos[1]=f.y+1;break;case'n':pos[0]=f.x+1;break;case's':pos[0]=f.x+1;break;}}
+Coords.setCurrent(pos);Selection.update();};}
+function createMover(pos)
+{var lloc=pos;KeyManager.watchKeys();return function(pos){Coords.moveOffset([pos[0]-lloc[0],pos[1]-lloc[1]]);lloc=pos;Selection.update();};}
+function oppLockCorner(ord)
+{switch(ord){case'n':return'sw';case's':return'nw';case'e':return'nw';case'w':return'ne';case'ne':return'sw';case'nw':return'se';case'se':return'nw';case'sw':return'ne';}}
+function createDragger(ord)
+{return function(e){if(options.disabled){return false;}
+if((ord==='move')&&!options.allowMove){return false;}
+docOffset=getPos($img);btndown=true;startDragMode(ord,mouseAbs(e));e.stopPropagation();e.preventDefault();return false;};}
+function presize($obj,w,h)
+{var nw=$obj.width(),nh=$obj.height();if((nw>w)&&w>0){nw=w;nh=(w/$obj.width())*$obj.height();}
+if((nh>h)&&h>0){nh=h;nw=(h/$obj.height())*$obj.width();}
+xscale=$obj.width()/nw;yscale=$obj.height()/nh;$obj.width(nw).height(nh);}
+function unscale(c)
+{return{x:parseInt(c.x*xscale,10),y:parseInt(c.y*yscale,10),x2:parseInt(c.x2*xscale,10),y2:parseInt(c.y2*yscale,10),w:parseInt(c.w*xscale,10),h:parseInt(c.h*yscale,10)};}
+function doneSelect(pos)
+{var c=Coords.getFixed();if((c.w>options.minSelect[0])&&(c.h>options.minSelect[1])){Selection.enableHandles();Selection.done();}else{Selection.release();}
+Tracker.setCursor(options.allowSelect?'crosshair':'default');}
+function newSelection(e)
+{if(options.disabled){return false;}
+if(!options.allowSelect){return false;}
+btndown=true;docOffset=getPos($img);Selection.disableHandles();Tracker.setCursor('crosshair');var pos=mouseAbs(e);Coords.setPressed(pos);Selection.update();Tracker.activateHandlers(selectDrag,doneSelect);KeyManager.watchKeys();e.stopPropagation();e.preventDefault();return false;}
+function selectDrag(pos)
+{Coords.setCurrent(pos);Selection.update();}
+function newTracker()
+{var trk=$('<div></div>').addClass(cssClass('tracker'));if($.browser.msie){trk.css({opacity:0,backgroundColor:'white'});}
+return trk;}
+if($.browser.msie&&($.browser.version.split('.')[0]==='6')){ie6mode=true;}
+if(typeof(obj)!=='object'){obj=$(obj)[0];}
+if(typeof(opt)!=='object'){opt={};}
+setOptions(opt);var img_css={border:'none',visibility:'visible',margin:0,padding:0,position:'absolute',top:0,left:0};var $origimg=$(obj),img_mode=true;if(obj.tagName=='IMG'){if($origimg[0].width!=0&&$origimg[0].height!=0){$origimg.width($origimg[0].width);$origimg.height($origimg[0].height);}else{var tempImage=new Image();tempImage.src=$origimg[0].src;$origimg.width(tempImage.width);$origimg.height(tempImage.height);}
+var $img=$origimg.clone().removeAttr('id').css(img_css).show();$img.width($origimg.width());$img.height($origimg.height());$origimg.after($img).hide();}else{$img=$origimg.css(img_css).show();img_mode=false;if(options.shade===null){options.shade=true;}}
+presize($img,options.boxWidth,options.boxHeight);var boundx=$img.width(),boundy=$img.height(),$div=$('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({position:'relative',backgroundColor:options.bgColor}).insertAfter($origimg).append($img);if(options.addClass){$div.addClass(options.addClass);}
+var $img2=$('<div />'),$img_holder=$('<div />').width('100%').height('100%').css({zIndex:310,position:'absolute',overflow:'hidden'}),$hdl_holder=$('<div />').width('100%').height('100%').css('zIndex',320),$sel=$('<div />').css({position:'absolute',zIndex:600}).dblclick(function(){var c=Coords.getFixed();options.onDblClick.call(api,c);}).insertBefore($img).append($img_holder,$hdl_holder);if(img_mode){$img2=$('<img />').attr('src',$img.attr('src')).css(img_css).width(boundx).height(boundy),$img_holder.append($img2);}
+if(ie6mode){$sel.css({overflowY:'hidden'});}
+var bound=options.boundary;var $trk=newTracker().width(boundx+(bound*2)).height(boundy+(bound*2)).css({position:'absolute',top:px(-bound),left:px(-bound),zIndex:290}).mousedown(newSelection);var bgcolor=options.bgColor,bgopacity=options.bgOpacity,xlimit,ylimit,xmin,ymin,xscale,yscale,enabled=true,btndown,animating,shift_down;docOffset=getPos($img);var Touch=(function(){function hasTouchSupport(){var support={},events=['touchstart','touchmove','touchend'],el=document.createElement('div'),i;try{for(i=0;i<events.length;i++){var eventName=events[i];eventName='on'+eventName;var isSupported=(eventName in el);if(!isSupported){el.setAttribute(eventName,'return;');isSupported=typeof el[eventName]=='function';}
+support[events[i]]=isSupported;}
+return support.touchstart&&support.touchend&&support.touchmove;}
+catch(err){return false;}}
+function detectSupport(){if((options.touchSupport===true)||(options.touchSupport===false))return options.touchSupport;else return hasTouchSupport();}
+return{createDragger:function(ord){return function(e){e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;if(options.disabled){return false;}
+if((ord==='move')&&!options.allowMove){return false;}
+btndown=true;startDragMode(ord,mouseAbs(e));e.stopPropagation();e.preventDefault();return false;};},newSelection:function(e){e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return newSelection(e);},isSupported:hasTouchSupport,support:detectSupport()};}());var Coords=(function(){var x1=0,y1=0,x2=0,y2=0,ox,oy;function setPressed(pos)
+{pos=rebound(pos);x2=x1=pos[0];y2=y1=pos[1];}
+function setCurrent(pos)
+{pos=rebound(pos);ox=pos[0]-x2;oy=pos[1]-y2;x2=pos[0];y2=pos[1];}
+function getOffset()
+{return[ox,oy];}
+function moveOffset(offset)
+{var ox=offset[0],oy=offset[1];if(0>x1+ox){ox-=ox+x1;}
+if(0>y1+oy){oy-=oy+y1;}
+if(boundy<y2+oy){oy+=boundy-(y2+oy);}
+if(boundx<x2+ox){ox+=boundx-(x2+ox);}
+x1+=ox;x2+=ox;y1+=oy;y2+=oy;}
+function getCorner(ord)
+{var c=getFixed();switch(ord){case'ne':return[c.x2,c.y];case'nw':return[c.x,c.y];case'se':return[c.x2,c.y2];case'sw':return[c.x,c.y2];}}
+function getFixed()
+{if(!options.aspectRatio){return getRect();}
+var aspect=options.aspectRatio,min_x=options.minSize[0]/xscale,max_x=options.maxSize[0]/xscale,max_y=options.maxSize[1]/yscale,rw=x2-x1,rh=y2-y1,rwa=Math.abs(rw),rha=Math.abs(rh),real_ratio=rwa/rha,xx,yy,w,h;if(max_x===0){max_x=boundx*10;}
+if(max_y===0){max_y=boundy*10;}
+if(real_ratio<aspect){yy=y2;w=rha*aspect;xx=rw<0?x1-w:w+x1;if(xx<0){xx=0;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}else if(xx>boundx){xx=boundx;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}}else{xx=x2;h=rwa/aspect;yy=rh<0?y1-h:y1+h;if(yy<0){yy=0;w=Math.abs((yy-y1)*aspect);xx=rw<0?x1-w:w+x1;}else if(yy>boundy){yy=boundy;w=Math.abs(yy-y1)*aspect;xx=rw<0?x1-w:w+x1;}}
+if(xx>x1){if(xx-x1<min_x){xx=x1+min_x;}else if(xx-x1>max_x){xx=x1+max_x;}
+if(yy>y1){yy=y1+(xx-x1)/aspect;}else{yy=y1-(xx-x1)/aspect;}}else if(xx<x1){if(x1-xx<min_x){xx=x1-min_x;}else if(x1-xx>max_x){xx=x1-max_x;}
+if(yy>y1){yy=y1+(x1-xx)/aspect;}else{yy=y1-(x1-xx)/aspect;}}
+if(xx<0){x1-=xx;xx=0;}else if(xx>boundx){x1-=xx-boundx;xx=boundx;}
+if(yy<0){y1-=yy;yy=0;}else if(yy>boundy){y1-=yy-boundy;yy=boundy;}
+return makeObj(flipCoords(x1,y1,xx,yy));}
+function rebound(p)
+{if(p[0]<0){p[0]=0;}
+if(p[1]<0){p[1]=0;}
+if(p[0]>boundx){p[0]=boundx;}
+if(p[1]>boundy){p[1]=boundy;}
+return[p[0],p[1]];}
+function flipCoords(x1,y1,x2,y2)
+{var xa=x1,xb=x2,ya=y1,yb=y2;if(x2<x1){xa=x2;xb=x1;}
+if(y2<y1){ya=y2;yb=y1;}
+return[Math.round(xa),Math.round(ya),Math.round(xb),Math.round(yb)];}
+function getRect()
+{var xsize=x2-x1,ysize=y2-y1,delta;if(xlimit&&(Math.abs(xsize)>xlimit)){x2=(xsize>0)?(x1+xlimit):(x1-xlimit);}
+if(ylimit&&(Math.abs(ysize)>ylimit)){y2=(ysize>0)?(y1+ylimit):(y1-ylimit);}
+if(ymin/yscale&&(Math.abs(ysize)<ymin/yscale)){y2=(ysize>0)?(y1+ymin/yscale):(y1-ymin/yscale);}
+if(xmin/xscale&&(Math.abs(xsize)<xmin/xscale)){x2=(xsize>0)?(x1+xmin/xscale):(x1-xmin/xscale);}
+if(x1<0){x2-=x1;x1-=x1;}
+if(y1<0){y2-=y1;y1-=y1;}
+if(x2<0){x1-=x2;x2-=x2;}
+if(y2<0){y1-=y2;y2-=y2;}
+if(x2>boundx){delta=x2-boundx;x1-=delta;x2-=delta;}
+if(y2>boundy){delta=y2-boundy;y1-=delta;y2-=delta;}
+if(x1>boundx){delta=x1-boundy;y2-=delta;y1-=delta;}
+if(y1>boundy){delta=y1-boundy;y2-=delta;y1-=delta;}
+return makeObj(flipCoords(x1,y1,x2,y2));}
+function makeObj(a)
+{return{x:a[0],y:a[1],x2:a[2],y2:a[3],w:a[2]-a[0],h:a[3]-a[1]};}
+return{flipCoords:flipCoords,setPressed:setPressed,setCurrent:setCurrent,getOffset:getOffset,moveOffset:moveOffset,getCorner:getCorner,getFixed:getFixed};}());var Shade=(function(){var enabled=false,holder=$('<div />').css({position:'absolute',zIndex:240,opacity:0}),shades={top:createShade(),left:createShade().height(boundy),right:createShade().height(boundy),bottom:createShade()};function resizeShades(w,h){shades.left.css({height:px(h)});shades.right.css({height:px(h)});}
+function updateAuto()
+{return updateShade(Coords.getFixed());}
+function updateShade(c)
+{shades.top.css({left:px(c.x),width:px(c.w),height:px(c.y)});shades.bottom.css({top:px(c.y2),left:px(c.x),width:px(c.w),height:px(boundy-c.y2)});shades.right.css({left:px(c.x2),width:px(boundx-c.x2)});shades.left.css({width:px(c.x)});}
+function createShade(){return $('<div />').css({position:'absolute',backgroundColor:options.shadeColor||options.bgColor}).appendTo(holder);}
+function enableShade(){if(!enabled){enabled=true;holder.insertBefore($img);updateAuto();Selection.setBgOpacity(1,0,1);$img2.hide();setBgColor(options.shadeColor||options.bgColor,1);if(Selection.isAwake())
+{setOpacity(options.bgOpacity,1);}
+else setOpacity(1,1);}}
+function setBgColor(color,now){colorChangeMacro(getShades(),color,now);}
+function disableShade(){if(enabled){holder.remove();$img2.show();enabled=false;if(Selection.isAwake()){Selection.setBgOpacity(options.bgOpacity,1,1);}else{Selection.setBgOpacity(1,1,1);Selection.disableHandles();}
+colorChangeMacro($div,0,1);}}
+function setOpacity(opacity,now){if(enabled){if(options.bgFade&&!now){holder.animate({opacity:1-opacity},{queue:false,duration:options.fadeTime});}
+else holder.css({opacity:1-opacity});}}
+function refreshAll(){options.shade?enableShade():disableShade();if(Selection.isAwake())setOpacity(options.bgOpacity);}
+function getShades(){return holder.children();}
+return{update:updateAuto,updateRaw:updateShade,getShades:getShades,setBgColor:setBgColor,enable:enableShade,disable:disableShade,resize:resizeShades,refresh:refreshAll,opacity:setOpacity};}());var Selection=(function(){var awake,hdep=370;var borders={};var handle={};var seehandles=false;var hhs=options.handleOffset;function insertBorder(type)
+{var jq=$('<div />').css({position:'absolute',opacity:options.borderOpacity}).addClass(cssClass(type));$img_holder.append(jq);return jq;}
+function dragDiv(ord,zi)
+{var jq=$('<div />').mousedown(createDragger(ord)).css({cursor:ord+'-resize',position:'absolute',zIndex:zi}).addClass('ord-'+ord);if(Touch.support){jq.bind('touchstart.jcrop',Touch.createDragger(ord));}
+$hdl_holder.append(jq);return jq;}
+function insertHandle(ord)
+{var hs=options.handleSize;return dragDiv(ord,hdep++).css({top:px(-hhs+1),left:px(-hhs+1),opacity:options.handleOpacity}).width(hs).height(hs).addClass(cssClass('handle'));}
+function insertDragbar(ord)
+{var s=options.handleSize,h=s,w=s,t=hhs,l=hhs;switch(ord){case'n':case's':w='100%';break;case'e':case'w':h='100%';break;}
+return dragDiv(ord,hdep++).width(w).height(h).css({top:px(-t+1),left:px(-l+1)});}
+function createHandles(li)
+{var i;for(i=0;i<li.length;i++){handle[li[i]]=insertHandle(li[i]);}}
+function moveHandles(c)
+{var midvert=Math.round((c.h/2)-hhs),midhoriz=Math.round((c.w/2)-hhs),north=-hhs+1,west=-hhs+1,east=c.w-hhs,south=c.h-hhs,x,y;if(handle.e){handle.e.css({top:px(midvert),left:px(east)});handle.w.css({top:px(midvert)});handle.s.css({top:px(south),left:px(midhoriz)});handle.n.css({left:px(midhoriz)});}
+if(handle.ne){handle.ne.css({left:px(east)});handle.se.css({top:px(south),left:px(east)});handle.sw.css({top:px(south)});}
+if(handle.b){handle.b.css({top:px(south)});handle.r.css({left:px(east)});}}
+function moveto(x,y)
+{if(!options.shade){$img2.css({top:px(-y),left:px(-x)});}
+$sel.css({top:px(y),left:px(x)});}
+function resize(w,h)
+{$sel.width(w).height(h);}
+function refresh()
+{var c=Coords.getFixed();Coords.setPressed([c.x,c.y]);Coords.setCurrent([c.x2,c.y2]);updateVisible();}
+function updateVisible(select)
+{if(awake){return update(select);}}
+function update(select)
+{var c=Coords.getFixed();resize(c.w,c.h);moveto(c.x,c.y);if(options.shade)Shade.updateRaw(c);if(seehandles){moveHandles(c);}
+if(!awake){show();}
+if(select){options.onSelect.call(api,unscale(c));}else{options.onChange.call(api,unscale(c));}}
+function setBgOpacity(opacity,force,now)
+{if(!awake&&!force)return;if(options.bgFade&&!now){$img.animate({opacity:opacity},{queue:false,duration:options.fadeTime});}else{$img.css('opacity',opacity);}}
+function show()
+{$sel.show();if(options.shade)Shade.opacity(bgopacity);else setBgOpacity(bgopacity,true);awake=true;}
+function release()
+{disableHandles();$sel.hide();if(options.shade)Shade.opacity(1);else setBgOpacity(1);awake=false;options.onRelease.call(api);}
+function showHandles()
+{if(seehandles){moveHandles(Coords.getFixed());$hdl_holder.show();}}
+function enableHandles()
+{seehandles=true;if(options.allowResize){moveHandles(Coords.getFixed());$hdl_holder.show();return true;}}
+function disableHandles()
+{seehandles=false;$hdl_holder.hide();}
+function animMode(v)
+{if(animating===v){disableHandles();}else{enableHandles();}}
+function done()
+{animMode(false);refresh();}
+if(options.drawBorders){borders={top:insertBorder('hline'),bottom:insertBorder('hline bottom'),left:insertBorder('vline'),right:insertBorder('vline right')};}
+if(options.dragEdges){handle.t=insertDragbar('n');handle.b=insertDragbar('s');handle.r=insertDragbar('e');handle.l=insertDragbar('w');}
+if(options.sideHandles){createHandles(['n','s','e','w']);}
+if(options.cornerHandles){createHandles(['sw','nw','ne','se']);}
+$(document).bind('touchstart.jcrop-ios',function(e){if($(e.currentTarget).hasClass('jcrop-tracker'))e.stopPropagation();});var $track=newTracker().mousedown(createDragger('move')).css({cursor:'move',position:'absolute',zIndex:360});if(Touch.support){$track.bind('touchstart.jcrop',Touch.createDragger('move'));}
+$img_holder.append($track);disableHandles();return{updateVisible:updateVisible,update:update,release:release,refresh:refresh,isAwake:function(){return awake;},setCursor:function(cursor){$track.css('cursor',cursor);},enableHandles:enableHandles,enableOnly:function(){seehandles=true;},showHandles:showHandles,disableHandles:disableHandles,animMode:animMode,setBgOpacity:setBgOpacity,done:done};}());var Tracker=(function(){var onMove=function(){},onDone=function(){},trackDoc=options.trackDocument;function toFront()
+{$trk.css({zIndex:450});if(Touch.support){$(document).bind('touchmove.jcrop',trackTouchMove).bind('touchend.jcrop',trackTouchEnd);}
+if(trackDoc){$(document).bind('mousemove.jcrop',trackMove).bind('mouseup.jcrop',trackUp);}}
+function toBack()
+{$trk.css({zIndex:290});$(document).unbind('.jcrop');}
+function trackMove(e)
+{onMove(mouseAbs(e));return false;}
+function trackUp(e)
+{e.preventDefault();e.stopPropagation();if(btndown){btndown=false;onDone(mouseAbs(e));if(Selection.isAwake()){options.onSelect.call(api,unscale(Coords.getFixed()));}
+toBack();onMove=function(){};onDone=function(){};}
+return false;}
+function activateHandlers(move,done)
+{btndown=true;onMove=move;onDone=done;toFront();return false;}
+function trackTouchMove(e)
+{e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return trackMove(e);}
+function trackTouchEnd(e)
+{e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return trackUp(e);}
+function setCursor(t)
+{$trk.css('cursor',t);}
+if(!trackDoc){$trk.mousemove(trackMove).mouseup(trackUp).mouseout(trackUp);}
+$img.before($trk);return{activateHandlers:activateHandlers,setCursor:setCursor};}());var KeyManager=(function(){var $keymgr=$('<input type="radio" />').css({position:'fixed',left:'-120px',width:'12px'}),$keywrap=$('<div />').css({position:'absolute',overflow:'hidden'}).append($keymgr);function watchKeys()
+{if(options.keySupport){$keymgr.show();$keymgr.focus();}}
+function onBlur(e)
+{$keymgr.hide();}
+function doNudge(e,x,y)
+{if(options.allowMove){Coords.moveOffset([x,y]);Selection.updateVisible(true);}
+e.preventDefault();e.stopPropagation();}
+function parseKey(e)
+{if(e.ctrlKey||e.metaKey){return true;}
+shift_down=e.shiftKey?true:false;var nudge=shift_down?10:1;switch(e.keyCode){case 37:doNudge(e,-nudge,0);break;case 39:doNudge(e,nudge,0);break;case 38:doNudge(e,0,-nudge);break;case 40:doNudge(e,0,nudge);break;case 27:if(options.allowSelect)Selection.release();break;case 9:return true;}
+return false;}
+if(options.keySupport){$keymgr.keydown(parseKey).blur(onBlur);if(ie6mode||!options.fixedSupport){$keymgr.css({position:'absolute',left:'-20px'});$keywrap.append($keymgr).insertBefore($img);}else{$keymgr.insertBefore($img);}}
+return{watchKeys:watchKeys};}());function setClass(cname)
+{$div.removeClass().addClass(cssClass('holder')).addClass(cname);}
+function animateTo(a,callback)
+{var x1=parseInt(a[0],10)/xscale,y1=parseInt(a[1],10)/yscale,x2=parseInt(a[2],10)/xscale,y2=parseInt(a[3],10)/yscale;if(animating){return;}
+var animto=Coords.flipCoords(x1,y1,x2,y2),c=Coords.getFixed(),initcr=[c.x,c.y,c.x2,c.y2],animat=initcr,interv=options.animationDelay,ix1=animto[0]-initcr[0],iy1=animto[1]-initcr[1],ix2=animto[2]-initcr[2],iy2=animto[3]-initcr[3],pcent=0,velocity=options.swingSpeed;x=animat[0];y=animat[1];x2=animat[2];y2=animat[3];Selection.animMode(true);var anim_timer;function queueAnimator(){window.setTimeout(animator,interv);}
+var animator=(function(){return function(){pcent+=(100-pcent)/velocity;animat[0]=x+((pcent/100)*ix1);animat[1]=y+((pcent/100)*iy1);animat[2]=x2+((pcent/100)*ix2);animat[3]=y2+((pcent/100)*iy2);if(pcent>=99.8){pcent=100;}
+if(pcent<100){setSelectRaw(animat);queueAnimator();}else{Selection.done();if(typeof(callback)==='function'){callback.call(api);}}};}());queueAnimator();}
+function setSelect(rect)
+{setSelectRaw([parseInt(rect[0],10)/xscale,parseInt(rect[1],10)/yscale,parseInt(rect[2],10)/xscale,parseInt(rect[3],10)/yscale]);options.onSelect.call(api,unscale(Coords.getFixed()));Selection.enableHandles();}
+function setSelectRaw(l)
+{Coords.setPressed([l[0],l[1]]);Coords.setCurrent([l[2],l[3]]);Selection.update();}
+function tellSelect()
+{return unscale(Coords.getFixed());}
+function tellScaled()
+{return Coords.getFixed();}
+function setOptionsNew(opt)
+{setOptions(opt);interfaceUpdate();}
+function disableCrop()
+{options.disabled=true;Selection.disableHandles();Selection.setCursor('default');Tracker.setCursor('default');}
+function enableCrop()
+{options.disabled=false;interfaceUpdate();}
+function cancelCrop()
+{Selection.done();Tracker.activateHandlers(null,null);}
+function destroy()
+{$div.remove();$origimg.show();$(obj).removeData('Jcrop');}
+function setImage(src,callback)
+{Selection.release();disableCrop();var img=new Image();img.onload=function(){var iw=img.width;var ih=img.height;var bw=options.boxWidth;var bh=options.boxHeight;$img.width(iw).height(ih);$img.attr('src',src);$img2.attr('src',src);presize($img,bw,bh);boundx=$img.width();boundy=$img.height();$img2.width(boundx).height(boundy);$trk.width(boundx+(bound*2)).height(boundy+(bound*2));$div.width(boundx).height(boundy);Shade.resize(boundx,boundy);enableCrop();if(typeof(callback)==='function'){callback.call(api);}};img.src=src;}
+function colorChangeMacro($obj,color,now){var mycolor=color||options.bgColor;if(options.bgFade&&supportsColorFade()&&options.fadeTime&&!now){$obj.animate({backgroundColor:mycolor},{queue:false,duration:options.fadeTime});}else{$obj.css('backgroundColor',mycolor);}}
+function interfaceUpdate(alt)
+{if(options.allowResize){if(alt){Selection.enableOnly();}else{Selection.enableHandles();}}else{Selection.disableHandles();}
+Tracker.setCursor(options.allowSelect?'crosshair':'default');Selection.setCursor(options.allowMove?'move':'default');if(options.hasOwnProperty('trueSize')){xscale=options.trueSize[0]/boundx;yscale=options.trueSize[1]/boundy;}
+if(options.hasOwnProperty('setSelect')){setSelect(options.setSelect);Selection.done();delete(options.setSelect);}
+Shade.refresh();if(options.bgColor!=bgcolor){colorChangeMacro(options.shade?Shade.getShades():$div,options.shade?(options.shadeColor||options.bgColor):options.bgColor);bgcolor=options.bgColor;}
+if(bgopacity!=options.bgOpacity){bgopacity=options.bgOpacity;if(options.shade)Shade.refresh();else Selection.setBgOpacity(bgopacity);}
+xlimit=options.maxSize[0]||0;ylimit=options.maxSize[1]||0;xmin=options.minSize[0]||0;ymin=options.minSize[1]||0;if(options.hasOwnProperty('outerImage')){$img.attr('src',options.outerImage);delete(options.outerImage);}
+Selection.refresh();}
+if(Touch.support)$trk.bind('touchstart.jcrop',Touch.newSelection);$hdl_holder.hide();interfaceUpdate(true);var api={setImage:setImage,animateTo:animateTo,setSelect:setSelect,setOptions:setOptionsNew,tellSelect:tellSelect,tellScaled:tellScaled,setClass:setClass,disable:disableCrop,enable:enableCrop,cancel:cancelCrop,release:Selection.release,destroy:destroy,focus:KeyManager.watchKeys,getBounds:function(){return[boundx*xscale,boundy*yscale];},getWidgetSize:function(){return[boundx,boundy];},getScaleFactor:function(){return[xscale,yscale];},ui:{holder:$div,selection:$sel}};if($.browser.msie){$div.bind('selectstart',function(){return false;});}
+$origimg.data('Jcrop',api);return api;};$.fn.Jcrop=function(options,callback)
+{var api;this.each(function(){if($(this).data('Jcrop')){if(options==='api')return $(this).data('Jcrop');else $(this).data('Jcrop').setOptions(options);}
+else{if(this.tagName=='IMG')
+$.Jcrop.Loader(this,function(){$(this).css({display:'block',visibility:'hidden'});api=$.Jcrop(this,options);if($.isFunction(callback))callback.call(api);});else{$(this).css({display:'block',visibility:'hidden'});api=$.Jcrop(this,options);if($.isFunction(callback))callback.call(api);}}});return this;};$.Jcrop.Loader=function(imgobj,success,error){var $img=$(imgobj),img=$img[0];function completeCheck(){if(img.complete){$img.unbind('.jcloader');if($.isFunction(success))success.call(img);}
+else window.setTimeout(completeCheck,50);}
+$img.bind('load.jcloader',completeCheck).bind('error.jcloader',function(e){$img.unbind('.jcloader');if($.isFunction(error))error.call(img);});if(img.complete&&$.isFunction(success)){$img.unbind('.jcloader');success.call(img);}};$.Jcrop.defaults={allowSelect:true,allowMove:true,allowResize:true,trackDocument:true,baseClass:'jcrop',addClass:null,bgColor:'black',bgOpacity:0.6,bgFade:false,borderOpacity:0.4,handleOpacity:0.5,handleSize:7,handleOffset:5,aspectRatio:0,keySupport:true,cornerHandles:true,sideHandles:true,drawBorders:true,dragEdges:true,fixedSupport:true,touchSupport:null,shade:null,boxWidth:0,boxHeight:0,boundary:2,fadeTime:400,animationDelay:20,swingSpeed:3,minSelect:[0,0],maxSize:[0,0],minSize:[0,0],onChange:function(){},onSelect:function(){},onDblClick:function(){},onRelease:function(){}};}(jQuery));
\ No newline at end of file
diff --git a/apps/contacts/js/jquery.jec-1.3.3.js b/apps/contacts/js/jquery.jec-1.3.3.js
new file mode 100644
index 00000000000..a0367dac2ae
--- /dev/null
+++ b/apps/contacts/js/jquery.jec-1.3.3.js
@@ -0,0 +1,863 @@
+/**
+ * jQuery jEC (jQuery Editable Combobox) 1.3.3
+ * http://code.google.com/p/jquery-jec
+ *
+ * Copyright (c) 2008-2009 Lukasz Rajchel (lukasz@rajchel.pl | http://rajchel.pl)
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ *
+ * Documentation :  http://code.google.com/p/jquery-jec/wiki/Documentation
+ * Changelog     :  http://code.google.com/p/jquery-jec/wiki/Changelog
+ *
+ * Contributors  :  Lukasz Rajchel, Artem Orlov
+ */
+
+/*jslint maxerr: 50, indent: 4, maxlen: 120*/
+/*global Array, Math, String, clearInterval, document, jQuery, setInterval*/
+/*members ':', Handle, Remove, Set, acceptedKeys, addClass, all, append, appendTo, array, attr, before, bind,
+blinkingCursor, blinkingCursorInterval, blur, bool, browser, ceil, change, charCode, classes, clearCursor, click, css,
+cursorState, data, destroy, disable, each, editable, enable, eq, expr, extend, filter, find, floor, fn, focus,
+focusOnNewOption, fromCharCode, get, getId, handleCursor, ignoredKeys, ignoreOptGroups, inArray, init, initJS, integer,
+isArray, isPlainObject, jEC, jECTimer, jec, jecKill, jecOff, jecOn, jecPref, jecValue, keyCode, keyDown, keyPress,
+keyRange, keyUp, keys, length, max, maxLength, min, msie, object, openedState, optionClasses, optionStyles, parent,
+position, pref, prop, push, random, remove, removeAttr, removeClass, removeData, removeProp, safari, setEditableOption,
+styles, substring, text, trigger, triggerChangeEvent, unbind, uneditable, useExistingOptions, val, value,
+valueIsEditable, which*/
+(function ($) {
+    'use strict';
+
+    $.jEC = (function () {
+        var pluginClass = 'jecEditableOption', cursorClass = 'hasCursor', options = {}, values = {}, lastKeyCode,
+            defaults, Validators, EventHandlers, Combobox, activeCombobox;
+
+        if ($.fn.prop === undefined) {
+            $.fn.extend({
+                'prop': function (key, valueSet) {
+                    if (valueSet) {
+                        $(this).attr(key, key);
+                    } else {
+                        $(this).removeAttr(key);
+                    }
+                },
+                'removeProp': function (key) {
+                    $(this).removeAttr(key);
+                }
+            });
+        }
+
+        defaults = {
+            position: 0,
+            ignoreOptGroups: false,
+            maxLength: 255,
+            classes: [],
+            styles: {},
+            optionClasses: [],
+            optionStyles: {},
+            triggerChangeEvent: false,
+            focusOnNewOption: false,
+            useExistingOptions: false,
+            blinkingCursor: false,
+            blinkingCursorInterval: 1000,
+            ignoredKeys: [],
+            acceptedKeys: [[32, 126], [191, 382]]
+        };
+
+        Validators = (function () {
+            return {
+                integer: function (value) {
+                    return typeof value === 'number' && Math.ceil(value) === Math.floor(value);
+                },
+
+                keyRange: function (value) {
+                    var min, max;
+                    if ($.isPlainObject(value)) {
+                        min = value.min;
+                        max = value.max;
+                    } else if ($.isArray(value) && value.length === 2) {
+                        min = value[0];
+                        max = value[1];
+                    }
+                    return Validators.integer(min) && Validators.integer(max) && min <= max;
+                }
+            };
+        }());
+
+        EventHandlers = (function () {
+            var getKeyCode;
+
+            getKeyCode = function (event) {
+                var charCode = event.charCode;
+                if (charCode !== undefined && charCode !== 0) {
+                    return charCode;
+                } else {
+                    return event.keyCode;
+                }
+            };
+
+            return {
+                // focus event handler
+                // enables blinking cursor
+                focus: function () {
+                    var opt = options[Combobox.getId($(this))];
+                    if (opt.blinkingCursor && $.jECTimer === undefined) {
+                        activeCombobox = $(this);
+                        $.jECTimer = setInterval($.jEC.handleCursor, opt.blinkingCursorInterval);
+                    }
+                },
+
+                // blur event handler
+                // disables blinking cursor
+                blur: function () {
+                    if ($.jECTimer !== undefined) {
+                        clearInterval($.jECTimer);
+                        $.jECTimer = undefined;
+                        activeCombobox = undefined;
+                        Combobox.clearCursor($(this));
+                    }
+                    Combobox.openedState($(this), false);
+                },
+
+                // keydown event handler
+                // handles keys pressed on select (backspace and delete must be handled
+                // in keydown event in order to work in IE)
+                keyDown: function (event) {
+					var keyCode = getKeyCode(event), option, value;
+
+                    lastKeyCode = keyCode;
+
+                    switch (keyCode) {
+                    case 8:  // backspace
+                    case 46: // delete
+                        option = $(this).find('option.' + pluginClass);
+                        if (option.val().length >= 1) {
+                            value = option.text().substring(0, option.text().length - 1);
+                            option.val(value).text(value).prop('selected', true);
+                        }
+                        return (keyCode !== 8);
+                    default:
+                        break;
+                    }
+                },
+
+                // keypress event handler
+                // handles the rest of the keys (keypress event gives more informations
+                // about pressed keys)
+                keyPress: function (event) {
+                    var keyCode = getKeyCode(event), opt = options[Combobox.getId($(this))],
+                        option, value, specialKeys, exit = false, text;
+
+                    Combobox.clearCursor($(this));
+                    if (keyCode !== 9 && keyCode !== 13 && keyCode !== 27) {
+                        // special keys codes
+                        specialKeys = [37, 38, 39, 40, 46];
+                        // handle special keys
+                        $.each(specialKeys, function (i, val) {
+							if (keyCode === val && keyCode === lastKeyCode) {
+                                exit = true;
+                            }
+                        });
+
+                        // don't handle ignored keys
+                        if (!exit && $.inArray(keyCode, opt.ignoredKeys) === -1) {
+                            // remove selection from all options
+                            $(this).find('option:selected').removeProp('selected');
+
+                            if ($.inArray(keyCode, opt.acceptedKeys) !== -1) {
+                                option = $(this).find('option.' + pluginClass);
+                                text = option.text();
+
+                                if (text.length < opt.maxLength) {
+                                    value = text + String.fromCharCode(getKeyCode(event));
+                                    option.val(value).text(value);
+                                }
+
+                                option.prop('selected', true);
+                            }
+                        }
+
+                        return false;
+                    }
+                },
+
+                keyUp: function () {
+					var opt = options[Combobox.getId($(this))];
+                    if (opt.triggerChangeEvent) {
+                        $(this).trigger('change');
+                    }
+                },
+
+                // change event handler
+                // handles editable option changing based on a pre-existing values
+                change: function () {
+                    var opt = options[Combobox.getId($(this))];
+                    if (opt.useExistingOptions) {
+                        Combobox.setEditableOption($(this));
+                    }
+                },
+
+                click: function () {
+                    if (!$.browser.safari) {
+                        Combobox.openedState($(this), !Combobox.openedState($(this)));
+                    }
+                }
+            };
+        }());
+
+        // Combobox
+        Combobox = (function () {
+            var Parameters, EditableOption, generateId, setup;
+
+            // validates and set combobox parameters
+            Parameters = (function () {
+                var Set, Remove, Handle;
+
+                Set = (function () {
+                    var parseKeys, Handles;
+
+                    parseKeys = function (value) {
+                        var keys = [];
+                        if ($.isArray(value)) {
+                            $.each(value, function (i, val) {
+                                var j, min, max;
+                                if (Validators.keyRange(val)) {
+                                    if ($.isArray(val)) {
+                                        min = val[0];
+                                        max = val[1];
+                                    } else {
+                                        min = val.min;
+                                        max = val.max;
+                                    }
+                                    for (j = min; j <= max; j += 1) {
+                                        keys.push(j);
+                                    }
+                                } else if (typeof val === 'number' && Validators.integer(val)) {
+                                    keys.push(val);
+                                }
+                            });
+                        }
+                        return keys;
+                    };
+
+                    Handles = (function () {
+                        return {
+                            integer: function (elem, name, value) {
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (opt !== undefined && Validators.integer(value)) {
+                                    opt[name] = value;
+                                    return true;
+                                }
+                                return false;
+                            },
+                            bool: function (elem, name, value) {
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (opt !== undefined && typeof value === 'boolean') {
+                                    opt[name] = value;
+                                    return true;
+                                }
+                                return false;
+                            },
+                            array: function (elem, name, value) {
+                                if (typeof value === 'string') {
+                                    value = [value];
+                                }
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (opt !== undefined && $.isArray(value)) {
+                                    opt[name] = value;
+                                    return true;
+                                }
+                                return false;
+                            },
+                            object: function (elem, name, value) {
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (opt !== undefined && value !== null && $.isPlainObject(value)) {
+                                    opt[name] = value;
+                                }
+                            },
+                            keys: function (elem, name, value) {
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (opt !== undefined && $.isArray(value)) {
+                                    opt[name] = parseKeys(value);
+                                }
+                            }
+                        };
+                    }());
+
+                    return {
+                        position: function (elem, value) {
+                            if (Handles.integer(elem, 'position', value)) {
+                                var id = Combobox.getId(elem), opt = options[id], optionsCount;
+                                optionsCount =
+                                    elem.find('option:not(.' + pluginClass + ')').length;
+                                if (value > optionsCount) {
+                                    opt.position = optionsCount;
+                                }
+                            }
+                        },
+
+                        ignoreOptGroups: function (elem, value) {
+                            Handles.bool(elem, 'ignoreOptGroups', value);
+                        },
+
+                        maxLength: function (elem, value) {
+                            if (Handles.integer(elem, 'maxLength', value)) {
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (value < 0 || value > 255) {
+                                    opt.maxLength = 255;
+                                }
+                            }
+                        },
+
+                        classes: function (elem, value) {
+                            Handles.array(elem, 'classes', value);
+                        },
+
+                        optionClasses: function (elem, value) {
+                            Handles.array(elem, 'optionClasses', value);
+                        },
+
+                        styles: function (elem, value) {
+                            Handles.object(elem, 'styles', value);
+                        },
+
+                        optionStyles: function (elem, value) {
+                            Handles.object(elem, 'optionStyles', value);
+                        },
+
+                        triggerChangeEvent: function (elem, value) {
+                            Handles.bool(elem, 'triggerChangeEvent', value);
+                        },
+
+                        focusOnNewOption: function (elem, value) {
+                            Handles.bool(elem, 'focusOnNewOption', value);
+                        },
+
+                        useExistingOptions: function (elem, value) {
+                            Handles.bool(elem, 'useExistingOptions', value);
+                        },
+
+                        blinkingCursor: function (elem, value) {
+                            Handles.bool(elem, 'blinkingCursor', value);
+                        },
+
+                        blinkingCursorInterval: function (elem, value) {
+                            Handles.integer(elem, 'blinkingCursorInterval', value);
+                        },
+
+                        ignoredKeys: function (elem, value) {
+                            Handles.keys(elem, 'ignoredKeys', value);
+                        },
+
+                        acceptedKeys: function (elem, value) {
+                            Handles.keys(elem, 'acceptedKeys', value);
+                        }
+                    };
+                }());
+
+                Remove = (function () {
+                    var removeClasses, removeStyles;
+
+                    removeClasses = function (elem, classes) {
+                        $.each(classes, function (i, val) {
+							elem.removeClass(val);
+                        });
+                    };
+
+                    removeStyles = function (elem, styles) {
+                        $.each(styles, function (key) {
+                            elem.css(key, '');
+                        });
+                    };
+
+                    return {
+                        classes: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                removeClasses(elem, opt.classes);
+                            }
+                        },
+
+                        optionClasses: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                removeClasses(elem.find('option.' + pluginClass),
+                                    opt.optionClasses);
+                            }
+                        },
+
+                        styles: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                removeStyles(elem, opt.styles);
+                            }
+                        },
+
+                        optionStyles: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                removeStyles(elem.find('option.' + pluginClass),
+                                    opt.optionStyles);
+                            }
+                        },
+
+                        all: function (elem) {
+                            Remove.classes(elem);
+                            Remove.optionClasses(elem);
+                            Remove.styles(elem);
+                            Remove.optionStyles(elem);
+                        }
+                    };
+                }());
+
+                Handle = (function () {
+                    var setClasses, setStyles;
+
+                    setClasses = function (elem, classes) {
+                        $.each(classes, function (i, val) {
+                            elem.addClass(String(val));
+                        });
+                    };
+
+                    setStyles = function (elem, styles) {
+                        $.each(styles, function (key, val) {
+                            elem.css(key, val);
+                        });
+                    };
+
+                    return {
+                        position: function (elem) {
+                            var opt = options[Combobox.getId(elem)], option, uneditableOptions, container;
+                            option = elem.find('option.' + pluginClass);
+
+                            uneditableOptions = elem.find('option:not(.' + pluginClass + ')');
+                            if (opt.position < uneditableOptions.length) {
+                                container = uneditableOptions.eq(opt.position);
+
+                                if (!opt.ignoreOptGroups && container.parent('optgroup').length > 0) {
+                                    uneditableOptions.eq(opt.position).parent().before(option);
+                                } else {
+                                    uneditableOptions.eq(opt.position).before(option);
+                                }
+                            } else {
+                                elem.append(option);
+                            }
+                        },
+
+                        classes: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                setClasses(elem, opt.classes);
+                            }
+                        },
+
+                        optionClasses: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                setClasses(elem.find('option.' + pluginClass), opt.optionClasses);
+                            }
+                        },
+
+                        styles: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                setStyles(elem, opt.styles);
+                            }
+                        },
+
+                        optionStyles: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                setStyles(elem.find('option.' + pluginClass), opt.optionStyles);
+                            }
+                        },
+
+                        focusOnNewOption: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined && opt.focusOnNewOption) {
+                                elem.find(':not(option.' + pluginClass + ')').removeProp('selected');
+                                elem.find('option.' + pluginClass).prop('selected', true);
+                            }
+                        },
+
+                        useExistingOptions: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined && opt.useExistingOptions) {
+                                Combobox.setEditableOption(elem);
+                            }
+                        },
+
+                        all: function (elem) {
+                            Handle.position(elem);
+                            Handle.classes(elem);
+                            Handle.optionClasses(elem);
+                            Handle.styles(elem);
+                            Handle.optionStyles(elem);
+                            Handle.focusOnNewOption(elem);
+                            Handle.useExistingOptions(elem);
+                        }
+                    };
+                }());
+
+                return {
+                    Set: Set,
+                    Remove: Remove,
+                    Handle: Handle
+                };
+            }());
+
+            EditableOption = (function () {
+                return {
+                    init: function (elem) {
+                        if (!elem.find('option.' + pluginClass).length) {
+                            var editableOption = $('<option>');
+                            editableOption.addClass(pluginClass);
+                            elem.append(editableOption);
+                        }
+
+                        elem.bind('keydown', EventHandlers.keyDown);
+                        elem.bind('keypress', EventHandlers.keyPress);
+                        elem.bind('keyup', EventHandlers.keyUp);
+                        elem.bind('change', EventHandlers.change);
+                        elem.bind('focus', EventHandlers.focus);
+                        elem.bind('blur', EventHandlers.blur);
+                        elem.bind('click', EventHandlers.click);
+                    },
+
+                    destroy: function (elem) {
+                        elem.find('option.' + pluginClass).remove();
+
+                        elem.unbind('keydown', EventHandlers.keyDown);
+                        elem.unbind('keypress', EventHandlers.keyPress);
+                        elem.unbind('keyup', EventHandlers.keyUp);
+                        elem.unbind('change', EventHandlers.change);
+                        elem.unbind('focus', EventHandlers.focus);
+                        elem.unbind('blur', EventHandlers.blur);
+                        elem.unbind('click', EventHandlers.click);
+                    }
+                };
+            }());
+
+            // generates unique identifier
+            generateId = function () {
+                while (true) {
+                    var random = Math.floor(Math.random() * 100000);
+
+                    if (options[random] === undefined) {
+                        return random;
+                    }
+                }
+            };
+
+            // sets combobox
+            setup = function (elem) {
+                EditableOption.init(elem);
+                Parameters.Handle.all(elem);
+            };
+
+            // Combobox public members
+            return {
+                // create editable combobox
+                init: function (settings) {
+                    return $(this).filter(':uneditable').each(function () {
+                        var id = generateId(), elem = $(this);
+
+                        elem.data('jecId', id);
+
+                        // override passed default options
+                        options[id] = $.extend(true, {}, defaults);
+
+                        // parse keys
+                        Parameters.Set.ignoredKeys(elem, options[id].ignoredKeys);
+                        Parameters.Set.acceptedKeys(elem, options[id].acceptedKeys);
+
+                        if ($.isPlainObject(settings)) {
+                            $.each(settings, function (key, val) {
+                                if (val !== undefined) {
+                                    switch (key) {
+                                    case 'position':
+                                        Parameters.Set.position(elem, val);
+                                        break;
+                                    case 'ignoreOptGroups':
+                                        Parameters.Set.ignoreOptGroups(elem, val);
+                                        break;
+                                    case 'maxLength':
+                                        Parameters.Set.maxLength(elem, val);
+                                        break;
+                                    case 'classes':
+                                        Parameters.Set.classes(elem, val);
+                                        break;
+                                    case 'optionClasses':
+                                        Parameters.Set.optionClasses(elem, val);
+                                        break;
+                                    case 'styles':
+                                        Parameters.Set.styles(elem, val);
+                                        break;
+                                    case 'optionStyles':
+                                        Parameters.Set.optionStyles(elem, val);
+                                        break;
+                                    case 'triggerChangeEvent':
+                                        Parameters.Set.triggerChangeEvent(elem, val);
+                                        break;
+                                    case 'focusOnNewOption':
+                                        Parameters.Set.focusOnNewOption(elem, val);
+                                        break;
+                                    case 'useExistingOptions':
+                                        Parameters.Set.useExistingOptions(elem, val);
+                                        break;
+                                    case 'blinkingCursor':
+                                        Parameters.Set.blinkingCursor(elem, val);
+                                        break;
+                                    case 'blinkingCursorInterval':
+                                        Parameters.Set.blinkingCursorInterval(elem, val);
+                                        break;
+                                    case 'ignoredKeys':
+                                        Parameters.Set.ignoredKeys(elem, val);
+                                        break;
+                                    case 'acceptedKeys':
+                                        Parameters.Set.acceptedKeys(elem, val);
+                                        break;
+                                    }
+                                }
+                            });
+                        }
+
+                        setup($(this));
+                    });
+                },
+
+                // creates editable combobox without using existing select elements
+                initJS: function (options, settings) {
+                    var select, addOptions;
+
+                    select = $('<select>');
+
+                    addOptions = function (elem, options) {
+                        if ($.isArray(options)) {
+                            $.each(options, function (i, val) {
+                                if ($.isPlainObject(val)) {
+                                    $.each(val, function (key, value) {
+                                        if ($.isArray(value)) {
+                                            var og = $('<optgroup>').attr('label', key);
+                                            addOptions(og, value);
+                                            og.appendTo(select);
+                                        } else if (typeof value === 'number' || typeof value === 'string') {
+                                            $('<option>').text(value).attr('value', key)
+                                                .appendTo(elem);
+                                        }
+                                    });
+                                } else if (typeof val === 'string' || typeof val === 'number') {
+                                    $('<option>').text(val).attr('value', val).appendTo(elem);
+                                }
+                            });
+                        }
+                    };
+
+                    addOptions(select, options);
+
+                    return select.jec(settings);
+                },
+
+                // destroys editable combobox
+                destroy: function () {
+                    return $(this).filter(':editable').each(function () {
+                        $(this).jecOff();
+                        $.removeData($(this).get(0), 'jecId');
+                        $.removeData($(this).get(0), 'jecCursorState');
+                        $.removeData($(this).get(0), 'jecOpenedState');
+                    });
+                },
+
+                // enable editablecombobox
+                enable: function () {
+                    return $(this).filter(':editable').each(function () {
+                        var id = Combobox.getId($(this)), value = values[id];
+
+                        setup($(this));
+
+                        if (value !== undefined) {
+                            $(this).jecValue(value);
+                        }
+                    });
+                },
+
+                // disable editable combobox
+                disable: function () {
+                    return $(this).filter(':editable').each(function () {
+                        var val = $(this).find('option.' + pluginClass).val();
+                        values[Combobox.getId($(this))] = val;
+                        Parameters.Remove.all($(this));
+                        EditableOption.destroy($(this));
+                    });
+                },
+
+                // gets or sets editable option's value
+                value: function (value, setFocus) {
+                    if ($(this).filter(':editable').length > 0) {
+                        if (value === null || value === undefined) {
+                            // get value
+                            return $(this).find('option.' + pluginClass).val();
+                        } else if (typeof value === 'string' || typeof value === 'number') {
+                            // set value
+                            return $(this).filter(':editable').each(function () {
+                                var option = $(this).find('option.' + pluginClass);
+                                option.val(value).text(value);
+                                if (typeof setFocus !== 'boolean' || setFocus) {
+                                    option.prop('selected', true);
+                                }
+                            });
+                        }
+                    }
+                },
+
+                // gets or sets editable option's preference
+                pref: function (name, value) {
+                    if ($(this).filter(':editable').length > 0) {
+                        if (typeof name === 'string') {
+                            if (value === null || value === undefined) {
+                                // get preference
+                                return options[Combobox.getId($(this))][name];
+                            } else {
+                                // set preference
+                                return $(this).filter(':editable').each(function () {
+                                    switch (name) {
+                                    case 'position':
+                                        Parameters.Set.position($(this), value);
+                                        Parameters.Handle.position($(this));
+                                        break;
+                                    case 'classes':
+                                        Parameters.Remove.classes($(this));
+                                        Parameters.Set.classes($(this), value);
+                                        Parameters.Handle.position($(this));
+                                        break;
+                                    case 'optionClasses':
+                                        Parameters.Remove.optionClasses($(this));
+                                        Parameters.Set.optionClasses($(this), value);
+                                        Parameters.Set.optionClasses($(this));
+                                        break;
+                                    case 'styles':
+                                        Parameters.Remove.styles($(this));
+                                        Parameters.Set.styles($(this), value);
+                                        Parameters.Set.styles($(this));
+                                        break;
+                                    case 'optionStyles':
+                                        Parameters.Remove.optionStyles($(this));
+                                        Parameters.Set.optionStyles($(this), value);
+                                        Parameters.Handle.optionStyles($(this));
+                                        break;
+                                    case 'focusOnNewOption':
+                                        Parameters.Set.focusOnNewOption($(this), value);
+                                        Parameters.Handle.focusOnNewOption($(this));
+                                        break;
+                                    case 'useExistingOptions':
+                                        Parameters.Set.useExistingOptions($(this), value);
+                                        Parameters.Handle.useExistingOptions($(this));
+                                        break;
+                                    case 'blinkingCursor':
+                                        Parameters.Set.blinkingCursor($(this), value);
+                                        break;
+                                    case 'blinkingCursorInterval':
+                                        Parameters.Set.blinkingCursorInterval($(this), value);
+                                        break;
+                                    case 'ignoredKeys':
+                                        Parameters.Set.ignoredKeys($(this), value);
+                                        break;
+                                    case 'acceptedKeys':
+                                        Parameters.Set.acceptedKeys($(this), value);
+                                        break;
+                                    }
+                                });
+                            }
+                        }
+                    }
+                },
+
+                // sets editable option to the value of currently selected option
+                setEditableOption: function (elem) {
+                    var value = elem.find('option:selected').text();
+                    elem.find('option.' + pluginClass).attr('value', elem.val()).text(value).prop('selected', true);
+                },
+
+                // get combobox id
+                getId: function (elem) {
+                    return elem.data('jecId');
+                },
+
+                valueIsEditable: function (elem) {
+                    return elem.find('option.' + pluginClass).get(0) === elem.find('option:selected').get(0);
+                },
+
+                clearCursor: function (elem) {
+                    $(elem).find('option.' + cursorClass).each(function () {
+                        var text = $(this).text();
+                        $(this).removeClass(cursorClass).text(text.substring(0, text.length - 1));
+                    });
+                },
+
+                cursorState: function (elem, state) {
+                    return elem.data('jecCursorState', state);
+                },
+
+                openedState: function (elem, state) {
+                    return elem.data('jecOpenedState', state);
+                },
+
+                //handles editable cursor
+                handleCursor: function () {
+                    if (activeCombobox !== undefined && activeCombobox !== null) {
+                        if ($.browser.msie && Combobox.openedState(activeCombobox)) {
+                            return;
+                        }
+
+                        var state = Combobox.cursorState(activeCombobox), elem;
+                        if (state) {
+                            Combobox.clearCursor(activeCombobox);
+                        } else if (Combobox.valueIsEditable(activeCombobox)) {
+                            elem = activeCombobox.find('option:selected');
+                            elem.addClass(cursorClass).text(elem.text() + '|');
+                        }
+                        Combobox.cursorState(activeCombobox, !state);
+                    }
+                }
+            };
+        }());
+
+        // jEC public members
+        return {
+            init: Combobox.init,
+            enable: Combobox.enable,
+            disable: Combobox.disable,
+            destroy: Combobox.destroy,
+            value: Combobox.value,
+            pref: Combobox.pref,
+            initJS: Combobox.initJS,
+            handleCursor: Combobox.handleCursor
+        };
+    }());
+
+    // register functions
+    $.fn.extend({
+        jec: $.jEC.init,
+        jecOn: $.jEC.enable,
+        jecOff: $.jEC.disable,
+        jecKill: $.jEC.destroy,
+        jecValue: $.jEC.value,
+        jecPref: $.jEC.pref
+    });
+
+    $.extend({
+        jec: $.jEC.initJS
+    });
+
+    // register selectors
+    $.extend($.expr[':'], {
+        editable: function (a) {
+            var data = $(a).data('jecId');
+            return data !== null && data !== undefined;
+        },
+
+        uneditable: function (a) {
+            var data = $(a).data('jecId');
+            return data === null || data === undefined;
+        }
+    });
+
+}(jQuery));
\ No newline at end of file
diff --git a/apps/contacts/templates/index2.php b/apps/contacts/templates/index2.php
new file mode 100644
index 00000000000..4c0dfad6177
--- /dev/null
+++ b/apps/contacts/templates/index2.php
@@ -0,0 +1,27 @@
+<script type='text/javascript'>
+	var totalurl = '<?php echo OC_Helper::linkTo('contacts', 'carddav.php', null, true); ?>/addressbooks';
+</script>
+<div id="controls">
+	<form>
+		<input type="button" id="contacts_newcontact" value="<?php echo $l->t('Add Contact'); ?>">
+		<input type="button" id="chooseaddressbook" value="<?php echo $l->t('Addressbooks'); ?>">
+	</form>
+</div>
+<div id="leftcontent" class="leftcontent">
+	<ul id="contacts">
+		<?php echo $this->inc("part.contacts"); ?>
+	</ul>
+</div>
+<div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>">
+	<?php
+		if ($_['id']){
+			echo $this->inc('part.contact');
+		}
+		else{
+			echo $this->inc('part.no_contacts');
+		}
+	?>
+</div>
+<!-- Dialogs -->
+<div id="dialog_holder"></div>
+<!-- End of Dialogs -->
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
new file mode 100644
index 00000000000..0e3611b2e4c
--- /dev/null
+++ b/apps/contacts/templates/part.contact.php
@@ -0,0 +1,210 @@
+<?php
+$l=new OC_L10N('contacts');
+$id = isset($_['id']) ? $_['id'] : '';
+$card = array();
+$card['id'] = $id;
+$card['FN'] = (array_key_exists('FN',$_['details'])) ? $_['details']['FN'][0] : null;
+$card['N'] = (array_key_exists('N',$_['details'])) ? $_['details']['N'][0] : array('', '', '', '', '');
+$card['ORG'] = (array_key_exists('ORG',$_['details'])) ? $_['details']['ORG'][0] : null;
+$card['PHOTO'] = (array_key_exists('PHOTO',$_['details'])) ? $_['details']['PHOTO'][0] : null;
+$card['BDAY'] = (array_key_exists('BDAY',$_['details'])) ? $_['details']['BDAY'][0] : null;
+if($card['BDAY']) {
+	$bday = new DateTime($card['BDAY']['value']);
+	$card['BDAY']['value'] = $bday->format('d-m-Y');
+}
+$card['NICKNAME'] = (array_key_exists('NICKNAME',$_['details'])) ? $_['details']['NICKNAME'][0] : null;
+$card['EMAIL'] = (array_key_exists('EMAIL',$_['details'])) ? $_['details']['EMAIL'] : array();
+$card['TEL'] = (array_key_exists('TEL',$_['details'])) ? $_['details']['TEL'] : array();
+$card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] : array();
+?>
+<div id="card">
+	<div id="actionbar">
+	<a id="contacts_propertymenu_button"></a>
+	<ul id="contacts_propertymenu">
+		<li <?php echo (!is_null($card['PHOTO'])?'style="display:none;"':''); ?>>
+			<a data-type="PHOTO"><?php echo $l->t('Profile picture'); ?></a>
+		</li>
+		<li <?php echo (!is_null($card['ORG'])?'style="display:none;"':''); ?>>
+			<a data-type="ORG"><?php echo $l->t('Organization'); ?></a>
+		</li>
+		<li <?php echo (!is_null($card['NICKNAME'])?'style="display:none;"':''); ?>>
+			<a data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a>
+		</li>
+		<li <?php echo (!is_null($card['BDAY'])?'style="display:none;"':''); ?>>
+			<a data-type="BDAY"><?php echo $l->t('Birthday'); ?></a>
+		</li>
+		<li><a data-type="TEL"><?php echo $l->t('Phone'); ?></a></li>
+		<li><a data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
+		<li><a data-type="ADR"><?php echo $l->t('Address'); ?></a></li>
+	</ul>
+	<img  onclick="Contacts.UI.Card.export();" class="svg action" id="contacts_downloadcard" src="<?php echo image_path('', 'actions/download.svg'); ?>" title="<?php echo $l->t('Download contact');?>" />
+	<img class="svg action" id="contacts_deletecard" src="<?php echo image_path('', 'actions/delete.svg'); ?>" title="<?php echo $l->t('Delete contact');?>" />
+	</div>
+
+	<div class="contactsection">
+
+	<form <?php echo (is_null($card['PHOTO'])?'style="display:none;"':''); ?> id="file_upload_form" action="ajax/uploadphoto.php" method="post" enctype="multipart/form-data" target="file_upload_target">
+	<fieldset id="photo" class="formfloat">
+		<div id="contacts_details_photo_wrapper" title="<?php echo $l->t('Click or drop to upload picture'); ?> (max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
+		<!-- img style="padding: 1em;" id="contacts_details_photo" alt="Profile picture"  src="photo.php?id=<?php echo $_['id']; ?>" / -->
+		<progress id="contacts_details_photo_progress" style="display:none;" value="0" max="100">0 %</progress>
+		</div>
+		<input type="hidden" name="id" value="<?php echo $_['id'] ?>">
+		<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
+		<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
+		<input id="file_upload_start" type="file" accept="image/*" name="imagefile" />
+		<iframe name="file_upload_target" id='file_upload_target' src=""></iframe>
+	</fieldset>
+	</form>
+	<form id="contact_identity" method="post" <?php echo ($_['id']==''||!isset($_['id'])?'style="display:none;"':''); ?>>
+	<input type="hidden" name="id" value="<?php echo $_['id'] ?>">
+	<fieldset class="propertycontainer" data-element="N"><input type="hidden" id="n" class="contacts_property" name="value" value="" /></fieldset>
+	<fieldset id="ident" class="formfloat">
+	<!-- legend>Name</legend -->
+	<dl class="form">
+		<!-- dt><label for="n"><?php echo $l->t('Name'); ?></label></dt>
+		<dd style="padding-top: 0.8em;vertical-align: text-bottom;"><span id="n" type="text"></span></dd -->
+		<dt><label for="fn"><?php echo $l->t('Display name'); ?></label></dt>
+		<dd class="propertycontainer" data-element="FN">
+		<select id="fn" name="value" required="required" class="contacts_property" title="<?php echo $l->t('Format custom, Short name, Full name, Reverse or Reverse with comma'); ?>" style="width:16em;">
+			<option id="short" title="Short name"></option>
+			<option id="full" title="Full name"></option>
+			<option id="reverse" title="Reverse"></option>
+			<option id="reverse_comma" title="Reverse with comma"></option>
+		</select><a id="edit_name" class="edit" title="<?php echo $l->t('Edit name details'); ?>"></a>
+		</dd>
+		<dt style="display:none;" id="org_label" data-element="ORG"><label for="org"><?php echo $l->t('Organization'); ?></label></dt>
+		<dd style="display:none;" class="propertycontainer" id="org_value" data-element="ORG"><input id="org"  required="required" name="value[ORG]" type="text" class="contacts_property" style="width:16em;" name="value" value="" placeholder="<?php echo $l->t('Organization'); ?>" /><a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'single');" title="<?php echo $l->t('Delete'); ?>"></a></dd>
+		<dt style="display:none;" id="nickname_label" data-element="NICKNAME"><label for="nickname"><?php echo $l->t('Nickname'); ?></label></dt>
+		<dd style="display:none;" class="propertycontainer" id="nickname_value" data-element="NICKNAME"><input id="nickname" required="required" name="value[NICKNAME]" type="text" class="contacts_property" style="width:16em;" name="value" value="" placeholder="<?php echo $l->t('Enter nickname'); ?>" /><a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'single');" title="<?php echo $l->t('Delete'); ?>"></a></dd>
+		<dt style="display:none;" id="bday_label" data-element="BDAY"><label for="bday"><?php echo $l->t('Birthday'); ?></label></dt>
+		<dd style="display:none;" class="propertycontainer" id="bday_value" data-element="BDAY"><input id="bday"  required="required" name="value" type="text" class="contacts_property" value="" placeholder="<?php echo $l->t('dd-mm-yyyy'); ?>" /><a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'single');" title="<?php echo $l->t('Delete'); ?>"></a></dd>
+	</dl>
+	</fieldset>
+	</form>
+	</div>
+
+	<!-- div class="delimiter"></div -->
+	<form id="contact_communication" method="post">
+	<div class="contactsection">
+		<!-- email addresses -->
+		<div id="emails" <?php echo (count($card['EMAIL'])>0?'':'style="display:none;"'); ?>>
+		<fieldset class="contactpart">
+		<legend><?php echo $l->t('Email'); ?></legend>
+			<ul id="emaillist" class="propertylist">
+			<li class="template" style="white-space: nowrap; display: none;" data-element="EMAIL">
+				<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
+				<input type="email" required="required" class="nonempty contacts_property" style="width:15em;" name="value" value="" x-moz-errormessage="<?php echo $l->t('Please specify a valid email address.'); ?>" placeholder="<?php echo $l->t('Enter email address'); ?>" /><span class="listactions"><a onclick="Contacts.UI.mailTo(this)" class="mail" title="<?php echo $l->t('Mail to address'); ?>"></a>
+				<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete email address'); ?>"></a></span></li>
+			<?php
+			if(0) { /*foreach($card['EMAIL'] as $email) {*/
+			?>
+			<li class="propertycontainer" style="white-space: nowrap;" data-checksum="<?php echo $email['checksum'] ?>" data-element="EMAIL">
+				<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" <?php echo (isset($email['parameters']['PREF'])?'checked="checked"':''); ?> />
+				<input type="email" required="required" class="nonempty contacts_property" style="width:15em;" name="value" value="<?php echo $email['value'] ?>" placeholder="<?php echo $l->t('Enter email address'); ?>" /><span class="listactions"><a onclick="Contacts.UI.mailTo(this)" class="mail" title="<?php echo $l->t('Mail to address'); ?>"></a>
+				<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete email address'); ?>"></a></span></li>
+			<?php } ?>
+			</ul><!-- a id="add_email" class="add" title="<?php echo $l->t('Add email address'); ?>"></a -->
+		</div> <!-- email addresses-->
+
+		<!-- Phone numbers -->
+		<div id="phones" <?php echo (count($card['TEL'])>0?'':'style="display:none;"'); ?>>
+		<fieldset class="contactpart">
+		<legend><?php echo $l->t('Phone'); ?></legend>
+			<ul id="phonelist" class="propertylist">
+				<li class="template" style="white-space: nowrap; display: none;" data-element="TEL">
+				<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" /> 
+				<input type="text" required="required" class="nonempty contacts_property" style="width:10em; border: 0px;" name="value" value="" placeholder="<?php echo $l->t('Enter phone number'); ?>" />
+				<select multiple="multiple" name="parameters[TYPE][]">
+					<?php echo html_select_options($_['phone_types'], array()) ?>
+				</select>
+				<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete phone number'); ?>"></a></li>
+			<?php
+			if(0) { /*foreach($card['TEL'] as $phone) {*/
+			?>
+				<li class="propertycontainer" style="white-space: nowrap;" data-checksum="<?php echo $phone['checksum'] ?>" data-element="TEL">
+				<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" <?php echo (isset($phone['parameters']['PREF'])?'checked="checked"':''); ?> /> 
+				<input type="text" required="required" class="nonempty contacts_property" style="width:8em; border: 0px;" name="value" value="<?php echo $phone['value'] ?>" placeholder="<?php echo $l->t('Enter phone number'); ?>" />
+				<select class="contacts_property" multiple="multiple" name="parameters[TYPE][]">
+					<?php echo html_select_options($_['phone_types'], isset($phone['parameters']['TYPE'])?$phone['parameters']['TYPE']:array()) ?>
+				</select>
+				<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete phone number'); ?>"></a></li>
+			<?php } ?>
+			</ul><!-- a id="add_phone" class="add" title="<?php echo $l->t('Add phone number'); ?>"></a -->
+		</div> <!-- Phone numbers -->
+
+		<!-- Addresses -->
+		<div id="addresses" <?php echo (count($card['ADR'])>0?'':'style="display:none;"'); ?>>
+		<fieldset class="contactpart">
+		<legend><?php echo $l->t('Address'); ?></legend>
+		<div id="addressdisplay">
+			<dl class="addresscard template" style="display: none;" data-element="ADR"><dt>
+			<input class="adr contacts_property" name="value" type="hidden" value="" />
+			<input type="hidden" class="adr_type contacts_property" name="parameters[TYPE][]" value="" />
+			<span class="adr_type_label"></span><a class="globe" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.searchOSM(this);" title="<?php echo $l->t('View on map'); ?>"></a><a class="edit" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.Card.editAddress(this, false);" title="<?php echo $l->t('Edit address details'); ?>"></a><a class="delete" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="Delete address"></a>
+			</dt><dd><ul class="addresslist"></ul></dd></dl>
+
+			<?php if(0) { /*foreach($card['ADR'] as $address) {*/ ?>
+			<dl class="addresscard propertycontainer" data-checksum="<?php echo $address['checksum']; ?>" data-element="ADR">
+			<dt>
+			<input class="adr contacts_property" name="value" type="hidden" value="<?php echo implode(';',$address['value']); ?>" />
+				<input type="hidden" class="adr_type contacts_property" name="parameters[TYPE][]" value="<?php echo strtoupper(implode(',',$address['parameters'])); ?>" />
+				<span class="adr_type_label">
+				<?php 
+				if(count($address['parameters']) > 0) {
+					//array_walk($address['parameters'], ) Nah, this wont work...
+					$translated = array();
+					foreach($address['parameters'] as $type) {
+						$translated[] = $l->t(ucwords(strtolower($type)));
+					}
+					echo implode('/', $translated);
+				}
+				?></span><a class="globe" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.searchOSM(this);" title="<?php echo $l->t('View on map'); ?>"></a><a class="edit" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.Card.editAddress(this, false);" title="<?php echo $l->t('Edit address details'); ?>"></a><a class="delete" style="float:right;"  onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="Delete address"></a>
+			</dt>
+			<dd>
+			<ul class="addresslist">
+				<?php
+				$adr = $address['value'];
+				$tmp = ($adr[0]?'<li>'.$adr[0].'</li>':'');
+				$tmp .= ($adr[1]?'<li>'.$adr[1].'</li>':'');
+				$tmp .= ($adr[2]?'<li>'.$adr[2].'</li>':'');
+				$tmp .= ($adr[3]||$adr[5]?'<li>'.$adr[5].' '.$adr[3].'</li>':'');
+				$tmp .= ($adr[4]?'<li>'.$adr[4].'</li>':'');
+				$tmp .= ($adr[6]?'<li>'.$adr[6].'</li>':'');
+				echo $tmp;
+				
+				?>
+			</ul>
+			</dd>
+			</dl>
+			<?php } ?>
+		</fieldset>
+		</div>
+		</div> <!-- Addresses -->
+	</div>
+	<!-- a id="add_address" onclick="Contacts.UI.Card.editAddress('new', true)" class="add" title="<?php echo $l->t('Add address'); ?>"></a -->
+	</div> 
+	</form>
+</div>
+<div class="delimiter"></div>
+<pre>
+<?php /*print_r($card);*/ ?>
+</pre>
+	<!-- div class="updatebar"><input type="button" value="Update" /></div -->
+<div id="edit_photo_dialog" title="Edit photo">
+		<div id="edit_photo_dialog_img"></div>
+</div>
+<script language="Javascript">
+$(document).ready(function(){
+	if('<?php echo $id; ?>'!='') {
+		$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':'<?php echo $id; ?>'},function(jsondata){
+			if(jsondata.status == 'success'){
+				Contacts.UI.Card.loadContact(jsondata.data);
+			}
+			else{
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+			}
+		});
+	}
+});
+</script>
diff --git a/apps/contacts/templates/part.contactphoto.php b/apps/contacts/templates/part.contactphoto.php
new file mode 100644
index 00000000000..7d7ab237561
--- /dev/null
+++ b/apps/contacts/templates/part.contactphoto.php
@@ -0,0 +1,9 @@
+<?php 
+$id = $_['id'];
+$wattr = isset($_['width'])?'width="'.$_['width'].'"':'';
+$hattr = isset($_['height'])?'height="'.$_['height'].'"':'';
+?>
+<img class="loading" id="contacts_details_photo" <?php echo $wattr; ?> <?php echo $hattr; ?> src="<?php echo OC_Helper::linkTo('contacts', 'photo.php', null, true); ?>?id=<?php echo $id; ?>&amp;refresh=<?php echo rand(); ?>" />
+<progress id="contacts_details_photo_progress" style="display:none;" value="0" max="100">0 %</progress>
+
+
diff --git a/apps/contacts/templates/part.cropphoto.php b/apps/contacts/templates/part.cropphoto.php
new file mode 100644
index 00000000000..cb416f0e415
--- /dev/null
+++ b/apps/contacts/templates/part.cropphoto.php
@@ -0,0 +1,62 @@
+<?php 
+$id = $_['id'];
+$tmp_path = $_['tmp_path'];
+OC_Log::write('contacts','templates/part.cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OC_Log::DEBUG);
+?>
+<script language="Javascript">
+	jQuery(function($) {
+		$('#cropbox').Jcrop({
+			onChange:	showCoords,
+			onSelect:	showCoords,
+			onRelease:	clearCoords,
+			maxSize:	[399, 399],
+			bgColor:	'black',
+			bgOpacity:	.4,
+			boxWidth: 	400,
+			boxHeight:	400,
+			setSelect:	[ 100, 130, 50, 50 ]//,
+			//aspectRatio: 0.8
+		});
+	});
+	// Simple event handler, called from onChange and onSelect
+	// event handlers, as per the Jcrop invocation above
+	function showCoords(c) {
+		$('#x1').val(c.x);
+		$('#y1').val(c.y);
+		$('#x2').val(c.x2);
+		$('#y2').val(c.y2);
+		$('#w').val(c.w);
+		$('#h').val(c.h);
+	};
+
+	function clearCoords() {
+		$('#coords input').val('');
+	};
+	/*
+	$('#coords').submit(function() {
+		alert('Handler for .submit() called.');
+		return true;
+	});*/
+</script>
+<img id="cropbox" src="<?php echo OC_Helper::linkTo('contacts', 'dynphoto.php', null, true); ?>?tmp_path=<?php echo urlencode($tmp_path); ?>" />
+<form id="cropform"
+	class="coords"
+	method="post"
+	enctype="multipart/form-data"
+	target="crop_target"
+	action="<?php echo OC_Helper::linkTo('contacts', 'ajax/savecrop.php', null, true); ?>">
+
+	<input type="hidden" id="id" name="id" value="<?php echo $id; ?>" />
+	<input type="hidden" id="tmp_path" name="tmp_path" value="<?php echo $tmp_path; ?>" />
+	<fieldset id="coords">
+	<input type="hidden" id="x1" name="x1" value="" />
+	<input type="hidden" id="y1" name="y1" value="" />
+	<input type="hidden" id="x2" name="x2" value="" />
+	<input type="hidden" id="y2" name="y2" value="" />
+	<input type="hidden" id="w" name="w" value="" />
+	<input type="hidden" id="h" name="h" value="" />
+	</fieldset>
+	<iframe name="crop_target" id='crop_target' src=""></iframe>
+</form>
+
+
diff --git a/apps/contacts/templates/part.edit_address_dialog.php b/apps/contacts/templates/part.edit_address_dialog.php
new file mode 100644
index 00000000000..0ecdc4e1915
--- /dev/null
+++ b/apps/contacts/templates/part.edit_address_dialog.php
@@ -0,0 +1,67 @@
+<?php
+$adr = isset($_['adr'])?$_['adr']:array();
+$id = $_['id'];
+$types = array();
+foreach(isset($adr['parameters']['TYPE'])?array($adr['parameters']['TYPE']):array() as $type) {
+	$types[] = strtoupper($type);
+}
+?>
+<div id="edit_address_dialog" title="<?php echo $l->t('Edit address'); ?>">
+<!-- ?php print_r($types); ? -->
+	<fieldset id="address">
+		<dl class="form">
+			<dt>
+				<label class="label" for="adr_type"><?php echo $l->t('Type'); ?></label>
+			</dt>
+			<dd>
+				<select id="adr_type" name="parameters[ADR][TYPE]" size="1">
+					<?php echo html_select_options($_['adr_types'], $types) ?>
+				</select>
+			</dd>
+			<dt>
+				<label class="label" for="adr_pobox"><?php echo $l->t('PO Box'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_pobox" name="value[ADR][0]" value="<?php echo isset($adr['value'][0])?$adr['value'][0]:''; ?>">
+			</dd>
+			<dd>
+			<dt>
+				<label class="label" for="adr_extended"><?php echo $l->t('Extended'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_extended" name="value[ADR][1]" value="<?php echo isset($adr['value'][1])?$adr['value'][1]:''; ?>">
+			</dd>
+			<dt>
+				<label class="label" for="adr_street"><?php echo $l->t('Street'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_street" name="value[ADR][2]" value="<?php echo isset($adr['value'][2])?$adr['value'][2]:''; ?>">
+			</dd>
+			<dt>
+				<label class="label" for="adr_city"><?php echo $l->t('City'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_city" name="value[ADR][3]" value="<?php echo isset($adr['value'][3])?$adr['value'][3]:''; ?>">
+			</dd>
+			<dt>
+				<label class="label" for="adr_region"><?php echo $l->t('Region'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_region" name="value[ADR][4]" value="<?php echo isset($adr['value'][4])?$adr['value'][4]:''; ?>">
+			</dd>
+			<dt>
+				<label class="label" for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_zipcode" name="value[ADR][5]" value="<?php echo isset($adr['value'][5])?$adr['value'][5]:''; ?>">
+			</dd>
+			<dt>
+				<label class="label" for="adr_country"><?php echo $l->t('Country'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_country" name="value[ADR][6]" value="<?php echo isset($adr['value'][6])?$adr['value'][6]:''; ?>">
+			</dd>
+		</dl>
+	</fieldset>
+	</form>
+</div>
diff --git a/apps/contacts/templates/part.edit_name_dialog.php b/apps/contacts/templates/part.edit_name_dialog.php
new file mode 100644
index 00000000000..d525fd1f99b
--- /dev/null
+++ b/apps/contacts/templates/part.edit_name_dialog.php
@@ -0,0 +1,59 @@
+<?php
+$l=new OC_L10N('contacts');
+$name = isset($_['name'])?$_['name']:'';
+//print_r($name);
+$id = isset($_['id'])?$_['id']:'';
+$addressbooks = isset($_['addressbooks'])?$_['addressbooks']:null;
+?>
+<div id="edit_name_dialog" title="Edit name">
+	<form>
+	<fieldset>
+	<dl class="form">
+		<?php if(!is_null($addressbooks)) { 
+			if(count($_['addressbooks'])==1) {
+		?>
+			<input type="hidden" id="aid" name="aid" value="<?php echo $_['addressbooks'][0]['id']; ?>">
+		<?php } else { ?>
+		<dt><label for="addressbook"><?php echo $l->t('Addressbook'); ?></label></dt>
+		<dd>
+			<select id="aid" name="aid" size="1">
+				<?php echo html_select_options($_['addressbooks'], null, array('value'=>'id', 'label'=>'displayname')); ?>
+			</select>
+		</dd>
+		<?php }} ?>
+		<dt><label for="pre"><?php echo $l->t('Hon. prefixes'); ?></label></dt>
+		<dd>
+			<input name="pre" id="pre" value="<?php echo isset($name['value'][3]) ? $name['value'][3] : ''; ?>" type="text" list="prefixes" />
+			<datalist id="prefixes">
+				<option value="<?php echo $l->t('Miss'); ?>">
+				<option value="<?php echo $l->t('Ms'); ?>">
+				<option value="<?php echo $l->t('Mr'); ?>">
+				<option value="<?php echo $l->t('Sir'); ?>">
+				<option value="<?php echo $l->t('Mrs'); ?>">
+				<option value="<?php echo $l->t('Dr'); ?>">
+			</datalist>
+		</dd>
+		<dt><label for="giv"><?php echo $l->t('Given name'); ?></label></dt>
+		<dd><input name="giv" id="giv" value="<?php echo isset($name['value'][1]) ? $name['value'][1] : ''; ?>" type="text" /></dd>
+		<dt><label for="add"><?php echo $l->t('Additional names'); ?></label></dt>
+		<dd><input name="add" id="add" value="<?php echo isset($name['value'][2]) ? $name['value'][2] : ''; ?>" type="text" /></dd>
+		<dt><label for="fam"><?php echo $l->t('Family name'); ?></label></dt>
+		<dd><input name="fam" id="fam" value="<?php echo isset($name['value'][0]) ? $name['value'][0] : ''; ?>" type="text" /></dd>
+		<dt><label for="suf"><?php echo $l->t('Hon. suffixes'); ?></label></dt>
+		<dd>
+			<input name="suf" id="suf" value="<?php echo isset($name['value'][4]) ? $name['value'][4] : ''; ?>" type="text" list="suffixes" />
+			<datalist id="suffixes">
+				<option value="<?php echo $l->t('J.D.'); ?>">
+				<option value="<?php echo $l->t('M.D.'); ?>">
+				<option value="<?php echo $l->t('D.O.'); ?>">
+				<option value="<?php echo $l->t('D.C.'); ?>">
+				<option value="<?php echo $l->t('Ph.D.'); ?>">
+				<option value="<?php echo $l->t('Esq.'); ?>">
+				<option value="<?php echo $l->t('Jr.'); ?>">
+				<option value="<?php echo $l->t('Sn.'); ?>">
+			</datalist>
+		</dd>
+	</dl>
+	</fieldset>
+	</form>
+</div>
diff --git a/apps/contacts/templates/part.no_contacts.php b/apps/contacts/templates/part.no_contacts.php
new file mode 100644
index 00000000000..ab6129cdde7
--- /dev/null
+++ b/apps/contacts/templates/part.no_contacts.php
@@ -0,0 +1,8 @@
+<div id="firstrun">
+You have no contacts in your list.
+	<div id="selections">
+		<input type="button" value="Import contacts" onclick="Contacts.UI.Addressbooks.import()" />
+		<input type="button" value="Add contact" onclick="Contacts.UI.Card.add()" />
+		<input type="button" value="Edit addressbooks" onclick="Contacts.UI.Addressbooks.overview()" />
+	</div>
+</div>
\ No newline at end of file
diff --git a/core/img/actions/add.png b/core/img/actions/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..db1b1970f17f7b6a35fb22693af492df7c2391df
GIT binary patch
literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000UR000UR0oc(#5&!@I8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10cA-<K~y-6rIRsh!cY{2zr?gP(khj73vPkp?%Kt{E=~of&iw=a
z3TJ<iU8Ep5NH@VPVx_b?<e5axyB$h{*rc@d!W-Uw=N;}noMVUx|0ye{Us@~{w@N7!
zpja%5>$;D?+cD70AutDnf$e!-)$_b+zu!LxPBMWx1QG;6x?3E_0_Z;xY&M&eAc`XL
z2);D9Sglr<U(G_HaH^C_K~WSD1i{sAw<{fBf^xb1Zioou@%Xye>)p)f^Yqhlxnwq*
z0pPkWwOTEGt5hm<yWQtzv-xBJtk-KjnM{~Yr<wcszK`$w>D_T0!Z1uy4Yu2Dk|arv
z9N$Z8of238wr$6qPUj_#V+|l8#%MIE4u``tfO@^YZ?#&lhG7VRX_|&@+n*wdNY*)N
zx7&BX1MtvjH10*Dl!g7355h2nzxqHab?5^DGDDM>1<_h-$8j`(Wm!6J0^^4?9(#YE
eHN{T^zp4*-4#pi%9*bB20000<MNUMnLSTZYj?9|?

literal 0
HcmV?d00001

diff --git a/core/img/actions/add.svg b/core/img/actions/add.svg
new file mode 100644
index 00000000000..29994747c33
--- /dev/null
+++ b/core/img/actions/add.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="22"
+   height="22"
+   id="svg2406"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="add.svg">
+  <metadata
+     id="metadata3125">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3123"
+     showgrid="false"
+     inkscape:zoom="10.727273"
+     inkscape:cx="11.843286"
+     inkscape:cy="14.728814"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2406" />
+  <defs
+     id="defs2408">
+    <linearGradient
+       id="linearGradient2264">
+      <stop
+         id="stop2266"
+         style="stop-color:#d7e866;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2268"
+         style="stop-color:#8cab2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.103895"
+       y1="15.180944"
+       x2="24.103895"
+       y2="34.224861"
+       id="linearGradient2401"
+       xlink:href="#linearGradient2264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8988874,0,0,0.8934652,-10.463705,-9.5659718)" />
+    <linearGradient
+       id="linearGradient4222">
+      <stop
+         id="stop4224"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4226"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.138529"
+       y1="6.5316639"
+       x2="24.138529"
+       y2="45.690399"
+       id="linearGradient2398"
+       xlink:href="#linearGradient4222"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5399382,0,0,0.5366811,-1.8489228,-1.5061978)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4222"
+       id="linearGradient3128"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5399382,0,0,0.5366811,-1.7557025,-1.7858588)"
+       x1="24.138529"
+       y1="6.5316639"
+       x2="24.138529"
+       y2="45.690399" />
+  </defs>
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.40000000000000002;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3128);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+     id="path2272"
+     d="m 8.5932204,8.2151575 0,-5.9948184 4.9999996,0 0,5.9948184 6,0 0,5.0051815 -6,0 0,6 -4.9999996,0 0,-6 -6,0 0,-5.0051815 6,0 z" />
+</svg>
diff --git a/core/img/actions/mail.png b/core/img/actions/mail.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea811ac5453b28affe9e1bed66fc5f472fbc85ba
GIT binary patch
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000UR000UR0oc(#5&!@I8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10ij7mK~y-6rIXFd+E5UNA7hR&8bncyP*Bia!M(WYwinq8_-;gW
zC#ZCxXm=`Zl;BTJP9~>|qS#W}uXSJ+^TIPf%uLQ&%PZyr0r2rZ`LDUrX!J!X_33uI
z>3<=M#iEy{>C!dEeD3vnA4G&wsq`-Rd_LoO9;?-=;-qPsd7g(chW&nzh>&I3Z#_*@
zcDo$_N-5Gb#WBW^Wf|pi8Ko5K^_si(>{@Hq>ovabQ!ExA37sTK5D`R#APA_{YRqOc
zZnxV*zh18_77H4U2EOk<bYqNlj4}4PQV;}OE*Hk*F;Nr|MG@oim^h9pl}bN#l_Ux7
zy#s44BEoz=Ck#XC^*WQugj_DiU@&06-!q*~>G%6Mj)S!pV+`(n-XuxbY&NvpZK~BO
z0K?%BfI^`_r_<qhJhEIa>2|v)rG6xc<JiV=%;9jL-ELDT6c7;r^7%Z#Bd$~`c%H|0
zyQS4?p|!TI)|%_}O0(I-aU8NN`{NBLr3k~2%jJUB8dpRfYxx`e%OxTrxTn+U+uPfl
m`)=~dL?p_+`i;&@H1Hj8cO_z{9a<;=0000<MNUMnLSTYIH}VAl

literal 0
HcmV?d00001

diff --git a/core/img/actions/mail.svg b/core/img/actions/mail.svg
new file mode 100644
index 00000000000..54a24faf85d
--- /dev/null
+++ b/core/img/actions/mail.svg
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="22"
+   height="22"
+   id="svg2575"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="mail_new.svg"
+   inkscape:export-filename="/home/tol/tanghus-owncloud/core/img/actions/mail.png"
+   inkscape:export-xdpi="65.454544"
+   inkscape:export-ydpi="65.454544">
+  <metadata
+     id="metadata59">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview57"
+     showgrid="false"
+     inkscape:zoom="10.727273"
+     inkscape:cx="11"
+     inkscape:cy="11"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2575" />
+  <defs
+     id="defs2577">
+    <linearGradient
+       id="linearGradient3943">
+      <stop
+         id="stop3945"
+         style="stop-color:#ffffff;stop-opacity:0.40000001"
+         offset="0" />
+      <stop
+         id="stop3947"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.138529"
+       y1="7.0478544"
+       x2="24.138529"
+       y2="47.272728"
+       id="linearGradient2560"
+       xlink:href="#linearGradient3943"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2817955,0,0,0.2800956,-16.058706,13.975052)" />
+    <linearGradient
+       id="linearGradient2264">
+      <stop
+         id="stop2266"
+         style="stop-color:#d7e866;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2268"
+         style="stop-color:#8cab2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.103895"
+       y1="15.168831"
+       x2="24.103895"
+       y2="32.485161"
+       id="linearGradient2558"
+       xlink:href="#linearGradient2264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4691323,0,0,0.4663025,-20.554789,9.7686284)" />
+    <linearGradient
+       id="linearGradient3495-841-851-719">
+      <stop
+         id="stop4120"
+         style="stop-color:#1e1e1e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4122"
+         style="stop-color:#1e1e1e;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3333-314-917-262">
+      <stop
+         id="stop4102"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4104"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2490-495-150-777">
+      <stop
+         id="stop4108"
+         style="stop-color:#787878;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4110"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3242-967-12-570-862-307">
+      <stop
+         id="stop4498"
+         style="stop-color:#f2f2f2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4502"
+         style="stop-color:#dbdbdb;stop-opacity:1"
+         offset="0.87426931" />
+      <stop
+         id="stop4504"
+         style="stop-color:#999999;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5060-6-986-342-61">
+      <stop
+         id="stop4080"
+         style="stop-color:#1e1e1e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4082"
+         style="stop-color:#1e1e1e;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="605.71429"
+       cy="486.64789"
+       r="117.14286"
+       fx="605.71429"
+       fy="486.64789"
+       id="radialGradient2724-226-535-494"
+       xlink:href="#linearGradient5060-6-986-342-61"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-6.553443e-2,0,0,2.470588e-2,-21.829255,10.577352)" />
+    <linearGradient
+       id="linearGradient5060-6-252-476-367">
+      <stop
+         id="stop4074"
+         style="stop-color:#1e1e1e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4076"
+         style="stop-color:#1e1e1e;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="605.71429"
+       cy="486.64789"
+       r="117.14286"
+       fx="605.71429"
+       fy="486.64789"
+       id="radialGradient2722-303-187-273"
+       xlink:href="#linearGradient5060-6-252-476-367"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.553443e-2,0,0,2.470588e-2,-69.175497,10.577352)" />
+    <linearGradient
+       id="linearGradient5048-7-668-934-892">
+      <stop
+         id="stop4066"
+         style="stop-color:#1e1e1e;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop4068"
+         style="stop-color:#1e1e1e;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop4070"
+         style="stop-color:#1e1e1e;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507"
+       id="linearGradient2720-766-26-906"
+       xlink:href="#linearGradient5048-7-668-934-892"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.553443e-2,0,0,2.470588e-2,-69.188394,10.577352)" />
+    <linearGradient
+       x1="23.903786"
+       y1="35.75"
+       x2="23.903786"
+       y2="16.00676"
+       id="linearGradient3411"
+       xlink:href="#linearGradient3495-841-851-719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4657385,0,0,0.4850945,0.8223379,-3.5686279)" />
+    <linearGradient
+       x1="23.928667"
+       y1="30.773148"
+       x2="23.928667"
+       y2="45.530704"
+       id="linearGradient3414"
+       xlink:href="#linearGradient3495-841-851-719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4657385,0,0,0.4850945,0.8223378,-4.102232)" />
+    <linearGradient
+       x1="25.57654"
+       y1="15.000002"
+       x2="25.57654"
+       y2="44.00053"
+       id="linearGradient3417"
+       xlink:href="#linearGradient3333-314-917-262"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4418603,0,0,0.4642857,1.3953491,-3.696433)" />
+    <linearGradient
+       x1="19.875452"
+       y1="10.389797"
+       x2="19.875452"
+       y2="45.60001"
+       id="linearGradient3420"
+       xlink:href="#linearGradient3242-967-12-570-862-307"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4666666,0,0,0.4545454,0.7999999,-2.7272752)" />
+    <linearGradient
+       x1="28.103424"
+       y1="45.000065"
+       x2="28.103424"
+       y2="14.038458"
+       id="linearGradient3422"
+       xlink:href="#linearGradient2490-495-150-777"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4666666,0,0,0.5006418,0.7999998,-4.7785529)" />
+    <linearGradient
+       x1="23.903786"
+       y1="35.75"
+       x2="23.903786"
+       y2="16.00676"
+       id="linearGradient2440"
+       xlink:href="#linearGradient3495-841-851-719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4657385,0,0,0.4850945,-0.1776621,-4.5686279)" />
+    <linearGradient
+       x1="23.928667"
+       y1="30.773148"
+       x2="23.928667"
+       y2="45.530704"
+       id="linearGradient2443"
+       xlink:href="#linearGradient3495-841-851-719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4657385,0,0,0.4850945,-0.1776622,-5.102232)" />
+    <linearGradient
+       x1="25.57654"
+       y1="15.000002"
+       x2="25.57654"
+       y2="44.00053"
+       id="linearGradient2446"
+       xlink:href="#linearGradient3333-314-917-262"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4418603,0,0,0.4642857,0.3953491,-4.696433)" />
+    <linearGradient
+       x1="19.875452"
+       y1="10.389797"
+       x2="19.875452"
+       y2="45.60001"
+       id="linearGradient2449"
+       xlink:href="#linearGradient3242-967-12-570-862-307"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4666666,0,0,0.4545454,-0.10677976,-1.5832074)" />
+    <linearGradient
+       x1="28.103424"
+       y1="45.000065"
+       x2="28.103424"
+       y2="14.038458"
+       id="linearGradient2451"
+       xlink:href="#linearGradient2490-495-150-777"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4666666,0,0,0.5006418,-0.10677986,-3.6344851)" />
+    <linearGradient
+       x1="24.103895"
+       y1="15.168831"
+       x2="24.103895"
+       y2="32.485161"
+       id="linearGradient2457"
+       xlink:href="#linearGradient2264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4691323,0,0,0.4663025,-20.554789,9.7686284)" />
+    <linearGradient
+       x1="24.138529"
+       y1="7.0478544"
+       x2="24.138529"
+       y2="47.272728"
+       id="linearGradient2459"
+       xlink:href="#linearGradient3943"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2817955,0,0,0.2800956,-16.058706,13.975052)" />
+  </defs>
+  <rect
+     width="21"
+     height="15"
+     rx="0.46666664"
+     ry="0.45454553"
+     x="0.59322035"
+     y="3.6440678"
+     id="rect2396"
+     style="fill:url(#linearGradient2449);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2451);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="19"
+     height="13"
+     rx="0.036476243"
+     ry="0.035004593"
+     x="1.5"
+     y="2.5"
+     id="rect3331"
+     style="opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2446);stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 8.2139564,10.336975 L 1.1222032,16.468629 M 13.709509,10.325653 L 20.811476,16.468629"
+     id="path3341"
+     style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2443);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 0.8491563,3.0457658 L 11.000062,12.181817 L 20.937208,3.0457658"
+     id="path3493"
+     style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:url(#linearGradient2440);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
-- 
GitLab


From 1e4444f25bf6afff103ee9ff7b1df6b147861d94 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 6 Feb 2012 08:04:06 +0100
Subject: [PATCH 416/546] Updated copyrights. Element menu didn't update.

---
 apps/contacts/ajax/saveproperty.php      |  4 ++--
 apps/contacts/dynphoto.php               |  2 +-
 apps/contacts/js/contacts.js             |  2 ++
 apps/contacts/templates/part.contact.php | 16 ++++------------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index fd1aa9e35f9..8f575c6b81e 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -2,8 +2,8 @@
 /**
  * ownCloud - Addressbook
  *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/apps/contacts/dynphoto.php b/apps/contacts/dynphoto.php
index 8025f559c37..2beac15e143 100644
--- a/apps/contacts/dynphoto.php
+++ b/apps/contacts/dynphoto.php
@@ -3,7 +3,7 @@
  * ownCloud - Image generator for contacts.
  *
  * @author Thomas Tanghus
- * @copyright 2011 Thomas Tanghus <thomas@tanghus.net>
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index c2130e08b5b..45130dd048f 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -310,6 +310,8 @@ Contacts={
 								$('#contact_identity').find('#org_value').show();
 								break;
 						}
+					} else {
+						$('#contacts_propertymenu a[data-type="'+props[prop]+'"]').parent().show();
 					}
 				}
 			},
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 0e3611b2e4c..1c7b7b9067a 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -21,18 +21,10 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 	<div id="actionbar">
 	<a id="contacts_propertymenu_button"></a>
 	<ul id="contacts_propertymenu">
-		<li <?php echo (!is_null($card['PHOTO'])?'style="display:none;"':''); ?>>
-			<a data-type="PHOTO"><?php echo $l->t('Profile picture'); ?></a>
-		</li>
-		<li <?php echo (!is_null($card['ORG'])?'style="display:none;"':''); ?>>
-			<a data-type="ORG"><?php echo $l->t('Organization'); ?></a>
-		</li>
-		<li <?php echo (!is_null($card['NICKNAME'])?'style="display:none;"':''); ?>>
-			<a data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a>
-		</li>
-		<li <?php echo (!is_null($card['BDAY'])?'style="display:none;"':''); ?>>
-			<a data-type="BDAY"><?php echo $l->t('Birthday'); ?></a>
-		</li>
+		<li><a data-type="PHOTO"><?php echo $l->t('Profile picture'); ?></a></li>
+		<li><a data-type="ORG"><?php echo $l->t('Organization'); ?></a></li>
+		<li><a data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a></li>
+		<li><a data-type="BDAY"><?php echo $l->t('Birthday'); ?></a></li>
 		<li><a data-type="TEL"><?php echo $l->t('Phone'); ?></a></li>
 		<li><a data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
 		<li><a data-type="ADR"><?php echo $l->t('Address'); ?></a></li>
-- 
GitLab


From 23396721e4925e45f3a928120e8ef6bf2e1037d1 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 6 Feb 2012 08:15:23 +0100
Subject: [PATCH 417/546] Hide container for emails/phones/adresses if there
 are none.

---
 apps/contacts/js/contacts.js             | 4 ++++
 apps/contacts/templates/part.contact.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 45130dd048f..b66dd6949d5 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -253,6 +253,7 @@ Contacts={
 				return false;
 			},
 			loadContact:function(jsondata){
+				$('#contact_communication').hide();
 				this.data = jsondata;
 				this.id = this.data.id;
 				console.log('loaded: ' + this.data.FN[0]['value']);
@@ -660,6 +661,7 @@ Contacts={
 				}
 				if($('#addressdisplay dl').length > 1) {
 					$('#addresses').show();
+					$('#contact_communication').show();
 				}
 				Contacts.UI.loadListHandlers();
 				return false;
@@ -858,6 +860,7 @@ Contacts={
 				}
 				if($('#emaillist li').length > 1) {
 					$('#emails').show();
+					$('#contact_communication').show();
 				}
 
 				$('#emaillist li:last-child').find('input[type="text"]').focus();
@@ -919,6 +922,7 @@ Contacts={
 				}
 				if($('#phonelist li').length > 1) {
 					$('#phones').show();
+					$('#contact_communication').show();
 				}
 				return false;
 			},
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 1c7b7b9067a..8a4faf720de 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -77,7 +77,7 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 	</div>
 
 	<!-- div class="delimiter"></div -->
-	<form id="contact_communication" method="post">
+	<form id="contact_communication" method="post" style="display: none;">
 	<div class="contactsection">
 		<!-- email addresses -->
 		<div id="emails" <?php echo (count($card['EMAIL'])>0?'':'style="display:none;"'); ?>>
-- 
GitLab


From 4db661ba9d2a7ea7a0a3357520c5aa5cee82d488 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 6 Feb 2012 14:18:40 +0100
Subject: [PATCH 418/546] Fixed broken "Add new" contact. Possible fix for
 cards with missing 'FN' property added through DAV. Misc. UI cleanups.

---
 apps/contacts/ajax/addcontact.php        |  8 ++-
 apps/contacts/ajax/editname.php          | 13 ++++-
 apps/contacts/ajax/newcontact.php        |  8 ++-
 apps/contacts/css/contacts.css           |  2 +-
 apps/contacts/js/contacts.js             | 70 +++++++++++++++++++-----
 apps/contacts/lib/vcard.php              |  2 +-
 apps/contacts/templates/part.contact.php | 28 ++--------
 7 files changed, 85 insertions(+), 46 deletions(-)

diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php
index 4bd3df54e39..c39d75eff88 100644
--- a/apps/contacts/ajax/addcontact.php
+++ b/apps/contacts/ajax/addcontact.php
@@ -24,11 +24,11 @@
 require_once('../../../lib/base.php');
 function bailOut($msg) {
 	OC_JSON::error(array('data' => array('message' => $msg)));
-	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('contacts','ajax/addcontact.php: '.$msg, OC_Log::DEBUG);
 	exit();
 }
 function debug($msg) {
-	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('contacts','ajax/addcontact.php: '.$msg, OC_Log::DEBUG);
 }
 foreach ($_POST as $key=>$element) {
 	debug('_POST: '.$key.'=>'.$element);
@@ -44,11 +44,13 @@ $addressbook = OC_Contacts_App::getAddressbook( $aid );
 
 $fn = trim($_POST['fn']);
 $n = trim($_POST['n']);
+debug('N: '.$n);
+debug('FN: '.$fn);
 
 $vcard = new OC_VObject('VCARD');
 $vcard->setUID();
-$vcard->setString('N',$n);
 $vcard->setString('FN',$fn);
+$vcard->setString('N',$n);
 
 $id = OC_Contacts_VCard::add($aid,$vcard->serialize());
 if(!$id) {
diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php
index 6205cc74b0a..c7a7bcdeaf8 100644
--- a/apps/contacts/ajax/editname.php
+++ b/apps/contacts/ajax/editname.php
@@ -9,14 +9,23 @@
 require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/editname.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/editname.php: '.$msg, OC_Log::DEBUG);
+}
+foreach ($_GET as $key=>$element) {
+	debug('_GET: '.$key.'=>'.$element);
+}
 
 $tmpl = new OC_TEMPLATE("contacts", "part.edit_name_dialog");
 
 $id = $_GET['id'];
 if($id) {
 	$vcard = OC_Contacts_App::getContactVCard($id);
-
-
 	$name = array('', '', '', '', '');
 	if($vcard->__isset('N')) {
 		$property = $vcard->__get('N');
diff --git a/apps/contacts/ajax/newcontact.php b/apps/contacts/ajax/newcontact.php
index 3d1a8e74535..fcfd12ca80d 100644
--- a/apps/contacts/ajax/newcontact.php
+++ b/apps/contacts/ajax/newcontact.php
@@ -24,11 +24,11 @@
 require_once('../../../lib/base.php');
 function bailOut($msg) {
 	OC_JSON::error(array('data' => array('message' => $msg)));
-	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('contacts','ajax/newcontact.php: '.$msg, OC_Log::DEBUG);
 	exit();
 }
 function debug($msg) {
-	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('contacts','ajax/newcontact.php: '.$msg, OC_Log::DEBUG);
 }
 foreach ($_POST as $key=>$element) {
 	debug('_POST: '.$key.'=>'.$element);
@@ -47,10 +47,14 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 $freeSpace=OC_Filesystem::free_space('/');
 $freeSpace=max($freeSpace,0);
 $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
+$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
+$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
 
 $tmpl = new OC_Template('contacts','part.contact');
 $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign('uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
+$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
 $tmpl->assign('addressbooks',$addressbooks);
 $tmpl->assign('id','');
 $page = $tmpl->fetchPage();
diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index a48533f85a0..d90e93f64e9 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -16,7 +16,7 @@
 #contacts_propertymenu li:hover { background-color: #1d2d44; }
 #contacts_propertymenu li a:hover { color: #fff }
 #actionbar { height: 30px; width: 200px; position: fixed; right: 0px; top: 75px; margin: 0 0 0 0; padding: 0 0 0 0;}
-#card { /*max-width: 70em;*/ border: thin solid lightgray; display: block; }
+#card { /*max-width: 70em; border: thin solid lightgray; display: block;*/ }
 #firstrun { /*border: thin solid lightgray;*/ width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777;}
 #firstrun #selections { /*border: thin solid lightgray;*/ font-size:0.8em;  width: 100%; margin: 2em auto auto auto; clear: both; }
 
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index b66dd6949d5..40f049de3b5 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -67,25 +67,34 @@ Contacts={
 		propertyTypeFor:function(obj) {
 			return $(obj).parents('.propertycontainer').first().data('element');
 		},
+		showHideContactInfo:function() {
+			var show = ($('#emaillist li[class*="propertycontainer"]').length > 0 || $('#phonelist li[class*="propertycontainer"]').length > 0 || $('#addressdisplay dl[class*="propertycontainer"]').length > 0);
+			console.log('showHideContactInfo: ' + show);
+			if(show) {
+				$('#contact_communication').show();
+			} else {
+				$('#contact_communication').hide();
+			}
+		},
 		checkListFor:function(obj) {
 			var type = $(obj).parents('.propertycontainer').first().data('element');
 			console.log('checkListFor: ' + type);
 			switch (type) {
 				case 'EMAIL':
 					console.log('emails: '+$('#emaillist>li').length);
-					if($('#emaillist>li').length == 1) {
+					if($('#emaillist li[class*="propertycontainer"]').length == 0) {
 						$('#emails').hide();
 					}
 					break;
 				case 'TEL':
 					console.log('phones: '+$('#phonelist>li').length);
-					if($('#phonelist>li').length == 1) {
+					if($('#phonelist li[class*="propertycontainer"]').length == 0) {
 						$('#phones').hide();
 					}
 					break;
 				case 'ADR':
 					console.log('addresses: '+$('#addressdisplay>dl').length);
-					if($('#addressdisplay>dl').length == 1) {
+					if($('#addressdisplay dl[class*="propertycontainer"]').length == 0) {
 						$('#addresses').hide();
 					}
 					break;
@@ -317,7 +326,7 @@ Contacts={
 				}
 			},
 			populateNameFields:function() {
-				this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = ''
+				this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
 				var full = '';
 				var narray = undefined;
 				//console.log('splitting: ' + this.data.N[0]['value']);
@@ -366,6 +375,8 @@ Contacts={
 			editNew:function(){ // add a new contact
 				//Contacts.UI.notImplemented();
 				//return false;
+				this.id = ''; this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
+
 				
 				$.getJSON('ajax/newcontact.php',{},function(jsondata){
 					if(jsondata.status == 'success'){
@@ -394,7 +405,31 @@ Contacts={
 					 */
 					if (jsondata.status == 'success'){
 						$('#rightcontent').data('id',jsondata.data.id);
-						id = jsondata.data.id;
+						var id = jsondata.data.id;
+						$.getJSON('ajax/contactdetails.php',{'id':id},function(jsondata){
+							if(jsondata.status == 'success'){
+								Contacts.UI.loadHandlers();
+								Contacts.UI.Card.loadContact(jsondata.data);
+								$('#leftcontent .active').removeClass('active');
+								var item = '<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'"  style="background: url(thumbnail.php?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+Contacts.UI.Card.fn+'</a></li>';
+								var added = false;
+								$('#leftcontent ul li').each(function(){
+									if ($(this).text().toLowerCase() > Contacts.UI.Card.fn.toLowerCase()) {
+										$(this).before(item).fadeIn('fast');
+										added = true;
+										return false;
+									}
+								});
+								if(!added) {
+									$('#leftcontent ul').append(item);
+								}
+								
+							}
+							else{
+								Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+								//alert(jsondata.data.message);
+							}
+						});
 						$('#contact_identity').show();
 						$('#actionbar').show();
 						// TODO: Add to contacts list.
@@ -466,7 +501,8 @@ Contacts={
 				console.log('addProperty:' + type);
 				switch (type) {
 					case 'PHOTO':
-						$('#contacts_propertymenu a[data-type="PHOTO"]').parent().hide();
+						$('#contacts_propertymenu a[data-type="'+type+'"]').parent().hide();
+						this.loadPhoto();
 						$('#file_upload_form').show();
 						break;
 					case 'EMAIL':
@@ -475,6 +511,7 @@ Contacts={
 							$('#emails').show();
 						}
 						Contacts.UI.Card.addMail();
+						Contacts.UI.showHideContactInfo();
 						break;
 					case 'TEL':
 						//console.log('phones: '+$('#phonelist>li').length);
@@ -482,6 +519,7 @@ Contacts={
 							$('#phones').show();
 						}
 						Contacts.UI.Card.addPhone();
+						Contacts.UI.showHideContactInfo();
 						break;
 					case 'ADR':
 						//console.log('addresses: '+$('#addressdisplay>dl').length);
@@ -489,6 +527,7 @@ Contacts={
 							$('#addresses').show();
 						}
 						Contacts.UI.Card.editAddress('new', true);
+						Contacts.UI.showHideContactInfo();
 						break;
 					case 'NICKNAME':
 					case 'ORG':
@@ -509,6 +548,7 @@ Contacts={
 						if(jsondata.status == 'success'){
 							if(type == 'list') {
 								Contacts.UI.propertyContainerFor(obj).remove();
+								Contacts.UI.showHideContactInfo();
 								Contacts.UI.checkListFor(obj);
 							} else if(type == 'single') {
 								var proptype = Contacts.UI.propertyTypeFor(obj);
@@ -529,6 +569,7 @@ Contacts={
 				} else { // Property hasn't been saved so there's nothing to delete.
 					if(type == 'list') {
 						Contacts.UI.propertyContainerFor(obj).remove();
+						Contacts.UI.showHideContactInfo();
 						Contacts.UI.checkListFor(obj);
 					} else if(type == 'single') {
 						var proptype = Contacts.UI.propertyTypeFor(obj);
@@ -542,7 +583,8 @@ Contacts={
 				}
 			},
 			editName:function(){
-				console.log('editName, id: ' + this.id);
+				console.log('editName, id: ' + (this.id == ''));
+				var isnew = (this.id == '');
 				//console.log('editName');
 				/* Initialize the name edit dialog */
 				if($('#edit_name_dialog').dialog('isOpen') == true){
@@ -550,9 +592,9 @@ Contacts={
 				}else{ // TODO: If id=='' call addcontact.php (or whatever name) instead and reload view with id.
 					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'editname.php')+'?id='+this.id, function(){
 						$('#edit_name_dialog' ).dialog({
-								modal: (this.id == '' && true || false),
-								closeOnEscape: (this.id == '' && false || true),
-								title:  (this.id == '' && t('contacts', 'Add contact') || t('contacts', 'Edit name')),
+								modal: (isnew && true || false),
+								closeOnEscape: (isnew == '' && false || true),
+								title:  (isnew && t('contacts', 'Add contact') || t('contacts', 'Edit name')),
 								height: 'auto', width: 'auto',
 								buttons: {
 									'Ok':function() { 
@@ -576,7 +618,7 @@ Contacts={
 			saveName:function(dlg){
 				console.log('saveName, id: ' + this.id);
 				// TODO: Check if new, get address book id and call Contacts.UI.Card.add()
-				var n = new Array($(dlg).find('#fam').val(),$(dlg).find('#giv').val(),$(dlg).find('#add').val(),$(dlg).find('#pre').val(),$(dlg).find('#suf').val());
+				var n = new Array($(dlg).find('#fam').val().strip_tags(),$(dlg).find('#giv').val().strip_tags(),$(dlg).find('#add').val().strip_tags(),$(dlg).find('#pre').val().strip_tags(),$(dlg).find('#suf').val().strip_tags());
 				this.famname = n[0];
 				this.givname = n[1];
 				this.addname = n[2];
@@ -602,7 +644,7 @@ Contacts={
 				$('#fn').val(0);
 				if(this.id == '') {
 					var aid = $(dlg).find('#aid').val();
-					Contacts.UI.Card.add(n, $('#short').text(), aid);
+					Contacts.UI.Card.add(n.join(';'), $('#short').text(), aid);
 				} else {
 					Contacts.UI.Card.saveProperty($('#n'));
 				}
@@ -704,6 +746,7 @@ Contacts={
 										if(isnew) {
 											container.remove();
 										}
+										Contacts.UI.showHideContactInfo();
 									}
 								},
 								close : function(event, ui) {
@@ -712,6 +755,7 @@ Contacts={
 									if(isnew) {
 										container.remove();
 									}
+									Contacts.UI.showHideContactInfo();
 								}/*,
 								open : function(event, ui) {
 									// load 'ADR' property - maybe :-P
@@ -1119,7 +1163,7 @@ $(document).ready(function(){
 	});
 
 	/**
-	 * Add and insert a new contact into the list.
+	 * Add and insert a new contact into the list. NOTE: Deprecated
 	 */
 	$('#contacts_addcardform input[type="submit"]').live('click',function(){
 		$.post('ajax/addcontact.php',$('#contact_identity').serialize(),function(jsondata){
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index aefa2c74114..eee57ec4a12 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -177,7 +177,7 @@ class OC_Contacts_VCard{
 			} else {
 				$fn = 'Unknown';
 			}
-			$card->addProperty('EMAIL', $email);
+			$card->addProperty('FN', $fn);
 			$data = $card->serialize();
 		}
 
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 8a4faf720de..446a9b88ede 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -1,21 +1,6 @@
 <?php
 $l=new OC_L10N('contacts');
 $id = isset($_['id']) ? $_['id'] : '';
-$card = array();
-$card['id'] = $id;
-$card['FN'] = (array_key_exists('FN',$_['details'])) ? $_['details']['FN'][0] : null;
-$card['N'] = (array_key_exists('N',$_['details'])) ? $_['details']['N'][0] : array('', '', '', '', '');
-$card['ORG'] = (array_key_exists('ORG',$_['details'])) ? $_['details']['ORG'][0] : null;
-$card['PHOTO'] = (array_key_exists('PHOTO',$_['details'])) ? $_['details']['PHOTO'][0] : null;
-$card['BDAY'] = (array_key_exists('BDAY',$_['details'])) ? $_['details']['BDAY'][0] : null;
-if($card['BDAY']) {
-	$bday = new DateTime($card['BDAY']['value']);
-	$card['BDAY']['value'] = $bday->format('d-m-Y');
-}
-$card['NICKNAME'] = (array_key_exists('NICKNAME',$_['details'])) ? $_['details']['NICKNAME'][0] : null;
-$card['EMAIL'] = (array_key_exists('EMAIL',$_['details'])) ? $_['details']['EMAIL'] : array();
-$card['TEL'] = (array_key_exists('TEL',$_['details'])) ? $_['details']['TEL'] : array();
-$card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] : array();
 ?>
 <div id="card">
 	<div id="actionbar">
@@ -35,7 +20,7 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 
 	<div class="contactsection">
 
-	<form <?php echo (is_null($card['PHOTO'])?'style="display:none;"':''); ?> id="file_upload_form" action="ajax/uploadphoto.php" method="post" enctype="multipart/form-data" target="file_upload_target">
+	<form style="display:none;" id="file_upload_form" action="ajax/uploadphoto.php" method="post" enctype="multipart/form-data" target="file_upload_target">
 	<fieldset id="photo" class="formfloat">
 		<div id="contacts_details_photo_wrapper" title="<?php echo $l->t('Click or drop to upload picture'); ?> (max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
 		<!-- img style="padding: 1em;" id="contacts_details_photo" alt="Profile picture"  src="photo.php?id=<?php echo $_['id']; ?>" / -->
@@ -80,7 +65,7 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 	<form id="contact_communication" method="post" style="display: none;">
 	<div class="contactsection">
 		<!-- email addresses -->
-		<div id="emails" <?php echo (count($card['EMAIL'])>0?'':'style="display:none;"'); ?>>
+		<div id="emails" style="display:none;">
 		<fieldset class="contactpart">
 		<legend><?php echo $l->t('Email'); ?></legend>
 			<ul id="emaillist" class="propertylist">
@@ -100,7 +85,7 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 		</div> <!-- email addresses-->
 
 		<!-- Phone numbers -->
-		<div id="phones" <?php echo (count($card['TEL'])>0?'':'style="display:none;"'); ?>>
+		<div id="phones" style="display:none;">
 		<fieldset class="contactpart">
 		<legend><?php echo $l->t('Phone'); ?></legend>
 			<ul id="phonelist" class="propertylist">
@@ -126,7 +111,7 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 		</div> <!-- Phone numbers -->
 
 		<!-- Addresses -->
-		<div id="addresses" <?php echo (count($card['ADR'])>0?'':'style="display:none;"'); ?>>
+		<div id="addresses" style="display:none;">
 		<fieldset class="contactpart">
 		<legend><?php echo $l->t('Address'); ?></legend>
 		<div id="addressdisplay">
@@ -178,11 +163,6 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 	</div> 
 	</form>
 </div>
-<div class="delimiter"></div>
-<pre>
-<?php /*print_r($card);*/ ?>
-</pre>
-	<!-- div class="updatebar"><input type="button" value="Update" /></div -->
 <div id="edit_photo_dialog" title="Edit photo">
 		<div id="edit_photo_dialog_img"></div>
 </div>
-- 
GitLab


From 249e46c5b7ff0d5c860238950ec5bdb1e7551ce7 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 7 Feb 2012 03:17:28 +0100
Subject: [PATCH 419/546] Some fixes for malformed VCards.

---
 apps/contacts/ajax/contactdetails.php | 19 +++++++
 apps/contacts/js/contacts.js          | 77 ++-------------------------
 apps/contacts/lib/vcard.php           |  2 +-
 3 files changed, 23 insertions(+), 75 deletions(-)

diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contactdetails.php
index f8f78ad3e80..6ba2c7384d0 100644
--- a/apps/contacts/ajax/contactdetails.php
+++ b/apps/contacts/ajax/contactdetails.php
@@ -42,6 +42,25 @@ if(is_null($vcard)) {
 	bailOut($l->t('Error parsing VCard for ID: "'.$id.'"'));
 }
 $details = OC_Contacts_VCard::structureContact($vcard);
+
+// Some Google exported files have no FN field.
+if(!isset($details['FN'])) {
+	$fn = '';
+	if(isset($details['N'])) {
+		$details['FN'] = array(implode(' ', $details['N'][0]['value']));
+	} elseif(isset($details['EMAIL'])) {
+		$details['FN'] = array('value' => $details['EMAIL'][0]['value']);
+	} else {
+		$details['FN'] = array('value' => $l->t('Unknown'));
+	}
+}
+
+// Make up for not supporting the 'N' field in earlier version.
+if(!isset($details['N'])) {
+	$details['N'] = array(array($details['FN'][0]['value'],'','','',''));
+}
+
+// Don't wanna transfer the photo in a json string.
 if(isset($details['PHOTO'])) {
 	$details['PHOTO'] = true;
 	//unset($details['PHOTO']);
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 40f049de3b5..9b1f21feab2 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -278,8 +278,6 @@ Contacts={
 				// Clear all elements
 				$('#ident .propertycontainer[class*="propertycontainer"]').each(function(){
 					if(props.indexOf($(this).data('element')) > -1) {
-// 						$('#contacts_propertymenu a[data-type="'+$(this).data('element')+'"]').parent().show();
-						//console.log($(this).html());
 						$(this).data('checksum', '');
 						$(this).find('input').val('');
 						$(this).hide();
@@ -287,33 +285,26 @@ Contacts={
 					}
 				});
 				for(var prop in props) {
-					//console.log('loadSingleProperties: ' + props[prop] + ': ' + this.data[props[prop]]);
 					if(this.data[props[prop]] != undefined) {
 						$('#contacts_propertymenu a[data-type="'+props[prop]+'"]').parent().hide();
 						var property = this.data[props[prop]][0];
 						var value = property['value'], checksum = property['checksum'];
-						//console.log('value: ' + property['value']);
-						//console.log('checksum: ' + property['checksum']);
 						switch(props[prop]) {
 							case 'BDAY':
 								var val = $.datepicker.parseDate('yy-mm-dd', value.substring(0, 10));
-								//console.log('Date: ' + val);
 								value = $.datepicker.formatDate('dd-mm-yy', val);
-								//console.log('Date: ' + value);
 								$('#contact_identity').find('#bday').val(value);
 								$('#contact_identity').find('#bday_value').data('checksum', checksum);
 								$('#contact_identity').find('#bday_label').show();
 								$('#contact_identity').find('#bday_value').show();
 								break;
 							case 'NICKNAME':
-								//console.log('NICKNAME: ' + value);
 								$('#contact_identity').find('#nickname').val(value);
 								$('#contact_identity').find('#nickname_value').data('checksum', checksum);
 								$('#contact_identity').find('#nickname_label').show();
 								$('#contact_identity').find('#nickname_value').show();
 								break;
 							case 'ORG':
-								//console.log('ORG: ' + value);
 								$('#contact_identity').find('#org').val(value);
 								$('#contact_identity').find('#org_value').data('checksum', checksum);
 								$('#contact_identity').find('#org_label').show();
@@ -329,9 +320,7 @@ Contacts={
 				this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
 				var full = '';
 				var narray = undefined;
-				//console.log('splitting: ' + this.data.N[0]['value']);
 				this.fn = this.data.FN[0]['value'];
-				//console.log('FN: ' + this.fn)
 				if(this.data.N == undefined) {
 					narray = [this.fn,'','','','']; // Checking for non-existing 'N' property :-P
 					full = this.fn;
@@ -339,7 +328,6 @@ Contacts={
 					narray = this.data.N[0]['value'];
 				}
 				this.famname = narray[0];
-				//console.log('famname: ' + this.famname)
 				this.givname = narray[1];
 				this.addname = narray[2];
 				this.honpre = narray[3];
@@ -359,7 +347,6 @@ Contacts={
 				if(this.honsuf.length > 0) {
 					this.fullname += ', ' + this.honsuf;
 				}
-				//console.log('fullname: ' + this.fullname)
 				$('#n').html(this.fullname);
 				$('.jecEditableOption').attr('title', 'Custom');
 				$('.jecEditableOption').text(this.fn);
@@ -383,7 +370,6 @@ Contacts={
 						id = '';
 						$('#rightcontent').data('id','');
 						$('#rightcontent').html(jsondata.data.page);
-						console.log('Trying to open name edit dialog');
 						Contacts.UI.Card.editName();
 					}
 					else{
@@ -393,16 +379,9 @@ Contacts={
 				});
 			},
 			add:function(n, fn, aid){ // add a new contact
-				//Contacts.UI.notImplemented();
-				//return false;
-				console.log('Add contact: ' + n + ', ' + fn + ' ' + aid);
+				//console.log('Add contact: ' + n + ', ' + fn + ' ' + aid);
 				$.post(OC.filePath('contacts', 'ajax', 'addcontact.php'), { n: n, fn: fn, aid: aid },
 				  function(jsondata) {
-					/*
-					 * Arguments:
-					 * jsondata.status
-					 * jsondata.data.id
-					 */
 					if (jsondata.status == 'success'){
 						$('#rightcontent').data('id',jsondata.data.id);
 						var id = jsondata.data.id;
@@ -451,11 +430,8 @@ Contacts={
 					Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', 'This property has to be non-empty.'));
 					return false;
 				}
-				//Contacts.UI.loading(obj, false);
-				//return false;
 				container = $(obj).parents('.propertycontainer').first(); // get the parent holding the metadata.
 				Contacts.UI.loading(container, true);
-				//console.log('saveProperty. Container: ' + container.data('checksum'));
 				var checksum = container.data('checksum');
 				var name = container.data('element');
 				var q = container.find('input,select').serialize();
@@ -501,12 +477,11 @@ Contacts={
 				console.log('addProperty:' + type);
 				switch (type) {
 					case 'PHOTO':
-						$('#contacts_propertymenu a[data-type="'+type+'"]').parent().hide();
 						this.loadPhoto();
 						$('#file_upload_form').show();
+						$('#contacts_propertymenu a[data-type="'+type+'"]').parent().hide();
 						break;
 					case 'EMAIL':
-						//console.log('emails: '+$('#emaillist>li').length);
 						if($('#emaillist>li').length == 1) {
 							$('#emails').show();
 						}
@@ -514,7 +489,6 @@ Contacts={
 						Contacts.UI.showHideContactInfo();
 						break;
 					case 'TEL':
-						//console.log('phones: '+$('#phonelist>li').length);
 						if($('#phonelist>li').length == 1) {
 							$('#phones').show();
 						}
@@ -522,7 +496,6 @@ Contacts={
 						Contacts.UI.showHideContactInfo();
 						break;
 					case 'ADR':
-						//console.log('addresses: '+$('#addressdisplay>dl').length);
 						if($('#addressdisplay>dl').length == 1) {
 							$('#addresses').show();
 						}
@@ -541,9 +514,7 @@ Contacts={
 				//console.log('deleteProperty, id: ' + this.id);
 				Contacts.UI.loading(obj, true);
 				var checksum = Contacts.UI.checksumFor(obj);
-				//var checksum = $(obj).parent().data('checksum');
 				if(checksum != undefined) {
-					//alert('deleteProperty: ' + $(obj).val() + ' ' + checksum);
 					$.getJSON('ajax/deleteproperty.php',{'id': this.id, 'checksum': checksum },function(jsondata){
 						if(jsondata.status == 'success'){
 							if(type == 'list') {
@@ -583,10 +554,7 @@ Contacts={
 				}
 			},
 			editName:function(){
-				console.log('editName, id: ' + (this.id == ''));
 				var isnew = (this.id == '');
-				//console.log('editName');
-				/* Initialize the name edit dialog */
 				if($('#edit_name_dialog').dialog('isOpen') == true){
 					$('#edit_name_dialog').dialog('moveToTop');
 				}else{ // TODO: If id=='' call addcontact.php (or whatever name) instead and reload view with id.
@@ -604,7 +572,6 @@ Contacts={
 									'Cancel':function() { $(this).dialog('destroy').remove(); }
 								},
 								close : function(event, ui) {
-									//alert('close');
 									$(this).dialog('destroy').remove();
 									//return event;
 								}/*,
@@ -617,18 +584,13 @@ Contacts={
 			},
 			saveName:function(dlg){
 				console.log('saveName, id: ' + this.id);
-				// TODO: Check if new, get address book id and call Contacts.UI.Card.add()
 				var n = new Array($(dlg).find('#fam').val().strip_tags(),$(dlg).find('#giv').val().strip_tags(),$(dlg).find('#add').val().strip_tags(),$(dlg).find('#pre').val().strip_tags(),$(dlg).find('#suf').val().strip_tags());
 				this.famname = n[0];
 				this.givname = n[1];
 				this.addname = n[2];
 				this.honpre = n[3];
 				this.honsuf = n[4];
-				//alert('saveName: ' + n);
 				$('#n').val(n.join(';'));
-				/*$('#card > input').each(function(){
-						alert($(this).attr('id') + ' ' + $(this).val());
-				});*/
 				if(n[3].length > 0) {
 					this.fullname = n[3] + ' ';
 				}
@@ -677,25 +639,14 @@ Contacts={
 						adrtxt = adrtxt + '<li>' + adrarray[6].strip_tags() + '</li>';
 					}
 					$('#addressdisplay dl').last().find('.addresslist').html(adrtxt);
-					//console.log('ADR: ' + adr);
-					console.log('checksum: ' + this.data.ADR[adr]['checksum']);
-					//console.log('type: ' + jQuery.type(this.data.ADR[adr]['value']));
 					var types = new Array();
 					var ttypes = new Array();
 					for(var param in this.data.ADR[adr]['parameters']) {
-						//console.log('param: ' + param + ': ' + this.data.ADR[adr]['parameters'][param]);
 						if(param.toUpperCase() == 'TYPE') {
-							//console.log('param type: ' + jQuery.type(this.data.ADR[adr]['parameters'][param]));
 							types.push(t('contacts', ucwords(this.data.ADR[adr]['parameters'][param].toLowerCase())));
 							ttypes.push(this.data.ADR[adr]['parameters'][param]);
-							//for(ptype in this.data.ADR[adr]['parameters'][param]) {
-							//	var pt = this.data.ADR[adr]['parameters'][param][ptype];
-							//	// TODO: Create an array with types, translate, ucwords and join.
-							//}
 						}
 					}
-					//console.log('# types: ' + types.length);
-					//console.log('Types:' + types.join('/'));
 					$('#addressdisplay dl').last().find('.adr_type_label').text(types.join('/'));
 					$('#addressdisplay dl').last().find('.adr_type').val(ttypes.join(','));
 					$('#addressdisplay dl').last().find('.adr').val(adrarray.join(';'));
@@ -721,7 +672,6 @@ Contacts={
 				} else {
 					q = q + '&checksum='+Contacts.UI.checksumFor(obj);
 				}
-				//console.log('editAddress: checksum ' + checksum);
 				/* Initialize the address edit dialog */
 				if($('#edit_address_dialog').dialog('isOpen') == true){
 					$('#edit_address_dialog').dialog('moveToTop');
@@ -732,8 +682,6 @@ Contacts={
 								height: 'auto', width: 'auto',
 								buttons: {
 									'Ok':function() {
-										console.log('OK:isnew ' + isnew);
-										console.log('OK:obj ' + obj);
 										if(isnew) {
 											Contacts.UI.Card.saveAddress(this, $('#addressdisplay dl:last-child').find('input').first(), isnew);
 										} else {
@@ -825,7 +773,7 @@ Contacts={
 				}
 			},
 			loadPhoto:function(){
-				console.log('loadPhoto: ' + this.data.PHOTO);
+				//console.log('loadPhoto: ' + this.data.PHOTO);
 				if(this.data.PHOTO) {
 					$('#file_upload_form').show();
 					$('#contacts_propertymenu a[data-type="PHOTO"]').parent().hide();
@@ -891,16 +839,11 @@ Contacts={
 					//$('#emaillist li:first-child').clone().appendTo($('#emaillist')).show();
 					$('#emaillist li:last-child').data('checksum', this.data.EMAIL[mail]['checksum'])
 					$('#emaillist li:last-child').find('input[type="email"]').val(this.data.EMAIL[mail]['value']);
-					//console.log('EMAIL: ' + mail);
-					//console.log('value: ' + this.data.EMAIL[mail]['value']);
-					//console.log('checksum: ' + this.data.EMAIL[mail]['checksum']);
 					for(var param in this.data.EMAIL[mail]['parameters']) {
-						//console.log('param: ' + param + ': ' + this.data.EMAIL[mail]['parameters'][param]);
 						if(param.toUpperCase() == 'PREF') {
 							$('#emaillist li:last-child').find('input[type="checkbox"]').attr('checked', 'checked')
 						}
 					}
-					//console.log('parameters: ' + jQuery.type(this.data.EMAIL[mail]['parameters']));
 				}
 				if($('#emaillist li').length > 1) {
 					$('#emails').show();
@@ -934,22 +877,15 @@ Contacts={
 					$('#phonelist li:last-child').find('select').multiselect('destroy');
 					$('#phonelist li:last-child').data('checksum', this.data.TEL[phone]['checksum'])
 					$('#phonelist li:last-child').find('input[type="text"]').val(this.data.TEL[phone]['value']);
-					//console.log('TEL: ' + phone);
-					//console.log('value: ' + this.data.TEL[phone]['value']);
-					//console.log('checksum: ' + this.data.TEL[phone]['checksum']);
 					for(var param in this.data.TEL[phone]['parameters']) {
-						//console.log('param: ' + param + ': ' + this.data.TEL[phone]['parameters'][param]);
 						if(param.toUpperCase() == 'PREF') {
 							$('#phonelist li:last-child').find('input[type="checkbox"]').attr('checked', 'checked');
 						}
 						else if(param.toUpperCase() == 'TYPE') {
-							//console.log('param type: ' + jQuery.type(this.data.TEL[phone]['parameters'][param]));
 							for(ptype in this.data.TEL[phone]['parameters'][param]) {
 								var pt = this.data.TEL[phone]['parameters'][param][ptype];
 								$('#phonelist li:last-child').find('select option').each(function(){
-									//console.log('Test: ' + $(this).val().toUpperCase() + '==' + pt);
 									if ($(this).val().toUpperCase() == pt) {
-										//console.log('Selected: ' + pt);
 										$(this).attr('selected', 'selected');
 									}
 								});
@@ -962,7 +898,6 @@ Contacts={
 														selectedList: 4,
 														classes: 'typelist'
 													});
-					//console.log('parameters: ' + jQuery.type(this.data.EMAIL[mail]['parameters']));
 				}
 				if($('#phonelist li').length > 1) {
 					$('#phones').show();
@@ -990,12 +925,6 @@ Contacts={
 			{
 				$.post(OC.filePath('contacts', 'ajax', 'activation.php'), { bookid: bookid, active: checkbox.checked?1:0 },
 				  function(data) {
-					/*
-					 * Arguments:
-					 * data.status
-					 * data.bookid
-					 * data.active
-					 */
 					if (data.status == 'success'){
 						checkbox.checked = data.active == 1;
 						Contacts.UI.Contacts.update();
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index eee57ec4a12..b2b29433975 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -119,7 +119,7 @@ class OC_Contacts_VCard{
 			$prodid = trim($card->getAsString('PRODID'));
 			if(!$prodid) {
 				$appinfo = $info=OC_App::getAppInfo('contacts');
-				$prodid = 'PRODID:-//ownCloud//NONSGML '.$appinfo['name'].' '.$appinfo['version'].'//EN';
+				$prodid = '//ownCloud//NONSGML '.$appinfo['name'].' '.$appinfo['version'].'//EN';
 				$card->setString('PRODID', $prodid);
 			}
 			// VCARD must have a version
-- 
GitLab


From 424c64c0eb3b7b9402029c0543c0844f89ff9833 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 8 Feb 2012 07:56:43 +0100
Subject: [PATCH 420/546] Don't import cards that can't be parsed by Sabre, but
 log it instead. Fix missing 'N' or 'FN' fields on import.

---
 apps/contacts/ajax/contactdetails.php |  5 ++-
 apps/contacts/js/contacts.js          | 54 ++++++++++++++-------------
 apps/contacts/lib/app.php             |  2 +-
 apps/contacts/lib/vcard.php           | 26 +++++++++++--
 4 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contactdetails.php
index 6ba2c7384d0..6a989c795e1 100644
--- a/apps/contacts/ajax/contactdetails.php
+++ b/apps/contacts/ajax/contactdetails.php
@@ -36,8 +36,11 @@ OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 $l=new OC_L10N('contacts');
 
-$id = $_GET['id'];
+$id = isset($_GET['id'])?$_GET['id']:null;
 $vcard = OC_Contacts_App::getContactVCard( $id );
+if(is_null($id)) {
+	bailOut($l->t('Missing ID'));
+}
 if(is_null($vcard)) {
 	bailOut($l->t('Error parsing VCard for ID: "'.$id.'"'));
 }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 9b1f21feab2..26206e97c06 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -236,6 +236,7 @@ Contacts={
 			delete:function() {
 				$('#contacts_deletecard').tipsy('hide');
 				$.getJSON('ajax/deletecard.php',{'id':this.id},function(jsondata){
+					console.log('Card.delete: ' + this.id);
 					if(jsondata.status == 'success'){
 						$('#leftcontent [data-id="'+jsondata.data.id+'"]').remove();
 						$('#rightcontent').data('id','');
@@ -1055,6 +1056,7 @@ $(document).ready(function(){
 	 */
 	$('#leftcontent li').live('click',function(){
 		var id = $(this).data('id');
+		console.log('Contact ' + id + ' clicked.');
 		var oldid = $('#rightcontent').data('id');
 		if(oldid != 0){
 			$('#leftcontent li[data-id="'+oldid+'"]').removeClass('active');
@@ -1094,32 +1096,32 @@ $(document).ready(function(){
 	/**
 	 * Add and insert a new contact into the list. NOTE: Deprecated
 	 */
-	$('#contacts_addcardform input[type="submit"]').live('click',function(){
-		$.post('ajax/addcontact.php',$('#contact_identity').serialize(),function(jsondata){
-			if(jsondata.status == 'success'){
-				$('#rightcontent').data('id',jsondata.data.id);
-				$('#rightcontent').html(jsondata.data.page);
-				$('#leftcontent .active').removeClass('active');
-				var item = '<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'"  style="background: url(thumbnail.php?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+jsondata.data.name+'</a></li>';
-				var added = false;
-				$('#leftcontent ul li').each(function(){
-					if ($(this).text().toLowerCase() > jsondata.data.name.toLowerCase()) {
-						$(this).before(item).fadeIn('fast');
-						added = true;
-						return false;
-					}
-				});
-				if(!added) {
-					$('#leftcontent ul').append(item);
-				}
-			}
-			else{
-				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
-				//alert(jsondata.data.message);
-			}
-		}, 'json');
-		return false;
-	});
+// 	$('#contacts_addcardform input[type="submit"]').live('click',function(){
+// 		$.post('ajax/addcontact.php',$('#contact_identity').serialize(),function(jsondata){
+// 			if(jsondata.status == 'success'){
+// 				$('#rightcontent').data('id',jsondata.data.id);
+// 				$('#rightcontent').html(jsondata.data.page);
+// 				$('#leftcontent .active').removeClass('active');
+// 				var item = '<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'"  style="background: url(thumbnail.php?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+jsondata.data.name+'</a></li>';
+// 				var added = false;
+// 				$('#leftcontent ul li').each(function(){
+// 					if ($(this).text().toLowerCase() > jsondata.data.name.toLowerCase()) {
+// 						$(this).before(item).fadeIn('fast');
+// 						added = true;
+// 						return false;
+// 					}
+// 				});
+// 				if(!added) {
+// 					$('#leftcontent ul').append(item);
+// 				}
+// 			}
+// 			else{
+// 				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+// 				//alert(jsondata.data.message);
+// 			}
+// 		}, 'json');
+// 		return false;
+// 	});
 	
 	$('#contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
 		if (isInView) { //NOTE: I've kept all conditions for future reference ;-)
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 580cc72d5eb..724d632ea5d 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -58,7 +58,7 @@ class OC_Contacts_App{
 	public static function getContactObject($id){
 		$card = OC_Contacts_VCard::find( $id );
 		if( $card === false ){
-			OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('Contact could not be found.'))));
+			OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('Contact could not be found.').' '.$id)));
 			exit();
 		}
 
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index b2b29433975..bb5b2da23d5 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -99,7 +99,7 @@ class OC_Contacts_VCard{
 	 * @brief Adds a card
 	 * @param integer $id Addressbook id
 	 * @param string $data  vCard file
-	 * @return insertid
+	 * @return insertid on success or null if card is not parseable.
 	 */
 	public static function add($id,$data){
 		$fn = null;
@@ -107,6 +107,22 @@ class OC_Contacts_VCard{
 		$card = OC_VObject::parse($data);
 		if(!is_null($card)){
 			$fn = $card->getAsString('FN');
+			if(!$fn){ // Fix missing 'FN' field.
+				$n = $card->getAsString('N');
+				if(!is_null($n)){
+					$fn = join(' ', array_reverse(array_slice(explode(';', $n), 0, 2)));
+					$card->setString('FN', $fn);
+					OC_Log::write('contacts','OC_Contacts_VCard::add. Added missing \'FN\' field: '.$fn,OC_Log::DEBUG);
+				} else {
+					$fn = 'Unknown Name';
+				}
+			}
+			$n = $card->getAsString('N');
+			if(!$n){ // Fix missing 'N' field.
+				$n = implode(';', array_reverse(array_slice(explode(' ', $fn), 0, 2))).';;;';
+				$card->setString('N', $n);
+				OC_Log::write('contacts','OC_Contacts_VCard::add. Added missing \'N\' field: '.$n,OC_Log::DEBUG);
+			}
 			$uid = $card->getAsString('UID');
 			if(is_null($uid)){
 				$card->setUID();
@@ -137,8 +153,10 @@ class OC_Contacts_VCard{
 		}
 		else{
 			// that's hard. Creating a UID and not saving it
-			$uid = self::createUID();
-			$uri = $uid.'.vcf';
+			OC_Log::write('contacts','OC_Contacts_VCard::add. Error parsing VCard: '.$data,OC_Log::ERROR);
+			return null; // Ditch cards that can't be parsed by Sabre.
+			//$uid = self::createUID();
+			//$uri = $uid.'.vcf';
 		};
 
 		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*contacts_cards (addressbookid,fullname,carddata,uri,lastmodified) VALUES(?,?,?,?,?)' );
@@ -175,7 +193,7 @@ class OC_Contacts_VCard{
 			if($email) {
 				$fn = $email;
 			} else {
-				$fn = 'Unknown';
+				$fn = 'Unknown Name';
 			}
 			$card->addProperty('FN', $fn);
 			$data = $card->serialize();
-- 
GitLab


From c0c6b5310e39afadd08a1ffa85e5c6575eceac0e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 6 Feb 2012 07:32:57 +0100
Subject: [PATCH 421/546] Added files for new contact editor/viewer.

---
 apps/contacts/ajax/addcontact.php             |   60 +
 apps/contacts/ajax/contactdetails.php         |   53 +
 apps/contacts/ajax/cropphoto.php              |   38 +
 apps/contacts/ajax/editaddress.php            |   31 +
 apps/contacts/ajax/editname.php               |   35 +
 apps/contacts/ajax/loadphoto.php              |   53 +
 apps/contacts/ajax/newcontact.php             |   58 +
 apps/contacts/ajax/savecrop.php               |  136 ++
 apps/contacts/ajax/saveproperty.php           |  134 ++
 apps/contacts/ajax/uploadphoto.php            |  133 ++
 apps/contacts/contacts.php                    |   60 +
 apps/contacts/css/Jcrop.gif                   |  Bin 0 -> 329 bytes
 apps/contacts/css/contacts.css                |  213 ++
 apps/contacts/css/jquery.Jcrop.css            |   84 +
 apps/contacts/dynphoto.php                    |   35 +
 apps/contacts/img/globe.svg                   |  102 +
 apps/contacts/img/person_large.png            |  Bin 0 -> 11517 bytes
 apps/contacts/js/contacts.js                  | 1289 ++++++++++++
 apps/contacts/js/jquery.Jcrop.js              | 1765 +++++++++++++++++
 apps/contacts/js/jquery.Jcrop.min.js          |  255 +++
 apps/contacts/js/jquery.jec-1.3.3.js          |  863 ++++++++
 apps/contacts/templates/index2.php            |   27 +
 apps/contacts/templates/part.contact.php      |  210 ++
 apps/contacts/templates/part.contactphoto.php |    9 +
 apps/contacts/templates/part.cropphoto.php    |   62 +
 .../templates/part.edit_address_dialog.php    |   67 +
 .../templates/part.edit_name_dialog.php       |   59 +
 apps/contacts/templates/part.no_contacts.php  |    8 +
 core/img/actions/add.png                      |  Bin 0 -> 488 bytes
 core/img/actions/add.svg                      |  109 +
 core/img/actions/mail.png                     |  Bin 0 -> 548 bytes
 core/img/actions/mail.svg                     |  345 ++++
 32 files changed, 6293 insertions(+)
 create mode 100644 apps/contacts/ajax/addcontact.php
 create mode 100644 apps/contacts/ajax/contactdetails.php
 create mode 100644 apps/contacts/ajax/cropphoto.php
 create mode 100644 apps/contacts/ajax/editaddress.php
 create mode 100644 apps/contacts/ajax/editname.php
 create mode 100644 apps/contacts/ajax/loadphoto.php
 create mode 100644 apps/contacts/ajax/newcontact.php
 create mode 100644 apps/contacts/ajax/savecrop.php
 create mode 100644 apps/contacts/ajax/saveproperty.php
 create mode 100644 apps/contacts/ajax/uploadphoto.php
 create mode 100644 apps/contacts/contacts.php
 create mode 100644 apps/contacts/css/Jcrop.gif
 create mode 100644 apps/contacts/css/contacts.css
 create mode 100644 apps/contacts/css/jquery.Jcrop.css
 create mode 100644 apps/contacts/dynphoto.php
 create mode 100644 apps/contacts/img/globe.svg
 create mode 100644 apps/contacts/img/person_large.png
 create mode 100644 apps/contacts/js/contacts.js
 create mode 100644 apps/contacts/js/jquery.Jcrop.js
 create mode 100644 apps/contacts/js/jquery.Jcrop.min.js
 create mode 100644 apps/contacts/js/jquery.jec-1.3.3.js
 create mode 100644 apps/contacts/templates/index2.php
 create mode 100644 apps/contacts/templates/part.contact.php
 create mode 100644 apps/contacts/templates/part.contactphoto.php
 create mode 100644 apps/contacts/templates/part.cropphoto.php
 create mode 100644 apps/contacts/templates/part.edit_address_dialog.php
 create mode 100644 apps/contacts/templates/part.edit_name_dialog.php
 create mode 100644 apps/contacts/templates/part.no_contacts.php
 create mode 100644 core/img/actions/add.png
 create mode 100644 core/img/actions/add.svg
 create mode 100644 core/img/actions/mail.png
 create mode 100644 core/img/actions/mail.svg

diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php
new file mode 100644
index 00000000000..4bd3df54e39
--- /dev/null
+++ b/apps/contacts/ajax/addcontact.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+}
+foreach ($_POST as $key=>$element) {
+	debug('_POST: '.$key.'=>'.$element);
+}
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
+
+$aid = $_POST['aid'];
+$addressbook = OC_Contacts_App::getAddressbook( $aid );
+
+$fn = trim($_POST['fn']);
+$n = trim($_POST['n']);
+
+$vcard = new OC_VObject('VCARD');
+$vcard->setUID();
+$vcard->setString('N',$n);
+$vcard->setString('FN',$fn);
+
+$id = OC_Contacts_VCard::add($aid,$vcard->serialize());
+if(!$id) {
+	OC_JSON::error(array('data' => array('message' => $l->t('There was an error adding the contact.'))));
+	OC_Log::write('contacts','ajax/addcontact.php: Recieved non-positive ID on adding card: '.$id, OC_Log::ERROR);
+	exit();
+}
+
+OC_JSON::success(array('data' => array( 'id' => $id )));
diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contactdetails.php
new file mode 100644
index 00000000000..f8f78ad3e80
--- /dev/null
+++ b/apps/contacts/ajax/contactdetails.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/contactdetails.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/contactdetails.php: '.$msg, OC_Log::DEBUG);
+}
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
+
+$id = $_GET['id'];
+$vcard = OC_Contacts_App::getContactVCard( $id );
+if(is_null($vcard)) {
+	bailOut($l->t('Error parsing VCard for ID: "'.$id.'"'));
+}
+$details = OC_Contacts_VCard::structureContact($vcard);
+if(isset($details['PHOTO'])) {
+	$details['PHOTO'] = true;
+	//unset($details['PHOTO']);
+} else {
+	$details['PHOTO'] = false;
+}
+$details['id'] = $id;
+
+OC_JSON::success(array('data' => $details));
\ No newline at end of file
diff --git a/apps/contacts/ajax/cropphoto.php b/apps/contacts/ajax/cropphoto.php
new file mode 100644
index 00000000000..878fb5610c6
--- /dev/null
+++ b/apps/contacts/ajax/cropphoto.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+
+$tmp_path = $_GET['tmp_path'];
+$id = $_GET['id'];
+OC_Log::write('contacts','ajax/cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OC_Log::DEBUG);
+$tmpl = new OC_TEMPLATE("contacts", "part.cropphoto");
+$tmpl->assign('tmp_path', $tmp_path);
+$tmpl->assign('id', $id);
+$page = $tmpl->fetchPage();
+
+OC_JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/ajax/editaddress.php b/apps/contacts/ajax/editaddress.php
new file mode 100644
index 00000000000..4e6456f6045
--- /dev/null
+++ b/apps/contacts/ajax/editaddress.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once('../../../lib/base.php');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+
+$id = $_GET['id'];
+$checksum = isset($_GET['checksum'])?$_GET['checksum']:'';
+$vcard = OC_Contacts_App::getContactVCard($id);
+$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
+
+$tmpl = new OC_TEMPLATE("contacts", "part.edit_address_dialog");
+if($checksum) {
+	$line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
+	$element = $vcard->children[$line];
+	$adr = OC_Contacts_VCard::structureProperty($element);
+	$tmpl->assign('adr',$adr);
+}
+
+$tmpl->assign('id',$id);
+$tmpl->assign('adr_types',$adr_types);
+
+$tmpl->printpage();
+
+?>
diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php
new file mode 100644
index 00000000000..6205cc74b0a
--- /dev/null
+++ b/apps/contacts/ajax/editname.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once('../../../lib/base.php');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+
+$tmpl = new OC_TEMPLATE("contacts", "part.edit_name_dialog");
+
+$id = $_GET['id'];
+if($id) {
+	$vcard = OC_Contacts_App::getContactVCard($id);
+
+
+	$name = array('', '', '', '', '');
+	if($vcard->__isset('N')) {
+		$property = $vcard->__get('N');
+		if($property) {
+			$name = OC_Contacts_VCard::structureProperty($property);
+		}
+	}
+	$tmpl->assign('name',$name);
+	$tmpl->assign('id',$id);
+} else {
+	$addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());
+	$tmpl->assign('addressbooks', $addressbooks);
+}
+$tmpl->printpage();
+
+?>
diff --git a/apps/contacts/ajax/loadphoto.php b/apps/contacts/ajax/loadphoto.php
new file mode 100644
index 00000000000..d9f7e737b55
--- /dev/null
+++ b/apps/contacts/ajax/loadphoto.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * TODO: Translatable strings.
+ *       Remember to delete tmp file at some point.
+ */
+// Init owncloud
+require_once('../../../lib/base.php');
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
+
+// foreach ($_POST as $key=>$element) {
+// 	OC_Log::write('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OC_Log::DEBUG);
+// }
+
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/savecrop.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+
+$image = null;
+
+$id = isset($_GET['id']) ? $_GET['id'] : '';
+
+if($id == '') {
+	bailOut('Missing contact id.');
+}
+
+$tmpl = new OC_TEMPLATE("contacts", "part.contactphoto");
+$tmpl->assign('id', $id);
+$page = $tmpl->fetchPage();
+OC_JSON::success(array('data' => array('page'=>$page)));
+?>
diff --git a/apps/contacts/ajax/newcontact.php b/apps/contacts/ajax/newcontact.php
new file mode 100644
index 00000000000..3d1a8e74535
--- /dev/null
+++ b/apps/contacts/ajax/newcontact.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+}
+foreach ($_POST as $key=>$element) {
+	debug('_POST: '.$key.'=>'.$element);
+}
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+
+$addressbooks = OC_Contacts_Addressbook::all(OC_USER::getUser());
+
+$upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
+$post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
+$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
+
+$freeSpace=OC_Filesystem::free_space('/');
+$freeSpace=max($freeSpace,0);
+$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
+
+$tmpl = new OC_Template('contacts','part.contact');
+$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign('uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
+$tmpl->assign('addressbooks',$addressbooks);
+$tmpl->assign('id','');
+$page = $tmpl->fetchPage();
+
+OC_JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
new file mode 100644
index 00000000000..7b7384723cd
--- /dev/null
+++ b/apps/contacts/ajax/savecrop.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * TODO: Translatable strings.
+ *       Remember to delete tmp file at some point.
+ */
+// Init owncloud
+require_once('../../../lib/base.php');
+OC_Log::write('contacts','ajax/savecrop.php: Huzzah!!!', OC_Log::DEBUG);
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
+
+// foreach ($_POST as $key=>$element) {
+// 	OC_Log::write('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OC_Log::DEBUG);
+// }
+
+// Firefox and Konqueror tries to download application/json for me.  --Arthur
+OC_JSON::setContentTypeHeader('text/plain');
+
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/savecrop.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+
+$image = null;
+
+$x1 = (isset($_POST['x1']) && $_POST['x1']) ? $_POST['x1'] : -1;
+//$x2 = isset($_POST['x2']) ? $_POST['x2'] : -1;
+$y1 = (isset($_POST['y1']) && $_POST['y1']) ? $_POST['y1'] : -1;
+//$y2 = isset($_POST['y2']) ? $_POST['y2'] : -1;
+$w = (isset($_POST['w']) && $_POST['w']) ? $_POST['w'] : -1;
+$h = (isset($_POST['h']) && $_POST['h']) ? $_POST['h'] : -1;
+$tmp_path = isset($_POST['tmp_path']) ? $_POST['tmp_path'] : '';
+$id = isset($_POST['id']) ? $_POST['id'] : '';
+
+if(in_array(-1, array($x1, $y1, $w, $h))) {
+	bailOut('Wrong crop dimensions: '.implode(', ', array($x1, $y1, $w, $h)));
+}
+
+if($tmp_path == '') {
+	bailOut('Missing path to temporary file.');
+}
+
+if($id == '') {
+	bailOut('Missing contact id.');
+}
+
+OC_Log::write('contacts','savecrop.php: files: '.$tmp_path.'  exists: '.file_exists($tmp_path), OC_Log::DEBUG);
+
+if(file_exists($tmp_path)) {
+	$image = new OC_Image();
+	if($image->loadFromFile($tmp_path)) {
+		if($image->crop($x1, $y1, $w, $h)) {
+			if($image->resize(200)) {
+				$tmpfname = tempnam("/tmp", "occCropped"); // create a new file because of caching issues.
+				if($image->save($tmpfname)) {
+					unlink($tmp_path);
+					$card = OC_Contacts_App::getContactVCard($id);
+					if(!$card) {
+						unlink($tmpfname);
+						bailOut('Error getting contact object.');
+					}
+					if($card->__isset('PHOTO')) {
+						OC_Log::write('contacts','savecrop.php: files: PHOTO property exists.', OC_Log::DEBUG);
+						$property = $card->__get('PHOTO');
+						if(!$property) {
+							unlink($tmpfname);
+							bailOut('Error getting PHOTO property.');
+						}
+						$property->setValue($image->__toString());
+						$property->parameters[] = new Sabre_VObject_Parameter('ENCODING', 'b');
+						$property->parameters[] = new Sabre_VObject_Parameter('TYPE', $image->mimeType());
+						$card->__set('PHOTO', $property);
+					} else {
+						OC_Log::write('contacts','savecrop.php: files: Adding PHOTO property.', OC_Log::DEBUG);
+						$card->addProperty('PHOTO', $image->__toString(), array('ENCODING' => 'b', 'TYPE' => $image->mimeType()));
+					}
+					if(!OC_Contacts_VCard::edit($id,$card->serialize())) {
+						bailOut('Error saving contact.');
+					}
+					unlink($tmpfname);
+					//$result=array( "status" => "success", 'mime'=>$image->mimeType(), 'tmp'=>$tmp_path);
+					$tmpl = new OC_TEMPLATE("contacts", "part.contactphoto");
+					$tmpl->assign('tmp_path', $tmpfname);
+					$tmpl->assign('mime', $image->mimeType());
+					$tmpl->assign('id', $id);
+					$tmpl->assign('width', $image->width());
+					$tmpl->assign('height', $image->height());
+					$page = $tmpl->fetchPage();
+					OC_JSON::success(array('data' => array('page'=>$page, 'tmp'=>$tmpfname)));
+					exit();
+				} else {
+					if(file_exists($tmpfname)) {
+						unlink($tmpfname);
+					}
+					bailOut('Error saving temporary image');
+				}
+			} else {
+				bailOut('Error resizing image');
+			}
+		} else {
+			bailOut('Error cropping image');
+		}
+	} else {
+		bailOut('Error creating temporary image');
+	}
+} else {
+	bailOut('Error finding image: '.$tmp_path);
+}
+
+if($tmp_path != '' && file_exists($tmp_path)) {
+	unlink($tmp_path);
+}
+
+?>
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
new file mode 100644
index 00000000000..fd1aa9e35f9
--- /dev/null
+++ b/apps/contacts/ajax/saveproperty.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Jakob Sack
+ * @copyright 2011 Jakob Sack mail@jakobsack.de
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+$l=new OC_L10N('contacts');
+
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+}
+foreach ($_POST as $key=>$element) {
+	debug('_POST: '.$key.'=>'.$element);
+}
+
+$id = isset($_POST['id'])?$_POST['id']:null;
+$name = isset($_POST['name'])?$_POST['name']:null;
+$value = isset($_POST['value'])?$_POST['value']:null;
+$parameters = isset($_POST['parameters'])?$_POST['parameters']:null;
+$checksum = isset($_POST['checksum'])?$_POST['checksum']:null;
+// if(!is_null($parameters)) {
+// 	debug('parameters: '.count($parameters));
+// 	foreach($parameters as $key=>$val ) {
+// 		debug('parameter: '.$key.'=>'.implode('/',$val));
+// 	}
+// }
+
+if(is_array($value)){ // FIXME: How to strip_tags for compound values?
+	ksort($value); // NOTE: Important, otherwise the compound value will be set in the order the fields appear in the form!
+	$value = OC_VObject::escapeSemicolons($value);
+} else {
+	$value = trim(strip_tags($value));
+}
+if(!$id) {
+	bailOut($l->t('id is not set.'));
+}
+if(!$checksum) {
+	bailOut($l->t('checksum is not set.'));
+}
+if(!$name) {
+	bailOut($l->t('element name is not set.'));
+}
+
+$vcard = OC_Contacts_App::getContactVCard( $id );
+$line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
+if(is_null($line)) {
+	bailOut($l->t('Information about vCard is incorrect. Please reload the page.'.$checksum.' "'.$line.'"'));
+}
+$element = $vcard->children[$line]->name;
+
+if($element != $name) {
+	bailOut($l->t('Something went FUBAR. ').$name.' != '.$element);
+}
+
+switch($element) {
+	case 'BDAY':
+		$date = New DateTime($value);
+		//$vcard->setDateTime('BDAY', $date, Sabre_VObject_Element_DateTime::DATE);
+		$value = $date->format(DateTime::ATOM);
+	case 'FN':
+		if(!$value) {
+			// create a method thats returns an alternative for FN.
+			//$value = getOtherValue();
+		}
+	case 'N':
+	case 'ORG':
+	case 'NICKNAME':
+		debug('Setting string:'.$name.' '.$value);
+		$vcard->setString($name, $value);
+		break;
+	case 'EMAIL':
+		$value = strtolower($value);
+	case 'TEL':
+	case 'ADR': // should I delete the property if empty or throw an error?
+		debug('Setting element: (EMAIL/TEL/ADR)'.$element);
+		if(!$value) {
+			unset($vcard->children[$line]); // Should never happen...
+		} else {
+			$vcard->children[$line]->setValue($value);
+			$vcard->children[$line]->parameters = array();
+			if(!is_null($parameters)) {
+				debug('Setting parameters: '.$parameters);
+				foreach($parameters as $key => $parameter) {
+					debug('Adding parameter: '.$key);
+					foreach($parameter as $val) {
+						debug('Adding parameter: '.$key.'=>'.$val);
+						$vcard->children[$line]->add(new Sabre_VObject_Parameter($key, strtoupper($val)));
+					}
+				}
+			}
+		}
+		break;
+}
+// Do checksum and be happy
+$checksum = md5($vcard->children[$line]->serialize());
+debug('New checksum: '.$checksum);
+
+if(!OC_Contacts_VCard::edit($id,$vcard->serialize())) {
+	OC_JSON::error(array('data' => array('message' => $l->t('Error updating contact property.'))));
+	OC_Log::write('contacts','ajax/setproperty.php: Error updating contact property: '.$value, OC_Log::ERROR);
+	exit();
+}
+
+//$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
+//$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
+
+OC_JSON::success(array('data' => array( 'line' => $line, 'checksum' => $checksum, 'oldchecksum' => $_POST['checksum'] )));
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
new file mode 100644
index 00000000000..62cd32f5dbb
--- /dev/null
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+// Init owncloud
+require_once('../../../lib/base.php');
+
+// Check if we are a user
+// Firefox and Konqueror tries to download application/json for me.  --Arthur
+OC_JSON::setContentTypeHeader('text/plain');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/uploadphoto.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/uploadphoto.php: '.$msg, OC_Log::DEBUG);
+}
+
+// foreach ($_SERVER as $key=>$element) {
+// 	debug('$_SERVER: '.$key.'=>'.$element);
+// }
+// foreach ($_GET as $key=>$element) {
+// 	debug('_GET: '.$key.'=>'.$element);
+// }
+// foreach ($_POST as $key=>$element) {
+// 	debug('_POST: '.$key.'=>'.$element);
+// }
+// foreach ($_FILES as $key=>$element) {
+// 	debug('_FILES: '.$key.'=>'.$element);
+// }
+
+// If it is a Drag'n'Drop transfer it's handled here.
+$fn = (isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : false);
+if ($fn) {
+	// AJAX call
+	if (!isset($_GET['id'])) {
+		OC_Log::write('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OC_Log::DEBUG);
+		OC_JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' )));
+		exit();
+	}
+	$id = $_GET['id'];
+	$tmpfname = tempnam('/tmp', 'occOrig');
+	file_put_contents($tmpfname, file_get_contents('php://input'));
+	debug($tmpfname.' uploaded');
+	$image = new OC_Image();
+	if($image->loadFromFile($tmpfname)) {
+		if($image->width() > 400 || $image->height() > 400) {
+			$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
+		}
+		if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
+			debug('Couldn\'t save correct image orientation: '.$tmpfname);
+		}
+		if($image->save($tmpfname)) {
+			OC_JSON::success(array('data' => array('mime'=>$_SERVER['CONTENT_TYPE'], 'name'=>$fn, 'id'=>$id, 'tmp'=>$tmpfname)));
+			exit();
+		} else {
+			bailOut('Couldn\'t save temporary image: '.$tmpfname);
+		}
+	} else {
+		bailOut('Couldn\'t load temporary image: '.$file['tmp_name']);
+	}
+}
+
+
+if (!isset($_POST['id'])) {
+	OC_Log::write('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OC_Log::DEBUG);
+	OC_JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' )));
+	exit();
+}
+if (!isset($_FILES['imagefile'])) {
+	OC_Log::write('contacts','ajax/uploadphoto.php: No file was uploaded. Unknown error.', OC_Log::DEBUG);
+	OC_JSON::error(array('data' => array( 'message' => 'No file was uploaded. Unknown error' )));
+	exit();
+}
+$error = $_FILES['imagefile']['error'];
+if($error !== UPLOAD_ERR_OK) {
+	$l=new OC_L10N('contacts');
+	$errors = array(
+		0=>$l->t("There is no error, the file uploaded with success"),
+		1=>$l->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'),
+		2=>$l->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
+		3=>$l->t("The uploaded file was only partially uploaded"),
+		4=>$l->t("No file was uploaded"),
+		6=>$l->t("Missing a temporary folder")
+	);
+	bailOut($errors[$error]);
+}
+$file=$_FILES['imagefile'];
+
+$tmpfname = tempnam("/tmp", "occOrig");
+if(file_exists($file['tmp_name'])) {
+	$image = new OC_Image();
+	if($image->loadFromFile($file['tmp_name'])) {
+		if($image->width() > 400 || $image->height() > 400) {
+			$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
+		}
+		if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
+			debug('Couldn\'t save correct image orientation: '.$tmpfname);
+		}
+		if($image->save($tmpfname)) {
+			OC_JSON::success(array('data' => array('mime'=>$file['type'],'size'=>$file['size'],'name'=>$file['name'], 'id'=>$_POST['id'], 'tmp'=>$tmpfname)));
+			exit();
+		} else {
+			bailOut('Couldn\'t save temporary image: '.$tmpfname);
+		}
+	} else {
+		bailOut('Couldn\'t load temporary image: '.$file['tmp_name']);
+	}
+} else {
+	bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');
+}
+
+?>
diff --git a/apps/contacts/contacts.php b/apps/contacts/contacts.php
new file mode 100644
index 00000000000..fded839fed8
--- /dev/null
+++ b/apps/contacts/contacts.php
@@ -0,0 +1,60 @@
+<?php
+require_once('../../lib/base.php');
+
+// Check if we are a user
+OC_Util::checkLoggedIn();
+// Get active address books. This creates a default one if none exists.
+$ids = OC_Contacts_Addressbook::activeIds(OC_User::getUser());
+$contacts = OC_Contacts_VCard::all($ids);
+
+$addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());
+
+// Load the files we need
+OC_App::setActiveNavigationEntry( 'contacts_index' );
+
+// Load a specific user?
+$id = isset( $_GET['id'] ) ? $_GET['id'] : null;
+$details = array();
+
+// FIXME: This cannot work..?
+if(is_null($id) && count($contacts) > 0) {
+	$id = $contacts[0]['id'];
+}
+if(!is_null($id)) {
+	$vcard = OC_Contacts_App::getContactVCard($id);
+	$details = OC_Contacts_VCard::structureContact($vcard);
+}
+$property_types = OC_Contacts_App::getAddPropertyOptions();
+$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
+
+$upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
+$post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
+$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
+
+$freeSpace=OC_Filesystem::free_space('/');
+$freeSpace=max($freeSpace,0);
+$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
+
+OC_Util::addScript('','jquery.multiselect');
+//OC_Util::addScript('contacts','interface');
+OC_Util::addScript('contacts','contacts');
+OC_Util::addScript('contacts','jquery.inview');
+OC_Util::addScript('contacts','jquery.Jcrop');
+OC_Util::addScript('contacts','jquery.jec-1.3.3');
+OC_Util::addStyle('','jquery.multiselect');
+//OC_Util::addStyle('contacts','styles');
+OC_Util::addStyle('contacts','jquery.Jcrop');
+OC_Util::addStyle('contacts','contacts');
+
+$tmpl = new OC_Template( "contacts", "index2", "user" );
+$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign('uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
+$tmpl->assign('property_types',$property_types);
+$tmpl->assign('phone_types',$phone_types);
+$tmpl->assign('addressbooks', $addressbooks);
+$tmpl->assign('contacts', $contacts);
+$tmpl->assign('details', $details );
+$tmpl->assign('id',$id);
+$tmpl->printPage();
+
+?>
diff --git a/apps/contacts/css/Jcrop.gif b/apps/contacts/css/Jcrop.gif
new file mode 100644
index 0000000000000000000000000000000000000000..72ea7ccb5321d5384d70437cfaac73011237901e
GIT binary patch
literal 329
zcmZ?wbhEHb<Y3@nn8?7eYSpU$|Nk?9f#QE|Ki808XU70nBRvCVMxdbLPZmxtAgu#Z
z0Mf$1#5;wRb9wgJ5Fhr7kxzB7so-zXTQDQ*d0g~`g(u!D-HO!|ewLP`>9b#5NV>2k
zBC~b@b~P=nNfWAe-b%_i6tS^-1y(h@EsB~1TqDA_h@fkxG$bHgvj}VxE1JLgr!*!^
ILUxTc0Q$^Q5C8xG

literal 0
HcmV?d00001

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
new file mode 100644
index 00000000000..a48533f85a0
--- /dev/null
+++ b/apps/contacts/css/contacts.css
@@ -0,0 +1,213 @@
+/*dl > dt {
+	font-weight: bold;
+}*/
+
+#contacts { padding-left:2px; padding-top: 5px; background: #fff; }
+#leftcontent a { height: 23px; display: block; margin: 0 0 0 0; padding: 0 0 0 25px; }
+#chooseaddressbook {margin-right: 170px; float: right;}
+#contacts_deletecard {position:absolute;top:15px;right:25px;}
+#contacts_downloadcard {position:absolute;top:15px;right:50px;}
+#contacts_propertymenu_button { position:absolute;top:15px;right:150px; height: 20px; width: 150px; background:url('../../../core/img/actions/add.svg') no-repeat center;	 }
+#contacts_propertymenu { position:absolute;top:35px;right:150px; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; }
+#contacts_propertymenu li { display: block; font-weight: bold; border-left: thin solid #1d2d44;  border-right: thin solid #1d2d44; height: 20px; width: 100px; }
+#contacts_propertymenu li:first-child { border-top: thin solid #1d2d44; -moz-border-radius-topleft:0.5em; -webkit-border-top-left-radius:0.5em; border-top-left-radius:0.5em; -moz-border-radius-topright:0.5em; -webkit-border-top-right-radius:0.5em; border-top-right-radius:0.5em; }
+#contacts_propertymenu li:last-child { border-bottom: thin solid #1d2d44; -moz-border-radius-bottomleft:0.5em; -webkit-border-bottom-left-radius:0.5em; border-bottom-left-radius:0.5em; -moz-border-radius-bottomright:0.5em; -webkit-border-bottom-right-radius:0.5em; border-bottom-right-radius:0.5em; }
+#contacts_propertymenu li a { padding: 3px; display: block }
+#contacts_propertymenu li:hover { background-color: #1d2d44; }
+#contacts_propertymenu li a:hover { color: #fff }
+#actionbar { height: 30px; width: 200px; position: fixed; right: 0px; top: 75px; margin: 0 0 0 0; padding: 0 0 0 0;}
+#card { /*max-width: 70em;*/ border: thin solid lightgray; display: block; }
+#firstrun { /*border: thin solid lightgray;*/ width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777;}
+#firstrun #selections { /*border: thin solid lightgray;*/ font-size:0.8em;  width: 100%; margin: 2em auto auto auto; clear: both; }
+
+#card input[type="text"],input[type="email"],input[type="tel"],input[type="date"], select { background-color: #f8f8f8; border: 0 !important; -webkit-appearance:none !important; -moz-appearance:none  !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; float: left; }
+#card input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,input[type="email"]:hover,input[type="tel"]:hover,input[type="date"]:hover,input[type="date"],input[type="date"]:hover,input[type="date"]:active,input[type="date"]:active,input[type="date"]:active,input[type="email"]:active,input[type="tel"]:active, select:hover, select:focus, select:active { border: 0 !important; -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; float: left; }
+input[type="text"]:invalid,input[type="email"]:invalid,input[type="tel"]:invalid,input[type="date"]:invalid { background-color: #ffc0c0 !important; }
+/*input[type="text"]:valid,input[type="email"]:valid,input[type="tel"]:valid,input[type="date"]:valid { background-color: #b1d28f !important; }*/
+dl.form
+{
+	width: 100%;
+	float: left;
+	clear: right;
+	margin: 0;
+	padding: 0;
+}
+
+.form dt
+{
+	display: table-cell;
+	clear: left;
+	float: left;
+	width: 7em;
+	/*overflow: hidden;*/
+	margin: 0;
+	padding: 0.8em 0.5em 0 0;
+	font-weight: bold;
+	text-align:right;
+	text-overflow:ellipsis;
+	o-text-overflow: ellipsis;
+	vertical-align: text-bottom;
+	/*
+	white-space: pre-wrap;
+	white-space: -moz-pre-wrap !important;
+	white-space: -pre-wrap;
+	white-space: -o-pre-wrap;*/
+}
+
+.form dd
+{
+	display: table-cell;
+	clear: right;
+	float: left;
+	margin: 0;
+	padding: 0px;
+	white-space: nowrap;
+	vertical-align: text-bottom;
+	/*min-width: 20em;*/
+	/*background-color: yellow;*/
+}
+
+.loading { background: url('../../../core/img/loading.gif') no-repeat center !important;}
+
+/*.add { cursor: pointer;  width: 25px; height: 25px; margin: 0px; float: right; position:relative; content: "\+"; font-weight: bold; color: #666; font-size: large; bottom: 0px; right: 0px; clear: both; text-align: center; vertical-align: bottom; display: none; }*/
+
+.listactions { height: 1em; width:60px; float: left; clear: right; }
+.add,.edit,.delete,.mail, .globe { cursor: pointer; width: 20px; height: 20px; margin: 0; float: left; position:relative; display: none; }
+.add { background:url('../../../core/img/actions/add.svg') no-repeat center; clear: both; }
+.delete { background:url('../../../core/img/actions/delete.svg') no-repeat center; }
+.edit { background:url('../../../core/img/actions/rename.svg') no-repeat center; }
+.mail { background:url('../../../core/img/actions/mail.svg') no-repeat center; }
+.globe { background:url('../img/globe.svg') no-repeat center; }
+
+#messagebox_msg { font-weight: bold; font-size: 1.2em; }
+
+/* Name editor */
+#edit_name_dialog {
+	/*width: 25em;*/
+	padding:0;
+}
+#edit_name_dialog > input {
+	width: 15em;
+}
+/* Address editor */
+#edit_address_dialog {
+	/*width: 30em;*/
+}
+#edit_address_dialog > input {
+	width: 15em;
+}
+#edit_photo_dialog_img {
+	display: block;
+	width: 150;
+	height: 200;
+	border: thin solid black;
+}
+#fn {
+	float: left;
+}
+.jecEditableOption {
+	margin: 2px;
+	border-radius: 0.5em;
+	border: thin solid #bbb;
+	content: 'Custom';
+}
+/**
+ * Create classes form, floateven and floatodd which flows left and right respectively.
+ */
+.contactsection { 
+	float: left; 
+	min-width: 30em;
+	max-width: 40em;
+	margin: 0.5em;
+	border: thin solid lightgray;
+	-webkit-border-radius: 0.5em;
+	-moz-border-radius: 0.5em;
+	border-radius: 0.5em;
+	background-color: #f8f8f8;
+}
+
+.contactpart legend {
+	/*background: #fff;
+	font-weight: bold;
+	left: 1em;
+	border: thin solid gray;
+	-webkit-border-radius: 0.5em;
+	-moz-border-radius: 0.5em;
+	border-radius: 0.5em;
+	padding: 3px;*/
+width:auto; padding:.3em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
+}
+/*#contacts_details_photo { 
+	cursor: pointer; 
+	z-index:1; 
+	margin: auto;
+}
+*/
+#cropbox { 
+	margin: auto;
+}
+
+/* Photo editor */
+/*#contacts_details_photo_wrapper {
+	z-index: 1000;
+}*/
+#contacts_details_photo {
+	border-radius: 0.5em;
+	border: thin solid #bbb;
+	padding: 0.5em;
+	margin: 1em 1em 1em 7em;
+	cursor: pointer;
+	/*background: #f8f8f8;*/
+	background: url(../../../core/img/loading.gif) no-repeat center center;
+	clear: right;
+}
+#contacts_details_photo:hover {
+	background: #fff;
+}
+#contacts_details_photo_progress {
+	margin: 0.3em 0.3em 0.3em 7em;
+	clear: left;
+}
+/* Address editor */
+#addressdisplay { padding: 0.5em; }
+dl.addresscard { background-color: #fff; float: left; width: 45%; margin: 0 0.3em 0.3em 0.3em; padding: 0; border: thin solid lightgray; }
+dl.addresscard dd {}
+dl.addresscard dt { padding: 0.3em; border-bottom: thin solid lightgray; font-weight: bold; clear: both;}
+dl.addresscard dd > ul { margin: 0.3em; padding: 0.3em; }
+#adr_type {} /* Select */
+#adr_pobox {}
+#adr_extended {}
+#adr_street {}
+#adr_city {}
+#adr_region {}
+#adr_zipcode {}
+#adr_country {}
+
+.delimiter {
+	height: 10px;
+	clear: both;
+}
+.updatebar {
+	height: 30px;
+	clear: both;
+	padding-right: 170px;
+	border: thin solid lightgray;
+}
+.updatebar button {
+	float: left; margin: 1em;
+}
+
+/*input[type="text"] { float: left; max-width: 15em; }
+input[type="radio"] { float: left; -khtml-appearance: none; width: 20px; height: 20px; vertical-align: middle; }*/
+#file_upload_target, #crop_target { display:none; }
+
+#file_upload_start { opacity:0; filter:alpha(opacity=0); z-index:1; position:absolute; left:0; top:0; cursor:pointer; width:0; height:0;}
+input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
+.propertycontainer dd { float: left; width: 25em; }
+.propertylist { clear: none; max-width: 28em; }
+.propertylist li { /*background-color: cyan; */ min-width: 25em; /*max-width: 30em;*/ display: block; clear: right; }
+.propertylist li > input[type="text"],input[type="email"],input[type="tel"] { float: left; max-width: 15em; }
+.propertylist li > input[type="checkbox"],input[type="radio"] { float: left; clear: left; width: 20px; height: 20px; vertical-align: middle; }
+.propertylist li > select { float: left; max-width: 8em; }
+.typelist { float: left; max-width: 10em; } /* for multiselect */
+.addresslist { clear: both; }
\ No newline at end of file
diff --git a/apps/contacts/css/jquery.Jcrop.css b/apps/contacts/css/jquery.Jcrop.css
new file mode 100644
index 00000000000..554f013fd77
--- /dev/null
+++ b/apps/contacts/css/jquery.Jcrop.css
@@ -0,0 +1,84 @@
+/* jquery.Jcrop.css
+   The code contained in this file is free software under MIT License
+   Copyright (c)2008-2011 Tapmodo Interactive LLC
+*/
+
+/*
+  The outer-most container in a typical Jcrop instance
+  If you are having difficulty with formatting related to styles
+  on a parent element, place any fixes here or in a like selector
+*/
+.jcrop-holder {
+  direction: ltr;
+  text-align: left;
+}
+
+.jcrop-vline, .jcrop-hline {
+	background: white url('Jcrop.gif') top left repeat;
+	font-size: 0px;
+	position: absolute;
+}
+
+.jcrop-vline {
+  height: 100%;
+  width: 1px !important;
+}
+
+.jcrop-hline {
+  width: 100%;
+  height: 1px !important;
+}
+
+.jcrop-vline.right {
+  right: 0px;
+}
+
+.jcrop-hline.bottom {
+  bottom: 0px;
+}
+
+.jcrop-handle {
+	background-color: #333;
+	border: 1px #eee solid;
+	font-size: 1px;
+}
+
+.jcrop-tracker {
+  height: 100%; 
+  -webkit-tap-highlight-color: transparent; /* "turn off" link highlight */
+  -webkit-touch-callout: none;              /* disable callout, image save panel */
+  -webkit-user-select: none;                /* disable cut copy paste */
+  width: 100%;
+}
+
+/*
+*/
+
+.jcrop-light .jcrop-vline, .jcrop-light .jcrop-hline {
+	background: white;
+  filter: Alpha(opacity=70) !important;
+  opacity: .70 !important;
+}
+
+.jcrop-light .jcrop-handle {
+	background-color: black;
+	border-color: white;
+  border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+.jcrop-dark .jcrop-vline, .jcrop-dark .jcrop-hline {
+	background: black;
+  filter: Alpha(opacity=70) !important;
+  opacity: 0.70 !important;
+}
+
+.jcrop-dark .jcrop-handle {
+	background-color: white;
+	border-color: black;
+  border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
diff --git a/apps/contacts/dynphoto.php b/apps/contacts/dynphoto.php
new file mode 100644
index 00000000000..8025f559c37
--- /dev/null
+++ b/apps/contacts/dynphoto.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * ownCloud - Image generator for contacts.
+ *
+ * @author Thomas Tanghus
+ * @copyright 2011 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../lib/base.php');
+$tmp_path = $_GET['tmp_path'];
+$maxsize = isset($_GET['maxsize']) ? $_GET['maxsize'] : -1;
+header("Cache-Control: no-cache, no-store, must-revalidate");
+
+OC_Log::write('contacts','dynphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OC_Log::DEBUG);
+
+$image = new OC_Image($tmp_path);
+if($maxsize != -1) {
+	$image->resize($maxsize);
+}
+$image();
diff --git a/apps/contacts/img/globe.svg b/apps/contacts/img/globe.svg
new file mode 100644
index 00000000000..4e43cfba10a
--- /dev/null
+++ b/apps/contacts/img/globe.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="16"
+   height="16"
+   id="svg2485">
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient3707-319-631">
+      <stop
+         id="stop4637"
+         style="stop-color:#254b6d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4639"
+         style="stop-color:#415b73;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop4641"
+         style="stop-color:#6195b5;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="20"
+       y1="43"
+       x2="20"
+       y2="2.6887112"
+       id="linearGradient2483"
+       xlink:href="#linearGradient3707-319-631"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3769285,0,0,0.3769199,-1.196178,-0.8960149)" />
+    <linearGradient
+       id="linearGradient2867-449-88-871-390-598-476-591-434-148">
+      <stop
+         id="stop4627"
+         style="stop-color:#51cfee;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4629"
+         style="stop-color:#49a3d2;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop4631"
+         style="stop-color:#3470b4;stop-opacity:1"
+         offset="0.704952" />
+      <stop
+         id="stop4633"
+         style="stop-color:#273567;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="61.240059"
+       cy="-8.7256308"
+       r="9.7552834"
+       fx="61.240059"
+       fy="-8.7256308"
+       id="radialGradient2481"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1.3551574,-1.3551567,0,-3.824604,-80.384092)" />
+    <linearGradient
+       id="linearGradient4873">
+      <stop
+         id="stop4875"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4877"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="63.397362"
+       y1="-12.489107"
+       x2="63.397362"
+       y2="5.4675598"
+       id="linearGradient2464"
+       xlink:href="#linearGradient4873"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7432394,0,0,0.7432224,-38.229789,10.609333)" />
+  </defs>
+  <g
+     id="layer1">
+    <path
+       d="M 15.5,7.999735 C 15.5,12.142003 12.141888,15.5 8.000094,15.5 C 3.857922,15.5 0.5,12.141965 0.5,7.999735 C 0.5,3.8576552 3.857922,0.4999997 8.000094,0.4999997 C 12.141888,0.4999997 15.5,3.8576552 15.5,7.999735 L 15.5,7.999735 z"
+       id="path6495"
+       style="fill:url(#radialGradient2481);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2483);stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       d="M 8.1022062,0.95621712 L 7.236144,1.0568701 L 6.2834735,1.3210847 C 6.3646244,1.2921995 6.446834,1.2606694 6.5309208,1.2330132 L 6.4195696,1.0317069 L 6.048401,1.0946151 L 5.8628152,1.2707582 L 5.5782512,1.3085031 L 5.318433,1.4343196 L 5.1947098,1.4972277 L 5.157592,1.5475543 L 4.9720082,1.5852992 L 4.8606579,1.8243504 L 4.712189,1.522391 L 4.6626994,1.6482076 L 4.6874462,1.9879118 L 4.4523728,2.1892181 L 4.3162766,2.5540857 L 4.6008407,2.5540857 L 4.712191,2.3150345 L 4.7493088,2.2269631 C 4.8744282,2.136984 4.9930427,2.0367771 5.1204782,1.9501669 L 5.4174142,2.05082 C 5.6107409,2.1843878 5.8054259,2.3200676 5.9989133,2.4534326 L 6.2834735,2.1892181 L 5.9617936,2.05082 L 5.8133266,1.7488605 L 5.2689442,1.6859524 L 5.2565714,1.6230443 L 5.4916438,1.6733709 L 5.6277409,1.5349726 L 5.9246759,1.4720643 C 5.9949454,1.4373108 6.06407,1.4122795 6.1350055,1.3839929 L 5.9494207,1.560136 L 6.6175262,2.0256568 L 6.6175262,2.302453 L 6.357707,2.5666673 L 6.7041325,3.2712399 L 6.9392071,3.1328408 L 7.2361431,2.6673207 C 7.6536127,2.5360677 8.0298636,2.383337 8.423888,2.2017997 L 8.3991411,2.3779426 L 8.5970969,2.5163408 L 8.9435226,2.2772895 L 8.7703107,2.0759833 L 8.5352353,2.2143814 L 8.4610018,2.1892185 C 8.4780536,2.1812953 8.4933662,2.1721092 8.5104914,2.1640557 L 8.8569181,1.2581766 L 8.1022062,0.95621712 z M 4.712189,2.3150345 L 4.9967521,2.5163408 L 5.2318265,2.5163408 L 5.2318265,2.2772895 L 4.9472634,2.1514733 L 4.712189,2.3150345 L 4.712189,2.3150345 z M 11.281895,2.1514733 L 10.774628,2.2772895 L 10.452951,2.4911776 L 10.452951,2.6799019 L 9.9456829,3.0070243 L 10.044661,3.4977095 L 10.341597,3.2838208 L 10.527183,3.4977095 L 10.737514,3.6235259 L 10.873608,3.2586575 L 10.799375,3.0447699 L 10.873608,2.8937896 L 11.170544,2.6169941 L 11.30664,2.6169941 L 11.170544,2.9189543 L 11.170544,3.1957496 C 11.292932,3.1618717 11.416467,3.1486778 11.541713,3.1328408 L 11.195288,3.3844746 L 11.170543,3.5354537 L 10.774628,3.8751588 L 10.366341,3.7745049 L 10.366341,3.5354537 L 10.180756,3.6612703 L 10.267364,3.8751588 L 9.9704267,3.8751588 L 9.8095868,4.1519548 L 9.61163,4.3784244 L 9.2528324,4.4539139 L 9.463162,4.6678019 L 9.5126507,4.88169 L 9.2528324,4.88169 L 8.9064068,5.0704143 L 8.9064068,5.6240059 L 9.0672458,5.6240059 L 9.2157146,5.7875676 L 9.5497684,5.6240059 L 9.6734907,5.2843013 L 9.920937,5.1333218 L 9.9704267,5.0075057 L 10.366341,4.9068526 L 10.589042,5.1584854 L 10.824117,5.2843013 L 10.688021,5.5610979 L 10.898351,5.49819 L 11.009701,5.2213934 L 10.737512,4.9068526 L 10.848862,4.9068526 L 11.121054,5.1333218 L 11.170543,5.4352821 L 11.405615,5.7120781 L 11.467479,5.3094657 L 11.591202,5.2465566 C 11.722897,5.3855865 11.826706,5.5556097 11.937626,5.7120781 L 12.345913,5.7372433 L 12.580987,5.8882234 L 12.469637,6.0517841 L 12.234564,6.2656727 L 11.888135,6.2656727 L 11.430361,6.1146942 L 11.195287,6.1398593 L 11.022074,6.3411657 L 10.527181,5.8378996 L 10.180756,5.7372462 L 9.6734907,5.8001547 L 9.2280866,5.9259711 C 8.974001,6.2188978 8.7138634,6.5150518 8.4733747,6.8192683 L 8.1888107,7.5238405 L 8.3249076,7.6748196 L 8.0774604,8.0396877 L 8.3496515,8.6813514 C 8.5761437,8.9418962 8.8039678,9.2006825 9.030129,9.461412 L 9.3641827,9.1720348 L 9.5002778,9.3481795 L 9.8590764,9.1091277 L 9.9827973,9.2475248 L 10.341595,9.2475248 L 10.551927,9.4865757 L 10.428203,9.914352 L 10.675649,10.203731 L 10.663275,10.706995 L 10.848861,11.071864 L 10.712766,11.386405 C 10.699498,11.611997 10.68802,11.827605 10.68802,12.053231 C 10.79718,12.358902 10.906621,12.663823 11.0097,12.971693 L 11.083934,13.462375 L 11.083934,13.714009 L 11.281891,13.714009 L 11.566453,13.525283 L 11.91288,13.525283 L 12.432517,12.933947 L 12.370656,12.732639 L 12.717083,12.418101 L 12.457262,12.128722 L 12.76657,11.877089 L 13.063506,11.688364 L 13.199602,11.537384 L 13.112995,11.19768 C 13.112995,10.911684 13.112996,10.628161 13.112995,10.342127 L 13.348069,9.8136993 L 13.645006,9.4865757 L 13.966685,8.6813514 L 13.966685,8.467463 C 13.806607,8.4879689 13.653171,8.506459 13.496537,8.5177905 L 13.818218,8.1906678 L 14.263621,7.8887078 L 14.498696,7.6119125 L 14.498696,7.3099534 C 14.445379,7.2077028 14.391536,7.0976601 14.337854,6.9954116 L 14.127525,7.2470431 L 13.966685,7.0583197 L 13.731609,6.8695964 L 13.731609,6.4795648 L 14.003802,6.7941047 L 14.313111,6.75636 C 14.452648,6.8851798 14.586636,6.9997236 14.709024,7.1463926 L 14.906986,6.9199159 C 14.906986,6.6761022 14.63695,5.4724677 14.053296,4.4539139 C 13.46964,3.4356954 12.444894,2.5037591 12.444895,2.5037591 L 12.370661,2.6421572 L 12.098469,2.9441167 L 11.752043,2.579249 L 12.098469,2.579249 L 12.259308,2.4031061 L 11.615949,2.2772895 L 11.281895,2.1514733 z M 3.8461259,2.3150345 L 3.7224027,2.6421572 C 3.7224027,2.6421572 3.5057941,2.6785236 3.4502116,2.6924839 C 2.7403769,3.3576613 1.3089548,4.8004591 0.97574709,7.5112538 C 0.98894063,7.5741032 1.2108206,7.9390292 1.2108206,7.9390292 L 1.7552039,8.2661509 L 2.2995852,8.417131 L 2.5346596,8.7065091 L 2.8934573,8.9833054 L 3.1037868,8.9455608 L 3.2522558,9.0210508 L 3.2522558,9.0713763 L 3.0542972,9.6375498 L 2.8934573,9.8766016 L 2.942946,9.9898366 L 2.8192238,10.442776 L 3.2769996,11.298327 L 3.7471476,11.713522 L 3.957476,12.015482 L 3.9327303,12.644563 L 4.0811982,12.99685 L 3.9327303,13.67626 C 3.9327303,13.67626 3.9129189,13.670673 3.9327303,13.739167 C 3.9527179,13.807695 4.759781,14.268689 4.8111654,14.22985 C 4.8623746,14.190288 4.9101447,14.154361 4.9101447,14.154361 L 4.860656,14.00338 L 5.0709847,13.802075 L 5.1452191,13.588188 L 5.4792709,13.474953 L 5.7390901,12.820706 L 5.6648567,12.644563 L 5.8380694,12.367767 L 6.2339838,12.279695 L 6.4319415,11.801593 L 6.3824509,11.210255 L 6.6917597,10.769898 L 6.7412484,10.316959 C 6.3168632,10.102948 5.9004921,9.8830534 5.4792709,9.6627135 L 5.2689423,9.2475198 L 4.8853999,9.1594491 L 4.6750703,8.5932746 L 4.1678047,8.6561827 L 3.7224017,8.32906 L 3.2522529,8.7442535 L 3.2522529,8.8071626 C 3.1114329,8.7658292 2.9446126,8.7597462 2.8192238,8.6813464 L 2.7202454,8.3793874 L 2.7202454,8.0522637 L 2.3985655,8.0900083 C 2.4244522,7.8816386 2.4591052,7.6692598 2.485171,7.4609265 L 2.2995852,7.4609265 L 2.1140005,7.6999783 L 1.9407887,7.7880501 L 1.6809694,7.6370692 L 1.6562245,7.3099456 L 1.7057143,6.9576606 L 2.0892557,6.6557005 L 2.3985645,6.6557005 L 2.4604271,6.4795582 L 2.8439686,6.5676288 L 3.1285316,6.932497 L 3.1780203,6.3285781 L 3.672914,5.9133853 L 3.8461259,5.4730269 L 4.2172963,5.3220476 L 4.415253,5.0200879 L 4.8854018,4.9320161 L 5.1204763,4.57973 C 4.8878,4.57973 4.6479303,4.57973 4.415253,4.57973 L 4.8606579,4.3658421 L 5.1699649,4.3658421 L 5.5658793,4.2274443 L 5.6401139,4.6174752 L 5.8133266,4.3406788 L 5.615369,4.2022808 L 5.6648596,4.0387201 L 5.5040187,3.8877395 L 5.3308048,3.8374132 L 5.3802955,3.6486888 L 5.2441994,3.3844746 L 4.9348905,3.5102908 L 4.9843801,3.2712399 L 4.6255827,3.0573516 L 4.3410204,3.5606172 L 4.3657663,3.7367603 L 4.0812032,3.8625768 L 3.9079904,4.2526078 L 3.821384,3.8877395 L 3.3388631,3.6864335 L 3.2522568,3.4096375 L 3.9079904,3.0321885 L 4.1925535,2.755392 L 4.2173002,2.4282694 L 4.0564593,2.3401977 L 3.8461298,2.315035 L 3.8461259,2.3150345 z M 9.1538541,2.9189543 L 9.1538541,3.1202592 L 9.2652062,3.246076 L 9.2652062,3.5480356 L 9.2033438,3.9506479 L 9.5250246,3.8877395 L 9.760098,3.6486888 L 9.5497694,3.4473819 C 9.4815603,3.2626763 9.4124355,3.0961113 9.3270669,2.9189543 L 9.1538541,2.9189543 z M 8.881662,3.3215656 L 8.6837063,3.3844746 L 8.7331959,3.7493421 L 8.9930152,3.6109428 L 8.881662,3.3215656 L 8.881662,3.3215656 z M 12.506754,6.6305386 L 12.803691,6.9828228 L 13.162489,7.7628866 L 13.385189,8.0145183 L 13.273839,8.2787347 L 13.471797,8.5177846 C 13.380952,8.5238987 13.292977,8.5303684 13.199605,8.5303684 C 13.029984,8.1679096 12.895741,7.802374 12.766575,7.4231829 L 12.543871,7.1715503 L 12.420149,6.7186111 L 12.506754,6.6305399 L 12.506754,6.6305386 z"
+       id="path6534"
+       style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <path
+       d="M 14.500001,7.9997709 C 14.500001,11.589737 11.589636,14.5 8.0000818,14.5 C 4.4101984,14.5 1.5000001,11.589705 1.5000001,7.9997709 C 1.5000001,4.4099703 4.4101984,1.5000014 8.0000818,1.5000014 C 11.589636,1.5000014 14.500001,4.4099703 14.500001,7.9997709 L 14.500001,7.9997709 z"
+       id="path2451"
+       style="opacity:0.4;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2464);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/apps/contacts/img/person_large.png b/apps/contacts/img/person_large.png
new file mode 100644
index 0000000000000000000000000000000000000000..f57511e1000690c223bc5de2313ddfface12f29a
GIT binary patch
literal 11517
zcmX|{1yodD)b?Q*B$RMy6zPy|0V$F08bTWB7U>*By1P^91_9}zg&{=#G{OMVARr*E
z@A3QI^|ID**Ua3r@4aWv+535Z=R|3$D-hsQ<6~f85GX0iYJ+1TcunHo1OMHf7mL9G
z`c_6s7Z>~m;95n3_jqoKhHo)2-pT!YVGa&K2*HO`9&!dAI<7Vz-WKlG7~bCA-1aVx
zZ(m!uS#!I(+vfZfr^djb!%&iaq3e@-nCG4NcrI{TO2XIXEhG|Y!k~#^uLVo^t<+eN
zVr7WKz#Br<TbrWpZM~YunPge-*%;V(@S2o)>DN@_M2Ub?+5m1c67t!71mD&uwOTrn
z6z>t#t6|>6e8VY!J}`K!+eX7RVopHfxd7@;&r>a8u5R@#U^~O~@@aNy1HNOf$eVTc
zLY&V~1KU$PH%!WwtAo{s*TWpBrC-+}jmpSYxAlQ27W5p#BxcF4pz;aCkD|3_37iqD
zaXu@t@*67tW_`d5-)e~<00US5GRY8qgVZYY9*(DR)xGo;ifiS<)Bx8IIKDx4R4u1w
zg!~0<<F_l9<15k53P=)G^#kZ1;?Jdv&U|ab$ZfBK`8U;z1cvIJ&bU6emnUW=(w%0t
zUPi{p3CQi*j-TzW`W^JB5Hbzq#&ALp?Ik0+f5s(7;a1{!VIO>5Q29Mk*>Vtee0j2g
zf4mwZg#npyRvXcL`swfeITP>i(YHl<OqdC@QY-k6A-{DyxFpwb-HzM$YgP0*=!0Gl
zK0Kapc&(2)2{F2>6rhfSB@9Q&e~@K(SUgqUjrnofJ`iQa4-Vwy<cej}K|+{l!FuoQ
zi98PW@~&cBpM&{^K%^NY%6$*-Ug)RR*6D=>C4GI0sP~?p(Zv|%7lhl}+f+0()=o~b
zQBiomt^!2IA(=Rm4R5z6TvLs-YRu(`|6L#dm>Hc?GW!re%%CSo!o<V`gd%xx@6M4f
zadJB=Gt=C|BekfA-o4FObmk84xFYYl_v~E)MWq*3K;O$$#coYDSq%*$2?>e!{T3#b
zS8?XNing|_d3kwG-`msv{0X|gxlv(WXAKc_E9j{)4*IVPdT@An$A#uFJraQNz@l_x
zeZ0O3#;LOCa6kNusx|5OvwYOT#k!Y`=<4d4!<xj*KeGlG$a&_<0*fNX<<xjT^i$$K
zL%!(Sa1gz2W-BDe`*88xvhA>nd@uc9qaJ7g4iTXO8|ix9Q2?vsY&AVGZYtOLt)F*x
zX^}lOBO_zy^<I@}$(s0akx7Tw-It6ZPJzATe@$}`!I0U}mFeZ>F}S{o+{>4tpF$gQ
zkK_~GTwLPyO?|_5ckOvv&7dnij&rq5WDcf-n%+=xzcV|=V@C6i1Bpk^T&$K_oXI@-
zJNuNFx7|h6^TY<PPPe;sukIbIba)@-pMMBMh4~#6UvobB((1Xd*W$WrD)b9)#AfB7
zkPW{`GxBh$waK%p%;4G!|ERQ9Qy+G`GxZ?{F&9#<dZohCrJE5DBt0#t3!i!Rg2h7P
z9t6|O85JNoS)o%#NlBU5B}8D{;D7P6U2E{1947#(^sC0ODICSqldD<YS(l00{9@B&
z)nxeVs#BeCgLW=}oALoHN)|Vw9}K%W+j+bYbKWnT8D{EYc{Wy7vZZZW_(wZ>S$)lj
z_9TQt{NpP+?7BI!nwlEp!1Ec|4^zo~oRyWy>SZG~P34vNA|w;LI$ET~Q+7$G8=HAC
zyyF_d*E-2cyA8Osi%qtZ-X*l!a{pmtCOj5}74lkMO1M~)L_z0_-x5U0_PzDauB^1;
zr{d3wC0)y{HB5^e-e7{^%}Iq_J)07Y3k$;zy4|1^kdop#g$La;2H~E-OWlODc+|fP
zC(_X(Tb!37hd1&^GDfU2b8;9{MleVh-dL{Q?qX+`@<~Ze&d+BuN98^yrI%}UUShfV
ze4*)ME0mDUicVrwC`M9Pje?<<-qIrcuD9@0_OxJ}E_(@4UL!;P1FMk=dujmz0j87@
z28AJlUh~A+S-siXG{V3ji<9p&f)4qJ?9xEp=}*mGYY#rKw%bpaG9=6$4#VMT;HKT%
z9!D1&B!5xAZhJUU6TqHk84$4CGS|QNJY0re*m+Twj@T`LB4+88+O*`}nTsQ)kcKo`
zI7{aH_wOyg)5spe;mm2uyYcU&MIC1ElgiN-ObUpKR`}1kypfU90uSur?TwO@-}??H
z5mG}^m<8}bmeG3LPZFBmY{<_gMx5Y~x8zGd)t)3uuB;sW@#A9^HTfaoy-=s+&q+Sw
z+&XszF-P?_TGP;v^{Vn!Mn#_cvq}UNu(|2oPftu6bh=D6f8MnjyC_8tsxz=h%ZNO-
z`QGly4{z1>i4cm(W+^PSZ&jKX^YHLcJokzW(kt@fD6vtg(DzwGKV~KU?V_L%5la(U
zYA;k1?wF3?={%O9{5(}-{PwNDiO*v>t&jg@F6`8O%s%%!Iyg8;_GQ#d*3=@kY@i$;
zALpN0`FzRk2oq9~M(c+Nx5|K&BKO@{T|PiK2fMudi~|S!uFs!W9X-D*8XykF`=sTQ
zAr$qB1s!39@2k}#)Bd0PQ3CG$h2EW5aC=|$Zs?^J_3-}V#1vBN_;0-1-ob%^JVq(Z
zv|2akWV(oEGaw@Qr%H*ooaekK<CI-$X(<cU^W$&HJ+fh1O;D)tXEI`%TlGC<V-oGb
zpEyD!joI4T1FY7$N#Wu5ve->lt(!IHps9JfAMLYO4z0bv6Q#a1-RNpFp74ToEKns;
z{TyV+RC#9$SyUp}NU$#{j-4C5;>7m4h?Z{CAsS)F<apm7LDcGyo$l7;eDH2^i&j-W
zkE?ah(?9;ran+UNYk$V1$XJ3*k$}s3N9i8wawQ1ERRTdozu#~tO?BiB3ufHSCah7{
z-kyR;Q06RJv6!XA{5wpuoVFGF9frb<#`3;=_ognYcwEm}AfE)98f!nxgz4z19_fKV
z;l9o63s_P4QUd#?N$w?FFmoya{ZGZOEKObwra3J*H$v2BB<S~kYhQ2JOZdb0hCG_B
z&FTHXEiW<Oqc&spjCAf}!Rf#@%@inf$Qqw2LKiR13OkE-dN12dyFS%F_qru+TkfJ5
z>fr7<)6P<u*~}utrzhWzsQ&m#%q&{XfZJ-ZqOvl>(@GC-2U8nLifPo*i>>#OV~$Yp
zCrWWzTk0^E<Lz^CVmIv;w0kiNUb+1uX;{hd<FXcO{wxO9sS&!?#yYE+Hx<GbqKQ<d
zEKG$zP93x%vsRQgM=M>_ylZ+BPKb`dtFg_4i3|qpJ2$=90-FkFr;HPWZ}-N2e(%tC
zkU4Sxz`~4X7z*JogKTZ`TQL_t$o-g4@huIX1J6!U4-WTQJIziF(!7CsyibF^FOf}+
zOA~#lY|}&f)DDNW1OC|GO-2vT0P+#nju~?~k_l^JzL0`wVOLa7J#viJG7UlYuGGF3
zDp+M+pY9c;Bz@ZO;Hvs(8hxp%xkSMvN{n7;7xN_nNg_;_cm9GUv#zbT3i_$4NB8Mx
z2P{3>Z|w8&9z&-g(#VtHMn*+ZSxz|qs24}=A|fq}1M~FiHkpj@;0qgxepA)(;XF~!
zSD$fl)Fh$a>gqim{;<lBY-TW1ZLLPf$HodPD>ubWpDlf@%w1~UtjDVv5_v^q%TKi+
zQg}w)gNn;$rgKv+{o2<DS#Z*$&2~``YYnNAPu+{1KSaU4&Ff{^Ds$`MB_B0XmyhHV
zBaB?T&c)H$?sRF&N#i!>`Iw9Yq93$)nha;wJPtmYMf(ZYx!RqN8FT9k22NvFK{+4(
zUDuQTu|rnRm|`$!dQaU-Fr%Tv#(Sbt@>J+lmZM5|(_Pf?#uZb9Ri~c1+?p)5)ZP{2
z?@)y*dm8(z>4lNdv%Sd7qgFBfy>6W@{w*2doSAK+4z!tT$Dy#RnI9F%WwJ7!<(03j
z?q>xPH_@<RQ9b$^Fu~L8WW2Pf1hH*0T!=jostPLljdvNYT9lPVWwiZTl(}$P$S~(C
z=iNa*k9&rq^d61g{bqG(dkv8c)b5D@tHwNm7xX+dl7IVv+~8S(k%2+toj{E;QoG20
zu?K@1J)gy)*G932;vzRt7a7_M5EU-E%1y(v<jz2CW)>8fJ%m=<^IZO3ay64?h|E?m
zi#eb#BaTTSO~o5dB}r~rdX_I>tJCP9BbJv=&|6*&t9Q!v;7CMmdZhheA<JD4vH6@d
zwL5RWYOvz;H*3<cS<VLu6Y;z`Y@Pf<T1~zef{;poYNdL70EdhcYwJN4lg35}NpFTq
zwsL>+vCO{dC9=i`6~Y+{VwcS#hiq#Tb#KdcjOOOacY7*acr}mej=d|h53>$nX8rJ2
zu~bt?>l7-h4Z-hVOHvd`=U^tqa&PE$kF?vwG&%%h1t?Oh9FtR6{TBR~#(S9$YV5`V
z>h4E9a_lQNRZ-!>v}>|qJ!@J0qP$9q0-FdFCKcK`>)nj(IEmZCT5U~YP2>n+DpjU=
zxc(!}$3`YiIz4)u<IX42$c&@U8-x`T>kh?FbnEM}ygO1Yyu4a=a8e98hHANa=593y
zU0!1h{^{#`cR=?(Tfaw>6)O9UFc(z(g2@gW7NUEh*TmdZmus<^3F9|wZu94&m6dx7
zsZ5%ugt*nb5PTudjYyzWjg%UfVZ79F?X_kbQ-4Cmk`SI2SS!BUd7((TR`(%#Wfvn}
z%1`4Rj^Wh;3=<0`txb0aTZqV;LHs()oh+zL`N<RFkajvc(gW#d+9lKW$s->*ilAdL
zxhN4P^@+$>EX!{4IC&Zr<s>L&N$O?Rf6V^|Z0C6^W8+uFwbRqV97GBxQ&d?@bPA}0
zoft6>(BPNz>l+dzk+)}M%FhZIvC{T>;$|`*tZ4?ljZ!VDsCde4+F4#liDto;8|64Q
zgNQxkBgF@@Jw5STr8*o=MN4bzpzP;m{jZIbIxbR0n%r$ng)XRCmZ3MCz?JL4k*o|`
z`D+fWRgH)NyNjsXCoYpfSdEM*4Gj-lcdTk7rNCIi{x1&N3CvBnklIaUY-o~l2_+Sk
zg{5VmRx#CN)F&dB->=(XU)kP_&y9If^`MrQb7K!9O6|?MKpSKKcn56Hmq@u=dO9-P
zoUAMhAD?;m`DB{5_g4HFDa?8B?^~}oZmpZHg^sE!M+ajly2@7skL#V*UP+rgbX)BX
zqzD<d9tA?>zyC<Fu&}PHMYFhwap&)asWjY=8)j%qxq9+p+M?6e$_fPBwWitWS!{J(
zE&Sj14-?Szas2}WP~efKDfp6^i>6*AGUuIiUWt(6b18A{Gr?0vm^L;xO#LLc5IENN
z=kWL95jVdNb7ln(pM8QDk9?}HM_yivfc7as+K@qJhA{Y2xiM>Sozwk>{DGfpb6bPx
z=;)X(1{`$<-Z*$c+G#)tjGK!iDSUAjqaX{5kcI}ni2^B}y9Y01Ub{wJwZ}rC(J*{5
zB?&lu#ESm`0m1H%lz~-D4aML#Y8exl+ryswx6&=gx3}UHJf>DYJ_gFgxRe6!=?s`*
z(-wrhOKG&!)W2YE;WGHO2}i3vX4y5(@7tNtf9`IYkTgC9L0&;Y`D<$y;5U@0*wAGA
zWJO#>5;Y)7e|0d5TfrLXd$KOa!phq9aTW5}|L>nW&oV!3QX<Q4mXl|}r_cNm{hyhd
z`HG8*Lez4Er@nn-xO=QN9X(sfXC~0^^zxOG8Y5^-_4x7Gx(9~1CmI>D)U~YXSZ;*J
z<_6v{B3ZkZ1)e=qFf%ioO5pmCEazhSOsJAA`sYbDye^HMJb9ttFBqc^<8LpDpgFRg
zl@1w#h4bfe0(~S%K@+*6{a_xKINOx5j5qxplhq})R-&zI$fasCjz8U=+?Sw9&V;&%
zxuFrPZwzA$9zu-=jv&DtMh4S@Ha0dQZ?{yZAQ|d}c=IHxNcJE*1x~eTk>Ed_-DCAk
zy66ck9707d3*-HA|3_aVUq%qhAxzPXjTdauGDb#^j9Q!wVHa38FCcnRkg#a4_Q}ZJ
z-WT!;3f4GT_{+h^=-&1{m$!Y<40On%ml4?^M_5P6U97~oUuS2Bw#IWLY6`8#rXN1I
zS3<Im5gQlBCn)&CI#L4JO87+Fr!3=<0}Y1~HkKO*V{e{O%%=U_Q<Lu7j~`5dfr0sr
zuE4Yfp2~CsFBu*Y(Up9}bj-)|>_05MTqvo}^=_GWsdj}a&nge)gKxmn1D-Run5JCf
zb2|R4tNI8h%>2~<-&I;H394Xw_R^KCf<i(x3GyEnfO$&4D|*}Z_``<}Y|(u~agPFB
zb+|J&4i=i)x4B~6L~aX?0DK@*kTeKkH!ug#<P{Ta*U`o0w}+Wzfi3X)y)S|lgn$$q
ze$tg#2L|%$%F3UQb#WE+)dqN<BfAYaz1k`($Hu<!q=2#p@&Y~OgGR5zS7y}wyu8S>
zvrnwQ1}*uhsj2S)u%bmFu&mr0orZ|n!BJ#_2?`7Qwew}5_{7D>c6RI*;y#0^L_$Jh
zdXJKrFv2i(MJUGxMO5vB$L0kBeAzzDZ|`Va-~?F!8v0^!aZ%X;aqJ@z>%anfWpR;R
ze4k7WnZ}KI6N>{9?7+qw4YD7nzJN7k<#~=%w?MO0!@IjBHGb%jh5@(sTHHMi;Tg-^
zpZe<6tH?pieD;w|cfX#717dDCT-5(}^;{AB)2C0Q1m<#<&I5i!%B+Rfwt*@tDpLo~
zs6e;c%S1_<p1Qwrv2$=}ynd_56Y(m+U{|=%T0eB>Z(e5RF;mgj_O__+FQ&M-xB*MP
zzP0+5zd1k-LEi!6nE#j%;UlgNV8ToZ95T!2<bQ>Y2a<_Im|Y?7_WZttI<HTsUgE^a
zzo6{%4NXGCxNhe&`u>Ddmr($x`1^P0nEhhM+^5vu$d$b8CGu;*yF-KxJBE?fyj%SZ
zRV~p5L*UI}^PF<o+w=PX#qbZ9f#-cNXQ*IVJhj;D=sVZ3vT5I9ENTRt7w}R1s}|OT
z`mYASbM7aS^F`sB18AW>fvCF-GrPoII6;(n_Wp;bCkVXK5}m-3a|35|@o`MgWel0C
zzKY6y;7uE2Seo@aU%&^HiTXb)OE-OQ1>->SS5m^))zwKP5;3QRir?AUK{ukfKXi0F
zlGCzM(5i#gn*zCXua#dfemGmm(V)qO;Gg;L@9#f5Kj-7+MccEbNrTA=o&eZd3heAb
zQjMtmWYA}f@ifo9?$@u@<j$yygh<mN!wDW4w7Sq_7`x+*SS5Risj;LyUDSm$14Kj^
z5hcqY`$22A#z+D1Ff}!`mh+tJfW!I=K)Y7w+um;P^M~ydaK!%uJ|;+g#FEu$P6n#^
zT`AdY#GBJsao?)T%7&Xw`6A}A^&wKbhlgFXm(u_g)v(q142sZ$R?4ofM<&S0BqmyP
zHXIMXe|K=~S=qSAOLch@6=i7z<*_wd*44GH%1}$A+#k>9Y-b7syDyOZ^C+sT*IY9i
zk)>Mt#ojIDRikLsqeqV<;?glC@jJc1X$m1chbvu6H*|y4FTbm!{*fhI5sX{H<9O}8
zoxQ#FQI0x~@kU7@p=PTY_STEpsi`%wpS*eMr{7d~e5valkZi}q$7$a?yyu)<mA*eb
z{*uI~g-`P72xpmq>k$~?^?^74rdPDMMb!nLu&~W@C)Ce7Az|V6d(Ed;;$X6MUTx((
zdDRVliKIZ(9WFEtFYU}xOMfT+7ipi3_^1_ezWLwG)Ku^9!=<P}%lHNnzD8dwtAU1C
zGKM5v8XB5fXDxWz)RdNK@SW%6Yh1M*EJ>o<!+Z&U2T84FX*H7LK?<`67|#)Zp$EM<
zIi7dd=balgM{W;#DCq@Ezy74DHEbI4LWExBFDw|E23=XBI$56ZK>`ST*01;L>aMPs
zgp~eajyG7?_7`tPHJjw25KMr6hOW=|CF1-5uQX`HPbaIceI_V4A20NYy<ptN7tAH_
zMWRaq)-U9JWPwTW-TCV84}HpoHn^94_j#a*JkpQfUBo%t_QPvyxobbK<13U&cjCO3
za^lW-?f$EVxqQ5cY@;|;Z#YC65g#AVyhhDxmn{#9UYl1DRh>>`+@EuTXUphSO&3~C
zPe}K1-~C5V726ZAGOi811*tcqIcf{5s;VNH8kfe#RHxd%s>i6kdZ9&1{pitoMWGFB
zagd~_{@uP~UDpsuq6KwU_bwgL9M6{BUaFl{>xLmFrTzvG&&$17JRDH4#|gV!0TpQX
z=g$^ZVaE2!+)~|%u`$vLQz{sBgjdugNEkq&Os%KsK}mi0#_&EV$jgg(?xog+GLWA*
z<7=N>J#y`A;5;gO%*laS5d7zgfK>5<k4e7LM-I>(R619+S<gyC#tTqmZEd-fG64k6
z%bUqK6k27KtXavyl{R`<)6kG)C+MKm4Xy>UT8-bt_UQvcLig*lU3Up<jt3aQn75m8
z&sOY?e(K|*WRQSt{KY>u3o&vVxiG?CKM^r%b=gc-;eJEFe!skO^z2L!SWVVqx&o1w
zQDYZ5ndj@7Bk77v(f>6l#?CJ<AM8*@Z3Actvit7-{^?>UL+FEJrsK^Vm-gL)yV_+!
zGDh@Tf5dB~2{IU~wst@uJ3D*6-ID{b>~8}CGFJcP=H)R18>dp1HN%H4kB<9YlI5{=
zXD3*R(<4{^%F7eZ_%I?o{GXnv=wfrZR6uJWY(ebOXmM$zH$?Jc`K<)f74r9?Tf#s(
zqS<k-(f8B_6q0}}#Z*-mAddc{A!OXGW-3a-7d|o)rD`yU{rS^HWBNr+e#YcB6&2MQ
zsKCrMCX693(7~8yU0{l#%vi=C-4Bo3w(~o3Wiq~UT^{I4_h$ASG@?GAeN!p9NBjjq
z-fz30W6}ZK1<K*|>(?r}^=a(F5mvFk3k<KLq@r+9pPHM22C;W?N=;to=lcRY0_Y=f
z!HV~O>R7ALKR>o|T>nHBkY%VLZ3_au2##+^bMKoe%z^CK-rhc6ZxQ<E!&R6uw}M!n
zspYD5lOYQWOJ-&!U7os8@>e$IxcW!MWKptqj*cHd(qp4)DP{wecBvw(u_vy<7@$l$
zyGX#`C+{;Vt>YdqbopQ8pM7Xd#=AUdniR&kz_@^Pb8-=b8+36gEhz~DJ@;*S+4$T0
zH_vmF6It`rm;6$OF8G9m27zV=e#eYT#Y&AoLx_auNdh47s{a1|Q-x5D2>A#11^)C}
z1yPjoUj^j<)7SYD``(-n@kiXd@oraEy8Kbmnf@$jfk|<akLIg)m~Kj<L=k<6uYl%)
zp<rikKP4eo*OC`Y50U{_KZm@52}wggF#cOxThZYgj<4vMtLC96vB?vaE>(AmOfsD0
z(>)z?UW;j2`T1MRZEyW5U(qIE|9N(NW#rOk{W%q1{NZtyZN5ELK9;1xXg_qoj|~)6
zK|w*{m_Z<Qw7*TLND_t^bGLq!ntPhb>3@)B&VLhKOdKa)Qiks%TA*HbuB7**NubRF
z^HK+$;L^59uCcC{jnI&~JF`aenRm?1;sNw6_WZfMt1Bxk>g(69(hNy%2aH@{ZV;f2
z10;{`FN_VR%|CmB1EeILNSSb3UMu^DN_JpwKq)0V_q;&_W4d&n&l;^JcD;!Hf02cd
zTFBGn6U)HOi3xRB6m-f?_lOL`_nl~(fGNptla=2CcCPW;dElVi{Vsk5T1~vPpqxh{
zF+xK_nbn>*BL(aK&KkK&FzC#uAv7e;|8qebAvX7-yl}&0s*PIXfB*K9DN5|t?)om$
z>CRlZGeXQWwOr-^@6P{CCP)96kR(ptM8WNOUMok+h}A#wcXxNk$(h<kmw_Mfvt`NU
z=5_14cxb?0MOhHdC5QOXxtN&PzZI$f&tgr+-+330JTQa(&V$n#q*nYFB=m)Ci}pD|
z<+-xz#sx_4XfVlw%C}iV625yaIk))6IrsFYXh^n^UkZpP@=(Wp`~F=Gs2`vf<7o~W
zc_YN2@3VzqlWbg_iV|7;{1@C5KyHG<tSEt+7<e06%m%3O*OiqCke$jj3Ty(5#g0Bu
zwd$bfxmqTh9M3@LD+<zgC~Y7KzjX|QarSXeGAS)UW-!_y*F>~c^oja*rx<?FVTMt}
zaV~(j)|ZvK_H2o&ETVze9-^?5*(KMWJF2St>CoHR)^1O-V;!avGjM}P0o%{dXC&`5
zn{4{B;7(7^4SR_u^;?$R4`NDQRQtt^Hd71_5BuJo&#5##<iXHic{5C-Lg`fYE|^5=
zS942?JE(R%hCajbQ1u^fzs$SJDS0ZtsIj-x%u&A($a=8rk!{Xf9`Qz5D0FPK=);H5
zi=MxCxzD}h1#BmLPO^E5cymq?#wa)eWX=8$AB&5N%lPfMQ2Ihdb&vrE43D+%aUI8;
zS8CX5^3?94J4`p$S+LTUo(!cm0%{|QyCW7%I`w?<U2F2yn`(7#t=`q!t!HF(cp?*(
z@v;m7Xe`=#wZKjCR@C<CH5)0_%&REr=9G_TGSaOZujtEhHzLt3)qBm)d2CLU#GaB!
z17xydsJjOH$9(0Dzu?qcqsT2AGOJ#NwJI{`RyRns7$1!rXgs~}ZEJbV<k7D8Q=<5<
z7%}e7_dvage6s3^h<=NeyPw{tAQOI@o3r&Tz&s=^wICgbw=ke>TC)pzXS5P0cZW&m
z<aP?R6SY=17ZW!ZW41On-F?P}860;22VHZ^G~jF*uulraiPrwY9sK*i5cP}2X($d6
z6ZUxO>(|06(^gtjI9$6TwWRVK@?6PLza@9ur)^7K<h1P-LwPA#cqu?cGDXBEKFjXp
zMP#wt{cF5Mnu<1lNE>v=5Q!elEyjq;5*C*gpvPlrVbMEl^s6$cE3uyRbF*AHLT|gW
zraiAVDzK=iZ|yj_AxiI@YLX*bh6$ELh0*ceh*?Rx>S=;rv9E>23!;ikvI?G=t(2O%
z{c}I&5|cJ3VHN(Y{}ebzvIU}UI+$uPFdn%4+Y2CTIRf({H|VQLc0wvLtvg(7o?a!}
zI*llbNk#6!uSfGQUcz${GI9znxekVg<cC*{ay6J>{72Jy2)(c|H^xG{OjW9~;LHbY
z)l79xhK8w*6r=e@+)sCPXFH`NB-D(ImS8EU2O~`A38=WojwZ?1O}&^Tgcm&}6{Nk0
zG-r}Xh{q^{qQcIzJG*jGWx<$xoBBB^y(onTjhILIF1k1L8lq%_$42%JEQ;3>k=(Vq
zxG@@*I7za8X<6ED*2ZOfYgVFUcW#uOU|mYgX(@2rD8j~27<<S1Wa~F$R>$lpycP9A
zR?11H!*O#y5#{UTInIW8NcTFOt1lm+s4Q*BI<QZ)H?wsb8fyyoDw%1VX>(Xg;Gcf<
zu9t4j&47heXMk@KrWxz^R1O<eZp8D^{f6XA>ghY}k!_E09wAPhQeD_6E=j|WNLkkm
z3Cspu(rgP;^8TN4^Fn@YPTiXx@>Zi)YSLA2O%ukq4;I;;AFwAWeo=kLvz}>-m#N6~
zSb^#OXSIlG?3_u0v`=_l`DWY|cG!jy{7({4sT}K>l0i57W`F%KqOg0%`|AY9{lc_f
zNOz38glWGeG-)6WpN=jKay8B0*7Fiwa=!47<jO#C*(Y#X9Y}W+`LdjGx)bm!O4sl{
zKzaVEcz}xgaa!zBR#rx{p|o`xq@=(j^?vT=HaRvZ_dXO7n~<Qg$;0>Z2kPxRRgd?O
zVPVL2p#io^gn4y3i$Gs_(04_)QM>G+`FYA5VdrEP*@}Uu6hWUR?_V8Epz;MQgMzy4
zEHDg#1D{)FfATtH5c(gJd@sTicSx1LX`Jq5A20-~_c(R&O&9g>uX1bCWP~|@29cMS
z|9qzHiic<Q_+f)zsBA|I#wun4jF%LD;T}^QQM0>ru41`8H86N!HSQ^nZQB~f$!Ocp
zIa&eonBAz>F2xsA3bJE5=>}6~+u2$Wzu$-&H0gWcr2vQ}+^>niV!5ul_Otd82b}*p
z%z(4Btms%-nhGeGtSDs_yvX;^R4Vrm_P_b0UsEv_m6nxh!Dpr-o5jrH@)O<n%CS#n
zs*8CA1U9lUS8x|JRT+{Jvyi6Q&{U5mi5k@s`|Ky3XI~2pbQPL454SU-4LFAY%VHJc
zB$>fDYCvKj=emD4+aS-6=wz7GbLN=4f!O%6>E3=;RaRq4ztU_(t|?$;nVq}=c}^j!
zPY0G~a;!~1t8SX&iAYH$l-lR_L#o(lz$z&mo>fqA;ZZQ=y8j~4DZJHB=A$Jdjjm9U
zkg;k-UrX{m3rTR0;g{Q%WEe5IC<R3HhUf=Q@u&<O9(e9cL|`VDMZCxYShI4;$G^Ay
z@sV!sOg@@Sm?oiLU3L%S;!?vh8`~=1WzfoG`e^m@_ta3PGly`Yd+(9bQ%dC#7eU7C
zmG!lJBe~&G6{%uYc>-&AHx5{%rNh50b#QN7;dk6p?-|#bhjTODguvM55gOtrvWc*8
z3&UPVADNHxT+ENYv5$sEwne8}o34krEGoN)8&8sGh(COwMM=Gp-LGG&UH7|ShwsfJ
z>jwP40B3uo0J*51jo|NZWXj9tt>-JWUnHmM;+~e~feLPInJ}Y&F_Pl%9<90x9nh11
zW_}+*S(pPobNCw-T)33l1HVjg6RB1a;E`b9w@C*#MW01!&PJNtI1QHcO38jL)hZ+R
zz=jZFT&N~IO_k*(d)lv>4=;Z3CS?^<Ny|W#+h@MP+-z**HMkjH>r@x>6Jx%H!%K8{
zzx<M(B}s3@v}W9NS@4G@k6399dxgO`>iV!PA(@qxOesopzZ$cNKZd2}60kkOB8_`+
zFH|loc8nNG%EakO)e27~d~4cub>)k4i!EjYR154hD4T#R%rwemmo|5#H7a)>+?%q4
z!(-gffuq}L+Q!D?X!AN_uLcWiT5xzl1Q2+Dm;tdx$TlAdKmt2oG1+qZTO(P2jOpSj
zz0B<F<e+-^OJKx7$pTfr44dq4Hyome!=MvFS5Rsn8ymZWIt=e$YjipVGCIo=3sY@c
zy?u8Nz}WEc@Q(zVRcczKf&8(=+w0jxyD#+D9u5^5$Sm4t4;>%#(j7S&IKO=P5<F;D
zBP$kCsdcDy+Wz|b8i2s3SN8$X2OC{t!q0GTEWwr|O|~DIwk~9Uq!XP30y=jB?<@HL
z5}jq}+yYKt8_N=C+`G0?oc?5r_Rdu<(S8cNj?~|)$t<vFFkPyaALah%)>peicS`$_
zCCUBQt<BB5n<@k+)$3f5u_Z$U_#FB8o*bi8N5Bxi-k+_>*R3zL&z0~`2X=%<D{ci1
zwtY=>0VmZHJCKR|KL-WS+|wgKkN>$O8XA+viJ0R7Sx&d{Y@zGG^{^;J1#hJFG_pI-
zJV?WmWP9w$$;~bCJ_R=?eJPzWONs>;my<zz;h^hG1JB|A*saI#pH+>ZUn#+y^0L8%
zmlyor_OC2pSKuQOz$}3Ybxiuf&rmS=c593(aIr)yn<|gk;+e7UW?HT2)`7N4mek?I
z3}fu-($DGp_i%7BZpn-FWuaxZwzi_cvgap{<ENyg_&r&Jt(<Hl6RVF=W`BN}Vc~Sm
z7PH}ljZGH7t^=?N2@BTb&$4oIQq}KZ;AZRNU(Y?c1gOXgMP5NBqx_D-{aWc&){mIR
zwnWt6&JLRtV2IJ5q75DJ{f(>r7N@3O7#ZcP(1YC+sNLx@&@)`;5;WI`tA7s7BG!F-
z3krF;k5_#wl%@r_jXxv7vW>m7^UP^H)kd()DAi2e%r-||r;MYcqf*tg5v0@pCEf;+
zRuzj3d)j)0)U8F*M*(@p*zKZY39uIi*jQCn)x>cdr4nua7)`M?e<bU`3$6B9p1@rd
zXQUK{e(LFaHxX5U6(oNsC`!?v<T6<Rgz|y*ZfEcD!ve5>YxQcv8<^Dkv;e)~K0S*5
z?a_gKWL?0XPQkb5`58a%2i=|wcZ852f4diyvPI|nt7?%-*cT;5>J0-R5OCQ~TWhGK
zop8A@88ie)h}K8b!$?-Y?r*!F3hvHaF`i4_?P?SV<QvOKBZg^%JMk{1kmErTG+&$e
zqU+-|N92{*TJrOstlX?z)W(x>l4O^jEIQVm{6g_8!PLQ(jBL0wss_-B+lbZ6vofhJ
zD|8VvCT92LAP+kd3%T8(z6&RZp8UEJ&r+4Y7>H$x9o{hZKWzR7U5<u(xOgQb#xJ@r
zx{9THG^;GR<0-|pi+n{z(H97uqwX6QmEr}MCOXFKcHIk|aAHWE4c6z*f(wZ6`sljX
zqd9z5Z&q5x+-9&$eK*O1&OXrYs^`;X?QDasRB6I*^09(0es&xM^;aZvU}8V<KWMms
z5Mk1C_Bj6}7LMe7_hE|d$am5o*!^keQFte|8iy)>L0;bGkC7Brb#)kim?mkMonSlD
zUsvoC6Z9YdpKaUBS$*HYqQybOuovVniBIcA%N3TKmYtp5*H)kz0ciwwn8Q?g%Uu-k
z@vNMj*Ir)fAlU>~xg+na(cU0J{%cd0U#ijw1=>JCjDrv6v@XAlUtrUR2g`lXGTF>b
z7z`45T-(kxL$2^1EIdmn)cLOZ9K2*3aLp|--wxamD7cE<9!isy4*3@VHy{&2bphdG
z*4M+1<V~WiV!Ku!&zTnTaWt>-75MFGWP-A3y8hfL)=zrOc}##lk~+<r{9LE#5ZZ`q
zH^7)64#W1+qT6_4?%5TW7Dnp!9<u9q)OE4)ZP<wl{RlJ8=SPx4c1R9e;>jGsx(T7b
z#_<ceszvvG&Ht#YwOUeyL-##GUi|jB-w|PiFvG6J=C0Vm(%0hV#`sHgDSSK@c=28T
zn#~GNHy2^^@3agoT3)BLM}HdesXFlj%$zR1d$0CzZ}(^9f$z`0zTEeTiJgNS^(D%_
zA?udGHtm)Ed~?(j{5hMTQVet4XQwFQ6(U&0g7^I!qr-&LaC&?!jMycjqn^KizLkmS
zVF)QmKNr75hmIqK(_wEpV1|<VZ2U<3blBm4SVZFJj($zN{|GP-kI|t-_nub&bfc=D
z{bXV}e^eaQc_Pk>Z*08GP5FCp7AMyi9fG4A-#Y`@%SSZ&9QWd2ktUxQBz+2zS>|`R
z{Iv9}AXFxnv+Hw-YJu0yQ*%N`_c)1TB$m+JrWW39@LjoH!-I?BEU;A>LrG3uwpPac
G-Twfpl}P*m

literal 0
HcmV?d00001

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
new file mode 100644
index 00000000000..c2130e08b5b
--- /dev/null
+++ b/apps/contacts/js/contacts.js
@@ -0,0 +1,1289 @@
+function ucwords (str) {
+	return (str + '').replace(/^([a-z])|\s+([a-z])/g, function ($1) {
+		return $1.toUpperCase();
+	});
+}
+
+String.prototype.strip_tags = function(){
+	tags = this;
+	stripped = tags.replace(/[\<\>]/gi, "");
+	return stripped;
+}
+
+
+Contacts={
+	UI:{
+		notImplemented:function() {
+			Contacts.UI.messageBox(t('contacts', 'Not implemented'), t('contacts', 'Sorry, this functionality has not been implemented yet'));
+		},
+		searchOSM:function(obj) {
+			var adr = Contacts.UI.propertyContainerFor(obj).find('.adr').val();
+			console.log('adr 1: ' + adr);
+			if(adr == undefined) {
+				Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', 'Couldn\'t get a valid address.'));
+				return;
+			}
+			// FIXME: I suck at regexp. /Tanghus
+			var adrarr = adr.split(';');
+			var adrstr = '';
+			if(adrarr[2].trim() != '') {
+				adrstr = adrstr + adrarr[2].trim() + ',';
+			}
+			if(adrarr[3].trim() != '') {
+				adrstr = adrstr + adrarr[3].trim() + ',';
+			}
+			if(adrarr[4].trim() != '') {
+				adrstr = adrstr + adrarr[4].trim() + ',';
+			}
+			if(adrarr[5].trim() != '') {
+				adrstr = adrstr + adrarr[5].trim() + ',';
+			}
+			if(adrarr[6].trim() != '') {
+				adrstr = adrstr + adrarr[6].trim();
+			}
+			console.log('adrstr: "' + adrstr + '"');
+			adrstr = encodeURIComponent(adrstr);
+			console.log('adrstr 2: ' + adrstr);
+			var uri = 'http://open.mapquestapi.com/nominatim/v1/search.php?q=' + adrstr + '&limit=10&addressdetails=1&zoom=';
+			console.log('uri: ' + uri);
+			var newWindow = window.open(uri,'_blank');
+			newWindow.focus();
+			//Contacts.UI.notImplemented();
+		},
+		mailTo:function(obj) {
+			var adr = Contacts.UI.propertyContainerFor($(obj)).find('input[type="email"]').val().trim();
+			if(adr == '') {
+				Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', 'Please enter an email address.'));
+				return;
+			}
+			window.location.href='mailto:' + adr;
+		},
+		propertyContainerFor:function(obj) {
+			return $(obj).parents('.propertycontainer').first();
+		},
+		checksumFor:function(obj) {
+			return $(obj).parents('.propertycontainer').first().data('checksum');
+		},
+		propertyTypeFor:function(obj) {
+			return $(obj).parents('.propertycontainer').first().data('element');
+		},
+		checkListFor:function(obj) {
+			var type = $(obj).parents('.propertycontainer').first().data('element');
+			console.log('checkListFor: ' + type);
+			switch (type) {
+				case 'EMAIL':
+					console.log('emails: '+$('#emaillist>li').length);
+					if($('#emaillist>li').length == 1) {
+						$('#emails').hide();
+					}
+					break;
+				case 'TEL':
+					console.log('phones: '+$('#phonelist>li').length);
+					if($('#phonelist>li').length == 1) {
+						$('#phones').hide();
+					}
+					break;
+				case 'ADR':
+					console.log('addresses: '+$('#addressdisplay>dl').length);
+					if($('#addressdisplay>dl').length == 1) {
+						$('#addresses').hide();
+					}
+					break;
+				case 'NICKNAME':
+				case 'ORG':
+				case 'BDAY':
+					break;
+			}
+		},
+		loading:function(obj, state) {
+			if(state) {
+				$(obj).addClass('loading');
+			} else {
+				$(obj).removeClass('loading');
+			}
+		},
+		showCardDAVUrl:function(username, bookname){
+			$('#carddav_url').val(totalurl + '/' + username + '/' + bookname);
+			$('#carddav_url').show();
+			$('#carddav_url_close').show();
+		},
+		messageBox:function(title, msg) {
+			//alert(msg);
+			if($('#messagebox').dialog('isOpen') == true){
+				// NOTE: Do we ever get here?
+				$('#messagebox').dialog('moveToTop');
+			}else{
+				$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'messagebox.php'), function(){
+					$('#messagebox').dialog(
+						{
+							autoOpen: true,
+							title: title,
+							buttons: [{
+										text: "Ok",
+										click: function() { $(this).dialog("close"); }
+									}],
+							close: function(event, ui) {
+								$(this).dialog('destroy').remove();
+							},
+							open: function(event, ui) {
+								$('#messagebox_msg').html(msg);
+							}
+					});
+				});
+			}
+		},
+		loadListHandlers:function() {
+			//$('.add,.delete').hide();
+			$('.globe,.mail,.delete,.edit').tipsy();
+			$('.addresscard,.propertylist li,.propertycontainer').hover(
+				function () {
+					$(this).find('.globe,.mail,.delete,.edit').fadeIn(100);
+				}, 
+				function () {
+					$(this).find('.globe,.mail,.delete,.edit').fadeOut(100);
+				}
+			);
+		},
+		loadHandlers:function() {
+			console.log('loadHandlers');
+			/*
+			$('.formfloat').hover(
+				function () {
+					$(this).find('.add').fadeIn(500);
+				}, 
+				function () {
+					$(this).find('.add').fadeOut(500);
+				}
+			);*/
+			$('#contacts_deletecard').tipsy({gravity: 'ne'});
+			$('#contacts_downloadcard').tipsy({gravity: 'ne'});
+			$('.button').tipsy();
+			$('#fn').jec();
+			$('.jecEditableOption').attr('title', t('contacts','Custom'));
+			$('#fn').tipsy();
+			$('#contacts_details_photo_wrapper').tipsy();
+			$('#bday').datepicker({
+						dateFormat : 'dd-mm-yy'
+			});
+			// Style phone types
+			$('#phonelist').find('select[class*="contacts_property"]').multiselect({
+													noneSelectedText: t('contacts', 'Select type'),
+													header: false,
+													selectedList: 4,
+													classes: 'typelist'
+												});
+			$('#add_email').click(function(){
+				Contacts.UI.Card.addMail();
+			});
+			$('#add_phone').click(function(){
+				Contacts.UI.Card.addPhone();
+			});
+// 			$('#add_address').click(function(){
+// 				Contacts.UI.Card.editAddress();
+// 				return false;
+// 			});
+			$('#n').click(function(){
+				Contacts.UI.Card.editName();
+				//return false;
+			});
+			$('#edit_name').click(function(){
+				Contacts.UI.Card.editName();
+				return false;
+			});
+			
+			/* Initialize the photo edit dialog */
+			$('#edit_photo_dialog').dialog({ autoOpen: false, modal: true, height: 'auto', width: 'auto' });
+			$('#edit_photo_dialog' ).dialog( 'option', 'buttons', [
+				{
+					text: "Ok",
+					click: function() { 
+						Contacts.UI.Card.savePhoto(this);
+						$(this).dialog('close');
+					}
+				},
+				{
+					text: "Cancel",
+					click: function() { $(this).dialog('close'); }
+				}
+			] );
+			Contacts.UI.loadListHandlers();
+		},
+		Card:{
+			id:'',
+			fn:'',
+			fullname:'',
+			shortname:'',
+			famname:'',
+			givname:'',
+			addname:'',
+			honpre:'',
+			honsuf:'',
+			data:undefined,
+			export:function() {
+				document.location.href = OC.linkTo('contacts', 'export.php') + '?contactid=' + this.id;
+				//$.get(OC.linkTo('contacts', 'export.php'),{'contactid':this.id},function(jsondata){
+				//});
+			},
+			delete:function() {
+				$('#contacts_deletecard').tipsy('hide');
+				$.getJSON('ajax/deletecard.php',{'id':this.id},function(jsondata){
+					if(jsondata.status == 'success'){
+						$('#leftcontent [data-id="'+jsondata.data.id+'"]').remove();
+						$('#rightcontent').data('id','');
+						//$('#rightcontent').empty();
+						this.id = this.fn = this.fullname = this.shortname = this.famname = this.givname = this.addname = this.honpre = this.honsuf = '';
+						this.data = undefined;
+						// Load empty page.
+						var firstid = $('#contacts li:first-child').data('id');
+						console.log('trying to load: ' + firstid);
+						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':firstid},function(jsondata){
+							if(jsondata.status == 'success'){
+								Contacts.UI.Card.loadContact(jsondata.data);
+							}
+							else{
+								Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+							}
+						});
+					}
+					else{
+						Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+						//alert(jsondata.data.message);
+					}
+				});
+				return false;
+			},
+			loadContact:function(jsondata){
+				this.data = jsondata;
+				this.id = this.data.id;
+				console.log('loaded: ' + this.data.FN[0]['value']);
+				this.populateNameFields();
+				this.loadPhoto();
+				this.loadMails();
+				this.loadPhones();
+				this.loadAddresses();
+				this.loadSingleProperties();
+			},
+			loadSingleProperties:function() {
+				var props = ['BDAY', 'NICKNAME', 'ORG'];
+				// Clear all elements
+				$('#ident .propertycontainer[class*="propertycontainer"]').each(function(){
+					if(props.indexOf($(this).data('element')) > -1) {
+// 						$('#contacts_propertymenu a[data-type="'+$(this).data('element')+'"]').parent().show();
+						//console.log($(this).html());
+						$(this).data('checksum', '');
+						$(this).find('input').val('');
+						$(this).hide();
+						$(this).prev().hide();
+					}
+				});
+				for(var prop in props) {
+					//console.log('loadSingleProperties: ' + props[prop] + ': ' + this.data[props[prop]]);
+					if(this.data[props[prop]] != undefined) {
+						$('#contacts_propertymenu a[data-type="'+props[prop]+'"]').parent().hide();
+						var property = this.data[props[prop]][0];
+						var value = property['value'], checksum = property['checksum'];
+						//console.log('value: ' + property['value']);
+						//console.log('checksum: ' + property['checksum']);
+						switch(props[prop]) {
+							case 'BDAY':
+								var val = $.datepicker.parseDate('yy-mm-dd', value.substring(0, 10));
+								//console.log('Date: ' + val);
+								value = $.datepicker.formatDate('dd-mm-yy', val);
+								//console.log('Date: ' + value);
+								$('#contact_identity').find('#bday').val(value);
+								$('#contact_identity').find('#bday_value').data('checksum', checksum);
+								$('#contact_identity').find('#bday_label').show();
+								$('#contact_identity').find('#bday_value').show();
+								break;
+							case 'NICKNAME':
+								//console.log('NICKNAME: ' + value);
+								$('#contact_identity').find('#nickname').val(value);
+								$('#contact_identity').find('#nickname_value').data('checksum', checksum);
+								$('#contact_identity').find('#nickname_label').show();
+								$('#contact_identity').find('#nickname_value').show();
+								break;
+							case 'ORG':
+								//console.log('ORG: ' + value);
+								$('#contact_identity').find('#org').val(value);
+								$('#contact_identity').find('#org_value').data('checksum', checksum);
+								$('#contact_identity').find('#org_label').show();
+								$('#contact_identity').find('#org_value').show();
+								break;
+						}
+					}
+				}
+			},
+			populateNameFields:function() {
+				this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = ''
+				var full = '';
+				var narray = undefined;
+				//console.log('splitting: ' + this.data.N[0]['value']);
+				this.fn = this.data.FN[0]['value'];
+				//console.log('FN: ' + this.fn)
+				if(this.data.N == undefined) {
+					narray = [this.fn,'','','','']; // Checking for non-existing 'N' property :-P
+					full = this.fn;
+				} else {
+					narray = this.data.N[0]['value'];
+				}
+				this.famname = narray[0];
+				//console.log('famname: ' + this.famname)
+				this.givname = narray[1];
+				this.addname = narray[2];
+				this.honpre = narray[3];
+				this.honsuf = narray[4];
+				if(this.honpre.length > 0) {
+					this.fullname += this.honpre + ' ';
+				}
+				if(this.givname.length > 0) {
+					this.fullname += ' ' + this.givname;
+				}
+				if(this.addname.length > 0) {
+					this.fullname += ' ' + this.addname;
+				}
+				if(this.famname.length > 0) {
+					this.fullname += ' ' + this.famname;
+				}
+				if(this.honsuf.length > 0) {
+					this.fullname += ', ' + this.honsuf;
+				}
+				//console.log('fullname: ' + this.fullname)
+				$('#n').html(this.fullname);
+				$('.jecEditableOption').attr('title', 'Custom');
+				$('.jecEditableOption').text(this.fn);
+				//$('.jecEditableOption').attr('value', 0);
+				$('#fn').val(0);
+				$('#full').text(this.fullname);
+				$('#short').text(this.givname + ' ' + this.famname);
+				$('#reverse').text(this.famname + ' ' + this.givname);
+				$('#reverse_comma').text(this.famname + ', ' + this.givname);
+				$('#contact_identity').find('*[data-element="N"]').data('checksum', this.data.N[0]['checksum']);
+				$('#contact_identity').find('*[data-element="FN"]').data('checksum', this.data.FN[0]['checksum']);
+			},
+			editNew:function(){ // add a new contact
+				//Contacts.UI.notImplemented();
+				//return false;
+				
+				$.getJSON('ajax/newcontact.php',{},function(jsondata){
+					if(jsondata.status == 'success'){
+						id = '';
+						$('#rightcontent').data('id','');
+						$('#rightcontent').html(jsondata.data.page);
+						console.log('Trying to open name edit dialog');
+						Contacts.UI.Card.editName();
+					}
+					else{
+						Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+						alert(jsondata.data.message);
+					}
+				});
+			},
+			add:function(n, fn, aid){ // add a new contact
+				//Contacts.UI.notImplemented();
+				//return false;
+				console.log('Add contact: ' + n + ', ' + fn + ' ' + aid);
+				$.post(OC.filePath('contacts', 'ajax', 'addcontact.php'), { n: n, fn: fn, aid: aid },
+				  function(jsondata) {
+					/*
+					 * Arguments:
+					 * jsondata.status
+					 * jsondata.data.id
+					 */
+					if (jsondata.status == 'success'){
+						$('#rightcontent').data('id',jsondata.data.id);
+						id = jsondata.data.id;
+						$('#contact_identity').show();
+						$('#actionbar').show();
+						// TODO: Add to contacts list.
+					}
+					else{
+						Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+						//alert(jsondata.data.message);
+					}
+				});
+			},
+			saveProperty:function(obj){
+				// I couldn't get the selector to filter on 'contacts_property' so I filter by hand here :-/
+				if(!$(obj).hasClass('contacts_property')) {
+					//console.log('Filtering out object.' + obj);
+					return false;
+				}
+				console.log('saveProperty. ' + $(obj).val());
+				if($(obj).hasClass('nonempty') && $(obj).val().trim() == '') {
+					Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', 'This property has to be non-empty.'));
+					return false;
+				}
+				//Contacts.UI.loading(obj, false);
+				//return false;
+				container = $(obj).parents('.propertycontainer').first(); // get the parent holding the metadata.
+				Contacts.UI.loading(container, true);
+				//console.log('saveProperty. Container: ' + container.data('checksum'));
+				var checksum = container.data('checksum');
+				var name = container.data('element');
+				var q = container.find('input,select').serialize();
+				if(q == '' || q == undefined) {
+					console.log('Couldn\'t serialize elements.');
+					Contacts.UI.loading(container, false);
+					return false;
+				}
+				q = q + '&id=' + this.id + '&name=' + name;
+				if(checksum != undefined && checksum != '') { // save
+					q = q + '&checksum=' + checksum;
+					console.log('Saving: ' + q);
+					$.post('ajax/saveproperty.php',q,function(jsondata){
+						if(jsondata.status == 'success'){
+							container.data('checksum', jsondata.data.checksum);
+							Contacts.UI.loading(container, false);
+							return true;
+						}
+						else{
+							Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+							Contacts.UI.loading(container, false);
+							return false;
+						}
+					},'json');
+				} else { // add
+					console.log('Adding: ' + q);
+					$.post('ajax/addproperty.php',q,function(jsondata){
+						if(jsondata.status == 'success'){
+							container.data('checksum', jsondata.data.checksum);
+							Contacts.UI.loading(container, false);
+							return true;
+						}
+						else{
+							Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+							Contacts.UI.loading(container, false);
+							return false;
+						}
+					},'json');
+				}
+			},
+			addProperty:function(obj){
+				var type = $(obj).data('type');
+				console.log('addProperty:' + type);
+				switch (type) {
+					case 'PHOTO':
+						$('#contacts_propertymenu a[data-type="PHOTO"]').parent().hide();
+						$('#file_upload_form').show();
+						break;
+					case 'EMAIL':
+						//console.log('emails: '+$('#emaillist>li').length);
+						if($('#emaillist>li').length == 1) {
+							$('#emails').show();
+						}
+						Contacts.UI.Card.addMail();
+						break;
+					case 'TEL':
+						//console.log('phones: '+$('#phonelist>li').length);
+						if($('#phonelist>li').length == 1) {
+							$('#phones').show();
+						}
+						Contacts.UI.Card.addPhone();
+						break;
+					case 'ADR':
+						//console.log('addresses: '+$('#addressdisplay>dl').length);
+						if($('#addressdisplay>dl').length == 1) {
+							$('#addresses').show();
+						}
+						Contacts.UI.Card.editAddress('new', true);
+						break;
+					case 'NICKNAME':
+					case 'ORG':
+					case 'BDAY':
+						$('dl dt[data-element="'+type+'"],dd[data-element="'+type+'"]').show();
+						$('#contacts_propertymenu a[data-type="'+type+'"]').parent().hide();
+						break;
+				}
+			},
+			deleteProperty:function(obj, type){
+				//console.log('deleteProperty, id: ' + this.id);
+				Contacts.UI.loading(obj, true);
+				var checksum = Contacts.UI.checksumFor(obj);
+				//var checksum = $(obj).parent().data('checksum');
+				if(checksum != undefined) {
+					//alert('deleteProperty: ' + $(obj).val() + ' ' + checksum);
+					$.getJSON('ajax/deleteproperty.php',{'id': this.id, 'checksum': checksum },function(jsondata){
+						if(jsondata.status == 'success'){
+							if(type == 'list') {
+								Contacts.UI.propertyContainerFor(obj).remove();
+								Contacts.UI.checkListFor(obj);
+							} else if(type == 'single') {
+								var proptype = Contacts.UI.propertyTypeFor(obj);
+								console.log('deleteProperty, hiding: ' + proptype);
+								$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
+								$('#contacts_propertymenu a[data-type="'+proptype+'"]').parent().show();
+								Contacts.UI.loading(obj, false);
+							} else {
+								Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', '\'deleteProperty\' called without type argument. Please report at bugs.owncloud.org'));
+								Contacts.UI.loading(obj, false);
+							}
+						}
+						else{
+							Contacts.UI.loading(obj, false);
+							Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+						}
+					});
+				} else { // Property hasn't been saved so there's nothing to delete.
+					if(type == 'list') {
+						Contacts.UI.propertyContainerFor(obj).remove();
+						Contacts.UI.checkListFor(obj);
+					} else if(type == 'single') {
+						var proptype = Contacts.UI.propertyTypeFor(obj);
+						console.log('deleteProperty, hiding: ' + proptype);
+						$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
+						$('#contacts_propertymenu a[data-type="'+proptype+'"]').parent().show();
+						Contacts.UI.loading(obj, false);
+					} else {
+						Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', '\'deleteProperty\' called without type argument. Please report at bugs.owncloud.org'));
+					}
+				}
+			},
+			editName:function(){
+				console.log('editName, id: ' + this.id);
+				//console.log('editName');
+				/* Initialize the name edit dialog */
+				if($('#edit_name_dialog').dialog('isOpen') == true){
+					$('#edit_name_dialog').dialog('moveToTop');
+				}else{ // TODO: If id=='' call addcontact.php (or whatever name) instead and reload view with id.
+					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'editname.php')+'?id='+this.id, function(){
+						$('#edit_name_dialog' ).dialog({
+								modal: (this.id == '' && true || false),
+								closeOnEscape: (this.id == '' && false || true),
+								title:  (this.id == '' && t('contacts', 'Add contact') || t('contacts', 'Edit name')),
+								height: 'auto', width: 'auto',
+								buttons: {
+									'Ok':function() { 
+										Contacts.UI.Card.saveName(this);
+										$(this).dialog('destroy').remove();
+									},
+									'Cancel':function() { $(this).dialog('destroy').remove(); }
+								},
+								close : function(event, ui) {
+									//alert('close');
+									$(this).dialog('destroy').remove();
+									//return event;
+								}/*,
+								open : function(event, ui) {
+									// load 'N' property - maybe :-P
+								}*/
+						});
+					});
+				}
+			},
+			saveName:function(dlg){
+				console.log('saveName, id: ' + this.id);
+				// TODO: Check if new, get address book id and call Contacts.UI.Card.add()
+				var n = new Array($(dlg).find('#fam').val(),$(dlg).find('#giv').val(),$(dlg).find('#add').val(),$(dlg).find('#pre').val(),$(dlg).find('#suf').val());
+				this.famname = n[0];
+				this.givname = n[1];
+				this.addname = n[2];
+				this.honpre = n[3];
+				this.honsuf = n[4];
+				//alert('saveName: ' + n);
+				$('#n').val(n.join(';'));
+				/*$('#card > input').each(function(){
+						alert($(this).attr('id') + ' ' + $(this).val());
+				});*/
+				if(n[3].length > 0) {
+					this.fullname = n[3] + ' ';
+				}
+				this.fullname += n[1] + ' ' + n[2] + ' ' + n[0];
+				if(n[4].length > 0) {
+					this.fullname += ', ' + n[4];
+				}
+				$('#short').text(n[1] + ' ' + n[0]);
+				$('#full').text(this.fullname);
+				$('#reverse').text(n[0] + ' ' + n[1]);
+				$('#reverse_comma').text(n[0] + ', ' + n[1]);
+				//$('#n').html(full);
+				$('#fn').val(0);
+				if(this.id == '') {
+					var aid = $(dlg).find('#aid').val();
+					Contacts.UI.Card.add(n, $('#short').text(), aid);
+				} else {
+					Contacts.UI.Card.saveProperty($('#n'));
+				}
+			},
+			loadAddresses:function(){
+				$('#addresses').hide();
+				$('#addressdisplay dl[class*="propertycontainer"]').remove();
+				for(var adr in this.data.ADR) {
+					$('#addressdisplay dl').first().clone().insertAfter($('#addressdisplay dl').last()).show();
+					$('#addressdisplay dl').last().removeClass('template').addClass('propertycontainer');
+					$('#addressdisplay dl').last().data('checksum', this.data.ADR[adr]['checksum']);
+					var adrarray = this.data.ADR[adr]['value'];
+					var adrtxt = '';
+					if(adrarray[0].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[0].strip_tags() + '</li>';
+					}
+					if(adrarray[1].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[1].strip_tags() + '</li>';
+					}
+					if(adrarray[2].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[2].strip_tags() + '</li>';
+					}
+					if(adrarray[3].length > 0 || adrarray[5].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[5].strip_tags() + ' ' + adrarray[3].strip_tags() + '</li>';
+					}
+					if(adrarray[4].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[4].strip_tags() + '</li>';
+					}
+					if(adrarray[6].length > 0) {
+						adrtxt = adrtxt + '<li>' + adrarray[6].strip_tags() + '</li>';
+					}
+					$('#addressdisplay dl').last().find('.addresslist').html(adrtxt);
+					//console.log('ADR: ' + adr);
+					console.log('checksum: ' + this.data.ADR[adr]['checksum']);
+					//console.log('type: ' + jQuery.type(this.data.ADR[adr]['value']));
+					var types = new Array();
+					var ttypes = new Array();
+					for(var param in this.data.ADR[adr]['parameters']) {
+						//console.log('param: ' + param + ': ' + this.data.ADR[adr]['parameters'][param]);
+						if(param.toUpperCase() == 'TYPE') {
+							//console.log('param type: ' + jQuery.type(this.data.ADR[adr]['parameters'][param]));
+							types.push(t('contacts', ucwords(this.data.ADR[adr]['parameters'][param].toLowerCase())));
+							ttypes.push(this.data.ADR[adr]['parameters'][param]);
+							//for(ptype in this.data.ADR[adr]['parameters'][param]) {
+							//	var pt = this.data.ADR[adr]['parameters'][param][ptype];
+							//	// TODO: Create an array with types, translate, ucwords and join.
+							//}
+						}
+					}
+					//console.log('# types: ' + types.length);
+					//console.log('Types:' + types.join('/'));
+					$('#addressdisplay dl').last().find('.adr_type_label').text(types.join('/'));
+					$('#addressdisplay dl').last().find('.adr_type').val(ttypes.join(','));
+					$('#addressdisplay dl').last().find('.adr').val(adrarray.join(';'));
+					$('#addressdisplay dl').last().data('checksum', this.data.ADR[adr]['checksum']);
+				}
+				if($('#addressdisplay dl').length > 1) {
+					$('#addresses').show();
+				}
+				Contacts.UI.loadListHandlers();
+				return false;
+			},
+			editAddress:function(obj, isnew){
+				console.log('editAddress');
+				var container = undefined;
+				var q = q = '?id=' + this.id;
+				if(obj === 'new') {
+					isnew = true;
+					$('#addressdisplay dl').first().clone().insertAfter($('#addressdisplay dl').last()).show();
+					container = $('#addressdisplay dl').last();
+					container.removeClass('template').addClass('propertycontainer');
+					Contacts.UI.loadListHandlers();
+				} else {
+					q = q + '&checksum='+Contacts.UI.checksumFor(obj);
+				}
+				//console.log('editAddress: checksum ' + checksum);
+				/* Initialize the address edit dialog */
+				if($('#edit_address_dialog').dialog('isOpen') == true){
+					$('#edit_address_dialog').dialog('moveToTop');
+				}else{
+					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'editaddress.php')+q, function(){
+						$('#edit_address_dialog' ).dialog({
+								/*modal: true,*/
+								height: 'auto', width: 'auto',
+								buttons: {
+									'Ok':function() {
+										console.log('OK:isnew ' + isnew);
+										console.log('OK:obj ' + obj);
+										if(isnew) {
+											Contacts.UI.Card.saveAddress(this, $('#addressdisplay dl:last-child').find('input').first(), isnew);
+										} else {
+											Contacts.UI.Card.saveAddress(this, obj, isnew);
+										}
+										$(this).dialog('destroy').remove();
+									},
+									'Cancel':function() {
+										$(this).dialog('destroy').remove();
+										if(isnew) {
+											container.remove();
+										}
+									}
+								},
+								close : function(event, ui) {
+									//alert('close');
+									$(this).dialog('destroy').remove();
+									if(isnew) {
+										container.remove();
+									}
+								}/*,
+								open : function(event, ui) {
+									// load 'ADR' property - maybe :-P
+								}*/
+						});
+					});
+				}
+			},
+			saveAddress:function(dlg, obj, isnew){
+				if(isnew) {
+					container = $('#addressdisplay dl').last();
+					obj = $('#addressdisplay dl:last-child').find('input').first();
+				} else {
+					checksum = Contacts.UI.checksumFor(obj);
+					container = Contacts.UI.propertyContainerFor(obj);
+				}
+				var adr = new Array($(dlg).find('#adr_pobox').val(),$(dlg).find('#adr_extended').val(),$(dlg).find('#adr_street').val(),$(dlg).find('#adr_city').val(),$(dlg).find('#adr_region').val(),$(dlg).find('#adr_zipcode').val(),$(dlg).find('#adr_country').val());
+				$(container).find('.adr').val(adr.join(';'));
+				$(container).find('.adr_type').val($(dlg).find('#adr_type').val());
+				$(container).find('.adr_type_label').html(t('contacts',ucwords($(dlg).find('#adr_type').val().toLowerCase())));
+				Contacts.UI.Card.saveProperty($(container).find('input').first());
+				var adrtxt = '';
+				if(adr[0].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[0] + '</li>';
+				}
+				if(adr[1].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[1] + '</li>';
+				}
+				if(adr[2].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[2] + '</li>';
+				}
+				if(adr[3].length > 0 || adr[5].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[5] + ' ' + adr[3] + '</li>';
+				}
+				if(adr[4].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[4] + '</li>';
+				}
+				if(adr[6].length > 0) {
+					adrtxt = adrtxt + '<li>' + adr[6] + '</li>';
+				}
+				$(container).find('.addresslist').html(adrtxt);
+			},
+			uploadPhoto:function(filelist) {
+				if(!filelist) {
+					Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts','No files selected for upload.'));
+					return;
+				}
+				//var file = filelist.item(0);
+				var file = filelist[0];
+				var target = $('#file_upload_target');
+				var form = $('#file_upload_form');
+				var totalSize=0;
+				if(file.size > $('#max_upload').val()){
+					Contacts.UI.messageBox(t('Upload too large'), t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'));
+					return;
+				} else {
+					target.load(function(){
+						var response=jQuery.parseJSON(target.contents().text());
+						if(response != undefined && response.status == 'success'){
+							Contacts.UI.Card.editPhoto(response.data.id, response.data.tmp);
+							//alert('File: ' + file.tmp + ' ' + file.name + ' ' + file.mime);
+						}else{
+							Contacts.UI.messageBox(t('contacts', 'Error'), response.data.message);
+						}
+					});
+					form.submit();
+				}
+			},
+			loadPhoto:function(){
+				console.log('loadPhoto: ' + this.data.PHOTO);
+				if(this.data.PHOTO) {
+					$('#file_upload_form').show();
+					$('#contacts_propertymenu a[data-type="PHOTO"]').parent().hide();
+				} else {
+					$('#file_upload_form').hide();
+					$('#contacts_propertymenu a[data-type="PHOTO"]').parent().show();
+				}
+				$.getJSON('ajax/loadphoto.php',{'id':this.id},function(jsondata){
+					if(jsondata.status == 'success'){
+						//alert(jsondata.data.page);
+						$('#contacts_details_photo_wrapper').html(jsondata.data.page);
+					}
+					else{
+						Contacts.UI.messageBox(jsondata.data.message);
+					}
+				});
+			},
+			editPhoto:function(id, tmp_path){
+				//alert('editPhoto: ' + tmp_path);
+				$.getJSON('ajax/cropphoto.php',{'tmp_path':tmp_path,'id':this.id},function(jsondata){
+					if(jsondata.status == 'success'){
+						//alert(jsondata.data.page);
+						$('#edit_photo_dialog_img').html(jsondata.data.page);
+					}
+					else{
+						Contacts.UI.messageBox(jsondata.data.message);
+					}
+				});
+				if($('#edit_photo_dialog').dialog('isOpen') == true){
+					$('#edit_photo_dialog').dialog('moveToTop');
+				} else {
+					$('#edit_photo_dialog').dialog('open');
+				}
+			},
+			savePhoto:function(){
+				var target = $('#crop_target');
+				var form = $('#cropform');
+				form.submit();
+				target.load(function(){
+					var response=jQuery.parseJSON(target.contents().text());
+					if(response != undefined && response.status == 'success'){
+						// load cropped photo.
+						$('#contacts_details_photo_wrapper').html(response.data.page);
+					}else{
+						Contacts.UI.messageBox(t('contacts','Error'), response.data.message);
+					}
+				});
+				$('#contacts [data-id="'+this.id+'"]').find('a').css('background','url(thumbnail.php?id='+this.id+'&refresh=1'+Math.random()+') no-repeat');
+			},
+			addMail:function() {
+				//alert('addMail');
+				$('#emaillist li[class*="template"]:first-child').clone().appendTo($('#emaillist')).show();
+				$('#emaillist li[class*="template"]:last-child').removeClass('template').addClass('propertycontainer');
+				$('#emaillist li:last-child').find('input[type="email"]').focus();
+				Contacts.UI.loadListHandlers();
+				return false;
+			},
+			loadMails:function() {
+				$('#emails').hide();
+				$('#emaillist li[class*="propertycontainer"]').remove();
+				for(var mail in this.data.EMAIL) {
+					this.addMail();
+					//$('#emaillist li:first-child').clone().appendTo($('#emaillist')).show();
+					$('#emaillist li:last-child').data('checksum', this.data.EMAIL[mail]['checksum'])
+					$('#emaillist li:last-child').find('input[type="email"]').val(this.data.EMAIL[mail]['value']);
+					//console.log('EMAIL: ' + mail);
+					//console.log('value: ' + this.data.EMAIL[mail]['value']);
+					//console.log('checksum: ' + this.data.EMAIL[mail]['checksum']);
+					for(var param in this.data.EMAIL[mail]['parameters']) {
+						//console.log('param: ' + param + ': ' + this.data.EMAIL[mail]['parameters'][param]);
+						if(param.toUpperCase() == 'PREF') {
+							$('#emaillist li:last-child').find('input[type="checkbox"]').attr('checked', 'checked')
+						}
+					}
+					//console.log('parameters: ' + jQuery.type(this.data.EMAIL[mail]['parameters']));
+				}
+				if($('#emaillist li').length > 1) {
+					$('#emails').show();
+				}
+
+				$('#emaillist li:last-child').find('input[type="text"]').focus();
+				Contacts.UI.loadListHandlers();
+				return false;
+			},
+			addPhone:function() {
+				$('#phonelist li[class*="template"]:first-child').clone().appendTo($('#phonelist')); //.show();
+				$('#phonelist li[class*="template"]:last-child').find('select').addClass('contacts_property');
+				$('#phonelist li[class*="template"]:last-child').removeClass('template').addClass('propertycontainer');
+				$('#phonelist li:last-child').find('input[type="text"]').focus();
+				Contacts.UI.loadListHandlers();
+				$('#phonelist li:last-child').find('select').multiselect({
+														noneSelectedText: t('contacts', 'Select type'),
+														header: false,
+														selectedList: 4,
+														classes: 'typelist'
+													});
+				$('#phonelist li:last-child').show();
+				return false;
+			},
+			loadPhones:function() {
+				$('#phones').hide();
+				$('#phonelist li[class*="propertycontainer"]').remove();
+				for(var phone in this.data.TEL) {
+					this.addPhone();
+					$('#phonelist li:last-child').find('select').multiselect('destroy');
+					$('#phonelist li:last-child').data('checksum', this.data.TEL[phone]['checksum'])
+					$('#phonelist li:last-child').find('input[type="text"]').val(this.data.TEL[phone]['value']);
+					//console.log('TEL: ' + phone);
+					//console.log('value: ' + this.data.TEL[phone]['value']);
+					//console.log('checksum: ' + this.data.TEL[phone]['checksum']);
+					for(var param in this.data.TEL[phone]['parameters']) {
+						//console.log('param: ' + param + ': ' + this.data.TEL[phone]['parameters'][param]);
+						if(param.toUpperCase() == 'PREF') {
+							$('#phonelist li:last-child').find('input[type="checkbox"]').attr('checked', 'checked');
+						}
+						else if(param.toUpperCase() == 'TYPE') {
+							//console.log('param type: ' + jQuery.type(this.data.TEL[phone]['parameters'][param]));
+							for(ptype in this.data.TEL[phone]['parameters'][param]) {
+								var pt = this.data.TEL[phone]['parameters'][param][ptype];
+								$('#phonelist li:last-child').find('select option').each(function(){
+									//console.log('Test: ' + $(this).val().toUpperCase() + '==' + pt);
+									if ($(this).val().toUpperCase() == pt) {
+										//console.log('Selected: ' + pt);
+										$(this).attr('selected', 'selected');
+									}
+								});
+							}
+						}
+					}
+					$('#phonelist li:last-child').find('select').multiselect({
+														noneSelectedText: t('contacts', 'Select type'),
+														header: false,
+														selectedList: 4,
+														classes: 'typelist'
+													});
+					//console.log('parameters: ' + jQuery.type(this.data.EMAIL[mail]['parameters']));
+				}
+				if($('#phonelist li').length > 1) {
+					$('#phones').show();
+				}
+				return false;
+			},
+		},
+		Addressbooks:{
+			overview:function(){
+				if($('#chooseaddressbook_dialog').dialog('isOpen') == true){
+					$('#chooseaddressbook_dialog').dialog('moveToTop');
+				}else{
+					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(){
+						$('#chooseaddressbook_dialog').dialog({
+							width : 600,
+							close : function(event, ui) {
+								$(this).dialog('destroy').remove();
+							}
+						});
+					});
+				}
+			},
+			activation:function(checkbox, bookid)
+			{
+				$.post(OC.filePath('contacts', 'ajax', 'activation.php'), { bookid: bookid, active: checkbox.checked?1:0 },
+				  function(data) {
+					/*
+					 * Arguments:
+					 * data.status
+					 * data.bookid
+					 * data.active
+					 */
+					if (data.status == 'success'){
+						checkbox.checked = data.active == 1;
+						Contacts.UI.Contacts.update();
+					}
+				  });
+			},
+			newAddressbook:function(object){
+				var tr = $(document.createElement('tr'))
+					.load(OC.filePath('contacts', 'ajax', 'addbook.php'));
+				$(object).closest('tr').after(tr).hide();
+				/* TODO: Shouldn't there be some kinda error checking here? */
+			},
+			editAddressbook:function(object, bookid){
+				var tr = $(document.createElement('tr'))
+					.load(OC.filePath('contacts', 'ajax', 'editaddressbook.php') + "?bookid="+bookid);
+				$(object).closest('tr').after(tr).hide();
+			},
+			deleteAddressbook:function(bookid){
+				var check = confirm("Do you really want to delete this address book?");
+				if(check == false){
+					return false;
+				}else{
+					$.post(OC.filePath('contacts', 'ajax', 'deletebook.php'), { id: bookid},
+					  function(data) {
+						if (data.status == 'success'){
+							$('#chooseaddressbook_dialog').dialog('destroy').remove();
+							Contacts.UI.Contacts.update();
+							Contacts.UI.Addressbooks.overview();
+						} else {
+							Contacts.UI.messageBox(t('contacts', 'Error'), data.message);
+							//alert('Error: ' + data.message);
+						}
+					  });
+				}
+			},
+			import:function(){
+				Contacts.UI.notImplemented();
+			},
+			submit:function(button, bookid){
+				var displayname = $("#displayname_"+bookid).val();
+				var active = $("#edit_active_"+bookid+":checked").length;
+				var description = $("#description_"+bookid).val();
+
+				var url;
+				if (bookid == 'new'){
+					url = OC.filePath('contacts', 'ajax', 'createaddressbook.php');
+				}else{
+					url = OC.filePath('contacts', 'ajax', 'updateaddressbook.php');
+				}
+				$.post(url, { id: bookid, name: displayname, active: active, description: description },
+					function(data){
+						if(data.status == 'success'){
+							$(button).closest('tr').prev().html(data.page).show().next().remove();
+						}
+					});
+				Contacts.UI.Contacts.update();
+			},
+			cancel:function(button, bookid){
+				$(button).closest('tr').prev().show().next().remove();
+			}
+		},
+		Contacts:{
+			/**
+			 * Reload the contacts list.
+			 */
+			update:function(){
+				$.getJSON('ajax/contacts.php',{},function(jsondata){
+					if(jsondata.status == 'success'){
+						$('#contacts').html(jsondata.data.page);
+					}
+					else{
+						Contacts.UI.messageBox(t('contacts', 'Error'),jsondata.data.message);
+						//alert(jsondata.data.message);
+					}
+				});
+				setTimeout(Contacts.UI.Contacts.lazyupdate, 500);
+			},
+			/**
+			 * Add thumbnails to the contact list as they become visible in the viewport.
+			 */
+			lazyupdate:function(){
+				$('#contacts li').live('inview', function(){
+					if (!$(this).find('a').attr('style')) {
+						$(this).find('a').css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
+					}
+				});
+			}
+		}
+	}
+}
+$(document).ready(function(){
+
+	Contacts.UI.loadHandlers();
+
+	/**
+	 * Show the Addressbook chooser
+	 */
+	$('#chooseaddressbook').click(function(){
+		Contacts.UI.Addressbooks.overview();
+		return false;
+	});
+
+	/**
+	 * Open blank form to add new contact.
+	 * FIXME: Load the same page but only show name data and popup the name edit dialog. 
+	 * On save load the page again with an id and show all fields.
+	 * NOTE: Or: Load the full page and popup name dialog modal. On success set the newly aquired ID, on
+	 * Cancel or failure give appropriate message and show ... something else :-P
+	 */
+	$('#contacts_newcontact').click(function(){
+		Contacts.UI.Card.editNew();
+// 		$.getJSON('ajax/addcontact.php',{},function(jsondata){
+// 			if(jsondata.status == 'success'){
+// 				$('#rightcontent').data('id','');
+// 				$('#rightcontent').html(jsondata.data.page)
+// 					.find('select').chosen();
+// 			}
+// 			else{
+// 				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+// 				//alert(jsondata.data.message);
+// 			}
+// 		});
+// 		return false;
+	});
+	
+	/**
+	 * Load the details view for a contact.
+	 */
+	$('#leftcontent li').live('click',function(){
+		var id = $(this).data('id');
+		var oldid = $('#rightcontent').data('id');
+		if(oldid != 0){
+			$('#leftcontent li[data-id="'+oldid+'"]').removeClass('active');
+		}
+		$.getJSON('ajax/contactdetails.php',{'id':id},function(jsondata){
+			if(jsondata.status == 'success'){
+				Contacts.UI.Card.loadContact(jsondata.data);
+			}
+			else{
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+				//alert(jsondata.data.message);
+			}
+		});
+		// NOTE: Deprecated.
+// 		$.getJSON('ajax/getdetails.php',{'id':id, 'new':1},function(jsondata){
+// 			if(jsondata.status == 'success'){
+// 				$('#rightcontent').data('id',jsondata.data.id);
+// 				$('#rightcontent').html(jsondata.data.page);
+// 				$('#leftcontent li[data-id="'+jsondata.data.id+'"]').addClass('active');
+// 				//Contacts.UI.loadHandlers();
+// 			}
+// 			else{
+// 				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+// 				//alert(jsondata.data.message);
+// 			}
+// 		});
+		return false;
+	});
+
+	/**
+	 * Delete currently selected contact TODO: and clear page
+	 */
+	$('#contacts_deletecard').live('click',function(){
+		Contacts.UI.Card.delete();
+	});
+
+	/**
+	 * Add and insert a new contact into the list.
+	 */
+	$('#contacts_addcardform input[type="submit"]').live('click',function(){
+		$.post('ajax/addcontact.php',$('#contact_identity').serialize(),function(jsondata){
+			if(jsondata.status == 'success'){
+				$('#rightcontent').data('id',jsondata.data.id);
+				$('#rightcontent').html(jsondata.data.page);
+				$('#leftcontent .active').removeClass('active');
+				var item = '<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'"  style="background: url(thumbnail.php?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+jsondata.data.name+'</a></li>';
+				var added = false;
+				$('#leftcontent ul li').each(function(){
+					if ($(this).text().toLowerCase() > jsondata.data.name.toLowerCase()) {
+						$(this).before(item).fadeIn('fast');
+						added = true;
+						return false;
+					}
+				});
+				if(!added) {
+					$('#leftcontent ul').append(item);
+				}
+			}
+			else{
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+				//alert(jsondata.data.message);
+			}
+		}, 'json');
+		return false;
+	});
+	
+	$('#contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+		if (isInView) { //NOTE: I've kept all conditions for future reference ;-)
+			// element is now visible in the viewport
+			if (visiblePartY == 'top') {
+				// top part of element is visible
+			} else if (visiblePartY == 'bottom') {
+				// bottom part of element is visible
+			} else {
+				// whole part of element is visible
+				if (!$(this).find('a').attr('style')) {
+					//alert($(this).data('id') + ' has background: ' + $(this).attr('style'));
+					$(this).find('a').css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
+				}/* else {
+					alert($(this).data('id') + ' has style ' + $(this).attr('style').match('url'));
+				}*/
+			}
+		} else {
+			// element has gone out of viewport
+		}
+	});
+	
+	$('.button').tipsy();
+	// Triggers invisible file input
+	$('#contacts_details_photo').live('click', function() {
+		$('#file_upload_start').trigger('click');
+		return false;
+	});
+	
+	// NOTE: For some reason the selector doesn't work when I select by '.contacts_property' too...
+	// I do the filtering in the event handler instead.
+	$('input[type="text"],input[type="checkbox"],input[type="email"],input[type="tel"],input[type="date"], select').live('change', function(){
+		Contacts.UI.Card.saveProperty(this);
+	});
+
+	// Name has changed. Update it and reorder.
+	$('#fn').live('change',function(){
+		var name = $('#fn').val();
+		var item = $('#contacts [data-id="'+Contacts.UI.Card.id+'"]').clone();
+		$('#contacts [data-id="'+Contacts.UI.Card.id+'"]').remove();
+		$(item).find('a').html(name);
+		var added = false;
+		$('#contacts li').each(function(){
+			if ($(this).text().toLowerCase() > name.toLowerCase()) {
+				$(this).before(item).fadeIn('fast');
+				added = true;
+				return false;
+			}
+		});
+		if(!added) {
+			$('#leftcontent ul').append(item);
+		}
+	});
+
+	/**
+	 * Profile picture upload handling
+	 */
+	// New profile picture selected
+	$('#file_upload_start').live('change',function(){
+		Contacts.UI.Card.uploadPhoto(this.files);
+	});
+	$('#contacts_details_photo').bind('dragover',function(event){
+		console.log('dragover');
+		$(event.target).css('background-color','red');
+		event.stopPropagation();
+		event.preventDefault();  
+	});
+	$('#contacts_details_photo').bind('dragleave',function(event){
+		console.log('dragleave');
+		$(event.target).css('background-color','white');
+		//event.stopPropagation();
+		//event.preventDefault();  
+	});
+	$('#contacts_details_photo').bind('drop',function(event){
+		event.stopPropagation();
+		event.preventDefault();
+		console.log('drop');
+		$(event.target).css('background-color','white')
+		$.fileUpload(event.originalEvent.dataTransfer.files);
+	});
+
+	/**
+	 * Upload function for dropped files. Should go in the Contacts class/object.
+	 */
+	$.fileUpload = function(files){
+		var file = files[0];
+		console.log('size: '+file.size);
+		if(file.size > $('#max_upload').val()){
+			Contacts.UI.messageBox(t('contacts','Upload too large'), t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'));
+			return;
+		}
+		if (file.type.indexOf("image") != 0) {
+			Contacts.UI.messageBox(t('contacts','Wrong file type'), t('contacts','Only image files can be used as profile picture.'));
+			return;
+		}
+		var xhr = new XMLHttpRequest();
+
+		if (!xhr.upload) {
+			Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', 'Your browser doesn\'t support AJAX upload. Please click on the profile picture to select a photo to upload.'))
+		}
+		fileUpload = xhr.upload,
+		xhr.onreadystatechange = function() {
+			if (xhr.readyState == 4){
+				response = $.parseJSON(xhr.responseText);
+				if(response.status == 'success') {
+					if(xhr.status == 200) {
+						Contacts.UI.Card.editPhoto(response.data.id, response.data.tmp);
+					} else {
+						Contacts.UI.messageBox(t('contacts', 'Error'), xhr.status + ': ' + xhr.responseText);
+					}
+				} else {
+					//alert(xhr.responseText);
+					Contacts.UI.messageBox(t('contacts', 'Error'), response.data.message);
+				}
+				// stop loading indicator
+				//$('#contacts_details_photo_progress').hide();
+			}
+		};
+	
+		fileUpload.onprogress = function(e){
+			if (e.lengthComputable){
+				var _progress = Math.round((e.loaded * 100) / e.total);
+				if (_progress != 100){
+					$('#contacts_details_photo_progress').text(_progress + '%');
+					$('#contacts_details_photo_progress').val(_progress);
+				}
+			}
+		};
+		// Start loading indicator.
+		//$('#contacts_details_photo_progress').show()();
+		xhr.open("POST", 'ajax/uploadphoto.php?id='+Contacts.UI.Card.id+'&imagefile='+encodeURIComponent(file.name), true);
+		xhr.setRequestHeader('Cache-Control', 'no-cache');
+		xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+		xhr.setRequestHeader('X_FILE_NAME', encodeURIComponent(file.name));
+		//xhr.setRequestHeader("X_FILENAME", file.name);
+		xhr.setRequestHeader('X-File-Size', file.size);
+		xhr.setRequestHeader('Content-Type', file.type);
+		xhr.send(file);
+	}
+
+	$('#contacts_propertymenu a').live('click',function(){
+		Contacts.UI.Card.addProperty(this);
+	});
+
+	
+});
diff --git a/apps/contacts/js/jquery.Jcrop.js b/apps/contacts/js/jquery.Jcrop.js
new file mode 100644
index 00000000000..36f9a0f08f8
--- /dev/null
+++ b/apps/contacts/js/jquery.Jcrop.js
@@ -0,0 +1,1765 @@
+/**
+ * jquery.Jcrop.js v0.9.9 {{{
+ *
+ * jQuery Image Cropping Plugin - released under MIT License 
+ * Author: Kelly Hallman <khallman@gmail.com>
+ * http://github.com/tapmodo/Jcrop
+ *
+ * }}}
+ * Copyright (c) 2008-2012 Tapmodo Interactive LLC {{{
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * }}}
+ */
+
+(function ($) {
+
+  $.Jcrop = function (obj, opt) {
+    var options = $.extend({}, $.Jcrop.defaults),
+        docOffset, lastcurs, ie6mode = false;
+
+    // Internal Methods {{{
+    function px(n) {
+      return parseInt(n, 10) + 'px';
+    }
+    function cssClass(cl) {
+      return options.baseClass + '-' + cl;
+    }
+    function supportsColorFade() {
+      return $.fx.step.hasOwnProperty('backgroundColor');
+    }
+    function getPos(obj) //{{{
+    {
+      var pos = $(obj).offset();
+      return [pos.left, pos.top];
+    }
+    //}}}
+    function mouseAbs(e) //{{{
+    {
+      return [(e.pageX - docOffset[0]), (e.pageY - docOffset[1])];
+    }
+    //}}}
+    function setOptions(opt) //{{{
+    {
+      if (typeof(opt) !== 'object') opt = {};
+      options = $.extend(options, opt);
+
+      $.each(['onChange','onSelect','onRelease','onDblClick'],function(i,e) {
+        if (typeof(options[e]) !== 'function') options[e] = function () {};
+      });
+    }
+    //}}}
+    function startDragMode(mode, pos) //{{{
+    {
+      docOffset = getPos($img);
+      Tracker.setCursor(mode === 'move' ? mode : mode + '-resize');
+
+      if (mode === 'move') {
+        return Tracker.activateHandlers(createMover(pos), doneSelect);
+      }
+
+      var fc = Coords.getFixed();
+      var opp = oppLockCorner(mode);
+      var opc = Coords.getCorner(oppLockCorner(opp));
+
+      Coords.setPressed(Coords.getCorner(opp));
+      Coords.setCurrent(opc);
+
+      Tracker.activateHandlers(dragmodeHandler(mode, fc), doneSelect);
+    }
+    //}}}
+    function dragmodeHandler(mode, f) //{{{
+    {
+      return function (pos) {
+        if (!options.aspectRatio) {
+          switch (mode) {
+          case 'e':
+            pos[1] = f.y2;
+            break;
+          case 'w':
+            pos[1] = f.y2;
+            break;
+          case 'n':
+            pos[0] = f.x2;
+            break;
+          case 's':
+            pos[0] = f.x2;
+            break;
+          }
+        } else {
+          switch (mode) {
+          case 'e':
+            pos[1] = f.y + 1;
+            break;
+          case 'w':
+            pos[1] = f.y + 1;
+            break;
+          case 'n':
+            pos[0] = f.x + 1;
+            break;
+          case 's':
+            pos[0] = f.x + 1;
+            break;
+          }
+        }
+        Coords.setCurrent(pos);
+        Selection.update();
+      };
+    }
+    //}}}
+    function createMover(pos) //{{{
+    {
+      var lloc = pos;
+      KeyManager.watchKeys();
+
+      return function (pos) {
+        Coords.moveOffset([pos[0] - lloc[0], pos[1] - lloc[1]]);
+        lloc = pos;
+
+        Selection.update();
+      };
+    }
+    //}}}
+    function oppLockCorner(ord) //{{{
+    {
+      switch (ord) {
+      case 'n':
+        return 'sw';
+      case 's':
+        return 'nw';
+      case 'e':
+        return 'nw';
+      case 'w':
+        return 'ne';
+      case 'ne':
+        return 'sw';
+      case 'nw':
+        return 'se';
+      case 'se':
+        return 'nw';
+      case 'sw':
+        return 'ne';
+      }
+    }
+    //}}}
+    function createDragger(ord) //{{{
+    {
+      return function (e) {
+        if (options.disabled) {
+          return false;
+        }
+        if ((ord === 'move') && !options.allowMove) {
+          return false;
+        }
+        
+        // Fix position of crop area when dragged the very first time.
+        // Necessary when crop image is in a hidden element when page is loaded.
+        docOffset = getPos($img);
+
+        btndown = true;
+        startDragMode(ord, mouseAbs(e));
+        e.stopPropagation();
+        e.preventDefault();
+        return false;
+      };
+    }
+    //}}}
+    function presize($obj, w, h) //{{{
+    {
+      var nw = $obj.width(),
+          nh = $obj.height();
+      if ((nw > w) && w > 0) {
+        nw = w;
+        nh = (w / $obj.width()) * $obj.height();
+      }
+      if ((nh > h) && h > 0) {
+        nh = h;
+        nw = (h / $obj.height()) * $obj.width();
+      }
+      xscale = $obj.width() / nw;
+      yscale = $obj.height() / nh;
+      $obj.width(nw).height(nh);
+    }
+    //}}}
+    function unscale(c) //{{{
+    {
+      return {
+        x: parseInt(c.x * xscale, 10),
+        y: parseInt(c.y * yscale, 10),
+        x2: parseInt(c.x2 * xscale, 10),
+        y2: parseInt(c.y2 * yscale, 10),
+        w: parseInt(c.w * xscale, 10),
+        h: parseInt(c.h * yscale, 10)
+      };
+    }
+    //}}}
+    function doneSelect(pos) //{{{
+    {
+      var c = Coords.getFixed();
+      if ((c.w > options.minSelect[0]) && (c.h > options.minSelect[1])) {
+        Selection.enableHandles();
+        Selection.done();
+      } else {
+        Selection.release();
+      }
+      Tracker.setCursor(options.allowSelect ? 'crosshair' : 'default');
+    }
+    //}}}
+    function newSelection(e) //{{{
+    {
+      if (options.disabled) {
+        return false;
+      }
+      if (!options.allowSelect) {
+        return false;
+      }
+      btndown = true;
+      docOffset = getPos($img);
+      Selection.disableHandles();
+      Tracker.setCursor('crosshair');
+      var pos = mouseAbs(e);
+      Coords.setPressed(pos);
+      Selection.update();
+      Tracker.activateHandlers(selectDrag, doneSelect);
+      KeyManager.watchKeys();
+
+      e.stopPropagation();
+      e.preventDefault();
+      return false;
+    }
+    //}}}
+    function selectDrag(pos) //{{{
+    {
+      Coords.setCurrent(pos);
+      Selection.update();
+    }
+    //}}}
+    function newTracker() //{{{
+    {
+      var trk = $('<div></div>').addClass(cssClass('tracker'));
+      if ($.browser.msie) {
+        trk.css({
+          opacity: 0,
+          backgroundColor: 'white'
+        });
+      }
+      return trk;
+    }
+    //}}}
+
+    // }}}
+    // Initialization {{{
+    // Sanitize some options {{{
+    if ($.browser.msie && ($.browser.version.split('.')[0] === '6')) {
+      ie6mode = true;
+    }
+    if (typeof(obj) !== 'object') {
+      obj = $(obj)[0];
+    }
+    if (typeof(opt) !== 'object') {
+      opt = {};
+    }
+    // }}}
+    setOptions(opt);
+    // Initialize some jQuery objects {{{
+    // The values are SET on the image(s) for the interface
+    // If the original image has any of these set, they will be reset
+    // However, if you destroy() the Jcrop instance the original image's
+    // character in the DOM will be as you left it.
+    var img_css = {
+      border: 'none',
+      visibility: 'visible',
+      margin: 0,
+      padding: 0,
+      position: 'absolute',
+      top: 0,
+      left: 0
+    };
+
+    var $origimg = $(obj),
+      img_mode = true;
+
+    if (obj.tagName == 'IMG') {
+      // Fix size of crop image.
+      // Necessary when crop image is within a hidden element when page is loaded.
+      if ($origimg[0].width != 0 && $origimg[0].height != 0) {
+        // Obtain dimensions from contained img element.
+        $origimg.width($origimg[0].width);
+        $origimg.height($origimg[0].height);
+      } else {
+        // Obtain dimensions from temporary image in case the original is not loaded yet (e.g. IE 7.0). 
+        var tempImage = new Image();
+        tempImage.src = $origimg[0].src;
+        $origimg.width(tempImage.width);
+        $origimg.height(tempImage.height);
+      } 
+
+      var $img = $origimg.clone().removeAttr('id').css(img_css).show();
+
+      $img.width($origimg.width());
+      $img.height($origimg.height());
+      $origimg.after($img).hide();
+
+    } else {
+      $img = $origimg.css(img_css).show();
+      img_mode = false;
+      if (options.shade === null) { options.shade = true; }
+    }
+
+    presize($img, options.boxWidth, options.boxHeight);
+
+    var boundx = $img.width(),
+        boundy = $img.height(),
+        
+        
+        $div = $('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({
+        position: 'relative',
+        backgroundColor: options.bgColor
+      }).insertAfter($origimg).append($img);
+
+    if (options.addClass) {
+      $div.addClass(options.addClass);
+    }
+
+    var $img2 = $('<div />'),
+
+        $img_holder = $('<div />') 
+        .width('100%').height('100%').css({
+          zIndex: 310,
+          position: 'absolute',
+          overflow: 'hidden'
+        }),
+
+        $hdl_holder = $('<div />') 
+        .width('100%').height('100%').css('zIndex', 320), 
+
+        $sel = $('<div />') 
+        .css({
+          position: 'absolute',
+          zIndex: 600
+        }).dblclick(function(){
+          var c = Coords.getFixed();
+          options.onDblClick.call(api,c);
+        }).insertBefore($img).append($img_holder, $hdl_holder); 
+
+    if (img_mode) {
+
+      $img2 = $('<img />')
+          .attr('src', $img.attr('src')).css(img_css).width(boundx).height(boundy),
+
+      $img_holder.append($img2);
+
+    }
+
+    if (ie6mode) {
+      $sel.css({
+        overflowY: 'hidden'
+      });
+    }
+
+    var bound = options.boundary;
+    var $trk = newTracker().width(boundx + (bound * 2)).height(boundy + (bound * 2)).css({
+      position: 'absolute',
+      top: px(-bound),
+      left: px(-bound),
+      zIndex: 290
+    }).mousedown(newSelection);
+
+    /* }}} */
+    // Set more variables {{{
+    var bgcolor = options.bgColor,
+        bgopacity = options.bgOpacity,
+        xlimit, ylimit, xmin, ymin, xscale, yscale, enabled = true,
+        btndown, animating, shift_down;
+
+    docOffset = getPos($img);
+    // }}}
+    // }}}
+    // Internal Modules {{{
+    // Touch Module {{{ 
+    var Touch = (function () {
+      // Touch support detection function adapted (under MIT License)
+      // from code by Jeffrey Sambells - http://github.com/iamamused/
+      function hasTouchSupport() {
+        var support = {},
+            events = ['touchstart', 'touchmove', 'touchend'],
+            el = document.createElement('div'), i;
+
+        try {
+          for(i=0; i<events.length; i++) {
+            var eventName = events[i];
+            eventName = 'on' + eventName;
+            var isSupported = (eventName in el);
+            if (!isSupported) {
+              el.setAttribute(eventName, 'return;');
+              isSupported = typeof el[eventName] == 'function';
+            }
+            support[events[i]] = isSupported;
+          }
+          return support.touchstart && support.touchend && support.touchmove;
+        }
+        catch(err) {
+          return false;
+        }
+      }
+
+      function detectSupport() {
+        if ((options.touchSupport === true) || (options.touchSupport === false)) return options.touchSupport;
+          else return hasTouchSupport();
+      }
+      return {
+        createDragger: function (ord) {
+          return function (e) {
+            e.pageX = e.originalEvent.changedTouches[0].pageX;
+            e.pageY = e.originalEvent.changedTouches[0].pageY;
+            if (options.disabled) {
+              return false;
+            }
+            if ((ord === 'move') && !options.allowMove) {
+              return false;
+            }
+            btndown = true;
+            startDragMode(ord, mouseAbs(e));
+            e.stopPropagation();
+            e.preventDefault();
+            return false;
+          };
+        },
+        newSelection: function (e) {
+          e.pageX = e.originalEvent.changedTouches[0].pageX;
+          e.pageY = e.originalEvent.changedTouches[0].pageY;
+          return newSelection(e);
+        },
+        isSupported: hasTouchSupport,
+        support: detectSupport()
+      };
+    }());
+    // }}}
+    // Coords Module {{{
+    var Coords = (function () {
+      var x1 = 0,
+          y1 = 0,
+          x2 = 0,
+          y2 = 0,
+          ox, oy;
+
+      function setPressed(pos) //{{{
+      {
+        pos = rebound(pos);
+        x2 = x1 = pos[0];
+        y2 = y1 = pos[1];
+      }
+      //}}}
+      function setCurrent(pos) //{{{
+      {
+        pos = rebound(pos);
+        ox = pos[0] - x2;
+        oy = pos[1] - y2;
+        x2 = pos[0];
+        y2 = pos[1];
+      }
+      //}}}
+      function getOffset() //{{{
+      {
+        return [ox, oy];
+      }
+      //}}}
+      function moveOffset(offset) //{{{
+      {
+        var ox = offset[0],
+            oy = offset[1];
+
+        if (0 > x1 + ox) {
+          ox -= ox + x1;
+        }
+        if (0 > y1 + oy) {
+          oy -= oy + y1;
+        }
+
+        if (boundy < y2 + oy) {
+          oy += boundy - (y2 + oy);
+        }
+        if (boundx < x2 + ox) {
+          ox += boundx - (x2 + ox);
+        }
+
+        x1 += ox;
+        x2 += ox;
+        y1 += oy;
+        y2 += oy;
+      }
+      //}}}
+      function getCorner(ord) //{{{
+      {
+        var c = getFixed();
+        switch (ord) {
+        case 'ne':
+          return [c.x2, c.y];
+        case 'nw':
+          return [c.x, c.y];
+        case 'se':
+          return [c.x2, c.y2];
+        case 'sw':
+          return [c.x, c.y2];
+        }
+      }
+      //}}}
+      function getFixed() //{{{
+      {
+        if (!options.aspectRatio) {
+          return getRect();
+        }
+        // This function could use some optimization I think...
+        var aspect = options.aspectRatio,
+            min_x = options.minSize[0] / xscale,
+            
+            
+            //min_y = options.minSize[1]/yscale,
+            max_x = options.maxSize[0] / xscale,
+            max_y = options.maxSize[1] / yscale,
+            rw = x2 - x1,
+            rh = y2 - y1,
+            rwa = Math.abs(rw),
+            rha = Math.abs(rh),
+            real_ratio = rwa / rha,
+            xx, yy, w, h;
+
+        if (max_x === 0) {
+          max_x = boundx * 10;
+        }
+        if (max_y === 0) {
+          max_y = boundy * 10;
+        }
+        if (real_ratio < aspect) {
+          yy = y2;
+          w = rha * aspect;
+          xx = rw < 0 ? x1 - w : w + x1;
+
+          if (xx < 0) {
+            xx = 0;
+            h = Math.abs((xx - x1) / aspect);
+            yy = rh < 0 ? y1 - h : h + y1;
+          } else if (xx > boundx) {
+            xx = boundx;
+            h = Math.abs((xx - x1) / aspect);
+            yy = rh < 0 ? y1 - h : h + y1;
+          }
+        } else {
+          xx = x2;
+          h = rwa / aspect;
+          yy = rh < 0 ? y1 - h : y1 + h;
+          if (yy < 0) {
+            yy = 0;
+            w = Math.abs((yy - y1) * aspect);
+            xx = rw < 0 ? x1 - w : w + x1;
+          } else if (yy > boundy) {
+            yy = boundy;
+            w = Math.abs(yy - y1) * aspect;
+            xx = rw < 0 ? x1 - w : w + x1;
+          }
+        }
+
+        // Magic %-)
+        if (xx > x1) { // right side
+          if (xx - x1 < min_x) {
+            xx = x1 + min_x;
+          } else if (xx - x1 > max_x) {
+            xx = x1 + max_x;
+          }
+          if (yy > y1) {
+            yy = y1 + (xx - x1) / aspect;
+          } else {
+            yy = y1 - (xx - x1) / aspect;
+          }
+        } else if (xx < x1) { // left side
+          if (x1 - xx < min_x) {
+            xx = x1 - min_x;
+          } else if (x1 - xx > max_x) {
+            xx = x1 - max_x;
+          }
+          if (yy > y1) {
+            yy = y1 + (x1 - xx) / aspect;
+          } else {
+            yy = y1 - (x1 - xx) / aspect;
+          }
+        }
+
+        if (xx < 0) {
+          x1 -= xx;
+          xx = 0;
+        } else if (xx > boundx) {
+          x1 -= xx - boundx;
+          xx = boundx;
+        }
+
+        if (yy < 0) {
+          y1 -= yy;
+          yy = 0;
+        } else if (yy > boundy) {
+          y1 -= yy - boundy;
+          yy = boundy;
+        }
+
+        return makeObj(flipCoords(x1, y1, xx, yy));
+      }
+      //}}}
+      function rebound(p) //{{{
+      {
+        if (p[0] < 0) {
+          p[0] = 0;
+        }
+        if (p[1] < 0) {
+          p[1] = 0;
+        }
+
+        if (p[0] > boundx) {
+          p[0] = boundx;
+        }
+        if (p[1] > boundy) {
+          p[1] = boundy;
+        }
+
+        return [p[0], p[1]];
+      }
+      //}}}
+      function flipCoords(x1, y1, x2, y2) //{{{
+      {
+        var xa = x1,
+            xb = x2,
+            ya = y1,
+            yb = y2;
+        if (x2 < x1) {
+          xa = x2;
+          xb = x1;
+        }
+        if (y2 < y1) {
+          ya = y2;
+          yb = y1;
+        }
+        return [Math.round(xa), Math.round(ya), Math.round(xb), Math.round(yb)];
+      }
+      //}}}
+      function getRect() //{{{
+      {
+        var xsize = x2 - x1,
+            ysize = y2 - y1,
+            delta;
+
+        if (xlimit && (Math.abs(xsize) > xlimit)) {
+          x2 = (xsize > 0) ? (x1 + xlimit) : (x1 - xlimit);
+        }
+        if (ylimit && (Math.abs(ysize) > ylimit)) {
+          y2 = (ysize > 0) ? (y1 + ylimit) : (y1 - ylimit);
+        }
+
+        if (ymin / yscale && (Math.abs(ysize) < ymin / yscale)) {
+          y2 = (ysize > 0) ? (y1 + ymin / yscale) : (y1 - ymin / yscale);
+        }
+        if (xmin / xscale && (Math.abs(xsize) < xmin / xscale)) {
+          x2 = (xsize > 0) ? (x1 + xmin / xscale) : (x1 - xmin / xscale);
+        }
+
+        if (x1 < 0) {
+          x2 -= x1;
+          x1 -= x1;
+        }
+        if (y1 < 0) {
+          y2 -= y1;
+          y1 -= y1;
+        }
+        if (x2 < 0) {
+          x1 -= x2;
+          x2 -= x2;
+        }
+        if (y2 < 0) {
+          y1 -= y2;
+          y2 -= y2;
+        }
+        if (x2 > boundx) {
+          delta = x2 - boundx;
+          x1 -= delta;
+          x2 -= delta;
+        }
+        if (y2 > boundy) {
+          delta = y2 - boundy;
+          y1 -= delta;
+          y2 -= delta;
+        }
+        if (x1 > boundx) {
+          delta = x1 - boundy;
+          y2 -= delta;
+          y1 -= delta;
+        }
+        if (y1 > boundy) {
+          delta = y1 - boundy;
+          y2 -= delta;
+          y1 -= delta;
+        }
+
+        return makeObj(flipCoords(x1, y1, x2, y2));
+      }
+      //}}}
+      function makeObj(a) //{{{
+      {
+        return {
+          x: a[0],
+          y: a[1],
+          x2: a[2],
+          y2: a[3],
+          w: a[2] - a[0],
+          h: a[3] - a[1]
+        };
+      }
+      //}}}
+
+      return {
+        flipCoords: flipCoords,
+        setPressed: setPressed,
+        setCurrent: setCurrent,
+        getOffset: getOffset,
+        moveOffset: moveOffset,
+        getCorner: getCorner,
+        getFixed: getFixed
+      };
+    }());
+
+    //}}}
+    // Shade Module {{{
+    var Shade = (function() {
+      var enabled = false,
+          holder = $('<div />').css({
+            position: 'absolute',
+            zIndex: 240,
+            opacity: 0
+          }),
+          shades = {
+            top: createShade(),
+            left: createShade().height(boundy),
+            right: createShade().height(boundy),
+            bottom: createShade()
+          };
+
+      function resizeShades(w,h) {
+        shades.left.css({ height: px(h) });
+        shades.right.css({ height: px(h) });
+      }
+      function updateAuto()
+      {
+        return updateShade(Coords.getFixed());
+      }
+      function updateShade(c)
+      {
+        shades.top.css({
+          left: px(c.x),
+          width: px(c.w),
+          height: px(c.y)
+        });
+        shades.bottom.css({
+          top: px(c.y2),
+          left: px(c.x),
+          width: px(c.w),
+          height: px(boundy-c.y2)
+        });
+        shades.right.css({
+          left: px(c.x2),
+          width: px(boundx-c.x2)
+        });
+        shades.left.css({
+          width: px(c.x)
+        });
+      }
+      function createShade() {
+        return $('<div />').css({
+          position: 'absolute',
+          backgroundColor: options.shadeColor||options.bgColor
+        }).appendTo(holder);
+      }
+      function enableShade() {
+        if (!enabled) {
+          enabled = true;
+          holder.insertBefore($img);
+          updateAuto();
+          Selection.setBgOpacity(1,0,1);
+          $img2.hide();
+
+          setBgColor(options.shadeColor||options.bgColor,1);
+          if (Selection.isAwake())
+          {
+            setOpacity(options.bgOpacity,1);
+          }
+            else setOpacity(1,1);
+        }
+      }
+      function setBgColor(color,now) {
+        colorChangeMacro(getShades(),color,now);
+      }
+      function disableShade() {
+        if (enabled) {
+          holder.remove();
+          $img2.show();
+          enabled = false;
+          if (Selection.isAwake()) {
+            Selection.setBgOpacity(options.bgOpacity,1,1);
+          } else {
+            Selection.setBgOpacity(1,1,1);
+            Selection.disableHandles();
+          }
+          colorChangeMacro($div,0,1);
+        }
+      }
+      function setOpacity(opacity,now) {
+        if (enabled) {
+          if (options.bgFade && !now) {
+            holder.animate({
+              opacity: 1-opacity
+            },{
+              queue: false,
+              duration: options.fadeTime
+            });
+          }
+          else holder.css({opacity:1-opacity});
+        }
+      }
+      function refreshAll() {
+        options.shade ? enableShade() : disableShade();
+        if (Selection.isAwake()) setOpacity(options.bgOpacity);
+      }
+      function getShades() {
+        return holder.children();
+      }
+
+      return {
+        update: updateAuto,
+        updateRaw: updateShade,
+        getShades: getShades,
+        setBgColor: setBgColor,
+        enable: enableShade,
+        disable: disableShade,
+        resize: resizeShades,
+        refresh: refreshAll,
+        opacity: setOpacity
+      };
+    }());
+    // }}}
+    // Selection Module {{{
+    var Selection = (function () {
+      var awake, hdep = 370;
+      var borders = {};
+      var handle = {};
+      var seehandles = false;
+      var hhs = options.handleOffset;
+
+      // Private Methods
+      function insertBorder(type) //{{{
+      {
+        var jq = $('<div />').css({
+          position: 'absolute',
+          opacity: options.borderOpacity
+        }).addClass(cssClass(type));
+        $img_holder.append(jq);
+        return jq;
+      }
+      //}}}
+      function dragDiv(ord, zi) //{{{
+      {
+        var jq = $('<div />').mousedown(createDragger(ord)).css({
+          cursor: ord + '-resize',
+          position: 'absolute',
+          zIndex: zi
+        }).addClass('ord-'+ord);
+
+        if (Touch.support) {
+          jq.bind('touchstart.jcrop', Touch.createDragger(ord));
+        }
+
+        $hdl_holder.append(jq);
+        return jq;
+      }
+      //}}}
+      function insertHandle(ord) //{{{
+      {
+        var hs = options.handleSize;
+        return dragDiv(ord, hdep++).css({
+          top: px(-hhs + 1),
+          left: px(-hhs + 1),
+          opacity: options.handleOpacity
+        }).width(hs).height(hs).addClass(cssClass('handle'));
+      }
+      //}}}
+      function insertDragbar(ord) //{{{
+      {
+        var s = options.handleSize,
+            h = s,
+            w = s,
+            t = hhs,
+            l = hhs;
+
+        switch (ord) {
+        case 'n':
+        case 's':
+          w = '100%';
+          break;
+        case 'e':
+        case 'w':
+          h = '100%';
+          break;
+        }
+
+        return dragDiv(ord, hdep++).width(w).height(h).css({
+          top: px(-t + 1),
+          left: px(-l + 1)
+        });
+      }
+      //}}}
+      function createHandles(li) //{{{
+      {
+        var i;
+        for (i = 0; i < li.length; i++) {
+          handle[li[i]] = insertHandle(li[i]);
+        }
+      }
+      //}}}
+      function moveHandles(c) //{{{
+      {
+        var midvert = Math.round((c.h / 2) - hhs),
+            midhoriz = Math.round((c.w / 2) - hhs),
+            north = -hhs + 1,
+            west = -hhs + 1,
+            east = c.w - hhs,
+            south = c.h - hhs,
+            x, y;
+
+        if (handle.e) {
+          handle.e.css({
+            top: px(midvert),
+            left: px(east)
+          });
+          handle.w.css({
+            top: px(midvert)
+          });
+          handle.s.css({
+            top: px(south),
+            left: px(midhoriz)
+          });
+          handle.n.css({
+            left: px(midhoriz)
+          });
+        }
+        if (handle.ne) {
+          handle.ne.css({
+            left: px(east)
+          });
+          handle.se.css({
+            top: px(south),
+            left: px(east)
+          });
+          handle.sw.css({
+            top: px(south)
+          });
+        }
+        if (handle.b) {
+          handle.b.css({
+            top: px(south)
+          });
+          handle.r.css({
+            left: px(east)
+          });
+        }
+      }
+      //}}}
+      function moveto(x, y) //{{{
+      {
+        if (!options.shade) {
+          $img2.css({
+            top: px(-y),
+            left: px(-x)
+          });
+        }
+        $sel.css({
+          top: px(y),
+          left: px(x)
+        });
+      }
+      //}}}
+      function resize(w, h) //{{{
+      {
+        $sel.width(w).height(h);
+      }
+      //}}}
+      function refresh() //{{{
+      {
+        var c = Coords.getFixed();
+
+        Coords.setPressed([c.x, c.y]);
+        Coords.setCurrent([c.x2, c.y2]);
+
+        updateVisible();
+      }
+      //}}}
+
+      // Internal Methods
+      function updateVisible(select) //{{{
+      {
+        if (awake) {
+          return update(select);
+        }
+      }
+      //}}}
+      function update(select) //{{{
+      {
+        var c = Coords.getFixed();
+
+        resize(c.w, c.h);
+        moveto(c.x, c.y);
+        if (options.shade) Shade.updateRaw(c);
+
+        if (seehandles) {
+          moveHandles(c);
+        }
+        if (!awake) {
+          show();
+        }
+
+        if (select) {
+          options.onSelect.call(api, unscale(c));
+        } else {
+          options.onChange.call(api, unscale(c));
+        }
+      }
+      //}}}
+      function setBgOpacity(opacity,force,now)
+      {
+        if (!awake && !force) return;
+        if (options.bgFade && !now) {
+          $img.animate({
+            opacity: opacity
+          },{
+            queue: false,
+            duration: options.fadeTime
+          });
+        } else {
+          $img.css('opacity', opacity);
+        }
+      }
+      function show() //{{{
+      {
+        $sel.show();
+
+        if (options.shade) Shade.opacity(bgopacity);
+          else setBgOpacity(bgopacity,true);
+
+        awake = true;
+      }
+      //}}}
+      function release() //{{{
+      {
+        disableHandles();
+        $sel.hide();
+
+        if (options.shade) Shade.opacity(1);
+          else setBgOpacity(1);
+
+        awake = false;
+        options.onRelease.call(api);
+      }
+      //}}}
+      function showHandles() //{{{
+      {
+        if (seehandles) {
+          moveHandles(Coords.getFixed());
+          $hdl_holder.show();
+        }
+      }
+      //}}}
+      function enableHandles() //{{{
+      {
+        seehandles = true;
+        if (options.allowResize) {
+          moveHandles(Coords.getFixed());
+          $hdl_holder.show();
+          return true;
+        }
+      }
+      //}}}
+      function disableHandles() //{{{
+      {
+        seehandles = false;
+        $hdl_holder.hide();
+      } 
+      //}}}
+      function animMode(v) //{{{
+      {
+        if (animating === v) {
+          disableHandles();
+        } else {
+          enableHandles();
+        }
+      } 
+      //}}}
+      function done() //{{{
+      {
+        animMode(false);
+        refresh();
+      } 
+      //}}}
+      /* Insert draggable elements {{{*/
+
+      // Insert border divs for outline
+      if (options.drawBorders) {
+        borders = {
+          top: insertBorder('hline'),
+          bottom: insertBorder('hline bottom'),
+          left: insertBorder('vline'),
+          right: insertBorder('vline right')
+        };
+      }
+
+      // Insert handles on edges
+      if (options.dragEdges) {
+        handle.t = insertDragbar('n');
+        handle.b = insertDragbar('s');
+        handle.r = insertDragbar('e');
+        handle.l = insertDragbar('w');
+      }
+
+      // Insert side and corner handles
+      if (options.sideHandles) {
+        createHandles(['n', 's', 'e', 'w']);
+      }
+      if (options.cornerHandles) {
+        createHandles(['sw', 'nw', 'ne', 'se']);
+      }
+      //}}}
+
+      // This is a hack for iOS5 to support drag/move touch functionality
+      $(document).bind('touchstart.jcrop-ios',function(e) {
+        if ($(e.currentTarget).hasClass('jcrop-tracker')) e.stopPropagation();
+      });
+
+      var $track = newTracker().mousedown(createDragger('move')).css({
+        cursor: 'move',
+        position: 'absolute',
+        zIndex: 360
+      });
+
+      if (Touch.support) {
+        $track.bind('touchstart.jcrop', Touch.createDragger('move'));
+      }
+
+      $img_holder.append($track);
+      disableHandles();
+
+      return {
+        updateVisible: updateVisible,
+        update: update,
+        release: release,
+        refresh: refresh,
+        isAwake: function () {
+          return awake;
+        },
+        setCursor: function (cursor) {
+          $track.css('cursor', cursor);
+        },
+        enableHandles: enableHandles,
+        enableOnly: function () {
+          seehandles = true;
+        },
+        showHandles: showHandles,
+        disableHandles: disableHandles,
+        animMode: animMode,
+        setBgOpacity: setBgOpacity,
+        done: done
+      };
+    }());
+    
+    //}}}
+    // Tracker Module {{{
+    var Tracker = (function () {
+      var onMove = function () {},
+          onDone = function () {},
+          trackDoc = options.trackDocument;
+
+      function toFront() //{{{
+      {
+        $trk.css({
+          zIndex: 450
+        });
+        if (Touch.support) {
+          $(document)
+            .bind('touchmove.jcrop', trackTouchMove)
+            .bind('touchend.jcrop', trackTouchEnd);
+        }
+        if (trackDoc) {
+          $(document)
+            .bind('mousemove.jcrop',trackMove)
+            .bind('mouseup.jcrop',trackUp);
+        }
+      } 
+      //}}}
+      function toBack() //{{{
+      {
+        $trk.css({
+          zIndex: 290
+        });
+        $(document).unbind('.jcrop');
+      } 
+      //}}}
+      function trackMove(e) //{{{
+      {
+        onMove(mouseAbs(e));
+        return false;
+      } 
+      //}}}
+      function trackUp(e) //{{{
+      {
+        e.preventDefault();
+        e.stopPropagation();
+
+        if (btndown) {
+          btndown = false;
+
+          onDone(mouseAbs(e));
+
+          if (Selection.isAwake()) {
+            options.onSelect.call(api, unscale(Coords.getFixed()));
+          }
+
+          toBack();
+          onMove = function () {};
+          onDone = function () {};
+        }
+
+        return false;
+      }
+      //}}}
+      function activateHandlers(move, done) //{{{
+      {
+        btndown = true;
+        onMove = move;
+        onDone = done;
+        toFront();
+        return false;
+      }
+      //}}}
+      function trackTouchMove(e) //{{{
+      {
+        e.pageX = e.originalEvent.changedTouches[0].pageX;
+        e.pageY = e.originalEvent.changedTouches[0].pageY;
+        return trackMove(e);
+      }
+      //}}}
+      function trackTouchEnd(e) //{{{
+      {
+        e.pageX = e.originalEvent.changedTouches[0].pageX;
+        e.pageY = e.originalEvent.changedTouches[0].pageY;
+        return trackUp(e);
+      }
+      //}}}
+      function setCursor(t) //{{{
+      {
+        $trk.css('cursor', t);
+      }
+      //}}}
+
+      if (!trackDoc) {
+        $trk.mousemove(trackMove).mouseup(trackUp).mouseout(trackUp);
+      }
+
+      $img.before($trk);
+      return {
+        activateHandlers: activateHandlers,
+        setCursor: setCursor
+      };
+    }());
+    //}}}
+    // KeyManager Module {{{
+    var KeyManager = (function () {
+      var $keymgr = $('<input type="radio" />').css({
+        position: 'fixed',
+        left: '-120px',
+        width: '12px'
+      }),
+          $keywrap = $('<div />').css({
+          position: 'absolute',
+          overflow: 'hidden'
+        }).append($keymgr);
+
+      function watchKeys() //{{{
+      {
+        if (options.keySupport) {
+          $keymgr.show();
+          $keymgr.focus();
+        }
+      }
+      //}}}
+      function onBlur(e) //{{{
+      {
+        $keymgr.hide();
+      }
+      //}}}
+      function doNudge(e, x, y) //{{{
+      {
+        if (options.allowMove) {
+          Coords.moveOffset([x, y]);
+          Selection.updateVisible(true);
+        }
+        e.preventDefault();
+        e.stopPropagation();
+      }
+      //}}}
+      function parseKey(e) //{{{
+      {
+        if (e.ctrlKey || e.metaKey) {
+          return true;
+        }
+        shift_down = e.shiftKey ? true : false;
+        var nudge = shift_down ? 10 : 1;
+
+        switch (e.keyCode) {
+        case 37:
+          doNudge(e, -nudge, 0);
+          break;
+        case 39:
+          doNudge(e, nudge, 0);
+          break;
+        case 38:
+          doNudge(e, 0, -nudge);
+          break;
+        case 40:
+          doNudge(e, 0, nudge);
+          break;
+        case 27:
+          if (options.allowSelect) Selection.release();
+          break;
+        case 9:
+          return true;
+        }
+
+        return false;
+      }
+      //}}}
+
+      if (options.keySupport) {
+        $keymgr.keydown(parseKey).blur(onBlur);
+        if (ie6mode || !options.fixedSupport) {
+          $keymgr.css({
+            position: 'absolute',
+            left: '-20px'
+          });
+          $keywrap.append($keymgr).insertBefore($img);
+        } else {
+          $keymgr.insertBefore($img);
+        }
+      }
+
+
+      return {
+        watchKeys: watchKeys
+      };
+    }());
+    //}}}
+    // }}}
+    // API methods {{{
+    function setClass(cname) //{{{
+    {
+      $div.removeClass().addClass(cssClass('holder')).addClass(cname);
+    }
+    //}}}
+    function animateTo(a, callback) //{{{
+    {
+      var x1 = parseInt(a[0], 10) / xscale,
+          y1 = parseInt(a[1], 10) / yscale,
+          x2 = parseInt(a[2], 10) / xscale,
+          y2 = parseInt(a[3], 10) / yscale;
+
+      if (animating) {
+        return;
+      }
+
+      var animto = Coords.flipCoords(x1, y1, x2, y2),
+          c = Coords.getFixed(),
+          initcr = [c.x, c.y, c.x2, c.y2],
+          animat = initcr,
+          interv = options.animationDelay,
+          ix1 = animto[0] - initcr[0],
+          iy1 = animto[1] - initcr[1],
+          ix2 = animto[2] - initcr[2],
+          iy2 = animto[3] - initcr[3],
+          pcent = 0,
+          velocity = options.swingSpeed;
+
+      x = animat[0];
+      y = animat[1];
+      x2 = animat[2];
+      y2 = animat[3];
+
+      Selection.animMode(true);
+      var anim_timer;
+
+      function queueAnimator() {
+        window.setTimeout(animator, interv);
+      }
+      var animator = (function () {
+        return function () {
+          pcent += (100 - pcent) / velocity;
+
+          animat[0] = x + ((pcent / 100) * ix1);
+          animat[1] = y + ((pcent / 100) * iy1);
+          animat[2] = x2 + ((pcent / 100) * ix2);
+          animat[3] = y2 + ((pcent / 100) * iy2);
+
+          if (pcent >= 99.8) {
+            pcent = 100;
+          }
+          if (pcent < 100) {
+            setSelectRaw(animat);
+            queueAnimator();
+          } else {
+            Selection.done();
+            if (typeof(callback) === 'function') {
+              callback.call(api);
+            }
+          }
+        };
+      }());
+      queueAnimator();
+    }
+    //}}}
+    function setSelect(rect) //{{{
+    {
+      setSelectRaw([parseInt(rect[0], 10) / xscale, parseInt(rect[1], 10) / yscale, parseInt(rect[2], 10) / xscale, parseInt(rect[3], 10) / yscale]);
+      options.onSelect.call(api, unscale(Coords.getFixed()));
+      Selection.enableHandles();
+    }
+    //}}}
+    function setSelectRaw(l) //{{{
+    {
+      Coords.setPressed([l[0], l[1]]);
+      Coords.setCurrent([l[2], l[3]]);
+      Selection.update();
+    }
+    //}}}
+    function tellSelect() //{{{
+    {
+      return unscale(Coords.getFixed());
+    }
+    //}}}
+    function tellScaled() //{{{
+    {
+      return Coords.getFixed();
+    }
+    //}}}
+    function setOptionsNew(opt) //{{{
+    {
+      setOptions(opt);
+      interfaceUpdate();
+    }
+    //}}}
+    function disableCrop() //{{{
+    {
+      options.disabled = true;
+      Selection.disableHandles();
+      Selection.setCursor('default');
+      Tracker.setCursor('default');
+    }
+    //}}}
+    function enableCrop() //{{{
+    {
+      options.disabled = false;
+      interfaceUpdate();
+    }
+    //}}}
+    function cancelCrop() //{{{
+    {
+      Selection.done();
+      Tracker.activateHandlers(null, null);
+    }
+    //}}}
+    function destroy() //{{{
+    {
+      $div.remove();
+      $origimg.show();
+      $(obj).removeData('Jcrop');
+    }
+    //}}}
+    function setImage(src, callback) //{{{
+    {
+      Selection.release();
+      disableCrop();
+      var img = new Image();
+      img.onload = function () {
+        var iw = img.width;
+        var ih = img.height;
+        var bw = options.boxWidth;
+        var bh = options.boxHeight;
+        $img.width(iw).height(ih);
+        $img.attr('src', src);
+        $img2.attr('src', src);
+        presize($img, bw, bh);
+        boundx = $img.width();
+        boundy = $img.height();
+        $img2.width(boundx).height(boundy);
+        $trk.width(boundx + (bound * 2)).height(boundy + (bound * 2));
+        $div.width(boundx).height(boundy);
+        Shade.resize(boundx,boundy);
+        enableCrop();
+
+        if (typeof(callback) === 'function') {
+          callback.call(api);
+        }
+      };
+      img.src = src;
+    }
+    //}}}
+    function colorChangeMacro($obj,color,now) {
+      var mycolor = color || options.bgColor;
+      if (options.bgFade && supportsColorFade() && options.fadeTime && !now) {
+        $obj.animate({
+          backgroundColor: mycolor
+        }, {
+          queue: false,
+          duration: options.fadeTime
+        });
+      } else {
+        $obj.css('backgroundColor', mycolor);
+      }
+    }
+    function interfaceUpdate(alt) //{{{
+    // This method tweaks the interface based on options object.
+    // Called when options are changed and at end of initialization.
+    {
+      if (options.allowResize) {
+        if (alt) {
+          Selection.enableOnly();
+        } else {
+          Selection.enableHandles();
+        }
+      } else {
+        Selection.disableHandles();
+      }
+
+      Tracker.setCursor(options.allowSelect ? 'crosshair' : 'default');
+      Selection.setCursor(options.allowMove ? 'move' : 'default');
+
+      if (options.hasOwnProperty('trueSize')) {
+        xscale = options.trueSize[0] / boundx;
+        yscale = options.trueSize[1] / boundy;
+      }
+
+      if (options.hasOwnProperty('setSelect')) {
+        setSelect(options.setSelect);
+        Selection.done();
+        delete(options.setSelect);
+      }
+
+      Shade.refresh();
+
+      if (options.bgColor != bgcolor) {
+        colorChangeMacro(
+          options.shade? Shade.getShades(): $div,
+          options.shade?
+            (options.shadeColor || options.bgColor):
+            options.bgColor
+        );
+        bgcolor = options.bgColor;
+      }
+
+      if (bgopacity != options.bgOpacity) {
+        bgopacity = options.bgOpacity;
+        if (options.shade) Shade.refresh();
+          else Selection.setBgOpacity(bgopacity);
+      }
+
+      xlimit = options.maxSize[0] || 0;
+      ylimit = options.maxSize[1] || 0;
+      xmin = options.minSize[0] || 0;
+      ymin = options.minSize[1] || 0;
+
+      if (options.hasOwnProperty('outerImage')) {
+        $img.attr('src', options.outerImage);
+        delete(options.outerImage);
+      }
+
+      Selection.refresh();
+    }
+    //}}}
+    //}}}
+
+    if (Touch.support) $trk.bind('touchstart.jcrop', Touch.newSelection);
+
+    $hdl_holder.hide();
+    interfaceUpdate(true);
+
+    var api = {
+      setImage: setImage,
+      animateTo: animateTo,
+      setSelect: setSelect,
+      setOptions: setOptionsNew,
+      tellSelect: tellSelect,
+      tellScaled: tellScaled,
+      setClass: setClass,
+
+      disable: disableCrop,
+      enable: enableCrop,
+      cancel: cancelCrop,
+      release: Selection.release,
+      destroy: destroy,
+
+      focus: KeyManager.watchKeys,
+
+      getBounds: function () {
+        return [boundx * xscale, boundy * yscale];
+      },
+      getWidgetSize: function () {
+        return [boundx, boundy];
+      },
+      getScaleFactor: function () {
+        return [xscale, yscale];
+      },
+
+      ui: {
+        holder: $div,
+        selection: $sel
+      }
+    };
+
+    if ($.browser.msie) {
+      $div.bind('selectstart', function () {
+        return false;
+      });
+    }
+
+    $origimg.data('Jcrop', api);
+    return api;
+  };
+  $.fn.Jcrop = function (options, callback) //{{{
+  {
+    var api;
+    // Iterate over each object, attach Jcrop
+    this.each(function () {
+      // If we've already attached to this object
+      if ($(this).data('Jcrop')) {
+        // The API can be requested this way (undocumented)
+        if (options === 'api') return $(this).data('Jcrop');
+        // Otherwise, we just reset the options...
+        else $(this).data('Jcrop').setOptions(options);
+      }
+      // If we haven't been attached, preload and attach
+      else {
+        if (this.tagName == 'IMG')
+          $.Jcrop.Loader(this,function(){
+            $(this).css({display:'block',visibility:'hidden'});
+            api = $.Jcrop(this, options);
+            if ($.isFunction(callback)) callback.call(api);
+          });
+        else {
+          $(this).css({display:'block',visibility:'hidden'});
+          api = $.Jcrop(this, options);
+          if ($.isFunction(callback)) callback.call(api);
+        }
+      }
+    });
+
+    // Return "this" so the object is chainable (jQuery-style)
+    return this;
+  };
+  //}}}
+  // $.Jcrop.Loader - basic image loader {{{
+
+  $.Jcrop.Loader = function(imgobj,success,error){
+    var $img = $(imgobj), img = $img[0];
+
+    function completeCheck(){
+      if (img.complete) {
+        $img.unbind('.jcloader');
+        if ($.isFunction(success)) success.call(img);
+      }
+      else window.setTimeout(completeCheck,50);
+    }
+
+    $img
+      .bind('load.jcloader',completeCheck)
+      .bind('error.jcloader',function(e){
+        $img.unbind('.jcloader');
+        if ($.isFunction(error)) error.call(img);
+      });
+
+    if (img.complete && $.isFunction(success)){
+      $img.unbind('.jcloader');
+      success.call(img);
+    }
+  };
+
+  //}}}
+  // Global Defaults {{{
+  $.Jcrop.defaults = {
+
+    // Basic Settings
+    allowSelect: true,
+    allowMove: true,
+    allowResize: true,
+
+    trackDocument: true,
+
+    // Styling Options
+    baseClass: 'jcrop',
+    addClass: null,
+    bgColor: 'black',
+    bgOpacity: 0.6,
+    bgFade: false,
+    borderOpacity: 0.4,
+    handleOpacity: 0.5,
+    handleSize: 7,
+    handleOffset: 5,
+
+    aspectRatio: 0,
+    keySupport: true,
+    cornerHandles: true,
+    sideHandles: true,
+    drawBorders: true,
+    dragEdges: true,
+    fixedSupport: true,
+    touchSupport: null,
+
+    shade: null,
+
+    boxWidth: 0,
+    boxHeight: 0,
+    boundary: 2,
+    fadeTime: 400,
+    animationDelay: 20,
+    swingSpeed: 3,
+
+    minSelect: [0, 0],
+    maxSize: [0, 0],
+    minSize: [0, 0],
+
+    // Callbacks / Event Handlers
+    onChange: function () {},
+    onSelect: function () {},
+    onDblClick: function () {},
+    onRelease: function () {}
+  };
+
+  // }}}
+}(jQuery));
diff --git a/apps/contacts/js/jquery.Jcrop.min.js b/apps/contacts/js/jquery.Jcrop.min.js
new file mode 100644
index 00000000000..0c05d67c22d
--- /dev/null
+++ b/apps/contacts/js/jquery.Jcrop.min.js
@@ -0,0 +1,255 @@
+/**
+ * jquery.Jcrop.min.js v0.9.9 {{{ (build:20120102)
+ * jQuery Image Cropping Plugin - released under MIT License
+ * Copyright (c) 2008-2012 Tapmodo Interactive LLC
+ * https://github.com/tapmodo/Jcrop
+ */
+
+(function($){$.Jcrop=function(obj,opt){var options=$.extend({},$.Jcrop.defaults),docOffset,lastcurs,ie6mode=false;function px(n){return parseInt(n,10)+'px';}
+function cssClass(cl){return options.baseClass+'-'+cl;}
+function supportsColorFade(){return $.fx.step.hasOwnProperty('backgroundColor');}
+function getPos(obj)
+{var pos=$(obj).offset();return[pos.left,pos.top];}
+function mouseAbs(e)
+{return[(e.pageX-docOffset[0]),(e.pageY-docOffset[1])];}
+function setOptions(opt)
+{if(typeof(opt)!=='object')opt={};options=$.extend(options,opt);$.each(['onChange','onSelect','onRelease','onDblClick'],function(i,e){if(typeof(options[e])!=='function')options[e]=function(){};});}
+function startDragMode(mode,pos)
+{docOffset=getPos($img);Tracker.setCursor(mode==='move'?mode:mode+'-resize');if(mode==='move'){return Tracker.activateHandlers(createMover(pos),doneSelect);}
+var fc=Coords.getFixed();var opp=oppLockCorner(mode);var opc=Coords.getCorner(oppLockCorner(opp));Coords.setPressed(Coords.getCorner(opp));Coords.setCurrent(opc);Tracker.activateHandlers(dragmodeHandler(mode,fc),doneSelect);}
+function dragmodeHandler(mode,f)
+{return function(pos){if(!options.aspectRatio){switch(mode){case'e':pos[1]=f.y2;break;case'w':pos[1]=f.y2;break;case'n':pos[0]=f.x2;break;case's':pos[0]=f.x2;break;}}else{switch(mode){case'e':pos[1]=f.y+1;break;case'w':pos[1]=f.y+1;break;case'n':pos[0]=f.x+1;break;case's':pos[0]=f.x+1;break;}}
+Coords.setCurrent(pos);Selection.update();};}
+function createMover(pos)
+{var lloc=pos;KeyManager.watchKeys();return function(pos){Coords.moveOffset([pos[0]-lloc[0],pos[1]-lloc[1]]);lloc=pos;Selection.update();};}
+function oppLockCorner(ord)
+{switch(ord){case'n':return'sw';case's':return'nw';case'e':return'nw';case'w':return'ne';case'ne':return'sw';case'nw':return'se';case'se':return'nw';case'sw':return'ne';}}
+function createDragger(ord)
+{return function(e){if(options.disabled){return false;}
+if((ord==='move')&&!options.allowMove){return false;}
+docOffset=getPos($img);btndown=true;startDragMode(ord,mouseAbs(e));e.stopPropagation();e.preventDefault();return false;};}
+function presize($obj,w,h)
+{var nw=$obj.width(),nh=$obj.height();if((nw>w)&&w>0){nw=w;nh=(w/$obj.width())*$obj.height();}
+if((nh>h)&&h>0){nh=h;nw=(h/$obj.height())*$obj.width();}
+xscale=$obj.width()/nw;yscale=$obj.height()/nh;$obj.width(nw).height(nh);}
+function unscale(c)
+{return{x:parseInt(c.x*xscale,10),y:parseInt(c.y*yscale,10),x2:parseInt(c.x2*xscale,10),y2:parseInt(c.y2*yscale,10),w:parseInt(c.w*xscale,10),h:parseInt(c.h*yscale,10)};}
+function doneSelect(pos)
+{var c=Coords.getFixed();if((c.w>options.minSelect[0])&&(c.h>options.minSelect[1])){Selection.enableHandles();Selection.done();}else{Selection.release();}
+Tracker.setCursor(options.allowSelect?'crosshair':'default');}
+function newSelection(e)
+{if(options.disabled){return false;}
+if(!options.allowSelect){return false;}
+btndown=true;docOffset=getPos($img);Selection.disableHandles();Tracker.setCursor('crosshair');var pos=mouseAbs(e);Coords.setPressed(pos);Selection.update();Tracker.activateHandlers(selectDrag,doneSelect);KeyManager.watchKeys();e.stopPropagation();e.preventDefault();return false;}
+function selectDrag(pos)
+{Coords.setCurrent(pos);Selection.update();}
+function newTracker()
+{var trk=$('<div></div>').addClass(cssClass('tracker'));if($.browser.msie){trk.css({opacity:0,backgroundColor:'white'});}
+return trk;}
+if($.browser.msie&&($.browser.version.split('.')[0]==='6')){ie6mode=true;}
+if(typeof(obj)!=='object'){obj=$(obj)[0];}
+if(typeof(opt)!=='object'){opt={};}
+setOptions(opt);var img_css={border:'none',visibility:'visible',margin:0,padding:0,position:'absolute',top:0,left:0};var $origimg=$(obj),img_mode=true;if(obj.tagName=='IMG'){if($origimg[0].width!=0&&$origimg[0].height!=0){$origimg.width($origimg[0].width);$origimg.height($origimg[0].height);}else{var tempImage=new Image();tempImage.src=$origimg[0].src;$origimg.width(tempImage.width);$origimg.height(tempImage.height);}
+var $img=$origimg.clone().removeAttr('id').css(img_css).show();$img.width($origimg.width());$img.height($origimg.height());$origimg.after($img).hide();}else{$img=$origimg.css(img_css).show();img_mode=false;if(options.shade===null){options.shade=true;}}
+presize($img,options.boxWidth,options.boxHeight);var boundx=$img.width(),boundy=$img.height(),$div=$('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({position:'relative',backgroundColor:options.bgColor}).insertAfter($origimg).append($img);if(options.addClass){$div.addClass(options.addClass);}
+var $img2=$('<div />'),$img_holder=$('<div />').width('100%').height('100%').css({zIndex:310,position:'absolute',overflow:'hidden'}),$hdl_holder=$('<div />').width('100%').height('100%').css('zIndex',320),$sel=$('<div />').css({position:'absolute',zIndex:600}).dblclick(function(){var c=Coords.getFixed();options.onDblClick.call(api,c);}).insertBefore($img).append($img_holder,$hdl_holder);if(img_mode){$img2=$('<img />').attr('src',$img.attr('src')).css(img_css).width(boundx).height(boundy),$img_holder.append($img2);}
+if(ie6mode){$sel.css({overflowY:'hidden'});}
+var bound=options.boundary;var $trk=newTracker().width(boundx+(bound*2)).height(boundy+(bound*2)).css({position:'absolute',top:px(-bound),left:px(-bound),zIndex:290}).mousedown(newSelection);var bgcolor=options.bgColor,bgopacity=options.bgOpacity,xlimit,ylimit,xmin,ymin,xscale,yscale,enabled=true,btndown,animating,shift_down;docOffset=getPos($img);var Touch=(function(){function hasTouchSupport(){var support={},events=['touchstart','touchmove','touchend'],el=document.createElement('div'),i;try{for(i=0;i<events.length;i++){var eventName=events[i];eventName='on'+eventName;var isSupported=(eventName in el);if(!isSupported){el.setAttribute(eventName,'return;');isSupported=typeof el[eventName]=='function';}
+support[events[i]]=isSupported;}
+return support.touchstart&&support.touchend&&support.touchmove;}
+catch(err){return false;}}
+function detectSupport(){if((options.touchSupport===true)||(options.touchSupport===false))return options.touchSupport;else return hasTouchSupport();}
+return{createDragger:function(ord){return function(e){e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;if(options.disabled){return false;}
+if((ord==='move')&&!options.allowMove){return false;}
+btndown=true;startDragMode(ord,mouseAbs(e));e.stopPropagation();e.preventDefault();return false;};},newSelection:function(e){e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return newSelection(e);},isSupported:hasTouchSupport,support:detectSupport()};}());var Coords=(function(){var x1=0,y1=0,x2=0,y2=0,ox,oy;function setPressed(pos)
+{pos=rebound(pos);x2=x1=pos[0];y2=y1=pos[1];}
+function setCurrent(pos)
+{pos=rebound(pos);ox=pos[0]-x2;oy=pos[1]-y2;x2=pos[0];y2=pos[1];}
+function getOffset()
+{return[ox,oy];}
+function moveOffset(offset)
+{var ox=offset[0],oy=offset[1];if(0>x1+ox){ox-=ox+x1;}
+if(0>y1+oy){oy-=oy+y1;}
+if(boundy<y2+oy){oy+=boundy-(y2+oy);}
+if(boundx<x2+ox){ox+=boundx-(x2+ox);}
+x1+=ox;x2+=ox;y1+=oy;y2+=oy;}
+function getCorner(ord)
+{var c=getFixed();switch(ord){case'ne':return[c.x2,c.y];case'nw':return[c.x,c.y];case'se':return[c.x2,c.y2];case'sw':return[c.x,c.y2];}}
+function getFixed()
+{if(!options.aspectRatio){return getRect();}
+var aspect=options.aspectRatio,min_x=options.minSize[0]/xscale,max_x=options.maxSize[0]/xscale,max_y=options.maxSize[1]/yscale,rw=x2-x1,rh=y2-y1,rwa=Math.abs(rw),rha=Math.abs(rh),real_ratio=rwa/rha,xx,yy,w,h;if(max_x===0){max_x=boundx*10;}
+if(max_y===0){max_y=boundy*10;}
+if(real_ratio<aspect){yy=y2;w=rha*aspect;xx=rw<0?x1-w:w+x1;if(xx<0){xx=0;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}else if(xx>boundx){xx=boundx;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}}else{xx=x2;h=rwa/aspect;yy=rh<0?y1-h:y1+h;if(yy<0){yy=0;w=Math.abs((yy-y1)*aspect);xx=rw<0?x1-w:w+x1;}else if(yy>boundy){yy=boundy;w=Math.abs(yy-y1)*aspect;xx=rw<0?x1-w:w+x1;}}
+if(xx>x1){if(xx-x1<min_x){xx=x1+min_x;}else if(xx-x1>max_x){xx=x1+max_x;}
+if(yy>y1){yy=y1+(xx-x1)/aspect;}else{yy=y1-(xx-x1)/aspect;}}else if(xx<x1){if(x1-xx<min_x){xx=x1-min_x;}else if(x1-xx>max_x){xx=x1-max_x;}
+if(yy>y1){yy=y1+(x1-xx)/aspect;}else{yy=y1-(x1-xx)/aspect;}}
+if(xx<0){x1-=xx;xx=0;}else if(xx>boundx){x1-=xx-boundx;xx=boundx;}
+if(yy<0){y1-=yy;yy=0;}else if(yy>boundy){y1-=yy-boundy;yy=boundy;}
+return makeObj(flipCoords(x1,y1,xx,yy));}
+function rebound(p)
+{if(p[0]<0){p[0]=0;}
+if(p[1]<0){p[1]=0;}
+if(p[0]>boundx){p[0]=boundx;}
+if(p[1]>boundy){p[1]=boundy;}
+return[p[0],p[1]];}
+function flipCoords(x1,y1,x2,y2)
+{var xa=x1,xb=x2,ya=y1,yb=y2;if(x2<x1){xa=x2;xb=x1;}
+if(y2<y1){ya=y2;yb=y1;}
+return[Math.round(xa),Math.round(ya),Math.round(xb),Math.round(yb)];}
+function getRect()
+{var xsize=x2-x1,ysize=y2-y1,delta;if(xlimit&&(Math.abs(xsize)>xlimit)){x2=(xsize>0)?(x1+xlimit):(x1-xlimit);}
+if(ylimit&&(Math.abs(ysize)>ylimit)){y2=(ysize>0)?(y1+ylimit):(y1-ylimit);}
+if(ymin/yscale&&(Math.abs(ysize)<ymin/yscale)){y2=(ysize>0)?(y1+ymin/yscale):(y1-ymin/yscale);}
+if(xmin/xscale&&(Math.abs(xsize)<xmin/xscale)){x2=(xsize>0)?(x1+xmin/xscale):(x1-xmin/xscale);}
+if(x1<0){x2-=x1;x1-=x1;}
+if(y1<0){y2-=y1;y1-=y1;}
+if(x2<0){x1-=x2;x2-=x2;}
+if(y2<0){y1-=y2;y2-=y2;}
+if(x2>boundx){delta=x2-boundx;x1-=delta;x2-=delta;}
+if(y2>boundy){delta=y2-boundy;y1-=delta;y2-=delta;}
+if(x1>boundx){delta=x1-boundy;y2-=delta;y1-=delta;}
+if(y1>boundy){delta=y1-boundy;y2-=delta;y1-=delta;}
+return makeObj(flipCoords(x1,y1,x2,y2));}
+function makeObj(a)
+{return{x:a[0],y:a[1],x2:a[2],y2:a[3],w:a[2]-a[0],h:a[3]-a[1]};}
+return{flipCoords:flipCoords,setPressed:setPressed,setCurrent:setCurrent,getOffset:getOffset,moveOffset:moveOffset,getCorner:getCorner,getFixed:getFixed};}());var Shade=(function(){var enabled=false,holder=$('<div />').css({position:'absolute',zIndex:240,opacity:0}),shades={top:createShade(),left:createShade().height(boundy),right:createShade().height(boundy),bottom:createShade()};function resizeShades(w,h){shades.left.css({height:px(h)});shades.right.css({height:px(h)});}
+function updateAuto()
+{return updateShade(Coords.getFixed());}
+function updateShade(c)
+{shades.top.css({left:px(c.x),width:px(c.w),height:px(c.y)});shades.bottom.css({top:px(c.y2),left:px(c.x),width:px(c.w),height:px(boundy-c.y2)});shades.right.css({left:px(c.x2),width:px(boundx-c.x2)});shades.left.css({width:px(c.x)});}
+function createShade(){return $('<div />').css({position:'absolute',backgroundColor:options.shadeColor||options.bgColor}).appendTo(holder);}
+function enableShade(){if(!enabled){enabled=true;holder.insertBefore($img);updateAuto();Selection.setBgOpacity(1,0,1);$img2.hide();setBgColor(options.shadeColor||options.bgColor,1);if(Selection.isAwake())
+{setOpacity(options.bgOpacity,1);}
+else setOpacity(1,1);}}
+function setBgColor(color,now){colorChangeMacro(getShades(),color,now);}
+function disableShade(){if(enabled){holder.remove();$img2.show();enabled=false;if(Selection.isAwake()){Selection.setBgOpacity(options.bgOpacity,1,1);}else{Selection.setBgOpacity(1,1,1);Selection.disableHandles();}
+colorChangeMacro($div,0,1);}}
+function setOpacity(opacity,now){if(enabled){if(options.bgFade&&!now){holder.animate({opacity:1-opacity},{queue:false,duration:options.fadeTime});}
+else holder.css({opacity:1-opacity});}}
+function refreshAll(){options.shade?enableShade():disableShade();if(Selection.isAwake())setOpacity(options.bgOpacity);}
+function getShades(){return holder.children();}
+return{update:updateAuto,updateRaw:updateShade,getShades:getShades,setBgColor:setBgColor,enable:enableShade,disable:disableShade,resize:resizeShades,refresh:refreshAll,opacity:setOpacity};}());var Selection=(function(){var awake,hdep=370;var borders={};var handle={};var seehandles=false;var hhs=options.handleOffset;function insertBorder(type)
+{var jq=$('<div />').css({position:'absolute',opacity:options.borderOpacity}).addClass(cssClass(type));$img_holder.append(jq);return jq;}
+function dragDiv(ord,zi)
+{var jq=$('<div />').mousedown(createDragger(ord)).css({cursor:ord+'-resize',position:'absolute',zIndex:zi}).addClass('ord-'+ord);if(Touch.support){jq.bind('touchstart.jcrop',Touch.createDragger(ord));}
+$hdl_holder.append(jq);return jq;}
+function insertHandle(ord)
+{var hs=options.handleSize;return dragDiv(ord,hdep++).css({top:px(-hhs+1),left:px(-hhs+1),opacity:options.handleOpacity}).width(hs).height(hs).addClass(cssClass('handle'));}
+function insertDragbar(ord)
+{var s=options.handleSize,h=s,w=s,t=hhs,l=hhs;switch(ord){case'n':case's':w='100%';break;case'e':case'w':h='100%';break;}
+return dragDiv(ord,hdep++).width(w).height(h).css({top:px(-t+1),left:px(-l+1)});}
+function createHandles(li)
+{var i;for(i=0;i<li.length;i++){handle[li[i]]=insertHandle(li[i]);}}
+function moveHandles(c)
+{var midvert=Math.round((c.h/2)-hhs),midhoriz=Math.round((c.w/2)-hhs),north=-hhs+1,west=-hhs+1,east=c.w-hhs,south=c.h-hhs,x,y;if(handle.e){handle.e.css({top:px(midvert),left:px(east)});handle.w.css({top:px(midvert)});handle.s.css({top:px(south),left:px(midhoriz)});handle.n.css({left:px(midhoriz)});}
+if(handle.ne){handle.ne.css({left:px(east)});handle.se.css({top:px(south),left:px(east)});handle.sw.css({top:px(south)});}
+if(handle.b){handle.b.css({top:px(south)});handle.r.css({left:px(east)});}}
+function moveto(x,y)
+{if(!options.shade){$img2.css({top:px(-y),left:px(-x)});}
+$sel.css({top:px(y),left:px(x)});}
+function resize(w,h)
+{$sel.width(w).height(h);}
+function refresh()
+{var c=Coords.getFixed();Coords.setPressed([c.x,c.y]);Coords.setCurrent([c.x2,c.y2]);updateVisible();}
+function updateVisible(select)
+{if(awake){return update(select);}}
+function update(select)
+{var c=Coords.getFixed();resize(c.w,c.h);moveto(c.x,c.y);if(options.shade)Shade.updateRaw(c);if(seehandles){moveHandles(c);}
+if(!awake){show();}
+if(select){options.onSelect.call(api,unscale(c));}else{options.onChange.call(api,unscale(c));}}
+function setBgOpacity(opacity,force,now)
+{if(!awake&&!force)return;if(options.bgFade&&!now){$img.animate({opacity:opacity},{queue:false,duration:options.fadeTime});}else{$img.css('opacity',opacity);}}
+function show()
+{$sel.show();if(options.shade)Shade.opacity(bgopacity);else setBgOpacity(bgopacity,true);awake=true;}
+function release()
+{disableHandles();$sel.hide();if(options.shade)Shade.opacity(1);else setBgOpacity(1);awake=false;options.onRelease.call(api);}
+function showHandles()
+{if(seehandles){moveHandles(Coords.getFixed());$hdl_holder.show();}}
+function enableHandles()
+{seehandles=true;if(options.allowResize){moveHandles(Coords.getFixed());$hdl_holder.show();return true;}}
+function disableHandles()
+{seehandles=false;$hdl_holder.hide();}
+function animMode(v)
+{if(animating===v){disableHandles();}else{enableHandles();}}
+function done()
+{animMode(false);refresh();}
+if(options.drawBorders){borders={top:insertBorder('hline'),bottom:insertBorder('hline bottom'),left:insertBorder('vline'),right:insertBorder('vline right')};}
+if(options.dragEdges){handle.t=insertDragbar('n');handle.b=insertDragbar('s');handle.r=insertDragbar('e');handle.l=insertDragbar('w');}
+if(options.sideHandles){createHandles(['n','s','e','w']);}
+if(options.cornerHandles){createHandles(['sw','nw','ne','se']);}
+$(document).bind('touchstart.jcrop-ios',function(e){if($(e.currentTarget).hasClass('jcrop-tracker'))e.stopPropagation();});var $track=newTracker().mousedown(createDragger('move')).css({cursor:'move',position:'absolute',zIndex:360});if(Touch.support){$track.bind('touchstart.jcrop',Touch.createDragger('move'));}
+$img_holder.append($track);disableHandles();return{updateVisible:updateVisible,update:update,release:release,refresh:refresh,isAwake:function(){return awake;},setCursor:function(cursor){$track.css('cursor',cursor);},enableHandles:enableHandles,enableOnly:function(){seehandles=true;},showHandles:showHandles,disableHandles:disableHandles,animMode:animMode,setBgOpacity:setBgOpacity,done:done};}());var Tracker=(function(){var onMove=function(){},onDone=function(){},trackDoc=options.trackDocument;function toFront()
+{$trk.css({zIndex:450});if(Touch.support){$(document).bind('touchmove.jcrop',trackTouchMove).bind('touchend.jcrop',trackTouchEnd);}
+if(trackDoc){$(document).bind('mousemove.jcrop',trackMove).bind('mouseup.jcrop',trackUp);}}
+function toBack()
+{$trk.css({zIndex:290});$(document).unbind('.jcrop');}
+function trackMove(e)
+{onMove(mouseAbs(e));return false;}
+function trackUp(e)
+{e.preventDefault();e.stopPropagation();if(btndown){btndown=false;onDone(mouseAbs(e));if(Selection.isAwake()){options.onSelect.call(api,unscale(Coords.getFixed()));}
+toBack();onMove=function(){};onDone=function(){};}
+return false;}
+function activateHandlers(move,done)
+{btndown=true;onMove=move;onDone=done;toFront();return false;}
+function trackTouchMove(e)
+{e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return trackMove(e);}
+function trackTouchEnd(e)
+{e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return trackUp(e);}
+function setCursor(t)
+{$trk.css('cursor',t);}
+if(!trackDoc){$trk.mousemove(trackMove).mouseup(trackUp).mouseout(trackUp);}
+$img.before($trk);return{activateHandlers:activateHandlers,setCursor:setCursor};}());var KeyManager=(function(){var $keymgr=$('<input type="radio" />').css({position:'fixed',left:'-120px',width:'12px'}),$keywrap=$('<div />').css({position:'absolute',overflow:'hidden'}).append($keymgr);function watchKeys()
+{if(options.keySupport){$keymgr.show();$keymgr.focus();}}
+function onBlur(e)
+{$keymgr.hide();}
+function doNudge(e,x,y)
+{if(options.allowMove){Coords.moveOffset([x,y]);Selection.updateVisible(true);}
+e.preventDefault();e.stopPropagation();}
+function parseKey(e)
+{if(e.ctrlKey||e.metaKey){return true;}
+shift_down=e.shiftKey?true:false;var nudge=shift_down?10:1;switch(e.keyCode){case 37:doNudge(e,-nudge,0);break;case 39:doNudge(e,nudge,0);break;case 38:doNudge(e,0,-nudge);break;case 40:doNudge(e,0,nudge);break;case 27:if(options.allowSelect)Selection.release();break;case 9:return true;}
+return false;}
+if(options.keySupport){$keymgr.keydown(parseKey).blur(onBlur);if(ie6mode||!options.fixedSupport){$keymgr.css({position:'absolute',left:'-20px'});$keywrap.append($keymgr).insertBefore($img);}else{$keymgr.insertBefore($img);}}
+return{watchKeys:watchKeys};}());function setClass(cname)
+{$div.removeClass().addClass(cssClass('holder')).addClass(cname);}
+function animateTo(a,callback)
+{var x1=parseInt(a[0],10)/xscale,y1=parseInt(a[1],10)/yscale,x2=parseInt(a[2],10)/xscale,y2=parseInt(a[3],10)/yscale;if(animating){return;}
+var animto=Coords.flipCoords(x1,y1,x2,y2),c=Coords.getFixed(),initcr=[c.x,c.y,c.x2,c.y2],animat=initcr,interv=options.animationDelay,ix1=animto[0]-initcr[0],iy1=animto[1]-initcr[1],ix2=animto[2]-initcr[2],iy2=animto[3]-initcr[3],pcent=0,velocity=options.swingSpeed;x=animat[0];y=animat[1];x2=animat[2];y2=animat[3];Selection.animMode(true);var anim_timer;function queueAnimator(){window.setTimeout(animator,interv);}
+var animator=(function(){return function(){pcent+=(100-pcent)/velocity;animat[0]=x+((pcent/100)*ix1);animat[1]=y+((pcent/100)*iy1);animat[2]=x2+((pcent/100)*ix2);animat[3]=y2+((pcent/100)*iy2);if(pcent>=99.8){pcent=100;}
+if(pcent<100){setSelectRaw(animat);queueAnimator();}else{Selection.done();if(typeof(callback)==='function'){callback.call(api);}}};}());queueAnimator();}
+function setSelect(rect)
+{setSelectRaw([parseInt(rect[0],10)/xscale,parseInt(rect[1],10)/yscale,parseInt(rect[2],10)/xscale,parseInt(rect[3],10)/yscale]);options.onSelect.call(api,unscale(Coords.getFixed()));Selection.enableHandles();}
+function setSelectRaw(l)
+{Coords.setPressed([l[0],l[1]]);Coords.setCurrent([l[2],l[3]]);Selection.update();}
+function tellSelect()
+{return unscale(Coords.getFixed());}
+function tellScaled()
+{return Coords.getFixed();}
+function setOptionsNew(opt)
+{setOptions(opt);interfaceUpdate();}
+function disableCrop()
+{options.disabled=true;Selection.disableHandles();Selection.setCursor('default');Tracker.setCursor('default');}
+function enableCrop()
+{options.disabled=false;interfaceUpdate();}
+function cancelCrop()
+{Selection.done();Tracker.activateHandlers(null,null);}
+function destroy()
+{$div.remove();$origimg.show();$(obj).removeData('Jcrop');}
+function setImage(src,callback)
+{Selection.release();disableCrop();var img=new Image();img.onload=function(){var iw=img.width;var ih=img.height;var bw=options.boxWidth;var bh=options.boxHeight;$img.width(iw).height(ih);$img.attr('src',src);$img2.attr('src',src);presize($img,bw,bh);boundx=$img.width();boundy=$img.height();$img2.width(boundx).height(boundy);$trk.width(boundx+(bound*2)).height(boundy+(bound*2));$div.width(boundx).height(boundy);Shade.resize(boundx,boundy);enableCrop();if(typeof(callback)==='function'){callback.call(api);}};img.src=src;}
+function colorChangeMacro($obj,color,now){var mycolor=color||options.bgColor;if(options.bgFade&&supportsColorFade()&&options.fadeTime&&!now){$obj.animate({backgroundColor:mycolor},{queue:false,duration:options.fadeTime});}else{$obj.css('backgroundColor',mycolor);}}
+function interfaceUpdate(alt)
+{if(options.allowResize){if(alt){Selection.enableOnly();}else{Selection.enableHandles();}}else{Selection.disableHandles();}
+Tracker.setCursor(options.allowSelect?'crosshair':'default');Selection.setCursor(options.allowMove?'move':'default');if(options.hasOwnProperty('trueSize')){xscale=options.trueSize[0]/boundx;yscale=options.trueSize[1]/boundy;}
+if(options.hasOwnProperty('setSelect')){setSelect(options.setSelect);Selection.done();delete(options.setSelect);}
+Shade.refresh();if(options.bgColor!=bgcolor){colorChangeMacro(options.shade?Shade.getShades():$div,options.shade?(options.shadeColor||options.bgColor):options.bgColor);bgcolor=options.bgColor;}
+if(bgopacity!=options.bgOpacity){bgopacity=options.bgOpacity;if(options.shade)Shade.refresh();else Selection.setBgOpacity(bgopacity);}
+xlimit=options.maxSize[0]||0;ylimit=options.maxSize[1]||0;xmin=options.minSize[0]||0;ymin=options.minSize[1]||0;if(options.hasOwnProperty('outerImage')){$img.attr('src',options.outerImage);delete(options.outerImage);}
+Selection.refresh();}
+if(Touch.support)$trk.bind('touchstart.jcrop',Touch.newSelection);$hdl_holder.hide();interfaceUpdate(true);var api={setImage:setImage,animateTo:animateTo,setSelect:setSelect,setOptions:setOptionsNew,tellSelect:tellSelect,tellScaled:tellScaled,setClass:setClass,disable:disableCrop,enable:enableCrop,cancel:cancelCrop,release:Selection.release,destroy:destroy,focus:KeyManager.watchKeys,getBounds:function(){return[boundx*xscale,boundy*yscale];},getWidgetSize:function(){return[boundx,boundy];},getScaleFactor:function(){return[xscale,yscale];},ui:{holder:$div,selection:$sel}};if($.browser.msie){$div.bind('selectstart',function(){return false;});}
+$origimg.data('Jcrop',api);return api;};$.fn.Jcrop=function(options,callback)
+{var api;this.each(function(){if($(this).data('Jcrop')){if(options==='api')return $(this).data('Jcrop');else $(this).data('Jcrop').setOptions(options);}
+else{if(this.tagName=='IMG')
+$.Jcrop.Loader(this,function(){$(this).css({display:'block',visibility:'hidden'});api=$.Jcrop(this,options);if($.isFunction(callback))callback.call(api);});else{$(this).css({display:'block',visibility:'hidden'});api=$.Jcrop(this,options);if($.isFunction(callback))callback.call(api);}}});return this;};$.Jcrop.Loader=function(imgobj,success,error){var $img=$(imgobj),img=$img[0];function completeCheck(){if(img.complete){$img.unbind('.jcloader');if($.isFunction(success))success.call(img);}
+else window.setTimeout(completeCheck,50);}
+$img.bind('load.jcloader',completeCheck).bind('error.jcloader',function(e){$img.unbind('.jcloader');if($.isFunction(error))error.call(img);});if(img.complete&&$.isFunction(success)){$img.unbind('.jcloader');success.call(img);}};$.Jcrop.defaults={allowSelect:true,allowMove:true,allowResize:true,trackDocument:true,baseClass:'jcrop',addClass:null,bgColor:'black',bgOpacity:0.6,bgFade:false,borderOpacity:0.4,handleOpacity:0.5,handleSize:7,handleOffset:5,aspectRatio:0,keySupport:true,cornerHandles:true,sideHandles:true,drawBorders:true,dragEdges:true,fixedSupport:true,touchSupport:null,shade:null,boxWidth:0,boxHeight:0,boundary:2,fadeTime:400,animationDelay:20,swingSpeed:3,minSelect:[0,0],maxSize:[0,0],minSize:[0,0],onChange:function(){},onSelect:function(){},onDblClick:function(){},onRelease:function(){}};}(jQuery));
\ No newline at end of file
diff --git a/apps/contacts/js/jquery.jec-1.3.3.js b/apps/contacts/js/jquery.jec-1.3.3.js
new file mode 100644
index 00000000000..a0367dac2ae
--- /dev/null
+++ b/apps/contacts/js/jquery.jec-1.3.3.js
@@ -0,0 +1,863 @@
+/**
+ * jQuery jEC (jQuery Editable Combobox) 1.3.3
+ * http://code.google.com/p/jquery-jec
+ *
+ * Copyright (c) 2008-2009 Lukasz Rajchel (lukasz@rajchel.pl | http://rajchel.pl)
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ *
+ * Documentation :  http://code.google.com/p/jquery-jec/wiki/Documentation
+ * Changelog     :  http://code.google.com/p/jquery-jec/wiki/Changelog
+ *
+ * Contributors  :  Lukasz Rajchel, Artem Orlov
+ */
+
+/*jslint maxerr: 50, indent: 4, maxlen: 120*/
+/*global Array, Math, String, clearInterval, document, jQuery, setInterval*/
+/*members ':', Handle, Remove, Set, acceptedKeys, addClass, all, append, appendTo, array, attr, before, bind,
+blinkingCursor, blinkingCursorInterval, blur, bool, browser, ceil, change, charCode, classes, clearCursor, click, css,
+cursorState, data, destroy, disable, each, editable, enable, eq, expr, extend, filter, find, floor, fn, focus,
+focusOnNewOption, fromCharCode, get, getId, handleCursor, ignoredKeys, ignoreOptGroups, inArray, init, initJS, integer,
+isArray, isPlainObject, jEC, jECTimer, jec, jecKill, jecOff, jecOn, jecPref, jecValue, keyCode, keyDown, keyPress,
+keyRange, keyUp, keys, length, max, maxLength, min, msie, object, openedState, optionClasses, optionStyles, parent,
+position, pref, prop, push, random, remove, removeAttr, removeClass, removeData, removeProp, safari, setEditableOption,
+styles, substring, text, trigger, triggerChangeEvent, unbind, uneditable, useExistingOptions, val, value,
+valueIsEditable, which*/
+(function ($) {
+    'use strict';
+
+    $.jEC = (function () {
+        var pluginClass = 'jecEditableOption', cursorClass = 'hasCursor', options = {}, values = {}, lastKeyCode,
+            defaults, Validators, EventHandlers, Combobox, activeCombobox;
+
+        if ($.fn.prop === undefined) {
+            $.fn.extend({
+                'prop': function (key, valueSet) {
+                    if (valueSet) {
+                        $(this).attr(key, key);
+                    } else {
+                        $(this).removeAttr(key);
+                    }
+                },
+                'removeProp': function (key) {
+                    $(this).removeAttr(key);
+                }
+            });
+        }
+
+        defaults = {
+            position: 0,
+            ignoreOptGroups: false,
+            maxLength: 255,
+            classes: [],
+            styles: {},
+            optionClasses: [],
+            optionStyles: {},
+            triggerChangeEvent: false,
+            focusOnNewOption: false,
+            useExistingOptions: false,
+            blinkingCursor: false,
+            blinkingCursorInterval: 1000,
+            ignoredKeys: [],
+            acceptedKeys: [[32, 126], [191, 382]]
+        };
+
+        Validators = (function () {
+            return {
+                integer: function (value) {
+                    return typeof value === 'number' && Math.ceil(value) === Math.floor(value);
+                },
+
+                keyRange: function (value) {
+                    var min, max;
+                    if ($.isPlainObject(value)) {
+                        min = value.min;
+                        max = value.max;
+                    } else if ($.isArray(value) && value.length === 2) {
+                        min = value[0];
+                        max = value[1];
+                    }
+                    return Validators.integer(min) && Validators.integer(max) && min <= max;
+                }
+            };
+        }());
+
+        EventHandlers = (function () {
+            var getKeyCode;
+
+            getKeyCode = function (event) {
+                var charCode = event.charCode;
+                if (charCode !== undefined && charCode !== 0) {
+                    return charCode;
+                } else {
+                    return event.keyCode;
+                }
+            };
+
+            return {
+                // focus event handler
+                // enables blinking cursor
+                focus: function () {
+                    var opt = options[Combobox.getId($(this))];
+                    if (opt.blinkingCursor && $.jECTimer === undefined) {
+                        activeCombobox = $(this);
+                        $.jECTimer = setInterval($.jEC.handleCursor, opt.blinkingCursorInterval);
+                    }
+                },
+
+                // blur event handler
+                // disables blinking cursor
+                blur: function () {
+                    if ($.jECTimer !== undefined) {
+                        clearInterval($.jECTimer);
+                        $.jECTimer = undefined;
+                        activeCombobox = undefined;
+                        Combobox.clearCursor($(this));
+                    }
+                    Combobox.openedState($(this), false);
+                },
+
+                // keydown event handler
+                // handles keys pressed on select (backspace and delete must be handled
+                // in keydown event in order to work in IE)
+                keyDown: function (event) {
+					var keyCode = getKeyCode(event), option, value;
+
+                    lastKeyCode = keyCode;
+
+                    switch (keyCode) {
+                    case 8:  // backspace
+                    case 46: // delete
+                        option = $(this).find('option.' + pluginClass);
+                        if (option.val().length >= 1) {
+                            value = option.text().substring(0, option.text().length - 1);
+                            option.val(value).text(value).prop('selected', true);
+                        }
+                        return (keyCode !== 8);
+                    default:
+                        break;
+                    }
+                },
+
+                // keypress event handler
+                // handles the rest of the keys (keypress event gives more informations
+                // about pressed keys)
+                keyPress: function (event) {
+                    var keyCode = getKeyCode(event), opt = options[Combobox.getId($(this))],
+                        option, value, specialKeys, exit = false, text;
+
+                    Combobox.clearCursor($(this));
+                    if (keyCode !== 9 && keyCode !== 13 && keyCode !== 27) {
+                        // special keys codes
+                        specialKeys = [37, 38, 39, 40, 46];
+                        // handle special keys
+                        $.each(specialKeys, function (i, val) {
+							if (keyCode === val && keyCode === lastKeyCode) {
+                                exit = true;
+                            }
+                        });
+
+                        // don't handle ignored keys
+                        if (!exit && $.inArray(keyCode, opt.ignoredKeys) === -1) {
+                            // remove selection from all options
+                            $(this).find('option:selected').removeProp('selected');
+
+                            if ($.inArray(keyCode, opt.acceptedKeys) !== -1) {
+                                option = $(this).find('option.' + pluginClass);
+                                text = option.text();
+
+                                if (text.length < opt.maxLength) {
+                                    value = text + String.fromCharCode(getKeyCode(event));
+                                    option.val(value).text(value);
+                                }
+
+                                option.prop('selected', true);
+                            }
+                        }
+
+                        return false;
+                    }
+                },
+
+                keyUp: function () {
+					var opt = options[Combobox.getId($(this))];
+                    if (opt.triggerChangeEvent) {
+                        $(this).trigger('change');
+                    }
+                },
+
+                // change event handler
+                // handles editable option changing based on a pre-existing values
+                change: function () {
+                    var opt = options[Combobox.getId($(this))];
+                    if (opt.useExistingOptions) {
+                        Combobox.setEditableOption($(this));
+                    }
+                },
+
+                click: function () {
+                    if (!$.browser.safari) {
+                        Combobox.openedState($(this), !Combobox.openedState($(this)));
+                    }
+                }
+            };
+        }());
+
+        // Combobox
+        Combobox = (function () {
+            var Parameters, EditableOption, generateId, setup;
+
+            // validates and set combobox parameters
+            Parameters = (function () {
+                var Set, Remove, Handle;
+
+                Set = (function () {
+                    var parseKeys, Handles;
+
+                    parseKeys = function (value) {
+                        var keys = [];
+                        if ($.isArray(value)) {
+                            $.each(value, function (i, val) {
+                                var j, min, max;
+                                if (Validators.keyRange(val)) {
+                                    if ($.isArray(val)) {
+                                        min = val[0];
+                                        max = val[1];
+                                    } else {
+                                        min = val.min;
+                                        max = val.max;
+                                    }
+                                    for (j = min; j <= max; j += 1) {
+                                        keys.push(j);
+                                    }
+                                } else if (typeof val === 'number' && Validators.integer(val)) {
+                                    keys.push(val);
+                                }
+                            });
+                        }
+                        return keys;
+                    };
+
+                    Handles = (function () {
+                        return {
+                            integer: function (elem, name, value) {
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (opt !== undefined && Validators.integer(value)) {
+                                    opt[name] = value;
+                                    return true;
+                                }
+                                return false;
+                            },
+                            bool: function (elem, name, value) {
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (opt !== undefined && typeof value === 'boolean') {
+                                    opt[name] = value;
+                                    return true;
+                                }
+                                return false;
+                            },
+                            array: function (elem, name, value) {
+                                if (typeof value === 'string') {
+                                    value = [value];
+                                }
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (opt !== undefined && $.isArray(value)) {
+                                    opt[name] = value;
+                                    return true;
+                                }
+                                return false;
+                            },
+                            object: function (elem, name, value) {
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (opt !== undefined && value !== null && $.isPlainObject(value)) {
+                                    opt[name] = value;
+                                }
+                            },
+                            keys: function (elem, name, value) {
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (opt !== undefined && $.isArray(value)) {
+                                    opt[name] = parseKeys(value);
+                                }
+                            }
+                        };
+                    }());
+
+                    return {
+                        position: function (elem, value) {
+                            if (Handles.integer(elem, 'position', value)) {
+                                var id = Combobox.getId(elem), opt = options[id], optionsCount;
+                                optionsCount =
+                                    elem.find('option:not(.' + pluginClass + ')').length;
+                                if (value > optionsCount) {
+                                    opt.position = optionsCount;
+                                }
+                            }
+                        },
+
+                        ignoreOptGroups: function (elem, value) {
+                            Handles.bool(elem, 'ignoreOptGroups', value);
+                        },
+
+                        maxLength: function (elem, value) {
+                            if (Handles.integer(elem, 'maxLength', value)) {
+                                var id = Combobox.getId(elem), opt = options[id];
+                                if (value < 0 || value > 255) {
+                                    opt.maxLength = 255;
+                                }
+                            }
+                        },
+
+                        classes: function (elem, value) {
+                            Handles.array(elem, 'classes', value);
+                        },
+
+                        optionClasses: function (elem, value) {
+                            Handles.array(elem, 'optionClasses', value);
+                        },
+
+                        styles: function (elem, value) {
+                            Handles.object(elem, 'styles', value);
+                        },
+
+                        optionStyles: function (elem, value) {
+                            Handles.object(elem, 'optionStyles', value);
+                        },
+
+                        triggerChangeEvent: function (elem, value) {
+                            Handles.bool(elem, 'triggerChangeEvent', value);
+                        },
+
+                        focusOnNewOption: function (elem, value) {
+                            Handles.bool(elem, 'focusOnNewOption', value);
+                        },
+
+                        useExistingOptions: function (elem, value) {
+                            Handles.bool(elem, 'useExistingOptions', value);
+                        },
+
+                        blinkingCursor: function (elem, value) {
+                            Handles.bool(elem, 'blinkingCursor', value);
+                        },
+
+                        blinkingCursorInterval: function (elem, value) {
+                            Handles.integer(elem, 'blinkingCursorInterval', value);
+                        },
+
+                        ignoredKeys: function (elem, value) {
+                            Handles.keys(elem, 'ignoredKeys', value);
+                        },
+
+                        acceptedKeys: function (elem, value) {
+                            Handles.keys(elem, 'acceptedKeys', value);
+                        }
+                    };
+                }());
+
+                Remove = (function () {
+                    var removeClasses, removeStyles;
+
+                    removeClasses = function (elem, classes) {
+                        $.each(classes, function (i, val) {
+							elem.removeClass(val);
+                        });
+                    };
+
+                    removeStyles = function (elem, styles) {
+                        $.each(styles, function (key) {
+                            elem.css(key, '');
+                        });
+                    };
+
+                    return {
+                        classes: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                removeClasses(elem, opt.classes);
+                            }
+                        },
+
+                        optionClasses: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                removeClasses(elem.find('option.' + pluginClass),
+                                    opt.optionClasses);
+                            }
+                        },
+
+                        styles: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                removeStyles(elem, opt.styles);
+                            }
+                        },
+
+                        optionStyles: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                removeStyles(elem.find('option.' + pluginClass),
+                                    opt.optionStyles);
+                            }
+                        },
+
+                        all: function (elem) {
+                            Remove.classes(elem);
+                            Remove.optionClasses(elem);
+                            Remove.styles(elem);
+                            Remove.optionStyles(elem);
+                        }
+                    };
+                }());
+
+                Handle = (function () {
+                    var setClasses, setStyles;
+
+                    setClasses = function (elem, classes) {
+                        $.each(classes, function (i, val) {
+                            elem.addClass(String(val));
+                        });
+                    };
+
+                    setStyles = function (elem, styles) {
+                        $.each(styles, function (key, val) {
+                            elem.css(key, val);
+                        });
+                    };
+
+                    return {
+                        position: function (elem) {
+                            var opt = options[Combobox.getId(elem)], option, uneditableOptions, container;
+                            option = elem.find('option.' + pluginClass);
+
+                            uneditableOptions = elem.find('option:not(.' + pluginClass + ')');
+                            if (opt.position < uneditableOptions.length) {
+                                container = uneditableOptions.eq(opt.position);
+
+                                if (!opt.ignoreOptGroups && container.parent('optgroup').length > 0) {
+                                    uneditableOptions.eq(opt.position).parent().before(option);
+                                } else {
+                                    uneditableOptions.eq(opt.position).before(option);
+                                }
+                            } else {
+                                elem.append(option);
+                            }
+                        },
+
+                        classes: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                setClasses(elem, opt.classes);
+                            }
+                        },
+
+                        optionClasses: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                setClasses(elem.find('option.' + pluginClass), opt.optionClasses);
+                            }
+                        },
+
+                        styles: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                setStyles(elem, opt.styles);
+                            }
+                        },
+
+                        optionStyles: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined) {
+                                setStyles(elem.find('option.' + pluginClass), opt.optionStyles);
+                            }
+                        },
+
+                        focusOnNewOption: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined && opt.focusOnNewOption) {
+                                elem.find(':not(option.' + pluginClass + ')').removeProp('selected');
+                                elem.find('option.' + pluginClass).prop('selected', true);
+                            }
+                        },
+
+                        useExistingOptions: function (elem) {
+                            var id = Combobox.getId(elem), opt = options[id];
+                            if (opt !== undefined && opt.useExistingOptions) {
+                                Combobox.setEditableOption(elem);
+                            }
+                        },
+
+                        all: function (elem) {
+                            Handle.position(elem);
+                            Handle.classes(elem);
+                            Handle.optionClasses(elem);
+                            Handle.styles(elem);
+                            Handle.optionStyles(elem);
+                            Handle.focusOnNewOption(elem);
+                            Handle.useExistingOptions(elem);
+                        }
+                    };
+                }());
+
+                return {
+                    Set: Set,
+                    Remove: Remove,
+                    Handle: Handle
+                };
+            }());
+
+            EditableOption = (function () {
+                return {
+                    init: function (elem) {
+                        if (!elem.find('option.' + pluginClass).length) {
+                            var editableOption = $('<option>');
+                            editableOption.addClass(pluginClass);
+                            elem.append(editableOption);
+                        }
+
+                        elem.bind('keydown', EventHandlers.keyDown);
+                        elem.bind('keypress', EventHandlers.keyPress);
+                        elem.bind('keyup', EventHandlers.keyUp);
+                        elem.bind('change', EventHandlers.change);
+                        elem.bind('focus', EventHandlers.focus);
+                        elem.bind('blur', EventHandlers.blur);
+                        elem.bind('click', EventHandlers.click);
+                    },
+
+                    destroy: function (elem) {
+                        elem.find('option.' + pluginClass).remove();
+
+                        elem.unbind('keydown', EventHandlers.keyDown);
+                        elem.unbind('keypress', EventHandlers.keyPress);
+                        elem.unbind('keyup', EventHandlers.keyUp);
+                        elem.unbind('change', EventHandlers.change);
+                        elem.unbind('focus', EventHandlers.focus);
+                        elem.unbind('blur', EventHandlers.blur);
+                        elem.unbind('click', EventHandlers.click);
+                    }
+                };
+            }());
+
+            // generates unique identifier
+            generateId = function () {
+                while (true) {
+                    var random = Math.floor(Math.random() * 100000);
+
+                    if (options[random] === undefined) {
+                        return random;
+                    }
+                }
+            };
+
+            // sets combobox
+            setup = function (elem) {
+                EditableOption.init(elem);
+                Parameters.Handle.all(elem);
+            };
+
+            // Combobox public members
+            return {
+                // create editable combobox
+                init: function (settings) {
+                    return $(this).filter(':uneditable').each(function () {
+                        var id = generateId(), elem = $(this);
+
+                        elem.data('jecId', id);
+
+                        // override passed default options
+                        options[id] = $.extend(true, {}, defaults);
+
+                        // parse keys
+                        Parameters.Set.ignoredKeys(elem, options[id].ignoredKeys);
+                        Parameters.Set.acceptedKeys(elem, options[id].acceptedKeys);
+
+                        if ($.isPlainObject(settings)) {
+                            $.each(settings, function (key, val) {
+                                if (val !== undefined) {
+                                    switch (key) {
+                                    case 'position':
+                                        Parameters.Set.position(elem, val);
+                                        break;
+                                    case 'ignoreOptGroups':
+                                        Parameters.Set.ignoreOptGroups(elem, val);
+                                        break;
+                                    case 'maxLength':
+                                        Parameters.Set.maxLength(elem, val);
+                                        break;
+                                    case 'classes':
+                                        Parameters.Set.classes(elem, val);
+                                        break;
+                                    case 'optionClasses':
+                                        Parameters.Set.optionClasses(elem, val);
+                                        break;
+                                    case 'styles':
+                                        Parameters.Set.styles(elem, val);
+                                        break;
+                                    case 'optionStyles':
+                                        Parameters.Set.optionStyles(elem, val);
+                                        break;
+                                    case 'triggerChangeEvent':
+                                        Parameters.Set.triggerChangeEvent(elem, val);
+                                        break;
+                                    case 'focusOnNewOption':
+                                        Parameters.Set.focusOnNewOption(elem, val);
+                                        break;
+                                    case 'useExistingOptions':
+                                        Parameters.Set.useExistingOptions(elem, val);
+                                        break;
+                                    case 'blinkingCursor':
+                                        Parameters.Set.blinkingCursor(elem, val);
+                                        break;
+                                    case 'blinkingCursorInterval':
+                                        Parameters.Set.blinkingCursorInterval(elem, val);
+                                        break;
+                                    case 'ignoredKeys':
+                                        Parameters.Set.ignoredKeys(elem, val);
+                                        break;
+                                    case 'acceptedKeys':
+                                        Parameters.Set.acceptedKeys(elem, val);
+                                        break;
+                                    }
+                                }
+                            });
+                        }
+
+                        setup($(this));
+                    });
+                },
+
+                // creates editable combobox without using existing select elements
+                initJS: function (options, settings) {
+                    var select, addOptions;
+
+                    select = $('<select>');
+
+                    addOptions = function (elem, options) {
+                        if ($.isArray(options)) {
+                            $.each(options, function (i, val) {
+                                if ($.isPlainObject(val)) {
+                                    $.each(val, function (key, value) {
+                                        if ($.isArray(value)) {
+                                            var og = $('<optgroup>').attr('label', key);
+                                            addOptions(og, value);
+                                            og.appendTo(select);
+                                        } else if (typeof value === 'number' || typeof value === 'string') {
+                                            $('<option>').text(value).attr('value', key)
+                                                .appendTo(elem);
+                                        }
+                                    });
+                                } else if (typeof val === 'string' || typeof val === 'number') {
+                                    $('<option>').text(val).attr('value', val).appendTo(elem);
+                                }
+                            });
+                        }
+                    };
+
+                    addOptions(select, options);
+
+                    return select.jec(settings);
+                },
+
+                // destroys editable combobox
+                destroy: function () {
+                    return $(this).filter(':editable').each(function () {
+                        $(this).jecOff();
+                        $.removeData($(this).get(0), 'jecId');
+                        $.removeData($(this).get(0), 'jecCursorState');
+                        $.removeData($(this).get(0), 'jecOpenedState');
+                    });
+                },
+
+                // enable editablecombobox
+                enable: function () {
+                    return $(this).filter(':editable').each(function () {
+                        var id = Combobox.getId($(this)), value = values[id];
+
+                        setup($(this));
+
+                        if (value !== undefined) {
+                            $(this).jecValue(value);
+                        }
+                    });
+                },
+
+                // disable editable combobox
+                disable: function () {
+                    return $(this).filter(':editable').each(function () {
+                        var val = $(this).find('option.' + pluginClass).val();
+                        values[Combobox.getId($(this))] = val;
+                        Parameters.Remove.all($(this));
+                        EditableOption.destroy($(this));
+                    });
+                },
+
+                // gets or sets editable option's value
+                value: function (value, setFocus) {
+                    if ($(this).filter(':editable').length > 0) {
+                        if (value === null || value === undefined) {
+                            // get value
+                            return $(this).find('option.' + pluginClass).val();
+                        } else if (typeof value === 'string' || typeof value === 'number') {
+                            // set value
+                            return $(this).filter(':editable').each(function () {
+                                var option = $(this).find('option.' + pluginClass);
+                                option.val(value).text(value);
+                                if (typeof setFocus !== 'boolean' || setFocus) {
+                                    option.prop('selected', true);
+                                }
+                            });
+                        }
+                    }
+                },
+
+                // gets or sets editable option's preference
+                pref: function (name, value) {
+                    if ($(this).filter(':editable').length > 0) {
+                        if (typeof name === 'string') {
+                            if (value === null || value === undefined) {
+                                // get preference
+                                return options[Combobox.getId($(this))][name];
+                            } else {
+                                // set preference
+                                return $(this).filter(':editable').each(function () {
+                                    switch (name) {
+                                    case 'position':
+                                        Parameters.Set.position($(this), value);
+                                        Parameters.Handle.position($(this));
+                                        break;
+                                    case 'classes':
+                                        Parameters.Remove.classes($(this));
+                                        Parameters.Set.classes($(this), value);
+                                        Parameters.Handle.position($(this));
+                                        break;
+                                    case 'optionClasses':
+                                        Parameters.Remove.optionClasses($(this));
+                                        Parameters.Set.optionClasses($(this), value);
+                                        Parameters.Set.optionClasses($(this));
+                                        break;
+                                    case 'styles':
+                                        Parameters.Remove.styles($(this));
+                                        Parameters.Set.styles($(this), value);
+                                        Parameters.Set.styles($(this));
+                                        break;
+                                    case 'optionStyles':
+                                        Parameters.Remove.optionStyles($(this));
+                                        Parameters.Set.optionStyles($(this), value);
+                                        Parameters.Handle.optionStyles($(this));
+                                        break;
+                                    case 'focusOnNewOption':
+                                        Parameters.Set.focusOnNewOption($(this), value);
+                                        Parameters.Handle.focusOnNewOption($(this));
+                                        break;
+                                    case 'useExistingOptions':
+                                        Parameters.Set.useExistingOptions($(this), value);
+                                        Parameters.Handle.useExistingOptions($(this));
+                                        break;
+                                    case 'blinkingCursor':
+                                        Parameters.Set.blinkingCursor($(this), value);
+                                        break;
+                                    case 'blinkingCursorInterval':
+                                        Parameters.Set.blinkingCursorInterval($(this), value);
+                                        break;
+                                    case 'ignoredKeys':
+                                        Parameters.Set.ignoredKeys($(this), value);
+                                        break;
+                                    case 'acceptedKeys':
+                                        Parameters.Set.acceptedKeys($(this), value);
+                                        break;
+                                    }
+                                });
+                            }
+                        }
+                    }
+                },
+
+                // sets editable option to the value of currently selected option
+                setEditableOption: function (elem) {
+                    var value = elem.find('option:selected').text();
+                    elem.find('option.' + pluginClass).attr('value', elem.val()).text(value).prop('selected', true);
+                },
+
+                // get combobox id
+                getId: function (elem) {
+                    return elem.data('jecId');
+                },
+
+                valueIsEditable: function (elem) {
+                    return elem.find('option.' + pluginClass).get(0) === elem.find('option:selected').get(0);
+                },
+
+                clearCursor: function (elem) {
+                    $(elem).find('option.' + cursorClass).each(function () {
+                        var text = $(this).text();
+                        $(this).removeClass(cursorClass).text(text.substring(0, text.length - 1));
+                    });
+                },
+
+                cursorState: function (elem, state) {
+                    return elem.data('jecCursorState', state);
+                },
+
+                openedState: function (elem, state) {
+                    return elem.data('jecOpenedState', state);
+                },
+
+                //handles editable cursor
+                handleCursor: function () {
+                    if (activeCombobox !== undefined && activeCombobox !== null) {
+                        if ($.browser.msie && Combobox.openedState(activeCombobox)) {
+                            return;
+                        }
+
+                        var state = Combobox.cursorState(activeCombobox), elem;
+                        if (state) {
+                            Combobox.clearCursor(activeCombobox);
+                        } else if (Combobox.valueIsEditable(activeCombobox)) {
+                            elem = activeCombobox.find('option:selected');
+                            elem.addClass(cursorClass).text(elem.text() + '|');
+                        }
+                        Combobox.cursorState(activeCombobox, !state);
+                    }
+                }
+            };
+        }());
+
+        // jEC public members
+        return {
+            init: Combobox.init,
+            enable: Combobox.enable,
+            disable: Combobox.disable,
+            destroy: Combobox.destroy,
+            value: Combobox.value,
+            pref: Combobox.pref,
+            initJS: Combobox.initJS,
+            handleCursor: Combobox.handleCursor
+        };
+    }());
+
+    // register functions
+    $.fn.extend({
+        jec: $.jEC.init,
+        jecOn: $.jEC.enable,
+        jecOff: $.jEC.disable,
+        jecKill: $.jEC.destroy,
+        jecValue: $.jEC.value,
+        jecPref: $.jEC.pref
+    });
+
+    $.extend({
+        jec: $.jEC.initJS
+    });
+
+    // register selectors
+    $.extend($.expr[':'], {
+        editable: function (a) {
+            var data = $(a).data('jecId');
+            return data !== null && data !== undefined;
+        },
+
+        uneditable: function (a) {
+            var data = $(a).data('jecId');
+            return data === null || data === undefined;
+        }
+    });
+
+}(jQuery));
\ No newline at end of file
diff --git a/apps/contacts/templates/index2.php b/apps/contacts/templates/index2.php
new file mode 100644
index 00000000000..4c0dfad6177
--- /dev/null
+++ b/apps/contacts/templates/index2.php
@@ -0,0 +1,27 @@
+<script type='text/javascript'>
+	var totalurl = '<?php echo OC_Helper::linkTo('contacts', 'carddav.php', null, true); ?>/addressbooks';
+</script>
+<div id="controls">
+	<form>
+		<input type="button" id="contacts_newcontact" value="<?php echo $l->t('Add Contact'); ?>">
+		<input type="button" id="chooseaddressbook" value="<?php echo $l->t('Addressbooks'); ?>">
+	</form>
+</div>
+<div id="leftcontent" class="leftcontent">
+	<ul id="contacts">
+		<?php echo $this->inc("part.contacts"); ?>
+	</ul>
+</div>
+<div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>">
+	<?php
+		if ($_['id']){
+			echo $this->inc('part.contact');
+		}
+		else{
+			echo $this->inc('part.no_contacts');
+		}
+	?>
+</div>
+<!-- Dialogs -->
+<div id="dialog_holder"></div>
+<!-- End of Dialogs -->
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
new file mode 100644
index 00000000000..0e3611b2e4c
--- /dev/null
+++ b/apps/contacts/templates/part.contact.php
@@ -0,0 +1,210 @@
+<?php
+$l=new OC_L10N('contacts');
+$id = isset($_['id']) ? $_['id'] : '';
+$card = array();
+$card['id'] = $id;
+$card['FN'] = (array_key_exists('FN',$_['details'])) ? $_['details']['FN'][0] : null;
+$card['N'] = (array_key_exists('N',$_['details'])) ? $_['details']['N'][0] : array('', '', '', '', '');
+$card['ORG'] = (array_key_exists('ORG',$_['details'])) ? $_['details']['ORG'][0] : null;
+$card['PHOTO'] = (array_key_exists('PHOTO',$_['details'])) ? $_['details']['PHOTO'][0] : null;
+$card['BDAY'] = (array_key_exists('BDAY',$_['details'])) ? $_['details']['BDAY'][0] : null;
+if($card['BDAY']) {
+	$bday = new DateTime($card['BDAY']['value']);
+	$card['BDAY']['value'] = $bday->format('d-m-Y');
+}
+$card['NICKNAME'] = (array_key_exists('NICKNAME',$_['details'])) ? $_['details']['NICKNAME'][0] : null;
+$card['EMAIL'] = (array_key_exists('EMAIL',$_['details'])) ? $_['details']['EMAIL'] : array();
+$card['TEL'] = (array_key_exists('TEL',$_['details'])) ? $_['details']['TEL'] : array();
+$card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] : array();
+?>
+<div id="card">
+	<div id="actionbar">
+	<a id="contacts_propertymenu_button"></a>
+	<ul id="contacts_propertymenu">
+		<li <?php echo (!is_null($card['PHOTO'])?'style="display:none;"':''); ?>>
+			<a data-type="PHOTO"><?php echo $l->t('Profile picture'); ?></a>
+		</li>
+		<li <?php echo (!is_null($card['ORG'])?'style="display:none;"':''); ?>>
+			<a data-type="ORG"><?php echo $l->t('Organization'); ?></a>
+		</li>
+		<li <?php echo (!is_null($card['NICKNAME'])?'style="display:none;"':''); ?>>
+			<a data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a>
+		</li>
+		<li <?php echo (!is_null($card['BDAY'])?'style="display:none;"':''); ?>>
+			<a data-type="BDAY"><?php echo $l->t('Birthday'); ?></a>
+		</li>
+		<li><a data-type="TEL"><?php echo $l->t('Phone'); ?></a></li>
+		<li><a data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
+		<li><a data-type="ADR"><?php echo $l->t('Address'); ?></a></li>
+	</ul>
+	<img  onclick="Contacts.UI.Card.export();" class="svg action" id="contacts_downloadcard" src="<?php echo image_path('', 'actions/download.svg'); ?>" title="<?php echo $l->t('Download contact');?>" />
+	<img class="svg action" id="contacts_deletecard" src="<?php echo image_path('', 'actions/delete.svg'); ?>" title="<?php echo $l->t('Delete contact');?>" />
+	</div>
+
+	<div class="contactsection">
+
+	<form <?php echo (is_null($card['PHOTO'])?'style="display:none;"':''); ?> id="file_upload_form" action="ajax/uploadphoto.php" method="post" enctype="multipart/form-data" target="file_upload_target">
+	<fieldset id="photo" class="formfloat">
+		<div id="contacts_details_photo_wrapper" title="<?php echo $l->t('Click or drop to upload picture'); ?> (max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
+		<!-- img style="padding: 1em;" id="contacts_details_photo" alt="Profile picture"  src="photo.php?id=<?php echo $_['id']; ?>" / -->
+		<progress id="contacts_details_photo_progress" style="display:none;" value="0" max="100">0 %</progress>
+		</div>
+		<input type="hidden" name="id" value="<?php echo $_['id'] ?>">
+		<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
+		<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
+		<input id="file_upload_start" type="file" accept="image/*" name="imagefile" />
+		<iframe name="file_upload_target" id='file_upload_target' src=""></iframe>
+	</fieldset>
+	</form>
+	<form id="contact_identity" method="post" <?php echo ($_['id']==''||!isset($_['id'])?'style="display:none;"':''); ?>>
+	<input type="hidden" name="id" value="<?php echo $_['id'] ?>">
+	<fieldset class="propertycontainer" data-element="N"><input type="hidden" id="n" class="contacts_property" name="value" value="" /></fieldset>
+	<fieldset id="ident" class="formfloat">
+	<!-- legend>Name</legend -->
+	<dl class="form">
+		<!-- dt><label for="n"><?php echo $l->t('Name'); ?></label></dt>
+		<dd style="padding-top: 0.8em;vertical-align: text-bottom;"><span id="n" type="text"></span></dd -->
+		<dt><label for="fn"><?php echo $l->t('Display name'); ?></label></dt>
+		<dd class="propertycontainer" data-element="FN">
+		<select id="fn" name="value" required="required" class="contacts_property" title="<?php echo $l->t('Format custom, Short name, Full name, Reverse or Reverse with comma'); ?>" style="width:16em;">
+			<option id="short" title="Short name"></option>
+			<option id="full" title="Full name"></option>
+			<option id="reverse" title="Reverse"></option>
+			<option id="reverse_comma" title="Reverse with comma"></option>
+		</select><a id="edit_name" class="edit" title="<?php echo $l->t('Edit name details'); ?>"></a>
+		</dd>
+		<dt style="display:none;" id="org_label" data-element="ORG"><label for="org"><?php echo $l->t('Organization'); ?></label></dt>
+		<dd style="display:none;" class="propertycontainer" id="org_value" data-element="ORG"><input id="org"  required="required" name="value[ORG]" type="text" class="contacts_property" style="width:16em;" name="value" value="" placeholder="<?php echo $l->t('Organization'); ?>" /><a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'single');" title="<?php echo $l->t('Delete'); ?>"></a></dd>
+		<dt style="display:none;" id="nickname_label" data-element="NICKNAME"><label for="nickname"><?php echo $l->t('Nickname'); ?></label></dt>
+		<dd style="display:none;" class="propertycontainer" id="nickname_value" data-element="NICKNAME"><input id="nickname" required="required" name="value[NICKNAME]" type="text" class="contacts_property" style="width:16em;" name="value" value="" placeholder="<?php echo $l->t('Enter nickname'); ?>" /><a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'single');" title="<?php echo $l->t('Delete'); ?>"></a></dd>
+		<dt style="display:none;" id="bday_label" data-element="BDAY"><label for="bday"><?php echo $l->t('Birthday'); ?></label></dt>
+		<dd style="display:none;" class="propertycontainer" id="bday_value" data-element="BDAY"><input id="bday"  required="required" name="value" type="text" class="contacts_property" value="" placeholder="<?php echo $l->t('dd-mm-yyyy'); ?>" /><a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'single');" title="<?php echo $l->t('Delete'); ?>"></a></dd>
+	</dl>
+	</fieldset>
+	</form>
+	</div>
+
+	<!-- div class="delimiter"></div -->
+	<form id="contact_communication" method="post">
+	<div class="contactsection">
+		<!-- email addresses -->
+		<div id="emails" <?php echo (count($card['EMAIL'])>0?'':'style="display:none;"'); ?>>
+		<fieldset class="contactpart">
+		<legend><?php echo $l->t('Email'); ?></legend>
+			<ul id="emaillist" class="propertylist">
+			<li class="template" style="white-space: nowrap; display: none;" data-element="EMAIL">
+				<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
+				<input type="email" required="required" class="nonempty contacts_property" style="width:15em;" name="value" value="" x-moz-errormessage="<?php echo $l->t('Please specify a valid email address.'); ?>" placeholder="<?php echo $l->t('Enter email address'); ?>" /><span class="listactions"><a onclick="Contacts.UI.mailTo(this)" class="mail" title="<?php echo $l->t('Mail to address'); ?>"></a>
+				<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete email address'); ?>"></a></span></li>
+			<?php
+			if(0) { /*foreach($card['EMAIL'] as $email) {*/
+			?>
+			<li class="propertycontainer" style="white-space: nowrap;" data-checksum="<?php echo $email['checksum'] ?>" data-element="EMAIL">
+				<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" <?php echo (isset($email['parameters']['PREF'])?'checked="checked"':''); ?> />
+				<input type="email" required="required" class="nonempty contacts_property" style="width:15em;" name="value" value="<?php echo $email['value'] ?>" placeholder="<?php echo $l->t('Enter email address'); ?>" /><span class="listactions"><a onclick="Contacts.UI.mailTo(this)" class="mail" title="<?php echo $l->t('Mail to address'); ?>"></a>
+				<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete email address'); ?>"></a></span></li>
+			<?php } ?>
+			</ul><!-- a id="add_email" class="add" title="<?php echo $l->t('Add email address'); ?>"></a -->
+		</div> <!-- email addresses-->
+
+		<!-- Phone numbers -->
+		<div id="phones" <?php echo (count($card['TEL'])>0?'':'style="display:none;"'); ?>>
+		<fieldset class="contactpart">
+		<legend><?php echo $l->t('Phone'); ?></legend>
+			<ul id="phonelist" class="propertylist">
+				<li class="template" style="white-space: nowrap; display: none;" data-element="TEL">
+				<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" /> 
+				<input type="text" required="required" class="nonempty contacts_property" style="width:10em; border: 0px;" name="value" value="" placeholder="<?php echo $l->t('Enter phone number'); ?>" />
+				<select multiple="multiple" name="parameters[TYPE][]">
+					<?php echo html_select_options($_['phone_types'], array()) ?>
+				</select>
+				<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete phone number'); ?>"></a></li>
+			<?php
+			if(0) { /*foreach($card['TEL'] as $phone) {*/
+			?>
+				<li class="propertycontainer" style="white-space: nowrap;" data-checksum="<?php echo $phone['checksum'] ?>" data-element="TEL">
+				<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" <?php echo (isset($phone['parameters']['PREF'])?'checked="checked"':''); ?> /> 
+				<input type="text" required="required" class="nonempty contacts_property" style="width:8em; border: 0px;" name="value" value="<?php echo $phone['value'] ?>" placeholder="<?php echo $l->t('Enter phone number'); ?>" />
+				<select class="contacts_property" multiple="multiple" name="parameters[TYPE][]">
+					<?php echo html_select_options($_['phone_types'], isset($phone['parameters']['TYPE'])?$phone['parameters']['TYPE']:array()) ?>
+				</select>
+				<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete phone number'); ?>"></a></li>
+			<?php } ?>
+			</ul><!-- a id="add_phone" class="add" title="<?php echo $l->t('Add phone number'); ?>"></a -->
+		</div> <!-- Phone numbers -->
+
+		<!-- Addresses -->
+		<div id="addresses" <?php echo (count($card['ADR'])>0?'':'style="display:none;"'); ?>>
+		<fieldset class="contactpart">
+		<legend><?php echo $l->t('Address'); ?></legend>
+		<div id="addressdisplay">
+			<dl class="addresscard template" style="display: none;" data-element="ADR"><dt>
+			<input class="adr contacts_property" name="value" type="hidden" value="" />
+			<input type="hidden" class="adr_type contacts_property" name="parameters[TYPE][]" value="" />
+			<span class="adr_type_label"></span><a class="globe" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.searchOSM(this);" title="<?php echo $l->t('View on map'); ?>"></a><a class="edit" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.Card.editAddress(this, false);" title="<?php echo $l->t('Edit address details'); ?>"></a><a class="delete" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="Delete address"></a>
+			</dt><dd><ul class="addresslist"></ul></dd></dl>
+
+			<?php if(0) { /*foreach($card['ADR'] as $address) {*/ ?>
+			<dl class="addresscard propertycontainer" data-checksum="<?php echo $address['checksum']; ?>" data-element="ADR">
+			<dt>
+			<input class="adr contacts_property" name="value" type="hidden" value="<?php echo implode(';',$address['value']); ?>" />
+				<input type="hidden" class="adr_type contacts_property" name="parameters[TYPE][]" value="<?php echo strtoupper(implode(',',$address['parameters'])); ?>" />
+				<span class="adr_type_label">
+				<?php 
+				if(count($address['parameters']) > 0) {
+					//array_walk($address['parameters'], ) Nah, this wont work...
+					$translated = array();
+					foreach($address['parameters'] as $type) {
+						$translated[] = $l->t(ucwords(strtolower($type)));
+					}
+					echo implode('/', $translated);
+				}
+				?></span><a class="globe" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.searchOSM(this);" title="<?php echo $l->t('View on map'); ?>"></a><a class="edit" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.Card.editAddress(this, false);" title="<?php echo $l->t('Edit address details'); ?>"></a><a class="delete" style="float:right;"  onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="Delete address"></a>
+			</dt>
+			<dd>
+			<ul class="addresslist">
+				<?php
+				$adr = $address['value'];
+				$tmp = ($adr[0]?'<li>'.$adr[0].'</li>':'');
+				$tmp .= ($adr[1]?'<li>'.$adr[1].'</li>':'');
+				$tmp .= ($adr[2]?'<li>'.$adr[2].'</li>':'');
+				$tmp .= ($adr[3]||$adr[5]?'<li>'.$adr[5].' '.$adr[3].'</li>':'');
+				$tmp .= ($adr[4]?'<li>'.$adr[4].'</li>':'');
+				$tmp .= ($adr[6]?'<li>'.$adr[6].'</li>':'');
+				echo $tmp;
+				
+				?>
+			</ul>
+			</dd>
+			</dl>
+			<?php } ?>
+		</fieldset>
+		</div>
+		</div> <!-- Addresses -->
+	</div>
+	<!-- a id="add_address" onclick="Contacts.UI.Card.editAddress('new', true)" class="add" title="<?php echo $l->t('Add address'); ?>"></a -->
+	</div> 
+	</form>
+</div>
+<div class="delimiter"></div>
+<pre>
+<?php /*print_r($card);*/ ?>
+</pre>
+	<!-- div class="updatebar"><input type="button" value="Update" /></div -->
+<div id="edit_photo_dialog" title="Edit photo">
+		<div id="edit_photo_dialog_img"></div>
+</div>
+<script language="Javascript">
+$(document).ready(function(){
+	if('<?php echo $id; ?>'!='') {
+		$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':'<?php echo $id; ?>'},function(jsondata){
+			if(jsondata.status == 'success'){
+				Contacts.UI.Card.loadContact(jsondata.data);
+			}
+			else{
+				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+			}
+		});
+	}
+});
+</script>
diff --git a/apps/contacts/templates/part.contactphoto.php b/apps/contacts/templates/part.contactphoto.php
new file mode 100644
index 00000000000..7d7ab237561
--- /dev/null
+++ b/apps/contacts/templates/part.contactphoto.php
@@ -0,0 +1,9 @@
+<?php 
+$id = $_['id'];
+$wattr = isset($_['width'])?'width="'.$_['width'].'"':'';
+$hattr = isset($_['height'])?'height="'.$_['height'].'"':'';
+?>
+<img class="loading" id="contacts_details_photo" <?php echo $wattr; ?> <?php echo $hattr; ?> src="<?php echo OC_Helper::linkTo('contacts', 'photo.php', null, true); ?>?id=<?php echo $id; ?>&amp;refresh=<?php echo rand(); ?>" />
+<progress id="contacts_details_photo_progress" style="display:none;" value="0" max="100">0 %</progress>
+
+
diff --git a/apps/contacts/templates/part.cropphoto.php b/apps/contacts/templates/part.cropphoto.php
new file mode 100644
index 00000000000..cb416f0e415
--- /dev/null
+++ b/apps/contacts/templates/part.cropphoto.php
@@ -0,0 +1,62 @@
+<?php 
+$id = $_['id'];
+$tmp_path = $_['tmp_path'];
+OC_Log::write('contacts','templates/part.cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OC_Log::DEBUG);
+?>
+<script language="Javascript">
+	jQuery(function($) {
+		$('#cropbox').Jcrop({
+			onChange:	showCoords,
+			onSelect:	showCoords,
+			onRelease:	clearCoords,
+			maxSize:	[399, 399],
+			bgColor:	'black',
+			bgOpacity:	.4,
+			boxWidth: 	400,
+			boxHeight:	400,
+			setSelect:	[ 100, 130, 50, 50 ]//,
+			//aspectRatio: 0.8
+		});
+	});
+	// Simple event handler, called from onChange and onSelect
+	// event handlers, as per the Jcrop invocation above
+	function showCoords(c) {
+		$('#x1').val(c.x);
+		$('#y1').val(c.y);
+		$('#x2').val(c.x2);
+		$('#y2').val(c.y2);
+		$('#w').val(c.w);
+		$('#h').val(c.h);
+	};
+
+	function clearCoords() {
+		$('#coords input').val('');
+	};
+	/*
+	$('#coords').submit(function() {
+		alert('Handler for .submit() called.');
+		return true;
+	});*/
+</script>
+<img id="cropbox" src="<?php echo OC_Helper::linkTo('contacts', 'dynphoto.php', null, true); ?>?tmp_path=<?php echo urlencode($tmp_path); ?>" />
+<form id="cropform"
+	class="coords"
+	method="post"
+	enctype="multipart/form-data"
+	target="crop_target"
+	action="<?php echo OC_Helper::linkTo('contacts', 'ajax/savecrop.php', null, true); ?>">
+
+	<input type="hidden" id="id" name="id" value="<?php echo $id; ?>" />
+	<input type="hidden" id="tmp_path" name="tmp_path" value="<?php echo $tmp_path; ?>" />
+	<fieldset id="coords">
+	<input type="hidden" id="x1" name="x1" value="" />
+	<input type="hidden" id="y1" name="y1" value="" />
+	<input type="hidden" id="x2" name="x2" value="" />
+	<input type="hidden" id="y2" name="y2" value="" />
+	<input type="hidden" id="w" name="w" value="" />
+	<input type="hidden" id="h" name="h" value="" />
+	</fieldset>
+	<iframe name="crop_target" id='crop_target' src=""></iframe>
+</form>
+
+
diff --git a/apps/contacts/templates/part.edit_address_dialog.php b/apps/contacts/templates/part.edit_address_dialog.php
new file mode 100644
index 00000000000..0ecdc4e1915
--- /dev/null
+++ b/apps/contacts/templates/part.edit_address_dialog.php
@@ -0,0 +1,67 @@
+<?php
+$adr = isset($_['adr'])?$_['adr']:array();
+$id = $_['id'];
+$types = array();
+foreach(isset($adr['parameters']['TYPE'])?array($adr['parameters']['TYPE']):array() as $type) {
+	$types[] = strtoupper($type);
+}
+?>
+<div id="edit_address_dialog" title="<?php echo $l->t('Edit address'); ?>">
+<!-- ?php print_r($types); ? -->
+	<fieldset id="address">
+		<dl class="form">
+			<dt>
+				<label class="label" for="adr_type"><?php echo $l->t('Type'); ?></label>
+			</dt>
+			<dd>
+				<select id="adr_type" name="parameters[ADR][TYPE]" size="1">
+					<?php echo html_select_options($_['adr_types'], $types) ?>
+				</select>
+			</dd>
+			<dt>
+				<label class="label" for="adr_pobox"><?php echo $l->t('PO Box'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_pobox" name="value[ADR][0]" value="<?php echo isset($adr['value'][0])?$adr['value'][0]:''; ?>">
+			</dd>
+			<dd>
+			<dt>
+				<label class="label" for="adr_extended"><?php echo $l->t('Extended'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_extended" name="value[ADR][1]" value="<?php echo isset($adr['value'][1])?$adr['value'][1]:''; ?>">
+			</dd>
+			<dt>
+				<label class="label" for="adr_street"><?php echo $l->t('Street'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_street" name="value[ADR][2]" value="<?php echo isset($adr['value'][2])?$adr['value'][2]:''; ?>">
+			</dd>
+			<dt>
+				<label class="label" for="adr_city"><?php echo $l->t('City'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_city" name="value[ADR][3]" value="<?php echo isset($adr['value'][3])?$adr['value'][3]:''; ?>">
+			</dd>
+			<dt>
+				<label class="label" for="adr_region"><?php echo $l->t('Region'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_region" name="value[ADR][4]" value="<?php echo isset($adr['value'][4])?$adr['value'][4]:''; ?>">
+			</dd>
+			<dt>
+				<label class="label" for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_zipcode" name="value[ADR][5]" value="<?php echo isset($adr['value'][5])?$adr['value'][5]:''; ?>">
+			</dd>
+			<dt>
+				<label class="label" for="adr_country"><?php echo $l->t('Country'); ?></label>
+			</dt>
+			<dd>
+				<input type="text" id="adr_country" name="value[ADR][6]" value="<?php echo isset($adr['value'][6])?$adr['value'][6]:''; ?>">
+			</dd>
+		</dl>
+	</fieldset>
+	</form>
+</div>
diff --git a/apps/contacts/templates/part.edit_name_dialog.php b/apps/contacts/templates/part.edit_name_dialog.php
new file mode 100644
index 00000000000..d525fd1f99b
--- /dev/null
+++ b/apps/contacts/templates/part.edit_name_dialog.php
@@ -0,0 +1,59 @@
+<?php
+$l=new OC_L10N('contacts');
+$name = isset($_['name'])?$_['name']:'';
+//print_r($name);
+$id = isset($_['id'])?$_['id']:'';
+$addressbooks = isset($_['addressbooks'])?$_['addressbooks']:null;
+?>
+<div id="edit_name_dialog" title="Edit name">
+	<form>
+	<fieldset>
+	<dl class="form">
+		<?php if(!is_null($addressbooks)) { 
+			if(count($_['addressbooks'])==1) {
+		?>
+			<input type="hidden" id="aid" name="aid" value="<?php echo $_['addressbooks'][0]['id']; ?>">
+		<?php } else { ?>
+		<dt><label for="addressbook"><?php echo $l->t('Addressbook'); ?></label></dt>
+		<dd>
+			<select id="aid" name="aid" size="1">
+				<?php echo html_select_options($_['addressbooks'], null, array('value'=>'id', 'label'=>'displayname')); ?>
+			</select>
+		</dd>
+		<?php }} ?>
+		<dt><label for="pre"><?php echo $l->t('Hon. prefixes'); ?></label></dt>
+		<dd>
+			<input name="pre" id="pre" value="<?php echo isset($name['value'][3]) ? $name['value'][3] : ''; ?>" type="text" list="prefixes" />
+			<datalist id="prefixes">
+				<option value="<?php echo $l->t('Miss'); ?>">
+				<option value="<?php echo $l->t('Ms'); ?>">
+				<option value="<?php echo $l->t('Mr'); ?>">
+				<option value="<?php echo $l->t('Sir'); ?>">
+				<option value="<?php echo $l->t('Mrs'); ?>">
+				<option value="<?php echo $l->t('Dr'); ?>">
+			</datalist>
+		</dd>
+		<dt><label for="giv"><?php echo $l->t('Given name'); ?></label></dt>
+		<dd><input name="giv" id="giv" value="<?php echo isset($name['value'][1]) ? $name['value'][1] : ''; ?>" type="text" /></dd>
+		<dt><label for="add"><?php echo $l->t('Additional names'); ?></label></dt>
+		<dd><input name="add" id="add" value="<?php echo isset($name['value'][2]) ? $name['value'][2] : ''; ?>" type="text" /></dd>
+		<dt><label for="fam"><?php echo $l->t('Family name'); ?></label></dt>
+		<dd><input name="fam" id="fam" value="<?php echo isset($name['value'][0]) ? $name['value'][0] : ''; ?>" type="text" /></dd>
+		<dt><label for="suf"><?php echo $l->t('Hon. suffixes'); ?></label></dt>
+		<dd>
+			<input name="suf" id="suf" value="<?php echo isset($name['value'][4]) ? $name['value'][4] : ''; ?>" type="text" list="suffixes" />
+			<datalist id="suffixes">
+				<option value="<?php echo $l->t('J.D.'); ?>">
+				<option value="<?php echo $l->t('M.D.'); ?>">
+				<option value="<?php echo $l->t('D.O.'); ?>">
+				<option value="<?php echo $l->t('D.C.'); ?>">
+				<option value="<?php echo $l->t('Ph.D.'); ?>">
+				<option value="<?php echo $l->t('Esq.'); ?>">
+				<option value="<?php echo $l->t('Jr.'); ?>">
+				<option value="<?php echo $l->t('Sn.'); ?>">
+			</datalist>
+		</dd>
+	</dl>
+	</fieldset>
+	</form>
+</div>
diff --git a/apps/contacts/templates/part.no_contacts.php b/apps/contacts/templates/part.no_contacts.php
new file mode 100644
index 00000000000..ab6129cdde7
--- /dev/null
+++ b/apps/contacts/templates/part.no_contacts.php
@@ -0,0 +1,8 @@
+<div id="firstrun">
+You have no contacts in your list.
+	<div id="selections">
+		<input type="button" value="Import contacts" onclick="Contacts.UI.Addressbooks.import()" />
+		<input type="button" value="Add contact" onclick="Contacts.UI.Card.add()" />
+		<input type="button" value="Edit addressbooks" onclick="Contacts.UI.Addressbooks.overview()" />
+	</div>
+</div>
\ No newline at end of file
diff --git a/core/img/actions/add.png b/core/img/actions/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..db1b1970f17f7b6a35fb22693af492df7c2391df
GIT binary patch
literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000UR000UR0oc(#5&!@I8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10cA-<K~y-6rIRsh!cY{2zr?gP(khj73vPkp?%Kt{E=~of&iw=a
z3TJ<iU8Ep5NH@VPVx_b?<e5axyB$h{*rc@d!W-Uw=N;}noMVUx|0ye{Us@~{w@N7!
zpja%5>$;D?+cD70AutDnf$e!-)$_b+zu!LxPBMWx1QG;6x?3E_0_Z;xY&M&eAc`XL
z2);D9Sglr<U(G_HaH^C_K~WSD1i{sAw<{fBf^xb1Zioou@%Xye>)p)f^Yqhlxnwq*
z0pPkWwOTEGt5hm<yWQtzv-xBJtk-KjnM{~Yr<wcszK`$w>D_T0!Z1uy4Yu2Dk|arv
z9N$Z8of238wr$6qPUj_#V+|l8#%MIE4u``tfO@^YZ?#&lhG7VRX_|&@+n*wdNY*)N
zx7&BX1MtvjH10*Dl!g7355h2nzxqHab?5^DGDDM>1<_h-$8j`(Wm!6J0^^4?9(#YE
eHN{T^zp4*-4#pi%9*bB20000<MNUMnLSTZYj?9|?

literal 0
HcmV?d00001

diff --git a/core/img/actions/add.svg b/core/img/actions/add.svg
new file mode 100644
index 00000000000..29994747c33
--- /dev/null
+++ b/core/img/actions/add.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="22"
+   height="22"
+   id="svg2406"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="add.svg">
+  <metadata
+     id="metadata3125">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3123"
+     showgrid="false"
+     inkscape:zoom="10.727273"
+     inkscape:cx="11.843286"
+     inkscape:cy="14.728814"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2406" />
+  <defs
+     id="defs2408">
+    <linearGradient
+       id="linearGradient2264">
+      <stop
+         id="stop2266"
+         style="stop-color:#d7e866;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2268"
+         style="stop-color:#8cab2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.103895"
+       y1="15.180944"
+       x2="24.103895"
+       y2="34.224861"
+       id="linearGradient2401"
+       xlink:href="#linearGradient2264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8988874,0,0,0.8934652,-10.463705,-9.5659718)" />
+    <linearGradient
+       id="linearGradient4222">
+      <stop
+         id="stop4224"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4226"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.138529"
+       y1="6.5316639"
+       x2="24.138529"
+       y2="45.690399"
+       id="linearGradient2398"
+       xlink:href="#linearGradient4222"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5399382,0,0,0.5366811,-1.8489228,-1.5061978)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4222"
+       id="linearGradient3128"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5399382,0,0,0.5366811,-1.7557025,-1.7858588)"
+       x1="24.138529"
+       y1="6.5316639"
+       x2="24.138529"
+       y2="45.690399" />
+  </defs>
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.40000000000000002;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3128);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+     id="path2272"
+     d="m 8.5932204,8.2151575 0,-5.9948184 4.9999996,0 0,5.9948184 6,0 0,5.0051815 -6,0 0,6 -4.9999996,0 0,-6 -6,0 0,-5.0051815 6,0 z" />
+</svg>
diff --git a/core/img/actions/mail.png b/core/img/actions/mail.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea811ac5453b28affe9e1bed66fc5f472fbc85ba
GIT binary patch
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000UR000UR0oc(#5&!@I8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10ij7mK~y-6rIXFd+E5UNA7hR&8bncyP*Bia!M(WYwinq8_-;gW
zC#ZCxXm=`Zl;BTJP9~>|qS#W}uXSJ+^TIPf%uLQ&%PZyr0r2rZ`LDUrX!J!X_33uI
z>3<=M#iEy{>C!dEeD3vnA4G&wsq`-Rd_LoO9;?-=;-qPsd7g(chW&nzh>&I3Z#_*@
zcDo$_N-5Gb#WBW^Wf|pi8Ko5K^_si(>{@Hq>ovabQ!ExA37sTK5D`R#APA_{YRqOc
zZnxV*zh18_77H4U2EOk<bYqNlj4}4PQV;}OE*Hk*F;Nr|MG@oim^h9pl}bN#l_Ux7
zy#s44BEoz=Ck#XC^*WQugj_DiU@&06-!q*~>G%6Mj)S!pV+`(n-XuxbY&NvpZK~BO
z0K?%BfI^`_r_<qhJhEIa>2|v)rG6xc<JiV=%;9jL-ELDT6c7;r^7%Z#Bd$~`c%H|0
zyQS4?p|!TI)|%_}O0(I-aU8NN`{NBLr3k~2%jJUB8dpRfYxx`e%OxTrxTn+U+uPfl
m`)=~dL?p_+`i;&@H1Hj8cO_z{9a<;=0000<MNUMnLSTYIH}VAl

literal 0
HcmV?d00001

diff --git a/core/img/actions/mail.svg b/core/img/actions/mail.svg
new file mode 100644
index 00000000000..54a24faf85d
--- /dev/null
+++ b/core/img/actions/mail.svg
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="22"
+   height="22"
+   id="svg2575"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="mail_new.svg"
+   inkscape:export-filename="/home/tol/tanghus-owncloud/core/img/actions/mail.png"
+   inkscape:export-xdpi="65.454544"
+   inkscape:export-ydpi="65.454544">
+  <metadata
+     id="metadata59">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview57"
+     showgrid="false"
+     inkscape:zoom="10.727273"
+     inkscape:cx="11"
+     inkscape:cy="11"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2575" />
+  <defs
+     id="defs2577">
+    <linearGradient
+       id="linearGradient3943">
+      <stop
+         id="stop3945"
+         style="stop-color:#ffffff;stop-opacity:0.40000001"
+         offset="0" />
+      <stop
+         id="stop3947"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.138529"
+       y1="7.0478544"
+       x2="24.138529"
+       y2="47.272728"
+       id="linearGradient2560"
+       xlink:href="#linearGradient3943"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2817955,0,0,0.2800956,-16.058706,13.975052)" />
+    <linearGradient
+       id="linearGradient2264">
+      <stop
+         id="stop2266"
+         style="stop-color:#d7e866;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2268"
+         style="stop-color:#8cab2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.103895"
+       y1="15.168831"
+       x2="24.103895"
+       y2="32.485161"
+       id="linearGradient2558"
+       xlink:href="#linearGradient2264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4691323,0,0,0.4663025,-20.554789,9.7686284)" />
+    <linearGradient
+       id="linearGradient3495-841-851-719">
+      <stop
+         id="stop4120"
+         style="stop-color:#1e1e1e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4122"
+         style="stop-color:#1e1e1e;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3333-314-917-262">
+      <stop
+         id="stop4102"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4104"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2490-495-150-777">
+      <stop
+         id="stop4108"
+         style="stop-color:#787878;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4110"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3242-967-12-570-862-307">
+      <stop
+         id="stop4498"
+         style="stop-color:#f2f2f2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4502"
+         style="stop-color:#dbdbdb;stop-opacity:1"
+         offset="0.87426931" />
+      <stop
+         id="stop4504"
+         style="stop-color:#999999;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5060-6-986-342-61">
+      <stop
+         id="stop4080"
+         style="stop-color:#1e1e1e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4082"
+         style="stop-color:#1e1e1e;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="605.71429"
+       cy="486.64789"
+       r="117.14286"
+       fx="605.71429"
+       fy="486.64789"
+       id="radialGradient2724-226-535-494"
+       xlink:href="#linearGradient5060-6-986-342-61"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-6.553443e-2,0,0,2.470588e-2,-21.829255,10.577352)" />
+    <linearGradient
+       id="linearGradient5060-6-252-476-367">
+      <stop
+         id="stop4074"
+         style="stop-color:#1e1e1e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4076"
+         style="stop-color:#1e1e1e;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="605.71429"
+       cy="486.64789"
+       r="117.14286"
+       fx="605.71429"
+       fy="486.64789"
+       id="radialGradient2722-303-187-273"
+       xlink:href="#linearGradient5060-6-252-476-367"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.553443e-2,0,0,2.470588e-2,-69.175497,10.577352)" />
+    <linearGradient
+       id="linearGradient5048-7-668-934-892">
+      <stop
+         id="stop4066"
+         style="stop-color:#1e1e1e;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop4068"
+         style="stop-color:#1e1e1e;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop4070"
+         style="stop-color:#1e1e1e;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507"
+       id="linearGradient2720-766-26-906"
+       xlink:href="#linearGradient5048-7-668-934-892"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.553443e-2,0,0,2.470588e-2,-69.188394,10.577352)" />
+    <linearGradient
+       x1="23.903786"
+       y1="35.75"
+       x2="23.903786"
+       y2="16.00676"
+       id="linearGradient3411"
+       xlink:href="#linearGradient3495-841-851-719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4657385,0,0,0.4850945,0.8223379,-3.5686279)" />
+    <linearGradient
+       x1="23.928667"
+       y1="30.773148"
+       x2="23.928667"
+       y2="45.530704"
+       id="linearGradient3414"
+       xlink:href="#linearGradient3495-841-851-719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4657385,0,0,0.4850945,0.8223378,-4.102232)" />
+    <linearGradient
+       x1="25.57654"
+       y1="15.000002"
+       x2="25.57654"
+       y2="44.00053"
+       id="linearGradient3417"
+       xlink:href="#linearGradient3333-314-917-262"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4418603,0,0,0.4642857,1.3953491,-3.696433)" />
+    <linearGradient
+       x1="19.875452"
+       y1="10.389797"
+       x2="19.875452"
+       y2="45.60001"
+       id="linearGradient3420"
+       xlink:href="#linearGradient3242-967-12-570-862-307"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4666666,0,0,0.4545454,0.7999999,-2.7272752)" />
+    <linearGradient
+       x1="28.103424"
+       y1="45.000065"
+       x2="28.103424"
+       y2="14.038458"
+       id="linearGradient3422"
+       xlink:href="#linearGradient2490-495-150-777"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4666666,0,0,0.5006418,0.7999998,-4.7785529)" />
+    <linearGradient
+       x1="23.903786"
+       y1="35.75"
+       x2="23.903786"
+       y2="16.00676"
+       id="linearGradient2440"
+       xlink:href="#linearGradient3495-841-851-719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4657385,0,0,0.4850945,-0.1776621,-4.5686279)" />
+    <linearGradient
+       x1="23.928667"
+       y1="30.773148"
+       x2="23.928667"
+       y2="45.530704"
+       id="linearGradient2443"
+       xlink:href="#linearGradient3495-841-851-719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4657385,0,0,0.4850945,-0.1776622,-5.102232)" />
+    <linearGradient
+       x1="25.57654"
+       y1="15.000002"
+       x2="25.57654"
+       y2="44.00053"
+       id="linearGradient2446"
+       xlink:href="#linearGradient3333-314-917-262"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4418603,0,0,0.4642857,0.3953491,-4.696433)" />
+    <linearGradient
+       x1="19.875452"
+       y1="10.389797"
+       x2="19.875452"
+       y2="45.60001"
+       id="linearGradient2449"
+       xlink:href="#linearGradient3242-967-12-570-862-307"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4666666,0,0,0.4545454,-0.10677976,-1.5832074)" />
+    <linearGradient
+       x1="28.103424"
+       y1="45.000065"
+       x2="28.103424"
+       y2="14.038458"
+       id="linearGradient2451"
+       xlink:href="#linearGradient2490-495-150-777"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4666666,0,0,0.5006418,-0.10677986,-3.6344851)" />
+    <linearGradient
+       x1="24.103895"
+       y1="15.168831"
+       x2="24.103895"
+       y2="32.485161"
+       id="linearGradient2457"
+       xlink:href="#linearGradient2264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4691323,0,0,0.4663025,-20.554789,9.7686284)" />
+    <linearGradient
+       x1="24.138529"
+       y1="7.0478544"
+       x2="24.138529"
+       y2="47.272728"
+       id="linearGradient2459"
+       xlink:href="#linearGradient3943"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2817955,0,0,0.2800956,-16.058706,13.975052)" />
+  </defs>
+  <rect
+     width="21"
+     height="15"
+     rx="0.46666664"
+     ry="0.45454553"
+     x="0.59322035"
+     y="3.6440678"
+     id="rect2396"
+     style="fill:url(#linearGradient2449);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2451);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="19"
+     height="13"
+     rx="0.036476243"
+     ry="0.035004593"
+     x="1.5"
+     y="2.5"
+     id="rect3331"
+     style="opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2446);stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 8.2139564,10.336975 L 1.1222032,16.468629 M 13.709509,10.325653 L 20.811476,16.468629"
+     id="path3341"
+     style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2443);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 0.8491563,3.0457658 L 11.000062,12.181817 L 20.937208,3.0457658"
+     id="path3493"
+     style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:url(#linearGradient2440);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
-- 
GitLab


From 9f1370a6d11ffe63ad4bc610baa7a1ddcf65a322 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 6 Feb 2012 08:04:06 +0100
Subject: [PATCH 422/546] Updated copyrights. Element menu didn't update.

---
 apps/contacts/ajax/saveproperty.php      |  4 ++--
 apps/contacts/dynphoto.php               |  2 +-
 apps/contacts/js/contacts.js             |  2 ++
 apps/contacts/templates/part.contact.php | 16 ++++------------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index fd1aa9e35f9..8f575c6b81e 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -2,8 +2,8 @@
 /**
  * ownCloud - Addressbook
  *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/apps/contacts/dynphoto.php b/apps/contacts/dynphoto.php
index 8025f559c37..2beac15e143 100644
--- a/apps/contacts/dynphoto.php
+++ b/apps/contacts/dynphoto.php
@@ -3,7 +3,7 @@
  * ownCloud - Image generator for contacts.
  *
  * @author Thomas Tanghus
- * @copyright 2011 Thomas Tanghus <thomas@tanghus.net>
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index c2130e08b5b..45130dd048f 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -310,6 +310,8 @@ Contacts={
 								$('#contact_identity').find('#org_value').show();
 								break;
 						}
+					} else {
+						$('#contacts_propertymenu a[data-type="'+props[prop]+'"]').parent().show();
 					}
 				}
 			},
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 0e3611b2e4c..1c7b7b9067a 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -21,18 +21,10 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 	<div id="actionbar">
 	<a id="contacts_propertymenu_button"></a>
 	<ul id="contacts_propertymenu">
-		<li <?php echo (!is_null($card['PHOTO'])?'style="display:none;"':''); ?>>
-			<a data-type="PHOTO"><?php echo $l->t('Profile picture'); ?></a>
-		</li>
-		<li <?php echo (!is_null($card['ORG'])?'style="display:none;"':''); ?>>
-			<a data-type="ORG"><?php echo $l->t('Organization'); ?></a>
-		</li>
-		<li <?php echo (!is_null($card['NICKNAME'])?'style="display:none;"':''); ?>>
-			<a data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a>
-		</li>
-		<li <?php echo (!is_null($card['BDAY'])?'style="display:none;"':''); ?>>
-			<a data-type="BDAY"><?php echo $l->t('Birthday'); ?></a>
-		</li>
+		<li><a data-type="PHOTO"><?php echo $l->t('Profile picture'); ?></a></li>
+		<li><a data-type="ORG"><?php echo $l->t('Organization'); ?></a></li>
+		<li><a data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a></li>
+		<li><a data-type="BDAY"><?php echo $l->t('Birthday'); ?></a></li>
 		<li><a data-type="TEL"><?php echo $l->t('Phone'); ?></a></li>
 		<li><a data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
 		<li><a data-type="ADR"><?php echo $l->t('Address'); ?></a></li>
-- 
GitLab


From 6112cdc7e8b80f8cb23fc36c872b94e620c5d086 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 6 Feb 2012 08:15:23 +0100
Subject: [PATCH 423/546] Hide container for emails/phones/adresses if there
 are none.

---
 apps/contacts/js/contacts.js             | 4 ++++
 apps/contacts/templates/part.contact.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 45130dd048f..b66dd6949d5 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -253,6 +253,7 @@ Contacts={
 				return false;
 			},
 			loadContact:function(jsondata){
+				$('#contact_communication').hide();
 				this.data = jsondata;
 				this.id = this.data.id;
 				console.log('loaded: ' + this.data.FN[0]['value']);
@@ -660,6 +661,7 @@ Contacts={
 				}
 				if($('#addressdisplay dl').length > 1) {
 					$('#addresses').show();
+					$('#contact_communication').show();
 				}
 				Contacts.UI.loadListHandlers();
 				return false;
@@ -858,6 +860,7 @@ Contacts={
 				}
 				if($('#emaillist li').length > 1) {
 					$('#emails').show();
+					$('#contact_communication').show();
 				}
 
 				$('#emaillist li:last-child').find('input[type="text"]').focus();
@@ -919,6 +922,7 @@ Contacts={
 				}
 				if($('#phonelist li').length > 1) {
 					$('#phones').show();
+					$('#contact_communication').show();
 				}
 				return false;
 			},
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 1c7b7b9067a..8a4faf720de 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -77,7 +77,7 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 	</div>
 
 	<!-- div class="delimiter"></div -->
-	<form id="contact_communication" method="post">
+	<form id="contact_communication" method="post" style="display: none;">
 	<div class="contactsection">
 		<!-- email addresses -->
 		<div id="emails" <?php echo (count($card['EMAIL'])>0?'':'style="display:none;"'); ?>>
-- 
GitLab


From 0c5eb542bdd3742cada1fa5331b1a3f4ae3f6975 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 6 Feb 2012 14:18:40 +0100
Subject: [PATCH 424/546] Fixed broken "Add new" contact. Possible fix for
 cards with missing 'FN' property added through DAV. Misc. UI cleanups.

---
 apps/contacts/ajax/addcontact.php        |  8 ++-
 apps/contacts/ajax/editname.php          | 13 ++++-
 apps/contacts/ajax/newcontact.php        |  8 ++-
 apps/contacts/css/contacts.css           |  2 +-
 apps/contacts/js/contacts.js             | 70 +++++++++++++++++++-----
 apps/contacts/lib/vcard.php              |  2 +-
 apps/contacts/templates/part.contact.php | 28 ++--------
 7 files changed, 85 insertions(+), 46 deletions(-)

diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php
index 4bd3df54e39..c39d75eff88 100644
--- a/apps/contacts/ajax/addcontact.php
+++ b/apps/contacts/ajax/addcontact.php
@@ -24,11 +24,11 @@
 require_once('../../../lib/base.php');
 function bailOut($msg) {
 	OC_JSON::error(array('data' => array('message' => $msg)));
-	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('contacts','ajax/addcontact.php: '.$msg, OC_Log::DEBUG);
 	exit();
 }
 function debug($msg) {
-	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('contacts','ajax/addcontact.php: '.$msg, OC_Log::DEBUG);
 }
 foreach ($_POST as $key=>$element) {
 	debug('_POST: '.$key.'=>'.$element);
@@ -44,11 +44,13 @@ $addressbook = OC_Contacts_App::getAddressbook( $aid );
 
 $fn = trim($_POST['fn']);
 $n = trim($_POST['n']);
+debug('N: '.$n);
+debug('FN: '.$fn);
 
 $vcard = new OC_VObject('VCARD');
 $vcard->setUID();
-$vcard->setString('N',$n);
 $vcard->setString('FN',$fn);
+$vcard->setString('N',$n);
 
 $id = OC_Contacts_VCard::add($aid,$vcard->serialize());
 if(!$id) {
diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php
index 6205cc74b0a..c7a7bcdeaf8 100644
--- a/apps/contacts/ajax/editname.php
+++ b/apps/contacts/ajax/editname.php
@@ -9,14 +9,23 @@
 require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/editname.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/editname.php: '.$msg, OC_Log::DEBUG);
+}
+foreach ($_GET as $key=>$element) {
+	debug('_GET: '.$key.'=>'.$element);
+}
 
 $tmpl = new OC_TEMPLATE("contacts", "part.edit_name_dialog");
 
 $id = $_GET['id'];
 if($id) {
 	$vcard = OC_Contacts_App::getContactVCard($id);
-
-
 	$name = array('', '', '', '', '');
 	if($vcard->__isset('N')) {
 		$property = $vcard->__get('N');
diff --git a/apps/contacts/ajax/newcontact.php b/apps/contacts/ajax/newcontact.php
index 3d1a8e74535..fcfd12ca80d 100644
--- a/apps/contacts/ajax/newcontact.php
+++ b/apps/contacts/ajax/newcontact.php
@@ -24,11 +24,11 @@
 require_once('../../../lib/base.php');
 function bailOut($msg) {
 	OC_JSON::error(array('data' => array('message' => $msg)));
-	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('contacts','ajax/newcontact.php: '.$msg, OC_Log::DEBUG);
 	exit();
 }
 function debug($msg) {
-	OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('contacts','ajax/newcontact.php: '.$msg, OC_Log::DEBUG);
 }
 foreach ($_POST as $key=>$element) {
 	debug('_POST: '.$key.'=>'.$element);
@@ -47,10 +47,14 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 $freeSpace=OC_Filesystem::free_space('/');
 $freeSpace=max($freeSpace,0);
 $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
+$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
+$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
 
 $tmpl = new OC_Template('contacts','part.contact');
 $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign('uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
+$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
 $tmpl->assign('addressbooks',$addressbooks);
 $tmpl->assign('id','');
 $page = $tmpl->fetchPage();
diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index a48533f85a0..d90e93f64e9 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -16,7 +16,7 @@
 #contacts_propertymenu li:hover { background-color: #1d2d44; }
 #contacts_propertymenu li a:hover { color: #fff }
 #actionbar { height: 30px; width: 200px; position: fixed; right: 0px; top: 75px; margin: 0 0 0 0; padding: 0 0 0 0;}
-#card { /*max-width: 70em;*/ border: thin solid lightgray; display: block; }
+#card { /*max-width: 70em; border: thin solid lightgray; display: block;*/ }
 #firstrun { /*border: thin solid lightgray;*/ width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777;}
 #firstrun #selections { /*border: thin solid lightgray;*/ font-size:0.8em;  width: 100%; margin: 2em auto auto auto; clear: both; }
 
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index b66dd6949d5..40f049de3b5 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -67,25 +67,34 @@ Contacts={
 		propertyTypeFor:function(obj) {
 			return $(obj).parents('.propertycontainer').first().data('element');
 		},
+		showHideContactInfo:function() {
+			var show = ($('#emaillist li[class*="propertycontainer"]').length > 0 || $('#phonelist li[class*="propertycontainer"]').length > 0 || $('#addressdisplay dl[class*="propertycontainer"]').length > 0);
+			console.log('showHideContactInfo: ' + show);
+			if(show) {
+				$('#contact_communication').show();
+			} else {
+				$('#contact_communication').hide();
+			}
+		},
 		checkListFor:function(obj) {
 			var type = $(obj).parents('.propertycontainer').first().data('element');
 			console.log('checkListFor: ' + type);
 			switch (type) {
 				case 'EMAIL':
 					console.log('emails: '+$('#emaillist>li').length);
-					if($('#emaillist>li').length == 1) {
+					if($('#emaillist li[class*="propertycontainer"]').length == 0) {
 						$('#emails').hide();
 					}
 					break;
 				case 'TEL':
 					console.log('phones: '+$('#phonelist>li').length);
-					if($('#phonelist>li').length == 1) {
+					if($('#phonelist li[class*="propertycontainer"]').length == 0) {
 						$('#phones').hide();
 					}
 					break;
 				case 'ADR':
 					console.log('addresses: '+$('#addressdisplay>dl').length);
-					if($('#addressdisplay>dl').length == 1) {
+					if($('#addressdisplay dl[class*="propertycontainer"]').length == 0) {
 						$('#addresses').hide();
 					}
 					break;
@@ -317,7 +326,7 @@ Contacts={
 				}
 			},
 			populateNameFields:function() {
-				this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = ''
+				this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
 				var full = '';
 				var narray = undefined;
 				//console.log('splitting: ' + this.data.N[0]['value']);
@@ -366,6 +375,8 @@ Contacts={
 			editNew:function(){ // add a new contact
 				//Contacts.UI.notImplemented();
 				//return false;
+				this.id = ''; this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
+
 				
 				$.getJSON('ajax/newcontact.php',{},function(jsondata){
 					if(jsondata.status == 'success'){
@@ -394,7 +405,31 @@ Contacts={
 					 */
 					if (jsondata.status == 'success'){
 						$('#rightcontent').data('id',jsondata.data.id);
-						id = jsondata.data.id;
+						var id = jsondata.data.id;
+						$.getJSON('ajax/contactdetails.php',{'id':id},function(jsondata){
+							if(jsondata.status == 'success'){
+								Contacts.UI.loadHandlers();
+								Contacts.UI.Card.loadContact(jsondata.data);
+								$('#leftcontent .active').removeClass('active');
+								var item = '<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'"  style="background: url(thumbnail.php?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+Contacts.UI.Card.fn+'</a></li>';
+								var added = false;
+								$('#leftcontent ul li').each(function(){
+									if ($(this).text().toLowerCase() > Contacts.UI.Card.fn.toLowerCase()) {
+										$(this).before(item).fadeIn('fast');
+										added = true;
+										return false;
+									}
+								});
+								if(!added) {
+									$('#leftcontent ul').append(item);
+								}
+								
+							}
+							else{
+								Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+								//alert(jsondata.data.message);
+							}
+						});
 						$('#contact_identity').show();
 						$('#actionbar').show();
 						// TODO: Add to contacts list.
@@ -466,7 +501,8 @@ Contacts={
 				console.log('addProperty:' + type);
 				switch (type) {
 					case 'PHOTO':
-						$('#contacts_propertymenu a[data-type="PHOTO"]').parent().hide();
+						$('#contacts_propertymenu a[data-type="'+type+'"]').parent().hide();
+						this.loadPhoto();
 						$('#file_upload_form').show();
 						break;
 					case 'EMAIL':
@@ -475,6 +511,7 @@ Contacts={
 							$('#emails').show();
 						}
 						Contacts.UI.Card.addMail();
+						Contacts.UI.showHideContactInfo();
 						break;
 					case 'TEL':
 						//console.log('phones: '+$('#phonelist>li').length);
@@ -482,6 +519,7 @@ Contacts={
 							$('#phones').show();
 						}
 						Contacts.UI.Card.addPhone();
+						Contacts.UI.showHideContactInfo();
 						break;
 					case 'ADR':
 						//console.log('addresses: '+$('#addressdisplay>dl').length);
@@ -489,6 +527,7 @@ Contacts={
 							$('#addresses').show();
 						}
 						Contacts.UI.Card.editAddress('new', true);
+						Contacts.UI.showHideContactInfo();
 						break;
 					case 'NICKNAME':
 					case 'ORG':
@@ -509,6 +548,7 @@ Contacts={
 						if(jsondata.status == 'success'){
 							if(type == 'list') {
 								Contacts.UI.propertyContainerFor(obj).remove();
+								Contacts.UI.showHideContactInfo();
 								Contacts.UI.checkListFor(obj);
 							} else if(type == 'single') {
 								var proptype = Contacts.UI.propertyTypeFor(obj);
@@ -529,6 +569,7 @@ Contacts={
 				} else { // Property hasn't been saved so there's nothing to delete.
 					if(type == 'list') {
 						Contacts.UI.propertyContainerFor(obj).remove();
+						Contacts.UI.showHideContactInfo();
 						Contacts.UI.checkListFor(obj);
 					} else if(type == 'single') {
 						var proptype = Contacts.UI.propertyTypeFor(obj);
@@ -542,7 +583,8 @@ Contacts={
 				}
 			},
 			editName:function(){
-				console.log('editName, id: ' + this.id);
+				console.log('editName, id: ' + (this.id == ''));
+				var isnew = (this.id == '');
 				//console.log('editName');
 				/* Initialize the name edit dialog */
 				if($('#edit_name_dialog').dialog('isOpen') == true){
@@ -550,9 +592,9 @@ Contacts={
 				}else{ // TODO: If id=='' call addcontact.php (or whatever name) instead and reload view with id.
 					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'editname.php')+'?id='+this.id, function(){
 						$('#edit_name_dialog' ).dialog({
-								modal: (this.id == '' && true || false),
-								closeOnEscape: (this.id == '' && false || true),
-								title:  (this.id == '' && t('contacts', 'Add contact') || t('contacts', 'Edit name')),
+								modal: (isnew && true || false),
+								closeOnEscape: (isnew == '' && false || true),
+								title:  (isnew && t('contacts', 'Add contact') || t('contacts', 'Edit name')),
 								height: 'auto', width: 'auto',
 								buttons: {
 									'Ok':function() { 
@@ -576,7 +618,7 @@ Contacts={
 			saveName:function(dlg){
 				console.log('saveName, id: ' + this.id);
 				// TODO: Check if new, get address book id and call Contacts.UI.Card.add()
-				var n = new Array($(dlg).find('#fam').val(),$(dlg).find('#giv').val(),$(dlg).find('#add').val(),$(dlg).find('#pre').val(),$(dlg).find('#suf').val());
+				var n = new Array($(dlg).find('#fam').val().strip_tags(),$(dlg).find('#giv').val().strip_tags(),$(dlg).find('#add').val().strip_tags(),$(dlg).find('#pre').val().strip_tags(),$(dlg).find('#suf').val().strip_tags());
 				this.famname = n[0];
 				this.givname = n[1];
 				this.addname = n[2];
@@ -602,7 +644,7 @@ Contacts={
 				$('#fn').val(0);
 				if(this.id == '') {
 					var aid = $(dlg).find('#aid').val();
-					Contacts.UI.Card.add(n, $('#short').text(), aid);
+					Contacts.UI.Card.add(n.join(';'), $('#short').text(), aid);
 				} else {
 					Contacts.UI.Card.saveProperty($('#n'));
 				}
@@ -704,6 +746,7 @@ Contacts={
 										if(isnew) {
 											container.remove();
 										}
+										Contacts.UI.showHideContactInfo();
 									}
 								},
 								close : function(event, ui) {
@@ -712,6 +755,7 @@ Contacts={
 									if(isnew) {
 										container.remove();
 									}
+									Contacts.UI.showHideContactInfo();
 								}/*,
 								open : function(event, ui) {
 									// load 'ADR' property - maybe :-P
@@ -1119,7 +1163,7 @@ $(document).ready(function(){
 	});
 
 	/**
-	 * Add and insert a new contact into the list.
+	 * Add and insert a new contact into the list. NOTE: Deprecated
 	 */
 	$('#contacts_addcardform input[type="submit"]').live('click',function(){
 		$.post('ajax/addcontact.php',$('#contact_identity').serialize(),function(jsondata){
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index aefa2c74114..eee57ec4a12 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -177,7 +177,7 @@ class OC_Contacts_VCard{
 			} else {
 				$fn = 'Unknown';
 			}
-			$card->addProperty('EMAIL', $email);
+			$card->addProperty('FN', $fn);
 			$data = $card->serialize();
 		}
 
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 8a4faf720de..446a9b88ede 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -1,21 +1,6 @@
 <?php
 $l=new OC_L10N('contacts');
 $id = isset($_['id']) ? $_['id'] : '';
-$card = array();
-$card['id'] = $id;
-$card['FN'] = (array_key_exists('FN',$_['details'])) ? $_['details']['FN'][0] : null;
-$card['N'] = (array_key_exists('N',$_['details'])) ? $_['details']['N'][0] : array('', '', '', '', '');
-$card['ORG'] = (array_key_exists('ORG',$_['details'])) ? $_['details']['ORG'][0] : null;
-$card['PHOTO'] = (array_key_exists('PHOTO',$_['details'])) ? $_['details']['PHOTO'][0] : null;
-$card['BDAY'] = (array_key_exists('BDAY',$_['details'])) ? $_['details']['BDAY'][0] : null;
-if($card['BDAY']) {
-	$bday = new DateTime($card['BDAY']['value']);
-	$card['BDAY']['value'] = $bday->format('d-m-Y');
-}
-$card['NICKNAME'] = (array_key_exists('NICKNAME',$_['details'])) ? $_['details']['NICKNAME'][0] : null;
-$card['EMAIL'] = (array_key_exists('EMAIL',$_['details'])) ? $_['details']['EMAIL'] : array();
-$card['TEL'] = (array_key_exists('TEL',$_['details'])) ? $_['details']['TEL'] : array();
-$card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] : array();
 ?>
 <div id="card">
 	<div id="actionbar">
@@ -35,7 +20,7 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 
 	<div class="contactsection">
 
-	<form <?php echo (is_null($card['PHOTO'])?'style="display:none;"':''); ?> id="file_upload_form" action="ajax/uploadphoto.php" method="post" enctype="multipart/form-data" target="file_upload_target">
+	<form style="display:none;" id="file_upload_form" action="ajax/uploadphoto.php" method="post" enctype="multipart/form-data" target="file_upload_target">
 	<fieldset id="photo" class="formfloat">
 		<div id="contacts_details_photo_wrapper" title="<?php echo $l->t('Click or drop to upload picture'); ?> (max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
 		<!-- img style="padding: 1em;" id="contacts_details_photo" alt="Profile picture"  src="photo.php?id=<?php echo $_['id']; ?>" / -->
@@ -80,7 +65,7 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 	<form id="contact_communication" method="post" style="display: none;">
 	<div class="contactsection">
 		<!-- email addresses -->
-		<div id="emails" <?php echo (count($card['EMAIL'])>0?'':'style="display:none;"'); ?>>
+		<div id="emails" style="display:none;">
 		<fieldset class="contactpart">
 		<legend><?php echo $l->t('Email'); ?></legend>
 			<ul id="emaillist" class="propertylist">
@@ -100,7 +85,7 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 		</div> <!-- email addresses-->
 
 		<!-- Phone numbers -->
-		<div id="phones" <?php echo (count($card['TEL'])>0?'':'style="display:none;"'); ?>>
+		<div id="phones" style="display:none;">
 		<fieldset class="contactpart">
 		<legend><?php echo $l->t('Phone'); ?></legend>
 			<ul id="phonelist" class="propertylist">
@@ -126,7 +111,7 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 		</div> <!-- Phone numbers -->
 
 		<!-- Addresses -->
-		<div id="addresses" <?php echo (count($card['ADR'])>0?'':'style="display:none;"'); ?>>
+		<div id="addresses" style="display:none;">
 		<fieldset class="contactpart">
 		<legend><?php echo $l->t('Address'); ?></legend>
 		<div id="addressdisplay">
@@ -178,11 +163,6 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
 	</div> 
 	</form>
 </div>
-<div class="delimiter"></div>
-<pre>
-<?php /*print_r($card);*/ ?>
-</pre>
-	<!-- div class="updatebar"><input type="button" value="Update" /></div -->
 <div id="edit_photo_dialog" title="Edit photo">
 		<div id="edit_photo_dialog_img"></div>
 </div>
-- 
GitLab


From c191ef64593eb74094571fda0799cb41bdfbe0a4 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 6 Feb 2012 07:32:57 +0100
Subject: [PATCH 425/546] Added files for new contact editor/viewer.

---
 apps/contacts/ajax/editname.php |  5 +--
 apps/contacts/js/contacts.js    | 74 +++++++--------------------------
 2 files changed, 16 insertions(+), 63 deletions(-)

diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php
index c7a7bcdeaf8..31bdd125675 100644
--- a/apps/contacts/ajax/editname.php
+++ b/apps/contacts/ajax/editname.php
@@ -17,13 +17,10 @@ function bailOut($msg) {
 function debug($msg) {
 	OC_Log::write('contacts','ajax/editname.php: '.$msg, OC_Log::DEBUG);
 }
-foreach ($_GET as $key=>$element) {
-	debug('_GET: '.$key.'=>'.$element);
-}
 
 $tmpl = new OC_TEMPLATE("contacts", "part.edit_name_dialog");
 
-$id = $_GET['id'];
+$id = isset($_GET['id'])?$_GET['id']:'';
 if($id) {
 	$vcard = OC_Contacts_App::getContactVCard($id);
 	$name = array('', '', '', '', '');
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 40f049de3b5..cac5c3031e5 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -67,6 +67,7 @@ Contacts={
 		propertyTypeFor:function(obj) {
 			return $(obj).parents('.propertycontainer').first().data('element');
 		},
+<<<<<<< HEAD
 		showHideContactInfo:function() {
 			var show = ($('#emaillist li[class*="propertycontainer"]').length > 0 || $('#phonelist li[class*="propertycontainer"]').length > 0 || $('#addressdisplay dl[class*="propertycontainer"]').length > 0);
 			console.log('showHideContactInfo: ' + show);
@@ -76,25 +77,39 @@ Contacts={
 				$('#contact_communication').hide();
 			}
 		},
+=======
+>>>>>>> Added files for new contact editor/viewer.
 		checkListFor:function(obj) {
 			var type = $(obj).parents('.propertycontainer').first().data('element');
 			console.log('checkListFor: ' + type);
 			switch (type) {
 				case 'EMAIL':
 					console.log('emails: '+$('#emaillist>li').length);
+<<<<<<< HEAD
 					if($('#emaillist li[class*="propertycontainer"]').length == 0) {
+=======
+					if($('#emaillist>li').length == 1) {
+>>>>>>> Added files for new contact editor/viewer.
 						$('#emails').hide();
 					}
 					break;
 				case 'TEL':
 					console.log('phones: '+$('#phonelist>li').length);
+<<<<<<< HEAD
 					if($('#phonelist li[class*="propertycontainer"]').length == 0) {
+=======
+					if($('#phonelist>li').length == 1) {
+>>>>>>> Added files for new contact editor/viewer.
 						$('#phones').hide();
 					}
 					break;
 				case 'ADR':
 					console.log('addresses: '+$('#addressdisplay>dl').length);
+<<<<<<< HEAD
 					if($('#addressdisplay dl[class*="propertycontainer"]').length == 0) {
+=======
+					if($('#addressdisplay>dl').length == 1) {
+>>>>>>> Added files for new contact editor/viewer.
 						$('#addresses').hide();
 					}
 					break;
@@ -376,8 +391,6 @@ Contacts={
 				//Contacts.UI.notImplemented();
 				//return false;
 				this.id = ''; this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
-
-				
 				$.getJSON('ajax/newcontact.php',{},function(jsondata){
 					if(jsondata.status == 'success'){
 						id = '';
@@ -583,9 +596,7 @@ Contacts={
 				}
 			},
 			editName:function(){
-				console.log('editName, id: ' + (this.id == ''));
 				var isnew = (this.id == '');
-				//console.log('editName');
 				/* Initialize the name edit dialog */
 				if($('#edit_name_dialog').dialog('isOpen') == true){
 					$('#edit_name_dialog').dialog('moveToTop');
@@ -1107,18 +1118,6 @@ $(document).ready(function(){
 	 */
 	$('#contacts_newcontact').click(function(){
 		Contacts.UI.Card.editNew();
-// 		$.getJSON('ajax/addcontact.php',{},function(jsondata){
-// 			if(jsondata.status == 'success'){
-// 				$('#rightcontent').data('id','');
-// 				$('#rightcontent').html(jsondata.data.page)
-// 					.find('select').chosen();
-// 			}
-// 			else{
-// 				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
-// 				//alert(jsondata.data.message);
-// 			}
-// 		});
-// 		return false;
 	});
 	
 	/**
@@ -1139,19 +1138,6 @@ $(document).ready(function(){
 				//alert(jsondata.data.message);
 			}
 		});
-		// NOTE: Deprecated.
-// 		$.getJSON('ajax/getdetails.php',{'id':id, 'new':1},function(jsondata){
-// 			if(jsondata.status == 'success'){
-// 				$('#rightcontent').data('id',jsondata.data.id);
-// 				$('#rightcontent').html(jsondata.data.page);
-// 				$('#leftcontent li[data-id="'+jsondata.data.id+'"]').addClass('active');
-// 				//Contacts.UI.loadHandlers();
-// 			}
-// 			else{
-// 				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
-// 				//alert(jsondata.data.message);
-// 			}
-// 		});
 		return false;
 	});
 
@@ -1162,36 +1148,6 @@ $(document).ready(function(){
 		Contacts.UI.Card.delete();
 	});
 
-	/**
-	 * Add and insert a new contact into the list. NOTE: Deprecated
-	 */
-	$('#contacts_addcardform input[type="submit"]').live('click',function(){
-		$.post('ajax/addcontact.php',$('#contact_identity').serialize(),function(jsondata){
-			if(jsondata.status == 'success'){
-				$('#rightcontent').data('id',jsondata.data.id);
-				$('#rightcontent').html(jsondata.data.page);
-				$('#leftcontent .active').removeClass('active');
-				var item = '<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'"  style="background: url(thumbnail.php?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+jsondata.data.name+'</a></li>';
-				var added = false;
-				$('#leftcontent ul li').each(function(){
-					if ($(this).text().toLowerCase() > jsondata.data.name.toLowerCase()) {
-						$(this).before(item).fadeIn('fast');
-						added = true;
-						return false;
-					}
-				});
-				if(!added) {
-					$('#leftcontent ul').append(item);
-				}
-			}
-			else{
-				Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
-				//alert(jsondata.data.message);
-			}
-		}, 'json');
-		return false;
-	});
-	
 	$('#contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
 		if (isInView) { //NOTE: I've kept all conditions for future reference ;-)
 			// element is now visible in the viewport
-- 
GitLab


From f4a586a52c1aeead0790ae0906523ce7aeba44bd Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 8 Feb 2012 09:18:58 +0100
Subject: [PATCH 426/546] Fix merge conflicts

---
 apps/contacts/js/contacts.js | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index cac5c3031e5..43fce50b2b8 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -67,7 +67,6 @@ Contacts={
 		propertyTypeFor:function(obj) {
 			return $(obj).parents('.propertycontainer').first().data('element');
 		},
-<<<<<<< HEAD
 		showHideContactInfo:function() {
 			var show = ($('#emaillist li[class*="propertycontainer"]').length > 0 || $('#phonelist li[class*="propertycontainer"]').length > 0 || $('#addressdisplay dl[class*="propertycontainer"]').length > 0);
 			console.log('showHideContactInfo: ' + show);
@@ -77,39 +76,25 @@ Contacts={
 				$('#contact_communication').hide();
 			}
 		},
-=======
->>>>>>> Added files for new contact editor/viewer.
 		checkListFor:function(obj) {
 			var type = $(obj).parents('.propertycontainer').first().data('element');
 			console.log('checkListFor: ' + type);
 			switch (type) {
 				case 'EMAIL':
 					console.log('emails: '+$('#emaillist>li').length);
-<<<<<<< HEAD
 					if($('#emaillist li[class*="propertycontainer"]').length == 0) {
-=======
-					if($('#emaillist>li').length == 1) {
->>>>>>> Added files for new contact editor/viewer.
 						$('#emails').hide();
 					}
 					break;
 				case 'TEL':
 					console.log('phones: '+$('#phonelist>li').length);
-<<<<<<< HEAD
 					if($('#phonelist li[class*="propertycontainer"]').length == 0) {
-=======
-					if($('#phonelist>li').length == 1) {
->>>>>>> Added files for new contact editor/viewer.
 						$('#phones').hide();
 					}
 					break;
 				case 'ADR':
 					console.log('addresses: '+$('#addressdisplay>dl').length);
-<<<<<<< HEAD
 					if($('#addressdisplay dl[class*="propertycontainer"]').length == 0) {
-=======
-					if($('#addressdisplay>dl').length == 1) {
->>>>>>> Added files for new contact editor/viewer.
 						$('#addresses').hide();
 					}
 					break;
-- 
GitLab


From 36d696c30dcd1dbb4f92293fef852a2afc19c156 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 8 Feb 2012 16:28:59 +0100
Subject: [PATCH 427/546] dont load pdfview for ie

---
 apps/files_pdfviewer/js/viewer.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/apps/files_pdfviewer/js/viewer.js b/apps/files_pdfviewer/js/viewer.js
index 7f6766c67dd..85bbf09362e 100755
--- a/apps/files_pdfviewer/js/viewer.js
+++ b/apps/files_pdfviewer/js/viewer.js
@@ -49,13 +49,15 @@ showPDFviewer.lastTitle='';
 showPDFviewer.loaded=false;
 
 $(document).ready(function(){
-	if(location.href.indexOf("files")!=-1) {
-		PDFJS.workerSrc = OC.filePath('files_pdfviewer','js','pdfjs/build/pdf.js');
-		if(typeof FileActions!=='undefined'){
-			FileActions.register('application/pdf','Edit','',function(filename){
-				showPDFviewer($('#dir').val(),filename);
-			});
-			FileActions.setDefault('application/pdf','Edit');
+	if(!$.browser.msie){//doesnt work on IE
+		if(location.href.indexOf("files")!=-1) {
+			PDFJS.workerSrc = OC.filePath('files_pdfviewer','js','pdfjs/build/pdf.js');
+			if(typeof FileActions!=='undefined'){
+				FileActions.register('application/pdf','Edit','',function(filename){
+					showPDFviewer($('#dir').val(),filename);
+				});
+				FileActions.setDefault('application/pdf','Edit');
+			}
 		}
 	}
 });
-- 
GitLab


From bcebfbfbe229b5fdb1cfc1c058e11e78550ff088 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 8 Feb 2012 17:29:54 +0100
Subject: [PATCH 428/546] bugfix in searching files by mimetype

---
 lib/filecache.php | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index 964099c7fcd..a053e4cbc1b 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -466,6 +466,7 @@ class OC_FileCache{
 	 * fine files by mimetype
 	 * @param string $part1
 	 * @param string $part2 (optional)
+	 * @param string root (optional)
 	 * @return array of file paths
 	 *
 	 * $part1 and $part2 together form the complete mimetype.
@@ -474,17 +475,24 @@ class OC_FileCache{
 	 * seccond mimetype part can be ommited
 	 * e.g. searchByMime('audio')
 	 */
-	public static function searchByMime($part1,$part2=''){
-		if($part2){
-			$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE mimepart=?');
-			$result=$query->execute(array($part1));
+	public static function searchByMime($part1,$part2='',$root=''){
+		if(!$root){
+			$root=OC_Filesystem::getRoot();
+		}elseif($root='/'){
+			$root='';
+		}
+		$rootLen=strlen($root);
+		$user=OC_User::getUser();
+		if(!$part2){
+			$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE mimepart=? AND user=?');
+			$result=$query->execute(array($part1,$user));
 		}else{
-			$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE mimetype=?');
-			$result=$query->execute(array($part1.'/'.$part2));
+			$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE mimetype=? AND user=?');
+			$result=$query->execute(array($part1.'/'.$part2,$user));
 		}
 		$names=array();
 		while($row=$result->fetchRow()){
-			$names[]=$row['path'];
+			$names[]=substr($row['path'],$rootLen);
 		}
 		return $names;
 	}
-- 
GitLab


From c4a6b998146c29289794c1e15b71f1cfcfb4229a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 8 Feb 2012 17:30:16 +0100
Subject: [PATCH 429/546] use oc_filecache and oc_eventsource for music
 scanning

---
 apps/media/ajax/api.php    | 28 ++----------
 apps/media/js/scanner.js   | 88 +++++++++-----------------------------
 apps/media/lib_scanner.php | 36 ++++++----------
 3 files changed, 38 insertions(+), 114 deletions(-)

diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php
index 4a93e84910e..ac6739a1386 100644
--- a/apps/media/ajax/api.php
+++ b/apps/media/ajax/api.php
@@ -70,10 +70,10 @@ if($arguments['action']){
 		case 'scan':
 			OC_DB::beginTransaction();
 			set_time_limit(0); //recursive scan can take a while
-			$path=$arguments['path'];
-			echo OC_MEDIA_SCANNER::scanFolder($path);
+			$eventSource=new OC_EventSource();
+			OC_MEDIA_SCANNER::scanCollection($eventSource);
+			$eventSource->close();
 			OC_DB::commit();
-			flush();
 			break;
 		case 'scanFile':
 			echo (OC_MEDIA_SCANNER::scanFile($arguments['path']))?'true':'false';
@@ -127,29 +127,9 @@ if($arguments['action']){
 			OC_Filesystem::readfile($arguments['path']);
 			exit;
 		case 'find_music':
-			OC_JSON::encodedPrint(findMusic());
+			OC_JSON::encodedPrint(OC_FileCache::searchByMime('audio'));
 			exit;
 	}
 }
 
-function findMusic($path=''){
-	$music=array();
-	$dh=OC_Filesystem::opendir($path);
-	if($dh){
-		while($filename=readdir($dh)){
-			if($filename[0]!='.'){
-				$file=$path.'/'.$filename;
-				if(OC_Filesystem::is_dir($file)){
-					$music=array_merge($music,findMusic($file));
-				}else{
-					if(OC_MEDIA_SCANNER::isMusic($filename)){
-						$music[]=$file;
-					}
-				}
-			}
-		}
-	}
-	return $music;
-}
-
 ?>
diff --git a/apps/media/js/scanner.js b/apps/media/js/scanner.js
index ed2046dd7a6..0baa9db419a 100644
--- a/apps/media/js/scanner.js
+++ b/apps/media/js/scanner.js
@@ -1,90 +1,44 @@
 Scanner={
 	songsFound:0,
+	eventSource:null,
 	songsScanned:0,
-	songsChecked:0,
-	startTime:null,
-	endTime:null,
-	stopScanning:false,
-	currentIndex:0,
-	songs:[],
 	findSongs:function(ready){
 		$.getJSON(OC.linkTo('media','ajax/api.php')+'?action=find_music',function(songs){
 			Scanner.songsFound=songs.length;
-			Scanner.currentIndex=-1
 			if(ready){
-				
 				ready(songs)
 			}
 		});
 	},
-	scanFile:function(path,ready){
-		path=encodeURIComponent(path);
-		$.getJSON(OC.linkTo('media','ajax/api.php')+'?action=get_path_info&path='+path,function(song){
-			Scanner.songsChecked++;
-			if(ready){
-				ready(song);
-			}
-			if(song){//do this after the ready call so we dont hold up the next ajax call
-				var artistId=song.song_artist;
-				Scanner.songsScanned++;
-				$('#scan span.songCount').text(Scanner.songsScanned);
-				var progress=(Scanner.songsChecked/Scanner.songsFound)*100;
-				$('#scanprogressbar').progressbar('value',progress)
-				Collection.addSong(song);
-			}
-		});
-	},
 	scanCollection:function(ready){
 		$('#scanprogressbar').progressbar({
 			value:0,
 		});
 		$('#scanprogressbar').show();
-		Scanner.songsChecked=0;
-		Scanner.currentIndex=0;
 		Scanner.songsScanned=0;
-		Scanner.startTime=new Date().getTime()/1000;
-		Scanner.findSongs(function(songs){
-			Scanner.songs=songs;
-			Scanner.start(function(){
-				$('#scan input.start').show();
-				$('#scan input.stop').hide();
-				$('#scanprogressbar').hide();
-				Collection.display();
-				if(ready){
-					ready();
-				}
-			});
+		Scanner.eventSource=new OC.EventSource(OC.linkTo('media','ajax/api.php'),{action:'scan'});
+		Scanner.eventSource.listen('count',function(total){
+			Scanner.songsFound=total;
+		});
+		Scanner.eventSource.listen('scanned',function(data){
+			Scanner.songsScanned=data.count;
+			$('#scan span.songCount').text(Scanner.songsScanned);
+			var progress=(Scanner.songsScanned/Scanner.songsFound)*100;
+			$('#scanprogressbar').progressbar('value',progress)
 		});
+		Scanner.eventSource.listen('done',function(count){
+			$('#scan input.start').show();
+			$('#scan input.stop').hide();
+			$('#scanprogressbar').hide();
+			Collection.load(Collection.display)
+			if(ready){
+				ready();
+			}
+		});
+		$('#scancount').show();
 	},
 	stop:function(){
-		Scanner.stopScanning=true;
-	},
-	start:function(ready){
-		Scanner.stopScanning=false;
-		$('#scancount').show();
-		var scanSong=function(){
-			if(!Scanner.stopScanning && Scanner.currentIndex<=Scanner.songs.length){
-				Scanner.scanFile(Scanner.songs[Scanner.currentIndex],scanSong)
-			}else if(!Scanner.stopScanning){
-				Scanner.endTime=new Date().getTime()/1000;
-				if(ready){
-					ready();
-					ready=null;//only call ready once
-				}
-			}
-			Scanner.currentIndex++;
-		}
-		scanSong();
-		scanSong();
+		Scanner.close();
 	},
-	toggle:function(){
-		if(Scanner.stopScanning){
-			Scanner.start();
-			$('#scan input.stop').val(t('media','Pause'));
-		}else{
-			Scanner.stop();
-			$('#scan input.stop').val(t('media','Resume'));
-		}
-	}
 
 }
diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
index 8b659c73b6e..ea594ee8e3c 100644
--- a/apps/media/lib_scanner.php
+++ b/apps/media/lib_scanner.php
@@ -33,32 +33,22 @@ class OC_MEDIA_SCANNER{
 	
 	/**
 	 * scan a folder for music
-	 * @param string $path
+	 * @param OC_EventSource eventSource (optional)
 	 * @return int the number of songs found
 	 */
-	public static function scanFolder($path){
-		if (OC_Filesystem::is_dir($path)) {
-			$songs=0;
-			if ($dh = OC_Filesystem::opendir($path)) {
-				while (($filename = readdir($dh)) !== false) {
-					if($filename<>'.' and $filename<>'..' and substr($filename,0,1)!='.'){
-						$file=$path.'/'.$filename;
-						if(OC_Filesystem::is_dir($file)){
-							$songs+=self::scanFolder($file);
-						}elseif(OC_Filesystem::is_file($file)){
-							$data=self::scanFile($file);
-							if($data){
-								$songs++;
-							}
-						}
-					}
-				}
+	public static function scanCollection($eventSource=null){
+		$music=OC_FileCache::searchByMime('audio');
+		$eventSource->send('count',count($music));
+		$songs=0;
+		foreach($music as $file){
+			self::scanFile($file);
+			$songs++;
+			if($eventSource){
+				$eventSource->send('scanned',array('file'=>$file,'count'=>$songs));
 			}
-		}elseif(OC_Filesystem::is_file($path)){
-			$songs=1;
-			self::scanFile($path);
-		}else{
-			$songs=0;
+		}
+		if($eventSource){
+			$eventSource->send('done',$songs);
 		}
 		return $songs;
 	}
-- 
GitLab


From 24748ee10fb6d165f51a3c99277a22106787696c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 8 Feb 2012 21:01:09 +0100
Subject: [PATCH 430/546] add convinience function to get filesystem view for
 app storage

---
 lib/app.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lib/app.php b/lib/app.php
index 37a99823e3d..22d18b17eec 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -403,4 +403,22 @@ class OC_App{
 			include OC::$SERVERROOT.'/apps/'.$appid.'/appinfo/update.php';
 		}
 	}
+
+	/**
+	 * @param string appid
+	 * @return OC_FilesystemView
+	 */
+	public static function getStorage($appid){
+		if(OC_App::isEnabled($appid)){//sanity check
+			if(OC_User::isLoggedIn()){
+				return new OC_FilesystemView('/'.OC_User::getUser().'/'.$appid);
+			}else{
+				OC_Log::write('core','Can\'t get app storage, app, user not logged in',OC_Log::ERROR);
+				return false;
+			}
+		}else{
+			OC_Log::write('core','Can\'t get app storage, app '.$appid.' not enabled',OC_Log::ERROR);
+			false;
+		}
+	}
 }
-- 
GitLab


From 7c03b612d2c58f9cc02c46c82e137087b1591d07 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 19 Jan 2012 21:39:05 +0100
Subject: [PATCH 431/546] OC-41: [Calendar] Date format not translatable

---
 apps/calendar/js/calendar.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 64c029404cb..92a8ba20205 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -668,8 +668,18 @@ $(document).ready(function(){
 			agenda: agendatime,
 			'': defaulttime
 			},
+		columnFormat: {
+			month: t('calendar', 'ddd'),    // Mon
+			week: t('calendar', 'ddd M/d'), // Mon 9/7
+			day: t('calendar', 'dddd M/d')  // Monday 9/7
+			},
 		titleFormat: {
-			list: 'yyyy/MMM/d dddd'
+			month: t('calendar', 'MMMM yyyy'),
+					// September 2009
+			week: t('calendar', "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"),
+					// Sep 7 - 13 2009
+			day: t('calendar', 'dddd, MMM d, yyyy'),
+					// Tuesday, Sep 8, 2009
 			},
 		axisFormat: defaulttime,
 		monthNames: monthNames,
-- 
GitLab


From eb5de4d4f7b98bb1c258dbb5ed5ecf9c2d39e746 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 7 Feb 2012 22:33:01 +0100
Subject: [PATCH 432/546] Change gallery thumbnail generation to OC_Image

---
 apps/gallery/ajax/galleryOp.php |  2 +-
 apps/gallery/ajax/thumbnail.php | 65 ++++++---------------------------
 lib/image.php                   |  6 ++-
 lib/util.php                    |  2 +-
 4 files changed, 18 insertions(+), 57 deletions(-)

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index f819d87f666..0ec447d01f6 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -69,7 +69,7 @@ function handlePartialCreate($path) {
   if (!OC_Filesystem::is_dir($path)) OC_JSON::error(array('cause' => 'Invalid path given'));
 
   $album = OC_Gallery_Album::find(OC_User::getUser(), null, $path);
-  $albums;
+  $albums = array();
   OC_Gallery_Scanner::scanDir($path, $albums);
   OC_JSON::success(array('album_details' => $albums));
 }
diff --git a/apps/gallery/ajax/thumbnail.php b/apps/gallery/ajax/thumbnail.php
index 6d25c7a2536..ad91edfa3c8 100644
--- a/apps/gallery/ajax/thumbnail.php
+++ b/apps/gallery/ajax/thumbnail.php
@@ -25,65 +25,22 @@ require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
 
-function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height) { //$imgSrc is a FILE - Returns an image resource.
-    //getting the image dimensions  
-		if(! function_exists('imagecreatefromjpeg'))
-			OC_Log::write('gallery','GD module not installed',OC_Log::ERROR);
-
-    list($width_orig, $height_orig) = getimagesize($imgSrc);   
-    switch (strtolower(substr($imgSrc, strrpos($imgSrc, '.')+1))) {
-      case "jpeg":
-      case "jpg":
-      case "tiff":
-        $myImage = imagecreatefromjpeg($imgSrc);
-        break;
-      case "png":
-        $myImage = imagecreatefrompng($imgSrc);
-        break;
-      default:
-        exit();
-    }
-		if(!$myImage) exit();
-    $ratio_orig = $width_orig/$height_orig;
-    
-    if ($thumbnail_width/$thumbnail_height > $ratio_orig) {
-       $new_height = $thumbnail_width/$ratio_orig;
-       $new_width = $thumbnail_width;
-    } else {
-       $new_width = $thumbnail_height*$ratio_orig;
-       $new_height = $thumbnail_height;
-    }
-    
-    $x_mid = $new_width/2;  //horizontal middle
-    $y_mid = $new_height/2; //vertical middle
-    
-    $process = imagecreatetruecolor(round($new_width), round($new_height)); 
-
-    imagecopyresampled($process, $myImage, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
-    $thumb = imagecreatetruecolor($thumbnail_width, $thumbnail_height); 
-    imagecopyresampled($thumb, $process, 0, 0, ($x_mid-($thumbnail_width/2)), ($y_mid-($thumbnail_height/2)), $thumbnail_width, $thumbnail_height, $thumbnail_width, $thumbnail_height);
-
-    imagedestroy($process);
-    imagedestroy($myImage);
-    return $thumb;
-}
-
 $box_size = 200;
 $img = $_GET['img'];
 
 $imagePath = OC_Filesystem::getLocalFile($img);
 
-if(file_exists($imagePath))
-{
-	$image = CroppedThumbnail($imagePath, $box_size, $box_size);
+if(file_exists($imagePath)) {
+  $image = new OC_Image($imagePath);
+  $image->centerCrop();
+  $image->resize($box_size, $box_size);
+  $image->fixOrientation();
 
-	header('Content-Type: image/png');
-	$offset = 3600 * 24;
-	// calc the string in GMT not localtime and add the offset
-	header("Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT");
-	header('Cache-Control: max-age='.$offset.', must-revalidate');
-	header('Pragma: public');
+  $offset = 3600 * 24;
+  // calc the string in GMT not localtime and add the offset
+  header("Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT");
+  header('Cache-Control: max-age='.$offset.', must-revalidate');
+  header('Pragma: public');
 
-	imagepng($image);
-	imagedestroy($image);
+  $image->show();
 }
diff --git a/lib/image.php b/lib/image.php
index 6de3ed9104d..255d289ea21 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -147,6 +147,10 @@ class OC_Image {
 				return false;
 			}
 		}
+		if (!$this->valid()) {
+			return false;
+		}
+
 		$retval = false;
 		switch(self::$imagetype) {
 			case IMAGETYPE_GIF:
@@ -257,7 +261,7 @@ class OC_Image {
 				$flip = true;
 				break;
 			case 8:
-				$rotate = 270;
+				$rotate = 90;
 				$flip = false;
 				break;
 		}
diff --git a/lib/util.php b/lib/util.php
index abd918044b5..43fb4413f04 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -110,7 +110,7 @@ class OC_Util {
 	/**
 	 * @brief Add a custom element to the header
 	 * @param string tag tag name of the element
-	 * @param array $attributes array of attrobutes for the element
+	 * @param array $attributes array of attributes for the element
 	 * @param string $text the text content for the element
 	 */
 	public static function addHeader( $tag, $attributes, $text=''){
-- 
GitLab


From 43d2266f5ca9f9f2802bf131fddeb21f849f3d12 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 7 Feb 2012 22:33:47 +0100
Subject: [PATCH 433/546] Add caching to gallery thumbnail generation

---
 apps/gallery/ajax/thumbnail.php | 24 ++++++++----------------
 apps/gallery/lib/photo.php      | 33 +++++++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/apps/gallery/ajax/thumbnail.php b/apps/gallery/ajax/thumbnail.php
index ad91edfa3c8..2dfe936d9dd 100644
--- a/apps/gallery/ajax/thumbnail.php
+++ b/apps/gallery/ajax/thumbnail.php
@@ -25,22 +25,14 @@ require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
 
-$box_size = 200;
 $img = $_GET['img'];
 
-$imagePath = OC_Filesystem::getLocalFile($img);
-
-if(file_exists($imagePath)) {
-  $image = new OC_Image($imagePath);
-  $image->centerCrop();
-  $image->resize($box_size, $box_size);
-  $image->fixOrientation();
-
-  $offset = 3600 * 24;
-  // calc the string in GMT not localtime and add the offset
-  header("Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT");
-  header('Cache-Control: max-age='.$offset.', must-revalidate');
-  header('Pragma: public');
-
-  $image->show();
+$image = OC_Gallery_Photo::getThumbnail($img);
+if ($image) {
+	$offset = 3600 * 24; // 24 hour
+	// calc the string in GMT not localtime and add the offset
+	header("Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT");
+	header('Cache-Control: max-age='.$offset.', must-revalidate');
+	header('Pragma: public');
+	$image->show();
 }
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index d1fb166aee9..15783cb341a 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -21,7 +21,7 @@
 * 
 */
 
-class OC_Gallery_Photo{
+class OC_Gallery_Photo {
 	public static function create($albumId, $img){
 		$stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_photos (album_id, file_path) VALUES (?, ?)');
 		$stmt->execute(array($albumId, $img));
@@ -65,5 +65,34 @@ class OC_Gallery_Photo{
     $stmt = OC_DB::prepare("UPDATE *PREFIX*gallery_photos SET file_path = ?, album_id = ? WHERE album_id = ? and file_path = ?");
     $stmt->execute(array($newpath, $newAlbumId, $oldAlbumId, $oldpath));
   }
-}
 
+	public static function getThumbnail($image_name) {
+		$imagePath = OC_Filesystem::getLocalFile($image_name);
+		if(!file_exists($imagePath)) {
+			return null;
+		}
+		$save_dir = OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/gallery/';
+		$save_dir .= dirname($image_name). '/';
+		$image_name = basename($image_name);
+		$thumb_file = $save_dir . $image_name;
+		if (file_exists($thumb_file)) {
+			$image = new OC_Image($thumb_file);
+		} else {
+			$image = new OC_Image($imagePath);
+			if ($image->valid()) {
+				$image->centerCrop();
+				$image->resize(200);
+				$image->fixOrientation();
+				if (!is_dir($save_dir)) {
+					mkdir($save_dir, 0777, true);
+				}
+				$image->save($thumb_file);
+			}
+		}
+		if ($image->valid()) {
+			//var_dump($image, $image->resource());
+			return $image;
+		}
+		return null;
+	}
+}
-- 
GitLab


From 158360c09b2f14b676daf3091c5743fd2a50748a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 8 Feb 2012 21:09:47 +0100
Subject: [PATCH 434/546] Gallery: use thumbnails of images for the album
 thumbnail

The thumbnails were already generated in this function, but now we save them
for displaying of the album.
---
 apps/gallery/lib/scanner.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index 3aae94d1a4f..9fdadbe38c7 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -89,8 +89,11 @@ class OC_Gallery_Scanner {
     $file_count = min(count($files), 10);
     $thumbnail = imagecreatetruecolor($file_count*200, 200);
     for ($i = 0; $i < $file_count; $i++) {
-		$imagePath = OC_Filesystem::getLocalFile($files[$i]);
-      CroppedThumbnail($imagePath, 200, 200, $thumbnail, $i*200);
+      $image = OC_Gallery_Photo::getThumbnail($files[$i]);
+      if ($image && $image->valid()) {
+	      imagecopyresampled($thumbnail, $image->resource(), $i*200, 0, 0, 0, 200, 200, 200, 200);
+      }
+      unset($image); // unset $image here to control the lifetime of image::$resource
     }
     imagepng($thumbnail, OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/gallery/' . $albumName.'.png');
   }
-- 
GitLab


From 7cd1a302d36259ef8496ea59d7060c99b6d10e25 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 8 Feb 2012 21:11:45 +0100
Subject: [PATCH 435/546] Gallery: Add caching headers to album thumbnail
 sending

---
 apps/gallery/ajax/galleryOp.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index 0ec447d01f6..8df692c7735 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -45,6 +45,11 @@ function handleGetThumbnails($albumname) {
   OC_JSON::checkLoggedIn();
   $photo = new OC_Image();
   $photo->loadFromFile(OC::$CONFIG_DATADIRECTORY.'/../gallery/'.$albumname.'.png');
+  $offset = 3600 * 24; // 24 hour
+  // calc the string in GMT not localtime and add the offset
+  header("Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT");
+  header('Cache-Control: max-age='.$offset.', must-revalidate');
+  header('Pragma: public');
   $photo->show();
 }
 
-- 
GitLab


From 88b2391d2bfbc85f9c976e6aacd302481e9898ee Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 8 Feb 2012 21:12:20 +0100
Subject: [PATCH 436/546] Fix wrong var name in sharedstorage.php

---
 apps/files_sharing/sharedstorage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 4840cce4c9d..cb641e68a84 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -460,7 +460,7 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 	}
 	
 	public function getMimeType($path) {
-		if ($path2 == "" || $path2 == "/") {
+		if ($path == "" || $path == "/") {
 			return 'httpd/unix-directory';
 		}
 		$source = $this->getSource($path);
@@ -517,4 +517,4 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 	
 }
 
-?>
\ No newline at end of file
+?>
-- 
GitLab


From 398fbe7b82c556df29636bf62291b165e4fd3b4f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 8 Feb 2012 21:25:20 +0100
Subject: [PATCH 437/546] use fetchRow instead of fetch

---
 lib/filecache.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index a053e4cbc1b..a46f915e553 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -304,7 +304,7 @@ class OC_FileCache{
 				$parent=self::getFileId($fullPath);
 				$query=OC_DB::prepare('SELECT size FROM *PREFIX*fscache WHERE parent=?');
 				$query->execute(array($parent));
-				while($row=$query->fetch()){
+				while($row=$query->fetchRow()){
 					$size+=$row['size'];
 				}
 				$mtime=$view->filemtime($path);
@@ -331,7 +331,7 @@ class OC_FileCache{
 		}
 		$query=OC_DB::prepare('SELECT size FROM *PREFIX*fscache WHERE path=?');
 		$query->execute(array($path));
-		if($row=$query->fetch()){
+		if($row=$query->fetchRow()){
 			return $row['size'];
 		}else{//file not in cache
 			return 0;
@@ -518,7 +518,7 @@ class OC_FileCache{
 		$path=$root.$path;
 		$query=OC_DB::prepare('SELECT mtime FROM *PREFIX*fscache WHERE path=?');
 		$query->execute(array($path));
-		if($row=$query->fetch()){
+		if($row=$query->fetchRow()){
 			$cachedMTime=$row['mtime'];
 			return ($mtime>$cachedMTime);
 		}else{//file not in cache, so it has to be updated
@@ -557,7 +557,7 @@ class OC_FileCache{
 		$parent=self::getFileId($view->getRoot().$path);
 		$query=OC_DB::prepare('SELECT name FROM *PREFIX*fscache WHERE parent=?');
 		$result=$query->execute(array($parent));
-		while($row=$result->fetch()){
+		while($row=$result->fetchRow()){
 			$file=$path.'/'.$row['name'];
 			if(!$view->file_exists($file)){
 				if(!$root){//filesystem hooks are only valid for the default root
-- 
GitLab


From 25381ac5b145390102e359462f9f99cc7e7802e0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 8 Feb 2012 21:39:09 +0100
Subject: [PATCH 438/546] fix filecache with MDB2

---
 lib/filecache.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index a46f915e553..cb516223f63 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -303,8 +303,8 @@ class OC_FileCache{
 			if(self::inCache($path,$root)){
 				$parent=self::getFileId($fullPath);
 				$query=OC_DB::prepare('SELECT size FROM *PREFIX*fscache WHERE parent=?');
-				$query->execute(array($parent));
-				while($row=$query->fetchRow()){
+				$result=$query->execute(array($parent));
+				while($row=$result->fetchRow()){
 					$size+=$row['size'];
 				}
 				$mtime=$view->filemtime($path);
@@ -330,8 +330,8 @@ class OC_FileCache{
 			}
 		}
 		$query=OC_DB::prepare('SELECT size FROM *PREFIX*fscache WHERE path=?');
-		$query->execute(array($path));
-		if($row=$query->fetchRow()){
+		$result=$query->execute(array($path));
+		if($row=$result->fetchRow()){
 			return $row['size'];
 		}else{//file not in cache
 			return 0;
@@ -517,8 +517,8 @@ class OC_FileCache{
 		$isDir=$view->is_dir($path);
 		$path=$root.$path;
 		$query=OC_DB::prepare('SELECT mtime FROM *PREFIX*fscache WHERE path=?');
-		$query->execute(array($path));
-		if($row=$query->fetchRow()){
+		$result=$query->execute(array($path));
+		if($row=$result->fetchRow()){
 			$cachedMTime=$row['mtime'];
 			return ($mtime>$cachedMTime);
 		}else{//file not in cache, so it has to be updated
-- 
GitLab


From ff53b0c2097ae5d0390336238454dc1792158905 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 9 Feb 2012 19:04:07 +0100
Subject: [PATCH 439/546] Keep js data structure in sync on changes. More
 checks for missing properties.

---
 apps/contacts/ajax/contactdetails.php    |  3 +-
 apps/contacts/css/contacts.css           |  8 ++---
 apps/contacts/js/contacts.js             | 46 ++++++++++++++++++++----
 apps/contacts/lib/app.php                | 18 +++++++++-
 apps/contacts/lib/vcard.php              | 18 ++++++++--
 apps/contacts/templates/part.contact.php |  6 ++--
 6 files changed, 82 insertions(+), 17 deletions(-)

diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contactdetails.php
index abec500c396..f7ac25ea515 100644
--- a/apps/contacts/ajax/contactdetails.php
+++ b/apps/contacts/ajax/contactdetails.php
@@ -60,7 +60,8 @@ if(!isset($details['FN'])) {
 
 // Make up for not supporting the 'N' field in earlier version.
 if(!isset($details['N'])) {
-	$details['N'] = array(array($details['FN'][0]['value'],'','','',''));
+	$details['N'] = array();
+	$details['N'][0] = array($details['FN'][0]['value'],'','','','');
 }
 
 // Don't wanna transfer the photo in a json string.
diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index d90e93f64e9..86322a2cc2a 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -8,10 +8,10 @@
 #contacts_deletecard {position:absolute;top:15px;right:25px;}
 #contacts_downloadcard {position:absolute;top:15px;right:50px;}
 #contacts_propertymenu_button { position:absolute;top:15px;right:150px; height: 20px; width: 150px; background:url('../../../core/img/actions/add.svg') no-repeat center;	 }
-#contacts_propertymenu { position:absolute;top:35px;right:150px; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; }
-#contacts_propertymenu li { display: block; font-weight: bold; border-left: thin solid #1d2d44;  border-right: thin solid #1d2d44; height: 20px; width: 100px; }
-#contacts_propertymenu li:first-child { border-top: thin solid #1d2d44; -moz-border-radius-topleft:0.5em; -webkit-border-top-left-radius:0.5em; border-top-left-radius:0.5em; -moz-border-radius-topright:0.5em; -webkit-border-top-right-radius:0.5em; border-top-right-radius:0.5em; }
-#contacts_propertymenu li:last-child { border-bottom: thin solid #1d2d44; -moz-border-radius-bottomleft:0.5em; -webkit-border-bottom-left-radius:0.5em; border-bottom-left-radius:0.5em; -moz-border-radius-bottomright:0.5em; -webkit-border-bottom-right-radius:0.5em; border-bottom-right-radius:0.5em; }
+#contacts_propertymenu { position:absolute;top:40px;right:150px; overflow:hidden; text-overflow:ellipsis; /*border: thin solid #1d2d44;*/  -moz-box-shadow:0 0 10px #000; -webkit-box-shadow:0 0 10px #000; box-shadow:0 0 10px #000; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; }
+#contacts_propertymenu li { display: block; font-weight: bold; height: 20px; width: 100px; }
+/*#contacts_propertymenu li:first-child { border-top: thin solid #1d2d44; -moz-border-radius-topleft:0.5em; -webkit-border-top-left-radius:0.5em; border-top-left-radius:0.5em; -moz-border-radius-topright:0.5em; -webkit-border-top-right-radius:0.5em; border-top-right-radius:0.5em; }
+#contacts_propertymenu li:last-child { border-bottom: thin solid #1d2d44; -moz-border-radius-bottomleft:0.5em; -webkit-border-bottom-left-radius:0.5em; border-bottom-left-radius:0.5em; -moz-border-radius-bottomright:0.5em; -webkit-border-bottom-right-radius:0.5em; border-bottom-right-radius:0.5em; }*/
 #contacts_propertymenu li a { padding: 3px; display: block }
 #contacts_propertymenu li:hover { background-color: #1d2d44; }
 #contacts_propertymenu li a:hover { color: #fff }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 34210a4567c..7f4e938c48a 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -154,7 +154,7 @@ Contacts={
 			);
 		},
 		loadHandlers:function() {
-			console.log('loadHandlers');
+			//console.log('loadHandlers');
 			/*
 			$('.formfloat').hover(
 				function () {
@@ -164,9 +164,9 @@ Contacts={
 					$(this).find('.add').fadeOut(500);
 				}
 			);*/
+			$('.button,.action').tipsy();
 			$('#contacts_deletecard').tipsy({gravity: 'ne'});
 			$('#contacts_downloadcard').tipsy({gravity: 'ne'});
-			$('.button').tipsy();
 			$('#fn').jec();
 			$('.jecEditableOption').attr('title', t('contacts','Custom'));
 			$('#fn').tipsy();
@@ -265,7 +265,7 @@ Contacts={
 				$('#contact_communication').hide();
 				this.data = jsondata;
 				this.id = this.data.id;
-				console.log('loaded: ' + this.data.FN[0]['value']);
+				//console.log('loaded: ' + this.data.FN[0]['value']);
 				this.populateNameFields();
 				this.loadPhoto();
 				this.loadMails();
@@ -417,13 +417,38 @@ Contacts={
 					}
 				});
 			},
+			savePropertyInternal:function(name, fields, oldchecksum, checksum){
+				// TODO: Add functionality for new fields.
+				//console.log('savePropertyInternal: ' + name + ', checksum: ' + checksum);
+				//console.log('savePropertyInternal: ' + this.data[name]);
+				var params = {};
+				var value = undefined;
+				jQuery.each(fields, function(i, field){
+					//.substring(11,'parameters[TYPE][]'.indexOf(']'))
+					if(field.name.substring(0, 5) === 'value') {
+						value = field.value;
+					} else if(field.name.substring(0, 10) === 'parameters') {
+						var p = field.name.substring(11,'parameters[TYPE][]'.indexOf(']'));
+						if(!(p in params)) {
+							params[p] = [];
+						}
+						params[p].push(field.value);
+					}
+				});
+				for(var i in this.data[name]) {
+					if(this.data[name][i]['checksum'] == oldchecksum) {
+						this.data[name][i]['checksum'] = checksum;
+						this.data[name][i]['value'] = value;
+						this.data[name][i]['parameters'] = params;
+					}
+				}
+			},
 			saveProperty:function(obj){
 				// I couldn't get the selector to filter on 'contacts_property' so I filter by hand here :-/
 				if(!$(obj).hasClass('contacts_property')) {
 					//console.log('Filtering out object.' + obj);
 					return false;
 				}
-				console.log('saveProperty. ' + $(obj).val());
 				if($(obj).hasClass('nonempty') && $(obj).val().trim() == '') {
 					Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', 'This property has to be non-empty.'));
 					return false;
@@ -432,7 +457,9 @@ Contacts={
 				Contacts.UI.loading(container, true);
 				var checksum = container.data('checksum');
 				var name = container.data('element');
-				var q = container.find('input,select').serialize();
+				console.log('saveProperty: ' + name);
+				var fields = container.find('input[class*="contacts_property"],select[class*="contacts_property"]').serializeArray();
+				var q = container.find('input[class*="contacts_property"],select[class*="contacts_property"]').serialize();
 				if(q == '' || q == undefined) {
 					console.log('Couldn\'t serialize elements.');
 					Contacts.UI.loading(container, false);
@@ -445,6 +472,7 @@ Contacts={
 					$.post('ajax/saveproperty.php',q,function(jsondata){
 						if(jsondata.status == 'success'){
 							container.data('checksum', jsondata.data.checksum);
+							Contacts.UI.Card.savePropertyInternal(name, fields, checksum, jsondata.data.checksum);
 							Contacts.UI.loading(container, false);
 							return true;
 						}
@@ -459,6 +487,8 @@ Contacts={
 					$.post('ajax/addproperty.php',q,function(jsondata){
 						if(jsondata.status == 'success'){
 							container.data('checksum', jsondata.data.checksum);
+							// TODO: savePropertyInternal doesn't know about new fields
+							//Contacts.UI.Card.savePropertyInternal(name, fields, checksum, jsondata.data.checksum);
 							Contacts.UI.loading(container, false);
 							return true;
 						}
@@ -884,7 +914,7 @@ Contacts={
 							for(ptype in this.data.TEL[phone]['parameters'][param]) {
 								var pt = this.data.TEL[phone]['parameters'][param][ptype];
 								$('#phonelist li:last-child').find('select option').each(function(){
-									if ($(this).val().toUpperCase() == pt) {
+									if ($(this).val().toUpperCase() == pt.toUpperCase()) {
 										$(this).attr('selected', 'selected');
 									}
 								});
@@ -1204,7 +1234,11 @@ $(document).ready(function(){
 		xhr.send(file);
 	}
 
+	$('#contacts_propertymenu_button').live('click',function(){
+		$('#contacts_propertymenu').is(':hidden') && $('#contacts_propertymenu').show() || $('#contacts_propertymenu').hide();
+	});
 	$('#contacts_propertymenu a').live('click',function(){
 		Contacts.UI.Card.addProperty(this);
+		$('#contacts_propertymenu').hide();
 	});
 });
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 724d632ea5d..f62bd311479 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -67,13 +67,29 @@ class OC_Contacts_App{
 	}
 
 	/**
-	 * @brief Gets the VCard as text
+	 * @brief Gets the VCard as an OC_VObject
 	 * @returns The card or null if the card could not be parsed.
 	 */
 	public static function getContactVCard($id){
 		$card = self::getContactObject( $id );
 
 		$vcard = OC_VObject::parse($card['carddata']);
+		// Try to fix cards with missing 'N' field from pre ownCloud 4. Hot damn, this is ugly...
+		if(!is_null($vcard) && !$vcard->__isset('N')){
+			$appinfo = $info=OC_App::getAppInfo('contacts');
+			if($appinfo['version'] >= 5) {
+				OC_Log::write('contacts','OC_Contacts_App::getContactVCard. Deprecated check for missing N field', OC_Log::DEBUG);
+			}
+			OC_Log::write('contacts','getContactVCard, Missing N field', OC_Log::DEBUG);
+			if($vcard->__isset('FN')) {
+				OC_Log::write('contacts','getContactVCard, found FN field: '.$vcard->__get('FN'), OC_Log::DEBUG);
+				$n = implode(';', array_reverse(array_slice(explode(' ', $vcard->__get('FN')), 0, 2))).';;;';
+				OC_Contacts_VCard::edit( $id, $vcard->serialize());
+			} else { // Else just add an empty 'N' field :-P
+				$vcard->setString('N', 'Unknown;Name;;;');
+			}
+			$vcard->setString('N', $n);
+		}
 		return $vcard;
 	}
 
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index bb5b2da23d5..f9ca427354e 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -134,7 +134,7 @@ class OC_Contacts_VCard{
 			// Add product ID.
 			$prodid = trim($card->getAsString('PRODID'));
 			if(!$prodid) {
-				$appinfo = $info=OC_App::getAppInfo('contacts');
+				$appinfo = OC_App::getAppInfo('contacts');
 				$prodid = '//ownCloud//NONSGML '.$appinfo['name'].' '.$appinfo['version'].'//EN';
 				$card->setString('PRODID', $prodid);
 			}
@@ -176,7 +176,7 @@ class OC_Contacts_VCard{
 	 * @return insertid
 	 */
 	public static function addFromDAVData($id,$uri,$data){
-		$fn = null;
+		$fn = $n = null;
 		$email = null;
 		$card = OC_VObject::parse($data);
 		if(!is_null($card)){
@@ -184,19 +184,31 @@ class OC_Contacts_VCard{
 				if($property->name == 'FN'){
 					$fn = $property->value;
 				}
+				if($property->name == 'N'){
+					$n = $property->value;
+				}
 				if($property->name == 'EMAIL' && is_null($email)){
 					$email = $property->value;
 				}
 			}
 		}
 		if(!$fn) {
-			if($email) {
+			if($n){
+				$fn = join(' ', array_reverse(array_slice(explode(';', $n), 0, 2)));
+			} elseif($email) {
 				$fn = $email;
 			} else {
 				$fn = 'Unknown Name';
 			}
 			$card->addProperty('FN', $fn);
 			$data = $card->serialize();
+			OC_Log::write('contacts','OC_Contacts_VCard::add. Added missing \'FN\' field: '.$n,OC_Log::DEBUG);
+		}
+		if(!$n){ // Fix missing 'N' field.
+			$n = implode(';', array_reverse(array_slice(explode(' ', $fn), 0, 2))).';;;';
+			$card->setString('N', $n);
+			$data = $card->serialize();
+			OC_Log::write('contacts','OC_Contacts_VCard::add. Added missing \'N\' field: '.$n,OC_Log::DEBUG);
 		}
 
 		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*contacts_cards (addressbookid,fullname,carddata,uri,lastmodified) VALUES(?,?,?,?,?)' );
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 446a9b88ede..a56999dbf39 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -4,8 +4,9 @@ $id = isset($_['id']) ? $_['id'] : '';
 ?>
 <div id="card">
 	<div id="actionbar">
-	<a id="contacts_propertymenu_button"></a>
-	<ul id="contacts_propertymenu">
+	<a title="<?php echo $l->t('Add field'); ?>" class="svg action" id="contacts_propertymenu_button"></a>
+	<div id="contacts_propertymenu" style="display: none;">
+	<ul>
 		<li><a data-type="PHOTO"><?php echo $l->t('Profile picture'); ?></a></li>
 		<li><a data-type="ORG"><?php echo $l->t('Organization'); ?></a></li>
 		<li><a data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a></li>
@@ -14,6 +15,7 @@ $id = isset($_['id']) ? $_['id'] : '';
 		<li><a data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
 		<li><a data-type="ADR"><?php echo $l->t('Address'); ?></a></li>
 	</ul>
+	</div>
 	<img  onclick="Contacts.UI.Card.export();" class="svg action" id="contacts_downloadcard" src="<?php echo image_path('', 'actions/download.svg'); ?>" title="<?php echo $l->t('Download contact');?>" />
 	<img class="svg action" id="contacts_deletecard" src="<?php echo image_path('', 'actions/delete.svg'); ?>" title="<?php echo $l->t('Delete contact');?>" />
 	</div>
-- 
GitLab


From c4864b4a54fb355f50da51d699a69b990610b146 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 9 Feb 2012 19:51:24 +0100
Subject: [PATCH 440/546] don't use PDO::inTransaction

---
 lib/db.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/db.php b/lib/db.php
index 82d9b67dca8..9d3c20e0145 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -35,6 +35,7 @@ class OC_DB {
 	static private $schema=false;
 	static private $affected=0;
 	static private $result=false;
+	static private $inTransaction=false;
 
 	/**
 	 * @brief connects to the database
@@ -490,17 +491,19 @@ class OC_DB {
 			return false;
 		}
 		self::$connection->beginTransaction();
+		self::$inTransaction=true;
 	}
 
 	/**
 	 * Commit the database changes done during a transaction that is in progress
 	 */
-	public static function commit($savePoint=''){
+	public static function commit(){
 		self::connect();
-		if(!self::$connection->inTransaction()){
+		if(!self::$inTransaction){
 			return false;
 		}
 		self::$connection->commit();
+		self::$inTransaction=false;
 	}
 }
 
-- 
GitLab


From b4d84bd9bba3bbe52478339909bf06366ac9850f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 9 Feb 2012 19:52:53 +0100
Subject: [PATCH 441/546] dont try to remove buffers, can cause trouble with
 strict warnings

---
 lib/eventsource.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/eventsource.php b/lib/eventsource.php
index b0450ff3d55..523f72403c3 100644
--- a/lib/eventsource.php
+++ b/lib/eventsource.php
@@ -32,7 +32,6 @@ class OC_EventSource{
 	private $fallBackId=0;
 	
 	public function __construct(){
-		ob_end_clean();
 		header('Cache-Control: no-cache');
 		$this->fallback=isset($_GET['fallback']) and $_GET['fallback']=='true';
 		if($this->fallback){
-- 
GitLab


From 8684e847b02002d17ff2d360eea977061d1ef6d1 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 9 Feb 2012 22:44:26 +0100
Subject: [PATCH 442/546] OC_Image: change static vars to object vars

---
 lib/image.php | 215 +++++++++++++++++++++++---------------------------
 1 file changed, 100 insertions(+), 115 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index 255d289ea21..97d30f56517 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -44,34 +44,24 @@ function ellipsis($str, $maxlen) {
  *
  */
 class OC_Image {
-	static private $resource = false; // tmp resource.
-	static private $destroy = false; // if the resource is created withing the object.
-	static private $imagetype = IMAGETYPE_PNG; // Default to png if file type isn't evident.
-	static private $filepath = null;
+	protected $resource = false; // tmp resource.
+	protected $imagetype = IMAGETYPE_PNG; // Default to png if file type isn't evident.
+	protected $filepath = null;
+
 	/**
 	* @brief Constructor.
 	* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
-	*					If a resource is passed it is the job of the caller to destroy it using imagedestroy($var)
 	* @returns bool False on error
 	*/
-	function __construct($imageref = null) {
-		//OC_Log::write('core','OC_Image::__construct, start', OC_Log::DEBUG);
+	public function __construct($imageref = null) {
+		//OC_Log::write('core',__METHOD__.'(): start', OC_Log::DEBUG);
 		if(!extension_loaded('gd') || !function_exists('gd_info')) {
 		//if(!function_exists('imagecreatefromjpeg')) {
-			OC_Log::write('core','OC_Image::__construct, GD module not installed', OC_Log::ERROR);
+			OC_Log::write('core',__METHOD__.'(): GD module not installed', OC_Log::ERROR);
 			return false;
 		}
 		if(!is_null($imageref)) {
-			self::load($imageref);
-		}
-	}
-
-	/**
-	* @brief Destructor.
-	*/
-	function __destruct() {
-		if(is_resource(self::$resource) && self::$destroy) {
-			imagedestroy(self::$resource); // Why does this issue a warning.
+			$this->load($imageref);
 		}
 	}
 
@@ -80,8 +70,7 @@ class OC_Image {
 	* @returns bool
 	*/
 	public function valid() { // apparently you can't name a method 'empty'...
-		$ret = is_resource(self::$resource);
-		return $ret;
+		return is_resource($this->resource);
 	}
 
 	/**
@@ -89,7 +78,7 @@ class OC_Image {
 	* @returns int
 	*/
 	public function mimeType() {
-		return is_resource(self::$resource) ? image_type_to_mime_type(self::$imagetype) : '';
+		return is_resource($this->resource) ? image_type_to_mime_type($this->imagetype) : '';
 	}
 
 	/**
@@ -97,7 +86,7 @@ class OC_Image {
 	* @returns int
 	*/
 	public function width() {
-		return is_resource(self::$resource) ? imagesx(self::$resource) : -1;
+		return is_resource($this->resource) ? imagesx($this->resource) : -1;
 	}
 
 	/**
@@ -105,7 +94,7 @@ class OC_Image {
 	* @returns int
 	*/
 	public function height() {
-		return is_resource(self::$resource) ? imagesy(self::$resource) : -1;
+		return is_resource($this->resource) ? imagesy($this->resource) : -1;
 	}
 
 	/**
@@ -122,8 +111,8 @@ class OC_Image {
 	*/
 
 	public function save($filepath=null) {
-		if($filepath === null && self::$filepath === null) {
-			OC_Log::write('core','OC_Image::save. save() called with no path.', OC_Log::ERROR);
+		if($filepath === null && $this->filepath === null) {
+			OC_Log::write('core',__METHOD__.'(): called with no path.', OC_Log::ERROR);
 			return false;
 		} elseif($filepath === null && $this->filepath !== null) {
 			$filepath = $this->filepath;
@@ -136,14 +125,14 @@ class OC_Image {
 	*/
 	private function _output($filepath=null, $really=false) {
 		if($really === false) {
-			header('Content-Type: '.self::mimeType());
+			header('Content-Type: '.$this->mimeType());
 			$filepath = null; // Just being cautious ;-)
 		} else {
 			if(!is_writable(dirname($filepath))) {
-				OC_Log::write('core','OC_Image::_output. Directory \''.dirname($filepath).'\' is not writable.', OC_Log::ERROR);
+				OC_Log::write('core',__METHOD__.'(): Directory \''.dirname($filepath).'\' is not writable.', OC_Log::ERROR);
 				return false;
 			} elseif(is_writable(dirname($filepath)) && file_exists($filepath) && !is_writable($filepath)) {
-				OC_Log::write('core','OC_Image::_output. File \''.$filepath.'\' is not writable.', OC_Log::ERROR);
+				OC_Log::write('core',__METHOD__.'(): File \''.$filepath.'\' is not writable.', OC_Log::ERROR);
 				return false;
 			}
 		}
@@ -152,25 +141,25 @@ class OC_Image {
 		}
 
 		$retval = false;
-		switch(self::$imagetype) {
+		switch($this->imagetype) {
 			case IMAGETYPE_GIF:
-				$retval = imagegif(self::$resource, $filepath);
+				$retval = imagegif($this->resource, $filepath);
 				break;
 			case IMAGETYPE_JPEG:
-				$retval = imagejpeg(self::$resource, $filepath);
+				$retval = imagejpeg($this->resource, $filepath);
 				break;
 			case IMAGETYPE_PNG:
-				$retval = imagepng(self::$resource, $filepath);
+				$retval = imagepng($this->resource, $filepath);
 				break;
 			case IMAGETYPE_XBM:
-				$retval = imagexbm(self::$resource, $filepath);
+				$retval = imagexbm($this->resource, $filepath);
 				break;
 			case IMAGETYPE_WBMP:
 			case IMAGETYPE_BMP:
-				$retval = imagewbmp(self::$resource, $filepath);
+				$retval = imagewbmp($this->resource, $filepath);
 				break;
 			default:
-				$retval = imagepng(self::$resource, $filepath);
+				$retval = imagepng($this->resource, $filepath);
 		}
 		return $retval;
 	}
@@ -179,14 +168,14 @@ class OC_Image {
 	* @brief Prints the image when called as $image().
 	*/
 	public function __invoke() {
-		return self::show();
+		return $this->show();
 	}
 
 	/**
 	* @returns Returns the image resource in any.
 	*/
 	public function resource() {
-		return self::$resource;
+		return $this->resource;
 	}
 
 	/**
@@ -194,9 +183,9 @@ class OC_Image {
 	*/
 	function __toString() {
 		ob_start();
-		$res = imagepng(self::$resource);
+		$res = imagepng($this->resource);
 		if (!$res) {
-			OC_Log::write('core','OC_Image::_string. Error writing image',OC_Log::ERROR);
+			OC_Log::write('core','OC_Image->__toString. Error writing image',OC_Log::ERROR);
 		}
 		return base64_encode(ob_get_clean());
 	}
@@ -208,18 +197,18 @@ class OC_Image {
 	*/
 	public function fixOrientation() {
 		if(!is_callable('exif_read_data')){
-			OC_Log::write('core','OC_Image::fixOrientation() Exif module not enabled.', OC_Log::DEBUG);
+			OC_Log::write('core','OC_Image->fixOrientation() Exif module not enabled.', OC_Log::DEBUG);
 			return false;
 		}
-		if(!is_resource(self::$resource)) {
-			OC_Log::write('core','OC_Image::fixOrientation() No image loaded.', OC_Log::DEBUG);
+		if(!is_resource($this->resource)) {
+			OC_Log::write('core','OC_Image->fixOrientation() No image loaded.', OC_Log::DEBUG);
 			return false;
 		}
-		if(is_null(self::$filepath) || !is_readable(self::$filepath)) {
-			OC_Log::write('core','OC_Image::fixOrientation() No readable file path set.', OC_Log::DEBUG);
+		if(is_null($this->filepath) || !is_readable($this->filepath)) {
+			OC_Log::write('core','OC_Image->fixOrientation() No readable file path set.', OC_Log::DEBUG);
 			return false;
 		}
-		$exif = exif_read_data(self::$filepath, 'IFD0');
+		$exif = exif_read_data($this->filepath, 'IFD0');
 		if(!$exif) {
 			return false;
 		}
@@ -227,7 +216,7 @@ class OC_Image {
 			return true; // Nothing to fix
 		}
 		$o = $exif['Orientation'];
-		OC_Log::write('core','OC_Image::fixOrientation() Orientation: '.$o, OC_Log::DEBUG);
+		OC_Log::write('core','OC_Image->fixOrientation() Orientation: '.$o, OC_Log::DEBUG);
 		$rotate = 0;
 		$flip = false;
 		switch($o) {
@@ -266,22 +255,22 @@ class OC_Image {
 				break;
 		}
 		if($rotate) {
-			$res = imagerotate(self::$resource, $rotate, -1);
+			$res = imagerotate($this->resource, $rotate, -1);
 			if($res) {
 				if(imagealphablending($res, true)) {
 					if(imagesavealpha($res, true)) {
-						self::$resource = $res;
+						$this->resource = $res;
 						return true;
 					} else {
-						OC_Log::write('core','OC_Image::fixOrientation() Error during alphasaving.', OC_Log::DEBUG);
+						OC_Log::write('core','OC_Image->fixOrientation() Error during alphasaving.', OC_Log::DEBUG);
 						return false;
 					}
 				} else {
-					OC_Log::write('core','OC_Image::fixOrientation() Error during alphablending.', OC_Log::DEBUG);
+					OC_Log::write('core','OC_Image->fixOrientation() Error during alphablending.', OC_Log::DEBUG);
 					return false;
 				}
 			} else {
-				OC_Log::write('core','OC_Image::fixOrientation() Error during oriention fixing.', OC_Log::DEBUG);
+				OC_Log::write('core','OC_Image->fixOrientation() Error during oriention fixing.', OC_Log::DEBUG);
 				return false;
 			}
 		}
@@ -290,20 +279,19 @@ class OC_Image {
 	/**
 	* @brief Loads an image from a local file, a base64 encoded string or a resource created by an imagecreate* function.
 	* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
-	*					If a resource is passed it is the job of the caller to destroy it using imagedestroy($var)
 	* @returns An image resource or false on error
 	*/
 	public function load($imageref) {
-		if(self::loadFromFile($imageref) !== false) {
-			return self::$resource;
-		} elseif(self::loadFromBase64($imageref) !== false) {
-			return self::$resource;
-		} elseif(self::loadFromData($imageref) !== false) {
-			return self::$resource;
-		} elseif(self::loadFromResource($imageref) !== false) {
-			return self::$resource;
+		if($this->loadFromFile($imageref) !== false) {
+			return $this->resource;
+		} elseif($this->loadFromBase64($imageref) !== false) {
+			return $this->resource;
+		} elseif($this->loadFromData($imageref) !== false) {
+			return $this->resource;
+		} elseif($this->loadFromResource($imageref) !== false) {
+			return $this->resource;
 		} else {
-			OC_Log::write('core','OC_Image::load, couldn\'t load anything. Giving up!', OC_Log::DEBUG);
+			OC_Log::write('core',__METHOD__.'(): couldn\'t load anything. Giving up!', OC_Log::DEBUG);
 			return false;
 		}
 	}
@@ -316,45 +304,45 @@ class OC_Image {
 	public function loadFromFile($imagepath=false) {
 		if(!is_file($imagepath) || !file_exists($imagepath) || !is_readable($imagepath)) {
 			// Debug output disabled because this method is tried before loadFromBase64?
-			OC_Log::write('core','OC_Image::loadFromFile, couldn\'t load: '.ellipsis($imagepath, 50), OC_Log::DEBUG);
+			OC_Log::write('core','OC_Image->loadFromFile, couldn\'t load: '.ellipsis($imagepath, 50), OC_Log::DEBUG);
 			return false;
 		}
 		$itype = exif_imagetype($imagepath);
 		switch($itype) {
 			case IMAGETYPE_GIF:
 				if (imagetypes() & IMG_GIF) {
-					self::$resource = imagecreatefromgif($imagepath);
+					$this->resource = imagecreatefromgif($imagepath);
 				} else {
-					OC_Log::write('core','OC_Image::loadFromFile, GIF images not supported: '.$imagepath, OC_Log::DEBUG);
+					OC_Log::write('core','OC_Image->loadFromFile, GIF images not supported: '.$imagepath, OC_Log::DEBUG);
 				}
 				break;
 			case IMAGETYPE_JPEG:
 				if (imagetypes() & IMG_JPG) {
-					self::$resource = imagecreatefromjpeg($imagepath);
+					$this->resource = imagecreatefromjpeg($imagepath);
 				} else {
-					OC_Log::write('core','OC_Image::loadFromFile, JPG images not supported: '.$imagepath, OC_Log::DEBUG);
+					OC_Log::write('core','OC_Image->loadFromFile, JPG images not supported: '.$imagepath, OC_Log::DEBUG);
 				}
 				break;
 			case IMAGETYPE_PNG:
 				if (imagetypes() & IMG_PNG) {
-					self::$resource = imagecreatefrompng($imagepath);
+					$this->resource = imagecreatefrompng($imagepath);
 				} else {
-					OC_Log::write('core','OC_Image::loadFromFile, PNG images not supported: '.$imagepath, OC_Log::DEBUG);
+					OC_Log::write('core','OC_Image->loadFromFile, PNG images not supported: '.$imagepath, OC_Log::DEBUG);
 				}
 				break;
 			case IMAGETYPE_XBM:
 				if (imagetypes() & IMG_XPM) {
-					self::$resource = imagecreatefromxbm($imagepath);
+					$this->resource = imagecreatefromxbm($imagepath);
 				} else {
-					OC_Log::write('core','OC_Image::loadFromFile, XBM/XPM images not supported: '.$imagepath, OC_Log::DEBUG);
+					OC_Log::write('core','OC_Image->loadFromFile, XBM/XPM images not supported: '.$imagepath, OC_Log::DEBUG);
 				}
 				break;
 			case IMAGETYPE_WBMP:
 			case IMAGETYPE_BMP:
 				if (imagetypes() & IMG_WBMP) {
-					self::$resource = imagecreatefromwbmp($imagepath);
+					$this->resource = imagecreatefromwbmp($imagepath);
 				} else {
-					OC_Log::write('core','OC_Image::loadFromFile, (W)BMP images not supported: '.$imagepath, OC_Log::DEBUG);
+					OC_Log::write('core','OC_Image->loadFromFile, (W)BMP images not supported: '.$imagepath, OC_Log::DEBUG);
 				}
 				break;
 			/*
@@ -382,17 +370,16 @@ class OC_Image {
 				break;
 			*/
 			default:
-				self::$resource = imagecreatefromstring(file_get_contents($imagepath));
+				$this->resource = imagecreatefromstring(file_get_contents($imagepath));
 				$itype = IMAGETYPE_PNG;
-				OC_Log::write('core','OC_Image::loadFromFile, Default', OC_Log::DEBUG);
+				OC_Log::write('core','OC_Image->loadFromFile, Default', OC_Log::DEBUG);
 				break;
 		}
 		if($this->valid()) {
-			self::$imagetype = $itype;
-			self::$filepath = $imagepath;
-			self::$destroy = true;
+			$this->imagetype = $itype;
+			$this->filepath = $imagepath;
 		}
-		return self::$resource;
+		return $this->resource;
 	}
 
 	/**
@@ -404,13 +391,12 @@ class OC_Image {
 		if(is_resource($str)) {
 			return false;
 		}
-		self::$resource = imagecreatefromstring($str);
-		if(!self::$resource) {
-			OC_Log::write('core','OC_Image::loadFromData, couldn\'t load', OC_Log::DEBUG);
+		$this->resource = imagecreatefromstring($str);
+		if(!$this->resource) {
+			OC_Log::write('core','OC_Image->loadFromData, couldn\'t load', OC_Log::DEBUG);
 			return false;
 		}
-		self::$destroy = true;
-		return self::$resource;
+		return $this->resource;
 	}
 
 	/**
@@ -424,20 +410,19 @@ class OC_Image {
 		}
 		$data = base64_decode($str);
 		if($data) { // try to load from string data
-			self::$resource = imagecreatefromstring($data);
-			if(!self::$resource) {
-				OC_Log::write('core','OC_Image::loadFromBase64, couldn\'t load', OC_Log::DEBUG);
+			$this->resource = imagecreatefromstring($data);
+			if(!$this->resource) {
+				OC_Log::write('core','OC_Image->loadFromBase64, couldn\'t load', OC_Log::DEBUG);
 				return false;
 			}
-			self::$destroy = true;
-			return self::$resource;
+			return $this->resource;
 		} else {
 			return false;
 		}
 	}
 
 	/**
-	* @brief Checks if image resource is valid and assigns it to self::$resource.
+	* @brief Checks if image resource is valid and assigns it to $this->resource.
 	* @param $res An image resource.
 	* @returns An image resource or false on error
 	*/
@@ -445,7 +430,7 @@ class OC_Image {
 		if(!is_resource($res)) {
 			return false;
 		}
-		self::$resource = $res;
+		$this->resource = $res;
 	}
 
 	/**
@@ -454,12 +439,12 @@ class OC_Image {
 	* @returns bool
 	*/
 	public function resize($maxsize) {
-		if(!self::$resource) {
-			OC_Log::write('core','OC_Image::resize, No image loaded', OC_Log::ERROR);
+		if(!$this->resource) {
+			OC_Log::write('core',__METHOD__.'(): No image loaded', OC_Log::ERROR);
 			return false;
 		}
-		$width_orig=imageSX(self::$resource);
-		$height_orig=imageSY(self::$resource);
+		$width_orig=imageSX($this->resource);
+		$height_orig=imageSY($this->resource);
 		$ratio_orig = $width_orig/$height_orig;
 		
 		if ($ratio_orig > 1) {
@@ -472,18 +457,18 @@ class OC_Image {
 
 		$process = imagecreatetruecolor(round($new_width), round($new_height));
 		if ($process == false) {
-			OC_Log::write('core','OC_Image::resize. Error creating true color image',OC_Log::ERROR);
+			OC_Log::write('core',__METHOD__.'(): Error creating true color image',OC_Log::ERROR);
 			imagedestroy($process);
 			return false;
 		}
 
-		imagecopyresampled($process, self::$resource, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
+		imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
 		if ($process == false) {
-			OC_Log::write('core','OC_Image::resize. Error resampling process image '.$new_width.'x'.$new_height,OC_Log::ERROR);
+			OC_Log::write('core',__METHOD__.'(): Error resampling process image '.$new_width.'x'.$new_height,OC_Log::ERROR);
 			imagedestroy($process);
 			return false;
 		}
-		self::$resource = $process;
+		$this->resource = $process;
 		return true;
 	}
 
@@ -492,12 +477,12 @@ class OC_Image {
 	* @returns bool for success or failure
 	*/
 	public function centerCrop() {
-		if(!self::$resource) {
-			OC_Log::write('core','OC_Image::centerCrop, No image loaded', OC_Log::ERROR);
+		if(!$this->resource) {
+			OC_Log::write('core','OC_Image->centerCrop, No image loaded', OC_Log::ERROR);
 			return false;
 		}
-		$width_orig=imageSX(self::$resource);
-		$height_orig=imageSY(self::$resource);
+		$width_orig=imageSX($this->resource);
+		$height_orig=imageSY($this->resource);
 		if($width_orig === $height_orig) {
 			return true;
 		}
@@ -513,17 +498,17 @@ class OC_Image {
 		}
 		$process = imagecreatetruecolor($width, $height);
 		if ($process == false) {
-			OC_Log::write('core','OC_Image::centerCrop. Error creating true color image',OC_Log::ERROR);
+			OC_Log::write('core','OC_Image->centerCrop. Error creating true color image',OC_Log::ERROR);
 			imagedestroy($process);
 			return false;
 		}
-		imagecopyresampled($process, self::$resource, 0, 0, $x, $y, $width, $height, $width, $height);
+		imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $width, $height, $width, $height);
 		if ($process == false) {
-			OC_Log::write('core','OC_Image::centerCrop. Error resampling process image '.$width.'x'.$height,OC_Log::ERROR);
+			OC_Log::write('core','OC_Image->centerCrop. Error resampling process image '.$width.'x'.$height,OC_Log::ERROR);
 			imagedestroy($process);
 			return false;
 		}
-		self::$resource = $process;
+		$this->resource = $process;
 		return true;
 	}
 
@@ -536,26 +521,26 @@ class OC_Image {
 	* @returns bool for success or failure
 	*/
 	public function crop($x, $y, $w, $h) {
-		if(!self::$resource) {
-			OC_Log::write('core','OC_Image::crop, No image loaded', OC_Log::ERROR);
+		if(!$this->resource) {
+			OC_Log::write('core',__METHOD__.'(): No image loaded', OC_Log::ERROR);
 			return false;
 		}
-		$width_orig=imageSX(self::$resource);
-		$height_orig=imageSY(self::$resource);
-		//OC_Log::write('core','OC_Image::crop. Original size: '.$width_orig.'x'.$height_orig, OC_Log::DEBUG);
+		$width_orig=imageSX($this->resource);
+		$height_orig=imageSY($this->resource);
+		//OC_Log::write('core',__METHOD__.'(): Original size: '.$width_orig.'x'.$height_orig, OC_Log::DEBUG);
 		$process = imagecreatetruecolor($w, $h);
 		if ($process == false) {
-			OC_Log::write('core','OC_Image::crop. Error creating true color image',OC_Log::ERROR);
+			OC_Log::write('core',__METHOD__.'(): Error creating true color image',OC_Log::ERROR);
 			imagedestroy($process);
 			return false;
 		}
-		imagecopyresampled($process, self::$resource, 0, 0, $x, $y, $w, $h, $w, $h);
+		imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $w, $h, $w, $h);
 		if ($process == false) {
-			OC_Log::write('core','OC_Image::crop. Error resampling process image '.$w.'x'.$h,OC_Log::ERROR);
+			OC_Log::write('core',__METHOD__.'(): Error resampling process image '.$w.'x'.$h,OC_Log::ERROR);
 			imagedestroy($process);
 			return false;
 		}
-		self::$resource = $process;
+		$this->resource = $process;
 		return true;
 	}
 }
-- 
GitLab


From 9379c3e1284d2d9250af4e5d406a7f6803309fad Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 9 Feb 2012 22:47:05 +0100
Subject: [PATCH 443/546] Gallery: remove unset call, not needed anymore

---
 apps/gallery/lib/scanner.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index 9fdadbe38c7..64efb006ad1 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -93,7 +93,6 @@ class OC_Gallery_Scanner {
       if ($image && $image->valid()) {
 	      imagecopyresampled($thumbnail, $image->resource(), $i*200, 0, 0, 0, 200, 200, 200, 200);
       }
-      unset($image); // unset $image here to control the lifetime of image::$resource
     }
     imagepng($thumbnail, OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/gallery/' . $albumName.'.png');
   }
-- 
GitLab


From 85853f9ec29be9a2ba92737de204da1469f72dd8 Mon Sep 17 00:00:00 2001
From: Klaas Freitag <freitag@owncloud.com>
Date: Fri, 10 Feb 2012 11:30:38 +0100
Subject: [PATCH 444/546] - Added the ability to change a files mtime via
 webdavs propset. - Added some minor debug help to fscache

---
 lib/connector/sabre/node.php | 30 +++++++++++++++++++++++-------
 lib/filecache.php            | 11 +++++++----
 lib/filestorage/local.php    |  7 +++++++
 lib/filesystem.php           |  3 +++
 lib/filesystemview.php       |  3 +++
 5 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index ace572a1ee3..b8b675c1203 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -92,6 +92,19 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 
 	}
 
+	/** 
+	 *  sets the last modification time of the file (mtime) to the value given 
+	 *  in the second parameter or to now if the second param is empty.
+	 *  Even if the modification time is set to a custom value the access time is set to now.
+	 */
+	public function setLastModifiedTime($mtime) {
+		OC_Filesystem::setFileMtime($this->path, $mtime);
+	}
+
+	public function endsWith( $str, $sub ) {
+		return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
+	}
+
 	/**
 	 * Updates properties on this node,
 	 *
@@ -110,13 +123,16 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 				}
 			}
 			else {
-				if(!array_key_exists( $propertyName, $existing )){
-					$query = OC_DB::prepare( 'INSERT INTO *PREFIX*properties (userid,propertypath,propertyname,propertyvalue) VALUES(?,?,?,?)' );
-					$query->execute( array( OC_User::getUser(), $this->path, $propertyName,$propertyValue ));
-				}
-				else{
-					$query = OC_DB::prepare( 'UPDATE *PREFIX*properties SET propertyvalue = ? WHERE userid = ? AND propertypath = ? AND propertyname = ?' );
-					$query->execute( array( $propertyValue,OC_User::getUser(), $this->path, $propertyName ));
+				if(  $this->endsWith( $propertyName, "modificationTime")) {
+					$this->setLastModifiedTime($propertyValue);
+				} else {
+					if(!array_key_exists( $propertyName, $existing )){
+						$query = OC_DB::prepare( 'INSERT INTO *PREFIX*properties (userid,propertypath,propertyname,propertyvalue) VALUES(?,?,?,?)' );
+						$query->execute( array( OC_User::getUser(), $this->path, $propertyName,$propertyValue ));
+					} else {
+						$query = OC_DB::prepare( 'UPDATE *PREFIX*properties SET propertyvalue = ? WHERE userid = ? AND propertypath = ? AND propertyname = ?' );
+						$query->execute( array( $propertyValue,OC_User::getUser(), $this->path, $propertyName ));
+					}
 				}
 			}
 
diff --git a/lib/filecache.php b/lib/filecache.php
index cb516223f63..921d4a27902 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -62,7 +62,7 @@ class OC_FileCache{
 		if(is_array($result)){
 			return $result;
 		}else{
-			OC_Log::write('file not found in cache ('.$path.')','core',OC_Log::DEBUG);
+			OC_Log::write('get(): file not found in cache ('.$path.')','core',OC_Log::DEBUG);
 			return false;
 		}
 	}
@@ -125,7 +125,9 @@ class OC_FileCache{
 			$queryParts[]='mimepart=?';
 		}
 		$arguments[]=$id;
-		$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET '.implode(' , ',$queryParts).' WHERE id=?');
+		
+		$sql = 'UPDATE *PREFIX*fscache SET '.implode(' , ',$queryParts).' WHERE id=?';
+		$query=OC_DB::prepare($sql);
 		$query->execute($arguments);
 	}
 
@@ -231,7 +233,7 @@ class OC_FileCache{
 		if(is_array($result)){
 			return $result;
 		}else{
-			OC_Log::write('file not found in cache ('.$path.')','core',OC_Log::DEBUG);
+			OC_Log::write('getFolderContent(): file not found in cache ('.$path.')','core',OC_Log::DEBUG);
 			return false;
 		}
 	}
@@ -264,7 +266,7 @@ class OC_FileCache{
 		if(is_array($result)){
 			return $result['id'];
 		}else{
-			OC_Log::write('file not found in cache ('.$path.')','core',OC_Log::DEBUG);
+			OC_Log::write('getFieldId(): file not found in cache ('.$path.')','core',OC_Log::DEBUG);
 			return -1;
 		}
 	}
@@ -293,6 +295,7 @@ class OC_FileCache{
 		}else{
 			$view=new OC_FilesystemView(($root=='/')?'':$root);
 		}
+		
 		$path=$params['path'];
 		$fullPath=$view->getRoot().$path;
 		$mimetype=$view->getMimeType($path);
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 2c1f650cb9f..292d2a84e7d 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -65,6 +65,13 @@ class OC_Filestorage_Local extends OC_Filestorage{
 	public function filemtime($path){
 		return filemtime($this->datadir.$path);
 	}
+	
+	public function setFileMtime($path, $mtime){
+                   // sets the modification time of the file to the given value. If mtime is nil the current time is set.
+                  // note that the access time of the file always changes to the current time.
+                  return touch($this->datadir.$path, $mtime);
+         }
+
 	public function file_get_contents($path){
 		return file_get_contents($this->datadir.$path);
 	}
diff --git a/lib/filesystem.php b/lib/filesystem.php
index a18072ecbc2..75997c244ff 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -345,6 +345,9 @@ class OC_Filesystem{
 	static public function filemtime($path){
 		return self::$defaultInstance->filemtime($path);
 	}
+	static public function setFileMtime($path, $mtime){
+		return self::$defaultInstance->setFileMtime($path, $mtime);
+	}
 	static public function file_get_contents($path){
 		return self::$defaultInstance->file_get_contents($path);
 	}
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 4586507a811..0f1c546f4c5 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -156,6 +156,9 @@ class OC_FilesystemView {
 	public function filemtime($path){
 		return $this->basicOperation('filemtime',$path);
 	}
+	public function setFileMtime($path, $mtime){
+		return $this->basicOperation('setFileMtime',$path, array('write'), $mtime);
+	}
 	public function file_get_contents($path){
 		return $this->basicOperation('file_get_contents',$path,array('read'));
 	}
-- 
GitLab


From c95e8a1fc556fc34caf5f3b5ead9f0e29c8ce4c7 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 10 Feb 2012 16:40:40 +0100
Subject: [PATCH 445/546] Added custom combobox widget.

---
 apps/contacts/contacts.php               |   2 +
 apps/contacts/css/jquery.combobox.css    |   3 +
 apps/contacts/js/contacts.js             |  42 +++++--
 apps/contacts/js/jquery.combobox.js      | 148 +++++++++++++++++++++++
 apps/contacts/templates/part.contact.php |   2 +-
 core/img/actions/triangle-s.png          | Bin 0 -> 526 bytes
 core/img/actions/triangle-s.svg          |  92 ++++++++++++++
 7 files changed, 278 insertions(+), 11 deletions(-)
 create mode 100644 apps/contacts/css/jquery.combobox.css
 create mode 100644 apps/contacts/js/jquery.combobox.js
 create mode 100644 core/img/actions/triangle-s.png
 create mode 100644 core/img/actions/triangle-s.svg

diff --git a/apps/contacts/contacts.php b/apps/contacts/contacts.php
index fded839fed8..938a6b13a04 100644
--- a/apps/contacts/contacts.php
+++ b/apps/contacts/contacts.php
@@ -38,11 +38,13 @@ $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
 OC_Util::addScript('','jquery.multiselect');
 //OC_Util::addScript('contacts','interface');
 OC_Util::addScript('contacts','contacts');
+OC_Util::addScript('contacts','jquery.combobox');
 OC_Util::addScript('contacts','jquery.inview');
 OC_Util::addScript('contacts','jquery.Jcrop');
 OC_Util::addScript('contacts','jquery.jec-1.3.3');
 OC_Util::addStyle('','jquery.multiselect');
 //OC_Util::addStyle('contacts','styles');
+OC_Util::addStyle('contacts','jquery.combobox');
 OC_Util::addStyle('contacts','jquery.Jcrop');
 OC_Util::addStyle('contacts','contacts');
 
diff --git a/apps/contacts/css/jquery.combobox.css b/apps/contacts/css/jquery.combobox.css
new file mode 100644
index 00000000000..59294235d29
--- /dev/null
+++ b/apps/contacts/css/jquery.combobox.css
@@ -0,0 +1,3 @@
+.combo-button { background:url('../../../core/img/actions/triangle-s.svg') no-repeat center; margin-left: -1px; float: left; border: none; }
+.ui-button-icon-only .ui-button-text { padding: 0.35em; } 
+.ui-autocomplete-input { margin: 0; padding: 0.48em 0 0.47em 0.45em; }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 7f4e938c48a..c0cea7917f1 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -167,8 +167,13 @@ Contacts={
 			$('.button,.action').tipsy();
 			$('#contacts_deletecard').tipsy({gravity: 'ne'});
 			$('#contacts_downloadcard').tipsy({gravity: 'ne'});
-			$('#fn').jec();
-			$('.jecEditableOption').attr('title', t('contacts','Custom'));
+			//$('#fn').jec();
+			$('#fn_select').combobox({
+				'id': 'fn',
+				'name': 'value',
+				'classes': ['contacts_property'],
+				'title': t('contacts', 'Format custom, Short name, Full name, Reverse or Reverse with comma')});
+			//$('.jecEditableOption').attr('title', t('contacts','Custom'));
 			$('#fn').tipsy();
 			$('#contacts_details_photo_wrapper').tipsy();
 			$('#bday').datepicker({
@@ -348,14 +353,21 @@ Contacts={
 					this.fullname += ', ' + this.honsuf;
 				}
 				$('#n').html(this.fullname);
-				$('.jecEditableOption').attr('title', 'Custom');
-				$('.jecEditableOption').text(this.fn);
+				//$('.jecEditableOption').attr('title', 'Custom');
+				//$('.jecEditableOption').text(this.fn);
 				//$('.jecEditableOption').attr('value', 0);
-				$('#fn').val(0);
-				$('#full').text(this.fullname);
+				$('#fn_select option').remove();
+				$('#fn_select').combobox('value', this.fn);
+				var names = [this.fullname, this.givname + ' ' + this.famname, this.famname + ' ' + this.givname, this.famname + ', ' + this.givname];
+				$.each(names, function(key, value) {
+					$('#fn_select')
+						.append($('<option></option>')
+						.text(value)); 
+				});
+				/*$('#full').text(this.fullname);
 				$('#short').text(this.givname + ' ' + this.famname);
 				$('#reverse').text(this.famname + ' ' + this.givname);
-				$('#reverse_comma').text(this.famname + ', ' + this.givname);
+				$('#reverse_comma').text(this.famname + ', ' + this.givname);*/
 				$('#contact_identity').find('*[data-element="N"]').data('checksum', this.data.N[0]['checksum']);
 				$('#contact_identity').find('*[data-element="FN"]').data('checksum', this.data.FN[0]['checksum']);
 			},
@@ -628,12 +640,22 @@ Contacts={
 				if(n[4].length > 0) {
 					this.fullname += ', ' + n[4];
 				}
-				$('#short').text(n[1] + ' ' + n[0]);
+
+				$('#fn_select option').remove();
+				//$('#fn_select').combobox('value', this.fn);
+				var names = [this.fullname, this.givname + ' ' + this.famname, this.famname + ' ' + this.givname, this.famname + ', ' + this.givname];
+				$.each(names, function(key, value) {
+					$('#fn_select')
+						.append($('<option></option>')
+						.text(value)); 
+				});
+				
+				/*$('#short').text(n[1] + ' ' + n[0]);
 				$('#full').text(this.fullname);
 				$('#reverse').text(n[0] + ' ' + n[1]);
-				$('#reverse_comma').text(n[0] + ', ' + n[1]);
+				$('#reverse_comma').text(n[0] + ', ' + n[1]);*/
 				//$('#n').html(full);
-				$('#fn').val(0);
+				//$('#fn').val(0);
 				if(this.id == '') {
 					var aid = $(dlg).find('#aid').val();
 					Contacts.UI.Card.add(n.join(';'), $('#short').text(), aid);
diff --git a/apps/contacts/js/jquery.combobox.js b/apps/contacts/js/jquery.combobox.js
new file mode 100644
index 00000000000..6da4ecb5147
--- /dev/null
+++ b/apps/contacts/js/jquery.combobox.js
@@ -0,0 +1,148 @@
+/**
+ * Inspired by http://jqueryui.com/demos/autocomplete/#combobox
+ */
+
+(function( $ ) {
+	$.widget('ui.combobox', {
+		_create: function() {
+			//console.log('_create: ' + this.options['id']);
+			var self = this,
+				select = this.element.hide(),
+				selected = select.children(':selected'),
+				value = selected.val() ? selected.text() : '';
+			var input = this.input = $('<input type="text">')
+				.insertAfter( select )
+				.val( value )
+				.autocomplete({
+					delay: 0,
+					minLength: 0,
+					source: function( request, response ) {
+						var matcher = new RegExp( $.ui.autocomplete.escapeRegex(request.term), "i" );
+						response( select.children( "option" ).map(function() {
+							var text = $( this ).text();
+							if ( this.value && ( !request.term || matcher.test(text) ) )
+								return {
+									label: text.replace(
+										new RegExp(
+											"(?![^&;]+;)(?!<[^<>]*)(" +
+											$.ui.autocomplete.escapeRegex(request.term) +
+											")(?![^<>]*>)(?![^&;]+;)", "gi"
+										), "<strong>$1</strong>" ),
+									value: text,
+									option: this
+								};
+						}) );
+					},
+					select: function( event, ui ) {
+						self.input.val($(ui.item.option).text());
+						self.input.trigger('change');
+						ui.item.option.selected = true;
+						self._trigger( "selected", event, {
+							item: ui.item.option
+						});
+					},
+					change: function( event, ui ) {
+						if ( !ui.item ) {
+							var matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( $(this).val() ) + "$", "i" ),
+								valid = false;
+							self.input.val($(this).val());
+							//self.input.trigger('change');
+							select.children( "option" ).each(function() {
+								if ( $( this ).text().match( matcher ) ) {
+									this.selected = valid = true;
+									return false;
+								}
+							});
+							/*if ( !valid ) {
+								// remove invalid value, as it didn't match anything
+								$( this ).val( "" );
+								select.val( "" );
+								input.data( "autocomplete" ).term = "";
+								return false;
+							}*/
+						}
+					}
+				})
+				.addClass( "ui-widget ui-widget-content ui-corner-left" );
+
+			input.data( "autocomplete" )._renderItem = function( ul, item ) {
+				return $( "<li></li>" )
+					.data( "item.autocomplete", item )
+					.append( "<a>" + item.label + "</a>" )
+					.appendTo( ul );
+			};
+
+			this.button = $( "<button type='button'>&nbsp;</button>" )
+				.attr( "tabIndex", -1 )
+				.attr( "title", "Show All Items" )
+				.insertAfter( input )
+				/*.button({
+					icons: {
+						primary: "ui-icon-triangle-1-s"
+					},
+					text: false
+				})
+				.removeClass( "ui-corner-all" )*/
+				.addClass('svg')
+				.addClass('action')
+				.addClass('combo-button')
+				.click(function() {
+					// close if already visible
+					if ( input.autocomplete( "widget" ).is( ":visible" ) ) {
+						input.autocomplete( "close" );
+						return;
+					}
+
+					// work around a bug (likely same cause as #5265)
+					$( this ).blur();
+
+					// pass empty string as value to search for, displaying all results
+					input.autocomplete( "search", "" );
+					input.focus();
+				});
+			$.each(this.options, function(key, value) {
+				self._setOption(key, value);
+			});
+		},
+		destroy: function() {
+			this.input.remove();
+			this.button.remove();
+			this.element.show();
+			$.Widget.prototype.destroy.call( this );
+		},
+		value: function(val) {
+			console.log('combobox.value: ' + val);
+			if(val != undefined) {
+				this.input.val(val);
+			} else {
+				return this.input.val();
+			}
+		},
+		_setOption: function( key, value ) {
+			switch( key ) {
+				case "id":
+					this.options['id'] = value;
+					this.input.attr('id', value);
+				break;
+				case "name":
+					this.options['name'] = value;
+					this.input.attr('name', value);
+				break;
+				case "classes":
+					var input = this.input;
+					$.each(this.options['classes'], function(key, value) {
+						input.addClass(value);
+					});
+				break;
+			}
+			// In jQuery UI 1.8, you have to manually invoke the _setOption method from the base widget
+			$.Widget.prototype._setOption.apply( this, arguments );
+			// In jQuery UI 1.9 and above, you use the _super method instead
+			//this._super( "_setOption", key, value );
+		},
+		options: { 
+			id: null,
+			name: null
+		},
+	});
+})( jQuery );
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index a56999dbf39..19e34fd3bb1 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -45,7 +45,7 @@ $id = isset($_['id']) ? $_['id'] : '';
 		<dd style="padding-top: 0.8em;vertical-align: text-bottom;"><span id="n" type="text"></span></dd -->
 		<dt><label for="fn"><?php echo $l->t('Display name'); ?></label></dt>
 		<dd class="propertycontainer" data-element="FN">
-		<select id="fn" name="value" required="required" class="contacts_property" title="<?php echo $l->t('Format custom, Short name, Full name, Reverse or Reverse with comma'); ?>" style="width:16em;">
+		<select id="fn_select" title="<?php echo $l->t('Format custom, Short name, Full name, Reverse or Reverse with comma'); ?>" style="width:16em;">
 			<option id="short" title="Short name"></option>
 			<option id="full" title="Full name"></option>
 			<option id="reverse" title="Reverse"></option>
diff --git a/core/img/actions/triangle-s.png b/core/img/actions/triangle-s.png
new file mode 100644
index 0000000000000000000000000000000000000000..d77d5db2caa3a3810e42d69b81a262d17b59d117
GIT binary patch
literal 526
zcmV+p0`dKcP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10gFjQK~y-6rIRshB2f^>e{We?%OF}=C<eg<3oR`63JV)ap^adr
zE+SgxI~?~N?mHv|H<brz(;TEql?y3^R7oHfHi7VV-+O6XNtQJ^$TR~p|M|@f%m`x)
z-!U7&b=_hR1V5ydXswY_qLe}@MGyoirI1n*%l|dT+}i-@boxn3c_f6`(^>;yj6o>{
zKopD2vaGdI>Ks69R@k4<=f8d5Ka4tuVfevot+&&7p7(Dyn;ip7YXe<&I-Nx(lX>}S
z=UguL;(6X5U<nWba2)5n+wI<c1sD#8caG!u+jZXM9^37<pU>ylyNU~i!n)V%`M_fm
z0ASJY_iuIq#^dn~uy`Mf1J<tVo|Vhx=Xi0YQh9E*T4%tA3F82Oi@{)UZCTd#!h{fJ
zI-Onv7jbbC;I&$<p4RL2hbYi!G#+ZT+9~k*KLCKs(P(sK+qO!jQfe}pTmhF!LVE`w
zEEbC=&1SQ%wWd@mod98yP<--CVzpZR0?1~wKY>KyX8?eMjlbR5<-70v1|0FY!Z1t=
QQvd(}07*qoM6N<$f@AI7jQ{`u

literal 0
HcmV?d00001

diff --git a/core/img/actions/triangle-s.svg b/core/img/actions/triangle-s.svg
new file mode 100644
index 00000000000..f899300bbca
--- /dev/null
+++ b/core/img/actions/triangle-s.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg6077"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="triangle-s.svg"
+   inkscape:export-filename="/home/tol/tanghus-owncloud/core/img/actions/triangle-s.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs6079">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+       id="linearGradient7308"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.54681372,-0.39376081,0,14.87048,-9.6346)"
+       x1="34.992828"
+       y1="0.94087797"
+       x2="34.992828"
+       y2="33.955856" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-5-4-0-1">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="1.0398514"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1600"
+     inkscape:window-height="845"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata6082">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       inkscape:connector-curvature="0"
+       d="M 14.5,3 1.5,3 8,15 14.5,3 z"
+       id="path2843-0-1-6-6"
+       style="opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 14.5,1.49996 -13,0 6.49999,12 6.50001,-12 z"
+       id="path2843-39-5-5"
+       style="opacity:0.7;color:#000000;fill:url(#linearGradient7308);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>
-- 
GitLab


From b4924ed1e59d587daf94fddd0dc739c662539779 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 10 Feb 2012 07:21:56 +0100
Subject: [PATCH 446/546] Variable wasn't reset.

---
 apps/contacts/js/contacts.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 7f4e938c48a..14503ad4426 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -619,6 +619,7 @@ Contacts={
 				this.addname = n[2];
 				this.honpre = n[3];
 				this.honsuf = n[4];
+				this.fullname = '';
 
 				$('#n').val(n.join(';'));
 				if(n[3].length > 0) {
-- 
GitLab


From d9db6e73d808a48859209e95ce73fe0d0d9bc563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20G=C3=B6ckeritz?= <admin@s-goecker.de>
Date: Fri, 10 Feb 2012 19:40:18 +0100
Subject: [PATCH 447/546] bugfix for oc-236

---
 .htaccess | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index 86a2de6b946..ebb28b0887b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -3,7 +3,9 @@ ErrorDocument 404 /core/templates/404.php
 php_value upload_max_filesize 512M
 php_value post_max_size 512M
 php_value memory_limit 512M
-SetEnv htaccessWorking true
+<IfModule env_module>
+  SetEnv htaccessWorking true
+</IfModule>
 </IfModule>
 <IfModule mod_rewrite.c>
 RewriteEngine on
-- 
GitLab


From b5418173e51c271c042cf2df6da40bf75fe98919 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 11 Feb 2012 21:09:51 +0100
Subject: [PATCH 448/546] Derive the user principles from the owncloud users

The code for updating the principles table is still there. To make it easier to
revert this commit if that is necessary.
---
 apps/calendar/caldav.php          |   2 +-
 apps/contacts/carddav.php         |   2 +-
 lib/connector/sabre/principal.php | 112 ++++++++++++------------------
 3 files changed, 45 insertions(+), 71 deletions(-)

diff --git a/apps/calendar/caldav.php b/apps/calendar/caldav.php
index b581274398d..db0b35da118 100644
--- a/apps/calendar/caldav.php
+++ b/apps/calendar/caldav.php
@@ -19,7 +19,7 @@ $caldavBackend    = new OC_Connector_Sabre_CalDAV();
 
 // Root nodes
 $nodes = array(
-	new Sabre_DAVACL_PrincipalCollection($principalBackend),
+	new Sabre_CalDAV_Principal_Collection($principalBackend),
 	new Sabre_CalDAV_CalendarRootNode($principalBackend, $caldavBackend),
 );
 
diff --git a/apps/contacts/carddav.php b/apps/contacts/carddav.php
index df7c858b1a0..a2bf492e206 100644
--- a/apps/contacts/carddav.php
+++ b/apps/contacts/carddav.php
@@ -33,7 +33,7 @@ $carddavBackend   = new OC_Connector_Sabre_CardDAV();
 
 // Root nodes
 $nodes = array(
-	new Sabre_DAVACL_PrincipalCollection($principalBackend),
+	new Sabre_CalDAV_Principal_Collection($principalBackend),
 	new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend),
 );
 
diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php
index 9c386f85e15..0f3d5feb794 100644
--- a/lib/connector/sabre/principal.php
+++ b/lib/connector/sabre/principal.php
@@ -44,6 +44,7 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 		}
 		return true;
 	}
+
 	/**
 	 * Returns a list of principals based on a prefix.
 	 *
@@ -57,22 +58,17 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 	 * @param string $prefixPath
 	 * @return array
 	 */
-	public function getPrincipalsByPrefix( $prefixPath ){
-		$query = OC_DB::prepare('SELECT * FROM *PREFIX*principals');
-		$result = $query->execute();
-
+	public function getPrincipalsByPrefix( $prefixPath ) {
 		$principals = array();
 
-		while($row = $result->fetchRow()){
-			// Checking if the principal is in the prefix
-			list($rowPrefix) = Sabre_DAV_URLUtil::splitPath($row['uri']);
-			if ($rowPrefix !== $prefixPath) continue;
-
-			$principals[] = array(
-				'uri' => $row['uri'],
-				'{DAV:}displayname' => $row['displayname']?$row['displayname']:basename($row['uri'])
-			);
-
+		if ($prefixPath == 'principals') {
+			foreach(OC_User::getUsers() as $user) {
+				$user_uri = 'principals/'.$user;
+				$principals[] = array(
+					'uri' => $user_uri,
+					'{DAV:}displayname' => $user,
+				);
+			}
 		}
 
 		return $principals;
@@ -87,20 +83,16 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 	 * @return array
 	 */
 	public function getPrincipalByPath($path) {
-		$query = OC_DB::prepare('SELECT * FROM *PREFIX*principals WHERE uri=?');
-		$result = $query->execute(array($path));
-
-		$users = array();
+		list($prefix,$name) = Sabre_DAV_URLUtil::splitPath($path);
 
-		$row = $result->fetchRow();
-		if (!$row) return;
-
-		return array(
-			'id'  => $row['id'],
-			'uri' => $row['uri'],
-			'{DAV:}displayname' => $row['displayname']?$row['displayname']:basename($row['uri'])
-		);
+		if ($prefix == 'principals' && OC_User::userExists($name)) {
+			return array(
+				'uri' => 'principals/'.$name,
+				'{DAV:}displayname' => $name,
+			);
+		}
 
+		return null;
 	}
 
 	/**
@@ -110,17 +102,15 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 	 * @return array
 	 */
 	public function getGroupMemberSet($principal) {
-		$principal = $this->getPrincipalByPath($principal);
+		// TODO: for now the group principal has only one member, the user itself
+		list($prefix,$name) = Sabre_DAV_URLUtil::splitPath($principal);
+
+		$principal = $this->getPrincipalByPath($prefix);
 		if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
 
-		$query = OC_DB::prepare('SELECT principals.uri as uri FROM *PREFIX*principalgroups AS groupmembers LEFT JOIN *PREFIX*principals AS principals ON groupmembers.member_id = principals.id WHERE groupmembers.principal_id = ?');
-		$result = $query->execute(array($principal['id']));
-	
-		$return = array();
-		while ($row = $result->fetchRow()){
-			$return[] = $row['uri'];
-		}
-		return $return;
+		return array(
+			$prefix
+		);
 	}
 
 	/**
@@ -130,17 +120,24 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 	 * @return array
 	 */
 	public function getGroupMembership($principal) {
-		$principal = $this->getPrincipalByPath($principal);
-		if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
-
-		$query = OC_DB::prepare('SELECT principals.uri as uri FROM *PREFIX*principalgroups AS groupmembers LEFT JOIN *PREFIX*principals AS principals ON groupmembers.member_id = principals.id WHERE groupmembers.member_id = ?');
-		$result = $query->execute(array($principal['id']));
-
-		$return = array();
-		while ($row = $result->fetchRow()){
-			$return[] = $row['uri'];
+		list($prefix,$name) = Sabre_DAV_URLUtil::splitPath($principal);
+
+		$group_membership = array();
+		if ($prefix == 'principals') {
+			$principal = $this->getPrincipalByPath($principal);
+			if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
+
+			// TODO: for now the user principal has only its own groups
+			return array(
+				'principals/'.$name.'/calendar-proxy-read',
+				'principals/'.$name.'/calendar-proxy-write',
+				// The addressbook groups are not supported in Sabre,
+				// see http://groups.google.com/group/sabredav-discuss/browse_thread/thread/ef2fa9759d55f8c#msg_5720afc11602e753
+				//'principals/'.$name.'/addressbook-proxy-read',
+				//'principals/'.$name.'/addressbook-proxy-write',
+			);
 		}
-		return $return;
+		return $group_membership;
 	}
 
 	/**
@@ -153,29 +150,6 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 	 * @return void
 	 */
 	public function setGroupMemberSet($principal, array $members) {
-		$query = OC_DB::prepare('SELECT id, uri FROM *PREFIX*principals WHERE uri IN (? '.str_repeat(', ?', count($members)).')');
-		$result = $query->execute(array_merge(array($principal), $members));
-
-		$memberIds = array();
-		$principalId = null;
-
-		while($row = $$result->fetchRow()) {
-			if ($row['uri'] == $principal) {
-				$principalId = $row['id'];
-			}
-			else{
-				$memberIds[] = $row['id'];
-			}
-		}
-		if (!$principalId) throw new Sabre_DAV_Exception('Principal not found');
-
-		// Wiping out old members
-		$query = OC_DB::prepare('DELETE FROM *PREFIX*principalgroups WHERE principal_id = ?');
-		$query->execute(array($principalID));
-
-		$query = OC_DB::prepare('INSERT INTO *PREFIX*principalgroups (principal_id, member_id) VALUES (?, ?);');
-		foreach($memberIds as $memberId) {
-			$query->execute(array($principalId, $memberId));
-		}
+		throw new Sabre_DAV_Exception('Setting members of the group is not supported yet');
 	}
 }
-- 
GitLab


From 340b6bf3ad6400aa4996114046c5ad7070cac9e4 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Sat, 11 Feb 2012 23:25:35 +0100
Subject: [PATCH 449/546] add themeing support and support for autoselection of
 mobile/tablet and standalone css/jss files and templates

---
 config/config.sample.php |   1 +
 lib/template.php         | 158 +++++++++++++++++++++++++++++++++------
 2 files changed, 138 insertions(+), 21 deletions(-)
 mode change 100644 => 100755 config/config.sample.php

diff --git a/config/config.sample.php b/config/config.sample.php
old mode 100644
new mode 100755
index a40ce073bf6..cd525358713
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -12,6 +12,7 @@ $CONFIG = array(
 "dbtableprefix" => "",
 "forcessl" => false,
 "enablebackup" => false,
+"theme" => "",
 // "datadirectory" => ""
 );
 ?>
diff --git a/lib/template.php b/lib/template.php
index 881d2a27b1e..84302fd1385 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -151,21 +151,75 @@ class OC_Template{
 	 * "admin".
 	 */
 	public function __construct( $app, $name, $renderas = "" ){
-		// Get the right template folder
-		$template = OC::$SERVERROOT."/core/templates/";
+		// Read the selected theme from the config file
+		$theme=OC_Config::getValue( "theme" );
+
+		// Read the detected formfactor and use the right file name.
+		$formfactor=$_SESSION['formfactor'];
+		if($formfactor=='default') { 
+			$fext='';
+		}elseif($formfactor=='mobile') { 
+			$fext='.mobile';
+		}elseif($formfactor=='tablet') { 
+			$fext='.tablet';
+		}elseif($formfactor=='standalone') { 
+			$fext='.standalone';
+		}else{
+			$fext='';
+		}
+
+		// Check if it is a app template or not.
 		if( $app != "" ){
-			// Check if the app is in the app folder
+			// Check if the app is in the app folder or in the root
 			if( file_exists( OC::$SERVERROOT."/apps/$app/templates/" )){
-				$template = OC::$SERVERROOT."/apps/$app/templates/";
+				// Check if the template is overwritten by the selected theme
+				if( file_exists( OC::$SERVERROOT."/themes/$theme/apps/$app/templates/"."$name$fext.php" )){
+					$template = OC::$SERVERROOT."/themes/$theme/apps/$app/templates/"."$name$fext.php";
+					$path = OC::$SERVERROOT."/themes/$theme/apps/$app/templates/";
+				}elseif( file_exists( OC::$SERVERROOT."/themes/$theme/apps/$app/templates/"."$name.php" )){
+					$template = OC::$SERVERROOT."/themes/$theme/apps/$app/templates/"."$name.php";
+					$path = OC::$SERVERROOT."/themes/$theme/apps/$app/templates/";
+				}elseif( OC::$SERVERROOT."/apps/$app/templates/"."$name$fext.php" ){
+					$template = OC::$SERVERROOT."/apps/$app/templates/"."$name$fext.php";
+					$path = OC::$SERVERROOT."/apps/$app/templates/";
+				}else{
+					$template = OC::$SERVERROOT."/apps/$app/templates/"."$name.php";
+					$path = OC::$SERVERROOT."/apps/$app/templates/";
+				}
+			}else{
+				// Check if the template is overwritten by the selected theme
+				if( file_exists( OC::$SERVERROOT."/themes/$theme/$app/templates/"."$name$fext.php" )){
+					$template = OC::$SERVERROOT."/themes/$theme/$app/templates/"."$name$fext.php";
+					$path = OC::$SERVERROOT."/themes/$theme/$app/templates/";
+				}elseif( file_exists( OC::$SERVERROOT."/themes/$theme/$app/templates/"."$name.php" )){
+					$template = OC::$SERVERROOT."/themes/$theme/$app/templates/"."$name.php";
+					$path = OC::$SERVERROOT."/themes/$theme/$app/templates/";
+				}elseif( file_exists( OC::$SERVERROOT."/$app/templates/"."$name$fext.php" )){
+					$template = OC::$SERVERROOT."/$app/templates/"."$name$fext.php";
+					$path = OC::$SERVERROOT."/$app/templates/";
+				}else{
+					$template = OC::$SERVERROOT."/$app/templates/"."$name.php";
+					$path = OC::$SERVERROOT."/$app/templates/";
+				}
+
 			}
-			else{
-				$template = OC::$SERVERROOT."/$app/templates/";
+		}else{
+			// Check if the template is overwritten by the selected theme
+			if( file_exists( OC::$SERVERROOT."/themes/$theme/core/templates/"."$name$fext.php" )){
+				$template = OC::$SERVERROOT."/themes/$theme/core/templates/"."$name$fext.php";
+				$path = OC::$SERVERROOT."/themes/$theme/core/templates/";
+			}elseif( file_exists( OC::$SERVERROOT."/themes/$theme/core/templates/"."$name.php" )){
+				$template = OC::$SERVERROOT."/themes/$theme/core/templates/"."$name.php";
+				$path = OC::$SERVERROOT."/themes/$theme/core/templates/";
+			}elseif( file_exists( OC::$SERVERROOT."/core/templates/"."$name$fext.php" )){
+				$template = OC::$SERVERROOT."/core/templates/"."$name$fext.php";
+				$path = OC::$SERVERROOT."/core/templates/";
+			}else{
+				$template = OC::$SERVERROOT."/core/templates/"."$name.php";
+				$path = OC::$SERVERROOT."/core/templates/";
 			}
 		}
 
-		// Templates have the ending .php
-		$path = $template;
-		$template .= "$name.php";
 
 		// Set the private data
 		$this->renderas = $renderas;
@@ -265,31 +319,93 @@ class OC_Template{
 			}else{
 				$page = new OC_Template( "core", "layout.guest" );
 			}
+			
+			// Read the selected theme from the config file
+			$theme=OC_Config::getValue( "theme" );
+
+			// Read the detected formfactor and use the right file name.
+			$formfactor=$_SESSION['formfactor'];
+			if($formfactor=='default') { 
+				$fext='';
+			}elseif($formfactor=='mobile') { 
+				$fext='.mobile';
+			}elseif($formfactor=='tablet') { 
+				$fext='.tablet';
+			}elseif($formfactor=='standalone') { 
+				$fext='.standalone';
+			}else{
+				$fext='';
+			}
 
-			// Add the css and js files
+			// Add the core js files or the js files provided by the selected theme
 			foreach(OC_Util::$scripts as $script){
-				if(is_file(OC::$SERVERROOT."/apps/$script.js" )){
+				if(is_file(OC::$SERVERROOT."/themes/$theme/apps/$script$fext.js" )){
+					$page->append( "jsfiles", OC::$WEBROOT."/themes/$theme/apps/$script$fext.js" );
+				}elseif(is_file(OC::$SERVERROOT."/themes/$theme/apps/$script.js" )){
+					$page->append( "jsfiles", OC::$WEBROOT."/themes/$theme/apps/$script.js" );
+
+				}elseif(is_file(OC::$SERVERROOT."/apps/$script$fext.js" )){
+					$page->append( "jsfiles", OC::$WEBROOT."/apps/$script$fext.js" );
+				}elseif(is_file(OC::$SERVERROOT."/apps/$script.js" )){
 					$page->append( "jsfiles", OC::$WEBROOT."/apps/$script.js" );
-				}
-				elseif(is_file(OC::$SERVERROOT."/$script.js" )){
+
+				}elseif(is_file(OC::$SERVERROOT."/themes/$theme/$script$fext.js" )){
+					$page->append( "jsfiles", OC::$WEBROOT."/themes/$theme/$script$fext.js" );
+				}elseif(is_file(OC::$SERVERROOT."/themes/$theme/$script.js" )){
+					$page->append( "jsfiles", OC::$WEBROOT."/themes/$theme/$script.js" );
+
+				}elseif(is_file(OC::$SERVERROOT."/$script$fext.js" )){
+					$page->append( "jsfiles", OC::$WEBROOT."/$script$fext.js" );
+				}elseif(is_file(OC::$SERVERROOT."/$script.js" )){
 					$page->append( "jsfiles", OC::$WEBROOT."/$script.js" );
-				}
-				else{
+
+				}elseif(is_file(OC::$SERVERROOT."/themes/$theme/core/$script$fext.js" )){
+					$page->append( "jsfiles", OC::$WEBROOT."/themes/$theme/core/$script$fext.js" );
+				}elseif(is_file(OC::$SERVERROOT."/themes/$theme/core/$script.js" )){
+					$page->append( "jsfiles", OC::$WEBROOT."/themes/$theme/core/$script.js" );
+
+				}elseif(is_file(OC::$SERVERROOT."/core/$script$fext.js" )){
+					$page->append( "jsfiles", OC::$WEBROOT."/core/$script$fext.js" );
+				}else{
 					$page->append( "jsfiles", OC::$WEBROOT."/core/$script.js" );
+
 				}
 			}
+			// Add the css files
 			foreach(OC_Util::$styles as $style){
-				if(is_file(OC::$SERVERROOT."/apps/$style.css" )){
+				if(is_file(OC::$SERVERROOT."/apps/$style$fext.css" )){
+					$page->append( "cssfiles", OC::$WEBROOT."/apps/$style$fext.css" );
+				}elseif(is_file(OC::$SERVERROOT."/apps/$style.css" )){
 					$page->append( "cssfiles", OC::$WEBROOT."/apps/$style.css" );
-				}
-				elseif(is_file(OC::$SERVERROOT."/$style.css" )){
+				}elseif(is_file(OC::$SERVERROOT."/$style$fext.css" )){
+					$page->append( "cssfiles", OC::$WEBROOT."/$style$fext.css" );
+				}elseif(is_file(OC::$SERVERROOT."/$style.css" )){
 					$page->append( "cssfiles", OC::$WEBROOT."/$style.css" );
-				}
-				else{
+				}elseif(is_file(OC::$SERVERROOT."/core/$style$fext.css" )){
+					$page->append( "cssfiles", OC::$WEBROOT."/core/$style$fext.css" );
+				}else{
 					$page->append( "cssfiles", OC::$WEBROOT."/core/$style.css" );
 				}
 			}
-			
+                        // Add the theme css files. you can override the default values here
+			if(!empty($theme)) {
+     	                 	foreach(OC_Util::$styles as $style){
+                                	if(is_file(OC::$SERVERROOT."/themes/$theme/apps/$style$fext.css" )){
+                                     		$page->append( "cssfiles", OC::$WEBROOT."/themes/$theme/apps/$style$fext.css" );
+                                	}elseif(is_file(OC::$SERVERROOT."/themes/$theme/apps/$style.css" )){
+                                     		$page->append( "cssfiles", OC::$WEBROOT."/themes/$theme/apps/$style.css" );
+                                	}elseif(is_file(OC::$SERVERROOT."/themes/$theme/$style$fext.css" )){
+                                        	$page->append( "cssfiles", OC::$WEBROOT."/themes/$theme/$style$fext.css" );
+                                	}elseif(is_file(OC::$SERVERROOT."/themes/$theme/$style.css" )){
+                                        	$page->append( "cssfiles", OC::$WEBROOT."/themes/$theme/$style.css" );
+                                	}elseif(is_file(OC::$SERVERROOT."/themes/$theme/core/$style$fext.css" )){
+                                        	$page->append( "cssfiles", OC::$WEBROOT."/themes/$theme/core/$style$fext.css" );
+                                	}elseif(is_file(OC::$SERVERROOT."/themes/$theme/core/$style.css" )){
+                                        	$page->append( "cssfiles", OC::$WEBROOT."/themes/$theme/core/$style.css" );
+                               		}
+                        	}		
+                        }		
+	
 			// Add custom headers
 			$page->assign('headers',$this->headers);
 			foreach(OC_Util::$headers as $header){
-- 
GitLab


From 6929652e141352f44c2ad63673d8aebeceee262b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sat, 11 Feb 2012 17:37:35 -0500
Subject: [PATCH 450/546] Redirect to installer if not installed

---
 lib/base.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/base.php b/lib/base.php
index 5b8eeb746b1..31133b72624 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -142,6 +142,13 @@ class OC{
 		// set the right include path
 		set_include_path(OC::$SERVERROOT.'/lib'.PATH_SEPARATOR.OC::$SERVERROOT.'/config'.PATH_SEPARATOR.OC::$SERVERROOT.'/3rdparty'.PATH_SEPARATOR.get_include_path().PATH_SEPARATOR.OC::$SERVERROOT);
 
+		// Redirect to installer if not installed
+		if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') {
+			$url = 'http://'.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php';
+			header("Location: $url");
+			exit();
+		}
+
 		// redirect to https site if configured
 		if( OC_Config::getValue( "forcessl", false )){
 			ini_set("session.cookie_secure", "on");
-- 
GitLab


From 5408a262347680ab0ee4c31b90eabb3e5ce04d4f Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Sun, 12 Feb 2012 00:01:46 +0100
Subject: [PATCH 451/546] add a README

---
 themes/README | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 themes/README

diff --git a/themes/README b/themes/README
new file mode 100644
index 00000000000..e348f86a120
--- /dev/null
+++ b/themes/README
@@ -0,0 +1,7 @@
+This is the themes folder. Themes can be used to customize the look and feel of ownCloud without the need to patch the source code.
+Themes can be placed in this folder with the name of the theme as foldername. The theme can be activated by putting 
+"theme" => 'themename', into the config.php file.
+The folder structure of a theme is exactly the same as the main ownCloud structure. You can override js files and templates with own versions. css files are loaded additionaly to the default files so you can override css properties.
+Themes should be developed here: https://gitorious.org/owncloud/themes
+You can also find a super simple example there
+
-- 
GitLab


From 192b8906a38aed893b9148954beaf6af85035d40 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 11 Feb 2012 21:24:22 +0100
Subject: [PATCH 452/546] Add copyright to OC_Connector_Sabre_Principal

---
 lib/connector/sabre/principal.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php
index 0f3d5feb794..72e180c65c0 100644
--- a/lib/connector/sabre/principal.php
+++ b/lib/connector/sabre/principal.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Copyright (c) 2011 Jakob Sack mail@jakobsack.de
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
 
 class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 	/**
-- 
GitLab


From c4ee924869fde31d41c47cd05d0f6c9ff4c16bdf Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 11 Feb 2012 21:48:45 +0100
Subject: [PATCH 453/546] Cleanup OC_Contacts_Addressbook::find usage

Use OC_Contacts_App::getAddressbook($id) instead of OC_Contacts_Addressbook::find($id), it contains access checks.
---
 apps/contacts/import.php    |  6 +-----
 apps/contacts/photo.php     | 14 +-------------
 apps/contacts/thumbnail.php | 16 +---------------
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index 9008208db59..4638bf0d73c 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -22,12 +22,8 @@ if($_POST['method'] == 'new'){
 	$id = OC_Contacts_Addressbook::add(OC_User::getUser(), $_POST['addressbookname']);
 	OC_Contacts_Addressbook::setActive($id, 1);
 }else{
-	$contacts = OC_Contacts_Addressbook::find($_POST['id']);
-	if($contacts['userid'] != OC_USER::getUser()){
-		OC_JSON::error();
-		exit();
-	}
 	$id = $_POST['id'];
+	OC_Contacts_App::getAddressbook($id); // is owner access check
 }
 //analyse the contacts file
 if(is_writable('import_tmp/')){
diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index 756aae63c4d..9566764e70a 100644
--- a/apps/contacts/photo.php
+++ b/apps/contacts/photo.php
@@ -31,19 +31,7 @@ if(isset($GET['refresh'])) {
 }
 $l10n = new OC_L10N('contacts');
 
-$card = OC_Contacts_VCard::find( $id );
-if( $card === false ){
-	echo $l10n->t('Contact could not be found.');
-	exit();
-}
-
-$addressbook = OC_Contacts_Addressbook::find( $card['addressbookid'] );
-if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
-	echo $l10n->t('This is not your contact.'); // This is a weird error, why would it come up? (Better feedback for users?)
-	exit();
-}
-
-$content = OC_VObject::parse($card['carddata']);
+$content = OC_Contacts_App::getContactVCard($id);
 $image = new OC_Image();
 // invalid vcard
 if( is_null($content)){
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index 36d395171a9..b981fdbe1e7 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -50,21 +50,7 @@ $id = $_GET['id'];
 
 $l10n = new OC_L10N('contacts');
 
-$card = OC_Contacts_VCard::find( $id );
-if( $card === false ){
-	OC_Log::write('contacts','thumbnail.php. Contact could not be found: '.$id,OC_Log::ERROR);
-	getStandardImage();
-	exit();
-}
-
-// FIXME: Is this check necessary? It just takes up CPU time.
-$addressbook = OC_Contacts_Addressbook::find( $card['addressbookid'] );
-if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
-	OC_Log::write('contacts','thumbnail.php. Wrong contact/addressbook - WTF?',OC_Log::ERROR);
-	exit();
-}
-
-$content = OC_VObject::parse($card['carddata']);
+$content = OC_Contacts_App::getContactVCard($id);
 
 // invalid vcard
 if( is_null($content)){
-- 
GitLab


From 1a74f0a18c799444d462c3d65ca348713bf89ad3 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 11 Feb 2012 21:52:39 +0100
Subject: [PATCH 454/546] Improve logging in OC_Contacts_App

Add logging to errors paths in getAddressbook and getContactObject.
---
 apps/contacts/lib/app.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index f62bd311479..944bd6e83af 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -49,6 +49,12 @@ class OC_Contacts_App{
 	public static function getAddressbook($id){
 		$addressbook = OC_Contacts_Addressbook::find( $id );
 		if( $addressbook === false || $addressbook['userid'] != OC_User::getUser()){
+			if ($addressbook === false) {
+				OC_Log::write('contacts', 'Addressbook not found: '. $id, OC_Log::ERROR);
+			}
+			else {
+				OC_Log::write('contacts', 'Addressbook('.$id.') is not from '.$OC_User::getUser(), OC_Log::ERROR);
+			}
 			OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('This is not your addressbook.')))); // Same here (as with the contact error). Could this error be improved?
 			exit();
 		}
@@ -58,11 +64,12 @@ class OC_Contacts_App{
 	public static function getContactObject($id){
 		$card = OC_Contacts_VCard::find( $id );
 		if( $card === false ){
+			OC_Log::write('contacts', 'Contact could not be found: '.$id, OC_Log::ERROR);
 			OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('Contact could not be found.').' '.$id)));
 			exit();
 		}
 
-		self::getAddressbook( $card['addressbookid'] );
+		self::getAddressbook( $card['addressbookid'] );//access check
 		return $card;
 	}
 
-- 
GitLab


From 8f3da6ee9b6082e6853a0166470316e5b19867e3 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 11 Feb 2012 21:57:38 +0100
Subject: [PATCH 455/546] Small coding style update

Fixup OC_Contacts_App
---
 apps/contacts/lib/app.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 944bd6e83af..5e58f9e928f 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -10,7 +10,7 @@
  * This class manages our app actions
  */
 OC_Contacts_App::$l10n = new OC_L10N('contacts');
-class OC_Contacts_App{
+class OC_Contacts_App {
 	public static $l10n;
 
 	/**
@@ -18,7 +18,7 @@ class OC_Contacts_App{
 	* @param int $id of contact
 	* @param Sabre_VObject_Component $vcard to render
 	*/
-	public static function renderDetails($id, $vcard, $new=false){
+	public static function renderDetails($id, $vcard, $new=false) {
 		$property_types = self::getAddPropertyOptions();
 		$adr_types = self::getTypesOfProperty('ADR');
 		$phone_types = self::getTypesOfProperty('TEL');
@@ -46,9 +46,9 @@ class OC_Contacts_App{
 		OC_JSON::success(array('data' => array( 'id' => $id, 'name' => $name, 'page' => $page )));
 	}
 
-	public static function getAddressbook($id){
+	public static function getAddressbook($id) {
 		$addressbook = OC_Contacts_Addressbook::find( $id );
-		if( $addressbook === false || $addressbook['userid'] != OC_User::getUser()){
+		if( $addressbook === false || $addressbook['userid'] != OC_User::getUser()) {
 			if ($addressbook === false) {
 				OC_Log::write('contacts', 'Addressbook not found: '. $id, OC_Log::ERROR);
 			}
@@ -61,9 +61,9 @@ class OC_Contacts_App{
 		return $addressbook;
 	}
 
-	public static function getContactObject($id){
+	public static function getContactObject($id) {
 		$card = OC_Contacts_VCard::find( $id );
-		if( $card === false ){
+		if( $card === false ) {
 			OC_Log::write('contacts', 'Contact could not be found: '.$id, OC_Log::ERROR);
 			OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('Contact could not be found.').' '.$id)));
 			exit();
@@ -77,12 +77,12 @@ class OC_Contacts_App{
 	 * @brief Gets the VCard as an OC_VObject
 	 * @returns The card or null if the card could not be parsed.
 	 */
-	public static function getContactVCard($id){
+	public static function getContactVCard($id) {
 		$card = self::getContactObject( $id );
 
 		$vcard = OC_VObject::parse($card['carddata']);
 		// Try to fix cards with missing 'N' field from pre ownCloud 4. Hot damn, this is ugly...
-		if(!is_null($vcard) && !$vcard->__isset('N')){
+		if(!is_null($vcard) && !$vcard->__isset('N')) {
 			$appinfo = $info=OC_App::getAppInfo('contacts');
 			if($appinfo['version'] >= 5) {
 				OC_Log::write('contacts','OC_Contacts_App::getContactVCard. Deprecated check for missing N field', OC_Log::DEBUG);
@@ -100,10 +100,10 @@ class OC_Contacts_App{
 		return $vcard;
 	}
 
-	public static function getPropertyLineByChecksum($vcard, $checksum){
+	public static function getPropertyLineByChecksum($vcard, $checksum) {
 		$line = null;
-		for($i=0;$i<count($vcard->children);$i++){
-			if(md5($vcard->children[$i]->serialize()) == $checksum ){
+		for($i=0;$i<count($vcard->children);$i++) {
+			if(md5($vcard->children[$i]->serialize()) == $checksum ) {
 				$line = $i;
 				break;
 			}
@@ -114,7 +114,7 @@ class OC_Contacts_App{
 	/**
 	 * @return array of vcard prop => label
 	 */
-	public static function getAddPropertyOptions(){
+	public static function getAddPropertyOptions() {
 		$l10n = self::$l10n;
 		return array(
 				'ADR'   => $l10n->t('Address'),
@@ -127,9 +127,9 @@ class OC_Contacts_App{
 	/**
 	 * @return types for property $prop
 	 */
-	public static function getTypesOfProperty($prop){
+	public static function getTypesOfProperty($prop) {
 		$l = self::$l10n;
-		switch($prop){
+		switch($prop) {
 		case 'ADR':
 			return array(
 				'WORK' => $l->t('Work'),
-- 
GitLab


From 90d189a8b3e054a2d85337f06dc0f3339b12c2f1 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 11 Feb 2012 22:00:42 +0100
Subject: [PATCH 456/546] Access check fix in contacts/ajax/activation.php

plus small cleanup
---
 apps/contacts/ajax/activation.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/apps/contacts/ajax/activation.php b/apps/contacts/ajax/activation.php
index fda63a528a4..d69e3dba3f8 100644
--- a/apps/contacts/ajax/activation.php
+++ b/apps/contacts/ajax/activation.php
@@ -10,18 +10,16 @@
 require_once ("../../../lib/base.php");
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
-$l=new OC_L10N('contacts');
 
 $bookid = $_POST['bookid'];
+$book = OC_Contacts_App::getAddressbook($bookid);// is owner access check
+
 if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) {
-	OC_JSON::error(array('data' => array('message' => $l->t('Error (de)activating addressbook.'))));
 	OC_Log::write('contacts','ajax/activation.php: Error activating addressbook: '.$bookid, OC_Log::ERROR);
+	OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error (de)activating addressbook.'))));
 	exit();
 }
-$book = OC_Contacts_App::getAddressbook($bookid);
-
 
-/* is there an OC_JSON::error() ? */
 OC_JSON::success(array(
 	'active' => OC_Contacts_Addressbook::isActive($bookid),
 	'bookid' => $bookid,
-- 
GitLab


From 3eff161bbf242b48764f92dbabe157b2e9ed4947 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Feb 2012 14:28:16 +0100
Subject: [PATCH 457/546] OC_Image: Use valid function instead of checking the
 resource

---
 lib/image.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index 97d30f56517..9081a3c7021 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -78,7 +78,7 @@ class OC_Image {
 	* @returns int
 	*/
 	public function mimeType() {
-		return is_resource($this->resource) ? image_type_to_mime_type($this->imagetype) : '';
+		return $this->valid() ? image_type_to_mime_type($this->imagetype) : '';
 	}
 
 	/**
@@ -86,7 +86,7 @@ class OC_Image {
 	* @returns int
 	*/
 	public function width() {
-		return is_resource($this->resource) ? imagesx($this->resource) : -1;
+		return $this->valid() ? imagesx($this->resource) : -1;
 	}
 
 	/**
@@ -94,7 +94,7 @@ class OC_Image {
 	* @returns int
 	*/
 	public function height() {
-		return is_resource($this->resource) ? imagesy($this->resource) : -1;
+		return $this->valid() ? imagesy($this->resource) : -1;
 	}
 
 	/**
@@ -200,7 +200,7 @@ class OC_Image {
 			OC_Log::write('core','OC_Image->fixOrientation() Exif module not enabled.', OC_Log::DEBUG);
 			return false;
 		}
-		if(!is_resource($this->resource)) {
+		if(!$this->valid()) {
 			OC_Log::write('core','OC_Image->fixOrientation() No image loaded.', OC_Log::DEBUG);
 			return false;
 		}
@@ -439,7 +439,7 @@ class OC_Image {
 	* @returns bool
 	*/
 	public function resize($maxsize) {
-		if(!$this->resource) {
+		if(!$this->valid()) {
 			OC_Log::write('core',__METHOD__.'(): No image loaded', OC_Log::ERROR);
 			return false;
 		}
@@ -477,7 +477,7 @@ class OC_Image {
 	* @returns bool for success or failure
 	*/
 	public function centerCrop() {
-		if(!$this->resource) {
+		if(!$this->valid()) {
 			OC_Log::write('core','OC_Image->centerCrop, No image loaded', OC_Log::ERROR);
 			return false;
 		}
@@ -521,7 +521,7 @@ class OC_Image {
 	* @returns bool for success or failure
 	*/
 	public function crop($x, $y, $w, $h) {
-		if(!$this->resource) {
+		if(!$this->valid()) {
 			OC_Log::write('core',__METHOD__.'(): No image loaded', OC_Log::ERROR);
 			return false;
 		}
-- 
GitLab


From facd4cbe17df60af015fc31692aa46225fa59951 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Feb 2012 14:57:44 +0100
Subject: [PATCH 458/546] Contacts: Cleanup photo and thumbnail code

---
 apps/contacts/photo.php     | 103 +++++++++++-------------------------
 apps/contacts/thumbnail.php |  71 ++++++++++++++-----------
 2 files changed, 69 insertions(+), 105 deletions(-)

diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index 9566764e70a..0b7769ebe07 100644
--- a/apps/contacts/photo.php
+++ b/apps/contacts/photo.php
@@ -1,23 +1,11 @@
 <?php
 /**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
+ * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
+ * Copyright (c) 2011, 2012 Bart Visscher <bartv@thisnet.nl>
+ * Copyright (c) 2011 Jakob Sack mail@jakobsack.de
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
  */
 
 // Init owncloud
@@ -29,67 +17,36 @@ $id = $_GET['id'];
 if(isset($GET['refresh'])) {
 	header("Cache-Control: no-cache, no-store, must-revalidate");
 }
-$l10n = new OC_L10N('contacts');
 
-$content = OC_Contacts_App::getContactVCard($id);
+$contact = OC_Contacts_App::getContactVCard($id);
 $image = new OC_Image();
 // invalid vcard
-if( is_null($content)){
-	$image->loadFromFile('img/person_large.png');
-	header('Content-Type: '.$image->mimeType());
-	$image();
-	//echo $l10n->t('This card is not RFC compatible.');
-	exit();
+if( is_null($contact)) {
+	OC_Log::write('contacts','photo.php. The VCard for ID '.$id.' is not RFC compatible',OC_Log::ERROR);
 } else {
 	// Photo :-)
-	foreach($content->children as $child){
-		if($child->name == 'PHOTO'){
-			$mime = 'image/jpeg';
-			foreach($child->parameters as $parameter){
-				if( $parameter->name == 'TYPE' ){
-					$mime = $parameter->value;
-				}
-			}
-			if($image->loadFromBase64($child->value)) {
-				if($image->width() > 200 || $image->height() > 200) {
-					$image->resize(200);
-				}
-				header('Content-Type: '.$mime);
-				$image();
-				exit();
-			} else {
-				$image->loadFromFile('img/person_large.png');
-				header('Content-Type: '.$image->mimeType());
-				$image();
-			}
-			//$photo = base64_decode($child->value);
-			//header('Content-Type: '.$mime);
-			//header('Content-Length: ' . strlen($photo));
-			//echo $photo;
-			//exit();
-		}
+	if($image->loadFromBase64($contact->getAsString('PHOTO'))) {
+		// OK
+		header('ETag: '.md5($contact->getAsString('PHOTO')));
 	}
-}
-$image->loadFromFile('img/person_large.png');
-header('Content-Type: '.$image->mimeType());
-$image();
-/*
-// Logo :-/
-foreach($content->children as $child){
-	if($child->name == 'PHOTO'){
-		$mime = 'image/jpeg';
-		foreach($child->parameters as $parameter){
-			if($parameter->name == 'TYPE'){
-				$mime = $parameter->value;
-			}
+	else
+	// Logo :-/
+	if($image->loadFromBase64($contact->getAsString('LOGO'))) {
+		// OK
+		header('ETag: '.md5($contact->getAsString('LOGO')));
+	}
+	if ($image->valid()) {
+		$max_size = 200;
+		if($image->width() > $max_size ||
+		   $image->height() > $max_size) {
+			$image->resize($max_size);
 		}
-		$photo = base64_decode($child->value());
-		header('Content-Type: '.$mime);
-		header('Content-Length: ' . strlen($photo));
-		echo $photo;
-		exit();
 	}
 }
-*/
-// Not found :-(
-//echo $l10n->t('This card does not contain a photo.');
+if (!$image->valid()) {
+	// Not found :-(
+	$image->loadFromFile('img/person_large.png');
+}
+header('Content-Type: '.$image->mimeType());
+$image->show();
+//echo OC_Contacts_App::$l10n->t('This card does not contain a photo.');
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index b981fdbe1e7..b44db95b390 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -29,15 +29,11 @@ OC_Util::checkAppEnabled('contacts');
 function getStandardImage(){
 	$date = new DateTime('now');
 	$date->add(new DateInterval('P10D'));
-	header('Expires: '.$date->format(DateTime::RFC850));
+	header('Expires: '.$date->format(DateTime::RFC2822));
 	header('Cache-Control: cache');
 	header('Pragma: cache');
+	header("HTTP/1.1 307 Temporary Redirect");
 	header('Location: '.OC_Helper::imagePath('contacts', 'person.png'));
-	exit();
-// 	$src_img = imagecreatefrompng('img/person.png');
-// 	header('Content-Type: image/png');
-// 	imagepng($src_img);
-// 	imagedestroy($src_img);
 }
 
 if(!function_exists('imagecreatefromjpeg')) {
@@ -50,10 +46,10 @@ $id = $_GET['id'];
 
 $l10n = new OC_L10N('contacts');
 
-$content = OC_Contacts_App::getContactVCard($id);
+$contact = OC_Contacts_App::getContactVCard($id);
 
 // invalid vcard
-if( is_null($content)){
+if( is_null($contact)){
 	OC_Log::write('contacts','thumbnail.php. The VCard for ID '.$id.' is not RFC compatible',OC_Log::ERROR);
 	getStandardImage();
 	exit();
@@ -62,34 +58,45 @@ if( is_null($content)){
 $thumbnail_size = 23;
 
 // Find the photo from VCard.
-foreach($content->children as $child){
-	if($child->name == 'PHOTO'){
-		$image = new OC_Image();
-		if($image->loadFromBase64($child->value)) {
-			if($image->centerCrop()) {
-				if($image->resize($thumbnail_size)) {
-					header('ETag: '.md5($child->value));
-					if(!$image()) {
-						OC_Log::write('contacts','thumbnail.php. Couldn\'t display thumbnail for ID '.$id,OC_Log::ERROR);
-						getStandardImage();
-						exit();
-					}
-				} else {
-					OC_Log::write('contacts','thumbnail.php. Couldn\'t resize thumbnail for ID '.$id,OC_Log::ERROR);
-					getStandardImage();
-					exit();
-				}
-			}else{
-				OC_Log::write('contacts','thumbnail.php. Couldn\'t crop thumbnail for ID '.$id,OC_Log::ERROR);
-				getStandardImage();
+$image = new OC_Image();
+$photo = $contact->getAsString('PHOTO');
+$etag = md5($photo);
+$rev_string = $contact->getAsString('REV');
+if ($rev_string) {
+	$rev = DateTime::createFromFormat(DateTime::W3C, $rev_string);
+	$last_modified_time = $rev->format(DateTime::RFC2822);
+} else {
+	$last_modified_time = null;
+}
+
+header('Cache-Control: cache');
+header('Pragma: cache');
+if ($rev_string) {
+	header('Last-Modified: '.$last_modified_time);
+}
+header('ETag: '.$etag);
+
+if (@trim($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $last_modified_time ||
+    @trim($_SERVER['HTTP_IF_NONE_MATCH']) == $etag) {
+	header('HTTP/1.1 304 Not Modified');
+	exit;
+}
+
+if($image->loadFromBase64($photo)) {
+	if($image->centerCrop()) {
+		if($image->resize($thumbnail_size)) {
+			if($image->show()) {
 				exit();
+			} else {
+				OC_Log::write('contacts','thumbnail.php. Couldn\'t display thumbnail for ID '.$id,OC_Log::ERROR);
 			}
 		} else {
-			OC_Log::write('contacts','thumbnail.php. Couldn\'t load image string for ID '.$id,OC_Log::ERROR);
-			getStandardImage();
-			exit();
+			OC_Log::write('contacts','thumbnail.php. Couldn\'t resize thumbnail for ID '.$id,OC_Log::ERROR);
 		}
-		exit();
+	}else{
+		OC_Log::write('contacts','thumbnail.php. Couldn\'t crop thumbnail for ID '.$id,OC_Log::ERROR);
 	}
+} else {
+	OC_Log::write('contacts','thumbnail.php. Couldn\'t load image string for ID '.$id,OC_Log::ERROR);
 }
 getStandardImage();
-- 
GitLab


From 6bd0aad1174f2625560d2a6c1b0138ad5f6cc3fb Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Feb 2012 15:12:08 +0100
Subject: [PATCH 459/546] Contacts: Fix adding N property in getContactVCard

---
 apps/contacts/lib/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 5e58f9e928f..914b480e9b4 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -91,11 +91,11 @@ class OC_Contacts_App {
 			if($vcard->__isset('FN')) {
 				OC_Log::write('contacts','getContactVCard, found FN field: '.$vcard->__get('FN'), OC_Log::DEBUG);
 				$n = implode(';', array_reverse(array_slice(explode(' ', $vcard->__get('FN')), 0, 2))).';;;';
+				$vcard->setString('N', $n);
 				OC_Contacts_VCard::edit( $id, $vcard->serialize());
 			} else { // Else just add an empty 'N' field :-P
 				$vcard->setString('N', 'Unknown;Name;;;');
 			}
-			$vcard->setString('N', $n);
 		}
 		return $vcard;
 	}
-- 
GitLab


From b77132edbedfc20b975c108989c3f2ff3c8c8df6 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Feb 2012 15:13:30 +0100
Subject: [PATCH 460/546] Contacts: Save last-modified time in REV property if
 not set

---
 apps/contacts/lib/app.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 914b480e9b4..d8d1d3ac047 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -97,6 +97,10 @@ class OC_Contacts_App {
 				$vcard->setString('N', 'Unknown;Name;;;');
 			}
 		}
+		if (!is_null($vcard) && !isset($vcard->REV)) {
+			$rev = new DateTime('@'.$card['lastmodified']);
+			$vcard->setString('REV', $rev->format(DateTime::W3C));
+		}
 		return $vcard;
 	}
 
-- 
GitLab


From 6eb1427ac07bab9052610b32b4c5df0486d5e554 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Feb 2012 15:55:36 +0100
Subject: [PATCH 461/546] Contacts: Document usage of
 OC_Contacts_App::getAddressbook

Remove redundant access checks and add comments to the calls to
OC_Contacts_App::getAddressbook that are access checks
---
 apps/contacts/ajax/addcard.php           |  2 +-
 apps/contacts/ajax/addcontact.php        |  2 +-
 apps/contacts/ajax/deletebook.php        |  2 +-
 apps/contacts/ajax/updateaddressbook.php |  1 +
 apps/contacts/export.php                 | 10 ----------
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/apps/contacts/ajax/addcard.php b/apps/contacts/ajax/addcard.php
index f15a1685840..fbf5b57ae7c 100644
--- a/apps/contacts/ajax/addcard.php
+++ b/apps/contacts/ajax/addcard.php
@@ -34,7 +34,7 @@ OC_JSON::checkAppEnabled('contacts');
 $l=new OC_L10N('contacts');
 
 $aid = $_POST['id'];
-$addressbook = OC_Contacts_App::getAddressbook( $aid );
+OC_Contacts_App::getAddressbook( $aid ); // is owner access check
 
 $fn = trim($_POST['fn']);
 $values = $_POST['value'];
diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php
index c39d75eff88..9b4e68ac272 100644
--- a/apps/contacts/ajax/addcontact.php
+++ b/apps/contacts/ajax/addcontact.php
@@ -40,7 +40,7 @@ OC_JSON::checkAppEnabled('contacts');
 $l=new OC_L10N('contacts');
 
 $aid = $_POST['aid'];
-$addressbook = OC_Contacts_App::getAddressbook( $aid );
+OC_Contacts_App::getAddressbook( $aid ); // is owner access check
 
 $fn = trim($_POST['fn']);
 $n = trim($_POST['n']);
diff --git a/apps/contacts/ajax/deletebook.php b/apps/contacts/ajax/deletebook.php
index a89c00575e9..d782c9dfb8d 100644
--- a/apps/contacts/ajax/deletebook.php
+++ b/apps/contacts/ajax/deletebook.php
@@ -30,7 +30,7 @@ OC_JSON::checkAppEnabled('contacts');
 
 //$id = $_GET['id'];
 $id = $_POST['id'];
-$addressbook = OC_Contacts_App::getAddressbook( $id );
+OC_Contacts_App::getAddressbook( $id ); // is owner access check
 
 OC_Contacts_Addressbook::delete($id);
 OC_JSON::success(array('data' => array( 'id' => $id )));
diff --git a/apps/contacts/ajax/updateaddressbook.php b/apps/contacts/ajax/updateaddressbook.php
index 7d9e2aea917..d6c1ad179bb 100644
--- a/apps/contacts/ajax/updateaddressbook.php
+++ b/apps/contacts/ajax/updateaddressbook.php
@@ -15,6 +15,7 @@ OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 
 $bookid = $_POST['id'];
+OC_Contacts_App::getAddressbook($bookid); // is owner access check
 
 if(!OC_Contacts_Addressbook::edit($bookid, $_POST['name'], null)) {
 	OC_JSON::error(array('data' => array('message' => $l->t('Error updating addressbook.'))));
diff --git a/apps/contacts/export.php b/apps/contacts/export.php
index fc2aa86500f..750d77bcac8 100644
--- a/apps/contacts/export.php
+++ b/apps/contacts/export.php
@@ -14,10 +14,6 @@ $contact = isset($_GET['contactid']) ? $_GET['contactid'] : NULL;
 $nl = "\n";
 if(isset($book)){
 	$addressbook = OC_Contacts_App::getAddressbook($book);
-	if($addressbook['userid'] != OC_User::getUser()){
-		OC_JSON::error();
-		exit;
-	}
 	$cardobjects = OC_Contacts_VCard::all($book);
 	header('Content-Type: text/directory');
 	header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $addressbook['displayname']) . '.vcf'); 
@@ -27,12 +23,6 @@ if(isset($book)){
 	}
 }elseif(isset($contact)){	
 	$data = OC_Contacts_App::getContactObject($contact);
-	$addressbookid = $data['addressbookid'];
-	$addressbook = OC_Contacts_App::getAddressbook($addressbookid);
-	if($addressbook['userid'] != OC_User::getUser()){
-		OC_JSON::error();
-		exit;
-	}
 	header('Content-Type: text/directory');
 	header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $data['fullname']) . '.vcf'); 
 	echo $data['carddata'];
-- 
GitLab


From 39f342d595136ae6edace17870d14e32c7466cbd Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Feb 2012 15:58:55 +0100
Subject: [PATCH 462/546] Contacts: Move debug logging of $_POST to after
 access checks

---
 apps/contacts/ajax/addcontact.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php
index 9b4e68ac272..80034327011 100644
--- a/apps/contacts/ajax/addcontact.php
+++ b/apps/contacts/ajax/addcontact.php
@@ -30,15 +30,16 @@ function bailOut($msg) {
 function debug($msg) {
 	OC_Log::write('contacts','ajax/addcontact.php: '.$msg, OC_Log::DEBUG);
 }
-foreach ($_POST as $key=>$element) {
-	debug('_POST: '.$key.'=>'.$element);
-}
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 $l=new OC_L10N('contacts');
 
+foreach ($_POST as $key=>$element) {
+	debug('_POST: '.$key.'=>'.$element);
+}
+
 $aid = $_POST['aid'];
 OC_Contacts_App::getAddressbook( $aid ); // is owner access check
 
-- 
GitLab


From 623afb69b6a51d57ca99d1d825b6c433a93baa96 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Feb 2012 16:11:41 +0100
Subject: [PATCH 463/546] Contacts: cleanup OC_L10N usage

---
 apps/contacts/ajax/addbook.php                    |  1 -
 apps/contacts/ajax/addcard.php                    |  3 +--
 apps/contacts/ajax/addcontact.php                 |  3 +--
 apps/contacts/ajax/addproperty.php                |  9 ++++-----
 apps/contacts/ajax/chooseaddressbook.php          |  1 -
 apps/contacts/ajax/contactdetails.php             |  9 ++++-----
 apps/contacts/ajax/createaddressbook.php          |  6 ++----
 apps/contacts/ajax/deletebook.php                 |  1 -
 apps/contacts/ajax/deleteproperty.php             |  6 ++----
 apps/contacts/ajax/editaddressbook.php            |  1 -
 apps/contacts/ajax/importdialog.php               |  1 -
 apps/contacts/ajax/loadphoto.php                  |  1 -
 apps/contacts/ajax/messagebox.php                 |  1 -
 apps/contacts/ajax/savecrop.php                   |  1 -
 apps/contacts/ajax/saveproperty.php               | 13 ++++++-------
 apps/contacts/ajax/showsetproperty.php            |  3 +--
 apps/contacts/ajax/updateaddressbook.php          |  2 --
 apps/contacts/ajax/uploadphoto.php                | 13 ++++++-------
 apps/contacts/appinfo/app.php                     |  6 ++----
 apps/contacts/templates/part.addcardform.php      |  3 ---
 apps/contacts/templates/part.contact.php          |  1 -
 apps/contacts/templates/part.edit_name_dialog.php |  1 -
 apps/contacts/thumbnail.php                       |  2 --
 23 files changed, 29 insertions(+), 59 deletions(-)

diff --git a/apps/contacts/ajax/addbook.php b/apps/contacts/ajax/addbook.php
index 36acb9af391..f5852183cc3 100644
--- a/apps/contacts/ajax/addbook.php
+++ b/apps/contacts/ajax/addbook.php
@@ -7,7 +7,6 @@
  */
 
 require_once('../../../lib/base.php');
-$l10n = new OC_L10N('contacts');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 $book = array(
diff --git a/apps/contacts/ajax/addcard.php b/apps/contacts/ajax/addcard.php
index fbf5b57ae7c..b1dc69a4691 100644
--- a/apps/contacts/ajax/addcard.php
+++ b/apps/contacts/ajax/addcard.php
@@ -31,7 +31,6 @@ function bailOut($msg) {
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
-$l=new OC_L10N('contacts');
 
 $aid = $_POST['id'];
 OC_Contacts_App::getAddressbook( $aid ); // is owner access check
@@ -95,7 +94,7 @@ foreach( $add as $propname){
 }
 $id = OC_Contacts_VCard::add($aid,$vcard->serialize());
 if(!$id) {
-	OC_JSON::error(array('data' => array('message' => $l->t('There was an error adding the contact.'))));
+	OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('There was an error adding the contact.'))));
 	OC_Log::write('contacts','ajax/addcard.php: Recieved non-positive ID on adding card: '.$id, OC_Log::ERROR);
 	exit();
 }
diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php
index 80034327011..5d17631caa4 100644
--- a/apps/contacts/ajax/addcontact.php
+++ b/apps/contacts/ajax/addcontact.php
@@ -34,7 +34,6 @@ function debug($msg) {
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
-$l=new OC_L10N('contacts');
 
 foreach ($_POST as $key=>$element) {
 	debug('_POST: '.$key.'=>'.$element);
@@ -55,7 +54,7 @@ $vcard->setString('N',$n);
 
 $id = OC_Contacts_VCard::add($aid,$vcard->serialize());
 if(!$id) {
-	OC_JSON::error(array('data' => array('message' => $l->t('There was an error adding the contact.'))));
+	OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('There was an error adding the contact.'))));
 	OC_Log::write('contacts','ajax/addcontact.php: Recieved non-positive ID on adding card: '.$id, OC_Log::ERROR);
 	exit();
 }
diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 23f0a9379b2..03a45532f9b 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -26,7 +26,6 @@ require_once('../../../lib/base.php');
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
-$l=new OC_L10N('contacts');
 
 $id = $_POST['id'];
 $vcard = OC_Contacts_App::getContactVCard( $id );
@@ -36,7 +35,7 @@ $value = $_POST['value'];
 if(!is_array($value)){
 	$value = trim($value);
 	if(!$value && in_array($name, array('TEL', 'EMAIL', 'ORG', 'BDAY', 'NICKNAME'))) {
-		OC_JSON::error(array('data' => array('message' => $l->t('Cannot add empty property.'))));
+		OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Cannot add empty property.'))));
 		exit();
 	}
 } elseif($name === 'ADR') { // only add if non-empty elements.
@@ -48,7 +47,7 @@ if(!is_array($value)){
 		}
 	}
 	if($empty) {
-		OC_JSON::error(array('data' => array('message' => $l->t('At least one of the address fields has to be filled out.'))));
+		OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('At least one of the address fields has to be filled out.'))));
 		exit();
 	}
 }
@@ -59,7 +58,7 @@ $current = $vcard->select($name);
 foreach($current as $item) {
 	$tmpvalue = (is_array($value)?implode(';', $value):$value);
 	if($tmpvalue == $item->value) {
-		OC_JSON::error(array('data' => array('message' => $l->t('Trying to add duplicate property: ').$name.': '.$tmpvalue)));
+		OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Trying to add duplicate property: ').$name.': '.$tmpvalue)));
 		OC_Log::write('contacts','ajax/addproperty.php: Trying to add duplicate property: '.$name.': '.$tmpvalue, OC_Log::DEBUG);
 		exit();
 	}
@@ -114,7 +113,7 @@ foreach ($parameters as $key=>$element) {
 $checksum = md5($vcard->children[$line]->serialize());
 
 if(!OC_Contacts_VCard::edit($id,$vcard->serialize())) {
-	OC_JSON::error(array('data' => array('message' => $l->t('Error adding contact property.'))));
+	OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error adding contact property.'))));
 	OC_Log::write('contacts','ajax/addproperty.php: Error updating contact property: '.$name, OC_Log::ERROR);
 	exit();
 }
diff --git a/apps/contacts/ajax/chooseaddressbook.php b/apps/contacts/ajax/chooseaddressbook.php
index b0a10bb3118..8298c16b041 100644
--- a/apps/contacts/ajax/chooseaddressbook.php
+++ b/apps/contacts/ajax/chooseaddressbook.php
@@ -7,7 +7,6 @@
  */
 
 require_once('../../../lib/base.php');
-$l10n = new OC_L10N('contacts');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 
diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contactdetails.php
index f7ac25ea515..f35fd595c56 100644
--- a/apps/contacts/ajax/contactdetails.php
+++ b/apps/contacts/ajax/contactdetails.php
@@ -34,15 +34,14 @@ function debug($msg) {
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
-$l=new OC_L10N('contacts');
 
 $id = isset($_GET['id'])?$_GET['id']:null;
 if(is_null($id)) {
-	bailOut($l->t('Missing ID'));
+	bailOut(OC_Contacts_App::$l10n->t('Missing ID'));
 }
 $vcard = OC_Contacts_App::getContactVCard( $id );
 if(is_null($vcard)) {
-	bailOut($l->t('Error parsing VCard for ID: "'.$id.'"'));
+	bailOut(OC_Contacts_App::$l10n->t('Error parsing VCard for ID: "'.$id.'"'));
 }
 $details = OC_Contacts_VCard::structureContact($vcard);
 
@@ -54,7 +53,7 @@ if(!isset($details['FN'])) {
 	} elseif(isset($details['EMAIL'])) {
 		$details['FN'] = array('value' => $details['EMAIL'][0]['value']);
 	} else {
-		$details['FN'] = array('value' => $l->t('Unknown'));
+		$details['FN'] = array('value' => OC_Contacts_App::$l10n->t('Unknown'));
 	}
 }
 
@@ -73,4 +72,4 @@ if(isset($details['PHOTO'])) {
 }
 $details['id'] = $id;
 
-OC_JSON::success(array('data' => $details));
\ No newline at end of file
+OC_JSON::success(array('data' => $details));
diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php
index 3d766b6a60a..fbd70bae583 100644
--- a/apps/contacts/ajax/createaddressbook.php
+++ b/apps/contacts/ajax/createaddressbook.php
@@ -8,8 +8,6 @@
  */
 require_once('../../../lib/base.php');
 
-$l10n = new OC_L10N('contacts');
-
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
@@ -17,13 +15,13 @@ OC_JSON::checkAppEnabled('contacts');
 $userid = OC_User::getUser();
 $bookid = OC_Contacts_Addressbook::add($userid, strip_tags($_POST['name']), null);
 if(!$bookid) {
-	OC_JSON::error(array('data' => array('message' => $l->t('Error adding addressbook.'))));
+	OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error adding addressbook.'))));
 	OC_Log::write('contacts','ajax/createaddressbook.php: Error adding addressbook: '.$_POST['name'], OC_Log::ERROR);
 	exit();
 }
 
 if(!OC_Contacts_Addressbook::setActive($bookid, 1)) {
-	OC_JSON::error(array('data' => array('message' => $l->t('Error activating addressbook.'))));
+	OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error activating addressbook.'))));
 	OC_Log::write('contacts','ajax/createaddressbook.php: Error activating addressbook: '.$bookid, OC_Log::ERROR);
 	//exit();
 }
diff --git a/apps/contacts/ajax/deletebook.php b/apps/contacts/ajax/deletebook.php
index d782c9dfb8d..46d8deb4868 100644
--- a/apps/contacts/ajax/deletebook.php
+++ b/apps/contacts/ajax/deletebook.php
@@ -23,7 +23,6 @@
 // Init owncloud
 require_once('../../../lib/base.php');
 
-$l10n = new OC_L10N('contacts');
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php
index d745d3271db..a9afffaad4c 100644
--- a/apps/contacts/ajax/deleteproperty.php
+++ b/apps/contacts/ajax/deleteproperty.php
@@ -26,7 +26,6 @@ require_once('../../../lib/base.php');
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
-$l10n = new OC_L10N('contacts');
 
 $id = $_GET['id'];
 $checksum = $_GET['checksum'];
@@ -34,15 +33,14 @@ $checksum = $_GET['checksum'];
 $vcard = OC_Contacts_App::getContactVCard( $id );
 $line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
 if(is_null($line)){
-	$l=new OC_L10N('contacts');
-	OC_JSON::error(array('data' => array( 'message' => $l->t('Information about vCard is incorrect. Please reload the page.'))));
+	OC_JSON::error(array('data' => array( 'message' => OC_Contacts_App::$l10n->t('Information about vCard is incorrect. Please reload the page.'))));
 	exit();
 }
 
 unset($vcard->children[$line]);
 
 if(!OC_Contacts_VCard::edit($id,$vcard->serialize())) {
-	OC_JSON::error(array('data' => array('message' => $l->t('Error deleting contact property.'))));
+	OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error deleting contact property.'))));
 	OC_Log::write('contacts','ajax/deleteproperty.php: Error deleting contact property', OC_Log::ERROR);
 	exit();
 }
diff --git a/apps/contacts/ajax/editaddressbook.php b/apps/contacts/ajax/editaddressbook.php
index ced673ce807..a6262f39b23 100644
--- a/apps/contacts/ajax/editaddressbook.php
+++ b/apps/contacts/ajax/editaddressbook.php
@@ -7,7 +7,6 @@
  */
 
 require_once('../../../lib/base.php');
-$l10n = new OC_L10N('contacts');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 $addressbook = OC_Contacts_App::getAddressbook($_GET['bookid']);
diff --git a/apps/contacts/ajax/importdialog.php b/apps/contacts/ajax/importdialog.php
index 17b4cebdbd1..280e462f662 100644
--- a/apps/contacts/ajax/importdialog.php
+++ b/apps/contacts/ajax/importdialog.php
@@ -9,7 +9,6 @@
 require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
-$l10n = new OC_L10N('contacts');
 $tmpl = new OC_Template('contacts', 'part.import');
 $tmpl->assign('path', $_POST['path']);
 $tmpl->assign('filename', $_POST['filename']);
diff --git a/apps/contacts/ajax/loadphoto.php b/apps/contacts/ajax/loadphoto.php
index d9f7e737b55..358e046942b 100644
--- a/apps/contacts/ajax/loadphoto.php
+++ b/apps/contacts/ajax/loadphoto.php
@@ -26,7 +26,6 @@ require_once('../../../lib/base.php');
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
-$l=new OC_L10N('contacts');
 
 // foreach ($_POST as $key=>$element) {
 // 	OC_Log::write('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OC_Log::DEBUG);
diff --git a/apps/contacts/ajax/messagebox.php b/apps/contacts/ajax/messagebox.php
index b3cad947674..408e7a537aa 100644
--- a/apps/contacts/ajax/messagebox.php
+++ b/apps/contacts/ajax/messagebox.php
@@ -7,7 +7,6 @@
  */
 
 require_once('../../../lib/base.php');
-$l10n = new OC_L10N('contacts');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index 7b7384723cd..1a84f6fdfae 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -28,7 +28,6 @@ OC_Log::write('contacts','ajax/savecrop.php: Huzzah!!!', OC_Log::DEBUG);
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
-$l=new OC_L10N('contacts');
 
 // foreach ($_POST as $key=>$element) {
 // 	OC_Log::write('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OC_Log::DEBUG);
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index 8f575c6b81e..6c8132c1dbf 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -26,7 +26,6 @@ require_once('../../../lib/base.php');
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
-$l=new OC_L10N('contacts');
 
 function bailOut($msg) {
 	OC_JSON::error(array('data' => array('message' => $msg)));
@@ -59,24 +58,24 @@ if(is_array($value)){ // FIXME: How to strip_tags for compound values?
 	$value = trim(strip_tags($value));
 }
 if(!$id) {
-	bailOut($l->t('id is not set.'));
+	bailOut(OC_Contacts_App::$l10n->t('id is not set.'));
 }
 if(!$checksum) {
-	bailOut($l->t('checksum is not set.'));
+	bailOut(OC_Contacts_App::$l10n->t('checksum is not set.'));
 }
 if(!$name) {
-	bailOut($l->t('element name is not set.'));
+	bailOut(OC_Contacts_App::$l10n->t('element name is not set.'));
 }
 
 $vcard = OC_Contacts_App::getContactVCard( $id );
 $line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
 if(is_null($line)) {
-	bailOut($l->t('Information about vCard is incorrect. Please reload the page.'.$checksum.' "'.$line.'"'));
+	bailOut(OC_Contacts_App::$l10n->t('Information about vCard is incorrect. Please reload the page.'.$checksum.' "'.$line.'"'));
 }
 $element = $vcard->children[$line]->name;
 
 if($element != $name) {
-	bailOut($l->t('Something went FUBAR. ').$name.' != '.$element);
+	bailOut(OC_Contacts_App::$l10n->t('Something went FUBAR. ').$name.' != '.$element);
 }
 
 switch($element) {
@@ -123,7 +122,7 @@ $checksum = md5($vcard->children[$line]->serialize());
 debug('New checksum: '.$checksum);
 
 if(!OC_Contacts_VCard::edit($id,$vcard->serialize())) {
-	OC_JSON::error(array('data' => array('message' => $l->t('Error updating contact property.'))));
+	OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error updating contact property.'))));
 	OC_Log::write('contacts','ajax/setproperty.php: Error updating contact property: '.$value, OC_Log::ERROR);
 	exit();
 }
diff --git a/apps/contacts/ajax/showsetproperty.php b/apps/contacts/ajax/showsetproperty.php
index 577230e4566..73bef655351 100644
--- a/apps/contacts/ajax/showsetproperty.php
+++ b/apps/contacts/ajax/showsetproperty.php
@@ -34,8 +34,7 @@ $vcard = OC_Contacts_App::getContactVCard( $id );
 
 $line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
 if(is_null($line)){
-	$l=new OC_L10N('contacts');
-	OC_JSON::error(array('data' => array( 'message' => $l->t('Information about vCard is incorrect. Please reload the page.'))));
+	OC_JSON::error(array('data' => array( 'message' => OC_Contacts_App::$l10n->t('Information about vCard is incorrect. Please reload the page.'))));
 	exit();
 }
 
diff --git a/apps/contacts/ajax/updateaddressbook.php b/apps/contacts/ajax/updateaddressbook.php
index d6c1ad179bb..b43b5b93a32 100644
--- a/apps/contacts/ajax/updateaddressbook.php
+++ b/apps/contacts/ajax/updateaddressbook.php
@@ -8,8 +8,6 @@
 
 require_once('../../../lib/base.php');
 
-$l10n = new OC_L10N('contacts');
-
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index 62cd32f5dbb..9780df46476 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -94,14 +94,13 @@ if (!isset($_FILES['imagefile'])) {
 }
 $error = $_FILES['imagefile']['error'];
 if($error !== UPLOAD_ERR_OK) {
-	$l=new OC_L10N('contacts');
 	$errors = array(
-		0=>$l->t("There is no error, the file uploaded with success"),
-		1=>$l->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'),
-		2=>$l->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
-		3=>$l->t("The uploaded file was only partially uploaded"),
-		4=>$l->t("No file was uploaded"),
-		6=>$l->t("Missing a temporary folder")
+		0=>OC_Contacts_App::$l10n->t("There is no error, the file uploaded with success"),
+		1=>OC_Contacts_App::$l10n->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'),
+		2=>OC_Contacts_App::$l10n->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
+		3=>OC_Contacts_App::$l10n->t("The uploaded file was only partially uploaded"),
+		4=>OC_Contacts_App::$l10n->t("No file was uploaded"),
+		6=>OC_Contacts_App::$l10n->t("Missing a temporary folder")
 	);
 	bailOut($errors[$error]);
 }
diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index 23a5a4253d0..9e424aa89f8 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -1,6 +1,4 @@
 <?php
-$l=new OC_L10N('contacts');
-
 OC::$CLASSPATH['OC_Contacts_App'] = 'apps/contacts/lib/app.php';
 OC::$CLASSPATH['OC_Contacts_Addressbook'] = 'apps/contacts/lib/addressbook.php';
 OC::$CLASSPATH['OC_Contacts_VCard'] = 'apps/contacts/lib/vcard.php';
@@ -18,9 +16,9 @@ OC_App::addNavigationEntry( array(
   'order' => 10,
   'href' => OC_Helper::linkTo( 'contacts', 'index.php' ),
   'icon' => OC_Helper::imagePath( 'settings', 'users.svg' ),
-  'name' => $l->t('Contacts') ));
+  'name' => OC_Contacts_App::$l10n->t('Contacts') ));
 
 
 OC_APP::registerPersonal('contacts','settings');
 OC_UTIL::addScript('contacts', 'loader');
-require_once('apps/contacts/lib/search.php');
\ No newline at end of file
+require_once('apps/contacts/lib/search.php');
diff --git a/apps/contacts/templates/part.addcardform.php b/apps/contacts/templates/part.addcardform.php
index 17207d2ebcb..1ad4c18b35b 100644
--- a/apps/contacts/templates/part.addcardform.php
+++ b/apps/contacts/templates/part.addcardform.php
@@ -1,6 +1,3 @@
-<?php
-$l=new OC_L10N('contacts');
-?>
 <form id="contacts_addcardform">
 	<?php if(count($_['addressbooks'])==1): ?>
 		<input type="hidden" name="id" value="<?php echo $_['addressbooks'][0]['id']; ?>">
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 19e34fd3bb1..bca3d9cbc2a 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -1,5 +1,4 @@
 <?php
-$l=new OC_L10N('contacts');
 $id = isset($_['id']) ? $_['id'] : '';
 ?>
 <div id="card">
diff --git a/apps/contacts/templates/part.edit_name_dialog.php b/apps/contacts/templates/part.edit_name_dialog.php
index d525fd1f99b..bb774b62bd7 100644
--- a/apps/contacts/templates/part.edit_name_dialog.php
+++ b/apps/contacts/templates/part.edit_name_dialog.php
@@ -1,5 +1,4 @@
 <?php
-$l=new OC_L10N('contacts');
 $name = isset($_['name'])?$_['name']:'';
 //print_r($name);
 $id = isset($_['id'])?$_['id']:'';
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index b44db95b390..4f65afb1540 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -44,8 +44,6 @@ if(!function_exists('imagecreatefromjpeg')) {
 
 $id = $_GET['id'];
 
-$l10n = new OC_L10N('contacts');
-
 $contact = OC_Contacts_App::getContactVCard($id);
 
 // invalid vcard
-- 
GitLab


From f5385e4a63de85d777d20f93e56cbee859329608 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Feb 2012 16:12:46 +0100
Subject: [PATCH 464/546] Contacts: Add id to vars with id in them

---
 apps/contacts/export.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/contacts/export.php b/apps/contacts/export.php
index 750d77bcac8..fb3e0a41ae7 100644
--- a/apps/contacts/export.php
+++ b/apps/contacts/export.php
@@ -9,20 +9,20 @@
 require_once ("../../lib/base.php");
 OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
-$book = isset($_GET['bookid']) ? $_GET['bookid'] : NULL;
-$contact = isset($_GET['contactid']) ? $_GET['contactid'] : NULL;
+$bookid = isset($_GET['bookid']) ? $_GET['bookid'] : NULL;
+$contactid = isset($_GET['contactid']) ? $_GET['contactid'] : NULL;
 $nl = "\n";
-if(isset($book)){
-	$addressbook = OC_Contacts_App::getAddressbook($book);
-	$cardobjects = OC_Contacts_VCard::all($book);
+if(isset($bookid)){
+	$addressbook = OC_Contacts_App::getAddressbook($bookid);
+	$cardobjects = OC_Contacts_VCard::all($bookid);
 	header('Content-Type: text/directory');
 	header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $addressbook['displayname']) . '.vcf'); 
 
 	foreach($cardobjects as $card) {
 		echo $card['carddata'] . $nl;
 	}
-}elseif(isset($contact)){	
-	$data = OC_Contacts_App::getContactObject($contact);
+}elseif(isset($contactid)){
+	$data = OC_Contacts_App::getContactObject($contactid);
 	header('Content-Type: text/directory');
 	header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $data['fullname']) . '.vcf'); 
 	echo $data['carddata'];
-- 
GitLab


From a0bb6079c5169f7314b9c82983e7a019469c2a00 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 12 Feb 2012 15:42:05 +0000
Subject: [PATCH 465/546] Add description to texteditor info.xml  -fix oc-234

---
 apps/files_texteditor/appinfo/info.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_texteditor/appinfo/info.xml b/apps/files_texteditor/appinfo/info.xml
index 9ed9d207f46..da1cdba15dd 100644
--- a/apps/files_texteditor/appinfo/info.xml
+++ b/apps/files_texteditor/appinfo/info.xml
@@ -2,6 +2,7 @@
 <info>
 	<id>files_texteditor</id>
 	<name>Text Editor</name>
+	<description>Simple plain text editor based on Ace editor.</description>
 	<version>0.3</version>
 	<licence>AGPL</licence>
 	<author>Tom Needham</author>
-- 
GitLab


From 0917bdecddd74a48ee2b21f18e184c579d156b62 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Feb 2012 17:20:30 +0100
Subject: [PATCH 466/546] Contacts: Move response caching to OC_Response

---
 apps/contacts/lib/app.php   |  8 ++++++
 apps/contacts/photo.php     |  9 +++----
 apps/contacts/thumbnail.php | 22 ++-------------
 lib/response.php            | 54 +++++++++++++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 25 deletions(-)
 create mode 100644 lib/response.php

diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index d8d1d3ac047..b804983efa5 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -152,4 +152,12 @@ class OC_Contacts_App {
 			);
 		}
 	}
+
+	public static function setLastModifiedHeader() {
+		$rev = $contact->getAsString('REV');
+		if ($rev) {
+			$rev = DateTime::createFromFormat(DateTime::W3C, $rev);
+			OC_Response::setLastModifiedHeader($rev);
+		}
+	}
 }
diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index 0b7769ebe07..314bce7cecc 100644
--- a/apps/contacts/photo.php
+++ b/apps/contacts/photo.php
@@ -14,9 +14,6 @@ OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 
 $id = $_GET['id'];
-if(isset($GET['refresh'])) {
-	header("Cache-Control: no-cache, no-store, must-revalidate");
-}
 
 $contact = OC_Contacts_App::getContactVCard($id);
 $image = new OC_Image();
@@ -24,16 +21,18 @@ $image = new OC_Image();
 if( is_null($contact)) {
 	OC_Log::write('contacts','photo.php. The VCard for ID '.$id.' is not RFC compatible',OC_Log::ERROR);
 } else {
+	OC_Contacts_App::setLastModifiedHeader($contact);
+
 	// Photo :-)
 	if($image->loadFromBase64($contact->getAsString('PHOTO'))) {
 		// OK
-		header('ETag: '.md5($contact->getAsString('PHOTO')));
+		OC_Response::setETagHeader(md5($contact->getAsString('PHOTO')));
 	}
 	else
 	// Logo :-/
 	if($image->loadFromBase64($contact->getAsString('LOGO'))) {
 		// OK
-		header('ETag: '.md5($contact->getAsString('LOGO')));
+		OC_Response::setETagHeader(md5($contact->getAsString('LOGO')));
 	}
 	if ($image->valid()) {
 		$max_size = 200;
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index 4f65afb1540..d7043b75f04 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -58,27 +58,9 @@ $thumbnail_size = 23;
 // Find the photo from VCard.
 $image = new OC_Image();
 $photo = $contact->getAsString('PHOTO');
-$etag = md5($photo);
-$rev_string = $contact->getAsString('REV');
-if ($rev_string) {
-	$rev = DateTime::createFromFormat(DateTime::W3C, $rev_string);
-	$last_modified_time = $rev->format(DateTime::RFC2822);
-} else {
-	$last_modified_time = null;
-}
 
-header('Cache-Control: cache');
-header('Pragma: cache');
-if ($rev_string) {
-	header('Last-Modified: '.$last_modified_time);
-}
-header('ETag: '.$etag);
-
-if (@trim($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $last_modified_time ||
-    @trim($_SERVER['HTTP_IF_NONE_MATCH']) == $etag) {
-	header('HTTP/1.1 304 Not Modified');
-	exit;
-}
+OC_Response::setETagHeader(md5($photo));
+OC_Contacts_App::setLastModifiedHeader($contact);
 
 if($image->loadFromBase64($photo)) {
 	if($image->centerCrop()) {
diff --git a/lib/response.php b/lib/response.php
new file mode 100644
index 00000000000..c254ddd10e7
--- /dev/null
+++ b/lib/response.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright (c) 2011 Bart Visscher bartv@thisnet.nl
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_Response {
+	const STATUS_NOT_MODIFIED = 304;
+
+	static public function enableCaching() {
+		header('Cache-Control: cache');
+		header('Pragma: cache');
+	}
+
+	static public function setStatus($status) {
+		switch($status) {
+			case self::STATUS_NOT_MODIFIED:
+				$status = $status . ' Not Modified';
+				break;
+		}
+		header($_SERVER["SERVER_PROTOCOL"].' '.$status);
+	}
+
+	static public function setETagHeader($etag) {
+		if (empty($etag)) {
+			return;
+		}
+		self::enableCaching();
+		if (isset($_SERVER['HTTP_IF_NONE_MATCH']) &&
+		    trim($_SERVER['HTTP_IF_NONE_MATCH']) == $etag) {
+			self::setStatus(self::STATUS_NOT_MODIFIED);
+			exit;
+		}
+		header('ETag: '.$etag);
+	}
+
+	static public function setLastModifiedHeader($lastModified) {
+		if (empty($lastModified)) {
+			return;
+		}
+		if ($lastModified instanceof DateTime) {
+			$lastModified = $lastModified->format(DateTime::RFC2822);
+		}
+		self::enableCaching();
+		if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) &&
+		    trim($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $lastModified) {
+			self::setStatus(self::STATUS_NOT_MODIFIED);
+			exit;
+		}
+		header('Last-Modified: '.$lastModified);
+	}
+}
-- 
GitLab


From 357944693017572319334aa8943e888cde0e99c0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 12 Feb 2012 18:06:32 +0100
Subject: [PATCH 467/546] use SimpleTest for unit testing

includes some tests for storage providers, more to come
---
 .../HELP_MY_TESTS_DONT_WORK_ANYMORE           |  399 ++++
 3rdparty/simpletest/LICENSE                   |  502 +++++
 3rdparty/simpletest/README                    |  102 +
 3rdparty/simpletest/VERSION                   |    1 +
 3rdparty/simpletest/arguments.php             |  224 +++
 3rdparty/simpletest/authentication.php        |  237 +++
 3rdparty/simpletest/autorun.php               |  101 +
 3rdparty/simpletest/browser.php               | 1144 +++++++++++
 3rdparty/simpletest/collector.php             |  122 ++
 3rdparty/simpletest/compatibility.php         |  166 ++
 3rdparty/simpletest/cookies.php               |  380 ++++
 3rdparty/simpletest/default_reporter.php      |  163 ++
 3rdparty/simpletest/detached.php              |   96 +
 .../docs/en/authentication_documentation.html |  378 ++++
 .../docs/en/browser_documentation.html        |  501 +++++
 3rdparty/simpletest/docs/en/docs.css          |  121 ++
 .../docs/en/expectation_documentation.html    |  476 +++++
 .../docs/en/form_testing_documentation.html   |  351 ++++
 .../docs/en/group_test_documentation.html     |  252 +++
 3rdparty/simpletest/docs/en/index.html        |  542 ++++++
 .../docs/en/mock_objects_documentation.html   |  870 +++++++++
 3rdparty/simpletest/docs/en/overview.html     |  487 +++++
 .../docs/en/partial_mocks_documentation.html  |  457 +++++
 .../docs/en/reporter_documentation.html       |  616 ++++++
 .../docs/en/unit_test_documentation.html      |  442 +++++
 .../docs/en/web_tester_documentation.html     |  588 ++++++
 .../docs/fr/authentication_documentation.html |  372 ++++
 .../docs/fr/browser_documentation.html        |  500 +++++
 3rdparty/simpletest/docs/fr/docs.css          |   84 +
 .../docs/fr/expectation_documentation.html    |  451 +++++
 .../docs/fr/form_testing_documentation.html   |  363 ++++
 .../docs/fr/group_test_documentation.html     |  265 +++
 3rdparty/simpletest/docs/fr/index.html        |  576 ++++++
 .../docs/fr/mock_objects_documentation.html   |  933 +++++++++
 3rdparty/simpletest/docs/fr/overview.html     |  321 +++
 .../docs/fr/partial_mocks_documentation.html  |  475 +++++
 .../docs/fr/reporter_documentation.html       |  630 ++++++
 .../docs/fr/unit_test_documentation.html      |  447 +++++
 .../docs/fr/web_tester_documentation.html     |  570 ++++++
 3rdparty/simpletest/dumper.php                |  407 ++++
 3rdparty/simpletest/eclipse.php               |  307 +++
 3rdparty/simpletest/encoding.php              |  649 +++++++
 3rdparty/simpletest/errors.php                |  267 +++
 3rdparty/simpletest/exceptions.php            |  226 +++
 3rdparty/simpletest/expectation.php           |  984 ++++++++++
 .../simpletest/extensions/pear_test_case.php  |  196 ++
 3rdparty/simpletest/extensions/testdox.php    |   53 +
 .../simpletest/extensions/testdox/test.php    |  107 +
 3rdparty/simpletest/form.php                  |  361 ++++
 3rdparty/simpletest/frames.php                |  592 ++++++
 3rdparty/simpletest/http.php                  |  628 ++++++
 3rdparty/simpletest/invoker.php               |  139 ++
 3rdparty/simpletest/mock_objects.php          | 1641 ++++++++++++++++
 3rdparty/simpletest/page.php                  |  542 ++++++
 3rdparty/simpletest/php_parser.php            | 1054 ++++++++++
 3rdparty/simpletest/recorder.php              |  101 +
 3rdparty/simpletest/reflection_php4.php       |  136 ++
 3rdparty/simpletest/reflection_php5.php       |  386 ++++
 3rdparty/simpletest/remote.php                |  115 ++
 3rdparty/simpletest/reporter.php              |  445 +++++
 3rdparty/simpletest/scorer.php                |  875 +++++++++
 3rdparty/simpletest/selector.php              |  141 ++
 3rdparty/simpletest/shell_tester.php          |  330 ++++
 3rdparty/simpletest/simpletest.php            |  391 ++++
 3rdparty/simpletest/socket.php                |  312 +++
 3rdparty/simpletest/tag.php                   | 1527 +++++++++++++++
 3rdparty/simpletest/test/acceptance_test.php  | 1729 +++++++++++++++++
 3rdparty/simpletest/test/adapter_test.php     |   50 +
 3rdparty/simpletest/test/all_tests.php        |   13 +
 3rdparty/simpletest/test/arguments_test.php   |   82 +
 .../simpletest/test/authentication_test.php   |  145 ++
 3rdparty/simpletest/test/autorun_test.php     |   23 +
 3rdparty/simpletest/test/bad_test_suite.php   |   10 +
 3rdparty/simpletest/test/browser_test.php     |  802 ++++++++
 3rdparty/simpletest/test/collector_test.php   |   50 +
 .../simpletest/test/command_line_test.php     |   40 +
 .../simpletest/test/compatibility_test.php    |   87 +
 3rdparty/simpletest/test/cookies_test.php     |  227 +++
 3rdparty/simpletest/test/detached_test.php    |   15 +
 3rdparty/simpletest/test/dumper_test.php      |   88 +
 3rdparty/simpletest/test/eclipse_test.php     |   32 +
 3rdparty/simpletest/test/encoding_test.php    |  240 +++
 3rdparty/simpletest/test/errors_test.php      |  229 +++
 3rdparty/simpletest/test/exceptions_test.php  |  183 ++
 3rdparty/simpletest/test/expectation_test.php |  317 +++
 3rdparty/simpletest/test/form_test.php        |  344 ++++
 3rdparty/simpletest/test/frames_test.php      |  549 ++++++
 3rdparty/simpletest/test/http_test.php        |  492 +++++
 3rdparty/simpletest/test/interfaces_test.php  |  137 ++
 .../test/interfaces_test_php5_1.php           |   14 +
 3rdparty/simpletest/test/live_test.php        |   47 +
 .../simpletest/test/mock_objects_test.php     |  985 ++++++++++
 3rdparty/simpletest/test/page_test.php        |  166 ++
 3rdparty/simpletest/test/parse_error_test.php |    9 +
 3rdparty/simpletest/test/parsing_test.php     |  642 ++++++
 3rdparty/simpletest/test/php_parser_test.php  |  489 +++++
 3rdparty/simpletest/test/recorder_test.php    |   23 +
 .../simpletest/test/reflection_php5_test.php  |  263 +++
 3rdparty/simpletest/test/remote_test.php      |   19 +
 3rdparty/simpletest/test/shell_test.php       |   38 +
 .../simpletest/test/shell_tester_test.php     |   42 +
 3rdparty/simpletest/test/simpletest_test.php  |   58 +
 3rdparty/simpletest/test/site/file.html       |    6 +
 3rdparty/simpletest/test/socket_test.php      |   25 +
 .../test/support/collector/collectable.1      |    0
 .../test/support/collector/collectable.2      |    0
 .../test/support/empty_test_file.php          |    3 +
 .../simpletest/test/support/failing_test.php  |    9 +
 .../simpletest/test/support/latin1_sample     |    1 +
 .../simpletest/test/support/passing_test.php  |    9 +
 .../test/support/recorder_sample.php          |   14 +
 .../simpletest/test/support/spl_examples.php  |   15 +
 .../support/supplementary_upload_sample.txt   |    1 +
 3rdparty/simpletest/test/support/test1.php    |    7 +
 .../simpletest/test/support/upload_sample.txt |    1 +
 3rdparty/simpletest/test/tag_test.php         |  554 ++++++
 .../simpletest/test/test_with_parse_error.php |    8 +
 3rdparty/simpletest/test/unit_tester_test.php |   61 +
 3rdparty/simpletest/test/unit_tests.php       |   49 +
 3rdparty/simpletest/test/url_test.php         |  515 +++++
 3rdparty/simpletest/test/user_agent_test.php  |  348 ++++
 3rdparty/simpletest/test/visual_test.php      |  495 +++++
 3rdparty/simpletest/test/web_tester_test.php  |  155 ++
 3rdparty/simpletest/test/xml_test.php         |  187 ++
 3rdparty/simpletest/test_case.php             |  658 +++++++
 3rdparty/simpletest/tidy_parser.php           |  382 ++++
 3rdparty/simpletest/unit_tester.php           |  413 ++++
 3rdparty/simpletest/url.php                   |  550 ++++++
 3rdparty/simpletest/user_agent.php            |  328 ++++
 3rdparty/simpletest/web_tester.php            | 1532 +++++++++++++++
 3rdparty/simpletest/xml.php                   |  647 ++++++
 lib/base.php                                  |    3 +
 lib/testcase.php                              |   93 -
 tests/index.php                               |   77 +-
 tests/lib/filestorage.php                     |   63 +
 tests/lib/filestorage/local.php               |   41 +
 tests/lib/filesystem.php                      |  222 ---
 tests/templates/index.php                     |   11 -
 138 files changed, 44403 insertions(+), 376 deletions(-)
 create mode 100755 3rdparty/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
 create mode 100755 3rdparty/simpletest/LICENSE
 create mode 100755 3rdparty/simpletest/README
 create mode 100755 3rdparty/simpletest/VERSION
 create mode 100755 3rdparty/simpletest/arguments.php
 create mode 100644 3rdparty/simpletest/authentication.php
 create mode 100644 3rdparty/simpletest/autorun.php
 create mode 100644 3rdparty/simpletest/browser.php
 create mode 100644 3rdparty/simpletest/collector.php
 create mode 100755 3rdparty/simpletest/compatibility.php
 create mode 100644 3rdparty/simpletest/cookies.php
 create mode 100644 3rdparty/simpletest/default_reporter.php
 create mode 100755 3rdparty/simpletest/detached.php
 create mode 100644 3rdparty/simpletest/docs/en/authentication_documentation.html
 create mode 100644 3rdparty/simpletest/docs/en/browser_documentation.html
 create mode 100755 3rdparty/simpletest/docs/en/docs.css
 create mode 100644 3rdparty/simpletest/docs/en/expectation_documentation.html
 create mode 100644 3rdparty/simpletest/docs/en/form_testing_documentation.html
 create mode 100644 3rdparty/simpletest/docs/en/group_test_documentation.html
 create mode 100644 3rdparty/simpletest/docs/en/index.html
 create mode 100644 3rdparty/simpletest/docs/en/mock_objects_documentation.html
 create mode 100644 3rdparty/simpletest/docs/en/overview.html
 create mode 100644 3rdparty/simpletest/docs/en/partial_mocks_documentation.html
 create mode 100644 3rdparty/simpletest/docs/en/reporter_documentation.html
 create mode 100644 3rdparty/simpletest/docs/en/unit_test_documentation.html
 create mode 100644 3rdparty/simpletest/docs/en/web_tester_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/authentication_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/browser_documentation.html
 create mode 100755 3rdparty/simpletest/docs/fr/docs.css
 create mode 100644 3rdparty/simpletest/docs/fr/expectation_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/form_testing_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/group_test_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/index.html
 create mode 100644 3rdparty/simpletest/docs/fr/mock_objects_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/overview.html
 create mode 100644 3rdparty/simpletest/docs/fr/partial_mocks_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/reporter_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/unit_test_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/web_tester_documentation.html
 create mode 100755 3rdparty/simpletest/dumper.php
 create mode 100644 3rdparty/simpletest/eclipse.php
 create mode 100644 3rdparty/simpletest/encoding.php
 create mode 100644 3rdparty/simpletest/errors.php
 create mode 100755 3rdparty/simpletest/exceptions.php
 create mode 100755 3rdparty/simpletest/expectation.php
 create mode 100755 3rdparty/simpletest/extensions/pear_test_case.php
 create mode 100755 3rdparty/simpletest/extensions/testdox.php
 create mode 100755 3rdparty/simpletest/extensions/testdox/test.php
 create mode 100644 3rdparty/simpletest/form.php
 create mode 100755 3rdparty/simpletest/frames.php
 create mode 100644 3rdparty/simpletest/http.php
 create mode 100755 3rdparty/simpletest/invoker.php
 create mode 100755 3rdparty/simpletest/mock_objects.php
 create mode 100755 3rdparty/simpletest/page.php
 create mode 100755 3rdparty/simpletest/php_parser.php
 create mode 100644 3rdparty/simpletest/recorder.php
 create mode 100644 3rdparty/simpletest/reflection_php4.php
 create mode 100644 3rdparty/simpletest/reflection_php5.php
 create mode 100644 3rdparty/simpletest/remote.php
 create mode 100755 3rdparty/simpletest/reporter.php
 create mode 100644 3rdparty/simpletest/scorer.php
 create mode 100755 3rdparty/simpletest/selector.php
 create mode 100644 3rdparty/simpletest/shell_tester.php
 create mode 100644 3rdparty/simpletest/simpletest.php
 create mode 100755 3rdparty/simpletest/socket.php
 create mode 100644 3rdparty/simpletest/tag.php
 create mode 100644 3rdparty/simpletest/test/acceptance_test.php
 create mode 100755 3rdparty/simpletest/test/adapter_test.php
 create mode 100755 3rdparty/simpletest/test/all_tests.php
 create mode 100755 3rdparty/simpletest/test/arguments_test.php
 create mode 100755 3rdparty/simpletest/test/authentication_test.php
 create mode 100755 3rdparty/simpletest/test/autorun_test.php
 create mode 100755 3rdparty/simpletest/test/bad_test_suite.php
 create mode 100755 3rdparty/simpletest/test/browser_test.php
 create mode 100755 3rdparty/simpletest/test/collector_test.php
 create mode 100755 3rdparty/simpletest/test/command_line_test.php
 create mode 100755 3rdparty/simpletest/test/compatibility_test.php
 create mode 100755 3rdparty/simpletest/test/cookies_test.php
 create mode 100755 3rdparty/simpletest/test/detached_test.php
 create mode 100755 3rdparty/simpletest/test/dumper_test.php
 create mode 100755 3rdparty/simpletest/test/eclipse_test.php
 create mode 100755 3rdparty/simpletest/test/encoding_test.php
 create mode 100755 3rdparty/simpletest/test/errors_test.php
 create mode 100755 3rdparty/simpletest/test/exceptions_test.php
 create mode 100755 3rdparty/simpletest/test/expectation_test.php
 create mode 100755 3rdparty/simpletest/test/form_test.php
 create mode 100755 3rdparty/simpletest/test/frames_test.php
 create mode 100755 3rdparty/simpletest/test/http_test.php
 create mode 100755 3rdparty/simpletest/test/interfaces_test.php
 create mode 100755 3rdparty/simpletest/test/interfaces_test_php5_1.php
 create mode 100755 3rdparty/simpletest/test/live_test.php
 create mode 100755 3rdparty/simpletest/test/mock_objects_test.php
 create mode 100755 3rdparty/simpletest/test/page_test.php
 create mode 100755 3rdparty/simpletest/test/parse_error_test.php
 create mode 100755 3rdparty/simpletest/test/parsing_test.php
 create mode 100755 3rdparty/simpletest/test/php_parser_test.php
 create mode 100755 3rdparty/simpletest/test/recorder_test.php
 create mode 100755 3rdparty/simpletest/test/reflection_php5_test.php
 create mode 100755 3rdparty/simpletest/test/remote_test.php
 create mode 100755 3rdparty/simpletest/test/shell_test.php
 create mode 100755 3rdparty/simpletest/test/shell_tester_test.php
 create mode 100755 3rdparty/simpletest/test/simpletest_test.php
 create mode 100755 3rdparty/simpletest/test/site/file.html
 create mode 100755 3rdparty/simpletest/test/socket_test.php
 create mode 100755 3rdparty/simpletest/test/support/collector/collectable.1
 create mode 100755 3rdparty/simpletest/test/support/collector/collectable.2
 create mode 100755 3rdparty/simpletest/test/support/empty_test_file.php
 create mode 100755 3rdparty/simpletest/test/support/failing_test.php
 create mode 100755 3rdparty/simpletest/test/support/latin1_sample
 create mode 100755 3rdparty/simpletest/test/support/passing_test.php
 create mode 100755 3rdparty/simpletest/test/support/recorder_sample.php
 create mode 100755 3rdparty/simpletest/test/support/spl_examples.php
 create mode 100755 3rdparty/simpletest/test/support/supplementary_upload_sample.txt
 create mode 100755 3rdparty/simpletest/test/support/test1.php
 create mode 100755 3rdparty/simpletest/test/support/upload_sample.txt
 create mode 100755 3rdparty/simpletest/test/tag_test.php
 create mode 100755 3rdparty/simpletest/test/test_with_parse_error.php
 create mode 100755 3rdparty/simpletest/test/unit_tester_test.php
 create mode 100755 3rdparty/simpletest/test/unit_tests.php
 create mode 100755 3rdparty/simpletest/test/url_test.php
 create mode 100755 3rdparty/simpletest/test/user_agent_test.php
 create mode 100755 3rdparty/simpletest/test/visual_test.php
 create mode 100755 3rdparty/simpletest/test/web_tester_test.php
 create mode 100755 3rdparty/simpletest/test/xml_test.php
 create mode 100644 3rdparty/simpletest/test_case.php
 create mode 100755 3rdparty/simpletest/tidy_parser.php
 create mode 100755 3rdparty/simpletest/unit_tester.php
 create mode 100644 3rdparty/simpletest/url.php
 create mode 100644 3rdparty/simpletest/user_agent.php
 create mode 100644 3rdparty/simpletest/web_tester.php
 create mode 100755 3rdparty/simpletest/xml.php
 delete mode 100644 lib/testcase.php
 create mode 100644 tests/lib/filestorage.php
 create mode 100644 tests/lib/filestorage/local.php
 delete mode 100644 tests/lib/filesystem.php
 delete mode 100644 tests/templates/index.php

diff --git a/3rdparty/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE b/3rdparty/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
new file mode 100755
index 00000000000..a65e83e8762
--- /dev/null
+++ b/3rdparty/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
@@ -0,0 +1,399 @@
+Simple Test interface changes
+=============================
+Because the SimpleTest tool set is still evolving it is likely that tests
+written with earlier versions will fail with the newest ones. The most
+dramatic changes are in the alpha releases. Here is a list of possible
+problems and their fixes...
+
+assertText() no longer finds a string inside a <script> tag
+-----------------------------------------------------------
+The assertText() method is intended to match only visible,
+human-readable text on the web page. Therefore, the contents of script
+tags should not be matched by this assertion. However there was a bug
+in the text normalisation code of simpletest which meant that <script>
+tags spanning multiple lines would not have their content stripped
+out. If you want to check the content of a <script> tag, use
+assertPattern(), or write a custom expectation.
+
+Overloaded method not working
+-----------------------------
+All protected and private methods had underscores
+removed. This means that any private/protected methods that
+you overloaded with those names need to be updated.
+
+Fatal error: Call to undefined method Classname::classname()
+------------------------------------------------------------
+SimpleTest renamed all of its constructors from 
+Classname to __construct; derived classes invoking
+their parent constructors should replace parent::Classname()
+with parent::__construct().
+
+Custom CSS in HtmlReporter not being applied
+--------------------------------------------
+Batch rename of protected and private methods 
+means that _getCss() was renamed to getCss().
+Please rename your method and it should work again.
+
+setReturnReference() throws errors in E_STRICT
+----------------------------------------------
+Happens when an object is passed by reference.
+This also happens with setReturnReferenceAt().
+If you want to return objects then replace these
+with calls to returns() and returnsAt() with the
+same arguments. This change was forced in the 1.1
+version for E_STRICT compatibility.
+
+assertReference() throws errors in E_STRICT
+-------------------------------------------
+Due to language restrictions you cannot compare
+both variables and objects in E_STRICT mode. Use
+assertSame() in this mode with objects. This change
+was forced the 1.1 version.
+
+Cannot create GroupTest
+-----------------------
+The GroupTest has been renamed TestSuite (see below).
+It was removed completely in 1.1 in favour of this
+name.
+
+No method getRelativeUrls() or getAbsoluteUrls()
+------------------------------------------------
+These methods were always a bit weird anyway, and
+the new parsing of the base tag makes them more so.
+They have been replaced with getUrls() instead. If
+you want the old functionality then simply chop
+off the current domain from getUrls().
+
+Method setWildcard() removed in mocks
+-------------------------------------
+Even setWildcard() has been removed in 1.0.1beta now.
+If you want to test explicitely for a '*' string, then
+simply pass in new IdenticalExpectation('*') instead.
+
+No method _getTest() on mocks
+-----------------------------
+This has finally been removed. It was a pretty esoteric
+flex point anyway. It was there to allow the mocks to
+work with other test tools, but no one does this.
+
+No method assertError(), assertNoErrors(), swallowErrors()
+----------------------------------------------------------
+These have been deprecated in 1.0.1beta in favour of
+expectError() and expectException(). assertNoErrors() is
+redundant if you use expectError() as failures are now reported
+immediately.
+
+No method TestCase::signal()
+----------------------------
+This has been deprecated in favour of triggering an error or
+throwing an exception. Deprecated as of 1.0.1beta.
+
+No method TestCase::sendMessage()
+---------------------------------
+This has been deprecated as of 1.0.1beta.
+
+Failure to connect now emits failures
+-------------------------------------
+It used to be that you would have to use the
+getTransferError() call on the web tester to see if
+there was a socket level error in a fetch. This check
+is now always carried out by the WebTestCase unless
+the fetch is prefaced with WebTestCase::ignoreErrors().
+The ignore directive only lasts for the next fetching
+action such as get() and click().
+
+No method SimpleTestOptions::ignore()
+-------------------------------------
+This is deprecated in version 1.0.1beta and has been moved
+to SimpleTest::ignore() as that is more readable. In
+addition, parent classes are also ignored automatically.
+If you are using PHP5 you can skip this directive simply
+by marking your test case as abstract.
+
+No method assertCopy()
+----------------------
+This is deprecated in 1.0.1 in favour of assertClone().
+The assertClone() method is slightly different in that
+the objects must be identical, but without being a
+reference. It is thus not a strict inversion of
+assertReference().
+
+Constructor wildcard override has no effect in mocks
+----------------------------------------------------
+As of 1.0.1beta this is now set with setWildcard() instead
+of in the constructor.
+
+No methods setStubBaseClass()/getStubBaseClass()
+------------------------------------------------
+As mocks are now used instead of stubs, these methods
+stopped working and are now removed as of the 1.0.1beta
+release. The mock objects may be freely used instead.
+
+No method addPartialMockCode()
+------------------------------
+The ability to insert arbitrary partial mock code
+has been removed. This was a low value feature
+causing needless complications. It was removed
+in the 1.0.1beta release.
+
+No method setMockBaseClass()
+----------------------------
+The ability to change the mock base class has been
+scheduled for removal and is deprecated since the
+1.0.1beta version. This was a rarely used feature
+except as a workaround for PHP5 limitations. As
+these limitations are being resolved it's hoped
+that the bundled mocks can be used directly.
+
+No class Stub
+-------------
+Server stubs are deprecated from 1.0.1 as the mocks now
+have exactly the same interface. Just use mock objects
+instead.
+
+No class SimpleTestOptions
+--------------------------
+This was replced by the shorter SimpleTest in 1.0.1beta1
+and is since deprecated.
+
+No file simple_test.php
+-----------------------
+This was renamed test_case.php in 1.0.1beta to more accurately
+reflect it's purpose. This file should never be directly
+included in test suites though, as it's part of the
+underlying mechanics and has a tendency to be refactored.
+
+No class WantedPatternExpectation
+---------------------------------
+This was deprecated in 1.0.1alpha in favour of the simpler
+name PatternExpectation.
+
+No class NoUnwantedPatternExpectation
+-------------------------------------
+This was deprecated in 1.0.1alpha in favour of the simpler
+name NoPatternExpectation.
+
+No method assertNoUnwantedPattern()
+-----------------------------------
+This has been renamed to assertNoPattern() in 1.0.1alpha and
+the old form is deprecated.
+
+No method assertWantedPattern()
+-------------------------------
+This has been renamed to assertPattern() in 1.0.1alpha and
+the old form is deprecated.
+
+No method assertExpectation()
+-----------------------------
+This was renamed as assert() in 1.0.1alpha and the old form
+has been deprecated.
+
+No class WildcardExpectation
+----------------------------
+This was a mostly internal class for the mock objects. It was
+renamed AnythingExpectation to bring it closer to JMock and
+NMock in version 1.0.1alpha.
+
+Missing UnitTestCase::assertErrorPattern()
+------------------------------------------
+This method is deprecated for version 1.0.1 onwards.
+This method has been subsumed by assertError() that can now
+take an expectation. Simply pass a PatternExpectation
+into assertError() to simulate the old behaviour.
+
+No HTML when matching page elements
+-----------------------------------
+This behaviour has been switched to using plain text as if it
+were seen by the user of the browser. This means that HTML tags
+are suppressed, entities are converted and whitespace is
+normalised. This should make it easier to match items in forms.
+Also images are replaced with their "alt" text so that they
+can be matched as well.
+
+No method SimpleRunner::_getTestCase()
+--------------------------------------
+This was made public as getTestCase() in 1.0RC2.
+
+No method restartSession()
+--------------------------
+This was renamed to restart() in the WebTestCase, SimpleBrowser
+and the underlying SimpleUserAgent in 1.0RC2. Because it was
+undocumented anyway, no attempt was made at backward
+compatibility.
+
+My custom test case ignored by tally()
+--------------------------------------
+The _assertTrue method has had it's signature changed due to a bug
+in the PHP 5.0.1 release. You must now use getTest() from within
+that method to get the test case. Mock compatibility with other
+unit testers is now deprecated as of 1.0.1alpha as PEAR::PHPUnit2
+should soon have mock support of it's own.
+
+Broken code extending SimpleRunner
+----------------------------------
+This was replaced with SimpleScorer so that I could use the runner
+name in another class. This happened in RC1 development and there
+is no easy backward compatibility fix. The solution is simply to
+extend SimpleScorer instead.
+
+Missing method getBaseCookieValue()
+-----------------------------------
+This was renamed getCurrentCookieValue() in RC1.
+
+Missing files from the SimpleTest suite
+---------------------------------------
+Versions of SimpleTest prior to Beta6 required a SIMPLE_TEST constant
+to point at the SimpleTest folder location before any of the toolset
+was loaded. This is no longer documented as it is now unnecessary
+for later versions. If you are using an earlier version you may
+need this constant. Consult the documentation that was bundled with
+the release that you are using or upgrade to Beta6 or later.
+
+No method SimpleBrowser::getCurrentUrl()
+--------------------------------------
+This is replaced with the more versatile showRequest() for
+debugging. It only existed in this context for version Beta5.
+Later versions will have SimpleBrowser::getHistory() for tracking
+paths through pages. It is renamed as getUrl() since 1.0RC1.
+
+No method Stub::setStubBaseClass()
+----------------------------------
+This method has finally been removed in 1.0RC1. Use
+SimpleTestOptions::setStubBaseClass() instead.
+
+No class CommandLineReporter
+----------------------------
+This was renamed to TextReporter in Beta3 and the deprecated version
+was removed in 1.0RC1.
+
+No method requireReturn()
+-------------------------
+This was deprecated in Beta3 and is now removed.
+
+No method expectCookie()
+------------------------
+This method was abruptly removed in Beta4 so as to simplify the internals
+until another mechanism can replace it. As a workaround it is necessary
+to assert that the cookie has changed by setting it before the page
+fetch and then assert the desired value.
+
+No method clickSubmitByFormId()
+-------------------------------
+This method had an incorrect name as no button was involved. It was
+renamed to submitByFormId() in Beta4 and the old version deprecated.
+Now removed.
+
+No method paintStart() or paintEnd()
+------------------------------------
+You should only get this error if you have subclassed the lower level
+reporting and test runner machinery. These methods have been broken
+down into events for test methods, events for test cases and events
+for group tests. The new methods are...
+
+paintStart() --> paintMethodStart(), paintCaseStart(), paintGroupStart()
+paintEnd() --> paintMethodEnd(), paintCaseEnd(), paintGroupEnd()
+
+This change was made in Beta3, ironically to make it easier to subclass
+the inner machinery. Simply duplicating the code you had in the previous
+methods should provide a temporary fix.
+
+No class TestDisplay
+--------------------
+This has been folded into SimpleReporter in Beta3 and is now deprecated.
+It was removed in RC1.
+
+No method WebTestCase::fetch()
+------------------------------
+This was renamed get() in Alpha8. It is removed in Beta3.
+
+No method submit()
+------------------
+This has been renamed clickSubmit() in Beta1. The old method was
+removed in Beta2.
+
+No method clearHistory()
+------------------------
+This method is deprecated in Beta2 and removed in RC1.
+
+No method getCallCount()
+------------------------
+This method has been deprecated since Beta1 and has now been
+removed. There are now more ways to set expectations on counts
+and so this method should be unecessery. Removed in RC1.
+
+Cannot find file *
+------------------
+The following public name changes have occoured...
+
+simple_html_test.php --> reporter.php
+simple_mock.php --> mock_objects.php
+simple_unit.php --> unit_tester.php
+simple_web.php --> web_tester.php
+
+The old names were deprecated in Alpha8 and removed in Beta1.
+
+No method attachObserver()
+--------------------------
+Prior to the Alpha8 release the old internal observer pattern was
+gutted and replaced with a visitor. This is to trade flexibility of
+test case expansion against the ease of writing user interfaces.
+
+Code such as...
+
+$test = &new MyTestCase();
+$test->attachObserver(new TestHtmlDisplay());
+$test->run();
+
+...should be rewritten as...
+
+$test = &new MyTestCase();
+$test->run(new HtmlReporter());
+
+If you previously attached multiple observers then the workaround
+is to run the tests twice, once with each, until they can be combined.
+For one observer the old method is simulated in Alpha 8, but is
+removed in Beta1.
+
+No class TestHtmlDisplay
+------------------------
+This class has been renamed to HtmlReporter in Alpha8. It is supported,
+but deprecated in Beta1 and removed in Beta2. If you have subclassed
+the display for your own design, then you will have to extend this
+class (HtmlReporter) instead.
+
+If you have accessed the event queue by overriding the notify() method
+then I am afraid you are in big trouble :(. The reporter is now
+carried around the test suite by the runner classes and the methods
+called directly. In the unlikely event that this is a problem and
+you don't want to upgrade the test tool then simplest is to write your
+own runner class and invoke the tests with...
+
+$test->accept(new MyRunner(new MyReporter()));
+
+...rather than the run method. This should be easier to extend
+anyway and gives much more control. Even this method is overhauled
+in Beta3 where the runner class can be set within the test case. Really
+the best thing to do is to upgrade to this version as whatever you were
+trying to achieve before should now be very much easier.
+
+Missing set options method
+--------------------------
+All test suite options are now in one class called SimpleTestOptions.
+This means that options are set differently...
+
+GroupTest::ignore() --> SimpleTestOptions::ignore()
+Mock::setMockBaseClass() --> SimpleTestOptions::setMockBaseClass()
+
+These changed in Alpha8 and the old versions are now removed in RC1.
+
+No method setExpected*()
+------------------------
+The mock expectations changed their names in Alpha4 and the old names
+ceased to be supported in Alpha8. The changes are...
+
+setExpectedArguments() --> expectArguments()
+setExpectedArgumentsSequence() --> expectArgumentsAt()
+setExpectedCallCount() --> expectCallCount()
+setMaximumCallCount() --> expectMaximumCallCount()
+
+The parameters remained the same.
diff --git a/3rdparty/simpletest/LICENSE b/3rdparty/simpletest/LICENSE
new file mode 100755
index 00000000000..09f465ab703
--- /dev/null
+++ b/3rdparty/simpletest/LICENSE
@@ -0,0 +1,502 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/3rdparty/simpletest/README b/3rdparty/simpletest/README
new file mode 100755
index 00000000000..40f41666d40
--- /dev/null
+++ b/3rdparty/simpletest/README
@@ -0,0 +1,102 @@
+SimpleTest
+==========
+
+You probably got this package from:
+
+    http://simpletest.org/en/download.html
+
+If there is no licence agreement with this package please download
+a version from the location above. You must read and accept that
+licence to use this software. The file is titled simply LICENSE.
+
+What is it? It's a framework for unit testing, web site testing and
+mock objects for PHP 5.0.5+.
+
+If you have used JUnit, you will find this PHP unit testing version very
+similar. Also included is a mock objects and server stubs generator.
+The stubs can have return values set for different arguments, can have
+sequences set also by arguments and can return items by reference.
+The mocks inherit all of this functionality and can also have
+expectations set, again in sequences and for different arguments.
+
+A web tester similar in concept to JWebUnit is also included. There is no
+JavaScript or tables support, but forms, authentication, cookies and
+frames are handled.
+
+You can see a release schedule at http://simpletest.org/en/overview.html
+which is also copied to the documentation folder with this release.
+A full PHPDocumenter API documentation exists at
+http://simpletest.org/api/.
+
+The user interface is minimal in the extreme, but a lot of information 
+flows from the test suite. After version 1.0 we will release a better 
+web UI, but we are leaving XUL and GTK versions to volunteers as 
+everybody has their own opinion on a good GUI, and we don't want to 
+discourage development by shipping one with the toolkit. You can 
+download an Eclipse plug-in separately. 
+
+The unit tests for SimpleTest itself can be run here:
+
+    test/unit_tests.php
+
+And tests involving live network connections as well are here:
+
+    test/all_tests.php
+
+The full tests will typically overrun the 8Mb limit often allowed
+to a PHP process. A workaround is to run the tests on the command
+with a custom php.ini file or with the switch -dmemory_limit=-1
+if you do not have access to your server version.
+
+The full tests read some test data from simpletest.org. If the site
+is down or has been modified for a later version then you will get
+spurious errors. A unit_tests.php failure on the other hand would be
+very serious. Please notify us if you find one.
+
+Even if all of the tests run please verify that your existing test suites
+also function as expected. The file:
+
+    HELP_MY_TESTS_DONT_WORK_ANYMORE
+
+...contains information on interface changes. It also points out
+deprecated interfaces, so you should read this even if all of
+your current tests appear to run.
+
+There is a documentation folder which contains the core reference information
+in English and French, although this information is fairly basic.
+You can find a tutorial on...
+
+    http://simpletest.org/en/first_test_tutorial.html
+
+...to get you started and this material will eventually become included
+with the project documentation. A French translation exists at:
+
+    http://simpletest.org/fr/first_test_tutorial.html
+
+If you download and use, and possibly even extend this tool, please let us
+know. Any feedback, even bad, is always welcome and we will work to get
+your suggestions into the next release. Ideally please send your
+comments to:
+
+    simpletest-support@lists.sourceforge.net
+
+...so that others can read them too. We usually try to respond within 48
+hours.
+
+There is no change log except at Sourceforge. You can visit the
+release notes to see the completed TODO list after each cycle and also the
+status of any bugs, but if the bug is recent then it will be fixed in SVN only.
+The SVN check-ins always have all the tests passing and so SVN snapshots should
+be pretty usable, although the code may not look so good internally.
+
+Oh, and one last thing: SimpleTest is called "Simple" because it should 
+be simple to use. We intend to add a complete set of tools for a test 
+first and "test as you code" type of development. "Simple" does not mean 
+"Lite" in this context. 
+
+Thanks to everyone who has sent comments and offered suggestions. They
+really are invaluable, but sadly you are too many to mention in full.
+Thanks to all on the advanced PHP forum on SitePoint, especially Harry
+Fuecks. Early adopters are always an inspiration.
+
+ -- Marcus Baker, Jason Sweat, Travis Swicegood, Perrick Penet and Edward Z. Yang.
diff --git a/3rdparty/simpletest/VERSION b/3rdparty/simpletest/VERSION
new file mode 100755
index 00000000000..9084fa2f716
--- /dev/null
+++ b/3rdparty/simpletest/VERSION
@@ -0,0 +1 @@
+1.1.0
diff --git a/3rdparty/simpletest/arguments.php b/3rdparty/simpletest/arguments.php
new file mode 100755
index 00000000000..89e7f9de6ef
--- /dev/null
+++ b/3rdparty/simpletest/arguments.php
@@ -0,0 +1,224 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: dumper.php 1909 2009-07-29 15:58:11Z dgheath $
+ */
+
+/**
+ *    Parses the command line arguments.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleArguments {
+    private $all = array();
+
+    /**
+     * Parses the command line arguments. The usual formats
+     * are supported:
+     * -f value
+     * -f=value
+     * --flag=value
+     * --flag value
+     * -f           (true)
+     * --flag       (true)
+     * @param array $arguments      Normally the PHP $argv.
+     */
+    function __construct($arguments) {
+        array_shift($arguments);
+        while (count($arguments) > 0) {
+            list($key, $value) = $this->parseArgument($arguments);
+            $this->assign($key, $value);
+        }
+    }
+
+    /**
+     * Sets the value in the argments object. If multiple
+     * values are added under the same key, the key will
+     * give an array value in the order they were added.
+     * @param string $key    The variable to assign to.
+     * @param string value   The value that would norally
+     *                       be colected on the command line.
+     */
+    function assign($key, $value) {
+        if ($this->$key === false) {
+            $this->all[$key] = $value;
+        } elseif (! is_array($this->$key)) {
+            $this->all[$key] = array($this->$key, $value);
+        } else {
+            $this->all[$key][] = $value;
+        }
+    }
+
+    /**
+     * Extracts the next key and value from the argument list.
+     * @param array $arguments      The remaining arguments to be parsed.
+     *                              The argument list will be reduced.
+     * @return array                Two item array of key and value.
+     *                              If no value can be found it will
+     *                              have the value true assigned instead.
+     */
+    private function parseArgument(&$arguments) {
+        $argument = array_shift($arguments);
+        if (preg_match('/^-(\w)=(.+)$/', $argument, $matches)) {
+            return array($matches[1], $matches[2]);
+        } elseif (preg_match('/^-(\w)$/', $argument, $matches)) {
+            return array($matches[1], $this->nextNonFlagElseTrue($arguments));
+        } elseif (preg_match('/^--(\w+)=(.+)$/', $argument, $matches)) {
+            return array($matches[1], $matches[2]);
+        } elseif (preg_match('/^--(\w+)$/', $argument, $matches)) {
+            return array($matches[1], $this->nextNonFlagElseTrue($arguments));
+        }
+    }
+
+    /**
+     * Attempts to use the next argument as a value. It
+     * won't use what it thinks is a flag.
+     * @param array $arguments    Remaining arguments to be parsed.
+     *                            This variable is modified if there
+     *                            is a value to be extracted.
+     * @return string/boolean     The next value unless it's a flag.
+     */
+    private function nextNonFlagElseTrue(&$arguments) {
+        return $this->valueIsNext($arguments) ? array_shift($arguments) : true;
+    }
+
+    /**
+     * Test to see if the next available argument is a valid value.
+     * If it starts with "-" or "--" it's a flag and doesn't count.
+     * @param array $arguments    Remaining arguments to be parsed.
+     *                            Not affected by this call.
+     * boolean                    True if valid value.
+     */
+    function valueIsNext($arguments) {
+        return isset($arguments[0]) && ! $this->isFlag($arguments[0]);
+    }
+
+    /**
+     * It's a flag if it starts with "-" or "--".
+     * @param string $argument       Value to be tested.
+     * @return boolean               True if it's a flag.
+     */
+    function isFlag($argument) {
+        return strncmp($argument, '-', 1) == 0;
+    }
+
+    /**
+     * The arguments are available as individual member
+     * variables on the object.
+     * @param string $key              Argument name.
+     * @return string/array/boolean    Either false for no value,
+     *                                 the value as a string or
+     *                                 a list of multiple values if
+     *                                 the flag had been specified more
+     *                                 than once.
+     */
+    function __get($key) {
+        if (isset($this->all[$key])) {
+            return $this->all[$key];
+        }
+        return false;
+    }
+
+    /**
+     * The entire argument set as a hash.
+     * @return hash         Each argument and it's value(s).
+     */
+    function all() {
+        return $this->all;
+    }
+}
+
+/**
+ *    Renders the help for the command line arguments.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleHelp {
+    private $overview;
+    private $flag_sets = array();
+    private $explanations = array();
+
+    /**
+     * Sets up the top level explanation for the program.
+     * @param string $overview        Summary of program.
+     */
+    function __construct($overview = '') {
+        $this->overview = $overview;
+    }
+
+    /**
+     * Adds the explanation for a group of flags that all
+     * have the same function.
+     * @param string/array $flags       Flag and alternates. Don't
+     *                                  worry about leading dashes
+     *                                  as these are inserted automatically.
+     * @param string $explanation       What that flag group does.
+     */
+    function explainFlag($flags, $explanation) {
+        $flags = is_array($flags) ? $flags : array($flags);
+        $this->flag_sets[] = $flags;
+        $this->explanations[] = $explanation;
+    }
+
+    /**
+     * Generates the help text.
+     * @returns string      The complete formatted text.
+     */
+    function render() {
+        $tab_stop = $this->longestFlag($this->flag_sets) + 4;
+        $text = $this->overview . "\n";
+        for ($i = 0; $i < count($this->flag_sets); $i++) {
+            $text .= $this->renderFlagSet($this->flag_sets[$i], $this->explanations[$i], $tab_stop);
+        }
+        return $this->noDuplicateNewLines($text);
+    }
+
+    /**
+     * Works out the longest flag for formatting purposes.
+     * @param array $flag_sets      The internal flag set list.
+     */
+    private function longestFlag($flag_sets) {
+        $longest = 0;
+        foreach ($flag_sets as $flags) {
+            foreach ($flags as $flag) {
+                $longest = max($longest, strlen($this->renderFlag($flag)));
+            }
+        }
+        return $longest;
+    }
+
+    /**
+     * Generates the text for a single flag and it's alternate flags.
+     * @returns string           Help text for that flag group.
+     */
+    private function renderFlagSet($flags, $explanation, $tab_stop) {
+        $flag = array_shift($flags);
+        $text = str_pad($this->renderFlag($flag), $tab_stop, ' ') . $explanation . "\n";
+        foreach ($flags as $flag) {
+            $text .= '  ' . $this->renderFlag($flag) . "\n";
+        }
+        return $text;
+    }
+
+    /**
+     * Generates the flag name including leading dashes.
+     * @param string $flag          Just the name.
+     * @returns                     Fag with apropriate dashes.
+     */
+    private function renderFlag($flag) {
+        return (strlen($flag) == 1 ? '-' : '--') . $flag;
+    }
+
+    /**
+     * Converts multiple new lines into a single new line.
+     * Just there to trap accidental duplicate new lines.
+     * @param string $text      Text to clean up.
+     * @returns string          Text with no blank lines.
+     */
+    private function noDuplicateNewLines($text) {
+        return preg_replace('/(\n+)/', "\n", $text);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/authentication.php b/3rdparty/simpletest/authentication.php
new file mode 100644
index 00000000000..fcd4efd3f0a
--- /dev/null
+++ b/3rdparty/simpletest/authentication.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: authentication.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+/**
+ *  include http class
+ */
+require_once(dirname(__FILE__) . '/http.php');
+
+/**
+ *    Represents a single security realm's identity.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleRealm {
+    private $type;
+    private $root;
+    private $username;
+    private $password;
+
+    /**
+     *    Starts with the initial entry directory.
+     *    @param string $type      Authentication type for this
+     *                             realm. Only Basic authentication
+     *                             is currently supported.
+     *    @param SimpleUrl $url    Somewhere in realm.
+     *    @access public
+     */
+    function SimpleRealm($type, $url) {
+        $this->type = $type;
+        $this->root = $url->getBasePath();
+        $this->username = false;
+        $this->password = false;
+    }
+
+    /**
+     *    Adds another location to the realm.
+     *    @param SimpleUrl $url    Somewhere in realm.
+     *    @access public
+     */
+    function stretch($url) {
+        $this->root = $this->getCommonPath($this->root, $url->getPath());
+    }
+
+    /**
+     *    Finds the common starting path.
+     *    @param string $first        Path to compare.
+     *    @param string $second       Path to compare.
+     *    @return string              Common directories.
+     *    @access private
+     */
+    protected function getCommonPath($first, $second) {
+        $first = explode('/', $first);
+        $second = explode('/', $second);
+        for ($i = 0; $i < min(count($first), count($second)); $i++) {
+            if ($first[$i] != $second[$i]) {
+                return implode('/', array_slice($first, 0, $i)) . '/';
+            }
+        }
+        return implode('/', $first) . '/';
+    }
+
+    /**
+     *    Sets the identity to try within this realm.
+     *    @param string $username    Username in authentication dialog.
+     *    @param string $username    Password in authentication dialog.
+     *    @access public
+     */
+    function setIdentity($username, $password) {
+        $this->username = $username;
+        $this->password = $password;
+    }
+
+    /**
+     *    Accessor for current identity.
+     *    @return string        Last succesful username.
+     *    @access public
+     */
+    function getUsername() {
+        return $this->username;
+    }
+
+    /**
+     *    Accessor for current identity.
+     *    @return string        Last succesful password.
+     *    @access public
+     */
+    function getPassword() {
+        return $this->password;
+    }
+
+    /**
+     *    Test to see if the URL is within the directory
+     *    tree of the realm.
+     *    @param SimpleUrl $url    URL to test.
+     *    @return boolean          True if subpath.
+     *    @access public
+     */
+    function isWithin($url) {
+        if ($this->isIn($this->root, $url->getBasePath())) {
+            return true;
+        }
+        if ($this->isIn($this->root, $url->getBasePath() . $url->getPage() . '/')) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     *    Tests to see if one string is a substring of
+     *    another.
+     *    @param string $part        Small bit.
+     *    @param string $whole       Big bit.
+     *    @return boolean            True if the small bit is
+     *                               in the big bit.
+     *    @access private
+     */
+    protected function isIn($part, $whole) {
+        return strpos($whole, $part) === 0;
+    }
+}
+
+/**
+ *    Manages security realms.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleAuthenticator {
+    private $realms;
+
+    /**
+     *    Clears the realms.
+     *    @access public
+     */
+    function SimpleAuthenticator() {
+        $this->restartSession();
+    }
+
+    /**
+     *    Starts with no realms set up.
+     *    @access public
+     */
+    function restartSession() {
+        $this->realms = array();
+    }
+
+    /**
+     *    Adds a new realm centered the current URL.
+     *    Browsers privatey wildly on their behaviour in this
+     *    regard. Mozilla ignores the realm and presents
+     *    only when challenged, wasting bandwidth. IE
+     *    just carries on presenting until a new challenge
+     *    occours. SimpleTest tries to follow the spirit of
+     *    the original standards committee and treats the
+     *    base URL as the root of a file tree shaped realm.
+     *    @param SimpleUrl $url    Base of realm.
+     *    @param string $type      Authentication type for this
+     *                             realm. Only Basic authentication
+     *                             is currently supported.
+     *    @param string $realm     Name of realm.
+     *    @access public
+     */
+    function addRealm($url, $type, $realm) {
+        $this->realms[$url->getHost()][$realm] = new SimpleRealm($type, $url);
+    }
+
+    /**
+     *    Sets the current identity to be presented
+     *    against that realm.
+     *    @param string $host        Server hosting realm.
+     *    @param string $realm       Name of realm.
+     *    @param string $username    Username for realm.
+     *    @param string $password    Password for realm.
+     *    @access public
+     */
+    function setIdentityForRealm($host, $realm, $username, $password) {
+        if (isset($this->realms[$host][$realm])) {
+            $this->realms[$host][$realm]->setIdentity($username, $password);
+        }
+    }
+
+    /**
+     *    Finds the name of the realm by comparing URLs.
+     *    @param SimpleUrl $url        URL to test.
+     *    @return SimpleRealm          Name of realm.
+     *    @access private
+     */
+    protected function findRealmFromUrl($url) {
+        if (! isset($this->realms[$url->getHost()])) {
+            return false;
+        }
+        foreach ($this->realms[$url->getHost()] as $name => $realm) {
+            if ($realm->isWithin($url)) {
+                return $realm;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Presents the appropriate headers for this location.
+     *    @param SimpleHttpRequest $request  Request to modify.
+     *    @param SimpleUrl $url              Base of realm.
+     *    @access public
+     */
+    function addHeaders(&$request, $url) {
+        if ($url->getUsername() && $url->getPassword()) {
+            $username = $url->getUsername();
+            $password = $url->getPassword();
+        } elseif ($realm = $this->findRealmFromUrl($url)) {
+            $username = $realm->getUsername();
+            $password = $realm->getPassword();
+        } else {
+            return;
+        }
+        $this->addBasicHeaders($request, $username, $password);
+    }
+
+    /**
+     *    Presents the appropriate headers for this
+     *    location for basic authentication.
+     *    @param SimpleHttpRequest $request  Request to modify.
+     *    @param string $username            Username for realm.
+     *    @param string $password            Password for realm.
+     *    @access public
+     */
+    static function addBasicHeaders(&$request, $username, $password) {
+        if ($username && $password) {
+            $request->addHeaderLine(
+                'Authorization: Basic ' . base64_encode("$username:$password"));
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/autorun.php b/3rdparty/simpletest/autorun.php
new file mode 100644
index 00000000000..8faf84d3ceb
--- /dev/null
+++ b/3rdparty/simpletest/autorun.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ *  Autorunner which runs all tests cases found in a file
+ *  that includes this module.
+ *  @package    SimpleTest
+ *  @version    $Id: autorun.php 2037 2011-11-30 17:58:21Z pp11 $
+ */
+
+/**#@+
+ * include simpletest files
+ */
+require_once dirname(__FILE__) . '/unit_tester.php';
+require_once dirname(__FILE__) . '/mock_objects.php';
+require_once dirname(__FILE__) . '/collector.php';
+require_once dirname(__FILE__) . '/default_reporter.php';
+/**#@-*/
+
+$GLOBALS['SIMPLETEST_AUTORUNNER_INITIAL_CLASSES'] = get_declared_classes();
+$GLOBALS['SIMPLETEST_AUTORUNNER_INITIAL_PATH'] = getcwd();
+register_shutdown_function('simpletest_autorun');
+
+/**
+ *    Exit handler to run all recent test cases and exit system if in CLI
+ */
+function simpletest_autorun() {
+	chdir($GLOBALS['SIMPLETEST_AUTORUNNER_INITIAL_PATH']);
+    if (tests_have_run()) {
+        return;
+    }
+    $result = run_local_tests();
+    if (SimpleReporter::inCli()) {
+        exit($result ? 0 : 1);
+    }
+}
+
+/**
+ *    run all recent test cases if no test has
+ *    so far been run. Uses the DefaultReporter which can have
+ *    it's output controlled with SimpleTest::prefer().
+ *    @return boolean/null false if there were test failures, true if
+ *                         there were no failures, null if tests are
+ *                         already running
+ */
+function run_local_tests() {
+    try {
+        if (tests_have_run()) {
+            return;
+        }
+        $candidates = capture_new_classes();
+        $loader = new SimpleFileLoader();
+        $suite = $loader->createSuiteFromClasses(
+                basename(initial_file()),
+                $loader->selectRunnableTests($candidates));
+        return $suite->run(new DefaultReporter());
+    } catch (Exception $stack_frame_fix) {
+        print $stack_frame_fix->getMessage();
+        return false;
+    }
+}
+
+/**
+ *    Checks the current test context to see if a test has
+ *    ever been run.
+ *    @return boolean        True if tests have run.
+ */
+function tests_have_run() {
+    if ($context = SimpleTest::getContext()) {
+        return (boolean)$context->getTest();
+    }
+    return false;
+}
+
+/**
+ *    The first autorun file.
+ *    @return string        Filename of first autorun script.
+ */
+function initial_file() {
+    static $file = false;
+    if (! $file) {
+        if (isset($_SERVER, $_SERVER['SCRIPT_FILENAME'])) {
+            $file = $_SERVER['SCRIPT_FILENAME'];
+        } else {
+            $included_files = get_included_files();
+            $file = reset($included_files);
+        }
+    }
+    return $file;
+}
+
+/**
+ *    Every class since the first autorun include. This
+ *    is safe enough if require_once() is always used.
+ *    @return array        Class names.
+ */
+function capture_new_classes() {
+    global $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES;
+    return array_map('strtolower', array_diff(get_declared_classes(),
+                            $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES ?
+                            $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES : array()));
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/browser.php b/3rdparty/simpletest/browser.php
new file mode 100644
index 00000000000..615e738d350
--- /dev/null
+++ b/3rdparty/simpletest/browser.php
@@ -0,0 +1,1144 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: browser.php 2013 2011-04-29 09:29:45Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/simpletest.php');
+require_once(dirname(__FILE__) . '/http.php');
+require_once(dirname(__FILE__) . '/encoding.php');
+require_once(dirname(__FILE__) . '/page.php');
+require_once(dirname(__FILE__) . '/php_parser.php');
+require_once(dirname(__FILE__) . '/tidy_parser.php');
+require_once(dirname(__FILE__) . '/selector.php');
+require_once(dirname(__FILE__) . '/frames.php');
+require_once(dirname(__FILE__) . '/user_agent.php');
+if (! SimpleTest::getParsers()) {
+    SimpleTest::setParsers(array(new SimpleTidyPageBuilder(), new SimplePHPPageBuilder()));
+    //SimpleTest::setParsers(array(new SimplePHPPageBuilder()));
+}
+/**#@-*/
+
+if (! defined('DEFAULT_MAX_NESTED_FRAMES')) {
+    define('DEFAULT_MAX_NESTED_FRAMES', 3);
+}
+
+/**
+ *    Browser history list.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleBrowserHistory {
+    private $sequence = array();
+    private $position = -1;
+
+    /**
+     *    Test for no entries yet.
+     *    @return boolean        True if empty.
+     *    @access private
+     */
+    protected function isEmpty() {
+        return ($this->position == -1);
+    }
+
+    /**
+     *    Test for being at the beginning.
+     *    @return boolean        True if first.
+     *    @access private
+     */
+    protected function atBeginning() {
+        return ($this->position == 0) && ! $this->isEmpty();
+    }
+
+    /**
+     *    Test for being at the last entry.
+     *    @return boolean        True if last.
+     *    @access private
+     */
+    protected function atEnd() {
+        return ($this->position + 1 >= count($this->sequence)) && ! $this->isEmpty();
+    }
+
+    /**
+     *    Adds a successfully fetched page to the history.
+     *    @param SimpleUrl $url                 URL of fetch.
+     *    @param SimpleEncoding $parameters     Any post data with the fetch.
+     *    @access public
+     */
+    function recordEntry($url, $parameters) {
+        $this->dropFuture();
+        array_push(
+                $this->sequence,
+                array('url' => $url, 'parameters' => $parameters));
+        $this->position++;
+    }
+
+    /**
+     *    Last fully qualified URL for current history
+     *    position.
+     *    @return SimpleUrl        URL for this position.
+     *    @access public
+     */
+    function getUrl() {
+        if ($this->isEmpty()) {
+            return false;
+        }
+        return $this->sequence[$this->position]['url'];
+    }
+
+    /**
+     *    Parameters of last fetch from current history
+     *    position.
+     *    @return SimpleFormEncoding    Post parameters.
+     *    @access public
+     */
+    function getParameters() {
+        if ($this->isEmpty()) {
+            return false;
+        }
+        return $this->sequence[$this->position]['parameters'];
+    }
+
+    /**
+     *    Step back one place in the history. Stops at
+     *    the first page.
+     *    @return boolean     True if any previous entries.
+     *    @access public
+     */
+    function back() {
+        if ($this->isEmpty() || $this->atBeginning()) {
+            return false;
+        }
+        $this->position--;
+        return true;
+    }
+
+    /**
+     *    Step forward one place. If already at the
+     *    latest entry then nothing will happen.
+     *    @return boolean     True if any future entries.
+     *    @access public
+     */
+    function forward() {
+        if ($this->isEmpty() || $this->atEnd()) {
+            return false;
+        }
+        $this->position++;
+        return true;
+    }
+
+    /**
+     *    Ditches all future entries beyond the current
+     *    point.
+     *    @access private
+     */
+    protected function dropFuture() {
+        if ($this->isEmpty()) {
+            return;
+        }
+        while (! $this->atEnd()) {
+            array_pop($this->sequence);
+        }
+    }
+}
+
+/**
+ *    Simulated web browser. This is an aggregate of
+ *    the user agent, the HTML parsing, request history
+ *    and the last header set.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleBrowser {
+    private $user_agent;
+    private $page;
+    private $history;
+    private $ignore_frames;
+    private $maximum_nested_frames;
+    private $parser;
+
+    /**
+     *    Starts with a fresh browser with no
+     *    cookie or any other state information. The
+     *    exception is that a default proxy will be
+     *    set up if specified in the options.
+     *    @access public
+     */
+    function __construct() {
+        $this->user_agent = $this->createUserAgent();
+        $this->user_agent->useProxy(
+                SimpleTest::getDefaultProxy(),
+                SimpleTest::getDefaultProxyUsername(),
+                SimpleTest::getDefaultProxyPassword());
+        $this->page = new SimplePage();
+        $this->history = $this->createHistory();
+        $this->ignore_frames = false;
+        $this->maximum_nested_frames = DEFAULT_MAX_NESTED_FRAMES;
+    }
+
+    /**
+     *    Creates the underlying user agent.
+     *    @return SimpleFetcher    Content fetcher.
+     *    @access protected
+     */
+    protected function createUserAgent() {
+        return new SimpleUserAgent();
+    }
+
+    /**
+     *    Creates a new empty history list.
+     *    @return SimpleBrowserHistory    New list.
+     *    @access protected
+     */
+    protected function createHistory() {
+        return new SimpleBrowserHistory();
+    }
+
+    /**
+     *    Get the HTML parser to use. Can be overridden by
+     *    setParser. Otherwise scans through the available parsers and
+     *    uses the first one which is available.
+     *    @return object SimplePHPPageBuilder or SimpleTidyPageBuilder
+     */
+    protected function getParser() {
+        if ($this->parser) {
+            return $this->parser;
+        }
+        foreach (SimpleTest::getParsers() as $parser) {
+            if ($parser->can()) {
+                return $parser;
+            }
+        }
+    }
+
+    /**
+     *    Override the default HTML parser, allowing parsers to be plugged in.
+     *    @param object           A parser object instance.
+     */
+    public function setParser($parser) {
+        $this->parser = $parser;
+    }
+
+    /**
+     *    Disables frames support. Frames will not be fetched
+     *    and the frameset page will be used instead.
+     *    @access public
+     */
+    function ignoreFrames() {
+        $this->ignore_frames = true;
+    }
+
+    /**
+     *    Enables frames support. Frames will be fetched from
+     *    now on.
+     *    @access public
+     */
+    function useFrames() {
+        $this->ignore_frames = false;
+    }
+
+    /**
+     *    Switches off cookie sending and recieving.
+     *    @access public
+     */
+    function ignoreCookies() {
+        $this->user_agent->ignoreCookies();
+    }
+
+    /**
+     *    Switches back on the cookie sending and recieving.
+     *    @access public
+     */
+    function useCookies() {
+        $this->user_agent->useCookies();
+    }
+
+    /**
+     *    Parses the raw content into a page. Will load further
+     *    frame pages unless frames are disabled.
+     *    @param SimpleHttpResponse $response    Response from fetch.
+     *    @param integer $depth                  Nested frameset depth.
+     *    @return SimplePage                     Parsed HTML.
+     *    @access private
+     */
+    protected function parse($response, $depth = 0) {
+        $page = $this->buildPage($response);
+        if ($this->ignore_frames || ! $page->hasFrames() || ($depth > $this->maximum_nested_frames)) {
+            return $page;
+        }
+        $frameset = new SimpleFrameset($page);
+        foreach ($page->getFrameset() as $key => $url) {
+            $frame = $this->fetch($url, new SimpleGetEncoding(), $depth + 1);
+            $frameset->addFrame($frame, $key);
+        }
+        return $frameset;
+    }
+
+    /**
+     *    Assembles the parsing machinery and actually parses
+     *    a single page. Frees all of the builder memory and so
+     *    unjams the PHP memory management.
+     *    @param SimpleHttpResponse $response    Response from fetch.
+     *    @return SimplePage                     Parsed top level page.
+     */
+    protected function buildPage($response) {
+        return $this->getParser()->parse($response);
+    }
+
+    /**
+     *    Fetches a page. Jointly recursive with the parse()
+     *    method as it descends a frameset.
+     *    @param string/SimpleUrl $url          Target to fetch.
+     *    @param SimpleEncoding $encoding       GET/POST parameters.
+     *    @param integer $depth                 Nested frameset depth protection.
+     *    @return SimplePage                    Parsed page.
+     *    @access private
+     */
+    protected function fetch($url, $encoding, $depth = 0) {
+        $response = $this->user_agent->fetchResponse($url, $encoding);
+        if ($response->isError()) {
+            return new SimplePage($response);
+        }
+        return $this->parse($response, $depth);
+    }
+
+    /**
+     *    Fetches a page or a single frame if that is the current
+     *    focus.
+     *    @param SimpleUrl $url                   Target to fetch.
+     *    @param SimpleEncoding $parameters       GET/POST parameters.
+     *    @return string                          Raw content of page.
+     *    @access private
+     */
+    protected function load($url, $parameters) {
+        $frame = $url->getTarget();
+        if (! $frame || ! $this->page->hasFrames() || (strtolower($frame) == '_top')) {
+            return $this->loadPage($url, $parameters);
+        }
+        return $this->loadFrame(array($frame), $url, $parameters);
+    }
+
+    /**
+     *    Fetches a page and makes it the current page/frame.
+     *    @param string/SimpleUrl $url            Target to fetch as string.
+     *    @param SimplePostEncoding $parameters   POST parameters.
+     *    @return string                          Raw content of page.
+     *    @access private
+     */
+    protected function loadPage($url, $parameters) {
+        $this->page = $this->fetch($url, $parameters);
+        $this->history->recordEntry(
+                $this->page->getUrl(),
+                $this->page->getRequestData());
+        return $this->page->getRaw();
+    }
+
+    /**
+     *    Fetches a frame into the existing frameset replacing the
+     *    original.
+     *    @param array $frames                    List of names to drill down.
+     *    @param string/SimpleUrl $url            Target to fetch as string.
+     *    @param SimpleFormEncoding $parameters   POST parameters.
+     *    @return string                          Raw content of page.
+     *    @access private
+     */
+    protected function loadFrame($frames, $url, $parameters) {
+        $page = $this->fetch($url, $parameters);
+        $this->page->setFrame($frames, $page);
+        return $page->getRaw();
+    }
+
+    /**
+     *    Removes expired and temporary cookies as if
+     *    the browser was closed and re-opened.
+     *    @param string/integer $date   Time when session restarted.
+     *                                  If omitted then all persistent
+     *                                  cookies are kept.
+     *    @access public
+     */
+    function restart($date = false) {
+        $this->user_agent->restart($date);
+    }
+
+    /**
+     *    Adds a header to every fetch.
+     *    @param string $header       Header line to add to every
+     *                                request until cleared.
+     *    @access public
+     */
+    function addHeader($header) {
+        $this->user_agent->addHeader($header);
+    }
+
+    /**
+     *    Ages the cookies by the specified time.
+     *    @param integer $interval    Amount in seconds.
+     *    @access public
+     */
+    function ageCookies($interval) {
+        $this->user_agent->ageCookies($interval);
+    }
+
+    /**
+     *    Sets an additional cookie. If a cookie has
+     *    the same name and path it is replaced.
+     *    @param string $name       Cookie key.
+     *    @param string $value      Value of cookie.
+     *    @param string $host       Host upon which the cookie is valid.
+     *    @param string $path       Cookie path if not host wide.
+     *    @param string $expiry     Expiry date.
+     *    @access public
+     */
+    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
+        $this->user_agent->setCookie($name, $value, $host, $path, $expiry);
+    }
+
+    /**
+     *    Reads the most specific cookie value from the
+     *    browser cookies.
+     *    @param string $host        Host to search.
+     *    @param string $path        Applicable path.
+     *    @param string $name        Name of cookie to read.
+     *    @return string             False if not present, else the
+     *                               value as a string.
+     *    @access public
+     */
+    function getCookieValue($host, $path, $name) {
+        return $this->user_agent->getCookieValue($host, $path, $name);
+    }
+
+    /**
+     *    Reads the current cookies for the current URL.
+     *    @param string $name   Key of cookie to find.
+     *    @return string        Null if there is no current URL, false
+     *                          if the cookie is not set.
+     *    @access public
+     */
+    function getCurrentCookieValue($name) {
+        return $this->user_agent->getBaseCookieValue($name, $this->page->getUrl());
+    }
+
+    /**
+     *    Sets the maximum number of redirects before
+     *    a page will be loaded anyway.
+     *    @param integer $max        Most hops allowed.
+     *    @access public
+     */
+    function setMaximumRedirects($max) {
+        $this->user_agent->setMaximumRedirects($max);
+    }
+
+    /**
+     *    Sets the maximum number of nesting of framed pages
+     *    within a framed page to prevent loops.
+     *    @param integer $max        Highest depth allowed.
+     *    @access public
+     */
+    function setMaximumNestedFrames($max) {
+        $this->maximum_nested_frames = $max;
+    }
+
+    /**
+     *    Sets the socket timeout for opening a connection.
+     *    @param integer $timeout      Maximum time in seconds.
+     *    @access public
+     */
+    function setConnectionTimeout($timeout) {
+        $this->user_agent->setConnectionTimeout($timeout);
+    }
+
+    /**
+     *    Sets proxy to use on all requests for when
+     *    testing from behind a firewall. Set URL
+     *    to false to disable.
+     *    @param string $proxy        Proxy URL.
+     *    @param string $username     Proxy username for authentication.
+     *    @param string $password     Proxy password for authentication.
+     *    @access public
+     */
+    function useProxy($proxy, $username = false, $password = false) {
+        $this->user_agent->useProxy($proxy, $username, $password);
+    }
+
+    /**
+     *    Fetches the page content with a HEAD request.
+     *    Will affect cookies, but will not change the base URL.
+     *    @param string/SimpleUrl $url                Target to fetch as string.
+     *    @param hash/SimpleHeadEncoding $parameters  Additional parameters for
+     *                                                HEAD request.
+     *    @return boolean                             True if successful.
+     *    @access public
+     */
+    function head($url, $parameters = false) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        if ($this->getUrl()) {
+            $url = $url->makeAbsolute($this->getUrl());
+        }
+        $response = $this->user_agent->fetchResponse($url, new SimpleHeadEncoding($parameters));
+        $this->page = new SimplePage($response);
+        return ! $response->isError();
+    }
+
+    /**
+     *    Fetches the page content with a simple GET request.
+     *    @param string/SimpleUrl $url                Target to fetch.
+     *    @param hash/SimpleFormEncoding $parameters  Additional parameters for
+     *                                                GET request.
+     *    @return string                              Content of page or false.
+     *    @access public
+     */
+    function get($url, $parameters = false) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        if ($this->getUrl()) {
+            $url = $url->makeAbsolute($this->getUrl());
+        }
+        return $this->load($url, new SimpleGetEncoding($parameters));
+    }
+
+    /**
+     *    Fetches the page content with a POST request.
+     *    @param string/SimpleUrl $url                Target to fetch as string.
+     *    @param hash/SimpleFormEncoding $parameters  POST parameters or request body.
+     *    @param string $content_type                 MIME Content-Type of the request body
+     *    @return string                              Content of page.
+     *    @access public
+     */
+    function post($url, $parameters = false, $content_type = false) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        if ($this->getUrl()) {
+            $url = $url->makeAbsolute($this->getUrl());
+        }
+        return $this->load($url, new SimplePostEncoding($parameters, $content_type));
+    }
+
+    /**
+     *    Fetches the page content with a PUT request.
+     *    @param string/SimpleUrl $url                Target to fetch as string.
+     *    @param hash/SimpleFormEncoding $parameters  PUT request body.
+     *    @param string $content_type                 MIME Content-Type of the request body
+     *    @return string                              Content of page.
+     *    @access public
+     */
+    function put($url, $parameters = false, $content_type = false) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        return $this->load($url, new SimplePutEncoding($parameters, $content_type));
+    }
+
+    /**
+     *    Sends a DELETE request and fetches the response.
+     *    @param string/SimpleUrl $url                Target to fetch.
+     *    @param hash/SimpleFormEncoding $parameters  Additional parameters for
+     *                                                DELETE request.
+     *    @return string                              Content of page or false.
+     *    @access public
+     */
+    function delete($url, $parameters = false) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        return $this->load($url, new SimpleDeleteEncoding($parameters));
+    }
+
+    /**
+     *    Equivalent to hitting the retry button on the
+     *    browser. Will attempt to repeat the page fetch. If
+     *    there is no history to repeat it will give false.
+     *    @return string/boolean   Content if fetch succeeded
+     *                             else false.
+     *    @access public
+     */
+    function retry() {
+        $frames = $this->page->getFrameFocus();
+        if (count($frames) > 0) {
+            $this->loadFrame(
+                    $frames,
+                    $this->page->getUrl(),
+                    $this->page->getRequestData());
+            return $this->page->getRaw();
+        }
+        if ($url = $this->history->getUrl()) {
+            $this->page = $this->fetch($url, $this->history->getParameters());
+            return $this->page->getRaw();
+        }
+        return false;
+    }
+
+    /**
+     *    Equivalent to hitting the back button on the
+     *    browser. The browser history is unchanged on
+     *    failure. The page content is refetched as there
+     *    is no concept of content caching in SimpleTest.
+     *    @return boolean     True if history entry and
+     *                        fetch succeeded
+     *    @access public
+     */
+    function back() {
+        if (! $this->history->back()) {
+            return false;
+        }
+        $content = $this->retry();
+        if (! $content) {
+            $this->history->forward();
+        }
+        return $content;
+    }
+
+    /**
+     *    Equivalent to hitting the forward button on the
+     *    browser. The browser history is unchanged on
+     *    failure. The page content is refetched as there
+     *    is no concept of content caching in SimpleTest.
+     *    @return boolean     True if history entry and
+     *                        fetch succeeded
+     *    @access public
+     */
+    function forward() {
+        if (! $this->history->forward()) {
+            return false;
+        }
+        $content = $this->retry();
+        if (! $content) {
+            $this->history->back();
+        }
+        return $content;
+    }
+
+    /**
+     *    Retries a request after setting the authentication
+     *    for the current realm.
+     *    @param string $username    Username for realm.
+     *    @param string $password    Password for realm.
+     *    @return boolean            True if successful fetch. Note
+     *                               that authentication may still have
+     *                               failed.
+     *    @access public
+     */
+    function authenticate($username, $password) {
+        if (! $this->page->getRealm()) {
+            return false;
+        }
+        $url = $this->page->getUrl();
+        if (! $url) {
+            return false;
+        }
+        $this->user_agent->setIdentity(
+                $url->getHost(),
+                $this->page->getRealm(),
+                $username,
+                $password);
+        return $this->retry();
+    }
+
+    /**
+     *    Accessor for a breakdown of the frameset.
+     *    @return array   Hash tree of frames by name
+     *                    or index if no name.
+     *    @access public
+     */
+    function getFrames() {
+        return $this->page->getFrames();
+    }
+
+    /**
+     *    Accessor for current frame focus. Will be
+     *    false if no frame has focus.
+     *    @return integer/string/boolean    Label if any, otherwise
+     *                                      the position in the frameset
+     *                                      or false if none.
+     *    @access public
+     */
+    function getFrameFocus() {
+        return $this->page->getFrameFocus();
+    }
+
+    /**
+     *    Sets the focus by index. The integer index starts from 1.
+     *    @param integer $choice    Chosen frame.
+     *    @return boolean           True if frame exists.
+     *    @access public
+     */
+    function setFrameFocusByIndex($choice) {
+        return $this->page->setFrameFocusByIndex($choice);
+    }
+
+    /**
+     *    Sets the focus by name.
+     *    @param string $name    Chosen frame.
+     *    @return boolean        True if frame exists.
+     *    @access public
+     */
+    function setFrameFocus($name) {
+        return $this->page->setFrameFocus($name);
+    }
+
+    /**
+     *    Clears the frame focus. All frames will be searched
+     *    for content.
+     *    @access public
+     */
+    function clearFrameFocus() {
+        return $this->page->clearFrameFocus();
+    }
+
+    /**
+     *    Accessor for last error.
+     *    @return string        Error from last response.
+     *    @access public
+     */
+    function getTransportError() {
+        return $this->page->getTransportError();
+    }
+
+    /**
+     *    Accessor for current MIME type.
+     *    @return string    MIME type as string; e.g. 'text/html'
+     *    @access public
+     */
+    function getMimeType() {
+        return $this->page->getMimeType();
+    }
+
+    /**
+     *    Accessor for last response code.
+     *    @return integer    Last HTTP response code received.
+     *    @access public
+     */
+    function getResponseCode() {
+        return $this->page->getResponseCode();
+    }
+
+    /**
+     *    Accessor for last Authentication type. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Description of challenge type.
+     *    @access public
+     */
+    function getAuthentication() {
+        return $this->page->getAuthentication();
+    }
+
+    /**
+     *    Accessor for last Authentication realm. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Name of security realm.
+     *    @access public
+     */
+    function getRealm() {
+        return $this->page->getRealm();
+    }
+
+    /**
+     *    Accessor for current URL of page or frame if
+     *    focused.
+     *    @return string    Location of current page or frame as
+     *                      a string.
+     */
+    function getUrl() {
+        $url = $this->page->getUrl();
+        return $url ? $url->asString() : false;
+    }
+
+    /**
+     *    Accessor for base URL of page if set via BASE tag
+     *    @return string    base URL
+     */
+    function getBaseUrl() {
+        $url = $this->page->getBaseUrl();
+        return $url ? $url->asString() : false;
+    }
+
+    /**
+     *    Accessor for raw bytes sent down the wire.
+     *    @return string      Original text sent.
+     *    @access public
+     */
+    function getRequest() {
+        return $this->page->getRequest();
+    }
+
+    /**
+     *    Accessor for raw header information.
+     *    @return string      Header block.
+     *    @access public
+     */
+    function getHeaders() {
+        return $this->page->getHeaders();
+    }
+
+    /**
+     *    Accessor for raw page information.
+     *    @return string      Original text content of web page.
+     *    @access public
+     */
+    function getContent() {
+        return $this->page->getRaw();
+    }
+
+    /**
+     *    Accessor for plain text version of the page.
+     *    @return string      Normalised text representation.
+     *    @access public
+     */
+    function getContentAsText() {
+        return $this->page->getText();
+    }
+
+    /**
+     *    Accessor for parsed title.
+     *    @return string     Title or false if no title is present.
+     *    @access public
+     */
+    function getTitle() {
+        return $this->page->getTitle();
+    }
+
+    /**
+     *    Accessor for a list of all links in current page.
+     *    @return array   List of urls with scheme of
+     *                    http or https and hostname.
+     *    @access public
+     */
+    function getUrls() {
+        return $this->page->getUrls();
+    }
+
+    /**
+     *    Sets all form fields with that name.
+     *    @param string $label   Name or label of field in forms.
+     *    @param string $value   New value of field.
+     *    @return boolean        True if field exists, otherwise false.
+     *    @access public
+     */
+    function setField($label, $value, $position=false) {
+        return $this->page->setField(new SimpleByLabelOrName($label), $value, $position);
+    }
+
+    /**
+     *    Sets all form fields with that name. Will use label if
+     *    one is available (not yet implemented).
+     *    @param string $name    Name of field in forms.
+     *    @param string $value   New value of field.
+     *    @return boolean        True if field exists, otherwise false.
+     *    @access public
+     */
+    function setFieldByName($name, $value, $position=false) {
+        return $this->page->setField(new SimpleByName($name), $value, $position);
+    }
+
+    /**
+     *    Sets all form fields with that id attribute.
+     *    @param string/integer $id   Id of field in forms.
+     *    @param string $value        New value of field.
+     *    @return boolean             True if field exists, otherwise false.
+     *    @access public
+     */
+    function setFieldById($id, $value) {
+        return $this->page->setField(new SimpleById($id), $value);
+    }
+
+    /**
+     *    Accessor for a form element value within the page.
+     *    Finds the first match.
+     *    @param string $label       Field label.
+     *    @return string/boolean     A value if the field is
+     *                               present, false if unchecked
+     *                               and null if missing.
+     *    @access public
+     */
+    function getField($label) {
+        return $this->page->getField(new SimpleByLabelOrName($label));
+    }
+
+    /**
+     *    Accessor for a form element value within the page.
+     *    Finds the first match.
+     *    @param string $name        Field name.
+     *    @return string/boolean     A string if the field is
+     *                               present, false if unchecked
+     *                               and null if missing.
+     *    @access public
+     */
+    function getFieldByName($name) {
+        return $this->page->getField(new SimpleByName($name));
+    }
+
+    /**
+     *    Accessor for a form element value within the page.
+     *    @param string/integer $id  Id of field in forms.
+     *    @return string/boolean     A string if the field is
+     *                               present, false if unchecked
+     *                               and null if missing.
+     *    @access public
+     */
+    function getFieldById($id) {
+        return $this->page->getField(new SimpleById($id));
+    }
+
+    /**
+     *    Clicks the submit button by label. The owning
+     *    form will be submitted by this.
+     *    @param string $label    Button label. An unlabeled
+     *                            button can be triggered by 'Submit'.
+     *    @param hash $additional Additional form data.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function clickSubmit($label = 'Submit', $additional = false) {
+        if (! ($form = $this->page->getFormBySubmit(new SimpleByLabel($label)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitButton(new SimpleByLabel($label), $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Clicks the submit button by name attribute. The owning
+     *    form will be submitted by this.
+     *    @param string $name     Button name.
+     *    @param hash $additional Additional form data.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function clickSubmitByName($name, $additional = false) {
+        if (! ($form = $this->page->getFormBySubmit(new SimpleByName($name)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitButton(new SimpleByName($name), $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Clicks the submit button by ID attribute of the button
+     *    itself. The owning form will be submitted by this.
+     *    @param string $id       Button ID.
+     *    @param hash $additional Additional form data.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function clickSubmitById($id, $additional = false) {
+        if (! ($form = $this->page->getFormBySubmit(new SimpleById($id)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitButton(new SimpleById($id), $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Tests to see if a submit button exists with this
+     *    label.
+     *    @param string $label    Button label.
+     *    @return boolean         True if present.
+     *    @access public
+     */
+    function isSubmit($label) {
+        return (boolean)$this->page->getFormBySubmit(new SimpleByLabel($label));
+    }
+
+    /**
+     *    Clicks the submit image by some kind of label. Usually
+     *    the alt tag or the nearest equivalent. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param string $label    ID attribute of button.
+     *    @param integer $x       X-coordinate of imaginary click.
+     *    @param integer $y       Y-coordinate of imaginary click.
+     *    @param hash $additional Additional form data.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function clickImage($label, $x = 1, $y = 1, $additional = false) {
+        if (! ($form = $this->page->getFormByImage(new SimpleByLabel($label)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitImage(new SimpleByLabel($label), $x, $y, $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Clicks the submit image by the name. Usually
+     *    the alt tag or the nearest equivalent. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param string $name     Name attribute of button.
+     *    @param integer $x       X-coordinate of imaginary click.
+     *    @param integer $y       Y-coordinate of imaginary click.
+     *    @param hash $additional Additional form data.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
+        if (! ($form = $this->page->getFormByImage(new SimpleByName($name)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitImage(new SimpleByName($name), $x, $y, $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Clicks the submit image by ID attribute. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param integer/string $id    ID attribute of button.
+     *    @param integer $x            X-coordinate of imaginary click.
+     *    @param integer $y            Y-coordinate of imaginary click.
+     *    @param hash $additional      Additional form data.
+     *    @return string/boolean       Page on success.
+     *    @access public
+     */
+    function clickImageById($id, $x = 1, $y = 1, $additional = false) {
+        if (! ($form = $this->page->getFormByImage(new SimpleById($id)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitImage(new SimpleById($id), $x, $y, $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Tests to see if an image exists with this
+     *    title or alt text.
+     *    @param string $label    Image text.
+     *    @return boolean         True if present.
+     *    @access public
+     */
+    function isImage($label) {
+        return (boolean)$this->page->getFormByImage(new SimpleByLabel($label));
+    }
+
+    /**
+     *    Submits a form by the ID.
+     *    @param string $id       The form ID. No submit button value
+     *                            will be sent.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function submitFormById($id, $additional = false) {
+        if (! ($form = $this->page->getFormById($id))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submit($additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Finds a URL by label. Will find the first link
+     *    found with this link text by default, or a later
+     *    one if an index is given. The match ignores case and
+     *    white space issues.
+     *    @param string $label     Text between the anchor tags.
+     *    @param integer $index    Link position counting from zero.
+     *    @return string/boolean   URL on success.
+     *    @access public
+     */
+    function getLink($label, $index = 0) {
+        $urls = $this->page->getUrlsByLabel($label);
+        if (count($urls) == 0) {
+            return false;
+        }
+        if (count($urls) < $index + 1) {
+            return false;
+        }
+        return $urls[$index];
+    }
+
+    /**
+     *    Follows a link by label. Will click the first link
+     *    found with this link text by default, or a later
+     *    one if an index is given. The match ignores case and
+     *    white space issues.
+     *    @param string $label     Text between the anchor tags.
+     *    @param integer $index    Link position counting from zero.
+     *    @return string/boolean   Page on success.
+     *    @access public
+     */
+    function clickLink($label, $index = 0) {
+        $url = $this->getLink($label, $index);
+        if ($url === false) {
+            return false;
+        }
+        $this->load($url, new SimpleGetEncoding());
+        return $this->getContent();
+    }
+
+    /**
+     *    Finds a link by id attribute.
+     *    @param string $id        ID attribute value.
+     *    @return string/boolean   URL on success.
+     *    @access public
+     */
+    function getLinkById($id) {
+        return $this->page->getUrlById($id);
+    }
+
+    /**
+     *    Follows a link by id attribute.
+     *    @param string $id        ID attribute value.
+     *    @return string/boolean   Page on success.
+     *    @access public
+     */
+    function clickLinkById($id) {
+        if (! ($url = $this->getLinkById($id))) {
+            return false;
+        }
+        $this->load($url, new SimpleGetEncoding());
+        return $this->getContent();
+    }
+
+    /**
+     *    Clicks a visible text item. Will first try buttons,
+     *    then links and then images.
+     *    @param string $label        Visible text or alt text.
+     *    @return string/boolean      Raw page or false.
+     *    @access public
+     */
+    function click($label) {
+        $raw = $this->clickSubmit($label);
+        if (! $raw) {
+            $raw = $this->clickLink($label);
+        }
+        if (! $raw) {
+            $raw = $this->clickImage($label);
+        }
+        return $raw;
+    }
+
+    /**
+     *    Tests to see if a click target exists.
+     *    @param string $label    Visible text or alt text.
+     *    @return boolean         True if target present.
+     *    @access public
+     */
+    function isClickable($label) {
+        return $this->isSubmit($label) || ($this->getLink($label) !== false) || $this->isImage($label);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/collector.php b/3rdparty/simpletest/collector.php
new file mode 100644
index 00000000000..ac49937aada
--- /dev/null
+++ b/3rdparty/simpletest/collector.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * This file contains the following classes: {@link SimpleCollector},
+ * {@link SimplePatternCollector}.
+ *
+ * @author Travis Swicegood <development@domain51.com>
+ * @package SimpleTest
+ * @subpackage UnitTester
+ * @version $Id: collector.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**
+ * The basic collector for {@link GroupTest}
+ *
+ * @see collect(), GroupTest::collect()
+ * @package SimpleTest
+ * @subpackage UnitTester
+ */
+class SimpleCollector {
+
+    /**
+     * Strips off any kind of slash at the end so as to normalise the path.
+     * @param string $path    Path to normalise.
+     * @return string         Path without trailing slash.
+     */
+    protected function removeTrailingSlash($path) {
+        if (substr($path, -1) == DIRECTORY_SEPARATOR) {
+            return substr($path, 0, -1);
+        } elseif (substr($path, -1) == '/') {
+            return substr($path, 0, -1);
+        } else {
+            return $path;
+        }
+    }
+
+    /**
+     * Scans the directory and adds what it can.
+     * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
+     * @param string $path    Directory to scan.
+     * @see _attemptToAdd()
+     */
+    function collect(&$test, $path) {
+        $path = $this->removeTrailingSlash($path);
+        if ($handle = opendir($path)) {
+            while (($entry = readdir($handle)) !== false) {
+                if ($this->isHidden($entry)) {
+                    continue;
+                }
+                $this->handle($test, $path . DIRECTORY_SEPARATOR . $entry);
+            }
+            closedir($handle);
+        }
+    }
+
+    /**
+     * This method determines what should be done with a given file and adds
+     * it via {@link GroupTest::addTestFile()} if necessary.
+     *
+     * This method should be overriden to provide custom matching criteria,
+     * such as pattern matching, recursive matching, etc.  For an example, see
+     * {@link SimplePatternCollector::_handle()}.
+     *
+     * @param object $test      Group test with {@link GroupTest::addTestFile()} method.
+     * @param string $filename  A filename as generated by {@link collect()}
+     * @see collect()
+     * @access protected
+     */
+    protected function handle(&$test, $file) {
+        if (is_dir($file)) {
+            return;
+        }
+        $test->addFile($file);
+    }
+
+    /**
+     *  Tests for hidden files so as to skip them. Currently
+     *  only tests for Unix hidden files.
+     *  @param string $filename        Plain filename.
+     *  @return boolean                True if hidden file.
+     *  @access private
+     */
+    protected function isHidden($filename) {
+        return strncmp($filename, '.', 1) == 0;
+    }
+}
+
+/**
+ * An extension to {@link SimpleCollector} that only adds files matching a
+ * given pattern.
+ *
+ * @package SimpleTest
+ * @subpackage UnitTester
+ * @see SimpleCollector
+ */
+class SimplePatternCollector extends SimpleCollector {
+    private $pattern;
+
+    /**
+     *
+     * @param string $pattern   Perl compatible regex to test name against
+     *  See {@link http://us4.php.net/manual/en/reference.pcre.pattern.syntax.php PHP's PCRE}
+     *  for full documentation of valid pattern.s
+     */
+    function __construct($pattern = '/php$/i') {
+        $this->pattern = $pattern;
+    }
+
+    /**
+     * Attempts to add files that match a given pattern.
+     *
+     * @see SimpleCollector::_handle()
+     * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
+     * @param string $path    Directory to scan.
+     * @access protected
+     */
+    protected function handle(&$test, $filename) {
+        if (preg_match($this->pattern, $filename)) {
+            parent::handle($test, $filename);
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/compatibility.php b/3rdparty/simpletest/compatibility.php
new file mode 100755
index 00000000000..e313db0cb51
--- /dev/null
+++ b/3rdparty/simpletest/compatibility.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @version    $Id: compatibility.php 1900 2009-07-29 11:44:37Z lastcraft $
+ */
+
+/**
+ *  Static methods for compatibility between different
+ *  PHP versions.
+ *  @package    SimpleTest
+ */
+class SimpleTestCompatibility {
+
+    /**
+     *    Creates a copy whether in PHP5 or PHP4.
+     *    @param object $object     Thing to copy.
+     *    @return object            A copy.
+     *    @access public
+     */
+    static function copy($object) {
+        if (version_compare(phpversion(), '5') >= 0) {
+            eval('$copy = clone $object;');
+            return $copy;
+        }
+        return $object;
+    }
+
+    /**
+     *    Identity test. Drops back to equality + types for PHP5
+     *    objects as the === operator counts as the
+     *    stronger reference constraint.
+     *    @param mixed $first    Test subject.
+     *    @param mixed $second   Comparison object.
+     *    @return boolean        True if identical.
+     *    @access public
+     */
+    static function isIdentical($first, $second) {
+        if (version_compare(phpversion(), '5') >= 0) {
+            return SimpleTestCompatibility::isIdenticalType($first, $second);
+        }
+        if ($first != $second) {
+            return false;
+        }
+        return ($first === $second);
+    }
+
+    /**
+     *    Recursive type test.
+     *    @param mixed $first    Test subject.
+     *    @param mixed $second   Comparison object.
+     *    @return boolean        True if same type.
+     *    @access private
+     */
+    protected static function isIdenticalType($first, $second) {
+        if (gettype($first) != gettype($second)) {
+            return false;
+        }
+        if (is_object($first) && is_object($second)) {
+            if (get_class($first) != get_class($second)) {
+                return false;
+            }
+            return SimpleTestCompatibility::isArrayOfIdenticalTypes(
+                    (array) $first,
+                    (array) $second);
+        }
+        if (is_array($first) && is_array($second)) {
+            return SimpleTestCompatibility::isArrayOfIdenticalTypes($first, $second);
+        }
+        if ($first !== $second) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Recursive type test for each element of an array.
+     *    @param mixed $first    Test subject.
+     *    @param mixed $second   Comparison object.
+     *    @return boolean        True if identical.
+     *    @access private
+     */
+    protected static function isArrayOfIdenticalTypes($first, $second) {
+        if (array_keys($first) != array_keys($second)) {
+            return false;
+        }
+        foreach (array_keys($first) as $key) {
+            $is_identical = SimpleTestCompatibility::isIdenticalType(
+                    $first[$key],
+                    $second[$key]);
+            if (! $is_identical) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Test for two variables being aliases.
+     *    @param mixed $first    Test subject.
+     *    @param mixed $second   Comparison object.
+     *    @return boolean        True if same.
+     *    @access public
+     */
+    static function isReference(&$first, &$second) {
+        if (version_compare(phpversion(), '5', '>=') && is_object($first)) {
+            return ($first === $second);
+        }
+        if (is_object($first) && is_object($second)) {
+            $id = uniqid("test");
+            $first->$id = true;
+            $is_ref = isset($second->$id);
+            unset($first->$id);
+            return $is_ref;
+        }
+        $temp = $first;
+        $first = uniqid("test");
+        $is_ref = ($first === $second);
+        $first = $temp;
+        return $is_ref;
+    }
+
+    /**
+     *    Test to see if an object is a member of a
+     *    class hiearchy.
+     *    @param object $object    Object to test.
+     *    @param string $class     Root name of hiearchy.
+     *    @return boolean         True if class in hiearchy.
+     *    @access public
+     */
+    static function isA($object, $class) {
+        if (version_compare(phpversion(), '5') >= 0) {
+            if (! class_exists($class, false)) {
+                if (function_exists('interface_exists')) {
+                    if (! interface_exists($class, false))  {
+                        return false;
+                    }
+                }
+            }
+            eval("\$is_a = \$object instanceof $class;");
+            return $is_a;
+        }
+        if (function_exists('is_a')) {
+            return is_a($object, $class);
+        }
+        return ((strtolower($class) == get_class($object))
+                or (is_subclass_of($object, $class)));
+    }
+
+    /**
+     *    Sets a socket timeout for each chunk.
+     *    @param resource $handle    Socket handle.
+     *    @param integer $timeout    Limit in seconds.
+     *    @access public
+     */
+    static function setTimeout($handle, $timeout) {
+        if (function_exists('stream_set_timeout')) {
+            stream_set_timeout($handle, $timeout, 0);
+        } elseif (function_exists('socket_set_timeout')) {
+            socket_set_timeout($handle, $timeout, 0);
+        } elseif (function_exists('set_socket_timeout')) {
+            set_socket_timeout($handle, $timeout, 0);
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/cookies.php b/3rdparty/simpletest/cookies.php
new file mode 100644
index 00000000000..7a28f4a5bcc
--- /dev/null
+++ b/3rdparty/simpletest/cookies.php
@@ -0,0 +1,380 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: cookies.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/url.php');
+/**#@-*/
+
+/**
+ *    Cookie data holder. Cookie rules are full of pretty
+ *    arbitary stuff. I have used...
+ *    http://wp.netscape.com/newsref/std/cookie_spec.html
+ *    http://www.cookiecentral.com/faq/
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleCookie {
+    private $host;
+    private $name;
+    private $value;
+    private $path;
+    private $expiry;
+    private $is_secure;
+
+    /**
+     *    Constructor. Sets the stored values.
+     *    @param string $name            Cookie key.
+     *    @param string $value           Value of cookie.
+     *    @param string $path            Cookie path if not host wide.
+     *    @param string $expiry          Expiry date as string.
+     *    @param boolean $is_secure      Currently ignored.
+     */
+    function __construct($name, $value = false, $path = false, $expiry = false, $is_secure = false) {
+        $this->host = false;
+        $this->name = $name;
+        $this->value = $value;
+        $this->path = ($path ? $this->fixPath($path) : "/");
+        $this->expiry = false;
+        if (is_string($expiry)) {
+            $this->expiry = strtotime($expiry);
+        } elseif (is_integer($expiry)) {
+            $this->expiry = $expiry;
+        }
+        $this->is_secure = $is_secure;
+    }
+
+    /**
+     *    Sets the host. The cookie rules determine
+     *    that the first two parts are taken for
+     *    certain TLDs and three for others. If the
+     *    new host does not match these rules then the
+     *    call will fail.
+     *    @param string $host       New hostname.
+     *    @return boolean           True if hostname is valid.
+     *    @access public
+     */
+    function setHost($host) {
+        if ($host = $this->truncateHost($host)) {
+            $this->host = $host;
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for the truncated host to which this
+     *    cookie applies.
+     *    @return string       Truncated hostname.
+     *    @access public
+     */
+    function getHost() {
+        return $this->host;
+    }
+
+    /**
+     *    Test for a cookie being valid for a host name.
+     *    @param string $host    Host to test against.
+     *    @return boolean        True if the cookie would be valid
+     *                           here.
+     */
+    function isValidHost($host) {
+        return ($this->truncateHost($host) === $this->getHost());
+    }
+
+    /**
+     *    Extracts just the domain part that determines a
+     *    cookie's host validity.
+     *    @param string $host    Host name to truncate.
+     *    @return string        Domain or false on a bad host.
+     *    @access private
+     */
+    protected function truncateHost($host) {
+        $tlds = SimpleUrl::getAllTopLevelDomains();
+        if (preg_match('/[a-z\-]+\.(' . $tlds . ')$/i', $host, $matches)) {
+            return $matches[0];
+        } elseif (preg_match('/[a-z\-]+\.[a-z\-]+\.[a-z\-]+$/i', $host, $matches)) {
+            return $matches[0];
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for name.
+     *    @return string       Cookie key.
+     *    @access public
+     */
+    function getName() {
+        return $this->name;
+    }
+
+    /**
+     *    Accessor for value. A deleted cookie will
+     *    have an empty string for this.
+     *    @return string       Cookie value.
+     *    @access public
+     */
+    function getValue() {
+        return $this->value;
+    }
+
+    /**
+     *    Accessor for path.
+     *    @return string       Valid cookie path.
+     *    @access public
+     */
+    function getPath() {
+        return $this->path;
+    }
+
+    /**
+     *    Tests a path to see if the cookie applies
+     *    there. The test path must be longer or
+     *    equal to the cookie path.
+     *    @param string $path       Path to test against.
+     *    @return boolean           True if cookie valid here.
+     *    @access public
+     */
+    function isValidPath($path) {
+        return (strncmp(
+                $this->fixPath($path),
+                $this->getPath(),
+                strlen($this->getPath())) == 0);
+    }
+
+    /**
+     *    Accessor for expiry.
+     *    @return string       Expiry string.
+     *    @access public
+     */
+    function getExpiry() {
+        if (! $this->expiry) {
+            return false;
+        }
+        return gmdate("D, d M Y H:i:s", $this->expiry) . " GMT";
+    }
+
+    /**
+     *    Test to see if cookie is expired against
+     *    the cookie format time or timestamp.
+     *    Will give true for a session cookie.
+     *    @param integer/string $now  Time to test against. Result
+     *                                will be false if this time
+     *                                is later than the cookie expiry.
+     *                                Can be either a timestamp integer
+     *                                or a cookie format date.
+     *    @access public
+     */
+    function isExpired($now) {
+        if (! $this->expiry) {
+            return true;
+        }
+        if (is_string($now)) {
+            $now = strtotime($now);
+        }
+        return ($this->expiry < $now);
+    }
+
+    /**
+     *    Ages the cookie by the specified number of
+     *    seconds.
+     *    @param integer $interval   In seconds.
+     *    @public
+     */
+    function agePrematurely($interval) {
+        if ($this->expiry) {
+            $this->expiry -= $interval;
+        }
+    }
+
+    /**
+     *    Accessor for the secure flag.
+     *    @return boolean       True if cookie needs SSL.
+     *    @access public
+     */
+    function isSecure() {
+        return $this->is_secure;
+    }
+
+    /**
+     *    Adds a trailing and leading slash to the path
+     *    if missing.
+     *    @param string $path            Path to fix.
+     *    @access private
+     */
+    protected function fixPath($path) {
+        if (substr($path, 0, 1) != '/') {
+            $path = '/' . $path;
+        }
+        if (substr($path, -1, 1) != '/') {
+            $path .= '/';
+        }
+        return $path;
+    }
+}
+
+/**
+ *    Repository for cookies. This stuff is a
+ *    tiny bit browser dependent.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleCookieJar {
+    private $cookies;
+
+    /**
+     *    Constructor. Jar starts empty.
+     *    @access public
+     */
+    function __construct() {
+        $this->cookies = array();
+    }
+
+    /**
+     *    Removes expired and temporary cookies as if
+     *    the browser was closed and re-opened.
+     *    @param string/integer $now   Time to test expiry against.
+     *    @access public
+     */
+    function restartSession($date = false) {
+        $surviving_cookies = array();
+        for ($i = 0; $i < count($this->cookies); $i++) {
+            if (! $this->cookies[$i]->getValue()) {
+                continue;
+            }
+            if (! $this->cookies[$i]->getExpiry()) {
+                continue;
+            }
+            if ($date && $this->cookies[$i]->isExpired($date)) {
+                continue;
+            }
+            $surviving_cookies[] = $this->cookies[$i];
+        }
+        $this->cookies = $surviving_cookies;
+    }
+
+    /**
+     *    Ages all cookies in the cookie jar.
+     *    @param integer $interval     The old session is moved
+     *                                 into the past by this number
+     *                                 of seconds. Cookies now over
+     *                                 age will be removed.
+     *    @access public
+     */
+    function agePrematurely($interval) {
+        for ($i = 0; $i < count($this->cookies); $i++) {
+            $this->cookies[$i]->agePrematurely($interval);
+        }
+    }
+
+    /**
+     *    Sets an additional cookie. If a cookie has
+     *    the same name and path it is replaced.
+     *    @param string $name       Cookie key.
+     *    @param string $value      Value of cookie.
+     *    @param string $host       Host upon which the cookie is valid.
+     *    @param string $path       Cookie path if not host wide.
+     *    @param string $expiry     Expiry date.
+     *    @access public
+     */
+    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
+        $cookie = new SimpleCookie($name, $value, $path, $expiry);
+        if ($host) {
+            $cookie->setHost($host);
+        }
+        $this->cookies[$this->findFirstMatch($cookie)] = $cookie;
+    }
+
+    /**
+     *    Finds a matching cookie to write over or the
+     *    first empty slot if none.
+     *    @param SimpleCookie $cookie    Cookie to write into jar.
+     *    @return integer                Available slot.
+     *    @access private
+     */
+    protected function findFirstMatch($cookie) {
+        for ($i = 0; $i < count($this->cookies); $i++) {
+            $is_match = $this->isMatch(
+                    $cookie,
+                    $this->cookies[$i]->getHost(),
+                    $this->cookies[$i]->getPath(),
+                    $this->cookies[$i]->getName());
+            if ($is_match) {
+                return $i;
+            }
+        }
+        return count($this->cookies);
+    }
+
+    /**
+     *    Reads the most specific cookie value from the
+     *    browser cookies. Looks for the longest path that
+     *    matches.
+     *    @param string $host        Host to search.
+     *    @param string $path        Applicable path.
+     *    @param string $name        Name of cookie to read.
+     *    @return string             False if not present, else the
+     *                               value as a string.
+     *    @access public
+     */
+    function getCookieValue($host, $path, $name) {
+        $longest_path = '';
+        foreach ($this->cookies as $cookie) {
+            if ($this->isMatch($cookie, $host, $path, $name)) {
+                if (strlen($cookie->getPath()) > strlen($longest_path)) {
+                    $value = $cookie->getValue();
+                    $longest_path = $cookie->getPath();
+                }
+            }
+        }
+        return (isset($value) ? $value : false);
+    }
+
+    /**
+     *    Tests cookie for matching against search
+     *    criteria.
+     *    @param SimpleTest $cookie    Cookie to test.
+     *    @param string $host          Host must match.
+     *    @param string $path          Cookie path must be shorter than
+     *                                 this path.
+     *    @param string $name          Name must match.
+     *    @return boolean              True if matched.
+     *    @access private
+     */
+    protected function isMatch($cookie, $host, $path, $name) {
+        if ($cookie->getName() != $name) {
+            return false;
+        }
+        if ($host && $cookie->getHost() && ! $cookie->isValidHost($host)) {
+            return false;
+        }
+        if (! $cookie->isValidPath($path)) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Uses a URL to sift relevant cookies by host and
+     *    path. Results are list of strings of form "name=value".
+     *    @param SimpleUrl $url       Url to select by.
+     *    @return array               Valid name and value pairs.
+     *    @access public
+     */
+    function selectAsPairs($url) {
+        $pairs = array();
+        foreach ($this->cookies as $cookie) {
+            if ($this->isMatch($cookie, $url->getHost(), $url->getPath(), $cookie->getName())) {
+                $pairs[] = $cookie->getName() . '=' . $cookie->getValue();
+            }
+        }
+        return $pairs;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/default_reporter.php b/3rdparty/simpletest/default_reporter.php
new file mode 100644
index 00000000000..6feb67a3088
--- /dev/null
+++ b/3rdparty/simpletest/default_reporter.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ *  Optional include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: default_reporter.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/simpletest.php');
+require_once(dirname(__FILE__) . '/scorer.php');
+require_once(dirname(__FILE__) . '/reporter.php');
+require_once(dirname(__FILE__) . '/xml.php');
+/**#@-*/
+
+/**
+ *    Parser for command line arguments. Extracts
+ *    the a specific test to run and engages XML
+ *    reporting when necessary.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleCommandLineParser {
+    private $to_property = array(
+            'case' => 'case', 'c' => 'case',
+            'test' => 'test', 't' => 'test',
+    );
+    private $case = '';
+    private $test = '';
+    private $xml = false;
+    private $help = false;
+    private $no_skips = false;
+
+    /**
+     *    Parses raw command line arguments into object properties.
+     *    @param string $arguments        Raw commend line arguments.
+     */
+    function __construct($arguments) {
+        if (! is_array($arguments)) {
+            return;
+        }
+        foreach ($arguments as $i => $argument) {
+            if (preg_match('/^--?(test|case|t|c)=(.+)$/', $argument, $matches)) {
+                $property = $this->to_property[$matches[1]];
+                $this->$property = $matches[2];
+            } elseif (preg_match('/^--?(test|case|t|c)$/', $argument, $matches)) {
+                $property = $this->to_property[$matches[1]];
+                if (isset($arguments[$i + 1])) {
+                    $this->$property = $arguments[$i + 1];
+                }
+            } elseif (preg_match('/^--?(xml|x)$/', $argument)) {
+                $this->xml = true;
+            } elseif (preg_match('/^--?(no-skip|no-skips|s)$/', $argument)) {
+                $this->no_skips = true;
+            } elseif (preg_match('/^--?(help|h)$/', $argument)) {
+                $this->help = true;
+            }
+        }
+    }
+
+    /**
+     *    Run only this test.
+     *    @return string        Test name to run.
+     */
+    function getTest() {
+        return $this->test;
+    }
+
+    /**
+     *    Run only this test suite.
+     *    @return string        Test class name to run.
+     */
+    function getTestCase() {
+        return $this->case;
+    }
+
+    /**
+     *    Output should be XML or not.
+     *    @return boolean        True if XML desired.
+     */
+    function isXml() {
+        return $this->xml;
+    }
+
+    /**
+     *    Output should suppress skip messages.
+     *    @return boolean        True for no skips.
+     */
+    function noSkips() {
+        return $this->no_skips;
+    }
+
+    /**
+     *    Output should be a help message. Disabled during XML mode.
+     *    @return boolean        True if help message desired.
+     */
+    function help() {
+        return $this->help && ! $this->xml;
+    }
+
+    /**
+     *    Returns plain-text help message for command line runner.
+     *    @return string         String help message
+     */
+    function getHelpText() {
+        return <<<HELP
+SimpleTest command line default reporter (autorun)
+Usage: php <test_file> [args...]
+
+    -c <class>      Run only the test-case <class>
+    -t <method>     Run only the test method <method>
+    -s              Suppress skip messages
+    -x              Return test results in XML
+    -h              Display this help message
+
+HELP;
+    }
+
+}
+
+/**
+ *    The default reporter used by SimpleTest's autorun
+ *    feature. The actual reporters used are dependency
+ *    injected and can be overridden.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class DefaultReporter extends SimpleReporterDecorator {
+
+    /**
+     *  Assembles the appropriate reporter for the environment.
+     */
+    function __construct() {
+        if (SimpleReporter::inCli()) {
+            $parser = new SimpleCommandLineParser($_SERVER['argv']);
+            $interfaces = $parser->isXml() ? array('XmlReporter') : array('TextReporter');
+            if ($parser->help()) {
+                // I'm not sure if we should do the echo'ing here -- ezyang
+                echo $parser->getHelpText();
+                exit(1);
+            }
+            $reporter = new SelectiveReporter(
+                    SimpleTest::preferred($interfaces),
+                    $parser->getTestCase(),
+                    $parser->getTest());
+            if ($parser->noSkips()) {
+                $reporter = new NoSkipsReporter($reporter);
+            }
+        } else {
+            $reporter = new SelectiveReporter(
+                    SimpleTest::preferred('HtmlReporter'),
+                    @$_GET['c'],
+                    @$_GET['t']);
+            if (@$_GET['skips'] == 'no' || @$_GET['show-skips'] == 'no') {
+                $reporter = new NoSkipsReporter($reporter);
+            }
+        }
+        parent::__construct($reporter);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/detached.php b/3rdparty/simpletest/detached.php
new file mode 100755
index 00000000000..a325e140d02
--- /dev/null
+++ b/3rdparty/simpletest/detached.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: detached.php 1784 2008-04-26 13:07:14Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/xml.php');
+require_once(dirname(__FILE__) . '/shell_tester.php');
+/**#@-*/
+
+/**
+ *    Runs an XML formated test in a separate process.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class DetachedTestCase {
+    private $command;
+    private $dry_command;
+    private $size;
+
+    /**
+     *    Sets the location of the remote test.
+     *    @param string $command       Test script.
+     *    @param string $dry_command   Script for dry run.
+     *    @access public
+     */
+    function __construct($command, $dry_command = false) {
+        $this->command = $command;
+        $this->dry_command = $dry_command ? $dry_command : $command;
+        $this->size = false;
+    }
+
+    /**
+     *    Accessor for the test name for subclasses.
+     *    @return string       Name of the test.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->command;
+    }
+
+    /**
+     *    Runs the top level test for this class. Currently
+     *    reads the data as a single chunk. I'll fix this
+     *    once I have added iteration to the browser.
+     *    @param SimpleReporter $reporter    Target of test results.
+     *    @returns boolean                   True if no failures.
+     *    @access public
+     */
+    function run(&$reporter) {
+        $shell = &new SimpleShell();
+        $shell->execute($this->command);
+        $parser = &$this->createParser($reporter);
+        if (! $parser->parse($shell->getOutput())) {
+            trigger_error('Cannot parse incoming XML from [' . $this->command . ']');
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Accessor for the number of subtests.
+     *    @return integer       Number of test cases.
+     *    @access public
+     */
+    function getSize() {
+        if ($this->size === false) {
+            $shell = &new SimpleShell();
+            $shell->execute($this->dry_command);
+            $reporter = &new SimpleReporter();
+            $parser = &$this->createParser($reporter);
+            if (! $parser->parse($shell->getOutput())) {
+                trigger_error('Cannot parse incoming XML from [' . $this->dry_command . ']');
+                return false;
+            }
+            $this->size = $reporter->getTestCaseCount();
+        }
+        return $this->size;
+    }
+
+    /**
+     *    Creates the XML parser.
+     *    @param SimpleReporter $reporter    Target of test results.
+     *    @return SimpleTestXmlListener      XML reader.
+     *    @access protected
+     */
+    protected function &createParser(&$reporter) {
+        return new SimpleTestXmlParser($reporter);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/docs/en/authentication_documentation.html b/3rdparty/simpletest/docs/en/authentication_documentation.html
new file mode 100644
index 00000000000..e058e19a111
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/authentication_documentation.html
@@ -0,0 +1,378 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest documentation for testing log-in and authentication</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <span class="chosen">Authentication</span>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Authentication documentation</h1>
+        This page...
+        <ul>
+<li>
+            Getting through <a href="#basic">Basic HTTP authentication</a>
+        </li>
+<li>
+            Testing <a href="#cookies">cookie based authentication</a>
+        </li>
+<li>
+            Managing <a href="#session">browser sessions</a> and timeouts
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                One of the trickiest, and yet most important, areas
+                of testing web sites is the security.
+                Testing these schemes is one of the core goals of
+                the SimpleTest web tester.
+            </p>
+        
+        <h2>
+<a class="target" name="basic"></a>Basic HTTP authentication</h2>
+            <p>
+                If you fetch a page protected by basic authentication then
+                rather than receiving content, you will instead get a 401
+                header.
+                We can illustrate this with this test...
+<pre>
+class AuthenticationTest extends WebTestCase {<strong>
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');
+        $this-&gt;showHeaders();
+    }</strong>
+}
+</pre>
+                This allows us to see the challenge header...
+                <div class="demo">
+                    <h1>File test</h1>
+<pre>
+HTTP/1.1 401 Authorization Required
+Date: Sat, 18 Sep 2004 19:25:18 GMT
+Server: Apache/1.3.29 (Unix) PHP/4.3.4
+WWW-Authenticate: Basic realm="SimpleTest basic authentication"
+Connection: close
+Content-Type: text/html; charset=iso-8859-1
+</pre>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>0</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                We are trying to get away from visual inspection though, and so SimpleTest
+                allows to make automated assertions against the challenge.
+                Here is a thorough test of our header...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');<strong>
+        $this-&gt;assertAuthentication('Basic');
+        $this-&gt;assertResponse(401);
+        $this-&gt;assertRealm('SimpleTest basic authentication');</strong>
+    }
+}
+</pre>
+                Any one of these tests would normally do on it's own depending
+                on the amount of detail you want to see.
+            </p>
+            <p>
+                One theme that runs through SimpleTest is the ability to use
+                <span class="new_code">SimpleExpectation</span> objects wherever a simple
+                match is not enough.
+                If you want only an approximate match to the realm for
+                example, you can do this...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');
+        $this-&gt;assertRealm(<strong>new PatternExpectation('/simpletest/i')</strong>);
+    }
+}
+</pre>
+                This type of test, testing HTTP responses, is not typical.
+            </p>
+            <p>
+                Most of the time we are not interested in testing the
+                authentication itself, but want to get past it to test
+                the pages underneath.
+                As soon as the challenge has been issued we can reply with
+                an authentication response...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function testCanAuthenticate() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');<strong>
+        $this-&gt;authenticate('Me', 'Secret');</strong>
+        $this-&gt;assertTitle(...);
+    }
+}
+</pre>
+                The username and password will now be sent with every
+                subsequent request to that directory and subdirectories.
+                You will have to authenticate again if you step outside
+                the authenticated directory, but SimpleTest is smart enough
+                to merge subdirectories into a common realm.
+            </p>
+            <p>
+                If you want, you can shortcut this step further by encoding
+                the log in details straight into the URL...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function testCanReadAuthenticatedPages() {
+        $this-&gt;get('http://<strong>Me:Secret@</strong>www.lastcraft.com/protected/');
+        $this-&gt;assertTitle(...);
+    }
+}
+</pre>
+                If your username or password has special characters, then you
+                will have to URL encode them or the request will not be parsed
+                correctly.
+                I'm afraid we leave this up to you.
+            </p>
+            <p>
+                A problem with encoding the login details directly in the URL is
+                the authentication header will not be sent on subsequent requests.
+                If you navigate with relative URLs though, the authentication
+                information will be preserved along with the domain name.
+            </p>
+            <p>
+                Normally though, you use the <span class="new_code">authenticate()</span> call.
+                SimpleTest will then remember your login information on each request.
+            </p>
+            <p>
+                Only testing with basic authentication is currently supported, and
+                this is only really secure in tandem with HTTPS connections.
+                This is usually good enough to protect test server from prying eyes,
+                however.
+                Digest authentication and NTLM authentication may be added
+                in the future if enough people request this feature.
+            </p>
+        
+        <h2>
+<a class="target" name="cookies"></a>Cookies</h2>
+            <p>
+                Basic authentication doesn't give enough control over the
+                user interface for web developers.
+                More likely this functionality will be coded directly into
+                the web architecture using cookies with complicated timeouts.
+                We need to be able to test this too.
+            </p>
+            <p>
+                Starting with a simple log-in form...
+<pre>
+&lt;form&gt;
+    Username:
+    &lt;input type="text" name="u" value="" /&gt;&lt;br /&gt;
+    Password:
+    &lt;input type="password" name="p" value="" /&gt;&lt;br /&gt;
+    &lt;input type="submit" value="Log in" /&gt;
+&lt;/form&gt;
+</pre>
+                Which looks like...
+            </p>
+            <p>
+                <form class="demo">
+                    Username:
+                    <input type="text" name="u" value=""><br>
+                    Password:
+                    <input type="password" name="p" value=""><br>
+                    <input type="submit" value="Log in">
+                </form>
+            </p>
+            <p>
+                Let's suppose that in fetching this page a cookie has been
+                set with a session ID.
+                We are not going to fill the form in yet, just test that
+                we are tracking the user.
+                Here is the test...
+<pre>
+class LogInTest extends WebTestCase {
+    function testSessionCookieSetBeforeForm() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $this-&gt;assertCookie('SID');</strong>
+    }
+}
+</pre>
+                All we are doing is confirming that the cookie is set.
+                As the value is likely to be rather cryptic it's not
+                really worth testing this with...
+<pre>
+class LogInTest extends WebTestCase {
+    function testSessionCookieIsCorrectPattern() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;assertCookie('SID', <strong>new PatternExpectation('/[a-f0-9]{32}/i')</strong>);
+    }
+}
+</pre>
+                If you are using PHP to handle sessions for you then
+                this test is even more useless, as we are just testing PHP itself.
+            </p>
+            <p>
+                The simplest test of logging in is to visually inspect the
+                next page to see if you are really logged in.
+                Just test the next page with <span class="new_code">WebTestCase::assertText()</span>.
+            </p>
+            <p>
+                The test is similar to any other form test,
+                but we might want to confirm that we still have the same
+                cookie after log-in as before we entered.
+                We wouldn't want to lose track of this after all.
+                Here is a possible test for this...
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testSessionCookieSameAfterLogIn() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $session = $this-&gt;getCookie('SID');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;click('Log in');
+        $this-&gt;assertText('Welcome Me');
+        $this-&gt;assertCookie('SID', $session);</strong>
+    }
+}
+</pre>
+                This confirms that the session identifier is maintained
+                afer log-in and we haven't accidently reset it.
+            </p>
+            <p>
+                We could even attempt to hack our own system by setting
+                arbitrary cookies to gain access...
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testSessionCookieSameAfterLogIn() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $this-&gt;setCookie('SID', 'Some other session');
+        $this-&gt;get('http://www.my-site.com/restricted.php');</strong>
+        $this-&gt;assertText('Access denied');
+    }
+}
+</pre>
+                Is your site protected from this attack?
+            </p>
+        
+        <h2>
+<a class="target" name="session"></a>Browser sessions</h2>
+            <p>
+                If you are testing an authentication system a critical piece
+                of behaviour is what happens when a user logs back in.
+                We would like to simulate closing and reopening a browser...
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testLoseAuthenticationAfterBrowserClose() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;click('Log in');
+        $this-&gt;assertText('Welcome Me');<strong>
+        
+        $this-&gt;restart();
+        $this-&gt;get('http://www.my-site.com/restricted.php');
+        $this-&gt;assertText('Access denied');</strong>
+    }
+}
+</pre>
+                The <span class="new_code">WebTestCase::restart()</span> method will
+                preserve cookies that have unexpired timeouts, but throw away
+                those that are temporary or expired.
+                You can optionally specify the time and date that the restart
+                happened.
+            </p>
+            <p>
+                Expiring cookies can be a problem.
+                After all, if you have a cookie that expires after an hour,
+                you don't want to stall the test for an hour while waiting
+                for the cookie to pass it's timeout.
+            </p>
+            <p>
+                To push the cookies over the hour limit you can age them
+                before you restart the session...
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testLoseAuthenticationAfterOneHour() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;click('Log in');
+        $this-&gt;assertText('Welcome Me');
+        <strong>
+        $this-&gt;ageCookies(3600);</strong>
+        $this-&gt;restart();
+        $this-&gt;get('http://www.my-site.com/restricted.php');
+        $this-&gt;assertText('Access denied');
+    }
+}
+</pre>
+                After the restart it will appear that cookies are an
+                hour older, and any that pass their expiry will have
+                disappeared.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <span class="chosen">Authentication</span>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/browser_documentation.html b/3rdparty/simpletest/docs/en/browser_documentation.html
new file mode 100644
index 00000000000..809c1431137
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/browser_documentation.html
@@ -0,0 +1,501 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest documentation for the scriptable web browser component</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <span class="chosen">Scriptable browser</span>
+</div></div>
+<h1>PHP Scriptable Web Browser</h1>
+        This page...
+        <ul>
+<li>
+            Using the bundled <a href="#scripting">web browser in scripts</a>
+        </li>
+<li>
+            <a href="#debug">Debugging</a> failed pages
+        </li>
+<li>
+            Complex <a href="#unit">tests with multiple web browsers</a>
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                SimpleTest's web browser component can be used not just
+                outside of the <span class="new_code">WebTestCase</span> class, but also
+                independently of the SimpleTest framework itself.
+            </p>
+        
+        <h2>
+<a class="target" name="scripting"></a>The Scriptable Browser</h2>
+            <p>
+                You can use the web browser in PHP scripts to confirm
+                services are up and running, or to extract information
+                from them at a regular basis.
+                For example, here is a small script to extract the current number of
+                open PHP 5 bugs from the <a href="http://www.php.net/">PHP web site</a>...
+<pre>
+<strong>&lt;?php
+require_once('simpletest/browser.php');
+    
+$browser = &amp;new SimpleBrowser();
+$browser-&gt;get('http://php.net/');
+$browser-&gt;click('reporting bugs');
+$browser-&gt;click('statistics');
+$page = $browser-&gt;click('PHP 5 bugs only');
+preg_match('/status=Open.*?by=Any.*?(\d+)&lt;\/a&gt;/', $page, $matches);
+print $matches[1];
+?&gt;</strong>
+</pre>
+                There are simpler methods to do this particular example in PHP
+                of course.
+                For example you can just use the PHP <span class="new_code">file()</span>
+                command against what here is a pretty fixed page.
+                However, using the web browser for scripts allows authentication,
+                correct handling of cookies, automatic loading of frames, redirects,
+                form submission and the ability to examine the page headers.
+            <p>
+            </p>
+                Methods such as periodic scraping are fragile against a site that is constantly
+                evolving and you would want a more direct way of accessing
+                data in a permanent set up, but for simple tasks this can provide
+                a very rapid solution.
+            </p>
+            <p>
+                All of the navigation methods used in the
+                <a href="web_tester_documentation.html">WebTestCase</a>
+                are present in the <span class="new_code">SimpleBrowser</span> class, but
+                the assertions are replaced with simpler accessors.
+                Here is a full list of the page navigation methods...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">addHeader($header)</span></td>
+<td>Adds a header to every fetch</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useProxy($proxy, $username, $password)</span></td>
+<td>Use this proxy from now on</td>
+</tr>
+                    <tr>
+<td><span class="new_code">head($url, $parameters)</span></td>
+<td>Perform a HEAD request</td>
+</tr>
+                    <tr>
+<td><span class="new_code">get($url, $parameters)</span></td>
+<td>Fetch a page with GET</td>
+</tr>
+                    <tr>
+<td><span class="new_code">post($url, $parameters)</span></td>
+<td>Fetch a page with POST</td>
+</tr>
+                    <tr>
+<td><span class="new_code">click($label)</span></td>
+<td>Clicks visible link or button text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLink($label)</span></td>
+<td>Follows a link by label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLinkById($id)</span></td>
+<td>Follows a link by attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>Current URL of page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getTitle()</span></td>
+<td>Page title</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getContent()</span></td>
+<td>Raw page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getContentAsText()</span></td>
+<td>HTML removed except for alt text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">retry()</span></td>
+<td>Repeat the last request</td>
+</tr>
+                    <tr>
+<td><span class="new_code">back()</span></td>
+<td>Use the browser back button</td>
+</tr>
+                    <tr>
+<td><span class="new_code">forward()</span></td>
+<td>Use the browser forward button</td>
+</tr>
+                    <tr>
+<td><span class="new_code">authenticate($username, $password)</span></td>
+<td>Retry page or frame after a 401 response</td>
+</tr>
+                    <tr>
+<td><span class="new_code">restart($date)</span></td>
+<td>Restarts the browser for a new session</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ageCookies($interval)</span></td>
+<td>Ages the cookies by the specified time</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setCookie($name, $value)</span></td>
+<td>Sets an additional cookie</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getCookieValue($host, $path, $name)</span></td>
+<td>Reads the most specific cookie</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getCurrentCookieValue($name)</span></td>
+<td>Reads cookie for the current context</td>
+</tr>
+                </tbody></table>
+                The methods <span class="new_code">SimpleBrowser::useProxy()</span> and
+                <span class="new_code">SimpleBrowser::addHeader()</span> are special.
+                Once called they continue to apply to all subsequent fetches.
+            </p>
+            <p>
+                Navigating forms is similar to the
+                <a href="form_testing_documentation.html">WebTestCase form navigation</a>...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setField($label, $value)</span></td>
+<td>Sets all form fields with that label or name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFieldByName($name, $value)</span></td>
+<td>Sets all form fields with that name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFieldById($id, $value)</span></td>
+<td>Sets all form fields with that id</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getField($label)</span></td>
+<td>Accessor for a form element value by label tag and then name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFieldByName($name)</span></td>
+<td>Accessor for a form element value using name attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFieldById($id)</span></td>
+<td>Accessor for a form element value</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmit($label)</span></td>
+<td>Submits form by button label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitByName($name)</span></td>
+<td>Submits form by button attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitById($id)</span></td>
+<td>Submits form by button attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImage($label, $x, $y)</span></td>
+<td>Clicks an input tag of type image by title or alt text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageByName($name, $x, $y)</span></td>
+<td>Clicks an input tag of type image by name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageById($id, $x, $y)</span></td>
+<td>Clicks an input tag of type image by ID attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">submitFormById($id)</span></td>
+<td>Submits by the form tag attribute</td>
+</tr>
+                </tbody></table>
+                At the moment there aren't many methods to list available links and fields.
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">isClickable($label)</span></td>
+<td>Test to see if a click target exists by label or name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isSubmit($label)</span></td>
+<td>Test for the existence of a button with that label or name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isImage($label)</span></td>
+<td>Test for the existence of an image button with that label or name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getLink($label)</span></td>
+<td>Finds a URL from its label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getLinkById($label)</span></td>
+<td>Finds a URL from its ID attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrls()</span></td>
+<td>Lists available links in the current page</td>
+</tr>
+                </tbody></table>
+                This will be expanded in later versions of SimpleTest.
+            </p>
+            <p>
+                Frames are a rather esoteric feature these days, but SimpleTest has
+                retained support for them.
+            </p>
+            <p>
+                Within a page, individual frames can be selected.
+                If no selection is made then all the frames are merged together
+                in one large conceptual page.
+                The content of the current page will be a concatenation of all of the
+                frames in the order that they were specified in the "frameset"
+                tags.
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">getFrames()</span></td>
+<td>A dump of the current frame structure</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFrameFocus()</span></td>
+<td>Current frame label or index</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocusByIndex($choice)</span></td>
+<td>Select a frame numbered from 1</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocus($name)</span></td>
+<td>Select frame by label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clearFrameFocus()</span></td>
+<td>Treat all the frames as a single page</td>
+</tr>
+                </tbody></table>
+                When focused on a single frame, the content will come from
+                that frame only.
+                This includes links to click and forms to submit.
+            </p>
+        
+        <h2>
+<a class="target" name="debug"></a>What went wrong?</h2>
+            <p>
+                All of this functionality is great when we actually manage to fetch pages,
+                but that doesn't always happen.
+                To help figure out what went wrong, the browser has some methods to
+                aid in debugging...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setConnectionTimeout($timeout)</span></td>
+<td>Close the socket on overrun</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>Url of most recent page fetched</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getRequest()</span></td>
+<td>Raw request header of page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getHeaders()</span></td>
+<td>Raw response header of page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getTransportError()</span></td>
+<td>Any socket level errors in the last fetch</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getResponseCode()</span></td>
+<td>HTTP response of page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getMimeType()</span></td>
+<td>Mime type of page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getAuthentication()</span></td>
+<td>Authentication type in 401 challenge header</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getRealm()</span></td>
+<td>Authentication realm in 401 challenge header</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getBaseUrl()</span></td>
+<td>Base url only of most recent page fetched</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumRedirects($max)</span></td>
+<td>Number of redirects before page is loaded anyway</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumNestedFrames($max)</span></td>
+<td>Protection against recursive framesets</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreFrames()</span></td>
+<td>Disables frames support</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useFrames()</span></td>
+<td>Enables frames support</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreCookies()</span></td>
+<td>Disables sending and receiving of cookies</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useCookies()</span></td>
+<td>Enables cookie support</td>
+</tr>
+                </tbody></table>
+                The methods <span class="new_code">SimpleBrowser::setConnectionTimeout()</span>
+                <span class="new_code">SimpleBrowser::setMaximumRedirects()</span>,
+                <span class="new_code">SimpleBrowser::setMaximumNestedFrames()</span>,
+                <span class="new_code">SimpleBrowser::ignoreFrames()</span>,
+                <span class="new_code">SimpleBrowser::useFrames()</span>,
+                <span class="new_code">SimpleBrowser::ignoreCookies()</span> and
+                <span class="new_code">SimpleBrowser::useCokies()</span> continue to apply
+                to every subsequent request.
+                The other methods are frames aware.
+                This means that if you have an individual frame that is not
+                loading, navigate to it using <span class="new_code">SimpleBrowser::setFrameFocus()</span>
+                and you can then use <span class="new_code">SimpleBrowser::getRequest()</span>, etc to
+                see what happened.
+            </p>
+        
+        <h2>
+<a class="target" name="unit"></a>Complex unit tests with multiple browsers</h2>
+            <p>
+                Anything that could be done in a
+                <a href="web_tester_documentation.html">WebTestCase</a> can
+                now be done in a <a href="unit_tester_documentation.html">UnitTestCase</a>.
+                This means that we could freely mix domain object testing with the
+                web interface...
+<pre>
+<strong>class TestOfRegistration extends UnitTestCase {
+    function testNewUserAddedToAuthenticator() {</strong>
+        $browser = new SimpleBrowser();
+        $browser-&gt;get('http://my-site.com/register.php');
+        $browser-&gt;setField('email', 'me@here');
+        $browser-&gt;setField('password', 'Secret');
+        $browser-&gt;click('Register');
+        <strong>
+        $authenticator = new Authenticator();
+        $member = $authenticator-&gt;findByEmail('me@here');
+        $this-&gt;assertEqual($member-&gt;getPassword(), 'Secret');
+    }
+}</strong>
+</pre>
+                While this may be a useful temporary expediency, I am not a fan
+                of this type of testing.
+                The testing has cut across application layers, make it twice as
+                likely it will need refactoring when the code changes.
+            </p>
+            <p>
+                A more useful case of where using the browser directly can be helpful
+                is where the <span class="new_code">WebTestCase</span> cannot cope.
+                An example is where two browsers are needed at the same time.
+            </p>
+            <p>
+                For example, say we want to disallow multiple simultaneous
+                usage of a site with the same username.
+                This test case will do the job...
+<pre>
+class TestOfSecurity extends UnitTestCase {
+    function testNoMultipleLoginsFromSameUser() {<strong>
+        $first_attempt = new SimpleBrowser();
+        $first_attempt-&gt;get('http://my-site.com/login.php');
+        $first_attempt-&gt;setField('name', 'Me');
+        $first_attempt-&gt;setField('password', 'Secret');
+        $first_attempt-&gt;click('Enter');
+        $this-&gt;assertEqual($first_attempt-&gt;getTitle(), 'Welcome');
+        
+        $second_attempt = new SimpleBrowser();
+        $second_attempt-&gt;get('http://my-site.com/login.php');
+        $second_attempt-&gt;setField('name', 'Me');
+        $second_attempt-&gt;setField('password', 'Secret');
+        $second_attempt-&gt;click('Enter');
+        $this-&gt;assertEqual($second_attempt-&gt;getTitle(), 'Access Denied');</strong>
+    }
+}
+</pre>
+                You can also use the <span class="new_code">SimpleBrowser</span> class
+                directly when you want to write test cases using a different
+                test tool than SimpleTest, such as PHPUnit.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <span class="chosen">Scriptable browser</span>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/docs.css b/3rdparty/simpletest/docs/en/docs.css
new file mode 100755
index 00000000000..18368a04f7a
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/docs.css
@@ -0,0 +1,121 @@
+body {
+    padding-left: 3%;
+    padding-right: 3%;
+}
+h1, h2, h3 {
+	font-family: sans-serif;
+}
+h1 {
+    text-align: center;
+}
+pre {
+    font-family: "courier new", courier, typewriter, monospace;
+    font-size: 90%;
+    border: 1px solid;
+	border-color: #999966;
+    background-color: #ffffcc;
+    padding: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+}
+.code, .new_code, pre.new_code {
+    font-family: "courier new", courier, typewriter, monospace;
+    font-weight: bold;
+}
+div.copyright {
+    font-size: 80%;
+    color: gray;
+}
+div.copyright a {
+    margin-top: 1em;
+    color: gray;
+}
+ul.api {
+    border: 2px outset;
+    border-color: gray;
+    background-color: white;
+    margin: 5px;
+    margin-left: 5%;
+    margin-right: 5%;
+}
+ul.api li {
+    margin-top: 0.2em;
+    margin-bottom: 0.2em;
+    list-style: none;
+    text-indent: -3em;
+    padding-left: 1em;
+}
+div.demo {
+    border: 4px ridge;
+    border-color: gray;
+    padding: 10px;
+    margin: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+    background-color: white;
+}
+div.demo span.fail {
+    color: red;
+}
+div.demo span.pass {
+    color: green;
+}
+div.demo h1 {
+    font-size: 12pt;
+    text-align: left;
+    font-weight: bold;
+}
+div.menu {
+    text-align: center;
+}
+table {
+    border: 2px outset;
+    border-color: gray;
+    background-color: white;
+    margin: 5px;
+    margin-left: 5%;
+    margin-right: 5%;
+}
+td {
+    font-size: 90%;
+}
+.shell {
+    color: white;
+}
+pre.shell {
+    border: 4px ridge;
+    border-color: gray;
+    padding: 10px;
+    margin: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+    background-color: #000100;
+	color: #99ff99;
+    font-size: 90%;
+}
+pre.file {
+    color: black;
+    border: 1px solid;
+    border-color: black;
+    padding: 10px;
+    margin: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+    background-color: white;
+    font-size: 90%;
+}
+form.demo {
+    background-color: lightgray;
+    border: 4px outset;
+    border-color: lightgray;
+    padding: 10px;
+    margin-right: 40%;
+}
+dl, dd {
+	margin:  10px;
+	margin-left:  30px;
+}
+em {
+    font-weight: bold;
+    font-family: "courier new", courier, typewriter, monospace;
+}
diff --git a/3rdparty/simpletest/docs/en/expectation_documentation.html b/3rdparty/simpletest/docs/en/expectation_documentation.html
new file mode 100644
index 00000000000..26704d5ae83
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/expectation_documentation.html
@@ -0,0 +1,476 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+        Extending the SimpleTest unit tester with additional expectation classes
+    </title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <span class="chosen">Expectations</span>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Expectation documentation</h1>
+        This page...
+        <ul>
+<li>
+            Using expectations for
+            <a href="#mock">more precise testing with mock objects</a>
+        </li>
+<li>
+            <a href="#behaviour">Changing mock object behaviour</a> with expectations
+        </li>
+<li>
+            <a href="#extending">Extending the expectations</a>
+        </li>
+<li>
+            Underneath SimpleTest <a href="#unit">uses expectation classes</a>
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="mock"></a>More control over mock objects</h2>
+            <p>
+                The default behaviour of the
+                <a href="mock_objects_documentation.html">mock objects</a>
+                in
+                <a href="http://sourceforge.net/projects/simpletest/">SimpleTest</a>
+                is either an identical match on the argument or to allow any argument at all.
+                For almost all tests this is sufficient.
+                Sometimes, though, you want to weaken a test case.
+            </p>
+            <p>
+                One place where a test can be too tightly coupled is with
+                text matching.
+                Suppose we have a component that outputs a helpful error
+                message when something goes wrong.
+                You want to test that the correct error was sent, but the actual
+                text may be rather long.
+                If you test for the text exactly, then every time the exact wording
+                of the message changes, you will have to go back and edit the test suite.
+            </p>
+            <p>
+                For example, suppose we have a news service that has failed
+                to connect to its remote source.
+<pre>
+<strong>class NewsService {
+    ...
+    function publish($writer) {
+        if (! $this-&gt;isConnected()) {
+            $writer-&gt;write('Cannot connect to news service "' .
+                    $this-&gt;_name . '" at this time. ' .
+                    'Please try again later.');
+        }
+        ...
+    }
+}</strong>
+</pre>
+                Here it is sending its content to a
+                <span class="new_code">Writer</span> class.
+                We could test this behaviour with a
+                <span class="new_code">MockWriter</span> like so...
+<pre>
+class TestOfNewsService extends UnitTestCase {
+    ...
+    function testConnectionFailure() {<strong>
+        $writer = new MockWriter();
+        $writer-&gt;expectOnce('write', array(
+                'Cannot connect to news service ' .
+                '"BBC News" at this time. ' .
+                'Please try again later.'));
+        
+        $service = new NewsService('BBC News');
+        $service-&gt;publish($writer);</strong>
+    }
+}
+</pre>
+                This is a good example of a brittle test.
+                If we decide to add additional instructions, such as
+                suggesting an alternative news source, we will break
+                our tests even though no underlying functionality
+                has been altered.
+            </p>
+            <p>
+                To get around this, we would like to do a regular expression
+                test rather than an exact match.
+                We can actually do this with...
+<pre>
+class TestOfNewsService extends UnitTestCase {
+    ...
+    function testConnectionFailure() {
+        $writer = new MockWriter();<strong>
+        $writer-&gt;expectOnce(
+                'write',
+                array(new PatternExpectation('/cannot connect/i')));</strong>
+        
+        $service = new NewsService('BBC News');
+        $service-&gt;publish($writer);
+    }
+}
+</pre>
+                Instead of passing in the expected parameter to the
+                <span class="new_code">MockWriter</span> we pass an
+                expectation class called
+                <span class="new_code">PatternExpectation</span>.
+                The mock object is smart enough to recognise this as special
+                and to treat it differently.
+                Rather than simply comparing the incoming argument to this
+                object, it uses the expectation object itself to
+                perform the test.
+            </p>
+            <p>
+                The <span class="new_code">PatternExpectation</span> takes
+                the regular expression to match in its constructor.
+                Whenever a comparison is made by the <span class="new_code">MockWriter</span>
+                against this expectation class, it will do a
+                <span class="new_code">preg_match()</span> with this pattern.
+                With our test case above, as long as "cannot connect"
+                appears in the text of the string, the mock will issue a pass
+                to the unit tester.
+                The rest of the text does not matter.
+            </p>
+            <p>
+                The possible expectation classes are...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">AnythingExpectation</span></td>
+<td>Will always match</td>
+</tr>
+                    <tr>
+<td><span class="new_code">EqualExpectation</span></td>
+<td>An equality, rather than the stronger identity comparison</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotEqualExpectation</span></td>
+<td>An inequality comparison</td>
+</tr>
+                    <tr>
+<td><span class="new_code">IndenticalExpectation</span></td>
+<td>The default mock object check which must match exactly</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotIndenticalExpectation</span></td>
+<td>Inverts the mock object logic</td>
+</tr>
+                    <tr>
+<td><span class="new_code">WithinMarginExpectation</span></td>
+<td>Compares a value to within a margin</td>
+</tr>
+                    <tr>
+<td><span class="new_code">OutsideMarginExpectation</span></td>
+<td>Checks that a value is out side the margin</td>
+</tr>
+                    <tr>
+<td><span class="new_code">PatternExpectation</span></td>
+<td>Uses a Perl Regex to match a string</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NoPatternExpectation</span></td>
+<td>Passes only if failing a Perl Regex</td>
+</tr>
+                    <tr>
+<td><span class="new_code">IsAExpectation</span></td>
+<td>Checks the type or class name only</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotAExpectation</span></td>
+<td>Opposite of the <span class="new_code">IsAExpectation</span>
+</td>
+</tr>
+                    <tr>
+<td><span class="new_code">MethodExistsExpectation</span></td>
+<td>Checks a method is available on an object</td>
+</tr>
+                    <tr>
+<td><span class="new_code">TrueExpectation</span></td>
+<td>Accepts any PHP variable that evaluates to true</td>
+</tr>
+                    <tr>
+<td><span class="new_code">FalseExpectation</span></td>
+<td>Accepts any PHP variable that evaluates to false</td>
+</tr>
+                </tbody></table>
+                Most take the expected value in the constructor.
+                The exceptions are the pattern matchers, which take a regular expression,
+                and the <span class="new_code">IsAExpectation</span> and <span class="new_code">NotAExpectation</span> which takes a type
+                or class name as a string.
+            </p>
+            <p>
+                Some examples...
+            </p>
+            <p>
+<pre>
+$mock-&gt;expectOnce('method', array(new IdenticalExpectation(14)));
+</pre>
+                This is the same as <span class="new_code">$mock-&gt;expectOnce('method', array(14))</span>.
+<pre>
+$mock-&gt;expectOnce('method', array(new EqualExpectation(14)));
+</pre>
+                This is different from the previous version in that the string
+                <span class="new_code">"14"</span> as a parameter will also pass.
+                Sometimes the additional type checks of SimpleTest are too restrictive.
+<pre>
+$mock-&gt;expectOnce('method', array(new AnythingExpectation(14)));
+</pre>
+                This is the same as <span class="new_code">$mock-&gt;expectOnce('method', array('*'))</span>.
+<pre>
+$mock-&gt;expectOnce('method', array(new IdenticalExpectation('*')));
+</pre>
+                This is handy if you want to assert a literal <span class="new_code">"*"</span>.
+<pre>
+new NotIdenticalExpectation(14)
+</pre>
+                This matches on anything other than integer 14.
+                Even the string <span class="new_code">"14"</span> would pass.
+<pre>
+new WithinMarginExpectation(14.0, 0.001)
+</pre>
+                This will accept any value from 13.999 to 14.001 inclusive.
+            </p>
+        
+        <h2>
+<a class="target" name="behaviour"></a>Using expectations to control stubs</h2>
+            <p>
+                The expectation classes can be used not just for sending assertions
+                from mock objects, but also for selecting behaviour for the
+                <a href="mock_objects_documentation.html">mock objects</a>.
+                Anywhere a list of arguments is given, a list of expectation objects
+                can be inserted instead.
+            </p>
+            <p>
+                Suppose we want a mock authorisation server to simulate a successful login,
+                but only if it receives a valid session object.
+                We can do this as follows...
+<pre>
+Mock::generate('Authorisation');
+<strong>
+$authorisation = new MockAuthorisation();
+$authorisation-&gt;returns(
+        'isAllowed',
+        true,
+        array(new IsAExpectation('Session', 'Must be a session')));
+$authorisation-&gt;returns('isAllowed', false);</strong>
+</pre>
+                We have set the default mock behaviour to return false when
+                <span class="new_code">isAllowed</span> is called.
+                When we call the method with a single parameter that
+                is a <span class="new_code">Session</span> object, it will return true.
+                We have also added a second parameter as a message.
+                This will be displayed as part of the mock object
+                failure message if this expectation is the cause of
+                a failure.
+            </p>
+            <p>
+                This kind of sophistication is rarely useful, but is included for
+                completeness.
+            </p>
+        
+        <h2>
+<a class="target" name="extending"></a>Creating your own expectations</h2>
+            <p>
+                The expectation classes have a very simple structure.
+                So simple that it is easy to create your own versions for
+                commonly used test logic.
+            </p>
+            <p>
+                As an example here is the creation of a class to test for
+                valid IP addresses.
+                In order to work correctly with the stubs and mocks the new
+                expectation class should extend
+                <span class="new_code">SimpleExpectation</span> or further extend a subclass...
+<pre>
+<strong>class ValidIp extends SimpleExpectation {
+    
+    function test($ip) {
+        return (ip2long($ip) != -1);
+    }
+    
+    function testMessage($ip) {
+        return "Address [$ip] should be a valid IP address";
+    }
+}</strong>
+</pre>
+                There are only two methods to implement.
+                The <span class="new_code">test()</span> method should
+                evaluate to true if the expectation is to pass, and
+                false otherwise.
+                The <span class="new_code">testMessage()</span> method
+                should simply return some helpful text explaining the test
+                that was carried out.
+            </p>
+            <p>
+                This class can now be used in place of the earlier expectation
+                classes.
+            </p>
+            <p>
+                Here is a more typical example, matching part of a hash...
+<pre>
+<strong>class JustField extends EqualExpectation {
+    private $key;
+    
+    function __construct($key, $expected) {
+        parent::__construct($expected);
+        $this-&gt;key = $key;
+    }
+    
+    function test($compare) {
+        if (! isset($compare[$this-&gt;key])) {
+            return false;
+        }
+        return parent::test($compare[$this-&gt;key]);
+    }
+    
+    function testMessage($compare) {
+        if (! isset($compare[$this-&gt;key])) {
+            return 'Key [' . $this-&gt;key . '] does not exist';
+        }
+        return 'Key [' . $this-&gt;key . '] -&gt; ' .
+                parent::testMessage($compare[$this-&gt;key]);
+    }
+}</strong>
+</pre>
+                We tend to seperate message clauses with
+                "&amp;nbsp;-&gt;&amp;nbsp;".
+                This allows derivative tools to reformat the output.
+            </p>
+            <p>
+                Suppose some authenticator is expecting to be given
+                a database row corresponding to the user, and we
+                only need to confirm the username is correct.
+                We can assert just their username with...
+<pre>
+$mock-&gt;expectOnce('authenticate',
+                  array(new JustKey('username', 'marcus')));
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="unit"></a>Under the bonnet of the unit tester</h2>
+            <p>
+                The <a href="http://sourceforge.net/projects/simpletest/">SimpleTest unit testing framework</a>
+                also uses the expectation classes internally for the
+                <a href="unit_test_documentation.html">UnitTestCase class</a>.
+                We can also take advantage of these mechanisms to reuse our
+                homebrew expectation classes within the test suites directly.
+            </p>
+            <p>
+                The most crude way of doing this is to use the generic
+                <span class="new_code">SimpleTest::assert()</span> method to
+                test against it directly...
+<pre>
+<strong>class TestOfNetworking extends UnitTestCase {
+    ...
+    function testGetValidIp() {
+        $server = &amp;new Server();
+        $this-&gt;assert(
+                new ValidIp(),
+                $server-&gt;getIp(),
+                'Server IP address-&gt;%s');
+    }
+}</strong>
+</pre>
+                <span class="new_code">assert()</span> will test any expectation class directly.
+            </p>
+            <p>
+                This is a little untidy compared with our usual
+                <span class="new_code">assert...()</span> syntax.
+            </p>
+            <p>
+                For such a simple case we would normally create a
+                separate assertion method on our test case rather
+                than bother using the expectation class.
+                If we pretend that our expectation is a little more
+                complicated for a moment, so that we want to reuse it,
+                we get...
+<pre>
+class TestOfNetworking extends UnitTestCase {
+    ...<strong>
+    function assertValidIp($ip, $message = '%s') {
+        $this-&gt;assert(new ValidIp(), $ip, $message);
+    }</strong>
+    
+    function testGetValidIp() {
+        $server = &amp;new Server();<strong>
+        $this-&gt;assertValidIp(
+                $server-&gt;getIp(),
+                'Server IP address-&gt;%s');</strong>
+    }
+}
+</pre>
+                It is rare to need the expectations for more than pattern
+                matching, but these facilities do allow testers to build
+                some sort of domain language for testing their application.
+                Also, complex expectation classes could make the tests
+                harder to read and debug.
+                In effect extending the test framework to create their own tool set.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The expectations mimic the constraints in <a href="http://www.jmock.org/">JMock</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">Full API for SimpleTest</a>
+            from the PHPDoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <span class="chosen">Expectations</span>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/form_testing_documentation.html b/3rdparty/simpletest/docs/en/form_testing_documentation.html
new file mode 100644
index 00000000000..328735c9dca
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/form_testing_documentation.html
@@ -0,0 +1,351 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest documentation for testing HTML forms</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <span class="chosen">Testing forms</span>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Form testing documentation</h1>
+        This page...
+        <ul>
+<li>
+            Changing form values and successfully
+            <a href="#submit">Submitting a simple form</a>
+        </li>
+<li>
+            Handling <a href="#multiple">widgets with multiple values</a>
+            by setting lists.
+        </li>
+<li>
+            Bypassing javascript to <a href="#hidden-field">set a hidden field</a>.
+        </li>
+<li>
+            <a href="#raw">Raw posting</a> when you don't have a button
+            to click.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="submit"></a>Submitting a simple form</h2>
+            <p>
+                When a page is fetched by the <span class="new_code">WebTestCase</span>
+                using <span class="new_code">get()</span> or
+                <span class="new_code">post()</span> the page content is
+                automatically parsed.
+                This results in any form controls that are inside &lt;form&gt; tags
+                being available from within the test case.
+                For example, if we have this snippet of HTML...
+<pre>
+&lt;form&gt;
+    &lt;input type="text" name="a" value="A default" /&gt;
+    &lt;input type="submit" value="Go" /&gt;
+&lt;/form&gt;
+</pre>
+                Which looks like this...
+            </p>
+            <p>
+                <form class="demo">
+                    <input type="text" name="a" value="A default">
+                    <input type="submit" value="Go">
+                </form>
+            </p>
+            <p>
+                We can navigate to this code, via the
+                <a href="http://www.lastcraft.com/form_testing_documentation.php">LastCraft</a>
+                site, with the following test...
+<pre>
+class SimpleFormTests extends WebTestCase {<strong>
+    function testDefaultValue() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('a', 'A default');
+    }</strong>
+}
+</pre>
+                Immediately after loading the page all of the HTML controls are set at
+                their default values just as they would appear in the web browser.
+                The assertion tests that a HTML widget exists in the page with the
+                name "a" and that it is currently set to the value
+                "A default".
+                As usual, we could use a pattern expectation instead of a fixed
+                string.
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testDefaultValue() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('a', <strong>new PatternExpectation('/default/')</strong>);
+    }
+}
+</pre>
+                We could submit the form straight away, but first we'll change
+                the value of the text field and only then submit it...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testDefaultValue() {
+        $this-&gt;get('http://www.my-site.com/');
+        $this-&gt;assertField('a', 'A default');<strong>
+        $this-&gt;setField('a', 'New value');
+        $this-&gt;click('Go');</strong>
+    }
+}
+</pre>
+                Because we didn't specify a method attribute on the form tag, and
+                didn't specify an action either, the test case will follow
+                the usual browser behaviour of submitting the form data as a <em>GET</em>
+                request back to the same location.
+                In general SimpleTest tries to emulate typical browser behaviour as much as possible,
+                rather than attempting to catch any form of HTML omission.
+                This is because the target of the testing framework is the PHP application
+                logic, not syntax or other errors in the HTML code.
+                For HTML errors, other tools such as
+                <a href="http://www.w3.org/People/Raggett/tidy/">HTMLTidy</a> should be used,
+                or any of the HTML and CSS validators already out there.
+            </p>
+            <p>
+                If a field is not present in any form, or if an option is unavailable,
+                then <span class="new_code">WebTestCase::setField()</span> will return
+                <span class="new_code">false</span>.
+                For example, suppose we wish to verify that a "Superuser"
+                option is not present in this form...
+<pre>
+&lt;strong&gt;Select type of user to add:&lt;/strong&gt;
+&lt;select name="type"&gt;
+    &lt;option&gt;Subscriber&lt;/option&gt;
+    &lt;option&gt;Author&lt;/option&gt;
+    &lt;option&gt;Administrator&lt;/option&gt;
+&lt;/select&gt;
+</pre>
+                Which looks like...
+            </p>
+            <p>
+                <form class="demo">
+                    <strong>Select type of user to add:</strong>
+                    <select name="type">
+                        <option>Subscriber</option>
+                        <option>Author</option>
+                        <option>Administrator</option>
+                    </select>
+                </form>
+            </p>
+            <p>
+                The following test will confirm it...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...
+    function testNoSuperuserChoiceAvailable() {<strong>
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertFalse($this-&gt;setField('type', 'Superuser'));</strong>
+    }
+}
+</pre>
+                The current selection will not be changed if the new value is not an option.
+            </p>
+            <p>
+                Here is the full list of widgets currently supported...
+                <ul>
+                    <li>Text fields, including hidden and password fields.</li>
+                    <li>Submit buttons including the button tag, although not yet reset buttons</li>
+                    <li>Text area. This includes text wrapping behaviour.</li>
+                    <li>Checkboxes, including multiple checkboxes in the same form.</li>
+                    <li>Drop down selections, including multiple selects.</li>
+                    <li>Radio buttons.</li>
+                    <li>Images.</li>
+                </ul>
+            </p>
+            <p>
+                The browser emulation offered by SimpleTest mimics
+                the actions which can be perform by a user on a
+                standard HTML page. Javascript is not supported, and
+                it's unlikely that support will be added any time
+                soon.
+            </p>
+            <p>
+                Of particular note is that the Javascript idiom of
+                passing form results by setting a hidden field cannot
+                be performed using the normal SimpleTest
+                commands. See below for a way to test such forms.
+            </p>
+        
+        <h2>
+<a class="target" name="multiple"></a>Fields with multiple values</h2>
+            <p>
+                SimpleTest can cope with two types of multivalue controls: Multiple
+                selection drop downs, and multiple checkboxes with the same name
+                within a form.
+                The multivalue nature of these means that setting and testing
+                are slightly different.
+                Using checkboxes as an example...
+<pre>
+&lt;form class="demo"&gt;
+    &lt;strong&gt;Create privileges allowed:&lt;/strong&gt;
+    &lt;input type="checkbox" name="crud" value="c" checked&gt;&lt;br&gt;
+    &lt;strong&gt;Retrieve privileges allowed:&lt;/strong&gt;
+    &lt;input type="checkbox" name="crud" value="r" checked&gt;&lt;br&gt;
+    &lt;strong&gt;Update privileges allowed:&lt;/strong&gt;
+    &lt;input type="checkbox" name="crud" value="u" checked&gt;&lt;br&gt;
+    &lt;strong&gt;Destroy privileges allowed:&lt;/strong&gt;
+    &lt;input type="checkbox" name="crud" value="d" checked&gt;&lt;br&gt;
+    &lt;input type="submit" value="Enable Privileges"&gt;
+&lt;/form&gt;
+</pre>
+                Which renders as...
+            </p>
+            <p>
+                <form class="demo">
+                    <strong>Create privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="c" checked><br>
+                    <strong>Retrieve privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="r" checked><br>
+                    <strong>Update privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="u" checked><br>
+                    <strong>Destroy privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="d" checked><br>
+                    <input type="submit" value="Enable Privileges">
+                </form>
+            </p>
+            <p>
+                If we wish to disable all but the retrieval privileges and
+                submit this information we can do it like this...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...<strong>
+    function testDisableNastyPrivileges() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('crud', array('c', 'r', 'u', 'd'));
+        $this-&gt;setField('crud', array('r'));
+        $this-&gt;click('Enable Privileges');
+    }</strong>
+}
+</pre>
+                Instead of setting the field to a single value, we give it a list
+                of values.
+                We do the same when testing expected values.
+                We can then write other test code to confirm the effect of this, perhaps
+                by logging in as that user and attempting an update.
+            </p>
+        
+        <h2>
+<a class="target" name="hidden-field"></a>Forms which use javascript to set a hidden field</h2>
+            <p>
+                If you want to test a form which relies on javascript to set a hidden
+                field, you can't just call setField().
+                The following code will <em>not</em> work:
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testEmulateMyJavascriptForm() {
+        <strong>// This does *not* work</strong>
+        $this-&gt;setField('a_hidden_field', '123');
+        $this-&gt;clickSubmit('OK');
+    }
+}
+</pre>
+                Instead, you need to pass the additional form parameters to the
+                clickSubmit() method:
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testMyJavascriptForm() {
+        <strong>$this-&gt;clickSubmit('OK', array('a_hidden_field'=&gt;'123'));</strong>
+    }
+
+}
+</pre>
+                Bear in mind that in doing this you're effectively stubbing out a
+                part of your software (the javascript code in the form), and
+                perhaps you might be better off using something like 
+                <a href="http://selenium.openqa.org/">Selenium</a> to ensure a complete
+                test.
+            </p>
+        
+        <h2>
+<a class="target" name="raw"></a>Raw posting</h2>
+            <p>
+                If you want to test a form handler, but have not yet written
+                or do not have access to the form itself, you can create a
+                form submission by hand.
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...<strong>    
+    function testAttemptedHack() {
+        $this-&gt;post(
+                'http://www.my-site.com/add_user.php',
+                array('type' =&gt; 'superuser'));
+        $this-&gt;assertNoText('user created');
+    }</strong>
+}
+</pre>
+                By adding data to the <span class="new_code">WebTestCase::post()</span>
+                method, we are emulating a form submission.
+                You would normally only do this as a temporary expedient, or where
+                you are expecting a 3rd party to submit to a form.
+                The exception is when you want tests to protect you from
+                attempts to spoof your pages.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <span class="chosen">Testing forms</span>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/group_test_documentation.html b/3rdparty/simpletest/docs/en/group_test_documentation.html
new file mode 100644
index 00000000000..10f22a2b1b9
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/group_test_documentation.html
@@ -0,0 +1,252 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP test suites</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <span class="chosen">Group tests</span>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Test suite documentation</h1>
+        This page...
+        <ul>
+<li>
+            Different ways to <a href="#group">group tests</a> together.
+        </li>
+<li>
+            Combining group tests into <a href="#higher">larger groups</a>.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="group"></a>Grouping tests into suites</h2>
+            <p>
+                There are many ways to group tests together into test suites.
+                One way is to simply place multiple test cases into a single file...
+<pre>
+<strong>&lt;?php
+require_once(dirname(__FILE__) . '/simpletest/autorun.php');
+require_once(dirname(__FILE__) . '/../classes/io.php');
+
+class FileTester extends UnitTestCase {
+    ...
+}
+
+class SocketTester extends UnitTestCase {
+    ...
+}
+?&gt;</strong>
+</pre>
+                As many cases as needed can appear in a single file.
+                They should include any code they need, such as the library
+                being tested, but need none of the SimpleTest libraries.
+            </p>
+            <p>
+                Occasionally special subclasses are created that methods useful
+                for testing part of the application.
+                These new base classes are then used in place of <span class="new_code">UnitTestCase</span>
+                or <span class="new_code">WebTestCase</span>.
+                You don't normally want to run these as test cases.
+                Simply mark any base test cases that should not be run as abstract...
+<pre>
+<strong>abstract</strong> class MyFileTestCase extends UnitTestCase {
+    ...
+}
+
+class FileTester extends MyFileTestCase { ... }
+
+class SocketTester extends UnitTestCase { ... }
+</pre>
+                Here the <span class="new_code">FileTester</span> class does
+                not contain any actual tests, but is the base class for other
+                test cases.
+            </p>
+            <p>
+                We will call this sample <em>file_test.php</em>.
+                Currently the test cases are grouped simply by being in the same file.
+                We can build larger constructs just by including other test files in.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('file_test.php');
+?&gt;
+</pre>
+                This will work, but create a purely flat hierarchy.
+                INstead we create a test suite file.
+                Our top level test suite can look like this...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class AllFileTests extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        <strong>$this-&gt;addFile('file_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                What happens here is that the <span class="new_code">TestSuite</span>
+                class will do the <span class="new_code">require_once()</span>
+                for us.
+                It then checks to see if any new test case classes
+                have been created by the new file and automatically composes
+                them to the test suite.
+                This method gives us the most control as we just manually add
+                more test files as our test suite grows.
+            </p>
+            <p>
+                If this is too much typing, and you are willing to group
+                test suites together in their own directories or otherwise
+                tag the file names, then there is a more automatic way...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class AllFileTests extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;collect(dirname(__FILE__) . '/unit',
+                       new SimplePatternCollector('/_test.php/'));
+    }
+}
+?&gt;
+</pre>
+                This will scan a directory called "unit" for any files
+                ending with "_test.php" and load them.
+                You don't have to use <span class="new_code">SimplePatternCollector</span> to
+                filter by a pattern in the filename, but this is the most common
+                usage.
+            </p>
+            <p>
+                That snippet above is very common in practice.
+                Now all you have to do is drop a file of test cases into the
+                directory and it will run just by running the test suite script.
+            </p>
+            <p>
+                The catch is that you cannot control the order in which the test
+                cases are run.
+                If you want to see lower level components fail first in the test suite,
+                and this will make diagnosis a lot easier, then you should manually
+                call <span class="new_code">addFile()</span> for these.
+                Tests cases are only loaded once, so it's fine to have these included
+                again by a directory scan.
+            </p>
+            <p>
+                Test cases loaded with the <span class="new_code">addFile</span> method have some
+                useful properties.
+                You can guarantee that the constructor is run
+                just before the first test method and the destructor
+                is run just after the last test method.
+                This allows you to place test case wide set up and tear down
+                code in the constructor and destructor, just like a normal
+                class.
+            </p>
+        
+        <h2>
+<a class="target" name="higher"></a>Composite suites</h2>
+            <p>
+                The above method places all of the test cases into one large suite.
+                For larger projects though this may not be flexible enough; you
+                may want to group the tests together in all sorts of ways.
+            </p>
+            <p>
+                Everything we have described so far with test scripts applies to
+                <span class="new_code">TestSuite</span>s as well...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+<strong>
+class BigTestSuite extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('file_tests.php');
+    }
+}</strong>
+?&gt;
+</pre>
+                This effectively adds our test cases and a single suite below
+                the first.
+                When a test fails, we see the breadcrumb trail of the nesting.
+                We can even mix groups and test cases freely as long as
+                we are careful about loops in our includes.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class BigTestSuite extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('file_tests.php');
+        <strong>$this-&gt;addFile('some_other_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                Note that in the event of a double include, ony the first instance
+                of the test case will be run.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <span class="chosen">Group tests</span>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/index.html b/3rdparty/simpletest/docs/en/index.html
new file mode 100644
index 00000000000..9f022d6b10b
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/index.html
@@ -0,0 +1,542 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+        Download the SimpleTest testing framework -
+        Unit tests and mock objects for PHP
+    </title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<span class="chosen">SimpleTest</span>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>SimpleTest for PHP</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#unit">Using unit tester</a>
+            with an example.
+        </li>
+<li>
+            <a href="#group">Grouping tests</a>
+            for testing with one click.
+        </li>
+<li>
+            <a href="#mock">Using mock objects</a>
+            to ease testing and gain tighter control.
+        </li>
+<li>
+            <a href="#web">Testing web pages</a>
+            at the browser level.
+        </li>
+</ul>
+<div class="content">
+        
+        
+            <p>
+                The following assumes that you are familiar with the concept
+                of unit testing as well as the PHP web development language.
+                It is a guide for the impatient new user of
+                <a href="https://sourceforge.net/project/showfiles.php?group_id=76550">SimpleTest</a>.
+                For fuller documentation, especially if you are new
+                to unit testing see the ongoing
+                <a href="unit_test_documentation.html">documentation</a>, and for
+                example test cases see the
+                <a href="http://www.lastcraft.com/first_test_tutorial.php">unit testing tutorial</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="unit"></a>Using the tester quickly</h2>
+            <p>
+                Amongst software testing tools, a unit tester is the one
+                closest to the developer.
+                In the context of agile development the test code sits right
+                next to the source code as both are written simultaneously.
+                In this context SimpleTest aims to be a complete PHP developer
+                test solution and is called "Simple" because it
+                should be easy to use and extend.
+                It wasn't a good choice of name really.
+                It includes all of the typical functions you would expect from
+                <a href="http://www.junit.org/">JUnit</a> and the
+                <a href="http://sourceforge.net/projects/phpunit/">PHPUnit</a>
+                ports, and includes
+                <a href="http://www.mockobjects.com">mock objects</a>.
+            </p>
+            <p>
+                What makes this tool immediately useful to the PHP developer is the internal
+                web browser.
+                This allows tests that navigate web sites, fill in forms and test pages.
+                Being able to write these test in PHP means that it is easy to write
+                integrated tests.
+                An example might be confirming that a user was written to a database
+                after a signing up through the web site.
+            </p>
+            <p>
+                The quickest way to demonstrate SimpleTest is with an example.
+            </p>
+            <p>
+                Let us suppose we are testing a simple file logging class called
+                <span class="new_code">Log</span> in <em>classes/log.php</em>.
+                We start by creating a test script which we will call
+                <em>tests/log_test.php</em> and populate it as follows...
+<pre>
+&lt;?php
+<strong>require_once('simpletest/autorun.php');</strong>
+require_once('../classes/log.php');
+
+class TestOfLogging extends <strong>UnitTestCase</strong> {
+}
+?&gt;
+</pre>
+                Here the <em>simpletest</em> folder is either local or in the path.
+                You would have to edit these locations depending on where you
+                unpacked the toolset.
+                The "autorun.php" file does more than just include the
+                SimpleTest files, it also runs our test for us.
+            </p>
+            <p>
+                The <span class="new_code">TestOfLogging</span> is our first test case and it's
+                currently empty.
+                Each test case is a class that extends one of the SimpleTet base classes
+                and we can have as many of these in the file as we want.
+            </p>
+            <p>
+                With three lines of scaffolding, and our <span class="new_code">Log</span> class
+                include, we have a test suite.
+                No tests though.
+            </p>
+            <p>
+                For our first test, we'll assume that the <span class="new_code">Log</span> class
+                takes the file name to write to in the constructor, and we have
+                a temporary folder in which to place this file...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+
+class TestOfLogging extends UnitTestCase {
+    function <strong>testLogCreatesNewFileOnFirstMessage()</strong> {
+        @unlink('/temp/test.log');
+        $log = new Log('/temp/test.log');
+        <strong>$this-&gt;assertFalse(file_exists('/temp/test.log'));</strong>
+        $log-&gt;message('Should write this to a file');
+        <strong>$this-&gt;assertTrue(file_exists('/temp/test.log'));</strong>
+    }
+}
+?&gt;
+</pre>
+                When a test case runs, it will search for any method that
+                starts with the string "test"
+                and execute that method.
+                If the method starts "test", it's a test.
+                Note the very long name <span class="new_code">testLogCreatesNewFileOnFirstMessage()</span>.
+                This is considered good style and makes the test output more readable.
+            </p>
+            <p>
+                We would normally have more than one test method in a test case,
+                but that's for later.
+            </p>
+            <p>
+                Assertions within the test methods trigger messages to the
+                test framework which displays the result immediately.
+                This immediate response is important, not just in the event
+                of the code causing a crash, but also so that
+                <span class="new_code">print</span> statements can display
+                their debugging content right next to the assertion concerned.
+            </p>
+            <p>
+                To see these results we have to actually run the tests.
+                No other code is necessary - we can just open the page
+                with our browser.
+            </p>
+            <p>
+                On failure the display looks like this...
+                <div class="demo">
+                    <h1>TestOfLogging</h1>
+                    <span class="fail">Fail</span>: testLogCreatesNewFileOnFirstMessage-&gt;True assertion failed.<br>
+                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
+                    <strong>1</strong> passes and <strong>1</strong> fails.</div>
+                </div>
+                ...and if it passes like this...
+                <div class="demo">
+                    <h1>TestOfLogging</h1>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>2</strong> passes and <strong>0</strong> fails.</div>
+                </div>
+                And if you get this...
+                <div class="demo">
+                    <b>Fatal error</b>:  Failed opening required '../classes/log.php' (include_path='') in <b>/home/marcus/projects/lastcraft/tutorial_tests/Log/tests/log_test.php</b> on line <b>7</b>
+                </div>
+                it means you're missing the <em>classes/Log.php</em> file that could look like...
+<pre>
+&lt;?php<strong>
+class Log {
+    function Log($file_path) {
+    }
+
+    function message() {
+    }
+}</strong>
+?&gt;
+</pre>
+                It's fun to write the code after the test.
+                More than fun even -
+                this system is called "Test Driven Development".
+            </p>
+            <p>
+                For more information about <span class="new_code">UnitTestCase</span>, see
+                the <a href="unit_test_documentation.html">unit test documentation</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="group"></a>Building test suites</h2>
+            <p>
+                It is unlikely in a real application that we will only ever run
+                one test case.
+                This means that we need a way of grouping cases into a test
+                script that can, if need be, run every test for the application.
+            </p>
+            <p>
+                Our first step is to create a new file called <em>tests/all_tests.php</em>
+                and insert the following code...
+<pre>
+&lt;?php
+<strong>require_once('simpletest/autorun.php');</strong>
+
+class AllTests extends <strong>TestSuite</strong> {
+    function AllTests() {
+        $this-&gt;TestSuite(<strong>'All tests'</strong>);
+        <strong>$this-&gt;addFile('log_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                The "autorun" include allows our upcoming test suite
+                to be run just by invoking this script.
+            </p>
+            <p>
+                The <span class="new_code">TestSuite</span> subclass must chain it's constructor.
+                This limitation will be removed in future versions.
+            </p>
+            <p>
+                The method <span class="new_code">TestSuite::addFile()</span>
+                will include the test case file and read any new classes
+                that are descended from <span class="new_code">SimpleTestCase</span>.
+                <span class="new_code">UnitTestCase</span> is just one example of a class derived from
+                <span class="new_code">SimpleTestCase</span>, and you can create your own.
+                <span class="new_code">TestSuite::addFile()</span> can include other test suites.
+            </p>
+            <p>
+                The class will not be instantiated yet.
+                When the test suite runs it will construct each instance once
+                it reaches that test, then destroy it straight after.
+                This means that the constructor is run just before each run
+                of that test case, and the destructor is run before the next test case starts.
+            </p>
+            <p>
+                It is common to group test case code into superclasses which are not
+                supposed to run, but become the base classes of other tests.
+                For "autorun" to work properly the test case file should not blindly run
+                any other test case extensions that do not actually run tests.
+                This could result in extra test cases being counted during the test
+                run.
+                Hardly a major problem, but to avoid this inconvenience simply mark your
+                base class as <span class="new_code">abstract</span>.
+                SimpleTest won't run abstract classes.
+                If you are still using PHP4, then
+                a <span class="new_code">SimpleTestOptions::ignore()</span> directive
+                somewhere in the test case file will have the same effect.
+            </p>
+            <p>
+                Also, the test case file should not have been included
+                elsewhere or no cases will be added to this group test.
+                This would be a more serious error as if the test case classes are
+                already loaded by PHP the <span class="new_code">TestSuite::addFile()</span>
+                method will not detect them.
+            </p>
+            <p>
+                To display the results it is necessary only to invoke
+                <em>tests/all_tests.php</em> from the web server or the command line.
+            </p>
+            <p>
+                For more information about building test suites,
+                see the <a href="group_test_documentation.html">test suite documentation</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="mock"></a>Using mock objects</h2>
+            <p>
+                Let's move further into the future and do something really complicated.
+            </p>
+            <p>
+                Assume that our logging class is tested and completed.
+                Assume also that we are testing another class that is
+                required to write log messages, say a
+                <span class="new_code">SessionPool</span>.
+                We want to test a method that will probably end up looking
+                like this...
+<pre><strong>
+class SessionPool {
+    ...
+    function logIn($username) {
+        ...
+        $this-&gt;_log-&gt;message("User $username logged in.");
+        ...
+    }
+    ...
+}
+</strong>
+</pre>
+                In the spirit of reuse, we are using our
+                <span class="new_code">Log</span> class.
+                A conventional test case might look like this...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+<strong>require_once('../classes/session_pool.php');</strong>
+
+class <strong>TestOfSessionLogging</strong> extends UnitTestCase {
+    
+    function setUp() {
+        <strong>@unlink('/temp/test.log');</strong>
+    }
+    
+    function tearDown() {
+        <strong>@unlink('/temp/test.log');</strong>
+    }
+    
+    function testLoggingInIsLogged() {
+        <strong>$log = new Log('/temp/test.log');
+        $session_pool = &amp;new SessionPool($log);
+        $session_pool-&gt;logIn('fred');</strong>
+        $messages = file('/temp/test.log');
+        $this-&gt;assertEqual($messages[0], "User fred logged in.<strong>\n</strong>");
+    }
+}
+?&gt;
+</pre>
+                We'll explain the <span class="new_code">setUp()</span> and <span class="new_code">tearDown()</span>
+                methods later.
+            </p>
+            <p>
+                This test case design is not all bad, but it could be improved.
+                We are spending time fiddling with log files which are
+                not part of our test.
+                We have created close ties with the <span class="new_code">Log</span> class and
+                this test.
+                What if we don't use files any more, but use ths
+                <em>syslog</em> library instead?
+                It means that our <span class="new_code">TestOfSessionLogging</span> test will
+                fail, even thouh it's not testing Logging.
+            </p>
+            <p>
+                It's fragile in smaller ways too.
+                Did you notice the extra carriage return in the message?
+                Was that added by the logger?
+                What if it also added a time stamp or other data?
+            </p>
+            <p>
+                The only part that we really want to test is that a particular
+                message was sent to the logger.
+                We can reduce coupling if we pass in a fake logging class
+                that simply records the message calls for testing, but
+                takes no action.
+                It would have to look exactly like our original though.
+            </p>
+            <p>
+                If the fake object doesn't write to a file then we save on deleting
+                the file before and after each test. We could save even more
+                test code if the fake object would kindly run the assertion for us.
+            <p>
+            </p>
+                Too good to be true?
+                We can create such an object easily...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+require_once('../classes/session_pool.php');
+
+<strong>Mock::generate('Log');</strong>
+
+class TestOfSessionLogging extends UnitTestCase {
+    
+    function testLoggingInIsLogged() {<strong>
+        $log = &amp;new MockLog();
+        $log-&gt;expectOnce('message', array('User fred logged in.'));</strong>
+        $session_pool = &amp;new SessionPool(<strong>$log</strong>);
+        $session_pool-&gt;logIn('fred');
+    }
+}
+?&gt;
+</pre>
+                The <span class="new_code">Mock::generate()</span> call code generated a new class
+                called <span class="new_code">MockLog</span>.
+                This looks like an identical clone, except that we can wire test code
+                to it.
+                That's what <span class="new_code">expectOnce()</span> does.
+                It says that if <span class="new_code">message()</span> is ever called on me, it had
+                better be with the parameter "User fred logged in.".
+            </p>
+            <p>
+                The test will be triggered when the call to
+                <span class="new_code">message()</span> is invoked on the
+                <span class="new_code">MockLog</span> object by <span class="new_code">SessionPool::logIn()</span> code.
+                The mock call will trigger a parameter comparison and then send the
+                resulting pass or fail event to the test display.
+                Wildcards can be included here too, so you don't have to test every parameter of
+                a call when you only want to test one.
+            </p>
+            <p>
+                If the mock reaches the end of the test case without the
+                method being called, the <span class="new_code">expectOnce()</span>
+                expectation will trigger a test failure.
+                In other words the mocks can detect the absence of
+                behaviour as well as the presence.
+            </p>
+            <p>
+                The mock objects in the SimpleTest suite can have arbitrary
+                return values set, sequences of returns, return values
+                selected according to the incoming arguments, sequences of
+                parameter expectations and limits on the number of times
+                a method is to be invoked.
+            </p>
+            <p>
+                For more information about mocking and stubbing, see the
+                <a href="mock_objects_documentation.html">mock objects documentation</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="web"></a>Web page testing</h2>
+            <p>
+                One of the requirements of web sites is that they produce web
+                pages.
+                If you are building a project top-down and you want to fully
+                integrate testing along the way then you will want a way of
+                automatically navigating a site and examining output for
+                correctness.
+                This is the job of a web tester.
+            </p>
+            <p>
+                The web testing in SimpleTest is fairly primitive, as there is
+                no JavaScript.
+                Most other browser operations are simulated.
+            </p>
+            <p>
+                To give an idea here is a trivial example where a home
+                page is fetched, from which we navigate to an "about"
+                page and then test some client determined content.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+<strong>require_once('simpletest/web_tester.php');</strong>
+
+class TestOfAbout extends <strong>WebTestCase</strong> {
+    function testOurAboutPageGivesFreeReignToOurEgo() {
+        <strong>$this-&gt;get('http://test-server/index.php');
+        $this-&gt;click('About');
+        $this-&gt;assertTitle('About why we are so great');
+        $this-&gt;assertText('We are really great');</strong>
+    }
+}
+?&gt;
+</pre>
+                With this code as an acceptance test, you can ensure that
+                the content always meets the specifications of both the
+                developers, and the other project stakeholders.
+            </p>
+            <p>
+                You can navigate forms too...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('simpletest/web_tester.php');
+
+class TestOfRankings extends WebTestCase {
+    function testWeAreTopOfGoogle() {
+        $this-&gt;get('http://google.com/');
+        $this-&gt;setField('q', 'simpletest');
+        $this-&gt;click("I'm Feeling Lucky");
+        $this-&gt;assertTitle('SimpleTest - Unit Testing for PHP');
+    }
+}
+?&gt;
+</pre>
+                ...although this could violate Google's(tm) terms and conditions.
+            </p>
+            <p>
+                For more information about web testing, see the
+                <a href="browser_documentation.html">scriptable
+                browser documentation</a> and the
+                <a href="web_tester_documentation.html">WebTestCase</a>.
+            </p>
+            <p>
+                <a href="http://sourceforge.net/projects/simpletest/"><img src="http://sourceforge.net/sflogo.php?group_id=76550&amp;type=5" width="210" height="62" border="0" alt="SourceForge.net Logo"></a>
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            <a href="https://sourceforge.net/project/showfiles.php?group_id=76550&amp;release_id=153280">Download PHP SimpleTest</a>
+            from <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<span class="chosen">SimpleTest</span>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/mock_objects_documentation.html b/3rdparty/simpletest/docs/en/mock_objects_documentation.html
new file mode 100644
index 00000000000..b4697f9ee3b
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/mock_objects_documentation.html
@@ -0,0 +1,870 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP mock objects documentation</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <span class="chosen">Mock objects</span>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Mock objects documentation</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#what">What are mock objects?</a>
+        </li>
+<li>
+            <a href="#creation">Creating mock objects</a>.
+        </li>
+<li>
+            <a href="#expectations">Mocks as critics</a> with expectations.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="what"></a>What are mock objects?</h2>
+            <p>
+                Mock objects have two roles during a test case: actor and critic.
+            </p>
+            <p>
+                The actor behaviour is to simulate objects that are difficult to
+                set up or time consuming to set up for a test.
+                The classic example is a database connection.
+                Setting up a test database at the start of each test would slow
+                testing to a crawl and would require the installation of the
+                database engine and test data on the test machine.
+                If we can simulate the connection and return data of our
+                choosing we not only win on the pragmatics of testing, but can
+                also feed our code spurious data to see how it responds.
+                We can simulate databases being down or other extremes
+                without having to create a broken database for real.
+                In other words, we get greater control of the test environment.
+            </p>
+            <p>
+                If mock objects only behaved as actors they would simply be
+                known as "server stubs".
+                This was originally a pattern named by Robert Binder (<a href="">Testing
+                object-oriented systems</a>: models, patterns, and tools,
+                Addison-Wesley) in 1999.
+            </p>
+            <p>
+                A server stub is a simulation of an object or component.
+                It should exactly replace a component in a system for test
+                or prototyping purposes, but remain lightweight.
+                This allows tests to run more quickly, or if the simulated
+                class has not been written, to run at all.
+            </p>
+            <p>
+                However, the mock objects not only play a part (by supplying chosen
+                return values on demand) they are also sensitive to the
+                messages sent to them (via expectations).
+                By setting expected parameters for a method call they act
+                as a guard that the calls upon them are made correctly.
+                If expectations are not met they save us the effort of
+                writing a failed test assertion by performing that duty on our
+                behalf.
+            </p>
+            <p>
+                In the case of an imaginary database connection they can
+                test that the query, say SQL, was correctly formed by
+                the object that is using the connection.
+                Set them up with fairly tight expectations and you will
+                hardly need manual assertions at all.
+            </p>
+        
+        <h2>
+<a class="target" name="creation"></a>Creating mock objects</h2>
+            <p>
+                All we need is an existing class or interface, say a database connection
+                that looks like this...
+<pre>
+<strong>class DatabaseConnection {
+    function DatabaseConnection() { }
+    function query($sql) { }
+    function selectQuery($sql) { }
+}</strong>
+</pre>
+                To create a mock version of the class we need to run a
+                code generator...
+<pre>
+require_once('simpletest/autorun.php');
+require_once('database_connection.php');
+
+<strong>Mock::generate('DatabaseConnection');</strong>
+</pre>
+                This code generates a clone class called
+                <span class="new_code">MockDatabaseConnection</span>.
+                This new class appears to be the same, but actually has no behaviour at all.
+            </p>
+            <p>
+                The new class is usually a subclass of <span class="new_code">DatabaseConnection</span>.
+                Unfortunately, there is no way to create a mock version of a
+                class with a <span class="new_code">final</span> method without having a living version of
+                that method.
+                We consider that unsafe.
+                If the target is an interface, or if <span class="new_code">final</span> methods are
+                present in a target class, then a whole new class
+                is created, but one implemeting the same interfaces.
+                If you try to pass this separate class through a type hint that specifies
+                the old concrete class name, it will fail.
+                Code like that insists on type hinting to a class with <span class="new_code">final</span>
+                methods probably cannot be safely tested with mocks.
+            </p>
+            <p>
+                If you want to see the generated code, then simply <span class="new_code">print</span>
+                the output of <span class="new_code">Mock::generate()</span>.
+                Here is the generated code for the <span class="new_code">DatabaseConnection</span>
+                class rather than the interface version...
+<pre>
+class MockDatabaseConnection extends DatabaseConnection {
+    public $mock;
+    protected $mocked_methods = array('databaseconnection', 'query', 'selectquery');
+
+    function MockDatabaseConnection() {
+        $this-&gt;mock = new SimpleMock();
+        $this-&gt;mock-&gt;disableExpectationNameChecks();
+    }
+    ...
+    function DatabaseConnection() {
+        $args = func_get_args();
+        $result = &amp;$this-&gt;mock-&gt;invoke("DatabaseConnection", $args);
+        return $result;
+    }
+    function query($sql) {
+        $args = func_get_args();
+        $result = &amp;$this-&gt;mock-&gt;invoke("query", $args);
+        return $result;
+    }
+    function selectQuery($sql) {
+        $args = func_get_args();
+        $result = &amp;$this-&gt;mock-&gt;invoke("selectQuery", $args);
+        return $result;
+    }
+}
+</pre>
+                Your output may vary depending on the exact version
+                of SimpleTest you are using.
+            </p>
+            <p>
+                Besides the original methods of the class, you will see some extra
+                methods that help testing.
+                More on these later.
+            </p>
+            <p>
+                We can now create instances of the new class within
+                our test case...
+<pre>
+require_once('simpletest/autorun.php');
+require_once('database_connection.php');
+
+Mock::generate('DatabaseConnection');
+
+class MyTestCase extends UnitTestCase {
+
+    function testSomething() {
+        <strong>$connection = new MockDatabaseConnection();</strong>
+    }
+}
+</pre>
+                The mock version now has all the methods of the original.
+                Also, any type hints will be faithfully preserved.
+                Say our query methods expect a <span class="new_code">Query</span> object...
+<pre>
+<strong>class DatabaseConnection {
+    function DatabaseConnection() { }
+    function query(Query $query) { }
+    function selectQuery(Query $query) { }
+}</strong>
+</pre>
+                If we now pass the wrong type of object, or worse a non-object...
+<pre>
+class MyTestCase extends UnitTestCase {
+
+    function testSomething() {
+        $connection = new MockDatabaseConnection();
+        $connection-&gt;query('insert into accounts () values ()');
+    }
+}
+</pre>
+                ...the code will throw a type violation at you just as the
+                original class would.
+            </p>
+            <p>
+                The mock version now has all the methods of the original.
+                Unfortunately, they all return <span class="new_code">null</span>.
+                As methods that always return <span class="new_code">null</span> are not that useful,
+                we need to be able to set them to something else...
+            </p>
+            <p>
+                <a class="target" name="stub"><h2>Mocks as actors</h2></a>
+            </p>
+            <p>
+                Changing the return value of a method from <span class="new_code">null</span>
+                to something else is pretty easy...
+<pre>
+<strong>$connection-&gt;returns('query', 37)</strong>
+</pre>
+                Now every time we call
+                <span class="new_code">$connection-&gt;query()</span> we get
+                the result of 37.
+                There is nothing special about 37.
+                The return value can be arbitrarily complicated.
+            </p>
+            <p>
+                Parameters are irrelevant here, we always get the same
+                values back each time once they have been set up this way.
+                That may not sound like a convincing replica of a
+                database connection, but for the half a dozen lines of
+                a test method it is usually all you need.
+            </p>
+            <p>
+                Things aren't always that simple though.
+                One common problem is iterators, where constantly returning
+                the same value could cause an endless loop in the object
+                being tested.
+                For these we need to set up sequences of values.
+                Let's say we have a simple iterator that looks like this...
+<pre>
+class Iterator {
+    function Iterator() { }
+    function next() { }
+}
+</pre>
+                This is about the simplest iterator you could have.
+                Assuming that this iterator only returns text until it
+                reaches the end, when it returns false, we can simulate it
+                with...
+<pre>
+Mock::generate('Iterator');
+
+class IteratorTest extends UnitTestCase() {
+
+    function testASequence() {<strong>
+        $iterator = new MockIterator();
+        $iterator-&gt;returns('next', false);
+        $iterator-&gt;returnsAt(0, 'next', 'First string');
+        $iterator-&gt;returnsAt(1, 'next', 'Second string');</strong>
+        ...
+    }
+}
+</pre>
+                When <span class="new_code">next()</span> is called on the
+                <span class="new_code">MockIterator</span> it will first return "First string",
+                on the second call "Second string" will be returned
+                and on any other call <span class="new_code">false</span> will
+                be returned.
+                The sequenced return values take precedence over the constant
+                return value.
+                The constant one is a kind of default if you like.
+            </p>
+            <p>
+                Another tricky situation is an overloaded
+                <span class="new_code">get()</span> operation.
+                An example of this is an information holder with name/value pairs.
+                Say we have a configuration class like...
+<pre>
+class Configuration {
+    function Configuration() { ... }
+    function get($key) { ... }
+}
+</pre>
+                This is a likely situation for using mock objects, as
+                actual configuration will vary from machine to machine and
+                even from test to test.
+                The problem though is that all the data comes through the
+                <span class="new_code">get()</span> method and yet
+                we want different results for different keys.
+                Luckily the mocks have a filter system...
+<pre>
+<strong>$config = &amp;new MockConfiguration();
+$config-&gt;returns('get', 'primary', array('db_host'));
+$config-&gt;returns('get', 'admin', array('db_user'));
+$config-&gt;returns('get', 'secret', array('db_password'));</strong>
+</pre>
+                The extra parameter is a list of arguments to attempt
+                to match.
+                In this case we are trying to match only one argument which
+                is the look up key.
+                Now when the mock object has the
+                <span class="new_code">get()</span> method invoked
+                like this...
+<pre>
+$config-&gt;get('db_user')
+</pre>
+                ...it will return "admin".
+                It finds this by attempting to match the calling arguments
+                to its list of returns one after another until
+                a complete match is found.
+            </p>
+            <p>
+                You can set a default argument argument like so...
+<pre><strong>
+$config-&gt;returns('get', false, array('*'));</strong>
+</pre>
+                This is not the same as setting the return value without
+                any argument requirements like this...
+<pre><strong>
+$config-&gt;returns('get', false);</strong>
+</pre>
+                In the first case it will accept any single argument,
+                but exactly one is required.
+                In the second case any number of arguments will do and
+                it acts as a catchall after all other matches.
+                Note that if we add further single parameter options after
+                the wildcard in the first case, they will be ignored as the wildcard
+                will match first.
+                With complex parameter lists the ordering could be important
+                or else desired matches could be masked by earlier wildcard
+                ones.
+                Declare the most specific matches first if you are not sure.
+            </p>
+            <p>
+                There are times when you want a specific reference to be
+                dished out by the mock rather than a copy or object handle.
+                This a rarity to say the least, but you might be simulating
+                a container that can hold primitives such as strings.
+                For example...
+<pre>
+class Pad {
+    function Pad() { }
+    function &amp;note($index) { }
+}
+</pre>
+                In this case you can set a reference into the mock's
+                return list...
+<pre>
+function testTaskReads() {
+    $note = 'Buy books';
+    $pad = new MockPad();
+    $vector-&gt;<strong>returnsByReference(</strong>'note', $note, array(3)<strong>)</strong>;
+    $task = new Task($pad);
+    ...
+}
+</pre>
+                With this arrangement you know that every time
+                <span class="new_code">$pad-&gt;note(3)</span> is
+                called it will return the same <span class="new_code">$note</span> each time,
+                even if it get's modified.
+            </p>
+            <p>
+                These three factors, timing, parameters and whether to copy,
+                can be combined orthogonally.
+                For example...
+<pre>
+$buy_books = 'Buy books';
+$write_code = 'Write code';
+$pad = new MockPad();
+$vector-&gt;<strong>returnsByReferenceAt(0, 'note', $buy_books, array('*', 3));</strong>
+$vector-&gt;<strong>returnsByReferenceAt(1, 'note', $write_code, array('*', 3));</strong>
+</pre>
+                This will return a reference to <span class="new_code">$buy_books</span> and
+                then to <span class="new_code">$write_code</span>, but only if two parameters
+                were set the second of which must be the integer 3.
+                That should cover most situations.
+            </p>
+            <p>
+                A final tricky case is one object creating another, known
+                as a factory pattern.
+                Suppose that on a successful query to our imaginary
+                database, a result set is returned as an iterator, with
+                each call to the the iterator's <span class="new_code">next()</span> giving
+                one row until false.
+                This sounds like a simulation nightmare, but in fact it can all
+                be mocked using the mechanics above...
+<pre>
+Mock::generate('DatabaseConnection');
+Mock::generate('ResultIterator');
+
+class DatabaseTest extends UnitTestCase {
+
+    function testUserFinderReadsResultsFromDatabase() {<strong>
+        $result = new MockResultIterator();
+        $result-&gt;returns('next', false);
+        $result-&gt;returnsAt(0, 'next', array(1, 'tom'));
+        $result-&gt;returnsAt(1, 'next', array(3, 'dick'));
+        $result-&gt;returnsAt(2, 'next', array(6, 'harry'));
+
+        $connection = new MockDatabaseConnection();
+        $connection-&gt;returns('selectQuery', $result);</strong>
+
+        $finder = new UserFinder(<strong>$connection</strong>);
+        $this-&gt;assertIdentical(
+                $finder-&gt;findNames(),
+                array('tom', 'dick', 'harry'));
+    }
+}
+</pre>
+                Now only if our
+                <span class="new_code">$connection</span> is called with the
+                <span class="new_code">query()</span> method will the
+                <span class="new_code">$result</span> be returned that is
+                itself exhausted after the third call to <span class="new_code">next()</span>.
+                This should be enough
+                information for our <span class="new_code">UserFinder</span> class,
+                the class actually
+                being tested here, to come up with goods.
+                A very precise test and not a real database in sight.
+            </p>
+            <p>
+                We could refine this test further by insisting that the correct
+                query is sent...
+<pre>
+$connection-&gt;returns('selectQuery', $result, array(<strong>'select name, id from people'</strong>));
+</pre>
+                This is actually a bad idea.
+            </p>
+            <p>
+                We have a <span class="new_code">UserFinder</span> in object land, talking to
+                database tables using a large interface - the whole of SQL.
+                Imagine that we have written a lot of tests that now depend
+                on the exact SQL string passed.
+                These queries could change en masse for all sorts of reasons
+                not related to the specific test.
+                For example the quoting rules could change, a table name could
+                change, a link table added or whatever.
+                This would require the rewriting of every single test any time
+                one of these refactoring is made, yet the intended behaviour has
+                stayed the same.
+                Tests are supposed to help refactoring, not hinder it.
+                I'd certainly like to have a test suite that passes while I change
+                table names.
+            </p>
+            <p>
+                As a rule it is best not to mock a fat interface.
+            </p>
+            <p>
+                By contrast, here is the round trip test...
+<pre>
+class DatabaseTest extends UnitTestCase {<strong>
+    function setUp() { ... }
+    function tearDown() { ... }</strong>
+
+    function testUserFinderReadsResultsFromDatabase() {
+        $finder = new UserFinder(<strong>new DatabaseConnection()</strong>);
+        $finder-&gt;add('tom');
+        $finder-&gt;add('dick');
+        $finder-&gt;add('harry');
+        $this-&gt;assertIdentical(
+                $finder-&gt;findNames(),
+                array('tom', 'dick', 'harry'));
+    }
+}
+</pre>
+                This test is immune to schema changes.
+                It will only fail if you actually break the functionality, which
+                is what you want a test to do.
+            </p>
+            <p>
+                The catch is those <span class="new_code">setUp()</span> and <span class="new_code">tearDown()</span>
+                methods that we've rather glossed over.
+                They have to clear out the database tables and ensure that the
+                schema is defined correctly.
+                That can be a chunk of extra work, but you usually have this code
+                lying around anyway for deployment purposes.
+            </p>
+            <p>
+                One place where you definitely need a mock is simulating failures.
+                Say the database goes down while <span class="new_code">UserFinder</span> is doing
+                it's work.
+                Does <span class="new_code">UserFinder</span> behave well...?
+<pre>
+class DatabaseTest extends UnitTestCase {
+
+    function testUserFinder() {
+        $connection = new MockDatabaseConnection();<strong>
+        $connection-&gt;throwOn('selectQuery', new TimedOut('Ouch!'));</strong>
+        $alert = new MockAlerts();<strong>
+        $alert-&gt;expectOnce('notify', 'Database is busy - please retry');</strong>
+        $finder = new UserFinder($connection, $alert);
+        $this-&gt;assertIdentical($finder-&gt;findNames(), array());
+    }
+}
+</pre>
+                We've passed the <span class="new_code">UserFinder</span> an <span class="new_code">$alert</span>
+                object.
+                This is going to do some kind of pretty notifications in the
+                user interface in the event of an error.
+                We'd rather not sprinkle our code with hard wired <span class="new_code">print</span>
+                statements if we can avoid it.
+                Wrapping the means of output means we can use this code anywhere.
+                It also makes testing easier.
+            </p>
+            <p>
+                To pass this test, the finder has to write a nice user friendly
+                message to <span class="new_code">$alert</span>, rather than propogating the exception.
+                So far, so good.
+            </p>
+            <p>
+                How do we get the mock <span class="new_code">DatabaseConnection</span> to throw an exception?
+                We generate the exception using the <span class="new_code">throwOn</span> method
+                on the mock.
+            </p>
+            <p>
+                Finally, what if the method you want to simulate does not exist yet?
+                If you set a return value on a method that is not there, SimpleTest
+                will throw an error.
+                What if you are using <span class="new_code">__call()</span> to simulate dynamic methods?
+            </p>
+            <p>
+                Objects with dynamic interfaces, using <span class="new_code">__call</span>, can
+                be problematic with the current mock objects implementation.
+                You can mock the <span class="new_code">__call()</span> method, but this is ugly.
+                Why should a test know anything about such low level implementation details?
+                It just wants to simulate the call.
+            </p>
+            <p>
+                The way round this is to add extra methods to the mock when
+                generating it.
+<pre>
+<strong>Mock::generate('DatabaseConnection', 'MockDatabaseConnection', array('setOptions'));</strong>
+</pre>
+                In a large test suite this could cause trouble, as you probably
+                already have a mock version of the class called
+                <span class="new_code">MockDatabaseConnection</span> without the extra methods.
+                The code generator will not generate a mock version of the class if
+                one of the same name already exists.
+                You will confusingly fail to see your method if another definition
+                was run first.
+            </p>
+            <p>
+                To cope with this, SimpleTest allows you to choose any name for the
+                new class at the same time as you add the extra methods.
+<pre>
+Mock::generate('DatabaseConnection', <strong>'MockDatabaseConnectionWithOptions'</strong>, array('setOptions'));
+</pre>
+                Here the mock will behave as if the <span class="new_code">setOptions()</span>
+                existed in the original class.
+            </p>
+            <p>
+                Mock objects can only be used within test cases, as upon expectations
+                they send messages straight to the currently running test case.
+                Creating them outside a test case will cause a run time error
+                when an expectation is triggered and there is no running test case
+                for the message to end up.
+                We cover expectations next.
+            </p>
+        
+        <h2>
+<a class="target" name="expectations"></a>Mocks as critics</h2>
+            <p>
+                Although the server stubs approach insulates your tests from
+                real world disruption, it is only half the benefit.
+                You can have the class under test receiving the required
+                messages, but is your new class sending correct ones?
+                Testing this can get messy without a mock objects library.
+            </p>
+			<p>
+                By way of example, let's take a simple <span class="new_code">PageController</span>
+                class to handle a credit card payment form...
+<pre>
+class PaymentForm extends PageController {
+    function __construct($alert, $payment_gateway) { ... }
+    function makePayment($request) { ... }
+}
+</pre>
+                This class takes a <span class="new_code">PaymentGateway</span> to actually talk
+                to the bank.
+                It also takes an <span class="new_code">Alert</span> object to handle errors.
+                This class talks to the page or template.
+                It's responsible for painting the error message and highlighting any
+                form fields that are incorrect.
+            </p>
+            <p>
+                It might look something like...
+<pre>
+class Alert {
+    function warn($warning, $id) {
+        print '&lt;div class="warning"&gt;' . $warning . '&lt;/div&gt;';
+        print '&lt;style type="text/css"&gt;#' . $id . ' { background-color: red }&lt;/style&gt;';
+    }
+}
+</pre>
+            </p>
+            <p>
+                Our interest is in the <span class="new_code">makePayment()</span> method.
+                If we fail to enter a "CVV2" number (the three digit number
+                on the back of the credit card), we want to show an error rather than
+                try to process the payment.
+                In test form...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('payment_form.php');
+Mock::generate('Alert');
+Mock::generate('PaymentGateway');
+
+class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
+
+    function testMissingCvv2CausesAlert() {
+        $alert = new MockAlert();
+        <strong>$alert-&gt;expectOnce(
+                    'warn',
+                    array('Missing three digit security code', 'cvv2'));</strong>
+        $controller = new PaymentForm(<strong>$alert</strong>, new MockPaymentGateway());
+        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+    }
+
+    function requestWithMissingCvv2() { ... }
+}
+?&gt;
+</pre>
+                The first question you may be asking is, where are the assertions?
+            </p>
+            <p>
+                The call to <span class="new_code">expectOnce('warn', array(...))</span> instructs the mock
+                to expect a call to <span class="new_code">warn()</span> before the test ends.
+                When it gets a call to <span class="new_code">warn()</span>, it checks the arguments.
+                If the arguments don't match, then a failure is generated.
+                It also fails if the method is never called at all.
+            </p>
+            <p>
+                The test above not only asserts that <span class="new_code">warn</span> was called,
+                but that it received the string "Missing three digit security code"
+                and also the tag "cvv2".
+                The equivalent of <span class="new_code">assertIdentical()</span> is applied to both
+                fields when the parameters are compared.
+            </p>
+            <p>
+                If you are not interested in the actual message, and we are not
+                for user interface code that changes often, we can skip that
+                parameter with the "*" operator...
+<pre>
+class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
+
+    function testMissingCvv2CausesAlert() {
+        $alert = new MockAlert();
+        $alert-&gt;expectOnce('warn', array(<strong>'*'</strong>, 'cvv2'));
+        $controller = new PaymentForm($alert, new MockPaymentGateway());
+        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+    }
+
+    function requestWithMissingCvv2() { ... }
+}
+</pre>
+                We can weaken the test further by missing
+                out the parameters array...
+<pre>
+function testMissingCvv2CausesAlert() {
+    $alert = new MockAlert();
+    <strong>$alert-&gt;expectOnce('warn');</strong>
+    $controller = new PaymentForm($alert, new MockPaymentGateway());
+    $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+}
+</pre>
+                This will only test that the method is called,
+                which is a bit drastic in this case.
+                Later on, we'll see how we can weaken the expectations more precisely.
+            </p>
+            <p>
+                Tests without assertions can be both compact and very expressive.
+                Because we intercept the call on the way into an object, here of
+                the <span class="new_code">Alert</span> class, we avoid having to assert its state
+                afterwards.
+                This not only avoids the assertions in the tests, but also having
+                to add extra test only accessors to the original code.
+                If you catch yourself adding such accessors, called "state based testing",
+                it's probably time to consider using mocks in the tests.
+                This is called "behaviour based testing", and is normally superior.
+            </p>
+            <p>
+                Let's add another test.
+                Let's make sure that we don't even attempt a payment without a CVV2...
+<pre>
+class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
+
+    function testMissingCvv2CausesAlert() { ... }
+
+    function testNoPaymentAttemptedWithMissingCvv2() {
+        $payment_gateway = new MockPaymentGateway();
+        <strong>$payment_gateway-&gt;expectNever('pay');</strong>
+        $controller = new PaymentForm(new MockAlert(), $payment_gateway);
+        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+    }
+
+    ...
+}
+</pre>
+                Asserting a negative can be very hard in tests, but
+                <span class="new_code">expectNever()</span> makes it easy.
+            </p>
+            <p>
+                <span class="new_code">expectOnce()</span> and <span class="new_code">expectNever()</span> are
+                sufficient for most tests, but
+                occasionally you want to test multiple events.
+                Normally for usability purposes we want all missing fields
+                in the form to light up, not just the first one.
+                This means that we should get multiple calls to
+                <span class="new_code">Alert::warn()</span>, not just one...
+<pre>
+function testAllRequiredFieldsHighlightedOnEmptyRequest() {
+    $alert = new MockAlert();<strong>
+    $alert-&gt;expectAt(0, 'warn', array('*', 'cc_number'));
+    $alert-&gt;expectAt(1, 'warn', array('*', 'expiry'));
+    $alert-&gt;expectAt(2, 'warn', array('*', 'cvv2'));
+    $alert-&gt;expectAt(3, 'warn', array('*', 'card_holder'));
+    $alert-&gt;expectAt(4, 'warn', array('*', 'address'));
+    $alert-&gt;expectAt(5, 'warn', array('*', 'postcode'));
+    $alert-&gt;expectAt(6, 'warn', array('*', 'country'));
+    $alert-&gt;expectCallCount('warn', 7);</strong>
+    $controller = new PaymentForm($alert, new MockPaymentGateway());
+    $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+}
+</pre>
+                The counter in <span class="new_code">expectAt()</span> is the number of times
+                the method has been called already.
+                Here we are asserting that every field will be highlighted.
+            </p>
+            <p>
+                Note that we are forced to assert the order too.
+                SimpleTest does not yet have a way to avoid this, but
+                this will be fixed in future versions.
+            </p>
+            <p>
+                Here is the full list of expectations you can set on a mock object
+                in <a href="http://simpletest.org/">SimpleTest</a>.
+                As with the assertions, these methods take an optional failure message.
+                <table>
+                    <thead><tr>
+<th>Expectation</th>
+<th>Description</th>
+</tr></thead>
+                    <tbody>
+                        <tr>
+                            <td><span class="new_code">expect($method, $args)</span></td>
+                            <td>Arguments must match if called</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectAt($timing, $method, $args)</span></td>
+                            <td>Arguments must match when called on the <span class="new_code">$timing</span>'th time</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectCallCount($method, $count)</span></td>
+                            <td>The method must be called exactly this many times</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectMaximumCallCount($method, $count)</span></td>
+                            <td>Call this method no more than <span class="new_code">$count</span> times</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectMinimumCallCount($method, $count)</span></td>
+                            <td>Must be called at least <span class="new_code">$count</span> times</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectNever($method)</span></td>
+                            <td>Must never be called</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectOnce($method, $args)</span></td>
+                            <td>Must be called once and with the expected arguments if supplied</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectAtLeastOnce($method, $args)</span></td>
+                            <td>Must be called at least once, and always with any expected arguments</td>
+                        </tr>
+                    </tbody>
+                </table>
+                Where the parameters are...
+                <dl>
+                    <dt class="new_code">$method</dt>
+                    <dd>The method name, as a string, to apply the condition to.</dd>
+                    <dt class="new_code">$args</dt>
+                    <dd>
+                        The arguments as a list. Wildcards can be included in the same
+                        manner as for <span class="new_code">setReturn()</span>.
+                        This argument is optional for <span class="new_code">expectOnce()</span>
+                        and <span class="new_code">expectAtLeastOnce()</span>.
+                    </dd>
+                    <dt class="new_code">$timing</dt>
+                    <dd>
+                        The only point in time to test the condition.
+                        The first call starts at zero and the count is for
+                        each method independently.
+                    </dd>
+                    <dt class="new_code">$count</dt>
+                    <dd>The number of calls expected.</dd>
+                </dl>
+            </p>
+            <p>
+                If you have just one call in your test, make sure you're using
+                <span class="new_code">expectOnce</span>.<br>
+                Using <span class="new_code">$mocked-&gt;expectAt(0, 'method', 'args);</span>
+                on its own will allow the method to never be called.
+                Checking the arguments and the overall call count
+                are currently independant.
+                Add an <span class="new_code">expectCallCount()</span> expectation when you
+                are using <span class="new_code">expectAt()</span> unless zero calls is allowed.
+            </p>
+            <p>
+                Like the assertions within test cases, all of the expectations
+                can take a message override as an extra parameter.
+                Also the original failure message can be embedded in the output
+                as "%s".
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            The original
+            <a href="http://www.mockobjects.com/">Mock objects</a> paper.
+        </li>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest home page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <span class="chosen">Mock objects</span>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/overview.html b/3rdparty/simpletest/docs/en/overview.html
new file mode 100644
index 00000000000..85ea9407749
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/overview.html
@@ -0,0 +1,487 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+        Overview and feature list for the SimpleTest PHP unit tester and web tester
+    </title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <span class="chosen">Overview</span>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Overview of SimpleTest</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#summary">Quick summary</a>
+            of the SimpleTest tool for PHP.
+        </li>
+<li>
+            <a href="#features">List of features</a>,
+            both current ones and those planned.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="summary"></a>What is SimpleTest?</h2>
+            <p>
+                The heart of SimpleTest is a testing framework built around
+                test case classes.
+                These are written as extensions of base test case classes,
+                each extended with methods that actually contain test code.
+                Each test method of a test case class is written to invoke
+                various assertions that the developer expects to be true such as
+                <span class="new_code">assertEqual()</span>.
+                If the expectation is correct, then a successful result is
+                dispatched to the observing test reporter, but any failure
+                or unexpected exception triggers an alert and a description
+                of the mismatch.
+                These test case declarations are transformed into executable
+                test scripts by including a SimpleTest aurorun.php file.
+            </p>
+            <p>
+                These documents apply to SimpleTest version 1.1, although we
+                try hard to maintain compatibility between versions.
+                If you get a test failure after an upgrade, check out the
+                file "HELP_MY_TESTS_DONT_WORK_ANYMORE" in the
+                simpletest directory to see if a feature you are using
+                has since been deprecated and later removed.
+            </p>
+            <p>
+                A <a href="unit_test_documentation.html">test case</a> looks like this...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class <strong>CanAddUp</strong> extends UnitTestCase {<strong>
+    function testOneAndOneMakesTwo() {
+        $this-&gt;assertEqual(1 + 1, 2);
+    }</strong>
+}
+?&gt;
+</pre>
+                Tests are grouped into test cases, which are just
+                PHP classes that extend <span class="new_code">UnitTestCase</span>
+                or <span class="new_code">WebTestCase</span>.
+                The tests themselves are just normal methods that start
+                their name with the letters "test".
+                You can have as many test cases as you want in a test
+                script and each test case can have as many test methods
+                as it wants too.
+            </p>
+            <p>
+                This test script is immediately runnable.
+                You just invoke it on the command line like so...
+<pre class="shell">
+php adding_test.php
+</pre>
+            </p>
+            <p>
+                When run on the command line you should see something like...
+<pre class="shell">
+adding_test.php
+OK
+Test cases run: 1/1, Passes: 1, Failures: 0, Exceptions: 0
+</pre>
+            </p>
+            <p>
+                If you place it on a web server and point your
+                web browser at it...
+                <div class="demo">
+                    <h1>adding_test.php</h1>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>6</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+            </p>
+            <p>
+                Of course this is a silly example.
+                A more realistic example might be...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('log.php');
+
+class <strong>TestOfLogging</strong> extends UnitTestCase {
+    function testWillCreateLogFileOnFirstMessage() {
+        $log = new Log('my.log');
+        $this-&gt;assertFalse(file_exists('my.log'));
+        $log-&gt;message('Hello');
+        $this-&gt;assertTrue(file_exists('my.log'));
+    }&lt;/strong&gt;
+}
+?&gt;
+</pre>
+            </p>
+            <p>
+                This tool is designed for the developer.
+                The target audience of this tool is anyone developing a small
+                to medium PHP application, including developers new to
+                unit and web regression testing.
+                The core principles are ease of use first, with extendibility and
+                essential features.
+            </p>
+            <p>
+                Tests are written in the PHP language itself more or less
+                as the application itself is built.
+                The advantage of using PHP as the testing language is that
+                there are no new languages to learn, testing can start straight away,
+                and the developer can test any part of the code.
+                Basically, all parts that can be accessed by the application code can also be
+                accessed by the test code when they are in the same programming language.
+            </p>
+            <p>
+                The simplest type of test case is the
+                <a href="unit_tester_documentation.html">UnitTestCase</a>.
+                This class of test case includes standard tests for equality,
+                references and pattern matching.
+                All these test the typical expectations of what you would
+                expect the result of a function or method to be.
+                This is by far the most common type of test in the daily
+                routine of development, making up about 95% of test cases.
+            </p>
+            <p>
+                The top level task of a web application though is not to
+                produce correct output from its methods and objects, but
+                to generate web pages.
+                The <a href="web_tester_documentation.html">WebTestCase</a> class tests web
+                pages.
+                It simulates a web browser requesting a page, complete with
+                cookies, proxies, secure connections, authentication, forms, frames and most
+                navigation elements.
+                With this type of test case, the developer can assert that
+                information is present in the page and that forms and
+                sessions are handled correctly.
+            </p>
+            <p>
+                A <a href="web_tester_documentation.html">WebTestCase</a> looks like this...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('simpletest/web_tester.php');
+
+class <strong>MySiteTest</strong> extends WebTestCase {
+    <strong>
+    function testHomePageHasContactDetailsLink() {
+        $this-&gt;get('http://www.my-site.com/index.php');
+        $this-&gt;assertTitle('My Home Page');
+        $this-&gt;clickLink('Contact');
+        $this-&gt;assertTitle('Contact me');
+        $this-&gt;assertText('/Email me at/');
+    }</strong>
+}
+?&gt;
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="features"></a>Feature list</h2>
+            <p>
+                The following is a very rough outline of past and future features
+                and their expected point of release.
+                I am afraid it is liable to change without warning, as meeting the
+                milestones rather depends on time available.
+            </p>
+            <p>
+                Green stuff has been coded, but not necessarily released yet.
+                If you have a pressing need for a green but unreleased feature
+                then you should check-out the code from Sourceforge SVN directly.
+                <table>
+<thead>
+                    <tr>
+<th>Feature</th>
+<th>Description</th>
+<th>Release</th>
+</tr>
+                    </thead>
+<tbody>
+<tr>
+                        <td>Unit test case</td>
+                        <td>Core test case class and assertions</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Html display</td>
+                        <td>Simplest possible display</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Autoloading of test cases</td>
+                        <td>
+                            Reading a file with test cases and loading them into a
+                            group test automatically
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Mock objects</td>
+                        <td>
+                            Objects capable of simulating other objects removing
+                            test dependencies
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Web test case</td>
+                        <td>Allows link following and title tag matching</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Partial mocks</td>
+                        <td>
+                            Mocking parts of a class for testing less than a class
+                            or for complex simulations
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Web cookie handling</td>
+                        <td>Correct handling of cookies when fetching pages</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Following redirects</td>
+                        <td>Page fetching automatically follows 300 redirects</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Form parsing</td>
+                        <td>Ability to submit simple forms and read default form values</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Command line interface</td>
+                        <td>Test display without the need of a web browser</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Exposure of expectation classes</td>
+                        <td>Can create precise tests with mocks as well as test cases</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>XML output and parsing</td>
+                        <td>
+                            Allows multi host testing and the integration of acceptance
+                            testing extensions
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Browser component</td>
+                        <td>
+                            Exposure of lower level web browser interface for more
+                            detailed test cases
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>HTTP authentication</td>
+                        <td>
+                            Fetching protected web pages with basic authentication
+                            only
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>SSL support</td>
+                        <td>Can connect to https: pages</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Proxy support</td>
+                        <td>Can connect via. common proxies</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Frames support</td>
+                        <td>Handling of frames in web test cases</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>File upload testing</td>
+                        <td>Can simulate the input type file tag</td>
+                        <td style="color: green;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>Mocking interfaces</td>
+                        <td>
+                            Can generate mock objects to interfaces as well as classes
+                            and class interfaces are carried for type hints
+                        </td>
+                        <td style="color: green;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>Testing exceptions</td>
+                        <td>Similar to testing PHP errors</td>
+                        <td style="color: green;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>HTML label support</td>
+                        <td>Can access all controls using the visual label</td>
+                        <td style="color: green;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>Base tag support</td>
+                        <td>Respects page base tag when clicking</td>
+                        <td style="color: green;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>PHP 5 E_STRICT compliant</td>
+                        <td>PHP 5 only version that works with the E_STRICT error level</td>
+                        <td style="color: green;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>Alternate HTML parsers</td>
+                        <td>Can detect compiled parsers for performance improvements</td>
+                        <td style="color: green;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>REST support</td>
+                        <td>Support for REST verbs as put(), delete(), etc.</td>
+                        <td style="color: green;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>BDD style fixtures</td>
+                        <td>Can import fixtures using a mixin like given() method</td>
+                        <td style="color: red;">1.5</td>
+                    </tr>
+                    <tr>
+                        <td>Plug-in architecture</td>
+                        <td>Automatic import of extensions including command line options</td>
+                        <td style="color: red;">1.5</td>
+                    </tr>
+                    <tr>
+                        <td>Reporting machinery enhancements</td>
+                        <td>Improved message passing for better cooperation with IDEs</td>
+                        <td style="color: red;">1.5</td>
+                    </tr>
+                    <tr>
+                        <td>Fluent mock interface</td>
+                        <td>More flexible and concise mock objects</td>
+                        <td style="color: red;">1.6</td>
+                    </tr>
+                    <tr>
+                        <td>Localisation</td>
+                        <td>Messages abstracted and code generated as well as UTF support</td>
+                        <td style="color: red;">1.6</td>
+                    </tr>
+                    <tr>
+                        <td>CSS selectors</td>
+                        <td>HTML content can be examined using CSS selectors</td>
+                        <td style="color: red;">1.7</td>
+                    </tr>
+                    <tr>
+                        <td>HTML table assertions</td>
+                        <td>Can match HTML or other table elements to expectations</td>
+                        <td style="color: red;">1.7</td>
+                    </tr>
+                    <tr>
+                        <td>Unified acceptance testing model</td>
+                        <td>Content searchable through selectors combined with expectations</td>
+                        <td style="color: red;">1.7</td>
+                    </tr>
+                    <tr>
+                        <td>DatabaseTestCase</td>
+                        <td>SQL selectors and DB drivers</td>
+                        <td style="color: red;">1.7</td>
+                    </tr>
+                    <tr>
+                        <td>IFrame support</td>
+                        <td>Reads IFrame content that can be refreshed</td>
+                        <td style="color: red;">1.8</td>
+                    </tr>
+                    <tr>
+                        <td>Integrated Selenium support</td>
+                        <td>Easy to use built in Selenium driver and tutorial or similar browser automation</td>
+                        <td style="color: red;">1.9</td>
+                    </tr>
+                    <tr>
+                        <td>Code coverage</td>
+                        <td>Reports using the bundled tool when using XDebug</td>
+                        <td style="color: red;">1.9</td>
+                    </tr>
+                    <tr>
+                        <td>Deprecation of old methods</td>
+                        <td>Simpler interface for SimpleTest2</td>
+                        <td style="color: red;">2.0</td>
+                    </tr>
+                    <tr>
+                        <td>Javascript suport</td>
+                        <td>Use of PECL module to add Javascript to the native browser</td>
+                        <td style="color: red;">3.0</td>
+                    </tr>
+                </tbody>
+</table>
+                PHP 5 migration is complete, which means that only PHP 5.0.3+
+                will be supported in SimpleTest version 1.1+.
+                Earlier versions of SimpleTest are compatible with PHP 4.2 up to
+                PHP 5 (non E_STRICT).
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            <a href="unit_test_documentation.html">Documentation for SimpleTest</a>.
+        </li>
+<li>
+            <a href="http://www.lastcraft.com/first_test_tutorial.php">How to write PHP test cases</a>
+            is a fairly advanced tutorial.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">SimpleTest API</a> from phpdoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <span class="chosen">Overview</span>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/partial_mocks_documentation.html b/3rdparty/simpletest/docs/en/partial_mocks_documentation.html
new file mode 100644
index 00000000000..cb70b1f86df
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/partial_mocks_documentation.html
@@ -0,0 +1,457 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP partial mocks documentation</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <span class="chosen">Partial mocks</span>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Partial mock objects documentation</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#inject">The mock injection problem</a>.
+        </li>
+<li>
+            Moving creation to a <a href="#creation">protected factory</a> method.
+        </li>
+<li>
+            <a href="#partial">Partial mocks</a> generate subclasses.
+        </li>
+<li>
+            Partial mocks <a href="#less">test less than a class</a>.
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                A partial mock is simply a pattern to alleviate a specific problem
+                in testing with mock objects,
+                that of getting mock objects into tight corners.
+                It's quite a limited tool and possibly not even a good idea.
+                It is included with SimpleTest because I have found it useful
+                on more than one occasion and has saved a lot of work at that point.
+            </p>
+        
+        <h2>
+<a class="target" name="inject"></a>The mock injection problem</h2>
+            <p>
+                When one object uses another it is very simple to just pass a mock
+                version in already set up with its expectations.
+                Things are rather tricker if one object creates another and the
+                creator is the one you want to test.
+                This means that the created object should be mocked, but we can
+                hardly tell our class under test to create a mock instead.
+                The tested class doesn't even know it is running inside a test
+                after all.
+            </p>
+            <p>
+                For example, suppose we are building a telnet client and it
+                needs to create a network socket to pass its messages.
+                The connection method might look something like...
+<pre>
+<strong>&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    function connect($ip, $port, $username, $password) {
+        $socket = new Socket($ip, $port);
+        $socket-&gt;read( ... );
+        ...
+    }
+}
+?&gt;</strong>
+</pre>
+                We would really like to have a mock object version of the socket
+                here, what can we do?
+            </p>
+            <p>
+                The first solution is to pass the socket in as a parameter,
+                forcing the creation up a level.
+                Having the client handle this is actually a very good approach
+                if you can manage it and should lead to factoring the creation from
+                the doing.
+                In fact, this is one way in which testing with mock objects actually
+                forces you to code more tightly focused solutions.
+                They improve your programming.
+            </p>
+            <p>
+                Here this would be...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    <strong>function connect($socket, $username, $password) {
+        $socket-&gt;read( ... );
+        ...
+    }</strong>
+}
+?&gt;
+</pre>
+                This means that the test code is typical for a test involving
+                mock objects.
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new Telnet();
+        $telnet-&gt;connect($socket, 'Me', 'Secret');
+        ...</strong>
+    }
+}
+</pre>
+                It is pretty obvious though that one level is all you can go.
+                You would hardly want your top level application creating
+                every low level file, socket and database connection ever
+                needed.
+                It wouldn't know the constructor parameters anyway.
+            </p>
+            <p>
+                The next simplest compromise is to have the created object passed
+                in as an optional parameter...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...<strong>
+    function connect($ip, $port, $username, $password, $socket = false) {
+        if (! $socket) {
+            $socket = new Socket($ip, $port);
+        }
+        $socket-&gt;read( ... );</strong>
+        ...
+        return $socket;
+    }
+}
+?&gt;
+</pre>
+                For a quick solution this is usually good enough.
+                The test now looks almost the same as if the parameter
+                was formally passed...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret', $socket);
+        ...</strong>
+    }
+}
+</pre>
+                The problem with this approach is its untidiness.
+                There is test code in the main class and parameters passed
+                in the test case that are never used.
+                This is a quick and dirty approach, but nevertheless effective
+                in most situations.
+            </p>
+            <p>
+                The next method is to pass in a factory object to do the creation...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {<strong>
+   function Telnet($network) {
+        $this-&gt;_network = $network;
+    }</strong>
+    ...
+    function connect($ip, $port, $username, $password) {<strong>
+        $socket = $this-&gt;_network-&gt;createSocket($ip, $port);
+        $socket-&gt;read( ... );</strong>
+        ...
+        return $socket;
+    }
+}
+?&gt;
+</pre>
+                This is probably the most highly factored answer as creation
+                is now moved into a small specialist class.
+                The networking factory can now be tested separately, but mocked
+                easily when we are testing the telnet class...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $network = new MockNetwork();
+        $network-&gt;returnsByReference('createSocket', $socket);
+        $telnet = new Telnet($network);
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
+    }
+}
+</pre>
+                The downside is that we are adding a lot more classes to the
+                library.
+                Also we are passing a lot of factories around which will
+                make the code a little less intuitive.
+                The most flexible solution, but the most complex.
+            </p>
+            <p>
+                Well techniques like "Dependency Injection" tackle the problem of
+                instantiating a lot of constructor parameters.
+                Unfortunately knowledge of this pattern is not widespread, and if you
+                are trying to get older code to work, rearchitecting the whole
+                application is not really an option.
+            </p>
+            <p>
+                Is there a middle ground?
+            </p>
+        
+        <h2>
+<a class="target" name="creation"></a>Protected factory method</h2>
+            <p>
+                There is a way we can circumvent the problem without creating
+                any new application classes, but it involves creating a subclass
+                when we do the actual testing.
+                Firstly we move the socket creation into its own method...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    function connect($ip, $port, $username, $password) {
+        <strong>$socket = $this-&gt;createSocket($ip, $port);</strong>
+        $socket-&gt;read( ... );
+        ...
+    }<strong>
+
+    protected function createSocket($ip, $port) {
+        return new Socket($ip, $port);
+    }</strong>
+}
+?&gt;
+</pre>
+                This is a pretty safe step even for very tangled legacy code.
+                This is the only change we make to the application.
+            </p>
+            <p>
+                For the test case we have to create a subclass so that
+                we can intercept the socket creation...
+<pre>
+<strong>class TelnetTestVersion extends Telnet {
+    var $mock;
+
+    function TelnetTestVersion($mock) {
+        $this-&gt;mock = $mock;
+        $this-&gt;Telnet();
+    }
+
+    protected function createSocket() {
+        return $this-&gt;mock;
+    }
+}</strong>
+</pre>
+                Here I have passed the mock in the constructor, but a
+                setter would have done just as well.
+                Note that the mock was set into the object variable
+                before the constructor was chained.
+                This is necessary in case the constructor calls
+                <span class="new_code">connect()</span>.
+                Otherwise it could get a null value from
+                <span class="new_code">createSocket()</span>.
+            </p>
+            <p>
+                After the completion of all of this extra work the
+                actual test case is fairly easy.
+                We just test our new class instead...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new TelnetTestVersion($socket);
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
+    }
+}
+</pre>
+                The new class is very simple of course.
+                It just sets up a return value, rather like a mock.
+                It would be nice if it also checked the incoming parameters
+                as well.
+                Just like a mock.
+                It seems we are likely to do this often, can
+                we automate the subclass creation?
+            </p>
+        
+        <h2>
+<a class="target" name="partial"></a>A partial mock</h2>
+            <p>
+                Of course the answer is "yes" or I would have stopped writing
+                this by now!
+                The previous test case was a lot of work, but we can
+                generate the subclass using a similar approach to the mock objects.
+            </p>
+            <p>
+                Here is the partial mock version of the test...
+<pre>
+<strong>Mock::generatePartial(
+        'Telnet',
+        'TelnetTestVersion',
+        array('createSocket'));</strong>
+
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new TelnetTestVersion();
+        $telnet-&gt;setReturnReference('createSocket', $socket);
+        $telnet-&gt;Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
+    }
+}
+</pre>
+                The partial mock is a subclass of the original with
+                selected methods "knocked out" with test
+                versions.
+                The <span class="new_code">generatePartial()</span> call
+                takes three parameters: the class to be subclassed,
+                the new test class name and a list of methods to mock.
+            </p>
+            <p>
+                Instantiating the resulting objects is slightly tricky.
+                The only constructor parameter of a partial mock is
+                the unit tester reference.
+                As with the normal mock objects this is needed for sending
+                test results in response to checked expectations.
+            </p>
+            <p>
+                The original constructor is not run yet.
+                This is necessary in case the constructor is going to
+                make use of the as yet unset mocked methods.
+                We set any return values at this point and then run the
+                constructor with its normal parameters.
+                This three step construction of "new", followed
+                by setting up the methods, followed by running the constructor
+                proper is what distinguishes the partial mock code.
+            </p>
+            <p>
+                Apart from construction, all of the mocked methods have
+                the same features as mock objects and all of the unmocked
+                methods behave as before.
+                We can set expectations very easily...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {
+        $socket = new MockSocket();
+        ...
+        $telnet = new TelnetTestVersion();
+        $telnet-&gt;setReturnReference('createSocket', $socket);
+        <strong>$telnet-&gt;expectOnce('createSocket', array('127.0.0.1', 21));</strong>
+        $telnet-&gt;Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');
+    }
+}
+</pre>
+                Partial mocks are not used often.
+                I consider them transitory.
+                Useful while refactoring, but once the application has
+                all of it's dependencies nicely separated then the
+                partial mocks can wither away.
+            </p>
+        
+        <h2>
+<a class="target" name="less"></a>Testing less than a class</h2>
+            <p>
+                The mocked out methods don't have to be factory methods,
+                they could be any sort of method.
+                In this way partial mocks allow us to take control of any part of
+                a class except the constructor.
+                We could even go as far as to mock every method
+                except one we actually want to test.
+            </p>
+            <p>
+                This last situation is all rather hypothetical, as I've hardly
+                tried it.
+                I am a little worried that
+                forcing object granularity may be better for the code quality.
+                I personally use partial mocks as a way of overriding creation
+                or for occasional testing of the TemplateMethod pattern.
+            </p>
+            <p>
+                It's all going to come down to the coding standards of your
+                project to decide if you allow test mechanisms like this.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">Full API for SimpleTest</a>
+            from the PHPDoc.
+        </li>
+<li>
+            The protected factory is described in
+            <a href="http://www-106.ibm.com/developerworks/java/library/j-mocktest.html">this paper from IBM</a>.
+            This is the only formal comment I have seen on this problem.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <span class="chosen">Partial mocks</span>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/reporter_documentation.html b/3rdparty/simpletest/docs/en/reporter_documentation.html
new file mode 100644
index 00000000000..8924b7bb67a
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/reporter_documentation.html
@@ -0,0 +1,616 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP test runner and display documentation</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <span class="chosen">Reporting</span>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Test reporter documentation</h1>
+        This page...
+        <ul>
+<li>
+            Displaying <a href="#html">results in HTML</a>
+        </li>
+<li>
+            Displaying and <a href="#other">reporting results</a>
+            in other formats
+        </li>
+<li>
+            Using <a href="#cli">SimpleTest from the command line</a>
+        </li>
+<li>
+            <a href="#xml">Using XML</a> for remote testing
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                SimpleTest pretty much follows the MVC-ish pattern
+                (Model-View-Controller).
+                The reporter classes are the view and the model is your
+                test cases and their hiearchy.
+                The controller is mostly hidden from the user of
+                SimpleTest unless you want to change how the test cases
+                are actually run, in which case it is possible to
+                override the runner objects from within the test case.
+                As usual with MVC, the controller is mostly undefined
+                and there are other places to control the test run.
+            </p>
+        
+        <h2>
+<a class="target" name="html"></a>Reporting results in HTML</h2>
+            <p>
+                The default HTML display is minimal in the extreme.
+                It reports success and failure with the conventional red and
+                green bars and shows a breadcrumb trail of test groups
+                for every failed assertion.
+                Here's a fail...
+                <div class="demo">
+                    <h1>File test</h1>
+                    <span class="fail">Fail</span>: createnewfile-&gt;True assertion failed.<br>
+                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
+                    <strong>0</strong> passes, <strong>1</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                And here all tests passed...
+                <div class="demo">
+                    <h1>File test</h1>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>1</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                The good news is that there are several points in the display
+                hiearchy for subclassing.
+            </p>
+            <p>
+                For web page based displays there is the
+                <span class="new_code">HtmlReporter</span> class with the following
+                signature...
+<pre>
+class HtmlReporter extends SimpleReporter {
+    public __construct($encoding) { ... }
+    public makeDry(boolean $is_dry) { ... }
+    public void paintHeader(string $test_name) { ... }
+    public void sendNoCacheHeaders() { ... }
+    public void paintFooter(string $test_name) { ... }
+    public void paintGroupStart(string $test_name, integer $size) { ... }
+    public void paintGroupEnd(string $test_name) { ... }
+    public void paintCaseStart(string $test_name) { ... }
+    public void paintCaseEnd(string $test_name) { ... }
+    public void paintMethodStart(string $test_name) { ... }
+    public void paintMethodEnd(string $test_name) { ... }
+    public void paintFail(string $message) { ... }
+    public void paintPass(string $message) { ... }
+    public void paintError(string $message) { ... }
+    public void paintException(string $message) { ... }
+    public void paintMessage(string $message) { ... }
+    public void paintFormattedMessage(string $message) { ... }
+    protected string getCss() { ... }
+    public array getTestList() { ... }
+    public integer getPassCount() { ... }
+    public integer getFailCount() { ... }
+    public integer getExceptionCount() { ... }
+    public integer getTestCaseCount() { ... }
+    public integer getTestCaseProgress() { ... }
+}
+</pre>
+                Here is what some of these methods mean. First the display methods
+                that you will probably want to override...
+                <ul class="api">
+                    <li>
+                        <span class="new_code">HtmlReporter(string $encoding)</span><br>
+                        is the constructor.
+                        Note that the unit test sets up the link to the display
+                        rather than the other way around.
+                        The display is a mostly passive receiver of test events.
+                        This allows easy adaption of the display for other test
+                        systems beside unit tests, such as monitoring servers.
+                        The encoding is the character encoding you wish to
+                        display the test output in.
+                        In order to correctly render debug output when
+                        using the web tester, this should match the encoding
+                        of the site you are trying to test.
+                        The available character set strings are described in
+                        the PHP <a href="http://www.php.net/manual/en/function.htmlentities.php">html_entities()</a>
+                        function.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintHeader(string $test_name)</span><br>
+                        is called once at the very start of the test when the first
+                        start event arrives.
+                        The first start event is usually delivered by the top level group
+                        test and so this is where <span class="new_code">$test_name</span>
+                        comes from.
+                        It paints the page title, CSS, body tag, etc.
+                        It returns nothing (<span class="new_code">void</span>).
+                    </li>
+                    <li>
+                        <span class="new_code">void paintFooter(string $test_name)</span><br>
+                        Called at the very end of the test to close any tags opened
+                        by the page header.
+                        By default it also displays the red/green bar and the final
+                        count of results.
+                        Actually the end of the test happens when a test end event
+                        comes in with the same name as the one that started it all
+                        at the same level.
+                        The tests nest you see.
+                        Closing the last test finishes the display.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintMethodStart(string $test_name)</span><br>
+                        is called at the start of each test method.
+                        The name normally comes from method name.
+                        The other test start events behave the same way except
+                        that the group test one tells the reporter how large
+                        it is in number of held test cases.
+                        This is so that the reporter can display a progress bar
+                        as the runner churns through the test cases.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintMethodEnd(string $test_name)</span><br>
+                        backs out of the test started with the same name.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintFail(string $message)</span><br>
+                        paints a failure.
+                        By default it just displays the word fail, a breadcrumbs trail
+                        showing the current test nesting and the message issued by
+                        the assertion.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintPass(string $message)</span><br>
+                        by default does nothing.
+                    </li>
+                    <li>
+                        <span class="new_code">string getCss()</span><br>
+                        Returns the CSS styles as a string for the page header
+                        method.
+                        Additional styles have to be appended here if you are
+                        not overriding the page header.
+                        You will want to use this method in an overriden page header
+                        if you want to include the original CSS.
+                    </li>
+                </ul>
+                There are also some accessors to get information on the current
+                state of the test suite.
+                Use these to enrich the display...
+                <ul class="api">
+                    <li>
+                        <span class="new_code">array getTestList()</span><br>
+                        is the first convenience method for subclasses.
+                        Lists the current nesting of the tests as a list
+                        of test names.
+                        The first, top level test case, is first in the
+                        list and the current test method will be last.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getPassCount()</span><br>
+                        returns the number of passes chalked up so far.
+                        Needed for the display at the end.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getFailCount()</span><br>
+                        is likewise the number of fails so far.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getExceptionCount()</span><br>
+                        is likewise the number of errors so far.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getTestCaseCount()</span><br>
+                        is the total number of test cases in the test run.
+                        This includes the grouping tests themselves.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getTestCaseProgress()</span><br>
+                        is the number of test cases completed so far.
+                    </li>
+                </ul>
+                One simple modification is to get the HtmlReporter to display
+                the passes as well as the failures and errors...
+<pre>
+<strong>class ReporterShowingPasses extends HtmlReporter {
+    
+    function paintPass($message) {
+        parent::paintPass($message);
+        print "&lt;span class=\"pass\"&gt;Pass&lt;/span&gt;: ";
+        $breadcrumb = $this-&gt;getTestList();
+        array_shift($breadcrumb);
+        print implode("-&amp;gt;", $breadcrumb);
+        print "-&amp;gt;$message&lt;br /&gt;\n";
+    }
+    
+    protected function getCss() {
+        return parent::getCss() . ' .pass { color: green; }';
+    }
+}</strong>
+</pre>
+            </p>
+            <p>
+                One method that was glossed over was the <span class="new_code">makeDry()</span>
+                method.
+                If you run this method, with no parameters, on the reporter
+                before the test suite is run no actual test methods
+                will be called.
+                You will still get the events of entering and leaving the
+                test methods and test cases, but no passes or failures etc,
+                because the test code will not actually be executed.
+            </p>
+            <p>
+                The reason for this is to allow for more sophistcated
+                GUI displays that allow the selection of individual test
+                cases.
+                In order to build a list of possible tests they need a
+                report on the test structure for drawing, say a tree view
+                of the test suite.
+                With a reporter set to dry run that just sends drawing events
+                this is easily accomplished.
+            </p>
+        
+        <h2>
+<a class="target" name="other"></a>Extending the reporter</h2>
+            <p>
+                Rather than simply modifying the existing display, you might want to
+                produce a whole new HTML look, or even generate text or XML.
+                Rather than override every method in
+                <span class="new_code">HtmlReporter</span> we can take one
+                step up the class hiearchy to <span class="new_code">SimpleReporter</span>
+                in the <em>simple_test.php</em> source file.
+            </p>
+            <p>
+                A do nothing display, a blank canvas for your own creation, would
+                be...
+<pre>
+<strong>require_once('simpletest/simpletest.php');</strong>
+
+class MyDisplay extends SimpleReporter {<strong>
+    </strong>
+    function paintHeader($test_name) { }
+    
+    function paintFooter($test_name) { }
+    
+    function paintStart($test_name, $size) {<strong>
+        parent::paintStart($test_name, $size);</strong>
+    }
+    
+    function paintEnd($test_name, $size) {<strong>
+        parent::paintEnd($test_name, $size);</strong>
+    }
+    
+    function paintPass($message) {<strong>
+        parent::paintPass($message);</strong>
+    }
+    
+    function paintFail($message) {<strong>
+        parent::paintFail($message);</strong>
+    }
+    
+    function paintError($message) {<strong>
+        parent::paintError($message);</strong>
+    }
+    
+    function paintException($exception) {<strong>
+        parent::paintException($exception);</strong>
+    }
+}
+</pre>
+                No output would come from this class until you add it.
+            </p>
+            <p>
+                The catch with using this low level class is that you must
+                explicitely invoke it in the test script.
+                The "autorun" facility will not be able to use
+                its runtime context (whether it's running in a web browser
+                or the command line) to select the reporter.
+            </p>
+            <p>
+                You explicitely invoke the test runner like so...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+$test-&gt;run(<strong>new MyReporter()</strong>);
+?&gt;
+</pre>
+                ...perhaps like this...
+<pre>
+&lt;?php
+require_once('simpletest/simpletest.php');
+require_once('my_reporter.php');
+
+class MyTest extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('tests/file_test.php');
+    }
+}
+
+$test = new MyTest();
+$test-&gt;run(<strong>new MyReporter()</strong>);
+?&gt;
+</pre>
+                We'll show how to fit in with "autorun" later.
+            </p>
+        
+        <h2>
+<a class="target" name="cli"></a>The command line reporter</h2>
+            <p>
+                SimpleTest also ships with a minimal command line reporter.
+                The interface mimics JUnit to some extent, but paints the
+                failure messages as they arrive.
+                To use the command line reporter explicitely, substitute it
+                for the HTML version...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+$test-&gt;run(<strong>new TextReporter()</strong>);
+?&gt;
+</pre>
+                Then invoke the test suite from the command line...
+<pre class="shell">
+php file_test.php
+</pre>
+                You will need the command line version of PHP installed
+                of course.
+                A passing test suite looks like this...
+<pre class="shell">
+File test
+OK
+Test cases run: 1/1, Passes: 1, Failures: 0, Exceptions: 0
+</pre>
+                A failure triggers a display like this...
+<pre class="shell">
+File test
+1) True assertion failed.
+    in createNewFile
+FAILURES!!!
+Test cases run: 1/1, Passes: 0, Failures: 1, Exceptions: 0
+</pre>
+            </p>
+            <p>
+                One of the main reasons for using a command line driven
+                test suite is of using the tester as part of some automated
+                process.
+                To function properly in shell scripts the test script should
+                return a non-zero exit code on failure.
+                If a test suite fails the value <span class="new_code">false</span>
+                is returned from the <span class="new_code">SimpleTest::run()</span>
+                method.
+                We can use that result to exit the script with the desired return
+                code...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+<strong>exit ($test-&gt;run(new TextReporter()) ? 0 : 1);</strong>
+?&gt;
+</pre>
+                Of course we wouldn't really want to create two test scripts,
+                a command line one and a web browser one, for each test suite.
+                The command line reporter includes a method to sniff out the
+                run time environment...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+<strong>if (TextReporter::inCli()) {</strong>
+    exit ($test-&gt;run(new TextReporter()) ? 0 : 1);
+<strong>}</strong>
+$test-&gt;run(new HtmlReporter());
+?&gt;
+</pre>
+                This is the form used within SimpleTest itself.
+                When you use the "autorun.php", and no
+                test has been run by the end, this is pretty much
+                the code that SimpleTest will run for you implicitely.
+            </p>
+            <p>
+                In other words, this is gives the same result...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class MyTest extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('tests/file_test.php');
+    }
+}
+?&gt;
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="xml"></a>Remote testing</h2>
+            <p>
+                SimpleTest ships with an <span class="new_code">XmlReporter</span> class
+                used for internal communication.
+                When run the output looks like...
+<pre class="shell">
+&lt;?xml version="1.0"?&gt;
+&lt;run&gt;
+  &lt;group size="4"&gt;
+    &lt;name&gt;Remote tests&lt;/name&gt;
+    &lt;group size="4"&gt;
+      &lt;name&gt;Visual test with 48 passes, 48 fails and 4 exceptions&lt;/name&gt;
+      &lt;case&gt;
+        &lt;name&gt;testofunittestcaseoutput&lt;/name&gt;
+        &lt;test&gt;
+          &lt;name&gt;testofresults&lt;/name&gt;
+          &lt;pass&gt;This assertion passed&lt;/pass&gt;
+          &lt;fail&gt;This assertion failed&lt;/fail&gt;
+        &lt;/test&gt;
+        &lt;test&gt;
+          ...
+        &lt;/test&gt;
+      &lt;/case&gt;
+    &lt;/group&gt;
+  &lt;/group&gt;
+&lt;/run&gt;
+</pre>
+                To get your normal test cases to produce this format, on the
+                command line add the <span class="new_code">--xml</span> flag.
+<pre class="shell">
+php my_test.php --xml
+</pre>
+                You can do teh same thing in the web browser by adding the
+                URL parameter <span class="new_code">xml=1</span>.
+                Any true value will do.
+            </p>
+            <p>
+                You can consume this format with the parser
+                supplied as part of SimpleTest itself.
+                This is called <span class="new_code">SimpleTestXmlParser</span> and
+                resides in <em>xml.php</em> within the SimpleTest package...
+<pre>
+&lt;?php
+require_once('simpletest/xml.php');
+    
+...
+$parser = new SimpleTestXmlParser(new HtmlReporter());
+$parser-&gt;parse($test_output);
+?&gt;
+</pre>
+                The <span class="new_code">$test_output</span> should be the XML format
+                from the XML reporter, and could come from say a command
+                line run of a test case.
+                The parser sends events to the reporter just like any
+                other test run.
+                There are some odd occasions where this is actually useful.
+            </p>
+            <p>
+                Most likely it's when you want to isolate a problematic crash
+                prone test.
+                You can collect the XML output using the backtick operator
+                from another test.
+                In that way it runs in its own process...
+<pre>
+&lt;?php
+require_once('simpletest/xml.php');
+
+if (TextReporter::inCli()) {
+    $parser = new SimpleTestXmlParser(new TextReporter());
+} else {
+    $parser = new SimpleTestXmlParser(new HtmlReporter());
+}
+$parser-&gt;parse(`php flakey_test.php --xml`);
+?&gt;
+</pre>
+            </p>
+            <p>
+                Another use is breaking up large test suites.
+            </p>
+            <p>
+                A problem with large test suites is thet they can exhaust
+                the default 16Mb memory limit on a PHP process.
+                By having the test groups output in XML and run in
+                separate processes, the output can be reparsed to
+                aggregate the results into a much smaller footprint top level
+                test.
+            </p>
+            <p>
+                Because the XML output can come from anywhere, this opens
+                up the possibility of aggregating test runs from remote
+                servers.
+                A test case already exists to do this within the SimpleTest
+                framework, but it is currently experimental...
+<pre>
+&lt;?php
+<strong>require_once('../remote.php');</strong>
+require_once('simpletest/autorun.php');
+    
+$test_url = ...;
+$dry_url = ...;
+
+class MyTestOnAnotherServer extends RemoteTestCase {
+    function __construct() {
+        $test_url = ...
+        parent::__construct($test_url, $test_url . ' --dry');
+    }
+}
+?&gt;
+</pre>
+                The <span class="new_code">RemoteTestCase</span> takes the actual location
+                of the test runner, basically a web page in XML format.
+                It also takes the URL of a reporter set to do a dry run.
+                This is so that progress can be reported upward correctly.
+                The <span class="new_code">RemoteTestCase</span> can be added to test suites
+                just like any other test suite.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <span class="chosen">Reporting</span>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/unit_test_documentation.html b/3rdparty/simpletest/docs/en/unit_test_documentation.html
new file mode 100644
index 00000000000..a399bf34cb1
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/unit_test_documentation.html
@@ -0,0 +1,442 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP regression test documentation</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <span class="chosen">Unit tester</span>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>PHP Unit Test documentation</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#unit">Unit test cases</a> and basic assertions.
+        </li>
+<li>
+            <a href="#extending_unit">Extending test cases</a> to
+            customise them for your own project.
+        </li>
+<li>
+            <a href="#running_unit">Running a single case</a> as
+            a single script.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="unit"></a>Unit test cases</h2>
+            <p>
+                The core system is a regression testing framework built around
+                test cases.
+                A sample test case looks like this...
+<pre>
+<strong>class FileTestCase extends UnitTestCase {
+}</strong>
+</pre>
+                Actual tests are added as methods in the test case whose names
+                by default start with the string "test" and
+                when the test case is invoked all such methods are run in
+                the order that PHP introspection finds them.
+                As many test methods can be added as needed.
+            </p>
+            <p>
+                For example...
+<pre>
+require_once('simpletest/autorun.php');
+require_once('../classes/writer.php');
+
+class FileTestCase extends UnitTestCase {
+    function FileTestCase() {
+        $this-&gt;UnitTestCase('File test');
+    }<strong>
+
+    function setUp() {
+        @unlink('../temp/test.txt');
+    }
+
+    function tearDown() {
+        @unlink('../temp/test.txt');
+    }
+
+    function testCreation() {
+        $writer = &amp;new FileWriter('../temp/test.txt');
+        $writer-&gt;write('Hello');
+        $this-&gt;assertTrue(file_exists('../temp/test.txt'), 'File created');
+    }</strong>
+}
+</pre>
+                The constructor is optional and usually omitted.
+                Without a name, the class name is taken as the name of the test case.
+            </p>
+            <p>
+                Our only test method at the moment is <span class="new_code">testCreation()</span>
+                where we check that a file has been created by our
+                <span class="new_code">Writer</span> object.
+                We could have put the <span class="new_code">unlink()</span>
+                code into this method as well, but by placing it in
+                <span class="new_code">setUp()</span> and
+                <span class="new_code">tearDown()</span> we can use it with
+                other test methods that we add.
+            </p>
+            <p>
+                The <span class="new_code">setUp()</span> method is run
+                just before each and every test method.
+                <span class="new_code">tearDown()</span> is run just after
+                each and every test method.
+            </p>
+            <p>
+                You can place some test case set up into the constructor to
+                be run once for all the methods in the test case, but
+                you risk test interference that way.
+                This way is slightly slower, but it is safer.
+                Note that if you come from a JUnit background this will not
+                be the behaviour you are used to.
+                JUnit surprisingly reinstantiates the test case for each test
+                method to prevent such interference.
+                SimpleTest requires the end user to use <span class="new_code">setUp()</span>, but
+                supplies additional hooks for library writers.
+            </p>
+            <p>
+                The means of reporting test results (see below) are by a
+                visiting display class
+                that is notified by various <span class="new_code">assert...()</span>
+                methods.
+                Here is the full list for the <span class="new_code">UnitTestCase</span>
+                class, the default for SimpleTest...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">assertTrue($x)</span></td>
+<td>Fail if $x is false</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertFalse($x)</span></td>
+<td>Fail if $x is true</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNull($x)</span></td>
+<td>Fail if $x is set</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNotNull($x)</span></td>
+<td>Fail if $x not set</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertIsA($x, $t)</span></td>
+<td>Fail if $x is not the class or type $t</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNotA($x, $t)</span></td>
+<td>Fail if $x is of the class or type $t</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertEqual($x, $y)</span></td>
+<td>Fail if $x == $y is false</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNotEqual($x, $y)</span></td>
+<td>Fail if $x == $y is true</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertWithinMargin($x, $y, $m)</span></td>
+<td>Fail if abs($x - $y) &lt; $m is false</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertOutsideMargin($x, $y, $m)</span></td>
+<td>Fail if abs($x - $y) &lt; $m is true</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertIdentical($x, $y)</span></td>
+<td>Fail if $x == $y is false or a type mismatch</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNotIdentical($x, $y)</span></td>
+<td>Fail if $x == $y is true and types match</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertReference($x, $y)</span></td>
+<td>Fail unless $x and $y are the same variable</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertClone($x, $y)</span></td>
+<td>Fail unless $x and $y are identical copies</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertPattern($p, $x)</span></td>
+<td>Fail unless the regex $p matches $x</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoPattern($p, $x)</span></td>
+<td>Fail if the regex $p matches $x</td>
+</tr>
+                    <tr>
+<td><span class="new_code">expectError($x)</span></td>
+<td>Fail if matching error does not occour</td>
+</tr>
+                    <tr>
+<td><span class="new_code">expectException($x)</span></td>
+<td>Fail if matching exception is not thrown</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreException($x)</span></td>
+<td>Swallows any upcoming matching exception</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assert($e)</span></td>
+<td>Fail on failed <a href="expectation_documentation.html">expectation</a> object $e</td>
+</tr>
+                </tbody></table>
+                All assertion methods can take an optional description as a
+                last parameter.
+                This is to label the displayed result with.
+                If omitted a default message is sent instead, which is usually
+                sufficient.
+                This default message can still be embedded in your own message
+                if you include "%s" within the string.
+                All the assertions return true on a pass or false on failure.
+            </p>
+            <p>
+                Some examples...
+<pre>
+$variable = null;
+<strong>$this-&gt;assertNull($variable, 'Should be cleared');</strong>
+</pre>
+                ...will pass and normally show no message.
+                If you have
+                <a href="http://www.lastcraft.com/display_subclass_tutorial.php">set up the tester to display passes</a>
+                as well then the message will be displayed as is.
+<pre>
+<strong>$this-&gt;assertIdentical(0, false, 'Zero is not false [%s]');</strong>
+</pre>
+                This will fail as it performs a type
+                check, as well as a comparison, between the two values.
+                The "%s" part is replaced by the default
+                error message that would have been shown if we had not
+                supplied our own.
+<pre>
+$a = 1;
+$b = $a;
+<strong>$this-&gt;assertReference($a, $b);</strong>
+</pre>
+                Will fail as the variable <span class="new_code">$a</span> is a copy of <span class="new_code">$b</span>.
+<pre>
+<strong>$this-&gt;assertPattern('/hello/i', 'Hello world');</strong>
+</pre>
+                This will pass as using a case insensitive match the string
+                <span class="new_code">hello</span> is contained in <span class="new_code">Hello world</span>.
+<pre>
+<strong>$this-&gt;expectError();</strong>
+trigger_error('Catastrophe');
+</pre>
+                Here the check catches the "Catastrophe"
+                message without checking the text and passes.
+                This removes the error from the queue.
+<pre>
+<strong>$this-&gt;expectError('Catastrophe');</strong>
+trigger_error('Catastrophe');
+</pre>
+                The next error check tests not only the existence of the error,
+                but also the text which, here matches so another pass.
+                If any unchecked errors are left at the end of a test method then
+                an exception will be reported in the test.
+            </p>
+            <p>
+                Note that SimpleTest cannot catch compile time PHP errors.
+            </p>
+            <p>
+                The test cases also have some convenience methods for debugging
+                code or extending the suite...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setUp()</span></td>
+<td>Runs this before each test method</td>
+</tr>
+                    <tr>
+<td><span class="new_code">tearDown()</span></td>
+<td>Runs this after each test method</td>
+</tr>
+                    <tr>
+<td><span class="new_code">pass()</span></td>
+<td>Sends a test pass</td>
+</tr>
+                    <tr>
+<td><span class="new_code">fail()</span></td>
+<td>Sends a test failure</td>
+</tr>
+                    <tr>
+<td><span class="new_code">error()</span></td>
+<td>Sends an exception event</td>
+</tr>
+                    <tr>
+<td><span class="new_code">signal($type, $payload)</span></td>
+<td>Sends a user defined message to the test reporter</td>
+</tr>
+                    <tr>
+<td><span class="new_code">dump($var)</span></td>
+<td>Does a formatted <span class="new_code">print_r()</span> for quick and dirty debugging</td>
+</tr>
+                </tbody></table>
+            </p>
+        
+        <h2>
+<a class="target" name="extending_unit"></a>Extending test cases</h2>
+            <p>
+                Of course additional test methods can be added to create
+                specific types of test case, so as to extend framework...
+<pre>
+require_once('simpletest/autorun.php');
+<strong>
+class FileTester extends UnitTestCase {
+    function FileTester($name = false) {
+        $this-&gt;UnitTestCase($name);
+    }
+
+    function assertFileExists($filename, $message = '%s') {
+        $this-&gt;assertTrue(
+                file_exists($filename),
+                sprintf($message, 'File [$filename] existence check'));
+    }</strong>
+}
+</pre>
+                Here the SimpleTest library is held in a folder called
+                <em>simpletest</em> that is local.
+                Substitute your own path for this.
+            </p>
+            <p>
+                To prevent this test case being run accidently, it is
+                advisable to mark it as <span class="new_code">abstract</span>.
+            </p>
+            <p>
+                Alternatively you could add a
+                <span class="new_code">SimpleTestOptions::ignore('FileTester');</span>
+                directive in your code.
+            </p>
+            <p>
+                This new case can be now be inherited just like
+                a normal test case...
+<pre>
+class FileTestCase extends <strong>FileTester</strong> {
+
+    function setUp() {
+        @unlink('../temp/test.txt');
+    }
+
+    function tearDown() {
+        @unlink('../temp/test.txt');
+    }
+
+    function testCreation() {
+        $writer = &amp;new FileWriter('../temp/test.txt');
+        $writer-&gt;write('Hello');<strong>
+        $this-&gt;assertFileExists('../temp/test.txt');</strong>
+    }
+}
+</pre>
+            </p>
+            <p>
+                If you want a test case that does not have all of the
+                <span class="new_code">UnitTestCase</span> assertions,
+                only your own and a few basics,
+                you need to extend the <span class="new_code">SimpleTestCase</span>
+                class instead.
+                It is found in <em>simple_test.php</em> rather than
+                <em>unit_tester.php</em>.
+                See <a href="group_test_documentation.html">later</a> if you
+                want to incorporate other unit tester's
+                test cases in your test suites.
+            </p>
+        
+        <h2>
+<a class="target" name="running_unit"></a>Running a single test case</h2>
+            <p>
+                You won't often run single test cases except when bashing
+                away at a module that is having difficulty, and you don't
+                want to upset the main test suite.
+                With <em>autorun</em> no particular scaffolding is needed,
+                just launch your particular test file and you're ready to go.
+            </p>
+            <p>
+                You can even decide which reporter (for example,
+                <span class="new_code">TextReporter</span> or <span class="new_code">HtmlReporter</span>)
+                you prefer for a specific file when launched on its own...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');<strong>
+SimpleTest :: prefer(new TextReporter());</strong>
+require_once('../classes/writer.php');
+
+class FileTestCase extends UnitTestCase {
+    ...
+}
+?&gt;
+</pre>
+                This script will run as is, but of course will output zero passes
+                and zero failures until test methods are added.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">Full API for SimpleTest</a>
+            from the PHPDoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <span class="chosen">Unit tester</span>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/web_tester_documentation.html b/3rdparty/simpletest/docs/en/web_tester_documentation.html
new file mode 100644
index 00000000000..aa9df50a679
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/web_tester_documentation.html
@@ -0,0 +1,588 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP web script testing documentation</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <span class="chosen">Web tester</span>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Web tester documentation</h1>
+        This page...
+        <ul>
+<li>
+            Successfully <a href="#fetch">fetching a web page</a>
+        </li>
+<li>
+            Testing the <a href="#content">page content</a>
+        </li>
+<li>
+            <a href="#navigation">Navigating a web site</a>
+            while testing
+        </li>
+<li>
+            <a href="#request">Raw request modifications</a> and debugging methods
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="fetch"></a>Fetching a page</h2>
+            <p>
+                Testing classes is all very well, but PHP is predominately
+                a language for creating functionality within web pages.
+                How do we test the front end presentation role of our PHP
+                applications?
+                Well the web pages are just text, so we should be able to
+                examine them just like any other test data.
+            </p>
+            <p>
+                This leads to a tricky issue.
+                If we test at too low a level, testing for matching tags
+                in the page with pattern matching for example, our tests will
+                be brittle.
+                The slightest change in layout could break a large number of
+                tests.
+                If we test at too high a level, say using mock versions of a
+                template engine, then we lose the ability to automate some classes
+                of test.
+                For example, the interaction of forms and navigation will
+                have to be tested manually.
+                These types of test are extremely repetitive and error prone.
+            </p>
+            <p>
+                SimpleTest includes a special form of test case for the testing
+                of web page actions.
+                The <span class="new_code">WebTestCase</span> includes facilities
+                for navigation, content and cookie checks and form handling.
+                Usage of these test cases is similar to the
+                <a href="unit_tester_documentation.html">UnitTestCase</a>...
+<pre>
+<strong>class TestOfLastcraft extends WebTestCase {
+}</strong>
+</pre>
+                Here we are about to test the
+                <a href="http://www.lastcraft.com/">Last Craft</a> site itself.
+                If this test case is in a file called <em>lastcraft_test.php</em>
+                then it can be loaded in a runner script just like unit tests...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');<strong>
+require_once('simpletest/web_tester.php');</strong>
+SimpleTest::prefer(new TextReporter());
+
+class WebTests extends TestSuite {
+    function WebTests() {
+        $this-&gt;TestSuite('Web site tests');<strong>
+        $this-&gt;addFile('lastcraft_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                I am using the text reporter here to more clearly
+                distinguish the web content from the test output.
+            </p>
+            <p>
+                Nothing is being tested yet.
+                We can fetch the home page by using the
+                <span class="new_code">get()</span> method...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    <strong>
+    function testHomepage() {
+        $this-&gt;assertTrue($this-&gt;get('http://www.lastcraft.com/'));
+    }</strong>
+}
+</pre>
+                The <span class="new_code">get()</span> method will
+                return true only if page content was successfully
+                loaded.
+                It is a simple, but crude way to check that a web page
+                was actually delivered by the web server.
+                However that content may be a 404 response and yet
+                our <span class="new_code">get()</span> method will still return true.
+            </p>
+            <p>
+                Assuming that the web server for the Last Craft site is up
+                (sadly not always the case), we should see...
+<pre class="shell">
+Web site tests
+OK
+Test cases run: 1/1, Failures: 0, Exceptions: 0
+</pre>
+                All we have really checked is that any kind of page was
+                returned.
+                We don't yet know if it was the right one.
+            </p>
+        
+        <h2>
+<a class="target" name="content"></a>Testing page content</h2>
+            <p>
+                To confirm that the page we think we are on is actually the
+                page we are on, we need to verify the page content.
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {<strong>
+        $this-&gt;get('http://www.lastcraft.com/');
+        $this-&gt;assertText('Why the last craft');</strong>
+    }
+}
+</pre>
+                The page from the last fetch is held in a buffer in
+                the test case, so there is no need to refer to it directly.
+                The pattern match is always made against the buffer.
+            </p>
+            <p>
+                Here is the list of possible content assertions...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">assertTitle($title)</span></td>
+<td>Pass if title is an exact match</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertText($text)</span></td>
+<td>Pass if matches visible and "alt" text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoText($text)</span></td>
+<td>Pass if doesn't match visible and "alt" text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertPattern($pattern)</span></td>
+<td>A Perl pattern match against the page content</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoPattern($pattern)</span></td>
+<td>A Perl pattern match to not find content</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertLink($label)</span></td>
+<td>Pass if a link with this text is present</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoLink($label)</span></td>
+<td>Pass if no link with this text is present</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertLinkById($id)</span></td>
+<td>Pass if a link with this id attribute is present</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoLinkById($id)</span></td>
+<td>Pass if no link with this id attribute is present</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertField($name, $value)</span></td>
+<td>Pass if an input tag with this name has this value</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertFieldById($id, $value)</span></td>
+<td>Pass if an input tag with this id has this value</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertResponse($codes)</span></td>
+<td>Pass if HTTP response matches this list</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertMime($types)</span></td>
+<td>Pass if MIME type is in this list</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertAuthentication($protocol)</span></td>
+<td>Pass if the current challenge is this protocol</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoAuthentication()</span></td>
+<td>Pass if there is no current challenge</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertRealm($name)</span></td>
+<td>Pass if the current challenge realm matches</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertHeader($header, $content)</span></td>
+<td>Pass if a header was fetched matching this value</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoHeader($header)</span></td>
+<td>Pass if a header was not fetched</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertCookie($name, $value)</span></td>
+<td>Pass if there is currently a matching cookie</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoCookie($name)</span></td>
+<td>Pass if there is currently no cookie of this name</td>
+</tr>
+                </tbody></table>
+                As usual with the SimpleTest assertions, they all return
+                false on failure and true on pass.
+                They also allow an optional test message and you can embed
+                the original test message inside using "%s" inside
+                your custom message.
+            </p>
+            <p>
+                So now we could instead test against the title tag with...
+<pre>
+<strong>$this-&gt;assertTitle('The Last Craft? Web developer tutorials on PHP, Extreme programming and Object Oriented development');</strong>
+</pre>
+                ...or, if that is too long and fragile...
+<pre>
+<strong>$this-&gt;assertTitle(new PatternExpectation('/The Last Craft/'));</strong>
+</pre>
+                As well as the simple HTML content checks we can check
+                that the MIME type is in a list of allowed types with...
+<pre>
+<strong>$this-&gt;assertMime(array('text/plain', 'text/html'));</strong>
+</pre>
+                More interesting is checking the HTTP response code.
+                Like the MIME type, we can assert that the response code
+                is in a list of allowed values...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testRedirects() {
+        $this-&gt;get('http://www.lastcraft.com/test/redirect.php');
+        $this-&gt;assertResponse(200);&lt;/strong&gt;
+    }
+}
+</pre>
+                Here we are checking that the fetch is successful by
+                allowing only a 200 HTTP response.
+                This test will pass, but it is not actually correct to do so.
+                There is no page, instead the server issues a redirect.
+                The <span class="new_code">WebTestCase</span> will
+                automatically follow up to three such redirects.
+                The tests are more robust this way and we are usually
+                interested in the interaction with the pages rather
+                than their delivery.
+                If the redirects are of interest then this ability must
+                be disabled...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {<strong>
+        $this-&gt;setMaximumRedirects(0);</strong>
+        $this-&gt;get('http://www.lastcraft.com/test/redirect.php');
+        $this-&gt;assertResponse(200);
+    }
+}
+</pre>
+                The assertion now fails as expected...
+<pre class="shell">
+Web site tests
+1) Expecting response in [200] got [302]
+    in testhomepage
+    in testoflastcraft
+    in lastcraft_test.php
+FAILURES!!!
+Test cases run: 1/1, Failures: 1, Exceptions: 0
+</pre>
+                We can modify the test to correctly assert redirects with...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {
+        $this-&gt;setMaximumRedirects(0);
+        $this-&gt;get('http://www.lastcraft.com/test/redirect.php');
+        $this-&gt;assertResponse(<strong>array(301, 302, 303, 307)</strong>);
+    }
+}
+</pre>
+                This now passes.
+            </p>
+        
+        <h2>
+<a class="target" name="navigation"></a>Navigating a web site</h2>
+            <p>
+                Users don't often navigate sites by typing in URLs, but by
+                clicking links and buttons.
+                Here we confirm that the contact details can be reached
+                from the home page...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    ...
+    function testContact() {
+        $this-&gt;get('http://www.lastcraft.com/');<strong>
+        $this-&gt;clickLink('About');
+        $this-&gt;assertTitle(new PatternExpectation('/About Last Craft/'));</strong>
+    }
+}
+</pre>
+                The parameter is the text of the link.
+            </p>
+            <p>
+                If the target is a button rather than an anchor tag, then
+                <span class="new_code">clickSubmit()</span> can be used
+                with the button title...
+<pre>
+<strong>$this-&gt;clickSubmit('Go!');</strong>
+</pre>
+                If you are not sure or don't care, the usual case, then just
+                use the <span class="new_code">click()</span> method...
+<pre>
+<strong>$this-&gt;click('Go!');</strong>
+</pre>
+            </p>
+            <p>
+                The list of navigation methods is...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>The current location</td>
+</tr>
+                    <tr>
+<td><span class="new_code">get($url, $parameters)</span></td>
+<td>Send a GET request with these parameters</td>
+</tr>
+                    <tr>
+<td><span class="new_code">post($url, $parameters)</span></td>
+<td>Send a POST request with these parameters</td>
+</tr>
+                    <tr>
+<td><span class="new_code">head($url, $parameters)</span></td>
+<td>Send a HEAD request without replacing the page content</td>
+</tr>
+                    <tr>
+<td><span class="new_code">retry()</span></td>
+<td>Reload the last request</td>
+</tr>
+                    <tr>
+<td><span class="new_code">back()</span></td>
+<td>Like the browser back button</td>
+</tr>
+                    <tr>
+<td><span class="new_code">forward()</span></td>
+<td>Like the browser forward button</td>
+</tr>
+                    <tr>
+<td><span class="new_code">authenticate($name, $password)</span></td>
+<td>Retry after a challenge</td>
+</tr>
+                    <tr>
+<td><span class="new_code">restart()</span></td>
+<td>Restarts the browser as if a new session</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getCookie($name)</span></td>
+<td>Gets the cookie value for the current context</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ageCookies($interval)</span></td>
+<td>Ages current cookies prior to a restart</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clearFrameFocus()</span></td>
+<td>Go back to treating all frames as one page</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmit($label)</span></td>
+<td>Click the first button with this label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitByName($name)</span></td>
+<td>Click the button with this name attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitById($id)</span></td>
+<td>Click the button with this ID attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImage($label, $x, $y)</span></td>
+<td>Click an input tag of type image by title or alt text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageByName($name, $x, $y)</span></td>
+<td>Click an input tag of type image by name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageById($id, $x, $y)</span></td>
+<td>Click an input tag of type image by ID attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">submitFormById($id)</span></td>
+<td>Submit a form without the submit value</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLink($label, $index)</span></td>
+<td>Click an anchor by the visible label text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLinkById($id)</span></td>
+<td>Click an anchor by the ID attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFrameFocus()</span></td>
+<td>The name of the currently selected frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocusByIndex($choice)</span></td>
+<td>Focus on a frame counting from 1</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocus($name)</span></td>
+<td>Focus on a frame by name</td>
+</tr>
+                </tbody></table>
+            </p>
+            <p>
+                The parameters in the <span class="new_code">get()</span>, <span class="new_code">post()</span> or
+                <span class="new_code">head()</span> methods are optional.
+                The HTTP HEAD fetch does not change the browser context, only loads
+                cookies.
+                This can be useful for when an image or stylesheet sets a cookie
+                for crafty robot blocking.
+            </p>
+            <p>
+                The <span class="new_code">retry()</span>, <span class="new_code">back()</span> and
+                <span class="new_code">forward()</span> commands work as they would on
+                your web browser.
+                They use the history to retry pages.
+                This can be handy for checking the effect of hitting the
+                back button on your forms.
+            </p>
+            <p>
+                The frame methods need a little explanation.
+                By default a framed page is treated just like any other.
+                Content will be searced for throughout the entire frameset,
+                so clicking a link will work no matter which frame
+                the anchor tag is in.
+                You can override this behaviour by focusing on a single
+                frame.
+                If you do that, all searches and actions will apply to that
+                frame alone, such as authentication and retries.
+                If a link or button is not in a focused frame then it cannot
+                be clicked.
+            </p>
+            <p>
+                Testing navigation on fixed pages only tells you when you
+                have broken an entire script.
+                For highly dynamic pages, such as for bulletin boards, this can
+                be crucial for verifying the correctness of the application.
+                For most applications though, the really tricky logic is usually in
+                the handling of forms and sessions.
+                Fortunately SimpleTest includes
+                <a href="form_testing_documentation.html">tools for testing web forms</a>
+                as well.
+            </p>
+        
+        <h2>
+<a class="target" name="request"></a>Modifying the request</h2>
+            <p>
+                Although SimpleTest does not have the goal of testing networking
+                problems, it does include some methods to modify and debug
+                the requests it makes.
+                Here is another method list...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">getTransportError()</span></td>
+<td>The last socket error</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showRequest()</span></td>
+<td>Dump the outgoing request</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showHeaders()</span></td>
+<td>Dump the incoming headers</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showSource()</span></td>
+<td>Dump the raw HTML page content</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreFrames()</span></td>
+<td>Do not load framesets</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setCookie($name, $value)</span></td>
+<td>Set a cookie from now on</td>
+</tr>
+                    <tr>
+<td><span class="new_code">addHeader($header)</span></td>
+<td>Always add this header to the request</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumRedirects($max)</span></td>
+<td>Stop after this many redirects</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setConnectionTimeout($timeout)</span></td>
+<td>Kill the connection after this time between bytes</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useProxy($proxy, $name, $password)</span></td>
+<td>Make requests via this proxy URL</td>
+</tr>
+                </tbody></table>
+                These methods are principally for debugging.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <span class="chosen">Web tester</span>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/authentication_documentation.html b/3rdparty/simpletest/docs/fr/authentication_documentation.html
new file mode 100644
index 00000000000..fe70e035593
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/authentication_documentation.html
@@ -0,0 +1,372 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation Simple Test : tester l'authentification</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur l'authentification</h1>
+        This page...
+        <ul>
+<li>
+            Passer au travers d'une <a href="#basique">authentification HTTP basique</a>
+        </li>
+<li>
+            Tester l'<a href="#cookies">authentification basée sur des cookies</a>
+        </li>
+<li>
+            Gérer les <a href="#session">sessions du navigateur</a> et les timeouts
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                Un des secteurs à la fois délicat et important lors d'un test
+                de site web reste la sécurité. Tester ces schémas est au coeur
+                des objectifs du testeur web de SimpleTest.
+            </p>
+        
+        <h2>
+<a class="target" name="basique"></a>Authentification HTTP basique</h2>
+            <p>
+                Si vous allez chercher une page web protégée
+                par une authentification basique, vous hériterez d'une entête 401.
+                Nous pouvons représenter ceci par ce test...
+<pre>
+class AuthenticationTest extends WebTestCase {<strong>
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');
+        $this-&gt;showHeaders();
+    }</strong>
+}
+</pre>
+                Ce qui nous permet de voir les entêtes reçues...
+                <div class="demo">
+                    <h1>File test</h1>
+<pre style="background-color: lightgray; color: black">
+HTTP/1.1 401 Authorization Required
+Date: Sat, 18 Sep 2004 19:25:18 GMT
+Server: Apache/1.3.29 (Unix) PHP/4.3.4
+WWW-Authenticate: Basic realm="SimpleTest basic authentication"
+Connection: close
+Content-Type: text/html; charset=iso-8859-1
+</pre>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>0</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                Sauf que nous voulons éviter l'inspection visuelle,
+                on souhaite que SimpleTest puisse nous dire si oui ou non
+                la page est protégée. Voici un test en profondeur sur nos entêtes...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');<strong>
+        $this-&gt;assertAuthentication('Basic');
+        $this-&gt;assertResponse(401);
+        $this-&gt;assertRealm('SimpleTest basic authentication');</strong>
+    }
+}
+</pre>
+                N'importe laquelle de ces assertions suffirait,
+                tout dépend de la masse de détails que vous souhaitez voir.
+            </p>
+            <p>
+                Un des axes qui traverse SimpleTest est la possibilité d'utiliser
+				des objets <span class="new_code">SimpleExpectation</span> à chaque fois qu'une
+				vérification simple suffit.
+				Si vous souhaitez vérifiez simplement le contenu du realm - l'identification
+				du domaine - dans notre exemple, il suffit de faire...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');
+        $this-&gt;assertRealm(<strong>new PatternExpectation('/simpletest/i')</strong>);
+    }
+}
+</pre>
+                Ce type de test, vérifier les réponses HTTP, n'est cependant pas commun.
+            </p>
+			<p>
+                La plupart du temps, nous ne souhaitons pas tester
+                l'authentification en elle-même, mais plutôt
+                les pages protégées par cette authentification.
+                Dès que la tentative d'authentification est reçue,
+                nous pouvons y répondre à l'aide d'une réponse d'authentification :
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function testAuthentication() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');<strong>
+        $this-&gt;authenticate('Me', 'Secret');</strong>
+        $this-&gt;assertTitle(...);
+    }
+}
+</pre>
+                Le nom d'utilisateur et le mot de passe seront désormais
+                envoyés à chaque requête vers ce répertoire
+                et ses sous-répertoires.
+                En revanche vous devrez vous authentifier à nouveau
+                si vous sortez de ce répertoire mais SimpleTest est assez
+                intelligent pour fusionner les sous-répertoires dans un même domaine.
+            </p>
+            <p>
+                Vous pouvez gagner une ligne en définissant
+                l'authentification au niveau de l'URL...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function testCanReadAuthenticatedPages() {
+        $this-&gt;get('http://<strong>Me:Secret@</strong>www.lastcraft.com/protected/');
+        $this-&gt;assertTitle(...);
+    }
+}
+</pre>
+                Si votre nom d'utilisateur ou mot de passe comporte
+                des caractères spéciaux, alors n'oubliez pas de les encoder,
+                sinon la requête ne sera pas analysée correctement.
+                De plus cette entête ne sera pas envoyée aux
+                sous requêtes si vous la définissez avec une URL absolue.
+                Par contre si vous naviguez avec des URL relatives,
+                l'information d'authentification sera préservée.
+            </p>
+            <p>
+                Normalement, vous utilisez l'appel <span class="new_code">authenticate()</span>. SimpleTest
+				utilisera alors vos informations de connexion à chaque requête.
+            </p>
+            <p>
+                 Pour l'instant, seule l'authentification de base est implémentée
+                 et elle n'est réellement fiable qu'en tandem avec une connexion HTTPS.
+                 C'est généralement suffisant pour protéger
+                 le serveur testé des regards malveillants.
+                 Les authentifications Digest et NTLM pourraient être ajoutées prochainement.
+            </p>
+        
+        <h2>
+<a class="target" name="cookies"></a>Cookies</h2>
+            <p>
+                L'authentification de base ne donne pas assez de contrôle
+                au développeur Web sur l'interface utilisateur.
+                Il y a de forte chance pour que cette fonctionnalité
+                soit codée directement dans l'architecture web
+                à grand renfort de cookies et de timeouts compliqués.
+            </p>
+            <p>
+                Commençons par un simple formulaire de connexion...
+<pre>
+&lt;form&gt;
+    Username:
+    &lt;input type="text" name="u" value="" /&gt;&lt;br /&gt;
+    Password:
+    &lt;input type="password" name="p" value="" /&gt;&lt;br /&gt;
+    &lt;input type="submit" value="Log in" /&gt;
+&lt;/form&gt;
+</pre>
+                Lequel doit ressembler à...
+            </p>
+            <p>
+                <form class="demo">
+                    Username:
+                    <input type="text" name="u" value=""><br>
+                    Password:
+                    <input type="password" name="p" value=""><br>
+                    <input type="submit" value="Log in">
+                </form>
+            </p>
+            <p>
+                Supposons que, durant le chargement de la page,
+                un cookie ait été inscrit avec un numéro d'identifiant de session.
+                Nous n'allons pas encore remplir le formulaire,
+                juste tester que nous pistons bien l'utilisateur.
+                Voici le test...
+<pre>
+class LogInTest extends WebTestCase {
+    function testSessionCookieSetBeforeForm() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $this-&gt;assertCookie('SID');</strong>
+    }
+}
+</pre>
+                Nous nous contentons ici de vérifier que le cookie a bien été défini.
+                Etant donné que sa valeur est plutôt énigmatique,
+                elle ne vaudrait pas la peine d'être testée avec...
+<pre>
+class LogInTest extends WebTestCase {
+    function testSessionCookieIsCorrectPattern() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;assertCookie('SID', <strong>new PatternExpectation('/[a-f0-9]{32}/i')</strong>);
+    }
+}
+</pre>
+                Si vous utilisez PHP pour gérer vos sessions alors
+				ce test est encore plus inutile, étant donné qu'il ne fait
+				que tester PHP lui-même.
+            </p>
+            <p>
+                Le test le plus simple pour vérifier que la connexion a bien eu lieu
+				reste d'inspecter visuellement la page suivante :
+				un simple appel à <span class="new_code">WebTestCase::assertText()</span> et le tour est joué.
+            </p>
+            <p>
+                Le reste du test est le même que dans n'importe quel autre formulaire,
+                mais nous pourrions souhaiter nous assurer
+                que le cookie n'a pas été modifié depuis la phase de connexion.
+                Voici comment cela pourrait être testé :
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testSessionCookieSameAfterLogIn() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $session = $this-&gt;getCookie('SID');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;clickSubmit('Log in');
+        $this-&gt;assertWantedPattern('/Welcome Me/');
+        $this-&gt;assertCookie('SID', $session);</strong>
+    }
+}
+</pre>
+                Ceci confirme que l'identifiant de session
+                est identique avant et après la connexion.
+            </p>
+            <p>
+                Nous pouvons même essayer de duper notre propre système
+                en créant un cookie arbitraire pour se connecter...
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testSessionCookieSameAfterLogIn() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $this-&gt;setCookie('SID', 'Some other session');
+        $this-&gt;get('http://www.my-site.com/restricted.php');</strong>
+        $this-&gt;assertWantedPattern('/Access denied/');
+    }
+}
+</pre>
+                Votre site est-il protégé contre ce type d'attaque ?
+            </p>
+        
+        <h2>
+<a class="target" name="session"></a>Sessions de navigateur</h2>
+            <p>
+                Si vous testez un système d'authentification,
+                la reconnexion par un utilisateur est un point sensible.
+                Essayons de simuler ce qui se passe dans ce cas :
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testLoseAuthenticationAfterBrowserClose() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;clickSubmit('Log in');
+        $this-&gt;assertWantedPattern('/Welcome Me/');<strong>
+        
+        $this-&gt;restart();
+        $this-&gt;get('http://www.my-site.com/restricted.php');
+        $this-&gt;assertWantedPattern('/Access denied/');</strong>
+    }
+}
+</pre>
+                La méthode <span class="new_code">WebTestCase::restart()</span> préserve
+                les cookies dont le timeout n'a pas expiré,
+                mais jette les cookies temporaires ou expirés.
+                Vous pouvez spécifier l'heure et la date de leur réactivation.
+            </p>
+            <p>
+                L'expiration des cookies peut être un problème.
+                Si vous avez un cookie qui doit expirer au bout d'une heure,
+                nous n'allons pas mettre le test en veille en attendant
+                que le cookie expire...
+            </p>
+            <p>
+                Afin de provoquer leur expiration,
+                vous pouvez dater manuellement les cookies,
+                avant le début de la session.
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testLoseAuthenticationAfterOneHour() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;clickSubmit('Log in');
+        $this-&gt;assertWantedPattern('/Welcome Me/');
+        <strong>
+        $this-&gt;ageCookies(3600);</strong>
+        $this-&gt;restart();
+        $this-&gt;get('http://www.my-site.com/restricted.php');
+        $this-&gt;assertWantedPattern('/Access denied/');
+    }
+}
+</pre>
+                Après le redémarrage, les cookies seront plus vieux
+                d'une heure et que tous ceux dont la date d'expiration
+                sera passée auront disparus.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API du développeur pour SimpleTest</a> donne tous les détails sur les classes et les assertions disponibles.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/browser_documentation.html b/3rdparty/simpletest/docs/fr/browser_documentation.html
new file mode 100644
index 00000000000..6be1267773b
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/browser_documentation.html
@@ -0,0 +1,500 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : le composant de navigation web scriptable</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur le navigateur scriptable</h1>
+        This page...
+        <ul>
+<li>
+            Utiliser le <a href="#scripting">navigateur web dans des scripts</a>
+        </li>
+<li>
+            <a href="#deboguer">Déboguer</a> les erreurs sur les pages
+        </li>
+<li>
+            <a href="#unit">Tests complexes avec des navigateurs web multiples</a>
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                Le composant de navigation web de SimpleTest peut être utilisé
+                non seulement à l'extérieur de la classe <span class="new_code">WebTestCase</span>,
+                mais aussi indépendamment du framework SimpleTest lui-même.
+            </p>
+        
+        <h2>
+<a class="target" name="script"></a>Le navigateur scriptable</h2>
+            <p>
+                Vous pouvez utiliser le navigateur web dans des scripts PHP
+                pour confirmer que des services marchent bien comme il faut
+                ou pour extraire des informations à partir de ceux-ci de façon régulière.
+                Par exemple, voici un petit script pour extraire
+                le nombre de bogues ouverts dans PHP 5 à partir
+                du <a href="http://www.php.net/">site web PHP</a>...
+<pre>
+&lt;?php
+    require_once('simpletest/browser.php');
+    
+    $browser = &amp;new SimpleBrowser();
+    $browser-&gt;get('http://php.net/');
+    $browser-&gt;clickLink('reporting bugs');
+    $browser-&gt;clickLink('statistics');
+    $browser-&gt;clickLink('PHP 5 bugs only');
+    $page = $browser-&gt;getContent();
+    preg_match('/status=Open.*?by=Any.*?(\d+)&lt;\/a&gt;/', $page, $matches);
+    print $matches[1];
+?&gt;
+</pre>
+                Bien sûr Il y a des méthodes plus simple pour réaliser
+                cet exemple en PHP. Par exemple, vous pourriez juste
+                utiliser la commande PHP <span class="new_code">file()</span> sur ce qui est
+                ici une page fixe. Cependant, en utilisant des scripts
+                avec le navigateur web vous vous autorisez l'authentification,
+                la gestion des cookies, le chargement automatique des fenêtres,
+                les redirections, la transmission de formulaires et la capacité
+                d'examiner les entêtes.
+			</p>
+			<p>
+				Ces méthodes qui se basent sur le contenu textuel des pages
+				sont fragiles dans un site en constante évolution
+				et vous voudrez employer une méthode plus directe
+				pour accéder aux données de façon permanente,
+                mais pour des tâches simples cette technique peut s'avérer
+                une solution très rapide.
+            </p>
+            <p>
+                Toutes les méthode de navigation utilisées dans <a href="web_tester_documentation.html">WebTestCase</a> sont présente dans la classe <span class="new_code">SimpleBrowser</span>, mais les assertions sont remplacées par de simples accesseurs. Voici une liste complète des méthodes de navigation de page à page...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">addHeader($header)</span></td>
+<td>Ajouter une entête à chaque téléchargement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useProxy($proxy, $username, $password)</span></td>
+<td>Utilise ce proxy à partir de maintenant</td>
+</tr> 
+                    <tr>
+<td><span class="new_code">head($url, $parameters)</span></td>
+<td>Effectue une requête HEAD</td>
+</tr>
+                    <tr>
+<td><span class="new_code">get($url, $parameters)</span></td>
+<td>Télécharge une page avec un GET</td>
+</tr>
+                    <tr>
+<td><span class="new_code">post($url, $parameters)</span></td>
+<td>Télécharge une page avec un POST</td>
+</tr>
+                    <tr>
+<td><span class="new_code">click($label)</span></td>
+<td>Suit un lien visible ou un bouton texte par son étiquette</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLink($label)</span></td>
+<td>Suit un lien par son étiquette</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isLink($label)</span></td>
+<td>Vérifie l'existance d'un lien par son étiquette</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLinkById($id)</span></td>
+<td>Suit un lien par son attribut d'identification</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isLinkById($id)</span></td>
+<td>Vérifie l'existance d'un lien par son attribut d'identification</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>La page ou la fenêtre URL en cours</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getTitle()</span></td>
+<td>Le titre de la page</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getContent()</span></td>
+<td>Le page ou la fenêtre brute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getContentAsText()</span></td>
+<td>Sans code HTML à l'exception du text "alt"</td>
+</tr>
+                    <tr>
+<td><span class="new_code">retry()</span></td>
+<td>Répète la dernière requête</td>
+</tr>
+                    <tr>
+<td><span class="new_code">back()</span></td>
+<td>Utilise le bouton "précédent" du navigateur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">forward()</span></td>
+<td>Utilise le bouton "suivant" du navigateur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">authenticate($username, $password)</span></td>
+<td>Retente la page ou la fenêtre après une réponse 401</td>
+</tr>
+                    <tr>
+<td><span class="new_code">restart($date)</span></td>
+<td>Relance le navigateur pour une nouvelle session</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ageCookies($interval)</span></td>
+<td>Change la date des cookies</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setCookie($name, $value)</span></td>
+<td>Lance un nouveau cookie</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getCookieValue($host, $path, $name)</span></td>
+<td>Lit le cookie le plus spécifique</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getCurrentCookieValue($name)</span></td>
+<td>Lit le contenue du cookie en cours</td>
+</tr>
+                </tbody></table>
+                Les méthode <span class="new_code">SimpleBrowser::useProxy()</span> et
+                <span class="new_code">SimpleBrowser::addHeader()</span> sont spéciales.
+                Une fois appelées, elles continuent à s'appliquer sur les téléchargements suivants.
+            </p>
+            <p>
+                Naviguer dans les formulaires est similaire à la <a href="form_testing_documentation.html">navigation des formulaires via WebTestCase</a>...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setField($label, $value)</span></td>
+<td>Modifie tous les champs avec cette étiquette ou ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFieldByName($name, $value)</span></td>
+<td>Modifie tous les champs avec ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFieldById($id, $value)</span></td>
+<td>Modifie tous les champs avec cet identifiant</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getField($label)</span></td>
+<td>Accesseur de la valeur d'un élément de formulaire avec cette étiquette ou ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFieldByName($name)</span></td>
+<td>Accesseur de la valeur d'un élément de formulaire avec ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFieldById($id)</span></td>
+<td>Accesseur de la valeur de l'élément de formulaire avec cet identifiant</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmit($label)</span></td>
+<td>Transmet le formulaire avec l'étiquette de son bouton</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitByName($name)</span></td>
+<td>Transmet le formulaire avec l'attribut de son bouton</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitById($id)</span></td>
+<td>Transmet le formulaire avec l'identifiant de son bouton</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImage($label, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son titre (title="*") our son texte alternatif (alt="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageByName($name, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son attribut (name="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageById($id, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son identifiant (id="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">submitFormById($id)</span></td>
+<td>Transmet le formulaire par son identifiant propre</td>
+</tr>
+                </tbody></table>
+                Au jourd d'aujourd'hui il n'existe pas beaucoup de méthodes pour lister
+                les formulaires et les champs disponibles.
+				<table><tbody>
+                    <tr>
+<td><span class="new_code">isClickable($label)</span></td>
+<td>Vérifie si un lien existe avec cette étiquette ou ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isSubmit($label)</span></td>
+<td>Vérifie si un bouton existe avec cette étiquette ou ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isImage($label)</span></td>
+<td>Vérifie si un bouton image existe avec cette étiquette ou ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getLink($label)</span></td>
+<td>Trouve une URL à partir de son label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getLinkById($label)</span></td>
+<td>Trouve une URL à partir de son identifiant</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrls()</span></td>
+<td>Liste l'ensemble des liens de la page courante</td>
+</tr>
+                </tbody></table>
+				Ce sera probablement
+                ajouté dans des versions successives de SimpleTest.
+            </p>
+            <p>
+                A l'intérieur d'une page, les fenêtres individuelles peuvent être
+                sélectionnées. Si aucune sélection n'est réalisée alors
+                toutes les fenêtres sont fusionnées ensemble dans
+                une unique et grande page.
+                Le contenu de la page en cours sera une concaténation des
+                toutes les fenêtres dans l'ordre spécifié par les balises "frameset".
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">getFrames()</span></td>
+<td>Un déchargement de la structure de la fenêtre courante</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFrameFocus()</span></td>
+<td>L'index ou l'étiquette de la fenêtre en courante</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocusByIndex($choice)</span></td>
+<td>Sélectionne la fenêtre numérotée à partir de 1</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocus($name)</span></td>
+<td>Sélectionne une fenêtre par son étiquette</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clearFrameFocus()</span></td>
+<td>Traite toutes les fenêtres comme une seule page</td>
+</tr>
+                </tbody></table>
+                Lorsqu'on est focalisé sur une fenêtre unique,
+                le contenu viendra de celle-ci uniquement.
+                Cela comprend les liens à cliquer et les formulaires à transmettre.
+            </p>
+        
+        <h2>
+<a class="target" name="deboguer"></a>Où sont les erreurs ?</h2>
+            <p>
+                Toute cette masse de fonctionnalités est géniale
+                lorsqu'on arrive à bien télécharger les pages,
+                mais ce n'est pas toujours évident.
+                Pour aider à découvrir les erreurs, le navigateur a aussi
+                des méthodes pour aider au débogage.
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setConnectionTimeout($timeout)</span></td>
+<td>Ferme la socket avec un délai trop long</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>L'URL de la page chargée le plus récemment</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getRequest()</span></td>
+<td>L'entête de la requête brute de la page ou de la fenêtre</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getHeaders()</span></td>
+<td>L'entête de réponse de la page ou de la fenêtre</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getTransportError()</span></td>
+<td>N'importe quel erreur au niveau de la socket dans le dernier téléchargement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getResponseCode()</span></td>
+<td>La réponse HTTP de la page ou de la fenêtre</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getMimeType()</span></td>
+<td>Le type Mime de la page our de la fenêtre</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getAuthentication()</span></td>
+<td>Le type d'authentification dans l'entête d'une provocation 401</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getRealm()</span></td>
+<td>Le realm d'authentification dans l'entête d'une provocation 401</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getBaseUrl()</span></td>
+<td>Uniquement la base de l'URL de la page chargée le plus récemment</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumRedirects($max)</span></td>
+<td>Nombre de redirections avant que la page ne soit chargée automatiquement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumNestedFrames($max)</span></td>
+<td>Protection contre des framesets récursifs</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreFrames()</span></td>
+<td>Neutralise le support des fenêtres</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useFrames()</span></td>
+<td>Autorise le support des fenêtres</td>
+</tr>
+                </tbody></table>
+                Les méthodes <span class="new_code">SimpleBrowser::setConnectionTimeout()</span>,
+                <span class="new_code">SimpleBrowser::setMaximumRedirects()</span>,
+                <span class="new_code">SimpleBrowser::setMaximumNestedFrames()</span>,
+                <span class="new_code">SimpleBrowser::ignoreFrames()</span>
+                et <span class="new_code">SimpleBrowser::useFrames()</span> continuent à s'appliquer
+                sur toutes les requêtes suivantes.
+                Les autres méthodes tiennent compte des fenêtres.
+                Cela veut dire que si une fenêtre individuelle ne se charge pas,
+                il suffit de se diriger vers elle avec
+                <span class="new_code">SimpleBrowser::setFrameFocus()</span> : ensuite on utilisera
+                <span class="new_code">SimpleBrowser::getRequest()</span>, etc. pour voir ce qui se passe.
+            </p>
+        
+        <h2>
+<a class="target" name="unit"></a>Tests unitaires complexes avec des navigateurs multiples</h2>
+            <p>
+                Tout ce qui peut être fait dans
+                <a href="web_tester_documentation.html">WebTestCase</a> peut maintenant
+                être fait dans un <a href="unit_tester_documentation.html">UnitTestCase</a>.
+                Ce qui revient à dire que nous pouvons librement mélanger
+                des tests sur des objets de domaine avec l'interface web...
+<pre><strong>
+class TestOfRegistration extends UnitTestCase {
+    function testNewUserAddedToAuthenticator() {</strong>
+        $browser = new SimpleBrowser();
+        $browser-&gt;get('http://my-site.com/register.php');
+        $browser-&gt;setField('email', 'me@here');
+        $browser-&gt;setField('password', 'Secret');
+        $browser-&gt;clickSubmit('Register');
+        <strong>
+        $authenticator = new Authenticator();
+        $member = $authenticator-&gt;findByEmail('me@here');
+        $this-&gt;assertEqual($member-&gt;getPassword(), 'Secret');</strong>
+    }
+}
+</pre>
+                Bien que ça puisse être utile par convenance temporaire,
+                je ne suis pas fan de ce genre de test. Ce test s'applique
+                à plusieurs couches de l'application, ça implique qu'il est
+                plus que probable qu'il faudra le remanier lorsque le code changera.
+            </p>
+            <p>
+                Un cas plus utile d'utilisation directe du navigateur est
+                le moment où le <span class="new_code">WebTestCase</span> ne peut plus suivre.
+                Un exemple ? Quand deux navigateurs doivent être utilisés en même temps.
+            </p>
+            <p>
+                Par exemple, supposons que nous voulions interdire
+                des usages simultanés d'un site avec le même login d'identification.
+                Ce scénario de test le vérifie...
+<pre>
+class TestOfSecurity extends UnitTestCase {
+    function testNoMultipleLoginsFromSameUser() {
+        $first = &amp;new SimpleBrowser();
+        $first-&gt;get('http://my-site.com/login.php');
+        $first-&gt;setField('name', 'Me');
+        $first-&gt;setField('password', 'Secret');
+        $first-&gt;clickSubmit('Enter');
+        $this-&gt;assertEqual($first-&gt;getTitle(), 'Welcome');
+        
+        $second = &amp;new SimpleBrowser();
+        $second-&gt;get('http://my-site.com/login.php');
+        $second-&gt;setField('name', 'Me');
+        $second-&gt;setField('password', 'Secret');
+        $second-&gt;clickSubmit('Enter');
+        $this-&gt;assertEqual($second-&gt;getTitle(), 'Access Denied');
+    }
+}
+</pre>
+                Vous pouvez aussi utiliser la classe <span class="new_code">SimpleBrowser</span>
+                quand vous souhaitez écrire des scénarios de test en utilisant
+                un autre outil que SimpleTest, comme PHPUnit par exemple.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API de développeur pour SimpleTest</a>
+            donne tous les détails sur les classes et les assertions disponibles.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/docs.css b/3rdparty/simpletest/docs/fr/docs.css
new file mode 100755
index 00000000000..49170486ab3
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/docs.css
@@ -0,0 +1,84 @@
+body {
+    padding-left: 3%;
+    padding-right: 3%;
+}
+pre {
+    font-family: "courier new", courier;
+    font-size: 80%;
+    border: 1px solid;
+    background-color: #cccccc;
+    padding: 5px;
+    margin-left: 5%;
+    margin-right: 8%;
+}
+.code, .new_code, pre.new_code {
+    font-weight: bold;
+}
+div.copyright {
+    font-size: 80%;
+    color: gray;
+}
+div.copyright a {
+    color: gray;
+}
+ul.api {
+    padding-left: 0em;
+    padding-right: 25%;
+}
+ul.api li {
+    margin-top: 0.2em;
+    margin-bottom: 0.2em;
+    list-style: none;
+    text-indent: -3em;
+    padding-left: 3em;
+}
+div.demo {
+    border: 4px ridge;
+    border-color: gray;
+    padding: 10px;
+    margin: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+    background-color: white;
+}
+div.demo span.fail {
+    color: red;
+}
+div.demo span.pass {
+    color: green;
+}
+div.demo h1 {
+    font-size: 12pt;
+    text-align: left;
+    font-weight: bold;
+}
+table {
+    border: 2px outset;
+    border-color: gray;
+    background-color: white;
+    margin: 5px;
+    margin-left: 5%;
+    margin-right: 5%;
+}
+td {
+    font-size: 80%;
+}
+.shell {
+    color: white;
+}
+pre.shell {
+    border: 4px ridge;
+    border-color: gray;
+    padding: 10px;
+    margin: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+    background-color: black;
+}
+form.demo {
+    background-color: lightgray;
+    border: 4px outset;
+    border-color: lightgray;
+    padding: 10px;
+    margin-right: 40%;
+}
diff --git a/3rdparty/simpletest/docs/fr/expectation_documentation.html b/3rdparty/simpletest/docs/fr/expectation_documentation.html
new file mode 100644
index 00000000000..ee579110a6d
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/expectation_documentation.html
@@ -0,0 +1,451 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : étendre le testeur unitaire avec des classes d'attentes supplémentaires</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur les attentes</h1>
+        This page...
+        <ul>
+<li>
+            Utiliser les attentes <a href="#fantaisie">pour des tests
+            plus précis avec des objets fantaisie</a>
+        </li>
+<li>
+            <a href="#comportement">Changer le comportement d'un objet fantaisie</a>
+            avec des attentes
+        </li>
+<li>
+            <a href="#etendre">Créer des attentes</a>
+        </li>
+<li>
+            Par dessous SimpleTest <a href="#unitaire">utilise des classes d'attente</a>
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="fantaisie"></a>Plus de contrôle sur les objets fantaisie</h2>
+            <p>
+                Le comportement par défaut des
+                <a href="mock_objects_documentation.html">objets fantaisie</a> dans
+                <a href="http://sourceforge.net/projects/simpletest/">SimpleTest</a>
+                est soit une correspondance identique sur l'argument,
+                soit l'acceptation de n'importe quel argument.
+                Pour la plupart des tests, c'est suffisant.
+                Cependant il est parfois nécessaire de ramollir un scénario de test.
+            </p>
+            <p>
+                Un des endroits où un test peut être trop serré
+                est la reconnaissance textuelle. Prenons l'exemple
+                d'un composant qui produirait un message d'erreur
+                utile lorsque quelque chose plante. Il serait utile de tester
+                que l'erreur correcte est renvoyée,
+                mais le texte proprement dit risque d'être plutôt long.
+                Si vous testez le texte dans son ensemble alors
+                à chaque modification de ce même message
+                -- même un point ou une virgule -- vous aurez
+                à revenir sur la suite de test pour la modifier.
+            </p>
+            <p>
+                Voici un cas concret, nous avons un service d'actualités
+                qui a échoué dans sa tentative de connexion à sa source distante.
+<pre>
+<strong>class NewsService {
+    ...
+    function publish($writer) {
+        if (! $this-&gt;isConnected()) {
+            $writer-&gt;write('Cannot connect to news service "' .
+                    $this-&gt;_name . '" at this time. ' .
+                    'Please try again later.');
+        }
+        ...
+    }
+}</strong>
+</pre>
+                Là il envoie son contenu vers un classe <span class="new_code">Writer</span>.
+                Nous pourrions tester ce comportement avec un <span class="new_code">MockWriter</span>...
+<pre>
+class TestOfNewsService extends UnitTestCase {
+    ...
+    function testConnectionFailure() {<strong>
+        $writer = new MockWriter($this);
+        $writer-&gt;expectOnce('write', array(
+                'Cannot connect to news service ' .
+                '"BBC News" at this time. ' .
+                'Please try again later.'));
+        
+        $service = new NewsService('BBC News');
+        $service-&gt;publish($writer);
+        
+        $writer-&gt;tally();</strong>
+    }
+}
+</pre>
+                C'est un bon exemple d'un test fragile.
+                Si nous décidons d'ajouter des instructions complémentaires,
+                par exemple proposer une source d'actualités alternative,
+                nous casserons nos tests par la même occasion sans pourtant
+                avoir modifié une seule fonctionnalité.
+            </p>
+            <p>
+                Pour contourner ce problème, nous voudrions utiliser
+                un test avec une expression rationnelle plutôt
+                qu'une correspondance exacte. Nous pouvons y parvenir avec...
+<pre>
+class TestOfNewsService extends UnitTestCase {
+    ...
+    function testConnectionFailure() {
+        $writer = new MockWriter($this);<strong>
+        $writer-&gt;expectOnce(
+                'write',
+                array(new PatternExpectation('/cannot connect/i')));</strong>
+        
+        $service = new NewsService('BBC News');
+        $service-&gt;publish($writer);
+        
+        $writer-&gt;tally();
+    }
+}
+</pre>
+                Plutôt que de transmettre le paramètre attendu au <span class="new_code">MockWriter</span>,
+                nous envoyons une classe d'attente appelée <span class="new_code">PatternExpectation</span>.
+                L'objet fantaisie est suffisamment élégant pour reconnaître
+                qu'il s'agit d'un truc spécial et pour le traiter différemment.
+                Plutôt que de comparer l'argument entrant à cet objet,
+                il utilise l'objet attente lui-même pour exécuter le test.
+            </p>
+            <p>
+                <span class="new_code">PatternExpectation</span> utilise
+                l'expression rationnelle pour la comparaison avec son constructeur.
+                A chaque fois qu'une comparaison est fait à travers
+                <span class="new_code">MockWriter</span> par rapport à cette classe attente,
+                elle fera un <span class="new_code">preg_match()</span> avec ce motif.
+                Dans notre scénario de test ci-dessus, aussi longtemps
+                que la chaîne "cannot connect" apparaît dans le texte,
+                la fantaisie transmettra un succès au testeur unitaire.
+                Peu importe le reste du texte.
+            </p>
+            <p>
+                Les classes attente possibles sont...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">AnythingExpectation</span></td>
+<td>Sera toujours validé</td>
+</tr>
+                    <tr>
+<td><span class="new_code">EqualExpectation</span></td>
+<td>Une égalité, plutôt que la plus forte comparaison à l'identique</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotEqualExpectation</span></td>
+<td>Une comparaison sur la non-égalité</td>
+</tr>
+                    <tr>
+<td><span class="new_code">IndenticalExpectation</span></td>
+<td>La vérification par défaut de l'objet fantaisie qui doit correspondre exactement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotIndenticalExpectation</span></td>
+<td>Inverse la logique de l'objet fantaisie</td>
+</tr>
+                    <tr>
+<td><span class="new_code">PatternExpectation</span></td>
+<td>Utilise une expression rationnelle Perl pour comparer une chaîne</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NoPatternExpectation</span></td>
+<td>Passe seulement si l'expression rationnelle Perl échoue</td>
+</tr>
+                    <tr>
+<td><span class="new_code">IsAExpectation</span></td>
+<td>Vérifie le type ou le nom de la classe uniquement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotAExpectation</span></td>
+<td>L'opposé de <span class="new_code">IsAExpectation</span>
+</td>
+</tr>
+                    <tr>
+<td><span class="new_code">MethodExistsExpectation</span></td>
+<td>Vérifie si la méthode est disponible sur un objet</td>
+</tr>
+					<tr>
+<td><span class="new_code">TrueExpectation</span></td>
+<td>Accepte n'importe quelle variable PHP qui vaut vrai</td>
+</tr>
+                    <tr>
+<td><span class="new_code">FalseExpectation</span></td>
+<td>Accepte n'importe quelle variable PHP qui vaut faux</td>
+</tr>
+                </tbody></table>
+                La plupart utilisent la valeur attendue dans le constructeur.
+                Les exceptions sont les vérifications sur motif,
+                qui utilisent une expression rationnelle, ainsi que
+                <span class="new_code">IsAExpectation</span> et <span class="new_code">NotAExpectation</span>,
+                qui prennent un type ou un nom de classe comme chaîne.
+            </p>
+        
+        <h2>
+<a class="target" name="comportement"></a>Utiliser les attentes pour contrôler les bouchons serveur</h2>
+            <p>
+                Les classes attente peuvent servir à autre chose
+                que l'envoi d'assertions depuis les objets fantaisie,
+                afin de choisir le comportement d'un
+                <a href="mock_objects_documentation.html">objet fantaisie</a>
+                ou celui d'un <a href="server_stubs_documentation.html">bouchon serveur</a>.
+                A chaque fois qu'une liste d'arguments est donnée,
+                une liste d'objets d'attente peut être insérée à la place.
+            </p>
+            <p>
+                Mettons que nous voulons qu'un bouchon serveur
+                d'autorisation simule une connexion réussie seulement
+                si il reçoit un objet de session valide.
+                Nous pouvons y arriver avec ce qui suit...
+<pre>
+Stub::generate('Authorisation');
+<strong>
+$authorisation = new StubAuthorisation();
+$authorisation-&gt;returns(
+        'isAllowed',
+        true,
+        array(new IsAExpectation('Session', 'Must be a session')));
+$authorisation-&gt;returns('isAllowed', false);</strong>
+</pre>
+                Le comportement par défaut du bouchon serveur
+                est défini pour renvoyer <span class="new_code">false</span>
+                quand <span class="new_code">isAllowed</span> est appelé.
+                Lorsque nous appelons cette méthode avec un unique paramètre
+                qui est un objet <span class="new_code">Session</span>, il renverra <span class="new_code">true</span>.
+                Nous avons aussi ajouté un deuxième paramètre comme message.
+                Il sera affiché dans le message d'erreur de l'objet fantaisie
+                si l'attente est la cause de l'échec.
+            </p>
+            <p>
+                Ce niveau de sophistication est rarement utile :
+                il n'est inclut que pour être complet.
+            </p>
+        
+        <h2>
+<a class="target" name="etendre"></a>Créer vos propres attentes</h2>
+            <p>
+                Les classes d'attentes ont une structure très simple.
+                Tellement simple qu'il devient très simple de créer
+                vos propres version de logique pour des tests utilisés couramment.
+            </p>
+            <p>
+                Par exemple voici la création d'une classe pour tester
+                la validité d'adresses IP. Pour fonctionner correctement
+                avec les bouchons serveurs et les objets fantaisie,
+                cette nouvelle classe d'attente devrait étendre
+                <span class="new_code">SimpleExpectation</span> ou une autre de ses sous-classes...
+<pre>
+<strong>class ValidIp extends SimpleExpectation {
+    
+    function test($ip) {
+        return (ip2long($ip) != -1);
+    }
+    
+    function testMessage($ip) {
+        return "Address [$ip] should be a valid IP address";
+    }
+}</strong>
+</pre> 
+               Il n'y a véritablement que deux méthodes à mettre en place.
+               La méthode <span class="new_code">test()</span> devrait renvoyer un <span class="new_code">true</span>
+               si l'attente doit passer, et une erreur <span class="new_code">false</span>
+               dans le cas contraire. La méthode <span class="new_code">testMessage()</span>
+               ne devrait renvoyer que du texte utile à la compréhension du test en lui-même.
+            </p>
+            <p>
+                Cette classe peut désormais être employée à la place
+                des classes d'attente précédentes.
+            </p>
+			<p>
+				Voici un exemple plus typique, vérifier un hash...
+<pre>
+<strong>class JustField extends EqualExpectation {
+    private $key;
+    
+    function __construct($key, $expected) {
+        parent::__construct($expected);
+        $this-&gt;key = $key;
+    }
+    
+    function test($compare) {
+        if (! isset($compare[$this-&gt;key])) {
+            return false;
+        }
+        return parent::test($compare[$this-&gt;key]);
+    }
+    
+    function testMessage($compare) {
+        if (! isset($compare[$this-&gt;key])) {
+            return 'Key [' . $this-&gt;key . '] does not exist';
+        }
+        return 'Key [' . $this-&gt;key . '] -&gt; ' .
+                parent::testMessage($compare[$this-&gt;key]);
+    }
+}</strong>
+</pre>
+                L'habitude a été prise pour séparer les clauses du message avec
+                "&amp;nbsp;-&gt;&amp;nbsp;".
+				Cela permet aux outils dérivés de reformater la sortie.
+            </p>
+            <p>
+                Supposons qu'un authentificateur s'attend à recevoir
+				une ligne de base de données correspondant à l'utilisateur,
+				et que nous avons juste besoin de valider le nom d'utilisateur.
+				Nous pouvons le faire très simplement avec... 
+<pre>
+$mock-&gt;expectOnce('authenticate',
+                  array(new JustKey('username', 'marcus')));
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="unitaire"></a>Sous le capot du testeur unitaire</h2>
+            <p>
+                Le <a href="http://sourceforge.net/projects/simpletest/">framework
+                de test unitaire SimpleTest</a> utilise aussi dans son coeur
+                des classes d'attente pour
+                la <a href="unit_test_documentation.html">classe UnitTestCase</a>.
+                Nous pouvons aussi tirer parti de ces mécanismes pour réutiliser
+                nos propres classes attente à l'intérieur même des suites de test.
+            </p>
+            <p>
+                La méthode la plus directe est d'utiliser la méthode
+                <span class="new_code">SimpleTest::assert()</span> pour effectuer le test...
+<pre>
+<strong>class TestOfNetworking extends UnitTestCase {
+    ...
+    function testGetValidIp() {
+        $server = &amp;new Server();
+        $this-&gt;assert(
+                new ValidIp(),
+                $server-&gt;getIp(),
+                'Server IP address-&gt;%s');
+    }
+}</strong>
+</pre>
+                <span class="new_code">assert()</span> testera toute attente directement.
+            </p>
+			<p>
+				C'est plutôt sale par rapport à notre syntaxe habituelle
+                du type <span class="new_code">assert...()</span>.
+            </p>
+            <p>
+                Pour un cas aussi simple, nous créons d'ordinaire une méthode
+                d'assertion distincte en utilisant la classe d'attente.
+                Supposons un instant que notre attente soit un peu plus
+                compliquée et que par conséquent nous souhaitions la réutiliser,
+                nous obtenons...
+<pre>
+class TestOfNetworking extends UnitTestCase {
+    ...<strong>
+    function assertValidIp($ip, $message = '%s') {
+        $this-&gt;assertExpectation(new ValidIp(), $ip, $message);
+    }</strong>
+    
+    function testGetValidIp() {
+        $server = &amp;new Server();<strong>
+        $this-&gt;assertValidIp(
+                $server-&gt;getIp(),
+                'Server IP address-&gt;%s');</strong>
+    }
+}
+</pre>
+                It is rare to need the expectations for more than pattern
+                matching, but these facilities do allow testers to build
+                some sort of domain language for testing their application.
+                Also, complex expectation classes could make the tests
+                harder to read and debug.
+                In effect extending the test framework to create their own tool set.
+            
+			
+                Il est assez rare que le besoin d'une attente dépasse
+                le stade de la reconnaissance d'un motif, mais ils permettent
+				aux testeurs de construire leur propre langage dédié ou DSL
+				(Domain Specific Language) pour tester leurs applications.
+                Attention, les classes d'attente complexes peuvent rendre
+                les tests difficiles à lire et à déboguer.
+                Ces mécanismes sont véritablement là pour les auteurs
+                de système qui étendront le framework de test
+                pour leurs propres outils de test.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            Les attentes imitent les contraintes dans
+            <a href="http://www.jmock.org/">JMock</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API complète pour SimpleTest</a>
+            réalisé avec PHPDoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/form_testing_documentation.html b/3rdparty/simpletest/docs/fr/form_testing_documentation.html
new file mode 100644
index 00000000000..e3cb6a10a19
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/form_testing_documentation.html
@@ -0,0 +1,363 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : tester des formulaires HTML</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur les tests de formulaire</h1>
+        This page...
+        <ul>
+<li>
+            Modifier les valeurs d'un formulaire et
+            <a href="#submit">réussir à transmettre un simple formulaire</a>
+        </li>
+<li>
+            Gérer des <a href="#multiple">objets à valeurs multiples</a>
+            en initialisant des listes.
+        </li>
+<li>
+            Le cas des formulaires utilisant Javascript pour
+            modifier <a href="#hidden-field">un champ caché</a>
+        </li>
+<li>
+            <a href="#brut">Envoi brut</a> quand il n'existe pas de bouton à cliquer.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="submit"></a>Valider un formulaire simple</h2>
+            <p>
+                Lorsqu'une page est téléchargée par <span class="new_code">WebTestCase</span>
+                en utilisant <span class="new_code">get()</span> ou <span class="new_code">post()</span>
+                le contenu de la page est automatiquement analysé.
+                De cette analyse découle le fait que toutes les commandes
+                à l'intérieur de la balise &lt;form&gt; sont disponibles
+                depuis l'intérieur du scénario de test.
+                Prenons par exemple cet extrait de code HTML...
+<pre>
+&lt;form&gt;
+    &lt;input type="text" name="a" value="A default" /&gt;
+    &lt;input type="submit" value="Go" /&gt;
+&lt;/form&gt;
+</pre>
+                Il ressemble à...
+            </p>
+            <p>
+                <form class="demo">
+                    <input type="text" name="a" value="A default">
+                    <input type="submit" value="Go">
+                </form>
+            </p>
+            <p>
+                Nous pouvons naviguer vers ce code, via le site
+                <a href="http://www.lastcraft.com/form_testing_documentation.php">LastCraft</a>,
+                avec le test suivant...
+<pre>
+class SimpleFormTests extends WebTestCase {<strong>
+    function testDefaultValue() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('a', 'A default');
+    }</strong>
+}
+</pre>
+                Directement après le chargement de la page toutes les commandes HTML
+                sont initiées avec leur valeur par défaut, comme elles apparaîtraient
+                dans un navigateur web. L'assertion teste qu'un objet HTML
+                avec le nom "a" existe dans la page
+                et qu'il contient la valeur "A default".
+            </p>
+            <p>
+                Nous pourrions retourner le formulaire tout de suite...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testDefaultValue() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('a', <strong>new PatternExpectation('/default/')</strong>);
+    }
+}
+</pre>
+                Mais d'abord nous allons changer la valeur du champ texte.
+                Ce n'est qu'après que nous le transmettrons...
+<pre>
+class SimpleFormTests extends WebTestCase {
+
+    function testDefaultValue() {
+        $this-&gt;get('http://www.my-site.com/');
+        $this-&gt;assertField('a', 'A default');<strong>
+        $this-&gt;setField('a', 'New value');
+        $this-&gt;clickSubmit('Go');</strong>
+    }
+}
+</pre>
+                Parce que nous n'avons spécifié ni attribut "method"
+                sur la balise form, ni attribut "action",
+                le scénario de test suivra le comportement classique d'un navigateur :
+                transmission des données avec une requête <em>GET</em>
+                vers la même page. En règle générale SimpleTest essaie d'émuler
+                le comportement typique d'un navigateur autant que possible,
+                plutôt que d'essayer d'attraper des attributs manquants sur les balises.
+                La raison est simple : la cible d'un framework de test est
+                la logique d'une application PHP, pas les erreurs
+                -- de syntaxe ou autres -- du code HTML.
+                Pour les erreurs HTML, d'autres outils tel
+				<a href="http://www.w3.org/People/Raggett/tidy/">HTMLTidy</a>
+                devraient être employés, ou même n'importe lequel des validateurs HTML et CSS
+				déjà sur le marché.
+            </p>
+            <p>
+                Si un champ manque dans n'importe quel formulaire ou si
+                une option est indisponible alors <span class="new_code">WebTestCase::setField()</span>
+                renverra <span class="new_code">false</span>. Par exemple, supposons que
+                nous souhaitons vérifier qu'une option "Superuser"
+                n'est pas présente dans ce formulaire...
+<pre>
+<strong>Select type of user to add:</strong>
+&lt;select name="type"&gt;
+    &lt;option&gt;Subscriber&lt;/option&gt;
+    &lt;option&gt;Author&lt;/option&gt;
+    &lt;option&gt;Administrator&lt;/option&gt;
+&lt;/select&gt;
+</pre>
+                Qui ressemble à...
+            </p>
+            <p>
+                <form class="demo">
+                    <strong>Select type of user to add:</strong>
+                    <select name="type">
+                        <option>Subscriber</option>
+                        <option>Author</option>
+                        <option>Administrator</option>
+                    </select>
+                </form>
+            </p>
+            <p>
+                Le test suivant le confirmera...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...
+    function testNoSuperuserChoiceAvailable() {<strong>
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertFalse($this-&gt;setField('type', 'Superuser'));</strong>
+    }
+}
+</pre>
+                La sélection ne sera pas changée si la nouvelle valeur n'est pas une des options.
+            </p>
+            <p>
+                Voici la liste complète des objets supportés à aujourd'hui...
+                <ul>
+                    <li>Champs texte, y compris les champs masqués (hidden) ou cryptés (password).</li>
+                    <li>Boutons submit, en incluant aussi la balise button, mais pas encore les boutons reset</li>
+                    <li>Aires texte (textarea) avec leur gestion des retours à la ligne (wrap).</li> 
+                    <li>Cases à cocher, y compris les cases à cocher multiples dans un même formulaire.</li>
+                    <li>Listes à menu déroulant, y compris celles à sélections multiples.</li>
+                    <li>Boutons radio.</li>
+                    <li>Images.</li>
+                </ul>
+            </p>
+            <p>
+                Le navigateur proposé par SimpleTest émule les actions
+                qui peuvent être réalisées par un utilisateur sur
+                une page HTML standard. Javascript n'est pas supporté et
+                il y a peu de chance pour qu'il le soit prochainement.
+            </p>
+            <p>
+                Une attention particulière doit être porté aux techniques Javascript
+                qui changent la valeur d'un champ caché : elles ne peuvent pas être
+                réalisées avec les commandes classiques de SimpleTest.
+                Une méthode alternative est proposée plus loin.
+            </p>
+        
+        <h2>
+<a class="target" name="multiple"></a>Champs à valeurs multiples</h2>
+            <p>
+                SimpleTest peut gérer deux types de commandes à valeur multiple :
+                les menus déroulants à sélection multiple et les cases à cocher
+                avec le même nom à l'intérieur même d'un formulaire.
+                La nature de ceux-ci implique que leur initialisation
+                et leur test sont légèrement différents.
+                Voici un exemple avec des cases à cocher...
+<pre>
+&lt;form class="demo"&gt;
+    <strong>Create privileges allowed:</strong>
+    &lt;input type="checkbox" name="crud" value="c" checked&gt;&lt;br&gt;
+    <strong>Retrieve privileges allowed:</strong>
+    &lt;input type="checkbox" name="crud" value="r" checked&gt;&lt;br&gt;
+    <strong>Update privileges allowed:</strong>
+    &lt;input type="checkbox" name="crud" value="u" checked&gt;&lt;br&gt;
+    <strong>Destroy privileges allowed:</strong>
+    &lt;input type="checkbox" name="crud" value="d" checked&gt;&lt;br&gt;
+    &lt;input type="submit" value="Enable Privileges"&gt;
+&lt;/form&gt;
+</pre>
+                Qui se traduit par...
+            </p>
+            <p>
+                <form class="demo">
+                    <strong>Create privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="c" checked><br>
+                    <strong>Retrieve privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="r" checked><br>
+                    <strong>Update privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="u" checked><br>
+                    <strong>Destroy privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="d" checked><br>
+                    <input type="submit" value="Enable Privileges">
+                </form>
+            </p>
+            <p>
+                Si nous souhaitons désactiver tous les privilèges sauf
+                ceux de téléchargement (Retrieve) et transmettre cette information,
+                nous pouvons y arriver par...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...<strong>
+    function testDisableNastyPrivileges() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('crud', array('c', 'r', 'u', 'd'));
+        $this-&gt;setField('crud', array('r'));
+        $this-&gt;clickSubmit('Enable Privileges');
+    }</strong>
+}
+</pre>
+                Plutôt que d'initier le champ à une valeur unique,
+                nous lui donnons une liste de valeurs.
+                Nous faisons la même chose pour tester les valeurs attendues.
+                Nous pouvons écrire d'autres bouts de code de test
+                pour confirmer cet effet, peut-être en nous connectant
+                comme utilisateur et en essayant d'effectuer une mise à jour.
+            </p>
+        
+        <h2>
+<a class="target" name="hidden-field"></a>Formulaires utilisant Javascript pour changer un champ caché</h2>
+            <p>
+                Si vous souhaitez tester un formulaire dépendant de Javascript
+                pour la modification d'un champ caché, vous ne pouvez pas
+                simplement utiliser setField().
+                Le code suivant <em>ne fonctionnera pas</em> :
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testEmulateMyJavascriptForm() {
+        <strong>// This does *not* work</strong>
+        $this-&gt;setField('a_hidden_field', '123');
+        $this-&gt;clickSubmit('OK');
+    }
+}
+</pre>
+                A la place, vous aurez besoin d'ajouter le paramètre supplémentaire
+                du formulaire à la méthode clickSubmit() :
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testMyJavascriptForm() {
+        <strong>$this-&gt;clickSubmit('OK', array('a_hidden_field'=&gt;'123'));</strong>
+    }
+
+}
+</pre>
+            </p>
+            <p>
+                N'oubliez pas que de la sorte, vous êtes effectivement en train
+                de court-circuitez une partie de votre application (le code Javascript
+                dans le formulaire) et que peut-être serait-il plus prudent
+                d'utiliser un outil comme
+                <a href="http://selenium.openqa.org/">Selenium</a> pour mettre sur pied
+                un test complet.
+            </p>
+        
+        <h2>
+<a class="target" name="brut"></a>Envoi brut</h2>
+            <p>
+                Si vous souhaitez tester un gestionnaire de formulaire
+                mais que vous ne l'avez pas écrit ou que vous n'y avez
+                pas encore accès, vous pouvez créer un envoi de formulaire à la main.
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...<strong>    
+    function testAttemptedHack() {
+        $this-&gt;post(
+                'http://www.my-site.com/add_user.php',
+                array('type' =&gt; 'superuser'));
+        $this-&gt;assertNoUnwantedPattern('/user created/i');
+    }</strong>
+}
+</pre>
+                En ajoutant des données à la méthode <span class="new_code">WebTestCase::post()</span>,
+                nous émulons la transmission d'un formulaire.
+				D'ordinaire, vous ne ferez cela que pour parer au plus pressé,
+				ou alors si vous espérez un tiers (javascript ?) transmette le formulaire.
+				Il reste quand même exception : si vous souhaitez vous protégez
+				d'attaques de type "spoofing".  
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li> 
+           <a href="http://simpletest.org/api/">L'API du développeur pour SimpleTest</a>
+           donne tous les détails sur les classes et les assertions disponibles.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/group_test_documentation.html b/3rdparty/simpletest/docs/fr/group_test_documentation.html
new file mode 100644
index 00000000000..fb546af4603
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/group_test_documentation.html
@@ -0,0 +1,265 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : Grouper des tests</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur le groupement des tests</h1>
+        This page...
+        <ul>
+<li>
+            Plusieurs approches pour <a href="#group">grouper des tests</a> ensemble.
+        </li>
+<li>
+            Combiner des groupes des tests dans des
+            <a href="#plus-haut">groupes plus grands</a>.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="grouper"></a>Grouper des tests</h2>
+            <p>
+                Il existe beaucoup de moyens pour grouper des tests dans des suites de tests.
+                Le premier d'entre eux est tout simplement ajouter tous les scénarios de test
+				au fur et à mesure d'un unique fichier...
+<pre>
+<strong>&lt;?php
+require_once(dirname(__FILE__) . '/simpletest/autorun.php');
+require_once(dirname(__FILE__) . '/../classes/io.php');
+
+class FileTester extends UnitTestCase {
+    ...
+}
+
+class SocketTester extends UnitTestCase {
+    ...
+}
+?&gt;</strong>
+</pre>
+                Autant de scénarios que nécessaires peuvent être
+                mis dans cet unique fichier. Ils doivent contenir
+                tout le code nécessaire, entre autres la bibliothèque testée,
+                mais aucune des bibliothèques de SimpleTest.
+            </p>
+			<p>
+				Occasionnellement des sous-classes spéciales sont créés pour
+				ajouter des méthodes nécessaires à certains tests spécifiques
+				au sein de l'application.
+                Ces nouvelles classes de base sont ensuite utilisées
+				à la place de <span class="new_code">UnitTestCase</span>
+                ou de <span class="new_code">WebTestCase</span>.
+                Bien sûr vous ne souhaitez pas les lancer en tant que
+				scénario de tests : il suffit alors de les identifier
+				comme "abstraites"...
+<pre>
+<strong>abstract</strong> class MyFileTestCase extends UnitTestCase {
+    ...
+}
+
+class FileTester extends MyFileTestCase { ... }
+
+class SocketTester extends UnitTestCase { ... }
+</pre>
+                La classe <span class="new_code">FileTester</span> ne contient aucun test véritable,
+                il s'agit d'une classe de base pour d'autres scénarios de test.
+			</p>
+			<p>
+                Nous appelons ce fichier <em>file_test.php</em>.
+				Pour l'instant les scénarios de tests sont simplement groupés dans le même fichier.
+                Nous pouvons mettre en place des structures plus importantes
+				en incluant d'autres fichiers de tests.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('file_test.php');
+?&gt;
+</pre>
+				Ceci fontionnera, tout en créant une hiérarchie tout à fait plate.
+                A la place, nous créons un fichier de suite de tests.
+                Notre suite des tests de premier niveau devient...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class AllFileTests extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        <strong>$this-&gt;addFile('file_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+				Voici ce qui arrive : la class <span class="new_code">TestSuite</span>
+                effecturera le <span class="new_code">require_once()</span> pour nous.
+				Ensuite elle vérifie si de nouvelles classes de test
+				ont été créées par ce nouveau fichier et les inclut
+				automatiquement dans la suite de tests.
+				Cette méthode nous donne un maximum de contrôle
+				tout comme le ferait des ajouts manuels de fichiers de tests
+				au fur et à mesure où notre suite grandit.
+            </p>
+            <p>
+                Si c'est trop de boulot pour vos petits doigts et qu'en plus
+				vous avez envie de grouper vos suites de tests par répertoire
+				ou par un tag dans le nom des fichiers, alors il y a un moyen
+				encore plus automatique... 
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class AllFileTests extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;collect(dirname(__FILE__) . '/unit',
+                       new SimplePatternCollector('/_test.php/'));
+    }
+}
+?&gt;
+</pre>
+				Cette fonctionnalités va scanner un répertoire appelé "unit",
+				y détecter tous les fichiers finissant par "_test.php"
+				et les charger.
+                Vous n'avez pas besoin d'utiliser <span class="new_code">SimplePatternCollector</span> pour
+				filtrer en fonction d'un motif dans le nom de fichier,
+				mais c'est son usage le plus courant. 
+            </p>
+			<p>
+                Ce morceau de code est très courant.
+				Désormais la seule chose qu'il vous reste à faire, c'est de
+				déposer un fichier avec des scénarios de tests dans ce répertoire
+				et il sera lancé directement par le script de la suite de tests. 
+            </p>
+			<p>
+                Juste un bémol : vous ne pouvez pas contrôler l'ordre de lancement
+				des tests.
+				Si vous souhaitez voir des composants de bas niveau renvoyer leurs erreurs
+				dès le début de la suite de tests - en particulier pour se facilier le travail
+				de diagnostic - alors vous devriez plutôt passer par <span class="new_code">addFile()</span>
+				pour ces cas spécifiques.
+                Les scénarios de tests ne sont chargés qu'une fois, pas d'inquiétude donc
+				lors du scan de votre répertoire avec tous les tests.
+            </p>
+			<p>
+                Les tests chargés avec la méthode <span class="new_code">addFile</span> ont certaines propriétés
+				qui peuvent s'avérer intéressantes.
+				Elle vous assure que le constructeur est lancé avant la première méthode
+				de test et que le destructeur est lancé après la dernière méthode de test.
+				Cela vous permet de placer une initialisation (setUp et tearDown) globale
+				au sein de ce destructeur et desctructeur, comme dans n'importe
+				quelle classe. 
+            </p>
+        
+        <h2>
+<a class="target" name="plus-haut"></a>Groupements de plus haut niveau</h2>
+			<p>
+                La technique ci-dessus place tous les scénarios de test
+                dans un unique et grand groupe.
+                Sauf que pour des projets plus conséquents,
+                ce n'est probablement pas assez souple;
+                vous voudriez peut-être grouper les tests tout à fait différemment.
+            </p>
+<p>
+                Tout ce que nous avons décrit avec des scripts de tests 
+				s'applique pareillement avec des <span class="new_code">TestSuite</span>s...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+<strong>
+class BigTestSuite extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('file_tests.php');
+    }
+}</strong>
+?&gt;
+</pre>
+				Cette opération additionne nos scénarios de tests et une unique suite
+				sous la première.
+                Quand un test échoue, nous voyons le fil d'ariane avec l'enchainement.
+                Nous pouvons même mélanger groupes et tests librement en prenant
+				quand même soin d'éviter les inclusions en boucle.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class BigTestSuite extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('file_tests.php');
+        <strong>$this-&gt;addFile('some_other_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                Petite précision, en cas de double inclusion, seule la première instance
+				sera lancée. 
+            </p>
+		
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/index.html b/3rdparty/simpletest/docs/fr/index.html
new file mode 100644
index 00000000000..f7e022c36ec
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/index.html
@@ -0,0 +1,576 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+        Prise en main rapide de SimpleTest pour PHP -
+        Tests unitaire et objets fantaisie pour PHP
+    </title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Prise en main rapide de SimpleTest</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#unit">Utiliser le testeur rapidement</a>
+            avec un exemple.
+        </li>
+<li>
+            <a href="#group">Groupes de tests</a>
+            pour tester en un seul clic.
+        </li>
+<li>
+            <a href="#mock">Utiliser les objets fantaisie</a>
+            pour faciliter les tests et gagner en contrôle.
+        </li>
+<li>
+            <a href="#web">Tester des pages web</a>
+            au niveau de l'HTML.
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                Le présent article présuppose que vous soyez familier avec
+                le concept de tests unitaires ainsi que celui de développement
+                web avec le langage PHP. Il s'agit d'un guide pour le nouvel
+                et impatient utilisateur de
+                <a href="https://sourceforge.net/project/showfiles.php?group_id=76550">SimpleTest</a>.
+                Pour une documentation plus complète, particulièrement si
+                vous découvrez les tests unitaires, consultez la
+                <a href="http://www.lastcraft.com/unit_test_documentation.php">documentation
+                en cours</a>, et pour des exemples de scénarios de test,
+                consultez le
+                <a href="http://www.lastcraft.com/first_test_tutorial.php">tutorial
+                sur les tests unitaires</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="unit"></a>Utiliser le testeur rapidement</h2>
+            <p>
+                Parmi les outils de test pour logiciel, le testeur unitaire
+                est le plus proche du développeur. Dans un contexte de
+                développement agile, le code de test se place juste à côté
+                du code source étant donné que tous les deux sont écrits
+                simultanément. Dans ce contexte, SimpleTest aspire à être
+                une solution complète de test pour un développeur PHP et
+                s'appelle "Simple" parce qu'elle devrait être simple à
+                utiliser et à étendre. Ce nom n'était pas vraiment un bon
+                choix. Non seulement cette solution inclut toutes les
+                fonctions classiques qu'on est en droit d'attendre de la
+                part des portages de <a href="http://www.junit.org/">JUnit</a> et des <a href="http://sourceforge.net/projects/phpunit/">PHPUnit</a>,
+                mais elle inclut aussi les <a href="http://www.mockobjects.com/">objets fantaisie ou
+                "mock objects"</a>.
+            </p>
+            <p>
+                Ce qui rend cet outil immédiatement utile pour un développeur PHP,
+                c'est son navigateur web interne.
+                Il permet des tests qui parcourent des sites web, remplissent
+                des formulaires et testent le contenu des pages.
+                Etre capable d'écrire ces tests en PHP veut dire qu'il devient
+                facile d'écrire des tests de recette (ou d'intégration).
+                Un exemple serait de confirmer qu'un utilisateur a bien été ajouté
+                dans une base de données après s'être enregistré sur une site web.
+            </p>
+            <p>
+                La démonstration la plus rapide : l'exemple
+            </p>
+            <p>
+                Supposons que nous sommes en train de tester une simple
+                classe de log dans un fichier : elle s'appelle
+                <span class="new_code">Log</span> dans <em>classes/Log.php</em>. Commençons
+                par créer un script de test, appelé
+                <em>tests/log_test.php</em>. Son contenu est le suivant...
+<pre>
+&lt;?php
+<strong>require_once('simpletest/autorun.php');</strong>
+require_once('../classes/log.php');
+
+class TestOfLogging extends <strong>UnitTestCase</strong> {
+}
+?&gt;
+</pre>
+                Ici le répertoire <em>simpletest</em> est soit dans le
+                dossier courant, soit dans les dossiers pour fichiers
+                inclus. Vous auriez à éditer ces arborescences suivant
+                l'endroit où vous avez installé SimpleTest.
+                Le fichier "autorun.php" fait plus que juste inclure
+                les éléments de SimpleTest : il lance aussi les tests pour nous.  
+            </p>
+            <p>
+                <span class="new_code">TestOfLogging</span> est notre premier scénario de test
+                et il est pour l'instant vide.
+                Chaque scénario de test est une classe qui étend une des classes
+                de base de SimpleTest. Nous pouvons avoir autant de classes de ce type
+                que nous voulons.
+            </p>
+            <p>
+                Avec ces trois lignes d'échafaudage
+                l'inclusion de notre classe <span class="new_code">Log</span>, nous avons une suite
+                de tests. Mais pas encore de test !
+            </p>
+            <p>
+                Pour notre premier test, supposons que la classe <span class="new_code">Log</span>
+                prenne le nom du fichier à écrire au sein du constructeur,
+                et que nous avons un répertoire temporaire dans lequel placer
+                ce fichier.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+
+class TestOfLogging extends UnitTestCase {
+    function <strong>testLogCreatesNewFileOnFirstMessage()</strong> {
+        @unlink('/temp/test.log');
+        $log = new Log('/temp/test.log');
+        <strong>$this-&gt;assertFalse(file_exists('/temp/test.log'));</strong>
+        $log-&gt;message('Should write this to a file');
+        <strong>$this-&gt;assertTrue(file_exists('/temp/test.log'));</strong>
+    }
+}
+?&gt;
+</pre>
+                Au lancement du scénario de test, toutes les méthodes qui
+                commencent avec la chaîne <span class="new_code">test</span> sont
+                identifiées puis exécutées.
+                Si la méthode commence par <span class="new_code">test</span>, c'est un test.
+                Remarquez bien le nom très long de notre exemple :
+                <span class="new_code">testLogCreatesNewFileOnFirstMessage()</span>.
+                C'est bel et bien délibéré : ce style est considéré désirable
+                et il rend la sortie du test plus lisible.
+            </p>
+            <p>
+                D'ordinaire nous avons bien plusieurs méthodes de tests.
+                Mais ce sera pour plus tard.
+            </p>
+            <p>
+                Les assertions dans les
+                méthodes de test envoient des messages vers le framework de
+                test qui affiche immédiatement le résultat. Cette réponse
+                immédiate est importante, non seulement lors d'un crash
+                causé par le code, mais aussi de manière à rapprocher
+                l'affichage de l'erreur au plus près du scénario de test
+                concerné via un appel à <span class="new_code">print</span>code&gt;.
+            </p>
+            <p>
+                Pour voir ces résultats lançons effectivement les tests.
+                Aucun autre code n'est nécessaire, il suffit d'ouvrir
+                la page dans un navigateur.
+            </p>
+            <p>
+                En cas échec, l'affichage ressemble à...
+                <div class="demo">
+                    <h1>TestOfLogging</h1>
+                    <span class="fail">Fail</span>: testcreatingnewfile-&gt;True assertion failed.<br>
+                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
+                    <strong>1</strong> passes and <strong>1</strong> fails.</div>
+                </div>
+                ...et si ça passe, on obtient...
+                <div class="demo">
+                    <h1>TestOfLogging</h1>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>2</strong> passes and <strong>0</strong> fails.</div>
+                </div>
+                Et si vous obtenez ça...
+                <div class="demo">
+                    <b>Fatal error</b>:  Failed opening required '../classes/log.php' (include_path='') in <b>/home/marcus/projects/lastcraft/tutorial_tests/Log/tests/log_test.php</b> on line <b>7</b>
+                </div>
+                c'est qu'il vous manque le fichier <em>classes/Log.php</em>
+                qui pourrait ressembler à : 
+<pre>
+&lt;?php<strong>
+class Log {
+    function Log($file_path) {
+    }
+
+    function message() {
+    }
+}</strong>
+?&gt;
+</pre>
+                C'est largement plus sympathique d'écrire le code après le test.
+                Plus que sympatique même - cette technique s'appelle
+                "Développement Piloté par les Tests" ou 
+                "Test Driven Development" en anglais.
+            </p>
+            <p>
+                Pour plus de renseignements sur le testeur, voyez la
+                <a href="unit_test_documentation.html">documentation pour les tests de régression</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="group"></a>Construire des groupes de tests</h2>
+            <p>
+                Il est peu probable que dans une véritable application on
+                ait uniquement besoin de passer un seul scénario de test.
+                Cela veut dire que nous avons besoin de grouper les
+                scénarios dans un script de test qui peut, si nécessaire,
+                lancer tous les tests de l'application.
+            </p>
+            <p>
+                Notre première étape est de créer un nouveau fichier appelé
+                <em>tests/all_tests.php</em> et d'y inclure le code suivant...
+<pre>
+&lt;?php
+<strong>require_once('simpletest/autorun.php');</strong>
+
+class AllTests extends <strong>TestSuite</strong> {
+    function AllTests() {
+        $this-&gt;TestSuite(<strong>'All tests'</strong>);
+        <strong>$this-&gt;addFile('log_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                L'inclusion de "autorun" permettra à notre future suite
+                de tests d'être lancée juste en invoquant ce script.
+            </p>
+            <p>
+                La sous-classe <span class="new_code">TestSuite</span> doit chaîner
+                son constructeur. Cette limitation sera supprimée dans
+                les versions à venir.   
+            </p>
+            <p>
+                The method <span class="new_code">TestSuite::addFile()</span>
+                will include the test case file and read any new classes
+                that are descended from <span class="new_code">SimpleTestCase</span>.
+
+                Cette méthode <span class="new_code">TestSuite::addTestFile()</span> va
+                inclure le fichier de scénarios de test et lire parmi
+                toutes les nouvelles classes créées celles qui sont issues
+                de <span class="new_code">SimpleTestCase</span>.
+                <span class="new_code">UnitTestCase</span> est juste un exemple de classe dérivée
+                depuis <span class="new_code">SimpleTestCase</span> et vous pouvez créer les vôtres.
+                <span class="new_code">TestSuite::addFile()</span> peut aussi inclure d'autres suites.
+            </p>
+            <p>
+                La classe ne sera pas encore instanciée.
+                Quand la suite de tests est lancée, elle construira chaque instance
+                une fois le test atteint, et le détuira juste ensuite.
+                Cela veut dire que le constructeur n'est lancé qu'une fois avant
+                chaque initialisation de ce scénario de test et que le destructeur
+                est lui aussi lancé avant que le test suivant ne commence.
+            </p>
+            <p>
+                Il est commun de grouper des scénarios de test dans des super-classes
+                qui ne sont pas sensées être lancées, mais qui deviennent une classe de base
+                pour d'autres tests.
+                Pour que "autorun" fonctionne proprement les fichiers
+                des scénarios de test ne devraient pas lancer aveuglement
+                d'autres extensions de scénarios de test qui ne lanceraient pas
+                effectivement des tests.
+                Cela pourrait aboutir à un mauvais comptages des scénarios de test
+                pendant la procédure.
+                Pas vraiement un problème majeure, mais pour éviter cet inconvénient
+                il suffit de marquer vos classes de base comme <span class="new_code">abstract</span>.
+                SimpleTest ne lance pas les classes abstraites. Et si vous utilisez encore
+                PHP4 alors une directive <span class="new_code">SimpleTestOptions::ignore()</span>
+                dans votre fichier de scénario de test aura le même effet.
+            </p>
+            <p>
+                Par ailleurs, le fichier avec le scénario de test ne devrait pas
+                avoir été inclus ailleurs. Sinon aucun scénario de test
+                ne sera inclus à ce groupe.
+                Ceci pourrait se transformer en un problème plus grave :
+                si des fichiers ont déjà été inclus par PHP alors la méthode
+                <span class="new_code">TestSuite::addFile()</span> ne les détectera pas.
+            </p>
+            <p>
+                Pour afficher les résultats, il est seulement nécessaire
+                d'invoquer <em>tests/all_tests.php</em> à partir du serveur
+                web.
+            </p>
+            <p>
+                Pour plus de renseignements des groupes de tests, voyez le
+                <a href="group_test_documentation.html">documentation sur le groupement des tests</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="mock"></a>Utiliser les objets fantaisie</h2>
+            <p>
+                Avançons un peu plus dans le futur.
+            </p>
+            <p>
+                Supposons que notre class logging soit testée et terminée.
+                Supposons aussi que nous testons une autre classe qui ait
+                besoin d'écrire des messages de log, disons
+                <span class="new_code">SessionPool</span>. Nous voulons tester une méthode
+                qui ressemblera probablement à quelque chose comme...
+<pre><strong>
+class SessionPool {
+    ...
+    function logIn($username) {
+        ...
+        $this-&gt;_log-&gt;message('User $username logged in.');
+        ...
+    }
+    ...
+}
+</strong>
+</pre>
+                Avec le concept de "réutilisation de code" comme fil
+                conducteur, nous utilisons notre class <span class="new_code">Log</span>. Un
+                scénario de test classique ressemblera peut-être à...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+<strong>require_once('../classes/session_pool.php');</strong>
+
+class <strong>TestOfSessionLogging</strong> extends UnitTestCase {
+    
+    function setUp() {
+        <strong>@unlink('/temp/test.log');</strong>
+    }
+    
+    function tearDown() {
+        <strong>@unlink('/temp/test.log');</strong>
+    }
+    
+    function testLoggingInIsLogged() {
+        <strong>$log = new Log('/temp/test.log');
+        $session_pool = &amp;new SessionPool($log);
+        $session_pool-&gt;logIn('fred');</strong>
+        $messages = file('/temp/test.log');
+        $this-&gt;assertEqual($messages[0], "User fred logged in.<strong>\n</strong>");
+    }
+}
+?&gt;
+</pre>
+                Nous expliquerons les méthodes <span class="new_code">setUp()</span>
+                et <span class="new_code">tearDown()</span> plus tard.
+            </p>
+            <p>
+                Le design de ce scénario de test n'est pas complètement
+                mauvais, mais on peut l'améliorer. Nous passons du temps à
+                tripoter les fichiers de log qui ne font pas partie de
+                notre test.
+                Pire, nous avons créé des liens de proximité
+                entre la classe <span class="new_code">Log</span> et ce test. Que se
+                passerait-il si nous n'utilisions plus de fichiers, mais la
+                bibliothèque <em>syslog</em> à la place ?
+                
+                Cela veut dire que notre test <span class="new_code">TestOfSessionLogging</span>
+                enverra un échec alors même qu'il ne teste pas Logging.
+            </p>
+            <p>
+                Il est aussi fragile sur des petites retouches. Avez-vous
+                remarqué le retour chariot supplémentaire à la fin du
+                message ? A-t-il été ajouté par le loggueur ? Et si il
+                ajoutait aussi un timestamp ou d'autres données ?
+            </p>
+            <p>
+                L'unique partie à tester réellement est l'envoi d'un
+                message précis au loggueur.
+                Nous pouvons réduire le couplage en
+                créant une fausse classe de logging : elle ne fait
+                qu'enregistrer le message pour le test, mais ne produit
+                aucun résultat. Sauf qu'elle doit ressembler exactement à
+                l'original.
+            </p>
+            <p>
+                Si l'objet fantaisie n'écrit pas dans un fichier alors nous
+                nous épargnons la suppression du fichier avant et après le
+                test. Nous pourrions même nous épargner quelques lignes de
+                code supplémentaires si l'objet fantaisie pouvait exécuter
+                l'assertion.
+            <p>
+            </p>
+                Trop beau pour être vrai ? Pas vraiement on peut créer un tel
+                objet très facilement...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+require_once('../classes/session_pool.php');
+
+<strong>Mock::generate('Log');</strong>
+
+class TestOfSessionLogging extends UnitTestCase {
+    
+    function testLoggingInIsLogged() {<strong>
+        $log = &amp;new MockLog();
+        $log-&gt;expectOnce('message', array('User fred logged in.'));</strong>
+        $session_pool = &amp;new SessionPool(<strong>$log</strong>);
+        $session_pool-&gt;logIn('fred');
+    }
+}
+?&gt;
+</pre>
+                L'appel <span class="new_code">Mock::generate()</span> a généré
+                une nouvelle classe appelé <span class="new_code">MockLog</span>.
+                Cela ressemble à un clone identique, sauf que nous pouvons
+                y adjoindre du code de test.
+                C'est ce que fait <span class="new_code">expectOnce()</span>.
+                Cela dit que si <span class="new_code">message()</span> m'est appelé,
+                il a intérêt à l'être avec le paramètre
+                "User fred logged in.".
+            </p>
+            <p>
+                L'appel <span class="new_code">tally()</span> est nécessaire pour annoncer à
+                l'objet fantaisie qu'il n'y aura plus d'appels ultérieurs.
+                Sans ça l'objet fantaisie pourrait attendre pendant une
+                éternité l'appel de la méthode sans jamais prévenir le
+                scénario de test. Les autres tests sont déclenchés
+                automatiquement quand l'appel à <span class="new_code">message()</span> est
+                invoqué sur l'objet <span class="new_code">MockLog</span> par le code 
+                <span class="new_code">SessionPool::logIn()</span>.
+                L'appel <span class="new_code">mock</span> va déclencher une comparaison des
+                paramètres et ensuite envoyer le message "pass" ou "fail"
+                au test pour l'affichage. Des jokers peuvent être inclus
+                pour ne pas avoir à tester tous les paramètres d'un appel
+                alors que vous ne souhaitez qu'en tester un.
+            </p>
+            <p>
+                Les objets fantaisie dans la suite SimpleTest peuvent avoir
+                un ensemble de valeurs de sortie arbitraires, des séquences
+                de sorties, des valeurs de sortie sélectionnées à partir
+                des arguments d'entrée, des séquences de paramètres
+                attendus et des limites sur le nombre de fois qu'une
+                méthode peut être invoquée.
+            </p>
+            <p>
+                Pour que ce test fonctionne la librairie avec les objets
+                fantaisie doit être incluse dans la suite de tests, par
+                exemple dans <em>all_tests.php</em>.
+            </p>
+            <p>
+                Pour plus de renseignements sur les objets fantaisie, voyez le
+                <a href="mock_objects_documentation.html">documentation sur les objets fantaisie</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="web"></a>Tester une page web</h2>
+            <p>
+                Une des exigences des sites web, c'est qu'ils produisent
+                des pages web. Si vous construisez un projet de A à Z et
+                que vous voulez intégrer des tests au fur et à mesure alors
+                vous voulez un outil qui puisse effectuer une navigation
+                automatique et en examiner le résultat. C'est le boulot
+                d'un testeur web.
+            </p>
+            <p>
+                Effectuer un test web via SimpleTest reste assez primitif :
+                il n'y a pas de javascript par exemple.
+                La plupart des autres opérations d'un navigateur sont simulées.
+            </p>
+            <p>
+                Pour vous donner une idée, voici un exemple assez trivial :
+                aller chercher une page web,
+                à partir de là naviguer vers la page "about"
+                et finalement tester un contenu déterminé par le client.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+<strong>require_once('simpletest/web_tester.php');</strong>
+
+class TestOfAbout extends <strong>WebTestCase</strong> {
+    function testOurAboutPageGivesFreeReignToOurEgo() {
+        <strong>$this-&gt;get('http://test-server/index.php');
+        $this-&gt;click('About');
+        $this-&gt;assertTitle('About why we are so great');
+        $this-&gt;assertText('We are really great');</strong>
+    }
+}
+?&gt;
+</pre>
+                Avec ce code comme test de recette, vous pouvez vous
+                assurer que le contenu corresponde toujours aux
+                spécifications à la fois des développeurs et des autres
+                parties prenantes au projet.
+            </p>
+            <p>
+                Vous pouvez aussi naviguer à travers des formulaires...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('simpletest/web_tester.php');
+
+class TestOfRankings extends WebTestCase {
+    function testWeAreTopOfGoogle() {
+        $this-&gt;get('http://google.com/');
+        $this-&gt;setField('q', 'simpletest');
+        $this-&gt;click("I'm Feeling Lucky");
+        $this-&gt;assertTitle('SimpleTest - Unit Testing for PHP');
+    }
+}
+?&gt;
+</pre>
+                ...même si cela pourrait constituer une violation
+                des documents juridiques de Google(tm).
+            </p>
+            <p>
+                Pour plus de renseignements sur comment tester une page web, voyez la
+                <a href="web_tester_documentation.html">documentation sur tester des scripts web</a>.
+            </p>
+            <p>
+                <a href="http://sourceforge.net/projects/simpletest/"><img src="http://sourceforge.net/sflogo.php?group_id=76550&amp;type=5" width="210" height="62" border="0" alt="SourceForge.net Logo"></a>
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            <a href="https://sourceforge.net/project/showfiles.php?group_id=76550&amp;release_id=153280">Télécharger PHP SimpleTest</a>
+            depuis <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            L'<a href="http://simpletest.org/api/">API de SimpleTest pour développeur</a>
+            donne tous les détails sur les classes et assertions existantes.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/mock_objects_documentation.html b/3rdparty/simpletest/docs/fr/mock_objects_documentation.html
new file mode 100644
index 00000000000..97e2c86ee73
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/mock_objects_documentation.html
@@ -0,0 +1,933 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : les objets fantaise</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur les objets fantaisie</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#what">Que sont les objets fantaisie ?</a>
+        </li>
+<li>
+            <a href="#creation">Créer des objets fantaisie</a>.
+        </li>
+<li>
+            <a href="#expectations">Les objets fantaisie en tant que critiques</a> avec les attentes.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="what"></a>Que sont les objets fantaisie ?</h2>
+            <p>
+                Les objets fantaisie - ou "mock objects" en anglais -
+                ont deux rôles pendant un scénario de test : acteur et critique.
+            </p>
+            <p>
+                Le comportement d'acteur est celui de simuler
+                des objets difficiles à initialiser ou trop consommateurs
+                en temps pendant un test.
+                Le cas classique est celui de la connexion à une base de données.
+                Mettre sur pied une base de données de test au lancement
+                de chaque test ralentirait considérablement les tests
+                et en plus exigerait l'installation d'un moteur
+                de base de données ainsi que des données sur la machine de test.
+                Si nous pouvons simuler la connexion
+                et renvoyer des données à notre guise
+                alors non seulement nous gagnons en pragmatisme
+                sur les tests mais en sus nous pouvons nourrir
+                notre base avec des données falsifiées
+                et voir comment il répond. Nous pouvons
+                simuler une base de données en suspens ou
+                d'autres cas extrêmes sans avoir à créer
+                une véritable panne de base de données.
+                En d'autres termes nous pouvons gagner
+                en contrôle sur l'environnement de test.
+            </p>
+            <p>
+                Si les objets fantaisie ne se comportaient que comme
+                des acteurs alors on les connaîtrait sous le nom de
+                <a href="server_stubs_documentation.html">bouchons serveur</a>.
+                Il s'agissait originairement d'un patron de conception
+                identifié par Robert Binder (<a href="">Testing
+                object-oriented systems</a>: models, patterns, and tools,
+                Addison-Wesley) en 1999.
+            </p>
+            <p>
+                Un bouchon serveur est une simulation d'un objet ou d'un composant.
+                Il doit remplacer exactement un composant dans un système
+                en vue d'effectuer des tests ou un prototypage,
+                tout en restant ultra-léger.
+                Il permet aux tests de s'exécuter plus rapidement, ou 
+                si la classe simulée n'a pas encore été écrite,
+                de se lancer tout court.
+            </p>
+            <p>
+                Cependant non seulement les objets fantaisie jouent
+                un rôle (en fournissant à la demande les valeurs requises)
+                mais en plus ils sont aussi sensibles aux messages qui
+                leur sont envoyés (par le biais d'attentes).
+                En posant les paramètres attendus d'une méthode
+                ils agissent comme des gardiens :
+                un appel sur eux doit être réalisé correctement.
+                Si les attentes ne sont pas atteintes ils nous épargnent
+                l'effort de l'écriture d'une assertion de test avec
+                échec en réalisant cette tâche à notre place.
+            </p>
+            <p>
+                Dans le cas d'une connexion à une base de données
+                imaginaire ils peuvent tester si la requête, disons SQL,
+                a bien été formé par l'objet qui utilise cette connexion.
+                Mettez-les sur pied avec des attentes assez précises
+                et vous verrez que vous n'aurez presque plus d'assertion à écrire manuellement.
+            </p>
+        
+        <h2>
+<a class="target" name="creation"></a>Créer des objets fantaisie</h2>
+            <p>
+                Tout ce dont nous avons besoin est une classe existante ou une interface,
+                par exemple une connexion à la base de données qui ressemblerait à...
+<pre>
+<strong>class DatabaseConnection {
+    function DatabaseConnection() { }
+    function query($sql) { }
+    function selectQuery($sql) { }
+}</strong>
+</pre>
+                Pour en créer sa version fantaisie nous devons juste
+				lancer le générateur...
+<pre>
+require_once('simpletest/autorun.php');
+require_once('database_connection.php');
+
+<strong>Mock::generate('DatabaseConnection');</strong>
+</pre>
+                Ce code génère une classe clone appelée <span class="new_code">MockDatabaseConnection</span>.
+                Cette nouvelle classe lui ressemble en tout point,
+                sauf qu'elle ne fait rien du tout.
+            </p>
+            <p>
+            	Cette nouvelle classe est génératlement
+            	une sous-classe de <span class="new_code">DatabaseConnection</span>.
+            	Malheureusement, il n'y as aucun moyen de créer une version fantaisie
+            	d'une classe avec une méthode <span class="new_code">final</span> sans avoir
+            	une version fonctionnelle de cette méthode.
+            	Ce n'est pas pas très satisfaisant.
+            	Si la cible est une interface ou si les méthodes <span class="new_code">final</span>
+            	existent dans la classe cible, alors une toute nouvelle classe
+            	est créée, elle implémente juste les même interfaces.
+            	Si vous essayer de faire passer cette classe à travers un indice de type
+            	qui spécifie le véritable nom de l'ancienne classe, alors il échouera.
+            	Du code qui forcerait un indice de type tout en utilisant
+            	des méthodes <span class="new_code">final</span> ne pourrait probablement pas être
+            	testé efficacement avec des objets fantaisie.
+            </p>
+            <p>
+                Si vous voulez voir le code généré, il suffit de faire un <span class="new_code">print</span>
+                de la sortie de <span class="new_code">Mock::generate()</span>.
+                VOici le code généré pour la classe <span class="new_code">DatabaseConnection</span>
+                à la place de son interface...
+<pre>
+class MockDatabaseConnection extends DatabaseConnection {
+    public $mock;
+    protected $mocked_methods = array('databaseconnection', 'query', 'selectquery');
+
+    function MockDatabaseConnection() {
+        $this-&gt;mock = new SimpleMock();
+        $this-&gt;mock-&gt;disableExpectationNameChecks();
+    }
+    ...
+    function DatabaseConnection() {
+        $args = func_get_args();
+        $result = &amp;$this-&gt;mock-&gt;invoke("DatabaseConnection", $args);
+        return $result;
+    }
+    function query($sql) {
+        $args = func_get_args();
+        $result = &amp;$this-&gt;mock-&gt;invoke("query", $args);
+        return $result;
+    }
+    function selectQuery($sql) {
+        $args = func_get_args();
+        $result = &amp;$this-&gt;mock-&gt;invoke("selectQuery", $args);
+        return $result;
+    }
+}
+</pre>
+                Votre sortie dépendra quelque peu de votre version précise de SimpleTest.
+            </p>
+            <p>
+                En plus des méthodes d'origine de la classe, vous en verrez d'autres
+                pour faciliter les tests.
+                Nous y reviendrons.
+            </p>
+            <p>
+                Nous pouvons désormais créer des instances de
+                cette nouvelle classe à l'intérieur même de notre scénario de test...
+<pre>
+require_once('simpletest/autorun.php');
+require_once('database_connection.php');
+
+Mock::generate('DatabaseConnection');
+
+class MyTestCase extends UnitTestCase {
+
+    function testSomething() {
+        <strong>$connection = new MockDatabaseConnection();</strong>
+    }
+}
+</pre>
+                La version fantaisie contient toutles méthodes de l'originale.
+                En outre, tous les indices de type seront préservés.
+                Dison que nos méthodes de requête attend un objet <span class="new_code">Query</span>...
+<pre>
+<strong>class DatabaseConnection {
+    function DatabaseConnection() { }
+    function query(Query $query) { }
+    function selectQuery(Query $query) { }
+}</strong>
+</pre>
+                Si nous lui passons le mauvais type d'objet
+                ou même pire un non-objet...
+<pre>
+class MyTestCase extends UnitTestCase {
+
+    function testSomething() {
+        $connection = new MockDatabaseConnection();
+        $connection-&gt;query('insert into accounts () values ()');
+    }
+}
+</pre>
+                ...alors le code renverra une violation de typage,
+                exactement comme on aurait pû s'y attendre
+                avec la classe d'origine.
+            </p>
+            <p>
+                Si la version fantaisie implémente bien toutes les méthodes
+                de l'originale, elle renvoit aussi systématiquement <span class="new_code">null</span>.
+                Et comme toutes les méthodes qui renvoient toujours <span class="new_code">null</span>
+                ne sont pas très utiles, nous avons besoin de leur faire dire
+                autre chose...
+            </p>
+        
+        <h2>
+<a class="target" name="bouchon"></a>Objets fantaisie en action</h2>
+            <p>
+                Changer le <span class="new_code">null</span> renvoyé par la méthode fantaisie
+                en autre chose est assez facile...
+<pre>
+<strong>$connection-&gt;returns('query', 37)</strong>
+</pre>
+                Désormais à chaque appel de <span class="new_code">$connection-&gt;query()</span>
+                nous obtenons un résultat de 37.
+                Il n'y a rien de particulier à cette valeur de 37.
+                Cette valeur de retour peut être aussi compliqué que nécessaire.
+            </p>
+            <p>
+                Ici les paramètres ne sont pas significatifs,
+                nous aurons systématiquement la même valeur en retour
+                une fois initialisés de la sorte.
+                Cela pourrait ne pas ressembler à une copie convaincante
+                de notre connexion à la base de données, mais pour
+                la demi-douzaine de lignes de code de notre méthode de test
+                c'est généralement largement assez.
+            </p>
+            <p>
+                Sauf que les choses ne sont pas toujours si simples.
+                Les itérateurs sont un problème récurrent, si par exemple
+                renvoyer systématiquement la même valeur entraine
+                une boucle infinie dans l'objet testé.
+                Pour ces cas-là, nous avons besoin d'une séquence de valeurs.
+				Supposons que nous avons un itérateur simple qui ressemble à...
+<pre>
+class Iterator {
+    function Iterator() { }
+    function next() { }
+}
+</pre>
+                Il s'agit là de l'itérateur le plus basique que nous puissions imaginer.
+                Supponsons que cet itérateur ne renvoit que du texte
+                jusqu'à ce qu'il atteigne la fin et qu'il renvoie alors un false,
+                nous pouvons le simuler avec...
+<pre>
+Mock::generate('Iterator');
+
+class IteratorTest extends UnitTestCase() {
+
+    function testASequence() {<strong>
+        $iterator = new MockIterator();
+        $iterator-&gt;returns('next', false);
+        $iterator-&gt;returnsAt(0, 'next', 'First string');
+        $iterator-&gt;returnsAt(1, 'next', 'Second string');</strong>
+        ...
+    }
+}
+</pre>
+                Quand <span class="new_code">next()</span> est appelé par le <span class="new_code">MockIterator</span>
+                il commencera par renvoyer "First string",
+                au deuxième passage "Second string" sera renvoyé
+                et sur n'importe quel autre appel <span class="new_code">false</span> sera renvoyé
+                à son tour.
+                Les valeurs renvoyées les unes après les autres auront la priorité
+                sur la valeur constante.
+                Cette dernière est la valeur par défaut en quelque sorte.
+            </p>
+            <p>
+                Une autre situation délicate serait une opération
+                <span class="new_code">get()</span> surchargée.
+                Un exemple serait un conteneur d'information avec des pairs clef/valeur.
+                Nous partons cette fois d'une classe de configuration telle...
+<pre>
+class Configuration {
+    function Configuration() { ... }
+    function get($key) { ... }
+}
+</pre>
+                C'est une situation courante pour utiliser des objets fantaisie,
+                étant donné que la véritable configuration sera différente
+                d'une machine à l'autre et parfois même d'un test à l'autre.
+                Cependant un problème apparaît quand toutes les données passent
+                par la méthode <span class="new_code">get()</span> et que nous souhaitons
+                quand même des résultats différents pour des clefs différentes.
+                Par chance les objets fantaisie ont un système de filtre...
+<pre>
+<strong>$config = &amp;new MockConfiguration();
+$config-&gt;returns('get', 'primary', array('db_host'));
+$config-&gt;returns('get', 'admin', array('db_user'));
+$config-&gt;returns('get', 'secret', array('db_password'));</strong>
+</pre>
+                Le dernier paramètre est une liste d'arguements
+                pour vérifier une correspondance.
+                Dans ce cas, nous essayons de faire correspondre un argument
+                qui se trouve être la clef de recherche.
+                Désormais quand l'objet fantaisie voit
+                sa méthode <span class="new_code">get()</span> invoquée...
+<pre>
+$config-&gt;get('db_user')
+</pre>
+                ...il renverra "admin".
+                Il trouve cette valeur en essayant de faire correspondre
+                l'argument reçu à ceux de ses propres listes : dès qu'une
+                correspondance complète est trouvé, il s'arrête.
+            </p>
+            <p>
+                Vous pouvez préciser un argument par défaut via...
+<pre><strong>
+$config-&gt;returns('get', false, array('*'));</strong>
+</pre>
+                Ce n'est pas la même chose que de définir la valeur renvoyée
+                sans aucun arguement...
+<pre><strong>
+$config-&gt;returns('get', false);</strong>
+</pre>
+                Dans le premier cas, il acceptera n'importe quel argument,
+                mais il en faut au moins un.
+                Dans le deuxième cas, n'importe quel nombre d'arguments
+                fera l'affaire and il agit comme un attrape-tout après
+                toutes les autres vérifications.
+                Notez que si - dans le premier cas - nous ajoutons
+                d'autres options avec paramètre unique après le joker,
+                alors elle seront ignorés puisque le joker fera
+                la première correspondance.
+                Avec des listes complexes de paramètres, l'ordre devient
+                important au risque de voir la correspondance souhaitée
+                masqué par un joker apparu plus tôt.
+                Déclarez les plus spécifiques d'abord si vous n'êtes pas sûr.
+            </p>
+            <p>
+                Il y a des moments où vous souhaitez qu'une référence
+                bien spécifique soit servie par l'objet fantaisie plutôt
+                qu'une copie.
+                C'est plutôt rare pour dire le moins, mais vous pourriez 
+                être en train de simuler un conteneur qui détiendrait
+                des primitives, tels des chaînes de caractères.
+                Par exemple.
+<pre>
+class Pad {
+    function Pad() { }
+    function &amp;note($index) { }
+}
+</pre>
+                Dans ce cas, vous pouvez définir une référence dans la liste
+                des valeurs retournées par l'objet fantaisie...
+<pre>
+function testTaskReads() {
+    $note = 'Buy books';
+    $pad = new MockPad();
+    $vector-&gt;<strong>returnsByReference(</strong>'note', $note, array(3)<strong>)</strong>;
+    $task = new Task($pad);
+    ...
+}
+</pre>
+                Avec cet assemblage vous savez qu'à chaque fois
+                que <span class="new_code">$pad-&gt;note(3)</span> est appelé
+                il renverra toujours la même <span class="new_code">$note</span>,
+                même si celle-ci est modifiée.
+            </p>
+            <p>
+                Ces trois facteurs, timing, paramètres et références,
+                peuvent être combinés orthogonalement.
+                Par exemple...
+<pre>
+$buy_books = 'Buy books';
+$write_code = 'Write code';
+$pad = new MockPad();
+$vector-&gt;<strong>returnsByReferenceAt(0, 'note', $buy_books, array('*', 3));</strong>
+$vector-&gt;<strong>returnsByReferenceAt(1, 'note', $write_code, array('*', 3));</strong>
+</pre>
+                Cela renverra une référence à <span class="new_code">$buy_books</span> et
+                ensuite à <span class="new_code">$write_code</span>, mais seuleent si deux paramètres
+                sont utilisés, le deuxième devant être l'entier 3.
+                Cela devrait couvrir la plupart des situations.
+            </p>
+            <p>
+                Un dernier cas délicat reste : celui d'un objet créant
+                un autre objet, plus connu sous le patron de conception "fabrique"
+                (ou "factory").
+                Supponsons qu'à la réussite d'une requête à
+                notre base de données imaginaire, un jeu d'enregistrements
+                est renvoyé sous la forme d'un itérateur, où chaque appel
+                au <span class="new_code">next()</span> sur notre itérateur donne une ligne
+                avant de s'arrêtre avec un false.
+                Cela semble à un cauchemar à simuler, alors qu'en fait un objet
+                fantaisie peut être créé avec les mécansimes ci-dessus...
+<pre>
+Mock::generate('DatabaseConnection');
+Mock::generate('ResultIterator');
+
+class DatabaseTest extends UnitTestCase {
+
+    function testUserFinderReadsResultsFromDatabase() {<strong>
+        $result = new MockResultIterator();
+        $result-&gt;returns('next', false);
+        $result-&gt;returnsAt(0, 'next', array(1, 'tom'));
+        $result-&gt;returnsAt(1, 'next', array(3, 'dick'));
+        $result-&gt;returnsAt(2, 'next', array(6, 'harry'));
+
+        $connection = new MockDatabaseConnection();
+        $connection-&gt;returns('selectQuery', $result);</strong>
+
+        $finder = new UserFinder(<strong>$connection</strong>);
+        $this-&gt;assertIdentical(
+                $finder-&gt;findNames(),
+                array('tom', 'dick', 'harry'));
+    }
+}
+</pre>
+                Désormais ce n'est que si notre <span class="new_code">$connection</span>
+                est appelée par la méthode <span class="new_code">query()</span>
+                que sera retourné le <span class="new_code">$result</span>,
+                lui-même s'arrêtant au troisième appel
+                à <span class="new_code">next()</span>.
+                Ce devrait être suffisant comme information
+                pour que notre classe <span class="new_code">UserFinder</span>,
+                la classe effectivement testée ici,
+                fasse son boulot.
+                Un test très précis et toujours pas
+                de base de données en vue.
+            </p>
+            <p>
+                Nous pourrsion affiner ce test encore plus
+                en insistant pour que la bonne requête
+                soit envoyée...
+<pre>
+$connection-&gt;returns('selectQuery', $result, array(<strong>'select name, id from people'</strong>));
+</pre>
+                Là, c'est une mauvaise idée.
+            </p>
+            <p>
+                Niveau objet, nous avons un <span class="new_code">UserFinder</span>
+                qui parle à une base de données à travers une interface géante -
+                l'ensemble du SQL.
+                Imaginez si nous avions écrit un grand nombre de tests
+                qui dépendrait désormais de cette requête SQL précise.
+                Ces requêtes pourraient changer en masse pour tout un tas
+                de raisons non liés à ce test spécifique.
+                Par exemple, la règle pour les quotes pourrait changer,
+                un nom de table pourrait évoluer, une table de liaison pourrait
+                être ajouté, etc.
+                Cela entrainerait une ré-écriture de tous les tests à chaque fois
+                qu'un remaniement est fait, alors même que le comportement lui
+                n'a pas bougé.
+                Les tests sont censés aider au remaniement, pas le bloquer.
+                Pour ma part, je préfère avoir une suite de tests qui passent
+                quand je fais évoluer le nom des tables.
+            </p>
+            <p>
+                Et si vous voulez une règle, c'est toujours mieux de ne pas
+                créer un objet fantaisie sur une grosse interface.
+            </p>
+            <p>
+            	Par contrast, voici le test complet...
+<pre>
+class DatabaseTest extends UnitTestCase {<strong>
+    function setUp() { ... }
+    function tearDown() { ... }</strong>
+
+    function testUserFinderReadsResultsFromDatabase() {
+        $finder = new UserFinder(<strong>new DatabaseConnection()</strong>);
+        $finder-&gt;add('tom');
+        $finder-&gt;add('dick');
+        $finder-&gt;add('harry');
+        $this-&gt;assertIdentical(
+                $finder-&gt;findNames(),
+                array('tom', 'dick', 'harry'));
+    }
+}
+</pre>
+                Ce test est immunisé contre le changement de schéma.
+                Il échouera uniquement si vous changez la fonctionnalité,
+                ce qui correspond bien à ce qu'un test doit faire.
+            </p>
+            <p>
+            	Il faut juste faire attention à ces méthodes <span class="new_code">setUp()</span>
+            	et <span class="new_code">tearDown()</span> que nous avons survolé pour l'instant.
+            	Elles doivent vider les tables de la base de données
+            	et s'assurer que le schéma est bien défini.
+            	Cela peut se engendrer un peu de travail supplémentaire,
+            	mais d'ordinaire ce type de code existe déjà - à commencer pour
+            	le déploiement.
+            </p>
+            <p>
+                Il y a au moins un endroit où vous aurez besoin d'objets fantaisie :
+                c'est la simulation des erreurs.
+                Exemple, la base de données tombe pendant que <span class="new_code">UserFinder</span>
+                fait son travail. Le <span class="new_code">UserFinder</span> se comporte-t-il bien ?
+<pre>
+class DatabaseTest extends UnitTestCase {
+
+    function testUserFinder() {
+        $connection = new MockDatabaseConnection();<strong>
+        $connection-&gt;throwOn('selectQuery', new TimedOut('Ouch!'));</strong>
+        $alert = new MockAlerts();<strong>
+        $alert-&gt;expectOnce('notify', 'Database is busy - please retry');</strong>
+        $finder = new UserFinder($connection, $alert);
+        $this-&gt;assertIdentical($finder-&gt;findNames(), array());
+    }
+}
+</pre>
+                Nous avons transmis au <span class="new_code">UserFinder</span>
+                un objet <span class="new_code">$alert</span>.
+                Il va transmettre un certain nombre de belles notifications
+                à l'interface utilisatuer en cas d'erreur.
+                Nous préfèrerions éviter de saupoudrer notre code avec
+                des commandes <span class="new_code">print</span> codées en dur si nous pouvons
+                l'éviter.
+                Emballer les moyens de sortie veut dire que nous pouvons utiliser
+                ce code partout. Et cela rend notre code plus facile.
+            </p>
+            <p>
+                Pour faire passer ce test, le finder doit écrire un message sympathique
+                et compréhensible à l'<span class="new_code">$alert</span>, plutôt que de propager
+                l'exception. Jusque là, tout va bien.
+            </p>
+            <p>
+                Comment faire en sorte que la <span class="new_code">DatabaseConnection</span> fantaisie
+                soulève une exception ?
+                Nous la générons avec la méthode <span class="new_code">throwOn</span> sur l'objet fantaisie.
+            </p>
+            <p>
+                Enfin, que se passe-t-il si la méthode voulue pour la simulation
+                n'existe pas encore ?
+                Si vous définissez une valeur de retour sur une méthode absente,
+                alors SimpleTest vous répondra avec une erreur.
+                Et si vous utilisez <span class="new_code">__call()</span> pour simuler
+                des méthodes dynamiques ?
+            </p>
+            <p>
+                Les objets avec des interfaces dynamiques, avec <span class="new_code">__call</span>,
+                peuvent être problématiques dans l'implémentation courante
+                des objets fantaisie.
+                Vous pouvez en créer un autour de la méthode <span class="new_code">__call()</span>
+                mais c'est très laid.
+                Et pourquoi un test devrait connaître quelque chose avec un niveau
+                si bas dans l'implémentation. Il n'a besoin que de simuler l'appel.
+            </p>
+            <p>
+                Il y a bien moyen de contournement : ajouter des méthodes complémentaires
+                à l'objet fantaisie à la génération.
+<pre>
+<strong>Mock::generate('DatabaseConnection', 'MockDatabaseConnection', array('setOptions'));</strong>
+</pre>
+                Dans une longue suite de tests cela pourrait entraîner des problèmes,
+                puisque vous avez probablement déjà une version fantaisie
+                de la classe appellée <span class="new_code">MockDatabaseConnection</span>
+                sans les méthodes complémentaires.
+                Le générateur de code ne générera pas la version fantaisie de la classe
+                s'il en existe déjà une version avec le même nom.
+                Il vous deviendra impossible de déterminer où est passée votre méthode
+                si une autre définition a été lancé au préalable.
+            </p>
+            <p>
+                Pour pallier à ce problème, SimpleTest vous permet de choisir
+                n'importe autre nom pour la nouvelle classe au moment même où
+                vous ajouter les méthodes complémentaires.
+<pre>
+Mock::generate('DatabaseConnection', <strong>'MockDatabaseConnectionWithOptions'</strong>, array('setOptions'));
+</pre>
+                Ici l'objet fantaisie se comportera comme si
+                <span class="new_code">setOptions()</span> existait bel et bien
+                dans la classe originale.
+            </p>
+            <p>
+                Les objets fantaisie ne peuvent être utilisés qu'à l'intérieur
+                des scénarios de test, étant donné qu'à l'apparition d'une attente
+                ils envoient des messages directement au scénario de test courant.
+                Les créer en dehors d'un scénario de test entraînera une erreur
+                de run time quand une attente est déclenchée et qu'il n'y a pas
+                de scénario de test en cours pour recevoir le message.
+                Nous pouvons désormais couvrir ces attentes.
+            </p>
+        
+        <h2>
+<a class="target" name="expectations"></a>Objets fantaisie en tant que critiques</h2>
+            <p>
+                Même si les bouchons serveur isolent vos tests des perturbations
+				du monde réel, ils n'apportent que le moitié des bénéfices possibles.
+				Vous pouvez obtenir une classe de test qui reçoive les bons messages,
+				mais cette nouvelle classe envoie-t-elle les bons ?
+				Le tester peut devenir très bordélique sans
+				une librairie d'objets fantaise.
+            </p>
+			<p>
+                Voici un exemple, prenons une classe <span class="new_code">PageController</span>
+				toute simple qui traitera un formulaire de paiement
+				par carte bleue...
+<pre>
+class PaymentForm extends PageController {
+    function __construct($alert, $payment_gateway) { ... }
+    function makePayment($request) { ... }
+}
+</pre>
+                Cette classe a besoin d'un <span class="new_code">PaymentGateway</span>
+				pour parler concrètement à la banque.
+				Il utilise aussi un objet <span class="new_code">Alert</span>
+				pour gérer les erreurs.
+				Cette dernière classe parle à la page ou au template.
+				Elle est responsable de l'affichage du message d'erreur
+				et de la mise en valeur de tout champ du formulaire
+				qui serait incorrecte.
+            </p>
+            <p>
+                Elle pourrait ressembler à...
+<pre>
+class Alert {
+    function warn($warning, $id) {
+        print '&lt;div class="warning"&gt;' . $warning . '&lt;/div&gt;';
+        print '&lt;style type="text/css"&gt;#' . $id . ' { background-color: red }&lt;/style&gt;';
+    }
+}
+</pre>
+            </p>
+            <p>
+                Portons notre attention à la méthode <span class="new_code">makePayment()</span>.
+				Si nous n'inscrivons pas un numéro "CVV2" (celui à trois
+				chiffre au dos de la carte bleue), nous souhaitons afficher
+				une erreur plutôt que d'essayer de traiter le paiement. 
+				En mode test...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('payment_form.php');
+Mock::generate('Alert');
+Mock::generate('PaymentGateway');
+
+class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
+
+    function testMissingCvv2CausesAlert() {
+        $alert = new MockAlert();
+        <strong>$alert-&gt;expectOnce(
+                    'warn',
+                    array('Missing three digit security code', 'cvv2'));</strong>
+        $controller = new PaymentForm(<strong>$alert</strong>, new MockPaymentGateway());
+        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+    }
+
+    function requestWithMissingCvv2() { ... }
+}
+?&gt;
+</pre>
+                Première question : où sont passés les assertions ?
+            </p>
+            <p>
+                L'appel à <span class="new_code">expectOnce('warn', array(...))</span> annonce
+				à l'objet fantaisie qu'il faut s'attendre à un appel à <span class="new_code">warn()</span>
+				avant la fin du test.
+				Quand il débouche sur l'appel à <span class="new_code">warn()</span>, il vérifie
+				les arguments. Si ceux-ci ne correspondent pas, alors un échec
+				est généré. Il échouera aussi si la méthode n'est jamais appelée.
+            </p>
+            <p>
+                Non seulement le test ci-dessus s'assure que <span class="new_code">warn</span>
+				a bien été appelé, mais en plus qu'il a bien reçu la chaîne
+				de caractère "Missing three digit security code"
+				et même le tag "cvv2".
+				L'équivalent de <span class="new_code">assertIdentical()</span> est appliqué
+				aux deux champs quand les paramètres sont comparés.
+            </p>
+            <p>
+                Si le contenu du message vous importe peu, surtout dans le cas
+				d'une interface utilisateur qui change régulièrement,
+				nous pouvons passer ce paramètre avec l'opérateur "*"...
+<pre>
+class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
+
+    function testMissingCvv2CausesAlert() {
+        $alert = new MockAlert();
+        $alert-&gt;expectOnce('warn', array(<strong>'*'</strong>, 'cvv2'));
+        $controller = new PaymentForm($alert, new MockPaymentGateway());
+        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+    }
+
+    function requestWithMissingCvv2() { ... }
+}
+</pre>
+                Nous pouvons même rendre le test encore moins spécifique
+				en supprimant complètement la liste des paramètres...
+<pre>
+function testMissingCvv2CausesAlert() {
+    $alert = new MockAlert();
+    <strong>$alert-&gt;expectOnce('warn');</strong>
+    $controller = new PaymentForm($alert, new MockPaymentGateway());
+    $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+}
+</pre>
+                Ceci vérifiera uniquement si la méthode a été appelé,
+				ce qui est peut-être un peu drastique dans ce cas.
+				Plus tard, nous verrons comment alléger les attentes
+				plus précisement.
+            </p>
+            <p>
+                Des tests sans assertions peuvent être à la fois compacts
+				et très expressifs. Parce que nous interceptons l'appel
+				sur le chemin de l'objet, ici de classe <span class="new_code">Alert</span>,
+				nous évitons de tester l'état par la suite.
+				Cela évite les assertions dans les tests, mais aussi
+				l'obligation d'ajouter des accesseurs uniquement
+				pour les tests dans le code original.
+				Si vous en arrivez à ajouter des accesseurs de ce type,
+				on parle alors de "state based testing" dans le jargon
+				("test piloté par l'état"),
+				il est probablement plus que temps d'utiliser
+				des objets fantaisie dans vos tests.
+				On peut alors parler de "behaviour based testing"
+				(ou "test piloté par le comportement") :
+				c'est largement mieux !
+            </p>
+            <p>
+                Ajoutons un autre test.
+				Assurons nous que nous essayons même pas un paiement sans CVV2...
+<pre>
+class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
+
+    function testMissingCvv2CausesAlert() { ... }
+
+    function testNoPaymentAttemptedWithMissingCvv2() {
+        $payment_gateway = new MockPaymentGateway();
+        <strong>$payment_gateway-&gt;expectNever('pay');</strong>
+        $controller = new PaymentForm(new MockAlert(), $payment_gateway);
+        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+    }
+
+    ...
+}
+</pre>
+                Vérifier une négation peut être très difficile
+				dans les tests, mais <span class="new_code">expectNever()</span>
+				rend l'opération très facile heureusement.
+            </p>
+            <p>
+                <span class="new_code">expectOnce()</span> et <span class="new_code">expectNever()</span> sont
+				suffisants pour la plupart des tests, mais
+				occasionnellement vous voulez tester plusieurs évènements.
+				D'ordinaire pour des raisons d'usabilité, nous souhaitons
+				que tous les champs manquants du formulaire soient
+				mis en relief, et pas uniquement le premier.
+				Cela veut dire que nous devrions voir de multiples appels
+				à <span class="new_code">Alert::warn()</span>, pas juste un...
+<pre>
+function testAllRequiredFieldsHighlightedOnEmptyRequest() {
+    $alert = new MockAlert();<strong>
+    $alert-&gt;expectAt(0, 'warn', array('*', 'cc_number'));
+    $alert-&gt;expectAt(1, 'warn', array('*', 'expiry'));
+    $alert-&gt;expectAt(2, 'warn', array('*', 'cvv2'));
+    $alert-&gt;expectAt(3, 'warn', array('*', 'card_holder'));
+    $alert-&gt;expectAt(4, 'warn', array('*', 'address'));
+    $alert-&gt;expectAt(5, 'warn', array('*', 'postcode'));
+    $alert-&gt;expectAt(6, 'warn', array('*', 'country'));
+    $alert-&gt;expectCallCount('warn', 7);</strong>
+    $controller = new PaymentForm($alert, new MockPaymentGateway());
+    $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+}
+</pre>
+                Le compteur dans <span class="new_code">expectAt()</span> précise
+				le nombre de fois que la méthode a déjà été appelée.
+				Ici nous vérifions que chaque champ sera bien mis en relief.
+            </p>
+            <p>
+                Notez que nous sommes forcé de tester l'ordre en même temps.
+				SimpleTest n'a pas encore de moyen pour éviter cela,
+				mais dans une version future ce sera corrigé.
+            </p>
+            <p>
+                Voici la liste complètes des attentes
+				que vous pouvez préciser sur une objet fantaisie
+				dans <a href="http://simpletest.org/">SimpleTest</a>.
+				Comme pour les assertions, ces méthodes prennent en option
+				un message d'erreur.
+                <table>
+                    <thead><tr>
+<th>Attente</th>
+<th>Description</th>
+</tr></thead>
+                    <tbody>
+                        <tr>
+                            <td><span class="new_code">expect($method, $args)</span></td>
+                            <td>Les arguements doivent correspondre si appelés</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectAt($timing, $method, $args)</span></td>
+                            <td>Les arguements doiven correspondre si appelés lors du passage numéro <span class="new_code">$timing</span>
+</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectCallCount($method, $count)</span></td>
+                            <td>La méthode doit être appelée exactement <span class="new_code">$count</span> fois</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectMaximumCallCount($method, $count)</span></td>
+                            <td>La méthode ne doit pas être appelée plus de <span class="new_code">$count</span> fois</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectMinimumCallCount($method, $count)</span></td>
+                            <td>La méthode ne doit pas être appelée moins de <span class="new_code">$count</span> fois</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectNever($method)</span></td>
+                            <td>La méthode ne doit jamais être appelée</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectOnce($method, $args)</span></td>
+                            <td>La méthode ne doit être appelée qu'une seule fois et avec les arguments (en option)</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectAtLeastOnce($method, $args)</span></td>
+                            <td>La méthode doit être appelée au moins une seule fois et toujours avec au moins un des arguments attendus</td>
+                        </tr>
+                    </tbody>
+                </table>
+                Où les paramètres sont...
+                <dl>
+                    <dt class="new_code">$method</dt>
+                    <dd>
+                    	Le nom de la méthode, sous la forme d'une chaîne de caractères,
+						à laquelle il faut appliquer la condition.
+					</dd>
+                    <dt class="new_code">$args</dt>
+                    <dd>
+                        Les argumetns sous la forme d'une liste.
+						Les jokers peuvent être inclus de la même manière
+						que pour <span class="new_code">setReturn()</span>.
+						Cet argument est optionnel pour <span class="new_code">expectOnce()</span>
+                        et <span class="new_code">expectAtLeastOnce()</span>.
+                    </dd>
+                    <dt class="new_code">$timing</dt>
+                    <dd>
+                        La seule marque dans le temps pour tester la condition.
+						Le premier appel commence à zéro et le comptage se fait
+						séparement sur chaque méthode.
+                    </dd>
+                    <dt class="new_code">$count</dt>
+                    <dd>Le nombre d'appels attendu.</dd>
+                </dl>
+            </p>
+            <p>
+                Si vous n'avez qu'un seul appel dans votre test, assurez vous
+				d'utiliser <span class="new_code">expectOnce</span>.<br>
+                Utiliser <span class="new_code">$mocked-&gt;expectAt(0, 'method', 'args);</span>
+				tout seul ne permettra qu'à la méthode de ne jamais être appelée.
+				Vérifier les arguements et le comptage total sont pour le moment
+				indépendants.
+				Ajouter une attente <span class="new_code">expectCallCount()</span> quand
+				vous utilisez <span class="new_code">expectAt()</span> (dans le cas sans appel)
+				est permis.
+            </p>
+            <p>
+                Comme les assertions à l'intérieur des scénarios de test,
+				toutes ces attentes peuvent incorporer une surchage
+				sur le message sous la forme d'un paramètre supplémentaire.
+				Par ailleurs le message original peut être inclus dans la sortie
+				avec "%s".
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            Le papier original sur les Objets fantaisie ou
+            <a href="http://www.mockobjects.com/">Mock objects</a>.
+        </li>
+<li>
+            La page du projet SimpleTest sur <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page d'accueil de SimpleTest sur <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/overview.html b/3rdparty/simpletest/docs/fr/overview.html
new file mode 100644
index 00000000000..968bbc48e50
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/overview.html
@@ -0,0 +1,321 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+        Aperçu et liste des fonctionnalités des testeurs unitaires PHP et web de SimpleTest PHP
+    </title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Apercu de SimpleTest</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#resume">Résumé rapide</a> de l'outil SimpleTest pour PHP.
+        </li>
+<li>
+            <a href="#fonctionnalites">La liste des fonctionnalites</a>, à la fois présentes et à venir.
+        </li>
+<li>
+            Il y a beaucoup de <a href="#ressources">ressources sur les tests unitaires</a> sur le web.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="resume"></a>Qu'est-ce que SimpleTest ?</h2>
+            <p>
+                Le coeur de SimpleTest est un framework de test construit autour de classes de scénarios de test. Celles-ci sont écrites comme des extensions des classes premières de scénarios de test, chacune élargie avec des méthodes qui contiennent le code de test effectif. Les scripts de test de haut niveau invoque la méthode <span class="new_code">run()</span> à chaque scénario de test successivement. Chaque méthode de test est écrite pour appeler des assertions diverses que le développeur suppose être vraies, <span class="new_code">assertEqual()</span> par exemple. Si l'assertion est correcte, alors un succès est expédié au rapporteur observant le test, mais toute erreur déclenche une alerte et une description de la dissension.
+            </p>
+            <p>
+                Un <a href="unit_test_documentation.html">scénario de test</a> ressemble à...
+<pre>
+class <strong>MyTestCase</strong> extends UnitTestCase {
+    <strong>
+    function testLog() {
+        $log = &amp;new Log('my.log');
+        $log-&gt;message('Hello');
+        $this-&gt;assertTrue(file_exists('my.log'));
+    }</strong>
+}
+</pre>
+            </p>
+            <p>
+                Ces outils sont conçus pour le développeur. Les tests sont écrits en PHP directement, plus ou moins simultanément avec la construction de l'application elle-même. L'avantage d'utiliser PHP lui-même comme langage de test est qu'il n'y a pas de nouveau langage à apprendre, les tests peuvent commencer directement et le développeur peut tester n'importe quelle partie du code. Plus simplement, toutes les parties qui peuvent être accédées par le code de l'application peuvent aussi être accédées par le code de test si ils sont tous les deux dans le même langage.
+            </p>
+            <p>
+                Le type de scénario de test le plus simple est le <span class="new_code">UnitTestCase</span>. Cette classe de scénario de test inclut les tests standards pour l'égalité, les références et l'appariement de motifs (via les expressions rationnelles). Ceux-ci testent ce que vous seriez en droit d'attendre du résultat d'une fonction ou d'une méthode. Il s'agit du type de test le plus commun pendant le quotidien du développeur, peut-être 95% des scénarios de test.
+            </p>
+            <p>
+                La tâche ultime d'une application web n'est cependant pas de produire une sortie correcte à partir de méthodes ou d'objets, mais plutôt de produire des pages web. La classe <span class="new_code">WebTestCase</span> teste des pages web. Elle simule un navigateur web demandant une page, de façon exhaustive : cookies, proxies, connexions sécurisées, authentification, formulaires, cadres et la plupart des éléments de navigation. Avec ce type de scénario de test, le développeur peut garantir que telle ou telle information est présente dans la page et que les formulaires ainsi que les sessions sont gérés comme il faut.
+            </p>
+            <p>
+                Un <a href="web_tester_documentation.html">scénario de test web</a> ressemble à...
+<pre>
+class <strong>MySiteTest</strong> extends WebTestCase {
+    <strong>
+    function testHomePage() {
+        $this-&gt;get('http://www.my-site.com/index.php');
+        $this-&gt;assertTitle('My Home Page');
+        $this-&gt;clickLink('Contact');
+        $this-&gt;assertTitle('Contact me');
+        $this-&gt;assertWantedPattern('/Email me at/');
+    }</strong>
+}
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="fonctionnalites"></a>Liste des fonctionnalites</h2>
+            <p>
+                Ci-dessous vous trouverez un canevas assez brut des fonctionnalités à aujourd'hui et pour demain, sans oublier leur date approximative de publication. J'ai bien peur qu'il soit modifiable sans pré-avis étant donné que les jalons dépendent beaucoup sur le temps disponible. Les trucs en vert ont été codés, mais pas forcément déjà rendus public. Si vous avez une besoin pressant pour une fonctionnalité verte mais pas encore publique alors vous devriez retirer le code directement sur le  CVS chez SourceFourge. Une fonctionnalitée publiée est indiqué par "Fini".
+                <table>
+<thead>
+                    <tr>
+<th>Fonctionnalité</th>
+<th>Description</th>
+<th>Publication</th>
+</tr>
+                    </thead>
+<tbody>
+<tr>
+                        <td>Scénariot de test unitaire</td>
+                        <td>Les classes de test et assertions de base</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Affichage HTML</td>
+                        <td>L'affichage le plus simple possible</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Autochargement des scénarios de test</td>
+                        <td>Lire un fichier avec des scénarios de test et les charger dans un groupe de tests automatiquement</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Générateur de code d'objets fantaisie</td>
+                        <td>Des objets capable de simuler d'autres objets, supprimant les dépendances dans les tests</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Bouchons serveur</td>
+                        <td>Des objets fantaisie sans résultat attendu à utiliser à l'extérieur des scénarios de test, pour le prototypage par exemple.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Intégration d'autres testeurs unitaires</td>
+                        <td>
+                            La capacité de lire et simuler d'autres scénarios de test en provenance de PHPUnit et de PEAR::Phpunit.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Scénario de test web</td>
+                        <td>Appariement basique de motifs dans une page téléchargée.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Analyse de page HTML</td>
+                        <td>Permet de suivre les liens et de trouver la balise de titre</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Simulacre partiel</td>
+                        <td>Simuler des parties d'une classe pour tester moins qu'une classe ou dans des cas complexes.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Gestion des cookies Web</td>
+                        <td>Gestion correcte des cookies au téléchargement d'une page.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Suivi des redirections</td>
+                        <td>Le téléchargement d'une page suit automatiquement une redirection 300.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Analyse d'un formulaire</td>
+                        <td>La capacité de valider un formulaire simple et d'en lire les valeurs par défaut.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Interface en ligne de commande</td>
+                        <td>Affiche le résultat des tests sans navigateur web.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Mise à nu des attentes d'une classe</td>
+                        <td>Peut créer des tests précis avec des simulacres ainsi que des scénarios de test.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Sortie et analyse XML</td>
+                        <td>Permet de tester sur plusieurs hôtes et d'intégrer des extensions d'acceptation de test.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Scénario de test en ligne de commande</td>
+                        <td>Permet de tester des outils ou scripts en ligne de commande et de manier des fichiers.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Compatibilité avec PHP Documentor</td>
+                        <td>Génération automatique et complète de la documentation au niveau des classes.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Interface navigateur</td>
+                        <td>Mise à nu des niveaux bas de l'interface du navigateur web pour des scénarios de test plus précis.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Authentification HTTP</td>
+                        <td>Téléchargement des pages web protégées avec une authentification basique seulement.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Boutons de navigation d'un navigateur</td>
+                        <td>Arrière, avant et recommencer</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Support de SSL</td>
+                        <td>Peut se connecter à des pages de type https.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Support de proxy</td>
+                        <td>Peut se connecter via des proxys communs</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Support des cadres</td>
+                        <td>Gère les cadres dans les scénarios de test web.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Test de l'upload de fichier</td>
+                        <td>Peut simuler la balise input de type file</td>
+                        <td style="color: red;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>Amélioration sur la machinerie des rapports</td>
+                        <td>Retouche sur la transmission des messages pour une meilleur coopération avec les IDEs</td>
+                        <td style="color: red;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>Amélioration de l'affichage des tests</td>
+                        <td>Une meilleure interface graphique web, avec un arbre des scénarios de test.</td>
+                        <td style="color: red;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>Localisation</td>
+                        <td>Abstraction des messages et génration du code à partir de fichiers XML.</td>
+                        <td style="color: red;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>Simulation d'interface</td>
+                        <td>Peut générer des objets fantaisie tant vers des interfaces que vers des classes.</td>
+                        <td style="color: red;">2.0</td>
+                    </tr>
+                    <tr>
+                        <td>Test sur es exceptions</td>
+                        <td>Dans le même esprit que sur les tests des erreurs PHP.</td>
+                        <td style="color: red;">2.0</td>
+                    </tr>
+                    <tr>
+                        <td>Rercherche d'éléments avec XPath</td>
+                        <td>Peut utiliser Tidy HTML pour un appariement plus rapide et plus souple.</td>
+                        <td style="color: red;">2.0</td>
+                    </tr>
+                </tbody>
+</table>
+                La migration vers PHP5 commencera juste après la série des 1.0, à partir de là PHP4 ne sera plus supporté. SimpleTest est actuellement compatible avec PHP5 mais n'utilisera aucune des nouvelles fonctionnalités avant la version 2.
+            </p>
+        
+        <h2>
+<a class="target" name="ressources"></a>Ressources sur le web pour les tests</h2>
+            <p>
+                Le processus est au moins aussi important que les outils. Le type de procédure que fait un usage le plus intensif des outils de test pour développeur est bien sûr l'<a href="http://www.extremeprogramming.org/">Extreme Programming</a>. Il s'agit là d'une des <a href="http://www.agilealliance.com/articles/index">méthodes agiles</a> qui combinent plusieurs pratiques pour "lisser la courbe de coût" du développement logiciel. La plus extrème reste le <a href="http://www.testdriven.com/modules/news/">développement piloté par les tests</a>, où vous devez adhérer à la règle du <cite>pas de code avant d'avoir un test</cite>. Si vous êtes plutôt du genre planninficateur ou que vous estimez que l'expérience compte plus que l'évolution, vous préférerez peut-être l'approche <a href="http://www.therationaledge.com/content/dec_01/f_spiritOfTheRUP_pk.html">RUP</a>. Je ne l'ai pas testé mais je peux voir où vous aurez besoin d'outils de test (cf. illustration 9).
+            </p>
+            <p>
+                La plupart des testeurs unitaires sont dans une certaine mesure un clone de <a href="http://www.junit.org/">JUnit</a>, au moins dans l'interface. Il y a énormément d'information sur le site de JUnit, à commencer par la <a href="http://junit.sourceforge.net/doc/faq/faq.htm">FAQ</a> quie contient pas mal de conseils généraux sur les tests. Une fois mordu par le bogue vous apprécierez sûrement la phrase <a href="http://junit.sourceforge.net/doc/testinfected/testing.htm">infecté par les tests</a> trouvée par Eric Gamma. Si vous êtes encore en train de tergiverser sur un testeur unitaire, sachez que les choix principaux sont <a href="http://phpunit.sourceforge.net/">PHPUnit</a> et <a href="http://pear.php.net/manual/en/package.php.phpunit.php">Pear PHP::PHPUnit</a>. De nombreuses fonctionnalités de SimpleTest leurs font défaut, mais la version PEAR a d'ores et déjà été mise à jour pour PHP5. Elle est aussi recommandée si vous portez des scénarios de test existant depuis <a href="http://www.junit.org/">JUnit</a>.
+            </p>
+            <p>
+                Les développeurs de bibliothèque n'ont pas l'air de livrer très souvent des tests avec leur code : c'est bien dommage. Le code d'une bibliothèque qui inclut des tests peut être remanié avec plus de sécurité et le code de test sert de documentation additionnelle dans un format assez standard. Ceci peut épargner la pêche aux indices dans le code source lorsque qu'un problème survient, en particulier lors de la mise à jour d'une telle bibliothèque. Parmi les bibliothèques utilisant SimpleTest comme testeur unitaire on retrouve <a href="http://wact.sourceforge.net/">WACT</a> et <a href="http://sourceforge.net/projects/htmlsax">PEAR::XML_HTMLSax</a>.
+            </p>
+            <p>
+                Au jour d'aujourd'hui il manque tristement beaucoup de matière sur les objets fantaisie : dommage, surtout que tester unitairement sans eux représente pas mal de travail en plus. L'<a href="http://www.sidewize.com/company/mockobjects.pdf">article original sur les objets fantaisie</a> est très orienté Java, mais reste intéressant à lire. Etant donné qu'il s'agit d'une nouvelle technologie il y a beaucoup de discussions et de débats sur comment les utiliser, souvent sur des wikis comme <a href="http://xpdeveloper.com/cgi-bin/oldwiki.cgi?MockObjects">Extreme Tuesday</a> ou <a href="http://www.mockobjects.com/MocksObjectsPaper.html">www.mockobjects.com</a>ou <a href="http://c2.com/cgi/wiki?MockObject">the original C2 Wiki</a>. Injecter des objets fantaisie dans une classe est un des champs principaux du débat : cet <a href="http://www-106.ibm.com/developerworks/java/library/j-mocktest.html">article chez IBM</a> en est un bon point de départ.
+            </p>
+            <p>
+                Il y a énormement d'outils de test web mais la plupart sont écrits en Java. De plus les tutoriels et autres conseils sont plutôt rares. Votre seul espoir est de regarder directement la documentation pour <a href="http://httpunit.sourceforge.net/">HTTPUnit</a>, <a href="http://htmlunit.sourceforge.net/">HTMLUnit</a> ou <a href="http://jwebunit.sourceforge.net/">JWebUnit</a> et d'espérer y trouver pour des indices. Il y a aussi des frameworks basés sur XML, mais de nouveau la plupart ont besoin de Java pour tourner.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            <a href="unit_test_documentation.html">Documentation pour SimpleTest</a>.
+        </li>
+<li>
+            <a href="http://www.lastcraft.com/first_test_tutorial.php">Comment écrire des scénarios de test en PHP</a> est un tutoriel plutôt avancé.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API de SimpleTest</a> par phpdoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/partial_mocks_documentation.html b/3rdparty/simpletest/docs/fr/partial_mocks_documentation.html
new file mode 100644
index 00000000000..740ae7b4026
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/partial_mocks_documentation.html
@@ -0,0 +1,475 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : les objets fantaisie partiels</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur les objets fantaisie partiels</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#injection">Le problème de l'injection d'un objet fantaisie</a>.
+        </li>
+<li>
+            Déplacer la création vers une méthode <a href="#creation">fabrique protégée</a>.
+        </li>
+<li>
+            <a href="#partiel">L'objet fantaisie partiel</a> génère une sous-classe.
+        </li>
+<li>
+            Les objets fantaisie partiels <a href="#moins">testent moins qu'une classe</a>.
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                Un objet fantaisie partiel n'est ni plus ni moins
+                qu'un modèle de conception pour soulager un problème spécifique
+                du test avec des objets fantaisie, celui de placer
+                des objets fantaisie dans des coins serrés.
+                Il s'agit d'un outil assez limité et peut-être même
+                une idée pas si bonne que ça. Elle est incluse dans SimpleTest
+                pour la simple raison que je l'ai trouvée utile
+                à plus d'une occasion et qu'elle m'a épargnée
+                pas mal de travail dans ces moments-là.
+            </p>
+        
+        <h2>
+<a class="target" name="injection"></a>Le problème de l'injection dans un objet fantaisie</h2>
+            <p>
+                Quand un objet en utilise un autre il est très simple
+                d'y faire circuler une version fantaisie déjà prête
+                avec ses attentes. Les choses deviennent un peu plus délicates
+                si un objet en crée un autre et que le créateur est celui
+                que l'on souhaite tester. Cela revient à dire que l'objet
+                créé devrait être une fantaisie, mais nous pouvons
+                difficilement dire à notre classe sous test de créer
+                un objet fantaisie plutôt qu'un "vrai" objet.
+                La classe testée ne sait même pas qu'elle travaille dans un environnement de test.
+            </p>
+            <p>
+                Par exemple, supposons que nous sommes en train
+                de construire un client telnet et qu'il a besoin
+                de créer une socket réseau pour envoyer ses messages.
+                La méthode de connexion pourrait ressemble à quelque chose comme...
+<pre>
+<strong>&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    function connect($ip, $port, $username, $password) {
+        $socket = new Socket($ip, $port);
+        $socket-&gt;read( ... );
+        ...
+    }
+}
+?&gt;</strong>
+</pre>
+                Nous voudrions vraiment avoir une version fantaisie
+                de l'objet socket, que pouvons nous faire ?
+            </p>
+            <p>
+                La première solution est de passer la socket en
+                tant que paramètre, ce qui force la création
+                au niveau inférieur. Charger le client de cette tâche
+                est effectivement une bonne approche si c'est possible
+                et devrait conduire à un remaniement -- de la création
+                à partir de l'action. En fait, c'est là une des manières
+                avec lesquels tester en s'appuyant sur des objets fantaisie
+                vous force à coder des solutions plus resserrées sur leur objectif.
+                Ils améliorent votre programmation.
+            </p>
+            <p>
+                Voici ce que ça devrait être...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    <strong>function connect($socket, $username, $password) {
+        $socket-&gt;read( ... );
+        ...
+    }</strong>
+}
+?&gt;
+</pre>
+                Sous-entendu, votre code de test est typique d'un cas
+                de test avec un objet fantaisie.
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new Telnet();
+        $telnet-&gt;connect($socket, 'Me', 'Secret');
+        ...</strong>
+    }
+}
+</pre>
+                C'est assez évident que vous ne pouvez descendre que d'un niveau.
+                Vous ne voudriez pas que votre application de haut niveau
+                crée tous les fichiers de bas niveau, sockets et autres connexions
+                à la base de données dont elle aurait besoin.
+                Elle ne connaîtrait pas les paramètres du constructeur de toute façon.
+            </p>
+            <p>
+                La solution suivante est de passer l'objet créé sous la forme
+                d'un paramètre optionnel...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...<strong>
+    function connect($ip, $port, $username, $password, $socket = false) {
+        if (! $socket) {
+            $socket = new Socket($ip, $port);
+        }
+        $socket-&gt;read( ... );</strong>
+        ...
+        return $socket;
+    }
+}
+?&gt;
+</pre>
+                Pour une solution rapide, c'est généralement suffisant.
+                Ensuite le test est très similaire : comme si le paramètre
+                était transmis formellement...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret', $socket);
+        ...</strong>
+    }
+}
+</pre>
+                Le problème de cette approche tient dans son manque de netteté.
+                Il y a du code de test dans la classe principale et aussi
+                des paramètres transmis dans le scénario de test
+                qui ne sont jamais utilisés. Il s'agit là d'une approche
+                rapide et sale, mais qui ne reste pas moins efficace
+                dans la plupart des situations.
+            </p>
+            <p>
+                Une autre solution encore est de laisser un objet fabrique
+                s'occuper de la création...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {<strong>
+   function Telnet($network) {
+        $this-&gt;_network = $network;
+    }</strong>
+    ...
+    function connect($ip, $port, $username, $password) {<strong>
+        $socket = $this-&gt;_network-&gt;createSocket($ip, $port);
+        $socket-&gt;read( ... );</strong>
+        ...
+        return $socket;
+    }
+}
+?&gt;
+</pre>
+                Il s'agit là probablement de la réponse la plus travaillée
+                étant donné que la création est maintenant située
+                dans une petite classe spécialisée. La fabrique réseau
+                peut être testée séparément et utilisée en tant que fantaisie
+                quand nous testons la classe telnet...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $network = new MockNetwork();
+        $network-&gt;returnsByReference('createSocket', $socket);
+        $telnet = new Telnet($network);
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
+    }
+}
+</pre>
+                Le problème reste que nous ajoutons beaucoup de classes
+                à la bibliothèque. Et aussi que nous utilisons beaucoup
+                de fabriques ce qui rend notre code un peu moins intuitif.
+                La solution la plus flexible, mais aussi la plus complexe.
+            </p>
+			<p>
+                Des techniques comme "l'Injection de Dépendance"
+				(ou "Dependency Injection") s'attelle au problème
+				de l'instanciation d'une classe avec beaucoup de paramètres.
+				Malheureusement la connaissance de ce patron de conception
+				n'est pas très répandue et si vous êtes en train d'essayer
+				de faire fonctionner du vieux code, ré-achitecturer toute
+				l'application n'est pas vraiment une option.
+            </p>
+            <p>
+                Peut-on trouver un juste milieu ?
+            </p>
+        
+        <h2>
+<a class="target" name="creation"></a>Méthode fabrique protégée</h2>
+            <p>
+                Il existe une technique pour palier à ce problème
+                sans créer de nouvelle classe dans l'application;
+                par contre elle induit la création d'une sous-classe au moment du test.
+                Premièrement nous déplaçons la création de la socket dans sa propre méthode...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    function connect($ip, $port, $username, $password) {
+        <strong>$socket = $this-&gt;createSocket($ip, $port);</strong>
+        $socket-&gt;read( ... );
+        ...
+    }<strong>
+
+    protected function createSocket($ip, $port) {
+        return new Socket($ip, $port);
+    }</strong>
+}
+?&gt;
+</pre>
+				Une première étape plutôt précautionneuse même pour
+				du code legacy et intermélé.
+                Il s'agit là de la seule modification dans le code de l'application.
+            </p>
+            <p>
+                Pour le scénario de test, nous devons créer
+                une sous-classe de manière à intercepter la création de la socket...
+<pre>
+<strong>class TelnetTestVersion extends Telnet {
+    var $mock;
+
+    function TelnetTestVersion($mock) {
+        $this-&gt;mock = $mock;
+        $this-&gt;Telnet();
+    }
+
+    protected function createSocket() {
+        return $this-&gt;mock;
+    }
+}</strong>
+</pre>
+                Ici j'ai déplacé la fantaisie dans le constructeur,
+                mais un setter aurait fonctionné tout aussi bien.
+                Notez bien que la fantaisie est placée dans une variable
+                d'objet avant que le constructeur ne soit attaché.
+                C'est nécessaire dans le cas où le constructeur appelle 
+                <span class="new_code">connect()</span>.
+                Autrement il pourrait donner un valeur nulle à partir de
+                <span class="new_code">createSocket()</span>.
+            </p>
+            <p>
+                Après la réalisation de tout ce travail supplémentaire
+                le scénario de test est assez simple.
+                Nous avons juste besoin de tester notre nouvelle classe à la place...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new TelnetTestVersion($socket);
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
+    }
+}
+</pre>
+                Cette nouvelle classe est très simple bien sûr.
+                Elle ne fait qu'initier une valeur renvoyée, à la manière
+                d'une fantaisie. Ce serait pas mal non plus si elle pouvait
+                vérifier les paramètres entrants.
+                Exactement comme un objet fantaisie.
+                Il se pourrait bien que nous ayons à réaliser cette astuce régulièrement :
+                serait-il possible d'automatiser la création de cette sous-classe ?
+            </p>
+        
+        <h2>
+<a class="target" name="partiel"></a>Un objet fantaisie partiel</h2>
+            <p>
+                Bien sûr la réponse est "oui"
+                ou alors j'aurais arrêté d'écrire depuis quelques temps déjà !
+                Le test précédent a représenté beaucoup de travail,
+                mais nous pouvons générer la sous-classe en utilisant
+                une approche à celle des objets fantaisie.
+            </p>
+            <p>
+                Voici donc une version avec objet fantaisie partiel du test...
+<pre>
+<strong>Mock::generatePartial(
+        'Telnet',
+        'TelnetTestVersion',
+        array('createSocket'));</strong>
+
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new TelnetTestVersion();
+        $telnet-&gt;setReturnReference('createSocket', $socket);
+        $telnet-&gt;Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
+    }
+}
+</pre>
+                La fantaisie partielle est une sous-classe de l'original
+                dont on aurait "remplacé" les méthodes sélectionnées
+                avec des versions de test. L'appel à <span class="new_code">generatePartial()</span>
+                nécessite trois paramètres : la classe à sous classer,
+                le nom de la nouvelle classe et une liste des méthodes à simuler.
+            </p>
+            <p>
+                Instancier les objets qui en résultent est plutôt délicat.
+                L'unique paramètre du constructeur d'un objet fantaisie partiel
+                est la référence du testeur unitaire.
+                Comme avec les objets fantaisie classiques c'est nécessaire
+                pour l'envoi des résultats de test en réponse à la vérification des attentes.
+            </p>
+            <p>
+                Une nouvelle fois le constructeur original n'est pas lancé.
+                Indispensable dans le cas où le constructeur aurait besoin
+                des méthodes fantaisie : elles n'ont pas encore été initiées !
+                Nous initions les valeurs retournées à cet instant et
+                ensuite lançons le constructeur avec ses paramètres normaux.
+                Cette construction en trois étapes de "new",
+                suivie par la mise en place des méthodes et ensuite
+                par la lancement du constructeur proprement dit est
+                ce qui distingue le code d'un objet fantaisie partiel.
+            </p>
+            <p>
+                A part pour leur construction, toutes ces méthodes
+                fantaisie ont les mêmes fonctionnalités que dans
+                le cas des objets fantaisie et toutes les méthodes
+                non fantaisie se comportent comme avant.
+                Nous pouvons mettre en place des attentes très facilement...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {
+        $socket = new MockSocket();
+        ...
+        $telnet = new TelnetTestVersion();
+        $telnet-&gt;setReturnReference('createSocket', $socket);
+        <strong>$telnet-&gt;expectOnce('createSocket', array('127.0.0.1', 21));</strong>
+        $telnet-&gt;Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');
+    }
+}
+</pre>
+                Les objets fantaisie partiels ne sont pas très utilisés.
+				Je les considère comme transitoire.
+				Utile lors d'un remaniement, mais une fois que l'application
+				a eu toutes ses dépendances bien séparées alors
+				ils peuvent disparaître.
+            </p>
+        
+        <h2>
+<a class="target" name="moins"></a>Tester moins qu'une classe</h2>
+            <p>
+                Les méthodes issues d'un objet fantaisie n'ont pas
+                besoin d'être des méthodes fabrique, Il peut s'agir
+                de n'importe quelle sorte de méthode.
+                Ainsi les objets fantaisie partiels nous permettent
+                de prendre le contrôle de n'importe quelle partie d'une classe,
+                le constructeur excepté. Nous pourrions même aller jusqu'à
+                créer des fantaisies sur toutes les méthodes à part celle
+                que nous voulons effectivement tester.
+            </p>
+            <p>
+                Cette situation est assez hypothétique, étant donné
+                que je ne l'ai pas souvent essayée.
+				Je crains qu'en forçant la granularité d'un objet
+                on n'obtienne pas forcément un code de meilleur qualité.
+                Personnellement j'utilise les objets fantaisie partiels
+                comme moyen de passer outre la création ou alors
+                de temps en temps pour tester le modèle de conception TemplateMethod.
+            </p>
+            <p>
+                On en revient toujours aux standards de code de votre projet :
+				c'est à vous de trancher si vous autorisez ce mécanisme ou non.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API complète pour SimpleTest</a>
+            à partir de PHPDoc.
+        </li>
+<li>
+            La méthode fabrique protégée est décrite dans
+            <a href="http://www-106.ibm.com/developerworks/java/library/j-mocktest.html">
+            cet article d'IBM</a>. Il s'agit de l'unique papier
+            formel que j'ai vu sur ce problème.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/reporter_documentation.html b/3rdparty/simpletest/docs/fr/reporter_documentation.html
new file mode 100644
index 00000000000..485fc74c7a4
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/reporter_documentation.html
@@ -0,0 +1,630 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : le rapporteur de test</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur le rapporteur de test</h1>
+        This page...
+        <ul>
+<li>
+            Afficher <a href="#html">les résultats en HTML</a>
+        </li>
+<li>
+            Afficher et <a href="#autres">rapporter les résultats</a>
+            dans d'autres formats
+        </li>
+<li>
+            Utilisé <a href="#cli">SimpleTest depuis la ligne de commande</a>
+        </li>
+<li>
+            <a href="#xml">Utiliser XML</a> pour des tests distants
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                SimpleTest suit plutôt plus que moins le modèle MVC (Modèle-Vue-Contrôleur).
+                Les classes "reporter" sont les vues et les modèles
+                sont vos scénarios de test et leur hiérarchie.
+                Le contrôleur est le plus souvent masqué à l'utilisateur
+                de SimpleTest à moins de vouloir changer la façon
+                dont les tests sont effectivement exécutés,
+                auquel cas il est possible de surcharger les objets
+                "runner" (ceux de l'exécuteur) depuis l'intérieur
+                d'un scénario de test. Comme d'habitude avec MVC,
+                le contrôleur est plutôt indéfini et il existe d'autres endroits
+                pour contrôler l'exécution des tests.
+            </p>
+        
+        <h2>
+<a class="target" name="html"></a>Les résultats rapportés au format HTML</h2>
+            <p>
+                L'affichage par défaut est minimal à l'extrême.
+                Il renvoie le succès ou l'échec avec les barres conventionnelles
+                - rouge et verte - et affichent une trace d'arborescence
+                des groupes de test pour chaque assertion erronée. Voici un tel échec...
+                <div class="demo">
+                    <h1>File test</h1>
+                    <span class="fail">Fail</span>: createnewfile-&gt;True assertion failed.<br>
+                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
+                    <strong>0</strong> passes, <strong>1</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                Alors qu'ici tous les tests passent...
+                <div class="demo">
+                    <h1>File test</h1>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>1</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                La bonne nouvelle, c'est qu'il existe pas mal de points
+                dans la hiérarchie de l'affichage pour créer des sous-classes.
+            </p>
+            <p>
+                Pour l'affichage basé sur des pages web,
+                il y a la classe <span class="new_code">HtmlReporter</span> avec la signature suivante...
+<pre>
+class HtmlReporter extends SimpleReporter {
+    public __construct($encoding) { ... }
+    public makeDry(boolean $is_dry) { ... }
+    public void paintHeader(string $test_name) { ... }
+    public void sendNoCacheHeaders() { ... }
+    public void paintFooter(string $test_name) { ... }
+    public void paintGroupStart(string $test_name, integer $size) { ... }
+    public void paintGroupEnd(string $test_name) { ... }
+    public void paintCaseStart(string $test_name) { ... }
+    public void paintCaseEnd(string $test_name) { ... }
+    public void paintMethodStart(string $test_name) { ... }
+    public void paintMethodEnd(string $test_name) { ... }
+    public void paintFail(string $message) { ... }
+    public void paintPass(string $message) { ... }
+    public void paintError(string $message) { ... }
+    public void paintException(string $message) { ... }
+    public void paintMessage(string $message) { ... }
+    public void paintFormattedMessage(string $message) { ... }
+    protected string getCss() { ... }
+    public array getTestList() { ... }
+    public integer getPassCount() { ... }
+    public integer getFailCount() { ... }
+    public integer getExceptionCount() { ... }
+    public integer getTestCaseCount() { ... }
+    public integer getTestCaseProgress() { ... }
+}
+</pre>
+                Voici ce que certaines de ces méthodes veulent dire.
+                Premièrement les méthodes d'affichage que vous voudrez probablement surcharger...
+                <ul class="api">
+                    <li>
+                        <span class="new_code">HtmlReporter(string $encoding)</span><br>
+                        est le constructeur. Notez que le test unitaire initie
+                        le lien à l'affichage plutôt que l'opposé.
+                        L'affichage est principalement un receveur passif
+                        des évènements de tests. Cela permet d'adapter
+                        facilement l'affichage pour d'autres systèmes
+                        en dehors des tests unitaires, tel le suivi
+                        de la charge de serveurs.
+                        L'"encoding" est le type d'encodage
+                        que vous souhaitez utiliser pour l'affichage du test.
+                        Pour pouvoir effectuer un rendu correct de la sortie
+                        de débogage quand on utilise le testeur web,
+                        il doit correspondre à l'encodage du site testé.
+                        Les chaînes de caractères disponibles
+                        sont indiquées dans la fonction PHP
+                        <a href="http://www.php.net/manual/fr/function.htmlentities.php">html_entities()</a>.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintHeader(string $test_name)</span><br>
+                        est appelé une fois, au début du test quand l'évènement
+                        de démarrage survient. Le premier évènement de démarrage
+                        est souvent délivré par le groupe de tests du niveau
+                        le plus haut et donc c'est de là que le
+                        <span class="new_code">$test_name</span> arrive.
+                        Il peint le titre de la page, CSS, la balise "body", etc.
+                        Il ne renvoie rien du tout (<span class="new_code">void</span>).
+                    </li>
+                    <li>
+                        <span class="new_code">void paintFooter(string $test_name)</span><br>
+                        est appelé à la toute fin du test pour fermer
+                        les balises ouvertes par l'entête de la page.
+                        Par défaut il affiche aussi la barre rouge ou verte
+                        et le décompte final des résultats.
+                        En fait la fin des tests arrive quand l'évènement
+                        de fin de test arrive avec le même nom
+                        que celui qui l'a initié au même niveau.
+                        Le nid des tests en quelque sorte.
+                        Fermer le dernier test finit l'affichage.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintMethodStart(string $test_name)</span><br>
+                        est appelé au début de chaque méthode de test.
+                        Normalement le nom vient de celui de la méthode.
+                        Les autres évènements de départ de test
+                        se comportent de la même manière sauf que
+                        celui du groupe de tests indique au rapporteur
+                        le nombre de scénarios de test qu'il contient.
+                        De la sorte le rapporteur peut afficher une barre
+                        de progrès au fur et à mesure que l'exécuteur
+                        passe en revue les scénarios de test.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintMethodEnd(string $test_name)</span><br>
+                        clôt le test lancé avec le même nom.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintFail(string $message)</span><br>
+                        peint un échec. Par défaut il ne fait qu'afficher
+                        le mot "fail", une trace d'arborescence
+                        affichant la position du test en cours
+                        et le message transmis par l'assertion.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintPass(string $message)</span><br>
+                        ne fait rien, par défaut.
+                    </li>
+                    <li>
+                        <span class="new_code">string getCss()</span><br>
+                        renvoie les styles CSS sous la forme d'une chaîne
+                        à l'attention de la méthode d'entêtes d'une page.
+                        Des styles additionnels peuvent être ajoutés ici
+                        si vous ne surchargez pas les entêtes de la page.
+                        Vous ne voudrez pas utiliser cette méthode dans
+                        des entêtes d'une page surchargée si vous souhaitez
+                        inclure le feuille de style CSS d'origine.
+                    </li>
+                </ul>
+                Il y a aussi des accesseurs pour aller chercher l'information
+                sur l'état courant de la suite de test. Vous les utiliserez
+                pour enrichir l'affichage...
+                <ul class="api">
+                    <li>
+                        <span class="new_code">array getTestList()</span><br>
+                        est la première méthode très commode pour les sous-classes.
+                        Elle liste l'arborescence courante des tests
+                        sous la forme d'une liste de noms de tests.
+                        Le premier test -- celui de premier niveau --
+                        sera le premier dans la liste et la méthode de test
+                        en cours sera la dernière.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getPassCount()</span><br>
+                        renvoie le nombre de succès atteint. Il est nécessaire
+                        pour l'affichage à la fin.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getFailCount()</span><br>
+                        renvoie de la même manière le nombre d'échecs.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getExceptionCount()</span><br>
+                        renvoie quant à lui le nombre d'erreurs.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getTestCaseCount()</span><br>
+                        est le nombre total de scénarios lors de l'exécution des tests.
+                        Il comprend aussi les tests groupés.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getTestCaseProgress()</span><br>
+                        est le nombre de scénarios réalisés jusqu'à présent.
+                    </li>
+                </ul>
+                Une modification simple : demander à l'HtmlReporter d'afficher
+                aussi bien les succès que les échecs et les erreurs...
+<pre>
+<strong>class ReporterShowingPasses extends HtmlReporter {
+    
+    function paintPass($message) {
+        parent::paintPass($message);
+        print "&lt;span class=\"pass\"&gt;Pass&lt;/span&gt;: ";
+        $breadcrumb = $this-&gt;getTestList();
+        array_shift($breadcrumb);
+        print implode("-&amp;gt;", $breadcrumb);
+        print "-&amp;gt;$message&lt;br /&gt;\n";
+    }
+    
+    protected function getCss() {
+        return parent::getCss() . ' .pass { color: green; }';
+    }
+}</strong>
+</pre>
+            </p>
+            <p>
+                Une méthode qui a beaucoup fait jaser reste la méthode <span class="new_code">makeDry()</span>.
+                Si vous lancez cette méthode, sans paramètre,
+                sur le rapporteur avant que la suite de test
+                ne soit exécutée alors aucune méthode de test
+                ne sera appelée. Vous continuerez à avoir
+                les évènements entrants et sortants des méthodes
+                et scénarios de test, mais aucun succès ni échec ou erreur,
+                parce que le code de test ne sera pas exécuté.
+            </p>
+            <p>
+                La raison ? Pour permettre un affichage complexe
+                d'une IHM (ou GUI) qui permettrait la sélection
+                de scénarios de test individuels.
+                Afin de construire une liste de tests possibles,
+                ils ont besoin d'un rapport sur la structure du test
+                pour l'affichage, par exemple, d'une vue en arbre
+                de la suite de test. Avec un rapporteur lancé
+                sur une exécution sèche qui ne renverrait
+                que les évènements d'affichage, cela devient
+                facilement réalisable.
+            </p>
+        
+        <h2>
+<a class="target" name="autre"></a>Etendre le rapporteur</h2>
+            <p>
+                Plutôt que de modifier l'affichage existant,
+                vous voudrez peut-être produire une présentation HTML
+                complètement différente, ou même générer une version texte ou XML.
+                Plutôt que de surcharger chaque méthode dans 
+                <span class="new_code">HtmlReporter</span> nous pouvons nous rendre
+                une étape plus haut dans la hiérarchie de classe vers
+                <span class="new_code">SimpleReporter</span> dans le fichier source <em>simple_test.php</em>.
+            </p>
+            <p>
+                Un affichage sans rien, un canevas vierge
+                pour votre propre création, serait...
+<pre>
+<strong>require_once('simpletest/simpletest.php');</strong>
+
+class MyDisplay extends SimpleReporter {<strong>
+    </strong>
+    function paintHeader($test_name) { }
+    
+    function paintFooter($test_name) { }
+    
+    function paintStart($test_name, $size) {<strong>
+        parent::paintStart($test_name, $size);</strong>
+    }
+    
+    function paintEnd($test_name, $size) {<strong>
+        parent::paintEnd($test_name, $size);</strong>
+    }
+    
+    function paintPass($message) {<strong>
+        parent::paintPass($message);</strong>
+    }
+    
+    function paintFail($message) {<strong>
+        parent::paintFail($message);</strong>
+    }
+    
+    function paintError($message) {<strong>
+        parent::paintError($message);</strong>
+    }
+    
+    function paintException($exception) {<strong>
+        parent::paintException($exception);</strong>
+    }
+}
+</pre>
+                Aucune sortie ne viendrait de cette classe jusqu'à un ajout de votre part.
+            </p>
+			 <p>
+                Sauf qu'il y a un problème : en utilisant cette cette classe
+				de bas niveau, vous devez explicitement l'invoquer
+				dans les scripts de test.
+				La commande "autorun" ne sera pas capable
+				d'utiliser son contexte courant (qu'elle soit lancée
+				dans un navigateur web ou via une ligne de commande)
+				pour sélectionner le rapporteur.
+            </p>
+            <p>
+                Vous invoquez explicitement la lanceur de tests comme suit...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+$test-&gt;run(<strong>new MyReporter()</strong>);
+?&gt;
+</pre>
+                ...ou peut-être comme cela...
+<pre>
+&lt;?php
+require_once('simpletest/simpletest.php');
+require_once('my_reporter.php');
+
+class MyTest extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('tests/file_test.php');
+    }
+}
+
+$test = new MyTest();
+$test-&gt;run(<strong>new MyReporter()</strong>);
+?&gt;
+</pre>
+                Nous verrons plus comment l'intégrer avec l'"autorun".
+            </p>
+        
+        <h2>
+<a class="target" name="cli"></a>Le rapporteur en ligne de commande</h2>
+            <p>
+                SimpleTest est aussi livré avec un rapporteur
+                en ligne de commande, minime lui aussi.
+                Pour utiliser le rapporteur en ligne de commande explicitement,
+                il suffit de l'intervertir avec celui de la version HTML...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+$test-&gt;run(<strong>new TextReporter()</strong>);
+?&gt;
+</pre>
+                Et ensuite d'invoquer la suite de test à partir d'une ligne de commande...
+<pre class="shell">
+php file_test.php
+</pre>
+                Bien sûr vous aurez besoin d'installer PHP
+                en ligne de commande. Une suite de test qui
+                passerait toutes ses assertions ressemble à...
+<pre class="shell">
+File test
+OK
+Test cases run: 1/1, Passes: 1, Failures: 0, Exceptions: 0
+</pre>
+                Un échec déclenche un affichage comme...
+<pre class="shell">
+File test
+1) True assertion failed.
+    in createNewFile
+FAILURES!!!
+Test cases run: 1/1, Passes: 0, Failures: 1, Exceptions: 0
+</pre>
+            </p>
+            <p>
+                Une des principales raisons pour utiliser
+                une suite de test en ligne de commande tient
+                dans l'utilisation possible du testeur avec
+                un processus automatisé. Pour fonctionner comme
+                il faut dans des scripts shell le script de test
+                devrait renvoyer un code de sortie non-nul suite à un échec.
+                Si une suite de test échoue la valeur <span class="new_code">false</span>
+                est renvoyée par la méthode <span class="new_code">SimpleTest::run()</span>.
+                Nous pouvons utiliser ce résultat pour terminer le script
+                avec la bonne valeur renvoyée...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+<strong>exit ($test-&gt;run(new TextReporter()) ? 0 : 1);</strong>
+?&gt;
+</pre>
+                Bien sûr l'objectif ne serait pas de créer deux scripts de test,
+                l'un en ligne de commande et l'autre pour un navigateur web,
+                pour chaque suite de test.
+                Le rapporteur en ligne de commande inclut
+                une méthode pour déterminer l'environnement d'exécution...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+<strong>if (TextReporter::inCli()) {</strong>
+    exit ($test-&gt;run(new TextReporter()) ? 0 : 1);
+<strong>}</strong>
+$test-&gt;run(new HtmlReporter());
+?&gt;
+</pre>
+                Il s'agit là de la forme utilisée par SimpleTest lui-même.
+                Quand vous utilisez l'"autorun.php"
+				et qu'aucun test n'a été lancé avant la fin,
+				c'est quasiment le code que SimpleTest lancera
+				pour vous implicitement.
+            </p>
+            <p>
+                En d'autres termes, ceci donne le même résultat...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class MyTest extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('tests/file_test.php');
+    }
+}
+?&gt;
+</pre>            </p>
+        
+        <h2>
+<a class="target" name="xml"></a>Test distant</h2>
+            <p>
+                SimpleTest est livré avec une classe <span class="new_code">XmlReporter</span>
+                utilisée pour de la communication interne.
+                Lors de son exécution, le résultat ressemble à...
+<pre class="shell">
+&lt;?xml version="1.0"?&gt;
+&lt;run&gt;
+  &lt;group size="4"&gt;
+    &lt;name&gt;Remote tests&lt;/name&gt;
+    &lt;group size="4"&gt;
+      &lt;name&gt;Visual test with 48 passes, 48 fails and 4 exceptions&lt;/name&gt;
+      &lt;case&gt;
+        &lt;name&gt;testofunittestcaseoutput&lt;/name&gt;
+        &lt;test&gt;
+          &lt;name&gt;testofresults&lt;/name&gt;
+          &lt;pass&gt;This assertion passed&lt;/pass&gt;
+          &lt;fail&gt;This assertion failed&lt;/fail&gt;
+        &lt;/test&gt;
+        &lt;test&gt;
+          ...
+        &lt;/test&gt;
+      &lt;/case&gt;
+    &lt;/group&gt;
+  &lt;/group&gt;
+&lt;/run&gt;
+</pre>
+                Pour faire en sorte ue vos scénarios de test produisent ce format,
+				dans la ligne de commande, ajoutez le flag <span class="new_code">--xml</span>.
+<pre class="shell">
+php my_test.php --xml
+</pre>
+                Vous pouvez faire la même chose dans le navigation web
+				en ajoutant le paramètre <span class="new_code">xml=1</span> dans l'URL.
+				N'importe quelle valeur "true" fera l'affaire.
+            </p>
+            <p>
+				Vous pouvez utiliser ce format avec le parseur
+                fourni dans SimpleTest lui-même.
+                Il s'agit de <span class="new_code">SimpleTestXmlParser</span>
+                et se trouve <em>xml.php</em> à l'intérieur du paquet SimpleTest...
+<pre>
+&lt;?php
+require_once('simpletest/xml.php');
+    
+...
+$parser = new SimpleTestXmlParser(new HtmlReporter());
+$parser-&gt;parse($test_output);
+?&gt;
+</pre>
+                <span class="new_code">$test_output</span> devrait être au format XML,
+                à partir du rapporteur XML, et pourrait venir
+                d'une exécution en ligne de commande d'un scénario de test.
+                Le parseur envoie des évènements au rapporteur exactement
+                comme tout autre exécution de test.
+                Il y a des occasions bizarres dans lesquelles c'est en fait très utile.
+            </p>
+			<p>
+                Le plus courant, c'est quand vous voulez isoler
+				un test sensible au crash.
+				Vous pouvez collecter la sortie XML en utilisant
+				l'opérateur antiquote (Ndt : backtick) à partir
+				d'un autre test.
+				De la sorte, il tourne dans son propre processus...
+<pre>
+&lt;?php
+require_once('simpletest/xml.php');
+
+if (TextReporter::inCli()) {
+    $parser = new SimpleTestXmlParser(new TextReporter());
+} else {
+    $parser = new SimpleTestXmlParser(new HtmlReporter());
+}
+$parser-&gt;parse(`php flakey_test.php --xml`);
+?&gt;
+</pre>
+            </p>
+            <p>
+                Un autre cas est celui des très longues suites de tests.
+            </p>
+			<p>
+                Elles peuvent venir à bout de la limite de mémoire
+                par défaut d'un process PHP - 16Mb.
+                En plaçant la sortie des groupes de test dans du XML
+                et leur exécution dans des process différents,
+                le résultat peut être parsé à nouveau pour agréger
+                les résultats avec moins d'impact sur le test au premier niveau.
+            </p>
+            <p>
+                Parce que la sortie XML peut venir de n'importe où,
+                ça ouvre des possibilités d'agrégation d'exécutions de test
+                depuis des serveur distants.
+                Un scénario de test pour le réaliser existe déjà
+                à l'intérieur du framework SimpleTest, mais il est encore expérimental...
+<pre>
+&lt;?php
+<strong>require_once('../remote.php');</strong>
+require_once('simpletest/autorun.php');
+    
+$test_url = ...;
+$dry_url = ...;
+
+class MyTestOnAnotherServer extends RemoteTestCase {
+    function __construct() {
+        $test_url = ...
+        parent::__construct($test_url, $test_url . ' --dry');
+    }
+}
+?&gt;
+</pre>
+                <span class="new_code">RemoteTestCase</span> prend la localisation réelle
+                du lanceur de test, tout simplement un page web au format XML.
+                Il prend aussi l'URL d'un rapporteur initié
+                pour effectuer une exécution sèche.
+                Cette technique est employée pour que les progrès
+                soient correctement rapportés vers le haut.
+                <span class="new_code">RemoteTestCase</span> peut être ajouté à
+                une suite de test comme n'importe quelle autre suite de tests.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            L'<a href="http://simpletest.org/api/">API pour développeur de SimpleTest</a>
+            donne tous les détails sur les classes et les assertions disponibles.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/unit_test_documentation.html b/3rdparty/simpletest/docs/fr/unit_test_documentation.html
new file mode 100644
index 00000000000..a7c31f95dbb
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/unit_test_documentation.html
@@ -0,0 +1,447 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest pour les tests de régression en PHP</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur les tests unitaires en PHP</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#unitaire">Scénarios de test unitaire</a>
+            et opérations basiques.
+        </li>
+<li>
+            <a href="#extension_unitaire">Étendre des scénarios de test</a>
+            pour les personnaliser à votre propre projet.
+        </li>
+<li>
+            <a href="#lancement_unitaire">Lancer un scénario seul</a>
+            comme un script unique.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="unitaire"></a>Scénarios de tests unitaires</h2>
+            <p>
+                Le coeur du système est un framework de tests de régression
+                construit autour des scénarios de test.
+                Un exemple de scénario de test ressemble à...
+<pre>
+<strong>class FileTestCase extends UnitTestCase {
+}</strong>
+</pre>
+                Si aucun nom de test n'est fourni au moment
+                de la liaison avec le constructeur alors
+                le nom de la classe sera utilisé.
+                Il s'agit du nom qui sera affiché dans les résultats du test.
+            </p>
+            <p>
+                Les véritables tests sont ajoutés en tant que méthode
+                dans le scénario de test dont le nom par défaut
+                commence par la chaîne "test"
+                et quand le scénario de test est appelé toutes les méthodes
+                de ce type sont exécutées dans l'ordre utilisé
+                par l'introspection de PHP pour les trouver.
+                Peuvent être ajoutées autant de méthodes de test que nécessaires.
+                Par exemple...
+<pre>
+require_once('simpletest/autorun.php');
+require_once('../classes/writer.php');
+
+class FileTestCase extends UnitTestCase {
+    function FileTestCase() {
+        $this-&gt;UnitTestCase('File test');
+    }<strong>
+
+    function setUp() {
+        @unlink('../temp/test.txt');
+    }
+
+    function tearDown() {
+        @unlink('../temp/test.txt');
+    }
+
+    function testCreation() {
+        $writer = &amp;new FileWriter('../temp/test.txt');
+        $writer-&gt;write('Hello');
+        $this-&gt;assertTrue(file_exists('../temp/test.txt'), 'File created');
+    }</strong>
+}
+</pre>
+                Le constructeur est optionnel et souvent omis. Sans nom,
+                le nom de la classe est utilisé comme nom pour le scénario de test.
+            </p>
+            <p>
+                Notre unique méthode de test pour le moment est
+                <span class="new_code">testCreation()</span> où nous vérifions
+                qu'un fichier a bien été créé par notre objet
+                <span class="new_code">Writer</span>. Nous pourrions avoir mis
+                le code <span class="new_code">unlink()</span> dans cette méthode,
+                mais en la plaçant dans <span class="new_code">setUp()</span>
+                et <span class="new_code">tearDown()</span> nous pouvons l'utiliser
+                pour nos autres méthodes de test que nous ajouterons.
+            </p>
+            <p>
+                La méthode <span class="new_code">setUp()</span> est lancé
+                juste avant chaque méthode de test.
+                <span class="new_code">tearDown()</span> est lancé après chaque méthode de test.
+            </p>
+            <p>
+                Vous pouvez placer une initialisation de
+                scénario de test dans le constructeur afin qu'elle soit lancée
+                pour toutes les méthodes dans le scénario de test
+                mais dans un tel cas vous vous exposeriez à des interférences.
+                Cette façon de faire est légèrement moins rapide,
+                mais elle est plus sûre.
+                Notez que si vous arrivez avec des notions de JUnit,
+                il ne s'agit pas du comportement auquel vous êtes habitués.
+                Bizarrement JUnit re-instancie le scénario de test
+                pour chaque méthode de test pour se prévenir
+                d'une telle interférence.
+                SimpleTest demande à l'utilisateur final d'utiliser
+                <span class="new_code">setUp()</span>, mais fournit aux codeurs de bibliothèque d'autres crochets.
+            </p>
+            <p>
+                Pour rapporter les résultats de test,
+                le passage par une classe d'affichage - notifiée par
+                les différentes méthodes de type <span class="new_code">assert...()</span> -
+                est utilisée. En voici la liste complète pour
+                la classe <span class="new_code">UnitTestCase</span>,
+                celle par défaut dans SimpleTest...
+            <table><tbody>
+                <tr>
+<td><span class="new_code">assertTrue($x)</span></td>
+<td>Echoue si $x est faux</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertFalse($x)</span></td>
+<td>Echoue si $x est vrai</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertNull($x)</span></td>
+<td>Echoue si $x est initialisé</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertNotNull($x)</span></td>
+<td>Echoue si $x n'est pas initialisé</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertIsA($x, $t)</span></td>
+<td>Echoue si $x n'est pas de la classe ou du type $t</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertEqual($x, $y)</span></td>
+<td>Echoue si $x == $y est faux</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertNotEqual($x, $y)</span></td>
+<td>Echoue si $x == $y est vrai</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertIdentical($x, $y)</span></td>
+<td>Echoue si $x === $y est faux</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertNotIdentical($x, $y)</span></td>
+<td>Echoue si $x === $y est vrai</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertReference($x, $y)</span></td>
+<td>Echoue sauf si $x et $y sont la même variable</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertCopy($x, $y)</span></td>
+<td>Echoue si $x et $y sont la même variable</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertPattern($p, $x)</span></td>
+<td>Echoue sauf si l'expression rationnelle $p capture $x</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertNoPattern($p, $x)</span></td>
+<td>Echoue si l'expression rationnelle $p capture $x</td>
+</tr>
+                <tr>
+<td><span class="new_code">expectError($x)</span></td>
+<td>Echoue si l'erreur correspondante n'arrive pas</td>
+</tr>
+                <tr>
+<td><span class="new_code">expectException($x)</span></td>
+<td>Echoue si l'exception correspondante n'est pas levée</td>
+</tr>
+                <tr>
+<td><span class="new_code">ignoreException($x)</span></td>
+<td>Avale toutes les exceptions correspondantes qui surviendraient</td>
+</tr>
+                <tr>
+<td><span class="new_code">assert($e)</span></td>
+<td>Echoue sur un objet <a href="expectation_documentation.html">attente</a> $e qui échouerait</td>
+</tr>
+            </tbody></table>
+                Toutes les méthodes d'assertion peuvent recevoir
+                une description optionnelle :
+                cette description sert pour étiqueter le résultat.
+                Sans elle, une message par défaut est envoyée à la place :
+                il est généralement suffisant.
+                Ce message par défaut peut encore être encadré
+                dans votre propre message si vous incluez "%s"
+                dans la chaîne.
+                Toutes les assertions renvoient vrai / true en cas de succès
+                et faux / false en cas d'échec.
+            </p>
+            <p>
+                D'autres exemples...
+<pre>
+<strong>$variable = null;
+$this-&gt;assertNull($variable, 'Should be cleared');</strong>
+</pre>
+                ...passera et normalement n'affichera aucun message.
+                Si vous avez <a href="http://www.lastcraft.com/display_subclass_tutorial.php">
+                configuré le testeur pour afficher aussi les succès</a>
+                alors le message sera affiché comme tel.
+<pre>
+<strong>$this-&gt;assertIdentical(0, false, 'Zero is not false [%s]');</strong>
+</pre>
+                Ceci échouera étant donné qu'il effectue une vérification
+                sur le type en plus d'une comparaison sur les deux valeurs.
+                La partie "%s" est remplacée par le message d'erreur
+                par défaut qui aurait été affiché si nous n'avions pas fourni le nôtre.
+                Cela nous permet d'emboîter les messages de test.
+<pre>
+<strong>$a = 1;
+$b = $a;
+$this-&gt;assertReference($a, $b);</strong>
+</pre>
+                Échouera étant donné que la variable <span class="new_code">$b</span>
+                est une copie de <span class="new_code">$a</span>.
+<pre>
+<strong>$this-&gt;assertPattern('/hello/i', 'Hello world');</strong>
+</pre>
+                Là, ça passe puisque la recherche est insensible
+                à la casse et que donc <span class="new_code">hello</span>
+                est bien repérable dans <span class="new_code">Hello world</span>.
+<pre>
+<strong>$this-&gt;expectError();</strong>
+trigger_error('Catastrophe');
+</pre>
+                Ici la vérification attrape le message "Catastrophe"
+				sans vérifier le texte et passe.
+				Elle enlève l'erreur de la queue au passage.
+<pre>
+<strong>$this-&gt;expectError('Catastrophe');</strong>
+trigger_error('Catastrophe');
+</pre>
+                La vérification d'erreur suivante teste non seulement
+				l'existance de l'erreur mais aussi le texte qui,
+				dans le cas présent, correspond et donc un nouveau succès.
+				Si des erreurs non vérifiées sont laissées pour compte
+				à la fin d'une méthode de test alors un exception sera levé
+				dans le test.
+            </p>
+            <p>
+                Notez que SimpleTest ne peut pas attraper des erreurs PHP
+				au moment de la compilation.
+            </p>
+            <p>
+                Les scénarios de tests peuvent utiliser des méthodes
+                bien pratiques pour déboguer le code ou pour étendre la suite...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setUp()</span></td>
+<td>Est lancée avant chaque méthode de test</td>
+</tr>
+                    <tr>
+<td><span class="new_code">tearDown()</span></td>
+<td>Est lancée après chaque méthode de test</td>
+</tr>
+                    <tr>
+<td><span class="new_code">pass()</span></td>
+<td>Envoie un succès</td>
+</tr>
+                    <tr>
+<td><span class="new_code">fail()</span></td>
+<td>Envoie un échec</td>
+</tr>
+                    <tr>
+<td><span class="new_code">error()</span></td>
+<td>Envoi un évènement exception</td>
+</tr>
+                    <tr>
+<td><span class="new_code">signal($type, $payload)</span></td>
+<td>Envoie un message défini par l'utilisateur au rapporteur du test</td>
+</tr>
+                    <tr>
+<td><span class="new_code">dump($var)</span></td>
+<td>Effectue un <span class="new_code">print_r()</span> formaté pour du déboguage rapide et grossier</td>
+</tr>
+                </tbody></table>
+            </p>
+        
+        <h2>
+<a class="target" name="extension_unitaire"></a>Etendre les scénarios de test</h2>
+            <p>
+                Bien sûr des méthodes supplémentaires de test
+                peuvent être ajoutées pour créer d'autres types
+                de scénario de test afin d'étendre le framework...
+<pre>
+require_once('simpletest/autorun.php');
+<strong>
+class FileTester extends UnitTestCase {
+    function FileTester($name = false) {
+        $this-&gt;UnitTestCase($name);
+    }
+
+    function assertFileExists($filename, $message = '%s') {
+        $this-&gt;assertTrue(
+                file_exists($filename),
+                sprintf($message, 'File [$filename] existence check'));
+    }</strong>
+}
+</pre>
+                Ici la bibliothèque SimpleTest est localisée
+                dans un répertoire local appelé <em>simpletest</em>.
+                Pensez à le modifier pour votre propre environnement.
+            </p>
+            <p>
+                Alternativement vous pourriez utiliser dans votre code
+                un directive <span class="new_code">SimpleTestOptions::ignore('FileTester');</span>.
+            </p>
+            <p>
+                Ce nouveau scénario peut être hérité exactement
+                comme un scénario de test classique...
+<pre>
+class FileTestCase extends <strong>FileTester</strong> {
+
+    function setUp() {
+        @unlink('../temp/test.txt');
+    }
+
+    function tearDown() {
+        @unlink('../temp/test.txt');
+    }
+
+    function testCreation() {
+        $writer = &amp;new FileWriter('../temp/test.txt');
+        $writer-&gt;write('Hello');<strong>
+        $this-&gt;assertFileExists('../temp/test.txt');</strong>
+    }
+}
+</pre>
+            </p>
+            <p>
+                Si vous souhaitez un scénario de test sans
+                toutes les assertions de <span class="new_code">UnitTestCase</span>
+                mais uniquement avec les vôtres propres,
+                vous aurez besoin d'étendre la classe
+                <span class="new_code">SimpleTestCase</span> à la place.
+                Elle se trouve dans <em>simple_test.php</em>
+                en lieu et place de <em>unit_tester.php</em>.
+                A consulter <a href="group_test_documentation.html">plus tard</a>
+                si vous souhaitez incorporer les scénarios
+                d'autres testeurs unitaires dans votre suite de test.
+            </p>
+        
+        <h2>
+<a class="target" name="lancement_unitaire"></a>Lancer un unique scénario de test</h2>
+            <p>
+                Ce n'est pas souvent qu'il faille lancer des scénarios
+                avec un unique test. Sauf lorsqu'il s'agit de s'arracher
+                les cheveux sur un module à problème sans pour
+                autant désorganiser la suite de test principale.
+                Avec <em>autorun</em> aucun échafaudage particulier
+                n'est nécessaire, il suffit de lancer votre test et
+                vous y êtes.
+            </p>
+            <p>
+                Vous pouvez même décider quel rapporteur
+                (par exemple, <span class="new_code">TextReporter</span> ou <span class="new_code">HtmlReporter</span>)
+                vous préférez pour un fichier spécifique quand il est lancé
+                tout seul...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');<strong>
+SimpleTest :: prefer(new TextReporter());</strong>
+require_once('../classes/writer.php');
+
+class FileTestCase extends UnitTestCase {
+    ...
+}
+?&gt;
+</pre>
+                Ce script sera lancé tel que mais il n'y aura
+                aucun succès ou échec avant que des méthodes de test soient ajoutées.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page de SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API complète de SimpleTest</a>
+            à partir de PHPDoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/web_tester_documentation.html b/3rdparty/simpletest/docs/fr/web_tester_documentation.html
new file mode 100644
index 00000000000..308fbc9ccbb
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/web_tester_documentation.html
@@ -0,0 +1,570 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : tester des scripts web</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur le testeur web</h1>
+        This page...
+        <ul>
+<li>
+            Réussir à <a href="#telecharger">télécharger une page web</a>
+        </li>
+<li>
+            Tester le <a href="#contenu">contenu de la page</a>
+        </li>
+<li>
+            <a href="#navigation">Naviguer sur un site web</a> pendant le test
+        </li>
+<li>
+            Méthodes pour <a href="#requete">modifier une requête</a> et pour déboguer
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="telecharger"></a>Télécharger une page</h2>
+            <p>
+                Tester des classes c'est très bien.
+                Reste que PHP est avant tout un langage
+                pour créer des fonctionnalités à l'intérieur de pages web.
+                Comment pouvons tester la partie de devant
+                -- celle de l'interface -- dans nos applications en PHP ?
+                Etant donné qu'une page web n'est constituée que de texte,
+                nous devrions pouvoir les examiner exactement
+                comme n'importe quelle autre donnée de test.
+            </p>
+            <p>
+                Cela nous amène à une situation délicate.
+                Si nous testons dans un niveau trop bas,
+                vérifier des balises avec un motif ad hoc par exemple,
+                nos tests seront trop fragiles. Le moindre changement
+                dans la présentation pourrait casser un grand nombre de test.
+                Si nos tests sont situés trop haut, en utilisant
+                une version fantaisie du moteur de template pour
+                donner un cas précis, alors nous perdons complètement
+                la capacité à automatiser certaines classes de test.
+                Par exemple, l'interaction entre des formulaires
+                et la navigation devra être testé manuellement.
+                Ces types de test sont extrêmement fastidieux
+                et plutôt sensibles aux erreurs.
+            </p>
+            <p>
+                SimpleTest comprend une forme spéciale de scénario
+                de test pour tester les actions d'une page web.
+                <span class="new_code">WebTestCase</span> inclut des facilités pour la navigation,
+                des vérifications sur le contenu
+                et les cookies ainsi que la gestion des formulaires.
+                Utiliser ces scénarios de test ressemble
+                fortement à <span class="new_code">UnitTestCase</span>...
+<pre>
+<strong>class TestOfLastcraft extends WebTestCase {
+}</strong>
+</pre>
+                Ici nous sommes sur le point de tester
+                le site de <a href="http://www.lastcraft.com/">Last Craft</a>.
+                Si ce scénario de test est situé dans un fichier appelé
+                <em>lastcraft_test.php</em> alors il peut être chargé
+                dans un script de lancement tout comme des tests unitaires...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');<strong>
+require_once('simpletest/web_tester.php');</strong>
+SimpleTest::prefer(new TextReporter());
+
+class WebTests extends TestSuite {
+    function WebTests() {
+        $this-&gt;TestSuite('Web site tests');<strong>
+        $this-&gt;addFile('lastcraft_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                J'utilise ici le rapporteur en mode texte
+                pour mieux distinguer le contenu au format HTML
+                du résultat du test proprement dit.
+            </p>
+            <p>
+                Rien n'est encore testé. Nous pouvons télécharger
+                la page d'accueil en utilisant la méthode <span class="new_code">get()</span>...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    <strong>
+    function testHomepage() {
+        $this-&gt;assertTrue($this-&gt;get('http://www.lastcraft.com/'));
+    }</strong>
+}
+</pre>
+                La méthode <span class="new_code">get()</span> renverra "true"
+                uniquement si le contenu de la page a bien été téléchargé.
+                C'est un moyen simple, mais efficace pour vérifier
+                qu'une page web a bien été délivré par le serveur web.
+                Cependant le contenu peut révéler être une erreur 404
+                et dans ce cas notre méthode <span class="new_code">get()</span> renverrait encore un succès.
+            </p>
+            <p>
+                En supposant que le serveur web pour le site Last Craft
+                soit opérationnel (malheureusement ce n'est pas toujours le cas),
+                nous devrions voir...
+<pre class="shell">
+Web site tests
+OK
+Test cases run: 1/1, Failures: 0, Exceptions: 0
+</pre>
+                Nous avons vérifié qu'une page, de n'importe quel type,
+                a bien été renvoyée. Nous ne savons pas encore
+                s'il s'agit de celle que nous souhaitions.
+            </p>
+        
+        <h2>
+<a class="target" name="contenu"></a>Tester le contenu d'une page</h2>
+            <p>
+                Pour obtenir la confirmation que la page téléchargée
+                est bien celle que nous attendions,
+                nous devons vérifier son contenu.
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {<strong>
+        $this-&gt;get('http://www.lastcraft.com/');
+        $this-&gt;assertWantedPattern('/why the last craft/i');</strong>
+    }
+}
+</pre>
+                La page obtenue par le dernier téléchargement est
+                placée dans un buffer au sein même du scénario de test.
+                Il n'est donc pas nécessaire de s'y référer directement.
+                La correspondance du motif est toujours effectuée
+                par rapport à ce buffer.
+            </p>
+            <p>
+                Voici une liste possible d'assertions sur le contenu...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">assertWantedPattern($pattern)</span></td>
+<td>Vérifier une correspondance sur le contenu via une expression rationnelle Perl</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoUnwantedPattern($pattern)</span></td>
+<td>Une expression rationnelle Perl pour vérifier une absence</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertTitle($title)</span></td>
+<td>Passe si le titre de la page correspond exactement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertLink($label)</span></td>
+<td>Passe si un lien avec ce texte est présent</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoLink($label)</span></td>
+<td>Passe si aucun lien avec ce texte est présent</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertLinkById($id)</span></td>
+<td>Passe si un lien avec cet attribut d'identification est présent</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertField($name, $value)</span></td>
+<td>Passe si une balise input avec ce nom contient cette valeur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertFieldById($id, $value)</span></td>
+<td>Passe si une balise input avec cet identifiant contient cette valeur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertResponse($codes)</span></td>
+<td>Passe si la réponse HTTP trouve une correspondance dans la liste</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertMime($types)</span></td>
+<td>Passe si le type MIME se retrouve dans cette liste</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertAuthentication($protocol)</span></td>
+<td>Passe si l'authentification provoquée est de ce type de protocole</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoAuthentication()</span></td>
+<td>Passe s'il n'y pas d'authentification provoquée en cours</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertRealm($name)</span></td>
+<td>Passe si le domaine provoqué correspond</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertHeader($header, $content)</span></td>
+<td>Passe si une entête téléchargée correspond à cette valeur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoUnwantedHeader($header)</span></td>
+<td>Passe si une entête n'a pas été téléchargé</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertHeaderPattern($header, $pattern)</span></td>
+<td>Passe si une entête téléchargée correspond à cette expression rationnelle Perl</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertCookie($name, $value)</span></td>
+<td>Passe s'il existe un cookie correspondant</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoCookie($name)</span></td>
+<td>Passe s'il n'y a pas de cookie avec un tel nom</td>
+</tr>
+                </tbody></table>
+                Comme d'habitude avec les assertions de SimpleTest,
+                elles renvoient toutes "false" en cas d'échec
+                et "true" si c'est un succès.
+                Elles renvoient aussi un message de test optionnel :
+                vous pouvez l'ajouter dans votre propre message en utilisant "%s".
+            </p>
+            <p>
+                A présent nous pourrions effectué le test sur le titre uniquement...
+<pre>
+<strong>$this-&gt;assertTitle('The Last Craft?');</strong>
+</pre>
+                En plus d'une simple vérification sur le contenu HTML,
+                nous pouvons aussi vérifier que le type MIME est bien d'un type acceptable...
+<pre>
+<strong>$this-&gt;assertMime(array('text/plain', 'text/html'));</strong>
+</pre>
+                Plus intéressant encore est la vérification sur
+                le code de la réponse HTTP. Pareillement au type MIME,
+                nous pouvons nous assurer que le code renvoyé se trouve
+                bien dans un liste de valeurs possibles...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {
+        $this-&gt;get('http://simpletest.sourceforge.net/');<strong>
+        $this-&gt;assertResponse(200);</strong>
+    }
+}
+</pre>
+                Ici nous vérifions que le téléchargement s'est
+                bien terminé en ne permettant qu'une réponse HTTP 200.
+                Ce test passera, mais ce n'est pas la meilleure façon de procéder.
+                Il n'existe aucune page sur <em>http://simpletest.sourceforge.net/</em>,
+                à la place le serveur renverra une redirection vers
+                <em>http://www.lastcraft.com/simple_test.php</em>.
+                <span class="new_code">WebTestCase</span> suit automatiquement trois
+                de ces redirections. Les tests sont quelque peu plus
+                robustes de la sorte. Surtout qu'on est souvent plus intéressé
+                par l'interaction entre les pages que de leur simple livraison.
+                Si les redirections se révèlent être digne d'intérêt,
+                il reste possible de les supprimer...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {<strong>
+        $this-&gt;setMaximumRedirects(0);</strong>
+        $this-&gt;get('http://simpletest.sourceforge.net/');
+        $this-&gt;assertResponse(200);
+    }
+}
+</pre>
+                Alors l'assertion échoue comme prévue...
+<pre class="shell">
+Web site tests
+1) Expecting response in [200] got [302]
+    in testhomepage
+    in testoflastcraft
+    in lastcraft_test.php
+FAILURES!!!
+Test cases run: 1/1, Failures: 1, Exceptions: 0
+</pre>
+                Nous pouvons modifier le test pour accepter les redirections...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {
+        $this-&gt;setMaximumRedirects(0);
+        $this-&gt;get('http://simpletest.sourceforge.net/');
+        $this-&gt;assertResponse(<strong>array(301, 302, 303, 307)</strong>);
+    }
+}
+</pre>
+                Maitenant ça passe.
+            </p>
+        
+        <h2>
+<a class="target" name="navigation"></a>Navigeur dans un site web</h2>
+            <p>
+                Les utilisateurs ne naviguent pas souvent en tapant les URLs,
+                mais surtout en cliquant sur des liens et des boutons.
+                Ici nous confirmons que les informations sur le contact
+                peuvent être atteintes depuis la page d'accueil...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    ...
+    function testContact() {
+        $this-&gt;get('http://www.lastcraft.com/');<strong>
+        $this-&gt;clickLink('About');
+        $this-&gt;assertTitle('About Last Craft');</strong>
+    }
+}
+</pre>
+                Le paramètre est le texte du lien.
+            </p>
+            <p>
+                Il l'objectif est un bouton plutôt qu'une balise ancre,
+                alors <span class="new_code">clickSubmit()</span> doit être utilisé avec
+                le titre du bouton...
+<pre>
+<strong>$this-&gt;clickSubmit('Go!');</strong>
+</pre>
+            </p>
+            <p>
+                La liste des méthodes de navigation est...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">get($url, $parameters)</span></td>
+<td>Envoie une requête GET avec ces paramètres</td>
+</tr>
+                    <tr>
+<td><span class="new_code">post($url, $parameters)</span></td>
+<td>Envoie une requête POST avec ces paramètres</td>
+</tr>
+                    <tr>
+<td><span class="new_code">head($url, $parameters)</span></td>
+<td>Envoie une requête HEAD sans remplacer le contenu de la page</td>
+</tr>
+                    <tr>
+<td><span class="new_code">retry()</span></td>
+<td>Relance la dernière requête</td>
+</tr>
+                    <tr>
+<td><span class="new_code">back()</span></td>
+<td>Identique au bouton "Précédent" du navigateur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">forward()</span></td>
+<td>Identique au bouton "Suivant" du navigateur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">authenticate($name, $password)</span></td>
+<td>Re-essaye avec une tentative d'authentification</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFrameFocus()</span></td>
+<td>Le nom de la fenêtre en cours d'utilisation</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocusByIndex($choice)</span></td>
+<td>Change le focus d'une fenêtre en commençant par 1</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocus($name)</span></td>
+<td>Change le focus d'une fenêtre en utilisant son nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clearFrameFocus()</span></td>
+<td>Revient à un traitement de toutes les fenêtres comme une seule</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmit($label)</span></td>
+<td>Clique sur le premier bouton avec cette étiquette</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitByName($name)</span></td>
+<td>Clique sur le bouton avec cet attribut de nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitById($id)</span></td>
+<td>Clique sur le bouton avec cet attribut d'identification</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImage($label, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son titre (title="*") our son texte alternatif (alt="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageByName($name, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son attribut (name="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageById($id, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son identifiant (id="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">submitFormById($id)</span></td>
+<td>Soumet un formulaire sans valeur de soumission</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLink($label, $index)</span></td>
+<td>Clique sur une ancre avec ce texte d'étiquette visible</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLinkById($id)</span></td>
+<td>Clique sur une ancre avec cet attribut d'identification</td>
+</tr>
+                </tbody></table>
+            </p>
+            <p>
+                Les paramètres dans les méthodes <span class="new_code">get()</span>, 
+                <span class="new_code">post()</span> et <span class="new_code">head()</span> sont optionnels.
+                Le téléchargement via  HTTP HEAD ne modifie pas
+                le contexte du navigateur, il se limite au chargement des cookies.
+                Cela peut être utilise lorsqu'une image ou une feuille de style
+                initie un cookie pour bloquer un robot trop entreprenant.
+            </p>
+            <p>
+                Les commandes <span class="new_code">retry()</span>, <span class="new_code">back()</span>
+                et <span class="new_code">forward()</span> fonctionnent exactement comme
+                dans un navigateur. Elles utilisent l'historique pour
+                relancer les pages. Une technique bien pratique pour
+                vérifier les effets d'un bouton retour sur vos formulaires.
+            </p>
+            <p>
+                Les méthodes sur les fenêtres méritent une petite explication.
+                Par défaut, une page avec des fenêtres est traitée comme toutes
+                les autres. Le contenu sera vérifié à travers l'ensemble de
+                la "frameset", par conséquent un lien fonctionnera,
+                peu importe la fenêtre qui contient la balise ancre.
+                Vous pouvez outrepassé ce comportement en exigeant
+                le focus sur une unique fenêtre. Si vous réalisez cela,
+                toutes les recherches et toutes les actions se limiteront
+                à cette unique fenêtre, y compris les demandes d'authentification.
+                Si un lien ou un bouton n'est pas dans la fenêtre en focus alors
+                il ne peut pas être cliqué.
+            </p>
+            <p>
+                Tester la navigation sur des pages fixes ne vous alerte que
+                quand vous avez cassé un script entier.
+                Pour des pages fortement dynamiques,
+                un forum de discussion par exemple,
+                ça peut être crucial pour vérifier l'état de l'application.
+                Pour la plupart des applications cependant,
+                la logique vraiment délicate se situe dans la gestion
+                des formulaires et des sessions.
+                Heureusement SimpleTest aussi inclut
+                <a href="form_testing_documentation.html">
+                des outils pour tester des formulaires web</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="requete"></a>Modifier la requête</h2>
+            <p>
+                Bien que SimpleTest n'ait pas comme objectif
+                de contrôler des erreurs réseau, il contient quand même
+                des méthodes pour modifier et déboguer les requêtes qu'il lance.
+                Voici une autre liste de méthode...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">getTransportError()</span></td>
+<td>La dernière erreur de socket</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>La localisation courante</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showRequest()</span></td>
+<td>Déverse la requête sortante</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showHeaders()</span></td>
+<td>Déverse les entêtes d'entrée</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showSource()</span></td>
+<td>Déverse le contenu brut de la page HTML</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreFrames()</span></td>
+<td>Ne recharge pas les framesets</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setCookie($name, $value)</span></td>
+<td>Initie un cookie à partir de maintenant</td>
+</tr>
+                    <tr>
+<td><span class="new_code">addHeader($header)</span></td>
+<td>Ajoute toujours cette entête à la requête</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumRedirects($max)</span></td>
+<td>S'arrête après autant de redirections</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setConnectionTimeout($timeout)</span></td>
+<td>Termine la connexion après autant de temps entre les bytes</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useProxy($proxy, $name, $password)</span></td>
+<td>Effectue les requêtes à travers ce proxy d'URL</td>
+</tr>
+                </tbody></table>
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API du développeur pour SimpleTest</a>
+            donne tous les détails sur les classes et les assertions disponibles.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/dumper.php b/3rdparty/simpletest/dumper.php
new file mode 100755
index 00000000000..339923c224f
--- /dev/null
+++ b/3rdparty/simpletest/dumper.php
@@ -0,0 +1,407 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: dumper.php 1909 2009-07-29 15:58:11Z dgheath $
+ */
+/**
+ * does type matter
+ */
+if (! defined('TYPE_MATTERS')) {
+    define('TYPE_MATTERS', true);
+}
+
+/**
+ *    Displays variables as text and does diffs.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleDumper {
+
+    /**
+     *    Renders a variable in a shorter form than print_r().
+     *    @param mixed $value      Variable to render as a string.
+     *    @return string           Human readable string form.
+     *    @access public
+     */
+    function describeValue($value) {
+        $type = $this->getType($value);
+        switch($type) {
+            case "Null":
+                return "NULL";
+            case "Boolean":
+                return "Boolean: " . ($value ? "true" : "false");
+            case "Array":
+                return "Array: " . count($value) . " items";
+            case "Object":
+                return "Object: of " . get_class($value);
+            case "String":
+                return "String: " . $this->clipString($value, 200);
+            default:
+                return "$type: $value";
+        }
+        return "Unknown";
+    }
+
+    /**
+     *    Gets the string representation of a type.
+     *    @param mixed $value    Variable to check against.
+     *    @return string         Type.
+     *    @access public
+     */
+    function getType($value) {
+        if (! isset($value)) {
+            return "Null";
+        } elseif (is_bool($value)) {
+            return "Boolean";
+        } elseif (is_string($value)) {
+            return "String";
+        } elseif (is_integer($value)) {
+            return "Integer";
+        } elseif (is_float($value)) {
+            return "Float";
+        } elseif (is_array($value)) {
+            return "Array";
+        } elseif (is_resource($value)) {
+            return "Resource";
+        } elseif (is_object($value)) {
+            return "Object";
+        }
+        return "Unknown";
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between two variables. Uses a
+     *    dynamic call.
+     *    @param mixed $first        First variable.
+     *    @param mixed $second       Value to compare with.
+     *    @param boolean $identical  If true then type anomolies count.
+     *    @return string             Description of difference.
+     *    @access public
+     */
+    function describeDifference($first, $second, $identical = false) {
+        if ($identical) {
+            if (! $this->isTypeMatch($first, $second)) {
+                return "with type mismatch as [" . $this->describeValue($first) .
+                    "] does not match [" . $this->describeValue($second) . "]";
+            }
+        }
+        $type = $this->getType($first);
+        if ($type == "Unknown") {
+            return "with unknown type";
+        }
+        $method = 'describe' . $type . 'Difference';
+        return $this->$method($first, $second, $identical);
+    }
+
+    /**
+     *    Tests to see if types match.
+     *    @param mixed $first        First variable.
+     *    @param mixed $second       Value to compare with.
+     *    @return boolean            True if matches.
+     *    @access private
+     */
+    protected function isTypeMatch($first, $second) {
+        return ($this->getType($first) == $this->getType($second));
+    }
+
+    /**
+     *    Clips a string to a maximum length.
+     *    @param string $value         String to truncate.
+     *    @param integer $size         Minimum string size to show.
+     *    @param integer $position     Centre of string section.
+     *    @return string               Shortened version.
+     *    @access public
+     */
+    function clipString($value, $size, $position = 0) {
+        $length = strlen($value);
+        if ($length <= $size) {
+            return $value;
+        }
+        $position = min($position, $length);
+        $start = ($size/2 > $position ? 0 : $position - $size/2);
+        if ($start + $size > $length) {
+            $start = $length - $size;
+        }
+        $value = substr($value, $start, $size);
+        return ($start > 0 ? "..." : "") . $value . ($start + $size < $length ? "..." : "");
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between two variables. The minimal
+     *    version.
+     *    @param null $first          First value.
+     *    @param mixed $second        Value to compare with.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeGenericDifference($first, $second) {
+        return "as [" . $this->describeValue($first) .
+                "] does not match [" .
+                $this->describeValue($second) . "]";
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between a null and another variable.
+     *    @param null $first          First null.
+     *    @param mixed $second        Null to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeNullDifference($first, $second, $identical) {
+        return $this->describeGenericDifference($first, $second);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between a boolean and another variable.
+     *    @param boolean $first       First boolean.
+     *    @param mixed $second        Boolean to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeBooleanDifference($first, $second, $identical) {
+        return $this->describeGenericDifference($first, $second);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between a string and another variable.
+     *    @param string $first        First string.
+     *    @param mixed $second        String to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeStringDifference($first, $second, $identical) {
+        if (is_object($second) || is_array($second)) {
+            return $this->describeGenericDifference($first, $second);
+        }
+        $position = $this->stringDiffersAt($first, $second);
+        $message = "at character $position";
+        $message .= " with [" .
+                $this->clipString($first, 200, $position) . "] and [" .
+                $this->clipString($second, 200, $position) . "]";
+        return $message;
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between an integer and another variable.
+     *    @param integer $first       First number.
+     *    @param mixed $second        Number to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeIntegerDifference($first, $second, $identical) {
+        if (is_object($second) || is_array($second)) {
+            return $this->describeGenericDifference($first, $second);
+        }
+        return "because [" . $this->describeValue($first) .
+                "] differs from [" .
+                $this->describeValue($second) . "] by " .
+                abs($first - $second);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between two floating point numbers.
+     *    @param float $first         First float.
+     *    @param mixed $second        Float to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeFloatDifference($first, $second, $identical) {
+        if (is_object($second) || is_array($second)) {
+            return $this->describeGenericDifference($first, $second);
+        }
+        return "because [" . $this->describeValue($first) .
+                "] differs from [" .
+                $this->describeValue($second) . "] by " .
+                abs($first - $second);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between two arrays.
+     *    @param array $first         First array.
+     *    @param mixed $second        Array to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeArrayDifference($first, $second, $identical) {
+        if (! is_array($second)) {
+            return $this->describeGenericDifference($first, $second);
+        }
+        if (! $this->isMatchingKeys($first, $second, $identical)) {
+            return "as key list [" .
+                    implode(", ", array_keys($first)) . "] does not match key list [" .
+                    implode(", ", array_keys($second)) . "]";
+        }
+        foreach (array_keys($first) as $key) {
+            if ($identical && ($first[$key] === $second[$key])) {
+                continue;
+            }
+            if (! $identical && ($first[$key] == $second[$key])) {
+                continue;
+            }
+            return "with member [$key] " . $this->describeDifference(
+                    $first[$key],
+                    $second[$key],
+                    $identical);
+        }
+        return "";
+    }
+
+    /**
+     *    Compares two arrays to see if their key lists match.
+     *    For an identical match, the ordering and types of the keys
+     *    is significant.
+     *    @param array $first         First array.
+     *    @param array $second        Array to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return boolean             True if matching.
+     *    @access private
+     */
+    protected function isMatchingKeys($first, $second, $identical) {
+        $first_keys = array_keys($first);
+        $second_keys = array_keys($second);
+        if ($identical) {
+            return ($first_keys === $second_keys);
+        }
+        sort($first_keys);
+        sort($second_keys);
+        return ($first_keys == $second_keys);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between a resource and another variable.
+     *    @param resource $first       First resource.
+     *    @param mixed $second         Resource to compare with.
+     *    @param boolean $identical    If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeResourceDifference($first, $second, $identical) {
+        return $this->describeGenericDifference($first, $second);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between two objects.
+     *    @param object $first        First object.
+     *    @param mixed $second        Object to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     */
+    protected function describeObjectDifference($first, $second, $identical) {
+        if (! is_object($second)) {
+            return $this->describeGenericDifference($first, $second);
+        }
+        return $this->describeArrayDifference(
+                $this->getMembers($first),
+                $this->getMembers($second),
+                $identical);
+    }
+
+    /**
+     *    Get all members of an object including private and protected ones.
+     *    A safer form of casting to an array.
+     *    @param object $object     Object to list members of,
+     *                              including private ones.
+     *    @return array             Names and values in the object.
+     */
+    protected function getMembers($object) {
+        $reflection = new ReflectionObject($object);
+        $members = array();
+        foreach ($reflection->getProperties() as $property) {
+            if (method_exists($property, 'setAccessible')) {
+                $property->setAccessible(true);
+            }
+            try {
+                $members[$property->getName()] = $property->getValue($object);
+            } catch (ReflectionException $e) {
+                $members[$property->getName()] =
+                    $this->getPrivatePropertyNoMatterWhat($property->getName(), $object);
+            }
+        }
+        return $members;
+    }
+
+    /**
+     *    Extracts a private member's value when reflection won't play ball.
+     *    @param string $name        Property name.
+     *    @param object $object      Object to read.
+     *    @return mixed              Value of property.
+     */
+    private function getPrivatePropertyNoMatterWhat($name, $object) {
+        foreach ((array)$object as $mangled_name => $value) {
+            if ($this->unmangle($mangled_name) == $name) {
+                return $value;
+            }
+        }
+    }
+
+    /**
+     *    Removes crud from property name after it's been converted
+     *    to an array.
+     *    @param string $mangled     Name from array cast.
+     *    @return string             Cleaned up name.
+     */
+    function unmangle($mangled) {
+        $parts = preg_split('/[^a-zA-Z0-9_\x7f-\xff]+/', $mangled);
+        return array_pop($parts);
+    }
+
+    /**
+     *    Find the first character position that differs
+     *    in two strings by binary chop.
+     *    @param string $first        First string.
+     *    @param string $second       String to compare with.
+     *    @return integer             Position of first differing
+     *                                character.
+     *    @access private
+     */
+    protected function stringDiffersAt($first, $second) {
+        if (! $first || ! $second) {
+            return 0;
+        }
+        if (strlen($first) < strlen($second)) {
+            list($first, $second) = array($second, $first);
+        }
+        $position = 0;
+        $step = strlen($first);
+        while ($step > 1) {
+            $step = (integer)(($step + 1) / 2);
+            if (strncmp($first, $second, $position + $step) == 0) {
+                $position += $step;
+            }
+        }
+        return $position;
+    }
+
+    /**
+     *    Sends a formatted dump of a variable to a string.
+     *    @param mixed $variable    Variable to display.
+     *    @return string            Output from print_r().
+     *    @access public
+     */
+    function dump($variable) {
+        ob_start();
+        print_r($variable);
+        $formatted = ob_get_contents();
+        ob_end_clean();
+        return $formatted;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/eclipse.php b/3rdparty/simpletest/eclipse.php
new file mode 100644
index 00000000000..20bd4530bb6
--- /dev/null
+++ b/3rdparty/simpletest/eclipse.php
@@ -0,0 +1,307 @@
+<?php
+/**
+ *  base include file for eclipse plugin
+ *  @package    SimpleTest
+ *  @subpackage Eclipse
+ *  @version    $Id: eclipse.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+/**#@+
+ * simpletest include files
+ */
+include_once 'unit_tester.php';
+include_once 'test_case.php';
+include_once 'invoker.php';
+include_once 'socket.php';
+include_once 'mock_objects.php';
+/**#@-*/
+
+/**
+ *  base reported class for eclipse plugin
+ *  @package    SimpleTest
+ *  @subpackage Eclipse
+ */
+class EclipseReporter extends SimpleScorer {
+
+    /**
+     *    Reporter to be run inside of Eclipse interface.
+     *    @param object $listener   Eclipse listener (?).
+     *    @param boolean $cc        Whether to include test coverage.
+     */
+    function __construct(&$listener, $cc=false){
+        $this->listener = &$listener;
+        $this->SimpleScorer();
+        $this->case = "";
+        $this->group = "";
+        $this->method = "";
+        $this->cc = $cc;
+        $this->error = false;
+        $this->fail = false;
+    }
+
+    /**
+     *    Means to display human readable object comparisons.
+     *    @return SimpleDumper        Visual comparer.
+     */
+    function getDumper() {
+        return new SimpleDumper();
+    }
+
+    /**
+     *    Localhost connection from Eclipse.
+     *    @param integer $port      Port to connect to Eclipse.
+     *    @param string $host       Normally localhost.
+     *    @return SimpleSocket      Connection to Eclipse.
+     */
+    function &createListener($port, $host="127.0.0.1"){
+        $tmplistener = &new SimpleSocket($host, $port, 5);
+        return $tmplistener;
+    }
+
+    /**
+     *    Wraps the test in an output buffer.
+     *    @param SimpleInvoker $invoker     Current test runner.
+     *    @return EclipseInvoker            Decorator with output buffering.
+     *    @access public
+     */
+    function &createInvoker(&$invoker){
+        $eclinvoker = &new EclipseInvoker($invoker, $this->listener);
+        return $eclinvoker;
+    }
+
+    /**
+     *    C style escaping.
+     *    @param string $raw    String with backslashes, quotes and whitespace.
+     *    @return string        Replaced with C backslashed tokens.
+     */
+    function escapeVal($raw){
+        $needle = array("\\","\"","/","\b","\f","\n","\r","\t");
+        $replace = array('\\\\','\"','\/','\b','\f','\n','\r','\t');
+        return str_replace($needle, $replace, $raw);
+    }
+
+    /**
+     *    Stash the first passing item. Clicking the test
+     *    item goes to first pass.
+     *    @param string $message    Test message, but we only wnat the first.
+     *    @access public
+     */
+    function paintPass($message){
+        if (! $this->pass){
+            $this->message = $this->escapeVal($message);
+        }
+        $this->pass = true;
+    }
+
+    /**
+     *    Stash the first failing item. Clicking the test
+     *    item goes to first fail.
+     *    @param string $message    Test message, but we only wnat the first.
+     *    @access public
+     */
+    function paintFail($message){
+        //only get the first failure or error
+        if (! $this->fail && ! $this->error){
+            $this->fail = true;
+            $this->message = $this->escapeVal($message);
+            $this->listener->write('{status:"fail",message:"'.$this->message.'",group:"'.$this->group.'",case:"'.$this->case.'",method:"'.$this->method.'"}');
+        }
+    }
+
+    /**
+     *    Stash the first error. Clicking the test
+     *    item goes to first error.
+     *    @param string $message    Test message, but we only wnat the first.
+     *    @access public
+     */
+    function paintError($message){
+        if (! $this->fail && ! $this->error){
+            $this->error = true;
+            $this->message = $this->escapeVal($message);
+            $this->listener->write('{status:"error",message:"'.$this->message.'",group:"'.$this->group.'",case:"'.$this->case.'",method:"'.$this->method.'"}');
+        }
+    }
+
+
+    /**
+     *    Stash the first exception. Clicking the test
+     *    item goes to first message.
+     *    @param string $message    Test message, but we only wnat the first.
+     *    @access public
+     */
+    function paintException($exception){
+        if (! $this->fail && ! $this->error){
+            $this->error = true;
+            $message = 'Unexpected exception of type[' . get_class($exception) .
+                    '] with message [' . $exception->getMessage() . '] in [' .
+                    $exception->getFile() .' line '. $exception->getLine() . ']';
+            $this->message = $this->escapeVal($message);
+            $this->listener->write(
+                    '{status:"error",message:"' . $this->message . '",group:"' .
+                    $this->group . '",case:"' . $this->case . '",method:"' . $this->method
+                    . '"}');
+        }
+    }
+
+
+    /**
+     *    We don't display any special header.
+     *    @param string $test_name     First test top level
+     *                                 to start.
+     *    @access public
+     */
+    function paintHeader($test_name) {
+    }
+
+    /**
+     *    We don't display any special footer.
+     *    @param string $test_name        The top level test.
+     *    @access public
+     */
+    function paintFooter($test_name) {
+    }
+
+    /**
+     *    Paints nothing at the start of a test method, but stash
+     *    the method name for later.
+     *    @param string $test_name   Name of test that is starting.
+     *    @access public
+     */
+    function paintMethodStart($method) {
+        $this->pass = false;
+        $this->fail = false;
+        $this->error = false;
+        $this->method = $this->escapeVal($method);
+    }
+
+    /**
+     *    Only send one message if the test passes, after that
+     *    suppress the message.
+     *    @param string $test_name   Name of test that is ending.
+     *    @access public
+     */
+    function paintMethodEnd($method){
+        if ($this->fail || $this->error || ! $this->pass){
+        } else {
+            $this->listener->write(
+                        '{status:"pass",message:"' . $this->message . '",group:"' .
+                        $this->group . '",case:"' . $this->case . '",method:"' .
+                        $this->method . '"}');
+        }
+    }
+
+    /**
+     *    Stashes the test case name for the later failure message.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseStart($case){
+        $this->case = $this->escapeVal($case);
+    }
+
+    /**
+     *    Drops the name.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseEnd($case){
+        $this->case = "";
+    }
+
+    /**
+     *    Stashes the name of the test suite. Starts test coverage
+     *    if enabled.
+     *    @param string $group     Name of test or other label.
+     *    @param integer $size     Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($group, $size){
+        $this->group = $this->escapeVal($group);
+        if ($this->cc){
+            if (extension_loaded('xdebug')){
+                xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
+            }
+        }
+    }
+
+    /**
+     *    Paints coverage report if enabled.
+     *    @param string $group     Name of test or other label.
+     *    @access public
+     */
+    function paintGroupEnd($group){
+        $this->group = "";
+        $cc = "";
+        if ($this->cc){
+            if (extension_loaded('xdebug')){
+                $arrfiles = xdebug_get_code_coverage();
+                xdebug_stop_code_coverage();
+                $thisdir = dirname(__FILE__);
+                $thisdirlen = strlen($thisdir);
+                foreach ($arrfiles as $index=>$file){
+                    if (substr($index, 0, $thisdirlen)===$thisdir){
+                        continue;
+                    }
+                    $lcnt = 0;
+                    $ccnt = 0;
+                    foreach ($file as $line){
+                        if ($line == -2){
+                            continue;
+                        }
+                        $lcnt++;
+                        if ($line==1){
+                            $ccnt++;
+                        }
+                    }
+                    if ($lcnt > 0){
+                        $cc .= round(($ccnt/$lcnt) * 100, 2) . '%';
+                    }else{
+                        $cc .= "0.00%";
+                    }
+                    $cc.= "\t". $index . "\n";
+                }
+            }
+        }
+        $this->listener->write('{status:"coverage",message:"' .
+                                EclipseReporter::escapeVal($cc) . '"}');
+    }
+}
+
+/**
+ *  Invoker decorator for Eclipse. Captures output until
+ *  the end of the test.
+ *  @package    SimpleTest
+ *  @subpackage Eclipse
+ */
+class EclipseInvoker extends SimpleInvokerDecorator{
+    function __construct(&$invoker, &$listener) {
+        $this->listener = &$listener;
+        $this->SimpleInvokerDecorator($invoker);
+    }
+
+    /**
+     *    Starts output buffering.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function before($method){
+        ob_start();
+        $this->invoker->before($method);
+    }
+
+    /**
+     *    Stops output buffering and send the captured output
+     *    to the listener.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function after($method) {
+        $this->invoker->after($method);
+        $output = ob_get_contents();
+        ob_end_clean();
+        if ($output !== ""){
+            $result = $this->listener->write('{status:"info",message:"' .
+                                              EclipseReporter::escapeVal($output) . '"}');
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/encoding.php b/3rdparty/simpletest/encoding.php
new file mode 100644
index 00000000000..cadc84e7a3b
--- /dev/null
+++ b/3rdparty/simpletest/encoding.php
@@ -0,0 +1,649 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: encoding.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/socket.php');
+/**#@-*/
+
+/**
+ *    Single post parameter.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleEncodedPair {
+    private $key;
+    private $value;
+
+    /**
+     *    Stashes the data for rendering later.
+     *    @param string $key       Form element name.
+     *    @param string $value     Data to send.
+     */
+    function __construct($key, $value) {
+        $this->key = $key;
+        $this->value = $value;
+    }
+
+    /**
+     *    The pair as a single string.
+     *    @return string        Encoded pair.
+     *    @access public
+     */
+    function asRequest() {
+        return urlencode($this->key) . '=' . urlencode($this->value);
+    }
+
+    /**
+     *    The MIME part as a string.
+     *    @return string        MIME part encoding.
+     *    @access public
+     */
+    function asMime() {
+        $part = 'Content-Disposition: form-data; ';
+        $part .= "name=\"" . $this->key . "\"\r\n";
+        $part .= "\r\n" . $this->value;
+        return $part;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @param string $key    Identifier.
+     *    @return boolean       True if matched.
+     *    @access public
+     */
+    function isKey($key) {
+        return $key == $this->key;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @return string       Identifier.
+     *    @access public
+     */
+    function getKey() {
+        return $this->key;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @return string       Content.
+     *    @access public
+     */
+    function getValue() {
+        return $this->value;
+    }
+}
+
+/**
+ *    Single post parameter.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleAttachment {
+    private $key;
+    private $content;
+    private $filename;
+
+    /**
+     *    Stashes the data for rendering later.
+     *    @param string $key          Key to add value to.
+     *    @param string $content      Raw data.
+     *    @param hash $filename       Original filename.
+     */
+    function __construct($key, $content, $filename) {
+        $this->key = $key;
+        $this->content = $content;
+        $this->filename = $filename;
+    }
+
+    /**
+     *    The pair as a single string.
+     *    @return string        Encoded pair.
+     *    @access public
+     */
+    function asRequest() {
+        return '';
+    }
+
+    /**
+     *    The MIME part as a string.
+     *    @return string        MIME part encoding.
+     *    @access public
+     */
+    function asMime() {
+        $part = 'Content-Disposition: form-data; ';
+        $part .= 'name="' . $this->key . '"; ';
+        $part .= 'filename="' . $this->filename . '"';
+        $part .= "\r\nContent-Type: " . $this->deduceMimeType();
+        $part .= "\r\n\r\n" . $this->content;
+        return $part;
+    }
+
+    /**
+     *    Attempts to figure out the MIME type from the
+     *    file extension and the content.
+     *    @return string        MIME type.
+     *    @access private
+     */
+    protected function deduceMimeType() {
+        if ($this->isOnlyAscii($this->content)) {
+            return 'text/plain';
+        }
+        return 'application/octet-stream';
+    }
+
+    /**
+     *    Tests each character is in the range 0-127.
+     *    @param string $ascii    String to test.
+     *    @access private
+     */
+    protected function isOnlyAscii($ascii) {
+        for ($i = 0, $length = strlen($ascii); $i < $length; $i++) {
+            if (ord($ascii[$i]) > 127) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @param string $key    Identifier.
+     *    @return boolean       True if matched.
+     *    @access public
+     */
+    function isKey($key) {
+        return $key == $this->key;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @return string       Identifier.
+     *    @access public
+     */
+    function getKey() {
+        return $this->key;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @return string       Content.
+     *    @access public
+     */
+    function getValue() {
+        return $this->filename;
+    }
+}
+
+/**
+ *    Bundle of GET/POST parameters. Can include
+ *    repeated parameters.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleEncoding {
+    private $request;
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false) {
+        if (! $query) {
+            $query = array();
+        }
+        $this->clear();
+        $this->merge($query);
+    }
+
+    /**
+     *    Empties the request of parameters.
+     *    @access public
+     */
+    function clear() {
+        $this->request = array();
+    }
+
+    /**
+     *    Adds a parameter to the query.
+     *    @param string $key            Key to add value to.
+     *    @param string/array $value    New data.
+     *    @access public
+     */
+    function add($key, $value) {
+        if ($value === false) {
+            return;
+        }
+        if (is_array($value)) {
+            foreach ($value as $item) {
+                $this->addPair($key, $item);
+            }
+        } else {
+            $this->addPair($key, $value);
+        }
+    }
+
+    /**
+     *    Adds a new value into the request.
+     *    @param string $key            Key to add value to.
+     *    @param string/array $value    New data.
+     *    @access private
+     */
+    protected function addPair($key, $value) {
+        $this->request[] = new SimpleEncodedPair($key, $value);
+    }
+
+    /**
+     *    Adds a MIME part to the query. Does nothing for a
+     *    form encoded packet.
+     *    @param string $key          Key to add value to.
+     *    @param string $content      Raw data.
+     *    @param hash $filename       Original filename.
+     *    @access public
+     */
+    function attach($key, $content, $filename) {
+        $this->request[] = new SimpleAttachment($key, $content, $filename);
+    }
+
+    /**
+     *    Adds a set of parameters to this query.
+     *    @param array/SimpleQueryString $query  Multiple values are
+     *                                           as lists on a single key.
+     *    @access public
+     */
+    function merge($query) {
+        if (is_object($query)) {
+            $this->request = array_merge($this->request, $query->getAll());
+        } elseif (is_array($query)) {
+            foreach ($query as $key => $value) {
+                $this->add($key, $value);
+            }
+        }
+    }
+
+    /**
+     *    Accessor for single value.
+     *    @return string/array    False if missing, string
+     *                            if present and array if
+     *                            multiple entries.
+     *    @access public
+     */
+    function getValue($key) {
+        $values = array();
+        foreach ($this->request as $pair) {
+            if ($pair->isKey($key)) {
+                $values[] = $pair->getValue();
+            }
+        }
+        if (count($values) == 0) {
+            return false;
+        } elseif (count($values) == 1) {
+            return $values[0];
+        } else {
+            return $values;
+        }
+    }
+
+    /**
+     *    Accessor for listing of pairs.
+     *    @return array        All pair objects.
+     *    @access public
+     */
+    function getAll() {
+        return $this->request;
+    }
+
+    /**
+     *    Renders the query string as a URL encoded
+     *    request part.
+     *    @return string        Part of URL.
+     *    @access protected
+     */
+    protected function encode() {
+        $statements = array();
+        foreach ($this->request as $pair) {
+            if ($statement = $pair->asRequest()) {
+                $statements[] = $statement;
+            }
+        }
+        return implode('&', $statements);
+    }
+}
+
+/**
+ *    Bundle of GET parameters. Can include
+ *    repeated parameters.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleGetEncoding extends SimpleEncoding {
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false) {
+        parent::__construct($query);
+    }
+
+    /**
+     *    HTTP request method.
+     *    @return string        Always GET.
+     *    @access public
+     */
+    function getMethod() {
+        return 'GET';
+    }
+
+    /**
+     *    Writes no extra headers.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeHeadersTo(&$socket) {
+    }
+
+    /**
+     *    No data is sent to the socket as the data is encoded into
+     *    the URL.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeTo(&$socket) {
+    }
+
+    /**
+     *    Renders the query string as a URL encoded
+     *    request part for attaching to a URL.
+     *    @return string        Part of URL.
+     *    @access public
+     */
+    function asUrlRequest() {
+        return $this->encode();
+    }
+}
+
+/**
+ *    Bundle of URL parameters for a HEAD request.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHeadEncoding extends SimpleGetEncoding {
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false) {
+        parent::__construct($query);
+    }
+
+    /**
+     *    HTTP request method.
+     *    @return string        Always HEAD.
+     *    @access public
+     */
+    function getMethod() {
+        return 'HEAD';
+    }
+}
+
+/**
+ *    Bundle of URL parameters for a DELETE request.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleDeleteEncoding extends SimpleGetEncoding {
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false) {
+        parent::__construct($query);
+    }
+
+    /**
+     *    HTTP request method.
+     *    @return string        Always DELETE.
+     *    @access public
+     */
+    function getMethod() {
+        return 'DELETE';
+    }
+}
+
+/**
+ *    Bundles an entity-body for transporting
+ *    a raw content payload with the request.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleEntityEncoding extends SimpleEncoding {
+    private $content_type;
+    private $body;
+
+    function __construct($query = false, $content_type = false) {
+        $this->content_type = $content_type;
+    	if (is_string($query)) {
+            $this->body = $query;
+            parent::__construct();
+        } else {
+            parent::__construct($query);
+        }
+    }
+
+    /**
+     *    Returns the media type of the entity body
+     *    @return string
+     *    @access public
+     */
+    function getContentType() {
+        if (!$this->content_type) {
+        	return ($this->body) ? 'text/plain' : 'application/x-www-form-urlencoded';
+        }
+    	return $this->content_type;
+    }
+
+    /**
+     *    Dispatches the form headers down the socket.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeHeadersTo(&$socket) {
+        $socket->write("Content-Length: " . (integer)strlen($this->encode()) . "\r\n");
+        $socket->write("Content-Type: " .  $this->getContentType() . "\r\n");
+    }
+
+    /**
+     *    Dispatches the form data down the socket.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeTo(&$socket) {
+        $socket->write($this->encode());
+    }
+
+    /**
+     *    Renders the request body
+     *    @return Encoded entity body
+     *    @access protected
+     */
+    protected function encode() {
+        return ($this->body) ? $this->body : parent::encode();
+    }
+}
+
+/**
+ *    Bundle of POST parameters. Can include
+ *    repeated parameters.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimplePostEncoding extends SimpleEntityEncoding {
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false, $content_type = false) {
+        if (is_array($query) and $this->hasMoreThanOneLevel($query)) {
+            $query = $this->rewriteArrayWithMultipleLevels($query);
+        }
+        parent::__construct($query, $content_type);
+    }
+
+    function hasMoreThanOneLevel($query) {
+        foreach ($query as $key => $value) {
+            if (is_array($value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function rewriteArrayWithMultipleLevels($query) {
+        $query_ = array();
+        foreach ($query as $key => $value) {
+            if (is_array($value)) {
+                foreach ($value as $sub_key => $sub_value) {
+                    $query_[$key."[".$sub_key."]"] = $sub_value;
+                }
+            } else {
+                $query_[$key] = $value;
+            }
+        }
+        if ($this->hasMoreThanOneLevel($query_)) {
+            $query_ = $this->rewriteArrayWithMultipleLevels($query_);
+        }
+
+        return $query_;
+    }
+
+    /**
+     *    HTTP request method.
+     *    @return string        Always POST.
+     *    @access public
+     */
+    function getMethod() {
+        return 'POST';
+    }
+
+    /**
+     *    Renders the query string as a URL encoded
+     *    request part for attaching to a URL.
+     *    @return string        Part of URL.
+     *    @access public
+     */
+    function asUrlRequest() {
+        return '';
+    }
+}
+
+/**
+ *    Encoded entity body for a PUT request.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimplePutEncoding extends SimpleEntityEncoding {
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false, $content_type = false) {
+        parent::__construct($query, $content_type);
+    }
+
+    /**
+     *    HTTP request method.
+     *    @return string        Always PUT.
+     *    @access public
+     */
+    function getMethod() {
+        return 'PUT';
+    }
+}
+
+/**
+ *    Bundle of POST parameters in the multipart
+ *    format. Can include file uploads.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleMultipartEncoding extends SimplePostEncoding {
+    private $boundary;
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false, $boundary = false) {
+        parent::__construct($query);
+        $this->boundary = ($boundary === false ? uniqid('st') : $boundary);
+    }
+
+    /**
+     *    Dispatches the form headers down the socket.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeHeadersTo(&$socket) {
+        $socket->write("Content-Length: " . (integer)strlen($this->encode()) . "\r\n");
+        $socket->write("Content-Type: multipart/form-data; boundary=" . $this->boundary . "\r\n");
+    }
+
+    /**
+     *    Dispatches the form data down the socket.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeTo(&$socket) {
+        $socket->write($this->encode());
+    }
+
+    /**
+     *    Renders the query string as a URL encoded
+     *    request part.
+     *    @return string        Part of URL.
+     *    @access public
+     */
+    function encode() {
+        $stream = '';
+        foreach ($this->getAll() as $pair) {
+            $stream .= "--" . $this->boundary . "\r\n";
+            $stream .= $pair->asMime() . "\r\n";
+        }
+        $stream .= "--" . $this->boundary . "--\r\n";
+        return $stream;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/errors.php b/3rdparty/simpletest/errors.php
new file mode 100644
index 00000000000..b3d0c2a0753
--- /dev/null
+++ b/3rdparty/simpletest/errors.php
@@ -0,0 +1,267 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: errors.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ * Includes SimpleTest files.
+ */
+require_once dirname(__FILE__) . '/invoker.php';
+require_once dirname(__FILE__) . '/test_case.php';
+require_once dirname(__FILE__) . '/expectation.php';
+/**#@-*/
+
+/**
+ *    Extension that traps errors into an error queue.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleErrorTrappingInvoker extends SimpleInvokerDecorator {
+
+    /**
+     *    Stores the invoker to wrap.
+     *    @param SimpleInvoker $invoker  Test method runner.
+     */
+    function __construct($invoker) {
+        parent::__construct($invoker);
+    }
+
+    /**
+     *    Invokes a test method and dispatches any
+     *    untrapped errors. Called back from
+     *    the visiting runner.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function invoke($method) {
+        $queue = $this->createErrorQueue();
+        set_error_handler('SimpleTestErrorHandler');
+        parent::invoke($method);
+        restore_error_handler();
+        $queue->tally();
+    }
+
+    /**
+     *    Wires up the error queue for a single test.
+     *    @return SimpleErrorQueue    Queue connected to the test.
+     *    @access private
+     */
+    protected function createErrorQueue() {
+        $context = SimpleTest::getContext();
+        $test = $this->getTestCase();
+        $queue = $context->get('SimpleErrorQueue');
+        $queue->setTestCase($test);
+        return $queue;
+    }
+}
+
+/**
+ *    Error queue used to record trapped
+ *    errors.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleErrorQueue {
+    private $queue;
+    private $expectation_queue;
+    private $test;
+    private $using_expect_style = false;
+
+    /**
+     *    Starts with an empty queue.
+     */
+    function __construct() {
+        $this->clear();
+    }
+
+    /**
+     *    Discards the contents of the error queue.
+     *    @access public
+     */
+    function clear() {
+        $this->queue = array();
+        $this->expectation_queue = array();
+    }
+
+    /**
+     *    Sets the currently running test case.
+     *    @param SimpleTestCase $test    Test case to send messages to.
+     *    @access public
+     */
+    function setTestCase($test) {
+        $this->test = $test;
+    }
+
+    /**
+     *    Sets up an expectation of an error. If this is
+     *    not fulfilled at the end of the test, a failure
+     *    will occour. If the error does happen, then this
+     *    will cancel it out and send a pass message.
+     *    @param SimpleExpectation $expected    Expected error match.
+     *    @param string $message                Message to display.
+     *    @access public
+     */
+    function expectError($expected, $message) {
+        array_push($this->expectation_queue, array($expected, $message));
+    }
+
+    /**
+     *    Adds an error to the front of the queue.
+     *    @param integer $severity       PHP error code.
+     *    @param string $content         Text of error.
+     *    @param string $filename        File error occoured in.
+     *    @param integer $line           Line number of error.
+     *    @access public
+     */
+    function add($severity, $content, $filename, $line) {
+        $content = str_replace('%', '%%', $content);
+        $this->testLatestError($severity, $content, $filename, $line);
+    }
+
+    /**
+     *    Any errors still in the queue are sent to the test
+     *    case. Any unfulfilled expectations trigger failures.
+     *    @access public
+     */
+    function tally() {
+        while (list($severity, $message, $file, $line) = $this->extract()) {
+            $severity = $this->getSeverityAsString($severity);
+            $this->test->error($severity, $message, $file, $line);
+        }
+        while (list($expected, $message) = $this->extractExpectation()) {
+            $this->test->assert($expected, false, "%s -> Expected error not caught");
+        }
+    }
+
+    /**
+     *    Tests the error against the most recent expected
+     *    error.
+     *    @param integer $severity       PHP error code.
+     *    @param string $content         Text of error.
+     *    @param string $filename        File error occoured in.
+     *    @param integer $line           Line number of error.
+     *    @access private
+     */
+    protected function testLatestError($severity, $content, $filename, $line) {
+        if ($expectation = $this->extractExpectation()) {
+            list($expected, $message) = $expectation;
+            $this->test->assert($expected, $content, sprintf(
+                    $message,
+                    "%s -> PHP error [$content] severity [" .
+                            $this->getSeverityAsString($severity) .
+                            "] in [$filename] line [$line]"));
+        } else {
+            $this->test->error($severity, $content, $filename, $line);
+        }
+    }
+
+    /**
+     *    Pulls the earliest error from the queue.
+     *    @return  mixed    False if none, or a list of error
+     *                      information. Elements are: severity
+     *                      as the PHP error code, the error message,
+     *                      the file with the error, the line number
+     *                      and a list of PHP super global arrays.
+     *    @access public
+     */
+    function extract() {
+        if (count($this->queue)) {
+            return array_shift($this->queue);
+        }
+        return false;
+    }
+
+    /**
+     *    Pulls the earliest expectation from the queue.
+     *    @return     SimpleExpectation    False if none.
+     *    @access private
+     */
+    protected function extractExpectation() {
+        if (count($this->expectation_queue)) {
+            return array_shift($this->expectation_queue);
+        }
+        return false;
+    }
+
+    /**
+     *    Converts an error code into it's string
+     *    representation.
+     *    @param $severity  PHP integer error code.
+     *    @return           String version of error code.
+     *    @access public
+     */
+    static function getSeverityAsString($severity) {
+        static $map = array(
+                E_STRICT => 'E_STRICT',
+                E_ERROR => 'E_ERROR',
+                E_WARNING => 'E_WARNING',
+                E_PARSE => 'E_PARSE',
+                E_NOTICE => 'E_NOTICE',
+                E_CORE_ERROR => 'E_CORE_ERROR',
+                E_CORE_WARNING => 'E_CORE_WARNING',
+                E_COMPILE_ERROR => 'E_COMPILE_ERROR',
+                E_COMPILE_WARNING => 'E_COMPILE_WARNING',
+                E_USER_ERROR => 'E_USER_ERROR',
+                E_USER_WARNING => 'E_USER_WARNING',
+                E_USER_NOTICE => 'E_USER_NOTICE');
+        if (defined('E_RECOVERABLE_ERROR')) {
+            $map[E_RECOVERABLE_ERROR] = 'E_RECOVERABLE_ERROR';
+        }
+        if (defined('E_DEPRECATED')) {
+            $map[E_DEPRECATED] = 'E_DEPRECATED';
+        }
+        return $map[$severity];
+    }
+}
+
+/**
+ *    Error handler that simply stashes any errors into the global
+ *    error queue. Simulates the existing behaviour with respect to
+ *    logging errors, but this feature may be removed in future.
+ *    @param $severity        PHP error code.
+ *    @param $message         Text of error.
+ *    @param $filename        File error occoured in.
+ *    @param $line            Line number of error.
+ *    @param $super_globals   Hash of PHP super global arrays.
+ *    @access public
+ */
+function SimpleTestErrorHandler($severity, $message, $filename = null, $line = null, $super_globals = null, $mask = null) {
+    $severity = $severity & error_reporting();
+    if ($severity) {
+        restore_error_handler();
+        if (IsNotCausedBySimpleTest($message) && IsNotTimeZoneNag($message)) {
+            if (ini_get('log_errors')) {
+                $label = SimpleErrorQueue::getSeverityAsString($severity);
+                error_log("$label: $message in $filename on line $line");
+            }
+            $queue = SimpleTest::getContext()->get('SimpleErrorQueue');
+            $queue->add($severity, $message, $filename, $line);
+        }
+        set_error_handler('SimpleTestErrorHandler');
+    }
+    return true;
+}
+
+/**
+ *  Certain messages can be caused by the unit tester itself.
+ *  These have to be filtered.
+ *  @param string $message      Message to filter.
+ *  @return boolean             True if genuine failure.
+ */
+function IsNotCausedBySimpleTest($message) {
+    return ! preg_match('/returned by reference/', $message);
+}
+
+/**
+ *  Certain messages caused by PHP are just noise.
+ *  These have to be filtered.
+ *  @param string $message      Message to filter.
+ *  @return boolean             True if genuine failure.
+ */
+function IsNotTimeZoneNag($message) {
+    return ! preg_match('/not safe to rely .* timezone settings/', $message);
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/exceptions.php b/3rdparty/simpletest/exceptions.php
new file mode 100755
index 00000000000..2f469e93a45
--- /dev/null
+++ b/3rdparty/simpletest/exceptions.php
@@ -0,0 +1,226 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: exceptions.php 1882 2009-07-01 14:30:05Z lastcraft $
+ */
+
+/**#@+
+ * Include required SimpleTest files
+ */
+require_once dirname(__FILE__) . '/invoker.php';
+require_once dirname(__FILE__) . '/expectation.php';
+/**#@-*/
+
+/**
+ *    Extension that traps exceptions and turns them into
+ *    an error message. PHP5 only.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleExceptionTrappingInvoker extends SimpleInvokerDecorator {
+
+    /**
+     *    Stores the invoker to be wrapped.
+     *    @param SimpleInvoker $invoker   Test method runner.
+     */
+    function __construct($invoker) {
+        parent::__construct($invoker);
+    }
+
+    /**
+     *    Invokes a test method whilst trapping expected
+     *    exceptions. Any left over unthrown exceptions
+     *    are then reported as failures.
+     *    @param string $method    Test method to call.
+     */
+    function invoke($method) {
+        $trap = SimpleTest::getContext()->get('SimpleExceptionTrap');
+        $trap->clear();
+        try {
+            $has_thrown = false;
+            parent::invoke($method);
+        } catch (Exception $exception) {
+            $has_thrown = true;
+            if (! $trap->isExpected($this->getTestCase(), $exception)) {
+                $this->getTestCase()->exception($exception);
+            }
+            $trap->clear();
+        }
+        if ($message = $trap->getOutstanding()) {
+            $this->getTestCase()->fail($message);
+        }
+        if ($has_thrown) {
+            try {
+                parent::getTestCase()->tearDown();
+            } catch (Exception $e) { }
+        }
+    }
+}
+
+/**
+ *    Tests exceptions either by type or the exact
+ *    exception. This could be improved to accept
+ *    a pattern expectation to test the error
+ *    message, but that will have to come later.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class ExceptionExpectation extends SimpleExpectation {
+    private $expected;
+
+    /**
+     *    Sets up the conditions to test against.
+     *    If the expected value is a string, then
+     *    it will act as a test of the class name.
+     *    An exception as the comparison will
+     *    trigger an identical match. Writing this
+     *    down now makes it look doubly dumb. I hope
+     *    come up with a better scheme later.
+     *    @param mixed $expected   A class name or an actual
+     *                             exception to compare with.
+     *    @param string $message   Message to display.
+     */
+    function __construct($expected, $message = '%s') {
+        $this->expected = $expected;
+        parent::__construct($message);
+    }
+
+    /**
+     *    Carry out the test.
+     *    @param Exception $compare    Value to check.
+     *    @return boolean              True if matched.
+     */
+    function test($compare) {
+        if (is_string($this->expected)) {
+            return ($compare instanceof $this->expected);
+        }
+        if (get_class($compare) != get_class($this->expected)) {
+            return false;
+        }
+        return $compare->getMessage() == $this->expected->getMessage();
+    }
+
+    /**
+     *    Create the message to display describing the test.
+     *    @param Exception $compare     Exception to match.
+     *    @return string                Final message.
+     */
+    function testMessage($compare) {
+        if (is_string($this->expected)) {
+            return "Exception [" . $this->describeException($compare) .
+                    "] should be type [" . $this->expected . "]";
+        }
+        return "Exception [" . $this->describeException($compare) .
+                "] should match [" .
+                $this->describeException($this->expected) . "]";
+    }
+
+    /**
+     *    Summary of an Exception object.
+     *    @param Exception $compare     Exception to describe.
+     *    @return string                Text description.
+     */
+    protected function describeException($exception) {
+        return get_class($exception) . ": " . $exception->getMessage();
+    }
+}
+
+/**
+ *    Stores expected exceptions for when they
+ *    get thrown. Saves the irritating try...catch
+ *    block.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleExceptionTrap {
+    private $expected;
+    private $ignored;
+    private $message;
+
+    /**
+     *    Clears down the queue ready for action.
+     */
+    function __construct() {
+        $this->clear();
+    }
+
+    /**
+     *    Sets up an expectation of an exception.
+     *    This has the effect of intercepting an
+     *    exception that matches.
+     *    @param SimpleExpectation $expected    Expected exception to match.
+     *    @param string $message                Message to display.
+     *    @access public
+     */
+    function expectException($expected = false, $message = '%s') {
+        $this->expected = $this->coerceToExpectation($expected);
+        $this->message = $message;
+    }
+
+    /**
+     *    Adds an exception to the ignore list. This is the list
+     *    of exceptions that when thrown do not affect the test.
+     *    @param SimpleExpectation $ignored    Exception to skip.
+     *    @access public
+     */
+    function ignoreException($ignored) {
+        $this->ignored[] = $this->coerceToExpectation($ignored);
+    }
+
+    /**
+     *    Compares the expected exception with any
+     *    in the queue. Issues a pass or fail and
+     *    returns the state of the test.
+     *    @param SimpleTestCase $test    Test case to send messages to.
+     *    @param Exception $exception    Exception to compare.
+     *    @return boolean                False on no match.
+     */
+    function isExpected($test, $exception) {
+        if ($this->expected) {
+            return $test->assert($this->expected, $exception, $this->message);
+        }
+        foreach ($this->ignored as $ignored) {
+            if ($ignored->test($exception)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Turns an expected exception into a SimpleExpectation object.
+     *    @param mixed $exception      Exception, expectation or
+     *                                 class name of exception.
+     *    @return SimpleExpectation    Expectation that will match the
+     *                                 exception.
+     */
+    private function coerceToExpectation($exception) {
+        if ($exception === false) {
+            return new AnythingExpectation();
+        }
+        if (! SimpleExpectation::isExpectation($exception)) {
+            return new ExceptionExpectation($exception);
+        }
+        return $exception;
+    }
+
+    /**
+     *    Tests for any left over exception.
+     *    @return string/false     The failure message or false if none.
+     */
+    function getOutstanding() {
+        return sprintf($this->message, 'Failed to trap exception');
+    }
+
+    /**
+     *    Discards the contents of the error queue.
+     */
+    function clear() {
+        $this->expected = false;
+        $this->message = false;
+        $this->ignored = array();
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/expectation.php b/3rdparty/simpletest/expectation.php
new file mode 100755
index 00000000000..a480a366c5c
--- /dev/null
+++ b/3rdparty/simpletest/expectation.php
@@ -0,0 +1,984 @@
+<?php
+/**
+ *    base include file for SimpleTest
+ *    @package    SimpleTest
+ *    @subpackage    UnitTester
+ *    @version    $Id: expectation.php 2009 2011-04-28 08:57:25Z pp11 $
+ */
+
+/**#@+
+ *    include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/dumper.php');
+require_once(dirname(__FILE__) . '/compatibility.php');
+/**#@-*/
+
+/**
+ *    Assertion that can display failure information.
+ *    Also includes various helper methods.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ *    @abstract
+ */
+class SimpleExpectation {
+    protected $dumper = false;
+    private $message;
+
+    /**
+     *    Creates a dumper for displaying values and sets
+     *    the test message.
+     *    @param string $message    Customised message on failure.
+     */
+    function __construct($message = '%s') {
+        $this->message = $message;
+    }
+
+    /**
+     *    Tests the expectation. True if correct.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     *    @abstract
+     */
+    function test($compare) {
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     *    @abstract
+     */
+    function testMessage($compare) {
+    }
+
+    /**
+     *    Overlays the generated message onto the stored user
+     *    message. An additional message can be interjected.
+     *    @param mixed $compare        Comparison value.
+     *    @param SimpleDumper $dumper  For formatting the results.
+     *    @return string               Description of success
+     *                                 or failure.
+     *    @access public
+     */
+    function overlayMessage($compare, $dumper) {
+        $this->dumper = $dumper;
+        return sprintf($this->message, $this->testMessage($compare));
+    }
+
+    /**
+     *    Accessor for the dumper.
+     *    @return SimpleDumper    Current value dumper.
+     *    @access protected
+     */
+    protected function getDumper() {
+        if (! $this->dumper) {
+            $dumper = new SimpleDumper();
+            return $dumper;
+        }
+        return $this->dumper;
+    }
+
+    /**
+     *    Test to see if a value is an expectation object.
+     *    A useful utility method.
+     *    @param mixed $expectation    Hopefully an Expectation
+     *                                 class.
+     *    @return boolean              True if descended from
+     *                                 this class.
+     *    @access public
+     */
+    static function isExpectation($expectation) {
+        return is_object($expectation) &&
+                SimpleTestCompatibility::isA($expectation, 'SimpleExpectation');
+    }
+}
+
+/**
+ *    A wildcard expectation always matches.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class AnythingExpectation extends SimpleExpectation {
+
+    /**
+     *    Tests the expectation. Always true.
+     *    @param mixed $compare  Ignored.
+     *    @return boolean        True.
+     *    @access public
+     */
+    function test($compare) {
+        return true;
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return 'Anything always matches [' . $dumper->describeValue($compare) . ']';
+    }
+}
+
+/**
+ *    An expectation that never matches.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class FailedExpectation extends SimpleExpectation {
+
+    /**
+     *    Tests the expectation. Always false.
+     *    @param mixed $compare  Ignored.
+     *    @return boolean        True.
+     *    @access public
+     */
+    function test($compare) {
+        return false;
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return 'Failed expectation never matches [' . $dumper->describeValue($compare) . ']';
+    }
+}
+
+/**
+ *    An expectation that passes on boolean true.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class TrueExpectation extends SimpleExpectation {
+
+    /**
+     *    Tests the expectation.
+     *    @param mixed $compare  Should be true.
+     *    @return boolean        True on match.
+     *    @access public
+     */
+    function test($compare) {
+        return (boolean)$compare;
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return 'Expected true, got [' . $dumper->describeValue($compare) . ']';
+    }
+}
+
+/**
+ *    An expectation that passes on boolean false.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class FalseExpectation extends SimpleExpectation {
+
+    /**
+     *    Tests the expectation.
+     *    @param mixed $compare  Should be false.
+     *    @return boolean        True on match.
+     *    @access public
+     */
+    function test($compare) {
+        return ! (boolean)$compare;
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return 'Expected false, got [' . $dumper->describeValue($compare) . ']';
+    }
+}
+
+/**
+ *    Test for equality.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class EqualExpectation extends SimpleExpectation {
+    private $value;
+
+    /**
+     *    Sets the value to compare against.
+     *    @param mixed $value        Test value to match.
+     *    @param string $message     Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $message = '%s') {
+        parent::__construct($message);
+        $this->value = $value;
+    }
+
+    /**
+     *    Tests the expectation. True if it matches the
+     *    held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return (($this->value == $compare) && ($compare == $this->value));
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            return "Equal expectation [" . $this->dumper->describeValue($this->value) . "]";
+        } else {
+            return "Equal expectation fails " .
+                    $this->dumper->describeDifference($this->value, $compare);
+        }
+    }
+
+    /**
+     *    Accessor for comparison value.
+     *    @return mixed       Held value to compare with.
+     *    @access protected
+     */
+    protected function getValue() {
+        return $this->value;
+    }
+}
+
+/**
+ *    Test for inequality.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NotEqualExpectation extends EqualExpectation {
+
+    /**
+     *    Sets the value to compare against.
+     *    @param mixed $value       Test value to match.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $message = '%s') {
+        parent::__construct($value, $message);
+    }
+
+    /**
+     *    Tests the expectation. True if it differs from the
+     *    held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        if ($this->test($compare)) {
+            return "Not equal expectation passes " .
+                    $dumper->describeDifference($this->getValue(), $compare);
+        } else {
+            return "Not equal expectation fails [" .
+                    $dumper->describeValue($this->getValue()) .
+                    "] matches";
+        }
+    }
+}
+
+/**
+ *    Test for being within a range.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class WithinMarginExpectation extends SimpleExpectation {
+    private $upper;
+    private $lower;
+
+    /**
+     *    Sets the value to compare against and the fuzziness of
+     *    the match. Used for comparing floating point values.
+     *    @param mixed $value        Test value to match.
+     *    @param mixed $margin       Fuzziness of match.
+     *    @param string $message     Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $margin, $message = '%s') {
+        parent::__construct($message);
+        $this->upper = $value + $margin;
+        $this->lower = $value - $margin;
+    }
+
+    /**
+     *    Tests the expectation. True if it matches the
+     *    held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return (($compare <= $this->upper) && ($compare >= $this->lower));
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            return $this->withinMessage($compare);
+        } else {
+            return $this->outsideMessage($compare);
+        }
+    }
+
+    /**
+     *    Creates a the message for being within the range.
+     *    @param mixed $compare        Value being tested.
+     *    @access private
+     */
+    protected function withinMessage($compare) {
+        return "Within expectation [" . $this->dumper->describeValue($this->lower) . "] and [" .
+                $this->dumper->describeValue($this->upper) . "]";
+    }
+
+    /**
+     *    Creates a the message for being within the range.
+     *    @param mixed $compare        Value being tested.
+     *    @access private
+     */
+    protected function outsideMessage($compare) {
+        if ($compare > $this->upper) {
+            return "Outside expectation " .
+                    $this->dumper->describeDifference($compare, $this->upper);
+        } else {
+            return "Outside expectation " .
+                    $this->dumper->describeDifference($compare, $this->lower);
+        }
+    }
+}
+
+/**
+ *    Test for being outside of a range.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class OutsideMarginExpectation extends WithinMarginExpectation {
+
+    /**
+     *    Sets the value to compare against and the fuzziness of
+     *    the match. Used for comparing floating point values.
+     *    @param mixed $value        Test value to not match.
+     *    @param mixed $margin       Fuzziness of match.
+     *    @param string $message     Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $margin, $message = '%s') {
+        parent::__construct($value, $margin, $message);
+    }
+
+    /**
+     *    Tests the expectation. True if it matches the
+     *    held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if (! $this->test($compare)) {
+            return $this->withinMessage($compare);
+        } else {
+            return $this->outsideMessage($compare);
+        }
+    }
+}
+
+/**
+ *    Test for reference.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class ReferenceExpectation {
+    private $value;
+
+    /**
+     *    Sets the reference value to compare against.
+     *    @param mixed $value       Test reference to match.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct(&$value, $message = '%s') {
+        $this->message = $message;
+        $this->value = &$value;
+    }
+
+    /**
+     *    Tests the expectation. True if it exactly
+     *    references the held value.
+     *    @param mixed $compare        Comparison reference.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test(&$compare) {
+        return SimpleTestCompatibility::isReference($this->value, $compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            return "Reference expectation [" . $this->dumper->describeValue($this->value) . "]";
+        } else {
+            return "Reference expectation fails " .
+                    $this->dumper->describeDifference($this->value, $compare);
+        }
+    }
+
+    /**
+     *    Overlays the generated message onto the stored user
+     *    message. An additional message can be interjected.
+     *    @param mixed $compare        Comparison value.
+     *    @param SimpleDumper $dumper  For formatting the results.
+     *    @return string               Description of success
+     *                                 or failure.
+     *    @access public
+     */
+    function overlayMessage($compare, $dumper) {
+        $this->dumper = $dumper;
+        return sprintf($this->message, $this->testMessage($compare));
+    }
+
+    /**
+     *    Accessor for the dumper.
+     *    @return SimpleDumper    Current value dumper.
+     *    @access protected
+     */
+    protected function getDumper() {
+        if (! $this->dumper) {
+            $dumper = new SimpleDumper();
+            return $dumper;
+        }
+        return $this->dumper;
+    }
+}
+
+/**
+ *    Test for identity.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class IdenticalExpectation extends EqualExpectation {
+
+    /**
+     *    Sets the value to compare against.
+     *    @param mixed $value       Test value to match.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $message = '%s') {
+        parent::__construct($value, $message);
+    }
+
+    /**
+     *    Tests the expectation. True if it exactly
+     *    matches the held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return SimpleTestCompatibility::isIdentical($this->getValue(), $compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        if ($this->test($compare)) {
+            return "Identical expectation [" . $dumper->describeValue($this->getValue()) . "]";
+        } else {
+            return "Identical expectation [" . $dumper->describeValue($this->getValue()) .
+                    "] fails with [" .
+                    $dumper->describeValue($compare) . "] " .
+                    $dumper->describeDifference($this->getValue(), $compare, TYPE_MATTERS);
+        }
+    }
+}
+
+/**
+ *    Test for non-identity.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NotIdenticalExpectation extends IdenticalExpectation {
+
+    /**
+     *    Sets the value to compare against.
+     *    @param mixed $value        Test value to match.
+     *    @param string $message     Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $message = '%s') {
+        parent::__construct($value, $message);
+    }
+
+    /**
+     *    Tests the expectation. True if it differs from the
+     *    held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        if ($this->test($compare)) {
+            return "Not identical expectation passes " .
+                    $dumper->describeDifference($this->getValue(), $compare, TYPE_MATTERS);
+        } else {
+            return "Not identical expectation [" . $dumper->describeValue($this->getValue()) . "] matches";
+        }
+    }
+}
+
+/**
+ *    Test for a pattern using Perl regex rules.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class PatternExpectation extends SimpleExpectation {
+    private $pattern;
+
+    /**
+     *    Sets the value to compare against.
+     *    @param string $pattern    Pattern to search for.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($pattern, $message = '%s') {
+        parent::__construct($message);
+        $this->pattern = $pattern;
+    }
+
+    /**
+     *    Accessor for the pattern.
+     *    @return string       Perl regex as string.
+     *    @access protected
+     */
+    protected function getPattern() {
+        return $this->pattern;
+    }
+
+    /**
+     *    Tests the expectation. True if the Perl regex
+     *    matches the comparison value.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return (boolean)preg_match($this->getPattern(), $compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            return $this->describePatternMatch($this->getPattern(), $compare);
+        } else {
+            $dumper = $this->getDumper();
+            return "Pattern [" . $this->getPattern() .
+                    "] not detected in [" .
+                    $dumper->describeValue($compare) . "]";
+        }
+    }
+
+    /**
+     *    Describes a pattern match including the string
+     *    found and it's position.
+     *    @param string $pattern        Regex to match against.
+     *    @param string $subject        Subject to search.
+     *    @access protected
+     */
+    protected function describePatternMatch($pattern, $subject) {
+        preg_match($pattern, $subject, $matches);
+        $position = strpos($subject, $matches[0]);
+        $dumper = $this->getDumper();
+        return "Pattern [$pattern] detected at character [$position] in [" .
+                $dumper->describeValue($subject) . "] as [" .
+                $matches[0] . "] in region [" .
+                $dumper->clipString($subject, 100, $position) . "]";
+    }
+}
+
+/**
+ *    Fail if a pattern is detected within the
+ *    comparison.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NoPatternExpectation extends PatternExpectation {
+
+    /**
+     *    Sets the reject pattern
+     *    @param string $pattern    Pattern to search for.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($pattern, $message = '%s') {
+        parent::__construct($pattern, $message);
+    }
+
+    /**
+     *    Tests the expectation. False if the Perl regex
+     *    matches the comparison value.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param string $compare      Comparison value.
+     *    @return string              Description of success
+     *                                or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            $dumper = $this->getDumper();
+            return "Pattern [" . $this->getPattern() .
+                    "] not detected in [" .
+                    $dumper->describeValue($compare) . "]";
+        } else {
+            return $this->describePatternMatch($this->getPattern(), $compare);
+        }
+    }
+}
+
+/**
+ *    Tests either type or class name if it's an object.
+ *      @package SimpleTest
+ *      @subpackage UnitTester
+ */
+class IsAExpectation extends SimpleExpectation {
+    private $type;
+
+    /**
+     *    Sets the type to compare with.
+     *    @param string $type       Type or class name.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($type, $message = '%s') {
+        parent::__construct($message);
+        $this->type = $type;
+    }
+
+    /**
+     *    Accessor for type to check against.
+     *    @return string    Type or class name.
+     *    @access protected
+     */
+    protected function getType() {
+        return $this->type;
+    }
+
+    /**
+     *    Tests the expectation. True if the type or
+     *    class matches the string value.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        if (is_object($compare)) {
+            return SimpleTestCompatibility::isA($compare, $this->type);
+        } else {
+            $function = 'is_'.$this->canonicalType($this->type);
+            if (is_callable($function)) {
+                return $function($compare);
+            }
+            return false;
+        }
+    }
+
+    /**
+     *    Coerces type name into a is_*() match.
+     *    @param string $type        User type.
+     *    @return string             Simpler type.
+     *    @access private
+     */
+    protected function canonicalType($type) {
+        $type = strtolower($type);
+        $map = array('boolean' => 'bool');
+        if (isset($map[$type])) {
+            $type = $map[$type];
+        }
+        return $type;
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return "Value [" . $dumper->describeValue($compare) .
+                "] should be type [" . $this->type . "]";
+    }
+}
+
+/**
+ *    Tests either type or class name if it's an object.
+ *    Will succeed if the type does not match.
+ *      @package SimpleTest
+ *      @subpackage UnitTester
+ */
+class NotAExpectation extends IsAExpectation {
+    private $type;
+
+    /**
+     *    Sets the type to compare with.
+     *    @param string $type       Type or class name.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($type, $message = '%s') {
+        parent::__construct($type, $message);
+    }
+
+    /**
+     *    Tests the expectation. False if the type or
+     *    class matches the string value.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if different.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return "Value [" . $dumper->describeValue($compare) .
+                "] should not be type [" . $this->getType() . "]";
+    }
+}
+
+/**
+ *    Tests for existance of a method in an object
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class MethodExistsExpectation extends SimpleExpectation {
+    private $method;
+
+    /**
+     *    Sets the value to compare against.
+     *    @param string $method     Method to check.
+     *    @param string $message    Customised message on failure.
+     *    @return void
+     */
+    function __construct($method, $message = '%s') {
+        parent::__construct($message);
+        $this->method = &$method;
+    }
+
+    /**
+     *    Tests the expectation. True if the method exists in the test object.
+     *    @param string $compare        Comparison method name.
+     *    @return boolean               True if correct.
+     */
+    function test($compare) {
+        return (boolean)(is_object($compare) && method_exists($compare, $this->method));
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        if (! is_object($compare)) {
+            return 'No method on non-object [' . $dumper->describeValue($compare) . ']';
+        }
+        $method = $this->method;
+        return "Object [" . $dumper->describeValue($compare) .
+                "] should contain method [$method]";
+    }
+}
+
+/**
+ *    Compares an object member's value even if private.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class MemberExpectation extends IdenticalExpectation {
+    private $name;
+
+    /**
+     *    Sets the value to compare against.
+     *    @param string $method     Method to check.
+     *    @param string $message    Customised message on failure.
+     *    @return void
+     */
+    function __construct($name, $expected) {
+        $this->name = $name;
+        parent::__construct($expected);
+    }
+
+    /**
+     *    Tests the expectation. True if the property value is identical.
+     *    @param object $actual         Comparison object.
+     *    @return boolean               True if identical.
+     */
+    function test($actual) {
+        if (! is_object($actual)) {
+            return false;
+        }
+        return parent::test($this->getProperty($this->name, $actual));
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     */
+    function testMessage($actual) {
+        return parent::testMessage($this->getProperty($this->name, $actual));
+    }
+
+    /**
+     *    Extracts the member value even if private using reflection.
+     *    @param string $name        Property name.
+     *    @param object $object      Object to read.
+     *    @return mixed              Value of property.
+     */
+    private function getProperty($name, $object) {
+        $reflection = new ReflectionObject($object);
+        $property = $reflection->getProperty($name);
+        if (method_exists($property, 'setAccessible')) {
+            $property->setAccessible(true);
+        }
+        try {
+            return $property->getValue($object);
+        } catch (ReflectionException $e) {
+            return $this->getPrivatePropertyNoMatterWhat($name, $object);
+        }
+    }
+
+    /**
+     *    Extracts a private member's value when reflection won't play ball.
+     *    @param string $name        Property name.
+     *    @param object $object      Object to read.
+     *    @return mixed              Value of property.
+     */
+    private function getPrivatePropertyNoMatterWhat($name, $object) {
+        foreach ((array)$object as $mangled_name => $value) {
+            if ($this->unmangle($mangled_name) == $name) {
+                return $value;
+            }
+        }
+    }
+
+    /**
+     *    Removes crud from property name after it's been converted
+     *    to an array.
+     *    @param string $mangled     Name from array cast.
+     *    @return string             Cleaned up name.
+     */
+    function unmangle($mangled) {
+        $parts = preg_split('/[^a-zA-Z0-9_\x7f-\xff]+/', $mangled);
+        return array_pop($parts);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/pear_test_case.php b/3rdparty/simpletest/extensions/pear_test_case.php
new file mode 100755
index 00000000000..71657ae4cea
--- /dev/null
+++ b/3rdparty/simpletest/extensions/pear_test_case.php
@@ -0,0 +1,196 @@
+<?php
+    /**
+     *	adapter for SimpleTest to use PEAR PHPUnit test cases
+     *	@package	SimpleTest
+     *	@subpackage Extensions
+     *	@version	$Id: pear_test_case.php 1836 2008-12-21 00:02:26Z edwardzyang $
+     */
+    
+    /**#@+
+     * include SimpleTest files
+     */
+    require_once(dirname(__FILE__) . '/../dumper.php');
+    require_once(dirname(__FILE__) . '/../compatibility.php');
+    require_once(dirname(__FILE__) . '/../test_case.php');
+    require_once(dirname(__FILE__) . '/../expectation.php');
+	/**#@-*/
+   
+    /**
+     *    Adapter for PEAR PHPUnit test case to allow
+     *    legacy PEAR test cases to be used with SimpleTest.
+     *    @package      SimpleTest
+     *    @subpackage   Extensions
+     */
+    class PHPUnit_TestCase extends SimpleTestCase {
+        private $_loosely_typed;
+        
+        /**
+         *    Constructor. Sets the test name.
+         *    @param $label        Test name to display.
+         *    @public
+         */
+        function __construct($label = false) {
+            parent::__construct($label);
+            $this->_loosely_typed = false;
+        }
+        
+        /**
+         *    Will test straight equality if set to loose
+         *    typing, or identity if not.
+         *    @param $first          First value.
+         *    @param $second         Comparison value.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertEquals($first, $second, $message = "%s", $delta = 0) {
+            if ($this->_loosely_typed) {
+                $expectation = new EqualExpectation($first);
+            } else {
+                $expectation = new IdenticalExpectation($first);
+            }
+            $this->assert($expectation, $second, $message);
+        }
+        
+        /**
+         *    Passes if the value tested is not null.
+         *    @param $value          Value to test against.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertNotNull($value, $message = "%s") {
+            parent::assert(new TrueExpectation(), isset($value), $message);
+        }
+        
+        /**
+         *    Passes if the value tested is null.
+         *    @param $value          Value to test against.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertNull($value, $message = "%s") {
+            parent::assert(new TrueExpectation(), !isset($value), $message);
+        }
+        
+        /**
+         *    Identity test tests for the same object.
+         *    @param $first          First object handle.
+         *    @param $second         Hopefully the same handle.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertSame($first, $second, $message = "%s") {
+            $dumper = new SimpleDumper();
+            $message = sprintf(
+                    $message,
+                    "[" . $dumper->describeValue($first) .
+                            "] and [" . $dumper->describeValue($second) .
+                            "] should reference the same object");
+            return $this->assert(
+					new TrueExpectation(),
+                    SimpleTestCompatibility::isReference($first, $second),
+                    $message);
+        }
+        
+        /**
+         *    Inverted identity test.
+         *    @param $first          First object handle.
+         *    @param $second         Hopefully a different handle.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertNotSame($first, $second, $message = "%s") {
+            $dumper = new SimpleDumper();
+            $message = sprintf(
+                    $message,
+                    "[" . $dumper->describeValue($first) .
+                            "] and [" . $dumper->describeValue($second) .
+                            "] should not be the same object");
+            return $this->assert(
+					new falseExpectation(),
+                    SimpleTestCompatibility::isReference($first, $second),
+                    $message);
+        }
+        
+        /**
+         *    Sends pass if the test condition resolves true,
+         *    a fail otherwise.
+         *    @param $condition      Condition to test true.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertTrue($condition, $message = "%s") {
+            parent::assert(new TrueExpectation(), $condition, $message);
+        }
+        
+        /**
+         *    Sends pass if the test condition resolves false,
+         *    a fail otherwise.
+         *    @param $condition      Condition to test false.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertFalse($condition, $message = "%s") {
+            parent::assert(new FalseExpectation(), $condition, $message);
+        }
+        
+        /**
+         *    Tests a regex match. Needs refactoring.
+         *    @param $pattern        Regex to match.
+         *    @param $subject        String to search in.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertRegExp($pattern, $subject, $message = "%s") {
+            $this->assert(new PatternExpectation($pattern), $subject, $message);
+        }
+        
+        /**
+         *    Tests the type of a value.
+         *    @param $value          Value to take type of.
+         *    @param $type           Hoped for type.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertType($value, $type, $message = "%s") {
+            parent::assert(new TrueExpectation(), gettype($value) == strtolower($type), $message);
+        }
+        
+        /**
+         *    Sets equality operation to act as a simple equal
+         *    comparison only, allowing a broader range of
+         *    matches.
+         *    @param $loosely_typed     True for broader comparison.
+         *    @public
+         */
+        function setLooselyTyped($loosely_typed) {
+            $this->_loosely_typed = $loosely_typed;
+        }
+
+        /**
+         *    For progress indication during
+         *    a test amongst other things.
+         *    @return            Usually one.
+         *    @public
+         */
+        function countTestCases() {
+            return $this->getSize();
+        }
+        
+        /**
+         *    Accessor for name, normally just the class
+         *    name.
+         *    @public
+         */
+        function getName() {
+            return $this->getLabel();
+        }
+        
+        /**
+         *    Does nothing. For compatibility only.
+         *    @param $name        Dummy
+         *    @public
+         */
+        function setName($name) {
+        }
+    }
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/testdox.php b/3rdparty/simpletest/extensions/testdox.php
new file mode 100755
index 00000000000..5cf32f35162
--- /dev/null
+++ b/3rdparty/simpletest/extensions/testdox.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ *	Extension for a TestDox reporter
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ *	@version	$Id: testdox.php 2004 2010-10-31 13:44:14Z jsweat $
+ */
+
+/**
+ * 	TestDox reporter 
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ */
+class TestDoxReporter extends SimpleReporter
+{
+    var $_test_case_pattern = '/^TestOf(.*)$/';
+
+    function __construct($test_case_pattern = '/^TestOf(.*)$/') {
+        parent::__construct();
+        $this->_test_case_pattern = empty($test_case_pattern) ? '/^(.*)$/' : $test_case_pattern;
+    }
+
+    function paintCaseStart($test_name) {
+        preg_match($this->_test_case_pattern, $test_name, $matches);
+        if (!empty($matches[1])) {
+            echo $matches[1] . "\n";
+        } else {
+            echo $test_name . "\n";
+        }
+    }
+
+    function paintCaseEnd($test_name) {
+        echo "\n";
+    }
+
+    function paintMethodStart($test_name) {
+        if (!preg_match('/^test(.*)$/i', $test_name, $matches)) {
+            return;
+        }
+        $test_name = $matches[1];
+        $test_name = preg_replace('/([A-Z])([A-Z])/', '$1 $2', $test_name);
+        echo '- ' . strtolower(preg_replace('/([a-zA-Z])([A-Z0-9])/', '$1 $2', $test_name));
+    }
+
+    function paintMethodEnd($test_name) {
+        echo "\n";
+    }
+
+    function paintFail($message) {
+        echo " [FAILED]";
+    }
+}
+?>
diff --git a/3rdparty/simpletest/extensions/testdox/test.php b/3rdparty/simpletest/extensions/testdox/test.php
new file mode 100755
index 00000000000..b03abe510ab
--- /dev/null
+++ b/3rdparty/simpletest/extensions/testdox/test.php
@@ -0,0 +1,107 @@
+<?php
+// $Id: test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once dirname(__FILE__) . '/../../autorun.php';
+require_once dirname(__FILE__) . '/../testdox.php';
+
+// uncomment to see test dox in action
+//SimpleTest::prefer(new TestDoxReporter());
+
+class TestOfTestDoxReporter extends UnitTestCase
+{
+    function testIsAnInstanceOfSimpleScorerAndReporter() {
+        $dox = new TestDoxReporter();
+        $this->assertIsA($dox, 'SimpleScorer');
+        $this->assertIsA($dox, 'SimpleReporter');
+    }
+
+    function testOutputsNameOfTestCase() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintCaseStart('TestOfTestDoxReporter');
+        $buffer = ob_get_clean();
+        $this->assertPattern('/^TestDoxReporter/', $buffer);
+    }
+
+    function testOutputOfTestCaseNameFilteredByConstructParameter() {
+        $dox = new TestDoxReporter('/^(.*)Test$/');
+        ob_start();
+        $dox->paintCaseStart('SomeGreatWidgetTest');
+        $buffer = ob_get_clean();
+        $this->assertPattern('/^SomeGreatWidget/', $buffer);
+    }
+
+    function testIfTest_case_patternIsEmptyAssumeEverythingMatches() {
+        $dox = new TestDoxReporter('');
+        ob_start();
+        $dox->paintCaseStart('TestOfTestDoxReporter');
+        $buffer = ob_get_clean();
+        $this->assertPattern('/^TestOfTestDoxReporter/', $buffer);
+    }
+
+    function testEmptyLineInsertedWhenCaseEnds() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintCaseEnd('TestOfTestDoxReporter');
+        $buffer = ob_get_clean();
+        $this->assertEqual("\n", $buffer);
+    }
+
+    function testPaintsTestMethodInTestDoxFormat() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintMethodStart('testSomeGreatTestCase');
+        $buffer = ob_get_clean();
+        $this->assertEqual("- some great test case", $buffer);
+        unset($buffer);
+
+        $random = rand(100, 200);
+        ob_start();
+        $dox->paintMethodStart("testRandomNumberIs{$random}");
+        $buffer = ob_get_clean();
+        $this->assertEqual("- random number is {$random}", $buffer);
+    }
+
+    function testDoesNotOutputAnythingOnNoneTestMethods() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintMethodStart('nonMatchingMethod');
+        $buffer = ob_get_clean();
+        $this->assertEqual('', $buffer);
+    }
+
+    function testPaintMethodAddLineBreak() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintMethodEnd('someMethod');
+        $buffer = ob_get_clean();
+        $this->assertEqual("\n", $buffer);
+    }
+
+    function testProperlySpacesSingleLettersInMethodName() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintMethodStart('testAVerySimpleAgainAVerySimpleMethod');
+        $buffer = ob_get_clean();
+        $this->assertEqual('- a very simple again a very simple method', $buffer);
+    }
+
+    function testOnFailureThisPrintsFailureNotice() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintFail('');
+        $buffer = ob_get_clean();
+        $this->assertEqual(' [FAILED]', $buffer);
+    }
+
+    function testWhenMatchingMethodNamesTestPrefixIsCaseInsensitive() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintMethodStart('TESTSupportsAllUppercaseTestPrefixEvenThoughIDoNotKnowWhyYouWouldDoThat');
+        $buffer = ob_get_clean();
+        $this->assertEqual(
+            '- supports all uppercase test prefix even though i do not know why you would do that',
+            $buffer
+        );
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/form.php b/3rdparty/simpletest/form.php
new file mode 100644
index 00000000000..5e423a9df82
--- /dev/null
+++ b/3rdparty/simpletest/form.php
@@ -0,0 +1,361 @@
+<?php
+/**
+ *  Base include file for SimpleTest.
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: form.php 2013 2011-04-29 09:29:45Z pp11 $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/tag.php');
+require_once(dirname(__FILE__) . '/encoding.php');
+require_once(dirname(__FILE__) . '/selector.php');
+/**#@-*/
+
+/**
+ *    Form tag class to hold widget values.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleForm {
+    private $method;
+    private $action;
+    private $encoding;
+    private $default_target;
+    private $id;
+    private $buttons;
+    private $images;
+    private $widgets;
+    private $radios;
+    private $checkboxes;
+
+    /**
+     *    Starts with no held controls/widgets.
+     *    @param SimpleTag $tag        Form tag to read.
+     *    @param SimplePage $page      Holding page.
+     */
+    function __construct($tag, $page) {
+        $this->method = $tag->getAttribute('method');
+        $this->action = $this->createAction($tag->getAttribute('action'), $page);
+        $this->encoding = $this->setEncodingClass($tag);
+        $this->default_target = false;
+        $this->id = $tag->getAttribute('id');
+        $this->buttons = array();
+        $this->images = array();
+        $this->widgets = array();
+        $this->radios = array();
+        $this->checkboxes = array();
+    }
+
+    /**
+     *    Creates the request packet to be sent by the form.
+     *    @param SimpleTag $tag        Form tag to read.
+     *    @return string               Packet class.
+     *    @access private
+     */
+    protected function setEncodingClass($tag) {
+        if (strtolower($tag->getAttribute('method')) == 'post') {
+            if (strtolower($tag->getAttribute('enctype')) == 'multipart/form-data') {
+                return 'SimpleMultipartEncoding';
+            }
+            return 'SimplePostEncoding';
+        }
+        return 'SimpleGetEncoding';
+    }
+
+    /**
+     *    Sets the frame target within a frameset.
+     *    @param string $frame        Name of frame.
+     *    @access public
+     */
+    function setDefaultTarget($frame) {
+        $this->default_target = $frame;
+    }
+
+    /**
+     *    Accessor for method of form submission.
+     *    @return string           Either get or post.
+     *    @access public
+     */
+    function getMethod() {
+        return ($this->method ? strtolower($this->method) : 'get');
+    }
+
+    /**
+     *    Combined action attribute with current location
+     *    to get an absolute form target.
+     *    @param string $action    Action attribute from form tag.
+     *    @param SimpleUrl $base   Page location.
+     *    @return SimpleUrl        Absolute form target.
+     */
+    protected function createAction($action, $page) {
+        if (($action === '') || ($action === false)) {
+            return $page->expandUrl($page->getUrl());
+        }
+        return $page->expandUrl(new SimpleUrl($action));;
+    }
+
+    /**
+     *    Absolute URL of the target.
+     *    @return SimpleUrl           URL target.
+     *    @access public
+     */
+    function getAction() {
+        $url = $this->action;
+        if ($this->default_target && ! $url->getTarget()) {
+            $url->setTarget($this->default_target);
+        }
+        if ($this->getMethod() == 'get') {
+            $url->clearRequest();
+        }
+        return $url;
+    }
+
+    /**
+     *    Creates the encoding for the current values in the
+     *    form.
+     *    @return SimpleFormEncoding    Request to submit.
+     *    @access private
+     */
+    protected function encode() {
+        $class = $this->encoding;
+        $encoding = new $class();
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            $this->widgets[$i]->write($encoding);
+        }
+        return $encoding;
+    }
+
+    /**
+     *    ID field of form for unique identification.
+     *    @return string           Unique tag ID.
+     *    @access public
+     */
+    function getId() {
+        return $this->id;
+    }
+
+    /**
+     *    Adds a tag contents to the form.
+     *    @param SimpleWidget $tag        Input tag to add.
+     */
+    function addWidget($tag) {
+        if (strtolower($tag->getAttribute('type')) == 'submit') {
+            $this->buttons[] = $tag;
+        } elseif (strtolower($tag->getAttribute('type')) == 'image') {
+            $this->images[] = $tag;
+        } elseif ($tag->getName()) {
+            $this->setWidget($tag);
+        }
+    }
+
+    /**
+     *    Sets the widget into the form, grouping radio
+     *    buttons if any.
+     *    @param SimpleWidget $tag   Incoming form control.
+     *    @access private
+     */
+    protected function setWidget($tag) {
+        if (strtolower($tag->getAttribute('type')) == 'radio') {
+            $this->addRadioButton($tag);
+        } elseif (strtolower($tag->getAttribute('type')) == 'checkbox') {
+            $this->addCheckbox($tag);
+        } else {
+            $this->widgets[] = &$tag;
+        }
+    }
+
+    /**
+     *    Adds a radio button, building a group if necessary.
+     *    @param SimpleRadioButtonTag $tag   Incoming form control.
+     *    @access private
+     */
+    protected function addRadioButton($tag) {
+        if (! isset($this->radios[$tag->getName()])) {
+            $this->widgets[] = new SimpleRadioGroup();
+            $this->radios[$tag->getName()] = count($this->widgets) - 1;
+        }
+        $this->widgets[$this->radios[$tag->getName()]]->addWidget($tag);
+    }
+
+    /**
+     *    Adds a checkbox, making it a group on a repeated name.
+     *    @param SimpleCheckboxTag $tag   Incoming form control.
+     *    @access private
+     */
+    protected function addCheckbox($tag) {
+        if (! isset($this->checkboxes[$tag->getName()])) {
+            $this->widgets[] = $tag;
+            $this->checkboxes[$tag->getName()] = count($this->widgets) - 1;
+        } else {
+            $index = $this->checkboxes[$tag->getName()];
+            if (! SimpleTestCompatibility::isA($this->widgets[$index], 'SimpleCheckboxGroup')) {
+                $previous = $this->widgets[$index];
+                $this->widgets[$index] = new SimpleCheckboxGroup();
+                $this->widgets[$index]->addWidget($previous);
+            }
+            $this->widgets[$index]->addWidget($tag);
+        }
+    }
+
+    /**
+     *    Extracts current value from form.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @return string/array              Value(s) as string or null
+     *                                      if not set.
+     *    @access public
+     */
+    function getValue($selector) {
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            if ($selector->isMatch($this->widgets[$i])) {
+                return $this->widgets[$i]->getValue();
+            }
+        }
+        foreach ($this->buttons as $button) {
+            if ($selector->isMatch($button)) {
+                return $button->getValue();
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Sets a widget value within the form.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @param string $value              Value to input into the widget.
+     *    @return boolean                   True if value is legal, false
+     *                                      otherwise. If the field is not
+     *                                      present, nothing will be set.
+     *    @access public
+     */
+    function setField($selector, $value, $position=false) {
+        $success = false;
+        $_position = 0;
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            if ($selector->isMatch($this->widgets[$i])) {
+                $_position++;
+                if ($position === false or $_position === (int)$position) {
+                    if ($this->widgets[$i]->setValue($value)) {
+                        $success = true;
+                    }
+                }
+            }
+        }
+        return $success;
+    }
+
+    /**
+     *    Used by the page object to set widgets labels to
+     *    external label tags.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @access public
+     */
+    function attachLabelBySelector($selector, $label) {
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            if ($selector->isMatch($this->widgets[$i])) {
+                if (method_exists($this->widgets[$i], 'setLabel')) {
+                    $this->widgets[$i]->setLabel($label);
+                    return;
+                }
+            }
+        }
+    }
+
+    /**
+     *    Test to see if a form has a submit button.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @return boolean                   True if present.
+     *    @access public
+     */
+    function hasSubmit($selector) {
+        foreach ($this->buttons as $button) {
+            if ($selector->isMatch($button)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Test to see if a form has an image control.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @return boolean                   True if present.
+     *    @access public
+     */
+    function hasImage($selector) {
+        foreach ($this->images as $image) {
+            if ($selector->isMatch($image)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Gets the submit values for a selected button.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @param hash $additional           Additional data for the form.
+     *    @return SimpleEncoding            Submitted values or false
+     *                                      if there is no such button
+     *                                      in the form.
+     *    @access public
+     */
+    function submitButton($selector, $additional = false) {
+        $additional = $additional ? $additional : array();
+        foreach ($this->buttons as $button) {
+            if ($selector->isMatch($button)) {
+                $encoding = $this->encode();
+                $button->write($encoding);
+                if ($additional) {
+                    $encoding->merge($additional);
+                }
+                return $encoding;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Gets the submit values for an image.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @param integer $x                 X-coordinate of click.
+     *    @param integer $y                 Y-coordinate of click.
+     *    @param hash $additional           Additional data for the form.
+     *    @return SimpleEncoding            Submitted values or false
+     *                                      if there is no such button in the
+     *                                      form.
+     *    @access public
+     */
+    function submitImage($selector, $x, $y, $additional = false) {
+        $additional = $additional ? $additional : array();
+        foreach ($this->images as $image) {
+            if ($selector->isMatch($image)) {
+                $encoding = $this->encode();
+                $image->write($encoding, $x, $y);
+                if ($additional) {
+                    $encoding->merge($additional);
+                }
+                return $encoding;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Simply submits the form without the submit button
+     *    value. Used when there is only one button or it
+     *    is unimportant.
+     *    @return hash           Submitted values.
+     *    @access public
+     */
+    function submit($additional = false) {
+        $encoding = $this->encode();
+        if ($additional) {
+            $encoding->merge($additional);
+        }
+        return $encoding;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/frames.php b/3rdparty/simpletest/frames.php
new file mode 100755
index 00000000000..d6d8e96fd0c
--- /dev/null
+++ b/3rdparty/simpletest/frames.php
@@ -0,0 +1,592 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: frames.php 1784 2008-04-26 13:07:14Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/page.php');
+require_once(dirname(__FILE__) . '/user_agent.php');
+/**#@-*/
+
+/**
+ *    A composite page. Wraps a frameset page and
+ *    adds subframes. The original page will be
+ *    mostly ignored. Implements the SimplePage
+ *    interface so as to be interchangeable.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleFrameset {
+    private $frameset;
+    private $frames;
+    private $focus;
+    private $names;
+
+    /**
+     *    Stashes the frameset page. Will make use of the
+     *    browser to fetch the sub frames recursively.
+     *    @param SimplePage $page        Frameset page.
+     */
+    function __construct($page) {
+        $this->frameset = $page;
+        $this->frames = array();
+        $this->focus = false;
+        $this->names = array();
+    }
+
+    /**
+     *    Adds a parsed page to the frameset.
+     *    @param SimplePage $page    Frame page.
+     *    @param string $name        Name of frame in frameset.
+     *    @access public
+     */
+    function addFrame($page, $name = false) {
+        $this->frames[] = $page;
+        if ($name) {
+            $this->names[$name] = count($this->frames) - 1;
+        }
+    }
+
+    /**
+     *    Replaces existing frame with another. If the
+     *    frame is nested, then the call is passed down
+     *    one level.
+     *    @param array $path        Path of frame in frameset.
+     *    @param SimplePage $page   Frame source.
+     *    @access public
+     */
+    function setFrame($path, $page) {
+        $name = array_shift($path);
+        if (isset($this->names[$name])) {
+            $index = $this->names[$name];
+        } else {
+            $index = $name - 1;
+        }
+        if (count($path) == 0) {
+            $this->frames[$index] = &$page;
+            return;
+        }
+        $this->frames[$index]->setFrame($path, $page);
+    }
+
+    /**
+     *    Accessor for current frame focus. Will be
+     *    false if no frame has focus. Will have the nested
+     *    frame focus if any.
+     *    @return array     Labels or indexes of nested frames.
+     *    @access public
+     */
+    function getFrameFocus() {
+        if ($this->focus === false) {
+            return array();
+        }
+        return array_merge(
+                array($this->getPublicNameFromIndex($this->focus)),
+                $this->frames[$this->focus]->getFrameFocus());
+    }
+
+    /**
+     *    Turns an internal array index into the frames list
+     *    into a public name, or if none, then a one offset
+     *    index.
+     *    @param integer $subject    Internal index.
+     *    @return integer/string     Public name.
+     *    @access private
+     */
+    protected function getPublicNameFromIndex($subject) {
+        foreach ($this->names as $name => $index) {
+            if ($subject == $index) {
+                return $name;
+            }
+        }
+        return $subject + 1;
+    }
+
+    /**
+     *    Sets the focus by index. The integer index starts from 1.
+     *    If already focused and the target frame also has frames,
+     *    then the nested frame will be focused.
+     *    @param integer $choice    Chosen frame.
+     *    @return boolean           True if frame exists.
+     *    @access public
+     */
+    function setFrameFocusByIndex($choice) {
+        if (is_integer($this->focus)) {
+            if ($this->frames[$this->focus]->hasFrames()) {
+                return $this->frames[$this->focus]->setFrameFocusByIndex($choice);
+            }
+        }
+        if (($choice < 1) || ($choice > count($this->frames))) {
+            return false;
+        }
+        $this->focus = $choice - 1;
+        return true;
+    }
+
+    /**
+     *    Sets the focus by name. If already focused and the
+     *    target frame also has frames, then the nested frame
+     *    will be focused.
+     *    @param string $name    Chosen frame.
+     *    @return boolean        True if frame exists.
+     *    @access public
+     */
+    function setFrameFocus($name) {
+        if (is_integer($this->focus)) {
+            if ($this->frames[$this->focus]->hasFrames()) {
+                return $this->frames[$this->focus]->setFrameFocus($name);
+            }
+        }
+        if (in_array($name, array_keys($this->names))) {
+            $this->focus = $this->names[$name];
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     *    Clears the frame focus.
+     *    @access public
+     */
+    function clearFrameFocus() {
+        $this->focus = false;
+        $this->clearNestedFramesFocus();
+    }
+
+    /**
+     *    Clears the frame focus for any nested frames.
+     *    @access private
+     */
+    protected function clearNestedFramesFocus() {
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $this->frames[$i]->clearFrameFocus();
+        }
+    }
+
+    /**
+     *    Test for the presence of a frameset.
+     *    @return boolean        Always true.
+     *    @access public
+     */
+    function hasFrames() {
+        return true;
+    }
+
+    /**
+     *    Accessor for frames information.
+     *    @return array/string      Recursive hash of frame URL strings.
+     *                              The key is either a numerical
+     *                              index or the name attribute.
+     *    @access public
+     */
+    function getFrames() {
+        $report = array();
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $report[$this->getPublicNameFromIndex($i)] =
+                    $this->frames[$i]->getFrames();
+        }
+        return $report;
+    }
+
+    /**
+     *    Accessor for raw text of either all the pages or
+     *    the frame in focus.
+     *    @return string        Raw unparsed content.
+     *    @access public
+     */
+    function getRaw() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getRaw();
+        }
+        $raw = '';
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $raw .= $this->frames[$i]->getRaw();
+        }
+        return $raw;
+    }
+
+    /**
+     *    Accessor for plain text of either all the pages or
+     *    the frame in focus.
+     *    @return string        Plain text content.
+     *    @access public
+     */
+    function getText() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getText();
+        }
+        $raw = '';
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $raw .= ' ' . $this->frames[$i]->getText();
+        }
+        return trim($raw);
+    }
+
+    /**
+     *    Accessor for last error.
+     *    @return string        Error from last response.
+     *    @access public
+     */
+    function getTransportError() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getTransportError();
+        }
+        return $this->frameset->getTransportError();
+    }
+
+    /**
+     *    Request method used to fetch this frame.
+     *    @return string      GET, POST or HEAD.
+     *    @access public
+     */
+    function getMethod() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getMethod();
+        }
+        return $this->frameset->getMethod();
+    }
+
+    /**
+     *    Original resource name.
+     *    @return SimpleUrl        Current url.
+     *    @access public
+     */
+    function getUrl() {
+        if (is_integer($this->focus)) {
+            $url = $this->frames[$this->focus]->getUrl();
+            $url->setTarget($this->getPublicNameFromIndex($this->focus));
+        } else {
+            $url = $this->frameset->getUrl();
+        }
+        return $url;
+    }
+
+    /**
+     *    Page base URL.
+     *    @return SimpleUrl        Current url.
+     *    @access public
+     */
+    function getBaseUrl() {
+        if (is_integer($this->focus)) {
+            $url = $this->frames[$this->focus]->getBaseUrl();
+        } else {
+            $url = $this->frameset->getBaseUrl();
+        }
+        return $url;
+    }
+
+    /**
+     *    Expands expandomatic URLs into fully qualified
+     *    URLs for the frameset page.
+     *    @param SimpleUrl $url        Relative URL.
+     *    @return SimpleUrl            Absolute URL.
+     *    @access public
+     */
+    function expandUrl($url) {
+        return $this->frameset->expandUrl($url);
+    }
+
+    /**
+     *    Original request data.
+     *    @return mixed              Sent content.
+     *    @access public
+     */
+    function getRequestData() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getRequestData();
+        }
+        return $this->frameset->getRequestData();
+    }
+
+    /**
+     *    Accessor for current MIME type.
+     *    @return string    MIME type as string; e.g. 'text/html'
+     *    @access public
+     */
+    function getMimeType() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getMimeType();
+        }
+        return $this->frameset->getMimeType();
+    }
+
+    /**
+     *    Accessor for last response code.
+     *    @return integer    Last HTTP response code received.
+     *    @access public
+     */
+    function getResponseCode() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getResponseCode();
+        }
+        return $this->frameset->getResponseCode();
+    }
+
+    /**
+     *    Accessor for last Authentication type. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Description of challenge type.
+     *    @access public
+     */
+    function getAuthentication() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getAuthentication();
+        }
+        return $this->frameset->getAuthentication();
+    }
+
+    /**
+     *    Accessor for last Authentication realm. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Name of security realm.
+     *    @access public
+     */
+    function getRealm() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getRealm();
+        }
+        return $this->frameset->getRealm();
+    }
+
+    /**
+     *    Accessor for outgoing header information.
+     *    @return string      Header block.
+     *    @access public
+     */
+    function getRequest() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getRequest();
+        }
+        return $this->frameset->getRequest();
+    }
+
+    /**
+     *    Accessor for raw header information.
+     *    @return string      Header block.
+     *    @access public
+     */
+    function getHeaders() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getHeaders();
+        }
+        return $this->frameset->getHeaders();
+    }
+
+    /**
+     *    Accessor for parsed title.
+     *    @return string     Title or false if no title is present.
+     *    @access public
+     */
+    function getTitle() {
+        return $this->frameset->getTitle();
+    }
+
+    /**
+     *    Accessor for a list of all fixed links.
+     *    @return array   List of urls as strings.
+     *    @access public
+     */
+    function getUrls() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getUrls();
+        }
+        $urls = array();
+        foreach ($this->frames as $frame) {
+            $urls = array_merge($urls, $frame->getUrls());
+        }
+        return array_values(array_unique($urls));
+    }
+
+    /**
+     *    Accessor for URLs by the link label. Label will match
+     *    regardess of whitespace issues and case.
+     *    @param string $label    Text of link.
+     *    @return array           List of links with that label.
+     *    @access public
+     */
+    function getUrlsByLabel($label) {
+        if (is_integer($this->focus)) {
+            return $this->tagUrlsWithFrame(
+                    $this->frames[$this->focus]->getUrlsByLabel($label),
+                    $this->focus);
+        }
+        $urls = array();
+        foreach ($this->frames as $index => $frame) {
+            $urls = array_merge(
+                    $urls,
+                    $this->tagUrlsWithFrame(
+                                $frame->getUrlsByLabel($label),
+                                $index));
+        }
+        return $urls;
+    }
+
+    /**
+     *    Accessor for a URL by the id attribute. If in a frameset
+     *    then the first link found with that ID attribute is
+     *    returned only. Focus on a frame if you want one from
+     *    a specific part of the frameset.
+     *    @param string $id       Id attribute of link.
+     *    @return string          URL with that id.
+     *    @access public
+     */
+    function getUrlById($id) {
+        foreach ($this->frames as $index => $frame) {
+            if ($url = $frame->getUrlById($id)) {
+                if (! $url->gettarget()) {
+                    $url->setTarget($this->getPublicNameFromIndex($index));
+                }
+                return $url;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Attaches the intended frame index to a list of URLs.
+     *    @param array $urls        List of SimpleUrls.
+     *    @param string $frame      Name of frame or index.
+     *    @return array             List of tagged URLs.
+     *    @access private
+     */
+    protected function tagUrlsWithFrame($urls, $frame) {
+        $tagged = array();
+        foreach ($urls as $url) {
+            if (! $url->getTarget()) {
+                $url->setTarget($this->getPublicNameFromIndex($frame));
+            }
+            $tagged[] = $url;
+        }
+        return $tagged;
+    }
+
+    /**
+     *    Finds a held form by button label. Will only
+     *    search correctly built forms.
+     *    @param SimpleSelector $selector       Button finder.
+     *    @return SimpleForm                    Form object containing
+     *                                          the button.
+     *    @access public
+     */
+    function getFormBySubmit($selector) {
+        return $this->findForm('getFormBySubmit', $selector);
+    }
+
+    /**
+     *    Finds a held form by image using a selector.
+     *    Will only search correctly built forms. The first
+     *    form found either within the focused frame, or
+     *    across frames, will be the one returned.
+     *    @param SimpleSelector $selector  Image finder.
+     *    @return SimpleForm               Form object containing
+     *                                     the image.
+     *    @access public
+     */
+    function getFormByImage($selector) {
+        return $this->findForm('getFormByImage', $selector);
+    }
+
+    /**
+     *    Finds a held form by the form ID. A way of
+     *    identifying a specific form when we have control
+     *    of the HTML code. The first form found
+     *    either within the focused frame, or across frames,
+     *    will be the one returned.
+     *    @param string $id     Form label.
+     *    @return SimpleForm    Form object containing the matching ID.
+     *    @access public
+     */
+    function getFormById($id) {
+        return $this->findForm('getFormById', $id);
+    }
+
+    /**
+        *    General form finder. Will search all the frames or
+        *    just the one in focus.
+        *    @param string $method    Method to use to find in a page.
+        *    @param string $attribute Label, name or ID.
+        *    @return SimpleForm    Form object containing the matching ID.
+        *    @access private
+        */
+    protected function findForm($method, $attribute) {
+        if (is_integer($this->focus)) {
+            return $this->findFormInFrame(
+                    $this->frames[$this->focus],
+                    $this->focus,
+                    $method,
+                    $attribute);
+        }
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $form = $this->findFormInFrame(
+                    $this->frames[$i],
+                    $i,
+                    $method,
+                    $attribute);
+            if ($form) {
+                return $form;
+            }
+        }
+        $null = null;
+        return $null;
+    }
+
+    /**
+     *    Finds a form in a page using a form finding method. Will
+     *    also tag the form with the frame name it belongs in.
+     *    @param SimplePage $page  Page content of frame.
+     *    @param integer $index    Internal frame representation.
+     *    @param string $method    Method to use to find in a page.
+     *    @param string $attribute Label, name or ID.
+     *    @return SimpleForm       Form object containing the matching ID.
+     *    @access private
+     */
+    protected function findFormInFrame($page, $index, $method, $attribute) {
+        $form = $this->frames[$index]->$method($attribute);
+        if (isset($form)) {
+            $form->setDefaultTarget($this->getPublicNameFromIndex($index));
+        }
+        return $form;
+    }
+
+    /**
+     *    Sets a field on each form in which the field is
+     *    available.
+     *    @param SimpleSelector $selector    Field finder.
+     *    @param string $value               Value to set field to.
+     *    @return boolean                    True if value is valid.
+     *    @access public
+     */
+    function setField($selector, $value) {
+        if (is_integer($this->focus)) {
+            $this->frames[$this->focus]->setField($selector, $value);
+        } else {
+            for ($i = 0; $i < count($this->frames); $i++) {
+                $this->frames[$i]->setField($selector, $value);
+            }
+        }
+    }
+
+    /**
+     *    Accessor for a form element value within a page.
+     *    @param SimpleSelector $selector    Field finder.
+     *    @return string/boolean             A string if the field is
+     *                                       present, false if unchecked
+     *                                       and null if missing.
+     *    @access public
+     */
+    function getField($selector) {
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $value = $this->frames[$i]->getField($selector);
+            if (isset($value)) {
+                return $value;
+            }
+        }
+        return null;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/http.php b/3rdparty/simpletest/http.php
new file mode 100644
index 00000000000..1bd74031a48
--- /dev/null
+++ b/3rdparty/simpletest/http.php
@@ -0,0 +1,628 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: http.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/socket.php');
+require_once(dirname(__FILE__) . '/cookies.php');
+require_once(dirname(__FILE__) . '/url.php');
+/**#@-*/
+
+/**
+ *    Creates HTTP headers for the end point of
+ *    a HTTP request.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleRoute {
+    private $url;
+
+    /**
+     *    Sets the target URL.
+     *    @param SimpleUrl $url   URL as object.
+     *    @access public
+     */
+    function __construct($url) {
+        $this->url = $url;
+    }
+
+    /**
+     *    Resource name.
+     *    @return SimpleUrl        Current url.
+     *    @access protected
+     */
+    function getUrl() {
+        return $this->url;
+    }
+
+    /**
+     *    Creates the first line which is the actual request.
+     *    @param string $method   HTTP request method, usually GET.
+     *    @return string          Request line content.
+     *    @access protected
+     */
+    protected function getRequestLine($method) {
+        return $method . ' ' . $this->url->getPath() .
+                $this->url->getEncodedRequest() . ' HTTP/1.0';
+    }
+
+    /**
+     *    Creates the host part of the request.
+     *    @return string          Host line content.
+     *    @access protected
+     */
+    protected function getHostLine() {
+        $line = 'Host: ' . $this->url->getHost();
+        if ($this->url->getPort()) {
+            $line .= ':' . $this->url->getPort();
+        }
+        return $line;
+    }
+
+    /**
+     *    Opens a socket to the route.
+     *    @param string $method      HTTP request method, usually GET.
+     *    @param integer $timeout    Connection timeout.
+     *    @return SimpleSocket       New socket.
+     *    @access public
+     */
+    function createConnection($method, $timeout) {
+        $default_port = ('https' == $this->url->getScheme()) ? 443 : 80;
+        $socket = $this->createSocket(
+                $this->url->getScheme() ? $this->url->getScheme() : 'http',
+                $this->url->getHost(),
+                $this->url->getPort() ? $this->url->getPort() : $default_port,
+                $timeout);
+        if (! $socket->isError()) {
+            $socket->write($this->getRequestLine($method) . "\r\n");
+            $socket->write($this->getHostLine() . "\r\n");
+            $socket->write("Connection: close\r\n");
+        }
+        return $socket;
+    }
+
+    /**
+     *    Factory for socket.
+     *    @param string $scheme                   Protocol to use.
+     *    @param string $host                     Hostname to connect to.
+     *    @param integer $port                    Remote port.
+     *    @param integer $timeout                 Connection timeout.
+     *    @return SimpleSocket/SimpleSecureSocket New socket.
+     *    @access protected
+     */
+    protected function createSocket($scheme, $host, $port, $timeout) {
+        if (in_array($scheme, array('file'))) {
+            return new SimpleFileSocket($this->url);
+        } elseif (in_array($scheme, array('https'))) {
+            return new SimpleSecureSocket($host, $port, $timeout);
+        } else {
+            return new SimpleSocket($host, $port, $timeout);
+        }
+    }
+}
+
+/**
+ *    Creates HTTP headers for the end point of
+ *    a HTTP request via a proxy server.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleProxyRoute extends SimpleRoute {
+    private $proxy;
+    private $username;
+    private $password;
+
+    /**
+     *    Stashes the proxy address.
+     *    @param SimpleUrl $url     URL as object.
+     *    @param string $proxy      Proxy URL.
+     *    @param string $username   Username for autentication.
+     *    @param string $password   Password for autentication.
+     *    @access public
+     */
+    function __construct($url, $proxy, $username = false, $password = false) {
+        parent::__construct($url);
+        $this->proxy = $proxy;
+        $this->username = $username;
+        $this->password = $password;
+    }
+
+    /**
+     *    Creates the first line which is the actual request.
+     *    @param string $method   HTTP request method, usually GET.
+     *    @param SimpleUrl $url   URL as object.
+     *    @return string          Request line content.
+     *    @access protected
+     */
+    function getRequestLine($method) {
+        $url = $this->getUrl();
+        $scheme = $url->getScheme() ? $url->getScheme() : 'http';
+        $port = $url->getPort() ? ':' . $url->getPort() : '';
+        return $method . ' ' . $scheme . '://' . $url->getHost() . $port .
+                $url->getPath() . $url->getEncodedRequest() . ' HTTP/1.0';
+    }
+
+    /**
+     *    Creates the host part of the request.
+     *    @param SimpleUrl $url   URL as object.
+     *    @return string          Host line content.
+     *    @access protected
+     */
+    function getHostLine() {
+        $host = 'Host: ' . $this->proxy->getHost();
+        $port = $this->proxy->getPort() ? $this->proxy->getPort() : 8080;
+        return "$host:$port";
+    }
+
+    /**
+     *    Opens a socket to the route.
+     *    @param string $method       HTTP request method, usually GET.
+     *    @param integer $timeout     Connection timeout.
+     *    @return SimpleSocket        New socket.
+     *    @access public
+     */
+    function createConnection($method, $timeout) {
+        $socket = $this->createSocket(
+                $this->proxy->getScheme() ? $this->proxy->getScheme() : 'http',
+                $this->proxy->getHost(),
+                $this->proxy->getPort() ? $this->proxy->getPort() : 8080,
+                $timeout);
+        if ($socket->isError()) {
+            return $socket;
+        }
+        $socket->write($this->getRequestLine($method) . "\r\n");
+        $socket->write($this->getHostLine() . "\r\n");
+        if ($this->username && $this->password) {
+            $socket->write('Proxy-Authorization: Basic ' .
+                    base64_encode($this->username . ':' . $this->password) .
+                    "\r\n");
+        }
+        $socket->write("Connection: close\r\n");
+        return $socket;
+    }
+}
+
+/**
+ *    HTTP request for a web page. Factory for
+ *    HttpResponse object.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHttpRequest {
+    private $route;
+    private $encoding;
+    private $headers;
+    private $cookies;
+
+    /**
+     *    Builds the socket request from the different pieces.
+     *    These include proxy information, URL, cookies, headers,
+     *    request method and choice of encoding.
+     *    @param SimpleRoute $route              Request route.
+     *    @param SimpleFormEncoding $encoding    Content to send with
+     *                                           request.
+     *    @access public
+     */
+    function __construct($route, $encoding) {
+        $this->route = $route;
+        $this->encoding = $encoding;
+        $this->headers = array();
+        $this->cookies = array();
+    }
+
+    /**
+     *    Dispatches the content to the route's socket.
+     *    @param integer $timeout      Connection timeout.
+     *    @return SimpleHttpResponse   A response which may only have
+     *                                 an error, but hopefully has a
+     *                                 complete web page.
+     *    @access public
+     */
+    function fetch($timeout) {
+        $socket = $this->route->createConnection($this->encoding->getMethod(), $timeout);
+        if (! $socket->isError()) {
+            $this->dispatchRequest($socket, $this->encoding);
+        }
+        return $this->createResponse($socket);
+    }
+
+    /**
+     *    Sends the headers.
+     *    @param SimpleSocket $socket           Open socket.
+     *    @param string $method                 HTTP request method,
+     *                                          usually GET.
+     *    @param SimpleFormEncoding $encoding   Content to send with request.
+     *    @access private
+     */
+    protected function dispatchRequest($socket, $encoding) {
+        foreach ($this->headers as $header_line) {
+            $socket->write($header_line . "\r\n");
+        }
+        if (count($this->cookies) > 0) {
+            $socket->write("Cookie: " . implode(";", $this->cookies) . "\r\n");
+        }
+        $encoding->writeHeadersTo($socket);
+        $socket->write("\r\n");
+        $encoding->writeTo($socket);
+    }
+
+    /**
+     *    Adds a header line to the request.
+     *    @param string $header_line    Text of full header line.
+     *    @access public
+     */
+    function addHeaderLine($header_line) {
+        $this->headers[] = $header_line;
+    }
+
+    /**
+     *    Reads all the relevant cookies from the
+     *    cookie jar.
+     *    @param SimpleCookieJar $jar     Jar to read
+     *    @param SimpleUrl $url           Url to use for scope.
+     *    @access public
+     */
+    function readCookiesFromJar($jar, $url) {
+        $this->cookies = $jar->selectAsPairs($url);
+    }
+
+    /**
+     *    Wraps the socket in a response parser.
+     *    @param SimpleSocket $socket   Responding socket.
+     *    @return SimpleHttpResponse    Parsed response object.
+     *    @access protected
+     */
+    protected function createResponse($socket) {
+        $response = new SimpleHttpResponse(
+                $socket,
+                $this->route->getUrl(),
+                $this->encoding);
+        $socket->close();
+        return $response;
+    }
+}
+
+/**
+ *    Collection of header lines in the response.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHttpHeaders {
+    private $raw_headers;
+    private $response_code;
+    private $http_version;
+    private $mime_type;
+    private $location;
+    private $cookies;
+    private $authentication;
+    private $realm;
+
+    /**
+     *    Parses the incoming header block.
+     *    @param string $headers     Header block.
+     *    @access public
+     */
+    function __construct($headers) {
+        $this->raw_headers = $headers;
+        $this->response_code = false;
+        $this->http_version = false;
+        $this->mime_type = '';
+        $this->location = false;
+        $this->cookies = array();
+        $this->authentication = false;
+        $this->realm = false;
+        foreach (explode("\r\n", $headers) as $header_line) {
+            $this->parseHeaderLine($header_line);
+        }
+    }
+
+    /**
+     *    Accessor for parsed HTTP protocol version.
+     *    @return integer           HTTP error code.
+     *    @access public
+     */
+    function getHttpVersion() {
+        return $this->http_version;
+    }
+
+    /**
+     *    Accessor for raw header block.
+     *    @return string        All headers as raw string.
+     *    @access public
+     */
+    function getRaw() {
+        return $this->raw_headers;
+    }
+
+    /**
+     *    Accessor for parsed HTTP error code.
+     *    @return integer           HTTP error code.
+     *    @access public
+     */
+    function getResponseCode() {
+        return (integer)$this->response_code;
+    }
+
+    /**
+     *    Returns the redirected URL or false if
+     *    no redirection.
+     *    @return string      URL or false for none.
+     *    @access public
+     */
+    function getLocation() {
+        return $this->location;
+    }
+
+    /**
+     *    Test to see if the response is a valid redirect.
+     *    @return boolean       True if valid redirect.
+     *    @access public
+     */
+    function isRedirect() {
+        return in_array($this->response_code, array(301, 302, 303, 307)) &&
+                (boolean)$this->getLocation();
+    }
+
+    /**
+     *    Test to see if the response is an authentication
+     *    challenge.
+     *    @return boolean       True if challenge.
+     *    @access public
+     */
+    function isChallenge() {
+        return ($this->response_code == 401) &&
+                (boolean)$this->authentication &&
+                (boolean)$this->realm;
+    }
+
+    /**
+     *    Accessor for MIME type header information.
+     *    @return string           MIME type.
+     *    @access public
+     */
+    function getMimeType() {
+        return $this->mime_type;
+    }
+
+    /**
+     *    Accessor for authentication type.
+     *    @return string        Type.
+     *    @access public
+     */
+    function getAuthentication() {
+        return $this->authentication;
+    }
+
+    /**
+     *    Accessor for security realm.
+     *    @return string        Realm.
+     *    @access public
+     */
+    function getRealm() {
+        return $this->realm;
+    }
+
+    /**
+     *    Writes new cookies to the cookie jar.
+     *    @param SimpleCookieJar $jar   Jar to write to.
+     *    @param SimpleUrl $url         Host and path to write under.
+     *    @access public
+     */
+    function writeCookiesToJar($jar, $url) {
+        foreach ($this->cookies as $cookie) {
+            $jar->setCookie(
+                    $cookie->getName(),
+                    $cookie->getValue(),
+                    $url->getHost(),
+                    $cookie->getPath(),
+                    $cookie->getExpiry());
+        }
+    }
+
+    /**
+     *    Called on each header line to accumulate the held
+     *    data within the class.
+     *    @param string $header_line        One line of header.
+     *    @access protected
+     */
+    protected function parseHeaderLine($header_line) {
+        if (preg_match('/HTTP\/(\d+\.\d+)\s+(\d+)/i', $header_line, $matches)) {
+            $this->http_version = $matches[1];
+            $this->response_code = $matches[2];
+        }
+        if (preg_match('/Content-type:\s*(.*)/i', $header_line, $matches)) {
+            $this->mime_type = trim($matches[1]);
+        }
+        if (preg_match('/Location:\s*(.*)/i', $header_line, $matches)) {
+            $this->location = trim($matches[1]);
+        }
+        if (preg_match('/Set-cookie:(.*)/i', $header_line, $matches)) {
+            $this->cookies[] = $this->parseCookie($matches[1]);
+        }
+        if (preg_match('/WWW-Authenticate:\s+(\S+)\s+realm=\"(.*?)\"/i', $header_line, $matches)) {
+            $this->authentication = $matches[1];
+            $this->realm = trim($matches[2]);
+        }
+    }
+
+    /**
+     *    Parse the Set-cookie content.
+     *    @param string $cookie_line    Text after "Set-cookie:"
+     *    @return SimpleCookie          New cookie object.
+     *    @access private
+     */
+    protected function parseCookie($cookie_line) {
+        $parts = explode(";", $cookie_line);
+        $cookie = array();
+        preg_match('/\s*(.*?)\s*=(.*)/', array_shift($parts), $cookie);
+        foreach ($parts as $part) {
+            if (preg_match('/\s*(.*?)\s*=(.*)/', $part, $matches)) {
+                $cookie[$matches[1]] = trim($matches[2]);
+            }
+        }
+        return new SimpleCookie(
+                $cookie[1],
+                trim($cookie[2]),
+                isset($cookie["path"]) ? $cookie["path"] : "",
+                isset($cookie["expires"]) ? $cookie["expires"] : false);
+    }
+}
+
+/**
+ *    Basic HTTP response.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHttpResponse extends SimpleStickyError {
+    private $url;
+    private $encoding;
+    private $sent;
+    private $content;
+    private $headers;
+
+    /**
+     *    Constructor. Reads and parses the incoming
+     *    content and headers.
+     *    @param SimpleSocket $socket   Network connection to fetch
+     *                                  response text from.
+     *    @param SimpleUrl $url         Resource name.
+     *    @param mixed $encoding        Record of content sent.
+     *    @access public
+     */
+    function __construct($socket, $url, $encoding) {
+        parent::__construct();
+        $this->url = $url;
+        $this->encoding = $encoding;
+        $this->sent = $socket->getSent();
+        $this->content = false;
+        $raw = $this->readAll($socket);
+        if ($socket->isError()) {
+            $this->setError('Error reading socket [' . $socket->getError() . ']');
+            return;
+        }
+        $this->parse($raw);
+    }
+
+    /**
+     *    Splits up the headers and the rest of the content.
+     *    @param string $raw    Content to parse.
+     *    @access private
+     */
+    protected function parse($raw) {
+        if (! $raw) {
+            $this->setError('Nothing fetched');
+            $this->headers = new SimpleHttpHeaders('');
+        } elseif ('file' == $this->url->getScheme()) {
+            $this->headers = new SimpleHttpHeaders('');
+            $this->content = $raw;
+        } elseif (! strstr($raw, "\r\n\r\n")) {
+            $this->setError('Could not split headers from content');
+            $this->headers = new SimpleHttpHeaders($raw);
+        } else {
+            list($headers, $this->content) = explode("\r\n\r\n", $raw, 2);
+            $this->headers = new SimpleHttpHeaders($headers);
+        }
+    }
+
+    /**
+     *    Original request method.
+     *    @return string        GET, POST or HEAD.
+     *    @access public
+     */
+    function getMethod() {
+        return $this->encoding->getMethod();
+    }
+
+    /**
+     *    Resource name.
+     *    @return SimpleUrl        Current url.
+     *    @access public
+     */
+    function getUrl() {
+        return $this->url;
+    }
+
+    /**
+     *    Original request data.
+     *    @return mixed              Sent content.
+     *    @access public
+     */
+    function getRequestData() {
+        return $this->encoding;
+    }
+
+    /**
+     *    Raw request that was sent down the wire.
+     *    @return string        Bytes actually sent.
+     *    @access public
+     */
+    function getSent() {
+        return $this->sent;
+    }
+
+    /**
+     *    Accessor for the content after the last
+     *    header line.
+     *    @return string           All content.
+     *    @access public
+     */
+    function getContent() {
+        return $this->content;
+    }
+
+    /**
+     *    Accessor for header block. The response is the
+     *    combination of this and the content.
+     *    @return SimpleHeaders        Wrapped header block.
+     *    @access public
+     */
+    function getHeaders() {
+        return $this->headers;
+    }
+
+    /**
+     *    Accessor for any new cookies.
+     *    @return array       List of new cookies.
+     *    @access public
+     */
+    function getNewCookies() {
+        return $this->headers->getNewCookies();
+    }
+
+    /**
+     *    Reads the whole of the socket output into a
+     *    single string.
+     *    @param SimpleSocket $socket  Unread socket.
+     *    @return string               Raw output if successful
+     *                                 else false.
+     *    @access private
+     */
+    protected function readAll($socket) {
+        $all = '';
+        while (! $this->isLastPacket($next = $socket->read())) {
+            $all .= $next;
+        }
+        return $all;
+    }
+
+    /**
+     *    Test to see if the packet from the socket is the
+     *    last one.
+     *    @param string $packet    Chunk to interpret.
+     *    @return boolean          True if empty or EOF.
+     *    @access private
+     */
+    protected function isLastPacket($packet) {
+        if (is_string($packet)) {
+            return $packet === '';
+        }
+        return ! $packet;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/invoker.php b/3rdparty/simpletest/invoker.php
new file mode 100755
index 00000000000..ee310343fc7
--- /dev/null
+++ b/3rdparty/simpletest/invoker.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: invoker.php 1785 2008-04-26 13:56:41Z pp11 $
+ */
+
+/**#@+
+ * Includes SimpleTest files and defined the root constant
+ * for dependent libraries.
+ */
+require_once(dirname(__FILE__) . '/errors.php');
+require_once(dirname(__FILE__) . '/compatibility.php');
+require_once(dirname(__FILE__) . '/scorer.php');
+require_once(dirname(__FILE__) . '/expectation.php');
+require_once(dirname(__FILE__) . '/dumper.php');
+if (! defined('SIMPLE_TEST')) {
+    define('SIMPLE_TEST', dirname(__FILE__) . '/');
+}
+/**#@-*/
+
+/**
+ *    This is called by the class runner to run a
+ *    single test method. Will also run the setUp()
+ *    and tearDown() methods.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleInvoker {
+    private $test_case;
+
+    /**
+     *    Stashes the test case for later.
+     *    @param SimpleTestCase $test_case  Test case to run.
+     */
+    function __construct($test_case) {
+        $this->test_case = $test_case;
+    }
+
+    /**
+     *    Accessor for test case being run.
+     *    @return SimpleTestCase    Test case.
+     *    @access public
+     */
+    function getTestCase() {
+        return $this->test_case;
+    }
+
+    /**
+     *    Runs test level set up. Used for changing
+     *    the mechanics of base test cases.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function before($method) {
+        $this->test_case->before($method);
+    }
+
+    /**
+     *    Invokes a test method and buffered with setUp()
+     *    and tearDown() calls.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function invoke($method) {
+        $this->test_case->setUp();
+        $this->test_case->$method();
+        $this->test_case->tearDown();
+    }
+
+    /**
+     *    Runs test level clean up. Used for changing
+     *    the mechanics of base test cases.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function after($method) {
+        $this->test_case->after($method);
+    }
+}
+
+/**
+ *    Do nothing decorator. Just passes the invocation
+ *    straight through.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleInvokerDecorator {
+    private $invoker;
+
+    /**
+     *    Stores the invoker to wrap.
+     *    @param SimpleInvoker $invoker  Test method runner.
+     */
+    function __construct($invoker) {
+        $this->invoker = $invoker;
+    }
+
+    /**
+     *    Accessor for test case being run.
+     *    @return SimpleTestCase    Test case.
+     *    @access public
+     */
+    function getTestCase() {
+        return $this->invoker->getTestCase();
+    }
+
+    /**
+     *    Runs test level set up. Used for changing
+     *    the mechanics of base test cases.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function before($method) {
+        $this->invoker->before($method);
+    }
+
+    /**
+     *    Invokes a test method and buffered with setUp()
+     *    and tearDown() calls.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function invoke($method) {
+        $this->invoker->invoke($method);
+    }
+
+    /**
+     *    Runs test level clean up. Used for changing
+     *    the mechanics of base test cases.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function after($method) {
+        $this->invoker->after($method);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/mock_objects.php b/3rdparty/simpletest/mock_objects.php
new file mode 100755
index 00000000000..93a827b6c02
--- /dev/null
+++ b/3rdparty/simpletest/mock_objects.php
@@ -0,0 +1,1641 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage MockObjects
+ *  @version    $Id: mock_objects.php 1973 2009-12-22 01:16:59Z lastcraft $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/expectation.php');
+require_once(dirname(__FILE__) . '/simpletest.php');
+require_once(dirname(__FILE__) . '/dumper.php');
+require_once(dirname(__FILE__) . '/reflection_php5.php');
+/**#@-*/
+
+/**
+ * Default character simpletest will substitute for any value
+ */
+if (! defined('MOCK_ANYTHING')) {
+    define('MOCK_ANYTHING', '*');
+}
+
+/**
+ *    Parameter comparison assertion.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class ParametersExpectation extends SimpleExpectation {
+    private $expected;
+
+    /**
+     *    Sets the expected parameter list.
+     *    @param array $parameters  Array of parameters including
+     *                              those that are wildcarded.
+     *                              If the value is not an array
+     *                              then it is considered to match any.
+     *    @param string $message    Customised message on failure.
+     */
+    function __construct($expected = false, $message = '%s') {
+        parent::__construct($message);
+        $this->expected = $expected;
+    }
+
+    /**
+     *    Tests the assertion. True if correct.
+     *    @param array $parameters     Comparison values.
+     *    @return boolean              True if correct.
+     */
+    function test($parameters) {
+        if (! is_array($this->expected)) {
+            return true;
+        }
+        if (count($this->expected) != count($parameters)) {
+            return false;
+        }
+        for ($i = 0; $i < count($this->expected); $i++) {
+            if (! $this->testParameter($parameters[$i], $this->expected[$i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Tests an individual parameter.
+     *    @param mixed $parameter    Value to test.
+     *    @param mixed $expected     Comparison value.
+     *    @return boolean            True if expectation
+     *                               fulfilled.
+     */
+    protected function testParameter($parameter, $expected) {
+        $comparison = $this->coerceToExpectation($expected);
+        return $comparison->test($parameter);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param array $comparison   Incoming parameter list.
+     *    @return string             Description of success
+     *                               or failure.
+     */
+    function testMessage($parameters) {
+        if ($this->test($parameters)) {
+            return "Expectation of " . count($this->expected) .
+                    " arguments of [" . $this->renderArguments($this->expected) .
+                    "] is correct";
+        } else {
+            return $this->describeDifference($this->expected, $parameters);
+        }
+    }
+
+    /**
+     *    Message to display if expectation differs from
+     *    the parameters actually received.
+     *    @param array $expected      Expected parameters as list.
+     *    @param array $parameters    Actual parameters received.
+     *    @return string              Description of difference.
+     */
+    protected function describeDifference($expected, $parameters) {
+        if (count($expected) != count($parameters)) {
+            return "Expected " . count($expected) .
+                    " arguments of [" . $this->renderArguments($expected) .
+                    "] but got " . count($parameters) .
+                    " arguments of [" . $this->renderArguments($parameters) . "]";
+        }
+        $messages = array();
+        for ($i = 0; $i < count($expected); $i++) {
+            $comparison = $this->coerceToExpectation($expected[$i]);
+            if (! $comparison->test($parameters[$i])) {
+                $messages[] = "parameter " . ($i + 1) . " with [" .
+                        $comparison->overlayMessage($parameters[$i], $this->getDumper()) . "]";
+            }
+        }
+        return "Parameter expectation differs at " . implode(" and ", $messages);
+    }
+
+    /**
+     *    Creates an identical expectation if the
+     *    object/value is not already some type
+     *    of expectation.
+     *    @param mixed $expected      Expected value.
+     *    @return SimpleExpectation   Expectation object.
+     */
+    protected function coerceToExpectation($expected) {
+        if (SimpleExpectation::isExpectation($expected)) {
+            return $expected;
+        }
+        return new IdenticalExpectation($expected);
+    }
+
+    /**
+     *    Renders the argument list as a string for
+     *    messages.
+     *    @param array $args    Incoming arguments.
+     *    @return string        Simple description of type and value.
+     */
+    protected function renderArguments($args) {
+        $descriptions = array();
+        if (is_array($args)) {
+            foreach ($args as $arg) {
+                $dumper = new SimpleDumper();
+                $descriptions[] = $dumper->describeValue($arg);
+            }
+        }
+        return implode(', ', $descriptions);
+    }
+}
+
+/**
+ *    Confirms that the number of calls on a method is as expected.
+ *  @package    SimpleTest
+ *  @subpackage MockObjects
+ */
+class CallCountExpectation extends SimpleExpectation {
+    private $method;
+    private $count;
+
+    /**
+     *    Stashes the method and expected count for later
+     *    reporting.
+     *    @param string $method    Name of method to confirm against.
+     *    @param integer $count    Expected number of calls.
+     *    @param string $message   Custom error message.
+     */
+    function __construct($method, $count, $message = '%s') {
+        $this->method = $method;
+        $this->count = $count;
+        parent::__construct($message);
+    }
+
+    /**
+     *    Tests the assertion. True if correct.
+     *    @param integer $compare     Measured call count.
+     *    @return boolean             True if expected.
+     */
+    function test($compare) {
+        return ($this->count == $compare);
+    }
+
+    /**
+     *    Reports the comparison.
+     *    @param integer $compare     Measured call count.
+     *    @return string              Message to show.
+     */
+    function testMessage($compare) {
+        return 'Expected call count for [' . $this->method .
+                '] was [' . $this->count .
+                '] got [' . $compare . ']';
+    }
+}
+
+/**
+ *    Confirms that the number of calls on a method is as expected.
+ *  @package    SimpleTest
+ *  @subpackage MockObjects
+ */
+class MinimumCallCountExpectation extends SimpleExpectation {
+    private $method;
+    private $count;
+
+    /**
+     *    Stashes the method and expected count for later
+     *    reporting.
+     *    @param string $method    Name of method to confirm against.
+     *    @param integer $count    Minimum number of calls.
+     *    @param string $message   Custom error message.
+     */
+    function __construct($method, $count, $message = '%s') {
+        $this->method = $method;
+        $this->count = $count;
+        parent::__construct($message);
+    }
+
+    /**
+     *    Tests the assertion. True if correct.
+     *    @param integer $compare     Measured call count.
+     *    @return boolean             True if enough.
+     */
+    function test($compare) {
+        return ($this->count <= $compare);
+    }
+
+    /**
+     *    Reports the comparison.
+     *    @param integer $compare     Measured call count.
+     *    @return string              Message to show.
+     */
+    function testMessage($compare) {
+        return 'Minimum call count for [' . $this->method .
+                '] was [' . $this->count .
+                '] got [' . $compare . ']';
+    }
+}
+
+/**
+ *    Confirms that the number of calls on a method is as expected.
+ *    @package      SimpleTest
+ *    @subpackage   MockObjects
+ */
+class MaximumCallCountExpectation extends SimpleExpectation {
+    private $method;
+    private $count;
+
+    /**
+     *    Stashes the method and expected count for later
+     *    reporting.
+     *    @param string $method    Name of method to confirm against.
+     *    @param integer $count    Minimum number of calls.
+     *    @param string $message   Custom error message.
+     */
+    function __construct($method, $count, $message = '%s') {
+        $this->method = $method;
+        $this->count = $count;
+        parent::__construct($message);
+    }
+
+    /**
+     *    Tests the assertion. True if correct.
+     *    @param integer $compare     Measured call count.
+     *    @return boolean             True if not over.
+     */
+    function test($compare) {
+        return ($this->count >= $compare);
+    }
+
+    /**
+     *    Reports the comparison.
+     *    @param integer $compare     Measured call count.
+     *    @return string              Message to show.
+     */
+    function testMessage($compare) {
+        return 'Maximum call count for [' . $this->method .
+                '] was [' . $this->count .
+                '] got [' . $compare . ']';
+    }
+}
+
+/**
+ *    Retrieves method actions by searching the
+ *    parameter lists until an expected match is found.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleSignatureMap {
+    private $map;
+
+    /**
+     *    Creates an empty call map.
+     */
+    function __construct() {
+        $this->map = array();
+    }
+
+    /**
+     *    Stashes a reference against a method call.
+     *    @param array $parameters    Array of arguments (including wildcards).
+     *    @param mixed $action        Reference placed in the map.
+     */
+    function add($parameters, $action) {
+        $place = count($this->map);
+        $this->map[$place] = array();
+        $this->map[$place]['params'] = new ParametersExpectation($parameters);
+        $this->map[$place]['content'] = $action;
+    }
+
+    /**
+     *    Searches the call list for a matching parameter
+     *    set. Returned by reference.
+     *    @param array $parameters    Parameters to search by
+     *                                without wildcards.
+     *    @return object              Object held in the first matching
+     *                                slot, otherwise null.
+     */
+    function &findFirstAction($parameters) {
+        $slot = $this->findFirstSlot($parameters);
+        if (isset($slot) && isset($slot['content'])) {
+            return $slot['content'];
+        }
+        $null = null;
+        return $null;
+    }
+
+    /**
+     *    Searches the call list for a matching parameter
+     *    set. True if successful.
+     *    @param array $parameters    Parameters to search by
+     *                                without wildcards.
+     *    @return boolean             True if a match is present.
+     */
+    function isMatch($parameters) {
+        return ($this->findFirstSlot($parameters) != null);
+    }
+
+    /**
+     *    Compares the incoming parameters with the
+     *    internal expectation. Uses the incoming $test
+     *    to dispatch the test message.
+     *    @param SimpleTestCase $test   Test to dispatch to.
+     *    @param array $parameters      The actual calling arguments.
+     *    @param string $message        The message to overlay.
+     */
+    function test($test, $parameters, $message) {
+    }
+
+    /**
+     *    Searches the map for a matching item.
+     *    @param array $parameters    Parameters to search by
+     *                                without wildcards.
+     *    @return array               Reference to slot or null.
+     */
+    function &findFirstSlot($parameters) {
+        $count = count($this->map);
+        for ($i = 0; $i < $count; $i++) {
+            if ($this->map[$i]["params"]->test($parameters)) {
+                return $this->map[$i];
+            }
+        }
+        $null = null;
+        return $null;
+    }
+}
+
+/**
+ *    Allows setting of actions against call signatures either
+ *    at a specific time, or always. Specific time settings
+ *    trump lasting ones, otherwise the most recently added
+ *    will mask an earlier match.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleCallSchedule {
+    private $wildcard = MOCK_ANYTHING;
+    private $always;
+    private $at;
+
+    /**
+     *    Sets up an empty response schedule.
+     *    Creates an empty call map.
+     */
+    function __construct() {
+        $this->always = array();
+        $this->at = array();
+    }
+
+    /**
+     *    Stores an action against a signature that
+     *    will always fire unless masked by a time
+     *    specific one.
+     *    @param string $method        Method name.
+     *    @param array $args           Calling parameters.
+     *    @param SimpleAction $action  Actually simpleByValue, etc.
+     */
+    function register($method, $args, $action) {
+        $args = $this->replaceWildcards($args);
+        $method = strtolower($method);
+        if (! isset($this->always[$method])) {
+            $this->always[$method] = new SimpleSignatureMap();
+        }
+        $this->always[$method]->add($args, $action);
+    }
+
+    /**
+     *    Stores an action against a signature that
+     *    will fire at a specific time in the future.
+     *    @param integer $step         delay of calls to this method,
+     *                                 0 is next.
+     *    @param string $method        Method name.
+     *    @param array $args           Calling parameters.
+     *    @param SimpleAction $action  Actually SimpleByValue, etc.
+     */
+    function registerAt($step, $method, $args, $action) {
+        $args = $this->replaceWildcards($args);
+        $method = strtolower($method);
+        if (! isset($this->at[$method])) {
+            $this->at[$method] = array();
+        }
+        if (! isset($this->at[$method][$step])) {
+            $this->at[$method][$step] = new SimpleSignatureMap();
+        }
+        $this->at[$method][$step]->add($args, $action);
+    }
+
+    /**
+     *  Sets up an expectation on the argument list.
+     *  @param string $method       Method to test.
+     *  @param array $args          Bare arguments or list of
+     *                              expectation objects.
+     *  @param string $message      Failure message.
+     */
+    function expectArguments($method, $args, $message) {
+        $args = $this->replaceWildcards($args);
+        $message .= Mock::getExpectationLine();
+        $this->expected_args[strtolower($method)] =
+                new ParametersExpectation($args, $message);
+
+    }
+
+    /**
+     *    Actually carry out the action stored previously,
+     *    if the parameters match.
+     *    @param integer $step      Time of call.
+     *    @param string $method     Method name.
+     *    @param array $args        The parameters making up the
+     *                              rest of the call.
+     *    @return mixed             The result of the action.
+     */
+    function &respond($step, $method, $args) {
+        $method = strtolower($method);
+        if (isset($this->at[$method][$step])) {
+            if ($this->at[$method][$step]->isMatch($args)) {
+                $action = $this->at[$method][$step]->findFirstAction($args);
+                if (isset($action)) {
+                    return $action->act();
+                }
+            }
+        }
+        if (isset($this->always[$method])) {
+            $action = $this->always[$method]->findFirstAction($args);
+            if (isset($action)) {
+                return $action->act();
+            }
+        }
+        $null = null;
+        return $null;
+    }
+
+    /**
+     *    Replaces wildcard matches with wildcard
+     *    expectations in the argument list.
+     *    @param array $args      Raw argument list.
+     *    @return array           Argument list with
+     *                            expectations.
+     */
+    protected function replaceWildcards($args) {
+        if ($args === false) {
+            return false;
+        }
+        for ($i = 0; $i < count($args); $i++) {
+            if ($args[$i] === $this->wildcard) {
+                $args[$i] = new AnythingExpectation();
+            }
+        }
+        return $args;
+    }
+}
+
+/**
+ *    A type of SimpleMethodAction.
+ *    Stashes a value for returning later. Follows usual
+ *    PHP5 semantics of objects being returned by reference.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleReturn {
+    private $value;
+
+    /**
+     *    Stashes it for later.
+     *    @param mixed $value     You need to clone objects
+     *                            if you want copy semantics
+     *                            for these.
+     */
+    function __construct($value) {
+        $this->value = $value;
+    }
+
+    /**
+     *    Returns the value stored earlier.
+     *    @return mixed    Whatever was stashed.
+     */
+    function act() {
+        return $this->value;
+    }
+}
+
+/**
+ *    A type of SimpleMethodAction.
+ *    Stashes a reference for returning later.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleByReference {
+    private $reference;
+
+    /**
+     *    Stashes it for later.
+     *    @param mixed $reference     Actual PHP4 style reference.
+     */
+    function __construct(&$reference) {
+        $this->reference = &$reference;
+    }
+
+    /**
+     *    Returns the reference stored earlier.
+     *    @return mixed    Whatever was stashed.
+     */
+    function &act() {
+        return $this->reference;
+    }
+}
+
+/**
+ *    A type of SimpleMethodAction.
+ *    Stashes a value for returning later.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleByValue {
+    private $value;
+
+    /**
+     *    Stashes it for later.
+     *    @param mixed $value     You need to clone objects
+     *                            if you want copy semantics
+     *                            for these.
+     */
+    function __construct($value) {
+        $this->value = $value;
+    }
+
+    /**
+     *    Returns the value stored earlier.
+     *    @return mixed    Whatever was stashed.
+     */
+    function &act() {
+        $dummy = $this->value;
+        return $dummy;
+    }
+}
+
+/**
+ *    A type of SimpleMethodAction.
+ *    Stashes an exception for throwing later.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleThrower {
+    private $exception;
+
+    /**
+     *    Stashes it for later.
+     *    @param Exception $exception    The exception object to throw.
+     */
+    function __construct($exception) {
+        $this->exception = $exception;
+    }
+
+    /**
+     *    Throws the exceptins stashed earlier.
+     */
+    function act() {
+        throw $this->exception;
+    }
+}
+
+/**
+ *    A type of SimpleMethodAction.
+ *    Stashes an error for emitting later.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleErrorThrower {
+    private $error;
+    private $severity;
+
+    /**
+     *    Stashes an error to throw later.
+     *    @param string $error      Error message.
+     *    @param integer $severity  PHP error constant, e.g E_USER_ERROR.
+     */
+    function __construct($error, $severity) {
+        $this->error = $error;
+        $this->severity = $severity;
+    }
+
+    /**
+     *    Triggers the stashed error.
+     */
+    function &act() {
+        trigger_error($this->error, $this->severity);
+        $null = null;
+        return $null;
+    }
+}
+
+/**
+ *    A base class or delegate that extends an
+ *    empty collection of methods that can have their
+ *    return values set and expectations made of the
+ *    calls upon them. The mock will assert the
+ *    expectations against it's attached test case in
+ *    addition to the server stub behaviour or returning
+ *    preprogrammed responses.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleMock {
+    private $actions;
+    private $expectations;
+    private $wildcard = MOCK_ANYTHING;
+    private $is_strict = true;
+    private $call_counts;
+    private $expected_counts;
+    private $max_counts;
+    private $expected_args;
+    private $expected_args_at;
+
+    /**
+     *    Creates an empty action list and expectation list.
+     *    All call counts are set to zero.
+     */
+    function SimpleMock() {
+        $this->actions = new SimpleCallSchedule();
+        $this->expectations = new SimpleCallSchedule();
+        $this->call_counts = array();
+        $this->expected_counts = array();
+        $this->max_counts = array();
+        $this->expected_args = array();
+        $this->expected_args_at = array();
+        $this->getCurrentTestCase()->tell($this);
+    }
+
+    /**
+     *    Disables a name check when setting expectations.
+     *    This hack is needed for the partial mocks.
+     */
+    function disableExpectationNameChecks() {
+        $this->is_strict = false;
+    }
+
+    /**
+     *    Finds currently running test.
+     *    @return SimpeTestCase    Current test case.
+     */
+    protected function getCurrentTestCase() {
+        return SimpleTest::getContext()->getTest();
+    }
+
+    /**
+     *    Die if bad arguments array is passed.
+     *    @param mixed $args     The arguments value to be checked.
+     *    @param string $task    Description of task attempt.
+     *    @return boolean        Valid arguments
+     */
+    protected function checkArgumentsIsArray($args, $task) {
+        if (! is_array($args)) {
+            trigger_error(
+                "Cannot $task as \$args parameter is not an array",
+                E_USER_ERROR);
+        }
+    }
+
+    /**
+     *    Triggers a PHP error if the method is not part
+     *    of this object.
+     *    @param string $method        Name of method.
+     *    @param string $task          Description of task attempt.
+     */
+    protected function dieOnNoMethod($method, $task) {
+        if ($this->is_strict && ! method_exists($this, $method)) {
+            trigger_error(
+                    "Cannot $task as no ${method}() in class " . get_class($this),
+                    E_USER_ERROR);
+        }
+    }
+
+    /**
+     *    Replaces wildcard matches with wildcard
+     *    expectations in the argument list.
+     *    @param array $args      Raw argument list.
+     *    @return array           Argument list with
+     *                            expectations.
+     */
+    function replaceWildcards($args) {
+        if ($args === false) {
+            return false;
+        }
+        for ($i = 0; $i < count($args); $i++) {
+            if ($args[$i] === $this->wildcard) {
+                $args[$i] = new AnythingExpectation();
+            }
+        }
+        return $args;
+    }
+
+    /**
+     *    Adds one to the call count of a method.
+     *    @param string $method        Method called.
+     *    @param array $args           Arguments as an array.
+     */
+    protected function addCall($method, $args) {
+        if (! isset($this->call_counts[$method])) {
+            $this->call_counts[$method] = 0;
+        }
+        $this->call_counts[$method]++;
+    }
+
+    /**
+     *    Fetches the call count of a method so far.
+     *    @param string $method        Method name called.
+     *    @return integer              Number of calls so far.
+     */
+    function getCallCount($method) {
+        $this->dieOnNoMethod($method, "get call count");
+        $method = strtolower($method);
+        if (! isset($this->call_counts[$method])) {
+            return 0;
+        }
+        return $this->call_counts[$method];
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed on by all calls to this method that match.
+     *    @param string $method       Method name.
+     *    @param mixed $value         Result of call by value/handle.
+     *    @param array $args          List of parameters to match
+     *                                including wildcards.
+     */
+    function returns($method, $value, $args = false) {
+        $this->dieOnNoMethod($method, "set return");
+        $this->actions->register($method, $args, new SimpleReturn($value));
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed only when the required call count
+     *    is reached.
+     *    @param integer $timing   Number of calls in the future
+     *                             to which the result applies. If
+     *                             not set then all calls will return
+     *                             the value.
+     *    @param string $method    Method name.
+     *    @param mixed $value      Result of call passed.
+     *    @param array $args       List of parameters to match
+     *                             including wildcards.
+     */
+    function returnsAt($timing, $method, $value, $args = false) {
+        $this->dieOnNoMethod($method, "set return value sequence");
+        $this->actions->registerAt($timing, $method, $args, new SimpleReturn($value));
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed by value for all calls to this method.
+     *    @param string $method       Method name.
+     *    @param mixed $value         Result of call passed by value.
+     *    @param array $args          List of parameters to match
+     *                                including wildcards.
+     */
+    function returnsByValue($method, $value, $args = false) {
+        $this->dieOnNoMethod($method, "set return value");
+        $this->actions->register($method, $args, new SimpleByValue($value));
+    }
+
+    /** @deprecated */
+    function setReturnValue($method, $value, $args = false) {
+        $this->returnsByValue($method, $value, $args);
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed by value only when the required call count
+     *    is reached.
+     *    @param integer $timing   Number of calls in the future
+     *                             to which the result applies. If
+     *                             not set then all calls will return
+     *                             the value.
+     *    @param string $method    Method name.
+     *    @param mixed $value      Result of call passed by value.
+     *    @param array $args       List of parameters to match
+     *                             including wildcards.
+     */
+    function returnsByValueAt($timing, $method, $value, $args = false) {
+        $this->dieOnNoMethod($method, "set return value sequence");
+        $this->actions->registerAt($timing, $method, $args, new SimpleByValue($value));
+    }
+
+    /** @deprecated */
+    function setReturnValueAt($timing, $method, $value, $args = false) {
+        $this->returnsByValueAt($timing, $method, $value, $args);
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed by reference for all calls.
+     *    @param string $method       Method name.
+     *    @param mixed $reference     Result of the call will be this object.
+     *    @param array $args          List of parameters to match
+     *                                including wildcards.
+     */
+    function returnsByReference($method, &$reference, $args = false) {
+        $this->dieOnNoMethod($method, "set return reference");
+        $this->actions->register($method, $args, new SimpleByReference($reference));
+    }
+
+    /** @deprecated */
+    function setReturnReference($method, &$reference, $args = false) {
+        $this->returnsByReference($method, $reference, $args);
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed by value only when the required call count
+     *    is reached.
+     *    @param integer $timing    Number of calls in the future
+     *                              to which the result applies. If
+     *                              not set then all calls will return
+     *                              the value.
+     *    @param string $method     Method name.
+     *    @param mixed $reference   Result of the call will be this object.
+     *    @param array $args        List of parameters to match
+     *                              including wildcards.
+     */
+    function returnsByReferenceAt($timing, $method, &$reference, $args = false) {
+        $this->dieOnNoMethod($method, "set return reference sequence");
+        $this->actions->registerAt($timing, $method, $args, new SimpleByReference($reference));
+    }
+
+    /** @deprecated */
+    function setReturnReferenceAt($timing, $method, &$reference, $args = false) {
+        $this->returnsByReferenceAt($timing, $method, $reference, $args);
+    }
+
+    /**
+     *    Sets up an expected call with a set of
+     *    expected parameters in that call. All
+     *    calls will be compared to these expectations
+     *    regardless of when the call is made.
+     *    @param string $method        Method call to test.
+     *    @param array $args           Expected parameters for the call
+     *                                 including wildcards.
+     *    @param string $message       Overridden message.
+     */
+    function expect($method, $args, $message = '%s') {
+        $this->dieOnNoMethod($method, 'set expected arguments');
+        $this->checkArgumentsIsArray($args, 'set expected arguments');
+        $this->expectations->expectArguments($method, $args, $message);
+        $args = $this->replaceWildcards($args);
+        $message .= Mock::getExpectationLine();
+        $this->expected_args[strtolower($method)] =
+                new ParametersExpectation($args, $message);
+    }
+
+    /**
+     *    Sets up an expected call with a set of
+     *    expected parameters in that call. The
+     *    expected call count will be adjusted if it
+     *    is set too low to reach this call.
+     *    @param integer $timing    Number of calls in the future at
+     *                              which to test. Next call is 0.
+     *    @param string $method     Method call to test.
+     *    @param array $args        Expected parameters for the call
+     *                              including wildcards.
+     *    @param string $message    Overridden message.
+     */
+    function expectAt($timing, $method, $args, $message = '%s') {
+        $this->dieOnNoMethod($method, 'set expected arguments at time');
+        $this->checkArgumentsIsArray($args, 'set expected arguments at time');
+        $args = $this->replaceWildcards($args);
+        if (! isset($this->expected_args_at[$timing])) {
+            $this->expected_args_at[$timing] = array();
+        }
+        $method = strtolower($method);
+        $message .= Mock::getExpectationLine();
+        $this->expected_args_at[$timing][$method] =
+                new ParametersExpectation($args, $message);
+    }
+
+    /**
+     *    Sets an expectation for the number of times
+     *    a method will be called. The tally method
+     *    is used to check this.
+     *    @param string $method        Method call to test.
+     *    @param integer $count        Number of times it should
+     *                                 have been called at tally.
+     *    @param string $message       Overridden message.
+     */
+    function expectCallCount($method, $count, $message = '%s') {
+        $this->dieOnNoMethod($method, 'set expected call count');
+        $message .= Mock::getExpectationLine();
+        $this->expected_counts[strtolower($method)] =
+                new CallCountExpectation($method, $count, $message);
+    }
+
+    /**
+     *    Sets the number of times a method may be called
+     *    before a test failure is triggered.
+     *    @param string $method        Method call to test.
+     *    @param integer $count        Most number of times it should
+     *                                 have been called.
+     *    @param string $message       Overridden message.
+     */
+    function expectMaximumCallCount($method, $count, $message = '%s') {
+        $this->dieOnNoMethod($method, 'set maximum call count');
+        $message .= Mock::getExpectationLine();
+        $this->max_counts[strtolower($method)] =
+                new MaximumCallCountExpectation($method, $count, $message);
+    }
+
+    /**
+     *    Sets the number of times to call a method to prevent
+     *    a failure on the tally.
+     *    @param string $method      Method call to test.
+     *    @param integer $count      Least number of times it should
+     *                               have been called.
+     *    @param string $message     Overridden message.
+     */
+    function expectMinimumCallCount($method, $count, $message = '%s') {
+        $this->dieOnNoMethod($method, 'set minimum call count');
+        $message .= Mock::getExpectationLine();
+        $this->expected_counts[strtolower($method)] =
+                new MinimumCallCountExpectation($method, $count, $message);
+    }
+
+    /**
+     *    Convenience method for barring a method
+     *    call.
+     *    @param string $method        Method call to ban.
+     *    @param string $message       Overridden message.
+     */
+    function expectNever($method, $message = '%s') {
+        $this->expectMaximumCallCount($method, 0, $message);
+    }
+
+    /**
+     *    Convenience method for a single method
+     *    call.
+     *    @param string $method     Method call to track.
+     *    @param array $args        Expected argument list or
+     *                              false for any arguments.
+     *    @param string $message    Overridden message.
+     */
+    function expectOnce($method, $args = false, $message = '%s') {
+        $this->expectCallCount($method, 1, $message);
+        if ($args !== false) {
+            $this->expect($method, $args, $message);
+        }
+    }
+
+    /**
+     *    Convenience method for requiring a method
+     *    call.
+     *    @param string $method       Method call to track.
+     *    @param array $args          Expected argument list or
+     *                                false for any arguments.
+     *    @param string $message      Overridden message.
+     */
+    function expectAtLeastOnce($method, $args = false, $message = '%s') {
+        $this->expectMinimumCallCount($method, 1, $message);
+        if ($args !== false) {
+            $this->expect($method, $args, $message);
+        }
+    }
+
+    /**
+     *    Sets up a trigger to throw an exception upon the
+     *    method call.
+     *    @param string $method     Method name to throw on.
+     *    @param object $exception  Exception object to throw.
+     *                              If not given then a simple
+     *                              Exception object is thrown.
+     *    @param array $args        Optional argument list filter.
+     *                              If given then the exception
+     *                              will only be thrown if the
+     *                              method call matches the arguments.
+     */
+    function throwOn($method, $exception = false, $args = false) {
+        $this->dieOnNoMethod($method, "throw on");
+        $this->actions->register($method, $args,
+                new SimpleThrower($exception ? $exception : new Exception()));
+    }
+
+    /**
+     *    Sets up a trigger to throw an exception upon the
+     *    method call.
+     *    @param integer $timing    When to throw the exception. A
+     *                              value of 0 throws immediately.
+     *                              A value of 1 actually allows one call
+     *                              to this method before throwing. 2
+     *                              will allow two calls before throwing
+     *                              and so on.
+     *    @param string $method     Method name to throw on.
+     *    @param object $exception  Exception object to throw.
+     *                              If not given then a simple
+     *                              Exception object is thrown.
+     *    @param array $args        Optional argument list filter.
+     *                              If given then the exception
+     *                              will only be thrown if the
+     *                              method call matches the arguments.
+     */
+    function throwAt($timing, $method, $exception = false, $args = false) {
+        $this->dieOnNoMethod($method, "throw at");
+        $this->actions->registerAt($timing, $method, $args,
+                new SimpleThrower($exception ? $exception : new Exception()));
+    }
+
+    /**
+     *    Sets up a trigger to throw an error upon the
+     *    method call.
+     *    @param string $method     Method name to throw on.
+     *    @param object $error      Error message to trigger.
+     *    @param array $args        Optional argument list filter.
+     *                              If given then the exception
+     *                              will only be thrown if the
+     *                              method call matches the arguments.
+     *    @param integer $severity  The PHP severity level. Defaults
+     *                              to E_USER_ERROR.
+     */
+    function errorOn($method, $error = 'A mock error', $args = false, $severity = E_USER_ERROR) {
+        $this->dieOnNoMethod($method, "error on");
+        $this->actions->register($method, $args, new SimpleErrorThrower($error, $severity));
+    }
+
+    /**
+     *    Sets up a trigger to throw an error upon a specific
+     *    method call.
+     *    @param integer $timing    When to throw the exception. A
+     *                              value of 0 throws immediately.
+     *                              A value of 1 actually allows one call
+     *                              to this method before throwing. 2
+     *                              will allow two calls before throwing
+     *                              and so on.
+     *    @param string $method     Method name to throw on.
+     *    @param object $error      Error message to trigger.
+     *    @param array $args        Optional argument list filter.
+     *                              If given then the exception
+     *                              will only be thrown if the
+     *                              method call matches the arguments.
+     *    @param integer $severity  The PHP severity level. Defaults
+     *                              to E_USER_ERROR.
+     */
+    function errorAt($timing, $method, $error = 'A mock error', $args = false, $severity = E_USER_ERROR) {
+        $this->dieOnNoMethod($method, "error at");
+        $this->actions->registerAt($timing, $method, $args, new SimpleErrorThrower($error, $severity));
+    }
+
+    /**
+     *    Receives event from unit test that the current
+     *    test method has finished. Totals up the call
+     *    counts and triggers a test assertion if a test
+     *    is present for expected call counts.
+     *    @param string $test_method      Current method name.
+     *    @param SimpleTestCase $test     Test to send message to.
+     */
+    function atTestEnd($test_method, &$test) {
+        foreach ($this->expected_counts as $method => $expectation) {
+            $test->assert($expectation, $this->getCallCount($method));
+        }
+        foreach ($this->max_counts as $method => $expectation) {
+            if ($expectation->test($this->getCallCount($method))) {
+                $test->assert($expectation, $this->getCallCount($method));
+            }
+        }
+    }
+
+    /**
+     *    Returns the expected value for the method name
+     *    and checks expectations. Will generate any
+     *    test assertions as a result of expectations
+     *    if there is a test present.
+     *    @param string $method       Name of method to simulate.
+     *    @param array $args          Arguments as an array.
+     *    @return mixed               Stored return.
+     */
+    function &invoke($method, $args) {
+        $method = strtolower($method);
+        $step = $this->getCallCount($method);
+        $this->addCall($method, $args);
+        $this->checkExpectations($method, $args, $step);
+        $was = $this->disableEStrict();
+        try {
+            $result = &$this->emulateCall($method, $args, $step);
+        } catch (Exception $e) {
+            $this->restoreEStrict($was);
+            throw $e;
+        }
+        $this->restoreEStrict($was);
+        return $result;
+    }
+
+    /**
+     *    Finds the return value matching the incoming
+     *    arguments. If there is no matching value found
+     *    then an error is triggered.
+     *    @param string $method      Method name.
+     *    @param array $args         Calling arguments.
+     *    @param integer $step       Current position in the
+     *                               call history.
+     *    @return mixed              Stored return or other action.
+     */
+    protected function &emulateCall($method, $args, $step) {
+        return $this->actions->respond($step, $method, $args);
+    }
+
+    /**
+     *    Tests the arguments against expectations.
+     *    @param string $method        Method to check.
+     *    @param array $args           Argument list to match.
+     *    @param integer $timing       The position of this call
+     *                                 in the call history.
+     */
+    protected function checkExpectations($method, $args, $timing) {
+        $test = $this->getCurrentTestCase();
+        if (isset($this->max_counts[$method])) {
+            if (! $this->max_counts[$method]->test($timing + 1)) {
+                $test->assert($this->max_counts[$method], $timing + 1);
+            }
+        }
+        if (isset($this->expected_args_at[$timing][$method])) {
+            $test->assert(
+                    $this->expected_args_at[$timing][$method],
+                    $args,
+                    "Mock method [$method] at [$timing] -> %s");
+        } elseif (isset($this->expected_args[$method])) {
+            $test->assert(
+                    $this->expected_args[$method],
+                    $args,
+                    "Mock method [$method] -> %s");
+        }
+    }
+
+    /**
+     *   Our mock has to be able to return anything, including
+     *   variable references. To allow for these mixed returns
+     *   we have to disable the E_STRICT warnings while the
+     *   method calls are emulated.
+     */
+    private function disableEStrict() {
+        $was = error_reporting();
+        error_reporting($was & ~E_STRICT);
+        return $was;
+    }
+
+    /**
+     *  Restores the E_STRICT level if it was previously set.
+     *  @param integer $was     Previous error reporting level.
+     */
+    private function restoreEStrict($was) {
+        error_reporting($was);
+    }
+}
+
+/**
+ *    Static methods only service class for code generation of
+ *    mock objects.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class Mock {
+
+    /**
+     *    Factory for mock object classes.
+     */
+    function __construct() {
+        trigger_error('Mock factory methods are static.');
+    }
+
+    /**
+     *    Clones a class' interface and creates a mock version
+     *    that can have return values and expectations set.
+     *    @param string $class         Class to clone.
+     *    @param string $mock_class    New class name. Default is
+     *                                 the old name with "Mock"
+     *                                 prepended.
+     *    @param array $methods        Additional methods to add beyond
+     *                                 those in the cloned class. Use this
+     *                                 to emulate the dynamic addition of
+     *                                 methods in the cloned class or when
+     *                                 the class hasn't been written yet.sta
+     */
+    static function generate($class, $mock_class = false, $methods = false) {
+        $generator = new MockGenerator($class, $mock_class);
+        return @$generator->generateSubclass($methods);
+    }
+
+    /**
+     *    Generates a version of a class with selected
+     *    methods mocked only. Inherits the old class
+     *    and chains the mock methods of an aggregated
+     *    mock object.
+     *    @param string $class            Class to clone.
+     *    @param string $mock_class       New class name.
+     *    @param array $methods           Methods to be overridden
+     *                                    with mock versions.
+     */
+    static function generatePartial($class, $mock_class, $methods) {
+        $generator = new MockGenerator($class, $mock_class);
+        return @$generator->generatePartial($methods);
+    }
+
+    /**
+     *    Uses a stack trace to find the line of an assertion.
+     */
+    static function getExpectationLine() {
+        $trace = new SimpleStackTrace(array('expect'));
+        return $trace->traceMethod();
+    }
+}
+
+/**
+ *    Service class for code generation of mock objects.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class MockGenerator {
+    private $class;
+    private $mock_class;
+    private $mock_base;
+    private $reflection;
+
+    /**
+     *    Builds initial reflection object.
+     *    @param string $class        Class to be mocked.
+     *    @param string $mock_class   New class with identical interface,
+     *                                but no behaviour.
+     */
+    function __construct($class, $mock_class) {
+        $this->class = $class;
+        $this->mock_class = $mock_class;
+        if (! $this->mock_class) {
+            $this->mock_class = 'Mock' . $this->class;
+        }
+        $this->mock_base = SimpleTest::getMockBaseClass();
+        $this->reflection = new SimpleReflection($this->class);
+    }
+
+    /**
+     *    Clones a class' interface and creates a mock version
+     *    that can have return values and expectations set.
+     *    @param array $methods        Additional methods to add beyond
+     *                                 those in th cloned class. Use this
+     *                                 to emulate the dynamic addition of
+     *                                 methods in the cloned class or when
+     *                                 the class hasn't been written yet.
+     */
+    function generate($methods) {
+        if (! $this->reflection->classOrInterfaceExists()) {
+            return false;
+        }
+        $mock_reflection = new SimpleReflection($this->mock_class);
+        if ($mock_reflection->classExistsSansAutoload()) {
+            return false;
+        }
+        $code = $this->createClassCode($methods ? $methods : array());
+        return eval("$code return \$code;");
+    }
+
+    /**
+     *    Subclasses a class and overrides every method with a mock one
+     *    that can have return values and expectations set. Chains
+     *    to an aggregated SimpleMock.
+     *    @param array $methods        Additional methods to add beyond
+     *                                 those in the cloned class. Use this
+     *                                 to emulate the dynamic addition of
+     *                                 methods in the cloned class or when
+     *                                 the class hasn't been written yet.
+     */
+    function generateSubclass($methods) {
+        if (! $this->reflection->classOrInterfaceExists()) {
+            return false;
+        }
+        $mock_reflection = new SimpleReflection($this->mock_class);
+        if ($mock_reflection->classExistsSansAutoload()) {
+            return false;
+        }
+        if ($this->reflection->isInterface() || $this->reflection->hasFinal()) {
+            $code = $this->createClassCode($methods ? $methods : array());
+            return eval("$code return \$code;");
+        } else {
+            $code = $this->createSubclassCode($methods ? $methods : array());
+            return eval("$code return \$code;");
+        }
+    }
+
+    /**
+     *    Generates a version of a class with selected
+     *    methods mocked only. Inherits the old class
+     *    and chains the mock methods of an aggregated
+     *    mock object.
+     *    @param array $methods           Methods to be overridden
+     *                                    with mock versions.
+     */
+    function generatePartial($methods) {
+        if (! $this->reflection->classExists($this->class)) {
+            return false;
+        }
+        $mock_reflection = new SimpleReflection($this->mock_class);
+        if ($mock_reflection->classExistsSansAutoload()) {
+            trigger_error('Partial mock class [' . $this->mock_class . '] already exists');
+            return false;
+        }
+        $code = $this->extendClassCode($methods);
+        return eval("$code return \$code;");
+    }
+
+    /**
+     *    The new mock class code as a string.
+     *    @param array $methods          Additional methods.
+     *    @return string                 Code for new mock class.
+     */
+    protected function createClassCode($methods) {
+        $implements = '';
+        $interfaces = $this->reflection->getInterfaces();
+        if (function_exists('spl_classes')) {
+            $interfaces = array_diff($interfaces, array('Traversable'));
+        }
+        if (count($interfaces) > 0) {
+            $implements = 'implements ' . implode(', ', $interfaces);
+        }
+        $code = "class " . $this->mock_class . " extends " . $this->mock_base . " $implements {\n";
+        $code .= "    function " . $this->mock_class . "() {\n";
+        $code .= "        \$this->" . $this->mock_base . "();\n";
+        $code .= "    }\n";
+        if (in_array('__construct', $this->reflection->getMethods())) {
+            $code .= "    function __construct() {\n";
+            $code .= "        \$this->" . $this->mock_base . "();\n";
+            $code .= "    }\n";
+        }
+        $code .= $this->createHandlerCode($methods);
+        $code .= "}\n";
+        return $code;
+    }
+
+    /**
+     *    The new mock class code as a string. The mock will
+     *    be a subclass of the original mocked class.
+     *    @param array $methods          Additional methods.
+     *    @return string                 Code for new mock class.
+     */
+    protected function createSubclassCode($methods) {
+        $code  = "class " . $this->mock_class . " extends " . $this->class . " {\n";
+        $code .= "    public \$mock;\n";
+        $code .= $this->addMethodList(array_merge($methods, $this->reflection->getMethods()));
+        $code .= "\n";
+        $code .= "    function " . $this->mock_class . "() {\n";
+        $code .= "        \$this->mock = new " . $this->mock_base . "();\n";
+        $code .= "        \$this->mock->disableExpectationNameChecks();\n";
+        $code .= "    }\n";
+        $code .= $this->chainMockReturns();
+        $code .= $this->chainMockExpectations();
+        $code .= $this->chainThrowMethods();
+        $code .= $this->overrideMethods($this->reflection->getMethods());
+        $code .= $this->createNewMethodCode($methods);
+        $code .= "}\n";
+        return $code;
+    }
+
+    /**
+     *    The extension class code as a string. The class
+     *    composites a mock object and chains mocked methods
+     *    to it.
+     *    @param array  $methods       Mocked methods.
+     *    @return string               Code for a new class.
+     */
+    protected function extendClassCode($methods) {
+        $code  = "class " . $this->mock_class . " extends " . $this->class . " {\n";
+        $code .= "    protected \$mock;\n";
+        $code .= $this->addMethodList($methods);
+        $code .= "\n";
+        $code .= "    function " . $this->mock_class . "() {\n";
+        $code .= "        \$this->mock = new " . $this->mock_base . "();\n";
+        $code .= "        \$this->mock->disableExpectationNameChecks();\n";
+        $code .= "    }\n";
+        $code .= $this->chainMockReturns();
+        $code .= $this->chainMockExpectations();
+        $code .= $this->chainThrowMethods();
+        $code .= $this->overrideMethods($methods);
+        $code .= "}\n";
+        return $code;
+    }
+
+    /**
+     *    Creates code within a class to generate replaced
+     *    methods. All methods call the invoke() handler
+     *    with the method name and the arguments in an
+     *    array.
+     *    @param array $methods    Additional methods.
+     */
+    protected function createHandlerCode($methods) {
+        $code = '';
+        $methods = array_merge($methods, $this->reflection->getMethods());
+        foreach ($methods as $method) {
+            if ($this->isConstructor($method)) {
+                continue;
+            }
+            $mock_reflection = new SimpleReflection($this->mock_base);
+            if (in_array($method, $mock_reflection->getMethods())) {
+                continue;
+            }
+            $code .= "    " . $this->reflection->getSignature($method) . " {\n";
+            $code .= "        \$args = func_get_args();\n";
+            $code .= "        \$result = &\$this->invoke(\"$method\", \$args);\n";
+            $code .= "        return \$result;\n";
+            $code .= "    }\n";
+        }
+        return $code;
+    }
+
+    /**
+     *    Creates code within a class to generate a new
+     *    methods. All methods call the invoke() handler
+     *    on the internal mock with the method name and
+     *    the arguments in an array.
+     *    @param array $methods    Additional methods.
+     */
+    protected function createNewMethodCode($methods) {
+        $code = '';
+        foreach ($methods as $method) {
+            if ($this->isConstructor($method)) {
+                continue;
+            }
+            $mock_reflection = new SimpleReflection($this->mock_base);
+            if (in_array($method, $mock_reflection->getMethods())) {
+                continue;
+            }
+            $code .= "    " . $this->reflection->getSignature($method) . " {\n";
+            $code .= "        \$args = func_get_args();\n";
+            $code .= "        \$result = &\$this->mock->invoke(\"$method\", \$args);\n";
+            $code .= "        return \$result;\n";
+            $code .= "    }\n";
+        }
+        return $code;
+    }
+
+    /**
+     *    Tests to see if a special PHP method is about to
+     *    be stubbed by mistake.
+     *    @param string $method    Method name.
+     *    @return boolean          True if special.
+     */
+    protected function isConstructor($method) {
+        return in_array(
+                strtolower($method),
+                array('__construct', '__destruct'));
+    }
+
+    /**
+     *    Creates a list of mocked methods for error checking.
+     *    @param array $methods       Mocked methods.
+     *    @return string              Code for a method list.
+     */
+    protected function addMethodList($methods) {
+        return "    protected \$mocked_methods = array('" .
+                implode("', '", array_map('strtolower', $methods)) .
+                "');\n";
+    }
+
+    /**
+     *    Creates code to abandon the expectation if not mocked.
+     *    @param string $alias       Parameter name of method name.
+     *    @return string             Code for bail out.
+     */
+    protected function bailOutIfNotMocked($alias) {
+        $code  = "        if (! in_array(strtolower($alias), \$this->mocked_methods)) {\n";
+        $code .= "            trigger_error(\"Method [$alias] is not mocked\");\n";
+        $code .= "            \$null = null;\n";
+        $code .= "            return \$null;\n";
+        $code .= "        }\n";
+        return $code;
+    }
+
+    /**
+     *    Creates source code for chaining to the composited
+     *    mock object.
+     *    @return string           Code for mock set up.
+     */
+    protected function chainMockReturns() {
+        $code  = "    function returns(\$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->returns(\$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function returnsAt(\$timing, \$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->returnsAt(\$timing, \$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function returnsByValue(\$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnValue(\$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function returnsByValueAt(\$timing, \$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnValueAt(\$timing, \$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function returnsByReference(\$method, &\$ref, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnReference(\$method, \$ref, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function returnsByReferenceAt(\$timing, \$method, &\$ref, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnReferenceAt(\$timing, \$method, \$ref, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function setReturnValue(\$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnValue(\$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function setReturnValueAt(\$timing, \$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnValueAt(\$timing, \$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function setReturnReference(\$method, &\$ref, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnReference(\$method, \$ref, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function setReturnReferenceAt(\$timing, \$method, &\$ref, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnReferenceAt(\$timing, \$method, \$ref, \$args);\n";
+        $code .= "    }\n";
+        return $code;
+    }
+
+    /**
+     *    Creates source code for chaining to an aggregated
+     *    mock object.
+     *    @return string                 Code for expectations.
+     */
+    protected function chainMockExpectations() {
+        $code  = "    function expect(\$method, \$args = false, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expect(\$method, \$args, \$msg);\n";
+        $code .= "    }\n";
+        $code .= "    function expectAt(\$timing, \$method, \$args = false, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectAt(\$timing, \$method, \$args, \$msg);\n";
+        $code .= "    }\n";
+        $code .= "    function expectCallCount(\$method, \$count) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectCallCount(\$method, \$count, \$msg = '%s');\n";
+        $code .= "    }\n";
+        $code .= "    function expectMaximumCallCount(\$method, \$count, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectMaximumCallCount(\$method, \$count, \$msg = '%s');\n";
+        $code .= "    }\n";
+        $code .= "    function expectMinimumCallCount(\$method, \$count, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectMinimumCallCount(\$method, \$count, \$msg = '%s');\n";
+        $code .= "    }\n";
+        $code .= "    function expectNever(\$method) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectNever(\$method);\n";
+        $code .= "    }\n";
+        $code .= "    function expectOnce(\$method, \$args = false, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectOnce(\$method, \$args, \$msg);\n";
+        $code .= "    }\n";
+        $code .= "    function expectAtLeastOnce(\$method, \$args = false, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectAtLeastOnce(\$method, \$args, \$msg);\n";
+        $code .= "    }\n";
+        return $code;
+    }
+
+    /**
+     *    Adds code for chaining the throw methods.
+     *    @return string           Code for chains.
+     */
+    protected function chainThrowMethods() {
+        $code  = "    function throwOn(\$method, \$exception = false, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->throwOn(\$method, \$exception, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function throwAt(\$timing, \$method, \$exception = false, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->throwAt(\$timing, \$method, \$exception, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function errorOn(\$method, \$error = 'A mock error', \$args = false, \$severity = E_USER_ERROR) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->errorOn(\$method, \$error, \$args, \$severity);\n";
+        $code .= "    }\n";
+        $code .= "    function errorAt(\$timing, \$method, \$error = 'A mock error', \$args = false, \$severity = E_USER_ERROR) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->errorAt(\$timing, \$method, \$error, \$args, \$severity);\n";
+        $code .= "    }\n";
+        return $code;
+    }
+
+    /**
+     *    Creates source code to override a list of methods
+     *    with mock versions.
+     *    @param array $methods    Methods to be overridden
+     *                             with mock versions.
+     *    @return string           Code for overridden chains.
+     */
+    protected function overrideMethods($methods) {
+        $code = "";
+        foreach ($methods as $method) {
+            if ($this->isConstructor($method)) {
+                continue;
+            }
+            $code .= "    " . $this->reflection->getSignature($method) . " {\n";
+            $code .= "        \$args = func_get_args();\n";
+            $code .= "        \$result = &\$this->mock->invoke(\"$method\", \$args);\n";
+            $code .= "        return \$result;\n";
+            $code .= "    }\n";
+        }
+        return $code;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/page.php b/3rdparty/simpletest/page.php
new file mode 100755
index 00000000000..5c0bce7079d
--- /dev/null
+++ b/3rdparty/simpletest/page.php
@@ -0,0 +1,542 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: page.php 1938 2009-08-05 17:16:23Z dgheath $
+ */
+
+/**#@+
+    *   include other SimpleTest class files
+    */
+require_once(dirname(__FILE__) . '/http.php');
+require_once(dirname(__FILE__) . '/php_parser.php');
+require_once(dirname(__FILE__) . '/tag.php');
+require_once(dirname(__FILE__) . '/form.php');
+require_once(dirname(__FILE__) . '/selector.php');
+/**#@-*/
+
+/**
+ *    A wrapper for a web page.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimplePage {
+    private $links = array();
+    private $title = false;
+    private $last_widget;
+    private $label;
+    private $forms = array();
+    private $frames = array();
+    private $transport_error;
+    private $raw;
+    private $text = false;
+    private $sent;
+    private $headers;
+    private $method;
+    private $url;
+    private $base = false;
+    private $request_data;
+
+    /**
+     *    Parses a page ready to access it's contents.
+     *    @param SimpleHttpResponse $response     Result of HTTP fetch.
+     *    @access public
+     */
+    function __construct($response = false) {
+        if ($response) {
+            $this->extractResponse($response);
+        } else {
+            $this->noResponse();
+        }
+    }
+
+    /**
+     *    Extracts all of the response information.
+     *    @param SimpleHttpResponse $response    Response being parsed.
+     *    @access private
+     */
+    protected function extractResponse($response) {
+        $this->transport_error = $response->getError();
+        $this->raw = $response->getContent();
+        $this->sent = $response->getSent();
+        $this->headers = $response->getHeaders();
+        $this->method = $response->getMethod();
+        $this->url = $response->getUrl();
+        $this->request_data = $response->getRequestData();
+    }
+
+    /**
+     *    Sets up a missing response.
+     *    @access private
+     */
+    protected function noResponse() {
+        $this->transport_error = 'No page fetched yet';
+        $this->raw = false;
+        $this->sent = false;
+        $this->headers = false;
+        $this->method = 'GET';
+        $this->url = false;
+        $this->request_data = false;
+    }
+
+    /**
+     *    Original request as bytes sent down the wire.
+     *    @return mixed              Sent content.
+     *    @access public
+     */
+    function getRequest() {
+        return $this->sent;
+    }
+
+    /**
+     *    Accessor for raw text of page.
+     *    @return string        Raw unparsed content.
+     *    @access public
+     */
+    function getRaw() {
+        return $this->raw;
+    }
+
+    /**
+     *    Accessor for plain text of page as a text browser
+     *    would see it.
+     *    @return string        Plain text of page.
+     *    @access public
+     */
+    function getText() {
+        if (! $this->text) {
+            $this->text = SimplePage::normalise($this->raw);
+        }
+        return $this->text;
+    }
+
+    /**
+     *    Accessor for raw headers of page.
+     *    @return string       Header block as text.
+     *    @access public
+     */
+    function getHeaders() {
+        if ($this->headers) {
+            return $this->headers->getRaw();
+        }
+        return false;
+    }
+
+    /**
+     *    Original request method.
+     *    @return string        GET, POST or HEAD.
+     *    @access public
+     */
+    function getMethod() {
+        return $this->method;
+    }
+
+    /**
+     *    Original resource name.
+     *    @return SimpleUrl        Current url.
+     *    @access public
+     */
+    function getUrl() {
+        return $this->url;
+    }
+
+    /**
+     *    Base URL if set via BASE tag page url otherwise
+     *    @return SimpleUrl        Base url.
+     *    @access public
+     */
+    function getBaseUrl() {
+        return $this->base;
+    }
+
+    /**
+     *    Original request data.
+     *    @return mixed              Sent content.
+     *    @access public
+     */
+    function getRequestData() {
+        return $this->request_data;
+    }
+
+    /**
+     *    Accessor for last error.
+     *    @return string        Error from last response.
+     *    @access public
+     */
+    function getTransportError() {
+        return $this->transport_error;
+    }
+
+    /**
+     *    Accessor for current MIME type.
+     *    @return string    MIME type as string; e.g. 'text/html'
+     *    @access public
+     */
+    function getMimeType() {
+        if ($this->headers) {
+            return $this->headers->getMimeType();
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for HTTP response code.
+     *    @return integer    HTTP response code received.
+     *    @access public
+     */
+    function getResponseCode() {
+        if ($this->headers) {
+            return $this->headers->getResponseCode();
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for last Authentication type. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Description of challenge type.
+     *    @access public
+     */
+    function getAuthentication() {
+        if ($this->headers) {
+            return $this->headers->getAuthentication();
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for last Authentication realm. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Name of security realm.
+     *    @access public
+     */
+    function getRealm() {
+        if ($this->headers) {
+            return $this->headers->getRealm();
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for current frame focus. Will be
+     *    false as no frames.
+     *    @return array    Always empty.
+     *    @access public
+     */
+    function getFrameFocus() {
+        return array();
+    }
+
+    /**
+     *    Sets the focus by index. The integer index starts from 1.
+     *    @param integer $choice    Chosen frame.
+     *    @return boolean           Always false.
+     *    @access public
+     */
+    function setFrameFocusByIndex($choice) {
+        return false;
+    }
+
+    /**
+     *    Sets the focus by name. Always fails for a leaf page.
+     *    @param string $name    Chosen frame.
+     *    @return boolean        False as no frames.
+     *    @access public
+     */
+    function setFrameFocus($name) {
+        return false;
+    }
+
+    /**
+     *    Clears the frame focus. Does nothing for a leaf page.
+     *    @access public
+     */
+    function clearFrameFocus() {
+    }
+
+    /**
+     *    TODO: write docs
+     */
+    function setFrames($frames) {
+        $this->frames = $frames;
+    }
+
+    /**
+     *    Test to see if link is an absolute one.
+     *    @param string $url     Url to test.
+     *    @return boolean        True if absolute.
+     *    @access protected
+     */
+    protected function linkIsAbsolute($url) {
+        $parsed = new SimpleUrl($url);
+        return (boolean)($parsed->getScheme() && $parsed->getHost());
+    }
+
+    /**
+     *    Adds a link to the page.
+     *    @param SimpleAnchorTag $tag      Link to accept.
+     */
+    function addLink($tag) {
+        $this->links[] = $tag;
+    }
+
+    /**
+     *    Set the forms
+     *    @param array $forms           An array of SimpleForm objects
+     */
+    function setForms($forms) {
+        $this->forms = $forms;
+    }
+
+    /**
+     *    Test for the presence of a frameset.
+     *    @return boolean        True if frameset.
+     *    @access public
+     */
+    function hasFrames() {
+        return count($this->frames) > 0;
+    }
+
+    /**
+     *    Accessor for frame name and source URL for every frame that
+     *    will need to be loaded. Immediate children only.
+     *    @return boolean/array     False if no frameset or
+     *                              otherwise a hash of frame URLs.
+     *                              The key is either a numerical
+     *                              base one index or the name attribute.
+     *    @access public
+     */
+    function getFrameset() {
+        if (! $this->hasFrames()) {
+            return false;
+        }
+        $urls = array();
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $name = $this->frames[$i]->getAttribute('name');
+            $url = new SimpleUrl($this->frames[$i]->getAttribute('src'));
+            $urls[$name ? $name : $i + 1] = $this->expandUrl($url);
+        }
+        return $urls;
+    }
+
+    /**
+     *    Fetches a list of loaded frames.
+     *    @return array/string    Just the URL for a single page.
+     *    @access public
+     */
+    function getFrames() {
+        $url = $this->expandUrl($this->getUrl());
+        return $url->asString();
+    }
+
+    /**
+     *    Accessor for a list of all links.
+     *    @return array   List of urls with scheme of
+     *                    http or https and hostname.
+     *    @access public
+     */
+    function getUrls() {
+        $all = array();
+        foreach ($this->links as $link) {
+            $url = $this->getUrlFromLink($link);
+            $all[] = $url->asString();
+        }
+        return $all;
+    }
+
+    /**
+     *    Accessor for URLs by the link label. Label will match
+     *    regardess of whitespace issues and case.
+     *    @param string $label    Text of link.
+     *    @return array           List of links with that label.
+     *    @access public
+     */
+    function getUrlsByLabel($label) {
+        $matches = array();
+        foreach ($this->links as $link) {
+            if ($link->getText() == $label) {
+                $matches[] = $this->getUrlFromLink($link);
+            }
+        }
+        return $matches;
+    }
+
+    /**
+     *    Accessor for a URL by the id attribute.
+     *    @param string $id       Id attribute of link.
+     *    @return SimpleUrl       URL with that id of false if none.
+     *    @access public
+     */
+    function getUrlById($id) {
+        foreach ($this->links as $link) {
+            if ($link->getAttribute('id') === (string)$id) {
+                return $this->getUrlFromLink($link);
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Converts a link tag into a target URL.
+     *    @param SimpleAnchor $link    Parsed link.
+     *    @return SimpleUrl            URL with frame target if any.
+     *    @access private
+     */
+    protected function getUrlFromLink($link) {
+        $url = $this->expandUrl($link->getHref());
+        if ($link->getAttribute('target')) {
+            $url->setTarget($link->getAttribute('target'));
+        }
+        return $url;
+    }
+
+    /**
+     *    Expands expandomatic URLs into fully qualified
+     *    URLs.
+     *    @param SimpleUrl $url        Relative URL.
+     *    @return SimpleUrl            Absolute URL.
+     *    @access public
+     */
+    function expandUrl($url) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        $location = $this->getBaseUrl() ? $this->getBaseUrl() : new SimpleUrl();
+        return $url->makeAbsolute($location->makeAbsolute($this->getUrl()));
+    }
+
+    /**
+     *    Sets the base url for the page.
+     *    @param string $url    Base URL for page.
+     */
+    function setBase($url) {
+        $this->base = new SimpleUrl($url);
+    }
+
+    /**
+     *    Sets the title tag contents.
+     *    @param SimpleTitleTag $tag    Title of page.
+     */
+    function setTitle($tag) {
+        $this->title = $tag;
+    }
+
+    /**
+     *    Accessor for parsed title.
+     *    @return string     Title or false if no title is present.
+     *    @access public
+     */
+    function getTitle() {
+        if ($this->title) {
+            return $this->title->getText();
+        }
+        return false;
+    }
+
+    /**
+     *    Finds a held form by button label. Will only
+     *    search correctly built forms.
+     *    @param SimpleSelector $selector       Button finder.
+     *    @return SimpleForm                    Form object containing
+     *                                          the button.
+     *    @access public
+     */
+    function getFormBySubmit($selector) {
+        for ($i = 0; $i < count($this->forms); $i++) {
+            if ($this->forms[$i]->hasSubmit($selector)) {
+                return $this->forms[$i];
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Finds a held form by image using a selector.
+     *    Will only search correctly built forms.
+     *    @param SimpleSelector $selector  Image finder.
+     *    @return SimpleForm               Form object containing
+     *                                     the image.
+     *    @access public
+     */
+    function getFormByImage($selector) {
+        for ($i = 0; $i < count($this->forms); $i++) {
+            if ($this->forms[$i]->hasImage($selector)) {
+                return $this->forms[$i];
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Finds a held form by the form ID. A way of
+     *    identifying a specific form when we have control
+     *    of the HTML code.
+     *    @param string $id     Form label.
+     *    @return SimpleForm    Form object containing the matching ID.
+     *    @access public
+     */
+    function getFormById($id) {
+        for ($i = 0; $i < count($this->forms); $i++) {
+            if ($this->forms[$i]->getId() == $id) {
+                return $this->forms[$i];
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Sets a field on each form in which the field is
+     *    available.
+     *    @param SimpleSelector $selector    Field finder.
+     *    @param string $value               Value to set field to.
+     *    @return boolean                    True if value is valid.
+     *    @access public
+     */
+    function setField($selector, $value, $position=false) {
+        $is_set = false;
+        for ($i = 0; $i < count($this->forms); $i++) {
+            if ($this->forms[$i]->setField($selector, $value, $position)) {
+                $is_set = true;
+            }
+        }
+        return $is_set;
+    }
+
+    /**
+     *    Accessor for a form element value within a page.
+     *    @param SimpleSelector $selector    Field finder.
+     *    @return string/boolean             A string if the field is
+     *                                       present, false if unchecked
+     *                                       and null if missing.
+     *    @access public
+     */
+    function getField($selector) {
+        for ($i = 0; $i < count($this->forms); $i++) {
+            $value = $this->forms[$i]->getValue($selector);
+            if (isset($value)) {
+                return $value;
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Turns HTML into text browser visible text. Images
+     *    are converted to their alt text and tags are supressed.
+     *    Entities are converted to their visible representation.
+     *    @param string $html        HTML to convert.
+     *    @return string             Plain text.
+     *    @access public
+     */
+    static function normalise($html) {
+        $text = preg_replace('#<!--.*?-->#si', '', $html);
+        $text = preg_replace('#<(script|option|textarea)[^>]*>.*?</\1>#si', '', $text);
+        $text = preg_replace('#<img[^>]*alt\s*=\s*("([^"]*)"|\'([^\']*)\'|([a-zA-Z_]+))[^>]*>#', ' \2\3\4 ', $text);
+        $text = preg_replace('#<[^>]*>#', '', $text);
+        $text = html_entity_decode($text, ENT_QUOTES);
+        $text = preg_replace('#\s+#', ' ', $text);
+        return trim(trim($text), "\xA0");        // TODO: The \xAO is a &nbsp;. Add a test for this.
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/php_parser.php b/3rdparty/simpletest/php_parser.php
new file mode 100755
index 00000000000..4c5b8f00bae
--- /dev/null
+++ b/3rdparty/simpletest/php_parser.php
@@ -0,0 +1,1054 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: php_parser.php 1927 2009-07-31 12:45:36Z dgheath $
+ */
+
+/**#@+
+ * Lexer mode stack constants
+ */
+foreach (array('LEXER_ENTER', 'LEXER_MATCHED',
+                'LEXER_UNMATCHED', 'LEXER_EXIT',
+                'LEXER_SPECIAL') as $i => $constant) {
+    if (! defined($constant)) {
+        define($constant, $i + 1);
+    }
+}
+/**#@-*/
+
+/**
+ *    Compounded regular expression. Any of
+ *    the contained patterns could match and
+ *    when one does, it's label is returned.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class ParallelRegex {
+    private $patterns;
+    private $labels;
+    private $regex;
+    private $case;
+
+    /**
+     *    Constructor. Starts with no patterns.
+     *    @param boolean $case    True for case sensitive, false
+     *                            for insensitive.
+     *    @access public
+     */
+    function __construct($case) {
+        $this->case = $case;
+        $this->patterns = array();
+        $this->labels = array();
+        $this->regex = null;
+    }
+
+    /**
+     *    Adds a pattern with an optional label.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $label        Label of regex to be returned
+     *                                on a match.
+     *    @access public
+     */
+    function addPattern($pattern, $label = true) {
+        $count = count($this->patterns);
+        $this->patterns[$count] = $pattern;
+        $this->labels[$count] = $label;
+        $this->regex = null;
+    }
+
+    /**
+     *    Attempts to match all patterns at once against
+     *    a string.
+     *    @param string $subject      String to match against.
+     *    @param string $match        First matched portion of
+     *                                subject.
+     *    @return boolean             True on success.
+     *    @access public
+     */
+    function match($subject, &$match) {
+        if (count($this->patterns) == 0) {
+            return false;
+        }
+        if (! preg_match($this->getCompoundedRegex(), $subject, $matches)) {
+            $match = '';
+            return false;
+        }
+        $match = $matches[0];
+        for ($i = 1; $i < count($matches); $i++) {
+            if ($matches[$i]) {
+                return $this->labels[$i - 1];
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Compounds the patterns into a single
+     *    regular expression separated with the
+     *    "or" operator. Caches the regex.
+     *    Will automatically escape (, ) and / tokens.
+     *    @param array $patterns    List of patterns in order.
+     *    @access private
+     */
+    protected function getCompoundedRegex() {
+        if ($this->regex == null) {
+            for ($i = 0, $count = count($this->patterns); $i < $count; $i++) {
+                $this->patterns[$i] = '(' . str_replace(
+                        array('/', '(', ')'),
+                        array('\/', '\(', '\)'),
+                        $this->patterns[$i]) . ')';
+            }
+            $this->regex = "/" . implode("|", $this->patterns) . "/" . $this->getPerlMatchingFlags();
+        }
+        return $this->regex;
+    }
+
+    /**
+     *    Accessor for perl regex mode flags to use.
+     *    @return string       Perl regex flags.
+     *    @access private
+     */
+    protected function getPerlMatchingFlags() {
+        return ($this->case ? "msS" : "msSi");
+    }
+}
+
+/**
+ *    States for a stack machine.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleStateStack {
+    private $stack;
+
+    /**
+     *    Constructor. Starts in named state.
+     *    @param string $start        Starting state name.
+     *    @access public
+     */
+    function __construct($start) {
+        $this->stack = array($start);
+    }
+
+    /**
+     *    Accessor for current state.
+     *    @return string       State.
+     *    @access public
+     */
+    function getCurrent() {
+        return $this->stack[count($this->stack) - 1];
+    }
+
+    /**
+     *    Adds a state to the stack and sets it
+     *    to be the current state.
+     *    @param string $state        New state.
+     *    @access public
+     */
+    function enter($state) {
+        array_push($this->stack, $state);
+    }
+
+    /**
+     *    Leaves the current state and reverts
+     *    to the previous one.
+     *    @return boolean    False if we drop off
+     *                       the bottom of the list.
+     *    @access public
+     */
+    function leave() {
+        if (count($this->stack) == 1) {
+            return false;
+        }
+        array_pop($this->stack);
+        return true;
+    }
+}
+
+/**
+ *    Accepts text and breaks it into tokens.
+ *    Some optimisation to make the sure the
+ *    content is only scanned by the PHP regex
+ *    parser once. Lexer modes must not start
+ *    with leading underscores.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleLexer {
+    private $regexes;
+    private $parser;
+    private $mode;
+    private $mode_handlers;
+    private $case;
+
+    /**
+     *    Sets up the lexer in case insensitive matching
+     *    by default.
+     *    @param SimpleSaxParser $parser  Handling strategy by
+     *                                    reference.
+     *    @param string $start            Starting handler.
+     *    @param boolean $case            True for case sensitive.
+     *    @access public
+     */
+    function __construct($parser, $start = "accept", $case = false) {
+        $this->case = $case;
+        $this->regexes = array();
+        $this->parser = $parser;
+        $this->mode = new SimpleStateStack($start);
+        $this->mode_handlers = array($start => $start);
+    }
+
+    /**
+     *    Adds a token search pattern for a particular
+     *    parsing mode. The pattern does not change the
+     *    current mode.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $mode         Should only apply this
+     *                                pattern when dealing with
+     *                                this type of input.
+     *    @access public
+     */
+    function addPattern($pattern, $mode = "accept") {
+        if (! isset($this->regexes[$mode])) {
+            $this->regexes[$mode] = new ParallelRegex($this->case);
+        }
+        $this->regexes[$mode]->addPattern($pattern);
+        if (! isset($this->mode_handlers[$mode])) {
+            $this->mode_handlers[$mode] = $mode;
+        }
+    }
+
+    /**
+     *    Adds a pattern that will enter a new parsing
+     *    mode. Useful for entering parenthesis, strings,
+     *    tags, etc.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $mode         Should only apply this
+     *                                pattern when dealing with
+     *                                this type of input.
+     *    @param string $new_mode     Change parsing to this new
+     *                                nested mode.
+     *    @access public
+     */
+    function addEntryPattern($pattern, $mode, $new_mode) {
+        if (! isset($this->regexes[$mode])) {
+            $this->regexes[$mode] = new ParallelRegex($this->case);
+        }
+        $this->regexes[$mode]->addPattern($pattern, $new_mode);
+        if (! isset($this->mode_handlers[$new_mode])) {
+            $this->mode_handlers[$new_mode] = $new_mode;
+        }
+    }
+
+    /**
+     *    Adds a pattern that will exit the current mode
+     *    and re-enter the previous one.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $mode         Mode to leave.
+     *    @access public
+     */
+    function addExitPattern($pattern, $mode) {
+        if (! isset($this->regexes[$mode])) {
+            $this->regexes[$mode] = new ParallelRegex($this->case);
+        }
+        $this->regexes[$mode]->addPattern($pattern, "__exit");
+        if (! isset($this->mode_handlers[$mode])) {
+            $this->mode_handlers[$mode] = $mode;
+        }
+    }
+
+    /**
+     *    Adds a pattern that has a special mode. Acts as an entry
+     *    and exit pattern in one go, effectively calling a special
+     *    parser handler for this token only.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $mode         Should only apply this
+     *                                pattern when dealing with
+     *                                this type of input.
+     *    @param string $special      Use this mode for this one token.
+     *    @access public
+     */
+    function addSpecialPattern($pattern, $mode, $special) {
+        if (! isset($this->regexes[$mode])) {
+            $this->regexes[$mode] = new ParallelRegex($this->case);
+        }
+        $this->regexes[$mode]->addPattern($pattern, "_$special");
+        if (! isset($this->mode_handlers[$special])) {
+            $this->mode_handlers[$special] = $special;
+        }
+    }
+
+    /**
+     *    Adds a mapping from a mode to another handler.
+     *    @param string $mode        Mode to be remapped.
+     *    @param string $handler     New target handler.
+     *    @access public
+     */
+    function mapHandler($mode, $handler) {
+        $this->mode_handlers[$mode] = $handler;
+    }
+
+    /**
+     *    Splits the page text into tokens. Will fail
+     *    if the handlers report an error or if no
+     *    content is consumed. If successful then each
+     *    unparsed and parsed token invokes a call to the
+     *    held listener.
+     *    @param string $raw        Raw HTML text.
+     *    @return boolean           True on success, else false.
+     *    @access public
+     */
+    function parse($raw) {
+        if (! isset($this->parser)) {
+            return false;
+        }
+        $length = strlen($raw);
+        while (is_array($parsed = $this->reduce($raw))) {
+            list($raw, $unmatched, $matched, $mode) = $parsed;
+            if (! $this->dispatchTokens($unmatched, $matched, $mode)) {
+                return false;
+            }
+            if ($raw === '') {
+                return true;
+            }
+            if (strlen($raw) == $length) {
+                return false;
+            }
+            $length = strlen($raw);
+        }
+        if (! $parsed) {
+            return false;
+        }
+        return $this->invokeParser($raw, LEXER_UNMATCHED);
+    }
+
+    /**
+     *    Sends the matched token and any leading unmatched
+     *    text to the parser changing the lexer to a new
+     *    mode if one is listed.
+     *    @param string $unmatched    Unmatched leading portion.
+     *    @param string $matched      Actual token match.
+     *    @param string $mode         Mode after match. A boolean
+     *                                false mode causes no change.
+     *    @return boolean             False if there was any error
+     *                                from the parser.
+     *    @access private
+     */
+    protected function dispatchTokens($unmatched, $matched, $mode = false) {
+        if (! $this->invokeParser($unmatched, LEXER_UNMATCHED)) {
+            return false;
+        }
+        if (is_bool($mode)) {
+            return $this->invokeParser($matched, LEXER_MATCHED);
+        }
+        if ($this->isModeEnd($mode)) {
+            if (! $this->invokeParser($matched, LEXER_EXIT)) {
+                return false;
+            }
+            return $this->mode->leave();
+        }
+        if ($this->isSpecialMode($mode)) {
+            $this->mode->enter($this->decodeSpecial($mode));
+            if (! $this->invokeParser($matched, LEXER_SPECIAL)) {
+                return false;
+            }
+            return $this->mode->leave();
+        }
+        $this->mode->enter($mode);
+        return $this->invokeParser($matched, LEXER_ENTER);
+    }
+
+    /**
+     *    Tests to see if the new mode is actually to leave
+     *    the current mode and pop an item from the matching
+     *    mode stack.
+     *    @param string $mode    Mode to test.
+     *    @return boolean        True if this is the exit mode.
+     *    @access private
+     */
+    protected function isModeEnd($mode) {
+        return ($mode === "__exit");
+    }
+
+    /**
+     *    Test to see if the mode is one where this mode
+     *    is entered for this token only and automatically
+     *    leaves immediately afterwoods.
+     *    @param string $mode    Mode to test.
+     *    @return boolean        True if this is the exit mode.
+     *    @access private
+     */
+    protected function isSpecialMode($mode) {
+        return (strncmp($mode, "_", 1) == 0);
+    }
+
+    /**
+     *    Strips the magic underscore marking single token
+     *    modes.
+     *    @param string $mode    Mode to decode.
+     *    @return string         Underlying mode name.
+     *    @access private
+     */
+    protected function decodeSpecial($mode) {
+        return substr($mode, 1);
+    }
+
+    /**
+     *    Calls the parser method named after the current
+     *    mode. Empty content will be ignored. The lexer
+     *    has a parser handler for each mode in the lexer.
+     *    @param string $content        Text parsed.
+     *    @param boolean $is_match      Token is recognised rather
+     *                                  than unparsed data.
+     *    @access private
+     */
+    protected function invokeParser($content, $is_match) {
+        if (($content === '') || ($content === false)) {
+            return true;
+        }
+        $handler = $this->mode_handlers[$this->mode->getCurrent()];
+        return $this->parser->$handler($content, $is_match);
+    }
+
+    /**
+     *    Tries to match a chunk of text and if successful
+     *    removes the recognised chunk and any leading
+     *    unparsed data. Empty strings will not be matched.
+     *    @param string $raw         The subject to parse. This is the
+     *                               content that will be eaten.
+     *    @return array/boolean      Three item list of unparsed
+     *                               content followed by the
+     *                               recognised token and finally the
+     *                               action the parser is to take.
+     *                               True if no match, false if there
+     *                               is a parsing error.
+     *    @access private
+     */
+    protected function reduce($raw) {
+        if ($action = $this->regexes[$this->mode->getCurrent()]->match($raw, $match)) {
+            $unparsed_character_count = strpos($raw, $match);
+            $unparsed = substr($raw, 0, $unparsed_character_count);
+            $raw = substr($raw, $unparsed_character_count + strlen($match));
+            return array($raw, $unparsed, $match, $action);
+        }
+        return true;
+    }
+}
+
+/**
+ *    Breaks HTML into SAX events.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHtmlLexer extends SimpleLexer {
+
+    /**
+     *    Sets up the lexer with case insensitive matching
+     *    and adds the HTML handlers.
+     *    @param SimpleSaxParser $parser  Handling strategy by
+     *                                    reference.
+     *    @access public
+     */
+    function __construct($parser) {
+        parent::__construct($parser, 'text');
+        $this->mapHandler('text', 'acceptTextToken');
+        $this->addSkipping();
+        foreach ($this->getParsedTags() as $tag) {
+            $this->addTag($tag);
+        }
+        $this->addInTagTokens();
+    }
+
+    /**
+     *    List of parsed tags. Others are ignored.
+     *    @return array        List of searched for tags.
+     *    @access private
+     */
+    protected function getParsedTags() {
+        return array('a', 'base', 'title', 'form', 'input', 'button', 'textarea', 'select',
+                'option', 'frameset', 'frame', 'label');
+    }
+
+    /**
+     *    The lexer has to skip certain sections such
+     *    as server code, client code and styles.
+     *    @access private
+     */
+    protected function addSkipping() {
+        $this->mapHandler('css', 'ignore');
+        $this->addEntryPattern('<style', 'text', 'css');
+        $this->addExitPattern('</style>', 'css');
+        $this->mapHandler('js', 'ignore');
+        $this->addEntryPattern('<script', 'text', 'js');
+        $this->addExitPattern('</script>', 'js');
+        $this->mapHandler('comment', 'ignore');
+        $this->addEntryPattern('<!--', 'text', 'comment');
+        $this->addExitPattern('-->', 'comment');
+    }
+
+    /**
+     *    Pattern matches to start and end a tag.
+     *    @param string $tag          Name of tag to scan for.
+     *    @access private
+     */
+    protected function addTag($tag) {
+        $this->addSpecialPattern("</$tag>", 'text', 'acceptEndToken');
+        $this->addEntryPattern("<$tag", 'text', 'tag');
+    }
+
+    /**
+     *    Pattern matches to parse the inside of a tag
+     *    including the attributes and their quoting.
+     *    @access private
+     */
+    protected function addInTagTokens() {
+        $this->mapHandler('tag', 'acceptStartToken');
+        $this->addSpecialPattern('\s+', 'tag', 'ignore');
+        $this->addAttributeTokens();
+        $this->addExitPattern('/>', 'tag');
+        $this->addExitPattern('>', 'tag');
+    }
+
+    /**
+     *    Matches attributes that are either single quoted,
+     *    double quoted or unquoted.
+     *    @access private
+     */
+    protected function addAttributeTokens() {
+        $this->mapHandler('dq_attribute', 'acceptAttributeToken');
+        $this->addEntryPattern('=\s*"', 'tag', 'dq_attribute');
+        $this->addPattern("\\\\\"", 'dq_attribute');
+        $this->addExitPattern('"', 'dq_attribute');
+        $this->mapHandler('sq_attribute', 'acceptAttributeToken');
+        $this->addEntryPattern("=\s*'", 'tag', 'sq_attribute');
+        $this->addPattern("\\\\'", 'sq_attribute');
+        $this->addExitPattern("'", 'sq_attribute');
+        $this->mapHandler('uq_attribute', 'acceptAttributeToken');
+        $this->addSpecialPattern('=\s*[^>\s]*', 'tag', 'uq_attribute');
+    }
+}
+
+/**
+ *    Converts HTML tokens into selected SAX events.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHtmlSaxParser {
+    private $lexer;
+    private $listener;
+    private $tag;
+    private $attributes;
+    private $current_attribute;
+
+    /**
+     *    Sets the listener.
+     *    @param SimplePhpPageBuilder $listener    SAX event handler.
+     *    @access public
+     */
+    function __construct($listener) {
+        $this->listener = $listener;
+        $this->lexer = $this->createLexer($this);
+        $this->tag = '';
+        $this->attributes = array();
+        $this->current_attribute = '';
+    }
+
+    /**
+     *    Runs the content through the lexer which
+     *    should call back to the acceptors.
+     *    @param string $raw      Page text to parse.
+     *    @return boolean         False if parse error.
+     *    @access public
+     */
+    function parse($raw) {
+        return $this->lexer->parse($raw);
+    }
+
+    /**
+     *    Sets up the matching lexer. Starts in 'text' mode.
+     *    @param SimpleSaxParser $parser    Event generator, usually $self.
+     *    @return SimpleLexer               Lexer suitable for this parser.
+     *    @access public
+     */
+    static function createLexer(&$parser) {
+        return new SimpleHtmlLexer($parser);
+    }
+
+    /**
+     *    Accepts a token from the tag mode. If the
+     *    starting element completes then the element
+     *    is dispatched and the current attributes
+     *    set back to empty. The element or attribute
+     *    name is converted to lower case.
+     *    @param string $token     Incoming characters.
+     *    @param integer $event    Lexer event type.
+     *    @return boolean          False if parse error.
+     *    @access public
+     */
+    function acceptStartToken($token, $event) {
+        if ($event == LEXER_ENTER) {
+            $this->tag = strtolower(substr($token, 1));
+            return true;
+        }
+        if ($event == LEXER_EXIT) {
+            $success = $this->listener->startElement(
+                    $this->tag,
+                    $this->attributes);
+            $this->tag = '';
+            $this->attributes = array();
+            return $success;
+        }
+        if ($token != '=') {
+            $this->current_attribute = strtolower(html_entity_decode($token, ENT_QUOTES));
+            $this->attributes[$this->current_attribute] = '';
+        }
+        return true;
+    }
+
+    /**
+     *    Accepts a token from the end tag mode.
+     *    The element name is converted to lower case.
+     *    @param string $token     Incoming characters.
+     *    @param integer $event    Lexer event type.
+     *    @return boolean          False if parse error.
+     *    @access public
+     */
+    function acceptEndToken($token, $event) {
+        if (! preg_match('/<\/(.*)>/', $token, $matches)) {
+            return false;
+        }
+        return $this->listener->endElement(strtolower($matches[1]));
+    }
+
+    /**
+     *    Part of the tag data.
+     *    @param string $token     Incoming characters.
+     *    @param integer $event    Lexer event type.
+     *    @return boolean          False if parse error.
+     *    @access public
+     */
+    function acceptAttributeToken($token, $event) {
+        if ($this->current_attribute) {
+            if ($event == LEXER_UNMATCHED) {
+                $this->attributes[$this->current_attribute] .=
+                        html_entity_decode($token, ENT_QUOTES);
+            }
+            if ($event == LEXER_SPECIAL) {
+                $this->attributes[$this->current_attribute] .=
+                        preg_replace('/^=\s*/' , '', html_entity_decode($token, ENT_QUOTES));
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    A character entity.
+     *    @param string $token    Incoming characters.
+     *    @param integer $event   Lexer event type.
+     *    @return boolean         False if parse error.
+     *    @access public
+     */
+    function acceptEntityToken($token, $event) {
+    }
+
+    /**
+     *    Character data between tags regarded as
+     *    important.
+     *    @param string $token     Incoming characters.
+     *    @param integer $event    Lexer event type.
+     *    @return boolean          False if parse error.
+     *    @access public
+     */
+    function acceptTextToken($token, $event) {
+        return $this->listener->addContent($token);
+    }
+
+    /**
+     *    Incoming data to be ignored.
+     *    @param string $token     Incoming characters.
+     *    @param integer $event    Lexer event type.
+     *    @return boolean          False if parse error.
+     *    @access public
+     */
+    function ignore($token, $event) {
+        return true;
+    }
+}
+
+/**
+ *    SAX event handler. Maintains a list of
+ *    open tags and dispatches them as they close.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimplePhpPageBuilder {
+    private $tags;
+    private $page;
+    private $private_content_tag;
+    private $open_forms = array();
+    private $complete_forms = array();
+    private $frameset = false;
+    private $loading_frames = array();
+    private $frameset_nesting_level = 0;
+    private $left_over_labels = array();
+
+    /**
+     *    Frees up any references so as to allow the PHP garbage
+     *    collection from unset() to work.
+     *    @access public
+     */
+    function free() {
+        unset($this->tags);
+        unset($this->page);
+        unset($this->private_content_tags);
+        $this->open_forms = array();
+        $this->complete_forms = array();
+        $this->frameset = false;
+        $this->loading_frames = array();
+        $this->frameset_nesting_level = 0;
+        $this->left_over_labels = array();
+    }
+
+    /**
+     *    This builder is always available.
+     *    @return boolean       Always true.
+     */
+    function can() {
+        return true;
+    }
+
+    /**
+     *    Reads the raw content and send events
+     *    into the page to be built.
+     *    @param $response SimpleHttpResponse  Fetched response.
+     *    @return SimplePage                   Newly parsed page.
+     *    @access public
+     */
+    function parse($response) {
+        $this->tags = array();
+        $this->page = $this->createPage($response);
+        $parser = $this->createParser($this);
+        $parser->parse($response->getContent());
+        $this->acceptPageEnd();
+        $page = $this->page;
+        $this->free();
+        return $page;
+    }
+
+    /**
+     *    Creates an empty page.
+     *    @return SimplePage        New unparsed page.
+     *    @access protected
+     */
+    protected function createPage($response) {
+        return new SimplePage($response);
+    }
+
+    /**
+     *    Creates the parser used with the builder.
+     *    @param SimplePhpPageBuilder $listener   Target of parser.
+     *    @return SimpleSaxParser              Parser to generate
+     *                                         events for the builder.
+     *    @access protected
+     */
+    protected function createParser(&$listener) {
+        return new SimpleHtmlSaxParser($listener);
+    }
+
+    /**
+     *    Start of element event. Opens a new tag.
+     *    @param string $name         Element name.
+     *    @param hash $attributes     Attributes without content
+     *                                are marked as true.
+     *    @return boolean             False on parse error.
+     *    @access public
+     */
+    function startElement($name, $attributes) {
+        $factory = new SimpleTagBuilder();
+        $tag = $factory->createTag($name, $attributes);
+        if (! $tag) {
+            return true;
+        }
+        if ($tag->getTagName() == 'label') {
+            $this->acceptLabelStart($tag);
+            $this->openTag($tag);
+            return true;
+        }
+        if ($tag->getTagName() == 'form') {
+            $this->acceptFormStart($tag);
+            return true;
+        }
+        if ($tag->getTagName() == 'frameset') {
+            $this->acceptFramesetStart($tag);
+            return true;
+        }
+        if ($tag->getTagName() == 'frame') {
+            $this->acceptFrame($tag);
+            return true;
+        }
+        if ($tag->isPrivateContent() && ! isset($this->private_content_tag)) {
+            $this->private_content_tag = &$tag;
+        }
+        if ($tag->expectEndTag()) {
+            $this->openTag($tag);
+            return true;
+        }
+        $this->acceptTag($tag);
+        return true;
+    }
+
+    /**
+     *    End of element event.
+     *    @param string $name        Element name.
+     *    @return boolean            False on parse error.
+     *    @access public
+     */
+    function endElement($name) {
+        if ($name == 'label') {
+            $this->acceptLabelEnd();
+            return true;
+        }
+        if ($name == 'form') {
+            $this->acceptFormEnd();
+            return true;
+        }
+        if ($name == 'frameset') {
+            $this->acceptFramesetEnd();
+            return true;
+        }
+        if ($this->hasNamedTagOnOpenTagStack($name)) {
+            $tag = array_pop($this->tags[$name]);
+            if ($tag->isPrivateContent() && $this->private_content_tag->getTagName() == $name) {
+                unset($this->private_content_tag);
+            }
+            $this->addContentTagToOpenTags($tag);
+            $this->acceptTag($tag);
+            return true;
+        }
+        return true;
+    }
+
+    /**
+     *    Test to see if there are any open tags awaiting
+     *    closure that match the tag name.
+     *    @param string $name        Element name.
+     *    @return boolean            True if any are still open.
+     *    @access private
+     */
+    protected function hasNamedTagOnOpenTagStack($name) {
+        return isset($this->tags[$name]) && (count($this->tags[$name]) > 0);
+    }
+
+    /**
+     *    Unparsed, but relevant data. The data is added
+     *    to every open tag.
+     *    @param string $text        May include unparsed tags.
+     *    @return boolean            False on parse error.
+     *    @access public
+     */
+    function addContent($text) {
+        if (isset($this->private_content_tag)) {
+            $this->private_content_tag->addContent($text);
+        } else {
+            $this->addContentToAllOpenTags($text);
+        }
+        return true;
+    }
+
+    /**
+     *    Any content fills all currently open tags unless it
+     *    is part of an option tag.
+     *    @param string $text        May include unparsed tags.
+     *    @access private
+     */
+    protected function addContentToAllOpenTags($text) {
+        foreach (array_keys($this->tags) as $name) {
+            for ($i = 0, $count = count($this->tags[$name]); $i < $count; $i++) {
+                $this->tags[$name][$i]->addContent($text);
+            }
+        }
+    }
+
+    /**
+     *    Parsed data in tag form. The parsed tag is added
+     *    to every open tag. Used for adding options to select
+     *    fields only.
+     *    @param SimpleTag $tag        Option tags only.
+     *    @access private
+     */
+    protected function addContentTagToOpenTags(&$tag) {
+        if ($tag->getTagName() != 'option') {
+            return;
+        }
+        foreach (array_keys($this->tags) as $name) {
+            for ($i = 0, $count = count($this->tags[$name]); $i < $count; $i++) {
+                $this->tags[$name][$i]->addTag($tag);
+            }
+        }
+    }
+
+    /**
+     *    Opens a tag for receiving content. Multiple tags
+     *    will be receiving input at the same time.
+     *    @param SimpleTag $tag        New content tag.
+     *    @access private
+     */
+    protected function openTag($tag) {
+        $name = $tag->getTagName();
+        if (! in_array($name, array_keys($this->tags))) {
+            $this->tags[$name] = array();
+        }
+        $this->tags[$name][] = $tag;
+    }
+
+    /**
+     *    Adds a tag to the page.
+     *    @param SimpleTag $tag        Tag to accept.
+     *    @access public
+     */
+    protected function acceptTag($tag) {
+        if ($tag->getTagName() == "a") {
+            $this->page->addLink($tag);
+        } elseif ($tag->getTagName() == "base") {
+            $this->page->setBase($tag->getAttribute('href'));
+        } elseif ($tag->getTagName() == "title") {
+            $this->page->setTitle($tag);
+        } elseif ($this->isFormElement($tag->getTagName())) {
+            for ($i = 0; $i < count($this->open_forms); $i++) {
+                $this->open_forms[$i]->addWidget($tag);
+            }
+            $this->last_widget = $tag;
+        }
+    }
+
+    /**
+     *    Opens a label for a described widget.
+     *    @param SimpleFormTag $tag      Tag to accept.
+     *    @access public
+     */
+    protected function acceptLabelStart($tag) {
+        $this->label = $tag;
+        unset($this->last_widget);
+    }
+
+    /**
+     *    Closes the most recently opened label.
+     *    @access public
+     */
+    protected function acceptLabelEnd() {
+        if (isset($this->label)) {
+            if (isset($this->last_widget)) {
+                $this->last_widget->setLabel($this->label->getText());
+                unset($this->last_widget);
+            } else {
+                $this->left_over_labels[] = SimpleTestCompatibility::copy($this->label);
+            }
+            unset($this->label);
+        }
+    }
+
+    /**
+     *    Tests to see if a tag is a possible form
+     *    element.
+     *    @param string $name     HTML element name.
+     *    @return boolean         True if form element.
+     *    @access private
+     */
+    protected function isFormElement($name) {
+        return in_array($name, array('input', 'button', 'textarea', 'select'));
+    }
+
+    /**
+     *    Opens a form. New widgets go here.
+     *    @param SimpleFormTag $tag      Tag to accept.
+     *    @access public
+     */
+    protected function acceptFormStart($tag) {
+        $this->open_forms[] = new SimpleForm($tag, $this->page);
+    }
+
+    /**
+     *    Closes the most recently opened form.
+     *    @access public
+     */
+    protected function acceptFormEnd() {
+        if (count($this->open_forms)) {
+            $this->complete_forms[] = array_pop($this->open_forms);
+        }
+    }
+
+    /**
+     *    Opens a frameset. A frameset may contain nested
+     *    frameset tags.
+     *    @param SimpleFramesetTag $tag      Tag to accept.
+     *    @access public
+     */
+    protected function acceptFramesetStart($tag) {
+        if (! $this->isLoadingFrames()) {
+            $this->frameset = $tag;
+        }
+        $this->frameset_nesting_level++;
+    }
+
+    /**
+     *    Closes the most recently opened frameset.
+     *    @access public
+     */
+    protected function acceptFramesetEnd() {
+        if ($this->isLoadingFrames()) {
+            $this->frameset_nesting_level--;
+        }
+    }
+
+    /**
+     *    Takes a single frame tag and stashes it in
+     *    the current frame set.
+     *    @param SimpleFrameTag $tag      Tag to accept.
+     *    @access public
+     */
+    protected function acceptFrame($tag) {
+        if ($this->isLoadingFrames()) {
+            if ($tag->getAttribute('src')) {
+                $this->loading_frames[] = $tag;
+            }
+        }
+    }
+
+    /**
+     *    Test to see if in the middle of reading
+     *    a frameset.
+     *    @return boolean        True if inframeset.
+     *    @access private
+     */
+    protected function isLoadingFrames() {
+        return $this->frameset and $this->frameset_nesting_level > 0;
+    }
+
+    /**
+     *    Marker for end of complete page. Any work in
+     *    progress can now be closed.
+     *    @access public
+     */
+    protected function acceptPageEnd() {
+        while (count($this->open_forms)) {
+            $this->complete_forms[] = array_pop($this->open_forms);
+        }
+        foreach ($this->left_over_labels as $label) {
+            for ($i = 0, $count = count($this->complete_forms); $i < $count; $i++) {
+                $this->complete_forms[$i]->attachLabelBySelector(
+                        new SimpleById($label->getFor()),
+                        $label->getText());
+            }
+        }
+        $this->page->setForms($this->complete_forms);
+        $this->page->setFrames($this->loading_frames);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/recorder.php b/3rdparty/simpletest/recorder.php
new file mode 100644
index 00000000000..b3d0d01c625
--- /dev/null
+++ b/3rdparty/simpletest/recorder.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ *	base include file for SimpleTest
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ *  @author Rene vd O (original code)
+ *  @author Perrick Penet
+ *  @author Marcus Baker
+ *	@version	$Id: recorder.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**
+ *	include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/scorer.php');
+
+/**
+ *	A single test result.
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ */
+abstract class SimpleResult {
+	public $time;
+	public $breadcrumb;
+	public $message;
+
+	/**
+	 * Records the test result as public members.
+	 * @param array $breadcrumb		Test stack at the time of the event.
+	 * @param string $message       The messsage to the human.
+	 */
+	function __construct($breadcrumb, $message) {
+		list($this->time, $this->breadcrumb, $this->message) =
+				array(time(), $breadcrumb, $message);
+	}
+}
+
+/**
+ *	A single pass captured for later.
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ */
+class SimpleResultOfPass extends SimpleResult { }
+
+/**
+ *	A single failure captured for later.
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ */
+class SimpleResultOfFail extends SimpleResult { }
+
+/**
+ *	A single exception captured for later.
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ */
+class SimpleResultOfException extends SimpleResult { }
+
+/**
+ *    Array-based test recorder. Returns an array
+ *    with timestamp, status, test name and message for each pass and failure.
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ */
+class Recorder extends SimpleReporterDecorator {
+    public $results = array();
+
+	/**
+	 *    Stashes the pass as a SimpleResultOfPass
+	 *    for later retrieval.
+     *    @param string $message    Pass message to be displayed
+     *    							eventually.
+	 */
+	function paintPass($message) {
+        parent::paintPass($message);
+        $this->results[] = new SimpleResultOfPass(parent::getTestList(), $message);
+	}
+
+	/**
+	 * 	  Stashes the fail as a SimpleResultOfFail
+	 * 	  for later retrieval.
+     *    @param string $message    Failure message to be displayed
+     *    							eventually.
+	 */
+	function paintFail($message) {
+        parent::paintFail($message);
+        $this->results[] = new SimpleResultOfFail(parent::getTestList(), $message);
+	}
+
+	/**
+	 * 	  Stashes the exception as a SimpleResultOfException
+	 * 	  for later retrieval.
+     *    @param string $message    Exception message to be displayed
+     *    							eventually.
+	 */
+	function paintException($message) {
+        parent::paintException($message);
+        $this->results[] = new SimpleResultOfException(parent::getTestList(), $message);
+	}
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/reflection_php4.php b/3rdparty/simpletest/reflection_php4.php
new file mode 100644
index 00000000000..39801ea1bdb
--- /dev/null
+++ b/3rdparty/simpletest/reflection_php4.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: reflection_php4.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**
+ *  Version specific reflection API.
+ *  @package SimpleTest
+ *  @subpackage UnitTester
+ *  @ignore duplicate with reflection_php5.php
+ */
+class SimpleReflection {
+    var $_interface;
+
+    /**
+     *    Stashes the class/interface.
+     *    @param string $interface    Class or interface
+     *                                to inspect.
+     */
+    function SimpleReflection($interface) {
+        $this->_interface = $interface;
+    }
+
+    /**
+     *    Checks that a class has been declared.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classExists() {
+        return class_exists($this->_interface);
+    }
+
+    /**
+     *    Needed to kill the autoload feature in PHP5
+     *    for classes created dynamically.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classExistsSansAutoload() {
+        return class_exists($this->_interface);
+    }
+
+    /**
+     *    Checks that a class or interface has been
+     *    declared.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classOrInterfaceExists() {
+        return class_exists($this->_interface);
+    }
+
+    /**
+     *    Needed to kill the autoload feature in PHP5
+     *    for classes created dynamically.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classOrInterfaceExistsSansAutoload() {
+        return class_exists($this->_interface);
+    }
+
+    /**
+     *    Gets the list of methods on a class or
+     *    interface.
+     *    @returns array          List of method names.
+     *    @access public
+     */
+    function getMethods() {
+        return get_class_methods($this->_interface);
+    }
+
+    /**
+     *    Gets the list of interfaces from a class. If the
+     *    class name is actually an interface then just that
+     *    interface is returned.
+     *    @returns array          List of interfaces.
+     *    @access public
+     */
+    function getInterfaces() {
+        return array();
+    }
+
+    /**
+     *    Finds the parent class name.
+     *    @returns string      Parent class name.
+     *    @access public
+     */
+    function getParent() {
+        return strtolower(get_parent_class($this->_interface));
+    }
+
+    /**
+     *    Determines if the class is abstract, which for PHP 4
+     *    will never be the case.
+     *    @returns boolean      True if abstract.
+     *    @access public
+     */
+    function isAbstract() {
+        return false;
+    }
+
+    /**
+     *    Determines if the the entity is an interface, which for PHP 4
+     *    will never be the case.
+     *    @returns boolean      True if interface.
+     *    @access public
+     */
+    function isInterface() {
+        return false;
+    }
+
+    /**
+     *    Scans for final methods, but as it's PHP 4 there
+     *    aren't any.
+     *    @returns boolean   True if the class has a final method.
+     *    @access public
+     */
+    function hasFinal() {
+        return false;
+    }
+
+    /**
+     *    Gets the source code matching the declaration
+     *    of a method.
+     *    @param string $method       Method name.
+     *    @access public
+     */
+    function getSignature($method) {
+        return "function &$method()";
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/reflection_php5.php b/3rdparty/simpletest/reflection_php5.php
new file mode 100644
index 00000000000..43d8a7b287f
--- /dev/null
+++ b/3rdparty/simpletest/reflection_php5.php
@@ -0,0 +1,386 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: reflection_php5.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**
+ *    Version specific reflection API.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleReflection {
+    private $interface;
+
+    /**
+     *    Stashes the class/interface.
+     *    @param string $interface    Class or interface
+     *                                to inspect.
+     */
+    function __construct($interface) {
+        $this->interface = $interface;
+    }
+
+    /**
+     *    Checks that a class has been declared. Versions
+     *    before PHP5.0.2 need a check that it's not really
+     *    an interface.
+     *    @return boolean            True if defined.
+     *    @access public
+     */
+    function classExists() {
+        if (! class_exists($this->interface)) {
+            return false;
+        }
+        $reflection = new ReflectionClass($this->interface);
+        return ! $reflection->isInterface();
+    }
+
+    /**
+     *    Needed to kill the autoload feature in PHP5
+     *    for classes created dynamically.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classExistsSansAutoload() {
+        return class_exists($this->interface, false);
+    }
+
+    /**
+     *    Checks that a class or interface has been
+     *    declared.
+     *    @return boolean            True if defined.
+     *    @access public
+     */
+    function classOrInterfaceExists() {
+        return $this->classOrInterfaceExistsWithAutoload($this->interface, true);
+    }
+
+    /**
+     *    Needed to kill the autoload feature in PHP5
+     *    for classes created dynamically.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classOrInterfaceExistsSansAutoload() {
+        return $this->classOrInterfaceExistsWithAutoload($this->interface, false);
+    }
+
+    /**
+     *    Needed to select the autoload feature in PHP5
+     *    for classes created dynamically.
+     *    @param string $interface       Class or interface name.
+     *    @param boolean $autoload       True totriggerautoload.
+     *    @return boolean                True if interface defined.
+     *    @access private
+     */
+    protected function classOrInterfaceExistsWithAutoload($interface, $autoload) {
+        if (function_exists('interface_exists')) {
+            if (interface_exists($this->interface, $autoload)) {
+                return true;
+            }
+        }
+        return class_exists($this->interface, $autoload);
+    }
+
+    /**
+     *    Gets the list of methods on a class or
+     *    interface.
+     *    @returns array              List of method names.
+     *    @access public
+     */
+    function getMethods() {
+        return array_unique(get_class_methods($this->interface));
+    }
+
+    /**
+     *    Gets the list of interfaces from a class. If the
+     *    class name is actually an interface then just that
+     *    interface is returned.
+     *    @returns array          List of interfaces.
+     *    @access public
+     */
+    function getInterfaces() {
+        $reflection = new ReflectionClass($this->interface);
+        if ($reflection->isInterface()) {
+            return array($this->interface);
+        }
+        return $this->onlyParents($reflection->getInterfaces());
+    }
+
+    /**
+     *    Gets the list of methods for the implemented
+     *    interfaces only.
+     *    @returns array      List of enforced method signatures.
+     *    @access public
+     */
+    function getInterfaceMethods() {
+        $methods = array();
+        foreach ($this->getInterfaces() as $interface) {
+            $methods = array_merge($methods, get_class_methods($interface));
+        }
+        return array_unique($methods);
+    }
+
+    /**
+     *    Checks to see if the method signature has to be tightly
+     *    specified.
+     *    @param string $method        Method name.
+     *    @returns boolean             True if enforced.
+     *    @access private
+     */
+    protected function isInterfaceMethod($method) {
+        return in_array($method, $this->getInterfaceMethods());
+    }
+
+    /**
+     *    Finds the parent class name.
+     *    @returns string      Parent class name.
+     *    @access public
+     */
+    function getParent() {
+        $reflection = new ReflectionClass($this->interface);
+        $parent = $reflection->getParentClass();
+        if ($parent) {
+            return $parent->getName();
+        }
+        return false;
+    }
+
+    /**
+     *    Trivially determines if the class is abstract.
+     *    @returns boolean      True if abstract.
+     *    @access public
+     */
+    function isAbstract() {
+        $reflection = new ReflectionClass($this->interface);
+        return $reflection->isAbstract();
+    }
+
+    /**
+     *    Trivially determines if the class is an interface.
+     *    @returns boolean      True if interface.
+     *    @access public
+     */
+    function isInterface() {
+        $reflection = new ReflectionClass($this->interface);
+        return $reflection->isInterface();
+    }
+
+    /**
+     *    Scans for final methods, as they screw up inherited
+     *    mocks by not allowing you to override them.
+     *    @returns boolean   True if the class has a final method.
+     *    @access public
+     */
+    function hasFinal() {
+        $reflection = new ReflectionClass($this->interface);
+        foreach ($reflection->getMethods() as $method) {
+            if ($method->isFinal()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Whittles a list of interfaces down to only the
+     *    necessary top level parents.
+     *    @param array $interfaces     Reflection API interfaces
+     *                                 to reduce.
+     *    @returns array               List of parent interface names.
+     *    @access private
+     */
+    protected function onlyParents($interfaces) {
+        $parents = array();
+        $blacklist = array();
+        foreach ($interfaces as $interface) {
+            foreach($interfaces as $possible_parent) {
+                if ($interface->getName() == $possible_parent->getName()) {
+                    continue;
+                }
+                if ($interface->isSubClassOf($possible_parent)) {
+                    $blacklist[$possible_parent->getName()] = true;
+                }
+            }
+            if (!isset($blacklist[$interface->getName()])) {
+                $parents[] = $interface->getName();
+            }
+        }
+        return $parents;
+    }
+
+    /**
+     * Checks whether a method is abstract or not.
+     * @param   string   $name  Method name.
+     * @return  bool            true if method is abstract, else false
+     * @access  private
+     */
+    protected function isAbstractMethod($name) {
+        $interface = new ReflectionClass($this->interface);
+        if (! $interface->hasMethod($name)) {
+            return false;
+        }
+        return $interface->getMethod($name)->isAbstract();
+    }
+
+    /**
+     * Checks whether a method is the constructor.
+     * @param   string   $name  Method name.
+     * @return  bool            true if method is the constructor
+     * @access  private
+     */
+    protected function isConstructor($name) {
+        return ($name == '__construct') || ($name == $this->interface);
+    }
+
+    /**
+     * Checks whether a method is abstract in all parents or not.
+     * @param   string   $name  Method name.
+     * @return  bool            true if method is abstract in parent, else false
+     * @access  private
+     */
+    protected function isAbstractMethodInParents($name) {
+        $interface = new ReflectionClass($this->interface);
+        $parent = $interface->getParentClass();
+        while($parent) {
+            if (! $parent->hasMethod($name)) {
+                return false;
+            }
+            if ($parent->getMethod($name)->isAbstract()) {
+                return true;
+            }
+            $parent = $parent->getParentClass();
+        }
+        return false;
+    }
+
+    /**
+     * Checks whether a method is static or not.
+     * @param   string  $name   Method name
+     * @return  bool            true if method is static, else false
+     * @access  private
+     */
+    protected function isStaticMethod($name) {
+        $interface = new ReflectionClass($this->interface);
+        if (! $interface->hasMethod($name)) {
+            return false;
+        }
+        return $interface->getMethod($name)->isStatic();
+    }
+
+    /**
+     *    Writes the source code matching the declaration
+     *    of a method.
+     *    @param string $name    Method name.
+     *    @return string         Method signature up to last
+     *                           bracket.
+     *    @access public
+     */
+    function getSignature($name) {
+        if ($name == '__set') {
+            return 'function __set($key, $value)';
+        }
+        if ($name == '__call') {
+            return 'function __call($method, $arguments)';
+        }
+        if (version_compare(phpversion(), '5.1.0', '>=')) {
+            if (in_array($name, array('__get', '__isset', $name == '__unset'))) {
+                return "function {$name}(\$key)";
+            }
+        }
+        if ($name == '__toString') {
+            return "function $name()";
+        }
+
+        // This wonky try-catch is a work around for a faulty method_exists()
+        // in early versions of PHP 5 which would return false for static
+        // methods. The Reflection classes work fine, but hasMethod()
+        // doesn't exist prior to PHP 5.1.0, so we need to use a more crude
+        // detection method.
+        try {
+            $interface = new ReflectionClass($this->interface);
+            $interface->getMethod($name);
+        } catch (ReflectionException $e) {
+            return "function $name()";
+        }
+        return $this->getFullSignature($name);
+    }
+
+    /**
+     *    For a signature specified in an interface, full
+     *    details must be replicated to be a valid implementation.
+     *    @param string $name    Method name.
+     *    @return string         Method signature up to last
+     *                           bracket.
+     *    @access private
+     */
+    protected function getFullSignature($name) {
+        $interface = new ReflectionClass($this->interface);
+        $method = $interface->getMethod($name);
+        $reference = $method->returnsReference() ? '&' : '';
+        $static = $method->isStatic() ? 'static ' : '';
+        return "{$static}function $reference$name(" .
+                implode(', ', $this->getParameterSignatures($method)) .
+                ")";
+    }
+
+    /**
+     *    Gets the source code for each parameter.
+     *    @param ReflectionMethod $method   Method object from
+     *                                      reflection API
+     *    @return array                     List of strings, each
+     *                                      a snippet of code.
+     *    @access private
+     */
+    protected function getParameterSignatures($method) {
+        $signatures = array();
+        foreach ($method->getParameters() as $parameter) {
+            $signature = '';
+            $type = $parameter->getClass();
+            if (is_null($type) && version_compare(phpversion(), '5.1.0', '>=') && $parameter->isArray()) {
+                $signature .= 'array ';
+            } elseif (!is_null($type)) {
+                $signature .= $type->getName() . ' ';
+            }
+            if ($parameter->isPassedByReference()) {
+                $signature .= '&';
+            }
+            $signature .= '$' . $this->suppressSpurious($parameter->getName());
+            if ($this->isOptional($parameter)) {
+                $signature .= ' = null';
+            }
+            $signatures[] = $signature;
+        }
+        return $signatures;
+    }
+
+    /**
+     *    The SPL library has problems with the
+     *    Reflection library. In particular, you can
+     *    get extra characters in parameter names :(.
+     *    @param string $name    Parameter name.
+     *    @return string         Cleaner name.
+     *    @access private
+     */
+    protected function suppressSpurious($name) {
+        return str_replace(array('[', ']', ' '), '', $name);
+    }
+
+    /**
+     *    Test of a reflection parameter being optional
+     *    that works with early versions of PHP5.
+     *    @param reflectionParameter $parameter    Is this optional.
+     *    @return boolean                          True if optional.
+     *    @access private
+     */
+    protected function isOptional($parameter) {
+        if (method_exists($parameter, 'isOptional')) {
+            return $parameter->isOptional();
+        }
+        return false;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/remote.php b/3rdparty/simpletest/remote.php
new file mode 100644
index 00000000000..4bb37b7c51b
--- /dev/null
+++ b/3rdparty/simpletest/remote.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: remote.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/browser.php');
+require_once(dirname(__FILE__) . '/xml.php');
+require_once(dirname(__FILE__) . '/test_case.php');
+/**#@-*/
+
+/**
+ *    Runs an XML formated test on a remote server.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class RemoteTestCase {
+    private $url;
+    private $dry_url;
+    private $size;
+
+    /**
+     *    Sets the location of the remote test.
+     *    @param string $url       Test location.
+     *    @param string $dry_url   Location for dry run.
+     *    @access public
+     */
+    function __construct($url, $dry_url = false) {
+        $this->url = $url;
+        $this->dry_url = $dry_url ? $dry_url : $url;
+        $this->size = false;
+    }
+
+    /**
+     *    Accessor for the test name for subclasses.
+     *    @return string           Name of the test.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->url;
+    }
+
+    /**
+     *    Runs the top level test for this class. Currently
+     *    reads the data as a single chunk. I'll fix this
+     *    once I have added iteration to the browser.
+     *    @param SimpleReporter $reporter    Target of test results.
+     *    @returns boolean                   True if no failures.
+     *    @access public
+     */
+    function run($reporter) {
+        $browser = $this->createBrowser();
+        $xml = $browser->get($this->url);
+        if (! $xml) {
+            trigger_error('Cannot read remote test URL [' . $this->url . ']');
+            return false;
+        }
+        $parser = $this->createParser($reporter);
+        if (! $parser->parse($xml)) {
+            trigger_error('Cannot parse incoming XML from [' . $this->url . ']');
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Creates a new web browser object for fetching
+     *    the XML report.
+     *    @return SimpleBrowser           New browser.
+     *    @access protected
+     */
+    protected function createBrowser() {
+        return new SimpleBrowser();
+    }
+
+    /**
+     *    Creates the XML parser.
+     *    @param SimpleReporter $reporter    Target of test results.
+     *    @return SimpleTestXmlListener      XML reader.
+     *    @access protected
+     */
+    protected function createParser($reporter) {
+        return new SimpleTestXmlParser($reporter);
+    }
+
+    /**
+     *    Accessor for the number of subtests.
+     *    @return integer           Number of test cases.
+     *    @access public
+     */
+    function getSize() {
+        if ($this->size === false) {
+            $browser = $this->createBrowser();
+            $xml = $browser->get($this->dry_url);
+            if (! $xml) {
+                trigger_error('Cannot read remote test URL [' . $this->dry_url . ']');
+                return false;
+            }
+            $reporter = new SimpleReporter();
+            $parser = $this->createParser($reporter);
+            if (! $parser->parse($xml)) {
+                trigger_error('Cannot parse incoming XML from [' . $this->dry_url . ']');
+                return false;
+            }
+            $this->size = $reporter->getTestCaseCount();
+        }
+        return $this->size;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/reporter.php b/3rdparty/simpletest/reporter.php
new file mode 100755
index 00000000000..bd4f3fa41dd
--- /dev/null
+++ b/3rdparty/simpletest/reporter.php
@@ -0,0 +1,445 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: reporter.php 2005 2010-11-02 14:09:34Z lastcraft $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/scorer.php');
+//require_once(dirname(__FILE__) . '/arguments.php');
+/**#@-*/
+
+/**
+ *    Sample minimal test displayer. Generates only
+ *    failure messages and a pass count.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class HtmlReporter extends SimpleReporter {
+    private $character_set;
+
+    /**
+     *    Does nothing yet. The first output will
+     *    be sent on the first test start. For use
+     *    by a web browser.
+     *    @access public
+     */
+    function __construct($character_set = 'ISO-8859-1') {
+        parent::__construct();
+        $this->character_set = $character_set;
+    }
+
+    /**
+     *    Paints the top of the web page setting the
+     *    title to the name of the starting test.
+     *    @param string $test_name      Name class of test.
+     *    @access public
+     */
+    function paintHeader($test_name) {
+        $this->sendNoCacheHeaders();
+        print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">";
+        print "<html>\n<head>\n<title>$test_name</title>\n";
+        print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=" .
+                $this->character_set . "\">\n";
+        print "<style type=\"text/css\">\n";
+        print $this->getCss() . "\n";
+        print "</style>\n";
+        print "</head>\n<body>\n";
+        print "<h1>$test_name</h1>\n";
+        flush();
+    }
+
+    /**
+     *    Send the headers necessary to ensure the page is
+     *    reloaded on every request. Otherwise you could be
+     *    scratching your head over out of date test data.
+     *    @access public
+     */
+    static function sendNoCacheHeaders() {
+        if (! headers_sent()) {
+            header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+            header("Cache-Control: no-store, no-cache, must-revalidate");
+            header("Cache-Control: post-check=0, pre-check=0", false);
+            header("Pragma: no-cache");
+        }
+    }
+
+    /**
+     *    Paints the CSS. Add additional styles here.
+     *    @return string            CSS code as text.
+     *    @access protected
+     */
+    protected function getCss() {
+        return ".fail { background-color: inherit; color: red; }" .
+                ".pass { background-color: inherit; color: green; }" .
+                " pre { background-color: lightgray; color: inherit; }";
+    }
+
+    /**
+     *    Paints the end of the test with a summary of
+     *    the passes and failures.
+     *    @param string $test_name        Name class of test.
+     *    @access public
+     */
+    function paintFooter($test_name) {
+        $colour = ($this->getFailCount() + $this->getExceptionCount() > 0 ? "red" : "green");
+        print "<div style=\"";
+        print "padding: 8px; margin-top: 1em; background-color: $colour; color: white;";
+        print "\">";
+        print $this->getTestCaseProgress() . "/" . $this->getTestCaseCount();
+        print " test cases complete:\n";
+        print "<strong>" . $this->getPassCount() . "</strong> passes, ";
+        print "<strong>" . $this->getFailCount() . "</strong> fails and ";
+        print "<strong>" . $this->getExceptionCount() . "</strong> exceptions.";
+        print "</div>\n";
+        print "</body>\n</html>\n";
+    }
+
+    /**
+     *    Paints the test failure with a breadcrumbs
+     *    trail of the nesting test suites below the
+     *    top level test.
+     *    @param string $message    Failure message displayed in
+     *                              the context of the other tests.
+     */
+    function paintFail($message) {
+        parent::paintFail($message);
+        print "<span class=\"fail\">Fail</span>: ";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print implode(" -&gt; ", $breadcrumb);
+        print " -&gt; " . $this->htmlEntities($message) . "<br />\n";
+    }
+
+    /**
+     *    Paints a PHP error.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintError($message) {
+        parent::paintError($message);
+        print "<span class=\"fail\">Exception</span>: ";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print implode(" -&gt; ", $breadcrumb);
+        print " -&gt; <strong>" . $this->htmlEntities($message) . "</strong><br />\n";
+    }
+
+    /**
+     *    Paints a PHP exception.
+     *    @param Exception $exception        Exception to display.
+     *    @access public
+     */
+    function paintException($exception) {
+        parent::paintException($exception);
+        print "<span class=\"fail\">Exception</span>: ";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print implode(" -&gt; ", $breadcrumb);
+        $message = 'Unexpected exception of type [' . get_class($exception) .
+                '] with message ['. $exception->getMessage() .
+                '] in ['. $exception->getFile() .
+                ' line ' . $exception->getLine() . ']';
+        print " -&gt; <strong>" . $this->htmlEntities($message) . "</strong><br />\n";
+    }
+
+    /**
+     *    Prints the message for skipping tests.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) {
+        parent::paintSkip($message);
+        print "<span class=\"pass\">Skipped</span>: ";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print implode(" -&gt; ", $breadcrumb);
+        print " -&gt; " . $this->htmlEntities($message) . "<br />\n";
+    }
+
+    /**
+     *    Paints formatted text such as dumped privateiables.
+     *    @param string $message        Text to show.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+        print '<pre>' . $this->htmlEntities($message) . '</pre>';
+    }
+
+    /**
+     *    Character set adjusted entity conversion.
+     *    @param string $message    Plain text or Unicode message.
+     *    @return string            Browser readable message.
+     *    @access protected
+     */
+    protected function htmlEntities($message) {
+        return htmlentities($message, ENT_COMPAT, $this->character_set);
+    }
+}
+
+/**
+ *    Sample minimal test displayer. Generates only
+ *    failure messages and a pass count. For command
+ *    line use. I've tried to make it look like JUnit,
+ *    but I wanted to output the errors as they arrived
+ *    which meant dropping the dots.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class TextReporter extends SimpleReporter {
+
+    /**
+     *    Does nothing yet. The first output will
+     *    be sent on the first test start.
+     */
+    function __construct() {
+        parent::__construct();
+    }
+
+    /**
+     *    Paints the title only.
+     *    @param string $test_name        Name class of test.
+     *    @access public
+     */
+    function paintHeader($test_name) {
+        if (! SimpleReporter::inCli()) {
+            header('Content-type: text/plain');
+        }
+        print "$test_name\n";
+        flush();
+    }
+
+    /**
+     *    Paints the end of the test with a summary of
+     *    the passes and failures.
+     *    @param string $test_name        Name class of test.
+     *    @access public
+     */
+    function paintFooter($test_name) {
+        if ($this->getFailCount() + $this->getExceptionCount() == 0) {
+            print "OK\n";
+        } else {
+            print "FAILURES!!!\n";
+        }
+        print "Test cases run: " . $this->getTestCaseProgress() .
+                "/" . $this->getTestCaseCount() .
+                ", Passes: " . $this->getPassCount() .
+                ", Failures: " . $this->getFailCount() .
+                ", Exceptions: " . $this->getExceptionCount() . "\n";
+    }
+
+    /**
+     *    Paints the test failure as a stack trace.
+     *    @param string $message    Failure message displayed in
+     *                              the context of the other tests.
+     *    @access public
+     */
+    function paintFail($message) {
+        parent::paintFail($message);
+        print $this->getFailCount() . ") $message\n";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+        print "\n";
+    }
+
+    /**
+     *    Paints a PHP error or exception.
+     *    @param string $message        Message to be shown.
+     *    @access public
+     *    @abstract
+     */
+    function paintError($message) {
+        parent::paintError($message);
+        print "Exception " . $this->getExceptionCount() . "!\n$message\n";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+        print "\n";
+    }
+
+    /**
+     *    Paints a PHP error or exception.
+     *    @param Exception $exception      Exception to describe.
+     *    @access public
+     *    @abstract
+     */
+    function paintException($exception) {
+        parent::paintException($exception);
+        $message = 'Unexpected exception of type [' . get_class($exception) .
+                '] with message ['. $exception->getMessage() .
+                '] in ['. $exception->getFile() .
+                ' line ' . $exception->getLine() . ']';
+        print "Exception " . $this->getExceptionCount() . "!\n$message\n";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+        print "\n";
+    }
+
+    /**
+     *    Prints the message for skipping tests.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) {
+        parent::paintSkip($message);
+        print "Skip: $message\n";
+    }
+
+    /**
+     *    Paints formatted text such as dumped privateiables.
+     *    @param string $message        Text to show.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+        print "$message\n";
+        flush();
+    }
+}
+
+/**
+ *    Runs just a single test group, a single case or
+ *    even a single test within that case.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SelectiveReporter extends SimpleReporterDecorator {
+    private $just_this_case = false;
+    private $just_this_test = false;
+    private $on;
+
+    /**
+     *    Selects the test case or group to be run,
+     *    and optionally a specific test.
+     *    @param SimpleScorer $reporter    Reporter to receive events.
+     *    @param string $just_this_case    Only this case or group will run.
+     *    @param string $just_this_test    Only this test method will run.
+     */
+    function __construct($reporter, $just_this_case = false, $just_this_test = false) {
+        if (isset($just_this_case) && $just_this_case) {
+            $this->just_this_case = strtolower($just_this_case);
+            $this->off();
+        } else {
+            $this->on();
+        }
+        if (isset($just_this_test) && $just_this_test) {
+            $this->just_this_test = strtolower($just_this_test);
+        }
+        parent::__construct($reporter);
+    }
+
+    /**
+     *    Compares criteria to actual the case/group name.
+     *    @param string $test_case    The incoming test.
+     *    @return boolean             True if matched.
+     *    @access protected
+     */
+    protected function matchesTestCase($test_case) {
+        return $this->just_this_case == strtolower($test_case);
+    }
+
+    /**
+     *    Compares criteria to actual the test name. If no
+     *    name was specified at the beginning, then all tests
+     *    can run.
+     *    @param string $method       The incoming test method.
+     *    @return boolean             True if matched.
+     *    @access protected
+     */
+    protected function shouldRunTest($test_case, $method) {
+        if ($this->isOn() || $this->matchesTestCase($test_case)) {
+            if ($this->just_this_test) {
+                return $this->just_this_test == strtolower($method);
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Switch on testing for the group or subgroup.
+     *    @access private
+     */
+    protected function on() {
+        $this->on = true;
+    }
+
+    /**
+     *    Switch off testing for the group or subgroup.
+     *    @access private
+     */
+    protected function off() {
+        $this->on = false;
+    }
+
+    /**
+     *    Is this group actually being tested?
+     *    @return boolean     True if the current test group is active.
+     *    @access private
+     */
+    protected function isOn() {
+        return $this->on;
+    }
+
+    /**
+     *    Veto everything that doesn't match the method wanted.
+     *    @param string $test_case       Name of test case.
+     *    @param string $method          Name of test method.
+     *    @return boolean                True if test should be run.
+     *    @access public
+     */
+    function shouldInvoke($test_case, $method) {
+        if ($this->shouldRunTest($test_case, $method)) {
+            return $this->reporter->shouldInvoke($test_case, $method);
+        }
+        return false;
+    }
+
+    /**
+     *    Paints the start of a group test.
+     *    @param string $test_case     Name of test or other label.
+     *    @param integer $size         Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_case, $size) {
+        if ($this->just_this_case && $this->matchesTestCase($test_case)) {
+            $this->on();
+        }
+        $this->reporter->paintGroupStart($test_case, $size);
+    }
+
+    /**
+     *    Paints the end of a group test.
+     *    @param string $test_case     Name of test or other label.
+     *    @access public
+     */
+    function paintGroupEnd($test_case) {
+        $this->reporter->paintGroupEnd($test_case);
+        if ($this->just_this_case && $this->matchesTestCase($test_case)) {
+            $this->off();
+        }
+    }
+}
+
+/**
+ *    Suppresses skip messages.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NoSkipsReporter extends SimpleReporterDecorator {
+
+    /**
+     *    Does nothing.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) { }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/scorer.php b/3rdparty/simpletest/scorer.php
new file mode 100644
index 00000000000..27776f4b631
--- /dev/null
+++ b/3rdparty/simpletest/scorer.php
@@ -0,0 +1,875 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: scorer.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+*/
+require_once(dirname(__FILE__) . '/invoker.php');
+/**#@-*/
+
+/**
+ *    Can receive test events and display them. Display
+ *    is achieved by making display methods available
+ *    and visiting the incoming event.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ *    @abstract
+ */
+class SimpleScorer {
+    private $passes;
+    private $fails;
+    private $exceptions;
+    private $is_dry_run;
+
+    /**
+     *    Starts the test run with no results.
+     *    @access public
+     */
+    function __construct() {
+        $this->passes = 0;
+        $this->fails = 0;
+        $this->exceptions = 0;
+        $this->is_dry_run = false;
+    }
+
+    /**
+     *    Signals that the next evaluation will be a dry
+     *    run. That is, the structure events will be
+     *    recorded, but no tests will be run.
+     *    @param boolean $is_dry        Dry run if true.
+     *    @access public
+     */
+    function makeDry($is_dry = true) {
+        $this->is_dry_run = $is_dry;
+    }
+
+    /**
+     *    The reporter has a veto on what should be run.
+     *    @param string $test_case_name  name of test case.
+     *    @param string $method          Name of test method.
+     *    @access public
+     */
+    function shouldInvoke($test_case_name, $method) {
+        return ! $this->is_dry_run;
+    }
+
+    /**
+     *    Can wrap the invoker in preperation for running
+     *    a test.
+     *    @param SimpleInvoker $invoker   Individual test runner.
+     *    @return SimpleInvoker           Wrapped test runner.
+     *    @access public
+     */
+    function createInvoker($invoker) {
+        return $invoker;
+    }
+
+    /**
+     *    Accessor for current status. Will be false
+     *    if there have been any failures or exceptions.
+     *    Used for command line tools.
+     *    @return boolean        True if no failures.
+     *    @access public
+     */
+    function getStatus() {
+        if ($this->exceptions + $this->fails > 0) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Paints the start of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @param integer $size         Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_name, $size) {
+    }
+
+    /**
+     *    Paints the end of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintGroupEnd($test_name) {
+    }
+
+    /**
+     *    Paints the start of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseStart($test_name) {
+    }
+
+    /**
+     *    Paints the end of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseEnd($test_name) {
+    }
+
+    /**
+     *    Paints the start of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodStart($test_name) {
+    }
+
+    /**
+     *    Paints the end of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodEnd($test_name) {
+    }
+
+    /**
+     *    Increments the pass count.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintPass($message) {
+        $this->passes++;
+    }
+
+    /**
+     *    Increments the fail count.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintFail($message) {
+        $this->fails++;
+    }
+
+    /**
+     *    Deals with PHP 4 throwing an error.
+     *    @param string $message    Text of error formatted by
+     *                              the test case.
+     *    @access public
+     */
+    function paintError($message) {
+        $this->exceptions++;
+    }
+
+    /**
+     *    Deals with PHP 5 throwing an exception.
+     *    @param Exception $exception    The actual exception thrown.
+     *    @access public
+     */
+    function paintException($exception) {
+        $this->exceptions++;
+    }
+
+    /**
+     *    Prints the message for skipping tests.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) {
+    }
+
+    /**
+     *    Accessor for the number of passes so far.
+     *    @return integer       Number of passes.
+     *    @access public
+     */
+    function getPassCount() {
+        return $this->passes;
+    }
+
+    /**
+     *    Accessor for the number of fails so far.
+     *    @return integer       Number of fails.
+     *    @access public
+     */
+    function getFailCount() {
+        return $this->fails;
+    }
+
+    /**
+     *    Accessor for the number of untrapped errors
+     *    so far.
+     *    @return integer       Number of exceptions.
+     *    @access public
+     */
+    function getExceptionCount() {
+        return $this->exceptions;
+    }
+
+    /**
+     *    Paints a simple supplementary message.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintMessage($message) {
+    }
+
+    /**
+     *    Paints a formatted ASCII message such as a
+     *    privateiable dump.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+    }
+
+    /**
+     *    By default just ignores user generated events.
+     *    @param string $type        Event type as text.
+     *    @param mixed $payload      Message or object.
+     *    @access public
+     */
+    function paintSignal($type, $payload) {
+    }
+}
+
+/**
+ *    Recipient of generated test messages that can display
+ *    page footers and headers. Also keeps track of the
+ *    test nesting. This is the main base class on which
+ *    to build the finished test (page based) displays.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleReporter extends SimpleScorer {
+    private $test_stack;
+    private $size;
+    private $progress;
+
+    /**
+     *    Starts the display with no results in.
+     *    @access public
+     */
+    function __construct() {
+        parent::__construct();
+        $this->test_stack = array();
+        $this->size = null;
+        $this->progress = 0;
+    }
+
+    /**
+     *    Gets the formatter for small generic data items.
+     *    @return SimpleDumper          Formatter.
+     *    @access public
+     */
+    function getDumper() {
+        return new SimpleDumper();
+    }
+
+    /**
+     *    Paints the start of a group test. Will also paint
+     *    the page header and footer if this is the
+     *    first test. Will stash the size if the first
+     *    start.
+     *    @param string $test_name   Name of test that is starting.
+     *    @param integer $size       Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_name, $size) {
+        if (! isset($this->size)) {
+            $this->size = $size;
+        }
+        if (count($this->test_stack) == 0) {
+            $this->paintHeader($test_name);
+        }
+        $this->test_stack[] = $test_name;
+    }
+
+    /**
+     *    Paints the end of a group test. Will paint the page
+     *    footer if the stack of tests has unwound.
+     *    @param string $test_name   Name of test that is ending.
+     *    @param integer $progress   Number of test cases ending.
+     *    @access public
+     */
+    function paintGroupEnd($test_name) {
+        array_pop($this->test_stack);
+        if (count($this->test_stack) == 0) {
+            $this->paintFooter($test_name);
+        }
+    }
+
+    /**
+     *    Paints the start of a test case. Will also paint
+     *    the page header and footer if this is the
+     *    first test. Will stash the size if the first
+     *    start.
+     *    @param string $test_name   Name of test that is starting.
+     *    @access public
+     */
+    function paintCaseStart($test_name) {
+        if (! isset($this->size)) {
+            $this->size = 1;
+        }
+        if (count($this->test_stack) == 0) {
+            $this->paintHeader($test_name);
+        }
+        $this->test_stack[] = $test_name;
+    }
+
+    /**
+     *    Paints the end of a test case. Will paint the page
+     *    footer if the stack of tests has unwound.
+     *    @param string $test_name   Name of test that is ending.
+     *    @access public
+     */
+    function paintCaseEnd($test_name) {
+        $this->progress++;
+        array_pop($this->test_stack);
+        if (count($this->test_stack) == 0) {
+            $this->paintFooter($test_name);
+        }
+    }
+
+    /**
+     *    Paints the start of a test method.
+     *    @param string $test_name   Name of test that is starting.
+     *    @access public
+     */
+    function paintMethodStart($test_name) {
+        $this->test_stack[] = $test_name;
+    }
+
+    /**
+     *    Paints the end of a test method. Will paint the page
+     *    footer if the stack of tests has unwound.
+     *    @param string $test_name   Name of test that is ending.
+     *    @access public
+     */
+    function paintMethodEnd($test_name) {
+        array_pop($this->test_stack);
+    }
+
+    /**
+     *    Paints the test document header.
+     *    @param string $test_name     First test top level
+     *                                 to start.
+     *    @access public
+     *    @abstract
+     */
+    function paintHeader($test_name) {
+    }
+
+    /**
+     *    Paints the test document footer.
+     *    @param string $test_name        The top level test.
+     *    @access public
+     *    @abstract
+     */
+    function paintFooter($test_name) {
+    }
+
+    /**
+     *    Accessor for internal test stack. For
+     *    subclasses that need to see the whole test
+     *    history for display purposes.
+     *    @return array     List of methods in nesting order.
+     *    @access public
+     */
+    function getTestList() {
+        return $this->test_stack;
+    }
+
+    /**
+     *    Accessor for total test size in number
+     *    of test cases. Null until the first
+     *    test is started.
+     *    @return integer   Total number of cases at start.
+     *    @access public
+     */
+    function getTestCaseCount() {
+        return $this->size;
+    }
+
+    /**
+     *    Accessor for the number of test cases
+     *    completed so far.
+     *    @return integer   Number of ended cases.
+     *    @access public
+     */
+    function getTestCaseProgress() {
+        return $this->progress;
+    }
+
+    /**
+     *    Static check for running in the comand line.
+     *    @return boolean        True if CLI.
+     *    @access public
+     */
+    static function inCli() {
+        return php_sapi_name() == 'cli';
+    }
+}
+
+/**
+ *    For modifying the behaviour of the visual reporters.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleReporterDecorator {
+    protected $reporter;
+
+    /**
+     *    Mediates between the reporter and the test case.
+     *    @param SimpleScorer $reporter       Reporter to receive events.
+     */
+    function __construct($reporter) {
+        $this->reporter = $reporter;
+    }
+
+    /**
+     *    Signals that the next evaluation will be a dry
+     *    run. That is, the structure events will be
+     *    recorded, but no tests will be run.
+     *    @param boolean $is_dry        Dry run if true.
+     *    @access public
+     */
+    function makeDry($is_dry = true) {
+        $this->reporter->makeDry($is_dry);
+    }
+
+    /**
+     *    Accessor for current status. Will be false
+     *    if there have been any failures or exceptions.
+     *    Used for command line tools.
+     *    @return boolean        True if no failures.
+     *    @access public
+     */
+    function getStatus() {
+        return $this->reporter->getStatus();
+    }
+
+    /**
+     *    The nesting of the test cases so far. Not
+     *    all reporters have this facility.
+     *    @return array        Test list if accessible.
+     *    @access public
+     */
+    function getTestList() {
+        if (method_exists($this->reporter, 'getTestList')) {
+            return $this->reporter->getTestList();
+        } else {
+            return array();
+        }
+    }
+
+    /**
+     *    The reporter has a veto on what should be run.
+     *    @param string $test_case_name  Name of test case.
+     *    @param string $method          Name of test method.
+     *    @return boolean                True if test should be run.
+     *    @access public
+     */
+    function shouldInvoke($test_case_name, $method) {
+        return $this->reporter->shouldInvoke($test_case_name, $method);
+    }
+
+    /**
+     *    Can wrap the invoker in preparation for running
+     *    a test.
+     *    @param SimpleInvoker $invoker   Individual test runner.
+     *    @return SimpleInvoker           Wrapped test runner.
+     *    @access public
+     */
+    function createInvoker($invoker) {
+        return $this->reporter->createInvoker($invoker);
+    }
+
+    /**
+     *    Gets the formatter for privateiables and other small
+     *    generic data items.
+     *    @return SimpleDumper          Formatter.
+     *    @access public
+     */
+    function getDumper() {
+        return $this->reporter->getDumper();
+    }
+
+    /**
+     *    Paints the start of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @param integer $size         Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_name, $size) {
+        $this->reporter->paintGroupStart($test_name, $size);
+    }
+
+    /**
+     *    Paints the end of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintGroupEnd($test_name) {
+        $this->reporter->paintGroupEnd($test_name);
+    }
+
+    /**
+     *    Paints the start of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseStart($test_name) {
+        $this->reporter->paintCaseStart($test_name);
+    }
+
+    /**
+     *    Paints the end of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseEnd($test_name) {
+        $this->reporter->paintCaseEnd($test_name);
+    }
+
+    /**
+     *    Paints the start of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodStart($test_name) {
+        $this->reporter->paintMethodStart($test_name);
+    }
+
+    /**
+     *    Paints the end of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodEnd($test_name) {
+        $this->reporter->paintMethodEnd($test_name);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintPass($message) {
+        $this->reporter->paintPass($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintFail($message) {
+        $this->reporter->paintFail($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message    Text of error formatted by
+     *                              the test case.
+     *    @access public
+     */
+    function paintError($message) {
+        $this->reporter->paintError($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param Exception $exception        Exception to show.
+     *    @access public
+     */
+    function paintException($exception) {
+        $this->reporter->paintException($exception);
+    }
+
+    /**
+     *    Prints the message for skipping tests.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) {
+        $this->reporter->paintSkip($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintMessage($message) {
+        $this->reporter->paintMessage($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+        $this->reporter->paintFormattedMessage($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $type        Event type as text.
+     *    @param mixed $payload      Message or object.
+     *    @return boolean            Should return false if this
+     *                               type of signal should fail the
+     *                               test suite.
+     *    @access public
+     */
+    function paintSignal($type, $payload) {
+        $this->reporter->paintSignal($type, $payload);
+    }
+}
+
+/**
+ *    For sending messages to multiple reporters at
+ *    the same time.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class MultipleReporter {
+    private $reporters = array();
+
+    /**
+     *    Adds a reporter to the subscriber list.
+     *    @param SimpleScorer $reporter     Reporter to receive events.
+     *    @access public
+     */
+    function attachReporter($reporter) {
+        $this->reporters[] = $reporter;
+    }
+
+    /**
+     *    Signals that the next evaluation will be a dry
+     *    run. That is, the structure events will be
+     *    recorded, but no tests will be run.
+     *    @param boolean $is_dry        Dry run if true.
+     *    @access public
+     */
+    function makeDry($is_dry = true) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->makeDry($is_dry);
+        }
+    }
+
+    /**
+     *    Accessor for current status. Will be false
+     *    if there have been any failures or exceptions.
+     *    If any reporter reports a failure, the whole
+     *    suite fails.
+     *    @return boolean        True if no failures.
+     *    @access public
+     */
+    function getStatus() {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            if (! $this->reporters[$i]->getStatus()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    The reporter has a veto on what should be run.
+     *    It requires all reporters to want to run the method.
+     *    @param string $test_case_name  name of test case.
+     *    @param string $method          Name of test method.
+     *    @access public
+     */
+    function shouldInvoke($test_case_name, $method) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            if (! $this->reporters[$i]->shouldInvoke($test_case_name, $method)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Every reporter gets a chance to wrap the invoker.
+     *    @param SimpleInvoker $invoker   Individual test runner.
+     *    @return SimpleInvoker           Wrapped test runner.
+     *    @access public
+     */
+    function createInvoker($invoker) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $invoker = $this->reporters[$i]->createInvoker($invoker);
+        }
+        return $invoker;
+    }
+
+    /**
+     *    Gets the formatter for privateiables and other small
+     *    generic data items.
+     *    @return SimpleDumper          Formatter.
+     *    @access public
+     */
+    function getDumper() {
+        return new SimpleDumper();
+    }
+
+    /**
+     *    Paints the start of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @param integer $size         Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_name, $size) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintGroupStart($test_name, $size);
+        }
+    }
+
+    /**
+     *    Paints the end of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintGroupEnd($test_name) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintGroupEnd($test_name);
+        }
+    }
+
+    /**
+     *    Paints the start of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseStart($test_name) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintCaseStart($test_name);
+        }
+    }
+
+    /**
+     *    Paints the end of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseEnd($test_name) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintCaseEnd($test_name);
+        }
+    }
+
+    /**
+     *    Paints the start of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodStart($test_name) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintMethodStart($test_name);
+        }
+    }
+
+    /**
+     *    Paints the end of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodEnd($test_name) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintMethodEnd($test_name);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintPass($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintPass($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintFail($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintFail($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message    Text of error formatted by
+     *                              the test case.
+     *    @access public
+     */
+    function paintError($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintError($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param Exception $exception    Exception to display.
+     *    @access public
+     */
+    function paintException($exception) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintException($exception);
+        }
+    }
+
+    /**
+     *    Prints the message for skipping tests.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintSkip($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintMessage($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintMessage($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintFormattedMessage($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $type        Event type as text.
+     *    @param mixed $payload      Message or object.
+     *    @return boolean            Should return false if this
+     *                               type of signal should fail the
+     *                               test suite.
+     *    @access public
+     */
+    function paintSignal($type, $payload) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintSignal($type, $payload);
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/selector.php b/3rdparty/simpletest/selector.php
new file mode 100755
index 00000000000..ba2fed312a8
--- /dev/null
+++ b/3rdparty/simpletest/selector.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ *  Base include file for SimpleTest.
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: selector.php 1786 2008-04-26 17:32:20Z pp11 $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/tag.php');
+require_once(dirname(__FILE__) . '/encoding.php');
+/**#@-*/
+
+/**
+ *    Used to extract form elements for testing against.
+ *    Searches by name attribute.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleByName {
+    private $name;
+
+    /**
+     *    Stashes the name for later comparison.
+     *    @param string $name     Name attribute to match.
+     */
+    function __construct($name) {
+        $this->name = $name;
+    }
+
+    /**
+     *  Accessor for name.
+     *  @returns string $name       Name to match.
+     */
+    function getName() {
+        return $this->name;
+    }
+
+    /**
+     *    Compares with name attribute of widget.
+     *    @param SimpleWidget $widget    Control to compare.
+     *    @access public
+     */
+    function isMatch($widget) {
+        return ($widget->getName() == $this->name);
+    }
+}
+
+/**
+ *    Used to extract form elements for testing against.
+ *    Searches by visible label or alt text.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleByLabel {
+    private $label;
+
+    /**
+     *    Stashes the name for later comparison.
+     *    @param string $label     Visible text to match.
+     */
+    function __construct($label) {
+        $this->label = $label;
+    }
+
+    /**
+     *    Comparison. Compares visible text of widget or
+     *    related label.
+     *    @param SimpleWidget $widget    Control to compare.
+     *    @access public
+     */
+    function isMatch($widget) {
+        if (! method_exists($widget, 'isLabel')) {
+            return false;
+        }
+        return $widget->isLabel($this->label);
+    }
+}
+
+/**
+ *    Used to extract form elements for testing against.
+ *    Searches dy id attribute.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleById {
+    private $id;
+
+    /**
+     *    Stashes the name for later comparison.
+     *    @param string $id     ID atribute to match.
+     */
+    function __construct($id) {
+        $this->id = $id;
+    }
+
+    /**
+     *    Comparison. Compares id attribute of widget.
+     *    @param SimpleWidget $widget    Control to compare.
+     *    @access public
+     */
+    function isMatch($widget) {
+        return $widget->isId($this->id);
+    }
+}
+
+/**
+ *    Used to extract form elements for testing against.
+ *    Searches by visible label, name or alt text.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleByLabelOrName {
+    private $label;
+
+    /**
+     *    Stashes the name/label for later comparison.
+     *    @param string $label     Visible text to match.
+     */
+    function __construct($label) {
+        $this->label = $label;
+    }
+
+    /**
+     *    Comparison. Compares visible text of widget or
+     *    related label or name.
+     *    @param SimpleWidget $widget    Control to compare.
+     *    @access public
+     */
+    function isMatch($widget) {
+        if (method_exists($widget, 'isLabel')) {
+            if ($widget->isLabel($this->label)) {
+                return true;
+            }
+        }
+        return ($widget->getName() == $this->label);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/shell_tester.php b/3rdparty/simpletest/shell_tester.php
new file mode 100644
index 00000000000..9a3bd389eeb
--- /dev/null
+++ b/3rdparty/simpletest/shell_tester.php
@@ -0,0 +1,330 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: shell_tester.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/test_case.php');
+/**#@-*/
+
+/**
+ *    Wrapper for exec() functionality.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleShell {
+    private $output;
+
+    /**
+     *    Executes the shell comand and stashes the output.
+     *    @access public
+     */
+    function __construct() {
+        $this->output = false;
+    }
+
+    /**
+     *    Actually runs the command. Does not trap the
+     *    error stream output as this need PHP 4.3+.
+     *    @param string $command    The actual command line
+     *                              to run.
+     *    @return integer           Exit code.
+     *    @access public
+     */
+    function execute($command) {
+        $this->output = false;
+        exec($command, $this->output, $ret);
+        return $ret;
+    }
+
+    /**
+     *    Accessor for the last output.
+     *    @return string        Output as text.
+     *    @access public
+     */
+    function getOutput() {
+        return implode("\n", $this->output);
+    }
+
+    /**
+     *    Accessor for the last output.
+     *    @return array         Output as array of lines.
+     *    @access public
+     */
+    function getOutputAsList() {
+        return $this->output;
+    }
+}
+
+/**
+ *    Test case for testing of command line scripts and
+ *    utilities. Usually scripts that are external to the
+ *    PHP code, but support it in some way.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class ShellTestCase extends SimpleTestCase {
+    private $current_shell;
+    private $last_status;
+    private $last_command;
+
+    /**
+     *    Creates an empty test case. Should be subclassed
+     *    with test methods for a functional test case.
+     *    @param string $label     Name of test case. Will use
+     *                             the class name if none specified.
+     *    @access public
+     */
+    function __construct($label = false) {
+        parent::__construct($label);
+        $this->current_shell = $this->createShell();
+        $this->last_status = false;
+        $this->last_command = '';
+    }
+
+    /**
+     *    Executes a command and buffers the results.
+     *    @param string $command     Command to run.
+     *    @return boolean            True if zero exit code.
+     *    @access public
+     */
+    function execute($command) {
+        $shell = $this->getShell();
+        $this->last_status = $shell->execute($command);
+        $this->last_command = $command;
+        return ($this->last_status === 0);
+    }
+
+    /**
+     *    Dumps the output of the last command.
+     *    @access public
+     */
+    function dumpOutput() {
+        $this->dump($this->getOutput());
+    }
+
+    /**
+     *    Accessor for the last output.
+     *    @return string        Output as text.
+     *    @access public
+     */
+    function getOutput() {
+        $shell = $this->getShell();
+        return $shell->getOutput();
+    }
+
+    /**
+     *    Accessor for the last output.
+     *    @return array         Output as array of lines.
+     *    @access public
+     */
+    function getOutputAsList() {
+        $shell = $this->getShell();
+        return $shell->getOutputAsList();
+    }
+
+    /**
+     *    Called from within the test methods to register
+     *    passes and failures.
+     *    @param boolean $result    Pass on true.
+     *    @param string $message    Message to display describing
+     *                              the test state.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertTrue($result, $message = false) {
+        return $this->assert(new TrueExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will be true on false and vice versa. False
+     *    is the PHP definition of false, so that null,
+     *    empty strings, zero and an empty array all count
+     *    as false.
+     *    @param boolean $result    Pass on false.
+     *    @param string $message    Message to display.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertFalse($result, $message = '%s') {
+        return $this->assert(new FalseExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    the same value only. Otherwise a fail. This
+     *    is for testing hand extracted text, etc.
+     *    @param mixed $first          Value to compare.
+     *    @param mixed $second         Value to compare.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass
+     *    @access public
+     */
+    function assertEqual($first, $second, $message = "%s") {
+        return $this->assert(
+                new EqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    a different value. Otherwise a fail. This
+     *    is for testing hand extracted text, etc.
+     *    @param mixed $first           Value to compare.
+     *    @param mixed $second          Value to compare.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertNotEqual($first, $second, $message = "%s") {
+        return $this->assert(
+                new NotEqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Tests the last status code from the shell.
+     *    @param integer $status   Expected status of last
+     *                             command.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertExitCode($status, $message = "%s") {
+        $message = sprintf($message, "Expected status code of [$status] from [" .
+                $this->last_command . "], but got [" .
+                $this->last_status . "]");
+        return $this->assertTrue($status === $this->last_status, $message);
+    }
+
+    /**
+     *    Attempt to exactly match the combined STDERR and
+     *    STDOUT output.
+     *    @param string $expected  Expected output.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertOutput($expected, $message = "%s") {
+        $shell = $this->getShell();
+        return $this->assert(
+                new EqualExpectation($expected),
+                $shell->getOutput(),
+                $message);
+    }
+
+    /**
+     *    Scans the output for a Perl regex. If found
+     *    anywhere it passes, else it fails.
+     *    @param string $pattern    Regex to search for.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertOutputPattern($pattern, $message = "%s") {
+        $shell = $this->getShell();
+        return $this->assert(
+                new PatternExpectation($pattern),
+                $shell->getOutput(),
+                $message);
+    }
+
+    /**
+     *    If a Perl regex is found anywhere in the current
+     *    output then a failure is generated, else a pass.
+     *    @param string $pattern    Regex to search for.
+     *    @param $message           Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertNoOutputPattern($pattern, $message = "%s") {
+        $shell = $this->getShell();
+        return $this->assert(
+                new NoPatternExpectation($pattern),
+                $shell->getOutput(),
+                $message);
+    }
+
+    /**
+     *    File existence check.
+     *    @param string $path      Full filename and path.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertFileExists($path, $message = "%s") {
+        $message = sprintf($message, "File [$path] should exist");
+        return $this->assertTrue(file_exists($path), $message);
+    }
+
+    /**
+     *    File non-existence check.
+     *    @param string $path      Full filename and path.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertFileNotExists($path, $message = "%s") {
+        $message = sprintf($message, "File [$path] should not exist");
+        return $this->assertFalse(file_exists($path), $message);
+    }
+
+    /**
+     *    Scans a file for a Perl regex. If found
+     *    anywhere it passes, else it fails.
+     *    @param string $pattern    Regex to search for.
+     *    @param string $path       Full filename and path.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertFilePattern($pattern, $path, $message = "%s") {
+        return $this->assert(
+                new PatternExpectation($pattern),
+                implode('', file($path)),
+                $message);
+    }
+
+    /**
+     *    If a Perl regex is found anywhere in the named
+     *    file then a failure is generated, else a pass.
+     *    @param string $pattern    Regex to search for.
+     *    @param string $path       Full filename and path.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertNoFilePattern($pattern, $path, $message = "%s") {
+        return $this->assert(
+                new NoPatternExpectation($pattern),
+                implode('', file($path)),
+                $message);
+    }
+
+    /**
+     *    Accessor for current shell. Used for testing the
+     *    the tester itself.
+     *    @return Shell        Current shell.
+     *    @access protected
+     */
+    protected function getShell() {
+        return $this->current_shell;
+    }
+
+    /**
+     *    Factory for the shell to run the command on.
+     *    @return Shell        New shell object.
+     *    @access protected
+     */
+    protected function createShell() {
+        return new SimpleShell();
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/simpletest.php b/3rdparty/simpletest/simpletest.php
new file mode 100644
index 00000000000..425c869a825
--- /dev/null
+++ b/3rdparty/simpletest/simpletest.php
@@ -0,0 +1,391 @@
+<?php
+/**
+ *  Global state for SimpleTest and kicker script in future versions.
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: simpletest.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/reflection_php5.php');
+require_once(dirname(__FILE__) . '/default_reporter.php');
+require_once(dirname(__FILE__) . '/compatibility.php');
+/**#@-*/
+
+/**
+ *    Registry and test context. Includes a few
+ *    global options that I'm slowly getting rid of.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleTest {
+
+    /**
+     *    Reads the SimpleTest version from the release file.
+     *    @return string        Version string.
+     */
+    static function getVersion() {
+        $content = file(dirname(__FILE__) . '/VERSION');
+        return trim($content[0]);
+    }
+
+    /**
+     *    Sets the name of a test case to ignore, usually
+     *    because the class is an abstract case that should
+     *    @param string $class        Add a class to ignore.
+     */
+    static function ignore($class) {
+        $registry = &SimpleTest::getRegistry();
+        $registry['IgnoreList'][strtolower($class)] = true;
+    }
+
+    /**
+     *    Scans the now complete ignore list, and adds
+     *    all parent classes to the list. If a class
+     *    is not a runnable test case, then it's parents
+     *    wouldn't be either. This is syntactic sugar
+     *    to cut down on ommissions of ignore()'s or
+     *    missing abstract declarations. This cannot
+     *    be done whilst loading classes wiithout forcing
+     *    a particular order on the class declarations and
+     *    the ignore() calls. It's just nice to have the ignore()
+     *    calls at the top of the file before the actual declarations.
+     *    @param array $classes     Class names of interest.
+     */
+    static function ignoreParentsIfIgnored($classes) {
+        $registry = &SimpleTest::getRegistry();
+        foreach ($classes as $class) {
+            if (SimpleTest::isIgnored($class)) {
+                $reflection = new SimpleReflection($class);
+                if ($parent = $reflection->getParent()) {
+                    SimpleTest::ignore($parent);
+                }
+            }
+        }
+    }
+
+    /**
+     *   Puts the object to the global pool of 'preferred' objects
+     *   which can be retrieved with SimpleTest :: preferred() method.
+     *   Instances of the same class are overwritten.
+     *   @param object $object      Preferred object
+     *   @see preferred()
+     */
+    static function prefer($object) {
+        $registry = &SimpleTest::getRegistry();
+        $registry['Preferred'][] = $object;
+    }
+
+    /**
+     *   Retrieves 'preferred' objects from global pool. Class filter
+     *   can be applied in order to retrieve the object of the specific
+     *   class
+     *   @param array|string $classes       Allowed classes or interfaces.
+     *   @return array|object|null
+     *   @see prefer()
+     */
+    static function preferred($classes) {
+        if (! is_array($classes)) {
+            $classes = array($classes);
+        }
+        $registry = &SimpleTest::getRegistry();
+        for ($i = count($registry['Preferred']) - 1; $i >= 0; $i--) {
+            foreach ($classes as $class) {
+                if (SimpleTestCompatibility::isA($registry['Preferred'][$i], $class)) {
+                    return $registry['Preferred'][$i];
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Test to see if a test case is in the ignore
+     *    list. Quite obviously the ignore list should
+     *    be a separate object and will be one day.
+     *    This method is internal to SimpleTest. Don't
+     *    use it.
+     *    @param string $class        Class name to test.
+     *    @return boolean             True if should not be run.
+     */
+    static function isIgnored($class) {
+        $registry = &SimpleTest::getRegistry();
+        return isset($registry['IgnoreList'][strtolower($class)]);
+    }
+
+    /**
+     *    Sets proxy to use on all requests for when
+     *    testing from behind a firewall. Set host
+     *    to false to disable. This will take effect
+     *    if there are no other proxy settings.
+     *    @param string $proxy     Proxy host as URL.
+     *    @param string $username  Proxy username for authentication.
+     *    @param string $password  Proxy password for authentication.
+     */
+    static function useProxy($proxy, $username = false, $password = false) {
+        $registry = &SimpleTest::getRegistry();
+        $registry['DefaultProxy'] = $proxy;
+        $registry['DefaultProxyUsername'] = $username;
+        $registry['DefaultProxyPassword'] = $password;
+    }
+
+    /**
+     *    Accessor for default proxy host.
+     *    @return string       Proxy URL.
+     */
+    static function getDefaultProxy() {
+        $registry = &SimpleTest::getRegistry();
+        return $registry['DefaultProxy'];
+    }
+
+    /**
+     *    Accessor for default proxy username.
+     *    @return string    Proxy username for authentication.
+     */
+    static function getDefaultProxyUsername() {
+        $registry = &SimpleTest::getRegistry();
+        return $registry['DefaultProxyUsername'];
+    }
+
+    /**
+     *    Accessor for default proxy password.
+     *    @return string    Proxy password for authentication.
+     */
+    static function getDefaultProxyPassword() {
+        $registry = &SimpleTest::getRegistry();
+        return $registry['DefaultProxyPassword'];
+    }
+
+    /**
+     *    Accessor for default HTML parsers.
+     *    @return array     List of parsers to try in
+     *                      order until one responds true
+     *                      to can().
+     */
+    static function getParsers() {
+        $registry = &SimpleTest::getRegistry();
+        return $registry['Parsers'];
+    }
+
+    /**
+     *    Set the list of HTML parsers to attempt to use by default.
+     *    @param array $parsers    List of parsers to try in
+     *                             order until one responds true
+     *                             to can().
+     */
+    static function setParsers($parsers) {
+        $registry = &SimpleTest::getRegistry();
+        $registry['Parsers'] = $parsers;
+    }
+
+    /**
+     *    Accessor for global registry of options.
+     *    @return hash           All stored values.
+     */
+    protected static function &getRegistry() {
+        static $registry = false;
+        if (! $registry) {
+            $registry = SimpleTest::getDefaults();
+        }
+        return $registry;
+    }
+
+    /**
+     *    Accessor for the context of the current
+     *    test run.
+     *    @return SimpleTestContext    Current test run.
+     */
+    static function getContext() {
+        static $context = false;
+        if (! $context) {
+            $context = new SimpleTestContext();
+        }
+        return $context;
+    }
+
+    /**
+     *    Constant default values.
+     *    @return hash       All registry defaults.
+     */
+    protected static function getDefaults() {
+        return array(
+                'Parsers' => false,
+                'MockBaseClass' => 'SimpleMock',
+                'IgnoreList' => array(),
+                'DefaultProxy' => false,
+                'DefaultProxyUsername' => false,
+                'DefaultProxyPassword' => false,
+                'Preferred' => array(new HtmlReporter(), new TextReporter(), new XmlReporter()));
+    }
+
+    /**
+     *    @deprecated
+     */
+    static function setMockBaseClass($mock_base) {
+        $registry = &SimpleTest::getRegistry();
+        $registry['MockBaseClass'] = $mock_base;
+    }
+
+    /**
+     *    @deprecated
+     */
+    static function getMockBaseClass() {
+        $registry = &SimpleTest::getRegistry();
+        return $registry['MockBaseClass'];
+    }
+}
+
+/**
+ *    Container for all components for a specific
+ *    test run. Makes things like error queues
+ *    available to PHP event handlers, and also
+ *    gets around some nasty reference issues in
+ *    the mocks.
+ *    @package  SimpleTest
+ */
+class SimpleTestContext {
+    private $test;
+    private $reporter;
+    private $resources;
+
+    /**
+     *    Clears down the current context.
+     *    @access public
+     */
+    function clear() {
+        $this->resources = array();
+    }
+
+    /**
+     *    Sets the current test case instance. This
+     *    global instance can be used by the mock objects
+     *    to send message to the test cases.
+     *    @param SimpleTestCase $test        Test case to register.
+     */
+    function setTest($test) {
+        $this->clear();
+        $this->test = $test;
+    }
+
+    /**
+     *    Accessor for currently running test case.
+     *    @return SimpleTestCase    Current test.
+     */
+    function getTest() {
+        return $this->test;
+    }
+
+    /**
+     *    Sets the current reporter. This
+     *    global instance can be used by the mock objects
+     *    to send messages.
+     *    @param SimpleReporter $reporter     Reporter to register.
+     */
+    function setReporter($reporter) {
+        $this->clear();
+        $this->reporter = $reporter;
+    }
+
+    /**
+     *    Accessor for current reporter.
+     *    @return SimpleReporter    Current reporter.
+     */
+    function getReporter() {
+        return $this->reporter;
+    }
+
+    /**
+     *    Accessor for the Singleton resource.
+     *    @return object       Global resource.
+     */
+    function get($resource) {
+        if (! isset($this->resources[$resource])) {
+            $this->resources[$resource] = new $resource();
+        }
+        return $this->resources[$resource];
+    }
+}
+
+/**
+ *    Interrogates the stack trace to recover the
+ *    failure point.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleStackTrace {
+    private $prefixes;
+
+    /**
+     *    Stashes the list of target prefixes.
+     *    @param array $prefixes      List of method prefixes
+     *                                to search for.
+     */
+    function __construct($prefixes) {
+        $this->prefixes = $prefixes;
+    }
+
+    /**
+     *    Extracts the last method name that was not within
+     *    Simpletest itself. Captures a stack trace if none given.
+     *    @param array $stack      List of stack frames.
+     *    @return string           Snippet of test report with line
+     *                             number and file.
+     */
+    function traceMethod($stack = false) {
+        $stack = $stack ? $stack : $this->captureTrace();
+        foreach ($stack as $frame) {
+            if ($this->frameLiesWithinSimpleTestFolder($frame)) {
+                continue;
+            }
+            if ($this->frameMatchesPrefix($frame)) {
+                return ' at [' . $frame['file'] . ' line ' . $frame['line'] . ']';
+            }
+        }
+        return '';
+    }
+
+    /**
+     *    Test to see if error is generated by SimpleTest itself.
+     *    @param array $frame     PHP stack frame.
+     *    @return boolean         True if a SimpleTest file.
+     */
+    protected function frameLiesWithinSimpleTestFolder($frame) {
+        if (isset($frame['file'])) {
+            $path = substr(SIMPLE_TEST, 0, -1);
+            if (strpos($frame['file'], $path) === 0) {
+                if (dirname($frame['file']) == $path) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Tries to determine if the method call is an assert, etc.
+     *    @param array $frame     PHP stack frame.
+     *    @return boolean         True if matches a target.
+     */
+    protected function frameMatchesPrefix($frame) {
+        foreach ($this->prefixes as $prefix) {
+            if (strncmp($frame['function'], $prefix, strlen($prefix)) == 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Grabs a current stack trace.
+     *    @return array        Fulle trace.
+     */
+    protected function captureTrace() {
+        if (function_exists('debug_backtrace')) {
+            return array_reverse(debug_backtrace());
+        }
+        return array();
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/socket.php b/3rdparty/simpletest/socket.php
new file mode 100755
index 00000000000..06e8ca62d00
--- /dev/null
+++ b/3rdparty/simpletest/socket.php
@@ -0,0 +1,312 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage MockObjects
+ *  @version    $Id: socket.php 1953 2009-09-20 01:26:25Z jsweat $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/compatibility.php');
+/**#@-*/
+
+/**
+ *    Stashes an error for later. Useful for constructors
+ *    until PHP gets exceptions.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleStickyError {
+    private $error = 'Constructor not chained';
+
+    /**
+     *    Sets the error to empty.
+     *    @access public
+     */
+    function __construct() {
+        $this->clearError();
+    }
+
+    /**
+     *    Test for an outstanding error.
+     *    @return boolean           True if there is an error.
+     *    @access public
+     */
+    function isError() {
+        return ($this->error != '');
+    }
+
+    /**
+     *    Accessor for an outstanding error.
+     *    @return string     Empty string if no error otherwise
+     *                       the error message.
+     *    @access public
+     */
+    function getError() {
+        return $this->error;
+    }
+
+    /**
+     *    Sets the internal error.
+     *    @param string       Error message to stash.
+     *    @access protected
+     */
+    function setError($error) {
+        $this->error = $error;
+    }
+
+    /**
+     *    Resets the error state to no error.
+     *    @access protected
+     */
+    function clearError() {
+        $this->setError('');
+    }
+}
+
+/**
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleFileSocket extends SimpleStickyError {
+    private $handle;
+    private $is_open = false;
+    private $sent = '';
+    private $block_size;
+
+    /**
+     *    Opens a socket for reading and writing.
+     *    @param SimpleUrl $file       Target URI to fetch.
+     *    @param integer $block_size   Size of chunk to read.
+     *    @access public
+     */
+    function __construct($file, $block_size = 1024) {
+        parent::__construct();
+        if (! ($this->handle = $this->openFile($file, $error))) {
+            $file_string = $file->asString();
+            $this->setError("Cannot open [$file_string] with [$error]");
+            return;
+        }
+        $this->is_open = true;
+        $this->block_size = $block_size;
+    }
+
+    /**
+     *    Writes some data to the socket and saves alocal copy.
+     *    @param string $message       String to send to socket.
+     *    @return boolean              True if successful.
+     *    @access public
+     */
+    function write($message) {
+        return true;
+    }
+
+    /**
+     *    Reads data from the socket. The error suppresion
+     *    is a workaround for PHP4 always throwing a warning
+     *    with a secure socket.
+     *    @return integer/boolean           Incoming bytes. False
+     *                                     on error.
+     *    @access public
+     */
+    function read() {
+        $raw = @fread($this->handle, $this->block_size);
+        if ($raw === false) {
+            $this->setError('Cannot read from socket');
+            $this->close();
+        }
+        return $raw;
+    }
+
+    /**
+     *    Accessor for socket open state.
+     *    @return boolean           True if open.
+     *    @access public
+     */
+    function isOpen() {
+        return $this->is_open;
+    }
+
+    /**
+     *    Closes the socket preventing further reads.
+     *    Cannot be reopened once closed.
+     *    @return boolean           True if successful.
+     *    @access public
+     */
+    function close() {
+        if (!$this->is_open) return false;
+        $this->is_open = false;
+        return fclose($this->handle);
+    }
+
+    /**
+     *    Accessor for content so far.
+     *    @return string        Bytes sent only.
+     *    @access public
+     */
+    function getSent() {
+        return $this->sent;
+    }
+
+    /**
+     *    Actually opens the low level socket.
+     *    @param SimpleUrl $file       SimpleUrl file target.
+     *    @param string $error         Recipient of error message.
+     *    @param integer $timeout      Maximum time to wait for connection.
+     *    @access protected
+     */
+    protected function openFile($file, &$error) {
+        return @fopen($file->asString(), 'r');
+    }
+}
+
+/**
+ *    Wrapper for TCP/IP socket.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleSocket extends SimpleStickyError {
+    private $handle;
+    private $is_open = false;
+    private $sent = '';
+    private $lock_size;
+
+    /**
+     *    Opens a socket for reading and writing.
+     *    @param string $host          Hostname to send request to.
+     *    @param integer $port         Port on remote machine to open.
+     *    @param integer $timeout      Connection timeout in seconds.
+     *    @param integer $block_size   Size of chunk to read.
+     *    @access public
+     */
+    function __construct($host, $port, $timeout, $block_size = 255) {
+        parent::__construct();
+        if (! ($this->handle = $this->openSocket($host, $port, $error_number, $error, $timeout))) {
+            $this->setError("Cannot open [$host:$port] with [$error] within [$timeout] seconds");
+            return;
+        }
+        $this->is_open = true;
+        $this->block_size = $block_size;
+        SimpleTestCompatibility::setTimeout($this->handle, $timeout);
+    }
+
+    /**
+     *    Writes some data to the socket and saves alocal copy.
+     *    @param string $message       String to send to socket.
+     *    @return boolean              True if successful.
+     *    @access public
+     */
+    function write($message) {
+        if ($this->isError() || ! $this->isOpen()) {
+            return false;
+        }
+        $count = fwrite($this->handle, $message);
+        if (! $count) {
+            if ($count === false) {
+                $this->setError('Cannot write to socket');
+                $this->close();
+            }
+            return false;
+        }
+        fflush($this->handle);
+        $this->sent .= $message;
+        return true;
+    }
+
+    /**
+     *    Reads data from the socket. The error suppresion
+     *    is a workaround for PHP4 always throwing a warning
+     *    with a secure socket.
+     *    @return integer/boolean           Incoming bytes. False
+     *                                     on error.
+     *    @access public
+     */
+    function read() {
+        if ($this->isError() || ! $this->isOpen()) {
+            return false;
+        }
+        $raw = @fread($this->handle, $this->block_size);
+        if ($raw === false) {
+            $this->setError('Cannot read from socket');
+            $this->close();
+        }
+        return $raw;
+    }
+
+    /**
+     *    Accessor for socket open state.
+     *    @return boolean           True if open.
+     *    @access public
+     */
+    function isOpen() {
+        return $this->is_open;
+    }
+
+    /**
+     *    Closes the socket preventing further reads.
+     *    Cannot be reopened once closed.
+     *    @return boolean           True if successful.
+     *    @access public
+     */
+    function close() {
+        $this->is_open = false;
+        return fclose($this->handle);
+    }
+
+    /**
+     *    Accessor for content so far.
+     *    @return string        Bytes sent only.
+     *    @access public
+     */
+    function getSent() {
+        return $this->sent;
+    }
+
+    /**
+     *    Actually opens the low level socket.
+     *    @param string $host          Host to connect to.
+     *    @param integer $port         Port on host.
+     *    @param integer $error_number Recipient of error code.
+     *    @param string $error         Recipoent of error message.
+     *    @param integer $timeout      Maximum time to wait for connection.
+     *    @access protected
+     */
+    protected function openSocket($host, $port, &$error_number, &$error, $timeout) {
+        return @fsockopen($host, $port, $error_number, $error, $timeout);
+    }
+}
+
+/**
+ *    Wrapper for TCP/IP socket over TLS.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleSecureSocket extends SimpleSocket {
+
+    /**
+     *    Opens a secure socket for reading and writing.
+     *    @param string $host      Hostname to send request to.
+     *    @param integer $port     Port on remote machine to open.
+     *    @param integer $timeout  Connection timeout in seconds.
+     *    @access public
+     */
+    function __construct($host, $port, $timeout) {
+        parent::__construct($host, $port, $timeout);
+    }
+
+    /**
+     *    Actually opens the low level socket.
+     *    @param string $host          Host to connect to.
+     *    @param integer $port         Port on host.
+     *    @param integer $error_number Recipient of error code.
+     *    @param string $error         Recipient of error message.
+     *    @param integer $timeout      Maximum time to wait for connection.
+     *    @access protected
+     */
+    function openSocket($host, $port, &$error_number, &$error, $timeout) {
+        return parent::openSocket("tls://$host", $port, $error_number, $error, $timeout);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/tag.php b/3rdparty/simpletest/tag.php
new file mode 100644
index 00000000000..afe649ec5dd
--- /dev/null
+++ b/3rdparty/simpletest/tag.php
@@ -0,0 +1,1527 @@
+<?php
+/**
+ *  Base include file for SimpleTest.
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: tag.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/page.php');
+require_once(dirname(__FILE__) . '/encoding.php');
+/**#@-*/
+
+/**
+ *    Creates tags and widgets given HTML tag
+ *    attributes.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTagBuilder {
+
+    /**
+     *    Factory for the tag objects. Creates the
+     *    appropriate tag object for the incoming tag name
+     *    and attributes.
+     *    @param string $name        HTML tag name.
+     *    @param hash $attributes    Element attributes.
+     *    @return SimpleTag          Tag object.
+     *    @access public
+     */
+    function createTag($name, $attributes) {
+        static $map = array(
+                'a' => 'SimpleAnchorTag',
+                'title' => 'SimpleTitleTag',
+                'base' => 'SimpleBaseTag',
+                'button' => 'SimpleButtonTag',
+                'textarea' => 'SimpleTextAreaTag',
+                'option' => 'SimpleOptionTag',
+                'label' => 'SimpleLabelTag',
+                'form' => 'SimpleFormTag',
+                'frame' => 'SimpleFrameTag');
+        $attributes = $this->keysToLowerCase($attributes);
+        if (array_key_exists($name, $map)) {
+            $tag_class = $map[$name];
+            return new $tag_class($attributes);
+        } elseif ($name == 'select') {
+            return $this->createSelectionTag($attributes);
+        } elseif ($name == 'input') {
+            return $this->createInputTag($attributes);
+        }
+        return new SimpleTag($name, $attributes);
+    }
+
+    /**
+     *    Factory for selection fields.
+     *    @param hash $attributes    Element attributes.
+     *    @return SimpleTag          Tag object.
+     *    @access protected
+     */
+    protected function createSelectionTag($attributes) {
+        if (isset($attributes['multiple'])) {
+            return new MultipleSelectionTag($attributes);
+        }
+        return new SimpleSelectionTag($attributes);
+    }
+
+    /**
+     *    Factory for input tags.
+     *    @param hash $attributes    Element attributes.
+     *    @return SimpleTag          Tag object.
+     *    @access protected
+     */
+    protected function createInputTag($attributes) {
+        if (! isset($attributes['type'])) {
+            return new SimpleTextTag($attributes);
+        }
+        $type = strtolower(trim($attributes['type']));
+        $map = array(
+                'submit' => 'SimpleSubmitTag',
+                'image' => 'SimpleImageSubmitTag',
+                'checkbox' => 'SimpleCheckboxTag',
+                'radio' => 'SimpleRadioButtonTag',
+                'text' => 'SimpleTextTag',
+                'hidden' => 'SimpleTextTag',
+                'password' => 'SimpleTextTag',
+                'file' => 'SimpleUploadTag');
+        if (array_key_exists($type, $map)) {
+            $tag_class = $map[$type];
+            return new $tag_class($attributes);
+        }
+        return false;
+    }
+
+    /**
+     *    Make the keys lower case for case insensitive look-ups.
+     *    @param hash $map   Hash to convert.
+     *    @return hash       Unchanged values, but keys lower case.
+     *    @access private
+     */
+    protected function keysToLowerCase($map) {
+        $lower = array();
+        foreach ($map as $key => $value) {
+            $lower[strtolower($key)] = $value;
+        }
+        return $lower;
+    }
+}
+
+/**
+ *    HTML or XML tag.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTag {
+    private $name;
+    private $attributes;
+    private $content;
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param string $name        Tag name.
+     *    @param hash $attributes    Attribute names and
+     *                               string values. Note that
+     *                               the keys must have been
+     *                               converted to lower case.
+     */
+    function __construct($name, $attributes) {
+        $this->name = strtolower(trim($name));
+        $this->attributes = $attributes;
+        $this->content = '';
+    }
+
+    /**
+     *    Check to see if the tag can have both start and
+     *    end tags with content in between.
+     *    @return boolean        True if content allowed.
+     *    @access public
+     */
+    function expectEndTag() {
+        return true;
+    }
+
+    /**
+     *    The current tag should not swallow all content for
+     *    itself as it's searchable page content. Private
+     *    content tags are usually widgets that contain default
+     *    values.
+     *    @return boolean        False as content is available
+     *                           to other tags by default.
+     *    @access public
+     */
+    function isPrivateContent() {
+        return false;
+    }
+
+    /**
+     *    Appends string content to the current content.
+     *    @param string $content        Additional text.
+     *    @access public
+     */
+    function addContent($content) {
+        $this->content .= (string)$content;
+        return $this;
+    }
+
+    /**
+     *    Adds an enclosed tag to the content.
+     *    @param SimpleTag $tag    New tag.
+     *    @access public
+     */
+    function addTag($tag) {
+    }
+
+    /**
+     *    Adds multiple enclosed tags to the content.
+     *    @param array            List of SimpleTag objects to be added.
+     */
+    function addTags($tags) {
+        foreach ($tags as $tag) {
+            $this->addTag($tag);
+        }
+    }
+
+    /**
+     *    Accessor for tag name.
+     *    @return string       Name of tag.
+     *    @access public
+     */
+    function getTagName() {
+        return $this->name;
+    }
+
+    /**
+     *    List of legal child elements.
+     *    @return array        List of element names.
+     *    @access public
+     */
+    function getChildElements() {
+        return array();
+    }
+
+    /**
+     *    Accessor for an attribute.
+     *    @param string $label    Attribute name.
+     *    @return string          Attribute value.
+     *    @access public
+     */
+    function getAttribute($label) {
+        $label = strtolower($label);
+        if (! isset($this->attributes[$label])) {
+            return false;
+        }
+        return (string)$this->attributes[$label];
+    }
+
+    /**
+     *    Sets an attribute.
+     *    @param string $label    Attribute name.
+     *    @return string $value   New attribute value.
+     *    @access protected
+     */
+    protected function setAttribute($label, $value) {
+        $this->attributes[strtolower($label)] = $value;
+    }
+
+    /**
+     *    Accessor for the whole content so far.
+     *    @return string       Content as big raw string.
+     *    @access public
+     */
+    function getContent() {
+        return $this->content;
+    }
+
+    /**
+     *    Accessor for content reduced to visible text. Acts
+     *    like a text mode browser, normalising space and
+     *    reducing images to their alt text.
+     *    @return string       Content as plain text.
+     *    @access public
+     */
+    function getText() {
+        return SimplePage::normalise($this->content);
+    }
+
+    /**
+     *    Test to see if id attribute matches.
+     *    @param string $id        ID to test against.
+     *    @return boolean          True on match.
+     *    @access public
+     */
+    function isId($id) {
+        return ($this->getAttribute('id') == $id);
+    }
+}
+
+/**
+ *    Base url.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleBaseTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('base', $attributes);
+    }
+
+    /**
+     *    Base tag is not a block tag.
+     *    @return boolean       false
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+}
+
+/**
+ *    Page title.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTitleTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('title', $attributes);
+    }
+}
+
+/**
+ *    Link.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleAnchorTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('a', $attributes);
+    }
+
+    /**
+     *    Accessor for URL as string.
+     *    @return string    Coerced as string.
+     *    @access public
+     */
+    function getHref() {
+        $url = $this->getAttribute('href');
+        if (is_bool($url)) {
+            $url = '';
+        }
+        return $url;
+    }
+}
+
+/**
+ *    Form element.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleWidget extends SimpleTag {
+    private $value;
+    private $label;
+    private $is_set;
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param string $name        Tag name.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($name, $attributes) {
+        parent::__construct($name, $attributes);
+        $this->value = false;
+        $this->label = false;
+        $this->is_set = false;
+    }
+
+    /**
+     *    Accessor for name submitted as the key in
+     *    GET/POST privateiables hash.
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getName() {
+        return $this->getAttribute('name');
+    }
+
+    /**
+     *    Accessor for default value parsed with the tag.
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getDefault() {
+        return $this->getAttribute('value');
+    }
+
+    /**
+     *    Accessor for currently set value or default if
+     *    none.
+     *    @return string      Value set by form or default
+     *                        if none.
+     *    @access public
+     */
+    function getValue() {
+        if (! $this->is_set) {
+            return $this->getDefault();
+        }
+        return $this->value;
+    }
+
+    /**
+     *    Sets the current form element value.
+     *    @param string $value       New value.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        $this->value = $value;
+        $this->is_set = true;
+        return true;
+    }
+
+    /**
+     *    Resets the form element value back to the
+     *    default.
+     *    @access public
+     */
+    function resetValue() {
+        $this->is_set = false;
+    }
+
+    /**
+     *    Allows setting of a label externally, say by a
+     *    label tag.
+     *    @param string $label    Label to attach.
+     *    @access public
+     */
+    function setLabel($label) {
+        $this->label = trim($label);
+        return $this;
+    }
+
+    /**
+     *    Reads external or internal label.
+     *    @param string $label    Label to test.
+     *    @return boolean         True is match.
+     *    @access public
+     */
+    function isLabel($label) {
+        return $this->label == trim($label);
+    }
+
+    /**
+     *    Dispatches the value into the form encoded packet.
+     *    @param SimpleEncoding $encoding    Form packet.
+     *    @access public
+     */
+    function write($encoding) {
+        if ($this->getName()) {
+            $encoding->add($this->getName(), $this->getValue());
+        }
+    }
+}
+
+/**
+ *    Text, password and hidden field.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTextTag extends SimpleWidget {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+        if ($this->getAttribute('value') === false) {
+            $this->setAttribute('value', '');
+        }
+    }
+
+    /**
+     *    Tag contains no content.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    Sets the current form element value. Cannot
+     *    change the value of a hidden field.
+     *    @param string $value       New value.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        if ($this->getAttribute('type') == 'hidden') {
+            return false;
+        }
+        return parent::setValue($value);
+    }
+}
+
+/**
+ *    Submit button as input tag.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleSubmitTag extends SimpleWidget {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+        if ($this->getAttribute('value') === false) {
+            $this->setAttribute('value', 'Submit');
+        }
+    }
+
+    /**
+     *    Tag contains no end element.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    Disables the setting of the button value.
+     *    @param string $value       Ignored.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        return false;
+    }
+
+    /**
+     *    Value of browser visible text.
+     *    @return string        Visible label.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->getValue();
+    }
+
+    /**
+     *    Test for a label match when searching.
+     *    @param string $label     Label to test.
+     *    @return boolean          True on match.
+     *    @access public
+     */
+    function isLabel($label) {
+        return trim($label) == trim($this->getLabel());
+    }
+}
+
+/**
+ *    Image button as input tag.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleImageSubmitTag extends SimpleWidget {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+    }
+
+    /**
+     *    Tag contains no end element.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    Disables the setting of the button value.
+     *    @param string $value       Ignored.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        return false;
+    }
+
+    /**
+     *    Value of browser visible text.
+     *    @return string        Visible label.
+     *    @access public
+     */
+    function getLabel() {
+        if ($this->getAttribute('title')) {
+            return $this->getAttribute('title');
+        }
+        return $this->getAttribute('alt');
+    }
+
+    /**
+     *    Test for a label match when searching.
+     *    @param string $label     Label to test.
+     *    @return boolean          True on match.
+     *    @access public
+     */
+    function isLabel($label) {
+        return trim($label) == trim($this->getLabel());
+    }
+
+    /**
+     *    Dispatches the value into the form encoded packet.
+     *    @param SimpleEncoding $encoding    Form packet.
+     *    @param integer $x                  X coordinate of click.
+     *    @param integer $y                  Y coordinate of click.
+     *    @access public
+     */
+    function write($encoding, $x = 1, $y = 1) {
+        if ($this->getName()) {
+            $encoding->add($this->getName() . '.x', $x);
+            $encoding->add($this->getName() . '.y', $y);
+        } else {
+            $encoding->add('x', $x);
+            $encoding->add('y', $y);
+        }
+    }
+}
+
+/**
+ *    Submit button as button tag.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleButtonTag extends SimpleWidget {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    Defaults are very browser dependent.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('button', $attributes);
+    }
+
+    /**
+     *    Check to see if the tag can have both start and
+     *    end tags with content in between.
+     *    @return boolean        True if content allowed.
+     *    @access public
+     */
+    function expectEndTag() {
+        return true;
+    }
+
+    /**
+     *    Disables the setting of the button value.
+     *    @param string $value       Ignored.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        return false;
+    }
+
+    /**
+     *    Value of browser visible text.
+     *    @return string        Visible label.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->getContent();
+    }
+
+    /**
+     *    Test for a label match when searching.
+     *    @param string $label     Label to test.
+     *    @return boolean          True on match.
+     *    @access public
+     */
+    function isLabel($label) {
+        return trim($label) == trim($this->getLabel());
+    }
+}
+
+/**
+ *    Content tag for text area.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTextAreaTag extends SimpleWidget {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('textarea', $attributes);
+    }
+
+    /**
+     *    Accessor for starting value.
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getDefault() {
+        return $this->wrap(html_entity_decode($this->getContent(), ENT_QUOTES));
+    }
+
+    /**
+     *    Applies word wrapping if needed.
+     *    @param string $value      New value.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        return parent::setValue($this->wrap($value));
+    }
+
+    /**
+     *    Test to see if text should be wrapped.
+     *    @return boolean        True if wrapping on.
+     *    @access private
+     */
+    function wrapIsEnabled() {
+        if ($this->getAttribute('cols')) {
+            $wrap = $this->getAttribute('wrap');
+            if (($wrap == 'physical') || ($wrap == 'hard')) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Performs the formatting that is peculiar to
+     *    this tag. There is strange behaviour in this
+     *    one, including stripping a leading new line.
+     *    Go figure. I am using Firefox as a guide.
+     *    @param string $text    Text to wrap.
+     *    @return string         Text wrapped with carriage
+     *                           returns and line feeds
+     *    @access private
+     */
+    protected function wrap($text) {
+        $text = str_replace("\r\r\n", "\r\n", str_replace("\n", "\r\n", $text));
+        $text = str_replace("\r\n\n", "\r\n", str_replace("\r", "\r\n", $text));
+        if (strncmp($text, "\r\n", strlen("\r\n")) == 0) {
+            $text = substr($text, strlen("\r\n"));
+        }
+        if ($this->wrapIsEnabled()) {
+            return wordwrap(
+                    $text,
+                    (integer)$this->getAttribute('cols'),
+                    "\r\n");
+        }
+        return $text;
+    }
+
+    /**
+     *    The content of textarea is not part of the page.
+     *    @return boolean        True.
+     *    @access public
+     */
+    function isPrivateContent() {
+        return true;
+    }
+}
+
+/**
+ *    File upload widget.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleUploadTag extends SimpleWidget {
+
+    /**
+     *    Starts with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+    }
+
+    /**
+     *    Tag contains no content.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    Dispatches the value into the form encoded packet.
+     *    @param SimpleEncoding $encoding    Form packet.
+     *    @access public
+     */
+    function write($encoding) {
+        if (! file_exists($this->getValue())) {
+            return;
+        }
+        $encoding->attach(
+                $this->getName(),
+                implode('', file($this->getValue())),
+                basename($this->getValue()));
+    }
+}
+
+/**
+ *    Drop down widget.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleSelectionTag extends SimpleWidget {
+    private $options;
+    private $choice;
+
+    /**
+     *    Starts with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('select', $attributes);
+        $this->options = array();
+        $this->choice = false;
+    }
+
+    /**
+     *    Adds an option tag to a selection field.
+     *    @param SimpleOptionTag $tag     New option.
+     *    @access public
+     */
+    function addTag($tag) {
+        if ($tag->getTagName() == 'option') {
+            $this->options[] = $tag;
+        }
+    }
+
+    /**
+     *    Text within the selection element is ignored.
+     *    @param string $content        Ignored.
+     *    @access public
+     */
+    function addContent($content) {
+        return $this;
+    }
+
+    /**
+     *    Scans options for defaults. If none, then
+     *    the first option is selected.
+     *    @return string        Selected field.
+     *    @access public
+     */
+    function getDefault() {
+        for ($i = 0, $count = count($this->options); $i < $count; $i++) {
+            if ($this->options[$i]->getAttribute('selected') !== false) {
+                return $this->options[$i]->getDefault();
+            }
+        }
+        if ($count > 0) {
+            return $this->options[0]->getDefault();
+        }
+        return '';
+    }
+
+    /**
+     *    Can only set allowed values.
+     *    @param string $value       New choice.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        for ($i = 0, $count = count($this->options); $i < $count; $i++) {
+            if ($this->options[$i]->isValue($value)) {
+                $this->choice = $i;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for current selection value.
+     *    @return string      Value attribute or
+     *                        content of opton.
+     *    @access public
+     */
+    function getValue() {
+        if ($this->choice === false) {
+            return $this->getDefault();
+        }
+        return $this->options[$this->choice]->getValue();
+    }
+}
+
+/**
+ *    Drop down widget.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class MultipleSelectionTag extends SimpleWidget {
+    private $options;
+    private $values;
+
+    /**
+     *    Starts with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('select', $attributes);
+        $this->options = array();
+        $this->values = false;
+    }
+
+    /**
+     *    Adds an option tag to a selection field.
+     *    @param SimpleOptionTag $tag     New option.
+     *    @access public
+     */
+    function addTag($tag) {
+        if ($tag->getTagName() == 'option') {
+            $this->options[] = &$tag;
+        }
+    }
+
+    /**
+     *    Text within the selection element is ignored.
+     *    @param string $content        Ignored.
+     *    @access public
+     */
+    function addContent($content) {
+        return $this;
+    }
+
+    /**
+     *    Scans options for defaults to populate the
+     *    value array().
+     *    @return array        Selected fields.
+     *    @access public
+     */
+    function getDefault() {
+        $default = array();
+        for ($i = 0, $count = count($this->options); $i < $count; $i++) {
+            if ($this->options[$i]->getAttribute('selected') !== false) {
+                $default[] = $this->options[$i]->getDefault();
+            }
+        }
+        return $default;
+    }
+
+    /**
+     *    Can only set allowed values. Any illegal value
+     *    will result in a failure, but all correct values
+     *    will be set.
+     *    @param array $desired      New choices.
+     *    @return boolean            True if all allowed.
+     *    @access public
+     */
+    function setValue($desired) {
+        $achieved = array();
+        foreach ($desired as $value) {
+            $success = false;
+            for ($i = 0, $count = count($this->options); $i < $count; $i++) {
+                if ($this->options[$i]->isValue($value)) {
+                    $achieved[] = $this->options[$i]->getValue();
+                    $success = true;
+                    break;
+                }
+            }
+            if (! $success) {
+                return false;
+            }
+        }
+        $this->values = $achieved;
+        return true;
+    }
+
+    /**
+     *    Accessor for current selection value.
+     *    @return array      List of currently set options.
+     *    @access public
+     */
+    function getValue() {
+        if ($this->values === false) {
+            return $this->getDefault();
+        }
+        return $this->values;
+    }
+}
+
+/**
+ *    Option for selection field.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleOptionTag extends SimpleWidget {
+
+    /**
+     *    Stashes the attributes.
+     */
+    function __construct($attributes) {
+        parent::__construct('option', $attributes);
+    }
+
+    /**
+     *    Does nothing.
+     *    @param string $value      Ignored.
+     *    @return boolean           Not allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        return false;
+    }
+
+    /**
+     *    Test to see if a value matches the option.
+     *    @param string $compare    Value to compare with.
+     *    @return boolean           True if possible match.
+     *    @access public
+     */
+    function isValue($compare) {
+        $compare = trim($compare);
+        if (trim($this->getValue()) == $compare) {
+            return true;
+        }
+        return trim(strip_tags($this->getContent())) == $compare;
+    }
+
+    /**
+     *    Accessor for starting value. Will be set to
+     *    the option label if no value exists.
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getDefault() {
+        if ($this->getAttribute('value') === false) {
+            return strip_tags($this->getContent());
+        }
+        return $this->getAttribute('value');
+    }
+
+    /**
+     *    The content of options is not part of the page.
+     *    @return boolean        True.
+     *    @access public
+     */
+    function isPrivateContent() {
+        return true;
+    }
+}
+
+/**
+ *    Radio button.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleRadioButtonTag extends SimpleWidget {
+
+    /**
+     *    Stashes the attributes.
+     *    @param array $attributes        Hash of attributes.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+        if ($this->getAttribute('value') === false) {
+            $this->setAttribute('value', 'on');
+        }
+    }
+
+    /**
+     *    Tag contains no content.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    The only allowed value sn the one in the
+     *    "value" attribute.
+     *    @param string $value      New value.
+     *    @return boolean           True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        if ($value === false) {
+            return parent::setValue($value);
+        }
+        if ($value != $this->getAttribute('value')) {
+            return false;
+        }
+        return parent::setValue($value);
+    }
+
+    /**
+     *    Accessor for starting value.
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getDefault() {
+        if ($this->getAttribute('checked') !== false) {
+            return $this->getAttribute('value');
+        }
+        return false;
+    }
+}
+
+/**
+ *    Checkbox widget.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleCheckboxTag extends SimpleWidget {
+
+    /**
+     *    Starts with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+        if ($this->getAttribute('value') === false) {
+            $this->setAttribute('value', 'on');
+        }
+    }
+
+    /**
+     *    Tag contains no content.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    The only allowed value in the one in the
+     *    "value" attribute. The default for this
+     *    attribute is "on". If this widget is set to
+     *    true, then the usual value will be taken.
+     *    @param string $value      New value.
+     *    @return boolean           True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        if ($value === false) {
+            return parent::setValue($value);
+        }
+        if ($value === true) {
+            return parent::setValue($this->getAttribute('value'));
+        }
+        if ($value != $this->getAttribute('value')) {
+            return false;
+        }
+        return parent::setValue($value);
+    }
+
+    /**
+     *    Accessor for starting value. The default
+     *    value is "on".
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getDefault() {
+        if ($this->getAttribute('checked') !== false) {
+            return $this->getAttribute('value');
+        }
+        return false;
+    }
+}
+
+/**
+ *    A group of multiple widgets with some shared behaviour.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTagGroup {
+    private $widgets = array();
+
+    /**
+     *    Adds a tag to the group.
+     *    @param SimpleWidget $widget
+     *    @access public
+     */
+    function addWidget($widget) {
+        $this->widgets[] = $widget;
+    }
+
+    /**
+     *    Accessor to widget set.
+     *    @return array        All widgets.
+     *    @access protected
+     */
+    protected function &getWidgets() {
+        return $this->widgets;
+    }
+
+    /**
+     *    Accessor for an attribute.
+     *    @param string $label    Attribute name.
+     *    @return boolean         Always false.
+     *    @access public
+     */
+    function getAttribute($label) {
+        return false;
+    }
+
+    /**
+     *    Fetches the name for the widget from the first
+     *    member.
+     *    @return string        Name of widget.
+     *    @access public
+     */
+    function getName() {
+        if (count($this->widgets) > 0) {
+            return $this->widgets[0]->getName();
+        }
+    }
+
+    /**
+     *    Scans the widgets for one with the appropriate
+     *    ID field.
+     *    @param string $id        ID value to try.
+     *    @return boolean          True if matched.
+     *    @access public
+     */
+    function isId($id) {
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            if ($this->widgets[$i]->isId($id)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Scans the widgets for one with the appropriate
+     *    attached label.
+     *    @param string $label     Attached label to try.
+     *    @return boolean          True if matched.
+     *    @access public
+     */
+    function isLabel($label) {
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            if ($this->widgets[$i]->isLabel($label)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Dispatches the value into the form encoded packet.
+     *    @param SimpleEncoding $encoding    Form packet.
+     *    @access public
+     */
+    function write($encoding) {
+        $encoding->add($this->getName(), $this->getValue());
+    }
+}
+
+/**
+ *    A group of tags with the same name within a form.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleCheckboxGroup extends SimpleTagGroup {
+
+    /**
+     *    Accessor for current selected widget or false
+     *    if none.
+     *    @return string/array     Widget values or false if none.
+     *    @access public
+     */
+    function getValue() {
+        $values = array();
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if ($widgets[$i]->getValue() !== false) {
+                $values[] = $widgets[$i]->getValue();
+            }
+        }
+        return $this->coerceValues($values);
+    }
+
+    /**
+     *    Accessor for starting value that is active.
+     *    @return string/array      Widget values or false if none.
+     *    @access public
+     */
+    function getDefault() {
+        $values = array();
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if ($widgets[$i]->getDefault() !== false) {
+                $values[] = $widgets[$i]->getDefault();
+            }
+        }
+        return $this->coerceValues($values);
+    }
+
+    /**
+     *    Accessor for current set values.
+     *    @param string/array/boolean $values   Either a single string, a
+     *                                          hash or false for nothing set.
+     *    @return boolean                       True if all values can be set.
+     *    @access public
+     */
+    function setValue($values) {
+        $values = $this->makeArray($values);
+        if (! $this->valuesArePossible($values)) {
+            return false;
+        }
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            $possible = $widgets[$i]->getAttribute('value');
+            if (in_array($widgets[$i]->getAttribute('value'), $values)) {
+                $widgets[$i]->setValue($possible);
+            } else {
+                $widgets[$i]->setValue(false);
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Tests to see if a possible value set is legal.
+     *    @param string/array/boolean $values   Either a single string, a
+     *                                          hash or false for nothing set.
+     *    @return boolean                       False if trying to set a
+     *                                          missing value.
+     *    @access private
+     */
+    protected function valuesArePossible($values) {
+        $matches = array();
+        $widgets = &$this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            $possible = $widgets[$i]->getAttribute('value');
+            if (in_array($possible, $values)) {
+                $matches[] = $possible;
+            }
+        }
+        return ($values == $matches);
+    }
+
+    /**
+     *    Converts the output to an appropriate format. This means
+     *    that no values is false, a single value is just that
+     *    value and only two or more are contained in an array.
+     *    @param array $values           List of values of widgets.
+     *    @return string/array/boolean   Expected format for a tag.
+     *    @access private
+     */
+    protected function coerceValues($values) {
+        if (count($values) == 0) {
+            return false;
+        } elseif (count($values) == 1) {
+            return $values[0];
+        } else {
+            return $values;
+        }
+    }
+
+    /**
+     *    Converts false or string into array. The opposite of
+     *    the coercian method.
+     *    @param string/array/boolean $value  A single item is converted
+     *                                        to a one item list. False
+     *                                        gives an empty list.
+     *    @return array                       List of values, possibly empty.
+     *    @access private
+     */
+    protected function makeArray($value) {
+        if ($value === false) {
+            return array();
+        }
+        if (is_string($value)) {
+            return array($value);
+        }
+        return $value;
+    }
+}
+
+/**
+ *    A group of tags with the same name within a form.
+ *    Used for radio buttons.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleRadioGroup extends SimpleTagGroup {
+
+    /**
+     *    Each tag is tried in turn until one is
+     *    successfully set. The others will be
+     *    unchecked if successful.
+     *    @param string $value      New value.
+     *    @return boolean           True if any allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        if (! $this->valueIsPossible($value)) {
+            return false;
+        }
+        $index = false;
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if (! $widgets[$i]->setValue($value)) {
+                $widgets[$i]->setValue(false);
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Tests to see if a value is allowed.
+     *    @param string    Attempted value.
+     *    @return boolean  True if a valid value.
+     *    @access private
+     */
+    protected function valueIsPossible($value) {
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if ($widgets[$i]->getAttribute('value') == $value) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for current selected widget or false
+     *    if none.
+     *    @return string/boolean   Value attribute or
+     *                             content of opton.
+     *    @access public
+     */
+    function getValue() {
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if ($widgets[$i]->getValue() !== false) {
+                return $widgets[$i]->getValue();
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for starting value that is active.
+     *    @return string/boolean      Value of first checked
+     *                                widget or false if none.
+     *    @access public
+     */
+    function getDefault() {
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if ($widgets[$i]->getDefault() !== false) {
+                return $widgets[$i]->getDefault();
+            }
+        }
+        return false;
+    }
+}
+
+/**
+ *    Tag to keep track of labels.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleLabelTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('label', $attributes);
+    }
+
+    /**
+     *    Access for the ID to attach the label to.
+     *    @return string        For attribute.
+     *    @access public
+     */
+    function getFor() {
+        return $this->getAttribute('for');
+    }
+}
+
+/**
+ *    Tag to aid parsing the form.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleFormTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('form', $attributes);
+    }
+}
+
+/**
+ *    Tag to aid parsing the frames in a page.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleFrameTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('frame', $attributes);
+    }
+
+    /**
+     *    Tag contains no content.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/acceptance_test.php b/3rdparty/simpletest/test/acceptance_test.php
new file mode 100644
index 00000000000..e96fe737e5f
--- /dev/null
+++ b/3rdparty/simpletest/test/acceptance_test.php
@@ -0,0 +1,1729 @@
+<?php
+// $Id: acceptance_test.php 2013 2011-04-29 09:29:45Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../compatibility.php');
+require_once(dirname(__FILE__) . '/../browser.php');
+require_once(dirname(__FILE__) . '/../web_tester.php');
+require_once(dirname(__FILE__) . '/../unit_tester.php');
+
+class SimpleTestAcceptanceTest extends WebTestCase {
+    static function samples() {
+        return 'http://www.lastcraft.com/test/';
+    }
+}
+
+class TestOfLiveBrowser extends UnitTestCase {
+    function samples() {
+        return SimpleTestAcceptanceTest::samples();
+    }
+
+    function testGet() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $this->assertTrue($browser->get($this->samples() . 'network_confirm.php'));
+        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/', $browser->getContent());
+        $this->assertEqual($browser->getTitle(), 'Simple test target file');
+        $this->assertEqual($browser->getResponseCode(), 200);
+        $this->assertEqual($browser->getMimeType(), 'text/html');
+    }
+
+    function testPost() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $this->assertTrue($browser->post($this->samples() . 'network_confirm.php'));
+        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/', $browser->getContent());
+    }
+
+    function testAbsoluteLinkFollowing() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'link_confirm.php');
+        $this->assertTrue($browser->clickLink('Absolute'));
+        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
+    }
+
+    function testRelativeEncodedLinkFollowing() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'link_confirm.php');
+        // Warning: the below data is ISO 8859-1 encoded
+        $this->assertTrue($browser->clickLink("m\xE4rc\xEAl kiek'eboe"));
+        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
+    }
+
+    function testRelativeLinkFollowing() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'link_confirm.php');
+        $this->assertTrue($browser->clickLink('Relative'));
+        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
+    }
+
+    function testUnifiedClickLinkClicking() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'link_confirm.php');
+        $this->assertTrue($browser->click('Relative'));
+        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
+    }
+
+    function testIdLinkFollowing() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'link_confirm.php');
+        $this->assertTrue($browser->clickLinkById(1));
+        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
+    }
+
+    function testCookieReading() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'set_cookies.php');
+        $this->assertEqual($browser->getCurrentCookieValue('session_cookie'), 'A');
+        $this->assertEqual($browser->getCurrentCookieValue('short_cookie'), 'B');
+        $this->assertEqual($browser->getCurrentCookieValue('day_cookie'), 'C');
+    }
+
+    function testSimpleSubmit() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'form.html');
+        $this->assertTrue($browser->clickSubmit('Go!'));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/', $browser->getContent());
+        $this->assertPattern('/go=\[Go!\]/', $browser->getContent());
+    }
+
+    function testUnifiedClickCanSubmit() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'form.html');
+        $this->assertTrue($browser->click('Go!'));
+        $this->assertPattern('/go=\[Go!\]/', $browser->getContent());
+    }
+}
+
+class TestOfLocalFileBrowser extends UnitTestCase {
+    function samples() {
+        return 'file://'.dirname(__FILE__).'/site/';
+    }
+
+    function testGet() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $this->assertTrue($browser->get($this->samples() . 'file.html'));
+        $this->assertPattern('/Link to SimpleTest/', $browser->getContent());
+        $this->assertEqual($browser->getTitle(), 'Link to SimpleTest');
+        $this->assertFalse($browser->getResponseCode());
+        $this->assertEqual($browser->getMimeType(), '');
+    }
+}
+
+class TestOfRequestMethods extends UnitTestCase {
+    function samples() {
+        return SimpleTestAcceptanceTest::samples();
+    }
+
+	function testHeadRequest() {
+		$browser = new SimpleBrowser();
+		$this->assertTrue($browser->head($this->samples() . 'request_methods.php'));
+		$this->assertEqual($browser->getResponseCode(), 202);
+	}
+
+	function testGetRequest() {
+		$browser = new SimpleBrowser();
+		$this->assertTrue($browser->get($this->samples() . 'request_methods.php'));
+		$this->assertEqual($browser->getResponseCode(), 405);
+	}
+
+	function testPostWithPlainEncoding() {
+		$browser = new SimpleBrowser();
+		$this->assertTrue($browser->post($this->samples() . 'request_methods.php', 'A content message'));
+		$this->assertEqual($browser->getResponseCode(), 406);
+		$this->assertPattern('/Please ensure content type is an XML format/', $browser->getContent());
+	}
+
+	function testPostWithXmlEncoding() {
+		$browser = new SimpleBrowser();
+		$this->assertTrue($browser->post($this->samples() . 'request_methods.php', '<a><b>c</b></a>', 'text/xml'));
+		$this->assertEqual($browser->getResponseCode(), 201);
+		$this->assertPattern('/c/', $browser->getContent());
+	}
+
+	function testPutWithPlainEncoding() {
+		$browser = new SimpleBrowser();
+		$this->assertTrue($browser->put($this->samples() . 'request_methods.php', 'A content message'));
+		$this->assertEqual($browser->getResponseCode(), 406);
+		$this->assertPattern('/Please ensure content type is an XML format/', $browser->getContent());
+	}
+
+	function testPutWithXmlEncoding() {
+		$browser = new SimpleBrowser();
+		$this->assertTrue($browser->put($this->samples() . 'request_methods.php', '<a><b>c</b></a>', 'application/xml'));
+		$this->assertEqual($browser->getResponseCode(), 201);
+		$this->assertPattern('/c/', $browser->getContent());
+	}
+
+	function testDeleteRequest() {
+		$browser = new SimpleBrowser();
+		$browser->delete($this->samples() . 'request_methods.php');
+		$this->assertEqual($browser->getResponseCode(), 202);
+		$this->assertPattern('/Your delete request was accepted/', $browser->getContent());
+	}
+
+}
+
+class TestRadioFields extends SimpleTestAcceptanceTest {
+    function testSetFieldAsInteger() {
+        $this->get($this->samples() . 'form_with_radio_buttons.html');
+        $this->assertTrue($this->setField('tested_field', 2));
+        $this->clickSubmitByName('send');
+        $this->assertEqual($this->getUrl(), $this->samples() . 'form_with_radio_buttons.html?tested_field=2&send=click+me');
+    }
+
+    function testSetFieldAsString() {
+        $this->get($this->samples() . 'form_with_radio_buttons.html');
+        $this->assertTrue($this->setField('tested_field', '2'));
+        $this->clickSubmitByName('send');
+        $this->assertEqual($this->getUrl(), $this->samples() . 'form_with_radio_buttons.html?tested_field=2&send=click+me');
+    }
+}
+
+class TestOfLiveFetching extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testFormWithArrayBasedInputs() {
+        $this->get($this->samples() . 'form_with_array_based_inputs.php');
+        $this->setField('value[]', '3', '1');
+        $this->setField('value[]', '4', '2');
+        $this->clickSubmit('Go');
+        $this->assertPattern('/QUERY_STRING : value%5B%5D=3&value%5B%5D=4&submit=Go/');
+    }
+
+    function testFormWithQuotedValues() {
+        $this->get($this->samples() . 'form_with_quoted_values.php');
+        $this->assertField('a', 'default');
+        $this->assertFieldById('text_field', 'default');
+        $this->clickSubmit('Go');
+        $this->assertPattern('/a=default&submit=Go/');
+    }
+
+    function testGet() {
+        $this->assertTrue($this->get($this->samples() . 'network_confirm.php'));
+        $this->assertEqual($this->getUrl(), $this->samples() . 'network_confirm.php');
+        $this->assertText('target for the SimpleTest');
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
+        $this->assertTitle('Simple test target file');
+        $this->assertTitle(new PatternExpectation('/target file/'));
+        $this->assertResponse(200);
+        $this->assertMime('text/html');
+        $this->assertHeader('connection', 'close');
+        $this->assertHeader('connection', new PatternExpectation('/los/'));
+    }
+
+    function testSlowGet() {
+        $this->assertTrue($this->get($this->samples() . 'slow_page.php'));
+    }
+
+    function testTimedOutGet() {
+        $this->setConnectionTimeout(1);
+        $this->ignoreErrors();
+        $this->assertFalse($this->get($this->samples() . 'slow_page.php'));
+    }
+
+    function testPost() {
+        $this->assertTrue($this->post($this->samples() . 'network_confirm.php'));
+        $this->assertText('target for the SimpleTest');
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+    }
+
+    function testGetWithData() {
+        $this->get($this->samples() . 'network_confirm.php', array("a" => "aaa"));
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
+        $this->assertText('a=[aaa]');
+    }
+
+    function testPostWithData() {
+        $this->post($this->samples() . 'network_confirm.php', array("a" => "aaa"));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('a=[aaa]');
+    }
+
+    function testPostWithRecursiveData() {
+        $this->post($this->samples() . 'network_confirm.php', array("a" => "aaa"));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('a=[aaa]');
+
+        $this->post($this->samples() . 'network_confirm.php', array("a[aa]" => "aaa"));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('a=[aa=[aaa]]');
+
+        $this->post($this->samples() . 'network_confirm.php', array("a[aa][aaa]" => "aaaa"));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('a=[aa=[aaa=[aaaa]]]');
+
+        $this->post($this->samples() . 'network_confirm.php', array("a" => array("aa" => "aaa")));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('a=[aa=[aaa]]');
+
+        $this->post($this->samples() . 'network_confirm.php', array("a" => array("aa" => array("aaa" => "aaaa"))));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('a=[aa=[aaa=[aaaa]]]');
+    }
+
+    function testRelativeGet() {
+        $this->get($this->samples() . 'link_confirm.php');
+        $this->assertTrue($this->get('network_confirm.php'));
+        $this->assertText('target for the SimpleTest');
+    }
+
+    function testRelativePost() {
+        $this->post($this->samples() . 'link_confirm.php', array('a' => '123'));
+        $this->assertTrue($this->post('network_confirm.php'));
+        $this->assertText('target for the SimpleTest');
+    }
+}
+
+class TestOfLinkFollowing extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testLinkAssertions() {
+        $this->get($this->samples() . 'link_confirm.php');
+        $this->assertLink('Absolute', $this->samples() . 'network_confirm.php');
+        $this->assertLink('Absolute', new PatternExpectation('/confirm/'));
+        $this->assertClickable('Absolute');
+    }
+
+    function testAbsoluteLinkFollowing() {
+        $this->get($this->samples() . 'link_confirm.php');
+        $this->assertTrue($this->clickLink('Absolute'));
+        $this->assertText('target for the SimpleTest');
+    }
+
+    function testRelativeLinkFollowing() {
+        $this->get($this->samples() . 'link_confirm.php');
+        $this->assertTrue($this->clickLink('Relative'));
+        $this->assertText('target for the SimpleTest');
+    }
+
+    function testLinkIdFollowing() {
+        $this->get($this->samples() . 'link_confirm.php');
+        $this->assertLinkById(1);
+        $this->assertTrue($this->clickLinkById(1));
+        $this->assertText('target for the SimpleTest');
+    }
+
+    function testAbsoluteUrlBehavesAbsolutely() {
+        $this->get($this->samples() . 'link_confirm.php');
+        $this->get('http://www.lastcraft.com');
+        $this->assertText('No guarantee of quality is given or even intended');
+    }
+
+    function testRelativeUrlRespectsBaseTag() {
+        $this->get($this->samples() . 'base_tag/base_link.html');
+        $this->click('Back to test pages');
+        $this->assertTitle('Simple test target file');
+    }
+}
+
+class TestOfLivePageLinkingWithMinimalLinks extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testClickToExplicitelyNamedSelfReturns() {
+        $this->get($this->samples() . 'front_controller_style/a_page.php');
+        $this->assertEqual($this->getUrl(), $this->samples() . 'front_controller_style/a_page.php');
+        $this->assertTitle('Simple test page with links');
+        $this->assertLink('Self');
+        $this->clickLink('Self');
+        $this->assertTitle('Simple test page with links');
+    }
+
+    function testClickToMissingPageReturnsToSamePage() {
+        $this->get($this->samples() . 'front_controller_style/a_page.php');
+        $this->clickLink('No page');
+        $this->assertTitle('Simple test page with links');
+        $this->assertText('[action=no_page]');
+    }
+
+    function testClickToBareActionReturnsToSamePage() {
+        $this->get($this->samples() . 'front_controller_style/a_page.php');
+        $this->clickLink('Bare action');
+        $this->assertTitle('Simple test page with links');
+        $this->assertText('[action=]');
+    }
+
+    function testClickToSingleQuestionMarkReturnsToSamePage() {
+        $this->get($this->samples() . 'front_controller_style/a_page.php');
+        $this->clickLink('Empty query');
+        $this->assertTitle('Simple test page with links');
+    }
+
+    function testClickToEmptyStringReturnsToSamePage() {
+        $this->get($this->samples() . 'front_controller_style/a_page.php');
+        $this->clickLink('Empty link');
+        $this->assertTitle('Simple test page with links');
+    }
+
+    function testClickToSingleDotGoesToCurrentDirectory() {
+        $this->get($this->samples() . 'front_controller_style/a_page.php');
+        $this->clickLink('Current directory');
+        $this->assertTitle(
+                'Simple test front controller',
+                '%s -> index.php needs to be set as a default web server home page');
+    }
+
+    function testClickBackADirectoryLevel() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->clickLink('Down one');
+        $this->assertPattern('|Index of .*?/test|i');
+    }
+}
+
+class TestOfLiveFrontControllerEmulation extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testJumpToNamedPage() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->assertText('Simple test front controller');
+        $this->clickLink('Index');
+        $this->assertResponse(200);
+        $this->assertText('[action=index]');
+    }
+
+    function testJumpToUnnamedPage() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->clickLink('No page');
+        $this->assertResponse(200);
+        $this->assertText('Simple test front controller');
+        $this->assertText('[action=no_page]');
+    }
+
+    function testJumpToUnnamedPageWithBareParameter() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->clickLink('Bare action');
+        $this->assertResponse(200);
+        $this->assertText('Simple test front controller');
+        $this->assertText('[action=]');
+    }
+
+    function testJumpToUnnamedPageWithEmptyQuery() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->clickLink('Empty query');
+        $this->assertResponse(200);
+        $this->assertPattern('/Simple test front controller/');
+        $this->assertPattern('/raw get data.*?\[\].*?get data/si');
+    }
+
+    function testJumpToUnnamedPageWithEmptyLink() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->clickLink('Empty link');
+        $this->assertResponse(200);
+        $this->assertPattern('/Simple test front controller/');
+        $this->assertPattern('/raw get data.*?\[\].*?get data/si');
+    }
+
+    function testJumpBackADirectoryLevel() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->clickLink('Down one');
+        $this->assertPattern('|Index of .*?/test|');
+    }
+
+    function testSubmitToNamedPage() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->assertText('Simple test front controller');
+        $this->clickSubmit('Index');
+        $this->assertResponse(200);
+        $this->assertText('[action=Index]');
+    }
+
+    function testSubmitToSameDirectory() {
+        $this->get($this->samples() . 'front_controller_style/index.php');
+        $this->clickSubmit('Same directory');
+        $this->assertResponse(200);
+        $this->assertText('[action=Same+directory]');
+    }
+
+    function testSubmitToEmptyAction() {
+        $this->get($this->samples() . 'front_controller_style/index.php');
+        $this->clickSubmit('Empty action');
+        $this->assertResponse(200);
+        $this->assertText('[action=Empty+action]');
+    }
+
+    function testSubmitToNoAction() {
+        $this->get($this->samples() . 'front_controller_style/index.php');
+        $this->clickSubmit('No action');
+        $this->assertResponse(200);
+        $this->assertText('[action=No+action]');
+    }
+
+    function testSubmitBackADirectoryLevel() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->clickSubmit('Down one');
+        $this->assertPattern('|Index of .*?/test|');
+    }
+
+    function testSubmitToNamedPageWithMixedPostAndGet() {
+        $this->get($this->samples() . 'front_controller_style/?a=A');
+        $this->assertText('Simple test front controller');
+        $this->clickSubmit('Index post');
+        $this->assertText('action=[Index post]');
+        $this->assertNoText('[a=A]');
+    }
+
+    function testSubmitToSameDirectoryMixedPostAndGet() {
+        $this->get($this->samples() . 'front_controller_style/index.php?a=A');
+        $this->clickSubmit('Same directory post');
+        $this->assertText('action=[Same directory post]');
+        $this->assertNoText('[a=A]');
+    }
+
+    function testSubmitToEmptyActionMixedPostAndGet() {
+        $this->get($this->samples() . 'front_controller_style/index.php?a=A');
+        $this->clickSubmit('Empty action post');
+        $this->assertText('action=[Empty action post]');
+        $this->assertText('[a=A]');
+    }
+
+    function testSubmitToNoActionMixedPostAndGet() {
+        $this->get($this->samples() . 'front_controller_style/index.php?a=A');
+        $this->clickSubmit('No action post');
+        $this->assertText('action=[No action post]');
+        $this->assertText('[a=A]');
+    }
+}
+
+class TestOfLiveHeaders extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testConfirmingHeaderExistence() {
+        $this->get('http://www.lastcraft.com/');
+        $this->assertHeader('content-type');
+        $this->assertHeader('content-type', 'text/html');
+        $this->assertHeader('content-type', new PatternExpectation('/HTML/i'));
+        $this->assertNoHeader('WWW-Authenticate');
+    }
+}
+
+class TestOfLiveRedirects extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testNoRedirects() {
+        $this->setMaximumRedirects(0);
+        $this->get($this->samples() . 'redirect.php');
+        $this->assertTitle('Redirection test');
+    }
+
+    function testRedirects() {
+        $this->setMaximumRedirects(1);
+        $this->get($this->samples() . 'redirect.php');
+        $this->assertTitle('Simple test target file');
+    }
+
+    function testRedirectLosesGetData() {
+        $this->get($this->samples() . 'redirect.php', array('a' => 'aaa'));
+        $this->assertNoText('a=[aaa]');
+    }
+
+    function testRedirectKeepsExtraRequestDataOfItsOwn() {
+        $this->get($this->samples() . 'redirect.php');
+        $this->assertText('r=[rrr]');
+    }
+
+    function testRedirectLosesPostData() {
+        $this->post($this->samples() . 'redirect.php', array('a' => 'aaa'));
+        $this->assertTitle('Simple test target file');
+        $this->assertNoText('a=[aaa]');
+    }
+
+    function testRedirectWithBaseUrlChange() {
+        $this->get($this->samples() . 'base_change_redirect.php');
+        $this->assertTitle('Simple test target file in folder');
+        $this->get($this->samples() . 'path/base_change_redirect.php');
+        $this->assertTitle('Simple test target file');
+    }
+
+    function testRedirectWithDoubleBaseUrlChange() {
+        $this->get($this->samples() . 'double_base_change_redirect.php');
+        $this->assertTitle('Simple test target file');
+    }
+}
+
+class TestOfLiveCookies extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function here() {
+        return new SimpleUrl($this->samples());
+    }
+
+    function thisHost() {
+        $here = $this->here();
+        return $here->getHost();
+    }
+
+    function thisPath() {
+        $here = $this->here();
+        return $here->getPath();
+    }
+
+    function testCookieSettingAndAssertions() {
+        $this->setCookie('a', 'Test cookie a');
+        $this->setCookie('b', 'Test cookie b', $this->thisHost());
+        $this->setCookie('c', 'Test cookie c', $this->thisHost(), $this->thisPath());
+        $this->get($this->samples() . 'network_confirm.php');
+        $this->assertText('Test cookie a');
+        $this->assertText('Test cookie b');
+        $this->assertText('Test cookie c');
+        $this->assertCookie('a');
+        $this->assertCookie('b', 'Test cookie b');
+        $this->assertTrue($this->getCookie('c') == 'Test cookie c');
+    }
+
+    function testNoCookieSetWhenCookiesDisabled() {
+        $this->setCookie('a', 'Test cookie a');
+        $this->ignoreCookies();
+        $this->get($this->samples() . 'network_confirm.php');
+        $this->assertNoText('Test cookie a');
+    }
+
+    function testCookieReading() {
+        $this->get($this->samples() . 'set_cookies.php');
+        $this->assertCookie('session_cookie', 'A');
+        $this->assertCookie('short_cookie', 'B');
+        $this->assertCookie('day_cookie', 'C');
+    }
+
+    function testNoCookie() {
+        $this->assertNoCookie('aRandomCookie');
+    }
+
+    function testNoCookieReadingWhenCookiesDisabled() {
+        $this->ignoreCookies();
+        $this->get($this->samples() . 'set_cookies.php');
+        $this->assertNoCookie('session_cookie');
+        $this->assertNoCookie('short_cookie');
+        $this->assertNoCookie('day_cookie');
+    }
+
+    function testCookiePatternAssertions() {
+        $this->get($this->samples() . 'set_cookies.php');
+        $this->assertCookie('session_cookie', new PatternExpectation('/a/i'));
+    }
+
+    function testTemporaryCookieExpiry() {
+        $this->get($this->samples() . 'set_cookies.php');
+        $this->restart();
+        $this->assertNoCookie('session_cookie');
+        $this->assertCookie('day_cookie', 'C');
+    }
+
+    function testTimedCookieExpiryWith100SecondMargin() {
+        $this->get($this->samples() . 'set_cookies.php');
+        $this->ageCookies(3600);
+        $this->restart(time() + 100);
+        $this->assertNoCookie('session_cookie');
+        $this->assertNoCookie('hour_cookie');
+        $this->assertCookie('day_cookie', 'C');
+    }
+
+    function testNoClockOverDriftBy100Seconds() {
+        $this->get($this->samples() . 'set_cookies.php');
+        $this->restart(time() + 200);
+        $this->assertNoCookie(
+                'short_cookie',
+                '%s -> Please check your computer clock setting if you are not using NTP');
+    }
+
+    function testNoClockUnderDriftBy100Seconds() {
+        $this->get($this->samples() . 'set_cookies.php');
+        $this->restart(time() + 0);
+        $this->assertCookie(
+                'short_cookie',
+                'B',
+                '%s -> Please check your computer clock setting if you are not using NTP');
+    }
+
+    function testCookiePath() {
+        $this->get($this->samples() . 'set_cookies.php');
+        $this->assertNoCookie('path_cookie', 'D');
+        $this->get('./path/show_cookies.php');
+        $this->assertPattern('/path_cookie/');
+        $this->assertCookie('path_cookie', 'D');
+    }
+}
+
+class LiveTestOfForms extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testSimpleSubmit() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('go=[Go!]');
+    }
+
+    function testDefaultFormValues() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertFieldByName('a', '');
+        $this->assertFieldByName('b', 'Default text');
+        $this->assertFieldByName('c', '');
+        $this->assertFieldByName('d', 'd1');
+        $this->assertFieldByName('e', false);
+        $this->assertFieldByName('f', 'on');
+        $this->assertFieldByName('g', 'g3');
+        $this->assertFieldByName('h', 2);
+        $this->assertFieldByName('go', 'Go!');
+        $this->assertClickable('Go!');
+        $this->assertSubmit('Go!');
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('go=[Go!]');
+        $this->assertText('a=[]');
+        $this->assertText('b=[Default text]');
+        $this->assertText('c=[]');
+        $this->assertText('d=[d1]');
+        $this->assertNoText('e=[');
+        $this->assertText('f=[on]');
+        $this->assertText('g=[g3]');
+    }
+
+    function testFormSubmissionByButtonLabel() {
+        $this->get($this->samples() . 'form.html');
+        $this->setFieldByName('a', 'aaa');
+        $this->setFieldByName('b', 'bbb');
+        $this->setFieldByName('c', 'ccc');
+        $this->setFieldByName('d', 'D2');
+        $this->setFieldByName('e', 'on');
+        $this->setFieldByName('f', false);
+        $this->setFieldByName('g', 'g2');
+        $this->setFieldByName('h', 1);
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('a=[aaa]');
+        $this->assertText('b=[bbb]');
+        $this->assertText('c=[ccc]');
+        $this->assertText('d=[d2]');
+        $this->assertText('e=[on]');
+        $this->assertNoText('f=[');
+        $this->assertText('g=[g2]');
+    }
+
+    function testAdditionalFormValues() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickSubmit('Go!', array('add' => 'A')));
+        $this->assertText('go=[Go!]');
+        $this->assertText('add=[A]');
+    }
+
+    function testFormSubmissionByName() {
+        $this->get($this->samples() . 'form.html');
+        $this->setFieldByName('a', 'A');
+        $this->assertTrue($this->clickSubmitByName('go'));
+        $this->assertText('a=[A]');
+    }
+
+    function testFormSubmissionByNameAndAdditionalParameters() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickSubmitByName('go', array('add' => 'A')));
+        $this->assertText('go=[Go!]');
+        $this->assertText('add=[A]');
+    }
+
+    function testFormSubmissionBySubmitButtonLabeledSubmit() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickSubmitByName('test'));
+        $this->assertText('test=[Submit]');
+    }
+
+    function testFormSubmissionWithIds() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertFieldById(1, '');
+        $this->assertFieldById(2, 'Default text');
+        $this->assertFieldById(3, '');
+        $this->assertFieldById(4, 'd1');
+        $this->assertFieldById(5, false);
+        $this->assertFieldById(6, 'on');
+        $this->assertFieldById(8, 'g3');
+        $this->assertFieldById(11, 2);
+        $this->setFieldById(1, 'aaa');
+        $this->setFieldById(2, 'bbb');
+        $this->setFieldById(3, 'ccc');
+        $this->setFieldById(4, 'D2');
+        $this->setFieldById(5, 'on');
+        $this->setFieldById(6, false);
+        $this->setFieldById(8, 'g2');
+        $this->setFieldById(11, 'H1');
+        $this->assertTrue($this->clickSubmitById(99));
+        $this->assertText('a=[aaa]');
+        $this->assertText('b=[bbb]');
+        $this->assertText('c=[ccc]');
+        $this->assertText('d=[d2]');
+        $this->assertText('e=[on]');
+        $this->assertNoText('f=[');
+        $this->assertText('g=[g2]');
+        $this->assertText('h=[1]');
+        $this->assertText('go=[Go!]');
+    }
+
+    function testFormSubmissionWithIdsAndAdditionnalData() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickSubmitById(99, array('additionnal' => "data")));
+        $this->assertText('additionnal=[data]');
+    }
+
+    function testFormSubmissionWithLabels() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertField('Text A', '');
+        $this->assertField('Text B', 'Default text');
+        $this->assertField('Text area C', '');
+        $this->assertField('Selection D', 'd1');
+        $this->assertField('Checkbox E', false);
+        $this->assertField('Checkbox F', 'on');
+        $this->assertField('3', 'g3');
+        $this->assertField('Selection H', 2);
+        $this->setField('Text A', 'aaa');
+        $this->setField('Text B', 'bbb');
+        $this->setField('Text area C', 'ccc');
+        $this->setField('Selection D', 'D2');
+        $this->setField('Checkbox E', 'on');
+        $this->setField('Checkbox F', false);
+        $this->setField('2', 'g2');
+        $this->setField('Selection H', 'H1');
+        $this->clickSubmit('Go!');
+        $this->assertText('a=[aaa]');
+        $this->assertText('b=[bbb]');
+        $this->assertText('c=[ccc]');
+        $this->assertText('d=[d2]');
+        $this->assertText('e=[on]');
+        $this->assertNoText('f=[');
+        $this->assertText('g=[g2]');
+        $this->assertText('h=[1]');
+        $this->assertText('go=[Go!]');
+    }
+
+    function testSettingCheckboxWithBooleanTrueSetsUnderlyingValue() {
+        $this->get($this->samples() . 'form.html');
+        $this->setField('Checkbox E', true);
+        $this->assertField('Checkbox E', 'on');
+        $this->clickSubmit('Go!');
+        $this->assertText('e=[on]');
+    }
+
+    function testFormSubmissionWithMixedPostAndGet() {
+        $this->get($this->samples() . 'form_with_mixed_post_and_get.html');
+        $this->setField('Text A', 'Hello');
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('a=[Hello]');
+        $this->assertText('x=[X]');
+        $this->assertText('y=[Y]');
+    }
+
+    function testFormSubmissionWithMixedPostAndEncodedGet() {
+        $this->get($this->samples() . 'form_with_mixed_post_and_get.html');
+        $this->setField('Text B', 'Hello');
+        $this->assertTrue($this->clickSubmit('Go encoded!'));
+        $this->assertText('b=[Hello]');
+        $this->assertText('x=[X]');
+        $this->assertText('y=[Y]');
+    }
+
+    function testFormSubmissionWithoutAction() {
+        $this->get($this->samples() . 'form_without_action.php?test=test');
+        $this->assertText('_GET : [test]');
+        $this->assertTrue($this->clickSubmit('Submit Post With Empty Action'));
+        $this->assertText('_GET : [test]');
+        $this->assertText('_POST : [test]');
+    }
+
+    function testImageSubmissionByLabel() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertImage('Image go!');
+        $this->assertTrue($this->clickImage('Image go!', 10, 12));
+        $this->assertText('go_x=[10]');
+        $this->assertText('go_y=[12]');
+    }
+
+    function testImageSubmissionByLabelWithAdditionalParameters() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickImage('Image go!', 10, 12, array('add' => 'A')));
+        $this->assertText('add=[A]');
+    }
+
+    function testImageSubmissionByName() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickImageByName('go', 10, 12));
+        $this->assertText('go_x=[10]');
+        $this->assertText('go_y=[12]');
+    }
+
+    function testImageSubmissionById() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickImageById(97, 10, 12));
+        $this->assertText('go_x=[10]');
+        $this->assertText('go_y=[12]');
+    }
+
+    function testButtonSubmissionByLabel() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickSubmit('Button go!', 10, 12));
+        $this->assertPattern('/go=\[ButtonGo\]/s');
+    }
+
+    function testNamelessSubmitSendsNoValue() {
+        $this->get($this->samples() . 'form_with_unnamed_submit.html');
+        $this->click('Go!');
+        $this->assertNoText('Go!');
+        $this->assertNoText('submit');
+    }
+
+    function testNamelessImageSendsXAndYValues() {
+        $this->get($this->samples() . 'form_with_unnamed_submit.html');
+        $this->clickImage('Image go!', 4, 5);
+        $this->assertNoText('ImageGo');
+        $this->assertText('x=[4]');
+        $this->assertText('y=[5]');
+    }
+
+    function testNamelessButtonSendsNoValue() {
+        $this->get($this->samples() . 'form_with_unnamed_submit.html');
+        $this->click('Button Go!');
+        $this->assertNoText('ButtonGo');
+    }
+
+    function testSelfSubmit() {
+        $this->get($this->samples() . 'self_form.php');
+        $this->assertNoText('[Submitted]');
+        $this->assertNoText('[Wrong form]');
+        $this->assertTrue($this->clickSubmit());
+        $this->assertText('[Submitted]');
+        $this->assertNoText('[Wrong form]');
+        $this->assertTitle('Test of form self submission');
+    }
+
+    function testSelfSubmitWithParameters() {
+        $this->get($this->samples() . 'self_form.php');
+        $this->setFieldByName('visible', 'Resent');
+        $this->assertTrue($this->clickSubmit());
+        $this->assertText('[Resent]');
+    }
+
+    function testSettingOfBlankOption() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->setFieldByName('d', ''));
+        $this->clickSubmit('Go!');
+        $this->assertText('d=[]');
+    }
+
+    function testAssertingFieldValueWithPattern() {
+        $this->get($this->samples() . 'form.html');
+        $this->setField('c', 'A very long string');
+        $this->assertField('c', new PatternExpectation('/very long/'));
+    }
+
+    function testSendingMultipartFormDataEncodedForm() {
+        $this->get($this->samples() . 'form_data_encoded_form.html');
+        $this->assertField('Text A', '');
+        $this->assertField('Text B', 'Default text');
+        $this->assertField('Text area C', '');
+        $this->assertField('Selection D', 'd1');
+        $this->assertField('Checkbox E', false);
+        $this->assertField('Checkbox F', 'on');
+        $this->assertField('3', 'g3');
+        $this->assertField('Selection H', 2);
+        $this->setField('Text A', 'aaa');
+        $this->setField('Text B', 'bbb');
+        $this->setField('Text area C', 'ccc');
+        $this->setField('Selection D', 'D2');
+        $this->setField('Checkbox E', 'on');
+        $this->setField('Checkbox F', false);
+        $this->setField('2', 'g2');
+        $this->setField('Selection H', 'H1');
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('a=[aaa]');
+        $this->assertText('b=[bbb]');
+        $this->assertText('c=[ccc]');
+        $this->assertText('d=[d2]');
+        $this->assertText('e=[on]');
+        $this->assertNoText('f=[');
+        $this->assertText('g=[g2]');
+        $this->assertText('h=[1]');
+        $this->assertText('go=[Go!]');
+    }
+
+    function testSettingVariousBlanksInFields() {
+        $this->get($this->samples() . 'form_with_false_defaults.html');
+        $this->assertField('Text A', '');
+        $this->setField('Text A', '0');
+        $this->assertField('Text A', '0');
+        $this->assertField('Text area B', '');
+        $this->setField('Text area B', '0');
+        $this->assertField('Text area B', '0');
+        $this->assertField('Selection D', '');
+        $this->setField('Selection D', 'D2');
+        $this->assertField('Selection D', 'D2');
+        $this->setField('Selection D', 'D3');
+        $this->assertField('Selection D', '0');
+        $this->setField('Selection D', 'D4');
+        $this->assertField('Selection D', '?');
+        $this->assertField('Checkbox E', '');
+        $this->assertField('Checkbox F', 'on');
+        $this->assertField('Checkbox G', '0');
+        $this->assertField('Checkbox H', '?');
+        $this->assertFieldByName('i', 'on');
+        $this->setFieldByName('i', '');
+        $this->assertFieldByName('i', '');
+        $this->setFieldByName('i', '0');
+        $this->assertFieldByName('i', '0');
+        $this->setFieldByName('i', '?');
+        $this->assertFieldByName('i', '?');
+    }
+
+    function testDefaultValueOfTextareaHasNewlinesAndWhitespacePreserved() {
+        $this->get($this->samples() . 'form_with_false_defaults.html');
+        $this->assertField('Text area C', '                ');
+    }
+
+    function chars($t) {
+        for ($i = 0; $i < strlen($t); $i++) {
+            print "[$t[$i]]";
+        }
+    }
+
+    function testSubmissionOfBlankFields() {
+        $this->get($this->samples() . 'form_with_false_defaults.html');
+        $this->setField('Text A', '');
+        $this->setField('Text area B', '');
+        $this->setFieldByName('i', '');
+        $this->click('Go!');
+        $this->assertText('a=[]');
+        $this->assertText('b=[]');
+        $this->assertText('d=[]');
+        $this->assertText('e=[]');
+        $this->assertText('i=[]');
+    }
+
+    function testDefaultValueOfTextareaHasNewlinesAndWhitespacePreservedOnSubmission() {
+        $this->get($this->samples() . 'form_with_false_defaults.html');
+        $this->click('Go!');
+        $this->assertPattern('/c=\[                \]/');
+    }
+
+    function testSubmissionOfEmptyValues() {
+        $this->get($this->samples() . 'form_with_false_defaults.html');
+        $this->setField('Selection D', 'D2');
+        $this->click('Go!');
+        $this->assertText('a=[]');
+        $this->assertText('b=[]');
+        $this->assertText('d=[D2]');
+        $this->assertText('f=[on]');
+        $this->assertText('i=[on]');
+    }
+
+    function testSubmissionOfZeroes() {
+        $this->get($this->samples() . 'form_with_false_defaults.html');
+        $this->setField('Text A', '0');
+        $this->setField('Text area B', '0');
+        $this->setField('Selection D', 'D3');
+        $this->setFieldByName('i', '0');
+        $this->click('Go!');
+        $this->assertText('a=[0]');
+        $this->assertText('b=[0]');
+        $this->assertText('d=[0]');
+        $this->assertText('g=[0]');
+        $this->assertText('i=[0]');
+    }
+
+    function testSubmissionOfQuestionMarks() {
+        $this->get($this->samples() . 'form_with_false_defaults.html');
+        $this->setField('Text A', '?');
+        $this->setField('Text area B', '?');
+        $this->setField('Selection D', 'D4');
+        $this->setFieldByName('i', '?');
+        $this->click('Go!');
+        $this->assertText('a=[?]');
+        $this->assertText('b=[?]');
+        $this->assertText('d=[?]');
+        $this->assertText('h=[?]');
+        $this->assertText('i=[?]');
+    }
+
+    function testSubmissionOfHtmlEncodedValues() {
+        $this->get($this->samples() . 'form_with_tricky_defaults.html');
+        $this->assertField('Text A', '&\'"<>');
+        $this->assertField('Text B', '"');
+        $this->assertField('Text area C', '&\'"<>');
+        $this->assertField('Selection D', "'");
+        $this->assertField('Checkbox E', '&\'"<>');
+        $this->assertField('Checkbox F', false);
+        $this->assertFieldByname('i', "'");
+        $this->click('Go!');
+        $this->assertText('a=[&\'"<>, "]');
+        $this->assertText('c=[&\'"<>]');
+        $this->assertText("d=[']");
+        $this->assertText('e=[&\'"<>]');
+        $this->assertText("i=[']");
+    }
+
+    function testFormActionRespectsBaseTag() {
+        $this->get($this->samples() . 'base_tag/form.html');
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('go=[Go!]');
+        $this->assertText('a=[]');
+    }
+}
+
+class TestOfLiveMultiValueWidgets extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testDefaultFormValueSubmission() {
+        $this->get($this->samples() . 'multiple_widget_form.html');
+        $this->assertFieldByName('a', array('a2', 'a3'));
+        $this->assertFieldByName('b', array('b2', 'b3'));
+        $this->assertFieldByName('c[]', array('c2', 'c3'));
+        $this->assertFieldByName('d', array('2', '3'));
+        $this->assertFieldByName('e', array('2', '3'));
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('a=[a2, a3]');
+        $this->assertText('b=[b2, b3]');
+        $this->assertText('c=[c2, c3]');
+        $this->assertText('d=[2, 3]');
+        $this->assertText('e=[2, 3]');
+    }
+
+    function testSubmittingMultipleValues() {
+        $this->get($this->samples() . 'multiple_widget_form.html');
+        $this->setFieldByName('a', array('a1', 'a4'));
+        $this->assertFieldByName('a', array('a1', 'a4'));
+        $this->assertFieldByName('a', array('a4', 'a1'));
+        $this->setFieldByName('b', array('b1', 'b4'));
+        $this->assertFieldByName('b', array('b1', 'b4'));
+        $this->setFieldByName('c[]', array('c1', 'c4'));
+        $this->assertField('c[]', array('c1', 'c4'));
+        $this->setFieldByName('d', array('1', '4'));
+        $this->assertField('d', array('1', '4'));
+        $this->setFieldByName('e', array('e1', 'e4'));
+        $this->assertField('e', array('1', '4'));
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('a=[a1, a4]');
+        $this->assertText('b=[b1, b4]');
+        $this->assertText('c=[c1, c4]');
+        $this->assertText('d=[1, 4]');
+        $this->assertText('e=[1, 4]');
+    }
+
+    function testSettingByOptionValue() {
+        $this->get($this->samples() . 'multiple_widget_form.html');
+        $this->setFieldByName('d', array('1', '4'));
+        $this->assertField('d', array('1', '4'));
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('d=[1, 4]');
+    }
+
+    function testSubmittingMultipleValuesByLabel() {
+        $this->get($this->samples() . 'multiple_widget_form.html');
+        $this->setField('Multiple selection A', array('a1', 'a4'));
+        $this->assertField('Multiple selection A', array('a1', 'a4'));
+        $this->assertField('Multiple selection A', array('a4', 'a1'));
+        $this->setField('multiple selection C', array('c1', 'c4'));
+        $this->assertField('multiple selection C', array('c1', 'c4'));
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('a=[a1, a4]');
+        $this->assertText('c=[c1, c4]');
+    }
+
+    function testSavantStyleHiddenFieldDefaults() {
+        $this->get($this->samples() . 'savant_style_form.html');
+        $this->assertFieldByName('a', array('a0'));
+        $this->assertFieldByName('b', array('b0'));
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('a=[a0]');
+        $this->assertText('b=[b0]');
+    }
+
+    function testSavantStyleHiddenDefaultsAreOverridden() {
+        $this->get($this->samples() . 'savant_style_form.html');
+        $this->assertTrue($this->setFieldByName('a', array('a1')));
+        $this->assertTrue($this->setFieldByName('b', 'b1'));
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('a=[a1]');
+        $this->assertText('b=[b1]');
+    }
+
+    function testSavantStyleFormSettingById() {
+        $this->get($this->samples() . 'savant_style_form.html');
+        $this->assertFieldById(1, array('a0'));
+        $this->assertFieldById(4, array('b0'));
+        $this->assertTrue($this->setFieldById(2, 'a1'));
+        $this->assertTrue($this->setFieldById(5, 'b1'));
+        $this->assertTrue($this->clickSubmitById(99));
+        $this->assertText('a=[a1]');
+        $this->assertText('b=[b1]');
+    }
+}
+
+class TestOfFileUploads extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testSingleFileUpload() {
+        $this->get($this->samples() . 'upload_form.html');
+        $this->assertTrue($this->setField('Content:',
+                dirname(__FILE__) . '/support/upload_sample.txt'));
+        $this->assertField('Content:', dirname(__FILE__) . '/support/upload_sample.txt');
+        $this->click('Go!');
+        $this->assertText('Sample for testing file upload');
+    }
+
+    function testMultipleFileUpload() {
+        $this->get($this->samples() . 'upload_form.html');
+        $this->assertTrue($this->setField('Content:',
+                dirname(__FILE__) . '/support/upload_sample.txt'));
+        $this->assertTrue($this->setField('Supplemental:',
+                dirname(__FILE__) . '/support/supplementary_upload_sample.txt'));
+        $this->assertField('Supplemental:',
+                dirname(__FILE__) . '/support/supplementary_upload_sample.txt');
+        $this->click('Go!');
+        $this->assertText('Sample for testing file upload');
+        $this->assertText('Some more text content');
+    }
+
+    function testBinaryFileUpload() {
+        $this->get($this->samples() . 'upload_form.html');
+        $this->assertTrue($this->setField('Content:',
+                dirname(__FILE__) . '/support/latin1_sample'));
+        $this->click('Go!');
+        $this->assertText(
+                implode('', file(dirname(__FILE__) . '/support/latin1_sample')));
+    }
+}
+
+class TestOfLiveHistoryNavigation extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testRetry() {
+        $this->get($this->samples() . 'cookie_based_counter.php');
+        $this->assertPattern('/count: 1/i');
+        $this->retry();
+        $this->assertPattern('/count: 2/i');
+        $this->retry();
+        $this->assertPattern('/count: 3/i');
+    }
+
+    function testOfBackButton() {
+        $this->get($this->samples() . '1.html');
+        $this->clickLink('2');
+        $this->assertTitle('2');
+        $this->assertTrue($this->back());
+        $this->assertTitle('1');
+        $this->assertTrue($this->forward());
+        $this->assertTitle('2');
+        $this->assertFalse($this->forward());
+    }
+
+    function testGetRetryResubmitsData() {
+        $this->assertTrue($this->get(
+                $this->samples() . 'network_confirm.php?a=aaa'));
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
+        $this->assertText('a=[aaa]');
+        $this->retry();
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
+        $this->assertText('a=[aaa]');
+    }
+
+    function testGetRetryResubmitsExtraData() {
+        $this->assertTrue($this->get(
+                $this->samples() . 'network_confirm.php',
+                array('a' => 'aaa')));
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
+        $this->assertText('a=[aaa]');
+        $this->retry();
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
+        $this->assertText('a=[aaa]');
+    }
+
+    function testPostRetryResubmitsData() {
+        $this->assertTrue($this->post(
+                $this->samples() . 'network_confirm.php',
+                array('a' => 'aaa')));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('a=[aaa]');
+        $this->retry();
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('a=[aaa]');
+    }
+
+    function testGetRetryResubmitsRepeatedData() {
+        $this->assertTrue($this->get(
+                $this->samples() . 'network_confirm.php?a=1&a=2'));
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
+        $this->assertText('a=[1, 2]');
+        $this->retry();
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
+        $this->assertText('a=[1, 2]');
+    }
+}
+
+class TestOfLiveAuthentication extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testChallengeFromProtectedPage() {
+        $this->get($this->samples() . 'protected/');
+        $this->assertResponse(401);
+        $this->assertAuthentication('Basic');
+        $this->assertRealm('SimpleTest basic authentication');
+        $this->assertRealm(new PatternExpectation('/simpletest/i'));
+        $this->authenticate('test', 'secret');
+        $this->assertResponse(200);
+        $this->retry();
+        $this->assertResponse(200);
+    }
+
+    function testTrailingSlashImpliedWithinRealm() {
+        $this->get($this->samples() . 'protected/');
+        $this->authenticate('test', 'secret');
+        $this->assertResponse(200);
+        $this->get($this->samples() . 'protected');
+        $this->assertResponse(200);
+    }
+
+    function testTrailingSlashImpliedSettingRealm() {
+        $this->get($this->samples() . 'protected');
+        $this->authenticate('test', 'secret');
+        $this->assertResponse(200);
+        $this->get($this->samples() . 'protected/');
+        $this->assertResponse(200);
+    }
+
+    function testEncodedAuthenticationFetchesPage() {
+        $this->get('http://test:secret@www.lastcraft.com/test/protected/');
+        $this->assertResponse(200);
+    }
+
+    function testEncodedAuthenticationFetchesPageAfterTrailingSlashRedirect() {
+        $this->get('http://test:secret@www.lastcraft.com/test/protected');
+        $this->assertResponse(200);
+    }
+
+    function testRealmExtendsToWholeDirectory() {
+        $this->get($this->samples() . 'protected/1.html');
+        $this->authenticate('test', 'secret');
+        $this->clickLink('2');
+        $this->assertResponse(200);
+        $this->clickLink('3');
+        $this->assertResponse(200);
+    }
+
+    function testRedirectKeepsAuthentication() {
+        $this->get($this->samples() . 'protected/local_redirect.php');
+        $this->authenticate('test', 'secret');
+        $this->assertTitle('Simple test target file');
+    }
+
+    function testRedirectKeepsEncodedAuthentication() {
+        $this->get('http://test:secret@www.lastcraft.com/test/protected/local_redirect.php');
+        $this->assertResponse(200);
+        $this->assertTitle('Simple test target file');
+    }
+
+    function testSessionRestartLosesAuthentication() {
+        $this->get($this->samples() . 'protected/');
+        $this->authenticate('test', 'secret');
+        $this->assertResponse(200);
+        $this->restart();
+        $this->get($this->samples() . 'protected/');
+        $this->assertResponse(401);
+    }
+}
+
+class TestOfLoadingFrames extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testNoFramesContentWhenFramesDisabled() {
+        $this->ignoreFrames();
+        $this->get($this->samples() . 'one_page_frameset.html');
+        $this->assertTitle('Frameset for testing of SimpleTest');
+        $this->assertText('This content is for no frames only');
+    }
+
+    function testPatternMatchCanReadTheOnlyFrame() {
+        $this->get($this->samples() . 'one_page_frameset.html');
+        $this->assertText('A target for the SimpleTest test suite');
+        $this->assertNoText('This content is for no frames only');
+    }
+
+    function testMessyFramesetResponsesByName() {
+        $this->assertTrue($this->get(
+                $this->samples() . 'messy_frameset.html'));
+        $this->assertTitle('Frameset for testing of SimpleTest');
+
+        $this->assertTrue($this->setFrameFocus('Front controller'));
+        $this->assertResponse(200);
+        $this->assertText('Simple test front controller');
+
+        $this->assertTrue($this->setFrameFocus('One'));
+        $this->assertResponse(200);
+        $this->assertLink('2');
+
+        $this->assertTrue($this->setFrameFocus('Frame links'));
+        $this->assertResponse(200);
+        $this->assertLink('Set one to 2');
+
+        $this->assertTrue($this->setFrameFocus('Counter'));
+        $this->assertResponse(200);
+        $this->assertText('Count: 1');
+
+        $this->assertTrue($this->setFrameFocus('Redirected'));
+        $this->assertResponse(200);
+        $this->assertText('r=rrr');
+
+        $this->assertTrue($this->setFrameFocus('Protected'));
+        $this->assertResponse(401);
+
+        $this->assertTrue($this->setFrameFocus('Protected redirect'));
+        $this->assertResponse(401);
+
+        $this->assertTrue($this->setFrameFocusByIndex(1));
+        $this->assertResponse(200);
+        $this->assertText('Simple test front controller');
+
+        $this->assertTrue($this->setFrameFocusByIndex(2));
+        $this->assertResponse(200);
+        $this->assertLink('2');
+
+        $this->assertTrue($this->setFrameFocusByIndex(3));
+        $this->assertResponse(200);
+        $this->assertLink('Set one to 2');
+
+        $this->assertTrue($this->setFrameFocusByIndex(4));
+        $this->assertResponse(200);
+        $this->assertText('Count: 1');
+
+        $this->assertTrue($this->setFrameFocusByIndex(5));
+        $this->assertResponse(200);
+        $this->assertText('r=rrr');
+
+        $this->assertTrue($this->setFrameFocusByIndex(6));
+        $this->assertResponse(401);
+
+        $this->assertTrue($this->setFrameFocusByIndex(7));
+    }
+
+    function testReloadingFramesetPage() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->assertText('Count: 1');
+        $this->retry();
+        $this->assertText('Count: 2');
+        $this->retry();
+        $this->assertText('Count: 3');
+    }
+
+    function testReloadingSingleFrameWithCookieCounter() {
+        $this->get($this->samples() . 'counting_frameset.html');
+        $this->setFrameFocus('a');
+        $this->assertText('Count: 1');
+        $this->setFrameFocus('b');
+        $this->assertText('Count: 2');
+
+        $this->setFrameFocus('a');
+        $this->retry();
+        $this->assertText('Count: 3');
+        $this->retry();
+        $this->assertText('Count: 4');
+        $this->setFrameFocus('b');
+        $this->assertText('Count: 2');
+    }
+
+    function testReloadingFrameWhenUnfocusedReloadsWholeFrameset() {
+        $this->get($this->samples() . 'counting_frameset.html');
+        $this->setFrameFocus('a');
+        $this->assertText('Count: 1');
+        $this->setFrameFocus('b');
+        $this->assertText('Count: 2');
+
+        $this->clearFrameFocus('a');
+        $this->retry();
+
+        $this->assertTitle('Frameset for testing of SimpleTest');
+        $this->setFrameFocus('a');
+        $this->assertText('Count: 3');
+        $this->setFrameFocus('b');
+        $this->assertText('Count: 4');
+    }
+
+    function testClickingNormalLinkReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickLink('2');
+        $this->assertLink('3');
+        $this->assertText('Simple test front controller');
+    }
+
+    function testJumpToNamedPageReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->assertPattern('/Simple test front controller/');
+        $this->clickLink('Index');
+        $this->assertResponse(200);
+        $this->assertText('[action=index]');
+        $this->assertText('Count: 1');
+    }
+
+    function testJumpToUnnamedPageReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickLink('No page');
+        $this->assertResponse(200);
+        $this->assertText('Simple test front controller');
+        $this->assertText('[action=no_page]');
+        $this->assertText('Count: 1');
+    }
+
+    function testJumpToUnnamedPageWithBareParameterReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickLink('Bare action');
+        $this->assertResponse(200);
+        $this->assertText('Simple test front controller');
+        $this->assertText('[action=]');
+        $this->assertText('Count: 1');
+    }
+
+    function testJumpToUnnamedPageWithEmptyQueryReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickLink('Empty query');
+        $this->assertResponse(200);
+        $this->assertPattern('/Simple test front controller/');
+        $this->assertPattern('/raw get data.*?\[\].*?get data/si');
+        $this->assertPattern('/Count: 1/');
+    }
+
+    function testJumpToUnnamedPageWithEmptyLinkReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickLink('Empty link');
+        $this->assertResponse(200);
+        $this->assertPattern('/Simple test front controller/');
+        $this->assertPattern('/raw get data.*?\[\].*?get data/si');
+        $this->assertPattern('/Count: 1/');
+    }
+
+    function testJumpBackADirectoryLevelReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickLink('Down one');
+        $this->assertPattern('/index of .*\/test/i');
+        $this->assertPattern('/Count: 1/');
+    }
+
+    function testSubmitToNamedPageReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->assertPattern('/Simple test front controller/');
+        $this->clickSubmit('Index');
+        $this->assertResponse(200);
+        $this->assertText('[action=Index]');
+        $this->assertText('Count: 1');
+    }
+
+    function testSubmitToSameDirectoryReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickSubmit('Same directory');
+        $this->assertResponse(200);
+        $this->assertText('[action=Same+directory]');
+        $this->assertText('Count: 1');
+    }
+
+    function testSubmitToEmptyActionReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickSubmit('Empty action');
+        $this->assertResponse(200);
+        $this->assertText('[action=Empty+action]');
+        $this->assertText('Count: 1');
+    }
+
+    function testSubmitToNoActionReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickSubmit('No action');
+        $this->assertResponse(200);
+        $this->assertText('[action=No+action]');
+        $this->assertText('Count: 1');
+    }
+
+    function testSubmitBackADirectoryLevelReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickSubmit('Down one');
+        $this->assertPattern('/index of .*\/test/i');
+        $this->assertPattern('/Count: 1/');
+    }
+
+    function testTopLinkExitsFrameset() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickLink('Exit the frameset');
+        $this->assertTitle('Simple test target file');
+    }
+
+    function testLinkInOnePageCanLoadAnother() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->assertNoLink('3');
+        $this->clickLink('Set one to 2');
+        $this->assertLink('3');
+        $this->assertNoLink('2');
+        $this->assertTitle('Frameset for testing of SimpleTest');
+    }
+
+    function testFrameWithRelativeLinksRespectsBaseTagForThatPage() {
+        $this->get($this->samples() . 'base_tag/frameset.html');
+        $this->click('Back to test pages');
+        $this->assertTitle('Frameset for testing of SimpleTest');
+        $this->assertText('A target for the SimpleTest test suite');
+    }
+
+    function testRelativeLinkInFrameIsNotAffectedByFramesetBaseTag() {
+        $this->get($this->samples() . 'base_tag/frameset_with_base_tag.html');
+        $this->assertText('This is page 1');
+        $this->click('To page 2');
+        $this->assertTitle('Frameset for testing of SimpleTest');
+        $this->assertText('This is page 2');
+    }
+}
+
+class TestOfFrameAuthentication extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testUnauthenticatedFrameSendsChallenge() {
+        $this->get($this->samples() . 'protected/');
+        $this->setFrameFocus('Protected');
+        $this->assertAuthentication('Basic');
+        $this->assertRealm('SimpleTest basic authentication');
+        $this->assertResponse(401);
+    }
+
+    function testCanReadFrameFromAlreadyAuthenticatedRealm() {
+        $this->get($this->samples() . 'protected/');
+        $this->authenticate('test', 'secret');
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->setFrameFocus('Protected');
+        $this->assertResponse(200);
+        $this->assertText('A target for the SimpleTest test suite');
+    }
+
+    function testCanAuthenticateFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->setFrameFocus('Protected');
+        $this->authenticate('test', 'secret');
+        $this->assertResponse(200);
+        $this->assertText('A target for the SimpleTest test suite');
+        $this->clearFrameFocus();
+        $this->assertText('Count: 1');
+    }
+
+    function testCanAuthenticateRedirectedFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->setFrameFocus('Protected redirect');
+        $this->assertResponse(401);
+        $this->authenticate('test', 'secret');
+        $this->assertResponse(200);
+        $this->assertText('A target for the SimpleTest test suite');
+        $this->clearFrameFocus();
+        $this->assertText('Count: 1');
+    }
+}
+
+class TestOfNestedFrames extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testCanNavigateToSpecificContent() {
+        $this->get($this->samples() . 'nested_frameset.html');
+        $this->assertTitle('Nested frameset for testing of SimpleTest');
+
+        $this->assertPattern('/This is frame A/');
+        $this->assertPattern('/This is frame B/');
+        $this->assertPattern('/Simple test front controller/');
+        $this->assertLink('2');
+        $this->assertLink('Set one to 2');
+        $this->assertPattern('/Count: 1/');
+        $this->assertPattern('/r=rrr/');
+
+        $this->setFrameFocus('pair');
+        $this->assertPattern('/This is frame A/');
+        $this->assertPattern('/This is frame B/');
+        $this->assertNoPattern('/Simple test front controller/');
+        $this->assertNoLink('2');
+
+        $this->setFrameFocus('aaa');
+        $this->assertPattern('/This is frame A/');
+        $this->assertNoPattern('/This is frame B/');
+
+        $this->clearFrameFocus();
+        $this->assertResponse(200);
+        $this->setFrameFocus('messy');
+        $this->assertResponse(200);
+        $this->setFrameFocus('Front controller');
+        $this->assertResponse(200);
+        $this->assertPattern('/Simple test front controller/');
+        $this->assertNoLink('2');
+    }
+
+    function testReloadingFramesetPage() {
+        $this->get($this->samples() . 'nested_frameset.html');
+        $this->assertPattern('/Count: 1/');
+        $this->retry();
+        $this->assertPattern('/Count: 2/');
+        $this->retry();
+        $this->assertPattern('/Count: 3/');
+    }
+
+    function testRetryingNestedPageOnlyRetriesThatSet() {
+        $this->get($this->samples() . 'nested_frameset.html');
+        $this->assertPattern('/Count: 1/');
+        $this->setFrameFocus('messy');
+        $this->retry();
+        $this->assertPattern('/Count: 2/');
+        $this->setFrameFocus('Counter');
+        $this->retry();
+        $this->assertPattern('/Count: 3/');
+
+        $this->clearFrameFocus();
+        $this->setFrameFocus('messy');
+        $this->setFrameFocus('Front controller');
+        $this->retry();
+
+        $this->clearFrameFocus();
+        $this->assertPattern('/Count: 3/');
+    }
+
+    function testAuthenticatingNestedPage() {
+        $this->get($this->samples() . 'nested_frameset.html');
+        $this->setFrameFocus('messy');
+        $this->setFrameFocus('Protected');
+        $this->assertAuthentication('Basic');
+        $this->assertRealm('SimpleTest basic authentication');
+        $this->assertResponse(401);
+
+        $this->authenticate('test', 'secret');
+        $this->assertResponse(200);
+        $this->assertPattern('/A target for the SimpleTest test suite/');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/adapter_test.php b/3rdparty/simpletest/test/adapter_test.php
new file mode 100755
index 00000000000..c1a06a2f653
--- /dev/null
+++ b/3rdparty/simpletest/test/adapter_test.php
@@ -0,0 +1,50 @@
+<?php
+// $Id: adapter_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../extensions/pear_test_case.php');
+
+class SameTestClass {
+}
+
+class TestOfPearAdapter extends PHPUnit_TestCase {
+    
+    function testBoolean() {
+        $this->assertTrue(true, "PEAR true");
+        $this->assertFalse(false, "PEAR false");
+    }
+    
+    function testName() {
+        $this->assertTrue($this->getName() == get_class($this));
+    }
+    
+    function testPass() {
+        $this->pass("PEAR pass");
+    }
+    
+    function testNulls() {
+        $value = null;
+        $this->assertNull($value, "PEAR null");
+        $value = 0;
+        $this->assertNotNull($value, "PEAR not null");
+    }
+    
+    function testType() {
+        $this->assertType("Hello", "string", "PEAR type");
+    }
+    
+    function testEquals() {
+        $this->assertEquals(12, 12, "PEAR identity");
+        $this->setLooselyTyped(true);
+        $this->assertEquals("12", 12, "PEAR equality");
+    }
+    
+    function testSame() {
+        $same = new SameTestClass();
+        $this->assertSame($same, $same, "PEAR same");
+    }
+    
+    function testRegExp() {
+        $this->assertRegExp('/hello/', "A big hello from me", "PEAR regex");
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/all_tests.php b/3rdparty/simpletest/test/all_tests.php
new file mode 100755
index 00000000000..99ce9451e32
--- /dev/null
+++ b/3rdparty/simpletest/test/all_tests.php
@@ -0,0 +1,13 @@
+<?php
+require_once(dirname(__FILE__) . '/../autorun.php');
+
+class AllTests extends TestSuite {
+    function AllTests() {
+        $this->TestSuite('All tests for SimpleTest ' . SimpleTest::getVersion());
+        $this->addFile(dirname(__FILE__) . '/unit_tests.php');
+        $this->addFile(dirname(__FILE__) . '/shell_test.php');
+        $this->addFile(dirname(__FILE__) . '/live_test.php');
+        $this->addFile(dirname(__FILE__) . '/acceptance_test.php');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/arguments_test.php b/3rdparty/simpletest/test/arguments_test.php
new file mode 100755
index 00000000000..0cca4e99b24
--- /dev/null
+++ b/3rdparty/simpletest/test/arguments_test.php
@@ -0,0 +1,82 @@
+<?php
+// $Id: cookies_test.php 1506 2007-05-07 00:58:03Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../arguments.php');
+
+class TestOfCommandLineArgumentParsing extends UnitTestCase {
+    function testArgumentListWithJustProgramNameGivesFalseToEveryName() {
+        $arguments = new SimpleArguments(array('me'));
+        $this->assertIdentical($arguments->a, false);
+        $this->assertIdentical($arguments->all(), array());
+    }
+    
+    function testSingleArgumentNameRecordedAsTrue() {
+        $arguments = new SimpleArguments(array('me', '-a'));
+        $this->assertIdentical($arguments->a, true);
+    }
+    
+    function testSingleArgumentCanBeGivenAValue() {
+        $arguments = new SimpleArguments(array('me', '-a=AAA'));
+        $this->assertIdentical($arguments->a, 'AAA');
+    }
+    
+    function testSingleArgumentCanBeGivenSpaceSeparatedValue() {
+        $arguments = new SimpleArguments(array('me', '-a', 'AAA'));
+        $this->assertIdentical($arguments->a, 'AAA');
+    }
+    
+    function testWillBuildArrayFromRepeatedValue() {
+        $arguments = new SimpleArguments(array('me', '-a', 'A', '-a', 'AA'));
+        $this->assertIdentical($arguments->a, array('A', 'AA'));
+    }
+    
+    function testWillBuildArrayFromMultiplyRepeatedValues() {
+        $arguments = new SimpleArguments(array('me', '-a', 'A', '-a', 'AA', '-a', 'AAA'));
+        $this->assertIdentical($arguments->a, array('A', 'AA', 'AAA'));
+    }
+    
+    function testCanParseLongFormArguments() {
+        $arguments = new SimpleArguments(array('me', '--aa=AA', '--bb', 'BB'));
+        $this->assertIdentical($arguments->aa, 'AA');
+        $this->assertIdentical($arguments->bb, 'BB');
+    }
+    
+    function testGetsFullSetOfResultsAsHash() {
+        $arguments = new SimpleArguments(array('me', '-a', '-b=1', '-b', '2', '--aa=AA', '--bb', 'BB', '-c'));
+        $this->assertEqual($arguments->all(),
+                           array('a' => true, 'b' => array('1', '2'), 'aa' => 'AA', 'bb' => 'BB', 'c' => true));
+    }
+}
+
+class TestOfHelpOutput extends UnitTestCase {
+    function testDisplaysGeneralHelpBanner() {
+        $help = new SimpleHelp('Cool program');
+        $this->assertEqual($help->render(), "Cool program\n");
+    }
+    
+    function testDisplaysOnlySingleLineEndings() {
+        $help = new SimpleHelp("Cool program\n");
+        $this->assertEqual($help->render(), "Cool program\n");
+    }
+    
+    function testDisplaysHelpOnShortFlag() {
+        $help = new SimpleHelp('Cool program');
+        $help->explainFlag('a', 'Enables A');
+        $this->assertEqual($help->render(), "Cool program\n-a    Enables A\n");
+    }
+    
+    function testHasAtleastFourSpacesAfterLongestFlag() {
+        $help = new SimpleHelp('Cool program');
+        $help->explainFlag('a', 'Enables A');
+        $help->explainFlag('long', 'Enables Long');
+        $this->assertEqual($help->render(),
+                           "Cool program\n-a        Enables A\n--long    Enables Long\n");
+    }
+    
+    function testCanDisplaysMultipleFlagsForEachOption() {
+        $help = new SimpleHelp('Cool program');
+        $help->explainFlag(array('a', 'aa'), 'Enables A');
+        $this->assertEqual($help->render(), "Cool program\n-a      Enables A\n  --aa\n");
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/authentication_test.php b/3rdparty/simpletest/test/authentication_test.php
new file mode 100755
index 00000000000..081cccddfae
--- /dev/null
+++ b/3rdparty/simpletest/test/authentication_test.php
@@ -0,0 +1,145 @@
+<?php
+// $Id: authentication_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../authentication.php');
+require_once(dirname(__FILE__) . '/../http.php');
+Mock::generate('SimpleHttpRequest');
+
+class TestOfRealm extends UnitTestCase {
+    
+    function testWithinSameUrl() {
+        $realm = new SimpleRealm(
+                'Basic',
+                new SimpleUrl('http://www.here.com/path/hello.html'));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path/hello.html')));
+    }
+    
+    function testInsideWithLongerUrl() {
+        $realm = new SimpleRealm(
+                'Basic',
+                new SimpleUrl('http://www.here.com/path/'));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path/hello.html')));
+    }
+    
+    function testBelowRootIsOutside() {
+        $realm = new SimpleRealm(
+                'Basic',
+                new SimpleUrl('http://www.here.com/path/'));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path/more/hello.html')));
+    }
+    
+    function testOldNetscapeDefinitionIsOutside() {
+        $realm = new SimpleRealm(
+                'Basic',
+                new SimpleUrl('http://www.here.com/path/'));
+        $this->assertFalse($realm->isWithin(
+                new SimpleUrl('http://www.here.com/pathmore/hello.html')));
+    }
+    
+    function testInsideWithMissingTrailingSlash() {
+        $realm = new SimpleRealm(
+                'Basic',
+                new SimpleUrl('http://www.here.com/path/'));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path')));
+    }
+    
+    function testDifferentPageNameStillInside() {
+        $realm = new SimpleRealm(
+                'Basic',
+                new SimpleUrl('http://www.here.com/path/hello.html'));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path/goodbye.html')));
+    }
+    
+    function testNewUrlInSameDirectoryDoesNotChangeRealm() {
+        $realm = new SimpleRealm(
+                'Basic',
+                new SimpleUrl('http://www.here.com/path/hello.html'));
+        $realm->stretch(new SimpleUrl('http://www.here.com/path/goodbye.html'));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path/index.html')));
+        $this->assertFalse($realm->isWithin(
+                new SimpleUrl('http://www.here.com/index.html')));
+    }
+    
+    function testNewUrlMakesRealmTheCommonPath() {
+        $realm = new SimpleRealm(
+                'Basic',
+                new SimpleUrl('http://www.here.com/path/here/hello.html'));
+        $realm->stretch(new SimpleUrl('http://www.here.com/path/there/goodbye.html'));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path/here/index.html')));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path/there/index.html')));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path/index.html')));
+        $this->assertFalse($realm->isWithin(
+                new SimpleUrl('http://www.here.com/index.html')));
+        $this->assertFalse($realm->isWithin(
+                new SimpleUrl('http://www.here.com/paths/index.html')));
+        $this->assertFalse($realm->isWithin(
+                new SimpleUrl('http://www.here.com/pathindex.html')));
+    }
+}
+
+class TestOfAuthenticator extends UnitTestCase {
+    
+    function testNoRealms() {
+        $request = new MockSimpleHttpRequest();
+        $request->expectNever('addHeaderLine');
+        $authenticator = new SimpleAuthenticator();
+        $authenticator->addHeaders($request, new SimpleUrl('http://here.com/'));
+    }
+    
+    function &createSingleRealm() {
+        $authenticator = new SimpleAuthenticator();
+        $authenticator->addRealm(
+                new SimpleUrl('http://www.here.com/path/hello.html'),
+                'Basic',
+                'Sanctuary');
+        $authenticator->setIdentityForRealm('www.here.com', 'Sanctuary', 'test', 'secret');
+        return $authenticator;
+    }
+    
+    function testOutsideRealm() {
+        $request = new MockSimpleHttpRequest();
+        $request->expectNever('addHeaderLine');
+        $authenticator = &$this->createSingleRealm();
+        $authenticator->addHeaders(
+                $request,
+                new SimpleUrl('http://www.here.com/hello.html'));
+    }
+    
+    function testWithinRealm() {
+        $request = new MockSimpleHttpRequest();
+        $request->expectOnce('addHeaderLine');
+        $authenticator = &$this->createSingleRealm();
+        $authenticator->addHeaders(
+                $request,
+                new SimpleUrl('http://www.here.com/path/more/hello.html'));
+    }
+    
+    function testRestartingClearsRealm() {
+        $request = new MockSimpleHttpRequest();
+        $request->expectNever('addHeaderLine');
+        $authenticator = &$this->createSingleRealm();
+        $authenticator->restartSession();
+        $authenticator->addHeaders(
+                $request,
+                new SimpleUrl('http://www.here.com/hello.html'));
+    }
+    
+    function testDifferentHostIsOutsideRealm() {
+        $request = new MockSimpleHttpRequest();
+        $request->expectNever('addHeaderLine');
+        $authenticator = &$this->createSingleRealm();
+        $authenticator->addHeaders(
+                $request,
+                new SimpleUrl('http://here.com/path/hello.html'));
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/autorun_test.php b/3rdparty/simpletest/test/autorun_test.php
new file mode 100755
index 00000000000..d85ea19897c
--- /dev/null
+++ b/3rdparty/simpletest/test/autorun_test.php
@@ -0,0 +1,23 @@
+<?php
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/support/test1.php');
+
+class TestOfAutorun extends UnitTestCase {
+    function testLoadIfIncluded() {
+        $tests = new TestSuite();
+        $tests->addFile(dirname(__FILE__) . '/support/test1.php');
+        $this->assertEqual($tests->getSize(), 1);
+    }
+
+    function testExitStatusOneIfTestsFail() {
+        exec('php ' . dirname(__FILE__) . '/support/failing_test.php', $output, $exit_status);
+        $this->assertEqual($exit_status, 1);
+    }
+
+    function testExitStatusZeroIfTestsPass() {
+        exec('php ' . dirname(__FILE__) . '/support/passing_test.php', $output, $exit_status);
+        $this->assertEqual($exit_status, 0);
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/bad_test_suite.php b/3rdparty/simpletest/test/bad_test_suite.php
new file mode 100755
index 00000000000..b426013be40
--- /dev/null
+++ b/3rdparty/simpletest/test/bad_test_suite.php
@@ -0,0 +1,10 @@
+<?php
+require_once(dirname(__FILE__) . '/../autorun.php');
+
+class BadTestCases extends TestSuite {
+    function BadTestCases() {
+        $this->TestSuite('Two bad test cases');
+        $this->addFile(dirname(__FILE__) . '/support/empty_test_file.php');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/browser_test.php b/3rdparty/simpletest/test/browser_test.php
new file mode 100755
index 00000000000..3a52aaa8ff4
--- /dev/null
+++ b/3rdparty/simpletest/test/browser_test.php
@@ -0,0 +1,802 @@
+<?php
+// $Id: browser_test.php 1964 2009-10-13 15:27:31Z maetl_ $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../browser.php');
+require_once(dirname(__FILE__) . '/../user_agent.php');
+require_once(dirname(__FILE__) . '/../http.php');
+require_once(dirname(__FILE__) . '/../page.php');
+require_once(dirname(__FILE__) . '/../encoding.php');
+
+Mock::generate('SimpleHttpResponse');
+Mock::generate('SimplePage');
+Mock::generate('SimpleForm');
+Mock::generate('SimpleUserAgent');
+Mock::generatePartial(
+        'SimpleBrowser',
+        'MockParseSimpleBrowser',
+        array('createUserAgent', 'parse'));
+Mock::generatePartial(
+        'SimpleBrowser',
+        'MockUserAgentSimpleBrowser',
+        array('createUserAgent'));
+
+class TestOfHistory extends UnitTestCase {
+
+    function testEmptyHistoryHasFalseContents() {
+        $history = new SimpleBrowserHistory();
+        $this->assertIdentical($history->getUrl(), false);
+        $this->assertIdentical($history->getParameters(), false);
+    }
+
+    function testCannotMoveInEmptyHistory() {
+        $history = new SimpleBrowserHistory();
+        $this->assertFalse($history->back());
+        $this->assertFalse($history->forward());
+    }
+
+    function testCurrentTargetAccessors() {
+        $history = new SimpleBrowserHistory();
+        $history->recordEntry(
+                new SimpleUrl('http://www.here.com/'),
+                new SimpleGetEncoding());
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.here.com/'));
+        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
+    }
+
+    function testSecondEntryAccessors() {
+        $history = new SimpleBrowserHistory();
+        $history->recordEntry(
+                new SimpleUrl('http://www.first.com/'),
+                new SimpleGetEncoding());
+        $history->recordEntry(
+                new SimpleUrl('http://www.second.com/'),
+                new SimplePostEncoding(array('a' => 1)));
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.second.com/'));
+        $this->assertIdentical(
+                $history->getParameters(),
+                new SimplePostEncoding(array('a' => 1)));
+    }
+
+    function testGoingBackwards() {
+        $history = new SimpleBrowserHistory();
+        $history->recordEntry(
+                new SimpleUrl('http://www.first.com/'),
+                new SimpleGetEncoding());
+        $history->recordEntry(
+                new SimpleUrl('http://www.second.com/'),
+                new SimplePostEncoding(array('a' => 1)));
+        $this->assertTrue($history->back());
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
+        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
+    }
+
+    function testGoingBackwardsOffBeginning() {
+        $history = new SimpleBrowserHistory();
+        $history->recordEntry(
+                new SimpleUrl('http://www.first.com/'),
+                new SimpleGetEncoding());
+        $this->assertFalse($history->back());
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
+        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
+    }
+
+    function testGoingForwardsOffEnd() {
+        $history = new SimpleBrowserHistory();
+        $history->recordEntry(
+                new SimpleUrl('http://www.first.com/'),
+                new SimpleGetEncoding());
+        $this->assertFalse($history->forward());
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
+        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
+    }
+
+    function testGoingBackwardsAndForwards() {
+        $history = new SimpleBrowserHistory();
+        $history->recordEntry(
+                new SimpleUrl('http://www.first.com/'),
+                new SimpleGetEncoding());
+        $history->recordEntry(
+                new SimpleUrl('http://www.second.com/'),
+                new SimplePostEncoding(array('a' => 1)));
+        $this->assertTrue($history->back());
+        $this->assertTrue($history->forward());
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.second.com/'));
+        $this->assertIdentical(
+                $history->getParameters(),
+                new SimplePostEncoding(array('a' => 1)));
+    }
+
+    function testNewEntryReplacesNextOne() {
+        $history = new SimpleBrowserHistory();
+        $history->recordEntry(
+                new SimpleUrl('http://www.first.com/'),
+                new SimpleGetEncoding());
+        $history->recordEntry(
+                new SimpleUrl('http://www.second.com/'),
+                new SimplePostEncoding(array('a' => 1)));
+        $history->back();
+        $history->recordEntry(
+                new SimpleUrl('http://www.third.com/'),
+                new SimpleGetEncoding());
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.third.com/'));
+        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
+    }
+
+    function testNewEntryDropsFutureEntries() {
+        $history = new SimpleBrowserHistory();
+        $history->recordEntry(
+                new SimpleUrl('http://www.first.com/'),
+                new SimpleGetEncoding());
+        $history->recordEntry(
+                new SimpleUrl('http://www.second.com/'),
+                new SimpleGetEncoding());
+        $history->recordEntry(
+                new SimpleUrl('http://www.third.com/'),
+                new SimpleGetEncoding());
+        $history->back();
+        $history->back();
+        $history->recordEntry(
+                new SimpleUrl('http://www.fourth.com/'),
+                new SimpleGetEncoding());
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.fourth.com/'));
+        $this->assertFalse($history->forward());
+        $history->back();
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
+        $this->assertFalse($history->back());
+    }
+}
+
+class TestOfParsedPageAccess extends UnitTestCase {
+
+    function loadPage(&$page) {
+        $response = new MockSimpleHttpResponse($this);
+        $agent = new MockSimpleUserAgent($this);
+        $agent->returns('fetchResponse', $response);
+
+        $browser = new MockParseSimpleBrowser($this);
+        $browser->returns('createUserAgent', $agent);
+        $browser->returns('parse', $page);
+        $browser->__construct();
+
+        $browser->get('http://this.com/page.html');
+        return $browser;
+    }
+
+    function testAccessorsWhenNoPage() {
+        $agent = new MockSimpleUserAgent($this);
+        $browser = new MockParseSimpleBrowser($this);
+        $browser->returns('createUserAgent', $agent);
+        $browser->__construct();
+        $this->assertEqual($browser->getContent(), '');
+    }
+
+    function testParse() {
+        $page = new MockSimplePage();
+        $page->setReturnValue('getRequest', "GET here.html\r\n\r\n");
+        $page->setReturnValue('getRaw', 'Raw HTML');
+        $page->setReturnValue('getTitle', 'Here');
+        $page->setReturnValue('getFrameFocus', 'Frame');
+        $page->setReturnValue('getMimeType', 'text/html');
+        $page->setReturnValue('getResponseCode', 200);
+        $page->setReturnValue('getAuthentication', 'Basic');
+        $page->setReturnValue('getRealm', 'Somewhere');
+        $page->setReturnValue('getTransportError', 'Ouch!');
+
+        $browser = $this->loadPage($page);
+        $this->assertEqual($browser->getRequest(), "GET here.html\r\n\r\n");
+        $this->assertEqual($browser->getContent(), 'Raw HTML');
+        $this->assertEqual($browser->getTitle(), 'Here');
+        $this->assertEqual($browser->getFrameFocus(), 'Frame');
+        $this->assertIdentical($browser->getResponseCode(), 200);
+        $this->assertEqual($browser->getMimeType(), 'text/html');
+        $this->assertEqual($browser->getAuthentication(), 'Basic');
+        $this->assertEqual($browser->getRealm(), 'Somewhere');
+        $this->assertEqual($browser->getTransportError(), 'Ouch!');
+    }
+
+    function testLinkAffirmationWhenPresent() {
+        $page = new MockSimplePage();
+        $page->setReturnValue('getUrlsByLabel', array('http://www.nowhere.com'));
+        $page->expectOnce('getUrlsByLabel', array('a link label'));
+        $browser = $this->loadPage($page);
+        $this->assertIdentical($browser->getLink('a link label'), 'http://www.nowhere.com');
+    }
+
+    function testLinkAffirmationByIdWhenPresent() {
+        $page = new MockSimplePage();
+        $page->setReturnValue('getUrlById', 'a_page.com', array(99));
+        $page->setReturnValue('getUrlById', false, array('*'));
+        $browser = $this->loadPage($page);
+        $this->assertIdentical($browser->getLinkById(99), 'a_page.com');
+        $this->assertFalse($browser->getLinkById(98));
+    }
+
+    function testSettingFieldIsPassedToPage() {
+        $page = new MockSimplePage();
+        $page->expectOnce('setField', array(new SimpleByLabelOrName('key'), 'Value', false));
+        $page->setReturnValue('getField', 'Value');
+        $browser = $this->loadPage($page);
+        $this->assertEqual($browser->getField('key'), 'Value');
+        $browser->setField('key', 'Value');
+    }
+}
+
+class TestOfBrowserNavigation extends UnitTestCase {
+    function createBrowser($agent, $page) {
+        $browser = new MockParseSimpleBrowser();
+        $browser->returns('createUserAgent', $agent);
+        $browser->returns('parse', $page);
+        $browser->__construct();
+        return $browser;
+    }
+
+    function testBrowserRequestMethods() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+        $agent->expectAt(
+                0,
+                'fetchResponse',
+                array(new SimpleUrl('http://this.com/get.req'), new SimpleGetEncoding()));
+        $agent->expectAt(
+                1,
+                'fetchResponse',
+                array(new SimpleUrl('http://this.com/post.req'), new SimplePostEncoding()));
+        $agent->expectAt(
+                2,
+                'fetchResponse',
+                array(new SimpleUrl('http://this.com/put.req'), new SimplePutEncoding()));
+        $agent->expectAt(
+                3,
+                'fetchResponse',
+                array(new SimpleUrl('http://this.com/delete.req'), new SimpleDeleteEncoding()));
+        $agent->expectAt(
+                4,
+                'fetchResponse',
+                array(new SimpleUrl('http://this.com/head.req'), new SimpleHeadEncoding()));                               
+        $agent->expectCallCount('fetchResponse', 5);
+
+        $page = new MockSimplePage();
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/get.req');
+        $browser->post('http://this.com/post.req');
+        $browser->put('http://this.com/put.req');
+        $browser->delete('http://this.com/delete.req');
+        $browser->head('http://this.com/head.req');
+    }  
+    
+    function testClickLinkRequestsPage() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+        $agent->expectAt(
+                0,
+                'fetchResponse',
+                array(new SimpleUrl('http://this.com/page.html'), new SimpleGetEncoding()));
+        $agent->expectAt(
+                1,
+                'fetchResponse',
+                array(new SimpleUrl('http://this.com/new.html'), new SimpleGetEncoding()));
+        $agent->expectCallCount('fetchResponse', 2);
+
+        $page = new MockSimplePage();
+        $page->setReturnValue('getUrlsByLabel', array(new SimpleUrl('http://this.com/new.html')));
+        $page->expectOnce('getUrlsByLabel', array('New'));
+        $page->setReturnValue('getRaw', 'A page');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickLink('New'));
+    }
+
+    function testClickLinkWithUnknownFrameStillRequestsWholePage() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+        $agent->expectAt(
+                0,
+                'fetchResponse',
+                array(new SimpleUrl('http://this.com/page.html'), new SimpleGetEncoding()));
+        $target = new SimpleUrl('http://this.com/new.html');
+        $target->setTarget('missing');
+        $agent->expectAt(
+                1,
+                'fetchResponse',
+                array($target, new SimpleGetEncoding()));
+        $agent->expectCallCount('fetchResponse', 2);
+
+        $parsed_url = new SimpleUrl('http://this.com/new.html');
+        $parsed_url->setTarget('missing');
+
+        $page = new MockSimplePage();
+        $page->setReturnValue('getUrlsByLabel', array($parsed_url));
+        $page->setReturnValue('hasFrames', false);
+        $page->expectOnce('getUrlsByLabel', array('New'));
+        $page->setReturnValue('getRaw', 'A page');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickLink('New'));
+    }
+
+    function testClickingMissingLinkFails() {
+        $agent = new MockSimpleUserAgent($this);
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+
+        $page = new MockSimplePage();
+        $page->setReturnValue('getUrlsByLabel', array());
+        $page->setReturnValue('getRaw', 'stuff');
+
+        $browser = $this->createBrowser($agent, $page);
+        $this->assertTrue($browser->get('http://this.com/page.html'));
+        $this->assertFalse($browser->clickLink('New'));
+    }
+
+    function testClickIndexedLink() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+        $agent->expectAt(
+                1,
+                'fetchResponse',
+                array(new SimpleUrl('1.html'), new SimpleGetEncoding()));
+        $agent->expectCallCount('fetchResponse', 2);
+
+        $page = new MockSimplePage();
+        $page->setReturnValue(
+                'getUrlsByLabel',
+                array(new SimpleUrl('0.html'), new SimpleUrl('1.html')));
+        $page->setReturnValue('getRaw', 'A page');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickLink('New', 1));
+    }
+
+    function testClinkLinkById() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+        $agent->expectAt(1, 'fetchResponse', array(
+                new SimpleUrl('http://this.com/link.html'),
+                new SimpleGetEncoding()));
+        $agent->expectCallCount('fetchResponse', 2);
+
+        $page = new MockSimplePage();
+        $page->setReturnValue('getUrlById', new SimpleUrl('http://this.com/link.html'));
+        $page->expectOnce('getUrlById', array(2));
+        $page->setReturnValue('getRaw', 'A page');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickLinkById(2));
+    }
+
+    function testClickingMissingLinkIdFails() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+
+        $page = new MockSimplePage();
+        $page->setReturnValue('getUrlById', false);
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertFalse($browser->clickLink(0));
+    }
+
+    function testSubmitFormByLabel() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+        $agent->expectAt(1, 'fetchResponse', array(
+                new SimpleUrl('http://this.com/handler.html'),
+                new SimplePostEncoding(array('a' => 'A'))));
+        $agent->expectCallCount('fetchResponse', 2);
+
+        $form = new MockSimpleForm();
+        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
+        $form->setReturnValue('getMethod', 'post');
+        $form->setReturnValue('submitButton', new SimplePostEncoding(array('a' => 'A')));
+        $form->expectOnce('submitButton', array(new SimpleByLabel('Go'), false));
+
+        $page = new MockSimplePage();
+        $page->returns('getFormBySubmit', $form);
+        $page->expectOnce('getFormBySubmit', array(new SimpleByLabel('Go')));
+        $page->setReturnValue('getRaw', 'stuff');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickSubmit('Go'));
+    }
+
+    function testDefaultSubmitFormByLabel() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+        $agent->expectAt(1,  'fetchResponse', array(
+                new SimpleUrl('http://this.com/page.html'),
+                new SimpleGetEncoding(array('a' => 'A'))));
+        $agent->expectCallCount('fetchResponse', 2);
+
+        $form = new MockSimpleForm();
+        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/page.html'));
+        $form->setReturnValue('getMethod', 'get');
+        $form->setReturnValue('submitButton', new SimpleGetEncoding(array('a' => 'A')));
+
+        $page = new MockSimplePage();
+        $page->returns('getFormBySubmit', $form);
+        $page->expectOnce('getFormBySubmit', array(new SimpleByLabel('Submit')));
+        $page->setReturnValue('getRaw', 'stuff');
+        $page->setReturnValue('getUrl', new SimpleUrl('http://this.com/page.html'));
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickSubmit());
+    }
+
+    function testSubmitFormByName() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+
+        $form = new MockSimpleForm();
+        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
+        $form->setReturnValue('getMethod', 'post');
+        $form->setReturnValue('submitButton', new SimplePostEncoding(array('a' => 'A')));
+
+        $page = new MockSimplePage();
+        $page->returns('getFormBySubmit', $form);
+        $page->expectOnce('getFormBySubmit', array(new SimpleByName('me')));
+        $page->setReturnValue('getRaw', 'stuff');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickSubmitByName('me'));
+    }
+
+    function testSubmitFormById() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+
+        $form = new MockSimpleForm();
+        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
+        $form->setReturnValue('getMethod', 'post');
+        $form->setReturnValue('submitButton', new SimplePostEncoding(array('a' => 'A')));
+        $form->expectOnce('submitButton', array(new SimpleById(99), false));
+
+        $page = new MockSimplePage();
+        $page->returns('getFormBySubmit', $form);
+        $page->expectOnce('getFormBySubmit', array(new SimpleById(99)));
+        $page->setReturnValue('getRaw', 'stuff');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickSubmitById(99));
+    }
+
+    function testSubmitFormByImageLabel() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+
+        $form = new MockSimpleForm();
+        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
+        $form->setReturnValue('getMethod', 'post');
+        $form->setReturnValue('submitImage', new SimplePostEncoding(array('a' => 'A')));
+        $form->expectOnce('submitImage', array(new SimpleByLabel('Go!'), 10, 11, false));
+
+        $page = new MockSimplePage();
+        $page->returns('getFormByImage', $form);
+        $page->expectOnce('getFormByImage', array(new SimpleByLabel('Go!')));
+        $page->setReturnValue('getRaw', 'stuff');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickImage('Go!', 10, 11));
+    }
+
+    function testSubmitFormByImageName() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+
+        $form = new MockSimpleForm();
+        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
+        $form->setReturnValue('getMethod', 'post');
+        $form->setReturnValue('submitImage', new SimplePostEncoding(array('a' => 'A')));
+        $form->expectOnce('submitImage', array(new SimpleByName('a'), 10, 11, false));
+
+        $page = new MockSimplePage();
+        $page->returns('getFormByImage', $form);
+        $page->expectOnce('getFormByImage', array(new SimpleByName('a')));
+        $page->setReturnValue('getRaw', 'stuff');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickImageByName('a', 10, 11));
+    }
+
+    function testSubmitFormByImageId() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+
+        $form = new MockSimpleForm();
+        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
+        $form->setReturnValue('getMethod', 'post');
+        $form->setReturnValue('submitImage', new SimplePostEncoding(array('a' => 'A')));
+        $form->expectOnce('submitImage', array(new SimpleById(99), 10, 11, false));
+
+        $page = new MockSimplePage();
+        $page->returns('getFormByImage', $form);
+        $page->expectOnce('getFormByImage', array(new SimpleById(99)));
+        $page->setReturnValue('getRaw', 'stuff');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickImageById(99, 10, 11));
+    }
+
+    function testSubmitFormByFormId() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+        $agent->expectAt(1, 'fetchResponse', array(
+                new SimpleUrl('http://this.com/handler.html'),
+                new SimplePostEncoding(array('a' => 'A'))));
+        $agent->expectCallCount('fetchResponse', 2);
+
+        $form = new MockSimpleForm();
+        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
+        $form->setReturnValue('getMethod', 'post');
+        $form->setReturnValue('submit', new SimplePostEncoding(array('a' => 'A')));
+
+        $page = new MockSimplePage();
+        $page->returns('getFormById', $form);
+        $page->expectOnce('getFormById', array(33));
+        $page->setReturnValue('getRaw', 'stuff');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->submitFormById(33));
+    }
+}
+
+class TestOfBrowserFrames extends UnitTestCase {
+
+    function createBrowser($agent) {
+        $browser = new MockUserAgentSimpleBrowser();
+        $browser->returns('createUserAgent', $agent);
+        $browser->__construct();
+        return $browser;
+    }
+
+    function createUserAgent($pages) {
+        $agent = new MockSimpleUserAgent();
+        foreach ($pages as $url => $raw) {
+            $url = new SimpleUrl($url);
+            $response = new MockSimpleHttpResponse();
+            $response->setReturnValue('getUrl', $url);
+            $response->setReturnValue('getContent', $raw);
+            $agent->returns('fetchResponse', $response, array($url, '*'));
+        }
+        return $agent;
+    }
+
+    function testSimplePageHasNoFrames() {
+        $browser = $this->createBrowser($this->createUserAgent(
+                array('http://site.with.no.frames/' => 'A non-framed page')));
+        $this->assertEqual(
+                $browser->get('http://site.with.no.frames/'),
+                'A non-framed page');
+        $this->assertIdentical($browser->getFrames(), 'http://site.with.no.frames/');
+    }
+
+    function testFramesetWithSingleFrame() {
+        $frameset = '<frameset><frame name="a" src="frame.html"></frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.one.frame/' => $frameset,
+                'http://site.with.one.frame/frame.html' => 'A frame')));
+        $this->assertEqual($browser->get('http://site.with.one.frame/'), 'A frame');
+        $this->assertIdentical(
+                $browser->getFrames(),
+                array('a' => 'http://site.with.one.frame/frame.html'));
+    }
+
+    function testTitleTakenFromFramesetPage() {
+        $frameset = '<title>Frameset title</title>' .
+                '<frameset><frame name="a" src="frame.html"></frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.one.frame/' => $frameset,
+                'http://site.with.one.frame/frame.html' => '<title>Page title</title>')));
+        $browser->get('http://site.with.one.frame/');
+        $this->assertEqual($browser->getTitle(), 'Frameset title');
+    }
+
+    function testFramesetWithSingleUnnamedFrame() {
+        $frameset = '<frameset><frame src="frame.html"></frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.one.frame/' => $frameset,
+                'http://site.with.one.frame/frame.html' => 'One frame')));
+        $this->assertEqual(
+                $browser->get('http://site.with.one.frame/'),
+                'One frame');
+        $this->assertIdentical(
+                $browser->getFrames(),
+                array(1 => 'http://site.with.one.frame/frame.html'));
+    }
+
+    function testFramesetWithMultipleFrames() {
+        $frameset = '<frameset>' .
+                '<frame name="a" src="frame_a.html">' .
+                '<frame name="b" src="frame_b.html">' .
+                '<frame name="c" src="frame_c.html">' .
+                '</frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.frames/' => $frameset,
+                'http://site.with.frames/frame_a.html' => 'A frame',
+                'http://site.with.frames/frame_b.html' => 'B frame',
+                'http://site.with.frames/frame_c.html' => 'C frame')));
+        $this->assertEqual(
+                $browser->get('http://site.with.frames/'),
+                'A frameB frameC frame');
+        $this->assertIdentical($browser->getFrames(), array(
+                'a' => 'http://site.with.frames/frame_a.html',
+                'b' => 'http://site.with.frames/frame_b.html',
+                'c' => 'http://site.with.frames/frame_c.html'));
+    }
+
+    function testFrameFocusByName() {
+        $frameset = '<frameset>' .
+                '<frame name="a" src="frame_a.html">' .
+                '<frame name="b" src="frame_b.html">' .
+                '<frame name="c" src="frame_c.html">' .
+                '</frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.frames/' => $frameset,
+                'http://site.with.frames/frame_a.html' => 'A frame',
+                'http://site.with.frames/frame_b.html' => 'B frame',
+                'http://site.with.frames/frame_c.html' => 'C frame')));
+        $browser->get('http://site.with.frames/');
+        $browser->setFrameFocus('a');
+        $this->assertEqual($browser->getContent(), 'A frame');
+        $browser->setFrameFocus('b');
+        $this->assertEqual($browser->getContent(), 'B frame');
+        $browser->setFrameFocus('c');
+        $this->assertEqual($browser->getContent(), 'C frame');
+    }
+
+    function testFramesetWithSomeNamedFrames() {
+        $frameset = '<frameset>' .
+                '<frame name="a" src="frame_a.html">' .
+                '<frame src="frame_b.html">' .
+                '<frame name="c" src="frame_c.html">' .
+                '<frame src="frame_d.html">' .
+                '</frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.frames/' => $frameset,
+                'http://site.with.frames/frame_a.html' => 'A frame',
+                'http://site.with.frames/frame_b.html' => 'B frame',
+                'http://site.with.frames/frame_c.html' => 'C frame',
+                'http://site.with.frames/frame_d.html' => 'D frame')));
+        $this->assertEqual(
+                $browser->get('http://site.with.frames/'),
+                'A frameB frameC frameD frame');
+        $this->assertIdentical($browser->getFrames(), array(
+                'a' => 'http://site.with.frames/frame_a.html',
+                2 => 'http://site.with.frames/frame_b.html',
+                'c' => 'http://site.with.frames/frame_c.html',
+                4 => 'http://site.with.frames/frame_d.html'));
+    }
+
+    function testFrameFocusWithMixedNamesAndIndexes() {
+        $frameset = '<frameset>' .
+                '<frame name="a" src="frame_a.html">' .
+                '<frame src="frame_b.html">' .
+                '<frame name="c" src="frame_c.html">' .
+                '<frame src="frame_d.html">' .
+                '</frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.frames/' => $frameset,
+                'http://site.with.frames/frame_a.html' => 'A frame',
+                'http://site.with.frames/frame_b.html' => 'B frame',
+                'http://site.with.frames/frame_c.html' => 'C frame',
+                'http://site.with.frames/frame_d.html' => 'D frame')));
+        $browser->get('http://site.with.frames/');
+        $browser->setFrameFocus('a');
+        $this->assertEqual($browser->getContent(), 'A frame');
+        $browser->setFrameFocus(2);
+        $this->assertEqual($browser->getContent(), 'B frame');
+        $browser->setFrameFocus('c');
+        $this->assertEqual($browser->getContent(), 'C frame');
+        $browser->setFrameFocus(4);
+        $this->assertEqual($browser->getContent(), 'D frame');
+        $browser->clearFrameFocus();
+        $this->assertEqual($browser->getContent(), 'A frameB frameC frameD frame');
+    }
+
+    function testNestedFrameset() {
+        $inner = '<frameset>' .
+                '<frame name="page" src="page.html">' .
+                '</frameset>';
+        $outer = '<frameset>' .
+                '<frame name="inner" src="inner.html">' .
+                '</frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.nested.frame/' => $outer,
+                'http://site.with.nested.frame/inner.html' => $inner,
+                'http://site.with.nested.frame/page.html' => 'The page')));
+        $this->assertEqual(
+                $browser->get('http://site.with.nested.frame/'),
+                'The page');
+        $this->assertIdentical($browser->getFrames(), array(
+                'inner' => array(
+                        'page' => 'http://site.with.nested.frame/page.html')));
+    }
+
+    function testCanNavigateToNestedFrame() {
+        $inner = '<frameset>' .
+                '<frame name="one" src="one.html">' .
+                '<frame name="two" src="two.html">' .
+                '</frameset>';
+        $outer = '<frameset>' .
+                '<frame name="inner" src="inner.html">' .
+                '<frame name="three" src="three.html">' .
+                '</frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.nested.frames/' => $outer,
+                'http://site.with.nested.frames/inner.html' => $inner,
+                'http://site.with.nested.frames/one.html' => 'Page one',
+                'http://site.with.nested.frames/two.html' => 'Page two',
+                'http://site.with.nested.frames/three.html' => 'Page three')));
+
+        $browser->get('http://site.with.nested.frames/');
+        $this->assertEqual($browser->getContent(), 'Page onePage twoPage three');
+
+        $this->assertTrue($browser->setFrameFocus('inner'));
+        $this->assertEqual($browser->getFrameFocus(), array('inner'));
+        $this->assertTrue($browser->setFrameFocus('one'));
+        $this->assertEqual($browser->getFrameFocus(), array('inner', 'one'));
+        $this->assertEqual($browser->getContent(), 'Page one');
+
+        $this->assertTrue($browser->setFrameFocus('two'));
+        $this->assertEqual($browser->getFrameFocus(), array('inner', 'two'));
+        $this->assertEqual($browser->getContent(), 'Page two');
+
+        $browser->clearFrameFocus();
+        $this->assertTrue($browser->setFrameFocus('three'));
+        $this->assertEqual($browser->getFrameFocus(), array('three'));
+        $this->assertEqual($browser->getContent(), 'Page three');
+
+        $this->assertTrue($browser->setFrameFocus('inner'));
+        $this->assertEqual($browser->getContent(), 'Page onePage two');
+    }
+
+    function testCanNavigateToNestedFrameByIndex() {
+        $inner = '<frameset>' .
+                '<frame src="one.html">' .
+                '<frame src="two.html">' .
+                '</frameset>';
+        $outer = '<frameset>' .
+                '<frame src="inner.html">' .
+                '<frame src="three.html">' .
+                '</frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.nested.frames/' => $outer,
+                'http://site.with.nested.frames/inner.html' => $inner,
+                'http://site.with.nested.frames/one.html' => 'Page one',
+                'http://site.with.nested.frames/two.html' => 'Page two',
+                'http://site.with.nested.frames/three.html' => 'Page three')));
+
+        $browser->get('http://site.with.nested.frames/');
+        $this->assertEqual($browser->getContent(), 'Page onePage twoPage three');
+
+        $this->assertTrue($browser->setFrameFocusByIndex(1));
+        $this->assertEqual($browser->getFrameFocus(), array(1));
+        $this->assertTrue($browser->setFrameFocusByIndex(1));
+        $this->assertEqual($browser->getFrameFocus(), array(1, 1));
+        $this->assertEqual($browser->getContent(), 'Page one');
+
+        $this->assertTrue($browser->setFrameFocusByIndex(2));
+        $this->assertEqual($browser->getFrameFocus(), array(1, 2));
+        $this->assertEqual($browser->getContent(), 'Page two');
+
+        $browser->clearFrameFocus();
+        $this->assertTrue($browser->setFrameFocusByIndex(2));
+        $this->assertEqual($browser->getFrameFocus(), array(2));
+        $this->assertEqual($browser->getContent(), 'Page three');
+
+        $this->assertTrue($browser->setFrameFocusByIndex(1));
+        $this->assertEqual($browser->getContent(), 'Page onePage two');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/collector_test.php b/3rdparty/simpletest/test/collector_test.php
new file mode 100755
index 00000000000..efdbf377ece
--- /dev/null
+++ b/3rdparty/simpletest/test/collector_test.php
@@ -0,0 +1,50 @@
+<?php
+// $Id: collector_test.php 1769 2008-04-19 14:39:00Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../collector.php');
+SimpleTest::ignore('MockTestSuite');
+Mock::generate('TestSuite');
+
+class PathEqualExpectation extends EqualExpectation {
+	function __construct($value, $message = '%s') {
+    	parent::__construct(str_replace("\\", '/', $value), $message);
+	}
+
+    function test($compare) {
+        return parent::test(str_replace("\\", '/', $compare));
+    }
+}
+
+class TestOfCollector extends UnitTestCase {
+    function testCollectionIsAddedToGroup() {
+        $suite = new MockTestSuite();
+        $suite->expectMinimumCallCount('addFile', 2);
+        $suite->expect(
+                'addFile',
+                array(new PatternExpectation('/collectable\\.(1|2)$/')));
+        $collector = new SimpleCollector();
+        $collector->collect($suite, dirname(__FILE__) . '/support/collector/');
+    }
+}
+
+class TestOfPatternCollector extends UnitTestCase {
+
+    function testAddingEverythingToGroup() {
+        $suite = new MockTestSuite();
+        $suite->expectCallCount('addFile', 2);
+        $suite->expect(
+                'addFile',
+                array(new PatternExpectation('/collectable\\.(1|2)$/')));
+        $collector = new SimplePatternCollector('/.*/');
+        $collector->collect($suite, dirname(__FILE__) . '/support/collector/');
+    }
+
+    function testOnlyMatchedFilesAreAddedToGroup() {
+        $suite = new MockTestSuite();
+        $suite->expectOnce('addFile', array(new PathEqualExpectation(
+        		dirname(__FILE__) . '/support/collector/collectable.1')));
+        $collector = new SimplePatternCollector('/1$/');
+        $collector->collect($suite, dirname(__FILE__) . '/support/collector/');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/command_line_test.php b/3rdparty/simpletest/test/command_line_test.php
new file mode 100755
index 00000000000..5baabff33c6
--- /dev/null
+++ b/3rdparty/simpletest/test/command_line_test.php
@@ -0,0 +1,40 @@
+<?php
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../default_reporter.php');
+
+class TestOfCommandLineParsing extends UnitTestCase {
+    
+    function testDefaultsToEmptyStringToMeanNullToTheSelectiveReporter() {
+        $parser = new SimpleCommandLineParser(array());
+        $this->assertIdentical($parser->getTest(), '');
+        $this->assertIdentical($parser->getTestCase(), '');
+    }
+    
+    function testNotXmlByDefault() {
+        $parser = new SimpleCommandLineParser(array());
+        $this->assertFalse($parser->isXml());
+    }
+    
+    function testCanDetectRequestForXml() {
+        $parser = new SimpleCommandLineParser(array('--xml'));
+        $this->assertTrue($parser->isXml());
+    }
+    
+    function testCanReadAssignmentSyntax() {
+        $parser = new SimpleCommandLineParser(array('--test=myTest'));
+        $this->assertEqual($parser->getTest(), 'myTest');
+    }
+    
+    function testCanReadFollowOnSyntax() {
+        $parser = new SimpleCommandLineParser(array('--test', 'myTest'));
+        $this->assertEqual($parser->getTest(), 'myTest');
+    }
+    
+    function testCanReadShortForms() {
+        $parser = new SimpleCommandLineParser(array('-t', 'myTest', '-c', 'MyClass', '-x'));
+        $this->assertEqual($parser->getTest(), 'myTest');
+        $this->assertEqual($parser->getTestCase(), 'MyClass');
+        $this->assertTrue($parser->isXml());
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/compatibility_test.php b/3rdparty/simpletest/test/compatibility_test.php
new file mode 100755
index 00000000000..b8635e5bb83
--- /dev/null
+++ b/3rdparty/simpletest/test/compatibility_test.php
@@ -0,0 +1,87 @@
+<?php
+// $Id: compatibility_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../compatibility.php');
+
+class ComparisonClass { }
+class ComparisonSubclass extends ComparisonClass { }
+interface ComparisonInterface { }
+class ComparisonClassWithInterface implements ComparisonInterface { }
+
+class TestOfCompatibility extends UnitTestCase {
+    
+    function testIsA() {
+        $this->assertTrue(SimpleTestCompatibility::isA(
+                new ComparisonClass(),
+                'ComparisonClass'));
+        $this->assertFalse(SimpleTestCompatibility::isA(
+                new ComparisonClass(),
+                'ComparisonSubclass'));
+        $this->assertTrue(SimpleTestCompatibility::isA(
+                new ComparisonSubclass(),
+                'ComparisonClass'));
+    }
+    
+    function testIdentityOfNumericStrings() {
+        $numericString1 = "123";
+        $numericString2 = "00123";
+        $this->assertNotIdentical($numericString1, $numericString2);
+    }
+    
+    function testIdentityOfObjects() {
+        $object1 = new ComparisonClass();
+        $object2 = new ComparisonClass();
+        $this->assertIdentical($object1, $object2);
+    }
+    
+    function testReferences () {
+        $thing = "Hello";
+        $thing_reference = &$thing;
+        $thing_copy = $thing;
+        $this->assertTrue(SimpleTestCompatibility::isReference(
+                $thing,
+                $thing));
+        $this->assertTrue(SimpleTestCompatibility::isReference(
+                $thing,
+                $thing_reference));
+        $this->assertFalse(SimpleTestCompatibility::isReference(
+                $thing,
+                $thing_copy));
+    }
+    
+    function testObjectReferences () {
+        $object = new ComparisonClass();
+        $object_reference = $object;
+        $object_copy = new ComparisonClass();
+        $object_assignment = $object;
+        $this->assertTrue(SimpleTestCompatibility::isReference(
+                $object,
+                $object));
+        $this->assertTrue(SimpleTestCompatibility::isReference(
+                $object,
+                $object_reference));
+        $this->assertFalse(SimpleTestCompatibility::isReference(
+                $object,
+                $object_copy));
+        if (version_compare(phpversion(), '5', '>=')) {
+            $this->assertTrue(SimpleTestCompatibility::isReference(
+                    $object,
+                    $object_assignment));
+        } else {
+            $this->assertFalse(SimpleTestCompatibility::isReference(
+                    $object,
+                    $object_assignment));
+        }
+    }
+    
+    function testInteraceComparison() {
+        $object = new ComparisonClassWithInterface();
+        $this->assertFalse(SimpleTestCompatibility::isA(
+                new ComparisonClass(),
+                'ComparisonInterface'));
+        $this->assertTrue(SimpleTestCompatibility::isA(
+                new ComparisonClassWithInterface(),
+                'ComparisonInterface'));
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/cookies_test.php b/3rdparty/simpletest/test/cookies_test.php
new file mode 100755
index 00000000000..0b49e43bf9f
--- /dev/null
+++ b/3rdparty/simpletest/test/cookies_test.php
@@ -0,0 +1,227 @@
+<?php
+// $Id: cookies_test.php 1506 2007-05-07 00:58:03Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../cookies.php');
+
+class TestOfCookie extends UnitTestCase {
+    
+    function testCookieDefaults() {
+        $cookie = new SimpleCookie("name");
+        $this->assertFalse($cookie->getValue());
+        $this->assertEqual($cookie->getPath(), "/");
+        $this->assertIdentical($cookie->getHost(), false);
+        $this->assertFalse($cookie->getExpiry());
+        $this->assertFalse($cookie->isSecure());
+    }
+    
+    function testCookieAccessors() {
+        $cookie = new SimpleCookie(
+                "name",
+                "value",
+                "/path",
+                "Mon, 18 Nov 2002 15:50:29 GMT",
+                true);
+        $this->assertEqual($cookie->getName(), "name");
+        $this->assertEqual($cookie->getValue(), "value");
+        $this->assertEqual($cookie->getPath(), "/path/");
+        $this->assertEqual($cookie->getExpiry(), "Mon, 18 Nov 2002 15:50:29 GMT");
+        $this->assertTrue($cookie->isSecure());
+    }
+    
+    function testFullHostname() {
+        $cookie = new SimpleCookie("name");
+        $this->assertTrue($cookie->setHost("host.name.here"));
+        $this->assertEqual($cookie->getHost(), "host.name.here");
+        $this->assertTrue($cookie->setHost("host.com"));
+        $this->assertEqual($cookie->getHost(), "host.com");
+    }
+    
+    function testHostTruncation() {
+        $cookie = new SimpleCookie("name");
+        $cookie->setHost("this.host.name.here");
+        $this->assertEqual($cookie->getHost(), "host.name.here");
+        $cookie->setHost("this.host.com");
+        $this->assertEqual($cookie->getHost(), "host.com");
+        $this->assertTrue($cookie->setHost("dashes.in-host.com"));
+        $this->assertEqual($cookie->getHost(), "in-host.com");
+    }
+    
+    function testBadHosts() {
+        $cookie = new SimpleCookie("name");
+        $this->assertFalse($cookie->setHost("gibberish"));
+        $this->assertFalse($cookie->setHost("host.here"));
+        $this->assertFalse($cookie->setHost("host..com"));
+        $this->assertFalse($cookie->setHost("..."));
+        $this->assertFalse($cookie->setHost("host.com."));
+    }
+    
+    function testHostValidity() {
+        $cookie = new SimpleCookie("name");
+        $cookie->setHost("this.host.name.here");
+        $this->assertTrue($cookie->isValidHost("host.name.here"));
+        $this->assertTrue($cookie->isValidHost("that.host.name.here"));
+        $this->assertFalse($cookie->isValidHost("bad.host"));
+        $this->assertFalse($cookie->isValidHost("nearly.name.here"));
+    }
+    
+    function testPathValidity() {
+        $cookie = new SimpleCookie("name", "value", "/path");
+        $this->assertFalse($cookie->isValidPath("/"));
+        $this->assertTrue($cookie->isValidPath("/path/"));
+        $this->assertTrue($cookie->isValidPath("/path/more"));
+    }
+    
+    function testSessionExpiring() {
+        $cookie = new SimpleCookie("name", "value", "/path");
+        $this->assertTrue($cookie->isExpired(0));
+    }
+    
+    function testTimestampExpiry() {
+        $cookie = new SimpleCookie("name", "value", "/path", 456);
+        $this->assertFalse($cookie->isExpired(0));
+        $this->assertTrue($cookie->isExpired(457));
+        $this->assertFalse($cookie->isExpired(455));
+    }
+    
+    function testDateExpiry() {
+        $cookie = new SimpleCookie(
+                "name",
+                "value",
+                "/path",
+                "Mon, 18 Nov 2002 15:50:29 GMT");
+        $this->assertTrue($cookie->isExpired("Mon, 18 Nov 2002 15:50:30 GMT"));
+        $this->assertFalse($cookie->isExpired("Mon, 18 Nov 2002 15:50:28 GMT"));
+    }
+    
+    function testAging() {
+        $cookie = new SimpleCookie("name", "value", "/path", 200);
+        $cookie->agePrematurely(199);
+        $this->assertFalse($cookie->isExpired(0));
+        $cookie->agePrematurely(2);
+        $this->assertTrue($cookie->isExpired(0));
+    }
+}
+
+class TestOfCookieJar extends UnitTestCase {
+    
+    function testAddCookie() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie("a", "A");
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=A'));
+    }
+    
+    function testHostFilter() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'A', 'my-host.com');
+        $jar->setCookie('b', 'B', 'another-host.com');
+        $jar->setCookie('c', 'C');
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('my-host.com')),
+                array('a=A', 'c=C'));
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('another-host.com')),
+                array('b=B', 'c=C'));
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('www.another-host.com')),
+                array('b=B', 'c=C'));
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('new-host.org')),
+                array('c=C'));
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('/')),
+                array('a=A', 'b=B', 'c=C'));
+    }
+    
+    function testPathFilter() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'A', false, '/path/');
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/elsewhere')), array());
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/')), array('a=A'));
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path')), array('a=A'));
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/pa')), array());
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/here')), array('a=A'));
+    }
+    
+    function testPathFilterDeeply() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'A', false, '/path/more_path/');
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/')), array());
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path')), array());
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/pa')), array());
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/more_path/')), array('a=A'));
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/more_path/and_more')), array('a=A'));
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/not_here/')), array());
+    }
+    
+    function testMultipleCookieWithDifferentPathsButSameName() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'abc', false, '/');
+        $jar->setCookie('a', '123', false, '/path/here/');
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('/')),
+                array('a=abc'));
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('my-host.com/')),
+                array('a=abc'));
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('my-host.com/path/')),
+                array('a=abc'));
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('my-host.com/path/here')),
+                array('a=abc', 'a=123'));
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('my-host.com/path/here/there')),
+                array('a=abc', 'a=123'));
+    }
+    
+    function testOverwrite() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'abc', false, '/');
+        $jar->setCookie('a', 'cde', false, '/');
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=cde'));
+    }
+    
+    function testClearSessionCookies() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'A', false, '/');
+        $jar->restartSession();
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
+    }
+    
+    function testExpiryFilterByDate() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'A', false, '/', 'Wed, 25-Dec-02 04:24:20 GMT');
+        $jar->restartSession("Wed, 25-Dec-02 04:24:19 GMT");
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=A'));
+        $jar->restartSession("Wed, 25-Dec-02 04:24:21 GMT");
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
+    }
+    
+    function testExpiryFilterByAgeing() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'A', false, '/', 'Wed, 25-Dec-02 04:24:20 GMT');
+        $jar->restartSession("Wed, 25-Dec-02 04:24:19 GMT");
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=A'));
+        $jar->agePrematurely(2);
+        $jar->restartSession("Wed, 25-Dec-02 04:24:19 GMT");
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
+    }
+    
+    function testCookieClearing() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'abc', false, '/');
+        $jar->setCookie('a', '', false, '/');
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a='));
+    }
+    
+    function testCookieClearByLoweringDate() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'abc', false, '/', 'Wed, 25-Dec-02 04:24:21 GMT');
+        $jar->setCookie('a', 'def', false, '/', 'Wed, 25-Dec-02 04:24:19 GMT');
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=def'));
+        $jar->restartSession('Wed, 25-Dec-02 04:24:20 GMT');
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/detached_test.php b/3rdparty/simpletest/test/detached_test.php
new file mode 100755
index 00000000000..f651d97eb61
--- /dev/null
+++ b/3rdparty/simpletest/test/detached_test.php
@@ -0,0 +1,15 @@
+<?php
+// $Id: detached_test.php 1884 2009-07-01 16:30:40Z lastcraft $
+require_once('../detached.php');
+require_once('../reporter.php');
+
+// The following URL will depend on your own installation.
+$command = 'php ' . dirname(__FILE__) . '/visual_test.php xml';
+
+$test = new TestSuite('Remote tests');
+$test->add(new DetachedTestCase($command));
+if (SimpleReporter::inCli()) {
+    exit ($test->run(new TextReporter()) ? 0 : 1);
+}
+$test->run(new HtmlReporter());
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/dumper_test.php b/3rdparty/simpletest/test/dumper_test.php
new file mode 100755
index 00000000000..789047de924
--- /dev/null
+++ b/3rdparty/simpletest/test/dumper_test.php
@@ -0,0 +1,88 @@
+<?php
+// $Id: dumper_test.php 1505 2007-04-30 23:39:59Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+
+class DumperDummy {
+}
+
+class TestOfTextFormatting extends UnitTestCase {
+    
+    function testClipping() {
+        $dumper = new SimpleDumper();
+        $this->assertEqual(
+                $dumper->clipString("Hello", 6),
+                "Hello",
+                "Hello, 6->%s");
+        $this->assertEqual(
+                $dumper->clipString("Hello", 5),
+                "Hello",
+                "Hello, 5->%s");
+        $this->assertEqual(
+                $dumper->clipString("Hello world", 3),
+                "Hel...",
+                "Hello world, 3->%s");
+        $this->assertEqual(
+                $dumper->clipString("Hello world", 6, 3),
+                "Hello ...",
+                "Hello world, 6, 3->%s");
+        $this->assertEqual(
+                $dumper->clipString("Hello world", 3, 6),
+                "...o w...",
+                "Hello world, 3, 6->%s");
+        $this->assertEqual(
+                $dumper->clipString("Hello world", 4, 11),
+                "...orld",
+                "Hello world, 4, 11->%s");
+        $this->assertEqual(
+                $dumper->clipString("Hello world", 4, 12),
+                "...orld",
+                "Hello world, 4, 12->%s");
+    }
+    
+    function testDescribeNull() {
+        $dumper = new SimpleDumper();
+        $this->assertPattern('/null/i', $dumper->describeValue(null));
+    }
+    
+    function testDescribeBoolean() {
+        $dumper = new SimpleDumper();
+        $this->assertPattern('/boolean/i', $dumper->describeValue(true));
+        $this->assertPattern('/true/i', $dumper->describeValue(true));
+        $this->assertPattern('/false/i', $dumper->describeValue(false));
+    }
+    
+    function testDescribeString() {
+        $dumper = new SimpleDumper();
+        $this->assertPattern('/string/i', $dumper->describeValue('Hello'));
+        $this->assertPattern('/Hello/', $dumper->describeValue('Hello'));
+    }
+    
+    function testDescribeInteger() {
+        $dumper = new SimpleDumper();
+        $this->assertPattern('/integer/i', $dumper->describeValue(35));
+        $this->assertPattern('/35/', $dumper->describeValue(35));
+    }
+    
+    function testDescribeFloat() {
+        $dumper = new SimpleDumper();
+        $this->assertPattern('/float/i', $dumper->describeValue(0.99));
+        $this->assertPattern('/0\.99/', $dumper->describeValue(0.99));
+    }
+    
+    function testDescribeArray() {
+        $dumper = new SimpleDumper();
+        $this->assertPattern('/array/i', $dumper->describeValue(array(1, 4)));
+        $this->assertPattern('/2/i', $dumper->describeValue(array(1, 4)));
+    }
+    
+    function testDescribeObject() {
+        $dumper = new SimpleDumper();
+        $this->assertPattern(
+                '/object/i',
+                $dumper->describeValue(new DumperDummy()));
+        $this->assertPattern(
+                '/DumperDummy/i',
+                $dumper->describeValue(new DumperDummy()));
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/eclipse_test.php b/3rdparty/simpletest/test/eclipse_test.php
new file mode 100755
index 00000000000..c90cbc918fd
--- /dev/null
+++ b/3rdparty/simpletest/test/eclipse_test.php
@@ -0,0 +1,32 @@
+<?php
+// $Id: eclipse_test.php 1739 2008-04-09 20:48:37Z edwardzyang $
+
+//To run this from the eclipse plugin...you need to make sure that the 
+//SimpleTest path in the preferences is the same as the location of the 
+//eclipse.php file below otherwise you end up with two "different" eclipse.php 
+//files included and that does not work...
+
+include_once(dirname(__FILE__) . '/../eclipse.php');
+Mock::generate('SimpleSocket');
+
+class TestOfEclipse extends UnitTestCase {
+	
+	function testPass() {
+		$listener = &new MockSimpleSocket();
+		
+		$fullpath = realpath(dirname(__FILE__).'/support/test1.php');
+		$testpath = EclipseReporter::escapeVal($fullpath);
+		$expected = "{status:\"pass\",message:\"pass1 at [$testpath line 4]\",group:\"$testpath\",case:\"test1\",method:\"test_pass\"}";
+		//this should work...but it doesn't so the next line and the last line are the hacks
+		//$listener->expectOnce('write',array($expected));
+		$listener->setReturnValue('write',-1);
+		
+		$pathparts = pathinfo($fullpath);
+		$filename = $pathparts['basename'];
+		$test= &new TestSuite($filename);
+		$test->addTestFile($fullpath);
+		$test->run(new EclipseReporter($listener));
+		$this->assertEqual($expected,$listener->output);
+	}
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/encoding_test.php b/3rdparty/simpletest/test/encoding_test.php
new file mode 100755
index 00000000000..a09236e057c
--- /dev/null
+++ b/3rdparty/simpletest/test/encoding_test.php
@@ -0,0 +1,240 @@
+<?php
+// $Id: encoding_test.php 1963 2009-10-07 11:57:52Z maetl_ $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../url.php');
+require_once(dirname(__FILE__) . '/../socket.php');
+
+Mock::generate('SimpleSocket');
+
+class TestOfEncodedParts extends UnitTestCase {
+    
+    function testFormEncodedAsKeyEqualsValue() {
+        $pair = new SimpleEncodedPair('a', 'A');
+        $this->assertEqual($pair->asRequest(), 'a=A');
+    }
+    
+    function testMimeEncodedAsHeadersAndContent() {
+        $pair = new SimpleEncodedPair('a', 'A');
+        $this->assertEqual(
+                $pair->asMime(),
+                "Content-Disposition: form-data; name=\"a\"\r\n\r\nA");
+    }
+    
+    function testAttachmentEncodedAsHeadersWithDispositionAndContent() {
+        $part = new SimpleAttachment('a', 'A', 'aaa.txt');
+        $this->assertEqual(
+                $part->asMime(),
+                "Content-Disposition: form-data; name=\"a\"; filename=\"aaa.txt\"\r\n" .
+                        "Content-Type: text/plain\r\n\r\nA");
+    }
+}
+
+class TestOfEncoding extends UnitTestCase {
+    private $content_so_far;
+    
+    function write($content) {
+        $this->content_so_far .= $content;
+    }
+    
+    function clear() {
+        $this->content_so_far = '';
+    }
+    
+    function assertWritten($encoding, $content, $message = '%s') {
+        $this->clear();
+        $encoding->writeTo($this);
+        $this->assertIdentical($this->content_so_far, $content, $message);
+    }
+    
+    function testGetEmpty() {
+        $encoding = new SimpleGetEncoding();
+        $this->assertIdentical($encoding->getValue('a'), false);
+        $this->assertIdentical($encoding->asUrlRequest(), '');
+    }
+    
+    function testPostEmpty() {
+        $encoding = new SimplePostEncoding();
+        $this->assertIdentical($encoding->getValue('a'), false);
+        $this->assertWritten($encoding, '');
+    }
+    
+    function testPrefilled() {
+        $encoding = new SimplePostEncoding(array('a' => 'aaa'));
+        $this->assertIdentical($encoding->getValue('a'), 'aaa');
+        $this->assertWritten($encoding, 'a=aaa');
+    }
+    
+    function testPrefilledWithTwoLevels() {
+        $query = array('a' => array('aa' => 'aaa'));
+        $encoding = new SimplePostEncoding($query);
+        $this->assertTrue($encoding->hasMoreThanOneLevel($query));
+        $this->assertEqual($encoding->rewriteArrayWithMultipleLevels($query), array('a[aa]' => 'aaa'));
+        $this->assertIdentical($encoding->getValue('a[aa]'), 'aaa');
+        $this->assertWritten($encoding, 'a%5Baa%5D=aaa');
+    }
+    
+    function testPrefilledWithThreeLevels() {
+        $query = array('a' => array('aa' => array('aaa' => 'aaaa')));
+        $encoding = new SimplePostEncoding($query);
+        $this->assertTrue($encoding->hasMoreThanOneLevel($query));
+        $this->assertEqual($encoding->rewriteArrayWithMultipleLevels($query), array('a[aa][aaa]' => 'aaaa'));
+        $this->assertIdentical($encoding->getValue('a[aa][aaa]'), 'aaaa');
+        $this->assertWritten($encoding, 'a%5Baa%5D%5Baaa%5D=aaaa');
+    }
+    
+    function testPrefilledWithObject() {
+        $encoding = new SimplePostEncoding(new SimpleEncoding(array('a' => 'aaa')));
+        $this->assertIdentical($encoding->getValue('a'), 'aaa');
+        $this->assertWritten($encoding, 'a=aaa');
+    }
+    
+    function testMultiplePrefilled() {
+        $query = array('a' => array('a1', 'a2'));
+        $encoding = new SimplePostEncoding($query);
+        $this->assertTrue($encoding->hasMoreThanOneLevel($query));
+        $this->assertEqual($encoding->rewriteArrayWithMultipleLevels($query), array('a[0]' => 'a1', 'a[1]' => 'a2'));
+        $this->assertIdentical($encoding->getValue('a[0]'), 'a1');
+        $this->assertIdentical($encoding->getValue('a[1]'), 'a2');
+        $this->assertWritten($encoding, 'a%5B0%5D=a1&a%5B1%5D=a2');
+    }
+    
+    function testSingleParameter() {
+        $encoding = new SimplePostEncoding();
+        $encoding->add('a', 'Hello');
+        $this->assertEqual($encoding->getValue('a'), 'Hello');
+        $this->assertWritten($encoding, 'a=Hello');
+    }
+    
+    function testFalseParameter() {
+        $encoding = new SimplePostEncoding();
+        $encoding->add('a', false);
+        $this->assertEqual($encoding->getValue('a'), false);
+        $this->assertWritten($encoding, '');
+    }
+    
+    function testUrlEncoding() {
+        $encoding = new SimplePostEncoding();
+        $encoding->add('a', 'Hello there!');
+        $this->assertWritten($encoding, 'a=Hello+there%21');
+    }
+    
+    function testUrlEncodingOfKey() {
+        $encoding = new SimplePostEncoding();
+        $encoding->add('a!', 'Hello');
+        $this->assertWritten($encoding, 'a%21=Hello');
+    }
+    
+    function testMultipleParameter() {
+        $encoding = new SimplePostEncoding();
+        $encoding->add('a', 'Hello');
+        $encoding->add('b', 'Goodbye');
+        $this->assertWritten($encoding, 'a=Hello&b=Goodbye');
+    }
+    
+    function testEmptyParameters() {
+        $encoding = new SimplePostEncoding();
+        $encoding->add('a', '');
+        $encoding->add('b', '');
+        $this->assertWritten($encoding, 'a=&b=');
+    }
+    
+    function testRepeatedParameter() {
+        $encoding = new SimplePostEncoding();
+        $encoding->add('a', 'Hello');
+        $encoding->add('a', 'Goodbye');
+        $this->assertIdentical($encoding->getValue('a'), array('Hello', 'Goodbye'));
+        $this->assertWritten($encoding, 'a=Hello&a=Goodbye');
+    }
+    
+    function testAddingLists() {
+        $encoding = new SimplePostEncoding();
+        $encoding->add('a', array('Hello', 'Goodbye'));
+        $this->assertIdentical($encoding->getValue('a'), array('Hello', 'Goodbye'));
+        $this->assertWritten($encoding, 'a=Hello&a=Goodbye');
+    }
+    
+    function testMergeInHash() {
+        $encoding = new SimpleGetEncoding(array('a' => 'A1', 'b' => 'B'));
+        $encoding->merge(array('a' => 'A2'));
+        $this->assertIdentical($encoding->getValue('a'), array('A1', 'A2'));
+        $this->assertIdentical($encoding->getValue('b'), 'B');
+    }
+    
+    function testMergeInObject() {
+        $encoding = new SimpleGetEncoding(array('a' => 'A1', 'b' => 'B'));
+        $encoding->merge(new SimpleEncoding(array('a' => 'A2')));
+        $this->assertIdentical($encoding->getValue('a'), array('A1', 'A2'));
+        $this->assertIdentical($encoding->getValue('b'), 'B');
+    }
+    
+    function testPrefilledMultipart() {
+        $encoding = new SimpleMultipartEncoding(array('a' => 'aaa'), 'boundary');
+        $this->assertIdentical($encoding->getValue('a'), 'aaa');
+        $this->assertwritten($encoding,
+                "--boundary\r\n" .
+                "Content-Disposition: form-data; name=\"a\"\r\n" .
+                "\r\n" .
+                "aaa\r\n" .
+                "--boundary--\r\n");
+    }
+    
+    function testAttachment() {
+        $encoding = new SimpleMultipartEncoding(array(), 'boundary');
+        $encoding->attach('a', 'aaa', 'aaa.txt');
+        $this->assertIdentical($encoding->getValue('a'), 'aaa.txt');
+        $this->assertwritten($encoding,
+                "--boundary\r\n" .
+                "Content-Disposition: form-data; name=\"a\"; filename=\"aaa.txt\"\r\n" .
+                "Content-Type: text/plain\r\n" .
+                "\r\n" .
+                "aaa\r\n" .
+                "--boundary--\r\n");
+    }
+    
+    function testEntityEncodingDefaultContentType() {
+        $encoding = new SimpleEntityEncoding();
+        $this->assertIdentical($encoding->getContentType(), 'application/x-www-form-urlencoded');
+        $this->assertWritten($encoding, '');
+    }
+    
+    function testEntityEncodingTextBody() {
+        $encoding = new SimpleEntityEncoding('plain text');
+        $this->assertIdentical($encoding->getContentType(), 'text/plain');
+        $this->assertWritten($encoding, 'plain text');
+    }
+    
+    function testEntityEncodingXmlBody() {
+        $encoding = new SimpleEntityEncoding('<p><a>xml</b><b>text</b></p>', 'text/xml');
+        $this->assertIdentical($encoding->getContentType(), 'text/xml');
+        $this->assertWritten($encoding, '<p><a>xml</b><b>text</b></p>');
+    }
+}
+
+class TestOfEncodingHeaders extends UnitTestCase {
+    
+    function testEmptyEncodingWritesZeroContentLength() {
+        $socket = new MockSimpleSocket();
+        $socket->expectAt(0, 'write', array("Content-Length: 0\r\n"));
+        $socket->expectAt(1, 'write', array("Content-Type: application/x-www-form-urlencoded\r\n"));
+        $encoding = new SimpleEntityEncoding();
+        $encoding->writeHeadersTo($socket);
+    }
+    
+    function testTextEncodingWritesDefaultContentType() {
+        $socket = new MockSimpleSocket();
+        $socket->expectAt(0, 'write', array("Content-Length: 18\r\n"));
+        $socket->expectAt(1, 'write', array("Content-Type: text/plain\r\n"));
+        $encoding = new SimpleEntityEncoding('one two three four');
+        $encoding->writeHeadersTo($socket);
+    }
+    
+    function testEmptyMultipartEncodingWritesEndBoundaryContentLength() {
+        $socket = new MockSimpleSocket();
+        $socket->expectAt(0, 'write', array("Content-Length: 14\r\n"));
+        $socket->expectAt(1, 'write', array("Content-Type: multipart/form-data; boundary=boundary\r\n"));
+        $encoding = new SimpleMultipartEncoding(array(), 'boundary');
+        $encoding->writeHeadersTo($socket);
+    }
+    
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/errors_test.php b/3rdparty/simpletest/test/errors_test.php
new file mode 100755
index 00000000000..ebb9e05891f
--- /dev/null
+++ b/3rdparty/simpletest/test/errors_test.php
@@ -0,0 +1,229 @@
+<?php
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../errors.php');
+require_once(dirname(__FILE__) . '/../expectation.php');
+require_once(dirname(__FILE__) . '/../test_case.php');
+Mock::generate('SimpleTestCase');
+Mock::generate('SimpleExpectation');
+SimpleTest::ignore('MockSimpleTestCase');
+
+class TestOfErrorQueue extends UnitTestCase {
+
+    function setUp() {
+        $context = SimpleTest::getContext();
+        $queue = $context->get('SimpleErrorQueue');
+        $queue->clear();
+    }
+
+    function tearDown() {
+        $context = SimpleTest::getContext();
+        $queue = $context->get('SimpleErrorQueue');
+        $queue->clear();
+    }
+
+    function testExpectationMatchCancelsIncomingError() {
+        $test = new MockSimpleTestCase();
+        $test->expectOnce('assert', array(
+                new IdenticalExpectation(new AnythingExpectation()),
+                'B',
+                'a message'));
+        $test->setReturnValue('assert', true);
+        $test->expectNever('error');
+        $queue = new SimpleErrorQueue();
+        $queue->setTestCase($test);
+        $queue->expectError(new AnythingExpectation(), 'a message');
+        $queue->add(1024, 'B', 'b.php', 100);
+    }
+}
+
+class TestOfErrorTrap extends UnitTestCase {
+    private $old;
+
+    function setUp() {
+        $this->old = error_reporting(E_ALL);
+        set_error_handler('SimpleTestErrorHandler');
+    }
+
+    function tearDown() {
+        restore_error_handler();
+        error_reporting($this->old);
+    }
+
+    function testQueueStartsEmpty() {
+        $context = SimpleTest::getContext();
+        $queue = $context->get('SimpleErrorQueue');
+        $this->assertFalse($queue->extract());
+    }
+
+    function testErrorsAreSwallowedByMatchingExpectation() {
+        $this->expectError('Ouch!');
+        trigger_error('Ouch!');
+    }
+
+    function testErrorsAreSwallowedInOrder() {
+        $this->expectError('a');
+        $this->expectError('b');
+        trigger_error('a');
+        trigger_error('b');
+    }
+
+    function testAnyErrorCanBeSwallowed() {
+        $this->expectError();
+        trigger_error('Ouch!');
+    }
+
+    function testErrorCanBeSwallowedByPatternMatching() {
+        $this->expectError(new PatternExpectation('/ouch/i'));
+        trigger_error('Ouch!');
+    }
+
+    function testErrorWithPercentsPassesWithNoSprintfError() {
+        $this->expectError("%");
+        trigger_error('%');
+    }
+}
+
+class TestOfErrors extends UnitTestCase {
+    private $old;
+
+    function setUp() {
+        $this->old = error_reporting(E_ALL);
+    }
+
+    function tearDown() {
+        error_reporting($this->old);
+    }
+
+    function testDefaultWhenAllReported() {
+        error_reporting(E_ALL);
+        $this->expectError('Ouch!');
+        trigger_error('Ouch!');
+    }
+
+    function testNoticeWhenReported() {
+        error_reporting(E_ALL);
+        $this->expectError('Ouch!');
+        trigger_error('Ouch!', E_USER_NOTICE);
+    }
+
+    function testWarningWhenReported() {
+        error_reporting(E_ALL);
+        $this->expectError('Ouch!');
+        trigger_error('Ouch!', E_USER_WARNING);
+    }
+
+    function testErrorWhenReported() {
+        error_reporting(E_ALL);
+        $this->expectError('Ouch!');
+        trigger_error('Ouch!', E_USER_ERROR);
+    }
+
+    function testNoNoticeWhenNotReported() {
+        error_reporting(0);
+        trigger_error('Ouch!', E_USER_NOTICE);
+    }
+
+    function testNoWarningWhenNotReported() {
+        error_reporting(0);
+        trigger_error('Ouch!', E_USER_WARNING);
+    }
+
+    function testNoticeSuppressedWhenReported() {
+        error_reporting(E_ALL);
+        @trigger_error('Ouch!', E_USER_NOTICE);
+    }
+
+    function testWarningSuppressedWhenReported() {
+        error_reporting(E_ALL);
+        @trigger_error('Ouch!', E_USER_WARNING);
+    }
+
+    function testErrorWithPercentsReportedWithNoSprintfError() {
+        $this->expectError('%');
+        trigger_error('%');
+    }
+}
+
+class TestOfPHP52RecoverableErrors extends UnitTestCase {
+    function skip() {
+        $this->skipIf(
+                version_compare(phpversion(), '5.2', '<'),
+                'E_RECOVERABLE_ERROR not tested for PHP below 5.2');
+    }
+
+    function testError() {
+        eval('
+            class RecoverableErrorTestingStub {
+                function ouch(RecoverableErrorTestingStub $obj) {
+                }
+            }
+        ');
+
+        $stub = new RecoverableErrorTestingStub();
+        $this->expectError(new PatternExpectation('/must be an instance of RecoverableErrorTestingStub/i'));
+        $stub->ouch(new stdClass());
+    }
+}
+
+class TestOfErrorsExcludingPHP52AndAbove extends UnitTestCase {
+    function skip() {
+        $this->skipIf(
+                version_compare(phpversion(), '5.2', '>='),
+                'E_USER_ERROR not tested for PHP 5.2 and above');
+    }
+
+    function testNoErrorWhenNotReported() {
+        error_reporting(0);
+        trigger_error('Ouch!', E_USER_ERROR);
+    }
+
+    function testErrorSuppressedWhenReported() {
+        error_reporting(E_ALL);
+        @trigger_error('Ouch!', E_USER_ERROR);
+    }
+}
+
+SimpleTest::ignore('TestOfNotEnoughErrors');
+/**
+ * This test is ignored as it is used by {@link TestRunnerForLeftOverAndNotEnoughErrors}
+ * to verify that it fails as expected.
+ *
+ * @ignore
+ */
+class TestOfNotEnoughErrors extends UnitTestCase {
+    function testExpectTwoErrorsThrowOne() {
+        $this->expectError('Error 1');
+        trigger_error('Error 1');
+        $this->expectError('Error 2');
+    }
+}
+
+SimpleTest::ignore('TestOfLeftOverErrors');
+/**
+ * This test is ignored as it is used by {@link TestRunnerForLeftOverAndNotEnoughErrors}
+ * to verify that it fails as expected.
+ *
+ * @ignore
+ */
+class TestOfLeftOverErrors extends UnitTestCase {
+    function testExpectOneErrorGetTwo() {
+        $this->expectError('Error 1');
+        trigger_error('Error 1');
+        trigger_error('Error 2');
+    }
+}
+
+class TestRunnerForLeftOverAndNotEnoughErrors extends UnitTestCase {
+    function testRunLeftOverErrorsTestCase() {
+        $test = new TestOfLeftOverErrors();
+        $this->assertFalse($test->run(new SimpleReporter()));
+    }
+
+    function testRunNotEnoughErrors() {
+        $test = new TestOfNotEnoughErrors();
+        $this->assertFalse($test->run(new SimpleReporter()));
+    }
+}
+
+// TODO: Add stacked error handler test
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/exceptions_test.php b/3rdparty/simpletest/test/exceptions_test.php
new file mode 100755
index 00000000000..1011543d4fa
--- /dev/null
+++ b/3rdparty/simpletest/test/exceptions_test.php
@@ -0,0 +1,183 @@
+<?php
+// $Id: exceptions_test.php 1882 2009-07-01 14:30:05Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../exceptions.php');
+require_once(dirname(__FILE__) . '/../expectation.php');
+require_once(dirname(__FILE__) . '/../test_case.php');
+Mock::generate('SimpleTestCase');
+Mock::generate('SimpleExpectation');
+
+class MyTestException extends Exception {}
+class HigherTestException extends MyTestException {}
+class OtherTestException extends Exception {}
+
+class TestOfExceptionExpectation extends UnitTestCase {
+
+    function testExceptionClassAsStringWillMatchExceptionsRootedOnThatClass() {
+        $expectation = new ExceptionExpectation('MyTestException');
+        $this->assertTrue($expectation->test(new MyTestException()));
+        $this->assertTrue($expectation->test(new HigherTestException()));
+        $this->assertFalse($expectation->test(new OtherTestException()));
+    }
+
+    function testMatchesClassAndMessageWhenExceptionExpected() {
+        $expectation = new ExceptionExpectation(new MyTestException('Hello'));
+        $this->assertTrue($expectation->test(new MyTestException('Hello')));
+        $this->assertFalse($expectation->test(new HigherTestException('Hello')));
+        $this->assertFalse($expectation->test(new OtherTestException('Hello')));
+        $this->assertFalse($expectation->test(new MyTestException('Goodbye')));
+        $this->assertFalse($expectation->test(new MyTestException()));
+    }
+
+    function testMessagelessExceptionMatchesOnlyOnClass() {
+        $expectation = new ExceptionExpectation(new MyTestException());
+        $this->assertTrue($expectation->test(new MyTestException()));
+        $this->assertFalse($expectation->test(new HigherTestException()));
+    }
+}
+
+class TestOfExceptionTrap extends UnitTestCase {
+
+    function testNoExceptionsInQueueMeansNoTestMessages() {
+        $test = new MockSimpleTestCase();
+        $test->expectNever('assert');
+        $queue = new SimpleExceptionTrap();
+        $this->assertFalse($queue->isExpected($test, new Exception()));
+    }
+
+    function testMatchingExceptionGivesTrue() {
+        $expectation = new MockSimpleExpectation();
+        $expectation->setReturnValue('test', true);
+        $test = new MockSimpleTestCase();
+        $test->setReturnValue('assert', true);
+        $queue = new SimpleExceptionTrap();
+        $queue->expectException($expectation, 'message');
+        $this->assertTrue($queue->isExpected($test, new Exception()));
+    }
+
+    function testMatchingExceptionTriggersAssertion() {
+        $test = new MockSimpleTestCase();
+        $test->expectOnce('assert', array(
+                '*',
+                new ExceptionExpectation(new Exception()),
+                'message'));
+        $queue = new SimpleExceptionTrap();
+        $queue->expectException(new ExceptionExpectation(new Exception()), 'message');
+        $queue->isExpected($test, new Exception());
+    }
+}
+
+class TestOfCatchingExceptions extends UnitTestCase {
+
+    function testCanCatchAnyExpectedException() {
+        $this->expectException();
+        throw new Exception();
+    }
+
+    function testCanMatchExceptionByClass() {
+        $this->expectException('MyTestException');
+        throw new HigherTestException();
+    }
+
+    function testCanMatchExceptionExactly() {
+        $this->expectException(new Exception('Ouch'));
+        throw new Exception('Ouch');
+    }
+
+    function testLastListedExceptionIsTheOneThatCounts() {
+        $this->expectException('OtherTestException');
+        $this->expectException('MyTestException');
+        throw new HigherTestException();
+    }
+}
+
+class TestOfIgnoringExceptions extends UnitTestCase {
+
+    function testCanIgnoreAnyException() {
+        $this->ignoreException();
+        throw new Exception();
+    }
+
+    function testCanIgnoreSpecificException() {
+        $this->ignoreException('MyTestException');
+        throw new MyTestException();
+    }
+
+    function testCanIgnoreExceptionExactly() {
+        $this->ignoreException(new Exception('Ouch'));
+        throw new Exception('Ouch');
+    }
+
+    function testIgnoredExceptionsDoNotMaskExpectedExceptions() {
+        $this->ignoreException('Exception');
+        $this->expectException('MyTestException');
+        throw new MyTestException();
+    }
+
+    function testCanIgnoreMultipleExceptions() {
+        $this->ignoreException('MyTestException');
+        $this->ignoreException('OtherTestException');
+        throw new OtherTestException();
+    }
+}
+
+class TestOfCallingTearDownAfterExceptions extends UnitTestCase {
+    private $debri = 0;
+
+    function tearDown() {
+        $this->debri--;
+    }
+
+    function testLeaveSomeDebri() {
+        $this->debri++;
+        $this->expectException();
+        throw new Exception(__FUNCTION__);
+    }
+
+	function testDebriWasRemovedOnce() {
+        $this->assertEqual($this->debri, 0);
+	}
+}
+
+class TestOfExceptionThrownInSetUpDoesNotRunTestBody extends UnitTestCase {
+
+	function setUp() {
+        $this->expectException();
+        throw new Exception();
+	}
+
+	function testShouldNotBeRun() {
+        $this->fail('This test body should not be run');
+	}
+
+	function testShouldNotBeRunEither() {
+        $this->fail('This test body should not be run either');
+	}
+}
+
+class TestOfExpectExceptionWithSetUp extends UnitTestCase {
+
+	function setUp() {
+        $this->expectException();
+	}
+
+	function testThisExceptionShouldBeCaught() {
+        throw new Exception();
+	}
+
+	function testJustThrowingMyTestException() {
+        throw new MyTestException();
+	}
+}
+
+class TestOfThrowingExceptionsInTearDown extends UnitTestCase {
+
+    function tearDown() {
+        throw new Exception();
+    }
+
+    function testDoesntFatal() {
+        $this->expectException();
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/expectation_test.php b/3rdparty/simpletest/test/expectation_test.php
new file mode 100755
index 00000000000..31fbe65e683
--- /dev/null
+++ b/3rdparty/simpletest/test/expectation_test.php
@@ -0,0 +1,317 @@
+<?php
+// $Id: expectation_test.php 2009 2011-04-28 08:57:25Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../expectation.php');
+
+class TestOfEquality extends UnitTestCase {
+
+    function testBoolean() {
+        $is_true = new EqualExpectation(true);
+        $this->assertTrue($is_true->test(true));
+        $this->assertFalse($is_true->test(false));
+    }
+
+    function testStringMatch() {
+        $hello = new EqualExpectation("Hello");
+        $this->assertTrue($hello->test("Hello"));
+        $this->assertFalse($hello->test("Goodbye"));
+    }
+
+    function testInteger() {
+        $fifteen = new EqualExpectation(15);
+        $this->assertTrue($fifteen->test(15));
+        $this->assertFalse($fifteen->test(14));
+    }
+
+    function testFloat() {
+        $pi = new EqualExpectation(3.14);
+        $this->assertTrue($pi->test(3.14));
+        $this->assertFalse($pi->test(3.15));
+    }
+
+    function testArray() {
+        $colours = new EqualExpectation(array("r", "g", "b"));
+        $this->assertTrue($colours->test(array("r", "g", "b")));
+        $this->assertFalse($colours->test(array("g", "b", "r")));
+    }
+
+    function testHash() {
+        $is_blue = new EqualExpectation(array("r" => 0, "g" => 0, "b" => 255));
+        $this->assertTrue($is_blue->test(array("r" => 0, "g" => 0, "b" => 255)));
+        $this->assertFalse($is_blue->test(array("r" => 0, "g" => 255, "b" => 0)));
+    }
+
+    function testHashWithOutOfOrderKeysShouldStillMatch() {
+        $any_order = new EqualExpectation(array('a' => 1, 'b' => 2));
+        $this->assertTrue($any_order->test(array('b' => 2, 'a' => 1)));
+    }
+}
+
+class TestOfWithin extends UnitTestCase {
+
+    function testWithinFloatingPointMargin() {
+        $within = new WithinMarginExpectation(1.0, 0.2);
+        $this->assertFalse($within->test(0.7));
+        $this->assertTrue($within->test(0.8));
+        $this->assertTrue($within->test(0.9));
+        $this->assertTrue($within->test(1.1));
+        $this->assertTrue($within->test(1.2));
+        $this->assertFalse($within->test(1.3));
+    }
+
+    function testOutsideFloatingPointMargin() {
+        $within = new OutsideMarginExpectation(1.0, 0.2);
+        $this->assertTrue($within->test(0.7));
+        $this->assertFalse($within->test(0.8));
+        $this->assertFalse($within->test(1.2));
+        $this->assertTrue($within->test(1.3));
+    }
+}
+
+class TestOfInequality extends UnitTestCase {
+
+    function testStringMismatch() {
+        $not_hello = new NotEqualExpectation("Hello");
+        $this->assertTrue($not_hello->test("Goodbye"));
+        $this->assertFalse($not_hello->test("Hello"));
+    }
+}
+
+class RecursiveNasty {
+    private $me;
+
+    function RecursiveNasty() {
+        $this->me = $this;
+    }
+}
+
+class OpaqueContainer {
+    private $stuff;
+    private $value;
+
+    public function __construct($value) {
+        $this->value = $value;
+    }
+}
+
+class DerivedOpaqueContainer extends OpaqueContainer {
+    // Deliberately have a variable whose name with the same suffix as a later
+    // variable
+    private $new_value = 1;
+
+    // Deliberately obscures the variable of the same name in the base
+    // class.
+    private $value;
+
+    public function __construct($value, $base_value) {
+        parent::__construct($base_value);
+        $this->value = $value;
+    }
+}
+
+class TestOfIdentity extends UnitTestCase {
+
+    function testType() {
+        $string = new IdenticalExpectation("37");
+        $this->assertTrue($string->test("37"));
+        $this->assertFalse($string->test(37));
+        $this->assertFalse($string->test("38"));
+    }
+
+    function _testNastyPhp5Bug() {
+        $this->assertFalse(new RecursiveNasty() != new RecursiveNasty());
+    }
+
+    function _testReallyHorribleRecursiveStructure() {
+        $hopeful = new IdenticalExpectation(new RecursiveNasty());
+        $this->assertTrue($hopeful->test(new RecursiveNasty()));
+    }
+
+    function testCanComparePrivateMembers() {
+        $expectFive = new IdenticalExpectation(new OpaqueContainer(5));
+        $this->assertTrue($expectFive->test(new OpaqueContainer(5)));
+        $this->assertFalse($expectFive->test(new OpaqueContainer(6)));
+    }
+
+    function testCanComparePrivateMembersOfObjectsInArrays() {
+        $expectFive = new IdenticalExpectation(array(new OpaqueContainer(5)));
+        $this->assertTrue($expectFive->test(array(new OpaqueContainer(5))));
+        $this->assertFalse($expectFive->test(array(new OpaqueContainer(6))));
+    }
+
+    function testCanComparePrivateMembersOfObjectsWherePrivateMemberOfBaseClassIsObscured() {
+        $expectFive = new IdenticalExpectation(array(new DerivedOpaqueContainer(1,2)));
+        $this->assertTrue($expectFive->test(array(new DerivedOpaqueContainer(1,2))));
+        $this->assertFalse($expectFive->test(array(new DerivedOpaqueContainer(0,2))));
+        $this->assertFalse($expectFive->test(array(new DerivedOpaqueContainer(0,9))));
+        $this->assertFalse($expectFive->test(array(new DerivedOpaqueContainer(1,0))));
+    }
+}
+
+class TransparentContainer {
+    public $value;
+
+    public function __construct($value) {
+        $this->value = $value;
+    }
+}
+
+class TestOfMemberComparison extends UnitTestCase {
+
+    function testMemberExpectationCanMatchPublicMember() {
+        $expect_five = new MemberExpectation('value', 5);
+        $this->assertTrue($expect_five->test(new TransparentContainer(5)));
+        $this->assertFalse($expect_five->test(new TransparentContainer(8)));
+    }
+
+    function testMemberExpectationCanMatchPrivateMember() {
+        $expect_five = new MemberExpectation('value', 5);
+        $this->assertTrue($expect_five->test(new OpaqueContainer(5)));
+        $this->assertFalse($expect_five->test(new OpaqueContainer(8)));
+    }
+
+    function testMemberExpectationCanMatchPrivateMemberObscuredByDerivedClass() {
+        $expect_five = new MemberExpectation('value', 5);
+        $this->assertTrue($expect_five->test(new DerivedOpaqueContainer(5,8)));
+        $this->assertTrue($expect_five->test(new DerivedOpaqueContainer(5,5)));
+        $this->assertFalse($expect_five->test(new DerivedOpaqueContainer(8,8)));
+        $this->assertFalse($expect_five->test(new DerivedOpaqueContainer(8,5)));
+    }
+
+}
+
+class DummyReferencedObject{}
+
+class TestOfReference extends UnitTestCase {
+
+    function testReference() {
+        $foo = "foo";
+        $ref = &$foo;
+        $not_ref = $foo;
+        $bar = "bar";
+
+        $expect = new ReferenceExpectation($foo);
+        $this->assertTrue($expect->test($ref));
+        $this->assertFalse($expect->test($not_ref));
+        $this->assertFalse($expect->test($bar));
+    }
+}
+
+class TestOfNonIdentity extends UnitTestCase {
+
+    function testType() {
+        $string = new NotIdenticalExpectation("37");
+        $this->assertTrue($string->test("38"));
+        $this->assertTrue($string->test(37));
+        $this->assertFalse($string->test("37"));
+    }
+}
+
+class TestOfPatterns extends UnitTestCase {
+
+    function testWanted() {
+        $pattern = new PatternExpectation('/hello/i');
+        $this->assertTrue($pattern->test("Hello world"));
+        $this->assertFalse($pattern->test("Goodbye world"));
+    }
+
+    function testUnwanted() {
+        $pattern = new NoPatternExpectation('/hello/i');
+        $this->assertFalse($pattern->test("Hello world"));
+        $this->assertTrue($pattern->test("Goodbye world"));
+    }
+}
+
+class ExpectedMethodTarget {
+    function hasThisMethod() {}
+}
+
+class TestOfMethodExistence extends UnitTestCase {
+
+    function testHasMethod() {
+        $instance = new ExpectedMethodTarget();
+        $expectation = new MethodExistsExpectation('hasThisMethod');
+        $this->assertTrue($expectation->test($instance));
+        $expectation = new MethodExistsExpectation('doesNotHaveThisMethod');
+        $this->assertFalse($expectation->test($instance));
+    }
+}
+
+class TestOfIsA extends UnitTestCase {
+
+    function testString() {
+        $expectation = new IsAExpectation('string');
+        $this->assertTrue($expectation->test('Hello'));
+        $this->assertFalse($expectation->test(5));
+    }
+
+    function testBoolean() {
+        $expectation = new IsAExpectation('boolean');
+        $this->assertTrue($expectation->test(true));
+        $this->assertFalse($expectation->test(1));
+    }
+
+    function testBool() {
+        $expectation = new IsAExpectation('bool');
+        $this->assertTrue($expectation->test(true));
+        $this->assertFalse($expectation->test(1));
+    }
+
+    function testDouble() {
+        $expectation = new IsAExpectation('double');
+        $this->assertTrue($expectation->test(5.0));
+        $this->assertFalse($expectation->test(5));
+    }
+
+    function testFloat() {
+        $expectation = new IsAExpectation('float');
+        $this->assertTrue($expectation->test(5.0));
+        $this->assertFalse($expectation->test(5));
+    }
+
+    function testReal() {
+        $expectation = new IsAExpectation('real');
+        $this->assertTrue($expectation->test(5.0));
+        $this->assertFalse($expectation->test(5));
+    }
+
+    function testInteger() {
+        $expectation = new IsAExpectation('integer');
+        $this->assertTrue($expectation->test(5));
+        $this->assertFalse($expectation->test(5.0));
+    }
+
+    function testInt() {
+        $expectation = new IsAExpectation('int');
+        $this->assertTrue($expectation->test(5));
+        $this->assertFalse($expectation->test(5.0));
+    }
+
+    function testScalar() {
+        $expectation = new IsAExpectation('scalar');
+        $this->assertTrue($expectation->test(5));
+        $this->assertFalse($expectation->test(array(5)));
+    }
+
+    function testNumeric() {
+        $expectation = new IsAExpectation('numeric');
+        $this->assertTrue($expectation->test(5));
+        $this->assertFalse($expectation->test('string'));
+    }
+
+    function testNull() {
+        $expectation = new IsAExpectation('null');
+        $this->assertTrue($expectation->test(null));
+        $this->assertFalse($expectation->test('string'));
+    }
+}
+
+class TestOfNotA extends UnitTestCase {
+
+    function testString() {
+        $expectation = new NotAExpectation('string');
+        $this->assertFalse($expectation->test('Hello'));
+        $this->assertTrue($expectation->test(5));
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/form_test.php b/3rdparty/simpletest/test/form_test.php
new file mode 100755
index 00000000000..70a18f2b3a0
--- /dev/null
+++ b/3rdparty/simpletest/test/form_test.php
@@ -0,0 +1,344 @@
+<?php
+// $Id: form_test.php 1996 2010-07-27 09:11:59Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../url.php');
+require_once(dirname(__FILE__) . '/../form.php');
+require_once(dirname(__FILE__) . '/../page.php');
+require_once(dirname(__FILE__) . '/../encoding.php');
+Mock::generate('SimplePage');
+
+class TestOfForm extends UnitTestCase {
+    
+    function page($url, $action = false) {
+        $page = new MockSimplePage();
+        $page->returns('getUrl', new SimpleUrl($url));
+        $page->returns('expandUrl', new SimpleUrl($url));
+        return $page;
+    }
+    
+    function testFormAttributes() {
+        $tag = new SimpleFormTag(array('method' => 'GET', 'action' => 'here.php', 'id' => '33'));
+        $form = new SimpleForm($tag, $this->page('http://host/a/index.html'));
+        $this->assertEqual($form->getMethod(), 'get');
+        $this->assertIdentical($form->getId(), '33');
+        $this->assertNull($form->getValue(new SimpleByName('a')));
+    }
+    
+    function testAction() {
+        $page = new MockSimplePage();
+        $page->expectOnce('expandUrl', array(new SimpleUrl('here.php')));
+        $page->setReturnValue('expandUrl', new SimpleUrl('http://host/here.php'));
+        $tag = new SimpleFormTag(array('method' => 'GET', 'action' => 'here.php'));
+        $form = new SimpleForm($tag, $page);
+        $this->assertEqual($form->getAction(), new SimpleUrl('http://host/here.php'));
+    }
+    
+    function testEmptyAction() {
+        $tag = new SimpleFormTag(array('method' => 'GET', 'action' => '', 'id' => '33'));
+        $form = new SimpleForm($tag, $this->page('http://host/a/index.html'));
+        $this->assertEqual(
+                $form->getAction(),
+                new SimpleUrl('http://host/a/index.html'));
+    }
+    
+    function testMissingAction() {
+        $tag = new SimpleFormTag(array('method' => 'GET'));
+        $form = new SimpleForm($tag, $this->page('http://host/a/index.html'));
+        $this->assertEqual(
+                $form->getAction(),
+                new SimpleUrl('http://host/a/index.html'));
+    }
+    
+    function testRootAction() {
+        $page = new MockSimplePage();
+        $page->expectOnce('expandUrl', array(new SimpleUrl('/')));
+        $page->setReturnValue('expandUrl', new SimpleUrl('http://host/'));
+        $tag = new SimpleFormTag(array('method' => 'GET', 'action' => '/'));
+        $form = new SimpleForm($tag, $page);
+        $this->assertEqual(
+                $form->getAction(),
+                new SimpleUrl('http://host/'));
+    }
+    
+    function testDefaultFrameTargetOnForm() {
+        $page = new MockSimplePage();
+        $page->expectOnce('expandUrl', array(new SimpleUrl('here.php')));
+        $page->setReturnValue('expandUrl', new SimpleUrl('http://host/here.php'));
+        $tag = new SimpleFormTag(array('method' => 'GET', 'action' => 'here.php'));
+        $form = new SimpleForm($tag, $page);
+        $form->setDefaultTarget('frame');
+        $expected = new SimpleUrl('http://host/here.php');
+        $expected->setTarget('frame');
+        $this->assertEqual($form->getAction(), $expected);
+    }
+    
+    function testTextWidget() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleTextTag(
+                array('name' => 'me', 'type' => 'text', 'value' => 'Myself')));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'Myself');
+        $this->assertTrue($form->setField(new SimpleByName('me'), 'Not me'));
+        $this->assertFalse($form->setField(new SimpleByName('not_present'), 'Not me'));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'Not me');
+        $this->assertNull($form->getValue(new SimpleByName('not_present')));
+    }
+    
+    function testTextWidgetById() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleTextTag(
+                array('name' => 'me', 'type' => 'text', 'value' => 'Myself', 'id' => 50)));
+        $this->assertIdentical($form->getValue(new SimpleById(50)), 'Myself');
+        $this->assertTrue($form->setField(new SimpleById(50), 'Not me'));
+        $this->assertIdentical($form->getValue(new SimpleById(50)), 'Not me');
+    }
+    
+    function testTextWidgetByLabel() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $widget = new SimpleTextTag(array('name' => 'me', 'type' => 'text', 'value' => 'a'));
+        $form->addWidget($widget);
+        $widget->setLabel('thing');
+        $this->assertIdentical($form->getValue(new SimpleByLabel('thing')), 'a');
+        $this->assertTrue($form->setField(new SimpleByLabel('thing'), 'b'));
+        $this->assertIdentical($form->getValue(new SimpleByLabel('thing')), 'b');
+    }
+    
+    function testSubmitEmpty() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $this->assertIdentical($form->submit(), new SimpleGetEncoding());
+    }
+    
+    function testSubmitButton() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
+        $form->addWidget(new SimpleSubmitTag(
+                array('type' => 'submit', 'name' => 'go', 'value' => 'Go!', 'id' => '9')));
+        $this->assertTrue($form->hasSubmit(new SimpleByName('go')));
+        $this->assertEqual($form->getValue(new SimpleByName('go')), 'Go!');
+        $this->assertEqual($form->getValue(new SimpleById(9)), 'Go!');
+        $this->assertEqual(
+                $form->submitButton(new SimpleByName('go')),
+                new SimpleGetEncoding(array('go' => 'Go!')));            
+        $this->assertEqual(
+                $form->submitButton(new SimpleByLabel('Go!')),
+                new SimpleGetEncoding(array('go' => 'Go!')));
+        $this->assertEqual(
+                $form->submitButton(new SimpleById(9)),
+                new SimpleGetEncoding(array('go' => 'Go!')));            
+    }
+    
+    function testSubmitWithAdditionalParameters() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
+        $form->addWidget(new SimpleSubmitTag(
+                array('type' => 'submit', 'name' => 'go', 'value' => 'Go!')));
+        $this->assertEqual(
+                $form->submitButton(new SimpleByLabel('Go!'), array('a' => 'A')),
+                new SimpleGetEncoding(array('go' => 'Go!', 'a' => 'A')));            
+    }
+    
+    function testSubmitButtonWithLabelOfSubmit() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
+        $form->addWidget(new SimpleSubmitTag(
+                array('type' => 'submit', 'name' => 'test', 'value' => 'Submit')));
+        $this->assertEqual(
+                $form->submitButton(new SimpleByName('test')),
+                new SimpleGetEncoding(array('test' => 'Submit')));            
+        $this->assertEqual(
+                $form->submitButton(new SimpleByLabel('Submit')),
+                new SimpleGetEncoding(array('test' => 'Submit')));            
+    }
+    
+    function testSubmitButtonWithWhitespacePaddedLabelOfSubmit() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
+        $form->addWidget(new SimpleSubmitTag(
+                array('type' => 'submit', 'name' => 'test', 'value' => ' Submit ')));
+        $this->assertEqual(
+                $form->submitButton(new SimpleByLabel('Submit')),
+                new SimpleGetEncoding(array('test' => ' Submit ')));            
+    }
+    
+    function testImageSubmitButton() {
+        $form = new SimpleForm(new SimpleFormTag(array()),  $this->page('htp://host'));
+        $form->addWidget(new SimpleImageSubmitTag(array(
+                'type' => 'image',
+                'src' => 'source.jpg',
+                'name' => 'go',
+                'alt' => 'Go!',
+                'id' => '9')));
+        $this->assertTrue($form->hasImage(new SimpleByLabel('Go!')));
+        $this->assertEqual(
+                $form->submitImage(new SimpleByLabel('Go!'), 100, 101),
+                new SimpleGetEncoding(array('go.x' => 100, 'go.y' => 101)));
+        $this->assertTrue($form->hasImage(new SimpleByName('go')));
+        $this->assertEqual(
+                $form->submitImage(new SimpleByName('go'), 100, 101),
+                new SimpleGetEncoding(array('go.x' => 100, 'go.y' => 101)));
+        $this->assertTrue($form->hasImage(new SimpleById(9)));
+        $this->assertEqual(
+                $form->submitImage(new SimpleById(9), 100, 101),
+                new SimpleGetEncoding(array('go.x' => 100, 'go.y' => 101)));
+    }
+    
+    function testImageSubmitButtonWithAdditionalData() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleImageSubmitTag(array(
+                'type' => 'image',
+                'src' => 'source.jpg',
+                'name' => 'go',
+                'alt' => 'Go!')));
+        $this->assertEqual(
+                $form->submitImage(new SimpleByLabel('Go!'), 100, 101, array('a' => 'A')),
+                new SimpleGetEncoding(array('go.x' => 100, 'go.y' => 101, 'a' => 'A')));
+    }
+    
+    function testButtonTag() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
+        $widget = new SimpleButtonTag(
+                array('type' => 'submit', 'name' => 'go', 'value' => 'Go', 'id' => '9'));
+        $widget->addContent('Go!');
+        $form->addWidget($widget);
+        $this->assertTrue($form->hasSubmit(new SimpleByName('go')));
+        $this->assertTrue($form->hasSubmit(new SimpleByLabel('Go!')));
+        $this->assertEqual(
+                $form->submitButton(new SimpleByName('go')),
+                new SimpleGetEncoding(array('go' => 'Go')));
+        $this->assertEqual(
+                $form->submitButton(new SimpleByLabel('Go!')),
+                new SimpleGetEncoding(array('go' => 'Go')));
+        $this->assertEqual(
+                $form->submitButton(new SimpleById(9)),
+                new SimpleGetEncoding(array('go' => 'Go')));
+    }
+    
+    function testMultipleFieldsWithSameNameSubmitted() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $input = new SimpleTextTag(array('name' => 'elements[]', 'value' => '1'));
+        $form->addWidget($input);
+        $input = new SimpleTextTag(array('name' => 'elements[]', 'value' => '2'));
+        $form->addWidget($input);
+        $form->setField(new SimpleByLabelOrName('elements[]'), '3', 1);
+        $form->setField(new SimpleByLabelOrName('elements[]'), '4', 2);
+		$submit = $form->submit();
+		$requests = $submit->getAll();
+        $this->assertEqual(count($requests), 2);
+        $this->assertIdentical($requests[0], new SimpleEncodedPair('elements[]', '3'));
+        $this->assertIdentical($requests[1], new SimpleEncodedPair('elements[]', '4'));
+    }
+    
+    function testSingleSelectFieldSubmitted() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $select = new SimpleSelectionTag(array('name' => 'a'));
+        $select->addTag(new SimpleOptionTag(
+                array('value' => 'aaa', 'selected' => '')));
+        $form->addWidget($select);
+        $this->assertIdentical(
+                $form->submit(),
+                new SimpleGetEncoding(array('a' => 'aaa')));
+    }
+    
+    function testSingleSelectFieldSubmittedWithPost() {
+        $form = new SimpleForm(new SimpleFormTag(array('method' => 'post')), $this->page('htp://host'));
+        $select = new SimpleSelectionTag(array('name' => 'a'));
+        $select->addTag(new SimpleOptionTag(
+                array('value' => 'aaa', 'selected' => '')));
+        $form->addWidget($select);
+        $this->assertIdentical(
+                $form->submit(),
+                new SimplePostEncoding(array('a' => 'aaa')));
+    }
+    
+    function testUnchecked() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleCheckboxTag(
+                array('name' => 'me', 'type' => 'checkbox')));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), false);
+        $this->assertTrue($form->setField(new SimpleByName('me'), 'on'));
+        $this->assertEqual($form->getValue(new SimpleByName('me')), 'on');
+        $this->assertFalse($form->setField(new SimpleByName('me'), 'other'));
+        $this->assertEqual($form->getValue(new SimpleByName('me')), 'on');
+    }
+    
+    function testChecked() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleCheckboxTag(
+                array('name' => 'me', 'value' => 'a', 'type' => 'checkbox', 'checked' => '')));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'a');
+        $this->assertTrue($form->setField(new SimpleByName('me'), 'a'));
+        $this->assertEqual($form->getValue(new SimpleByName('me')), 'a');
+        $this->assertTrue($form->setField(new SimpleByName('me'), false));
+        $this->assertEqual($form->getValue(new SimpleByName('me')), false);
+    }
+    
+    function testSingleUncheckedRadioButton() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleRadioButtonTag(
+                array('name' => 'me', 'value' => 'a', 'type' => 'radio')));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), false);
+        $this->assertTrue($form->setField(new SimpleByName('me'), 'a'));
+        $this->assertEqual($form->getValue(new SimpleByName('me')), 'a');
+    }
+    
+    function testSingleCheckedRadioButton() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleRadioButtonTag(
+                array('name' => 'me', 'value' => 'a', 'type' => 'radio', 'checked' => '')));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'a');
+        $this->assertFalse($form->setField(new SimpleByName('me'), 'other'));
+    }
+    
+    function testUncheckedRadioButtons() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleRadioButtonTag(
+                array('name' => 'me', 'value' => 'a', 'type' => 'radio')));
+        $form->addWidget(new SimpleRadioButtonTag(
+                array('name' => 'me', 'value' => 'b', 'type' => 'radio')));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), false);
+        $this->assertTrue($form->setField(new SimpleByName('me'), 'a'));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'a');
+        $this->assertTrue($form->setField(new SimpleByName('me'), 'b'));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'b');
+        $this->assertFalse($form->setField(new SimpleByName('me'), 'c'));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'b');
+    }
+    
+    function testCheckedRadioButtons() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleRadioButtonTag(
+                array('name' => 'me', 'value' => 'a', 'type' => 'radio')));
+        $form->addWidget(new SimpleRadioButtonTag(
+                array('name' => 'me', 'value' => 'b', 'type' => 'radio', 'checked' => '')));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'b');
+        $this->assertTrue($form->setField(new SimpleByName('me'), 'a'));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'a');
+    }
+    
+    function testMultipleFieldsWithSameKey() {
+        $form = new SimpleForm(new SimpleFormTag(array()),  $this->page('htp://host'));
+        $form->addWidget(new SimpleCheckboxTag(
+                array('name' => 'a', 'type' => 'checkbox', 'value' => 'me')));
+        $form->addWidget(new SimpleCheckboxTag(
+                array('name' => 'a', 'type' => 'checkbox', 'value' => 'you')));
+        $this->assertIdentical($form->getValue(new SimpleByName('a')), false);
+        $this->assertTrue($form->setField(new SimpleByName('a'), 'me'));
+        $this->assertIdentical($form->getValue(new SimpleByName('a')), 'me');
+    }
+
+    function testRemoveGetParamsFromAction() {
+        Mock::generatePartial('SimplePage', 'MockPartialSimplePage', array('getUrl'));
+        $page = new MockPartialSimplePage();
+        $page->returns('getUrl', new SimpleUrl('htp://host/'));
+
+        # Keep GET params in "action", if the form has no widgets
+        $form = new SimpleForm(new SimpleFormTag(array('action'=>'?test=1')), $page);
+        $this->assertEqual($form->getAction()->asString(), 'htp://host/');
+
+        $form = new SimpleForm(new SimpleFormTag(array('action'=>'?test=1')),  $page);
+        $form->addWidget(new SimpleTextTag(array('name' => 'me', 'type' => 'text', 'value' => 'a')));
+        $this->assertEqual($form->getAction()->asString(), 'htp://host/');
+
+        $form = new SimpleForm(new SimpleFormTag(array('action'=>'')),  $page);
+        $this->assertEqual($form->getAction()->asString(), 'htp://host/');
+
+        $form = new SimpleForm(new SimpleFormTag(array('action'=>'?test=1', 'method'=>'post')),  $page);
+        $this->assertEqual($form->getAction()->asString(), 'htp://host/?test=1');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/frames_test.php b/3rdparty/simpletest/test/frames_test.php
new file mode 100755
index 00000000000..29309700e31
--- /dev/null
+++ b/3rdparty/simpletest/test/frames_test.php
@@ -0,0 +1,549 @@
+<?php
+// $Id: frames_test.php 1899 2009-07-28 19:33:42Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../tag.php');
+require_once(dirname(__FILE__) . '/../page.php');
+require_once(dirname(__FILE__) . '/../frames.php');
+Mock::generate('SimplePage');
+Mock::generate('SimpleForm');
+
+class TestOfFrameset extends UnitTestCase {
+
+    function testTitleReadFromFramesetPage() {
+        $page = new MockSimplePage();
+        $page->setReturnValue('getTitle', 'This page');
+        $frameset = new SimpleFrameset($page);
+        $this->assertEqual($frameset->getTitle(), 'This page');
+    }
+
+    function TestHeadersReadFromFramesetByDefault() {
+        $page = new MockSimplePage();
+        $page->setReturnValue('getHeaders', 'Header: content');
+        $page->setReturnValue('getMimeType', 'text/xml');
+        $page->setReturnValue('getResponseCode', 401);
+        $page->setReturnValue('getTransportError', 'Could not parse headers');
+        $page->setReturnValue('getAuthentication', 'Basic');
+        $page->setReturnValue('getRealm', 'Safe place');
+
+        $frameset = new SimpleFrameset($page);
+
+        $this->assertIdentical($frameset->getHeaders(), 'Header: content');
+        $this->assertIdentical($frameset->getMimeType(), 'text/xml');
+        $this->assertIdentical($frameset->getResponseCode(), 401);
+        $this->assertIdentical($frameset->getTransportError(), 'Could not parse headers');
+        $this->assertIdentical($frameset->getAuthentication(), 'Basic');
+        $this->assertIdentical($frameset->getRealm(), 'Safe place');
+    }
+
+    function testEmptyFramesetHasNoContent() {
+        $page = new MockSimplePage();
+        $page->setReturnValue('getRaw', 'This content');
+        $frameset = new SimpleFrameset($page);
+        $this->assertEqual($frameset->getRaw(), '');
+    }
+
+    function testRawContentIsFromOnlyFrame() {
+        $page = new MockSimplePage();
+        $page->expectNever('getRaw');
+
+        $frame = new MockSimplePage();
+        $frame->setReturnValue('getRaw', 'Stuff');
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame);
+        $this->assertEqual($frameset->getRaw(), 'Stuff');
+    }
+
+    function testRawContentIsFromAllFrames() {
+        $page = new MockSimplePage();
+        $page->expectNever('getRaw');
+
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getRaw', 'Stuff1');
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue('getRaw', 'Stuff2');
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame1);
+        $frameset->addFrame($frame2);
+        $this->assertEqual($frameset->getRaw(), 'Stuff1Stuff2');
+    }
+
+    function testTextContentIsFromOnlyFrame() {
+        $page = new MockSimplePage();
+        $page->expectNever('getText');
+
+        $frame = new MockSimplePage();
+        $frame->setReturnValue('getText', 'Stuff');
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame);
+        $this->assertEqual($frameset->getText(), 'Stuff');
+    }
+
+    function testTextContentIsFromAllFrames() {
+        $page = new MockSimplePage();
+        $page->expectNever('getText');
+
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getText', 'Stuff1');
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue('getText', 'Stuff2');
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame1);
+        $frameset->addFrame($frame2);
+        $this->assertEqual($frameset->getText(), 'Stuff1 Stuff2');
+    }
+
+    function testFieldFoundIsFirstInFramelist() {
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getField', null);
+        $frame1->expectOnce('getField', array(new SimpleByName('a')));
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue('getField', 'A');
+        $frame2->expectOnce('getField', array(new SimpleByName('a')));
+
+        $frame3 = new MockSimplePage();
+        $frame3->expectNever('getField');
+
+        $page = new MockSimplePage();
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame1);
+        $frameset->addFrame($frame2);
+        $frameset->addFrame($frame3);
+        $this->assertIdentical($frameset->getField(new SimpleByName('a')), 'A');
+    }
+
+    function testFrameReplacementByIndex() {
+        $page = new MockSimplePage();
+        $page->expectNever('getRaw');
+
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getRaw', 'Stuff1');
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue('getRaw', 'Stuff2');
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame1);
+        $frameset->setFrame(array(1), $frame2);
+        $this->assertEqual($frameset->getRaw(), 'Stuff2');
+    }
+
+    function testFrameReplacementByName() {
+        $page = new MockSimplePage();
+        $page->expectNever('getRaw');
+
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getRaw', 'Stuff1');
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue('getRaw', 'Stuff2');
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame1, 'a');
+        $frameset->setFrame(array('a'), $frame2);
+        $this->assertEqual($frameset->getRaw(), 'Stuff2');
+    }
+}
+
+class TestOfFrameNavigation extends UnitTestCase {
+
+    function testStartsWithoutFrameFocus() {
+        $page = new MockSimplePage();
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame(new MockSimplePage());
+        $this->assertFalse($frameset->getFrameFocus());
+    }
+
+    function testCanFocusOnSingleFrame() {
+        $page = new MockSimplePage();
+        $page->expectNever('getRaw');
+
+        $frame = new MockSimplePage();
+        $frame->setReturnValue('getFrameFocus', array());
+        $frame->setReturnValue('getRaw', 'Stuff');
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame);
+
+        $this->assertFalse($frameset->setFrameFocusByIndex(0));
+        $this->assertTrue($frameset->setFrameFocusByIndex(1));
+        $this->assertEqual($frameset->getRaw(), 'Stuff');
+        $this->assertFalse($frameset->setFrameFocusByIndex(2));
+        $this->assertIdentical($frameset->getFrameFocus(), array(1));
+    }
+
+    function testContentComesFromFrameInFocus() {
+        $page = new MockSimplePage();
+
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getRaw', 'Stuff1');
+        $frame1->setReturnValue('getFrameFocus', array());
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue('getRaw', 'Stuff2');
+        $frame2->setReturnValue('getFrameFocus', array());
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame1);
+        $frameset->addFrame($frame2);
+
+        $this->assertTrue($frameset->setFrameFocusByIndex(1));
+        $this->assertEqual($frameset->getFrameFocus(), array(1));
+        $this->assertEqual($frameset->getRaw(), 'Stuff1');
+
+        $this->assertTrue($frameset->setFrameFocusByIndex(2));
+        $this->assertEqual($frameset->getFrameFocus(), array(2));
+        $this->assertEqual($frameset->getRaw(), 'Stuff2');
+
+        $this->assertFalse($frameset->setFrameFocusByIndex(3));
+        $this->assertEqual($frameset->getFrameFocus(), array(2));
+
+        $frameset->clearFrameFocus();
+        $this->assertEqual($frameset->getRaw(), 'Stuff1Stuff2');
+    }
+
+    function testCanFocusByName() {
+        $page = new MockSimplePage();
+
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getRaw', 'Stuff1');
+        $frame1->setReturnValue('getFrameFocus', array());
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue('getRaw', 'Stuff2');
+        $frame2->setReturnValue('getFrameFocus', array());
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame1, 'A');
+        $frameset->addFrame($frame2, 'B');
+
+        $this->assertTrue($frameset->setFrameFocus('A'));
+        $this->assertEqual($frameset->getFrameFocus(), array('A'));
+        $this->assertEqual($frameset->getRaw(), 'Stuff1');
+
+        $this->assertTrue($frameset->setFrameFocusByIndex(2));
+        $this->assertEqual($frameset->getFrameFocus(), array('B'));
+        $this->assertEqual($frameset->getRaw(), 'Stuff2');
+
+        $this->assertFalse($frameset->setFrameFocus('z'));
+
+        $frameset->clearFrameFocus();
+        $this->assertEqual($frameset->getRaw(), 'Stuff1Stuff2');
+    }
+}
+
+class TestOfFramesetPageInterface extends UnitTestCase {
+    private $page_interface;
+    private $frameset_interface;
+
+    function __construct() {
+        parent::__construct();
+        $this->page_interface = $this->getPageMethods();
+        $this->frameset_interface = $this->getFramesetMethods();
+    }
+
+    function assertListInAnyOrder($list, $expected) {
+        sort($list);
+        sort($expected);
+        $this->assertEqual($list, $expected);
+    }
+
+    private function getPageMethods() {
+        $methods = array();
+        foreach (get_class_methods('SimplePage') as $method) {
+            if (strtolower($method) == strtolower('SimplePage')) {
+                continue;
+            }
+            if (strtolower($method) == strtolower('getFrameset')) {
+                continue;
+            }
+            if (strncmp($method, '_', 1) == 0) {
+                continue;
+            }
+            if (in_array($method, array('setTitle', 'setBase', 'setForms', 'normalise', 'setFrames', 'addLink'))) {
+                continue;
+            }
+            $methods[] = $method;
+        }
+        return $methods;
+    }
+
+    private function getFramesetMethods() {
+        $methods = array();
+        foreach (get_class_methods('SimpleFrameset') as $method) {
+            if (strtolower($method) == strtolower('SimpleFrameset')) {
+                continue;
+            }
+            if (strncmp($method, '_', 1) == 0) {
+                continue;
+            }
+            if (strncmp($method, 'add', 3) == 0) {
+                continue;
+            }
+            $methods[] = $method;
+        }
+        return $methods;
+    }
+
+    function testFramsetHasPageInterface() {
+        $difference = array();
+        foreach ($this->page_interface as $method) {
+            if (! in_array($method, $this->frameset_interface)) {
+                $this->fail("No [$method] in Frameset class");
+                return;
+            }
+        }
+        $this->pass('Frameset covers Page interface');
+    }
+
+    function testHeadersReadFromFrameIfInFocus() {
+        $frame = new MockSimplePage();
+        $frame->setReturnValue('getUrl', new SimpleUrl('http://localhost/stuff'));
+
+        $frame->setReturnValue('getRequest', 'POST stuff');
+        $frame->setReturnValue('getMethod', 'POST');
+        $frame->setReturnValue('getRequestData', array('a' => 'A'));
+        $frame->setReturnValue('getHeaders', 'Header: content');
+        $frame->setReturnValue('getMimeType', 'text/xml');
+        $frame->setReturnValue('getResponseCode', 401);
+        $frame->setReturnValue('getTransportError', 'Could not parse headers');
+        $frame->setReturnValue('getAuthentication', 'Basic');
+        $frame->setReturnValue('getRealm', 'Safe place');
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame($frame);
+        $frameset->setFrameFocusByIndex(1);
+
+        $url = new SimpleUrl('http://localhost/stuff');
+        $url->setTarget(1);
+        $this->assertIdentical($frameset->getUrl(), $url);
+
+        $this->assertIdentical($frameset->getRequest(), 'POST stuff');
+        $this->assertIdentical($frameset->getMethod(), 'POST');
+        $this->assertIdentical($frameset->getRequestData(), array('a' => 'A'));
+        $this->assertIdentical($frameset->getHeaders(), 'Header: content');
+        $this->assertIdentical($frameset->getMimeType(), 'text/xml');
+        $this->assertIdentical($frameset->getResponseCode(), 401);
+        $this->assertIdentical($frameset->getTransportError(), 'Could not parse headers');
+        $this->assertIdentical($frameset->getAuthentication(), 'Basic');
+        $this->assertIdentical($frameset->getRealm(), 'Safe place');
+    }
+
+    function testUrlsComeFromBothFrames() {
+        $page = new MockSimplePage();
+        $page->expectNever('getUrls');
+
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue(
+                'getUrls',
+                array('http://www.lastcraft.com/', 'http://myserver/'));
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue(
+                'getUrls',
+                array('http://www.lastcraft.com/', 'http://test/'));
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame1);
+        $frameset->addFrame($frame2);
+        $this->assertListInAnyOrder(
+                $frameset->getUrls(),
+                array('http://www.lastcraft.com/', 'http://myserver/', 'http://test/'));
+    }
+
+    function testLabelledUrlsComeFromBothFrames() {
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue(
+                'getUrlsByLabel',
+                array(new SimpleUrl('goodbye.php')),
+                array('a'));
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue(
+                'getUrlsByLabel',
+                array(new SimpleUrl('hello.php')),
+                array('a'));
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame($frame1);
+        $frameset->addFrame($frame2, 'Two');
+
+        $expected1 = new SimpleUrl('goodbye.php');
+        $expected1->setTarget(1);
+        $expected2 = new SimpleUrl('hello.php');
+        $expected2->setTarget('Two');
+        $this->assertEqual(
+                $frameset->getUrlsByLabel('a'),
+                array($expected1, $expected2));
+    }
+
+    function testUrlByIdComesFromFirstFrameToRespond() {
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getUrlById', new SimpleUrl('four.php'), array(4));
+        $frame1->setReturnValue('getUrlById', false, array(5));
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue('getUrlById', false, array(4));
+        $frame2->setReturnValue('getUrlById', new SimpleUrl('five.php'), array(5));
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame($frame1);
+        $frameset->addFrame($frame2);
+
+        $four = new SimpleUrl('four.php');
+        $four->setTarget(1);
+        $this->assertEqual($frameset->getUrlById(4), $four);
+        $five = new SimpleUrl('five.php');
+        $five->setTarget(2);
+        $this->assertEqual($frameset->getUrlById(5), $five);
+    }
+
+    function testReadUrlsFromFrameInFocus() {
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getUrls', array('a'));
+        $frame1->setReturnValue('getUrlsByLabel', array(new SimpleUrl('l')));
+        $frame1->setReturnValue('getUrlById', new SimpleUrl('i'));
+
+        $frame2 = new MockSimplePage();
+        $frame2->expectNever('getUrls');
+        $frame2->expectNever('getUrlsByLabel');
+        $frame2->expectNever('getUrlById');
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame($frame1, 'A');
+        $frameset->addFrame($frame2, 'B');
+        $frameset->setFrameFocus('A');
+
+        $this->assertIdentical($frameset->getUrls(), array('a'));
+        $expected = new SimpleUrl('l');
+        $expected->setTarget('A');
+        $this->assertIdentical($frameset->getUrlsByLabel('label'), array($expected));
+        $expected = new SimpleUrl('i');
+        $expected->setTarget('A');
+        $this->assertIdentical($frameset->getUrlById(99), $expected);
+    }
+
+    function testReadFrameTaggedUrlsFromFrameInFocus() {
+        $frame = new MockSimplePage();
+
+        $by_label = new SimpleUrl('l');
+        $by_label->setTarget('L');
+        $frame->setReturnValue('getUrlsByLabel', array($by_label));
+
+        $by_id = new SimpleUrl('i');
+        $by_id->setTarget('I');
+        $frame->setReturnValue('getUrlById', $by_id);
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame($frame, 'A');
+        $frameset->setFrameFocus('A');
+
+        $this->assertIdentical($frameset->getUrlsByLabel('label'), array($by_label));
+        $this->assertIdentical($frameset->getUrlById(99), $by_id);
+    }
+
+    function testFindingFormsById() {
+        $frame = new MockSimplePage();
+        $form = new MockSimpleForm();
+        $frame->returns('getFormById', $form, array('a'));
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame(new MockSimplePage(), 'A');
+        $frameset->addFrame($frame, 'B');
+        $this->assertSame($frameset->getFormById('a'), $form);
+
+        $frameset->setFrameFocus('A');
+        $this->assertNull($frameset->getFormById('a'));
+
+        $frameset->setFrameFocus('B');
+        $this->assertSame($frameset->getFormById('a'), $form);
+    }
+
+    function testFindingFormsBySubmit() {
+        $frame = new MockSimplePage();
+        $form = new MockSimpleForm();
+        $frame->returns(
+                'getFormBySubmit',
+                $form,
+                array(new SimpleByLabel('a')));
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame(new MockSimplePage(), 'A');
+        $frameset->addFrame($frame, 'B');
+        $this->assertSame($frameset->getFormBySubmit(new SimpleByLabel('a')), $form);
+
+        $frameset->setFrameFocus('A');
+        $this->assertNull($frameset->getFormBySubmit(new SimpleByLabel('a')));
+
+        $frameset->setFrameFocus('B');
+        $this->assertSame($frameset->getFormBySubmit(new SimpleByLabel('a')), $form);
+    }
+
+    function testFindingFormsByImage() {
+        $frame = new MockSimplePage();
+        $form = new MockSimpleForm();
+        $frame->returns(
+                'getFormByImage',
+                $form,
+                array(new SimpleByLabel('a')));
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame(new MockSimplePage(), 'A');
+        $frameset->addFrame($frame, 'B');
+        $this->assertSame($frameset->getFormByImage(new SimpleByLabel('a')), $form);
+
+        $frameset->setFrameFocus('A');
+        $this->assertNull($frameset->getFormByImage(new SimpleByLabel('a')));
+
+        $frameset->setFrameFocus('B');
+        $this->assertSame($frameset->getFormByImage(new SimpleByLabel('a')), $form);
+    }
+
+    function testSettingAllFrameFieldsWhenNoFrameFocus() {
+        $frame1 = new MockSimplePage();
+        $frame1->expectOnce('setField', array(new SimpleById(22), 'A'));
+
+        $frame2 = new MockSimplePage();
+        $frame2->expectOnce('setField', array(new SimpleById(22), 'A'));
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame($frame1, 'A');
+        $frameset->addFrame($frame2, 'B');
+        $frameset->setField(new SimpleById(22), 'A');
+    }
+
+    function testOnlySettingFieldFromFocusedFrame() {
+        $frame1 = new MockSimplePage();
+        $frame1->expectOnce('setField', array(new SimpleByLabelOrName('a'), 'A'));
+
+        $frame2 = new MockSimplePage();
+        $frame2->expectNever('setField');
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame($frame1, 'A');
+        $frameset->addFrame($frame2, 'B');
+        $frameset->setFrameFocus('A');
+        $frameset->setField(new SimpleByLabelOrName('a'), 'A');
+    }
+
+    function testOnlyGettingFieldFromFocusedFrame() {
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getField', 'f', array(new SimpleByName('a')));
+
+        $frame2 = new MockSimplePage();
+        $frame2->expectNever('getField');
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame($frame1, 'A');
+        $frameset->addFrame($frame2, 'B');
+        $frameset->setFrameFocus('A');
+        $this->assertIdentical($frameset->getField(new SimpleByName('a')), 'f');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/http_test.php b/3rdparty/simpletest/test/http_test.php
new file mode 100755
index 00000000000..bd3fdd0d028
--- /dev/null
+++ b/3rdparty/simpletest/test/http_test.php
@@ -0,0 +1,492 @@
+<?php
+// $Id: http_test.php 1964 2009-10-13 15:27:31Z maetl_ $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../encoding.php');
+require_once(dirname(__FILE__) . '/../http.php');
+require_once(dirname(__FILE__) . '/../socket.php');
+require_once(dirname(__FILE__) . '/../cookies.php');
+Mock::generate('SimpleSocket');
+Mock::generate('SimpleCookieJar');
+Mock::generate('SimpleRoute');
+Mock::generatePartial(
+		'SimpleRoute',
+		'PartialSimpleRoute',
+array('createSocket'));
+Mock::generatePartial(
+        'SimpleProxyRoute',
+        'PartialSimpleProxyRoute',
+array('createSocket'));
+
+class TestOfDirectRoute extends UnitTestCase {
+
+	function testDefaultGetRequest() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("GET /here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: a.valid.host\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+		$route = new PartialSimpleRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(new SimpleUrl('http://a.valid.host/here.html'));
+		$this->assertSame($route->createConnection('GET', 15), $socket);
+	}
+
+	function testDefaultPostRequest() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("POST /here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: a.valid.host\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+		$route = new PartialSimpleRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(new SimpleUrl('http://a.valid.host/here.html'));
+
+		$route->createConnection('POST', 15);
+	}
+	
+	function testDefaultDeleteRequest() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("DELETE /here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: a.valid.host\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+		$route = new PartialSimpleRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(new SimpleUrl('http://a.valid.host/here.html'));
+		$this->assertSame($route->createConnection('DELETE', 15), $socket);
+	}
+	
+	function testDefaultHeadRequest() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("HEAD /here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: a.valid.host\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+		$route = new PartialSimpleRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(new SimpleUrl('http://a.valid.host/here.html'));
+		$this->assertSame($route->createConnection('HEAD', 15), $socket);
+	}
+
+	function testGetWithPort() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("GET /here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: a.valid.host:81\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+
+		$route = new PartialSimpleRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(new SimpleUrl('http://a.valid.host:81/here.html'));
+
+		$route->createConnection('GET', 15);
+	}
+
+	function testGetWithParameters() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("GET /here.html?a=1&b=2 HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: a.valid.host\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+
+		$route = new PartialSimpleRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(new SimpleUrl('http://a.valid.host/here.html?a=1&b=2'));
+
+		$route->createConnection('GET', 15);
+	}
+}
+
+class TestOfProxyRoute extends UnitTestCase {
+
+	function testDefaultGet() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("GET http://a.valid.host/here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: my-proxy:8080\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+
+		$route = new PartialSimpleProxyRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(
+		new SimpleUrl('http://a.valid.host/here.html'),
+		new SimpleUrl('http://my-proxy'));
+		$route->createConnection('GET', 15);
+	}
+
+	function testDefaultPost() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("POST http://a.valid.host/here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: my-proxy:8080\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+
+		$route = new PartialSimpleProxyRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(
+		new SimpleUrl('http://a.valid.host/here.html'),
+		new SimpleUrl('http://my-proxy'));
+		$route->createConnection('POST', 15);
+	}
+
+	function testGetWithPort() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("GET http://a.valid.host:81/here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: my-proxy:8081\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+
+		$route = new PartialSimpleProxyRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(
+		new SimpleUrl('http://a.valid.host:81/here.html'),
+		new SimpleUrl('http://my-proxy:8081'));
+		$route->createConnection('GET', 15);
+	}
+
+	function testGetWithParameters() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("GET http://a.valid.host/here.html?a=1&b=2 HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: my-proxy:8080\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+
+		$route = new PartialSimpleProxyRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(
+		new SimpleUrl('http://a.valid.host/here.html?a=1&b=2'),
+		new SimpleUrl('http://my-proxy'));
+		$route->createConnection('GET', 15);
+	}
+
+	function testGetWithAuthentication() {
+		$encoded = base64_encode('Me:Secret');
+
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("GET http://a.valid.host/here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: my-proxy:8080\r\n"));
+		$socket->expectAt(2, 'write', array("Proxy-Authorization: Basic $encoded\r\n"));
+		$socket->expectAt(3, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 4);
+
+		$route = new PartialSimpleProxyRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(
+		new SimpleUrl('http://a.valid.host/here.html'),
+		new SimpleUrl('http://my-proxy'),
+                'Me',
+                'Secret');
+		$route->createConnection('GET', 15);
+	}
+}
+
+class TestOfHttpRequest extends UnitTestCase {
+
+	function testReadingBadConnection() {
+		$socket = new MockSimpleSocket();
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+		$request = new SimpleHttpRequest($route, new SimpleGetEncoding());
+		$reponse = $request->fetch(15);
+		$this->assertTrue($reponse->isError());
+	}
+
+	function testReadingGoodConnection() {
+		$socket = new MockSimpleSocket();
+		$socket->expectOnce('write', array("\r\n"));
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+		$route->expect('createConnection', array('GET', 15));
+
+		$request = new SimpleHttpRequest($route, new SimpleGetEncoding());
+		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
+	}
+
+	function testWritingAdditionalHeaders() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("My: stuff\r\n"));
+		$socket->expectAt(1, 'write', array("\r\n"));
+		$socket->expectCallCount('write', 2);
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+
+		$request = new SimpleHttpRequest($route, new SimpleGetEncoding());
+		$request->addHeaderLine('My: stuff');
+		$request->fetch(15);
+	}
+
+	function testCookieWriting() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("Cookie: a=A\r\n"));
+		$socket->expectAt(1, 'write', array("\r\n"));
+		$socket->expectCallCount('write', 2);
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+
+		$jar = new SimpleCookieJar();
+		$jar->setCookie('a', 'A');
+
+		$request = new SimpleHttpRequest($route, new SimpleGetEncoding());
+		$request->readCookiesFromJar($jar, new SimpleUrl('/'));
+		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
+	}
+
+	function testMultipleCookieWriting() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("Cookie: a=A;b=B\r\n"));
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+
+		$jar = new SimpleCookieJar();
+		$jar->setCookie('a', 'A');
+		$jar->setCookie('b', 'B');
+
+		$request = new SimpleHttpRequest($route, new SimpleGetEncoding());
+		$request->readCookiesFromJar($jar, new SimpleUrl('/'));
+		$request->fetch(15);
+	}
+	
+    function testReadingDeleteConnection() {
+		$socket = new MockSimpleSocket();
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+		$route->expect('createConnection', array('DELETE', 15));
+
+		$request = new SimpleHttpRequest($route, new SimpleDeleteEncoding());
+		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');    	
+    }
+}
+
+class TestOfHttpPostRequest extends UnitTestCase {
+
+	function testReadingBadConnectionCausesErrorBecauseOfDeadSocket() {
+		$socket = new MockSimpleSocket();
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+		$request = new SimpleHttpRequest($route, new SimplePostEncoding());
+		$reponse = $request->fetch(15);
+		$this->assertTrue($reponse->isError());
+	}
+
+	function testReadingGoodConnection() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("Content-Length: 0\r\n"));
+		$socket->expectAt(1, 'write', array("Content-Type: application/x-www-form-urlencoded\r\n"));
+		$socket->expectAt(2, 'write', array("\r\n"));
+		$socket->expectAt(3, 'write', array(""));
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+		$route->expect('createConnection', array('POST', 15));
+
+		$request = new SimpleHttpRequest($route, new SimplePostEncoding());
+		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
+	}
+
+	function testContentHeadersCalculatedWithUrlEncodedParams() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("Content-Length: 3\r\n"));
+		$socket->expectAt(1, 'write', array("Content-Type: application/x-www-form-urlencoded\r\n"));
+		$socket->expectAt(2, 'write', array("\r\n"));
+		$socket->expectAt(3, 'write', array("a=A"));
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+		$route->expect('createConnection', array('POST', 15));
+
+		$request = new SimpleHttpRequest(
+		$route,
+		new SimplePostEncoding(array('a' => 'A')));
+		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
+	}
+
+	function testContentHeadersCalculatedWithRawEntityBody() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("Content-Length: 8\r\n"));
+		$socket->expectAt(1, 'write', array("Content-Type: text/plain\r\n"));
+		$socket->expectAt(2, 'write', array("\r\n"));
+		$socket->expectAt(3, 'write', array("raw body"));
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+		$route->expect('createConnection', array('POST', 15));
+
+		$request = new SimpleHttpRequest(
+		$route,
+		new SimplePostEncoding('raw body'));
+		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
+	}
+
+	function testContentHeadersCalculatedWithXmlEntityBody() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("Content-Length: 27\r\n"));
+		$socket->expectAt(1, 'write', array("Content-Type: text/xml\r\n"));
+		$socket->expectAt(2, 'write', array("\r\n"));
+		$socket->expectAt(3, 'write', array("<a><b>one</b><c>two</c></a>"));
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+		$route->expect('createConnection', array('POST', 15));
+
+		$request = new SimpleHttpRequest(
+		$route,
+		new SimplePostEncoding('<a><b>one</b><c>two</c></a>', 'text/xml'));
+		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
+	}
+}
+
+class TestOfHttpHeaders extends UnitTestCase {
+
+	function testParseBasicHeaders() {
+		$headers = new SimpleHttpHeaders(
+                "HTTP/1.1 200 OK\r\n" .
+                "Date: Mon, 18 Nov 2002 15:50:29 GMT\r\n" .
+                "Content-Type: text/plain\r\n" .
+                "Server: Apache/1.3.24 (Win32) PHP/4.2.3\r\n" .
+                "Connection: close");
+		$this->assertIdentical($headers->getHttpVersion(), "1.1");
+		$this->assertIdentical($headers->getResponseCode(), 200);
+		$this->assertEqual($headers->getMimeType(), "text/plain");
+	}
+
+	function testNonStandardResponseHeader() {
+		$headers = new SimpleHttpHeaders(
+                "HTTP/1.1 302 (HTTP-Version SP Status-Code CRLF)\r\n" .
+                "Connection: close");
+		$this->assertIdentical($headers->getResponseCode(), 302);
+	}
+
+	function testCanParseMultipleCookies() {
+		$jar = new MockSimpleCookieJar();
+		$jar->expectAt(0, 'setCookie', array('a', 'aaa', 'host', '/here/', 'Wed, 25 Dec 2002 04:24:20 GMT'));
+		$jar->expectAt(1, 'setCookie', array('b', 'bbb', 'host', '/', false));
+
+		$headers = new SimpleHttpHeaders(
+                "HTTP/1.1 200 OK\r\n" .
+                "Date: Mon, 18 Nov 2002 15:50:29 GMT\r\n" .
+                "Content-Type: text/plain\r\n" .
+                "Server: Apache/1.3.24 (Win32) PHP/4.2.3\r\n" .
+                "Set-Cookie: a=aaa; expires=Wed, 25-Dec-02 04:24:20 GMT; path=/here/\r\n" .
+                "Set-Cookie: b=bbb\r\n" .
+                "Connection: close");
+		$headers->writeCookiesToJar($jar, new SimpleUrl('http://host'));
+	}
+
+	function testCanRecogniseRedirect() {
+		$headers = new SimpleHttpHeaders("HTTP/1.1 301 OK\r\n" .
+                "Content-Type: text/plain\r\n" .
+                "Content-Length: 0\r\n" .
+                "Location: http://www.somewhere-else.com/\r\n" .
+                "Connection: close");
+		$this->assertIdentical($headers->getResponseCode(), 301);
+		$this->assertEqual($headers->getLocation(), "http://www.somewhere-else.com/");
+		$this->assertTrue($headers->isRedirect());
+	}
+
+	function testCanParseChallenge() {
+		$headers = new SimpleHttpHeaders("HTTP/1.1 401 Authorization required\r\n" .
+                "Content-Type: text/plain\r\n" .
+                "Connection: close\r\n" .
+                "WWW-Authenticate: Basic realm=\"Somewhere\"");
+		$this->assertEqual($headers->getAuthentication(), 'Basic');
+		$this->assertEqual($headers->getRealm(), 'Somewhere');
+		$this->assertTrue($headers->isChallenge());
+	}
+}
+
+class TestOfHttpResponse extends UnitTestCase {
+
+	function testBadRequest() {
+		$socket = new MockSimpleSocket();
+		$socket->setReturnValue('getSent', '');
+
+		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
+		$this->assertTrue($response->isError());
+		$this->assertPattern('/Nothing fetched/', $response->getError());
+		$this->assertIdentical($response->getContent(), false);
+		$this->assertIdentical($response->getSent(), '');
+	}
+
+	function testBadSocketDuringResponse() {
+		$socket = new MockSimpleSocket();
+		$socket->setReturnValueAt(0, "read", "HTTP/1.1 200 OK\r\n");
+		$socket->setReturnValueAt(1, "read", "Date: Mon, 18 Nov 2002 15:50:29 GMT\r\n");
+		$socket->setReturnValue("read", "");
+		$socket->setReturnValue('getSent', 'HTTP/1.1 ...');
+
+		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
+		$this->assertTrue($response->isError());
+		$this->assertEqual($response->getContent(), '');
+		$this->assertEqual($response->getSent(), 'HTTP/1.1 ...');
+	}
+
+	function testIncompleteHeader() {
+		$socket = new MockSimpleSocket();
+		$socket->setReturnValueAt(0, "read", "HTTP/1.1 200 OK\r\n");
+		$socket->setReturnValueAt(1, "read", "Date: Mon, 18 Nov 2002 15:50:29 GMT\r\n");
+		$socket->setReturnValueAt(2, "read", "Content-Type: text/plain\r\n");
+		$socket->setReturnValue("read", "");
+
+		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
+		$this->assertTrue($response->isError());
+		$this->assertEqual($response->getContent(), "");
+	}
+
+	function testParseOfResponseHeadersWhenChunked() {
+		$socket = new MockSimpleSocket();
+		$socket->setReturnValueAt(0, "read", "HTTP/1.1 200 OK\r\nDate: Mon, 18 Nov 2002 15:50:29 GMT\r\n");
+		$socket->setReturnValueAt(1, "read", "Content-Type: text/plain\r\n");
+		$socket->setReturnValueAt(2, "read", "Server: Apache/1.3.24 (Win32) PHP/4.2.3\r\nConne");
+		$socket->setReturnValueAt(3, "read", "ction: close\r\n\r\nthis is a test file\n");
+		$socket->setReturnValueAt(4, "read", "with two lines in it\n");
+		$socket->setReturnValue("read", "");
+
+		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
+		$this->assertFalse($response->isError());
+		$this->assertEqual(
+		$response->getContent(),
+                "this is a test file\nwith two lines in it\n");
+		$headers = $response->getHeaders();
+		$this->assertIdentical($headers->getHttpVersion(), "1.1");
+		$this->assertIdentical($headers->getResponseCode(), 200);
+		$this->assertEqual($headers->getMimeType(), "text/plain");
+		$this->assertFalse($headers->isRedirect());
+		$this->assertFalse($headers->getLocation());
+	}
+
+	function testRedirect() {
+		$socket = new MockSimpleSocket();
+		$socket->setReturnValueAt(0, "read", "HTTP/1.1 301 OK\r\n");
+		$socket->setReturnValueAt(1, "read", "Content-Type: text/plain\r\n");
+		$socket->setReturnValueAt(2, "read", "Location: http://www.somewhere-else.com/\r\n");
+		$socket->setReturnValueAt(3, "read", "Connection: close\r\n");
+		$socket->setReturnValueAt(4, "read", "\r\n");
+		$socket->setReturnValue("read", "");
+
+		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
+		$headers = $response->getHeaders();
+		$this->assertTrue($headers->isRedirect());
+		$this->assertEqual($headers->getLocation(), "http://www.somewhere-else.com/");
+	}
+
+	function testRedirectWithPort() {
+		$socket = new MockSimpleSocket();
+		$socket->setReturnValueAt(0, "read", "HTTP/1.1 301 OK\r\n");
+		$socket->setReturnValueAt(1, "read", "Content-Type: text/plain\r\n");
+		$socket->setReturnValueAt(2, "read", "Location: http://www.somewhere-else.com:80/\r\n");
+		$socket->setReturnValueAt(3, "read", "Connection: close\r\n");
+		$socket->setReturnValueAt(4, "read", "\r\n");
+		$socket->setReturnValue("read", "");
+
+		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
+		$headers = $response->getHeaders();
+		$this->assertTrue($headers->isRedirect());
+		$this->assertEqual($headers->getLocation(), "http://www.somewhere-else.com:80/");
+	}
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/interfaces_test.php b/3rdparty/simpletest/test/interfaces_test.php
new file mode 100755
index 00000000000..ab30fe47ff8
--- /dev/null
+++ b/3rdparty/simpletest/test/interfaces_test.php
@@ -0,0 +1,137 @@
+<?php
+// $Id: interfaces_test.php 1981 2010-03-23 23:29:56Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+if (function_exists('spl_classes')) {
+    include(dirname(__FILE__) . '/support/spl_examples.php');
+}
+if (version_compare(PHP_VERSION, '5.1', '>=')) {
+    include(dirname(__FILE__) . '/interfaces_test_php5_1.php');
+}
+
+interface DummyInterface {
+    function aMethod();
+    function anotherMethod($a);
+    function &referenceMethod(&$a);
+}
+
+Mock::generate('DummyInterface');
+Mock::generatePartial('DummyInterface', 'PartialDummyInterface', array());
+
+class TestOfMockInterfaces extends UnitTestCase {
+
+    function testCanMockAnInterface() {
+        $mock = new MockDummyInterface();
+        $this->assertIsA($mock, 'SimpleMock');
+        $this->assertIsA($mock, 'MockDummyInterface');
+        $this->assertTrue(method_exists($mock, 'aMethod'));
+        $this->assertTrue(method_exists($mock, 'anotherMethod'));
+        $this->assertNull($mock->aMethod());
+    }
+
+    function testMockedInterfaceExpectsParameters() {
+        $mock = new MockDummyInterface();
+        $this->expectError();
+        $mock->anotherMethod();
+    }
+
+    function testCannotPartiallyMockAnInterface() {
+        $this->assertFalse(class_exists('PartialDummyInterface'));
+    }
+}
+
+class TestOfSpl extends UnitTestCase {
+    
+    function skip() {
+        $this->skipUnless(function_exists('spl_classes'), 'No SPL module loaded');
+    }
+
+    function testCanMockAllSplClasses() {
+        if (! function_exists('spl_classes')) {
+            return;
+        }
+        foreach(spl_classes() as $class) {
+            if ($class == 'SplHeap' or $class = 'SplFileObject') {
+                continue;
+            }
+            if (version_compare(PHP_VERSION, '5.1', '<') &&
+                $class == 'CachingIterator' ||
+                $class == 'CachingRecursiveIterator' ||
+                $class == 'FilterIterator' ||
+                $class == 'LimitIterator' ||
+                $class == 'ParentIterator') {
+                // These iterators require an iterator be passed to them during
+                // construction in PHP 5.0; there is no way for SimpleTest
+                // to supply such an iterator, however, so support for it is
+                // disabled.
+                continue;
+            }
+            $mock_class = "Mock$class";
+            Mock::generate($class);
+            $this->assertIsA(new $mock_class(), $mock_class);
+        }
+    }
+
+    function testExtensionOfCommonSplClasses() {
+        Mock::generate('IteratorImplementation');
+        $this->assertIsA(
+                new IteratorImplementation(),
+                'IteratorImplementation');
+        Mock::generate('IteratorAggregateImplementation');
+        $this->assertIsA(
+                new IteratorAggregateImplementation(),
+                'IteratorAggregateImplementation');
+   }
+}
+
+class WithHint {
+    function hinted(DummyInterface $object) { }
+}
+
+class ImplementsDummy implements DummyInterface {
+    function aMethod() { }
+    function anotherMethod($a) { }
+    function &referenceMethod(&$a) { }
+    function extraMethod($a = false) { }
+}
+Mock::generate('ImplementsDummy');
+
+class TestOfImplementations extends UnitTestCase {
+
+    function testMockedInterfaceCanPassThroughTypeHint() {
+        $mock = new MockDummyInterface();
+        $hinter = new WithHint();
+        $hinter->hinted($mock);
+    }
+
+    function testImplementedInterfacesAreCarried() {
+        $mock = new MockImplementsDummy();
+        $hinter = new WithHint();
+        $hinter->hinted($mock);
+    }
+    
+    function testNoSpuriousWarningsWhenSkippingDefaultedParameter() {
+        $mock = new MockImplementsDummy();
+        $mock->extraMethod();
+    }
+}
+
+interface SampleInterfaceWithConstruct {
+    function __construct($something);
+}
+
+class TestOfInterfaceMocksWithConstruct extends UnitTestCase {
+    function TODO_testBasicConstructOfAnInterface() {   // Fails in PHP 5.3dev
+        Mock::generate('SampleInterfaceWithConstruct');
+    }
+}
+
+interface SampleInterfaceWithClone {
+    function __clone();
+}
+
+class TestOfSampleInterfaceWithClone extends UnitTestCase {
+    function testCanMockWithoutErrors() {
+        Mock::generate('SampleInterfaceWithClone');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/interfaces_test_php5_1.php b/3rdparty/simpletest/test/interfaces_test_php5_1.php
new file mode 100755
index 00000000000..3d154f99539
--- /dev/null
+++ b/3rdparty/simpletest/test/interfaces_test_php5_1.php
@@ -0,0 +1,14 @@
+<?php
+
+interface SampleInterfaceWithHintInSignature {
+    function method(array $hinted);
+}
+
+class TestOfInterfaceMocksWithHintInSignature extends UnitTestCase {
+    function testBasicConstructOfAnInterfaceWithHintInSignature() {
+        Mock::generate('SampleInterfaceWithHintInSignature');
+        $mock = new MockSampleInterfaceWithHintInSignature();
+        $this->assertIsA($mock, 'SampleInterfaceWithHintInSignature');
+    }
+}
+
diff --git a/3rdparty/simpletest/test/live_test.php b/3rdparty/simpletest/test/live_test.php
new file mode 100755
index 00000000000..3fbb54499d3
--- /dev/null
+++ b/3rdparty/simpletest/test/live_test.php
@@ -0,0 +1,47 @@
+<?php
+// $Id: live_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../socket.php');
+require_once(dirname(__FILE__) . '/../http.php');
+require_once(dirname(__FILE__) . '/../compatibility.php');
+
+if (SimpleTest::getDefaultProxy()) {
+    SimpleTest::ignore('LiveHttpTestCase');
+}
+
+class LiveHttpTestCase extends UnitTestCase {
+
+    function testBadSocket() {
+        $socket = new SimpleSocket('bad_url', 111, 5);
+        $this->assertTrue($socket->isError());
+        $this->assertPattern(
+                '/Cannot open \\[bad_url:111\\] with \\[/',
+                $socket->getError());
+        $this->assertFalse($socket->isOpen());
+        $this->assertFalse($socket->write('A message'));
+    }
+    
+    function testSocketClosure() {
+        $socket = new SimpleSocket('www.lastcraft.com', 80, 15, 8);
+        $this->assertTrue($socket->isOpen());
+        $this->assertTrue($socket->write("GET /test/network_confirm.php HTTP/1.0\r\n"));
+        $socket->write("Host: www.lastcraft.com\r\n");
+        $socket->write("Connection: close\r\n\r\n");
+        $this->assertEqual($socket->read(), "HTTP/1.1");
+        $socket->close();
+        $this->assertIdentical($socket->read(), false);
+    }
+    
+    function testRecordOfSentCharacters() {
+        $socket = new SimpleSocket('www.lastcraft.com', 80, 15);
+        $this->assertTrue($socket->write("GET /test/network_confirm.php HTTP/1.0\r\n"));
+        $socket->write("Host: www.lastcraft.com\r\n");
+        $socket->write("Connection: close\r\n\r\n");
+        $socket->close();
+        $this->assertEqual($socket->getSent(),
+                "GET /test/network_confirm.php HTTP/1.0\r\n" .
+                "Host: www.lastcraft.com\r\n" .
+                "Connection: close\r\n\r\n");
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/mock_objects_test.php b/3rdparty/simpletest/test/mock_objects_test.php
new file mode 100755
index 00000000000..7f3178995a7
--- /dev/null
+++ b/3rdparty/simpletest/test/mock_objects_test.php
@@ -0,0 +1,985 @@
+<?php
+// $Id: mock_objects_test.php 1900 2009-07-29 11:44:37Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../expectation.php');
+require_once(dirname(__FILE__) . '/../mock_objects.php');
+
+class TestOfAnythingExpectation extends UnitTestCase {
+    function testSimpleInteger() {
+        $expectation = new AnythingExpectation();
+        $this->assertTrue($expectation->test(33));
+        $this->assertTrue($expectation->test(false));
+        $this->assertTrue($expectation->test(null));
+    }
+}
+
+class TestOfParametersExpectation extends UnitTestCase {
+
+    function testEmptyMatch() {
+        $expectation = new ParametersExpectation(array());
+        $this->assertTrue($expectation->test(array()));
+        $this->assertFalse($expectation->test(array(33)));
+    }
+
+    function testSingleMatch() {
+        $expectation = new ParametersExpectation(array(0));
+        $this->assertFalse($expectation->test(array(1)));
+        $this->assertTrue($expectation->test(array(0)));
+    }
+
+    function testAnyMatch() {
+        $expectation = new ParametersExpectation(false);
+        $this->assertTrue($expectation->test(array()));
+        $this->assertTrue($expectation->test(array(1, 2)));
+    }
+
+    function testMissingParameter() {
+        $expectation = new ParametersExpectation(array(0));
+        $this->assertFalse($expectation->test(array()));
+    }
+
+    function testNullParameter() {
+        $expectation = new ParametersExpectation(array(null));
+        $this->assertTrue($expectation->test(array(null)));
+        $this->assertFalse($expectation->test(array()));
+    }
+
+    function testAnythingExpectations() {
+        $expectation = new ParametersExpectation(array(new AnythingExpectation()));
+        $this->assertFalse($expectation->test(array()));
+        $this->assertIdentical($expectation->test(array(null)), true);
+        $this->assertIdentical($expectation->test(array(13)), true);
+    }
+
+    function testOtherExpectations() {
+        $expectation = new ParametersExpectation(
+                array(new PatternExpectation('/hello/i')));
+        $this->assertFalse($expectation->test(array('Goodbye')));
+        $this->assertTrue($expectation->test(array('hello')));
+        $this->assertTrue($expectation->test(array('Hello')));
+    }
+
+    function testIdentityOnly() {
+        $expectation = new ParametersExpectation(array("0"));
+        $this->assertFalse($expectation->test(array(0)));
+        $this->assertTrue($expectation->test(array("0")));
+    }
+
+    function testLongList() {
+        $expectation = new ParametersExpectation(
+                array("0", 0, new AnythingExpectation(), false));
+        $this->assertTrue($expectation->test(array("0", 0, 37, false)));
+        $this->assertFalse($expectation->test(array("0", 0, 37, true)));
+        $this->assertFalse($expectation->test(array("0", 0, 37)));
+    }
+}
+
+class TestOfSimpleSignatureMap extends UnitTestCase {
+
+    function testEmpty() {
+        $map = new SimpleSignatureMap();
+        $this->assertFalse($map->isMatch("any", array()));
+        $this->assertNull($map->findFirstAction("any", array()));
+    }
+
+    function testDifferentCallSignaturesCanHaveDifferentReferences() {
+        $map = new SimpleSignatureMap();
+        $fred = 'Fred';
+        $jim = 'jim';
+        $map->add(array(0), $fred);
+        $map->add(array('0'), $jim);
+        $this->assertSame($fred, $map->findFirstAction(array(0)));
+        $this->assertSame($jim, $map->findFirstAction(array('0')));
+    }
+
+    function testWildcard() {
+        $fred = 'Fred';
+        $map = new SimpleSignatureMap();
+        $map->add(array(new AnythingExpectation(), 1, 3), $fred);
+        $this->assertTrue($map->isMatch(array(2, 1, 3)));
+        $this->assertSame($map->findFirstAction(array(2, 1, 3)), $fred);
+    }
+
+    function testAllWildcard() {
+        $fred = 'Fred';
+        $map = new SimpleSignatureMap();
+        $this->assertFalse($map->isMatch(array(2, 1, 3)));
+        $map->add('', $fred);
+        $this->assertTrue($map->isMatch(array(2, 1, 3)));
+        $this->assertSame($map->findFirstAction(array(2, 1, 3)), $fred);
+    }
+
+    function testOrdering() {
+        $map = new SimpleSignatureMap();
+        $map->add(array(1, 2), new SimpleByValue("1, 2"));
+        $map->add(array(1, 3), new SimpleByValue("1, 3"));
+        $map->add(array(1), new SimpleByValue("1"));
+        $map->add(array(1, 4), new SimpleByValue("1, 4"));
+        $map->add(array(new AnythingExpectation()), new SimpleByValue("Any"));
+        $map->add(array(2), new SimpleByValue("2"));
+        $map->add("", new SimpleByValue("Default"));
+        $map->add(array(), new SimpleByValue("None"));
+        $this->assertEqual($map->findFirstAction(array(1, 2)), new SimpleByValue("1, 2"));
+        $this->assertEqual($map->findFirstAction(array(1, 3)), new SimpleByValue("1, 3"));
+        $this->assertEqual($map->findFirstAction(array(1, 4)), new SimpleByValue("1, 4"));
+        $this->assertEqual($map->findFirstAction(array(1)), new SimpleByValue("1"));
+        $this->assertEqual($map->findFirstAction(array(2)), new SimpleByValue("Any"));
+        $this->assertEqual($map->findFirstAction(array(3)), new SimpleByValue("Any"));
+        $this->assertEqual($map->findFirstAction(array()), new SimpleByValue("Default"));
+    }
+}
+
+class TestOfCallSchedule extends UnitTestCase {
+    function testCanBeSetToAlwaysReturnTheSameReference() {
+        $a = 5;
+        $schedule = new SimpleCallSchedule();
+        $schedule->register('aMethod', false, new SimpleByReference($a));
+        $this->assertReference($schedule->respond(0, 'aMethod', array()), $a);
+        $this->assertReference($schedule->respond(1, 'aMethod', array()), $a);
+    }
+
+    function testSpecificSignaturesOverrideTheAlwaysCase() {
+        $any = 'any';
+        $one = 'two';
+        $schedule = new SimpleCallSchedule();
+        $schedule->register('aMethod', array(1), new SimpleByReference($one));
+        $schedule->register('aMethod', false, new SimpleByReference($any));
+        $this->assertReference($schedule->respond(0, 'aMethod', array(2)), $any);
+        $this->assertReference($schedule->respond(0, 'aMethod', array(1)), $one);
+    }
+
+    function testReturnsCanBeSetOverTime() {
+        $one = 'one';
+        $two = 'two';
+        $schedule = new SimpleCallSchedule();
+        $schedule->registerAt(0, 'aMethod', false, new SimpleByReference($one));
+        $schedule->registerAt(1, 'aMethod', false, new SimpleByReference($two));
+        $this->assertReference($schedule->respond(0, 'aMethod', array()), $one);
+        $this->assertReference($schedule->respond(1, 'aMethod', array()), $two);
+    }
+
+    function testReturnsOverTimecanBeAlteredByTheArguments() {
+        $one = '1';
+        $two = '2';
+        $two_a = '2a';
+        $schedule = new SimpleCallSchedule();
+        $schedule->registerAt(0, 'aMethod', false, new SimpleByReference($one));
+        $schedule->registerAt(1, 'aMethod', array('a'), new SimpleByReference($two_a));
+        $schedule->registerAt(1, 'aMethod', false, new SimpleByReference($two));
+        $this->assertReference($schedule->respond(0, 'aMethod', array()), $one);
+        $this->assertReference($schedule->respond(1, 'aMethod', array()), $two);
+        $this->assertReference($schedule->respond(1, 'aMethod', array('a')), $two_a);
+    }
+
+    function testCanReturnByValue() {
+        $a = 5;
+        $schedule = new SimpleCallSchedule();
+        $schedule->register('aMethod', false, new SimpleByValue($a));
+        $this->assertCopy($schedule->respond(0, 'aMethod', array()), $a);
+    }
+
+    function testCanThrowException() {
+        if (version_compare(phpversion(), '5', '>=')) {
+            $schedule = new SimpleCallSchedule();
+            $schedule->register('aMethod', false, new SimpleThrower(new Exception('Ouch')));
+            $this->expectException(new Exception('Ouch'));
+            $schedule->respond(0, 'aMethod', array());
+        }
+    }
+
+    function testCanEmitError() {
+        $schedule = new SimpleCallSchedule();
+        $schedule->register('aMethod', false, new SimpleErrorThrower('Ouch', E_USER_WARNING));
+        $this->expectError('Ouch');
+        $schedule->respond(0, 'aMethod', array());
+    }
+}
+
+class Dummy {
+    function Dummy() {
+    }
+
+    function aMethod() {
+        return true;
+    }
+
+    function &aReferenceMethod() {
+        return true;
+    }
+
+    function anotherMethod() {
+        return true;
+    }
+}
+Mock::generate('Dummy');
+Mock::generate('Dummy', 'AnotherMockDummy');
+Mock::generate('Dummy', 'MockDummyWithExtraMethods', array('extraMethod'));
+
+class TestOfMockGeneration extends UnitTestCase {
+
+    function testCloning() {
+        $mock = new MockDummy();
+        $this->assertTrue(method_exists($mock, "aMethod"));
+        $this->assertNull($mock->aMethod());
+    }
+
+    function testCloningWithExtraMethod() {
+        $mock = new MockDummyWithExtraMethods();
+        $this->assertTrue(method_exists($mock, "extraMethod"));
+    }
+
+    function testCloningWithChosenClassName() {
+        $mock = new AnotherMockDummy();
+        $this->assertTrue(method_exists($mock, "aMethod"));
+    }
+}
+
+class TestOfMockReturns extends UnitTestCase {
+
+    function testDefaultReturn() {
+        $mock = new MockDummy();
+        $mock->returnsByValue("aMethod", "aaa");
+        $this->assertIdentical($mock->aMethod(), "aaa");
+        $this->assertIdentical($mock->aMethod(), "aaa");
+    }
+
+    function testParameteredReturn() {
+        $mock = new MockDummy();
+        $mock->returnsByValue('aMethod', 'aaa', array(1, 2, 3));
+        $this->assertNull($mock->aMethod());
+        $this->assertIdentical($mock->aMethod(1, 2, 3), 'aaa');
+    }
+
+    function testSetReturnGivesObjectReference() {
+        $mock = new MockDummy();
+        $object = new Dummy();
+        $mock->returns('aMethod', $object, array(1, 2, 3));
+        $this->assertSame($mock->aMethod(1, 2, 3), $object);
+    }
+
+    function testSetReturnReferenceGivesOriginalReference() {
+        $mock = new MockDummy();
+        $object = 1;
+        $mock->returnsByReference('aReferenceMethod', $object, array(1, 2, 3));
+        $this->assertReference($mock->aReferenceMethod(1, 2, 3), $object);
+    }
+
+    function testReturnValueCanBeChosenJustByPatternMatchingArguments() {
+        $mock = new MockDummy();
+        $mock->returnsByValue(
+                "aMethod",
+                "aaa",
+                array(new PatternExpectation('/hello/i')));
+        $this->assertIdentical($mock->aMethod('Hello'), 'aaa');
+        $this->assertNull($mock->aMethod('Goodbye'));
+    }
+
+    function testMultipleMethods() {
+        $mock = new MockDummy();
+        $mock->returnsByValue("aMethod", 100, array(1));
+        $mock->returnsByValue("aMethod", 200, array(2));
+        $mock->returnsByValue("anotherMethod", 10, array(1));
+        $mock->returnsByValue("anotherMethod", 20, array(2));
+        $this->assertIdentical($mock->aMethod(1), 100);
+        $this->assertIdentical($mock->anotherMethod(1), 10);
+        $this->assertIdentical($mock->aMethod(2), 200);
+        $this->assertIdentical($mock->anotherMethod(2), 20);
+    }
+
+    function testReturnSequence() {
+        $mock = new MockDummy();
+        $mock->returnsByValueAt(0, "aMethod", "aaa");
+        $mock->returnsByValueAt(1, "aMethod", "bbb");
+        $mock->returnsByValueAt(3, "aMethod", "ddd");
+        $this->assertIdentical($mock->aMethod(), "aaa");
+        $this->assertIdentical($mock->aMethod(), "bbb");
+        $this->assertNull($mock->aMethod());
+        $this->assertIdentical($mock->aMethod(), "ddd");
+    }
+
+    function testSetReturnReferenceAtGivesOriginal() {
+        $mock = new MockDummy();
+        $object = 100;
+        $mock->returnsByReferenceAt(1, "aReferenceMethod", $object);
+        $this->assertNull($mock->aReferenceMethod());
+        $this->assertReference($mock->aReferenceMethod(), $object);
+        $this->assertNull($mock->aReferenceMethod());
+    }
+
+    function testReturnsAtGivesOriginalObjectHandle() {
+        $mock = new MockDummy();
+        $object = new Dummy();
+        $mock->returnsAt(1, "aMethod", $object);
+        $this->assertNull($mock->aMethod());
+        $this->assertSame($mock->aMethod(), $object);
+        $this->assertNull($mock->aMethod());
+    }
+
+    function testComplicatedReturnSequence() {
+        $mock = new MockDummy();
+        $object = new Dummy();
+        $mock->returnsAt(1, "aMethod", "aaa", array("a"));
+        $mock->returnsAt(1, "aMethod", "bbb");
+        $mock->returnsAt(2, "aMethod", $object, array('*', 2));
+        $mock->returnsAt(2, "aMethod", "value", array('*', 3));
+        $mock->returns("aMethod", 3, array(3));
+        $this->assertNull($mock->aMethod());
+        $this->assertEqual($mock->aMethod("a"), "aaa");
+        $this->assertSame($mock->aMethod(1, 2), $object);
+        $this->assertEqual($mock->aMethod(3), 3);
+        $this->assertNull($mock->aMethod());
+    }
+
+    function testMultipleMethodSequences() {
+        $mock = new MockDummy();
+        $mock->returnsByValueAt(0, "aMethod", "aaa");
+        $mock->returnsByValueAt(1, "aMethod", "bbb");
+        $mock->returnsByValueAt(0, "anotherMethod", "ccc");
+        $mock->returnsByValueAt(1, "anotherMethod", "ddd");
+        $this->assertIdentical($mock->aMethod(), "aaa");
+        $this->assertIdentical($mock->anotherMethod(), "ccc");
+        $this->assertIdentical($mock->aMethod(), "bbb");
+        $this->assertIdentical($mock->anotherMethod(), "ddd");
+    }
+
+    function testSequenceFallback() {
+        $mock = new MockDummy();
+        $mock->returnsByValueAt(0, "aMethod", "aaa", array('a'));
+        $mock->returnsByValueAt(1, "aMethod", "bbb", array('a'));
+        $mock->returnsByValue("aMethod", "AAA");
+        $this->assertIdentical($mock->aMethod('a'), "aaa");
+        $this->assertIdentical($mock->aMethod('b'), "AAA");
+    }
+
+    function testMethodInterference() {
+        $mock = new MockDummy();
+        $mock->returnsByValueAt(0, "anotherMethod", "aaa");
+        $mock->returnsByValue("aMethod", "AAA");
+        $this->assertIdentical($mock->aMethod(), "AAA");
+        $this->assertIdentical($mock->anotherMethod(), "aaa");
+    }
+}
+
+class TestOfMockExpectationsThatPass extends UnitTestCase {
+
+    function testAnyArgument() {
+        $mock = new MockDummy();
+        $mock->expect('aMethod', array('*'));
+        $mock->aMethod(1);
+        $mock->aMethod('hello');
+    }
+
+    function testAnyTwoArguments() {
+        $mock = new MockDummy();
+        $mock->expect('aMethod', array('*', '*'));
+        $mock->aMethod(1, 2);
+    }
+
+    function testSpecificArgument() {
+        $mock = new MockDummy();
+        $mock->expect('aMethod', array(1));
+        $mock->aMethod(1);
+    }
+
+    function testExpectation() {
+        $mock = new MockDummy();
+        $mock->expect('aMethod', array(new IsAExpectation('Dummy')));
+        $mock->aMethod(new Dummy());
+    }
+
+    function testArgumentsInSequence() {
+        $mock = new MockDummy();
+        $mock->expectAt(0, 'aMethod', array(1, 2));
+        $mock->expectAt(1, 'aMethod', array(3, 4));
+        $mock->aMethod(1, 2);
+        $mock->aMethod(3, 4);
+    }
+
+    function testAtLeastOnceSatisfiedByOneCall() {
+        $mock = new MockDummy();
+        $mock->expectAtLeastOnce('aMethod');
+        $mock->aMethod();
+    }
+
+    function testAtLeastOnceSatisfiedByTwoCalls() {
+        $mock = new MockDummy();
+        $mock->expectAtLeastOnce('aMethod');
+        $mock->aMethod();
+        $mock->aMethod();
+    }
+
+    function testOnceSatisfiedByOneCall() {
+        $mock = new MockDummy();
+        $mock->expectOnce('aMethod');
+        $mock->aMethod();
+    }
+
+    function testMinimumCallsSatisfiedByEnoughCalls() {
+        $mock = new MockDummy();
+        $mock->expectMinimumCallCount('aMethod', 1);
+        $mock->aMethod();
+    }
+
+    function testMinimumCallsSatisfiedByTooManyCalls() {
+        $mock = new MockDummy();
+        $mock->expectMinimumCallCount('aMethod', 3);
+        $mock->aMethod();
+        $mock->aMethod();
+        $mock->aMethod();
+        $mock->aMethod();
+    }
+
+    function testMaximumCallsSatisfiedByEnoughCalls() {
+        $mock = new MockDummy();
+        $mock->expectMaximumCallCount('aMethod', 1);
+        $mock->aMethod();
+    }
+
+    function testMaximumCallsSatisfiedByNoCalls() {
+        $mock = new MockDummy();
+        $mock->expectMaximumCallCount('aMethod', 1);
+    }
+}
+
+class MockWithInjectedTestCase extends SimpleMock {
+    protected function getCurrentTestCase() {
+        return SimpleTest::getContext()->getTest()->getMockedTest();
+    }
+}
+SimpleTest::setMockBaseClass('MockWithInjectedTestCase');
+Mock::generate('Dummy', 'MockDummyWithInjectedTestCase');
+SimpleTest::setMockBaseClass('SimpleMock');
+Mock::generate('SimpleTestCase');
+
+class LikeExpectation extends IdenticalExpectation {
+    function __construct($expectation) {
+        $expectation->message = '';
+        parent::__construct($expectation);
+    }
+
+    function test($compare) {
+        $compare->message = '';
+        return parent::test($compare);
+    }
+
+    function testMessage($compare) {
+        $compare->message = '';
+        return parent::testMessage($compare);
+    }
+}
+
+class TestOfMockExpectations extends UnitTestCase {
+    private $test;
+
+    function setUp() {
+        $this->test = new MockSimpleTestCase();
+    }
+
+    function getMockedTest() {
+        return $this->test;
+    }
+
+    function testSettingExpectationOnNonMethodThrowsError() {
+        $mock = new MockDummyWithInjectedTestCase();
+        $this->expectError();
+        $mock->expectMaximumCallCount('aMissingMethod', 2);
+    }
+
+    function testMaxCallsDetectsOverrun() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 2), 3));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectMaximumCallCount('aMethod', 2);
+        $mock->aMethod();
+        $mock->aMethod();
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testTallyOnMaxCallsSendsPassOnUnderrun() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 2), 2));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectMaximumCallCount("aMethod", 2);
+        $mock->aMethod();
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testExpectNeverDetectsOverrun() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 0), 1));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectNever('aMethod');
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testTallyOnExpectNeverStillSendsPassOnUnderrun() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 0), 0));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectNever('aMethod');
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testMinCalls() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 2), 2));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectMinimumCallCount('aMethod', 2);
+        $mock->aMethod();
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testFailedNever() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 0), 1));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectNever('aMethod');
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testUnderOnce() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 1), 0));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectOnce('aMethod');
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testOverOnce() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 1), 2));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectOnce('aMethod');
+        $mock->aMethod();
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testUnderAtLeastOnce() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 1), 0));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectAtLeastOnce("aMethod");
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testZeroArguments() {
+        $this->test->expectOnce('assert',
+                                array(new MemberExpectation('expected', array()), array(), '*'));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expect('aMethod', array());
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testExpectedArguments() {
+        $this->test->expectOnce('assert',
+                                array(new MemberExpectation('expected', array(1, 2, 3)), array(1, 2, 3), '*'));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expect('aMethod', array(1, 2, 3));
+        $mock->aMethod(1, 2, 3);
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testFailedArguments() {
+        $this->test->expectOnce('assert',
+                                array(new MemberExpectation('expected', array('this')), array('that'), '*'));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expect('aMethod', array('this'));
+        $mock->aMethod('that');
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testWildcardsAreTranslatedToAnythingExpectations() {
+        $this->test->expectOnce('assert',
+                                array(new MemberExpectation('expected',
+                                                            array(new AnythingExpectation(),
+                                                                  123,
+                                                                  new AnythingExpectation())),
+                                      array(100, 123, 101), '*'));
+        $mock = new MockDummyWithInjectedTestCase($this);
+        $mock->expect("aMethod", array('*', 123, '*'));
+        $mock->aMethod(100, 123, 101);
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testSpecificPassingSequence() {
+        $this->test->expectAt(0, 'assert',
+                              array(new MemberExpectation('expected', array(1, 2, 3)), array(1, 2, 3), '*'));
+        $this->test->expectAt(1, 'assert',
+                              array(new MemberExpectation('expected', array('Hello')), array('Hello'), '*'));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectAt(1, 'aMethod', array(1, 2, 3));
+        $mock->expectAt(2, 'aMethod', array('Hello'));
+        $mock->aMethod();
+        $mock->aMethod(1, 2, 3);
+        $mock->aMethod('Hello');
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testNonArrayForExpectedParametersGivesError() {
+        $mock = new MockDummyWithInjectedTestCase();
+        $this->expectError(new PatternExpectation('/\$args.*not an array/i'));
+        $mock->expect("aMethod", "foo");
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+   }
+}
+
+class TestOfMockComparisons extends UnitTestCase {
+
+    function testEqualComparisonOfMocksDoesNotCrash() {
+        $expectation = new EqualExpectation(new MockDummy());
+        $this->assertTrue($expectation->test(new MockDummy(), true));
+    }
+
+    function testIdenticalComparisonOfMocksDoesNotCrash() {
+        $expectation = new IdenticalExpectation(new MockDummy());
+        $this->assertTrue($expectation->test(new MockDummy()));
+    }
+}
+
+class ClassWithSpecialMethods {
+    function __get($name) { }
+    function __set($name, $value) { }
+    function __isset($name) { }
+    function __unset($name) { }
+    function __call($method, $arguments) { }
+    function __toString() { }
+}
+Mock::generate('ClassWithSpecialMethods');
+
+class TestOfSpecialMethodsAfterPHP51 extends UnitTestCase {
+
+    function skip() {
+        $this->skipIf(version_compare(phpversion(), '5.1', '<'), '__isset and __unset overloading not tested unless PHP 5.1+');
+    }
+
+    function testCanEmulateIsset() {
+        $mock = new MockClassWithSpecialMethods();
+        $mock->returnsByValue('__isset', true);
+        $this->assertIdentical(isset($mock->a), true);
+    }
+
+    function testCanExpectUnset() {
+        $mock = new MockClassWithSpecialMethods();
+        $mock->expectOnce('__unset', array('a'));
+        unset($mock->a);
+    }
+
+}
+
+class TestOfSpecialMethods extends UnitTestCase {
+    function skip() {
+        $this->skipIf(version_compare(phpversion(), '5', '<'), 'Overloading not tested unless PHP 5+');
+    }
+
+    function testCanMockTheThingAtAll() {
+        $mock = new MockClassWithSpecialMethods();
+    }
+
+    function testReturnFromSpecialAccessor() {
+        $mock = new MockClassWithSpecialMethods();
+        $mock->returnsByValue('__get', '1st Return', array('first'));
+        $mock->returnsByValue('__get', '2nd Return', array('second'));
+        $this->assertEqual($mock->first, '1st Return');
+        $this->assertEqual($mock->second, '2nd Return');
+    }
+
+    function testcanExpectTheSettingOfValue() {
+        $mock = new MockClassWithSpecialMethods();
+        $mock->expectOnce('__set', array('a', 'A'));
+        $mock->a = 'A';
+    }
+
+    function testCanSimulateAnOverloadmethod() {
+        $mock = new MockClassWithSpecialMethods();
+        $mock->expectOnce('__call', array('amOverloaded', array('A')));
+        $mock->returnsByValue('__call', 'aaa');
+        $this->assertIdentical($mock->amOverloaded('A'), 'aaa');
+    }
+
+    function testToStringMagic() {
+        $mock = new MockClassWithSpecialMethods();
+        $mock->expectOnce('__toString');
+        $mock->returnsByValue('__toString', 'AAA');
+        ob_start();
+        print $mock;
+        $output = ob_get_contents();
+        ob_end_clean();
+        $this->assertEqual($output, 'AAA');
+    }
+}
+
+class WithStaticMethod {
+    static function aStaticMethod() { }
+}
+Mock::generate('WithStaticMethod');
+
+class TestOfMockingClassesWithStaticMethods extends UnitTestCase {
+
+    function testStaticMethodIsMockedAsStatic() {
+        $mock = new WithStaticMethod();
+        $reflection = new ReflectionClass($mock);
+        $method = $reflection->getMethod('aStaticMethod');
+        $this->assertTrue($method->isStatic());
+    }
+}
+
+class MockTestException extends Exception { }
+
+class TestOfThrowingExceptionsFromMocks extends UnitTestCase {
+
+    function testCanThrowOnMethodCall() {
+        $mock = new MockDummy();
+        $mock->throwOn('aMethod');
+        $this->expectException();
+        $mock->aMethod();
+    }
+
+    function testCanThrowSpecificExceptionOnMethodCall() {
+        $mock = new MockDummy();
+        $mock->throwOn('aMethod', new MockTestException());
+        $this->expectException();
+        $mock->aMethod();
+    }
+
+    function testThrowsOnlyWhenCallSignatureMatches() {
+        $mock = new MockDummy();
+        $mock->throwOn('aMethod', new MockTestException(), array(3));
+        $mock->aMethod(1);
+        $mock->aMethod(2);
+        $this->expectException();
+        $mock->aMethod(3);
+    }
+
+    function testCanThrowOnParticularInvocation() {
+        $mock = new MockDummy();
+        $mock->throwAt(2, 'aMethod', new MockTestException());
+        $mock->aMethod();
+        $mock->aMethod();
+        $this->expectException();
+        $mock->aMethod();
+    }
+}
+
+class TestOfThrowingErrorsFromMocks extends UnitTestCase {
+
+    function testCanGenerateErrorFromMethodCall() {
+        $mock = new MockDummy();
+        $mock->errorOn('aMethod', 'Ouch!');
+        $this->expectError('Ouch!');
+        $mock->aMethod();
+    }
+
+    function testGeneratesErrorOnlyWhenCallSignatureMatches() {
+        $mock = new MockDummy();
+        $mock->errorOn('aMethod', 'Ouch!', array(3));
+        $mock->aMethod(1);
+        $mock->aMethod(2);
+        $this->expectError();
+        $mock->aMethod(3);
+    }
+
+    function testCanGenerateErrorOnParticularInvocation() {
+        $mock = new MockDummy();
+        $mock->errorAt(2, 'aMethod', 'Ouch!');
+        $mock->aMethod();
+        $mock->aMethod();
+        $this->expectError();
+        $mock->aMethod();
+    }
+}
+
+Mock::generatePartial('Dummy', 'TestDummy', array('anotherMethod', 'aReferenceMethod'));
+
+class TestOfPartialMocks extends UnitTestCase {
+
+    function testMethodReplacementWithNoBehaviourReturnsNull() {
+        $mock = new TestDummy();
+        $this->assertEqual($mock->aMethod(99), 99);
+        $this->assertNull($mock->anotherMethod());
+    }
+
+    function testSettingReturns() {
+        $mock = new TestDummy();
+        $mock->returnsByValue('anotherMethod', 33, array(3));
+        $mock->returnsByValue('anotherMethod', 22);
+        $mock->returnsByValueAt(2, 'anotherMethod', 44, array(3));
+        $this->assertEqual($mock->anotherMethod(), 22);
+        $this->assertEqual($mock->anotherMethod(3), 33);
+        $this->assertEqual($mock->anotherMethod(3), 44);
+    }
+
+    function testSetReturnReferenceGivesOriginal() {
+        $mock = new TestDummy();
+        $object = 99;
+        $mock->returnsByReferenceAt(0, 'aReferenceMethod', $object, array(3));
+        $this->assertReference($mock->aReferenceMethod(3), $object);
+    }
+
+    function testReturnsAtGivesOriginalObjectHandle() {
+        $mock = new TestDummy();
+        $object = new Dummy();
+        $mock->returnsAt(0, 'anotherMethod', $object, array(3));
+        $this->assertSame($mock->anotherMethod(3), $object);
+    }
+
+    function testExpectations() {
+        $mock = new TestDummy();
+        $mock->expectCallCount('anotherMethod', 2);
+        $mock->expect('anotherMethod', array(77));
+        $mock->expectAt(1, 'anotherMethod', array(66));
+        $mock->anotherMethod(77);
+        $mock->anotherMethod(66);
+    }
+
+    function testSettingExpectationOnMissingMethodThrowsError() {
+        $mock = new TestDummy();
+        $this->expectError();
+        $mock->expectCallCount('aMissingMethod', 2);
+    }
+}
+
+class ConstructorSuperClass {
+    function ConstructorSuperClass() { }
+}
+
+class ConstructorSubClass extends ConstructorSuperClass { }
+
+class TestOfPHP4StyleSuperClassConstruct extends UnitTestCase {
+    function testBasicConstruct() {
+        Mock::generate('ConstructorSubClass');
+        $mock = new MockConstructorSubClass();
+        $this->assertIsA($mock, 'ConstructorSubClass');
+        $this->assertTrue(method_exists($mock, 'ConstructorSuperClass'));
+    }
+}
+
+class TestOfPHP5StaticMethodMocking extends UnitTestCase {
+    function testCanCreateAMockObjectWithStaticMethodsWithoutError() {
+        eval('
+            class SimpleObjectContainingStaticMethod {
+                static function someStatic() { }
+            }
+        ');
+        Mock::generate('SimpleObjectContainingStaticMethod');
+    }
+}
+
+class TestOfPHP5AbstractMethodMocking extends UnitTestCase {
+    function testCanCreateAMockObjectFromAnAbstractWithProperFunctionDeclarations() {
+        eval('
+            abstract class SimpleAbstractClassContainingAbstractMethods {
+                abstract function anAbstract();
+                abstract function anAbstractWithParameter($foo);
+                abstract function anAbstractWithMultipleParameters($foo, $bar);
+            }
+        ');
+        Mock::generate('SimpleAbstractClassContainingAbstractMethods');
+        $this->assertTrue(
+            method_exists(
+                // Testing with class name alone does not work in PHP 5.0
+                new MockSimpleAbstractClassContainingAbstractMethods,
+                'anAbstract'
+            )
+        );
+        $this->assertTrue(
+            method_exists(
+                new MockSimpleAbstractClassContainingAbstractMethods,
+                'anAbstractWithParameter'
+            )
+        );
+        $this->assertTrue(
+            method_exists(
+                new MockSimpleAbstractClassContainingAbstractMethods,
+                'anAbstractWithMultipleParameters'
+            )
+        );
+    }
+
+    function testMethodsDefinedAsAbstractInParentShouldHaveFullSignature() {
+        eval('
+             abstract class SimpleParentAbstractClassContainingAbstractMethods {
+                abstract function anAbstract();
+                abstract function anAbstractWithParameter($foo);
+                abstract function anAbstractWithMultipleParameters($foo, $bar);
+            }
+
+             class SimpleChildAbstractClassContainingAbstractMethods extends SimpleParentAbstractClassContainingAbstractMethods {
+                function anAbstract(){}
+                function anAbstractWithParameter($foo){}
+                function anAbstractWithMultipleParameters($foo, $bar){}
+            }
+
+            class EvenDeeperEmptyChildClass extends SimpleChildAbstractClassContainingAbstractMethods {}
+        ');
+        Mock::generate('SimpleChildAbstractClassContainingAbstractMethods');
+        $this->assertTrue(
+            method_exists(
+                new MockSimpleChildAbstractClassContainingAbstractMethods,
+                'anAbstract'
+            )
+        );
+        $this->assertTrue(
+            method_exists(
+                new MockSimpleChildAbstractClassContainingAbstractMethods,
+                'anAbstractWithParameter'
+            )
+        );
+        $this->assertTrue(
+            method_exists(
+                new MockSimpleChildAbstractClassContainingAbstractMethods,
+                'anAbstractWithMultipleParameters'
+            )
+        );
+        Mock::generate('EvenDeeperEmptyChildClass');
+        $this->assertTrue(
+            method_exists(
+                new MockEvenDeeperEmptyChildClass,
+                'anAbstract'
+            )
+        );
+        $this->assertTrue(
+            method_exists(
+                new MockEvenDeeperEmptyChildClass,
+                'anAbstractWithParameter'
+            )
+        );
+        $this->assertTrue(
+            method_exists(
+                new MockEvenDeeperEmptyChildClass,
+                'anAbstractWithMultipleParameters'
+            )
+        );
+    }
+}
+
+class DummyWithProtected
+{
+    public function aMethodCallsProtected() { return $this->aProtectedMethod(); }
+    protected function aProtectedMethod() { return true; }
+}
+
+Mock::generatePartial('DummyWithProtected', 'TestDummyWithProtected', array('aProtectedMethod'));
+class TestOfProtectedMethodPartialMocks extends UnitTestCase
+{
+    function testProtectedMethodExists() {
+        $this->assertTrue(
+            method_exists(
+                new TestDummyWithProtected,
+                'aProtectedMethod'
+            )
+        );
+    }
+
+    function testProtectedMethodIsCalled() {
+        $object = new DummyWithProtected();
+        $this->assertTrue($object->aMethodCallsProtected(), 'ensure original was called');
+    }
+
+    function testMockedMethodIsCalled() {
+        $object = new TestDummyWithProtected();
+        $object->returnsByValue('aProtectedMethod', false);
+        $this->assertFalse($object->aMethodCallsProtected());
+    }
+}
+
+?>
diff --git a/3rdparty/simpletest/test/page_test.php b/3rdparty/simpletest/test/page_test.php
new file mode 100755
index 00000000000..fdc15c5d008
--- /dev/null
+++ b/3rdparty/simpletest/test/page_test.php
@@ -0,0 +1,166 @@
+<?php
+// $Id: page_test.php 1913 2009-07-29 16:50:56Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../expectation.php');
+require_once(dirname(__FILE__) . '/../http.php');
+require_once(dirname(__FILE__) . '/../page.php');
+Mock::generate('SimpleHttpHeaders');
+Mock::generate('SimpleHttpResponse');
+
+class TestOfPageInterface extends UnitTestCase {
+    function testInterfaceOnEmptyPage() {
+        $page = new SimplePage();
+        $this->assertEqual($page->getTransportError(), 'No page fetched yet');
+        $this->assertIdentical($page->getRaw(), false);
+        $this->assertIdentical($page->getHeaders(), false);
+        $this->assertIdentical($page->getMimeType(), false);
+        $this->assertIdentical($page->getResponseCode(), false);
+        $this->assertIdentical($page->getAuthentication(), false);
+        $this->assertIdentical($page->getRealm(), false);
+        $this->assertFalse($page->hasFrames());
+        $this->assertIdentical($page->getUrls(), array());
+        $this->assertIdentical($page->getTitle(), false);
+    }
+}
+
+class TestOfPageHeaders extends UnitTestCase {
+
+    function testUrlAccessor() {
+        $headers = new MockSimpleHttpHeaders();
+
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getHeaders', $headers);
+        $response->setReturnValue('getMethod', 'POST');
+        $response->setReturnValue('getUrl', new SimpleUrl('here'));
+        $response->setReturnValue('getRequestData', array('a' => 'A'));
+
+        $page = new SimplePage($response);
+        $this->assertEqual($page->getMethod(), 'POST');
+        $this->assertEqual($page->getUrl(), new SimpleUrl('here'));
+        $this->assertEqual($page->getRequestData(), array('a' => 'A'));
+    }
+
+    function testTransportError() {
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getError', 'Ouch');
+
+        $page = new SimplePage($response);
+        $this->assertEqual($page->getTransportError(), 'Ouch');
+    }
+
+    function testHeadersAccessor() {
+        $headers = new MockSimpleHttpHeaders();
+        $headers->setReturnValue('getRaw', 'My: Headers');
+
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getHeaders', $headers);
+
+        $page = new SimplePage($response);
+        $this->assertEqual($page->getHeaders(), 'My: Headers');
+    }
+
+    function testMimeAccessor() {
+        $headers = new MockSimpleHttpHeaders();
+        $headers->setReturnValue('getMimeType', 'text/html');
+
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getHeaders', $headers);
+
+        $page = new SimplePage($response);
+        $this->assertEqual($page->getMimeType(), 'text/html');
+    }
+
+    function testResponseAccessor() {
+        $headers = new MockSimpleHttpHeaders();
+        $headers->setReturnValue('getResponseCode', 301);
+
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getHeaders', $headers);
+
+        $page = new SimplePage($response);
+        $this->assertIdentical($page->getResponseCode(), 301);
+    }
+
+    function testAuthenticationAccessors() {
+        $headers = new MockSimpleHttpHeaders();
+        $headers->setReturnValue('getAuthentication', 'Basic');
+        $headers->setReturnValue('getRealm', 'Secret stuff');
+
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getHeaders', $headers);
+
+        $page = new SimplePage($response);
+        $this->assertEqual($page->getAuthentication(), 'Basic');
+        $this->assertEqual($page->getRealm(), 'Secret stuff');
+    }
+}
+
+class TestOfHtmlStrippingAndNormalisation extends UnitTestCase {
+
+	function testImageSuppressionWhileKeepingParagraphsAndAltText() {
+        $this->assertEqual(
+                SimplePage::normalise('<img src="foo.png" /><p>some text</p><img src="bar.png" alt="bar" />'),
+                'some text bar');
+	}
+
+    function testSpaceNormalisation() {
+        $this->assertEqual(
+                SimplePage::normalise("\nOne\tTwo   \nThree\t"),
+                'One Two Three');
+    }
+
+    function testMultilinesCommentSuppression() {
+        $this->assertEqual(
+                SimplePage::normalise('<!--\n Hello \n-->'),
+                '');
+    }
+
+    function testCommentSuppression() {
+        $this->assertEqual(
+                SimplePage::normalise('<!--Hello-->'),
+                '');
+    }
+
+    function testJavascriptSuppression() {
+        $this->assertEqual(
+                SimplePage::normalise('<script attribute="test">\nHello\n</script>'),
+                '');
+        $this->assertEqual(
+                SimplePage::normalise('<script attribute="test">Hello</script>'),
+                '');
+        $this->assertEqual(
+                SimplePage::normalise('<script>Hello</script>'),
+                '');
+    }
+
+    function testTagSuppression() {
+        $this->assertEqual(
+                SimplePage::normalise('<b>Hello</b>'),
+                'Hello');
+    }
+
+    function testAdjoiningTagSuppression() {
+        $this->assertEqual(
+                SimplePage::normalise('<b>Hello</b><em>Goodbye</em>'),
+                'HelloGoodbye');
+    }
+
+    function testExtractImageAltTextWithDifferentQuotes() {
+        $this->assertEqual(
+                SimplePage::normalise('<img alt="One"><img alt=\'Two\'><img alt=Three>'),
+                'One Two Three');
+    }
+
+    function testExtractImageAltTextMultipleTimes() {
+        $this->assertEqual(
+                SimplePage::normalise('<img alt="One"><img alt="Two"><img alt="Three">'),
+                'One Two Three');
+    }
+
+    function testHtmlEntityTranslation() {
+        $this->assertEqual(
+                SimplePage::normalise('&lt;&gt;&quot;&amp;&#039;'),
+                '<>"&\'');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/parse_error_test.php b/3rdparty/simpletest/test/parse_error_test.php
new file mode 100755
index 00000000000..c3ffb3d4205
--- /dev/null
+++ b/3rdparty/simpletest/test/parse_error_test.php
@@ -0,0 +1,9 @@
+<?php
+// $Id: parse_error_test.php 1509 2007-05-08 22:11:49Z lastcraft $
+require_once('../unit_tester.php');
+require_once('../reporter.php');
+
+$test = &new TestSuite('This should fail');
+$test->addFile('test_with_parse_error.php');
+$test->run(new HtmlReporter());
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/parsing_test.php b/3rdparty/simpletest/test/parsing_test.php
new file mode 100755
index 00000000000..2c5e6cafe1d
--- /dev/null
+++ b/3rdparty/simpletest/test/parsing_test.php
@@ -0,0 +1,642 @@
+<?php
+// $Id: page_test.php 1912 2009-07-29 16:39:17Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../page.php');
+require_once(dirname(__FILE__) . '/../php_parser.php');
+require_once(dirname(__FILE__) . '/../tidy_parser.php');
+Mock::generate('SimpleHttpResponse');
+
+abstract class TestOfParsing extends UnitTestCase {
+
+    function testRawAccessor() {
+        $page = $this->whenVisiting('http://host/', 'Raw HTML');
+        $this->assertEqual($page->getRaw(), 'Raw HTML');
+    }
+
+    function testTextAccessor() {
+        $page = $this->whenVisiting('http://host/', '<b>Some</b> &quot;messy&quot; HTML');
+        $this->assertEqual($page->getText(), 'Some "messy" HTML');
+    }
+
+    function testFramesetAbsence() {
+        $page = $this->whenVisiting('http://here/', '');
+        $this->assertFalse($page->hasFrames());
+        $this->assertIdentical($page->getFrameset(), false);
+    }
+
+    function testPageWithNoUrlsGivesEmptyArrayOfLinks() {
+        $page = $this->whenVisiting('http://here/', '<html><body><p>Stuff</p></body></html>');
+        $this->assertIdentical($page->getUrls(), array());
+    }
+
+    function testAddAbsoluteLink() {
+        $page = $this->whenVisiting('http://host',
+                                    '<html><a href="http://somewhere.com">Label</a></html>');
+        $this->assertEqual(
+                $page->getUrlsByLabel('Label'),
+                array(new SimpleUrl('http://somewhere.com')));
+    }
+
+    function testUrlLabelsHaveHtmlTagsStripped() {
+        $page = $this->whenVisiting('http://host',
+                                    '<html><a href="http://somewhere.com"><b>Label</b></a></html>');
+        $this->assertEqual(
+                $page->getUrlsByLabel('Label'),
+                array(new SimpleUrl('http://somewhere.com')));
+    }
+
+    function testAddStrictRelativeLink() {
+        $page = $this->whenVisiting('http://host',
+                                    '<html><a href="./somewhere.php">Label</a></html>');
+        $this->assertEqual(
+                $page->getUrlsByLabel('Label'),
+                array(new SimpleUrl('http://host/somewhere.php')));
+    }
+
+    function testAddBareRelativeLink() {
+        $page = $this->whenVisiting('http://host',
+                                    '<html><a href="somewhere.php">Label</a></html>');
+        $this->assertEqual(
+                $page->getUrlsByLabel('Label'),
+                array(new SimpleUrl('http://host/somewhere.php')));
+    }
+
+    function testAddRelativeLinkWithBaseTag() {
+        $raw = '<html><head><base href="http://www.lastcraft.com/stuff/"></head>' .
+               '<body><a href="somewhere.php">Label</a></body>' .
+               '</html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual(
+                $page->getUrlsByLabel('Label'),
+                array(new SimpleUrl('http://www.lastcraft.com/stuff/somewhere.php')));
+    }
+
+    function testAddAbsoluteLinkWithBaseTag() {
+        $raw = '<html><head><base href="http://www.lastcraft.com/stuff/"></head>' .
+               '<body><a href="http://here.com/somewhere.php">Label</a></body>' .
+               '</html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual(
+                $page->getUrlsByLabel('Label'),
+                array(new SimpleUrl('http://here.com/somewhere.php')));
+    }
+
+    function testCanFindLinkInsideForm() {
+        $raw = '<html><body><form><a href="./somewhere.php">Label</a></form></body></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual(
+                $page->getUrlsByLabel('Label'),
+                array(new SimpleUrl('http://host/somewhere.php')));
+    }
+
+    function testCanGetLinksByIdOrLabel() {
+        $raw = '<html><body><a href="./somewhere.php" id="33">Label</a></body></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual(
+                $page->getUrlsByLabel('Label'),
+                array(new SimpleUrl('http://host/somewhere.php')));
+        $this->assertFalse($page->getUrlById(0));
+        $this->assertEqual(
+                $page->getUrlById(33),
+                new SimpleUrl('http://host/somewhere.php'));
+    }
+
+    function testCanFindLinkByNormalisedLabel() {
+        $raw = '<html><body><a href="./somewhere.php" id="33"><em>Long &amp; thin</em></a></body></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual(
+                $page->getUrlsByLabel('Long & thin'),
+                array(new SimpleUrl('http://host/somewhere.php')));
+    }
+
+    function testCanFindLinkByImageAltText() {
+        $raw = '<a href="./somewhere.php" id="33"><img src="pic.jpg" alt="&lt;A picture&gt;"></a>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual(
+                array_map(array($this, 'urlToString'), $page->getUrlsByLabel('<A picture>')),
+                array('http://host/somewhere.php'));
+    }
+
+    function testTitle() {
+        $page = $this->whenVisiting('http://host',
+                                    '<html><head><title>Me</title></head></html>');
+        $this->assertEqual($page->getTitle(), 'Me');
+    }
+
+    function testTitleWithEntityReference() {
+        $page = $this->whenVisiting('http://host',
+                                    '<html><head><Title>Me&amp;Me</TITLE></head></html>');
+        $this->assertEqual($page->getTitle(), "Me&Me");
+    }
+
+    function testOnlyFramesInFramesetAreRecognised() {
+        $raw =
+            '<frameset>' .
+            '  <frame src="2.html"></frame>' .
+            '  <frame src="3.html"></frame>' .
+            '</frameset>' .
+            '<frame src="4.html"></frame>';
+        $page = $this->whenVisiting('http://here', $raw);
+        $this->assertTrue($page->hasFrames());
+        $this->assertSameFrameset($page->getFrameset(), array(
+                1 => new SimpleUrl('http://here/2.html'),
+                2 => new SimpleUrl('http://here/3.html')));
+    }
+
+    function testReadsNamesInFrames() {
+        $raw =
+            '<frameset>' .
+            '  <frame src="1.html"></frame>' .
+            '  <frame src="2.html" name="A"></frame>' .
+            '  <frame src="3.html" name="B"></frame>' .
+            '  <frame src="4.html"></frame>' .
+            '</frameset>';
+        $page = $this->whenVisiting('http://here', $raw);
+        $this->assertTrue($page->hasFrames());
+        $this->assertSameFrameset($page->getFrameset(), array(
+                1 => new SimpleUrl('http://here/1.html'),
+                'A' => new SimpleUrl('http://here/2.html'),
+                'B' => new SimpleUrl('http://here/3.html'),
+                4 => new SimpleUrl('http://here/4.html')));
+    }
+
+    function testRelativeFramesRespectBaseTag() {
+        $raw = '<base href="https://there.com/stuff/"><frameset><frame src="1.html"></frameset>';
+        $page = $this->whenVisiting('http://here', $raw);
+        $this->assertSameFrameset(
+                $page->getFrameset(),
+                array(1 => new SimpleUrl('https://there.com/stuff/1.html')));
+    }
+
+    function testSingleFrameInNestedFrameset() {
+        $raw = '<html><frameset><frameset>' .
+                '<frame src="a.html">' .
+                '</frameset></frameset></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->hasFrames());
+        $this->assertIdentical(
+                $page->getFrameset(),
+                array(1 => new SimpleUrl('http://host/a.html')));
+    }
+
+    function testFramesCollectedWithNestedFramesetTags() {
+        $raw = '<html><frameset>' .
+                '<frame src="a.html">' .
+                '<frameset><frame src="b.html"></frameset>' .
+                '<frame src="c.html">' .
+                '</frameset></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->hasFrames());
+        $this->assertIdentical($page->getFrameset(), array(
+                1 => new SimpleUrl('http://host/a.html'),
+                2 => new SimpleUrl('http://host/b.html'),
+                3 => new SimpleUrl('http://host/c.html')));
+    }
+
+    function testNamedFrames() {
+        $raw = '<html><frameset>' .
+                '<frame src="a.html">' .
+                '<frame name="_one" src="b.html">' .
+                '<frame src="c.html">' .
+                '<frame src="d.html" name="_two">' .
+                '</frameset></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->hasFrames());
+        $this->assertIdentical($page->getFrameset(), array(
+                1 => new SimpleUrl('http://host/a.html'),
+                '_one' => new SimpleUrl('http://host/b.html'),
+                3 => new SimpleUrl('http://host/c.html'),
+                '_two' => new SimpleUrl('http://host/d.html')));
+    }
+
+    function testCanReadElementOfCompleteForm() {
+        $raw = '<html><head><form>' .
+                '<input type="text" name="here" value="Hello">' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('here')), "Hello");
+    }
+
+    function testCanReadElementOfUnclosedForm() {
+        $raw = '<html><head><form>' .
+                '<input type="text" name="here" value="Hello">' .
+                '</head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('here')), "Hello");
+    }
+
+    function testCanReadElementByLabel() {
+        $raw = '<html><head><form>' .
+                '<label>Where<input type="text" name="here" value="Hello"></label>' .
+                '</head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByLabel('Where')), "Hello");
+    }
+
+    function testCanFindFormByLabel() {
+        $raw = '<html><head><form><input type="submit"></form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertNull($page->getFormBySubmit(new SimpleByLabel('submit')));
+        $this->assertNull($page->getFormBySubmit(new SimpleByName('submit')));
+        $this->assertIsA(
+                $page->getFormBySubmit(new SimpleByLabel('Submit')),
+                'SimpleForm');
+    }
+
+    function testConfirmSubmitAttributesAreCaseSensitive() {
+        $raw = '<html><head><FORM><INPUT TYPE="SUBMIT" NAME="S" VALUE="S"></FORM></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertIsA(
+                $page->getFormBySubmit(new SimpleByName('S')),
+                'SimpleForm');
+        $this->assertIsA(
+                $page->getFormBySubmit(new SimpleByLabel('S')),
+                'SimpleForm');
+    }
+
+    function testCanFindFormByImage() {
+        $raw = '<html><head><form>' .
+                '<input type="image" id=100 alt="Label" name="me">' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertIsA(
+                $page->getFormByImage(new SimpleByLabel('Label')),
+                'SimpleForm');
+        $this->assertIsA(
+                $page->getFormByImage(new SimpleByName('me')),
+                'SimpleForm');
+        $this->assertIsA(
+                $page->getFormByImage(new SimpleById(100)),
+                'SimpleForm');
+    }
+
+    function testCanFindFormByButtonTag() {
+        $raw = '<html><head><form>' .
+                '<button type="submit" name="b" value="B">BBB</button>' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertNull($page->getFormBySubmit(new SimpleByLabel('b')));
+        $this->assertNull($page->getFormBySubmit(new SimpleByLabel('B')));
+        $this->assertIsA(
+                $page->getFormBySubmit(new SimpleByName('b')),
+                'SimpleForm');
+        $this->assertIsA(
+                $page->getFormBySubmit(new SimpleByLabel('BBB')),
+                'SimpleForm');
+    }
+
+    function testCanFindFormById() {
+        $raw = '<html><head><form id="55"><input type="submit"></form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertNull($page->getFormById(54));
+        $this->assertIsA($page->getFormById(55), 'SimpleForm');
+    }
+
+    function testFormCanBeSubmitted() {
+        $raw = '<html><head><form method="GET" action="here.php">' .
+                '<input type="submit" name="s" value="Submit">' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $form = $page->getFormBySubmit(new SimpleByLabel('Submit'));
+        $this->assertEqual(
+                $form->submitButton(new SimpleByLabel('Submit')),
+                new SimpleGetEncoding(array('s' => 'Submit')));
+    }
+
+    function testUnparsedTagDoesNotCrash() {
+        $raw = '<form><input type="reset" name="Clear"></form>';
+        $this->whenVisiting('http://host', $raw);
+    }
+
+    function testReadingTextField() {
+        $raw = '<html><head><form>' .
+                '<input type="text" name="a">' .
+                '<input type="text" name="b" value="bbb" id=3>' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertNull($page->getField(new SimpleByName('missing')));
+        $this->assertIdentical($page->getField(new SimpleByName('a')), '');
+        $this->assertIdentical($page->getField(new SimpleByName('b')), 'bbb');
+    }
+
+    function testEntitiesAreDecodedInDefaultTextFieldValue() {
+        $raw = '<form><input type="text" name="a" value="&amp;\'&quot;&lt;&gt;"></form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), '&\'"<>');
+    }
+
+    function testReadingTextFieldIsCaseInsensitive() {
+        $raw = '<html><head><FORM>' .
+                '<INPUT TYPE="TEXT" NAME="a">' .
+                '<INPUT TYPE="TEXT" NAME="b" VALUE="bbb" id=3>' .
+                '</FORM></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertNull($page->getField(new SimpleByName('missing')));
+        $this->assertIdentical($page->getField(new SimpleByName('a')), '');
+        $this->assertIdentical($page->getField(new SimpleByName('b')), 'bbb');
+    }
+
+    function testSettingTextField() {
+        $raw = '<html><head><form>' .
+                '<input type="text" name="a">' .
+                '<input type="text" name="b" id=3>' .
+                '<input type="submit">' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->setField(new SimpleByName('a'), 'aaa'));
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'aaa');
+        $this->assertTrue($page->setField(new SimpleById(3), 'bbb'));
+        $this->assertEqual($page->getField(new SimpleBYId(3)), 'bbb');
+        $this->assertFalse($page->setField(new SimpleByName('z'), 'zzz'));
+        $this->assertNull($page->getField(new SimpleByName('z')));
+    }
+
+    function testSettingTextFieldByEnclosingLabel() {
+        $raw = '<html><head><form>' .
+                '<label>Stuff' .
+                '<input type="text" name="a" value="A">' .
+                '</label>' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'A');
+        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'A');
+        $this->assertTrue($page->setField(new SimpleByLabel('Stuff'), 'aaa'));
+        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'aaa');
+    }
+
+    function testLabelsWithoutForDoNotAttachToInputsWithNoId() {
+        $raw = '<form action="network_confirm.php?x=X&y=Y" method="post">
+            <label>Text A <input type="text" name="a" value="one"></label>
+            <label>Text B <input type="text" name="b" value="two"></label>
+        </form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByLabelOrName('Text A')), 'one');
+        $this->assertEqual($page->getField(new SimpleByLabelOrName('Text B')), 'two');
+        $this->assertTrue($page->setField(new SimpleByLabelOrName('Text A'), '1'));
+        $this->assertTrue($page->setField(new SimpleByLabelOrName('Text B'), '2'));
+        $this->assertEqual($page->getField(new SimpleByLabelOrName('Text A')), '1');
+        $this->assertEqual($page->getField(new SimpleByLabelOrName('Text B')), '2');
+    }
+
+    function testGettingTextFieldByEnclosingLabelWithConflictingOtherFields() {
+        $raw = '<html><head><form>' .
+                '<label>Stuff' .
+                '<input type="text" name="a" value="A">' .
+                '</label>' .
+                '<input type="text" name="b" value="B">' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'A');
+        $this->assertEqual($page->getField(new SimpleByName('b')), 'B');
+        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'A');
+    }
+
+    function testSettingTextFieldByExternalLabel() {
+        $raw = '<html><head><form>' .
+                '<label for="aaa">Stuff</label>' .
+                '<input id="aaa" type="text" name="a" value="A">' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'A');
+        $this->assertTrue($page->setField(new SimpleByLabel('Stuff'), 'aaa'));
+        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'aaa');
+    }
+
+    function testReadingTextArea() {
+        $raw = '<html><head><form>' .
+                '<textarea name="a">aaa</textarea>' .
+                '<input type="submit">' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'aaa');
+    }
+
+    function testEntitiesAreDecodedInTextareaValue() {
+        $raw = '<form><textarea name="a">&amp;\'&quot;&lt;&gt;</textarea></form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), '&\'"<>');
+    }
+
+    function testNewlinesPreservedInTextArea() {
+        $raw = "<form><textarea name=\"a\">hello\r\nworld</textarea></form>";
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), "hello\r\nworld");
+    }
+
+    function testWhitespacePreservedInTextArea() {
+        $raw = '<form><textarea name="a">     </textarea></form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), '     ');
+    }
+
+    function testComplexWhitespaceInTextArea() {
+        $raw = "<html>\n" .
+                "    <head><title></title></head>\n" .
+                "    <body>\n" .
+                "        <form>\n".
+                "            <label>Text area C\n" .
+                "                <textarea name='c'>\n" .
+                "                </textarea>\n" .
+                "            </label>\n" .
+                "        </form>\n" .
+                "    </body>\n" .
+                "</html>";
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('c')), "                ");
+    }
+
+    function testSettingTextArea() {
+        $raw = '<form>' .
+                '<textarea name="a">aaa</textarea>' .
+                '<input type="submit">' .
+                '</form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->setField(new SimpleByName('a'), 'AAA'));
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'AAA');
+    }
+
+    function testDontIncludeTextAreaContentInLabel() {
+        $raw = '<form><label>Text area C<textarea id=3 name="c">mouse</textarea></label></form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByLabel('Text area C')), 'mouse');
+    }
+
+    function testSettingSelectionField() {
+        $raw = '<form>' .
+                '<select name="a">' .
+                '<option>aaa</option>' .
+                '<option selected>bbb</option>' .
+                '</select>' .
+                '<input type="submit">' .
+                '</form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'bbb');
+        $this->assertFalse($page->setField(new SimpleByName('a'), 'ccc'));
+        $this->assertTrue($page->setField(new SimpleByName('a'), 'aaa'));
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'aaa');
+    }
+
+    function testSelectionOptionsAreNormalised() {
+        $raw = '<form>' .
+                '<select name="a">' .
+                '<option selected><b>Big</b> bold</option>' .
+                '<option>small <em>italic</em></option>' .
+                '</select>' .
+                '</form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'Big bold');
+        $this->assertTrue($page->setField(new SimpleByName('a'), 'small italic'));
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'small italic');
+    }
+
+    function testCanParseBlankOptions() {
+        $raw = '<form>
+                <select id=4 name="d">
+                    <option value="d1">D1</option>
+                    <option value="d2">D2</option>
+                    <option></option>
+                </select>
+                </form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->setField(new SimpleByName('d'), ''));
+    }
+
+    function testTwoSelectionFieldsAreIndependent() {
+        $raw = '<form>
+                    <select id=4 name="d">
+                        <option value="d1" selected>D1</option>
+                        <option value="d2">D2</option>
+                    </select>
+                    <select id=11 name="h">
+                        <option value="h1">H1</option>
+                        <option value="h2" selected>H2</option>
+                    </select>
+                </form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->setField(new SimpleByName('d'), 'd2'));
+        $this->assertTrue($page->setField(new SimpleByName('h'), 'h1'));
+        $this->assertEqual($page->getField(new SimpleByName('d')), 'd2');
+    }
+
+    function testEmptyOptionDoesNotScrewUpTwoSelectionFields() {
+        $raw = '<form>
+                    <select name="d">
+                        <option value="d1" selected>D1</option>
+                        <option value="d2">D2</option>
+                        <option></option>
+                    </select>
+                    <select name="h">
+                        <option value="h1">H1</option>
+                        <option value="h2" selected>H2</option>
+                    </select>
+                </form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->setField(new SimpleByName('d'), 'd2'));
+        $this->assertTrue($page->setField(new SimpleByName('h'), 'h1'));
+        $this->assertEqual($page->getField(new SimpleByName('d')), 'd2');
+    }
+
+    function testSettingSelectionFieldByEnclosingLabel() {
+        $raw = '<form>' .
+                '<label>Stuff' .
+                '<select name="a"><option selected>A</option><option>B</option></select>' .
+                '</label>' .
+                '</form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'A');
+        $this->assertTrue($page->setField(new SimpleByLabel('Stuff'), 'B'));
+        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'B');
+    }
+
+    function testTwoSelectionFieldsWithLabelsAreIndependent() {
+        $raw = '<form>
+                    <label>Labelled D
+                        <select id=4 name="d">
+                            <option value="d1" selected>D1</option>
+                            <option value="d2">D2</option>
+                        </select>
+                    </label>
+                    <label>Labelled H
+                        <select id=11 name="h">
+                            <option value="h1">H1</option>
+                            <option value="h2" selected>H2</option>
+                        </select>
+                    </label>
+                </form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->setField(new SimpleByLabel('Labelled D'), 'd2'));
+        $this->assertTrue($page->setField(new SimpleByLabel('Labelled H'), 'h1'));
+        $this->assertEqual($page->getField(new SimpleByLabel('Labelled D')), 'd2');
+    }
+
+    function testSettingRadioButtonByEnclosingLabel() {
+        $raw = '<form>' .
+                '<label>A<input type="radio" name="r" value="a" checked></label>' .
+                '<label>B<input type="radio" name="r" value="b"></label>' .
+                '</form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByLabel('A')), 'a');
+        $this->assertTrue($page->setField(new SimpleBylabel('B'), 'b'));
+        $this->assertEqual($page->getField(new SimpleByLabel('B')), 'b');
+    }
+
+    function testCanParseInputsWithAllKindsOfAttributeQuoting() {
+        $raw = '<form>' .
+                '<input type="checkbox" name=\'first\' value=one checked></input>' .
+                '<input type=checkbox name="second" value="two"></input>' .
+                '<input type=checkbox name="third" value=\'three\' checked="checked" />' .
+                '</form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('first')), 'one');
+        $this->assertEqual($page->getField(new SimpleByName('second')), false);
+        $this->assertEqual($page->getField(new SimpleByName('third')), 'three');
+    }
+
+    function urlToString($url) {
+        return $url->asString();
+    }
+
+    function assertSameFrameset($actual, $expected) {
+        $this->assertIdentical(array_map(array($this, 'urlToString'), $actual),
+                               array_map(array($this, 'urlToString'), $expected));
+    }
+}
+
+class TestOfParsingUsingPhpParser extends TestOfParsing {
+
+    function whenVisiting($url, $content) {
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getContent', $content);
+        $response->setReturnValue('getUrl', new SimpleUrl($url));
+        $builder = new SimplePhpPageBuilder();
+        return $builder->parse($response);
+    }
+
+    function testNastyTitle() {
+        $page = $this->whenVisiting('http://host',
+                                    '<html><head><Title> <b>Me&amp;Me </TITLE></b></head></html>');
+        $this->assertEqual($page->getTitle(), "Me&Me");
+    }
+
+    function testLabelShouldStopAtClosingLabelTag() {
+        $raw = '<form><label>start<textarea id=3 name="c" wrap="hard">stuff</textarea>end</label>stuff</form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByLabel('startend')), 'stuff');
+    }
+}
+
+class TestOfParsingUsingTidyParser extends TestOfParsing {
+
+    function skip() {
+        $this->skipUnless(extension_loaded('tidy'), 'Install \'tidy\' php extension to enable html tidy based parser');
+    }
+
+    function whenVisiting($url, $content) {
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getContent', $content);
+        $response->setReturnValue('getUrl', new SimpleUrl($url));
+        $builder = new SimpleTidyPageBuilder();
+        return $builder->parse($response);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/php_parser_test.php b/3rdparty/simpletest/test/php_parser_test.php
new file mode 100755
index 00000000000..d95c7d06a60
--- /dev/null
+++ b/3rdparty/simpletest/test/php_parser_test.php
@@ -0,0 +1,489 @@
+<?php
+// $Id: php_parser_test.php 1911 2009-07-29 16:38:04Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../php_parser.php');
+require_once(dirname(__FILE__) . '/../tag.php');
+Mock::generate('SimplePage');
+Mock::generate('SimplePhpPageBuilder');
+Mock::generate('SimpleHttpResponse');
+Mock::generatePartial(
+        'SimplePhpPageBuilder',
+        'PartialSimplePhpPageBuilder',
+        array('createPage', 'createParser'));
+Mock::generate('SimpleHtmlSaxParser');
+Mock::generate('SimplePhpPageBuilder');
+
+class TestOfParallelRegex extends UnitTestCase {
+
+    function testNoPatterns() {
+        $regex = new ParallelRegex(false);
+        $this->assertFalse($regex->match("Hello", $match));
+        $this->assertEqual($match, "");
+    }
+
+    function testNoSubject() {
+        $regex = new ParallelRegex(false);
+        $regex->addPattern(".*");
+        $this->assertTrue($regex->match("", $match));
+        $this->assertEqual($match, "");
+    }
+
+    function testMatchAll() {
+        $regex = new ParallelRegex(false);
+        $regex->addPattern(".*");
+        $this->assertTrue($regex->match("Hello", $match));
+        $this->assertEqual($match, "Hello");
+    }
+
+    function testCaseSensitive() {
+        $regex = new ParallelRegex(true);
+        $regex->addPattern("abc");
+        $this->assertTrue($regex->match("abcdef", $match));
+        $this->assertEqual($match, "abc");
+        $this->assertTrue($regex->match("AAABCabcdef", $match));
+        $this->assertEqual($match, "abc");
+    }
+
+    function testCaseInsensitive() {
+        $regex = new ParallelRegex(false);
+        $regex->addPattern("abc");
+        $this->assertTrue($regex->match("abcdef", $match));
+        $this->assertEqual($match, "abc");
+        $this->assertTrue($regex->match("AAABCabcdef", $match));
+        $this->assertEqual($match, "ABC");
+    }
+
+    function testMatchMultiple() {
+        $regex = new ParallelRegex(true);
+        $regex->addPattern("abc");
+        $regex->addPattern("ABC");
+        $this->assertTrue($regex->match("abcdef", $match));
+        $this->assertEqual($match, "abc");
+        $this->assertTrue($regex->match("AAABCabcdef", $match));
+        $this->assertEqual($match, "ABC");
+        $this->assertFalse($regex->match("Hello", $match));
+    }
+
+    function testPatternLabels() {
+        $regex = new ParallelRegex(false);
+        $regex->addPattern("abc", "letter");
+        $regex->addPattern("123", "number");
+        $this->assertIdentical($regex->match("abcdef", $match), "letter");
+        $this->assertEqual($match, "abc");
+        $this->assertIdentical($regex->match("0123456789", $match), "number");
+        $this->assertEqual($match, "123");
+    }
+}
+
+class TestOfStateStack extends UnitTestCase {
+
+    function testStartState() {
+        $stack = new SimpleStateStack("one");
+        $this->assertEqual($stack->getCurrent(), "one");
+    }
+
+    function testExhaustion() {
+        $stack = new SimpleStateStack("one");
+        $this->assertFalse($stack->leave());
+    }
+
+    function testStateMoves() {
+        $stack = new SimpleStateStack("one");
+        $stack->enter("two");
+        $this->assertEqual($stack->getCurrent(), "two");
+        $stack->enter("three");
+        $this->assertEqual($stack->getCurrent(), "three");
+        $this->assertTrue($stack->leave());
+        $this->assertEqual($stack->getCurrent(), "two");
+        $stack->enter("third");
+        $this->assertEqual($stack->getCurrent(), "third");
+        $this->assertTrue($stack->leave());
+        $this->assertTrue($stack->leave());
+        $this->assertEqual($stack->getCurrent(), "one");
+    }
+}
+
+class TestParser {
+
+    function accept() {
+    }
+
+    function a() {
+    }
+
+    function b() {
+    }
+}
+Mock::generate('TestParser');
+
+class TestOfLexer extends UnitTestCase {
+
+    function testEmptyPage() {
+        $handler = new MockTestParser();
+        $handler->expectNever("accept");
+        $handler->setReturnValue("accept", true);
+        $handler->expectNever("accept");
+        $handler->setReturnValue("accept", true);
+        $lexer = new SimpleLexer($handler);
+        $lexer->addPattern("a+");
+        $this->assertTrue($lexer->parse(""));
+    }
+
+    function testSinglePattern() {
+        $handler = new MockTestParser();
+        $handler->expectAt(0, "accept", array("aaa", LEXER_MATCHED));
+        $handler->expectAt(1, "accept", array("x", LEXER_UNMATCHED));
+        $handler->expectAt(2, "accept", array("a", LEXER_MATCHED));
+        $handler->expectAt(3, "accept", array("yyy", LEXER_UNMATCHED));
+        $handler->expectAt(4, "accept", array("a", LEXER_MATCHED));
+        $handler->expectAt(5, "accept", array("x", LEXER_UNMATCHED));
+        $handler->expectAt(6, "accept", array("aaa", LEXER_MATCHED));
+        $handler->expectAt(7, "accept", array("z", LEXER_UNMATCHED));
+        $handler->expectCallCount("accept", 8);
+        $handler->setReturnValue("accept", true);
+        $lexer = new SimpleLexer($handler);
+        $lexer->addPattern("a+");
+        $this->assertTrue($lexer->parse("aaaxayyyaxaaaz"));
+    }
+
+    function testMultiplePattern() {
+        $handler = new MockTestParser();
+        $target = array("a", "b", "a", "bb", "x", "b", "a", "xxxxxx", "a", "x");
+        for ($i = 0; $i < count($target); $i++) {
+            $handler->expectAt($i, "accept", array($target[$i], '*'));
+        }
+        $handler->expectCallCount("accept", count($target));
+        $handler->setReturnValue("accept", true);
+        $lexer = new SimpleLexer($handler);
+        $lexer->addPattern("a+");
+        $lexer->addPattern("b+");
+        $this->assertTrue($lexer->parse("ababbxbaxxxxxxax"));
+    }
+}
+
+class TestOfLexerModes extends UnitTestCase {
+
+    function testIsolatedPattern() {
+        $handler = new MockTestParser();
+        $handler->expectAt(0, "a", array("a", LEXER_MATCHED));
+        $handler->expectAt(1, "a", array("b", LEXER_UNMATCHED));
+        $handler->expectAt(2, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(3, "a", array("bxb", LEXER_UNMATCHED));
+        $handler->expectAt(4, "a", array("aaa", LEXER_MATCHED));
+        $handler->expectAt(5, "a", array("x", LEXER_UNMATCHED));
+        $handler->expectAt(6, "a", array("aaaa", LEXER_MATCHED));
+        $handler->expectAt(7, "a", array("x", LEXER_UNMATCHED));
+        $handler->expectCallCount("a", 8);
+        $handler->setReturnValue("a", true);
+        $lexer = new SimpleLexer($handler, "a");
+        $lexer->addPattern("a+", "a");
+        $lexer->addPattern("b+", "b");
+        $this->assertTrue($lexer->parse("abaabxbaaaxaaaax"));
+    }
+
+    function testModeChange() {
+        $handler = new MockTestParser();
+        $handler->expectAt(0, "a", array("a", LEXER_MATCHED));
+        $handler->expectAt(1, "a", array("b", LEXER_UNMATCHED));
+        $handler->expectAt(2, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(3, "a", array("b", LEXER_UNMATCHED));
+        $handler->expectAt(4, "a", array("aaa", LEXER_MATCHED));
+        $handler->expectAt(0, "b", array(":", LEXER_ENTER));
+        $handler->expectAt(1, "b", array("a", LEXER_UNMATCHED));
+        $handler->expectAt(2, "b", array("b", LEXER_MATCHED));
+        $handler->expectAt(3, "b", array("a", LEXER_UNMATCHED));
+        $handler->expectAt(4, "b", array("bb", LEXER_MATCHED));
+        $handler->expectAt(5, "b", array("a", LEXER_UNMATCHED));
+        $handler->expectAt(6, "b", array("bbb", LEXER_MATCHED));
+        $handler->expectAt(7, "b", array("a", LEXER_UNMATCHED));
+        $handler->expectCallCount("a", 5);
+        $handler->expectCallCount("b", 8);
+        $handler->setReturnValue("a", true);
+        $handler->setReturnValue("b", true);
+        $lexer = new SimpleLexer($handler, "a");
+        $lexer->addPattern("a+", "a");
+        $lexer->addEntryPattern(":", "a", "b");
+        $lexer->addPattern("b+", "b");
+        $this->assertTrue($lexer->parse("abaabaaa:ababbabbba"));
+    }
+
+    function testNesting() {
+        $handler = new MockTestParser();
+        $handler->setReturnValue("a", true);
+        $handler->setReturnValue("b", true);
+        $handler->expectAt(0, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(1, "a", array("b", LEXER_UNMATCHED));
+        $handler->expectAt(2, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(3, "a", array("b", LEXER_UNMATCHED));
+        $handler->expectAt(0, "b", array("(", LEXER_ENTER));
+        $handler->expectAt(1, "b", array("bb", LEXER_MATCHED));
+        $handler->expectAt(2, "b", array("a", LEXER_UNMATCHED));
+        $handler->expectAt(3, "b", array("bb", LEXER_MATCHED));
+        $handler->expectAt(4, "b", array(")", LEXER_EXIT));
+        $handler->expectAt(4, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(5, "a", array("b", LEXER_UNMATCHED));
+        $handler->expectCallCount("a", 6);
+        $handler->expectCallCount("b", 5);
+        $lexer = new SimpleLexer($handler, "a");
+        $lexer->addPattern("a+", "a");
+        $lexer->addEntryPattern("(", "a", "b");
+        $lexer->addPattern("b+", "b");
+        $lexer->addExitPattern(")", "b");
+        $this->assertTrue($lexer->parse("aabaab(bbabb)aab"));
+    }
+
+    function testSingular() {
+        $handler = new MockTestParser();
+        $handler->setReturnValue("a", true);
+        $handler->setReturnValue("b", true);
+        $handler->expectAt(0, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(1, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(2, "a", array("xx", LEXER_UNMATCHED));
+        $handler->expectAt(3, "a", array("xx", LEXER_UNMATCHED));
+        $handler->expectAt(0, "b", array("b", LEXER_SPECIAL));
+        $handler->expectAt(1, "b", array("bbb", LEXER_SPECIAL));
+        $handler->expectCallCount("a", 4);
+        $handler->expectCallCount("b", 2);
+        $lexer = new SimpleLexer($handler, "a");
+        $lexer->addPattern("a+", "a");
+        $lexer->addSpecialPattern("b+", "a", "b");
+        $this->assertTrue($lexer->parse("aabaaxxbbbxx"));
+    }
+
+    function testUnwindTooFar() {
+        $handler = new MockTestParser();
+        $handler->setReturnValue("a", true);
+        $handler->expectAt(0, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(1, "a", array(")", LEXER_EXIT));
+        $handler->expectCallCount("a", 2);
+        $lexer = new SimpleLexer($handler, "a");
+        $lexer->addPattern("a+", "a");
+        $lexer->addExitPattern(")", "a");
+        $this->assertFalse($lexer->parse("aa)aa"));
+    }
+}
+
+class TestOfLexerHandlers extends UnitTestCase {
+
+    function testModeMapping() {
+        $handler = new MockTestParser();
+        $handler->setReturnValue("a", true);
+        $handler->expectAt(0, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(1, "a", array("(", LEXER_ENTER));
+        $handler->expectAt(2, "a", array("bb", LEXER_MATCHED));
+        $handler->expectAt(3, "a", array("a", LEXER_UNMATCHED));
+        $handler->expectAt(4, "a", array("bb", LEXER_MATCHED));
+        $handler->expectAt(5, "a", array(")", LEXER_EXIT));
+        $handler->expectAt(6, "a", array("b", LEXER_UNMATCHED));
+        $handler->expectCallCount("a", 7);
+        $lexer = new SimpleLexer($handler, "mode_a");
+        $lexer->addPattern("a+", "mode_a");
+        $lexer->addEntryPattern("(", "mode_a", "mode_b");
+        $lexer->addPattern("b+", "mode_b");
+        $lexer->addExitPattern(")", "mode_b");
+        $lexer->mapHandler("mode_a", "a");
+        $lexer->mapHandler("mode_b", "a");
+        $this->assertTrue($lexer->parse("aa(bbabb)b"));
+    }
+}
+
+class TestOfSimpleHtmlLexer extends UnitTestCase {
+
+    function &createParser() {
+        $parser = new MockSimpleHtmlSaxParser();
+        $parser->setReturnValue('acceptStartToken', true);
+        $parser->setReturnValue('acceptEndToken', true);
+        $parser->setReturnValue('acceptAttributeToken', true);
+        $parser->setReturnValue('acceptEntityToken', true);
+        $parser->setReturnValue('acceptTextToken', true);
+        $parser->setReturnValue('ignore', true);
+        return $parser;
+    }
+
+    function testNoContent() {
+        $parser = $this->createParser();
+        $parser->expectNever('acceptStartToken');
+        $parser->expectNever('acceptEndToken');
+        $parser->expectNever('acceptAttributeToken');
+        $parser->expectNever('acceptEntityToken');
+        $parser->expectNever('acceptTextToken');
+        $lexer = new SimpleHtmlLexer($parser);
+        $this->assertTrue($lexer->parse(''));
+    }
+
+    function testUninteresting() {
+        $parser = $this->createParser();
+        $parser->expectOnce('acceptTextToken', array('<html></html>', '*'));
+        $lexer = new SimpleHtmlLexer($parser);
+        $this->assertTrue($lexer->parse('<html></html>'));
+    }
+
+    function testSkipCss() {
+        $parser = $this->createParser();
+        $parser->expectNever('acceptTextToken');
+        $parser->expectAtLeastOnce('ignore');
+        $lexer = new SimpleHtmlLexer($parser);
+        $this->assertTrue($lexer->parse("<style>Lot's of styles</style>"));
+    }
+
+    function testSkipJavaScript() {
+        $parser = $this->createParser();
+        $parser->expectNever('acceptTextToken');
+        $parser->expectAtLeastOnce('ignore');
+        $lexer = new SimpleHtmlLexer($parser);
+        $this->assertTrue($lexer->parse("<SCRIPT>Javascript code {';:^%^%£$'@\"*(}</SCRIPT>"));
+    }
+
+    function testSkipHtmlComments() {
+        $parser = $this->createParser();
+        $parser->expectNever('acceptTextToken');
+        $parser->expectAtLeastOnce('ignore');
+        $lexer = new SimpleHtmlLexer($parser);
+        $this->assertTrue($lexer->parse("<!-- <title>title</title><style>styles</style> -->"));
+    }
+
+    function testTagWithNoAttributes() {
+        $parser = $this->createParser();
+        $parser->expectAt(0, 'acceptStartToken', array('<title', '*'));
+        $parser->expectAt(1, 'acceptStartToken', array('>', '*'));
+        $parser->expectCallCount('acceptStartToken', 2);
+        $parser->expectOnce('acceptTextToken', array('Hello', '*'));
+        $parser->expectOnce('acceptEndToken', array('</title>', '*'));
+        $lexer = new SimpleHtmlLexer($parser);
+        $this->assertTrue($lexer->parse('<title>Hello</title>'));
+    }
+
+    function testTagWithAttributes() {
+        $parser = $this->createParser();
+        $parser->expectOnce('acceptTextToken', array('label', '*'));
+        $parser->expectAt(0, 'acceptStartToken', array('<a', '*'));
+        $parser->expectAt(1, 'acceptStartToken', array('href', '*'));
+        $parser->expectAt(2, 'acceptStartToken', array('>', '*'));
+        $parser->expectCallCount('acceptStartToken', 3);
+        $parser->expectAt(0, 'acceptAttributeToken', array('= "', '*'));
+        $parser->expectAt(1, 'acceptAttributeToken', array('here.html', '*'));
+        $parser->expectAt(2, 'acceptAttributeToken', array('"', '*'));
+        $parser->expectCallCount('acceptAttributeToken', 3);
+        $parser->expectOnce('acceptEndToken', array('</a>', '*'));
+        $lexer = new SimpleHtmlLexer($parser);
+        $this->assertTrue($lexer->parse('<a href = "here.html">label</a>'));
+    }
+}
+
+class TestOfHtmlSaxParser extends UnitTestCase {
+
+    function createListener() {
+        $listener = new MockSimplePhpPageBuilder();
+        $listener->setReturnValue('startElement', true);
+        $listener->setReturnValue('addContent', true);
+        $listener->setReturnValue('endElement', true);
+        return $listener;
+    }
+
+    function testFramesetTag() {
+        $listener = $this->createListener();
+        $listener->expectOnce('startElement', array('frameset', array()));
+        $listener->expectOnce('addContent', array('Frames'));
+        $listener->expectOnce('endElement', array('frameset'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse('<frameset>Frames</frameset>'));
+    }
+
+    function testTagWithUnquotedAttributes() {
+        $listener = $this->createListener();
+        $listener->expectOnce(
+                'startElement',
+                array('input', array('name' => 'a.b.c', 'value' => 'd')));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse('<input name=a.b.c value = d>'));
+    }
+
+    function testTagInsideContent() {
+        $listener = $this->createListener();
+        $listener->expectOnce('startElement', array('a', array()));
+        $listener->expectAt(0, 'addContent', array('<html>'));
+        $listener->expectAt(1, 'addContent', array('</html>'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse('<html><a></a></html>'));
+    }
+
+    function testTagWithInternalContent() {
+        $listener = $this->createListener();
+        $listener->expectOnce('startElement', array('a', array()));
+        $listener->expectOnce('addContent', array('label'));
+        $listener->expectOnce('endElement', array('a'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse('<a>label</a>'));
+    }
+
+    function testLinkAddress() {
+        $listener = $this->createListener();
+        $listener->expectOnce('startElement', array('a', array('href' => 'here.html')));
+        $listener->expectOnce('addContent', array('label'));
+        $listener->expectOnce('endElement', array('a'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse("<a href = 'here.html'>label</a>"));
+    }
+
+    function testEncodedAttribute() {
+        $listener = $this->createListener();
+        $listener->expectOnce('startElement', array('a', array('href' => 'here&there.html')));
+        $listener->expectOnce('addContent', array('label'));
+        $listener->expectOnce('endElement', array('a'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse("<a href = 'here&amp;there.html'>label</a>"));
+    }
+
+    function testTagWithId() {
+        $listener = $this->createListener();
+        $listener->expectOnce('startElement', array('a', array('id' => '0')));
+        $listener->expectOnce('addContent', array('label'));
+        $listener->expectOnce('endElement', array('a'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse('<a id="0">label</a>'));
+    }
+
+    function testTagWithEmptyAttributes() {
+        $listener = $this->createListener();
+        $listener->expectOnce(
+                'startElement',
+                array('option', array('value' => '', 'selected' => '')));
+        $listener->expectOnce('addContent', array('label'));
+        $listener->expectOnce('endElement', array('option'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse('<option value="" selected>label</option>'));
+    }
+
+    function testComplexTagWithLotsOfCaseVariations() {
+        $listener = $this->createListener();
+        $listener->expectOnce(
+                'startElement',
+                array('a', array('href' => 'here.html', 'style' => "'cool'")));
+        $listener->expectOnce('addContent', array('label'));
+        $listener->expectOnce('endElement', array('a'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse('<A HREF = \'here.html\' Style="\'cool\'">label</A>'));
+    }
+
+    function testXhtmlSelfClosingTag() {
+        $listener = $this->createListener();
+        $listener->expectOnce(
+                'startElement',
+                array('input', array('type' => 'submit', 'name' => 'N', 'value' => 'V')));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse('<input type="submit" name="N" value="V" />'));
+    }
+
+    function testNestedFrameInFrameset() {
+        $listener = $this->createListener();
+        $listener->expectAt(0, 'startElement', array('frameset', array()));
+        $listener->expectAt(1, 'startElement', array('frame', array('src' => 'frame.html')));
+        $listener->expectCallCount('startElement', 2);
+        $listener->expectOnce('addContent', array('<noframes>Hello</noframes>'));
+        $listener->expectOnce('endElement', array('frameset'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse(
+                '<frameset><frame src="frame.html"><noframes>Hello</noframes></frameset>'));
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/recorder_test.php b/3rdparty/simpletest/test/recorder_test.php
new file mode 100755
index 00000000000..fdae4c1cccc
--- /dev/null
+++ b/3rdparty/simpletest/test/recorder_test.php
@@ -0,0 +1,23 @@
+<?php
+// $Id: test.php 1500 2007-04-29 14:33:31Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../recorder.php');
+
+class TestOfRecorder extends UnitTestCase {
+    
+    function testContentOfRecorderWithOnePassAndOneFailure() {
+        $test = new TestSuite();
+        $test->addFile(dirname(__FILE__) . '/support/recorder_sample.php');
+        $recorder = new Recorder(new SimpleReporter());
+        $test->run($recorder);
+        $this->assertEqual(count($recorder->results), 2);
+        $this->assertIsA($recorder->results[0], 'SimpleResultOfPass');
+        $this->assertEqual('testTrueIsTrue', array_pop($recorder->results[0]->breadcrumb));
+        $this->assertPattern('/ at \[.*\Wrecorder_sample\.php line 7\]/', $recorder->results[0]->message);
+        $this->assertIsA($recorder->results[1], 'SimpleResultOfFail');
+        $this->assertEqual('testFalseIsTrue', array_pop($recorder->results[1]->breadcrumb));
+        $this->assertPattern("/Expected false, got \[Boolean: true\] at \[.*\Wrecorder_sample\.php line 11\]/",
+                             $recorder->results[1]->message);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/reflection_php5_test.php b/3rdparty/simpletest/test/reflection_php5_test.php
new file mode 100755
index 00000000000..d9f46e6db78
--- /dev/null
+++ b/3rdparty/simpletest/test/reflection_php5_test.php
@@ -0,0 +1,263 @@
+<?php
+// $Id: reflection_php5_test.php 1778 2008-04-21 16:13:08Z edwardzyang $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../reflection_php5.php');
+
+class AnyOldLeafClass {
+	function aMethod() { }
+}
+
+abstract class AnyOldClass {
+	function aMethod() { }
+}
+
+class AnyOldLeafClassWithAFinal {
+	final function aMethod() { }
+}
+
+interface AnyOldInterface {
+	function aMethod();
+}
+
+interface AnyOldArgumentInterface {
+	function aMethod(AnyOldInterface $argument);
+}
+
+interface AnyDescendentInterface extends AnyOldInterface {
+}
+
+class AnyOldImplementation implements AnyOldInterface {
+	function aMethod() { }
+	function extraMethod() { }
+}
+
+abstract class AnyAbstractImplementation implements AnyOldInterface {
+}
+
+abstract class AnotherOldAbstractClass {
+    protected abstract function aMethod(AnyOldInterface $argument);
+}
+
+class AnyOldSubclass extends AnyOldImplementation { }
+
+class AnyOldArgumentClass {
+	function aMethod($argument) { }
+}
+
+class AnyOldArgumentImplementation implements AnyOldArgumentInterface {
+	function aMethod(AnyOldInterface $argument) { }
+}
+
+class AnyOldTypeHintedClass implements AnyOldArgumentInterface {
+	function aMethod(AnyOldInterface $argument) { }
+}
+
+class AnyDescendentImplementation implements AnyDescendentInterface {
+	function aMethod() { }
+}
+
+class AnyOldOverloadedClass {
+	function __isset($key) { }
+	function __unset($key) { }
+}
+
+class AnyOldClassWithStaticMethods {
+	static function aStatic() { }
+	static function aStaticWithParameters($arg1, $arg2) { }
+}
+
+abstract class AnyOldAbstractClassWithAbstractMethods {
+    abstract function anAbstract();
+    abstract function anAbstractWithParameter($foo);
+    abstract function anAbstractWithMultipleParameters($foo, $bar);
+}
+
+class TestOfReflection extends UnitTestCase {
+
+	function testClassExistence() {
+		$reflection = new SimpleReflection('AnyOldLeafClass');
+		$this->assertTrue($reflection->classOrInterfaceExists());
+		$this->assertTrue($reflection->classOrInterfaceExistsSansAutoload());
+		$this->assertFalse($reflection->isAbstract());
+		$this->assertFalse($reflection->isInterface());
+	}
+
+	function testClassNonExistence() {
+		$reflection = new SimpleReflection('UnknownThing');
+		$this->assertFalse($reflection->classOrInterfaceExists());
+		$this->assertFalse($reflection->classOrInterfaceExistsSansAutoload());
+	}
+
+	function testDetectionOfAbstractClass() {
+		$reflection = new SimpleReflection('AnyOldClass');
+		$this->assertTrue($reflection->isAbstract());
+	}
+
+	function testDetectionOfFinalMethods() {
+		$reflection = new SimpleReflection('AnyOldClass');
+		$this->assertFalse($reflection->hasFinal());
+		$reflection = new SimpleReflection('AnyOldLeafClassWithAFinal');
+		$this->assertTrue($reflection->hasFinal());
+	}
+
+	function testFindingParentClass() {
+		$reflection = new SimpleReflection('AnyOldSubclass');
+		$this->assertEqual($reflection->getParent(), 'AnyOldImplementation');
+	}
+
+	function testInterfaceExistence() {
+		$reflection = new SimpleReflection('AnyOldInterface');
+		$this->assertTrue($reflection->classOrInterfaceExists());
+		$this->assertTrue($reflection->classOrInterfaceExistsSansAutoload());
+		$this->assertTrue($reflection->isInterface());
+	}
+
+	function testMethodsListFromClass() {
+		$reflection = new SimpleReflection('AnyOldClass');
+		$this->assertIdentical($reflection->getMethods(), array('aMethod'));
+	}
+
+	function testMethodsListFromInterface() {
+		$reflection = new SimpleReflection('AnyOldInterface');
+		$this->assertIdentical($reflection->getMethods(), array('aMethod'));
+		$this->assertIdentical($reflection->getInterfaceMethods(), array('aMethod'));
+	}
+
+	function testMethodsComeFromDescendentInterfacesASWell() {
+		$reflection = new SimpleReflection('AnyDescendentInterface');
+		$this->assertIdentical($reflection->getMethods(), array('aMethod'));
+	}
+	
+	function testCanSeparateInterfaceMethodsFromOthers() {
+		$reflection = new SimpleReflection('AnyOldImplementation');
+		$this->assertIdentical($reflection->getMethods(), array('aMethod', 'extraMethod'));
+		$this->assertIdentical($reflection->getInterfaceMethods(), array('aMethod'));
+	}
+
+	function testMethodsComeFromDescendentInterfacesInAbstractClass() {
+		$reflection = new SimpleReflection('AnyAbstractImplementation');
+		$this->assertIdentical($reflection->getMethods(), array('aMethod'));
+	}
+
+	function testInterfaceHasOnlyItselfToImplement() {
+		$reflection = new SimpleReflection('AnyOldInterface');
+		$this->assertEqual(
+				$reflection->getInterfaces(),
+				array('AnyOldInterface'));
+	}
+
+	function testInterfacesListedForClass() {
+		$reflection = new SimpleReflection('AnyOldImplementation');
+		$this->assertEqual(
+				$reflection->getInterfaces(),
+				array('AnyOldInterface'));
+	}
+
+	function testInterfacesListedForSubclass() {
+		$reflection = new SimpleReflection('AnyOldSubclass');
+		$this->assertEqual(
+				$reflection->getInterfaces(),
+				array('AnyOldInterface'));
+	}
+
+	function testNoParameterCreationWhenNoInterface() {
+		$reflection = new SimpleReflection('AnyOldArgumentClass');
+		$function = $reflection->getSignature('aMethod');
+		if (version_compare(phpversion(), '5.0.2', '<=')) {
+			$this->assertEqual('function amethod($argument)', strtolower($function));
+		} else {
+			$this->assertEqual('function aMethod($argument)', $function);
+		}
+	}
+
+	function testParameterCreationWithoutTypeHinting() {
+		$reflection = new SimpleReflection('AnyOldArgumentImplementation');
+		$function = $reflection->getSignature('aMethod');
+		if (version_compare(phpversion(), '5.0.2', '<=')) {
+			$this->assertEqual('function amethod(AnyOldInterface $argument)', $function);
+		} else {
+			$this->assertEqual('function aMethod(AnyOldInterface $argument)', $function);
+		}
+	}
+
+	function testParameterCreationForTypeHinting() {
+		$reflection = new SimpleReflection('AnyOldTypeHintedClass');
+		$function = $reflection->getSignature('aMethod');
+		if (version_compare(phpversion(), '5.0.2', '<=')) {
+			$this->assertEqual('function amethod(AnyOldInterface $argument)', $function);
+		} else {
+			$this->assertEqual('function aMethod(AnyOldInterface $argument)', $function);
+		}
+	}
+
+	function testIssetFunctionSignature() {
+		$reflection = new SimpleReflection('AnyOldOverloadedClass');
+		$function = $reflection->getSignature('__isset');
+		$this->assertEqual('function __isset($key)', $function);
+	}
+	
+	function testUnsetFunctionSignature() {
+		$reflection = new SimpleReflection('AnyOldOverloadedClass');
+		$function = $reflection->getSignature('__unset');
+		$this->assertEqual('function __unset($key)', $function);
+	}
+
+	function testProperlyReflectsTheFinalInterfaceWhenObjectImplementsAnExtendedInterface() {
+		$reflection = new SimpleReflection('AnyDescendentImplementation');
+		$interfaces = $reflection->getInterfaces();
+		$this->assertEqual(1, count($interfaces));
+		$this->assertEqual('AnyDescendentInterface', array_shift($interfaces));
+	}
+	
+	function testCreatingSignatureForAbstractMethod() {
+	    $reflection = new SimpleReflection('AnotherOldAbstractClass');
+	    $this->assertEqual($reflection->getSignature('aMethod'), 'function aMethod(AnyOldInterface $argument)');
+	}
+	
+	function testCanProperlyGenerateStaticMethodSignatures() {
+		$reflection = new SimpleReflection('AnyOldClassWithStaticMethods');
+		$this->assertEqual('static function aStatic()', $reflection->getSignature('aStatic'));
+		$this->assertEqual(
+			'static function aStaticWithParameters($arg1, $arg2)',
+			$reflection->getSignature('aStaticWithParameters')
+		);
+	}
+}
+
+class TestOfReflectionWithTypeHints extends UnitTestCase {
+	function skip() {
+		$this->skipIf(version_compare(phpversion(), '5.1.0', '<'), 'Reflection with type hints only tested for PHP 5.1.0 and above');
+	}
+
+	function testParameterCreationForTypeHintingWithArray() {
+		eval('interface AnyOldArrayTypeHintedInterface {
+				  function amethod(array $argument);
+			  } 
+			  class AnyOldArrayTypeHintedClass implements AnyOldArrayTypeHintedInterface {
+				  function amethod(array $argument) {}
+			  }');
+		$reflection = new SimpleReflection('AnyOldArrayTypeHintedClass');
+		$function = $reflection->getSignature('amethod');
+		$this->assertEqual('function amethod(array $argument)', $function);
+	}
+}
+
+class TestOfAbstractsWithAbstractMethods extends UnitTestCase {
+    function testCanProperlyGenerateAbstractMethods() {
+        $reflection = new SimpleReflection('AnyOldAbstractClassWithAbstractMethods');
+        $this->assertEqual(
+            'function anAbstract()',
+            $reflection->getSignature('anAbstract')
+        );
+        $this->assertEqual(
+            'function anAbstractWithParameter($foo)',
+            $reflection->getSignature('anAbstractWithParameter')
+        );
+        $this->assertEqual(
+            'function anAbstractWithMultipleParameters($foo, $bar)',
+            $reflection->getSignature('anAbstractWithMultipleParameters')
+        );
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/remote_test.php b/3rdparty/simpletest/test/remote_test.php
new file mode 100755
index 00000000000..5f3f96a4de9
--- /dev/null
+++ b/3rdparty/simpletest/test/remote_test.php
@@ -0,0 +1,19 @@
+<?php
+// $Id: remote_test.php 1759 2008-04-15 02:37:07Z edwardzyang $
+require_once('../remote.php');
+require_once('../reporter.php');
+
+// The following URL will depend on your own installation.
+if (isset($_SERVER['SCRIPT_URI'])) {
+    $base_uri = $_SERVER['SCRIPT_URI'];
+} elseif (isset($_SERVER['HTTP_HOST']) && isset($_SERVER['PHP_SELF'])) {
+    $base_uri = 'http://'. $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
+};
+$test_url = str_replace('remote_test.php', 'visual_test.php', $base_uri);
+
+$test = new TestSuite('Remote tests');
+$test->add(new RemoteTestCase($test_url . '?xml=yes', $test_url . '?xml=yes&dry=yes'));
+if (SimpleReporter::inCli()) {
+    exit ($test->run(new TextReporter()) ? 0 : 1);
+}
+$test->run(new HtmlReporter());
diff --git a/3rdparty/simpletest/test/shell_test.php b/3rdparty/simpletest/test/shell_test.php
new file mode 100755
index 00000000000..d1d769a6795
--- /dev/null
+++ b/3rdparty/simpletest/test/shell_test.php
@@ -0,0 +1,38 @@
+<?php
+// $Id: shell_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../shell_tester.php');
+
+class TestOfShell extends UnitTestCase {
+    
+    function testEcho() {
+        $shell = new SimpleShell();
+        $this->assertIdentical($shell->execute('echo Hello'), 0);
+        $this->assertPattern('/Hello/', $shell->getOutput());
+    }
+    
+    function testBadCommand() {
+        $shell = new SimpleShell();
+        $this->assertNotEqual($ret = $shell->execute('blurgh! 2>&1'), 0);
+    }
+}
+
+class TestOfShellTesterAndShell extends ShellTestCase {
+    
+    function testEcho() {
+        $this->assertTrue($this->execute('echo Hello'));
+        $this->assertExitCode(0);
+        $this->assertoutput('Hello');
+    }
+    
+    function testFileExistence() {
+        $this->assertFileExists(dirname(__FILE__) . '/all_tests.php');
+        $this->assertFileNotExists('wibble');
+    }
+    
+    function testFilePatterns() {
+        $this->assertFilePattern('/all[_ ]tests/i', dirname(__FILE__) . '/all_tests.php');
+        $this->assertNoFilePattern('/sputnik/i', dirname(__FILE__) . '/all_tests.php');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/shell_tester_test.php b/3rdparty/simpletest/test/shell_tester_test.php
new file mode 100755
index 00000000000..b12c602a39f
--- /dev/null
+++ b/3rdparty/simpletest/test/shell_tester_test.php
@@ -0,0 +1,42 @@
+<?php
+// $Id: shell_tester_test.php 1787 2008-04-26 20:35:39Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../shell_tester.php');
+Mock::generate('SimpleShell');
+
+class TestOfShellTestCase extends ShellTestCase {
+    private $mock_shell = false;
+    
+    function getShell() {
+        return $this->mock_shell;
+    }
+    
+    function testGenericEquality() {
+        $this->assertEqual('a', 'a');
+        $this->assertNotEqual('a', 'A');
+    }
+    
+    function testExitCode() {
+        $this->mock_shell = new MockSimpleShell();
+        $this->mock_shell->setReturnValue('execute', 0);
+        $this->mock_shell->expectOnce('execute', array('ls'));
+        $this->assertTrue($this->execute('ls'));
+        $this->assertExitCode(0);
+    }
+    
+    function testOutput() {
+        $this->mock_shell = new MockSimpleShell();
+        $this->mock_shell->setReturnValue('execute', 0);
+        $this->mock_shell->setReturnValue('getOutput', "Line 1\nLine 2\n");
+        $this->assertOutput("Line 1\nLine 2\n");
+    }
+    
+    function testOutputPatterns() {
+        $this->mock_shell = new MockSimpleShell();
+        $this->mock_shell->setReturnValue('execute', 0);
+        $this->mock_shell->setReturnValue('getOutput', "Line 1\nLine 2\n");
+        $this->assertOutputPattern('/line/i');
+        $this->assertNoOutputPattern('/line 2/');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/simpletest_test.php b/3rdparty/simpletest/test/simpletest_test.php
new file mode 100755
index 00000000000..daa65c6f472
--- /dev/null
+++ b/3rdparty/simpletest/test/simpletest_test.php
@@ -0,0 +1,58 @@
+<?php
+// $Id: simpletest_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../simpletest.php');
+
+SimpleTest::ignore('ShouldNeverBeRunEither');
+
+class ShouldNeverBeRun extends UnitTestCase {
+    function testWithNoChanceOfSuccess() {
+        $this->fail('Should be ignored');
+    }
+}
+
+class ShouldNeverBeRunEither extends ShouldNeverBeRun { }
+
+class TestOfStackTrace extends UnitTestCase {
+
+    function testCanFindAssertInTrace() {
+        $trace = new SimpleStackTrace(array('assert'));
+        $this->assertEqual(
+                $trace->traceMethod(array(array(
+                        'file' => '/my_test.php',
+                        'line' => 24,
+                        'function' => 'assertSomething'))),
+                ' at [/my_test.php line 24]');
+    }
+}
+
+class DummyResource { }
+
+class TestOfContext extends UnitTestCase {
+
+    function testCurrentContextIsUnique() {
+        $this->assertSame(
+                SimpleTest::getContext(),
+                SimpleTest::getContext());
+    }
+
+    function testContextHoldsCurrentTestCase() {
+        $context = SimpleTest::getContext();
+        $this->assertSame($this, $context->getTest());
+    }
+
+    function testResourceIsSingleInstanceWithContext() {
+        $context = new SimpleTestContext();
+        $this->assertSame(
+                $context->get('DummyResource'),
+                $context->get('DummyResource'));
+    }
+
+    function testClearingContextResetsResources() {
+        $context = new SimpleTestContext();
+        $resource = $context->get('DummyResource');
+        $context->clear();
+        $this->assertClone($resource, $context->get('DummyResource'));
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/site/file.html b/3rdparty/simpletest/test/site/file.html
new file mode 100755
index 00000000000..cc41aee1b8b
--- /dev/null
+++ b/3rdparty/simpletest/test/site/file.html
@@ -0,0 +1,6 @@
+<html>
+    <head><title>Link to SimpleTest</title></head>
+    <body>
+        <a href="http://simpletest.org/">Link to SimpleTest</a>
+    </body>
+</html>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/socket_test.php b/3rdparty/simpletest/test/socket_test.php
new file mode 100755
index 00000000000..729adda4960
--- /dev/null
+++ b/3rdparty/simpletest/test/socket_test.php
@@ -0,0 +1,25 @@
+<?php
+// $Id: socket_test.php 1782 2008-04-25 17:09:06Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../socket.php');
+Mock::generate('SimpleSocket');
+
+class TestOfSimpleStickyError extends UnitTestCase {
+    
+    function testSettingError() {
+        $error = new SimpleStickyError();
+        $this->assertFalse($error->isError());
+        $error->setError('Ouch');
+        $this->assertTrue($error->isError());
+        $this->assertEqual($error->getError(), 'Ouch');
+    }
+    
+    function testClearingError() {
+        $error = new SimpleStickyError();
+        $error->setError('Ouch');
+        $this->assertTrue($error->isError());
+        $error->clearError();
+        $this->assertFalse($error->isError());
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/collector/collectable.1 b/3rdparty/simpletest/test/support/collector/collectable.1
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/3rdparty/simpletest/test/support/collector/collectable.2 b/3rdparty/simpletest/test/support/collector/collectable.2
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/3rdparty/simpletest/test/support/empty_test_file.php b/3rdparty/simpletest/test/support/empty_test_file.php
new file mode 100755
index 00000000000..31e3f7bed62
--- /dev/null
+++ b/3rdparty/simpletest/test/support/empty_test_file.php
@@ -0,0 +1,3 @@
+<?php
+require_once(dirname(__FILE__) . '/../../autorun.php');
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/failing_test.php b/3rdparty/simpletest/test/support/failing_test.php
new file mode 100755
index 00000000000..30f0d7507d9
--- /dev/null
+++ b/3rdparty/simpletest/test/support/failing_test.php
@@ -0,0 +1,9 @@
+<?php
+require_once(dirname(__FILE__) . '/../../autorun.php');
+
+class FailingTest extends UnitTestCase {
+    function test_fail() {
+        $this->assertEqual(1,2);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/latin1_sample b/3rdparty/simpletest/test/support/latin1_sample
new file mode 100755
index 00000000000..19035257766
--- /dev/null
+++ b/3rdparty/simpletest/test/support/latin1_sample
@@ -0,0 +1 @@
+£¹²³¼½¾@¶øþðßæ«»¢µ
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/passing_test.php b/3rdparty/simpletest/test/support/passing_test.php
new file mode 100755
index 00000000000..b7863216353
--- /dev/null
+++ b/3rdparty/simpletest/test/support/passing_test.php
@@ -0,0 +1,9 @@
+<?php
+require_once(dirname(__FILE__) . '/../../autorun.php');
+
+class PassingTest extends UnitTestCase {
+    function test_pass() {
+        $this->assertEqual(2,2);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/recorder_sample.php b/3rdparty/simpletest/test/support/recorder_sample.php
new file mode 100755
index 00000000000..4f157f6b601
--- /dev/null
+++ b/3rdparty/simpletest/test/support/recorder_sample.php
@@ -0,0 +1,14 @@
+<?php
+// $Id: sample_test.php 1500 2007-04-29 14:33:31Z pp11 $
+require_once dirname(__FILE__) . '/../../autorun.php';
+
+class SampleTestForRecorder extends UnitTestCase {
+    function testTrueIsTrue() {
+        $this->assertTrue(true);
+    }
+
+    function testFalseIsTrue() {
+        $this->assertFalse(true);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/spl_examples.php b/3rdparty/simpletest/test/support/spl_examples.php
new file mode 100755
index 00000000000..45add356c44
--- /dev/null
+++ b/3rdparty/simpletest/test/support/spl_examples.php
@@ -0,0 +1,15 @@
+<?php
+    // $Id: spl_examples.php 1262 2006-02-05 19:35:31Z lastcraft $
+
+    class IteratorImplementation implements Iterator {
+        function current() { }
+        function next() { }
+        function key() { }
+        function valid() { }
+        function rewind() { }
+    }
+
+    class IteratorAggregateImplementation implements IteratorAggregate {
+        function getIterator() { }
+    }
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/supplementary_upload_sample.txt b/3rdparty/simpletest/test/support/supplementary_upload_sample.txt
new file mode 100755
index 00000000000..d8aa9e81013
--- /dev/null
+++ b/3rdparty/simpletest/test/support/supplementary_upload_sample.txt
@@ -0,0 +1 @@
+Some more text content
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/test1.php b/3rdparty/simpletest/test/support/test1.php
new file mode 100755
index 00000000000..b414586d642
--- /dev/null
+++ b/3rdparty/simpletest/test/support/test1.php
@@ -0,0 +1,7 @@
+<?php
+class test1 extends UnitTestCase {
+	function test_pass(){
+		$this->assertEqual(3,1+2, "pass1");
+	}
+}
+?>
diff --git a/3rdparty/simpletest/test/support/upload_sample.txt b/3rdparty/simpletest/test/support/upload_sample.txt
new file mode 100755
index 00000000000..ec98d7c5e3f
--- /dev/null
+++ b/3rdparty/simpletest/test/support/upload_sample.txt
@@ -0,0 +1 @@
+Sample for testing file upload
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/tag_test.php b/3rdparty/simpletest/test/tag_test.php
new file mode 100755
index 00000000000..5e8a377f089
--- /dev/null
+++ b/3rdparty/simpletest/test/tag_test.php
@@ -0,0 +1,554 @@
+<?php
+// $Id: tag_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../tag.php');
+require_once(dirname(__FILE__) . '/../encoding.php');
+Mock::generate('SimpleMultipartEncoding');
+
+class TestOfTag extends UnitTestCase {
+    
+    function testStartValuesWithoutAdditionalContent() {
+        $tag = new SimpleTitleTag(array('a' => '1', 'b' => ''));
+        $this->assertEqual($tag->getTagName(), 'title');
+        $this->assertIdentical($tag->getAttribute('a'), '1');
+        $this->assertIdentical($tag->getAttribute('b'), '');
+        $this->assertIdentical($tag->getAttribute('c'), false);
+        $this->assertIdentical($tag->getContent(), '');
+    }
+    
+    function testTitleContent() {
+        $tag = new SimpleTitleTag(array());
+        $this->assertTrue($tag->expectEndTag());
+        $tag->addContent('Hello');
+        $tag->addContent('World');
+        $this->assertEqual($tag->getText(), 'HelloWorld');
+    }
+    
+    function testMessyTitleContent() {
+        $tag = new SimpleTitleTag(array());
+        $this->assertTrue($tag->expectEndTag());
+        $tag->addContent('<b>Hello</b>');
+        $tag->addContent('<em>World</em>');
+        $this->assertEqual($tag->getText(), 'HelloWorld');
+    }
+    
+    function testTagWithNoEnd() {
+        $tag = new SimpleTextTag(array());
+        $this->assertFalse($tag->expectEndTag());
+    }
+    
+    function testAnchorHref() {
+        $tag = new SimpleAnchorTag(array('href' => 'http://here/'));
+        $this->assertEqual($tag->getHref(), 'http://here/');
+        
+        $tag = new SimpleAnchorTag(array('href' => ''));
+        $this->assertIdentical($tag->getAttribute('href'), '');
+        $this->assertIdentical($tag->getHref(), '');
+        
+        $tag = new SimpleAnchorTag(array());
+        $this->assertIdentical($tag->getAttribute('href'), false);
+        $this->assertIdentical($tag->getHref(), '');
+    }
+    
+    function testIsIdMatchesIdAttribute() {
+        $tag = new SimpleAnchorTag(array('href' => 'http://here/', 'id' => 7));
+        $this->assertIdentical($tag->getAttribute('id'), '7');
+        $this->assertTrue($tag->isId(7));
+    }
+}
+
+class TestOfWidget extends UnitTestCase {
+    
+    function testTextEmptyDefault() {
+        $tag = new SimpleTextTag(array('type' => 'text'));
+        $this->assertIdentical($tag->getDefault(), '');
+        $this->assertIdentical($tag->getValue(), '');
+    }
+    
+    function testSettingOfExternalLabel() {
+        $tag = new SimpleTextTag(array('type' => 'text'));
+        $tag->setLabel('it');
+        $this->assertTrue($tag->isLabel('it'));
+    }
+    
+    function testTextDefault() {
+        $tag = new SimpleTextTag(array('value' => 'aaa'));
+        $this->assertEqual($tag->getDefault(), 'aaa');
+        $this->assertEqual($tag->getValue(), 'aaa');
+    }
+    
+    function testSettingTextValue() {
+        $tag = new SimpleTextTag(array('value' => 'aaa'));
+        $tag->setValue('bbb');
+        $this->assertEqual($tag->getValue(), 'bbb');
+        $tag->resetValue();
+        $this->assertEqual($tag->getValue(), 'aaa');
+    }
+    
+    function testFailToSetHiddenValue() {
+        $tag = new SimpleTextTag(array('value' => 'aaa', 'type' => 'hidden'));
+        $this->assertFalse($tag->setValue('bbb'));
+        $this->assertEqual($tag->getValue(), 'aaa');
+    }
+    
+    function testSubmitDefaults() {
+        $tag = new SimpleSubmitTag(array('type' => 'submit'));
+        $this->assertIdentical($tag->getName(), false);
+        $this->assertEqual($tag->getValue(), 'Submit');
+        $this->assertFalse($tag->setValue('Cannot set this'));
+        $this->assertEqual($tag->getValue(), 'Submit');
+        $this->assertEqual($tag->getLabel(), 'Submit');
+        
+        $encoding = new MockSimpleMultipartEncoding();
+        $encoding->expectNever('add');
+        $tag->write($encoding);
+    }
+    
+    function testPopulatedSubmit() {
+        $tag = new SimpleSubmitTag(
+                array('type' => 'submit', 'name' => 's', 'value' => 'Ok!'));
+        $this->assertEqual($tag->getName(), 's');
+        $this->assertEqual($tag->getValue(), 'Ok!');
+        $this->assertEqual($tag->getLabel(), 'Ok!');
+        
+        $encoding = new MockSimpleMultipartEncoding();
+        $encoding->expectOnce('add', array('s', 'Ok!'));
+        $tag->write($encoding);
+    }
+    
+    function testImageSubmit() {
+        $tag = new SimpleImageSubmitTag(
+                array('type' => 'image', 'name' => 's', 'alt' => 'Label'));
+        $this->assertEqual($tag->getName(), 's');
+        $this->assertEqual($tag->getLabel(), 'Label');
+        
+        $encoding = new MockSimpleMultipartEncoding();
+        $encoding->expectAt(0, 'add', array('s.x', 20));
+        $encoding->expectAt(1, 'add', array('s.y', 30));
+        $tag->write($encoding, 20, 30);
+    }
+    
+    function testImageSubmitTitlePreferredOverAltForLabel() {
+        $tag = new SimpleImageSubmitTag(
+                array('type' => 'image', 'name' => 's', 'alt' => 'Label', 'title' => 'Title'));
+        $this->assertEqual($tag->getLabel(), 'Title');
+    }
+    
+    function testButton() {
+        $tag = new SimpleButtonTag(
+                array('type' => 'submit', 'name' => 's', 'value' => 'do'));
+        $tag->addContent('I am a button');
+        $this->assertEqual($tag->getName(), 's');
+        $this->assertEqual($tag->getValue(), 'do');
+        $this->assertEqual($tag->getLabel(), 'I am a button');
+
+        $encoding = new MockSimpleMultipartEncoding();
+        $encoding->expectOnce('add', array('s', 'do'));
+        $tag->write($encoding);
+    }
+}
+
+class TestOfTextArea extends UnitTestCase {
+    
+    function testDefault() {
+        $tag = new SimpleTextAreaTag(array('name' => 'a'));
+        $tag->addContent('Some text');
+        $this->assertEqual($tag->getName(), 'a');
+        $this->assertEqual($tag->getDefault(), 'Some text');
+    }
+    
+    function testWrapping() {
+        $tag = new SimpleTextAreaTag(array('cols' => '10', 'wrap' => 'physical'));
+        $tag->addContent("Lot's of text that should be wrapped");
+        $this->assertEqual(
+                $tag->getDefault(),
+                "Lot's of\r\ntext that\r\nshould be\r\nwrapped");
+        $tag->setValue("New long text\r\nwith two lines");
+        $this->assertEqual(
+                $tag->getValue(),
+                "New long\r\ntext\r\nwith two\r\nlines");
+    }
+    
+    function testWrappingRemovesLeadingcariageReturn() {
+        $tag = new SimpleTextAreaTag(array('cols' => '20', 'wrap' => 'physical'));
+        $tag->addContent("\rStuff");
+        $this->assertEqual($tag->getDefault(), 'Stuff');
+        $tag->setValue("\nNew stuff\n");
+        $this->assertEqual($tag->getValue(), "New stuff\r\n");
+    }
+    
+    function testBreaksAreNewlineAndCarriageReturn() {
+        $tag = new SimpleTextAreaTag(array('cols' => '10'));
+        $tag->addContent("Some\nText\rwith\r\nbreaks");
+        $this->assertEqual($tag->getValue(), "Some\r\nText\r\nwith\r\nbreaks");
+    }
+}
+
+class TestOfCheckbox extends UnitTestCase {
+    
+    function testCanSetCheckboxToNamedValueWithBooleanTrue() {
+        $tag = new SimpleCheckboxTag(array('name' => 'a', 'value' => 'A'));
+        $this->assertEqual($tag->getValue(), false);
+        $tag->setValue(true);
+        $this->assertIdentical($tag->getValue(), 'A');
+    }
+}
+
+class TestOfSelection extends UnitTestCase {
+    
+    function testEmpty() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $this->assertIdentical($tag->getValue(), '');
+    }
+    
+    function testSingle() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $option = new SimpleOptionTag(array());
+        $option->addContent('AAA');
+        $tag->addTag($option);
+        $this->assertEqual($tag->getValue(), 'AAA');
+    }
+    
+    function testSingleDefault() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $option = new SimpleOptionTag(array('selected' => ''));
+        $option->addContent('AAA');
+        $tag->addTag($option);
+        $this->assertEqual($tag->getValue(), 'AAA');
+    }
+    
+    function testSingleMappedDefault() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $option = new SimpleOptionTag(array('selected' => '', 'value' => 'aaa'));
+        $option->addContent('AAA');
+        $tag->addTag($option);
+        $this->assertEqual($tag->getValue(), 'aaa');
+    }
+    
+    function testStartsWithDefault() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $a = new SimpleOptionTag(array());
+        $a->addContent('AAA');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array('selected' => ''));
+        $b->addContent('BBB');
+        $tag->addTag($b);
+        $c = new SimpleOptionTag(array());
+        $c->addContent('CCC');
+        $tag->addTag($c);
+        $this->assertEqual($tag->getValue(), 'BBB');
+    }
+    
+    function testSettingOption() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $a = new SimpleOptionTag(array());
+        $a->addContent('AAA');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array('selected' => ''));
+        $b->addContent('BBB');
+        $tag->addTag($b);
+        $c = new SimpleOptionTag(array());
+        $c->addContent('CCC');
+        $tag->setValue('AAA');
+        $this->assertEqual($tag->getValue(), 'AAA');
+    }
+    
+    function testSettingMappedOption() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $a = new SimpleOptionTag(array('value' => 'aaa'));
+        $a->addContent('AAA');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array('value' => 'bbb', 'selected' => ''));
+        $b->addContent('BBB');
+        $tag->addTag($b);
+        $c = new SimpleOptionTag(array('value' => 'ccc'));
+        $c->addContent('CCC');
+        $tag->addTag($c);
+        $tag->setValue('AAA');
+        $this->assertEqual($tag->getValue(), 'aaa');
+        $tag->setValue('ccc');
+        $this->assertEqual($tag->getValue(), 'ccc');
+    }
+    
+    function testSelectionDespiteSpuriousWhitespace() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $a = new SimpleOptionTag(array());
+        $a->addContent(' AAA ');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array('selected' => ''));
+        $b->addContent(' BBB ');
+        $tag->addTag($b);
+        $c = new SimpleOptionTag(array());
+        $c->addContent(' CCC ');
+        $tag->addTag($c);
+        $this->assertEqual($tag->getValue(), ' BBB ');
+        $tag->setValue('AAA');
+        $this->assertEqual($tag->getValue(), ' AAA ');
+    }
+    
+    function testFailToSetIllegalOption() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $a = new SimpleOptionTag(array());
+        $a->addContent('AAA');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array('selected' => ''));
+        $b->addContent('BBB');
+        $tag->addTag($b);
+        $c = new SimpleOptionTag(array());
+        $c->addContent('CCC');
+        $tag->addTag($c);
+        $this->assertFalse($tag->setValue('Not present'));
+        $this->assertEqual($tag->getValue(), 'BBB');
+    }
+    
+    function testNastyOptionValuesThatLookLikeFalse() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $a = new SimpleOptionTag(array('value' => '1'));
+        $a->addContent('One');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array('value' => '0'));
+        $b->addContent('Zero');
+        $tag->addTag($b);
+        $this->assertIdentical($tag->getValue(), '1');
+        $tag->setValue('Zero');
+        $this->assertIdentical($tag->getValue(), '0');
+    }
+    
+    function testBlankOption() {
+        $tag = new SimpleSelectionTag(array('name' => 'A'));
+        $a = new SimpleOptionTag(array());
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array());
+        $b->addContent('b');
+        $tag->addTag($b);
+        $this->assertIdentical($tag->getValue(), '');
+        $tag->setValue('b');
+        $this->assertIdentical($tag->getValue(), 'b');
+        $tag->setValue('');
+        $this->assertIdentical($tag->getValue(), '');
+    }
+    
+    function testMultipleDefaultWithNoSelections() {
+        $tag = new MultipleSelectionTag(array('name' => 'a', 'multiple' => ''));
+        $a = new SimpleOptionTag(array());
+        $a->addContent('AAA');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array());
+        $b->addContent('BBB');
+        $tag->addTag($b);
+        $this->assertIdentical($tag->getDefault(), array());
+        $this->assertIdentical($tag->getValue(), array());
+    }
+    
+    function testMultipleDefaultWithSelections() {
+        $tag = new MultipleSelectionTag(array('name' => 'a', 'multiple' => ''));
+        $a = new SimpleOptionTag(array('selected' => ''));
+        $a->addContent('AAA');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array('selected' => ''));
+        $b->addContent('BBB');
+        $tag->addTag($b);
+        $this->assertIdentical($tag->getDefault(), array('AAA', 'BBB'));
+        $this->assertIdentical($tag->getValue(), array('AAA', 'BBB'));
+    }
+    
+    function testSettingMultiple() {
+        $tag = new MultipleSelectionTag(array('name' => 'a', 'multiple' => ''));
+        $a = new SimpleOptionTag(array('selected' => ''));
+        $a->addContent('AAA');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array());
+        $b->addContent('BBB');
+        $tag->addTag($b);
+        $c = new SimpleOptionTag(array('selected' => '', 'value' => 'ccc'));
+        $c->addContent('CCC');
+        $tag->addTag($c);
+        $this->assertIdentical($tag->getDefault(), array('AAA', 'ccc'));
+        $this->assertTrue($tag->setValue(array('BBB', 'ccc')));
+        $this->assertIdentical($tag->getValue(), array('BBB', 'ccc'));
+        $this->assertTrue($tag->setValue(array()));
+        $this->assertIdentical($tag->getValue(), array());
+    }
+    
+    function testFailToSetIllegalOptionsInMultiple() {
+        $tag = new MultipleSelectionTag(array('name' => 'a', 'multiple' => ''));
+        $a = new SimpleOptionTag(array('selected' => ''));
+        $a->addContent('AAA');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array());
+        $b->addContent('BBB');
+        $tag->addTag($b);
+        $this->assertFalse($tag->setValue(array('CCC')));
+        $this->assertTrue($tag->setValue(array('AAA', 'BBB')));
+        $this->assertFalse($tag->setValue(array('AAA', 'CCC')));
+    }
+}
+
+class TestOfRadioGroup extends UnitTestCase {
+    
+    function testEmptyGroup() {
+        $group = new SimpleRadioGroup();
+        $this->assertIdentical($group->getDefault(), false);
+        $this->assertIdentical($group->getValue(), false);
+        $this->assertFalse($group->setValue('a'));
+    }
+    
+    function testReadingSingleButtonGroup() {
+        $group = new SimpleRadioGroup();
+        $group->addWidget(new SimpleRadioButtonTag(
+                array('value' => 'A', 'checked' => '')));
+        $this->assertIdentical($group->getDefault(), 'A');
+        $this->assertIdentical($group->getValue(), 'A');
+    }
+    
+    function testReadingMultipleButtonGroup() {
+        $group = new SimpleRadioGroup();
+        $group->addWidget(new SimpleRadioButtonTag(
+                array('value' => 'A')));
+        $group->addWidget(new SimpleRadioButtonTag(
+                array('value' => 'B', 'checked' => '')));
+        $this->assertIdentical($group->getDefault(), 'B');
+        $this->assertIdentical($group->getValue(), 'B');
+    }
+    
+    function testFailToSetUnlistedValue() {
+        $group = new SimpleRadioGroup();
+        $group->addWidget(new SimpleRadioButtonTag(array('value' => 'z')));
+        $this->assertFalse($group->setValue('a'));
+        $this->assertIdentical($group->getValue(), false);
+    }
+    
+    function testSettingNewValueClearsTheOldOne() {
+        $group = new SimpleRadioGroup();
+        $group->addWidget(new SimpleRadioButtonTag(
+                array('value' => 'A')));
+        $group->addWidget(new SimpleRadioButtonTag(
+                array('value' => 'B', 'checked' => '')));
+        $this->assertTrue($group->setValue('A'));
+        $this->assertIdentical($group->getValue(), 'A');
+    }
+    
+    function testIsIdMatchesAnyWidgetInSet() {
+        $group = new SimpleRadioGroup();
+        $group->addWidget(new SimpleRadioButtonTag(
+                array('value' => 'A', 'id' => 'i1')));
+        $group->addWidget(new SimpleRadioButtonTag(
+                array('value' => 'B', 'id' => 'i2')));
+        $this->assertFalse($group->isId('i0'));
+        $this->assertTrue($group->isId('i1'));
+        $this->assertTrue($group->isId('i2'));
+    }
+    
+    function testIsLabelMatchesAnyWidgetInSet() {
+        $group = new SimpleRadioGroup();
+        $button1 = new SimpleRadioButtonTag(array('value' => 'A'));
+        $button1->setLabel('one');
+        $group->addWidget($button1);
+        $button2 = new SimpleRadioButtonTag(array('value' => 'B'));
+        $button2->setLabel('two');
+        $group->addWidget($button2);
+        $this->assertFalse($group->isLabel('three'));
+        $this->assertTrue($group->isLabel('one'));
+        $this->assertTrue($group->isLabel('two'));
+    }
+}
+
+class TestOfTagGroup extends UnitTestCase {
+    
+    function testReadingMultipleCheckboxGroup() {
+        $group = new SimpleCheckboxGroup();
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
+        $group->addWidget(new SimpleCheckboxTag(
+                array('value' => 'B', 'checked' => '')));
+        $this->assertIdentical($group->getDefault(), 'B');
+        $this->assertIdentical($group->getValue(), 'B');
+    }
+    
+    function testReadingMultipleUncheckedItems() {
+        $group = new SimpleCheckboxGroup();
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'B')));            
+        $this->assertIdentical($group->getDefault(), false);
+        $this->assertIdentical($group->getValue(), false);
+    }
+    
+    function testReadingMultipleCheckedItems() {
+        $group = new SimpleCheckboxGroup();
+        $group->addWidget(new SimpleCheckboxTag(
+                array('value' => 'A', 'checked' => '')));
+        $group->addWidget(new SimpleCheckboxTag(
+                array('value' => 'B', 'checked' => '')));
+        $this->assertIdentical($group->getDefault(), array('A', 'B'));
+        $this->assertIdentical($group->getValue(), array('A', 'B'));
+    }
+    
+    function testSettingSingleValue() {
+        $group = new SimpleCheckboxGroup();
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'B')));
+        $this->assertTrue($group->setValue('A'));
+        $this->assertIdentical($group->getValue(), 'A');
+        $this->assertTrue($group->setValue('B'));
+        $this->assertIdentical($group->getValue(), 'B');
+    }
+    
+    function testSettingMultipleValues() {
+        $group = new SimpleCheckboxGroup();
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'B')));
+        $this->assertTrue($group->setValue(array('A', 'B')));
+        $this->assertIdentical($group->getValue(), array('A', 'B'));
+    }
+    
+    function testSettingNoValue() {
+        $group = new SimpleCheckboxGroup();
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'B')));
+        $this->assertTrue($group->setValue(false));
+        $this->assertIdentical($group->getValue(), false);
+    }
+    
+    function testIsIdMatchesAnyIdInSet() {
+        $group = new SimpleCheckboxGroup();
+        $group->addWidget(new SimpleCheckboxTag(array('id' => 1, 'value' => 'A')));
+        $group->addWidget(new SimpleCheckboxTag(array('id' => 2, 'value' => 'B')));
+        $this->assertFalse($group->isId(0));
+        $this->assertTrue($group->isId(1));
+        $this->assertTrue($group->isId(2));
+    }
+}
+
+class TestOfUploadWidget extends UnitTestCase {
+    
+    function testValueIsFilePath() {
+        $upload = new SimpleUploadTag(array('name' => 'a'));
+        $upload->setValue(dirname(__FILE__) . '/support/upload_sample.txt');
+        $this->assertEqual($upload->getValue(), dirname(__FILE__) . '/support/upload_sample.txt');
+    }
+    
+    function testSubmitsFileContents() {
+        $encoding = new MockSimpleMultipartEncoding();
+        $encoding->expectOnce('attach', array(
+                'a',
+                'Sample for testing file upload',
+                'upload_sample.txt'));
+        $upload = new SimpleUploadTag(array('name' => 'a'));
+        $upload->setValue(dirname(__FILE__) . '/support/upload_sample.txt');
+        $upload->write($encoding);
+    }
+}
+
+class TestOfLabelTag extends UnitTestCase {
+    
+    function testLabelShouldHaveAnEndTag() {
+        $label = new SimpleLabelTag(array());
+        $this->assertTrue($label->expectEndTag());
+    }
+    
+    function testContentIsTextOnly() {
+        $label = new SimpleLabelTag(array());
+        $label->addContent('Here <tag>are</tag> words');
+        $this->assertEqual($label->getText(), 'Here are words');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/test_with_parse_error.php b/3rdparty/simpletest/test/test_with_parse_error.php
new file mode 100755
index 00000000000..41a5832a5cb
--- /dev/null
+++ b/3rdparty/simpletest/test/test_with_parse_error.php
@@ -0,0 +1,8 @@
+<?php
+    // $Id: test_with_parse_error.php 901 2005-01-24 00:32:14Z lastcraft $
+    
+    class TestCaseWithParseError extends UnitTestCase {
+        wibble
+    }
+    
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/unit_tester_test.php b/3rdparty/simpletest/test/unit_tester_test.php
new file mode 100755
index 00000000000..ce9850f09ab
--- /dev/null
+++ b/3rdparty/simpletest/test/unit_tester_test.php
@@ -0,0 +1,61 @@
+<?php
+// $Id: unit_tester_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+
+class ReferenceForTesting {
+}
+
+class TestOfUnitTester extends UnitTestCase {
+    
+    function testAssertTrueReturnsAssertionAsBoolean() {
+        $this->assertTrue($this->assertTrue(true));
+    }
+    
+    function testAssertFalseReturnsAssertionAsBoolean() {
+        $this->assertTrue($this->assertFalse(false));
+    }
+    
+    function testAssertEqualReturnsAssertionAsBoolean() {
+        $this->assertTrue($this->assertEqual(5, 5));
+    }
+    
+    function testAssertIdenticalReturnsAssertionAsBoolean() {
+        $this->assertTrue($this->assertIdentical(5, 5));
+    }
+    
+    function testCoreAssertionsDoNotThrowErrors() {
+        $this->assertIsA($this, 'UnitTestCase');
+        $this->assertNotA($this, 'WebTestCase');
+    }
+    
+    function testReferenceAssertionOnObjects() {
+        $a = new ReferenceForTesting();
+        $b = $a;
+        $this->assertSame($a, $b);
+    }
+    
+    function testReferenceAssertionOnScalars() {
+        $a = 25;
+        $b = &$a;
+        $this->assertReference($a, $b);
+    }
+    
+    function testCloneOnObjects() {
+        $a = new ReferenceForTesting();
+        $b = new ReferenceForTesting();
+        $this->assertClone($a, $b);
+    }
+
+    function TODO_testCloneOnScalars() {
+        $a = 25;
+        $b = 25;
+        $this->assertClone($a, $b);
+    }
+
+    function testCopyOnScalars() {
+        $a = 25;
+        $b = 25;
+        $this->assertCopy($a, $b);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/unit_tests.php b/3rdparty/simpletest/test/unit_tests.php
new file mode 100755
index 00000000000..9e621293f9e
--- /dev/null
+++ b/3rdparty/simpletest/test/unit_tests.php
@@ -0,0 +1,49 @@
+<?php
+// $Id: unit_tests.php 1986 2010-04-02 10:02:42Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../unit_tester.php');
+require_once(dirname(__FILE__) . '/../shell_tester.php');
+require_once(dirname(__FILE__) . '/../mock_objects.php');
+require_once(dirname(__FILE__) . '/../web_tester.php');
+require_once(dirname(__FILE__) . '/../extensions/pear_test_case.php');
+
+class UnitTests extends TestSuite {
+    function UnitTests() {
+        $this->TestSuite('Unit tests');
+        $path = dirname(__FILE__);
+        $this->addFile($path . '/errors_test.php');
+        $this->addFile($path . '/exceptions_test.php');
+        $this->addFile($path . '/arguments_test.php');
+        $this->addFile($path . '/autorun_test.php');
+        $this->addFile($path . '/compatibility_test.php');
+        $this->addFile($path . '/simpletest_test.php');
+        $this->addFile($path . '/dumper_test.php');
+        $this->addFile($path . '/expectation_test.php');
+        $this->addFile($path . '/unit_tester_test.php');
+        $this->addFile($path . '/reflection_php5_test.php');
+        $this->addFile($path . '/mock_objects_test.php');
+        $this->addFile($path . '/interfaces_test.php');
+        $this->addFile($path . '/collector_test.php');
+        $this->addFile($path . '/recorder_test.php');
+        $this->addFile($path . '/adapter_test.php');
+        $this->addFile($path . '/socket_test.php');
+        $this->addFile($path . '/encoding_test.php');
+        $this->addFile($path . '/url_test.php');
+        $this->addFile($path . '/cookies_test.php');
+        $this->addFile($path . '/http_test.php');
+        $this->addFile($path . '/authentication_test.php');
+        $this->addFile($path . '/user_agent_test.php');
+        $this->addFile($path . '/php_parser_test.php');
+        $this->addFile($path . '/parsing_test.php');
+        $this->addFile($path . '/tag_test.php');
+        $this->addFile($path . '/form_test.php');
+        $this->addFile($path . '/page_test.php');
+        $this->addFile($path . '/frames_test.php');
+        $this->addFile($path . '/browser_test.php');
+        $this->addFile($path . '/web_tester_test.php');
+        $this->addFile($path . '/shell_tester_test.php');
+        $this->addFile($path . '/xml_test.php');
+        $this->addFile($path . '/../extensions/testdox/test.php');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/url_test.php b/3rdparty/simpletest/test/url_test.php
new file mode 100755
index 00000000000..80119afbdde
--- /dev/null
+++ b/3rdparty/simpletest/test/url_test.php
@@ -0,0 +1,515 @@
+<?php
+// $Id: url_test.php 1998 2010-07-27 09:55:55Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../url.php');
+
+class TestOfUrl extends UnitTestCase {
+    
+    function testDefaultUrl() {
+        $url = new SimpleUrl('');
+        $this->assertEqual($url->getScheme(), '');
+        $this->assertEqual($url->getHost(), '');
+        $this->assertEqual($url->getScheme('http'), 'http');
+        $this->assertEqual($url->getHost('localhost'), 'localhost');
+        $this->assertEqual($url->getPath(), '');
+    }
+    
+    function testBasicParsing() {
+        $url = new SimpleUrl('https://www.lastcraft.com/test/');
+        $this->assertEqual($url->getScheme(), 'https');
+        $this->assertEqual($url->getHost(), 'www.lastcraft.com');
+        $this->assertEqual($url->getPath(), '/test/');
+    }
+    
+    function testRelativeUrls() {
+        $url = new SimpleUrl('../somewhere.php');
+        $this->assertEqual($url->getScheme(), false);
+        $this->assertEqual($url->getHost(), false);
+        $this->assertEqual($url->getPath(), '../somewhere.php');
+    }
+    
+    function testParseBareParameter() {
+        $url = new SimpleUrl('?a');
+        $this->assertEqual($url->getPath(), '');
+        $this->assertEqual($url->getEncodedRequest(), '?a');
+        $url->addRequestParameter('x', 'X');
+        $this->assertEqual($url->getEncodedRequest(), '?a=&x=X');
+    }
+    
+    function testParseEmptyParameter() {
+        $url = new SimpleUrl('?a=');
+        $this->assertEqual($url->getPath(), '');
+        $this->assertEqual($url->getEncodedRequest(), '?a=');
+        $url->addRequestParameter('x', 'X');
+        $this->assertEqual($url->getEncodedRequest(), '?a=&x=X');
+    }
+    
+    function testParseParameterPair() {
+        $url = new SimpleUrl('?a=A');
+        $this->assertEqual($url->getPath(), '');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A');
+        $url->addRequestParameter('x', 'X');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&x=X');
+    }
+    
+    function testParseMultipleParameters() {
+        $url = new SimpleUrl('?a=A&b=B');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=B');
+        $url->addRequestParameter('x', 'X');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=B&x=X');
+    }
+    
+    function testParsingParameterMixture() {
+        $url = new SimpleUrl('?a=A&b=&c');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=&c');
+        $url->addRequestParameter('x', 'X');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=&c=&x=X');
+    }
+    
+    function testAddParametersFromScratch() {
+        $url = new SimpleUrl('');
+        $url->addRequestParameter('a', 'A');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A');
+        $url->addRequestParameter('b', 'B');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=B');
+        $url->addRequestParameter('a', 'aaa');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=B&a=aaa');
+    }
+    
+    function testClearingParameters() {
+        $url = new SimpleUrl('');
+        $url->addRequestParameter('a', 'A');
+        $url->clearRequest();
+        $this->assertIdentical($url->getEncodedRequest(), '');
+    }
+    
+    function testEncodingParameters() {
+        $url = new SimpleUrl('');
+        $url->addRequestParameter('a', '?!"\'#~@[]{}:;<>,./|$%^&*()_+-=');
+        $this->assertIdentical(
+                $request = $url->getEncodedRequest(),
+                '?a=%3F%21%22%27%23%7E%40%5B%5D%7B%7D%3A%3B%3C%3E%2C.%2F%7C%24%25%5E%26%2A%28%29_%2B-%3D');
+    }
+    
+    function testDecodingParameters() {            
+        $url = new SimpleUrl('?a=%3F%21%22%27%23%7E%40%5B%5D%7B%7D%3A%3B%3C%3E%2C.%2F%7C%24%25%5E%26%2A%28%29_%2B-%3D');
+        $this->assertEqual(
+                $url->getEncodedRequest(),
+                '?a=' . urlencode('?!"\'#~@[]{}:;<>,./|$%^&*()_+-='));
+    }
+    
+    function testUrlInQueryDoesNotConfuseParsing() {
+        $url = new SimpleUrl('wibble/login.php?url=http://www.google.com/moo/');
+        $this->assertFalse($url->getScheme());
+        $this->assertFalse($url->getHost());
+        $this->assertEqual($url->getPath(), 'wibble/login.php');
+        $this->assertEqual($url->getEncodedRequest(), '?url=http://www.google.com/moo/');
+    }
+    
+    function testSettingCordinates() {
+        $url = new SimpleUrl('');
+        $url->setCoordinates('32', '45');
+        $this->assertIdentical($url->getX(), 32);
+        $this->assertIdentical($url->getY(), 45);
+        $this->assertEqual($url->getEncodedRequest(), '');
+    }
+    
+    function testParseCordinates() {
+        $url = new SimpleUrl('?32,45');
+        $this->assertIdentical($url->getX(), 32);
+        $this->assertIdentical($url->getY(), 45);
+    }
+    
+    function testClearingCordinates() {
+        $url = new SimpleUrl('?32,45');
+        $url->setCoordinates();
+        $this->assertIdentical($url->getX(), false);
+        $this->assertIdentical($url->getY(), false);
+    }
+    
+    function testParsingParameterCordinateMixture() {
+        $url = new SimpleUrl('?a=A&b=&c?32,45');
+        $this->assertIdentical($url->getX(), 32);
+        $this->assertIdentical($url->getY(), 45);
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=&c');
+    }
+    
+    function testParsingParameterWithBadCordinates() {
+        $url = new SimpleUrl('?a=A&b=&c?32');
+        $this->assertIdentical($url->getX(), false);
+        $this->assertIdentical($url->getY(), false);
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=&c?32');
+    }
+    
+    function testPageSplitting() {
+        $url = new SimpleUrl('./here/../there/somewhere.php');
+        $this->assertEqual($url->getPath(), './here/../there/somewhere.php');
+        $this->assertEqual($url->getPage(), 'somewhere.php');
+        $this->assertEqual($url->getBasePath(), './here/../there/');
+    }
+    
+    function testAbsolutePathPageSplitting() {
+        $url = new SimpleUrl("http://host.com/here/there/somewhere.php");
+        $this->assertEqual($url->getPath(), "/here/there/somewhere.php");
+        $this->assertEqual($url->getPage(), "somewhere.php");
+        $this->assertEqual($url->getBasePath(), "/here/there/");
+    }
+    
+    function testSplittingUrlWithNoPageGivesEmptyPage() {
+        $url = new SimpleUrl('/here/there/');
+        $this->assertEqual($url->getPath(), '/here/there/');
+        $this->assertEqual($url->getPage(), '');
+        $this->assertEqual($url->getBasePath(), '/here/there/');
+    }
+    
+    function testPathNormalisation() {
+        $url = new SimpleUrl();
+        $this->assertEqual(
+                $url->normalisePath('https://host.com/I/am/here/../there/somewhere.php'),
+                'https://host.com/I/am/there/somewhere.php');
+    }
+
+    // regression test for #1535407
+    function testPathNormalisationWithSinglePeriod() {
+        $url = new SimpleUrl();
+        $this->assertEqual(
+            $url->normalisePath('https://host.com/I/am/here/./../there/somewhere.php'),
+            'https://host.com/I/am/there/somewhere.php');
+    }
+    
+    // regression test for #1852413
+    function testHostnameExtractedFromUContainingAtSign() {
+        $url = new SimpleUrl("http://localhost/name@example.com");
+        $this->assertEqual($url->getScheme(), "http");
+        $this->assertEqual($url->getUsername(), "");
+        $this->assertEqual($url->getPassword(), "");
+        $this->assertEqual($url->getHost(), "localhost");
+        $this->assertEqual($url->getPath(), "/name@example.com");
+    }
+
+    function testHostnameInLocalhost() {
+        $url = new SimpleUrl("http://localhost/name/example.com");
+        $this->assertEqual($url->getScheme(), "http");
+        $this->assertEqual($url->getUsername(), "");
+        $this->assertEqual($url->getPassword(), "");
+        $this->assertEqual($url->getHost(), "localhost");
+        $this->assertEqual($url->getPath(), "/name/example.com");
+    }
+
+    function testUsernameAndPasswordAreUrlDecoded() {
+        $url = new SimpleUrl('http://' . urlencode('test@test') .
+                ':' . urlencode('$!�@*&%') . '@www.lastcraft.com');
+        $this->assertEqual($url->getUsername(), 'test@test');
+        $this->assertEqual($url->getPassword(), '$!�@*&%');
+    }
+    
+    function testBlitz() {
+        $this->assertUrl(
+                "https://username:password@www.somewhere.com:243/this/that/here.php?a=1&b=2#anchor",
+                array("https", "username", "password", "www.somewhere.com", 243, "/this/that/here.php", "com", "?a=1&b=2", "anchor"),
+                array("a" => "1", "b" => "2"));
+        $this->assertUrl(
+                "username:password@www.somewhere.com/this/that/here.php?a=1",
+                array(false, "username", "password", "www.somewhere.com", false, "/this/that/here.php", "com", "?a=1", false),
+                array("a" => "1"));
+        $this->assertUrl(
+                "username:password@somewhere.com:243?1,2",
+                array(false, "username", "password", "somewhere.com", 243, "/", "com", "", false),
+                array(),
+                array(1, 2));
+        $this->assertUrl(
+                "https://www.somewhere.com",
+                array("https", false, false, "www.somewhere.com", false, "/", "com", "", false));
+        $this->assertUrl(
+                "username@www.somewhere.com:243#anchor",
+                array(false, "username", false, "www.somewhere.com", 243, "/", "com", "", "anchor"));
+        $this->assertUrl(
+                "/this/that/here.php?a=1&b=2?3,4",
+                array(false, false, false, false, false, "/this/that/here.php", false, "?a=1&b=2", false),
+                array("a" => "1", "b" => "2"),
+                array(3, 4));
+        $this->assertUrl(
+                "username@/here.php?a=1&b=2",
+                array(false, "username", false, false, false, "/here.php", false, "?a=1&b=2", false),
+                array("a" => "1", "b" => "2"));
+    }
+    
+    function testAmbiguousHosts() {
+        $this->assertUrl(
+                "tigger",
+                array(false, false, false, false, false, "tigger", false, "", false));
+        $this->assertUrl(
+                "/tigger",
+                array(false, false, false, false, false, "/tigger", false, "", false));
+        $this->assertUrl(
+                "//tigger",
+                array(false, false, false, "tigger", false, "/", false, "", false));
+        $this->assertUrl(
+                "//tigger/",
+                array(false, false, false, "tigger", false, "/", false, "", false));
+        $this->assertUrl(
+                "tigger.com",
+                array(false, false, false, "tigger.com", false, "/", "com", "", false));
+        $this->assertUrl(
+                "me.net/tigger",
+                array(false, false, false, "me.net", false, "/tigger", "net", "", false));
+    }
+    
+    function testAsString() {
+        $this->assertPreserved('https://www.here.com');
+        $this->assertPreserved('http://me:secret@www.here.com');
+        $this->assertPreserved('http://here/there');
+        $this->assertPreserved('http://here/there?a=A&b=B');
+        $this->assertPreserved('http://here/there?a=1&a=2');
+        $this->assertPreserved('http://here/there?a=1&a=2?9,8');
+        $this->assertPreserved('http://host?a=1&a=2');
+        $this->assertPreserved('http://host#stuff');
+        $this->assertPreserved('http://me:secret@www.here.com/a/b/c/here.html?a=A?7,6');
+        $this->assertPreserved('http://www.here.com/?a=A__b=B');
+        $this->assertPreserved('http://www.example.com:8080/');
+    }
+    
+    function testUrlWithTwoSlashesInPath() {
+        $url = new SimpleUrl('/article/categoryedit/insert//');
+        $this->assertEqual($url->getPath(), '/article/categoryedit/insert//');
+    }
+    
+    function testUrlWithRequestKeyEncoded() {
+        $url = new SimpleUrl('/?foo%5B1%5D=bar');
+        $this->assertEqual($url->getEncodedRequest(), '?foo%5B1%5D=bar');
+        $url->addRequestParameter('a[1]', 'b[]');
+        $this->assertEqual($url->getEncodedRequest(), '?foo%5B1%5D=bar&a%5B1%5D=b%5B%5D');
+
+        $url = new SimpleUrl('/');
+        $url->addRequestParameter('a[1]', 'b[]');
+        $this->assertEqual($url->getEncodedRequest(), '?a%5B1%5D=b%5B%5D');
+    }
+
+    function testUrlWithRequestKeyEncodedAndParamNamLookingLikePair() {
+        $url = new SimpleUrl('/');
+        $url->addRequestParameter('foo[]=bar', '');
+        $this->assertEqual($url->getEncodedRequest(), '?foo%5B%5D%3Dbar=');
+        $url = new SimpleUrl('/?foo%5B%5D%3Dbar=');
+        $this->assertEqual($url->getEncodedRequest(), '?foo%5B%5D%3Dbar=');
+    }
+
+    function assertUrl($raw, $parts, $params = false, $coords = false) {
+        if (! is_array($params)) {
+            $params = array();
+        }
+        $url = new SimpleUrl($raw);
+        $this->assertIdentical($url->getScheme(), $parts[0], "[$raw] scheme -> %s");
+        $this->assertIdentical($url->getUsername(), $parts[1], "[$raw] username -> %s");
+        $this->assertIdentical($url->getPassword(), $parts[2], "[$raw] password -> %s");
+        $this->assertIdentical($url->getHost(), $parts[3], "[$raw] host -> %s");
+        $this->assertIdentical($url->getPort(), $parts[4], "[$raw] port -> %s");
+        $this->assertIdentical($url->getPath(), $parts[5], "[$raw] path -> %s");
+        $this->assertIdentical($url->getTld(), $parts[6], "[$raw] tld -> %s");
+        $this->assertIdentical($url->getEncodedRequest(), $parts[7], "[$raw] encoded -> %s");
+        $this->assertIdentical($url->getFragment(), $parts[8], "[$raw] fragment -> %s");
+        if ($coords) {
+            $this->assertIdentical($url->getX(), $coords[0], "[$raw] x -> %s");
+            $this->assertIdentical($url->getY(), $coords[1], "[$raw] y -> %s");
+        }
+    }
+    
+    function assertPreserved($string) {
+        $url = new SimpleUrl($string);
+        $this->assertEqual($url->asString(), $string);
+    }
+}
+
+class TestOfAbsoluteUrls extends UnitTestCase {
+    
+	function testDirectoriesAfterFilename() {
+		$string = '../../index.php/foo/bar';
+		$url = new SimpleUrl($string);
+		$this->assertEqual($url->asString(), $string);
+		
+		$absolute = $url->makeAbsolute('http://www.domain.com/some/path/');
+		$this->assertEqual($absolute->asString(), 'http://www.domain.com/index.php/foo/bar');
+	}
+
+    function testMakingAbsolute() {
+        $url = new SimpleUrl('../there/somewhere.php');
+        $this->assertEqual($url->getPath(), '../there/somewhere.php');
+        $absolute = $url->makeAbsolute('https://host.com:1234/I/am/here/');
+        $this->assertEqual($absolute->getScheme(), 'https');
+        $this->assertEqual($absolute->getHost(), 'host.com');
+        $this->assertEqual($absolute->getPort(), 1234);
+        $this->assertEqual($absolute->getPath(), '/I/am/there/somewhere.php');
+    }
+    
+    function testMakingAnEmptyUrlAbsolute() {
+        $url = new SimpleUrl('');
+        $this->assertEqual($url->getPath(), '');
+        $absolute = $url->makeAbsolute('http://host.com/I/am/here/page.html');
+        $this->assertEqual($absolute->getScheme(), 'http');
+        $this->assertEqual($absolute->getHost(), 'host.com');
+        $this->assertEqual($absolute->getPath(), '/I/am/here/page.html');
+    }
+    
+    function testMakingAnEmptyUrlAbsoluteWithMissingPageName() {
+        $url = new SimpleUrl('');
+        $this->assertEqual($url->getPath(), '');
+        $absolute = $url->makeAbsolute('http://host.com/I/am/here/');
+        $this->assertEqual($absolute->getScheme(), 'http');
+        $this->assertEqual($absolute->getHost(), 'host.com');
+        $this->assertEqual($absolute->getPath(), '/I/am/here/');
+    }
+    
+    function testMakingAShortQueryUrlAbsolute() {
+        $url = new SimpleUrl('?a#b');
+        $this->assertEqual($url->getPath(), '');
+        $absolute = $url->makeAbsolute('http://host.com/I/am/here/');
+        $this->assertEqual($absolute->getScheme(), 'http');
+        $this->assertEqual($absolute->getHost(), 'host.com');
+        $this->assertEqual($absolute->getPath(), '/I/am/here/');
+        $this->assertEqual($absolute->getEncodedRequest(), '?a');
+        $this->assertEqual($absolute->getFragment(), 'b');
+    }
+    
+    function testMakingADirectoryUrlAbsolute() {
+        $url = new SimpleUrl('hello/');
+        $this->assertEqual($url->getPath(), 'hello/');
+        $this->assertEqual($url->getBasePath(), 'hello/');
+        $this->assertEqual($url->getPage(), '');
+        $absolute = $url->makeAbsolute('http://host.com/I/am/here/page.html');
+        $this->assertEqual($absolute->getPath(), '/I/am/here/hello/');
+    }
+    
+    function testMakingARootUrlAbsolute() {
+        $url = new SimpleUrl('/');
+        $this->assertEqual($url->getPath(), '/');
+        $absolute = $url->makeAbsolute('http://host.com/I/am/here/page.html');
+        $this->assertEqual($absolute->getPath(), '/');
+    }
+    
+    function testMakingARootPageUrlAbsolute() {
+        $url = new SimpleUrl('/here.html');
+        $absolute = $url->makeAbsolute('http://host.com/I/am/here/page.html');
+        $this->assertEqual($absolute->getPath(), '/here.html');
+    }
+    
+    function testCarryAuthenticationFromRootPage() {
+        $url = new SimpleUrl('here.html');
+        $absolute = $url->makeAbsolute('http://test:secret@host.com/');
+        $this->assertEqual($absolute->getPath(), '/here.html');
+        $this->assertEqual($absolute->getUsername(), 'test');
+        $this->assertEqual($absolute->getPassword(), 'secret');
+    }
+    
+    function testMakingCoordinateUrlAbsolute() {
+        $url = new SimpleUrl('?1,2');
+        $this->assertEqual($url->getPath(), '');
+        $absolute = $url->makeAbsolute('http://host.com/I/am/here/');
+        $this->assertEqual($absolute->getScheme(), 'http');
+        $this->assertEqual($absolute->getHost(), 'host.com');
+        $this->assertEqual($absolute->getPath(), '/I/am/here/');
+        $this->assertEqual($absolute->getX(), 1);
+        $this->assertEqual($absolute->getY(), 2);
+    }
+    
+    function testMakingAbsoluteAppendedPath() {
+        $url = new SimpleUrl('./there/somewhere.php');
+        $absolute = $url->makeAbsolute('https://host.com/here/');
+        $this->assertEqual($absolute->getPath(), '/here/there/somewhere.php');
+    }
+    
+    function testMakingAbsoluteBadlyFormedAppendedPath() {
+        $url = new SimpleUrl('there/somewhere.php');
+        $absolute = $url->makeAbsolute('https://host.com/here/');
+        $this->assertEqual($absolute->getPath(), '/here/there/somewhere.php');
+    }
+    
+    function testMakingAbsoluteHasNoEffectWhenAlreadyAbsolute() {
+        $url = new SimpleUrl('https://test:secret@www.lastcraft.com:321/stuff/?a=1#f');
+        $absolute = $url->makeAbsolute('http://host.com/here/');
+        $this->assertEqual($absolute->getScheme(), 'https');
+        $this->assertEqual($absolute->getUsername(), 'test');
+        $this->assertEqual($absolute->getPassword(), 'secret');
+        $this->assertEqual($absolute->getHost(), 'www.lastcraft.com');
+        $this->assertEqual($absolute->getPort(), 321);
+        $this->assertEqual($absolute->getPath(), '/stuff/');
+        $this->assertEqual($absolute->getEncodedRequest(), '?a=1');
+        $this->assertEqual($absolute->getFragment(), 'f');
+    }
+    
+    function testMakingAbsoluteCarriesAuthenticationWhenAlreadyAbsolute() {
+        $url = new SimpleUrl('https://www.lastcraft.com');
+        $absolute = $url->makeAbsolute('http://test:secret@host.com/here/');
+        $this->assertEqual($absolute->getHost(), 'www.lastcraft.com');
+        $this->assertEqual($absolute->getUsername(), 'test');
+        $this->assertEqual($absolute->getPassword(), 'secret');
+    }
+    
+    function testMakingHostOnlyAbsoluteDoesNotCarryAnyOtherInformation() {
+        $url = new SimpleUrl('http://www.lastcraft.com');
+        $absolute = $url->makeAbsolute('https://host.com:81/here/');
+        $this->assertEqual($absolute->getScheme(), 'http');
+        $this->assertEqual($absolute->getHost(), 'www.lastcraft.com');
+        $this->assertIdentical($absolute->getPort(), false);
+        $this->assertEqual($absolute->getPath(), '/');
+    }
+}
+
+class TestOfFrameUrl extends UnitTestCase {
+    
+    function testTargetAttachment() {
+        $url = new SimpleUrl('http://www.site.com/home.html');
+        $this->assertIdentical($url->getTarget(), false);
+        $url->setTarget('A frame');
+        $this->assertIdentical($url->getTarget(), 'A frame');
+    }
+}
+
+/**
+ * @note Based off of http://www.mozilla.org/quality/networking/testing/filetests.html
+ */
+class TestOfFileUrl extends UnitTestCase {
+    
+    function testMinimalUrl() {
+        $url = new SimpleUrl('file:///');
+        $this->assertEqual($url->getScheme(), 'file');
+        $this->assertIdentical($url->getHost(), false);
+        $this->assertEqual($url->getPath(), '/');
+    }
+    
+    function testUnixUrl() {
+        $url = new SimpleUrl('file:///fileInRoot');
+        $this->assertEqual($url->getScheme(), 'file');
+        $this->assertIdentical($url->getHost(), false);
+        $this->assertEqual($url->getPath(), '/fileInRoot');
+    }
+    
+    function testDOSVolumeUrl() {
+        $url = new SimpleUrl('file:///C:/config.sys');
+        $this->assertEqual($url->getScheme(), 'file');
+        $this->assertIdentical($url->getHost(), false);
+        $this->assertEqual($url->getPath(), '/C:/config.sys');
+    }
+    
+    function testDOSVolumePromotion() {
+        $url = new SimpleUrl('file://C:/config.sys');
+        $this->assertEqual($url->getScheme(), 'file');
+        $this->assertIdentical($url->getHost(), false);
+        $this->assertEqual($url->getPath(), '/C:/config.sys');
+    }
+    
+    function testDOSBackslashes() {
+        $url = new SimpleUrl('file:///C:\config.sys');
+        $this->assertEqual($url->getScheme(), 'file');
+        $this->assertIdentical($url->getHost(), false);
+        $this->assertEqual($url->getPath(), '/C:/config.sys');
+    }
+    
+    function testDOSDirnameAfterFile() {
+        $url = new SimpleUrl('file://C:\config.sys');
+        $this->assertEqual($url->getScheme(), 'file');
+        $this->assertIdentical($url->getHost(), false);
+        $this->assertEqual($url->getPath(), '/C:/config.sys');
+    }
+    
+}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/user_agent_test.php b/3rdparty/simpletest/test/user_agent_test.php
new file mode 100755
index 00000000000..030abeb257d
--- /dev/null
+++ b/3rdparty/simpletest/test/user_agent_test.php
@@ -0,0 +1,348 @@
+<?php
+// $Id: user_agent_test.php 1788 2008-04-27 11:01:59Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../user_agent.php');
+require_once(dirname(__FILE__) . '/../authentication.php');
+require_once(dirname(__FILE__) . '/../http.php');
+require_once(dirname(__FILE__) . '/../encoding.php');
+Mock::generate('SimpleHttpRequest');
+Mock::generate('SimpleHttpResponse');
+Mock::generate('SimpleHttpHeaders');
+Mock::generatePartial('SimpleUserAgent', 'MockRequestUserAgent', array('createHttpRequest'));
+
+class TestOfFetchingUrlParameters extends UnitTestCase {
+    
+    function setUp() {
+        $this->headers = new MockSimpleHttpHeaders();
+        $this->response = new MockSimpleHttpResponse();
+        $this->response->setReturnValue('isError', false);
+        $this->response->returns('getHeaders', new MockSimpleHttpHeaders());
+        $this->request = new MockSimpleHttpRequest();
+        $this->request->returns('fetch', $this->response);
+    }
+    
+    function testGetRequestWithoutIncidentGivesNoErrors() {
+        $url = new SimpleUrl('http://test:secret@this.com/page.html');
+        $url->addRequestParameters(array('a' => 'A', 'b' => 'B'));
+        
+        $agent = new MockRequestUserAgent();
+        $agent->returns('createHttpRequest', $this->request);
+        $agent->__construct();
+        
+        $response = $agent->fetchResponse(
+                new SimpleUrl('http://test:secret@this.com/page.html'),
+                new SimpleGetEncoding(array('a' => 'A', 'b' => 'B')));
+        $this->assertFalse($response->isError());
+    }
+}
+
+class TestOfAdditionalHeaders extends UnitTestCase {
+    
+    function testAdditionalHeaderAddedToRequest() {
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnReference('getHeaders', new MockSimpleHttpHeaders());
+        
+        $request = new MockSimpleHttpRequest();
+        $request->setReturnReference('fetch', $response);
+        $request->expectOnce(
+                'addHeaderLine',
+                array('User-Agent: SimpleTest'));
+        
+        $agent = new MockRequestUserAgent();
+        $agent->setReturnReference('createHttpRequest', $request);
+        $agent->__construct();
+        $agent->addHeader('User-Agent: SimpleTest');
+        $response = $agent->fetchResponse(new SimpleUrl('http://this.host/'), new SimpleGetEncoding());
+    }
+}
+
+class TestOfBrowserCookies extends UnitTestCase {
+
+    private function createStandardResponse() {
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue("isError", false);
+        $response->setReturnValue("getContent", "stuff");
+        $response->setReturnReference("getHeaders", new MockSimpleHttpHeaders());
+        return $response;
+    }
+    
+    private function createCookieSite($header_lines) {
+        $headers = new SimpleHttpHeaders($header_lines);
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue("isError", false);
+        $response->setReturnReference("getHeaders", $headers);
+        $response->setReturnValue("getContent", "stuff");
+        $request = new MockSimpleHttpRequest();
+        $request->setReturnReference("fetch", $response);
+        return $request;
+    }
+    
+    private function createMockedRequestUserAgent(&$request) {
+        $agent = new MockRequestUserAgent();
+        $agent->setReturnReference('createHttpRequest', $request);
+        $agent->__construct();
+        return $agent;
+    }
+    
+    function testCookieJarIsSentToRequest() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'A');
+        
+        $request = new MockSimpleHttpRequest();
+        $request->returns('fetch', $this->createStandardResponse());
+        $request->expectOnce('readCookiesFromJar', array($jar, '*'));
+        
+        $agent = $this->createMockedRequestUserAgent($request);
+        $agent->setCookie('a', 'A');
+        $agent->fetchResponse(
+                new SimpleUrl('http://this.com/this/path/page.html'),
+                new SimpleGetEncoding());
+    }
+      
+    function testNoCookieJarIsSentToRequestWhenCookiesAreDisabled() {
+        $request = new MockSimpleHttpRequest();
+        $request->returns('fetch', $this->createStandardResponse());
+        $request->expectNever('readCookiesFromJar');
+        
+        $agent = $this->createMockedRequestUserAgent($request);
+        $agent->setCookie('a', 'A');
+        $agent->ignoreCookies();
+        $agent->fetchResponse(
+                new SimpleUrl('http://this.com/this/path/page.html'),
+                new SimpleGetEncoding());
+    }
+  
+    function testReadingNewCookie() {
+        $request = $this->createCookieSite('Set-cookie: a=AAAA');
+        $agent = $this->createMockedRequestUserAgent($request);
+        $agent->fetchResponse(
+                new SimpleUrl('http://this.com/this/path/page.html'),
+                new SimpleGetEncoding());
+        $this->assertEqual($agent->getCookieValue("this.com", "this/path/", "a"), "AAAA");
+    }
+  
+    function testIgnoringNewCookieWhenCookiesDisabled() {
+        $request = $this->createCookieSite('Set-cookie: a=AAAA');
+        $agent = $this->createMockedRequestUserAgent($request);
+        $agent->ignoreCookies();
+        $agent->fetchResponse(
+                new SimpleUrl('http://this.com/this/path/page.html'),
+                new SimpleGetEncoding());
+        $this->assertIdentical($agent->getCookieValue("this.com", "this/path/", "a"), false);
+    }
+   
+    function testOverwriteCookieThatAlreadyExists() {
+        $request = $this->createCookieSite('Set-cookie: a=AAAA');
+        $agent = $this->createMockedRequestUserAgent($request);
+        $agent->setCookie('a', 'A');
+        $agent->fetchResponse(
+                new SimpleUrl('http://this.com/this/path/page.html'),
+                new SimpleGetEncoding());
+        $this->assertEqual($agent->getCookieValue("this.com", "this/path/", "a"), "AAAA");
+    }
+   
+    function testClearCookieBySettingExpiry() {
+        $request = $this->createCookieSite('Set-cookie: a=b');
+        $agent = $this->createMockedRequestUserAgent($request);
+        
+        $agent->setCookie("a", "A", "this/path/", "Wed, 25-Dec-02 04:24:21 GMT");
+        $agent->fetchResponse(
+                new SimpleUrl('http://this.com/this/path/page.html'),
+                new SimpleGetEncoding());
+        $this->assertIdentical(
+                $agent->getCookieValue("this.com", "this/path/", "a"),
+                "b");
+        $agent->restart("Wed, 25-Dec-02 04:24:20 GMT");
+        $this->assertIdentical(
+                $agent->getCookieValue("this.com", "this/path/", "a"),
+                false);
+    }
+    
+    function testAgeingAndClearing() {
+        $request = $this->createCookieSite('Set-cookie: a=A; expires=Wed, 25-Dec-02 04:24:21 GMT; path=/this/path');
+        $agent = $this->createMockedRequestUserAgent($request);
+        
+        $agent->fetchResponse(
+                new SimpleUrl('http://this.com/this/path/page.html'),
+                new SimpleGetEncoding());
+        $agent->restart("Wed, 25-Dec-02 04:24:20 GMT");
+        $this->assertIdentical(
+                $agent->getCookieValue("this.com", "this/path/", "a"),
+                "A");
+        $agent->ageCookies(2);
+        $agent->restart("Wed, 25-Dec-02 04:24:20 GMT");
+        $this->assertIdentical(
+                $agent->getCookieValue("this.com", "this/path/", "a"),
+                false);
+    }
+    
+    function testReadingIncomingAndSettingNewCookies() {
+        $request = $this->createCookieSite('Set-cookie: a=AAA');
+        $agent = $this->createMockedRequestUserAgent($request);
+        
+        $this->assertNull($agent->getBaseCookieValue("a", false));
+        $agent->fetchResponse(
+                new SimpleUrl('http://this.com/this/path/page.html'),
+                new SimpleGetEncoding());
+        $agent->setCookie("b", "BBB", "this.com", "this/path/");
+        $this->assertEqual(
+                $agent->getBaseCookieValue("a", new SimpleUrl('http://this.com/this/path/page.html')),
+                "AAA");
+        $this->assertEqual(
+                $agent->getBaseCookieValue("b", new SimpleUrl('http://this.com/this/path/page.html')),
+                "BBB");
+    }
+}
+
+class TestOfHttpRedirects extends UnitTestCase {
+    
+    function createRedirect($content, $redirect) {
+        $headers = new MockSimpleHttpHeaders();
+        $headers->setReturnValue('isRedirect', (boolean)$redirect);
+        $headers->setReturnValue('getLocation', $redirect);
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getContent', $content);
+        $response->setReturnReference('getHeaders', $headers);
+        $request = new MockSimpleHttpRequest();
+        $request->setReturnReference('fetch', $response);
+        return $request;
+    }
+    
+    function testDisabledRedirects() {
+        $agent = new MockRequestUserAgent();
+        $agent->returns(
+                'createHttpRequest',
+                $this->createRedirect('stuff', 'there.html'));
+        $agent->expectOnce('createHttpRequest');
+        $agent->__construct();
+        $agent->setMaximumRedirects(0);
+        $response = $agent->fetchResponse(new SimpleUrl('here.html'), new SimpleGetEncoding());
+        $this->assertEqual($response->getContent(), 'stuff');
+    }
+    
+    function testSingleRedirect() {
+        $agent = new MockRequestUserAgent();
+        $agent->returnsAt(
+                0,
+                'createHttpRequest',
+                $this->createRedirect('first', 'two.html'));
+        $agent->returnsAt(
+                1,
+                'createHttpRequest',
+                $this->createRedirect('second', 'three.html'));
+        $agent->expectCallCount('createHttpRequest', 2);
+        $agent->__construct();
+        
+        $agent->setMaximumRedirects(1);
+        $response = $agent->fetchResponse(new SimpleUrl('one.html'), new SimpleGetEncoding());
+        $this->assertEqual($response->getContent(), 'second');
+    }
+    
+    function testDoubleRedirect() {
+        $agent = new MockRequestUserAgent();
+        $agent->returnsAt(
+                0,
+                'createHttpRequest',
+                $this->createRedirect('first', 'two.html'));
+        $agent->returnsAt(
+                1,
+                'createHttpRequest',
+                $this->createRedirect('second', 'three.html'));
+        $agent->returnsAt(
+                2,
+                'createHttpRequest',
+                $this->createRedirect('third', 'four.html'));
+        $agent->expectCallCount('createHttpRequest', 3);
+        $agent->__construct();
+        
+        $agent->setMaximumRedirects(2);
+        $response = $agent->fetchResponse(new SimpleUrl('one.html'), new SimpleGetEncoding());
+        $this->assertEqual($response->getContent(), 'third');
+    }
+    
+    function testSuccessAfterRedirect() {
+        $agent = new MockRequestUserAgent();
+        $agent->returnsAt(
+                0,
+                'createHttpRequest',
+                $this->createRedirect('first', 'two.html'));
+        $agent->returnsAt(
+                1,
+                'createHttpRequest',
+                $this->createRedirect('second', false));
+        $agent->returnsAt(
+                2,
+                'createHttpRequest',
+                $this->createRedirect('third', 'four.html'));
+        $agent->expectCallCount('createHttpRequest', 2);
+        $agent->__construct();
+        
+        $agent->setMaximumRedirects(2);
+        $response = $agent->fetchResponse(new SimpleUrl('one.html'), new SimpleGetEncoding());
+        $this->assertEqual($response->getContent(), 'second');
+    }
+    
+    function testRedirectChangesPostToGet() {
+        $agent = new MockRequestUserAgent();
+        $agent->returnsAt(
+                0,
+                'createHttpRequest',
+                $this->createRedirect('first', 'two.html'));
+        $agent->expectAt(0, 'createHttpRequest', array('*', new IsAExpectation('SimplePostEncoding')));
+        $agent->returnsAt(
+                1,
+                'createHttpRequest',
+                $this->createRedirect('second', 'three.html'));
+        $agent->expectAt(1, 'createHttpRequest', array('*', new IsAExpectation('SimpleGetEncoding')));
+        $agent->expectCallCount('createHttpRequest', 2);
+        $agent->__construct();
+        $agent->setMaximumRedirects(1);
+        $response = $agent->fetchResponse(new SimpleUrl('one.html'), new SimplePostEncoding());
+    }
+}
+
+class TestOfBadHosts extends UnitTestCase {
+    
+    private function createSimulatedBadHost() {
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('isError', true);
+        $response->setReturnValue('getError', 'Bad socket');
+        $response->setReturnValue('getContent', false);
+        $request = new MockSimpleHttpRequest();
+        $request->setReturnReference('fetch', $response);
+        return $request;
+    }
+    
+    function testUntestedHost() {
+        $request = $this->createSimulatedBadHost();
+        $agent = new MockRequestUserAgent();
+        $agent->setReturnReference('createHttpRequest', $request);
+        $agent->__construct();
+        $response = $agent->fetchResponse(
+                new SimpleUrl('http://this.host/this/path/page.html'),
+                new SimpleGetEncoding());
+        $this->assertTrue($response->isError());
+    }
+}
+
+class TestOfAuthorisation extends UnitTestCase {
+    
+    function testAuthenticateHeaderAdded() {
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnReference('getHeaders', new MockSimpleHttpHeaders());
+        
+        $request = new MockSimpleHttpRequest();
+        $request->returns('fetch', $response);
+        $request->expectOnce(
+                'addHeaderLine',
+                array('Authorization: Basic ' . base64_encode('test:secret')));
+        
+        $agent = new MockRequestUserAgent();
+        $agent->returns('createHttpRequest', $request);
+        $agent->__construct();
+        $response = $agent->fetchResponse(
+                new SimpleUrl('http://test:secret@this.host'),
+                new SimpleGetEncoding());
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/visual_test.php b/3rdparty/simpletest/test/visual_test.php
new file mode 100755
index 00000000000..6b9d085d67f
--- /dev/null
+++ b/3rdparty/simpletest/test/visual_test.php
@@ -0,0 +1,495 @@
+<?php
+// $Id: visual_test.php 1884 2009-07-01 16:30:40Z lastcraft $
+
+// NOTE:
+// Some of these tests are designed to fail! Do not be alarmed.
+//                         ----------------
+
+// The following tests are a bit hacky. Whilst Kent Beck tried to
+// build a unit tester with a unit tester, I am not that brave.
+// Instead I have just hacked together odd test scripts until
+// I have enough of a tester to procede more formally.
+//
+// The proper tests start in all_tests.php
+require_once('../unit_tester.php');
+require_once('../shell_tester.php');
+require_once('../mock_objects.php');
+require_once('../reporter.php');
+require_once('../xml.php');
+
+class TestDisplayClass {
+    private $a;
+
+    function TestDisplayClass($a) {
+        $this->a = $a;
+    }
+}
+
+class PassingUnitTestCaseOutput extends UnitTestCase {
+
+    function testOfResults() {
+        $this->pass('Pass');
+    }
+
+    function testTrue() {
+        $this->assertTrue(true);
+    }
+
+    function testFalse() {
+        $this->assertFalse(false);
+    }
+
+    function testExpectation() {
+        $expectation = &new EqualExpectation(25, 'My expectation message: %s');
+        $this->assert($expectation, 25, 'My assert message : %s');
+    }
+
+    function testNull() {
+        $this->assertNull(null, "%s -> Pass");
+        $this->assertNotNull(false, "%s -> Pass");
+    }
+
+    function testType() {
+        $this->assertIsA("hello", "string", "%s -> Pass");
+        $this->assertIsA($this, "PassingUnitTestCaseOutput", "%s -> Pass");
+        $this->assertIsA($this, "UnitTestCase", "%s -> Pass");
+    }
+
+    function testTypeEquality() {
+        $this->assertEqual("0", 0, "%s -> Pass");
+    }
+
+    function testNullEquality() {
+        $this->assertNotEqual(null, 1, "%s -> Pass");
+        $this->assertNotEqual(1, null, "%s -> Pass");
+    }
+
+    function testIntegerEquality() {
+        $this->assertNotEqual(1, 2, "%s -> Pass");
+    }
+
+    function testStringEquality() {
+        $this->assertEqual("a", "a", "%s -> Pass");
+        $this->assertNotEqual("aa", "ab", "%s -> Pass");
+    }
+
+    function testHashEquality() {
+        $this->assertEqual(array("a" => "A", "b" => "B"), array("b" => "B", "a" => "A"), "%s -> Pass");
+    }
+
+    function testWithin() {
+        $this->assertWithinMargin(5, 5.4, 0.5, "%s -> Pass");
+    }
+
+    function testOutside() {
+        $this->assertOutsideMargin(5, 5.6, 0.5, "%s -> Pass");
+    }
+
+    function testStringIdentity() {
+        $a = "fred";
+        $b = $a;
+        $this->assertIdentical($a, $b, "%s -> Pass");
+    }
+
+    function testTypeIdentity() {
+        $a = "0";
+        $b = 0;
+        $this->assertNotIdentical($a, $b, "%s -> Pass");
+    }
+
+    function testNullIdentity() {
+        $this->assertNotIdentical(null, 1, "%s -> Pass");
+        $this->assertNotIdentical(1, null, "%s -> Pass");
+    }
+
+    function testHashIdentity() {
+    }
+
+    function testObjectEquality() {
+        $this->assertEqual(new TestDisplayClass(4), new TestDisplayClass(4), "%s -> Pass");
+        $this->assertNotEqual(new TestDisplayClass(4), new TestDisplayClass(5), "%s -> Pass");
+    }
+
+    function testObjectIndentity() {
+        $this->assertIdentical(new TestDisplayClass(false), new TestDisplayClass(false), "%s -> Pass");
+        $this->assertNotIdentical(new TestDisplayClass(false), new TestDisplayClass(0), "%s -> Pass");
+    }
+
+    function testReference() {
+        $a = "fred";
+        $b = &$a;
+        $this->assertReference($a, $b, "%s -> Pass");
+    }
+
+    function testCloneOnDifferentObjects() {
+        $a = "fred";
+        $b = $a;
+        $c = "Hello";
+        $this->assertClone($a, $b, "%s -> Pass");
+    }
+
+    function testPatterns() {
+        $this->assertPattern('/hello/i', "Hello there", "%s -> Pass");
+        $this->assertNoPattern('/hello/', "Hello there", "%s -> Pass");
+    }
+
+    function testLongStrings() {
+        $text = "";
+        for ($i = 0; $i < 10; $i++) {
+            $text .= "0123456789";
+        }
+        $this->assertEqual($text, $text);
+    }
+}
+
+class FailingUnitTestCaseOutput extends UnitTestCase {
+
+    function testOfResults() {
+        $this->fail('Fail');        // Fail.
+    }
+
+    function testTrue() {
+        $this->assertTrue(false);        // Fail.
+    }
+
+    function testFalse() {
+        $this->assertFalse(true);        // Fail.
+    }
+
+    function testExpectation() {
+        $expectation = &new EqualExpectation(25, 'My expectation message: %s');
+        $this->assert($expectation, 24, 'My assert message : %s');        // Fail.
+    }
+
+    function testNull() {
+        $this->assertNull(false, "%s -> Fail");        // Fail.
+        $this->assertNotNull(null, "%s -> Fail");        // Fail.
+    }
+
+    function testType() {
+        $this->assertIsA(14, "string", "%s -> Fail");        // Fail.
+        $this->assertIsA(14, "TestOfUnitTestCaseOutput", "%s -> Fail");        // Fail.
+        $this->assertIsA($this, "TestReporter", "%s -> Fail");        // Fail.
+    }
+
+    function testTypeEquality() {
+        $this->assertNotEqual("0", 0, "%s -> Fail");        // Fail.
+    }
+
+    function testNullEquality() {
+        $this->assertEqual(null, 1, "%s -> Fail");        // Fail.
+        $this->assertEqual(1, null, "%s -> Fail");        // Fail.
+    }
+
+    function testIntegerEquality() {
+        $this->assertEqual(1, 2, "%s -> Fail");        // Fail.
+    }
+
+    function testStringEquality() {
+        $this->assertNotEqual("a", "a", "%s -> Fail");    // Fail.
+        $this->assertEqual("aa", "ab", "%s -> Fail");        // Fail.
+    }
+
+    function testHashEquality() {
+        $this->assertEqual(array("a" => "A", "b" => "B"), array("b" => "B", "a" => "Z"), "%s -> Fail");
+    }
+
+    function testWithin() {
+        $this->assertWithinMargin(5, 5.6, 0.5, "%s -> Fail");   // Fail.
+    }
+
+    function testOutside() {
+        $this->assertOutsideMargin(5, 5.4, 0.5, "%s -> Fail");   // Fail.
+    }
+
+    function testStringIdentity() {
+        $a = "fred";
+        $b = $a;
+        $this->assertNotIdentical($a, $b, "%s -> Fail");       // Fail.
+    }
+
+    function testTypeIdentity() {
+        $a = "0";
+        $b = 0;
+        $this->assertIdentical($a, $b, "%s -> Fail");        // Fail.
+    }
+
+    function testNullIdentity() {
+        $this->assertIdentical(null, 1, "%s -> Fail");        // Fail.
+        $this->assertIdentical(1, null, "%s -> Fail");        // Fail.
+    }
+
+    function testHashIdentity() {
+        $this->assertIdentical(array("a" => "A", "b" => "B"), array("b" => "B", "a" => "A"), "%s -> fail");        // Fail.
+    }
+
+    function testObjectEquality() {
+        $this->assertNotEqual(new TestDisplayClass(4), new TestDisplayClass(4), "%s -> Fail");    // Fail.
+        $this->assertEqual(new TestDisplayClass(4), new TestDisplayClass(5), "%s -> Fail");        // Fail.
+    }
+
+    function testObjectIndentity() {
+        $this->assertNotIdentical(new TestDisplayClass(false), new TestDisplayClass(false), "%s -> Fail");    // Fail.
+        $this->assertIdentical(new TestDisplayClass(false), new TestDisplayClass(0), "%s -> Fail");        // Fail.
+    }
+
+    function testReference() {
+        $a = "fred";
+        $b = &$a;
+        $this->assertClone($a, $b, "%s -> Fail");        // Fail.
+    }
+
+    function testCloneOnDifferentObjects() {
+        $a = "fred";
+        $b = $a;
+        $c = "Hello";
+        $this->assertClone($a, $c, "%s -> Fail");        // Fail.
+    }
+
+    function testPatterns() {
+        $this->assertPattern('/hello/', "Hello there", "%s -> Fail");            // Fail.
+        $this->assertNoPattern('/hello/i', "Hello there", "%s -> Fail");      // Fail.
+    }
+
+    function testLongStrings() {
+        $text = "";
+        for ($i = 0; $i < 10; $i++) {
+            $text .= "0123456789";
+        }
+        $this->assertEqual($text . $text, $text . "a" . $text);        // Fail.
+    }
+}
+
+class Dummy {
+    function Dummy() {
+    }
+
+    function a() {
+    }
+}
+Mock::generate('Dummy');
+
+class TestOfMockObjectsOutput extends UnitTestCase {
+
+    function testCallCounts() {
+        $dummy = &new MockDummy();
+        $dummy->expectCallCount('a', 1, 'My message: %s');
+        $dummy->a();
+        $dummy->a();
+    }
+
+    function testMinimumCallCounts() {
+        $dummy = &new MockDummy();
+        $dummy->expectMinimumCallCount('a', 2, 'My message: %s');
+        $dummy->a();
+        $dummy->a();
+    }
+
+    function testEmptyMatching() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array());
+        $dummy->a();
+        $dummy->a(null);        // Fail.
+    }
+
+    function testEmptyMatchingWithCustomMessage() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array(), 'My expectation message: %s');
+        $dummy->a();
+        $dummy->a(null);        // Fail.
+    }
+
+    function testNullMatching() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array(null));
+        $dummy->a(null);
+        $dummy->a();        // Fail.
+    }
+
+    function testBooleanMatching() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array(true, false));
+        $dummy->a(true, false);
+        $dummy->a(true, true);        // Fail.
+    }
+
+    function testIntegerMatching() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array(32, 33));
+        $dummy->a(32, 33);
+        $dummy->a(32, 34);        // Fail.
+    }
+
+    function testFloatMatching() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array(3.2, 3.3));
+        $dummy->a(3.2, 3.3);
+        $dummy->a(3.2, 3.4);        // Fail.
+    }
+
+    function testStringMatching() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array('32', '33'));
+        $dummy->a('32', '33');
+        $dummy->a('32', '34');        // Fail.
+    }
+
+    function testEmptyMatchingWithCustomExpectationMessage() {
+        $dummy = &new MockDummy();
+        $dummy->expect(
+                'a',
+                array(new EqualExpectation('A', 'My part expectation message: %s')),
+                'My expectation message: %s');
+        $dummy->a('A');
+        $dummy->a('B');        // Fail.
+    }
+
+    function testArrayMatching() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array(array(32), array(33)));
+        $dummy->a(array(32), array(33));
+        $dummy->a(array(32), array('33'));        // Fail.
+    }
+
+    function testObjectMatching() {
+        $a = new Dummy();
+        $a->a = 'a';
+        $b = new Dummy();
+        $b->b = 'b';
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array($a, $b));
+        $dummy->a($a, $b);
+        $dummy->a($a, $a);        // Fail.
+    }
+
+    function testBigList() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array(false, 0, 1, 1.0));
+        $dummy->a(false, 0, 1, 1.0);
+        $dummy->a(true, false, 2, 2.0);        // Fail.
+    }
+}
+
+class TestOfPastBugs extends UnitTestCase {
+
+    function testMixedTypes() {
+        $this->assertEqual(array(), null, "%s -> Pass");
+        $this->assertIdentical(array(), null, "%s -> Fail");    // Fail.
+    }
+
+    function testMockWildcards() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array('*', array(33)));
+        $dummy->a(array(32), array(33));
+        $dummy->a(array(32), array('33'));        // Fail.
+    }
+}
+
+class TestOfVisualShell extends ShellTestCase {
+
+    function testDump() {
+        $this->execute('ls');
+        $this->dumpOutput();
+        $this->execute('dir');
+        $this->dumpOutput();
+    }
+
+    function testDumpOfList() {
+        $this->execute('ls');
+        $this->dump($this->getOutputAsList());
+    }
+}
+
+class PassesAsWellReporter extends HtmlReporter {
+
+    protected function getCss() {
+        return parent::getCss() . ' .pass { color: darkgreen; }';
+    }
+
+    function paintPass($message) {
+        parent::paintPass($message);
+        print "<span class=\"pass\">Pass</span>: ";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print implode(" -&gt; ", $breadcrumb);
+        print " -&gt; " . htmlentities($message) . "<br />\n";
+    }
+
+    function paintSignal($type, &$payload) {
+        print "<span class=\"fail\">$type</span>: ";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print implode(" -&gt; ", $breadcrumb);
+        print " -&gt; " . htmlentities(serialize($payload)) . "<br />\n";
+    }
+}
+
+class TestOfSkippingNoMatterWhat extends UnitTestCase {
+    function skip() {
+        $this->skipIf(true, 'Always skipped -> %s');
+    }
+
+    function testFail() {
+        $this->fail('This really shouldn\'t have happened');
+    }
+}
+
+class TestOfSkippingOrElse extends UnitTestCase {
+    function skip() {
+        $this->skipUnless(false, 'Always skipped -> %s');
+    }
+
+    function testFail() {
+        $this->fail('This really shouldn\'t have happened');
+    }
+}
+
+class TestOfSkippingTwiceOver extends UnitTestCase {
+    function skip() {
+        $this->skipIf(true, 'First reason -> %s');
+        $this->skipIf(true, 'Second reason -> %s');
+    }
+
+    function testFail() {
+        $this->fail('This really shouldn\'t have happened');
+    }
+}
+
+class TestThatShouldNotBeSkipped extends UnitTestCase {
+    function skip() {
+        $this->skipIf(false);
+        $this->skipUnless(true);
+    }
+
+    function testFail() {
+        $this->fail('We should see this message');
+    }
+
+    function testPass() {
+        $this->pass('We should see this message');
+    }
+}
+
+$test = &new TestSuite('Visual test with 46 passes, 47 fails and 0 exceptions');
+$test->add(new PassingUnitTestCaseOutput());
+$test->add(new FailingUnitTestCaseOutput());
+$test->add(new TestOfMockObjectsOutput());
+$test->add(new TestOfPastBugs());
+$test->add(new TestOfVisualShell());
+$test->add(new TestOfSkippingNoMatterWhat());
+$test->add(new TestOfSkippingOrElse());
+$test->add(new TestOfSkippingTwiceOver());
+$test->add(new TestThatShouldNotBeSkipped());
+
+if (isset($_GET['xml']) || in_array('xml', (isset($argv) ? $argv : array()))) {
+    $reporter = new XmlReporter();
+} elseif (TextReporter::inCli()) {
+    $reporter = new TextReporter();
+} else {
+    $reporter = new PassesAsWellReporter();
+}
+if (isset($_GET['dry']) || in_array('dry', (isset($argv) ? $argv : array()))) {
+    $reporter->makeDry();
+}
+exit ($test->run($reporter) ? 0 : 1);
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/web_tester_test.php b/3rdparty/simpletest/test/web_tester_test.php
new file mode 100755
index 00000000000..8c3bf1adf63
--- /dev/null
+++ b/3rdparty/simpletest/test/web_tester_test.php
@@ -0,0 +1,155 @@
+<?php
+// $Id: web_tester_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../web_tester.php');
+
+class TestOfFieldExpectation extends UnitTestCase {
+    
+    function testStringMatchingIsCaseSensitive() {
+        $expectation = new FieldExpectation('a');
+        $this->assertTrue($expectation->test('a'));
+        $this->assertTrue($expectation->test(array('a')));
+        $this->assertFalse($expectation->test('A'));
+    }
+    
+    function testMatchesInteger() {
+        $expectation = new FieldExpectation('1');
+        $this->assertTrue($expectation->test('1'));
+        $this->assertTrue($expectation->test(1));
+        $this->assertTrue($expectation->test(array('1')));
+        $this->assertTrue($expectation->test(array(1)));
+    }
+    
+    function testNonStringFailsExpectation() {
+        $expectation = new FieldExpectation('a');
+        $this->assertFalse($expectation->test(null));
+    }
+    
+    function testUnsetFieldCanBeTestedFor() {
+        $expectation = new FieldExpectation(false);
+        $this->assertTrue($expectation->test(false));
+    }
+    
+    function testMultipleValuesCanBeInAnyOrder() {
+        $expectation = new FieldExpectation(array('a', 'b'));
+        $this->assertTrue($expectation->test(array('a', 'b')));
+        $this->assertTrue($expectation->test(array('b', 'a')));
+        $this->assertFalse($expectation->test(array('a', 'a')));            
+        $this->assertFalse($expectation->test('a'));            
+    }
+    
+    function testSingleItemCanBeArrayOrString() {
+        $expectation = new FieldExpectation(array('a'));
+        $this->assertTrue($expectation->test(array('a')));
+        $this->assertTrue($expectation->test('a'));
+    }
+}
+
+class TestOfHeaderExpectations extends UnitTestCase {
+    
+    function testExpectingOnlyTheHeaderName() {
+        $expectation = new HttpHeaderExpectation('a');
+        $this->assertIdentical($expectation->test(false), false);
+        $this->assertIdentical($expectation->test('a: A'), true);
+        $this->assertIdentical($expectation->test('A: A'), true);
+        $this->assertIdentical($expectation->test('a: B'), true);
+        $this->assertIdentical($expectation->test(' a : A '), true);
+    }
+    
+    function testHeaderValueAsWell() {
+        $expectation = new HttpHeaderExpectation('a', 'A');
+        $this->assertIdentical($expectation->test(false), false);
+        $this->assertIdentical($expectation->test('a: A'), true);
+        $this->assertIdentical($expectation->test('A: A'), true);
+        $this->assertIdentical($expectation->test('A: a'), false);
+        $this->assertIdentical($expectation->test('a: B'), false);
+        $this->assertIdentical($expectation->test(' a : A '), true);
+        $this->assertIdentical($expectation->test(' a : AB '), false);
+    }
+    
+    function testHeaderValueWithColons() {
+        $expectation = new HttpHeaderExpectation('a', 'A:B:C');
+        $this->assertIdentical($expectation->test('a: A'), false);
+        $this->assertIdentical($expectation->test('a: A:B'), false);
+        $this->assertIdentical($expectation->test('a: A:B:C'), true);
+        $this->assertIdentical($expectation->test('a: A:B:C:D'), false);
+    }
+    
+    function testMultilineSearch() {
+        $expectation = new HttpHeaderExpectation('a', 'A');
+        $this->assertIdentical($expectation->test("aa: A\r\nb: B\r\nc: C"), false);
+        $this->assertIdentical($expectation->test("aa: A\r\na: A\r\nb: B"), true);
+    }
+    
+    function testMultilineSearchWithPadding() {
+        $expectation = new HttpHeaderExpectation('a', ' A ');
+        $this->assertIdentical($expectation->test("aa:A\r\nb:B\r\nc:C"), false);
+        $this->assertIdentical($expectation->test("aa:A\r\na:A\r\nb:B"), true);
+    }
+    
+    function testPatternMatching() {
+        $expectation = new HttpHeaderExpectation('a', new PatternExpectation('/A/'));
+        $this->assertIdentical($expectation->test('a: A'), true);
+        $this->assertIdentical($expectation->test('A: A'), true);
+        $this->assertIdentical($expectation->test('A: a'), false);
+        $this->assertIdentical($expectation->test('a: B'), false);
+        $this->assertIdentical($expectation->test(' a : A '), true);
+        $this->assertIdentical($expectation->test(' a : AB '), true);
+    }
+    
+    function testCaseInsensitivePatternMatching() {
+        $expectation = new HttpHeaderExpectation('a', new PatternExpectation('/A/i'));
+        $this->assertIdentical($expectation->test('a: a'), true);
+        $this->assertIdentical($expectation->test('a: B'), false);
+        $this->assertIdentical($expectation->test(' a : A '), true);
+        $this->assertIdentical($expectation->test(' a : BAB '), true);
+        $this->assertIdentical($expectation->test(' a : bab '), true);
+    }
+    
+    function testUnwantedHeader() {
+        $expectation = new NoHttpHeaderExpectation('a');
+        $this->assertIdentical($expectation->test(''), true);
+        $this->assertIdentical($expectation->test('stuff'), true);
+        $this->assertIdentical($expectation->test('b: B'), true);
+        $this->assertIdentical($expectation->test('a: A'), false);
+        $this->assertIdentical($expectation->test('A: A'), false);
+    }
+    
+    function testMultilineUnwantedSearch() {
+        $expectation = new NoHttpHeaderExpectation('a');
+        $this->assertIdentical($expectation->test("aa:A\r\nb:B\r\nc:C"), true);
+        $this->assertIdentical($expectation->test("aa:A\r\na:A\r\nb:B"), false);
+    }
+    
+    function testLocationHeaderSplitsCorrectly() {
+        $expectation = new HttpHeaderExpectation('Location', 'http://here/');
+        $this->assertIdentical($expectation->test('Location: http://here/'), true);
+    }
+}
+
+class TestOfTextExpectations extends UnitTestCase {
+    
+    function testMatchingSubString() {
+        $expectation = new TextExpectation('wanted');
+        $this->assertIdentical($expectation->test(''), false);
+        $this->assertIdentical($expectation->test('Wanted'), false);
+        $this->assertIdentical($expectation->test('wanted'), true);
+        $this->assertIdentical($expectation->test('the wanted text is here'), true);
+    }
+    
+    function testNotMatchingSubString() {
+        $expectation = new NoTextExpectation('wanted');
+        $this->assertIdentical($expectation->test(''), true);
+        $this->assertIdentical($expectation->test('Wanted'), true);
+        $this->assertIdentical($expectation->test('wanted'), false);
+        $this->assertIdentical($expectation->test('the wanted text is here'), false);
+    }
+}
+
+class TestOfGenericAssertionsInWebTester extends WebTestCase {
+    function testEquality() {
+        $this->assertEqual('a', 'a');
+        $this->assertNotEqual('a', 'A');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/xml_test.php b/3rdparty/simpletest/test/xml_test.php
new file mode 100755
index 00000000000..f99e0dcd98b
--- /dev/null
+++ b/3rdparty/simpletest/test/xml_test.php
@@ -0,0 +1,187 @@
+<?php
+// $Id: xml_test.php 1787 2008-04-26 20:35:39Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../xml.php');
+Mock::generate('SimpleScorer');
+
+if (! function_exists('xml_parser_create')) {
+    SimpleTest::ignore('TestOfXmlStructureParsing');
+    SimpleTest::ignore('TestOfXmlResultsParsing');
+}
+
+class TestOfNestingTags extends UnitTestCase {
+    function testGroupSize() {
+        $nesting = new NestingGroupTag(array('SIZE' => 2));
+        $this->assertEqual($nesting->getSize(), 2);
+    }
+}
+
+class TestOfXmlStructureParsing extends UnitTestCase {
+    function testValidXml() {
+        $listener = new MockSimpleScorer();
+        $listener->expectNever('paintGroupStart');
+        $listener->expectNever('paintGroupEnd');
+        $listener->expectNever('paintCaseStart');
+        $listener->expectNever('paintCaseEnd');
+        $parser = new SimpleTestXmlParser($listener);
+        $this->assertTrue($parser->parse("<?xml version=\"1.0\"?>\n"));
+        $this->assertTrue($parser->parse("<run>\n"));
+        $this->assertTrue($parser->parse("</run>\n"));
+    }
+
+    function testEmptyGroup() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintGroupStart', array('a_group', 7));
+        $listener->expectOnce('paintGroupEnd', array('a_group'));
+        $parser = new SimpleTestXmlParser($listener);
+        $parser->parse("<?xml version=\"1.0\"?>\n");
+        $parser->parse("<run>\n");
+        $this->assertTrue($parser->parse("<group size=\"7\">\n"));
+        $this->assertTrue($parser->parse("<name>a_group</name>\n"));
+        $this->assertTrue($parser->parse("</group>\n"));
+        $parser->parse("</run>\n");
+    }
+
+    function testEmptyCase() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintCaseStart', array('a_case'));
+        $listener->expectOnce('paintCaseEnd', array('a_case'));
+        $parser = new SimpleTestXmlParser($listener);
+        $parser->parse("<?xml version=\"1.0\"?>\n");
+        $parser->parse("<run>\n");
+        $this->assertTrue($parser->parse("<case>\n"));
+        $this->assertTrue($parser->parse("<name>a_case</name>\n"));
+        $this->assertTrue($parser->parse("</case>\n"));
+        $parser->parse("</run>\n");
+    }
+
+    function testEmptyMethod() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintCaseStart', array('a_case'));
+        $listener->expectOnce('paintCaseEnd', array('a_case'));
+        $listener->expectOnce('paintMethodStart', array('a_method'));
+        $listener->expectOnce('paintMethodEnd', array('a_method'));
+        $parser = new SimpleTestXmlParser($listener);
+        $parser->parse("<?xml version=\"1.0\"?>\n");
+        $parser->parse("<run>\n");
+        $parser->parse("<case>\n");
+        $parser->parse("<name>a_case</name>\n");
+        $this->assertTrue($parser->parse("<test>\n"));
+        $this->assertTrue($parser->parse("<name>a_method</name>\n"));
+        $this->assertTrue($parser->parse("</test>\n"));
+        $parser->parse("</case>\n");
+        $parser->parse("</run>\n");
+    }
+
+    function testNestedGroup() {
+        $listener = new MockSimpleScorer();
+        $listener->expectAt(0, 'paintGroupStart', array('a_group', 7));
+        $listener->expectAt(1, 'paintGroupStart', array('b_group', 3));
+        $listener->expectCallCount('paintGroupStart', 2);
+        $listener->expectAt(0, 'paintGroupEnd', array('b_group'));
+        $listener->expectAt(1, 'paintGroupEnd', array('a_group'));
+        $listener->expectCallCount('paintGroupEnd', 2);
+
+        $parser = new SimpleTestXmlParser($listener);
+        $parser->parse("<?xml version=\"1.0\"?>\n");
+        $parser->parse("<run>\n");
+
+        $this->assertTrue($parser->parse("<group size=\"7\">\n"));
+        $this->assertTrue($parser->parse("<name>a_group</name>\n"));
+        $this->assertTrue($parser->parse("<group size=\"3\">\n"));
+        $this->assertTrue($parser->parse("<name>b_group</name>\n"));
+        $this->assertTrue($parser->parse("</group>\n"));
+        $this->assertTrue($parser->parse("</group>\n"));
+        $parser->parse("</run>\n");
+    }
+}
+
+class AnyOldSignal {
+    public $stuff = true;
+}
+
+class TestOfXmlResultsParsing extends UnitTestCase {
+
+    function sendValidStart(&$parser) {
+        $parser->parse("<?xml version=\"1.0\"?>\n");
+        $parser->parse("<run>\n");
+        $parser->parse("<case>\n");
+        $parser->parse("<name>a_case</name>\n");
+        $parser->parse("<test>\n");
+        $parser->parse("<name>a_method</name>\n");
+    }
+
+    function sendValidEnd(&$parser) {
+        $parser->parse("</test>\n");
+        $parser->parse("</case>\n");
+        $parser->parse("</run>\n");
+    }
+
+    function testPass() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintPass', array('a_message'));
+        $parser = new SimpleTestXmlParser($listener);
+        $this->sendValidStart($parser);
+        $this->assertTrue($parser->parse("<pass>a_message</pass>\n"));
+        $this->sendValidEnd($parser);
+    }
+
+    function testFail() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintFail', array('a_message'));
+        $parser = new SimpleTestXmlParser($listener);
+        $this->sendValidStart($parser);
+        $this->assertTrue($parser->parse("<fail>a_message</fail>\n"));
+        $this->sendValidEnd($parser);
+    }
+
+    function testException() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintError', array('a_message'));
+        $parser = new SimpleTestXmlParser($listener);
+        $this->sendValidStart($parser);
+        $this->assertTrue($parser->parse("<exception>a_message</exception>\n"));
+        $this->sendValidEnd($parser);
+    }
+
+    function testSkip() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintSkip', array('a_message'));
+        $parser = new SimpleTestXmlParser($listener);
+        $this->sendValidStart($parser);
+        $this->assertTrue($parser->parse("<skip>a_message</skip>\n"));
+        $this->sendValidEnd($parser);
+    }
+
+    function testSignal() {
+        $signal = new AnyOldSignal();
+        $signal->stuff = "Hello";
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintSignal', array('a_signal', $signal));
+        $parser = new SimpleTestXmlParser($listener);
+        $this->sendValidStart($parser);
+        $this->assertTrue($parser->parse(
+                "<signal type=\"a_signal\"><![CDATA[" .
+                serialize($signal) . "]]></signal>\n"));
+        $this->sendValidEnd($parser);
+    }
+
+    function testMessage() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintMessage', array('a_message'));
+        $parser = new SimpleTestXmlParser($listener);
+        $this->sendValidStart($parser);
+        $this->assertTrue($parser->parse("<message>a_message</message>\n"));
+        $this->sendValidEnd($parser);
+    }
+
+    function testFormattedMessage() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintFormattedMessage', array("\na\tmessage\n"));
+        $parser = new SimpleTestXmlParser($listener);
+        $this->sendValidStart($parser);
+        $this->assertTrue($parser->parse("<formatted><![CDATA[\na\tmessage\n]]></formatted>\n"));
+        $this->sendValidEnd($parser);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test_case.php b/3rdparty/simpletest/test_case.php
new file mode 100644
index 00000000000..ba023c3b2ea
--- /dev/null
+++ b/3rdparty/simpletest/test_case.php
@@ -0,0 +1,658 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: test_case.php 2012 2011-04-29 08:57:00Z pp11 $
+ */
+
+/**#@+
+ * Includes SimpleTest files and defined the root constant
+ * for dependent libraries.
+ */
+require_once(dirname(__FILE__) . '/invoker.php');
+require_once(dirname(__FILE__) . '/errors.php');
+require_once(dirname(__FILE__) . '/compatibility.php');
+require_once(dirname(__FILE__) . '/scorer.php');
+require_once(dirname(__FILE__) . '/expectation.php');
+require_once(dirname(__FILE__) . '/dumper.php');
+require_once(dirname(__FILE__) . '/simpletest.php');
+require_once(dirname(__FILE__) . '/exceptions.php');
+require_once(dirname(__FILE__) . '/reflection_php5.php');
+/**#@-*/
+if (! defined('SIMPLE_TEST')) {
+    /**
+     * @ignore
+     */
+    define('SIMPLE_TEST', dirname(__FILE__) . DIRECTORY_SEPARATOR);
+}
+
+/**
+ *    Basic test case. This is the smallest unit of a test
+ *    suite. It searches for
+ *    all methods that start with the the string "test" and
+ *    runs them. Working test cases extend this class.
+ *    @package      SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleTestCase {
+    private $label = false;
+    protected $reporter;
+    private $observers;
+    private $should_skip = false;
+
+    /**
+     *    Sets up the test with no display.
+     *    @param string $label    If no test name is given then
+     *                            the class name is used.
+     *    @access public
+     */
+    function __construct($label = false) {
+        if ($label) {
+            $this->label = $label;
+        }
+    }
+
+    /**
+     *    Accessor for the test name for subclasses.
+     *    @return string           Name of the test.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->label ? $this->label : get_class($this);
+    }
+
+    /**
+     *    This is a placeholder for skipping tests. In this
+     *    method you place skipIf() and skipUnless() calls to
+     *    set the skipping state.
+     *    @access public
+     */
+    function skip() {
+    }
+
+    /**
+     *    Will issue a message to the reporter and tell the test
+     *    case to skip if the incoming flag is true.
+     *    @param string $should_skip    Condition causing the tests to be skipped.
+     *    @param string $message        Text of skip condition.
+     *    @access public
+     */
+    function skipIf($should_skip, $message = '%s') {
+        if ($should_skip && ! $this->should_skip) {
+            $this->should_skip = true;
+            $message = sprintf($message, 'Skipping [' . get_class($this) . ']');
+            $this->reporter->paintSkip($message . $this->getAssertionLine());
+        }
+    }
+
+    /**
+     *    Accessor for the private variable $_shoud_skip
+     *    @access public
+     */
+    function shouldSkip() {
+        return $this->should_skip;
+    }
+
+    /**
+     *    Will issue a message to the reporter and tell the test
+     *    case to skip if the incoming flag is false.
+     *    @param string $shouldnt_skip  Condition causing the tests to be run.
+     *    @param string $message        Text of skip condition.
+     *    @access public
+     */
+    function skipUnless($shouldnt_skip, $message = false) {
+        $this->skipIf(! $shouldnt_skip, $message);
+    }
+
+    /**
+     *    Used to invoke the single tests.
+     *    @return SimpleInvoker        Individual test runner.
+     *    @access public
+     */
+    function createInvoker() {
+        return new SimpleErrorTrappingInvoker(
+                new SimpleExceptionTrappingInvoker(new SimpleInvoker($this)));
+    }
+
+    /**
+     *    Uses reflection to run every method within itself
+     *    starting with the string "test" unless a method
+     *    is specified.
+     *    @param SimpleReporter $reporter    Current test reporter.
+     *    @return boolean                    True if all tests passed.
+     *    @access public
+     */
+    function run($reporter) {
+        $context = SimpleTest::getContext();
+        $context->setTest($this);
+        $context->setReporter($reporter);
+        $this->reporter = $reporter;
+        $started = false;
+        foreach ($this->getTests() as $method) {
+            if ($reporter->shouldInvoke($this->getLabel(), $method)) {
+                $this->skip();
+                if ($this->should_skip) {
+                    break;
+                }
+                if (! $started) {
+                    $reporter->paintCaseStart($this->getLabel());
+                    $started = true;
+                }
+                $invoker = $this->reporter->createInvoker($this->createInvoker());
+                $invoker->before($method);
+                $invoker->invoke($method);
+                $invoker->after($method);
+            }
+        }
+        if ($started) {
+            $reporter->paintCaseEnd($this->getLabel());
+        }
+        unset($this->reporter);
+        $context->setTest(null);
+        return $reporter->getStatus();
+    }
+
+    /**
+     *    Gets a list of test names. Normally that will
+     *    be all internal methods that start with the
+     *    name "test". This method should be overridden
+     *    if you want a different rule.
+     *    @return array        List of test names.
+     *    @access public
+     */
+    function getTests() {
+        $methods = array();
+        foreach (get_class_methods(get_class($this)) as $method) {
+            if ($this->isTest($method)) {
+                $methods[] = $method;
+            }
+        }
+        return $methods;
+    }
+
+    /**
+     *    Tests to see if the method is a test that should
+     *    be run. Currently any method that starts with 'test'
+     *    is a candidate unless it is the constructor.
+     *    @param string $method        Method name to try.
+     *    @return boolean              True if test method.
+     *    @access protected
+     */
+    protected function isTest($method) {
+        if (strtolower(substr($method, 0, 4)) == 'test') {
+            return ! SimpleTestCompatibility::isA($this, strtolower($method));
+        }
+        return false;
+    }
+
+    /**
+     *    Announces the start of the test.
+     *    @param string $method    Test method just started.
+     *    @access public
+     */
+    function before($method) {
+        $this->reporter->paintMethodStart($method);
+        $this->observers = array();
+    }
+
+    /**
+     *    Sets up unit test wide variables at the start
+     *    of each test method. To be overridden in
+     *    actual user test cases.
+     *    @access public
+     */
+    function setUp() {
+    }
+
+    /**
+     *    Clears the data set in the setUp() method call.
+     *    To be overridden by the user in actual user test cases.
+     *    @access public
+     */
+    function tearDown() {
+    }
+
+    /**
+     *    Announces the end of the test. Includes private clean up.
+     *    @param string $method    Test method just finished.
+     *    @access public
+     */
+    function after($method) {
+        for ($i = 0; $i < count($this->observers); $i++) {
+            $this->observers[$i]->atTestEnd($method, $this);
+        }
+        $this->reporter->paintMethodEnd($method);
+    }
+
+    /**
+     *    Sets up an observer for the test end.
+     *    @param object $observer    Must have atTestEnd()
+     *                               method.
+     *    @access public
+     */
+    function tell($observer) {
+        $this->observers[] = &$observer;
+    }
+
+    /**
+     *    @deprecated
+     */
+    function pass($message = "Pass") {
+        if (! isset($this->reporter)) {
+            trigger_error('Can only make assertions within test methods');
+        }
+        $this->reporter->paintPass(
+                $message . $this->getAssertionLine());
+        return true;
+    }
+
+    /**
+     *    Sends a fail event with a message.
+     *    @param string $message        Message to send.
+     *    @access public
+     */
+    function fail($message = "Fail") {
+        if (! isset($this->reporter)) {
+            trigger_error('Can only make assertions within test methods');
+        }
+        $this->reporter->paintFail(
+                $message . $this->getAssertionLine());
+        return false;
+    }
+
+    /**
+     *    Formats a PHP error and dispatches it to the
+     *    reporter.
+     *    @param integer $severity  PHP error code.
+     *    @param string $message    Text of error.
+     *    @param string $file       File error occoured in.
+     *    @param integer $line      Line number of error.
+     *    @access public
+     */
+    function error($severity, $message, $file, $line) {
+        if (! isset($this->reporter)) {
+            trigger_error('Can only make assertions within test methods');
+        }
+        $this->reporter->paintError(
+                "Unexpected PHP error [$message] severity [$severity] in [$file line $line]");
+    }
+
+    /**
+     *    Formats an exception and dispatches it to the
+     *    reporter.
+     *    @param Exception $exception    Object thrown.
+     *    @access public
+     */
+    function exception($exception) {
+        $this->reporter->paintException($exception);
+    }
+
+    /**
+     *    For user defined expansion of the available messages.
+     *    @param string $type       Tag for sorting the signals.
+     *    @param mixed $payload     Extra user specific information.
+     */
+    function signal($type, $payload) {
+        if (! isset($this->reporter)) {
+            trigger_error('Can only make assertions within test methods');
+        }
+        $this->reporter->paintSignal($type, $payload);
+    }
+
+    /**
+     *    Runs an expectation directly, for extending the
+     *    tests with new expectation classes.
+     *    @param SimpleExpectation $expectation  Expectation subclass.
+     *    @param mixed $compare               Value to compare.
+     *    @param string $message                 Message to display.
+     *    @return boolean                        True on pass
+     *    @access public
+     */
+    function assert($expectation, $compare, $message = '%s') {
+        if ($expectation->test($compare)) {
+            return $this->pass(sprintf(
+                    $message,
+                    $expectation->overlayMessage($compare, $this->reporter->getDumper())));
+        } else {
+            return $this->fail(sprintf(
+                    $message,
+                    $expectation->overlayMessage($compare, $this->reporter->getDumper())));
+        }
+    }
+
+    /**
+     *    Uses a stack trace to find the line of an assertion.
+     *    @return string           Line number of first assert*
+     *                             method embedded in format string.
+     *    @access public
+     */
+    function getAssertionLine() {
+        $trace = new SimpleStackTrace(array('assert', 'expect', 'pass', 'fail', 'skip'));
+        return $trace->traceMethod();
+    }
+
+    /**
+     *    Sends a formatted dump of a variable to the
+     *    test suite for those emergency debugging
+     *    situations.
+     *    @param mixed $variable    Variable to display.
+     *    @param string $message    Message to display.
+     *    @return mixed             The original variable.
+     *    @access public
+     */
+    function dump($variable, $message = false) {
+        $dumper = $this->reporter->getDumper();
+        $formatted = $dumper->dump($variable);
+        if ($message) {
+            $formatted = $message . "\n" . $formatted;
+        }
+        $this->reporter->paintFormattedMessage($formatted);
+        return $variable;
+    }
+
+    /**
+     *    Accessor for the number of subtests including myelf.
+     *    @return integer           Number of test cases.
+     *    @access public
+     */
+    function getSize() {
+        return 1;
+    }
+}
+
+/**
+ *  Helps to extract test cases automatically from a file.
+ *    @package      SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleFileLoader {
+
+    /**
+     *    Builds a test suite from a library of test cases.
+     *    The new suite is composed into this one.
+     *    @param string $test_file        File name of library with
+     *                                    test case classes.
+     *    @return TestSuite               The new test suite.
+     *    @access public
+     */
+    function load($test_file) {
+        $existing_classes = get_declared_classes();
+        $existing_globals = get_defined_vars();
+        include_once($test_file);
+        $new_globals = get_defined_vars();
+        $this->makeFileVariablesGlobal($existing_globals, $new_globals);
+        $new_classes = array_diff(get_declared_classes(), $existing_classes);
+        if (empty($new_classes)) {
+            $new_classes = $this->scrapeClassesFromFile($test_file);
+        }
+        $classes = $this->selectRunnableTests($new_classes);
+        return $this->createSuiteFromClasses($test_file, $classes);
+    }
+
+    /**
+     *    Imports new variables into the global namespace.
+     *    @param hash $existing   Variables before the file was loaded.
+     *    @param hash $new        Variables after the file was loaded.
+     *    @access private
+     */
+    protected function makeFileVariablesGlobal($existing, $new) {
+        $globals = array_diff(array_keys($new), array_keys($existing));
+        foreach ($globals as $global) {
+            $GLOBALS[$global] = $new[$global];
+        }
+    }
+
+    /**
+     *    Lookup classnames from file contents, in case the
+     *    file may have been included before.
+     *    Note: This is probably too clever by half. Figuring this
+     *    out after a failed test case is going to be tricky for us,
+     *    never mind the user. A test case should not be included
+     *    twice anyway.
+     *    @param string $test_file        File name with classes.
+     *    @access private
+     */
+    protected function scrapeClassesFromFile($test_file) {
+        preg_match_all('~^\s*class\s+(\w+)(\s+(extends|implements)\s+\w+)*\s*\{~mi',
+                        file_get_contents($test_file),
+                        $matches );
+        return $matches[1];
+    }
+
+    /**
+     *    Calculates the incoming test cases. Skips abstract
+     *    and ignored classes.
+     *    @param array $candidates   Candidate classes.
+     *    @return array              New classes which are test
+     *                               cases that shouldn't be ignored.
+     *    @access public
+     */
+    function selectRunnableTests($candidates) {
+        $classes = array();
+        foreach ($candidates as $class) {
+            if (TestSuite::getBaseTestCase($class)) {
+                $reflection = new SimpleReflection($class);
+                if ($reflection->isAbstract()) {
+                    SimpleTest::ignore($class);
+                } else {
+                    $classes[] = $class;
+                }
+            }
+        }
+        return $classes;
+    }
+
+    /**
+     *    Builds a test suite from a class list.
+     *    @param string $title       Title of new group.
+     *    @param array $classes      Test classes.
+     *    @return TestSuite          Group loaded with the new
+     *                               test cases.
+     *    @access public
+     */
+    function createSuiteFromClasses($title, $classes) {
+        if (count($classes) == 0) {
+            $suite = new BadTestSuite($title, "No runnable test cases in [$title]");
+            return $suite;
+        }
+        SimpleTest::ignoreParentsIfIgnored($classes);
+        $suite = new TestSuite($title);
+        foreach ($classes as $class) {
+            if (! SimpleTest::isIgnored($class)) {
+                $suite->add($class);
+            }
+        }
+        return $suite;
+    }
+}
+
+/**
+ *    This is a composite test class for combining
+ *    test cases and other RunnableTest classes into
+ *    a group test.
+ *    @package      SimpleTest
+ *    @subpackage   UnitTester
+ */
+class TestSuite {
+    private $label;
+    private $test_cases;
+
+    /**
+     *    Sets the name of the test suite.
+     *    @param string $label    Name sent at the start and end
+     *                            of the test.
+     *    @access public
+     */
+    function TestSuite($label = false) {
+        $this->label = $label;
+        $this->test_cases = array();
+    }
+
+    /**
+     *    Accessor for the test name for subclasses. If the suite
+     *    wraps a single test case the label defaults to the name of that test.
+     *    @return string           Name of the test.
+     *    @access public
+     */
+    function getLabel() {
+        if (! $this->label) {
+            return ($this->getSize() == 1) ?
+                    get_class($this->test_cases[0]) : get_class($this);
+        } else {
+            return $this->label;
+        }
+    }
+
+    /**
+     *    Adds a test into the suite by instance or class. The class will
+     *    be instantiated if it's a test suite.
+     *    @param SimpleTestCase $test_case  Suite or individual test
+     *                                      case implementing the
+     *                                      runnable test interface.
+     *    @access public
+     */
+    function add($test_case) {
+        if (! is_string($test_case)) {
+            $this->test_cases[] = $test_case;
+        } elseif (TestSuite::getBaseTestCase($test_case) == 'testsuite') {
+            $this->test_cases[] = new $test_case();
+        } else {
+            $this->test_cases[] = $test_case;
+        }
+    }
+
+    /**
+     *    Builds a test suite from a library of test cases.
+     *    The new suite is composed into this one.
+     *    @param string $test_file        File name of library with
+     *                                    test case classes.
+     *    @access public
+     */
+    function addFile($test_file) {
+        $extractor = new SimpleFileLoader();
+        $this->add($extractor->load($test_file));
+    }
+
+    /**
+     *    Delegates to a visiting collector to add test
+     *    files.
+     *    @param string $path                  Path to scan from.
+     *    @param SimpleCollector $collector    Directory scanner.
+     *    @access public
+     */
+    function collect($path, $collector) {
+        $collector->collect($this, $path);
+    }
+
+    /**
+     *    Invokes run() on all of the held test cases, instantiating
+     *    them if necessary.
+     *    @param SimpleReporter $reporter    Current test reporter.
+     *    @access public
+     */
+    function run($reporter) {
+        $reporter->paintGroupStart($this->getLabel(), $this->getSize());
+        for ($i = 0, $count = count($this->test_cases); $i < $count; $i++) {
+            if (is_string($this->test_cases[$i])) {
+                $class = $this->test_cases[$i];
+                $test = new $class();
+                $test->run($reporter);
+                unset($test);
+            } else {
+                $this->test_cases[$i]->run($reporter);
+            }
+        }
+        $reporter->paintGroupEnd($this->getLabel());
+        return $reporter->getStatus();
+    }
+
+    /**
+     *    Number of contained test cases.
+     *    @return integer     Total count of cases in the group.
+     *    @access public
+     */
+    function getSize() {
+        $count = 0;
+        foreach ($this->test_cases as $case) {
+            if (is_string($case)) {
+                if (! SimpleTest::isIgnored($case)) {
+                    $count++;
+                }
+            } else {
+                $count += $case->getSize();
+            }
+        }
+        return $count;
+    }
+
+    /**
+     *    Test to see if a class is derived from the
+     *    SimpleTestCase class.
+     *    @param string $class     Class name.
+     *    @access public
+     */
+    static function getBaseTestCase($class) {
+        while ($class = get_parent_class($class)) {
+            $class = strtolower($class);
+            if ($class == 'simpletestcase' || $class == 'testsuite') {
+                return $class;
+            }
+        }
+        return false;
+    }
+}
+
+/**
+ *    This is a failing group test for when a test suite hasn't
+ *    loaded properly.
+ *    @package      SimpleTest
+ *    @subpackage   UnitTester
+ */
+class BadTestSuite {
+    private $label;
+    private $error;
+
+    /**
+     *    Sets the name of the test suite and error message.
+     *    @param string $label    Name sent at the start and end
+     *                            of the test.
+     *    @access public
+     */
+    function BadTestSuite($label, $error) {
+        $this->label = $label;
+        $this->error = $error;
+    }
+
+    /**
+     *    Accessor for the test name for subclasses.
+     *    @return string           Name of the test.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->label;
+    }
+
+    /**
+     *    Sends a single error to the reporter.
+     *    @param SimpleReporter $reporter    Current test reporter.
+     *    @access public
+     */
+    function run($reporter) {
+        $reporter->paintGroupStart($this->getLabel(), $this->getSize());
+        $reporter->paintFail('Bad TestSuite [' . $this->getLabel() .
+                '] with error [' . $this->error . ']');
+        $reporter->paintGroupEnd($this->getLabel());
+        return $reporter->getStatus();
+    }
+
+    /**
+     *    Number of contained test cases. Always zero.
+     *    @return integer     Total count of cases in the group.
+     *    @access public
+     */
+    function getSize() {
+        return 0;
+    }
+}
+?>
diff --git a/3rdparty/simpletest/tidy_parser.php b/3rdparty/simpletest/tidy_parser.php
new file mode 100755
index 00000000000..3d8b4b2ac7d
--- /dev/null
+++ b/3rdparty/simpletest/tidy_parser.php
@@ -0,0 +1,382 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: php_parser.php 1911 2009-07-29 16:38:04Z lastcraft $
+ */
+
+/**
+ *    Builds the page object.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTidyPageBuilder {
+    private $page;
+    private $forms = array();
+    private $labels = array();
+    private $widgets_by_id = array();
+
+    public function __destruct() {
+        $this->free();
+    }
+
+    /**
+     *    Frees up any references so as to allow the PHP garbage
+     *    collection from unset() to work.
+     */
+    private function free() {
+        unset($this->page);
+        $this->forms = array();
+        $this->labels = array();
+    }
+
+    /**
+     *    This builder is only available if the 'tidy' extension is loaded.
+     *    @return boolean       True if available.
+     */
+    function can() {
+        return extension_loaded('tidy');
+    }
+
+    /**
+     *    Reads the raw content the page using HTML Tidy.
+     *    @param $response SimpleHttpResponse  Fetched response.
+     *    @return SimplePage                   Newly parsed page.
+     */
+    function parse($response) {
+        $this->page = new SimplePage($response);
+        $tidied = tidy_parse_string($input = $this->insertGuards($response->getContent()),
+                                    array('output-xml' => false, 'wrap' => '0', 'indent' => 'no'),
+                                    'latin1');
+        $this->walkTree($tidied->html());
+        $this->attachLabels($this->widgets_by_id, $this->labels);
+        $this->page->setForms($this->forms);
+        $page = $this->page;
+        $this->free();
+        return $page;
+    }
+
+    /**
+     *    Stops HTMLTidy stripping content that we wish to preserve.
+     *    @param string      The raw html.
+     *    @return string     The html with guard tags inserted.
+     */
+    private function insertGuards($html) {
+        return $this->insertEmptyTagGuards($this->insertTextareaSimpleWhitespaceGuards($html));
+    }
+
+    /**
+     *    Removes the extra content added during the parse stage
+     *    in order to preserve content we don't want stripped
+     *    out by HTMLTidy.
+     *    @param string      The raw html.
+     *    @return string     The html with guard tags removed.
+     */
+    private function stripGuards($html) {
+        return $this->stripTextareaWhitespaceGuards($this->stripEmptyTagGuards($html));
+    }
+
+    /**
+     *    HTML tidy strips out empty tags such as <option> which we
+     *    need to preserve. This method inserts an additional marker.
+     *    @param string      The raw html.
+     *    @return string     The html with guards inserted.
+     */
+    private function insertEmptyTagGuards($html) {
+        return preg_replace('#<(option|textarea)([^>]*)>(\s*)</(option|textarea)>#is',
+                            '<\1\2>___EMPTY___\3</\4>',
+                            $html);
+    }
+
+    /**
+     *    HTML tidy strips out empty tags such as <option> which we
+     *    need to preserve. This method strips additional markers
+     *    inserted by SimpleTest to the tidy output used to make the
+     *    tags non-empty. This ensures their preservation.
+     *    @param string      The raw html.
+     *    @return string     The html with guards removed.
+     */
+    private function stripEmptyTagGuards($html) {
+        return preg_replace('#(^|>)(\s*)___EMPTY___(\s*)(</|$)#i', '\2\3', $html);
+    }
+
+    /**
+     *    By parsing the XML output of tidy, we lose some whitespace
+     *    information in textarea tags. We temporarily recode this
+     *    data ourselves so as not to lose it.
+     *    @param string      The raw html.
+     *    @return string     The html with guards inserted.
+     */
+    private function insertTextareaSimpleWhitespaceGuards($html) {
+        return preg_replace_callback('#<textarea([^>]*)>(.*?)</textarea>#is',
+                                     array($this, 'insertWhitespaceGuards'),
+                                     $html);
+    }
+
+    /**
+     *  Callback for insertTextareaSimpleWhitespaceGuards().
+     *  @param array $matches       Result of preg_replace_callback().
+     *  @return string              Guard tags now replace whitespace.
+     */
+    private function insertWhitespaceGuards($matches) {
+        return '<textarea' . $matches[1] . '>' .
+                str_replace(array("\n", "\r", "\t", ' '),
+                            array('___NEWLINE___', '___CR___', '___TAB___', '___SPACE___'),
+                            $matches[2]) .
+                '</textarea>';
+    }
+
+    /**
+     *    Removes the whitespace preserving guards we added
+     *    before parsing.
+     *    @param string      The raw html.
+     *    @return string     The html with guards removed.
+     */
+    private function stripTextareaWhitespaceGuards($html) {
+        return str_replace(array('___NEWLINE___', '___CR___', '___TAB___', '___SPACE___'),
+                           array("\n", "\r", "\t", ' '),
+                           $html);
+    }
+
+    /**
+     *  Visits the given node and all children
+     *  @param object $node      Tidy XML node.
+     */
+    private function walkTree($node) {
+        if ($node->name == 'a') {
+            $this->page->addLink($this->tags()->createTag($node->name, (array)$node->attribute)
+                                        ->addContent($this->innerHtml($node)));
+        } elseif ($node->name == 'base' and isset($node->attribute['href'])) {
+            $this->page->setBase($node->attribute['href']);
+        } elseif ($node->name == 'title') {
+            $this->page->setTitle($this->tags()->createTag($node->name, (array)$node->attribute)
+                                         ->addContent($this->innerHtml($node)));
+        } elseif ($node->name == 'frameset') {
+            $this->page->setFrames($this->collectFrames($node));
+        } elseif ($node->name == 'form') {
+            $this->forms[] = $this->walkForm($node, $this->createEmptyForm($node));
+        } elseif ($node->name == 'label') {
+            $this->labels[] = $this->tags()->createTag($node->name, (array)$node->attribute)
+                                           ->addContent($this->innerHtml($node));
+        } else {
+            $this->walkChildren($node);
+        }
+    }
+
+    /**
+     *  Helper method for traversing the XML tree.
+     *  @param object $node     Tidy XML node.
+     */
+    private function walkChildren($node) {
+        if ($node->hasChildren()) {
+            foreach ($node->child as $child) {
+                $this->walkTree($child);
+            }
+        }
+    }
+
+    /**
+     *  Facade for forms containing preparsed widgets.
+     *  @param object $node     Tidy XML node.
+     *  @return SimpleForm      Facade for SimpleBrowser.
+     */
+    private function createEmptyForm($node) {
+        return new SimpleForm($this->tags()->createTag($node->name, (array)$node->attribute), $this->page);
+    }
+
+    /**
+     *  Visits the given node and all children
+     *  @param object $node      Tidy XML node.
+     */
+    private function walkForm($node, $form, $enclosing_label = '') {
+        if ($node->name == 'a') {
+            $this->page->addLink($this->tags()->createTag($node->name, (array)$node->attribute)
+                                              ->addContent($this->innerHtml($node)));
+        } elseif (in_array($node->name, array('input', 'button', 'textarea', 'select'))) {
+            $this->addWidgetToForm($node, $form, $enclosing_label);
+        } elseif ($node->name == 'label') {
+            $this->labels[] = $this->tags()->createTag($node->name, (array)$node->attribute)
+                                           ->addContent($this->innerHtml($node));
+            if ($node->hasChildren()) {
+                foreach ($node->child as $child) {
+                    $this->walkForm($child, $form, SimplePage::normalise($this->innerHtml($node)));
+                }
+            }
+        } elseif ($node->hasChildren()) {
+            foreach ($node->child as $child) {
+                $this->walkForm($child, $form);
+            }
+        }
+        return $form;
+    }
+
+    /**
+     *  Tests a node for a "for" atribute. Used for
+     *  attaching labels.
+     *  @param object $node      Tidy XML node.
+     *  @return boolean          True if the "for" attribute exists.
+     */
+    private function hasFor($node) {
+        return isset($node->attribute) and $node->attribute['for'];
+    }
+
+    /**
+     *  Adds the widget into the form container.
+     *  @param object $node             Tidy XML node of widget.
+     *  @param SimpleForm $form         Form to add it to.
+     *  @param string $enclosing_label  The label of any label
+     *                                  tag we might be in.
+     */
+    private function addWidgetToForm($node, $form, $enclosing_label) {
+        $widget = $this->tags()->createTag($node->name, $this->attributes($node));
+        if (! $widget) {
+            return;
+        }
+        $widget->setLabel($enclosing_label)
+               ->addContent($this->innerHtml($node));
+        if ($node->name == 'select') {
+            $widget->addTags($this->collectSelectOptions($node));
+        }
+        $form->addWidget($widget);
+        $this->indexWidgetById($widget);
+    }
+
+    /**
+     *  Fills the widget cache to speed up searching.
+     *  @param SimpleTag $widget    Parsed widget to cache.
+     */
+    private function indexWidgetById($widget) {
+        $id = $widget->getAttribute('id');
+        if (! $id) {
+            return;
+        }
+        if (! isset($this->widgets_by_id[$id])) {
+            $this->widgets_by_id[$id] = array();
+        }
+        $this->widgets_by_id[$id][] = $widget;
+    }
+
+    /**
+     *  Parses the options from inside an XML select node.
+     *  @param object $node      Tidy XML node.
+     *  @return array            List of SimpleTag options.
+     */
+    private function collectSelectOptions($node) {
+        $options = array();
+        if ($node->name == 'option') {
+            $options[] = $this->tags()->createTag($node->name, $this->attributes($node))
+                                      ->addContent($this->innerHtml($node));
+        }
+        if ($node->hasChildren()) {
+            foreach ($node->child as $child) {
+                $options = array_merge($options, $this->collectSelectOptions($child));
+            }
+        }
+        return $options;
+    }
+
+    /**
+     *  Convenience method for collecting all the attributes
+     *  of a tag. Not sure why Tidy does not have this.
+     *  @param object $node      Tidy XML node.
+     *  @return array            Hash of attribute strings.
+     */
+    private function attributes($node) {
+        if (! preg_match('|<[^ ]+\s(.*?)/?>|s', $node->value, $first_tag_contents)) {
+            return array();
+        }
+        $attributes = array();
+        preg_match_all('/\S+\s*=\s*\'[^\']*\'|(\S+\s*=\s*"[^"]*")|([^ =]+\s*=\s*[^ "\']+?)|[^ "\']+/', $first_tag_contents[1], $matches);
+        foreach($matches[0] as $unparsed) {
+            $attributes = $this->mergeAttribute($attributes, $unparsed);
+        }
+        return $attributes;
+    }
+
+    /**
+     *  Overlay an attribute into the attributes hash.
+     *  @param array $attributes        Current attribute list.
+     *  @param string $raw              Raw attribute string with
+     *                                  both key and value.
+     *  @return array                   New attribute hash.
+     */
+    private function mergeAttribute($attributes, $raw) {
+        $parts = explode('=', $raw);
+        list($name, $value) = count($parts) == 1 ? array($parts[0], $parts[0]) : $parts;
+        $attributes[trim($name)] = html_entity_decode($this->dequote(trim($value)), ENT_QUOTES);
+        return $attributes;
+    }
+
+    /**
+     *  Remove start and end quotes.
+     *  @param string $quoted    A quoted string.
+     *  @return string           Quotes are gone.
+     */
+    private function dequote($quoted) {
+        if (preg_match('/^(\'([^\']*)\'|"([^"]*)")$/', $quoted, $matches)) {
+            return isset($matches[3]) ? $matches[3] : $matches[2];
+        }
+        return $quoted;
+    }
+
+    /**
+     *  Collects frame information inside a frameset tag.
+     *  @param object $node     Tidy XML node.
+     *  @return array           List of SimpleTag frame descriptions.
+     */
+    private function collectFrames($node) {
+        $frames = array();
+        if ($node->name == 'frame') {
+            $frames = array($this->tags()->createTag($node->name, (array)$node->attribute));
+        } else if ($node->hasChildren()) {
+            $frames = array();
+            foreach ($node->child as $child) {
+                $frames = array_merge($frames, $this->collectFrames($child));
+            }
+        }
+        return $frames;
+    }
+
+    /**
+     *  Extracts the XML node text.
+     *  @param object $node     Tidy XML node.
+     *  @return string          The text only.
+     */
+    private function innerHtml($node) {
+        $raw = '';
+        if ($node->hasChildren()) {
+            foreach ($node->child as $child) {
+                $raw .= $child->value;
+            }
+        }
+        return $this->stripGuards($raw);
+    }
+
+    /**
+     *  Factory for parsed content holders.
+     *  @return SimpleTagBuilder    Factory.
+     */
+    private function tags() {
+        return new SimpleTagBuilder();
+    }
+
+    /**
+     *  Called at the end of a parse run. Attaches any
+     *  non-wrapping labels to their form elements.
+     *  @param array $widgets_by_id     Cached SimpleTag hash.
+     *  @param array $labels            SimpleTag label elements.
+     */
+    private function attachLabels($widgets_by_id, $labels) {
+        foreach ($labels as $label) {
+            $for = $label->getFor();
+            if ($for and isset($widgets_by_id[$for])) {
+                $text = $label->getText();
+                foreach ($widgets_by_id[$for] as $widget) {
+                    $widget->setLabel($text);
+                }
+            }
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/unit_tester.php b/3rdparty/simpletest/unit_tester.php
new file mode 100755
index 00000000000..ce82660afa2
--- /dev/null
+++ b/3rdparty/simpletest/unit_tester.php
@@ -0,0 +1,413 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: unit_tester.php 1882 2009-07-01 14:30:05Z lastcraft $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/test_case.php');
+require_once(dirname(__FILE__) . '/dumper.php');
+/**#@-*/
+
+/**
+ *    Standard unit test class for day to day testing
+ *    of PHP code XP style. Adds some useful standard
+ *    assertions.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class UnitTestCase extends SimpleTestCase {
+
+    /**
+     *    Creates an empty test case. Should be subclassed
+     *    with test methods for a functional test case.
+     *    @param string $label     Name of test case. Will use
+     *                             the class name if none specified.
+     *    @access public
+     */
+    function __construct($label = false) {
+        if (! $label) {
+            $label = get_class($this);
+        }
+        parent::__construct($label);
+    }
+
+    /**
+     *    Called from within the test methods to register
+     *    passes and failures.
+     *    @param boolean $result    Pass on true.
+     *    @param string $message    Message to display describing
+     *                              the test state.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertTrue($result, $message = '%s') {
+        return $this->assert(new TrueExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will be true on false and vice versa. False
+     *    is the PHP definition of false, so that null,
+     *    empty strings, zero and an empty array all count
+     *    as false.
+     *    @param boolean $result    Pass on false.
+     *    @param string $message    Message to display.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertFalse($result, $message = '%s') {
+        return $this->assert(new FalseExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will be true if the value is null.
+     *    @param null $value       Supposedly null value.
+     *    @param string $message   Message to display.
+     *    @return boolean                        True on pass
+     *    @access public
+     */
+    function assertNull($value, $message = '%s') {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                '[' . $dumper->describeValue($value) . '] should be null');
+        return $this->assertTrue(! isset($value), $message);
+    }
+
+    /**
+     *    Will be true if the value is set.
+     *    @param mixed $value           Supposedly set value.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass.
+     *    @access public
+     */
+    function assertNotNull($value, $message = '%s') {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                '[' . $dumper->describeValue($value) . '] should not be null');
+        return $this->assertTrue(isset($value), $message);
+    }
+
+    /**
+     *    Type and class test. Will pass if class
+     *    matches the type name or is a subclass or
+     *    if not an object, but the type is correct.
+     *    @param mixed $object         Object to test.
+     *    @param string $type          Type name as string.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass.
+     *    @access public
+     */
+    function assertIsA($object, $type, $message = '%s') {
+        return $this->assert(
+                new IsAExpectation($type),
+                $object,
+                $message);
+    }
+
+    /**
+     *    Type and class mismatch test. Will pass if class
+     *    name or underling type does not match the one
+     *    specified.
+     *    @param mixed $object         Object to test.
+     *    @param string $type          Type name as string.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass.
+     *    @access public
+     */
+    function assertNotA($object, $type, $message = '%s') {
+        return $this->assert(
+                new NotAExpectation($type),
+                $object,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    the same value only. Otherwise a fail.
+     *    @param mixed $first          Value to compare.
+     *    @param mixed $second         Value to compare.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass
+     *    @access public
+     */
+    function assertEqual($first, $second, $message = '%s') {
+        return $this->assert(
+                new EqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    a different value. Otherwise a fail.
+     *    @param mixed $first           Value to compare.
+     *    @param mixed $second          Value to compare.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertNotEqual($first, $second, $message = '%s') {
+        return $this->assert(
+                new NotEqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the if the first parameter
+     *    is near enough to the second by the margin.
+     *    @param mixed $first          Value to compare.
+     *    @param mixed $second         Value to compare.
+     *    @param mixed $margin         Fuzziness of match.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass
+     *    @access public
+     */
+    function assertWithinMargin($first, $second, $margin, $message = '%s') {
+        return $this->assert(
+                new WithinMarginExpectation($first, $margin),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters differ
+     *    by more than the margin.
+     *    @param mixed $first          Value to compare.
+     *    @param mixed $second         Value to compare.
+     *    @param mixed $margin         Fuzziness of match.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass
+     *    @access public
+     */
+    function assertOutsideMargin($first, $second, $margin, $message = '%s') {
+        return $this->assert(
+                new OutsideMarginExpectation($first, $margin),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    the same value and same type. Otherwise a fail.
+     *    @param mixed $first           Value to compare.
+     *    @param mixed $second          Value to compare.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertIdentical($first, $second, $message = '%s') {
+        return $this->assert(
+                new IdenticalExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    the different value or different type.
+     *    @param mixed $first           Value to compare.
+     *    @param mixed $second          Value to compare.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertNotIdentical($first, $second, $message = '%s') {
+        return $this->assert(
+                new NotIdenticalExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if both parameters refer
+     *    to the same object or value. Fail otherwise.
+     *    This will cause problems testing objects under
+     *    E_STRICT.
+     *    TODO: Replace with expectation.
+     *    @param mixed $first           Reference to check.
+     *    @param mixed $second          Hopefully the same variable.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertReference(&$first, &$second, $message = '%s') {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                '[' . $dumper->describeValue($first) .
+                        '] and [' . $dumper->describeValue($second) .
+                        '] should reference the same object');
+        return $this->assertTrue(
+                SimpleTestCompatibility::isReference($first, $second),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if both parameters refer
+     *    to the same object. Fail otherwise. This has
+     *    the same semantics at the PHPUnit assertSame.
+     *    That is, if values are passed in it has roughly
+     *    the same affect as assertIdentical.
+     *    TODO: Replace with expectation.
+     *    @param mixed $first           Object reference to check.
+     *    @param mixed $second          Hopefully the same object.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertSame($first, $second, $message = '%s') {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                '[' . $dumper->describeValue($first) .
+                        '] and [' . $dumper->describeValue($second) .
+                        '] should reference the same object');
+        return $this->assertTrue($first === $second, $message);
+    }
+
+    /**
+     *    Will trigger a pass if both parameters refer
+     *    to different objects. Fail otherwise. The objects
+     *    have to be identical though.
+     *    @param mixed $first           Object reference to check.
+     *    @param mixed $second          Hopefully not the same object.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertClone($first, $second, $message = '%s') {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                '[' . $dumper->describeValue($first) .
+                        '] and [' . $dumper->describeValue($second) .
+                        '] should not be the same object');
+        $identical = new IdenticalExpectation($first);
+        return $this->assertTrue(
+                $identical->test($second) && ! ($first === $second),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if both parameters refer
+     *    to different variables. Fail otherwise. The objects
+     *    have to be identical references though.
+     *    This will fail under E_STRICT with objects. Use
+     *    assertClone() for this.
+     *    @param mixed $first           Object reference to check.
+     *    @param mixed $second          Hopefully not the same object.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertCopy(&$first, &$second, $message = "%s") {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                "[" . $dumper->describeValue($first) .
+                        "] and [" . $dumper->describeValue($second) .
+                        "] should not be the same object");
+        return $this->assertFalse(
+                SimpleTestCompatibility::isReference($first, $second),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the Perl regex pattern
+     *    is found in the subject. Fail otherwise.
+     *    @param string $pattern    Perl regex to look for including
+     *                              the regex delimiters.
+     *    @param string $subject    String to search in.
+     *    @param string $message    Message to display.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertPattern($pattern, $subject, $message = '%s') {
+        return $this->assert(
+                new PatternExpectation($pattern),
+                $subject,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the perl regex pattern
+     *    is not present in subject. Fail if found.
+     *    @param string $pattern    Perl regex to look for including
+     *                              the regex delimiters.
+     *    @param string $subject    String to search in.
+     *    @param string $message    Message to display.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertNoPattern($pattern, $subject, $message = '%s') {
+        return $this->assert(
+                new NoPatternExpectation($pattern),
+                $subject,
+                $message);
+    }
+
+    /**
+     *    Prepares for an error. If the error mismatches it
+     *    passes through, otherwise it is swallowed. Any
+     *    left over errors trigger failures.
+     *    @param SimpleExpectation/string $expected   The error to match.
+     *    @param string $message                      Message on failure.
+     *    @access public
+     */
+    function expectError($expected = false, $message = '%s') {
+        $queue = SimpleTest::getContext()->get('SimpleErrorQueue');
+        $queue->expectError($this->coerceExpectation($expected), $message);
+    }
+
+    /**
+     *    Prepares for an exception. If the error mismatches it
+     *    passes through, otherwise it is swallowed. Any
+     *    left over errors trigger failures.
+     *    @param SimpleExpectation/Exception $expected  The error to match.
+     *    @param string $message                        Message on failure.
+     *    @access public
+     */
+    function expectException($expected = false, $message = '%s') {
+        $queue = SimpleTest::getContext()->get('SimpleExceptionTrap');
+        $line = $this->getAssertionLine();
+        $queue->expectException($expected, $message . $line);
+    }
+
+    /**
+     *    Tells SimpleTest to ignore an upcoming exception as not relevant
+     *    to the current test. It doesn't affect the test, whether thrown or
+     *    not.
+     *    @param SimpleExpectation/Exception $ignored  The error to ignore.
+     *    @access public
+     */
+    function ignoreException($ignored = false) {
+        SimpleTest::getContext()->get('SimpleExceptionTrap')->ignoreException($ignored);
+    }
+
+    /**
+     *    Creates an equality expectation if the
+     *    object/value is not already some type
+     *    of expectation.
+     *    @param mixed $expected      Expected value.
+     *    @return SimpleExpectation   Expectation object.
+     *    @access private
+     */
+    protected function coerceExpectation($expected) {
+        if ($expected == false) {
+            return new TrueExpectation();
+        }
+        if (SimpleTestCompatibility::isA($expected, 'SimpleExpectation')) {
+            return $expected;
+        }
+        return new EqualExpectation(
+                is_string($expected) ? str_replace('%', '%%', $expected) : $expected);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/url.php b/3rdparty/simpletest/url.php
new file mode 100644
index 00000000000..11d70e745ee
--- /dev/null
+++ b/3rdparty/simpletest/url.php
@@ -0,0 +1,550 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: url.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/encoding.php');
+/**#@-*/
+
+/**
+ *    URL parser to replace parse_url() PHP function which
+ *    got broken in PHP 4.3.0. Adds some browser specific
+ *    functionality such as expandomatics.
+ *    Guesses a bit trying to separate the host from
+ *    the path and tries to keep a raw, possibly unparsable,
+ *    request string as long as possible.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleUrl {
+    private $scheme;
+    private $username;
+    private $password;
+    private $host;
+    private $port;
+    public $path;
+    private $request;
+    private $fragment;
+    private $x;
+    private $y;
+    private $target;
+    private $raw = false;
+
+    /**
+     *    Constructor. Parses URL into sections.
+     *    @param string $url        Incoming URL.
+     *    @access public
+     */
+    function __construct($url = '') {
+        list($x, $y) = $this->chompCoordinates($url);
+        $this->setCoordinates($x, $y);
+        $this->scheme = $this->chompScheme($url);
+        if ($this->scheme === 'file') {
+            // Unescaped backslashes not used in directory separator context
+            // will get caught by this, but they should have been urlencoded
+            // anyway so we don't care. If this ends up being a problem, the
+            // host regexp must be modified to match for backslashes when
+            // the scheme is file.
+            $url = str_replace('\\', '/', $url);
+        }
+        list($this->username, $this->password) = $this->chompLogin($url);
+        $this->host = $this->chompHost($url);
+        $this->port = false;
+        if (preg_match('/(.*?):(.*)/', $this->host, $host_parts)) {
+            if ($this->scheme === 'file' && strlen($this->host) === 2) {
+                // DOS drive was placed in authority; promote it to path.
+                $url = '/' . $this->host . $url;
+                $this->host = false;
+            } else {
+                $this->host = $host_parts[1];
+                $this->port = (integer)$host_parts[2];
+            }
+        }
+        $this->path = $this->chompPath($url);
+        $this->request = $this->parseRequest($this->chompRequest($url));
+        $this->fragment = (strncmp($url, "#", 1) == 0 ? substr($url, 1) : false);
+        $this->target = false;
+    }
+
+    /**
+     *    Extracts the X, Y coordinate pair from an image map.
+     *    @param string $url   URL so far. The coordinates will be
+     *                         removed.
+     *    @return array        X, Y as a pair of integers.
+     *    @access private
+     */
+    protected function chompCoordinates(&$url) {
+        if (preg_match('/(.*)\?(\d+),(\d+)$/', $url, $matches)) {
+            $url = $matches[1];
+            return array((integer)$matches[2], (integer)$matches[3]);
+        }
+        return array(false, false);
+    }
+
+    /**
+     *    Extracts the scheme part of an incoming URL.
+     *    @param string $url   URL so far. The scheme will be
+     *                         removed.
+     *    @return string       Scheme part or false.
+     *    @access private
+     */
+    protected function chompScheme(&$url) {
+        if (preg_match('#^([^/:]*):(//)(.*)#', $url, $matches)) {
+            $url = $matches[2] . $matches[3];
+            return $matches[1];
+        }
+        return false;
+    }
+
+    /**
+     *    Extracts the username and password from the
+     *    incoming URL. The // prefix will be reattached
+     *    to the URL after the doublet is extracted.
+     *    @param string $url    URL so far. The username and
+     *                          password are removed.
+     *    @return array         Two item list of username and
+     *                          password. Will urldecode() them.
+     *    @access private
+     */
+    protected function chompLogin(&$url) {
+        $prefix = '';
+        if (preg_match('#^(//)(.*)#', $url, $matches)) {
+            $prefix = $matches[1];
+            $url = $matches[2];
+        }
+        if (preg_match('#^([^/]*)@(.*)#', $url, $matches)) {
+            $url = $prefix . $matches[2];
+            $parts = explode(":", $matches[1]);
+            return array(
+                    urldecode($parts[0]),
+                    isset($parts[1]) ? urldecode($parts[1]) : false);
+        }
+        $url = $prefix . $url;
+        return array(false, false);
+    }
+
+    /**
+     *    Extracts the host part of an incoming URL.
+     *    Includes the port number part. Will extract
+     *    the host if it starts with // or it has
+     *    a top level domain or it has at least two
+     *    dots.
+     *    @param string $url    URL so far. The host will be
+     *                          removed.
+     *    @return string        Host part guess or false.
+     *    @access private
+     */
+    protected function chompHost(&$url) {
+        if (preg_match('!^(//)(.*?)(/.*|\?.*|#.*|$)!', $url, $matches)) {
+            $url = $matches[3];
+            return $matches[2];
+        }
+        if (preg_match('!(.*?)(\.\./|\./|/|\?|#|$)(.*)!', $url, $matches)) {
+            $tlds = SimpleUrl::getAllTopLevelDomains();
+            if (preg_match('/[a-z0-9\-]+\.(' . $tlds . ')/i', $matches[1])) {
+                $url = $matches[2] . $matches[3];
+                return $matches[1];
+            } elseif (preg_match('/[a-z0-9\-]+\.[a-z0-9\-]+\.[a-z0-9\-]+/i', $matches[1])) {
+                $url = $matches[2] . $matches[3];
+                return $matches[1];
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Extracts the path information from the incoming
+     *    URL. Strips this path from the URL.
+     *    @param string $url     URL so far. The host will be
+     *                           removed.
+     *    @return string         Path part or '/'.
+     *    @access private
+     */
+    protected function chompPath(&$url) {
+        if (preg_match('/(.*?)(\?|#|$)(.*)/', $url, $matches)) {
+            $url = $matches[2] . $matches[3];
+            return ($matches[1] ? $matches[1] : '');
+        }
+        return '';
+    }
+
+    /**
+     *    Strips off the request data.
+     *    @param string $url  URL so far. The request will be
+     *                        removed.
+     *    @return string      Raw request part.
+     *    @access private
+     */
+    protected function chompRequest(&$url) {
+        if (preg_match('/\?(.*?)(#|$)(.*)/', $url, $matches)) {
+            $url = $matches[2] . $matches[3];
+            return $matches[1];
+        }
+        return '';
+    }
+
+    /**
+     *    Breaks the request down into an object.
+     *    @param string $raw           Raw request.
+     *    @return SimpleFormEncoding    Parsed data.
+     *    @access private
+     */
+    protected function parseRequest($raw) {
+        $this->raw = $raw;
+        $request = new SimpleGetEncoding();
+        foreach (explode("&", $raw) as $pair) {
+            if (preg_match('/(.*?)=(.*)/', $pair, $matches)) {
+                $request->add(urldecode($matches[1]), urldecode($matches[2]));
+            } elseif ($pair) {
+                $request->add(urldecode($pair), '');
+            }
+        }
+        return $request;
+    }
+
+    /**
+     *    Accessor for protocol part.
+     *    @param string $default    Value to use if not present.
+     *    @return string            Scheme name, e.g "http".
+     *    @access public
+     */
+    function getScheme($default = false) {
+        return $this->scheme ? $this->scheme : $default;
+    }
+
+    /**
+     *    Accessor for user name.
+     *    @return string    Username preceding host.
+     *    @access public
+     */
+    function getUsername() {
+        return $this->username;
+    }
+
+    /**
+     *    Accessor for password.
+     *    @return string    Password preceding host.
+     *    @access public
+     */
+    function getPassword() {
+        return $this->password;
+    }
+
+    /**
+     *    Accessor for hostname and port.
+     *    @param string $default    Value to use if not present.
+     *    @return string            Hostname only.
+     *    @access public
+     */
+    function getHost($default = false) {
+        return $this->host ? $this->host : $default;
+    }
+
+    /**
+     *    Accessor for top level domain.
+     *    @return string       Last part of host.
+     *    @access public
+     */
+    function getTld() {
+        $path_parts = pathinfo($this->getHost());
+        return (isset($path_parts['extension']) ? $path_parts['extension'] : false);
+    }
+
+    /**
+     *    Accessor for port number.
+     *    @return integer    TCP/IP port number.
+     *    @access public
+     */
+    function getPort() {
+        return $this->port;
+    }
+
+    /**
+     *    Accessor for path.
+     *    @return string    Full path including leading slash if implied.
+     *    @access public
+     */
+    function getPath() {
+        if (! $this->path && $this->host) {
+            return '/';
+        }
+        return $this->path;
+    }
+
+    /**
+     *    Accessor for page if any. This may be a
+     *    directory name if ambiguious.
+     *    @return            Page name.
+     *    @access public
+     */
+    function getPage() {
+        if (! preg_match('/([^\/]*?)$/', $this->getPath(), $matches)) {
+            return false;
+        }
+        return $matches[1];
+    }
+
+    /**
+     *    Gets the path to the page.
+     *    @return string       Path less the page.
+     *    @access public
+     */
+    function getBasePath() {
+        if (! preg_match('/(.*\/)[^\/]*?$/', $this->getPath(), $matches)) {
+            return false;
+        }
+        return $matches[1];
+    }
+
+    /**
+     *    Accessor for fragment at end of URL after the "#".
+     *    @return string    Part after "#".
+     *    @access public
+     */
+    function getFragment() {
+        return $this->fragment;
+    }
+
+    /**
+     *    Sets image coordinates. Set to false to clear
+     *    them.
+     *    @param integer $x    Horizontal position.
+     *    @param integer $y    Vertical position.
+     *    @access public
+     */
+    function setCoordinates($x = false, $y = false) {
+        if (($x === false) || ($y === false)) {
+            $this->x = $this->y = false;
+            return;
+        }
+        $this->x = (integer)$x;
+        $this->y = (integer)$y;
+    }
+
+    /**
+     *    Accessor for horizontal image coordinate.
+     *    @return integer        X value.
+     *    @access public
+     */
+    function getX() {
+        return $this->x;
+    }
+
+    /**
+     *    Accessor for vertical image coordinate.
+     *    @return integer        Y value.
+     *    @access public
+     */
+    function getY() {
+        return $this->y;
+    }
+
+    /**
+     *    Accessor for current request parameters
+     *    in URL string form. Will return teh original request
+     *    if at all possible even if it doesn't make much
+     *    sense.
+     *    @return string   Form is string "?a=1&b=2", etc.
+     *    @access public
+     */
+    function getEncodedRequest() {
+        if ($this->raw) {
+            $encoded = $this->raw;
+        } else {
+            $encoded = $this->request->asUrlRequest();
+        }
+        if ($encoded) {
+            return '?' . preg_replace('/^\?/', '', $encoded);
+        }
+        return '';
+    }
+
+    /**
+     *    Adds an additional parameter to the request.
+     *    @param string $key            Name of parameter.
+     *    @param string $value          Value as string.
+     *    @access public
+     */
+    function addRequestParameter($key, $value) {
+        $this->raw = false;
+        $this->request->add($key, $value);
+    }
+
+    /**
+     *    Adds additional parameters to the request.
+     *    @param hash/SimpleFormEncoding $parameters   Additional
+     *                                                parameters.
+     *    @access public
+     */
+    function addRequestParameters($parameters) {
+        $this->raw = false;
+        $this->request->merge($parameters);
+    }
+
+    /**
+     *    Clears down all parameters.
+     *    @access public
+     */
+    function clearRequest() {
+        $this->raw = false;
+        $this->request = new SimpleGetEncoding();
+    }
+
+    /**
+     *    Gets the frame target if present. Although
+     *    not strictly part of the URL specification it
+     *    acts as similarily to the browser.
+     *    @return boolean/string    Frame name or false if none.
+     *    @access public
+     */
+    function getTarget() {
+        return $this->target;
+    }
+
+    /**
+     *    Attaches a frame target.
+     *    @param string $frame        Name of frame.
+     *    @access public
+     */
+    function setTarget($frame) {
+        $this->raw = false;
+        $this->target = $frame;
+    }
+
+    /**
+     *    Renders the URL back into a string.
+     *    @return string        URL in canonical form.
+     *    @access public
+     */
+    function asString() {
+        $path = $this->path;
+        $scheme = $identity = $host = $port = $encoded = $fragment = '';
+        if ($this->username && $this->password) {
+            $identity = $this->username . ':' . $this->password . '@';
+        }
+        if ($this->getHost()) {
+            $scheme = $this->getScheme() ? $this->getScheme() : 'http';
+            $scheme .= '://';
+            $host = $this->getHost();
+        } elseif ($this->getScheme() === 'file') {
+            // Safest way; otherwise, file URLs on Windows have an extra
+            // leading slash. It might be possible to convert file://
+            // URIs to local file paths, but that requires more research.
+            $scheme = 'file://';
+        }
+        if ($this->getPort() && $this->getPort() != 80 ) {
+            $port = ':'.$this->getPort();
+        }
+
+        if (substr($this->path, 0, 1) == '/') {
+            $path = $this->normalisePath($this->path);
+        }
+        $encoded = $this->getEncodedRequest();
+        $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
+        $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
+        return "$scheme$identity$host$port$path$encoded$fragment$coords";
+    }
+
+    /**
+     *    Replaces unknown sections to turn a relative
+     *    URL into an absolute one. The base URL can
+     *    be either a string or a SimpleUrl object.
+     *    @param string/SimpleUrl $base       Base URL.
+     *    @access public
+     */
+    function makeAbsolute($base) {
+        if (! is_object($base)) {
+            $base = new SimpleUrl($base);
+        }
+        if ($this->getHost()) {
+            $scheme = $this->getScheme();
+            $host = $this->getHost();
+            $port = $this->getPort() ? ':' . $this->getPort() : '';
+            $identity = $this->getIdentity() ? $this->getIdentity() . '@' : '';
+            if (! $identity) {
+                $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
+            }
+        } else {
+            $scheme = $base->getScheme();
+            $host = $base->getHost();
+            $port = $base->getPort() ? ':' . $base->getPort() : '';
+            $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
+        }
+        $path = $this->normalisePath($this->extractAbsolutePath($base));
+        $encoded = $this->getEncodedRequest();
+        $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
+        $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
+        return new SimpleUrl("$scheme://$identity$host$port$path$encoded$fragment$coords");
+    }
+
+    /**
+     *    Replaces unknown sections of the path with base parts
+     *    to return a complete absolute one.
+     *    @param string/SimpleUrl $base       Base URL.
+     *    @param string                       Absolute path.
+     *    @access private
+     */
+    protected function extractAbsolutePath($base) {
+        if ($this->getHost()) {
+            return $this->path;
+        }
+        if (! $this->isRelativePath($this->path)) {
+            return $this->path;
+        }
+        if ($this->path) {
+            return $base->getBasePath() . $this->path;
+        }
+        return $base->getPath();
+    }
+
+    /**
+     *    Simple test to see if a path part is relative.
+     *    @param string $path        Path to test.
+     *    @return boolean            True if starts with a "/".
+     *    @access private
+     */
+    protected function isRelativePath($path) {
+        return (substr($path, 0, 1) != '/');
+    }
+
+    /**
+     *    Extracts the username and password for use in rendering
+     *    a URL.
+     *    @return string/boolean    Form of username:password or false.
+     *    @access public
+     */
+    function getIdentity() {
+        if ($this->username && $this->password) {
+            return $this->username . ':' . $this->password;
+        }
+        return false;
+    }
+
+    /**
+     *    Replaces . and .. sections of the path.
+     *    @param string $path    Unoptimised path.
+     *    @return string         Path with dots removed if possible.
+     *    @access public
+     */
+    function normalisePath($path) {
+        $path = preg_replace('|/\./|', '/', $path);
+        return preg_replace('|/[^/]+/\.\./|', '/', $path);
+    }
+
+    /**
+     *    A pipe seperated list of all TLDs that result in two part
+     *    domain names.
+     *    @return string        Pipe separated list.
+     *    @access public
+     */
+    static function getAllTopLevelDomains() {
+        return 'com|edu|net|org|gov|mil|int|biz|info|name|pro|aero|coop|museum';
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/user_agent.php b/3rdparty/simpletest/user_agent.php
new file mode 100644
index 00000000000..ea536020017
--- /dev/null
+++ b/3rdparty/simpletest/user_agent.php
@@ -0,0 +1,328 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: user_agent.php 2039 2011-11-30 18:16:15Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/cookies.php');
+require_once(dirname(__FILE__) . '/http.php');
+require_once(dirname(__FILE__) . '/encoding.php');
+require_once(dirname(__FILE__) . '/authentication.php');
+/**#@-*/
+
+if (! defined('DEFAULT_MAX_REDIRECTS')) {
+    define('DEFAULT_MAX_REDIRECTS', 3);
+}
+if (! defined('DEFAULT_CONNECTION_TIMEOUT')) {
+    define('DEFAULT_CONNECTION_TIMEOUT', 15);
+}
+
+/**
+ *    Fetches web pages whilst keeping track of
+ *    cookies and authentication.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleUserAgent {
+    private $cookie_jar;
+    private $cookies_enabled = true;
+    private $authenticator;
+    private $max_redirects = DEFAULT_MAX_REDIRECTS;
+    private $proxy = false;
+    private $proxy_username = false;
+    private $proxy_password = false;
+    private $connection_timeout = DEFAULT_CONNECTION_TIMEOUT;
+    private $additional_headers = array();
+
+    /**
+     *    Starts with no cookies, realms or proxies.
+     *    @access public
+     */
+    function __construct() {
+        $this->cookie_jar = new SimpleCookieJar();
+        $this->authenticator = new SimpleAuthenticator();
+    }
+
+    /**
+     *    Removes expired and temporary cookies as if
+     *    the browser was closed and re-opened. Authorisation
+     *    has to be obtained again as well.
+     *    @param string/integer $date   Time when session restarted.
+     *                                  If omitted then all persistent
+     *                                  cookies are kept.
+     *    @access public
+     */
+    function restart($date = false) {
+        $this->cookie_jar->restartSession($date);
+        $this->authenticator->restartSession();
+    }
+
+    /**
+     *    Adds a header to every fetch.
+     *    @param string $header       Header line to add to every
+     *                                request until cleared.
+     *    @access public
+     */
+    function addHeader($header) {
+        $this->additional_headers[] = $header;
+    }
+
+    /**
+     *    Ages the cookies by the specified time.
+     *    @param integer $interval    Amount in seconds.
+     *    @access public
+     */
+    function ageCookies($interval) {
+        $this->cookie_jar->agePrematurely($interval);
+    }
+
+    /**
+     *    Sets an additional cookie. If a cookie has
+     *    the same name and path it is replaced.
+     *    @param string $name            Cookie key.
+     *    @param string $value           Value of cookie.
+     *    @param string $host            Host upon which the cookie is valid.
+     *    @param string $path            Cookie path if not host wide.
+     *    @param string $expiry          Expiry date.
+     *    @access public
+     */
+    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
+        $this->cookie_jar->setCookie($name, $value, $host, $path, $expiry);
+    }
+
+    /**
+     *    Reads the most specific cookie value from the
+     *    browser cookies.
+     *    @param string $host        Host to search.
+     *    @param string $path        Applicable path.
+     *    @param string $name        Name of cookie to read.
+     *    @return string             False if not present, else the
+     *                               value as a string.
+     *    @access public
+     */
+    function getCookieValue($host, $path, $name) {
+        return $this->cookie_jar->getCookieValue($host, $path, $name);
+    }
+
+    /**
+     *    Reads the current cookies within the base URL.
+     *    @param string $name     Key of cookie to find.
+     *    @param SimpleUrl $base  Base URL to search from.
+     *    @return string/boolean  Null if there is no base URL, false
+     *                            if the cookie is not set.
+     *    @access public
+     */
+    function getBaseCookieValue($name, $base) {
+        if (! $base) {
+            return null;
+        }
+        return $this->getCookieValue($base->getHost(), $base->getPath(), $name);
+    }
+
+    /**
+     *    Switches off cookie sending and recieving.
+     *    @access public
+     */
+    function ignoreCookies() {
+        $this->cookies_enabled = false;
+    }
+
+    /**
+     *    Switches back on the cookie sending and recieving.
+     *    @access public
+     */
+    function useCookies() {
+        $this->cookies_enabled = true;
+    }
+
+    /**
+     *    Sets the socket timeout for opening a connection.
+     *    @param integer $timeout      Maximum time in seconds.
+     *    @access public
+     */
+    function setConnectionTimeout($timeout) {
+        $this->connection_timeout = $timeout;
+    }
+
+    /**
+     *    Sets the maximum number of redirects before
+     *    a page will be loaded anyway.
+     *    @param integer $max        Most hops allowed.
+     *    @access public
+     */
+    function setMaximumRedirects($max) {
+        $this->max_redirects = $max;
+    }
+
+    /**
+     *    Sets proxy to use on all requests for when
+     *    testing from behind a firewall. Set URL
+     *    to false to disable.
+     *    @param string $proxy        Proxy URL.
+     *    @param string $username     Proxy username for authentication.
+     *    @param string $password     Proxy password for authentication.
+     *    @access public
+     */
+    function useProxy($proxy, $username, $password) {
+        if (! $proxy) {
+            $this->proxy = false;
+            return;
+        }
+        if ((strncmp($proxy, 'http://', 7) != 0) && (strncmp($proxy, 'https://', 8) != 0)) {
+            $proxy = 'http://'. $proxy;
+        }
+        $this->proxy = new SimpleUrl($proxy);
+        $this->proxy_username = $username;
+        $this->proxy_password = $password;
+    }
+
+    /**
+     *    Test to see if the redirect limit is passed.
+     *    @param integer $redirects        Count so far.
+     *    @return boolean                  True if over.
+     *    @access private
+     */
+    protected function isTooManyRedirects($redirects) {
+        return ($redirects > $this->max_redirects);
+    }
+
+    /**
+     *    Sets the identity for the current realm.
+     *    @param string $host        Host to which realm applies.
+     *    @param string $realm       Full name of realm.
+     *    @param string $username    Username for realm.
+     *    @param string $password    Password for realm.
+     *    @access public
+     */
+    function setIdentity($host, $realm, $username, $password) {
+        $this->authenticator->setIdentityForRealm($host, $realm, $username, $password);
+    }
+
+    /**
+     *    Fetches a URL as a response object. Will keep trying if redirected.
+     *    It will also collect authentication realm information.
+     *    @param string/SimpleUrl $url      Target to fetch.
+     *    @param SimpleEncoding $encoding   Additional parameters for request.
+     *    @return SimpleHttpResponse        Hopefully the target page.
+     *    @access public
+     */
+    function fetchResponse($url, $encoding) {
+        if ($encoding->getMethod() != 'POST') {
+            $url->addRequestParameters($encoding);
+            $encoding->clear();
+        }
+        $response = $this->fetchWhileRedirected($url, $encoding);
+        if ($headers = $response->getHeaders()) {
+            if ($headers->isChallenge()) {
+                $this->authenticator->addRealm(
+                        $url,
+                        $headers->getAuthentication(),
+                        $headers->getRealm());
+            }
+        }
+        return $response;
+    }
+
+    /**
+     *    Fetches the page until no longer redirected or
+     *    until the redirect limit runs out.
+     *    @param SimpleUrl $url                  Target to fetch.
+     *    @param SimpelFormEncoding $encoding    Additional parameters for request.
+     *    @return SimpleHttpResponse             Hopefully the target page.
+     *    @access private
+     */
+    protected function fetchWhileRedirected($url, $encoding) {
+        $redirects = 0;
+        do {
+            $response = $this->fetch($url, $encoding);
+            if ($response->isError()) {
+                return $response;
+            }
+            $headers = $response->getHeaders();
+            if ($this->cookies_enabled) {
+                $headers->writeCookiesToJar($this->cookie_jar, $url);
+            }
+            if (! $headers->isRedirect()) {
+                break;
+            }
+            $location = new SimpleUrl($headers->getLocation());
+            $url = $location->makeAbsolute($url);
+            $encoding = new SimpleGetEncoding();
+        } while (! $this->isTooManyRedirects(++$redirects));
+        return $response;
+    }
+
+    /**
+     *    Actually make the web request.
+     *    @param SimpleUrl $url                   Target to fetch.
+     *    @param SimpleFormEncoding $encoding     Additional parameters for request.
+     *    @return SimpleHttpResponse              Headers and hopefully content.
+     *    @access protected
+     */
+    protected function fetch($url, $encoding) {
+        $request = $this->createRequest($url, $encoding);
+        return $request->fetch($this->connection_timeout);
+    }
+
+    /**
+     *    Creates a full page request.
+     *    @param SimpleUrl $url                 Target to fetch as url object.
+     *    @param SimpleFormEncoding $encoding   POST/GET parameters.
+     *    @return SimpleHttpRequest             New request.
+     *    @access private
+     */
+    protected function createRequest($url, $encoding) {
+        $request = $this->createHttpRequest($url, $encoding);
+        $this->addAdditionalHeaders($request);
+        if ($this->cookies_enabled) {
+            $request->readCookiesFromJar($this->cookie_jar, $url);
+        }
+        $this->authenticator->addHeaders($request, $url);
+        return $request;
+    }
+
+    /**
+     *    Builds the appropriate HTTP request object.
+     *    @param SimpleUrl $url                  Target to fetch as url object.
+     *    @param SimpleFormEncoding $parameters  POST/GET parameters.
+     *    @return SimpleHttpRequest              New request object.
+     *    @access protected
+     */
+    protected function createHttpRequest($url, $encoding) {
+        return new SimpleHttpRequest($this->createRoute($url), $encoding);
+    }
+
+    /**
+     *    Sets up either a direct route or via a proxy.
+     *    @param SimpleUrl $url   Target to fetch as url object.
+     *    @return SimpleRoute     Route to take to fetch URL.
+     *    @access protected
+     */
+    protected function createRoute($url) {
+        if ($this->proxy) {
+            return new SimpleProxyRoute(
+                    $url,
+                    $this->proxy,
+                    $this->proxy_username,
+                    $this->proxy_password);
+        }
+        return new SimpleRoute($url);
+    }
+
+    /**
+     *    Adds additional manual headers.
+     *    @param SimpleHttpRequest $request    Outgoing request.
+     *    @access private
+     */
+    protected function addAdditionalHeaders(&$request) {
+        foreach ($this->additional_headers as $header) {
+            $request->addHeaderLine($header);
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/web_tester.php b/3rdparty/simpletest/web_tester.php
new file mode 100644
index 00000000000..a17230e7b33
--- /dev/null
+++ b/3rdparty/simpletest/web_tester.php
@@ -0,0 +1,1532 @@
+<?php
+/**
+ *  Base include file for SimpleTest.
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: web_tester.php 2013 2011-04-29 09:29:45Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/test_case.php');
+require_once(dirname(__FILE__) . '/browser.php');
+require_once(dirname(__FILE__) . '/page.php');
+require_once(dirname(__FILE__) . '/expectation.php');
+/**#@-*/
+
+/**
+ *    Test for an HTML widget value match.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class FieldExpectation extends SimpleExpectation {
+    private $value;
+
+    /**
+     *    Sets the field value to compare against.
+     *    @param mixed $value     Test value to match. Can be an
+     *                            expectation for say pattern matching.
+     *    @param string $message  Optiona message override. Can use %s as
+     *                            a placeholder for the original message.
+     *    @access public
+     */
+    function __construct($value, $message = '%s') {
+        parent::__construct($message);
+        if (is_array($value)) {
+            sort($value);
+        }
+        $this->value = $value;
+    }
+
+    /**
+     *    Tests the expectation. True if it matches
+     *    a string value or an array value in any order.
+     *    @param mixed $compare        Comparison value. False for
+     *                                 an unset field.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        if ($this->value === false) {
+            return ($compare === false);
+        }
+        if ($this->isSingle($this->value)) {
+            return $this->testSingle($compare);
+        }
+        if (is_array($this->value)) {
+            return $this->testMultiple($compare);
+        }
+        return false;
+    }
+
+    /**
+     *    Tests for valid field comparisons with a single option.
+     *    @param mixed $value       Value to type check.
+     *    @return boolean           True if integer, string or float.
+     *    @access private
+     */
+    protected function isSingle($value) {
+        return is_string($value) || is_integer($value) || is_float($value);
+    }
+
+    /**
+     *    String comparison for simple field with a single option.
+     *    @param mixed $compare    String to test against.
+     *    @returns boolean         True if matching.
+     *    @access private
+     */
+    protected function testSingle($compare) {
+        if (is_array($compare) && count($compare) == 1) {
+            $compare = $compare[0];
+        }
+        if (! $this->isSingle($compare)) {
+            return false;
+        }
+        return ($this->value == $compare);
+    }
+
+    /**
+     *    List comparison for multivalue field.
+     *    @param mixed $compare    List in any order to test against.
+     *    @returns boolean         True if matching.
+     *    @access private
+     */
+    protected function testMultiple($compare) {
+        if (is_string($compare)) {
+            $compare = array($compare);
+        }
+        if (! is_array($compare)) {
+            return false;
+        }
+        sort($compare);
+        return ($this->value === $compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        if (is_array($compare)) {
+            sort($compare);
+        }
+        if ($this->test($compare)) {
+            return "Field expectation [" . $dumper->describeValue($this->value) . "]";
+        } else {
+            return "Field expectation [" . $dumper->describeValue($this->value) .
+                    "] fails with [" .
+                    $dumper->describeValue($compare) . "] " .
+                    $dumper->describeDifference($this->value, $compare);
+        }
+    }
+}
+
+/**
+ *    Test for a specific HTTP header within a header block.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class HttpHeaderExpectation extends SimpleExpectation {
+    private $expected_header;
+    private $expected_value;
+
+    /**
+     *    Sets the field and value to compare against.
+     *    @param string $header   Case insenstive trimmed header name.
+     *    @param mixed $value     Optional value to compare. If not
+     *                            given then any value will match. If
+     *                            an expectation object then that will
+     *                            be used instead.
+     *    @param string $message  Optiona message override. Can use %s as
+     *                            a placeholder for the original message.
+     */
+    function __construct($header, $value = false, $message = '%s') {
+        parent::__construct($message);
+        $this->expected_header = $this->normaliseHeader($header);
+        $this->expected_value = $value;
+    }
+
+    /**
+     *    Accessor for aggregated object.
+     *    @return mixed        Expectation set in constructor.
+     *    @access protected
+     */
+    protected function getExpectation() {
+        return $this->expected_value;
+    }
+
+    /**
+     *    Removes whitespace at ends and case variations.
+     *    @param string $header    Name of header.
+     *    @param string            Trimmed and lowecased header
+     *                             name.
+     *    @access private
+     */
+    protected function normaliseHeader($header) {
+        return strtolower(trim($header));
+    }
+
+    /**
+     *    Tests the expectation. True if it matches
+     *    a string value or an array value in any order.
+     *    @param mixed $compare   Raw header block to search.
+     *    @return boolean         True if header present.
+     *    @access public
+     */
+    function test($compare) {
+        return is_string($this->findHeader($compare));
+    }
+
+    /**
+     *    Searches the incoming result. Will extract the matching
+     *    line as text.
+     *    @param mixed $compare   Raw header block to search.
+     *    @return string          Matching header line.
+     *    @access protected
+     */
+    protected function findHeader($compare) {
+        $lines = explode("\r\n", $compare);
+        foreach ($lines as $line) {
+            if ($this->testHeaderLine($line)) {
+                return $line;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Compares a single header line against the expectation.
+     *    @param string $line      A single line to compare.
+     *    @return boolean          True if matched.
+     *    @access private
+     */
+    protected function testHeaderLine($line) {
+        if (count($parsed = explode(':', $line, 2)) < 2) {
+            return false;
+        }
+        list($header, $value) = $parsed;
+        if ($this->normaliseHeader($header) != $this->expected_header) {
+            return false;
+        }
+        return $this->testHeaderValue($value, $this->expected_value);
+    }
+
+    /**
+     *    Tests the value part of the header.
+     *    @param string $value        Value to test.
+     *    @param mixed $expected      Value to test against.
+     *    @return boolean             True if matched.
+     *    @access protected
+     */
+    protected function testHeaderValue($value, $expected) {
+        if ($expected === false) {
+            return true;
+        }
+        if (SimpleExpectation::isExpectation($expected)) {
+            return $expected->test(trim($value));
+        }
+        return (trim($value) == trim($expected));
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Raw header block to search.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if (SimpleExpectation::isExpectation($this->expected_value)) {
+            $message = $this->expected_value->overlayMessage($compare, $this->getDumper());
+        } else {
+            $message = $this->expected_header .
+                    ($this->expected_value ? ': ' . $this->expected_value : '');
+        }
+        if (is_string($line = $this->findHeader($compare))) {
+            return "Searching for header [$message] found [$line]";
+        } else {
+            return "Failed to find header [$message]";
+        }
+    }
+}
+
+/**
+ *    Test for a specific HTTP header within a header block that
+ *    should not be found.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class NoHttpHeaderExpectation extends HttpHeaderExpectation {
+    private $expected_header;
+    private $expected_value;
+
+    /**
+     *    Sets the field and value to compare against.
+     *    @param string $unwanted   Case insenstive trimmed header name.
+     *    @param string $message    Optiona message override. Can use %s as
+     *                              a placeholder for the original message.
+     */
+    function __construct($unwanted, $message = '%s') {
+        parent::__construct($unwanted, false, $message);
+    }
+
+    /**
+     *    Tests that the unwanted header is not found.
+     *    @param mixed $compare   Raw header block to search.
+     *    @return boolean         True if header present.
+     *    @access public
+     */
+    function test($compare) {
+        return ($this->findHeader($compare) === false);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Raw header block to search.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $expectation = $this->getExpectation();
+        if (is_string($line = $this->findHeader($compare))) {
+            return "Found unwanted header [$expectation] with [$line]";
+        } else {
+            return "Did not find unwanted header [$expectation]";
+        }
+    }
+}
+
+/**
+ *    Test for a text substring.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class TextExpectation extends SimpleExpectation {
+    private $substring;
+
+    /**
+     *    Sets the value to compare against.
+     *    @param string $substring  Text to search for.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($substring, $message = '%s') {
+        parent::__construct($message);
+        $this->substring = $substring;
+    }
+
+    /**
+     *    Accessor for the substring.
+     *    @return string       Text to match.
+     *    @access protected
+     */
+    protected function getSubstring() {
+        return $this->substring;
+    }
+
+    /**
+     *    Tests the expectation. True if the text contains the
+     *    substring.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return (strpos($compare, $this->substring) !== false);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            return $this->describeTextMatch($this->getSubstring(), $compare);
+        } else {
+            $dumper = $this->getDumper();
+            return "Text [" . $this->getSubstring() .
+                    "] not detected in [" .
+                    $dumper->describeValue($compare) . "]";
+        }
+    }
+
+    /**
+     *    Describes a pattern match including the string
+     *    found and it's position.
+     *    @param string $substring      Text to search for.
+     *    @param string $subject        Subject to search.
+     *    @access protected
+     */
+    protected function describeTextMatch($substring, $subject) {
+        $position = strpos($subject, $substring);
+        $dumper = $this->getDumper();
+        return "Text [$substring] detected at character [$position] in [" .
+                $dumper->describeValue($subject) . "] in region [" .
+                $dumper->clipString($subject, 100, $position) . "]";
+    }
+}
+
+/**
+ *    Fail if a substring is detected within the
+ *    comparison text.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NoTextExpectation extends TextExpectation {
+
+    /**
+     *    Sets the reject pattern
+     *    @param string $substring  Text to search for.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($substring, $message = '%s') {
+        parent::__construct($substring, $message);
+    }
+
+    /**
+     *    Tests the expectation. False if the substring appears
+     *    in the text.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param string $compare      Comparison value.
+     *    @return string              Description of success
+     *                                or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            $dumper = $this->getDumper();
+            return "Text [" . $this->getSubstring() .
+                    "] not detected in [" .
+                    $dumper->describeValue($compare) . "]";
+        } else {
+            return $this->describeTextMatch($this->getSubstring(), $compare);
+        }
+    }
+}
+
+/**
+ *    Test case for testing of web pages. Allows
+ *    fetching of pages, parsing of HTML and
+ *    submitting forms.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class WebTestCase extends SimpleTestCase {
+    private $browser;
+    private $ignore_errors = false;
+
+    /**
+     *    Creates an empty test case. Should be subclassed
+     *    with test methods for a functional test case.
+     *    @param string $label     Name of test case. Will use
+     *                             the class name if none specified.
+     *    @access public
+     */
+    function __construct($label = false) {
+        parent::__construct($label);
+    }
+
+    /**
+     *    Announces the start of the test.
+     *    @param string $method    Test method just started.
+     *    @access public
+     */
+    function before($method) {
+        parent::before($method);
+        $this->setBrowser($this->createBrowser());
+    }
+
+    /**
+     *    Announces the end of the test. Includes private clean up.
+     *    @param string $method    Test method just finished.
+     *    @access public
+     */
+    function after($method) {
+        $this->unsetBrowser();
+        parent::after($method);
+    }
+
+    /**
+     *    Gets a current browser reference for setting
+     *    special expectations or for detailed
+     *    examination of page fetches.
+     *    @return SimpleBrowser     Current test browser object.
+     *    @access public
+     */
+    function getBrowser() {
+        return $this->browser;
+    }
+
+    /**
+     *    Gets a current browser reference for setting
+     *    special expectations or for detailed
+     *    examination of page fetches.
+     *    @param SimpleBrowser $browser    New test browser object.
+     *    @access public
+     */
+    function setBrowser($browser) {
+        return $this->browser = $browser;
+    }
+
+    /**
+     *    Sets the HTML parser to use within this browser.
+     *    @param object         The parser, one of SimplePHPPageBuilder or
+     *                          SimpleTidyPageBuilder.
+     */
+    function setParser($parser) {
+        $this->browser->setParser($parser);
+    }
+
+    /**
+     *    Clears the current browser reference to help the
+     *    PHP garbage collector.
+     *    @access public
+     */
+    function unsetBrowser() {
+        unset($this->browser);
+    }
+
+    /**
+     *    Creates a new default web browser object.
+     *    Will be cleared at the end of the test method.
+     *    @return TestBrowser           New browser.
+     *    @access public
+     */
+    function createBrowser() {
+        return new SimpleBrowser();
+    }
+
+    /**
+     *    Gets the last response error.
+     *    @return string    Last low level HTTP error.
+     *    @access public
+     */
+    function getTransportError() {
+        return $this->browser->getTransportError();
+    }
+
+    /**
+     *    Accessor for the currently selected URL.
+     *    @return string        Current location or false if
+     *                          no page yet fetched.
+     *    @access public
+     */
+    function getUrl() {
+        return $this->browser->getUrl();
+    }
+
+    /**
+     *    Dumps the current request for debugging.
+     *    @access public
+     */
+    function showRequest() {
+        $this->dump($this->browser->getRequest());
+    }
+
+    /**
+     *    Dumps the current HTTP headers for debugging.
+     *    @access public
+     */
+    function showHeaders() {
+        $this->dump($this->browser->getHeaders());
+    }
+
+    /**
+     *    Dumps the current HTML source for debugging.
+     *    @access public
+     */
+    function showSource() {
+        $this->dump($this->browser->getContent());
+    }
+
+    /**
+     *    Dumps the visible text only for debugging.
+     *    @access public
+     */
+    function showText() {
+        $this->dump(wordwrap($this->browser->getContentAsText(), 80));
+    }
+
+    /**
+     *    Simulates the closing and reopening of the browser.
+     *    Temporary cookies will be discarded and timed
+     *    cookies will be expired if later than the
+     *    specified time.
+     *    @param string/integer $date Time when session restarted.
+     *                                If ommitted then all persistent
+     *                                cookies are kept. Time is either
+     *                                Cookie format string or timestamp.
+     *    @access public
+     */
+    function restart($date = false) {
+        if ($date === false) {
+            $date = time();
+        }
+        $this->browser->restart($date);
+    }
+
+    /**
+     *    Moves cookie expiry times back into the past.
+     *    Useful for testing timeouts and expiries.
+     *    @param integer $interval    Amount to age in seconds.
+     *    @access public
+     */
+    function ageCookies($interval) {
+        $this->browser->ageCookies($interval);
+    }
+
+    /**
+     *    Disables frames support. Frames will not be fetched
+     *    and the frameset page will be used instead.
+     *    @access public
+     */
+    function ignoreFrames() {
+        $this->browser->ignoreFrames();
+    }
+
+    /**
+     *    Switches off cookie sending and recieving.
+     *    @access public
+     */
+    function ignoreCookies() {
+        $this->browser->ignoreCookies();
+    }
+
+    /**
+     *    Skips errors for the next request only. You might
+     *    want to confirm that a page is unreachable for
+     *    example.
+     *    @access public
+     */
+    function ignoreErrors() {
+        $this->ignore_errors = true;
+    }
+
+    /**
+     *    Issues a fail if there is a transport error anywhere
+     *    in the current frameset. Only one such error is
+     *    reported.
+     *    @param string/boolean $result   HTML or failure.
+     *    @return string/boolean $result  Passes through result.
+     *    @access private
+     */
+    protected function failOnError($result) {
+        if (! $this->ignore_errors) {
+            if ($error = $this->browser->getTransportError()) {
+                $this->fail($error);
+            }
+        }
+        $this->ignore_errors = false;
+        return $result;
+    }
+
+    /**
+     *    Adds a header to every fetch.
+     *    @param string $header       Header line to add to every
+     *                                request until cleared.
+     *    @access public
+     */
+    function addHeader($header) {
+        $this->browser->addHeader($header);
+    }
+
+    /**
+     *    Sets the maximum number of redirects before
+     *    the web page is loaded regardless.
+     *    @param integer $max        Maximum hops.
+     *    @access public
+     */
+    function setMaximumRedirects($max) {
+        if (! $this->browser) {
+            trigger_error(
+                    'Can only set maximum redirects in a test method, setUp() or tearDown()');
+        }
+        $this->browser->setMaximumRedirects($max);
+    }
+
+    /**
+     *    Sets the socket timeout for opening a connection and
+     *    receiving at least one byte of information.
+     *    @param integer $timeout      Maximum time in seconds.
+     *    @access public
+     */
+    function setConnectionTimeout($timeout) {
+        $this->browser->setConnectionTimeout($timeout);
+    }
+
+    /**
+     *    Sets proxy to use on all requests for when
+     *    testing from behind a firewall. Set URL
+     *    to false to disable.
+     *    @param string $proxy        Proxy URL.
+     *    @param string $username     Proxy username for authentication.
+     *    @param string $password     Proxy password for authentication.
+     *    @access public
+     */
+    function useProxy($proxy, $username = false, $password = false) {
+        $this->browser->useProxy($proxy, $username, $password);
+    }
+
+    /**
+     *    Fetches a page into the page buffer. If
+     *    there is no base for the URL then the
+     *    current base URL is used. After the fetch
+     *    the base URL reflects the new location.
+     *    @param string $url          URL to fetch.
+     *    @param hash $parameters     Optional additional GET data.
+     *    @return boolean/string      Raw page on success.
+     *    @access public
+     */
+    function get($url, $parameters = false) {
+        return $this->failOnError($this->browser->get($url, $parameters));
+    }
+
+    /**
+     *    Fetches a page by POST into the page buffer.
+     *    If there is no base for the URL then the
+     *    current base URL is used. After the fetch
+     *    the base URL reflects the new location.
+     *    @param string $url          URL to fetch.
+     *    @param mixed $parameters    Optional POST parameters or content body to send
+     *    @param string $content_type Content type of provided body
+     *    @return boolean/string      Raw page on success.
+     *    @access public
+     */
+    function post($url, $parameters = false, $content_type = false) {
+        return $this->failOnError($this->browser->post($url, $parameters, $content_type));
+    }
+
+    /**
+     *    Fetches a page by PUT into the page buffer.
+     *    If there is no base for the URL then the
+     *    current base URL is used. After the fetch
+     *    the base URL reflects the new location.
+     *    @param string $url          URL to fetch.
+     *    @param mixed $body          Optional content body to send
+     *    @param string $content_type Content type of provided body
+     *    @return boolean/string      Raw page on success.
+     *    @access public
+     */
+    function put($url, $body = false, $content_type = false) {
+        return $this->failOnError($this->browser->put($url, $body, $content_type));
+    }
+
+    /**
+     *    Fetches a page by a DELETE request
+     *    @param string $url          URL to fetch.
+     *    @param hash $parameters     Optional additional parameters.
+     *    @return boolean/string      Raw page on success.
+     *    @access public
+     */
+    function delete($url, $parameters = false) {
+        return $this->failOnError($this->browser->delete($url, $parameters));
+    }
+
+
+    /**
+     *    Does a HTTP HEAD fetch, fetching only the page
+     *    headers. The current base URL is unchanged by this.
+     *    @param string $url          URL to fetch.
+     *    @param hash $parameters     Optional additional GET data.
+     *    @return boolean             True on success.
+     *    @access public
+     */
+    function head($url, $parameters = false) {
+        return $this->failOnError($this->browser->head($url, $parameters));
+    }
+
+    /**
+     *    Equivalent to hitting the retry button on the
+     *    browser. Will attempt to repeat the page fetch.
+     *    @return boolean     True if fetch succeeded.
+     *    @access public
+     */
+    function retry() {
+        return $this->failOnError($this->browser->retry());
+    }
+
+    /**
+     *    Equivalent to hitting the back button on the
+     *    browser.
+     *    @return boolean     True if history entry and
+     *                        fetch succeeded.
+     *    @access public
+     */
+    function back() {
+        return $this->failOnError($this->browser->back());
+    }
+
+    /**
+     *    Equivalent to hitting the forward button on the
+     *    browser.
+     *    @return boolean     True if history entry and
+     *                        fetch succeeded.
+     *    @access public
+     */
+    function forward() {
+        return $this->failOnError($this->browser->forward());
+    }
+
+    /**
+     *    Retries a request after setting the authentication
+     *    for the current realm.
+     *    @param string $username    Username for realm.
+     *    @param string $password    Password for realm.
+     *    @return boolean/string     HTML on successful fetch. Note
+     *                               that authentication may still have
+     *                               failed.
+     *    @access public
+     */
+    function authenticate($username, $password) {
+        return $this->failOnError(
+                $this->browser->authenticate($username, $password));
+    }
+
+    /**
+     *    Gets the cookie value for the current browser context.
+     *    @param string $name          Name of cookie.
+     *    @return string               Value of cookie or false if unset.
+     *    @access public
+     */
+    function getCookie($name) {
+        return $this->browser->getCurrentCookieValue($name);
+    }
+
+    /**
+     *    Sets a cookie in the current browser.
+     *    @param string $name          Name of cookie.
+     *    @param string $value         Cookie value.
+     *    @param string $host          Host upon which the cookie is valid.
+     *    @param string $path          Cookie path if not host wide.
+     *    @param string $expiry        Expiry date.
+     *    @access public
+     */
+    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
+        $this->browser->setCookie($name, $value, $host, $path, $expiry);
+    }
+
+    /**
+     *    Accessor for current frame focus. Will be
+     *    false if no frame has focus.
+     *    @return integer/string/boolean    Label if any, otherwise
+     *                                      the position in the frameset
+     *                                      or false if none.
+     *    @access public
+     */
+    function getFrameFocus() {
+        return $this->browser->getFrameFocus();
+    }
+
+    /**
+     *    Sets the focus by index. The integer index starts from 1.
+     *    @param integer $choice    Chosen frame.
+     *    @return boolean           True if frame exists.
+     *    @access public
+     */
+    function setFrameFocusByIndex($choice) {
+        return $this->browser->setFrameFocusByIndex($choice);
+    }
+
+    /**
+     *    Sets the focus by name.
+     *    @param string $name    Chosen frame.
+     *    @return boolean        True if frame exists.
+     *    @access public
+     */
+    function setFrameFocus($name) {
+        return $this->browser->setFrameFocus($name);
+    }
+
+    /**
+     *    Clears the frame focus. All frames will be searched
+     *    for content.
+     *    @access public
+     */
+    function clearFrameFocus() {
+        return $this->browser->clearFrameFocus();
+    }
+
+    /**
+     *    Clicks a visible text item. Will first try buttons,
+     *    then links and then images.
+     *    @param string $label        Visible text or alt text.
+     *    @return string/boolean      Raw page or false.
+     *    @access public
+     */
+    function click($label) {
+        return $this->failOnError($this->browser->click($label));
+    }
+
+    /**
+     *    Checks for a click target.
+     *    @param string $label        Visible text or alt text.
+     *    @return boolean             True if click target.
+     *    @access public
+     */
+    function assertClickable($label, $message = '%s') {
+        return $this->assertTrue(
+                $this->browser->isClickable($label),
+                sprintf($message, "Click target [$label] should exist"));
+    }
+
+    /**
+     *    Clicks the submit button by label. The owning
+     *    form will be submitted by this.
+     *    @param string $label    Button label. An unlabeled
+     *                            button can be triggered by 'Submit'.
+     *    @param hash $additional Additional form values.
+     *    @return boolean/string  Page on success, else false.
+     *    @access public
+     */
+    function clickSubmit($label = 'Submit', $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickSubmit($label, $additional));
+    }
+
+    /**
+     *    Clicks the submit button by name attribute. The owning
+     *    form will be submitted by this.
+     *    @param string $name     Name attribute of button.
+     *    @param hash $additional Additional form values.
+     *    @return boolean/string  Page on success.
+     *    @access public
+     */
+    function clickSubmitByName($name, $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickSubmitByName($name, $additional));
+    }
+
+    /**
+     *    Clicks the submit button by ID attribute. The owning
+     *    form will be submitted by this.
+     *    @param string $id       ID attribute of button.
+     *    @param hash $additional Additional form values.
+     *    @return boolean/string  Page on success.
+     *    @access public
+     */
+    function clickSubmitById($id, $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickSubmitById($id, $additional));
+    }
+
+    /**
+     *    Checks for a valid button label.
+     *    @param string $label        Visible text.
+     *    @return boolean             True if click target.
+     *    @access public
+     */
+    function assertSubmit($label, $message = '%s') {
+        return $this->assertTrue(
+                $this->browser->isSubmit($label),
+                sprintf($message, "Submit button [$label] should exist"));
+    }
+
+    /**
+     *    Clicks the submit image by some kind of label. Usually
+     *    the alt tag or the nearest equivalent. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param string $label    Alt attribute of button.
+     *    @param integer $x       X-coordinate of imaginary click.
+     *    @param integer $y       Y-coordinate of imaginary click.
+     *    @param hash $additional Additional form values.
+     *    @return boolean/string  Page on success.
+     *    @access public
+     */
+    function clickImage($label, $x = 1, $y = 1, $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickImage($label, $x, $y, $additional));
+    }
+
+    /**
+     *    Clicks the submit image by the name. Usually
+     *    the alt tag or the nearest equivalent. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param string $name     Name attribute of button.
+     *    @param integer $x       X-coordinate of imaginary click.
+     *    @param integer $y       Y-coordinate of imaginary click.
+     *    @param hash $additional Additional form values.
+     *    @return boolean/string  Page on success.
+     *    @access public
+     */
+    function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickImageByName($name, $x, $y, $additional));
+    }
+
+    /**
+     *    Clicks the submit image by ID attribute. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param integer/string $id   ID attribute of button.
+     *    @param integer $x           X-coordinate of imaginary click.
+     *    @param integer $y           Y-coordinate of imaginary click.
+     *    @param hash $additional     Additional form values.
+     *    @return boolean/string      Page on success.
+     *    @access public
+     */
+    function clickImageById($id, $x = 1, $y = 1, $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickImageById($id, $x, $y, $additional));
+    }
+
+    /**
+     *    Checks for a valid image with atht alt text or title.
+     *    @param string $label        Visible text.
+     *    @return boolean             True if click target.
+     *    @access public
+     */
+    function assertImage($label, $message = '%s') {
+        return $this->assertTrue(
+                $this->browser->isImage($label),
+                sprintf($message, "Image with text [$label] should exist"));
+    }
+
+    /**
+     *    Submits a form by the ID.
+     *    @param string $id       Form ID. No button information
+     *                            is submitted this way.
+     *    @return boolean/string  Page on success.
+     *    @access public
+     */
+    function submitFormById($id, $additional = false) {
+        return $this->failOnError($this->browser->submitFormById($id, $additional));
+    }
+
+    /**
+     *    Follows a link by name. Will click the first link
+     *    found with this link text by default, or a later
+     *    one if an index is given. Match is case insensitive
+     *    with normalised space.
+     *    @param string $label     Text between the anchor tags.
+     *    @param integer $index    Link position counting from zero.
+     *    @return boolean/string   Page on success.
+     *    @access public
+     */
+    function clickLink($label, $index = 0) {
+        return $this->failOnError($this->browser->clickLink($label, $index));
+    }
+
+    /**
+     *    Follows a link by id attribute.
+     *    @param string $id        ID attribute value.
+     *    @return boolean/string   Page on success.
+     *    @access public
+     */
+    function clickLinkById($id) {
+        return $this->failOnError($this->browser->clickLinkById($id));
+    }
+
+    /**
+     *    Tests for the presence of a link label. Match is
+     *    case insensitive with normalised space.
+     *    @param string $label     Text between the anchor tags.
+     *    @param mixed $expected   Expected URL or expectation object.
+     *    @param string $message   Message to display. Default
+     *                             can be embedded with %s.
+     *    @return boolean          True if link present.
+     *    @access public
+     */
+    function assertLink($label, $expected = true, $message = '%s') {
+        $url = $this->browser->getLink($label);
+        if ($expected === true || ($expected !== true && $url === false)) {
+            return $this->assertTrue($url !== false, sprintf($message, "Link [$label] should exist"));
+        }
+        if (! SimpleExpectation::isExpectation($expected)) {
+            $expected = new IdenticalExpectation($expected);
+        }
+        return $this->assert($expected, $url->asString(), sprintf($message, "Link [$label] should match"));
+    }
+
+    /**
+     *    Tests for the non-presence of a link label. Match is
+     *    case insensitive with normalised space.
+     *    @param string/integer $label    Text between the anchor tags
+     *                                    or ID attribute.
+     *    @param string $message          Message to display. Default
+     *                                    can be embedded with %s.
+     *    @return boolean                 True if link missing.
+     *    @access public
+     */
+    function assertNoLink($label, $message = '%s') {
+        return $this->assertTrue(
+                $this->browser->getLink($label) === false,
+                sprintf($message, "Link [$label] should not exist"));
+    }
+
+    /**
+     *    Tests for the presence of a link id attribute.
+     *    @param string $id        Id attribute value.
+     *    @param mixed $expected   Expected URL or expectation object.
+     *    @param string $message   Message to display. Default
+     *                             can be embedded with %s.
+     *    @return boolean          True if link present.
+     *    @access public
+     */
+    function assertLinkById($id, $expected = true, $message = '%s') {
+        $url = $this->browser->getLinkById($id);
+        if ($expected === true) {
+            return $this->assertTrue($url !== false, sprintf($message, "Link ID [$id] should exist"));
+        }
+        if (! SimpleExpectation::isExpectation($expected)) {
+            $expected = new IdenticalExpectation($expected);
+        }
+        return $this->assert($expected, $url->asString(), sprintf($message, "Link ID [$id] should match"));
+    }
+
+    /**
+     *    Tests for the non-presence of a link label. Match is
+     *    case insensitive with normalised space.
+     *    @param string $id        Id attribute value.
+     *    @param string $message   Message to display. Default
+     *                             can be embedded with %s.
+     *    @return boolean          True if link missing.
+     *    @access public
+     */
+    function assertNoLinkById($id, $message = '%s') {
+        return $this->assertTrue(
+                $this->browser->getLinkById($id) === false,
+                sprintf($message, "Link ID [$id] should not exist"));
+    }
+
+    /**
+     *    Sets all form fields with that label, or name if there
+     *    is no label attached.
+     *    @param string $name    Name of field in forms.
+     *    @param string $value   New value of field.
+     *    @return boolean        True if field exists, otherwise false.
+     *    @access public
+     */
+    function setField($label, $value, $position=false) {
+        return $this->browser->setField($label, $value, $position);
+    }
+
+    /**
+     *    Sets all form fields with that name.
+     *    @param string $name    Name of field in forms.
+     *    @param string $value   New value of field.
+     *    @return boolean        True if field exists, otherwise false.
+     *    @access public
+     */
+    function setFieldByName($name, $value, $position=false) {
+        return $this->browser->setFieldByName($name, $value, $position);
+    }
+
+    /**
+     *    Sets all form fields with that id.
+     *    @param string/integer $id   Id of field in forms.
+     *    @param string $value        New value of field.
+     *    @return boolean             True if field exists, otherwise false.
+     *    @access public
+     */
+    function setFieldById($id, $value) {
+        return $this->browser->setFieldById($id, $value);
+    }
+
+    /**
+     *    Confirms that the form element is currently set
+     *    to the expected value. A missing form will always
+     *    fail. If no value is given then only the existence
+     *    of the field is checked.
+     *    @param string $name       Name of field in forms.
+     *    @param mixed $expected    Expected string/array value or
+     *                              false for unset fields.
+     *    @param string $message    Message to display. Default
+     *                              can be embedded with %s.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertField($label, $expected = true, $message = '%s') {
+        $value = $this->browser->getField($label);
+        return $this->assertFieldValue($label, $value, $expected, $message);
+    }
+
+    /**
+     *    Confirms that the form element is currently set
+     *    to the expected value. A missing form element will always
+     *    fail. If no value is given then only the existence
+     *    of the field is checked.
+     *    @param string $name       Name of field in forms.
+     *    @param mixed $expected    Expected string/array value or
+     *                              false for unset fields.
+     *    @param string $message    Message to display. Default
+     *                              can be embedded with %s.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertFieldByName($name, $expected = true, $message = '%s') {
+        $value = $this->browser->getFieldByName($name);
+        return $this->assertFieldValue($name, $value, $expected, $message);
+    }
+
+    /**
+     *    Confirms that the form element is currently set
+     *    to the expected value. A missing form will always
+     *    fail. If no ID is given then only the existence
+     *    of the field is checked.
+     *    @param string/integer $id  Name of field in forms.
+     *    @param mixed $expected     Expected string/array value or
+     *                               false for unset fields.
+     *    @param string $message     Message to display. Default
+     *                               can be embedded with %s.
+     *    @return boolean            True if pass.
+     *    @access public
+     */
+    function assertFieldById($id, $expected = true, $message = '%s') {
+        $value = $this->browser->getFieldById($id);
+        return $this->assertFieldValue($id, $value, $expected, $message);
+    }
+
+    /**
+     *    Tests the field value against the expectation.
+     *    @param string $identifier      Name, ID or label.
+     *    @param mixed $value            Current field value.
+     *    @param mixed $expected         Expected value to match.
+     *    @param string $message         Failure message.
+     *    @return boolean                True if pass
+     *    @access protected
+     */
+    protected function assertFieldValue($identifier, $value, $expected, $message) {
+        if ($expected === true) {
+            return $this->assertTrue(
+                    isset($value),
+                    sprintf($message, "Field [$identifier] should exist"));
+        }
+        if (! SimpleExpectation::isExpectation($expected)) {
+            $identifier = str_replace('%', '%%', $identifier);
+            $expected = new FieldExpectation(
+                    $expected,
+                    "Field [$identifier] should match with [%s]");
+        }
+        return $this->assert($expected, $value, $message);
+    }
+
+    /**
+     *    Checks the response code against a list
+     *    of possible values.
+     *    @param array $responses    Possible responses for a pass.
+     *    @param string $message     Message to display. Default
+     *                               can be embedded with %s.
+     *    @return boolean            True if pass.
+     *    @access public
+     */
+    function assertResponse($responses, $message = '%s') {
+        $responses = (is_array($responses) ? $responses : array($responses));
+        $code = $this->browser->getResponseCode();
+        $message = sprintf($message, "Expecting response in [" .
+                implode(", ", $responses) . "] got [$code]");
+        return $this->assertTrue(in_array($code, $responses), $message);
+    }
+
+    /**
+     *    Checks the mime type against a list
+     *    of possible values.
+     *    @param array $types      Possible mime types for a pass.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertMime($types, $message = '%s') {
+        $types = (is_array($types) ? $types : array($types));
+        $type = $this->browser->getMimeType();
+        $message = sprintf($message, "Expecting mime type in [" .
+                implode(", ", $types) . "] got [$type]");
+        return $this->assertTrue(in_array($type, $types), $message);
+    }
+
+    /**
+     *    Attempt to match the authentication type within
+     *    the security realm we are currently matching.
+     *    @param string $authentication   Usually basic.
+     *    @param string $message          Message to display.
+     *    @return boolean                 True if pass.
+     *    @access public
+     */
+    function assertAuthentication($authentication = false, $message = '%s') {
+        if (! $authentication) {
+            $message = sprintf($message, "Expected any authentication type, got [" .
+                    $this->browser->getAuthentication() . "]");
+            return $this->assertTrue(
+                    $this->browser->getAuthentication(),
+                    $message);
+        } else {
+            $message = sprintf($message, "Expected authentication [$authentication] got [" .
+                    $this->browser->getAuthentication() . "]");
+            return $this->assertTrue(
+                    strtolower($this->browser->getAuthentication()) == strtolower($authentication),
+                    $message);
+        }
+    }
+
+    /**
+     *    Checks that no authentication is necessary to view
+     *    the desired page.
+     *    @param string $message     Message to display.
+     *    @return boolean            True if pass.
+     *    @access public
+     */
+    function assertNoAuthentication($message = '%s') {
+        $message = sprintf($message, "Expected no authentication type, got [" .
+                $this->browser->getAuthentication() . "]");
+        return $this->assertFalse($this->browser->getAuthentication(), $message);
+    }
+
+    /**
+     *    Attempts to match the current security realm.
+     *    @param string $realm     Name of security realm.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertRealm($realm, $message = '%s') {
+        if (! SimpleExpectation::isExpectation($realm)) {
+            $realm = new EqualExpectation($realm);
+        }
+        return $this->assert(
+                $realm,
+                $this->browser->getRealm(),
+                "Expected realm -> $message");
+    }
+
+    /**
+     *    Checks each header line for the required value. If no
+     *    value is given then only an existence check is made.
+     *    @param string $header    Case insensitive header name.
+     *    @param mixed $value      Case sensitive trimmed string to
+     *                             match against. An expectation object
+     *                             can be used for pattern matching.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertHeader($header, $value = false, $message = '%s') {
+        return $this->assert(
+                new HttpHeaderExpectation($header, $value),
+                $this->browser->getHeaders(),
+                $message);
+    }
+
+    /**
+     *    Confirms that the header type has not been received.
+     *    Only the landing page is checked. If you want to check
+     *    redirect pages, then you should limit redirects so
+     *    as to capture the page you want.
+     *    @param string $header    Case insensitive header name.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertNoHeader($header, $message = '%s') {
+        return $this->assert(
+                new NoHttpHeaderExpectation($header),
+                $this->browser->getHeaders(),
+                $message);
+    }
+
+    /**
+     *    Tests the text between the title tags.
+     *    @param string/SimpleExpectation $title    Expected title.
+     *    @param string $message                    Message to display.
+     *    @return boolean                           True if pass.
+     *    @access public
+     */
+    function assertTitle($title = false, $message = '%s') {
+        if (! SimpleExpectation::isExpectation($title)) {
+            $title = new EqualExpectation($title);
+        }
+        return $this->assert($title, $this->browser->getTitle(), $message);
+    }
+
+    /**
+     *    Will trigger a pass if the text is found in the plain
+     *    text form of the page.
+     *    @param string $text       Text to look for.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertText($text, $message = '%s') {
+        return $this->assert(
+                new TextExpectation($text),
+                $this->browser->getContentAsText(),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the text is not found in the plain
+     *    text form of the page.
+     *    @param string $text       Text to look for.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertNoText($text, $message = '%s') {
+        return $this->assert(
+                new NoTextExpectation($text),
+                $this->browser->getContentAsText(),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the Perl regex pattern
+     *    is found in the raw content.
+     *    @param string $pattern    Perl regex to look for including
+     *                              the regex delimiters.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertPattern($pattern, $message = '%s') {
+        return $this->assert(
+                new PatternExpectation($pattern),
+                $this->browser->getContent(),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the perl regex pattern
+     *    is not present in raw content.
+     *    @param string $pattern    Perl regex to look for including
+     *                              the regex delimiters.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertNoPattern($pattern, $message = '%s') {
+        return $this->assert(
+                new NoPatternExpectation($pattern),
+                $this->browser->getContent(),
+                $message);
+    }
+
+    /**
+     *    Checks that a cookie is set for the current page
+     *    and optionally checks the value.
+     *    @param string $name        Name of cookie to test.
+     *    @param string $expected    Expected value as a string or
+     *                               false if any value will do.
+     *    @param string $message     Message to display.
+     *    @return boolean            True if pass.
+     *    @access public
+     */
+    function assertCookie($name, $expected = false, $message = '%s') {
+        $value = $this->getCookie($name);
+        if (! $expected) {
+            return $this->assertTrue(
+                    $value,
+                    sprintf($message, "Expecting cookie [$name]"));
+        }
+        if (! SimpleExpectation::isExpectation($expected)) {
+            $expected = new EqualExpectation($expected);
+        }
+        return $this->assert($expected, $value, "Expecting cookie [$name] -> $message");
+    }
+
+    /**
+     *    Checks that no cookie is present or that it has
+     *    been successfully cleared.
+     *    @param string $name        Name of cookie to test.
+     *    @param string $message     Message to display.
+     *    @return boolean            True if pass.
+     *    @access public
+     */
+    function assertNoCookie($name, $message = '%s') {
+        return $this->assertTrue(
+                $this->getCookie($name) === null or $this->getCookie($name) === false,
+                sprintf($message, "Not expecting cookie [$name]"));
+    }
+
+    /**
+     *    Called from within the test methods to register
+     *    passes and failures.
+     *    @param boolean $result    Pass on true.
+     *    @param string $message    Message to display describing
+     *                              the test state.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertTrue($result, $message = '%s') {
+        return $this->assert(new TrueExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will be true on false and vice versa. False
+     *    is the PHP definition of false, so that null,
+     *    empty strings, zero and an empty array all count
+     *    as false.
+     *    @param boolean $result    Pass on false.
+     *    @param string $message    Message to display.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertFalse($result, $message = '%s') {
+        return $this->assert(new FalseExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    the same value only. Otherwise a fail. This
+     *    is for testing hand extracted text, etc.
+     *    @param mixed $first          Value to compare.
+     *    @param mixed $second         Value to compare.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass
+     *    @access public
+     */
+    function assertEqual($first, $second, $message = '%s') {
+        return $this->assert(
+                new EqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    a different value. Otherwise a fail. This
+     *    is for testing hand extracted text, etc.
+     *    @param mixed $first           Value to compare.
+     *    @param mixed $second          Value to compare.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertNotEqual($first, $second, $message = '%s') {
+        return $this->assert(
+                new NotEqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Uses a stack trace to find the line of an assertion.
+     *    @return string           Line number of first assert*
+     *                             method embedded in format string.
+     *    @access public
+     */
+    function getAssertionLine() {
+        $trace = new SimpleStackTrace(array('assert', 'click', 'pass', 'fail'));
+        return $trace->traceMethod();
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/xml.php b/3rdparty/simpletest/xml.php
new file mode 100755
index 00000000000..54fb6f5b16d
--- /dev/null
+++ b/3rdparty/simpletest/xml.php
@@ -0,0 +1,647 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: xml.php 1787 2008-04-26 20:35:39Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/scorer.php');
+/**#@-*/
+
+/**
+ *    Creates the XML needed for remote communication
+ *    by SimpleTest.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class XmlReporter extends SimpleReporter {
+    private $indent;
+    private $namespace;
+
+    /**
+     *    Sets up indentation and namespace.
+     *    @param string $namespace        Namespace to add to each tag.
+     *    @param string $indent           Indenting to add on each nesting.
+     *    @access public
+     */
+    function __construct($namespace = false, $indent = '  ') {
+        parent::__construct();
+        $this->namespace = ($namespace ? $namespace . ':' : '');
+        $this->indent = $indent;
+    }
+
+    /**
+     *    Calculates the pretty printing indent level
+     *    from the current level of nesting.
+     *    @param integer $offset  Extra indenting level.
+     *    @return string          Leading space.
+     *    @access protected
+     */
+    protected function getIndent($offset = 0) {
+        return str_repeat(
+                $this->indent,
+                count($this->getTestList()) + $offset);
+    }
+
+    /**
+     *    Converts character string to parsed XML
+     *    entities string.
+     *    @param string text        Unparsed character data.
+     *    @return string            Parsed character data.
+     *    @access public
+     */
+    function toParsedXml($text) {
+        return str_replace(
+                array('&', '<', '>', '"', '\''),
+                array('&amp;', '&lt;', '&gt;', '&quot;', '&apos;'),
+                $text);
+    }
+
+    /**
+     *    Paints the start of a group test.
+     *    @param string $test_name   Name of test that is starting.
+     *    @param integer $size       Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_name, $size) {
+        parent::paintGroupStart($test_name, $size);
+        print $this->getIndent();
+        print "<" . $this->namespace . "group size=\"$size\">\n";
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "name>" .
+                $this->toParsedXml($test_name) .
+                "</" . $this->namespace . "name>\n";
+    }
+
+    /**
+     *    Paints the end of a group test.
+     *    @param string $test_name   Name of test that is ending.
+     *    @access public
+     */
+    function paintGroupEnd($test_name) {
+        print $this->getIndent();
+        print "</" . $this->namespace . "group>\n";
+        parent::paintGroupEnd($test_name);
+    }
+
+    /**
+     *    Paints the start of a test case.
+     *    @param string $test_name   Name of test that is starting.
+     *    @access public
+     */
+    function paintCaseStart($test_name) {
+        parent::paintCaseStart($test_name);
+        print $this->getIndent();
+        print "<" . $this->namespace . "case>\n";
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "name>" .
+                $this->toParsedXml($test_name) .
+                "</" . $this->namespace . "name>\n";
+    }
+
+    /**
+     *    Paints the end of a test case.
+     *    @param string $test_name   Name of test that is ending.
+     *    @access public
+     */
+    function paintCaseEnd($test_name) {
+        print $this->getIndent();
+        print "</" . $this->namespace . "case>\n";
+        parent::paintCaseEnd($test_name);
+    }
+
+    /**
+     *    Paints the start of a test method.
+     *    @param string $test_name   Name of test that is starting.
+     *    @access public
+     */
+    function paintMethodStart($test_name) {
+        parent::paintMethodStart($test_name);
+        print $this->getIndent();
+        print "<" . $this->namespace . "test>\n";
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "name>" .
+                $this->toParsedXml($test_name) .
+                "</" . $this->namespace . "name>\n";
+    }
+
+    /**
+     *    Paints the end of a test method.
+     *    @param string $test_name   Name of test that is ending.
+     *    @param integer $progress   Number of test cases ending.
+     *    @access public
+     */
+    function paintMethodEnd($test_name) {
+        print $this->getIndent();
+        print "</" . $this->namespace . "test>\n";
+        parent::paintMethodEnd($test_name);
+    }
+
+    /**
+     *    Paints pass as XML.
+     *    @param string $message        Message to encode.
+     *    @access public
+     */
+    function paintPass($message) {
+        parent::paintPass($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "pass>";
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "pass>\n";
+    }
+
+    /**
+     *    Paints failure as XML.
+     *    @param string $message        Message to encode.
+     *    @access public
+     */
+    function paintFail($message) {
+        parent::paintFail($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "fail>";
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "fail>\n";
+    }
+
+    /**
+     *    Paints error as XML.
+     *    @param string $message        Message to encode.
+     *    @access public
+     */
+    function paintError($message) {
+        parent::paintError($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "exception>";
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "exception>\n";
+    }
+
+    /**
+     *    Paints exception as XML.
+     *    @param Exception $exception    Exception to encode.
+     *    @access public
+     */
+    function paintException($exception) {
+        parent::paintException($exception);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "exception>";
+        $message = 'Unexpected exception of type [' . get_class($exception) .
+                '] with message ['. $exception->getMessage() .
+                '] in ['. $exception->getFile() .
+                ' line ' . $exception->getLine() . ']';
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "exception>\n";
+    }
+
+    /**
+     *    Paints the skipping message and tag.
+     *    @param string $message        Text to display in skip tag.
+     *    @access public
+     */
+    function paintSkip($message) {
+        parent::paintSkip($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "skip>";
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "skip>\n";
+    }
+
+    /**
+     *    Paints a simple supplementary message.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintMessage($message) {
+        parent::paintMessage($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "message>";
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "message>\n";
+    }
+
+    /**
+     *    Paints a formatted ASCII message such as a
+     *    privateiable dump.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+        parent::paintFormattedMessage($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "formatted>";
+        print "<![CDATA[$message]]>";
+        print "</" . $this->namespace . "formatted>\n";
+    }
+
+    /**
+     *    Serialises the event object.
+     *    @param string $type        Event type as text.
+     *    @param mixed $payload      Message or object.
+     *    @access public
+     */
+    function paintSignal($type, $payload) {
+        parent::paintSignal($type, $payload);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "signal type=\"$type\">";
+        print "<![CDATA[" . serialize($payload) . "]]>";
+        print "</" . $this->namespace . "signal>\n";
+    }
+
+    /**
+     *    Paints the test document header.
+     *    @param string $test_name     First test top level
+     *                                 to start.
+     *    @access public
+     *    @abstract
+     */
+    function paintHeader($test_name) {
+        if (! SimpleReporter::inCli()) {
+            header('Content-type: text/xml');
+        }
+        print "<?xml version=\"1.0\"";
+        if ($this->namespace) {
+            print " xmlns:" . $this->namespace .
+                    "=\"www.lastcraft.com/SimpleTest/Beta3/Report\"";
+        }
+        print "?>\n";
+        print "<" . $this->namespace . "run>\n";
+    }
+
+    /**
+     *    Paints the test document footer.
+     *    @param string $test_name        The top level test.
+     *    @access public
+     *    @abstract
+     */
+    function paintFooter($test_name) {
+        print "</" . $this->namespace . "run>\n";
+    }
+}
+
+/**
+ *    Accumulator for incoming tag. Holds the
+ *    incoming test structure information for
+ *    later dispatch to the reporter.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NestingXmlTag {
+    private $name;
+    private $attributes;
+
+    /**
+     *    Sets the basic test information except
+     *    the name.
+     *    @param hash $attributes   Name value pairs.
+     *    @access public
+     */
+    function NestingXmlTag($attributes) {
+        $this->name = false;
+        $this->attributes = $attributes;
+    }
+
+    /**
+     *    Sets the test case/method name.
+     *    @param string $name        Name of test.
+     *    @access public
+     */
+    function setName($name) {
+        $this->name = $name;
+    }
+
+    /**
+     *    Accessor for name.
+     *    @return string        Name of test.
+     *    @access public
+     */
+    function getName() {
+        return $this->name;
+    }
+
+    /**
+     *    Accessor for attributes.
+     *    @return hash        All attributes.
+     *    @access protected
+     */
+    protected function getAttributes() {
+        return $this->attributes;
+    }
+}
+
+/**
+ *    Accumulator for incoming method tag. Holds the
+ *    incoming test structure information for
+ *    later dispatch to the reporter.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NestingMethodTag extends NestingXmlTag {
+
+    /**
+     *    Sets the basic test information except
+     *    the name.
+     *    @param hash $attributes   Name value pairs.
+     *    @access public
+     */
+    function NestingMethodTag($attributes) {
+        $this->NestingXmlTag($attributes);
+    }
+
+    /**
+     *    Signals the appropriate start event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintStart(&$listener) {
+        $listener->paintMethodStart($this->getName());
+    }
+
+    /**
+     *    Signals the appropriate end event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintEnd(&$listener) {
+        $listener->paintMethodEnd($this->getName());
+    }
+}
+
+/**
+ *    Accumulator for incoming case tag. Holds the
+ *    incoming test structure information for
+ *    later dispatch to the reporter.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NestingCaseTag extends NestingXmlTag {
+
+    /**
+     *    Sets the basic test information except
+     *    the name.
+     *    @param hash $attributes   Name value pairs.
+     *    @access public
+     */
+    function NestingCaseTag($attributes) {
+        $this->NestingXmlTag($attributes);
+    }
+
+    /**
+     *    Signals the appropriate start event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintStart(&$listener) {
+        $listener->paintCaseStart($this->getName());
+    }
+
+    /**
+     *    Signals the appropriate end event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintEnd(&$listener) {
+        $listener->paintCaseEnd($this->getName());
+    }
+}
+
+/**
+ *    Accumulator for incoming group tag. Holds the
+ *    incoming test structure information for
+ *    later dispatch to the reporter.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NestingGroupTag extends NestingXmlTag {
+
+    /**
+     *    Sets the basic test information except
+     *    the name.
+     *    @param hash $attributes   Name value pairs.
+     *    @access public
+     */
+    function NestingGroupTag($attributes) {
+        $this->NestingXmlTag($attributes);
+    }
+
+    /**
+     *    Signals the appropriate start event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintStart(&$listener) {
+        $listener->paintGroupStart($this->getName(), $this->getSize());
+    }
+
+    /**
+     *    Signals the appropriate end event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintEnd(&$listener) {
+        $listener->paintGroupEnd($this->getName());
+    }
+
+    /**
+     *    The size in the attributes.
+     *    @return integer     Value of size attribute or zero.
+     *    @access public
+     */
+    function getSize() {
+        $attributes = $this->getAttributes();
+        if (isset($attributes['SIZE'])) {
+            return (integer)$attributes['SIZE'];
+        }
+        return 0;
+    }
+}
+
+/**
+ *    Parser for importing the output of the XmlReporter.
+ *    Dispatches that output to another reporter.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleTestXmlParser {
+    private $listener;
+    private $expat;
+    private $tag_stack;
+    private $in_content_tag;
+    private $content;
+    private $attributes;
+
+    /**
+     *    Loads a listener with the SimpleReporter
+     *    interface.
+     *    @param SimpleReporter $listener   Listener of tag events.
+     *    @access public
+     */
+    function SimpleTestXmlParser(&$listener) {
+        $this->listener = &$listener;
+        $this->expat = &$this->createParser();
+        $this->tag_stack = array();
+        $this->in_content_tag = false;
+        $this->content = '';
+        $this->attributes = array();
+    }
+
+    /**
+     *    Parses a block of XML sending the results to
+     *    the listener.
+     *    @param string $chunk        Block of text to read.
+     *    @return boolean             True if valid XML.
+     *    @access public
+     */
+    function parse($chunk) {
+        if (! xml_parse($this->expat, $chunk)) {
+            trigger_error('XML parse error with ' .
+                    xml_error_string(xml_get_error_code($this->expat)));
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Sets up expat as the XML parser.
+     *    @return resource        Expat handle.
+     *    @access protected
+     */
+    protected function &createParser() {
+        $expat = xml_parser_create();
+        xml_set_object($expat, $this);
+        xml_set_element_handler($expat, 'startElement', 'endElement');
+        xml_set_character_data_handler($expat, 'addContent');
+        xml_set_default_handler($expat, 'defaultContent');
+        return $expat;
+    }
+
+    /**
+     *    Opens a new test nesting level.
+     *    @return NestedXmlTag     The group, case or method tag
+     *                             to start.
+     *    @access private
+     */
+    protected function pushNestingTag($nested) {
+        array_unshift($this->tag_stack, $nested);
+    }
+
+    /**
+     *    Accessor for current test structure tag.
+     *    @return NestedXmlTag     The group, case or method tag
+     *                             being parsed.
+     *    @access private
+     */
+    protected function &getCurrentNestingTag() {
+        return $this->tag_stack[0];
+    }
+
+    /**
+     *    Ends a nesting tag.
+     *    @return NestedXmlTag     The group, case or method tag
+     *                             just finished.
+     *    @access private
+     */
+    protected function popNestingTag() {
+        return array_shift($this->tag_stack);
+    }
+
+    /**
+     *    Test if tag is a leaf node with only text content.
+     *    @param string $tag        XML tag name.
+     *    @return @boolean          True if leaf, false if nesting.
+     *    @private
+     */
+    protected function isLeaf($tag) {
+        return in_array($tag, array(
+                'NAME', 'PASS', 'FAIL', 'EXCEPTION', 'SKIP', 'MESSAGE', 'FORMATTED', 'SIGNAL'));
+    }
+
+    /**
+     *    Handler for start of event element.
+     *    @param resource $expat     Parser handle.
+     *    @param string $tag         Element name.
+     *    @param hash $attributes    Name value pairs.
+     *                               Attributes without content
+     *                               are marked as true.
+     *    @access protected
+     */
+    protected function startElement($expat, $tag, $attributes) {
+        $this->attributes = $attributes;
+        if ($tag == 'GROUP') {
+            $this->pushNestingTag(new NestingGroupTag($attributes));
+        } elseif ($tag == 'CASE') {
+            $this->pushNestingTag(new NestingCaseTag($attributes));
+        } elseif ($tag == 'TEST') {
+            $this->pushNestingTag(new NestingMethodTag($attributes));
+        } elseif ($this->isLeaf($tag)) {
+            $this->in_content_tag = true;
+            $this->content = '';
+        }
+    }
+
+    /**
+     *    End of element event.
+     *    @param resource $expat     Parser handle.
+     *    @param string $tag         Element name.
+     *    @access protected
+     */
+    protected function endElement($expat, $tag) {
+        $this->in_content_tag = false;
+        if (in_array($tag, array('GROUP', 'CASE', 'TEST'))) {
+            $nesting_tag = $this->popNestingTag();
+            $nesting_tag->paintEnd($this->listener);
+        } elseif ($tag == 'NAME') {
+            $nesting_tag = &$this->getCurrentNestingTag();
+            $nesting_tag->setName($this->content);
+            $nesting_tag->paintStart($this->listener);
+        } elseif ($tag == 'PASS') {
+            $this->listener->paintPass($this->content);
+        } elseif ($tag == 'FAIL') {
+            $this->listener->paintFail($this->content);
+        } elseif ($tag == 'EXCEPTION') {
+            $this->listener->paintError($this->content);
+        } elseif ($tag == 'SKIP') {
+            $this->listener->paintSkip($this->content);
+        } elseif ($tag == 'SIGNAL') {
+            $this->listener->paintSignal(
+                    $this->attributes['TYPE'],
+                    unserialize($this->content));
+        } elseif ($tag == 'MESSAGE') {
+            $this->listener->paintMessage($this->content);
+        } elseif ($tag == 'FORMATTED') {
+            $this->listener->paintFormattedMessage($this->content);
+        }
+    }
+
+    /**
+     *    Content between start and end elements.
+     *    @param resource $expat     Parser handle.
+     *    @param string $text        Usually output messages.
+     *    @access protected
+     */
+    protected function addContent($expat, $text) {
+        if ($this->in_content_tag) {
+            $this->content .= $text;
+        }
+        return true;
+    }
+
+    /**
+     *    XML and Doctype handler. Discards all such content.
+     *    @param resource $expat     Parser handle.
+     *    @param string $default     Text of default content.
+     *    @access protected
+     */
+    protected function defaultContent($expat, $default) {
+    }
+}
+?>
diff --git a/lib/base.php b/lib/base.php
index 31133b72624..8f169a5732f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -68,6 +68,9 @@ class OC{
 		elseif(strpos($className,'Sabre_')===0) {
 			require_once str_replace('_','/',$className) . '.php';
 		}
+		elseif(strpos($className,'Test_')===0){
+			require_once 'tests/lib/'.strtolower(str_replace('_','/',substr($className,5)) . '.php');
+		}
 	}
 
 	/**
diff --git a/lib/testcase.php b/lib/testcase.php
deleted file mode 100644
index 19494dc2f19..00000000000
--- a/lib/testcase.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-/**
-* ownCloud
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@gmailc.om
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-
-/**
- * base class for unit tests
- */
-class OC_TestCase{
-	private $tests; //array of all tests in this test case
-	
-	public function __construct(){
-		$this->tests=array();
-		$this->results=array();
-		$functions=get_class_methods(get_class($this));
-		$exclude=get_class_methods('OC_TestCase');
-		foreach($functions as $function){
-			if(array_search($function,$exclude)===false){
-				$this->tests[]=$function;
-			}
-		}
-	}
-	
-	public function getTests(){
-		return $this->tests;
-	}
-	
-	/**
-	 * function that gets called before each test
-	 */
-	private function setup(){
-	}
-
-	/**
-	 * function that gets called after each test
-	 */
-	private function tearDown(){
-	}
-	
-	/**
-	 * check if the result equals the expected result
-	 * @param mixed $expected the expected result
-	 * @param mixed $result the actual result
-	 * @param string $error (optional) the error message to display if the result isn't expected
-	 */
-	protected function assertEquals($expected,$result,$error=''){
-		if($expected!==$result){
-			if($expected===true){
-				$expected='true';
-			}
-			if($expected===false){
-				$expected='false';
-			}
-			if($result===true){
-				$result='true';
-			}
-			if($result===false){
-				$result='false';
-			}
-			if($error==''){
-				$error="Unexpected result, expected '$expected' but was '$result'";
-			}
-			throw new Exception($error);
-		}
-	}
-
-	/**
-	 * fail the test
-	 * @param string $error the error message
-	 */
-	protected function fail($error){
-		throw new Exception($error);
-	}
-}
\ No newline at end of file
diff --git a/tests/index.php b/tests/index.php
index 34e1d4166ce..d29579a4bba 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -3,7 +3,7 @@
 * ownCloud
 *
 * @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@gmailc.om
+* @copyright 2012 Robin Appelman icewind@owncloud.com
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -20,59 +20,36 @@
 *
 */
 
+require_once '../lib/base.php';
+require_once 'simpletest/unit_tester.php';
+require_once 'simpletest/mock_objects.php';
+require_once 'simpletest/collector.php';
+require_once 'simpletest/default_reporter.php';
 
-/**
- * run all test cases
- */
- $RUNTIME_NOSETUPFS=true;
-require_once('../lib/base.php');
-OC_Util::checkAdminUser();
+//load all test cases
+loadTests();
 
-$testCases=loadFiles(__DIR__,array('index.php','templates'));
-@ob_end_clean();
-$testResults=array();
-foreach($testCases as $testCaseClass){
-	$testCase=new $testCaseClass();
-	$results=array();
-	foreach($testCase->getTests() as $test){
-		$testCase->setup();
-		try{
-			$testCase->$test();
-			$results[$test]='Ok';
-		}catch(Exception $e){
-			$results[$test]=$e->getMessage();
+function loadTests($dir=''){
+	$basedir=dirname(__FILE__).'/';
+	if($dh=opendir($basedir.$dir)){
+		while($name=readdir($dh)){
+			if(substr($name,0,1)!='.'){//no hidden files, '.' or '..'
+				$file=$dir.'/'.$name;
+				if(is_dir($basedir.$file)){
+					loadTests($file);
+				}elseif(substr($file,-4)=='.php' and $file!=__FILE__){
+					$testCase=new TestSuite(getTestName($file));
+					$testCase->addFile($basedir.$file);
+					if($testCase->getSize()>0){
+						$testCase->run(new DefaultReporter());
+					}
+				}
+			}
 		}
-		$testCase->tearDown();
 	}
-	$testResults[$testCaseClass]=$results;
 }
 
-$tmpl = new OC_Template( 'tests', 'index');
-$tmpl->assign('tests',$testResults);
-$tmpl->printPage();
-
-/**
- * recursively load all files in a folder
- * @param string $path
- * @param array $exclude list of files to exclude
- */
-function loadFiles($path,$exclude=false){
-	$results=array();
-	if(!$exclude){
-		$exclude=array();
-	}
-	$dh=opendir($path);
-	while($file=readdir($dh)){
-		if($file!='.' && $file!='..' && array_search($file,$exclude)===false){
-			if(is_file($path.'/'.$file) and substr($file,-3)=='php'){
-				$result=require_once($path.'/'.$file);
-				$results[]=$result;
-			}elseif(is_dir($path.'/'.$file)){
-				$subResults=loadFiles($path.'/'.$file);
-				$results=array_merge($results,$subResults);
-			}
-		}
-	}
-	return $results;
+function getTestName($file){
+	//TODO: get better test names
+	return substr($file,5,-4);//strip /lib/ and .php
 }
-?>
diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
new file mode 100644
index 00000000000..edb029d916f
--- /dev/null
+++ b/tests/lib/filestorage.php
@@ -0,0 +1,63 @@
+<?php
+/**
+* ownCloud
+*
+* @author Robin Appelman
+* @copyright 2012 Robin Appelman icewind@owncloud.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+abstract class Test_FileStorage extends UnitTestCase {
+	/**
+	 * @var OC_Filestorage instance
+	 */
+	protected $instance;
+
+	/**
+	 * the root folder of the storage should always exist, be readable and be recognized as a directory
+	 */
+	public function testRoot(){
+		$this->assertTrue($this->instance->file_exists('/'),'Root folder does not exist');
+		$this->assertTrue($this->instance->is_readable('/'),'Root folder is not readable');
+		$this->assertTrue($this->instance->is_dir('/'),'Root folder is not a directory');
+		$this->assertFalse($this->instance->is_file('/'),'Root folder is a file');
+		
+		//without this, any further testing would be useless, not an acutal requirement for filestorage though
+		$this->assertTrue($this->instance->is_writable('/'),'Root folder is not writable');
+	}
+
+	/**
+	 * test the various uses of file_get_contents and file_put_contents
+	 */
+	public function testGetPutContents(){
+		$sourceFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
+		$sourceText=file_get_contents($sourceFile);
+		
+		//fill a file with string data
+		$this->instance->file_put_contents('/lorem.txt',$sourceText);
+		$this->assertEqual($sourceText,$this->instance->file_get_contents('/lorem.txt'),'data returned from file_get_contents is not equal to the source data');
+
+		//fill a file with a stream
+		$this->instance->file_put_contents('/lorem.txt',fopen($sourceFile,'r'));
+		$this->assertEqual($sourceText,$this->instance->file_get_contents('/lorem.txt'),'data returned from file_get_contents is not equal to the source data');
+
+		//empty the file
+		$this->instance->file_put_contents('/lorem.txt','');
+		$this->assertEqual('',$this->instance->file_get_contents('/lorem.txt'),'file not emptied');
+	}
+}
+
+
diff --git a/tests/lib/filestorage/local.php b/tests/lib/filestorage/local.php
new file mode 100644
index 00000000000..0a2d46c5ebc
--- /dev/null
+++ b/tests/lib/filestorage/local.php
@@ -0,0 +1,41 @@
+<?php
+/**
+* ownCloud
+*
+* @author Robin Appelman
+* @copyright 2012 Robin Appelman icewind@owncloud.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+class Test_Filestorage_Local extends Test_FileStorage {
+	/**
+	 * @var string tmpDir
+	 */
+	private $tmpDir;
+	public function setUp(){
+		$this->tmpDir=get_temp_dir().'/filestoragelocal';
+		if(!file_exists($this->tmpDir)){
+			mkdir($this->tmpDir);
+		}
+		$this->instance=new OC_Filestorage_Local(array('datadir'=>$this->tmpDir));
+	}
+
+	public function tearDown(){
+		OC_Helper::rmdirr($this->tmpDir);
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php
deleted file mode 100644
index 43cf2e53f3f..00000000000
--- a/tests/lib/filesystem.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-class OC_FILEYSYSTEM_Test extends OC_TestCase
-{
-	public function setup(){
-		OC_Util::setupFS('testuser','testcase');
-	}
-	public function tearDown(){
-		OC_Filesystem::chroot('');
-		OC_Filesystem::delTree('/testuser');
-		OC_Util::tearDownFS();
-	}
-	
-	public function isDir(){
-		$this->assertEquals(true, OC_Filesystem::is_dir('/'),'Root is not a directory');
-	}
-	
-	public function fileExists(){
-		$this->assertEquals(false, OC_Filesystem::file_exists('/dummy'),'Unexpected result with non-existing file');
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		$this->assertEquals(true, OC_Filesystem::file_exists('/dummy'),'Unexpected result with existing file');
-	}
-
-	public function mkdir(){
-		OC_Filesystem::mkdir('/dummy');
-		$this->assertEquals(true, OC_Filesystem::file_exists('/dummy'),'No such file or directory after creating folder');
-		$this->assertEquals(true, OC_Filesystem::is_dir('/dummy'),'File created instead of filder');
-	}
-
-	public function rmdir(){
-		OC_Filesystem::mkdir('/dummy');
-		OC_Filesystem::rmdir('/dummy');
-		$this->assertEquals(false, OC_Filesystem::file_exists('/dummy'),'Folder still exists after removing');
-	}
-
-	public function isFile(){
-		$this->assertEquals(false, OC_Filesystem::is_file('/'),'Root is a file');
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		$this->assertEquals(true, OC_Filesystem::is_file('/dummy'),'Created file is not said to be a file');
-	}
-
-	public function opendir(){
-		OC_Filesystem::file_put_contents('/dummy1','foo');
-		OC_Filesystem::file_put_contents('/dummy2','foo');
-		$dh=OC_Filesystem::opendir('/');
-		if(!$dh){
-			$this->fail('Failed to open root');
-		}
-		$dummy1Found=false;
-		$dummy2Found=false;
-		while($file=readdir($dh)){
-			if($file=='dummy1'){
-				$dummy1Found=true;
-			}elseif($file=='dummy2'){
-				$dummy2Found=true;
-			}elseif($file!='.' and $file!='..'){
-				$this->fail('Unexpected filename when reading opened dir');
-			}
-		}
-		$this->assertEquals(true,$dummy1Found,'Not all files found when reading opened dir');
-		$this->assertEquals(true,$dummy2Found,'Not all files found when reading opened dir');
-	}
-
-	public function filesize(){
-		OC_Filesystem::file_put_contents('/dummy','1234567890');
-		$this->assertEquals(10, OC_Filesystem::filesize('/dummy'),'Unexpected filesize');
-	}
-
-	public function stat(){
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		$time=time();
-		$stat=OC_Filesystem::stat('/dummy');
-		$this->assertEquals(true,abs($time-$stat['atime'])<1,'Unexpected access time');//there can be small difference between those values due to running time
-		$this->assertEquals(true,abs($time-$stat['ctime'])<1,'Unexpected creation time');
-		$this->assertEquals(true,abs($time-$stat['mtime'])<1,'Unexpected modified time');
-		$this->assertEquals(3,$stat['size'],'Unexpected filesize');
-	}
-
-	public function filetype(){
-		OC_Filesystem::file_put_contents('/dummyFile','foo');
-		OC_Filesystem::mkdir('/dummyFolder');
-		$this->assertEquals('file', OC_Filesystem::filetype('/dummyFile'),'Unexpected filetype of file');
-		$this->assertEquals('dir', OC_Filesystem::filetype('/dummyFolder'),'Unexpected filetype of folder');
-	}
-
-	public function readfile(){
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		ob_start();
-		OC_Filesystem::readfile('/dummy');
-		$this->assertEquals('foo', ob_get_contents(),'Unexpected output of readfile');
-		@ob_end_clean();
-	}
-
-	public function isReadable(){
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		$this->assertEquals(true, OC_Filesystem::is_readable('/dummy'),'Can\'t read created file');
-	}
-
-	public function isWritable(){
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		$this->assertEquals(true, OC_Filesystem::is_writeable('/dummy'),'Can\'t write created file');
-	}
-
-	public function fileatime(){
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		$time=time();
-		$this->assertEquals(true,abs($time-OC_Filesystem::fileatime('/dummy'))<1,'Unexpected access time');//there can be small difference between those values due to running time
-	}
-
-	public function filectime(){
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		$time=time();
-		$this->assertEquals(true,abs($time-OC_Filesystem::filectime('/dummy'))<1,'Unexpected creation time');//there can be small difference between those values due to running time
-	}
-
-	public function filemtime(){
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		$time=time();
-		$this->assertEquals(true,abs($time-OC_Filesystem::filemtime('/dummy'))<1,'Unexpected modified time');//there can be small difference between those values due to running time
-	}
-
-	public function fileGetContents(){
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		$this->assertEquals('foo', OC_Filesystem::file_get_contents('/dummy'),'Unexpected content of file');
-	}
-
-	public function unlink(){
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		OC_Filesystem::unlink('/dummy');
-		$this->assertEquals(false, OC_Filesystem::file_exists('/dummy'),'File still exists after deletion');
-	}
-
-	public function rename(){
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		OC_Filesystem::rename('/dummy','/bar');
-		$this->assertEquals(true, OC_Filesystem::file_exists('/bar'),'New file doesnt exists after moving');
-		$this->assertEquals(false, OC_Filesystem::file_exists('/dummy'),'Old file still exists after moving');
-		$this->assertEquals('foo', OC_Filesystem::file_get_contents('/bar'),'Unexpected content of file after moving');
-	}
-
-	public function copy(){
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		OC_Filesystem::copy('/dummy','/bar');
-		$this->assertEquals(true, OC_Filesystem::file_exists('/bar'),'New file doesnt exists after copying');
-		$this->assertEquals(true, OC_Filesystem::file_exists('/dummy'),'Old file doesnt exists after copying');
-		$this->assertEquals('foo', OC_Filesystem::file_get_contents('/bar'),'Unexpected content of file after copying');
-	}
-
-	public function fopen(){
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		$fh=OC_Filesystem::fopen('/dummy','r');
-		if(!$fh){
-			$this->fail('Cant open file for reading');
-		}
-		$content=fread($fh,3);
-		$this->assertEquals('foo', $content,'Unexpected content of file');
-		fclose($fh);
-		$fh=OC_Filesystem::fopen('/dummy','a');
-		fwrite($fh,'bar',3);
-		fclose($fh);
-		$this->assertEquals('foobar', OC_Filesystem::file_get_contents('/dummy'),'Unexpected content of file after appending');
-		$fh=OC_Filesystem::fopen('/dummy','w');
-		fwrite($fh,'bar',3);
-		fclose($fh);
-		$this->assertEquals('bar', OC_Filesystem::file_get_contents('/dummy'),'Unexpected content of file after writing');
-	}
-
-	public function toTmpFile(){
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		$tmp=OC_Filesystem::toTmpFile('/dummy');
-		$this->assertEquals('foo', file_get_contents($tmp),'Unexpected content of temporary file');
-		unlink($tmp);
-	}
-
-	public function fromTmpFile(){
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		$tmp=OC_Filesystem::toTmpFile('/dummy');
-		OC_Filesystem::fromTmpFile($tmp,'/bar');
-		$this->assertEquals('foo', OC_Filesystem::file_get_contents('/bar'),'Unexpected content of new file');
-		$this->assertEquals(false, file_exists($tmp),'Temporary file still exists');
-	}
-
-	public function getMimeType(){
-		OC_Filesystem::file_put_contents('/dummy','some plain text');
-		$this->assertEquals('text/plain', OC_Filesystem::getMimeType('/dummy'),'Unexpected mimetype of pain text file');
-		OC_Filesystem::file_put_contents('/dummy',"<?xml version='1.0'?>\n</dummy>");
-		$this->assertEquals('application/xml', OC_Filesystem::getMimeType('/dummy'),'Unexpected mimetype of xml file');
-	}
-
-	public function delTree(){
-		OC_Filesystem::mkdir('/dummy');
-		OC_Filesystem::file_put_contents('/dummy/bar','foo');
-		OC_Filesystem::delTree('/dummy');
-		$this->assertEquals(false, OC_Filesystem::file_exists('/dummy/bar'),'File in deleted folder still exists');
-		$this->assertEquals(false, OC_Filesystem::file_exists('/dummy'),'Deleted folder still exists');
-	}
-
-	public function getTree(){
-		OC_Filesystem::mkdir('/dummy');
-		OC_Filesystem::file_put_contents('/dummy/bar','foo');
-		$expected=array('/dummy','/dummy/bar');
-		$this->assertEquals($expected, OC_Filesystem::getTree('/dummy'),'Unexpected filelist returned');
-	}
-
-	public function hash(){
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		$this->assertEquals(md5('foo'), OC_Filesystem::hash('md5','/dummy'),'Unexpected md5 hash of file');
-	}
-
-	public function freeSpace(){
-		$oldSpace=OC_Filesystem::free_space('/');
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		$newSpace=OC_Filesystem::free_space('/');
-		$this->assertEquals(true, $newSpace<$oldSpace,'free space not smaller after creating a non empty file');
-	}
-
-	public function search(){
-		OC_Filesystem::file_put_contents('/dummy','foo');
-		$this->assertEquals(array('/dummy'),OC_Filesystem::search('my'),'unexpected file list after search');
-	}
-}
-return 'OC_FILEYSYSTEM_Test';
-?>
\ No newline at end of file
diff --git a/tests/templates/index.php b/tests/templates/index.php
deleted file mode 100644
index b8d3dac0666..00000000000
--- a/tests/templates/index.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php foreach($_['tests'] as $name=>$results):?>
-	<h2><?php echo $name;?></h2>
-	<ul>
-		<?php foreach($results as $test=>$result):?>
-			<li>
-				<b><?php echo $test;?></b>
-				<?php echo $result;?>
-			</il>
-		<?php endforeach ?>
-	</ul>
-<?php endforeach ?>
\ No newline at end of file
-- 
GitLab


From ee7931f457177d20f798b13911eb54fa92423f2f Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Feb 2012 20:26:54 +0100
Subject: [PATCH 468/546] Contacts: Add missing parameter

---
 apps/contacts/lib/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index b804983efa5..016bd2b791a 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -153,7 +153,7 @@ class OC_Contacts_App {
 		}
 	}
 
-	public static function setLastModifiedHeader() {
+	public static function setLastModifiedHeader($contact) {
 		$rev = $contact->getAsString('REV');
 		if ($rev) {
 			$rev = DateTime::createFromFormat(DateTime::W3C, $rev);
-- 
GitLab


From 45bb6f5fd49cc5f86107176cf34f1b097698ed72 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Feb 2012 20:38:06 +0100
Subject: [PATCH 469/546] OC_Response: add redirect function

---
 apps/contacts/thumbnail.php |  6 ++----
 lib/response.php            | 21 ++++++++++++++++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index d7043b75f04..9c68e0789b4 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -30,10 +30,8 @@ function getStandardImage(){
 	$date = new DateTime('now');
 	$date->add(new DateInterval('P10D'));
 	header('Expires: '.$date->format(DateTime::RFC2822));
-	header('Cache-Control: cache');
-	header('Pragma: cache');
-	header("HTTP/1.1 307 Temporary Redirect");
-	header('Location: '.OC_Helper::imagePath('contacts', 'person.png'));
+	OC_Response::enableCaching();
+	OC_Response::redirect(OC_Helper::imagePath('contacts', 'person.png'));
 }
 
 if(!function_exists('imagecreatefromjpeg')) {
diff --git a/lib/response.php b/lib/response.php
index c254ddd10e7..5f095a0affd 100644
--- a/lib/response.php
+++ b/lib/response.php
@@ -7,7 +7,9 @@
  */
 
 class OC_Response {
+	const STATUS_FOUND = 304;
 	const STATUS_NOT_MODIFIED = 304;
+	const STATUS_TEMPORARY_REDIRECT = 307;
 
 	static public function enableCaching() {
 		header('Cache-Control: cache');
@@ -15,12 +17,29 @@ class OC_Response {
 	}
 
 	static public function setStatus($status) {
+		$protocol = $_SERVER['SERVER_PROTOCOL'];
 		switch($status) {
 			case self::STATUS_NOT_MODIFIED:
 				$status = $status . ' Not Modified';
 				break;
+			case self::STATUS_TEMPORARY_REDIRECT:
+				if ($protocol == 'HTTP/1.1') {
+					$status = $status . ' Temporary Redirect';
+					break;
+				} else {
+					$status = self::STATUS_FOUND;
+					// fallthrough
+				}
+			case self::STATUS_FOUND;
+				$status = $status . ' Found';
+				break;
 		}
-		header($_SERVER["SERVER_PROTOCOL"].' '.$status);
+		header($protocol.' '.$status);
+	}
+
+	static public function redirect($location) {
+		self::setStatus(self::STATUS_TEMPORARY_REDIRECT);
+		header('Location: '.$location);
 	}
 
 	static public function setETagHeader($etag) {
-- 
GitLab


From 125cf79a377a1073d18e6c609da9a6fcee64677b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Feb 2012 20:38:28 +0100
Subject: [PATCH 470/546] OC_Response: add setExpiresHeader function

---
 apps/contacts/thumbnail.php |  4 +---
 lib/response.php            | 12 ++++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index 9c68e0789b4..0cdd0a86c74 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -27,9 +27,7 @@ OC_JSON::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 
 function getStandardImage(){
-	$date = new DateTime('now');
-	$date->add(new DateInterval('P10D'));
-	header('Expires: '.$date->format(DateTime::RFC2822));
+	OC_Response::setExpiresHeader('P10D');
 	OC_Response::enableCaching();
 	OC_Response::redirect(OC_Helper::imagePath('contacts', 'person.png'));
 }
diff --git a/lib/response.php b/lib/response.php
index 5f095a0affd..7733168b5b9 100644
--- a/lib/response.php
+++ b/lib/response.php
@@ -42,6 +42,18 @@ class OC_Response {
 		header('Location: '.$location);
 	}
 
+	static public function setExpiresHeader($expires) {
+		if (is_string($expires) && $expires[0] == 'P') {
+			$interval = $expires;
+			$expires = new DateTime('now');
+			$expires->add(new DateInterval(expires));
+		}
+		if ($expires instanceof DateTime) {
+			$expires = $expires->format(DateTime::RFC2822);
+		}
+		header('Expires: '.expires);
+	}
+
 	static public function setETagHeader($etag) {
 		if (empty($etag)) {
 			return;
-- 
GitLab


From 5c816c0cc93094b1ad6ca841e89dc5fe579b70b6 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Feb 2012 20:40:44 +0100
Subject: [PATCH 471/546] Contacts: Optimize thumbnail cache handling a bit

---
 apps/contacts/thumbnail.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index 0cdd0a86c74..c020c29ac8c 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -43,11 +43,12 @@ $id = $_GET['id'];
 $contact = OC_Contacts_App::getContactVCard($id);
 
 // invalid vcard
-if( is_null($contact)){
+if(is_null($contact)){
 	OC_Log::write('contacts','thumbnail.php. The VCard for ID '.$id.' is not RFC compatible',OC_Log::ERROR);
 	getStandardImage();
 	exit();
 }
+OC_Contacts_App::setLastModifiedHeader($contact);
 
 $thumbnail_size = 23;
 
@@ -56,12 +57,12 @@ $image = new OC_Image();
 $photo = $contact->getAsString('PHOTO');
 
 OC_Response::setETagHeader(md5($photo));
-OC_Contacts_App::setLastModifiedHeader($contact);
 
 if($image->loadFromBase64($photo)) {
 	if($image->centerCrop()) {
 		if($image->resize($thumbnail_size)) {
 			if($image->show()) {
+				// done
 				exit();
 			} else {
 				OC_Log::write('contacts','thumbnail.php. Couldn\'t display thumbnail for ID '.$id,OC_Log::ERROR);
-- 
GitLab


From a25bda8e414077cc10fd82aef0a653195b13da05 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Feb 2012 21:56:01 +0100
Subject: [PATCH 472/546] Add application name to title

---
 core/templates/layout.user.php | 2 +-
 lib/template.php               | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index f793275f2ca..64353d4d4f4 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title>ownCloud</title>
+		<title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
diff --git a/lib/template.php b/lib/template.php
index 84302fd1385..d991759fbcd 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -314,8 +314,15 @@ class OC_Template{
 				}
 
 				// Add navigation entry
-				$page->assign( "navigation", OC_App::getNavigation());
+				$navigation = OC_App::getNavigation();
+				$page->assign( "navigation", $navigation);
 				$page->assign( "settingsnavigation", OC_App::getSettingsNavigation());
+				foreach($navigation as $entry) {
+					if ($entry['active']) {
+						$page->assign( 'application', $entry['name'] );
+						break;
+					}
+				}
 			}else{
 				$page = new OC_Template( "core", "layout.guest" );
 			}
-- 
GitLab


From 40d343e2afc6e6a5a8a65093065315506e0b9be0 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 12 Feb 2012 22:33:16 +0100
Subject: [PATCH 473/546] fix oc-bug 239 - & => &amp;

---
 apps/calendar/js/calendar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 92a8ba20205..6f1f52eafa1 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -708,7 +708,7 @@ $(document).ready(function(){
 		eventDrop: Calendar.UI.moveEvent,
 		eventResize: Calendar.UI.resizeEvent,
 		eventRender: function(event, element) {
-			element.find('span.fc-event-title').html(element.find('span.fc-event-title').text());
+			element.find('.fc-event-title').html(element.find('.fc-event-title').text());
 			element.tipsy({
 				className: 'tipsy-event',
 				opacity: 0.9,
-- 
GitLab


From 3030f13d5fd89c93bcd54fcdc62c7d9eac53aa81 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 13 Feb 2012 10:25:45 +0100
Subject: [PATCH 474/546] some additional test cases for file storage backends

---
 tests/lib/filestorage.php | 51 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
index edb029d916f..7f024dafaa3 100644
--- a/tests/lib/filestorage.php
+++ b/tests/lib/filestorage.php
@@ -34,10 +34,41 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->assertTrue($this->instance->is_readable('/'),'Root folder is not readable');
 		$this->assertTrue($this->instance->is_dir('/'),'Root folder is not a directory');
 		$this->assertFalse($this->instance->is_file('/'),'Root folder is a file');
+		$this->assertEqual('dir',$this->instance->filetype('/'));
 		
 		//without this, any further testing would be useless, not an acutal requirement for filestorage though
 		$this->assertTrue($this->instance->is_writable('/'),'Root folder is not writable');
 	}
+	
+	public function testDirectories(){
+		$this->assertFalse($this->instance->file_exists('/folder'));
+		
+		$this->assertTrue($this->instance->mkdir('/folder'));
+		
+		$this->assertTrue($this->instance->file_exists('/folder'));
+		$this->assertTrue($this->instance->is_dir('/folder'));
+		$this->assertFalse($this->instance->is_file('/folder'));
+		$this->assertEqual('dir',$this->instance->filetype('/folder'));
+		$this->assertEqual(0,$this->instance->filesize('/folder'));
+		$this->assertTrue($this->instance->is_readable('/folder'));
+		$this->assertTrue($this->instance->is_writable('/folder'));
+		
+		$dh=$this->instance->opendir('/');
+		$content=array();
+		while($file=readdir($dh)){
+			if($file!='.' and $file!='..'){
+				$content[]=$file;
+			}
+		}
+		$this->assertEqual(array('folder'),$content);
+		
+		$this->assertFalse($this->instance->mkdir('/folder'));//cant create existing folders
+		$this->assertTrue($this->instance->rmdir('/folder'));
+		
+		$this->assertFalse($this->instance->file_exists('/folder'));
+		
+		$this->assertFalse($this->instance->rmdir('/folder'));//cant remove non existing folders
+	}
 
 	/**
 	 * test the various uses of file_get_contents and file_put_contents
@@ -58,6 +89,26 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->instance->file_put_contents('/lorem.txt','');
 		$this->assertEqual('',$this->instance->file_get_contents('/lorem.txt'),'file not emptied');
 	}
+	
+	/**
+	 * test various known mimetypes
+	 */
+	public function testMimeType(){
+		$this->assertEqual('httpd/unix-directory',$this->instance->getMimeType('/'));
+		$this->assertEqual(false,$this->instance->getMimeType('/non/existing/file'));
+		
+		$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
+		$this->instance->file_put_contents('/lorem.txt',fopen($textFile,'r'));
+		$this->assertEqual('text/plain',$this->instance->getMimeType('/lorem.txt'));
+		
+		$pngFile=OC::$SERVERROOT.'/tests/data/logo-wide.png';
+		$this->instance->file_put_contents('/logo-wide.png',fopen($pngFile,'r'));
+		$this->assertEqual('image/png',$this->instance->getMimeType('/logo-wide.png'));
+		
+		$svgFile=OC::$SERVERROOT.'/tests/data/logo-wide.svg';
+		$this->instance->file_put_contents('/logo-wide.svg',fopen($svgFile,'r'));
+		$this->assertEqual('image/svg+xml',$this->instance->getMimeType('/logo-wide.svg'));
+	}
 }
 
 
-- 
GitLab


From 31ea39360cae963d3ba90c6b7b50fbcb175ffa6b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 13 Feb 2012 10:26:40 +0100
Subject: [PATCH 475/546] dummy data for tests cases

---
 tests/data/logo-wide.png | Bin 0 -> 3559 bytes
 tests/data/logo-wide.svg | 875 +++++++++++++++++++++++++++++++++++++++
 tests/data/lorem.txt     |   4 +
 3 files changed, 879 insertions(+)
 create mode 100644 tests/data/logo-wide.png
 create mode 100644 tests/data/logo-wide.svg
 create mode 100644 tests/data/lorem.txt

diff --git a/tests/data/logo-wide.png b/tests/data/logo-wide.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2c16a0f60a6991eb6a98109d017b48e3b3a3a3b
GIT binary patch
literal 3559
zcmV<D4H)u?P)<h;3K|Lk000e1NJLTq004{t001Be1^@s6z#fpR00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H14P;3~K~#90?VD*>lt;FJ-)^=>*#vPHQ2|+G6E#Lfg@7?8(YT@+
zjW=eQ#CziyCz-isG-k4x#4(G>L^C&uGbW>=aY;<XZB$&MMiG%kTtHFWWmT4@o9=Ue
zd=MLGnr4gn!TUV*@Nnu>)v52R@6@TKRU$%b;2k)otH#-GhO3Knw6;PQW-u5W9UUFA
z_4>*~`31#Wa?^Gvwo1cov?{9B7%+iD#?5qWr}^lG|C-t%JUBod(60}U8VwgOT_OEU
z7GKA2EzY@gb#GBg;nUekyNg@gfHqnW5oxgmsKQ51PI&r%78d0f7KtU+ZcNaHjhuX~
zM{rDVOWM$uS~oS>!}JV$sJqIb8g64}>s?u?PpvQ-4|a5R{qK>(A{MS(w#dnvI*y-A
z=b5>SFB%JN{L|An=$d3m8^0>HjV+*3sZ;?&$G_IKW2cuNiH)@H?bY2WCH+j%?!?1J
zjf1_z(l_Q?HCO-!h4*LD<1w8#ZQb=g@N#2qY2!Z7SeFzuWZeAOFD<-NuGNYuFTV1Y
z?AUWi8jDV+m(UTD3cE!--tK<8+qTqjYLtiRJ22MO#i_%><?k+V);KuS$jiQ%%h17L
zjUKRecD95B`Z=U#oJkrSJFTFsOq*C-QgTR-&A}U|c9u4}!Zuo!Mh%!s9fO7r3dN~?
zyBczBMFrZ53Y?wVH_3<x2ZcHY`u7cZG<F2(ndgTdPfowH=fKa}K4GJux{$JKSCcAj
zqg7BhM%gH;E?qixbf_)Adi@sNx^!x?5xshLMW@pf9O%pRNn=$XzVj#7@7H|Vxu0L3
z4dJ7vtX8R1swP+7MvKz8pjRcQl24u178Dh?OFVd-QyFJDm2r+6xAM?c=*<?ne)Bdb
zQ!`1=%p&ddc`oH%!_Ll*0KYy22l^5m=u76=i}?2KRim7@S2woBuXLTeV97+izA^(?
z+SE?A(Q-6uS*=q2RUJ6=<YkWzZr#VmMiLs-kB}fgx_0*Dv1xPo=JR*)aCZZsva*up
z|M)k%6OS@-*g!%8{Rj^9#j8hGDk^lGK6ioCjI*R>oa4aZ6U=@7cg&1?yiS`XrDa5o
zpIvnA_N^gTPwhS1Vm)u8X;>Q_dwY-4gpHc~W8CaN-nn%<UuyH$r7I<V^L7yt$vk&K
z9-THvmVWwA(d+efbZc|<`Yn0#`9I5RZ!ee9vhq6l`+rK30Z~&E@AnF!Es6C5CTzr{
zf4sl^tD0+R6Y>j-Bx>AjiQl|kVkSN($*Gz3shY)TG|KAu?<IEPbCOq3bC=j)FiP;S
z3HkT?Vf_jzyei#qJL*fbty1&~jTs&@@!7&kgF!6u?RPsQB6_Oa&MUB}XNh&266A&X
zZ`P4VJuy4KOL%mzR(J@%r8KW9-ETYUOF32ry>8Af@t=S2x|@yK@}g?n?t{GXr#W==
z=+NXTa@xd4*qwNUA9wD@QRBd&pHFfs<1D2m<sG`Yc1(+intDU6Rv*2cSM+_(sU4e|
z+)x`$qE683=|9}r#mQ;5o3l%dzS0n`*H^ms@$TWcE&ekbOBHSSZYPJ1CiBUA3z}_I
zenAnB#J$LXV1J&R{22WMeQ<Yk1)#9#4(XZaS+{vd@sVRGr}K&nrsSsVx!UYTe_f)0
z;lMy(JMejxd|uVxkMD<3R*+M}<@5>}9UU4u@!E$gR%?$Xr^(%tQu!`nuPpiKi#k(8
zZN|pESSR*q4y)E|krk`rE$Zw&@UwAXblmNL2ggs4`|qx;NuDCIQA9S2$TK1mDk8Qf
z`M>!o>6bYsA}a20LH>O=ZC(5Kt}nm%l*6F#{y4R7M{34dLIV9P4m-WRl8Oo)9vxg;
zY$y*53nC*k%c4$H<X~08`V}4R?QB<d4}Q33i#6Ul3;^~6@xVmjE8rARc|VP6ENTGn
z(1)YDbn<xihjpL1dG+X8LqS`iL*rm?v68b{7wPBY-J*v1`}QXD+=T}9JUhDc?xK0F
zo*kSvwx|Iuiv#c_5C{C0?Q9UWr~hzgH&>^Bul!(<n_69W2R<awkMuK^zx348=Lv4W
z3pExyJ6kjw2TDrH8q|FxX1MBsh!B78&@q!*)QFbjO<)s{cE1g2F19XCPP1oCAMak<
zvs4oj<j3yBBNi*ky>gxY0lqD6T#s&DxP0{nf&Kb4s2ew7j7!FutSP`1;0*9<T>WeZ
zgaGBhX~5k1hz&3q=+}a61_8OijTWl2HugY&z!gxT%tUIy(bmn`C1&`L0d)=(tMT*k
z=3I6T1x3ZbtW-?V>Gb&Y_Tv17OD%5og`8aacz3r-w|{^yt}f0`pq!8S0HwejlsLhZ
zJ-}F?qL%y`FbJr<;)(}e0&bhg+<;F|;*u0V1B3x<fw!nRZ~{;UaC2jo-YBc79#!>q
zLwTXE0pHcq-2*(-Kz)A(P6DR40o;M*zz`snntcXvvej1_!UO#3|AKAQYUa<G#lp8g
zWyP|EfU-OM_4=)>-IzeRR!h0If?hqlG4F+$4cKTsrDf&V*w|3}-c5aU@^t6Q^_yB%
zRMa%tx33b20RDyYU`!uMca*QDHqMwojO~KrC8}`+enL46eab{`2P^^-fYCtpenkY3
zY*i=fCjj^Xm=A0<k@rIBqc89`6S*~CSqBtvRgEW*2)qN-_aeur4F-dA?fWgYd17od
z2BU$kI}#BQo}IUtj5FD6SoHx1eq7DbU2C~<Gv5juttaD57J>cxHmZz>fTw5mi#h>}
zN7>VGX+hJLp#-q2YsvM%>nNUTj)~kJXwH3Q8{nV7lhhn60GEJ=foUjHV{`ZncpJq_
z){ENS-u8B0eqn>PEm<^=FII14_S{8u_Vi%s8}o5>QLgXWsMU1#bSFC}x0yEI<M6Q*
zLV~Ohq_5q$jjgTCb=k1NU?RSZvN1Ngh0Ia|qp-ZO_P@aIO#V+onYx-vILb76te$)w
z@LsJp8;c8y7hBhmq8gRzXhW+Y0FMr?Z29J6PG@Gb@Q=T*lmCa`&tSouA1hyZGr4f-
z3JJRp5;tLt)n(F7p9A5rnXD5i(?Uzo56I-+bYqU|fCu+3r=_C=sZAvUr4N=kff7SC
z1{L@EF#si=X%KZ@e&O~XckaJyjdEGJ7B@E++Bs_K<c$~_fp6bltXi|hT7%7EFdBJf
z(K6myI2T8ab@2<p*Xw_{Q;=V@*-VxbP|_@;?%@g)SfN*rG8KU`RUM?}G}RbNQ2JmA
zCzK$+8ZF@1K$*TMD@uU7R<r?t`bt{ly8rAya_MMNYJ<vlc6R9W=5N*k{AK?0tlgAA
z)`iQ~v~89ZU&b>aB!EHT{jDyuW!oM@#+mG-oV4BB%w$JW)16nKy!hIvG5?UAX<iHh
zO0fC|8eUpgP%{t(#rDVs%0*H$uucYsS<tsf@krJCLTNxK_Xc^rs6`eV^Ycq5%zN#<
z!h#~pTNjQR2Q&^2+`Mf*z-{NK;h~Wa7$(k|r;XpTy-~}^vT`l2ELv8wYRzW-ghv}%
z5#HnK^;<0Y@c-`KyjwcWO!f%C8)cbU&3a%~Exn;Y4ltpXJP;_tI<I1hViXVaEtX&8
z_rP>&uHw$4#9~j^Q>J@W-JhGtmZGeh>RZjc4t&GC4?zcfT_vxN2;lNB2TOquj+-(d
zYD(UYJwMfZ>BV3$%KX2)U-86@xdwB0W3Jt}CBcys^LmCx1%!^6v}5{nuNGNzAenSB
z!}vh#lX*cy$IbT&dw6K@@CmoR{AQERXf#?Zw|>hGeMD4T!M;Psb428M5pk{RkGm*`
zcxfWyQ|kcDQ$#L`$P5v&7m;WYNfME%B9bK{GeyKfM23k-qKHg3DLX_&{v{0`(xr%q
z#*ExoL=K6_Cn7S+#9q_%t%!UoB3>pkHxW4@A|HrI*D6^%5s9m^d9;~&o~g1Ux~iXu
zh_{HW5|M2pVpmJwu1dbDO0QaOD<acH<eZ2Msd2r*YryDk?#?dX_U+xXU(ARhP9Z^l
z4&AzT;(YccQqs?qCG0w=ExL1eiwep;JltlywcsVUApgFUl$LY&Sc+lEM_&})DJgj>
z>v+O;0H48Q<D48Fm;3hdRt*^#;v60l;Mm{ahr;4Jq-LCxV<%GYB&B3j78T#UoL^8l
z<#O7dY*2px<lNqMl~<3h(X*zFbL$`Ai%%af0J1M$CjE34Yd0knXXWG`$-7xN<4Wd#
z48UTPYXcs@EnqjwCYrh5HU(9EmE(b<zzSe5;19fj;%SnBl~wgrKcrqL9>U_%6L=N)
z2=kkDHYocXkto6DSHRy*@|~;lX9BU@i@)rESAcOSUZn*1xvJmw#Q-5FdqZI;(@i$8
zrmD^Qcm|k((pMeIrsQ^%mEl>lm%zRH#|%>2sRw(wx<w242*%`s!s2~KwdzRj$zA6G
zyh39lJ9qSWRbOcsV53&wtuz=86_(sxd^vg7HPgCODwV27Sga2Q8Putx`$H-f52{t_
z!m{%6eZ?guhm3ZHq^n8$^2}M@D=c=nbNlv>X&f}8v=tS;AZkaA=Dbc<aiI84SwhaK
hoqH{Gyp2}i{{fnqhMG6JwT=J)002ovPDHLkV1jB4?wJ4p

literal 0
HcmV?d00001

diff --git a/tests/data/logo-wide.svg b/tests/data/logo-wide.svg
new file mode 100644
index 00000000000..73b37cc7aaa
--- /dev/null
+++ b/tests/data/logo-wide.svg
@@ -0,0 +1,875 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="140"
+   height="32"
+   viewBox="0 0 139.99999 32"
+   enable-background="new 0 0 595.275 311.111"
+   xml:space="preserve"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="logo-wide.svg"><metadata
+   id="metadata327"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+   id="defs325"><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_1_"
+   id="linearGradient3353"
+   gradientUnits="userSpaceOnUse"
+   x1="288.49411"
+   y1="55.888199"
+   x2="288.49411"
+   y2="339.22189" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_2_"
+   id="linearGradient3355"
+   gradientUnits="userSpaceOnUse"
+   x1="251.2114"
+   y1="55.888199"
+   x2="251.2114"
+   y2="339.22159" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_3_"
+   id="linearGradient3357"
+   gradientUnits="userSpaceOnUse"
+   x1="293.22461"
+   y1="55.888199"
+   x2="293.22461"
+   y2="339.22171" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_4_"
+   id="linearGradient3359"
+   gradientUnits="userSpaceOnUse"
+   x1="375.33401"
+   y1="55.888199"
+   x2="375.33401"
+   y2="339.22159" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_5_"
+   id="linearGradient3361"
+   gradientUnits="userSpaceOnUse"
+   x1="334.49411"
+   y1="55.888199"
+   x2="334.49411"
+   y2="339.22159" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_6_"
+   id="linearGradient3363"
+   gradientUnits="userSpaceOnUse"
+   x1="458.42679"
+   y1="55.8867"
+   x2="458.42679"
+   y2="339.2236" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_7_"
+   id="linearGradient3365"
+   gradientUnits="userSpaceOnUse"
+   x1="413.16309"
+   y1="55.888199"
+   x2="413.16309"
+   y2="339.22131" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_8_"
+   id="linearGradient3367"
+   gradientUnits="userSpaceOnUse"
+   x1="290.76169"
+   y1="55.8867"
+   x2="290.76169"
+   y2="339.2236" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_9_"
+   id="linearGradient3369"
+   gradientUnits="userSpaceOnUse"
+   x1="346.77341"
+   y1="55.888199"
+   x2="346.77341"
+   y2="339.22119" />
+	<linearGradient
+   y2="339.22189"
+   x2="288.49411"
+   y1="55.888199"
+   x1="288.49411"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_1_">
+		<stop
+   id="stop261"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop263"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+	<linearGradient
+   y2="339.22159"
+   x2="251.2114"
+   y1="55.888199"
+   x1="251.2114"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_2_">
+		<stop
+   id="stop268"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop270"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+	<linearGradient
+   y2="339.22171"
+   x2="293.22461"
+   y1="55.888199"
+   x1="293.22461"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_3_">
+		<stop
+   id="stop275"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop277"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+	<linearGradient
+   y2="339.22159"
+   x2="375.33401"
+   y1="55.888199"
+   x1="375.33401"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_4_">
+		<stop
+   id="stop282"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop284"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+	<linearGradient
+   y2="339.22159"
+   x2="334.49411"
+   y1="55.888199"
+   x1="334.49411"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_5_">
+		<stop
+   id="stop289"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop291"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+	<linearGradient
+   y2="339.2236"
+   x2="458.42679"
+   y1="55.8867"
+   x1="458.42679"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_6_">
+		<stop
+   id="stop296"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop298"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+	<linearGradient
+   y2="339.22131"
+   x2="413.16309"
+   y1="55.888199"
+   x1="413.16309"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_7_">
+		<stop
+   id="stop303"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop305"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+	<linearGradient
+   y2="339.2236"
+   x2="290.76169"
+   y1="55.8867"
+   x1="290.76169"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_8_">
+		<stop
+   id="stop310"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop312"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+	<linearGradient
+   y2="339.22119"
+   x2="346.77341"
+   y1="55.888199"
+   x1="346.77341"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_9_">
+		<stop
+   id="stop317"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop319"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1280"
+   inkscape:window-height="776"
+   id="namedview323"
+   showgrid="false"
+   inkscape:zoom="3.4068286"
+   inkscape:cx="79.998916"
+   inkscape:cy="32.107419"
+   inkscape:window-x="0"
+   inkscape:window-y="24"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1"
+   showguides="true"
+   inkscape:guide-bbox="true" />
+<pattern
+   y="565.223"
+   width="69"
+   height="69"
+   patternUnits="userSpaceOnUse"
+   id="Polka_Dot_Pattern"
+   viewBox="2.125 -70.896 69 69"
+   overflow="visible">
+	<g
+   id="g4">
+		<polygon
+   fill="none"
+   points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896   "
+   id="polygon6" />
+		<polygon
+   fill="#F6BB60"
+   points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896   "
+   id="polygon8" />
+		<g
+   id="g10">
+			<path
+   fill="#FFFFFF"
+   d="M61.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path12" />
+			<path
+   fill="#FFFFFF"
+   d="M54.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path14" />
+			<path
+   fill="#FFFFFF"
+   d="M46.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path16" />
+			<path
+   fill="#FFFFFF"
+   d="M38.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path18" />
+			<path
+   fill="#FFFFFF"
+   d="M31.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path20" />
+			<path
+   fill="#FFFFFF"
+   d="M23.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path22" />
+			<path
+   fill="#FFFFFF"
+   d="M15.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path24" />
+			<path
+   fill="#FFFFFF"
+   d="M8.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path26" />
+			<path
+   fill="#FFFFFF"
+   d="M0.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19C0.361-71.362,0.3-71.4,0.248-71.335     c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path28" />
+		</g>
+		<g
+   id="g30">
+			<path
+   fill="#FFFFFF"
+   d="M69.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128     c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path32" />
+		</g>
+		<path
+   fill="#FFFFFF"
+   d="M0.495-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128    c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161    c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631    c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45    c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221    c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337    c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207    c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224C0.5-71.68,0.503-71.744,0.51-71.626    c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path34" />
+		<g
+   id="g36">
+			<g
+   id="g38">
+				<path
+   fill="#FFFFFF"
+   d="M69.439-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path40" />
+				<path
+   fill="#FFFFFF"
+   d="M61.778-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path42" />
+				<path
+   fill="#FFFFFF"
+   d="M54.118-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path44" />
+				<path
+   fill="#FFFFFF"
+   d="M46.458-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path46" />
+				<path
+   fill="#FFFFFF"
+   d="M38.797-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path48" />
+				<path
+   fill="#FFFFFF"
+   d="M31.137-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path50" />
+				<path
+   fill="#FFFFFF"
+   d="M23.477-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path52" />
+				<path
+   fill="#FFFFFF"
+   d="M15.816-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path54" />
+				<path
+   fill="#FFFFFF"
+   d="M8.156-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path56" />
+				<path
+   fill="#FFFFFF"
+   d="M0.495-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143C2-61.45,2.217-61.397,2.391-61.46c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path58" />
+			</g>
+			<g
+   id="g60">
+				<path
+   fill="#FFFFFF"
+   d="M69.439-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path62" />
+				<path
+   fill="#FFFFFF"
+   d="M61.778-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path64" />
+				<path
+   fill="#FFFFFF"
+   d="M54.118-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path66" />
+				<path
+   fill="#FFFFFF"
+   d="M46.458-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path68" />
+				<path
+   fill="#FFFFFF"
+   d="M38.797-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path70" />
+				<path
+   fill="#FFFFFF"
+   d="M31.137-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path72" />
+				<path
+   fill="#FFFFFF"
+   d="M23.477-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path74" />
+				<path
+   fill="#FFFFFF"
+   d="M15.816-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path76" />
+				<path
+   fill="#FFFFFF"
+   d="M8.156-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path78" />
+				<path
+   fill="#FFFFFF"
+   d="M0.495-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-56.374,0.503-56.438,0.51-56.32      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path80" />
+			</g>
+			<g
+   id="g82">
+				<path
+   fill="#FFFFFF"
+   d="M69.439-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path84" />
+				<path
+   fill="#FFFFFF"
+   d="M61.778-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path86" />
+				<path
+   fill="#FFFFFF"
+   d="M54.118-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path88" />
+				<path
+   fill="#FFFFFF"
+   d="M46.458-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path90" />
+				<path
+   fill="#FFFFFF"
+   d="M38.797-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path92" />
+				<path
+   fill="#FFFFFF"
+   d="M31.137-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path94" />
+				<path
+   fill="#FFFFFF"
+   d="M23.477-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path96" />
+				<path
+   fill="#FFFFFF"
+   d="M15.816-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path98" />
+				<path
+   fill="#FFFFFF"
+   d="M8.156-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path100" />
+				<path
+   fill="#FFFFFF"
+   d="M0.495-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path102" />
+			</g>
+			<g
+   id="g104">
+				<path
+   fill="#FFFFFF"
+   d="M69.439-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path106" />
+				<path
+   fill="#FFFFFF"
+   d="M61.778-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path108" />
+				<path
+   fill="#FFFFFF"
+   d="M54.118-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path110" />
+				<path
+   fill="#FFFFFF"
+   d="M46.458-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path112" />
+				<path
+   fill="#FFFFFF"
+   d="M38.797-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path114" />
+				<path
+   fill="#FFFFFF"
+   d="M31.137-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path116" />
+				<path
+   fill="#FFFFFF"
+   d="M23.477-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path118" />
+				<path
+   fill="#FFFFFF"
+   d="M15.816-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path120" />
+				<path
+   fill="#FFFFFF"
+   d="M8.156-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      C8.15-41.004,8.149-41.02,8.14-41.04"
+   id="path122" />
+				<path
+   fill="#FFFFFF"
+   d="M0.495-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path124" />
+			</g>
+			<g
+   id="g126">
+				<path
+   fill="#FFFFFF"
+   d="M69.439-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path128" />
+				<path
+   fill="#FFFFFF"
+   d="M61.778-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path130" />
+				<path
+   fill="#FFFFFF"
+   d="M54.118-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path132" />
+				<path
+   fill="#FFFFFF"
+   d="M46.458-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path134" />
+				<path
+   fill="#FFFFFF"
+   d="M38.797-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path136" />
+				<path
+   fill="#FFFFFF"
+   d="M31.137-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path138" />
+				<path
+   fill="#FFFFFF"
+   d="M23.477-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path140" />
+				<path
+   fill="#FFFFFF"
+   d="M15.816-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path142" />
+				<path
+   fill="#FFFFFF"
+   d="M8.156-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path144" />
+				<path
+   fill="#FFFFFF"
+   d="M0.495-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-33.416,0.503-33.48,0.51-33.362      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path146" />
+			</g>
+			<g
+   id="g148">
+				<path
+   fill="#FFFFFF"
+   d="M69.439-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path150" />
+				<path
+   fill="#FFFFFF"
+   d="M61.778-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path152" />
+				<path
+   fill="#FFFFFF"
+   d="M54.118-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path154" />
+				<path
+   fill="#FFFFFF"
+   d="M46.458-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path156" />
+				<path
+   fill="#FFFFFF"
+   d="M38.797-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path158" />
+				<path
+   fill="#FFFFFF"
+   d="M31.137-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path160" />
+				<path
+   fill="#FFFFFF"
+   d="M23.477-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path162" />
+				<path
+   fill="#FFFFFF"
+   d="M15.816-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path164" />
+				<path
+   fill="#FFFFFF"
+   d="M8.156-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path166" />
+				<path
+   fill="#FFFFFF"
+   d="M0.495-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path168" />
+			</g>
+			<g
+   id="g170">
+				<path
+   fill="#FFFFFF"
+   d="M69.439-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path172" />
+				<path
+   fill="#FFFFFF"
+   d="M61.778-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path174" />
+				<path
+   fill="#FFFFFF"
+   d="M54.118-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path176" />
+				<path
+   fill="#FFFFFF"
+   d="M46.458-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path178" />
+				<path
+   fill="#FFFFFF"
+   d="M38.797-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path180" />
+				<path
+   fill="#FFFFFF"
+   d="M31.137-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path182" />
+				<path
+   fill="#FFFFFF"
+   d="M23.477-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path184" />
+				<path
+   fill="#FFFFFF"
+   d="M15.816-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path186" />
+				<path
+   fill="#FFFFFF"
+   d="M8.156-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path188" />
+				<path
+   fill="#FFFFFF"
+   d="M0.495-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-18.11,0.503-18.175,0.51-18.057      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path190" />
+			</g>
+			<g
+   id="g192">
+				<path
+   fill="#FFFFFF"
+   d="M69.439-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362C69-9.692,69.159-9.523,69.154-9.4c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path194" />
+				<path
+   fill="#FFFFFF"
+   d="M61.778-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path196" />
+				<path
+   fill="#FFFFFF"
+   d="M54.118-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path198" />
+				<path
+   fill="#FFFFFF"
+   d="M46.458-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path200" />
+				<path
+   fill="#FFFFFF"
+   d="M38.797-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path202" />
+				<path
+   fill="#FFFFFF"
+   d="M31.137-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path204" />
+				<path
+   fill="#FFFFFF"
+   d="M23.477-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path206" />
+				<path
+   fill="#FFFFFF"
+   d="M15.816-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053C17.933-7.969,17.839-8.227,18-8.34      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path208" />
+				<path
+   fill="#FFFFFF"
+   d="M8.156-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      C7.915-10.05,7.866-9.836,7.886-9.75C7.717-9.692,7.876-9.523,7.871-9.4C7.868-9.351,7.83-9.295,7.826-9.239      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      C9.114-7.652,9.321-7.799,9.48-7.837c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path210" />
+				<path
+   fill="#FFFFFF"
+   d="M0.495-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      C0.254-10.05,0.205-9.836,0.225-9.75C0.056-9.692,0.215-9.523,0.21-9.4c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-8.671,0.501-8.456,0.668-8.325c0.19,0.148,0.365,0.572,0.608,0.631      C1.454-7.652,1.66-7.799,1.819-7.837C2-7.88,2.217-7.827,2.391-7.89c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46C3.477-8.933,3.471-8.995,3.5-9.071      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path212" />
+			</g>
+		</g>
+		<g
+   id="g214">
+			<path
+   fill="#FFFFFF"
+   d="M69.439-2.778c0.018,0.072,0.008,0.127-0.026,0.19C69.361-2.487,69.3-2.525,69.248-2.46     c-0.051,0.062-0.099,0.276-0.079,0.362C69-2.04,69.159-1.871,69.154-1.748c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C70.397,0,70.604-0.146,70.763-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path216" />
+			<path
+   fill="#FFFFFF"
+   d="M61.778-2.778c0.018,0.072,0.007,0.127-0.026,0.19C61.7-2.487,61.64-2.525,61.587-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C62.737,0,62.943-0.146,63.103-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C61.915-3.117,61.78-3.02,61.781-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path218" />
+			<path
+   fill="#FFFFFF"
+   d="M54.118-2.778c0.018,0.072,0.007,0.127-0.026,0.19C54.04-2.487,53.98-2.525,53.927-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C55.077,0,55.283-0.146,55.442-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C54.255-3.117,54.12-3.02,54.121-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path220" />
+			<path
+   fill="#FFFFFF"
+   d="M46.458-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C47.416,0,47.623-0.146,47.782-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C46.594-3.117,46.459-3.02,46.46-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path222" />
+			<path
+   fill="#FFFFFF"
+   d="M38.797-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C39.756,0,39.962-0.146,40.122-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C38.934-3.117,38.799-3.02,38.8-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path224" />
+			<path
+   fill="#FFFFFF"
+   d="M31.137-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C32.095,0,32.302-0.146,32.461-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C31.273-3.117,31.139-3.02,31.14-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path226" />
+			<path
+   fill="#FFFFFF"
+   d="M23.477-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C24.435,0,24.642-0.146,24.801-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path228" />
+			<path
+   fill="#FFFFFF"
+   d="M15.816-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C16.774,0,16.981-0.146,17.14-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     C15.81-2.74,15.809-2.756,15.8-2.776"
+   id="path230" />
+			<path
+   fill="#FFFFFF"
+   d="M8.156-2.778c0.018,0.072,0.007,0.127-0.026,0.19C8.077-2.487,8.018-2.525,7.965-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35C7.868-1.698,7.83-1.643,7.826-1.587     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C9.114,0,9.321-0.146,9.48-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C8.954-3.54,8.847-3.448,8.692-3.367     c-0.17,0.088-0.139,0.166-0.318,0.224C8.292-3.117,8.158-3.02,8.159-2.92C8.16-2.805,8.164-2.869,8.17-2.751     C8.15-2.74,8.149-2.756,8.14-2.776"
+   id="path232" />
+			<path
+   fill="#FFFFFF"
+   d="M0.495-2.778c0.018,0.072,0.008,0.127-0.026,0.19C0.417-2.487,0.356-2.525,0.304-2.46     C0.253-2.397,0.205-2.184,0.225-2.098C0.056-2.04,0.215-1.871,0.21-1.748c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-1.019,0.501-0.804,0.668-0.673c0.19,0.148,0.365,0.572,0.608,0.631     C1.454,0,1.66-0.146,1.819-0.185C2-0.228,2.217-0.175,2.391-0.237c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46C3.477-1.28,3.471-1.343,3.5-1.419     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C1.293-3.54,1.187-3.448,1.031-3.367     c-0.17,0.088-0.139,0.166-0.318,0.224C0.632-3.117,0.498-3.02,0.498-2.92C0.5-2.805,0.503-2.869,0.51-2.751     C0.489-2.74,0.488-2.756,0.479-2.776"
+   id="path234" />
+		</g>
+	</g>
+</pattern>
+
+
+
+
+
+
+
+
+
+
+
+
+<g
+   style="display:inline"
+   id="g3154"
+   transform="matrix(0.21384268,0,0,0.21384268,31.655324,-22.278409)"><circle
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="circle238"
+     r="21.999001"
+     cy="225.17101"
+     cx="97.311996"
+     sodipodi:cx="97.311996"
+     sodipodi:cy="225.17101"
+     sodipodi:rx="21.999001"
+     sodipodi:ry="21.999001"
+     d="m 119.311,225.17101 c 0,12.14971 -9.84929,21.999 -21.999004,21.999 -12.149712,0 -21.999,-9.84929 -21.999,-21.999 0,-12.14972 9.849288,-21.99901 21.999,-21.99901 12.149714,0 21.999004,9.84929 21.999004,21.99901 z" /><circle
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="circle240"
+     r="22.000999"
+     cy="225.17101"
+     cx="364.82501"
+     sodipodi:cx="364.82501"
+     sodipodi:cy="225.17101"
+     sodipodi:rx="22.000999"
+     sodipodi:ry="22.000999"
+     d="m 386.82601,225.17101 c 0,12.15081 -9.85018,22.00099 -22.001,22.00099 -12.15081,0 -22.001,-9.85018 -22.001,-22.00099 0,-12.15082 9.85019,-22.001 22.001,-22.001 12.15082,0 22.001,9.85018 22.001,22.001 z" /><path
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="path242"
+     d="m 135.313,202.966 v 30.074 c 0,7.801 6.324,14.123 14.123,14.123 7.803,0 14.125,-6.322 14.125,-14.123 0,-0.004 0,-30.074 0,-30.074"
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="path244"
+     d="m 163.561,202.966 v 30.074 c 0,7.801 6.324,14.123 14.125,14.123 7.801,0 14.125,-6.322 14.125,-14.123 0,-0.004 0,-30.074 0,-30.074"
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="path246"
+     d="m 319.578,162.962 v 70.078 c 0,7.801 6.322,14.123 14.123,14.123"
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="path248"
+     d="m 208.317,247.169 v -22.201 c 0,-12.15 9.85,-22 22,-22 12.152,0 22.002,9.85 22.002,22 0,0.006 0,22.201 0,22.201"
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="path250"
+     d="m 401.322,202.966 v 22.205 c 0,12.148 9.85,21.998 22,21.998 12.15,0 22.002,-9.85 22.002,-21.998 0,-0.008 0,-22.205 0,-22.205"
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="path252"
+     d="m 303.146,176.839 c -19.421,0 -35.167,15.744 -35.167,35.166 0,19.422 15.746,35.164 35.167,35.164"
+     inkscape:connector-curvature="0" /><polyline
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="polyline254"
+     points="504.596,162.962 504.596,203.134 504.596,202.155 " /><path
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="path256"
+     d="m 490.236,247.157 c -4.275,0 -7.844,0 -7.848,0 -12.15,0 -22,-9.85 -22,-21.998 0,-12.15 9.85,-22 22,-22 l 22.207,-0.025 c 0,0 0.137,22.342 0,29.895 -0.138,7.552 -7.968,14.128 -14.359,14.128 z"
+     inkscape:connector-curvature="0" /></g><circle
+   sodipodi:ry="20.332001"
+   sodipodi:rx="20.332001"
+   sodipodi:cy="78.911003"
+   sodipodi:cx="288.49399"
+   style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:4;stroke-opacity:1;display:inline"
+   id="circle265"
+   r="20.332001"
+   cy="78.911003"
+   cx="288.49399"
+   transform="matrix(0.21384268,0,0,0.21384268,-45.328041,-8.5924791)" /><circle
+   sodipodi:ry="37.242001"
+   sodipodi:rx="37.242001"
+   sodipodi:cy="149.577"
+   sodipodi:cx="251.211"
+   style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:4;stroke-opacity:1;display:inline"
+   id="circle272"
+   r="37.242001"
+   cy="149.577"
+   cx="251.211"
+   transform="matrix(0.21384268,0,0,0.21384268,-45.328041,-8.5924791)" /><circle
+   sodipodi:ry="40.261002"
+   sodipodi:rx="40.261002"
+   sodipodi:cy="124.796"
+   sodipodi:cx="293.22501"
+   style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:4;stroke-opacity:1;display:inline"
+   id="circle279"
+   r="40.261002"
+   cy="124.796"
+   cx="293.22501"
+   transform="matrix(0.21384268,0,0,0.21384268,-45.328041,-8.5924791)" /><circle
+   sodipodi:ry="37.242001"
+   sodipodi:rx="37.242001"
+   sodipodi:cy="108.472"
+   sodipodi:cx="375.33401"
+   style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:4;stroke-opacity:1;display:inline"
+   id="circle286"
+   r="37.242001"
+   cy="108.472"
+   cx="375.33401"
+   transform="matrix(0.21384268,0,0,0.21384268,-45.328041,-8.5924791)" /><circle
+   sodipodi:ry="37.241001"
+   sodipodi:rx="37.241001"
+   sodipodi:cy="79.503998"
+   sodipodi:cx="334.49301"
+   style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:4;stroke-opacity:1;display:inline"
+   id="circle293"
+   r="37.241001"
+   cy="79.503998"
+   cx="334.49301"
+   transform="matrix(0.21384268,0,0,0.21384268,-45.328041,-8.5924791)" /><circle
+   sodipodi:ry="40.261002"
+   sodipodi:rx="40.261002"
+   sodipodi:cy="147.563"
+   sodipodi:cx="413.16299"
+   style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+   id="circle307"
+   r="40.261002"
+   cy="147.563"
+   cx="413.16299"
+   transform="matrix(0.21384268,0,0,0.21384268,-45.328041,-8.5924791)" /><circle
+   sodipodi:ry="21.299"
+   sodipodi:rx="21.299"
+   sodipodi:cy="166.011"
+   sodipodi:cx="290.76199"
+   style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:4;stroke-opacity:1;display:inline"
+   id="circle314"
+   r="21.299"
+   cy="166.011"
+   cx="290.76199"
+   transform="matrix(0.21384268,0,0,0.21384268,-45.328041,-8.5924791)" /><path
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:0.8553707;stroke-opacity:1;display:inline"
+   id="path321"
+   d="m 39.804227,20.419344 c 0,6.062012 -4.91496,10.976117 -10.9774,10.976117 -6.06244,0 -10.977185,-4.914105 -10.977185,-10.976117 0,-6.062654 4.914959,-10.9771861 10.977185,-10.9771861 6.062226,0 10.9774,4.9145321 10.9774,10.9771861 z" /></svg>
\ No newline at end of file
diff --git a/tests/data/lorem.txt b/tests/data/lorem.txt
new file mode 100644
index 00000000000..b62c3fb2ffd
--- /dev/null
+++ b/tests/data/lorem.txt
@@ -0,0 +1,4 @@
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
-- 
GitLab


From d6aa5ac7e8630d59b53165ec89134ec57db887fd Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 13 Feb 2012 10:27:00 +0100
Subject: [PATCH 476/546] make local filestorage comply with test cases

---
 lib/filestorage/local.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 292d2a84e7d..2e66943cad2 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -12,14 +12,10 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		}
 	}
 	public function mkdir($path){
-		if($return=mkdir($this->datadir.$path)){
-		}
-		return $return;
+		return @mkdir($this->datadir.$path);
 	}
 	public function rmdir($path){
-		if($return=rmdir($this->datadir.$path)){
-		}
-		return $return;
+		return @rmdir($this->datadir.$path);
 	}
 	public function opendir($path){
 		return opendir($this->datadir.$path);
@@ -80,8 +76,7 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		}
 	}
 	public function unlink($path){
-		$return=$this->delTree($path);
-		return $return;
+		return $this->delTree($path);
 	}
 	public function rename($path1,$path2){
 		if(! $this->file_exists($path1)){
@@ -168,6 +163,8 @@ class OC_Filestorage_Local extends OC_Filestorage{
 				$mimeType=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream';
 			}
 			return $mimeType;
+		}else{
+			return false;
 		}
 	}
 
-- 
GitLab


From e4028960013836620afedf1ecfbde9e7637b22f1 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 13 Feb 2012 22:30:27 +0100
Subject: [PATCH 477/546] Gallery: Remove autoloaded includes from
 galleryOp.php

---
 apps/gallery/ajax/galleryOp.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index 8df692c7735..c0623c90d94 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -22,8 +22,7 @@
 */
 
 require_once('../../../lib/base.php');
-require_once(OC::$CLASSPATH['OC_Gallery_Album']);
-require_once(OC::$CLASSPATH['OC_Gallery_Scanner']);
+
 OC_JSON::checkAppEnabled('gallery');
 
 function handleRename($oldname, $newname) {
-- 
GitLab


From e084386770167945b77559ca3d291b6cad39acf6 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 13 Feb 2012 22:32:27 +0100
Subject: [PATCH 478/546] Gallery: Move login check to beginning of
 galleryOp.php

---
 apps/gallery/ajax/galleryOp.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index c0623c90d94..db6c79d6cdc 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -23,16 +23,15 @@
 
 require_once('../../../lib/base.php');
 
+OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
 
 function handleRename($oldname, $newname) {
-  OC_JSON::checkLoggedIn();
   OC_Gallery_Album::rename($oldname, $newname, OC_User::getUser());
   OC_Gallery_Album::changeThumbnailPath($oldname, $newname);
 }
 
 function handleRemove($name) {
-  OC_JSON::checkLoggedIn();
   $album_id = OC_Gallery_Album::find(OC_User::getUser(), $name);
   $album_id = $album_id->fetchRow();
   $album_id = $album_id['album_id'];
@@ -41,7 +40,6 @@ function handleRemove($name) {
 }
 
 function handleGetThumbnails($albumname) {
-  OC_JSON::checkLoggedIn();
   $photo = new OC_Image();
   $photo->loadFromFile(OC::$CONFIG_DATADIRECTORY.'/../gallery/'.$albumname.'.png');
   $offset = 3600 * 24; // 24 hour
@@ -53,13 +51,11 @@ function handleGetThumbnails($albumname) {
 }
 
 function handleGalleryScanning() {
-  OC_JSON::checkLoggedIn();
   OC_Gallery_Scanner::cleanup();
   OC_JSON::success(array('albums' => OC_Gallery_Scanner::scan('/')));
 }
 
 function handleFilescan($cleanup) {
-  OC_JSON::checkLoggedIn();
   if ($cleanup) OC_Gallery_Album::cleanup();
   $root = OC_Preferences::getValue(OC_User::getUser(), 'gallery', 'root', '').'/';
   $pathlist = OC_Gallery_Scanner::find_paths($root);
@@ -68,7 +64,6 @@ function handleFilescan($cleanup) {
 }
 
 function handlePartialCreate($path) {
-  OC_JSON::checkLoggedIn();
   if (empty($path)) OC_JSON::error(array('cause' => 'No path specified'));
   if (!OC_Filesystem::is_dir($path)) OC_JSON::error(array('cause' => 'Invalid path given'));
 
@@ -79,7 +74,6 @@ function handlePartialCreate($path) {
 }
 
 function handleStoreSettings($root, $order) {
-  OC_JSON::checkLoggedIn();
   if (!OC_Filesystem::file_exists($root)) {
     OC_JSON::error(array('cause' => 'No such file or directory'));
     return;
-- 
GitLab


From 7208abf6184ddb1f5628c4665a848d5f1e04622b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 13 Feb 2012 22:35:48 +0100
Subject: [PATCH 479/546] OC_Response: fix var name bugs

---
 lib/response.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/response.php b/lib/response.php
index 7733168b5b9..f0d1aaab530 100644
--- a/lib/response.php
+++ b/lib/response.php
@@ -46,12 +46,12 @@ class OC_Response {
 		if (is_string($expires) && $expires[0] == 'P') {
 			$interval = $expires;
 			$expires = new DateTime('now');
-			$expires->add(new DateInterval(expires));
+			$expires->add(new DateInterval($interval));
 		}
 		if ($expires instanceof DateTime) {
 			$expires = $expires->format(DateTime::RFC2822);
 		}
-		header('Expires: '.expires);
+		header('Expires: '.$expires);
 	}
 
 	static public function setETagHeader($etag) {
-- 
GitLab


From 363fdc40b82f5e7ba0de7a11f031bc8d86af68be Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 13 Feb 2012 22:37:27 +0100
Subject: [PATCH 480/546] OC_Response: Set Expire and Cache-Control headers in
 enableCaching

---
 lib/response.php | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/response.php b/lib/response.php
index f0d1aaab530..b5fca1cb227 100644
--- a/lib/response.php
+++ b/lib/response.php
@@ -11,9 +11,23 @@ class OC_Response {
 	const STATUS_NOT_MODIFIED = 304;
 	const STATUS_TEMPORARY_REDIRECT = 307;
 
-	static public function enableCaching() {
-		header('Cache-Control: cache');
-		header('Pragma: cache');
+	static public function enableCaching($cache_time = null) {
+		if (is_numeric($cache_time)) {
+			header('Pragma: public');// enable caching in IE
+			if ($cache_time > 0) {
+				self::setExpiresHeader('PT'.$cache_time.'S');
+				header('Cache-Control: max-age='.$cache_time.', must-revalidate');
+			}
+			else {
+				self::setExpiresHeader(0);
+				header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+			}
+		}
+		else {
+			header('Cache-Control: cache');
+			header('Pragma: cache');
+		}
+
 	}
 
 	static public function setStatus($status) {
-- 
GitLab


From e137020f67f97bb04e59c04205e1815229d95fae Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 13 Feb 2012 22:38:34 +0100
Subject: [PATCH 481/546] Gallery: Use OC_Respone::enableCaching for
 (album)thumbnails

---
 apps/gallery/ajax/galleryOp.php | 6 +-----
 apps/gallery/ajax/thumbnail.php | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index db6c79d6cdc..9273de2599d 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -40,13 +40,9 @@ function handleRemove($name) {
 }
 
 function handleGetThumbnails($albumname) {
+  OC_Response::enableCaching(3600 * 24); // 24 hour
   $photo = new OC_Image();
   $photo->loadFromFile(OC::$CONFIG_DATADIRECTORY.'/../gallery/'.$albumname.'.png');
-  $offset = 3600 * 24; // 24 hour
-  // calc the string in GMT not localtime and add the offset
-  header("Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT");
-  header('Cache-Control: max-age='.$offset.', must-revalidate');
-  header('Pragma: public');
   $photo->show();
 }
 
diff --git a/apps/gallery/ajax/thumbnail.php b/apps/gallery/ajax/thumbnail.php
index 2dfe936d9dd..184171f8fca 100644
--- a/apps/gallery/ajax/thumbnail.php
+++ b/apps/gallery/ajax/thumbnail.php
@@ -29,10 +29,6 @@ $img = $_GET['img'];
 
 $image = OC_Gallery_Photo::getThumbnail($img);
 if ($image) {
-	$offset = 3600 * 24; // 24 hour
-	// calc the string in GMT not localtime and add the offset
-	header("Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT");
-	header('Cache-Control: max-age='.$offset.', must-revalidate');
-	header('Pragma: public');
+	OC_Response::enableCaching(3600 * 24); // 24 hour
 	$image->show();
 }
-- 
GitLab


From 169ddc5b0b14697088ca394eb07fa7c8473b1fcc Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 13 Feb 2012 22:39:30 +0100
Subject: [PATCH 482/546] Gallery: Only get local file when generating photo
 thumbnail

---
 apps/gallery/lib/photo.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index 15783cb341a..4eb313bfc33 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -67,10 +67,6 @@ class OC_Gallery_Photo {
   }
 
 	public static function getThumbnail($image_name) {
-		$imagePath = OC_Filesystem::getLocalFile($image_name);
-		if(!file_exists($imagePath)) {
-			return null;
-		}
 		$save_dir = OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/gallery/';
 		$save_dir .= dirname($image_name). '/';
 		$image_name = basename($image_name);
@@ -78,6 +74,10 @@ class OC_Gallery_Photo {
 		if (file_exists($thumb_file)) {
 			$image = new OC_Image($thumb_file);
 		} else {
+			$imagePath = OC_Filesystem::getLocalFile($image_name);
+			if(!file_exists($imagePath)) {
+				return null;
+			}
 			$image = new OC_Image($imagePath);
 			if ($image->valid()) {
 				$image->centerCrop();
@@ -90,7 +90,6 @@ class OC_Gallery_Photo {
 			}
 		}
 		if ($image->valid()) {
-			//var_dump($image, $image->resource());
 			return $image;
 		}
 		return null;
-- 
GitLab


From 0fd5252cfc7c6d85d27bf1ec62fadbbc3267c0a1 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 13 Feb 2012 22:41:05 +0100
Subject: [PATCH 483/546] OC_Image: Move Content-Type header to show function

---
 lib/image.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index 9081a3c7021..df8f76352a0 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -102,6 +102,7 @@ class OC_Image {
 	* @returns bool
 	*/
 	public function show() {
+		header('Content-Type: '.$this->mimeType());
 		return $this->_output();
 	}
 
@@ -117,17 +118,14 @@ class OC_Image {
 		} elseif($filepath === null && $this->filepath !== null) {
 			$filepath = $this->filepath;
 		}
-		return $this->_output($filepath, true);
+		return $this->_output($filepath);
 	}
 
 	/**
 	* @brief Outputs/saves the image.
 	*/
-	private function _output($filepath=null, $really=false) {
-		if($really === false) {
-			header('Content-Type: '.$this->mimeType());
-			$filepath = null; // Just being cautious ;-)
-		} else {
+	private function _output($filepath=null) {
+		if($filepath) {
 			if(!is_writable(dirname($filepath))) {
 				OC_Log::write('core',__METHOD__.'(): Directory \''.dirname($filepath).'\' is not writable.', OC_Log::ERROR);
 				return false;
-- 
GitLab


From 594dcf13f2d311ba2161e33effe6e297939e3595 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 13 Feb 2012 22:47:31 +0100
Subject: [PATCH 484/546] Contacts+OC_Respone: Move enableCaching out of
 setEtagHeader and setLastModifiedHeader

---
 apps/contacts/photo.php     | 1 +
 apps/contacts/thumbnail.php | 1 +
 lib/response.php            | 3 +--
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index 314bce7cecc..8dfbcb6fb10 100644
--- a/apps/contacts/photo.php
+++ b/apps/contacts/photo.php
@@ -21,6 +21,7 @@ $image = new OC_Image();
 if( is_null($contact)) {
 	OC_Log::write('contacts','photo.php. The VCard for ID '.$id.' is not RFC compatible',OC_Log::ERROR);
 } else {
+	OC_Response::enableCaching();
 	OC_Contacts_App::setLastModifiedHeader($contact);
 
 	// Photo :-)
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index c020c29ac8c..39da6bc2bf7 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -48,6 +48,7 @@ if(is_null($contact)){
 	getStandardImage();
 	exit();
 }
+OC_Response::enableCaching();
 OC_Contacts_App::setLastModifiedHeader($contact);
 
 $thumbnail_size = 23;
diff --git a/lib/response.php b/lib/response.php
index b5fca1cb227..a768366b02c 100644
--- a/lib/response.php
+++ b/lib/response.php
@@ -63,6 +63,7 @@ class OC_Response {
 			$expires->add(new DateInterval($interval));
 		}
 		if ($expires instanceof DateTime) {
+			$expires->setTimezone(new DateTimeZone('GMT'));
 			$expires = $expires->format(DateTime::RFC2822);
 		}
 		header('Expires: '.$expires);
@@ -72,7 +73,6 @@ class OC_Response {
 		if (empty($etag)) {
 			return;
 		}
-		self::enableCaching();
 		if (isset($_SERVER['HTTP_IF_NONE_MATCH']) &&
 		    trim($_SERVER['HTTP_IF_NONE_MATCH']) == $etag) {
 			self::setStatus(self::STATUS_NOT_MODIFIED);
@@ -88,7 +88,6 @@ class OC_Response {
 		if ($lastModified instanceof DateTime) {
 			$lastModified = $lastModified->format(DateTime::RFC2822);
 		}
-		self::enableCaching();
 		if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) &&
 		    trim($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $lastModified) {
 			self::setStatus(self::STATUS_NOT_MODIFIED);
-- 
GitLab


From 29fc82c364e2e90330d9858528e50d785e5e66bd Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 13 Feb 2012 23:35:33 +0100
Subject: [PATCH 485/546] Send gallery album thumbnail with
 OC_Response::sendFile

---
 apps/gallery/ajax/galleryOp.php |  6 +++---
 lib/image.php                   |  5 +++++
 lib/response.php                | 21 +++++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
index 9273de2599d..5ac6d295108 100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
@@ -41,9 +41,9 @@ function handleRemove($name) {
 
 function handleGetThumbnails($albumname) {
   OC_Response::enableCaching(3600 * 24); // 24 hour
-  $photo = new OC_Image();
-  $photo->loadFromFile(OC::$CONFIG_DATADIRECTORY.'/../gallery/'.$albumname.'.png');
-  $photo->show();
+  $thumbnail = OC::$CONFIG_DATADIRECTORY.'/../gallery/'.$albumname.'.png';
+  header('Content-Type: '.OC_Image::getMimeTypeForFile($thumbnail));
+  OC_Response::sendFile($thumbnail);
 }
 
 function handleGalleryScanning() {
diff --git a/lib/image.php b/lib/image.php
index df8f76352a0..b1d3a14f415 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -48,6 +48,11 @@ class OC_Image {
 	protected $imagetype = IMAGETYPE_PNG; // Default to png if file type isn't evident.
 	protected $filepath = null;
 
+	static public function getMimeTypeForFile($filepath) {
+		$imagetype = exif_imagetype($filepath);
+		return $imagetype ? image_type_to_mime_type($imagetype) : '';
+	}
+
 	/**
 	* @brief Constructor.
 	* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
diff --git a/lib/response.php b/lib/response.php
index a768366b02c..f47534aeefb 100644
--- a/lib/response.php
+++ b/lib/response.php
@@ -10,6 +10,7 @@ class OC_Response {
 	const STATUS_FOUND = 304;
 	const STATUS_NOT_MODIFIED = 304;
 	const STATUS_TEMPORARY_REDIRECT = 307;
+	const STATUS_NOT_FOUND = 404;
 
 	static public function enableCaching($cache_time = null) {
 		if (is_numeric($cache_time)) {
@@ -47,6 +48,9 @@ class OC_Response {
 			case self::STATUS_FOUND;
 				$status = $status . ' Found';
 				break;
+			case self::STATUS_NOT_FOUND;
+				$status = $status . ' Not Found';
+				break;
 		}
 		header($protocol.' '.$status);
 	}
@@ -85,6 +89,9 @@ class OC_Response {
 		if (empty($lastModified)) {
 			return;
 		}
+		if (is_int($lastModified)) {
+			$lastModified = gmdate(DateTime::RFC2822, $lastModified);
+		}
 		if ($lastModified instanceof DateTime) {
 			$lastModified = $lastModified->format(DateTime::RFC2822);
 		}
@@ -95,4 +102,18 @@ class OC_Response {
 		}
 		header('Last-Modified: '.$lastModified);
 	}
+
+	static public function sendFile($filepath=null) {
+		$fp = fopen($filepath, 'rb');
+		if ($fp) {
+			self::setLastModifiedHeader(filemtime($filepath));
+			self::setETagHeader(md5_file($filepath));
+
+			header('Content-Length: '.filesize($filepath));
+			fpassthru($fp);
+		}
+		else {
+			self::setStatus(self::STATUS_NOT_FOUND);
+		}
+	}
 }
-- 
GitLab


From 525306c1e2930c6b378b0a4e9fb92eeb90865b0a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 13 Feb 2012 23:48:05 +0100
Subject: [PATCH 486/546] Replace Expires and caching headers by OC_Response
 functions

---
 apps/files_sharing/get.php |  4 +---
 apps/media/ajax/api.php    | 13 +++----------
 apps/media/tomahawk.php    |  4 +---
 files/download.php         |  4 +---
 lib/files.php              |  4 +---
 lib/response.php           |  3 +++
 6 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
index c80b0c2ef03..3a3db6dd38e 100644
--- a/apps/files_sharing/get.php
+++ b/apps/files_sharing/get.php
@@ -67,9 +67,7 @@ if ($source !== false) {
 		//get time mimetype and set the headers
 		$mimetype = OC_Filesystem::getMimeType($source);
 		header("Content-Transfer-Encoding: binary");
-		header("Expires: 0");
-		header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-		header("Pragma: public");
+		OC_Response::disableCaching();
 		header('Content-Disposition: filename="'.basename($source).'"');
 		header("Content-Type: " . $mimetype);
 		header("Content-Length: " . OC_Filesystem::filesize($source));
diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php
index ac6739a1386..bb4502690b5 100644
--- a/apps/media/ajax/api.php
+++ b/apps/media/ajax/api.php
@@ -111,18 +111,11 @@ if($arguments['action']){
 			OC_MEDIA_COLLECTION::registerPlay($songId);
 			
 			header('Content-Type:'.$ftype);
-			 // calc an offset of 24 hours
-			$offset = 3600 * 24;
-			// calc the string in GMT not localtime and add the offset
-			$expire = "Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT";
-			//output the HTTP header
-			header($expire);
-			header('Cache-Control: max-age=3600, must-revalidate');
-			header('Pragma: public');
+			OC_Response::enableCaching(3600 * 24); // 24 hour
 			header('Accept-Ranges: bytes');
 			header('Content-Length: '.OC_Filesystem::filesize($arguments['path']));
-			$gmt_mtime = gmdate('D, d M Y H:i:s', OC_Filesystem::filemtime($arguments['path']) ) . ' GMT';
-			header("Last-Modified: " . $gmt_mtime );
+			$mtime = OC_Filesystem::filemtime($arguments['path']);
+			OC_Response::setLastModifiedHeader($mtime);
 			
 			OC_Filesystem::readfile($arguments['path']);
 			exit;
diff --git a/apps/media/tomahawk.php b/apps/media/tomahawk.php
index 68401db67ae..6dd41233f12 100644
--- a/apps/media/tomahawk.php
+++ b/apps/media/tomahawk.php
@@ -43,9 +43,7 @@ if(isset($_POST['play']) and $_POST['play']=='true'){
 	$song=OC_MEDIA_COLLECTION::getSong($_POST['song']);
 	$ftype=OC_Filesystem::getMimeType( $song['song_path'] );
 	header('Content-Type:'.$ftype);
-	header('Expires: 0');
-	header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-	header('Pragma: public');
+	OC_Response::disableCaching();
 	header('Content-Length: '.OC_Filesystem::filesize($song['song_path']));
 
 	OC_Filesystem::readfile($song['song_path']);
diff --git a/files/download.php b/files/download.php
index 71f91d352f7..d1f5ba486d7 100644
--- a/files/download.php
+++ b/files/download.php
@@ -41,9 +41,7 @@ $ftype=OC_Filesystem::getMimeType( $filename );
 
 header('Content-Type:'.$ftype);
 header('Content-Disposition: attachment; filename="'.basename($filename).'"');
-header('Expires: 0');
-header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-header('Pragma: public');
+OC_Response::disableCaching();
 header('Content-Length: '.OC_Filesystem::filesize($filename));
 
 @ob_end_clean();
diff --git a/lib/files.php b/lib/files.php
index 457c8ea38f2..1f8331afb21 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -91,9 +91,7 @@ class OC_Files {
 		if($zip or OC_Filesystem::is_readable($filename)){
 			header('Content-Disposition: attachment; filename="'.basename($filename).'"');
 			header('Content-Transfer-Encoding: binary');
-			header('Expires: 0');
-			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-			header('Pragma: public');
+			OC_Response::disableCaching();
 			if($zip){
 				header('Content-Type: application/zip');
 				header('Content-Length: ' . filesize($filename));
diff --git a/lib/response.php b/lib/response.php
index f47534aeefb..2fa0a5adcd3 100644
--- a/lib/response.php
+++ b/lib/response.php
@@ -30,6 +30,9 @@ class OC_Response {
 		}
 
 	}
+	static public function disableCaching() {
+		self::enableCaching(0);
+	}
 
 	static public function setStatus($status) {
 		$protocol = $_SERVER['SERVER_PROTOCOL'];
-- 
GitLab


From 777804fac231f031ccbaed49590400dca91fab6b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 14 Feb 2012 00:12:22 +0100
Subject: [PATCH 487/546] Gallery: remove unused cover.php

---
 apps/gallery/ajax/cover.php | 81 -------------------------------------
 1 file changed, 81 deletions(-)
 delete mode 100644 apps/gallery/ajax/cover.php

diff --git a/apps/gallery/ajax/cover.php b/apps/gallery/ajax/cover.php
deleted file mode 100644
index 068a6e9c4ec..00000000000
--- a/apps/gallery/ajax/cover.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bart.p.pl@gmail.com
-* 
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either 
-* version 3 of the License, or any later version.
-* 
-* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
-*  
-* You should have received a copy of the GNU Lesser General Public 
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*/
-
-require_once('../../../lib/base.php');
-OC_JSON::checkLoggedIn();
-OC_JSON::checkAppEnabled('gallery');
-
-function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height) { //$imgSrc is a FILE - Returns an image resource.
-    //getting the image dimensions  
-    list($width_orig, $height_orig) = getimagesize($imgSrc);   
-    switch (strtolower(substr($imgSrc, strrpos($imgSrc, '.')+1))) {
-      case "jpeg":
-      case "jpg":
-        $myImage = imagecreatefromjpeg($imgSrc);
-        break;
-      default:
-        exit();
-    }
-    $ratio_orig = $width_orig/$height_orig;
-    
-    if ($thumbnail_width/$thumbnail_height > $ratio_orig) {
-       $new_height = $thumbnail_width/$ratio_orig;
-       $new_width = $thumbnail_width;
-    } else {
-       $new_width = $thumbnail_height*$ratio_orig;
-       $new_height = $thumbnail_height;
-    }
-    
-    $x_mid = $new_width/2;  //horizontal middle
-    $y_mid = $new_height/2; //vertical middle
-    
-    $process = imagecreatetruecolor(round($new_width), round($new_height)); 
-
-    imagecopyresampled($process, $myImage, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
-    $thumb = imagecreatetruecolor($thumbnail_width, $thumbnail_height); 
-    imagecopyresampled($thumb, $process, 0, 0, ($x_mid-($thumbnail_width/2)), ($y_mid-($thumbnail_height/2)), $thumbnail_width, $thumbnail_height, $thumbnail_width, $thumbnail_height);
-
-    imagedestroy($process);
-    imagedestroy($myImage);
-    return $thumb;
-}
-
-$box_size = 200;
-$album_name = $_GET['album'];
-$x = $_GET['x'];
-
-$stmt = OC_DB::prepare('SELECT `file_path` FROM *PREFIX*gallery_photos,*PREFIX*gallery_albums WHERE *PREFIX*gallery_albums.`uid_owner` = ? AND `album_name` = ? AND *PREFIX*gallery_photos.`album_id` == *PREFIX*gallery_albums.`album_id`');
-$result = $stmt->execute(array(OC_User::getUser(), $album_name));
-$x = min((int)($x/($box_size/$result->numRows())), $result->numRows()-1); // get image to display
-$result->seek($x); // never throws
-$path = $result->fetchRow();
-$path = $path['file_path'];
-$imagePath = OC_Filesystem::getLocalFile($img);
-$imagesize = getimagesize($imagePath);
-
-header('Content-Type: image/png');
-$image = CroppedThumbnail($imagePath, $box_size, $box_size);
-
-imagepng($image);
-imagedestroy($image);
-?>
-- 
GitLab


From a37bd932223f6fbcad9be8a2129a09502f4bd762 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 14 Feb 2012 00:13:04 +0100
Subject: [PATCH 488/546] External: Use OC_Util::checkLoggedIn

---
 apps/external/index.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/apps/external/index.php b/apps/external/index.php
index 86b19abc10e..51cdc344bbf 100644
--- a/apps/external/index.php
+++ b/apps/external/index.php
@@ -23,12 +23,7 @@
 
 require_once('../../lib/base.php');
 
-// Check if we are a user
-if( !OC_User::isLoggedIn()){
-	header( "Location: ".OC_Helper::linkTo( '', 'index.php' ));
-	exit();
-}
-
+OC_Util::checkLoggedIn();
 
 if(isset($_GET['id'])){
 
-- 
GitLab


From 7323b525607385ff37854533e1b585d17fd8648c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 13 Feb 2012 10:25:45 +0100
Subject: [PATCH 489/546] some additional test cases for file storage backends

---
 tests/lib/filestorage.php | 51 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
index edb029d916f..7f024dafaa3 100644
--- a/tests/lib/filestorage.php
+++ b/tests/lib/filestorage.php
@@ -34,10 +34,41 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->assertTrue($this->instance->is_readable('/'),'Root folder is not readable');
 		$this->assertTrue($this->instance->is_dir('/'),'Root folder is not a directory');
 		$this->assertFalse($this->instance->is_file('/'),'Root folder is a file');
+		$this->assertEqual('dir',$this->instance->filetype('/'));
 		
 		//without this, any further testing would be useless, not an acutal requirement for filestorage though
 		$this->assertTrue($this->instance->is_writable('/'),'Root folder is not writable');
 	}
+	
+	public function testDirectories(){
+		$this->assertFalse($this->instance->file_exists('/folder'));
+		
+		$this->assertTrue($this->instance->mkdir('/folder'));
+		
+		$this->assertTrue($this->instance->file_exists('/folder'));
+		$this->assertTrue($this->instance->is_dir('/folder'));
+		$this->assertFalse($this->instance->is_file('/folder'));
+		$this->assertEqual('dir',$this->instance->filetype('/folder'));
+		$this->assertEqual(0,$this->instance->filesize('/folder'));
+		$this->assertTrue($this->instance->is_readable('/folder'));
+		$this->assertTrue($this->instance->is_writable('/folder'));
+		
+		$dh=$this->instance->opendir('/');
+		$content=array();
+		while($file=readdir($dh)){
+			if($file!='.' and $file!='..'){
+				$content[]=$file;
+			}
+		}
+		$this->assertEqual(array('folder'),$content);
+		
+		$this->assertFalse($this->instance->mkdir('/folder'));//cant create existing folders
+		$this->assertTrue($this->instance->rmdir('/folder'));
+		
+		$this->assertFalse($this->instance->file_exists('/folder'));
+		
+		$this->assertFalse($this->instance->rmdir('/folder'));//cant remove non existing folders
+	}
 
 	/**
 	 * test the various uses of file_get_contents and file_put_contents
@@ -58,6 +89,26 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->instance->file_put_contents('/lorem.txt','');
 		$this->assertEqual('',$this->instance->file_get_contents('/lorem.txt'),'file not emptied');
 	}
+	
+	/**
+	 * test various known mimetypes
+	 */
+	public function testMimeType(){
+		$this->assertEqual('httpd/unix-directory',$this->instance->getMimeType('/'));
+		$this->assertEqual(false,$this->instance->getMimeType('/non/existing/file'));
+		
+		$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
+		$this->instance->file_put_contents('/lorem.txt',fopen($textFile,'r'));
+		$this->assertEqual('text/plain',$this->instance->getMimeType('/lorem.txt'));
+		
+		$pngFile=OC::$SERVERROOT.'/tests/data/logo-wide.png';
+		$this->instance->file_put_contents('/logo-wide.png',fopen($pngFile,'r'));
+		$this->assertEqual('image/png',$this->instance->getMimeType('/logo-wide.png'));
+		
+		$svgFile=OC::$SERVERROOT.'/tests/data/logo-wide.svg';
+		$this->instance->file_put_contents('/logo-wide.svg',fopen($svgFile,'r'));
+		$this->assertEqual('image/svg+xml',$this->instance->getMimeType('/logo-wide.svg'));
+	}
 }
 
 
-- 
GitLab


From bfa18fde19427179aa1ec5132810b429dee33cf7 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 13 Feb 2012 10:26:40 +0100
Subject: [PATCH 490/546] dummy data for tests cases

---
 tests/data/logo-wide.png | Bin 0 -> 3559 bytes
 tests/data/logo-wide.svg | 875 +++++++++++++++++++++++++++++++++++++++
 tests/data/lorem.txt     |   4 +
 3 files changed, 879 insertions(+)
 create mode 100644 tests/data/logo-wide.png
 create mode 100644 tests/data/logo-wide.svg
 create mode 100644 tests/data/lorem.txt

diff --git a/tests/data/logo-wide.png b/tests/data/logo-wide.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2c16a0f60a6991eb6a98109d017b48e3b3a3a3b
GIT binary patch
literal 3559
zcmV<D4H)u?P)<h;3K|Lk000e1NJLTq004{t001Be1^@s6z#fpR00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H14P;3~K~#90?VD*>lt;FJ-)^=>*#vPHQ2|+G6E#Lfg@7?8(YT@+
zjW=eQ#CziyCz-isG-k4x#4(G>L^C&uGbW>=aY;<XZB$&MMiG%kTtHFWWmT4@o9=Ue
zd=MLGnr4gn!TUV*@Nnu>)v52R@6@TKRU$%b;2k)otH#-GhO3Knw6;PQW-u5W9UUFA
z_4>*~`31#Wa?^Gvwo1cov?{9B7%+iD#?5qWr}^lG|C-t%JUBod(60}U8VwgOT_OEU
z7GKA2EzY@gb#GBg;nUekyNg@gfHqnW5oxgmsKQ51PI&r%78d0f7KtU+ZcNaHjhuX~
zM{rDVOWM$uS~oS>!}JV$sJqIb8g64}>s?u?PpvQ-4|a5R{qK>(A{MS(w#dnvI*y-A
z=b5>SFB%JN{L|An=$d3m8^0>HjV+*3sZ;?&$G_IKW2cuNiH)@H?bY2WCH+j%?!?1J
zjf1_z(l_Q?HCO-!h4*LD<1w8#ZQb=g@N#2qY2!Z7SeFzuWZeAOFD<-NuGNYuFTV1Y
z?AUWi8jDV+m(UTD3cE!--tK<8+qTqjYLtiRJ22MO#i_%><?k+V);KuS$jiQ%%h17L
zjUKRecD95B`Z=U#oJkrSJFTFsOq*C-QgTR-&A}U|c9u4}!Zuo!Mh%!s9fO7r3dN~?
zyBczBMFrZ53Y?wVH_3<x2ZcHY`u7cZG<F2(ndgTdPfowH=fKa}K4GJux{$JKSCcAj
zqg7BhM%gH;E?qixbf_)Adi@sNx^!x?5xshLMW@pf9O%pRNn=$XzVj#7@7H|Vxu0L3
z4dJ7vtX8R1swP+7MvKz8pjRcQl24u178Dh?OFVd-QyFJDm2r+6xAM?c=*<?ne)Bdb
zQ!`1=%p&ddc`oH%!_Ll*0KYy22l^5m=u76=i}?2KRim7@S2woBuXLTeV97+izA^(?
z+SE?A(Q-6uS*=q2RUJ6=<YkWzZr#VmMiLs-kB}fgx_0*Dv1xPo=JR*)aCZZsva*up
z|M)k%6OS@-*g!%8{Rj^9#j8hGDk^lGK6ioCjI*R>oa4aZ6U=@7cg&1?yiS`XrDa5o
zpIvnA_N^gTPwhS1Vm)u8X;>Q_dwY-4gpHc~W8CaN-nn%<UuyH$r7I<V^L7yt$vk&K
z9-THvmVWwA(d+efbZc|<`Yn0#`9I5RZ!ee9vhq6l`+rK30Z~&E@AnF!Es6C5CTzr{
zf4sl^tD0+R6Y>j-Bx>AjiQl|kVkSN($*Gz3shY)TG|KAu?<IEPbCOq3bC=j)FiP;S
z3HkT?Vf_jzyei#qJL*fbty1&~jTs&@@!7&kgF!6u?RPsQB6_Oa&MUB}XNh&266A&X
zZ`P4VJuy4KOL%mzR(J@%r8KW9-ETYUOF32ry>8Af@t=S2x|@yK@}g?n?t{GXr#W==
z=+NXTa@xd4*qwNUA9wD@QRBd&pHFfs<1D2m<sG`Yc1(+intDU6Rv*2cSM+_(sU4e|
z+)x`$qE683=|9}r#mQ;5o3l%dzS0n`*H^ms@$TWcE&ekbOBHSSZYPJ1CiBUA3z}_I
zenAnB#J$LXV1J&R{22WMeQ<Yk1)#9#4(XZaS+{vd@sVRGr}K&nrsSsVx!UYTe_f)0
z;lMy(JMejxd|uVxkMD<3R*+M}<@5>}9UU4u@!E$gR%?$Xr^(%tQu!`nuPpiKi#k(8
zZN|pESSR*q4y)E|krk`rE$Zw&@UwAXblmNL2ggs4`|qx;NuDCIQA9S2$TK1mDk8Qf
z`M>!o>6bYsA}a20LH>O=ZC(5Kt}nm%l*6F#{y4R7M{34dLIV9P4m-WRl8Oo)9vxg;
zY$y*53nC*k%c4$H<X~08`V}4R?QB<d4}Q33i#6Ul3;^~6@xVmjE8rARc|VP6ENTGn
z(1)YDbn<xihjpL1dG+X8LqS`iL*rm?v68b{7wPBY-J*v1`}QXD+=T}9JUhDc?xK0F
zo*kSvwx|Iuiv#c_5C{C0?Q9UWr~hzgH&>^Bul!(<n_69W2R<awkMuK^zx348=Lv4W
z3pExyJ6kjw2TDrH8q|FxX1MBsh!B78&@q!*)QFbjO<)s{cE1g2F19XCPP1oCAMak<
zvs4oj<j3yBBNi*ky>gxY0lqD6T#s&DxP0{nf&Kb4s2ew7j7!FutSP`1;0*9<T>WeZ
zgaGBhX~5k1hz&3q=+}a61_8OijTWl2HugY&z!gxT%tUIy(bmn`C1&`L0d)=(tMT*k
z=3I6T1x3ZbtW-?V>Gb&Y_Tv17OD%5og`8aacz3r-w|{^yt}f0`pq!8S0HwejlsLhZ
zJ-}F?qL%y`FbJr<;)(}e0&bhg+<;F|;*u0V1B3x<fw!nRZ~{;UaC2jo-YBc79#!>q
zLwTXE0pHcq-2*(-Kz)A(P6DR40o;M*zz`snntcXvvej1_!UO#3|AKAQYUa<G#lp8g
zWyP|EfU-OM_4=)>-IzeRR!h0If?hqlG4F+$4cKTsrDf&V*w|3}-c5aU@^t6Q^_yB%
zRMa%tx33b20RDyYU`!uMca*QDHqMwojO~KrC8}`+enL46eab{`2P^^-fYCtpenkY3
zY*i=fCjj^Xm=A0<k@rIBqc89`6S*~CSqBtvRgEW*2)qN-_aeur4F-dA?fWgYd17od
z2BU$kI}#BQo}IUtj5FD6SoHx1eq7DbU2C~<Gv5juttaD57J>cxHmZz>fTw5mi#h>}
zN7>VGX+hJLp#-q2YsvM%>nNUTj)~kJXwH3Q8{nV7lhhn60GEJ=foUjHV{`ZncpJq_
z){ENS-u8B0eqn>PEm<^=FII14_S{8u_Vi%s8}o5>QLgXWsMU1#bSFC}x0yEI<M6Q*
zLV~Ohq_5q$jjgTCb=k1NU?RSZvN1Ngh0Ia|qp-ZO_P@aIO#V+onYx-vILb76te$)w
z@LsJp8;c8y7hBhmq8gRzXhW+Y0FMr?Z29J6PG@Gb@Q=T*lmCa`&tSouA1hyZGr4f-
z3JJRp5;tLt)n(F7p9A5rnXD5i(?Uzo56I-+bYqU|fCu+3r=_C=sZAvUr4N=kff7SC
z1{L@EF#si=X%KZ@e&O~XckaJyjdEGJ7B@E++Bs_K<c$~_fp6bltXi|hT7%7EFdBJf
z(K6myI2T8ab@2<p*Xw_{Q;=V@*-VxbP|_@;?%@g)SfN*rG8KU`RUM?}G}RbNQ2JmA
zCzK$+8ZF@1K$*TMD@uU7R<r?t`bt{ly8rAya_MMNYJ<vlc6R9W=5N*k{AK?0tlgAA
z)`iQ~v~89ZU&b>aB!EHT{jDyuW!oM@#+mG-oV4BB%w$JW)16nKy!hIvG5?UAX<iHh
zO0fC|8eUpgP%{t(#rDVs%0*H$uucYsS<tsf@krJCLTNxK_Xc^rs6`eV^Ycq5%zN#<
z!h#~pTNjQR2Q&^2+`Mf*z-{NK;h~Wa7$(k|r;XpTy-~}^vT`l2ELv8wYRzW-ghv}%
z5#HnK^;<0Y@c-`KyjwcWO!f%C8)cbU&3a%~Exn;Y4ltpXJP;_tI<I1hViXVaEtX&8
z_rP>&uHw$4#9~j^Q>J@W-JhGtmZGeh>RZjc4t&GC4?zcfT_vxN2;lNB2TOquj+-(d
zYD(UYJwMfZ>BV3$%KX2)U-86@xdwB0W3Jt}CBcys^LmCx1%!^6v}5{nuNGNzAenSB
z!}vh#lX*cy$IbT&dw6K@@CmoR{AQERXf#?Zw|>hGeMD4T!M;Psb428M5pk{RkGm*`
zcxfWyQ|kcDQ$#L`$P5v&7m;WYNfME%B9bK{GeyKfM23k-qKHg3DLX_&{v{0`(xr%q
z#*ExoL=K6_Cn7S+#9q_%t%!UoB3>pkHxW4@A|HrI*D6^%5s9m^d9;~&o~g1Ux~iXu
zh_{HW5|M2pVpmJwu1dbDO0QaOD<acH<eZ2Msd2r*YryDk?#?dX_U+xXU(ARhP9Z^l
z4&AzT;(YccQqs?qCG0w=ExL1eiwep;JltlywcsVUApgFUl$LY&Sc+lEM_&})DJgj>
z>v+O;0H48Q<D48Fm;3hdRt*^#;v60l;Mm{ahr;4Jq-LCxV<%GYB&B3j78T#UoL^8l
z<#O7dY*2px<lNqMl~<3h(X*zFbL$`Ai%%af0J1M$CjE34Yd0knXXWG`$-7xN<4Wd#
z48UTPYXcs@EnqjwCYrh5HU(9EmE(b<zzSe5;19fj;%SnBl~wgrKcrqL9>U_%6L=N)
z2=kkDHYocXkto6DSHRy*@|~;lX9BU@i@)rESAcOSUZn*1xvJmw#Q-5FdqZI;(@i$8
zrmD^Qcm|k((pMeIrsQ^%mEl>lm%zRH#|%>2sRw(wx<w242*%`s!s2~KwdzRj$zA6G
zyh39lJ9qSWRbOcsV53&wtuz=86_(sxd^vg7HPgCODwV27Sga2Q8Putx`$H-f52{t_
z!m{%6eZ?guhm3ZHq^n8$^2}M@D=c=nbNlv>X&f}8v=tS;AZkaA=Dbc<aiI84SwhaK
hoqH{Gyp2}i{{fnqhMG6JwT=J)002ovPDHLkV1jB4?wJ4p

literal 0
HcmV?d00001

diff --git a/tests/data/logo-wide.svg b/tests/data/logo-wide.svg
new file mode 100644
index 00000000000..73b37cc7aaa
--- /dev/null
+++ b/tests/data/logo-wide.svg
@@ -0,0 +1,875 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="140"
+   height="32"
+   viewBox="0 0 139.99999 32"
+   enable-background="new 0 0 595.275 311.111"
+   xml:space="preserve"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="logo-wide.svg"><metadata
+   id="metadata327"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+   id="defs325"><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_1_"
+   id="linearGradient3353"
+   gradientUnits="userSpaceOnUse"
+   x1="288.49411"
+   y1="55.888199"
+   x2="288.49411"
+   y2="339.22189" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_2_"
+   id="linearGradient3355"
+   gradientUnits="userSpaceOnUse"
+   x1="251.2114"
+   y1="55.888199"
+   x2="251.2114"
+   y2="339.22159" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_3_"
+   id="linearGradient3357"
+   gradientUnits="userSpaceOnUse"
+   x1="293.22461"
+   y1="55.888199"
+   x2="293.22461"
+   y2="339.22171" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_4_"
+   id="linearGradient3359"
+   gradientUnits="userSpaceOnUse"
+   x1="375.33401"
+   y1="55.888199"
+   x2="375.33401"
+   y2="339.22159" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_5_"
+   id="linearGradient3361"
+   gradientUnits="userSpaceOnUse"
+   x1="334.49411"
+   y1="55.888199"
+   x2="334.49411"
+   y2="339.22159" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_6_"
+   id="linearGradient3363"
+   gradientUnits="userSpaceOnUse"
+   x1="458.42679"
+   y1="55.8867"
+   x2="458.42679"
+   y2="339.2236" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_7_"
+   id="linearGradient3365"
+   gradientUnits="userSpaceOnUse"
+   x1="413.16309"
+   y1="55.888199"
+   x2="413.16309"
+   y2="339.22131" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_8_"
+   id="linearGradient3367"
+   gradientUnits="userSpaceOnUse"
+   x1="290.76169"
+   y1="55.8867"
+   x2="290.76169"
+   y2="339.2236" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#SVGID_9_"
+   id="linearGradient3369"
+   gradientUnits="userSpaceOnUse"
+   x1="346.77341"
+   y1="55.888199"
+   x2="346.77341"
+   y2="339.22119" />
+	<linearGradient
+   y2="339.22189"
+   x2="288.49411"
+   y1="55.888199"
+   x1="288.49411"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_1_">
+		<stop
+   id="stop261"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop263"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+	<linearGradient
+   y2="339.22159"
+   x2="251.2114"
+   y1="55.888199"
+   x1="251.2114"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_2_">
+		<stop
+   id="stop268"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop270"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+	<linearGradient
+   y2="339.22171"
+   x2="293.22461"
+   y1="55.888199"
+   x1="293.22461"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_3_">
+		<stop
+   id="stop275"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop277"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+	<linearGradient
+   y2="339.22159"
+   x2="375.33401"
+   y1="55.888199"
+   x1="375.33401"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_4_">
+		<stop
+   id="stop282"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop284"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+	<linearGradient
+   y2="339.22159"
+   x2="334.49411"
+   y1="55.888199"
+   x1="334.49411"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_5_">
+		<stop
+   id="stop289"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop291"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+	<linearGradient
+   y2="339.2236"
+   x2="458.42679"
+   y1="55.8867"
+   x1="458.42679"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_6_">
+		<stop
+   id="stop296"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop298"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+	<linearGradient
+   y2="339.22131"
+   x2="413.16309"
+   y1="55.888199"
+   x1="413.16309"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_7_">
+		<stop
+   id="stop303"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop305"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+	<linearGradient
+   y2="339.2236"
+   x2="290.76169"
+   y1="55.8867"
+   x1="290.76169"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_8_">
+		<stop
+   id="stop310"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop312"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+	<linearGradient
+   y2="339.22119"
+   x2="346.77341"
+   y1="55.888199"
+   x1="346.77341"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_9_">
+		<stop
+   id="stop317"
+   style="stop-color:#BED5E1"
+   offset="0" />
+		<stop
+   id="stop319"
+   style="stop-color:#567B8F"
+   offset="1" />
+	</linearGradient>
+	
+</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1280"
+   inkscape:window-height="776"
+   id="namedview323"
+   showgrid="false"
+   inkscape:zoom="3.4068286"
+   inkscape:cx="79.998916"
+   inkscape:cy="32.107419"
+   inkscape:window-x="0"
+   inkscape:window-y="24"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1"
+   showguides="true"
+   inkscape:guide-bbox="true" />
+<pattern
+   y="565.223"
+   width="69"
+   height="69"
+   patternUnits="userSpaceOnUse"
+   id="Polka_Dot_Pattern"
+   viewBox="2.125 -70.896 69 69"
+   overflow="visible">
+	<g
+   id="g4">
+		<polygon
+   fill="none"
+   points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896   "
+   id="polygon6" />
+		<polygon
+   fill="#F6BB60"
+   points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896   "
+   id="polygon8" />
+		<g
+   id="g10">
+			<path
+   fill="#FFFFFF"
+   d="M61.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path12" />
+			<path
+   fill="#FFFFFF"
+   d="M54.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path14" />
+			<path
+   fill="#FFFFFF"
+   d="M46.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path16" />
+			<path
+   fill="#FFFFFF"
+   d="M38.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path18" />
+			<path
+   fill="#FFFFFF"
+   d="M31.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path20" />
+			<path
+   fill="#FFFFFF"
+   d="M23.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path22" />
+			<path
+   fill="#FFFFFF"
+   d="M15.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path24" />
+			<path
+   fill="#FFFFFF"
+   d="M8.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path26" />
+			<path
+   fill="#FFFFFF"
+   d="M0.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19C0.361-71.362,0.3-71.4,0.248-71.335     c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path28" />
+		</g>
+		<g
+   id="g30">
+			<path
+   fill="#FFFFFF"
+   d="M69.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128     c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path32" />
+		</g>
+		<path
+   fill="#FFFFFF"
+   d="M0.495-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128    c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161    c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631    c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45    c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221    c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337    c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207    c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224C0.5-71.68,0.503-71.744,0.51-71.626    c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path34" />
+		<g
+   id="g36">
+			<g
+   id="g38">
+				<path
+   fill="#FFFFFF"
+   d="M69.439-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path40" />
+				<path
+   fill="#FFFFFF"
+   d="M61.778-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path42" />
+				<path
+   fill="#FFFFFF"
+   d="M54.118-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path44" />
+				<path
+   fill="#FFFFFF"
+   d="M46.458-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path46" />
+				<path
+   fill="#FFFFFF"
+   d="M38.797-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path48" />
+				<path
+   fill="#FFFFFF"
+   d="M31.137-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path50" />
+				<path
+   fill="#FFFFFF"
+   d="M23.477-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path52" />
+				<path
+   fill="#FFFFFF"
+   d="M15.816-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path54" />
+				<path
+   fill="#FFFFFF"
+   d="M8.156-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path56" />
+				<path
+   fill="#FFFFFF"
+   d="M0.495-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143C2-61.45,2.217-61.397,2.391-61.46c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path58" />
+			</g>
+			<g
+   id="g60">
+				<path
+   fill="#FFFFFF"
+   d="M69.439-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path62" />
+				<path
+   fill="#FFFFFF"
+   d="M61.778-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path64" />
+				<path
+   fill="#FFFFFF"
+   d="M54.118-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path66" />
+				<path
+   fill="#FFFFFF"
+   d="M46.458-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path68" />
+				<path
+   fill="#FFFFFF"
+   d="M38.797-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path70" />
+				<path
+   fill="#FFFFFF"
+   d="M31.137-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path72" />
+				<path
+   fill="#FFFFFF"
+   d="M23.477-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path74" />
+				<path
+   fill="#FFFFFF"
+   d="M15.816-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path76" />
+				<path
+   fill="#FFFFFF"
+   d="M8.156-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path78" />
+				<path
+   fill="#FFFFFF"
+   d="M0.495-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-56.374,0.503-56.438,0.51-56.32      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path80" />
+			</g>
+			<g
+   id="g82">
+				<path
+   fill="#FFFFFF"
+   d="M69.439-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path84" />
+				<path
+   fill="#FFFFFF"
+   d="M61.778-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path86" />
+				<path
+   fill="#FFFFFF"
+   d="M54.118-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path88" />
+				<path
+   fill="#FFFFFF"
+   d="M46.458-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path90" />
+				<path
+   fill="#FFFFFF"
+   d="M38.797-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path92" />
+				<path
+   fill="#FFFFFF"
+   d="M31.137-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path94" />
+				<path
+   fill="#FFFFFF"
+   d="M23.477-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path96" />
+				<path
+   fill="#FFFFFF"
+   d="M15.816-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path98" />
+				<path
+   fill="#FFFFFF"
+   d="M8.156-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path100" />
+				<path
+   fill="#FFFFFF"
+   d="M0.495-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path102" />
+			</g>
+			<g
+   id="g104">
+				<path
+   fill="#FFFFFF"
+   d="M69.439-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path106" />
+				<path
+   fill="#FFFFFF"
+   d="M61.778-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path108" />
+				<path
+   fill="#FFFFFF"
+   d="M54.118-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path110" />
+				<path
+   fill="#FFFFFF"
+   d="M46.458-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path112" />
+				<path
+   fill="#FFFFFF"
+   d="M38.797-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path114" />
+				<path
+   fill="#FFFFFF"
+   d="M31.137-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path116" />
+				<path
+   fill="#FFFFFF"
+   d="M23.477-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path118" />
+				<path
+   fill="#FFFFFF"
+   d="M15.816-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path120" />
+				<path
+   fill="#FFFFFF"
+   d="M8.156-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      C8.15-41.004,8.149-41.02,8.14-41.04"
+   id="path122" />
+				<path
+   fill="#FFFFFF"
+   d="M0.495-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path124" />
+			</g>
+			<g
+   id="g126">
+				<path
+   fill="#FFFFFF"
+   d="M69.439-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path128" />
+				<path
+   fill="#FFFFFF"
+   d="M61.778-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path130" />
+				<path
+   fill="#FFFFFF"
+   d="M54.118-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path132" />
+				<path
+   fill="#FFFFFF"
+   d="M46.458-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path134" />
+				<path
+   fill="#FFFFFF"
+   d="M38.797-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path136" />
+				<path
+   fill="#FFFFFF"
+   d="M31.137-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path138" />
+				<path
+   fill="#FFFFFF"
+   d="M23.477-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path140" />
+				<path
+   fill="#FFFFFF"
+   d="M15.816-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path142" />
+				<path
+   fill="#FFFFFF"
+   d="M8.156-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path144" />
+				<path
+   fill="#FFFFFF"
+   d="M0.495-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-33.416,0.503-33.48,0.51-33.362      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path146" />
+			</g>
+			<g
+   id="g148">
+				<path
+   fill="#FFFFFF"
+   d="M69.439-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path150" />
+				<path
+   fill="#FFFFFF"
+   d="M61.778-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path152" />
+				<path
+   fill="#FFFFFF"
+   d="M54.118-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path154" />
+				<path
+   fill="#FFFFFF"
+   d="M46.458-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path156" />
+				<path
+   fill="#FFFFFF"
+   d="M38.797-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path158" />
+				<path
+   fill="#FFFFFF"
+   d="M31.137-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path160" />
+				<path
+   fill="#FFFFFF"
+   d="M23.477-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path162" />
+				<path
+   fill="#FFFFFF"
+   d="M15.816-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path164" />
+				<path
+   fill="#FFFFFF"
+   d="M8.156-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path166" />
+				<path
+   fill="#FFFFFF"
+   d="M0.495-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path168" />
+			</g>
+			<g
+   id="g170">
+				<path
+   fill="#FFFFFF"
+   d="M69.439-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path172" />
+				<path
+   fill="#FFFFFF"
+   d="M61.778-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path174" />
+				<path
+   fill="#FFFFFF"
+   d="M54.118-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path176" />
+				<path
+   fill="#FFFFFF"
+   d="M46.458-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path178" />
+				<path
+   fill="#FFFFFF"
+   d="M38.797-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path180" />
+				<path
+   fill="#FFFFFF"
+   d="M31.137-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path182" />
+				<path
+   fill="#FFFFFF"
+   d="M23.477-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path184" />
+				<path
+   fill="#FFFFFF"
+   d="M15.816-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path186" />
+				<path
+   fill="#FFFFFF"
+   d="M8.156-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path188" />
+				<path
+   fill="#FFFFFF"
+   d="M0.495-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-18.11,0.503-18.175,0.51-18.057      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path190" />
+			</g>
+			<g
+   id="g192">
+				<path
+   fill="#FFFFFF"
+   d="M69.439-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362C69-9.692,69.159-9.523,69.154-9.4c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path194" />
+				<path
+   fill="#FFFFFF"
+   d="M61.778-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path196" />
+				<path
+   fill="#FFFFFF"
+   d="M54.118-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path198" />
+				<path
+   fill="#FFFFFF"
+   d="M46.458-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path200" />
+				<path
+   fill="#FFFFFF"
+   d="M38.797-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path202" />
+				<path
+   fill="#FFFFFF"
+   d="M31.137-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path204" />
+				<path
+   fill="#FFFFFF"
+   d="M23.477-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path206" />
+				<path
+   fill="#FFFFFF"
+   d="M15.816-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053C17.933-7.969,17.839-8.227,18-8.34      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path208" />
+				<path
+   fill="#FFFFFF"
+   d="M8.156-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      C7.915-10.05,7.866-9.836,7.886-9.75C7.717-9.692,7.876-9.523,7.871-9.4C7.868-9.351,7.83-9.295,7.826-9.239      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      C9.114-7.652,9.321-7.799,9.48-7.837c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path210" />
+				<path
+   fill="#FFFFFF"
+   d="M0.495-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      C0.254-10.05,0.205-9.836,0.225-9.75C0.056-9.692,0.215-9.523,0.21-9.4c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-8.671,0.501-8.456,0.668-8.325c0.19,0.148,0.365,0.572,0.608,0.631      C1.454-7.652,1.66-7.799,1.819-7.837C2-7.88,2.217-7.827,2.391-7.89c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46C3.477-8.933,3.471-8.995,3.5-9.071      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path212" />
+			</g>
+		</g>
+		<g
+   id="g214">
+			<path
+   fill="#FFFFFF"
+   d="M69.439-2.778c0.018,0.072,0.008,0.127-0.026,0.19C69.361-2.487,69.3-2.525,69.248-2.46     c-0.051,0.062-0.099,0.276-0.079,0.362C69-2.04,69.159-1.871,69.154-1.748c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C70.397,0,70.604-0.146,70.763-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path216" />
+			<path
+   fill="#FFFFFF"
+   d="M61.778-2.778c0.018,0.072,0.007,0.127-0.026,0.19C61.7-2.487,61.64-2.525,61.587-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C62.737,0,62.943-0.146,63.103-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C61.915-3.117,61.78-3.02,61.781-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path218" />
+			<path
+   fill="#FFFFFF"
+   d="M54.118-2.778c0.018,0.072,0.007,0.127-0.026,0.19C54.04-2.487,53.98-2.525,53.927-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C55.077,0,55.283-0.146,55.442-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C54.255-3.117,54.12-3.02,54.121-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path220" />
+			<path
+   fill="#FFFFFF"
+   d="M46.458-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C47.416,0,47.623-0.146,47.782-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C46.594-3.117,46.459-3.02,46.46-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path222" />
+			<path
+   fill="#FFFFFF"
+   d="M38.797-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C39.756,0,39.962-0.146,40.122-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C38.934-3.117,38.799-3.02,38.8-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path224" />
+			<path
+   fill="#FFFFFF"
+   d="M31.137-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C32.095,0,32.302-0.146,32.461-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C31.273-3.117,31.139-3.02,31.14-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path226" />
+			<path
+   fill="#FFFFFF"
+   d="M23.477-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C24.435,0,24.642-0.146,24.801-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
+   id="path228" />
+			<path
+   fill="#FFFFFF"
+   d="M15.816-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C16.774,0,16.981-0.146,17.14-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     C15.81-2.74,15.809-2.756,15.8-2.776"
+   id="path230" />
+			<path
+   fill="#FFFFFF"
+   d="M8.156-2.778c0.018,0.072,0.007,0.127-0.026,0.19C8.077-2.487,8.018-2.525,7.965-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35C7.868-1.698,7.83-1.643,7.826-1.587     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C9.114,0,9.321-0.146,9.48-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C8.954-3.54,8.847-3.448,8.692-3.367     c-0.17,0.088-0.139,0.166-0.318,0.224C8.292-3.117,8.158-3.02,8.159-2.92C8.16-2.805,8.164-2.869,8.17-2.751     C8.15-2.74,8.149-2.756,8.14-2.776"
+   id="path232" />
+			<path
+   fill="#FFFFFF"
+   d="M0.495-2.778c0.018,0.072,0.008,0.127-0.026,0.19C0.417-2.487,0.356-2.525,0.304-2.46     C0.253-2.397,0.205-2.184,0.225-2.098C0.056-2.04,0.215-1.871,0.21-1.748c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-1.019,0.501-0.804,0.668-0.673c0.19,0.148,0.365,0.572,0.608,0.631     C1.454,0,1.66-0.146,1.819-0.185C2-0.228,2.217-0.175,2.391-0.237c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46C3.477-1.28,3.471-1.343,3.5-1.419     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C1.293-3.54,1.187-3.448,1.031-3.367     c-0.17,0.088-0.139,0.166-0.318,0.224C0.632-3.117,0.498-3.02,0.498-2.92C0.5-2.805,0.503-2.869,0.51-2.751     C0.489-2.74,0.488-2.756,0.479-2.776"
+   id="path234" />
+		</g>
+	</g>
+</pattern>
+
+
+
+
+
+
+
+
+
+
+
+
+<g
+   style="display:inline"
+   id="g3154"
+   transform="matrix(0.21384268,0,0,0.21384268,31.655324,-22.278409)"><circle
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="circle238"
+     r="21.999001"
+     cy="225.17101"
+     cx="97.311996"
+     sodipodi:cx="97.311996"
+     sodipodi:cy="225.17101"
+     sodipodi:rx="21.999001"
+     sodipodi:ry="21.999001"
+     d="m 119.311,225.17101 c 0,12.14971 -9.84929,21.999 -21.999004,21.999 -12.149712,0 -21.999,-9.84929 -21.999,-21.999 0,-12.14972 9.849288,-21.99901 21.999,-21.99901 12.149714,0 21.999004,9.84929 21.999004,21.99901 z" /><circle
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="circle240"
+     r="22.000999"
+     cy="225.17101"
+     cx="364.82501"
+     sodipodi:cx="364.82501"
+     sodipodi:cy="225.17101"
+     sodipodi:rx="22.000999"
+     sodipodi:ry="22.000999"
+     d="m 386.82601,225.17101 c 0,12.15081 -9.85018,22.00099 -22.001,22.00099 -12.15081,0 -22.001,-9.85018 -22.001,-22.00099 0,-12.15082 9.85019,-22.001 22.001,-22.001 12.15082,0 22.001,9.85018 22.001,22.001 z" /><path
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="path242"
+     d="m 135.313,202.966 v 30.074 c 0,7.801 6.324,14.123 14.123,14.123 7.803,0 14.125,-6.322 14.125,-14.123 0,-0.004 0,-30.074 0,-30.074"
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="path244"
+     d="m 163.561,202.966 v 30.074 c 0,7.801 6.324,14.123 14.125,14.123 7.801,0 14.125,-6.322 14.125,-14.123 0,-0.004 0,-30.074 0,-30.074"
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="path246"
+     d="m 319.578,162.962 v 70.078 c 0,7.801 6.322,14.123 14.123,14.123"
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="path248"
+     d="m 208.317,247.169 v -22.201 c 0,-12.15 9.85,-22 22,-22 12.152,0 22.002,9.85 22.002,22 0,0.006 0,22.201 0,22.201"
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="path250"
+     d="m 401.322,202.966 v 22.205 c 0,12.148 9.85,21.998 22,21.998 12.15,0 22.002,-9.85 22.002,-21.998 0,-0.008 0,-22.205 0,-22.205"
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="path252"
+     d="m 303.146,176.839 c -19.421,0 -35.167,15.744 -35.167,35.166 0,19.422 15.746,35.164 35.167,35.164"
+     inkscape:connector-curvature="0" /><polyline
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="polyline254"
+     points="504.596,162.962 504.596,203.134 504.596,202.155 " /><path
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-opacity:1"
+     id="path256"
+     d="m 490.236,247.157 c -4.275,0 -7.844,0 -7.848,0 -12.15,0 -22,-9.85 -22,-21.998 0,-12.15 9.85,-22 22,-22 l 22.207,-0.025 c 0,0 0.137,22.342 0,29.895 -0.138,7.552 -7.968,14.128 -14.359,14.128 z"
+     inkscape:connector-curvature="0" /></g><circle
+   sodipodi:ry="20.332001"
+   sodipodi:rx="20.332001"
+   sodipodi:cy="78.911003"
+   sodipodi:cx="288.49399"
+   style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:4;stroke-opacity:1;display:inline"
+   id="circle265"
+   r="20.332001"
+   cy="78.911003"
+   cx="288.49399"
+   transform="matrix(0.21384268,0,0,0.21384268,-45.328041,-8.5924791)" /><circle
+   sodipodi:ry="37.242001"
+   sodipodi:rx="37.242001"
+   sodipodi:cy="149.577"
+   sodipodi:cx="251.211"
+   style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:4;stroke-opacity:1;display:inline"
+   id="circle272"
+   r="37.242001"
+   cy="149.577"
+   cx="251.211"
+   transform="matrix(0.21384268,0,0,0.21384268,-45.328041,-8.5924791)" /><circle
+   sodipodi:ry="40.261002"
+   sodipodi:rx="40.261002"
+   sodipodi:cy="124.796"
+   sodipodi:cx="293.22501"
+   style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:4;stroke-opacity:1;display:inline"
+   id="circle279"
+   r="40.261002"
+   cy="124.796"
+   cx="293.22501"
+   transform="matrix(0.21384268,0,0,0.21384268,-45.328041,-8.5924791)" /><circle
+   sodipodi:ry="37.242001"
+   sodipodi:rx="37.242001"
+   sodipodi:cy="108.472"
+   sodipodi:cx="375.33401"
+   style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:4;stroke-opacity:1;display:inline"
+   id="circle286"
+   r="37.242001"
+   cy="108.472"
+   cx="375.33401"
+   transform="matrix(0.21384268,0,0,0.21384268,-45.328041,-8.5924791)" /><circle
+   sodipodi:ry="37.241001"
+   sodipodi:rx="37.241001"
+   sodipodi:cy="79.503998"
+   sodipodi:cx="334.49301"
+   style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:4;stroke-opacity:1;display:inline"
+   id="circle293"
+   r="37.241001"
+   cy="79.503998"
+   cx="334.49301"
+   transform="matrix(0.21384268,0,0,0.21384268,-45.328041,-8.5924791)" /><circle
+   sodipodi:ry="40.261002"
+   sodipodi:rx="40.261002"
+   sodipodi:cy="147.563"
+   sodipodi:cx="413.16299"
+   style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+   id="circle307"
+   r="40.261002"
+   cy="147.563"
+   cx="413.16299"
+   transform="matrix(0.21384268,0,0,0.21384268,-45.328041,-8.5924791)" /><circle
+   sodipodi:ry="21.299"
+   sodipodi:rx="21.299"
+   sodipodi:cy="166.011"
+   sodipodi:cx="290.76199"
+   style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:4;stroke-opacity:1;display:inline"
+   id="circle314"
+   r="21.299"
+   cy="166.011"
+   cx="290.76199"
+   transform="matrix(0.21384268,0,0,0.21384268,-45.328041,-8.5924791)" /><path
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:0.8553707;stroke-opacity:1;display:inline"
+   id="path321"
+   d="m 39.804227,20.419344 c 0,6.062012 -4.91496,10.976117 -10.9774,10.976117 -6.06244,0 -10.977185,-4.914105 -10.977185,-10.976117 0,-6.062654 4.914959,-10.9771861 10.977185,-10.9771861 6.062226,0 10.9774,4.9145321 10.9774,10.9771861 z" /></svg>
\ No newline at end of file
diff --git a/tests/data/lorem.txt b/tests/data/lorem.txt
new file mode 100644
index 00000000000..b62c3fb2ffd
--- /dev/null
+++ b/tests/data/lorem.txt
@@ -0,0 +1,4 @@
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
-- 
GitLab


From 3c52ac7af3a5e03e8a740f195ca020cf67871c35 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 13 Feb 2012 10:27:00 +0100
Subject: [PATCH 491/546] make local filestorage comply with test cases

---
 lib/filestorage/local.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 292d2a84e7d..2e66943cad2 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -12,14 +12,10 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		}
 	}
 	public function mkdir($path){
-		if($return=mkdir($this->datadir.$path)){
-		}
-		return $return;
+		return @mkdir($this->datadir.$path);
 	}
 	public function rmdir($path){
-		if($return=rmdir($this->datadir.$path)){
-		}
-		return $return;
+		return @rmdir($this->datadir.$path);
 	}
 	public function opendir($path){
 		return opendir($this->datadir.$path);
@@ -80,8 +76,7 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		}
 	}
 	public function unlink($path){
-		$return=$this->delTree($path);
-		return $return;
+		return $this->delTree($path);
 	}
 	public function rename($path1,$path2){
 		if(! $this->file_exists($path1)){
@@ -168,6 +163,8 @@ class OC_Filestorage_Local extends OC_Filestorage{
 				$mimeType=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream';
 			}
 			return $mimeType;
+		}else{
+			return false;
 		}
 	}
 
-- 
GitLab


From 024405e4f1a645f640803ad41e24e59a43f27890 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 13 Feb 2012 13:02:54 +0100
Subject: [PATCH 492/546] Added function for later testing.

---
 apps/contacts/js/contacts.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 9071038b50a..d61489b63c3 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -3,6 +3,21 @@ function ucwords (str) {
 		return $1.toUpperCase();
 	});
 }
+/* TODO: Test this.
+ * http://snipplr.com/view/45323/remove-duplicate-values-from-array/
+Array.prototype.unique = function unique() { 
+	var i = 0; 
+	while (i < this.length) { 
+		var current = this[i]; 
+		for (k = this.length; k > i; k--) { 
+			if (this[k] === current) { 
+				this.splice(k,1);
+			}
+		} i++; 
+	} 
+	return this; 
+}
+*/
 
 String.prototype.strip_tags = function(){
 	tags = this;
-- 
GitLab


From 3adaacc0ce8cbbcb070cd06fb52d98e4f590751a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 14 Feb 2012 00:56:50 +0100
Subject: [PATCH 493/546] Added OC_Contacts_VCard::moveToAddressBook

---
 apps/contacts/lib/vcard.php | 40 +++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index f9ca427354e..a0eacd0e63b 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -384,4 +384,44 @@ class OC_Contacts_VCard{
 		}
 		return $temp;
 	}
+
+	/**
+	 * @brief Move card(s) to an address book
+	 * @param integer $aid Address book id
+	 * @param $id Array or integer of cards to be moved.
+	 * @return boolean
+	 *
+	 */
+	public static function moveToAddressBook($aid, $id){
+		OC_Contacts_App::getAddressbook($aid); // check for user ownership.
+		if(is_array($id)) {
+			$id_sql = join(',', array_fill(0, count($id), '?'));
+			$prep = 'UPDATE *PREFIX*contacts_cards SET addressbookid = ? WHERE id IN ('.$id_sql.')';
+			try {
+				$stmt = OC_DB::prepare( $prep );
+				//$aid = array($aid);
+				$vals = array_merge((array)$aid, $id);
+				$result = $stmt->execute($vals);
+			} catch(Exception $e) {
+				OC_Log::write('contacts','OC_Contacts_VCard::moveToAddressBook:, exception: '.$e->getMessage(),OC_Log::DEBUG);
+				OC_Log::write('contacts','OC_Contacts_VCard::moveToAddressBook, ids: '.join(',', $vals),OC_Log::DEBUG);
+				OC_Log::write('contacts','SQL:'.$prep,OC_Log::DEBUG);
+				return false;
+			}
+		} else {
+			try {
+				$stmt = OC_DB::prepare( 'UPDATE *PREFIX*contacts_cards SET addressbookid = ? WHERE id = ?' );
+				$result = $stmt->execute(array($aid, $id));
+			} catch(Exception $e) {
+				OC_Log::write('contacts','OC_Contacts_VCard::moveToAddressBook:, exception: '.$e->getMessage(),OC_Log::DEBUG);
+				OC_Log::write('contacts','OC_Contacts_VCard::moveToAddressBook, id: '.$id,OC_Log::DEBUG);
+				OC_Log::write('contacts','SQL:'.$prep,OC_Log::DEBUG);
+				return false;
+			}
+		}
+
+		OC_Contacts_Addressbook::touch($aid);
+		return true;
+	}
+
 }
-- 
GitLab


From 07c422d81d51b476717c5e0178ddbab073466e38 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 14 Feb 2012 01:02:01 +0100
Subject: [PATCH 494/546] Removed superfluous debug.

---
 apps/contacts/lib/vcard.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index a0eacd0e63b..f10af83964c 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -415,7 +415,6 @@ class OC_Contacts_VCard{
 			} catch(Exception $e) {
 				OC_Log::write('contacts','OC_Contacts_VCard::moveToAddressBook:, exception: '.$e->getMessage(),OC_Log::DEBUG);
 				OC_Log::write('contacts','OC_Contacts_VCard::moveToAddressBook, id: '.$id,OC_Log::DEBUG);
-				OC_Log::write('contacts','SQL:'.$prep,OC_Log::DEBUG);
 				return false;
 			}
 		}
-- 
GitLab


From 4446854f758b96f717ffb0f8a20e05356b5b93c5 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 14 Feb 2012 01:11:21 +0100
Subject: [PATCH 495/546] Don't try to load a profile picture for contacts the
 doesn't have any.

---
 apps/contacts/thumbnail.php | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index 39da6bc2bf7..5082626499b 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -56,25 +56,26 @@ $thumbnail_size = 23;
 // Find the photo from VCard.
 $image = new OC_Image();
 $photo = $contact->getAsString('PHOTO');
+if($photo) {
+	OC_Response::setETagHeader(md5($photo));
 
-OC_Response::setETagHeader(md5($photo));
-
-if($image->loadFromBase64($photo)) {
-	if($image->centerCrop()) {
-		if($image->resize($thumbnail_size)) {
-			if($image->show()) {
-				// done
-				exit();
+	if($image->loadFromBase64($photo)) {
+		if($image->centerCrop()) {
+			if($image->resize($thumbnail_size)) {
+				if($image->show()) {
+					// done
+					exit();
+				} else {
+					OC_Log::write('contacts','thumbnail.php. Couldn\'t display thumbnail for ID '.$id,OC_Log::ERROR);
+				}
 			} else {
-				OC_Log::write('contacts','thumbnail.php. Couldn\'t display thumbnail for ID '.$id,OC_Log::ERROR);
+				OC_Log::write('contacts','thumbnail.php. Couldn\'t resize thumbnail for ID '.$id,OC_Log::ERROR);
 			}
-		} else {
-			OC_Log::write('contacts','thumbnail.php. Couldn\'t resize thumbnail for ID '.$id,OC_Log::ERROR);
+		}else{
+			OC_Log::write('contacts','thumbnail.php. Couldn\'t crop thumbnail for ID '.$id,OC_Log::ERROR);
 		}
-	}else{
-		OC_Log::write('contacts','thumbnail.php. Couldn\'t crop thumbnail for ID '.$id,OC_Log::ERROR);
+	} else {
+		OC_Log::write('contacts','thumbnail.php. Couldn\'t load image string for ID '.$id,OC_Log::ERROR);
 	}
-} else {
-	OC_Log::write('contacts','thumbnail.php. Couldn\'t load image string for ID '.$id,OC_Log::ERROR);
 }
 getStandardImage();
-- 
GitLab


From 53503148f3208ac5aa47e7ea654932a5c5af5c5a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 14 Feb 2012 01:47:18 +0100
Subject: [PATCH 496/546] Use proper index file.

---
 apps/contacts/contacts.php         | 62 -------------------------
 apps/contacts/index.php            | 73 ++++++++++++------------------
 apps/contacts/templates/index.php  |  4 +-
 apps/contacts/templates/index2.php | 27 -----------
 4 files changed, 32 insertions(+), 134 deletions(-)
 delete mode 100644 apps/contacts/contacts.php
 delete mode 100644 apps/contacts/templates/index2.php

diff --git a/apps/contacts/contacts.php b/apps/contacts/contacts.php
deleted file mode 100644
index 938a6b13a04..00000000000
--- a/apps/contacts/contacts.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-require_once('../../lib/base.php');
-
-// Check if we are a user
-OC_Util::checkLoggedIn();
-// Get active address books. This creates a default one if none exists.
-$ids = OC_Contacts_Addressbook::activeIds(OC_User::getUser());
-$contacts = OC_Contacts_VCard::all($ids);
-
-$addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());
-
-// Load the files we need
-OC_App::setActiveNavigationEntry( 'contacts_index' );
-
-// Load a specific user?
-$id = isset( $_GET['id'] ) ? $_GET['id'] : null;
-$details = array();
-
-// FIXME: This cannot work..?
-if(is_null($id) && count($contacts) > 0) {
-	$id = $contacts[0]['id'];
-}
-if(!is_null($id)) {
-	$vcard = OC_Contacts_App::getContactVCard($id);
-	$details = OC_Contacts_VCard::structureContact($vcard);
-}
-$property_types = OC_Contacts_App::getAddPropertyOptions();
-$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
-
-$upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
-$post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
-$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
-
-$freeSpace=OC_Filesystem::free_space('/');
-$freeSpace=max($freeSpace,0);
-$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
-
-OC_Util::addScript('','jquery.multiselect');
-//OC_Util::addScript('contacts','interface');
-OC_Util::addScript('contacts','contacts');
-OC_Util::addScript('contacts','jquery.combobox');
-OC_Util::addScript('contacts','jquery.inview');
-OC_Util::addScript('contacts','jquery.Jcrop');
-OC_Util::addScript('contacts','jquery.jec-1.3.3');
-OC_Util::addStyle('','jquery.multiselect');
-//OC_Util::addStyle('contacts','styles');
-OC_Util::addStyle('contacts','jquery.combobox');
-OC_Util::addStyle('contacts','jquery.Jcrop');
-OC_Util::addStyle('contacts','contacts');
-
-$tmpl = new OC_Template( "contacts", "index2", "user" );
-$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assign('uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
-$tmpl->assign('property_types',$property_types);
-$tmpl->assign('phone_types',$phone_types);
-$tmpl->assign('addressbooks', $addressbooks);
-$tmpl->assign('contacts', $contacts);
-$tmpl->assign('details', $details );
-$tmpl->assign('id',$id);
-$tmpl->printPage();
-
-?>
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 9012e5d8af8..c5115d16074 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -1,36 +1,15 @@
 <?php
 /**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
+ * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
+ * Copyright (c) 2011 Jakob Sack mail@jakobsack.de
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
  */
-
-function contacts_namesort($a,$b){
-	return strcmp($a['fullname'],$b['fullname']);
-}
-
-// Init owncloud
 require_once('../../lib/base.php');
 
 // Check if we are a user
 OC_Util::checkLoggedIn();
-OC_Util::checkAppEnabled('contacts');
-
 // Get active address books. This creates a default one if none exists.
 $ids = OC_Contacts_Addressbook::activeIds(OC_User::getUser());
 $contacts = OC_Contacts_VCard::all($ids);
@@ -47,33 +26,41 @@ $details = array();
 if(is_null($id) && count($contacts) > 0) {
 	$id = $contacts[0]['id'];
 }
-$vcard = null;
-$details = null;
 if(!is_null($id)) {
 	$vcard = OC_Contacts_App::getContactVCard($id);
-	if(!is_null($vcard)) {
-		$details = OC_Contacts_VCard::structureContact($vcard);
-	}
+	$details = OC_Contacts_VCard::structureContact($vcard);
 }
-
-// Include Style and Script
-OC_Util::addScript('contacts','interface');
-OC_Util::addScript('contacts','jquery.inview');
-OC_Util::addScript('', 'jquery.multiselect');
-OC_Util::addStyle('contacts','styles');
-//OC_Util::addStyle('contacts','formtastic');
-
 $property_types = OC_Contacts_App::getAddPropertyOptions();
-$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
 $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
 
-// Process the template
-$tmpl = new OC_Template( 'contacts', 'index', 'user' );
+$upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
+$post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
+$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
+
+$freeSpace=OC_Filesystem::free_space('/');
+$freeSpace=max($freeSpace,0);
+$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
+
+OC_Util::addScript('','jquery.multiselect');
+OC_Util::addScript('contacts','contacts');
+OC_Util::addScript('contacts','jquery.combobox');
+OC_Util::addScript('contacts','jquery.inview');
+OC_Util::addScript('contacts','jquery.Jcrop');
+OC_Util::addStyle('','jquery.multiselect');
+//OC_Util::addStyle('contacts','styles');
+OC_Util::addStyle('contacts','jquery.combobox');
+OC_Util::addStyle('contacts','jquery.Jcrop');
+OC_Util::addStyle('contacts','contacts');
+
+$tmpl = new OC_Template( "contacts", "index", "user" );
+$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign('uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
 $tmpl->assign('property_types',$property_types);
-$tmpl->assign('adr_types',$adr_types);
 $tmpl->assign('phone_types',$phone_types);
 $tmpl->assign('addressbooks', $addressbooks);
 $tmpl->assign('contacts', $contacts);
 $tmpl->assign('details', $details );
 $tmpl->assign('id',$id);
 $tmpl->printPage();
+
+?>
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 5d9c312712f..4c0dfad6177 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -15,10 +15,10 @@
 <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>">
 	<?php
 		if ($_['id']){
-			echo $this->inc("part.details");
+			echo $this->inc('part.contact');
 		}
 		else{
-			echo $this->inc("part.addcardform");
+			echo $this->inc('part.no_contacts');
 		}
 	?>
 </div>
diff --git a/apps/contacts/templates/index2.php b/apps/contacts/templates/index2.php
deleted file mode 100644
index 4c0dfad6177..00000000000
--- a/apps/contacts/templates/index2.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<script type='text/javascript'>
-	var totalurl = '<?php echo OC_Helper::linkTo('contacts', 'carddav.php', null, true); ?>/addressbooks';
-</script>
-<div id="controls">
-	<form>
-		<input type="button" id="contacts_newcontact" value="<?php echo $l->t('Add Contact'); ?>">
-		<input type="button" id="chooseaddressbook" value="<?php echo $l->t('Addressbooks'); ?>">
-	</form>
-</div>
-<div id="leftcontent" class="leftcontent">
-	<ul id="contacts">
-		<?php echo $this->inc("part.contacts"); ?>
-	</ul>
-</div>
-<div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>">
-	<?php
-		if ($_['id']){
-			echo $this->inc('part.contact');
-		}
-		else{
-			echo $this->inc('part.no_contacts');
-		}
-	?>
-</div>
-<!-- Dialogs -->
-<div id="dialog_holder"></div>
-<!-- End of Dialogs -->
-- 
GitLab


From dc20900e10f9a080f1ffa164c1e6b0dd62f6c46b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 14 Feb 2012 01:56:38 +0100
Subject: [PATCH 497/546] Modify check for missing UID.

---
 apps/contacts/lib/vcard.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index f10af83964c..cc25c009d67 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -124,10 +124,9 @@ class OC_Contacts_VCard{
 				OC_Log::write('contacts','OC_Contacts_VCard::add. Added missing \'N\' field: '.$n,OC_Log::DEBUG);
 			}
 			$uid = $card->getAsString('UID');
-			if(is_null($uid)){
+			if(!$uid){
 				$card->setUID();
 				$uid = $card->getAsString('UID');
-				//$data = $card->serialize();
 			};
 			$uri = $uid.'.vcf';
 
@@ -176,7 +175,7 @@ class OC_Contacts_VCard{
 	 * @return insertid
 	 */
 	public static function addFromDAVData($id,$uri,$data){
-		$fn = $n = null;
+		$fn = $n = $uid = null;
 		$email = null;
 		$card = OC_VObject::parse($data);
 		if(!is_null($card)){
@@ -187,6 +186,9 @@ class OC_Contacts_VCard{
 				if($property->name == 'N'){
 					$n = $property->value;
 				}
+				if($property->name == 'UID'){
+					$uid = $property->value;
+				}
 				if($property->name == 'EMAIL' && is_null($email)){
 					$email = $property->value;
 				}
@@ -210,6 +212,10 @@ class OC_Contacts_VCard{
 			$data = $card->serialize();
 			OC_Log::write('contacts','OC_Contacts_VCard::add. Added missing \'N\' field: '.$n,OC_Log::DEBUG);
 		}
+		if(!$uid) {
+			$card->setUID();
+			$data = $card->serialize();
+		}
 
 		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*contacts_cards (addressbookid,fullname,carddata,uri,lastmodified) VALUES(?,?,?,?,?)' );
 		$result = $stmt->execute(array($id,$fn,$data,$uri,time()));
-- 
GitLab


From f7161bb48b6bb71b04f4167f8c4cfb4096824ed8 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 14 Feb 2012 02:15:21 +0100
Subject: [PATCH 498/546] Added some error checking as mentioned in
 http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-227

---
 apps/contacts/lib/vcard.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index cc25c009d67..ece203bd458 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -47,6 +47,7 @@ class OC_Contacts_VCard{
 	 * ['carddata']
 	 */
 	public static function all($id){
+		$result = null;
 		if(is_array($id)) {
 			$id_sql = join(',', array_fill(0, count($id), '?'));
 			$prep = 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid IN ('.$id_sql.') ORDER BY fullname';
@@ -58,13 +59,20 @@ class OC_Contacts_VCard{
 				OC_Log::write('contacts','OC_Contacts_VCard:all, ids: '.join(',', $id),OC_Log::DEBUG);
 				OC_Log::write('contacts','SQL:'.$prep,OC_Log::DEBUG);
 			}
-		} else {
-			$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? ORDER BY fullname' );
-			$result = $stmt->execute(array($id));
+		} elseif($id) {
+			try {
+				$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? ORDER BY fullname' );
+				$result = $stmt->execute(array($id));
+			} catch(Exception $e) {
+				OC_Log::write('contacts','OC_Contacts_VCard:all:, exception: '.$e->getMessage(),OC_Log::DEBUG);
+				OC_Log::write('contacts','OC_Contacts_VCard:all, ids: '. $id,OC_Log::DEBUG);
+			}
 		}
 		$cards = array();
-		while( $row = $result->fetchRow()){
-			$cards[] = $row;
+		if(!is_null($result)) {
+			while( $row = $result->fetchRow()){
+				$cards[] = $row;
+			}
 		}
 
 		return $cards;
-- 
GitLab


From 60a03580fff65d969faea8e5788b278ed8b15481 Mon Sep 17 00:00:00 2001
From: Klaas Freitag <freitag@owncloud.com>
Date: Tue, 14 Feb 2012 09:59:54 +0100
Subject: [PATCH 499/546] allow to set a files mtime through a PROPPATCH
 request on resource 'lastmodified'. Needed for syncing algorithms.

---
 lib/connector/sabre/node.php | 12 ++++--------
 lib/filestorage/local.php    | 17 ++++++++++-------
 lib/filesystem.php           |  4 ++--
 lib/filesystemview.php       |  4 ++--
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index b8b675c1203..41acb48dfb6 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -97,12 +97,8 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 *  in the second parameter or to now if the second param is empty.
 	 *  Even if the modification time is set to a custom value the access time is set to now.
 	 */
-	public function setLastModifiedTime($mtime) {
-		OC_Filesystem::setFileMtime($this->path, $mtime);
-	}
-
-	public function endsWith( $str, $sub ) {
-		return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
+	public function touch($mtime) {
+		OC_Filesystem::touch($this->path, $mtime);
 	}
 
 	/**
@@ -123,8 +119,8 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 				}
 			}
 			else {
-				if(  $this->endsWith( $propertyName, "modificationTime")) {
-					$this->setLastModifiedTime($propertyValue);
+				if( strcmp( $propertyName, "lastmodified")) {
+					$this->touch($propertyValue);
 				} else {
 					if(!array_key_exists( $propertyName, $existing )){
 						$query = OC_DB::prepare( 'INSERT INTO *PREFIX*properties (userid,propertypath,propertyname,propertyvalue) VALUES(?,?,?,?)' );
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 292d2a84e7d..35db244e4d6 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -65,13 +65,16 @@ class OC_Filestorage_Local extends OC_Filestorage{
 	public function filemtime($path){
 		return filemtime($this->datadir.$path);
 	}
-	
-	public function setFileMtime($path, $mtime){
-                   // sets the modification time of the file to the given value. If mtime is nil the current time is set.
-                  // note that the access time of the file always changes to the current time.
-                  return touch($this->datadir.$path, $mtime);
-         }
-
+	public function touch($path, $mtime){
+		// sets the modification time of the file to the given value. 
+		// If mtime is nil the current time is set.
+		// note that the access time of the file always changes to the current time.
+		if( touch( $this->datadir.$path, $mtime ) ) {
+			clearstatcache( true, $this->datadir.$path );
+		}
+		
+		return touch($this->datadir.$path, $mtime);
+	}
 	public function file_get_contents($path){
 		return file_get_contents($this->datadir.$path);
 	}
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 75997c244ff..90195bc2130 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -345,8 +345,8 @@ class OC_Filesystem{
 	static public function filemtime($path){
 		return self::$defaultInstance->filemtime($path);
 	}
-	static public function setFileMtime($path, $mtime){
-		return self::$defaultInstance->setFileMtime($path, $mtime);
+	static public function touch($path, $mtime){
+		return self::$defaultInstance->touch($path, $mtime);
 	}
 	static public function file_get_contents($path){
 		return self::$defaultInstance->file_get_contents($path);
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 0f1c546f4c5..91c6cd17720 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -156,8 +156,8 @@ class OC_FilesystemView {
 	public function filemtime($path){
 		return $this->basicOperation('filemtime',$path);
 	}
-	public function setFileMtime($path, $mtime){
-		return $this->basicOperation('setFileMtime',$path, array('write'), $mtime);
+	public function touch($path, $mtime){
+		return $this->basicOperation('touch', $path, array('write'), $mtime);
 	}
 	public function file_get_contents($path){
 		return $this->basicOperation('file_get_contents',$path,array('read'));
-- 
GitLab


From ae426ad1151615dda9d492bb550de15b81f91216 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 14 Feb 2012 10:34:52 +0100
Subject: [PATCH 500/546] Added some check for when addinf deleting contacts.

---
 apps/contacts/ajax/loadintro.php             |  62 +++++++++
 apps/contacts/js/contacts.js                 | 127 +++++++++++--------
 apps/contacts/templates/part.no_contacts.php |   2 +-
 3 files changed, 137 insertions(+), 54 deletions(-)
 create mode 100644 apps/contacts/ajax/loadintro.php

diff --git a/apps/contacts/ajax/loadintro.php b/apps/contacts/ajax/loadintro.php
new file mode 100644
index 00000000000..d3249c19107
--- /dev/null
+++ b/apps/contacts/ajax/loadintro.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * ownCloud - Addressbook
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+function bailOut($msg) {
+	OC_JSON::error(array('data' => array('message' => $msg)));
+	OC_Log::write('contacts','ajax/newcontact.php: '.$msg, OC_Log::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OC_Log::write('contacts','ajax/newcontact.php: '.$msg, OC_Log::DEBUG);
+}
+// foreach ($_POST as $key=>$element) {
+// 	debug('_POST: '.$key.'=>'.$element);
+// }
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('contacts');
+
+// $addressbooks = OC_Contacts_Addressbook::all(OC_USER::getUser());
+// 
+// $upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
+// $post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
+// $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
+// 
+// $freeSpace=OC_Filesystem::free_space('/');
+// $freeSpace=max($freeSpace,0);
+// $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
+// $adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
+// $phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
+
+$tmpl = new OC_Template('contacts','part.no_contacts');
+// $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+// $tmpl->assign('uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
+// $tmpl->assign('adr_types',$adr_types);
+// $tmpl->assign('phone_types',$phone_types);
+// $tmpl->assign('addressbooks',$addressbooks);
+// $tmpl->assign('id','');
+$page = $tmpl->fetchPage();
+
+OC_JSON::success(array('data' => array( 'page' => $page )));
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index d61489b63c3..6effbdd3ee4 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -132,7 +132,10 @@ Contacts={
 			$('#carddav_url_close').show();
 		},
 		messageBox:function(title, msg) {
-			//alert(msg);
+			if(msg.toLowerCase().indexOf('auth') > 0) {
+				// fugly hack, I know
+				alert(msg);
+			}
 			if($('#messagebox').dialog('isOpen') == true){
 				// NOTE: Do we ever get here?
 				$('#messagebox').dialog('moveToTop');
@@ -253,6 +256,50 @@ Contacts={
 				//$.get(OC.linkTo('contacts', 'export.php'),{'contactid':this.id},function(jsondata){
 				//});
 			},
+			import:function(){
+				Contacts.UI.notImplemented();
+			},
+			add:function(n, fn, aid){ // add a new contact
+				console.log('Add contact: ' + n + ', ' + fn + ' ' + aid);
+				$.post(OC.filePath('contacts', 'ajax', 'addcontact.php'), { n: n, fn: fn, aid: aid },
+				  function(jsondata) {
+					if (jsondata.status == 'success'){
+						$('#rightcontent').data('id',jsondata.data.id);
+						var id = jsondata.data.id;
+						$.getJSON('ajax/contactdetails.php',{'id':id},function(jsondata){
+							if(jsondata.status == 'success'){
+								Contacts.UI.loadHandlers();
+								Contacts.UI.Card.loadContact(jsondata.data);
+								$('#leftcontent .active').removeClass('active');
+								var item = '<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'"  style="background: url(thumbnail.php?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+Contacts.UI.Card.fn+'</a></li>';
+								var added = false;
+								$('#leftcontent ul li').each(function(){
+									if ($(this).text().toLowerCase() > Contacts.UI.Card.fn.toLowerCase()) {
+										$(this).before(item).fadeIn('fast');
+										added = true;
+										return false;
+									}
+								});
+								if(!added) {
+									$('#leftcontent ul').append(item);
+								}
+								
+							}
+							else{
+								Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+								//alert(jsondata.data.message);
+							}
+						});
+						$('#contact_identity').show();
+						$('#actionbar').show();
+						// TODO: Add to contacts list.
+					}
+					else{
+						Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+						//alert(jsondata.data.message);
+					}
+				});
+			},
 			delete:function() {
 				$('#contacts_deletecard').tipsy('hide');
 				$.getJSON('ajax/deletecard.php',{'id':this.id},function(jsondata){
@@ -262,17 +309,31 @@ Contacts={
 						//$('#rightcontent').empty();
 						this.id = this.fn = this.fullname = this.shortname = this.famname = this.givname = this.addname = this.honpre = this.honsuf = '';
 						this.data = undefined;
-						// Load empty page.
-						var firstid = $('#contacts li:first-child').data('id');
-						console.log('trying to load: ' + firstid);
-						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':firstid},function(jsondata){
-							if(jsondata.status == 'success'){
-								Contacts.UI.Card.loadContact(jsondata.data);
-							}
-							else{
-								Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
-							}
-						});
+						// Load first in list.
+						if($('#contacts li').length > 0) {
+							var firstid = $('#contacts li:first-child').data('id');
+							console.log('trying to load: ' + firstid);
+							$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':firstid},function(jsondata){
+								if(jsondata.status == 'success'){
+									Contacts.UI.Card.loadContact(jsondata.data);
+								}
+								else{
+									Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+								}
+							});
+						} else {
+							// load intro page
+							$.getJSON('ajax/loadintro.php',{},function(jsondata){
+								if(jsondata.status == 'success'){
+									id = '';
+									$('#rightcontent').data('id','');
+									$('#rightcontent').html(jsondata.data.page);
+								}
+								else{
+									Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+								}
+							});
+						}
 					}
 					else{
 						Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
@@ -285,6 +346,7 @@ Contacts={
 				$('#contact_communication').hide();
 				this.data = jsondata;
 				this.id = this.data.id;
+				$('#rightcontent').data('id',this.id);
 				//console.log('loaded: ' + this.data.FN[0]['value']);
 				this.populateNameFields();
 				this.loadPhoto();
@@ -397,47 +459,6 @@ Contacts={
 						$('#rightcontent').html(jsondata.data.page);
 						Contacts.UI.Card.editName();
 					}
-					else{
-						Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
-						alert(jsondata.data.message);
-					}
-				});
-			},
-			add:function(n, fn, aid){ // add a new contact
-				console.log('Add contact: ' + n + ', ' + fn + ' ' + aid);
-				$.post(OC.filePath('contacts', 'ajax', 'addcontact.php'), { n: n, fn: fn, aid: aid },
-				  function(jsondata) {
-					if (jsondata.status == 'success'){
-						$('#rightcontent').data('id',jsondata.data.id);
-						var id = jsondata.data.id;
-						$.getJSON('ajax/contactdetails.php',{'id':id},function(jsondata){
-							if(jsondata.status == 'success'){
-								Contacts.UI.loadHandlers();
-								Contacts.UI.Card.loadContact(jsondata.data);
-								$('#leftcontent .active').removeClass('active');
-								var item = '<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'"  style="background: url(thumbnail.php?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+Contacts.UI.Card.fn+'</a></li>';
-								var added = false;
-								$('#leftcontent ul li').each(function(){
-									if ($(this).text().toLowerCase() > Contacts.UI.Card.fn.toLowerCase()) {
-										$(this).before(item).fadeIn('fast');
-										added = true;
-										return false;
-									}
-								});
-								if(!added) {
-									$('#leftcontent ul').append(item);
-								}
-								
-							}
-							else{
-								Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
-								//alert(jsondata.data.message);
-							}
-						});
-						$('#contact_identity').show();
-						$('#actionbar').show();
-						// TODO: Add to contacts list.
-					}
 					else{
 						Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
 						//alert(jsondata.data.message);
diff --git a/apps/contacts/templates/part.no_contacts.php b/apps/contacts/templates/part.no_contacts.php
index ab6129cdde7..f58fdef09f0 100644
--- a/apps/contacts/templates/part.no_contacts.php
+++ b/apps/contacts/templates/part.no_contacts.php
@@ -2,7 +2,7 @@
 You have no contacts in your list.
 	<div id="selections">
 		<input type="button" value="Import contacts" onclick="Contacts.UI.Addressbooks.import()" />
-		<input type="button" value="Add contact" onclick="Contacts.UI.Card.add()" />
+		<input type="button" value="Add contact" onclick="Contacts.UI.Card.editNew()" />
 		<input type="button" value="Edit addressbooks" onclick="Contacts.UI.Addressbooks.overview()" />
 	</div>
 </div>
\ No newline at end of file
-- 
GitLab


From 31dab0372dd0d9b7a7b4b1e27faeaaf89c420ef3 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 14 Feb 2012 13:57:11 +0100
Subject: [PATCH 501/546] Added some fixes for what to show when address books
 are (de)selected, all contacts deleted etc. Still need some cleaning up.

---
 apps/contacts/ajax/loadintro.php |  4 +--
 apps/contacts/css/contacts.css   |  3 ++-
 apps/contacts/js/contacts.js     | 45 +++++++++++++++++++++++++++++++-
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/apps/contacts/ajax/loadintro.php b/apps/contacts/ajax/loadintro.php
index d3249c19107..8e5673655a1 100644
--- a/apps/contacts/ajax/loadintro.php
+++ b/apps/contacts/ajax/loadintro.php
@@ -24,11 +24,11 @@
 require_once('../../../lib/base.php');
 function bailOut($msg) {
 	OC_JSON::error(array('data' => array('message' => $msg)));
-	OC_Log::write('contacts','ajax/newcontact.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('contacts','ajax/loadintro.php: '.$msg, OC_Log::DEBUG);
 	exit();
 }
 function debug($msg) {
-	OC_Log::write('contacts','ajax/newcontact.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('contacts','ajax/loadintro.php: '.$msg, OC_Log::DEBUG);
 }
 // foreach ($_POST as $key=>$element) {
 // 	debug('_POST: '.$key.'=>'.$element);
diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 86322a2cc2a..460859fae17 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -77,7 +77,8 @@ dl.form
 .delete { background:url('../../../core/img/actions/delete.svg') no-repeat center; }
 .edit { background:url('../../../core/img/actions/rename.svg') no-repeat center; }
 .mail { background:url('../../../core/img/actions/mail.svg') no-repeat center; }
-.globe { background:url('../img/globe.svg') no-repeat center; }
+/*.globe { background:url('../img/globe.svg') no-repeat center; }*/
+.globe { background:url('../../../core/img/actions/public.svg') no-repeat center; }
 
 #messagebox_msg { font-weight: bold; font-size: 1.2em; }
 
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 6effbdd3ee4..9e3faec192a 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -251,6 +251,44 @@ Contacts={
 			honpre:'',
 			honsuf:'',
 			data:undefined,
+			update:function() {
+				// Make sure proper DOM is loaded.
+				console.log('Card.update(), #n: ' + $('#n').length);
+				console.log('Card.update(), #contacts: ' + $('#contacts li').length);
+				if($('#n').length == 0 && $('#contacts li').length > 0) {
+					$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{},function(jsondata){
+						if(jsondata.status == 'success'){
+							$('#rightcontent').html(jsondata.data.page);
+							Contacts.UI.loadHandlers();
+							if($('#contacts li').length > 0) {
+								var firstid = $('#contacts li:first-child').data('id');
+								console.log('trying to load: ' + firstid);
+								$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':firstid},function(jsondata){
+									if(jsondata.status == 'success'){
+										Contacts.UI.Card.loadContact(jsondata.data);
+									} else{
+										Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+									}
+								});
+							}
+						} else{
+							Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+						}
+					});
+				}
+				if($('#contacts li').length == 0) {
+					// load intro page
+					$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
+						if(jsondata.status == 'success'){
+							id = '';
+							$('#rightcontent').data('id','');
+							$('#rightcontent').html(jsondata.data.page);
+						} else {
+							Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
+						}
+					});
+				}
+			},
 			export:function() {
 				document.location.href = OC.linkTo('contacts', 'export.php') + '?contactid=' + this.id;
 				//$.get(OC.linkTo('contacts', 'export.php'),{'contactid':this.id},function(jsondata){
@@ -311,6 +349,8 @@ Contacts={
 						this.data = undefined;
 						// Load first in list.
 						if($('#contacts li').length > 0) {
+							Contacts.UI.Card.update();
+							/*
 							var firstid = $('#contacts li:first-child').data('id');
 							console.log('trying to load: ' + firstid);
 							$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':firstid},function(jsondata){
@@ -320,7 +360,7 @@ Contacts={
 								else{
 									Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
 								}
-							});
+							});*/
 						} else {
 							// load intro page
 							$.getJSON('ajax/loadintro.php',{},function(jsondata){
@@ -447,6 +487,7 @@ Contacts={
 				$('#reverse_comma').text(this.famname + ', ' + this.givname);*/
 				$('#contact_identity').find('*[data-element="N"]').data('checksum', this.data.N[0]['checksum']);
 				$('#contact_identity').find('*[data-element="FN"]').data('checksum', this.data.FN[0]['checksum']);
+				$('#contact_identity').show();
 			},
 			editNew:function(){ // add a new contact
 				//Contacts.UI.notImplemented();
@@ -1079,9 +1120,11 @@ Contacts={
 			 * Reload the contacts list.
 			 */
 			update:function(){
+				console.log('Contacts.update, start');
 				$.getJSON('ajax/contacts.php',{},function(jsondata){
 					if(jsondata.status == 'success'){
 						$('#contacts').html(jsondata.data.page);
+						Contacts.UI.Card.update();
 					}
 					else{
 						Contacts.UI.messageBox(t('contacts', 'Error'),jsondata.data.message);
-- 
GitLab


From d53ed4b40bedc5c967f92839629379a91925bd87 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Tue, 14 Feb 2012 16:32:38 +0100
Subject: [PATCH 502/546] make it possible to override every image and logo
 with a new version from within a theme. I think we have a very cool theming
 here. *self-praise*

---
 lib/helper.php | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/lib/helper.php b/lib/helper.php
index 4d1219d78d4..6d3df6d97e7 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -75,18 +75,25 @@ class OC_Helper {
 	 *
 	 * Returns the path to the image.
 	 */
-	public static function imagePath( $app, $image ){
-		// Check if the app is in the app folder
-		if( file_exists( OC::$SERVERROOT."/apps/$app/img/$image" )){
-			return OC::$WEBROOT."/apps/$app/img/$image";
-		}
-		elseif( !empty( $app )){
-			return OC::$WEBROOT."/$app/img/$image";
-		}
-		else{
-			return OC::$WEBROOT."/core/img/$image";
-		}
-	}
+        public static function imagePath( $app, $image ){
+                // Read the selected theme from the config file
+                $theme=OC_Config::getValue( "theme" );
+
+                // Check if the app is in the app folder
+                if( file_exists( OC::$SERVERROOT."/themes/$theme/apps/$app/img/$image" )){
+                        return OC::$WEBROOT."/themes/$theme/apps/$app/img/$image";
+                }elseif( file_exists( OC::$SERVERROOT."/apps/$app/img/$image" )){
+                        return OC::$WEBROOT."/apps/$app/img/$image";
+                }elseif( !empty( $app ) and file_exists( OC::$SERVERROOT."/themes/$theme/$app/img/$image" )){
+                        return OC::$WEBROOT."/themes/$theme/$app/img/$image";
+                }elseif( !empty( $app ) and file_exists( OC::$SERVERROOT."/$app/img/$image" )){
+                        return OC::$WEBROOT."/$app/img/$image";
+                }elseif( file_exists( OC::$SERVERROOT."/themes/$theme/core/img/$image" )){
+                        return OC::$WEBROOT."/themes/$theme/core/img/$image";
+                }else{
+                        return OC::$WEBROOT."/core/img/$image";
+                }
+        }
 
 	/**
 	 * @brief get path to icon of file type
-- 
GitLab


From aec6a3c32ff3195c3ccfb0484e1fb76fad4896e4 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Tue, 14 Feb 2012 21:49:51 +0000
Subject: [PATCH 503/546] Fix editing shared files and file opening bug. Fixes
 oc-209 and oc-195

---
 apps/files_texteditor/js/editor.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 6e154bedb9c..2d07c4fd79d 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -56,18 +56,16 @@ function setSyntaxMode(ext){
 
 function showControls(filename,writeperms){
 	// Loads the control bar at the top.
-	$('.actions,#file_action_panel').fadeOut('slow').promise().done(function() {
-		// Load the new toolbar.
-		var editorcontrols;
-		if(writeperms=="true"){
-			var editorcontrols = '<button id="editor_save">'+t('files_texteditor','Save')+'</button><div class="separator"></div><label for="gotolineval">Go to line:</label><input type="text" id="gotolineval"><div class="separator"></div>';
-		}
-		var html = '<label for="editorseachval">Search:</label><input type="text" name="editorsearchval" id="editorsearchval"><div class="separator"></div><button id="editor_close">'+t('files_texteditor','Close')+'</button>';
-		$('#controls').append(html);
-		$('#editorbar').fadeIn('slow');	
-		var breadcrumbhtml = '<div class="crumb svg" id="breadcrumb_file" style="background-image:url(&quot;../core/img/breadcrumb.png&quot;)"><p>'+filename+'</p></div>';
-		$('.actions').before(breadcrumbhtml).before(editorcontrols);
-	});
+	// Load the new toolbar.
+	var editorbarhtml = '<div id="editorcontrols" style="display: none;"><div class="crumb svg last" id="breadcrumb_file" style="background-image:url(&quot;../core/img/breadcrumb.png&quot;)"><p>'+filename+'</p></div>';
+	if(writeperms=="true"){
+		editorbarhtml += '<button id="editor_save">'+t('files_texteditor','Save')+'</button><div class="separator"></div>';
+	}
+	editorbarhtml += '<label for="gotolineval">Go to line:</label><input stype="text" id="gotolineval"><label for="editorseachval">Search:</label><input type="text" name="editorsearchval" id="editorsearchval"><div class="separator"></div><button id="editor_close">'+t('files_texteditor','Close')+'</button></div>';
+	// Change breadcrumb classes
+	$('#controls .last').removeClass('last');
+	$('#controls').append(editorbarhtml);
+	$('#editorcontrols').fadeIn('slow');
 }
  
 function bindControlEvents(){
@@ -182,8 +180,10 @@ function showFileEditor(dir,filename){
 					// Save mtime
 					$('#editor').attr('data-mtime', result.data.mtime);
 					// Initialise the editor
-					showControls(filename,result.data.write);
+					$('.actions,#file_action_panel').fadeOut('slow');
 					$('table').fadeOut('slow', function() {
+						// Show the control bar
+						showControls(filename,result.data.write);
 						// Update document title
 						document.title = filename;
 						$('#editor').text(result.data.filecontents);
@@ -215,7 +215,7 @@ function showFileEditor(dir,filename){
 // Fades out the editor.
 function hideFileEditor(){
 	// Fades out editor controls
-	$('#controls > :not(.actions,#file_access_panel,.crumb),#breadcrumb_file').fadeOut('slow',function(){
+	$('#editorcontrols').fadeOut('slow',function(){
 		$(this).remove();
 	});
 	// Fade out editor
-- 
GitLab


From e6b835bea8fd153b580785c764fb36efae28ade8 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Tue, 14 Feb 2012 21:55:51 +0000
Subject: [PATCH 504/546] Update breadcrumb css on close

---
 apps/files_texteditor/js/editor.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 2d07c4fd79d..7473d532304 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -217,6 +217,7 @@ function hideFileEditor(){
 	// Fades out editor controls
 	$('#editorcontrols').fadeOut('slow',function(){
 		$(this).remove();
+		$(".crumb:last").addClass('last');
 	});
 	// Fade out editor
 	$('#editor').fadeOut('slow', function(){
-- 
GitLab


From c2fb5fed029a77f4cdcd6a8b9a6308ef40091639 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 15 Feb 2012 14:42:37 +0100
Subject: [PATCH 505/546] use cached size for getting the size of a moved file

---
 lib/filecache.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index 921d4a27902..6ae2f8253db 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -380,8 +380,7 @@ class OC_FileCache{
 		$fullOldPath=$root.$oldPath;
 		$fullNewPath=$root.$newPath;
 		if(($id=self::getFileId($fullOldPath))!=-1){
-			$oldInfo=self::get($fullOldPath);
-			$oldSize=$oldInfo['size'];
+			$oldSize=self::getCachedSize($oldPath,$root);
 		}else{
 			return;
 		}
-- 
GitLab


From dccdeca2581f705c69eb4266aa646173f588a9de Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <karlitschek@kde.org>
Date: Wed, 15 Feb 2012 20:40:37 +0100
Subject: [PATCH 506/546] remove the 3rdparty files. everything is now in
 https://gitorious.org/owncloud/3rdparty

---
 3rdparty/Console/Getopt.php                   |  251 -
 3rdparty/Crypt_Blowfish/Blowfish.php          |  317 -
 .../Crypt_Blowfish/Blowfish/DefaultKey.php    |  327 --
 3rdparty/MDB2.php                             | 4316 --------------
 3rdparty/MDB2/Date.php                        |  183 -
 3rdparty/MDB2/Driver/Datatype/Common.php      | 1824 ------
 3rdparty/MDB2/Driver/Datatype/mysql.php       |  553 --
 3rdparty/MDB2/Driver/Datatype/pgsql.php       |  554 --
 3rdparty/MDB2/Driver/Datatype/sqlite.php      |  409 --
 3rdparty/MDB2/Driver/Function/Common.php      |  293 -
 3rdparty/MDB2/Driver/Function/mysql.php       |  136 -
 3rdparty/MDB2/Driver/Function/pgsql.php       |  115 -
 3rdparty/MDB2/Driver/Function/sqlite.php      |  162 -
 3rdparty/MDB2/Driver/Manager/Common.php       | 1014 ----
 3rdparty/MDB2/Driver/Manager/mysql.php        | 1432 -----
 3rdparty/MDB2/Driver/Manager/pgsql.php        |  951 ---
 3rdparty/MDB2/Driver/Manager/sqlite.php       | 1366 -----
 3rdparty/MDB2/Driver/Native/Common.php        |   61 -
 3rdparty/MDB2/Driver/Native/mysql.php         |   60 -
 3rdparty/MDB2/Driver/Native/pgsql.php         |   88 -
 3rdparty/MDB2/Driver/Native/sqlite.php        |   60 -
 3rdparty/MDB2/Driver/Reverse/Common.php       |  517 --
 3rdparty/MDB2/Driver/Reverse/mysql.php        |  536 --
 3rdparty/MDB2/Driver/Reverse/pgsql.php        |  573 --
 3rdparty/MDB2/Driver/Reverse/sqlite.php       |  609 --
 3rdparty/MDB2/Driver/mysql.php                | 1700 ------
 3rdparty/MDB2/Driver/pgsql.php                | 1519 -----
 3rdparty/MDB2/Driver/sqlite.php               | 1088 ----
 3rdparty/MDB2/Extended.php                    |  721 ---
 3rdparty/MDB2/Iterator.php                    |  259 -
 3rdparty/MDB2/LOB.php                         |  264 -
 3rdparty/MDB2/Schema.php                      | 2763 ---------
 3rdparty/MDB2/Schema/Parser.php               |  812 ---
 3rdparty/MDB2/Schema/Parser2.php              |  624 --
 3rdparty/MDB2/Schema/Reserved/ibase.php       |  436 --
 3rdparty/MDB2/Schema/Reserved/mssql.php       |  258 -
 3rdparty/MDB2/Schema/Reserved/mysql.php       |  284 -
 3rdparty/MDB2/Schema/Reserved/oci8.php        |  171 -
 3rdparty/MDB2/Schema/Reserved/pgsql.php       |  147 -
 3rdparty/MDB2/Schema/Tool.php                 |  560 --
 .../MDB2/Schema/Tool/ParameterException.php   |    6 -
 3rdparty/MDB2/Schema/Validate.php             |  917 ---
 3rdparty/MDB2/Schema/Writer.php               |  581 --
 3rdparty/PEAR.php                             | 1055 ----
 3rdparty/PEAR/Autoloader.php                  |  208 -
 3rdparty/PEAR/Builder.php                     |  426 --
 3rdparty/PEAR/Command.php                     |  398 --
 3rdparty/PEAR/Command/Auth.php                |  155 -
 3rdparty/PEAR/Command/Build.php               |   89 -
 3rdparty/PEAR/Command/Common.php              |  249 -
 3rdparty/PEAR/Command/Config.php              |  225 -
 3rdparty/PEAR/Command/Install.php             |  470 --
 3rdparty/PEAR/Command/Mirror.php              |  101 -
 3rdparty/PEAR/Command/Package.php             |  819 ---
 3rdparty/PEAR/Command/Registry.php            |  351 --
 3rdparty/PEAR/Command/Remote.php              |  435 --
 3rdparty/PEAR/Common.php                      | 2094 -------
 3rdparty/PEAR/Config.php                      | 1169 ----
 3rdparty/PEAR/Dependency.php                  |  487 --
 3rdparty/PEAR/Downloader.php                  |  680 ---
 3rdparty/PEAR/ErrorStack.php                  |  981 ----
 3rdparty/PEAR/Exception.php                   |  359 --
 3rdparty/PEAR/Frontend/CLI.php                |  509 --
 3rdparty/PEAR/Installer.php                   | 1068 ----
 3rdparty/PEAR/Packager.php                    |  165 -
 3rdparty/PEAR/Registry.php                    |  538 --
 3rdparty/PEAR/Remote.php                      |  394 --
 3rdparty/PEAR/RunTest.php                     |  363 --
 3rdparty/README                               |    2 +
 3rdparty/Sabre.includes.php                   |  127 -
 3rdparty/Sabre/CalDAV/Backend/Abstract.php    |  163 -
 3rdparty/Sabre/CalDAV/Backend/PDO.php         |  386 --
 3rdparty/Sabre/CalDAV/Calendar.php            |  318 -
 3rdparty/Sabre/CalDAV/CalendarObject.php      |  260 -
 3rdparty/Sabre/CalDAV/CalendarRootNode.php    |   75 -
 .../Exception/InvalidICalendarObject.php      |   18 -
 3rdparty/Sabre/CalDAV/ICSExportPlugin.php     |  124 -
 3rdparty/Sabre/CalDAV/ICalendar.php           |   18 -
 3rdparty/Sabre/CalDAV/ICalendarObject.php     |   20 -
 3rdparty/Sabre/CalDAV/ICalendarUtil.php       |  157 -
 3rdparty/Sabre/CalDAV/Plugin.php              |  788 ---
 .../Sabre/CalDAV/Principal/Collection.php     |   31 -
 3rdparty/Sabre/CalDAV/Principal/ProxyRead.php |  178 -
 .../Sabre/CalDAV/Principal/ProxyWrite.php     |  178 -
 3rdparty/Sabre/CalDAV/Principal/User.php      |  122 -
 .../SupportedCalendarComponentSet.php         |   85 -
 .../CalDAV/Property/SupportedCalendarData.php |   38 -
 .../CalDAV/Property/SupportedCollationSet.php |   44 -
 3rdparty/Sabre/CalDAV/Server.php              |   65 -
 3rdparty/Sabre/CalDAV/UserCalendars.php       |  280 -
 3rdparty/Sabre/CalDAV/Version.php             |   24 -
 3rdparty/Sabre/CalDAV/XMLUtil.php             |  208 -
 3rdparty/Sabre/CardDAV/AddressBook.php        |  293 -
 .../Sabre/CardDAV/AddressBookQueryParser.php  |  211 -
 3rdparty/Sabre/CardDAV/AddressBookRoot.php    |   78 -
 3rdparty/Sabre/CardDAV/Backend/Abstract.php   |  121 -
 3rdparty/Sabre/CardDAV/Backend/PDO.php        |  277 -
 3rdparty/Sabre/CardDAV/Card.php               |  220 -
 3rdparty/Sabre/CardDAV/IAddressBook.php       |   18 -
 3rdparty/Sabre/CardDAV/ICard.php              |   18 -
 3rdparty/Sabre/CardDAV/IDirectory.php         |   21 -
 3rdparty/Sabre/CardDAV/Plugin.php             |  463 --
 .../CardDAV/Property/SupportedAddressData.php |   69 -
 3rdparty/Sabre/CardDAV/UserAddressBooks.php   |  240 -
 3rdparty/Sabre/CardDAV/Version.php            |   26 -
 .../Sabre/DAV/Auth/Backend/AbstractBasic.php  |   79 -
 .../Sabre/DAV/Auth/Backend/AbstractDigest.php |   96 -
 3rdparty/Sabre/DAV/Auth/Backend/Apache.php    |   60 -
 3rdparty/Sabre/DAV/Auth/Backend/File.php      |   76 -
 3rdparty/Sabre/DAV/Auth/Backend/PDO.php       |   66 -
 3rdparty/Sabre/DAV/Auth/IBackend.php          |   34 -
 3rdparty/Sabre/DAV/Auth/Plugin.php            |  111 -
 .../Sabre/DAV/Browser/GuessContentType.php    |   97 -
 .../Sabre/DAV/Browser/MapGetToPropFind.php    |   54 -
 3rdparty/Sabre/DAV/Browser/Plugin.php         |  285 -
 3rdparty/Sabre/DAV/Client.php                 |  431 --
 3rdparty/Sabre/DAV/Collection.php             |   90 -
 3rdparty/Sabre/DAV/Directory.php              |   17 -
 3rdparty/Sabre/DAV/Exception.php              |   63 -
 3rdparty/Sabre/DAV/Exception/BadRequest.php   |   28 -
 3rdparty/Sabre/DAV/Exception/Conflict.php     |   28 -
 .../Sabre/DAV/Exception/ConflictingLock.php   |   35 -
 3rdparty/Sabre/DAV/Exception/FileNotFound.php |   28 -
 3rdparty/Sabre/DAV/Exception/Forbidden.php    |   27 -
 .../DAV/Exception/InsufficientStorage.php     |   27 -
 .../DAV/Exception/InvalidResourceType.php     |   33 -
 .../Exception/LockTokenMatchesRequestUri.php  |   39 -
 3rdparty/Sabre/DAV/Exception/Locked.php       |   67 -
 .../Sabre/DAV/Exception/MethodNotAllowed.php  |   44 -
 .../Sabre/DAV/Exception/NotAuthenticated.php  |   28 -
 .../Sabre/DAV/Exception/NotImplemented.php    |   27 -
 .../DAV/Exception/PreconditionFailed.php      |   69 -
 .../DAV/Exception/ReportNotImplemented.php    |   30 -
 .../RequestedRangeNotSatisfiable.php          |   29 -
 .../DAV/Exception/UnsupportedMediaType.php    |   28 -
 3rdparty/Sabre/DAV/FS/Directory.php           |  121 -
 3rdparty/Sabre/DAV/FS/File.php                |   89 -
 3rdparty/Sabre/DAV/FS/Node.php                |   81 -
 3rdparty/Sabre/DAV/FSExt/Directory.php        |  135 -
 3rdparty/Sabre/DAV/FSExt/File.php             |   88 -
 3rdparty/Sabre/DAV/FSExt/Node.php             |  276 -
 3rdparty/Sabre/DAV/File.php                   |   81 -
 3rdparty/Sabre/DAV/ICollection.php            |   58 -
 3rdparty/Sabre/DAV/IExtendedCollection.php    |   28 -
 3rdparty/Sabre/DAV/IFile.php                  |   63 -
 3rdparty/Sabre/DAV/ILockable.php              |   38 -
 3rdparty/Sabre/DAV/INode.php                  |   44 -
 3rdparty/Sabre/DAV/IProperties.php            |   67 -
 3rdparty/Sabre/DAV/IQuota.php                 |   27 -
 3rdparty/Sabre/DAV/Locks/Backend/Abstract.php |   50 -
 3rdparty/Sabre/DAV/Locks/Backend/FS.php       |  189 -
 3rdparty/Sabre/DAV/Locks/Backend/File.php     |  175 -
 3rdparty/Sabre/DAV/Locks/Backend/PDO.php      |  165 -
 3rdparty/Sabre/DAV/Locks/LockInfo.php         |   81 -
 3rdparty/Sabre/DAV/Locks/Plugin.php           |  680 ---
 3rdparty/Sabre/DAV/Mount/Plugin.php           |   79 -
 3rdparty/Sabre/DAV/Node.php                   |   55 -
 3rdparty/Sabre/DAV/ObjectTree.php             |  154 -
 3rdparty/Sabre/DAV/Property.php               |   25 -
 .../Sabre/DAV/Property/GetLastModified.php    |   75 -
 3rdparty/Sabre/DAV/Property/Href.php          |   91 -
 3rdparty/Sabre/DAV/Property/HrefList.php      |   96 -
 3rdparty/Sabre/DAV/Property/IHref.php         |   25 -
 3rdparty/Sabre/DAV/Property/LockDiscovery.php |  102 -
 3rdparty/Sabre/DAV/Property/ResourceType.php  |  125 -
 3rdparty/Sabre/DAV/Property/Response.php      |  156 -
 3rdparty/Sabre/DAV/Property/ResponseList.php  |   58 -
 3rdparty/Sabre/DAV/Property/SupportedLock.php |   76 -
 .../Sabre/DAV/Property/SupportedReportSet.php |  110 -
 3rdparty/Sabre/DAV/Server.php                 | 1941 ------
 3rdparty/Sabre/DAV/ServerPlugin.php           |   90 -
 3rdparty/Sabre/DAV/SimpleCollection.php       |  106 -
 3rdparty/Sabre/DAV/SimpleDirectory.php        |   21 -
 3rdparty/Sabre/DAV/SimpleFile.php             |  120 -
 3rdparty/Sabre/DAV/StringUtil.php             |   91 -
 .../Sabre/DAV/TemporaryFileFilterPlugin.php   |  279 -
 3rdparty/Sabre/DAV/Tree.php                   |  192 -
 3rdparty/Sabre/DAV/Tree/Filesystem.php        |  124 -
 3rdparty/Sabre/DAV/URLUtil.php                |  125 -
 3rdparty/Sabre/DAV/UUIDUtil.php               |   64 -
 3rdparty/Sabre/DAV/Version.php                |   24 -
 3rdparty/Sabre/DAV/XMLUtil.php                |  183 -
 .../DAVACL/AbstractPrincipalCollection.php    |  121 -
 .../Sabre/DAVACL/Exception/AceConflict.php    |   34 -
 .../Sabre/DAVACL/Exception/NeedPrivileges.php |   80 -
 .../Sabre/DAVACL/Exception/NoAbstract.php     |   34 -
 .../Exception/NotRecognizedPrincipal.php      |   34 -
 .../Exception/NotSupportedPrivilege.php       |   34 -
 3rdparty/Sabre/DAVACL/IACL.php                |   58 -
 3rdparty/Sabre/DAVACL/IPrincipal.php          |   75 -
 3rdparty/Sabre/DAVACL/IPrincipalBackend.php   |   73 -
 3rdparty/Sabre/DAVACL/Plugin.php              | 1238 ----
 3rdparty/Sabre/DAVACL/Principal.php           |  263 -
 .../Sabre/DAVACL/PrincipalBackend/PDO.php     |  206 -
 3rdparty/Sabre/DAVACL/PrincipalCollection.php |   35 -
 3rdparty/Sabre/DAVACL/Property/Acl.php        |  186 -
 .../Property/CurrentUserPrivilegeSet.php      |   75 -
 3rdparty/Sabre/DAVACL/Property/Principal.php  |  154 -
 .../DAVACL/Property/SupportedPrivilegeSet.php |   92 -
 3rdparty/Sabre/DAVACL/Version.php             |   24 -
 3rdparty/Sabre/HTTP/AWSAuth.php               |  226 -
 3rdparty/Sabre/HTTP/AbstractAuth.php          |  111 -
 3rdparty/Sabre/HTTP/BasicAuth.php             |   61 -
 3rdparty/Sabre/HTTP/DigestAuth.php            |  234 -
 3rdparty/Sabre/HTTP/Request.php               |  243 -
 3rdparty/Sabre/HTTP/Response.php              |  152 -
 3rdparty/Sabre/HTTP/Util.php                  |   65 -
 3rdparty/Sabre/HTTP/Version.php               |   24 -
 3rdparty/Sabre/LICENCE                        |   27 -
 3rdparty/Sabre/VObject/Component.php          |  254 -
 3rdparty/Sabre/VObject/Element.php            |   15 -
 3rdparty/Sabre/VObject/Element/DateTime.php   |  245 -
 .../Sabre/VObject/Element/MultiDateTime.php   |  168 -
 3rdparty/Sabre/VObject/ElementList.php        |  172 -
 3rdparty/Sabre/VObject/Node.php               |  149 -
 3rdparty/Sabre/VObject/Parameter.php          |   81 -
 3rdparty/Sabre/VObject/ParseException.php     |   12 -
 3rdparty/Sabre/VObject/Property.php           |  289 -
 3rdparty/Sabre/VObject/Reader.php             |  191 -
 3rdparty/Sabre/VObject/Version.php            |   24 -
 3rdparty/Sabre/VObject/includes.php           |   29 -
 3rdparty/Sabre/autoload.php                   |   27 -
 3rdparty/System.php                           |  540 --
 3rdparty/XML/Parser.php                       |  667 ---
 3rdparty/XML/RPC.php                          | 1951 ------
 3rdparty/XML/RPC/Server.php                   |  624 --
 3rdparty/css/chosen-sprite.png                |  Bin 742 -> 0 bytes
 3rdparty/css/chosen.css                       |  341 --
 3rdparty/css/chosen/chosen-sprite.png         |  Bin 3998 -> 0 bytes
 3rdparty/css/chosen/chosen.css                |  368 --
 3rdparty/fullcalendar/GPL-LICENSE.txt         |  278 -
 3rdparty/fullcalendar/MIT-LICENSE.txt         |   20 -
 3rdparty/fullcalendar/changelog.txt           |  313 -
 3rdparty/fullcalendar/css/fullcalendar.css    |  616 --
 .../fullcalendar/css/fullcalendar.print.css   |   59 -
 3rdparty/fullcalendar/js/fullcalendar.js      | 5210 -----------------
 3rdparty/fullcalendar/js/fullcalendar.min.js  |  113 -
 3rdparty/fullcalendar/js/gcal.js              |  112 -
 3rdparty/js/chosen/LICENSE.md                 |   24 -
 3rdparty/js/chosen/README.md                  |   46 -
 3rdparty/js/chosen/VERSION                    |    1 -
 3rdparty/js/chosen/chosen.jquery.js           |  857 ---
 3rdparty/js/chosen/chosen.jquery.min.js       |   10 -
 .../HELP_MY_TESTS_DONT_WORK_ANYMORE           |  399 --
 3rdparty/simpletest/LICENSE                   |  502 --
 3rdparty/simpletest/README                    |  102 -
 3rdparty/simpletest/VERSION                   |    1 -
 3rdparty/simpletest/arguments.php             |  224 -
 3rdparty/simpletest/authentication.php        |  237 -
 3rdparty/simpletest/autorun.php               |  101 -
 3rdparty/simpletest/browser.php               | 1144 ----
 3rdparty/simpletest/collector.php             |  122 -
 3rdparty/simpletest/compatibility.php         |  166 -
 3rdparty/simpletest/cookies.php               |  380 --
 3rdparty/simpletest/default_reporter.php      |  163 -
 3rdparty/simpletest/detached.php              |   96 -
 .../docs/en/authentication_documentation.html |  378 --
 .../docs/en/browser_documentation.html        |  501 --
 3rdparty/simpletest/docs/en/docs.css          |  121 -
 .../docs/en/expectation_documentation.html    |  476 --
 .../docs/en/form_testing_documentation.html   |  351 --
 .../docs/en/group_test_documentation.html     |  252 -
 3rdparty/simpletest/docs/en/index.html        |  542 --
 .../docs/en/mock_objects_documentation.html   |  870 ---
 3rdparty/simpletest/docs/en/overview.html     |  487 --
 .../docs/en/partial_mocks_documentation.html  |  457 --
 .../docs/en/reporter_documentation.html       |  616 --
 .../docs/en/unit_test_documentation.html      |  442 --
 .../docs/en/web_tester_documentation.html     |  588 --
 .../docs/fr/authentication_documentation.html |  372 --
 .../docs/fr/browser_documentation.html        |  500 --
 3rdparty/simpletest/docs/fr/docs.css          |   84 -
 .../docs/fr/expectation_documentation.html    |  451 --
 .../docs/fr/form_testing_documentation.html   |  363 --
 .../docs/fr/group_test_documentation.html     |  265 -
 3rdparty/simpletest/docs/fr/index.html        |  576 --
 .../docs/fr/mock_objects_documentation.html   |  933 ---
 3rdparty/simpletest/docs/fr/overview.html     |  321 -
 .../docs/fr/partial_mocks_documentation.html  |  475 --
 .../docs/fr/reporter_documentation.html       |  630 --
 .../docs/fr/unit_test_documentation.html      |  447 --
 .../docs/fr/web_tester_documentation.html     |  570 --
 3rdparty/simpletest/dumper.php                |  407 --
 3rdparty/simpletest/eclipse.php               |  307 -
 3rdparty/simpletest/encoding.php              |  649 --
 3rdparty/simpletest/errors.php                |  267 -
 3rdparty/simpletest/exceptions.php            |  226 -
 3rdparty/simpletest/expectation.php           |  984 ----
 .../simpletest/extensions/pear_test_case.php  |  196 -
 3rdparty/simpletest/extensions/testdox.php    |   53 -
 .../simpletest/extensions/testdox/test.php    |  107 -
 3rdparty/simpletest/form.php                  |  361 --
 3rdparty/simpletest/frames.php                |  592 --
 3rdparty/simpletest/http.php                  |  628 --
 3rdparty/simpletest/invoker.php               |  139 -
 3rdparty/simpletest/mock_objects.php          | 1641 ------
 3rdparty/simpletest/page.php                  |  542 --
 3rdparty/simpletest/php_parser.php            | 1054 ----
 3rdparty/simpletest/recorder.php              |  101 -
 3rdparty/simpletest/reflection_php4.php       |  136 -
 3rdparty/simpletest/reflection_php5.php       |  386 --
 3rdparty/simpletest/remote.php                |  115 -
 3rdparty/simpletest/reporter.php              |  445 --
 3rdparty/simpletest/scorer.php                |  875 ---
 3rdparty/simpletest/selector.php              |  141 -
 3rdparty/simpletest/shell_tester.php          |  330 --
 3rdparty/simpletest/simpletest.php            |  391 --
 3rdparty/simpletest/socket.php                |  312 -
 3rdparty/simpletest/tag.php                   | 1527 -----
 3rdparty/simpletest/test/acceptance_test.php  | 1729 ------
 3rdparty/simpletest/test/adapter_test.php     |   50 -
 3rdparty/simpletest/test/all_tests.php        |   13 -
 3rdparty/simpletest/test/arguments_test.php   |   82 -
 .../simpletest/test/authentication_test.php   |  145 -
 3rdparty/simpletest/test/autorun_test.php     |   23 -
 3rdparty/simpletest/test/bad_test_suite.php   |   10 -
 3rdparty/simpletest/test/browser_test.php     |  802 ---
 3rdparty/simpletest/test/collector_test.php   |   50 -
 .../simpletest/test/command_line_test.php     |   40 -
 .../simpletest/test/compatibility_test.php    |   87 -
 3rdparty/simpletest/test/cookies_test.php     |  227 -
 3rdparty/simpletest/test/detached_test.php    |   15 -
 3rdparty/simpletest/test/dumper_test.php      |   88 -
 3rdparty/simpletest/test/eclipse_test.php     |   32 -
 3rdparty/simpletest/test/encoding_test.php    |  240 -
 3rdparty/simpletest/test/errors_test.php      |  229 -
 3rdparty/simpletest/test/exceptions_test.php  |  183 -
 3rdparty/simpletest/test/expectation_test.php |  317 -
 3rdparty/simpletest/test/form_test.php        |  344 --
 3rdparty/simpletest/test/frames_test.php      |  549 --
 3rdparty/simpletest/test/http_test.php        |  492 --
 3rdparty/simpletest/test/interfaces_test.php  |  137 -
 .../test/interfaces_test_php5_1.php           |   14 -
 3rdparty/simpletest/test/live_test.php        |   47 -
 .../simpletest/test/mock_objects_test.php     |  985 ----
 3rdparty/simpletest/test/page_test.php        |  166 -
 3rdparty/simpletest/test/parse_error_test.php |    9 -
 3rdparty/simpletest/test/parsing_test.php     |  642 --
 3rdparty/simpletest/test/php_parser_test.php  |  489 --
 3rdparty/simpletest/test/recorder_test.php    |   23 -
 .../simpletest/test/reflection_php5_test.php  |  263 -
 3rdparty/simpletest/test/remote_test.php      |   19 -
 3rdparty/simpletest/test/shell_test.php       |   38 -
 .../simpletest/test/shell_tester_test.php     |   42 -
 3rdparty/simpletest/test/simpletest_test.php  |   58 -
 3rdparty/simpletest/test/site/file.html       |    6 -
 3rdparty/simpletest/test/socket_test.php      |   25 -
 .../test/support/collector/collectable.1      |    0
 .../test/support/collector/collectable.2      |    0
 .../test/support/empty_test_file.php          |    3 -
 .../simpletest/test/support/failing_test.php  |    9 -
 .../simpletest/test/support/latin1_sample     |    1 -
 .../simpletest/test/support/passing_test.php  |    9 -
 .../test/support/recorder_sample.php          |   14 -
 .../simpletest/test/support/spl_examples.php  |   15 -
 .../support/supplementary_upload_sample.txt   |    1 -
 3rdparty/simpletest/test/support/test1.php    |    7 -
 .../simpletest/test/support/upload_sample.txt |    1 -
 3rdparty/simpletest/test/tag_test.php         |  554 --
 .../simpletest/test/test_with_parse_error.php |    8 -
 3rdparty/simpletest/test/unit_tester_test.php |   61 -
 3rdparty/simpletest/test/unit_tests.php       |   49 -
 3rdparty/simpletest/test/url_test.php         |  515 --
 3rdparty/simpletest/test/user_agent_test.php  |  348 --
 3rdparty/simpletest/test/visual_test.php      |  495 --
 3rdparty/simpletest/test/web_tester_test.php  |  155 -
 3rdparty/simpletest/test/xml_test.php         |  187 -
 3rdparty/simpletest/test_case.php             |  658 ---
 3rdparty/simpletest/tidy_parser.php           |  382 --
 3rdparty/simpletest/unit_tester.php           |  413 --
 3rdparty/simpletest/url.php                   |  550 --
 3rdparty/simpletest/user_agent.php            |  328 --
 3rdparty/simpletest/web_tester.php            | 1532 -----
 3rdparty/simpletest/xml.php                   |  647 --
 3rdparty/timepicker/GPL-LICENSE.txt           |  278 -
 3rdparty/timepicker/MIT-LICENSE.txt           |   20 -
 .../ui-bg_diagonals-thick_18_b81900_40x40.png |  Bin 260 -> 0 bytes
 .../ui-bg_diagonals-thick_20_666666_40x40.png |  Bin 251 -> 0 bytes
 .../images/ui-bg_flat_10_000000_40x100.png    |  Bin 178 -> 0 bytes
 .../images/ui-bg_glass_100_f6f6f6_1x400.png   |  Bin 104 -> 0 bytes
 .../images/ui-bg_glass_100_fdf5ce_1x400.png   |  Bin 125 -> 0 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png    |  Bin 105 -> 0 bytes
 .../ui-bg_gloss-wave_35_f6a828_500x100.png    |  Bin 3762 -> 0 bytes
 .../ui-bg_highlight-soft_100_eeeeee_1x100.png |  Bin 90 -> 0 bytes
 .../ui-bg_highlight-soft_75_ffe45c_1x100.png  |  Bin 129 -> 0 bytes
 .../images/ui-icons_222222_256x240.png        |  Bin 4369 -> 0 bytes
 .../images/ui-icons_228ef1_256x240.png        |  Bin 4369 -> 0 bytes
 .../images/ui-icons_ef8c08_256x240.png        |  Bin 4369 -> 0 bytes
 .../images/ui-icons_ffd27a_256x240.png        |  Bin 4369 -> 0 bytes
 .../images/ui-icons_ffffff_256x240.png        |  Bin 4369 -> 0 bytes
 .../css/include/jquery-1.5.1.min.js           |   16 -
 .../css/include/jquery-ui-1.8.14.custom.css   |  568 --
 .../css/include/jquery.ui.core.min.js         |   17 -
 .../css/include/jquery.ui.position.min.js     |   16 -
 .../css/include/jquery.ui.tabs.min.js         |   35 -
 .../css/include/jquery.ui.widget.min.js       |   15 -
 .../ui-bg_diagonals-thick_18_b81900_40x40.png |  Bin 260 -> 0 bytes
 .../ui-bg_diagonals-thick_20_666666_40x40.png |  Bin 251 -> 0 bytes
 .../images/ui-bg_flat_10_000000_40x100.png    |  Bin 178 -> 0 bytes
 .../images/ui-bg_glass_100_f6f6f6_1x400.png   |  Bin 104 -> 0 bytes
 .../images/ui-bg_glass_100_fdf5ce_1x400.png   |  Bin 125 -> 0 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png    |  Bin 105 -> 0 bytes
 .../ui-bg_gloss-wave_35_f6a828_500x100.png    |  Bin 3762 -> 0 bytes
 .../ui-bg_highlight-soft_100_eeeeee_1x100.png |  Bin 90 -> 0 bytes
 .../ui-bg_highlight-soft_75_ffe45c_1x100.png  |  Bin 129 -> 0 bytes
 .../images/ui-icons_222222_256x240.png        |  Bin 4369 -> 0 bytes
 .../images/ui-icons_228ef1_256x240.png        |  Bin 4369 -> 0 bytes
 .../images/ui-icons_ef8c08_256x240.png        |  Bin 4369 -> 0 bytes
 .../images/ui-icons_ffd27a_256x240.png        |  Bin 4369 -> 0 bytes
 .../images/ui-icons_ffffff_256x240.png        |  Bin 4369 -> 0 bytes
 .../timepicker/css/jquery.ui.timepicker.css   |   69 -
 3rdparty/timepicker/js/i18n/i18n.html         |   73 -
 .../js/i18n/jquery.ui.timepicker-de.js        |    9 -
 .../js/i18n/jquery.ui.timepicker-fr.js        |   13 -
 .../js/i18n/jquery.ui.timepicker-ja.js        |    9 -
 .../timepicker/js/jquery.ui.timepicker.js     | 1345 -----
 3rdparty/timepicker/releases.txt              |  105 -
 3rdparty/when/MIT-LICENSE.txt                 |    9 -
 3rdparty/when/When.php                        |  731 ---
 419 files changed, 2 insertions(+), 123978 deletions(-)
 delete mode 100644 3rdparty/Console/Getopt.php
 delete mode 100644 3rdparty/Crypt_Blowfish/Blowfish.php
 delete mode 100644 3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php
 delete mode 100644 3rdparty/MDB2.php
 delete mode 100644 3rdparty/MDB2/Date.php
 delete mode 100644 3rdparty/MDB2/Driver/Datatype/Common.php
 delete mode 100644 3rdparty/MDB2/Driver/Datatype/mysql.php
 delete mode 100644 3rdparty/MDB2/Driver/Datatype/pgsql.php
 delete mode 100644 3rdparty/MDB2/Driver/Datatype/sqlite.php
 delete mode 100644 3rdparty/MDB2/Driver/Function/Common.php
 delete mode 100644 3rdparty/MDB2/Driver/Function/mysql.php
 delete mode 100644 3rdparty/MDB2/Driver/Function/pgsql.php
 delete mode 100644 3rdparty/MDB2/Driver/Function/sqlite.php
 delete mode 100644 3rdparty/MDB2/Driver/Manager/Common.php
 delete mode 100644 3rdparty/MDB2/Driver/Manager/mysql.php
 delete mode 100644 3rdparty/MDB2/Driver/Manager/pgsql.php
 delete mode 100644 3rdparty/MDB2/Driver/Manager/sqlite.php
 delete mode 100644 3rdparty/MDB2/Driver/Native/Common.php
 delete mode 100644 3rdparty/MDB2/Driver/Native/mysql.php
 delete mode 100644 3rdparty/MDB2/Driver/Native/pgsql.php
 delete mode 100644 3rdparty/MDB2/Driver/Native/sqlite.php
 delete mode 100644 3rdparty/MDB2/Driver/Reverse/Common.php
 delete mode 100644 3rdparty/MDB2/Driver/Reverse/mysql.php
 delete mode 100644 3rdparty/MDB2/Driver/Reverse/pgsql.php
 delete mode 100644 3rdparty/MDB2/Driver/Reverse/sqlite.php
 delete mode 100644 3rdparty/MDB2/Driver/mysql.php
 delete mode 100644 3rdparty/MDB2/Driver/pgsql.php
 delete mode 100644 3rdparty/MDB2/Driver/sqlite.php
 delete mode 100644 3rdparty/MDB2/Extended.php
 delete mode 100644 3rdparty/MDB2/Iterator.php
 delete mode 100644 3rdparty/MDB2/LOB.php
 delete mode 100644 3rdparty/MDB2/Schema.php
 delete mode 100644 3rdparty/MDB2/Schema/Parser.php
 delete mode 100644 3rdparty/MDB2/Schema/Parser2.php
 delete mode 100644 3rdparty/MDB2/Schema/Reserved/ibase.php
 delete mode 100644 3rdparty/MDB2/Schema/Reserved/mssql.php
 delete mode 100644 3rdparty/MDB2/Schema/Reserved/mysql.php
 delete mode 100644 3rdparty/MDB2/Schema/Reserved/oci8.php
 delete mode 100644 3rdparty/MDB2/Schema/Reserved/pgsql.php
 delete mode 100644 3rdparty/MDB2/Schema/Tool.php
 delete mode 100644 3rdparty/MDB2/Schema/Tool/ParameterException.php
 delete mode 100644 3rdparty/MDB2/Schema/Validate.php
 delete mode 100644 3rdparty/MDB2/Schema/Writer.php
 delete mode 100644 3rdparty/PEAR.php
 delete mode 100644 3rdparty/PEAR/Autoloader.php
 delete mode 100644 3rdparty/PEAR/Builder.php
 delete mode 100644 3rdparty/PEAR/Command.php
 delete mode 100644 3rdparty/PEAR/Command/Auth.php
 delete mode 100644 3rdparty/PEAR/Command/Build.php
 delete mode 100644 3rdparty/PEAR/Command/Common.php
 delete mode 100644 3rdparty/PEAR/Command/Config.php
 delete mode 100644 3rdparty/PEAR/Command/Install.php
 delete mode 100644 3rdparty/PEAR/Command/Mirror.php
 delete mode 100644 3rdparty/PEAR/Command/Package.php
 delete mode 100644 3rdparty/PEAR/Command/Registry.php
 delete mode 100644 3rdparty/PEAR/Command/Remote.php
 delete mode 100644 3rdparty/PEAR/Common.php
 delete mode 100644 3rdparty/PEAR/Config.php
 delete mode 100644 3rdparty/PEAR/Dependency.php
 delete mode 100644 3rdparty/PEAR/Downloader.php
 delete mode 100644 3rdparty/PEAR/ErrorStack.php
 delete mode 100644 3rdparty/PEAR/Exception.php
 delete mode 100644 3rdparty/PEAR/Frontend/CLI.php
 delete mode 100644 3rdparty/PEAR/Installer.php
 delete mode 100644 3rdparty/PEAR/Packager.php
 delete mode 100644 3rdparty/PEAR/Registry.php
 delete mode 100644 3rdparty/PEAR/Remote.php
 delete mode 100644 3rdparty/PEAR/RunTest.php
 create mode 100644 3rdparty/README
 delete mode 100644 3rdparty/Sabre.includes.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Backend/Abstract.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Backend/PDO.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Calendar.php
 delete mode 100644 3rdparty/Sabre/CalDAV/CalendarObject.php
 delete mode 100644 3rdparty/Sabre/CalDAV/CalendarRootNode.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Exception/InvalidICalendarObject.php
 delete mode 100644 3rdparty/Sabre/CalDAV/ICSExportPlugin.php
 delete mode 100644 3rdparty/Sabre/CalDAV/ICalendar.php
 delete mode 100644 3rdparty/Sabre/CalDAV/ICalendarObject.php
 delete mode 100644 3rdparty/Sabre/CalDAV/ICalendarUtil.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Plugin.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Principal/Collection.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Principal/User.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Server.php
 delete mode 100644 3rdparty/Sabre/CalDAV/UserCalendars.php
 delete mode 100644 3rdparty/Sabre/CalDAV/Version.php
 delete mode 100644 3rdparty/Sabre/CalDAV/XMLUtil.php
 delete mode 100644 3rdparty/Sabre/CardDAV/AddressBook.php
 delete mode 100644 3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
 delete mode 100644 3rdparty/Sabre/CardDAV/AddressBookRoot.php
 delete mode 100644 3rdparty/Sabre/CardDAV/Backend/Abstract.php
 delete mode 100644 3rdparty/Sabre/CardDAV/Backend/PDO.php
 delete mode 100644 3rdparty/Sabre/CardDAV/Card.php
 delete mode 100644 3rdparty/Sabre/CardDAV/IAddressBook.php
 delete mode 100644 3rdparty/Sabre/CardDAV/ICard.php
 delete mode 100644 3rdparty/Sabre/CardDAV/IDirectory.php
 delete mode 100644 3rdparty/Sabre/CardDAV/Plugin.php
 delete mode 100644 3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
 delete mode 100644 3rdparty/Sabre/CardDAV/UserAddressBooks.php
 delete mode 100644 3rdparty/Sabre/CardDAV/Version.php
 delete mode 100644 3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
 delete mode 100644 3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
 delete mode 100644 3rdparty/Sabre/DAV/Auth/Backend/Apache.php
 delete mode 100644 3rdparty/Sabre/DAV/Auth/Backend/File.php
 delete mode 100644 3rdparty/Sabre/DAV/Auth/Backend/PDO.php
 delete mode 100644 3rdparty/Sabre/DAV/Auth/IBackend.php
 delete mode 100644 3rdparty/Sabre/DAV/Auth/Plugin.php
 delete mode 100644 3rdparty/Sabre/DAV/Browser/GuessContentType.php
 delete mode 100644 3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
 delete mode 100644 3rdparty/Sabre/DAV/Browser/Plugin.php
 delete mode 100644 3rdparty/Sabre/DAV/Client.php
 delete mode 100644 3rdparty/Sabre/DAV/Collection.php
 delete mode 100644 3rdparty/Sabre/DAV/Directory.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/BadRequest.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/Conflict.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/ConflictingLock.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/FileNotFound.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/Forbidden.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/Locked.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/NotImplemented.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
 delete mode 100644 3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
 delete mode 100644 3rdparty/Sabre/DAV/FS/Directory.php
 delete mode 100644 3rdparty/Sabre/DAV/FS/File.php
 delete mode 100644 3rdparty/Sabre/DAV/FS/Node.php
 delete mode 100644 3rdparty/Sabre/DAV/FSExt/Directory.php
 delete mode 100644 3rdparty/Sabre/DAV/FSExt/File.php
 delete mode 100644 3rdparty/Sabre/DAV/FSExt/Node.php
 delete mode 100644 3rdparty/Sabre/DAV/File.php
 delete mode 100644 3rdparty/Sabre/DAV/ICollection.php
 delete mode 100644 3rdparty/Sabre/DAV/IExtendedCollection.php
 delete mode 100644 3rdparty/Sabre/DAV/IFile.php
 delete mode 100644 3rdparty/Sabre/DAV/ILockable.php
 delete mode 100644 3rdparty/Sabre/DAV/INode.php
 delete mode 100644 3rdparty/Sabre/DAV/IProperties.php
 delete mode 100644 3rdparty/Sabre/DAV/IQuota.php
 delete mode 100644 3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
 delete mode 100644 3rdparty/Sabre/DAV/Locks/Backend/FS.php
 delete mode 100644 3rdparty/Sabre/DAV/Locks/Backend/File.php
 delete mode 100644 3rdparty/Sabre/DAV/Locks/Backend/PDO.php
 delete mode 100644 3rdparty/Sabre/DAV/Locks/LockInfo.php
 delete mode 100644 3rdparty/Sabre/DAV/Locks/Plugin.php
 delete mode 100644 3rdparty/Sabre/DAV/Mount/Plugin.php
 delete mode 100644 3rdparty/Sabre/DAV/Node.php
 delete mode 100644 3rdparty/Sabre/DAV/ObjectTree.php
 delete mode 100644 3rdparty/Sabre/DAV/Property.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/GetLastModified.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/Href.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/HrefList.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/IHref.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/LockDiscovery.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/ResourceType.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/Response.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/ResponseList.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/SupportedLock.php
 delete mode 100644 3rdparty/Sabre/DAV/Property/SupportedReportSet.php
 delete mode 100644 3rdparty/Sabre/DAV/Server.php
 delete mode 100644 3rdparty/Sabre/DAV/ServerPlugin.php
 delete mode 100644 3rdparty/Sabre/DAV/SimpleCollection.php
 delete mode 100644 3rdparty/Sabre/DAV/SimpleDirectory.php
 delete mode 100644 3rdparty/Sabre/DAV/SimpleFile.php
 delete mode 100644 3rdparty/Sabre/DAV/StringUtil.php
 delete mode 100644 3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
 delete mode 100644 3rdparty/Sabre/DAV/Tree.php
 delete mode 100644 3rdparty/Sabre/DAV/Tree/Filesystem.php
 delete mode 100644 3rdparty/Sabre/DAV/URLUtil.php
 delete mode 100644 3rdparty/Sabre/DAV/UUIDUtil.php
 delete mode 100644 3rdparty/Sabre/DAV/Version.php
 delete mode 100644 3rdparty/Sabre/DAV/XMLUtil.php
 delete mode 100644 3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Exception/AceConflict.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
 delete mode 100644 3rdparty/Sabre/DAVACL/IACL.php
 delete mode 100644 3rdparty/Sabre/DAVACL/IPrincipal.php
 delete mode 100644 3rdparty/Sabre/DAVACL/IPrincipalBackend.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Plugin.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Principal.php
 delete mode 100644 3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
 delete mode 100644 3rdparty/Sabre/DAVACL/PrincipalCollection.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Property/Acl.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Property/Principal.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
 delete mode 100644 3rdparty/Sabre/DAVACL/Version.php
 delete mode 100644 3rdparty/Sabre/HTTP/AWSAuth.php
 delete mode 100644 3rdparty/Sabre/HTTP/AbstractAuth.php
 delete mode 100644 3rdparty/Sabre/HTTP/BasicAuth.php
 delete mode 100644 3rdparty/Sabre/HTTP/DigestAuth.php
 delete mode 100644 3rdparty/Sabre/HTTP/Request.php
 delete mode 100644 3rdparty/Sabre/HTTP/Response.php
 delete mode 100644 3rdparty/Sabre/HTTP/Util.php
 delete mode 100644 3rdparty/Sabre/HTTP/Version.php
 delete mode 100644 3rdparty/Sabre/LICENCE
 delete mode 100644 3rdparty/Sabre/VObject/Component.php
 delete mode 100644 3rdparty/Sabre/VObject/Element.php
 delete mode 100644 3rdparty/Sabre/VObject/Element/DateTime.php
 delete mode 100644 3rdparty/Sabre/VObject/Element/MultiDateTime.php
 delete mode 100644 3rdparty/Sabre/VObject/ElementList.php
 delete mode 100644 3rdparty/Sabre/VObject/Node.php
 delete mode 100644 3rdparty/Sabre/VObject/Parameter.php
 delete mode 100644 3rdparty/Sabre/VObject/ParseException.php
 delete mode 100644 3rdparty/Sabre/VObject/Property.php
 delete mode 100644 3rdparty/Sabre/VObject/Reader.php
 delete mode 100644 3rdparty/Sabre/VObject/Version.php
 delete mode 100644 3rdparty/Sabre/VObject/includes.php
 delete mode 100644 3rdparty/Sabre/autoload.php
 delete mode 100644 3rdparty/System.php
 delete mode 100644 3rdparty/XML/Parser.php
 delete mode 100644 3rdparty/XML/RPC.php
 delete mode 100644 3rdparty/XML/RPC/Server.php
 delete mode 100644 3rdparty/css/chosen-sprite.png
 delete mode 100644 3rdparty/css/chosen.css
 delete mode 100644 3rdparty/css/chosen/chosen-sprite.png
 delete mode 100644 3rdparty/css/chosen/chosen.css
 delete mode 100644 3rdparty/fullcalendar/GPL-LICENSE.txt
 delete mode 100644 3rdparty/fullcalendar/MIT-LICENSE.txt
 delete mode 100644 3rdparty/fullcalendar/changelog.txt
 delete mode 100644 3rdparty/fullcalendar/css/fullcalendar.css
 delete mode 100644 3rdparty/fullcalendar/css/fullcalendar.print.css
 delete mode 100644 3rdparty/fullcalendar/js/fullcalendar.js
 delete mode 100644 3rdparty/fullcalendar/js/fullcalendar.min.js
 delete mode 100644 3rdparty/fullcalendar/js/gcal.js
 delete mode 100644 3rdparty/js/chosen/LICENSE.md
 delete mode 100644 3rdparty/js/chosen/README.md
 delete mode 100644 3rdparty/js/chosen/VERSION
 delete mode 100644 3rdparty/js/chosen/chosen.jquery.js
 delete mode 100644 3rdparty/js/chosen/chosen.jquery.min.js
 delete mode 100755 3rdparty/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
 delete mode 100755 3rdparty/simpletest/LICENSE
 delete mode 100755 3rdparty/simpletest/README
 delete mode 100755 3rdparty/simpletest/VERSION
 delete mode 100755 3rdparty/simpletest/arguments.php
 delete mode 100644 3rdparty/simpletest/authentication.php
 delete mode 100644 3rdparty/simpletest/autorun.php
 delete mode 100644 3rdparty/simpletest/browser.php
 delete mode 100644 3rdparty/simpletest/collector.php
 delete mode 100755 3rdparty/simpletest/compatibility.php
 delete mode 100644 3rdparty/simpletest/cookies.php
 delete mode 100644 3rdparty/simpletest/default_reporter.php
 delete mode 100755 3rdparty/simpletest/detached.php
 delete mode 100644 3rdparty/simpletest/docs/en/authentication_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/en/browser_documentation.html
 delete mode 100755 3rdparty/simpletest/docs/en/docs.css
 delete mode 100644 3rdparty/simpletest/docs/en/expectation_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/en/form_testing_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/en/group_test_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/en/index.html
 delete mode 100644 3rdparty/simpletest/docs/en/mock_objects_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/en/overview.html
 delete mode 100644 3rdparty/simpletest/docs/en/partial_mocks_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/en/reporter_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/en/unit_test_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/en/web_tester_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/fr/authentication_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/fr/browser_documentation.html
 delete mode 100755 3rdparty/simpletest/docs/fr/docs.css
 delete mode 100644 3rdparty/simpletest/docs/fr/expectation_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/fr/form_testing_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/fr/group_test_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/fr/index.html
 delete mode 100644 3rdparty/simpletest/docs/fr/mock_objects_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/fr/overview.html
 delete mode 100644 3rdparty/simpletest/docs/fr/partial_mocks_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/fr/reporter_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/fr/unit_test_documentation.html
 delete mode 100644 3rdparty/simpletest/docs/fr/web_tester_documentation.html
 delete mode 100755 3rdparty/simpletest/dumper.php
 delete mode 100644 3rdparty/simpletest/eclipse.php
 delete mode 100644 3rdparty/simpletest/encoding.php
 delete mode 100644 3rdparty/simpletest/errors.php
 delete mode 100755 3rdparty/simpletest/exceptions.php
 delete mode 100755 3rdparty/simpletest/expectation.php
 delete mode 100755 3rdparty/simpletest/extensions/pear_test_case.php
 delete mode 100755 3rdparty/simpletest/extensions/testdox.php
 delete mode 100755 3rdparty/simpletest/extensions/testdox/test.php
 delete mode 100644 3rdparty/simpletest/form.php
 delete mode 100755 3rdparty/simpletest/frames.php
 delete mode 100644 3rdparty/simpletest/http.php
 delete mode 100755 3rdparty/simpletest/invoker.php
 delete mode 100755 3rdparty/simpletest/mock_objects.php
 delete mode 100755 3rdparty/simpletest/page.php
 delete mode 100755 3rdparty/simpletest/php_parser.php
 delete mode 100644 3rdparty/simpletest/recorder.php
 delete mode 100644 3rdparty/simpletest/reflection_php4.php
 delete mode 100644 3rdparty/simpletest/reflection_php5.php
 delete mode 100644 3rdparty/simpletest/remote.php
 delete mode 100755 3rdparty/simpletest/reporter.php
 delete mode 100644 3rdparty/simpletest/scorer.php
 delete mode 100755 3rdparty/simpletest/selector.php
 delete mode 100644 3rdparty/simpletest/shell_tester.php
 delete mode 100644 3rdparty/simpletest/simpletest.php
 delete mode 100755 3rdparty/simpletest/socket.php
 delete mode 100644 3rdparty/simpletest/tag.php
 delete mode 100644 3rdparty/simpletest/test/acceptance_test.php
 delete mode 100755 3rdparty/simpletest/test/adapter_test.php
 delete mode 100755 3rdparty/simpletest/test/all_tests.php
 delete mode 100755 3rdparty/simpletest/test/arguments_test.php
 delete mode 100755 3rdparty/simpletest/test/authentication_test.php
 delete mode 100755 3rdparty/simpletest/test/autorun_test.php
 delete mode 100755 3rdparty/simpletest/test/bad_test_suite.php
 delete mode 100755 3rdparty/simpletest/test/browser_test.php
 delete mode 100755 3rdparty/simpletest/test/collector_test.php
 delete mode 100755 3rdparty/simpletest/test/command_line_test.php
 delete mode 100755 3rdparty/simpletest/test/compatibility_test.php
 delete mode 100755 3rdparty/simpletest/test/cookies_test.php
 delete mode 100755 3rdparty/simpletest/test/detached_test.php
 delete mode 100755 3rdparty/simpletest/test/dumper_test.php
 delete mode 100755 3rdparty/simpletest/test/eclipse_test.php
 delete mode 100755 3rdparty/simpletest/test/encoding_test.php
 delete mode 100755 3rdparty/simpletest/test/errors_test.php
 delete mode 100755 3rdparty/simpletest/test/exceptions_test.php
 delete mode 100755 3rdparty/simpletest/test/expectation_test.php
 delete mode 100755 3rdparty/simpletest/test/form_test.php
 delete mode 100755 3rdparty/simpletest/test/frames_test.php
 delete mode 100755 3rdparty/simpletest/test/http_test.php
 delete mode 100755 3rdparty/simpletest/test/interfaces_test.php
 delete mode 100755 3rdparty/simpletest/test/interfaces_test_php5_1.php
 delete mode 100755 3rdparty/simpletest/test/live_test.php
 delete mode 100755 3rdparty/simpletest/test/mock_objects_test.php
 delete mode 100755 3rdparty/simpletest/test/page_test.php
 delete mode 100755 3rdparty/simpletest/test/parse_error_test.php
 delete mode 100755 3rdparty/simpletest/test/parsing_test.php
 delete mode 100755 3rdparty/simpletest/test/php_parser_test.php
 delete mode 100755 3rdparty/simpletest/test/recorder_test.php
 delete mode 100755 3rdparty/simpletest/test/reflection_php5_test.php
 delete mode 100755 3rdparty/simpletest/test/remote_test.php
 delete mode 100755 3rdparty/simpletest/test/shell_test.php
 delete mode 100755 3rdparty/simpletest/test/shell_tester_test.php
 delete mode 100755 3rdparty/simpletest/test/simpletest_test.php
 delete mode 100755 3rdparty/simpletest/test/site/file.html
 delete mode 100755 3rdparty/simpletest/test/socket_test.php
 delete mode 100755 3rdparty/simpletest/test/support/collector/collectable.1
 delete mode 100755 3rdparty/simpletest/test/support/collector/collectable.2
 delete mode 100755 3rdparty/simpletest/test/support/empty_test_file.php
 delete mode 100755 3rdparty/simpletest/test/support/failing_test.php
 delete mode 100755 3rdparty/simpletest/test/support/latin1_sample
 delete mode 100755 3rdparty/simpletest/test/support/passing_test.php
 delete mode 100755 3rdparty/simpletest/test/support/recorder_sample.php
 delete mode 100755 3rdparty/simpletest/test/support/spl_examples.php
 delete mode 100755 3rdparty/simpletest/test/support/supplementary_upload_sample.txt
 delete mode 100755 3rdparty/simpletest/test/support/test1.php
 delete mode 100755 3rdparty/simpletest/test/support/upload_sample.txt
 delete mode 100755 3rdparty/simpletest/test/tag_test.php
 delete mode 100755 3rdparty/simpletest/test/test_with_parse_error.php
 delete mode 100755 3rdparty/simpletest/test/unit_tester_test.php
 delete mode 100755 3rdparty/simpletest/test/unit_tests.php
 delete mode 100755 3rdparty/simpletest/test/url_test.php
 delete mode 100755 3rdparty/simpletest/test/user_agent_test.php
 delete mode 100755 3rdparty/simpletest/test/visual_test.php
 delete mode 100755 3rdparty/simpletest/test/web_tester_test.php
 delete mode 100755 3rdparty/simpletest/test/xml_test.php
 delete mode 100644 3rdparty/simpletest/test_case.php
 delete mode 100755 3rdparty/simpletest/tidy_parser.php
 delete mode 100755 3rdparty/simpletest/unit_tester.php
 delete mode 100644 3rdparty/simpletest/url.php
 delete mode 100644 3rdparty/simpletest/user_agent.php
 delete mode 100644 3rdparty/simpletest/web_tester.php
 delete mode 100755 3rdparty/simpletest/xml.php
 delete mode 100644 3rdparty/timepicker/GPL-LICENSE.txt
 delete mode 100644 3rdparty/timepicker/MIT-LICENSE.txt
 delete mode 100644 3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 delete mode 100644 3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_20_666666_40x40.png
 delete mode 100644 3rdparty/timepicker/css/include/images/ui-bg_flat_10_000000_40x100.png
 delete mode 100644 3rdparty/timepicker/css/include/images/ui-bg_glass_100_f6f6f6_1x400.png
 delete mode 100644 3rdparty/timepicker/css/include/images/ui-bg_glass_100_fdf5ce_1x400.png
 delete mode 100644 3rdparty/timepicker/css/include/images/ui-bg_glass_65_ffffff_1x400.png
 delete mode 100644 3rdparty/timepicker/css/include/images/ui-bg_gloss-wave_35_f6a828_500x100.png
 delete mode 100644 3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 delete mode 100644 3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
 delete mode 100644 3rdparty/timepicker/css/include/images/ui-icons_222222_256x240.png
 delete mode 100644 3rdparty/timepicker/css/include/images/ui-icons_228ef1_256x240.png
 delete mode 100644 3rdparty/timepicker/css/include/images/ui-icons_ef8c08_256x240.png
 delete mode 100644 3rdparty/timepicker/css/include/images/ui-icons_ffd27a_256x240.png
 delete mode 100644 3rdparty/timepicker/css/include/images/ui-icons_ffffff_256x240.png
 delete mode 100644 3rdparty/timepicker/css/include/jquery-1.5.1.min.js
 delete mode 100644 3rdparty/timepicker/css/include/jquery-ui-1.8.14.custom.css
 delete mode 100644 3rdparty/timepicker/css/include/jquery.ui.core.min.js
 delete mode 100644 3rdparty/timepicker/css/include/jquery.ui.position.min.js
 delete mode 100644 3rdparty/timepicker/css/include/jquery.ui.tabs.min.js
 delete mode 100644 3rdparty/timepicker/css/include/jquery.ui.widget.min.js
 delete mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 delete mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
 delete mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
 delete mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
 delete mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
 delete mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
 delete mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
 delete mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 delete mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
 delete mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_222222_256x240.png
 delete mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_228ef1_256x240.png
 delete mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ef8c08_256x240.png
 delete mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffd27a_256x240.png
 delete mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffffff_256x240.png
 delete mode 100644 3rdparty/timepicker/css/jquery.ui.timepicker.css
 delete mode 100644 3rdparty/timepicker/js/i18n/i18n.html
 delete mode 100644 3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js
 delete mode 100644 3rdparty/timepicker/js/i18n/jquery.ui.timepicker-fr.js
 delete mode 100644 3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js
 delete mode 100644 3rdparty/timepicker/js/jquery.ui.timepicker.js
 delete mode 100644 3rdparty/timepicker/releases.txt
 delete mode 100644 3rdparty/when/MIT-LICENSE.txt
 delete mode 100755 3rdparty/when/When.php

diff --git a/3rdparty/Console/Getopt.php b/3rdparty/Console/Getopt.php
deleted file mode 100644
index aec980b34d5..00000000000
--- a/3rdparty/Console/Getopt.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Andrei Zmievski <andrei@php.net>                             |
-// +----------------------------------------------------------------------+
-//
-// $Id: Getopt.php,v 1.21.4.7 2003/12/05 21:57:01 andrei Exp $
-
-require_once( 'PEAR.php');
-
-/**
- * Command-line options parsing class.
- *
- * @author Andrei Zmievski <andrei@php.net>
- *
- */
-class Console_Getopt {
-    /**
-     * Parses the command-line options.
-     *
-     * The first parameter to this function should be the list of command-line
-     * arguments without the leading reference to the running program.
-     *
-     * The second parameter is a string of allowed short options. Each of the
-     * option letters can be followed by a colon ':' to specify that the option
-     * requires an argument, or a double colon '::' to specify that the option
-     * takes an optional argument.
-     *
-     * The third argument is an optional array of allowed long options. The
-     * leading '--' should not be included in the option name. Options that
-     * require an argument should be followed by '=', and options that take an
-     * option argument should be followed by '=='.
-     *
-     * The return value is an array of two elements: the list of parsed
-     * options and the list of non-option command-line arguments. Each entry in
-     * the list of parsed options is a pair of elements - the first one
-     * specifies the option, and the second one specifies the option argument,
-     * if there was one.
-     *
-     * Long and short options can be mixed.
-     *
-     * Most of the semantics of this function are based on GNU getopt_long().
-     *
-     * @param array  $args           an array of command-line arguments
-     * @param string $short_options  specifies the list of allowed short options
-     * @param array  $long_options   specifies the list of allowed long options
-     *
-     * @return array two-element array containing the list of parsed options and
-     * the non-option arguments
-     *
-     * @access public
-     *
-     */
-    function getopt2($args, $short_options, $long_options = null)
-    {
-        return Console_Getopt::doGetopt(2, $args, $short_options, $long_options);
-    }
-
-    /**
-     * This function expects $args to start with the script name (POSIX-style).
-     * Preserved for backwards compatibility.
-     * @see getopt2()
-     */
-    function getopt($args, $short_options, $long_options = null)
-    {
-        return Console_Getopt::doGetopt(1, $args, $short_options, $long_options);
-    }
-
-    /**
-     * The actual implementation of the argument parsing code.
-     */
-    function doGetopt($version, $args, $short_options, $long_options = null)
-    {
-        // in case you pass directly readPHPArgv() as the first arg
-        if (PEAR::isError($args)) {
-            return $args;
-        }
-        if (empty($args)) {
-            return array(array(), array());
-        }
-        $opts     = array();
-        $non_opts = array();
-
-        settype($args, 'array');
-
-        if ($long_options) {
-            sort($long_options);
-        }
-
-        /*
-         * Preserve backwards compatibility with callers that relied on
-         * erroneous POSIX fix.
-         */
-        if ($version < 2) {
-            if (isset($args[0]{0}) && $args[0]{0} != '-') {
-                array_shift($args);
-            }
-        }
-
-        reset($args);
-        while (list($i, $arg) = each($args)) {
-
-            /* The special element '--' means explicit end of
-               options. Treat the rest of the arguments as non-options
-               and end the loop. */
-            if ($arg == '--') {
-                $non_opts = array_merge($non_opts, array_slice($args, $i + 1));
-                break;
-            }
-
-            if ($arg{0} != '-' || (strlen($arg) > 1 && $arg{1} == '-' && !$long_options)) {
-                $non_opts = array_merge($non_opts, array_slice($args, $i));
-                break;
-            } elseif (strlen($arg) > 1 && $arg{1} == '-') {
-                $error = Console_Getopt::_parseLongOption(substr($arg, 2), $long_options, $opts, $args);
-                if (PEAR::isError($error))
-                    return $error;
-            } else {
-                $error = Console_Getopt::_parseShortOption(substr($arg, 1), $short_options, $opts, $args);
-                if (PEAR::isError($error))
-                    return $error;
-            }
-        }
-
-        return array($opts, $non_opts);
-    }
-
-    /**
-     * @access private
-     *
-     */
-    function _parseShortOption($arg, $short_options, &$opts, &$args)
-    {
-        for ($i = 0; $i < strlen($arg); $i++) {
-            $opt = $arg{$i};
-            $opt_arg = null;
-
-            /* Try to find the short option in the specifier string. */
-            if (($spec = strstr($short_options, $opt)) === false || $arg{$i} == ':')
-            {
-                return PEAR::raiseError("Console_Getopt: unrecognized option -- $opt");
-            }
-
-            if (strlen($spec) > 1 && $spec{1} == ':') {
-                if (strlen($spec) > 2 && $spec{2} == ':') {
-                    if ($i + 1 < strlen($arg)) {
-                        /* Option takes an optional argument. Use the remainder of
-                           the arg string if there is anything left. */
-                        $opts[] = array($opt, substr($arg, $i + 1));
-                        break;
-                    }
-                } else {
-                    /* Option requires an argument. Use the remainder of the arg
-                       string if there is anything left. */
-                    if ($i + 1 < strlen($arg)) {
-                        $opts[] = array($opt,  substr($arg, $i + 1));
-                        break;
-                    } else if (list(, $opt_arg) = each($args))
-                        /* Else use the next argument. */;
-                    else
-                        return PEAR::raiseError("Console_Getopt: option requires an argument -- $opt");
-                }
-            }
-
-            $opts[] = array($opt, $opt_arg);
-        }
-    }
-
-    /**
-     * @access private
-     *
-     */
-    function _parseLongOption($arg, $long_options, &$opts, &$args)
-    {
-        @list($opt, $opt_arg) = explode('=', $arg);
-        $opt_len = strlen($opt);
-
-        for ($i = 0; $i < count($long_options); $i++) {
-            $long_opt  = $long_options[$i];
-            $opt_start = substr($long_opt, 0, $opt_len);
-
-            /* Option doesn't match. Go on to the next one. */
-            if ($opt_start != $opt)
-                continue;
-
-            $opt_rest  = substr($long_opt, $opt_len);
-
-            /* Check that the options uniquely matches one of the allowed
-               options. */
-            if ($opt_rest != '' && $opt{0} != '=' &&
-                $i + 1 < count($long_options) &&
-                $opt == substr($long_options[$i+1], 0, $opt_len)) {
-                return PEAR::raiseError("Console_Getopt: option --$opt is ambiguous");
-            }
-
-            if (substr($long_opt, -1) == '=') {
-                if (substr($long_opt, -2) != '==') {
-                    /* Long option requires an argument.
-                       Take the next argument if one wasn't specified. */;
-                    if (!strlen($opt_arg) && !(list(, $opt_arg) = each($args))) {
-                        return PEAR::raiseError("Console_Getopt: option --$opt requires an argument");
-                    }
-                }
-            } else if ($opt_arg) {
-                return PEAR::raiseError("Console_Getopt: option --$opt doesn't allow an argument");
-            }
-
-            $opts[] = array('--' . $opt, $opt_arg);
-            return;
-        }
-
-        return PEAR::raiseError("Console_Getopt: unrecognized option --$opt");
-    }
-
-    /**
-    * Safely read the $argv PHP array across different PHP configurations.
-    * Will take care on register_globals and register_argc_argv ini directives
-    *
-    * @access public
-    * @return mixed the $argv PHP array or PEAR error if not registered
-    */
-    function readPHPArgv()
-    {
-        global $argv;
-        if (!is_array($argv)) {
-            if (!@is_array($_SERVER['argv'])) {
-                if (!@is_array($GLOBALS['HTTP_SERVER_VARS']['argv'])) {
-                    return PEAR::raiseError("Console_Getopt: Could not read cmd args (register_argc_argv=Off?)");
-                }
-                return $GLOBALS['HTTP_SERVER_VARS']['argv'];
-            }
-            return $_SERVER['argv'];
-        }
-        return $argv;
-    }
-
-}
-
-?>
diff --git a/3rdparty/Crypt_Blowfish/Blowfish.php b/3rdparty/Crypt_Blowfish/Blowfish.php
deleted file mode 100644
index a7b8948f043..00000000000
--- a/3rdparty/Crypt_Blowfish/Blowfish.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Crypt_Blowfish allows for encryption and decryption on the fly using
- * the Blowfish algorithm. Crypt_Blowfish does not require the mcrypt
- * PHP extension, it uses only PHP.
- * Crypt_Blowfish support encryption/decryption with or without a secret key.
- *
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @copyright  2005 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Blowfish.php,v 1.81 2005/05/30 18:40:36 mfonda Exp $
- * @link       http://pear.php.net/package/Crypt_Blowfish
- */
-
-
-require_once 'PEAR.php';
-
-
-/**
- *
- * Example usage:
- * $bf = new Crypt_Blowfish('some secret key!');
- * $encrypted = $bf->encrypt('this is some example plain text');
- * $plaintext = $bf->decrypt($encrypted);
- * echo "plain text: $plaintext";
- *
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @copyright  2005 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @link       http://pear.php.net/package/Crypt_Blowfish
- * @version    @package_version@
- * @access     public
- */
-class Crypt_Blowfish
-{
-    /**
-     * P-Array contains 18 32-bit subkeys
-     *
-     * @var array
-     * @access private
-     */
-    var $_P = array();
-    
-    
-    /**
-     * Array of four S-Blocks each containing 256 32-bit entries
-     *
-     * @var array
-     * @access private
-     */
-    var $_S = array();
-
-    /**
-     * Mcrypt td resource
-     *
-     * @var resource
-     * @access private
-     */
-    var $_td = null;
-
-    /**
-     * Initialization vector
-     *
-     * @var string
-     * @access private
-     */
-    var $_iv = null;
-
-    
-    /**
-     * Crypt_Blowfish Constructor
-     * Initializes the Crypt_Blowfish object, and gives a sets
-     * the secret key
-     *
-     * @param string $key
-     * @access public
-     */
-    function Crypt_Blowfish($key)
-    {
-        if (extension_loaded('mcrypt')) {
-            $this->_td = mcrypt_module_open(MCRYPT_BLOWFISH, '', 'ecb', '');
-            $this->_iv = mcrypt_create_iv(8, MCRYPT_RAND);
-        }
-        $this->setKey($key);
-    }
-    
-    /**
-     * Deprecated isReady method
-     *
-     * @return bool
-     * @access public
-     * @deprecated
-     */
-    function isReady()
-    {
-        return true;
-    }
-    
-    /**
-     * Deprecated init method - init is now a private
-     * method and has been replaced with _init
-     *
-     * @return bool
-     * @access public
-     * @deprecated
-     * @see Crypt_Blowfish::_init()
-     */
-    function init()
-    {
-        $this->_init();
-    }
-    
-    /**
-     * Initializes the Crypt_Blowfish object
-     *
-     * @access private
-     */
-    function _init()
-    {
-        $defaults = new Crypt_Blowfish_DefaultKey();
-        $this->_P = $defaults->P;
-        $this->_S = $defaults->S;
-    }
-            
-    /**
-     * Enciphers a single 64 bit block
-     *
-     * @param int &$Xl
-     * @param int &$Xr
-     * @access private
-     */
-    function _encipher(&$Xl, &$Xr)
-    {
-        for ($i = 0; $i < 16; $i++) {
-            $temp = $Xl ^ $this->_P[$i];
-            $Xl = ((($this->_S[0][($temp>>24) & 255] +
-                            $this->_S[1][($temp>>16) & 255]) ^
-                            $this->_S[2][($temp>>8) & 255]) +
-                            $this->_S[3][$temp & 255]) ^ $Xr;
-            $Xr = $temp;
-        }
-        $Xr = $Xl ^ $this->_P[16];
-        $Xl = $temp ^ $this->_P[17];
-    }
-    
-    
-    /**
-     * Deciphers a single 64 bit block
-     *
-     * @param int &$Xl
-     * @param int &$Xr
-     * @access private
-     */
-    function _decipher(&$Xl, &$Xr)
-    {
-        for ($i = 17; $i > 1; $i--) {
-            $temp = $Xl ^ $this->_P[$i];
-            $Xl = ((($this->_S[0][($temp>>24) & 255] +
-                            $this->_S[1][($temp>>16) & 255]) ^
-                            $this->_S[2][($temp>>8) & 255]) +
-                            $this->_S[3][$temp & 255]) ^ $Xr;
-            $Xr = $temp;
-        }
-        $Xr = $Xl ^ $this->_P[1];
-        $Xl = $temp ^ $this->_P[0];
-    }
-    
-    
-    /**
-     * Encrypts a string
-     *
-     * @param string $plainText
-     * @return string Returns cipher text on success, PEAR_Error on failure
-     * @access public
-     */
-    function encrypt($plainText)
-    {
-        if (!is_string($plainText)) {
-            PEAR::raiseError('Plain text must be a string', 0, PEAR_ERROR_DIE);
-        }
-
-        if (extension_loaded('mcrypt')) {
-            return mcrypt_generic($this->_td, $plainText);
-        }
-
-        $cipherText = '';
-        $len = strlen($plainText);
-        $plainText .= str_repeat(chr(0),(8 - ($len%8))%8);
-        for ($i = 0; $i < $len; $i += 8) {
-            list(,$Xl,$Xr) = unpack("N2",substr($plainText,$i,8));
-            $this->_encipher($Xl, $Xr);
-            $cipherText .= pack("N2", $Xl, $Xr);
-        }
-        return $cipherText;
-    }
-    
-    
-    /**
-     * Decrypts an encrypted string
-     *
-     * @param string $cipherText
-     * @return string Returns plain text on success, PEAR_Error on failure
-     * @access public
-     */
-    function decrypt($cipherText)
-    {
-        if (!is_string($cipherText)) {
-            PEAR::raiseError('Chiper text must be a string', 1, PEAR_ERROR_DIE);
-        }
-
-        if (extension_loaded('mcrypt')) {
-            return mdecrypt_generic($this->_td, $cipherText);
-        }
-
-        $plainText = '';
-        $len = strlen($cipherText);
-        $cipherText .= str_repeat(chr(0),(8 - ($len%8))%8);
-        for ($i = 0; $i < $len; $i += 8) {
-            list(,$Xl,$Xr) = unpack("N2",substr($cipherText,$i,8));
-            $this->_decipher($Xl, $Xr);
-            $plainText .= pack("N2", $Xl, $Xr);
-        }
-        return $plainText;
-    }
-    
-    
-    /**
-     * Sets the secret key
-     * The key must be non-zero, and less than or equal to
-     * 56 characters in length.
-     *
-     * @param string $key
-     * @return bool  Returns true on success, PEAR_Error on failure
-     * @access public
-     */
-    function setKey($key)
-    {
-        if (!is_string($key)) {
-            PEAR::raiseError('Key must be a string', 2, PEAR_ERROR_DIE);
-        }
-
-        $len = strlen($key);
-
-        if ($len > 56 || $len == 0) {
-            PEAR::raiseError('Key must be less than 56 characters and non-zero. Supplied key length: ' . $len, 3, PEAR_ERROR_DIE);
-        }
-
-        if (extension_loaded('mcrypt')) {
-            mcrypt_generic_init($this->_td, $key, $this->_iv);
-            return true;
-        }
-
-        require_once 'Blowfish/DefaultKey.php';
-        $this->_init();
-        
-        $k = 0;
-        $data = 0;
-        $datal = 0;
-        $datar = 0;
-        
-        for ($i = 0; $i < 18; $i++) {
-            $data = 0;
-            for ($j = 4; $j > 0; $j--) {
-                    $data = $data << 8 | ord($key{$k});
-                    $k = ($k+1) % $len;
-            }
-            $this->_P[$i] ^= $data;
-        }
-        
-        for ($i = 0; $i <= 16; $i += 2) {
-            $this->_encipher($datal, $datar);
-            $this->_P[$i] = $datal;
-            $this->_P[$i+1] = $datar;
-        }
-        for ($i = 0; $i < 256; $i += 2) {
-            $this->_encipher($datal, $datar);
-            $this->_S[0][$i] = $datal;
-            $this->_S[0][$i+1] = $datar;
-        }
-        for ($i = 0; $i < 256; $i += 2) {
-            $this->_encipher($datal, $datar);
-            $this->_S[1][$i] = $datal;
-            $this->_S[1][$i+1] = $datar;
-        }
-        for ($i = 0; $i < 256; $i += 2) {
-            $this->_encipher($datal, $datar);
-            $this->_S[2][$i] = $datal;
-            $this->_S[2][$i+1] = $datar;
-        }
-        for ($i = 0; $i < 256; $i += 2) {
-            $this->_encipher($datal, $datar);
-            $this->_S[3][$i] = $datal;
-            $this->_S[3][$i+1] = $datar;
-        }
-        
-        return true;
-    }
-    
-}
-
-?>
diff --git a/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php b/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php
deleted file mode 100644
index 2ff8ac788a6..00000000000
--- a/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Crypt_Blowfish allows for encryption and decryption on the fly using
- * the Blowfish algorithm. Crypt_Blowfish does not require the mcrypt
- * PHP extension, it uses only PHP.
- * Crypt_Blowfish support encryption/decryption with or without a secret key.
- *
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @copyright  2005 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: DefaultKey.php,v 1.81 2005/05/30 18:40:37 mfonda Exp $
- * @link       http://pear.php.net/package/Crypt_Blowfish
- */
-
-
-/**
- * Class containing default key
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @copyright  2005 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @link       http://pear.php.net/package/Crypt_Blowfish
- * @version    @package_version@
- * @access     public
- */
-class Crypt_Blowfish_DefaultKey
-{
-    var $P = array();
-    
-    var $S = array();
-    
-    function Crypt_Blowfish_DefaultKey()
-    {
-        $this->P = array(
-            0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
-            0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,
-            0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,
-            0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,
-            0x9216D5D9, 0x8979FB1B
-        );
-        
-        $this->S = array(
-            array(
-                0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,
-                0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,
-                0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,
-                0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,
-                0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,
-                0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,
-                0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,
-                0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,
-                0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,
-                0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,
-                0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,
-                0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,
-                0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,
-                0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,
-                0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,
-                0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,
-                0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,
-                0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,
-                0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,
-                0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,
-                0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,
-                0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,
-                0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,
-                0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,
-                0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,
-                0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,
-                0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,
-                0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,
-                0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,
-                0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,
-                0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,
-                0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,
-                0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,
-                0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,
-                0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,
-                0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,
-                0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,
-                0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,
-                0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,
-                0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,
-                0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,
-                0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,
-                0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,
-                0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,
-                0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,
-                0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,
-                0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,
-                0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,
-                0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,
-                0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,
-                0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,
-                0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,
-                0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,
-                0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,
-                0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,
-                0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,
-                0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,
-                0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,
-                0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,
-                0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,
-                0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,
-                0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,
-                0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,
-                0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A
-            ),
-            array(
-                0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,
-                0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,
-                0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,
-                0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,
-                0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,
-                0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,
-                0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,
-                0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,
-                0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,
-                0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,
-                0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,
-                0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,
-                0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,
-                0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,
-                0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,
-                0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,
-                0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,
-                0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,
-                0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,
-                0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,
-                0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,
-                0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,
-                0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,
-                0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,
-                0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,
-                0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,
-                0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,
-                0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,
-                0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,
-                0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,
-                0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,
-                0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,
-                0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,
-                0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,
-                0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,
-                0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,
-                0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,
-                0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,
-                0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,
-                0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,
-                0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,
-                0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,
-                0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,
-                0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,
-                0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,
-                0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,
-                0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,
-                0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,
-                0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,
-                0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,
-                0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,
-                0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,
-                0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,
-                0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,
-                0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,
-                0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,
-                0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,
-                0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,
-                0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,
-                0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,
-                0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,
-                0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,
-                0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,
-                0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7
-            ),
-            array(
-                0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,
-                0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,
-                0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,
-                0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,
-                0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,
-                0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,
-                0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,
-                0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,
-                0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,
-                0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,
-                0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,
-                0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,
-                0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,
-                0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,
-                0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,
-                0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,
-                0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,
-                0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,
-                0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,
-                0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,
-                0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,
-                0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,
-                0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,
-                0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,
-                0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,
-                0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,
-                0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,
-                0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,
-                0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,
-                0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,
-                0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,
-                0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,
-                0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,
-                0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,
-                0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,
-                0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,
-                0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,
-                0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,
-                0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,
-                0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,
-                0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,
-                0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,
-                0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,
-                0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,
-                0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,
-                0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,
-                0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,
-                0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,
-                0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,
-                0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,
-                0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,
-                0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,
-                0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,
-                0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,
-                0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,
-                0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,
-                0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,
-                0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,
-                0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,
-                0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,
-                0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,
-                0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,
-                0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,
-                0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0
-            ),
-            array(
-                0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,
-                0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,
-                0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,
-                0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,
-                0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,
-                0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,
-                0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,
-                0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,
-                0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,
-                0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,
-                0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,
-                0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,
-                0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,
-                0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,
-                0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,
-                0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,
-                0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,
-                0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,
-                0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,
-                0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,
-                0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,
-                0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,
-                0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,
-                0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,
-                0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,
-                0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,
-                0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,
-                0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,
-                0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,
-                0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,
-                0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,
-                0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,
-                0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,
-                0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,
-                0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,
-                0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,
-                0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,
-                0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,
-                0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,
-                0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,
-                0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,
-                0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,
-                0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,
-                0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,
-                0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,
-                0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,
-                0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,
-                0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,
-                0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,
-                0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,
-                0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,
-                0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,
-                0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,
-                0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,
-                0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,
-                0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,
-                0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,
-                0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,
-                0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,
-                0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,
-                0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,
-                0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,
-                0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,
-                0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6
-            )
-        );
-    }
-    
-}
-
-?>
diff --git a/3rdparty/MDB2.php b/3rdparty/MDB2.php
deleted file mode 100644
index aa7ec6ba093..00000000000
--- a/3rdparty/MDB2.php
+++ /dev/null
@@ -1,4316 +0,0 @@
-<?php
-// vim: set et ts=4 sw=4 fdm=marker:
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: MDB2.php,v 1.335 2008/11/29 14:57:01 afz Exp $
-//
-
-/**
- * @package     MDB2
- * @category    Database
- * @author      Lukas Smith <smith@pooteeweet.org>
- */
-
-require_once('PEAR.php');
-
-// {{{ Error constants
-
-/**
- * The method mapErrorCode in each MDB2_dbtype implementation maps
- * native error codes to one of these.
- *
- * If you add an error code here, make sure you also add a textual
- * version of it in MDB2::errorMessage().
- */
-
-define('MDB2_OK',                      true);
-define('MDB2_ERROR',                     -1);
-define('MDB2_ERROR_SYNTAX',              -2);
-define('MDB2_ERROR_CONSTRAINT',          -3);
-define('MDB2_ERROR_NOT_FOUND',           -4);
-define('MDB2_ERROR_ALREADY_EXISTS',      -5);
-define('MDB2_ERROR_UNSUPPORTED',         -6);
-define('MDB2_ERROR_MISMATCH',            -7);
-define('MDB2_ERROR_INVALID',             -8);
-define('MDB2_ERROR_NOT_CAPABLE',         -9);
-define('MDB2_ERROR_TRUNCATED',          -10);
-define('MDB2_ERROR_INVALID_NUMBER',     -11);
-define('MDB2_ERROR_INVALID_DATE',       -12);
-define('MDB2_ERROR_DIVZERO',            -13);
-define('MDB2_ERROR_NODBSELECTED',       -14);
-define('MDB2_ERROR_CANNOT_CREATE',      -15);
-define('MDB2_ERROR_CANNOT_DELETE',      -16);
-define('MDB2_ERROR_CANNOT_DROP',        -17);
-define('MDB2_ERROR_NOSUCHTABLE',        -18);
-define('MDB2_ERROR_NOSUCHFIELD',        -19);
-define('MDB2_ERROR_NEED_MORE_DATA',     -20);
-define('MDB2_ERROR_NOT_LOCKED',         -21);
-define('MDB2_ERROR_VALUE_COUNT_ON_ROW', -22);
-define('MDB2_ERROR_INVALID_DSN',        -23);
-define('MDB2_ERROR_CONNECT_FAILED',     -24);
-define('MDB2_ERROR_EXTENSION_NOT_FOUND',-25);
-define('MDB2_ERROR_NOSUCHDB',           -26);
-define('MDB2_ERROR_ACCESS_VIOLATION',   -27);
-define('MDB2_ERROR_CANNOT_REPLACE',     -28);
-define('MDB2_ERROR_CONSTRAINT_NOT_NULL',-29);
-define('MDB2_ERROR_DEADLOCK',           -30);
-define('MDB2_ERROR_CANNOT_ALTER',       -31);
-define('MDB2_ERROR_MANAGER',            -32);
-define('MDB2_ERROR_MANAGER_PARSE',      -33);
-define('MDB2_ERROR_LOADMODULE',         -34);
-define('MDB2_ERROR_INSUFFICIENT_DATA',  -35);
-define('MDB2_ERROR_NO_PERMISSION',      -36);
-define('MDB2_ERROR_DISCONNECT_FAILED',  -37);
-
-// }}}
-// {{{ Verbose constants
-/**
- * These are just helper constants to more verbosely express parameters to prepare()
- */
-
-define('MDB2_PREPARE_MANIP', false);
-define('MDB2_PREPARE_RESULT', null);
-
-// }}}
-// {{{ Fetchmode constants
-
-/**
- * This is a special constant that tells MDB2 the user hasn't specified
- * any particular get mode, so the default should be used.
- */
-define('MDB2_FETCHMODE_DEFAULT', 0);
-
-/**
- * Column data indexed by numbers, ordered from 0 and up
- */
-define('MDB2_FETCHMODE_ORDERED', 1);
-
-/**
- * Column data indexed by column names
- */
-define('MDB2_FETCHMODE_ASSOC', 2);
-
-/**
- * Column data as object properties
- */
-define('MDB2_FETCHMODE_OBJECT', 3);
-
-/**
- * For multi-dimensional results: normally the first level of arrays
- * is the row number, and the second level indexed by column number or name.
- * MDB2_FETCHMODE_FLIPPED switches this order, so the first level of arrays
- * is the column name, and the second level the row number.
- */
-define('MDB2_FETCHMODE_FLIPPED', 4);
-
-// }}}
-// {{{ Portability mode constants
-
-/**
- * Portability: turn off all portability features.
- * @see MDB2_Driver_Common::setOption()
- */
-define('MDB2_PORTABILITY_NONE', 0);
-
-/**
- * Portability: convert names of tables and fields to case defined in the
- * "field_case" option when using the query*(), fetch*() and tableInfo() methods.
- * @see MDB2_Driver_Common::setOption()
- */
-define('MDB2_PORTABILITY_FIX_CASE', 1);
-
-/**
- * Portability: right trim the data output by query*() and fetch*().
- * @see MDB2_Driver_Common::setOption()
- */
-define('MDB2_PORTABILITY_RTRIM', 2);
-
-/**
- * Portability: force reporting the number of rows deleted.
- * @see MDB2_Driver_Common::setOption()
- */
-define('MDB2_PORTABILITY_DELETE_COUNT', 4);
-
-/**
- * Portability: not needed in MDB2 (just left here for compatibility to DB)
- * @see MDB2_Driver_Common::setOption()
- */
-define('MDB2_PORTABILITY_NUMROWS', 8);
-
-/**
- * Portability: makes certain error messages in certain drivers compatible
- * with those from other DBMS's.
- *
- * + mysql, mysqli:  change unique/primary key constraints
- *   MDB2_ERROR_ALREADY_EXISTS -> MDB2_ERROR_CONSTRAINT
- *
- * + odbc(access):  MS's ODBC driver reports 'no such field' as code
- *   07001, which means 'too few parameters.'  When this option is on
- *   that code gets mapped to MDB2_ERROR_NOSUCHFIELD.
- *
- * @see MDB2_Driver_Common::setOption()
- */
-define('MDB2_PORTABILITY_ERRORS', 16);
-
-/**
- * Portability: convert empty values to null strings in data output by
- * query*() and fetch*().
- * @see MDB2_Driver_Common::setOption()
- */
-define('MDB2_PORTABILITY_EMPTY_TO_NULL', 32);
-
-/**
- * Portability: removes database/table qualifiers from associative indexes
- * @see MDB2_Driver_Common::setOption()
- */
-define('MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES', 64);
-
-/**
- * Portability: turn on all portability features.
- * @see MDB2_Driver_Common::setOption()
- */
-define('MDB2_PORTABILITY_ALL', 127);
-
-// }}}
-// {{{ Globals for class instance tracking
-
-/**
- * These are global variables that are used to track the various class instances
- */
-
-$GLOBALS['_MDB2_databases'] = array();
-$GLOBALS['_MDB2_dsninfo_default'] = array(
-    'phptype'  => false,
-    'dbsyntax' => false,
-    'username' => false,
-    'password' => false,
-    'protocol' => false,
-    'hostspec' => false,
-    'port'     => false,
-    'socket'   => false,
-    'database' => false,
-    'mode'     => false,
-);
-
-// }}}
-// {{{ class MDB2
-
-/**
- * The main 'MDB2' class is simply a container class with some static
- * methods for creating DB objects as well as some utility functions
- * common to all parts of DB.
- *
- * The object model of MDB2 is as follows (indentation means inheritance):
- *
- * MDB2          The main MDB2 class.  This is simply a utility class
- *              with some 'static' methods for creating MDB2 objects as
- *              well as common utility functions for other MDB2 classes.
- *
- * MDB2_Driver_Common   The base for each MDB2 implementation.  Provides default
- * |            implementations (in OO lingo virtual methods) for
- * |            the actual DB implementations as well as a bunch of
- * |            query utility functions.
- * |
- * +-MDB2_Driver_mysql  The MDB2 implementation for MySQL. Inherits MDB2_Driver_Common.
- *              When calling MDB2::factory or MDB2::connect for MySQL
- *              connections, the object returned is an instance of this
- *              class.
- * +-MDB2_Driver_pgsql  The MDB2 implementation for PostGreSQL. Inherits MDB2_Driver_Common.
- *              When calling MDB2::factory or MDB2::connect for PostGreSQL
- *              connections, the object returned is an instance of this
- *              class.
- *
- * @package     MDB2
- * @category    Database
- * @author      Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2
-{
-    // {{{ function setOptions(&$db, $options)
-
-    /**
-     * set option array   in an exiting database object
-     *
-     * @param   MDB2_Driver_Common  MDB2 object
-     * @param   array   An associative array of option names and their values.
-     *
-     * @return mixed   MDB2_OK or a PEAR Error object
-     *
-     * @access  public
-     */
-    static function setOptions(&$db, $options)
-    {
-        if (is_array($options)) {
-            foreach ($options as $option => $value) {
-                $test = $db->setOption($option, $value);
-                if (PEAR::isError($test)) {
-                    return $test;
-                }
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function classExists($classname)
-
-    /**
-     * Checks if a class exists without triggering __autoload
-     *
-     * @param   string  classname
-     *
-     * @return  bool    true success and false on error
-     * @static
-     * @access  public
-     */
-    static function classExists($classname)
-    {
-        if (version_compare(phpversion(), "5.0", ">=")) {
-            return class_exists($classname, false);
-        }
-        return class_exists($classname);
-    }
-
-    // }}}
-    // {{{ function loadClass($class_name, $debug)
-
-    /**
-     * Loads a PEAR class.
-     *
-     * @param   string  classname to load
-     * @param   bool    if errors should be suppressed
-     *
-     * @return  mixed   true success or PEAR_Error on failure
-     *
-     * @access  public
-     */
-    static function loadClass($class_name, $debug)
-    {
-        if (!MDB2::classExists($class_name)) {
-            $file_name = str_replace('_', DIRECTORY_SEPARATOR, $class_name).'.php';
-            if ($debug) {
-                $include = include_once($file_name);
-            } else {
-                $include = include_once($file_name);
-            }
-            if (!$include) {
-                if (!MDB2::fileExists($file_name)) {
-                    $msg = "unable to find package '$class_name' file '$file_name'";
-                } else {
-                    $msg = "unable to load class '$class_name' from file '$file_name'";
-                }
-                $err =MDB2::raiseErrorStatic(MDB2_ERROR_NOT_FOUND, null, null, $msg);
-                return $err;
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function &factory($dsn, $options = false)
-
-    /**
-     * Create a new MDB2 object for the specified database type
-     *
-     * IMPORTANT: In order for MDB2 to work properly it is necessary that
-     * you make sure that you work with a reference of the original
-     * object instead of a copy (this is a PHP4 quirk).
-     *
-     * For example:
-     *     $db =& MDB2::factory($dsn);
-     *          ^^
-     * And not:
-     *     $db = MDB2::factory($dsn);
-     *
-     * @param   mixed   'data source name', see the MDB2::parseDSN
-     *                      method for a description of the dsn format.
-     *                      Can also be specified as an array of the
-     *                      format returned by MDB2::parseDSN.
-     * @param   array   An associative array of option names and
-     *                            their values.
-     *
-     * @return  mixed   a newly created MDB2 object, or false on error
-     *
-     * @access  public
-     */
-    static function factory($dsn, $options = false)
-    {
-        $dsninfo = MDB2::parseDSN($dsn);
-        if (empty($dsninfo['phptype'])) {
-            $err =MDB2::raiseErrorStatic(MDB2_ERROR_NOT_FOUND,
-                null, null, 'no RDBMS driver specified');
-            return $err;
-        }
-        $class_name = 'MDB2_Driver_'.$dsninfo['phptype'];
-
-        $debug = (!empty($options['debug']));
-        $err = MDB2::loadClass($class_name, $debug);
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-
-        $db =new $class_name();
-        $db->setDSN($dsninfo);
-        $err = MDB2::setOptions($db, $options);
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-
-        return $db;
-    }
-
-    // }}}
-    // {{{ function &connect($dsn, $options = false)
-
-    /**
-     * Create a new MDB2_Driver_* connection object and connect to the specified
-     * database
-     *
-     * IMPORTANT: In order for MDB2 to work properly it is necessary that
-     * you make sure that you work with a reference of the original
-     * object instead of a copy (this is a PHP4 quirk).
-     *
-     * For example:
-     *     $db =& MDB2::connect($dsn);
-     *          ^^
-     * And not:
-     *     $db = MDB2::connect($dsn);
-     *          ^^
-     *
-     * @param mixed $dsn     'data source name', see the MDB2::parseDSN
-     *                       method for a description of the dsn format.
-     *                       Can also be specified as an array of the
-     *                       format returned by MDB2::parseDSN.
-     * @param array $options An associative array of option names and
-     *                       their values.
-     *
-     * @return mixed a newly created MDB2 connection object, or a MDB2
-     *               error object on error
-     *
-     * @access  public
-     * @see     MDB2::parseDSN
-     */
-    function &connect($dsn, $options = false)
-    {
-        $db =MDB2::factory($dsn, $options);
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $err = $db->connect();
-        if (PEAR::isError($err)) {
-            $dsn = $db->getDSN('string', 'xxx');
-            $db->disconnect();
-            $err->addUserInfo($dsn);
-            return $err;
-        }
-
-        return $db;
-    }
-
-    // }}}
-    // {{{ function &singleton($dsn = null, $options = false)
-
-    /**
-     * Returns a MDB2 connection with the requested DSN.
-     * A new MDB2 connection object is only created if no object with the
-     * requested DSN exists yet.
-     *
-     * IMPORTANT: In order for MDB2 to work properly it is necessary that
-     * you make sure that you work with a reference of the original
-     * object instead of a copy (this is a PHP4 quirk).
-     *
-     * For example:
-     *     $db =& MDB2::singleton($dsn);
-     *          ^^
-     * And not:
-     *     $db = MDB2::singleton($dsn);
-     *          ^^
-     *
-     * @param   mixed   'data source name', see the MDB2::parseDSN
-     *                            method for a description of the dsn format.
-     *                            Can also be specified as an array of the
-     *                            format returned by MDB2::parseDSN.
-     * @param   array   An associative array of option names and
-     *                            their values.
-     *
-     * @return  mixed   a newly created MDB2 connection object, or a MDB2
-     *                  error object on error
-     *
-     * @access  public
-     * @see     MDB2::parseDSN
-     */
-    function &singleton($dsn = null, $options = false)
-    {
-        if ($dsn) {
-            $dsninfo = MDB2::parseDSN($dsn);
-            $dsninfo = array_merge($GLOBALS['_MDB2_dsninfo_default'], $dsninfo);
-            $keys = array_keys($GLOBALS['_MDB2_databases']);
-            for ($i=0, $j=count($keys); $i<$j; ++$i) {
-                if (isset($GLOBALS['_MDB2_databases'][$keys[$i]])) {
-                    $tmp_dsn = $GLOBALS['_MDB2_databases'][$keys[$i]]->getDSN('array');
-                    if (count(array_diff_assoc($tmp_dsn, $dsninfo)) == 0) {
-                        MDB2::setOptions($GLOBALS['_MDB2_databases'][$keys[$i]], $options);
-                        return $GLOBALS['_MDB2_databases'][$keys[$i]];
-                    }
-                }
-            }
-        } elseif (is_array($GLOBALS['_MDB2_databases']) && reset($GLOBALS['_MDB2_databases'])) {
-            $db =$GLOBALS['_MDB2_databases'][key($GLOBALS['_MDB2_databases'])];
-            return $db;
-        }
-        $db =MDB2::factory($dsn, $options);
-        return $db;
-    }
-
-    // }}}
-    // {{{ function areEquals()
-
-    /**
-     * It looks like there's a memory leak in array_diff() in PHP 5.1.x,
-     * so use this method instead.
-     * @see http://pear.php.net/bugs/bug.php?id=11790
-     *
-     * @param array $arr1
-     * @param array $arr2
-     * @return boolean
-     */
-    static function areEquals($arr1, $arr2)
-    {
-        if (count($arr1) != count($arr2)) {
-            return false;
-        }
-        foreach (array_keys($arr1) as $k) {
-            if (!array_key_exists($k, $arr2) || $arr1[$k] != $arr2[$k]) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ function loadFile($file)
-
-    /**
-     * load a file (like 'Date')
-     *
-     * @param   string  name of the file in the MDB2 directory (without '.php')
-     *
-     * @return  string  name of the file that was included
-     *
-     * @access  public
-     */
-    function loadFile($file)
-    {
-        $file_name = 'MDB2'.DIRECTORY_SEPARATOR.$file.'.php';
-        if (!MDB2::fileExists($file_name)) {
-            return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'unable to find: '.$file_name);
-        }
-        if (!include_once($file_name)) {
-            return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'unable to load driver class: '.$file_name);
-        }
-        return $file_name;
-    }
-
-    // }}}
-    // {{{ function apiVersion()
-
-    /**
-     * Return the MDB2 API version
-     *
-     * @return  string  the MDB2 API version number
-     *
-     * @access  public
-     */
-    function apiVersion()
-    {
-        return '2.5.0b2';
-    }
-
-    // }}}
-    // {{{ function &raiseError($code = null, $mode = null, $options = null, $userinfo = null)
-
-    /**
-     * This method is used to communicate an error and invoke error
-     * callbacks etc.  Basically a wrapper for PEAR::raiseError
-     * without the message string.
-     *
-     * @param   mixed  int error code
-     *
-     * @param   int    error mode, see PEAR_Error docs
-     *
-     * @param   mixed  If error mode is PEAR_ERROR_TRIGGER, this is the
-     *                 error level (E_USER_NOTICE etc).  If error mode is
-     *                 PEAR_ERROR_CALLBACK, this is the callback function,
-     *                 either as a function name, or as an array of an
-     *                 object and method name.  For other error modes this
-     *                 parameter is ignored.
-     *
-     * @param   string Extra debug information.  Defaults to the last
-     *                 query and native error code.
-     *
-     * @return PEAR_Error instance of a PEAR Error object
-     *
-     * @access  private
-     * @see     PEAR_Error
-     */
-    function raiseError($code = null,
-                         $mode = null,
-                         $options = null,
-                         $userinfo = null,
-                         $dummy1 = null,
-                         $dummy2 = null,
-                         $dummy3 = false)
-    {
-        $err =PEAR::raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true);
-        return $err;
-    }
-    static function raiseErrorStatic($code = null,
-                         $mode = null,
-                         $options = null,
-                         $userinfo = null,
-                         $dummy1 = null,
-                         $dummy2 = null,
-                         $dummy3 = false)
-    {
-	    $pear=new PEAR();
-        $err =$pear->raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true);
-        return $err;
-    }
-
-    // }}}
-    // {{{ function isError($data, $code = null)
-
-    /**
-     * Tell whether a value is a MDB2 error.
-     *
-     * @param   mixed   the value to test
-     * @param   int     if is an error object, return true
-     *                        only if $code is a string and
-     *                        $db->getMessage() == $code or
-     *                        $code is an integer and $db->getCode() == $code
-     *
-     * @return  bool    true if parameter is an error
-     *
-     * @access  public
-     */
-    static function isError($data, $code = null)
-    {
-        if ($data instanceof MDB2_Error) {
-            if (is_null($code)) {
-                return true;
-            } elseif (is_string($code)) {
-                return $data->getMessage() === $code;
-            } else {
-                $code = (array)$code;
-                return in_array($data->getCode(), $code);
-            }
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ function isConnection($value)
-
-    /**
-     * Tell whether a value is a MDB2 connection
-     *
-     * @param   mixed   value to test
-     *
-     * @return  bool    whether $value is a MDB2 connection
-     *
-     * @access  public
-     */
-    static function isConnection($value)
-    {
-        return ($value instanceof MDB2_Driver_Common);
-    }
-
-    // }}}
-    // {{{ function isResult($value)
-
-    /**
-     * Tell whether a value is a MDB2 result
-     *
-     * @param   mixed   value to test
-     *
-     * @return  bool    whether $value is a MDB2 result
-     *
-     * @access  public
-     */
-    static function isResult($value)
-    {
-        return $value instanceof MDB2_Result;
-    }
-
-    // }}}
-    // {{{ function isResultCommon($value)
-
-    /**
-     * Tell whether a value is a MDB2 result implementing the common interface
-     *
-     * @param   mixed   value to test
-     *
-     * @return  bool    whether $value is a MDB2 result implementing the common interface
-     *
-     * @access  public
-     */
-    static function isResultCommon($value)
-    {
-        return ($value instanceof MDB2_Result_Common);
-    }
-
-    // }}}
-    // {{{ function isStatement($value)
-
-    /**
-     * Tell whether a value is a MDB2 statement interface
-     *
-     * @param   mixed   value to test
-     *
-     * @return  bool    whether $value is a MDB2 statement interface
-     *
-     * @access  public
-     */
-    static function isStatement($value)
-    {
-        return $value instanceof MDB2_Statement_Common;
-    }
-
-    // }}}
-    // {{{ function errorMessage($value = null)
-
-    /**
-     * Return a textual error message for a MDB2 error code
-     *
-     * @param   int|array   integer error code,
-                                null to get the current error code-message map,
-                                or an array with a new error code-message map
-     *
-     * @return  string  error message, or false if the error code was
-     *                  not recognized
-     *
-     * @access  public
-     */
-    static function errorMessage($value = null)
-    {
-        static $errorMessages;
-
-        if (is_array($value)) {
-            $errorMessages = $value;
-            return MDB2_OK;
-        }
-
-        if (!isset($errorMessages)) {
-            $errorMessages = array(
-                MDB2_OK                       => 'no error',
-                MDB2_ERROR                    => 'unknown error',
-                MDB2_ERROR_ALREADY_EXISTS     => 'already exists',
-                MDB2_ERROR_CANNOT_CREATE      => 'can not create',
-                MDB2_ERROR_CANNOT_ALTER       => 'can not alter',
-                MDB2_ERROR_CANNOT_REPLACE     => 'can not replace',
-                MDB2_ERROR_CANNOT_DELETE      => 'can not delete',
-                MDB2_ERROR_CANNOT_DROP        => 'can not drop',
-                MDB2_ERROR_CONSTRAINT         => 'constraint violation',
-                MDB2_ERROR_CONSTRAINT_NOT_NULL=> 'null value violates not-null constraint',
-                MDB2_ERROR_DIVZERO            => 'division by zero',
-                MDB2_ERROR_INVALID            => 'invalid',
-                MDB2_ERROR_INVALID_DATE       => 'invalid date or time',
-                MDB2_ERROR_INVALID_NUMBER     => 'invalid number',
-                MDB2_ERROR_MISMATCH           => 'mismatch',
-                MDB2_ERROR_NODBSELECTED       => 'no database selected',
-                MDB2_ERROR_NOSUCHFIELD        => 'no such field',
-                MDB2_ERROR_NOSUCHTABLE        => 'no such table',
-                MDB2_ERROR_NOT_CAPABLE        => 'MDB2 backend not capable',
-                MDB2_ERROR_NOT_FOUND          => 'not found',
-                MDB2_ERROR_NOT_LOCKED         => 'not locked',
-                MDB2_ERROR_SYNTAX             => 'syntax error',
-                MDB2_ERROR_UNSUPPORTED        => 'not supported',
-                MDB2_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
-                MDB2_ERROR_INVALID_DSN        => 'invalid DSN',
-                MDB2_ERROR_CONNECT_FAILED     => 'connect failed',
-                MDB2_ERROR_NEED_MORE_DATA     => 'insufficient data supplied',
-                MDB2_ERROR_EXTENSION_NOT_FOUND=> 'extension not found',
-                MDB2_ERROR_NOSUCHDB           => 'no such database',
-                MDB2_ERROR_ACCESS_VIOLATION   => 'insufficient permissions',
-                MDB2_ERROR_LOADMODULE         => 'error while including on demand module',
-                MDB2_ERROR_TRUNCATED          => 'truncated',
-                MDB2_ERROR_DEADLOCK           => 'deadlock detected',
-                MDB2_ERROR_NO_PERMISSION      => 'no permission',
-                MDB2_ERROR_DISCONNECT_FAILED  => 'disconnect failed',
-            );
-        }
-
-        if (is_null($value)) {
-            return $errorMessages;
-        }
-
-        if (PEAR::isError($value)) {
-            $value = $value->getCode();
-        }
-
-        return isset($errorMessages[$value]) ?
-           $errorMessages[$value] : $errorMessages[MDB2_ERROR];
-    }
-
-    // }}}
-    // {{{ function parseDSN($dsn)
-
-    /**
-     * Parse a data source name.
-     *
-     * Additional keys can be added by appending a URI query string to the
-     * end of the DSN.
-     *
-     * The format of the supplied DSN is in its fullest form:
-     * <code>
-     *  phptype(dbsyntax)://username:password@protocol+hostspec/database?option=8&another=true
-     * </code>
-     *
-     * Most variations are allowed:
-     * <code>
-     *  phptype://username:password@protocol+hostspec:110//usr/db_file.db?mode=0644
-     *  phptype://username:password@hostspec/database_name
-     *  phptype://username:password@hostspec
-     *  phptype://username@hostspec
-     *  phptype://hostspec/database
-     *  phptype://hostspec
-     *  phptype(dbsyntax)
-     *  phptype
-     * </code>
-     *
-     * @param   string  Data Source Name to be parsed
-     *
-     * @return  array   an associative array with the following keys:
-     *  + phptype:  Database backend used in PHP (mysql, odbc etc.)
-     *  + dbsyntax: Database used with regards to SQL syntax etc.
-     *  + protocol: Communication protocol to use (tcp, unix etc.)
-     *  + hostspec: Host specification (hostname[:port])
-     *  + database: Database to use on the DBMS server
-     *  + username: User name for login
-     *  + password: Password for login
-     *
-     * @access  public
-     * @author  Tomas V.V.Cox <cox@idecnet.com>
-     */
-    static function parseDSN($dsn)
-    {
-        $parsed = $GLOBALS['_MDB2_dsninfo_default'];
-
-        if (is_array($dsn)) {
-            $dsn = array_merge($parsed, $dsn);
-            if (!$dsn['dbsyntax']) {
-                $dsn['dbsyntax'] = $dsn['phptype'];
-            }
-            return $dsn;
-        }
-
-        // Find phptype and dbsyntax
-        if (($pos = strpos($dsn, '://')) !== false) {
-            $str = substr($dsn, 0, $pos);
-            $dsn = substr($dsn, $pos + 3);
-        } else {
-            $str = $dsn;
-            $dsn = null;
-        }
-
-        // Get phptype and dbsyntax
-        // $str => phptype(dbsyntax)
-        if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
-            $parsed['phptype']  = $arr[1];
-            $parsed['dbsyntax'] = !$arr[2] ? $arr[1] : $arr[2];
-        } else {
-            $parsed['phptype']  = $str;
-            $parsed['dbsyntax'] = $str;
-        }
-
-        if (!count($dsn)) {
-            return $parsed;
-        }
-
-        // Get (if found): username and password
-        // $dsn => username:password@protocol+hostspec/database
-        if (($at = strrpos($dsn,'@')) !== false) {
-            $str = substr($dsn, 0, $at);
-            $dsn = substr($dsn, $at + 1);
-            if (($pos = strpos($str, ':')) !== false) {
-                $parsed['username'] = rawurldecode(substr($str, 0, $pos));
-                $parsed['password'] = rawurldecode(substr($str, $pos + 1));
-            } else {
-                $parsed['username'] = rawurldecode($str);
-            }
-        }
-
-        // Find protocol and hostspec
-
-        // $dsn => proto(proto_opts)/database
-        if (preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) {
-            $proto       = $match[1];
-            $proto_opts  = $match[2] ? $match[2] : false;
-            $dsn         = $match[3];
-
-        // $dsn => protocol+hostspec/database (old format)
-        } else {
-            if (strpos($dsn, '+') !== false) {
-                list($proto, $dsn) = explode('+', $dsn, 2);
-            }
-            if (   strpos($dsn, '//') === 0
-                && strpos($dsn, '/', 2) !== false
-                && $parsed['phptype'] == 'oci8'
-            ) {
-                //oracle's "Easy Connect" syntax:
-                //"username/password@[//]host[:port][/service_name]"
-                //e.g. "scott/tiger@//mymachine:1521/oracle"
-                $proto_opts = $dsn;
-                $dsn = substr($proto_opts, strrpos($proto_opts, '/') + 1);
-            } elseif (strpos($dsn, '/') !== false) {
-                list($proto_opts, $dsn) = explode('/', $dsn, 2);
-            } else {
-                $proto_opts = $dsn;
-                $dsn = null;
-            }
-        }
-
-        // process the different protocol options
-        $parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
-        $proto_opts = rawurldecode($proto_opts);
-        if (strpos($proto_opts, ':') !== false) {
-            list($proto_opts, $parsed['port']) = explode(':', $proto_opts);
-        }
-        if ($parsed['protocol'] == 'tcp') {
-            $parsed['hostspec'] = $proto_opts;
-        } elseif ($parsed['protocol'] == 'unix') {
-            $parsed['socket'] = $proto_opts;
-        }
-
-        // Get dabase if any
-        // $dsn => database
-        if ($dsn) {
-            // /database
-            if (($pos = strpos($dsn, '?')) === false) {
-                $parsed['database'] = $dsn;
-            // /database?param1=value1&param2=value2
-            } else {
-                $parsed['database'] = substr($dsn, 0, $pos);
-                $dsn = substr($dsn, $pos + 1);
-                if (strpos($dsn, '&') !== false) {
-                    $opts = explode('&', $dsn);
-                } else { // database?param1=value1
-                    $opts = array($dsn);
-                }
-                foreach ($opts as $opt) {
-                    list($key, $value) = explode('=', $opt);
-                    if (!isset($parsed[$key])) {
-                        // don't allow params overwrite
-                        $parsed[$key] = rawurldecode($value);
-                    }
-                }
-            }
-        }
-
-        return $parsed;
-    }
-
-    // }}}
-    // {{{ function fileExists($file)
-
-    /**
-     * Checks if a file exists in the include path
-     *
-     * @param   string  filename
-     *
-     * @return  bool    true success and false on error
-     *
-     * @access  public
-     */
-    static function fileExists($file)
-    {
-        // safe_mode does notwork with is_readable()
-        if (!@ini_get('safe_mode')) {
-             $dirs = explode(PATH_SEPARATOR, ini_get('include_path'));
-             array_unshift($dirs,OC::$SERVERROOT);
-             array_unshift($dirs,OC::$SERVERROOT. DIRECTORY_SEPARATOR .'inc');
-//              print_r($dirs);die();
-             foreach ($dirs as $dir) {
-                 if (is_readable($dir . DIRECTORY_SEPARATOR . $file)) {
-                     return true;
-                 }
-            }
-        } else {
-            $fp = @fopen($file, 'r', true);
-            if (is_resource($fp)) {
-                @fclose($fp);
-                return true;
-            }
-        }
-        return false;
-    }
-    // }}}
-}
-
-// }}}
-// {{{ class MDB2_Error extends PEAR_Error
-
-/**
- * MDB2_Error implements a class for reporting portable database error
- * messages.
- *
- * @package     MDB2
- * @category    Database
- * @author Stig Bakken <ssb@fast.no>
- */
-class MDB2_Error extends PEAR_Error
-{
-    // {{{ constructor: function MDB2_Error($code = MDB2_ERROR, $mode = PEAR_ERROR_RETURN, $level = E_USER_NOTICE, $debuginfo = null)
-
-    /**
-     * MDB2_Error constructor.
-     *
-     * @param   mixed   MDB2 error code, or string with error message.
-     * @param   int     what 'error mode' to operate in
-     * @param   int     what error level to use for $mode raPEAR_ERROR_TRIGGER
-     * @param   mixed   additional debug info, such as the last query
-     */
-    function MDB2_Error($code = MDB2_ERROR, $mode = PEAR_ERROR_RETURN,
-              $level = E_USER_NOTICE, $debuginfo = null, $dummy = null)
-    {
-        if (is_null($code)) {
-            $code = MDB2_ERROR;
-        }
-        $this->PEAR_Error('MDB2 Error: '.MDB2::errorMessage($code), $code,
-            $mode, $level, $debuginfo);
-    }
-
-    // }}}
-}
-
-// }}}
-// {{{ class MDB2_Driver_Common extends PEAR
-
-/**
- * MDB2_Driver_Common: Base class that is extended by each MDB2 driver
- *
- * @package     MDB2
- * @category    Database
- * @author      Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Common extends PEAR
-{
-    // {{{ Variables (Properties)
-
-    /**
-     * index of the MDB2 object within the $GLOBALS['_MDB2_databases'] array
-     * @var     int
-     * @access  public
-     */
-    var $db_index = 0;
-
-    /**
-     * DSN used for the next query
-     * @var     array
-     * @access  protected
-     */
-    var $dsn = array();
-
-    /**
-     * DSN that was used to create the current connection
-     * @var     array
-     * @access  protected
-     */
-    var $connected_dsn = array();
-
-    /**
-     * connection resource
-     * @var     mixed
-     * @access  protected
-     */
-    var $connection = 0;
-
-    /**
-     * if the current opened connection is a persistent connection
-     * @var     bool
-     * @access  protected
-     */
-    var $opened_persistent;
-
-    /**
-     * the name of the database for the next query
-     * @var     string
-     * @access  protected
-     */
-    var $database_name = '';
-
-    /**
-     * the name of the database currently selected
-     * @var     string
-     * @access  protected
-     */
-    var $connected_database_name = '';
-
-    /**
-     * server version information
-     * @var     string
-     * @access  protected
-     */
-    var $connected_server_info = '';
-
-    /**
-     * list of all supported features of the given driver
-     * @var     array
-     * @access  public
-     */
-    var $supported = array(
-        'sequences' => false,
-        'indexes' => false,
-        'affected_rows' => false,
-        'summary_functions' => false,
-        'order_by_text' => false,
-        'transactions' => false,
-        'savepoints' => false,
-        'current_id' => false,
-        'limit_queries' => false,
-        'LOBs' => false,
-        'replace' => false,
-        'sub_selects' => false,
-        'triggers' => false,
-        'auto_increment' => false,
-        'primary_key' => false,
-        'result_introspection' => false,
-        'prepared_statements' => false,
-        'identifier_quoting' => false,
-        'pattern_escaping' => false,
-        'new_link' => false,
-    );
-
-    /**
-     * Array of supported options that can be passed to the MDB2 instance.
-     * 
-     * The options can be set during object creation, using
-     * MDB2::connect(), MDB2::factory() or MDB2::singleton(). The options can 
-     * also be set after the object is created, using MDB2::setOptions() or 
-     * MDB2_Driver_Common::setOption().
-     * The list of available option includes:
-     * <ul>
-     *  <li>$options['ssl'] -> boolean: determines if ssl should be used for connections</li>
-     *  <li>$options['field_case'] -> CASE_LOWER|CASE_UPPER: determines what case to force on field/table names</li>
-     *  <li>$options['disable_query'] -> boolean: determines if queries should be executed</li>
-     *  <li>$options['result_class'] -> string: class used for result sets</li>
-     *  <li>$options['buffered_result_class'] -> string: class used for buffered result sets</li>
-     *  <li>$options['result_wrap_class'] -> string: class used to wrap result sets into</li>
-     *  <li>$options['result_buffering'] -> boolean should results be buffered or not?</li>
-     *  <li>$options['fetch_class'] -> string: class to use when fetch mode object is used</li>
-     *  <li>$options['persistent'] -> boolean: persistent connection?</li>
-     *  <li>$options['debug'] -> integer: numeric debug level</li>
-     *  <li>$options['debug_handler'] -> string: function/method that captures debug messages</li>
-     *  <li>$options['debug_expanded_output'] -> bool: BC option to determine if more context information should be send to the debug handler</li>
-     *  <li>$options['default_text_field_length'] -> integer: default text field length to use</li>
-     *  <li>$options['lob_buffer_length'] -> integer: LOB buffer length</li>
-     *  <li>$options['log_line_break'] -> string: line-break format</li>
-     *  <li>$options['idxname_format'] -> string: pattern for index name</li>
-     *  <li>$options['seqname_format'] -> string: pattern for sequence name</li>
-     *  <li>$options['savepoint_format'] -> string: pattern for auto generated savepoint names</li>
-     *  <li>$options['statement_format'] -> string: pattern for prepared statement names</li>
-     *  <li>$options['seqcol_name'] -> string: sequence column name</li>
-     *  <li>$options['quote_identifier'] -> boolean: if identifier quoting should be done when check_option is used</li>
-     *  <li>$options['use_transactions'] -> boolean: if transaction use should be enabled</li>
-     *  <li>$options['decimal_places'] -> integer: number of decimal places to handle</li>
-     *  <li>$options['portability'] -> integer: portability constant</li>
-     *  <li>$options['modules'] -> array: short to long module name mapping for __call()</li>
-     *  <li>$options['emulate_prepared'] -> boolean: force prepared statements to be emulated</li>
-     *  <li>$options['datatype_map'] -> array: map user defined datatypes to other primitive datatypes</li>
-     *  <li>$options['datatype_map_callback'] -> array: callback function/method that should be called</li>
-     *  <li>$options['bindname_format'] -> string: regular expression pattern for named parameters</li>
-     *  <li>$options['multi_query'] -> boolean: determines if queries returning multiple result sets should be executed</li>
-     *  <li>$options['max_identifiers_length'] -> integer: max identifier length</li>
-     *  <li>$options['default_fk_action_onupdate'] -> string: default FOREIGN KEY ON UPDATE action ['RESTRICT'|'NO ACTION'|'SET DEFAULT'|'SET NULL'|'CASCADE']</li>
-     *  <li>$options['default_fk_action_ondelete'] -> string: default FOREIGN KEY ON DELETE action ['RESTRICT'|'NO ACTION'|'SET DEFAULT'|'SET NULL'|'CASCADE']</li>
-     * </ul>
-     *
-     * @var     array
-     * @access  public
-     * @see     MDB2::connect()
-     * @see     MDB2::factory()
-     * @see     MDB2::singleton()
-     * @see     MDB2_Driver_Common::setOption()
-     */
-    var $options = array(
-        'ssl' => false,
-        'field_case' => CASE_LOWER,
-        'disable_query' => false,
-        'result_class' => 'MDB2_Result_%s',
-        'buffered_result_class' => 'MDB2_BufferedResult_%s',
-        'result_wrap_class' => false,
-        'result_buffering' => true,
-        'fetch_class' => 'stdClass',
-        'persistent' => false,
-        'debug' => 0,
-        'debug_handler' => 'MDB2_defaultDebugOutput',
-        'debug_expanded_output' => false,
-        'default_text_field_length' => 4096,
-        'lob_buffer_length' => 8192,
-        'log_line_break' => "\n",
-        'idxname_format' => '%s_idx',
-        'seqname_format' => '%s_seq',
-        'savepoint_format' => 'MDB2_SAVEPOINT_%s',
-        'statement_format' => 'MDB2_STATEMENT_%1$s_%2$s',
-        'seqcol_name' => 'sequence',
-        'quote_identifier' => false,
-        'use_transactions' => true,
-        'decimal_places' => 2,
-        'portability' => MDB2_PORTABILITY_ALL,
-        'modules' => array(
-            'ex' => 'Extended',
-            'dt' => 'Datatype',
-            'mg' => 'Manager',
-            'rv' => 'Reverse',
-            'na' => 'Native',
-            'fc' => 'Function',
-        ),
-        'emulate_prepared' => false,
-        'datatype_map' => array(),
-        'datatype_map_callback' => array(),
-        'nativetype_map_callback' => array(),
-        'lob_allow_url_include' => false,
-        'bindname_format' => '(?:\d+)|(?:[a-zA-Z][a-zA-Z0-9_]*)',
-        'max_identifiers_length' => 30,
-        'default_fk_action_onupdate' => 'RESTRICT',
-        'default_fk_action_ondelete' => 'RESTRICT',
-    );
-
-    /**
-     * string array
-     * @var     string
-     * @access  protected
-     */
-    var $string_quoting = array('start' => "'", 'end' => "'", 'escape' => false, 'escape_pattern' => false);
-
-    /**
-     * identifier quoting
-     * @var     array
-     * @access  protected
-     */
-    var $identifier_quoting = array('start' => '"', 'end' => '"', 'escape' => '"');
-
-    /**
-     * sql comments
-     * @var     array
-     * @access  protected
-     */
-    var $sql_comments = array(
-        array('start' => '--', 'end' => "\n", 'escape' => false),
-        array('start' => '/*', 'end' => '*/', 'escape' => false),
-    );
-
-    /**
-     * comparision wildcards
-     * @var     array
-     * @access  protected
-     */
-    var $wildcards = array('%', '_');
-
-    /**
-     * column alias keyword
-     * @var     string
-     * @access  protected
-     */
-    var $as_keyword = ' AS ';
-
-    /**
-     * warnings
-     * @var     array
-     * @access  protected
-     */
-    var $warnings = array();
-
-    /**
-     * string with the debugging information
-     * @var     string
-     * @access  public
-     */
-    var $debug_output = '';
-
-    /**
-     * determine if there is an open transaction
-     * @var     bool
-     * @access  protected
-     */
-    var $in_transaction = false;
-
-    /**
-     * the smart transaction nesting depth
-     * @var     int
-     * @access  protected
-     */
-    var $nested_transaction_counter = null;
-
-    /**
-     * the first error that occured inside a nested transaction
-     * @var     MDB2_Error|bool
-     * @access  protected
-     */
-    var $has_transaction_error = false;
-
-    /**
-     * result offset used in the next query
-     * @var     int
-     * @access  protected
-     */
-    var $offset = 0;
-
-    /**
-     * result limit used in the next query
-     * @var     int
-     * @access  protected
-     */
-    var $limit = 0;
-
-    /**
-     * Database backend used in PHP (mysql, odbc etc.)
-     * @var     string
-     * @access  public
-     */
-    var $phptype;
-
-    /**
-     * Database used with regards to SQL syntax etc.
-     * @var     string
-     * @access  public
-     */
-    var $dbsyntax;
-
-    /**
-     * the last query sent to the driver
-     * @var     string
-     * @access  public
-     */
-    var $last_query;
-
-    /**
-     * the default fetchmode used
-     * @var     int
-     * @access  protected
-     */
-    var $fetchmode = MDB2_FETCHMODE_ORDERED;
-
-    /**
-     * array of module instances
-     * @var     array
-     * @access  protected
-     */
-    var $modules = array();
-
-    /**
-     * determines of the PHP4 destructor emulation has been enabled yet
-     * @var     array
-     * @access  protected
-     */
-    var $destructor_registered = true;
-
-    // }}}
-    // {{{ constructor: function __construct()
-
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
-        end($GLOBALS['_MDB2_databases']);
-        $db_index = key($GLOBALS['_MDB2_databases']) + 1;
-        $GLOBALS['_MDB2_databases'][$db_index] = &$this;
-        $this->db_index = $db_index;
-    }
-
-
-    // }}}
-    // {{{ destructor: function __destruct()
-
-    /**
-     *  Destructor
-     */
-    function __destruct()
-    {
-        $this->disconnect(false);
-    }
-
-    // }}}
-    // {{{ function free()
-
-    /**
-     * Free the internal references so that the instance can be destroyed
-     *
-     * @return  bool    true on success, false if result is invalid
-     *
-     * @access  public
-     */
-    function free()
-    {
-        unset($GLOBALS['_MDB2_databases'][$this->db_index]);
-        unset($this->db_index);
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function __toString()
-
-    /**
-     * String conversation
-     *
-     * @return  string representation of the object
-     *
-     * @access  public
-     */
-    function __toString()
-    {
-        $info = get_class($this);
-        $info.= ': (phptype = '.$this->phptype.', dbsyntax = '.$this->dbsyntax.')';
-        if ($this->connection) {
-            $info.= ' [connected]';
-        }
-        return $info;
-    }
-
-    // }}}
-    // {{{ function errorInfo($error = null)
-
-    /**
-     * This method is used to collect information about an error
-     *
-     * @param   mixed   error code or resource
-     *
-     * @return  array   with MDB2 errorcode, native error code, native message
-     *
-     * @access  public
-     */
-    function errorInfo($error = null)
-    {
-        return array($error, null, null);
-    }
-
-    // }}}
-    // {{{ function &raiseError($code = null, $mode = null, $options = null, $userinfo = null)
-
-    /**
-     * This method is used to communicate an error and invoke error
-     * callbacks etc.  Basically a wrapper for PEAR::raiseError
-     * without the message string.
-     *
-     * @param mixed  $code     integer error code, or a PEAR error object (all 
-     *                         other parameters are ignored if this parameter is
-     *                         an object
-     * @param int    $mode     error mode, see PEAR_Error docs
-     * @param mixed  $options  If error mode is PEAR_ERROR_TRIGGER, this is the
-     *                         error level (E_USER_NOTICE etc). If error mode is
-     *                         PEAR_ERROR_CALLBACK, this is the callback function,
-     *                         either as a function name, or as an array of an
-     *                         object and method name. For other error modes this
-     *                         parameter is ignored.
-     * @param string $userinfo Extra debug information. Defaults to the last
-     *                         query and native error code.
-     * @param string $method   name of the method that triggered the error
-     * @param string $dummy1   not used
-     * @param bool   $dummy2   not used
-     *
-     * @return PEAR_Error instance of a PEAR Error object
-     * @access public
-     * @see    PEAR_Error
-     */
-    function raiseError($code = null,
-                         $mode = null,
-                         $options = null,
-                         $userinfo = null,
-                         $method = null,
-                         $dummy1 = null,
-                         $dummy2 = false
-    ) {
-        $userinfo = "[Error message: $userinfo]\n";
-        // The error is yet a MDB2 error object
-        if (PEAR::isError($code)) {
-            // because we use the static PEAR::raiseError, our global
-            // handler should be used if it is set
-            if (is_null($mode) && !empty($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
-            }
-            if (is_null($userinfo)) {
-                $userinfo = $code->getUserinfo();
-            }
-            $code = $code->getCode();
-        } elseif ($code == MDB2_ERROR_NOT_FOUND) {
-            // extension not loaded: don't call $this->errorInfo() or the script
-            // will die
-        } elseif (isset($this->connection)) {
-            if (!empty($this->last_query)) {
-                $userinfo.= "[Last executed query: {$this->last_query}]\n";
-            }
-            $native_errno = $native_msg = null;
-            list($code, $native_errno, $native_msg) = $this->errorInfo($code);
-            if (!is_null($native_errno) && $native_errno !== '') {
-                $userinfo.= "[Native code: $native_errno]\n";
-            }
-            if (!is_null($native_msg) && $native_msg !== '') {
-                $userinfo.= "[Native message: ". strip_tags($native_msg) ."]\n";
-            }
-            echo $userinfo;
-            if (!is_null($method)) {
-                $userinfo = $method.': '.$userinfo;
-            }
-        }
-
-        $err = PEAR::raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true);
-        if ($err->getMode() !== PEAR_ERROR_RETURN
-            && isset($this->nested_transaction_counter) && !$this->has_transaction_error) {
-            $this->has_transaction_error =$err;
-        }
-        return $err;
-    }
-
-    // }}}
-    // {{{ function resetWarnings()
-
-    /**
-     * reset the warning array
-     *
-     * @return void
-     *
-     * @access  public
-     */
-    function resetWarnings()
-    {
-        $this->warnings = array();
-    }
-
-    // }}}
-    // {{{ function getWarnings()
-
-    /**
-     * Get all warnings in reverse order.
-     * This means that the last warning is the first element in the array
-     *
-     * @return  array   with warnings
-     *
-     * @access  public
-     * @see     resetWarnings()
-     */
-    function getWarnings()
-    {
-        return array_reverse($this->warnings);
-    }
-
-    // }}}
-    // {{{ function setFetchMode($fetchmode, $object_class = 'stdClass')
-
-    /**
-     * Sets which fetch mode should be used by default on queries
-     * on this connection
-     *
-     * @param   int     MDB2_FETCHMODE_ORDERED, MDB2_FETCHMODE_ASSOC
-     *                               or MDB2_FETCHMODE_OBJECT
-     * @param   string  the class name of the object to be returned
-     *                               by the fetch methods when the
-     *                               MDB2_FETCHMODE_OBJECT mode is selected.
-     *                               If no class is specified by default a cast
-     *                               to object from the assoc array row will be
-     *                               done.  There is also the possibility to use
-     *                               and extend the 'MDB2_row' class.
-     *
-     * @return  mixed   MDB2_OK or MDB2 Error Object
-     *
-     * @access  public
-     * @see     MDB2_FETCHMODE_ORDERED, MDB2_FETCHMODE_ASSOC, MDB2_FETCHMODE_OBJECT
-     */
-    function setFetchMode($fetchmode, $object_class = 'stdClass')
-    {
-        switch ($fetchmode) {
-        case MDB2_FETCHMODE_OBJECT:
-            $this->options['fetch_class'] = $object_class;
-        case MDB2_FETCHMODE_ORDERED:
-        case MDB2_FETCHMODE_ASSOC:
-            $this->fetchmode = $fetchmode;
-            break;
-        default:
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'invalid fetchmode mode', __FUNCTION__);
-        }
-
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function setOption($option, $value)
-
-    /**
-     * set the option for the db class
-     *
-     * @param   string  option name
-     * @param   mixed   value for the option
-     *
-     * @return  mixed   MDB2_OK or MDB2 Error Object
-     *
-     * @access  public
-     */
-    function setOption($option, $value)
-    {
-        if (array_key_exists($option, $this->options)) {
-            $this->options[$option] = $value;
-            return MDB2_OK;
-        }
-        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            "unknown option $option", __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ function getOption($option)
-
-    /**
-     * Returns the value of an option
-     *
-     * @param   string  option name
-     *
-     * @return  mixed   the option value or error object
-     *
-     * @access  public
-     */
-    function getOption($option)
-    {
-        if (array_key_exists($option, $this->options)) {
-            return $this->options[$option];
-        }
-        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            "unknown option $option", __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ function debug($message, $scope = '', $is_manip = null)
-
-    /**
-     * set a debug message
-     *
-     * @param   string  message that should be appended to the debug variable
-     * @param   string  usually the method name that triggered the debug call:
-     *                  for example 'query', 'prepare', 'execute', 'parameters',
-     *                  'beginTransaction', 'commit', 'rollback'
-     * @param   array   contains context information about the debug() call
-     *                  common keys are: is_manip, time, result etc.
-     *
-     * @return void
-     *
-     * @access  public
-     */
-    function debug($message, $scope = '', $context = array())
-    {
-        if ($this->options['debug'] && $this->options['debug_handler']) {
-            if (!$this->options['debug_expanded_output']) {
-                if (!empty($context['when']) && $context['when'] !== 'pre') {
-                    return null;
-                }
-                $context = empty($context['is_manip']) ? false : $context['is_manip'];
-            }
-            return call_user_func_array($this->options['debug_handler'], array(&$this, $scope, $message, $context));
-        }
-        return null;
-    }
-
-    // }}}
-    // {{{ function getDebugOutput()
-
-    /**
-     * output debug info
-     *
-     * @return  string  content of the debug_output class variable
-     *
-     * @access  public
-     */
-    function getDebugOutput()
-    {
-        return $this->debug_output;
-    }
-
-    // }}}
-    // {{{ function escape($text)
-
-    /**
-     * Quotes a string so it can be safely used in a query. It will quote
-     * the text so it can safely be used within a query.
-     *
-     * @param   string  the input string to quote
-     * @param   bool    escape wildcards
-     *
-     * @return  string  quoted string
-     *
-     * @access  public
-     */
-    function escape($text, $escape_wildcards = false)
-    {
-        if ($escape_wildcards) {
-            $text = $this->escapePattern($text);
-        }
-
-        $text = str_replace($this->string_quoting['end'], $this->string_quoting['escape'] . $this->string_quoting['end'], $text);
-        return $text;
-    }
-
-    // }}}
-    // {{{ function escapePattern($text)
-
-    /**
-     * Quotes pattern (% and _) characters in a string)
-     *
-     * @param   string  the input string to quote
-     *
-     * @return  string  quoted string
-     *
-     * @access  public
-     */
-    function escapePattern($text)
-    {
-        if ($this->string_quoting['escape_pattern']) {
-            $text = str_replace($this->string_quoting['escape_pattern'], $this->string_quoting['escape_pattern'] . $this->string_quoting['escape_pattern'], $text);
-            foreach ($this->wildcards as $wildcard) {
-                $text = str_replace($wildcard, $this->string_quoting['escape_pattern'] . $wildcard, $text);
-            }
-        }
-        return $text;
-    }
-
-    // }}}
-    // {{{ function quoteIdentifier($str, $check_option = false)
-
-    /**
-     * Quote a string so it can be safely used as a table or column name
-     *
-     * Delimiting style depends on which database driver is being used.
-     *
-     * NOTE: just because you CAN use delimited identifiers doesn't mean
-     * you SHOULD use them.  In general, they end up causing way more
-     * problems than they solve.
-     *
-     * NOTE: if you have table names containing periods, don't use this method
-     * (@see bug #11906)
-     *
-     * Portability is broken by using the following characters inside
-     * delimited identifiers:
-     *   + backtick (<kbd>`</kbd>) -- due to MySQL
-     *   + double quote (<kbd>"</kbd>) -- due to Oracle
-     *   + brackets (<kbd>[</kbd> or <kbd>]</kbd>) -- due to Access
-     *
-     * Delimited identifiers are known to generally work correctly under
-     * the following drivers:
-     *   + mssql
-     *   + mysql
-     *   + mysqli
-     *   + oci8
-     *   + pgsql
-     *   + sqlite
-     *
-     * InterBase doesn't seem to be able to use delimited identifiers
-     * via PHP 4.  They work fine under PHP 5.
-     *
-     * @param   string  identifier name to be quoted
-     * @param   bool    check the 'quote_identifier' option
-     *
-     * @return  string  quoted identifier string
-     *
-     * @access  public
-     */
-    function quoteIdentifier($str, $check_option = false)
-    {
-        if ($check_option && !$this->options['quote_identifier']) {
-            return $str;
-        }
-        $str = str_replace($this->identifier_quoting['end'], $this->identifier_quoting['escape'] . $this->identifier_quoting['end'], $str);
-        $parts = explode('.', $str);
-        foreach (array_keys($parts) as $k) {
-            $parts[$k] = $this->identifier_quoting['start'] . $parts[$k] . $this->identifier_quoting['end'];
-        }
-        return implode('.', $parts);
-    }
-
-    // }}}
-    // {{{ function getAsKeyword()
-
-    /**
-     * Gets the string to alias column
-     *
-     * @return string to use when aliasing a column
-     */
-    function getAsKeyword()
-    {
-        return $this->as_keyword;
-    }
-
-    // }}}
-    // {{{ function getConnection()
-
-    /**
-     * Returns a native connection
-     *
-     * @return  mixed   a valid MDB2 connection object,
-     *                  or a MDB2 error object on error
-     *
-     * @access  public
-     */
-    function getConnection()
-    {
-        $result = $this->connect();
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        return $this->connection;
-    }
-
-     // }}}
-    // {{{ function _fixResultArrayValues(&$row, $mode)
-
-    /**
-     * Do all necessary conversions on result arrays to fix DBMS quirks
-     *
-     * @param   array   the array to be fixed (passed by reference)
-     * @param   array   bit-wise addition of the required portability modes
-     *
-     * @return  void
-     *
-     * @access  protected
-     */
-    function _fixResultArrayValues(&$row, $mode)
-    {
-        switch ($mode) {
-        case MDB2_PORTABILITY_EMPTY_TO_NULL:
-            foreach ($row as $key => $value) {
-                if ($value === '') {
-                    $row[$key] = null;
-                }
-            }
-            break;
-        case MDB2_PORTABILITY_RTRIM:
-            foreach ($row as $key => $value) {
-                if (is_string($value)) {
-                    $row[$key] = rtrim($value);
-                }
-            }
-            break;
-        case MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES:
-            $tmp_row = array();
-            foreach ($row as $key => $value) {
-                $tmp_row[preg_replace('/^(?:.*\.)?([^.]+)$/', '\\1', $key)] = $value;
-            }
-            $row = $tmp_row;
-            break;
-        case (MDB2_PORTABILITY_RTRIM + MDB2_PORTABILITY_EMPTY_TO_NULL):
-            foreach ($row as $key => $value) {
-                if ($value === '') {
-                    $row[$key] = null;
-                } elseif (is_string($value)) {
-                    $row[$key] = rtrim($value);
-                }
-            }
-            break;
-        case (MDB2_PORTABILITY_RTRIM + MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES):
-            $tmp_row = array();
-            foreach ($row as $key => $value) {
-                if (is_string($value)) {
-                    $value = rtrim($value);
-                }
-                $tmp_row[preg_replace('/^(?:.*\.)?([^.]+)$/', '\\1', $key)] = $value;
-            }
-            $row = $tmp_row;
-            break;
-        case (MDB2_PORTABILITY_EMPTY_TO_NULL + MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES):
-            $tmp_row = array();
-            foreach ($row as $key => $value) {
-                if ($value === '') {
-                    $value = null;
-                }
-                $tmp_row[preg_replace('/^(?:.*\.)?([^.]+)$/', '\\1', $key)] = $value;
-            }
-            $row = $tmp_row;
-            break;
-        case (MDB2_PORTABILITY_RTRIM + MDB2_PORTABILITY_EMPTY_TO_NULL + MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES):
-            $tmp_row = array();
-            foreach ($row as $key => $value) {
-                if ($value === '') {
-                    $value = null;
-                } elseif (is_string($value)) {
-                    $value = rtrim($value);
-                }
-                $tmp_row[preg_replace('/^(?:.*\.)?([^.]+)$/', '\\1', $key)] = $value;
-            }
-            $row = $tmp_row;
-            break;
-        }
-    }
-
-    // }}}
-    // {{{ function &loadModule($module, $property = null, $phptype_specific = null)
-
-    /**
-     * loads a module
-     *
-     * @param   string  name of the module that should be loaded
-     *                  (only used for error messages)
-     * @param   string  name of the property into which the class will be loaded
-     * @param   bool    if the class to load for the module is specific to the
-     *                  phptype
-     *
-     * @return  object  on success a reference to the given module is returned
-     *                  and on failure a PEAR error
-     *
-     * @access  public
-     */
-    function &loadModule($module, $property = null, $phptype_specific = null)
-    {
-        if (!$property) {
-            $property = strtolower($module);
-        }
-
-        if (!isset($this->{$property})) {
-            $version = $phptype_specific;
-            if ($phptype_specific !== false) {
-                $version = true;
-                $class_name = 'MDB2_Driver_'.$module.'_'.$this->phptype;
-                $file_name = str_replace('_', DIRECTORY_SEPARATOR, $class_name).'.php';
-            }
-            if ($phptype_specific === false
-                || (!MDB2::classExists($class_name) && !MDB2::fileExists($file_name))
-            ) {
-                $version = false;
-                $class_name = 'MDB2_'.$module;
-                $file_name = str_replace('_', DIRECTORY_SEPARATOR, $class_name).'.php';
-            }
-
-            $err = MDB2::loadClass($class_name, $this->getOption('debug'));
-            if (PEAR::isError($err)) {
-                return $err;
-            }
-            // load module in a specific version
-            if ($version) {
-                if (method_exists($class_name, 'getClassName')) {
-                    $class_name_new = call_user_func(array($class_name, 'getClassName'), $this->db_index);
-                    if ($class_name != $class_name_new) {
-                        $class_name = $class_name_new;
-                        $err = MDB2::loadClass($class_name, $this->getOption('debug'));
-                        if (PEAR::isError($err)) {
-                            return $err;
-                        }
-                    }
-                }
-            }
-
-            if (!MDB2::classExists($class_name)) {
-                $err =$this->raiseError(MDB2_ERROR_LOADMODULE, null, null,
-                    "unable to load module '$module' into property '$property'", __FUNCTION__);
-                return $err;
-            }
-            $this->{$property} = new $class_name($this->db_index);
-            $this->modules[$module] =$this->{$property};
-            if ($version) {
-                // this will be used in the connect method to determine if the module
-                // needs to be loaded with a different version if the server
-                // version changed in between connects
-                $this->loaded_version_modules[] = $property;
-            }
-        }
-
-        return $this->{$property};
-    }
-
-    // }}}
-    // {{{ function __call($method, $params)
-
-    /**
-     * Calls a module method using the __call magic method
-     *
-     * @param   string  Method name.
-     * @param   array   Arguments.
-     *
-     * @return  mixed   Returned value.
-     */
-    function __call($method, $params)
-    {
-        $module = null;
-        if (preg_match('/^([a-z]+)([A-Z])(.*)$/', $method, $match)
-            && isset($this->options['modules'][$match[1]])
-        ) {
-            $module = $this->options['modules'][$match[1]];
-            $method = strtolower($match[2]).$match[3];
-            if (!isset($this->modules[$module]) || !is_object($this->modules[$module])) {
-                $result =& $this->loadModule($module);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
-        } else {
-            foreach ($this->modules as $key => $foo) {
-                if (is_object($this->modules[$key])
-                    && method_exists($this->modules[$key], $method)
-                ) {
-                    $module = $key;
-                    break;
-                }
-            }
-        }
-        if (!is_null($module)) {
-            return call_user_func_array(array(&$this->modules[$module], $method), $params);
-        }
-        trigger_error(sprintf('Call to undefined function: %s::%s().', get_class($this), $method), E_USER_ERROR);
-    }
-
-    // }}}
-    // {{{ function beginTransaction($savepoint = null)
-
-    /**
-     * Start a transaction or set a savepoint.
-     *
-     * @param   string  name of a savepoint to set
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function beginTransaction($savepoint = null)
-    {
-        $this->debug('Starting transaction', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
-        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'transactions are not supported', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ function commit($savepoint = null)
-
-    /**
-     * Commit the database changes done during a transaction that is in
-     * progress or release a savepoint. This function may only be called when
-     * auto-committing is disabled, otherwise it will fail. Therefore, a new
-     * transaction is implicitly started after committing the pending changes.
-     *
-     * @param   string  name of a savepoint to release
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function commit($savepoint = null)
-    {
-        $this->debug('Committing transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
-        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'commiting transactions is not supported', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ function rollback($savepoint = null)
-
-    /**
-     * Cancel any database changes done during a transaction or since a specific
-     * savepoint that is in progress. This function may only be called when
-     * auto-committing is disabled, otherwise it will fail. Therefore, a new
-     * transaction is implicitly started after canceling the pending changes.
-     *
-     * @param   string  name of a savepoint to rollback to
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function rollback($savepoint = null)
-    {
-        $this->debug('Rolling back transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
-        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'rolling back transactions is not supported', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ function inTransaction($ignore_nested = false)
-
-    /**
-     * If a transaction is currently open.
-     *
-     * @param   bool    if the nested transaction count should be ignored
-     * @return  int|bool    - an integer with the nesting depth is returned if a
-     *                      nested transaction is open
-     *                      - true is returned for a normal open transaction
-     *                      - false is returned if no transaction is open
-     *
-     * @access  public
-     */
-    function inTransaction($ignore_nested = false)
-    {
-        if (!$ignore_nested && isset($this->nested_transaction_counter)) {
-            return $this->nested_transaction_counter;
-        }
-        return $this->in_transaction;
-    }
-
-    // }}}
-    // {{{ function setTransactionIsolation($isolation)
-
-    /**
-     * Set the transacton isolation level.
-     *
-     * @param   string  standard isolation level
-     *                  READ UNCOMMITTED (allows dirty reads)
-     *                  READ COMMITTED (prevents dirty reads)
-     *                  REPEATABLE READ (prevents nonrepeatable reads)
-     *                  SERIALIZABLE (prevents phantom reads)
-     * @param   array some transaction options:
-     *                  'wait' => 'WAIT' | 'NO WAIT'
-     *                  'rw'   => 'READ WRITE' | 'READ ONLY'
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     * @since   2.1.1
-     */
-    static function setTransactionIsolation($isolation, $options = array())
-    {
-        $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true));
-        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'isolation level setting is not supported', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ function beginNestedTransaction($savepoint = false)
-
-    /**
-     * Start a nested transaction.
-     *
-     * @return  mixed   MDB2_OK on success/savepoint name, a MDB2 error on failure
-     *
-     * @access  public
-     * @since   2.1.1
-     */
-    function beginNestedTransaction()
-    {
-        if ($this->in_transaction) {
-            ++$this->nested_transaction_counter;
-            $savepoint = sprintf($this->options['savepoint_format'], $this->nested_transaction_counter);
-            if ($this->supports('savepoints') && $savepoint) {
-                return $this->beginTransaction($savepoint);
-            }
-            return MDB2_OK;
-        }
-        $this->has_transaction_error = false;
-        $result = $this->beginTransaction();
-        $this->nested_transaction_counter = 1;
-        return $result;
-    }
-
-    // }}}
-    // {{{ function completeNestedTransaction($force_rollback = false, $release = false)
-
-    /**
-     * Finish a nested transaction by rolling back if an error occured or
-     * committing otherwise.
-     *
-     * @param   bool    if the transaction should be rolled back regardless
-     *                  even if no error was set within the nested transaction
-     * @return  mixed   MDB_OK on commit/counter decrementing, false on rollback
-     *                  and a MDB2 error on failure
-     *
-     * @access  public
-     * @since   2.1.1
-     */
-    function completeNestedTransaction($force_rollback = false)
-    {
-        if ($this->nested_transaction_counter > 1) {
-            $savepoint = sprintf($this->options['savepoint_format'], $this->nested_transaction_counter);
-            if ($this->supports('savepoints') && $savepoint) {
-                if ($force_rollback || $this->has_transaction_error) {
-                    $result = $this->rollback($savepoint);
-                    if (!PEAR::isError($result)) {
-                        $result = false;
-                        $this->has_transaction_error = false;
-                    }
-                } else {
-                    $result = $this->commit($savepoint);
-                }
-            } else {
-                $result = MDB2_OK;
-            }
-            --$this->nested_transaction_counter;
-            return $result;
-        }
-
-        $this->nested_transaction_counter = null;
-        $result = MDB2_OK;
-
-        // transaction has not yet been rolled back
-        if ($this->in_transaction) {
-            if ($force_rollback || $this->has_transaction_error) {
-                $result = $this->rollback();
-                if (!PEAR::isError($result)) {
-                    $result = false;
-                }
-            } else {
-                $result = $this->commit();
-            }
-        }
-        $this->has_transaction_error = false;
-        return $result;
-    }
-
-    // }}}
-    // {{{ function failNestedTransaction($error = null, $immediately = false)
-
-    /**
-     * Force setting nested transaction to failed.
-     *
-     * @param   mixed   value to return in getNestededTransactionError()
-     * @param   bool    if the transaction should be rolled back immediately
-     * @return  bool    MDB2_OK
-     *
-     * @access  public
-     * @since   2.1.1
-     */
-    function failNestedTransaction($error = null, $immediately = false)
-    {
-        if (is_null($error)) {
-            $error = $this->has_transaction_error ? $this->has_transaction_error : true;
-        } elseif (!$error) {
-            $error = true;
-        }
-        $this->has_transaction_error = $error;
-        if (!$immediately) {
-            return MDB2_OK;
-        }
-        return $this->rollback();
-    }
-
-    // }}}
-    // {{{ function getNestedTransactionError()
-
-    /**
-     * The first error that occured since the transaction start.
-     *
-     * @return  MDB2_Error|bool     MDB2 error object if an error occured or false.
-     *
-     * @access  public
-     * @since   2.1.1
-     */
-    function getNestedTransactionError()
-    {
-        return $this->has_transaction_error;
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database
-     *
-     * @return true on success, MDB2 Error Object on failure
-     */
-    function connect()
-    {
-        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ databaseExists()
-
-    /**
-     * check if given database name is exists?
-     *
-     * @param string $name    name of the database that should be checked
-     *
-     * @return mixed true/false on success, a MDB2 error on failure
-     * @access public
-     */
-    function databaseExists($name)
-    {
-        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ setCharset($charset, $connection = null)
-
-    /**
-     * Set the charset on the current connection
-     *
-     * @param string    charset
-     * @param resource  connection handle
-     *
-     * @return true on success, MDB2 Error Object on failure
-     */
-    function setCharset($charset, $connection = null)
-    {
-        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ function disconnect($force = true)
-
-    /**
-     * Log out and disconnect from the database.
-     *
-     * @param boolean $force whether the disconnect should be forced even if the
-     *                       connection is opened persistently
-     *
-     * @return mixed true on success, false if not connected and error object on error
-     *
-     * @access  public
-     */
-    function disconnect($force = true)
-    {
-        $this->connection = 0;
-        $this->connected_dsn = array();
-        $this->connected_database_name = '';
-        $this->opened_persistent = null;
-        $this->connected_server_info = '';
-        $this->in_transaction = null;
-        $this->nested_transaction_counter = null;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function setDatabase($name)
-
-    /**
-     * Select a different database
-     *
-     * @param   string  name of the database that should be selected
-     *
-     * @return  string  name of the database previously connected to
-     *
-     * @access  public
-     */
-    function setDatabase($name)
-    {
-        $previous_database_name = (isset($this->database_name)) ? $this->database_name : '';
-        $this->database_name = $name;
-        if (!empty($this->connected_database_name) && ($this->connected_database_name != $this->database_name)) {
-            $this->disconnect(false);
-        }
-        return $previous_database_name;
-    }
-
-    // }}}
-    // {{{ function getDatabase()
-
-    /**
-     * Get the current database
-     *
-     * @return  string  name of the database
-     *
-     * @access  public
-     */
-    function getDatabase()
-    {
-        return $this->database_name;
-    }
-
-    // }}}
-    // {{{ function setDSN($dsn)
-
-    /**
-     * set the DSN
-     *
-     * @param   mixed   DSN string or array
-     *
-     * @return  MDB2_OK
-     *
-     * @access  public
-     */
-    function setDSN($dsn)
-    {
-        $dsn_default = $GLOBALS['_MDB2_dsninfo_default'];
-        $dsn = MDB2::parseDSN($dsn);
-        if (array_key_exists('database', $dsn)) {
-            $this->database_name = $dsn['database'];
-            unset($dsn['database']);
-        }
-        $this->dsn = array_merge($dsn_default, $dsn);
-        return $this->disconnect(false);
-    }
-
-    // }}}
-    // {{{ function getDSN($type = 'string', $hidepw = false)
-
-    /**
-     * return the DSN as a string
-     *
-     * @param   string  format to return ("array", "string")
-     * @param   string  string to hide the password with
-     *
-     * @return  mixed   DSN in the chosen type
-     *
-     * @access  public
-     */
-    function getDSN($type = 'string', $hidepw = false)
-    {
-        $dsn = array_merge($GLOBALS['_MDB2_dsninfo_default'], $this->dsn);
-        $dsn['phptype'] = $this->phptype;
-        $dsn['database'] = $this->database_name;
-        if ($hidepw) {
-            $dsn['password'] = $hidepw;
-        }
-        switch ($type) {
-        // expand to include all possible options
-        case 'string':
-           $dsn = $dsn['phptype'].
-               ($dsn['dbsyntax'] ? ('('.$dsn['dbsyntax'].')') : '').
-               '://'.$dsn['username'].':'.
-                $dsn['password'].'@'.$dsn['hostspec'].
-                ($dsn['port'] ? (':'.$dsn['port']) : '').
-                '/'.$dsn['database'];
-            break;
-        case 'array':
-        default:
-            break;
-        }
-        return $dsn;
-    }
-
-    // }}}
-    // {{{ _isNewLinkSet()
-
-    /**
-     * Check if the 'new_link' option is set
-     *
-     * @return boolean
-     *
-     * @access protected
-     */
-    function _isNewLinkSet()
-    {
-        return (isset($this->dsn['new_link'])
-            && ($this->dsn['new_link'] === true
-             || (is_string($this->dsn['new_link']) && preg_match('/^true$/i', $this->dsn['new_link']))
-             || (is_numeric($this->dsn['new_link']) && 0 != (int)$this->dsn['new_link'])
-            )
-        );
-    }
-
-    // }}}
-    // {{{ function &standaloneQuery($query, $types = null, $is_manip = false)
-
-   /**
-     * execute a query as database administrator
-     *
-     * @param   string  the SQL query
-     * @param   mixed   array that contains the types of the columns in
-     *                        the result set
-     * @param   bool    if the query is a manipulation query
-     *
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function &standaloneQuery($query, $types = null, $is_manip = false)
-    {
-        $offset = $this->offset;
-        $limit = $this->limit;
-        $this->offset = $this->limit = 0;
-        $query = $this->_modifyQuery($query, $is_manip, $limit, $offset);
-
-        $connection = $this->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-
-        $result =$this->_doQuery($query, $is_manip, $connection, false);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        if ($is_manip) {
-            $affected_rows =  $this->_affectedRows($connection, $result);
-            return $affected_rows;
-        }
-        $result =$this->_wrapResult($result, $types, true, false, $limit, $offset);
-        return $result;
-    }
-
-    // }}}
-    // {{{ function _modifyQuery($query, $is_manip, $limit, $offset)
-
-    /**
-     * Changes a query string for various DBMS specific reasons
-     *
-     * @param   string  query to modify
-     * @param   bool    if it is a DML query
-     * @param   int  limit the number of rows
-     * @param   int  start reading from given offset
-     *
-     * @return  string  modified query
-     *
-     * @access  protected
-     */
-    function _modifyQuery($query, $is_manip, $limit, $offset)
-    {
-        return $query;
-    }
-
-    // }}}
-    // {{{ function &_doQuery($query, $is_manip = false, $connection = null, $database_name = null)
-
-    /**
-     * Execute a query
-     * @param   string  query
-     * @param   bool    if the query is a manipulation query
-     * @param   resource connection handle
-     * @param   string  database name
-     *
-     * @return  result or error object
-     *
-     * @access  protected
-     */
-    function &_doQuery($query, $is_manip = false, $connection = null, $database_name = null)
-    {
-        $this->last_query = $query;
-        $result = $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'pre'));
-        if ($result) {
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-            $query = $result;
-        }
-        $err =$this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-        return $err;
-    }
-
-    // }}}
-    // {{{ function _affectedRows($connection, $result = null)
-
-    /**
-     * Returns the number of rows affected
-     *
-     * @param   resource result handle
-     * @param   resource connection handle
-     *
-     * @return  mixed   MDB2 Error Object or the number of rows affected
-     *
-     * @access  private
-     */
-    function _affectedRows($connection, $result = null)
-    {
-        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ function &exec($query)
-
-    /**
-     * Execute a manipulation query to the database and return the number of affected rows
-     *
-     * @param   string  the SQL query
-     *
-     * @return  mixed   number of affected rows on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function &exec($query)
-    {
-        $offset = $this->offset;
-        $limit = $this->limit;
-        $this->offset = $this->limit = 0;
-        $query = $this->_modifyQuery($query, true, $limit, $offset);
-
-        $connection = $this->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-
-        $result =$this->_doQuery($query, true, $connection, $this->database_name);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        $affectedRows = $this->_affectedRows($connection, $result);
-        return $affectedRows;
-    }
-
-    // }}}
-    // {{{ function &query($query, $types = null, $result_class = true, $result_wrap_class = false)
-
-    /**
-     * Send a query to the database and return any results
-     *
-     * @param   string  the SQL query
-     * @param   mixed   array that contains the types of the columns in
-     *                        the result set
-     * @param   mixed   string which specifies which result class to use
-     * @param   mixed   string which specifies which class to wrap results in
-     *
-     * @return mixed   an MDB2_Result handle on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function &query($query, $types = null, $result_class = true, $result_wrap_class = false)
-    {
-        $offset = $this->offset;
-        $limit = $this->limit;
-        $this->offset = $this->limit = 0;
-        $query = $this->_modifyQuery($query, false, $limit, $offset);
-
-        $connection = $this->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-
-        $result =$this->_doQuery($query, false, $connection, $this->database_name);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        $result =$this->_wrapResult($result, $types, $result_class, $result_wrap_class, $limit, $offset);
-        return $result;
-    }
-
-    // }}}
-    // {{{ function &_wrapResult($result, $types = array(), $result_class = true, $result_wrap_class = false, $limit = null, $offset = null)
-
-    /**
-     * wrap a result set into the correct class
-     *
-     * @param   resource result handle
-     * @param   mixed   array that contains the types of the columns in
-     *                        the result set
-     * @param   mixed   string which specifies which result class to use
-     * @param   mixed   string which specifies which class to wrap results in
-     * @param   string  number of rows to select
-     * @param   string  first row to select
-     *
-     * @return mixed   an MDB2_Result, a MDB2 error on failure
-     *
-     * @access  protected
-     */
-    function &_wrapResult($result, $types = array(), $result_class = true,
-        $result_wrap_class = false, $limit = null, $offset = null)
-    {
-        if ($types === true) {
-            if ($this->supports('result_introspection')) {
-                $this->loadModule('Reverse', null, true);
-                $tableInfo = $this->reverse->tableInfo($result);
-                if (PEAR::isError($tableInfo)) {
-                    return $tableInfo;
-                }
-                $types = array();
-                foreach ($tableInfo as $field) {
-                    $types[] = $field['mdb2type'];
-                }
-            } else {
-                $types = null;
-            }
-        }
-
-        if ($result_class === true) {
-            $result_class = $this->options['result_buffering']
-                ? $this->options['buffered_result_class'] : $this->options['result_class'];
-        }
-
-        if ($result_class) {
-            $class_name = sprintf($result_class, $this->phptype);
-            if (!MDB2::classExists($class_name)) {
-                $err =$this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                    'result class does not exist '.$class_name, __FUNCTION__);
-                return $err;
-            }
-            $result =new $class_name($this, $result, $limit, $offset);
-            if (!MDB2::isResultCommon($result)) {
-                $err =$this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                    'result class is not extended from MDB2_Result_Common', __FUNCTION__);
-                return $err;
-            }
-            if (!empty($types)) {
-                $err = $result->setResultTypes($types);
-                if (PEAR::isError($err)) {
-                    $result->free();
-                    return $err;
-                }
-            }
-        }
-        if ($result_wrap_class === true) {
-            $result_wrap_class = $this->options['result_wrap_class'];
-        }
-        if ($result_wrap_class) {
-            if (!MDB2::classExists($result_wrap_class)) {
-                $err =$this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                    'result wrap class does not exist '.$result_wrap_class, __FUNCTION__);
-                return $err;
-            }
-            $result = new $result_wrap_class($result, $this->fetchmode);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ function getServerVersion($native = false)
-
-    /**
-     * return version information about the server
-     *
-     * @param   bool    determines if the raw version string should be returned
-     *
-     * @return  mixed   array with version information or row string
-     *
-     * @access  public
-     */
-    function getServerVersion($native = false)
-    {
-        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ function setLimit($limit, $offset = null)
-
-    /**
-     * set the range of the next query
-     *
-     * @param   string  number of rows to select
-     * @param   string  first row to select
-     *
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function setLimit($limit, $offset = null)
-    {
-        if (!$this->supports('limit_queries')) {
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'limit is not supported by this driver', __FUNCTION__);
-        }
-        $limit = (int)$limit;
-        if ($limit < 0) {
-            return $this->raiseError(MDB2_ERROR_SYNTAX, null, null,
-                'it was not specified a valid selected range row limit', __FUNCTION__);
-        }
-        $this->limit = $limit;
-        if (!is_null($offset)) {
-            $offset = (int)$offset;
-            if ($offset < 0) {
-                return $this->raiseError(MDB2_ERROR_SYNTAX, null, null,
-                    'it was not specified a valid first selected range row', __FUNCTION__);
-            }
-            $this->offset = $offset;
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function subSelect($query, $type = false)
-
-    /**
-     * simple subselect emulation: leaves the query untouched for all RDBMS
-     * that support subselects
-     *
-     * @param   string  the SQL query for the subselect that may only
-     *                      return a column
-     * @param   string  determines type of the field
-     *
-     * @return  string  the query
-     *
-     * @access  public
-     */
-    function subSelect($query, $type = false)
-    {
-        if ($this->supports('sub_selects') === true) {
-            return $query;
-        }
-
-        if (!$this->supports('sub_selects')) {
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'method not implemented', __FUNCTION__);
-        }
-
-        $col = $this->queryCol($query, $type);
-        if (PEAR::isError($col)) {
-            return $col;
-        }
-        if (!is_array($col) || count($col) == 0) {
-            return 'NULL';
-        }
-        if ($type) {
-            $this->loadModule('Datatype', null, true);
-            return $this->datatype->implodeArray($col, $type);
-        }
-        return implode(', ', $col);
-    }
-
-    // }}}
-    // {{{ function replace($table, $fields)
-
-    /**
-     * Execute a SQL REPLACE query. A REPLACE query is identical to a INSERT
-     * query, except that if there is already a row in the table with the same
-     * key field values, the old row is deleted before the new row is inserted.
-     *
-     * The REPLACE type of query does not make part of the SQL standards. Since
-     * practically only MySQL and SQLite implement it natively, this type of
-     * query isemulated through this method for other DBMS using standard types
-     * of queries inside a transaction to assure the atomicity of the operation.
-     *
-     * @param   string  name of the table on which the REPLACE query will
-     *       be executed.
-     * @param   array   associative array   that describes the fields and the
-     *       values that will be inserted or updated in the specified table. The
-     *       indexes of the array are the names of all the fields of the table.
-     *       The values of the array are also associative arrays that describe
-     *       the values and other properties of the table fields.
-     *
-     *       Here follows a list of field properties that need to be specified:
-     *
-     *       value
-     *           Value to be assigned to the specified field. This value may be
-     *           of specified in database independent type format as this
-     *           function can perform the necessary datatype conversions.
-     *
-     *           Default: this property is required unless the Null property is
-     *           set to 1.
-     *
-     *       type
-     *           Name of the type of the field. Currently, all types MDB2
-     *           are supported except for clob and blob.
-     *
-     *           Default: no type conversion
-     *
-     *       null
-     *           bool    property that indicates that the value for this field
-     *           should be set to null.
-     *
-     *           The default value for fields missing in INSERT queries may be
-     *           specified the definition of a table. Often, the default value
-     *           is already null, but since the REPLACE may be emulated using
-     *           an UPDATE query, make sure that all fields of the table are
-     *           listed in this function argument array.
-     *
-     *           Default: 0
-     *
-     *       key
-     *           bool    property that indicates that this field should be
-     *           handled as a primary key or at least as part of the compound
-     *           unique index of the table that will determine the row that will
-     *           updated if it exists or inserted a new row otherwise.
-     *
-     *           This function will fail if no key field is specified or if the
-     *           value of a key field is set to null because fields that are
-     *           part of unique index they may not be null.
-     *
-     *           Default: 0
-     *
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function replace($table, $fields)
-    {
-        if (!$this->supports('replace')) {
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'replace query is not supported', __FUNCTION__);
-        }
-        $count = count($fields);
-        $condition = $values = array();
-        for ($colnum = 0, reset($fields); $colnum < $count; next($fields), $colnum++) {
-            $name = key($fields);
-            if (isset($fields[$name]['null']) && $fields[$name]['null']) {
-                $value = 'NULL';
-            } else {
-                $type = isset($fields[$name]['type']) ? $fields[$name]['type'] : null;
-                $value = $this->quote($fields[$name]['value'], $type);
-            }
-            $values[$name] = $value;
-            if (isset($fields[$name]['key']) && $fields[$name]['key']) {
-                if ($value === 'NULL') {
-                    return $this->raiseError(MDB2_ERROR_CANNOT_REPLACE, null, null,
-                        'key value '.$name.' may not be NULL', __FUNCTION__);
-                }
-                $condition[] = $this->quoteIdentifier($name, true) . '=' . $value;
-            }
-        }
-        if (empty($condition)) {
-            return $this->raiseError(MDB2_ERROR_CANNOT_REPLACE, null, null,
-                'not specified which fields are keys', __FUNCTION__);
-        }
-
-        $result = null;
-        $in_transaction = $this->in_transaction;
-        if (!$in_transaction && PEAR::isError($result = $this->beginTransaction())) {
-            return $result;
-        }
-
-        $connection = $this->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-
-        $condition = ' WHERE '.implode(' AND ', $condition);
-        $query = 'DELETE FROM ' . $this->quoteIdentifier($table, true) . $condition;
-        $result =$this->_doQuery($query, true, $connection);
-        if (!PEAR::isError($result)) {
-            $affected_rows = $this->_affectedRows($connection, $result);
-            $insert = '';
-            foreach ($values as $key => $value) {
-                $insert .= ($insert?', ':'') . $this->quoteIdentifier($key, true);
-            }
-            $values = implode(', ', $values);
-            $query = 'INSERT INTO '. $this->quoteIdentifier($table, true) . "($insert) VALUES ($values)";
-            $result =$this->_doQuery($query, true, $connection);
-            if (!PEAR::isError($result)) {
-                $affected_rows += $this->_affectedRows($connection, $result);;
-            }
-        }
-
-        if (!$in_transaction) {
-            if (PEAR::isError($result)) {
-                $this->rollback();
-            } else {
-                $result = $this->commit();
-            }
-        }
-
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        return $affected_rows;
-    }
-
-    // }}}
-    // {{{ function &prepare($query, $types = null, $result_types = null, $lobs = array())
-
-    /**
-     * Prepares a query for multiple execution with execute().
-     * With some database backends, this is emulated.
-     * prepare() requires a generic query as string like
-     * 'INSERT INTO numbers VALUES(?,?)' or
-     * 'INSERT INTO numbers VALUES(:foo,:bar)'.
-     * The ? and :name and are placeholders which can be set using
-     * bindParam() and the query can be sent off using the execute() method.
-     * The allowed format for :name can be set with the 'bindname_format' option.
-     *
-     * @param   string  the query to prepare
-     * @param   mixed   array that contains the types of the placeholders
-     * @param   mixed   array that contains the types of the columns in
-     *                        the result set or MDB2_PREPARE_RESULT, if set to
-     *                        MDB2_PREPARE_MANIP the query is handled as a manipulation query
-     * @param   mixed   key (field) value (parameter) pair for all lob placeholders
-     *
-     * @return  mixed   resource handle for the prepared query on success, 
-     *                  a MDB2 error on failure
-     *
-     * @access  public
-     * @see     bindParam, execute
-     */
-    function &prepare($query, $types = null, $result_types = null, $lobs = array())
-    {
-        $is_manip = ($result_types === MDB2_PREPARE_MANIP);
-        $offset = $this->offset;
-        $limit = $this->limit;
-        $this->offset = $this->limit = 0;
-        $result = $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'pre'));
-        if ($result) {
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-            $query = $result;
-        }
-        $placeholder_type_guess = $placeholder_type = null;
-        $question  = '?';
-        $colon     = ':';
-        $positions = array();
-        $position  = 0;
-        while ($position < strlen($query)) {
-            $q_position = strpos($query, $question, $position);
-            $c_position = strpos($query, $colon, $position);
-            if ($q_position && $c_position) {
-                $p_position = min($q_position, $c_position);
-            } elseif ($q_position) {
-                $p_position = $q_position;
-            } elseif ($c_position) {
-                $p_position = $c_position;
-            } else {
-                break;
-            }
-            if (is_null($placeholder_type)) {
-                $placeholder_type_guess = $query[$p_position];
-            }
-
-            $new_pos = $this->_skipDelimitedStrings($query, $position, $p_position);
-            if (PEAR::isError($new_pos)) {
-                return $new_pos;
-            }
-            if ($new_pos != $position) {
-                $position = $new_pos;
-                continue; //evaluate again starting from the new position
-            }
-
-            if ($query[$position] == $placeholder_type_guess) {
-                if (is_null($placeholder_type)) {
-                    $placeholder_type = $query[$p_position];
-                    $question = $colon = $placeholder_type;
-                    if (!empty($types) && is_array($types)) {
-                        if ($placeholder_type == ':') {
-                            if (is_int(key($types))) {
-                                $types_tmp = $types;
-                                $types = array();
-                                $count = -1;
-                            }
-                        } else {
-                            $types = array_values($types);
-                        }
-                    }
-                }
-                if ($placeholder_type == ':') {
-                    $regexp = '/^.{'.($position+1).'}('.$this->options['bindname_format'].').*$/s';
-                    $parameter = preg_replace($regexp, '\\1', $query);
-                    if ($parameter === '') {
-                        $err =$this->raiseError(MDB2_ERROR_SYNTAX, null, null,
-                            'named parameter name must match "bindname_format" option', __FUNCTION__);
-                        return $err;
-                    }
-                    $positions[$p_position] = $parameter;
-                    $query = substr_replace($query, '?', $position, strlen($parameter)+1);
-                    // use parameter name in type array
-                    if (isset($count) && isset($types_tmp[++$count])) {
-                        $types[$parameter] = $types_tmp[$count];
-                    }
-                } else {
-                    $positions[$p_position] = count($positions);
-                }
-                $position = $p_position + 1;
-            } else {
-                $position = $p_position;
-            }
-        }
-        $class_name = 'MDB2_Statement_'.$this->phptype;
-        $statement = null;
-        $obj = new $class_name($this, $statement, $positions, $query, $types, $result_types, $is_manip, $limit, $offset);
-        $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'post', 'result' => $obj));
-        return $obj;
-    }
-
-    // }}}
-    // {{{ function _skipDelimitedStrings($query, $position, $p_position)
-    
-    /**
-     * Utility method, used by prepare() to avoid replacing placeholders within delimited strings.
-     * Check if the placeholder is contained within a delimited string.
-     * If so, skip it and advance the position, otherwise return the current position,
-     * which is valid
-     *
-     * @param string $query
-     * @param integer $position current string cursor position
-     * @param integer $p_position placeholder position
-     *
-     * @return mixed integer $new_position on success
-     *               MDB2_Error on failure
-     *
-     * @access  protected
-     */
-    function _skipDelimitedStrings($query, $position, $p_position)
-    {
-        $ignores = $this->string_quoting;
-        $ignores[] = $this->identifier_quoting;
-        $ignores = array_merge($ignores, $this->sql_comments);
-        
-        foreach ($ignores as $ignore) {
-            if (!empty($ignore['start'])) {
-                if (is_int($start_quote = strpos($query, $ignore['start'], $position)) && $start_quote < $p_position) {
-                    $end_quote = $start_quote;
-                    do {
-                        if (!is_int($end_quote = strpos($query, $ignore['end'], $end_quote + 1))) {
-                            if ($ignore['end'] === "\n") {
-                                $end_quote = strlen($query) - 1;
-                            } else {
-                                $err =$this->raiseError(MDB2_ERROR_SYNTAX, null, null,
-                                    'query with an unterminated text string specified', __FUNCTION__);
-                                return $err;
-                            }
-                        }
-                    } while ($ignore['escape']
-                        && $end_quote-1 != $start_quote
-                        && $query[($end_quote - 1)] == $ignore['escape']
-                        && (   $ignore['escape_pattern'] !== $ignore['escape']
-                            || $query[($end_quote - 2)] != $ignore['escape'])
-                    );
-
-                    $position = $end_quote + 1;
-                    return $position;
-                }
-            }
-        }
-        return $position;
-    }
-    
-    // }}}
-    // {{{ function quote($value, $type = null, $quote = true)
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     * compose query statements.
-     *
-     * @param   string  text string value that is intended to be converted.
-     * @param   string  type to which the value should be converted to
-     * @param   bool    quote
-     * @param   bool    escape wildcards
-     *
-     * @return  string  text string that represents the given argument value in
-     *       a DBMS specific format.
-     *
-     * @access  public
-     */
-    function quote($value, $type = null, $quote = true, $escape_wildcards = false)
-    {
-        $result = $this->loadModule('Datatype', null, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        return $this->datatype->quote($value, $type, $quote, $escape_wildcards);
-    }
-
-    // }}}
-    // {{{ function getDeclaration($type, $name, $field)
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare
-     * of the given type
-     *
-     * @param   string  type to which the value should be converted to
-     * @param   string  name the field to be declared.
-     * @param   string  definition of the field
-     *
-     * @return  string  DBMS specific SQL code portion that should be used to
-     *                 declare the specified field.
-     *
-     * @access  public
-     */
-    function getDeclaration($type, $name, $field)
-    {
-        $result = $this->loadModule('Datatype', null, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        return $this->datatype->getDeclaration($type, $name, $field);
-    }
-
-    // }}}
-    // {{{ function compareDefinition($current, $previous)
-
-    /**
-     * Obtain an array of changes that may need to applied
-     *
-     * @param   array   new definition
-     * @param   array   old definition
-     *
-     * @return  array   containing all changes that will need to be applied
-     *
-     * @access  public
-     */
-    function compareDefinition($current, $previous)
-    {
-        $result = $this->loadModule('Datatype', null, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        return $this->datatype->compareDefinition($current, $previous);
-    }
-
-    // }}}
-    // {{{ function supports($feature)
-
-    /**
-     * Tell whether a DB implementation or its backend extension
-     * supports a given feature.
-     *
-     * @param   string  name of the feature (see the MDB2 class doc)
-     *
-     * @return  bool|string if this DB implementation supports a given feature
-     *                      false means no, true means native,
-     *                      'emulated' means emulated
-     *
-     * @access  public
-     */
-    function supports($feature)
-    {
-        if (array_key_exists($feature, $this->supported)) {
-            return $this->supported[$feature];
-        }
-        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            "unknown support feature $feature", __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ function getSequenceName($sqn)
-
-    /**
-     * adds sequence name formatting to a sequence name
-     *
-     * @param   string  name of the sequence
-     *
-     * @return  string  formatted sequence name
-     *
-     * @access  public
-     */
-    function getSequenceName($sqn)
-    {
-        return sprintf($this->options['seqname_format'],
-            preg_replace('/[^a-z0-9_\-\$.]/i', '_', $sqn));
-    }
-
-    // }}}
-    // {{{ function getIndexName($idx)
-
-    /**
-     * adds index name formatting to a index name
-     *
-     * @param   string  name of the index
-     *
-     * @return  string  formatted index name
-     *
-     * @access  public
-     */
-    function getIndexName($idx)
-    {
-        return sprintf($this->options['idxname_format'],
-            preg_replace('/[^a-z0-9_\-\$.]/i', '_', $idx));
-    }
-
-    // }}}
-    // {{{ function nextID($seq_name, $ondemand = true)
-
-    /**
-     * Returns the next free id of a sequence
-     *
-     * @param   string  name of the sequence
-     * @param   bool    when true missing sequences are automatic created
-     *
-     * @return  mixed   MDB2 Error Object or id
-     *
-     * @access  public
-     */
-    function nextID($seq_name, $ondemand = true)
-    {
-        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ function lastInsertID($table = null, $field = null)
-
-    /**
-     * Returns the autoincrement ID if supported or $id or fetches the current
-     * ID in a sequence called: $table.(empty($field) ? '' : '_'.$field)
-     *
-     * @param   string  name of the table into which a new row was inserted
-     * @param   string  name of the field into which a new row was inserted
-     *
-     * @return  mixed   MDB2 Error Object or id
-     *
-     * @access  public
-     */
-    function lastInsertID($table = null, $field = null)
-    {
-        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ function currID($seq_name)
-
-    /**
-     * Returns the current id of a sequence
-     *
-     * @param   string  name of the sequence
-     *
-     * @return  mixed   MDB2 Error Object or id
-     *
-     * @access  public
-     */
-    function currID($seq_name)
-    {
-        $this->warnings[] = 'database does not support getting current
-            sequence value, the sequence value was incremented';
-        return $this->nextID($seq_name);
-    }
-
-    // }}}
-    // {{{ function queryOne($query, $type = null, $colnum = 0)
-
-    /**
-     * Execute the specified query, fetch the value from the first column of
-     * the first row of the result set and then frees
-     * the result set.
-     *
-     * @param string $query  the SELECT query statement to be executed.
-     * @param string $type   optional argument that specifies the expected
-     *                       datatype of the result set field, so that an eventual
-     *                       conversion may be performed. The default datatype is
-     *                       text, meaning that no conversion is performed
-     * @param mixed  $colnum the column number (or name) to fetch
-     *
-     * @return  mixed   MDB2_OK or field value on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function queryOne($query, $type = null, $colnum = 0)
-    {
-        $result = $this->query($query, $type);
-        if (!MDB2::isResultCommon($result)) {
-            return $result;
-        }
-
-        $one = $result->fetchOne($colnum);
-        $result->free();
-        return $one;
-    }
-
-    // }}}
-    // {{{ function queryRow($query, $types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT)
-
-    /**
-     * Execute the specified query, fetch the values from the first
-     * row of the result set into an array and then frees
-     * the result set.
-     *
-     * @param   string  the SELECT query statement to be executed.
-     * @param   array   optional array argument that specifies a list of
-     *       expected datatypes of the result set columns, so that the eventual
-     *       conversions may be performed. The default list of datatypes is
-     *       empty, meaning that no conversion is performed.
-     * @param   int     how the array data should be indexed
-     *
-     * @return  mixed   MDB2_OK or data array on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function queryRow($query, $types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT)
-    {
-        $result = $this->query($query, $types);
-        if (!MDB2::isResultCommon($result)) {
-            return $result;
-        }
-
-        $row = $result->fetchRow($fetchmode);
-        $result->free();
-        return $row;
-    }
-
-    // }}}
-    // {{{ function queryCol($query, $type = null, $colnum = 0)
-
-    /**
-     * Execute the specified query, fetch the value from the first column of
-     * each row of the result set into an array and then frees the result set.
-     *
-     * @param string $query  the SELECT query statement to be executed.
-     * @param string $type   optional argument that specifies the expected
-     *                       datatype of the result set field, so that an eventual
-     *                       conversion may be performed. The default datatype is text,
-     *                       meaning that no conversion is performed
-     * @param mixed  $colnum the column number (or name) to fetch
-     *
-     * @return  mixed   MDB2_OK or data array on success, a MDB2 error on failure
-     * @access  public
-     */
-    function queryCol($query, $type = null, $colnum = 0)
-    {
-        $result = $this->query($query, $type);
-        if (!MDB2::isResultCommon($result)) {
-            return $result;
-        }
-
-        $col = $result->fetchCol($colnum);
-        $result->free();
-        return $col;
-    }
-
-    // }}}
-    // {{{ function queryAll($query, $types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT, $rekey = false, $force_array = false, $group = false)
-
-    /**
-     * Execute the specified query, fetch all the rows of the result set into
-     * a two dimensional array and then frees the result set.
-     *
-     * @param   string  the SELECT query statement to be executed.
-     * @param   array   optional array argument that specifies a list of
-     *       expected datatypes of the result set columns, so that the eventual
-     *       conversions may be performed. The default list of datatypes is
-     *       empty, meaning that no conversion is performed.
-     * @param   int     how the array data should be indexed
-     * @param   bool    if set to true, the $all will have the first
-     *       column as its first dimension
-     * @param   bool    used only when the query returns exactly
-     *       two columns. If true, the values of the returned array will be
-     *       one-element arrays instead of scalars.
-     * @param   bool    if true, the values of the returned array is
-     *       wrapped in another array.  If the same key value (in the first
-     *       column) repeats itself, the values will be appended to this array
-     *       instead of overwriting the existing values.
-     *
-     * @return  mixed   MDB2_OK or data array on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function queryAll($query, $types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT,
-        $rekey = false, $force_array = false, $group = false)
-    {
-        $result = $this->query($query, $types);
-        if (!MDB2::isResultCommon($result)) {
-            return $result;
-        }
-
-        $all = $result->fetchAll($fetchmode, $rekey, $force_array, $group);
-        $result->free();
-        return $all;
-    }
-
-    // }}}
-}
-
-// }}}
-// {{{ class MDB2_Result
-
-/**
- * The dummy class that all user space result classes should extend from
- *
- * @package     MDB2
- * @category    Database
- * @author      Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Result
-{
-}
-
-// }}}
-// {{{ class MDB2_Result_Common extends MDB2_Result
-
-/**
- * The common result class for MDB2 result objects
- *
- * @package     MDB2
- * @category    Database
- * @author      Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Result_Common extends MDB2_Result
-{
-    // {{{ Variables (Properties)
-
-    var $db;
-    var $result;
-    var $rownum = -1;
-    var $types = array();
-    var $values = array();
-    var $offset;
-    var $offset_count = 0;
-    var $limit;
-    var $column_names;
-
-    // }}}
-    // {{{ constructor: function __construct(&$db, &$result, $limit = 0, $offset = 0)
-
-    /**
-     * Constructor
-     */
-    function __construct(&$db, &$result, $limit = 0, $offset = 0)
-    {
-        $this->db =$db;
-        $this->result =$result;
-        $this->offset = $offset;
-        $this->limit = max(0, $limit - 1);
-    }
-
-
-    // }}}
-    // {{{ function setResultTypes($types)
-
-    /**
-     * Define the list of types to be associated with the columns of a given
-     * result set.
-     *
-     * This function may be called before invoking fetchRow(), fetchOne(),
-     * fetchCol() and fetchAll() so that the necessary data type
-     * conversions are performed on the data to be retrieved by them. If this
-     * function is not called, the type of all result set columns is assumed
-     * to be text, thus leading to not perform any conversions.
-     *
-     * @param   array   variable that lists the
-     *       data types to be expected in the result set columns. If this array
-     *       contains less types than the number of columns that are returned
-     *       in the result set, the remaining columns are assumed to be of the
-     *       type text. Currently, the types clob and blob are not fully
-     *       supported.
-     *
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function setResultTypes($types)
-    {
-        $load = $this->db->loadModule('Datatype', null, true);
-        if (PEAR::isError($load)) {
-            return $load;
-        }
-        $types = $this->db->datatype->checkResultTypes($types);
-        if (PEAR::isError($types)) {
-            return $types;
-        }
-        $this->types = $types;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function seek($rownum = 0)
-
-    /**
-     * Seek to a specific row in a result set
-     *
-     * @param   int     number of the row where the data can be found
-     *
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function seek($rownum = 0)
-    {
-        $target_rownum = $rownum - 1;
-        if ($this->rownum > $target_rownum) {
-            return $this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'seeking to previous rows not implemented', __FUNCTION__);
-        }
-        while ($this->rownum < $target_rownum) {
-            $this->fetchRow();
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function &fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
-
-    /**
-     * Fetch and return a row of data
-     *
-     * @param   int     how the array data should be indexed
-     * @param   int     number of the row where the data can be found
-     *
-     * @return  int     data array on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function &fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
-    {
-        $err =$this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-        return $err;
-    }
-
-    // }}}
-    // {{{ function fetchOne($colnum = 0)
-
-    /**
-     * fetch single column from the next row from a result set
-     *
-     * @param int|string the column number (or name) to fetch
-     * @param int        number of the row where the data can be found
-     *
-     * @return string data on success, a MDB2 error on failure
-     * @access  public
-     */
-    function fetchOne($colnum = 0, $rownum = null)
-    {
-        $fetchmode = is_numeric($colnum) ? MDB2_FETCHMODE_ORDERED : MDB2_FETCHMODE_ASSOC;
-        $row = $this->fetchRow($fetchmode, $rownum);
-        if (!is_array($row) || PEAR::isError($row)) {
-            return $row;
-        }
-        if (!array_key_exists($colnum, $row)) {
-            return $this->db->raiseError(MDB2_ERROR_TRUNCATED, null, null,
-                'column is not defined in the result set: '.$colnum, __FUNCTION__);
-        }
-        return $row[$colnum];
-    }
-
-    // }}}
-    // {{{ function fetchCol($colnum = 0)
-
-    /**
-     * Fetch and return a column from the current row pointer position
-     *
-     * @param int|string the column number (or name) to fetch
-     *
-     * @return  mixed data array on success, a MDB2 error on failure
-     * @access  public
-     */
-    function fetchCol($colnum = 0)
-    {
-        $column = array();
-        $fetchmode = is_numeric($colnum) ? MDB2_FETCHMODE_ORDERED : MDB2_FETCHMODE_ASSOC;
-        $row = $this->fetchRow($fetchmode);
-        if (is_array($row)) {
-            if (!array_key_exists($colnum, $row)) {
-                return $this->db->raiseError(MDB2_ERROR_TRUNCATED, null, null,
-                    'column is not defined in the result set: '.$colnum, __FUNCTION__);
-            }
-            do {
-                $column[] = $row[$colnum];
-            } while (is_array($row = $this->fetchRow($fetchmode)));
-        }
-        if (PEAR::isError($row)) {
-            return $row;
-        }
-        return $column;
-    }
-
-    // }}}
-    // {{{ function fetchAll($fetchmode = MDB2_FETCHMODE_DEFAULT, $rekey = false, $force_array = false, $group = false)
-
-    /**
-     * Fetch and return all rows from the current row pointer position
-     *
-     * @param   int     $fetchmode  the fetch mode to use:
-     *                            + MDB2_FETCHMODE_ORDERED
-     *                            + MDB2_FETCHMODE_ASSOC
-     *                            + MDB2_FETCHMODE_ORDERED | MDB2_FETCHMODE_FLIPPED
-     *                            + MDB2_FETCHMODE_ASSOC | MDB2_FETCHMODE_FLIPPED
-     * @param   bool    if set to true, the $all will have the first
-     *       column as its first dimension
-     * @param   bool    used only when the query returns exactly
-     *       two columns. If true, the values of the returned array will be
-     *       one-element arrays instead of scalars.
-     * @param   bool    if true, the values of the returned array is
-     *       wrapped in another array.  If the same key value (in the first
-     *       column) repeats itself, the values will be appended to this array
-     *       instead of overwriting the existing values.
-     *
-     * @return  mixed   data array on success, a MDB2 error on failure
-     *
-     * @access  public
-     * @see     getAssoc()
-     */
-    function fetchAll($fetchmode = MDB2_FETCHMODE_DEFAULT, $rekey = false,
-        $force_array = false, $group = false)
-    {
-        $all = array();
-        $row = $this->fetchRow($fetchmode);
-        if (PEAR::isError($row)) {
-            return $row;
-        } elseif (!$row) {
-            return $all;
-        }
-
-        $shift_array = $rekey ? false : null;
-        if (!is_null($shift_array)) {
-            if (is_object($row)) {
-                $colnum = count(get_object_vars($row));
-            } else {
-                $colnum = count($row);
-            }
-            if ($colnum < 2) {
-                return $this->db->raiseError(MDB2_ERROR_TRUNCATED, null, null,
-                    'rekey feature requires atleast 2 column', __FUNCTION__);
-            }
-            $shift_array = (!$force_array && $colnum == 2);
-        }
-
-        if ($rekey) {
-            do {
-                if (is_object($row)) {
-                    $arr = get_object_vars($row);
-                    $key = reset($arr);
-                    unset($row->{$key});
-                } else {
-                    if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
-                        $key = reset($row);
-                        unset($row[key($row)]);
-                    } else {
-                        $key = array_shift($row);
-                    }
-                    if ($shift_array) {
-                        $row = array_shift($row);
-                    }
-                }
-                if ($group) {
-                    $all[$key][] = $row;
-                } else {
-                    $all[$key] = $row;
-                }
-            } while (($row = $this->fetchRow($fetchmode)));
-        } elseif ($fetchmode & MDB2_FETCHMODE_FLIPPED) {
-            do {
-                foreach ($row as $key => $val) {
-                    $all[$key][] = $val;
-                }
-            } while (($row = $this->fetchRow($fetchmode)));
-        } else {
-            do {
-                $all[] = $row;
-            } while (($row = $this->fetchRow($fetchmode)));
-        }
-
-        return $all;
-    }
-
-    // }}}
-    // {{{ function rowCount()
-    /**
-     * Returns the actual row number that was last fetched (count from 0)
-     * @return  int
-     *
-     * @access  public
-     */
-    function rowCount()
-    {
-        return $this->rownum + 1;
-    }
-
-    // }}}
-    // {{{ function numRows()
-
-    /**
-     * Returns the number of rows in a result object
-     *
-     * @return  mixed   MDB2 Error Object or the number of rows
-     *
-     * @access  public
-     */
-    function numRows()
-    {
-        return $this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ function nextResult()
-
-    /**
-     * Move the internal result pointer to the next available result
-     *
-     * @return  true on success, false if there is no more result set or an error object on failure
-     *
-     * @access  public
-     */
-    function nextResult()
-    {
-        return $this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ function getColumnNames()
-
-    /**
-     * Retrieve the names of columns returned by the DBMS in a query result or
-     * from the cache.
-     *
-     * @param   bool    If set to true the values are the column names,
-     *                  otherwise the names of the columns are the keys.
-     * @return  mixed   Array variable that holds the names of columns or an
-     *                  MDB2 error on failure.
-     *                  Some DBMS may not return any columns when the result set
-     *                  does not contain any rows.
-     *
-     * @access  public
-     */
-    function getColumnNames($flip = false)
-    {
-        if (!isset($this->column_names)) {
-            $result = $this->_getColumnNames();
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-            $this->column_names = $result;
-        }
-        if ($flip) {
-            return array_flip($this->column_names);
-        }
-        return $this->column_names;
-    }
-
-    // }}}
-    // {{{ function _getColumnNames()
-
-    /**
-     * Retrieve the names of columns returned by the DBMS in a query result.
-     *
-     * @return  mixed   Array variable that holds the names of columns as keys
-     *                  or an MDB2 error on failure.
-     *                  Some DBMS may not return any columns when the result set
-     *                  does not contain any rows.
-     *
-     * @access  private
-     */
-    function _getColumnNames()
-    {
-        return $this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ function numCols()
-
-    /**
-     * Count the number of columns returned by the DBMS in a query result.
-     *
-     * @return  mixed   integer value with the number of columns, a MDB2 error
-     *       on failure
-     *
-     * @access  public
-     */
-    function numCols()
-    {
-        return $this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ function getResource()
-
-    /**
-     * return the resource associated with the result object
-     *
-     * @return  resource
-     *
-     * @access  public
-     */
-    function getResource()
-    {
-        return $this->result;
-    }
-
-    // }}}
-    // {{{ function bindColumn($column, &$value, $type = null)
-
-    /**
-     * Set bind variable to a column.
-     *
-     * @param   int     column number or name
-     * @param   mixed   variable reference
-     * @param   string  specifies the type of the field
-     *
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function bindColumn($column, &$value, $type = null)
-    {
-        if (!is_numeric($column)) {
-            $column_names = $this->getColumnNames();
-            if ($this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                if ($this->db->options['field_case'] == CASE_LOWER) {
-                    $column = strtolower($column);
-                } else {
-                    $column = strtoupper($column);
-                }
-            }
-            $column = $column_names[$column];
-        }
-        $this->values[$column] =$value;
-        if (!is_null($type)) {
-            $this->types[$column] = $type;
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function _assignBindColumns($row)
-
-    /**
-     * Bind a variable to a value in the result row.
-     *
-     * @param   array   row data
-     *
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  private
-     */
-    function _assignBindColumns($row)
-    {
-        $row = array_values($row);
-        foreach ($row as $column => $value) {
-            if (array_key_exists($column, $this->values)) {
-                $this->values[$column] = $value;
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function free()
-
-    /**
-     * Free the internal resources associated with result.
-     *
-     * @return  bool    true on success, false if result is invalid
-     *
-     * @access  public
-     */
-    function free()
-    {
-        $this->result = false;
-        return MDB2_OK;
-    }
-
-    // }}}
-}
-
-// }}}
-// {{{ class MDB2_Row
-
-/**
- * The simple class that accepts row data as an array
- *
- * @package     MDB2
- * @category    Database
- * @author      Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Row
-{
-    // {{{ constructor: function __construct(&$row)
-
-    /**
-     * constructor
-     *
-     * @param   resource    row data as array
-     */
-    function __construct(&$row)
-    {
-        foreach ($row as $key => $value) {
-            $this->$key = &$row[$key];
-        }
-    }
-}
-
-// }}}
-// {{{ class MDB2_Statement_Common
-
-/**
- * The common statement class for MDB2 statement objects
- *
- * @package     MDB2
- * @category    Database
- * @author      Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Statement_Common
-{
-    // {{{ Variables (Properties)
-
-    var $db;
-    var $statement;
-    var $query;
-    var $result_types;
-    var $types;
-    var $values = array();
-    var $limit;
-    var $offset;
-    var $is_manip;
-
-    // }}}
-    // {{{ constructor: function __construct(&$db, &$statement, $positions, $query, $types, $result_types, $is_manip = false, $limit = null, $offset = null)
-
-    /**
-     * Constructor
-     */
-    function __construct(&$db, &$statement, $positions, $query, $types, $result_types, $is_manip = false, $limit = null, $offset = null)
-    {
-        $this->db =$db;
-        $this->statement =$statement;
-        $this->positions = $positions;
-        $this->query = $query;
-        $this->types = (array)$types;
-        $this->result_types = (array)$result_types;
-        $this->limit = $limit;
-        $this->is_manip = $is_manip;
-        $this->offset = $offset;
-    }
-
-
-    // }}}
-    // {{{ function bindValue($parameter, &$value, $type = null)
-
-    /**
-     * Set the value of a parameter of a prepared query.
-     *
-     * @param   int     the order number of the parameter in the query
-     *       statement. The order number of the first parameter is 1.
-     * @param   mixed   value that is meant to be assigned to specified
-     *       parameter. The type of the value depends on the $type argument.
-     * @param   string  specifies the type of the field
-     *
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function bindValue($parameter, $value, $type = null)
-    {
-        if (!is_numeric($parameter)) {
-            $parameter = preg_replace('/^:(.*)$/', '\\1', $parameter);
-        }
-        if (!in_array($parameter, $this->positions)) {
-            return $this->db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'Unable to bind to missing placeholder: '.$parameter, __FUNCTION__);
-        }
-        $this->values[$parameter] = $value;
-        if (!is_null($type)) {
-            $this->types[$parameter] = $type;
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function bindValueArray($values, $types = null)
-
-    /**
-     * Set the values of multiple a parameter of a prepared query in bulk.
-     *
-     * @param   array   specifies all necessary information
-     *       for bindValue() the array elements must use keys corresponding to
-     *       the number of the position of the parameter.
-     * @param   array   specifies the types of the fields
-     *
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     * @see     bindParam()
-     */
-    function bindValueArray($values, $types = null)
-    {
-        $types = is_array($types) ? array_values($types) : array_fill(0, count($values), null);
-        $parameters = array_keys($values);
-        foreach ($parameters as $key => $parameter) {
-            $this->db->pushErrorHandling(PEAR_ERROR_RETURN);
-            $this->db->expectError(MDB2_ERROR_NOT_FOUND);
-            $err = $this->bindValue($parameter, $values[$parameter], $types[$key]);
-            $this->db->popExpect();
-            $this->db->popErrorHandling();
-            if (PEAR::isError($err)) {
-                if ($err->getCode() == MDB2_ERROR_NOT_FOUND) {
-                    //ignore (extra value for missing placeholder)
-                    continue;
-                }
-                return $err;
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function bindParam($parameter, &$value, $type = null)
-
-    /**
-     * Bind a variable to a parameter of a prepared query.
-     *
-     * @param   int     the order number of the parameter in the query
-     *       statement. The order number of the first parameter is 1.
-     * @param   mixed   variable that is meant to be bound to specified
-     *       parameter. The type of the value depends on the $type argument.
-     * @param   string  specifies the type of the field
-     *
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function bindParam($parameter, &$value, $type = null)
-    {
-        if (!is_numeric($parameter)) {
-            $parameter = preg_replace('/^:(.*)$/', '\\1', $parameter);
-        }
-        if (!in_array($parameter, $this->positions)) {
-            return $this->db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'Unable to bind to missing placeholder: '.$parameter, __FUNCTION__);
-        }
-        $this->values[$parameter] =$value;
-        if (!is_null($type)) {
-            $this->types[$parameter] = $type;
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function bindParamArray(&$values, $types = null)
-
-    /**
-     * Bind the variables of multiple a parameter of a prepared query in bulk.
-     *
-     * @param   array   specifies all necessary information
-     *       for bindParam() the array elements must use keys corresponding to
-     *       the number of the position of the parameter.
-     * @param   array   specifies the types of the fields
-     *
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     * @see     bindParam()
-     */
-    function bindParamArray(&$values, $types = null)
-    {
-        $types = is_array($types) ? array_values($types) : array_fill(0, count($values), null);
-        $parameters = array_keys($values);
-        foreach ($parameters as $key => $parameter) {
-            $err = $this->bindParam($parameter, $values[$parameter], $types[$key]);
-            if (PEAR::isError($err)) {
-                return $err;
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function &execute($values = null, $result_class = true, $result_wrap_class = false)
-
-    /**
-     * Execute a prepared query statement.
-     *
-     * @param array specifies all necessary information
-     *              for bindParam() the array elements must use keys corresponding
-     *              to the number of the position of the parameter.
-     * @param mixed specifies which result class to use
-     * @param mixed specifies which class to wrap results in
-     *
-     * @return mixed MDB2_Result or integer (affected rows) on success,
-     *               a MDB2 error on failure
-     * @access public
-     */
-    function &execute($values = null, $result_class = true, $result_wrap_class = false)
-    {
-        if (is_null($this->positions)) {
-            return $this->db->raiseError(MDB2_ERROR, null, null,
-                'Prepared statement has already been freed', __FUNCTION__);
-        }
-
-        $values = (array)$values;
-        if (!empty($values)) {
-            $err = $this->bindValueArray($values);
-            if (PEAR::isError($err)) {
-                return $this->db->raiseError(MDB2_ERROR, null, null,
-                                            'Binding Values failed with message: ' . $err->getMessage(), __FUNCTION__);
-            }
-        }
-        $result =$this->_execute($result_class, $result_wrap_class);
-        return $result;
-    }
-
-    // }}}
-    // {{{ function &_execute($result_class = true, $result_wrap_class = false)
-
-    /**
-     * Execute a prepared query statement helper method.
-     *
-     * @param   mixed   specifies which result class to use
-     * @param   mixed   specifies which class to wrap results in
-     *
-     * @return mixed MDB2_Result or integer (affected rows) on success,
-     *               a MDB2 error on failure
-     * @access  private
-     */
-    function &_execute($result_class = true, $result_wrap_class = false)
-    {
-        $this->last_query = $this->query;
-        $query = '';
-        $last_position = 0;
-        foreach ($this->positions as $current_position => $parameter) {
-            if (!array_key_exists($parameter, $this->values)) {
-                return $this->db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                    'Unable to bind to missing placeholder: '.$parameter, __FUNCTION__);
-            }
-            $value = $this->values[$parameter];
-            $query.= substr($this->query, $last_position, $current_position - $last_position);
-            if (!isset($value)) {
-                $value_quoted = 'NULL';
-            } else {
-                $type = !empty($this->types[$parameter]) ? $this->types[$parameter] : null;
-                $value_quoted = $this->db->quote($value, $type);
-                if (PEAR::isError($value_quoted)) {
-                    return $value_quoted;
-                }
-            }
-            $query.= $value_quoted;
-            $last_position = $current_position + 1;
-        }
-        $query.= substr($this->query, $last_position);
-
-        $this->db->offset = $this->offset;
-        $this->db->limit = $this->limit;
-        if ($this->is_manip) {
-            $result = $this->db->exec($query);
-        } else {
-            $result =$this->db->query($query, $this->result_types, $result_class, $result_wrap_class);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ function free()
-
-    /**
-     * Release resources allocated for the specified prepared query.
-     *
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function free()
-    {
-        if (is_null($this->positions)) {
-            return $this->db->raiseError(MDB2_ERROR, null, null,
-                'Prepared statement has already been freed', __FUNCTION__);
-        }
-
-        $this->statement = null;
-        $this->positions = null;
-        $this->query = null;
-        $this->types = null;
-        $this->result_types = null;
-        $this->limit = null;
-        $this->is_manip = null;
-        $this->offset = null;
-        $this->values = null;
-
-        return MDB2_OK;
-    }
-
-    // }}}
-}
-
-// }}}
-// {{{ class MDB2_Module_Common
-
-/**
- * The common modules class for MDB2 module objects
- *
- * @package     MDB2
- * @category    Database
- * @author      Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Module_Common
-{
-    // {{{ Variables (Properties)
-
-    /**
-     * contains the key to the global MDB2 instance array of the associated
-     * MDB2 instance
-     *
-     * @var     int
-     * @access  protected
-     */
-    var $db_index;
-
-    // }}}
-    // {{{ constructor: function __construct($db_index)
-
-    /**
-     * Constructor
-     */
-    function __construct($db_index)
-    {
-        $this->db_index = $db_index;
-    }
-
-    // }}}
-    // {{{ function &getDBInstance()
-
-    /**
-     * Get the instance of MDB2 associated with the module instance
-     *
-     * @return  object  MDB2 instance or a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function getDBInstance()
-    {
-        if (isset($GLOBALS['_MDB2_databases'][$this->db_index])) {
-            $result =$GLOBALS['_MDB2_databases'][$this->db_index];
-        } else {
-            $result =$this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'could not find MDB2 instance');
-        }
-        return $result;
-    }
-
-    // }}}
-}
-
-// }}}
-// {{{ function MDB2_closeOpenTransactions()
-
-/**
- * Close any open transactions form persistent connections
- *
- * @return  void
- *
- * @access  public
- */
-
-function MDB2_closeOpenTransactions()
-{
-    reset($GLOBALS['_MDB2_databases']);
-    while (next($GLOBALS['_MDB2_databases'])) {
-        $key = key($GLOBALS['_MDB2_databases']);
-        if ($GLOBALS['_MDB2_databases'][$key]->opened_persistent
-            && $GLOBALS['_MDB2_databases'][$key]->in_transaction
-        ) {
-            $GLOBALS['_MDB2_databases'][$key]->rollback();
-        }
-    }
-}
-
-// }}}
-// {{{ function MDB2_defaultDebugOutput(&$db, $scope, $message, $is_manip = null)
-
-/**
- * default debug output handler
- *
- * @param   object  reference to an MDB2 database object
- * @param   string  usually the method name that triggered the debug call:
- *                  for example 'query', 'prepare', 'execute', 'parameters',
- *                  'beginTransaction', 'commit', 'rollback'
- * @param   string  message that should be appended to the debug variable
- * @param   array   contains context information about the debug() call
- *                  common keys are: is_manip, time, result etc.
- *
- * @return  void|string optionally return a modified message, this allows
- *                      rewriting a query before being issued or prepared
- *
- * @access  public
- */
-function MDB2_defaultDebugOutput(&$db, $scope, $message, $context = array())
-{
-    $db->debug_output.= $scope.'('.$db->db_index.'): ';
-    $db->debug_output.= $message.$db->getOption('log_line_break');
-    return $message;
-}
-
-// }}}
-?>
diff --git a/3rdparty/MDB2/Date.php b/3rdparty/MDB2/Date.php
deleted file mode 100644
index ce846543a50..00000000000
--- a/3rdparty/MDB2/Date.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: Date.php,v 1.10 2006/03/01 12:15:32 lsmith Exp $
-//
-
-/**
- * @package  MDB2
- * @category Database
- * @author   Lukas Smith <smith@pooteeweet.org>
- */
-
-/**
- * Several methods to convert the MDB2 native timestamp format (ISO based)
- * to and from data structures that are convenient to worth with in side of php.
- * For more complex date arithmetic please take a look at the Date package in PEAR
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Date
-{
-    // {{{ mdbNow()
-
-    /**
-     * return the current datetime
-     *
-     * @return string current datetime in the MDB2 format
-     * @access public
-     */
-    function mdbNow()
-    {
-        return date('Y-m-d H:i:s');
-    }
-    // }}}
-
-    // {{{ mdbToday()
-
-    /**
-     * return the current date
-     *
-     * @return string current date in the MDB2 format
-     * @access public
-     */
-    function mdbToday()
-    {
-        return date('Y-m-d');
-    }
-    // }}}
-
-    // {{{ mdbTime()
-
-    /**
-     * return the current time
-     *
-     * @return string current time in the MDB2 format
-     * @access public
-     */
-    function mdbTime()
-    {
-        return date('H:i:s');
-    }
-    // }}}
-
-    // {{{ date2Mdbstamp()
-
-    /**
-     * convert a date into a MDB2 timestamp
-     *
-     * @param int hour of the date
-     * @param int minute of the date
-     * @param int second of the date
-     * @param int month of the date
-     * @param int day of the date
-     * @param int year of the date
-     *
-     * @return string a valid MDB2 timestamp
-     * @access public
-     */
-    function date2Mdbstamp($hour = null, $minute = null, $second = null,
-        $month = null, $day = null, $year = null)
-    {
-        return MDB2_Date::unix2Mdbstamp(mktime($hour, $minute, $second, $month, $day, $year, -1));
-    }
-    // }}}
-
-    // {{{ unix2Mdbstamp()
-
-    /**
-     * convert a unix timestamp into a MDB2 timestamp
-     *
-     * @param int a valid unix timestamp
-     *
-     * @return string a valid MDB2 timestamp
-     * @access public
-     */
-    function unix2Mdbstamp($unix_timestamp)
-    {
-        return date('Y-m-d H:i:s', $unix_timestamp);
-    }
-    // }}}
-
-    // {{{ mdbstamp2Unix()
-
-    /**
-     * convert a MDB2 timestamp into a unix timestamp
-     *
-     * @param int a valid MDB2 timestamp
-     * @return string unix timestamp with the time stored in the MDB2 format
-     *
-     * @access public
-     */
-    function mdbstamp2Unix($mdb_timestamp)
-    {
-        $arr = MDB2_Date::mdbstamp2Date($mdb_timestamp);
-
-        return mktime($arr['hour'], $arr['minute'], $arr['second'], $arr['month'], $arr['day'], $arr['year'], -1);
-    }
-    // }}}
-
-    // {{{ mdbstamp2Date()
-
-    /**
-     * convert a MDB2 timestamp into an array containing all
-     * values necessary to pass to php's date() function
-     *
-     * @param int a valid MDB2 timestamp
-     *
-     * @return array with the time split
-     * @access public
-     */
-    function mdbstamp2Date($mdb_timestamp)
-    {
-        list($arr['year'], $arr['month'], $arr['day'], $arr['hour'], $arr['minute'], $arr['second']) =
-            sscanf($mdb_timestamp, "%04u-%02u-%02u %02u:%02u:%02u");
-        return $arr;
-    }
-    // }}}
-}
-
-?>
diff --git a/3rdparty/MDB2/Driver/Datatype/Common.php b/3rdparty/MDB2/Driver/Datatype/Common.php
deleted file mode 100644
index 85a74f64fca..00000000000
--- a/3rdparty/MDB2/Driver/Datatype/Common.php
+++ /dev/null
@@ -1,1824 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: Common.php,v 1.139 2008/12/04 11:50:42 afz Exp $
-
-require_once('MDB2/LOB.php');
-
-/**
- * @package  MDB2
- * @category Database
- * @author   Lukas Smith <smith@pooteeweet.org>
- */
-
-/**
- * MDB2_Driver_Common: Base class that is extended by each MDB2 driver
- *
- * To load this module in the MDB2 object:
- * $mdb->loadModule('Datatype');
- *
- * @package MDB2
- * @category Database
- * @author Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Datatype_Common extends MDB2_Module_Common
-{
-    var $valid_default_values = array(
-        'text'      => '',
-        'boolean'   => true,
-        'integer'   => 0,
-        'decimal'   => 0.0,
-        'float'     => 0.0,
-        'timestamp' => '1970-01-01 00:00:00',
-        'time'      => '00:00:00',
-        'date'      => '1970-01-01',
-        'clob'      => '',
-        'blob'      => '',
-    );
-
-    /**
-     * contains all LOB objects created with this MDB2 instance
-     * @var array
-     * @access protected
-     */
-    var $lobs = array();
-
-    // }}}
-    // {{{ getValidTypes()
-
-    /**
-     * Get the list of valid types
-     *
-     * This function returns an array of valid types as keys with the values
-     * being possible default values for all native datatypes and mapped types
-     * for custom datatypes.
-     *
-     * @return mixed array on success, a MDB2 error on failure
-     * @access public
-     */
-    function getValidTypes()
-    {
-        $types = $this->valid_default_values;
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        if (!empty($db->options['datatype_map'])) {
-            foreach ($db->options['datatype_map'] as $type => $mapped_type) {
-                if (array_key_exists($mapped_type, $types)) {
-                    $types[$type] = $types[$mapped_type];
-                } elseif (!empty($db->options['datatype_map_callback'][$type])) {
-                    $parameter = array('type' => $type, 'mapped_type' => $mapped_type);
-                    $default =  call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
-                    $types[$type] = $default;
-                }
-            }
-        }
-        return $types;
-    }
-
-    // }}}
-    // {{{ checkResultTypes()
-
-    /**
-     * Define the list of types to be associated with the columns of a given
-     * result set.
-     *
-     * This function may be called before invoking fetchRow(), fetchOne()
-     * fetchCole() and fetchAll() so that the necessary data type
-     * conversions are performed on the data to be retrieved by them. If this
-     * function is not called, the type of all result set columns is assumed
-     * to be text, thus leading to not perform any conversions.
-     *
-     * @param array $types array variable that lists the
-     *       data types to be expected in the result set columns. If this array
-     *       contains less types than the number of columns that are returned
-     *       in the result set, the remaining columns are assumed to be of the
-     *       type text. Currently, the types clob and blob are not fully
-     *       supported.
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function checkResultTypes($types)
-    {
-        $types = is_array($types) ? $types : array($types);
-        foreach ($types as $key => $type) {
-            if (!isset($this->valid_default_values[$type])) {
-                $db =$this->getDBInstance();
-                if (PEAR::isError($db)) {
-                    return $db;
-                }
-                if (empty($db->options['datatype_map'][$type])) {
-                    return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                        $type.' for '.$key.' is not a supported column type', __FUNCTION__);
-                }
-            }
-        }
-        return $types;
-    }
-
-    // }}}
-    // {{{ _baseConvertResult()
-
-    /**
-     * General type conversion method
-     *
-     * @param mixed   $value reference to a value to be converted
-     * @param string  $type  specifies which type to convert to
-     * @param boolean $rtrim [optional] when TRUE [default], apply rtrim() to text
-     * @return object an MDB2 error on failure
-     * @access protected
-     */
-    function _baseConvertResult($value, $type, $rtrim = true)
-    {
-        switch ($type) {
-        case 'text':
-            if ($rtrim) {
-                $value = rtrim($value);
-            }
-            return $value;
-        case 'integer':
-            return intval($value);
-        case 'boolean':
-            return !empty($value);
-        case 'decimal':
-            return $value;
-        case 'float':
-            return doubleval($value);
-        case 'date':
-            return $value;
-        case 'time':
-            return $value;
-        case 'timestamp':
-            return $value;
-        case 'clob':
-        case 'blob':
-            $this->lobs[] = array(
-                'buffer' => null,
-                'position' => 0,
-                'lob_index' => null,
-                'endOfLOB' => false,
-                'resource' => $value,
-                'value' => null,
-                'loaded' => false,
-            );
-            end($this->lobs);
-            $lob_index = key($this->lobs);
-            $this->lobs[$lob_index]['lob_index'] = $lob_index;
-            return fopen('MDB2LOB://'.$lob_index.'@'.$this->db_index, 'r+');
-        }
-
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_INVALID, null, null,
-            'attempt to convert result value to an unknown type :' . $type, __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ convertResult()
-
-    /**
-     * Convert a value to a RDBMS indipendent MDB2 type
-     *
-     * @param mixed   $value value to be converted
-     * @param string  $type  specifies which type to convert to
-     * @param boolean $rtrim [optional] when TRUE [default], apply rtrim() to text
-     * @return mixed converted value
-     * @access public
-     */
-    function convertResult($value, $type, $rtrim = true)
-    {
-        if (is_null($value)) {
-            return null;
-        }
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        if (!empty($db->options['datatype_map'][$type])) {
-            $type = $db->options['datatype_map'][$type];
-            if (!empty($db->options['datatype_map_callback'][$type])) {
-                $parameter = array('type' => $type, 'value' => $value, 'rtrim' => $rtrim);
-                return call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
-            }
-        }
-        return $this->_baseConvertResult($value, $type, $rtrim);
-    }
-
-    // }}}
-    // {{{ convertResultRow()
-
-    /**
-     * Convert a result row
-     *
-     * @param array   $types
-     * @param array   $row   specifies the types to convert to
-     * @param boolean $rtrim [optional] when TRUE [default], apply rtrim() to text
-     * @return mixed MDB2_OK on success, an MDB2 error on failure
-     * @access public
-     */
-    function convertResultRow($types, $row, $rtrim = true)
-    {
-        $types = $this->_sortResultFieldTypes(array_keys($row), $types);
-        foreach ($row as $key => $value) {
-            if (empty($types[$key])) {
-                continue;
-            }
-            $value = $this->convertResult($row[$key], $types[$key], $rtrim);
-            if (PEAR::isError($value)) {
-                return $value;
-            }
-            $row[$key] = $value;
-        }
-        return $row;
-    }
-
-    // }}}
-    // {{{ _sortResultFieldTypes()
-
-    /**
-     * convert a result row
-     *
-     * @param array $types
-     * @param array $row specifies the types to convert to
-     * @param bool   $rtrim   if to rtrim text values or not
-     * @return mixed MDB2_OK on success,  a MDB2 error on failure
-     * @access public
-     */
-    function _sortResultFieldTypes($columns, $types)
-    {
-        $n_cols = count($columns);
-        $n_types = count($types);
-        if ($n_cols > $n_types) {
-            for ($i= $n_cols - $n_types; $i >= 0; $i--) {
-                $types[] = null;
-            }
-        }
-        $sorted_types = array();
-        foreach ($columns as $col) {
-            $sorted_types[$col] = null;
-        }
-        foreach ($types as $name => $type) {
-            if (array_key_exists($name, $sorted_types)) {
-                $sorted_types[$name] = $type;
-                unset($types[$name]);
-            }
-        }
-        // if there are left types in the array, fill the null values of the
-        // sorted array with them, in order.
-        if (count($types)) {
-            reset($types);
-            foreach (array_keys($sorted_types) as $k) {
-                if (is_null($sorted_types[$k])) {
-                    $sorted_types[$k] = current($types);
-                    next($types);
-                }
-            }
-        }
-        return $sorted_types;
-    }
-
-    // }}}
-    // {{{ getDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare
-     * of the given type
-     *
-     * @param string $type type to which the value should be converted to
-     * @param string  $name   name the field to be declared.
-     * @param string  $field  definition of the field
-     * @return string  DBMS specific SQL code portion that should be used to
-     *                 declare the specified field.
-     * @access public
-     */
-    function getDeclaration($type, $name, $field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if (!empty($db->options['datatype_map'][$type])) {
-            $type = $db->options['datatype_map'][$type];
-            if (!empty($db->options['datatype_map_callback'][$type])) {
-                $parameter = array('type' => $type, 'name' => $name, 'field' => $field);
-                return call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
-            }
-            $field['type'] = $type;
-        }
-
-        if (!method_exists($this, "_get{$type}Declaration")) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'type not defined: '.$type, __FUNCTION__);
-        }
-        return $this->{"_get{$type}Declaration"}($name, $field);
-    }
-
-    // }}}
-    // {{{ getTypeDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare an text type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param array $field  associative array with the name of the properties
-     *      of the field being declared as array indexes. Currently, the types
-     *      of supported field properties are as follows:
-     *
-     *      length
-     *          Integer value that determines the maximum length of the text
-     *          field. If this argument is missing the field should be
-     *          declared to have the longest length allowed by the DBMS.
-     *
-     *      default
-     *          Text value to be used as default for this field.
-     *
-     *      notnull
-     *          Boolean flag that indicates whether this field is constrained
-     *          to not be set to null.
-     * @return string  DBMS specific SQL code portion that should be used to
-     *      declare the specified field.
-     * @access public
-     */
-    function getTypeDeclaration($field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        switch ($field['type']) {
-        case 'text':
-            $length = !empty($field['length']) ? $field['length'] : $db->options['default_text_field_length'];
-            $fixed = !empty($field['fixed']) ? $field['fixed'] : false;
-            return $fixed ? ($length ? 'CHAR('.$length.')' : 'CHAR('.$db->options['default_text_field_length'].')')
-                : ($length ? 'VARCHAR('.$length.')' : 'TEXT');
-        case 'clob':
-            return 'TEXT';
-        case 'blob':
-            return 'TEXT';
-        case 'integer':
-            return 'INT';
-        case 'boolean':
-            return 'INT';
-        case 'date':
-            return 'CHAR ('.strlen('YYYY-MM-DD').')';
-        case 'time':
-            return 'CHAR ('.strlen('HH:MM:SS').')';
-        case 'timestamp':
-            return 'CHAR ('.strlen('YYYY-MM-DD HH:MM:SS').')';
-        case 'float':
-            return 'TEXT';
-        case 'decimal':
-            return 'TEXT';
-        }
-        return '';
-    }
-
-    // }}}
-    // {{{ _getDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare a generic type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param string $name   name the field to be declared.
-     * @param array  $field  associative array with the name of the properties
-     *      of the field being declared as array indexes. Currently, the types
-     *      of supported field properties are as follows:
-     *
-     *      length
-     *          Integer value that determines the maximum length of the text
-     *          field. If this argument is missing the field should be
-     *          declared to have the longest length allowed by the DBMS.
-     *
-     *      default
-     *          Text value to be used as default for this field.
-     *
-     *      notnull
-     *          Boolean flag that indicates whether this field is constrained
-     *          to not be set to null.
-     *      charset
-     *          Text value with the default CHARACTER SET for this field.
-     *      collation
-     *          Text value with the default COLLATION for this field.
-     * @return string  DBMS specific SQL code portion that should be used to
-     *      declare the specified field, or a MDB2_Error on failure
-     * @access protected
-     */
-    function _getDeclaration($name, $field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $name = $db->quoteIdentifier($name, true);
-        $declaration_options = $db->datatype->_getDeclarationOptions($field);
-        if (PEAR::isError($declaration_options)) {
-            return $declaration_options;
-        }
-        return $name.' '.$this->getTypeDeclaration($field).$declaration_options;
-    }
-
-    // }}}
-    // {{{ _getDeclarationOptions()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare a generic type
-     * field to be used in statement like CREATE TABLE, without the field name
-     * and type values (ie. just the character set, default value, if the
-     * field is permitted to be NULL or not, and the collation options).
-     *
-     * @param array  $field  associative array with the name of the properties
-     *      of the field being declared as array indexes. Currently, the types
-     *      of supported field properties are as follows:
-     *
-     *      default
-     *          Text value to be used as default for this field.
-     *      notnull
-     *          Boolean flag that indicates whether this field is constrained
-     *          to not be set to null.
-     *      charset
-     *          Text value with the default CHARACTER SET for this field.
-     *      collation
-     *          Text value with the default COLLATION for this field.
-     * @return string  DBMS specific SQL code portion that should be used to
-     *      declare the specified field's options.
-     * @access protected
-     */
-    function _getDeclarationOptions($field)
-    {
-        $charset = empty($field['charset']) ? '' :
-            ' '.$this->_getCharsetFieldDeclaration($field['charset']);
-
-        $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
-        $default = '';
-        if (array_key_exists('default', $field)) {
-            if ($field['default'] === '') {
-                $db =$this->getDBInstance();
-                if (PEAR::isError($db)) {
-                    return $db;
-                }
-                $valid_default_values = $this->getValidTypes();
-                $field['default'] = $valid_default_values[$field['type']];
-                if ($field['default'] === ''&& ($db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL)) {
-                    $field['default'] = ' ';
-                }
-            }
-            if (!is_null($field['default'])) {
-                $default = ' DEFAULT ' . $this->quote($field['default'], $field['type']);
-            }
-        }
-
-        $collation = empty($field['collation']) ? '' :
-            ' '.$this->_getCollationFieldDeclaration($field['collation']);
-
-        return $charset.$default.$notnull.$collation;
-    }
-
-    // }}}
-    // {{{ _getCharsetFieldDeclaration()
-    
-    /**
-     * Obtain DBMS specific SQL code portion needed to set the CHARACTER SET
-     * of a field declaration to be used in statements like CREATE TABLE.
-     *
-     * @param string $charset   name of the charset
-     * @return string  DBMS specific SQL code portion needed to set the CHARACTER SET
-     *                 of a field declaration.
-     */
-    function _getCharsetFieldDeclaration($charset)
-    {
-        return '';
-    }
-
-    // }}}
-    // {{{ _getCollationFieldDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to set the COLLATION
-     * of a field declaration to be used in statements like CREATE TABLE.
-     *
-     * @param string $collation   name of the collation
-     * @return string  DBMS specific SQL code portion needed to set the COLLATION
-     *                 of a field declaration.
-     */
-    function _getCollationFieldDeclaration($collation)
-    {
-        return '';
-    }
-
-    // }}}
-    // {{{ _getIntegerDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare an integer type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param string $name name the field to be declared.
-     * @param array $field associative array with the name of the properties
-     *       of the field being declared as array indexes. Currently, the types
-     *       of supported field properties are as follows:
-     *
-     *       unsigned
-     *           Boolean flag that indicates whether the field should be
-     *           declared as unsigned integer if possible.
-     *
-     *       default
-     *           Integer value to be used as default for this field.
-     *
-     *       notnull
-     *           Boolean flag that indicates whether this field is constrained
-     *           to not be set to null.
-     * @return string DBMS specific SQL code portion that should be used to
-     *       declare the specified field.
-     * @access protected
-     */
-    function _getIntegerDeclaration($name, $field)
-    {
-        if (!empty($field['unsigned'])) {
-            $db =$this->getDBInstance();
-            if (PEAR::isError($db)) {
-                return $db;
-            }
-
-            $db->warnings[] = "unsigned integer field \"$name\" is being declared as signed integer";
-        }
-        return $this->_getDeclaration($name, $field);
-    }
-
-    // }}}
-    // {{{ _getTextDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare an text type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param string $name name the field to be declared.
-     * @param array $field associative array with the name of the properties
-     *       of the field being declared as array indexes. Currently, the types
-     *       of supported field properties are as follows:
-     *
-     *       length
-     *           Integer value that determines the maximum length of the text
-     *           field. If this argument is missing the field should be
-     *           declared to have the longest length allowed by the DBMS.
-     *
-     *       default
-     *           Text value to be used as default for this field.
-     *
-     *       notnull
-     *           Boolean flag that indicates whether this field is constrained
-     *           to not be set to null.
-     * @return string DBMS specific SQL code portion that should be used to
-     *       declare the specified field.
-     * @access protected
-     */
-    function _getTextDeclaration($name, $field)
-    {
-        return $this->_getDeclaration($name, $field);
-    }
-
-    // }}}
-    // {{{ _getCLOBDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare an character
-     * large object type field to be used in statements like CREATE TABLE.
-     *
-     * @param string $name name the field to be declared.
-     * @param array $field associative array with the name of the properties
-     *        of the field being declared as array indexes. Currently, the types
-     *        of supported field properties are as follows:
-     *
-     *        length
-     *            Integer value that determines the maximum length of the large
-     *            object field. If this argument is missing the field should be
-     *            declared to have the longest length allowed by the DBMS.
-     *
-     *        notnull
-     *            Boolean flag that indicates whether this field is constrained
-     *            to not be set to null.
-     * @return string DBMS specific SQL code portion that should be used to
-     *        declare the specified field.
-     * @access public
-     */
-    function _getCLOBDeclaration($name, $field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
-        $name = $db->quoteIdentifier($name, true);
-        return $name.' '.$this->getTypeDeclaration($field).$notnull;
-    }
-
-    // }}}
-    // {{{ _getBLOBDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare an binary large
-     * object type field to be used in statements like CREATE TABLE.
-     *
-     * @param string $name name the field to be declared.
-     * @param array $field associative array with the name of the properties
-     *        of the field being declared as array indexes. Currently, the types
-     *        of supported field properties are as follows:
-     *
-     *        length
-     *            Integer value that determines the maximum length of the large
-     *            object field. If this argument is missing the field should be
-     *            declared to have the longest length allowed by the DBMS.
-     *
-     *        notnull
-     *            Boolean flag that indicates whether this field is constrained
-     *            to not be set to null.
-     * @return string DBMS specific SQL code portion that should be used to
-     *        declare the specified field.
-     * @access protected
-     */
-    function _getBLOBDeclaration($name, $field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
-        $name = $db->quoteIdentifier($name, true);
-        return $name.' '.$this->getTypeDeclaration($field).$notnull;
-    }
-
-    // }}}
-    // {{{ _getBooleanDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare a boolean type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param string $name name the field to be declared.
-     * @param array $field associative array with the name of the properties
-     *       of the field being declared as array indexes. Currently, the types
-     *       of supported field properties are as follows:
-     *
-     *       default
-     *           Boolean value to be used as default for this field.
-     *
-     *       notnullL
-     *           Boolean flag that indicates whether this field is constrained
-     *           to not be set to null.
-     * @return string DBMS specific SQL code portion that should be used to
-     *       declare the specified field.
-     * @access protected
-     */
-    function _getBooleanDeclaration($name, $field)
-    {
-        return $this->_getDeclaration($name, $field);
-    }
-
-    // }}}
-    // {{{ _getDateDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare a date type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param string $name name the field to be declared.
-     * @param array $field associative array with the name of the properties
-     *       of the field being declared as array indexes. Currently, the types
-     *       of supported field properties are as follows:
-     *
-     *       default
-     *           Date value to be used as default for this field.
-     *
-     *       notnull
-     *           Boolean flag that indicates whether this field is constrained
-     *           to not be set to null.
-     * @return string DBMS specific SQL code portion that should be used to
-     *       declare the specified field.
-     * @access protected
-     */
-    function _getDateDeclaration($name, $field)
-    {
-        return $this->_getDeclaration($name, $field);
-    }
-
-    // }}}
-    // {{{ _getTimestampDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare a timestamp
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param string $name name the field to be declared.
-     * @param array $field associative array with the name of the properties
-     *       of the field being declared as array indexes. Currently, the types
-     *       of supported field properties are as follows:
-     *
-     *       default
-     *           Timestamp value to be used as default for this field.
-     *
-     *       notnull
-     *           Boolean flag that indicates whether this field is constrained
-     *           to not be set to null.
-     * @return string DBMS specific SQL code portion that should be used to
-     *       declare the specified field.
-     * @access protected
-     */
-    function _getTimestampDeclaration($name, $field)
-    {
-        return $this->_getDeclaration($name, $field);
-    }
-
-    // }}}
-    // {{{ _getTimeDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare a time
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param string $name name the field to be declared.
-     * @param array $field associative array with the name of the properties
-     *       of the field being declared as array indexes. Currently, the types
-     *       of supported field properties are as follows:
-     *
-     *       default
-     *           Time value to be used as default for this field.
-     *
-     *       notnull
-     *           Boolean flag that indicates whether this field is constrained
-     *           to not be set to null.
-     * @return string DBMS specific SQL code portion that should be used to
-     *       declare the specified field.
-     * @access protected
-     */
-    function _getTimeDeclaration($name, $field)
-    {
-        return $this->_getDeclaration($name, $field);
-    }
-
-    // }}}
-    // {{{ _getFloatDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare a float type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param string $name name the field to be declared.
-     * @param array $field associative array with the name of the properties
-     *       of the field being declared as array indexes. Currently, the types
-     *       of supported field properties are as follows:
-     *
-     *       default
-     *           Float value to be used as default for this field.
-     *
-     *       notnull
-     *           Boolean flag that indicates whether this field is constrained
-     *           to not be set to null.
-     * @return string DBMS specific SQL code portion that should be used to
-     *       declare the specified field.
-     * @access protected
-     */
-    function _getFloatDeclaration($name, $field)
-    {
-        return $this->_getDeclaration($name, $field);
-    }
-
-    // }}}
-    // {{{ _getDecimalDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare a decimal type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param string $name name the field to be declared.
-     * @param array $field associative array with the name of the properties
-     *       of the field being declared as array indexes. Currently, the types
-     *       of supported field properties are as follows:
-     *
-     *       default
-     *           Decimal value to be used as default for this field.
-     *
-     *       notnull
-     *           Boolean flag that indicates whether this field is constrained
-     *           to not be set to null.
-     * @return string DBMS specific SQL code portion that should be used to
-     *       declare the specified field.
-     * @access protected
-     */
-    function _getDecimalDeclaration($name, $field)
-    {
-        return $this->_getDeclaration($name, $field);
-    }
-
-    // }}}
-    // {{{ compareDefinition()
-
-    /**
-     * Obtain an array of changes that may need to applied
-     *
-     * @param array $current new definition
-     * @param array  $previous old definition
-     * @return array  containing all changes that will need to be applied
-     * @access public
-     */
-    function compareDefinition($current, $previous)
-    {
-        $type = !empty($current['type']) ? $current['type'] : null;
-
-        if (!method_exists($this, "_compare{$type}Definition")) {
-            $db =$this->getDBInstance();
-            if (PEAR::isError($db)) {
-                return $db;
-            }
-            if (!empty($db->options['datatype_map_callback'][$type])) {
-                $parameter = array('current' => $current, 'previous' => $previous);
-                $change =  call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
-                return $change;
-            }
-            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'type "'.$current['type'].'" is not yet supported', __FUNCTION__);
-        }
-
-        if (empty($previous['type']) || $previous['type'] != $type) {
-            return $current;
-        }
-
-        $change = $this->{"_compare{$type}Definition"}($current, $previous);
-
-        if ($previous['type'] != $type) {
-            $change['type'] = true;
-        }
-
-        $previous_notnull = !empty($previous['notnull']) ? $previous['notnull'] : false;
-        $notnull = !empty($current['notnull']) ? $current['notnull'] : false;
-        if ($previous_notnull != $notnull) {
-            $change['notnull'] = true;
-        }
-
-        $previous_default = array_key_exists('default', $previous) ? $previous['default'] :
-            ($previous_notnull ? '' : null);
-        $default = array_key_exists('default', $current) ? $current['default'] :
-            ($notnull ? '' : null);
-        if ($previous_default !== $default) {
-            $change['default'] = true;
-        }
-
-        return $change;
-    }
-
-    // }}}
-    // {{{ _compareIntegerDefinition()
-
-    /**
-     * Obtain an array of changes that may need to applied to an integer field
-     *
-     * @param array $current new definition
-     * @param array  $previous old definition
-     * @return array  containing all changes that will need to be applied
-     * @access protected
-     */
-    function _compareIntegerDefinition($current, $previous)
-    {
-        $change = array();
-        $previous_unsigned = !empty($previous['unsigned']) ? $previous['unsigned'] : false;
-        $unsigned = !empty($current['unsigned']) ? $current['unsigned'] : false;
-        if ($previous_unsigned != $unsigned) {
-            $change['unsigned'] = true;
-        }
-        $previous_autoincrement = !empty($previous['autoincrement']) ? $previous['autoincrement'] : false;
-        $autoincrement = !empty($current['autoincrement']) ? $current['autoincrement'] : false;
-        if ($previous_autoincrement != $autoincrement) {
-            $change['autoincrement'] = true;
-        }
-        return $change;
-    }
-
-    // }}}
-    // {{{ _compareTextDefinition()
-
-    /**
-     * Obtain an array of changes that may need to applied to an text field
-     *
-     * @param array $current new definition
-     * @param array  $previous old definition
-     * @return array  containing all changes that will need to be applied
-     * @access protected
-     */
-    function _compareTextDefinition($current, $previous)
-    {
-        $change = array();
-        $previous_length = !empty($previous['length']) ? $previous['length'] : 0;
-        $length = !empty($current['length']) ? $current['length'] : 0;
-        if ($previous_length != $length) {
-            $change['length'] = true;
-        }
-        $previous_fixed = !empty($previous['fixed']) ? $previous['fixed'] : 0;
-        $fixed = !empty($current['fixed']) ? $current['fixed'] : 0;
-        if ($previous_fixed != $fixed) {
-            $change['fixed'] = true;
-        }
-        return $change;
-    }
-
-    // }}}
-    // {{{ _compareCLOBDefinition()
-
-    /**
-     * Obtain an array of changes that may need to applied to an CLOB field
-     *
-     * @param array $current new definition
-     * @param array  $previous old definition
-     * @return array  containing all changes that will need to be applied
-     * @access protected
-     */
-    function _compareCLOBDefinition($current, $previous)
-    {
-        return $this->_compareTextDefinition($current, $previous);
-    }
-
-    // }}}
-    // {{{ _compareBLOBDefinition()
-
-    /**
-     * Obtain an array of changes that may need to applied to an BLOB field
-     *
-     * @param array $current new definition
-     * @param array  $previous old definition
-     * @return array  containing all changes that will need to be applied
-     * @access protected
-     */
-    function _compareBLOBDefinition($current, $previous)
-    {
-        return $this->_compareTextDefinition($current, $previous);
-    }
-
-    // }}}
-    // {{{ _compareDateDefinition()
-
-    /**
-     * Obtain an array of changes that may need to applied to an date field
-     *
-     * @param array $current new definition
-     * @param array  $previous old definition
-     * @return array  containing all changes that will need to be applied
-     * @access protected
-     */
-    function _compareDateDefinition($current, $previous)
-    {
-        return array();
-    }
-
-    // }}}
-    // {{{ _compareTimeDefinition()
-
-    /**
-     * Obtain an array of changes that may need to applied to an time field
-     *
-     * @param array $current new definition
-     * @param array  $previous old definition
-     * @return array  containing all changes that will need to be applied
-     * @access protected
-     */
-    function _compareTimeDefinition($current, $previous)
-    {
-        return array();
-    }
-
-    // }}}
-    // {{{ _compareTimestampDefinition()
-
-    /**
-     * Obtain an array of changes that may need to applied to an timestamp field
-     *
-     * @param array $current new definition
-     * @param array  $previous old definition
-     * @return array  containing all changes that will need to be applied
-     * @access protected
-     */
-    function _compareTimestampDefinition($current, $previous)
-    {
-        return array();
-    }
-
-    // }}}
-    // {{{ _compareBooleanDefinition()
-
-    /**
-     * Obtain an array of changes that may need to applied to an boolean field
-     *
-     * @param array $current new definition
-     * @param array  $previous old definition
-     * @return array  containing all changes that will need to be applied
-     * @access protected
-     */
-    function _compareBooleanDefinition($current, $previous)
-    {
-        return array();
-    }
-
-    // }}}
-    // {{{ _compareFloatDefinition()
-
-    /**
-     * Obtain an array of changes that may need to applied to an float field
-     *
-     * @param array $current new definition
-     * @param array  $previous old definition
-     * @return array  containing all changes that will need to be applied
-     * @access protected
-     */
-    function _compareFloatDefinition($current, $previous)
-    {
-        return array();
-    }
-
-    // }}}
-    // {{{ _compareDecimalDefinition()
-
-    /**
-     * Obtain an array of changes that may need to applied to an decimal field
-     *
-     * @param array $current new definition
-     * @param array  $previous old definition
-     * @return array  containing all changes that will need to be applied
-     * @access protected
-     */
-    function _compareDecimalDefinition($current, $previous)
-    {
-        return array();
-    }
-
-    // }}}
-    // {{{ quote()
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     * compose query statements.
-     *
-     * @param string $value text string value that is intended to be converted.
-     * @param string $type type to which the value should be converted to
-     * @param bool $quote determines if the value should be quoted and escaped
-     * @param bool $escape_wildcards if to escape escape wildcards
-     * @return string text string that represents the given argument value in
-     *       a DBMS specific format.
-     * @access public
-     */
-    function quote($value, $type = null, $quote = true, $escape_wildcards = false)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if (is_null($value)
-            || ($value === '' && $db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL)
-        ) {
-            if (!$quote) {
-                return null;
-            }
-            return 'NULL';
-        }
-
-        if (is_null($type)) {
-            switch (gettype($value)) {
-            case 'integer':
-                $type = 'integer';
-                break;
-            case 'double':
-                // todo: default to decimal as float is quite unusual
-                // $type = 'float';
-                $type = 'decimal';
-                break;
-            case 'boolean':
-                $type = 'boolean';
-                break;
-            case 'array':
-                 $value = serialize($value);
-            case 'object':
-                 $type = 'text';
-                break;
-            default:
-                if (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}$/', $value)) {
-                    $type = 'timestamp';
-                } elseif (preg_match('/^\d{2}:\d{2}$/', $value)) {
-                    $type = 'time';
-                } elseif (preg_match('/^\d{4}-\d{2}-\d{2}$/', $value)) {
-                    $type = 'date';
-                } else {
-                    $type = 'text';
-                }
-                break;
-            }
-        } elseif (!empty($db->options['datatype_map'][$type])) {
-            $type = $db->options['datatype_map'][$type];
-            if (!empty($db->options['datatype_map_callback'][$type])) {
-                $parameter = array('type' => $type, 'value' => $value, 'quote' => $quote, 'escape_wildcards' => $escape_wildcards);
-                return call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
-            }
-        }
-
-        if (!method_exists($this, "_quote{$type}")) {
-            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'type not defined: '.$type, __FUNCTION__);
-        }
-        $value = $this->{"_quote{$type}"}($value, $quote, $escape_wildcards);
-        if ($quote && $escape_wildcards && $db->string_quoting['escape_pattern']
-            && $db->string_quoting['escape'] !== $db->string_quoting['escape_pattern']
-        ) {
-            $value.= $this->patternEscapeString();
-        }
-        return $value;
-    }
-
-    // }}}
-    // {{{ _quoteInteger()
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     * compose query statements.
-     *
-     * @param string $value text string value that is intended to be converted.
-     * @param bool $quote determines if the value should be quoted and escaped
-     * @param bool $escape_wildcards if to escape escape wildcards
-     * @return string text string that represents the given argument value in
-     *       a DBMS specific format.
-     * @access protected
-     */
-    function _quoteInteger($value, $quote, $escape_wildcards)
-    {
-        return (int)$value;
-    }
-
-    // }}}
-    // {{{ _quoteText()
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     * compose query statements.
-     *
-     * @param string $value text string value that is intended to be converted.
-     * @param bool $quote determines if the value should be quoted and escaped
-     * @param bool $escape_wildcards if to escape escape wildcards
-     * @return string text string that already contains any DBMS specific
-     *       escaped character sequences.
-     * @access protected
-     */
-    function _quoteText($value, $quote, $escape_wildcards)
-    {
-        if (!$quote) {
-            return $value;
-        }
-
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $value = $db->escape($value, $escape_wildcards);
-        if (PEAR::isError($value)) {
-            return $value;
-        }
-        return "'".$value."'";
-    }
-
-    // }}}
-    // {{{ _readFile()
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     * compose query statements.
-     *
-     * @param string $value text string value that is intended to be converted.
-     * @return string text string that represents the given argument value in
-     *       a DBMS specific format.
-     * @access protected
-     */
-    function _readFile($value)
-    {
-        $close = false;
-        if (preg_match('/^(\w+:\/\/)(.*)$/', $value, $match)) {
-            $close = true;
-            if ($match[1] == 'file://') {
-                $value = $match[2];
-            }
-            $value = @fopen($value, 'r');
-        }
-
-        if (is_resource($value)) {
-            $db =$this->getDBInstance();
-            if (PEAR::isError($db)) {
-                return $db;
-            }
-
-            $fp = $value;
-            $value = '';
-            while (!@feof($fp)) {
-                $value.= @fread($fp, $db->options['lob_buffer_length']);
-            }
-            if ($close) {
-                @fclose($fp);
-            }
-        }
-
-        return $value;
-    }
-
-    // }}}
-    // {{{ _quoteLOB()
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     * compose query statements.
-     *
-     * @param string $value text string value that is intended to be converted.
-     * @param bool $quote determines if the value should be quoted and escaped
-     * @param bool $escape_wildcards if to escape escape wildcards
-     * @return string text string that represents the given argument value in
-     *       a DBMS specific format.
-     * @access protected
-     */
-    function _quoteLOB($value, $quote, $escape_wildcards)
-    {
-        $value = $this->_readFile($value);
-        if (PEAR::isError($value)) {
-            return $value;
-        }
-        return $this->_quoteText($value, $quote, $escape_wildcards);
-    }
-
-    // }}}
-    // {{{ _quoteCLOB()
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     * compose query statements.
-     *
-     * @param string $value text string value that is intended to be converted.
-     * @param bool $quote determines if the value should be quoted and escaped
-     * @param bool $escape_wildcards if to escape escape wildcards
-     * @return string text string that represents the given argument value in
-     *       a DBMS specific format.
-     * @access protected
-     */
-    function _quoteCLOB($value, $quote, $escape_wildcards)
-    {
-        return $this->_quoteLOB($value, $quote, $escape_wildcards);
-    }
-
-    // }}}
-    // {{{ _quoteBLOB()
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     * compose query statements.
-     *
-     * @param string $value text string value that is intended to be converted.
-     * @param bool $quote determines if the value should be quoted and escaped
-     * @param bool $escape_wildcards if to escape escape wildcards
-     * @return string text string that represents the given argument value in
-     *       a DBMS specific format.
-     * @access protected
-     */
-    function _quoteBLOB($value, $quote, $escape_wildcards)
-    {
-        return $this->_quoteLOB($value, $quote, $escape_wildcards);
-    }
-
-    // }}}
-    // {{{ _quoteBoolean()
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     * compose query statements.
-     *
-     * @param string $value text string value that is intended to be converted.
-     * @param bool $quote determines if the value should be quoted and escaped
-     * @param bool $escape_wildcards if to escape escape wildcards
-     * @return string text string that represents the given argument value in
-     *       a DBMS specific format.
-     * @access protected
-     */
-    function _quoteBoolean($value, $quote, $escape_wildcards)
-    {
-        return ($value ? 1 : 0);
-    }
-
-    // }}}
-    // {{{ _quoteDate()
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     * compose query statements.
-     *
-     * @param string $value text string value that is intended to be converted.
-     * @param bool $quote determines if the value should be quoted and escaped
-     * @param bool $escape_wildcards if to escape escape wildcards
-     * @return string text string that represents the given argument value in
-     *       a DBMS specific format.
-     * @access protected
-     */
-    function _quoteDate($value, $quote, $escape_wildcards)
-    {
-        if ($value === 'CURRENT_DATE') {
-            $db =$this->getDBInstance();
-            if (PEAR::isError($db)) {
-                return $db;
-            }
-            if (isset($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
-                return $db->function->now('date');
-            }
-            return 'CURRENT_DATE';
-        }
-        return $this->_quoteText($value, $quote, $escape_wildcards);
-    }
-
-    // }}}
-    // {{{ _quoteTimestamp()
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     * compose query statements.
-     *
-     * @param string $value text string value that is intended to be converted.
-     * @param bool $quote determines if the value should be quoted and escaped
-     * @param bool $escape_wildcards if to escape escape wildcards
-     * @return string text string that represents the given argument value in
-     *       a DBMS specific format.
-     * @access protected
-     */
-    function _quoteTimestamp($value, $quote, $escape_wildcards)
-    {
-        if ($value === 'CURRENT_TIMESTAMP') {
-            $db =$this->getDBInstance();
-            if (PEAR::isError($db)) {
-                return $db;
-            }
-            if (isset($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
-                return $db->function->now('timestamp');
-            }
-            return 'CURRENT_TIMESTAMP';
-        }
-        return $this->_quoteText($value, $quote, $escape_wildcards);
-    }
-
-    // }}}
-    // {{{ _quoteTime()
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     *       compose query statements.
-     *
-     * @param string $value text string value that is intended to be converted.
-     * @param bool $quote determines if the value should be quoted and escaped
-     * @param bool $escape_wildcards if to escape escape wildcards
-     * @return string text string that represents the given argument value in
-     *       a DBMS specific format.
-     * @access protected
-     */
-    function _quoteTime($value, $quote, $escape_wildcards)
-    {
-        if ($value === 'CURRENT_TIME') {
-            $db =$this->getDBInstance();
-            if (PEAR::isError($db)) {
-                return $db;
-            }
-            if (isset($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
-                return $db->function->now('time');
-            }
-            return 'CURRENT_TIME';
-        }
-        return $this->_quoteText($value, $quote, $escape_wildcards);
-    }
-
-    // }}}
-    // {{{ _quoteFloat()
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     * compose query statements.
-     *
-     * @param string $value text string value that is intended to be converted.
-     * @param bool $quote determines if the value should be quoted and escaped
-     * @param bool $escape_wildcards if to escape escape wildcards
-     * @return string text string that represents the given argument value in
-     *       a DBMS specific format.
-     * @access protected
-     */
-    function _quoteFloat($value, $quote, $escape_wildcards)
-    {
-        if (preg_match('/^(.*)e([-+])(\d+)$/i', $value, $matches)) {
-            $decimal = $this->_quoteDecimal($matches[1], $quote, $escape_wildcards);
-            $sign = $matches[2];
-            $exponent = str_pad($matches[3], 2, '0', STR_PAD_LEFT);
-            $value = $decimal.'E'.$sign.$exponent;
-        } else {
-            $value = $this->_quoteDecimal($value, $quote, $escape_wildcards);
-        }
-        return $value;
-    }
-
-    // }}}
-    // {{{ _quoteDecimal()
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     * compose query statements.
-     *
-     * @param string $value text string value that is intended to be converted.
-     * @param bool $quote determines if the value should be quoted and escaped
-     * @param bool $escape_wildcards if to escape escape wildcards
-     * @return string text string that represents the given argument value in
-     *       a DBMS specific format.
-     * @access protected
-     */
-    function _quoteDecimal($value, $quote, $escape_wildcards)
-    {
-        $value = (string)$value;
-        $value = preg_replace('/[^\d\.,\-+eE]/', '', $value);
-        if (preg_match('/[^\.\d]/', $value)) {
-            if (strpos($value, ',')) {
-                // 1000,00
-                if (!strpos($value, '.')) {
-                    // convert the last "," to a "."
-                    $value = strrev(str_replace(',', '.', strrev($value)));
-                // 1.000,00
-                } elseif (strpos($value, '.') && strpos($value, '.') < strpos($value, ',')) {
-                    $value = str_replace('.', '', $value);
-                    // convert the last "," to a "."
-                    $value = strrev(str_replace(',', '.', strrev($value)));
-                // 1,000.00
-                } else {
-                    $value = str_replace(',', '', $value);
-                }
-            }
-        }
-        return $value;
-    }
-
-    // }}}
-    // {{{ writeLOBToFile()
-
-    /**
-     * retrieve LOB from the database
-     *
-     * @param resource $lob stream handle
-     * @param string $file name of the file into which the LOb should be fetched
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access protected
-     */
-    function writeLOBToFile($lob, $file)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if (preg_match('/^(\w+:\/\/)(.*)$/', $file, $match)) {
-            if ($match[1] == 'file://') {
-                $file = $match[2];
-            }
-        }
-
-        $fp = @fopen($file, 'wb');
-        while (!@feof($lob)) {
-            $result = @fread($lob, $db->options['lob_buffer_length']);
-            $read = strlen($result);
-            if (@fwrite($fp, $result, $read) != $read) {
-                @fclose($fp);
-                return $db->raiseError(MDB2_ERROR, null, null,
-                    'could not write to the output file', __FUNCTION__);
-            }
-        }
-        @fclose($fp);
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ _retrieveLOB()
-
-    /**
-     * retrieve LOB from the database
-     *
-     * @param array $lob array
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access protected
-     */
-    function _retrieveLOB(&$lob)
-    {
-        if (is_null($lob['value'])) {
-            $lob['value'] = $lob['resource'];
-        }
-        $lob['loaded'] = true;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ readLOB()
-
-    /**
-     * Read data from large object input stream.
-     *
-     * @param resource $lob stream handle
-     * @param string $data reference to a variable that will hold data
-     *                          to be read from the large object input stream
-     * @param integer $length    value that indicates the largest ammount ofdata
-     *                          to be read from the large object input stream.
-     * @return mixed the effective number of bytes read from the large object
-     *                      input stream on sucess or an MDB2 error object.
-     * @access public
-     * @see endOfLOB()
-     */
-    function _readLOB($lob, $length)
-    {
-        return substr($lob['value'], $lob['position'], $length);
-    }
-
-    // }}}
-    // {{{ _endOfLOB()
-
-    /**
-     * Determine whether it was reached the end of the large object and
-     * therefore there is no more data to be read for the its input stream.
-     *
-     * @param array $lob array
-     * @return mixed true or false on success, a MDB2 error on failure
-     * @access protected
-     */
-    function _endOfLOB($lob)
-    {
-        return $lob['endOfLOB'];
-    }
-
-    // }}}
-    // {{{ destroyLOB()
-
-    /**
-     * Free any resources allocated during the lifetime of the large object
-     * handler object.
-     *
-     * @param resource $lob stream handle
-     * @access public
-     */
-    function destroyLOB($lob)
-    {
-        $lob_data = stream_get_meta_data($lob);
-        $lob_index = $lob_data['wrapper_data']->lob_index;
-        fclose($lob);
-        if (isset($this->lobs[$lob_index])) {
-            $this->_destroyLOB($this->lobs[$lob_index]);
-            unset($this->lobs[$lob_index]);
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ _destroyLOB()
-
-    /**
-     * Free any resources allocated during the lifetime of the large object
-     * handler object.
-     *
-     * @param array $lob array
-     * @access private
-     */
-    function _destroyLOB(&$lob)
-    {
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ implodeArray()
-
-    /**
-     * apply a type to all values of an array and return as a comma seperated string
-     * useful for generating IN statements
-     *
-     * @access public
-     *
-     * @param array $array data array
-     * @param string $type determines type of the field
-     *
-     * @return string comma seperated values
-     */
-    function implodeArray($array, $type = false)
-    {
-        if (!is_array($array) || empty($array)) {
-            return 'NULL';
-        }
-        if ($type) {
-            foreach ($array as $value) {
-                $return[] = $this->quote($value, $type);
-            }
-        } else {
-            $return = $array;
-        }
-        return implode(', ', $return);
-    }
-
-    // }}}
-    // {{{ matchPattern()
-
-    /**
-     * build a pattern matching string
-     *
-     * @access public
-     *
-     * @param array $pattern even keys are strings, odd are patterns (% and _)
-     * @param string $operator optional pattern operator (LIKE, ILIKE and maybe others in the future)
-     * @param string $field optional field name that is being matched against
-     *                  (might be required when emulating ILIKE)
-     *
-     * @return string SQL pattern
-     */
-    function matchPattern($pattern, $operator = null, $field = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $match = '';
-        if (!is_null($operator)) {
-            $operator = strtoupper($operator);
-            switch ($operator) {
-            // case insensitive
-            case 'ILIKE':
-                if (is_null($field)) {
-                    return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                        'case insensitive LIKE matching requires passing the field name', __FUNCTION__);
-                }
-                $db->loadModule('Function', null, true);
-                $match = $db->function->lower($field).' LIKE ';
-                break;
-            // case sensitive
-            case 'LIKE':
-                $match = is_null($field) ? 'LIKE ' : $field.' LIKE ';
-                break;
-            default:
-                return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                    'not a supported operator type:'. $operator, __FUNCTION__);
-            }
-        }
-        $match.= "'";
-        foreach ($pattern as $key => $value) {
-            if ($key % 2) {
-                $match.= $value;
-            } else {
-                if ($operator === 'ILIKE') {
-                    $value = strtolower($value);
-                }
-                $escaped = $db->escape($value);
-                if (PEAR::isError($escaped)) {
-                    return $escaped;
-                }
-                $match.= $db->escapePattern($escaped);
-            }
-        }
-        $match.= "'";
-        $match.= $this->patternEscapeString();
-        return $match;
-    }
-
-    // }}}
-    // {{{ patternEscapeString()
-
-    /**
-     * build string to define pattern escape character
-     *
-     * @access public
-     *
-     * @return string define pattern escape character
-     */
-    function patternEscapeString()
-    {
-        return '';
-    }
-
-    // }}}
-    // {{{ mapNativeDatatype()
-
-    /**
-     * Maps a native array description of a field to a MDB2 datatype and length
-     *
-     * @param array  $field native field description
-     * @return array containing the various possible types, length, sign, fixed
-     * @access public
-     */
-    function mapNativeDatatype($field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        // If the user has specified an option to map the native field
-        // type to a custom MDB2 datatype...
-        $db_type = strtok($field['type'], '(), ');
-        if (!empty($db->options['nativetype_map_callback'][$db_type])) {
-            return call_user_func_array($db->options['nativetype_map_callback'][$db_type], array($db, $field));
-        }
-
-        // Otherwise perform the built-in (i.e. normal) MDB2 native type to
-        // MDB2 datatype conversion
-        return $this->_mapNativeDatatype($field);
-    }
-
-    // }}}
-    // {{{ _mapNativeDatatype()
-
-    /**
-     * Maps a native array description of a field to a MDB2 datatype and length
-     *
-     * @param array  $field native field description
-     * @return array containing the various possible types, length, sign, fixed
-     * @access public
-     */
-    function _mapNativeDatatype($field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ mapPrepareDatatype()
-
-    /**
-     * Maps an mdb2 datatype to mysqli prepare type
-     *
-     * @param string $type
-     * @return string
-     * @access public
-     */
-    function mapPrepareDatatype($type)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if (!empty($db->options['datatype_map'][$type])) {
-            $type = $db->options['datatype_map'][$type];
-            if (!empty($db->options['datatype_map_callback'][$type])) {
-                $parameter = array('type' => $type);
-                return call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
-            }
-        }
-
-        return $type;
-    }
-}
-?>
diff --git a/3rdparty/MDB2/Driver/Datatype/mysql.php b/3rdparty/MDB2/Driver/Datatype/mysql.php
deleted file mode 100644
index 93dd40524e6..00000000000
--- a/3rdparty/MDB2/Driver/Datatype/mysql.php
+++ /dev/null
@@ -1,553 +0,0 @@
-<?php
-// vim: set et ts=4 sw=4 fdm=marker:
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: mysql.php,v 1.65 2008/02/22 19:23:49 quipo Exp $
-//
-
-require_once('MDB2/Driver/Datatype/Common.php');
-
-/**
- * MDB2 MySQL driver
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Datatype_mysql extends MDB2_Driver_Datatype_Common
-{
-    // {{{ _getCharsetFieldDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to set the CHARACTER SET
-     * of a field declaration to be used in statements like CREATE TABLE.
-     *
-     * @param string $charset   name of the charset
-     * @return string  DBMS specific SQL code portion needed to set the CHARACTER SET
-     *                 of a field declaration.
-     */
-    function _getCharsetFieldDeclaration($charset)
-    {
-        return 'CHARACTER SET '.$charset;
-    }
-
-    // }}}
-    // {{{ _getCollationFieldDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to set the COLLATION
-     * of a field declaration to be used in statements like CREATE TABLE.
-     *
-     * @param string $collation   name of the collation
-     * @return string  DBMS specific SQL code portion needed to set the COLLATION
-     *                 of a field declaration.
-     */
-    function _getCollationFieldDeclaration($collation)
-    {
-        return 'COLLATE '.$collation;
-    }
-
-    // }}}
-    // {{{ getTypeDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare an text type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param array $field  associative array with the name of the properties
-     *      of the field being declared as array indexes. Currently, the types
-     *      of supported field properties are as follows:
-     *
-     *      length
-     *          Integer value that determines the maximum length of the text
-     *          field. If this argument is missing the field should be
-     *          declared to have the longest length allowed by the DBMS.
-     *
-     *      default
-     *          Text value to be used as default for this field.
-     *
-     *      notnull
-     *          Boolean flag that indicates whether this field is constrained
-     *          to not be set to null.
-     * @return string  DBMS specific SQL code portion that should be used to
-     *      declare the specified field.
-     * @access public
-     */
-    function getTypeDeclaration($field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        switch ($field['type']) {
-        case 'text':
-            if (empty($field['length']) && array_key_exists('default', $field)) {
-                $field['length'] = $db->varchar_max_length;
-            }
-            $length = !empty($field['length']) ? $field['length'] : false;
-            $fixed = !empty($field['fixed']) ? $field['fixed'] : false;
-            return $fixed ? ($length ? 'CHAR('.$length.')' : 'CHAR(255)')
-                : ($length ? 'VARCHAR('.$length.')' : 'TEXT');
-        case 'clob':
-            if (!empty($field['length'])) {
-                $length = $field['length'];
-                if ($length <= 255) {
-                    return 'TINYTEXT';
-                } elseif ($length <= 65532) {
-                    return 'TEXT';
-                } elseif ($length <= 16777215) {
-                    return 'MEDIUMTEXT';
-                }
-            }
-            return 'LONGTEXT';
-        case 'blob':
-            if (!empty($field['length'])) {
-                $length = $field['length'];
-                if ($length <= 255) {
-                    return 'TINYBLOB';
-                } elseif ($length <= 65532) {
-                    return 'BLOB';
-                } elseif ($length <= 16777215) {
-                    return 'MEDIUMBLOB';
-                }
-            }
-            return 'LONGBLOB';
-        case 'integer':
-            if (!empty($field['length'])) {
-                $length = $field['length'];
-                if ($length <= 1) {
-                    return 'TINYINT';
-                } elseif ($length == 2) {
-                    return 'SMALLINT';
-                } elseif ($length == 3) {
-                    return 'MEDIUMINT';
-                } elseif ($length == 4) {
-                    return 'INT';
-                } elseif ($length > 4) {
-                    return 'BIGINT';
-                }
-            }
-            return 'INT';
-        case 'boolean':
-            return 'TINYINT(1)';
-        case 'date':
-            return 'DATE';
-        case 'time':
-            return 'TIME';
-        case 'timestamp':
-            return 'DATETIME';
-        case 'float':
-            return 'DOUBLE';
-        case 'decimal':
-            $length = !empty($field['length']) ? $field['length'] : 18;
-            $scale = !empty($field['scale']) ? $field['scale'] : $db->options['decimal_places'];
-            return 'DECIMAL('.$length.','.$scale.')';
-        }
-        return '';
-    }
-
-    // }}}
-    // {{{ _getIntegerDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare an integer type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param string  $name   name the field to be declared.
-     * @param string  $field  associative array with the name of the properties
-     *                        of the field being declared as array indexes.
-     *                        Currently, the types of supported field
-     *                        properties are as follows:
-     *
-     *                       unsigned
-     *                        Boolean flag that indicates whether the field
-     *                        should be declared as unsigned integer if
-     *                        possible.
-     *
-     *                       default
-     *                        Integer value to be used as default for this
-     *                        field.
-     *
-     *                       notnull
-     *                        Boolean flag that indicates whether this field is
-     *                        constrained to not be set to null.
-     * @return string  DBMS specific SQL code portion that should be used to
-     *                 declare the specified field.
-     * @access protected
-     */
-    function _getIntegerDeclaration($name, $field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $default = $autoinc = '';
-        if (!empty($field['autoincrement'])) {
-            $autoinc = ' AUTO_INCREMENT PRIMARY KEY';
-        } elseif (array_key_exists('default', $field)) {
-            if ($field['default'] === '') {
-                $field['default'] = empty($field['notnull']) ? null : 0;
-            }
-            $default = ' DEFAULT '.$this->quote($field['default'], 'integer');
-        }
-
-        $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
-        $unsigned = empty($field['unsigned']) ? '' : ' UNSIGNED';
-        $name = $db->quoteIdentifier($name, true);
-        return $name.' '.$this->getTypeDeclaration($field).$unsigned.$default.$notnull.$autoinc;
-    }
-
-    // }}}
-    // {{{ _getFloatDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare an float type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param string  $name   name the field to be declared.
-     * @param string  $field  associative array with the name of the properties
-     *                        of the field being declared as array indexes.
-     *                        Currently, the types of supported field
-     *                        properties are as follows:
-     *
-     *                       unsigned
-     *                        Boolean flag that indicates whether the field
-     *                        should be declared as unsigned float if
-     *                        possible.
-     *
-     *                       default
-     *                        float value to be used as default for this
-     *                        field.
-     *
-     *                       notnull
-     *                        Boolean flag that indicates whether this field is
-     *                        constrained to not be set to null.
-     * @return string  DBMS specific SQL code portion that should be used to
-     *                 declare the specified field.
-     * @access protected
-     */
-    function _getFloatDeclaration($name, $field)
-    {
-        // Since AUTO_INCREMENT can be used for integer or floating-point types,
-        // reuse the INTEGER declaration
-        // @see http://bugs.mysql.com/bug.php?id=31032
-        return $this->_getIntegerDeclaration($name, $field);
-    }
-
-    // }}}
-    // {{{ _getDecimalDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare an decimal type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param string  $name   name the field to be declared.
-     * @param string  $field  associative array with the name of the properties
-     *                        of the field being declared as array indexes.
-     *                        Currently, the types of supported field
-     *                        properties are as follows:
-     *
-     *                       unsigned
-     *                        Boolean flag that indicates whether the field
-     *                        should be declared as unsigned integer if
-     *                        possible.
-     *
-     *                       default
-     *                        Decimal value to be used as default for this
-     *                        field.
-     *
-     *                       notnull
-     *                        Boolean flag that indicates whether this field is
-     *                        constrained to not be set to null.
-     * @return string  DBMS specific SQL code portion that should be used to
-     *                 declare the specified field.
-     * @access protected
-     */
-    function _getDecimalDeclaration($name, $field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $default = '';
-        if (array_key_exists('default', $field)) {
-            if ($field['default'] === '') {
-                $field['default'] = empty($field['notnull']) ? null : 0;
-            }
-            $default = ' DEFAULT '.$this->quote($field['default'], 'integer');
-        } elseif (empty($field['notnull'])) {
-            $default = ' DEFAULT NULL';
-        }
-
-        $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
-        $unsigned = empty($field['unsigned']) ? '' : ' UNSIGNED';
-        $name = $db->quoteIdentifier($name, true);
-        return $name.' '.$this->getTypeDeclaration($field).$unsigned.$default.$notnull;
-    }
-
-    // }}}
-    // {{{ matchPattern()
-
-    /**
-     * build a pattern matching string
-     *
-     * @access public
-     *
-     * @param array $pattern even keys are strings, odd are patterns (% and _)
-     * @param string $operator optional pattern operator (LIKE, ILIKE and maybe others in the future)
-     * @param string $field optional field name that is being matched against
-     *                  (might be required when emulating ILIKE)
-     *
-     * @return string SQL pattern
-     */
-    function matchPattern($pattern, $operator = null, $field = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $match = '';
-        if (!is_null($operator)) {
-            $field = is_null($field) ? '' : $field.' ';
-            $operator = strtoupper($operator);
-            switch ($operator) {
-            // case insensitive
-            case 'ILIKE':
-                $match = $field.'LIKE ';
-                break;
-            // case sensitive
-            case 'LIKE':
-                $match = $field.'LIKE BINARY ';
-                break;
-            default:
-                return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                    'not a supported operator type:'. $operator, __FUNCTION__);
-            }
-        }
-        $match.= "'";
-        foreach ($pattern as $key => $value) {
-            if ($key % 2) {
-                $match.= $value;
-            } else {
-                $match.= $db->escapePattern($db->escape($value));
-            }
-        }
-        $match.= "'";
-        $match.= $this->patternEscapeString();
-        return $match;
-    }
-
-    // }}}
-    // {{{ _mapNativeDatatype()
-
-    /**
-     * Maps a native array description of a field to a MDB2 datatype and length
-     *
-     * @param array  $field native field description
-     * @return array containing the various possible types, length, sign, fixed
-     * @access public
-     */
-    function _mapNativeDatatype($field)
-    {
-        $db_type = strtolower($field['type']);
-        $db_type = strtok($db_type, '(), ');
-        if ($db_type == 'national') {
-            $db_type = strtok('(), ');
-        }
-        if (!empty($field['length'])) {
-            $length = strtok($field['length'], ', ');
-            $decimal = strtok(', ');
-        } else {
-            $length = strtok('(), ');
-            $decimal = strtok('(), ');
-        }
-        $type = array();
-        $unsigned = $fixed = null;
-        switch ($db_type) {
-        case 'tinyint':
-            $type[] = 'integer';
-            $type[] = 'boolean';
-            if (preg_match('/^(is|has)/', $field['name'])) {
-                $type = array_reverse($type);
-            }
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            $length = 1;
-            break;
-        case 'smallint':
-            $type[] = 'integer';
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            $length = 2;
-            break;
-        case 'mediumint':
-            $type[] = 'integer';
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            $length = 3;
-            break;
-        case 'int':
-        case 'integer':
-            $type[] = 'integer';
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            $length = 4;
-            break;
-        case 'bigint':
-            $type[] = 'integer';
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            $length = 8;
-            break;
-        case 'tinytext':
-        case 'mediumtext':
-        case 'longtext':
-        case 'text':
-        case 'varchar':
-            $fixed = false;
-        case 'string':
-        case 'char':
-            $type[] = 'text';
-            if ($length == '1') {
-                $type[] = 'boolean';
-                if (preg_match('/^(is|has)/', $field['name'])) {
-                    $type = array_reverse($type);
-                }
-            } elseif (strstr($db_type, 'text')) {
-                $type[] = 'clob';
-                if ($decimal == 'binary') {
-                    $type[] = 'blob';
-                }
-                $type = array_reverse($type);
-            }
-            if ($fixed !== false) {
-                $fixed = true;
-            }
-            break;
-        case 'enum':
-            $type[] = 'text';
-            preg_match_all('/\'.+\'/U', $field['type'], $matches);
-            $length = 0;
-            $fixed = false;
-            if (is_array($matches)) {
-                foreach ($matches[0] as $value) {
-                    $length = max($length, strlen($value)-2);
-                }
-                if ($length == '1' && count($matches[0]) == 2) {
-                    $type[] = 'boolean';
-                    if (preg_match('/^(is|has)/', $field['name'])) {
-                        $type = array_reverse($type);
-                    }
-                }
-            }
-            $type[] = 'integer';
-        case 'set':
-            $fixed = false;
-            $type[] = 'text';
-            $type[] = 'integer';
-            break;
-        case 'date':
-            $type[] = 'date';
-            $length = null;
-            break;
-        case 'datetime':
-        case 'timestamp':
-            $type[] = 'timestamp';
-            $length = null;
-            break;
-        case 'time':
-            $type[] = 'time';
-            $length = null;
-            break;
-        case 'float':
-        case 'double':
-        case 'real':
-            $type[] = 'float';
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            break;
-        case 'unknown':
-        case 'decimal':
-        case 'numeric':
-            $type[] = 'decimal';
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            if ($decimal !== false) {
-                $length = $length.','.$decimal;
-            }
-            break;
-        case 'tinyblob':
-        case 'mediumblob':
-        case 'longblob':
-        case 'blob':
-            $type[] = 'blob';
-            $length = null;
-            break;
-        case 'binary':
-        case 'varbinary':
-            $type[] = 'blob';
-            break;
-        case 'year':
-            $type[] = 'integer';
-            $type[] = 'date';
-            $length = null;
-            break;
-        default:
-            $db =$this->getDBInstance();
-            if (PEAR::isError($db)) {
-                return $db;
-            }
-
-            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'unknown database attribute type: '.$db_type, __FUNCTION__);
-        }
-
-        if ((int)$length <= 0) {
-            $length = null;
-        }
-
-        return array($type, $length, $unsigned, $fixed);
-    }
-
-    // }}}
-}
-
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Datatype/pgsql.php b/3rdparty/MDB2/Driver/Datatype/pgsql.php
deleted file mode 100644
index e72aa743b73..00000000000
--- a/3rdparty/MDB2/Driver/Datatype/pgsql.php
+++ /dev/null
@@ -1,554 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Paul Cooper <pgc@ucecom.com>                                 |
-// +----------------------------------------------------------------------+
-//
-// $Id: pgsql.php,v 1.93 2008/08/28 20:32:57 afz Exp $
-
-require_once('MDB2/Driver/Datatype/Common.php');
-
-/**
- * MDB2 PostGreSQL driver
- *
- * @package MDB2
- * @category Database
- * @author  Paul Cooper <pgc@ucecom.com>
- */
-class MDB2_Driver_Datatype_pgsql extends MDB2_Driver_Datatype_Common
-{
-    // {{{ _baseConvertResult()
-
-    /**
-     * General type conversion method
-     *
-     * @param mixed   $value refernce to a value to be converted
-     * @param string  $type  specifies which type to convert to
-     * @param boolean $rtrim [optional] when TRUE [default], apply rtrim() to text
-     * @return object a MDB2 error on failure
-     * @access protected
-     */
-    function _baseConvertResult($value, $type, $rtrim = true)
-    {
-        if (is_null($value)) {
-            return null;
-        }
-        switch ($type) {
-        case 'boolean':
-            return $value == 't';
-        case 'float':
-            return doubleval($value);
-        case 'date':
-            return $value;
-        case 'time':
-            return substr($value, 0, strlen('HH:MM:SS'));
-        case 'timestamp':
-            return substr($value, 0, strlen('YYYY-MM-DD HH:MM:SS'));
-        case 'blob':
-            $value = pg_unescape_bytea($value);
-            return parent::_baseConvertResult($value, $type, $rtrim);
-        }
-        return parent::_baseConvertResult($value, $type, $rtrim);
-    }
-
-    // }}}
-    // {{{ getTypeDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare an text type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param array $field  associative array with the name of the properties
-     *      of the field being declared as array indexes. Currently, the types
-     *      of supported field properties are as follows:
-     *
-     *      length
-     *          Integer value that determines the maximum length of the text
-     *          field. If this argument is missing the field should be
-     *          declared to have the longest length allowed by the DBMS.
-     *
-     *      default
-     *          Text value to be used as default for this field.
-     *
-     *      notnull
-     *          Boolean flag that indicates whether this field is constrained
-     *          to not be set to null.
-     * @return string  DBMS specific SQL code portion that should be used to
-     *      declare the specified field.
-     * @access public
-     */
-    function getTypeDeclaration($field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        switch ($field['type']) {
-        case 'text':
-            $length = !empty($field['length']) ? $field['length'] : false;
-            $fixed = !empty($field['fixed']) ? $field['fixed'] : false;
-            return $fixed ? ($length ? 'CHAR('.$length.')' : 'CHAR('.$db->options['default_text_field_length'].')')
-                : ($length ? 'VARCHAR('.$length.')' : 'TEXT');
-        case 'clob':
-            return 'TEXT';
-        case 'blob':
-            return 'BYTEA';
-        case 'integer':
-            if (!empty($field['autoincrement'])) {
-                if (!empty($field['length'])) {
-                    $length = $field['length'];
-                    if ($length > 4) {
-                        return 'BIGSERIAL PRIMARY KEY';
-                    }
-                }
-                return 'SERIAL PRIMARY KEY';
-            }
-            if (!empty($field['length'])) {
-                $length = $field['length'];
-                if ($length <= 2) {
-                    return 'SMALLINT';
-                } elseif ($length == 3 || $length == 4) {
-                    return 'INT';
-                } elseif ($length > 4) {
-                    return 'BIGINT';
-                }
-            }
-            return 'INT';
-        case 'boolean':
-            return 'BOOLEAN';
-        case 'date':
-            return 'DATE';
-        case 'time':
-            return 'TIME without time zone';
-        case 'timestamp':
-            return 'TIMESTAMP without time zone';
-        case 'float':
-            return 'FLOAT8';
-        case 'decimal':
-            $length = !empty($field['length']) ? $field['length'] : 18;
-            $scale = !empty($field['scale']) ? $field['scale'] : $db->options['decimal_places'];
-            return 'NUMERIC('.$length.','.$scale.')';
-        }
-    }
-
-    // }}}
-    // {{{ _getIntegerDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare an integer type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param string $name name the field to be declared.
-     * @param array $field associative array with the name of the properties
-     *       of the field being declared as array indexes. Currently, the types
-     *       of supported field properties are as follows:
-     *
-     *       unsigned
-     *           Boolean flag that indicates whether the field should be
-     *           declared as unsigned integer if possible.
-     *
-     *       default
-     *           Integer value to be used as default for this field.
-     *
-     *       notnull
-     *           Boolean flag that indicates whether this field is constrained
-     *           to not be set to null.
-     * @return string DBMS specific SQL code portion that should be used to
-     *       declare the specified field.
-     * @access protected
-     */
-    function _getIntegerDeclaration($name, $field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if (!empty($field['unsigned'])) {
-            $db->warnings[] = "unsigned integer field \"$name\" is being declared as signed integer";
-        }
-        if (!empty($field['autoincrement'])) {
-            $name = $db->quoteIdentifier($name, true);
-            return $name.' '.$this->getTypeDeclaration($field);
-        }
-        $default = '';
-        if (array_key_exists('default', $field)) {
-            if ($field['default'] === '') {
-                $field['default'] = empty($field['notnull']) ? null : 0;
-            }
-            $default = ' DEFAULT '.$this->quote($field['default'], 'integer');
-        }
-
-        $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
-        $name = $db->quoteIdentifier($name, true);
-        return $name.' '.$this->getTypeDeclaration($field).$default.$notnull;
-    }
-
-    // }}}
-    // {{{ _quoteCLOB()
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     * compose query statements.
-     *
-     * @param string $value text string value that is intended to be converted.
-     * @param bool $quote determines if the value should be quoted and escaped
-     * @param bool $escape_wildcards if to escape escape wildcards
-     * @return string text string that represents the given argument value in
-     *      a DBMS specific format.
-     * @access protected
-     */
-    function _quoteCLOB($value, $quote, $escape_wildcards)
-    {
-        return $this->_quoteText($value, $quote, $escape_wildcards);
-    }
-
-    // }}}
-    // {{{ _quoteBLOB()
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     * compose query statements.
-     *
-     * @param string $value text string value that is intended to be converted.
-     * @param bool $quote determines if the value should be quoted and escaped
-     * @param bool $escape_wildcards if to escape escape wildcards
-     * @return string text string that represents the given argument value in
-     *      a DBMS specific format.
-     * @access protected
-     */
-    function _quoteBLOB($value, $quote, $escape_wildcards)
-    {
-        if (!$quote) {
-            return $value;
-        }
-        if (version_compare(PHP_VERSION, '5.2.0RC6', '>=')) {
-            $db =$this->getDBInstance();
-            if (PEAR::isError($db)) {
-                return $db;
-            }
-            $connection = $db->getConnection();
-            if (PEAR::isError($connection)) {
-                return $connection;
-            }
-            $value = @pg_escape_bytea($connection, $value);
-        } else {
-            $value = @pg_escape_bytea($value);
-        }
-        return "'".$value."'";
-    }
-
-    // }}}
-    // {{{ _quoteBoolean()
-
-    /**
-     * Convert a text value into a DBMS specific format that is suitable to
-     * compose query statements.
-     *
-     * @param string $value text string value that is intended to be converted.
-     * @param bool $quote determines if the value should be quoted and escaped
-     * @param bool $escape_wildcards if to escape escape wildcards
-     * @return string text string that represents the given argument value in
-     *       a DBMS specific format.
-     * @access protected
-     */
-    function _quoteBoolean($value, $quote, $escape_wildcards)
-    {
-        $value = $value ? 't' : 'f';
-        if (!$quote) {
-            return $value;
-        }
-        return "'".$value."'";
-    }
-
-    // }}}
-    // {{{ matchPattern()
-
-    /**
-     * build a pattern matching string
-     *
-     * @access public
-     *
-     * @param array $pattern even keys are strings, odd are patterns (% and _)
-     * @param string $operator optional pattern operator (LIKE, ILIKE and maybe others in the future)
-     * @param string $field optional field name that is being matched against
-     *                  (might be required when emulating ILIKE)
-     *
-     * @return string SQL pattern
-     */
-    function matchPattern($pattern, $operator = null, $field = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $match = '';
-        if (!is_null($operator)) {
-            $field = is_null($field) ? '' : $field.' ';
-            $operator = strtoupper($operator);
-            switch ($operator) {
-            // case insensitive
-            case 'ILIKE':
-                $match = $field.'ILIKE ';
-                break;
-            // case sensitive
-            case 'LIKE':
-                $match = $field.'LIKE ';
-                break;
-            default:
-                return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                    'not a supported operator type:'. $operator, __FUNCTION__);
-            }
-        }
-        $match.= "'";
-        foreach ($pattern as $key => $value) {
-            if ($key % 2) {
-                $match.= $value;
-            } else {
-                $match.= $db->escapePattern($db->escape($value));
-            }
-        }
-        $match.= "'";
-        $match.= $this->patternEscapeString();
-        return $match;
-    }
-
-    // }}}
-    // {{{ patternEscapeString()
-
-    /**
-     * build string to define escape pattern string
-     *
-     * @access public
-     *
-     *
-     * @return string define escape pattern
-     */
-    function patternEscapeString()
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        return ' ESCAPE '.$this->quote($db->string_quoting['escape_pattern']);
-    }
-
-    // }}}
-    // {{{ _mapNativeDatatype()
-
-    /**
-     * Maps a native array description of a field to a MDB2 datatype and length
-     *
-     * @param array  $field native field description
-     * @return array containing the various possible types, length, sign, fixed
-     * @access public
-     */
-    function _mapNativeDatatype($field)
-    {
-        $db_type = strtolower($field['type']);
-        $length = $field['length'];
-        $type = array();
-        $unsigned = $fixed = null;
-        switch ($db_type) {
-        case 'smallint':
-        case 'int2':
-            $type[] = 'integer';
-            $unsigned = false;
-            $length = 2;
-            if ($length == '2') {
-                $type[] = 'boolean';
-                if (preg_match('/^(is|has)/', $field['name'])) {
-                    $type = array_reverse($type);
-                }
-            }
-            break;
-        case 'int':
-        case 'int4':
-        case 'integer':
-        case 'serial':
-        case 'serial4':
-            $type[] = 'integer';
-            $unsigned = false;
-            $length = 4;
-            break;
-        case 'bigint':
-        case 'int8':
-        case 'bigserial':
-        case 'serial8':
-            $type[] = 'integer';
-            $unsigned = false;
-            $length = 8;
-            break;
-        case 'bool':
-        case 'boolean':
-            $type[] = 'boolean';
-            $length = null;
-            break;
-        case 'text':
-        case 'varchar':
-            $fixed = false;
-        case 'unknown':
-        case 'char':
-        case 'bpchar':
-            $type[] = 'text';
-            if ($length == '1') {
-                $type[] = 'boolean';
-                if (preg_match('/^(is|has)/', $field['name'])) {
-                    $type = array_reverse($type);
-                }
-            } elseif (strstr($db_type, 'text')) {
-                $type[] = 'clob';
-                $type = array_reverse($type);
-            }
-            if ($fixed !== false) {
-                $fixed = true;
-            }
-            break;
-        case 'date':
-            $type[] = 'date';
-            $length = null;
-            break;
-        case 'datetime':
-        case 'timestamp':
-        case 'timestamptz':
-            $type[] = 'timestamp';
-            $length = null;
-            break;
-        case 'time':
-            $type[] = 'time';
-            $length = null;
-            break;
-        case 'float':
-        case 'float4':
-        case 'float8':
-        case 'double':
-        case 'real':
-            $type[] = 'float';
-            break;
-        case 'decimal':
-        case 'money':
-        case 'numeric':
-            $type[] = 'decimal';
-            if (isset($field['scale'])) {
-                $length = $length.','.$field['scale'];
-            }
-            break;
-        case 'tinyblob':
-        case 'mediumblob':
-        case 'longblob':
-        case 'blob':
-        case 'bytea':
-            $type[] = 'blob';
-            $length = null;
-            break;
-        case 'oid':
-            $type[] = 'blob';
-            $type[] = 'clob';
-            $length = null;
-            break;
-        case 'year':
-            $type[] = 'integer';
-            $type[] = 'date';
-            $length = null;
-            break;
-        default:
-            $db =$this->getDBInstance();
-            if (PEAR::isError($db)) {
-                return $db;
-            }
-            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'unknown database attribute type: '.$db_type, __FUNCTION__);
-        }
-
-        if ((int)$length <= 0) {
-            $length = null;
-        }
-
-        return array($type, $length, $unsigned, $fixed);
-    }
-
-    // }}}
-    // {{{ mapPrepareDatatype()
-
-    /**
-     * Maps an mdb2 datatype to native prepare type
-     *
-     * @param string $type
-     * @return string
-     * @access public
-     */
-    function mapPrepareDatatype($type)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if (!empty($db->options['datatype_map'][$type])) {
-            $type = $db->options['datatype_map'][$type];
-            if (!empty($db->options['datatype_map_callback'][$type])) {
-                $parameter = array('type' => $type);
-                return call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
-            }
-        }
-
-        switch ($type) {
-            case 'integer':
-                return 'int';
-            case 'boolean':
-                return 'bool';
-            case 'decimal':
-            case 'float':
-                return 'numeric';
-            case 'clob':
-                return 'text';
-            case 'blob':
-                return 'bytea';
-            default:
-                break;
-        }
-        return $type;
-    }
-    // }}}
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Datatype/sqlite.php b/3rdparty/MDB2/Driver/Datatype/sqlite.php
deleted file mode 100644
index 9e57e7e5678..00000000000
--- a/3rdparty/MDB2/Driver/Datatype/sqlite.php
+++ /dev/null
@@ -1,409 +0,0 @@
-<?php
-// vim: set et ts=4 sw=4 fdm=marker:
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: sqlite.php,v 1.67 2008/02/22 19:58:06 quipo Exp $
-//
-
-require_once('MDB2/Driver/Datatype/Common.php');
-
-/**
- * MDB2 SQLite driver
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Datatype_sqlite extends MDB2_Driver_Datatype_Common
-{
-    // {{{ _getCollationFieldDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to set the COLLATION
-     * of a field declaration to be used in statements like CREATE TABLE.
-     *
-     * @param string $collation name of the collation
-     *
-     * @return string DBMS specific SQL code portion needed to set the COLLATION
-     *                of a field declaration.
-     */
-    function _getCollationFieldDeclaration($collation)
-    {
-        return 'COLLATE '.$collation;
-    }
-
-    // }}}
-    // {{{ getTypeDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare an text type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param array $field  associative array with the name of the properties
-     *      of the field being declared as array indexes. Currently, the types
-     *      of supported field properties are as follows:
-     *
-     *      length
-     *          Integer value that determines the maximum length of the text
-     *          field. If this argument is missing the field should be
-     *          declared to have the longest length allowed by the DBMS.
-     *
-     *      default
-     *          Text value to be used as default for this field.
-     *
-     *      notnull
-     *          Boolean flag that indicates whether this field is constrained
-     *          to not be set to null.
-     * @return string  DBMS specific SQL code portion that should be used to
-     *      declare the specified field.
-     * @access public
-     */
-    function getTypeDeclaration($field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        switch ($field['type']) {
-        case 'text':
-            $length = !empty($field['length'])
-                ? $field['length'] : false;
-            $fixed = !empty($field['fixed']) ? $field['fixed'] : false;
-            return $fixed ? ($length ? 'CHAR('.$length.')' : 'CHAR('.$db->options['default_text_field_length'].')')
-                : ($length ? 'VARCHAR('.$length.')' : 'TEXT');
-        case 'clob':
-            if (!empty($field['length'])) {
-                $length = $field['length'];
-                if ($length <= 255) {
-                    return 'TINYTEXT';
-                } elseif ($length <= 65532) {
-                    return 'TEXT';
-                } elseif ($length <= 16777215) {
-                    return 'MEDIUMTEXT';
-                }
-            }
-            return 'LONGTEXT';
-        case 'blob':
-            if (!empty($field['length'])) {
-                $length = $field['length'];
-                if ($length <= 255) {
-                    return 'TINYBLOB';
-                } elseif ($length <= 65532) {
-                    return 'BLOB';
-                } elseif ($length <= 16777215) {
-                    return 'MEDIUMBLOB';
-                }
-            }
-            return 'LONGBLOB';
-        case 'integer':
-            if (!empty($field['length'])) {
-                $length = $field['length'];
-                if ($length <= 2) {
-                    return 'SMALLINT';
-                } elseif ($length == 3 || $length == 4) {
-                    return 'INTEGER';
-                } elseif ($length > 4) {
-                    return 'BIGINT';
-                }
-            }
-            return 'INTEGER';
-        case 'boolean':
-            return 'BOOLEAN';
-        case 'date':
-            return 'DATE';
-        case 'time':
-            return 'TIME';
-        case 'timestamp':
-            return 'DATETIME';
-        case 'float':
-            return 'DOUBLE'.($db->options['fixed_float'] ? '('.
-                ($db->options['fixed_float']+2).','.$db->options['fixed_float'].')' : '');
-        case 'decimal':
-            $length = !empty($field['length']) ? $field['length'] : 18;
-            $scale = !empty($field['scale']) ? $field['scale'] : $db->options['decimal_places'];
-            return 'DECIMAL('.$length.','.$scale.')';
-        }
-        return '';
-    }
-
-    // }}}
-    // {{{ _getIntegerDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare an integer type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param string  $name   name the field to be declared.
-     * @param string  $field  associative array with the name of the properties
-     *                        of the field being declared as array indexes.
-     *                        Currently, the types of supported field
-     *                        properties are as follows:
-     *
-     *                       unsigned
-     *                        Boolean flag that indicates whether the field
-     *                        should be declared as unsigned integer if
-     *                        possible.
-     *
-     *                       default
-     *                        Integer value to be used as default for this
-     *                        field.
-     *
-     *                       notnull
-     *                        Boolean flag that indicates whether this field is
-     *                        constrained to not be set to null.
-     * @return string  DBMS specific SQL code portion that should be used to
-     *                 declare the specified field.
-     * @access protected
-     */
-    function _getIntegerDeclaration($name, $field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $default = $autoinc = '';
-        if (!empty($field['autoincrement'])) {
-            $autoinc = ' PRIMARY KEY';
-        } elseif (array_key_exists('default', $field)) {
-            if ($field['default'] === '') {
-                $field['default'] = empty($field['notnull']) ? null : 0;
-            }
-            $default = ' DEFAULT '.$this->quote($field['default'], 'integer');
-        }
-
-        $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
-        $unsigned = empty($field['unsigned']) ? '' : ' UNSIGNED';
-        $name = $db->quoteIdentifier($name, true);
-        return $name.' '.$this->getTypeDeclaration($field).$unsigned.$default.$notnull.$autoinc;
-    }
-
-    // }}}
-    // {{{ matchPattern()
-
-    /**
-     * build a pattern matching string
-     *
-     * @access public
-     *
-     * @param array $pattern even keys are strings, odd are patterns (% and _)
-     * @param string $operator optional pattern operator (LIKE, ILIKE and maybe others in the future)
-     * @param string $field optional field name that is being matched against
-     *                  (might be required when emulating ILIKE)
-     *
-     * @return string SQL pattern
-     */
-    function matchPattern($pattern, $operator = null, $field = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $match = '';
-        if (!is_null($operator)) {
-            $field = is_null($field) ? '' : $field.' ';
-            $operator = strtoupper($operator);
-            switch ($operator) {
-            // case insensitive
-            case 'ILIKE':
-                $match = $field.'LIKE ';
-                break;
-            // case sensitive
-            case 'LIKE':
-                $match = $field.'LIKE ';
-                break;
-            default:
-                return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                    'not a supported operator type:'. $operator, __FUNCTION__);
-            }
-        }
-        $match.= "'";
-        foreach ($pattern as $key => $value) {
-            if ($key % 2) {
-                $match.= $value;
-            } else {
-                $match.= $db->escapePattern($db->escape($value));
-            }
-        }
-        $match.= "'";
-        $match.= $this->patternEscapeString();
-        return $match;
-    }
-
-    // }}}
-    // {{{ _mapNativeDatatype()
-
-    /**
-     * Maps a native array description of a field to a MDB2 datatype and length
-     *
-     * @param array  $field native field description
-     * @return array containing the various possible types, length, sign, fixed
-     * @access public
-     */
-    function _mapNativeDatatype($field)
-    {
-        $db_type = strtolower($field['type']);
-        $length = !empty($field['length']) ? $field['length'] : null;
-        $unsigned = !empty($field['unsigned']) ? $field['unsigned'] : null;
-        $fixed = null;
-        $type = array();
-        switch ($db_type) {
-        case 'boolean':
-            $type[] = 'boolean';
-            break;
-        case 'tinyint':
-            $type[] = 'integer';
-            $type[] = 'boolean';
-            if (preg_match('/^(is|has)/', $field['name'])) {
-                $type = array_reverse($type);
-            }
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            $length = 1;
-            break;
-        case 'smallint':
-            $type[] = 'integer';
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            $length = 2;
-            break;
-        case 'mediumint':
-            $type[] = 'integer';
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            $length = 3;
-            break;
-        case 'int':
-        case 'integer':
-        case 'serial':
-            $type[] = 'integer';
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            $length = 4;
-            break;
-        case 'bigint':
-        case 'bigserial':
-            $type[] = 'integer';
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            $length = 8;
-            break;
-        case 'clob':
-            $type[] = 'clob';
-            $fixed  = false;
-            break;
-        case 'tinytext':
-        case 'mediumtext':
-        case 'longtext':
-        case 'text':
-        case 'varchar':
-        case 'varchar2':
-            $fixed = false;
-        case 'char':
-            $type[] = 'text';
-            if ($length == '1') {
-                $type[] = 'boolean';
-                if (preg_match('/^(is|has)/', $field['name'])) {
-                    $type = array_reverse($type);
-                }
-            } elseif (strstr($db_type, 'text')) {
-                $type[] = 'clob';
-                $type = array_reverse($type);
-            }
-            if ($fixed !== false) {
-                $fixed = true;
-            }
-            break;
-        case 'date':
-            $type[] = 'date';
-            $length = null;
-            break;
-        case 'datetime':
-        case 'timestamp':
-            $type[] = 'timestamp';
-            $length = null;
-            break;
-        case 'time':
-            $type[] = 'time';
-            $length = null;
-            break;
-        case 'float':
-        case 'double':
-        case 'real':
-            $type[] = 'float';
-            break;
-        case 'decimal':
-        case 'numeric':
-            $type[] = 'decimal';
-            $length = $length.','.$field['decimal'];
-            break;
-        case 'tinyblob':
-        case 'mediumblob':
-        case 'longblob':
-        case 'blob':
-            $type[] = 'blob';
-            $length = null;
-            break;
-        case 'year':
-            $type[] = 'integer';
-            $type[] = 'date';
-            $length = null;
-            break;
-        default:
-            $db =$this->getDBInstance();
-            if (PEAR::isError($db)) {
-                return $db;
-            }
-            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'unknown database attribute type: '.$db_type, __FUNCTION__);
-        }
-
-        if ((int)$length <= 0) {
-            $length = null;
-        }
-
-        return array($type, $length, $unsigned, $fixed);
-    }
-
-    // }}}
-}
-
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Function/Common.php b/3rdparty/MDB2/Driver/Function/Common.php
deleted file mode 100644
index 731f06882ce..00000000000
--- a/3rdparty/MDB2/Driver/Function/Common.php
+++ /dev/null
@@ -1,293 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: Common.php,v 1.21 2008/02/17 18:51:39 quipo Exp $
-//
-
-/**
- * @package  MDB2
- * @category Database
- * @author   Lukas Smith <smith@pooteeweet.org>
- */
-
-/**
- * Base class for the function modules that is extended by each MDB2 driver
- *
- * To load this module in the MDB2 object:
- * $mdb->loadModule('Function');
- *
- * @package  MDB2
- * @category Database
- * @author   Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Function_Common extends MDB2_Module_Common
-{
-    // {{{ executeStoredProc()
-
-    /**
-     * Execute a stored procedure and return any results
-     *
-     * @param string $name string that identifies the function to execute
-     * @param mixed  $params  array that contains the paramaters to pass the stored proc
-     * @param mixed   $types  array that contains the types of the columns in
-     *                        the result set
-     * @param mixed $result_class string which specifies which result class to use
-     * @param mixed $result_wrap_class string which specifies which class to wrap results in
-     *
-     * @return mixed a result handle or MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function &executeStoredProc($name, $params = null, $types = null, $result_class = true, $result_wrap_class = false)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $error =& $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-        return $error;
-    }
-
-    // }}}
-    // {{{ functionTable()
-
-    /**
-     * return string for internal table used when calling only a function
-     *
-     * @return string for internal table used when calling only a function
-     * @access public
-     */
-    function functionTable()
-    {
-        return '';
-    }
-
-    // }}}
-    // {{{ now()
-
-    /**
-     * Return string to call a variable with the current timestamp inside an SQL statement
-     * There are three special variables for current date and time:
-     * - CURRENT_TIMESTAMP (date and time, TIMESTAMP type)
-     * - CURRENT_DATE (date, DATE type)
-     * - CURRENT_TIME (time, TIME type)
-     *
-     * @param string $type 'timestamp' | 'time' | 'date'
-     *
-     * @return string to call a variable with the current timestamp
-     * @access public
-     */
-    function now($type = 'timestamp')
-    {
-        switch ($type) {
-        case 'time':
-            return 'CURRENT_TIME';
-        case 'date':
-            return 'CURRENT_DATE';
-        case 'timestamp':
-        default:
-            return 'CURRENT_TIMESTAMP';
-        }
-    }
-
-    // }}}
-    // {{{ unixtimestamp()
-
-    /**
-     * return string to call a function to get the unix timestamp from a iso timestamp
-     *
-     * @param string $expression
-     *
-     * @return string to call a variable with the timestamp
-     * @access public
-     */
-    function unixtimestamp($expression)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $error =& $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-        return $error;
-    }
-
-    // }}}
-    // {{{ substring()
-
-    /**
-     * return string to call a function to get a substring inside an SQL statement
-     *
-     * @return string to call a function to get a substring
-     * @access public
-     */
-    function substring($value, $position = 1, $length = null)
-    {
-        if (!is_null($length)) {
-            return "SUBSTRING($value FROM $position FOR $length)";
-        }
-        return "SUBSTRING($value FROM $position)";
-    }
-
-    // }}}
-    // {{{ replace()
-
-    /**
-     * return string to call a function to get replace inside an SQL statement.
-     *
-     * @return string to call a function to get a replace
-     * @access public
-     */
-    function replace($str, $from_str, $to_str)
-    {
-        return "REPLACE($str, $from_str , $to_str)";
-    }
-
-    // }}}
-    // {{{ concat()
-
-    /**
-     * Returns string to concatenate two or more string parameters
-     *
-     * @param string $value1
-     * @param string $value2
-     * @param string $values...
-     *
-     * @return string to concatenate two strings
-     * @access public
-     */
-    function concat($value1, $value2)
-    {
-        $args = func_get_args();
-        return "(".implode(' || ', $args).")";
-    }
-
-    // }}}
-    // {{{ random()
-
-    /**
-     * return string to call a function to get random value inside an SQL statement
-     *
-     * @return return string to generate float between 0 and 1
-     * @access public
-     */
-    function random()
-    {
-        return 'RAND()';
-    }
-
-    // }}}
-    // {{{ lower()
-
-    /**
-     * return string to call a function to lower the case of an expression
-     *
-     * @param string $expression
-     *
-     * @return return string to lower case of an expression
-     * @access public
-     */
-    function lower($expression)
-    {
-        return "LOWER($expression)";
-    }
-
-    // }}}
-    // {{{ upper()
-
-    /**
-     * return string to call a function to upper the case of an expression
-     *
-     * @param string $expression
-     *
-     * @return return string to upper case of an expression
-     * @access public
-     */
-    function upper($expression)
-    {
-        return "UPPER($expression)";
-    }
-
-    // }}}
-    // {{{ length()
-
-    /**
-     * return string to call a function to get the length of a string expression
-     *
-     * @param string $expression
-     *
-     * @return return string to get the string expression length
-     * @access public
-     */
-    function length($expression)
-    {
-        return "LENGTH($expression)";
-    }
-
-    // }}}
-    // {{{ guid()
-
-    /**
-     * Returns global unique identifier
-     *
-     * @return string to get global unique identifier
-     * @access public
-     */
-    function guid()
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $error =& $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-        return $error;
-    }
-
-    // }}}
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Function/mysql.php b/3rdparty/MDB2/Driver/Function/mysql.php
deleted file mode 100644
index 44183c3aa06..00000000000
--- a/3rdparty/MDB2/Driver/Function/mysql.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: mysql.php,v 1.12 2008/02/17 18:54:08 quipo Exp $
-//
-
-require_once('MDB2/Driver/Function/Common.php');
-
-/**
- * MDB2 MySQL driver for the function modules
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Function_mysql extends MDB2_Driver_Function_Common
-{
-     // }}}
-    // {{{ executeStoredProc()
-
-    /**
-     * Execute a stored procedure and return any results
-     *
-     * @param string $name string that identifies the function to execute
-     * @param mixed  $params  array that contains the paramaters to pass the stored proc
-     * @param mixed   $types  array that contains the types of the columns in
-     *                        the result set
-     * @param mixed $result_class string which specifies which result class to use
-     * @param mixed $result_wrap_class string which specifies which class to wrap results in
-     * @return mixed a result handle or MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function &executeStoredProc($name, $params = null, $types = null, $result_class = true, $result_wrap_class = false)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = 'CALL '.$name;
-        $query .= $params ? '('.implode(', ', $params).')' : '()';
-        return $db->query($query, $types, $result_class, $result_wrap_class);
-    }
-
-    // }}}
-    // {{{ unixtimestamp()
-
-    /**
-     * return string to call a function to get the unix timestamp from a iso timestamp
-     *
-     * @param string $expression
-     *
-     * @return string to call a variable with the timestamp
-     * @access public
-     */
-    function unixtimestamp($expression)
-    {
-        return 'UNIX_TIMESTAMP('. $expression.')';
-    }
-
-    // }}}
-    // {{{ concat()
-
-    /**
-     * Returns string to concatenate two or more string parameters
-     *
-     * @param string $value1
-     * @param string $value2
-     * @param string $values...
-     * @return string to concatenate two strings
-     * @access public
-     **/
-    function concat($value1, $value2)
-    {
-        $args = func_get_args();
-        return "CONCAT(".implode(', ', $args).")";
-    }
-
-    // }}}
-    // {{{ guid()
-
-    /**
-     * Returns global unique identifier
-     *
-     * @return string to get global unique identifier
-     * @access public
-     */
-    function guid()
-    {
-        return 'UUID()';
-    }
-
-    // }}}
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Function/pgsql.php b/3rdparty/MDB2/Driver/Function/pgsql.php
deleted file mode 100644
index 173bfc91494..00000000000
--- a/3rdparty/MDB2/Driver/Function/pgsql.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Paul Cooper <pgc@ucecom.com>                                 |
-// +----------------------------------------------------------------------+
-//
-// $Id: pgsql.php,v 1.11 2008/11/09 19:46:50 quipo Exp $
-
-require_once('MDB2/Driver/Function/Common.php');
-
-/**
- * MDB2 MySQL driver for the function modules
- *
- * @package MDB2
- * @category Database
- * @author Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Function_pgsql extends MDB2_Driver_Function_Common
-{
-    // {{{ executeStoredProc()
-
-    /**
-     * Execute a stored procedure and return any results
-     *
-     * @param string $name string that identifies the function to execute
-     * @param mixed  $params  array that contains the paramaters to pass the stored proc
-     * @param mixed   $types  array that contains the types of the columns in
-     *                        the result set
-     * @param mixed $result_class string which specifies which result class to use
-     * @param mixed $result_wrap_class string which specifies which class to wrap results in
-     * @return mixed a result handle or MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function &executeStoredProc($name, $params = null, $types = null, $result_class = true, $result_wrap_class = false)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = 'SELECT * FROM '.$name;
-        $query .= $params ? '('.implode(', ', $params).')' : '()';
-        return $db->query($query, $types, $result_class, $result_wrap_class);
-    }
-    // }}}
-    // {{{ unixtimestamp()
-
-    /**
-     * return string to call a function to get the unix timestamp from a iso timestamp
-     *
-     * @param string $expression
-     *
-     * @return string to call a variable with the timestamp
-     * @access public
-     */
-    function unixtimestamp($expression)
-    {
-        return 'EXTRACT(EPOCH FROM DATE_TRUNC(\'seconds\', CAST ((' . $expression . ') AS TIMESTAMP)))';
-    }
-
-    // }}}
-    // {{{ random()
-
-    /**
-     * return string to call a function to get random value inside an SQL statement
-     *
-     * @return return string to generate float between 0 and 1
-     * @access public
-     */
-    function random()
-    {
-        return 'RANDOM()';
-    }
-
-    // }}}
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Function/sqlite.php b/3rdparty/MDB2/Driver/Function/sqlite.php
deleted file mode 100644
index 8a5b7ec8fad..00000000000
--- a/3rdparty/MDB2/Driver/Function/sqlite.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: sqlite.php,v 1.10 2008/02/17 18:54:08 quipo Exp $
-//
-
-require_once('MDB2/Driver/Function/Common.php');
-
-/**
- * MDB2 SQLite driver for the function modules
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Function_sqlite extends MDB2_Driver_Function_Common
-{
-    // {{{ constructor
-
-    /**
-     * Constructor
-     */
-    function __construct($db_index)
-    {
-        parent::__construct($db_index);
-        // create all sorts of UDFs
-    }
-
-    // {{{ now()
-
-    /**
-     * Return string to call a variable with the current timestamp inside an SQL statement
-     * There are three special variables for current date and time.
-     *
-     * @return string to call a variable with the current timestamp
-     * @access public
-     */
-    function now($type = 'timestamp')
-    {
-        switch ($type) {
-        case 'time':
-            return 'time(\'now\')';
-        case 'date':
-            return 'date(\'now\')';
-        case 'timestamp':
-        default:
-            return 'datetime(\'now\')';
-        }
-    }
-
-    // }}}
-    // {{{ unixtimestamp()
-
-    /**
-     * return string to call a function to get the unix timestamp from a iso timestamp
-     *
-     * @param string $expression
-     *
-     * @return string to call a variable with the timestamp
-     * @access public
-     */
-    function unixtimestamp($expression)
-    {
-        return 'strftime("%s",'. $expression.', "utc")';
-    }
-
-    // }}}
-    // {{{ substring()
-
-    /**
-     * return string to call a function to get a substring inside an SQL statement
-     *
-     * @return string to call a function to get a substring
-     * @access public
-     */
-    function substring($value, $position = 1, $length = null)
-    {
-        if (!is_null($length)) {
-            return "substr($value,$position,$length)";
-        }
-        return "substr($value,$position,length($value))";
-    }
-
-    // }}}
-    // {{{ random()
-
-    /**
-     * return string to call a function to get random value inside an SQL statement
-     *
-     * @return return string to generate float between 0 and 1
-     * @access public
-     */
-    function random()
-    {
-        return '((RANDOM()+2147483648)/4294967296)';
-    }
-
-    // }}}
-    // {{{ replace()
-
-    /**
-     * return string to call a function to get a replacement inside an SQL statement.
-     *
-     * @return string to call a function to get a replace
-     * @access public
-     */
-    function replace($str, $from_str, $to_str)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $error =& $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-        return $error;
-    }
-
-    // }}}
-}
-?>
diff --git a/3rdparty/MDB2/Driver/Manager/Common.php b/3rdparty/MDB2/Driver/Manager/Common.php
deleted file mode 100644
index 9e16749bffc..00000000000
--- a/3rdparty/MDB2/Driver/Manager/Common.php
+++ /dev/null
@@ -1,1014 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Authors: Lukas Smith <smith@pooteeweet.org>                          |
-// |          Lorenzo Alberton <l.alberton@quipo.it>                      |
-// +----------------------------------------------------------------------+
-//
-// $Id: Common.php,v 1.72 2009/01/14 15:00:40 quipo Exp $
-//
-
-/**
- * @package  MDB2
- * @category Database
- * @author   Lukas Smith <smith@pooteeweet.org>
- * @author   Lorenzo Alberton <l.alberton@quipo.it>
- */
-
-/**
- * Base class for the management modules that is extended by each MDB2 driver
- *
- * To load this module in the MDB2 object:
- * $mdb->loadModule('Manager');
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Manager_Common extends MDB2_Module_Common
-{
-    // {{{ splitTableSchema()
-
-    /**
-     * Split the "[owner|schema].table" notation into an array
-     *
-     * @param string $table [schema and] table name
-     *
-     * @return array array(schema, table)
-     * @access private
-     */
-    function splitTableSchema($table)
-    {
-        $ret = array();
-        if (strpos($table, '.') !== false) {
-            return explode('.', $table);
-        }
-        return array(null, $table);
-    }
-
-    // }}}
-    // {{{ getFieldDeclarationList()
-
-    /**
-     * Get declaration of a number of field in bulk
-     *
-     * @param array $fields  a multidimensional associative array.
-     *      The first dimension determines the field name, while the second
-     *      dimension is keyed with the name of the properties
-     *      of the field being declared as array indexes. Currently, the types
-     *      of supported field properties are as follows:
-     *
-     *      default
-     *          Boolean value to be used as default for this field.
-     *
-     *      notnull
-     *          Boolean flag that indicates whether this field is constrained
-     *          to not be set to null.
-     *
-     * @return mixed string on success, a MDB2 error on failure
-     * @access public
-     */
-    function getFieldDeclarationList($fields)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if (!is_array($fields) || empty($fields)) {
-            return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                'missing any fields', __FUNCTION__);
-        }
-        foreach ($fields as $field_name => $field) {
-            $query = $db->getDeclaration($field['type'], $field_name, $field);
-            if (PEAR::isError($query)) {
-                return $query;
-            }
-            $query_fields[] = $query;
-        }
-        return implode(', ', $query_fields);
-    }
-
-    // }}}
-    // {{{ _fixSequenceName()
-
-    /**
-     * Removes any formatting in an sequence name using the 'seqname_format' option
-     *
-     * @param string $sqn string that containts name of a potential sequence
-     * @param bool $check if only formatted sequences should be returned
-     * @return string name of the sequence with possible formatting removed
-     * @access protected
-     */
-    function _fixSequenceName($sqn, $check = false)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $seq_pattern = '/^'.preg_replace('/%s/', '([a-z0-9_]+)', $db->options['seqname_format']).'$/i';
-        $seq_name = preg_replace($seq_pattern, '\\1', $sqn);
-        if ($seq_name && !strcasecmp($sqn, $db->getSequenceName($seq_name))) {
-            return $seq_name;
-        }
-        if ($check) {
-            return false;
-        }
-        return $sqn;
-    }
-
-    // }}}
-    // {{{ _fixIndexName()
-
-    /**
-     * Removes any formatting in an index name using the 'idxname_format' option
-     *
-     * @param string $idx string that containts name of anl index
-     * @return string name of the index with eventual formatting removed
-     * @access protected
-     */
-    function _fixIndexName($idx)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $idx_pattern = '/^'.preg_replace('/%s/', '([a-z0-9_]+)', $db->options['idxname_format']).'$/i';
-        $idx_name = preg_replace($idx_pattern, '\\1', $idx);
-        if ($idx_name && !strcasecmp($idx, $db->getIndexName($idx_name))) {
-            return $idx_name;
-        }
-        return $idx;
-    }
-
-    // }}}
-    // {{{ createDatabase()
-
-    /**
-     * create a new database
-     *
-     * @param string $name    name of the database that should be created
-     * @param array  $options array with charset, collation info
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createDatabase($database, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ alterDatabase()
-
-    /**
-     * alter an existing database
-     *
-     * @param string $name    name of the database that should be created
-     * @param array  $options array with charset, collation info
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function alterDatabase($database, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ dropDatabase()
-
-    /**
-     * drop an existing database
-     *
-     * @param string $name name of the database that should be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropDatabase($database)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ _getCreateTableQuery()
-
-    /**
-     * Create a basic SQL query for a new table creation
-     *
-     * @param string $name    Name of the database that should be created
-     * @param array  $fields  Associative array that contains the definition of each field of the new table
-     * @param array  $options An associative array of table options
-     *
-     * @return mixed string (the SQL query) on success, a MDB2 error on failure
-     * @see createTable()
-     */
-    function _getCreateTableQuery($name, $fields, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if (!$name) {
-            return $db->raiseError(MDB2_ERROR_CANNOT_CREATE, null, null,
-                'no valid table name specified', __FUNCTION__);
-        }
-        if (empty($fields)) {
-            return $db->raiseError(MDB2_ERROR_CANNOT_CREATE, null, null,
-                'no fields specified for table "'.$name.'"', __FUNCTION__);
-        }
-        $query_fields = $this->getFieldDeclarationList($fields);
-        if (PEAR::isError($query_fields)) {
-            return $query_fields;
-        }
-        if (!empty($options['primary'])) {
-            $query_fields.= ', PRIMARY KEY ('.implode(', ', array_keys($options['primary'])).')';
-        }
-
-        $name = $db->quoteIdentifier($name, true);
-        $result = 'CREATE ';
-        if (!empty($options['temporary'])) {
-            $result .= $this->_getTemporaryTableQuery();
-        }
-        $result .= " TABLE $name ($query_fields)";
-        return $result;
-    }
-
-    // }}}
-    // {{{ _getTemporaryTableQuery()
-
-    /**
-     * A method to return the required SQL string that fits between CREATE ... TABLE
-     * to create the table as a temporary table.
-     *
-     * Should be overridden in driver classes to return the correct string for the
-     * specific database type.
-     *
-     * The default is to return the string "TEMPORARY" - this will result in a
-     * SQL error for any database that does not support temporary tables, or that
-     * requires a different SQL command from "CREATE TEMPORARY TABLE".
-     *
-     * @return string The string required to be placed between "CREATE" and "TABLE"
-     *                to generate a temporary table, if possible.
-     */
-    function _getTemporaryTableQuery()
-    {
-        return 'TEMPORARY';
-    }
-
-    // }}}
-    // {{{ createTable()
-
-    /**
-     * create a new table
-     *
-     * @param string $name   Name of the database that should be created
-     * @param array $fields  Associative array that contains the definition of each field of the new table
-     *                       The indexes of the array entries are the names of the fields of the table an
-     *                       the array entry values are associative arrays like those that are meant to be
-     *                       passed with the field definitions to get[Type]Declaration() functions.
-     *                          array(
-     *                              'id' => array(
-     *                                  'type' => 'integer',
-     *                                  'unsigned' => 1
-     *                                  'notnull' => 1
-     *                                  'default' => 0
-     *                              ),
-     *                              'name' => array(
-     *                                  'type' => 'text',
-     *                                  'length' => 12
-     *                              ),
-     *                              'password' => array(
-     *                                  'type' => 'text',
-     *                                  'length' => 12
-     *                              )
-     *                          );
-     * @param array $options  An associative array of table options:
-     *                          array(
-     *                              'comment' => 'Foo',
-     *                              'temporary' => true|false,
-     *                          );
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createTable($name, $fields, $options = array())
-    {
-        $query = $this->_getCreateTableQuery($name, $fields, $options);
-        if (PEAR::isError($query)) {
-            return $query;
-        }
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        $result = $db->exec($query);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ dropTable()
-
-    /**
-     * drop an existing table
-     *
-     * @param string $name name of the table that should be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropTable($name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $name = $db->quoteIdentifier($name, true);
-        return $db->exec("DROP TABLE $name");
-    }
-
-    // }}}
-    // {{{ truncateTable()
-
-    /**
-     * Truncate an existing table (if the TRUNCATE TABLE syntax is not supported,
-     * it falls back to a DELETE FROM TABLE query)
-     *
-     * @param string $name name of the table that should be truncated
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function truncateTable($name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $name = $db->quoteIdentifier($name, true);
-        return $db->exec("DELETE FROM $name");
-    }
-
-    // }}}
-    // {{{ vacuum()
-
-    /**
-     * Optimize (vacuum) all the tables in the db (or only the specified table)
-     * and optionally run ANALYZE.
-     *
-     * @param string $table table name (all the tables if empty)
-     * @param array  $options an array with driver-specific options:
-     *               - timeout [int] (in seconds) [mssql-only]
-     *               - analyze [boolean] [pgsql and mysql]
-     *               - full [boolean] [pgsql-only]
-     *               - freeze [boolean] [pgsql-only]
-     *
-     * @return mixed MDB2_OK success, a MDB2 error on failure
-     * @access public
-     */
-    function vacuum($table = null, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ alterTable()
-
-    /**
-     * alter an existing table
-     *
-     * @param string $name         name of the table that is intended to be changed.
-     * @param array $changes     associative array that contains the details of each type
-     *                             of change that is intended to be performed. The types of
-     *                             changes that are currently supported are defined as follows:
-     *
-     *                             name
-     *
-     *                                New name for the table.
-     *
-     *                            add
-     *
-     *                                Associative array with the names of fields to be added as
-     *                                 indexes of the array. The value of each entry of the array
-     *                                 should be set to another associative array with the properties
-     *                                 of the fields to be added. The properties of the fields should
-     *                                 be the same as defined by the MDB2 parser.
-     *
-     *
-     *                            remove
-     *
-     *                                Associative array with the names of fields to be removed as indexes
-     *                                 of the array. Currently the values assigned to each entry are ignored.
-     *                                 An empty array should be used for future compatibility.
-     *
-     *                            rename
-     *
-     *                                Associative array with the names of fields to be renamed as indexes
-     *                                 of the array. The value of each entry of the array should be set to
-     *                                 another associative array with the entry named name with the new
-     *                                 field name and the entry named Declaration that is expected to contain
-     *                                 the portion of the field declaration already in DBMS specific SQL code
-     *                                 as it is used in the CREATE TABLE statement.
-     *
-     *                            change
-     *
-     *                                Associative array with the names of the fields to be changed as indexes
-     *                                 of the array. Keep in mind that if it is intended to change either the
-     *                                 name of a field and any other properties, the change array entries
-     *                                 should have the new names of the fields as array indexes.
-     *
-     *                                The value of each entry of the array should be set to another associative
-     *                                 array with the properties of the fields to that are meant to be changed as
-     *                                 array entries. These entries should be assigned to the new values of the
-     *                                 respective properties. The properties of the fields should be the same
-     *                                 as defined by the MDB2 parser.
-     *
-     *                            Example
-     *                                array(
-     *                                    'name' => 'userlist',
-     *                                    'add' => array(
-     *                                        'quota' => array(
-     *                                            'type' => 'integer',
-     *                                            'unsigned' => 1
-     *                                        )
-     *                                    ),
-     *                                    'remove' => array(
-     *                                        'file_limit' => array(),
-     *                                        'time_limit' => array()
-     *                                    ),
-     *                                    'change' => array(
-     *                                        'name' => array(
-     *                                            'length' => '20',
-     *                                            'definition' => array(
-     *                                                'type' => 'text',
-     *                                                'length' => 20,
-     *                                            ),
-     *                                        )
-     *                                    ),
-     *                                    'rename' => array(
-     *                                        'sex' => array(
-     *                                            'name' => 'gender',
-     *                                            'definition' => array(
-     *                                                'type' => 'text',
-     *                                                'length' => 1,
-     *                                                'default' => 'M',
-     *                                            ),
-     *                                        )
-     *                                    )
-     *                                )
-     *
-     * @param boolean $check     indicates whether the function should just check if the DBMS driver
-     *                             can perform the requested table alterations if the value is true or
-     *                             actually perform them otherwise.
-     * @access public
-     *
-      * @return mixed MDB2_OK on success, a MDB2 error on failure
-     */
-    function alterTable($name, $changes, $check)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ listDatabases()
-
-    /**
-     * list all databases
-     *
-     * @return mixed array of database names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listDatabases()
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implementedd', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ listUsers()
-
-    /**
-     * list all users
-     *
-     * @return mixed array of user names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listUsers()
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ listViews()
-
-    /**
-     * list all views in the current database
-     *
-     * @param string database, the current is default
-     *               NB: not all the drivers can get the view names from
-     *               a database other than the current one
-     * @return mixed array of view names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listViews($database = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ listTableViews()
-
-    /**
-     * list the views in the database that reference a given table
-     *
-     * @param string table for which all referenced views should be found
-     * @return mixed array of view names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableViews($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ listTableTriggers()
-
-    /**
-     * list all triggers in the database that reference a given table
-     *
-     * @param string table for which all referenced triggers should be found
-     * @return mixed array of trigger names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableTriggers($table = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ listFunctions()
-
-    /**
-     * list all functions in the current database
-     *
-     * @return mixed array of function names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listFunctions()
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ listTables()
-
-    /**
-     * list all tables in the current database
-     *
-     * @param string database, the current is default.
-     *               NB: not all the drivers can get the table names from
-     *               a database other than the current one
-     * @return mixed array of table names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTables($database = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ listTableFields()
-
-    /**
-     * list all fields in a table in the current database
-     *
-     * @param string $table name of table that should be used in method
-     * @return mixed array of field names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableFields($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ createIndex()
-
-    /**
-     * Get the stucture of a field into an array
-     *
-     * @param string    $table         name of the table on which the index is to be created
-     * @param string    $name         name of the index to be created
-     * @param array     $definition        associative array that defines properties of the index to be created.
-     *                                 Currently, only one property named FIELDS is supported. This property
-     *                                 is also an associative with the names of the index fields as array
-     *                                 indexes. Each entry of this array is set to another type of associative
-     *                                 array that specifies properties of the index that are specific to
-     *                                 each field.
-     *
-     *                                Currently, only the sorting property is supported. It should be used
-     *                                 to define the sorting direction of the index. It may be set to either
-     *                                 ascending or descending.
-     *
-     *                                Not all DBMS support index sorting direction configuration. The DBMS
-     *                                 drivers of those that do not support it ignore this property. Use the
-     *                                 function supports() to determine whether the DBMS driver can manage indexes.
-     *
-     *                                 Example
-     *                                    array(
-     *                                        'fields' => array(
-     *                                            'user_name' => array(
-     *                                                'sorting' => 'ascending'
-     *                                            ),
-     *                                            'last_login' => array()
-     *                                        )
-     *                                    )
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createIndex($table, $name, $definition)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $table = $db->quoteIdentifier($table, true);
-        $name = $db->quoteIdentifier($db->getIndexName($name), true);
-        $query = "CREATE INDEX $name ON $table";
-        $fields = array();
-        foreach (array_keys($definition['fields']) as $field) {
-            $fields[] = $db->quoteIdentifier($field, true);
-        }
-        $query .= ' ('. implode(', ', $fields) . ')';
-        return $db->exec($query);
-    }
-
-    // }}}
-    // {{{ dropIndex()
-
-    /**
-     * drop existing index
-     *
-     * @param string    $table         name of table that should be used in method
-     * @param string    $name         name of the index to be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropIndex($table, $name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $name = $db->quoteIdentifier($db->getIndexName($name), true);
-        return $db->exec("DROP INDEX $name");
-    }
-
-    // }}}
-    // {{{ listTableIndexes()
-
-    /**
-     * list all indexes in a table
-     *
-     * @param string $table name of table that should be used in method
-     * @return mixed array of index names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableIndexes($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ _getAdvancedFKOptions()
-
-    /**
-     * Return the FOREIGN KEY query section dealing with non-standard options
-     * as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
-     *
-     * @param array $definition
-     * @return string
-     * @access protected
-     */
-    function _getAdvancedFKOptions($definition)
-    {
-        return '';
-    }
-
-    // }}}
-    // {{{ createConstraint()
-
-    /**
-     * create a constraint on a table
-     *
-     * @param string    $table       name of the table on which the constraint is to be created
-     * @param string    $name        name of the constraint to be created
-     * @param array     $definition  associative array that defines properties of the constraint to be created.
-     *                               The full structure of the array looks like this:
-     *          <pre>
-     *          array (
-     *              [primary] => 0
-     *              [unique]  => 0
-     *              [foreign] => 1
-     *              [check]   => 0
-     *              [fields] => array (
-     *                  [field1name] => array() // one entry per each field covered
-     *                  [field2name] => array() // by the index
-     *                  [field3name] => array(
-     *                      [sorting]  => ascending
-     *                      [position] => 3
-     *                  )
-     *              )
-     *              [references] => array(
-     *                  [table] => name
-     *                  [fields] => array(
-     *                      [field1name] => array(  //one entry per each referenced field
-     *                           [position] => 1
-     *                      )
-     *                  )
-     *              )
-     *              [deferrable] => 0
-     *              [initiallydeferred] => 0
-     *              [onupdate] => CASCADE|RESTRICT|SET NULL|SET DEFAULT|NO ACTION
-     *              [ondelete] => CASCADE|RESTRICT|SET NULL|SET DEFAULT|NO ACTION
-     *              [match] => SIMPLE|PARTIAL|FULL
-     *          );
-     *          </pre>
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createConstraint($table, $name, $definition)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        $table = $db->quoteIdentifier($table, true);
-        $name = $db->quoteIdentifier($db->getIndexName($name), true);
-        $query = "ALTER TABLE $table ADD CONSTRAINT $name";
-        if (!empty($definition['primary'])) {
-            $query.= ' PRIMARY KEY';
-        } elseif (!empty($definition['unique'])) {
-            $query.= ' UNIQUE';
-        } elseif (!empty($definition['foreign'])) {
-            $query.= ' FOREIGN KEY';
-        }
-        $fields = array();
-        foreach (array_keys($definition['fields']) as $field) {
-            $fields[] = $db->quoteIdentifier($field, true);
-        }
-        $query .= ' ('. implode(', ', $fields) . ')';
-        if (!empty($definition['foreign'])) {
-            $query.= ' REFERENCES ' . $db->quoteIdentifier($definition['references']['table'], true);
-            $referenced_fields = array();
-            foreach (array_keys($definition['references']['fields']) as $field) {
-                $referenced_fields[] = $db->quoteIdentifier($field, true);
-            }
-            $query .= ' ('. implode(', ', $referenced_fields) . ')';
-            $query .= $this->_getAdvancedFKOptions($definition);
-        }
-        return $db->exec($query);
-    }
-
-    // }}}
-    // {{{ dropConstraint()
-
-    /**
-     * drop existing constraint
-     *
-     * @param string    $table        name of table that should be used in method
-     * @param string    $name         name of the constraint to be dropped
-     * @param string    $primary      hint if the constraint is primary
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropConstraint($table, $name, $primary = false)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $table = $db->quoteIdentifier($table, true);
-        $name = $db->quoteIdentifier($db->getIndexName($name), true);
-        return $db->exec("ALTER TABLE $table DROP CONSTRAINT $name");
-    }
-
-    // }}}
-    // {{{ listTableConstraints()
-
-    /**
-     * list all constraints in a table
-     *
-     * @param string $table name of table that should be used in method
-     * @return mixed array of constraint names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableConstraints($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ createSequence()
-
-    /**
-     * create sequence
-     *
-     * @param string    $seq_name     name of the sequence to be created
-     * @param string    $start         start value of the sequence; default is 1
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createSequence($seq_name, $start = 1)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * drop existing sequence
-     *
-     * @param string    $seq_name     name of the sequence to be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropSequence($name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ listSequences()
-
-    /**
-     * list all sequences in the current database
-     *
-     * @param string database, the current is default
-     *               NB: not all the drivers can get the sequence names from
-     *               a database other than the current one
-     * @return mixed array of sequence names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listSequences($database = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Manager/mysql.php b/3rdparty/MDB2/Driver/Manager/mysql.php
deleted file mode 100644
index 099ed48a84f..00000000000
--- a/3rdparty/MDB2/Driver/Manager/mysql.php
+++ /dev/null
@@ -1,1432 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: mysql.php,v 1.113 2008/11/23 20:30:29 quipo Exp $
-//
-
-require_once('MDB2/Driver/Manager/Common.php');
-
-/**
- * MDB2 MySQL driver for the management modules
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
-{
-
-    // }}}
-    // {{{ createDatabase()
-
-    /**
-     * create a new database
-     *
-     * @param string $name    name of the database that should be created
-     * @param array  $options array with charset, collation info
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createDatabase($name, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $name  = $db->quoteIdentifier($name, true);
-        $query = 'CREATE DATABASE ' . $name;
-        if (!empty($options['charset'])) {
-            $query .= ' DEFAULT CHARACTER SET ' . $db->quote($options['charset'], 'text');
-        }
-        if (!empty($options['collation'])) {
-            $query .= ' COLLATE ' . $db->quote($options['collation'], 'text');
-        }
-        return $db->standaloneQuery($query, null, true);
-    }
-
-    // }}}
-    // {{{ alterDatabase()
-
-    /**
-     * alter an existing database
-     *
-     * @param string $name    name of the database that is intended to be changed
-     * @param array  $options array with charset, collation info
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function alterDatabase($name, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = 'ALTER DATABASE '. $db->quoteIdentifier($name, true);
-        if (!empty($options['charset'])) {
-            $query .= ' DEFAULT CHARACTER SET ' . $db->quote($options['charset'], 'text');
-        }
-        if (!empty($options['collation'])) {
-            $query .= ' COLLATE ' . $db->quote($options['collation'], 'text');
-        }
-        return $db->standaloneQuery($query, null, true);
-    }
-
-    // }}}
-    // {{{ dropDatabase()
-
-    /**
-     * drop an existing database
-     *
-     * @param string $name name of the database that should be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropDatabase($name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $name = $db->quoteIdentifier($name, true);
-        $query = "DROP DATABASE $name";
-        return $db->standaloneQuery($query, null, true);
-    }
-
-    // }}}
-    // {{{ _getAdvancedFKOptions()
-
-    /**
-     * Return the FOREIGN KEY query section dealing with non-standard options
-     * as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
-     *
-     * @param array $definition
-     * @return string
-     * @access protected
-     */
-    function _getAdvancedFKOptions($definition)
-    {
-        $query = '';
-        if (!empty($definition['match'])) {
-            $query .= ' MATCH '.$definition['match'];
-        }
-        if (!empty($definition['onupdate'])) {
-            $query .= ' ON UPDATE '.$definition['onupdate'];
-        }
-        if (!empty($definition['ondelete'])) {
-            $query .= ' ON DELETE '.$definition['ondelete'];
-        }
-        return $query;
-    }
-
-    // }}}
-    // {{{ createTable()
-
-    /**
-     * create a new table
-     *
-     * @param string $name   Name of the database that should be created
-     * @param array $fields  Associative array that contains the definition of each field of the new table
-     *                       The indexes of the array entries are the names of the fields of the table an
-     *                       the array entry values are associative arrays like those that are meant to be
-     *                       passed with the field definitions to get[Type]Declaration() functions.
-     *                          array(
-     *                              'id' => array(
-     *                                  'type' => 'integer',
-     *                                  'unsigned' => 1
-     *                                  'notnull' => 1
-     *                                  'default' => 0
-     *                              ),
-     *                              'name' => array(
-     *                                  'type' => 'text',
-     *                                  'length' => 12
-     *                              ),
-     *                              'password' => array(
-     *                                  'type' => 'text',
-     *                                  'length' => 12
-     *                              )
-     *                          );
-     * @param array $options  An associative array of table options:
-     *                          array(
-     *                              'comment' => 'Foo',
-     *                              'charset' => 'utf8',
-     *                              'collate' => 'utf8_unicode_ci',
-     *                              'type'    => 'innodb',
-     *                          );
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createTable($name, $fields, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        // if we have an AUTO_INCREMENT column and a PK on more than one field,
-        // we have to handle it differently...
-        $autoincrement = null;
-        if (empty($options['primary'])) {
-            $pk_fields = array();
-            foreach ($fields as $fieldname => $def) {
-                if (!empty($def['primary'])) {
-                    $pk_fields[$fieldname] = true;
-                }
-                if (!empty($def['autoincrement'])) {
-                    $autoincrement = $fieldname;
-                }
-            }
-            if (!is_null($autoincrement) && count($pk_fields) > 1) {
-                $options['primary'] = $pk_fields;
-            } else {
-                // the PK constraint is on max one field => OK
-                $autoincrement = null;
-            }
-        }
-
-        $query = $this->_getCreateTableQuery($name, $fields, $options);
-        if (PEAR::isError($query)) {
-            return $query;
-        }
-
-        if (!is_null($autoincrement)) {
-            // we have to remove the PK clause added by _getIntegerDeclaration()
-            $query = str_replace('AUTO_INCREMENT PRIMARY KEY', 'AUTO_INCREMENT', $query);
-        }
-
-        $options_strings = array();
-
-        if (!empty($options['comment'])) {
-            $options_strings['comment'] = 'COMMENT = '.$db->quote($options['comment'], 'text');
-        }
-
-        if (!empty($options['charset'])) {
-            $options_strings['charset'] = 'DEFAULT CHARACTER SET '.$options['charset'];
-            if (!empty($options['collate'])) {
-                $options_strings['charset'].= ' COLLATE '.$options['collate'];
-            }
-        }
-
-        $type = false;
-        if (!empty($options['type'])) {
-            $type = $options['type'];
-        } elseif ($db->options['default_table_type']) {
-            $type = $db->options['default_table_type'];
-        }
-        if ($type) {
-            $options_strings[] = "ENGINE = $type";
-        }
-
-        if (!empty($options_strings)) {
-            $query .= ' '.implode(' ', $options_strings);
-        }
-        $result = $db->exec($query);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ dropTable()
-
-    /**
-     * drop an existing table
-     *
-     * @param string $name name of the table that should be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropTable($name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        //delete the triggers associated to existing FK constraints
-        $constraints = $this->listTableConstraints($name);
-        if (!PEAR::isError($constraints) && !empty($constraints)) {
-            $db->loadModule('Reverse', null, true);
-            foreach ($constraints as $constraint) {
-                $definition = $db->reverse->getTableConstraintDefinition($name, $constraint);
-                if (!PEAR::isError($definition) && !empty($definition['foreign'])) {
-                    $result = $this->_dropFKTriggers($name, $constraint, $definition['references']['table']);
-                    if (PEAR::isError($result)) {
-                        return $result;
-                    }
-                }
-            }
-        }
-
-        return parent::dropTable($name);
-    }
-
-    // }}}
-    // {{{ truncateTable()
-
-    /**
-     * Truncate an existing table (if the TRUNCATE TABLE syntax is not supported,
-     * it falls back to a DELETE FROM TABLE query)
-     *
-     * @param string $name name of the table that should be truncated
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function truncateTable($name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $name = $db->quoteIdentifier($name, true);
-        return $db->exec("TRUNCATE TABLE $name");
-    }
-
-    // }}}
-    // {{{ vacuum()
-
-    /**
-     * Optimize (vacuum) all the tables in the db (or only the specified table)
-     * and optionally run ANALYZE.
-     *
-     * @param string $table table name (all the tables if empty)
-     * @param array  $options an array with driver-specific options:
-     *               - timeout [int] (in seconds) [mssql-only]
-     *               - analyze [boolean] [pgsql and mysql]
-     *               - full [boolean] [pgsql-only]
-     *               - freeze [boolean] [pgsql-only]
-     *
-     * @return mixed MDB2_OK success, a MDB2 error on failure
-     * @access public
-     */
-    function vacuum($table = null, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if (empty($table)) {
-            $table = $this->listTables();
-            if (PEAR::isError($table)) {
-                return $table;
-            }
-        }
-        if (is_array($table)) {
-            foreach (array_keys($table) as $k) {
-            	$table[$k] = $db->quoteIdentifier($table[$k], true);
-            }
-            $table = implode(', ', $table);
-        } else {
-            $table = $db->quoteIdentifier($table, true);
-        }
-        
-        $result = $db->exec('OPTIMIZE TABLE '.$table);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if (!empty($options['analyze'])) {
-            return $db->exec('ANALYZE TABLE '.$table);
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ alterTable()
-
-    /**
-     * alter an existing table
-     *
-     * @param string $name         name of the table that is intended to be changed.
-     * @param array $changes     associative array that contains the details of each type
-     *                             of change that is intended to be performed. The types of
-     *                             changes that are currently supported are defined as follows:
-     *
-     *                             name
-     *
-     *                                New name for the table.
-     *
-     *                            add
-     *
-     *                                Associative array with the names of fields to be added as
-     *                                 indexes of the array. The value of each entry of the array
-     *                                 should be set to another associative array with the properties
-     *                                 of the fields to be added. The properties of the fields should
-     *                                 be the same as defined by the MDB2 parser.
-     *
-     *
-     *                            remove
-     *
-     *                                Associative array with the names of fields to be removed as indexes
-     *                                 of the array. Currently the values assigned to each entry are ignored.
-     *                                 An empty array should be used for future compatibility.
-     *
-     *                            rename
-     *
-     *                                Associative array with the names of fields to be renamed as indexes
-     *                                 of the array. The value of each entry of the array should be set to
-     *                                 another associative array with the entry named name with the new
-     *                                 field name and the entry named Declaration that is expected to contain
-     *                                 the portion of the field declaration already in DBMS specific SQL code
-     *                                 as it is used in the CREATE TABLE statement.
-     *
-     *                            change
-     *
-     *                                Associative array with the names of the fields to be changed as indexes
-     *                                 of the array. Keep in mind that if it is intended to change either the
-     *                                 name of a field and any other properties, the change array entries
-     *                                 should have the new names of the fields as array indexes.
-     *
-     *                                The value of each entry of the array should be set to another associative
-     *                                 array with the properties of the fields to that are meant to be changed as
-     *                                 array entries. These entries should be assigned to the new values of the
-     *                                 respective properties. The properties of the fields should be the same
-     *                                 as defined by the MDB2 parser.
-     *
-     *                            Example
-     *                                array(
-     *                                    'name' => 'userlist',
-     *                                    'add' => array(
-     *                                        'quota' => array(
-     *                                            'type' => 'integer',
-     *                                            'unsigned' => 1
-     *                                        )
-     *                                    ),
-     *                                    'remove' => array(
-     *                                        'file_limit' => array(),
-     *                                        'time_limit' => array()
-     *                                    ),
-     *                                    'change' => array(
-     *                                        'name' => array(
-     *                                            'length' => '20',
-     *                                            'definition' => array(
-     *                                                'type' => 'text',
-     *                                                'length' => 20,
-     *                                            ),
-     *                                        )
-     *                                    ),
-     *                                    'rename' => array(
-     *                                        'sex' => array(
-     *                                            'name' => 'gender',
-     *                                            'definition' => array(
-     *                                                'type' => 'text',
-     *                                                'length' => 1,
-     *                                                'default' => 'M',
-     *                                            ),
-     *                                        )
-     *                                    )
-     *                                )
-     *
-     * @param boolean $check     indicates whether the function should just check if the DBMS driver
-     *                             can perform the requested table alterations if the value is true or
-     *                             actually perform them otherwise.
-     * @access public
-     *
-      * @return mixed MDB2_OK on success, a MDB2 error on failure
-     */
-    function alterTable($name, $changes, $check)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        foreach ($changes as $change_name => $change) {
-            switch ($change_name) {
-            case 'add':
-            case 'remove':
-            case 'change':
-            case 'rename':
-            case 'name':
-                break;
-            default:
-                return $db->raiseError(MDB2_ERROR_CANNOT_ALTER, null, null,
-                    'change type "'.$change_name.'" not yet supported', __FUNCTION__);
-            }
-        }
-
-        if ($check) {
-            return MDB2_OK;
-        }
-
-        $query = '';
-        if (!empty($changes['name'])) {
-            $change_name = $db->quoteIdentifier($changes['name'], true);
-            $query .= 'RENAME TO ' . $change_name;
-        }
-
-        if (!empty($changes['add']) && is_array($changes['add'])) {
-            foreach ($changes['add'] as $field_name => $field) {
-                if ($query) {
-                    $query.= ', ';
-                }
-                $query.= 'ADD ' . $db->getDeclaration($field['type'], $field_name, $field);
-            }
-        }
-
-        if (!empty($changes['remove']) && is_array($changes['remove'])) {
-            foreach ($changes['remove'] as $field_name => $field) {
-                if ($query) {
-                    $query.= ', ';
-                }
-                $field_name = $db->quoteIdentifier($field_name, true);
-                $query.= 'DROP ' . $field_name;
-            }
-        }
-
-        $rename = array();
-        if (!empty($changes['rename']) && is_array($changes['rename'])) {
-            foreach ($changes['rename'] as $field_name => $field) {
-                $rename[$field['name']] = $field_name;
-            }
-        }
-
-        if (!empty($changes['change']) && is_array($changes['change'])) {
-            foreach ($changes['change'] as $field_name => $field) {
-                if ($query) {
-                    $query.= ', ';
-                }
-                if (isset($rename[$field_name])) {
-                    $old_field_name = $rename[$field_name];
-                    unset($rename[$field_name]);
-                } else {
-                    $old_field_name = $field_name;
-                }
-                $old_field_name = $db->quoteIdentifier($old_field_name, true);
-                $query.= "CHANGE $old_field_name " . $db->getDeclaration($field['definition']['type'], $field_name, $field['definition']);
-            }
-        }
-
-        if (!empty($rename) && is_array($rename)) {
-            foreach ($rename as $rename_name => $renamed_field) {
-                if ($query) {
-                    $query.= ', ';
-                }
-                $field = $changes['rename'][$renamed_field];
-                $renamed_field = $db->quoteIdentifier($renamed_field, true);
-                $query.= 'CHANGE ' . $renamed_field . ' ' . $db->getDeclaration($field['definition']['type'], $field['name'], $field['definition']);
-            }
-        }
-
-        if (!$query) {
-            return MDB2_OK;
-        }
-
-        $name = $db->quoteIdentifier($name, true);
-        return $db->exec("ALTER TABLE $name $query");
-    }
-
-    // }}}
-    // {{{ listDatabases()
-
-    /**
-     * list all databases
-     *
-     * @return mixed array of database names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listDatabases()
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $result = $db->queryCol('SHOW DATABASES');
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ listUsers()
-
-    /**
-     * list all users
-     *
-     * @return mixed array of user names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listUsers()
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->queryCol('SELECT DISTINCT USER FROM mysql.USER');
-    }
-
-    // }}}
-    // {{{ listFunctions()
-
-    /**
-     * list all functions in the current database
-     *
-     * @return mixed array of function names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listFunctions()
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SELECT name FROM mysql.proc";
-        /*
-        SELECT ROUTINE_NAME
-          FROM INFORMATION_SCHEMA.ROUTINES
-         WHERE ROUTINE_TYPE = 'FUNCTION'
-        */
-        $result = $db->queryCol($query);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ listTableTriggers()
-
-    /**
-     * list all triggers in the database that reference a given table
-     *
-     * @param string table for which all referenced triggers should be found
-     * @return mixed array of trigger names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableTriggers($table = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = 'SHOW TRIGGERS';
-        if (!is_null($table)) {
-            $table = $db->quote($table, 'text');
-            $query .= " LIKE $table";
-        }
-        $result = $db->queryCol($query);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ listTables()
-
-    /**
-     * list all tables in the current database
-     *
-     * @param string database, the current is default
-     * @return mixed array of table names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTables($database = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SHOW /*!50002 FULL*/ TABLES";
-        if (!is_null($database)) {
-            $query .= " FROM $database";
-        }
-        $query.= "/*!50002  WHERE Table_type = 'BASE TABLE'*/";
-
-        $table_names = $db->queryAll($query, null, MDB2_FETCHMODE_ORDERED);
-        if (PEAR::isError($table_names)) {
-            return $table_names;
-        }
-
-        $result = array();
-        foreach ($table_names as $table) {
-            if (!$this->_fixSequenceName($table[0], true)) {
-                $result[] = $table[0];
-            }
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ listViews()
-
-    /**
-     * list all views in the current database
-     *
-     * @param string database, the current is default
-     * @return mixed array of view names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listViews($database = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = 'SHOW FULL TABLES';
-        if (!is_null($database)) {
-            $query.= " FROM $database";
-        }
-        $query.= " WHERE Table_type = 'VIEW'";
-
-        $result = $db->queryCol($query);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ listTableFields()
-
-    /**
-     * list all fields in a table in the current database
-     *
-     * @param string $table name of table that should be used in method
-     * @return mixed array of field names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableFields($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $table = $db->quoteIdentifier($table, true);
-        $result = $db->queryCol("SHOW COLUMNS FROM $table");
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ createIndex()
-
-    /**
-     * Get the stucture of a field into an array
-     *
-     * @author Leoncx
-     * @param string $table      name of the table on which the index is to be created
-     * @param string $name       name of the index to be created
-     * @param array  $definition associative array that defines properties of the index to be created.
-     *                           Currently, only one property named FIELDS is supported. This property
-     *                           is also an associative with the names of the index fields as array
-     *                           indexes. Each entry of this array is set to another type of associative
-     *                           array that specifies properties of the index that are specific to
-     *                           each field.
-     *
-     *                           Currently, only the sorting property is supported. It should be used
-     *                           to define the sorting direction of the index. It may be set to either
-     *                           ascending or descending.
-     *
-     *                           Not all DBMS support index sorting direction configuration. The DBMS
-     *                           drivers of those that do not support it ignore this property. Use the
-     *                           function supports() to determine whether the DBMS driver can manage indexes.
-     *
-     *                           Example
-     *                               array(
-     *                                   'fields' => array(
-     *                                       'user_name' => array(
-     *                                           'sorting' => 'ascending'
-     *                                           'length' => 10
-     *                                       ),
-     *                                       'last_login' => array()
-     *                                    )
-     *                                )
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createIndex($table, $name, $definition)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $table = $db->quoteIdentifier($table, true);
-        $name = $db->quoteIdentifier($db->getIndexName($name), true);
-        $query = "CREATE INDEX $name ON $table";
-        $fields = array();
-        foreach ($definition['fields'] as $field => $fieldinfo) {
-            if (!empty($fieldinfo['length'])) {
-                $fields[] = $db->quoteIdentifier($field, true) . '(' . $fieldinfo['length'] . ')';
-            } else {
-                $fields[] = $db->quoteIdentifier($field, true);
-            }
-        }
-        $query .= ' ('. implode(', ', $fields) . ')';
-        return $db->exec($query);
-    }
-
-    // }}}
-    // {{{ dropIndex()
-
-    /**
-     * drop existing index
-     *
-     * @param string    $table         name of table that should be used in method
-     * @param string    $name         name of the index to be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropIndex($table, $name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $table = $db->quoteIdentifier($table, true);
-        $name = $db->quoteIdentifier($db->getIndexName($name), true);
-        return $db->exec("DROP INDEX $name ON $table");
-    }
-
-    // }}}
-    // {{{ listTableIndexes()
-
-    /**
-     * list all indexes in a table
-     *
-     * @param string $table name of table that should be used in method
-     * @return mixed array of index names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableIndexes($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $key_name = 'Key_name';
-        $non_unique = 'Non_unique';
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            if ($db->options['field_case'] == CASE_LOWER) {
-                $key_name = strtolower($key_name);
-                $non_unique = strtolower($non_unique);
-            } else {
-                $key_name = strtoupper($key_name);
-                $non_unique = strtoupper($non_unique);
-            }
-        }
-
-        $table = $db->quoteIdentifier($table, true);
-        $query = "SHOW INDEX FROM $table";
-        $indexes = $db->queryAll($query, null, MDB2_FETCHMODE_ASSOC);
-        if (PEAR::isError($indexes)) {
-            return $indexes;
-        }
-
-        $result = array();
-        foreach ($indexes as $index_data) {
-            if ($index_data[$non_unique] && ($index = $this->_fixIndexName($index_data[$key_name]))) {
-                $result[$index] = true;
-            }
-        }
-
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_change_key_case($result, $db->options['field_case']);
-        }
-        return array_keys($result);
-    }
-
-    // }}}
-    // {{{ createConstraint()
-
-    /**
-     * create a constraint on a table
-     *
-     * @param string    $table        name of the table on which the constraint is to be created
-     * @param string    $name         name of the constraint to be created
-     * @param array     $definition   associative array that defines properties of the constraint to be created.
-     *                                Currently, only one property named FIELDS is supported. This property
-     *                                is also an associative with the names of the constraint fields as array
-     *                                constraints. Each entry of this array is set to another type of associative
-     *                                array that specifies properties of the constraint that are specific to
-     *                                each field.
-     *
-     *                                Example
-     *                                   array(
-     *                                       'fields' => array(
-     *                                           'user_name' => array(),
-     *                                           'last_login' => array()
-     *                                       )
-     *                                   )
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createConstraint($table, $name, $definition)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $type = '';
-        $idx_name = $db->quoteIdentifier($db->getIndexName($name), true);
-        if (!empty($definition['primary'])) {
-            $type = 'PRIMARY';
-            $idx_name = 'KEY';
-        } elseif (!empty($definition['unique'])) {
-            $type = 'UNIQUE';
-        } elseif (!empty($definition['foreign'])) {
-            $type = 'CONSTRAINT';
-        }
-        if (empty($type)) {
-            return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                'invalid definition, could not create constraint', __FUNCTION__);
-        }
-
-        $table_quoted = $db->quoteIdentifier($table, true);
-        $query = "ALTER TABLE $table_quoted ADD $type $idx_name";
-        if (!empty($definition['foreign'])) {
-            $query .= ' FOREIGN KEY';
-        }
-        $fields = array();
-        foreach ($definition['fields'] as $field => $fieldinfo) {
-            $quoted = $db->quoteIdentifier($field, true);
-            if (!empty($fieldinfo['length'])) {
-                $quoted .= '(' . $fieldinfo['length'] . ')';
-            }
-            $fields[] = $quoted;
-        }
-        $query .= ' ('. implode(', ', $fields) . ')';
-        if (!empty($definition['foreign'])) {
-            $query.= ' REFERENCES ' . $db->quoteIdentifier($definition['references']['table'], true);
-            $referenced_fields = array();
-            foreach (array_keys($definition['references']['fields']) as $field) {
-                $referenced_fields[] = $db->quoteIdentifier($field, true);
-            }
-            $query .= ' ('. implode(', ', $referenced_fields) . ')';
-            $query .= $this->_getAdvancedFKOptions($definition);
-
-            // add index on FK column(s) or we can't add a FK constraint
-            // @see http://forums.mysql.com/read.php?22,19755,226009
-            $result = $this->createIndex($table, $name.'_fkidx', $definition);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-        }
-        $res = $db->exec($query);
-        if (PEAR::isError($res)) {
-            return $res;
-        }
-        if (!empty($definition['foreign'])) {
-            return $this->_createFKTriggers($table, array($name => $definition));
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ dropConstraint()
-
-    /**
-     * drop existing constraint
-     *
-     * @param string    $table        name of table that should be used in method
-     * @param string    $name         name of the constraint to be dropped
-     * @param string    $primary      hint if the constraint is primary
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropConstraint($table, $name, $primary = false)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if ($primary || strtolower($name) == 'primary') {
-            $query = 'ALTER TABLE '. $db->quoteIdentifier($table, true) .' DROP PRIMARY KEY';
-            return $db->exec($query);
-        }
-
-        //is it a FK constraint? If so, also delete the associated triggers
-        $db->loadModule('Reverse', null, true);
-        $definition = $db->reverse->getTableConstraintDefinition($table, $name);
-        if (!PEAR::isError($definition) && !empty($definition['foreign'])) {
-            //first drop the FK enforcing triggers
-            $result = $this->_dropFKTriggers($table, $name, $definition['references']['table']);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-            //then drop the constraint itself
-            $table = $db->quoteIdentifier($table, true);
-            $name = $db->quoteIdentifier($db->getIndexName($name), true);
-            $query = "ALTER TABLE $table DROP FOREIGN KEY $name";
-            return $db->exec($query);
-        }
-
-        $table = $db->quoteIdentifier($table, true);
-        $name = $db->quoteIdentifier($db->getIndexName($name), true);
-        $query = "ALTER TABLE $table DROP INDEX $name";
-        return $db->exec($query);
-    }
-
-    // }}}
-    // {{{ _createFKTriggers()
-
-    /**
-     * Create triggers to enforce the FOREIGN KEY constraint on the table
-     *
-     * NB: since there's no RAISE_APPLICATION_ERROR facility in mysql,
-     * we call a non-existent procedure to raise the FK violation message.
-     * @see http://forums.mysql.com/read.php?99,55108,71877#msg-71877
-     *
-     * @param string $table        table name
-     * @param array  $foreign_keys FOREIGN KEY definitions
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access private
-     */
-    function _createFKTriggers($table, $foreign_keys)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        // create triggers to enforce FOREIGN KEY constraints
-        if ($db->supports('triggers') && !empty($foreign_keys)) {
-            $table_quoted = $db->quoteIdentifier($table, true);
-            foreach ($foreign_keys as $fkname => $fkdef) {
-                if (empty($fkdef)) {
-                    continue;
-                }
-                //set actions to default if not set
-                $fkdef['onupdate'] = empty($fkdef['onupdate']) ? $db->options['default_fk_action_onupdate'] : strtoupper($fkdef['onupdate']);
-                $fkdef['ondelete'] = empty($fkdef['ondelete']) ? $db->options['default_fk_action_ondelete'] : strtoupper($fkdef['ondelete']);
-
-                $trigger_names = array(
-                    'insert'    => $fkname.'_insert_trg',
-                    'update'    => $fkname.'_update_trg',
-                    'pk_update' => $fkname.'_pk_update_trg',
-                    'pk_delete' => $fkname.'_pk_delete_trg',
-                );
-                $table_fields = array_keys($fkdef['fields']);
-                $referenced_fields = array_keys($fkdef['references']['fields']);
-
-                //create the ON [UPDATE|DELETE] triggers on the primary table
-                $restrict_action = ' IF (SELECT ';
-                $aliased_fields = array();
-                foreach ($table_fields as $field) {
-                    $aliased_fields[] = $table_quoted .'.'.$field .' AS '.$field;
-                }
-                $restrict_action .= implode(',', $aliased_fields)
-                       .' FROM '.$table_quoted
-                       .' WHERE ';
-                $conditions  = array();
-                $new_values  = array();
-                $null_values = array();
-                for ($i=0; $i<count($table_fields); $i++) {
-                    $conditions[]  = $table_fields[$i] .' = OLD.'.$referenced_fields[$i];
-                    $new_values[]  = $table_fields[$i] .' = NEW.'.$referenced_fields[$i];
-                    $null_values[] = $table_fields[$i] .' = NULL';
-                }
-                $conditions2 = array();
-                for ($i=0; $i<count($referenced_fields); $i++) {
-                    $conditions2[]  = 'NEW.'.$referenced_fields[$i] .' <> OLD.'.$referenced_fields[$i];
-                }
-                $restrict_action .= implode(' AND ', $conditions).') IS NOT NULL'
-                                .' AND (' .implode(' OR ', $conditions2) .')'
-                                .' THEN CALL %s_ON_TABLE_'.$table.'_VIOLATES_FOREIGN_KEY_CONSTRAINT();'
-                                .' END IF;';
-
-                $cascade_action_update = 'UPDATE '.$table_quoted.' SET '.implode(', ', $new_values) .' WHERE '.implode(' AND ', $conditions). ';';
-                $cascade_action_delete = 'DELETE FROM '.$table_quoted.' WHERE '.implode(' AND ', $conditions). ';';
-                $setnull_action        = 'UPDATE '.$table_quoted.' SET '.implode(', ', $null_values).' WHERE '.implode(' AND ', $conditions). ';';
-
-                if ('SET DEFAULT' == $fkdef['onupdate'] || 'SET DEFAULT' == $fkdef['ondelete']) {
-                    $db->loadModule('Reverse', null, true);
-                    $default_values = array();
-                    foreach ($table_fields as $table_field) {
-                        $field_definition = $db->reverse->getTableFieldDefinition($table, $field);
-                        if (PEAR::isError($field_definition)) {
-                            return $field_definition;
-                        }
-                        $default_values[] = $table_field .' = '. $field_definition[0]['default'];
-                    }
-                    $setdefault_action = 'UPDATE '.$table_quoted.' SET '.implode(', ', $default_values).' WHERE '.implode(' AND ', $conditions). ';';
-                }
-
-                $query = 'CREATE TRIGGER %s'
-                        .' %s ON '.$fkdef['references']['table']
-                        .' FOR EACH ROW BEGIN '
-                        .' SET FOREIGN_KEY_CHECKS = 0; ';  //only really needed for ON UPDATE CASCADE
-
-                if ('CASCADE' == $fkdef['onupdate']) {
-                    $sql_update = sprintf($query, $trigger_names['pk_update'], 'BEFORE UPDATE',  'update') . $cascade_action_update;
-                } elseif ('SET NULL' == $fkdef['onupdate']) {
-                    $sql_update = sprintf($query, $trigger_names['pk_update'], 'BEFORE UPDATE', 'update') . $setnull_action;
-                } elseif ('SET DEFAULT' == $fkdef['onupdate']) {
-                    $sql_update = sprintf($query, $trigger_names['pk_update'], 'BEFORE UPDATE', 'update') . $setdefault_action;
-                } elseif ('NO ACTION' == $fkdef['onupdate']) {
-                    $sql_update = sprintf($query.$restrict_action, $trigger_names['pk_update'], 'AFTER UPDATE', 'update');
-                } elseif ('RESTRICT' == $fkdef['onupdate']) {
-                    $sql_update = sprintf($query.$restrict_action, $trigger_names['pk_update'], 'BEFORE UPDATE', 'update');
-                }
-                if ('CASCADE' == $fkdef['ondelete']) {
-                    $sql_delete = sprintf($query, $trigger_names['pk_delete'], 'BEFORE DELETE',  'delete') . $cascade_action_delete;
-                } elseif ('SET NULL' == $fkdef['ondelete']) {
-                    $sql_delete = sprintf($query, $trigger_names['pk_delete'], 'BEFORE DELETE', 'delete') . $setnull_action;
-                } elseif ('SET DEFAULT' == $fkdef['ondelete']) {
-                    $sql_delete = sprintf($query, $trigger_names['pk_delete'], 'BEFORE DELETE', 'delete') . $setdefault_action;
-                } elseif ('NO ACTION' == $fkdef['ondelete']) {
-                    $sql_delete = sprintf($query.$restrict_action, $trigger_names['pk_delete'], 'AFTER DELETE', 'delete');
-                } elseif ('RESTRICT' == $fkdef['ondelete']) {
-                    $sql_delete = sprintf($query.$restrict_action, $trigger_names['pk_delete'], 'BEFORE DELETE', 'delete');
-                }
-                $sql_update .= ' SET FOREIGN_KEY_CHECKS = 1; END;';
-                $sql_delete .= ' SET FOREIGN_KEY_CHECKS = 1; END;';
-
-                $db->pushErrorHandling(PEAR_ERROR_RETURN);
-                $db->expectError(MDB2_ERROR_CANNOT_CREATE);
-                $result = $db->exec($sql_delete);
-                $expected_errmsg = 'This MySQL version doesn\'t support multiple triggers with the same action time and event for one table';
-                $db->popExpect();
-                $db->popErrorHandling();
-                if (PEAR::isError($result)) {
-                    if ($result->getCode() != MDB2_ERROR_CANNOT_CREATE) {
-                        return $result;
-                    }
-                    $db->warnings[] = $expected_errmsg;
-                }
-                $db->pushErrorHandling(PEAR_ERROR_RETURN);
-                $db->expectError(MDB2_ERROR_CANNOT_CREATE);
-                $result = $db->exec($sql_update);
-                $db->popExpect();
-                $db->popErrorHandling();
-                if (PEAR::isError($result) && $result->getCode() != MDB2_ERROR_CANNOT_CREATE) {
-                    if ($result->getCode() != MDB2_ERROR_CANNOT_CREATE) {
-                        return $result;
-                    }
-                    $db->warnings[] = $expected_errmsg;
-                }
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ _dropFKTriggers()
-
-    /**
-     * Drop the triggers created to enforce the FOREIGN KEY constraint on the table
-     *
-     * @param string $table            table name
-     * @param string $fkname           FOREIGN KEY constraint name
-     * @param string $referenced_table referenced table name
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access private
-     */
-    function _dropFKTriggers($table, $fkname, $referenced_table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $triggers  = $this->listTableTriggers($table);
-        $triggers2 = $this->listTableTriggers($referenced_table);
-        if (!PEAR::isError($triggers2) && !PEAR::isError($triggers)) {
-            $triggers = array_merge($triggers, $triggers2);
-            $pattern = '/^'.$fkname.'(_pk)?_(insert|update|delete)_trg$/i';
-            foreach ($triggers as $trigger) {
-                if (preg_match($pattern, $trigger)) {
-                    $result = $db->exec('DROP TRIGGER '.$trigger);
-                    if (PEAR::isError($result)) {
-                        return $result;
-                    }
-                }
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ listTableConstraints()
-
-    /**
-     * list all constraints in a table
-     *
-     * @param string $table name of table that should be used in method
-     * @return mixed array of constraint names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableConstraints($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $key_name = 'Key_name';
-        $non_unique = 'Non_unique';
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            if ($db->options['field_case'] == CASE_LOWER) {
-                $key_name = strtolower($key_name);
-                $non_unique = strtolower($non_unique);
-            } else {
-                $key_name = strtoupper($key_name);
-                $non_unique = strtoupper($non_unique);
-            }
-        }
-
-        $query = 'SHOW INDEX FROM ' . $db->quoteIdentifier($table, true);
-        $indexes = $db->queryAll($query, null, MDB2_FETCHMODE_ASSOC);
-        if (PEAR::isError($indexes)) {
-            return $indexes;
-        }
-
-        $result = array();
-        foreach ($indexes as $index_data) {
-            if (!$index_data[$non_unique]) {
-                if ($index_data[$key_name] !== 'PRIMARY') {
-                    $index = $this->_fixIndexName($index_data[$key_name]);
-                } else {
-                    $index = 'PRIMARY';
-                }
-                if (!empty($index)) {
-                    $result[$index] = true;
-                }
-            }
-        }
-        
-        //list FOREIGN KEY constraints...
-        $query = 'SHOW CREATE TABLE '. $db->escape($table);
-        $definition = $db->queryOne($query, 'text', 1);
-        if (!PEAR::isError($definition) && !empty($definition)) {
-            $pattern = '/\bCONSTRAINT\b\s+([^\s]+)\s+\bFOREIGN KEY\b/Uims';
-            if (preg_match_all($pattern, str_replace('`', '', $definition), $matches) > 0) {
-                foreach ($matches[1] as $constraint) {
-                    $result[$constraint] = true;
-                }
-            }
-        }
-
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_change_key_case($result, $db->options['field_case']);
-        }
-        return array_keys($result);
-    }
-
-    // }}}
-    // {{{ createSequence()
-
-    /**
-     * create sequence
-     *
-     * @param string    $seq_name name of the sequence to be created
-     * @param string    $start    start value of the sequence; default is 1
-     * @param array     $options  An associative array of table options:
-     *                          array(
-     *                              'comment' => 'Foo',
-     *                              'charset' => 'utf8',
-     *                              'collate' => 'utf8_unicode_ci',
-     *                              'type'    => 'innodb',
-     *                          );
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createSequence($seq_name, $start = 1, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        $seqcol_name = $db->quoteIdentifier($db->options['seqcol_name'], true);
-        
-        $options_strings = array();
-
-        if (!empty($options['comment'])) {
-            $options_strings['comment'] = 'COMMENT = '.$db->quote($options['comment'], 'text');
-        }
-
-        if (!empty($options['charset'])) {
-            $options_strings['charset'] = 'DEFAULT CHARACTER SET '.$options['charset'];
-            if (!empty($options['collate'])) {
-                $options_strings['charset'].= ' COLLATE '.$options['collate'];
-            }
-        }
-
-        $type = false;
-        if (!empty($options['type'])) {
-            $type = $options['type'];
-        } elseif ($db->options['default_table_type']) {
-            $type = $db->options['default_table_type'];
-        }
-        if ($type) {
-            $options_strings[] = "ENGINE = $type";
-        }
-
-        $query = "CREATE TABLE $sequence_name ($seqcol_name INT NOT NULL AUTO_INCREMENT, PRIMARY KEY ($seqcol_name))";
-        if (!empty($options_strings)) {
-            $query .= ' '.implode(' ', $options_strings);
-        }
-        $res = $db->exec($query);
-        if (PEAR::isError($res)) {
-            return $res;
-        }
-
-        if ($start == 1) {
-            return MDB2_OK;
-        }
-
-        $query = "INSERT INTO $sequence_name ($seqcol_name) VALUES (".($start-1).')';
-        $res = $db->exec($query);
-        if (!PEAR::isError($res)) {
-            return MDB2_OK;
-        }
-
-        // Handle error
-        $result = $db->exec("DROP TABLE $sequence_name");
-        if (PEAR::isError($result)) {
-            return $db->raiseError($result, null, null,
-                'could not drop inconsistent sequence table', __FUNCTION__);
-        }
-
-        return $db->raiseError($res, null, null,
-            'could not create sequence table', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * drop existing sequence
-     *
-     * @param string    $seq_name     name of the sequence to be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropSequence($seq_name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        return $db->exec("DROP TABLE $sequence_name");
-    }
-
-    // }}}
-    // {{{ listSequences()
-
-    /**
-     * list all sequences in the current database
-     *
-     * @param string database, the current is default
-     * @return mixed array of sequence names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listSequences($database = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SHOW TABLES";
-        if (!is_null($database)) {
-            $query .= " FROM $database";
-        }
-        $table_names = $db->queryCol($query);
-        if (PEAR::isError($table_names)) {
-            return $table_names;
-        }
-
-        $result = array();
-        foreach ($table_names as $table_name) {
-            if ($sqn = $this->_fixSequenceName($table_name, true)) {
-                $result[] = $sqn;
-            }
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Manager/pgsql.php b/3rdparty/MDB2/Driver/Manager/pgsql.php
deleted file mode 100644
index 44a611d399d..00000000000
--- a/3rdparty/MDB2/Driver/Manager/pgsql.php
+++ /dev/null
@@ -1,951 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Paul Cooper <pgc@ucecom.com>                                 |
-// +----------------------------------------------------------------------+
-//
-// $Id: pgsql.php,v 1.87 2008/11/29 14:09:59 afz Exp $
-
-require_once('MDB2/Driver/Manager/Common.php');
-
-/**
- * MDB2 MySQL driver for the management modules
- *
- * @package MDB2
- * @category Database
- * @author  Paul Cooper <pgc@ucecom.com>
- */
-class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
-{
-    // {{{ createDatabase()
-
-    /**
-     * create a new database
-     *
-     * @param string $name    name of the database that should be created
-     * @param array  $options array with charset info
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createDatabase($name, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $name  = $db->quoteIdentifier($name, true);
-        $query = 'CREATE DATABASE ' . $name;
-        if (!empty($options['charset'])) {
-            $query .= ' WITH ENCODING ' . $db->quote($options['charset'], 'text');
-        }
-        return $db->standaloneQuery($query, null, true);
-    }
-
-    // }}}
-    // {{{ alterDatabase()
-
-    /**
-     * alter an existing database
-     *
-     * @param string $name    name of the database that is intended to be changed
-     * @param array  $options array with name, owner info
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function alterDatabase($name, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = 'ALTER DATABASE '. $db->quoteIdentifier($name, true);
-        if (!empty($options['name'])) {
-            $query .= ' RENAME TO ' . $options['name'];
-        }
-        if (!empty($options['owner'])) {
-            $query .= ' OWNER TO ' . $options['owner'];
-        }
-        return $db->standaloneQuery($query, null, true);
-    }
-
-    // }}}
-    // {{{ dropDatabase()
-
-    /**
-     * drop an existing database
-     *
-     * @param string $name name of the database that should be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropDatabase($name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $name = $db->quoteIdentifier($name, true);
-        $query = "DROP DATABASE $name";
-        return $db->standaloneQuery($query, null, true);
-    }
-
-    // }}}
-    // {{{ _getAdvancedFKOptions()
-
-    /**
-     * Return the FOREIGN KEY query section dealing with non-standard options
-     * as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
-     *
-     * @param array $definition
-     * @return string
-     * @access protected
-     */
-    function _getAdvancedFKOptions($definition)
-    {
-        $query = '';
-        if (!empty($definition['match'])) {
-            $query .= ' MATCH '.$definition['match'];
-        }
-        if (!empty($definition['onupdate'])) {
-            $query .= ' ON UPDATE '.$definition['onupdate'];
-        }
-        if (!empty($definition['ondelete'])) {
-            $query .= ' ON DELETE '.$definition['ondelete'];
-        }
-        if (!empty($definition['deferrable'])) {
-            $query .= ' DEFERRABLE';
-        } else {
-            $query .= ' NOT DEFERRABLE';
-        }
-        if (!empty($definition['initiallydeferred'])) {
-            $query .= ' INITIALLY DEFERRED';
-        } else {
-            $query .= ' INITIALLY IMMEDIATE';
-        }
-        return $query;
-    }
-
-    // }}}
-    // {{{ truncateTable()
-
-    /**
-     * Truncate an existing table (if the TRUNCATE TABLE syntax is not supported,
-     * it falls back to a DELETE FROM TABLE query)
-     *
-     * @param string $name name of the table that should be truncated
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function truncateTable($name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $name = $db->quoteIdentifier($name, true);
-        return $db->exec("TRUNCATE TABLE $name");
-    }
-
-    // }}}
-    // {{{ vacuum()
-
-    /**
-     * Optimize (vacuum) all the tables in the db (or only the specified table)
-     * and optionally run ANALYZE.
-     *
-     * @param string $table table name (all the tables if empty)
-     * @param array  $options an array with driver-specific options:
-     *               - timeout [int] (in seconds) [mssql-only]
-     *               - analyze [boolean] [pgsql and mysql]
-     *               - full [boolean] [pgsql-only]
-     *               - freeze [boolean] [pgsql-only]
-     *
-     * @return mixed MDB2_OK success, a MDB2 error on failure
-     * @access public
-     */
-    function vacuum($table = null, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        $query = 'VACUUM';
-
-        if (!empty($options['full'])) {
-            $query .= ' FULL';
-        }
-        if (!empty($options['freeze'])) {
-            $query .= ' FREEZE';
-        }
-        if (!empty($options['analyze'])) {
-            $query .= ' ANALYZE';
-        }
-
-        if (!empty($table)) {
-            $query .= ' '.$db->quoteIdentifier($table, true);
-        }
-        return $db->exec($query);
-    }
-
-    // }}}
-    // {{{ alterTable()
-
-    /**
-     * alter an existing table
-     *
-     * @param string $name         name of the table that is intended to be changed.
-     * @param array $changes     associative array that contains the details of each type
-     *                             of change that is intended to be performed. The types of
-     *                             changes that are currently supported are defined as follows:
-     *
-     *                             name
-     *
-     *                                New name for the table.
-     *
-     *                            add
-     *
-     *                                Associative array with the names of fields to be added as
-     *                                 indexes of the array. The value of each entry of the array
-     *                                 should be set to another associative array with the properties
-     *                                 of the fields to be added. The properties of the fields should
-     *                                 be the same as defined by the MDB2 parser.
-     *
-     *
-     *                            remove
-     *
-     *                                Associative array with the names of fields to be removed as indexes
-     *                                 of the array. Currently the values assigned to each entry are ignored.
-     *                                 An empty array should be used for future compatibility.
-     *
-     *                            rename
-     *
-     *                                Associative array with the names of fields to be renamed as indexes
-     *                                 of the array. The value of each entry of the array should be set to
-     *                                 another associative array with the entry named name with the new
-     *                                 field name and the entry named Declaration that is expected to contain
-     *                                 the portion of the field declaration already in DBMS specific SQL code
-     *                                 as it is used in the CREATE TABLE statement.
-     *
-     *                            change
-     *
-     *                                Associative array with the names of the fields to be changed as indexes
-     *                                 of the array. Keep in mind that if it is intended to change either the
-     *                                 name of a field and any other properties, the change array entries
-     *                                 should have the new names of the fields as array indexes.
-     *
-     *                                The value of each entry of the array should be set to another associative
-     *                                 array with the properties of the fields to that are meant to be changed as
-     *                                 array entries. These entries should be assigned to the new values of the
-     *                                 respective properties. The properties of the fields should be the same
-     *                                 as defined by the MDB2 parser.
-     *
-     *                            Example
-     *                                array(
-     *                                    'name' => 'userlist',
-     *                                    'add' => array(
-     *                                        'quota' => array(
-     *                                            'type' => 'integer',
-     *                                            'unsigned' => 1
-     *                                        )
-     *                                    ),
-     *                                    'remove' => array(
-     *                                        'file_limit' => array(),
-     *                                        'time_limit' => array()
-     *                                    ),
-     *                                    'change' => array(
-     *                                        'name' => array(
-     *                                            'length' => '20',
-     *                                            'definition' => array(
-     *                                                'type' => 'text',
-     *                                                'length' => 20,
-     *                                            ),
-     *                                        )
-     *                                    ),
-     *                                    'rename' => array(
-     *                                        'sex' => array(
-     *                                            'name' => 'gender',
-     *                                            'definition' => array(
-     *                                                'type' => 'text',
-     *                                                'length' => 1,
-     *                                                'default' => 'M',
-     *                                            ),
-     *                                        )
-     *                                    )
-     *                                )
-     *
-     * @param boolean $check     indicates whether the function should just check if the DBMS driver
-     *                             can perform the requested table alterations if the value is true or
-     *                             actually perform them otherwise.
-     * @access public
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     */
-    function alterTable($name, $changes, $check)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        foreach ($changes as $change_name => $change) {
-            switch ($change_name) {
-            case 'add':
-            case 'remove':
-            case 'change':
-            case 'name':
-            case 'rename':
-                break;
-            default:
-                return $db->raiseError(MDB2_ERROR_CANNOT_ALTER, null, null,
-                    'change type "'.$change_name.'\" not yet supported', __FUNCTION__);
-            }
-        }
-
-        if ($check) {
-            return MDB2_OK;
-        }
-
-        $name = $db->quoteIdentifier($name, true);
-
-        if (!empty($changes['remove']) && is_array($changes['remove'])) {
-            foreach ($changes['remove'] as $field_name => $field) {
-                $field_name = $db->quoteIdentifier($field_name, true);
-                $query = 'DROP ' . $field_name;
-                $result = $db->exec("ALTER TABLE $name $query");
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
-        }
-
-        if (!empty($changes['rename']) && is_array($changes['rename'])) {
-            foreach ($changes['rename'] as $field_name => $field) {
-                $field_name = $db->quoteIdentifier($field_name, true);
-                $result = $db->exec("ALTER TABLE $name RENAME COLUMN $field_name TO ".$db->quoteIdentifier($field['name'], true));
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
-        }
-
-        if (!empty($changes['add']) && is_array($changes['add'])) {
-            foreach ($changes['add'] as $field_name => $field) {
-                $query = 'ADD ' . $db->getDeclaration($field['type'], $field_name, $field);
-                $result = $db->exec("ALTER TABLE $name $query");
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
-        }
-
-        if (!empty($changes['change']) && is_array($changes['change'])) {
-            foreach ($changes['change'] as $field_name => $field) {
-                $field_name = $db->quoteIdentifier($field_name, true);
-                if (!empty($field['definition']['type'])) {
-                    $server_info = $db->getServerVersion();
-                    if (PEAR::isError($server_info)) {
-                        return $server_info;
-                    }
-                    if (is_array($server_info) && $server_info['major'] < 8) {
-                        return $db->raiseError(MDB2_ERROR_CANNOT_ALTER, null, null,
-                            'changing column type for "'.$change_name.'\" requires PostgreSQL 8.0 or above', __FUNCTION__);
-                    }
-                    $db->loadModule('Datatype', null, true);
-                    $type = $db->datatype->getTypeDeclaration($field['definition']);
-                    if($type=='SERIAL PRIMARY KEY'){//not correct when altering a table, since serials arent a real type
-						$type='INTEGER';//use integer instead
-                    }
-                    $query = "ALTER $field_name TYPE $type USING CAST($field_name AS $type)";
-                    $result = $db->exec("ALTER TABLE $name $query");
-                    if (PEAR::isError($result)) {
-                        return $result;
-                    }
-                }
-                if (array_key_exists('default', $field['definition'])) {
-                    $query = "ALTER $field_name SET DEFAULT ".$db->quote($field['definition']['default'], $field['definition']['type']);
-                    $result = $db->exec("ALTER TABLE $name $query");
-                    if (PEAR::isError($result)) {
-                        return $result;
-                    }
-                }
-                if (!empty($field['definition']['notnull'])) {
-                    $query = "ALTER $field_name ".($field['definition']['notnull'] ? 'SET' : 'DROP').' NOT NULL';
-                    $result = $db->exec("ALTER TABLE $name $query");
-                    if (PEAR::isError($result)) {
-                        return $result;
-                    }
-                }
-            }
-        }
-
-        if (!empty($changes['name'])) {
-            $change_name = $db->quoteIdentifier($changes['name'], true);
-            $result = $db->exec("ALTER TABLE $name RENAME TO ".$change_name);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-        }
-
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ listDatabases()
-
-    /**
-     * list all databases
-     *
-     * @return mixed array of database names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listDatabases()
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = 'SELECT datname FROM pg_database';
-        $result2 = $db->standaloneQuery($query, array('text'), false);
-        if (!MDB2::isResultCommon($result2)) {
-            return $result2;
-        }
-
-        $result = $result2->fetchCol();
-        $result2->free();
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ listUsers()
-
-    /**
-     * list all users
-     *
-     * @return mixed array of user names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listUsers()
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = 'SELECT usename FROM pg_user';
-        $result2 = $db->standaloneQuery($query, array('text'), false);
-        if (!MDB2::isResultCommon($result2)) {
-            return $result2;
-        }
-
-        $result = $result2->fetchCol();
-        $result2->free();
-        return $result;
-    }
-
-    // }}}
-    // {{{ listViews()
-
-    /**
-     * list all views in the current database
-     *
-     * @return mixed array of view names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listViews($database = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SELECT viewname
-                    FROM pg_views
-                   WHERE schemaname NOT IN ('pg_catalog', 'information_schema')
-                     AND viewname !~ '^pg_'";
-        $result = $db->queryCol($query);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ listTableViews()
-
-    /**
-     * list the views in the database that reference a given table
-     *
-     * @param string table for which all referenced views should be found
-     * @return mixed array of view names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableViews($table)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = 'SELECT viewname FROM pg_views NATURAL JOIN pg_tables';
-        $query.= ' WHERE tablename ='.$db->quote($table, 'text');
-        $result = $db->queryCol($query);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ listFunctions()
-
-    /**
-     * list all functions in the current database
-     *
-     * @return mixed array of function names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listFunctions()
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "
-            SELECT
-                proname
-            FROM
-                pg_proc pr,
-                pg_type tp
-            WHERE
-                tp.oid = pr.prorettype
-                AND pr.proisagg = FALSE
-                AND tp.typname <> 'trigger'
-                AND pr.pronamespace IN
-                    (SELECT oid FROM pg_namespace WHERE nspname NOT LIKE 'pg_%' AND nspname != 'information_schema')";
-        $result = $db->queryCol($query);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ listTableTriggers()
-
-    /**
-     * list all triggers in the database that reference a given table
-     *
-     * @param string table for which all referenced triggers should be found
-     * @return mixed array of trigger names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableTriggers($table = null)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = 'SELECT trg.tgname AS trigger_name
-                    FROM pg_trigger trg,
-                         pg_class tbl
-                   WHERE trg.tgrelid = tbl.oid';
-        if (!is_null($table)) {
-            $table = $db->quote(strtoupper($table), 'text');
-            $query .= " AND tbl.relname = $table";
-        }
-        $result = $db->queryCol($query);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ listTables()
-
-    /**
-     * list all tables in the current database
-     *
-     * @return mixed array of table names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTables($database = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        // gratuitously stolen from PEAR DB _getSpecialQuery in pgsql.php
-        $query = 'SELECT c.relname AS "Name"'
-            . ' FROM pg_class c, pg_user u'
-            . ' WHERE c.relowner = u.usesysid'
-            . " AND c.relkind = 'r'"
-            . ' AND NOT EXISTS'
-            . ' (SELECT 1 FROM pg_views'
-            . '  WHERE viewname = c.relname)'
-            . " AND c.relname !~ '^(pg_|sql_)'"
-            . ' UNION'
-            . ' SELECT c.relname AS "Name"'
-            . ' FROM pg_class c'
-            . " WHERE c.relkind = 'r'"
-            . ' AND NOT EXISTS'
-            . ' (SELECT 1 FROM pg_views'
-            . '  WHERE viewname = c.relname)'
-            . ' AND NOT EXISTS'
-            . ' (SELECT 1 FROM pg_user'
-            . '  WHERE usesysid = c.relowner)'
-            . " AND c.relname !~ '^pg_'";
-        $result = $db->queryCol($query);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ listTableFields()
-
-    /**
-     * list all fields in a table in the current database
-     *
-     * @param string $table name of table that should be used in method
-     * @return mixed array of field names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableFields($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        list($schema, $table) = $this->splitTableSchema($table);
-
-        $table = $db->quoteIdentifier($table, true);
-        if (!empty($schema)) {
-            $table = $db->quoteIdentifier($schema, true) . '.' .$table;
-        }
-        $db->setLimit(1);
-        $result2 = $db->query("SELECT * FROM $table LIMIT 1");
-        if (PEAR::isError($result2)) {
-            return $result2;
-        }
-        $result = $result2->getColumnNames();
-        $result2->free();
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        return array_flip($result);
-    }
-
-    // }}}
-    // {{{ listTableIndexes()
-
-    /**
-     * list all indexes in a table
-     *
-     * @param string $table name of table that should be used in method
-     * @return mixed array of index names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableIndexes($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        list($schema, $table) = $this->splitTableSchema($table);
-
-        $table = $db->quote($table, 'text');
-        $subquery = "SELECT indexrelid
-                       FROM pg_index
-                  LEFT JOIN pg_class ON pg_class.oid = pg_index.indrelid
-                  LEFT JOIN pg_namespace ON pg_class.relnamespace = pg_namespace.oid
-                      WHERE pg_class.relname = $table
-                        AND indisunique != 't'
-                        AND indisprimary != 't'";
-        if (!empty($schema)) {
-            $subquery .= ' AND pg_namespace.nspname = '.$db->quote($schema, 'text');
-        }
-        $query = "SELECT relname FROM pg_class WHERE oid IN ($subquery)";
-        $indexes = $db->queryCol($query, 'text');
-        if (PEAR::isError($indexes)) {
-            return $indexes;
-        }
-
-        $result = array();
-        foreach ($indexes as $index) {
-            $index = $this->_fixIndexName($index);
-            if (!empty($index)) {
-                $result[$index] = true;
-            }
-        }
-
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_change_key_case($result, $db->options['field_case']);
-        }
-        return array_keys($result);
-    }
-
-    // }}}
-    // {{{ dropConstraint()
-
-    /**
-     * drop existing constraint
-     *
-     * @param string $table   name of table that should be used in method
-     * @param string $name    name of the constraint to be dropped
-     * @param string $primary hint if the constraint is primary
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropConstraint($table, $name, $primary = false)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        // is it an UNIQUE index?
-        $query = 'SELECT relname
-                    FROM pg_class
-                   WHERE oid IN (
-                         SELECT indexrelid
-                           FROM pg_index, pg_class
-                          WHERE pg_class.relname = '.$db->quote($table, 'text').'
-                            AND pg_class.oid = pg_index.indrelid
-                            AND indisunique = \'t\')
-                  EXCEPT
-                  SELECT conname
-                   FROM pg_constraint, pg_class
-                  WHERE pg_constraint.conrelid = pg_class.oid
-                    AND relname = '. $db->quote($table, 'text');
-        $unique = $db->queryCol($query, 'text');
-        if (PEAR::isError($unique) || empty($unique)) {
-            // not an UNIQUE index, maybe a CONSTRAINT
-            return parent::dropConstraint($table, $name, $primary);
-        }
-
-        if (in_array($name, $unique)) {
-            return $db->exec('DROP INDEX '.$db->quoteIdentifier($name, true));
-        }
-        $idxname = $db->getIndexName($name);
-        if (in_array($idxname, $unique)) {
-            return $db->exec('DROP INDEX '.$db->quoteIdentifier($idxname, true));
-        }
-        return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-            $name . ' is not an existing constraint for table ' . $table, __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ listTableConstraints()
-
-    /**
-     * list all constraints in a table
-     *
-     * @param string $table name of table that should be used in method
-     * @return mixed array of constraint names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableConstraints($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        list($schema, $table) = $this->splitTableSchema($table);
-
-        $table = $db->quote($table, 'text');
-        $query = 'SELECT conname
-                    FROM pg_constraint
-               LEFT JOIN pg_class ON pg_constraint.conrelid = pg_class.oid
-               LEFT JOIN pg_namespace ON pg_class.relnamespace = pg_namespace.oid
-                   WHERE relname = ' .$table;
-        if (!empty($schema)) {
-            $query .= ' AND pg_namespace.nspname = ' . $db->quote($schema, 'text');
-        }
-        $query .= '
-                   UNION DISTINCT
-                  SELECT relname
-                    FROM pg_class
-                   WHERE oid IN (
-                         SELECT indexrelid
-                           FROM pg_index
-                      LEFT JOIN pg_class ON pg_class.oid = pg_index.indrelid
-                      LEFT JOIN pg_namespace ON pg_class.relnamespace = pg_namespace.oid
-                          WHERE pg_class.relname = '.$table.'
-                            AND indisunique = \'t\'';
-        if (!empty($schema)) {
-            $query .= ' AND pg_namespace.nspname = ' . $db->quote($schema, 'text');
-        }
-        $query .= ')';
-        $constraints = $db->queryCol($query);
-        if (PEAR::isError($constraints)) {
-            return $constraints;
-        }
-
-        $result = array();
-        foreach ($constraints as $constraint) {
-            $constraint = $this->_fixIndexName($constraint);
-            if (!empty($constraint)) {
-                $result[$constraint] = true;
-            }
-        }
-
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
-            && $db->options['field_case'] == CASE_LOWER
-        ) {
-            $result = array_change_key_case($result, $db->options['field_case']);
-        }
-        return array_keys($result);
-    }
-
-    // }}}
-    // {{{ createSequence()
-
-    /**
-     * create sequence
-     *
-     * @param string $seq_name name of the sequence to be created
-     * @param string $start start value of the sequence; default is 1
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createSequence($seq_name, $start = 1)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        return $db->exec("CREATE SEQUENCE $sequence_name INCREMENT 1".
-            ($start < 1 ? " MINVALUE $start" : '')." START $start");
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * drop existing sequence
-     *
-     * @param string $seq_name name of the sequence to be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropSequence($seq_name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        return $db->exec("DROP SEQUENCE $sequence_name");
-    }
-
-    // }}}
-    // {{{ listSequences()
-
-    /**
-     * list all sequences in the current database
-     *
-     * @return mixed array of sequence names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listSequences($database = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SELECT relname FROM pg_class WHERE relkind = 'S' AND relnamespace IN";
-        $query.= "(SELECT oid FROM pg_namespace WHERE nspname NOT LIKE 'pg_%' AND nspname != 'information_schema')";
-        $table_names = $db->queryCol($query);
-        if (PEAR::isError($table_names)) {
-            return $table_names;
-        }
-        $result = array();
-        foreach ($table_names as $table_name) {
-            $result[] = $this->_fixSequenceName($table_name);
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Manager/sqlite.php b/3rdparty/MDB2/Driver/Manager/sqlite.php
deleted file mode 100644
index 1b7239876f1..00000000000
--- a/3rdparty/MDB2/Driver/Manager/sqlite.php
+++ /dev/null
@@ -1,1366 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith, Lorenzo Alberton                       |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Authors: Lukas Smith <smith@pooteeweet.org>                          |
-// |          Lorenzo Alberton <l.alberton@quipo.it>                      |
-// +----------------------------------------------------------------------+
-//
-// $Id: sqlite.php,v 1.76 2008/05/31 11:48:48 quipo Exp $
-//
-
-require_once('MDB2/Driver/Manager/Common.php');
-
-/**
- * MDB2 SQLite driver for the management modules
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- * @author  Lorenzo Alberton <l.alberton@quipo.it>
- */
-class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
-{
-    // {{{ createDatabase()
-
-    /**
-     * create a new database
-     *
-     * @param string $name    name of the database that should be created
-     * @param array  $options array with charset info
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createDatabase($name, $options = array())
-    {
-		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $database_file = $db->_getDatabaseFile($name);
-        if (file_exists($database_file)) {
-            return $db->raiseError(MDB2_ERROR_ALREADY_EXISTS, null, null,
-                'database already exists', __FUNCTION__);
-        }
-        $php_errormsg = '';
-        $database_file="$datadir/$database_file.db";
-        $handle = sqlite_open($database_file, $db->dsn['mode'], $php_errormsg);
-        if (!$handle) {
-            return $db->raiseError(MDB2_ERROR_CANNOT_CREATE, null, null,
-                (isset($php_errormsg) ? $php_errormsg : 'could not create the database file'), __FUNCTION__);
-        }
-        if (!empty($options['charset'])) {
-            $query = 'PRAGMA encoding = ' . $db->quote($options['charset'], 'text');
-            @sqlite_query($query, $handle);
-        }
-        @sqlite_close($handle);
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ dropDatabase()
-
-    /**
-     * drop an existing database
-     *
-     * @param string $name name of the database that should be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropDatabase($name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $database_file = $db->_getDatabaseFile($name);
-        if (!@file_exists($database_file)) {
-            return $db->raiseError(MDB2_ERROR_CANNOT_DROP, null, null,
-                'database does not exist', __FUNCTION__);
-        }
-        $result = @unlink($database_file);
-        if (!$result) {
-            return $db->raiseError(MDB2_ERROR_CANNOT_DROP, null, null,
-                (isset($php_errormsg) ? $php_errormsg : 'could not remove the database file'), __FUNCTION__);
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ _getAdvancedFKOptions()
-
-    /**
-     * Return the FOREIGN KEY query section dealing with non-standard options
-     * as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
-     *
-     * @param array $definition
-     * @return string
-     * @access protected
-     */
-    function _getAdvancedFKOptions($definition)
-    {
-        $query = '';
-        if (!empty($definition['match'])) {
-            $query .= ' MATCH '.$definition['match'];
-        }
-        if (!empty($definition['onupdate']) && (strtoupper($definition['onupdate']) != 'NO ACTION')) {
-            $query .= ' ON UPDATE '.$definition['onupdate'];
-        }
-        if (!empty($definition['ondelete']) && (strtoupper($definition['ondelete']) != 'NO ACTION')) {
-            $query .= ' ON DELETE '.$definition['ondelete'];
-        }
-        if (!empty($definition['deferrable'])) {
-            $query .= ' DEFERRABLE';
-        } else {
-            $query .= ' NOT DEFERRABLE';
-        }
-        if (!empty($definition['initiallydeferred'])) {
-            $query .= ' INITIALLY DEFERRED';
-        } else {
-            $query .= ' INITIALLY IMMEDIATE';
-        }
-        return $query;
-    }
-
-    // }}}
-    // {{{ _getCreateTableQuery()
-
-    /**
-     * Create a basic SQL query for a new table creation
-     * @param string $name   Name of the database that should be created
-     * @param array $fields  Associative array that contains the definition of each field of the new table
-     * @param array $options  An associative array of table options
-     * @return mixed string (the SQL query) on success, a MDB2 error on failure
-     * @see createTable()
-     */
-    function _getCreateTableQuery($name, $fields, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if (!$name) {
-            return $db->raiseError(MDB2_ERROR_CANNOT_CREATE, null, null,
-                'no valid table name specified', __FUNCTION__);
-        }
-        if (empty($fields)) {
-            return $db->raiseError(MDB2_ERROR_CANNOT_CREATE, null, null,
-                'no fields specified for table "'.$name.'"', __FUNCTION__);
-        }
-        $query_fields = $this->getFieldDeclarationList($fields);
-        if (PEAR::isError($query_fields)) {
-            return $query_fields;
-        }
-        if (!empty($options['primary'])) {
-            $query_fields.= ', PRIMARY KEY ('.implode(', ', array_keys($options['primary'])).')';
-        }
-        if (!empty($options['foreign_keys'])) {
-            foreach ($options['foreign_keys'] as $fkname => $fkdef) {
-                if (empty($fkdef)) {
-                    continue;
-                }
-                $query_fields.= ', CONSTRAINT '.$fkname.' FOREIGN KEY ('.implode(', ', array_keys($fkdef['fields'])).')';
-                $query_fields.= ' REFERENCES '.$fkdef['references']['table'].' ('.implode(', ', array_keys($fkdef['references']['fields'])).')';
-                $query_fields.= $this->_getAdvancedFKOptions($fkdef);
-            }
-        }
-
-        $name = $db->quoteIdentifier($name, true);
-        $result = 'CREATE ';
-        if (!empty($options['temporary'])) {
-            $result .= $this->_getTemporaryTableQuery();
-        }
-        $result .= " TABLE $name ($query_fields)";
-        return $result;
-    }
-
-    // }}}
-    // {{{ createTable()
-
-    /**
-     * create a new table
-     *
-     * @param string $name    Name of the database that should be created
-     * @param array  $fields  Associative array that contains the definition
-     *                        of each field of the new table
-     * @param array  $options An associative array of table options
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createTable($name, $fields, $options = array())
-    {
-        $result = parent::createTable($name, $fields, $options);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        // create triggers to enforce FOREIGN KEY constraints
-        if (!empty($options['foreign_keys'])) {
-            $db =$this->getDBInstance();
-            if (PEAR::isError($db)) {
-                return $db;
-            }
-            foreach ($options['foreign_keys'] as $fkname => $fkdef) {
-                if (empty($fkdef)) {
-                    continue;
-                }
-                //set actions to default if not set
-                $fkdef['onupdate'] = empty($fkdef['onupdate']) ? $db->options['default_fk_action_onupdate'] : strtoupper($fkdef['onupdate']);
-                $fkdef['ondelete'] = empty($fkdef['ondelete']) ? $db->options['default_fk_action_ondelete'] : strtoupper($fkdef['ondelete']);
-
-                $trigger_names = array(
-                    'insert'    => $fkname.'_insert_trg',
-                    'update'    => $fkname.'_update_trg',
-                    'pk_update' => $fkname.'_pk_update_trg',
-                    'pk_delete' => $fkname.'_pk_delete_trg',
-                );
-                
-                //create the [insert|update] triggers on the FK table
-                $table_fields = array_keys($fkdef['fields']);
-                $referenced_fields = array_keys($fkdef['references']['fields']);
-                $query = 'CREATE TRIGGER %s BEFORE %s ON '.$name
-                        .' FOR EACH ROW BEGIN'
-                        .' SELECT RAISE(ROLLBACK, \'%s on table "'.$name.'" violates FOREIGN KEY constraint "'.$fkname.'"\')'
-                        .' WHERE  (SELECT ';
-                $aliased_fields = array();
-                foreach ($referenced_fields as $field) {
-                    $aliased_fields[] = $fkdef['references']['table'] .'.'.$field .' AS '.$field;
-                }
-                $query .= implode(',', $aliased_fields)
-                       .' FROM '.$fkdef['references']['table']
-                       .' WHERE ';
-                $conditions = array();
-                for ($i=0; $i<count($table_fields); $i++) {
-                    $conditions[] = $referenced_fields[$i] .' = NEW.'.$table_fields[$i];
-                }
-                $query .= implode(' AND ', $conditions).') IS NULL; END;';
-                $result = $db->exec(sprintf($query, $trigger_names['insert'], 'INSERT', 'insert'));
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-
-                $result = $db->exec(sprintf($query, $trigger_names['update'], 'UPDATE', 'update'));
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                
-                //create the ON [UPDATE|DELETE] triggers on the primary table
-                $restrict_action = 'SELECT RAISE(ROLLBACK, \'%s on table "'.$name.'" violates FOREIGN KEY constraint "'.$fkname.'"\')'
-                                  .' WHERE  (SELECT ';
-                $aliased_fields = array();
-                foreach ($table_fields as $field) {
-                    $aliased_fields[] = $name .'.'.$field .' AS '.$field;
-                }
-                $restrict_action .= implode(',', $aliased_fields)
-                       .' FROM '.$name
-                       .' WHERE ';
-                $conditions  = array();
-                $new_values  = array();
-                $null_values = array();
-                for ($i=0; $i<count($table_fields); $i++) {
-                    $conditions[]  = $table_fields[$i] .' = OLD.'.$referenced_fields[$i];
-                    $new_values[]  = $table_fields[$i] .' = NEW.'.$referenced_fields[$i];
-                    $null_values[] = $table_fields[$i] .' = NULL';
-                }
-                $conditions2 = array();
-                for ($i=0; $i<count($referenced_fields); $i++) {
-                    $conditions2[]  = 'NEW.'.$referenced_fields[$i] .' <> OLD.'.$referenced_fields[$i];
-                }
-                $restrict_action .= implode(' AND ', $conditions).') IS NOT NULL'
-                                 .' AND (' .implode(' OR ', $conditions2) .')';
-
-                $cascade_action_update = 'UPDATE '.$name.' SET '.implode(', ', $new_values) .' WHERE '.implode(' AND ', $conditions);
-                $cascade_action_delete = 'DELETE FROM '.$name.' WHERE '.implode(' AND ', $conditions);
-                $setnull_action        = 'UPDATE '.$name.' SET '.implode(', ', $null_values).' WHERE '.implode(' AND ', $conditions);
-
-                if ('SET DEFAULT' == $fkdef['onupdate'] || 'SET DEFAULT' == $fkdef['ondelete']) {
-                    $db->loadModule('Reverse', null, true);
-                    $default_values = array();
-                    foreach ($table_fields as $table_field) {
-                        $field_definition = $db->reverse->getTableFieldDefinition($name, $field);
-                        if (PEAR::isError($field_definition)) {
-                            return $field_definition;
-                        }
-                        $default_values[] = $table_field .' = '. $field_definition[0]['default'];
-                    }
-                    $setdefault_action = 'UPDATE '.$name.' SET '.implode(', ', $default_values).' WHERE '.implode(' AND ', $conditions);
-                }
-
-                $query = 'CREATE TRIGGER %s'
-                        .' %s ON '.$fkdef['references']['table']
-                        .' FOR EACH ROW BEGIN ';
-
-                if ('CASCADE' == $fkdef['onupdate']) {
-                    $sql_update = sprintf($query, $trigger_names['pk_update'], 'AFTER UPDATE',  'update') . $cascade_action_update. '; END;';
-                } elseif ('SET NULL' == $fkdef['onupdate']) {
-                    $sql_update = sprintf($query, $trigger_names['pk_update'], 'BEFORE UPDATE', 'update') . $setnull_action. '; END;';
-                } elseif ('SET DEFAULT' == $fkdef['onupdate']) {
-                    $sql_update = sprintf($query, $trigger_names['pk_update'], 'BEFORE UPDATE', 'update') . $setdefault_action. '; END;';
-                } elseif ('NO ACTION' == $fkdef['onupdate']) {
-                    $sql_update = sprintf($query.$restrict_action, $trigger_names['pk_update'], 'AFTER UPDATE', 'update') . '; END;';
-                } elseif ('RESTRICT' == $fkdef['onupdate']) {
-                    $sql_update = sprintf($query.$restrict_action, $trigger_names['pk_update'], 'BEFORE UPDATE', 'update') . '; END;';
-                }
-                if ('CASCADE' == $fkdef['ondelete']) {
-                    $sql_delete = sprintf($query, $trigger_names['pk_delete'], 'AFTER DELETE',  'delete') . $cascade_action_delete. '; END;';
-                } elseif ('SET NULL' == $fkdef['ondelete']) {
-                    $sql_delete = sprintf($query, $trigger_names['pk_delete'], 'BEFORE DELETE', 'delete') . $setnull_action. '; END;';
-                } elseif ('SET DEFAULT' == $fkdef['ondelete']) {
-                    $sql_delete = sprintf($query, $trigger_names['pk_delete'], 'BEFORE DELETE', 'delete') . $setdefault_action. '; END;';
-                } elseif ('NO ACTION' == $fkdef['ondelete']) {
-                    $sql_delete = sprintf($query.$restrict_action, $trigger_names['pk_delete'], 'AFTER DELETE', 'delete')  . '; END;';
-                } elseif ('RESTRICT' == $fkdef['ondelete']) {
-                    $sql_delete = sprintf($query.$restrict_action, $trigger_names['pk_delete'], 'BEFORE DELETE', 'delete') . '; END;';
-                }
-
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $result = $db->exec($sql_delete);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $result = $db->exec($sql_update);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
-        }
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ dropTable()
-
-    /**
-     * drop an existing table
-     *
-     * @param string $name name of the table that should be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropTable($name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        
-        //delete the triggers associated to existing FK constraints
-        $constraints = $this->listTableConstraints($name);
-        if (!PEAR::isError($constraints) && !empty($constraints)) {
-            $db->loadModule('Reverse', null, true);
-            foreach ($constraints as $constraint) {
-                $definition = $db->reverse->getTableConstraintDefinition($name, $constraint);
-                if (!PEAR::isError($definition) && !empty($definition['foreign'])) {
-                    $result = $this->_dropFKTriggers($name, $constraint, $definition['references']['table']);
-                    if (PEAR::isError($result)) {
-                        return $result;
-                    }
-                }
-            }
-        }
-
-        $name = $db->quoteIdentifier($name, true);
-        return $db->exec("DROP TABLE $name");
-    }
-
-    // }}}
-    // {{{ vacuum()
-
-    /**
-     * Optimize (vacuum) all the tables in the db (or only the specified table)
-     * and optionally run ANALYZE.
-     *
-     * @param string $table table name (all the tables if empty)
-     * @param array  $options an array with driver-specific options:
-     *               - timeout [int] (in seconds) [mssql-only]
-     *               - analyze [boolean] [pgsql and mysql]
-     *               - full [boolean] [pgsql-only]
-     *               - freeze [boolean] [pgsql-only]
-     *
-     * @return mixed MDB2_OK success, a MDB2 error on failure
-     * @access public
-     */
-    function vacuum($table = null, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = 'VACUUM';
-        if (!empty($table)) {
-            $query .= ' '.$db->quoteIdentifier($table, true);
-        }
-        return $db->exec($query);
-    }
-
-    // }}}
-    // {{{ alterTable()
-
-    /**
-     * alter an existing table
-     *
-     * @param string $name         name of the table that is intended to be changed.
-     * @param array $changes     associative array that contains the details of each type
-     *                             of change that is intended to be performed. The types of
-     *                             changes that are currently supported are defined as follows:
-     *
-     *                             name
-     *
-     *                                New name for the table.
-     *
-     *                            add
-     *
-     *                                Associative array with the names of fields to be added as
-     *                                 indexes of the array. The value of each entry of the array
-     *                                 should be set to another associative array with the properties
-     *                                 of the fields to be added. The properties of the fields should
-     *                                 be the same as defined by the MDB2 parser.
-     *
-     *
-     *                            remove
-     *
-     *                                Associative array with the names of fields to be removed as indexes
-     *                                 of the array. Currently the values assigned to each entry are ignored.
-     *                                 An empty array should be used for future compatibility.
-     *
-     *                            rename
-     *
-     *                                Associative array with the names of fields to be renamed as indexes
-     *                                 of the array. The value of each entry of the array should be set to
-     *                                 another associative array with the entry named name with the new
-     *                                 field name and the entry named Declaration that is expected to contain
-     *                                 the portion of the field declaration already in DBMS specific SQL code
-     *                                 as it is used in the CREATE TABLE statement.
-     *
-     *                            change
-     *
-     *                                Associative array with the names of the fields to be changed as indexes
-     *                                 of the array. Keep in mind that if it is intended to change either the
-     *                                 name of a field and any other properties, the change array entries
-     *                                 should have the new names of the fields as array indexes.
-     *
-     *                                The value of each entry of the array should be set to another associative
-     *                                 array with the properties of the fields to that are meant to be changed as
-     *                                 array entries. These entries should be assigned to the new values of the
-     *                                 respective properties. The properties of the fields should be the same
-     *                                 as defined by the MDB2 parser.
-     *
-     *                            Example
-     *                                array(
-     *                                    'name' => 'userlist',
-     *                                    'add' => array(
-     *                                        'quota' => array(
-     *                                            'type' => 'integer',
-     *                                            'unsigned' => 1
-     *                                        )
-     *                                    ),
-     *                                    'remove' => array(
-     *                                        'file_limit' => array(),
-     *                                        'time_limit' => array()
-     *                                    ),
-     *                                    'change' => array(
-     *                                        'name' => array(
-     *                                            'length' => '20',
-     *                                            'definition' => array(
-     *                                                'type' => 'text',
-     *                                                'length' => 20,
-     *                                            ),
-     *                                        )
-     *                                    ),
-     *                                    'rename' => array(
-     *                                        'sex' => array(
-     *                                            'name' => 'gender',
-     *                                            'definition' => array(
-     *                                                'type' => 'text',
-     *                                                'length' => 1,
-     *                                                'default' => 'M',
-     *                                            ),
-     *                                        )
-     *                                    )
-     *                                )
-     *
-     * @param boolean $check     indicates whether the function should just check if the DBMS driver
-     *                             can perform the requested table alterations if the value is true or
-     *                             actually perform them otherwise.
-     * @access public
-     *
-      * @return mixed MDB2_OK on success, a MDB2 error on failure
-     */
-    function alterTable($name, $changes, $check, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        foreach ($changes as $change_name => $change) {
-            switch ($change_name) {
-            case 'add':
-            case 'remove':
-            case 'change':
-            case 'name':
-            case 'rename':
-                break;
-            default:
-                return $db->raiseError(MDB2_ERROR_CANNOT_ALTER, null, null,
-                    'change type "'.$change_name.'" not yet supported', __FUNCTION__);
-            }
-        }
-
-        if ($check) {
-            return MDB2_OK;
-        }
-
-        $db->loadModule('Reverse', null, true);
-
-        // actually sqlite 2.x supports no ALTER TABLE at all .. so we emulate it
-        $fields = $db->manager->listTableFields($name);
-        if (PEAR::isError($fields)) {
-            return $fields;
-        }
-
-        $fields = array_flip($fields);
-        foreach ($fields as $field => $value) {
-            $definition = $db->reverse->getTableFieldDefinition($name, $field);
-            if (PEAR::isError($definition)) {
-                return $definition;
-            }
-            $fields[$field] = $definition[0];
-        }
-
-        $indexes = $db->manager->listTableIndexes($name);
-        if (PEAR::isError($indexes)) {
-            return $indexes;
-        }
-
-        $indexes = array_flip($indexes);
-        foreach ($indexes as $index => $value) {
-            $definition = $db->reverse->getTableIndexDefinition($name, $index);
-            if (PEAR::isError($definition)) {
-                return $definition;
-            }
-            $indexes[$index] = $definition;
-        }
-
-        $constraints = $db->manager->listTableConstraints($name);
-        if (PEAR::isError($constraints)) {
-            return $constraints;
-        }
-
-        if (!array_key_exists('foreign_keys', $options)) {
-            $options['foreign_keys'] = array();
-        }
-        $constraints = array_flip($constraints);
-        foreach ($constraints as $constraint => $value) {
-			if (!empty($definition['primary'])) {
-                if (!array_key_exists('primary', $options)) {
-                    $options['primary'] = $definition['fields'];
-                    //remove from the $constraint array, it's already handled by createTable()
-                    unset($constraints[$constraint]);
-                }
-            } else {
-                $c_definition = $db->reverse->getTableConstraintDefinition($name, $constraint);
-                if (PEAR::isError($c_definition)) {
-                    return $c_definition;
-                }
-                if (!empty($c_definition['foreign'])) {
-                    if (!array_key_exists($constraint, $options['foreign_keys'])) {
-                        $options['foreign_keys'][$constraint] = $c_definition;
-                    }
-                    //remove from the $constraint array, it's already handled by createTable()
-                    unset($constraints[$constraint]);
-                } else {
-                    $constraints[$constraint] = $c_definition;
-                }
-            }
-        }
-
-        $name_new = $name;
-        $create_order = $select_fields = array_keys($fields);
-        foreach ($changes as $change_name => $change) {
-            switch ($change_name) {
-            case 'add':
-                foreach ($change as $field_name => $field) {
-                    $fields[$field_name] = $field;
-                    $create_order[] = $field_name;
-                }
-                break;
-            case 'remove':
-                foreach ($change as $field_name => $field) {
-                    unset($fields[$field_name]);
-                    $select_fields = array_diff($select_fields, array($field_name));
-                    $create_order = array_diff($create_order, array($field_name));
-                }
-                break;
-            case 'change':
-                foreach ($change as $field_name => $field) {
-                    $fields[$field_name] = $field['definition'];
-                }
-                break;
-            case 'name':
-                $name_new = $change;
-                break;
-            case 'rename':
-                foreach ($change as $field_name => $field) {
-                    unset($fields[$field_name]);
-                    $fields[$field['name']] = $field['definition'];
-                    $create_order[array_search($field_name, $create_order)] = $field['name'];
-                }
-                break;
-            default:
-                return $db->raiseError(MDB2_ERROR_CANNOT_ALTER, null, null,
-                    'change type "'.$change_name.'" not yet supported', __FUNCTION__);
-            }
-        }
-
-        $data = null;
-        if (!empty($select_fields)) {
-            $query = 'SELECT '.implode(', ', $select_fields).' FROM '.$db->quoteIdentifier($name, true);
-            $data = $db->queryAll($query, null, MDB2_FETCHMODE_ORDERED);
-        }
-
-        $result = $this->dropTable($name);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        $result = $this->createTable($name_new, $fields, $options);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        foreach ($indexes as $index => $definition) {
-            $this->createIndex($name_new, $index, $definition);
-        }
-
-        foreach ($constraints as $constraint => $definition) {
-			if(empty($definition['primary']) and empty($definition['foreign'])){
-				$this->createConstraint($name_new, $constraint, $definition);
-			}
-        }
-
-        if (!empty($select_fields) && !empty($data)) {
-            $query = 'INSERT INTO '.$db->quoteIdentifier($name_new, true);
-            $query.= '('.implode(', ', array_slice(array_keys($fields), 0, count($select_fields))).')';
-            $query.=' VALUES (?'.str_repeat(', ?', (count($select_fields) - 1)).')';
-            $stmt =$db->prepare($query, null, MDB2_PREPARE_MANIP);
-            if (PEAR::isError($stmt)) {
-                return $stmt;
-            }
-            foreach ($data as $row) {
-                $result = $stmt->execute($row);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ listDatabases()
-
-    /**
-     * list all databases
-     *
-     * @return mixed array of database names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listDatabases()
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'list databases is not supported', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ listUsers()
-
-    /**
-     * list all users
-     *
-     * @return mixed array of user names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listUsers()
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'list databases is not supported', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ listViews()
-
-    /**
-     * list all views in the current database
-     *
-     * @return mixed array of view names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listViews($dummy=null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SELECT name FROM sqlite_master WHERE type='view' AND sql NOT NULL";
-        $result = $db->queryCol($query);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ listTableViews()
-
-    /**
-     * list the views in the database that reference a given table
-     *
-     * @param string table for which all referenced views should be found
-     * @return mixed array of view names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableViews($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SELECT name, sql FROM sqlite_master WHERE type='view' AND sql NOT NULL";
-        $views = $db->queryAll($query, array('text', 'text'), MDB2_FETCHMODE_ASSOC);
-        if (PEAR::isError($views)) {
-            return $views;
-        }
-        $result = array();
-        foreach ($views as $row) {
-            if (preg_match("/^create view .* \bfrom\b\s+\b{$table}\b /i", $row['sql'])) {
-                if (!empty($row['name'])) {
-                    $result[$row['name']] = true;
-                }
-            }
-        }
-
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_change_key_case($result, $db->options['field_case']);
-        }
-        return array_keys($result);
-    }
-
-    // }}}
-    // {{{ listTables()
-
-    /**
-     * list all tables in the current database
-     *
-     * @return mixed array of table names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTables($dummy=null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SELECT name FROM sqlite_master WHERE type='table' AND sql NOT NULL ORDER BY name";
-        $table_names = $db->queryCol($query);
-        if (PEAR::isError($table_names)) {
-            return $table_names;
-        }
-        $result = array();
-        foreach ($table_names as $table_name) {
-            if (!$this->_fixSequenceName($table_name, true)) {
-                $result[] = $table_name;
-            }
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ listTableFields()
-
-    /**
-     * list all fields in a table in the current database
-     *
-     * @param string $table name of table that should be used in method
-     * @return mixed array of field names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableFields($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $result = $db->loadModule('Reverse', null, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $query = "SELECT sql FROM sqlite_master WHERE type='table' AND ";
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $query.= 'LOWER(name)='.$db->quote(strtolower($table), 'text');
-        } else {
-            $query.= 'name='.$db->quote($table, 'text');
-        }
-        $sql = $db->queryOne($query);
-        if (PEAR::isError($sql)) {
-            return $sql;
-        }
-        $columns = $db->reverse->_getTableColumns($sql);
-        $fields = array();
-        foreach ($columns as $column) {
-            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                if ($db->options['field_case'] == CASE_LOWER) {
-                    $column['name'] = strtolower($column['name']);
-                } else {
-                    $column['name'] = strtoupper($column['name']);
-                }
-            } else {
-                $column = array_change_key_case($column, $db->options['field_case']);
-            }
-            $fields[] = $column['name'];
-        }
-        return $fields;
-    }
-
-    // }}}
-    // {{{ listTableTriggers()
-
-    /**
-     * list all triggers in the database that reference a given table
-     *
-     * @param string table for which all referenced triggers should be found
-     * @return mixed array of trigger names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableTriggers($table = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SELECT name FROM sqlite_master WHERE type='trigger' AND sql NOT NULL";
-        if (!is_null($table)) {
-            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                $query.= ' AND LOWER(tbl_name)='.$db->quote(strtolower($table), 'text');
-            } else {
-                $query.= ' AND tbl_name='.$db->quote($table, 'text');
-            }
-        }
-        $result = $db->queryCol($query);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ createIndex()
-
-    /**
-     * Get the stucture of a field into an array
-     *
-     * @param string    $table         name of the table on which the index is to be created
-     * @param string    $name         name of the index to be created
-     * @param array     $definition        associative array that defines properties of the index to be created.
-     *                                 Currently, only one property named FIELDS is supported. This property
-     *                                 is also an associative with the names of the index fields as array
-     *                                 indexes. Each entry of this array is set to another type of associative
-     *                                 array that specifies properties of the index that are specific to
-     *                                 each field.
-     *
-     *                                Currently, only the sorting property is supported. It should be used
-     *                                 to define the sorting direction of the index. It may be set to either
-     *                                 ascending or descending.
-     *
-     *                                Not all DBMS support index sorting direction configuration. The DBMS
-     *                                 drivers of those that do not support it ignore this property. Use the
-     *                                 function support() to determine whether the DBMS driver can manage indexes.
-
-     *                                 Example
-     *                                    array(
-     *                                        'fields' => array(
-     *                                            'user_name' => array(
-     *                                                'sorting' => 'ascending'
-     *                                            ),
-     *                                            'last_login' => array()
-     *                                        )
-     *                                    )
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createIndex($table, $name, $definition)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $table = $db->quoteIdentifier($table, true);
-        $name  = $db->getIndexName($name);
-        $query = "CREATE INDEX $name ON $table";
-        $fields = array();
-        foreach ($definition['fields'] as $field_name => $field) {
-            $field_string = $field_name;
-            if (!empty($field['sorting'])) {
-                switch ($field['sorting']) {
-                case 'ascending':
-                    $field_string.= ' ASC';
-                    break;
-                case 'descending':
-                    $field_string.= ' DESC';
-                    break;
-                }
-            }
-            $fields[] = $field_string;
-        }
-        $query .= ' ('.implode(', ', $fields) . ')';
-        return $db->exec($query);
-    }
-
-    // }}}
-    // {{{ dropIndex()
-
-    /**
-     * drop existing index
-     *
-     * @param string    $table         name of table that should be used in method
-     * @param string    $name         name of the index to be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropIndex($table, $name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $name = $db->getIndexName($name);
-        return $db->exec("DROP INDEX $name");
-    }
-
-    // }}}
-    // {{{ listTableIndexes()
-
-    /**
-     * list all indexes in a table
-     *
-     * @param string $table name of table that should be used in method
-     * @return mixed array of index names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableIndexes($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $table = $db->quote($table, 'text');
-        $query = "SELECT sql FROM sqlite_master WHERE type='index' AND ";
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $query.= 'LOWER(tbl_name)='.strtolower($table);
-        } else {
-            $query.= "tbl_name=$table";
-        }
-        $query.= " AND sql NOT NULL ORDER BY name";
-        $indexes = $db->queryCol($query, 'text');
-        if (PEAR::isError($indexes)) {
-            return $indexes;
-        }
-
-        $result = array();
-        foreach ($indexes as $sql) {
-            if (preg_match("/^create index ([^ ]+) on /i", $sql, $tmp)) {
-                $index = $this->_fixIndexName($tmp[1]);
-                if (!empty($index)) {
-                    $result[$index] = true;
-                }
-            }
-        }
-
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_change_key_case($result, $db->options['field_case']);
-        }
-        return array_keys($result);
-    }
-
-    // }}}
-    // {{{ createConstraint()
-
-    /**
-     * create a constraint on a table
-     *
-     * @param string $table      name of the table on which the constraint is to be created
-     * @param string $name       name of the constraint to be created
-     * @param array  $definition associative array that defines properties of the constraint to be created.
-     *                           Currently, only one property named FIELDS is supported. This property
-     *                           is also an associative with the names of the constraint fields as array
-     *                           constraints. Each entry of this array is set to another type of associative
-     *                           array that specifies properties of the constraint that are specific to
-     *                           each field.
-     *
-     *                           Example
-     *                              array(
-     *                                  'fields' => array(
-     *                                      'user_name' => array(),
-     *                                      'last_login' => array()
-     *                                  )
-     *                              )
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createConstraint($table, $name, $definition)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if (!empty($definition['primary'])) {
-            return $db->manager->alterTable($table, array(), false, array('primary' => $definition['fields']));
-        }
-        
-        if (!empty($definition['foreign'])) {
-            return $db->manager->alterTable($table, array(), false, array('foreign_keys' => array($name => $definition)));
-        }
-
-        $table = $db->quoteIdentifier($table, true);
-        $name  = $db->getIndexName($name);
-        $query = "CREATE UNIQUE INDEX $name ON $table";
-        $fields = array();
-        foreach ($definition['fields'] as $field_name => $field) {
-            $field_string = $field_name;
-            if (!empty($field['sorting'])) {
-                switch ($field['sorting']) {
-                case 'ascending':
-                    $field_string.= ' ASC';
-                    break;
-                case 'descending':
-                    $field_string.= ' DESC';
-                    break;
-                }
-            }
-            $fields[] = $field_string;
-        }
-        $query .= ' ('.implode(', ', $fields) . ')';
-        return $db->exec($query);
-    }
-
-    // }}}
-    // {{{ dropConstraint()
-
-    /**
-     * drop existing constraint
-     *
-     * @param string    $table        name of table that should be used in method
-     * @param string    $name         name of the constraint to be dropped
-     * @param string    $primary      hint if the constraint is primary
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropConstraint($table, $name, $primary = false)
-    {
-        if ($primary || $name == 'PRIMARY') {
-            return $this->alterTable($table, array(), false, array('primary' => null));
-        }
-
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        //is it a FK constraint? If so, also delete the associated triggers
-        $db->loadModule('Reverse', null, true);
-        $definition = $db->reverse->getTableConstraintDefinition($table, $name);
-        if (!PEAR::isError($definition) && !empty($definition['foreign'])) {
-            //first drop the FK enforcing triggers
-            $result = $this->_dropFKTriggers($table, $name, $definition['references']['table']);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-            //then drop the constraint itself
-            return $this->alterTable($table, array(), false, array('foreign_keys' => array($name => null)));
-        }
-
-        $name = $db->getIndexName($name);
-        return $db->exec("DROP INDEX $name");
-    }
-
-    // }}}
-    // {{{ _dropFKTriggers()
-    
-    /**
-     * Drop the triggers created to enforce the FOREIGN KEY constraint on the table
-     *
-     * @param string $table  table name
-     * @param string $fkname FOREIGN KEY constraint name
-     * @param string $referenced_table  referenced table name
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access private
-     */
-    function _dropFKTriggers($table, $fkname, $referenced_table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $triggers  = $this->listTableTriggers($table);
-        $triggers2 = $this->listTableTriggers($referenced_table);
-        if (!PEAR::isError($triggers2) && !PEAR::isError($triggers)) {
-            $triggers = array_merge($triggers, $triggers2);
-            $pattern = '/^'.$fkname.'(_pk)?_(insert|update|delete)_trg$/i';
-            foreach ($triggers as $trigger) {
-                if (preg_match($pattern, $trigger)) {
-                    $result = $db->exec('DROP TRIGGER '.$trigger);
-                    if (PEAR::isError($result)) {
-                        return $result;
-                    }
-                }
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ listTableConstraints()
-
-    /**
-     * list all constraints in a table
-     *
-     * @param string $table name of table that should be used in method
-     * @return mixed array of constraint names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableConstraints($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $table = $db->quote($table, 'text');
-        $query = "SELECT sql FROM sqlite_master WHERE type='index' AND ";
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $query.= 'LOWER(tbl_name)='.strtolower($table);
-        } else {
-            $query.= "tbl_name=$table";
-        }
-        $query.= " AND sql NOT NULL ORDER BY name";
-        $indexes = $db->queryCol($query, 'text');
-        if (PEAR::isError($indexes)) {
-            return $indexes;
-        }
-
-        $result = array();
-        foreach ($indexes as $sql) {
-            if (preg_match("/^create unique index ([^ ]+) on /i", $sql, $tmp)) {
-                $index = $this->_fixIndexName($tmp[1]);
-                if (!empty($index)) {
-                    $result[$index] = true;
-                }
-            }
-        }
-        
-        // also search in table definition for PRIMARY KEYs...
-        $query = "SELECT sql FROM sqlite_master WHERE type='table' AND ";
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $query.= 'LOWER(name)='.strtolower($table);
-        } else {
-            $query.= "name=$table";
-        }
-        $query.= " AND sql NOT NULL ORDER BY name";
-        $table_def = $db->queryOne($query, 'text');
-        if (PEAR::isError($table_def)) {
-            return $table_def;
-        }
-        if (preg_match("/\bPRIMARY\s+KEY\b/i", $table_def, $tmp)) {
-            $result['primary'] = true;
-        }
-
-        // ...and for FOREIGN KEYs
-        if (preg_match_all("/\bCONSTRAINT\b\s+([^\s]+)\s+\bFOREIGN\s+KEY/imsx", $table_def, $tmp)) {
-            foreach ($tmp[1] as $fk) {
-                $result[$fk] = true;
-            }
-        }
-
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_change_key_case($result, $db->options['field_case']);
-        }
-        return array_keys($result);
-    }
-
-    // }}}
-    // {{{ createSequence()
-
-    /**
-     * create sequence
-     *
-     * @param string    $seq_name     name of the sequence to be created
-     * @param string    $start         start value of the sequence; default is 1
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createSequence($seq_name, $start = 1)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        $seqcol_name = $db->quoteIdentifier($db->options['seqcol_name'], true);
-        $query = "CREATE TABLE $sequence_name ($seqcol_name INTEGER PRIMARY KEY DEFAULT 0 NOT NULL)";
-        $res = $db->exec($query);
-        if (PEAR::isError($res)) {
-            return $res;
-        }
-        if ($start == 1) {
-            return MDB2_OK;
-        }
-        $res = $db->exec("INSERT INTO $sequence_name ($seqcol_name) VALUES (".($start-1).')');
-        if (!PEAR::isError($res)) {
-            return MDB2_OK;
-        }
-        // Handle error
-        $result = $db->exec("DROP TABLE $sequence_name");
-        if (PEAR::isError($result)) {
-            return $db->raiseError($result, null, null,
-                'could not drop inconsistent sequence table', __FUNCTION__);
-        }
-        return $db->raiseError($res, null, null,
-            'could not create sequence table', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * drop existing sequence
-     *
-     * @param string    $seq_name     name of the sequence to be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropSequence($seq_name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        return $db->exec("DROP TABLE $sequence_name");
-    }
-
-    // }}}
-    // {{{ listSequences()
-
-    /**
-     * list all sequences in the current database
-     *
-     * @return mixed array of sequence names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listSequences($dummy=null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SELECT name FROM sqlite_master WHERE type='table' AND sql NOT NULL ORDER BY name";
-        $table_names = $db->queryCol($query);
-        if (PEAR::isError($table_names)) {
-            return $table_names;
-        }
-        $result = array();
-        foreach ($table_names as $table_name) {
-            if ($sqn = $this->_fixSequenceName($table_name, true)) {
-                $result[] = $sqn;
-            }
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-}
-?>
diff --git a/3rdparty/MDB2/Driver/Native/Common.php b/3rdparty/MDB2/Driver/Native/Common.php
deleted file mode 100644
index c01caa35b71..00000000000
--- a/3rdparty/MDB2/Driver/Native/Common.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: Common.php,v 1.2 2007/09/09 13:47:36 quipo Exp $
-//
-
-/**
- * Base class for the natuve modules that is extended by each MDB2 driver
- *
- * To load this module in the MDB2 object:
- * $mdb->loadModule('Native');
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Native_Common extends MDB2_Module_Common
-{
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Native/mysql.php b/3rdparty/MDB2/Driver/Native/mysql.php
deleted file mode 100644
index 90ff068e6ff..00000000000
--- a/3rdparty/MDB2/Driver/Native/mysql.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: mysql.php,v 1.9 2006/06/18 21:59:05 lsmith Exp $
-//
-
-require_once 'MDB2/Driver/Native/Common.php';
-
-/**
- * MDB2 MySQL driver for the native module
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Native_mysql extends MDB2_Driver_Native_Common
-{
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Native/pgsql.php b/3rdparty/MDB2/Driver/Native/pgsql.php
deleted file mode 100644
index acab8389c89..00000000000
--- a/3rdparty/MDB2/Driver/Native/pgsql.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Paul Cooper <pgc@ucecom.com>                                 |
-// +----------------------------------------------------------------------+
-//
-// $Id: pgsql.php,v 1.12 2006/07/15 13:07:15 lsmith Exp $
-
-require_once 'MDB2/Driver/Native/Common.php';
-
-/**
- * MDB2 PostGreSQL driver for the native module
- *
- * @package MDB2
- * @category Database
- * @author  Paul Cooper <pgc@ucecom.com>
- */
-class MDB2_Driver_Native_pgsql extends MDB2_Driver_Native_Common
-{
-    // }}}
-    // {{{ deleteOID()
-
-    /**
-     * delete an OID
-     *
-     * @param integer    $OID
-     * @return mixed MDB2_OK on success or MDB2 Error Object on failure
-     * @access public
-     */
-    function deleteOID($OID)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $connection = $db->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-
-        if (!@pg_lo_unlink($connection, $OID)) {
-            return $db->raiseError(null, null, null,
-                'Unable to unlink OID: '.$OID, __FUNCTION__);
-        }
-        return MDB2_OK;
-    }
-
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Native/sqlite.php b/3rdparty/MDB2/Driver/Native/sqlite.php
deleted file mode 100644
index 0213293a50a..00000000000
--- a/3rdparty/MDB2/Driver/Native/sqlite.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: sqlite.php,v 1.9 2006/06/18 21:59:05 lsmith Exp $
-//
-
-require_once 'MDB2/Driver/Native/Common.php';
-
-/**
- * MDB2 SQLite driver for the native module
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Native_sqlite extends MDB2_Driver_Native_Common
-{
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Reverse/Common.php b/3rdparty/MDB2/Driver/Reverse/Common.php
deleted file mode 100644
index c78d84f760a..00000000000
--- a/3rdparty/MDB2/Driver/Reverse/Common.php
+++ /dev/null
@@ -1,517 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: Common.php,v 1.43 2009/01/14 15:01:21 quipo Exp $
-//
-
-/**
- * @package MDB2
- * @category Database
- */
-
-/**
- * These are constants for the tableInfo-function
- * they are bitwised or'ed. so if there are more constants to be defined
- * in the future, adjust MDB2_TABLEINFO_FULL accordingly
- */
-
-define('MDB2_TABLEINFO_ORDER',      1);
-define('MDB2_TABLEINFO_ORDERTABLE', 2);
-define('MDB2_TABLEINFO_FULL',       3);
-
-/**
- * Base class for the schema reverse engineering module that is extended by each MDB2 driver
- *
- * To load this module in the MDB2 object:
- * $mdb->loadModule('Reverse');
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Reverse_Common extends MDB2_Module_Common
-{
-    // {{{ splitTableSchema()
-
-    /**
-     * Split the "[owner|schema].table" notation into an array
-     *
-     * @param string $table [schema and] table name
-     *
-     * @return array array(schema, table)
-     * @access private
-     */
-    function splitTableSchema($table)
-    {
-        $ret = array();
-        if (strpos($table, '.') !== false) {
-            return explode('.', $table);
-        }
-        return array(null, $table);
-    }
-
-    // }}}
-    // {{{ getTableFieldDefinition()
-
-    /**
-     * Get the structure of a field into an array
-     *
-     * @param string    $table     name of table that should be used in method
-     * @param string    $field     name of field that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure.
-     *          The returned array contains an array for each field definition,
-     *          with all or some of these indices, depending on the field data type:
-     *          [notnull] [nativetype] [length] [fixed] [default] [type] [mdb2type]
-     * @access public
-     */
-    function getTableFieldDefinition($table, $field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ getTableIndexDefinition()
-
-    /**
-     * Get the structure of an index into an array
-     *
-     * @param string    $table      name of table that should be used in method
-     * @param string    $index      name of index that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     *          The returned array has this structure:
-     *          </pre>
-     *          array (
-     *              [fields] => array (
-     *                  [field1name] => array() // one entry per each field covered
-     *                  [field2name] => array() // by the index
-     *                  [field3name] => array(
-     *                      [sorting] => ascending
-     *                  )
-     *              )
-     *          );
-     *          </pre>
-     * @access public
-     */
-    function getTableIndexDefinition($table, $index)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ getTableConstraintDefinition()
-
-    /**
-     * Get the structure of an constraints into an array
-     *
-     * @param string    $table      name of table that should be used in method
-     * @param string    $index      name of index that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     *          The returned array has this structure:
-     *          <pre>
-     *          array (
-     *              [primary] => 0
-     *              [unique]  => 0
-     *              [foreign] => 1
-     *              [check]   => 0
-     *              [fields] => array (
-     *                  [field1name] => array() // one entry per each field covered
-     *                  [field2name] => array() // by the index
-     *                  [field3name] => array(
-     *                      [sorting]  => ascending
-     *                      [position] => 3
-     *                  )
-     *              )
-     *              [references] => array(
-     *                  [table] => name
-     *                  [fields] => array(
-     *                      [field1name] => array(  //one entry per each referenced field
-     *                           [position] => 1
-     *                      )
-     *                  )
-     *              )
-     *              [deferrable] => 0
-     *              [initiallydeferred] => 0
-     *              [onupdate] => CASCADE|RESTRICT|SET NULL|SET DEFAULT|NO ACTION
-     *              [ondelete] => CASCADE|RESTRICT|SET NULL|SET DEFAULT|NO ACTION
-     *              [match] => SIMPLE|PARTIAL|FULL
-     *          );
-     *          </pre>
-     * @access public
-     */
-    function getTableConstraintDefinition($table, $index)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ getSequenceDefinition()
-
-    /**
-     * Get the structure of a sequence into an array
-     *
-     * @param string    $sequence   name of sequence that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     *          The returned array has this structure:
-     *          <pre>
-     *          array (
-     *              [start] => n
-     *          );
-     *          </pre>
-     * @access public
-     */
-    function getSequenceDefinition($sequence)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $start = $db->currId($sequence);
-        if (PEAR::isError($start)) {
-            return $start;
-        }
-        if ($db->supports('current_id')) {
-            $start++;
-        } else {
-            $db->warnings[] = 'database does not support getting current
-                sequence value, the sequence value was incremented';
-        }
-        $definition = array();
-        if ($start != 1) {
-            $definition = array('start' => $start);
-        }
-        return $definition;
-    }
-
-    // }}}
-    // {{{ getTriggerDefinition()
-
-    /**
-     * Get the structure of a trigger into an array
-     *
-     * EXPERIMENTAL
-     *
-     * WARNING: this function is experimental and may change the returned value 
-     * at any time until labelled as non-experimental
-     *
-     * @param string    $trigger    name of trigger that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     *          The returned array has this structure:
-     *          <pre>
-     *          array (
-     *              [trigger_name]    => 'trigger name',
-     *              [table_name]      => 'table name',
-     *              [trigger_body]    => 'trigger body definition',
-     *              [trigger_type]    => 'BEFORE' | 'AFTER',
-     *              [trigger_event]   => 'INSERT' | 'UPDATE' | 'DELETE'
-     *                  //or comma separated list of multiple events, when supported
-     *              [trigger_enabled] => true|false
-     *              [trigger_comment] => 'trigger comment',
-     *          );
-     *          </pre>
-     *          The oci8 driver also returns a [when_clause] index.
-     * @access public
-     */
-    function getTriggerDefinition($trigger)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * The format of the resulting array depends on which <var>$mode</var>
-     * you select.  The sample output below is based on this query:
-     * <pre>
-     *    SELECT tblFoo.fldID, tblFoo.fldPhone, tblBar.fldId
-     *    FROM tblFoo
-     *    JOIN tblBar ON tblFoo.fldId = tblBar.fldId
-     * </pre>
-     *
-     * <ul>
-     * <li>
-     *
-     * <kbd>null</kbd> (default)
-     *   <pre>
-     *   [0] => Array (
-     *       [table] => tblFoo
-     *       [name] => fldId
-     *       [type] => int
-     *       [len] => 11
-     *       [flags] => primary_key not_null
-     *   )
-     *   [1] => Array (
-     *       [table] => tblFoo
-     *       [name] => fldPhone
-     *       [type] => string
-     *       [len] => 20
-     *       [flags] =>
-     *   )
-     *   [2] => Array (
-     *       [table] => tblBar
-     *       [name] => fldId
-     *       [type] => int
-     *       [len] => 11
-     *       [flags] => primary_key not_null
-     *   )
-     *   </pre>
-     *
-     * </li><li>
-     *
-     * <kbd>MDB2_TABLEINFO_ORDER</kbd>
-     *
-     *   <p>In addition to the information found in the default output,
-     *   a notation of the number of columns is provided by the
-     *   <samp>num_fields</samp> element while the <samp>order</samp>
-     *   element provides an array with the column names as the keys and
-     *   their location index number (corresponding to the keys in the
-     *   the default output) as the values.</p>
-     *
-     *   <p>If a result set has identical field names, the last one is
-     *   used.</p>
-     *
-     *   <pre>
-     *   [num_fields] => 3
-     *   [order] => Array (
-     *       [fldId] => 2
-     *       [fldTrans] => 1
-     *   )
-     *   </pre>
-     *
-     * </li><li>
-     *
-     * <kbd>MDB2_TABLEINFO_ORDERTABLE</kbd>
-     *
-     *   <p>Similar to <kbd>MDB2_TABLEINFO_ORDER</kbd> but adds more
-     *   dimensions to the array in which the table names are keys and
-     *   the field names are sub-keys.  This is helpful for queries that
-     *   join tables which have identical field names.</p>
-     *
-     *   <pre>
-     *   [num_fields] => 3
-     *   [ordertable] => Array (
-     *       [tblFoo] => Array (
-     *           [fldId] => 0
-     *           [fldPhone] => 1
-     *       )
-     *       [tblBar] => Array (
-     *           [fldId] => 2
-     *       )
-     *   )
-     *   </pre>
-     *
-     * </li>
-     * </ul>
-     *
-     * The <samp>flags</samp> element contains a space separated list
-     * of extra information about the field.  This data is inconsistent
-     * between DBMS's due to the way each DBMS works.
-     *   + <samp>primary_key</samp>
-     *   + <samp>unique_key</samp>
-     *   + <samp>multiple_key</samp>
-     *   + <samp>not_null</samp>
-     *
-     * Most DBMS's only provide the <samp>table</samp> and <samp>flags</samp>
-     * elements if <var>$result</var> is a table name.  The following DBMS's
-     * provide full information from queries:
-     *   + fbsql
-     *   + mysql
-     *
-     * If the 'portability' option has <samp>MDB2_PORTABILITY_FIX_CASE</samp>
-     * turned on, the names of tables and fields will be lower or upper cased.
-     *
-     * @param object|string  $result  MDB2_result object from a query or a
-     *                                string containing the name of a table.
-     *                                While this also accepts a query result
-     *                                resource identifier, this behavior is
-     *                                deprecated.
-     * @param int  $mode   either unused or one of the tableInfo modes:
-     *                     <kbd>MDB2_TABLEINFO_ORDERTABLE</kbd>,
-     *                     <kbd>MDB2_TABLEINFO_ORDER</kbd> or
-     *                     <kbd>MDB2_TABLEINFO_FULL</kbd> (which does both).
-     *                     These are bitwise, so the first two can be
-     *                     combined using <kbd>|</kbd>.
-     *
-     * @return array  an associative array with the information requested.
-     *                 A MDB2_Error object on failure.
-     *
-     * @see MDB2_Driver_Common::setOption()
-     */
-    function tableInfo($result, $mode = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if (!is_string($result)) {
-            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'method not implemented', __FUNCTION__);
-        }
-
-        $db->loadModule('Manager', null, true);
-        $fields = $db->manager->listTableFields($result);
-        if (PEAR::isError($fields)) {
-            return $fields;
-        }
-
-        $flags = array();
-
-        $idxname_format = $db->getOption('idxname_format');
-        $db->setOption('idxname_format', '%s');
-
-        $indexes = $db->manager->listTableIndexes($result);
-        if (PEAR::isError($indexes)) {
-            $db->setOption('idxname_format', $idxname_format);
-            return $indexes;
-        }
-
-        foreach ($indexes as $index) {
-            $definition = $this->getTableIndexDefinition($result, $index);
-            if (PEAR::isError($definition)) {
-                $db->setOption('idxname_format', $idxname_format);
-                return $definition;
-            }
-            if (count($definition['fields']) > 1) {
-                foreach ($definition['fields'] as $field => $sort) {
-                    $flags[$field] = 'multiple_key';
-                }
-            }
-        }
-
-        $constraints = $db->manager->listTableConstraints($result);
-        if (PEAR::isError($constraints)) {
-            return $constraints;
-        }
-
-        foreach ($constraints as $constraint) {
-            $definition = $this->getTableConstraintDefinition($result, $constraint);
-            if (PEAR::isError($definition)) {
-                $db->setOption('idxname_format', $idxname_format);
-                return $definition;
-            }
-            $flag = !empty($definition['primary'])
-                ? 'primary_key' : (!empty($definition['unique'])
-                    ? 'unique_key' : false);
-            if ($flag) {
-                foreach ($definition['fields'] as $field => $sort) {
-                    if (empty($flags[$field]) || $flags[$field] != 'primary_key') {
-                        $flags[$field] = $flag;
-                    }
-                }
-            }
-        }
-
-        $res = array();
-
-        if ($mode) {
-            $res['num_fields'] = count($fields);
-        }
-
-        foreach ($fields as $i => $field) {
-            $definition = $this->getTableFieldDefinition($result, $field);
-            if (PEAR::isError($definition)) {
-                $db->setOption('idxname_format', $idxname_format);
-                return $definition;
-            }
-            $res[$i] = $definition[0];
-            $res[$i]['name'] = $field;
-            $res[$i]['table'] = $result;
-            $res[$i]['type'] = preg_replace('/^([a-z]+).*$/i', '\\1', trim($definition[0]['nativetype']));
-            // 'primary_key', 'unique_key', 'multiple_key'
-            $res[$i]['flags'] = empty($flags[$field]) ? '' : $flags[$field];
-            // not_null', 'unsigned', 'auto_increment', 'default_[rawencodedvalue]'
-            if (!empty($res[$i]['notnull'])) {
-                $res[$i]['flags'].= ' not_null';
-            }
-            if (!empty($res[$i]['unsigned'])) {
-                $res[$i]['flags'].= ' unsigned';
-            }
-            if (!empty($res[$i]['auto_increment'])) {
-                $res[$i]['flags'].= ' autoincrement';
-            }
-            if (!empty($res[$i]['default'])) {
-                $res[$i]['flags'].= ' default_'.rawurlencode($res[$i]['default']);
-            }
-
-            if ($mode & MDB2_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & MDB2_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        $db->setOption('idxname_format', $idxname_format);
-        return $res;
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Reverse/mysql.php b/3rdparty/MDB2/Driver/Reverse/mysql.php
deleted file mode 100644
index 6e366c22a5e..00000000000
--- a/3rdparty/MDB2/Driver/Reverse/mysql.php
+++ /dev/null
@@ -1,536 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: mysql.php,v 1.80 2008/03/26 21:15:37 quipo Exp $
-//
-
-require_once('MDB2/Driver/Reverse/Common.php');
-
-/**
- * MDB2 MySQL driver for the schema reverse engineering module
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- * @author  Lorenzo Alberton <l.alberton@quipo.it>
- */
-class MDB2_Driver_Reverse_mysql extends MDB2_Driver_Reverse_Common
-{
-    // {{{ getTableFieldDefinition()
-
-    /**
-     * Get the structure of a field into an array
-     *
-     * @param string $table_name name of table that should be used in method
-     * @param string $field_name name of field that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function getTableFieldDefinition($table_name, $field_name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $result = $db->loadModule('Datatype', null, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        list($schema, $table) = $this->splitTableSchema($table_name);
-
-        $table = $db->quoteIdentifier($table, true);
-        $query = "SHOW FULL COLUMNS FROM $table LIKE ".$db->quote($field_name);
-        $columns = $db->queryAll($query, null, MDB2_FETCHMODE_ASSOC);
-        if (PEAR::isError($columns)) {
-            return $columns;
-        }
-        foreach ($columns as $column) {
-            $column = array_change_key_case($column, CASE_LOWER);
-            $column['name'] = $column['field'];
-            unset($column['field']);
-            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                if ($db->options['field_case'] == CASE_LOWER) {
-                    $column['name'] = strtolower($column['name']);
-                } else {
-                    $column['name'] = strtoupper($column['name']);
-                }
-            } else {
-                $column = array_change_key_case($column, $db->options['field_case']);
-            }
-            if ($field_name == $column['name']) {
-                $mapped_datatype = $db->datatype->mapNativeDatatype($column);
-                if (PEAR::isError($mapped_datatype)) {
-                    return $mapped_datatype;
-                }
-                list($types, $length, $unsigned, $fixed) = $mapped_datatype;
-                $notnull = false;
-                if (empty($column['null']) || $column['null'] !== 'YES') {
-                    $notnull = true;
-                }
-                $default = false;
-                if (array_key_exists('default', $column)) {
-                    $default = $column['default'];
-                    if (is_null($default) && $notnull) {
-                        $default = '';
-                    }
-                }
-                $autoincrement = false;
-                if (!empty($column['extra']) && $column['extra'] == 'auto_increment') {
-                    $autoincrement = true;
-                }
-                $collate = null;
-                if (!empty($column['collation'])) {
-                    $collate = $column['collation'];
-                    $charset = preg_replace('/(.+?)(_.+)?/', '$1', $collate);
-                }
-
-                $definition[0] = array(
-                    'notnull' => $notnull,
-                    'nativetype' => preg_replace('/^([a-z]+)[^a-z].*/i', '\\1', $column['type'])
-                );
-                if (!is_null($length)) {
-                    $definition[0]['length'] = $length;
-                }
-                if (!is_null($unsigned)) {
-                    $definition[0]['unsigned'] = $unsigned;
-                }
-                if (!is_null($fixed)) {
-                    $definition[0]['fixed'] = $fixed;
-                }
-                if ($default !== false) {
-                    $definition[0]['default'] = $default;
-                }
-                if ($autoincrement !== false) {
-                    $definition[0]['autoincrement'] = $autoincrement;
-                }
-                if (!is_null($collate)) {
-                    $definition[0]['collate'] = $collate;
-                    $definition[0]['charset'] = $charset;
-                }
-                foreach ($types as $key => $type) {
-                    $definition[$key] = $definition[0];
-                    if ($type == 'clob' || $type == 'blob') {
-                        unset($definition[$key]['default']);
-                    } elseif ($type == 'timestamp' && $notnull && empty($definition[$key]['default'])) {
-                        $definition[$key]['default'] = '0000-00-00 00:00:00';
-                    }
-                    $definition[$key]['type'] = $type;
-                    $definition[$key]['mdb2type'] = $type;
-                }
-                return $definition;
-            }
-        }
-
-        return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-            'it was not specified an existing table column', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ getTableIndexDefinition()
-
-    /**
-     * Get the structure of an index into an array
-     *
-     * @param string $table_name name of table that should be used in method
-     * @param string $index_name name of index that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function getTableIndexDefinition($table_name, $index_name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        list($schema, $table) = $this->splitTableSchema($table_name);
-
-        $table = $db->quoteIdentifier($table, true);
-        $query = "SHOW INDEX FROM $table /*!50002 WHERE Key_name = %s */";
-        $index_name_mdb2 = $db->getIndexName($index_name);
-        $result = $db->queryRow(sprintf($query, $db->quote($index_name_mdb2)));
-        if (!PEAR::isError($result) && !is_null($result)) {
-            // apply 'idxname_format' only if the query succeeded, otherwise
-            // fallback to the given $index_name, without transformation
-            $index_name = $index_name_mdb2;
-        }
-        $result = $db->query(sprintf($query, $db->quote($index_name)));
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $colpos = 1;
-        $definition = array();
-        while (is_array($row = $result->fetchRow(MDB2_FETCHMODE_ASSOC))) {
-            $row = array_change_key_case($row, CASE_LOWER);
-            $key_name = $row['key_name'];
-            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                if ($db->options['field_case'] == CASE_LOWER) {
-                    $key_name = strtolower($key_name);
-                } else {
-                    $key_name = strtoupper($key_name);
-                }
-            }
-            if ($index_name == $key_name) {
-                if (!$row['non_unique']) {
-                    return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                        $index_name . ' is not an existing table index', __FUNCTION__);
-                }
-                $column_name = $row['column_name'];
-                if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                    if ($db->options['field_case'] == CASE_LOWER) {
-                        $column_name = strtolower($column_name);
-                    } else {
-                        $column_name = strtoupper($column_name);
-                    }
-                }
-                $definition['fields'][$column_name] = array(
-                    'position' => $colpos++
-                );
-                if (!empty($row['collation'])) {
-                    $definition['fields'][$column_name]['sorting'] = ($row['collation'] == 'A'
-                        ? 'ascending' : 'descending');
-                }
-            }
-        }
-        $result->free();
-        if (empty($definition['fields'])) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                $index_name . ' is not an existing table index', __FUNCTION__);
-        }
-        return $definition;
-    }
-
-    // }}}
-    // {{{ getTableConstraintDefinition()
-
-    /**
-     * Get the structure of a constraint into an array
-     *
-     * @param string $table_name      name of table that should be used in method
-     * @param string $constraint_name name of constraint that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function getTableConstraintDefinition($table_name, $constraint_name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        list($schema, $table) = $this->splitTableSchema($table_name);
-        $constraint_name_original = $constraint_name;
-
-        $table = $db->quoteIdentifier($table, true);
-        $query = "SHOW INDEX FROM $table /*!50002 WHERE Key_name = %s */";
-        if (strtolower($constraint_name) != 'primary') {
-            $constraint_name_mdb2 = $db->getIndexName($constraint_name);
-            $result = $db->queryRow(sprintf($query, $db->quote($constraint_name_mdb2)));
-            if (!PEAR::isError($result) && !is_null($result)) {
-                // apply 'idxname_format' only if the query succeeded, otherwise
-                // fallback to the given $index_name, without transformation
-                $constraint_name = $constraint_name_mdb2;
-            }
-        }
-        $result = $db->query(sprintf($query, $db->quote($constraint_name)));
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $colpos = 1;
-        //default values, eventually overridden
-        $definition = array(
-            'primary' => false,
-            'unique'  => false,
-            'foreign' => false,
-            'check'   => false,
-            'fields'  => array(),
-            'references' => array(
-                'table'  => '',
-                'fields' => array(),
-            ),
-            'onupdate'  => '',
-            'ondelete'  => '',
-            'match'     => '',
-            'deferrable'        => false,
-            'initiallydeferred' => false,
-        );
-        while (is_array($row = $result->fetchRow(MDB2_FETCHMODE_ASSOC))) {
-            $row = array_change_key_case($row, CASE_LOWER);
-            $key_name = $row['key_name'];
-            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                if ($db->options['field_case'] == CASE_LOWER) {
-                    $key_name = strtolower($key_name);
-                } else {
-                    $key_name = strtoupper($key_name);
-                }
-            }
-            if ($constraint_name == $key_name) {
-                if ($row['non_unique']) {
-                    //FOREIGN KEY?
-                    return $this->_getTableFKConstraintDefinition($table, $constraint_name_original, $definition);
-                }
-                if ($row['key_name'] == 'PRIMARY') {
-                    $definition['primary'] = true;
-                } elseif (!$row['non_unique']) {
-                    $definition['unique'] = true;
-                }
-                $column_name = $row['column_name'];
-                if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                    if ($db->options['field_case'] == CASE_LOWER) {
-                        $column_name = strtolower($column_name);
-                    } else {
-                        $column_name = strtoupper($column_name);
-                    }
-                }
-                $definition['fields'][$column_name] = array(
-                    'position' => $colpos++
-                );
-                if (!empty($row['collation'])) {
-                    $definition['fields'][$column_name]['sorting'] = ($row['collation'] == 'A'
-                        ? 'ascending' : 'descending');
-                }
-            }
-        }
-        $result->free();
-        if (empty($definition['fields'])) {
-            return $this->_getTableFKConstraintDefinition($table, $constraint_name_original, $definition);
-        }
-        return $definition;
-    }
-
-    // }}}
-    // {{{ _getTableFKConstraintDefinition()
-    
-    /**
-     * Get the FK definition from the CREATE TABLE statement
-     *
-     * @param string $table           table name
-     * @param string $constraint_name constraint name
-     * @param array  $definition      default values for constraint definition
-     *
-     * @return array|PEAR_Error
-     * @access private
-     */
-    function _getTableFKConstraintDefinition($table, $constraint_name, $definition)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        $query = 'SHOW CREATE TABLE '. $db->escape($table);
-        $constraint = $db->queryOne($query, 'text', 1);
-        if (!PEAR::isError($constraint) && !empty($constraint)) {
-            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                if ($db->options['field_case'] == CASE_LOWER) {
-                    $constraint = strtolower($constraint);
-                } else {
-                    $constraint = strtoupper($constraint);
-                }
-            }
-            $constraint_name_original = $constraint_name;
-            $constraint_name = $db->getIndexName($constraint_name);
-            $pattern = '/\bCONSTRAINT\s+'.$constraint_name.'\s+FOREIGN KEY\s+\(([^\)]+)\) \bREFERENCES\b ([^ ]+) \(([^\)]+)\)/i';
-            if (!preg_match($pattern, str_replace('`', '', $constraint), $matches)) {
-                //fallback to original constraint name
-                $pattern = '/\bCONSTRAINT\s+'.$constraint_name_original.'\s+FOREIGN KEY\s+\(([^\)]+)\) \bREFERENCES\b ([^ ]+) \(([^\)]+)\)/i';
-            }
-            if (preg_match($pattern, str_replace('`', '', $constraint), $matches)) {
-                $definition['foreign'] = true;
-                $column_names = explode(',', $matches[1]);
-                $referenced_cols = explode(',', $matches[3]);
-                $definition['references'] = array(
-                    'table'  => $matches[2],
-                    'fields' => array(),
-                );
-                $colpos = 1;
-                foreach ($column_names as $column_name) {
-                    $definition['fields'][trim($column_name)] = array(
-                        'position' => $colpos++
-                    );
-                }
-                $colpos = 1;
-                foreach ($referenced_cols as $column_name) {
-                    $definition['references']['fields'][trim($column_name)] = array(
-                        'position' => $colpos++
-                    );
-                }
-                $definition['onupdate'] = 'NO ACTION';
-                $definition['ondelete'] = 'NO ACTION';
-                $definition['match']    = 'SIMPLE';
-                return $definition;
-            }
-        }
-        return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                $constraint_name . ' is not an existing table constraint', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ getTriggerDefinition()
-
-    /**
-     * Get the structure of a trigger into an array
-     *
-     * EXPERIMENTAL
-     *
-     * WARNING: this function is experimental and may change the returned value
-     * at any time until labelled as non-experimental
-     *
-     * @param string    $trigger    name of trigger that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function getTriggerDefinition($trigger)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = 'SELECT trigger_name,
-                         event_object_table AS table_name,
-                         action_statement AS trigger_body,
-                         action_timing AS trigger_type,
-                         event_manipulation AS trigger_event
-                    FROM information_schema.triggers
-                   WHERE trigger_name = '. $db->quote($trigger, 'text');
-        $types = array(
-            'trigger_name'    => 'text',
-            'table_name'      => 'text',
-            'trigger_body'    => 'text',
-            'trigger_type'    => 'text',
-            'trigger_event'   => 'text',
-        );
-        $def = $db->queryRow($query, $types, MDB2_FETCHMODE_ASSOC);
-        if (PEAR::isError($def)) {
-            return $def;
-        }
-        $def['trigger_comment'] = '';
-        $def['trigger_enabled'] = true;
-        return $def;
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * @param object|string  $result  MDB2_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A MDB2_Error object on failure.
-     *
-     * @see MDB2_Driver_Common::setOption()
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-           return parent::tableInfo($result, $mode);
-        }
-
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $resource = MDB2::isResultCommon($result) ? $result->getResource() : $result;
-        if (!is_resource($resource)) {
-            return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                'Could not generate result resource', __FUNCTION__);
-        }
-
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            if ($db->options['field_case'] == CASE_LOWER) {
-                $case_func = 'strtolower';
-            } else {
-                $case_func = 'strtoupper';
-            }
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @mysql_num_fields($resource);
-        $res   = array();
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        $db->loadModule('Datatype', null, true);
-        for ($i = 0; $i < $count; $i++) {
-            $res[$i] = array(
-                'table' => $case_func(@mysql_field_table($resource, $i)),
-                'name'  => $case_func(@mysql_field_name($resource, $i)),
-                'type'  => @mysql_field_type($resource, $i),
-                'length'   => @mysql_field_len($resource, $i),
-                'flags' => @mysql_field_flags($resource, $i),
-            );
-            if ($res[$i]['type'] == 'string') {
-                $res[$i]['type'] = 'char';
-            } elseif ($res[$i]['type'] == 'unknown') {
-                $res[$i]['type'] = 'decimal';
-            }
-            $mdb2type_info = $db->datatype->mapNativeDatatype($res[$i]);
-            if (PEAR::isError($mdb2type_info)) {
-               return $mdb2type_info;
-            }
-            $res[$i]['mdb2type'] = $mdb2type_info[0][0];
-            if ($mode & MDB2_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & MDB2_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        return $res;
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Reverse/pgsql.php b/3rdparty/MDB2/Driver/Reverse/pgsql.php
deleted file mode 100644
index 8669c2b919b..00000000000
--- a/3rdparty/MDB2/Driver/Reverse/pgsql.php
+++ /dev/null
@@ -1,573 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Authors: Paul Cooper <pgc@ucecom.com>                                |
-// |          Lorenzo Alberton <l.alberton@quipo.it>                      |
-// +----------------------------------------------------------------------+
-//
-// $Id: pgsql.php,v 1.75 2008/08/22 16:36:20 quipo Exp $
-
-require_once('MDB2/Driver/Reverse/Common.php');
-
-/**
- * MDB2 PostGreSQL driver for the schema reverse engineering module
- *
- * @package  MDB2
- * @category Database
- * @author   Paul Cooper <pgc@ucecom.com>
- * @author   Lorenzo Alberton <l.alberton@quipo.it>
- */
-class MDB2_Driver_Reverse_pgsql extends MDB2_Driver_Reverse_Common
-{
-    // {{{ getTableFieldDefinition()
-
-    /**
-     * Get the structure of a field into an array
-     *
-     * @param string $table_name name of table that should be used in method
-     * @param string $field_name name of field that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function getTableFieldDefinition($table_name, $field_name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $result = $db->loadModule('Datatype', null, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        list($schema, $table) = $this->splitTableSchema($table_name);
-
-        $query = "SELECT a.attname AS name,
-                         t.typname AS type,
-                         CASE a.attlen
-                           WHEN -1 THEN
-	                         CASE t.typname
-	                           WHEN 'numeric' THEN (a.atttypmod / 65536)
-	                           WHEN 'decimal' THEN (a.atttypmod / 65536)
-	                           WHEN 'money'   THEN (a.atttypmod / 65536)
-	                           ELSE CASE a.atttypmod
-                                 WHEN -1 THEN NULL
-	                             ELSE a.atttypmod - 4
-	                           END
-                             END
-	                       ELSE a.attlen
-                         END AS length,
-	                     CASE t.typname
-	                       WHEN 'numeric' THEN (a.atttypmod % 65536) - 4
-	                       WHEN 'decimal' THEN (a.atttypmod % 65536) - 4
-	                       WHEN 'money'   THEN (a.atttypmod % 65536) - 4
-	                       ELSE 0
-                         END AS scale,
-                         a.attnotnull,
-                         a.atttypmod,
-                         a.atthasdef,
-                         (SELECT substring(pg_get_expr(d.adbin, d.adrelid) for 128)
-                            FROM pg_attrdef d
-                           WHERE d.adrelid = a.attrelid
-                             AND d.adnum = a.attnum
-                             AND a.atthasdef
-                         ) as default
-                    FROM pg_attribute a,
-                         pg_class c,
-                         pg_type t
-                   WHERE c.relname = ".$db->quote($table, 'text')."
-                     AND a.atttypid = t.oid
-                     AND c.oid = a.attrelid
-                     AND NOT a.attisdropped
-                     AND a.attnum > 0
-                     AND a.attname = ".$db->quote($field_name, 'text')."
-                ORDER BY a.attnum";
-        $column = $db->queryRow($query, null, MDB2_FETCHMODE_ASSOC);
-        if (PEAR::isError($column)) {
-            return $column;
-        }
-
-        if (empty($column)) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'it was not specified an existing table column', __FUNCTION__);
-        }
-
-        $column = array_change_key_case($column, CASE_LOWER);
-        $mapped_datatype = $db->datatype->mapNativeDatatype($column);
-        if (PEAR::isError($mapped_datatype)) {
-            return $mapped_datatype;
-        }
-        list($types, $length, $unsigned, $fixed) = $mapped_datatype;
-        $notnull = false;
-        if (!empty($column['attnotnull']) && $column['attnotnull'] == 't') {
-            $notnull = true;
-        }
-        $default = null;
-        if ($column['atthasdef'] === 't'
-            && !preg_match("/nextval\('([^']+)'/", $column['default'])
-        ) {
-            $pattern = '/^\'(.*)\'::[\w ]+$/i';
-            $default = $column['default'];#substr($column['adsrc'], 1, -1);
-            if (is_null($default) && $notnull) {
-                $default = '';
-            } elseif (!empty($default) && preg_match($pattern, $default)) {
-                //remove data type cast
-                $default = preg_replace ($pattern, '\\1', $default);
-            }
-        }
-        $autoincrement = false;
-        if (preg_match("/nextval\('([^']+)'/", $column['default'], $nextvals)) {
-            $autoincrement = true;
-        }
-        $definition[0] = array('notnull' => $notnull, 'nativetype' => $column['type']);
-        if (!is_null($length)) {
-            $definition[0]['length'] = $length;
-        }
-        if (!is_null($unsigned)) {
-            $definition[0]['unsigned'] = $unsigned;
-        }
-        if (!is_null($fixed)) {
-            $definition[0]['fixed'] = $fixed;
-        }
-        if ($default !== false) {
-            $definition[0]['default'] = $default;
-        }
-        if ($autoincrement !== false) {
-            $definition[0]['autoincrement'] = $autoincrement;
-        }
-        foreach ($types as $key => $type) {
-            $definition[$key] = $definition[0];
-            if ($type == 'clob' || $type == 'blob') {
-                unset($definition[$key]['default']);
-            }
-            $definition[$key]['type'] = $type;
-            $definition[$key]['mdb2type'] = $type;
-        }
-        return $definition;
-    }
-
-    // }}}
-    // {{{ getTableIndexDefinition()
-
-    /**
-     * Get the structure of an index into an array
-     *
-     * @param string $table_name name of table that should be used in method
-     * @param string $index_name name of index that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function getTableIndexDefinition($table_name, $index_name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        
-        list($schema, $table) = $this->splitTableSchema($table_name);
-
-        $query = 'SELECT relname, indkey FROM pg_index, pg_class';
-        $query.= ' WHERE pg_class.oid = pg_index.indexrelid';
-        $query.= " AND indisunique != 't' AND indisprimary != 't'";
-        $query.= ' AND pg_class.relname = %s';
-        $index_name_mdb2 = $db->getIndexName($index_name);
-        $row = $db->queryRow(sprintf($query, $db->quote($index_name_mdb2, 'text')), null, MDB2_FETCHMODE_ASSOC);
-        if (PEAR::isError($row) || empty($row)) {
-            // fallback to the given $index_name, without transformation
-            $row = $db->queryRow(sprintf($query, $db->quote($index_name, 'text')), null, MDB2_FETCHMODE_ASSOC);
-        }
-        if (PEAR::isError($row)) {
-            return $row;
-        }
-
-        if (empty($row)) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'it was not specified an existing table index', __FUNCTION__);
-        }
-
-        $row = array_change_key_case($row, CASE_LOWER);
-
-        $db->loadModule('Manager', null, true);
-        $columns = $db->manager->listTableFields($table_name);
-
-        $definition = array();
-
-        $index_column_numbers = explode(' ', $row['indkey']);
-
-        $colpos = 1;
-        foreach ($index_column_numbers as $number) {
-            $definition['fields'][$columns[($number - 1)]] = array(
-                'position' => $colpos++,
-                'sorting' => 'ascending',
-            );
-        }
-        return $definition;
-    }
-
-    // }}}
-    // {{{ getTableConstraintDefinition()
-
-    /**
-     * Get the structure of a constraint into an array
-     *
-     * @param string $table_name      name of table that should be used in method
-     * @param string $constraint_name name of constraint that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function getTableConstraintDefinition($table_name, $constraint_name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        
-        list($schema, $table) = $this->splitTableSchema($table_name);
-
-        $query = "SELECT c.oid,
-                         c.conname AS constraint_name,
-                         CASE WHEN c.contype = 'c' THEN 1 ELSE 0 END AS \"check\",
-                         CASE WHEN c.contype = 'f' THEN 1 ELSE 0 END AS \"foreign\",
-                         CASE WHEN c.contype = 'p' THEN 1 ELSE 0 END AS \"primary\",
-                         CASE WHEN c.contype = 'u' THEN 1 ELSE 0 END AS \"unique\",
-                         CASE WHEN c.condeferrable = 'f' THEN 0 ELSE 1 END AS deferrable,
-                         CASE WHEN c.condeferred = 'f' THEN 0 ELSE 1 END AS initiallydeferred,
-                         --array_to_string(c.conkey, ' ') AS constraint_key,
-                         t.relname AS table_name,
-                         t2.relname AS references_table,
-                         CASE confupdtype
-                           WHEN 'a' THEN 'NO ACTION'
-                           WHEN 'r' THEN 'RESTRICT'
-                           WHEN 'c' THEN 'CASCADE'
-                           WHEN 'n' THEN 'SET NULL'
-                           WHEN 'd' THEN 'SET DEFAULT'
-                         END AS onupdate,
-                         CASE confdeltype
-                           WHEN 'a' THEN 'NO ACTION'
-                           WHEN 'r' THEN 'RESTRICT'
-                           WHEN 'c' THEN 'CASCADE'
-                           WHEN 'n' THEN 'SET NULL'
-                           WHEN 'd' THEN 'SET DEFAULT'
-                         END AS ondelete,
-                         CASE confmatchtype
-                           WHEN 'u' THEN 'UNSPECIFIED'
-                           WHEN 'f' THEN 'FULL'
-                           WHEN 'p' THEN 'PARTIAL'
-                         END AS match,
-                         --array_to_string(c.confkey, ' ') AS fk_constraint_key,
-                         consrc
-                    FROM pg_constraint c
-               LEFT JOIN pg_class t  ON c.conrelid  = t.oid
-               LEFT JOIN pg_class t2 ON c.confrelid = t2.oid
-                   WHERE c.conname = %s
-                     AND t.relname = " . $db->quote($table, 'text');
-        $constraint_name_mdb2 = $db->getIndexName($constraint_name);
-        $row = $db->queryRow(sprintf($query, $db->quote($constraint_name_mdb2, 'text')), null, MDB2_FETCHMODE_ASSOC);
-        if (PEAR::isError($row) || empty($row)) {
-            // fallback to the given $index_name, without transformation
-            $constraint_name_mdb2 = $constraint_name;
-            $row = $db->queryRow(sprintf($query, $db->quote($constraint_name_mdb2, 'text')), null, MDB2_FETCHMODE_ASSOC);
-        }
-        if (PEAR::isError($row)) {
-            return $row;
-        }
-        $uniqueIndex = false;
-        if (empty($row)) {
-            // We might be looking for a UNIQUE index that was not created
-            // as a constraint but should be treated as such.
-            $query = 'SELECT relname AS constraint_name,
-                             indkey,
-                             0 AS "check",
-                             0 AS "foreign",
-                             0 AS "primary",
-                             1 AS "unique",
-                             0 AS deferrable,
-                             0 AS initiallydeferred,
-                             NULL AS references_table,
-                             NULL AS onupdate,
-                             NULL AS ondelete,
-                             NULL AS match
-                        FROM pg_index, pg_class
-                       WHERE pg_class.oid = pg_index.indexrelid
-                         AND indisunique = \'t\'
-                         AND pg_class.relname = %s';
-            $constraint_name_mdb2 = $db->getIndexName($constraint_name);
-            $row = $db->queryRow(sprintf($query, $db->quote($constraint_name_mdb2, 'text')), null, MDB2_FETCHMODE_ASSOC);
-            if (PEAR::isError($row) || empty($row)) {
-                // fallback to the given $index_name, without transformation
-                $constraint_name_mdb2 = $constraint_name;
-                $row = $db->queryRow(sprintf($query, $db->quote($constraint_name_mdb2, 'text')), null, MDB2_FETCHMODE_ASSOC);
-            }
-            if (PEAR::isError($row)) {
-                return $row;
-            }
-            if (empty($row)) {
-                return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                    $constraint_name . ' is not an existing table constraint', __FUNCTION__);
-            }
-            $uniqueIndex = true;
-        }
-
-        $row = array_change_key_case($row, CASE_LOWER);
-
-        $definition = array(
-            'primary' => (boolean)$row['primary'],
-            'unique'  => (boolean)$row['unique'],
-            'foreign' => (boolean)$row['foreign'],
-            'check'   => (boolean)$row['check'],
-            'fields'  => array(),
-            'references' => array(
-                'table'  => $row['references_table'],
-                'fields' => array(),
-            ),
-            'deferrable' => (boolean)$row['deferrable'],
-            'initiallydeferred' => (boolean)$row['initiallydeferred'],
-            'onupdate' => $row['onupdate'],
-            'ondelete' => $row['ondelete'],
-            'match'    => $row['match'],
-        );
-
-        if ($uniqueIndex) {
-            $db->loadModule('Manager', null, true);
-            $columns = $db->manager->listTableFields($table_name);
-            $index_column_numbers = explode(' ', $row['indkey']);
-            $colpos = 1;
-            foreach ($index_column_numbers as $number) {
-                $definition['fields'][$columns[($number - 1)]] = array(
-                    'position' => $colpos++,
-                    'sorting'  => 'ascending',
-                );
-            }
-            return $definition;
-        }
-
-        $query = 'SELECT a.attname
-                    FROM pg_constraint c
-               LEFT JOIN pg_class t  ON c.conrelid  = t.oid
-               LEFT JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = ANY(c.conkey)
-                   WHERE c.conname = %s
-                     AND t.relname = ' . $db->quote($table, 'text');
-        $fields = $db->queryCol(sprintf($query, $db->quote($constraint_name_mdb2, 'text')), null);
-        if (PEAR::isError($fields)) {
-            return $fields;
-        }
-        $colpos = 1;
-        foreach ($fields as $field) {
-            $definition['fields'][$field] = array(
-                'position' => $colpos++,
-                'sorting' => 'ascending',
-            );
-        }
-        
-        if ($definition['foreign']) {
-            $query = 'SELECT a.attname
-                        FROM pg_constraint c
-                   LEFT JOIN pg_class t  ON c.confrelid  = t.oid
-                   LEFT JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = ANY(c.confkey)
-                       WHERE c.conname = %s
-                         AND t.relname = ' . $db->quote($definition['references']['table'], 'text');
-            $foreign_fields = $db->queryCol(sprintf($query, $db->quote($constraint_name_mdb2, 'text')), null);
-            if (PEAR::isError($foreign_fields)) {
-                return $foreign_fields;
-            }
-            $colpos = 1;
-            foreach ($foreign_fields as $foreign_field) {
-                $definition['references']['fields'][$foreign_field] = array(
-                    'position' => $colpos++,
-                );
-            }
-        }
-        
-        if ($definition['check']) {
-            $check_def = $db->queryOne("SELECT pg_get_constraintdef(" . $row['oid'] . ", 't')");
-            // ...
-        }
-        return $definition;
-    }
-
-    // }}}
-    // {{{ getTriggerDefinition()
-
-    /**
-     * Get the structure of a trigger into an array
-     *
-     * EXPERIMENTAL
-     *
-     * WARNING: this function is experimental and may change the returned value
-     * at any time until labelled as non-experimental
-     *
-     * @param string $trigger name of trigger that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     * @access public
-     *
-     * @TODO: add support for plsql functions and functions with args
-     */
-    function getTriggerDefinition($trigger)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SELECT trg.tgname AS trigger_name,
-                         tbl.relname AS table_name,
-                         CASE
-                            WHEN p.proname IS NOT NULL THEN 'EXECUTE PROCEDURE ' || p.proname || '();'
-                            ELSE ''
-                         END AS trigger_body,
-                         CASE trg.tgtype & cast(2 as int2)
-                            WHEN 0 THEN 'AFTER'
-                            ELSE 'BEFORE'
-                         END AS trigger_type,
-                         CASE trg.tgtype & cast(28 as int2)
-                            WHEN 16 THEN 'UPDATE'
-                            WHEN 8 THEN 'DELETE'
-                            WHEN 4 THEN 'INSERT'
-                            WHEN 20 THEN 'INSERT, UPDATE'
-                            WHEN 28 THEN 'INSERT, UPDATE, DELETE'
-                            WHEN 24 THEN 'UPDATE, DELETE'
-                            WHEN 12 THEN 'INSERT, DELETE'
-                         END AS trigger_event,
-                         CASE trg.tgenabled
-                            WHEN 'O' THEN 't'
-                            ELSE trg.tgenabled
-                         END AS trigger_enabled,
-                         obj_description(trg.oid, 'pg_trigger') AS trigger_comment
-                    FROM pg_trigger trg,
-                         pg_class tbl,
-                         pg_proc p
-                   WHERE trg.tgrelid = tbl.oid
-                     AND trg.tgfoid = p.oid
-                     AND trg.tgname = ". $db->quote($trigger, 'text');
-        $types = array(
-            'trigger_name'    => 'text',
-            'table_name'      => 'text',
-            'trigger_body'    => 'text',
-            'trigger_type'    => 'text',
-            'trigger_event'   => 'text',
-            'trigger_comment' => 'text',
-            'trigger_enabled' => 'boolean',
-        );
-        return $db->queryRow($query, $types, MDB2_FETCHMODE_ASSOC);
-    }
-    
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * NOTE: only supports 'table' and 'flags' if <var>$result</var>
-     * is a table name.
-     *
-     * @param object|string  $result  MDB2_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A MDB2_Error object on failure.
-     *
-     * @see MDB2_Driver_Common::tableInfo()
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-           return parent::tableInfo($result, $mode);
-        }
-
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $resource = MDB2::isResultCommon($result) ? $result->getResource() : $result;
-        if (!is_resource($resource)) {
-            return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                'Could not generate result resource', __FUNCTION__);
-        }
-
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            if ($db->options['field_case'] == CASE_LOWER) {
-                $case_func = 'strtolower';
-            } else {
-                $case_func = 'strtoupper';
-            }
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @pg_num_fields($resource);
-        $res   = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        $db->loadModule('Datatype', null, true);
-        for ($i = 0; $i < $count; $i++) {
-            $res[$i] = array(
-                'table' => function_exists('pg_field_table') ? @pg_field_table($resource, $i) : '',
-                'name'  => $case_func(@pg_field_name($resource, $i)),
-                'type'  => @pg_field_type($resource, $i),
-                'length' => @pg_field_size($resource, $i),
-                'flags' => '',
-            );
-            $mdb2type_info = $db->datatype->mapNativeDatatype($res[$i]);
-            if (PEAR::isError($mdb2type_info)) {
-               return $mdb2type_info;
-            }
-            $res[$i]['mdb2type'] = $mdb2type_info[0][0];
-            if ($mode & MDB2_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & MDB2_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        return $res;
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Reverse/sqlite.php b/3rdparty/MDB2/Driver/Reverse/sqlite.php
deleted file mode 100644
index 60c686c418a..00000000000
--- a/3rdparty/MDB2/Driver/Reverse/sqlite.php
+++ /dev/null
@@ -1,609 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith, Lorenzo Alberton                       |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Authors: Lukas Smith <smith@pooteeweet.org>                          |
-// |          Lorenzo Alberton <l.alberton@quipo.it>                      |
-// +----------------------------------------------------------------------+
-//
-// $Id: sqlite.php,v 1.80 2008/05/03 10:30:14 quipo Exp $
-//
-
-require_once('MDB2/Driver/Reverse/Common.php');
-
-/**
- * MDB2 SQlite driver for the schema reverse engineering module
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Reverse_sqlite extends MDB2_Driver_Reverse_Common
-{
-    /**
-     * Remove SQL comments from the field definition
-     *
-     * @access private
-     */
-    function _removeComments($sql) {
-        $lines = explode("\n", $sql);
-        foreach ($lines as $k => $line) {
-            $pieces = explode('--', $line);
-            if (count($pieces) > 1 && (substr_count($pieces[0], '\'') % 2) == 0) {
-                $lines[$k] = substr($line, 0, strpos($line, '--'));
-            }
-        }
-        return implode("\n", $lines);
-    }
-
-    /**
-     *
-     */
-    function _getTableColumns($sql)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        $start_pos  = strpos($sql, '(');
-        $end_pos    = strrpos($sql, ')');
-        $column_def = substr($sql, $start_pos+1, $end_pos-$start_pos-1);
-        // replace the decimal length-places-separator with a colon
-        $column_def = preg_replace('/(\d),(\d)/', '\1:\2', $column_def);
-        $column_def = $this->_removeComments($column_def);
-        $column_sql = explode(',', $column_def);
-        $columns    = array();
-        $count      = count($column_sql);
-        if ($count == 0) {
-            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'unexpected empty table column definition list', __FUNCTION__);
-        }
-        $regexp = '/^\s*([^\s]+) +(CHAR|VARCHAR|VARCHAR2|TEXT|BOOLEAN|SMALLINT|INT|INTEGER|DECIMAL|BIGINT|DOUBLE|FLOAT|DATETIME|DATE|TIME|LONGTEXT|LONGBLOB)( ?\(([1-9][0-9]*)(:([1-9][0-9]*))?\))?( NULL| NOT NULL)?( UNSIGNED)?( NULL| NOT NULL)?( PRIMARY KEY)?( DEFAULT (\'[^\']*\'|[^ ]+))?( NULL| NOT NULL)?( PRIMARY KEY)?(\s*\-\-.*)?$/i';
-        $regexp2 = '/^\s*([^ ]+) +(PRIMARY|UNIQUE|CHECK)$/i';
-        for ($i=0, $j=0; $i<$count; ++$i) {
-            if (!preg_match($regexp, trim($column_sql[$i]), $matches)) {
-                if (!preg_match($regexp2, trim($column_sql[$i]))) {
-                    continue;
-                }
-                return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                    'unexpected table column SQL definition: "'.$column_sql[$i].'"', __FUNCTION__);
-            }
-            $columns[$j]['name'] = trim($matches[1], implode('', $db->identifier_quoting));
-            $columns[$j]['type'] = strtolower($matches[2]);
-            if (isset($matches[4]) && strlen($matches[4])) {
-                $columns[$j]['length'] = $matches[4];
-            }
-            if (isset($matches[6]) && strlen($matches[6])) {
-                $columns[$j]['decimal'] = $matches[6];
-            }
-            if (isset($matches[8]) && strlen($matches[8])) {
-                $columns[$j]['unsigned'] = true;
-            }
-            if (isset($matches[9]) && strlen($matches[9])) {
-                $columns[$j]['autoincrement'] = true;
-            }
-            if (isset($matches[12]) && strlen($matches[12])) {
-                $default = $matches[12];
-                if (strlen($default) && $default[0]=="'") {
-                    $default = str_replace("''", "'", substr($default, 1, strlen($default)-2));
-                }
-                if ($default === 'NULL') {
-                    $default = null;
-                }
-                $columns[$j]['default'] = $default;
-            }
-            if (isset($matches[7]) && strlen($matches[7])) {
-                $columns[$j]['notnull'] = ($matches[7] === ' NOT NULL');
-            } else if (isset($matches[9]) && strlen($matches[9])) {
-                $columns[$j]['notnull'] = ($matches[9] === ' NOT NULL');
-            } else if (isset($matches[13]) && strlen($matches[13])) {
-                $columns[$j]['notnull'] = ($matches[13] === ' NOT NULL');
-            }
-            ++$j;
-        }
-        return $columns;
-    }
-
-    // {{{ getTableFieldDefinition()
-
-    /**
-     * Get the stucture of a field into an array
-     *
-     * @param string $table_name name of table that should be used in method
-     * @param string $field_name name of field that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure.
-     *          The returned array contains an array for each field definition,
-     *          with (some of) these indices:
-     *          [notnull] [nativetype] [length] [fixed] [default] [type] [mdb2type]
-     * @access public
-     */
-    function getTableFieldDefinition($table_name, $field_name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        
-        list($schema, $table) = $this->splitTableSchema($table_name);
-
-        $result = $db->loadModule('Datatype', null, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $query = "SELECT sql FROM sqlite_master WHERE type='table' AND ";
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $query.= 'LOWER(name)='.$db->quote(strtolower($table), 'text');
-        } else {
-            $query.= 'name='.$db->quote($table, 'text');
-        }
-        $sql = $db->queryOne($query);
-        if (PEAR::isError($sql)) {
-            return $sql;
-        }
-        $columns = $this->_getTableColumns($sql);
-        foreach ($columns as $column) {
-            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                if ($db->options['field_case'] == CASE_LOWER) {
-                    $column['name'] = strtolower($column['name']);
-                } else {
-                    $column['name'] = strtoupper($column['name']);
-                }
-            } else {
-                $column = array_change_key_case($column, $db->options['field_case']);
-            }
-            if ($field_name == $column['name']) {
-                $mapped_datatype = $db->datatype->mapNativeDatatype($column);
-                if (PEAR::isError($mapped_datatype)) {
-                    return $mapped_datatype;
-                }
-                list($types, $length, $unsigned, $fixed) = $mapped_datatype;
-                $notnull = false;
-                if (!empty($column['notnull'])) {
-                    $notnull = $column['notnull'];
-                }
-                $default = false;
-                if (array_key_exists('default', $column)) {
-                    $default = $column['default'];
-                    if (is_null($default) && $notnull) {
-                        $default = '';
-                    }
-                }
-                $autoincrement = false;
-                if (!empty($column['autoincrement'])) {
-                    $autoincrement = true;
-                }
-
-                $definition[0] = array(
-                    'notnull' => $notnull,
-                    'nativetype' => preg_replace('/^([a-z]+)[^a-z].*/i', '\\1', $column['type'])
-                );
-                if (!is_null($length)) {
-                    $definition[0]['length'] = $length;
-                }
-                if (!is_null($unsigned)) {
-                    $definition[0]['unsigned'] = $unsigned;
-                }
-                if (!is_null($fixed)) {
-                    $definition[0]['fixed'] = $fixed;
-                }
-                if ($default !== false) {
-                    $definition[0]['default'] = $default;
-                }
-                if ($autoincrement !== false) {
-                    $definition[0]['autoincrement'] = $autoincrement;
-                }
-                foreach ($types as $key => $type) {
-                    $definition[$key] = $definition[0];
-                    if ($type == 'clob' || $type == 'blob') {
-                        unset($definition[$key]['default']);
-                    }
-                    $definition[$key]['type'] = $type;
-                    $definition[$key]['mdb2type'] = $type;
-                }
-                return $definition;
-            }
-        }
-
-        return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-            'it was not specified an existing table column', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ getTableIndexDefinition()
-
-    /**
-     * Get the stucture of an index into an array
-     *
-     * @param string $table_name name of table that should be used in method
-     * @param string $index_name name of index that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function getTableIndexDefinition($table_name, $index_name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        
-        list($schema, $table) = $this->splitTableSchema($table_name);
-
-        $query = "SELECT sql FROM sqlite_master WHERE type='index' AND ";
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $query.= 'LOWER(name)=%s AND LOWER(tbl_name)=' . $db->quote(strtolower($table), 'text');
-        } else {
-            $query.= 'name=%s AND tbl_name=' . $db->quote($table, 'text');
-        }
-        $query.= ' AND sql NOT NULL ORDER BY name';
-        $index_name_mdb2 = $db->getIndexName($index_name);
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $qry = sprintf($query, $db->quote(strtolower($index_name_mdb2), 'text'));
-        } else {
-            $qry = sprintf($query, $db->quote($index_name_mdb2, 'text'));
-        }
-        $sql = $db->queryOne($qry, 'text');
-        if (PEAR::isError($sql) || empty($sql)) {
-            // fallback to the given $index_name, without transformation
-            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                $qry = sprintf($query, $db->quote(strtolower($index_name), 'text'));
-            } else {
-                $qry = sprintf($query, $db->quote($index_name, 'text'));
-            }
-            $sql = $db->queryOne($qry, 'text');
-        }
-        if (PEAR::isError($sql)) {
-            return $sql;
-        }
-        if (!$sql) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'it was not specified an existing table index', __FUNCTION__);
-        }
-
-        $sql = strtolower($sql);
-        $start_pos = strpos($sql, '(');
-        $end_pos = strrpos($sql, ')');
-        $column_names = substr($sql, $start_pos+1, $end_pos-$start_pos-1);
-        $column_names = explode(',', $column_names);
-
-        if (preg_match("/^create unique/", $sql)) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'it was not specified an existing table index', __FUNCTION__);
-        }
-
-        $definition = array();
-        $count = count($column_names);
-        for ($i=0; $i<$count; ++$i) {
-            $column_name = strtok($column_names[$i], ' ');
-            $collation = strtok(' ');
-            $definition['fields'][$column_name] = array(
-                'position' => $i+1
-            );
-            if (!empty($collation)) {
-                $definition['fields'][$column_name]['sorting'] =
-                    ($collation=='ASC' ? 'ascending' : 'descending');
-            }
-        }
-
-        if (empty($definition['fields'])) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'it was not specified an existing table index', __FUNCTION__);
-        }
-        return $definition;
-    }
-
-    // }}}
-    // {{{ getTableConstraintDefinition()
-
-    /**
-     * Get the stucture of a constraint into an array
-     *
-     * @param string $table_name      name of table that should be used in method
-     * @param string $constraint_name name of constraint that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function getTableConstraintDefinition($table_name, $constraint_name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        
-        list($schema, $table) = $this->splitTableSchema($table_name);
-
-        $query = "SELECT sql FROM sqlite_master WHERE type='index' AND ";
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $query.= 'LOWER(name)=%s AND LOWER(tbl_name)=' . $db->quote(strtolower($table), 'text');
-        } else {
-            $query.= 'name=%s AND tbl_name=' . $db->quote($table, 'text');
-        }
-        $query.= ' AND sql NOT NULL ORDER BY name';
-        $constraint_name_mdb2 = $db->getIndexName($constraint_name);
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $qry = sprintf($query, $db->quote(strtolower($constraint_name_mdb2), 'text'));
-        } else {
-            $qry = sprintf($query, $db->quote($constraint_name_mdb2, 'text'));
-        }
-        $sql = $db->queryOne($qry, 'text');
-        if (PEAR::isError($sql) || empty($sql)) {
-            // fallback to the given $index_name, without transformation
-            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                $qry = sprintf($query, $db->quote(strtolower($constraint_name), 'text'));
-            } else {
-                $qry = sprintf($query, $db->quote($constraint_name, 'text'));
-            }
-            $sql = $db->queryOne($qry, 'text');
-        }
-        if (PEAR::isError($sql)) {
-            return $sql;
-        }
-        //default values, eventually overridden
-        $definition = array(
-            'primary' => false,
-            'unique'  => false,
-            'foreign' => false,
-            'check'   => false,
-            'fields'  => array(),
-            'references' => array(
-                'table'  => '',
-                'fields' => array(),
-            ),
-            'onupdate'  => '',
-            'ondelete'  => '',
-            'match'     => '',
-            'deferrable'        => false,
-            'initiallydeferred' => false,
-        );
-        if (!$sql) {
-            $query = "SELECT sql FROM sqlite_master WHERE type='table' AND ";
-            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                $query.= 'LOWER(name)='.$db->quote(strtolower($table), 'text');
-            } else {
-                $query.= 'name='.$db->quote($table, 'text');
-            }
-            $query.= " AND sql NOT NULL ORDER BY name";
-            $sql = $db->queryOne($query, 'text');
-            if (PEAR::isError($sql)) {
-                return $sql;
-            }
-            if ($constraint_name == 'primary') {
-                // search in table definition for PRIMARY KEYs
-                if (preg_match("/\bPRIMARY\s+KEY\b\s*\(([^)]+)/i", $sql, $tmp)) {
-                    $definition['primary'] = true;
-                    $definition['fields'] = array();
-                    $column_names = explode(',', $tmp[1]);
-                    $colpos = 1;
-                    foreach ($column_names as $column_name) {
-                        $definition['fields'][trim($column_name)] = array(
-                            'position' => $colpos++
-                        );
-                    }
-                    return $definition;
-                }
-                if (preg_match("/\"([^\"]+)\"[^\,\"]+\bPRIMARY\s+KEY\b[^\,\)]*/i", $sql, $tmp)) {
-                    $definition['primary'] = true;
-                    $definition['fields'] = array();
-                    $column_names = explode(',', $tmp[1]);
-                    $colpos = 1;
-                    foreach ($column_names as $column_name) {
-                        $definition['fields'][trim($column_name)] = array(
-                            'position' => $colpos++
-                        );
-                    }
-                    return $definition;
-                }
-            } else {
-                // search in table definition for FOREIGN KEYs
-                $pattern = "/\bCONSTRAINT\b\s+%s\s+
-                    \bFOREIGN\s+KEY\b\s*\(([^\)]+)\)\s*
-                    \bREFERENCES\b\s+([^\s]+)\s*\(([^\)]+)\)\s*
-                    (?:\bMATCH\s*([^\s]+))?\s*
-                    (?:\bON\s+UPDATE\s+([^\s,\)]+))?\s*
-                    (?:\bON\s+DELETE\s+([^\s,\)]+))?\s*
-                    /imsx";
-                $found_fk = false;
-                if (preg_match(sprintf($pattern, $constraint_name_mdb2), $sql, $tmp)) {
-                    $found_fk = true;
-                } elseif (preg_match(sprintf($pattern, $constraint_name), $sql, $tmp)) {
-                    $found_fk = true;
-                }
-                if ($found_fk) {
-                    $definition['foreign'] = true;
-                    $definition['match'] = 'SIMPLE';
-                    $definition['onupdate'] = 'NO ACTION';
-                    $definition['ondelete'] = 'NO ACTION';
-                    $definition['references']['table'] = $tmp[2];
-                    $column_names = explode(',', $tmp[1]);
-                    $colpos = 1;
-                    foreach ($column_names as $column_name) {
-                        $definition['fields'][trim($column_name)] = array(
-                            'position' => $colpos++
-                        );
-                    }
-                    $referenced_cols = explode(',', $tmp[3]);
-                    $colpos = 1;
-                    foreach ($referenced_cols as $column_name) {
-                        $definition['references']['fields'][trim($column_name)] = array(
-                            'position' => $colpos++
-                        );
-                    }
-                    if (isset($tmp[4])) {
-                        $definition['match']    = $tmp[4];
-                    }
-                    if (isset($tmp[5])) {
-                        $definition['onupdate'] = $tmp[5];
-                    }
-                    if (isset($tmp[6])) {
-                        $definition['ondelete'] = $tmp[6];
-                    }
-                    return $definition;
-                }
-            }
-            $sql = false;
-        }
-        if (!$sql) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                $constraint_name . ' is not an existing table constraint', __FUNCTION__);
-        }
-
-        $sql = strtolower($sql);
-        $start_pos = strpos($sql, '(');
-        $end_pos   = strrpos($sql, ')');
-        $column_names = substr($sql, $start_pos+1, $end_pos-$start_pos-1);
-        $column_names = explode(',', $column_names);
-
-        if (!preg_match("/^create unique/", $sql)) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                $constraint_name . ' is not an existing table constraint', __FUNCTION__);
-        }
-
-        $definition['unique'] = true;
-        $count = count($column_names);
-        for ($i=0; $i<$count; ++$i) {
-            $column_name = strtok($column_names[$i]," ");
-            $collation = strtok(" ");
-            $definition['fields'][$column_name] = array(
-                'position' => $i+1
-            );
-            if (!empty($collation)) {
-                $definition['fields'][$column_name]['sorting'] =
-                    ($collation=='ASC' ? 'ascending' : 'descending');
-            }
-        }
-
-        if (empty($definition['fields'])) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                $constraint_name . ' is not an existing table constraint', __FUNCTION__);
-        }
-        return $definition;
-    }
-
-    // }}}
-    // {{{ getTriggerDefinition()
-
-    /**
-     * Get the structure of a trigger into an array
-     *
-     * EXPERIMENTAL
-     *
-     * WARNING: this function is experimental and may change the returned value
-     * at any time until labelled as non-experimental
-     *
-     * @param string    $trigger    name of trigger that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function getTriggerDefinition($trigger)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SELECT name as trigger_name,
-                         tbl_name AS table_name,
-                         sql AS trigger_body,
-                         NULL AS trigger_type,
-                         NULL AS trigger_event,
-                         NULL AS trigger_comment,
-                         1 AS trigger_enabled
-                    FROM sqlite_master
-                   WHERE type='trigger'";
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $query.= ' AND LOWER(name)='.$db->quote(strtolower($trigger), 'text');
-        } else {
-            $query.= ' AND name='.$db->quote($trigger, 'text');
-        }
-        $types = array(
-            'trigger_name'    => 'text',
-            'table_name'      => 'text',
-            'trigger_body'    => 'text',
-            'trigger_type'    => 'text',
-            'trigger_event'   => 'text',
-            'trigger_comment' => 'text',
-            'trigger_enabled' => 'boolean',
-        );
-        $def = $db->queryRow($query, $types, MDB2_FETCHMODE_ASSOC);
-        if (PEAR::isError($def)) {
-            return $def;
-        }
-        if (empty($def)) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'it was not specified an existing trigger', __FUNCTION__);
-        }
-        if (preg_match("/^create\s+(?:temp|temporary)?trigger\s+(?:if\s+not\s+exists\s+)?.*(before|after)?\s+(insert|update|delete)/Uims", $def['trigger_body'], $tmp)) {
-            $def['trigger_type'] = strtoupper($tmp[1]);
-            $def['trigger_event'] = strtoupper($tmp[2]);
-        }
-        return $def;
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table
-     *
-     * @param string         $result  a string containing the name of a table
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A MDB2_Error object on failure.
-     *
-     * @see MDB2_Driver_Common::tableInfo()
-     * @since Method available since Release 1.7.0
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-           return parent::tableInfo($result, $mode);
-        }
-
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_NOT_CAPABLE, null, null,
-           'This DBMS can not obtain tableInfo from result sets', __FUNCTION__);
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/mysql.php b/3rdparty/MDB2/Driver/mysql.php
deleted file mode 100644
index b9b46c0d762..00000000000
--- a/3rdparty/MDB2/Driver/mysql.php
+++ /dev/null
@@ -1,1700 +0,0 @@
-<?php
-// vim: set et ts=4 sw=4 fdm=marker:
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: mysql.php,v 1.214 2008/11/16 21:45:08 quipo Exp $
-//
-
-/**
- * MDB2 MySQL driver
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_mysql extends MDB2_Driver_Common
-{
-    // {{{ properties
-
-    var $string_quoting = array('start' => "'", 'end' => "'", 'escape' => '\\', 'escape_pattern' => '\\');
-
-    var $identifier_quoting = array('start' => '`', 'end' => '`', 'escape' => '`');
-
-    var $sql_comments = array(
-        array('start' => '-- ', 'end' => "\n", 'escape' => false),
-        array('start' => '#', 'end' => "\n", 'escape' => false),
-        array('start' => '/*', 'end' => '*/', 'escape' => false),
-    );
-
-    var $server_capabilities_checked = false;
-
-    var $start_transaction = false;
-
-    var $varchar_max_length = 255;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
-        parent::__construct();
-
-        $this->phptype = 'mysql';
-        $this->dbsyntax = 'mysql';
-
-        $this->supported['sequences'] = 'emulated';
-        $this->supported['indexes'] = true;
-        $this->supported['affected_rows'] = true;
-        $this->supported['transactions'] = false;
-        $this->supported['savepoints'] = false;
-        $this->supported['summary_functions'] = true;
-        $this->supported['order_by_text'] = true;
-        $this->supported['current_id'] = 'emulated';
-        $this->supported['limit_queries'] = true;
-        $this->supported['LOBs'] = true;
-        $this->supported['replace'] = true;
-        $this->supported['sub_selects'] = 'emulated';
-        $this->supported['triggers'] = false;
-        $this->supported['auto_increment'] = true;
-        $this->supported['primary_key'] = true;
-        $this->supported['result_introspection'] = true;
-        $this->supported['prepared_statements'] = 'emulated';
-        $this->supported['identifier_quoting'] = true;
-        $this->supported['pattern_escaping'] = true;
-        $this->supported['new_link'] = true;
-
-        $this->options['DBA_username'] = false;
-        $this->options['DBA_password'] = false;
-        $this->options['default_table_type'] = '';
-        $this->options['max_identifiers_length'] = 64;
-
-        $this->_reCheckSupportedOptions();
-    }
-
-    // }}}
-    // {{{ _reCheckSupportedOptions()
-    
-    /**
-     * If the user changes certain options, other capabilities may depend
-     * on the new settings, so we need to check them (again).
-     *
-     * @access private
-     */
-    function _reCheckSupportedOptions()
-    {
-        $this->supported['transactions'] = $this->options['use_transactions'];
-        $this->supported['savepoints']   = $this->options['use_transactions'];
-        if ($this->options['default_table_type']) {
-            switch (strtoupper($this->options['default_table_type'])) {
-            case 'BLACKHOLE':
-            case 'MEMORY':
-            case 'ARCHIVE':
-            case 'CSV':
-            case 'HEAP':
-            case 'ISAM':
-            case 'MERGE':
-            case 'MRG_ISAM':
-            case 'ISAM':
-            case 'MRG_MYISAM':
-            case 'MYISAM':
-                $this->supported['savepoints']   = false;
-                $this->supported['transactions'] = false;
-                $this->warnings[] = $this->options['default_table_type'] .
-                    ' is not a supported default table type';
-                break;
-            }
-        }
-    }
-
-    // }}}
-    // {{{ function setOption($option, $value)
-
-    /**
-     * set the option for the db class
-     *
-     * @param   string  option name
-     * @param   mixed   value for the option
-     *
-     * @return  mixed   MDB2_OK or MDB2 Error Object
-     *
-     * @access  public
-     */
-    function setOption($option, $value)
-    {
-        $res = parent::setOption($option, $value);
-        $this->_reCheckSupportedOptions();
-    }
-
-    // }}}
-    // {{{ errorInfo()
-
-    /**
-     * This method is used to collect information about an error
-     *
-     * @param integer $error
-     * @return array
-     * @access public
-     */
-    function errorInfo($error = null)
-    {
-        if ($this->connection) {
-            $native_code = @mysql_errno($this->connection);
-            $native_msg  = @mysql_error($this->connection);
-        } else {
-            $native_code = @mysql_errno();
-            $native_msg  = @mysql_error();
-        }
-        if (is_null($error)) {
-            static $ecode_map;
-            if (empty($ecode_map)) {
-                $ecode_map = array(
-                    1000 => MDB2_ERROR_INVALID, //hashchk
-                    1001 => MDB2_ERROR_INVALID, //isamchk
-                    1004 => MDB2_ERROR_CANNOT_CREATE,
-                    1005 => MDB2_ERROR_CANNOT_CREATE,
-                    1006 => MDB2_ERROR_CANNOT_CREATE,
-                    1007 => MDB2_ERROR_ALREADY_EXISTS,
-                    1008 => MDB2_ERROR_CANNOT_DROP,
-                    1009 => MDB2_ERROR_CANNOT_DROP,
-                    1010 => MDB2_ERROR_CANNOT_DROP,
-                    1011 => MDB2_ERROR_CANNOT_DELETE,
-                    1022 => MDB2_ERROR_ALREADY_EXISTS,
-                    1029 => MDB2_ERROR_NOT_FOUND,
-                    1032 => MDB2_ERROR_NOT_FOUND,
-                    1044 => MDB2_ERROR_ACCESS_VIOLATION,
-                    1045 => MDB2_ERROR_ACCESS_VIOLATION,
-                    1046 => MDB2_ERROR_NODBSELECTED,
-                    1048 => MDB2_ERROR_CONSTRAINT,
-                    1049 => MDB2_ERROR_NOSUCHDB,
-                    1050 => MDB2_ERROR_ALREADY_EXISTS,
-                    1051 => MDB2_ERROR_NOSUCHTABLE,
-                    1054 => MDB2_ERROR_NOSUCHFIELD,
-                    1060 => MDB2_ERROR_ALREADY_EXISTS,
-                    1061 => MDB2_ERROR_ALREADY_EXISTS,
-                    1062 => MDB2_ERROR_ALREADY_EXISTS,
-                    1064 => MDB2_ERROR_SYNTAX,
-                    1067 => MDB2_ERROR_INVALID,
-                    1072 => MDB2_ERROR_NOT_FOUND,
-                    1086 => MDB2_ERROR_ALREADY_EXISTS,
-                    1091 => MDB2_ERROR_NOT_FOUND,
-                    1100 => MDB2_ERROR_NOT_LOCKED,
-                    1109 => MDB2_ERROR_NOT_FOUND,
-                    1125 => MDB2_ERROR_ALREADY_EXISTS,
-                    1136 => MDB2_ERROR_VALUE_COUNT_ON_ROW,
-                    1138 => MDB2_ERROR_INVALID,
-                    1142 => MDB2_ERROR_ACCESS_VIOLATION,
-                    1143 => MDB2_ERROR_ACCESS_VIOLATION,
-                    1146 => MDB2_ERROR_NOSUCHTABLE,
-                    1149 => MDB2_ERROR_SYNTAX,
-                    1169 => MDB2_ERROR_CONSTRAINT,
-                    1176 => MDB2_ERROR_NOT_FOUND,
-                    1177 => MDB2_ERROR_NOSUCHTABLE,
-                    1213 => MDB2_ERROR_DEADLOCK,
-                    1216 => MDB2_ERROR_CONSTRAINT,
-                    1217 => MDB2_ERROR_CONSTRAINT,
-                    1227 => MDB2_ERROR_ACCESS_VIOLATION,
-                    1235 => MDB2_ERROR_CANNOT_CREATE,
-                    1299 => MDB2_ERROR_INVALID_DATE,
-                    1300 => MDB2_ERROR_INVALID,
-                    1304 => MDB2_ERROR_ALREADY_EXISTS,
-                    1305 => MDB2_ERROR_NOT_FOUND,
-                    1306 => MDB2_ERROR_CANNOT_DROP,
-                    1307 => MDB2_ERROR_CANNOT_CREATE,
-                    1334 => MDB2_ERROR_CANNOT_ALTER,
-                    1339 => MDB2_ERROR_NOT_FOUND,
-                    1356 => MDB2_ERROR_INVALID,
-                    1359 => MDB2_ERROR_ALREADY_EXISTS,
-                    1360 => MDB2_ERROR_NOT_FOUND,
-                    1363 => MDB2_ERROR_NOT_FOUND,
-                    1365 => MDB2_ERROR_DIVZERO,
-                    1451 => MDB2_ERROR_CONSTRAINT,
-                    1452 => MDB2_ERROR_CONSTRAINT,
-                    1542 => MDB2_ERROR_CANNOT_DROP,
-                    1546 => MDB2_ERROR_CONSTRAINT,
-                    1582 => MDB2_ERROR_CONSTRAINT,
-                    2003 => MDB2_ERROR_CONNECT_FAILED,
-                    2019 => MDB2_ERROR_INVALID,
-                );
-            }
-            if ($this->options['portability'] & MDB2_PORTABILITY_ERRORS) {
-                $ecode_map[1022] = MDB2_ERROR_CONSTRAINT;
-                $ecode_map[1048] = MDB2_ERROR_CONSTRAINT_NOT_NULL;
-                $ecode_map[1062] = MDB2_ERROR_CONSTRAINT;
-            } else {
-                // Doing this in case mode changes during runtime.
-                $ecode_map[1022] = MDB2_ERROR_ALREADY_EXISTS;
-                $ecode_map[1048] = MDB2_ERROR_CONSTRAINT;
-                $ecode_map[1062] = MDB2_ERROR_ALREADY_EXISTS;
-            }
-            if (isset($ecode_map[$native_code])) {
-                $error = $ecode_map[$native_code];
-            }
-        }
-        return array($error, $native_code, $native_msg);
-    }
-
-    // }}}
-    // {{{ escape()
-
-    /**
-     * Quotes a string so it can be safely used in a query. It will quote
-     * the text so it can safely be used within a query.
-     *
-     * @param   string  the input string to quote
-     * @param   bool    escape wildcards
-     *
-     * @return  string  quoted string
-     *
-     * @access  public
-     */
-    function escape($text, $escape_wildcards = false)
-    {
-        if ($escape_wildcards) {
-            $text = $this->escapePattern($text);
-        }
-        $connection = $this->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-        $text = @mysql_real_escape_string($text, $connection);
-        return $text;
-    }
-
-    // }}}
-    // {{{ beginTransaction()
-
-    /**
-     * Start a transaction or set a savepoint.
-     *
-     * @param   string  name of a savepoint to set
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function beginTransaction($savepoint = null)
-    {
-        $this->debug('Starting transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
-        $this->_getServerCapabilities();
-        if (!is_null($savepoint)) {
-            if (!$this->supports('savepoints')) {
-                return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                    'savepoints are not supported', __FUNCTION__);
-            }
-            if (!$this->in_transaction) {
-                return $this->raiseError(MDB2_ERROR_INVALID, null, null,
-                    'savepoint cannot be released when changes are auto committed', __FUNCTION__);
-            }
-            $query = 'SAVEPOINT '.$savepoint;
-            return $this->_doQuery($query, true);
-        } elseif ($this->in_transaction) {
-            return MDB2_OK;  //nothing to do
-        }
-        if (!$this->destructor_registered && $this->opened_persistent) {
-            $this->destructor_registered = true;
-            register_shutdown_function('MDB2_closeOpenTransactions');
-        }
-        $query = $this->start_transaction ? 'START TRANSACTION' : 'SET AUTOCOMMIT = 0';
-        $result =& $this->_doQuery($query, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $this->in_transaction = true;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commit the database changes done during a transaction that is in
-     * progress or release a savepoint. This function may only be called when
-     * auto-committing is disabled, otherwise it will fail. Therefore, a new
-     * transaction is implicitly started after committing the pending changes.
-     *
-     * @param   string  name of a savepoint to release
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function commit($savepoint = null)
-    {
-        $this->debug('Committing transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
-        if (!$this->in_transaction) {
-            return $this->raiseError(MDB2_ERROR_INVALID, null, null,
-                'commit/release savepoint cannot be done changes are auto committed', __FUNCTION__);
-        }
-        if (!is_null($savepoint)) {
-            if (!$this->supports('savepoints')) {
-                return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                    'savepoints are not supported', __FUNCTION__);
-            }
-            $server_info = $this->getServerVersion();
-            if (version_compare($server_info['major'].'.'.$server_info['minor'].'.'.$server_info['patch'], '5.0.3', '<')) {
-                return MDB2_OK;
-            }
-            $query = 'RELEASE SAVEPOINT '.$savepoint;
-            return $this->_doQuery($query, true);
-        }
-
-        if (!$this->supports('transactions')) {
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'transactions are not supported', __FUNCTION__);
-        }
-
-        $result =& $this->_doQuery('COMMIT', true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if (!$this->start_transaction) {
-            $query = 'SET AUTOCOMMIT = 1';
-            $result =& $this->_doQuery($query, true);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-        }
-        $this->in_transaction = false;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Cancel any database changes done during a transaction or since a specific
-     * savepoint that is in progress. This function may only be called when
-     * auto-committing is disabled, otherwise it will fail. Therefore, a new
-     * transaction is implicitly started after canceling the pending changes.
-     *
-     * @param   string  name of a savepoint to rollback to
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function rollback($savepoint = null)
-    {
-        $this->debug('Rolling back transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
-        if (!$this->in_transaction) {
-            return $this->raiseError(MDB2_ERROR_INVALID, null, null,
-                'rollback cannot be done changes are auto committed', __FUNCTION__);
-        }
-        if (!is_null($savepoint)) {
-            if (!$this->supports('savepoints')) {
-                return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                    'savepoints are not supported', __FUNCTION__);
-            }
-            $query = 'ROLLBACK TO SAVEPOINT '.$savepoint;
-            return $this->_doQuery($query, true);
-        }
-
-        $query = 'ROLLBACK';
-        $result =& $this->_doQuery($query, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if (!$this->start_transaction) {
-            $query = 'SET AUTOCOMMIT = 1';
-            $result =& $this->_doQuery($query, true);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-        }
-        $this->in_transaction = false;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function setTransactionIsolation()
-
-    /**
-     * Set the transacton isolation level.
-     *
-     * @param   string  standard isolation level
-     *                  READ UNCOMMITTED (allows dirty reads)
-     *                  READ COMMITTED (prevents dirty reads)
-     *                  REPEATABLE READ (prevents nonrepeatable reads)
-     *                  SERIALIZABLE (prevents phantom reads)
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     * @since   2.1.1
-     */
-    static function setTransactionIsolation($isolation, $options = array())
-    {
-        $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true));
-        if (!$this->supports('transactions')) {
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'transactions are not supported', __FUNCTION__);
-        }
-        switch ($isolation) {
-        case 'READ UNCOMMITTED':
-        case 'READ COMMITTED':
-        case 'REPEATABLE READ':
-        case 'SERIALIZABLE':
-            break;
-        default:
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'isolation level is not supported: '.$isolation, __FUNCTION__);
-        }
-
-        $query = "SET SESSION TRANSACTION ISOLATION LEVEL $isolation";
-        return $this->_doQuery($query, true);
-    }
-
-    // }}}
-    // {{{ _doConnect()
-
-    /**
-     * do the grunt work of the connect
-     *
-     * @return connection on success or MDB2 Error Object on failure
-     * @access protected
-     */
-    function _doConnect($username, $password, $persistent = false)
-    {
-        if (!PEAR::loadExtension($this->phptype)) {
-            return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'extension '.$this->phptype.' is not compiled into PHP', __FUNCTION__);
-        }
-
-        $params = array();
-        if ($this->dsn['protocol'] && $this->dsn['protocol'] == 'unix') {
-            $params[0] = ':' . $this->dsn['socket'];
-        } else {
-            $params[0] = $this->dsn['hostspec'] ? $this->dsn['hostspec']
-                         : 'localhost';
-            if ($this->dsn['port']) {
-                $params[0].= ':' . $this->dsn['port'];
-            }
-        }
-        $params[] = $username ? $username : null;
-        $params[] = $password ? $password : null;
-        if (!$persistent) {
-            if ($this->_isNewLinkSet()) {
-                $params[] = true;
-            } else {
-                $params[] = false;
-            }
-        }
-        if (version_compare(phpversion(), '4.3.0', '>=')) {
-            $params[] = isset($this->dsn['client_flags'])
-                ? $this->dsn['client_flags'] : null;
-        }
-        $connect_function = $persistent ? 'mysql_pconnect' : 'mysql_connect';
-
-        $connection = @call_user_func_array($connect_function, $params);
-        if (!$connection) {
-            if (($err = @mysql_error()) != '') {
-                return $this->raiseError(MDB2_ERROR_CONNECT_FAILED, null, null,
-                    $err, __FUNCTION__);
-            } else {
-                return $this->raiseError(MDB2_ERROR_CONNECT_FAILED, null, null,
-                    'unable to establish a connection', __FUNCTION__);
-            }
-        }
-
-        if (!empty($this->dsn['charset'])) {
-            $result = $this->setCharset($this->dsn['charset'], $connection);
-            if (PEAR::isError($result)) {
-                $this->disconnect(false);
-                return $result;
-            }
-        }
-
-        return $connection;
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database
-     *
-     * @return MDB2_OK on success, MDB2 Error Object on failure
-     * @access public
-     */
-    function connect()
-    {
-        if (is_resource($this->connection)) {
-            //if (count(array_diff($this->connected_dsn, $this->dsn)) == 0
-            if (MDB2::areEquals($this->connected_dsn, $this->dsn)
-                && $this->opened_persistent == $this->options['persistent']
-            ) {
-                return MDB2_OK;
-            }
-            $this->disconnect(false);
-        }
-
-        $connection = $this->_doConnect(
-            $this->dsn['username'],
-            $this->dsn['password'],
-            $this->options['persistent']
-        );
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-
-        $this->connection = $connection;
-        $this->connected_dsn = $this->dsn;
-        $this->connected_database_name = '';
-        $this->opened_persistent = $this->options['persistent'];
-        $this->dbsyntax = $this->dsn['dbsyntax'] ? $this->dsn['dbsyntax'] : $this->phptype;
-
-        if ($this->database_name) {
-            if ($this->database_name != $this->connected_database_name) {
-                if (!@mysql_select_db($this->database_name, $connection)) {
-                    $err = $this->raiseError(null, null, null,
-                        'Could not select the database: '.$this->database_name, __FUNCTION__);
-                    return $err;
-                }
-                $this->connected_database_name = $this->database_name;
-            }
-        }
-
-        $this->_getServerCapabilities();
-
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ setCharset()
-
-    /**
-     * Set the charset on the current connection
-     *
-     * @param string    charset (or array(charset, collation))
-     * @param resource  connection handle
-     *
-     * @return true on success, MDB2 Error Object on failure
-     */
-    function setCharset($charset, $connection = null)
-    {
-        if (is_null($connection)) {
-            $connection = $this->getConnection();
-            if (PEAR::isError($connection)) {
-                return $connection;
-            }
-        }
-        $collation = null;
-        if (is_array($charset) && 2 == count($charset)) {
-            $collation = array_pop($charset);
-            $charset   = array_pop($charset);
-        }
-        $client_info = mysql_get_client_info();
-        if (function_exists('mysql_set_charset') && version_compare($client_info, '5.0.6')) {
-            if (!$result = mysql_set_charset($charset, $connection)) {
-                $err =& $this->raiseError(null, null, null,
-                    'Could not set client character set', __FUNCTION__);
-                return $err;
-            }
-            return $result;
-        }
-        $query = "SET NAMES '".mysql_real_escape_string($charset, $connection)."'";
-        if (!is_null($collation)) {
-            $query .= " COLLATE '".mysqli_real_escape_string($connection, $collation)."'";
-        }
-        return $this->_doQuery($query, true, $connection);
-    }
-
-    // }}}
-    // {{{ databaseExists()
-
-    /**
-     * check if given database name is exists?
-     *
-     * @param string $name    name of the database that should be checked
-     *
-     * @return mixed true/false on success, a MDB2 error on failure
-     * @access public
-     */
-    function databaseExists($name)
-    {
-        $connection = $this->_doConnect($this->dsn['username'],
-                                        $this->dsn['password'],
-                                        $this->options['persistent']);
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-
-        $result = @mysql_select_db($name, $connection);
-        @mysql_close($connection);
-
-        return $result;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Log out and disconnect from the database.
-     *
-     * @param  boolean $force if the disconnect should be forced even if the
-     *                        connection is opened persistently
-     * @return mixed true on success, false if not connected and error
-     *                object on error
-     * @access public
-     */
-    function disconnect($force = true)
-    {
-        if (is_resource($this->connection)) {
-            if ($this->in_transaction) {
-                $dsn = $this->dsn;
-                $database_name = $this->database_name;
-                $persistent = $this->options['persistent'];
-                $this->dsn = $this->connected_dsn;
-                $this->database_name = $this->connected_database_name;
-                $this->options['persistent'] = $this->opened_persistent;
-                $this->rollback();
-                $this->dsn = $dsn;
-                $this->database_name = $database_name;
-                $this->options['persistent'] = $persistent;
-            }
-
-            if (!$this->opened_persistent || $force) {
-                $ok = @mysql_close($this->connection);
-                if (!$ok) {
-                    return $this->raiseError(MDB2_ERROR_DISCONNECT_FAILED,
-                           null, null, null, __FUNCTION__);
-                }
-            }
-        } else {
-            return false;
-        }
-        return parent::disconnect($force);
-    }
-
-    // }}}
-    // {{{ standaloneQuery()
-
-   /**
-     * execute a query as DBA
-     *
-     * @param string $query the SQL query
-     * @param mixed   $types  array that contains the types of the columns in
-     *                        the result set
-     * @param boolean $is_manip  if the query is a manipulation query
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function &standaloneQuery($query, $types = null, $is_manip = false)
-    {
-        $user = $this->options['DBA_username']? $this->options['DBA_username'] : $this->dsn['username'];
-        $pass = $this->options['DBA_password']? $this->options['DBA_password'] : $this->dsn['password'];
-        $connection = $this->_doConnect($user, $pass, $this->options['persistent']);
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-
-        $offset = $this->offset;
-        $limit = $this->limit;
-        $this->offset = $this->limit = 0;
-        $query = $this->_modifyQuery($query, $is_manip, $limit, $offset);
-        
-        $result =& $this->_doQuery($query, $is_manip, $connection, $this->database_name);
-        if (!PEAR::isError($result)) {
-            $result = $this->_affectedRows($connection, $result);
-        }
-
-        @mysql_close($connection);
-        return $result;
-    }
-
-    // }}}
-    // {{{ _doQuery()
-
-    /**
-     * Execute a query
-     * @param string $query  query
-     * @param boolean $is_manip  if the query is a manipulation query
-     * @param resource $connection
-     * @param string $database_name
-     * @return result or error object
-     * @access protected
-     */
-    function &_doQuery($query, $is_manip = false, $connection = null, $database_name = null)
-    {
-        $this->last_query = $query;
-        $result = $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'pre'));
-        if ($result) {
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-            $query = $result;
-        }
-        if ($this->options['disable_query']) {
-            $result = $is_manip ? 0 : null;
-            return $result;
-        }
-
-        if (is_null($connection)) {
-            $connection = $this->getConnection();
-            if (PEAR::isError($connection)) {
-                return $connection;
-            }
-        }
-        if (is_null($database_name)) {
-            $database_name = $this->database_name;
-        }
-
-        if ($database_name) {
-            if ($database_name != $this->connected_database_name) {
-                if (!@mysql_select_db($database_name, $connection)) {
-                    $err = $this->raiseError(null, null, null,
-                        'Could not select the database: '.$database_name, __FUNCTION__);
-                    return $err;
-                }
-                $this->connected_database_name = $database_name;
-            }
-        }
-
-        $function = $this->options['result_buffering']
-            ? 'mysql_query' : 'mysql_unbuffered_query';
-        $result = @$function($query, $connection);
-        if (!$result) {
-            $err =& $this->raiseError(null, null, null,
-                'Could not execute statement', __FUNCTION__);
-            return $err;
-        }
-
-        $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'post', 'result' => $result));
-        return $result;
-    }
-
-    // }}}
-    // {{{ _affectedRows()
-
-    /**
-     * Returns the number of rows affected
-     *
-     * @param resource $result
-     * @param resource $connection
-     * @return mixed MDB2 Error Object or the number of rows affected
-     * @access private
-     */
-    function _affectedRows($connection, $result = null)
-    {
-        if (is_null($connection)) {
-            $connection = $this->getConnection();
-            if (PEAR::isError($connection)) {
-                return $connection;
-            }
-        }
-        return @mysql_affected_rows($connection);
-    }
-
-    // }}}
-    // {{{ _modifyQuery()
-
-    /**
-     * Changes a query string for various DBMS specific reasons
-     *
-     * @param string $query  query to modify
-     * @param boolean $is_manip  if it is a DML query
-     * @param integer $limit  limit the number of rows
-     * @param integer $offset  start reading from given offset
-     * @return string modified query
-     * @access protected
-     */
-    function _modifyQuery($query, $is_manip, $limit, $offset)
-    {
-        if ($this->options['portability'] & MDB2_PORTABILITY_DELETE_COUNT) {
-            // "DELETE FROM table" gives 0 affected rows in MySQL.
-            // This little hack lets you know how many rows were deleted.
-            if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $query)) {
-                $query = preg_replace('/^\s*DELETE\s+FROM\s+(\S+)\s*$/',
-                                      'DELETE FROM \1 WHERE 1=1', $query);
-            }
-        }
-        if ($limit > 0
-            && !preg_match('/LIMIT\s*\d(?:\s*(?:,|OFFSET)\s*\d+)?(?:[^\)]*)?$/i', $query)
-        ) {
-            $query = rtrim($query);
-            if (substr($query, -1) == ';') {
-                $query = substr($query, 0, -1);
-            }
-
-            // LIMIT doesn't always come last in the query
-            // @see http://dev.mysql.com/doc/refman/5.0/en/select.html
-            $after = '';
-            if (preg_match('/(\s+INTO\s+(?:OUT|DUMP)FILE\s.*)$/ims', $query, $matches)) {
-                $after = $matches[0];
-                $query = preg_replace('/(\s+INTO\s+(?:OUT|DUMP)FILE\s.*)$/ims', '', $query);
-            } elseif (preg_match('/(\s+FOR\s+UPDATE\s*)$/i', $query, $matches)) {
-               $after = $matches[0];
-               $query = preg_replace('/(\s+FOR\s+UPDATE\s*)$/im', '', $query);
-            } elseif (preg_match('/(\s+LOCK\s+IN\s+SHARE\s+MODE\s*)$/im', $query, $matches)) {
-               $after = $matches[0];
-               $query = preg_replace('/(\s+LOCK\s+IN\s+SHARE\s+MODE\s*)$/im', '', $query);
-            }
-
-            if ($is_manip) {
-                return $query . " LIMIT $limit" . $after;
-            } else {
-                return $query . " LIMIT $offset, $limit" . $after;
-            }
-        }
-        return $query;
-    }
-
-    // }}}
-    // {{{ getServerVersion()
-
-    /**
-     * return version information about the server
-     *
-     * @param bool   $native  determines if the raw version string should be returned
-     * @return mixed array/string with version information or MDB2 error object
-     * @access public
-     */
-    function getServerVersion($native = false)
-    {
-        $connection = $this->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-        if ($this->connected_server_info) {
-            $server_info = $this->connected_server_info;
-        } else {
-            $server_info = @mysql_get_server_info($connection);
-        }
-        if (!$server_info) {
-            return $this->raiseError(null, null, null,
-                'Could not get server information', __FUNCTION__);
-        }
-        // cache server_info
-        $this->connected_server_info = $server_info;
-        if (!$native) {
-            $tmp = explode('.', $server_info, 3);
-            if (isset($tmp[2]) && strpos($tmp[2], '-')) {
-                $tmp2 = explode('-', @$tmp[2], 2);
-            } else {
-                $tmp2[0] = isset($tmp[2]) ? $tmp[2] : null;
-                $tmp2[1] = null;
-            }
-            $server_info = array(
-                'major' => isset($tmp[0]) ? $tmp[0] : null,
-                'minor' => isset($tmp[1]) ? $tmp[1] : null,
-                'patch' => $tmp2[0],
-                'extra' => $tmp2[1],
-                'native' => $server_info,
-            );
-        }
-        return $server_info;
-    }
-
-    // }}}
-    // {{{ _getServerCapabilities()
-
-    /**
-     * Fetch some information about the server capabilities
-     * (transactions, subselects, prepared statements, etc).
-     *
-     * @access private
-     */
-    function _getServerCapabilities()
-    {
-        if (!$this->server_capabilities_checked) {
-            $this->server_capabilities_checked = true;
-
-            //set defaults
-            $this->supported['sub_selects'] = 'emulated';
-            $this->supported['prepared_statements'] = 'emulated';
-            $this->supported['triggers'] = false;
-            $this->start_transaction = false;
-            $this->varchar_max_length = 255;
-            
-            $server_info = $this->getServerVersion();
-            if (is_array($server_info)) {
-                $server_version = $server_info['major'].'.'.$server_info['minor'].'.'.$server_info['patch'];
-
-                if (!version_compare($server_version, '4.1.0', '<')) {
-                    $this->supported['sub_selects'] = true;
-                    $this->supported['prepared_statements'] = true;
-                }
-
-                // SAVEPOINTs were introduced in MySQL 4.0.14 and 4.1.1 (InnoDB)
-                if (version_compare($server_version, '4.1.0', '>=')) {
-                    if (version_compare($server_version, '4.1.1', '<')) {
-                        $this->supported['savepoints'] = false;
-                    }
-                } elseif (version_compare($server_version, '4.0.14', '<')) {
-                    $this->supported['savepoints'] = false;
-                }
-
-                if (!version_compare($server_version, '4.0.11', '<')) {
-                    $this->start_transaction = true;
-                }
-
-                if (!version_compare($server_version, '5.0.3', '<')) {
-                    $this->varchar_max_length = 65532;
-                }
-
-                if (!version_compare($server_version, '5.0.2', '<')) {
-                    $this->supported['triggers'] = true;
-                }
-            }
-        }
-    }
-
-    // }}}
-    // {{{ function _skipUserDefinedVariable($query, $position)
-
-    /**
-     * Utility method, used by prepare() to avoid misinterpreting MySQL user 
-     * defined variables (SELECT @x:=5) for placeholders.
-     * Check if the placeholder is a false positive, i.e. if it is an user defined
-     * variable instead. If so, skip it and advance the position, otherwise
-     * return the current position, which is valid
-     *
-     * @param string $query
-     * @param integer $position current string cursor position
-     * @return integer $new_position
-     * @access protected
-     */
-    function _skipUserDefinedVariable($query, $position)
-    {
-        $found = strpos(strrev(substr($query, 0, $position)), '@');
-        if ($found === false) {
-            return $position;
-        }
-        $pos = strlen($query) - strlen(substr($query, $position)) - $found - 1;
-        $substring = substr($query, $pos, $position - $pos + 2);
-        if (preg_match('/^@\w+\s*:=$/', $substring)) {
-            return $position + 1; //found an user defined variable: skip it
-        }
-        return $position;
-    }
-
-    // }}}
-    // {{{ prepare()
-
-    /**
-     * Prepares a query for multiple execution with execute().
-     * With some database backends, this is emulated.
-     * prepare() requires a generic query as string like
-     * 'INSERT INTO numbers VALUES(?,?)' or
-     * 'INSERT INTO numbers VALUES(:foo,:bar)'.
-     * The ? and :name and are placeholders which can be set using
-     * bindParam() and the query can be sent off using the execute() method.
-     * The allowed format for :name can be set with the 'bindname_format' option.
-     *
-     * @param string $query the query to prepare
-     * @param mixed   $types  array that contains the types of the placeholders
-     * @param mixed   $result_types  array that contains the types of the columns in
-     *                        the result set or MDB2_PREPARE_RESULT, if set to
-     *                        MDB2_PREPARE_MANIP the query is handled as a manipulation query
-     * @param mixed   $lobs   key (field) value (parameter) pair for all lob placeholders
-     * @return mixed resource handle for the prepared query on success, a MDB2
-     *        error on failure
-     * @access public
-     * @see bindParam, execute
-     */
-    function &prepare($query, $types = null, $result_types = null, $lobs = array())
-    {
-        if ($this->options['emulate_prepared']
-            || $this->supported['prepared_statements'] !== true
-        ) {
-            $obj =& parent::prepare($query, $types, $result_types, $lobs);
-            return $obj;
-        }
-        $is_manip = ($result_types === MDB2_PREPARE_MANIP);
-        $offset = $this->offset;
-        $limit = $this->limit;
-        $this->offset = $this->limit = 0;
-        $query = $this->_modifyQuery($query, $is_manip, $limit, $offset);
-        $result = $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'pre'));
-        if ($result) {
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-            $query = $result;
-        }
-        $placeholder_type_guess = $placeholder_type = null;
-        $question = '?';
-        $colon = ':';
-        $positions = array();
-        $position = 0;
-        while ($position < strlen($query)) {
-            $q_position = strpos($query, $question, $position);
-            $c_position = strpos($query, $colon, $position);
-            if ($q_position && $c_position) {
-                $p_position = min($q_position, $c_position);
-            } elseif ($q_position) {
-                $p_position = $q_position;
-            } elseif ($c_position) {
-                $p_position = $c_position;
-            } else {
-                break;
-            }
-            if (is_null($placeholder_type)) {
-                $placeholder_type_guess = $query[$p_position];
-            }
-            
-            $new_pos = $this->_skipDelimitedStrings($query, $position, $p_position);
-            if (PEAR::isError($new_pos)) {
-                return $new_pos;
-            }
-            if ($new_pos != $position) {
-                $position = $new_pos;
-                continue; //evaluate again starting from the new position
-            }
-            
-            //make sure this is not part of an user defined variable
-            $new_pos = $this->_skipUserDefinedVariable($query, $position);
-            if ($new_pos != $position) {
-                $position = $new_pos;
-                continue; //evaluate again starting from the new position
-            }
-
-            if ($query[$position] == $placeholder_type_guess) {
-                if (is_null($placeholder_type)) {
-                    $placeholder_type = $query[$p_position];
-                    $question = $colon = $placeholder_type;
-                }
-                if ($placeholder_type == ':') {
-                    $regexp = '/^.{'.($position+1).'}('.$this->options['bindname_format'].').*$/s';
-                    $parameter = preg_replace($regexp, '\\1', $query);
-                    if ($parameter === '') {
-                        $err =& $this->raiseError(MDB2_ERROR_SYNTAX, null, null,
-                            'named parameter name must match "bindname_format" option', __FUNCTION__);
-                        return $err;
-                    }
-                    $positions[$p_position] = $parameter;
-                    $query = substr_replace($query, '?', $position, strlen($parameter)+1);
-                } else {
-                    $positions[$p_position] = count($positions);
-                }
-                $position = $p_position + 1;
-            } else {
-                $position = $p_position;
-            }
-        }
-        $connection = $this->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-        static $prep_statement_counter = 1;
-        $statement_name = sprintf($this->options['statement_format'], $this->phptype, $prep_statement_counter++ . sha1(microtime() + mt_rand()));
-        $statement_name = substr(strtolower($statement_name), 0, $this->options['max_identifiers_length']);
-        $query = "PREPARE $statement_name FROM ".$this->quote($query, 'text');
-        $statement =& $this->_doQuery($query, true, $connection);
-        if (PEAR::isError($statement)) {
-            return $statement;
-        }
-
-        $class_name = 'MDB2_Statement_'.$this->phptype;
-        $obj = new $class_name($this, $statement_name, $positions, $query, $types, $result_types, $is_manip, $limit, $offset);
-        $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'post', 'result' => $obj));
-        return $obj;
-    }
-
-    // }}}
-    // {{{ replace()
-
-    /**
-     * Execute a SQL REPLACE query. A REPLACE query is identical to a INSERT
-     * query, except that if there is already a row in the table with the same
-     * key field values, the old row is deleted before the new row is inserted.
-     *
-     * The REPLACE type of query does not make part of the SQL standards. Since
-     * practically only MySQL implements it natively, this type of query is
-     * emulated through this method for other DBMS using standard types of
-     * queries inside a transaction to assure the atomicity of the operation.
-     *
-     * @access public
-     *
-     * @param string $table name of the table on which the REPLACE query will
-     *  be executed.
-     * @param array $fields associative array that describes the fields and the
-     *  values that will be inserted or updated in the specified table. The
-     *  indexes of the array are the names of all the fields of the table. The
-     *  values of the array are also associative arrays that describe the
-     *  values and other properties of the table fields.
-     *
-     *  Here follows a list of field properties that need to be specified:
-     *
-     *    value:
-     *          Value to be assigned to the specified field. This value may be
-     *          of specified in database independent type format as this
-     *          function can perform the necessary datatype conversions.
-     *
-     *    Default:
-     *          this property is required unless the Null property
-     *          is set to 1.
-     *
-     *    type
-     *          Name of the type of the field. Currently, all types Metabase
-     *          are supported except for clob and blob.
-     *
-     *    Default: no type conversion
-     *
-     *    null
-     *          Boolean property that indicates that the value for this field
-     *          should be set to null.
-     *
-     *          The default value for fields missing in INSERT queries may be
-     *          specified the definition of a table. Often, the default value
-     *          is already null, but since the REPLACE may be emulated using
-     *          an UPDATE query, make sure that all fields of the table are
-     *          listed in this function argument array.
-     *
-     *    Default: 0
-     *
-     *    key
-     *          Boolean property that indicates that this field should be
-     *          handled as a primary key or at least as part of the compound
-     *          unique index of the table that will determine the row that will
-     *          updated if it exists or inserted a new row otherwise.
-     *
-     *          This function will fail if no key field is specified or if the
-     *          value of a key field is set to null because fields that are
-     *          part of unique index they may not be null.
-     *
-     *    Default: 0
-     *
-     * @see http://dev.mysql.com/doc/refman/5.0/en/replace.html
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     */
-    function replace($table, $fields)
-    {
-        $count = count($fields);
-        $query = $values = '';
-        $keys = $colnum = 0;
-        for (reset($fields); $colnum < $count; next($fields), $colnum++) {
-            $name = key($fields);
-            if ($colnum > 0) {
-                $query .= ',';
-                $values.= ',';
-            }
-            $query.= $this->quoteIdentifier($name, true);
-            if (isset($fields[$name]['null']) && $fields[$name]['null']) {
-                $value = 'NULL';
-            } else {
-                $type = isset($fields[$name]['type']) ? $fields[$name]['type'] : null;
-                $value = $this->quote($fields[$name]['value'], $type);
-                if (PEAR::isError($value)) {
-                    return $value;
-                }
-            }
-            $values.= $value;
-            if (isset($fields[$name]['key']) && $fields[$name]['key']) {
-                if ($value === 'NULL') {
-                    return $this->raiseError(MDB2_ERROR_CANNOT_REPLACE, null, null,
-                        'key value '.$name.' may not be NULL', __FUNCTION__);
-                }
-                $keys++;
-            }
-        }
-        if ($keys == 0) {
-            return $this->raiseError(MDB2_ERROR_CANNOT_REPLACE, null, null,
-                'not specified which fields are keys', __FUNCTION__);
-        }
-
-        $connection = $this->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-
-        $table = $this->quoteIdentifier($table, true);
-        $query = "REPLACE INTO $table ($query) VALUES ($values)";
-        $result =& $this->_doQuery($query, true, $connection);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        return $this->_affectedRows($connection, $result);
-    }
-
-    // }}}
-    // {{{ nextID()
-
-    /**
-     * Returns the next free id of a sequence
-     *
-     * @param string $seq_name name of the sequence
-     * @param boolean $ondemand when true the sequence is
-     *                          automatic created, if it
-     *                          not exists
-     *
-     * @return mixed MDB2 Error Object or id
-     * @access public
-     */
-    function nextID($seq_name, $ondemand = true)
-    {
-        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq_name), true);
-        $seqcol_name = $this->quoteIdentifier($this->options['seqcol_name'], true);
-        $query = "INSERT INTO $sequence_name ($seqcol_name) VALUES (NULL)";
-        $this->pushErrorHandling(PEAR_ERROR_RETURN);
-        $this->expectError(MDB2_ERROR_NOSUCHTABLE);
-        $result =& $this->_doQuery($query, true);
-        $this->popExpect();
-        $this->popErrorHandling();
-        if (PEAR::isError($result)) {
-            if ($ondemand && $result->getCode() == MDB2_ERROR_NOSUCHTABLE) {
-                $this->loadModule('Manager', null, true);
-                $result = $this->manager->createSequence($seq_name);
-                if (PEAR::isError($result)) {
-                    return $this->raiseError($result, null, null,
-                        'on demand sequence '.$seq_name.' could not be created', __FUNCTION__);
-                } else {
-                    return $this->nextID($seq_name, false);
-                }
-            }
-            return $result;
-        }
-        $value = $this->lastInsertID();
-        if (is_numeric($value)) {
-            $query = "DELETE FROM $sequence_name WHERE $seqcol_name < $value";
-            $result =& $this->_doQuery($query, true);
-            if (PEAR::isError($result)) {
-                $this->warnings[] = 'nextID: could not delete previous sequence table values from '.$seq_name;
-            }
-        }
-        return $value;
-    }
-
-    // }}}
-    // {{{ lastInsertID()
-
-    /**
-     * Returns the autoincrement ID if supported or $id or fetches the current
-     * ID in a sequence called: $table.(empty($field) ? '' : '_'.$field)
-     *
-     * @param string $table name of the table into which a new row was inserted
-     * @param string $field name of the field into which a new row was inserted
-     * @return mixed MDB2 Error Object or id
-     * @access public
-     */
-    function lastInsertID($table = null, $field = null)
-    {
-        // not using mysql_insert_id() due to http://pear.php.net/bugs/bug.php?id=8051
-        return $this->queryOne('SELECT LAST_INSERT_ID()', 'integer');
-    }
-
-    // }}}
-    // {{{ currID()
-
-    /**
-     * Returns the current id of a sequence
-     *
-     * @param string $seq_name name of the sequence
-     * @return mixed MDB2 Error Object or id
-     * @access public
-     */
-    function currID($seq_name)
-    {
-        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq_name), true);
-        $seqcol_name = $this->quoteIdentifier($this->options['seqcol_name'], true);
-        $query = "SELECT MAX($seqcol_name) FROM $sequence_name";
-        return $this->queryOne($query, 'integer');
-    }
-}
-
-/**
- * MDB2 MySQL result driver
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Result_mysql extends MDB2_Result_Common
-{
-    // }}}
-    // {{{ fetchRow()
-
-    /**
-     * Fetch a row and insert the data into an existing array.
-     *
-     * @param int       $fetchmode  how the array data should be indexed
-     * @param int    $rownum    number of the row where the data can be found
-     * @return int data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function &fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
-    {
-        if (!is_null($rownum)) {
-            $seek = $this->seek($rownum);
-            if (PEAR::isError($seek)) {
-                return $seek;
-            }
-        }
-        if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
-            $fetchmode = $this->db->fetchmode;
-        }
-        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
-            $row = @mysql_fetch_assoc($this->result);
-            if (is_array($row)
-                && $this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
-            ) {
-                $row = array_change_key_case($row, $this->db->options['field_case']);
-            }
-        } else {
-           $row = @mysql_fetch_row($this->result);
-        }
-
-        if (!$row) {
-            if ($this->result === false) {
-                $err =& $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                    'resultset has already been freed', __FUNCTION__);
-                return $err;
-            }
-            $null = null;
-            return $null;
-        }
-        $mode = $this->db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL;
-        $rtrim = false;
-        if ($this->db->options['portability'] & MDB2_PORTABILITY_RTRIM) {
-            if (empty($this->types)) {
-                $mode += MDB2_PORTABILITY_RTRIM;
-            } else {
-                $rtrim = true;
-            }
-        }
-        if ($mode) {
-            $this->db->_fixResultArrayValues($row, $mode);
-        }
-        if (!empty($this->types)) {
-            $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
-        }
-        if (!empty($this->values)) {
-            $this->_assignBindColumns($row);
-        }
-        if ($fetchmode === MDB2_FETCHMODE_OBJECT) {
-            $object_class = $this->db->options['fetch_class'];
-            if ($object_class == 'stdClass') {
-                $row = (object) $row;
-            } else {
-                $row = new $object_class($row);
-            }
-        }
-        ++$this->rownum;
-        return $row;
-    }
-
-    // }}}
-    // {{{ _getColumnNames()
-
-    /**
-     * Retrieve the names of columns returned by the DBMS in a query result.
-     *
-     * @return  mixed   Array variable that holds the names of columns as keys
-     *                  or an MDB2 error on failure.
-     *                  Some DBMS may not return any columns when the result set
-     *                  does not contain any rows.
-     * @access private
-     */
-    function _getColumnNames()
-    {
-        $columns = array();
-        $numcols = $this->numCols();
-        if (PEAR::isError($numcols)) {
-            return $numcols;
-        }
-        for ($column = 0; $column < $numcols; $column++) {
-            $column_name = @mysql_field_name($this->result, $column);
-            $columns[$column_name] = $column;
-        }
-        if ($this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $columns = array_change_key_case($columns, $this->db->options['field_case']);
-        }
-        return $columns;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Count the number of columns returned by the DBMS in a query result.
-     *
-     * @return mixed integer value with the number of columns, a MDB2 error
-     *                       on failure
-     * @access public
-     */
-    function numCols()
-    {
-        $cols = @mysql_num_fields($this->result);
-        if (is_null($cols)) {
-            if ($this->result === false) {
-                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                    'resultset has already been freed', __FUNCTION__);
-            } elseif (is_null($this->result)) {
-                return count($this->types);
-            }
-            return $this->db->raiseError(null, null, null,
-                'Could not get column count', __FUNCTION__);
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ free()
-
-    /**
-     * Free the internal resources associated with result.
-     *
-     * @return boolean true on success, false if result is invalid
-     * @access public
-     */
-    function free()
-    {
-        if (is_resource($this->result) && $this->db->connection) {
-            $free = @mysql_free_result($this->result);
-            if ($free === false) {
-                return $this->db->raiseError(null, null, null,
-                    'Could not free result', __FUNCTION__);
-            }
-        }
-        $this->result = false;
-        return MDB2_OK;
-    }
-}
-
-/**
- * MDB2 MySQL buffered result driver
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_BufferedResult_mysql extends MDB2_Result_mysql
-{
-    // }}}
-    // {{{ seek()
-
-    /**
-     * Seek to a specific row in a result set
-     *
-     * @param int    $rownum    number of the row where the data can be found
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function seek($rownum = 0)
-    {
-        if ($this->rownum != ($rownum - 1) && !@mysql_data_seek($this->result, $rownum)) {
-            if ($this->result === false) {
-                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                    'resultset has already been freed', __FUNCTION__);
-            } elseif (is_null($this->result)) {
-                return MDB2_OK;
-            }
-            return $this->db->raiseError(MDB2_ERROR_INVALID, null, null,
-                'tried to seek to an invalid row number ('.$rownum.')', __FUNCTION__);
-        }
-        $this->rownum = $rownum - 1;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ valid()
-
-    /**
-     * Check if the end of the result set has been reached
-     *
-     * @return mixed true or false on sucess, a MDB2 error on failure
-     * @access public
-     */
-    function valid()
-    {
-        $numrows = $this->numRows();
-        if (PEAR::isError($numrows)) {
-            return $numrows;
-        }
-        return $this->rownum < ($numrows - 1);
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Returns the number of rows in a result object
-     *
-     * @return mixed MDB2 Error Object or the number of rows
-     * @access public
-     */
-    function numRows()
-    {
-        $rows = @mysql_num_rows($this->result);
-        if (false === $rows) {
-            if (false === $this->result) {
-                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                    'resultset has already been freed', __FUNCTION__);
-            } elseif (is_null($this->result)) {
-                return 0;
-            }
-            return $this->db->raiseError(null, null, null,
-                'Could not get row count', __FUNCTION__);
-        }
-        return $rows;
-    }
-}
-
-/**
- * MDB2 MySQL statement driver
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Statement_mysql extends MDB2_Statement_Common
-{
-    // {{{ _execute()
-
-    /**
-     * Execute a prepared query statement helper method.
-     *
-     * @param mixed $result_class string which specifies which result class to use
-     * @param mixed $result_wrap_class string which specifies which class to wrap results in
-     *
-     * @return mixed MDB2_Result or integer (affected rows) on success,
-     *               a MDB2 error on failure
-     * @access private
-     */
-    function &_execute($result_class = true, $result_wrap_class = false)
-    {
-        if (is_null($this->statement)) {
-            $result =& parent::_execute($result_class, $result_wrap_class);
-            return $result;
-        }
-        $this->db->last_query = $this->query;
-        $this->db->debug($this->query, 'execute', array('is_manip' => $this->is_manip, 'when' => 'pre', 'parameters' => $this->values));
-        if ($this->db->getOption('disable_query')) {
-            $result = $this->is_manip ? 0 : null;
-            return $result;
-        }
-
-        $connection = $this->db->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-
-        $query = 'EXECUTE '.$this->statement;
-        if (!empty($this->positions)) {
-            $parameters = array();
-            foreach ($this->positions as $parameter) {
-                if (!array_key_exists($parameter, $this->values)) {
-                    return $this->db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                        'Unable to bind to missing placeholder: '.$parameter, __FUNCTION__);
-                }
-                $value = $this->values[$parameter];
-                $type = array_key_exists($parameter, $this->types) ? $this->types[$parameter] : null;
-                if (is_resource($value) || $type == 'clob' || $type == 'blob' && $this->db->options['lob_allow_url_include']) {
-                    if (!is_resource($value) && preg_match('/^(\w+:\/\/)(.*)$/', $value, $match)) {
-                        if ($match[1] == 'file://') {
-                            $value = $match[2];
-                        }
-                        $value = @fopen($value, 'r');
-                        $close = true;
-                    }
-                    if (is_resource($value)) {
-                        $data = '';
-                        while (!@feof($value)) {
-                            $data.= @fread($value, $this->db->options['lob_buffer_length']);
-                        }
-                        if ($close) {
-                            @fclose($value);
-                        }
-                        $value = $data;
-                    }
-                }
-                $quoted = $this->db->quote($value, $type);
-                if (PEAR::isError($quoted)) {
-                    return $quoted;
-                }
-                $param_query = 'SET @'.$parameter.' = '.$quoted;
-                $result = $this->db->_doQuery($param_query, true, $connection);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
-            $query.= ' USING @'.implode(', @', array_values($this->positions));
-        }
-
-        $result = $this->db->_doQuery($query, $this->is_manip, $connection);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        if ($this->is_manip) {
-            $affected_rows = $this->db->_affectedRows($connection, $result);
-            return $affected_rows;
-        }
-
-        $result =& $this->db->_wrapResult($result, $this->result_types,
-            $result_class, $result_wrap_class, $this->limit, $this->offset);
-        $this->db->debug($this->query, 'execute', array('is_manip' => $this->is_manip, 'when' => 'post', 'result' => $result));
-        return $result;
-    }
-
-    // }}}
-    // {{{ free()
-
-    /**
-     * Release resources allocated for the specified prepared query.
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function free()
-    {
-        if (is_null($this->positions)) {
-            return $this->db->raiseError(MDB2_ERROR, null, null,
-                'Prepared statement has already been freed', __FUNCTION__);
-        }
-        $result = MDB2_OK;
-
-        if (!is_null($this->statement)) {
-            $connection = $this->db->getConnection();
-            if (PEAR::isError($connection)) {
-                return $connection;
-            }
-            $query = 'DEALLOCATE PREPARE '.$this->statement;
-            $result = $this->db->_doQuery($query, true, $connection);
-        }
-
-        parent::free();
-        return $result;
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/pgsql.php b/3rdparty/MDB2/Driver/pgsql.php
deleted file mode 100644
index 13fea690680..00000000000
--- a/3rdparty/MDB2/Driver/pgsql.php
+++ /dev/null
@@ -1,1519 +0,0 @@
-<?php
-// vim: set et ts=4 sw=4 fdm=marker:
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Paul Cooper <pgc@ucecom.com>                                 |
-// +----------------------------------------------------------------------+
-//
-// $Id: pgsql.php,v 1.203 2008/11/29 14:04:46 afz Exp $
-
-/**
- * MDB2 PostGreSQL driver
- *
- * @package MDB2
- * @category Database
- * @author  Paul Cooper <pgc@ucecom.com>
- */
-class MDB2_Driver_pgsql extends MDB2_Driver_Common
-{
-    // {{{ properties
-    var $string_quoting = array('start' => "'", 'end' => "'", 'escape' => "'", 'escape_pattern' => '\\');
-
-    var $identifier_quoting = array('start' => '"', 'end' => '"', 'escape' => '"');
-    // }}}
-    // {{{ constructor
-
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
-        parent::__construct();
-
-        $this->phptype = 'pgsql';
-        $this->dbsyntax = 'pgsql';
-
-        $this->supported['sequences'] = true;
-        $this->supported['indexes'] = true;
-        $this->supported['affected_rows'] = true;
-        $this->supported['summary_functions'] = true;
-        $this->supported['order_by_text'] = true;
-        $this->supported['transactions'] = true;
-        $this->supported['savepoints'] = true;
-        $this->supported['current_id'] = true;
-        $this->supported['limit_queries'] = true;
-        $this->supported['LOBs'] = true;
-        $this->supported['replace'] = 'emulated';
-        $this->supported['sub_selects'] = true;
-        $this->supported['triggers'] = true;
-        $this->supported['auto_increment'] = 'emulated';
-        $this->supported['primary_key'] = true;
-        $this->supported['result_introspection'] = true;
-        $this->supported['prepared_statements'] = true;
-        $this->supported['identifier_quoting'] = true;
-        $this->supported['pattern_escaping'] = true;
-        $this->supported['new_link'] = true;
-
-        $this->options['DBA_username'] = false;
-        $this->options['DBA_password'] = false;
-        $this->options['multi_query'] = false;
-        $this->options['disable_smart_seqname'] = true;
-        $this->options['max_identifiers_length'] = 63;
-    }
-
-    // }}}
-    // {{{ errorInfo()
-
-    /**
-     * This method is used to collect information about an error
-     *
-     * @param integer $error
-     * @return array
-     * @access public
-     */
-    function errorInfo($error = null)
-    {
-        // Fall back to MDB2_ERROR if there was no mapping.
-        $error_code = MDB2_ERROR;
-
-        $native_msg = '';
-        if (is_resource($error)) {
-            $native_msg = @pg_result_error($error);
-        } elseif ($this->connection) {
-            $native_msg = @pg_last_error($this->connection);
-            if (!$native_msg && @pg_connection_status($this->connection) === PGSQL_CONNECTION_BAD) {
-                $native_msg = 'Database connection has been lost.';
-                $error_code = MDB2_ERROR_CONNECT_FAILED;
-            }
-        } else {
-            $native_msg = @pg_last_error();
-        }
-
-        static $error_regexps;
-        if (empty($error_regexps)) {
-            $error_regexps = array(
-                '/column .* (of relation .*)?does not exist/i'
-                    => MDB2_ERROR_NOSUCHFIELD,
-                '/(relation|sequence|table).*does not exist|class .* not found/i'
-                    => MDB2_ERROR_NOSUCHTABLE,
-                '/database .* does not exist/'
-                    => MDB2_ERROR_NOT_FOUND,
-                '/constraint .* does not exist/'
-                    => MDB2_ERROR_NOT_FOUND,
-                '/index .* does not exist/'
-                    => MDB2_ERROR_NOT_FOUND,
-                '/database .* already exists/i'
-                    => MDB2_ERROR_ALREADY_EXISTS,
-                '/relation .* already exists/i'
-                    => MDB2_ERROR_ALREADY_EXISTS,
-                '/(divide|division) by zero$/i'
-                    => MDB2_ERROR_DIVZERO,
-                '/pg_atoi: error in .*: can\'t parse /i'
-                    => MDB2_ERROR_INVALID_NUMBER,
-                '/invalid input syntax for( type)? (integer|numeric)/i'
-                    => MDB2_ERROR_INVALID_NUMBER,
-                '/value .* is out of range for type \w*int/i'
-                    => MDB2_ERROR_INVALID_NUMBER,
-                '/integer out of range/i'
-                    => MDB2_ERROR_INVALID_NUMBER,
-                '/value too long for type character/i'
-                    => MDB2_ERROR_INVALID,
-                '/attribute .* not found|relation .* does not have attribute/i'
-                    => MDB2_ERROR_NOSUCHFIELD,
-                '/column .* specified in USING clause does not exist in (left|right) table/i'
-                    => MDB2_ERROR_NOSUCHFIELD,
-                '/parser: parse error at or near/i'
-                    => MDB2_ERROR_SYNTAX,
-                '/syntax error at/'
-                    => MDB2_ERROR_SYNTAX,
-                '/column reference .* is ambiguous/i'
-                    => MDB2_ERROR_SYNTAX,
-                '/permission denied/'
-                    => MDB2_ERROR_ACCESS_VIOLATION,
-                '/violates not-null constraint/'
-                    => MDB2_ERROR_CONSTRAINT_NOT_NULL,
-                '/violates [\w ]+ constraint/'
-                    => MDB2_ERROR_CONSTRAINT,
-                '/referential integrity violation/'
-                    => MDB2_ERROR_CONSTRAINT,
-                '/more expressions than target columns/i'
-                    => MDB2_ERROR_VALUE_COUNT_ON_ROW,
-            );
-        }
-        if (is_numeric($error) && $error < 0) {
-            $error_code = $error;
-        } else {
-            foreach ($error_regexps as $regexp => $code) {
-                if (preg_match($regexp, $native_msg)) {
-                    $error_code = $code;
-                    break;
-                }
-            }
-        }
-        return array($error_code, null, $native_msg);
-    }
-
-    // }}}
-    // {{{ escape()
-
-    /**
-     * Quotes a string so it can be safely used in a query. It will quote
-     * the text so it can safely be used within a query.
-     *
-     * @param   string  the input string to quote
-     * @param   bool    escape wildcards
-     *
-     * @return  string  quoted string
-     *
-     * @access  public
-     */
-    function escape($text, $escape_wildcards = false)
-    {
-        if ($escape_wildcards) {
-            $text = $this->escapePattern($text);
-        }
-        $connection = $this->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-        if (is_resource($connection) && version_compare(PHP_VERSION, '5.2.0RC5', '>=')) {
-            $text = @pg_escape_string($connection, $text);
-        } else {
-            $text = @pg_escape_string($text);
-        }
-        return $text;
-    }
-
-    // }}}
-    // {{{ beginTransaction()
-
-    /**
-     * Start a transaction or set a savepoint.
-     *
-     * @param   string  name of a savepoint to set
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function beginTransaction($savepoint = null)
-    {
-        $this->debug('Starting transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
-        if (!is_null($savepoint)) {
-            if (!$this->in_transaction) {
-                return $this->raiseError(MDB2_ERROR_INVALID, null, null,
-                    'savepoint cannot be released when changes are auto committed', __FUNCTION__);
-            }
-            $query = 'SAVEPOINT '.$savepoint;
-            return $this->_doQuery($query, true);
-        } elseif ($this->in_transaction) {
-            return MDB2_OK;  //nothing to do
-        }
-        if (!$this->destructor_registered && $this->opened_persistent) {
-            $this->destructor_registered = true;
-            register_shutdown_function('MDB2_closeOpenTransactions');
-        }
-        $result =& $this->_doQuery('BEGIN', true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $this->in_transaction = true;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commit the database changes done during a transaction that is in
-     * progress or release a savepoint. This function may only be called when
-     * auto-committing is disabled, otherwise it will fail. Therefore, a new
-     * transaction is implicitly started after committing the pending changes.
-     *
-     * @param   string  name of a savepoint to release
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function commit($savepoint = null)
-    {
-        $this->debug('Committing transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
-        if (!$this->in_transaction) {
-            return $this->raiseError(MDB2_ERROR_INVALID, null, null,
-                'commit/release savepoint cannot be done changes are auto committed', __FUNCTION__);
-        }
-        if (!is_null($savepoint)) {
-            $query = 'RELEASE SAVEPOINT '.$savepoint;
-            return $this->_doQuery($query, true);
-        }
-
-        $result =& $this->_doQuery('COMMIT', true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $this->in_transaction = false;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Cancel any database changes done during a transaction or since a specific
-     * savepoint that is in progress. This function may only be called when
-     * auto-committing is disabled, otherwise it will fail. Therefore, a new
-     * transaction is implicitly started after canceling the pending changes.
-     *
-     * @param   string  name of a savepoint to rollback to
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function rollback($savepoint = null)
-    {
-        $this->debug('Rolling back transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
-        if (!$this->in_transaction) {
-            return $this->raiseError(MDB2_ERROR_INVALID, null, null,
-                'rollback cannot be done changes are auto committed', __FUNCTION__);
-        }
-        if (!is_null($savepoint)) {
-            $query = 'ROLLBACK TO SAVEPOINT '.$savepoint;
-            return $this->_doQuery($query, true);
-        }
-
-        $query = 'ROLLBACK';
-        $result =& $this->_doQuery($query, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $this->in_transaction = false;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function setTransactionIsolation()
-
-    /**
-     * Set the transacton isolation level.
-     *
-     * @param   string  standard isolation level
-     *                  READ UNCOMMITTED (allows dirty reads)
-     *                  READ COMMITTED (prevents dirty reads)
-     *                  REPEATABLE READ (prevents nonrepeatable reads)
-     *                  SERIALIZABLE (prevents phantom reads)
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     * @since   2.1.1
-     */
-    static function setTransactionIsolation($isolation, $options = array())
-    {
-        $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true));
-        switch ($isolation) {
-        case 'READ UNCOMMITTED':
-        case 'READ COMMITTED':
-        case 'REPEATABLE READ':
-        case 'SERIALIZABLE':
-            break;
-        default:
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'isolation level is not supported: '.$isolation, __FUNCTION__);
-        }
-
-        $query = "SET SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL $isolation";
-        return $this->_doQuery($query, true);
-    }
-
-    // }}}
-    // {{{ _doConnect()
-
-    /**
-     * Do the grunt work of connecting to the database
-     *
-     * @return mixed connection resource on success, MDB2 Error Object on failure
-     * @access protected
-     */
-    function _doConnect($username, $password, $database_name, $persistent = false)
-    {
-        if (!PEAR::loadExtension($this->phptype)) {
-            return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'extension '.$this->phptype.' is not compiled into PHP', __FUNCTION__);
-        }
-        
-        if ($database_name == '') {
-            $database_name = 'template1';
-        }
-
-        $protocol = $this->dsn['protocol'] ? $this->dsn['protocol'] : 'tcp';
-
-        $params = array('');
-        if ($protocol == 'tcp') {
-            if ($this->dsn['hostspec']) {
-                $params[0].= 'host=' . $this->dsn['hostspec'];
-            }
-            if ($this->dsn['port']) {
-                $params[0].= ' port=' . $this->dsn['port'];
-            }
-        } elseif ($protocol == 'unix') {
-            // Allow for pg socket in non-standard locations.
-            if ($this->dsn['socket']) {
-                $params[0].= 'host=' . $this->dsn['socket'];
-            }
-            if ($this->dsn['port']) {
-                $params[0].= ' port=' . $this->dsn['port'];
-            }
-        }
-        if ($database_name) {
-            $params[0].= ' dbname=\'' . addslashes($database_name) . '\'';
-        }
-        if ($username) {
-            $params[0].= ' user=\'' . addslashes($username) . '\'';
-        }
-        if ($password) {
-            $params[0].= ' password=\'' . addslashes($password) . '\'';
-        }
-        if (!empty($this->dsn['options'])) {
-            $params[0].= ' options=' . $this->dsn['options'];
-        }
-        if (!empty($this->dsn['tty'])) {
-            $params[0].= ' tty=' . $this->dsn['tty'];
-        }
-        if (!empty($this->dsn['connect_timeout'])) {
-            $params[0].= ' connect_timeout=' . $this->dsn['connect_timeout'];
-        }
-        if (!empty($this->dsn['sslmode'])) {
-            $params[0].= ' sslmode=' . $this->dsn['sslmode'];
-        }
-        if (!empty($this->dsn['service'])) {
-            $params[0].= ' service=' . $this->dsn['service'];
-        }
-
-        if ($this->_isNewLinkSet()) {
-            if (version_compare(phpversion(), '4.3.0', '>=')) {
-                $params[] = PGSQL_CONNECT_FORCE_NEW;
-            }
-        }
-
-        $connect_function = $persistent ? 'pg_pconnect' : 'pg_connect';
-        $connection = @call_user_func_array($connect_function, $params);
-        if (!$connection) {
-            return $this->raiseError(MDB2_ERROR_CONNECT_FAILED, null, null,
-                'unable to establish a connection', __FUNCTION__);
-        }
-
-       if (empty($this->dsn['disable_iso_date'])) {
-            if (!@pg_query($connection, "SET SESSION DATESTYLE = 'ISO'")) {
-                return $this->raiseError(null, null, null,
-                    'Unable to set date style to iso', __FUNCTION__);
-            }
-       }
-
-        if (!empty($this->dsn['charset'])) {
-            $result = $this->setCharset($this->dsn['charset'], $connection);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-        }
-
-        return $connection;
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database
-     *
-     * @return true on success, MDB2 Error Object on failure
-     * @access public
-     */
-    function connect()
-    {
-        if (is_resource($this->connection)) {
-            //if (count(array_diff($this->connected_dsn, $this->dsn)) == 0
-            if (MDB2::areEquals($this->connected_dsn, $this->dsn)
-                && $this->connected_database_name == $this->database_name
-                && ($this->opened_persistent == $this->options['persistent'])
-            ) {
-                return MDB2_OK;
-            }
-            $this->disconnect(false);
-        }
-
-        if ($this->database_name) {
-            $connection = $this->_doConnect($this->dsn['username'],
-                                            $this->dsn['password'],
-                                            $this->database_name,
-                                            $this->options['persistent']);
-            if (PEAR::isError($connection)) {
-                return $connection;
-            }
-
-            $this->connection = $connection;
-            $this->connected_dsn = $this->dsn;
-            $this->connected_database_name = $this->database_name;
-            $this->opened_persistent = $this->options['persistent'];
-            $this->dbsyntax = $this->dsn['dbsyntax'] ? $this->dsn['dbsyntax'] : $this->phptype;
-        }
-
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ setCharset()
-
-    /**
-     * Set the charset on the current connection
-     *
-     * @param string    charset
-     * @param resource  connection handle
-     *
-     * @return true on success, MDB2 Error Object on failure
-     */
-    function setCharset($charset, $connection = null)
-    {
-        if (is_null($connection)) {
-            $connection = $this->getConnection();
-            if (PEAR::isError($connection)) {
-                return $connection;
-            }
-        }
-        if (is_array($charset)) {
-            $charset   = array_shift($charset);
-            $this->warnings[] = 'postgresql does not support setting client collation';
-        }
-        $result = @pg_set_client_encoding($connection, $charset);
-        if ($result == -1) {
-            return $this->raiseError(null, null, null,
-                'Unable to set client charset: '.$charset, __FUNCTION__);
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ databaseExists()
-
-    /**
-     * check if given database name is exists?
-     *
-     * @param string $name    name of the database that should be checked
-     *
-     * @return mixed true/false on success, a MDB2 error on failure
-     * @access public
-     */
-    function databaseExists($name)
-    {
-        $res = $this->_doConnect($this->dsn['username'],
-                                 $this->dsn['password'],
-                                 $this->escape($name),
-                                 $this->options['persistent']);
-        if (!PEAR::isError($res)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Log out and disconnect from the database.
-     *
-     * @param  boolean $force if the disconnect should be forced even if the
-     *                        connection is opened persistently
-     * @return mixed true on success, false if not connected and error
-     *                object on error
-     * @access public
-     */
-    function disconnect($force = true)
-    {
-        if (is_resource($this->connection)) {
-            if ($this->in_transaction) {
-                $dsn = $this->dsn;
-                $database_name = $this->database_name;
-                $persistent = $this->options['persistent'];
-                $this->dsn = $this->connected_dsn;
-                $this->database_name = $this->connected_database_name;
-                $this->options['persistent'] = $this->opened_persistent;
-                $this->rollback();
-                $this->dsn = $dsn;
-                $this->database_name = $database_name;
-                $this->options['persistent'] = $persistent;
-            }
-
-            if (!$this->opened_persistent || $force) {
-                $ok = @pg_close($this->connection);
-                if (!$ok) {
-                    return $this->raiseError(MDB2_ERROR_DISCONNECT_FAILED,
-                           null, null, null, __FUNCTION__);
-                }
-            }
-        } else {
-            return false;
-        }
-        return parent::disconnect($force);
-    }
-
-    // }}}
-    // {{{ standaloneQuery()
-
-   /**
-     * execute a query as DBA
-     *
-     * @param string $query the SQL query
-     * @param mixed   $types  array that contains the types of the columns in
-     *                        the result set
-     * @param boolean $is_manip  if the query is a manipulation query
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function &standaloneQuery($query, $types = null, $is_manip = false)
-    {
-        $user = $this->options['DBA_username']? $this->options['DBA_username'] : $this->dsn['username'];
-        $pass = $this->options['DBA_password']? $this->options['DBA_password'] : $this->dsn['password'];
-        $connection = $this->_doConnect($user, $pass, $this->database_name, $this->options['persistent']);
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-
-        $offset = $this->offset;
-        $limit = $this->limit;
-        $this->offset = $this->limit = 0;
-        $query = $this->_modifyQuery($query, $is_manip, $limit, $offset);
-
-        $result =& $this->_doQuery($query, $is_manip, $connection, $this->database_name);
-        if (!PEAR::isError($result)) {
-            if ($is_manip) {
-                $result =  $this->_affectedRows($connection, $result);
-            } else {
-                $result =& $this->_wrapResult($result, $types, true, false, $limit, $offset);
-            }
-        }
-
-        @pg_close($connection);
-        return $result;
-    }
-
-    // }}}
-    // {{{ _doQuery()
-
-    /**
-     * Execute a query
-     * @param string $query  query
-     * @param boolean $is_manip  if the query is a manipulation query
-     * @param resource $connection
-     * @param string $database_name
-     * @return result or error object
-     * @access protected
-     */
-    function &_doQuery($query, $is_manip = false, $connection = null, $database_name = null)
-    {
-        $this->last_query = $query;
-        $result = $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'pre'));
-        if ($result) {
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-            $query = $result;
-        }
-        if ($this->options['disable_query']) {
-            $result = $is_manip ? 0 : null;
-            return $result;
-        }
-
-        if (is_null($connection)) {
-            $connection = $this->getConnection();
-            if (PEAR::isError($connection)) {
-                return $connection;
-            }
-        }
-
-        $function = $this->options['multi_query'] ? 'pg_send_query' : 'pg_query';
-        $result = @$function($connection, $query);
-        if (!$result) {
-            $err =& $this->raiseError(null, null, null,
-                'Could not execute statement', __FUNCTION__);
-            return $err;
-        } elseif ($this->options['multi_query']) {
-            if (!($result = @pg_get_result($connection))) {
-                $err =& $this->raiseError(null, null, null,
-                        'Could not get the first result from a multi query', __FUNCTION__);
-                return $err;
-            }
-        }
-
-        $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'post', 'result' => $result));
-        return $result;
-    }
-
-    // }}}
-    // {{{ _affectedRows()
-
-    /**
-     * Returns the number of rows affected
-     *
-     * @param resource $result
-     * @param resource $connection
-     * @return mixed MDB2 Error Object or the number of rows affected
-     * @access private
-     */
-    function _affectedRows($connection, $result = null)
-    {
-        if (is_null($connection)) {
-            $connection = $this->getConnection();
-            if (PEAR::isError($connection)) {
-                return $connection;
-            }
-        }
-        return @pg_affected_rows($result);
-    }
-
-    // }}}
-    // {{{ _modifyQuery()
-
-    /**
-     * Changes a query string for various DBMS specific reasons
-     *
-     * @param string $query  query to modify
-     * @param boolean $is_manip  if it is a DML query
-     * @param integer $limit  limit the number of rows
-     * @param integer $offset  start reading from given offset
-     * @return string modified query
-     * @access protected
-     */
-    function _modifyQuery($query, $is_manip, $limit, $offset)
-    {
-        if ($limit > 0
-            && !preg_match('/LIMIT\s*\d(?:\s*(?:,|OFFSET)\s*\d+)?(?:[^\)]*)?$/i', $query)
-        ) {
-            $query = rtrim($query);
-            if (substr($query, -1) == ';') {
-                $query = substr($query, 0, -1);
-            }
-            if ($is_manip) {
-                $query = $this->_modifyManipQuery($query, $limit);
-            } else {
-                $query.= " LIMIT $limit OFFSET $offset";
-            }
-        }
-        return $query;
-    }
-    
-    // }}}
-    // {{{ _modifyManipQuery()
-    
-    /**
-     * Changes a manip query string for various DBMS specific reasons
-     *
-     * @param string $query  query to modify
-     * @param integer $limit  limit the number of rows
-     * @return string modified query
-     * @access protected
-     */
-    function _modifyManipQuery($query, $limit)
-    {
-        $pos = strpos(strtolower($query), 'where');
-        $where = $pos ? substr($query, $pos) : '';
-
-        $manip_clause = '(\bDELETE\b\s+(?:\*\s+)?\bFROM\b|\bUPDATE\b)';
-        $from_clause  = '([\w\.]+)';
-        $where_clause = '(?:(.*)\bWHERE\b\s+(.*))|(.*)';
-        $pattern = '/^'. $manip_clause . '\s+' . $from_clause .'(?:\s)*(?:'. $where_clause .')?$/i';
-        $matches = preg_match($pattern, $query, $match);
-        if ($matches) {
-            $manip = $match[1];
-            $from  = $match[2];
-            $what  = (count($matches) == 6) ? $match[5] : $match[3];
-            return $manip.' '.$from.' '.$what.' WHERE ctid=(SELECT ctid FROM '.$from.' '.$where.' LIMIT '.$limit.')';
-        }
-        //return error?
-        return $query;
-    }
-
-    // }}}
-    // {{{ getServerVersion()
-
-    /**
-     * return version information about the server
-     *
-     * @param bool   $native  determines if the raw version string should be returned
-     * @return mixed array/string with version information or MDB2 error object
-     * @access public
-     */
-    function getServerVersion($native = false)
-    {
-        $query = 'SHOW SERVER_VERSION';
-        if ($this->connected_server_info) {
-            $server_info = $this->connected_server_info;
-        } else {
-            $server_info = $this->queryOne($query, 'text');
-            if (PEAR::isError($server_info)) {
-                return $server_info;
-            }
-        }
-        // cache server_info
-        $this->connected_server_info = $server_info;
-        if (!$native && !PEAR::isError($server_info)) {
-            $tmp = explode('.', $server_info, 3);
-            if (empty($tmp[2])
-                && isset($tmp[1])
-                && preg_match('/(\d+)(.*)/', $tmp[1], $tmp2)
-            ) {
-                $server_info = array(
-                    'major' => $tmp[0],
-                    'minor' => $tmp2[1],
-                    'patch' => null,
-                    'extra' => $tmp2[2],
-                    'native' => $server_info,
-                );
-            } else {
-                $server_info = array(
-                    'major' => isset($tmp[0]) ? $tmp[0] : null,
-                    'minor' => isset($tmp[1]) ? $tmp[1] : null,
-                    'patch' => isset($tmp[2]) ? $tmp[2] : null,
-                    'extra' => null,
-                    'native' => $server_info,
-                );
-            }
-        }
-        return $server_info;
-    }
-
-    // }}}
-    // {{{ prepare()
-
-    /**
-     * Prepares a query for multiple execution with execute().
-     * With some database backends, this is emulated.
-     * prepare() requires a generic query as string like
-     * 'INSERT INTO numbers VALUES(?,?)' or
-     * 'INSERT INTO numbers VALUES(:foo,:bar)'.
-     * The ? and :name and are placeholders which can be set using
-     * bindParam() and the query can be sent off using the execute() method.
-     * The allowed format for :name can be set with the 'bindname_format' option.
-     *
-     * @param string $query the query to prepare
-     * @param mixed   $types  array that contains the types of the placeholders
-     * @param mixed   $result_types  array that contains the types of the columns in
-     *                        the result set or MDB2_PREPARE_RESULT, if set to
-     *                        MDB2_PREPARE_MANIP the query is handled as a manipulation query
-     * @param mixed   $lobs   key (field) value (parameter) pair for all lob placeholders
-     * @return mixed resource handle for the prepared query on success, a MDB2
-     *        error on failure
-     * @access public
-     * @see bindParam, execute
-     */
-    function &prepare($query, $types = null, $result_types = null, $lobs = array())
-    {
-        if ($this->options['emulate_prepared']) {
-            $obj =& parent::prepare($query, $types, $result_types, $lobs);
-            return $obj;
-        }
-        $is_manip = ($result_types === MDB2_PREPARE_MANIP);
-        $offset = $this->offset;
-        $limit = $this->limit;
-        $this->offset = $this->limit = 0;
-        $result = $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'pre'));
-        if ($result) {
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-            $query = $result;
-        }
-        $pgtypes = function_exists('pg_prepare') ? false : array();
-        if ($pgtypes !== false && !empty($types)) {
-            $this->loadModule('Datatype', null, true);
-        }
-        $query = $this->_modifyQuery($query, $is_manip, $limit, $offset);
-        $placeholder_type_guess = $placeholder_type = null;
-        $question = '?';
-        $colon = ':';
-        $positions = array();
-        $position = $parameter = 0;
-        while ($position < strlen($query)) {
-            $q_position = strpos($query, $question, $position);
-            $c_position = strpos($query, $colon, $position);
-            //skip "::type" cast ("select id::varchar(20) from sometable where name=?")
-            $doublecolon_position = strpos($query, '::', $position);
-            if ($doublecolon_position !== false && $doublecolon_position == $c_position) {
-                $c_position = strpos($query, $colon, $position+2);
-            }
-            if ($q_position && $c_position) {
-                $p_position = min($q_position, $c_position);
-            } elseif ($q_position) {
-                $p_position = $q_position;
-            } elseif ($c_position) {
-                $p_position = $c_position;
-            } else {
-                break;
-            }
-            if (is_null($placeholder_type)) {
-                $placeholder_type_guess = $query[$p_position];
-            }
-            
-            $new_pos = $this->_skipDelimitedStrings($query, $position, $p_position);
-            if (PEAR::isError($new_pos)) {
-                return $new_pos;
-            }
-            if ($new_pos != $position) {
-                $position = $new_pos;
-                continue; //evaluate again starting from the new position
-            }
-
-            if ($query[$position] == $placeholder_type_guess) {
-                if (is_null($placeholder_type)) {
-                    $placeholder_type = $query[$p_position];
-                    $question = $colon = $placeholder_type;
-                    if (!empty($types) && is_array($types)) {
-                        if ($placeholder_type == ':') {
-                        } else {
-                            $types = array_values($types);
-                        }
-                    }
-                }
-                if ($placeholder_type_guess == '?') {
-                    $length = 1;
-                    $name = $parameter;
-                } else {
-                    $regexp = '/^.{'.($position+1).'}('.$this->options['bindname_format'].').*$/s';
-                    $param = preg_replace($regexp, '\\1', $query);
-                    if ($param === '') {
-                        $err =& $this->raiseError(MDB2_ERROR_SYNTAX, null, null,
-                            'named parameter name must match "bindname_format" option', __FUNCTION__);
-                        return $err;
-                    }
-                    $length = strlen($param) + 1;
-                    $name = $param;
-                }
-                if ($pgtypes !== false) {
-                    if (is_array($types) && array_key_exists($name, $types)) {
-                        $pgtypes[] = $this->datatype->mapPrepareDatatype($types[$name]);
-                    } elseif (is_array($types) && array_key_exists($parameter, $types)) {
-                        $pgtypes[] = $this->datatype->mapPrepareDatatype($types[$parameter]);
-                    } else {
-                        $pgtypes[] = 'text';
-                    }
-                }
-                if (($key_parameter = array_search($name, $positions))) {
-                    $next_parameter = 1;
-                    foreach ($positions as $key => $value) {
-                        if ($key_parameter == $key) {
-                            break;
-                        }
-                        ++$next_parameter;
-                    }
-                } else {
-                    ++$parameter;
-                    $next_parameter = $parameter;
-                    $positions[] = $name;
-                }
-                $query = substr_replace($query, '$'.$parameter, $position, $length);
-                $position = $p_position + strlen($parameter);
-            } else {
-                $position = $p_position;
-            }
-        }
-        $connection = $this->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-        static $prep_statement_counter = 1;
-        $statement_name = sprintf($this->options['statement_format'], $this->phptype, $prep_statement_counter++ . sha1(microtime() + mt_rand()));
-        $statement_name = substr(strtolower($statement_name), 0, $this->options['max_identifiers_length']);
-        if ($pgtypes === false) {
-            $result = @pg_prepare($connection, $statement_name, $query);
-            if (!$result) {
-                $err =& $this->raiseError(null, null, null,
-                    'Unable to create prepared statement handle', __FUNCTION__);
-                return $err;
-            }
-        } else {
-            $types_string = '';
-            if ($pgtypes) {
-                $types_string = ' ('.implode(', ', $pgtypes).') ';
-            }
-            $query = 'PREPARE '.$statement_name.$types_string.' AS '.$query;
-            $statement =& $this->_doQuery($query, true, $connection);
-            if (PEAR::isError($statement)) {
-                return $statement;
-            }
-        }
-
-        $class_name = 'MDB2_Statement_'.$this->phptype;
-        $obj = new $class_name($this, $statement_name, $positions, $query, $types, $result_types, $is_manip, $limit, $offset);
-        $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'post', 'result' => $obj));
-        return $obj;
-    }
-
-    // }}}
-    // {{{ function getSequenceName($sqn)
-
-    /**
-     * adds sequence name formatting to a sequence name
-     *
-     * @param   string  name of the sequence
-     *
-     * @return  string  formatted sequence name
-     *
-     * @access  public
-     */
-    function getSequenceName($sqn)
-    {
-        if (false === $this->options['disable_smart_seqname']) {
-            if (strpos($sqn, '_') !== false) {
-                list($table, $field) = explode('_', $sqn, 2);
-            }
-            $schema_list = $this->queryOne("SELECT array_to_string(current_schemas(false), ',')");
-            if (PEAR::isError($schema_list) || empty($schema_list) || count($schema_list) < 2) {
-                $order_by = ' a.attnum';
-                $schema_clause = ' AND n.nspname=current_schema()';
-            } else {
-                $schemas = explode(',', $schema_list);
-                $schema_clause = ' AND n.nspname IN ('.$schema_list.')';
-                $counter = 1;
-                $order_by = ' CASE ';
-                foreach ($schemas as $schema) {
-                    $order_by .= ' WHEN n.nspname='.$schema.' THEN '.$counter++;
-                }
-                $order_by .= ' ELSE '.$counter.' END, a.attnum';
-            }
-
-            $query = "SELECT substring((SELECT substring(pg_get_expr(d.adbin, d.adrelid) for 128)
-                    	    FROM pg_attrdef d
-                    	   WHERE d.adrelid = a.attrelid
-                    	     AND d.adnum = a.attnum
-                    	     AND a.atthasdef
-                    	 ) FROM 'nextval[^'']*''([^'']*)')
-                        FROM pg_attribute a
-                    LEFT JOIN pg_class c ON c.oid = a.attrelid
-                    LEFT JOIN pg_attrdef d ON d.adrelid = a.attrelid AND d.adnum = a.attnum AND a.atthasdef
-                    LEFT JOIN pg_namespace n ON c.relnamespace = n.oid
-                       WHERE (c.relname = ".$this->quote($sqn, 'text');
-            if (!empty($field)) {
-                $query .= " OR (c.relname = ".$this->quote($table, 'text')." AND a.attname = ".$this->quote($field, 'text').")";
-            }
-            $query .= "      )"
-                         .$schema_clause."
-                         AND NOT a.attisdropped
-                         AND a.attnum > 0
-                         AND pg_get_expr(d.adbin, d.adrelid) LIKE 'nextval%'
-                    ORDER BY ".$order_by;
-            $seqname = $this->queryOne($query);
-            if (!PEAR::isError($seqname) && !empty($seqname) && is_string($seqname)) {
-                return $seqname;
-            }
-        }
-
-        return parent::getSequenceName($sqn);
-    }
-
-    // }}}
-    // {{{ nextID()
-
-    /**
-     * Returns the next free id of a sequence
-     *
-     * @param string $seq_name name of the sequence
-     * @param boolean $ondemand when true the sequence is
-     *                          automatic created, if it
-     *                          not exists
-     * @return mixed MDB2 Error Object or id
-     * @access public
-     */
-    function nextID($seq_name, $ondemand = true)
-    {
-        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq_name), true);
-        $query = "SELECT NEXTVAL('$sequence_name')";
-        $this->pushErrorHandling(PEAR_ERROR_RETURN);
-        $this->expectError(MDB2_ERROR_NOSUCHTABLE);
-        $result = $this->queryOne($query, 'integer');
-        $this->popExpect();
-        $this->popErrorHandling();
-        if (PEAR::isError($result)) {
-            if ($ondemand && $result->getCode() == MDB2_ERROR_NOSUCHTABLE) {
-                $this->loadModule('Manager', null, true);
-                $result = $this->manager->createSequence($seq_name);
-                if (PEAR::isError($result)) {
-                    return $this->raiseError($result, null, null,
-                        'on demand sequence could not be created', __FUNCTION__);
-                }
-                return $this->nextId($seq_name, false);
-            }
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ lastInsertID()
-
-    /**
-     * Returns the autoincrement ID if supported or $id or fetches the current
-     * ID in a sequence called: $table.(empty($field) ? '' : '_'.$field)
-     *
-     * @param string $table name of the table into which a new row was inserted
-     * @param string $field name of the field into which a new row was inserted
-     * @return mixed MDB2 Error Object or id
-     * @access public
-     */
-    function lastInsertID($table = null, $field = null)
-    {
-        if (empty($table) && empty($field)) {
-            return $this->queryOne('SELECT lastval()', 'integer');
-        }
-        $seq = $table.(empty($field) ? '' : '_'.$field);
-        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq), true);
-        return $this->queryOne("SELECT currval('$sequence_name')", 'integer');
-    }
-
-    // }}}
-    // {{{ currID()
-
-    /**
-     * Returns the current id of a sequence
-     *
-     * @param string $seq_name name of the sequence
-     * @return mixed MDB2 Error Object or id
-     * @access public
-     */
-    function currID($seq_name)
-    {
-        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq_name), true);
-        return $this->queryOne("SELECT last_value FROM $sequence_name", 'integer');
-    }
-}
-
-/**
- * MDB2 PostGreSQL result driver
- *
- * @package MDB2
- * @category Database
- * @author  Paul Cooper <pgc@ucecom.com>
- */
-class MDB2_Result_pgsql extends MDB2_Result_Common
-{
-    // }}}
-    // {{{ fetchRow()
-
-    /**
-     * Fetch a row and insert the data into an existing array.
-     *
-     * @param int       $fetchmode  how the array data should be indexed
-     * @param int    $rownum    number of the row where the data can be found
-     * @return int data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function &fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
-    {
-        if (!is_null($rownum)) {
-            $seek = $this->seek($rownum);
-            if (PEAR::isError($seek)) {
-                return $seek;
-            }
-        }
-        if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
-            $fetchmode = $this->db->fetchmode;
-        }
-        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
-            $row = @pg_fetch_array($this->result, null, PGSQL_ASSOC);
-            if (is_array($row)
-                && $this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
-            ) {
-                $row = array_change_key_case($row, $this->db->options['field_case']);
-            }
-        } else {
-            $row = @pg_fetch_row($this->result);
-        }
-        if (!$row) {
-            if ($this->result === false) {
-                $err =& $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                    'resultset has already been freed', __FUNCTION__);
-                return $err;
-            }
-            $null = null;
-            return $null;
-        }
-        $mode = $this->db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL;
-        $rtrim = false;
-        if ($this->db->options['portability'] & MDB2_PORTABILITY_RTRIM) {
-            if (empty($this->types)) {
-                $mode += MDB2_PORTABILITY_RTRIM;
-            } else {
-                $rtrim = true;
-            }
-        }
-        if ($mode) {
-            $this->db->_fixResultArrayValues($row, $mode);
-        }
-        if (!empty($this->types)) {
-            $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
-        }
-        if (!empty($this->values)) {
-            $this->_assignBindColumns($row);
-        }
-        if ($fetchmode === MDB2_FETCHMODE_OBJECT) {
-            $object_class = $this->db->options['fetch_class'];
-            if ($object_class == 'stdClass') {
-                $row = (object) $row;
-            } else {
-                $row = new $object_class($row);
-            }
-        }
-        ++$this->rownum;
-        return $row;
-    }
-
-    // }}}
-    // {{{ _getColumnNames()
-
-    /**
-     * Retrieve the names of columns returned by the DBMS in a query result.
-     *
-     * @return  mixed   Array variable that holds the names of columns as keys
-     *                  or an MDB2 error on failure.
-     *                  Some DBMS may not return any columns when the result set
-     *                  does not contain any rows.
-     * @access private
-     */
-    function _getColumnNames()
-    {
-        $columns = array();
-        $numcols = $this->numCols();
-        if (PEAR::isError($numcols)) {
-            return $numcols;
-        }
-        for ($column = 0; $column < $numcols; $column++) {
-            $column_name = @pg_field_name($this->result, $column);
-            $columns[$column_name] = $column;
-        }
-        if ($this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $columns = array_change_key_case($columns, $this->db->options['field_case']);
-        }
-        return $columns;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Count the number of columns returned by the DBMS in a query result.
-     *
-     * @access public
-     * @return mixed integer value with the number of columns, a MDB2 error
-     *                       on failure
-     */
-    function numCols()
-    {
-        $cols = @pg_num_fields($this->result);
-        if (is_null($cols)) {
-            if ($this->result === false) {
-                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                    'resultset has already been freed', __FUNCTION__);
-            } elseif (is_null($this->result)) {
-                return count($this->types);
-            }
-            return $this->db->raiseError(null, null, null,
-                'Could not get column count', __FUNCTION__);
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Move the internal result pointer to the next available result
-     *
-     * @return true on success, false if there is no more result set or an error object on failure
-     * @access public
-     */
-    function nextResult()
-    {
-        $connection = $this->db->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-
-        if (!($this->result = @pg_get_result($connection))) {
-            return false;
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ free()
-
-    /**
-     * Free the internal resources associated with result.
-     *
-     * @return boolean true on success, false if result is invalid
-     * @access public
-     */
-    function free()
-    {
-        if (is_resource($this->result) && $this->db->connection) {
-            $free = @pg_free_result($this->result);
-            if ($free === false) {
-                return $this->db->raiseError(null, null, null,
-                    'Could not free result', __FUNCTION__);
-            }
-        }
-        $this->result = false;
-        return MDB2_OK;
-    }
-}
-
-/**
- * MDB2 PostGreSQL buffered result driver
- *
- * @package MDB2
- * @category Database
- * @author  Paul Cooper <pgc@ucecom.com>
- */
-class MDB2_BufferedResult_pgsql extends MDB2_Result_pgsql
-{
-    // {{{ seek()
-
-    /**
-     * Seek to a specific row in a result set
-     *
-     * @param int    $rownum    number of the row where the data can be found
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function seek($rownum = 0)
-    {
-        if ($this->rownum != ($rownum - 1) && !@pg_result_seek($this->result, $rownum)) {
-            if ($this->result === false) {
-                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                    'resultset has already been freed', __FUNCTION__);
-            } elseif (is_null($this->result)) {
-                return MDB2_OK;
-            }
-            return $this->db->raiseError(MDB2_ERROR_INVALID, null, null,
-                'tried to seek to an invalid row number ('.$rownum.')', __FUNCTION__);
-        }
-        $this->rownum = $rownum - 1;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ valid()
-
-    /**
-     * Check if the end of the result set has been reached
-     *
-     * @return mixed true or false on sucess, a MDB2 error on failure
-     * @access public
-     */
-    function valid()
-    {
-        $numrows = $this->numRows();
-        if (PEAR::isError($numrows)) {
-            return $numrows;
-        }
-        return $this->rownum < ($numrows - 1);
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Returns the number of rows in a result object
-     *
-     * @return mixed MDB2 Error Object or the number of rows
-     * @access public
-     */
-    function numRows()
-    {
-        $rows = @pg_num_rows($this->result);
-        if (is_null($rows)) {
-            if ($this->result === false) {
-                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                    'resultset has already been freed', __FUNCTION__);
-            } elseif (is_null($this->result)) {
-                return 0;
-            }
-            return $this->db->raiseError(null, null, null,
-                'Could not get row count', __FUNCTION__);
-        }
-        return $rows;
-    }
-}
-
-/**
- * MDB2 PostGreSQL statement driver
- *
- * @package MDB2
- * @category Database
- * @author  Paul Cooper <pgc@ucecom.com>
- */
-class MDB2_Statement_pgsql extends MDB2_Statement_Common
-{
-    // {{{ _execute()
-
-    /**
-     * Execute a prepared query statement helper method.
-     *
-     * @param mixed $result_class string which specifies which result class to use
-     * @param mixed $result_wrap_class string which specifies which class to wrap results in
-     *
-     * @return mixed MDB2_Result or integer (affected rows) on success,
-     *               a MDB2 error on failure
-     * @access private
-     */
-    function &_execute($result_class = true, $result_wrap_class = false)
-    {
-        if (is_null($this->statement)) {
-            $result =& parent::_execute($result_class, $result_wrap_class);
-            return $result;
-        }
-        $this->db->last_query = $this->query;
-        $this->db->debug($this->query, 'execute', array('is_manip' => $this->is_manip, 'when' => 'pre', 'parameters' => $this->values));
-        if ($this->db->getOption('disable_query')) {
-            $result = $this->is_manip ? 0 : null;
-            return $result;
-        }
-
-        $connection = $this->db->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-
-        $query = false;
-        $parameters = array();
-        // todo: disabled until pg_execute() bytea issues are cleared up
-        if (true || !function_exists('pg_execute')) {
-            $query = 'EXECUTE '.$this->statement;
-        }
-        if (!empty($this->positions)) {
-            foreach ($this->positions as $parameter) {
-                if (!array_key_exists($parameter, $this->values)) {
-                    return $this->db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                        'Unable to bind to missing placeholder: '.$parameter, __FUNCTION__);
-                }
-                $value = $this->values[$parameter];
-                $type = array_key_exists($parameter, $this->types) ? $this->types[$parameter] : null;
-                if (is_resource($value) || $type == 'clob' || $type == 'blob' || $this->db->options['lob_allow_url_include']) {
-                    if (!is_resource($value) && preg_match('/^(\w+:\/\/)(.*)$/', $value, $match)) {
-                        if ($match[1] == 'file://') {
-                            $value = $match[2];
-                        }
-                        $value = @fopen($value, 'r');
-                        $close = true;
-                    }
-                    if (is_resource($value)) {
-                        $data = '';
-                        while (!@feof($value)) {
-                            $data.= @fread($value, $this->db->options['lob_buffer_length']);
-                        }
-                        if ($close) {
-                            @fclose($value);
-                        }
-                        $value = $data;
-                    }
-                }
-                $quoted = $this->db->quote($value, $type, $query);
-                if (PEAR::isError($quoted)) {
-                    return $quoted;
-                }
-                $parameters[] = $quoted;
-            }
-            if ($query) {
-                $query.= ' ('.implode(', ', $parameters).')';
-            }
-        }
-
-        if (!$query) {
-            $result = @pg_execute($connection, $this->statement, $parameters);
-            if (!$result) {
-                $err =& $this->db->raiseError(null, null, null,
-                    'Unable to execute statement', __FUNCTION__);
-                return $err;
-            }
-        } else {
-            $result = $this->db->_doQuery($query, $this->is_manip, $connection);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-        }
-
-        if ($this->is_manip) {
-            $affected_rows = $this->db->_affectedRows($connection, $result);
-            return $affected_rows;
-        }
-
-        $result =& $this->db->_wrapResult($result, $this->result_types,
-            $result_class, $result_wrap_class, $this->limit, $this->offset);
-        $this->db->debug($this->query, 'execute', array('is_manip' => $this->is_manip, 'when' => 'post', 'result' => $result));
-        return $result;
-    }
-
-    // }}}
-    // {{{ free()
-
-    /**
-     * Release resources allocated for the specified prepared query.
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function free()
-    {
-        if (is_null($this->positions)) {
-            return $this->db->raiseError(MDB2_ERROR, null, null,
-                'Prepared statement has already been freed', __FUNCTION__);
-        }
-        $result = MDB2_OK;
-
-        if (!is_null($this->statement)) {
-            $connection = $this->db->getConnection();
-            if (PEAR::isError($connection)) {
-                return $connection;
-            }
-            $query = 'DEALLOCATE PREPARE '.$this->statement;
-            $result = $this->db->_doQuery($query, true, $connection);
-        }
-
-        parent::free();
-        return $result;
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/sqlite.php b/3rdparty/MDB2/Driver/sqlite.php
deleted file mode 100644
index 5d2ad27d016..00000000000
--- a/3rdparty/MDB2/Driver/sqlite.php
+++ /dev/null
@@ -1,1088 +0,0 @@
-<?php
-// vim: set et ts=4 sw=4 fdm=marker:
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: sqlite.php,v 1.165 2008/11/30 14:28:01 afz Exp $
-//
-
-/**
- * MDB2 SQLite driver
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_sqlite extends MDB2_Driver_Common
-{
-    // {{{ properties
-    var $string_quoting = array('start' => "'", 'end' => "'", 'escape' => "'", 'escape_pattern' => false);
-
-    var $identifier_quoting = array('start' => '"', 'end' => '"', 'escape' => '"');
-
-    var $_lasterror = '';
-
-    var $fix_assoc_fields_names = false;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
-        parent::__construct();
-
-        $this->phptype = 'sqlite';
-        $this->dbsyntax = 'sqlite';
-
-        $this->supported['sequences'] = 'emulated';
-        $this->supported['indexes'] = true;
-        $this->supported['affected_rows'] = true;
-        $this->supported['summary_functions'] = true;
-        $this->supported['order_by_text'] = true;
-        $this->supported['current_id'] = 'emulated';
-        $this->supported['limit_queries'] = true;
-        $this->supported['LOBs'] = true;
-        $this->supported['replace'] = true;
-        $this->supported['transactions'] = true;
-        $this->supported['savepoints'] = false;
-        $this->supported['sub_selects'] = true;
-        $this->supported['triggers'] = true;
-        $this->supported['auto_increment'] = true;
-        $this->supported['primary_key'] = false; // requires alter table implementation
-        $this->supported['result_introspection'] = false; // not implemented
-        $this->supported['prepared_statements'] = 'emulated';
-        $this->supported['identifier_quoting'] = true;
-        $this->supported['pattern_escaping'] = false;
-        $this->supported['new_link'] = false;
-
-        $this->options['DBA_username'] = false;
-        $this->options['DBA_password'] = false;
-        $this->options['base_transaction_name'] = '___php_MDB2_sqlite_auto_commit_off';
-        $this->options['fixed_float'] = 0;
-        $this->options['database_path'] = '';
-        $this->options['database_extension'] = '';
-        $this->options['server_version'] = '';
-        $this->options['max_identifiers_length'] = 128; //no real limit
-    }
-
-    // }}}
-    // {{{ errorInfo()
-
-    /**
-     * This method is used to collect information about an error
-     *
-     * @param integer $error
-     * @return array
-     * @access public
-     */
-    function errorInfo($error = null)
-    {
-        $native_code = null;
-        if ($this->connection) {
-            $native_code = @sqlite_last_error($this->connection);
-        }
-        $native_msg = $this->_lasterror
-            ? html_entity_decode($this->_lasterror) : @sqlite_error_string($native_code);
-            
-        // PHP 5.2+ prepends the function name to $php_errormsg, so we need
-        // this hack to work around it, per bug #9599.
-        $native_msg = preg_replace('/^sqlite[a-z_]+\(\)[^:]*: /', '', $native_msg);
-
-        if (is_null($error)) {
-            static $error_regexps;
-            if (empty($error_regexps)) {
-                $error_regexps = array(
-                    '/^no such table:/' => MDB2_ERROR_NOSUCHTABLE,
-                    '/^no such index:/' => MDB2_ERROR_NOT_FOUND,
-                    '/^(table|index) .* already exists$/' => MDB2_ERROR_ALREADY_EXISTS,
-                    '/PRIMARY KEY must be unique/i' => MDB2_ERROR_CONSTRAINT,
-                    '/is not unique/' => MDB2_ERROR_CONSTRAINT,
-                    '/columns .* are not unique/i' => MDB2_ERROR_CONSTRAINT,
-                    '/uniqueness constraint failed/' => MDB2_ERROR_CONSTRAINT,
-                    '/may not be NULL/' => MDB2_ERROR_CONSTRAINT_NOT_NULL,
-                    '/^no such column:/' => MDB2_ERROR_NOSUCHFIELD,
-                    '/no column named/' => MDB2_ERROR_NOSUCHFIELD,
-                    '/column not present in both tables/i' => MDB2_ERROR_NOSUCHFIELD,
-                    '/^near ".*": syntax error$/' => MDB2_ERROR_SYNTAX,
-                    '/[0-9]+ values for [0-9]+ columns/i' => MDB2_ERROR_VALUE_COUNT_ON_ROW,
-                 );
-            }
-            foreach ($error_regexps as $regexp => $code) {
-                if (preg_match($regexp, $native_msg)) {
-                    $error = $code;
-                    break;
-                }
-            }
-        }
-        return array($error, $native_code, $native_msg);
-    }
-
-    // }}}
-    // {{{ escape()
-
-    /**
-     * Quotes a string so it can be safely used in a query. It will quote
-     * the text so it can safely be used within a query.
-     *
-     * @param   string  the input string to quote
-     * @param   bool    escape wildcards
-     *
-     * @return  string  quoted string
-     *
-     * @access  public
-     */
-    function escape($text, $escape_wildcards = false)
-    {
-        $text = @sqlite_escape_string($text);
-        return $text;
-    }
-
-    // }}}
-    // {{{ beginTransaction()
-
-    /**
-     * Start a transaction or set a savepoint.
-     *
-     * @param   string  name of a savepoint to set
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function beginTransaction($savepoint = null)
-    {
-        $this->debug('Starting transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
-        if (!is_null($savepoint)) {
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'savepoints are not supported', __FUNCTION__);
-        } elseif ($this->in_transaction) {
-            return MDB2_OK;  //nothing to do
-        }
-        if (!$this->destructor_registered && $this->opened_persistent) {
-            $this->destructor_registered = true;
-            register_shutdown_function('MDB2_closeOpenTransactions');
-        }
-        $query = 'BEGIN TRANSACTION '.$this->options['base_transaction_name'];
-        $result =$this->_doQuery($query, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $this->in_transaction = true;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commit the database changes done during a transaction that is in
-     * progress or release a savepoint. This function may only be called when
-     * auto-committing is disabled, otherwise it will fail. Therefore, a new
-     * transaction is implicitly started after committing the pending changes.
-     *
-     * @param   string  name of a savepoint to release
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function commit($savepoint = null)
-    {
-        $this->debug('Committing transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
-        if (!$this->in_transaction) {
-            return $this->raiseError(MDB2_ERROR_INVALID, null, null,
-                'commit/release savepoint cannot be done changes are auto committed', __FUNCTION__);
-        }
-        if (!is_null($savepoint)) {
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'savepoints are not supported', __FUNCTION__);
-        }
-
-        $query = 'COMMIT TRANSACTION '.$this->options['base_transaction_name'];
-        $result =$this->_doQuery($query, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $this->in_transaction = false;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{
-
-    /**
-     * Cancel any database changes done during a transaction or since a specific
-     * savepoint that is in progress. This function may only be called when
-     * auto-committing is disabled, otherwise it will fail. Therefore, a new
-     * transaction is implicitly started after canceling the pending changes.
-     *
-     * @param   string  name of a savepoint to rollback to
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function rollback($savepoint = null)
-    {
-        $this->debug('Rolling back transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
-        if (!$this->in_transaction) {
-            return $this->raiseError(MDB2_ERROR_INVALID, null, null,
-                'rollback cannot be done changes are auto committed', __FUNCTION__);
-        }
-        if (!is_null($savepoint)) {
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'savepoints are not supported', __FUNCTION__);
-        }
-
-        $query = 'ROLLBACK TRANSACTION '.$this->options['base_transaction_name'];
-        $result =$this->_doQuery($query, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $this->in_transaction = false;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function setTransactionIsolation()
-
-    /**
-     * Set the transacton isolation level.
-     *
-     * @param   string  standard isolation level
-     *                  READ UNCOMMITTED (allows dirty reads)
-     *                  READ COMMITTED (prevents dirty reads)
-     *                  REPEATABLE READ (prevents nonrepeatable reads)
-     *                  SERIALIZABLE (prevents phantom reads)
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     * @since   2.1.1
-     */
-    static function setTransactionIsolation($isolation,$options=array())
-    {
-        $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true));
-        switch ($isolation) {
-        case 'READ UNCOMMITTED':
-            $isolation = 0;
-            break;
-        case 'READ COMMITTED':
-        case 'REPEATABLE READ':
-        case 'SERIALIZABLE':
-            $isolation = 1;
-            break;
-        default:
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'isolation level is not supported: '.$isolation, __FUNCTION__);
-        }
-
-        $query = "PRAGMA read_uncommitted=$isolation";
-        return $this->_doQuery($query, true);
-    }
-
-    // }}}
-    // {{{ getDatabaseFile()
-
-    /**
-     * Builds the string with path+dbname+extension
-     *
-     * @return string full database path+file
-     * @access protected
-     */
-    function _getDatabaseFile($database_name)
-    {
-        if ($database_name === '' || $database_name === ':memory:') {
-            return $database_name;
-        }
-        return $this->options['database_path'].$database_name.$this->options['database_extension'];
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database
-     *
-     * @return true on success, MDB2 Error Object on failure
-     **/
-    function connect()
-    {
-		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
-        $database_file = $this->_getDatabaseFile($this->database_name);
-        if (is_resource($this->connection)) {
-            //if (count(array_diff($this->connected_dsn, $this->dsn)) == 0
-            if (MDB2::areEquals($this->connected_dsn, $this->dsn)
-                && $this->connected_database_name == $database_file
-                && $this->opened_persistent == $this->options['persistent']
-            ) {
-                return MDB2_OK;
-            }
-            $this->disconnect(false);
-        }
-
-        if (!PEAR::loadExtension($this->phptype)) {
-            return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'extension '.$this->phptype.' is not compiled into PHP', __FUNCTION__);
-        }
-
-        if (empty($this->database_name)) {
-            return $this->raiseError(MDB2_ERROR_CONNECT_FAILED, null, null,
-            'unable to establish a connection', __FUNCTION__);
-        }
-
-        if ($database_file !== ':memory:') {
-			if(!strpos($database_file,'.db')){
-				$database_file="$datadir/$database_file.db";
-			}
-            if (!file_exists($database_file)) {
-                if (!touch($database_file)) {
-                    return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                        'Could not create database file', __FUNCTION__);
-                }
-                if (!isset($this->dsn['mode'])
-                    || !is_numeric($this->dsn['mode'])
-                ) {
-                    $mode = 0644;
-                } else {
-                    $mode = octdec($this->dsn['mode']);
-                }
-                if (!chmod($database_file, $mode)) {
-                    return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                        'Could not be chmodded database file', __FUNCTION__);
-                }
-                if (!file_exists($database_file)) {
-                    return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                        'Could not be found database file', __FUNCTION__);
-                }
-            }
-            if (!is_file($database_file)) {
-                return $this->raiseError(MDB2_ERROR_INVALID, null, null,
-                        'Database is a directory name', __FUNCTION__);
-            }
-            if (!is_readable($database_file)) {
-                return $this->raiseError(MDB2_ERROR_ACCESS_VIOLATION, null, null,
-                        'Could not read database file', __FUNCTION__);
-            }
-        }
-
-        $connect_function = ($this->options['persistent'] ? 'sqlite_popen' : 'sqlite_open');
-        $php_errormsg = '';
-        if (version_compare('5.1.0', PHP_VERSION, '>')) {
-            @ini_set('track_errors', true);
-            echo 1;
-            $connection = @$connect_function($database_file);
-            echo 2;
-            @ini_restore('track_errors');
-        } else {
-            $connection = @$connect_function($database_file, 0666, $php_errormsg);
-        }
-        $this->_lasterror = $php_errormsg;
-        if (!$connection) {
-            return $this->raiseError(MDB2_ERROR_CONNECT_FAILED, null, null,
-            'unable to establish a connection', __FUNCTION__);
-        }
-
-        if ($this->fix_assoc_fields_names ||
-            $this->options['portability'] & MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES)
-        {
-            @sqlite_query("PRAGMA short_column_names = 1", $connection);
-            $this->fix_assoc_fields_names = true;
-        }
-
-        $this->connection = $connection;
-        $this->connected_dsn = $this->dsn;
-        $this->connected_database_name = $database_file;
-        $this->opened_persistent = $this->getoption('persistent');
-        $this->dbsyntax = $this->dsn['dbsyntax'] ? $this->dsn['dbsyntax'] : $this->phptype;
-
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ databaseExists()
-
-    /**
-     * check if given database name is exists?
-     *
-     * @param string $name    name of the database that should be checked
-     *
-     * @return mixed true/false on success, a MDB2 error on failure
-     * @access public
-     */
-    function databaseExists($name)
-    {
-        $database_file = $this->_getDatabaseFile($name);
-        $result = file_exists($database_file);
-        return $result;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Log out and disconnect from the database.
-     *
-     * @param  boolean $force if the disconnect should be forced even if the
-     *                        connection is opened persistently
-     * @return mixed true on success, false if not connected and error
-     *                object on error
-     * @access public
-     */
-    function disconnect($force = true)
-    {
-        if (is_resource($this->connection)) {
-            if ($this->in_transaction) {
-                $dsn = $this->dsn;
-                $database_name = $this->database_name;
-                $persistent = $this->options['persistent'];
-                $this->dsn = $this->connected_dsn;
-                $this->database_name = $this->connected_database_name;
-                $this->options['persistent'] = $this->opened_persistent;
-                $this->rollback();
-                $this->dsn = $dsn;
-                $this->database_name = $database_name;
-                $this->options['persistent'] = $persistent;
-            }
-
-            if (!$this->opened_persistent || $force) {
-                @sqlite_close($this->connection);
-            }
-        } else {
-            return false;
-        }
-        return parent::disconnect($force);
-    }
-
-    // }}}
-    // {{{ _doQuery()
-
-    /**
-     * Execute a query
-     * @param string $query  query
-     * @param boolean $is_manip  if the query is a manipulation query
-     * @param resource $connection
-     * @param string $database_name
-     * @return result or error object
-     * @access protected
-     */
-    function &_doQuery($query, $is_manip = false, $connection = null, $database_name = null)
-    {
-        $this->last_query = $query;
-        $result = $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'pre'));
-        if ($result) {
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-            $query = $result;
-        }
-        if ($this->options['disable_query']) {
-            $result = $is_manip ? 0 : null;
-            return $result;
-        }
-
-        if (is_null($connection)) {
-            $connection = $this->getConnection();
-            if (PEAR::isError($connection)) {
-                return $connection;
-            }
-        }
-
-        $function = $this->options['result_buffering']
-            ? 'sqlite_query' : 'sqlite_unbuffered_query';
-        $php_errormsg = '';
-        if (version_compare('5.1.0', PHP_VERSION, '>')) {
-            @ini_set('track_errors', true);
-            do {
-                $result = @$function($query.';', $connection);
-            } while (sqlite_last_error($connection) == SQLITE_SCHEMA);
-            @ini_restore('track_errors');
-        } else {
-            do {
-                $result = @$function($query.';', $connection, SQLITE_BOTH, $php_errormsg);
-            } while (sqlite_last_error($connection) == SQLITE_SCHEMA);
-        }
-        $this->_lasterror = $php_errormsg;
-
-        if (!$result) {
-            $err =$this->raiseError(null, null, null,
-                'Could not execute statement', __FUNCTION__);
-            return $err;
-        }
-
-        $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'post', 'result' => $result));
-        return $result;
-    }
-
-    // }}}
-    // {{{ _affectedRows()
-
-    /**
-     * Returns the number of rows affected
-     *
-     * @param resource $result
-     * @param resource $connection
-     * @return mixed MDB2 Error Object or the number of rows affected
-     * @access private
-     */
-    function _affectedRows($connection, $result = null)
-    {
-        if (is_null($connection)) {
-            $connection = $this->getConnection();
-            if (PEAR::isError($connection)) {
-                return $connection;
-            }
-        }
-        return @sqlite_changes($connection);
-    }
-
-    // }}}
-    // {{{ _modifyQuery()
-
-    /**
-     * Changes a query string for various DBMS specific reasons
-     *
-     * @param string $query  query to modify
-     * @param boolean $is_manip  if it is a DML query
-     * @param integer $limit  limit the number of rows
-     * @param integer $offset  start reading from given offset
-     * @return string modified query
-     * @access protected
-     */
-    function _modifyQuery($query, $is_manip, $limit, $offset)
-    {
-        if ($this->options['portability'] & MDB2_PORTABILITY_DELETE_COUNT) {
-            if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $query)) {
-                $query = preg_replace('/^\s*DELETE\s+FROM\s+(\S+)\s*$/',
-                                      'DELETE FROM \1 WHERE 1=1', $query);
-            }
-        }
-        if ($limit > 0
-            && !preg_match('/LIMIT\s*\d(?:\s*(?:,|OFFSET)\s*\d+)?(?:[^\)]*)?$/i', $query)
-        ) {
-            $query = rtrim($query);
-            if (substr($query, -1) == ';') {
-                $query = substr($query, 0, -1);
-            }
-            if ($is_manip) {
-                $query.= " LIMIT $limit";
-            } else {
-                $query.= " LIMIT $offset,$limit";
-            }
-        }
-        return $query;
-    }
-
-    // }}}
-    // {{{ getServerVersion()
-
-    /**
-     * return version information about the server
-     *
-     * @param bool   $native  determines if the raw version string should be returned
-     * @return mixed array/string with version information or MDB2 error object
-     * @access public
-     */
-    function getServerVersion($native = false)
-    {
-        $server_info = false;
-        if ($this->connected_server_info) {
-            $server_info = $this->connected_server_info;
-        } elseif ($this->options['server_version']) {
-            $server_info = $this->options['server_version'];
-        } elseif (function_exists('sqlite_libversion')) {
-            $server_info = @sqlite_libversion();
-        }
-        if (!$server_info) {
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'Requires either the "server_version" option or the sqlite_libversion() function', __FUNCTION__);
-        }
-        // cache server_info
-        $this->connected_server_info = $server_info;
-        if (!$native) {
-            $tmp = explode('.', $server_info, 3);
-            $server_info = array(
-                'major' => isset($tmp[0]) ? $tmp[0] : null,
-                'minor' => isset($tmp[1]) ? $tmp[1] : null,
-                'patch' => isset($tmp[2]) ? $tmp[2] : null,
-                'extra' => null,
-                'native' => $server_info,
-            );
-        }
-        return $server_info;
-    }
-
-    // }}}
-    // {{{ replace()
-
-    /**
-     * Execute a SQL REPLACE query. A REPLACE query is identical to a INSERT
-     * query, except that if there is already a row in the table with the same
-     * key field values, the old row is deleted before the new row is inserted.
-     *
-     * The REPLACE type of query does not make part of the SQL standards. Since
-     * practically only SQLite implements it natively, this type of query is
-     * emulated through this method for other DBMS using standard types of
-     * queries inside a transaction to assure the atomicity of the operation.
-     *
-     * @access public
-     *
-     * @param string $table name of the table on which the REPLACE query will
-     *  be executed.
-     * @param array $fields associative array that describes the fields and the
-     *  values that will be inserted or updated in the specified table. The
-     *  indexes of the array are the names of all the fields of the table. The
-     *  values of the array are also associative arrays that describe the
-     *  values and other properties of the table fields.
-     *
-     *  Here follows a list of field properties that need to be specified:
-     *
-     *    value:
-     *          Value to be assigned to the specified field. This value may be
-     *          of specified in database independent type format as this
-     *          function can perform the necessary datatype conversions.
-     *
-     *    Default:
-     *          this property is required unless the Null property
-     *          is set to 1.
-     *
-     *    type
-     *          Name of the type of the field. Currently, all types Metabase
-     *          are supported except for clob and blob.
-     *
-     *    Default: no type conversion
-     *
-     *    null
-     *          Boolean property that indicates that the value for this field
-     *          should be set to null.
-     *
-     *          The default value for fields missing in INSERT queries may be
-     *          specified the definition of a table. Often, the default value
-     *          is already null, but since the REPLACE may be emulated using
-     *          an UPDATE query, make sure that all fields of the table are
-     *          listed in this function argument array.
-     *
-     *    Default: 0
-     *
-     *    key
-     *          Boolean property that indicates that this field should be
-     *          handled as a primary key or at least as part of the compound
-     *          unique index of the table that will determine the row that will
-     *          updated if it exists or inserted a new row otherwise.
-     *
-     *          This function will fail if no key field is specified or if the
-     *          value of a key field is set to null because fields that are
-     *          part of unique index they may not be null.
-     *
-     *    Default: 0
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     */
-    function replace($table, $fields)
-    {
-        $count = count($fields);
-        $query = $values = '';
-        $keys = $colnum = 0;
-        for (reset($fields); $colnum < $count; next($fields), $colnum++) {
-            $name = key($fields);
-            if ($colnum > 0) {
-                $query .= ',';
-                $values.= ',';
-            }
-            $query.= $this->quoteIdentifier($name, true);
-            if (isset($fields[$name]['null']) && $fields[$name]['null']) {
-                $value = 'NULL';
-            } else {
-                $type = isset($fields[$name]['type']) ? $fields[$name]['type'] : null;
-                $value = $this->quote($fields[$name]['value'], $type);
-                if (PEAR::isError($value)) {
-                    return $value;
-                }
-            }
-            $values.= $value;
-            if (isset($fields[$name]['key']) && $fields[$name]['key']) {
-                if ($value === 'NULL') {
-                    return $this->raiseError(MDB2_ERROR_CANNOT_REPLACE, null, null,
-                        'key value '.$name.' may not be NULL', __FUNCTION__);
-                }
-                $keys++;
-            }
-        }
-        if ($keys == 0) {
-            return $this->raiseError(MDB2_ERROR_CANNOT_REPLACE, null, null,
-                'not specified which fields are keys', __FUNCTION__);
-        }
-
-        $connection = $this->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-
-        $table = $this->quoteIdentifier($table, true);
-        $query = "REPLACE INTO $table ($query) VALUES ($values)";
-        $result =$this->_doQuery($query, true, $connection);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        return $this->_affectedRows($connection, $result);
-    }
-
-    // }}}
-    // {{{ nextID()
-
-    /**
-     * Returns the next free id of a sequence
-     *
-     * @param string $seq_name name of the sequence
-     * @param boolean $ondemand when true the sequence is
-     *                          automatic created, if it
-     *                          not exists
-     *
-     * @return mixed MDB2 Error Object or id
-     * @access public
-     */
-    function nextID($seq_name, $ondemand = true)
-    {
-        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq_name), true);
-        $seqcol_name = $this->options['seqcol_name'];
-        $query = "INSERT INTO $sequence_name ($seqcol_name) VALUES (NULL)";
-        $this->pushErrorHandling(PEAR_ERROR_RETURN);
-        $this->expectError(MDB2_ERROR_NOSUCHTABLE);
-        $result =$this->_doQuery($query, true);
-        $this->popExpect();
-        $this->popErrorHandling();
-        if (PEAR::isError($result)) {
-            if ($ondemand && $result->getCode() == MDB2_ERROR_NOSUCHTABLE) {
-                $this->loadModule('Manager', null, true);
-                $result = $this->manager->createSequence($seq_name);
-                if (PEAR::isError($result)) {
-                    return $this->raiseError($result, null, null,
-                        'on demand sequence '.$seq_name.' could not be created', __FUNCTION__);
-                } else {
-                    return $this->nextID($seq_name, false);
-                }
-            }
-            return $result;
-        }
-        $value = $this->lastInsertID();
-        if (is_numeric($value)) {
-            $query = "DELETE FROM $sequence_name WHERE $seqcol_name < $value";
-            $result =$this->_doQuery($query, true);
-            if (PEAR::isError($result)) {
-                $this->warnings[] = 'nextID: could not delete previous sequence table values from '.$seq_name;
-            }
-        }
-        return $value;
-    }
-
-    // }}}
-    // {{{ lastInsertID()
-
-    /**
-     * Returns the autoincrement ID if supported or $id or fetches the current
-     * ID in a sequence called: $table.(empty($field) ? '' : '_'.$field)
-     *
-     * @param string $table name of the table into which a new row was inserted
-     * @param string $field name of the field into which a new row was inserted
-     * @return mixed MDB2 Error Object or id
-     * @access public
-     */
-    function lastInsertID($table = null, $field = null)
-    {
-        $connection = $this->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-        $value = @sqlite_last_insert_rowid($connection);
-        if (!$value) {
-            return $this->raiseError(null, null, null,
-                'Could not get last insert ID', __FUNCTION__);
-        }
-        return $value;
-    }
-
-    // }}}
-    // {{{ currID()
-
-    /**
-     * Returns the current id of a sequence
-     *
-     * @param string $seq_name name of the sequence
-     * @return mixed MDB2 Error Object or id
-     * @access public
-     */
-    function currID($seq_name)
-    {
-        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq_name), true);
-        $seqcol_name = $this->quoteIdentifier($this->options['seqcol_name'], true);
-        $query = "SELECT MAX($seqcol_name) FROM $sequence_name";
-        return $this->queryOne($query, 'integer');
-    }
-}
-
-/**
- * MDB2 SQLite result driver
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Result_sqlite extends MDB2_Result_Common
-{
-    // }}}
-    // {{{ fetchRow()
-
-    /**
-     * Fetch a row and insert the data into an existing array.
-     *
-     * @param int       $fetchmode  how the array data should be indexed
-     * @param int    $rownum    number of the row where the data can be found
-     * @return int data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function &fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
-    {
-        if (!is_null($rownum)) {
-            $seek = $this->seek($rownum);
-            if (PEAR::isError($seek)) {
-                return $seek;
-            }
-        }
-        if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
-            $fetchmode = $this->db->fetchmode;
-        }
-        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
-            $row = @sqlite_fetch_array($this->result, SQLITE_ASSOC);
-            if (is_array($row)
-                && $this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
-            ) {
-                $row = array_change_key_case($row, $this->db->options['field_case']);
-            }
-        } else {
-           $row = @sqlite_fetch_array($this->result, SQLITE_NUM);
-        }
-        if (!$row) {
-            if ($this->result === false) {
-                $err =$this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                    'resultset has already been freed', __FUNCTION__);
-                return $err;
-            }
-            $null = null;
-            return $null;
-        }
-        $mode = $this->db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL;
-        $rtrim = false;
-        if ($this->db->options['portability'] & MDB2_PORTABILITY_RTRIM) {
-            if (empty($this->types)) {
-                $mode += MDB2_PORTABILITY_RTRIM;
-            } else {
-                $rtrim = true;
-            }
-        }
-        if ($mode) {
-            $this->db->_fixResultArrayValues($row, $mode);
-        }
-        if (!empty($this->types)) {
-            $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
-        }
-        if (!empty($this->values)) {
-            $this->_assignBindColumns($row);
-        }
-        if ($fetchmode === MDB2_FETCHMODE_OBJECT) {
-            $object_class = $this->db->options['fetch_class'];
-            if ($object_class == 'stdClass') {
-                $row = (object) $row;
-            } else {
-                $row = new $object_class($row);
-            }
-        }
-        ++$this->rownum;
-        return $row;
-    }
-
-    // }}}
-    // {{{ _getColumnNames()
-
-    /**
-     * Retrieve the names of columns returned by the DBMS in a query result.
-     *
-     * @return  mixed   Array variable that holds the names of columns as keys
-     *                  or an MDB2 error on failure.
-     *                  Some DBMS may not return any columns when the result set
-     *                  does not contain any rows.
-     * @access private
-     */
-    function _getColumnNames()
-    {
-        $columns = array();
-        $numcols = $this->numCols();
-        if (PEAR::isError($numcols)) {
-            return $numcols;
-        }
-        for ($column = 0; $column < $numcols; $column++) {
-            $column_name = @sqlite_field_name($this->result, $column);
-            $columns[$column_name] = $column;
-        }
-        if ($this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $columns = array_change_key_case($columns, $this->db->options['field_case']);
-        }
-        return $columns;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Count the number of columns returned by the DBMS in a query result.
-     *
-     * @access public
-     * @return mixed integer value with the number of columns, a MDB2 error
-     *                       on failure
-     */
-    function numCols()
-    {
-        $cols = @sqlite_num_fields($this->result);
-        if (is_null($cols)) {
-            if ($this->result === false) {
-                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                    'resultset has already been freed', __FUNCTION__);
-            } elseif (is_null($this->result)) {
-                return count($this->types);
-            }
-            return $this->db->raiseError(null, null, null,
-                'Could not get column count', __FUNCTION__);
-        }
-        return $cols;
-    }
-}
-
-/**
- * MDB2 SQLite buffered result driver
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_BufferedResult_sqlite extends MDB2_Result_sqlite
-{
-    // {{{ seek()
-
-    /**
-     * Seek to a specific row in a result set
-     *
-     * @param int    $rownum    number of the row where the data can be found
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function seek($rownum = 0)
-    {
-        if (!@sqlite_seek($this->result, $rownum)) {
-            if ($this->result === false) {
-                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                    'resultset has already been freed', __FUNCTION__);
-            } elseif (is_null($this->result)) {
-                return MDB2_OK;
-            }
-            return $this->db->raiseError(MDB2_ERROR_INVALID, null, null,
-                'tried to seek to an invalid row number ('.$rownum.')', __FUNCTION__);
-        }
-        $this->rownum = $rownum - 1;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ valid()
-
-    /**
-     * Check if the end of the result set has been reached
-     *
-     * @return mixed true or false on sucess, a MDB2 error on failure
-     * @access public
-     */
-    function valid()
-    {
-        $numrows = $this->numRows();
-        if (PEAR::isError($numrows)) {
-            return $numrows;
-        }
-        return $this->rownum < ($numrows - 1);
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Returns the number of rows in a result object
-     *
-     * @return mixed MDB2 Error Object or the number of rows
-     * @access public
-     */
-    function numRows()
-    {
-        $rows = @sqlite_num_rows($this->result);
-        if (is_null($rows)) {
-            if ($this->result === false) {
-                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                    'resultset has already been freed', __FUNCTION__);
-            } elseif (is_null($this->result)) {
-                return 0;
-            }
-            return $this->db->raiseError(null, null, null,
-                'Could not get row count', __FUNCTION__);
-        }
-        return $rows;
-    }
-}
-
-/**
- * MDB2 SQLite statement driver
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Statement_sqlite extends MDB2_Statement_Common
-{
-
-}
-
-?>
diff --git a/3rdparty/MDB2/Extended.php b/3rdparty/MDB2/Extended.php
deleted file mode 100644
index 864ab923543..00000000000
--- a/3rdparty/MDB2/Extended.php
+++ /dev/null
@@ -1,721 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: Extended.php,v 1.60 2007/11/28 19:49:34 quipo Exp $
-
-/**
- * @package  MDB2
- * @category Database
- * @author   Lukas Smith <smith@pooteeweet.org>
- */
-
-/**
- * Used by autoPrepare()
- */
-define('MDB2_AUTOQUERY_INSERT', 1);
-define('MDB2_AUTOQUERY_UPDATE', 2);
-define('MDB2_AUTOQUERY_DELETE', 3);
-define('MDB2_AUTOQUERY_SELECT', 4);
-
-/**
- * MDB2_Extended: class which adds several high level methods to MDB2
- *
- * @package MDB2
- * @category Database
- * @author Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Extended extends MDB2_Module_Common
-{
-    // {{{ autoPrepare()
-
-    /**
-     * Generate an insert, update or delete query and call prepare() on it
-     *
-     * @param string table
-     * @param array the fields names
-     * @param int type of query to build
-     *                          MDB2_AUTOQUERY_INSERT
-     *                          MDB2_AUTOQUERY_UPDATE
-     *                          MDB2_AUTOQUERY_DELETE
-     *                          MDB2_AUTOQUERY_SELECT
-     * @param string (in case of update and delete queries, this string will be put after the sql WHERE statement)
-     * @param array that contains the types of the placeholders
-     * @param mixed array that contains the types of the columns in
-     *                        the result set or MDB2_PREPARE_RESULT, if set to
-     *                        MDB2_PREPARE_MANIP the query is handled as a manipulation query
-     *
-     * @return resource handle for the query
-     * @see buildManipSQL
-     * @access public
-     */
-    function autoPrepare($table, $table_fields, $mode = MDB2_AUTOQUERY_INSERT,
-        $where = false, $types = null, $result_types = MDB2_PREPARE_MANIP)
-    {
-        $query = $this->buildManipSQL($table, $table_fields, $mode, $where);
-        if (PEAR::isError($query)) {
-            return $query;
-        }
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        $lobs = array();
-        foreach ((array)$types as $param => $type) {
-            if (($type == 'clob') || ($type == 'blob')) {
-                $lobs[$param] = $table_fields[$param];
-            }
-        }
-        return $db->prepare($query, $types, $result_types, $lobs);
-    }
-
-    // }}}
-    // {{{ autoExecute()
-
-    /**
-     * Generate an insert, update or delete query and call prepare() and execute() on it
-     *
-     * @param string name of the table
-     * @param array assoc ($key=>$value) where $key is a field name and $value its value
-     * @param int type of query to build
-     *                          MDB2_AUTOQUERY_INSERT
-     *                          MDB2_AUTOQUERY_UPDATE
-     *                          MDB2_AUTOQUERY_DELETE
-     *                          MDB2_AUTOQUERY_SELECT
-     * @param string (in case of update and delete queries, this string will be put after the sql WHERE statement)
-     * @param array that contains the types of the placeholders
-     * @param string which specifies which result class to use
-     * @param mixed  array that contains the types of the columns in
-     *                        the result set or MDB2_PREPARE_RESULT, if set to
-     *                        MDB2_PREPARE_MANIP the query is handled as a manipulation query
-     *
-     * @return bool|MDB2_Error true on success, a MDB2 error on failure
-     * @see buildManipSQL
-     * @see autoPrepare
-     * @access public
-    */
-    function &autoExecute($table, $fields_values, $mode = MDB2_AUTOQUERY_INSERT,
-        $where = false, $types = null, $result_class = true, $result_types = MDB2_PREPARE_MANIP)
-    {
-        $fields_values = (array)$fields_values;
-        if ($mode == MDB2_AUTOQUERY_SELECT) {
-            if (is_array($result_types)) {
-                $keys = array_keys($result_types);
-            } elseif (!empty($fields_values)) {
-                $keys = $fields_values;
-            } else {
-                $keys = array();
-            }
-        } else {
-            $keys = array_keys($fields_values);
-        }
-        $params = array_values($fields_values);
-        if (empty($params)) {
-            $query = $this->buildManipSQL($table, $keys, $mode, $where);
-
-            $db =& $this->getDBInstance();
-            if (PEAR::isError($db)) {
-                return $db;
-            }
-            if ($mode == MDB2_AUTOQUERY_SELECT) {
-                $result =& $db->query($query, $result_types, $result_class);
-            } else {
-                $result = $db->exec($query);
-            }
-        } else {
-            $stmt = $this->autoPrepare($table, $keys, $mode, $where, $types, $result_types);
-            if (PEAR::isError($stmt)) {
-                return $stmt;
-            }
-            $result =& $stmt->execute($params, $result_class);
-            $stmt->free();
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ buildManipSQL()
-
-    /**
-     * Make automaticaly an sql query for prepare()
-     *
-     * Example : buildManipSQL('table_sql', array('field1', 'field2', 'field3'), MDB2_AUTOQUERY_INSERT)
-     *           will return the string : INSERT INTO table_sql (field1,field2,field3) VALUES (?,?,?)
-     * NB : - This belongs more to a SQL Builder class, but this is a simple facility
-     *      - Be carefull ! If you don't give a $where param with an UPDATE/DELETE query, all
-     *        the records of the table will be updated/deleted !
-     *
-     * @param string name of the table
-     * @param ordered array containing the fields names
-     * @param int type of query to build
-     *                          MDB2_AUTOQUERY_INSERT
-     *                          MDB2_AUTOQUERY_UPDATE
-     *                          MDB2_AUTOQUERY_DELETE
-     *                          MDB2_AUTOQUERY_SELECT
-     * @param string (in case of update and delete queries, this string will be put after the sql WHERE statement)
-     *
-     * @return string sql query for prepare()
-     * @access public
-     */
-    function buildManipSQL($table, $table_fields, $mode, $where = false)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if ($db->options['quote_identifier']) {
-            $table = $db->quoteIdentifier($table);
-        }
-
-        if (!empty($table_fields) && $db->options['quote_identifier']) {
-            foreach ($table_fields as $key => $field) {
-                $table_fields[$key] = $db->quoteIdentifier($field);
-            }
-        }
-
-        if ($where !== false && !is_null($where)) {
-            if (is_array($where)) {
-                $where = implode(' AND ', $where);
-            }
-            $where = ' WHERE '.$where;
-        }
-
-        switch ($mode) {
-        case MDB2_AUTOQUERY_INSERT:
-            if (empty($table_fields)) {
-                return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                'Insert requires table fields', __FUNCTION__);
-            }
-            $cols = implode(', ', $table_fields);
-            $values = '?'.str_repeat(', ?', (count($table_fields) - 1));
-            return 'INSERT INTO '.$table.' ('.$cols.') VALUES ('.$values.')';
-            break;
-        case MDB2_AUTOQUERY_UPDATE:
-            if (empty($table_fields)) {
-                return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                'Update requires table fields', __FUNCTION__);
-            }
-            $set = implode(' = ?, ', $table_fields).' = ?';
-            $sql = 'UPDATE '.$table.' SET '.$set.$where;
-            return $sql;
-            break;
-        case MDB2_AUTOQUERY_DELETE:
-            $sql = 'DELETE FROM '.$table.$where;
-            return $sql;
-            break;
-        case MDB2_AUTOQUERY_SELECT:
-            $cols = !empty($table_fields) ? implode(', ', $table_fields) : '*';
-            $sql = 'SELECT '.$cols.' FROM '.$table.$where;
-            return $sql;
-            break;
-        }
-        return $db->raiseError(MDB2_ERROR_SYNTAX, null, null,
-                'Non existant mode', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ limitQuery()
-
-    /**
-     * Generates a limited query
-     *
-     * @param string query
-     * @param array that contains the types of the columns in the result set
-     * @param integer the numbers of rows to fetch
-     * @param integer the row to start to fetching
-     * @param string which specifies which result class to use
-     * @param mixed   string which specifies which class to wrap results in
-     *
-     * @return MDB2_Result|MDB2_Error result set on success, a MDB2 error on failure
-     * @access public
-     */
-    function &limitQuery($query, $types, $limit, $offset = 0, $result_class = true,
-        $result_wrap_class = false)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $result = $db->setLimit($limit, $offset);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $result =& $db->query($query, $types, $result_class, $result_wrap_class);
-        return $result;
-    }
-
-    // }}}
-    // {{{ execParam()
-
-    /**
-     * Execute a parameterized DML statement.
-     *
-     * @param string the SQL query
-     * @param array if supplied, prepare/execute will be used
-     *       with this array as execute parameters
-     * @param array that contains the types of the values defined in $params
-     *
-     * @return int|MDB2_Error affected rows on success, a MDB2 error on failure
-     * @access public
-     */
-    function execParam($query, $params = array(), $param_types = null)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        settype($params, 'array');
-        if (empty($params)) {
-            return $db->exec($query);
-        }
-
-        $stmt = $db->prepare($query, $param_types, MDB2_PREPARE_MANIP);
-        if (PEAR::isError($stmt)) {
-            return $stmt;
-        }
-
-        $result = $stmt->execute($params);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        $stmt->free();
-        return $result;
-    }
-
-    // }}}
-    // {{{ getOne()
-
-    /**
-     * Fetch the first column of the first row of data returned from a query.
-     * Takes care of doing the query and freeing the results when finished.
-     *
-     * @param string the SQL query
-     * @param string that contains the type of the column in the result set
-     * @param array if supplied, prepare/execute will be used
-     *       with this array as execute parameters
-     * @param array that contains the types of the values defined in $params
-     * @param int|string which column to return
-     *
-     * @return scalar|MDB2_Error data on success, a MDB2 error on failure
-     * @access public
-     */
-    function getOne($query, $type = null, $params = array(),
-        $param_types = null, $colnum = 0)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        settype($params, 'array');
-        settype($type, 'array');
-        if (empty($params)) {
-            return $db->queryOne($query, $type, $colnum);
-        }
-
-        $stmt = $db->prepare($query, $param_types, $type);
-        if (PEAR::isError($stmt)) {
-            return $stmt;
-        }
-
-        $result = $stmt->execute($params);
-        if (!MDB2::isResultCommon($result)) {
-            return $result;
-        }
-
-        $one = $result->fetchOne($colnum);
-        $stmt->free();
-        $result->free();
-        return $one;
-    }
-
-    // }}}
-    // {{{ getRow()
-
-    /**
-     * Fetch the first row of data returned from a query.  Takes care
-     * of doing the query and freeing the results when finished.
-     *
-     * @param string the SQL query
-     * @param array that contains the types of the columns in the result set
-     * @param array if supplied, prepare/execute will be used
-     *       with this array as execute parameters
-     * @param array that contains the types of the values defined in $params
-     * @param int the fetch mode to use
-     *
-     * @return array|MDB2_Error data on success, a MDB2 error on failure
-     * @access public
-     */
-    function getRow($query, $types = null, $params = array(),
-        $param_types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        settype($params, 'array');
-        if (empty($params)) {
-            return $db->queryRow($query, $types, $fetchmode);
-        }
-
-        $stmt = $db->prepare($query, $param_types, $types);
-        if (PEAR::isError($stmt)) {
-            return $stmt;
-        }
-
-        $result = $stmt->execute($params);
-        if (!MDB2::isResultCommon($result)) {
-            return $result;
-        }
-
-        $row = $result->fetchRow($fetchmode);
-        $stmt->free();
-        $result->free();
-        return $row;
-    }
-
-    // }}}
-    // {{{ getCol()
-
-    /**
-     * Fetch a single column from a result set and return it as an
-     * indexed array.
-     *
-     * @param string the SQL query
-     * @param string that contains the type of the column in the result set
-     * @param array if supplied, prepare/execute will be used
-     *       with this array as execute parameters
-     * @param array that contains the types of the values defined in $params
-     * @param int|string which column to return
-     *
-     * @return array|MDB2_Error data on success, a MDB2 error on failure
-     * @access public
-     */
-    function getCol($query, $type = null, $params = array(),
-        $param_types = null, $colnum = 0)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        settype($params, 'array');
-        settype($type, 'array');
-        if (empty($params)) {
-            return $db->queryCol($query, $type, $colnum);
-        }
-
-        $stmt = $db->prepare($query, $param_types, $type);
-        if (PEAR::isError($stmt)) {
-            return $stmt;
-        }
-
-        $result = $stmt->execute($params);
-        if (!MDB2::isResultCommon($result)) {
-            return $result;
-        }
-
-        $col = $result->fetchCol($colnum);
-        $stmt->free();
-        $result->free();
-        return $col;
-    }
-
-    // }}}
-    // {{{ getAll()
-
-    /**
-     * Fetch all the rows returned from a query.
-     *
-     * @param string the SQL query
-     * @param array that contains the types of the columns in the result set
-     * @param array if supplied, prepare/execute will be used
-     *       with this array as execute parameters
-     * @param array that contains the types of the values defined in $params
-     * @param int the fetch mode to use
-     * @param bool if set to true, the $all will have the first
-     *       column as its first dimension
-     * @param bool $force_array used only when the query returns exactly
-     *       two columns. If true, the values of the returned array will be
-     *       one-element arrays instead of scalars.
-     * @param bool $group if true, the values of the returned array is
-     *       wrapped in another array.  If the same key value (in the first
-     *       column) repeats itself, the values will be appended to this array
-     *       instead of overwriting the existing values.
-     *
-     * @return array|MDB2_Error data on success, a MDB2 error on failure
-     * @access public
-     */
-    function getAll($query, $types = null, $params = array(),
-        $param_types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT,
-        $rekey = false, $force_array = false, $group = false)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        settype($params, 'array');
-        if (empty($params)) {
-            return $db->queryAll($query, $types, $fetchmode, $rekey, $force_array, $group);
-        }
-
-        $stmt = $db->prepare($query, $param_types, $types);
-        if (PEAR::isError($stmt)) {
-            return $stmt;
-        }
-
-        $result = $stmt->execute($params);
-        if (!MDB2::isResultCommon($result)) {
-            return $result;
-        }
-
-        $all = $result->fetchAll($fetchmode, $rekey, $force_array, $group);
-        $stmt->free();
-        $result->free();
-        return $all;
-    }
-
-    // }}}
-    // {{{ getAssoc()
-
-    /**
-     * Fetch the entire result set of a query and return it as an
-     * associative array using the first column as the key.
-     *
-     * If the result set contains more than two columns, the value
-     * will be an array of the values from column 2-n.  If the result
-     * set contains only two columns, the returned value will be a
-     * scalar with the value of the second column (unless forced to an
-     * array with the $force_array parameter).  A MDB2 error code is
-     * returned on errors.  If the result set contains fewer than two
-     * columns, a MDB2_ERROR_TRUNCATED error is returned.
-     *
-     * For example, if the table 'mytable' contains:
-     * <pre>
-     *   ID      TEXT       DATE
-     * --------------------------------
-     *   1       'one'      944679408
-     *   2       'two'      944679408
-     *   3       'three'    944679408
-     * </pre>
-     * Then the call getAssoc('SELECT id,text FROM mytable') returns:
-     * <pre>
-     *    array(
-     *      '1' => 'one',
-     *      '2' => 'two',
-     *      '3' => 'three',
-     *    )
-     * </pre>
-     * ...while the call getAssoc('SELECT id,text,date FROM mytable') returns:
-     * <pre>
-     *    array(
-     *      '1' => array('one', '944679408'),
-     *      '2' => array('two', '944679408'),
-     *      '3' => array('three', '944679408')
-     *    )
-     * </pre>
-     *
-     * If the more than one row occurs with the same value in the
-     * first column, the last row overwrites all previous ones by
-     * default.  Use the $group parameter if you don't want to
-     * overwrite like this.  Example:
-     * <pre>
-     * getAssoc('SELECT category,id,name FROM mytable', null, null
-     *           MDB2_FETCHMODE_ASSOC, false, true) returns:
-     *    array(
-     *      '1' => array(array('id' => '4', 'name' => 'number four'),
-     *                   array('id' => '6', 'name' => 'number six')
-     *             ),
-     *      '9' => array(array('id' => '4', 'name' => 'number four'),
-     *                   array('id' => '6', 'name' => 'number six')
-     *             )
-     *    )
-     * </pre>
-     *
-     * Keep in mind that database functions in PHP usually return string
-     * values for results regardless of the database's internal type.
-     *
-     * @param string the SQL query
-     * @param array that contains the types of the columns in the result set
-     * @param array if supplied, prepare/execute will be used
-     *       with this array as execute parameters
-     * @param array that contains the types of the values defined in $params
-     * @param bool $force_array used only when the query returns
-     * exactly two columns.  If TRUE, the values of the returned array
-     * will be one-element arrays instead of scalars.
-     * @param bool $group if TRUE, the values of the returned array
-     *       is wrapped in another array.  If the same key value (in the first
-     *       column) repeats itself, the values will be appended to this array
-     *       instead of overwriting the existing values.
-     *
-     * @return array|MDB2_Error data on success, a MDB2 error on failure
-     * @access public
-     */
-    function getAssoc($query, $types = null, $params = array(), $param_types = null,
-        $fetchmode = MDB2_FETCHMODE_DEFAULT, $force_array = false, $group = false)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        settype($params, 'array');
-        if (empty($params)) {
-            return $db->queryAll($query, $types, $fetchmode, true, $force_array, $group);
-        }
-
-        $stmt = $db->prepare($query, $param_types, $types);
-        if (PEAR::isError($stmt)) {
-            return $stmt;
-        }
-
-        $result = $stmt->execute($params);
-        if (!MDB2::isResultCommon($result)) {
-            return $result;
-        }
-
-        $all = $result->fetchAll($fetchmode, true, $force_array, $group);
-        $stmt->free();
-        $result->free();
-        return $all;
-    }
-
-    // }}}
-    // {{{ executeMultiple()
-
-    /**
-     * This function does several execute() calls on the same statement handle.
-     * $params must be an array indexed numerically from 0, one execute call is
-     * done for every 'row' in the array.
-     *
-     * If an error occurs during execute(), executeMultiple() does not execute
-     * the unfinished rows, but rather returns that error.
-     *
-     * @param resource query handle from prepare()
-     * @param array numeric array containing the data to insert into the query
-     *
-     * @return bool|MDB2_Error true on success, a MDB2 error on failure
-     * @access public
-     * @see prepare(), execute()
-     */
-    function executeMultiple(&$stmt, $params = null)
-    {
-        for ($i = 0, $j = count($params); $i < $j; $i++) {
-            $result = $stmt->execute($params[$i]);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ getBeforeID()
-
-    /**
-     * Returns the next free id of a sequence if the RDBMS
-     * does not support auto increment
-     *
-     * @param string name of the table into which a new row was inserted
-     * @param string name of the field into which a new row was inserted
-     * @param bool when true the sequence is automatic created, if it not exists
-     * @param bool if the returned value should be quoted
-     *
-     * @return int|MDB2_Error id on success, a MDB2 error on failure
-     * @access public
-     */
-    function getBeforeID($table, $field = null, $ondemand = true, $quote = true)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if ($db->supports('auto_increment') !== true) {
-            $seq = $table.(empty($field) ? '' : '_'.$field);
-            $id = $db->nextID($seq, $ondemand);
-            if (!$quote || PEAR::isError($id)) {
-                return $id;
-            }
-            return $db->quote($id, 'integer');
-        } elseif (!$quote) {
-            return null;
-        }
-        return 'NULL';
-    }
-
-    // }}}
-    // {{{ getAfterID()
-
-    /**
-     * Returns the autoincrement ID if supported or $id
-     *
-     * @param mixed value as returned by getBeforeId()
-     * @param string name of the table into which a new row was inserted
-     * @param string name of the field into which a new row was inserted
-     *
-     * @return int|MDB2_Error id on success, a MDB2 error on failure
-     * @access public
-     */
-    function getAfterID($id, $table, $field = null)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if ($db->supports('auto_increment') !== true) {
-            return $id;
-        }
-        return $db->lastInsertID($table, $field);
-    }
-
-    // }}}
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Iterator.php b/3rdparty/MDB2/Iterator.php
deleted file mode 100644
index ca5e7b69c27..00000000000
--- a/3rdparty/MDB2/Iterator.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: Iterator.php,v 1.22 2006/05/06 14:03:41 lsmith Exp $
-
-/**
- * PHP5 Iterator
- *
- * @package  MDB2
- * @category Database
- * @author   Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Iterator implements Iterator
-{
-    protected $fetchmode;
-    protected $result;
-    protected $row;
-
-    // {{{ constructor
-
-    /**
-     * Constructor
-     */
-    public function __construct($result, $fetchmode = MDB2_FETCHMODE_DEFAULT)
-    {
-        $this->result = $result;
-        $this->fetchmode = $fetchmode;
-    }
-    // }}}
-
-    // {{{ seek()
-
-    /**
-     * Seek forward to a specific row in a result set
-     *
-     * @param int number of the row where the data can be found
-     *
-     * @return void
-     * @access public
-     */
-    public function seek($rownum)
-    {
-        $this->row = null;
-        if ($this->result) {
-            $this->result->seek($rownum);
-        }
-    }
-    // }}}
-
-    // {{{ next()
-
-    /**
-     * Fetch next row of data
-     *
-     * @return void
-     * @access public
-     */
-    public function next()
-    {
-        $this->row = null;
-    }
-    // }}}
-
-    // {{{ current()
-
-    /**
-     * return a row of data
-     *
-     * @return void
-     * @access public
-     */
-    public function current()
-    {
-        if (is_null($this->row)) {
-            $row = $this->result->fetchRow($this->fetchmode);
-            if (PEAR::isError($row)) {
-                $row = false;
-            }
-            $this->row = $row;
-        }
-        return $this->row;
-    }
-    // }}}
-
-    // {{{ valid()
-
-    /**
-     * Check if the end of the result set has been reached
-     *
-     * @return bool true/false, false is also returned on failure
-     * @access public
-     */
-    public function valid()
-    {
-        return (bool)$this->current();
-    }
-    // }}}
-
-    // {{{ free()
-
-    /**
-     * Free the internal resources associated with result.
-     *
-     * @return bool|MDB2_Error true on success, false|MDB2_Error if result is invalid
-     * @access public
-     */
-    public function free()
-    {
-        if ($this->result) {
-            return $this->result->free();
-        }
-        $this->result = false;
-        $this->row = null;
-        return false;
-    }
-    // }}}
-
-    // {{{ key()
-
-    /**
-     * Returns the row number
-     *
-     * @return int|bool|MDB2_Error true on success, false|MDB2_Error if result is invalid
-     * @access public
-     */
-    public function key()
-    {
-        if ($this->result) {
-            return $this->result->rowCount();
-        }
-        return false;
-    }
-    // }}}
-
-    // {{{ rewind()
-
-    /**
-     * Seek to the first row in a result set
-     *
-     * @return void
-     * @access public
-     */
-    public function rewind()
-    {
-    }
-    // }}}
-
-    // {{{ destructor
-
-    /**
-     * Destructor
-     */
-    public function __destruct()
-    {
-        $this->free();
-    }
-    // }}}
-}
-
-/**
- * PHP5 buffered Iterator
- *
- * @package  MDB2
- * @category Database
- * @author   Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_BufferedIterator extends MDB2_Iterator implements SeekableIterator
-{
-    // {{{ valid()
-
-    /**
-     * Check if the end of the result set has been reached
-     *
-     * @return bool|MDB2_Error true on success, false|MDB2_Error if result is invalid
-     * @access public
-     */
-    public function valid()
-    {
-        if ($this->result) {
-            return $this->result->valid();
-        }
-        return false;
-    }
-    // }}}
-
-    // {{{count()
-
-    /**
-     * Returns the number of rows in a result object
-     *
-     * @return int|MDB2_Error number of rows, false|MDB2_Error if result is invalid
-     * @access public
-     */
-    public function count()
-    {
-        if ($this->result) {
-            return $this->result->numRows();
-        }
-        return false;
-    }
-    // }}}
-
-    // {{{ rewind()
-
-    /**
-     * Seek to the first row in a result set
-     *
-     * @return void
-     * @access public
-     */
-    public function rewind()
-    {
-        $this->seek(0);
-    }
-    // }}}
-}
-
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/LOB.php b/3rdparty/MDB2/LOB.php
deleted file mode 100644
index ae67224020e..00000000000
--- a/3rdparty/MDB2/LOB.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lukas Smith <smith@pooteeweet.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: LOB.php,v 1.34 2006/10/25 11:52:21 lsmith Exp $
-
-/**
- * @package  MDB2
- * @category Database
- * @author   Lukas Smith <smith@pooteeweet.org>
- */
-
-require_once('MDB2.php');
-
-/**
- * MDB2_LOB: user land stream wrapper implementation for LOB support
- *
- * @package MDB2
- * @category Database
- * @author Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_LOB
-{
-    /**
-     * contains the key to the global MDB2 instance array of the associated
-     * MDB2 instance
-     *
-     * @var integer
-     * @access protected
-     */
-    var $db_index;
-
-    /**
-     * contains the key to the global MDB2_LOB instance array of the associated
-     * MDB2_LOB instance
-     *
-     * @var integer
-     * @access protected
-     */
-    var $lob_index;
-
-    // {{{ stream_open()
-
-    /**
-     * open stream
-     *
-     * @param string specifies the URL that was passed to fopen()
-     * @param string the mode used to open the file
-     * @param int holds additional flags set by the streams API
-     * @param string not used
-     *
-     * @return bool
-     * @access public
-     */
-    function stream_open($path, $mode, $options, &$opened_path)
-    {
-        if (!preg_match('/^rb?\+?$/', $mode)) {
-            return false;
-        }
-        $url = parse_url($path);
-        if (empty($url['host'])) {
-            return false;
-        }
-        $this->db_index = (int)$url['host'];
-        if (!isset($GLOBALS['_MDB2_databases'][$this->db_index])) {
-            return false;
-        }
-        $db =& $GLOBALS['_MDB2_databases'][$this->db_index];
-        $this->lob_index = (int)$url['user'];
-        if (!isset($db->datatype->lobs[$this->lob_index])) {
-            return false;
-        }
-        return true;
-    }
-    // }}}
-
-    // {{{ stream_read()
-
-    /**
-     * read stream
-     *
-     * @param int number of bytes to read
-     *
-     * @return string
-     * @access public
-     */
-    function stream_read($count)
-    {
-        if (isset($GLOBALS['_MDB2_databases'][$this->db_index])) {
-            $db =& $GLOBALS['_MDB2_databases'][$this->db_index];
-            $db->datatype->_retrieveLOB($db->datatype->lobs[$this->lob_index]);
-
-            $data = $db->datatype->_readLOB($db->datatype->lobs[$this->lob_index], $count);
-            $length = strlen($data);
-            if ($length == 0) {
-                $db->datatype->lobs[$this->lob_index]['endOfLOB'] = true;
-            }
-            $db->datatype->lobs[$this->lob_index]['position'] += $length;
-            return $data;
-        }
-    }
-    // }}}
-
-    // {{{ stream_write()
-
-    /**
-     * write stream, note implemented
-     *
-     * @param string data
-     *
-     * @return int
-     * @access public
-     */
-    function stream_write($data)
-    {
-        return 0;
-    }
-    // }}}
-
-    // {{{ stream_tell()
-
-    /**
-     * return the current position
-     *
-     * @return int current position
-     * @access public
-     */
-    function stream_tell()
-    {
-        if (isset($GLOBALS['_MDB2_databases'][$this->db_index])) {
-            $db =& $GLOBALS['_MDB2_databases'][$this->db_index];
-            return $db->datatype->lobs[$this->lob_index]['position'];
-        }
-    }
-    // }}}
-
-    // {{{ stream_eof()
-
-    /**
-     * Check if stream reaches EOF
-     *
-     * @return bool
-     * @access public
-     */
-    function stream_eof()
-    {
-        if (!isset($GLOBALS['_MDB2_databases'][$this->db_index])) {
-            return true;
-        }
-
-        $db =& $GLOBALS['_MDB2_databases'][$this->db_index];
-        $result = $db->datatype->_endOfLOB($db->datatype->lobs[$this->lob_index]);
-        if (version_compare(phpversion(), "5.0", ">=")
-            && version_compare(phpversion(), "5.1", "<")
-        ) {
-            return !$result;
-        }
-        return $result;
-    }
-    // }}}
-
-    // {{{ stream_seek()
-
-    /**
-     * Seek stream, not implemented
-     *
-     * @param int offset
-     * @param int whence
-     *
-     * @return bool
-     * @access public
-     */
-    function stream_seek($offset, $whence)
-    {
-        return false;
-    }
-    // }}}
-
-    // {{{ stream_stat()
-
-    /**
-     * return information about stream
-     *
-     * @access public
-     */
-    function stream_stat()
-    {
-        if (isset($GLOBALS['_MDB2_databases'][$this->db_index])) {
-            $db =& $GLOBALS['_MDB2_databases'][$this->db_index];
-            return array(
-              'db_index' => $this->db_index,
-              'lob_index' => $this->lob_index,
-            );
-        }
-    }
-    // }}}
-
-    // {{{ stream_close()
-
-    /**
-     * close stream
-     *
-     * @access public
-     */
-    function stream_close()
-    {
-        if (isset($GLOBALS['_MDB2_databases'][$this->db_index])) {
-            $db =& $GLOBALS['_MDB2_databases'][$this->db_index];
-            if (isset($db->datatype->lobs[$this->lob_index])) {
-                $db->datatype->_destroyLOB($db->datatype->lobs[$this->lob_index]);
-                unset($db->datatype->lobs[$this->lob_index]);
-            }
-        }
-    }
-    // }}}
-}
-
-// register streams wrapper
-if (!stream_wrapper_register("MDB2LOB", "MDB2_LOB")) {
-    MDB2::raiseError();
-    return false;
-}
-
-?>
diff --git a/3rdparty/MDB2/Schema.php b/3rdparty/MDB2/Schema.php
deleted file mode 100644
index 25818460a62..00000000000
--- a/3rdparty/MDB2/Schema.php
+++ /dev/null
@@ -1,2763 +0,0 @@
-<?php
-/**
- * PHP version 4, 5
- *
- * Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,
- * Stig. S. Bakken, Lukas Smith, Igor Feghali
- * All rights reserved.
- *
- * MDB2_Schema enables users to maintain RDBMS independant schema files
- * in XML that can be used to manipulate both data and database schemas
- * This LICENSE is in the BSD license style.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,
- * Lukas Smith, Igor Feghali nor the names of his contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Author: Lukas Smith <smith@pooteeweet.org>
- * Author: Igor Feghali <ifeghali@php.net>
- *
- * @category Database
- * @package  MDB2_Schema
- * @author   Lukas Smith <smith@pooteeweet.org>
- * @author   Igor Feghali <ifeghali@php.net>
- * @license  BSD http://www.opensource.org/licenses/bsd-license.php
- * @version  CVS: $Id: Schema.php,v 1.132 2009/02/22 21:43:22 ifeghali Exp $
- * @link     http://pear.php.net/packages/MDB2_Schema
- */
-
-// require_once('MDB2.php');
-
-define('MDB2_SCHEMA_DUMP_ALL',       0);
-define('MDB2_SCHEMA_DUMP_STRUCTURE', 1);
-define('MDB2_SCHEMA_DUMP_CONTENT',   2);
-
-/**
- * If you add an error code here, make sure you also add a textual
- * version of it in MDB2_Schema::errorMessage().
- */
-
-define('MDB2_SCHEMA_ERROR',             -1);
-define('MDB2_SCHEMA_ERROR_PARSE',       -2);
-define('MDB2_SCHEMA_ERROR_VALIDATE',    -3);
-define('MDB2_SCHEMA_ERROR_UNSUPPORTED', -4);    // Driver does not support this function
-define('MDB2_SCHEMA_ERROR_INVALID',     -5);    // Invalid attribute value
-define('MDB2_SCHEMA_ERROR_WRITER',      -6);
-
-/**
- * The database manager is a class that provides a set of database
- * management services like installing, altering and dumping the data
- * structures of databases.
- *
- * @category Database
- * @package  MDB2_Schema
- * @author   Lukas Smith <smith@pooteeweet.org>
- * @license  BSD http://www.opensource.org/licenses/bsd-license.php
- * @link     http://pear.php.net/packages/MDB2_Schema
- */
-class MDB2_Schema extends PEAR
-{
-    // {{{ properties
-
-    var $db;
-
-    var $warnings = array();
-
-    var $options = array(
-        'fail_on_invalid_names' => true,
-        'dtd_file'              => false,
-        'valid_types'           => array(),
-        'force_defaults'        => true,
-        'parser'                => 'MDB2_Schema_Parser',
-        'writer'                => 'MDB2_Schema_Writer',
-        'validate'              => 'MDB2_Schema_Validate',
-        'drop_missing_tables'   => false
-    );
-
-    // }}}
-    // {{{ apiVersion()
-
-    /**
-     * Return the MDB2 API version
-     *
-     * @return string  the MDB2 API version number
-     * @access public
-     */
-    function apiVersion()
-    {
-        return '0.4.3';
-    }
-
-    // }}}
-    // {{{ arrayMergeClobber()
-
-    /**
-     * Clobbers two arrays together
-     *
-     * @param array $a1 array that should be clobbered
-     * @param array $a2 array that should be clobbered
-     *
-     * @return array|false  array on success and false on error
-     *
-     * @access public
-     * @author kc@hireability.com
-     */
-    function arrayMergeClobber($a1, $a2)
-    {
-        if (!is_array($a1) || !is_array($a2)) {
-            return false;
-        }
-        foreach ($a2 as $key => $val) {
-            if (is_array($val) && array_key_exists($key, $a1) && is_array($a1[$key])) {
-                $a1[$key] = MDB2_Schema::arrayMergeClobber($a1[$key], $val);
-            } else {
-                $a1[$key] = $val;
-            }
-        }
-        return $a1;
-    }
-
-    // }}}
-    // {{{ resetWarnings()
-
-    /**
-     * reset the warning array
-     *
-     * @access public
-     * @return void
-     */
-    function resetWarnings()
-    {
-        $this->warnings = array();
-    }
-
-    // }}}
-    // {{{ getWarnings()
-
-    /**
-     * Get all warnings in reverse order
-     *
-     * This means that the last warning is the first element in the array
-     *
-     * @return array with warnings
-     * @access public
-     * @see resetWarnings()
-     */
-    function getWarnings()
-    {
-        return array_reverse($this->warnings);
-    }
-
-    // }}}
-    // {{{ setOption()
-
-    /**
-     * Sets the option for the db class
-     *
-     * @param string $option option name
-     * @param mixed  $value  value for the option
-     *
-     * @return bool|MDB2_Error MDB2_OK or error object
-     * @access public
-     */
-    function setOption($option, $value)
-    {
-        if (isset($this->options[$option])) {
-            if (is_null($value)) {
-                return $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
-                    'may not set an option to value null');
-            }
-            $this->options[$option] = $value;
-            return MDB2_OK;
-        }
-        return $this->raiseError(MDB2_SCHEMA_ERROR_UNSUPPORTED, null, null,
-            "unknown option $option");
-    }
-
-    // }}}
-    // {{{ getOption()
-
-    /**
-     * returns the value of an option
-     *
-     * @param string $option option name
-     *
-     * @return mixed the option value or error object
-     * @access public
-     */
-    function getOption($option)
-    {
-        if (isset($this->options[$option])) {
-            return $this->options[$option];
-        }
-        return $this->raiseError(MDB2_SCHEMA_ERROR_UNSUPPORTED,
-            null, null, "unknown option $option");
-    }
-
-    // }}}
-    // {{{ factory()
-
-    /**
-     * Create a new MDB2 object for the specified database type
-     * type
-     *
-     * @param string|array|MDB2_Driver_Common &$db     'data source name', see the
-     *                                                 MDB2::parseDSN method for a description of the dsn format.
-     *                                                 Can also be specified as an array of the
-     *                                                 format returned by @see MDB2::parseDSN.
-     *                                                 Finally you can also pass an existing db object to be used.
-     * @param array                           $options An associative array of option names and their values.
-     *
-     * @return bool|MDB2_Error MDB2_OK or error object
-     * @access public
-     * @see     MDB2::parseDSN
-     */
-    static function factory(&$db, $options = array())
-    {
-        $obj =new MDB2_Schema();
-        $result = $obj->connect($db, $options);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        return $obj;
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Create a new MDB2 connection object and connect to the specified
-     * database
-     *
-     * @param string|array|MDB2_Driver_Common &$db     'data source name', see the
-     *              MDB2::parseDSN method for a description of the dsn format.
-     *              Can also be specified as an array of the
-     *              format returned by MDB2::parseDSN.
-     *              Finally you can also pass an existing db object to be used.
-     * @param array                           $options An associative array of option names and their values.
-     *
-     * @return bool|MDB2_Error MDB2_OK or error object
-     * @access public
-     * @see    MDB2::parseDSN
-     */
-    function connect(&$db, $options = array())
-    {
-        $db_options = array();
-        if (is_array($options)) {
-            foreach ($options as $option => $value) {
-                if (array_key_exists($option, $this->options)) {
-                    $result = $this->setOption($option, $value);
-                    if (PEAR::isError($result)) {
-                        return $result;
-                    }
-                } else {
-                    $db_options[$option] = $value;
-                }
-            }
-        }
-        $this->disconnect();
-        if (!MDB2::isConnection($db)) {
-            $db =MDB2::factory($db, $db_options);
-        }
-
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        $this->db =& $db;
-        $this->db->loadModule('Datatype');
-        $this->db->loadModule('Manager');
-        $this->db->loadModule('Reverse');
-        $this->db->loadModule('Function');
-        if (empty($this->options['valid_types'])) {
-            $this->options['valid_types'] = $this->db->datatype->getValidTypes();
-        }
-
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Log out and disconnect from the database.
-     *
-     * @access public
-     * @return void
-     */
-    function disconnect()
-    {
-        if (MDB2::isConnection($this->db)) {
-            $this->db->disconnect();
-            unset($this->db);
-        }
-    }
-
-    // }}}
-    // {{{ parseDatabaseDefinition()
-
-    /**
-     * Parse a database definition from a file or an array
-     *
-     * @param string|array $schema                the database schema array or file name
-     * @param bool         $skip_unreadable       if non readable files should be skipped
-     * @param array        $variables             associative array that the defines the text string values
-     *                                            that are meant to be used to replace the variables that are
-     *                                            used in the schema description.
-     * @param bool         $fail_on_invalid_names make function fail on invalid names
-     * @param array        $structure             database structure definition
-     *
-     * @access public
-     * @return array
-     */
-    function parseDatabaseDefinition($schema, $skip_unreadable = false, $variables = array(),
-        $fail_on_invalid_names = true, $structure = false)
-    {
-        $database_definition = false;
-        if (is_string($schema)) {
-            // if $schema is not readable then we just skip it
-            // and simply copy the $current_schema file to that file name
-            if (is_readable($schema)) {
-                $database_definition = $this->parseDatabaseDefinitionFile($schema, $variables, $fail_on_invalid_names, $structure);
-            }
-        } elseif (is_array($schema)) {
-            $database_definition = $schema;
-        }
-        if (!$database_definition && !$skip_unreadable) {
-            $database_definition = $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
-                'invalid data type of schema or unreadable data source');
-        }
-        return $database_definition;
-    }
-
-    // }}}
-    // {{{ parseDatabaseDefinitionFile()
-
-    /**
-     * Parse a database definition file by creating a schema format
-     * parser object and passing the file contents as parser input data stream.
-     *
-     * @param string $input_file            the database schema file.
-     * @param array  $variables             associative array that the defines the text string values
-     *                                      that are meant to be used to replace the variables that are
-     *                                      used in the schema description.
-     * @param bool   $fail_on_invalid_names make function fail on invalid names
-     * @param array  $structure             database structure definition
-     *
-     * @access public
-     * @return array
-     */
-    function parseDatabaseDefinitionFile($input_file, $variables = array(),
-        $fail_on_invalid_names = true, $structure = false)
-    {
-        $dtd_file = $this->options['dtd_file'];
-        if ($dtd_file) {
-            include_once 'XML/DTD/XmlValidator.php';
-            $dtd =new XML_DTD_XmlValidator;
-            if (!$dtd->isValid($dtd_file, $input_file)) {
-                return $this->raiseError(MDB2_SCHEMA_ERROR_PARSE, null, null, $dtd->getMessage());
-            }
-        }
-
-        $class_name = $this->options['parser'];
-
-        $result = MDB2::loadClass($class_name, $this->db->getOption('debug'));
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        $parser =new $class_name($variables, $fail_on_invalid_names, $structure, $this->options['valid_types'], $this->options['force_defaults']);
-        $result = $parser->setInputFile($input_file);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        $result = $parser->parse();
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if (PEAR::isError($parser->error)) {
-            return $parser->error;
-        }
-
-        return $parser->database_definition;
-    }
-
-    // }}}
-    // {{{ getDefinitionFromDatabase()
-
-    /**
-     * Attempt to reverse engineer a schema structure from an existing MDB2
-     * This method can be used if no xml schema file exists yet.
-     * The resulting xml schema file may need some manual adjustments.
-     *
-     * @return array|MDB2_Error array with definition or error object
-     * @access public
-     */
-    function getDefinitionFromDatabase()
-    {
-        $database = $this->db->database_name;
-        if (empty($database)) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
-                'it was not specified a valid database name');
-        }
-        $class_name = $this->options['validate'];
-
-        $result = MDB2::loadClass($class_name, $this->db->getOption('debug'));
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        $val =new $class_name($this->options['fail_on_invalid_names'], $this->options['valid_types'], $this->options['force_defaults']);
-
-        $database_definition = array(
-            'name' => $database,
-            'create' => true,
-            'overwrite' => false,
-            'charset' => 'utf8',
-            'description' => '',
-            'comments' => '',
-            'tables' => array(),
-            'sequences' => array(),
-        );
-
-        $tables = $this->db->manager->listTables();
-        if (PEAR::isError($tables)) {
-            return $tables;
-        }
-
-        foreach ($tables as $table_name) {
-            $fields = $this->db->manager->listTableFields($table_name);
-            if (PEAR::isError($fields)) {
-                return $fields;
-            }
-
-            $database_definition['tables'][$table_name] = array(
-                'was' => '',
-                'description' => '',
-                'comments' => '',
-                'fields' => array(),
-                'indexes' => array(),
-                'constraints' => array(),
-                'initialization' => array()
-            );
-
-            $table_definition =& $database_definition['tables'][$table_name];
-            foreach ($fields as $field_name) {
-                $definition = $this->db->reverse->getTableFieldDefinition($table_name, $field_name);
-                if (PEAR::isError($definition)) {
-                    return $definition;
-                }
-
-                if (!empty($definition[0]['autoincrement'])) {
-                    $definition[0]['default'] = '0';
-                }
-
-                $table_definition['fields'][$field_name] = $definition[0];
-
-                $field_choices = count($definition);
-                if ($field_choices > 1) {
-                    $warning = "There are $field_choices type choices in the table $table_name field $field_name (#1 is the default): ";
-
-                    $field_choice_cnt = 1;
-
-                    $table_definition['fields'][$field_name]['choices'] = array();
-                    foreach ($definition as $field_choice) {
-                        $table_definition['fields'][$field_name]['choices'][] = $field_choice;
-
-                        $warning .= 'choice #'.($field_choice_cnt).': '.serialize($field_choice);
-                        $field_choice_cnt++;
-                    }
-                    $this->warnings[] = $warning;
-                }
-
-                /**
-                 * The first parameter is used to verify if there are duplicated
-                 * fields which we can guarantee that won't happen when reverse engineering
-                 */
-                $result = $val->validateField(array(), $table_definition['fields'][$field_name], $field_name);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
-
-            $keys = array();
-
-            $indexes = $this->db->manager->listTableIndexes($table_name);
-            if (PEAR::isError($indexes)) {
-                return $indexes;
-            }
-
-            if (is_array($indexes)) {
-                foreach ($indexes as $index_name) {
-                    $this->db->expectError(MDB2_ERROR_NOT_FOUND);
-                    $definition = $this->db->reverse->getTableIndexDefinition($table_name, $index_name);
-                    $this->db->popExpect();
-                    if (PEAR::isError($definition)) {
-                        if (PEAR::isError($definition, MDB2_ERROR_NOT_FOUND)) {
-                            continue;
-                        }
-                        return $definition;
-                    }
-
-                    $keys[$index_name] = $definition;
-                }
-            }
-
-            $constraints = $this->db->manager->listTableConstraints($table_name);
-            if (PEAR::isError($constraints)) {
-                return $constraints;
-            }
-
-            if (is_array($constraints)) {
-                foreach ($constraints as $constraint_name) {
-                    $this->db->expectError(MDB2_ERROR_NOT_FOUND);
-                    $definition = $this->db->reverse->getTableConstraintDefinition($table_name, $constraint_name);
-                    $this->db->popExpect();
-                    if (PEAR::isError($definition)) {
-                        if (PEAR::isError($definition, MDB2_ERROR_NOT_FOUND)) {
-                            continue;
-                        }
-                        return $definition;
-                    }
-
-                    $keys[$constraint_name] = $definition;
-                }
-            }
-
-            foreach ($keys as $key_name => $definition) {
-                if (array_key_exists('foreign', $definition)
-                    && $definition['foreign']
-                ) {
-                    /**
-                     * The first parameter is used to verify if there are duplicated
-                     * foreign keys which we can guarantee that won't happen when reverse engineering
-                     */
-                    $result = $val->validateConstraint(array(), $definition, $key_name);
-                    if (PEAR::isError($result)) {
-                        return $result;
-                    }
-
-                    foreach ($definition['fields'] as $field_name => $field) {
-                        /**
-                         * The first parameter is used to verify if there are duplicated
-                         * referencing fields which we can guarantee that won't happen when reverse engineering
-                         */
-                        $result = $val->validateConstraintField(array(), $field_name);
-                        if (PEAR::isError($result)) {
-                            return $result;
-                        }
-
-                        $definition['fields'][$field_name] = '';
-                    }
-
-                    foreach ($definition['references']['fields'] as $field_name => $field) {
-                        /**
-                         * The first parameter is used to verify if there are duplicated
-                         * referenced fields which we can guarantee that won't happen when reverse engineering
-                         */
-                        $result = $val->validateConstraintReferencedField(array(), $field_name);
-                        if (PEAR::isError($result)) {
-                            return $result;
-                        }
-
-                        $definition['references']['fields'][$field_name] = '';
-                    }
-
-                    $table_definition['constraints'][$key_name] = $definition;
-                } else {
-                    /**
-                     * The first parameter is used to verify if there are duplicated
-                     * indices which we can guarantee that won't happen when reverse engineering
-                     */
-                    $result = $val->validateIndex(array(), $definition, $key_name);
-                    if (PEAR::isError($result)) {
-                        return $result;
-                    }
-
-                    foreach ($definition['fields'] as $field_name => $field) {
-                        /**
-                         * The first parameter is used to verify if there are duplicated
-                         * index fields which we can guarantee that won't happen when reverse engineering
-                         */
-                        $result = $val->validateIndexField(array(), $field, $field_name);
-                        if (PEAR::isError($result)) {
-                            return $result;
-                        }
-
-                        $definition['fields'][$field_name] = $field;
-                    }
-
-                    $table_definition['indexes'][$key_name] = $definition;
-                }
-            }
-
-            /**
-             * The first parameter is used to verify if there are duplicated
-             * tables which we can guarantee that won't happen when reverse engineering
-             */
-            $result = $val->validateTable(array(), $table_definition, $table_name);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-
-        }
-
-        $sequences = $this->db->manager->listSequences();
-        if (PEAR::isError($sequences)) {
-            return $sequences;
-        }
-
-        if (is_array($sequences)) {
-            foreach ($sequences as $sequence_name) {
-                $definition = $this->db->reverse->getSequenceDefinition($sequence_name);
-                if (PEAR::isError($definition)) {
-                    return $definition;
-                }
-                if (isset($database_definition['tables'][$sequence_name])
-                    && isset($database_definition['tables'][$sequence_name]['indexes'])
-                ) {
-                    foreach ($database_definition['tables'][$sequence_name]['indexes'] as $index) {
-                        if (isset($index['primary']) && $index['primary']
-                            && count($index['fields'] == 1)
-                        ) {
-                            $definition['on'] = array(
-                                'table' => $sequence_name,
-                                'field' => key($index['fields']),
-                            );
-                            break;
-                        }
-                    }
-                }
-
-                /**
-                 * The first parameter is used to verify if there are duplicated
-                 * sequences which we can guarantee that won't happen when reverse engineering
-                 */
-                $result = $val->validateSequence(array(), $definition, $sequence_name);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-
-                $database_definition['sequences'][$sequence_name] = $definition;
-            }
-        }
-
-        $result = $val->validateDatabase($database_definition);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        return $database_definition;
-    }
-
-    // }}}
-    // {{{ createTableIndexes()
-
-    /**
-     * A method to create indexes for an existing table
-     *
-     * @param string  $table_name Name of the table
-     * @param array   $indexes    An array of indexes to be created
-     * @param boolean $overwrite  If the table/index should be overwritten if it already exists
-     *
-     * @return mixed  MDB2_Error if there is an error creating an index, MDB2_OK otherwise
-     * @access public
-     */
-    function createTableIndexes($table_name, $indexes, $overwrite = false)
-    {
-        if (!$this->db->supports('indexes')) {
-            $this->db->debug('Indexes are not supported', __FUNCTION__);
-            return MDB2_OK;
-        }
-
-        $errorcodes = array(MDB2_ERROR_UNSUPPORTED, MDB2_ERROR_NOT_CAPABLE);
-        foreach ($indexes as $index_name => $index) {
-
-            // Does the index already exist, and if so, should it be overwritten?
-            $create_index = true;
-            $this->db->expectError($errorcodes);
-            if (!empty($index['primary']) || !empty($index['unique'])) {
-                $current_indexes = $this->db->manager->listTableConstraints($table_name);
-            } else {
-                $current_indexes = $this->db->manager->listTableIndexes($table_name);
-            }
-
-            $this->db->popExpect();
-            if (PEAR::isError($current_indexes)) {
-                if (!MDB2::isError($current_indexes, $errorcodes)) {
-                    return $current_indexes;
-                }
-            } elseif (is_array($current_indexes) && in_array($index_name, $current_indexes)) {
-                if (!$overwrite) {
-                    $this->db->debug('Index already exists: '.$index_name, __FUNCTION__);
-                    $create_index = false;
-                } else {
-                    $this->db->debug('Preparing to overwrite index: '.$index_name, __FUNCTION__);
-
-                    $this->db->expectError(MDB2_ERROR_NOT_FOUND);
-                    if (!empty($index['primary']) || !empty($index['unique'])) {
-                        $result = $this->db->manager->dropConstraint($table_name, $index_name);
-                    } else {
-                        $result = $this->db->manager->dropIndex($table_name, $index_name);
-                    }
-                    $this->db->popExpect();
-                    if (PEAR::isError($result) && !MDB2::isError($result, MDB2_ERROR_NOT_FOUND)) {
-                        return $result;
-                    }
-                }
-            }
-
-            // Check if primary is being used and if it's supported
-            if (!empty($index['primary']) && !$this->db->supports('primary_key')) {
-
-                // Primary not supported so we fallback to UNIQUE and making the field NOT NULL
-                $index['unique'] = true;
-
-                $changes = array();
-
-                foreach ($index['fields'] as $field => $empty) {
-                    $field_info = $this->db->reverse->getTableFieldDefinition($table_name, $field);
-                    if (PEAR::isError($field_info)) {
-                        return $field_info;
-                    }
-                    if (!$field_info[0]['notnull']) {
-                        $changes['change'][$field] = $field_info[0];
-
-                        $changes['change'][$field]['notnull'] = true;
-                    }
-                }
-                if (!empty($changes)) {
-                    $this->db->manager->alterTable($table_name, $changes, false);
-                }
-            }
-
-            // Should the index be created?
-            if ($create_index) {
-                if (!empty($index['primary']) || !empty($index['unique'])) {
-                    $result = $this->db->manager->createConstraint($table_name, $index_name, $index);
-                } else {
-                    $result = $this->db->manager->createIndex($table_name, $index_name, $index);
-                }
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ createTableConstraints()
-
-    /**
-     * A method to create foreign keys for an existing table
-     *
-     * @param string  $table_name  Name of the table
-     * @param array   $constraints An array of foreign keys to be created
-     * @param boolean $overwrite   If the foreign key should be overwritten if it already exists
-     *
-     * @return mixed  MDB2_Error if there is an error creating a foreign key, MDB2_OK otherwise
-     * @access public
-     */
-    function createTableConstraints($table_name, $constraints, $overwrite = false)
-    {
-        if (!$this->db->supports('indexes')) {
-            $this->db->debug('Indexes are not supported', __FUNCTION__);
-            return MDB2_OK;
-        }
-
-        $errorcodes = array(MDB2_ERROR_UNSUPPORTED, MDB2_ERROR_NOT_CAPABLE);
-        foreach ($constraints as $constraint_name => $constraint) {
-
-            // Does the foreign key already exist, and if so, should it be overwritten?
-            $create_constraint = true;
-            $this->db->expectError($errorcodes);
-            $current_constraints = $this->db->manager->listTableConstraints($table_name);
-            $this->db->popExpect();
-            if (PEAR::isError($current_constraints)) {
-                if (!MDB2::isError($current_constraints, $errorcodes)) {
-                    return $current_constraints;
-                }
-            } elseif (is_array($current_constraints) && in_array($constraint_name, $current_constraints)) {
-                if (!$overwrite) {
-                    $this->db->debug('Foreign key already exists: '.$constraint_name, __FUNCTION__);
-                    $create_constraint = false;
-                } else {
-                    $this->db->debug('Preparing to overwrite foreign key: '.$constraint_name, __FUNCTION__);
-                    $result = $this->db->manager->dropConstraint($table_name, $constraint_name);
-                    if (PEAR::isError($result)) {
-                        return $result;
-                    }
-                }
-            }
-
-            // Should the foreign key be created?
-            if ($create_constraint) {
-                $result = $this->db->manager->createConstraint($table_name, $constraint_name, $constraint);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ createTable()
-
-    /**
-     * Create a table and inititialize the table if data is available
-     *
-     * @param string $table_name name of the table to be created
-     * @param array  $table      multi dimensional array that contains the
-     *                           structure and optional data of the table
-     * @param bool   $overwrite  if the table/index should be overwritten if it already exists
-     * @param array  $options    an array of options to be passed to the database specific driver
-     *                           version of MDB2_Driver_Manager_Common::createTable().
-     *
-     * @return bool|MDB2_Error MDB2_OK or error object
-     * @access public
-     */
-    function createTable($table_name, $table, $overwrite = false, $options = array())
-    {
-        $create = true;
-
-        $errorcodes = array(MDB2_ERROR_UNSUPPORTED, MDB2_ERROR_NOT_CAPABLE);
-
-        $this->db->expectError($errorcodes);
-
-        $tables = $this->db->manager->listTables();
-
-        $this->db->popExpect();
-        if (PEAR::isError($tables)) {
-            if (!MDB2::isError($tables, $errorcodes)) {
-                return $tables;
-            }
-        } elseif (is_array($tables) && in_array($table_name, $tables)) {
-            if (!$overwrite) {
-                $create = false;
-                $this->db->debug('Table already exists: '.$table_name, __FUNCTION__);
-            } else {
-                $result = $this->db->manager->dropTable($table_name);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $this->db->debug('Overwritting table: '.$table_name, __FUNCTION__);
-            }
-        }
-
-        if ($create) {
-            $result = $this->db->manager->createTable($table_name, $table['fields'], $options);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-        }
-
-        if (!empty($table['initialization']) && is_array($table['initialization'])) {
-            $result = $this->initializeTable($table_name, $table);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-        }
-
-        if (!empty($table['indexes']) && is_array($table['indexes'])) {
-            $result = $this->createTableIndexes($table_name, $table['indexes'], $overwrite);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-        }
-
-        if (!empty($table['constraints']) && is_array($table['constraints'])) {
-            $result = $this->createTableConstraints($table_name, $table['constraints'], $overwrite);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-        }
-
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ initializeTable()
-
-    /**
-     * Inititialize the table with data
-     *
-     * @param string $table_name name of the table
-     * @param array  $table      multi dimensional array that contains the
-     *                           structure and optional data of the table
-     *
-     * @return bool|MDB2_Error MDB2_OK or error object
-     * @access public
-     */
-    function initializeTable($table_name, $table)
-    {
-        $query_insertselect = 'INSERT INTO %s (%s) (SELECT %s FROM %s %s)';
-
-        $query_insert = 'INSERT INTO %s (%s) VALUES (%s)';
-        $query_update = 'UPDATE %s SET %s %s';
-        $query_delete = 'DELETE FROM %s %s';
-
-        $table_name = $this->db->quoteIdentifier($table_name, true);
-
-        $result = MDB2_OK;
-
-        $support_transactions = $this->db->supports('transactions');
-
-        foreach ($table['initialization'] as $instruction) {
-            $query = '';
-            switch ($instruction['type']) {
-            case 'insert':
-                if (!isset($instruction['data']['select'])) {
-                    $data = $this->getInstructionFields($instruction['data'], $table['fields']);
-                    if (!empty($data)) {
-                        $fields = implode(', ', array_keys($data));
-                        $values = implode(', ', array_values($data));
-
-                        $query = sprintf($query_insert, $table_name, $fields, $values);
-                    }
-                } else {
-                    $data  = $this->getInstructionFields($instruction['data']['select'], $table['fields']);
-                    $where = $this->getInstructionWhere($instruction['data']['select'], $table['fields']);
-
-                    $select_table_name = $this->db->quoteIdentifier($instruction['data']['select']['table'], true);
-                    if (!empty($data)) {
-                        $fields = implode(', ', array_keys($data));
-                        $values = implode(', ', array_values($data));
-
-                        $query = sprintf($query_insertselect, $table_name, $fields, $values, $select_table_name, $where);
-                    }
-                }
-                break;
-            case 'update':
-                $data  = $this->getInstructionFields($instruction['data'], $table['fields']);
-                $where = $this->getInstructionWhere($instruction['data'], $table['fields']);
-                if (!empty($data)) {
-                    array_walk($data, array($this, 'buildFieldValue'));
-                    $fields_values = implode(', ', $data);
-
-                    $query = sprintf($query_update, $table_name, $fields_values, $where);
-                }
-                break;
-            case 'delete':
-                $where = $this->getInstructionWhere($instruction['data'], $table['fields']);
-                $query = sprintf($query_delete, $table_name, $where);
-                break;
-            }
-            if ($query) {
-                if ($support_transactions && PEAR::isError($res = $this->db->beginNestedTransaction())) {
-                    return $res;
-                }
-
-                $result = $this->db->exec($query);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-
-                if ($support_transactions && PEAR::isError($res = $this->db->completeNestedTransaction())) {
-                    return $res;
-                }
-            }
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ buildFieldValue()
-
-    /**
-     * Appends the contents of second argument + '=' to the beginning of first
-     * argument.
-     *
-     * Used with array_walk() in initializeTable() for UPDATEs.
-     *
-     * @param string &$element value of array's element
-     * @param string $key      key of array's element
-     *
-     * @return void
-     *
-     * @access public
-     * @see MDB2_Schema::initializeTable()
-     */
-    function buildFieldValue(&$element, $key)
-    {
-        $element = $key."=$element";
-    }
-
-    // }}}
-    // {{{ getExpression()
-
-    /**
-     * Generates a string that represents a value that would be associated
-     * with a column in a DML instruction.
-     *
-     * @param array  $element           multi dimensional array that contains the
-     *                                  structure of the current DML instruction.
-     * @param array  $fields_definition multi dimensional array that contains the
-     *                                  definition for current table's fields
-     * @param string $type              type of given field
-     *
-     * @return string
-     *
-     * @access public
-     * @see MDB2_Schema::getInstructionFields(), MDB2_Schema::getInstructionWhere()
-     */
-    function getExpression($element, $fields_definition = array(), $type = null)
-    {
-        $str = '';
-        switch ($element['type']) {
-        case 'null':
-            $str .= 'NULL';
-            break;
-        case 'value':
-            $str .= $this->db->quote($element['data'], $type);
-            break;
-        case 'column':
-            $str .= $this->db->quoteIdentifier($element['data'], true);
-            break;
-        case 'function':
-            $arguments = array();
-            if (!empty($element['data']['arguments'])
-                && is_array($element['data']['arguments'])
-            ) {
-                foreach ($element['data']['arguments'] as $v) {
-                    $arguments[] = $this->getExpression($v, $fields_definition);
-                }
-            }
-            if (method_exists($this->db->function, $element['data']['name'])) {
-                $user_func = array(&$this->db->function, $element['data']['name']);
-
-                $str .= call_user_func_array($user_func, $arguments);
-            } else {
-                $str .= $element['data']['name'].'(';
-                $str .= implode(', ', $arguments);
-                $str .= ')';
-            }
-            break;
-        case 'expression':
-            $type0 = $type1 = null;
-            if ($element['data']['operants'][0]['type'] == 'column'
-                && array_key_exists($element['data']['operants'][0]['data'], $fields_definition)
-            ) {
-                $type0 = $fields_definition[$element['data']['operants'][0]['data']]['type'];
-            }
-
-            if ($element['data']['operants'][1]['type'] == 'column'
-                && array_key_exists($element['data']['operants'][1]['data'], $fields_definition)
-            ) {
-                $type1 = $fields_definition[$element['data']['operants'][1]['data']]['type'];
-            }
-
-            $str .= '(';
-            $str .= $this->getExpression($element['data']['operants'][0], $fields_definition, $type1);
-            $str .= $this->getOperator($element['data']['operator']);
-            $str .= $this->getExpression($element['data']['operants'][1], $fields_definition, $type0);
-            $str .= ')';
-            break;
-        }
-
-        return $str;
-    }
-
-    // }}}
-    // {{{ getOperator()
-
-    /**
-     * Returns the matching SQL operator
-     *
-     * @param string $op parsed descriptive operator
-     *
-     * @return string matching SQL operator
-     *
-     * @access public
-     * @static
-     * @see MDB2_Schema::getExpression()
-     */
-    function getOperator($op)
-    {
-        switch ($op) {
-        case 'PLUS':
-            return ' + ';
-        case 'MINUS':
-            return ' - ';
-        case 'TIMES':
-            return ' * ';
-        case 'DIVIDED':
-            return ' / ';
-        case 'EQUAL':
-            return ' = ';
-        case 'NOT EQUAL':
-            return ' != ';
-        case 'LESS THAN':
-            return ' < ';
-        case 'GREATER THAN':
-            return ' > ';
-        case 'LESS THAN OR EQUAL':
-            return ' <= ';
-        case 'GREATER THAN OR EQUAL':
-            return ' >= ';
-        default:
-            return ' '.$op.' ';
-        }
-    }
-
-    // }}}
-    // {{{ getInstructionFields()
-
-    /**
-     * Walks the parsed DML instruction array, field by field,
-     * storing them and their processed values inside a new array.
-     *
-     * @param array $instruction       multi dimensional array that contains the
-     *                                 structure of the current DML instruction.
-     * @param array $fields_definition multi dimensional array that contains the
-     *                                 definition for current table's fields
-     *
-     * @return array  array of strings in the form 'field_name' => 'value'
-     *
-     * @access public
-     * @static
-     * @see MDB2_Schema::initializeTable()
-     */
-    function getInstructionFields($instruction, $fields_definition = array())
-    {
-        $fields = array();
-        if (!empty($instruction['field']) && is_array($instruction['field'])) {
-            foreach ($instruction['field'] as $field) {
-                $field_name = $this->db->quoteIdentifier($field['name'], true);
-
-                $fields[$field_name] = $this->getExpression($field['group'], $fields_definition);
-            }
-        }
-        return $fields;
-    }
-
-    // }}}
-    // {{{ getInstructionWhere()
-
-    /**
-     * Translates the parsed WHERE expression of a DML instruction
-     * (array structure) to a SQL WHERE clause (string).
-     *
-     * @param array $instruction       multi dimensional array that contains the
-     *                                 structure of the current DML instruction.
-     * @param array $fields_definition multi dimensional array that contains the
-     *                                 definition for current table's fields.
-     *
-     * @return string SQL WHERE clause
-     *
-     * @access public
-     * @static
-     * @see MDB2_Schema::initializeTable()
-     */
-    function getInstructionWhere($instruction, $fields_definition = array())
-    {
-        $where = '';
-        if (!empty($instruction['where'])) {
-            $where = 'WHERE '.$this->getExpression($instruction['where'], $fields_definition);
-        }
-        return $where;
-    }
-
-    // }}}
-    // {{{ createSequence()
-
-    /**
-     * Create a sequence
-     *
-     * @param string $sequence_name name of the sequence to be created
-     * @param array  $sequence      multi dimensional array that contains the
-     *                              structure and optional data of the table
-     * @param bool   $overwrite     if the sequence should be overwritten if it already exists
-     *
-     * @return bool|MDB2_Error MDB2_OK or error object
-     * @access public
-     */
-    function createSequence($sequence_name, $sequence, $overwrite = false)
-    {
-        if (!$this->db->supports('sequences')) {
-            $this->db->debug('Sequences are not supported', __FUNCTION__);
-            return MDB2_OK;
-        }
-
-        $errorcodes = array(MDB2_ERROR_UNSUPPORTED, MDB2_ERROR_NOT_CAPABLE);
-        $this->db->expectError($errorcodes);
-        $sequences = $this->db->manager->listSequences();
-        $this->db->popExpect();
-        if (PEAR::isError($sequences)) {
-            if (!MDB2::isError($sequences, $errorcodes)) {
-                return $sequences;
-            }
-        } elseif (is_array($sequence) && in_array($sequence_name, $sequences)) {
-            if (!$overwrite) {
-                $this->db->debug('Sequence already exists: '.$sequence_name, __FUNCTION__);
-                return MDB2_OK;
-            }
-
-            $result = $this->db->manager->dropSequence($sequence_name);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-            $this->db->debug('Overwritting sequence: '.$sequence_name, __FUNCTION__);
-        }
-
-        $start = 1;
-        $field = '';
-        if (!empty($sequence['on'])) {
-            $table = $sequence['on']['table'];
-            $field = $sequence['on']['field'];
-
-            $errorcodes = array(MDB2_ERROR_UNSUPPORTED, MDB2_ERROR_NOT_CAPABLE);
-            $this->db->expectError($errorcodes);
-            $tables = $this->db->manager->listTables();
-            $this->db->popExpect();
-            if (PEAR::isError($tables) && !MDB2::isError($tables, $errorcodes)) {
-                 return $tables;
-            }
-
-            if (!PEAR::isError($tables) && is_array($tables) && in_array($table, $tables)) {
-                if ($this->db->supports('summary_functions')) {
-                    $query = "SELECT MAX($field) FROM ".$this->db->quoteIdentifier($table, true);
-                } else {
-                    $query = "SELECT $field FROM ".$this->db->quoteIdentifier($table, true)." ORDER BY $field DESC";
-                }
-                $start = $this->db->queryOne($query, 'integer');
-                if (PEAR::isError($start)) {
-                    return $start;
-                }
-                ++$start;
-            } else {
-                $this->warnings[] = 'Could not sync sequence: '.$sequence_name;
-            }
-        } elseif (!empty($sequence['start']) && is_numeric($sequence['start'])) {
-            $start = $sequence['start'];
-            $table = '';
-        }
-
-        $result = $this->db->manager->createSequence($sequence_name, $start);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ createDatabase()
-
-    /**
-     * Create a database space within which may be created database objects
-     * like tables, indexes and sequences. The implementation of this function
-     * is highly DBMS specific and may require special permissions to run
-     * successfully. Consult the documentation or the DBMS drivers that you
-     * use to be aware of eventual configuration requirements.
-     *
-     * @param array $database_definition multi dimensional array that contains the current definition
-     * @param array $options             an array of options to be passed to the 
-     *                                   database specific driver version of
-     *                                   MDB2_Driver_Manager_Common::createTable().
-     *
-     * @return bool|MDB2_Error MDB2_OK or error object
-     * @access public
-     */
-    function createDatabase($database_definition, $options = array())
-    {
-        if (!isset($database_definition['name']) || !$database_definition['name']) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
-                'no valid database name specified');
-        }
-
-        $create    = (isset($database_definition['create']) && $database_definition['create']);
-        $overwrite = (isset($database_definition['overwrite']) && $database_definition['overwrite']);
-
-        /**
-         *
-         * We need to clean up database name before any query to prevent
-         * database driver from using a inexistent database
-         *
-         */
-        $previous_database_name = $this->db->setDatabase('');
-
-        // Lower / Upper case the db name if the portability deems so.
-        if ($this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $func = $this->db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper';
-
-            $db_name = $func($database_definition['name']);
-        } else {
-            $db_name = $database_definition['name'];
-        }
-
-        if ($create) {
-
-            $dbExists = $this->db->databaseExists($db_name);
-            if (PEAR::isError($dbExists)) {
-                return $dbExists;
-            }
-
-            if ($dbExists && $overwrite) {
-                $this->db->expectError(MDB2_ERROR_CANNOT_DROP);
-                $result = $this->db->manager->dropDatabase($db_name);
-                $this->db->popExpect();
-                if (PEAR::isError($result) && !MDB2::isError($result, MDB2_ERROR_CANNOT_DROP)) {
-                    return $result;
-                }
-                $dbExists = false;
-                $this->db->debug('Overwritting database: ' . $db_name, __FUNCTION__);
-            }
-
-            $dbOptions = array();
-            if (array_key_exists('charset', $database_definition)
-                && !empty($database_definition['charset'])) {
-                $dbOptions['charset'] = $database_definition['charset'];
-            }
-
-            if ($dbExists) {
-                $this->db->debug('Database already exists: ' . $db_name, __FUNCTION__);
-//                 if (!empty($dbOptions)) {
-//                     $errorcodes = array(MDB2_ERROR_UNSUPPORTED, MDB2_ERROR_NO_PERMISSION);
-//                     $this->db->expectError($errorcodes);
-//                     $result = $this->db->manager->alterDatabase($db_name, $dbOptions);
-//                     $this->db->popExpect();
-//                     if (PEAR::isError($result) && !MDB2::isError($result, $errorcodes)) {
-//                         return $result;
-//                     }
-//                 }
-                $create = false;
-            } else {
-                $this->db->expectError(MDB2_ERROR_UNSUPPORTED);
-                $result = $this->db->manager->createDatabase($db_name, $dbOptions);
-                $this->db->popExpect();
-                if (PEAR::isError($result) && !MDB2::isError($result, MDB2_ERROR_UNSUPPORTED)) {
-                    return $result;
-                }
-                $this->db->debug('Creating database: ' . $db_name, __FUNCTION__);
-            }
-        }
-
-        $this->db->setDatabase($db_name);
-        if (($support_transactions = $this->db->supports('transactions'))
-            && PEAR::isError($result = $this->db->beginNestedTransaction())
-        ) {
-            return $result;
-        }
-
-        $created_objects = 0;
-        if (isset($database_definition['tables'])
-            && is_array($database_definition['tables'])
-        ) {
-            foreach ($database_definition['tables'] as $table_name => $table) {
-                $result = $this->createTable($table_name, $table, $overwrite, $options);
-                if (PEAR::isError($result)) {
-                    break;
-                }
-                $created_objects++;
-            }
-        }
-        if (!PEAR::isError($result)
-            && isset($database_definition['sequences'])
-            && is_array($database_definition['sequences'])
-        ) {
-            foreach ($database_definition['sequences'] as $sequence_name => $sequence) {
-                $result = $this->createSequence($sequence_name, $sequence, false, $overwrite);
-
-                if (PEAR::isError($result)) {
-                    break;
-                }
-                $created_objects++;
-            }
-        }
-
-        if ($support_transactions) {
-            $res = $this->db->completeNestedTransaction();
-            if (PEAR::isError($res)) {
-                $result = $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
-                    'Could not end transaction ('.
-                    $res->getMessage().' ('.$res->getUserinfo().'))');
-            }
-        } elseif (PEAR::isError($result) && $created_objects) {
-            $result = $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
-                'the database was only partially created ('.
-                $result->getMessage().' ('.$result->getUserinfo().'))');
-        }
-
-        $this->db->setDatabase($previous_database_name);
-
-        if (PEAR::isError($result) && $create
-            && PEAR::isError($result2 = $this->db->manager->dropDatabase($db_name))
-        ) {
-            if (!MDB2::isError($result2, MDB2_ERROR_UNSUPPORTED)) {
-                return $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
-                       'Could not drop the created database after unsuccessful creation attempt ('.
-                       $result2->getMessage().' ('.$result2->getUserinfo().'))');
-            }
-        }
-
-        return $result;
-    }
-
-    // }}}
-    // {{{ compareDefinitions()
-
-    /**
-     * Compare a previous definition with the currently parsed definition
-     *
-     * @param array $current_definition  multi dimensional array that contains the current definition
-     * @param array $previous_definition multi dimensional array that contains the previous definition
-     *
-     * @return array|MDB2_Error array of changes on success, or a error object
-     * @access public
-     */
-    function compareDefinitions($current_definition, $previous_definition)
-    {
-        $changes = array();
-
-        if (!empty($current_definition['tables']) && is_array($current_definition['tables'])) {
-            $changes['tables'] = $defined_tables = array();
-            foreach ($current_definition['tables'] as $table_name => $table) {
-                $previous_tables = array();
-                if (!empty($previous_definition) && is_array($previous_definition)) {
-                    $previous_tables = $previous_definition['tables'];
-                }
-                $change = $this->compareTableDefinitions($table_name, $table, $previous_tables, $defined_tables);
-                if (PEAR::isError($change)) {
-                    return $change;
-                }
-                if (!empty($change)) {
-                    $changes['tables'] = MDB2_Schema::arrayMergeClobber($changes['tables'], $change);
-                }
-            }
-
-            if (!empty($previous_definition['tables'])
-                && is_array($previous_definition['tables'])) {
-                foreach ($previous_definition['tables'] as $table_name => $table) {
-                    if (empty($defined_tables[$table_name])) {
-                        $changes['tables']['remove'][$table_name] = true;
-                    }
-                }
-            }
-        }
-        if (!empty($current_definition['sequences']) && is_array($current_definition['sequences'])) {
-            $changes['sequences'] = $defined_sequences = array();
-            foreach ($current_definition['sequences'] as $sequence_name => $sequence) {
-                $previous_sequences = array();
-                if (!empty($previous_definition) && is_array($previous_definition)) {
-                    $previous_sequences = $previous_definition['sequences'];
-                }
-
-                $change = $this->compareSequenceDefinitions($sequence_name,
-                                                            $sequence,
-                                                            $previous_sequences,
-                                                            $defined_sequences);
-                if (PEAR::isError($change)) {
-                    return $change;
-                }
-                if (!empty($change)) {
-                    $changes['sequences'] = MDB2_Schema::arrayMergeClobber($changes['sequences'], $change);
-                }
-            }
-            if (!empty($previous_definition['sequences']) && is_array($previous_definition['sequences'])) {
-                foreach ($previous_definition['sequences'] as $sequence_name => $sequence) {
-                    if (empty($defined_sequences[$sequence_name])) {
-                        $changes['sequences']['remove'][$sequence_name] = true;
-                    }
-                }
-            }
-        }
-        return $changes;
-    }
-
-    // }}}
-    // {{{ compareTableFieldsDefinitions()
-
-    /**
-     * Compare a previous definition with the currently parsed definition
-     *
-     * @param string $table_name          name of the table
-     * @param array  $current_definition  multi dimensional array that contains the current definition
-     * @param array  $previous_definition multi dimensional array that contains the previous definition
-     *
-     * @return array|MDB2_Error array of changes on success, or a error object
-     * @access public
-     */
-    function compareTableFieldsDefinitions($table_name, $current_definition,
-        $previous_definition)
-    {
-        $changes = $defined_fields = array();
-
-        if (is_array($current_definition)) {
-            foreach ($current_definition as $field_name => $field) {
-                $was_field_name = $field['was'];
-                if (!empty($previous_definition[$field_name])
-                    && (
-                        (isset($previous_definition[$field_name]['was'])
-                         && $previous_definition[$field_name]['was'] == $was_field_name)
-                        || !isset($previous_definition[$was_field_name])
-                       )) {
-                    $was_field_name = $field_name;
-                }
-
-                if (!empty($previous_definition[$was_field_name])) {
-                    if ($was_field_name != $field_name) {
-                        $changes['rename'][$was_field_name] = array('name' => $field_name, 'definition' => $field);
-                    }
-
-                    if (!empty($defined_fields[$was_field_name])) {
-                        return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
-                            'the field "'.$was_field_name.
-                            '" was specified for more than one field of table');
-                    }
-
-                    $defined_fields[$was_field_name] = true;
-
-                    $change = $this->db->compareDefinition($field, $previous_definition[$was_field_name]);
-                    if (PEAR::isError($change)) {
-                        return $change;
-                    }
-
-                    if (!empty($change)) {
-                        if (array_key_exists('default', $change)
-                            && $change['default']
-                            && !array_key_exists('default', $field)) {
-                                $field['default'] = null;
-                        }
-
-                        $change['definition'] = $field;
-
-                        $changes['change'][$field_name] = $change;
-                    }
-                } else {
-                    if ($field_name != $was_field_name) {
-                        return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
-                            'it was specified a previous field name ("'.
-                            $was_field_name.'") for field "'.$field_name.'" of table "'.
-                            $table_name.'" that does not exist');
-                    }
-
-                    $changes['add'][$field_name] = $field;
-                }
-            }
-        }
-
-        if (isset($previous_definition) && is_array($previous_definition)) {
-            foreach ($previous_definition as $field_previous_name => $field_previous) {
-                if (empty($defined_fields[$field_previous_name])) {
-                    $changes['remove'][$field_previous_name] = true;
-                }
-            }
-        }
-
-        return $changes;
-    }
-
-    // }}}
-    // {{{ compareTableIndexesDefinitions()
-
-    /**
-     * Compare a previous definition with the currently parsed definition
-     *
-     * @param string $table_name          name of the table
-     * @param array  $current_definition  multi dimensional array that contains the current definition
-     * @param array  $previous_definition multi dimensional array that contains the previous definition
-     *
-     * @return array|MDB2_Error array of changes on success, or a error object
-     * @access public
-     */
-    function compareTableIndexesDefinitions($table_name, $current_definition,
-        $previous_definition)
-    {
-        $changes = $defined_indexes = array();
-
-        if (is_array($current_definition)) {
-            foreach ($current_definition as $index_name => $index) {
-                $was_index_name = $index['was'];
-                if (!empty($previous_definition[$index_name])
-                    && isset($previous_definition[$index_name]['was'])
-                    && $previous_definition[$index_name]['was'] == $was_index_name
-                ) {
-                    $was_index_name = $index_name;
-                }
-                if (!empty($previous_definition[$was_index_name])) {
-                    $change = array();
-                    if ($was_index_name != $index_name) {
-                        $change['name'] = $was_index_name;
-                    }
-
-                    if (!empty($defined_indexes[$was_index_name])) {
-                        return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
-                            'the index "'.$was_index_name.'" was specified for'.
-                            ' more than one index of table "'.$table_name.'"');
-                    }
-                    $defined_indexes[$was_index_name] = true;
-
-                    $previous_unique = array_key_exists('unique', $previous_definition[$was_index_name])
-                        ? $previous_definition[$was_index_name]['unique'] : false;
-
-                    $unique = array_key_exists('unique', $index) ? $index['unique'] : false;
-                    if ($previous_unique != $unique) {
-                        $change['unique'] = $unique;
-                    }
-
-                    $previous_primary = array_key_exists('primary', $previous_definition[$was_index_name])
-                        ? $previous_definition[$was_index_name]['primary'] : false;
-
-                    $primary = array_key_exists('primary', $index) ? $index['primary'] : false;
-                    if ($previous_primary != $primary) {
-                        $change['primary'] = $primary;
-                    }
-
-                    $defined_fields  = array();
-                    $previous_fields = $previous_definition[$was_index_name]['fields'];
-                    if (!empty($index['fields']) && is_array($index['fields'])) {
-                        foreach ($index['fields'] as $field_name => $field) {
-                            if (!empty($previous_fields[$field_name])) {
-                                $defined_fields[$field_name] = true;
-
-                                $previous_sorting = array_key_exists('sorting', $previous_fields[$field_name])
-                                    ? $previous_fields[$field_name]['sorting'] : '';
-
-                                $sorting = array_key_exists('sorting', $field) ? $field['sorting'] : '';
-                                if ($previous_sorting != $sorting) {
-                                    $change['change'] = true;
-                                }
-                            } else {
-                                $change['change'] = true;
-                            }
-                        }
-                    }
-                    if (isset($previous_fields) && is_array($previous_fields)) {
-                        foreach ($previous_fields as $field_name => $field) {
-                            if (empty($defined_fields[$field_name])) {
-                                $change['change'] = true;
-                            }
-                        }
-                    }
-                    if (!empty($change)) {
-                        $changes['change'][$index_name] = $current_definition[$index_name];
-                    }
-                } else {
-                    if ($index_name != $was_index_name) {
-                        return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
-                            'it was specified a previous index name ("'.$was_index_name.
-                            ') for index "'.$index_name.'" of table "'.$table_name.'" that does not exist');
-                    }
-                    $changes['add'][$index_name] = $current_definition[$index_name];
-                }
-            }
-        }
-        foreach ($previous_definition as $index_previous_name => $index_previous) {
-            if (empty($defined_indexes[$index_previous_name])) {
-                $changes['remove'][$index_previous_name] = $index_previous;
-            }
-        }
-        return $changes;
-    }
-
-    // }}}
-    // {{{ compareTableDefinitions()
-
-    /**
-     * Compare a previous definition with the currently parsed definition
-     *
-     * @param string $table_name          name of the table
-     * @param array  $current_definition  multi dimensional array that contains the current definition
-     * @param array  $previous_definition multi dimensional array that contains the previous definition
-     * @param array  &$defined_tables     table names in the schema
-     *
-     * @return array|MDB2_Error array of changes on success, or a error object
-     * @access public
-     */
-    function compareTableDefinitions($table_name, $current_definition,
-        $previous_definition, &$defined_tables)
-    {
-        $changes = array();
-
-        if (is_array($current_definition)) {
-            $was_table_name = $table_name;
-            if (!empty($current_definition['was'])) {
-                $was_table_name = $current_definition['was'];
-            }
-            if (!empty($previous_definition[$was_table_name])) {
-                $changes['change'][$was_table_name] = array();
-                if ($was_table_name != $table_name) {
-                    $changes['change'][$was_table_name] = array('name' => $table_name);
-                }
-                if (!empty($defined_tables[$was_table_name])) {
-                    return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
-                        'the table "'.$was_table_name.
-                        '" was specified for more than one table of the database');
-                }
-                $defined_tables[$was_table_name] = true;
-                if (!empty($current_definition['fields']) && is_array($current_definition['fields'])) {
-                    $previous_fields = array();
-                    if (isset($previous_definition[$was_table_name]['fields'])
-                        && is_array($previous_definition[$was_table_name]['fields'])) {
-                        $previous_fields = $previous_definition[$was_table_name]['fields'];
-                    }
-
-                    $change = $this->compareTableFieldsDefinitions($table_name,
-                                                                   $current_definition['fields'],
-                                                                   $previous_fields);
-
-                    if (PEAR::isError($change)) {
-                        return $change;
-                    }
-                    if (!empty($change)) {
-                        $changes['change'][$was_table_name] =
-                            MDB2_Schema::arrayMergeClobber($changes['change'][$was_table_name], $change);
-                    }
-                }
-                if (!empty($current_definition['indexes']) && is_array($current_definition['indexes'])) {
-                    $previous_indexes = array();
-                    if (isset($previous_definition[$was_table_name]['indexes'])
-                        && is_array($previous_definition[$was_table_name]['indexes'])) {
-                        $previous_indexes = $previous_definition[$was_table_name]['indexes'];
-                    }
-                    $change = $this->compareTableIndexesDefinitions($table_name,
-                                                                    $current_definition['indexes'],
-                                                                    $previous_indexes);
-
-                    if (PEAR::isError($change)) {
-                        return $change;
-                    }
-                    if (!empty($change)) {
-                        $changes['change'][$was_table_name]['indexes'] = $change;
-                    }
-                }
-                if (empty($changes['change'][$was_table_name])) {
-                    unset($changes['change'][$was_table_name]);
-                }
-                if (empty($changes['change'])) {
-                    unset($changes['change']);
-                }
-            } else {
-                if ($table_name != $was_table_name) {
-                    return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
-                        'it was specified a previous table name ("'.$was_table_name.
-                        '") for table "'.$table_name.'" that does not exist');
-                }
-                $changes['add'][$table_name] = true;
-            }
-        }
-
-        return $changes;
-    }
-
-    // }}}
-    // {{{ compareSequenceDefinitions()
-
-    /**
-     * Compare a previous definition with the currently parsed definition
-     *
-     * @param string $sequence_name       name of the sequence
-     * @param array  $current_definition  multi dimensional array that contains the current definition
-     * @param array  $previous_definition multi dimensional array that contains the previous definition
-     * @param array  &$defined_sequences  names in the schema
-     *
-     * @return array|MDB2_Error array of changes on success, or a error object
-     * @access public
-     */
-    function compareSequenceDefinitions($sequence_name, $current_definition,
-        $previous_definition, &$defined_sequences)
-    {
-        $changes = array();
-
-        if (is_array($current_definition)) {
-            $was_sequence_name = $sequence_name;
-            if (!empty($previous_definition[$sequence_name])
-                && isset($previous_definition[$sequence_name]['was'])
-                && $previous_definition[$sequence_name]['was'] == $was_sequence_name
-            ) {
-                $was_sequence_name = $sequence_name;
-            } elseif (!empty($current_definition['was'])) {
-                $was_sequence_name = $current_definition['was'];
-            }
-            if (!empty($previous_definition[$was_sequence_name])) {
-                if ($was_sequence_name != $sequence_name) {
-                    $changes['change'][$was_sequence_name]['name'] = $sequence_name;
-                }
-
-                if (!empty($defined_sequences[$was_sequence_name])) {
-                    return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
-                        'the sequence "'.$was_sequence_name.'" was specified as base'.
-                        ' of more than of sequence of the database');
-                }
-
-                $defined_sequences[$was_sequence_name] = true;
-
-                $change = array();
-                if (!empty($current_definition['start'])
-                    && isset($previous_definition[$was_sequence_name]['start'])
-                    && $current_definition['start'] != $previous_definition[$was_sequence_name]['start']
-                ) {
-                    $change['start'] = $previous_definition[$sequence_name]['start'];
-                }
-                if (isset($current_definition['on']['table'])
-                    && isset($previous_definition[$was_sequence_name]['on']['table'])
-                    && $current_definition['on']['table'] != $previous_definition[$was_sequence_name]['on']['table']
-                    && isset($current_definition['on']['field'])
-                    && isset($previous_definition[$was_sequence_name]['on']['field'])
-                    && $current_definition['on']['field'] != $previous_definition[$was_sequence_name]['on']['field']
-                ) {
-                    $change['on'] = $current_definition['on'];
-                }
-                if (!empty($change)) {
-                    $changes['change'][$was_sequence_name][$sequence_name] = $change;
-                }
-            } else {
-                if ($sequence_name != $was_sequence_name) {
-                    return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
-                        'it was specified a previous sequence name ("'.$was_sequence_name.
-                        '") for sequence "'.$sequence_name.'" that does not exist');
-                }
-                $changes['add'][$sequence_name] = true;
-            }
-        }
-        return $changes;
-    }
-    // }}}
-    // {{{ verifyAlterDatabase()
-
-    /**
-     * Verify that the changes requested are supported
-     *
-     * @param array $changes associative array that contains the definition of the changes
-     *              that are meant to be applied to the database structure.
-     *
-     * @return bool|MDB2_Error MDB2_OK or error object
-     * @access public
-     */
-    function verifyAlterDatabase($changes)
-    {
-        if (!empty($changes['tables']['change']) && is_array($changes['tables']['change'])) {
-            foreach ($changes['tables']['change'] as $table_name => $table) {
-                if (!empty($table['indexes']) && is_array($table['indexes'])) {
-                    if (!$this->db->supports('indexes')) {
-                        return $this->raiseError(MDB2_SCHEMA_ERROR_UNSUPPORTED, null, null,
-                            'indexes are not supported');
-                    }
-                    $table_changes = count($table['indexes']);
-                    if (!empty($table['indexes']['add'])) {
-                        $table_changes--;
-                    }
-                    if (!empty($table['indexes']['remove'])) {
-                        $table_changes--;
-                    }
-                    if (!empty($table['indexes']['change'])) {
-                        $table_changes--;
-                    }
-                    if ($table_changes) {
-                        return $this->raiseError(MDB2_SCHEMA_ERROR_UNSUPPORTED, null, null,
-                            'index alteration not yet supported: '.implode(', ', array_keys($table['indexes'])));
-                    }
-                }
-                unset($table['indexes']);
-                $result = $this->db->manager->alterTable($table_name, $table, true);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
-        }
-        if (!empty($changes['sequences']) && is_array($changes['sequences'])) {
-            if (!$this->db->supports('sequences')) {
-                return $this->raiseError(MDB2_SCHEMA_ERROR_UNSUPPORTED, null, null,
-                    'sequences are not supported');
-            }
-            $sequence_changes = count($changes['sequences']);
-            if (!empty($changes['sequences']['add'])) {
-                $sequence_changes--;
-            }
-            if (!empty($changes['sequences']['remove'])) {
-                $sequence_changes--;
-            }
-            if (!empty($changes['sequences']['change'])) {
-                $sequence_changes--;
-            }
-            if ($sequence_changes) {
-                return $this->raiseError(MDB2_SCHEMA_ERROR_UNSUPPORTED, null, null,
-                    'sequence alteration not yet supported: '.implode(', ', array_keys($changes['sequences'])));
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ alterDatabaseIndexes()
-
-    /**
-     * Execute the necessary actions to implement the requested changes
-     * in the indexes inside a database structure.
-     *
-     * @param string $table_name name of the table
-     * @param array  $changes    associative array that contains the definition of the changes
-     *                       that are meant to be applied to the database structure.
-     *
-     * @return bool|MDB2_Error MDB2_OK or error object
-     * @access public
-     */
-    function alterDatabaseIndexes($table_name, $changes)
-    {
-        $alterations = 0;
-        if (empty($changes)) {
-            return $alterations;
-        }
-
-        if (!empty($changes['remove']) && is_array($changes['remove'])) {
-            foreach ($changes['remove'] as $index_name => $index) {
-                $this->db->expectError(MDB2_ERROR_NOT_FOUND);
-                if (!empty($index['primary']) || !empty($index['unique'])) {
-                    $result = $this->db->manager->dropConstraint($table_name, $index_name, !empty($index['primary']));
-                } else {
-                    $result = $this->db->manager->dropIndex($table_name, $index_name);
-                }
-                $this->db->popExpect();
-                if (PEAR::isError($result) && !MDB2::isError($result, MDB2_ERROR_NOT_FOUND)) {
-                    return $result;
-                }
-                $alterations++;
-            }
-        }
-        if (!empty($changes['change']) && is_array($changes['change'])) {
-            foreach ($changes['change'] as $index_name => $index) {
-                /**
-                 * Drop existing index/constraint first.
-                 * Since $changes doesn't tell us whether it's an index or a constraint before the change,
-                 * we have to find out and call the appropriate method.
-                 */
-                if (in_array($index_name, $this->db->manager->listTableIndexes($table_name))) {
-                    $result = $this->db->manager->dropIndex($table_name, $index_name);
-                } elseif (in_array($index_name, $this->db->manager->listTableConstraints($table_name))) {
-                    $result = $this->db->manager->dropConstraint($table_name, $index_name);
-                }
-                if (!empty($result) && PEAR::isError($result)) {
-                    return $result;
-                }
-
-                if (!empty($index['primary']) || !empty($index['unique'])) {
-                    $result = $this->db->manager->createConstraint($table_name, $index_name, $index);
-                } else {
-                    $result = $this->db->manager->createIndex($table_name, $index_name, $index);
-                }
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $alterations++;
-            }
-        }
-        if (!empty($changes['add']) && is_array($changes['add'])) {
-            foreach ($changes['add'] as $index_name => $index) {
-                if (!empty($index['primary']) || !empty($index['unique'])) {
-                    $result = $this->db->manager->createConstraint($table_name, $index_name, $index);
-                } else {
-                    $result = $this->db->manager->createIndex($table_name, $index_name, $index);
-                }
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $alterations++;
-            }
-        }
-
-        return $alterations;
-    }
-
-    // }}}
-    // {{{ alterDatabaseTables()
-
-    /**
-     * Execute the necessary actions to implement the requested changes
-     * in the tables inside a database structure.
-     *
-     * @param array $current_definition  multi dimensional array that contains the current definition
-     * @param array $previous_definition multi dimensional array that contains the previous definition
-     * @param array $changes             associative array that contains the definition of the changes
-     *                                   that are meant to be applied to the database structure.
-     *
-     * @return bool|MDB2_Error MDB2_OK or error object
-     * @access public
-     */
-    function alterDatabaseTables($current_definition, $previous_definition, $changes)
-    {
-        /* FIXME: tables marked to be added are initialized by createTable(), others don't */
-        $alterations = 0;
-        if (empty($changes)) {
-            return $alterations;
-        }
-
-        if (!empty($changes['add']) && is_array($changes['add'])) {
-            foreach ($changes['add'] as $table_name => $table) {
-                $result = $this->createTable($table_name, $current_definition[$table_name]);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $alterations++;
-            }
-        }
- 
-        if ($this->options['drop_missing_tables']
-            && !empty($changes['remove'])
-            && is_array($changes['remove'])) {
-            foreach ($changes['remove'] as $table_name => $table) {
-                $result = $this->db->manager->dropTable($table_name);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $alterations++;
-            }
-        }
-
-        if (!empty($changes['change']) && is_array($changes['change'])) {
-            foreach ($changes['change'] as $table_name => $table) {
-                $indexes = array();
-                if (!empty($table['indexes'])) {
-                    $indexes = $table['indexes'];
-                    unset($table['indexes']);
-                }
-                if (!empty($indexes['remove'])) {
-                    $result = $this->alterDatabaseIndexes($table_name, array('remove' => $indexes['remove']));
-                    if (PEAR::isError($result)) {
-                        return $result;
-                    }
-                    unset($indexes['remove']);
-                    $alterations += $result;
-                }
-                $result = $this->db->manager->alterTable($table_name, $table, false);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $alterations++;
-
-                // table may be renamed at this point
-                if (!empty($table['name'])) {
-                    $table_name = $table['name'];
-                }
-
-                if (!empty($indexes)) {
-                    $result = $this->alterDatabaseIndexes($table_name, $indexes);
-                    if (PEAR::isError($result)) {
-                        return $result;
-                    }
-                    $alterations += $result;
-                }
-            }
-        }
-
-        return $alterations;
-    }
-
-    // }}}
-    // {{{ alterDatabaseSequences()
-
-    /**
-     * Execute the necessary actions to implement the requested changes
-     * in the sequences inside a database structure.
-     *
-     * @param array $current_definition  multi dimensional array that contains the current definition
-     * @param array $previous_definition multi dimensional array that contains the previous definition
-     * @param array $changes             associative array that contains the definition of the changes
-     *                                   that are meant to be applied to the database structure.
-     *
-     * @return bool|MDB2_Error MDB2_OK or error object
-     * @access public
-     */
-    function alterDatabaseSequences($current_definition, $previous_definition, $changes)
-    {
-        $alterations = 0;
-        if (empty($changes)) {
-            return $alterations;
-        }
-
-        if (!empty($changes['add']) && is_array($changes['add'])) {
-            foreach ($changes['add'] as $sequence_name => $sequence) {
-                $result = $this->createSequence($sequence_name, $current_definition[$sequence_name]);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $alterations++;
-            }
-        }
-
-        if (!empty($changes['remove']) && is_array($changes['remove'])) {
-            foreach ($changes['remove'] as $sequence_name => $sequence) {
-                $result = $this->db->manager->dropSequence($sequence_name);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $alterations++;
-            }
-        }
-
-        if (!empty($changes['change']) && is_array($changes['change'])) {
-            foreach ($changes['change'] as $sequence_name => $sequence) {
-                $result = $this->db->manager->dropSequence($previous_definition[$sequence_name]['was']);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $result = $this->createSequence($sequence_name, $sequence);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $alterations++;
-            }
-        }
-
-        return $alterations;
-    }
-
-    // }}}
-    // {{{ alterDatabase()
-
-    /**
-     * Execute the necessary actions to implement the requested changes
-     * in a database structure.
-     *
-     * @param array $current_definition  multi dimensional array that contains the current definition
-     * @param array $previous_definition multi dimensional array that contains the previous definition
-     * @param array $changes             associative array that contains the definition of the changes
-     *                                   that are meant to be applied to the database structure.
-     *
-     * @return bool|MDB2_Error MDB2_OK or error object
-     * @access public
-     */
-    function alterDatabase($current_definition, $previous_definition, $changes)
-    {
-        $alterations = 0;
-        if (empty($changes)) {
-            return $alterations;
-        }
-
-        $result = $this->verifyAlterDatabase($changes);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        if (!empty($current_definition['name'])) {
-            $previous_database_name = $this->db->setDatabase($current_definition['name']);
-        }
-
-        if (($support_transactions = $this->db->supports('transactions'))
-            && PEAR::isError($result = $this->db->beginNestedTransaction())
-        ) {
-            return $result;
-        }
-
-        if (!empty($changes['tables']) && !empty($current_definition['tables'])) {
-            $current_tables  = isset($current_definition['tables']) ? $current_definition['tables'] : array();
-            $previous_tables = isset($previous_definition['tables']) ? $previous_definition['tables'] : array();
-
-            $result = $this->alterDatabaseTables($current_tables, $previous_tables, $changes['tables']);
-            if (is_numeric($result)) {
-                $alterations += $result;
-            }
-        }
-
-        if (!PEAR::isError($result) && !empty($changes['sequences'])) {
-            $current_sequences  = isset($current_definition['sequences']) ? $current_definition['sequences'] : array();
-            $previous_sequences = isset($previous_definition['sequences']) ? $previous_definition['sequences'] : array();
-
-            $result = $this->alterDatabaseSequences($current_sequences, $previous_sequences, $changes['sequences']);
-            if (is_numeric($result)) {
-                $alterations += $result;
-            }
-        }
-
-        if ($support_transactions) {
-            $res = $this->db->completeNestedTransaction();
-            if (PEAR::isError($res)) {
-                $result = $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
-                    'Could not end transaction ('.
-                    $res->getMessage().' ('.$res->getUserinfo().'))');
-            }
-        } elseif (PEAR::isError($result) && $alterations) {
-            $result = $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
-                'the requested database alterations were only partially implemented ('.
-                $result->getMessage().' ('.$result->getUserinfo().'))');
-        }
-
-        if (isset($previous_database_name)) {
-            $this->db->setDatabase($previous_database_name);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ dumpDatabaseChanges()
-
-    /**
-     * Dump the changes between two database definitions.
-     *
-     * @param array $changes associative array that specifies the list of database
-     *              definitions changes as returned by the _compareDefinitions
-     *              manager class function.
-     *
-     * @return bool|MDB2_Error MDB2_OK or error object
-     * @access public
-     */
-    function dumpDatabaseChanges($changes)
-    {
-        if (!empty($changes['tables'])) {
-            if (!empty($changes['tables']['add']) && is_array($changes['tables']['add'])) {
-                foreach ($changes['tables']['add'] as $table_name => $table) {
-                    $this->db->debug("$table_name:", __FUNCTION__);
-                    $this->db->debug("\tAdded table '$table_name'", __FUNCTION__);
-                }
-            }
-
-            if (!empty($changes['tables']['remove']) && is_array($changes['tables']['remove'])) {
-                if ($this->options['drop_missing_tables']) {
-                    foreach ($changes['tables']['remove'] as $table_name => $table) {
-                        $this->db->debug("$table_name:", __FUNCTION__);
-                        $this->db->debug("\tRemoved table '$table_name'", __FUNCTION__);
-                    }
-                } else {
-                    foreach ($changes['tables']['remove'] as $table_name => $table) {
-                        $this->db->debug("\tObsolete table '$table_name' left as is", __FUNCTION__);
-                    }
-                }
-            }
-
-            if (!empty($changes['tables']['change']) && is_array($changes['tables']['change'])) {
-                foreach ($changes['tables']['change'] as $table_name => $table) {
-                    if (array_key_exists('name', $table)) {
-                        $this->db->debug("\tRenamed table '$table_name' to '".$table['name']."'", __FUNCTION__);
-                    }
-                    if (!empty($table['add']) && is_array($table['add'])) {
-                        foreach ($table['add'] as $field_name => $field) {
-                            $this->db->debug("\tAdded field '".$field_name."'", __FUNCTION__);
-                        }
-                    }
-                    if (!empty($table['remove']) && is_array($table['remove'])) {
-                        foreach ($table['remove'] as $field_name => $field) {
-                            $this->db->debug("\tRemoved field '".$field_name."'", __FUNCTION__);
-                        }
-                    }
-                    if (!empty($table['rename']) && is_array($table['rename'])) {
-                        foreach ($table['rename'] as $field_name => $field) {
-                            $this->db->debug("\tRenamed field '".$field_name."' to '".$field['name']."'", __FUNCTION__);
-                        }
-                    }
-                    if (!empty($table['change']) && is_array($table['change'])) {
-                        foreach ($table['change'] as $field_name => $field) {
-                            $field = $field['definition'];
-                            if (array_key_exists('type', $field)) {
-                                $this->db->debug("\tChanged field '$field_name' type to '".$field['type']."'", __FUNCTION__);
-                            }
-
-                            if (array_key_exists('unsigned', $field)) {
-                                $this->db->debug("\tChanged field '$field_name' type to '".
-                                                 (!empty($field['unsigned']) && $field['unsigned'] ? '' : 'not ')."unsigned'",
-                                                 __FUNCTION__);
-                            }
-
-                            if (array_key_exists('length', $field)) {
-                                $this->db->debug("\tChanged field '$field_name' length to '".
-                                                (!empty($field['length']) ? $field['length']: 'no length')."'", __FUNCTION__);
-                            }
-                            if (array_key_exists('default', $field)) {
-                                $this->db->debug("\tChanged field '$field_name' default to ".
-                                                 (isset($field['default']) ? "'".$field['default']."'" : 'NULL'), __FUNCTION__);
-                            }
-
-                            if (array_key_exists('notnull', $field)) {
-                                $this->db->debug("\tChanged field '$field_name' notnull to ".
-                                                 (!empty($field['notnull']) && $field['notnull'] ? 'true' : 'false'),
-                                                 __FUNCTION__);
-                            }
-                        }
-                    }
-                    if (!empty($table['indexes']) && is_array($table['indexes'])) {
-                        if (!empty($table['indexes']['add']) && is_array($table['indexes']['add'])) {
-                            foreach ($table['indexes']['add'] as $index_name => $index) {
-                                $this->db->debug("\tAdded index '".$index_name.
-                                    "' of table '$table_name'", __FUNCTION__);
-                            }
-                        }
-                        if (!empty($table['indexes']['remove']) && is_array($table['indexes']['remove'])) {
-                            foreach ($table['indexes']['remove'] as $index_name => $index) {
-                                $this->db->debug("\tRemoved index '".$index_name.
-                                    "' of table '$table_name'", __FUNCTION__);
-                            }
-                        }
-                        if (!empty($table['indexes']['change']) && is_array($table['indexes']['change'])) {
-                            foreach ($table['indexes']['change'] as $index_name => $index) {
-                                if (array_key_exists('name', $index)) {
-                                    $this->db->debug("\tRenamed index '".$index_name."' to '".$index['name'].
-                                                     "' on table '$table_name'", __FUNCTION__);
-                                }
-                                if (array_key_exists('unique', $index)) {
-                                    $this->db->debug("\tChanged index '".$index_name."' unique to '".
-                                                     !empty($index['unique'])."' on table '$table_name'", __FUNCTION__);
-                                }
-                                if (array_key_exists('primary', $index)) {
-                                    $this->db->debug("\tChanged index '".$index_name."' primary to '".
-                                                     !empty($index['primary'])."' on table '$table_name'", __FUNCTION__);
-                                }
-                                if (array_key_exists('change', $index)) {
-                                    $this->db->debug("\tChanged index '".$index_name.
-                                        "' on table '$table_name'", __FUNCTION__);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        if (!empty($changes['sequences'])) {
-            if (!empty($changes['sequences']['add']) && is_array($changes['sequences']['add'])) {
-                foreach ($changes['sequences']['add'] as $sequence_name => $sequence) {
-                    $this->db->debug("$sequence_name:", __FUNCTION__);
-                    $this->db->debug("\tAdded sequence '$sequence_name'", __FUNCTION__);
-                }
-            }
-            if (!empty($changes['sequences']['remove']) && is_array($changes['sequences']['remove'])) {
-                foreach ($changes['sequences']['remove'] as $sequence_name => $sequence) {
-                    $this->db->debug("$sequence_name:", __FUNCTION__);
-                    $this->db->debug("\tAdded sequence '$sequence_name'", __FUNCTION__);
-                }
-            }
-            if (!empty($changes['sequences']['change']) && is_array($changes['sequences']['change'])) {
-                foreach ($changes['sequences']['change'] as $sequence_name => $sequence) {
-                    if (array_key_exists('name', $sequence)) {
-                        $this->db->debug("\tRenamed sequence '$sequence_name' to '".
-                                         $sequence['name']."'", __FUNCTION__);
-                    }
-                    if (!empty($sequence['change']) && is_array($sequence['change'])) {
-                        foreach ($sequence['change'] as $sequence_name => $sequence) {
-                            if (array_key_exists('start', $sequence)) {
-                                $this->db->debug("\tChanged sequence '$sequence_name' start to '".
-                                                 $sequence['start']."'", __FUNCTION__);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ dumpDatabase()
-
-    /**
-     * Dump a previously parsed database structure in the Metabase schema
-     * XML based format suitable for the Metabase parser. This function
-     * may optionally dump the database definition with initialization
-     * commands that specify the data that is currently present in the tables.
-     *
-     * @param array $database_definition multi dimensional array that contains the current definition
-     * @param array $arguments           associative array that takes pairs of tag
-     * names and values that define dump options.
-     *                 <pre>array (
-     *                     'output_mode'    =>    String
-     *                         'file' :   dump into a file
-     *                         default:   dump using a function
-     *                     'output'        =>    String
-     *                         depending on the 'Output_Mode'
-     *                                  name of the file
-     *                                  name of the function
-     *                     'end_of_line'        =>    String
-     *                         end of line delimiter that should be used
-     *                         default: "\n"
-     *                 );</pre>
-     * @param int   $dump                Int that determines what data to dump
-     *              + MDB2_SCHEMA_DUMP_ALL       : the entire db
-     *              + MDB2_SCHEMA_DUMP_STRUCTURE : only the structure of the db
-     *              + MDB2_SCHEMA_DUMP_CONTENT   : only the content of the db
-     *
-     * @return bool|MDB2_Error MDB2_OK or error object
-     * @access public
-     */
-    function dumpDatabase($database_definition, $arguments, $dump = MDB2_SCHEMA_DUMP_ALL)
-    {
-        $class_name = $this->options['writer'];
-
-        $result = MDB2::loadClass($class_name, $this->db->getOption('debug'));
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        // get initialization data
-        if (isset($database_definition['tables']) && is_array($database_definition['tables'])
-            && $dump == MDB2_SCHEMA_DUMP_ALL || $dump == MDB2_SCHEMA_DUMP_CONTENT
-        ) {
-            foreach ($database_definition['tables'] as $table_name => $table) {
-                $fields  = array();
-                $fieldsq = array();
-                foreach ($table['fields'] as $field_name => $field) {
-                    $fields[$field_name] = $field['type'];
-
-                    $fieldsq[] = $this->db->quoteIdentifier($field_name, true);
-                }
-
-                $query  = 'SELECT '.implode(', ', $fieldsq).' FROM ';
-                $query .= $this->db->quoteIdentifier($table_name, true);
-
-                $data = $this->db->queryAll($query, $fields, MDB2_FETCHMODE_ASSOC);
-
-                if (PEAR::isError($data)) {
-                    return $data;
-                }
-
-                if (!empty($data)) {
-                    $initialization    = array();
-                    $lob_buffer_length = $this->db->getOption('lob_buffer_length');
-                    foreach ($data as $row) {
-                        $rows = array();
-                        foreach ($row as $key => $lob) {
-                            if (is_resource($lob)) {
-                                $value = '';
-                                while (!feof($lob)) {
-                                    $value .= fread($lob, $lob_buffer_length);
-                                }
-                                $row[$key] = $value;
-                            }
-                            $rows[] = array('name' => $key, 'group' => array('type' => 'value', 'data' => $row[$key]));
-                        }
-                        $initialization[] = array('type' => 'insert', 'data' => array('field' => $rows));
-                    }
-                    $database_definition['tables'][$table_name]['initialization'] = $initialization;
-                }
-            }
-        }
-
-        $writer = new $class_name($this->options['valid_types']);
-        return $writer->dumpDatabase($database_definition, $arguments, $dump);
-    }
-
-    // }}}
-    // {{{ writeInitialization()
-
-    /**
-     * Write initialization and sequences
-     *
-     * @param string|array $data      data file or data array
-     * @param string|array $structure structure file or array
-     * @param array        $variables associative array that is passed to the argument
-     * of the same name to the parseDatabaseDefinitionFile function. (there third
-     * param)
-     *
-     * @return bool|MDB2_Error MDB2_OK or error object
-     * @access public
-     */
-    function writeInitialization($data, $structure = false, $variables = array())
-    {
-        if ($structure) {
-            $structure = $this->parseDatabaseDefinition($structure, false, $variables);
-            if (PEAR::isError($structure)) {
-                return $structure;
-            }
-        }
-
-        $data = $this->parseDatabaseDefinition($data, false, $variables, false, $structure);
-        if (PEAR::isError($data)) {
-            return $data;
-        }
-
-        $previous_database_name = null;
-        if (!empty($data['name'])) {
-            $previous_database_name = $this->db->setDatabase($data['name']);
-        } elseif (!empty($structure['name'])) {
-            $previous_database_name = $this->db->setDatabase($structure['name']);
-        }
-
-        if (!empty($data['tables']) && is_array($data['tables'])) {
-            foreach ($data['tables'] as $table_name => $table) {
-                if (empty($table['initialization'])) {
-                    continue;
-                }
-                $result = $this->initializeTable($table_name, $table);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
-        }
-
-        if (!empty($structure['sequences']) && is_array($structure['sequences'])) {
-            foreach ($structure['sequences'] as $sequence_name => $sequence) {
-                if (isset($data['sequences'][$sequence_name])
-                    || !isset($sequence['on']['table'])
-                    || !isset($data['tables'][$sequence['on']['table']])
-                ) {
-                    continue;
-                }
-                $result = $this->createSequence($sequence_name, $sequence, true);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
-        }
-        if (!empty($data['sequences']) && is_array($data['sequences'])) {
-            foreach ($data['sequences'] as $sequence_name => $sequence) {
-                $result = $this->createSequence($sequence_name, $sequence, true);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
-        }
-
-        if (isset($previous_database_name)) {
-            $this->db->setDatabase($previous_database_name);
-        }
-
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ updateDatabase()
-
-    /**
-     * Compare the correspondent files of two versions of a database schema
-     * definition: the previously installed and the one that defines the schema
-     * that is meant to update the database.
-     * If the specified previous definition file does not exist, this function
-     * will create the database from the definition specified in the current
-     * schema file.
-     * If both files exist, the function assumes that the database was previously
-     * installed based on the previous schema file and will update it by just
-     * applying the changes.
-     * If this function succeeds, the contents of the current schema file are
-     * copied to replace the previous schema file contents. Any subsequent schema
-     * changes should only be done on the file specified by the $current_schema_file
-     * to let this function make a consistent evaluation of the exact changes that
-     * need to be applied.
-     *
-     * @param string|array $current_schema            filename or array of the updated database schema definition.
-     * @param string|array $previous_schema           filename or array of the previously installed database schema definition.
-     * @param array        $variables                 associative array that is passed to the argument of the same
-     *                                                name to the parseDatabaseDefinitionFile function. (there third param)
-     * @param bool         $disable_query             determines if the disable_query option should be set to true
-     *                                                for the alterDatabase() or createDatabase() call
-     * @param bool         $overwrite_old_schema_file Overwrite?
-     *
-     * @return bool|MDB2_Error MDB2_OK or error object
-     * @access public
-     */
-    function updateDatabase($current_schema, $previous_schema = false,
-                            $variables = array(), $disable_query = false,
-                            $overwrite_old_schema_file = false)
-    {
-        $current_definition = $this->parseDatabaseDefinition($current_schema, false, $variables,
-                                                             $this->options['fail_on_invalid_names']);
-
-        if (PEAR::isError($current_definition)) {
-            return $current_definition;
-        }
-
-        $previous_definition = false;
-        if ($previous_schema) {
-            $previous_definition = $this->parseDatabaseDefinition($previous_schema, true, $variables,
-                                                                  $this->options['fail_on_invalid_names']);
-            if (PEAR::isError($previous_definition)) {
-                return $previous_definition;
-            }
-        }
-
-        if ($previous_definition) {
-            $dbExists = $this->db->databaseExists($current_definition['name']);
-            if (PEAR::isError($dbExists)) {
-                return $dbExists;
-            }
-
-            if (!$dbExists) {
-                 return $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
-                    'database to update does not exist: '.$current_definition['name']);
-            }
-
-            $changes = $this->compareDefinitions($current_definition, $previous_definition);
-            if (PEAR::isError($changes)) {
-                return $changes;
-            }
-
-            if (is_array($changes)) {
-                $this->db->setOption('disable_query', $disable_query);
-                $result = $this->alterDatabase($current_definition, $previous_definition, $changes);
-                $this->db->setOption('disable_query', false);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $copy = true;
-                if ($this->db->options['debug']) {
-                    $result = $this->dumpDatabaseChanges($changes);
-                    if (PEAR::isError($result)) {
-                        return $result;
-                    }
-                }
-            }
-        } else {
-            $this->db->setOption('disable_query', $disable_query);
-            $result = $this->createDatabase($current_definition);
-            $this->db->setOption('disable_query', false);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-        }
-
-        if ($overwrite_old_schema_file
-            && !$disable_query
-            && is_string($previous_schema) && is_string($current_schema)
-            && !copy($current_schema, $previous_schema)) {
-
-            return $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
-                'Could not copy the new database definition file to the current file');
-        }
-
-        return MDB2_OK;
-    }
-    // }}}
-    // {{{ errorMessage()
-
-    /**
-     * Return a textual error message for a MDB2 error code
-     *
-     * @param int|array $value integer error code, <code>null</code> to get the
-     *                          current error code-message map,
-     *                          or an array with a new error code-message map
-     *
-     * @return  string  error message, or false if the error code was not recognized
-     * @access public
-     */
-    function errorMessage($value = null)
-    {
-        static $errorMessages;
-        if (is_array($value)) {
-            $errorMessages = $value;
-            return MDB2_OK;
-        } elseif (!isset($errorMessages)) {
-            $errorMessages = array(
-                MDB2_SCHEMA_ERROR              => 'unknown error',
-                MDB2_SCHEMA_ERROR_PARSE        => 'schema parse error',
-                MDB2_SCHEMA_ERROR_VALIDATE     => 'schema validation error',
-                MDB2_SCHEMA_ERROR_INVALID      => 'invalid',
-                MDB2_SCHEMA_ERROR_UNSUPPORTED  => 'not supported',
-                MDB2_SCHEMA_ERROR_WRITER       => 'schema writer error',
-            );
-        }
-
-        if (is_null($value)) {
-            return $errorMessages;
-        }
-
-        if (PEAR::isError($value)) {
-            $value = $value->getCode();
-        }
-
-        return !empty($errorMessages[$value]) ?
-           $errorMessages[$value] : $errorMessages[MDB2_SCHEMA_ERROR];
-    }
-
-    // }}}
-    // {{{ raiseError()
-
-    /**
-     * This method is used to communicate an error and invoke error
-     * callbacks etc.  Basically a wrapper for PEAR::raiseError
-     * without the message string.
-     *
-     * @param int|PEAR_Error $code     integer error code or and PEAR_Error instance
-     * @param int            $mode     error mode, see PEAR_Error docs
-     *                                 error level (E_USER_NOTICE etc).  If error mode is
-     *                                 PEAR_ERROR_CALLBACK, this is the callback function,
-     *                                 either as a function name, or as an array of an
-     *                                 object and method name.  For other error modes this
-     *                                 parameter is ignored.
-     * @param array          $options  Options, depending on the mode, @see PEAR::setErrorHandling
-     * @param string         $userinfo Extra debug information.  Defaults to the last
-     *                                 query and native error code.
-     *
-     * @return object  a PEAR error object
-     * @access  public
-     * @see PEAR_Error
-     */
-    function raiseError($code = null, $mode = null, $options = null, $userinfo = null,$a=null,$b=null,$c=null)
-    {
-        $err =PEAR::raiseError(null, $code, $mode, $options,
-                                $userinfo, 'MDB2_Schema_Error', true);
-        return $err;
-    }
-
-    // }}}
-    // {{{ isError()
-
-    /**
-     * Tell whether a value is an MDB2_Schema error.
-     *
-     * @param mixed $data the value to test
-     * @param int   $code if $data is an error object, return true only if $code is
-     *                    a string and $db->getMessage() == $code or
-     *                    $code is an integer and $db->getCode() == $code
-     *
-     * @return  bool  true if parameter is an error
-     * @access  public
-     */
-    static function isError($data, $code = null)
-    {
-        if (is_a($data, 'MDB2_Schema_Error')) {
-            if (is_null($code)) {
-                return true;
-            } elseif (is_string($code)) {
-                return $data->getMessage() === $code;
-            } else {
-                $code = (array)$code;
-                return in_array($data->getCode(), $code);
-            }
-        }
-        return false;
-    }
-
-    // }}}
-}
-
-/**
- * MDB2_Schema_Error implements a class for reporting portable database error
- * messages.
- *
- * @category Database
- * @package  MDB2_Schema
- * @author   Stig Bakken <ssb@fast.no>
- * @license  BSD http://www.opensource.org/licenses/bsd-license.php
- * @link     http://pear.php.net/packages/MDB2_Schema
- */
-class MDB2_Schema_Error extends PEAR_Error
-{
-    /**
-     * MDB2_Schema_Error constructor.
-     *
-     * @param mixed $code      error code, or string with error message.
-     * @param int   $mode      what 'error mode' to operate in
-     * @param int   $level     what error level to use for $mode & PEAR_ERROR_TRIGGER
-     * @param mixed $debuginfo additional debug info, such as the last query
-     *
-     * @access  public
-     */
-    function MDB2_Schema_Error($code = MDB2_SCHEMA_ERROR, $mode = PEAR_ERROR_RETURN,
-              $level = E_USER_NOTICE, $debuginfo = null)
-    {
-        $this->PEAR_Error('MDB2_Schema Error: ' . MDB2_Schema::errorMessage($code), $code,
-            $mode, $level, $debuginfo);
-    }
-}
-?>
diff --git a/3rdparty/MDB2/Schema/Parser.php b/3rdparty/MDB2/Schema/Parser.php
deleted file mode 100644
index b740ef55fa8..00000000000
--- a/3rdparty/MDB2/Schema/Parser.php
+++ /dev/null
@@ -1,812 +0,0 @@
-<?php
-/**
- * PHP versions 4 and 5
- *
- * Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,
- * Stig. S. Bakken, Lukas Smith, Igor Feghali
- * All rights reserved.
- *
- * MDB2_Schema enables users to maintain RDBMS independant schema files
- * in XML that can be used to manipulate both data and database schemas
- * This LICENSE is in the BSD license style.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,
- * Lukas Smith, Igor Feghali nor the names of his contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Author: Christian Dickmann <dickmann@php.net>
- * Author: Igor Feghali <ifeghali@php.net>
- *
- * $Id: Parser.php,v 1.68 2008/11/30 03:34:00 clockwerx Exp $
- *
- * @category Database
- * @package  MDB2_Schema
- * @author   Christian Dickmann <dickmann@php.net>
- * @author   Igor Feghali <ifeghali@php.net>
- * @license  BSD http://www.opensource.org/licenses/bsd-license.php
- * @version  CVS: $Id: Parser.php,v 1.68 2008/11/30 03:34:00 clockwerx Exp $
- * @link     http://pear.php.net/packages/MDB2_Schema
- */
-
-
-require_once('XML/Parser.php');
-require_once('MDB2/Schema/Validate.php');
-
-/**
- * Parses an XML schema file
- *
- * @category Database
- * @package  MDB2_Schema
- * @author   Christian Dickmann <dickmann@php.net>
- * @license  BSD http://www.opensource.org/licenses/bsd-license.php
- * @link     http://pear.php.net/packages/MDB2_Schema
- */
-class MDB2_Schema_Parser extends XML_Parser
-{
-    var $database_definition = array();
-
-    var $elements = array();
-
-    var $element = '';
-
-    var $count = 0;
-
-    var $table = array();
-
-    var $table_name = '';
-
-    var $field = array();
-
-    var $field_name = '';
-
-    var $init = array();
-
-    var $init_function = array();
-
-    var $init_expression = array();
-
-    var $init_field = array();
-
-    var $index = array();
-
-    var $index_name = '';
-
-    var $constraint = array();
-
-    var $constraint_name = '';
-
-    var $var_mode = false;
-
-    var $variables = array();
-
-    var $sequence = array();
-
-    var $sequence_name = '';
-
-    var $error;
-
-    var $structure = false;
-
-    var $val;
-
-    function __construct($variables, $fail_on_invalid_names = true,
-                         $structure = false, $valid_types = array(),
-                         $force_defaults = true)
-    {
-        // force ISO-8859-1 due to different defaults for PHP4 and PHP5
-        // todo: this probably needs to be investigated some more andcleaned up
-        parent::__construct('ISO-8859-1');
-
-        $this->variables = $variables;
-        $this->structure = $structure;
-        $this->val       =new MDB2_Schema_Validate($fail_on_invalid_names, $valid_types, $force_defaults);
-    }
-
-    function startHandler($xp, $element, $attribs)
-    {
-        if (strtolower($element) == 'variable') {
-            $this->var_mode = true;
-            return;
-        }
-
-        $this->elements[$this->count++] = strtolower($element);
-
-        $this->element = implode('-', $this->elements);
-
-        switch ($this->element) {
-        /* Initialization */
-        case 'database-table-initialization':
-            $this->table['initialization'] = array();
-            break;
-
-        /* Insert */
-        /* insert: field+ */
-        case 'database-table-initialization-insert':
-            $this->init = array('type' => 'insert', 'data' => array('field' => array()));
-            break;
-        /* insert-select: field+, table, where? */
-        case 'database-table-initialization-insert-select':
-            $this->init['data']['table'] = '';
-            break;
-
-        /* Update */
-        /* update: field+, where? */
-        case 'database-table-initialization-update':
-            $this->init = array('type' => 'update', 'data' => array('field' => array()));
-            break;
-
-        /* Delete */
-        /* delete: where */
-        case 'database-table-initialization-delete':
-            $this->init = array('type' => 'delete', 'data' => array('where' => array()));
-            break;
-
-        /* Insert and Update */
-        case 'database-table-initialization-insert-field':
-        case 'database-table-initialization-insert-select-field':
-        case 'database-table-initialization-update-field':
-            $this->init_field = array('name' => '', 'group' => array());
-            break;
-        case 'database-table-initialization-insert-field-value':
-        case 'database-table-initialization-insert-select-field-value':
-        case 'database-table-initialization-update-field-value':
-            /* if value tag is empty cdataHandler is not called so we must force value element creation here */
-            $this->init_field['group'] = array('type' => 'value', 'data' => '');
-            break;
-        case 'database-table-initialization-insert-field-null':
-        case 'database-table-initialization-insert-select-field-null':
-        case 'database-table-initialization-update-field-null':
-            $this->init_field['group'] = array('type' => 'null');
-            break;
-        case 'database-table-initialization-insert-field-function':
-        case 'database-table-initialization-insert-select-field-function':
-        case 'database-table-initialization-update-field-function':
-            $this->init_function = array('name' => '');
-            break;
-        case 'database-table-initialization-insert-field-expression':
-        case 'database-table-initialization-insert-select-field-expression':
-        case 'database-table-initialization-update-field-expression':
-            $this->init_expression = array();
-            break;
-
-        /* All */
-        case 'database-table-initialization-insert-select-where':
-        case 'database-table-initialization-update-where':
-        case 'database-table-initialization-delete-where':
-            $this->init['data']['where'] = array('type' => '', 'data' => array());
-            break;
-        case 'database-table-initialization-insert-select-where-expression':
-        case 'database-table-initialization-update-where-expression':
-        case 'database-table-initialization-delete-where-expression':
-            $this->init_expression = array();
-            break;
-
-        /* One level simulation of expression-function recursion */
-        case 'database-table-initialization-insert-field-expression-function':
-        case 'database-table-initialization-insert-select-field-expression-function':
-        case 'database-table-initialization-insert-select-where-expression-function':
-        case 'database-table-initialization-update-field-expression-function':
-        case 'database-table-initialization-update-where-expression-function':
-        case 'database-table-initialization-delete-where-expression-function':
-            $this->init_function = array('name' => '');
-            break;
-
-        /* One level simulation of function-expression recursion */
-        case 'database-table-initialization-insert-field-function-expression':
-        case 'database-table-initialization-insert-select-field-function-expression':
-        case 'database-table-initialization-insert-select-where-function-expression':
-        case 'database-table-initialization-update-field-function-expression':
-        case 'database-table-initialization-update-where-function-expression':
-        case 'database-table-initialization-delete-where-function-expression':
-            $this->init_expression = array();
-            break;
-
-        /* Definition */
-        case 'database':
-            $this->database_definition = array(
-                'name' => '',
-                'create' => '',
-                'overwrite' => '',
-                'charset' => '',
-                'description' => '',
-                'comments' => '',
-                'tables' => array(),
-                'sequences' => array()
-            );
-            break;
-        case 'database-table':
-            $this->table_name = '';
-
-            $this->table = array(
-                'was' => '',
-                'description' => '',
-                'comments' => '',
-                'fields' => array(),
-                'indexes' => array(),
-                'constraints' => array(),
-                'initialization' => array()
-            );
-            break;
-        case 'database-table-declaration-field':
-        case 'database-table-declaration-foreign-field':
-        case 'database-table-declaration-foreign-references-field':
-            $this->field_name = '';
-
-            $this->field = array();
-            break;
-        case 'database-table-declaration-index-field':
-            $this->field_name = '';
-
-            $this->field = array('sorting' => '', 'length' => '');
-            break;
-        /* force field attributes to be initialized when the tag is empty in the XML */
-        case 'database-table-declaration-field-was':
-            $this->field['was'] = '';
-            break;
-        case 'database-table-declaration-field-type':
-            $this->field['type'] = '';
-            break;
-        case 'database-table-declaration-field-fixed':
-            $this->field['fixed'] = '';
-            break;
-        case 'database-table-declaration-field-default':
-            $this->field['default'] = '';
-            break;
-        case 'database-table-declaration-field-notnull':
-            $this->field['notnull'] = '';
-            break;
-        case 'database-table-declaration-field-autoincrement':
-            $this->field['autoincrement'] = '';
-            break;
-        case 'database-table-declaration-field-unsigned':
-            $this->field['unsigned'] = '';
-            break;
-        case 'database-table-declaration-field-length':
-            $this->field['length'] = '';
-            break;
-        case 'database-table-declaration-field-description':
-            $this->field['description'] = '';
-            break;
-        case 'database-table-declaration-field-comments':
-            $this->field['comments'] = '';
-            break;
-        case 'database-table-declaration-index':
-            $this->index_name = '';
-
-            $this->index = array(
-                'was' => '',
-                'unique' =>'',
-                'primary' => '',
-                'fields' => array()
-            );
-            break;
-        case 'database-table-declaration-foreign':
-            $this->constraint_name = '';
-
-            $this->constraint = array(
-                'was' => '',
-                'match' => '',
-                'ondelete' => '',
-                'onupdate' => '',
-                'deferrable' => '',
-                'initiallydeferred' => '',
-                'foreign' => true,
-                'fields' => array(),
-                'references' => array('table' => '', 'fields' => array())
-            );
-            break;
-        case 'database-sequence':
-            $this->sequence_name = '';
-
-            $this->sequence = array(
-                'was' => '',
-                'start' => '',
-                'description' => '',
-                'comments' => '',
-                'on' => array('table' => '', 'field' => '')
-            );
-            break;
-        }
-    }
-
-    function endHandler($xp, $element)
-    {
-        if (strtolower($element) == 'variable') {
-            $this->var_mode = false;
-            return;
-        }
-
-        switch ($this->element) {
-        /* Initialization */
-
-        /* Insert */
-        case 'database-table-initialization-insert-select':
-            $this->init['data'] = array('select' => $this->init['data']);
-            break;
-
-        /* Insert and Delete */
-        case 'database-table-initialization-insert-field':
-        case 'database-table-initialization-insert-select-field':
-        case 'database-table-initialization-update-field':
-            $result = $this->val->validateDataField($this->table['fields'], $this->init['data']['field'], $this->init_field);
-            if (PEAR::isError($result)) {
-                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
-            } else {
-                $this->init['data']['field'][] = $this->init_field;
-            }
-            break;
-        case 'database-table-initialization-insert-field-function':
-        case 'database-table-initialization-insert-select-field-function':
-        case 'database-table-initialization-update-field-function':
-            $this->init_field['group'] = array('type' => 'function', 'data' => $this->init_function);
-            break;
-        case 'database-table-initialization-insert-field-expression':
-        case 'database-table-initialization-insert-select-field-expression':
-        case 'database-table-initialization-update-field-expression':
-            $this->init_field['group'] = array('type' => 'expression', 'data' => $this->init_expression);
-            break;
-
-        /* All */
-        case 'database-table-initialization-insert-select-where-expression':
-        case 'database-table-initialization-update-where-expression':
-        case 'database-table-initialization-delete-where-expression':
-            $this->init['data']['where']['type'] = 'expression';
-            $this->init['data']['where']['data'] = $this->init_expression;
-            break;
-        case 'database-table-initialization-insert':
-        case 'database-table-initialization-delete':
-        case 'database-table-initialization-update':
-            $this->table['initialization'][] = $this->init;
-            break;
-
-        /* One level simulation of expression-function recursion */
-        case 'database-table-initialization-insert-field-expression-function':
-        case 'database-table-initialization-insert-select-field-expression-function':
-        case 'database-table-initialization-insert-select-where-expression-function':
-        case 'database-table-initialization-update-field-expression-function':
-        case 'database-table-initialization-update-where-expression-function':
-        case 'database-table-initialization-delete-where-expression-function':
-            $this->init_expression['operants'][] = array('type' => 'function', 'data' => $this->init_function);
-            break;
-
-        /* One level simulation of function-expression recursion */
-        case 'database-table-initialization-insert-field-function-expression':
-        case 'database-table-initialization-insert-select-field-function-expression':
-        case 'database-table-initialization-insert-select-where-function-expression':
-        case 'database-table-initialization-update-field-function-expression':
-        case 'database-table-initialization-update-where-function-expression':
-        case 'database-table-initialization-delete-where-function-expression':
-            $this->init_function['arguments'][] = array('type' => 'expression', 'data' => $this->init_expression);
-            break;
-
-        /* Table definition */
-        case 'database-table':
-            $result = $this->val->validateTable($this->database_definition['tables'], $this->table, $this->table_name);
-            if (PEAR::isError($result)) {
-                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
-            } else {
-                $this->database_definition['tables'][$this->table_name] = $this->table;
-            }
-            break;
-        case 'database-table-name':
-            if (isset($this->structure['tables'][$this->table_name])) {
-                $this->table = $this->structure['tables'][$this->table_name];
-            }
-            break;
-
-        /* Field declaration */
-        case 'database-table-declaration-field':
-            $result = $this->val->validateField($this->table['fields'], $this->field, $this->field_name);
-            if (PEAR::isError($result)) {
-                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
-            } else {
-                $this->table['fields'][$this->field_name] = $this->field;
-            }
-            break;
-
-        /* Index declaration */
-        case 'database-table-declaration-index':
-            $result = $this->val->validateIndex($this->table['indexes'], $this->index, $this->index_name);
-            if (PEAR::isError($result)) {
-                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
-            } else {
-                $this->table['indexes'][$this->index_name] = $this->index;
-            }
-            break;
-        case 'database-table-declaration-index-field':
-            $result = $this->val->validateIndexField($this->index['fields'], $this->field, $this->field_name);
-            if (PEAR::isError($result)) {
-                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
-            } else {
-                $this->index['fields'][$this->field_name] = $this->field;
-            }
-            break;
-
-        /* Foreign Key declaration */
-        case 'database-table-declaration-foreign':
-            $result = $this->val->validateConstraint($this->table['constraints'], $this->constraint, $this->constraint_name);
-            if (PEAR::isError($result)) {
-                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
-            } else {
-                $this->table['constraints'][$this->constraint_name] = $this->constraint;
-            }
-            break;
-        case 'database-table-declaration-foreign-field':
-            $result = $this->val->validateConstraintField($this->constraint['fields'], $this->field_name);
-            if (PEAR::isError($result)) {
-                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
-            } else {
-                $this->constraint['fields'][$this->field_name] = '';
-            }
-            break;
-        case 'database-table-declaration-foreign-references-field':
-            $result = $this->val->validateConstraintReferencedField($this->constraint['references']['fields'], $this->field_name);
-            if (PEAR::isError($result)) {
-                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
-            } else {
-                $this->constraint['references']['fields'][$this->field_name] = '';
-            }
-            break;
-
-        /* Sequence declaration */
-        case 'database-sequence':
-            $result = $this->val->validateSequence($this->database_definition['sequences'], $this->sequence, $this->sequence_name);
-            if (PEAR::isError($result)) {
-                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
-            } else {
-                $this->database_definition['sequences'][$this->sequence_name] = $this->sequence;
-            }
-            break;
-
-        /* End of File */
-        case 'database':
-            $result = $this->val->validateDatabase($this->database_definition);
-            if (PEAR::isError($result)) {
-                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
-            }
-            break;
-        }
-
-        unset($this->elements[--$this->count]);
-        $this->element = implode('-', $this->elements);
-    }
-
-    function raiseError($msg = null, $xmlecode = 0, $xp = null, $ecode = MDB2_SCHEMA_ERROR_PARSE,$a=null,$b=null,$c=null)
-    {
-        if (is_null($this->error)) {
-            $error = '';
-            if (is_resource($msg)) {
-                $error .= 'Parser error: '.xml_error_string(xml_get_error_code($msg));
-                $xp     = $msg;
-            } else {
-                $error .= 'Parser error: '.$msg;
-                if (!is_resource($xp)) {
-                    $xp = $this->parser;
-                }
-            }
-
-            if ($error_string = xml_error_string($xmlecode)) {
-                $error .= ' - '.$error_string;
-            }
-
-            if (is_resource($xp)) {
-                $byte   = @xml_get_current_byte_index($xp);
-                $line   = @xml_get_current_line_number($xp);
-                $column = @xml_get_current_column_number($xp);
-                $error .= " - Byte: $byte; Line: $line; Col: $column";
-            }
-
-            $error .= "\n";
-
-            $this->error =& MDB2_Schema::raiseError($ecode, null, null, $error);
-        }
-        return $this->error;
-    }
-
-    function cdataHandler($xp, $data)
-    {
-        if ($this->var_mode == true) {
-            if (!isset($this->variables[$data])) {
-                $this->raiseError('variable "'.$data.'" not found', null, $xp);
-                return;
-            }
-            $data = $this->variables[$data];
-        }
-
-        switch ($this->element) {
-        /* Initialization */
-
-        /* Insert */
-        case 'database-table-initialization-insert-select-table':
-            $this->init['data']['table'] = $data;
-            break;
-
-        /* Insert and Update */
-        case 'database-table-initialization-insert-field-name':
-        case 'database-table-initialization-insert-select-field-name':
-        case 'database-table-initialization-update-field-name':
-            $this->init_field['name'] .= $data;
-            break;
-        case 'database-table-initialization-insert-field-value':
-        case 'database-table-initialization-insert-select-field-value':
-        case 'database-table-initialization-update-field-value':
-            $this->init_field['group']['data'] .= $data;
-            break;
-        case 'database-table-initialization-insert-field-function-name':
-        case 'database-table-initialization-insert-select-field-function-name':
-        case 'database-table-initialization-update-field-function-name':
-            $this->init_function['name'] .= $data;
-            break;
-        case 'database-table-initialization-insert-field-function-value':
-        case 'database-table-initialization-insert-select-field-function-value':
-        case 'database-table-initialization-update-field-function-value':
-            $this->init_function['arguments'][] = array('type' => 'value', 'data' => $data);
-            break;
-        case 'database-table-initialization-insert-field-function-column':
-        case 'database-table-initialization-insert-select-field-function-column':
-        case 'database-table-initialization-update-field-function-column':
-            $this->init_function['arguments'][] = array('type' => 'column', 'data' => $data);
-            break;
-        case 'database-table-initialization-insert-field-column':
-        case 'database-table-initialization-insert-select-field-column':
-        case 'database-table-initialization-update-field-column':
-            $this->init_field['group'] = array('type' => 'column', 'data' => $data);
-            break;
-
-        /* All */
-        case 'database-table-initialization-insert-field-expression-operator':
-        case 'database-table-initialization-insert-select-field-expression-operator':
-        case 'database-table-initialization-insert-select-where-expression-operator':
-        case 'database-table-initialization-update-field-expression-operator':
-        case 'database-table-initialization-update-where-expression-operator':
-        case 'database-table-initialization-delete-where-expression-operator':
-            $this->init_expression['operator'] = $data;
-            break;
-        case 'database-table-initialization-insert-field-expression-value':
-        case 'database-table-initialization-insert-select-field-expression-value':
-        case 'database-table-initialization-insert-select-where-expression-value':
-        case 'database-table-initialization-update-field-expression-value':
-        case 'database-table-initialization-update-where-expression-value':
-        case 'database-table-initialization-delete-where-expression-value':
-            $this->init_expression['operants'][] = array('type' => 'value', 'data' => $data);
-            break;
-        case 'database-table-initialization-insert-field-expression-column':
-        case 'database-table-initialization-insert-select-field-expression-column':
-        case 'database-table-initialization-insert-select-where-expression-column':
-        case 'database-table-initialization-update-field-expression-column':
-        case 'database-table-initialization-update-where-expression-column':
-        case 'database-table-initialization-delete-where-expression-column':
-            $this->init_expression['operants'][] = array('type' => 'column', 'data' => $data);
-            break;
-
-        case 'database-table-initialization-insert-field-function-function':
-        case 'database-table-initialization-insert-field-function-expression':
-        case 'database-table-initialization-insert-field-expression-expression':
-        case 'database-table-initialization-update-field-function-function':
-        case 'database-table-initialization-update-field-function-expression':
-        case 'database-table-initialization-update-field-expression-expression':
-        case 'database-table-initialization-update-where-expression-expression':
-        case 'database-table-initialization-delete-where-expression-expression':
-            /* Recursion to be implemented yet */
-            break;
-
-        /* One level simulation of expression-function recursion */
-        case 'database-table-initialization-insert-field-expression-function-name':
-        case 'database-table-initialization-insert-select-field-expression-function-name':
-        case 'database-table-initialization-insert-select-where-expression-function-name':
-        case 'database-table-initialization-update-field-expression-function-name':
-        case 'database-table-initialization-update-where-expression-function-name':
-        case 'database-table-initialization-delete-where-expression-function-name':
-            $this->init_function['name'] .= $data;
-            break;
-        case 'database-table-initialization-insert-field-expression-function-value':
-        case 'database-table-initialization-insert-select-field-expression-function-value':
-        case 'database-table-initialization-insert-select-where-expression-function-value':
-        case 'database-table-initialization-update-field-expression-function-value':
-        case 'database-table-initialization-update-where-expression-function-value':
-        case 'database-table-initialization-delete-where-expression-function-value':
-            $this->init_function['arguments'][] = array('type' => 'value', 'data' => $data);
-            break;
-        case 'database-table-initialization-insert-field-expression-function-column':
-        case 'database-table-initialization-insert-select-field-expression-function-column':
-        case 'database-table-initialization-insert-select-where-expression-function-column':
-        case 'database-table-initialization-update-field-expression-function-column':
-        case 'database-table-initialization-update-where-expression-function-column':
-        case 'database-table-initialization-delete-where-expression-function-column':
-            $this->init_function['arguments'][] = array('type' => 'column', 'data' => $data);
-            break;
-
-        /* One level simulation of function-expression recursion */
-        case 'database-table-initialization-insert-field-function-expression-operator':
-        case 'database-table-initialization-insert-select-field-function-expression-operator':
-        case 'database-table-initialization-update-field-function-expression-operator':
-            $this->init_expression['operator'] = $data;
-            break;
-        case 'database-table-initialization-insert-field-function-expression-value':
-        case 'database-table-initialization-insert-select-field-function-expression-value':
-        case 'database-table-initialization-update-field-function-expression-value':
-            $this->init_expression['operants'][] = array('type' => 'value', 'data' => $data);
-            break;
-        case 'database-table-initialization-insert-field-function-expression-column':
-        case 'database-table-initialization-insert-select-field-function-expression-column':
-        case 'database-table-initialization-update-field-function-expression-column':
-            $this->init_expression['operants'][] = array('type' => 'column', 'data' => $data);
-            break;
-
-        /* Database */
-        case 'database-name':
-            $this->database_definition['name'] .= $data;
-            break;
-        case 'database-create':
-            $this->database_definition['create'] .= $data;
-            break;
-        case 'database-overwrite':
-            $this->database_definition['overwrite'] .= $data;
-            break;
-        case 'database-charset':
-            $this->database_definition['charset'] .= $data;
-            break;
-        case 'database-description':
-            $this->database_definition['description'] .= $data;
-            break;
-        case 'database-comments':
-            $this->database_definition['comments'] .= $data;
-            break;
-
-        /* Table declaration */
-        case 'database-table-name':
-            $this->table_name .= $data;
-            break;
-        case 'database-table-was':
-            $this->table['was'] .= $data;
-            break;
-        case 'database-table-description':
-            $this->table['description'] .= $data;
-            break;
-        case 'database-table-comments':
-            $this->table['comments'] .= $data;
-            break;
-
-        /* Field declaration */
-        case 'database-table-declaration-field-name':
-            $this->field_name .= $data;
-            break;
-        case 'database-table-declaration-field-was':
-            $this->field['was'] .= $data;
-            break;
-        case 'database-table-declaration-field-type':
-            $this->field['type'] .= $data;
-            break;
-        case 'database-table-declaration-field-fixed':
-            $this->field['fixed'] .= $data;
-            break;
-        case 'database-table-declaration-field-default':
-            $this->field['default'] .= $data;
-            break;
-        case 'database-table-declaration-field-notnull':
-            $this->field['notnull'] .= $data;
-            break;
-        case 'database-table-declaration-field-autoincrement':
-            $this->field['autoincrement'] .= $data;
-            break;
-        case 'database-table-declaration-field-unsigned':
-            $this->field['unsigned'] .= $data;
-            break;
-        case 'database-table-declaration-field-length':
-            $this->field['length'] .= $data;
-            break;
-        case 'database-table-declaration-field-description':
-            $this->field['description'] .= $data;
-            break;
-        case 'database-table-declaration-field-comments':
-            $this->field['comments'] .= $data;
-            break;
-
-        /* Index declaration */
-        case 'database-table-declaration-index-name':
-            $this->index_name .= $data;
-            break;
-        case 'database-table-declaration-index-was':
-            $this->index['was'] .= $data;
-            break;
-        case 'database-table-declaration-index-unique':
-            $this->index['unique'] .= $data;
-            break;
-        case 'database-table-declaration-index-primary':
-            $this->index['primary'] .= $data;
-            break;
-        case 'database-table-declaration-index-field-name':
-            $this->field_name .= $data;
-            break;
-        case 'database-table-declaration-index-field-sorting':
-            $this->field['sorting'] .= $data;
-            break;
-        /* Add by Leoncx */
-        case 'database-table-declaration-index-field-length':
-            $this->field['length'] .= $data;
-            break;
-
-        /* Foreign Key declaration */
-        case 'database-table-declaration-foreign-name':
-            $this->constraint_name .= $data;
-            break;
-        case 'database-table-declaration-foreign-was':
-            $this->constraint['was'] .= $data;
-            break;
-        case 'database-table-declaration-foreign-match':
-            $this->constraint['match'] .= $data;
-            break;
-        case 'database-table-declaration-foreign-ondelete':
-            $this->constraint['ondelete'] .= $data;
-            break;
-        case 'database-table-declaration-foreign-onupdate':
-            $this->constraint['onupdate'] .= $data;
-            break;
-        case 'database-table-declaration-foreign-deferrable':
-            $this->constraint['deferrable'] .= $data;
-            break;
-        case 'database-table-declaration-foreign-initiallydeferred':
-            $this->constraint['initiallydeferred'] .= $data;
-            break;
-        case 'database-table-declaration-foreign-field':
-            $this->field_name .= $data;
-            break;
-        case 'database-table-declaration-foreign-references-table':
-            $this->constraint['references']['table'] .= $data;
-            break;
-        case 'database-table-declaration-foreign-references-field':
-            $this->field_name .= $data;
-            break;
-
-        /* Sequence declaration */
-        case 'database-sequence-name':
-            $this->sequence_name .= $data;
-            break;
-        case 'database-sequence-was':
-            $this->sequence['was'] .= $data;
-            break;
-        case 'database-sequence-start':
-            $this->sequence['start'] .= $data;
-            break;
-        case 'database-sequence-description':
-            $this->sequence['description'] .= $data;
-            break;
-        case 'database-sequence-comments':
-            $this->sequence['comments'] .= $data;
-            break;
-        case 'database-sequence-on-table':
-            $this->sequence['on']['table'] .= $data;
-            break;
-        case 'database-sequence-on-field':
-            $this->sequence['on']['field'] .= $data;
-            break;
-        }
-    }
-}
-
-?>
diff --git a/3rdparty/MDB2/Schema/Parser2.php b/3rdparty/MDB2/Schema/Parser2.php
deleted file mode 100644
index 01318473fdd..00000000000
--- a/3rdparty/MDB2/Schema/Parser2.php
+++ /dev/null
@@ -1,624 +0,0 @@
-<?php
-/**
- * PHP versions 4 and 5
- *
- * Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,
- * Stig. S. Bakken, Lukas Smith, Igor Feghali
- * All rights reserved.
- *
- * MDB2_Schema enables users to maintain RDBMS independant schema files
- * in XML that can be used to manipulate both data and database schemas
- * This LICENSE is in the BSD license style.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,
- * Lukas Smith, Igor Feghali nor the names of his contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Author: Igor Feghali <ifeghali@php.net>
- *
- * @category Database
- * @package  MDB2_Schema
- * @author   Igor Feghali <ifeghali@php.net>
- * @license  BSD http://www.opensource.org/licenses/bsd-license.php
- * @version  CVS: $Id: Parser2.php,v 1.12 2008/11/30 03:34:00 clockwerx Exp $
- * @link     http://pear.php.net/packages/MDB2_Schema
- */
-
-require_once 'XML/Unserializer.php';
-require_once 'MDB2/Schema/Validate.php';
-
-/**
- * Parses an XML schema file
- *
- * @category Database
- * @package  MDB2_Schema
- * @author   Lukas Smith <smith@pooteeweet.org>
- * @author   Igor Feghali <ifeghali@php.net>
- * @license  BSD http://www.opensource.org/licenses/bsd-license.php
- * @link     http://pear.php.net/packages/MDB2_Schema
- */
-class MDB2_Schema_Parser2 extends XML_Unserializer
-{
-    var $database_definition = array();
-
-    var $database_loaded = array();
-
-    var $variables = array();
-
-    var $error;
-
-    var $structure = false;
-
-    var $val;
-
-    var $options = array();
-
-    var $table = array();
-
-    var $table_name = '';
-
-    var $field = array();
-
-    var $field_name = '';
-
-    var $index = array();
-
-    var $index_name = '';
-
-    var $constraint = array();
-
-    var $constraint_name = '';
-
-    var $sequence = array();
-
-    var $sequence_name = '';
-
-    var $init = array();
-
-    function __construct($variables, $fail_on_invalid_names = true, $structure = false, $valid_types = array(), $force_defaults = true)
-    {
-        // force ISO-8859-1 due to different defaults for PHP4 and PHP5
-        // todo: this probably needs to be investigated some more and cleaned up
-        $this->options['encoding'] = 'ISO-8859-1';
-
-        $this->options['XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE']    = true;
-        $this->options['XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY'] = false;
-
-        $this->options['forceEnum'] = array('table', 'field', 'index', 'foreign', 'insert', 'update', 'delete', 'sequence');
-
-        /*
-         * todo: find a way to force the following items not to be parsed as arrays
-         * as it cause problems in functions with multiple arguments
-         */
-        //$this->options['forceNEnum'] = array('value', 'column');
-        $this->variables = $variables;
-        $this->structure = $structure;
-
-        $this->val =& new MDB2_Schema_Validate($fail_on_invalid_names, $valid_types, $force_defaults);
-        parent::XML_Unserializer($this->options);
-    }
-
-    function MDB2_Schema_Parser2($variables, $fail_on_invalid_names = true, $structure = false, $valid_types = array(), $force_defaults = true)
-    {
-        $this->__construct($variables, $fail_on_invalid_names, $structure, $valid_types, $force_defaults);
-    }
-
-    function parse()
-    {
-        $result = $this->unserialize($this->filename, true);
-
-        if (PEAR::isError($result)) {
-            return $result;
-        } else {
-            $this->database_loaded = $this->getUnserializedData();
-            return $this->fixDatabaseKeys($this->database_loaded);
-        }
-    }
-
-    function setInputFile($filename)
-    {
-        $this->filename = $filename;
-        return MDB2_OK;
-    }
-
-    function renameKey(&$arr, $oKey, $nKey)
-    {
-        $arr[$nKey] = &$arr[$oKey];
-        unset($arr[$oKey]);
-    }
-
-    function fixDatabaseKeys($database)
-    {
-        $this->database_definition = array(
-            'name' => '',
-            'create' => '',
-            'overwrite' => '',
-            'charset' => '',
-            'description' => '',
-            'comments' => '',
-            'tables' => array(),
-            'sequences' => array()
-        );
-
-        if (!empty($database['name'])) {
-            $this->database_definition['name'] = $database['name'];
-        }
-        if (!empty($database['create'])) {
-            $this->database_definition['create'] = $database['create'];
-        }
-        if (!empty($database['overwrite'])) {
-            $this->database_definition['overwrite'] = $database['overwrite'];
-        }
-        if (!empty($database['charset'])) {
-            $this->database_definition['charset'] = $database['charset'];
-        }
-        if (!empty($database['description'])) {
-            $this->database_definition['description'] = $database['description'];
-        }
-        if (!empty($database['comments'])) {
-            $this->database_definition['comments'] = $database['comments'];
-        }
-
-        if (!empty($database['table']) && is_array($database['table'])) {
-            foreach ($database['table'] as $table) {
-                $this->fixTableKeys($table);
-            }
-        }
-
-        if (!empty($database['sequence']) && is_array($database['sequence'])) {
-            foreach ($database['sequence'] as $sequence) {
-                $this->fixSequenceKeys($sequence);
-            }
-        }
-
-        $result = $this->val->validateDatabase($this->database_definition);
-        if (PEAR::isError($result)) {
-            return $this->raiseError($result->getUserinfo());
-        }
-
-        return MDB2_OK;
-    }
-
-    function fixTableKeys($table)
-    {
-        $this->table = array(
-            'was' => '',
-            'description' => '',
-            'comments' => '',
-            'fields' => array(),
-            'indexes' => array(),
-            'constraints' => array(),
-            'initialization' => array()
-        );
-
-        if (!empty($table['name'])) {
-            $this->table_name = $table['name'];
-        } else {
-            $this->table_name = '';
-        }
-        if (!empty($table['was'])) {
-            $this->table['was'] = $table['was'];
-        }
-        if (!empty($table['description'])) {
-            $this->table['description'] = $table['description'];
-        }
-        if (!empty($table['comments'])) {
-            $this->table['comments'] = $table['comments'];
-        }
-
-        if (!empty($table['declaration']) && is_array($table['declaration'])) {
-            if (!empty($table['declaration']['field']) && is_array($table['declaration']['field'])) {
-                foreach ($table['declaration']['field'] as $field) {
-                    $this->fixTableFieldKeys($field);
-                }
-            }
-
-            if (!empty($table['declaration']['index']) && is_array($table['declaration']['index'])) {
-                foreach ($table['declaration']['index'] as $index) {
-                    $this->fixTableIndexKeys($index);
-                }
-            }
-
-            if (!empty($table['declaration']['foreign']) && is_array($table['declaration']['foreign'])) {
-                foreach ($table['declaration']['foreign'] as $constraint) {
-                    $this->fixTableConstraintKeys($constraint);
-                }
-            }
-        }
-
-        if (!empty($table['initialization']) && is_array($table['initialization'])) {
-            if (!empty($table['initialization']['insert']) && is_array($table['initialization']['insert'])) {
-                foreach ($table['initialization']['insert'] as $init) {
-                    $this->fixTableInitializationKeys($init, 'insert');
-                }
-            }
-            if (!empty($table['initialization']['update']) && is_array($table['initialization']['update'])) {
-                foreach ($table['initialization']['update'] as $init) {
-                    $this->fixTableInitializationKeys($init, 'update');
-                }
-            }
-            if (!empty($table['initialization']['delete']) && is_array($table['initialization']['delete'])) {
-                foreach ($table['initialization']['delete'] as $init) {
-                    $this->fixTableInitializationKeys($init, 'delete');
-                }
-            }
-        }
-
-        $result = $this->val->validateTable($this->database_definition['tables'], $this->table, $this->table_name);
-        if (PEAR::isError($result)) {
-            return $this->raiseError($result->getUserinfo());
-        } else {
-            $this->database_definition['tables'][$this->table_name] = $this->table;
-        }
-
-        return MDB2_OK;
-    }
-
-    function fixTableFieldKeys($field)
-    {
-        $this->field = array();
-        if (!empty($field['name'])) {
-            $this->field_name = $field['name'];
-        } else {
-            $this->field_name = '';
-        }
-        if (!empty($field['was'])) {
-            $this->field['was'] = $field['was'];
-        }
-        if (!empty($field['type'])) {
-            $this->field['type'] = $field['type'];
-        }
-        if (!empty($field['fixed'])) {
-            $this->field['fixed'] = $field['fixed'];
-        }
-        if (isset($field['default'])) {
-            $this->field['default'] = $field['default'];
-        }
-        if (!empty($field['notnull'])) {
-            $this->field['notnull'] = $field['notnull'];
-        }
-        if (!empty($field['autoincrement'])) {
-            $this->field['autoincrement'] = $field['autoincrement'];
-        }
-        if (!empty($field['unsigned'])) {
-            $this->field['unsigned'] = $field['unsigned'];
-        }
-        if (!empty($field['length'])) {
-            $this->field['length'] = $field['length'];
-        }
-        if (!empty($field['description'])) {
-            $this->field['description'] = $field['description'];
-        }
-        if (!empty($field['comments'])) {
-            $this->field['comments'] = $field['comments'];
-        }
-
-        $result = $this->val->validateField($this->table['fields'], $this->field, $this->field_name);
-        if (PEAR::isError($result)) {
-            return $this->raiseError($result->getUserinfo());
-        } else {
-            $this->table['fields'][$this->field_name] = $this->field;
-        }
-
-        return MDB2_OK;
-    }
-
-    function fixTableIndexKeys($index)
-    {
-        $this->index = array(
-            'was' => '',
-            'unique' =>'',
-            'primary' => '',
-            'fields' => array()
-        );
-
-        if (!empty($index['name'])) {
-            $this->index_name = $index['name'];
-        } else {
-            $this->index_name = '';
-        }
-        if (!empty($index['was'])) {
-            $this->index['was'] = $index['was'];
-        }
-        if (!empty($index['unique'])) {
-            $this->index['unique'] = $index['unique'];
-        }
-        if (!empty($index['primary'])) {
-            $this->index['primary'] = $index['primary'];
-        }
-        if (!empty($index['field'])) {
-            foreach ($index['field'] as $field) {
-                if (!empty($field['name'])) {
-                    $this->field_name = $field['name'];
-                } else {
-                    $this->field_name = '';
-                }
-                $this->field = array(
-                    'sorting' => '',
-                    'length' => ''
-                );
-
-                if (!empty($field['sorting'])) {
-                    $this->field['sorting'] = $field['sorting'];
-                }
-                if (!empty($field['length'])) {
-                    $this->field['length'] = $field['length'];
-                }
-
-                $result = $this->val->validateIndexField($this->index['fields'], $this->field, $this->field_name);
-                if (PEAR::isError($result)) {
-                    return $this->raiseError($result->getUserinfo());
-                }
-
-                $this->index['fields'][$this->field_name] = $this->field;
-            }
-        }
-
-        $result = $this->val->validateIndex($this->table['indexes'], $this->index, $this->index_name);
-        if (PEAR::isError($result)) {
-            return $this->raiseError($result->getUserinfo());
-        } else {
-            $this->table['indexes'][$this->index_name] = $this->index;
-        }
-
-        return MDB2_OK;
-    }
-
-    function fixTableConstraintKeys($constraint) 
-    {
-        $this->constraint = array(
-            'was' => '',
-            'match' => '',
-            'ondelete' => '',
-            'onupdate' => '',
-            'deferrable' => '',
-            'initiallydeferred' => '',
-            'foreign' => true,
-            'fields' => array(),
-            'references' => array('table' => '', 'fields' => array())
-        );
-
-        if (!empty($constraint['name'])) {
-            $this->constraint_name = $constraint['name'];
-        } else {
-            $this->constraint_name = '';
-        }
-        if (!empty($constraint['was'])) {
-            $this->constraint['was'] = $constraint['was'];
-        }
-        if (!empty($constraint['match'])) {
-            $this->constraint['match'] = $constraint['match'];
-        }
-        if (!empty($constraint['ondelete'])) {
-            $this->constraint['ondelete'] = $constraint['ondelete'];
-        }
-        if (!empty($constraint['onupdate'])) {
-            $this->constraint['onupdate'] = $constraint['onupdate'];
-        }
-        if (!empty($constraint['deferrable'])) {
-            $this->constraint['deferrable'] = $constraint['deferrable'];
-        }
-        if (!empty($constraint['initiallydeferred'])) {
-            $this->constraint['initiallydeferred'] = $constraint['initiallydeferred'];
-        }
-        if (!empty($constraint['field']) && is_array($constraint['field'])) {
-            foreach ($constraint['field'] as $field) {
-                $result = $this->val->validateConstraintField($this->constraint['fields'], $field);
-                if (PEAR::isError($result)) {
-                    return $this->raiseError($result->getUserinfo());
-                }
-
-                $this->constraint['fields'][$field] = '';
-            }
-        }
-
-        if (!empty($constraint['references']) && is_array($constraint['references'])) {
-            /**
-             * As we forced 'table' to be enumerated
-             * we have to fix it on the foreign-references-table context
-             */
-            if (!empty($constraint['references']['table']) && is_array($constraint['references']['table'])) {
-                $this->constraint['references']['table'] = $constraint['references']['table'][0];
-            }
-
-            if (!empty($constraint['references']['field']) && is_array($constraint['references']['field'])) {
-                foreach ($constraint['references']['field'] as $field) {
-                    $result = $this->val->validateConstraintReferencedField($this->constraint['references']['fields'], $field);
-                    if (PEAR::isError($result)) {
-                        return $this->raiseError($result->getUserinfo());
-                    }
-
-                    $this->constraint['references']['fields'][$field] = '';
-                }
-            }
-        }
-
-        $result = $this->val->validateConstraint($this->table['constraints'], $this->constraint, $this->constraint_name);
-        if (PEAR::isError($result)) {
-            return $this->raiseError($result->getUserinfo());
-        } else {
-            $this->table['constraints'][$this->constraint_name] = $this->constraint;
-        }
-
-        return MDB2_OK;
-    }
-
-    function fixTableInitializationKeys($element, $type = '')
-    {
-        if (!empty($element['select']) && is_array($element['select'])) {
-            $this->fixTableInitializationDataKeys($element['select']);
-            $this->init = array( 'select' => $this->init );
-        } else {
-            $this->fixTableInitializationDataKeys($element);
-        }
-
-        $this->table['initialization'][] = array( 'type' => $type, 'data' => $this->init );
-    }
-
-    function fixTableInitializationDataKeys($element)
-    {
-        $this->init = array();
-        if (!empty($element['field']) && is_array($element['field'])) {
-            foreach ($element['field'] as $field) {
-                $name = $field['name'];
-                unset($field['name']);
-
-                $this->setExpression($field);
-                $this->init['field'][] = array( 'name' => $name, 'group' => $field );
-            }
-        }
-        /**
-         * As we forced 'table' to be enumerated
-         * we have to fix it on the insert-select context
-         */
-        if (!empty($element['table']) && is_array($element['table'])) {
-            $this->init['table'] = $element['table'][0];
-        }
-        if (!empty($element['where']) && is_array($element['where'])) {
-            $this->init['where'] = $element['where'];
-            $this->setExpression($this->init['where']);
-        }
-    }
-
-    function setExpression(&$arr)
-    {
-        $element = each($arr);
-
-        $arr = array( 'type' => $element['key'] );
-
-        $element = $element['value'];
-
-        switch ($arr['type']) {
-        case 'null':
-            break;
-        case 'value':
-        case 'column':
-            $arr['data'] = $element;
-            break;
-        case 'function':
-            if (!empty($element)
-                && is_array($element)
-            ) {
-                $arr['data'] = array( 'name' => $element['name'] );
-                unset($element['name']);
-
-                foreach ($element as $type => $value) {
-                    if (!empty($value)) {
-                        if (is_array($value)) {
-                            foreach ($value as $argument) {
-                                $argument = array( $type => $argument );
-                                $this->setExpression($argument);
-                                $arr['data']['arguments'][] = $argument;
-                            }
-                        } else {
-                            $arr['data']['arguments'][] = array( 'type' => $type, 'data' => $value );
-                        }
-                    }
-                }
-            }
-            break;
-        case 'expression':
-            $arr['data'] = array( 'operants' => array(), 'operator' => $element['operator'] );
-            unset($element['operator']);
-
-            foreach ($element as $k => $v) {
-                $argument = array( $k => $v );
-                $this->setExpression($argument);
-                $arr['data']['operants'][] = $argument;
-            }
-            break;
-        }
-    }
-
-    function fixSequenceKeys($sequence)
-    {
-        $this->sequence = array(
-            'was' => '',
-            'start' => '',
-            'description' => '',
-            'comments' => '',
-            'on' => array('table' => '', 'field' => '')
-        );
-
-        if (!empty($sequence['name'])) {
-            $this->sequence_name = $sequence['name'];
-        } else {
-            $this->sequence_name = '';
-        }
-        if (!empty($sequence['was'])) {
-            $this->sequence['was'] = $sequence['was'];
-        }
-        if (!empty($sequence['start'])) {
-            $this->sequence['start'] = $sequence['start'];
-        }
-        if (!empty($sequence['description'])) {
-            $this->sequence['description'] = $sequence['description'];
-        }
-        if (!empty($sequence['comments'])) {
-            $this->sequence['comments'] = $sequence['comments'];
-        }
-        if (!empty($sequence['on']) && is_array($sequence['on'])) {
-            /**
-             * As we forced 'table' to be enumerated
-             * we have to fix it on the sequence-on-table context
-             */
-            if (!empty($sequence['on']['table']) && is_array($sequence['on']['table'])) {
-                $this->sequence['on']['table'] = $sequence['on']['table'][0];
-            }
-
-            /**
-             * As we forced 'field' to be enumerated
-             * we have to fix it on the sequence-on-field context
-             */
-            if (!empty($sequence['on']['field']) && is_array($sequence['on']['field'])) {
-                $this->sequence['on']['field'] = $sequence['on']['field'][0];
-            }
-        }
-
-        $result = $this->val->validateSequence($this->database_definition['sequences'], $this->sequence, $this->sequence_name);
-        if (PEAR::isError($result)) {
-            return $this->raiseError($result->getUserinfo());
-        } else {
-            $this->database_definition['sequences'][$this->sequence_name] = $this->sequence;
-        }
-
-        return MDB2_OK;
-    }
-
-    function &raiseError($msg = null, $ecode = MDB2_SCHEMA_ERROR_PARSE)
-    {
-        if (is_null($this->error)) {
-            $error = 'Parser error: '.$msg."\n";
-
-            $this->error =& MDB2_Schema::raiseError($ecode, null, null, $error);
-        }
-        return $this->error;
-    }
-}
-
-?>
diff --git a/3rdparty/MDB2/Schema/Reserved/ibase.php b/3rdparty/MDB2/Schema/Reserved/ibase.php
deleted file mode 100644
index b208abc83a3..00000000000
--- a/3rdparty/MDB2/Schema/Reserved/ibase.php
+++ /dev/null
@@ -1,436 +0,0 @@
-<?php
-// {{{ Disclaimer, Licence, copyrights
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Lorenzo Alberton <l.alberton@quipo.it>                       |
-// +----------------------------------------------------------------------+
-//
-// }}}
-// {{{ $GLOBALS['_MDB2_Schema_Reserved']['ibase']
-/**
- * Has a list of reserved words of Interbase/Firebird
- *
- * @package MDB2_Schema
- * @category Database
- * @access protected
- * @author Lorenzo Alberton <l.alberton@quipo.it>
- */
-$GLOBALS['_MDB2_Schema_Reserved']['ibase'] = array(
-    'ABS',
-    'ABSOLUTE',
-    'ACTION',
-    'ACTIVE',
-    'ADD',
-    'ADMIN',
-    'AFTER',
-    'ALL',
-    'ALLOCATE',
-    'ALTER',
-    'AND',
-    'ANY',
-    'ARE',
-    'AS',
-    'ASC',
-    'ASCENDING',
-    'ASSERTION',
-    'AT',
-    'AUTHORIZATION',
-    'AUTO',
-    'AUTODDL',
-    'AVG',
-    'BACKUP',
-    'BASE_NAME',
-    'BASED',
-    'BASENAME',
-    'BEFORE',
-    'BEGIN',
-    'BETWEEN',
-    'BIGINT',
-    'BIT',
-    'BIT_LENGTH',
-    'BLOB',
-    'BLOCK',
-    'BLOBEDIT',
-    'BOOLEAN',
-    'BOTH',
-    'BOTH',
-    'BREAK',
-    'BUFFER',
-    'BY',
-    'CACHE',
-    'CASCADE',
-    'CASCADED',
-    'CASE',
-    'CASE',
-    'CAST',
-    'CATALOG',
-    'CHAR',
-    'CHAR_LENGTH',
-    'CHARACTER',
-    'CHARACTER_LENGTH',
-    'CHECK',
-    'CHECK_POINT_LEN',
-    'CHECK_POINT_LENGTH',
-    'CLOSE',
-    'COALESCE',
-    'COLLATE',
-    'COLLATION',
-    'COLUMN',
-    'COMMENT',
-    'COMMIT',
-    'COMMITTED',
-    'COMPILETIME',
-    'COMPUTED',
-    'CONDITIONAL',
-    'CONNECT',
-    'CONNECTION',
-    'CONSTRAINT',
-    'CONSTRAINTS',
-    'CONTAINING',
-    'CONTINUE',
-    'CONVERT',
-    'CORRESPONDING',
-    'COUNT',
-    'CREATE',
-    'CROSS',
-    'CSTRING',
-    'CURRENT',
-    'CURRENT_CONNECTION',
-    'CURRENT_DATE',
-    'CURRENT_ROLE',
-    'CURRENT_TIME',
-    'CURRENT_TIMESTAMP',
-    'CURRENT_TRANSACTION',
-    'CURRENT_USER',
-    'DATABASE',
-    'DATE',
-    'DAY',
-    'DB_KEY',
-    'DEALLOCATE',
-    'DEBUG',
-    'DEC',
-    'DECIMAL',
-    'DECLARE',
-    'DEFAULT',
-    'DEFERRABLE',
-    'DEFERRED',
-    'DELETE',
-    'DELETING',
-    'DESC',
-    'DESCENDING',
-    'DESCRIBE',
-    'DESCRIPTOR',
-    'DIAGNOSTICS',
-    'DIFFERENCE',
-    'DISCONNECT',
-    'DISPLAY',
-    'DISTINCT',
-    'DO',
-    'DOMAIN',
-    'DOUBLE',
-    'DROP',
-    'ECHO',
-    'EDIT',
-    'ELSE',
-    'END',
-    'END-EXEC',
-    'ENTRY_POINT',
-    'ESCAPE',
-    'EVENT',
-    'EXCEPT',
-    'EXCEPTION',
-    'EXEC',
-    'EXECUTE',
-    'EXISTS',
-    'EXIT',
-    'EXTERN',
-    'EXTERNAL',
-    'EXTRACT',
-    'FALSE',
-    'FETCH',
-    'FILE',
-    'FILTER',
-    'FIRST',
-    'FLOAT',
-    'FOR',
-    'FOREIGN',
-    'FOUND',
-    'FREE_IT',
-    'FROM',
-    'FULL',
-    'FUNCTION',
-    'GDSCODE',
-    'GEN_ID',
-    'GENERATOR',
-    'GET',
-    'GLOBAL',
-    'GO',
-    'GOTO',
-    'GRANT',
-    'GROUP',
-    'GROUP_COMMIT_WAIT',
-    'GROUP_COMMIT_WAIT_TIME',
-    'HAVING',
-    'HELP',
-    'HOUR',
-    'IDENTITY',
-    'IF',
-    'IIF',
-    'IMMEDIATE',
-    'IN',
-    'INACTIVE',
-    'INDEX',
-    'INDICATOR',
-    'INIT',
-    'INITIALLY',
-    'INNER',
-    'INPUT',
-    'INPUT_TYPE',
-    'INSENSITIVE',
-    'INSERT',
-    'INSERTING',
-    'INT',
-    'INTEGER',
-    'INTERSECT',
-    'INTERVAL',
-    'INTO',
-    'IS',
-    'ISOLATION',
-    'ISQL',
-    'JOIN',
-    'KEY',
-    'LANGUAGE',
-    'LAST',
-    'LC_MESSAGES',
-    'LC_TYPE',
-    'LEADING',
-    'LEADING',
-    'LEADING',
-    'LEAVE',
-    'LEFT',
-    'LENGTH',
-    'LEV',
-    'LEVEL',
-    'LIKE',
-    'LOCAL',
-    'LOCK',
-    'LOG_BUF_SIZE',
-    'LOG_BUFFER_SIZE',
-    'LOGFILE',
-    'LONG',
-    'LOWER',
-    'MANUAL',
-    'MATCH',
-    'MAX',
-    'MAX_SEGMENT',
-    'MAXIMUM',
-    'MAXIMUM_SEGMENT',
-    'MERGE',
-    'MESSAGE',
-    'MIN',
-    'MINIMUM',
-    'MINUTE',
-    'MODULE',
-    'MODULE_NAME',
-    'MONTH',
-    'NAMES',
-    'NATIONAL',
-    'NATURAL',
-    'NCHAR',
-    'NEXT',
-    'NO',
-    'NOAUTO',
-    'NOT',
-    'NULL',
-    'NULLIF',
-    'NULLS',
-    'NUM_LOG_BUFFERS',
-    'NUM_LOG_BUFS',
-    'NUMERIC',
-    'OCTET_LENGTH',
-    'OF',
-    'ON',
-    'ONLY',
-    'OPEN',
-    'OPTION',
-    'OR',
-    'ORDER',
-    'OUTER',
-    'OUTPUT',
-    'OUTPUT_TYPE',
-    'OVERFLOW',
-    'OVERLAPS',
-    'PAD',
-    'PAGE',
-    'PAGE_SIZE',
-    'PAGELENGTH',
-    'PAGES',
-    'PARAMETER',
-    'PARTIAL',
-    'PASSWORD',
-    'PERCENT',
-    'PLAN',
-    'POSITION',
-    'POST_EVENT',
-    'PRECISION',
-    'PREPARE',
-    'PRESERVE',
-    'PRIMARY',
-    'PRIOR',
-    'PRIVILEGES',
-    'PROCEDURE',
-    'PUBLIC',
-    'QUIT',
-    'RAW_PARTITIONS',
-    'RDB$DB_KEY',
-    'READ',
-    'REAL',
-    'RECORD_VERSION',
-    'RECREATE',
-    'RECREATE ROW_COUNT',
-    'REFERENCES',
-    'RELATIVE',
-    'RELEASE',
-    'RESERV',
-    'RESERVING',
-    'RESTART',
-    'RESTRICT',
-    'RETAIN',
-    'RETURN',
-    'RETURNING',
-    'RETURNING_VALUES',
-    'RETURNS',
-    'REVOKE',
-    'RIGHT',
-    'ROLE',
-    'ROLLBACK',
-    'ROW_COUNT',
-    'ROWS',
-    'RUNTIME',
-    'SAVEPOINT',
-    'SCALAR_ARRAY',
-    'SCHEMA',
-    'SCROLL',
-    'SECOND',
-    'SECTION',
-    'SELECT',
-    'SEQUENCE',
-    'SESSION',
-    'SESSION_USER',
-    'SET',
-    'SHADOW',
-    'SHARED',
-    'SHELL',
-    'SHOW',
-    'SINGULAR',
-    'SIZE',
-    'SKIP',
-    'SMALLINT',
-    'SNAPSHOT',
-    'SOME',
-    'SORT',
-    'SPACE',
-    'SQL',
-    'SQLCODE',
-    'SQLERROR',
-    'SQLSTATE',
-    'SQLWARNING',
-    'STABILITY',
-    'STARTING',
-    'STARTS',
-    'STATEMENT',
-    'STATIC',
-    'STATISTICS',
-    'SUB_TYPE',
-    'SUBSTRING',
-    'SUM',
-    'SUSPEND',
-    'SYSTEM_USER',
-    'TABLE',
-    'TEMPORARY',
-    'TERMINATOR',
-    'THEN',
-    'TIES',
-    'TIME',
-    'TIMESTAMP',
-    'TIMEZONE_HOUR',
-    'TIMEZONE_MINUTE',
-    'TO',
-    'TRAILING',
-    'TRANSACTION',
-    'TRANSLATE',
-    'TRANSLATION',
-    'TRIGGER',
-    'TRIM',
-    'TRUE',
-    'TYPE',
-    'UNCOMMITTED',
-    'UNION',
-    'UNIQUE',
-    'UNKNOWN',
-    'UPDATE',
-    'UPDATING',
-    'UPPER',
-    'USAGE',
-    'USER',
-    'USING',
-    'VALUE',
-    'VALUES',
-    'VARCHAR',
-    'VARIABLE',
-    'VARYING',
-    'VERSION',
-    'VIEW',
-    'WAIT',
-    'WEEKDAY',
-    'WHEN',
-    'WHENEVER',
-    'WHERE',
-    'WHILE',
-    'WITH',
-    'WORK',
-    'WRITE',
-    'YEAR',
-    'YEARDAY',
-    'ZONE',
-);
-// }}}
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Schema/Reserved/mssql.php b/3rdparty/MDB2/Schema/Reserved/mssql.php
deleted file mode 100644
index 74ac6885780..00000000000
--- a/3rdparty/MDB2/Schema/Reserved/mssql.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-// {{{ Disclaimer, Licence, copyrights
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: David Coallier <davidc@php.net>                              |
-// +----------------------------------------------------------------------+
-// }}}
-// {{{ $GLOBALS['_MDB2_Schema_Reserved']['mssql']
-/**
- * Has a list of all the reserved words for mssql.
- *
- * @package  MDB2_Schema
- * @category Database
- * @access   protected
- * @author   David Coallier <davidc@php.net>
- */
-$GLOBALS['_MDB2_Schema_Reserved']['mssql'] = array(
-    'ADD',
-    'CURRENT_TIMESTAMP',
-    'GROUP',
-    'OPENQUERY',
-    'SERIALIZABLE',
-    'ALL',
-    'CURRENT_USER',
-    'HAVING',
-    'OPENROWSET',
-    'SESSION_USER',
-    'ALTER',
-    'CURSOR',
-    'HOLDLOCK',
-    'OPTION',
-    'SET',
-    'AND',
-    'DATABASE',
-    'IDENTITY',
-    'OR',
-    'SETUSER',
-    'ANY',
-    'DBCC',
-    'IDENTITYCOL',
-    'ORDER',
-    'SHUTDOWN',
-    'AS',
-    'DEALLOCATE',
-    'IDENTITY_INSERT',
-    'OUTER',
-    'SOME',
-    'ASC',
-    'DECLARE',
-    'IF',
-    'OVER',
-    'STATISTICS',
-    'AUTHORIZATION',
-    'DEFAULT',
-    'IN',
-    'PERCENT',
-    'SUM',
-    'AVG',
-    'DELETE',
-    'INDEX',
-    'PERM',
-    'SYSTEM_USER',
-    'BACKUP',
-    'DENY',
-    'INNER',
-    'PERMANENT',
-    'TABLE',
-    'BEGIN',
-    'DESC',
-    'INSERT',
-    'PIPE',
-    'TAPE',
-    'BETWEEN',
-    'DISK',
-    'INTERSECT',
-    'PLAN',
-    'TEMP',
-    'BREAK',
-    'DISTINCT',
-    'INTO',
-    'PRECISION',
-    'TEMPORARY',
-    'BROWSE',
-    'DISTRIBUTED',
-    'IS',
-    'PREPARE',
-    'TEXTSIZE',
-    'BULK',
-    'DOUBLE',
-    'ISOLATION',
-    'PRIMARY',
-    'THEN',
-    'BY',
-    'DROP',
-    'JOIN',
-    'PRINT',
-    'TO',
-    'CASCADE',
-    'DUMMY',
-    'KEY',
-    'PRIVILEGES',
-    'TOP',
-    'CASE',
-    'DUMP',
-    'KILL',
-    'PROC',
-    'TRAN',
-    'CHECK',
-    'ELSE',
-    'LEFT',
-    'PROCEDURE',
-    'TRANSACTION',
-    'CHECKPOINT',
-    'END',
-    'LEVEL',
-    'PROCESSEXIT',
-    'TRIGGER',
-    'CLOSE',
-    'ERRLVL',
-    'LIKE',
-    'PUBLIC',
-    'TRUNCATE',
-    'CLUSTERED',
-    'ERROREXIT',
-    'LINENO',
-    'RAISERROR',
-    'TSEQUAL',
-    'COALESCE',
-    'ESCAPE',
-    'LOAD',
-    'READ',
-    'UNCOMMITTED',
-    'COLUMN',
-    'EXCEPT',
-    'MAX',
-    'READTEXT',
-    'UNION',
-    'COMMIT',
-    'EXEC',
-    'MIN',
-    'RECONFIGURE',
-    'UNIQUE',
-    'COMMITTED',
-    'EXECUTE',
-    'MIRROREXIT',
-    'REFERENCES',
-    'UPDATE',
-    'COMPUTE',
-    'EXISTS',
-    'NATIONAL',
-    'REPEATABLE',
-    'UPDATETEXT',
-    'CONFIRM',
-    'EXIT',
-    'NOCHECK',
-    'REPLICATION',
-    'USE',
-    'CONSTRAINT',
-    'FETCH',
-    'NONCLUSTERED',
-    'RESTORE',
-    'USER',
-    'CONTAINS',
-    'FILE',
-    'NOT',
-    'RESTRICT',
-    'VALUES',
-    'CONTAINSTABLE',
-    'FILLFACTOR',
-    'NULL',
-    'RETURN',
-    'VARYING',
-    'CONTINUE',
-    'FLOPPY',
-    'NULLIF',
-    'REVOKE',
-    'VIEW',
-    'CONTROLROW',
-    'FOR',
-    'OF',
-    'RIGHT',
-    'WAITFOR',
-    'CONVERT',
-    'FOREIGN',
-    'OFF',
-    'ROLLBACK',
-    'WHEN',
-    'COUNT',
-    'FREETEXT',
-    'OFFSETS',
-    'ROWCOUNT',
-    'WHERE',
-    'CREATE',
-    'FREETEXTTABLE',
-    'ON',
-    'ROWGUIDCOL',
-    'WHILE',
-    'CROSS',
-    'FROM',
-    'ONCE',
-    'RULE',
-    'WITH',
-    'CURRENT',
-    'FULL',
-    'ONLY',
-    'SAVE',
-    'WORK',
-    'CURRENT_DATE',
-    'GOTO',
-    'OPEN',
-    'SCHEMA',
-    'WRITETEXT',
-    'CURRENT_TIME',
-    'GRANT',
-    'OPENDATASOURCE',
-    'SELECT',
-);
-//}}}
-
-?>
diff --git a/3rdparty/MDB2/Schema/Reserved/mysql.php b/3rdparty/MDB2/Schema/Reserved/mysql.php
deleted file mode 100644
index 4f0575e0bb1..00000000000
--- a/3rdparty/MDB2/Schema/Reserved/mysql.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-// {{{ Disclaimer, Licence, copyrights
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: David Coallier <davidc@php.net>                              |
-// +----------------------------------------------------------------------+
-//
-// $Id: mysql.php,v 1.3 2006/03/01 12:16:40 lsmith Exp $
-// }}}
-// {{{ $GLOBALS['_MDB2_Schema_Reserved']['mysql']
-/**
- * Has a list of reserved words of mysql
- *
- * @package MDB2_Schema
- * @category Database
- * @access protected
- * @author David Coalier <davidc@php.net>
- */
-$GLOBALS['_MDB2_Schema_Reserved']['mysql'] = array(
-    'ADD',
-    'ALL',
-    'ALTER',
-    'ANALYZE',
-    'AND',
-    'AS',
-    'ASC',
-    'ASENSITIVE',
-    'BEFORE',
-    'BETWEEN',
-    'BIGINT',
-    'BINARY',
-    'BLOB',
-    'BOTH',
-    'BY',
-    'CALL',
-    'CASCADE',
-    'CASE',
-    'CHANGE',
-    'CHAR',
-    'CHARACTER',
-    'CHECK',
-    'COLLATE',
-    'COLUMN',
-    'CONDITION',
-    'CONNECTION',
-    'CONSTRAINT',
-    'CONTINUE',
-    'CONVERT',
-    'CREATE',
-    'CROSS',
-    'CURRENT_DATE',
-    'CURRENT_TIME',
-    'CURRENT_TIMESTAMP',
-    'CURRENT_USER',
-    'CURSOR',
-    'DATABASE',
-    'DATABASES',
-    'DAY_HOUR',
-    'DAY_MICROSECOND',
-    'DAY_MINUTE',
-    'DAY_SECOND',
-    'DEC',
-    'DECIMAL',
-    'DECLARE',
-    'DEFAULT',
-    'DELAYED',
-    'DELETE',
-    'DESC',
-    'DESCRIBE',
-    'DETERMINISTIC',
-    'DISTINCT',
-    'DISTINCTROW',
-    'DIV',
-    'DOUBLE',
-    'DROP',
-    'DUAL',
-    'EACH',
-    'ELSE',
-    'ELSEIF',
-    'ENCLOSED',
-    'ESCAPED',
-    'EXISTS',
-    'EXIT',
-    'EXPLAIN',
-    'FALSE',
-    'FETCH',
-    'FLOAT',
-    'FLOAT4',
-    'FLOAT8',
-    'FOR',
-    'FORCE',
-    'FOREIGN',
-    'FROM',
-    'FULLTEXT',
-    'GOTO',
-    'GRANT',
-    'GROUP',
-    'HAVING',
-    'HIGH_PRIORITY',
-    'HOUR_MICROSECOND',
-    'HOUR_MINUTE',
-    'HOUR_SECOND',
-    'IF',
-    'IGNORE',
-    'IN',
-    'INDEX',
-    'INFILE',
-    'INNER',
-    'INOUT',
-    'INSENSITIVE',
-    'INSERT',
-    'INT',
-    'INT1',
-    'INT2',
-    'INT3',
-    'INT4',
-    'INT8',
-    'INTEGER',
-    'INTERVAL',
-    'INTO',
-    'IS',
-    'ITERATE',
-    'JOIN',
-    'KEY',
-    'KEYS',
-    'KILL',
-    'LABEL',
-    'LEADING',
-    'LEAVE',
-    'LEFT',
-    'LIKE',
-    'LIMIT',
-    'LINES',
-    'LOAD',
-    'LOCALTIME',
-    'LOCALTIMESTAMP',
-    'LOCK',
-    'LONG',
-    'LONGBLOB',
-    'LONGTEXT',
-    'LOOP',
-    'LOW_PRIORITY',
-    'MATCH',
-    'MEDIUMBLOB',
-    'MEDIUMINT',
-    'MEDIUMTEXT',
-    'MIDDLEINT',
-    'MINUTE_MICROSECOND',
-    'MINUTE_SECOND',
-    'MOD',
-    'MODIFIES',
-    'NATURAL',
-    'NOT',
-    'NO_WRITE_TO_BINLOG',
-    'NULL',
-    'NUMERIC',
-    'ON',
-    'OPTIMIZE',
-    'OPTION',
-    'OPTIONALLY',
-    'OR',
-    'ORDER',
-    'OUT',
-    'OUTER',
-    'OUTFILE',
-    'PRECISION',
-    'PRIMARY',
-    'PROCEDURE',
-    'PURGE',
-    'RAID0',
-    'READ',
-    'READS',
-    'REAL',
-    'REFERENCES',
-    'REGEXP',
-    'RELEASE',
-    'RENAME',
-    'REPEAT',
-    'REPLACE',
-    'REQUIRE',
-    'RESTRICT',
-    'RETURN',
-    'REVOKE',
-    'RIGHT',
-    'RLIKE',
-    'SCHEMA',
-    'SCHEMAS',
-    'SECOND_MICROSECOND',
-    'SELECT',
-    'SENSITIVE',
-    'SEPARATOR',
-    'SET',
-    'SHOW',
-    'SMALLINT',
-    'SONAME',
-    'SPATIAL',
-    'SPECIFIC',
-    'SQL',
-    'SQLEXCEPTION',
-    'SQLSTATE',
-    'SQLWARNING',
-    'SQL_BIG_RESULT',
-    'SQL_CALC_FOUND_ROWS',
-    'SQL_SMALL_RESULT',
-    'SSL',
-    'STARTING',
-    'STRAIGHT_JOIN',
-    'TABLE',
-    'TERMINATED',
-    'THEN',
-    'TINYBLOB',
-    'TINYINT',
-    'TINYTEXT',
-    'TO',
-    'TRAILING',
-    'TRIGGER',
-    'TRUE',
-    'UNDO',
-    'UNION',
-    'UNIQUE',
-    'UNLOCK',
-    'UNSIGNED',
-    'UPDATE',
-    'USAGE',
-    'USE',
-    'USING',
-    'UTC_DATE',
-    'UTC_TIME',
-    'UTC_TIMESTAMP',
-    'VALUES',
-    'VARBINARY',
-    'VARCHAR',
-    'VARCHARACTER',
-    'VARYING',
-    'WHEN',
-    'WHERE',
-    'WHILE',
-    'WITH',
-    'WRITE',
-    'X509',
-    'XOR',
-    'YEAR_MONTH',
-    'ZEROFILL',
-    );
-    // }}}
-?>
diff --git a/3rdparty/MDB2/Schema/Reserved/oci8.php b/3rdparty/MDB2/Schema/Reserved/oci8.php
deleted file mode 100644
index 57fe12ddcab..00000000000
--- a/3rdparty/MDB2/Schema/Reserved/oci8.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-// {{{ Disclaimer, Licence, copyrights
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: David Coallier <davidc@php.net>                              |
-// +----------------------------------------------------------------------+
-// }}}
-// {{{ $GLOBALS['_MDB2_Schema_Reserved']['oci8']
-/**
- * Has a list of all the reserved words for oracle.
- *
- * @package  MDB2_Schema
- * @category Database
- * @access   protected
- * @author   David Coallier <davidc@php.net>
- */
-$GLOBALS['_MDB2_Schema_Reserved']['oci8'] = array(
-    'ACCESS',
-    'ELSE',
-    'MODIFY',
-    'START',
-    'ADD',
-    'EXCLUSIVE',
-    'NOAUDIT',
-    'SELECT',
-    'ALL',
-    'EXISTS',
-    'NOCOMPRESS',
-    'SESSION',
-    'ALTER',
-    'FILE',
-    'NOT',
-    'SET',
-    'AND',
-    'FLOAT',
-    'NOTFOUND ',
-    'SHARE',
-    'ANY',
-    'FOR',
-    'NOWAIT',
-    'SIZE',
-    'ARRAYLEN',
-    'FROM',
-    'NULL',
-    'SMALLINT',
-    'AS',
-    'GRANT',
-    'NUMBER',
-    'SQLBUF',
-    'ASC',
-    'GROUP',
-    'OF',
-    'SUCCESSFUL',
-    'AUDIT',
-    'HAVING',
-    'OFFLINE ',
-    'SYNONYM',
-    'BETWEEN',
-    'IDENTIFIED',
-    'ON',
-    'SYSDATE',
-    'BY',
-    'IMMEDIATE',
-    'ONLINE',
-    'TABLE',
-    'CHAR',
-    'IN',
-    'OPTION',
-    'THEN',
-    'CHECK',
-    'INCREMENT',
-    'OR',
-    'TO',
-    'CLUSTER',
-    'INDEX',
-    'ORDER',
-    'TRIGGER',
-    'COLUMN',
-    'INITIAL',
-    'PCTFREE',
-    'UID',
-    'COMMENT',
-    'INSERT',
-    'PRIOR',
-    'UNION',
-    'COMPRESS',
-    'INTEGER',
-    'PRIVILEGES',
-    'UNIQUE',
-    'CONNECT',
-    'INTERSECT',
-    'PUBLIC',
-    'UPDATE',
-    'CREATE',
-    'INTO',
-    'RAW',
-    'USER',
-    'CURRENT',
-    'IS',
-    'RENAME',
-    'VALIDATE',
-    'DATE',
-    'LEVEL',
-    'RESOURCE',
-    'VALUES',
-    'DECIMAL',
-    'LIKE',
-    'REVOKE',
-    'VARCHAR',
-    'DEFAULT',
-    'LOCK',
-    'ROW',
-    'VARCHAR2',
-    'DELETE',
-    'LONG',
-    'ROWID',
-    'VIEW',
-    'DESC',
-    'MAXEXTENTS',
-    'ROWLABEL',
-    'WHENEVER',
-    'DISTINCT',
-    'MINUS',
-    'ROWNUM',
-    'WHERE',
-    'DROP',
-    'MODE',
-    'ROWS',
-    'WITH',
-);
-// }}}
-
-?>
diff --git a/3rdparty/MDB2/Schema/Reserved/pgsql.php b/3rdparty/MDB2/Schema/Reserved/pgsql.php
deleted file mode 100644
index d358e9c12f0..00000000000
--- a/3rdparty/MDB2/Schema/Reserved/pgsql.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-// {{{ Disclaimer, Licence, copyrights
-// +----------------------------------------------------------------------+
-// | PHP versions 4 and 5                                                 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
-// | Stig. S. Bakken, Lukas Smith                                         |
-// | All rights reserved.                                                 |
-// +----------------------------------------------------------------------+
-// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
-// | API as well as database abstraction for PHP applications.            |
-// | This LICENSE is in the BSD license style.                            |
-// |                                                                      |
-// | Redistribution and use in source and binary forms, with or without   |
-// | modification, are permitted provided that the following conditions   |
-// | are met:                                                             |
-// |                                                                      |
-// | Redistributions of source code must retain the above copyright       |
-// | notice, this list of conditions and the following disclaimer.        |
-// |                                                                      |
-// | Redistributions in binary form must reproduce the above copyright    |
-// | notice, this list of conditions and the following disclaimer in the  |
-// | documentation and/or other materials provided with the distribution. |
-// |                                                                      |
-// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
-// | Lukas Smith nor the names of his contributors may be used to endorse |
-// | or promote products derived from this software without specific prior|
-// | written permission.                                                  |
-// |                                                                      |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
-// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
-// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
-// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
-// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
-// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
-// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
-// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
-// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
-// | POSSIBILITY OF SUCH DAMAGE.                                          |
-// +----------------------------------------------------------------------+
-// | Author: Marcelo Santos Araujo <msaraujo@php.net>                     |
-// +----------------------------------------------------------------------+
-//
-// }}}
-// {{{ $GLOBALS['_MDB2_Schema_Reserved']['pgsql']
-/**
- * Has a list of reserved words of pgsql
- *
- * @package MDB2_Schema
- * @category Database
- * @access protected
- * @author Marcelo Santos Araujo <msaraujo@php.net>
- */
-$GLOBALS['_MDB2_Schema_Reserved']['pgsql'] = array(
-    'ALL',
-    'ANALYSE',
-    'ANALYZE',
-    'AND',
-    'ANY',
-    'AS',
-    'ASC',
-    'AUTHORIZATION',
-    'BETWEEN',
-    'BINARY',
-    'BOTH',
-    'CASE',
-    'CAST',
-    'CHECK',
-    'COLLATE',
-    'COLUMN',
-    'CONSTRAINT',
-    'CREATE',
-    'CURRENT_DATE',
-    'CURRENT_TIME',
-    'CURRENT_TIMESTAMP',
-    'CURRENT_USER',
-    'DEFAULT',
-    'DEFERRABLE',
-    'DESC',
-    'DISTINCT',
-    'DO',
-    'ELSE',
-    'END',
-    'EXCEPT',
-    'FALSE',
-    'FOR',
-    'FOREIGN',
-    'FREEZE',
-    'FROM',
-    'FULL',
-    'GRANT',
-    'GROUP',
-    'HAVING',
-    'ILIKE',
-    'IN',
-    'INITIALLY',
-    'INNER',
-    'INTERSECT',
-    'INTO',
-    'IS',
-    'ISNULL',
-    'JOIN',
-    'LEADING',
-    'LEFT',
-    'LIKE',
-    'LIMIT',
-    'LOCALTIME',
-    'LOCALTIMESTAMP',
-    'NATURAL',
-    'NEW',
-    'NOT',
-    'NOTNULL',
-    'NULL',
-    'OFF',
-    'OFFSET',
-    'OLD',
-    'ON',
-    'ONLY',
-    'OR',
-    'ORDER',
-    'OUTER',
-    'OVERLAPS',
-    'PLACING',
-    'PRIMARY',
-    'REFERENCES',
-    'SELECT',
-    'SESSION_USER',
-    'SIMILAR',
-    'SOME',
-    'TABLE',
-    'THEN',
-    'TO',
-    'TRAILING',
-    'TRUE',
-    'UNION',
-    'UNIQUE',
-    'USER',
-    'USING',
-    'VERBOSE',
-    'WHEN',
-    'WHERE'
-);
-// }}}
-?>
-
diff --git a/3rdparty/MDB2/Schema/Tool.php b/3rdparty/MDB2/Schema/Tool.php
deleted file mode 100644
index 9689a0f6d73..00000000000
--- a/3rdparty/MDB2/Schema/Tool.php
+++ /dev/null
@@ -1,560 +0,0 @@
-<?php
-/**
- * PHP versions 4 and 5
- *
- * Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,
- * Stig. S. Bakken, Lukas Smith, Igor Feghali
- * All rights reserved.
- *
- * MDB2_Schema enables users to maintain RDBMS independant schema files
- * in XML that can be used to manipulate both data and database schemas
- * This LICENSE is in the BSD license style.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,
- * Lukas Smith, Igor Feghali nor the names of his contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Author: Christian Weiske <cweiske@php.net>
- * $Id: Tool.php,v 1.6 2008/12/13 00:26:07 clockwerx Exp $
- *
- * @category Database
- * @package  MDB2_Schema
- * @author   Christian Weiske <cweiske@php.net>
- * @license  BSD http://www.opensource.org/licenses/bsd-license.php
- * @version  CVS: $Id: Tool.php,v 1.6 2008/12/13 00:26:07 clockwerx Exp $
- * @link     http://pear.php.net/packages/MDB2_Schema
- */
-
-require_once 'MDB2/Schema.php';
-require_once 'MDB2/Schema/Tool/ParameterException.php';
-
-/**
-* Command line tool to work with database schemas
-*
-* Functionality:
-* - dump a database schema to stdout
-* - import schema into database
-* - create a diff between two schemas
-* - apply diff to database
-*
- * @category Database
- * @package  MDB2_Schema
- * @author   Christian Weiske <cweiske@php.net>
- * @license  BSD http://www.opensource.org/licenses/bsd-license.php
- * @link     http://pear.php.net/packages/MDB2_Schema
- */
-class MDB2_Schema_Tool
-{
-    /**
-    * Run the schema tool
-    *
-    * @param array $args Array of command line arguments
-    */
-    public function __construct($args)
-    {
-        $strAction = $this->getAction($args);
-        try {
-            $this->{'do' . ucfirst($strAction)}($args);
-        } catch (MDB2_Schema_Tool_ParameterException $e) {
-            $this->{'doHelp' . ucfirst($strAction)}($e->getMessage());
-        }
-    }//public function __construct($args)
-
-
-
-    /**
-    * Runs the tool with command line arguments
-    *
-    * @return void
-    */
-    public static function run()
-    {
-        $args = $GLOBALS['argv'];
-        array_shift($args);
-
-        try {
-            $tool = new MDB2_Schema_Tool($args);
-        } catch (Exception $e) {
-            self::toStdErr($e->getMessage() . "\n");
-        }
-    }//public static function run()
-
-
-
-    /**
-    * Reads the first parameter from the argument array and
-    * returns the action.
-    *
-    * @param array &$args Command line parameters
-    *
-    * @return string Action to execute
-    */
-    protected function getAction(&$args)
-    {
-        if (count($args) == 0) {
-            return 'help';
-        }
-        $arg = array_shift($args);
-        switch ($arg) {
-        case 'h':
-        case 'help':
-        case '-h':
-        case '--help':
-            return 'help';
-        case 'd':
-        case 'dump':
-        case '-d':
-        case '--dump':
-            return 'dump';
-        case 'l':
-        case 'load':
-        case '-l':
-        case '--load':
-            return 'load';
-        case 'i':
-        case 'diff':
-        case '-i':
-        case '--diff':
-            return 'diff';
-        case 'a':
-        case 'apply':
-        case '-a':
-        case '--apply':
-            return 'apply';
-        case 'n':
-        case 'init':
-        case '-i':
-        case '--init':
-            return 'init';
-        default:
-            throw new MDB2_Schema_Tool_ParameterException("Unknown mode \"$arg\"");
-        }
-    }//protected function getAction(&$args)
-
-
-
-    /**
-    * Writes the message to stderr
-    *
-    * @param string $msg Message to print
-    *
-    * @return void
-    */
-    protected static function toStdErr($msg)
-    {
-        file_put_contents('php://stderr', $msg);
-    }//protected static function toStdErr($msg)
-
-
-
-    /**
-    * Displays generic help to stdout
-    *
-    * @return void
-    */
-    protected function doHelp()
-    {
-        self::toStdErr(<<<EOH
-Usage: mdb2_schematool mode parameters
-
-Works with database schemas
-
-mode: (- and -- are optional)
- h,  help     Show this help screen
- d,  dump     Dump a schema to stdout
- l,  load     Load a schema into database
- i,  diff     Create a diff between two schemas and dump it to stdout
- a,  apply    Apply a diff to a database
- n,  init     Initialize a database with data
-
-EOH
-        );
-    }//protected function doHelp()
-
-
-
-    /**
-    * Displays the help screen for "dump" command
-    *
-    * @return void
-    */
-    protected function doHelpDump()
-    {
-        self::toStdErr( <<<EOH
-Usage: mdb2_schematool dump [all|data|schema] [-p] DSN
-
-Dumps a database schema to stdout
-
-If dump type is not specified, defaults to "schema".
-
-DSN: Data source name in the form of
- driver://user:password@host/database
-
-User and password may be omitted.
-Using -p reads password from stdin which is more secure than passing it in the parameter.
-
-EOH
-        );
-    }//protected function doHelpDump()
-
-
-
-    /**
-    * Displays the help screen for "init" command
-    *
-    * @return void
-    */
-    protected function doHelpInit()
-    {
-        self::toStdErr( <<<EOH
-Usage: mdb2_schematool init source [-p] destination
-
-Initializes a database with data
- (Inserts data on a previous created database at destination)
-
-source should be a schema file containing data,
-destination should be a DSN
-
-DSN: Data source name in the form of
- driver://user:password@host/database
-
-User and password may be omitted.
-Using -p reads password from stdin which is more secure than passing it in the parameter.
-
-EOH
-        );
-    }//protected function doHelpInit()
-
-
-
-    /**
-    * Displays the help screen for "load" command
-    *
-    * @return void
-    */
-    protected function doHelpLoad()
-    {
-        self::toStdErr( <<<EOH
-Usage: mdb2_schematool load [-p] source [-p] destination
-
-Loads a database schema from source to destination
- (Creates the database schema at destination)
-
-source can be a DSN or a schema file,
-destination should be a DSN
-
-DSN: Data source name in the form of
- driver://user:password@host/database
-
-User and password may be omitted.
-Using -p reads password from stdin which is more secure than passing it in the parameter.
-
-EOH
-        );
-    }//protected function doHelpLoad()
-
-
-
-    /**
-    * Returns an array of options for MDB2_Schema constructor
-    *
-    * @return array Options for MDB2_Schema constructor
-    */
-    protected function getSchemaOptions()
-    {
-        $options = array(
-            'log_line_break' => '<br>',
-            'idxname_format' => '%s',
-            'debug' => true,
-            'quote_identifier' => true,
-            'force_defaults' => false,
-            'portability' => true,
-            'use_transactions' => false,
-        );
-        return $options;
-    }//protected function getSchemaOptions()
-
-
-
-    /**
-    * Checks if the passed parameter is a PEAR_Error object
-    * and throws an exception in that case.
-    *
-    * @param mixed  $object   Some variable to check
-    * @param string $location Where the error occured
-    *
-    * @return void
-    */
-    protected function throwExceptionOnError($object, $location = '')
-    {
-        if (PEAR::isError($object)) {
-            //FIXME: exception class
-            //debug_print_backtrace();
-            throw new Exception('Error ' . $location
-                . "\n" . $object->getMessage()
-                . "\n" . $object->getUserInfo()
-            );
-        }
-    }//protected function throwExceptionOnError($object, $location = '')
-
-
-
-    /**
-    * Loads a file or a dsn from the arguments
-    *
-    * @param array &$args Array of arguments to the program
-    *
-    * @return array Array of ('file'|'dsn', $value)
-    */
-    protected function getFileOrDsn(&$args)
-    {
-        if (count($args) == 0) {
-            throw new MDB2_Schema_Tool_ParameterException('File or DSN expected');
-        }
-
-        $arg = array_shift($args);
-        if ($arg == '-p') {
-            $bAskPassword = true;
-            $arg          = array_shift($args);
-        } else {
-            $bAskPassword = false;
-        }
-
-        if (strpos($arg, '://') === false) {
-            if (file_exists($arg)) {
-                //File
-                return array('file', $arg);
-            } else {
-                throw new Exception('Schema file does not exist');
-            }
-        }
-
-        //read password if necessary
-        if ($bAskPassword) {
-            $password = $this->readPasswordFromStdin($arg);
-            $arg      = self::setPasswordIntoDsn($arg, $password);
-            self::toStdErr($arg);
-        }
-        return array('dsn', $arg);
-    }//protected function getFileOrDsn(&$args)
-
-
-
-    /**
-    * Takes a DSN data source name and integrates the given
-    * password into it.
-    *
-    * @param string $dsn      Data source name
-    * @param string $password Password
-    *
-    * @return string DSN with password
-    */
-    protected function setPasswordIntoDsn($dsn, $password)
-    {
-        //simple try to integrate password
-        if (strpos($dsn, '@') === false) {
-            //no @ -> no user and no password
-            return str_replace('://', '://:' . $password . '@', $dsn);
-        } else if (preg_match('|://[^:]+@|', $dsn)) {
-            //user only, no password
-            return str_replace('@', ':' . $password . '@', $dsn);
-        } else if (strpos($dsn, ':@') !== false) {
-            //abstract version
-            return str_replace(':@', ':' . $password . '@', $dsn);
-        }
-
-        return $dsn;
-    }//protected function setPasswordIntoDsn($dsn, $password)
-
-
-
-    /**
-    * Reads a password from stdin
-    *
-    * @param string $dsn DSN name to put into the message
-    *
-    * @return string Password
-    */
-    protected function readPasswordFromStdin($dsn)
-    {
-        $stdin = fopen('php://stdin', 'r');
-        self::toStdErr('Please insert password for ' . $dsn . "\n");
-        $password = '';
-        $breakme  = false;
-        while (false !== ($char = fgetc($stdin))) {
-            if (ord($char) == 10 || $char == "\n" || $char == "\r") {
-                break;
-            }
-            $password .= $char;
-        }
-        fclose($stdin);
-
-        return trim($password);
-    }//protected function readPasswordFromStdin()
-
-
-
-    /**
-    * Creates a database schema dump and sends it to stdout
-    *
-    * @param array $args Command line arguments
-    *
-    * @return void
-    */
-    protected function doDump($args)
-    {
-        $dump_what = MDB2_SCHEMA_DUMP_STRUCTURE;
-        $arg = '';
-        if (count($args)) {
-            $arg = $args[0];
-        }
-
-        switch (strtolower($arg)) {
-        case 'all':
-            $dump_what = MDB2_SCHEMA_DUMP_ALL;
-            array_shift($args);
-            break;
-        case 'data':
-            $dump_what = MDB2_SCHEMA_DUMP_CONTENT;
-            array_shift($args);
-            break;
-        case 'schema':
-            array_shift($args);
-        }
-
-        list($type, $dsn) = $this->getFileOrDsn($args);
-        if ($type == 'file') {
-            throw new MDB2_Schema_Tool_ParameterException(
-                'Dumping a schema file as a schema file does not make much sense'
-            );
-        }
-
-        $schema = MDB2_Schema::factory($dsn, $this->getSchemaOptions());
-        $this->throwExceptionOnError($schema);
-
-        $definition = $schema->getDefinitionFromDatabase();
-        $this->throwExceptionOnError($definition);
-
-
-        $dump_options = array(
-            'output_mode' => 'file',
-            'output' => 'php://stdout',
-            'end_of_line' => "\r\n"
-        );
-        $op = $schema->dumpDatabase(
-            $definition, $dump_options, $dump_what
-        );
-        $this->throwExceptionOnError($op);
-
-        $schema->disconnect();
-    }//protected function doDump($args)
-
-
-
-    /**
-    * Loads a database schema
-    *
-    * @param array $args Command line arguments
-    *
-    * @return void
-    */
-    protected function doLoad($args)
-    {
-        list($typeSource, $dsnSource) = $this->getFileOrDsn($args);
-        list($typeDest,   $dsnDest)   = $this->getFileOrDsn($args);
-
-        if ($typeDest == 'file') {
-            throw new MDB2_Schema_Tool_ParameterException(
-                'A schema can only be loaded into a database, not a file'
-            );
-        }
-
-
-        $schemaDest = MDB2_Schema::factory($dsnDest, $this->getSchemaOptions());
-        $this->throwExceptionOnError($schemaDest);
-
-        //load definition
-        if ($typeSource == 'file') {
-            $definition = $schemaDest->parseDatabaseDefinitionFile($dsnSource);
-            $where      = 'loading schema file';
-        } else {
-            $schemaSource = MDB2_Schema::factory($dsnSource, $this->getSchemaOptions());
-            $this->throwExceptionOnError($schemaSource, 'connecting to source database');
-
-            $definition = $schemaSource->getDefinitionFromDatabase();
-            $where      = 'loading definition from database';
-        }
-        $this->throwExceptionOnError($definition, $where);
-
-
-        //create destination database from definition
-        $simulate = false;
-        $op       = $schemaDest->createDatabase($definition, array(), $simulate);
-        $this->throwExceptionOnError($op, 'creating the database');
-    }//protected function doLoad($args)
-
-
-
-    /**
-    * Initializes a database with data
-    *
-    * @param array $args Command line arguments
-    *
-    * @return void
-    */
-    protected function doInit($args)
-    {
-        list($typeSource, $dsnSource) = $this->getFileOrDsn($args);
-        list($typeDest,   $dsnDest)   = $this->getFileOrDsn($args);
-
-        if ($typeSource != 'file') {
-            throw new MDB2_Schema_Tool_ParameterException(
-                'Data must come from a source file'
-            );
-        }
-
-        if ($typeDest != 'dsn') {
-            throw new MDB2_Schema_Tool_ParameterException(
-                'A schema can only be loaded into a database, not a file'
-            );
-        }
-
-        $schemaDest = MDB2_Schema::factory($dsnDest, $this->getSchemaOptions());
-        $this->throwExceptionOnError($schemaDest, 'connecting to destination database');
-
-        $definition = $schemaDest->getDefinitionFromDatabase();
-        $this->throwExceptionOnError($definition, 'loading definition from database');
-
-        $op = $schemaDest->writeInitialization($dsnSource, $definition);
-        $this->throwExceptionOnError($op, 'initializing database');
-    }//protected function doInit($args)
-
-
-}//class MDB2_Schema_Tool
-
-?>
diff --git a/3rdparty/MDB2/Schema/Tool/ParameterException.php b/3rdparty/MDB2/Schema/Tool/ParameterException.php
deleted file mode 100644
index fab1e03e250..00000000000
--- a/3rdparty/MDB2/Schema/Tool/ParameterException.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class MDB2_Schema_Tool_ParameterException extends Exception
-{}
-
-?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Schema/Validate.php b/3rdparty/MDB2/Schema/Validate.php
deleted file mode 100644
index 217cf51b959..00000000000
--- a/3rdparty/MDB2/Schema/Validate.php
+++ /dev/null
@@ -1,917 +0,0 @@
-<?php
-/**
- * PHP versions 4 and 5
- *
- * Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,
- * Stig. S. Bakken, Lukas Smith, Igor Feghali
- * All rights reserved.
- *
- * MDB2_Schema enables users to maintain RDBMS independant schema files
- * in XML that can be used to manipulate both data and database schemas
- * This LICENSE is in the BSD license style.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,
- * Lukas Smith, Igor Feghali nor the names of his contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Author: Christian Dickmann <dickmann@php.net>
- * Author: Igor Feghali <ifeghali@php.net>
- *
- * @category Database
- * @package  MDB2_Schema
- * @author   Christian Dickmann <dickmann@php.net>
- * @author   Igor Feghali <ifeghali@php.net>
- * @license  BSD http://www.opensource.org/licenses/bsd-license.php
- * @version  CVS: $Id: Validate.php,v 1.42 2008/11/30 03:34:00 clockwerx Exp $
- * @link     http://pear.php.net/packages/MDB2_Schema
- */
-
-/**
- * Validates an XML schema file
- *
- * @category Database
- * @package  MDB2_Schema
- * @author   Igor Feghali <ifeghali@php.net>
- * @license  BSD http://www.opensource.org/licenses/bsd-license.php
- * @link     http://pear.php.net/packages/MDB2_Schema
- */
-class MDB2_Schema_Validate
-{
-    // {{{ properties
-
-    var $fail_on_invalid_names = true;
-
-    var $valid_types = array();
-
-    var $force_defaults = true;
-
-    // }}}
-    // {{{ constructor
-
-    function __construct($fail_on_invalid_names = true, $valid_types = array(), $force_defaults = true)
-    {
-        if (empty($GLOBALS['_MDB2_Schema_Reserved'])) {
-            $GLOBALS['_MDB2_Schema_Reserved'] = array();
-        }
-
-        if (is_array($fail_on_invalid_names)) {
-            $this->fail_on_invalid_names = array_intersect($fail_on_invalid_names,
-                                                           array_keys($GLOBALS['_MDB2_Schema_Reserved']));
-        } elseif ($fail_on_invalid_names === true) {
-            $this->fail_on_invalid_names = array_keys($GLOBALS['_MDB2_Schema_Reserved']);
-        } else {
-            $this->fail_on_invalid_names = array();
-        }
-        $this->valid_types    = $valid_types;
-        $this->force_defaults = $force_defaults;
-    }
-
-    // }}}
-    // {{{ raiseError()
-
-    function &raiseError($ecode, $msg = null)
-    {
-        $error =& MDB2_Schema::raiseError($ecode, null, null, $msg);
-        return $error;
-    }
-
-    // }}}
-    // {{{ isBoolean()
-
-    /**
-     * Verifies if a given value can be considered boolean. If yes, set value
-     * to true or false according to its actual contents and return true. If
-     * not, keep its contents untouched and return false.
-     *
-     * @param mixed &$value value to be checked
-     *
-     * @return bool
-     *
-     * @access public
-     * @static
-     */
-    function isBoolean(&$value)
-    {
-        if (is_bool($value)) {
-            return true;
-        }
-
-        if ($value === 0 || $value === 1 || $value === '') {
-            $value = (bool)$value;
-            return true;
-        }
-
-        if (!is_string($value)) {
-            return false;
-        }
-
-        switch ($value) {
-        case '0':
-        case 'N':
-        case 'n':
-        case 'no':
-        case 'false':
-            $value = false;
-            break;
-        case '1':
-        case 'Y':
-        case 'y':
-        case 'yes':
-        case 'true':
-            $value = true;
-            break;
-        default:
-            return false;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ validateTable()
-
-    /* Definition */
-    /**
-     * Checks whether the definition of a parsed table is valid. Modify table
-     * definition when necessary.
-     *
-     * @param array  $tables     multi dimensional array that contains the
-     *                           tables of current database.
-     * @param array  &$table     multi dimensional array that contains the
-     *                           structure and optional data of the table.
-     * @param string $table_name name of the parsed table
-     *
-     * @return bool|error object
-     *
-     * @access public
-     */
-    function validateTable($tables, &$table, $table_name)
-    {
-        /* Have we got a name? */
-        if (!$table_name) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'a table has to have a name');
-        }
-
-        /* Table name duplicated? */
-        if (is_array($tables) && isset($tables[$table_name])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'table "'.$table_name.'" already exists');
-        }
-
-        /* Table name reserved? */
-        if (is_array($this->fail_on_invalid_names)) {
-            $name = strtoupper($table_name);
-            foreach ($this->fail_on_invalid_names as $rdbms) {
-                if (in_array($name, $GLOBALS['_MDB2_Schema_Reserved'][$rdbms])) {
-                    return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                        'table name "'.$table_name.'" is a reserved word in: '.$rdbms);
-                }
-            }
-        }
-
-        /* Was */
-        if (empty($table['was'])) {
-            $table['was'] = $table_name;
-        }
-
-        /* Have we got fields? */
-        if (empty($table['fields']) || !is_array($table['fields'])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'tables need one or more fields');
-        }
-
-        /* Autoincrement */
-        $autoinc = $primary = false;
-        foreach ($table['fields'] as $field_name => $field) {
-            if (!empty($field['autoincrement'])) {
-                if ($autoinc) {
-                    return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                        'there was already an autoincrement field in "'.$table_name.'" before "'.$field_name.'"');
-                }
-                $autoinc = $field_name;
-            }
-        }
-
-        /*
-         * Checking Indexes
-         * this have to be done here otherwise we can't
-         * guarantee that all table fields were already
-         * defined in the moment we are parsing indexes
-         */
-        if (!empty($table['indexes']) && is_array($table['indexes'])) {
-            foreach ($table['indexes'] as $name => $index) {
-                $skip_index = false;
-                if (!empty($index['primary'])) {
-                    /*
-                     * Lets see if we should skip this index since there is
-                     * already an auto increment on this field this implying
-                     * a primary key index.
-                     */
-                    if (count($index['fields']) == '1'
-                        && $autoinc
-                        && array_key_exists($autoinc, $index['fields'])) {
-                        $skip_index = true;
-                    } elseif ($autoinc || $primary) {
-                        return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                            'there was already an primary index or autoincrement field in "'.$table_name.'" before "'.$name.'"');
-                    } else {
-                        $primary = true;
-                    }
-                }
-
-                if (!$skip_index && is_array($index['fields'])) {
-                    foreach ($index['fields'] as $field_name => $field) {
-                        if (!isset($table['fields'][$field_name])) {
-                            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                                'index field "'.$field_name.'" does not exist');
-                        }
-                        if (!empty($index['primary'])
-                            && !$table['fields'][$field_name]['notnull']
-                        ) {
-                            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                                'all primary key fields must be defined notnull in "'.$table_name.'"');
-                        }
-                    }
-                } else {
-                    unset($table['indexes'][$name]);
-                }
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ validateField()
-
-    /**
-     * Checks whether the definition of a parsed field is valid. Modify field
-     * definition when necessary.
-     *
-     * @param array  $fields     multi dimensional array that contains the
-     *                           fields of current table.
-     * @param array  &$field     multi dimensional array that contains the
-     *                           structure of the parsed field.
-     * @param string $field_name name of the parsed field
-     *
-     * @return bool|error object
-     *
-     * @access public
-     */
-    function validateField($fields, &$field, $field_name)
-    {
-        /* Have we got a name? */
-        if (!$field_name) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'field name missing');
-        }
-
-        /* Field name duplicated? */
-        if (is_array($fields) && isset($fields[$field_name])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'field "'.$field_name.'" already exists');
-        }
-
-        /* Field name reserverd? */
-        if (is_array($this->fail_on_invalid_names)) {
-            $name = strtoupper($field_name);
-            foreach ($this->fail_on_invalid_names as $rdbms) {
-                if (in_array($name, $GLOBALS['_MDB2_Schema_Reserved'][$rdbms])) {
-                    return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                        'field name "'.$field_name.'" is a reserved word in: '.$rdbms);
-                }
-            }
-        }
-
-        /* Type check */
-        if (empty($field['type'])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'no field type specified');
-        }
-        if (!empty($this->valid_types) && !array_key_exists($field['type'], $this->valid_types)) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'no valid field type ("'.$field['type'].'") specified');
-        }
-
-        /* Unsigned */
-        if (array_key_exists('unsigned', $field) && !$this->isBoolean($field['unsigned'])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'unsigned has to be a boolean value');
-        }
-
-        /* Fixed */
-        if (array_key_exists('fixed', $field) && !$this->isBoolean($field['fixed'])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'fixed has to be a boolean value');
-        }
-
-        /* Length */
-        if (array_key_exists('length', $field) && $field['length'] <= 0) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'length has to be an integer greater 0');
-        }
-
-        // if it's a DECIMAL datatype, check if a 'scale' value is provided:
-        // <length>8,4</length> should be translated to DECIMAL(8,4)
-        if (is_float($this->valid_types[$field['type']])
-            && !empty($field['length'])
-            && strpos($field['length'], ',') !== false
-        ) {
-            list($field['length'], $field['scale']) = explode(',', $field['length']);
-        }
-
-        /* Was */
-        if (empty($field['was'])) {
-            $field['was'] = $field_name;
-        }
-
-        /* Notnull */
-        if (empty($field['notnull'])) {
-            $field['notnull'] = false;
-        }
-        if (!$this->isBoolean($field['notnull'])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'field "notnull" has to be a boolean value');
-        }
-
-        /* Default */
-        if ($this->force_defaults
-            && !array_key_exists('default', $field)
-            && $field['type'] != 'clob' && $field['type'] != 'blob'
-        ) {
-            $field['default'] = $this->valid_types[$field['type']];
-        }
-        if (array_key_exists('default', $field)) {
-            if ($field['type'] == 'clob' || $field['type'] == 'blob') {
-                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                    '"'.$field['type'].'"-fields are not allowed to have a default value');
-            }
-            if ($field['default'] === '' && !$field['notnull']) {
-                $field['default'] = null;
-            }
-        }
-        if (isset($field['default'])
-            && PEAR::isError($result = $this->validateDataFieldValue($field, $field['default'], $field_name))
-        ) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'default value of "'.$field_name.'" is incorrect: '.$result->getUserinfo());
-        }
-
-        /* Autoincrement */
-        if (!empty($field['autoincrement'])) {
-            if (!$field['notnull']) {
-                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                    'all autoincrement fields must be defined notnull');
-            }
-
-            if (empty($field['default'])) {
-                $field['default'] = '0';
-            } elseif ($field['default'] !== '0' && $field['default'] !== 0) {
-                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                    'all autoincrement fields must be defined default "0"');
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ validateIndex()
-
-    /**
-     * Checks whether a parsed index is valid. Modify index definition when
-     * necessary.
-     *
-     * @param array  $table_indexes multi dimensional array that contains the
-     *                              indexes of current table.
-     * @param array  &$index        multi dimensional array that contains the
-     *                              structure of the parsed index.
-     * @param string $index_name    name of the parsed index
-     *
-     * @return bool|error object
-     *
-     * @access public
-     */
-    function validateIndex($table_indexes, &$index, $index_name)
-    {
-        if (!$index_name) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'an index has to have a name');
-        }
-        if (is_array($table_indexes) && isset($table_indexes[$index_name])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'index "'.$index_name.'" already exists');
-        }
-        if (array_key_exists('unique', $index) && !$this->isBoolean($index['unique'])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'field "unique" has to be a boolean value');
-        }
-        if (array_key_exists('primary', $index) && !$this->isBoolean($index['primary'])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'field "primary" has to be a boolean value');
-        }
-
-        /* Have we got fields? */
-        if (empty($index['fields']) || !is_array($index['fields'])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'indexes need one or more fields');
-        }
-
-        if (empty($index['was'])) {
-            $index['was'] = $index_name;
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ validateIndexField()
-
-    /**
-     * Checks whether a parsed index-field is valid. Modify its definition when
-     * necessary.
-     *
-     * @param array  $index_fields multi dimensional array that contains the
-     *                             fields of current index.
-     * @param array  &$field       multi dimensional array that contains the
-     *                             structure of the parsed index-field.
-     * @param string $field_name   name of the parsed index-field
-     *
-     * @return bool|error object
-     *
-     * @access public
-     */
-    function validateIndexField($index_fields, &$field, $field_name)
-    {
-        if (is_array($index_fields) && isset($index_fields[$field_name])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'index field "'.$field_name.'" already exists');
-        }
-        if (!$field_name) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'the index-field-name is required');
-        }
-        if (empty($field['sorting'])) {
-            $field['sorting'] = 'ascending';
-        } elseif ($field['sorting'] !== 'ascending' && $field['sorting'] !== 'descending') {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'sorting type unknown');
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ validateConstraint()
-
-    /**
-     * Checks whether a parsed foreign key is valid. Modify its definition when
-     * necessary.
-     *
-     * @param array  $table_constraints multi dimensional array that contains the
-     *                                  constraints of current table.
-     * @param array  &$constraint       multi dimensional array that contains the
-     *                                  structure of the parsed foreign key.
-     * @param string $constraint_name   name of the parsed foreign key
-     *
-     * @return bool|error object
-     *
-     * @access public
-     */
-    function validateConstraint($table_constraints, &$constraint, $constraint_name)
-    {
-        if (!$constraint_name) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'a foreign key has to have a name');
-        }
-        if (is_array($table_constraints) && isset($table_constraints[$constraint_name])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'foreign key "'.$constraint_name.'" already exists');
-        }
-
-        /* Have we got fields? */
-        if (empty($constraint['fields']) || !is_array($constraint['fields'])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'foreign key "'.$constraint_name.'" need one or more fields');
-        }
-
-        /* Have we got referenced fields? */
-        if (empty($constraint['references']) || !is_array($constraint['references'])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'foreign key "'.$constraint_name.'" need to reference one or more fields');
-        }
-
-        /* Have we got referenced table? */
-        if (empty($constraint['references']['table'])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'foreign key "'.$constraint_name.'" need to reference a table');
-        }
-
-        if (empty($constraint['was'])) {
-            $constraint['was'] = $constraint_name;
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ validateConstraintField()
-
-    /**
-     * Checks whether a foreign-field is valid.
-     *
-     * @param array  $constraint_fields multi dimensional array that contains the
-     *                                  fields of current foreign key.
-     * @param string $field_name        name of the parsed foreign-field
-     *
-     * @return bool|error object
-     *
-     * @access public
-     */
-    function validateConstraintField($constraint_fields, $field_name)
-    {
-        if (!$field_name) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'empty value for foreign-field');
-        }
-        if (is_array($constraint_fields) && isset($constraint_fields[$field_name])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'foreign field "'.$field_name.'" already exists');
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ validateConstraintReferencedField()
-
-    /**
-     * Checks whether a foreign-referenced field is valid.
-     *
-     * @param array  $referenced_fields multi dimensional array that contains the
-     *                                  fields of current foreign key.
-     * @param string $field_name        name of the parsed foreign-field
-     *
-     * @return bool|error object
-     *
-     * @access public
-     */
-    function validateConstraintReferencedField($referenced_fields, $field_name)
-    {
-        if (!$field_name) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'empty value for referenced foreign-field');
-        }
-        if (is_array($referenced_fields) && isset($referenced_fields[$field_name])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'foreign field "'.$field_name.'" already referenced');
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ validateSequence()
-
-    /**
-     * Checks whether the definition of a parsed sequence is valid. Modify
-     * sequence definition when necessary.
-     *
-     * @param array  $sequences     multi dimensional array that contains the
-     *                              sequences of current database.
-     * @param array  &$sequence     multi dimensional array that contains the
-     *                              structure of the parsed sequence.
-     * @param string $sequence_name name of the parsed sequence
-     *
-     * @return bool|error object
-     *
-     * @access public
-     */
-    function validateSequence($sequences, &$sequence, $sequence_name)
-    {
-        if (!$sequence_name) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'a sequence has to have a name');
-        }
-
-        if (is_array($sequences) && isset($sequences[$sequence_name])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'sequence "'.$sequence_name.'" already exists');
-        }
-
-        if (is_array($this->fail_on_invalid_names)) {
-            $name = strtoupper($sequence_name);
-            foreach ($this->fail_on_invalid_names as $rdbms) {
-                if (in_array($name, $GLOBALS['_MDB2_Schema_Reserved'][$rdbms])) {
-                    return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                        'sequence name "'.$sequence_name.'" is a reserved word in: '.$rdbms);
-                }
-            }
-        }
-
-        if (empty($sequence['was'])) {
-            $sequence['was'] = $sequence_name;
-        }
-
-        if (!empty($sequence['on'])
-            && (empty($sequence['on']['table']) || empty($sequence['on']['field']))
-        ) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'sequence "'.$sequence_name.'" on a table was not properly defined');
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ validateDatabase()
-
-    /**
-     * Checks whether a parsed database is valid. Modify its structure and
-     * data when necessary.
-     *
-     * @param array &$database multi dimensional array that contains the
-     *                         structure and optional data of the database.
-     *
-     * @return bool|error object
-     *
-     * @access public
-     */
-    function validateDatabase(&$database)
-    {
-        /* Have we got a name? */
-        if (!is_array($database) || !isset($database['name']) || !$database['name']) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'a database has to have a name');
-        }
-
-        /* Database name reserved? */
-        if (is_array($this->fail_on_invalid_names)) {
-            $name = strtoupper($database['name']);
-            foreach ($this->fail_on_invalid_names as $rdbms) {
-                if (in_array($name, $GLOBALS['_MDB2_Schema_Reserved'][$rdbms])) {
-                    return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                        'database name "'.$database['name'].'" is a reserved word in: '.$rdbms);
-                }
-            }
-        }
-
-        /* Create */
-        if (isset($database['create'])
-            && !$this->isBoolean($database['create'])
-        ) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'field "create" has to be a boolean value');
-        }
-
-        /* Overwrite */
-        if (isset($database['overwrite'])
-            && $database['overwrite'] !== ''
-            && !$this->isBoolean($database['overwrite'])
-        ) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'field "overwrite" has to be a boolean value');
-        }
-
-        /*
-         * This have to be done here otherwise we can't guarantee that all
-         * tables were already defined in the moment we are parsing constraints
-         */
-        if (isset($database['tables'])) {
-            foreach ($database['tables'] as $table_name => $table) {
-                if (!empty($table['constraints'])) {
-                    foreach ($table['constraints'] as $constraint_name => $constraint) {
-                        $referenced_table_name = $constraint['references']['table'];
-
-                        if (!isset($database['tables'][$referenced_table_name])) {
-                            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                                'referenced table "'.$referenced_table_name.'" of foreign key "'.$constraint_name.'" of table "'.$table_name.'" does not exist');
-                        }
-
-                        if (empty($constraint['references']['fields'])) {
-                            $referenced_table = $database['tables'][$referenced_table_name];
-
-                            $primary = false;
-
-                            if (!empty($referenced_table['indexes'])) {
-                                foreach ($referenced_table['indexes'] as $index_name => $index) {
-                                    if (array_key_exists('primary', $index)
-                                        && $index['primary']
-                                    ) {
-                                        $primary = array();
-                                        foreach ($index['fields'] as $field_name => $field) {
-                                            $primary[$field_name] = '';
-                                        }
-                                        break;
-                                    }
-                                }
-                            }
-
-                            if (!$primary) {
-                                foreach ($referenced_table['fields'] as $field_name => $field) {
-                                    if (array_key_exists('autoincrement', $field)
-                                        && $field['autoincrement']
-                                    ) {
-                                        $primary = array( $field_name => '' );
-                                        break;
-                                    }
-                                }
-                            }
-
-                            if (!$primary) {
-                                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                                    'referenced table "'.$referenced_table_name.'" has no primary key and no referenced field was specified for foreign key "'.$constraint_name.'" of table "'.$table_name.'"');
-                            }
-
-                            $constraint['references']['fields'] = $primary;
-                        }
-
-                        /* the same number of referencing and referenced fields ? */
-                        if (count($constraint['fields']) != count($constraint['references']['fields'])) {
-                            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                                'The number of fields in the referenced key must match those of the foreign key "'.$constraint_name.'"');
-                        }
-
-                        $database['tables'][$table_name]['constraints'][$constraint_name]['references']['fields'] = $constraint['references']['fields'];
-                    }
-                }
-            }
-        }
-
-        /*
-         * This have to be done here otherwise we can't guarantee that all
-         * tables were already defined in the moment we are parsing sequences
-         */
-        if (isset($database['sequences'])) {
-            foreach ($database['sequences'] as $seq_name => $seq) {
-                if (!empty($seq['on'])
-                    && empty($database['tables'][$seq['on']['table']]['fields'][$seq['on']['field']])
-                ) {
-                    return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                        'sequence "'.$seq_name.'" was assigned on unexisting field/table');
-                }
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ validateDataField()
-
-    /* Data Manipulation */
-    /**
-     * Checks whether a parsed DML-field is valid. Modify its structure when
-     * necessary. This is called when validating INSERT and
-     * UPDATE.
-     *
-     * @param array  $table_fields       multi dimensional array that contains the
-     *                                   definition for current table's fields.
-     * @param array  $instruction_fields multi dimensional array that contains the
-     *                                   parsed fields of the current DML instruction.
-     * @param string &$field             array that contains the parsed instruction field
-     *
-     * @return bool|error object
-     *
-     * @access public
-     */
-    function validateDataField($table_fields, $instruction_fields, &$field)
-    {
-        if (!$field['name']) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'field-name has to be specified');
-        }
-
-        if (is_array($instruction_fields) && isset($instruction_fields[$field['name']])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'field "'.$field['name'].'" already initialized');
-        }
-
-        if (is_array($table_fields) && !isset($table_fields[$field['name']])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                '"'.$field['name'].'" is not defined');
-        }
-
-        if (!isset($field['group']['type'])) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                '"'.$field['name'].'" has no initial value');
-        }
-
-        if (isset($field['group']['data'])
-            && $field['group']['type'] == 'value'
-            && $field['group']['data'] !== ''
-            && PEAR::isError($result = $this->validateDataFieldValue($table_fields[$field['name']], $field['group']['data'], $field['name']))
-        ) {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                'value of "'.$field['name'].'" is incorrect: '.$result->getUserinfo());
-        }
-
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ validateDataFieldValue()
-
-    /**
-     * Checks whether a given value is compatible with a table field. This is
-     * done when parsing a field for a INSERT or UPDATE instruction.
-     *
-     * @param array  $field_def    multi dimensional array that contains the
-     *                             definition for current table's fields.
-     * @param string &$field_value value to fill the parsed field
-     * @param string $field_name   name of the parsed field
-     *
-     * @return bool|error object
-     *
-     * @access public
-     * @see MDB2_Schema_Validate::validateInsertField()
-     */
-    function validateDataFieldValue($field_def, &$field_value, $field_name)
-    {
-        switch ($field_def['type']) {
-        case 'text':
-        case 'clob':
-            if (!empty($field_def['length']) && strlen($field_value) > $field_def['length']) {
-                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                    '"'.$field_value.'" is larger than "'.$field_def['length'].'"');
-            }
-            break;
-        case 'blob':
-            $field_value = pack('H*', $field_value);
-            if (!empty($field_def['length']) && strlen($field_value) > $field_def['length']) {
-                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                    '"'.$field_value.'" is larger than "'.$field_def['type'].'"');
-            }
-            break;
-        case 'integer':
-            if ($field_value != ((int)$field_value)) {
-                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                    '"'.$field_value.'" is not of type "'.$field_def['type'].'"');
-            }
-            //$field_value = (int)$field_value;
-            if (!empty($field_def['unsigned']) && $field_def['unsigned'] && $field_value < 0) {
-                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                    '"'.$field_value.'" signed instead of unsigned');
-            }
-            break;
-        case 'boolean':
-            if (!$this->isBoolean($field_value)) {
-                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                    '"'.$field_value.'" is not of type "'.$field_def['type'].'"');
-            }
-            break;
-        case 'date':
-            if (!preg_match('/([0-9]{4})-([0-9]{1,2})-([0-9]{1,2})/', $field_value)
-                && $field_value !== 'CURRENT_DATE'
-            ) {
-                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                    '"'.$field_value.'" is not of type "'.$field_def['type'].'"');
-            }
-            break;
-        case 'timestamp':
-            if (!preg_match('/([0-9]{4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})/', $field_value)
-                && strcasecmp($field_value, 'now()') != 0
-                && $field_value !== 'CURRENT_TIMESTAMP'
-            ) {
-                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                    '"'.$field_value.'" is not of type "'.$field_def['type'].'"');
-            }
-            break;
-        case 'time':
-            if (!preg_match("/([0-9]{2}):([0-9]{2}):([0-9]{2})/", $field_value)
-                && $field_value !== 'CURRENT_TIME'
-            ) {
-                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                    '"'.$field_value.'" is not of type "'.$field_def['type'].'"');
-            }
-            break;
-        case 'float':
-        case 'double':
-            if ($field_value != (double)$field_value) {
-                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
-                    '"'.$field_value.'" is not of type "'.$field_def['type'].'"');
-            }
-            //$field_value = (double)$field_value;
-            break;
-        }
-        return MDB2_OK;
-    }
-}
-
-?>
diff --git a/3rdparty/MDB2/Schema/Writer.php b/3rdparty/MDB2/Schema/Writer.php
deleted file mode 100644
index 5ae4918dc1d..00000000000
--- a/3rdparty/MDB2/Schema/Writer.php
+++ /dev/null
@@ -1,581 +0,0 @@
-<?php
-/**
- * PHP versions 4 and 5
- *
- * Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,
- * Stig. S. Bakken, Lukas Smith, Igor Feghali
- * All rights reserved.
- *
- * MDB2_Schema enables users to maintain RDBMS independant schema files
- * in XML that can be used to manipulate both data and database schemas
- * This LICENSE is in the BSD license style.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,
- * Lukas Smith, Igor Feghali nor the names of his contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Author: Lukas Smith <smith@pooteeweet.org>
- * Author: Igor Feghali <ifeghali@php.net>
- *
- * @category Database
- * @package  MDB2_Schema
- * @author   Lukas Smith <smith@pooteeweet.org>
- * @author   Igor Feghali <ifeghali@php.net>
- * @license  BSD http://www.opensource.org/licenses/bsd-license.php
- * @version  CVS: $Id: Writer.php,v 1.40 2008/11/30 03:34:00 clockwerx Exp $
- * @link     http://pear.php.net/packages/MDB2_Schema
- */
-
-/**
- * Writes an XML schema file
- *
- * @category Database
- * @package  MDB2_Schema
- * @author   Lukas Smith <smith@pooteeweet.org>
- * @license  BSD http://www.opensource.org/licenses/bsd-license.php
- * @link     http://pear.php.net/packages/MDB2_Schema
- */
-class MDB2_Schema_Writer
-{
-    // {{{ properties
-
-    var $valid_types = array();
-
-    // }}}
-    // {{{ constructor
-
-    function __construct($valid_types = array())
-    {
-        $this->valid_types = $valid_types;
-    }
-
-    function MDB2_Schema_Writer($valid_types = array())
-    {
-        $this->__construct($valid_types);
-    }
-
-    // }}}
-    // {{{ raiseError()
-
-    /**
-     * This method is used to communicate an error and invoke error
-     * callbacks etc.  Basically a wrapper for PEAR::raiseError
-     * without the message string.
-     *
-     * @param int|PEAR_Error $code    integer error code or and PEAR_Error instance
-     * @param int            $mode    error mode, see PEAR_Error docs
-     *                                error level (E_USER_NOTICE etc).  If error mode is
-     *                                PEAR_ERROR_CALLBACK, this is the callback function,
-     *                                either as a function name, or as an array of an
-     *                                object and method name.  For other error modes this
-     *                                parameter is ignored.
-     * @param string         $options Extra debug information.  Defaults to the last
-     *                                query and native error code.
-     *
-     * @return object  a PEAR error object
-     * @access  public
-     * @see PEAR_Error
-     */
-    function &raiseError($code = null, $mode = null, $options = null, $userinfo = null)
-    {
-        $error =& MDB2_Schema::raiseError($code, $mode, $options, $userinfo);
-        return $error;
-    }
-
-    // }}}
-    // {{{ _escapeSpecialChars()
-
-    /**
-     * add escapecharacters to all special characters in a string
-     *
-     * @param string $string string that should be escaped
-     *
-     * @return string escaped string
-     * @access protected
-     */
-    function _escapeSpecialChars($string)
-    {
-        if (!is_string($string)) {
-            $string = strval($string);
-        }
-
-        $escaped = '';
-        for ($char = 0, $count = strlen($string); $char < $count; $char++) {
-            switch ($string[$char]) {
-            case '&':
-                $escaped .= '&amp;';
-                break;
-            case '>':
-                $escaped .= '&gt;';
-                break;
-            case '<':
-                $escaped .= '&lt;';
-                break;
-            case '"':
-                $escaped .= '&quot;';
-                break;
-            case '\'':
-                $escaped .= '&apos;';
-                break;
-            default:
-                $code = ord($string[$char]);
-                if ($code < 32 || $code > 127) {
-                    $escaped .= "&#$code;";
-                } else {
-                    $escaped .= $string[$char];
-                }
-                break;
-            }
-        }
-        return $escaped;
-    }
-
-    // }}}
-    // {{{ _dumpBoolean()
-
-    /**
-     * dump the structure of a sequence
-     *
-     * @param string $boolean boolean value or variable definition
-     *
-     * @return string with xml boolea definition
-     * @access private
-     */
-    function _dumpBoolean($boolean)
-    {
-        if (is_string($boolean)) {
-            if ($boolean !== 'true' || $boolean !== 'false'
-                || preg_match('/<variable>.*</variable>/', $boolean)
-            ) {
-                return $boolean;
-            }
-        }
-        return $boolean ? 'true' : 'false';
-    }
-
-    // }}}
-    // {{{ dumpSequence()
-
-    /**
-     * dump the structure of a sequence
-     *
-     * @param string  $sequence_definition sequence definition
-     * @param string  $sequence_name       sequence name
-     * @param string  $eol                 end of line characters
-     * @param integer $dump                determines what data to dump
-     *                      MDB2_SCHEMA_DUMP_ALL       : the entire db
-     *                      MDB2_SCHEMA_DUMP_STRUCTURE : only the structure of the db
-     *                      MDB2_SCHEMA_DUMP_CONTENT   : only the content of the db
-     *
-     * @return mixed string xml sequence definition on success, or a error object
-     * @access public
-     */
-    function dumpSequence($sequence_definition, $sequence_name, $eol, $dump = MDB2_SCHEMA_DUMP_ALL)
-    {
-        $buffer = "$eol <sequence>$eol  <name>$sequence_name</name>$eol";
-        if ($dump == MDB2_SCHEMA_DUMP_ALL || $dump == MDB2_SCHEMA_DUMP_CONTENT) {
-            if (!empty($sequence_definition['start'])) {
-                $start   = $sequence_definition['start'];
-                $buffer .= "  <start>$start</start>$eol";
-            }
-        }
-
-        if (!empty($sequence_definition['on'])) {
-            $buffer .= "  <on>$eol";
-            $buffer .= "   <table>".$sequence_definition['on']['table'];
-            $buffer .= "</table>$eol   <field>".$sequence_definition['on']['field'];
-            $buffer .= "</field>$eol  </on>$eol";
-        }
-        $buffer .= " </sequence>$eol";
-
-        return $buffer;
-    }
-
-    // }}}
-    // {{{ dumpDatabase()
-
-    /**
-     * Dump a previously parsed database structure in the Metabase schema
-     * XML based format suitable for the Metabase parser. This function
-     * may optionally dump the database definition with initialization
-     * commands that specify the data that is currently present in the tables.
-     *
-     * @param array   $database_definition unknown
-     * @param array   $arguments           associative array that takes pairs of tag
-     *              names and values that define dump options.
-     *                 array (
-     *                     'output_mode'    =>    String
-     *                         'file' :   dump into a file
-     *                         default:   dump using a function
-     *                     'output'        =>    String
-     *                         depending on the 'Output_Mode'
-     *                                  name of the file
-     *                                  name of the function
-     *                     'end_of_line'        =>    String
-     *                         end of line delimiter that should be used
-     *                         default: "\n"
-     *                 );
-     * @param integer $dump                determines what data to dump
-     *                      MDB2_SCHEMA_DUMP_ALL       : the entire db
-     *                      MDB2_SCHEMA_DUMP_STRUCTURE : only the structure of the db
-     *                      MDB2_SCHEMA_DUMP_CONTENT   : only the content of the db
-     *
-     * @return mixed MDB2_OK on success, or a error object
-     * @access public
-     */
-    function dumpDatabase($database_definition, $arguments, $dump = MDB2_SCHEMA_DUMP_ALL)
-    {
-        if (!empty($arguments['output'])) {
-            if (!empty($arguments['output_mode']) && $arguments['output_mode'] == 'file') {
-                $fp = fopen($arguments['output'], 'w');
-                if ($fp === false) {
-                    return $this->raiseError(MDB2_SCHEMA_ERROR_WRITER, null, null,
-                        'it was not possible to open output file');
-                }
-
-                $output = false;
-            } elseif (is_callable($arguments['output'])) {
-                $output = $arguments['output'];
-            } else {
-                return $this->raiseError(MDB2_SCHEMA_ERROR_WRITER, null, null,
-                    'no valid output function specified');
-            }
-        } else {
-            return $this->raiseError(MDB2_SCHEMA_ERROR_WRITER, null, null,
-                'no output method specified');
-        }
-
-        $eol = isset($arguments['end_of_line']) ? $arguments['end_of_line'] : "\n";
-
-        $sequences = array();
-        if (!empty($database_definition['sequences'])
-            && is_array($database_definition['sequences'])
-        ) {
-            foreach ($database_definition['sequences'] as $sequence_name => $sequence) {
-                $table = !empty($sequence['on']) ? $sequence['on']['table'] :'';
-
-                $sequences[$table][] = $sequence_name;
-            }
-        }
-
-        $buffer  = '<?xml version="1.0" encoding="ISO-8859-1" ?>'.$eol;
-        $buffer .= "<database>$eol$eol <name>".$database_definition['name']."</name>";
-        $buffer .= "$eol <create>".$this->_dumpBoolean($database_definition['create'])."</create>";
-        $buffer .= "$eol <overwrite>".$this->_dumpBoolean($database_definition['overwrite'])."</overwrite>$eol";
-        $buffer .= "$eol <charset>".$database_definition['charset']."</charset>$eol";
-
-        if ($output) {
-            call_user_func($output, $buffer);
-        } else {
-            fwrite($fp, $buffer);
-        }
-
-        if (!empty($database_definition['tables']) && is_array($database_definition['tables'])) {
-            foreach ($database_definition['tables'] as $table_name => $table) {
-                $buffer = "$eol <table>$eol$eol  <name>$table_name</name>$eol";
-                if ($dump == MDB2_SCHEMA_DUMP_ALL || $dump == MDB2_SCHEMA_DUMP_STRUCTURE) {
-                    $buffer .= "$eol  <declaration>$eol";
-                    if (!empty($table['fields']) && is_array($table['fields'])) {
-                        foreach ($table['fields'] as $field_name => $field) {
-                            if (empty($field['type'])) {
-                                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE, null, null,
-                                    'it was not specified the type of the field "'.
-                                    $field_name.'" of the table "'.$table_name.'"');
-                            }
-                            if (!empty($this->valid_types) && !array_key_exists($field['type'], $this->valid_types)) {
-                                return $this->raiseError(MDB2_SCHEMA_ERROR_UNSUPPORTED, null, null,
-                                    'type "'.$field['type'].'" is not yet supported');
-                            }
-                            $buffer .= "$eol   <field>$eol    <name>$field_name</name>$eol    <type>";
-                            $buffer .= $field['type']."</type>$eol";
-                            if (!empty($field['fixed']) && $field['type'] === 'text') {
-                                $buffer .= "    <fixed>".$this->_dumpBoolean($field['fixed'])."</fixed>$eol";
-                            }
-                            if (array_key_exists('default', $field)
-                                && $field['type'] !== 'clob' && $field['type'] !== 'blob'
-                            ) {
-                                $buffer .= '    <default>'.$this->_escapeSpecialChars($field['default'])."</default>$eol";
-                            }
-                            if (!empty($field['notnull'])) {
-                                $buffer .= "    <notnull>".$this->_dumpBoolean($field['notnull'])."</notnull>$eol";
-                            } else {
-                                $buffer .= "    <notnull>false</notnull>$eol";
-                            }
-                            if (!empty($field['autoincrement'])) {
-                                $buffer .= "    <autoincrement>" . $field['autoincrement'] ."</autoincrement>$eol";
-                            }
-                            if (!empty($field['unsigned'])) {
-                                $buffer .= "    <unsigned>".$this->_dumpBoolean($field['unsigned'])."</unsigned>$eol";
-                            }
-                            if (!empty($field['length'])) {
-                                $buffer .= '    <length>'.$field['length']."</length>$eol";
-                            }
-                            $buffer .= "   </field>$eol";
-                        }
-                    }
-
-                    if (!empty($table['indexes']) && is_array($table['indexes'])) {
-                        foreach ($table['indexes'] as $index_name => $index) {
-                            if (strtolower($index_name) === 'primary') {
-                                $index_name = $table_name . '_pKey';
-                            }
-                            $buffer .= "$eol   <index>$eol    <name>$index_name</name>$eol";
-                            if (!empty($index['unique'])) {
-                                $buffer .= "    <unique>".$this->_dumpBoolean($index['unique'])."</unique>$eol";
-                            }
-
-                            if (!empty($index['primary'])) {
-                                $buffer .= "    <primary>".$this->_dumpBoolean($index['primary'])."</primary>$eol";
-                            }
-
-                            foreach ($index['fields'] as $field_name => $field) {
-                                $buffer .= "    <field>$eol     <name>$field_name</name>$eol";
-                                if (!empty($field) && is_array($field)) {
-                                    $buffer .= '     <sorting>'.$field['sorting']."</sorting>$eol";
-                                }
-                                $buffer .= "    </field>$eol";
-                            }
-                            $buffer .= "   </index>$eol";
-                        }
-                    }
-
-                    if (!empty($table['constraints']) && is_array($table['constraints'])) {
-                        foreach ($table['constraints'] as $constraint_name => $constraint) {
-                            $buffer .= "$eol   <foreign>$eol    <name>$constraint_name</name>$eol";
-                            if (empty($constraint['fields']) || !is_array($constraint['fields'])) {
-                                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE, null, null,
-                                    'it was not specified a field for the foreign key "'.
-                                    $constraint_name.'" of the table "'.$table_name.'"');
-                            }
-                            if (!is_array($constraint['references']) || empty($constraint['references']['table'])) {
-                                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE, null, null,
-                                    'it was not specified the referenced table of the foreign key "'.
-                                    $constraint_name.'" of the table "'.$table_name.'"');
-                            }
-                            if (!empty($constraint['match'])) {
-                                $buffer .= "    <match>".$constraint['match']."</match>$eol";
-                            }
-                            if (!empty($constraint['ondelete'])) {
-                                $buffer .= "    <ondelete>".$constraint['ondelete']."</ondelete>$eol";
-                            }
-                            if (!empty($constraint['onupdate'])) {
-                                $buffer .= "    <onupdate>".$constraint['onupdate']."</onupdate>$eol";
-                            }
-                            if (!empty($constraint['deferrable'])) {
-                                $buffer .= "    <deferrable>".$constraint['deferrable']."</deferrable>$eol";
-                            }
-                            if (!empty($constraint['initiallydeferred'])) {
-                                $buffer .= "    <initiallydeferred>".$constraint['initiallydeferred']."</initiallydeferred>$eol";
-                            }
-                            foreach ($constraint['fields'] as $field_name => $field) {
-                                $buffer .= "    <field>$field_name</field>$eol";
-                            }
-                            $buffer .= "    <references>$eol     <table>".$constraint['references']['table']."</table>$eol";
-                            foreach ($constraint['references']['fields'] as $field_name => $field) {
-                                $buffer .= "     <field>$field_name</field>$eol";
-                            }
-                            $buffer .= "    </references>$eol";
-
-                            $buffer .= "   </foreign>$eol";
-                        }
-                    }
-
-                    $buffer .= "$eol  </declaration>$eol";
-                }
-
-                if ($output) {
-                    call_user_func($output, $buffer);
-                } else {
-                    fwrite($fp, $buffer);
-                }
-
-                $buffer = '';
-                if ($dump == MDB2_SCHEMA_DUMP_ALL || $dump == MDB2_SCHEMA_DUMP_CONTENT) {
-                    if (!empty($table['initialization']) && is_array($table['initialization'])) {
-                        $buffer = "$eol  <initialization>$eol";
-                        foreach ($table['initialization'] as $instruction) {
-                            switch ($instruction['type']) {
-                            case 'insert':
-                                $buffer .= "$eol   <insert>$eol";
-                                foreach ($instruction['data']['field'] as $field) {
-                                    $field_name = $field['name'];
-
-                                    $buffer .= "$eol    <field>$eol     <name>$field_name</name>$eol";
-                                    $buffer .= $this->writeExpression($field['group'], 5, $arguments);
-                                    $buffer .= "    </field>$eol";
-                                }
-                                $buffer .= "$eol   </insert>$eol";
-                                break;
-                            case 'update':
-                                $buffer .= "$eol   <update>$eol";
-                                foreach ($instruction['data']['field'] as $field) {
-                                    $field_name = $field['name'];
-
-                                    $buffer .= "$eol    <field>$eol     <name>$field_name</name>$eol";
-                                    $buffer .= $this->writeExpression($field['group'], 5, $arguments);
-                                    $buffer .= "    </field>$eol";
-                                }
-
-                                if (!empty($instruction['data']['where'])
-                                    && is_array($instruction['data']['where'])
-                                ) {
-                                    $buffer .= "    <where>$eol";
-                                    $buffer .= $this->writeExpression($instruction['data']['where'], 5, $arguments);
-                                    $buffer .= "    </where>$eol";
-                                }
-
-                                $buffer .= "$eol   </update>$eol";
-                                break;
-                            case 'delete':
-                                $buffer .= "$eol   <delete>$eol$eol";
-                                if (!empty($instruction['data']['where'])
-                                    && is_array($instruction['data']['where'])
-                                ) {
-                                    $buffer .= "    <where>$eol";
-                                    $buffer .= $this->writeExpression($instruction['data']['where'], 5, $arguments);
-                                    $buffer .= "    </where>$eol";
-                                }
-                                $buffer .= "$eol   </delete>$eol";
-                                break;
-                            }
-                        }
-                        $buffer .= "$eol  </initialization>$eol";
-                    }
-                }
-                $buffer .= "$eol </table>$eol";
-                if ($output) {
-                    call_user_func($output, $buffer);
-                } else {
-                    fwrite($fp, $buffer);
-                }
-
-                if (isset($sequences[$table_name])) {
-                    foreach ($sequences[$table_name] as $sequence) {
-                        $result = $this->dumpSequence($database_definition['sequences'][$sequence],
-                                                      $sequence, $eol, $dump);
-                        if (PEAR::isError($result)) {
-                            return $result;
-                        }
-
-                        if ($output) {
-                            call_user_func($output, $result);
-                        } else {
-                            fwrite($fp, $result);
-                        }
-                    }
-                }
-            }
-        }
-
-        if (isset($sequences[''])) {
-            foreach ($sequences[''] as $sequence) {
-                $result = $this->dumpSequence($database_definition['sequences'][$sequence],
-                                              $sequence, $eol, $dump);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-
-                if ($output) {
-                    call_user_func($output, $result);
-                } else {
-                    fwrite($fp, $result);
-                }
-            }
-        }
-
-        $buffer = "$eol</database>$eol";
-        if ($output) {
-            call_user_func($output, $buffer);
-        } else {
-            fwrite($fp, $buffer);
-            fclose($fp);
-        }
-
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ writeExpression()
-
-    /**
-     * Dumps the structure of an element. Elements can be value, column,
-     * function or expression.
-     *
-     * @param array   $element   multi dimensional array that represents the parsed element
-     *                           of a DML instruction.
-     * @param integer $offset    base indentation width
-     * @param array   $arguments associative array that takes pairs of tag
-     *                           names and values that define dump options.
-     *
-     * @return string
-     *
-     * @access public
-     * @see MDB2_Schema_Writer::dumpDatabase()
-     */
-    function writeExpression($element, $offset = 0, $arguments = null)
-    {
-        $eol = isset($arguments['end_of_line']) ? $arguments['end_of_line'] : "\n";
-        $str = '';
-
-        $indent  = str_repeat(' ', $offset);
-        $noffset = $offset + 1;
-
-        switch ($element['type']) {
-        case 'value':
-            $str .= "$indent<value>".$this->_escapeSpecialChars($element['data'])."</value>$eol";
-            break;
-        case 'column':
-            $str .= "$indent<column>".$this->_escapeSpecialChars($element['data'])."</column>$eol";
-            break;
-        case 'function':
-            $str .= "$indent<function>$eol$indent <name>".$this->_escapeSpecialChars($element['data']['name'])."</name>$eol";
-
-            if (!empty($element['data']['arguments'])
-                && is_array($element['data']['arguments'])
-            ) {
-                foreach ($element['data']['arguments'] as $v) {
-                    $str .= $this->writeExpression($v, $noffset, $arguments);
-                }
-            }
-
-            $str .= "$indent</function>$eol";
-            break;
-        case 'expression':
-            $str .= "$indent<expression>$eol";
-            $str .= $this->writeExpression($element['data']['operants'][0], $noffset, $arguments);
-            $str .= "$indent <operator>".$element['data']['operator']."</operator>$eol";
-            $str .= $this->writeExpression($element['data']['operants'][1], $noffset, $arguments);
-            $str .= "$indent</expression>$eol";
-            break;
-        }
-        return $str;
-    }
-
-    // }}}
-}
-?>
diff --git a/3rdparty/PEAR.php b/3rdparty/PEAR.php
deleted file mode 100644
index f832c0d4916..00000000000
--- a/3rdparty/PEAR.php
+++ /dev/null
@@ -1,1055 +0,0 @@
-<?php
-//
-// +--------------------------------------------------------------------+
-// | PEAR, the PHP Extension and Application Repository                 |
-// +--------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                              |
-// +--------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,     |
-// | that is bundled with this package in the file LICENSE, and is      |
-// | available through the world-wide-web at the following url:         |
-// | http://www.php.net/license/3_0.txt.                                |
-// | If you did not receive a copy of the PHP license and are unable to |
-// | obtain it through the world-wide-web, please send a note to        |
-// | license@php.net so we can mail you a copy immediately.             |
-// +--------------------------------------------------------------------+
-// | Authors: Sterling Hughes <sterling@php.net>                        |
-// |          Stig Bakken <ssb@php.net>                                 |
-// |          Tomas V.V.Cox <cox@idecnet.com>                           |
-// +--------------------------------------------------------------------+
-//
-// $Id: PEAR.php,v 1.82.2.6 2005/01/01 05:24:51 cellog Exp $
-//
-
-define('PEAR_ERROR_RETURN',     1);
-define('PEAR_ERROR_PRINT',      2);
-define('PEAR_ERROR_TRIGGER',    4);
-define('PEAR_ERROR_DIE',        8);
-define('PEAR_ERROR_CALLBACK',  16);
-/**
- * WARNING: obsolete
- * @deprecated
- */
-define('PEAR_ERROR_EXCEPTION', 32);
-define('PEAR_ZE2', (function_exists('version_compare') &&
-                    version_compare(zend_version(), "2-dev", "ge")));
-
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    define('OS_WINDOWS', true);
-    define('OS_UNIX',    false);
-    define('PEAR_OS',    'Windows');
-} else {
-    define('OS_WINDOWS', false);
-    define('OS_UNIX',    true);
-    define('PEAR_OS',    'Unix'); // blatant assumption
-}
-
-// instant backwards compatibility
-if (!defined('PATH_SEPARATOR')) {
-    if (OS_WINDOWS) {
-        define('PATH_SEPARATOR', ';');
-    } else {
-        define('PATH_SEPARATOR', ':');
-    }
-}
-
-$GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
-$GLOBALS['_PEAR_default_error_options']  = E_USER_NOTICE;
-$GLOBALS['_PEAR_destructor_object_list'] = array();
-$GLOBALS['_PEAR_shutdown_funcs']         = array();
-$GLOBALS['_PEAR_error_handler_stack']    = array();
-
-@ini_set('track_errors', true);
-
-/**
- * Base class for other PEAR classes.  Provides rudimentary
- * emulation of destructors.
- *
- * If you want a destructor in your class, inherit PEAR and make a
- * destructor method called _yourclassname (same name as the
- * constructor, but with a "_" prefix).  Also, in your constructor you
- * have to call the PEAR constructor: $this->PEAR();.
- * The destructor method will be called without parameters.  Note that
- * at in some SAPI implementations (such as Apache), any output during
- * the request shutdown (in which destructors are called) seems to be
- * discarded.  If you need to get any debug information from your
- * destructor, use error_log(), syslog() or something similar.
- *
- * IMPORTANT! To use the emulated destructors you need to create the
- * objects by reference: $obj =& new PEAR_child;
- *
- * @since PHP 4.0.2
- * @author Stig Bakken <ssb@php.net>
- * @see http://pear.php.net/manual/
- */
-class PEAR
-{
-    // {{{ properties
-
-    /**
-     * Whether to enable internal debug messages.
-     *
-     * @var     bool
-     * @access  private
-     */
-    var $_debug = false;
-
-    /**
-     * Default error mode for this object.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_mode = null;
-
-    /**
-     * Default error options used for this object when error mode
-     * is PEAR_ERROR_TRIGGER.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_options = null;
-
-    /**
-     * Default error handler (callback) for this object, if error mode is
-     * PEAR_ERROR_CALLBACK.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_default_error_handler = '';
-
-    /**
-     * Which class to use for error objects.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_error_class = 'PEAR_Error';
-
-    /**
-     * An array of expected errors.
-     *
-     * @var     array
-     * @access  private
-     */
-    var $_expected_errors = array();
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * Constructor.  Registers this object in
-     * $_PEAR_destructor_object_list for destructor emulation if a
-     * destructor object exists.
-     *
-     * @param string $error_class  (optional) which class to use for
-     *        error objects, defaults to PEAR_Error.
-     * @access public
-     * @return void
-     */
-    function PEAR($error_class = null)
-    {
-        $classname = strtolower(get_class($this));
-        if ($this->_debug) {
-            print "PEAR constructor called, class=$classname\n";
-        }
-        if ($error_class !== null) {
-            $this->_error_class = $error_class;
-        }
-        while ($classname && strcasecmp($classname, "pear")) {
-            $destructor = "_$classname";
-            if (method_exists($this, $destructor)) {
-                global $_PEAR_destructor_object_list;
-                $_PEAR_destructor_object_list[] = &$this;
-                if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-                    register_shutdown_function("_PEAR_call_destructors");
-                    $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-                }
-                break;
-            } else {
-                $classname = get_parent_class($classname);
-            }
-        }
-    }
-
-    // }}}
-    // {{{ destructor
-
-    /**
-     * Destructor (the emulated type of...).  Does nothing right now,
-     * but is included for forward compatibility, so subclass
-     * destructors should always call it.
-     *
-     * See the note in the class desciption about output from
-     * destructors.
-     *
-     * @access public
-     * @return void
-     */
-    function _PEAR() {
-        if ($this->_debug) {
-            printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
-        }
-    }
-
-    // }}}
-    // {{{ getStaticProperty()
-
-    /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
-    function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        return $properties[$class][$var];
-    }
-
-    // }}}
-    // {{{ registerShutdownFunc()
-
-    /**
-    * Use this function to register a shutdown method for static
-    * classes.
-    *
-    * @access public
-    * @param  mixed $func  The function name (or array of class/method) to call
-    * @param  mixed $args  The arguments to pass to the function
-    * @return void
-    */
-    function registerShutdownFunc($func, $args = array())
-    {
-        $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
-    }
-
-    // }}}
-    // {{{ isError()
-
-    /**
-     * Tell whether a value is a PEAR error.
-     *
-     * @param   mixed $data   the value to test
-     * @param   int   $code   if $data is an error object, return true
-     *                        only if $code is a string and
-     *                        $obj->getMessage() == $code or
-     *                        $code is an integer and $obj->getCode() == $code
-     * @access  public
-     * @return  bool    true if parameter is an error
-     */
-    static function isError($data, $code = null)
-    {
-        if ($data instanceof PEAR_Error) {
-            if (is_null($code)) {
-                return true;
-            } elseif (is_string($code)) {
-                return $data->getMessage() == $code;
-            } else {
-                return $data->getCode() == $code;
-            }
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ setErrorHandling()
-
-    /**
-     * Sets how errors generated by this object should be handled.
-     * Can be invoked both in objects and statically.  If called
-     * statically, setErrorHandling sets the default behaviour for all
-     * PEAR objects.  If called in an object, setErrorHandling sets
-     * the default behaviour for that object.
-     *
-     * @param int $mode
-     *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *        PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options
-     *        When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
-     *        of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *
-     *        When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
-     *        to be the callback function or method.  A callback
-     *        function is a string with the name of the function, a
-     *        callback method is an array of two elements: the element
-     *        at index 0 is the object, and the element at index 1 is
-     *        the name of the method to call in the object.
-     *
-     *        When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
-     *        a printf format string used when printing the error
-     *        message.
-     *
-     * @access public
-     * @return void
-     * @see PEAR_ERROR_RETURN
-     * @see PEAR_ERROR_PRINT
-     * @see PEAR_ERROR_TRIGGER
-     * @see PEAR_ERROR_DIE
-     * @see PEAR_ERROR_CALLBACK
-     * @see PEAR_ERROR_EXCEPTION
-     *
-     * @since PHP 4.0.5
-     */
-
-    function setErrorHandling($mode = null, $options = null)
-    {
-        if (isset($this) && $this instanceof PEAR) {
-            $setmode     = &$this->_default_error_mode;
-            $setoptions  = &$this->_default_error_options;
-        } else {
-            $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-            $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        }
-
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-    }
-
-    // }}}
-    // {{{ expectError()
-
-    /**
-     * This method is used to tell which errors you expect to get.
-     * Expected errors are always returned with error mode
-     * PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
-     * and this method pushes a new element onto it.  The list of
-     * expected errors are in effect until they are popped off the
-     * stack with the popExpect() method.
-     *
-     * Note that this method can not be called statically
-     *
-     * @param mixed $code a single error code or an array of error codes to expect
-     *
-     * @return int     the new depth of the "expected errors" stack
-     * @access public
-     */
-    function expectError($code = '*')
-    {
-        if (is_array($code)) {
-            array_push($this->_expected_errors, $code);
-        } else {
-            array_push($this->_expected_errors, array($code));
-        }
-        return sizeof($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ popExpect()
-
-    /**
-     * This method pops one element off the expected error codes
-     * stack.
-     *
-     * @return array   the list of error codes that were popped
-     */
-    function popExpect()
-    {
-        return array_pop($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ _checkDelExpect()
-
-    /**
-     * This method checks unsets an error code if available
-     *
-     * @param mixed error code
-     * @return bool true if the error code was unset, false otherwise
-     * @access private
-     * @since PHP 4.3.0
-     */
-    function _checkDelExpect($error_code)
-    {
-        $deleted = false;
-
-        foreach ($this->_expected_errors AS $key => $error_array) {
-            if (in_array($error_code, $error_array)) {
-                unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
-                $deleted = true;
-            }
-
-            // clean up empty arrays
-            if (0 == count($this->_expected_errors[$key])) {
-                unset($this->_expected_errors[$key]);
-            }
-        }
-        return $deleted;
-    }
-
-    // }}}
-    // {{{ delExpect()
-
-    /**
-     * This method deletes all occurences of the specified element from
-     * the expected error codes stack.
-     *
-     * @param  mixed $error_code error code that should be deleted
-     * @return mixed list of error codes that were deleted or error
-     * @access public
-     * @since PHP 4.3.0
-     */
-    function delExpect($error_code)
-    {
-        $deleted = false;
-
-        if ((is_array($error_code) && (0 != count($error_code)))) {
-            // $error_code is a non-empty array here;
-            // we walk through it trying to unset all
-            // values
-            foreach($error_code as $key => $error) {
-                if ($this->_checkDelExpect($error)) {
-                    $deleted =  true;
-                } else {
-                    $deleted = false;
-                }
-            }
-            return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-        } elseif (!empty($error_code)) {
-            // $error_code comes alone, trying to unset it
-            if ($this->_checkDelExpect($error_code)) {
-                return true;
-            } else {
-                return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-            }
-        } else {
-            // $error_code is empty
-            return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
-        }
-    }
-
-    // }}}
-    // {{{ raiseError()
-
-    /**
-     * This method is a wrapper that returns an instance of the
-     * configured error class with this object's default error
-     * handling applied.  If the $mode and $options parameters are not
-     * specified, the object's defaults are used.
-     *
-     * @param mixed $message a text error message or a PEAR error object
-     *
-     * @param int $code      a numeric error code (it is up to your class
-     *                  to define these if you want to use codes)
-     *
-     * @param int $mode      One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
-     *                  specifies the PHP-internal error level (one of
-     *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *                  If $mode is PEAR_ERROR_CALLBACK, this
-     *                  parameter specifies the callback function or
-     *                  method.  In other error modes this parameter
-     *                  is ignored.
-     *
-     * @param string $userinfo If you need to pass along for example debug
-     *                  information, this parameter is meant for that.
-     *
-     * @param string $error_class The returned error object will be
-     *                  instantiated from this class, if specified.
-     *
-     * @param bool $skipmsg If true, raiseError will only pass error codes,
-     *                  the error message parameter will be dropped.
-     *
-     * @access public
-     * @return object   a PEAR error object
-     * @see PEAR::setErrorHandling
-     * @since PHP 4.0.5
-     */
-    function raiseError($message = null,
-                         $code = null,
-                         $mode = null,
-                         $options = null,
-                         $userinfo = null,
-                         $error_class = null,
-                         $skipmsg = false)
-    {
-        // The error is yet a PEAR error object
-        if (is_object($message)) {
-            $code        = $message->getCode();
-            $userinfo    = $message->getUserInfo();
-            $error_class = $message->getType();
-            $message->error_message_prefix = '';
-            $message     = $message->getMessage();
-        }
-
-        if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) {
-            if ($exp[0] == "*" ||
-                (is_int(reset($exp)) && in_array($code, $exp)) ||
-                (is_string(reset($exp)) && in_array($message, $exp))) {
-                $mode = PEAR_ERROR_RETURN;
-            }
-        }
-        // No mode given, try global ones
-        if ($mode === null) {
-            // Class error handler
-            if (isset($this) && isset($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
-            // Global error handler
-            } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
-                $mode    = $GLOBALS['_PEAR_default_error_mode'];
-                $options = $GLOBALS['_PEAR_default_error_options'];
-            }
-        }
-
-        if ($error_class !== null) {
-            $ec = $error_class;
-        } elseif (isset($this) && isset($this->_error_class)) {
-            $ec = $this->_error_class;
-        } else {
-            $ec = 'PEAR_Error';
-        }
-        if ($skipmsg) {
-            return new $ec($code, $mode, $options, $userinfo);
-        } else {
-            return new $ec($message, $code, $mode, $options, $userinfo);
-        }
-    }
-
-    // }}}
-    // {{{ throwError()
-
-    /**
-     * Simpler form of raiseError with fewer options.  In most cases
-     * message, code and userinfo are enough.
-     *
-     * @param string $message
-     *
-     */
-    function throwError($message = null,
-                         $code = null,
-                         $userinfo = null)
-    {
-        if (isset($this) && $this instanceof PEAR) {
-            return $this->raiseError($message, $code, null, null, $userinfo);
-        } else {
-            return PEAR::raiseError($message, $code, null, null, $userinfo);
-        }
-    }
-
-    // }}}
-    function staticPushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-        $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        $stack[] = array($def_mode, $def_options);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $def_mode = $mode;
-                $def_options = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $def_mode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $def_options = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    function staticPopErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-        $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        return true;
-    }
-
-    // {{{ pushErrorHandling()
-
-    /**
-     * Push a new error handler on top of the error handler options stack. With this
-     * you can easily override the actual error handler for some code and restore
-     * it later with popErrorHandling.
-     *
-     * @param mixed $mode (same as setErrorHandling)
-     * @param mixed $options (same as setErrorHandling)
-     *
-     * @return bool Always true
-     *
-     * @see PEAR::setErrorHandling
-     */
-    function pushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        if (isset($this) && $this instanceof PEAR) {
-            $def_mode    = &$this->_default_error_mode;
-            $def_options = &$this->_default_error_options;
-        } else {
-            $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-            $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        }
-        $stack[] = array($def_mode, $def_options);
-
-        if (isset($this) && $this instanceof PEAR) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    // }}}
-    // {{{ popErrorHandling()
-
-    /**
-    * Pop the last error handler used
-    *
-    * @return bool Always true
-    *
-    * @see PEAR::pushErrorHandling
-    */
-    function popErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        if (isset($this) && $this instanceof PEAR) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ loadExtension()
-
-    /**
-    * OS independant PHP extension load. Remember to take care
-    * on the correct extension name for case sensitive OSes.
-    *
-    * @param string $ext The extension name
-    * @return bool Success or not on the dl() call
-    */
-    function loadExtension($ext)
-    {
-        if (!extension_loaded($ext)) {
-            // if either returns true dl() will produce a FATAL error, stop that
-            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
-                return false;
-            }
-            if (OS_WINDOWS) {
-                $suffix = '.dll';
-            } elseif (PHP_OS == 'HP-UX') {
-                $suffix = '.sl';
-            } elseif (PHP_OS == 'AIX') {
-                $suffix = '.a';
-            } elseif (PHP_OS == 'OSX') {
-                $suffix = '.bundle';
-            } else {
-                $suffix = '.so';
-            }
-            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
-        }
-        return true;
-    }
-
-    // }}}
-}
-
-// {{{ _PEAR_call_destructors()
-
-function _PEAR_call_destructors()
-{
-    global $_PEAR_destructor_object_list;
-    if (is_array($_PEAR_destructor_object_list) &&
-        sizeof($_PEAR_destructor_object_list))
-    {
-        reset($_PEAR_destructor_object_list);
-        if (@PEAR::getStaticProperty('PEAR', 'destructlifo')) {
-            $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
-        }
-        while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
-            $classname = get_class($objref);
-            while ($classname) {
-                $destructor = "_$classname";
-                if (method_exists($objref, $destructor)) {
-                    $objref->$destructor();
-                    break;
-                } else {
-                    $classname = get_parent_class($classname);
-                }
-            }
-        }
-        // Empty the object list to ensure that destructors are
-        // not called more than once.
-        $_PEAR_destructor_object_list = array();
-    }
-
-    // Now call the shutdown functions
-    if (is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
-        foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
-            call_user_func_array($value[0], $value[1]);
-        }
-    }
-}
-
-// }}}
-
-class PEAR_Error
-{
-    // {{{ properties
-
-    var $error_message_prefix = '';
-    var $mode                 = PEAR_ERROR_RETURN;
-    var $level                = E_USER_NOTICE;
-    var $code                 = -1;
-    var $message              = '';
-    var $userinfo             = '';
-    var $backtrace            = null;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Error constructor
-     *
-     * @param string $message  message
-     *
-     * @param int $code     (optional) error code
-     *
-     * @param int $mode     (optional) error mode, one of: PEAR_ERROR_RETURN,
-     * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
-     * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
-     *
-     * @param mixed $options   (optional) error level, _OR_ in the case of
-     * PEAR_ERROR_CALLBACK, the callback function or object/method
-     * tuple.
-     *
-     * @param string $userinfo (optional) additional user/debug info
-     *
-     * @access public
-     *
-     */
-    function PEAR_Error($message = 'unknown error', $code = null,
-                        $mode = null, $options = null, $userinfo = null)
-    {
-        if ($mode === null) {
-            $mode = PEAR_ERROR_RETURN;
-        }
-        $this->message   = $message;
-        $this->code      = $code;
-        $this->mode      = $mode;
-        $this->userinfo  = $userinfo;
-        if (function_exists("debug_backtrace")) {
-            if (@!PEAR::getStaticProperty('PEAR_Error', 'skiptrace')) {
-                $this->backtrace = debug_backtrace();
-            }
-        }
-        if ($mode & PEAR_ERROR_CALLBACK) {
-            $this->level = E_USER_NOTICE;
-            $this->callback = $options;
-        } else {
-            if ($options === null) {
-                $options = E_USER_NOTICE;
-            }
-            $this->level = $options;
-            $this->callback = null;
-        }
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-            } else {
-                $format = $options;
-            }
-            printf($format, $this->getMessage());
-        }
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            trigger_error($this->getMessage(), $this->level);
-        }
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $msg = $this->getMessage();
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-                if (substr($msg, -1) != "\n") {
-                    $msg .= "\n";
-                }
-            } else {
-                $format = $options;
-            }
-            die(sprintf($format, $msg));
-        }
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_callable($this->callback)) {
-                call_user_func($this->callback, $this);
-            }
-        }
-        if ($this->mode & PEAR_ERROR_EXCEPTION) {
-            trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_ErrorStack for exceptions", E_USER_WARNING);
-            eval('$e = new Exception($this->message, $this->code);$e->PEAR_Error = $this;throw($e);');
-        }
-    }
-
-    // }}}
-    // {{{ getMode()
-
-    /**
-     * Get the error mode from an error object.
-     *
-     * @return int error mode
-     * @access public
-     */
-    function getMode() {
-        return $this->mode;
-    }
-
-    // }}}
-    // {{{ getCallback()
-
-    /**
-     * Get the callback function/method from an error object.
-     *
-     * @return mixed callback function or object/method array
-     * @access public
-     */
-    function getCallback() {
-        return $this->callback;
-    }
-
-    // }}}
-    // {{{ getMessage()
-
-
-    /**
-     * Get the error message from an error object.
-     *
-     * @return  string  full error message
-     * @access public
-     */
-    function getMessage()
-    {
-        return ($this->error_message_prefix . $this->message);
-    }
-
-
-    // }}}
-    // {{{ getCode()
-
-    /**
-     * Get error code from an error object
-     *
-     * @return int error code
-     * @access public
-     */
-     function getCode()
-     {
-        return $this->code;
-     }
-
-    // }}}
-    // {{{ getType()
-
-    /**
-     * Get the name of this error/exception.
-     *
-     * @return string error/exception name (type)
-     * @access public
-     */
-    function getType()
-    {
-        return get_class($this);
-    }
-
-    // }}}
-    // {{{ getUserInfo()
-
-    /**
-     * Get additional user-supplied information.
-     *
-     * @return string user-supplied information
-     * @access public
-     */
-    function getUserInfo()
-    {
-        return $this->userinfo;
-    }
-
-    // }}}
-    // {{{ getDebugInfo()
-
-    /**
-     * Get additional debug information supplied by the application.
-     *
-     * @return string debug information
-     * @access public
-     */
-    function getDebugInfo()
-    {
-        return $this->getUserInfo();
-    }
-
-    // }}}
-    // {{{ getBacktrace()
-
-    /**
-     * Get the call backtrace from where the error was generated.
-     * Supported with PHP 4.3.0 or newer.
-     *
-     * @param int $frame (optional) what frame to fetch
-     * @return array Backtrace, or NULL if not available.
-     * @access public
-     */
-    function getBacktrace($frame = null)
-    {
-        if ($frame === null) {
-            return $this->backtrace;
-        }
-        return $this->backtrace[$frame];
-    }
-
-    // }}}
-    // {{{ addUserInfo()
-
-    function addUserInfo($info)
-    {
-        if (empty($this->userinfo)) {
-            $this->userinfo = $info;
-        } else {
-            $this->userinfo .= " ** $info";
-        }
-    }
-
-    // }}}
-    // {{{ toString()
-
-    /**
-     * Make a string representation of this object.
-     *
-     * @return string a string with an object summary
-     * @access public
-     */
-    function toString() {
-        $modes = array();
-        $levels = array(E_USER_NOTICE  => 'notice',
-                        E_USER_WARNING => 'warning',
-                        E_USER_ERROR   => 'error');
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_array($this->callback)) {
-                $callback = (is_object($this->callback[0]) ?
-                    strtolower(get_class($this->callback[0])) :
-                    $this->callback[0]) . '::' .
-                    $this->callback[1];
-            } else {
-                $callback = $this->callback;
-            }
-            return sprintf('[%s: message="%s" code=%d mode=callback '.
-                           'callback=%s prefix="%s" info="%s"]',
-                           strtolower(get_class($this)), $this->message, $this->code,
-                           $callback, $this->error_message_prefix,
-                           $this->userinfo);
-        }
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            $modes[] = 'print';
-        }
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            $modes[] = 'trigger';
-        }
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $modes[] = 'die';
-        }
-        if ($this->mode & PEAR_ERROR_RETURN) {
-            $modes[] = 'return';
-        }
-        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
-                       'prefix="%s" info="%s"]',
-                       strtolower(get_class($this)), $this->message, $this->code,
-                       implode("|", $modes), $levels[$this->level],
-                       $this->error_message_prefix,
-                       $this->userinfo);
-    }
-
-    // }}}
-}
-
-/*
- * Local Variables:
- * mode: php
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-?>
diff --git a/3rdparty/PEAR/Autoloader.php b/3rdparty/PEAR/Autoloader.php
deleted file mode 100644
index de0278d6191..00000000000
--- a/3rdparty/PEAR/Autoloader.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-// /* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Stig Bakken <ssb@php.net>                                    |
-// |                                                                      |
-// +----------------------------------------------------------------------+
-//
-// $Id: Autoloader.php,v 1.11 2004/02/27 02:21:29 cellog Exp $
-
-if (!extension_loaded("overload")) {
-    // die hard without ext/overload
-    die("Rebuild PHP with the `overload' extension to use PEAR_Autoloader");
-}
-
-require_once "PEAR.php";
-
-/**
- * This class is for objects where you want to separate the code for
- * some methods into separate classes.  This is useful if you have a
- * class with not-frequently-used methods that contain lots of code
- * that you would like to avoid always parsing.
- *
- * The PEAR_Autoloader class provides autoloading and aggregation.
- * The autoloading lets you set up in which classes the separated
- * methods are found.  Aggregation is the technique used to import new
- * methods, an instance of each class providing separated methods is
- * stored and called every time the aggregated method is called.
- *
- * @author Stig Sæther Bakken <ssb@php.net>
- */
-class PEAR_Autoloader extends PEAR
-{
-    // {{{ properties
-
-    /**
-     * Map of methods and classes where they are defined
-     *
-     * @var array
-     *
-     * @access private
-     */
-    var $_autoload_map = array();
-
-    /**
-     * Map of methods and aggregate objects
-     *
-     * @var array
-     *
-     * @access private
-     */
-    var $_method_map = array();
-
-    // }}}
-    // {{{ addAutoload()
-
-    /**
-     * Add one or more autoload entries.
-     *
-     * @param string $method     which method to autoload
-     *
-     * @param string $classname  (optional) which class to find the method in.
-     *                           If the $method parameter is an array, this
-     *                           parameter may be omitted (and will be ignored
-     *                           if not), and the $method parameter will be
-     *                           treated as an associative array with method
-     *                           names as keys and class names as values.
-     *
-     * @return void
-     *
-     * @access public
-     */
-    function addAutoload($method, $classname = null)
-    {
-        if (is_array($method)) {
-            array_walk($method, create_function('$a,&$b', '$b = strtolower($b);'));
-            $this->_autoload_map = array_merge($this->_autoload_map, $method);
-        } else {
-            $this->_autoload_map[strtolower($method)] = $classname;
-        }
-    }
-
-    // }}}
-    // {{{ removeAutoload()
-
-    /**
-     * Remove an autoload entry.
-     *
-     * @param string $method  which method to remove the autoload entry for
-     *
-     * @return bool TRUE if an entry was removed, FALSE if not
-     *
-     * @access public
-     */
-    function removeAutoload($method)
-    {
-        $method = strtolower($method);
-        $ok = isset($this->_autoload_map[$method]);
-        unset($this->_autoload_map[$method]);
-        return $ok;
-    }
-
-    // }}}
-    // {{{ addAggregateObject()
-
-    /**
-     * Add an aggregate object to this object.  If the specified class
-     * is not defined, loading it will be attempted following PEAR's
-     * file naming scheme.  All the methods in the class will be
-     * aggregated, except private ones (name starting with an
-     * underscore) and constructors.
-     *
-     * @param string $classname  what class to instantiate for the object.
-     *
-     * @return void
-     *
-     * @access public
-     */
-    function addAggregateObject($classname)
-    {
-        $classname = strtolower($classname);
-        if (!class_exists($classname)) {
-            $include_file = preg_replace('/[^a-z0-9]/i', '_', $classname);
-            include_once $include_file;
-        }
-        $obj =& new $classname;
-        $methods = get_class_methods($classname);
-        foreach ($methods as $method) {
-            // don't import priviate methods and constructors
-            if ($method{0} != '_' && $method != $classname) {
-                $this->_method_map[$method] = $obj;
-            }
-        }
-    }
-
-    // }}}
-    // {{{ removeAggregateObject()
-
-    /**
-     * Remove an aggregate object.
-     *
-     * @param string $classname  the class of the object to remove
-     *
-     * @return bool  TRUE if an object was removed, FALSE if not
-     *
-     * @access public
-     */
-    function removeAggregateObject($classname)
-    {
-        $ok = false;
-        $classname = strtolower($classname);
-        reset($this->_method_map);
-        while (list($method, $obj) = each($this->_method_map)) {
-            if (is_a($obj, $classname)) {
-                unset($this->_method_map[$method]);
-                $ok = true;
-            }
-        }
-        return $ok;
-    }
-
-    // }}}
-    // {{{ __call()
-
-    /**
-     * Overloaded object call handler, called each time an
-     * undefined/aggregated method is invoked.  This method repeats
-     * the call in the right aggregate object and passes on the return
-     * value.
-     *
-     * @param string $method  which method that was called
-     *
-     * @param string $args    An array of the parameters passed in the
-     *                        original call
-     *
-     * @return mixed  The return value from the aggregated method, or a PEAR
-     *                error if the called method was unknown.
-     */
-    function __call($method, $args, &$retval)
-    {
-        $method = strtolower($method);
-        if (empty($this->_method_map[$method]) && isset($this->_autoload_map[$method])) {
-            $this->addAggregateObject($this->_autoload_map[$method]);
-        }
-        if (isset($this->_method_map[$method])) {
-            $retval = call_user_func_array(array($this->_method_map[$method], $method), $args);
-            return true;
-        }
-        return false;
-    }
-
-    // }}}
-}
-
-overload("PEAR_Autoloader");
-
-?>
diff --git a/3rdparty/PEAR/Builder.php b/3rdparty/PEAR/Builder.php
deleted file mode 100644
index 4f6cc135d1e..00000000000
--- a/3rdparty/PEAR/Builder.php
+++ /dev/null
@@ -1,426 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Stig Sæther Bakken <ssb@php.net>                            |
-// +----------------------------------------------------------------------+
-//
-// $Id: Builder.php,v 1.16.2.3 2005/02/17 17:55:01 cellog Exp $
-
-require_once 'PEAR/Common.php';
-
-/**
- * Class to handle building (compiling) extensions.
- *
- * @author Stig Sæther Bakken <ssb@php.net>
- */
-class PEAR_Builder extends PEAR_Common
-{
-    // {{{ properties
-
-    var $php_api_version = 0;
-    var $zend_module_api_no = 0;
-    var $zend_extension_api_no = 0;
-
-    var $extensions_built = array();
-
-    var $current_callback = null;
-
-    // used for msdev builds
-    var $_lastline = null;
-    var $_firstline = null;
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Builder constructor.
-     *
-     * @param object $ui user interface object (instance of PEAR_Frontend_*)
-     *
-     * @access public
-     */
-    function PEAR_Builder(&$ui)
-    {
-        parent::PEAR_Common();
-        $this->setFrontendObject($ui);
-    }
-
-    // }}}
-
-    // {{{ _build_win32()
-
-    /**
-     * Build an extension from source on windows.
-     * requires msdev
-     */
-    function _build_win32($descfile, $callback = null)
-    {
-        if (PEAR::isError($info = $this->infoFromDescriptionFile($descfile))) {
-            return $info;
-        }
-        $dir = dirname($descfile);
-        $old_cwd = getcwd();
-
-        if (!@chdir($dir)) {
-            return $this->raiseError("could not chdir to $dir");
-        }
-        $this->log(2, "building in $dir");
-
-        $dsp = $info['package'].'.dsp';
-        if (!@is_file("$dir/$dsp")) {
-            return $this->raiseError("The DSP $dsp does not exist.");
-        }
-        // XXX TODO: make release build type configurable
-        $command = 'msdev '.$dsp.' /MAKE "'.$info['package']. ' - Release"';
-
-        $this->current_callback = $callback;
-        $err = $this->_runCommand($command, array(&$this, 'msdevCallback'));
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-
-        // figure out the build platform and type
-        $platform = 'Win32';
-        $buildtype = 'Release';
-        if (preg_match('/.*?'.$info['package'].'\s-\s(\w+)\s(.*?)-+/i',$this->_firstline,$matches)) {
-            $platform = $matches[1];
-            $buildtype = $matches[2];
-        }
-
-        if (preg_match('/(.*)?\s-\s(\d+).*?(\d+)/',$this->_lastline,$matches)) {
-            if ($matches[2]) {
-                // there were errors in the build
-                return $this->raiseError("There were errors during compilation.");
-            }
-            $out = $matches[1];
-        } else {
-            return $this->raiseError("Did not understand the completion status returned from msdev.exe.");
-        }
-
-        // msdev doesn't tell us the output directory :/
-        // open the dsp, find /out and use that directory
-        $dsptext = join(file($dsp),'');
-
-        // this regex depends on the build platform and type having been
-        // correctly identified above.
-        $regex ='/.*?!IF\s+"\$\(CFG\)"\s+==\s+("'.
-                    $info['package'].'\s-\s'.
-                    $platform.'\s'.
-                    $buildtype.'").*?'.
-                    '\/out:"(.*?)"/is';
-
-        if ($dsptext && preg_match($regex,$dsptext,$matches)) {
-            // what we get back is a relative path to the output file itself.
-            $outfile = realpath($matches[2]);
-        } else {
-            return $this->raiseError("Could not retrieve output information from $dsp.");
-        }
-        if (@copy($outfile, "$dir/$out")) {
-            $outfile = "$dir/$out";
-        }
-
-        $built_files[] = array(
-            'file' => "$outfile",
-            'php_api' => $this->php_api_version,
-            'zend_mod_api' => $this->zend_module_api_no,
-            'zend_ext_api' => $this->zend_extension_api_no,
-            );
-
-        return $built_files;
-    }
-    // }}}
-
-    // {{{ msdevCallback()
-    function msdevCallback($what, $data)
-    {
-        if (!$this->_firstline)
-            $this->_firstline = $data;
-        $this->_lastline = $data;
-    }
-    // }}}
-
-    // {{{ _harventInstDir
-    /**
-     * @param string
-     * @param string
-     * @param array
-     * @access private
-     */
-    function _harvestInstDir($dest_prefix, $dirname, &$built_files)
-    {
-        $d = opendir($dirname);
-        if (!$d)
-            return false;
-
-        $ret = true;
-        while (($ent = readdir($d)) !== false) {
-            if ($ent{0} == '.')
-                continue;
-
-            $full = $dirname . DIRECTORY_SEPARATOR . $ent;
-            if (is_dir($full)) {
-                if (!$this->_harvestInstDir(
-                        $dest_prefix . DIRECTORY_SEPARATOR . $ent,
-                        $full, $built_files)) {
-                    $ret = false;
-                    break;
-                }
-            } else {
-                $dest = $dest_prefix . DIRECTORY_SEPARATOR . $ent;
-                $built_files[] = array(
-                        'file' => $full,
-                        'dest' => $dest,
-                        'php_api' => $this->php_api_version,
-                        'zend_mod_api' => $this->zend_module_api_no,
-                        'zend_ext_api' => $this->zend_extension_api_no,
-                        );
-            }
-        }
-        closedir($d);
-        return $ret;
-    }
-
-    // }}}
-
-    // {{{ build()
-
-    /**
-     * Build an extension from source.  Runs "phpize" in the source
-     * directory, but compiles in a temporary directory
-     * (/var/tmp/pear-build-USER/PACKAGE-VERSION).
-     *
-     * @param string $descfile path to XML package description file
-     *
-     * @param mixed $callback callback function used to report output,
-     * see PEAR_Builder::_runCommand for details
-     *
-     * @return array an array of associative arrays with built files,
-     * format:
-     * array( array( 'file' => '/path/to/ext.so',
-     *               'php_api' => YYYYMMDD,
-     *               'zend_mod_api' => YYYYMMDD,
-     *               'zend_ext_api' => YYYYMMDD ),
-     *        ... )
-     *
-     * @access public
-     *
-     * @see PEAR_Builder::_runCommand
-     * @see PEAR_Common::infoFromDescriptionFile
-     */
-    function build($descfile, $callback = null)
-    {
-        if (PEAR_OS == "Windows") {
-            return $this->_build_win32($descfile,$callback);
-        }
-        if (PEAR_OS != 'Unix') {
-            return $this->raiseError("building extensions not supported on this platform");
-        }
-        if (PEAR::isError($info = $this->infoFromDescriptionFile($descfile))) {
-            return $info;
-        }
-        $dir = dirname($descfile);
-        $old_cwd = getcwd();
-        if (!@chdir($dir)) {
-            return $this->raiseError("could not chdir to $dir");
-        }
-        $vdir = "$info[package]-$info[version]";
-        if (is_dir($vdir)) {
-            chdir($vdir);
-        }
-        $dir = getcwd();
-        $this->log(2, "building in $dir");
-        $this->current_callback = $callback;
-        putenv('PATH=' . $this->config->get('bin_dir') . ':' . getenv('PATH'));
-        $err = $this->_runCommand("phpize", array(&$this, 'phpizeCallback'));
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-        if (!$err) {
-            return $this->raiseError("`phpize' failed");
-        }
-
-        // {{{ start of interactive part
-        $configure_command = "$dir/configure";
-        if (isset($info['configure_options'])) {
-            foreach ($info['configure_options'] as $o) {
-                list($r) = $this->ui->userDialog('build',
-                                                 array($o['prompt']),
-                                                 array('text'),
-                                                 array(@$o['default']));
-                if (substr($o['name'], 0, 5) == 'with-' &&
-                    ($r == 'yes' || $r == 'autodetect')) {
-                    $configure_command .= " --$o[name]";
-                } else {
-                    $configure_command .= " --$o[name]=".trim($r);
-                }
-            }
-        }
-        // }}} end of interactive part
-
-        // FIXME make configurable
-        if(!$user=getenv('USER')){
-            $user='defaultuser';
-        }
-        $build_basedir = "/var/tmp/pear-build-$user";
-        $build_dir = "$build_basedir/$info[package]-$info[version]";
-        $inst_dir = "$build_basedir/install-$info[package]-$info[version]";
-        $this->log(1, "building in $build_dir");
-        if (is_dir($build_dir)) {
-            System::rm('-rf', $build_dir);
-        }
-        if (!System::mkDir(array('-p', $build_dir))) {
-            return $this->raiseError("could not create build dir: $build_dir");
-        }
-        $this->addTempFile($build_dir);
-        if (!System::mkDir(array('-p', $inst_dir))) {
-            return $this->raiseError("could not create temporary install dir: $inst_dir");
-        }
-        $this->addTempFile($inst_dir);
-
-        if (getenv('MAKE')) {
-            $make_command = getenv('MAKE');
-        } else {
-            $make_command = 'make';
-        }
-        $to_run = array(
-            $configure_command,
-            $make_command,
-            "$make_command INSTALL_ROOT=\"$inst_dir\" install",
-            "find \"$inst_dir\" -ls"
-            );
-        if (!@chdir($build_dir)) {
-            return $this->raiseError("could not chdir to $build_dir");
-        }
-        putenv('PHP_PEAR_VERSION=@PEAR-VER@');
-        foreach ($to_run as $cmd) {
-            $err = $this->_runCommand($cmd, $callback);
-            if (PEAR::isError($err)) {
-                chdir($old_cwd);
-                return $err;
-            }
-            if (!$err) {
-                chdir($old_cwd);
-                return $this->raiseError("`$cmd' failed");
-            }
-        }
-        if (!($dp = opendir("modules"))) {
-            chdir($old_cwd);
-            return $this->raiseError("no `modules' directory found");
-        }
-        $built_files = array();
-        $prefix = exec("php-config --prefix");
-        $this->_harvestInstDir($prefix, $inst_dir . DIRECTORY_SEPARATOR . $prefix, $built_files);
-        chdir($old_cwd);
-        return $built_files;
-    }
-
-    // }}}
-    // {{{ phpizeCallback()
-
-    /**
-     * Message callback function used when running the "phpize"
-     * program.  Extracts the API numbers used.  Ignores other message
-     * types than "cmdoutput".
-     *
-     * @param string $what the type of message
-     * @param mixed $data the message
-     *
-     * @return void
-     *
-     * @access public
-     */
-    function phpizeCallback($what, $data)
-    {
-        if ($what != 'cmdoutput') {
-            return;
-        }
-        $this->log(1, rtrim($data));
-        if (preg_match('/You should update your .aclocal.m4/', $data)) {
-            return;
-        }
-        $matches = array();
-        if (preg_match('/^\s+(\S[^:]+):\s+(\d{8})/', $data, $matches)) {
-            $member = preg_replace('/[^a-z]/', '_', strtolower($matches[1]));
-            $apino = (int)$matches[2];
-            if (isset($this->$member)) {
-                $this->$member = $apino;
-                //$msg = sprintf("%-22s : %d", $matches[1], $apino);
-                //$this->log(1, $msg);
-            }
-        }
-    }
-
-    // }}}
-    // {{{ _runCommand()
-
-    /**
-     * Run an external command, using a message callback to report
-     * output.  The command will be run through popen and output is
-     * reported for every line with a "cmdoutput" message with the
-     * line string, including newlines, as payload.
-     *
-     * @param string $command the command to run
-     *
-     * @param mixed $callback (optional) function to use as message
-     * callback
-     *
-     * @return bool whether the command was successful (exit code 0
-     * means success, any other means failure)
-     *
-     * @access private
-     */
-    function _runCommand($command, $callback = null)
-    {
-        $this->log(1, "running: $command");
-        $pp = @popen("$command 2>&1", "r");
-        if (!$pp) {
-            return $this->raiseError("failed to run `$command'");
-        }
-        if ($callback && $callback[0]->debug == 1) {
-            $olddbg = $callback[0]->debug;
-            $callback[0]->debug = 2;
-        }
-
-        while ($line = fgets($pp, 1024)) {
-            if ($callback) {
-                call_user_func($callback, 'cmdoutput', $line);
-            } else {
-                $this->log(2, rtrim($line));
-            }
-        }
-        if ($callback && isset($olddbg)) {
-            $callback[0]->debug = $olddbg;
-        }
-        $exitcode = @pclose($pp);
-        return ($exitcode == 0);
-    }
-
-    // }}}
-    // {{{ log()
-
-    function log($level, $msg)
-    {
-        if ($this->current_callback) {
-            if ($this->debug >= $level) {
-                call_user_func($this->current_callback, 'output', $msg);
-            }
-            return;
-        }
-        return PEAR_Common::log($level, $msg);
-    }
-
-    // }}}
-}
-
-?>
diff --git a/3rdparty/PEAR/Command.php b/3rdparty/PEAR/Command.php
deleted file mode 100644
index 2ea68743d20..00000000000
--- a/3rdparty/PEAR/Command.php
+++ /dev/null
@@ -1,398 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Stig Bakken <ssb@php.net>                                    |
-// +----------------------------------------------------------------------+
-//
-// $Id: Command.php,v 1.24 2004/05/16 15:43:30 pajoye Exp $
-
-
-require_once "PEAR.php";
-
-/**
- * List of commands and what classes they are implemented in.
- * @var array command => implementing class
- */
-$GLOBALS['_PEAR_Command_commandlist'] = array();
-
-/**
- * List of shortcuts to common commands.
- * @var array shortcut => command
- */
-$GLOBALS['_PEAR_Command_shortcuts'] = array();
-
-/**
- * Array of command objects
- * @var array class => object
- */
-$GLOBALS['_PEAR_Command_objects'] = array();
-
-/**
- * Which user interface class is being used.
- * @var string class name
- */
-$GLOBALS['_PEAR_Command_uiclass'] = 'PEAR_Frontend_CLI';
-
-/**
- * Instance of $_PEAR_Command_uiclass.
- * @var object
- */
-$GLOBALS['_PEAR_Command_uiobject'] = null;
-
-/**
- * PEAR command class, a simple factory class for administrative
- * commands.
- *
- * How to implement command classes:
- *
- * - The class must be called PEAR_Command_Nnn, installed in the
- *   "PEAR/Common" subdir, with a method called getCommands() that
- *   returns an array of the commands implemented by the class (see
- *   PEAR/Command/Install.php for an example).
- *
- * - The class must implement a run() function that is called with three
- *   params:
- *
- *    (string) command name
- *    (array)  assoc array with options, freely defined by each
- *             command, for example:
- *             array('force' => true)
- *    (array)  list of the other parameters
- *
- *   The run() function returns a PEAR_CommandResponse object.  Use
- *   these methods to get information:
- *
- *    int getStatus()   Returns PEAR_COMMAND_(SUCCESS|FAILURE|PARTIAL)
- *                      *_PARTIAL means that you need to issue at least
- *                      one more command to complete the operation
- *                      (used for example for validation steps).
- *
- *    string getMessage()  Returns a message for the user.  Remember,
- *                         no HTML or other interface-specific markup.
- *
- *   If something unexpected happens, run() returns a PEAR error.
- *
- * - DON'T OUTPUT ANYTHING! Return text for output instead.
- *
- * - DON'T USE HTML! The text you return will be used from both Gtk,
- *   web and command-line interfaces, so for now, keep everything to
- *   plain text.
- *
- * - DON'T USE EXIT OR DIE! Always use pear errors.  From static
- *   classes do PEAR::raiseError(), from other classes do
- *   $this->raiseError().
- */
-class PEAR_Command
-{
-    // {{{ factory()
-
-    /**
-     * Get the right object for executing a command.
-     *
-     * @param string $command The name of the command
-     * @param object $config  Instance of PEAR_Config object
-     *
-     * @return object the command object or a PEAR error
-     *
-     * @access public
-     * @static
-     */
-    function factory($command, &$config)
-    {
-        if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
-            PEAR_Command::registerCommands();
-        }
-        if (isset($GLOBALS['_PEAR_Command_shortcuts'][$command])) {
-            $command = $GLOBALS['_PEAR_Command_shortcuts'][$command];
-        }
-        if (!isset($GLOBALS['_PEAR_Command_commandlist'][$command])) {
-            return PEAR::raiseError("unknown command `$command'");
-        }
-        $class = $GLOBALS['_PEAR_Command_commandlist'][$command];
-        if (!class_exists($class)) {
-            return PEAR::raiseError("unknown command `$command'");
-        }
-        $ui =& PEAR_Command::getFrontendObject();
-        $obj = &new $class($ui, $config);
-        return $obj;
-    }
-
-    // }}}
-    // {{{ & getFrontendObject()
-
-    /**
-     * Get instance of frontend object.
-     *
-     * @return object
-     * @static
-     */
-    function &getFrontendObject()
-    {
-        if (empty($GLOBALS['_PEAR_Command_uiobject'])) {
-            $GLOBALS['_PEAR_Command_uiobject'] = &new $GLOBALS['_PEAR_Command_uiclass'];
-        }
-        return $GLOBALS['_PEAR_Command_uiobject'];
-    }
-
-    // }}}
-    // {{{ & setFrontendClass()
-
-    /**
-     * Load current frontend class.
-     *
-     * @param string $uiclass Name of class implementing the frontend
-     *
-     * @return object the frontend object, or a PEAR error
-     * @static
-     */
-    function &setFrontendClass($uiclass)
-    {
-        if (is_object($GLOBALS['_PEAR_Command_uiobject']) &&
-              is_a($GLOBALS['_PEAR_Command_uiobject'], $uiclass)) {
-            return $GLOBALS['_PEAR_Command_uiobject'];
-        }
-        if (!class_exists($uiclass)) {
-            $file = str_replace('_', '/', $uiclass) . '.php';
-            if (PEAR_Command::isIncludeable($file)) {
-                include_once $file;
-            }
-        }
-        if (class_exists($uiclass)) {
-            $obj = &new $uiclass;
-            // quick test to see if this class implements a few of the most
-            // important frontend methods
-            if (method_exists($obj, 'userConfirm')) {
-                $GLOBALS['_PEAR_Command_uiobject'] = &$obj;
-                $GLOBALS['_PEAR_Command_uiclass'] = $uiclass;
-                return $obj;
-            } else {
-                $err = PEAR::raiseError("not a frontend class: $uiclass");
-                return $err;
-            }
-        }
-        $err = PEAR::raiseError("no such class: $uiclass");
-        return $err;
-    }
-
-    // }}}
-    // {{{ setFrontendType()
-
-    // }}}
-    // {{{ isIncludeable()
-
-    /**
-     * @param string $path relative or absolute include path
-     * @return boolean
-     * @static
-     */
-    function isIncludeable($path)
-    {
-        if (file_exists($path) && is_readable($path)) {
-            return true;
-        }
-        $ipath = explode(PATH_SEPARATOR, ini_get('include_path'));
-        foreach ($ipath as $include) {
-            $test = realpath($include . DIRECTORY_SEPARATOR . $path);
-            if (file_exists($test) && is_readable($test)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Set current frontend.
-     *
-     * @param string $uitype Name of the frontend type (for example "CLI")
-     *
-     * @return object the frontend object, or a PEAR error
-     * @static
-     */
-    function setFrontendType($uitype)
-    {
-        $uiclass = 'PEAR_Frontend_' . $uitype;
-        return PEAR_Command::setFrontendClass($uiclass);
-    }
-
-    // }}}
-    // {{{ registerCommands()
-
-    /**
-     * Scan through the Command directory looking for classes
-     * and see what commands they implement.
-     *
-     * @param bool   (optional) if FALSE (default), the new list of
-     *               commands should replace the current one.  If TRUE,
-     *               new entries will be merged with old.
-     *
-     * @param string (optional) where (what directory) to look for
-     *               classes, defaults to the Command subdirectory of
-     *               the directory from where this file (__FILE__) is
-     *               included.
-     *
-     * @return bool TRUE on success, a PEAR error on failure
-     *
-     * @access public
-     * @static
-     */
-    function registerCommands($merge = false, $dir = null)
-    {
-        if ($dir === null) {
-            $dir = dirname(__FILE__) . '/Command';
-        }
-        $dp = @opendir($dir);
-        if (empty($dp)) {
-            return PEAR::raiseError("registerCommands: opendir($dir) failed");
-        }
-        if (!$merge) {
-            $GLOBALS['_PEAR_Command_commandlist'] = array();
-        }
-        while ($entry = readdir($dp)) {
-            if ($entry{0} == '.' || substr($entry, -4) != '.php' || $entry == 'Common.php') {
-                continue;
-            }
-            $class = "PEAR_Command_".substr($entry, 0, -4);
-            $file = "$dir/$entry";
-            include_once $file;
-            // List of commands
-            if (empty($GLOBALS['_PEAR_Command_objects'][$class])) {
-                $GLOBALS['_PEAR_Command_objects'][$class] = &new $class($ui, $config);
-            }
-            $implements = $GLOBALS['_PEAR_Command_objects'][$class]->getCommands();
-            foreach ($implements as $command => $desc) {
-                $GLOBALS['_PEAR_Command_commandlist'][$command] = $class;
-                $GLOBALS['_PEAR_Command_commanddesc'][$command] = $desc;
-            }
-            $shortcuts = $GLOBALS['_PEAR_Command_objects'][$class]->getShortcuts();
-            foreach ($shortcuts as $shortcut => $command) {
-                $GLOBALS['_PEAR_Command_shortcuts'][$shortcut] = $command;
-            }
-        }
-        @closedir($dp);
-        return true;
-    }
-
-    // }}}
-    // {{{ getCommands()
-
-    /**
-     * Get the list of currently supported commands, and what
-     * classes implement them.
-     *
-     * @return array command => implementing class
-     *
-     * @access public
-     * @static
-     */
-    function getCommands()
-    {
-        if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
-            PEAR_Command::registerCommands();
-        }
-        return $GLOBALS['_PEAR_Command_commandlist'];
-    }
-
-    // }}}
-    // {{{ getShortcuts()
-
-    /**
-     * Get the list of command shortcuts.
-     *
-     * @return array shortcut => command
-     *
-     * @access public
-     * @static
-     */
-    function getShortcuts()
-    {
-        if (empty($GLOBALS['_PEAR_Command_shortcuts'])) {
-            PEAR_Command::registerCommands();
-        }
-        return $GLOBALS['_PEAR_Command_shortcuts'];
-    }
-
-    // }}}
-    // {{{ getGetoptArgs()
-
-    /**
-     * Compiles arguments for getopt.
-     *
-     * @param string $command     command to get optstring for
-     * @param string $short_args  (reference) short getopt format
-     * @param array  $long_args   (reference) long getopt format
-     *
-     * @return void
-     *
-     * @access public
-     * @static
-     */
-    function getGetoptArgs($command, &$short_args, &$long_args)
-    {
-        if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
-            PEAR_Command::registerCommands();
-        }
-        if (!isset($GLOBALS['_PEAR_Command_commandlist'][$command])) {
-            return null;
-        }
-        $class = $GLOBALS['_PEAR_Command_commandlist'][$command];
-        $obj = &$GLOBALS['_PEAR_Command_objects'][$class];
-        return $obj->getGetoptArgs($command, $short_args, $long_args);
-    }
-
-    // }}}
-    // {{{ getDescription()
-
-    /**
-     * Get description for a command.
-     *
-     * @param  string $command Name of the command
-     *
-     * @return string command description
-     *
-     * @access public
-     * @static
-     */
-    function getDescription($command)
-    {
-        if (!isset($GLOBALS['_PEAR_Command_commanddesc'][$command])) {
-            return null;
-        }
-        return $GLOBALS['_PEAR_Command_commanddesc'][$command];
-    }
-
-    // }}}
-    // {{{ getHelp()
-
-    /**
-     * Get help for command.
-     *
-     * @param string $command Name of the command to return help for
-     *
-     * @access public
-     * @static
-     */
-    function getHelp($command)
-    {
-        $cmds = PEAR_Command::getCommands();
-        if (isset($cmds[$command])) {
-            $class = $cmds[$command];
-            return $GLOBALS['_PEAR_Command_objects'][$class]->getHelp($command);
-        }
-        return false;
-    }
-    // }}}
-}
-
-?>
diff --git a/3rdparty/PEAR/Command/Auth.php b/3rdparty/PEAR/Command/Auth.php
deleted file mode 100644
index 0b9d3d3965d..00000000000
--- a/3rdparty/PEAR/Command/Auth.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Stig Bakken <ssb@php.net>                                    |
-// +----------------------------------------------------------------------+
-//
-// $Id: Auth.php,v 1.15 2004/01/08 17:33:13 sniper Exp $
-
-require_once "PEAR/Command/Common.php";
-require_once "PEAR/Remote.php";
-require_once "PEAR/Config.php";
-
-/**
- * PEAR commands for managing configuration data.
- *
- */
-class PEAR_Command_Auth extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'login' => array(
-            'summary' => 'Connects and authenticates to remote server',
-            'shortcut' => 'li',
-            'function' => 'doLogin',
-            'options' => array(),
-            'doc' => '
-Log in to the remote server.  To use remote functions in the installer
-that require any kind of privileges, you need to log in first.  The
-username and password you enter here will be stored in your per-user
-PEAR configuration (~/.pearrc on Unix-like systems).  After logging
-in, your username and password will be sent along in subsequent
-operations on the remote server.',
-            ),
-        'logout' => array(
-            'summary' => 'Logs out from the remote server',
-            'shortcut' => 'lo',
-            'function' => 'doLogout',
-            'options' => array(),
-            'doc' => '
-Logs out from the remote server.  This command does not actually
-connect to the remote server, it only deletes the stored username and
-password from your user configuration.',
-            )
-
-        );
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Auth constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Auth(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    // {{{ doLogin()
-
-    /**
-     * Execute the 'login' command.
-     *
-     * @param string $command command name
-     *
-     * @param array $options option_name => value
-     *
-     * @param array $params list of additional parameters
-     *
-     * @return bool TRUE on success, FALSE for unknown commands, or
-     * a PEAR error on failure
-     *
-     * @access public
-     */
-    function doLogin($command, $options, $params)
-    {
-        $server = $this->config->get('master_server');
-        $remote = new PEAR_Remote($this->config);
-        $username = $this->config->get('username');
-        if (empty($username)) {
-            $username = @$_ENV['USER'];
-        }
-        $this->ui->outputData("Logging in to $server.", $command);
-        
-        list($username, $password) = $this->ui->userDialog(
-            $command,
-            array('Username', 'Password'),
-            array('text',     'password'),
-            array($username,  '')
-            );
-        $username = trim($username);
-        $password = trim($password);
-        
-        $this->config->set('username', $username);
-        $this->config->set('password', $password);
-        
-        $remote->expectError(401);
-        $ok = $remote->call('logintest');
-        $remote->popExpect();
-        if ($ok === true) {
-            $this->ui->outputData("Logged in.", $command);
-            $this->config->store();
-        } else {
-            return $this->raiseError("Login failed!");
-        }
-
-    }
-
-    // }}}
-    // {{{ doLogout()
-
-    /**
-     * Execute the 'logout' command.
-     *
-     * @param string $command command name
-     *
-     * @param array $options option_name => value
-     *
-     * @param array $params list of additional parameters
-     *
-     * @return bool TRUE on success, FALSE for unknown commands, or
-     * a PEAR error on failure
-     *
-     * @access public
-     */
-    function doLogout($command, $options, $params)
-    {
-        $server = $this->config->get('master_server');
-        $this->ui->outputData("Logging out from $server.", $command);
-        $this->config->remove('username');
-        $this->config->remove('password');
-        $this->config->store();
-    }
-
-    // }}}
-}
-
-?>
\ No newline at end of file
diff --git a/3rdparty/PEAR/Command/Build.php b/3rdparty/PEAR/Command/Build.php
deleted file mode 100644
index 2ecbbc92f5f..00000000000
--- a/3rdparty/PEAR/Command/Build.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Stig Bakken <ssb@php.net>                                    |
-// |         Tomas V.V.Cox <cox@idecnet.com>                              |
-// |                                                                      |
-// +----------------------------------------------------------------------+
-//
-// $Id: Build.php,v 1.9 2004/01/08 17:33:13 sniper Exp $
-
-require_once "PEAR/Command/Common.php";
-require_once "PEAR/Builder.php";
-
-/**
- * PEAR commands for building extensions.
- *
- */
-class PEAR_Command_Build extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'build' => array(
-            'summary' => 'Build an Extension From C Source',
-            'function' => 'doBuild',
-            'shortcut' => 'b',
-            'options' => array(),
-            'doc' => '[package.xml]
-Builds one or more extensions contained in a package.'
-            ),
-        );
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Build constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Build(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    // {{{ doBuild()
-
-    function doBuild($command, $options, $params)
-    {
-        if (sizeof($params) < 1) {
-            $params[0] = 'package.xml';
-        }
-        $builder = &new PEAR_Builder($this->ui);
-        $this->debug = $this->config->get('verbose');
-        $err = $builder->build($params[0], array(&$this, 'buildCallback'));
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ buildCallback()
-
-    function buildCallback($what, $data)
-    {
-        if (($what == 'cmdoutput' && $this->debug > 1) ||
-            ($what == 'output' && $this->debug > 0)) {
-            $this->ui->outputData(rtrim($data), 'build');
-        }
-    }
-
-    // }}}
-}
diff --git a/3rdparty/PEAR/Command/Common.php b/3rdparty/PEAR/Command/Common.php
deleted file mode 100644
index c6ace694caf..00000000000
--- a/3rdparty/PEAR/Command/Common.php
+++ /dev/null
@@ -1,249 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Stig Sæther Bakken <ssb@php.net>                             |
-// +----------------------------------------------------------------------+
-//
-// $Id: Common.php,v 1.24 2004/01/08 17:33:13 sniper Exp $
-
-require_once "PEAR.php";
-
-class PEAR_Command_Common extends PEAR
-{
-    // {{{ properties
-
-    /**
-     * PEAR_Config object used to pass user system and configuration
-     * on when executing commands
-     *
-     * @var object
-     */
-    var $config;
-
-    /**
-     * User Interface object, for all interaction with the user.
-     * @var object
-     */
-    var $ui;
-
-    var $_deps_rel_trans = array(
-                                 'lt' => '<',
-                                 'le' => '<=',
-                                 'eq' => '=',
-                                 'ne' => '!=',
-                                 'gt' => '>',
-                                 'ge' => '>=',
-                                 'has' => '=='
-                                 );
-
-    var $_deps_type_trans = array(
-                                  'pkg' => 'package',
-                                  'extension' => 'extension',
-                                  'php' => 'PHP',
-                                  'prog' => 'external program',
-                                  'ldlib' => 'external library for linking',
-                                  'rtlib' => 'external runtime library',
-                                  'os' => 'operating system',
-                                  'websrv' => 'web server',
-                                  'sapi' => 'SAPI backend'
-                                  );
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Common constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Common(&$ui, &$config)
-    {
-        parent::PEAR();
-        $this->config = &$config;
-        $this->ui = &$ui;
-    }
-
-    // }}}
-
-    // {{{ getCommands()
-
-    /**
-     * Return a list of all the commands defined by this class.
-     * @return array list of commands
-     * @access public
-     */
-    function getCommands()
-    {
-        $ret = array();
-        foreach (array_keys($this->commands) as $command) {
-            $ret[$command] = $this->commands[$command]['summary'];
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ getShortcuts()
-
-    /**
-     * Return a list of all the command shortcuts defined by this class.
-     * @return array shortcut => command
-     * @access public
-     */
-    function getShortcuts()
-    {
-        $ret = array();
-        foreach (array_keys($this->commands) as $command) {
-            if (isset($this->commands[$command]['shortcut'])) {
-                $ret[$this->commands[$command]['shortcut']] = $command;
-            }
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ getOptions()
-
-    function getOptions($command)
-    {
-        return @$this->commands[$command]['options'];
-    }
-
-    // }}}
-    // {{{ getGetoptArgs()
-
-    function getGetoptArgs($command, &$short_args, &$long_args)
-    {
-        $short_args = "";
-        $long_args = array();
-        if (empty($this->commands[$command])) {
-            return;
-        }
-        reset($this->commands[$command]);
-        while (list($option, $info) = each($this->commands[$command]['options'])) {
-            $larg = $sarg = '';
-            if (isset($info['arg'])) {
-                if ($info['arg']{0} == '(') {
-                    $larg = '==';
-                    $sarg = '::';
-                    $arg = substr($info['arg'], 1, -1);
-                } else {
-                    $larg = '=';
-                    $sarg = ':';
-                    $arg = $info['arg'];
-                }
-            }
-            if (isset($info['shortopt'])) {
-                $short_args .= $info['shortopt'] . $sarg;
-            }
-            $long_args[] = $option . $larg;
-        }
-    }
-
-    // }}}
-    // {{{ getHelp()
-    /**
-    * Returns the help message for the given command
-    *
-    * @param string $command The command
-    * @return mixed A fail string if the command does not have help or
-    *               a two elements array containing [0]=>help string,
-    *               [1]=> help string for the accepted cmd args
-    */
-    function getHelp($command)
-    {
-        $config = &PEAR_Config::singleton();
-        $help = @$this->commands[$command]['doc'];
-        if (empty($help)) {
-            // XXX (cox) Fallback to summary if there is no doc (show both?)
-            if (!$help = @$this->commands[$command]['summary']) {
-                return "No help for command \"$command\"";
-            }
-        }
-        if (preg_match_all('/{config\s+([^\}]+)}/e', $help, $matches)) {
-            foreach($matches[0] as $k => $v) {
-                $help = preg_replace("/$v/", $config->get($matches[1][$k]), $help);
-            }
-        }
-        return array($help, $this->getHelpArgs($command));
-    }
-
-    // }}}
-    // {{{ getHelpArgs()
-    /**
-    * Returns the help for the accepted arguments of a command
-    *
-    * @param  string $command
-    * @return string The help string
-    */
-    function getHelpArgs($command)
-    {
-        if (isset($this->commands[$command]['options']) &&
-            count($this->commands[$command]['options']))
-        {
-            $help = "Options:\n";
-            foreach ($this->commands[$command]['options'] as $k => $v) {
-                if (isset($v['arg'])) {
-                    if ($v['arg']{0} == '(') {
-                        $arg = substr($v['arg'], 1, -1);
-                        $sapp = " [$arg]";
-                        $lapp = "[=$arg]";
-                    } else {
-                        $sapp = " $v[arg]";
-                        $lapp = "=$v[arg]";
-                    }
-                } else {
-                    $sapp = $lapp = "";
-                }
-                if (isset($v['shortopt'])) {
-                    $s = $v['shortopt'];
-                    @$help .= "  -$s$sapp, --$k$lapp\n";
-                } else {
-                    @$help .= "  --$k$lapp\n";
-                }
-                $p = "        ";
-                $doc = rtrim(str_replace("\n", "\n$p", $v['doc']));
-                $help .= "        $doc\n";
-            }
-            return $help;
-        }
-        return null;
-    }
-
-    // }}}
-    // {{{ run()
-
-    function run($command, $options, $params)
-    {
-        $func = @$this->commands[$command]['function'];
-        if (empty($func)) {
-            // look for shortcuts
-            foreach (array_keys($this->commands) as $cmd) {
-                if (@$this->commands[$cmd]['shortcut'] == $command) {
-                    $command = $cmd;
-                    $func = @$this->commands[$command]['function'];
-                    if (empty($func)) {
-                        return $this->raiseError("unknown command `$command'");
-                    }
-                    break;
-                }
-            }
-        }
-        return $this->$func($command, $options, $params);
-    }
-
-    // }}}
-}
-
-?>
\ No newline at end of file
diff --git a/3rdparty/PEAR/Command/Config.php b/3rdparty/PEAR/Command/Config.php
deleted file mode 100644
index 474a2345170..00000000000
--- a/3rdparty/PEAR/Command/Config.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Stig Bakken <ssb@php.net>                                    |
-// |         Tomas V.V.Cox <cox@idecnet.com>                              |
-// |                                                                      |
-// +----------------------------------------------------------------------+
-//
-// $Id: Config.php,v 1.27 2004/06/15 16:48:49 pajoye Exp $
-
-require_once "PEAR/Command/Common.php";
-require_once "PEAR/Config.php";
-
-/**
- * PEAR commands for managing configuration data.
- *
- */
-class PEAR_Command_Config extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'config-show' => array(
-            'summary' => 'Show All Settings',
-            'function' => 'doConfigShow',
-            'shortcut' => 'csh',
-            'options' => array(),
-            'doc' => '
-Displays all configuration values.  An optional argument
-may be used to tell which configuration layer to display.  Valid
-configuration layers are "user", "system" and "default".
-',
-            ),
-        'config-get' => array(
-            'summary' => 'Show One Setting',
-            'function' => 'doConfigGet',
-            'shortcut' => 'cg',
-            'options' => array(),
-            'doc' => '<parameter> [layer]
-Displays the value of one configuration parameter.  The
-first argument is the name of the parameter, an optional second argument
-may be used to tell which configuration layer to look in.  Valid configuration
-layers are "user", "system" and "default".  If no layer is specified, a value
-will be picked from the first layer that defines the parameter, in the order
-just specified.
-',
-            ),
-        'config-set' => array(
-            'summary' => 'Change Setting',
-            'function' => 'doConfigSet',
-            'shortcut' => 'cs',
-            'options' => array(),
-            'doc' => '<parameter> <value> [layer]
-Sets the value of one configuration parameter.  The first argument is
-the name of the parameter, the second argument is the new value.  Some
-parameters are subject to validation, and the command will fail with
-an error message if the new value does not make sense.  An optional
-third argument may be used to specify in which layer to set the
-configuration parameter.  The default layer is "user".
-',
-            ),
-        'config-help' => array(
-            'summary' => 'Show Information About Setting',
-            'function' => 'doConfigHelp',
-            'shortcut' => 'ch',
-            'options' => array(),
-            'doc' => '[parameter]
-Displays help for a configuration parameter.  Without arguments it
-displays help for all configuration parameters.
-',
-           ),
-        );
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Config constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Config(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    // {{{ doConfigShow()
-
-    function doConfigShow($command, $options, $params)
-    {
-        // $params[0] -> the layer
-        if ($error = $this->_checkLayer(@$params[0])) {
-            return $this->raiseError($error);
-        }
-        $keys = $this->config->getKeys();
-        sort($keys);
-        $data = array('caption' => 'Configuration:');
-        foreach ($keys as $key) {
-            $type = $this->config->getType($key);
-            $value = $this->config->get($key, @$params[0]);
-            if ($type == 'password' && $value) {
-                $value = '********';
-            }
-            if ($value === false) {
-                $value = 'false';
-            } elseif ($value === true) {
-                $value = 'true';
-            }
-            $data['data'][$this->config->getGroup($key)][] = array($this->config->getPrompt($key) , $key, $value);
-        }
-        $this->ui->outputData($data, $command);
-        return true;
-    }
-
-    // }}}
-    // {{{ doConfigGet()
-
-    function doConfigGet($command, $options, $params)
-    {
-        // $params[0] -> the parameter
-        // $params[1] -> the layer
-        if ($error = $this->_checkLayer(@$params[1])) {
-            return $this->raiseError($error);
-        }
-        if (sizeof($params) < 1 || sizeof($params) > 2) {
-            return $this->raiseError("config-get expects 1 or 2 parameters");
-        } elseif (sizeof($params) == 1) {
-            $this->ui->outputData($this->config->get($params[0]), $command);
-        } else {
-            $data = $this->config->get($params[0], $params[1]);
-            $this->ui->outputData($data, $command);
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ doConfigSet()
-
-    function doConfigSet($command, $options, $params)
-    {
-        // $param[0] -> a parameter to set
-        // $param[1] -> the value for the parameter
-        // $param[2] -> the layer
-        $failmsg = '';
-        if (sizeof($params) < 2 || sizeof($params) > 3) {
-            $failmsg .= "config-set expects 2 or 3 parameters";
-            return PEAR::raiseError($failmsg);
-        }
-        if ($error = $this->_checkLayer(@$params[2])) {
-            $failmsg .= $error;
-            return PEAR::raiseError($failmsg);
-        }
-        if (!call_user_func_array(array(&$this->config, 'set'), $params))
-        {
-            $failmsg = "config-set (" . implode(", ", $params) . ") failed";
-        } else {
-            $this->config->store();
-        }
-        if ($failmsg) {
-            return $this->raiseError($failmsg);
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ doConfigHelp()
-
-    function doConfigHelp($command, $options, $params)
-    {
-        if (empty($params)) {
-            $params = $this->config->getKeys();
-        }
-        $data['caption']  = "Config help" . ((count($params) == 1) ? " for $params[0]" : '');
-        $data['headline'] = array('Name', 'Type', 'Description');
-        $data['border']   = true;
-        foreach ($params as $name) {
-            $type = $this->config->getType($name);
-            $docs = $this->config->getDocs($name);
-            if ($type == 'set') {
-                $docs = rtrim($docs) . "\nValid set: " .
-                    implode(' ', $this->config->getSetValues($name));
-            }
-            $data['data'][] = array($name, $type, $docs);
-        }
-        $this->ui->outputData($data, $command);
-    }
-
-    // }}}
-    // {{{ _checkLayer()
-
-    /**
-     * Checks if a layer is defined or not
-     *
-     * @param string $layer The layer to search for
-     * @return mixed False on no error or the error message
-     */
-    function _checkLayer($layer = null)
-    {
-        if (!empty($layer) && $layer != 'default') {
-            $layers = $this->config->getLayers();
-            if (!in_array($layer, $layers)) {
-                return " only the layers: \"" . implode('" or "', $layers) . "\" are supported";
-            }
-        }
-        return false;
-    }
-
-    // }}}
-}
-
-?>
diff --git a/3rdparty/PEAR/Command/Install.php b/3rdparty/PEAR/Command/Install.php
deleted file mode 100644
index dce52f017e2..00000000000
--- a/3rdparty/PEAR/Command/Install.php
+++ /dev/null
@@ -1,470 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Stig Sæther Bakken <ssb@php.net>                             |
-// +----------------------------------------------------------------------+
-//
-// $Id: Install.php,v 1.53.2.1 2004/10/19 04:08:42 cellog Exp $
-
-require_once "PEAR/Command/Common.php";
-require_once "PEAR/Installer.php";
-
-/**
- * PEAR commands for installation or deinstallation/upgrading of
- * packages.
- *
- */
-class PEAR_Command_Install extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'install' => array(
-            'summary' => 'Install Package',
-            'function' => 'doInstall',
-            'shortcut' => 'i',
-            'options' => array(
-                'force' => array(
-                    'shortopt' => 'f',
-                    'doc' => 'will overwrite newer installed packages',
-                    ),
-                'nodeps' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'ignore dependencies, install anyway',
-                    ),
-                'register-only' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'do not install files, only register the package as installed',
-                    ),
-                'soft' => array(
-                    'shortopt' => 's',
-                    'doc' => 'soft install, fail silently, or upgrade if already installed',
-                    ),
-                'nobuild' => array(
-                    'shortopt' => 'B',
-                    'doc' => 'don\'t build C extensions',
-                    ),
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'request uncompressed files when downloading',
-                    ),
-                'installroot' => array(
-                    'shortopt' => 'R',
-                    'arg' => 'DIR',
-                    'doc' => 'root directory used when installing files (ala PHP\'s INSTALL_ROOT)',
-                    ),
-                'ignore-errors' => array(
-                    'doc' => 'force install even if there were errors',
-                    ),
-                'alldeps' => array(
-                    'shortopt' => 'a',
-                    'doc' => 'install all required and optional dependencies',
-                    ),
-                'onlyreqdeps' => array(
-                    'shortopt' => 'o',
-                    'doc' => 'install all required dependencies',
-                    ),
-                ),
-            'doc' => '<package> ...
-Installs one or more PEAR packages.  You can specify a package to
-install in four ways:
-
-"Package-1.0.tgz" : installs from a local file
-
-"http://example.com/Package-1.0.tgz" : installs from
-anywhere on the net.
-
-"package.xml" : installs the package described in
-package.xml.  Useful for testing, or for wrapping a PEAR package in
-another package manager such as RPM.
-
-"Package" : queries your configured server
-({config master_server}) and downloads the newest package with
-the preferred quality/state ({config preferred_state}).
-
-More than one package may be specified at once.  It is ok to mix these
-four ways of specifying packages.
-'),
-        'upgrade' => array(
-            'summary' => 'Upgrade Package',
-            'function' => 'doInstall',
-            'shortcut' => 'up',
-            'options' => array(
-                'force' => array(
-                    'shortopt' => 'f',
-                    'doc' => 'overwrite newer installed packages',
-                    ),
-                'nodeps' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'ignore dependencies, upgrade anyway',
-                    ),
-                'register-only' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'do not install files, only register the package as upgraded',
-                    ),
-                'nobuild' => array(
-                    'shortopt' => 'B',
-                    'doc' => 'don\'t build C extensions',
-                    ),
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'request uncompressed files when downloading',
-                    ),
-                'installroot' => array(
-                    'shortopt' => 'R',
-                    'arg' => 'DIR',
-                    'doc' => 'root directory used when installing files (ala PHP\'s INSTALL_ROOT)',
-                    ),
-                'ignore-errors' => array(
-                    'doc' => 'force install even if there were errors',
-                    ),
-                'alldeps' => array(
-                    'shortopt' => 'a',
-                    'doc' => 'install all required and optional dependencies',
-                    ),
-                'onlyreqdeps' => array(
-                    'shortopt' => 'o',
-                    'doc' => 'install all required dependencies',
-                    ),
-                ),
-            'doc' => '<package> ...
-Upgrades one or more PEAR packages.  See documentation for the
-"install" command for ways to specify a package.
-
-When upgrading, your package will be updated if the provided new
-package has a higher version number (use the -f option if you need to
-upgrade anyway).
-
-More than one package may be specified at once.
-'),
-        'upgrade-all' => array(
-            'summary' => 'Upgrade All Packages',
-            'function' => 'doInstall',
-            'shortcut' => 'ua',
-            'options' => array(
-                'nodeps' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'ignore dependencies, upgrade anyway',
-                    ),
-                'register-only' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'do not install files, only register the package as upgraded',
-                    ),
-                'nobuild' => array(
-                    'shortopt' => 'B',
-                    'doc' => 'don\'t build C extensions',
-                    ),
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'request uncompressed files when downloading',
-                    ),
-                'installroot' => array(
-                    'shortopt' => 'R',
-                    'arg' => 'DIR',
-                    'doc' => 'root directory used when installing files (ala PHP\'s INSTALL_ROOT)',
-                    ),
-                'ignore-errors' => array(
-                    'doc' => 'force install even if there were errors',
-                    ),
-                ),
-            'doc' => '
-Upgrades all packages that have a newer release available.  Upgrades are
-done only if there is a release available of the state specified in
-"preferred_state" (currently {config preferred_state}), or a state considered
-more stable.
-'),
-        'uninstall' => array(
-            'summary' => 'Un-install Package',
-            'function' => 'doUninstall',
-            'shortcut' => 'un',
-            'options' => array(
-                'nodeps' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'ignore dependencies, uninstall anyway',
-                    ),
-                'register-only' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'do not remove files, only register the packages as not installed',
-                    ),
-                'installroot' => array(
-                    'shortopt' => 'R',
-                    'arg' => 'DIR',
-                    'doc' => 'root directory used when installing files (ala PHP\'s INSTALL_ROOT)',
-                    ),
-                'ignore-errors' => array(
-                    'doc' => 'force install even if there were errors',
-                    ),
-                ),
-            'doc' => '<package> ...
-Uninstalls one or more PEAR packages.  More than one package may be
-specified at once.
-'),
-        'bundle' => array(
-            'summary' => 'Unpacks a Pecl Package',
-            'function' => 'doBundle',
-            'shortcut' => 'bun',
-            'options' => array(
-                'destination' => array(
-                   'shortopt' => 'd',
-                    'arg' => 'DIR',
-                    'doc' => 'Optional destination directory for unpacking (defaults to current path or "ext" if exists)',
-                    ),
-                'force' => array(
-                    'shortopt' => 'f',
-                    'doc' => 'Force the unpacking even if there were errors in the package',
-                ),
-            ),
-            'doc' => '<package>
-Unpacks a Pecl Package into the selected location. It will download the
-package if needed.
-'),
-    );
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Install constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Install(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    // {{{ doInstall()
-
-    function doInstall($command, $options, $params)
-    {
-        require_once 'PEAR/Downloader.php';
-        if (empty($this->installer)) {
-            $this->installer = &new PEAR_Installer($this->ui);
-        }
-        if ($command == 'upgrade') {
-            $options['upgrade'] = true;
-        }
-        if ($command == 'upgrade-all') {
-            include_once "PEAR/Remote.php";
-            $options['upgrade'] = true;
-            $remote = &new PEAR_Remote($this->config);
-            $state = $this->config->get('preferred_state');
-            if (empty($state) || $state == 'any') {
-                $latest = $remote->call("package.listLatestReleases");
-            } else {
-                $latest = $remote->call("package.listLatestReleases", $state);
-            }
-            if (PEAR::isError($latest)) {
-                return $latest;
-            }
-            $reg = new PEAR_Registry($this->config->get('php_dir'));
-            $installed = array_flip($reg->listPackages());
-            $params = array();
-            foreach ($latest as $package => $info) {
-                $package = strtolower($package);
-                if (!isset($installed[$package])) {
-                    // skip packages we don't have installed
-                    continue;
-                }
-                $inst_version = $reg->packageInfo($package, 'version');
-                if (version_compare("$info[version]", "$inst_version", "le")) {
-                    // installed version is up-to-date
-                    continue;
-                }
-                $params[] = $package;
-                $this->ui->outputData(array('data' => "Will upgrade $package"), $command);
-            }
-        }
-        $this->downloader = &new PEAR_Downloader($this->ui, $options, $this->config);
-        $errors = array();
-        $downloaded = array();
-        $this->downloader->download($params);
-        $errors = $this->downloader->getErrorMsgs();
-        if (count($errors)) {
-            $err['data'] = array($errors);
-            $err['headline'] = 'Install Errors';
-            $this->ui->outputData($err);
-            return $this->raiseError("$command failed");
-        }
-        $downloaded = $this->downloader->getDownloadedPackages();
-        $this->installer->sortPkgDeps($downloaded);
-        foreach ($downloaded as $pkg) {
-            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-            $info = $this->installer->install($pkg['file'], $options, $this->config);
-            PEAR::popErrorHandling();
-            if (PEAR::isError($info)) {
-                $this->ui->outputData('ERROR: ' .$info->getMessage());
-                continue;
-            }
-            if (is_array($info)) {
-                if ($this->config->get('verbose') > 0) {
-                    $label = "$info[package] $info[version]";
-                    $out = array('data' => "$command ok: $label");
-                    if (isset($info['release_warnings'])) {
-                        $out['release_warnings'] = $info['release_warnings'];
-                    }
-                    $this->ui->outputData($out, $command);
-                }
-            } else {
-                return $this->raiseError("$command failed");
-            }
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ doUninstall()
-
-    function doUninstall($command, $options, $params)
-    {
-        if (empty($this->installer)) {
-            $this->installer = &new PEAR_Installer($this->ui);
-        }
-        if (sizeof($params) < 1) {
-            return $this->raiseError("Please supply the package(s) you want to uninstall");
-        }
-        include_once 'PEAR/Registry.php';
-        $reg = new PEAR_Registry($this->config->get('php_dir'));
-        $newparams = array();
-        $badparams = array();
-        foreach ($params as $pkg) {
-            $info = $reg->packageInfo($pkg);
-            if ($info === null) {
-                $badparams[] = $pkg;
-            } else {
-                $newparams[] = $info;
-            }
-        }
-        $this->installer->sortPkgDeps($newparams, true);
-        $params = array();
-        foreach($newparams as $info) {
-            $params[] = $info['info']['package'];
-        }
-        $params = array_merge($params, $badparams);
-        foreach ($params as $pkg) {
-            if ($this->installer->uninstall($pkg, $options)) {
-                if ($this->config->get('verbose') > 0) {
-                    $this->ui->outputData("uninstall ok: $pkg", $command);
-                }
-            } else {
-                return $this->raiseError("uninstall failed: $pkg");
-            }
-        }
-        return true;
-    }
-
-    // }}}
-
-
-    // }}}
-    // {{{ doBundle()
-    /*
-    (cox) It just downloads and untars the package, does not do
-            any check that the PEAR_Installer::_installFile() does.
-    */
-
-    function doBundle($command, $options, $params)
-    {
-        if (empty($this->installer)) {
-            $this->installer = &new PEAR_Downloader($this->ui);
-        }
-        $installer = &$this->installer;
-        if (sizeof($params) < 1) {
-            return $this->raiseError("Please supply the package you want to bundle");
-        }
-        $pkgfile = $params[0];
-        $need_download = false;
-        if (preg_match('#^(http|ftp)://#', $pkgfile)) {
-            $need_download = true;
-        } elseif (!@is_file($pkgfile)) {
-            if ($installer->validPackageName($pkgfile)) {
-                $pkgfile = $installer->getPackageDownloadUrl($pkgfile);
-                $need_download = true;
-            } else {
-                if (strlen($pkgfile)) {
-                    return $this->raiseError("Could not open the package file: $pkgfile");
-                } else {
-                    return $this->raiseError("No package file given");
-                }
-            }
-        }
-
-        // Download package -----------------------------------------------
-        if ($need_download) {
-            $downloaddir = $installer->config->get('download_dir');
-            if (empty($downloaddir)) {
-                if (PEAR::isError($downloaddir = System::mktemp('-d'))) {
-                    return $downloaddir;
-                }
-                $installer->log(2, '+ tmp dir created at ' . $downloaddir);
-            }
-            $callback = $this->ui ? array(&$installer, '_downloadCallback') : null;
-            $file = $installer->downloadHttp($pkgfile, $this->ui, $downloaddir, $callback);
-            if (PEAR::isError($file)) {
-                return $this->raiseError($file);
-            }
-            $pkgfile = $file;
-        }
-
-       // Parse xml file -----------------------------------------------
-        $pkginfo = $installer->infoFromTgzFile($pkgfile);
-        if (PEAR::isError($pkginfo)) {
-            return $this->raiseError($pkginfo);
-        }
-        $installer->validatePackageInfo($pkginfo, $errors, $warnings);
-        // XXX We allow warnings, do we have to do it?
-        if (count($errors)) {
-             if (empty($options['force'])) {
-                return $this->raiseError("The following errors where found:\n".
-                                                 implode("\n", $errors));
-            } else {
-                $this->log(0, "warning : the following errors were found:\n".
-                           implode("\n", $errors));
-            }
-        }
-        $pkgname = $pkginfo['package'];
-
-        // Unpacking -------------------------------------------------
-
-        if (isset($options['destination'])) {
-            if (!is_dir($options['destination'])) {
-                System::mkdir('-p ' . $options['destination']);
-            }
-            $dest = realpath($options['destination']);
-        } else {
-            $pwd = getcwd();
-            if (is_dir($pwd . DIRECTORY_SEPARATOR . 'ext')) {
-                $dest = $pwd . DIRECTORY_SEPARATOR . 'ext';
-            } else {
-                $dest = $pwd;
-            }
-        }
-        $dest .= DIRECTORY_SEPARATOR . $pkgname;
-        $orig = $pkgname . '-' . $pkginfo['version'];
-
-        $tar = new Archive_Tar($pkgfile);
-        if (!@$tar->extractModify($dest, $orig)) {
-            return $this->raiseError("unable to unpack $pkgfile");
-        }
-        $this->ui->outputData("Package ready at '$dest'");
-    // }}}
-    }
-
-    // }}}
-
-}
-?>
diff --git a/3rdparty/PEAR/Command/Mirror.php b/3rdparty/PEAR/Command/Mirror.php
deleted file mode 100644
index bf56c3db640..00000000000
--- a/3rdparty/PEAR/Command/Mirror.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Alexander Merz <alexmerz@php.net>                            |
-// |                                                                      |
-// +----------------------------------------------------------------------+
-//
-// $Id: Mirror.php,v 1.5 2004/03/18 12:23:57 mj Exp $
-
-require_once "PEAR/Command/Common.php";
-require_once "PEAR/Command.php";
-require_once "PEAR/Remote.php";
-require_once "PEAR.php";
-
-/**
- * PEAR commands for providing file mirrors
- *
- */
-class PEAR_Command_Mirror extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'download-all' => array(
-            'summary' => 'Downloads each available package from master_server',
-            'function' => 'doDownloadAll',
-            'shortcut' => 'da',
-            'options' => array(),
-            'doc' => '
-	    Requests a list of available packages from the package server
-	    (master_server) and downloads them to current working directory'
-            ),
-        );
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Mirror constructor.
-     *
-     * @access public
-     * @param object PEAR_Frontend a reference to an frontend
-     * @param object PEAR_Config a reference to the configuration data
-     */
-    function PEAR_Command_Mirror(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    // {{{ doDownloadAll()
-    /**
-    * retrieves a list of avaible Packages from master server
-    * and downloads them
-    *
-    * @access public
-    * @param string $command the command
-    * @param array $options the command options before the command
-    * @param array $params the stuff after the command name
-    * @return bool true if succesful
-    * @throw PEAR_Error 
-    */
-    function doDownloadAll($command, $options, $params)
-    {
-        $this->config->set("php_dir", "."); 
-        $remote = &new PEAR_Remote($this->config);
-        $remoteInfo = $remote->call("package.listAll");
-        if (PEAR::isError($remoteInfo)) {
-            return $remoteInfo;
-        }
-        $cmd = &PEAR_Command::factory("download", $this->config);
-        if (PEAR::isError($cmd)) {
-            return $cmd;
-        }
-        foreach ($remoteInfo as $pkgn => $pkg) {
-            /**
-             * Error handling not neccesary, because already done by 
-             * the download command
-             */
-            $cmd->run("download", array(), array($pkgn));
-        }
-
-        return true;
-    }
-
-    // }}}
-}
diff --git a/3rdparty/PEAR/Command/Package.php b/3rdparty/PEAR/Command/Package.php
deleted file mode 100644
index aca87111118..00000000000
--- a/3rdparty/PEAR/Command/Package.php
+++ /dev/null
@@ -1,819 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Stig Bakken <ssb@php.net>                                   |
-// |          Martin Jansen <mj@php.net>                                  |
-// |          Greg Beaver <cellog@php.net>                                |
-// +----------------------------------------------------------------------+
-//
-// $Id: Package.php,v 1.61.2.7 2005/02/17 17:47:55 cellog Exp $
-
-require_once 'PEAR/Common.php';
-require_once 'PEAR/Command/Common.php';
-
-class PEAR_Command_Package extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'package' => array(
-            'summary' => 'Build Package',
-            'function' => 'doPackage',
-            'shortcut' => 'p',
-            'options' => array(
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'Do not gzip the package file'
-                    ),
-                'showname' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'Print the name of the packaged file.',
-                    ),
-                ),
-            'doc' => '[descfile]
-Creates a PEAR package from its description file (usually called
-package.xml).
-'
-            ),
-        'package-validate' => array(
-            'summary' => 'Validate Package Consistency',
-            'function' => 'doPackageValidate',
-            'shortcut' => 'pv',
-            'options' => array(),
-            'doc' => '
-',
-            ),
-        'cvsdiff' => array(
-            'summary' => 'Run a "cvs diff" for all files in a package',
-            'function' => 'doCvsDiff',
-            'shortcut' => 'cd',
-            'options' => array(
-                'quiet' => array(
-                    'shortopt' => 'q',
-                    'doc' => 'Be quiet',
-                    ),
-                'reallyquiet' => array(
-                    'shortopt' => 'Q',
-                    'doc' => 'Be really quiet',
-                    ),
-                'date' => array(
-                    'shortopt' => 'D',
-                    'doc' => 'Diff against revision of DATE',
-                    'arg' => 'DATE',
-                    ),
-                'release' => array(
-                    'shortopt' => 'R',
-                    'doc' => 'Diff against tag for package release REL',
-                    'arg' => 'REL',
-                    ),
-                'revision' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'Diff against revision REV',
-                    'arg' => 'REV',
-                    ),
-                'context' => array(
-                    'shortopt' => 'c',
-                    'doc' => 'Generate context diff',
-                    ),
-                'unified' => array(
-                    'shortopt' => 'u',
-                    'doc' => 'Generate unified diff',
-                    ),
-                'ignore-case' => array(
-                    'shortopt' => 'i',
-                    'doc' => 'Ignore case, consider upper- and lower-case letters equivalent',
-                    ),
-                'ignore-whitespace' => array(
-                    'shortopt' => 'b',
-                    'doc' => 'Ignore changes in amount of white space',
-                    ),
-                'ignore-blank-lines' => array(
-                    'shortopt' => 'B',
-                    'doc' => 'Ignore changes that insert or delete blank lines',
-                    ),
-                'brief' => array(
-                    'doc' => 'Report only whether the files differ, no details',
-                    ),
-                'dry-run' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'Don\'t do anything, just pretend',
-                    ),
-                ),
-            'doc' => '<package.xml>
-Compares all the files in a package.  Without any options, this
-command will compare the current code with the last checked-in code.
-Using the -r or -R option you may compare the current code with that
-of a specific release.
-',
-            ),
-        'cvstag' => array(
-            'summary' => 'Set CVS Release Tag',
-            'function' => 'doCvsTag',
-            'shortcut' => 'ct',
-            'options' => array(
-                'quiet' => array(
-                    'shortopt' => 'q',
-                    'doc' => 'Be quiet',
-                    ),
-                'reallyquiet' => array(
-                    'shortopt' => 'Q',
-                    'doc' => 'Be really quiet',
-                    ),
-                'slide' => array(
-                    'shortopt' => 'F',
-                    'doc' => 'Move (slide) tag if it exists',
-                    ),
-                'delete' => array(
-                    'shortopt' => 'd',
-                    'doc' => 'Remove tag',
-                    ),
-                'dry-run' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'Don\'t do anything, just pretend',
-                    ),
-                ),
-            'doc' => '<package.xml>
-Sets a CVS tag on all files in a package.  Use this command after you have
-packaged a distribution tarball with the "package" command to tag what
-revisions of what files were in that release.  If need to fix something
-after running cvstag once, but before the tarball is released to the public,
-use the "slide" option to move the release tag.
-',
-            ),
-        'run-tests' => array(
-            'summary' => 'Run Regression Tests',
-            'function' => 'doRunTests',
-            'shortcut' => 'rt',
-            'options' => array(
-                'recur' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'Run tests in child directories, recursively.  4 dirs deep maximum',
-                ),
-                'ini' => array(
-                    'shortopt' => 'i',
-                    'doc' => 'actual string of settings to pass to php in format " -d setting=blah"',
-                    'arg' => 'SETTINGS'
-                ),
-                'realtimelog' => array(
-                    'shortopt' => 'l',
-                    'doc' => 'Log test runs/results as they are run',
-                ),
-            ),
-            'doc' => '[testfile|dir ...]
-Run regression tests with PHP\'s regression testing script (run-tests.php).',
-            ),
-        'package-dependencies' => array(
-            'summary' => 'Show package dependencies',
-            'function' => 'doPackageDependencies',
-            'shortcut' => 'pd',
-            'options' => array(),
-            'doc' => '
-List all depencies the package has.'
-            ),
-        'sign' => array(
-            'summary' => 'Sign a package distribution file',
-            'function' => 'doSign',
-            'shortcut' => 'si',
-            'options' => array(),
-            'doc' => '<package-file>
-Signs a package distribution (.tar or .tgz) file with GnuPG.',
-            ),
-        'makerpm' => array(
-            'summary' => 'Builds an RPM spec file from a PEAR package',
-            'function' => 'doMakeRPM',
-            'shortcut' => 'rpm',
-            'options' => array(
-                'spec-template' => array(
-                    'shortopt' => 't',
-                    'arg' => 'FILE',
-                    'doc' => 'Use FILE as RPM spec file template'
-                    ),
-                'rpm-pkgname' => array(
-                    'shortopt' => 'p',
-                    'arg' => 'FORMAT',
-                    'doc' => 'Use FORMAT as format string for RPM package name, %s is replaced
-by the PEAR package name, defaults to "PEAR::%s".',
-                    ),
-                ),
-            'doc' => '<package-file>
-
-Creates an RPM .spec file for wrapping a PEAR package inside an RPM
-package.  Intended to be used from the SPECS directory, with the PEAR
-package tarball in the SOURCES directory:
-
-$ pear makerpm ../SOURCES/Net_Socket-1.0.tgz
-Wrote RPM spec file PEAR::Net_Geo-1.0.spec
-$ rpm -bb PEAR::Net_Socket-1.0.spec
-...
-Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
-',
-            ),
-        );
-
-    var $output;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Package constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Package(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    // {{{ _displayValidationResults()
-
-    function _displayValidationResults($err, $warn, $strict = false)
-    {
-        foreach ($err as $e) {
-            $this->output .= "Error: $e\n";
-        }
-        foreach ($warn as $w) {
-            $this->output .= "Warning: $w\n";
-        }
-        $this->output .= sprintf('Validation: %d error(s), %d warning(s)'."\n",
-                                       sizeof($err), sizeof($warn));
-        if ($strict && sizeof($err) > 0) {
-            $this->output .= "Fix these errors and try again.";
-            return false;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ doPackage()
-
-    function doPackage($command, $options, $params)
-    {
-        $this->output = '';
-        include_once 'PEAR/Packager.php';
-        if (sizeof($params) < 1) {
-            $params[0] = "package.xml";
-        }
-        $pkginfofile = isset($params[0]) ? $params[0] : 'package.xml';
-        $packager =& new PEAR_Packager();
-        $err = $warn = array();
-        $dir = dirname($pkginfofile);
-        $compress = empty($options['nocompress']) ? true : false;
-        $result = $packager->package($pkginfofile, $compress);
-        if (PEAR::isError($result)) {
-            $this->ui->outputData($this->output, $command);
-            return $this->raiseError($result);
-        }
-        // Don't want output, only the package file name just created
-        if (isset($options['showname'])) {
-            $this->output = $result;
-        }
-        if (PEAR::isError($result)) {
-            $this->output .= "Package failed: ".$result->getMessage();
-        }
-        $this->ui->outputData($this->output, $command);
-        return true;
-    }
-
-    // }}}
-    // {{{ doPackageValidate()
-
-    function doPackageValidate($command, $options, $params)
-    {
-        $this->output = '';
-        if (sizeof($params) < 1) {
-            $params[0] = "package.xml";
-        }
-        $obj = new PEAR_Common;
-        $info = null;
-        if ($fp = @fopen($params[0], "r")) {
-            $test = fread($fp, 5);
-            fclose($fp);
-            if ($test == "<?xml") {
-                $info = $obj->infoFromDescriptionFile($params[0]);
-            }
-        }
-        if (empty($info)) {
-            $info = $obj->infoFromTgzFile($params[0]);
-        }
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-        $obj->validatePackageInfo($info, $err, $warn);
-        $this->_displayValidationResults($err, $warn);
-        $this->ui->outputData($this->output, $command);
-        return true;
-    }
-
-    // }}}
-    // {{{ doCvsTag()
-
-    function doCvsTag($command, $options, $params)
-    {
-        $this->output = '';
-        $_cmd = $command;
-        if (sizeof($params) < 1) {
-            $help = $this->getHelp($command);
-            return $this->raiseError("$command: missing parameter: $help[0]");
-        }
-        $obj = new PEAR_Common;
-        $info = $obj->infoFromDescriptionFile($params[0]);
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-        $err = $warn = array();
-        $obj->validatePackageInfo($info, $err, $warn);
-        if (!$this->_displayValidationResults($err, $warn, true)) {
-            $this->ui->outputData($this->output, $command);
-            break;
-        }
-        $version = $info['version'];
-        $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $version);
-        $cvstag = "RELEASE_$cvsversion";
-        $files = array_keys($info['filelist']);
-        $command = "cvs";
-        if (isset($options['quiet'])) {
-            $command .= ' -q';
-        }
-        if (isset($options['reallyquiet'])) {
-            $command .= ' -Q';
-        }
-        $command .= ' tag';
-        if (isset($options['slide'])) {
-            $command .= ' -F';
-        }
-        if (isset($options['delete'])) {
-            $command .= ' -d';
-        }
-        $command .= ' ' . $cvstag . ' ' . escapeshellarg($params[0]);
-        foreach ($files as $file) {
-            $command .= ' ' . escapeshellarg($file);
-        }
-        if ($this->config->get('verbose') > 1) {
-            $this->output .= "+ $command\n";
-        }
-        $this->output .= "+ $command\n";
-        if (empty($options['dry-run'])) {
-            $fp = popen($command, "r");
-            while ($line = fgets($fp, 1024)) {
-                $this->output .= rtrim($line)."\n";
-            }
-            pclose($fp);
-        }
-        $this->ui->outputData($this->output, $_cmd);
-        return true;
-    }
-
-    // }}}
-    // {{{ doCvsDiff()
-
-    function doCvsDiff($command, $options, $params)
-    {
-        $this->output = '';
-        if (sizeof($params) < 1) {
-            $help = $this->getHelp($command);
-            return $this->raiseError("$command: missing parameter: $help[0]");
-        }
-        $obj = new PEAR_Common;
-        $info = $obj->infoFromDescriptionFile($params[0]);
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-        $files = array_keys($info['filelist']);
-        $cmd = "cvs";
-        if (isset($options['quiet'])) {
-            $cmd .= ' -q';
-            unset($options['quiet']);
-        }
-        if (isset($options['reallyquiet'])) {
-            $cmd .= ' -Q';
-            unset($options['reallyquiet']);
-        }
-        if (isset($options['release'])) {
-            $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $options['release']);
-            $cvstag = "RELEASE_$cvsversion";
-            $options['revision'] = $cvstag;
-            unset($options['release']);
-        }
-        $execute = true;
-        if (isset($options['dry-run'])) {
-            $execute = false;
-            unset($options['dry-run']);
-        }
-        $cmd .= ' diff';
-        // the rest of the options are passed right on to "cvs diff"
-        foreach ($options as $option => $optarg) {
-            $arg = @$this->commands[$command]['options'][$option]['arg'];
-            $short = @$this->commands[$command]['options'][$option]['shortopt'];
-            $cmd .= $short ? " -$short" : " --$option";
-            if ($arg && $optarg) {
-                $cmd .= ($short ? '' : '=') . escapeshellarg($optarg);
-            }
-        }
-        foreach ($files as $file) {
-            $cmd .= ' ' . escapeshellarg($file);
-        }
-        if ($this->config->get('verbose') > 1) {
-            $this->output .= "+ $cmd\n";
-        }
-        if ($execute) {
-            $fp = popen($cmd, "r");
-            while ($line = fgets($fp, 1024)) {
-                $this->output .= rtrim($line)."\n";
-            }
-            pclose($fp);
-        }
-        $this->ui->outputData($this->output, $command);
-        return true;
-    }
-
-    // }}}
-    // {{{ doRunTests()
-
-    function doRunTests($command, $options, $params)
-    {
-        include_once 'PEAR/RunTest.php';
-        $log = new PEAR_Common;
-        $log->ui = &$this->ui; // slightly hacky, but it will work
-        $run = new PEAR_RunTest($log);
-        $tests = array();
-        if (isset($options['recur'])) {
-            $depth = 4;
-        } else {
-            $depth = 1;
-        }
-        if (!count($params)) {
-            $params[] = '.';
-        }
-        foreach ($params as $p) {
-            if (is_dir($p)) {
-                $dir = System::find(array($p, '-type', 'f',
-                                            '-maxdepth', $depth,
-                                            '-name', '*.phpt'));
-                $tests = array_merge($tests, $dir);
-            } else {
-                if (!@file_exists($p)) {
-                    if (!preg_match('/\.phpt$/', $p)) {
-                        $p .= '.phpt';
-                    }
-                    $dir = System::find(array(dirname($p), '-type', 'f',
-                                                '-maxdepth', $depth,
-                                                '-name', $p));
-                    $tests = array_merge($tests, $dir);
-                } else {
-                    $tests[] = $p;
-                }
-            }
-        }
-        $ini_settings = '';
-        if (isset($options['ini'])) {
-            $ini_settings .= $options['ini'];
-        }
-        if (isset($_ENV['TEST_PHP_INCLUDE_PATH'])) {
-            $ini_settings .= " -d include_path={$_ENV['TEST_PHP_INCLUDE_PATH']}";
-        }
-        if ($ini_settings) {
-            $this->ui->outputData('Using INI settings: "' . $ini_settings . '"');
-        }
-        $skipped = $passed = $failed = array();
-        $this->ui->outputData('Running ' . count($tests) . ' tests', $command);
-        $start = time();
-        if (isset($options['realtimelog'])) {
-            @unlink('run-tests.log');
-        }
-        foreach ($tests as $t) {
-            if (isset($options['realtimelog'])) {
-                $fp = @fopen('run-tests.log', 'a');
-                if ($fp) {
-                    fwrite($fp, "Running test $t...");
-                    fclose($fp);
-                }
-            }
-            $result = $run->run($t, $ini_settings);
-            if (OS_WINDOWS) {
-                for($i=0;$i<2000;$i++) {
-                    $i = $i; // delay - race conditions on windows
-                }
-            }
-            if (isset($options['realtimelog'])) {
-                $fp = @fopen('run-tests.log', 'a');
-                if ($fp) {
-                    fwrite($fp, "$result\n");
-                    fclose($fp);
-                }
-            }
-            if ($result == 'FAILED') {
-            	$failed[] = $t;
-            }
-            if ($result == 'PASSED') {
-            	$passed[] = $t;
-            }
-            if ($result == 'SKIPPED') {
-            	$skipped[] = $t;
-            }
-        }
-        $total = date('i:s', time() - $start);
-        if (count($failed)) {
-            $output = "TOTAL TIME: $total\n";
-            $output .= count($passed) . " PASSED TESTS\n";
-            $output .= count($skipped) . " SKIPPED TESTS\n";
-    		$output .= count($failed) . " FAILED TESTS:\n";
-        	foreach ($failed as $failure) {
-        		$output .= $failure . "\n";
-        	}
-            if (isset($options['realtimelog'])) {
-                $fp = @fopen('run-tests.log', 'a');
-            } else {
-                $fp = @fopen('run-tests.log', 'w');
-            }
-            if ($fp) {
-                fwrite($fp, $output, strlen($output));
-                fclose($fp);
-                $this->ui->outputData('wrote log to "' . realpath('run-tests.log') . '"', $command);
-            }
-        } elseif (@file_exists('run-tests.log') && !@is_dir('run-tests.log')) {
-            @unlink('run-tests.log');
-        }
-        $this->ui->outputData('TOTAL TIME: ' . $total);
-        $this->ui->outputData(count($passed) . ' PASSED TESTS', $command);
-        $this->ui->outputData(count($skipped) . ' SKIPPED TESTS', $command);
-        if (count($failed)) {
-    		$this->ui->outputData(count($failed) . ' FAILED TESTS:', $command);
-        	foreach ($failed as $failure) {
-        		$this->ui->outputData($failure, $command);
-        	}
-        }
-
-        return true;
-    }
-
-    // }}}
-    // {{{ doPackageDependencies()
-
-    function doPackageDependencies($command, $options, $params)
-    {
-        // $params[0] -> the PEAR package to list its information
-        if (sizeof($params) != 1) {
-            return $this->raiseError("bad parameter(s), try \"help $command\"");
-        }
-
-        $obj = new PEAR_Common();
-        if (PEAR::isError($info = $obj->infoFromAny($params[0]))) {
-            return $this->raiseError($info);
-        }
-
-        if (is_array($info['release_deps'])) {
-            $data = array(
-                'caption' => 'Dependencies for ' . $info['package'],
-                'border' => true,
-                'headline' => array("Type", "Name", "Relation", "Version"),
-                );
-
-            foreach ($info['release_deps'] as $d) {
-
-                if (isset($this->_deps_rel_trans[$d['rel']])) {
-                    $rel = $this->_deps_rel_trans[$d['rel']];
-                } else {
-                    $rel = $d['rel'];
-                }
-
-                if (isset($this->_deps_type_trans[$d['type']])) {
-                    $type = ucfirst($this->_deps_type_trans[$d['type']]);
-                } else {
-                    $type = $d['type'];
-                }
-
-                if (isset($d['name'])) {
-                    $name = $d['name'];
-                } else {
-                    $name = '';
-                }
-
-                if (isset($d['version'])) {
-                    $version = $d['version'];
-                } else {
-                    $version = '';
-                }
-
-                $data['data'][] = array($type, $name, $rel, $version);
-            }
-
-            $this->ui->outputData($data, $command);
-            return true;
-        }
-
-        // Fallback
-        $this->ui->outputData("This package does not have any dependencies.", $command);
-    }
-
-    // }}}
-    // {{{ doSign()
-
-    function doSign($command, $options, $params)
-    {
-        // should move most of this code into PEAR_Packager
-        // so it'll be easy to implement "pear package --sign"
-        if (sizeof($params) != 1) {
-            return $this->raiseError("bad parameter(s), try \"help $command\"");
-        }
-        if (!file_exists($params[0])) {
-            return $this->raiseError("file does not exist: $params[0]");
-        }
-        $obj = new PEAR_Common;
-        $info = $obj->infoFromTgzFile($params[0]);
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-        include_once "Archive/Tar.php";
-        include_once "System.php";
-        $tar = new Archive_Tar($params[0]);
-        $tmpdir = System::mktemp('-d pearsign');
-        if (!$tar->extractList('package.xml package.sig', $tmpdir)) {
-            return $this->raiseError("failed to extract tar file");
-        }
-        if (file_exists("$tmpdir/package.sig")) {
-            return $this->raiseError("package already signed");
-        }
-        @unlink("$tmpdir/package.sig");
-        $input = $this->ui->userDialog($command,
-                                       array('GnuPG Passphrase'),
-                                       array('password'));
-        $gpg = popen("gpg --batch --passphrase-fd 0 --armor --detach-sign --output $tmpdir/package.sig $tmpdir/package.xml 2>/dev/null", "w");
-        if (!$gpg) {
-            return $this->raiseError("gpg command failed");
-        }
-        fwrite($gpg, "$input[0]\r");
-        if (pclose($gpg) || !file_exists("$tmpdir/package.sig")) {
-            return $this->raiseError("gpg sign failed");
-        }
-        $tar->addModify("$tmpdir/package.sig", '', $tmpdir);
-        return true;
-    }
-
-    // }}}
-    // {{{ doMakeRPM()
-
-    /*
-
-    (cox)
-
-    TODO:
-
-        - Fill the rpm dependencies in the template file.
-
-    IDEAS:
-
-        - Instead of mapping the role to rpm vars, perhaps it's better
-
-          to use directly the pear cmd to install the files by itself
-
-          in %postrun so:
-
-          pear -d php_dir=%{_libdir}/php/pear -d test_dir=.. <package>
-
-    */
-
-    function doMakeRPM($command, $options, $params)
-    {
-        if (sizeof($params) != 1) {
-            return $this->raiseError("bad parameter(s), try \"help $command\"");
-        }
-        if (!file_exists($params[0])) {
-            return $this->raiseError("file does not exist: $params[0]");
-        }
-        include_once "Archive/Tar.php";
-        include_once "PEAR/Installer.php";
-        include_once "System.php";
-        $tar = new Archive_Tar($params[0]);
-        $tmpdir = System::mktemp('-d pear2rpm');
-        $instroot = System::mktemp('-d pear2rpm');
-        $tmp = $this->config->get('verbose');
-        $this->config->set('verbose', 0);
-        $installer = new PEAR_Installer($this->ui);
-        $info = $installer->install($params[0],
-                                    array('installroot' => $instroot,
-                                          'nodeps' => true));
-        $pkgdir = "$info[package]-$info[version]";
-        $info['rpm_xml_dir'] = '/var/lib/pear';
-        $this->config->set('verbose', $tmp);
-        if (!$tar->extractList("package.xml", $tmpdir, $pkgdir)) {
-            return $this->raiseError("failed to extract $params[0]");
-        }
-        if (!file_exists("$tmpdir/package.xml")) {
-            return $this->raiseError("no package.xml found in $params[0]");
-        }
-        if (isset($options['spec-template'])) {
-            $spec_template = $options['spec-template'];
-        } else {
-            $spec_template = $this->config->get('data_dir') .
-                '/PEAR/template.spec';
-        }
-        if (isset($options['rpm-pkgname'])) {
-            $rpm_pkgname_format = $options['rpm-pkgname'];
-        } else {
-            $rpm_pkgname_format = "PEAR::%s";
-        }
-
-        $info['extra_headers'] = '';
-        $info['doc_files'] = '';
-        $info['files'] = '';
-        $info['rpm_package'] = sprintf($rpm_pkgname_format, $info['package']);
-        $srcfiles = 0;
-        foreach ($info['filelist'] as $name => $attr) {
-
-            if (!isset($attr['role'])) {
-                continue;
-            }
-            $name = preg_replace('![/:\\\\]!', '/', $name);
-            if ($attr['role'] == 'doc') {
-                $info['doc_files'] .= " $name";
-
-            // Map role to the rpm vars
-            } else {
-
-                $c_prefix = '%{_libdir}/php/pear';
-
-                switch ($attr['role']) {
-
-                    case 'php':
-
-                        $prefix = $c_prefix; break;
-
-                    case 'ext':
-
-                        $prefix = '%{_libdir}/php'; break; // XXX good place?
-
-                    case 'src':
-
-                        $srcfiles++;
-
-                        $prefix = '%{_includedir}/php'; break; // XXX good place?
-
-                    case 'test':
-
-                        $prefix = "$c_prefix/tests/" . $info['package']; break;
-
-                    case 'data':
-
-                        $prefix = "$c_prefix/data/" . $info['package']; break;
-
-                    case 'script':
-
-                        $prefix = '%{_bindir}'; break;
-
-                }
-
-                $name = str_replace('\\', '/', $name);
-                $info['files'] .= "$prefix/$name\n";
-
-            }
-        }
-        if ($srcfiles > 0) {
-            include_once "OS/Guess.php";
-            $os = new OS_Guess;
-            $arch = $os->getCpu();
-        } else {
-            $arch = 'noarch';
-        }
-        $cfg = array('master_server', 'php_dir', 'ext_dir', 'doc_dir',
-                     'bin_dir', 'data_dir', 'test_dir');
-        foreach ($cfg as $k) {
-            $info[$k] = $this->config->get($k);
-        }
-        $info['arch'] = $arch;
-        $fp = @fopen($spec_template, "r");
-        if (!$fp) {
-            return $this->raiseError("could not open RPM spec file template $spec_template: $php_errormsg");
-        }
-        $spec_contents = preg_replace('/@([a-z0-9_-]+)@/e', '$info["\1"]', fread($fp, filesize($spec_template)));
-        fclose($fp);
-        $spec_file = "$info[rpm_package]-$info[version].spec";
-        $wp = fopen($spec_file, "wb");
-        if (!$wp) {
-            return $this->raiseError("could not write RPM spec file $spec_file: $php_errormsg");
-        }
-        fwrite($wp, $spec_contents);
-        fclose($wp);
-        $this->ui->outputData("Wrote RPM spec file $spec_file", $command);
-
-        return true;
-    }
-
-    // }}}
-}
-
-?>
diff --git a/3rdparty/PEAR/Command/Registry.php b/3rdparty/PEAR/Command/Registry.php
deleted file mode 100644
index 62cb4b00e28..00000000000
--- a/3rdparty/PEAR/Command/Registry.php
+++ /dev/null
@@ -1,351 +0,0 @@
-<?php
-// /* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Stig Bakken <ssb@php.net>                                    |
-// |                                                                      |
-// +----------------------------------------------------------------------+
-//
-// $Id: Registry.php,v 1.36 2004/01/08 17:33:13 sniper Exp $
-
-require_once 'PEAR/Command/Common.php';
-require_once 'PEAR/Registry.php';
-require_once 'PEAR/Config.php';
-
-class PEAR_Command_Registry extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'list' => array(
-            'summary' => 'List Installed Packages',
-            'function' => 'doList',
-            'shortcut' => 'l',
-            'options' => array(),
-            'doc' => '[package]
-If invoked without parameters, this command lists the PEAR packages
-installed in your php_dir ({config php_dir)).  With a parameter, it
-lists the files in that package.
-',
-            ),
-        'shell-test' => array(
-            'summary' => 'Shell Script Test',
-            'function' => 'doShellTest',
-            'shortcut' => 'st',
-            'options' => array(),
-            'doc' => '<package> [[relation] version]
-Tests if a package is installed in the system. Will exit(1) if it is not.
-   <relation>   The version comparison operator. One of:
-                <, lt, <=, le, >, gt, >=, ge, ==, =, eq, !=, <>, ne
-   <version>    The version to compare with
-'),
-        'info' => array(
-            'summary'  => 'Display information about a package',
-            'function' => 'doInfo',
-            'shortcut' => 'in',
-            'options'  => array(),
-            'doc'      => '<package>
-Displays information about a package. The package argument may be a
-local package file, an URL to a package file, or the name of an
-installed package.'
-            )
-        );
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Registry constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Registry(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    // {{{ doList()
-
-    function _sortinfo($a, $b)
-    {
-        return strcmp($a['package'], $b['package']);
-    }
-
-    function doList($command, $options, $params)
-    {
-        $reg = new PEAR_Registry($this->config->get('php_dir'));
-        if (sizeof($params) == 0) {
-            $installed = $reg->packageInfo();
-            usort($installed, array(&$this, '_sortinfo'));
-            $i = $j = 0;
-            $data = array(
-                'caption' => 'Installed packages:',
-                'border' => true,
-                'headline' => array('Package', 'Version', 'State')
-                );
-            foreach ($installed as $package) {
-                $data['data'][] = array($package['package'],
-                                          $package['version'],
-                                          @$package['release_state']);
-            }
-            if (count($installed)==0) {
-                $data = '(no packages installed)';
-            }
-            $this->ui->outputData($data, $command);
-        } else {
-            if (file_exists($params[0]) && !is_dir($params[0])) {
-                include_once "PEAR/Common.php";
-                $obj = &new PEAR_Common;
-                $info = $obj->infoFromAny($params[0]);
-                $headings = array('Package File', 'Install Path');
-                $installed = false;
-            } else {
-                $info = $reg->packageInfo($params[0]);
-                $headings = array('Type', 'Install Path');
-                $installed = true;
-            }
-            if (PEAR::isError($info)) {
-                return $this->raiseError($info);
-            }
-            if ($info === null) {
-                return $this->raiseError("`$params[0]' not installed");
-            }
-            $list = $info['filelist'];
-            if ($installed) {
-                $caption = 'Installed Files For ' . $params[0];
-            } else {
-                $caption = 'Contents of ' . basename($params[0]);
-            }
-            $data = array(
-                'caption' => $caption,
-                'border' => true,
-                'headline' => $headings);
-            foreach ($list as $file => $att) {
-                if ($installed) {
-                    if (empty($att['installed_as'])) {
-                        continue;
-                    }
-                    $data['data'][] = array($att['role'], $att['installed_as']);
-                } else {
-                    if (isset($att['baseinstalldir'])) {
-                        $dest = $att['baseinstalldir'] . DIRECTORY_SEPARATOR .
-                            $file;
-                    } else {
-                        $dest = $file;
-                    }
-                    switch ($att['role']) {
-                        case 'test':
-                        case 'data':
-                            if ($installed) {
-                                break 2;
-                            }
-                            $dest = '-- will not be installed --';
-                            break;
-                        case 'doc':
-                            $dest = $this->config->get('doc_dir') . DIRECTORY_SEPARATOR .
-                                $dest;
-                            break;
-                        case 'php':
-                        default:
-                            $dest = $this->config->get('php_dir') . DIRECTORY_SEPARATOR .
-                                $dest;
-                    }
-                    $dest = preg_replace('!/+!', '/', $dest);
-                    $file = preg_replace('!/+!', '/', $file);
-                    $data['data'][] = array($file, $dest);
-                }
-            }
-            $this->ui->outputData($data, $command);
-
-
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ doShellTest()
-
-    function doShellTest($command, $options, $params)
-    {
-        $this->pushErrorHandling(PEAR_ERROR_RETURN);
-        $reg = &new PEAR_Registry($this->config->get('php_dir'));
-        // "pear shell-test Foo"
-        if (sizeof($params) == 1) {
-            if (!$reg->packageExists($params[0])) {
-                exit(1);
-            }
-            // "pear shell-test Foo 1.0"
-        } elseif (sizeof($params) == 2) {
-            $v = $reg->packageInfo($params[0], 'version');
-            if (!$v || !version_compare("$v", "{$params[1]}", "ge")) {
-                exit(1);
-            }
-            // "pear shell-test Foo ge 1.0"
-        } elseif (sizeof($params) == 3) {
-            $v = $reg->packageInfo($params[0], 'version');
-            if (!$v || !version_compare("$v", "{$params[2]}", $params[1])) {
-                exit(1);
-            }
-        } else {
-            $this->popErrorHandling();
-            $this->raiseError("$command: expects 1 to 3 parameters");
-            exit(1);
-        }
-    }
-
-    // }}}
-    // {{{ doInfo
-
-    function doInfo($command, $options, $params)
-    {
-        // $params[0] The package for showing info
-        if (sizeof($params) != 1) {
-            return $this->raiseError("This command only accepts one param: ".
-                                     "the package you want information");
-        }
-        if (@is_file($params[0])) {
-            $obj  = &new PEAR_Common();
-            $info = $obj->infoFromAny($params[0]);
-        } else {
-            $reg = &new PEAR_Registry($this->config->get('php_dir'));
-            $info = $reg->packageInfo($params[0]);
-        }
-        if (PEAR::isError($info)) {
-            return $info;
-        }
-        if (empty($info)) {
-            $this->raiseError("Nothing found for `$params[0]'");
-            return;
-        }
-        unset($info['filelist']);
-        unset($info['changelog']);
-        $keys = array_keys($info);
-        $longtext = array('description', 'summary');
-        foreach ($keys as $key) {
-            if (is_array($info[$key])) {
-                switch ($key) {
-                    case 'maintainers': {
-                        $i = 0;
-                        $mstr = '';
-                        foreach ($info[$key] as $m) {
-                            if ($i++ > 0) {
-                                $mstr .= "\n";
-                            }
-                            $mstr .= $m['name'] . " <";
-                            if (isset($m['email'])) {
-                                $mstr .= $m['email'];
-                            } else {
-                                $mstr .= $m['handle'] . '@php.net';
-                            }
-                            $mstr .= "> ($m[role])";
-                        }
-                        $info[$key] = $mstr;
-                        break;
-                    }
-                    case 'release_deps': {
-                        $i = 0;
-                        $dstr = '';
-                        foreach ($info[$key] as $d) {
-                            if (isset($this->_deps_rel_trans[$d['rel']])) {
-                                $rel = $this->_deps_rel_trans[$d['rel']];
-                            } else {
-                                $rel = $d['rel'];
-                            }
-                            if (isset($this->_deps_type_trans[$d['type']])) {
-                                $type = ucfirst($this->_deps_type_trans[$d['type']]);
-                            } else {
-                                $type = $d['type'];
-                            }
-                            if (isset($d['name'])) {
-                                $name = $d['name'] . ' ';
-                            } else {
-                                $name = '';
-                            }
-                            if (isset($d['version'])) {
-                                $version = $d['version'] . ' ';
-                            } else {
-                                $version = '';
-                            }
-                            $dstr .= "$type $name$rel $version\n";
-                        }
-                        $info[$key] = $dstr;
-                        break;
-                    }
-                    case 'provides' : {
-                        $debug = $this->config->get('verbose');
-                        if ($debug < 2) {
-                            $pstr = 'Classes: ';
-                        } else {
-                            $pstr = '';
-                        }
-                        $i = 0;
-                        foreach ($info[$key] as $p) {
-                            if ($debug < 2 && $p['type'] != "class") {
-                                continue;
-                            }
-                            // Only print classes when verbosity mode is < 2
-                            if ($debug < 2) {
-                                if ($i++ > 0) {
-                                    $pstr .= ", ";
-                                }
-                                $pstr .= $p['name'];
-                            } else {
-                                if ($i++ > 0) {
-                                    $pstr .= "\n";
-                                }
-                                $pstr .= ucfirst($p['type']) . " " . $p['name'];
-                                if (isset($p['explicit']) && $p['explicit'] == 1) {
-                                    $pstr .= " (explicit)";
-                                }
-                            }
-                        }
-                        $info[$key] = $pstr;
-                        break;
-                    }
-                    default: {
-                        $info[$key] = implode(", ", $info[$key]);
-                        break;
-                    }
-                }
-            }
-            if ($key == '_lastmodified') {
-                $hdate = date('Y-m-d', $info[$key]);
-                unset($info[$key]);
-                $info['Last Modified'] = $hdate;
-            } else {
-                $info[$key] = trim($info[$key]);
-                if (in_array($key, $longtext)) {
-                    $info[$key] = preg_replace('/  +/', ' ', $info[$key]);
-                }
-            }
-        }
-        $caption = 'About ' . $info['package'] . '-' . $info['version'];
-        $data = array(
-            'caption' => $caption,
-            'border' => true);
-        foreach ($info as $key => $value) {
-            $key = ucwords(trim(str_replace('_', ' ', $key)));
-            $data['data'][] = array($key, $value);
-        }
-        $data['raw'] = $info;
-
-        $this->ui->outputData($data, 'package-info');
-    }
-
-    // }}}
-}
-
-?>
diff --git a/3rdparty/PEAR/Command/Remote.php b/3rdparty/PEAR/Command/Remote.php
deleted file mode 100644
index bbd16093f5d..00000000000
--- a/3rdparty/PEAR/Command/Remote.php
+++ /dev/null
@@ -1,435 +0,0 @@
-<?php
-// /* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Stig Bakken <ssb@php.net>                                    |
-// |                                                                      |
-// +----------------------------------------------------------------------+
-//
-// $Id: Remote.php,v 1.39 2004/04/03 15:56:00 cellog Exp $
-
-require_once 'PEAR/Command/Common.php';
-require_once 'PEAR/Common.php';
-require_once 'PEAR/Remote.php';
-require_once 'PEAR/Registry.php';
-
-class PEAR_Command_Remote extends PEAR_Command_Common
-{
-    // {{{ command definitions
-
-    var $commands = array(
-        'remote-info' => array(
-            'summary' => 'Information About Remote Packages',
-            'function' => 'doRemoteInfo',
-            'shortcut' => 'ri',
-            'options' => array(),
-            'doc' => '<package>
-Get details on a package from the server.',
-            ),
-        'list-upgrades' => array(
-            'summary' => 'List Available Upgrades',
-            'function' => 'doListUpgrades',
-            'shortcut' => 'lu',
-            'options' => array(),
-            'doc' => '
-List releases on the server of packages you have installed where
-a newer version is available with the same release state (stable etc.).'
-            ),
-        'remote-list' => array(
-            'summary' => 'List Remote Packages',
-            'function' => 'doRemoteList',
-            'shortcut' => 'rl',
-            'options' => array(),
-            'doc' => '
-Lists the packages available on the configured server along with the
-latest stable release of each package.',
-            ),
-        'search' => array(
-            'summary' => 'Search remote package database',
-            'function' => 'doSearch',
-            'shortcut' => 'sp',
-            'options' => array(),
-            'doc' => '
-Lists all packages which match the search parameters (first param
-is package name, second package info)',
-            ),
-        'list-all' => array(
-            'summary' => 'List All Packages',
-            'function' => 'doListAll',
-            'shortcut' => 'la',
-            'options' => array(),
-            'doc' => '
-Lists the packages available on the configured server along with the
-latest stable release of each package.',
-            ),
-        'download' => array(
-            'summary' => 'Download Package',
-            'function' => 'doDownload',
-            'shortcut' => 'd',
-            'options' => array(
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'download an uncompressed (.tar) file',
-                    ),
-                ),
-            'doc' => '{package|package-version}
-Download a package tarball.  The file will be named as suggested by the
-server, for example if you download the DB package and the latest stable
-version of DB is 1.2, the downloaded file will be DB-1.2.tgz.',
-            ),
-        'clear-cache' => array(
-            'summary' => 'Clear XML-RPC Cache',
-            'function' => 'doClearCache',
-            'shortcut' => 'cc',
-            'options' => array(),
-            'doc' => '
-Clear the XML-RPC cache.  See also the cache_ttl configuration
-parameter.
-',
-            ),
-        );
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Remote constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Remote(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    // {{{ doRemoteInfo()
-
-    function doRemoteInfo($command, $options, $params)
-    {
-        if (sizeof($params) != 1) {
-            return $this->raiseError("$command expects one param: the remote package name");
-        }
-        $r = new PEAR_Remote($this->config);
-        $info = $r->call('package.info', $params[0]);
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-
-        $reg = new PEAR_Registry($this->config->get('php_dir'));
-        $installed = $reg->packageInfo($info['name']);
-        $info['installed'] = $installed['version'] ? $installed['version'] : '- no -';
-
-        $this->ui->outputData($info, $command);
-
-        return true;
-    }
-
-    // }}}
-    // {{{ doRemoteList()
-
-    function doRemoteList($command, $options, $params)
-    {
-        $r = new PEAR_Remote($this->config);
-        $list_options = false;
-        if ($this->config->get('preferred_state') == 'stable')
-            $list_options = true;
-        $available = $r->call('package.listAll', $list_options);
-        if (PEAR::isError($available)) {
-            return $this->raiseError($available);
-        }
-        $i = $j = 0;
-        $data = array(
-            'caption' => 'Available packages:',
-            'border' => true,
-            'headline' => array('Package', 'Version'),
-            );
-        foreach ($available as $name => $info) {
-            $data['data'][] = array($name, isset($info['stable']) ? $info['stable'] : '-n/a-');
-        }
-        if (count($available)==0) {
-            $data = '(no packages installed yet)';
-        }
-        $this->ui->outputData($data, $command);
-        return true;
-    }
-
-    // }}}
-    // {{{ doListAll()
-
-    function doListAll($command, $options, $params)
-    {
-        $r = new PEAR_Remote($this->config);
-        $reg = new PEAR_Registry($this->config->get('php_dir'));
-        $list_options = false;
-        if ($this->config->get('preferred_state') == 'stable')
-            $list_options = true;
-        $available = $r->call('package.listAll', $list_options);
-        if (PEAR::isError($available)) {
-            return $this->raiseError($available);
-        }
-        if (!is_array($available)) {
-            return $this->raiseError('The package list could not be fetched from the remote server. Please try again. (Debug info: "'.$available.'")');
-        }
-        $data = array(
-            'caption' => 'All packages:',
-            'border' => true,
-            'headline' => array('Package', 'Latest', 'Local'),
-            );
-        $local_pkgs = $reg->listPackages();
-        
-        foreach ($available as $name => $info) {
-            $installed = $reg->packageInfo($name);
-            $desc = $info['summary'];
-            if (isset($params[$name]))
-                $desc .= "\n\n".$info['description'];
-
-            if (isset($options['mode']))
-            {
-                if ($options['mode'] == 'installed' && !isset($installed['version']))
-                    continue;
-                if ($options['mode'] == 'notinstalled' && isset($installed['version']))
-                    continue;
-                if ($options['mode'] == 'upgrades'
-                    && (!isset($installed['version']) || $installed['version'] == $info['stable']))
-                {
-                    continue;
-                }
-            }
-            $pos = array_search(strtolower($name), $local_pkgs);
-            if ($pos !== false) {
-                unset($local_pkgs[$pos]);
-            }
-
-            $data['data'][$info['category']][] = array(
-                $name,
-                @$info['stable'],
-                @$installed['version'],
-                @$desc,
-                @$info['deps'],
-                );
-        }
-        
-        foreach ($local_pkgs as $name) {
-            $info = $reg->packageInfo($name);
-            $data['data']['Local'][] = array(
-                $info['package'], 
-                '',
-                $info['version'],
-                $info['summary'],
-                @$info['release_deps']
-                );
-        }
-
-        $this->ui->outputData($data, $command);
-        return true;
-    }
-
-    // }}}
-    // {{{ doSearch()
-
-    function doSearch($command, $options, $params)
-    {
-        if ((!isset($params[0]) || empty($params[0]))
-            && (!isset($params[1]) || empty($params[1])))
-        {
-            return $this->raiseError('no valid search string supplied');
-        };
-
-        $r = new PEAR_Remote($this->config);
-        $reg = new PEAR_Registry($this->config->get('php_dir'));
-        $available = $r->call('package.listAll', true, false);
-        if (PEAR::isError($available)) {
-            return $this->raiseError($available);
-        }
-        $data = array(
-            'caption' => 'Matched packages:',
-            'border' => true,
-            'headline' => array('Package', 'Stable/(Latest)', 'Local'),
-            );
-
-        foreach ($available as $name => $info) {
-            $found = (!empty($params[0]) && stristr($name, $params[0]) !== false);
-            if (!$found && !(isset($params[1]) && !empty($params[1])
-                && (stristr($info['summary'], $params[1]) !== false
-                    || stristr($info['description'], $params[1]) !== false)))
-            {
-                continue;
-            };
-
-            $installed = $reg->packageInfo($name);
-            $desc = $info['summary'];
-            if (isset($params[$name]))
-                $desc .= "\n\n".$info['description'];
-
-            $unstable = '';
-            if ($info['unstable']) {
-                $unstable = '/(' . $info['unstable'] . $info['state'] . ')';
-            }
-            if (!isset($info['stable']) || !$info['stable']) {
-                $info['stable'] = 'none';
-            }
-            $data['data'][$info['category']][] = array(
-                $name,
-                $info['stable'] . $unstable,
-                $installed['version'],
-                $desc,
-                );
-        }
-        if (!isset($data['data'])) {
-            return $this->raiseError('no packages found');
-        }
-        $this->ui->outputData($data, $command);
-        return true;
-    }
-
-    // }}}
-    // {{{ doDownload()
-
-    function doDownload($command, $options, $params)
-    {
-        //$params[0] -> The package to download
-        if (count($params) != 1) {
-            return PEAR::raiseError("download expects one argument: the package to download");
-        }
-        $server = $this->config->get('master_server');
-        if (!ereg('^http://', $params[0])) {
-            $getoption = isset($options['nocompress'])&&$options['nocompress']==1?'?uncompress=on':'';
-            $pkgfile = "http://$server/get/$params[0]".$getoption;
-        } else {
-            $pkgfile = $params[0];
-        }
-        $this->bytes_downloaded = 0;
-        $saved = PEAR_Common::downloadHttp($pkgfile, $this->ui, '.',
-                                           array(&$this, 'downloadCallback'));
-        if (PEAR::isError($saved)) {
-            return $this->raiseError($saved);
-        }
-        $fname = basename($saved);
-        $this->ui->outputData("File $fname downloaded ($this->bytes_downloaded bytes)", $command);
-        return true;
-    }
-
-    function downloadCallback($msg, $params = null)
-    {
-        if ($msg == 'done') {
-            $this->bytes_downloaded = $params;
-        }
-    }
-
-    // }}}
-    // {{{ doListUpgrades()
-
-    function doListUpgrades($command, $options, $params)
-    {
-        include_once "PEAR/Registry.php";
-        $remote = new PEAR_Remote($this->config);
-        if (empty($params[0])) {
-            $state = $this->config->get('preferred_state');
-        } else {
-            $state = $params[0];
-        }
-        $caption = 'Available Upgrades';
-        if (empty($state) || $state == 'any') {
-            $latest = $remote->call("package.listLatestReleases");
-        } else {
-            $latest = $remote->call("package.listLatestReleases", $state);
-            $caption .= ' (' . implode(', ', PEAR_Common::betterStates($state, true)) . ')';
-        }
-        $caption .= ':';
-        if (PEAR::isError($latest)) {
-            return $latest;
-        }
-        $reg = new PEAR_Registry($this->config->get('php_dir'));
-        $inst = array_flip($reg->listPackages());
-        $data = array(
-            'caption' => $caption,
-            'border' => 1,
-            'headline' => array('Package', 'Local', 'Remote', 'Size'),
-            );
-        foreach ((array)$latest as $pkg => $info) {
-            $package = strtolower($pkg);
-            if (!isset($inst[$package])) {
-                // skip packages we don't have installed
-                continue;
-            }
-            extract($info);
-            $pkginfo = $reg->packageInfo($package);
-            $inst_version = $pkginfo['version'];
-            $inst_state   = $pkginfo['release_state'];
-            if (version_compare("$version", "$inst_version", "le")) {
-                // installed version is up-to-date
-                continue;
-            }
-            if ($filesize >= 20480) {
-                $filesize += 1024 - ($filesize % 1024);
-                $fs = sprintf("%dkB", $filesize / 1024);
-            } elseif ($filesize > 0) {
-                $filesize += 103 - ($filesize % 103);
-                $fs = sprintf("%.1fkB", $filesize / 1024.0);
-            } else {
-                $fs = "  -"; // XXX center instead
-            }
-            $data['data'][] = array($pkg, "$inst_version ($inst_state)", "$version ($state)", $fs);
-        }
-        if (empty($data['data'])) {
-            $this->ui->outputData('No upgrades available');
-        } else {
-            $this->ui->outputData($data, $command);
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ doClearCache()
-
-    function doClearCache($command, $options, $params)
-    {
-        $cache_dir = $this->config->get('cache_dir');
-        $verbose = $this->config->get('verbose');
-        $output = '';
-        if (!($dp = @opendir($cache_dir))) {
-            return $this->raiseError("opendir($cache_dir) failed: $php_errormsg");
-        }
-        if ($verbose >= 1) {
-            $output .= "reading directory $cache_dir\n";
-        }
-        $num = 0;
-        while ($ent = readdir($dp)) {
-            if (preg_match('/^xmlrpc_cache_[a-z0-9]{32}$/', $ent)) {
-                $path = $cache_dir . DIRECTORY_SEPARATOR . $ent;
-                $ok = @unlink($path);
-                if ($ok) {
-                    if ($verbose >= 2) {
-                        $output .= "deleted $path\n";
-                    }
-                    $num++;
-                } elseif ($verbose >= 1) {
-                    $output .= "failed to delete $path\n";
-                }
-            }
-        }
-        closedir($dp);
-        if ($verbose >= 1) {
-            $output .= "$num cache entries cleared\n";
-        }
-        $this->ui->outputData(rtrim($output), $command);
-        return $num;
-    }
-
-    // }}}
-}
-
-?>
diff --git a/3rdparty/PEAR/Common.php b/3rdparty/PEAR/Common.php
deleted file mode 100644
index fba53a37799..00000000000
--- a/3rdparty/PEAR/Common.php
+++ /dev/null
@@ -1,2094 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Stig Bakken <ssb@php.net>                                   |
-// |          Tomas V.V.Cox <cox@idecnet.com>                             |
-// +----------------------------------------------------------------------+
-//
-// $Id: Common.php,v 1.126.2.2 2004/12/27 07:04:19 cellog Exp $
-
-require_once 'PEAR.php';
-require_once 'Archive/Tar.php';
-require_once 'System.php';
-require_once 'PEAR/Config.php';
-
-// {{{ constants and globals
-
-/**
- * PEAR_Common error when an invalid PHP file is passed to PEAR_Common::analyzeSourceCode()
- */
-define('PEAR_COMMON_ERROR_INVALIDPHP', 1);
-define('_PEAR_COMMON_PACKAGE_NAME_PREG', '[A-Za-z][a-zA-Z0-9_]+');
-define('PEAR_COMMON_PACKAGE_NAME_PREG', '/^' . _PEAR_COMMON_PACKAGE_NAME_PREG . '$/');
-
-// this should allow: 1, 1.0, 1.0RC1, 1.0dev, 1.0dev123234234234, 1.0a1, 1.0b1, 1.0pl1
-define('_PEAR_COMMON_PACKAGE_VERSION_PREG', '\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?');
-define('PEAR_COMMON_PACKAGE_VERSION_PREG', '/^' . _PEAR_COMMON_PACKAGE_VERSION_PREG . '$/i');
-
-// XXX far from perfect :-)
-define('PEAR_COMMON_PACKAGE_DOWNLOAD_PREG', '/^(' . _PEAR_COMMON_PACKAGE_NAME_PREG . ')(-([.0-9a-zA-Z]+))?$/');
-
-/**
- * List of temporary files and directories registered by
- * PEAR_Common::addTempFile().
- * @var array
- */
-$GLOBALS['_PEAR_Common_tempfiles'] = array();
-
-/**
- * Valid maintainer roles
- * @var array
- */
-$GLOBALS['_PEAR_Common_maintainer_roles'] = array('lead','developer','contributor','helper');
-
-/**
- * Valid release states
- * @var array
- */
-$GLOBALS['_PEAR_Common_release_states'] = array('alpha','beta','stable','snapshot','devel');
-
-/**
- * Valid dependency types
- * @var array
- */
-$GLOBALS['_PEAR_Common_dependency_types'] = array('pkg','ext','php','prog','ldlib','rtlib','os','websrv','sapi');
-
-/**
- * Valid dependency relations
- * @var array
- */
-$GLOBALS['_PEAR_Common_dependency_relations'] = array('has','eq','lt','le','gt','ge','not', 'ne');
-
-/**
- * Valid file roles
- * @var array
- */
-$GLOBALS['_PEAR_Common_file_roles'] = array('php','ext','test','doc','data','src','script');
-
-/**
- * Valid replacement types
- * @var array
- */
-$GLOBALS['_PEAR_Common_replacement_types'] = array('php-const', 'pear-config', 'package-info');
-
-/**
- * Valid "provide" types
- * @var array
- */
-$GLOBALS['_PEAR_Common_provide_types'] = array('ext', 'prog', 'class', 'function', 'feature', 'api');
-
-/**
- * Valid "provide" types
- * @var array
- */
-$GLOBALS['_PEAR_Common_script_phases'] = array('pre-install', 'post-install', 'pre-uninstall', 'post-uninstall', 'pre-build', 'post-build', 'pre-configure', 'post-configure', 'pre-setup', 'post-setup');
-
-// }}}
-
-/**
- * Class providing common functionality for PEAR administration classes.
- * @deprecated This class will disappear, and its components will be spread
- *             into smaller classes, like the AT&T breakup
- */
-class PEAR_Common extends PEAR
-{
-    // {{{ properties
-
-    /** stack of elements, gives some sort of XML context */
-    var $element_stack = array();
-
-    /** name of currently parsed XML element */
-    var $current_element;
-
-    /** array of attributes of the currently parsed XML element */
-    var $current_attributes = array();
-
-    /** assoc with information about a package */
-    var $pkginfo = array();
-
-    /**
-     * User Interface object (PEAR_Frontend_* class).  If null,
-     * the log() method uses print.
-     * @var object
-     */
-    var $ui = null;
-
-    /**
-     * Configuration object (PEAR_Config).
-     * @var object
-     */
-    var $config = null;
-
-    var $current_path = null;
-
-    /**
-     * PEAR_SourceAnalyzer instance
-     * @var object
-     */
-    var $source_analyzer = null;
-    /**
-     * Flag variable used to mark a valid package file
-     * @var boolean
-     * @access private
-     */
-    var $_validPackageFile;
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * PEAR_Common constructor
-     *
-     * @access public
-     */
-    function PEAR_Common()
-    {
-        parent::PEAR();
-        $this->config = &PEAR_Config::singleton();
-        $this->debug = $this->config->get('verbose');
-    }
-
-    // }}}
-    // {{{ destructor
-
-    /**
-     * PEAR_Common destructor
-     *
-     * @access private
-     */
-    function _PEAR_Common()
-    {
-        // doesn't work due to bug #14744
-        //$tempfiles = $this->_tempfiles;
-        $tempfiles =& $GLOBALS['_PEAR_Common_tempfiles'];
-        while ($file = array_shift($tempfiles)) {
-            if (@is_dir($file)) {
-                System::rm(array('-rf', $file));
-            } elseif (file_exists($file)) {
-                unlink($file);
-            }
-        }
-    }
-
-    // }}}
-    // {{{ addTempFile()
-
-    /**
-     * Register a temporary file or directory.  When the destructor is
-     * executed, all registered temporary files and directories are
-     * removed.
-     *
-     * @param string  $file  name of file or directory
-     *
-     * @return void
-     *
-     * @access public
-     */
-    function addTempFile($file)
-    {
-        $GLOBALS['_PEAR_Common_tempfiles'][] = $file;
-    }
-
-    // }}}
-    // {{{ mkDirHier()
-
-    /**
-     * Wrapper to System::mkDir(), creates a directory as well as
-     * any necessary parent directories.
-     *
-     * @param string  $dir  directory name
-     *
-     * @return bool TRUE on success, or a PEAR error
-     *
-     * @access public
-     */
-    function mkDirHier($dir)
-    {
-        $this->log(2, "+ create dir $dir");
-        return System::mkDir(array('-p', $dir));
-    }
-
-    // }}}
-    // {{{ log()
-
-    /**
-     * Logging method.
-     *
-     * @param int    $level  log level (0 is quiet, higher is noisier)
-     * @param string $msg    message to write to the log
-     *
-     * @return void
-     *
-     * @access public
-     */
-    function log($level, $msg, $append_crlf = true)
-    {
-        if ($this->debug >= $level) {
-            if (is_object($this->ui)) {
-                $this->ui->log($msg, $append_crlf);
-            } else {
-                print "$msg\n";
-            }
-        }
-    }
-
-    // }}}
-    // {{{ mkTempDir()
-
-    /**
-     * Create and register a temporary directory.
-     *
-     * @param string $tmpdir (optional) Directory to use as tmpdir.
-     *                       Will use system defaults (for example
-     *                       /tmp or c:\windows\temp) if not specified
-     *
-     * @return string name of created directory
-     *
-     * @access public
-     */
-    function mkTempDir($tmpdir = '')
-    {
-        if ($tmpdir) {
-            $topt = array('-t', $tmpdir);
-        } else {
-            $topt = array();
-        }
-        $topt = array_merge($topt, array('-d', 'pear'));
-        if (!$tmpdir = System::mktemp($topt)) {
-            return false;
-        }
-        $this->addTempFile($tmpdir);
-        return $tmpdir;
-    }
-
-    // }}}
-    // {{{ setFrontendObject()
-
-    /**
-     * Set object that represents the frontend to be used.
-     *
-     * @param  object Reference of the frontend object
-     * @return void
-     * @access public
-     */
-    function setFrontendObject(&$ui)
-    {
-        $this->ui = &$ui;
-    }
-
-    // }}}
-
-    // {{{ _unIndent()
-
-    /**
-     * Unindent given string (?)
-     *
-     * @param string $str The string that has to be unindented.
-     * @return string
-     * @access private
-     */
-    function _unIndent($str)
-    {
-        // remove leading newlines
-        $str = preg_replace('/^[\r\n]+/', '', $str);
-        // find whitespace at the beginning of the first line
-        $indent_len = strspn($str, " \t");
-        $indent = substr($str, 0, $indent_len);
-        $data = '';
-        // remove the same amount of whitespace from following lines
-        foreach (explode("\n", $str) as $line) {
-            if (substr($line, 0, $indent_len) == $indent) {
-                $data .= substr($line, $indent_len) . "\n";
-            }
-        }
-        return $data;
-    }
-
-    // }}}
-    // {{{ _element_start()
-
-    /**
-     * XML parser callback for starting elements.  Used while package
-     * format version is not yet known.
-     *
-     * @param resource  $xp       XML parser resource
-     * @param string    $name     name of starting element
-     * @param array     $attribs  element attributes, name => value
-     *
-     * @return void
-     *
-     * @access private
-     */
-    function _element_start($xp, $name, $attribs)
-    {
-        array_push($this->element_stack, $name);
-        $this->current_element = $name;
-        $spos = sizeof($this->element_stack) - 2;
-        $this->prev_element = ($spos >= 0) ? $this->element_stack[$spos] : '';
-        $this->current_attributes = $attribs;
-        switch ($name) {
-            case 'package': {
-                $this->_validPackageFile = true;
-                if (isset($attribs['version'])) {
-                    $vs = preg_replace('/[^0-9a-z]/', '_', $attribs['version']);
-                } else {
-                    $vs = '1_0';
-                }
-                $elem_start = '_element_start_'. $vs;
-                $elem_end = '_element_end_'. $vs;
-                $cdata = '_pkginfo_cdata_'. $vs;
-                if (!method_exists($this, $elem_start) ||
-                      !method_exists($this, $elem_end) ||
-                      !method_exists($this, $cdata)) {
-                    $this->raiseError("No handlers for package.xml version $attribs[version]");
-                    return;
-                }
-                xml_set_element_handler($xp, $elem_start, $elem_end);
-                xml_set_character_data_handler($xp, $cdata);
-                break;
-            }
-        }
-    }
-
-    // }}}
-    // {{{ _element_end()
-
-    /**
-     * XML parser callback for ending elements.  Used while package
-     * format version is not yet known.
-     *
-     * @param resource  $xp    XML parser resource
-     * @param string    $name  name of ending element
-     *
-     * @return void
-     *
-     * @access private
-     */
-    function _element_end($xp, $name)
-    {
-    }
-
-    // }}}
-
-    // Support for package DTD v1.0:
-    // {{{ _element_start_1_0()
-
-    /**
-     * XML parser callback for ending elements.  Used for version 1.0
-     * packages.
-     *
-     * @param resource  $xp    XML parser resource
-     * @param string    $name  name of ending element
-     *
-     * @return void
-     *
-     * @access private
-     */
-    function _element_start_1_0($xp, $name, $attribs)
-    {
-        array_push($this->element_stack, $name);
-        $this->current_element = $name;
-        $spos = sizeof($this->element_stack) - 2;
-        $this->prev_element = ($spos >= 0) ? $this->element_stack[$spos] : '';
-        $this->current_attributes = $attribs;
-        $this->cdata = '';
-        switch ($name) {
-            case 'dir':
-                if ($this->in_changelog) {
-                    break;
-                }
-                if ($attribs['name'] != '/') {
-                    $this->dir_names[] = $attribs['name'];
-                }
-                if (isset($attribs['baseinstalldir'])) {
-                    $this->dir_install = $attribs['baseinstalldir'];
-                }
-                if (isset($attribs['role'])) {
-                    $this->dir_role = $attribs['role'];
-                }
-                break;
-            case 'file':
-                if ($this->in_changelog) {
-                    break;
-                }
-                if (isset($attribs['name'])) {
-                    $path = '';
-                    if (count($this->dir_names)) {
-                        foreach ($this->dir_names as $dir) {
-                            $path .= $dir . DIRECTORY_SEPARATOR;
-                        }
-                    }
-                    $path .= $attribs['name'];
-                    unset($attribs['name']);
-                    $this->current_path = $path;
-                    $this->filelist[$path] = $attribs;
-                    // Set the baseinstalldir only if the file don't have this attrib
-                    if (!isset($this->filelist[$path]['baseinstalldir']) &&
-                        isset($this->dir_install))
-                    {
-                        $this->filelist[$path]['baseinstalldir'] = $this->dir_install;
-                    }
-                    // Set the Role
-                    if (!isset($this->filelist[$path]['role']) && isset($this->dir_role)) {
-                        $this->filelist[$path]['role'] = $this->dir_role;
-                    }
-                }
-                break;
-            case 'replace':
-                if (!$this->in_changelog) {
-                    $this->filelist[$this->current_path]['replacements'][] = $attribs;
-                }
-                break;
-            case 'maintainers':
-                $this->pkginfo['maintainers'] = array();
-                $this->m_i = 0; // maintainers array index
-                break;
-            case 'maintainer':
-                // compatibility check
-                if (!isset($this->pkginfo['maintainers'])) {
-                    $this->pkginfo['maintainers'] = array();
-                    $this->m_i = 0;
-                }
-                $this->pkginfo['maintainers'][$this->m_i] = array();
-                $this->current_maintainer =& $this->pkginfo['maintainers'][$this->m_i];
-                break;
-            case 'changelog':
-                $this->pkginfo['changelog'] = array();
-                $this->c_i = 0; // changelog array index
-                $this->in_changelog = true;
-                break;
-            case 'release':
-                if ($this->in_changelog) {
-                    $this->pkginfo['changelog'][$this->c_i] = array();
-                    $this->current_release = &$this->pkginfo['changelog'][$this->c_i];
-                } else {
-                    $this->current_release = &$this->pkginfo;
-                }
-                break;
-            case 'deps':
-                if (!$this->in_changelog) {
-                    $this->pkginfo['release_deps'] = array();
-                }
-                break;
-            case 'dep':
-                // dependencies array index
-                if (!$this->in_changelog) {
-                    $this->d_i++;
-                    $this->pkginfo['release_deps'][$this->d_i] = $attribs;
-                }
-                break;
-            case 'configureoptions':
-                if (!$this->in_changelog) {
-                    $this->pkginfo['configure_options'] = array();
-                }
-                break;
-            case 'configureoption':
-                if (!$this->in_changelog) {
-                    $this->pkginfo['configure_options'][] = $attribs;
-                }
-                break;
-            case 'provides':
-                if (empty($attribs['type']) || empty($attribs['name'])) {
-                    break;
-                }
-                $attribs['explicit'] = true;
-                $this->pkginfo['provides']["$attribs[type];$attribs[name]"] = $attribs;
-                break;
-        }
-    }
-
-    // }}}
-    // {{{ _element_end_1_0()
-
-    /**
-     * XML parser callback for ending elements.  Used for version 1.0
-     * packages.
-     *
-     * @param resource  $xp    XML parser resource
-     * @param string    $name  name of ending element
-     *
-     * @return void
-     *
-     * @access private
-     */
-    function _element_end_1_0($xp, $name)
-    {
-        $data = trim($this->cdata);
-        switch ($name) {
-            case 'name':
-                switch ($this->prev_element) {
-                    case 'package':
-                        // XXX should we check the package name here?
-                        $this->pkginfo['package'] = ereg_replace('[^a-zA-Z0-9._]', '_', $data);
-                        break;
-                    case 'maintainer':
-                        $this->current_maintainer['name'] = $data;
-                        break;
-                }
-                break;
-            case 'summary':
-                $this->pkginfo['summary'] = $data;
-                break;
-            case 'description':
-                $data = $this->_unIndent($this->cdata);
-                $this->pkginfo['description'] = $data;
-                break;
-            case 'user':
-                $this->current_maintainer['handle'] = $data;
-                break;
-            case 'email':
-                $this->current_maintainer['email'] = $data;
-                break;
-            case 'role':
-                $this->current_maintainer['role'] = $data;
-                break;
-            case 'version':
-                $data = ereg_replace ('[^a-zA-Z0-9._\-]', '_', $data);
-                if ($this->in_changelog) {
-                    $this->current_release['version'] = $data;
-                } else {
-                    $this->pkginfo['version'] = $data;
-                }
-                break;
-            case 'date':
-                if ($this->in_changelog) {
-                    $this->current_release['release_date'] = $data;
-                } else {
-                    $this->pkginfo['release_date'] = $data;
-                }
-                break;
-            case 'notes':
-                // try to "de-indent" release notes in case someone
-                // has been over-indenting their xml ;-)
-                $data = $this->_unIndent($this->cdata);
-                if ($this->in_changelog) {
-                    $this->current_release['release_notes'] = $data;
-                } else {
-                    $this->pkginfo['release_notes'] = $data;
-                }
-                break;
-            case 'warnings':
-                if ($this->in_changelog) {
-                    $this->current_release['release_warnings'] = $data;
-                } else {
-                    $this->pkginfo['release_warnings'] = $data;
-                }
-                break;
-            case 'state':
-                if ($this->in_changelog) {
-                    $this->current_release['release_state'] = $data;
-                } else {
-                    $this->pkginfo['release_state'] = $data;
-                }
-                break;
-            case 'license':
-                if ($this->in_changelog) {
-                    $this->current_release['release_license'] = $data;
-                } else {
-                    $this->pkginfo['release_license'] = $data;
-                }
-                break;
-            case 'dep':
-                if ($data && !$this->in_changelog) {
-                    $this->pkginfo['release_deps'][$this->d_i]['name'] = $data;
-                }
-                break;
-            case 'dir':
-                if ($this->in_changelog) {
-                    break;
-                }
-                array_pop($this->dir_names);
-                break;
-            case 'file':
-                if ($this->in_changelog) {
-                    break;
-                }
-                if ($data) {
-                    $path = '';
-                    if (count($this->dir_names)) {
-                        foreach ($this->dir_names as $dir) {
-                            $path .= $dir . DIRECTORY_SEPARATOR;
-                        }
-                    }
-                    $path .= $data;
-                    $this->filelist[$path] = $this->current_attributes;
-                    // Set the baseinstalldir only if the file don't have this attrib
-                    if (!isset($this->filelist[$path]['baseinstalldir']) &&
-                        isset($this->dir_install))
-                    {
-                        $this->filelist[$path]['baseinstalldir'] = $this->dir_install;
-                    }
-                    // Set the Role
-                    if (!isset($this->filelist[$path]['role']) && isset($this->dir_role)) {
-                        $this->filelist[$path]['role'] = $this->dir_role;
-                    }
-                }
-                break;
-            case 'maintainer':
-                if (empty($this->pkginfo['maintainers'][$this->m_i]['role'])) {
-                    $this->pkginfo['maintainers'][$this->m_i]['role'] = 'lead';
-                }
-                $this->m_i++;
-                break;
-            case 'release':
-                if ($this->in_changelog) {
-                    $this->c_i++;
-                }
-                break;
-            case 'changelog':
-                $this->in_changelog = false;
-                break;
-        }
-        array_pop($this->element_stack);
-        $spos = sizeof($this->element_stack) - 1;
-        $this->current_element = ($spos > 0) ? $this->element_stack[$spos] : '';
-        $this->cdata = '';
-    }
-
-    // }}}
-    // {{{ _pkginfo_cdata_1_0()
-
-    /**
-     * XML parser callback for character data.  Used for version 1.0
-     * packages.
-     *
-     * @param resource  $xp    XML parser resource
-     * @param string    $name  character data
-     *
-     * @return void
-     *
-     * @access private
-     */
-    function _pkginfo_cdata_1_0($xp, $data)
-    {
-        if (isset($this->cdata)) {
-            $this->cdata .= $data;
-        }
-    }
-
-    // }}}
-
-    // {{{ infoFromTgzFile()
-
-    /**
-     * Returns information about a package file.  Expects the name of
-     * a gzipped tar file as input.
-     *
-     * @param string  $file  name of .tgz file
-     *
-     * @return array  array with package information
-     *
-     * @access public
-     *
-     */
-    function infoFromTgzFile($file)
-    {
-        if (!@is_file($file)) {
-            return $this->raiseError("could not open file \"$file\"");
-        }
-        $tar = new Archive_Tar($file);
-        if ($this->debug <= 1) {
-            $tar->pushErrorHandling(PEAR_ERROR_RETURN);
-        }
-        $content = $tar->listContent();
-        if ($this->debug <= 1) {
-            $tar->popErrorHandling();
-        }
-        if (!is_array($content)) {
-            $file = realpath($file);
-            return $this->raiseError("Could not get contents of package \"$file\"".
-                                     '. Invalid tgz file.');
-        }
-        $xml = null;
-        foreach ($content as $file) {
-            $name = $file['filename'];
-            if ($name == 'package.xml') {
-                $xml = $name;
-                break;
-            } elseif (ereg('package.xml$', $name, $match)) {
-                $xml = $match[0];
-                break;
-            }
-        }
-        $tmpdir = System::mkTemp(array('-d', 'pear'));
-        $this->addTempFile($tmpdir);
-        if (!$xml || !$tar->extractList(array($xml), $tmpdir)) {
-            return $this->raiseError('could not extract the package.xml file');
-        }
-        return $this->infoFromDescriptionFile("$tmpdir/$xml");
-    }
-
-    // }}}
-    // {{{ infoFromDescriptionFile()
-
-    /**
-     * Returns information about a package file.  Expects the name of
-     * a package xml file as input.
-     *
-     * @param string  $descfile  name of package xml file
-     *
-     * @return array  array with package information
-     *
-     * @access public
-     *
-     */
-    function infoFromDescriptionFile($descfile)
-    {
-        if (!@is_file($descfile) || !is_readable($descfile) ||
-             (!$fp = @fopen($descfile, 'r'))) {
-            return $this->raiseError("Unable to open $descfile");
-        }
-
-        // read the whole thing so we only get one cdata callback
-        // for each block of cdata
-        $data = fread($fp, filesize($descfile));
-        return $this->infoFromString($data);
-    }
-
-    // }}}
-    // {{{ infoFromString()
-
-    /**
-     * Returns information about a package file.  Expects the contents
-     * of a package xml file as input.
-     *
-     * @param string  $data  name of package xml file
-     *
-     * @return array   array with package information
-     *
-     * @access public
-     *
-     */
-    function infoFromString($data)
-    {
-        require_once('PEAR/Dependency.php');
-        if (PEAR_Dependency::checkExtension($error, 'xml')) {
-            return $this->raiseError($error);
-        }
-        $xp = @xml_parser_create();
-        if (!$xp) {
-            return $this->raiseError('Unable to create XML parser');
-        }
-        xml_set_object($xp, $this);
-        xml_set_element_handler($xp, '_element_start', '_element_end');
-        xml_set_character_data_handler($xp, '_pkginfo_cdata');
-        xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, false);
-
-        $this->element_stack = array();
-        $this->pkginfo = array('provides' => array());
-        $this->current_element = false;
-        unset($this->dir_install);
-        $this->pkginfo['filelist'] = array();
-        $this->filelist =& $this->pkginfo['filelist'];
-        $this->dir_names = array();
-        $this->in_changelog = false;
-        $this->d_i = 0;
-        $this->cdata = '';
-        $this->_validPackageFile = false;
-
-        if (!xml_parse($xp, $data, 1)) {
-            $code = xml_get_error_code($xp);
-            $msg = sprintf("XML error: %s at line %d",
-                           xml_error_string($code),
-                           xml_get_current_line_number($xp));
-            xml_parser_free($xp);
-            return $this->raiseError($msg, $code);
-        }
-
-        xml_parser_free($xp);
-
-        if (!$this->_validPackageFile) {
-            return $this->raiseError('Invalid Package File, no <package> tag');
-        }
-        foreach ($this->pkginfo as $k => $v) {
-            if (!is_array($v)) {
-                $this->pkginfo[$k] = trim($v);
-            }
-        }
-        return $this->pkginfo;
-    }
-    // }}}
-    // {{{ infoFromAny()
-
-    /**
-     * Returns package information from different sources
-     *
-     * This method is able to extract information about a package
-     * from a .tgz archive or from a XML package definition file.
-     *
-     * @access public
-     * @param  string Filename of the source ('package.xml', '<package>.tgz')
-     * @return string
-     */
-    function infoFromAny($info)
-    {
-        if (is_string($info) && file_exists($info)) {
-            $tmp = substr($info, -4);
-            if ($tmp == '.xml') {
-                $info = $this->infoFromDescriptionFile($info);
-            } elseif ($tmp == '.tar' || $tmp == '.tgz') {
-                $info = $this->infoFromTgzFile($info);
-            } else {
-                $fp = fopen($info, "r");
-                $test = fread($fp, 5);
-                fclose($fp);
-                if ($test == "<?xml") {
-                    $info = $this->infoFromDescriptionFile($info);
-                } else {
-                    $info = $this->infoFromTgzFile($info);
-                }
-            }
-            if (PEAR::isError($info)) {
-                return $this->raiseError($info);
-            }
-        }
-        return $info;
-    }
-
-    // }}}
-    // {{{ xmlFromInfo()
-
-    /**
-     * Return an XML document based on the package info (as returned
-     * by the PEAR_Common::infoFrom* methods).
-     *
-     * @param array  $pkginfo  package info
-     *
-     * @return string XML data
-     *
-     * @access public
-     */
-    function xmlFromInfo($pkginfo)
-    {
-        static $maint_map = array(
-            "handle" => "user",
-            "name" => "name",
-            "email" => "email",
-            "role" => "role",
-            );
-        $ret = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>\n";
-        $ret .= "<!DOCTYPE package SYSTEM \"http://pear.php.net/dtd/package-1.0\">\n";
-        $ret .= "<package version=\"1.0\">
-  <name>$pkginfo[package]</name>
-  <summary>".htmlspecialchars($pkginfo['summary'])."</summary>
-  <description>".htmlspecialchars($pkginfo['description'])."</description>
-  <maintainers>
-";
-        foreach ($pkginfo['maintainers'] as $maint) {
-            $ret .= "    <maintainer>\n";
-            foreach ($maint_map as $idx => $elm) {
-                $ret .= "      <$elm>";
-                $ret .= htmlspecialchars($maint[$idx]);
-                $ret .= "</$elm>\n";
-            }
-            $ret .= "    </maintainer>\n";
-        }
-        $ret .= "  </maintainers>\n";
-        $ret .= $this->_makeReleaseXml($pkginfo);
-        if (@sizeof($pkginfo['changelog']) > 0) {
-            $ret .= "  <changelog>\n";
-            foreach ($pkginfo['changelog'] as $oldrelease) {
-                $ret .= $this->_makeReleaseXml($oldrelease, true);
-            }
-            $ret .= "  </changelog>\n";
-        }
-        $ret .= "</package>\n";
-        return $ret;
-    }
-
-    // }}}
-    // {{{ _makeReleaseXml()
-
-    /**
-     * Generate part of an XML description with release information.
-     *
-     * @param array  $pkginfo    array with release information
-     * @param bool   $changelog  whether the result will be in a changelog element
-     *
-     * @return string XML data
-     *
-     * @access private
-     */
-    function _makeReleaseXml($pkginfo, $changelog = false)
-    {
-        // XXX QUOTE ENTITIES IN PCDATA, OR EMBED IN CDATA BLOCKS!!
-        $indent = $changelog ? "  " : "";
-        $ret = "$indent  <release>\n";
-        if (!empty($pkginfo['version'])) {
-            $ret .= "$indent    <version>$pkginfo[version]</version>\n";
-        }
-        if (!empty($pkginfo['release_date'])) {
-            $ret .= "$indent    <date>$pkginfo[release_date]</date>\n";
-        }
-        if (!empty($pkginfo['release_license'])) {
-            $ret .= "$indent    <license>$pkginfo[release_license]</license>\n";
-        }
-        if (!empty($pkginfo['release_state'])) {
-            $ret .= "$indent    <state>$pkginfo[release_state]</state>\n";
-        }
-        if (!empty($pkginfo['release_notes'])) {
-            $ret .= "$indent    <notes>".htmlspecialchars($pkginfo['release_notes'])."</notes>\n";
-        }
-        if (!empty($pkginfo['release_warnings'])) {
-            $ret .= "$indent    <warnings>".htmlspecialchars($pkginfo['release_warnings'])."</warnings>\n";
-        }
-        if (isset($pkginfo['release_deps']) && sizeof($pkginfo['release_deps']) > 0) {
-            $ret .= "$indent    <deps>\n";
-            foreach ($pkginfo['release_deps'] as $dep) {
-                $ret .= "$indent      <dep type=\"$dep[type]\" rel=\"$dep[rel]\"";
-                if (isset($dep['version'])) {
-                    $ret .= " version=\"$dep[version]\"";
-                }
-                if (isset($dep['optional'])) {
-                    $ret .= " optional=\"$dep[optional]\"";
-                }
-                if (isset($dep['name'])) {
-                    $ret .= ">$dep[name]</dep>\n";
-                } else {
-                    $ret .= "/>\n";
-                }
-            }
-            $ret .= "$indent    </deps>\n";
-        }
-        if (isset($pkginfo['configure_options'])) {
-            $ret .= "$indent    <configureoptions>\n";
-            foreach ($pkginfo['configure_options'] as $c) {
-                $ret .= "$indent      <configureoption name=\"".
-                    htmlspecialchars($c['name']) . "\"";
-                if (isset($c['default'])) {
-                    $ret .= " default=\"" . htmlspecialchars($c['default']) . "\"";
-                }
-                $ret .= " prompt=\"" . htmlspecialchars($c['prompt']) . "\"";
-                $ret .= "/>\n";
-            }
-            $ret .= "$indent    </configureoptions>\n";
-        }
-        if (isset($pkginfo['provides'])) {
-            foreach ($pkginfo['provides'] as $key => $what) {
-                $ret .= "$indent    <provides type=\"$what[type]\" ";
-                $ret .= "name=\"$what[name]\" ";
-                if (isset($what['extends'])) {
-                    $ret .= "extends=\"$what[extends]\" ";
-                }
-                $ret .= "/>\n";
-            }
-        }
-        if (isset($pkginfo['filelist'])) {
-            $ret .= "$indent    <filelist>\n";
-            foreach ($pkginfo['filelist'] as $file => $fa) {
-                @$ret .= "$indent      <file role=\"$fa[role]\"";
-                if (isset($fa['baseinstalldir'])) {
-                    $ret .= ' baseinstalldir="' .
-                        htmlspecialchars($fa['baseinstalldir']) . '"';
-                }
-                if (isset($fa['md5sum'])) {
-                    $ret .= " md5sum=\"$fa[md5sum]\"";
-                }
-                if (isset($fa['platform'])) {
-                    $ret .= " platform=\"$fa[platform]\"";
-                }
-                if (!empty($fa['install-as'])) {
-                    $ret .= ' install-as="' .
-                        htmlspecialchars($fa['install-as']) . '"';
-                }
-                $ret .= ' name="' . htmlspecialchars($file) . '"';
-                if (empty($fa['replacements'])) {
-                    $ret .= "/>\n";
-                } else {
-                    $ret .= ">\n";
-                    foreach ($fa['replacements'] as $r) {
-                        $ret .= "$indent        <replace";
-                        foreach ($r as $k => $v) {
-                            $ret .= " $k=\"" . htmlspecialchars($v) .'"';
-                        }
-                        $ret .= "/>\n";
-                    }
-                    @$ret .= "$indent      </file>\n";
-                }
-            }
-            $ret .= "$indent    </filelist>\n";
-        }
-        $ret .= "$indent  </release>\n";
-        return $ret;
-    }
-
-    // }}}
-    // {{{ validatePackageInfo()
-
-    /**
-     * Validate XML package definition file.
-     *
-     * @param  string $info Filename of the package archive or of the
-     *                package definition file
-     * @param  array $errors Array that will contain the errors
-     * @param  array $warnings Array that will contain the warnings
-     * @param  string $dir_prefix (optional) directory where source files
-     *                may be found, or empty if they are not available
-     * @access public
-     * @return boolean
-     */
-    function validatePackageInfo($info, &$errors, &$warnings, $dir_prefix = '')
-    {
-        if (PEAR::isError($info = $this->infoFromAny($info))) {
-            return $this->raiseError($info);
-        }
-        if (!is_array($info)) {
-            return false;
-        }
-
-        $errors = array();
-        $warnings = array();
-        if (!isset($info['package'])) {
-            $errors[] = 'missing package name';
-        } elseif (!$this->validPackageName($info['package'])) {
-            $errors[] = 'invalid package name';
-        }
-        $this->_packageName = $pn = $info['package'];
-
-        if (empty($info['summary'])) {
-            $errors[] = 'missing summary';
-        } elseif (strpos(trim($info['summary']), "\n") !== false) {
-            $warnings[] = 'summary should be on a single line';
-        }
-        if (empty($info['description'])) {
-            $errors[] = 'missing description';
-        }
-        if (empty($info['release_license'])) {
-            $errors[] = 'missing license';
-        }
-        if (!isset($info['version'])) {
-            $errors[] = 'missing version';
-        } elseif (!$this->validPackageVersion($info['version'])) {
-            $errors[] = 'invalid package release version';
-        }
-        if (empty($info['release_state'])) {
-            $errors[] = 'missing release state';
-        } elseif (!in_array($info['release_state'], PEAR_Common::getReleaseStates())) {
-            $errors[] = "invalid release state `$info[release_state]', should be one of: "
-                . implode(' ', PEAR_Common::getReleaseStates());
-        }
-        if (empty($info['release_date'])) {
-            $errors[] = 'missing release date';
-        } elseif (!preg_match('/^\d{4}-\d\d-\d\d$/', $info['release_date'])) {
-            $errors[] = "invalid release date `$info[release_date]', format is YYYY-MM-DD";
-        }
-        if (empty($info['release_notes'])) {
-            $errors[] = "missing release notes";
-        }
-        if (empty($info['maintainers'])) {
-            $errors[] = 'no maintainer(s)';
-        } else {
-            $i = 1;
-            foreach ($info['maintainers'] as $m) {
-                if (empty($m['handle'])) {
-                    $errors[] = "maintainer $i: missing handle";
-                }
-                if (empty($m['role'])) {
-                    $errors[] = "maintainer $i: missing role";
-                } elseif (!in_array($m['role'], PEAR_Common::getUserRoles())) {
-                    $errors[] = "maintainer $i: invalid role `$m[role]', should be one of: "
-                        . implode(' ', PEAR_Common::getUserRoles());
-                }
-                if (empty($m['name'])) {
-                    $errors[] = "maintainer $i: missing name";
-                }
-                if (empty($m['email'])) {
-                    $errors[] = "maintainer $i: missing email";
-                }
-                $i++;
-            }
-        }
-        if (!empty($info['release_deps'])) {
-            $i = 1;
-            foreach ($info['release_deps'] as $d) {
-                if (empty($d['type'])) {
-                    $errors[] = "dependency $i: missing type";
-                } elseif (!in_array($d['type'], PEAR_Common::getDependencyTypes())) {
-                    $errors[] = "dependency $i: invalid type '$d[type]', should be one of: " .
-                        implode(' ', PEAR_Common::getDependencyTypes());
-                }
-                if (empty($d['rel'])) {
-                    $errors[] = "dependency $i: missing relation";
-                } elseif (!in_array($d['rel'], PEAR_Common::getDependencyRelations())) {
-                    $errors[] = "dependency $i: invalid relation '$d[rel]', should be one of: "
-                        . implode(' ', PEAR_Common::getDependencyRelations());
-                }
-                if (!empty($d['optional'])) {
-                    if (!in_array($d['optional'], array('yes', 'no'))) {
-                        $errors[] = "dependency $i: invalid relation optional attribute '$d[optional]', should be one of: yes no";
-                    } else {
-                        if (($d['rel'] == 'not' || $d['rel'] == 'ne') && $d['optional'] == 'yes') {
-                            $errors[] = "dependency $i: 'not' and 'ne' dependencies cannot be " .
-                                "optional";
-                        }
-                    }
-                }
-                if ($d['rel'] != 'not' && $d['rel'] != 'has' && empty($d['version'])) {
-                    $warnings[] = "dependency $i: missing version";
-                } elseif (($d['rel'] == 'not' || $d['rel'] == 'has') && !empty($d['version'])) {
-                    $warnings[] = "dependency $i: version ignored for `$d[rel]' dependencies";
-                }
-                if ($d['rel'] == 'not' && !empty($d['version'])) {
-                    $warnings[] = "dependency $i: 'not' defines a total conflict, to exclude " .
-                        "specific versions, use 'ne'";
-                }
-                if ($d['type'] == 'php' && !empty($d['name'])) {
-                    $warnings[] = "dependency $i: name ignored for php type dependencies";
-                } elseif ($d['type'] != 'php' && empty($d['name'])) {
-                    $errors[] = "dependency $i: missing name";
-                }
-                if ($d['type'] == 'php' && $d['rel'] == 'not') {
-                    $errors[] = "dependency $i: PHP dependencies cannot use 'not' " .
-                        "rel, use 'ne' to exclude versions";
-                }
-                $i++;
-            }
-        }
-        if (!empty($info['configure_options'])) {
-            $i = 1;
-            foreach ($info['configure_options'] as $c) {
-                if (empty($c['name'])) {
-                    $errors[] = "configure option $i: missing name";
-                }
-                if (empty($c['prompt'])) {
-                    $errors[] = "configure option $i: missing prompt";
-                }
-                $i++;
-            }
-        }
-        if (empty($info['filelist'])) {
-            $errors[] = 'no files';
-        } else {
-            foreach ($info['filelist'] as $file => $fa) {
-                if (empty($fa['role'])) {
-                    $errors[] = "file $file: missing role";
-                    continue;
-                } elseif (!in_array($fa['role'], PEAR_Common::getFileRoles())) {
-                    $errors[] = "file $file: invalid role, should be one of: "
-                        . implode(' ', PEAR_Common::getFileRoles());
-                }
-                if ($fa['role'] == 'php' && $dir_prefix) {
-                    $this->log(1, "Analyzing $file");
-                    $srcinfo = $this->analyzeSourceCode($dir_prefix . DIRECTORY_SEPARATOR . $file);
-                    if ($srcinfo) {
-                        $this->buildProvidesArray($srcinfo);
-                    }
-                }
-
-                // (ssb) Any checks we can do for baseinstalldir?
-                // (cox) Perhaps checks that either the target dir and
-                //       baseInstall doesn't cointain "../../"
-            }
-        }
-        $this->_packageName = $pn = $info['package'];
-        $pnl = strlen($pn);
-        foreach ((array)$this->pkginfo['provides'] as $key => $what) {
-            if (isset($what['explicit'])) {
-                // skip conformance checks if the provides entry is
-                // specified in the package.xml file
-                continue;
-            }
-            extract($what);
-            if ($type == 'class') {
-                if (!strncasecmp($name, $pn, $pnl)) {
-                    continue;
-                }
-                $warnings[] = "in $file: class \"$name\" not prefixed with package name \"$pn\"";
-            } elseif ($type == 'function') {
-                if (strstr($name, '::') || !strncasecmp($name, $pn, $pnl)) {
-                    continue;
-                }
-                $warnings[] = "in $file: function \"$name\" not prefixed with package name \"$pn\"";
-            }
-        }
-
-
-        return true;
-    }
-
-    // }}}
-    // {{{ buildProvidesArray()
-
-    /**
-     * Build a "provides" array from data returned by
-     * analyzeSourceCode().  The format of the built array is like
-     * this:
-     *
-     *  array(
-     *    'class;MyClass' => 'array('type' => 'class', 'name' => 'MyClass'),
-     *    ...
-     *  )
-     *
-     *
-     * @param array $srcinfo array with information about a source file
-     * as returned by the analyzeSourceCode() method.
-     *
-     * @return void
-     *
-     * @access public
-     *
-     */
-    function buildProvidesArray($srcinfo)
-    {
-        $file = basename($srcinfo['source_file']);
-        $pn = '';
-        if (isset($this->_packageName)) {
-            $pn = $this->_packageName;
-        }
-        $pnl = strlen($pn);
-        foreach ($srcinfo['declared_classes'] as $class) {
-            $key = "class;$class";
-            if (isset($this->pkginfo['provides'][$key])) {
-                continue;
-            }
-            $this->pkginfo['provides'][$key] =
-                array('file'=> $file, 'type' => 'class', 'name' => $class);
-            if (isset($srcinfo['inheritance'][$class])) {
-                $this->pkginfo['provides'][$key]['extends'] =
-                    $srcinfo['inheritance'][$class];
-            }
-        }
-        foreach ($srcinfo['declared_methods'] as $class => $methods) {
-            foreach ($methods as $method) {
-                $function = "$class::$method";
-                $key = "function;$function";
-                if ($method{0} == '_' || !strcasecmp($method, $class) ||
-                    isset($this->pkginfo['provides'][$key])) {
-                    continue;
-                }
-                $this->pkginfo['provides'][$key] =
-                    array('file'=> $file, 'type' => 'function', 'name' => $function);
-            }
-        }
-
-        foreach ($srcinfo['declared_functions'] as $function) {
-            $key = "function;$function";
-            if ($function{0} == '_' || isset($this->pkginfo['provides'][$key])) {
-                continue;
-            }
-            if (!strstr($function, '::') && strncasecmp($function, $pn, $pnl)) {
-                $warnings[] = "in1 " . $file . ": function \"$function\" not prefixed with package name \"$pn\"";
-            }
-            $this->pkginfo['provides'][$key] =
-                array('file'=> $file, 'type' => 'function', 'name' => $function);
-        }
-    }
-
-    // }}}
-    // {{{ analyzeSourceCode()
-
-    /**
-     * Analyze the source code of the given PHP file
-     *
-     * @param  string Filename of the PHP file
-     * @return mixed
-     * @access public
-     */
-    function analyzeSourceCode($file)
-    {
-        if (!function_exists("token_get_all")) {
-            return false;
-        }
-        if (!defined('T_DOC_COMMENT')) {
-            define('T_DOC_COMMENT', T_COMMENT);
-        }
-        if (!defined('T_INTERFACE')) {
-            define('T_INTERFACE', -1);
-        }
-        if (!defined('T_IMPLEMENTS')) {
-            define('T_IMPLEMENTS', -1);
-        }
-        if (!$fp = @fopen($file, "r")) {
-            return false;
-        }
-        $contents = fread($fp, filesize($file));
-        $tokens = token_get_all($contents);
-/*
-        for ($i = 0; $i < sizeof($tokens); $i++) {
-            @list($token, $data) = $tokens[$i];
-            if (is_string($token)) {
-                var_dump($token);
-            } else {
-                print token_name($token) . ' ';
-                var_dump(rtrim($data));
-            }
-        }
-*/
-        $look_for = 0;
-        $paren_level = 0;
-        $bracket_level = 0;
-        $brace_level = 0;
-        $lastphpdoc = '';
-        $current_class = '';
-        $current_interface = '';
-        $current_class_level = -1;
-        $current_function = '';
-        $current_function_level = -1;
-        $declared_classes = array();
-        $declared_interfaces = array();
-        $declared_functions = array();
-        $declared_methods = array();
-        $used_classes = array();
-        $used_functions = array();
-        $extends = array();
-        $implements = array();
-        $nodeps = array();
-        $inquote = false;
-        $interface = false;
-        for ($i = 0; $i < sizeof($tokens); $i++) {
-            if (is_array($tokens[$i])) {
-                list($token, $data) = $tokens[$i];
-            } else {
-                $token = $tokens[$i];
-                $data = '';
-            }
-            if ($inquote) {
-                if ($token != '"') {
-                    continue;
-                } else {
-                    $inquote = false;
-                }
-            }
-            switch ($token) {
-                case T_WHITESPACE:
-                    continue;
-                case ';':
-                    if ($interface) {
-                        $current_function = '';
-                        $current_function_level = -1;
-                    }
-                    break;
-                case '"':
-                    $inquote = true;
-                    break;
-                case T_CURLY_OPEN:
-                case T_DOLLAR_OPEN_CURLY_BRACES:
-                case '{': $brace_level++; continue 2;
-                case '}':
-                    $brace_level--;
-                    if ($current_class_level == $brace_level) {
-                        $current_class = '';
-                        $current_class_level = -1;
-                    }
-                    if ($current_function_level == $brace_level) {
-                        $current_function = '';
-                        $current_function_level = -1;
-                    }
-                    continue 2;
-                case '[': $bracket_level++; continue 2;
-                case ']': $bracket_level--; continue 2;
-                case '(': $paren_level++;   continue 2;
-                case ')': $paren_level--;   continue 2;
-                case T_INTERFACE:
-                    $interface = true;
-                case T_CLASS:
-                    if (($current_class_level != -1) || ($current_function_level != -1)) {
-                        PEAR::raiseError("Parser error: Invalid PHP file $file",
-                            PEAR_COMMON_ERROR_INVALIDPHP);
-                        return false;
-                    }
-                case T_FUNCTION:
-                case T_NEW:
-                case T_EXTENDS:
-                case T_IMPLEMENTS:
-                    $look_for = $token;
-                    continue 2;
-                case T_STRING:
-                    if (version_compare(zend_version(), '2.0', '<')) {
-                        if (in_array(strtolower($data),
-                            array('public', 'private', 'protected', 'abstract',
-                                  'interface', 'implements', 'clone', 'throw') 
-                                 )) {
-                            PEAR::raiseError('Error: PHP5 packages must be packaged by php 5 PEAR');
-                            return false;
-                        }
-                    }
-                    if ($look_for == T_CLASS) {
-                        $current_class = $data;
-                        $current_class_level = $brace_level;
-                        $declared_classes[] = $current_class;
-                    } elseif ($look_for == T_INTERFACE) {
-                        $current_interface = $data;
-                        $current_class_level = $brace_level;
-                        $declared_interfaces[] = $current_interface;
-                    } elseif ($look_for == T_IMPLEMENTS) {
-                        $implements[$current_class] = $data;
-                    } elseif ($look_for == T_EXTENDS) {
-                        $extends[$current_class] = $data;
-                    } elseif ($look_for == T_FUNCTION) {
-                        if ($current_class) {
-                            $current_function = "$current_class::$data";
-                            $declared_methods[$current_class][] = $data;
-                        } elseif ($current_interface) {
-                            $current_function = "$current_interface::$data";
-                            $declared_methods[$current_interface][] = $data;
-                        } else {
-                            $current_function = $data;
-                            $declared_functions[] = $current_function;
-                        }
-                        $current_function_level = $brace_level;
-                        $m = array();
-                    } elseif ($look_for == T_NEW) {
-                        $used_classes[$data] = true;
-                    }
-                    $look_for = 0;
-                    continue 2;
-                case T_VARIABLE:
-                    $look_for = 0;
-                    continue 2;
-                case T_DOC_COMMENT:
-                case T_COMMENT:
-                    if (preg_match('!^/\*\*\s!', $data)) {
-                        $lastphpdoc = $data;
-                        if (preg_match_all('/@nodep\s+(\S+)/', $lastphpdoc, $m)) {
-                            $nodeps = array_merge($nodeps, $m[1]);
-                        }
-                    }
-                    continue 2;
-                case T_DOUBLE_COLON:
-                    if (!($tokens[$i - 1][0] == T_WHITESPACE || $tokens[$i - 1][0] == T_STRING)) {
-                        PEAR::raiseError("Parser error: Invalid PHP file $file",
-                            PEAR_COMMON_ERROR_INVALIDPHP);
-                        return false;
-                    }
-                    $class = $tokens[$i - 1][1];
-                    if (strtolower($class) != 'parent') {
-                        $used_classes[$class] = true;
-                    }
-                    continue 2;
-            }
-        }
-        return array(
-            "source_file" => $file,
-            "declared_classes" => $declared_classes,
-            "declared_interfaces" => $declared_interfaces,
-            "declared_methods" => $declared_methods,
-            "declared_functions" => $declared_functions,
-            "used_classes" => array_diff(array_keys($used_classes), $nodeps),
-            "inheritance" => $extends,
-            "implements" => $implements,
-            );
-    }
-
-    // }}}
-    // {{{  betterStates()
-
-    /**
-     * Return an array containing all of the states that are more stable than
-     * or equal to the passed in state
-     *
-     * @param string Release state
-     * @param boolean Determines whether to include $state in the list
-     * @return false|array False if $state is not a valid release state
-     */
-    function betterStates($state, $include = false)
-    {
-        static $states = array('snapshot', 'devel', 'alpha', 'beta', 'stable');
-        $i = array_search($state, $states);
-        if ($i === false) {
-            return false;
-        }
-        if ($include) {
-            $i--;
-        }
-        return array_slice($states, $i + 1);
-    }
-
-    // }}}
-    // {{{ detectDependencies()
-
-    function detectDependencies($any, $status_callback = null)
-    {
-        if (!function_exists("token_get_all")) {
-            return false;
-        }
-        if (PEAR::isError($info = $this->infoFromAny($any))) {
-            return $this->raiseError($info);
-        }
-        if (!is_array($info)) {
-            return false;
-        }
-        $deps = array();
-        $used_c = $decl_c = $decl_f = $decl_m = array();
-        foreach ($info['filelist'] as $file => $fa) {
-            $tmp = $this->analyzeSourceCode($file);
-            $used_c = @array_merge($used_c, $tmp['used_classes']);
-            $decl_c = @array_merge($decl_c, $tmp['declared_classes']);
-            $decl_f = @array_merge($decl_f, $tmp['declared_functions']);
-            $decl_m = @array_merge($decl_m, $tmp['declared_methods']);
-            $inheri = @array_merge($inheri, $tmp['inheritance']);
-        }
-        $used_c = array_unique($used_c);
-        $decl_c = array_unique($decl_c);
-        $undecl_c = array_diff($used_c, $decl_c);
-        return array('used_classes' => $used_c,
-                     'declared_classes' => $decl_c,
-                     'declared_methods' => $decl_m,
-                     'declared_functions' => $decl_f,
-                     'undeclared_classes' => $undecl_c,
-                     'inheritance' => $inheri,
-                     );
-    }
-
-    // }}}
-    // {{{ getUserRoles()
-
-    /**
-     * Get the valid roles for a PEAR package maintainer
-     *
-     * @return array
-     * @static
-     */
-    function getUserRoles()
-    {
-        return $GLOBALS['_PEAR_Common_maintainer_roles'];
-    }
-
-    // }}}
-    // {{{ getReleaseStates()
-
-    /**
-     * Get the valid package release states of packages
-     *
-     * @return array
-     * @static
-     */
-    function getReleaseStates()
-    {
-        return $GLOBALS['_PEAR_Common_release_states'];
-    }
-
-    // }}}
-    // {{{ getDependencyTypes()
-
-    /**
-     * Get the implemented dependency types (php, ext, pkg etc.)
-     *
-     * @return array
-     * @static
-     */
-    function getDependencyTypes()
-    {
-        return $GLOBALS['_PEAR_Common_dependency_types'];
-    }
-
-    // }}}
-    // {{{ getDependencyRelations()
-
-    /**
-     * Get the implemented dependency relations (has, lt, ge etc.)
-     *
-     * @return array
-     * @static
-     */
-    function getDependencyRelations()
-    {
-        return $GLOBALS['_PEAR_Common_dependency_relations'];
-    }
-
-    // }}}
-    // {{{ getFileRoles()
-
-    /**
-     * Get the implemented file roles
-     *
-     * @return array
-     * @static
-     */
-    function getFileRoles()
-    {
-        return $GLOBALS['_PEAR_Common_file_roles'];
-    }
-
-    // }}}
-    // {{{ getReplacementTypes()
-
-    /**
-     * Get the implemented file replacement types in
-     *
-     * @return array
-     * @static
-     */
-    function getReplacementTypes()
-    {
-        return $GLOBALS['_PEAR_Common_replacement_types'];
-    }
-
-    // }}}
-    // {{{ getProvideTypes()
-
-    /**
-     * Get the implemented file replacement types in
-     *
-     * @return array
-     * @static
-     */
-    function getProvideTypes()
-    {
-        return $GLOBALS['_PEAR_Common_provide_types'];
-    }
-
-    // }}}
-    // {{{ getScriptPhases()
-
-    /**
-     * Get the implemented file replacement types in
-     *
-     * @return array
-     * @static
-     */
-    function getScriptPhases()
-    {
-        return $GLOBALS['_PEAR_Common_script_phases'];
-    }
-
-    // }}}
-    // {{{ validPackageName()
-
-    /**
-     * Test whether a string contains a valid package name.
-     *
-     * @param string $name the package name to test
-     *
-     * @return bool
-     *
-     * @access public
-     */
-    function validPackageName($name)
-    {
-        return (bool)preg_match(PEAR_COMMON_PACKAGE_NAME_PREG, $name);
-    }
-
-
-    // }}}
-    // {{{ validPackageVersion()
-
-    /**
-     * Test whether a string contains a valid package version.
-     *
-     * @param string $ver the package version to test
-     *
-     * @return bool
-     *
-     * @access public
-     */
-    function validPackageVersion($ver)
-    {
-        return (bool)preg_match(PEAR_COMMON_PACKAGE_VERSION_PREG, $ver);
-    }
-
-
-    // }}}
-
-    // {{{ downloadHttp()
-
-    /**
-     * Download a file through HTTP.  Considers suggested file name in
-     * Content-disposition: header and can run a callback function for
-     * different events.  The callback will be called with two
-     * parameters: the callback type, and parameters.  The implemented
-     * callback types are:
-     *
-     *  'setup'       called at the very beginning, parameter is a UI object
-     *                that should be used for all output
-     *  'message'     the parameter is a string with an informational message
-     *  'saveas'      may be used to save with a different file name, the
-     *                parameter is the filename that is about to be used.
-     *                If a 'saveas' callback returns a non-empty string,
-     *                that file name will be used as the filename instead.
-     *                Note that $save_dir will not be affected by this, only
-     *                the basename of the file.
-     *  'start'       download is starting, parameter is number of bytes
-     *                that are expected, or -1 if unknown
-     *  'bytesread'   parameter is the number of bytes read so far
-     *  'done'        download is complete, parameter is the total number
-     *                of bytes read
-     *  'connfailed'  if the TCP connection fails, this callback is called
-     *                with array(host,port,errno,errmsg)
-     *  'writefailed' if writing to disk fails, this callback is called
-     *                with array(destfile,errmsg)
-     *
-     * If an HTTP proxy has been configured (http_proxy PEAR_Config
-     * setting), the proxy will be used.
-     *
-     * @param string  $url       the URL to download
-     * @param object  $ui        PEAR_Frontend_* instance
-     * @param object  $config    PEAR_Config instance
-     * @param string  $save_dir  (optional) directory to save file in
-     * @param mixed   $callback  (optional) function/method to call for status
-     *                           updates
-     *
-     * @return string  Returns the full path of the downloaded file or a PEAR
-     *                 error on failure.  If the error is caused by
-     *                 socket-related errors, the error object will
-     *                 have the fsockopen error code available through
-     *                 getCode().
-     *
-     * @access public
-     */
-    function downloadHttp($url, &$ui, $save_dir = '.', $callback = null)
-    {
-        if ($callback) {
-            call_user_func($callback, 'setup', array(&$ui));
-        }
-        if (preg_match('!^http://([^/:?#]*)(:(\d+))?(/.*)!', $url, $matches)) {
-            list(,$host,,$port,$path) = $matches;
-        }
-        if (isset($this)) {
-            $config = &$this->config;
-        } else {
-            $config = &PEAR_Config::singleton();
-        }
-        $proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
-        if ($proxy = parse_url($config->get('http_proxy'))) {
-            $proxy_host = @$proxy['host'];
-            $proxy_port = @$proxy['port'];
-            $proxy_user = @$proxy['user'];
-            $proxy_pass = @$proxy['pass'];
-
-            if ($proxy_port == '') {
-                $proxy_port = 8080;
-            }
-            if ($callback) {
-                call_user_func($callback, 'message', "Using HTTP proxy $host:$port");
-            }
-        }
-        if (empty($port)) {
-            $port = 80;
-        }
-        if ($proxy_host != '') {
-            $fp = @fsockopen($proxy_host, $proxy_port, $errno, $errstr);
-            if (!$fp) {
-                if ($callback) {
-                    call_user_func($callback, 'connfailed', array($proxy_host, $proxy_port,
-                                                                  $errno, $errstr));
-                }
-                return PEAR::raiseError("Connection to `$proxy_host:$proxy_port' failed: $errstr", $errno);
-            }
-            $request = "GET $url HTTP/1.0\r\n";
-        } else {
-            $fp = @fsockopen($host, $port, $errno, $errstr);
-            if (!$fp) {
-                if ($callback) {
-                    call_user_func($callback, 'connfailed', array($host, $port,
-                                                                  $errno, $errstr));
-                }
-                return PEAR::raiseError("Connection to `$host:$port' failed: $errstr", $errno);
-            }
-            $request = "GET $path HTTP/1.0\r\n";
-        }
-        $request .= "Host: $host:$port\r\n".
-            "User-Agent: PHP/".PHP_VERSION."\r\n";
-        if ($proxy_host != '' && $proxy_user != '') {
-            $request .= 'Proxy-Authorization: Basic ' .
-                base64_encode($proxy_user . ':' . $proxy_pass) . "\r\n";
-        }
-        $request .= "\r\n";
-        fwrite($fp, $request);
-        $headers = array();
-        while (trim($line = fgets($fp, 1024))) {
-            if (preg_match('/^([^:]+):\s+(.*)\s*$/', $line, $matches)) {
-                $headers[strtolower($matches[1])] = trim($matches[2]);
-            } elseif (preg_match('|^HTTP/1.[01] ([0-9]{3}) |', $line, $matches)) {
-                if ($matches[1] != 200) {
-                    return PEAR::raiseError("File http://$host:$port$path not valid (received: $line)");
-                }
-            }
-        }
-        if (isset($headers['content-disposition']) &&
-            preg_match('/\sfilename=\"([^;]*\S)\"\s*(;|$)/', $headers['content-disposition'], $matches)) {
-            $save_as = basename($matches[1]);
-        } else {
-            $save_as = basename($url);
-        }
-        if ($callback) {
-            $tmp = call_user_func($callback, 'saveas', $save_as);
-            if ($tmp) {
-                $save_as = $tmp;
-            }
-        }
-        $dest_file = $save_dir . DIRECTORY_SEPARATOR . $save_as;
-        if (!$wp = @fopen($dest_file, 'wb')) {
-            fclose($fp);
-            if ($callback) {
-                call_user_func($callback, 'writefailed', array($dest_file, $php_errormsg));
-            }
-            return PEAR::raiseError("could not open $dest_file for writing");
-        }
-        if (isset($headers['content-length'])) {
-            $length = $headers['content-length'];
-        } else {
-            $length = -1;
-        }
-        $bytes = 0;
-        if ($callback) {
-            call_user_func($callback, 'start', array(basename($dest_file), $length));
-        }
-        while ($data = @fread($fp, 1024)) {
-            $bytes += strlen($data);
-            if ($callback) {
-                call_user_func($callback, 'bytesread', $bytes);
-            }
-            if (!@fwrite($wp, $data)) {
-                fclose($fp);
-                if ($callback) {
-                    call_user_func($callback, 'writefailed', array($dest_file, $php_errormsg));
-                }
-                return PEAR::raiseError("$dest_file: write failed ($php_errormsg)");
-            }
-        }
-        fclose($fp);
-        fclose($wp);
-        if ($callback) {
-            call_user_func($callback, 'done', $bytes);
-        }
-        return $dest_file;
-    }
-
-    // }}}
-    // {{{ sortPkgDeps()
-
-    /**
-     * Sort a list of arrays of array(downloaded packagefilename) by dependency.
-     *
-     * It also removes duplicate dependencies
-     * @param array
-     * @param boolean Sort packages in reverse order if true
-     * @return array array of array(packagefilename, package.xml contents)
-     */
-    function sortPkgDeps(&$packages, $uninstall = false)
-    {
-        $ret = array();
-        if ($uninstall) {
-            foreach($packages as $packageinfo) {
-                $ret[] = array('info' => $packageinfo);
-            }
-        } else {
-            foreach($packages as $packagefile) {
-                if (!is_array($packagefile)) {
-                    $ret[] = array('file' => $packagefile,
-                                   'info' => $a = $this->infoFromAny($packagefile),
-                                   'pkg' => $a['package']);
-                } else {
-                    $ret[] = $packagefile;
-                }
-            }
-        }
-        $checkdupes = array();
-        $newret = array();
-        foreach($ret as $i => $p) {
-            if (!isset($checkdupes[$p['info']['package']])) {
-                $checkdupes[$p['info']['package']][] = $i;
-                $newret[] = $p;
-            }
-        }
-        $this->_packageSortTree = $this->_getPkgDepTree($newret);
-
-        $func = $uninstall ? '_sortPkgDepsRev' : '_sortPkgDeps';
-        usort($newret, array(&$this, $func));
-        $this->_packageSortTree = null;
-        $packages = $newret;
-    }
-
-    // }}}
-    // {{{ _sortPkgDeps()
-
-    /**
-     * Compare two package's package.xml, and sort
-     * so that dependencies are installed first
-     *
-     * This is a crude compare, real dependency checking is done on install.
-     * The only purpose this serves is to make the command-line
-     * order-independent (you can list a dependent package first, and
-     * installation occurs in the order required)
-     * @access private
-     */
-    function _sortPkgDeps($p1, $p2)
-    {
-        $p1name = $p1['info']['package'];
-        $p2name = $p2['info']['package'];
-        $p1deps = $this->_getPkgDeps($p1);
-        $p2deps = $this->_getPkgDeps($p2);
-        if (!count($p1deps) && !count($p2deps)) {
-            return 0; // order makes no difference
-        }
-        if (!count($p1deps)) {
-            return -1; // package 2 has dependencies, package 1 doesn't
-        }
-        if (!count($p2deps)) {
-            return 1; // package 1 has dependencies, package 2 doesn't
-        }
-        // both have dependencies
-        if (in_array($p1name, $p2deps)) {
-            return -1; // put package 1 first: package 2 depends on package 1
-        }
-        if (in_array($p2name, $p1deps)) {
-            return 1; // put package 2 first: package 1 depends on package 2
-        }
-        if ($this->_removedDependency($p1name, $p2name)) {
-            return -1; // put package 1 first: package 2 depends on packages that depend on package 1
-        }
-        if ($this->_removedDependency($p2name, $p1name)) {
-            return 1; // put package 2 first: package 1 depends on packages that depend on package 2
-        }
-        // doesn't really matter if neither depends on the other
-        return 0;
-    }
-
-    // }}}
-    // {{{ _sortPkgDepsRev()
-
-    /**
-     * Compare two package's package.xml, and sort
-     * so that dependencies are uninstalled last
-     *
-     * This is a crude compare, real dependency checking is done on uninstall.
-     * The only purpose this serves is to make the command-line
-     * order-independent (you can list a dependency first, and
-     * uninstallation occurs in the order required)
-     * @access private
-     */
-    function _sortPkgDepsRev($p1, $p2)
-    {
-        $p1name = $p1['info']['package'];
-        $p2name = $p2['info']['package'];
-        $p1deps = $this->_getRevPkgDeps($p1);
-        $p2deps = $this->_getRevPkgDeps($p2);
-        if (!count($p1deps) && !count($p2deps)) {
-            return 0; // order makes no difference
-        }
-        if (!count($p1deps)) {
-            return 1; // package 2 has dependencies, package 1 doesn't
-        }
-        if (!count($p2deps)) {
-            return -1; // package 2 has dependencies, package 1 doesn't
-        }
-        // both have dependencies
-        if (in_array($p1name, $p2deps)) {
-            return 1; // put package 1 last
-        }
-        if (in_array($p2name, $p1deps)) {
-            return -1; // put package 2 last
-        }
-        if ($this->_removedDependency($p1name, $p2name)) {
-            return 1; // put package 1 last: package 2 depends on packages that depend on package 1
-        }
-        if ($this->_removedDependency($p2name, $p1name)) {
-            return -1; // put package 2 last: package 1 depends on packages that depend on package 2
-        }
-        // doesn't really matter if neither depends on the other
-        return 0;
-    }
-
-    // }}}
-    // {{{ _getPkgDeps()
-
-    /**
-     * get an array of package dependency names
-     * @param array
-     * @return array
-     * @access private
-     */
-    function _getPkgDeps($p)
-    {
-        if (!isset($p['info']['releases'])) {
-            return $this->_getRevPkgDeps($p);
-        }
-        $rel = array_shift($p['info']['releases']);
-        if (!isset($rel['deps'])) {
-            return array();
-        }
-        $ret = array();
-        foreach($rel['deps'] as $dep) {
-            if ($dep['type'] == 'pkg') {
-                $ret[] = $dep['name'];
-            }
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ _getPkgDeps()
-
-    /**
-     * get an array representation of the package dependency tree
-     * @return array
-     * @access private
-     */
-    function _getPkgDepTree($packages)
-    {
-        $tree = array();
-        foreach ($packages as $p) {
-            $package = $p['info']['package'];
-            $deps = $this->_getPkgDeps($p);
-            $tree[$package] = $deps;
-        }
-        return $tree;
-    }
-
-    // }}}
-    // {{{ _removedDependency($p1, $p2)
-
-    /**
-     * get an array of package dependency names for uninstall
-     * @param string package 1 name
-     * @param string package 2 name
-     * @return bool
-     * @access private
-     */
-    function _removedDependency($p1, $p2)
-    {
-        if (empty($this->_packageSortTree[$p2])) {
-            return false;
-        }
-        if (!in_array($p1, $this->_packageSortTree[$p2])) {
-            foreach ($this->_packageSortTree[$p2] as $potential) {
-                if ($this->_removedDependency($p1, $potential)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ _getRevPkgDeps()
-
-    /**
-     * get an array of package dependency names for uninstall
-     * @param array
-     * @return array
-     * @access private
-     */
-    function _getRevPkgDeps($p)
-    {
-        if (!isset($p['info']['release_deps'])) {
-            return array();
-        }
-        $ret = array();
-        foreach($p['info']['release_deps'] as $dep) {
-            if ($dep['type'] == 'pkg') {
-                $ret[] = $dep['name'];
-            }
-        }
-        return $ret;
-    }
-
-    // }}}
-}
-
-?>
diff --git a/3rdparty/PEAR/Config.php b/3rdparty/PEAR/Config.php
deleted file mode 100644
index ba641735250..00000000000
--- a/3rdparty/PEAR/Config.php
+++ /dev/null
@@ -1,1169 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Stig Bakken <ssb@php.net>                                    |
-// +----------------------------------------------------------------------+
-//
-// $Id: Config.php,v 1.52 2004/01/08 17:33:12 sniper Exp $
-
-require_once 'PEAR.php';
-require_once 'System.php';
-
-/**
- * Last created PEAR_Config instance.
- * @var object
- */
-$GLOBALS['_PEAR_Config_instance'] = null;
-if (!defined('PEAR_INSTALL_DIR') || !PEAR_INSTALL_DIR) {
-    $PEAR_INSTALL_DIR = PHP_LIBDIR . DIRECTORY_SEPARATOR . 'pear';
-} else {
-    $PEAR_INSTALL_DIR = PEAR_INSTALL_DIR;
-}
-
-// Below we define constants with default values for all configuration
-// parameters except username/password.  All of them can have their
-// defaults set through environment variables.  The reason we use the
-// PHP_ prefix is for some security, PHP protects environment
-// variables starting with PHP_*.
-
-if (getenv('PHP_PEAR_SYSCONF_DIR')) {
-    define('PEAR_CONFIG_SYSCONFDIR', getenv('PHP_PEAR_SYSCONF_DIR'));
-} elseif (getenv('SystemRoot')) {
-    define('PEAR_CONFIG_SYSCONFDIR', getenv('SystemRoot'));
-} else {
-    define('PEAR_CONFIG_SYSCONFDIR', PHP_SYSCONFDIR);
-}
-
-// Default for master_server
-if (getenv('PHP_PEAR_MASTER_SERVER')) {
-    define('PEAR_CONFIG_DEFAULT_MASTER_SERVER', getenv('PHP_PEAR_MASTER_SERVER'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_MASTER_SERVER', 'pear.php.net');
-}
-
-// Default for http_proxy
-if (getenv('PHP_PEAR_HTTP_PROXY')) {
-    define('PEAR_CONFIG_DEFAULT_HTTP_PROXY', getenv('PHP_PEAR_HTTP_PROXY'));
-} elseif (getenv('http_proxy')) {
-    define('PEAR_CONFIG_DEFAULT_HTTP_PROXY', getenv('http_proxy'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_HTTP_PROXY', '');
-}
-
-// Default for php_dir
-if (getenv('PHP_PEAR_INSTALL_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_PHP_DIR', getenv('PHP_PEAR_INSTALL_DIR'));
-} else {
-    if (@is_dir($PEAR_INSTALL_DIR)) {
-        define('PEAR_CONFIG_DEFAULT_PHP_DIR',
-               $PEAR_INSTALL_DIR);
-    } else {
-        define('PEAR_CONFIG_DEFAULT_PHP_DIR', $PEAR_INSTALL_DIR);
-    }
-}
-
-// Default for ext_dir
-if (getenv('PHP_PEAR_EXTENSION_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_EXT_DIR', getenv('PHP_PEAR_EXTENSION_DIR'));
-} else {
-    if (ini_get('extension_dir')) {
-        define('PEAR_CONFIG_DEFAULT_EXT_DIR', ini_get('extension_dir'));
-    } elseif (defined('PEAR_EXTENSION_DIR') && @is_dir(PEAR_EXTENSION_DIR)) {
-        define('PEAR_CONFIG_DEFAULT_EXT_DIR', PEAR_EXTENSION_DIR);
-    } elseif (defined('PHP_EXTENSION_DIR')) {
-        define('PEAR_CONFIG_DEFAULT_EXT_DIR', PHP_EXTENSION_DIR);
-    } else {
-        define('PEAR_CONFIG_DEFAULT_EXT_DIR', '.');
-    }
-}
-
-// Default for doc_dir
-if (getenv('PHP_PEAR_DOC_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_DOC_DIR', getenv('PHP_PEAR_DOC_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_DOC_DIR',
-           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'docs');
-}
-
-// Default for bin_dir
-if (getenv('PHP_PEAR_BIN_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_BIN_DIR', getenv('PHP_PEAR_BIN_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_BIN_DIR', PHP_BINDIR);
-}
-
-// Default for data_dir
-if (getenv('PHP_PEAR_DATA_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_DATA_DIR', getenv('PHP_PEAR_DATA_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_DATA_DIR',
-           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'data');
-}
-
-// Default for test_dir
-if (getenv('PHP_PEAR_TEST_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_TEST_DIR', getenv('PHP_PEAR_TEST_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_TEST_DIR',
-           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'tests');
-}
-
-// Default for cache_dir
-if (getenv('PHP_PEAR_CACHE_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_CACHE_DIR', getenv('PHP_PEAR_CACHE_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_CACHE_DIR',
-           System::tmpdir() . DIRECTORY_SEPARATOR . 'pear' .
-           DIRECTORY_SEPARATOR . 'cache');
-}
-
-// Default for php_bin
-if (getenv('PHP_PEAR_PHP_BIN')) {
-    define('PEAR_CONFIG_DEFAULT_PHP_BIN', getenv('PHP_PEAR_PHP_BIN'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_PHP_BIN', PEAR_CONFIG_DEFAULT_BIN_DIR.
-           DIRECTORY_SEPARATOR.'php'.(OS_WINDOWS ? '.exe' : ''));
-}
-
-// Default for verbose
-if (getenv('PHP_PEAR_VERBOSE')) {
-    define('PEAR_CONFIG_DEFAULT_VERBOSE', getenv('PHP_PEAR_VERBOSE'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_VERBOSE', 1);
-}
-
-// Default for preferred_state
-if (getenv('PHP_PEAR_PREFERRED_STATE')) {
-    define('PEAR_CONFIG_DEFAULT_PREFERRED_STATE', getenv('PHP_PEAR_PREFERRED_STATE'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_PREFERRED_STATE', 'stable');
-}
-
-// Default for umask
-if (getenv('PHP_PEAR_UMASK')) {
-    define('PEAR_CONFIG_DEFAULT_UMASK', getenv('PHP_PEAR_UMASK'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_UMASK', decoct(umask()));
-}
-
-// Default for cache_ttl
-if (getenv('PHP_PEAR_CACHE_TTL')) {
-    define('PEAR_CONFIG_DEFAULT_CACHE_TTL', getenv('PHP_PEAR_CACHE_TTL'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_CACHE_TTL', 3600);
-}
-
-// Default for sig_type
-if (getenv('PHP_PEAR_SIG_TYPE')) {
-    define('PEAR_CONFIG_DEFAULT_SIG_TYPE', getenv('PHP_PEAR_SIG_TYPE'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_SIG_TYPE', 'gpg');
-}
-
-// Default for sig_bin
-if (getenv('PHP_PEAR_SIG_BIN')) {
-    define('PEAR_CONFIG_DEFAULT_SIG_BIN', getenv('PHP_PEAR_SIG_BIN'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_SIG_BIN',
-           System::which(
-               'gpg', OS_WINDOWS ? 'c:\gnupg\gpg.exe' : '/usr/local/bin/gpg'));
-}
-
-// Default for sig_keydir
-if (getenv('PHP_PEAR_SIG_KEYDIR')) {
-    define('PEAR_CONFIG_DEFAULT_SIG_KEYDIR', getenv('PHP_PEAR_SIG_KEYDIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_SIG_KEYDIR',
-           PEAR_CONFIG_SYSCONFDIR . DIRECTORY_SEPARATOR . 'pearkeys');
-}
-
-/**
- * This is a class for storing configuration data, keeping track of
- * which are system-defined, user-defined or defaulted.
- */
-class PEAR_Config extends PEAR
-{
-    // {{{ properties
-
-    /**
-     * Array of config files used.
-     *
-     * @var array layer => config file
-     */
-    var $files = array(
-        'system' => '',
-        'user' => '',
-        );
-
-    var $layers = array();
-
-    /**
-     * Configuration data, two-dimensional array where the first
-     * dimension is the config layer ('user', 'system' and 'default'),
-     * and the second dimension is keyname => value.
-     *
-     * The order in the first dimension is important!  Earlier
-     * layers will shadow later ones when a config value is
-     * requested (if a 'user' value exists, it will be returned first,
-     * then 'system' and finally 'default').
-     *
-     * @var array layer => array(keyname => value, ...)
-     */
-    var $configuration = array(
-        'user' => array(),
-        'system' => array(),
-        'default' => array(),
-        );
-
-    /**
-     * Information about the configuration data.  Stores the type,
-     * default value and a documentation string for each configuration
-     * value.
-     *
-     * @var array layer => array(infotype => value, ...)
-     */
-    var $configuration_info = array(
-        // Internet Access
-        'master_server' => array(
-            'type' => 'string',
-            'default' => 'pear.php.net',
-            'doc' => 'name of the main PEAR server',
-            'prompt' => 'PEAR server',
-            'group' => 'Internet Access',
-            ),
-        'http_proxy' => array(
-            'type' => 'string',
-            'default' => PEAR_CONFIG_DEFAULT_HTTP_PROXY,
-            'doc' => 'HTTP proxy (host:port) to use when downloading packages',
-            'prompt' => 'HTTP Proxy Server Address',
-            'group' => 'Internet Access',
-            ),
-        // File Locations
-        'php_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_PHP_DIR,
-            'doc' => 'directory where .php files are installed',
-            'prompt' => 'PEAR directory',
-            'group' => 'File Locations',
-            ),
-        'ext_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_EXT_DIR,
-            'doc' => 'directory where loadable extensions are installed',
-            'prompt' => 'PHP extension directory',
-            'group' => 'File Locations',
-            ),
-        'doc_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_DOC_DIR,
-            'doc' => 'directory where documentation is installed',
-            'prompt' => 'PEAR documentation directory',
-            'group' => 'File Locations',
-            ),
-        'bin_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_BIN_DIR,
-            'doc' => 'directory where executables are installed',
-            'prompt' => 'PEAR executables directory',
-            'group' => 'File Locations',
-            ),
-        'data_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_DATA_DIR,
-            'doc' => 'directory where data files are installed',
-            'prompt' => 'PEAR data directory',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'test_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_TEST_DIR,
-            'doc' => 'directory where regression tests are installed',
-            'prompt' => 'PEAR test directory',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'cache_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_CACHE_DIR,
-            'doc' => 'directory which is used for XMLRPC cache',
-            'prompt' => 'PEAR Installer cache directory',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'php_bin' => array(
-            'type' => 'file',
-            'default' => PEAR_CONFIG_DEFAULT_PHP_BIN,
-            'doc' => 'PHP CLI/CGI binary for executing scripts',
-            'prompt' => 'PHP CLI/CGI binary',
-            'group' => 'File Locations (Advanced)',
-            ),
-        // Maintainers
-        'username' => array(
-            'type' => 'string',
-            'default' => '',
-            'doc' => '(maintainers) your PEAR account name',
-            'prompt' => 'PEAR username (for maintainers)',
-            'group' => 'Maintainers',
-            ),
-        'password' => array(
-            'type' => 'password',
-            'default' => '',
-            'doc' => '(maintainers) your PEAR account password',
-            'prompt' => 'PEAR password (for maintainers)',
-            'group' => 'Maintainers',
-            ),
-        // Advanced
-        'verbose' => array(
-            'type' => 'integer',
-            'default' => PEAR_CONFIG_DEFAULT_VERBOSE,
-            'doc' => 'verbosity level
-0: really quiet
-1: somewhat quiet
-2: verbose
-3: debug',
-            'prompt' => 'Debug Log Level',
-            'group' => 'Advanced',
-            ),
-        'preferred_state' => array(
-            'type' => 'set',
-            'default' => PEAR_CONFIG_DEFAULT_PREFERRED_STATE,
-            'doc' => 'the installer will prefer releases with this state when installing packages without a version or state specified',
-            'valid_set' => array(
-                'stable', 'beta', 'alpha', 'devel', 'snapshot'),
-            'prompt' => 'Preferred Package State',
-            'group' => 'Advanced',
-            ),
-        'umask' => array(
-            'type' => 'mask',
-            'default' => PEAR_CONFIG_DEFAULT_UMASK,
-            'doc' => 'umask used when creating files (Unix-like systems only)',
-            'prompt' => 'Unix file mask',
-            'group' => 'Advanced',
-            ),
-        'cache_ttl' => array(
-            'type' => 'integer',
-            'default' => PEAR_CONFIG_DEFAULT_CACHE_TTL,
-            'doc' => 'amount of secs where the local cache is used and not updated',
-            'prompt' => 'Cache TimeToLive',
-            'group' => 'Advanced',
-            ),
-        'sig_type' => array(
-            'type' => 'set',
-            'default' => PEAR_CONFIG_DEFAULT_SIG_TYPE,
-            'doc' => 'which package signature mechanism to use',
-            'valid_set' => array('gpg'),
-            'prompt' => 'Package Signature Type',
-            'group' => 'Maintainers',
-            ),
-        'sig_bin' => array(
-            'type' => 'string',
-            'default' => PEAR_CONFIG_DEFAULT_SIG_BIN,
-            'doc' => 'which package signature mechanism to use',
-            'prompt' => 'Signature Handling Program',
-            'group' => 'Maintainers',
-            ),
-        'sig_keyid' => array(
-            'type' => 'string',
-            'default' => '',
-            'doc' => 'which key to use for signing with',
-            'prompt' => 'Signature Key Id',
-            'group' => 'Maintainers',
-            ),
-        'sig_keydir' => array(
-            'type' => 'string',
-            'default' => PEAR_CONFIG_DEFAULT_SIG_KEYDIR,
-            'doc' => 'which package signature mechanism to use',
-            'prompt' => 'Signature Key Directory',
-            'group' => 'Maintainers',
-            ),
-        );
-
-    // }}}
-
-    // {{{ PEAR_Config([file], [defaults_file])
-
-    /**
-     * Constructor.
-     *
-     * @param string (optional) file to read user-defined options from
-     * @param string (optional) file to read system-wide defaults from
-     *
-     * @access public
-     *
-     * @see PEAR_Config::singleton
-     */
-    function PEAR_Config($user_file = '', $system_file = '')
-    {
-        $this->PEAR();
-        $sl = DIRECTORY_SEPARATOR;
-        if (empty($user_file)) {
-            if (OS_WINDOWS) {
-                $user_file = PEAR_CONFIG_SYSCONFDIR . $sl . 'pear.ini';
-            } else {
-                $user_file = getenv('HOME') . $sl . '.pearrc';
-            }
-        }
-        if (empty($system_file)) {
-            if (OS_WINDOWS) {
-                $system_file = PEAR_CONFIG_SYSCONFDIR . $sl . 'pearsys.ini';
-            } else {
-                $system_file = PEAR_CONFIG_SYSCONFDIR . $sl . 'pear.conf';
-            }
-        }
-        $this->layers = array_keys($this->configuration);
-        $this->files['user'] = $user_file;
-        $this->files['system'] = $system_file;
-        if ($user_file && file_exists($user_file)) {
-            $this->readConfigFile($user_file);
-        }
-        if ($system_file && file_exists($system_file)) {
-            $this->mergeConfigFile($system_file, false, 'system');
-        }
-        foreach ($this->configuration_info as $key => $info) {
-            $this->configuration['default'][$key] = $info['default'];
-        }
-        //$GLOBALS['_PEAR_Config_instance'] = &$this;
-    }
-
-    // }}}
-    // {{{ singleton([file], [defaults_file])
-
-    /**
-     * Static singleton method.  If you want to keep only one instance
-     * of this class in use, this method will give you a reference to
-     * the last created PEAR_Config object if one exists, or create a
-     * new object.
-     *
-     * @param string (optional) file to read user-defined options from
-     * @param string (optional) file to read system-wide defaults from
-     *
-     * @return object an existing or new PEAR_Config instance
-     *
-     * @access public
-     *
-     * @see PEAR_Config::PEAR_Config
-     */
-    function &singleton($user_file = '', $system_file = '')
-    {
-        if (is_object($GLOBALS['_PEAR_Config_instance'])) {
-            return $GLOBALS['_PEAR_Config_instance'];
-        }
-        $GLOBALS['_PEAR_Config_instance'] =
-             &new PEAR_Config($user_file, $system_file);
-        return $GLOBALS['_PEAR_Config_instance'];
-    }
-
-    // }}}
-    // {{{ readConfigFile([file], [layer])
-
-    /**
-     * Reads configuration data from a file.  All existing values in
-     * the config layer are discarded and replaced with data from the
-     * file.
-     *
-     * @param string (optional) file to read from, if NULL or not
-     * specified, the last-used file for the same layer (second param)
-     * is used
-     *
-     * @param string (optional) config layer to insert data into
-     * ('user' or 'system')
-     *
-     * @return bool TRUE on success or a PEAR error on failure
-     *
-     * @access public
-     */
-    function readConfigFile($file = null, $layer = 'user')
-    {
-        if (empty($this->files[$layer])) {
-            return $this->raiseError("unknown config file type `$layer'");
-        }
-        if ($file === null) {
-            $file = $this->files[$layer];
-        }
-        $data = $this->_readConfigDataFrom($file);
-        if (PEAR::isError($data)) {
-            return $data;
-        }
-        $this->_decodeInput($data);
-        $this->configuration[$layer] = $data;
-        return true;
-    }
-
-    // }}}
-    // {{{ mergeConfigFile(file, [override], [layer])
-
-    /**
-     * Merges data into a config layer from a file.  Does the same
-     * thing as readConfigFile, except it does not replace all
-     * existing values in the config layer.
-     *
-     * @param string file to read from
-     *
-     * @param bool (optional) whether to overwrite existing data
-     * (default TRUE)
-     *
-     * @param string config layer to insert data into ('user' or
-     * 'system')
-     *
-     * @return bool TRUE on success or a PEAR error on failure
-     *
-     * @access public.
-     */
-    function mergeConfigFile($file, $override = true, $layer = 'user')
-    {
-        if (empty($this->files[$layer])) {
-            return $this->raiseError("unknown config file type `$layer'");
-        }
-        if ($file === null) {
-            $file = $this->files[$layer];
-        }
-        $data = $this->_readConfigDataFrom($file);
-        if (PEAR::isError($data)) {
-            return $data;
-        }
-        $this->_decodeInput($data);
-        if ($override) {
-            $this->configuration[$layer] = array_merge($this->configuration[$layer], $data);
-        } else {
-            $this->configuration[$layer] = array_merge($data, $this->configuration[$layer]);
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ writeConfigFile([file], [layer])
-
-    /**
-     * Writes data into a config layer from a file.
-     *
-     * @param string file to read from
-     *
-     * @param bool (optional) whether to overwrite existing data
-     * (default TRUE)
-     *
-     * @param string config layer to insert data into ('user' or
-     * 'system')
-     *
-     * @return bool TRUE on success or a PEAR error on failure
-     *
-     * @access public.
-     */
-    function writeConfigFile($file = null, $layer = 'user', $data = null)
-    {
-        if ($layer == 'both' || $layer == 'all') {
-            foreach ($this->files as $type => $file) {
-                $err = $this->writeConfigFile($file, $type, $data);
-                if (PEAR::isError($err)) {
-                    return $err;
-                }
-            }
-            return true;
-        }
-        if (empty($this->files[$layer])) {
-            return $this->raiseError("unknown config file type `$layer'");
-        }
-        if ($file === null) {
-            $file = $this->files[$layer];
-        }
-        $data = ($data === null) ? $this->configuration[$layer] : $data;
-        $this->_encodeOutput($data);
-        $opt = array('-p', dirname($file));
-        if (!@System::mkDir($opt)) {
-            return $this->raiseError("could not create directory: " . dirname($file));
-        }
-        if (@is_file($file) && !@is_writeable($file)) {
-            return $this->raiseError("no write access to $file!");
-        }
-        $fp = @fopen($file, "w");
-        if (!$fp) {
-            return $this->raiseError("PEAR_Config::writeConfigFile fopen('$file','w') failed");
-        }
-        $contents = "#PEAR_Config 0.9\n" . serialize($data);
-        if (!@fwrite($fp, $contents)) {
-            return $this->raiseError("PEAR_Config::writeConfigFile: fwrite failed");
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ _readConfigDataFrom(file)
-
-    /**
-     * Reads configuration data from a file and returns the parsed data
-     * in an array.
-     *
-     * @param string file to read from
-     *
-     * @return array configuration data or a PEAR error on failure
-     *
-     * @access private
-     */
-    function _readConfigDataFrom($file)
-    {
-        $fp = @fopen($file, "r");
-        if (!$fp) {
-            return $this->raiseError("PEAR_Config::readConfigFile fopen('$file','r') failed");
-        }
-        $size = filesize($file);
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-        $contents = fread($fp, $size);
-        set_magic_quotes_runtime($rt);
-        fclose($fp);
-        $version = '0.1';
-        if (preg_match('/^#PEAR_Config\s+(\S+)\s+/si', $contents, $matches)) {
-            $version = $matches[1];
-            $contents = substr($contents, strlen($matches[0]));
-        }
-        if (version_compare("$version", '1', '<')) {
-            $data = unserialize($contents);
-            if (!is_array($data)) {
-                if (strlen(trim($contents)) > 0) {
-                    $error = "PEAR_Config: bad data in $file";
-//                if (isset($this)) {
-                    return $this->raiseError($error);
-//                } else {
-//                    return PEAR::raiseError($error);
-                } else {
-                    $data = array();
-                }
-            }
-        // add parsing of newer formats here...
-        } else {
-            return $this->raiseError("$file: unknown version `$version'");
-        }
-        return $data;
-    }
-
-    // }}}
-    // {{{ getConfFile(layer)
-    /**
-    * Gets the file used for storing the config for a layer
-    *
-    * @param string $layer 'user' or 'system'
-    */
-
-    function getConfFile($layer)
-    {
-        return $this->files[$layer];
-    }
-
-    // }}}
-    // {{{ _encodeOutput(&data)
-
-    /**
-     * Encodes/scrambles configuration data before writing to files.
-     * Currently, 'password' values will be base64-encoded as to avoid
-     * that people spot cleartext passwords by accident.
-     *
-     * @param array (reference) array to encode values in
-     *
-     * @return bool TRUE on success
-     *
-     * @access private
-     */
-    function _encodeOutput(&$data)
-    {
-        foreach ($data as $key => $value) {
-            if (!isset($this->configuration_info[$key])) {
-                continue;
-            }
-            $type = $this->configuration_info[$key]['type'];
-            switch ($type) {
-                // we base64-encode passwords so they are at least
-                // not shown in plain by accident
-                case 'password': {
-                    $data[$key] = base64_encode($data[$key]);
-                    break;
-                }
-                case 'mask': {
-                    $data[$key] = octdec($data[$key]);
-                    break;
-                }
-            }
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ _decodeInput(&data)
-
-    /**
-     * Decodes/unscrambles configuration data after reading from files.
-     *
-     * @param array (reference) array to encode values in
-     *
-     * @return bool TRUE on success
-     *
-     * @access private
-     *
-     * @see PEAR_Config::_encodeOutput
-     */
-    function _decodeInput(&$data)
-    {
-        if (!is_array($data)) {
-            return true;
-        }
-        foreach ($data as $key => $value) {
-            if (!isset($this->configuration_info[$key])) {
-                continue;
-            }
-            $type = $this->configuration_info[$key]['type'];
-            switch ($type) {
-                case 'password': {
-                    $data[$key] = base64_decode($data[$key]);
-                    break;
-                }
-                case 'mask': {
-                    $data[$key] = decoct($data[$key]);
-                    break;
-                }
-            }
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ get(key, [layer])
-
-    /**
-     * Returns a configuration value, prioritizing layers as per the
-     * layers property.
-     *
-     * @param string config key
-     *
-     * @return mixed the config value, or NULL if not found
-     *
-     * @access public
-     */
-    function get($key, $layer = null)
-    {
-        if ($layer === null) {
-            foreach ($this->layers as $layer) {
-                if (isset($this->configuration[$layer][$key])) {
-                    return $this->configuration[$layer][$key];
-                }
-            }
-        } elseif (isset($this->configuration[$layer][$key])) {
-            return $this->configuration[$layer][$key];
-        }
-        return null;
-    }
-
-    // }}}
-    // {{{ set(key, value, [layer])
-
-    /**
-     * Set a config value in a specific layer (defaults to 'user').
-     * Enforces the types defined in the configuration_info array.  An
-     * integer config variable will be cast to int, and a set config
-     * variable will be validated against its legal values.
-     *
-     * @param string config key
-     *
-     * @param string config value
-     *
-     * @param string (optional) config layer
-     *
-     * @return bool TRUE on success, FALSE on failure
-     *
-     * @access public
-     */
-    function set($key, $value, $layer = 'user')
-    {
-        if (empty($this->configuration_info[$key])) {
-            return false;
-        }
-        extract($this->configuration_info[$key]);
-        switch ($type) {
-            case 'integer':
-                $value = (int)$value;
-                break;
-            case 'set': {
-                // If a valid_set is specified, require the value to
-                // be in the set.  If there is no valid_set, accept
-                // any value.
-                if ($valid_set) {
-                    reset($valid_set);
-                    if ((key($valid_set) === 0 && !in_array($value, $valid_set)) ||
-                        (key($valid_set) !== 0 && empty($valid_set[$value])))
-                    {
-                        return false;
-                    }
-                }
-                break;
-            }
-        }
-        $this->configuration[$layer][$key] = $value;
-        return true;
-    }
-
-    // }}}
-    // {{{ getType(key)
-
-    /**
-     * Get the type of a config value.
-     *
-     * @param string  config key
-     *
-     * @return string type, one of "string", "integer", "file",
-     * "directory", "set" or "password".
-     *
-     * @access public
-     *
-     */
-    function getType($key)
-    {
-        if (isset($this->configuration_info[$key])) {
-            return $this->configuration_info[$key]['type'];
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ getDocs(key)
-
-    /**
-     * Get the documentation for a config value.
-     *
-     * @param string  config key
-     *
-     * @return string documentation string
-     *
-     * @access public
-     *
-     */
-    function getDocs($key)
-    {
-        if (isset($this->configuration_info[$key])) {
-            return $this->configuration_info[$key]['doc'];
-        }
-        return false;
-    }
-       // }}}
-    // {{{ getPrompt(key)
-
-    /**
-     * Get the short documentation for a config value.
-     *
-     * @param string  config key
-     *
-     * @return string short documentation string
-     *
-     * @access public
-     *
-     */
-    function getPrompt($key)
-    {
-        if (isset($this->configuration_info[$key])) {
-            return $this->configuration_info[$key]['prompt'];
-        }
-        return false;
-    }
-    // }}}
-    // {{{ getGroup(key)
-
-    /**
-     * Get the parameter group for a config key.
-     *
-     * @param string  config key
-     *
-     * @return string parameter group
-     *
-     * @access public
-     *
-     */
-    function getGroup($key)
-    {
-        if (isset($this->configuration_info[$key])) {
-            return $this->configuration_info[$key]['group'];
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ getGroups()
-
-    /**
-     * Get the list of parameter groups.
-     *
-     * @return array list of parameter groups
-     *
-     * @access public
-     *
-     */
-    function getGroups()
-    {
-        $tmp = array();
-        foreach ($this->configuration_info as $key => $info) {
-            $tmp[$info['group']] = 1;
-        }
-        return array_keys($tmp);
-    }
-
-    // }}}
-    // {{{ getGroupKeys()
-
-    /**
-     * Get the list of the parameters in a group.
-     *
-     * @param string $group parameter group
-     *
-     * @return array list of parameters in $group
-     *
-     * @access public
-     *
-     */
-    function getGroupKeys($group)
-    {
-        $keys = array();
-        foreach ($this->configuration_info as $key => $info) {
-            if ($info['group'] == $group) {
-                $keys[] = $key;
-            }
-        }
-        return $keys;
-    }
-
-    // }}}
-    // {{{ getSetValues(key)
-
-    /**
-     * Get the list of allowed set values for a config value.  Returns
-     * NULL for config values that are not sets.
-     *
-     * @param string  config key
-     *
-     * @return array enumerated array of set values, or NULL if the
-     *               config key is unknown or not a set
-     *
-     * @access public
-     *
-     */
-    function getSetValues($key)
-    {
-        if (isset($this->configuration_info[$key]) &&
-            isset($this->configuration_info[$key]['type']) &&
-            $this->configuration_info[$key]['type'] == 'set')
-        {
-            $valid_set = $this->configuration_info[$key]['valid_set'];
-            reset($valid_set);
-            if (key($valid_set) === 0) {
-                return $valid_set;
-            }
-            return array_keys($valid_set);
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ getKeys()
-
-    /**
-     * Get all the current config keys.
-     *
-     * @return array simple array of config keys
-     *
-     * @access public
-     */
-    function getKeys()
-    {
-        $keys = array();
-        foreach ($this->layers as $layer) {
-            $keys = array_merge($keys, $this->configuration[$layer]);
-        }
-        return array_keys($keys);
-    }
-
-    // }}}
-    // {{{ remove(key, [layer])
-
-    /**
-     * Remove the a config key from a specific config layer.
-     *
-     * @param string config key
-     *
-     * @param string (optional) config layer
-     *
-     * @return bool TRUE on success, FALSE on failure
-     *
-     * @access public
-     */
-    function remove($key, $layer = 'user')
-    {
-        if (isset($this->configuration[$layer][$key])) {
-            unset($this->configuration[$layer][$key]);
-            return true;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ removeLayer(layer)
-
-    /**
-     * Temporarily remove an entire config layer.  USE WITH CARE!
-     *
-     * @param string config key
-     *
-     * @param string (optional) config layer
-     *
-     * @return bool TRUE on success, FALSE on failure
-     *
-     * @access public
-     */
-    function removeLayer($layer)
-    {
-        if (isset($this->configuration[$layer])) {
-            $this->configuration[$layer] = array();
-            return true;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ store([layer])
-
-    /**
-     * Stores configuration data in a layer.
-     *
-     * @param string config layer to store
-     *
-     * @return bool TRUE on success, or PEAR error on failure
-     *
-     * @access public
-     */
-    function store($layer = 'user', $data = null)
-    {
-        return $this->writeConfigFile(null, $layer, $data);
-    }
-
-    // }}}
-    // {{{ toDefault(key)
-
-    /**
-     * Unset the user-defined value of a config key, reverting the
-     * value to the system-defined one.
-     *
-     * @param string config key
-     *
-     * @return bool TRUE on success, FALSE on failure
-     *
-     * @access public
-     */
-    function toDefault($key)
-    {
-        trigger_error("PEAR_Config::toDefault() deprecated, use PEAR_Config::remove() instead", E_USER_NOTICE);
-        return $this->remove($key, 'user');
-    }
-
-    // }}}
-    // {{{ definedBy(key)
-
-    /**
-     * Tells what config layer that gets to define a key.
-     *
-     * @param string config key
-     *
-     * @return string the config layer, or an empty string if not found
-     *
-     * @access public
-     */
-    function definedBy($key)
-    {
-        foreach ($this->layers as $layer) {
-            if (isset($this->configuration[$layer][$key])) {
-                return $layer;
-            }
-        }
-        return '';
-    }
-
-    // }}}
-    // {{{ isDefaulted(key)
-
-    /**
-     * Tells whether a config value has a system-defined value.
-     *
-     * @param string   config key
-     *
-     * @return bool
-     *
-     * @access public
-     *
-     * @deprecated
-     */
-    function isDefaulted($key)
-    {
-        trigger_error("PEAR_Config::isDefaulted() deprecated, use PEAR_Config::definedBy() instead", E_USER_NOTICE);
-        return $this->definedBy($key) == 'system';
-    }
-
-    // }}}
-    // {{{ isDefined(key)
-
-    /**
-     * Tells whether a given key exists as a config value.
-     *
-     * @param string config key
-     *
-     * @return bool whether <config key> exists in this object
-     *
-     * @access public
-     */
-    function isDefined($key)
-    {
-        foreach ($this->layers as $layer) {
-            if (isset($this->configuration[$layer][$key])) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ isDefinedLayer(key)
-
-    /**
-     * Tells whether a given config layer exists.
-     *
-     * @param string config layer
-     *
-     * @return bool whether <config layer> exists in this object
-     *
-     * @access public
-     */
-    function isDefinedLayer($layer)
-    {
-        return isset($this->configuration[$layer]);
-    }
-
-    // }}}
-    // {{{ getLayers()
-
-    /**
-     * Returns the layers defined (except the 'default' one)
-     *
-     * @return array of the defined layers
-     */
-    function getLayers()
-    {
-        $cf = $this->configuration;
-        unset($cf['default']);
-        return array_keys($cf);
-    }
-
-    // }}}
-}
-
-?>
diff --git a/3rdparty/PEAR/Dependency.php b/3rdparty/PEAR/Dependency.php
deleted file mode 100644
index 705167aa70f..00000000000
--- a/3rdparty/PEAR/Dependency.php
+++ /dev/null
@@ -1,487 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Tomas V.V.Cox <cox@idecnet.com>                             |
-// |          Stig Bakken <ssb@php.net>                                   |
-// +----------------------------------------------------------------------+
-//
-// $Id: Dependency.php,v 1.36.4.1 2004/12/27 07:04:19 cellog Exp $
-
-require_once "PEAR.php";
-
-define('PEAR_DEPENDENCY_MISSING',        -1);
-define('PEAR_DEPENDENCY_CONFLICT',       -2);
-define('PEAR_DEPENDENCY_UPGRADE_MINOR',  -3);
-define('PEAR_DEPENDENCY_UPGRADE_MAJOR',  -4);
-define('PEAR_DEPENDENCY_BAD_DEPENDENCY', -5);
-define('PEAR_DEPENDENCY_MISSING_OPTIONAL', -6);
-define('PEAR_DEPENDENCY_CONFLICT_OPTIONAL',       -7);
-define('PEAR_DEPENDENCY_UPGRADE_MINOR_OPTIONAL',  -8);
-define('PEAR_DEPENDENCY_UPGRADE_MAJOR_OPTIONAL',  -9);
-
-/**
- * Dependency check for PEAR packages
- *
- * The class is based on the dependency RFC that can be found at
- * http://cvs.php.net/cvs.php/pearweb/rfc. It requires PHP >= 4.1
- *
- * @author Tomas V.V.Vox <cox@idecnet.com>
- * @author Stig Bakken <ssb@php.net>
- */
-class PEAR_Dependency
-{
-    // {{{ constructor
-    /**
-     * Constructor
-     *
-     * @access public
-     * @param  object Registry object
-     * @return void
-     */
-    function PEAR_Dependency(&$registry)
-    {
-        $this->registry = &$registry;
-    }
-
-    // }}}
-    // {{{ callCheckMethod()
-
-    /**
-    * This method maps the XML dependency definition to the
-    * corresponding one from PEAR_Dependency
-    *
-    * <pre>
-    * $opts => Array
-    *    (
-    *        [type] => pkg
-    *        [rel] => ge
-    *        [version] => 3.4
-    *        [name] => HTML_Common
-    *        [optional] => false
-    *    )
-    * </pre>
-    *
-    * @param  string Error message
-    * @param  array  Options
-    * @return boolean
-    */
-    function callCheckMethod(&$errmsg, $opts)
-    {
-        $rel = isset($opts['rel']) ? $opts['rel'] : 'has';
-        $req = isset($opts['version']) ? $opts['version'] : null;
-        $name = isset($opts['name']) ? $opts['name'] : null;
-        $opt = (isset($opts['optional']) && $opts['optional'] == 'yes') ?
-            $opts['optional'] : null;
-        $errmsg = '';
-        switch ($opts['type']) {
-            case 'pkg':
-                return $this->checkPackage($errmsg, $name, $req, $rel, $opt);
-                break;
-            case 'ext':
-                return $this->checkExtension($errmsg, $name, $req, $rel, $opt);
-                break;
-            case 'php':
-                return $this->checkPHP($errmsg, $req, $rel);
-                break;
-            case 'prog':
-                return $this->checkProgram($errmsg, $name);
-                break;
-            case 'os':
-                return $this->checkOS($errmsg, $name);
-                break;
-            case 'sapi':
-                return $this->checkSAPI($errmsg, $name);
-                break;
-            case 'zend':
-                return $this->checkZend($errmsg, $name);
-                break;
-            default:
-                return "'{$opts['type']}' dependency type not supported";
-        }
-    }
-
-    // }}}
-    // {{{ checkPackage()
-
-    /**
-     * Package dependencies check method
-     *
-     * @param string $errmsg    Empty string, it will be populated with an error message, if any
-     * @param string $name      Name of the package to test
-     * @param string $req       The package version required
-     * @param string $relation  How to compare versions with each other
-     * @param bool   $opt       Whether the relationship is optional
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkPackage(&$errmsg, $name, $req = null, $relation = 'has',
-                          $opt = false)
-    {
-        if (is_string($req) && substr($req, 0, 2) == 'v.') {
-            $req = substr($req, 2);
-        }
-        switch ($relation) {
-            case 'has':
-                if (!$this->registry->packageExists($name)) {
-                    if ($opt) {
-                        $errmsg = "package `$name' is recommended to utilize some features.";
-                        return PEAR_DEPENDENCY_MISSING_OPTIONAL;
-                    }
-                    $errmsg = "requires package `$name'";
-                    return PEAR_DEPENDENCY_MISSING;
-                }
-                return false;
-            case 'not':
-                if ($this->registry->packageExists($name)) {
-                    $errmsg = "conflicts with package `$name'";
-                    return PEAR_DEPENDENCY_CONFLICT;
-                }
-                return false;
-            case 'lt':
-            case 'le':
-            case 'eq':
-            case 'ne':
-            case 'ge':
-            case 'gt':
-                $version = $this->registry->packageInfo($name, 'version');
-                if (!$this->registry->packageExists($name)
-                    || !version_compare("$version", "$req", $relation))
-                {
-                    $code = $this->codeFromRelation($relation, $version, $req, $opt);
-                    if ($opt) {
-                        $errmsg = "package `$name' version " . $this->signOperator($relation) .
-                            " $req is recommended to utilize some features.";
-                        if ($version) {
-                            $errmsg .= "  Installed version is $version";
-                        }
-                        return $code;
-                    }
-                    $errmsg = "requires package `$name' " .
-                        $this->signOperator($relation) . " $req";
-                    return $code;
-                }
-                return false;
-        }
-        $errmsg = "relation '$relation' with requirement '$req' is not supported (name=$name)";
-        return PEAR_DEPENDENCY_BAD_DEPENDENCY;
-    }
-
-    // }}}
-    // {{{ checkPackageUninstall()
-
-    /**
-     * Check package dependencies on uninstall
-     *
-     * @param string $error     The resultant error string
-     * @param string $warning   The resultant warning string
-     * @param string $name      Name of the package to test
-     *
-     * @return bool true if there were errors
-     */
-    function checkPackageUninstall(&$error, &$warning, $package)
-    {
-        $error = null;
-        $packages = $this->registry->listPackages();
-        foreach ($packages as $pkg) {
-            if ($pkg == $package) {
-                continue;
-            }
-            $deps = $this->registry->packageInfo($pkg, 'release_deps');
-            if (empty($deps)) {
-                continue;
-            }
-            foreach ($deps as $dep) {
-                if ($dep['type'] == 'pkg' && strcasecmp($dep['name'], $package) == 0) {
-                    if ($dep['rel'] == 'ne' || $dep['rel'] == 'not') {
-                        continue;
-                    }
-                    if (isset($dep['optional']) && $dep['optional'] == 'yes') {
-                        $warning .= "\nWarning: Package '$pkg' optionally depends on '$package'";
-                    } else {
-                        $error .= "Package '$pkg' depends on '$package'\n";
-                    }
-                }
-            }
-        }
-        return ($error) ? true : false;
-    }
-
-    // }}}
-    // {{{ checkExtension()
-
-    /**
-     * Extension dependencies check method
-     *
-     * @param string $name        Name of the extension to test
-     * @param string $req_ext_ver Required extension version to compare with
-     * @param string $relation    How to compare versions with eachother
-     * @param bool   $opt         Whether the relationship is optional
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkExtension(&$errmsg, $name, $req = null, $relation = 'has',
-        $opt = false)
-    {
-        if ($relation == 'not') {
-            if (extension_loaded($name)) {
-                $errmsg = "conflicts with  PHP extension '$name'";
-                return PEAR_DEPENDENCY_CONFLICT;
-            } else {
-                return false;
-            }
-        }
-
-        if (!extension_loaded($name)) {
-            if ($relation == 'not') {
-                return false;
-            }
-            if ($opt) {
-                $errmsg = "'$name' PHP extension is recommended to utilize some features";
-                return PEAR_DEPENDENCY_MISSING_OPTIONAL;
-            }
-            $errmsg = "'$name' PHP extension is not installed";
-            return PEAR_DEPENDENCY_MISSING;
-        }
-        if ($relation == 'has') {
-            return false;
-        }
-        $code = false;
-        if (is_string($req) && substr($req, 0, 2) == 'v.') {
-            $req = substr($req, 2);
-        }
-        $ext_ver = phpversion($name);
-        $operator = $relation;
-        // Force params to be strings, otherwise the comparation will fail (ex. 0.9==0.90)
-        if (!version_compare("$ext_ver", "$req", $operator)) {
-            $errmsg = "'$name' PHP extension version " .
-                $this->signOperator($operator) . " $req is required";
-            $code = $this->codeFromRelation($relation, $ext_ver, $req, $opt);
-            if ($opt) {
-                $errmsg = "'$name' PHP extension version " . $this->signOperator($operator) .
-                    " $req is recommended to utilize some features";
-                return $code;
-            }
-        }
-        return $code;
-    }
-
-    // }}}
-    // {{{ checkOS()
-
-    /**
-     * Operating system  dependencies check method
-     *
-     * @param string $os  Name of the operating system
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkOS(&$errmsg, $os)
-    {
-        // XXX Fixme: Implement a more flexible way, like
-        // comma separated values or something similar to PEAR_OS
-        static $myos;
-        if (empty($myos)) {
-            include_once "OS/Guess.php";
-            $myos = new OS_Guess();
-        }
-        // only 'has' relation is currently supported
-        if ($myos->matchSignature($os)) {
-            return false;
-        }
-        $errmsg = "'$os' operating system not supported";
-        return PEAR_DEPENDENCY_CONFLICT;
-    }
-
-    // }}}
-    // {{{ checkPHP()
-
-    /**
-     * PHP version check method
-     *
-     * @param string $req   which version to compare
-     * @param string $relation  how to compare the version
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkPHP(&$errmsg, $req, $relation = 'ge')
-    {
-        // this would be a bit stupid, but oh well :)
-        if ($relation == 'has') {
-            return false;
-        }
-        if ($relation == 'not') {
-            $errmsg = 'Invalid dependency - "not" is not allowed for php dependencies, ' .
-                'php cannot conflict with itself';
-            return PEAR_DEPENDENCY_BAD_DEPENDENCY;
-        }
-        if (substr($req, 0, 2) == 'v.') {
-            $req = substr($req,2, strlen($req) - 2);
-        }
-        $php_ver = phpversion();
-        $operator = $relation;
-        if (!version_compare("$php_ver", "$req", $operator)) {
-            $errmsg = "PHP version " . $this->signOperator($operator) .
-                " $req is required";
-            return PEAR_DEPENDENCY_CONFLICT;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ checkProgram()
-
-    /**
-     * External program check method.  Looks for executable files in
-     * directories listed in the PATH environment variable.
-     *
-     * @param string $program   which program to look for
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkProgram(&$errmsg, $program)
-    {
-        // XXX FIXME honor safe mode
-        $exe_suffix = OS_WINDOWS ? '.exe' : '';
-        $path_elements = explode(PATH_SEPARATOR, getenv('PATH'));
-        foreach ($path_elements as $dir) {
-            $file = $dir . DIRECTORY_SEPARATOR . $program . $exe_suffix;
-            if (@file_exists($file) && @is_executable($file)) {
-                return false;
-            }
-        }
-        $errmsg = "'$program' program is not present in the PATH";
-        return PEAR_DEPENDENCY_MISSING;
-    }
-
-    // }}}
-    // {{{ checkSAPI()
-
-    /**
-     * SAPI backend check method.  Version comparison is not yet
-     * available here.
-     *
-     * @param string $name      name of SAPI backend
-     * @param string $req   which version to compare
-     * @param string $relation  how to compare versions (currently
-     *                          hardcoded to 'has')
-     * @return mixed bool false if no error or the error string
-     */
-    function checkSAPI(&$errmsg, $name, $req = null, $relation = 'has')
-    {
-        // XXX Fixme: There is no way to know if the user has or
-        // not other SAPI backends installed than the installer one
-
-        $sapi_backend = php_sapi_name();
-        // Version comparisons not supported, sapi backends don't have
-        // version information yet.
-        if ($sapi_backend == $name) {
-            return false;
-        }
-        $errmsg = "'$sapi_backend' SAPI backend not supported";
-        return PEAR_DEPENDENCY_CONFLICT;
-    }
-
-    // }}}
-    // {{{ checkZend()
-
-    /**
-     * Zend version check method
-     *
-     * @param string $req   which version to compare
-     * @param string $relation  how to compare the version
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkZend(&$errmsg, $req, $relation = 'ge')
-    {
-        if (substr($req, 0, 2) == 'v.') {
-            $req = substr($req,2, strlen($req) - 2);
-        }
-        $zend_ver = zend_version();
-        $operator = substr($relation,0,2);
-        if (!version_compare("$zend_ver", "$req", $operator)) {
-            $errmsg = "Zend version " . $this->signOperator($operator) .
-                " $req is required";
-            return PEAR_DEPENDENCY_CONFLICT;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ signOperator()
-
-    /**
-     * Converts text comparing operators to them sign equivalents
-     *
-     * Example: 'ge' to '>='
-     *
-     * @access public
-     * @param  string Operator
-     * @return string Sign equivalent
-     */
-    function signOperator($operator)
-    {
-        switch($operator) {
-            case 'lt': return '<';
-            case 'le': return '<=';
-            case 'gt': return '>';
-            case 'ge': return '>=';
-            case 'eq': return '==';
-            case 'ne': return '!=';
-            default:
-                return $operator;
-        }
-    }
-
-    // }}}
-    // {{{ codeFromRelation()
-
-    /**
-     * Convert relation into corresponding code
-     *
-     * @access public
-     * @param  string Relation
-     * @param  string Version
-     * @param  string Requirement
-     * @param  bool   Optional dependency indicator
-     * @return integer
-     */
-    function codeFromRelation($relation, $version, $req, $opt = false)
-    {
-        $code = PEAR_DEPENDENCY_BAD_DEPENDENCY;
-        switch ($relation) {
-            case 'gt': case 'ge': case 'eq':
-                // upgrade
-                $have_major = preg_replace('/\D.*/', '', $version);
-                $need_major = preg_replace('/\D.*/', '', $req);
-                if ($need_major > $have_major) {
-                    $code = $opt ? PEAR_DEPENDENCY_UPGRADE_MAJOR_OPTIONAL :
-                                   PEAR_DEPENDENCY_UPGRADE_MAJOR;
-                } else {
-                    $code = $opt ? PEAR_DEPENDENCY_UPGRADE_MINOR_OPTIONAL :
-                                   PEAR_DEPENDENCY_UPGRADE_MINOR;
-                }
-                break;
-            case 'lt': case 'le': case 'ne':
-                $code = $opt ? PEAR_DEPENDENCY_CONFLICT_OPTIONAL :
-                               PEAR_DEPENDENCY_CONFLICT;
-                break;
-        }
-        return $code;
-    }
-
-    // }}}
-}
-?>
diff --git a/3rdparty/PEAR/Downloader.php b/3rdparty/PEAR/Downloader.php
deleted file mode 100644
index 5e16dc5ffb1..00000000000
--- a/3rdparty/PEAR/Downloader.php
+++ /dev/null
@@ -1,680 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Stig Bakken <ssb@php.net>                                   |
-// |          Tomas V.V.Cox <cox@idecnet.com>                             |
-// |          Martin Jansen <mj@php.net>                                  |
-// +----------------------------------------------------------------------+
-//
-// $Id: Downloader.php,v 1.17.2.1 2004/10/22 22:54:03 cellog Exp $
-
-require_once 'PEAR/Common.php';
-require_once 'PEAR/Registry.php';
-require_once 'PEAR/Dependency.php';
-require_once 'PEAR/Remote.php';
-require_once 'System.php';
-
-
-define('PEAR_INSTALLER_OK',       1);
-define('PEAR_INSTALLER_FAILED',   0);
-define('PEAR_INSTALLER_SKIPPED', -1);
-define('PEAR_INSTALLER_ERROR_NO_PREF_STATE', 2);
-
-/**
- * Administration class used to download PEAR packages and maintain the
- * installed package database.
- *
- * @since PEAR 1.4
- * @author Greg Beaver <cellog@php.net>
- */
-class PEAR_Downloader extends PEAR_Common
-{
-    /**
-     * @var PEAR_Config
-     * @access private
-     */
-    var $_config;
-
-    /**
-     * @var PEAR_Registry
-     * @access private
-     */
-    var $_registry;
-
-    /**
-     * @var PEAR_Remote
-     * @access private
-     */
-    var $_remote;
-
-    /**
-     * Preferred Installation State (snapshot, devel, alpha, beta, stable)
-     * @var string|null
-     * @access private
-     */
-    var $_preferredState;
-
-    /**
-     * Options from command-line passed to Install.
-     *
-     * Recognized options:<br />
-     *  - onlyreqdeps   : install all required dependencies as well
-     *  - alldeps       : install all dependencies, including optional
-     *  - installroot   : base relative path to install files in
-     *  - force         : force a download even if warnings would prevent it
-     * @see PEAR_Command_Install
-     * @access private
-     * @var array
-     */
-    var $_options;
-
-    /**
-     * Downloaded Packages after a call to download().
-     *
-     * Format of each entry:
-     *
-     * <code>
-     * array('pkg' => 'package_name', 'file' => '/path/to/local/file',
-     *    'info' => array() // parsed package.xml
-     * );
-     * </code>
-     * @access private
-     * @var array
-     */
-    var $_downloadedPackages = array();
-
-    /**
-     * Packages slated for download.
-     *
-     * This is used to prevent downloading a package more than once should it be a dependency
-     * for two packages to be installed.
-     * Format of each entry:
-     *
-     * <pre>
-     * array('package_name1' => parsed package.xml, 'package_name2' => parsed package.xml,
-     * );
-     * </pre>
-     * @access private
-     * @var array
-     */
-    var $_toDownload = array();
-
-    /**
-     * Array of every package installed, with names lower-cased.
-     *
-     * Format:
-     * <code>
-     * array('package1' => 0, 'package2' => 1, );
-     * </code>
-     * @var array
-     */
-    var $_installed = array();
-
-    /**
-     * @var array
-     * @access private
-     */
-    var $_errorStack = array();
-
-    // {{{ PEAR_Downloader()
-
-    function PEAR_Downloader(&$ui, $options, &$config)
-    {
-        $this->_options = $options;
-        $this->_config = &$config;
-        $this->_preferredState = $this->_config->get('preferred_state');
-        $this->ui = &$ui;
-        if (!$this->_preferredState) {
-            // don't inadvertantly use a non-set preferred_state
-            $this->_preferredState = null;
-        }
-
-        $php_dir = $this->_config->get('php_dir');
-        if (isset($this->_options['installroot'])) {
-            if (substr($this->_options['installroot'], -1) == DIRECTORY_SEPARATOR) {
-                $this->_options['installroot'] = substr($this->_options['installroot'], 0, -1);
-            }
-            $php_dir = $this->_prependPath($php_dir, $this->_options['installroot']);
-        }
-        $this->_registry = &new PEAR_Registry($php_dir);
-        $this->_remote = &new PEAR_Remote($config);
-
-        if (isset($this->_options['alldeps']) || isset($this->_options['onlyreqdeps'])) {
-            $this->_installed = $this->_registry->listPackages();
-            array_walk($this->_installed, create_function('&$v,$k','$v = strtolower($v);'));
-            $this->_installed = array_flip($this->_installed);
-        }
-        parent::PEAR_Common();
-    }
-
-    // }}}
-    // {{{ configSet()
-    function configSet($key, $value, $layer = 'user')
-    {
-        $this->_config->set($key, $value, $layer);
-        $this->_preferredState = $this->_config->get('preferred_state');
-        if (!$this->_preferredState) {
-            // don't inadvertantly use a non-set preferred_state
-            $this->_preferredState = null;
-        }
-    }
-
-    // }}}
-    // {{{ setOptions()
-    function setOptions($options)
-    {
-        $this->_options = $options;
-    }
-
-    // }}}
-    // {{{ _downloadFile()
-    /**
-     * @param string filename to download
-     * @param string version/state
-     * @param string original value passed to command-line
-     * @param string|null preferred state (snapshot/devel/alpha/beta/stable)
-     *                    Defaults to configuration preferred state
-     * @return null|PEAR_Error|string
-     * @access private
-     */
-    function _downloadFile($pkgfile, $version, $origpkgfile, $state = null)
-    {
-        if (is_null($state)) {
-            $state = $this->_preferredState;
-        }
-        // {{{ check the package filename, and whether it's already installed
-        $need_download = false;
-        if (preg_match('#^(http|ftp)://#', $pkgfile)) {
-            $need_download = true;
-        } elseif (!@is_file($pkgfile)) {
-            if ($this->validPackageName($pkgfile)) {
-                if ($this->_registry->packageExists($pkgfile)) {
-                    if (empty($this->_options['upgrade']) && empty($this->_options['force'])) {
-                        $errors[] = "$pkgfile already installed";
-                        return;
-                    }
-                }
-                $pkgfile = $this->getPackageDownloadUrl($pkgfile, $version);
-                $need_download = true;
-            } else {
-                if (strlen($pkgfile)) {
-                    $errors[] = "Could not open the package file: $pkgfile";
-                } else {
-                    $errors[] = "No package file given";
-                }
-                return;
-            }
-        }
-        // }}}
-
-        // {{{ Download package -----------------------------------------------
-        if ($need_download) {
-            $downloaddir = $this->_config->get('download_dir');
-            if (empty($downloaddir)) {
-                if (PEAR::isError($downloaddir = System::mktemp('-d'))) {
-                    return $downloaddir;
-                }
-                $this->log(3, '+ tmp dir created at ' . $downloaddir);
-            }
-            $callback = $this->ui ? array(&$this, '_downloadCallback') : null;
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $file = $this->downloadHttp($pkgfile, $this->ui, $downloaddir, $callback);
-            $this->popErrorHandling();
-            if (PEAR::isError($file)) {
-                if ($this->validPackageName($origpkgfile)) {
-                    if (!PEAR::isError($info = $this->_remote->call('package.info',
-                          $origpkgfile))) {
-                        if (!count($info['releases'])) {
-                            return $this->raiseError('Package ' . $origpkgfile .
-                            ' has no releases');
-                        } else {
-                            return $this->raiseError('No releases of preferred state "'
-                            . $state . '" exist for package ' . $origpkgfile .
-                            '.  Use ' . $origpkgfile . '-state to install another' .
-                            ' state (like ' . $origpkgfile .'-beta)',
-                            PEAR_INSTALLER_ERROR_NO_PREF_STATE);
-                        }
-                    } else {
-                        return $pkgfile;
-                    }
-                } else {
-                    return $this->raiseError($file);
-                }
-            }
-            $pkgfile = $file;
-        }
-        // }}}
-        return $pkgfile;
-    }
-    // }}}
-    // {{{ getPackageDownloadUrl()
-
-    function getPackageDownloadUrl($package, $version = null)
-    {
-        if ($version) {
-            $package .= "-$version";
-        }
-        if ($this === null || $this->_config === null) {
-            $package = "http://pear.php.net/get/$package";
-        } else {
-            $package = "http://" . $this->_config->get('master_server') .
-                "/get/$package";
-        }
-        if (!extension_loaded("zlib")) {
-            $package .= '?uncompress=yes';
-        }
-        return $package;
-    }
-
-    // }}}
-    // {{{ extractDownloadFileName($pkgfile, &$version)
-
-    function extractDownloadFileName($pkgfile, &$version)
-    {
-        if (@is_file($pkgfile)) {
-            return $pkgfile;
-        }
-        // regex defined in Common.php
-        if (preg_match(PEAR_COMMON_PACKAGE_DOWNLOAD_PREG, $pkgfile, $m)) {
-            $version = (isset($m[3])) ? $m[3] : null;
-            return $m[1];
-        }
-        $version = null;
-        return $pkgfile;
-    }
-
-    // }}}
-
-    // }}}
-    // {{{ getDownloadedPackages()
-
-    /**
-     * Retrieve a list of downloaded packages after a call to {@link download()}.
-     *
-     * Also resets the list of downloaded packages.
-     * @return array
-     */
-    function getDownloadedPackages()
-    {
-        $ret = $this->_downloadedPackages;
-        $this->_downloadedPackages = array();
-        $this->_toDownload = array();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ download()
-
-    /**
-     * Download any files and their dependencies, if necessary
-     *
-     * BC-compatible method name
-     * @param array a mixed list of package names, local files, or package.xml
-     */
-    function download($packages)
-    {
-        return $this->doDownload($packages);
-    }
-
-    // }}}
-    // {{{ doDownload()
-
-    /**
-     * Download any files and their dependencies, if necessary
-     *
-     * @param array a mixed list of package names, local files, or package.xml
-     */
-    function doDownload($packages)
-    {
-        $mywillinstall = array();
-        $state = $this->_preferredState;
-
-        // {{{ download files in this list if necessary
-        foreach($packages as $pkgfile) {
-            $need_download = false;
-            if (!is_file($pkgfile)) {
-                if (preg_match('#^(http|ftp)://#', $pkgfile)) {
-                    $need_download = true;
-                }
-                $pkgfile = $this->_downloadNonFile($pkgfile);
-                if (PEAR::isError($pkgfile)) {
-                    return $pkgfile;
-                }
-                if ($pkgfile === false) {
-                    continue;
-                }
-            } // end is_file()
-
-            $tempinfo = $this->infoFromAny($pkgfile);
-            if ($need_download) {
-                $this->_toDownload[] = $tempinfo['package'];
-            }
-            if (isset($this->_options['alldeps']) || isset($this->_options['onlyreqdeps'])) {
-                // ignore dependencies if there are any errors
-                if (!PEAR::isError($tempinfo)) {
-                    $mywillinstall[strtolower($tempinfo['package'])] = @$tempinfo['release_deps'];
-                }
-            }
-            $this->_downloadedPackages[] = array('pkg' => $tempinfo['package'],
-                                       'file' => $pkgfile, 'info' => $tempinfo);
-        } // end foreach($packages)
-        // }}}
-
-        // {{{ extract dependencies from downloaded files and then download
-        // them if necessary
-        if (isset($this->_options['alldeps']) || isset($this->_options['onlyreqdeps'])) {
-            $deppackages = array();
-            foreach ($mywillinstall as $package => $alldeps) {
-                if (!is_array($alldeps)) {
-                    // there are no dependencies
-                    continue;
-                }
-                $fail = false;
-                foreach ($alldeps as $info) {
-                    if ($info['type'] != 'pkg') {
-                        continue;
-                    }
-                    $ret = $this->_processDependency($package, $info, $mywillinstall);
-                    if ($ret === false) {
-                        continue;
-                    }
-                    if ($ret === 0) {
-                        $fail = true;
-                        continue;
-                    }
-                    if (PEAR::isError($ret)) {
-                        return $ret;
-                    }
-                    $deppackages[] = $ret;
-                } // foreach($alldeps
-                if ($fail) {
-                    $deppackages = array();
-                }
-            }
-
-            if (count($deppackages)) {
-                $this->doDownload($deppackages);
-            }
-        } // }}} if --alldeps or --onlyreqdeps
-    }
-
-    // }}}
-    // {{{ _downloadNonFile($pkgfile)
-
-    /**
-     * @return false|PEAR_Error|string false if loop should be broken out of,
-     *                                 string if the file was downloaded,
-     *                                 PEAR_Error on exception
-     * @access private
-     */
-    function _downloadNonFile($pkgfile)
-    {
-        $origpkgfile = $pkgfile;
-        $state = null;
-        $pkgfile = $this->extractDownloadFileName($pkgfile, $version);
-        if (preg_match('#^(http|ftp)://#', $pkgfile)) {
-            return $this->_downloadFile($pkgfile, $version, $origpkgfile);
-        }
-        if (!$this->validPackageName($pkgfile)) {
-            return $this->raiseError("Package name '$pkgfile' not valid");
-        }
-        // ignore packages that are installed unless we are upgrading
-        $curinfo = $this->_registry->packageInfo($pkgfile);
-        if ($this->_registry->packageExists($pkgfile)
-              && empty($this->_options['upgrade']) && empty($this->_options['force'])) {
-            $this->log(0, "Package '{$curinfo['package']}' already installed, skipping");
-            return false;
-        }
-        if (in_array($pkgfile, $this->_toDownload)) {
-            return false;
-        }
-        $releases = $this->_remote->call('package.info', $pkgfile, 'releases', true);
-        if (!count($releases)) {
-            return $this->raiseError("No releases found for package '$pkgfile'");
-        }
-        // Want a specific version/state
-        if ($version !== null) {
-            // Passed Foo-1.2
-            if ($this->validPackageVersion($version)) {
-                if (!isset($releases[$version])) {
-                    return $this->raiseError("No release with version '$version' found for '$pkgfile'");
-                }
-            // Passed Foo-alpha
-            } elseif (in_array($version, $this->getReleaseStates())) {
-                $state = $version;
-                $version = 0;
-                foreach ($releases as $ver => $inf) {
-                    if ($inf['state'] == $state && version_compare("$version", "$ver") < 0) {
-                        $version = $ver;
-                        break;
-                    }
-                }
-                if ($version == 0) {
-                    return $this->raiseError("No release with state '$state' found for '$pkgfile'");
-                }
-            // invalid suffix passed
-            } else {
-                return $this->raiseError("Invalid suffix '-$version', be sure to pass a valid PEAR ".
-                                         "version number or release state");
-            }
-        // Guess what to download
-        } else {
-            $states = $this->betterStates($this->_preferredState, true);
-            $possible = false;
-            $version = 0;
-            $higher_version = 0;
-            $prev_hi_ver = 0;
-            foreach ($releases as $ver => $inf) {
-                if (in_array($inf['state'], $states) && version_compare("$version", "$ver") < 0) {
-                    $version = $ver;
-                    break;
-                } else {
-                    $ver = (string)$ver;
-                    if (version_compare($prev_hi_ver, $ver) < 0) {
-                        $prev_hi_ver = $higher_version = $ver;
-                    }
-				}
-            }
-            if ($version === 0 && !isset($this->_options['force'])) {
-                return $this->raiseError('No release with state equal to: \'' . implode(', ', $states) .
-                                         "' found for '$pkgfile'");
-            } elseif ($version === 0) {
-                $this->log(0, "Warning: $pkgfile is state '" . $releases[$higher_version]['state'] . "' which is less stable " .
-                              "than state '$this->_preferredState'");
-            }
-        }
-        // Check if we haven't already the version
-        if (empty($this->_options['force']) && !is_null($curinfo)) {
-            if ($curinfo['version'] == $version) {
-                $this->log(0, "Package '{$curinfo['package']}-{$curinfo['version']}' already installed, skipping");
-                return false;
-            } elseif (version_compare("$version", "{$curinfo['version']}") < 0) {
-                $this->log(0, "Package '{$curinfo['package']}' version '{$curinfo['version']}' " .
-                              " is installed and {$curinfo['version']} is > requested '$version', skipping");
-                return false;
-            }
-        }
-        $this->_toDownload[] = $pkgfile;
-        return $this->_downloadFile($pkgfile, $version, $origpkgfile, $state);
-    }
-
-    // }}}
-    // {{{ _processDependency($package, $info, $mywillinstall)
-
-    /**
-     * Process a dependency, download if necessary
-     * @param array dependency information from PEAR_Remote call
-     * @param array packages that will be installed in this iteration
-     * @return false|string|PEAR_Error
-     * @access private
-     * @todo Add test for relation 'lt'/'le' -> make sure that the dependency requested is
-     *       in fact lower than the required value.  This will be very important for BC dependencies
-     */
-    function _processDependency($package, $info, $mywillinstall)
-    {
-        $state = $this->_preferredState;
-        if (!isset($this->_options['alldeps']) && isset($info['optional']) &&
-              $info['optional'] == 'yes') {
-            // skip optional deps
-            $this->log(0, "skipping Package '$package' optional dependency '$info[name]'");
-            return false;
-        }
-        // {{{ get releases
-        $releases = $this->_remote->call('package.info', $info['name'], 'releases', true);
-        if (PEAR::isError($releases)) {
-            return $releases;
-        }
-        if (!count($releases)) {
-            if (!isset($this->_installed[strtolower($info['name'])])) {
-                $this->pushError("Package '$package' dependency '$info[name]' ".
-                            "has no releases");
-            }
-            return false;
-        }
-        $found = false;
-        $save = $releases;
-        while(count($releases) && !$found) {
-            if (!empty($state) && $state != 'any') {
-                list($release_version, $release) = each($releases);
-                if ($state != $release['state'] &&
-                    !in_array($release['state'], $this->betterStates($state)))
-                {
-                    // drop this release - it ain't stable enough
-                    array_shift($releases);
-                } else {
-                    $found = true;
-                }
-            } else {
-                $found = true;
-            }
-        }
-        if (!count($releases) && !$found) {
-            $get = array();
-            foreach($save as $release) {
-                $get = array_merge($get,
-                    $this->betterStates($release['state'], true));
-            }
-            $savestate = array_shift($get);
-            $this->pushError( "Release for '$package' dependency '$info[name]' " .
-                "has state '$savestate', requires '$state'");
-            return 0;
-        }
-        if (in_array(strtolower($info['name']), $this->_toDownload) ||
-              isset($mywillinstall[strtolower($info['name'])])) {
-            // skip upgrade check for packages we will install
-            return false;
-        }
-        if (!isset($this->_installed[strtolower($info['name'])])) {
-            // check to see if we can install the specific version required
-            if ($info['rel'] == 'eq') {
-                return $info['name'] . '-' . $info['version'];
-            }
-            // skip upgrade check for packages we don't have installed
-            return $info['name'];
-        }
-        // }}}
-
-        // {{{ see if a dependency must be upgraded
-        $inst_version = $this->_registry->packageInfo($info['name'], 'version');
-        if (!isset($info['version'])) {
-            // this is a rel='has' dependency, check against latest
-            if (version_compare($release_version, $inst_version, 'le')) {
-                return false;
-            } else {
-                return $info['name'];
-            }
-        }
-        if (version_compare($info['version'], $inst_version, 'le')) {
-            // installed version is up-to-date
-            return false;
-        }
-        return $info['name'];
-    }
-
-    // }}}
-    // {{{ _downloadCallback()
-
-    function _downloadCallback($msg, $params = null)
-    {
-        switch ($msg) {
-            case 'saveas':
-                $this->log(1, "downloading $params ...");
-                break;
-            case 'done':
-                $this->log(1, '...done: ' . number_format($params, 0, '', ',') . ' bytes');
-                break;
-            case 'bytesread':
-                static $bytes;
-                if (empty($bytes)) {
-                    $bytes = 0;
-                }
-                if (!($bytes % 10240)) {
-                    $this->log(1, '.', false);
-                }
-                $bytes += $params;
-                break;
-            case 'start':
-                $this->log(1, "Starting to download {$params[0]} (".number_format($params[1], 0, '', ',')." bytes)");
-                break;
-        }
-        if (method_exists($this->ui, '_downloadCallback'))
-            $this->ui->_downloadCallback($msg, $params);
-    }
-
-    // }}}
-    // {{{ _prependPath($path, $prepend)
-
-    function _prependPath($path, $prepend)
-    {
-        if (strlen($prepend) > 0) {
-            if (OS_WINDOWS && preg_match('/^[a-z]:/i', $path)) {
-                $path = $prepend . substr($path, 2);
-            } else {
-                $path = $prepend . $path;
-            }
-        }
-        return $path;
-    }
-    // }}}
-    // {{{ pushError($errmsg, $code)
-
-    /**
-     * @param string
-     * @param integer
-     */
-    function pushError($errmsg, $code = -1)
-    {
-        array_push($this->_errorStack, array($errmsg, $code));
-    }
-
-    // }}}
-    // {{{ getErrorMsgs()
-
-    function getErrorMsgs()
-    {
-        $msgs = array();
-        $errs = $this->_errorStack;
-        foreach ($errs as $err) {
-            $msgs[] = $err[0];
-        }
-        $this->_errorStack = array();
-        return $msgs;
-    }
-
-    // }}}
-}
-// }}}
-
-?>
diff --git a/3rdparty/PEAR/ErrorStack.php b/3rdparty/PEAR/ErrorStack.php
deleted file mode 100644
index da52f08d345..00000000000
--- a/3rdparty/PEAR/ErrorStack.php
+++ /dev/null
@@ -1,981 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Gregory Beaver <cellog@php.net>                              |
-// |                                                                      |
-// +----------------------------------------------------------------------+
-//
-// $Id: ErrorStack.php,v 1.7.2.5 2005/01/01 21:26:51 cellog Exp $
-
-/**
- * Error Stack Implementation
- * 
- * This is an incredibly simple implementation of a very complex error handling
- * facility.  It contains the ability
- * to track multiple errors from multiple packages simultaneously.  In addition,
- * it can track errors of many levels, save data along with the error, context
- * information such as the exact file, line number, class and function that
- * generated the error, and if necessary, it can raise a traditional PEAR_Error.
- * It has built-in support for PEAR::Log, to log errors as they occur
- * 
- * Since version 0.2alpha, it is also possible to selectively ignore errors,
- * through the use of an error callback, see {@link pushCallback()}
- * 
- * Since version 0.3alpha, it is possible to specify the exception class
- * returned from {@link push()}
- *
- * Since version PEAR1.3.2, ErrorStack no longer instantiates an exception class.  This can
- * still be done quite handily in an error callback or by manipulating the returned array
- * @author Greg Beaver <cellog@php.net>
- * @version PEAR1.3.2 (beta)
- * @package PEAR_ErrorStack
- * @category Debugging
- * @license http://www.php.net/license/3_0.txt PHP License v3.0
- */
-
-/**
- * Singleton storage
- * 
- * Format:
- * <pre>
- * array(
- *  'package1' => PEAR_ErrorStack object,
- *  'package2' => PEAR_ErrorStack object,
- *  ...
- * )
- * </pre>
- * @access private
- * @global array $GLOBALS['_PEAR_ERRORSTACK_SINGLETON']
- */
-$GLOBALS['_PEAR_ERRORSTACK_SINGLETON'] = array();
-
-/**
- * Global error callback (default)
- * 
- * This is only used if set to non-false.  * is the default callback for
- * all packages, whereas specific packages may set a default callback
- * for all instances, regardless of whether they are a singleton or not.
- *
- * To exclude non-singletons, only set the local callback for the singleton
- * @see PEAR_ErrorStack::setDefaultCallback()
- * @access private
- * @global array $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK']
- */
-$GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK'] = array(
-    '*' => false,
-);
-
-/**
- * Global Log object (default)
- * 
- * This is only used if set to non-false.  Use to set a default log object for
- * all stacks, regardless of instantiation order or location
- * @see PEAR_ErrorStack::setDefaultLogger()
- * @access private
- * @global array $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER']
- */
-$GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'] = false;
-
-/**
- * Global Overriding Callback
- * 
- * This callback will override any error callbacks that specific loggers have set.
- * Use with EXTREME caution
- * @see PEAR_ErrorStack::staticPushCallback()
- * @access private
- * @global array $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER']
- */
-$GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'] = array();
-
-/**#@+
- * One of four possible return values from the error Callback
- * @see PEAR_ErrorStack::_errorCallback()
- */
-/**
- * If this is returned, then the error will be both pushed onto the stack
- * and logged.
- */
-define('PEAR_ERRORSTACK_PUSHANDLOG', 1);
-/**
- * If this is returned, then the error will only be pushed onto the stack,
- * and not logged.
- */
-define('PEAR_ERRORSTACK_PUSH', 2);
-/**
- * If this is returned, then the error will only be logged, but not pushed
- * onto the error stack.
- */
-define('PEAR_ERRORSTACK_LOG', 3);
-/**
- * If this is returned, then the error is completely ignored.
- */
-define('PEAR_ERRORSTACK_IGNORE', 4);
-/**
- * If this is returned, then the error is logged and die() is called.
- */
-define('PEAR_ERRORSTACK_DIE', 5);
-/**#@-*/
-
-/**
- * Error code for an attempt to instantiate a non-class as a PEAR_ErrorStack in
- * the singleton method.
- */
-define('PEAR_ERRORSTACK_ERR_NONCLASS', 1);
-
-/**
- * Error code for an attempt to pass an object into {@link PEAR_ErrorStack::getMessage()}
- * that has no __toString() method
- */
-define('PEAR_ERRORSTACK_ERR_OBJTOSTRING', 2);
-/**
- * Error Stack Implementation
- *
- * Usage:
- * <code>
- * // global error stack
- * $global_stack = &PEAR_ErrorStack::singleton('MyPackage');
- * // local error stack
- * $local_stack = new PEAR_ErrorStack('MyPackage');
- * </code>
- * @copyright 2004 Gregory Beaver
- * @package PEAR_ErrorStack
- * @license http://www.php.net/license/3_0.txt PHP License
- */
-class PEAR_ErrorStack {
-    /**
-     * Errors are stored in the order that they are pushed on the stack.
-     * @since 0.4alpha Errors are no longer organized by error level.
-     * This renders pop() nearly unusable, and levels could be more easily
-     * handled in a callback anyway
-     * @var array
-     * @access private
-     */
-    var $_errors = array();
-
-    /**
-     * Storage of errors by level.
-     *
-     * Allows easy retrieval and deletion of only errors from a particular level
-     * @since PEAR 1.4.0dev
-     * @var array
-     * @access private
-     */
-    var $_errorsByLevel = array();
-
-    /**
-     * Package name this error stack represents
-     * @var string
-     * @access protected
-     */
-    var $_package;
-    
-    /**
-     * Determines whether a PEAR_Error is thrown upon every error addition
-     * @var boolean
-     * @access private
-     */
-    var $_compat = false;
-    
-    /**
-     * If set to a valid callback, this will be used to generate the error
-     * message from the error code, otherwise the message passed in will be
-     * used
-     * @var false|string|array
-     * @access private
-     */
-    var $_msgCallback = false;
-    
-    /**
-     * If set to a valid callback, this will be used to generate the error
-     * context for an error.  For PHP-related errors, this will be a file
-     * and line number as retrieved from debug_backtrace(), but can be
-     * customized for other purposes.  The error might actually be in a separate
-     * configuration file, or in a database query.
-     * @var false|string|array
-     * @access protected
-     */
-    var $_contextCallback = false;
-    
-    /**
-     * If set to a valid callback, this will be called every time an error
-     * is pushed onto the stack.  The return value will be used to determine
-     * whether to allow an error to be pushed or logged.
-     * 
-     * The return value must be one an PEAR_ERRORSTACK_* constant
-     * @see PEAR_ERRORSTACK_PUSHANDLOG, PEAR_ERRORSTACK_PUSH, PEAR_ERRORSTACK_LOG
-     * @var false|string|array
-     * @access protected
-     */
-    var $_errorCallback = array();
-    
-    /**
-     * PEAR::Log object for logging errors
-     * @var false|Log
-     * @access protected
-     */
-    var $_logger = false;
-    
-    /**
-     * Error messages - designed to be overridden
-     * @var array
-     * @abstract
-     */
-    var $_errorMsgs = array();
-    
-    /**
-     * Set up a new error stack
-     * 
-     * @param string   $package name of the package this error stack represents
-     * @param callback $msgCallback callback used for error message generation
-     * @param callback $contextCallback callback used for context generation,
-     *                 defaults to {@link getFileLine()}
-     * @param boolean  $throwPEAR_Error
-     */
-    function PEAR_ErrorStack($package, $msgCallback = false, $contextCallback = false,
-                         $throwPEAR_Error = false)
-    {
-        $this->_package = $package;
-        $this->setMessageCallback($msgCallback);
-        $this->setContextCallback($contextCallback);
-        $this->_compat = $throwPEAR_Error;
-    }
-    
-    /**
-     * Return a single error stack for this package.
-     * 
-     * Note that all parameters are ignored if the stack for package $package
-     * has already been instantiated
-     * @param string   $package name of the package this error stack represents
-     * @param callback $msgCallback callback used for error message generation
-     * @param callback $contextCallback callback used for context generation,
-     *                 defaults to {@link getFileLine()}
-     * @param boolean  $throwPEAR_Error
-     * @param string   $stackClass class to instantiate
-     * @static
-     * @return PEAR_ErrorStack
-     */
-    function &singleton($package, $msgCallback = false, $contextCallback = false,
-                         $throwPEAR_Error = false, $stackClass = 'PEAR_ErrorStack')
-    {
-        if (isset($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package])) {
-            return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package];
-        }
-        if (!class_exists($stackClass)) {
-            if (function_exists('debug_backtrace')) {
-                $trace = debug_backtrace();
-            }
-            PEAR_ErrorStack::staticPush('PEAR_ErrorStack', PEAR_ERRORSTACK_ERR_NONCLASS,
-                'exception', array('stackclass' => $stackClass),
-                'stack class "%stackclass%" is not a valid class name (should be like PEAR_ErrorStack)',
-                false, $trace);
-        }
-        return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package] =
-            &new $stackClass($package, $msgCallback, $contextCallback, $throwPEAR_Error);
-    }
-
-    /**
-     * Internal error handler for PEAR_ErrorStack class
-     * 
-     * Dies if the error is an exception (and would have died anyway)
-     * @access private
-     */
-    function _handleError($err)
-    {
-        if ($err['level'] == 'exception') {
-            $message = $err['message'];
-            if (isset($_SERVER['REQUEST_URI'])) {
-                echo '<br />';
-            } else {
-                echo "\n";
-            }
-            var_dump($err['context']);
-            die($message);
-        }
-    }
-    
-    /**
-     * Set up a PEAR::Log object for all error stacks that don't have one
-     * @param Log $log 
-     * @static
-     */
-    function setDefaultLogger(&$log)
-    {
-        if (is_object($log) && method_exists($log, 'log') ) {
-            $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'] = &$log;
-        } elseif (is_callable($log)) {
-            $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'] = &$log;
-	}
-    }
-    
-    /**
-     * Set up a PEAR::Log object for this error stack
-     * @param Log $log 
-     */
-    function setLogger(&$log)
-    {
-        if (is_object($log) && method_exists($log, 'log') ) {
-            $this->_logger = &$log;
-        } elseif (is_callable($log)) {
-            $this->_logger = &$log;
-        }
-    }
-    
-    /**
-     * Set an error code => error message mapping callback
-     * 
-     * This method sets the callback that can be used to generate error
-     * messages for any instance
-     * @param array|string Callback function/method
-     */
-    function setMessageCallback($msgCallback)
-    {
-        if (!$msgCallback) {
-            $this->_msgCallback = array(&$this, 'getErrorMessage');
-        } else {
-            if (is_callable($msgCallback)) {
-                $this->_msgCallback = $msgCallback;
-            }
-        }
-    }
-    
-    /**
-     * Get an error code => error message mapping callback
-     * 
-     * This method returns the current callback that can be used to generate error
-     * messages
-     * @return array|string|false Callback function/method or false if none
-     */
-    function getMessageCallback()
-    {
-        return $this->_msgCallback;
-    }
-    
-    /**
-     * Sets a default callback to be used by all error stacks
-     * 
-     * This method sets the callback that can be used to generate error
-     * messages for a singleton
-     * @param array|string Callback function/method
-     * @param string Package name, or false for all packages
-     * @static
-     */
-    function setDefaultCallback($callback = false, $package = false)
-    {
-        if (!is_callable($callback)) {
-            $callback = false;
-        }
-        $package = $package ? $package : '*';
-        $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK'][$package] = $callback;
-    }
-    
-    /**
-     * Set a callback that generates context information (location of error) for an error stack
-     * 
-     * This method sets the callback that can be used to generate context
-     * information for an error.  Passing in NULL will disable context generation
-     * and remove the expensive call to debug_backtrace()
-     * @param array|string|null Callback function/method
-     */
-    function setContextCallback($contextCallback)
-    {
-        if ($contextCallback === null) {
-            return $this->_contextCallback = false;
-        }
-        if (!$contextCallback) {
-            $this->_contextCallback = array(&$this, 'getFileLine');
-        } else {
-            if (is_callable($contextCallback)) {
-                $this->_contextCallback = $contextCallback;
-            }
-        }
-    }
-    
-    /**
-     * Set an error Callback
-     * If set to a valid callback, this will be called every time an error
-     * is pushed onto the stack.  The return value will be used to determine
-     * whether to allow an error to be pushed or logged.
-     * 
-     * The return value must be one of the ERRORSTACK_* constants.
-     * 
-     * This functionality can be used to emulate PEAR's pushErrorHandling, and
-     * the PEAR_ERROR_CALLBACK mode, without affecting the integrity of
-     * the error stack or logging
-     * @see PEAR_ERRORSTACK_PUSHANDLOG, PEAR_ERRORSTACK_PUSH, PEAR_ERRORSTACK_LOG
-     * @see popCallback()
-     * @param string|array $cb
-     */
-    function pushCallback($cb)
-    {
-        array_push($this->_errorCallback, $cb);
-    }
-    
-    /**
-     * Remove a callback from the error callback stack
-     * @see pushCallback()
-     * @return array|string|false
-     */
-    function popCallback()
-    {
-        if (!count($this->_errorCallback)) {
-            return false;
-        }
-        return array_pop($this->_errorCallback);
-    }
-    
-    /**
-     * Set a temporary overriding error callback for every package error stack
-     *
-     * Use this to temporarily disable all existing callbacks (can be used
-     * to emulate the @ operator, for instance)
-     * @see PEAR_ERRORSTACK_PUSHANDLOG, PEAR_ERRORSTACK_PUSH, PEAR_ERRORSTACK_LOG
-     * @see staticPopCallback(), pushCallback()
-     * @param string|array $cb
-     * @static
-     */
-    function staticPushCallback($cb)
-    {
-        array_push($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'], $cb);
-    }
-    
-    /**
-     * Remove a temporary overriding error callback
-     * @see staticPushCallback()
-     * @return array|string|false
-     * @static
-     */
-    function staticPopCallback()
-    {
-        $ret = array_pop($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK']);
-        if (!is_array($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'])) {
-            $GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'] = array();
-        }
-        return $ret;
-    }
-    
-    /**
-     * Add an error to the stack
-     * 
-     * If the message generator exists, it is called with 2 parameters.
-     *  - the current Error Stack object
-     *  - an array that is in the same format as an error.  Available indices
-     *    are 'code', 'package', 'time', 'params', 'level', and 'context'
-     * 
-     * Next, if the error should contain context information, this is
-     * handled by the context grabbing method.
-     * Finally, the error is pushed onto the proper error stack
-     * @param int    $code      Package-specific error code
-     * @param string $level     Error level.  This is NOT spell-checked
-     * @param array  $params    associative array of error parameters
-     * @param string $msg       Error message, or a portion of it if the message
-     *                          is to be generated
-     * @param array  $repackage If this error re-packages an error pushed by
-     *                          another package, place the array returned from
-     *                          {@link pop()} in this parameter
-     * @param array  $backtrace Protected parameter: use this to pass in the
-     *                          {@link debug_backtrace()} that should be used
-     *                          to find error context
-     * @return PEAR_Error|array|Exception
-     *                          if compatibility mode is on, a PEAR_Error is also
-     *                          thrown.  If the class Exception exists, then one
-     *                          is returned to allow code like:
-     * <code>
-     * throw ($stack->push(MY_ERROR_CODE, 'error', array('username' => 'grob')));
-     * </code>
-     * 
-     * The errorData property of the exception class will be set to the array
-     * that would normally be returned.  If a PEAR_Error is returned, the userinfo
-     * property is set to the array
-     * 
-     * Otherwise, an array is returned in this format:
-     * <code>
-     * array(
-     *    'code' => $code,
-     *    'params' => $params,
-     *    'package' => $this->_package,
-     *    'level' => $level,
-     *    'time' => time(),
-     *    'context' => $context,
-     *    'message' => $msg,
-     * //['repackage' => $err] repackaged error array/Exception class
-     * );
-     * </code>
-     */
-    function push($code, $level = 'error', $params = array(), $msg = false,
-                  $repackage = false, $backtrace = false)
-    {
-        $context = false;
-        // grab error context
-        if ($this->_contextCallback) {
-            if (!$backtrace) {
-                $backtrace = debug_backtrace();
-            }
-            $context = call_user_func($this->_contextCallback, $code, $params, $backtrace);
-        }
-        
-        // save error
-        $time = explode(' ', microtime());
-        $time = $time[1] + $time[0];
-        $err = array(
-                'code' => $code,
-                'params' => $params,
-                'package' => $this->_package,
-                'level' => $level,
-                'time' => $time,
-                'context' => $context,
-                'message' => $msg,
-               );
-
-        // set up the error message, if necessary
-        if ($this->_msgCallback) {
-            $msg = call_user_func_array($this->_msgCallback,
-                                        array(&$this, $err));
-            $err['message'] = $msg;
-        }        
-        
-        if ($repackage) {
-            $err['repackage'] = $repackage;
-        }
-        $push = $log = true;
-        $die = false;
-        // try the overriding callback first
-        $callback = $this->staticPopCallback();
-        if ($callback) {
-            $this->staticPushCallback($callback);
-        }
-        if (!is_callable($callback)) {
-            // try the local callback next
-            $callback = $this->popCallback();
-            if (is_callable($callback)) {
-                $this->pushCallback($callback);
-            } else {
-                // try the default callback
-                $callback = isset($GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK'][$this->_package]) ?
-                    $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK'][$this->_package] :
-                    $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK']['*'];
-            }
-        }
-        if (is_callable($callback)) {
-            switch(call_user_func($callback, $err)){
-            	case PEAR_ERRORSTACK_IGNORE: 
-            		return $err;
-        		break;
-            	case PEAR_ERRORSTACK_PUSH: 
-            		$log = false;
-        		break;
-            	case PEAR_ERRORSTACK_LOG: 
-            		$push = false;
-        		break;
-            	case PEAR_ERRORSTACK_DIE: 
-            		$die = true;
-        		break;
-                // anything else returned has the same effect as pushandlog
-            }
-        }
-        if ($push) {
-            array_unshift($this->_errors, $err);
-            $this->_errorsByLevel[$err['level']][] = &$this->_errors[0];
-        }
-        if ($log) {
-            if ($this->_logger || $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER']) {
-                $this->_log($err);
-            }
-        }
-        if ($die) {
-            die();
-        }
-        if ($this->_compat && $push) {
-            return $this->raiseError($msg, $code, null, null, $err);
-        }
-        return $err;
-    }
-    
-    /**
-     * Static version of {@link push()}
-     * 
-     * @param string $package   Package name this error belongs to
-     * @param int    $code      Package-specific error code
-     * @param string $level     Error level.  This is NOT spell-checked
-     * @param array  $params    associative array of error parameters
-     * @param string $msg       Error message, or a portion of it if the message
-     *                          is to be generated
-     * @param array  $repackage If this error re-packages an error pushed by
-     *                          another package, place the array returned from
-     *                          {@link pop()} in this parameter
-     * @param array  $backtrace Protected parameter: use this to pass in the
-     *                          {@link debug_backtrace()} that should be used
-     *                          to find error context
-     * @return PEAR_Error|null|Exception
-     *                          if compatibility mode is on, a PEAR_Error is also
-     *                          thrown.  If the class Exception exists, then one
-     *                          is returned to allow code like:
-     * <code>
-     * throw ($stack->push(MY_ERROR_CODE, 'error', array('username' => 'grob')));
-     * </code>
-     * @static
-     */
-    function staticPush($package, $code, $level = 'error', $params = array(),
-                        $msg = false, $repackage = false, $backtrace = false)
-    {
-        $s = &PEAR_ErrorStack::singleton($package);
-        if ($s->_contextCallback) {
-            if (!$backtrace) {
-                if (function_exists('debug_backtrace')) {
-                    $backtrace = debug_backtrace();
-                }
-            }
-        }
-        return $s->push($code, $level, $params, $msg, $repackage, $backtrace);
-    }
-    
-    /**
-     * Log an error using PEAR::Log
-     * @param array $err Error array
-     * @param array $levels Error level => Log constant map
-     * @access protected
-     */
-    function _log($err)
-    {
-        if ($this->_logger) {
-            $logger = &$this->_logger;
-        } else {
-            $logger = &$GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'];
-        }
-        if (is_a($logger, 'Log')) {
-            $levels = array(
-                'exception' => PEAR_LOG_CRIT,
-                'alert' => PEAR_LOG_ALERT,
-                'critical' => PEAR_LOG_CRIT,
-                'error' => PEAR_LOG_ERR,
-                'warning' => PEAR_LOG_WARNING,
-                'notice' => PEAR_LOG_NOTICE,
-                'info' => PEAR_LOG_INFO,
-                'debug' => PEAR_LOG_DEBUG);
-            if (isset($levels[$err['level']])) {
-                $level = $levels[$err['level']];
-            } else {
-                $level = PEAR_LOG_INFO;
-            }
-            $logger->log($err['message'], $level, $err);
-        } else { // support non-standard logs
-            call_user_func($logger, $err);
-        }
-    }
-
-    
-    /**
-     * Pop an error off of the error stack
-     * 
-     * @return false|array
-     * @since 0.4alpha it is no longer possible to specify a specific error
-     * level to return - the last error pushed will be returned, instead
-     */
-    function pop()
-    {
-        return @array_shift($this->_errors);
-    }
-    
-    /**
-     * Determine whether there are any errors on the stack
-     * @param string|array Level name.  Use to determine if any errors
-     * of level (string), or levels (array) have been pushed
-     * @return boolean
-     */
-    function hasErrors($level = false)
-    {
-        if ($level) {
-            return isset($this->_errorsByLevel[$level]);
-        }
-        return count($this->_errors);
-    }
-    
-    /**
-     * Retrieve all errors since last purge
-     * 
-     * @param boolean set in order to empty the error stack
-     * @param string level name, to return only errors of a particular severity
-     * @return array
-     */
-    function getErrors($purge = false, $level = false)
-    {
-        if (!$purge) {
-            if ($level) {
-                if (!isset($this->_errorsByLevel[$level])) {
-                    return array();
-                } else {
-                    return $this->_errorsByLevel[$level];
-                }
-            } else {
-                return $this->_errors;
-            }
-        }
-        if ($level) {
-            $ret = $this->_errorsByLevel[$level];
-            foreach ($this->_errorsByLevel[$level] as $i => $unused) {
-                // entries are references to the $_errors array
-                $this->_errorsByLevel[$level][$i] = false;
-            }
-            // array_filter removes all entries === false
-            $this->_errors = array_filter($this->_errors);
-            unset($this->_errorsByLevel[$level]);
-            return $ret;
-        }
-        $ret = $this->_errors;
-        $this->_errors = array();
-        $this->_errorsByLevel = array();
-        return $ret;
-    }
-    
-    /**
-     * Determine whether there are any errors on a single error stack, or on any error stack
-     *
-     * The optional parameter can be used to test the existence of any errors without the need of
-     * singleton instantiation
-     * @param string|false Package name to check for errors
-     * @param string Level name to check for a particular severity
-     * @return boolean
-     * @static
-     */
-    function staticHasErrors($package = false, $level = false)
-    {
-        if ($package) {
-            if (!isset($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package])) {
-                return false;
-            }
-            return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package]->hasErrors($level);
-        }
-        foreach ($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'] as $package => $obj) {
-            if ($obj->hasErrors($level)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    /**
-     * Get a list of all errors since last purge, organized by package
-     * @since PEAR 1.4.0dev BC break! $level is now in the place $merge used to be
-     * @param boolean $purge Set to purge the error stack of existing errors
-     * @param string  $level Set to a level name in order to retrieve only errors of a particular level
-     * @param boolean $merge Set to return a flat array, not organized by package
-     * @param array   $sortfunc Function used to sort a merged array - default
-     *        sorts by time, and should be good for most cases
-     * @static
-     * @return array 
-     */
-    function staticGetErrors($purge = false, $level = false, $merge = false,
-                             $sortfunc = array('PEAR_ErrorStack', '_sortErrors'))
-    {
-        $ret = array();
-        if (!is_callable($sortfunc)) {
-            $sortfunc = array('PEAR_ErrorStack', '_sortErrors');
-        }
-        foreach ($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'] as $package => $obj) {
-            $test = $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package]->getErrors($purge, $level);
-            if ($test) {
-                if ($merge) {
-                    $ret = array_merge($ret, $test);
-                } else {
-                    $ret[$package] = $test;
-                }
-            }
-        }
-        if ($merge) {
-            usort($ret, $sortfunc);
-        }
-        return $ret;
-    }
-    
-    /**
-     * Error sorting function, sorts by time
-     * @access private
-     */
-    function _sortErrors($a, $b)
-    {
-        if ($a['time'] == $b['time']) {
-            return 0;
-        }
-        if ($a['time'] < $b['time']) {
-            return 1;
-        }
-        return -1;
-    }
-
-    /**
-     * Standard file/line number/function/class context callback
-     *
-     * This function uses a backtrace generated from {@link debug_backtrace()}
-     * and so will not work at all in PHP < 4.3.0.  The frame should
-     * reference the frame that contains the source of the error.
-     * @return array|false either array('file' => file, 'line' => line,
-     *         'function' => function name, 'class' => class name) or
-     *         if this doesn't work, then false
-     * @param unused
-     * @param integer backtrace frame.
-     * @param array Results of debug_backtrace()
-     * @static
-     */
-    function getFileLine($code, $params, $backtrace = null)
-    {
-        if ($backtrace === null) {
-            return false;
-        }
-        $frame = 0;
-        $functionframe = 1;
-        if (!isset($backtrace[1])) {
-            $functionframe = 0;
-        } else {
-            while (isset($backtrace[$functionframe]['function']) &&
-                  $backtrace[$functionframe]['function'] == 'eval' &&
-                  isset($backtrace[$functionframe + 1])) {
-                $functionframe++;
-            }
-        }
-        if (isset($backtrace[$frame])) {
-            if (!isset($backtrace[$frame]['file'])) {
-                $frame++;
-            }
-            $funcbacktrace = $backtrace[$functionframe];
-            $filebacktrace = $backtrace[$frame];
-            $ret = array('file' => $filebacktrace['file'],
-                         'line' => $filebacktrace['line']);
-            // rearrange for eval'd code or create function errors
-            if (strpos($filebacktrace['file'], '(') && 
-            	  preg_match(';^(.*?)\((\d+)\) : (.*?)$;', $filebacktrace['file'],
-                  $matches)) {
-                $ret['file'] = $matches[1];
-                $ret['line'] = $matches[2] + 0;
-            }
-            if (isset($funcbacktrace['function']) && isset($backtrace[1])) {
-                if ($funcbacktrace['function'] != 'eval') {
-                    if ($funcbacktrace['function'] == '__lambda_func') {
-                        $ret['function'] = 'create_function() code';
-                    } else {
-                        $ret['function'] = $funcbacktrace['function'];
-                    }
-                }
-            }
-            if (isset($funcbacktrace['class']) && isset($backtrace[1])) {
-                $ret['class'] = $funcbacktrace['class'];
-            }
-            return $ret;
-        }
-        return false;
-    }
-    
-    /**
-     * Standard error message generation callback
-     * 
-     * This method may also be called by a custom error message generator
-     * to fill in template values from the params array, simply
-     * set the third parameter to the error message template string to use
-     * 
-     * The special variable %__msg% is reserved: use it only to specify
-     * where a message passed in by the user should be placed in the template,
-     * like so:
-     * 
-     * Error message: %msg% - internal error
-     * 
-     * If the message passed like so:
-     * 
-     * <code>
-     * $stack->push(ERROR_CODE, 'error', array(), 'server error 500');
-     * </code>
-     * 
-     * The returned error message will be "Error message: server error 500 -
-     * internal error"
-     * @param PEAR_ErrorStack
-     * @param array
-     * @param string|false Pre-generated error message template
-     * @static
-     * @return string
-     */
-    function getErrorMessage(&$stack, $err, $template = false)
-    {
-        if ($template) {
-            $mainmsg = $template;
-        } else {
-            $mainmsg = $stack->getErrorMessageTemplate($err['code']);
-        }
-        $mainmsg = str_replace('%__msg%', $err['message'], $mainmsg);
-        if (count($err['params'])) {
-            foreach ($err['params'] as $name => $val) {
-                if (is_array($val)) {
-                    // @ is needed in case $val is a multi-dimensional array
-                    $val = @implode(', ', $val);
-                }
-                if (is_object($val)) {
-                    if (method_exists($val, '__toString')) {
-                        $val = $val->__toString();
-                    } else {
-                        PEAR_ErrorStack::staticPush('PEAR_ErrorStack', PEAR_ERRORSTACK_ERR_OBJTOSTRING,
-                            'warning', array('obj' => get_class($val)),
-                            'object %obj% passed into getErrorMessage, but has no __toString() method');
-                        $val = 'Object';
-                    }
-                }
-                $mainmsg = str_replace('%' . $name . '%', $val, $mainmsg);
-            }
-        }
-        return $mainmsg;
-    }
-    
-    /**
-     * Standard Error Message Template generator from code
-     * @return string
-     */
-    function getErrorMessageTemplate($code)
-    {
-        if (!isset($this->_errorMsgs[$code])) {
-            return '%__msg%';
-        }
-        return $this->_errorMsgs[$code];
-    }
-    
-    /**
-     * Set the Error Message Template array
-     * 
-     * The array format must be:
-     * <pre>
-     * array(error code => 'message template',...)
-     * </pre>
-     * 
-     * Error message parameters passed into {@link push()} will be used as input
-     * for the error message.  If the template is 'message %foo% was %bar%', and the
-     * parameters are array('foo' => 'one', 'bar' => 'six'), the error message returned will
-     * be 'message one was six'
-     * @return string
-     */
-    function setErrorMessageTemplate($template)
-    {
-        $this->_errorMsgs = $template;
-    }
-    
-    
-    /**
-     * emulate PEAR::raiseError()
-     * 
-     * @return PEAR_Error
-     */
-    function raiseError()
-    {
-        require_once 'PEAR.php';
-        $args = func_get_args();
-        return call_user_func_array(array('PEAR', 'raiseError'), $args);
-    }
-}
-$stack = &PEAR_ErrorStack::singleton('PEAR_ErrorStack');
-$stack->pushCallback(array('PEAR_ErrorStack', '_handleError'));
-?>
\ No newline at end of file
diff --git a/3rdparty/PEAR/Exception.php b/3rdparty/PEAR/Exception.php
deleted file mode 100644
index c735c16b398..00000000000
--- a/3rdparty/PEAR/Exception.php
+++ /dev/null
@@ -1,359 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 foldmethod=marker: */
-// +----------------------------------------------------------------------+
-// | PEAR_Exception                                                       |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 2004 The PEAR Group                                    |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Tomas V.V.Cox <cox@idecnet.com>                             |
-// |          Hans Lellelid <hans@velum.net>                              |
-// |          Bertrand Mansion <bmansion@mamasam.com>                     |
-// |          Greg Beaver <cellog@php.net>                                |
-// +----------------------------------------------------------------------+
-//
-// $Id: Exception.php,v 1.4.2.2 2004/12/31 19:01:52 cellog Exp $
-
-
-/**
- * Base PEAR_Exception Class
- *
- * WARNING: This code should be considered stable, but the API is
- * subject to immediate and drastic change, so API stability is
- * at best alpha
- *
- * 1) Features:
- *
- * - Nestable exceptions (throw new PEAR_Exception($msg, $prev_exception))
- * - Definable triggers, shot when exceptions occur
- * - Pretty and informative error messages
- * - Added more context info available (like class, method or cause)
- * - cause can be a PEAR_Exception or an array of mixed
- *   PEAR_Exceptions/PEAR_ErrorStack warnings
- * - callbacks for specific exception classes and their children
- *
- * 2) Ideas:
- *
- * - Maybe a way to define a 'template' for the output
- *
- * 3) Inherited properties from PHP Exception Class:
- *
- * protected $message
- * protected $code
- * protected $line
- * protected $file
- * private   $trace
- *
- * 4) Inherited methods from PHP Exception Class:
- *
- * __clone
- * __construct
- * getMessage
- * getCode
- * getFile
- * getLine
- * getTraceSafe
- * getTraceSafeAsString
- * __toString
- *
- * 5) Usage example
- *
- * <code>
- *  require_once 'PEAR/Exception.php';
- *
- *  class Test {
- *     function foo() {
- *         throw new PEAR_Exception('Error Message', ERROR_CODE);
- *     }
- *  }
- *
- *  function myLogger($pear_exception) {
- *     echo $pear_exception->getMessage();
- *  }
- *  // each time a exception is thrown the 'myLogger' will be called
- *  // (its use is completely optional)
- *  PEAR_Exception::addObserver('myLogger');
- *  $test = new Test;
- *  try {
- *     $test->foo();
- *  } catch (PEAR_Exception $e) {
- *     print $e;
- *  }
- * </code>
- *
- * @since PHP 5
- * @package PEAR
- * @version $Revision: 1.4.2.2 $
- * @author Tomas V.V.Cox <cox@idecnet.com>
- * @author Hans Lellelid <hans@velum.net>
- * @author Bertrand Mansion <bmansion@mamasam.com>
- *
- */
-class PEAR_Exception extends Exception
-{
-    const OBSERVER_PRINT = -2;
-    const OBSERVER_TRIGGER = -4;
-    const OBSERVER_DIE = -8;
-    protected $cause;
-    private static $_observers = array();
-    private static $_uniqueid = 0;
-    private $_trace;
-
-    /**
-     * Supported signatures:
-     * PEAR_Exception(string $message);
-     * PEAR_Exception(string $message, int $code);
-     * PEAR_Exception(string $message, Exception $cause);
-     * PEAR_Exception(string $message, Exception $cause, int $code);
-     * PEAR_Exception(string $message, array $causes);
-     * PEAR_Exception(string $message, array $causes, int $code);
-     */
-    public function __construct($message, $p2 = null, $p3 = null)
-    {
-        if (is_int($p2)) {
-            $code = $p2;
-            $this->cause = null;
-        } elseif ($p2 instanceof Exception || is_array($p2)) {
-            $code = $p3;
-            if (is_array($p2) && isset($p2['message'])) {
-                // fix potential problem of passing in a single warning
-                $p2 = array($p2);
-            }
-            $this->cause = $p2;
-        } else {
-        $code = null;
-            $this->cause = null;
-        }
-        parent::__construct($message, $code);
-        $this->signal();
-    }
-
-    /**
-     * @param mixed $callback  - A valid php callback, see php func is_callable()
-     *                         - A PEAR_Exception::OBSERVER_* constant
-     *                         - An array(const PEAR_Exception::OBSERVER_*,
-     *                           mixed $options)
-     * @param string $label    The name of the observer. Use this if you want
-     *                         to remove it later with removeObserver()
-     */
-    public static function addObserver($callback, $label = 'default')
-    {
-        self::$_observers[$label] = $callback;
-    }
-
-    public static function removeObserver($label = 'default')
-    {
-        unset(self::$_observers[$label]);
-    }
-
-    /**
-     * @return int unique identifier for an observer
-     */
-    public static function getUniqueId()
-    {
-        return self::$_uniqueid++;
-    }
-
-    private function signal()
-    {
-        foreach (self::$_observers as $func) {
-            if (is_callable($func)) {
-                call_user_func($func, $this);
-                continue;
-            }
-            settype($func, 'array');
-            switch ($func[0]) {
-                case self::OBSERVER_PRINT :
-                    $f = (isset($func[1])) ? $func[1] : '%s';
-                    printf($f, $this->getMessage());
-                    break;
-                case self::OBSERVER_TRIGGER :
-                    $f = (isset($func[1])) ? $func[1] : E_USER_NOTICE;
-                    trigger_error($this->getMessage(), $f);
-                    break;
-                case self::OBSERVER_DIE :
-                    $f = (isset($func[1])) ? $func[1] : '%s';
-                    die(printf($f, $this->getMessage()));
-                    break;
-                default:
-                    trigger_error('invalid observer type', E_USER_WARNING);
-            }
-        }
-    }
-
-    /**
-     * Return specific error information that can be used for more detailed
-     * error messages or translation.
-     *
-     * This method may be overridden in child exception classes in order
-     * to add functionality not present in PEAR_Exception and is a placeholder
-     * to define API
-     *
-     * The returned array must be an associative array of parameter => value like so:
-     * <pre>
-     * array('name' => $name, 'context' => array(...))
-     * </pre>
-     * @return array
-     */
-    public function getErrorData()
-    {
-        return array();
-    }
-
-    /**
-     * Returns the exception that caused this exception to be thrown
-     * @access public
-     * @return Exception|array The context of the exception
-     */
-    public function getCause()
-    {
-        return $this->cause;
-    }
-
-    /**
-     * Function must be public to call on caused exceptions
-     * @param array
-     */
-    public function getCauseMessage(&$causes)
-    {
-        $trace = $this->getTraceSafe();
-        $cause = array('class'   => get_class($this),
-                       'message' => $this->message,
-                       'file' => 'unknown',
-                       'line' => 'unknown');
-        if (isset($trace[0])) {
-            if (isset($trace[0]['file'])) {
-                $cause['file'] = $trace[0]['file'];
-                $cause['line'] = $trace[0]['line'];
-            }
-        }
-        if ($this->cause instanceof PEAR_Exception) {
-            $this->cause->getCauseMessage($causes);
-        }
-        if (is_array($this->cause)) {
-            foreach ($this->cause as $cause) {
-                if ($cause instanceof PEAR_Exception) {
-                    $cause->getCauseMessage($causes);
-                } elseif (is_array($cause) && isset($cause['message'])) {
-                    // PEAR_ErrorStack warning
-                    $causes[] = array(
-                        'class' => $cause['package'],
-                        'message' => $cause['message'],
-                        'file' => isset($cause['context']['file']) ?
-                                            $cause['context']['file'] :
-                                            'unknown',
-                        'line' => isset($cause['context']['line']) ?
-                                            $cause['context']['line'] :
-                                            'unknown',
-                    );
-                }
-            }
-        }
-    }
-
-    public function getTraceSafe()
-    {   
-        if (!isset($this->_trace)) {
-            $this->_trace = $this->getTrace();
-            if (empty($this->_trace)) {
-                $backtrace = debug_backtrace();
-                $this->_trace = array($backtrace[count($backtrace)-1]);
-            }
-        }
-        return $this->_trace;
-    }
-
-    public function getErrorClass()
-    {
-        $trace = $this->getTraceSafe();
-        return $trace[0]['class'];
-    }
-
-    public function getErrorMethod()
-    {
-        $trace = $this->getTraceSafe();
-        return $trace[0]['function'];
-    }
-
-    public function __toString()
-    {
-        if (isset($_SERVER['REQUEST_URI'])) {
-            return $this->toHtml();
-        }
-        return $this->toText();
-        }
-
-    public function toHtml()
-    {
-        $trace = $this->getTraceSafe();
-        $causes = array();
-        $this->getCauseMessage($causes);
-        $html =  '<table border="1" cellspacing="0">' . "\n";
-        foreach ($causes as $i => $cause) {
-            $html .= '<tr><td colspan="3" bgcolor="#ff9999">'
-               . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
-               . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
-               . 'on line <b>' . $cause['line'] . '</b>'
-               . "</td></tr>\n";
-        }
-        $html .= '<tr><td colspan="3" bgcolor="#aaaaaa" align="center"><b>Exception trace</b></td></tr>' . "\n"
-               . '<tr><td align="center" bgcolor="#cccccc" width="20"><b>#</b></td>'
-               . '<td align="center" bgcolor="#cccccc"><b>Function</b></td>'
-               . '<td align="center" bgcolor="#cccccc"><b>Location</b></td></tr>' . "\n";
-
-        foreach ($trace as $k => $v) {
-            $html .= '<tr><td align="center">' . $k . '</td>'
-                   . '<td>';
-            if (!empty($v['class'])) {
-                $html .= $v['class'] . $v['type'];
-            }
-            $html .= $v['function'];
-            $args = array();
-            if (!empty($v['args'])) {
-                foreach ($v['args'] as $arg) {
-                    if (is_null($arg)) $args[] = 'null';
-                    elseif (is_array($arg)) $args[] = 'Array';
-                    elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
-                    elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
-                    elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
-                    else {
-                        $arg = (string)$arg;
-                        $str = htmlspecialchars(substr($arg, 0, 16));
-                        if (strlen($arg) > 16) $str .= '&hellip;';
-                        $args[] = "'" . $str . "'";
-                    }
-                }
-            }
-            $html .= '(' . implode(', ',$args) . ')'
-                   . '</td>'
-                   . '<td>' . $v['file'] . ':' . $v['line'] . '</td></tr>' . "\n";
-        }
-        $html .= '<tr><td align="center">' . ($k+1) . '</td>'
-               . '<td>{main}</td>'
-               . '<td>&nbsp;</td></tr>' . "\n"
-               . '</table>';
-        return $html;
-    }
-
-    public function toText()
-    {
-        $causes = array();
-        $this->getCauseMessage($causes);
-        $causeMsg = '';
-        foreach ($causes as $i => $cause) {
-            $causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
-                   . $cause['message'] . ' in ' . $cause['file']
-                   . ' on line ' . $cause['line'] . "\n";
-        }
-        return $causeMsg . $this->getTraceAsString();
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/3rdparty/PEAR/Frontend/CLI.php b/3rdparty/PEAR/Frontend/CLI.php
deleted file mode 100644
index 832ddf09b3f..00000000000
--- a/3rdparty/PEAR/Frontend/CLI.php
+++ /dev/null
@@ -1,509 +0,0 @@
-<?php
-/*
-  +----------------------------------------------------------------------+
-  | PHP Version 5                                                        |
-  +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2004 The PHP Group                                |
-  +----------------------------------------------------------------------+
-  | This source file is subject to version 3.0 of the PHP license,       |
-  | that is bundled with this package in the file LICENSE, and is        |
-  | available through the world-wide-web at the following url:           |
-  | http://www.php.net/license/3_0.txt.                                  |
-  | If you did not receive a copy of the PHP license and are unable to   |
-  | obtain it through the world-wide-web, please send a note to          |
-  | license@php.net so we can mail you a copy immediately.               |
-  +----------------------------------------------------------------------+
-  | Author: Stig Sæther Bakken <ssb@php.net>                             |
-  +----------------------------------------------------------------------+
-
-  $Id: CLI.php,v 1.41 2004/02/17 05:49:16 ssb Exp $
-*/
-
-require_once "PEAR.php";
-
-class PEAR_Frontend_CLI extends PEAR
-{
-    // {{{ properties
-
-    /**
-     * What type of user interface this frontend is for.
-     * @var string
-     * @access public
-     */
-    var $type = 'CLI';
-    var $lp = ''; // line prefix
-
-    var $params = array();
-    var $term = array(
-        'bold' => '',
-        'normal' => '',
-        );
-
-    // }}}
-
-    // {{{ constructor
-
-    function PEAR_Frontend_CLI()
-    {
-        parent::PEAR();
-        $term = getenv('TERM'); //(cox) $_ENV is empty for me in 4.1.1
-        if (function_exists('posix_isatty') && !posix_isatty(1)) {
-            // output is being redirected to a file or through a pipe
-        } elseif ($term) {
-            // XXX can use ncurses extension here, if available
-            if (preg_match('/^(xterm|vt220|linux)/', $term)) {
-                $this->term['bold'] = sprintf("%c%c%c%c", 27, 91, 49, 109);
-                $this->term['normal']=sprintf("%c%c%c", 27, 91, 109);
-            } elseif (preg_match('/^vt100/', $term)) {
-                $this->term['bold'] = sprintf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0);
-                $this->term['normal']=sprintf("%c%c%c%c%c", 27, 91, 109, 0, 0);
-            }
-        } elseif (OS_WINDOWS) {
-            // XXX add ANSI codes here
-        }
-    }
-
-    // }}}
-
-    // {{{ displayLine(text)
-
-    function displayLine($text)
-    {
-        trigger_error("PEAR_Frontend_CLI::displayLine deprecated", E_USER_ERROR);
-    }
-
-    function _displayLine($text)
-    {
-        print "$this->lp$text\n";
-    }
-
-    // }}}
-    // {{{ display(text)
-
-    function display($text)
-    {
-        trigger_error("PEAR_Frontend_CLI::display deprecated", E_USER_ERROR);
-    }
-
-    function _display($text)
-    {
-        print $text;
-    }
-
-    // }}}
-    // {{{ displayError(eobj)
-
-    /**
-     * @param object PEAR_Error object
-     */
-    function displayError($eobj)
-    {
-        return $this->_displayLine($eobj->getMessage());
-    }
-
-    // }}}
-    // {{{ displayFatalError(eobj)
-
-    /**
-     * @param object PEAR_Error object
-     */
-    function displayFatalError($eobj)
-    {
-        $this->displayError($eobj);
-        exit(1);
-    }
-
-    // }}}
-    // {{{ displayHeading(title)
-
-    function displayHeading($title)
-    {
-        trigger_error("PEAR_Frontend_CLI::displayHeading deprecated", E_USER_ERROR);
-    }
-
-    function _displayHeading($title)
-    {
-        print $this->lp.$this->bold($title)."\n";
-        print $this->lp.str_repeat("=", strlen($title))."\n";
-    }
-
-    // }}}
-    // {{{ userDialog(prompt, [type], [default])
-
-    function userDialog($command, $prompts, $types = array(), $defaults = array())
-    {
-        $result = array();
-        if (is_array($prompts)) {
-            $fp = fopen("php://stdin", "r");
-            foreach ($prompts as $key => $prompt) {
-                $type = $types[$key];
-                $default = @$defaults[$key];
-                if ($type == 'password') {
-                    system('stty -echo');
-                }
-                print "$this->lp$prompt ";
-                if ($default) {
-                    print "[$default] ";
-                }
-                print ": ";
-                $line = fgets($fp, 2048);
-                if ($type == 'password') {
-                    system('stty echo');
-                    print "\n";
-                }
-                if ($default && trim($line) == "") {
-                    $result[$key] = $default;
-                } else {
-                    $result[$key] = $line;
-                }
-            }
-            fclose($fp);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ userConfirm(prompt, [default])
-
-    function userConfirm($prompt, $default = 'yes')
-    {
-        trigger_error("PEAR_Frontend_CLI::userConfirm not yet converted", E_USER_ERROR);
-        static $positives = array('y', 'yes', 'on', '1');
-        static $negatives = array('n', 'no', 'off', '0');
-        print "$this->lp$prompt [$default] : ";
-        $fp = fopen("php://stdin", "r");
-        $line = fgets($fp, 2048);
-        fclose($fp);
-        $answer = strtolower(trim($line));
-        if (empty($answer)) {
-            $answer = $default;
-        }
-        if (in_array($answer, $positives)) {
-            return true;
-        }
-        if (in_array($answer, $negatives)) {
-            return false;
-        }
-        if (in_array($default, $positives)) {
-            return true;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ startTable([params])
-
-    function startTable($params = array())
-    {
-        trigger_error("PEAR_Frontend_CLI::startTable deprecated", E_USER_ERROR);
-    }
-
-    function _startTable($params = array())
-    {
-        $params['table_data'] = array();
-        $params['widest'] = array();  // indexed by column
-        $params['highest'] = array(); // indexed by row
-        $params['ncols'] = 0;
-        $this->params = $params;
-    }
-
-    // }}}
-    // {{{ tableRow(columns, [rowparams], [colparams])
-
-    function tableRow($columns, $rowparams = array(), $colparams = array())
-    {
-        trigger_error("PEAR_Frontend_CLI::tableRow deprecated", E_USER_ERROR);
-    }
-
-    function _tableRow($columns, $rowparams = array(), $colparams = array())
-    {
-        $highest = 1;
-        for ($i = 0; $i < sizeof($columns); $i++) {
-            $col = &$columns[$i];
-            if (isset($colparams[$i]) && !empty($colparams[$i]['wrap'])) {
-                $col = wordwrap($col, $colparams[$i]['wrap'], "\n", 0);
-            }
-            if (strpos($col, "\n") !== false) {
-                $multiline = explode("\n", $col);
-                $w = 0;
-                foreach ($multiline as $n => $line) {
-                    if (strlen($line) > $w) {
-                        $w = strlen($line);
-                    }
-                }
-                $lines = sizeof($multiline);
-            } else {
-                $w = strlen($col);
-            }
-            if ($w > @$this->params['widest'][$i]) {
-                $this->params['widest'][$i] = $w;
-            }
-            $tmp = count_chars($columns[$i], 1);
-            // handle unix, mac and windows formats
-            $lines = (isset($tmp[10]) ? $tmp[10] : @$tmp[13]) + 1;
-            if ($lines > $highest) {
-                $highest = $lines;
-            }
-        }
-        if (sizeof($columns) > $this->params['ncols']) {
-            $this->params['ncols'] = sizeof($columns);
-        }
-        $new_row = array(
-            'data' => $columns,
-            'height' => $highest,
-            'rowparams' => $rowparams,
-            'colparams' => $colparams,
-            );
-        $this->params['table_data'][] = $new_row;
-    }
-
-    // }}}
-    // {{{ endTable()
-
-    function endTable()
-    {
-        trigger_error("PEAR_Frontend_CLI::endTable deprecated", E_USER_ERROR);
-    }
-
-    function _endTable()
-    {
-        extract($this->params);
-        if (!empty($caption)) {
-            $this->_displayHeading($caption);
-        }
-        if (count($table_data) == 0) {
-            return;
-        }
-        if (!isset($width)) {
-            $width = $widest;
-        } else {
-            for ($i = 0; $i < $ncols; $i++) {
-                if (!isset($width[$i])) {
-                    $width[$i] = $widest[$i];
-                }
-            }
-        }
-        $border = false;
-        if (empty($border)) {
-            $cellstart = '';
-            $cellend = ' ';
-            $rowend = '';
-            $padrowend = false;
-            $borderline = '';
-        } else {
-            $cellstart = '| ';
-            $cellend = ' ';
-            $rowend = '|';
-            $padrowend = true;
-            $borderline = '+';
-            foreach ($width as $w) {
-                $borderline .= str_repeat('-', $w + strlen($cellstart) + strlen($cellend) - 1);
-                $borderline .= '+';
-            }
-        }
-        if ($borderline) {
-            $this->_displayLine($borderline);
-        }
-        for ($i = 0; $i < sizeof($table_data); $i++) {
-            extract($table_data[$i]);
-            if (!is_array($rowparams)) {
-                $rowparams = array();
-            }
-            if (!is_array($colparams)) {
-                $colparams = array();
-            }
-            $rowlines = array();
-            if ($height > 1) {
-                for ($c = 0; $c < sizeof($data); $c++) {
-                    $rowlines[$c] = preg_split('/(\r?\n|\r)/', $data[$c]);
-                    if (sizeof($rowlines[$c]) < $height) {
-                        $rowlines[$c] = array_pad($rowlines[$c], $height, '');
-                    }
-                }
-            } else {
-                for ($c = 0; $c < sizeof($data); $c++) {
-                    $rowlines[$c] = array($data[$c]);
-                }
-            }
-            for ($r = 0; $r < $height; $r++) {
-                $rowtext = '';
-                for ($c = 0; $c < sizeof($data); $c++) {
-                    if (isset($colparams[$c])) {
-                        $attribs = array_merge($rowparams, $colparams);
-                    } else {
-                        $attribs = $rowparams;
-                    }
-                    $w = isset($width[$c]) ? $width[$c] : 0;
-                    //$cell = $data[$c];
-                    $cell = $rowlines[$c][$r];
-                    $l = strlen($cell);
-                    if ($l > $w) {
-                        $cell = substr($cell, 0, $w);
-                    }
-                    if (isset($attribs['bold'])) {
-                        $cell = $this->bold($cell);
-                    }
-                    if ($l < $w) {
-                        // not using str_pad here because we may
-                        // add bold escape characters to $cell
-                        $cell .= str_repeat(' ', $w - $l);
-                    }
-
-                    $rowtext .= $cellstart . $cell . $cellend;
-                }
-                if (!$border) {
-                    $rowtext = rtrim($rowtext);
-                }
-                $rowtext .= $rowend;
-                $this->_displayLine($rowtext);
-            }
-        }
-        if ($borderline) {
-            $this->_displayLine($borderline);
-        }
-    }
-
-    // }}}
-    // {{{ outputData()
-
-    function outputData($data, $command = '_default')
-    {
-        switch ($command) {
-            case 'install':
-            case 'upgrade':
-            case 'upgrade-all':
-                if (isset($data['release_warnings'])) {
-                    $this->_displayLine('');
-                    $this->_startTable(array(
-                        'border' => false,
-                        'caption' => 'Release Warnings'
-                        ));
-                    $this->_tableRow(array($data['release_warnings']), null, array(1 => array('wrap' => 55)));
-                    $this->_endTable();
-                    $this->_displayLine('');
-                }
-                $this->_displayLine($data['data']);
-                break;
-            case 'search':
-                $this->_startTable($data);
-                if (isset($data['headline']) && is_array($data['headline'])) {
-                    $this->_tableRow($data['headline'], array('bold' => true), array(1 => array('wrap' => 55)));
-                }
-
-                foreach($data['data'] as $category) {
-                    foreach($category as $pkg) {
-                        $this->_tableRow($pkg, null, array(1 => array('wrap' => 55)));
-                    }
-                };
-                $this->_endTable();
-                break;
-            case 'list-all':
-                $this->_startTable($data);
-                if (isset($data['headline']) && is_array($data['headline'])) {
-                    $this->_tableRow($data['headline'], array('bold' => true), array(1 => array('wrap' => 55)));
-                }
-
-                foreach($data['data'] as $category) {
-                    foreach($category as $pkg) {
-                        unset($pkg[3]);
-                        unset($pkg[4]);
-                        $this->_tableRow($pkg, null, array(1 => array('wrap' => 55)));
-                    }
-                };
-                $this->_endTable();
-                break;
-            case 'config-show':
-                $data['border'] = false;
-                $opts = array(0 => array('wrap' => 30),
-                              1 => array('wrap' => 20),
-                              2 => array('wrap' => 35));
-                $this->_startTable($data);
-                if (isset($data['headline']) && is_array($data['headline'])) {
-                    $this->_tableRow($data['headline'],
-                                     array('bold' => true),
-                                     $opts);
-                }
-                foreach($data['data'] as $group) {
-                    foreach($group as $value) {
-                        if ($value[2] == '') {
-                            $value[2] = "<not set>";
-                        }
-                        $this->_tableRow($value, null, $opts);
-                    }
-                }
-                $this->_endTable();
-                break;
-            case 'remote-info':
-                $data = array(
-                    'caption' => 'Package details:',
-                    'border' => false,
-                    'data' => array(
-                        array("Latest",    $data['stable']),
-                        array("Installed", $data['installed']),
-                        array("Package",   $data['name']),
-                        array("License",   $data['license']),
-                        array("Category",  $data['category']),
-                        array("Summary",   $data['summary']),
-                        array("Description", $data['description']),
-                        ),
-                    );
-            default: {
-                if (is_array($data)) {
-                    $this->_startTable($data);
-                    $count = count($data['data'][0]);
-                    if ($count == 2) {
-                        $opts = array(0 => array('wrap' => 25),
-                                      1 => array('wrap' => 48)
-                        );
-                    } elseif ($count == 3) {
-                        $opts = array(0 => array('wrap' => 30),
-                                      1 => array('wrap' => 20),
-                                      2 => array('wrap' => 35)
-                        );
-                    } else {
-                        $opts = null;
-                    }
-                    if (isset($data['headline']) && is_array($data['headline'])) {
-                        $this->_tableRow($data['headline'],
-                                         array('bold' => true),
-                                         $opts);
-                    }
-                    foreach($data['data'] as $row) {
-                        $this->_tableRow($row, null, $opts);
-                    }
-                    $this->_endTable();
-                } else {
-                    $this->_displayLine($data);
-                }
-            }
-        }
-    }
-
-    // }}}
-    // {{{ log(text)
-
-
-    function log($text, $append_crlf = true)
-    {
-        if ($append_crlf) {
-            return $this->_displayLine($text);
-        }
-        return $this->_display($text);
-    }
-
-
-    // }}}
-    // {{{ bold($text)
-
-    function bold($text)
-    {
-        if (empty($this->term['bold'])) {
-            return strtoupper($text);
-        }
-        return $this->term['bold'] . $text . $this->term['normal'];
-    }
-
-    // }}}
-}
-
-?>
diff --git a/3rdparty/PEAR/Installer.php b/3rdparty/PEAR/Installer.php
deleted file mode 100644
index 31e2cff81ee..00000000000
--- a/3rdparty/PEAR/Installer.php
+++ /dev/null
@@ -1,1068 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Stig Bakken <ssb@php.net>                                   |
-// |          Tomas V.V.Cox <cox@idecnet.com>                             |
-// |          Martin Jansen <mj@php.net>                                  |
-// +----------------------------------------------------------------------+
-//
-// $Id: Installer.php,v 1.150.2.2 2005/02/17 17:47:55 cellog Exp $
-
-require_once 'PEAR/Downloader.php';
-
-/**
- * Administration class used to install PEAR packages and maintain the
- * installed package database.
- *
- * TODO:
- *   - Check dependencies break on package uninstall (when no force given)
- *   - add a guessInstallDest() method with the code from _installFile() and
- *     use that method in Registry::_rebuildFileMap() & Command_Registry::doList(),
- *     others..
- *
- * @since PHP 4.0.2
- * @author Stig Bakken <ssb@php.net>
- * @author Martin Jansen <mj@php.net>
- * @author Greg Beaver <cellog@php.net>
- */
-class PEAR_Installer extends PEAR_Downloader
-{
-    // {{{ properties
-
-    /** name of the package directory, for example Foo-1.0
-     * @var string
-     */
-    var $pkgdir;
-
-    /** directory where PHP code files go
-     * @var string
-     */
-    var $phpdir;
-
-    /** directory where PHP extension files go
-     * @var string
-     */
-    var $extdir;
-
-    /** directory where documentation goes
-     * @var string
-     */
-    var $docdir;
-
-    /** installation root directory (ala PHP's INSTALL_ROOT or
-     * automake's DESTDIR
-     * @var string
-     */
-    var $installroot = '';
-
-    /** debug level
-     * @var int
-     */
-    var $debug = 1;
-
-    /** temporary directory
-     * @var string
-     */
-    var $tmpdir;
-
-    /** PEAR_Registry object used by the installer
-     * @var object
-     */
-    var $registry;
-
-    /** List of file transactions queued for an install/upgrade/uninstall.
-     *
-     *  Format:
-     *    array(
-     *      0 => array("rename => array("from-file", "to-file")),
-     *      1 => array("delete" => array("file-to-delete")),
-     *      ...
-     *    )
-     *
-     * @var array
-     */
-    var $file_operations = array();
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * PEAR_Installer constructor.
-     *
-     * @param object $ui user interface object (instance of PEAR_Frontend_*)
-     *
-     * @access public
-     */
-    function PEAR_Installer(&$ui)
-    {
-        parent::PEAR_Common();
-        $this->setFrontendObject($ui);
-        $this->debug = $this->config->get('verbose');
-        //$this->registry = &new PEAR_Registry($this->config->get('php_dir'));
-    }
-
-    // }}}
-
-    // {{{ _deletePackageFiles()
-
-    /**
-     * Delete a package's installed files, does not remove empty directories.
-     *
-     * @param string $package package name
-     *
-     * @return bool TRUE on success, or a PEAR error on failure
-     *
-     * @access private
-     */
-    function _deletePackageFiles($package)
-    {
-        if (!strlen($package)) {
-            return $this->raiseError("No package to uninstall given");
-        }
-        $filelist = $this->registry->packageInfo($package, 'filelist');
-        if ($filelist == null) {
-            return $this->raiseError("$package not installed");
-        }
-        foreach ($filelist as $file => $props) {
-            if (empty($props['installed_as'])) {
-                continue;
-            }
-            $path = $this->_prependPath($props['installed_as'], $this->installroot);
-            $this->addFileOperation('delete', array($path));
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ _installFile()
-
-    /**
-     * @param string filename
-     * @param array attributes from <file> tag in package.xml
-     * @param string path to install the file in
-     * @param array options from command-line
-     * @access private
-     */
-    function _installFile($file, $atts, $tmp_path, $options)
-    {
-        // {{{ return if this file is meant for another platform
-        static $os;
-        if (isset($atts['platform'])) {
-            if (empty($os)) {
-                include_once "OS/Guess.php";
-                $os = new OS_Guess();
-            }
-            if (strlen($atts['platform']) && $atts['platform']{0} == '!') {
-                $negate = true;
-                $platform = substr($atts['platform'], 1);
-            } else {
-                $negate = false;
-                $platform = $atts['platform'];
-            }
-            if ((bool) $os->matchSignature($platform) === $negate) {
-                $this->log(3, "skipped $file (meant for $atts[platform], we are ".$os->getSignature().")");
-                return PEAR_INSTALLER_SKIPPED;
-            }
-        }
-        // }}}
-
-        // {{{ assemble the destination paths
-        switch ($atts['role']) {
-            case 'doc':
-            case 'data':
-            case 'test':
-                $dest_dir = $this->config->get($atts['role'] . '_dir') .
-                            DIRECTORY_SEPARATOR . $this->pkginfo['package'];
-                unset($atts['baseinstalldir']);
-                break;
-            case 'ext':
-            case 'php':
-                $dest_dir = $this->config->get($atts['role'] . '_dir');
-                break;
-            case 'script':
-                $dest_dir = $this->config->get('bin_dir');
-                break;
-            case 'src':
-            case 'extsrc':
-                $this->source_files++;
-                return;
-            default:
-                return $this->raiseError("Invalid role `$atts[role]' for file $file");
-        }
-        $save_destdir = $dest_dir;
-        if (!empty($atts['baseinstalldir'])) {
-            $dest_dir .= DIRECTORY_SEPARATOR . $atts['baseinstalldir'];
-        }
-        if (dirname($file) != '.' && empty($atts['install-as'])) {
-            $dest_dir .= DIRECTORY_SEPARATOR . dirname($file);
-        }
-        if (empty($atts['install-as'])) {
-            $dest_file = $dest_dir . DIRECTORY_SEPARATOR . basename($file);
-        } else {
-            $dest_file = $dest_dir . DIRECTORY_SEPARATOR . $atts['install-as'];
-        }
-        $orig_file = $tmp_path . DIRECTORY_SEPARATOR . $file;
-
-        // Clean up the DIRECTORY_SEPARATOR mess
-        $ds2 = DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR;
-        list($dest_file, $orig_file) = preg_replace(array('!\\\\+!', '!/!', "!$ds2+!"),
-                                                    DIRECTORY_SEPARATOR,
-                                                    array($dest_file, $orig_file));
-        $installed_as = $dest_file;
-        $final_dest_file = $this->_prependPath($dest_file, $this->installroot);
-        $dest_dir = dirname($final_dest_file);
-        $dest_file = $dest_dir . DIRECTORY_SEPARATOR . '.tmp' . basename($final_dest_file);
-        // }}}
-
-        if (!@is_dir($dest_dir)) {
-            if (!$this->mkDirHier($dest_dir)) {
-                return $this->raiseError("failed to mkdir $dest_dir",
-                                         PEAR_INSTALLER_FAILED);
-            }
-            $this->log(3, "+ mkdir $dest_dir");
-        }
-        if (empty($atts['replacements'])) {
-            if (!file_exists($orig_file)) {
-                return $this->raiseError("file does not exist",
-                                         PEAR_INSTALLER_FAILED);
-            }
-            if (!@copy($orig_file, $dest_file)) {
-                return $this->raiseError("failed to write $dest_file",
-                                         PEAR_INSTALLER_FAILED);
-            }
-            $this->log(3, "+ cp $orig_file $dest_file");
-            if (isset($atts['md5sum'])) {
-                $md5sum = md5_file($dest_file);
-            }
-        } else {
-            // {{{ file with replacements
-            if (!file_exists($orig_file)) {
-                return $this->raiseError("file does not exist",
-                                         PEAR_INSTALLER_FAILED);
-            }
-            $fp = fopen($orig_file, "r");
-            $contents = fread($fp, filesize($orig_file));
-            fclose($fp);
-            if (isset($atts['md5sum'])) {
-                $md5sum = md5($contents);
-            }
-            $subst_from = $subst_to = array();
-            foreach ($atts['replacements'] as $a) {
-                $to = '';
-                if ($a['type'] == 'php-const') {
-                    if (preg_match('/^[a-z0-9_]+$/i', $a['to'])) {
-                        eval("\$to = $a[to];");
-                    } else {
-                        $this->log(0, "invalid php-const replacement: $a[to]");
-                        continue;
-                    }
-                } elseif ($a['type'] == 'pear-config') {
-                    $to = $this->config->get($a['to']);
-                    if (is_null($to)) {
-                        $this->log(0, "invalid pear-config replacement: $a[to]");
-                        continue;
-                    }
-                } elseif ($a['type'] == 'package-info') {
-                    if (isset($this->pkginfo[$a['to']]) && is_string($this->pkginfo[$a['to']])) {
-                        $to = $this->pkginfo[$a['to']];
-                    } else {
-                        $this->log(0, "invalid package-info replacement: $a[to]");
-                        continue;
-                    }
-                }
-                if (!is_null($to)) {
-                    $subst_from[] = $a['from'];
-                    $subst_to[] = $to;
-                }
-            }
-            $this->log(3, "doing ".sizeof($subst_from)." substitution(s) for $final_dest_file");
-            if (sizeof($subst_from)) {
-                $contents = str_replace($subst_from, $subst_to, $contents);
-            }
-            $wp = @fopen($dest_file, "wb");
-            if (!is_resource($wp)) {
-                return $this->raiseError("failed to create $dest_file: $php_errormsg",
-                                         PEAR_INSTALLER_FAILED);
-            }
-            if (!fwrite($wp, $contents)) {
-                return $this->raiseError("failed writing to $dest_file: $php_errormsg",
-                                         PEAR_INSTALLER_FAILED);
-            }
-            fclose($wp);
-            // }}}
-        }
-        // {{{ check the md5
-        if (isset($md5sum)) {
-            if (strtolower($md5sum) == strtolower($atts['md5sum'])) {
-                $this->log(2, "md5sum ok: $final_dest_file");
-            } else {
-                if (empty($options['force'])) {
-                    // delete the file
-                    @unlink($dest_file);
-                    return $this->raiseError("bad md5sum for file $final_dest_file",
-                                             PEAR_INSTALLER_FAILED);
-                } else {
-                    $this->log(0, "warning : bad md5sum for file $final_dest_file");
-                }
-            }
-        }
-        // }}}
-        // {{{ set file permissions
-        if (!OS_WINDOWS) {
-            if ($atts['role'] == 'script') {
-                $mode = 0777 & ~(int)octdec($this->config->get('umask'));
-                $this->log(3, "+ chmod +x $dest_file");
-            } else {
-                $mode = 0666 & ~(int)octdec($this->config->get('umask'));
-            }
-            $this->addFileOperation("chmod", array($mode, $dest_file));
-            if (!@chmod($dest_file, $mode)) {
-                $this->log(0, "failed to change mode of $dest_file");
-            }
-        }
-        // }}}
-        $this->addFileOperation("rename", array($dest_file, $final_dest_file));
-        // Store the full path where the file was installed for easy unistall
-        $this->addFileOperation("installed_as", array($file, $installed_as,
-                                $save_destdir, dirname(substr($dest_file, strlen($save_destdir)))));
-
-        //$this->log(2, "installed: $dest_file");
-        return PEAR_INSTALLER_OK;
-    }
-
-    // }}}
-    // {{{ addFileOperation()
-
-    /**
-     * Add a file operation to the current file transaction.
-     *
-     * @see startFileTransaction()
-     * @var string $type This can be one of:
-     *    - rename:  rename a file ($data has 2 values)
-     *    - chmod:   change permissions on a file ($data has 2 values)
-     *    - delete:  delete a file ($data has 1 value)
-     *    - rmdir:   delete a directory if empty ($data has 1 value)
-     *    - installed_as: mark a file as installed ($data has 4 values).
-     * @var array $data For all file operations, this array must contain the
-     *    full path to the file or directory that is being operated on.  For
-     *    the rename command, the first parameter must be the file to rename,
-     *    the second its new name.
-     *
-     *    The installed_as operation contains 4 elements in this order:
-     *    1. Filename as listed in the filelist element from package.xml
-     *    2. Full path to the installed file
-     *    3. Full path from the php_dir configuration variable used in this
-     *       installation
-     *    4. Relative path from the php_dir that this file is installed in
-     */
-    function addFileOperation($type, $data)
-    {
-        if (!is_array($data)) {
-            return $this->raiseError('Internal Error: $data in addFileOperation'
-                . ' must be an array, was ' . gettype($data));
-        }
-        if ($type == 'chmod') {
-            $octmode = decoct($data[0]);
-            $this->log(3, "adding to transaction: $type $octmode $data[1]");
-        } else {
-            $this->log(3, "adding to transaction: $type " . implode(" ", $data));
-        }
-        $this->file_operations[] = array($type, $data);
-    }
-
-    // }}}
-    // {{{ startFileTransaction()
-
-    function startFileTransaction($rollback_in_case = false)
-    {
-        if (count($this->file_operations) && $rollback_in_case) {
-            $this->rollbackFileTransaction();
-        }
-        $this->file_operations = array();
-    }
-
-    // }}}
-    // {{{ commitFileTransaction()
-
-    function commitFileTransaction()
-    {
-        $n = count($this->file_operations);
-        $this->log(2, "about to commit $n file operations");
-        // {{{ first, check permissions and such manually
-        $errors = array();
-        foreach ($this->file_operations as $tr) {
-            list($type, $data) = $tr;
-            switch ($type) {
-                case 'rename':
-                    if (!file_exists($data[0])) {
-                        $errors[] = "cannot rename file $data[0], doesn't exist";
-                    }
-                    // check that dest dir. is writable
-                    if (!is_writable(dirname($data[1]))) {
-                        $errors[] = "permission denied ($type): $data[1]";
-                    }
-                    break;
-                case 'chmod':
-                    // check that file is writable
-                    if (!is_writable($data[1])) {
-                        $errors[] = "permission denied ($type): $data[1] " . decoct($data[0]);
-                    }
-                    break;
-                case 'delete':
-                    if (!file_exists($data[0])) {
-                        $this->log(2, "warning: file $data[0] doesn't exist, can't be deleted");
-                    }
-                    // check that directory is writable
-                    if (file_exists($data[0]) && !is_writable(dirname($data[0]))) {
-                        $errors[] = "permission denied ($type): $data[0]";
-                    }
-                    break;
-            }
-
-        }
-        // }}}
-        $m = sizeof($errors);
-        if ($m > 0) {
-            foreach ($errors as $error) {
-                $this->log(1, $error);
-            }
-            return false;
-        }
-        // {{{ really commit the transaction
-        foreach ($this->file_operations as $tr) {
-            list($type, $data) = $tr;
-            switch ($type) {
-                case 'rename':
-                    @unlink($data[1]);
-                    @rename($data[0], $data[1]);
-                    $this->log(3, "+ mv $data[0] $data[1]");
-                    break;
-                case 'chmod':
-                    @chmod($data[1], $data[0]);
-                    $octmode = decoct($data[0]);
-                    $this->log(3, "+ chmod $octmode $data[1]");
-                    break;
-                case 'delete':
-                    @unlink($data[0]);
-                    $this->log(3, "+ rm $data[0]");
-                    break;
-                case 'rmdir':
-                    @rmdir($data[0]);
-                    $this->log(3, "+ rmdir $data[0]");
-                    break;
-                case 'installed_as':
-                    $this->pkginfo['filelist'][$data[0]]['installed_as'] = $data[1];
-                    if (!isset($this->pkginfo['filelist']['dirtree'][dirname($data[1])])) {
-                        $this->pkginfo['filelist']['dirtree'][dirname($data[1])] = true;
-                        while(!empty($data[3]) && $data[3] != '/' && $data[3] != '\\'
-                              && $data[3] != '.') {
-                            $this->pkginfo['filelist']['dirtree']
-                                [$this->_prependPath($data[3], $data[2])] = true;
-                            $data[3] = dirname($data[3]);
-                        }
-                    }
-                    break;
-            }
-        }
-        // }}}
-        $this->log(2, "successfully committed $n file operations");
-        $this->file_operations = array();
-        return true;
-    }
-
-    // }}}
-    // {{{ rollbackFileTransaction()
-
-    function rollbackFileTransaction()
-    {
-        $n = count($this->file_operations);
-        $this->log(2, "rolling back $n file operations");
-        foreach ($this->file_operations as $tr) {
-            list($type, $data) = $tr;
-            switch ($type) {
-                case 'rename':
-                    @unlink($data[0]);
-                    $this->log(3, "+ rm $data[0]");
-                    break;
-                case 'mkdir':
-                    @rmdir($data[0]);
-                    $this->log(3, "+ rmdir $data[0]");
-                    break;
-                case 'chmod':
-                    break;
-                case 'delete':
-                    break;
-                case 'installed_as':
-                    if (isset($this->pkginfo['filelist'])) {
-                        unset($this->pkginfo['filelist'][$data[0]]['installed_as']);
-                    }
-                    if (isset($this->pkginfo['filelist']['dirtree'][dirname($data[1])])) {
-                        unset($this->pkginfo['filelist']['dirtree'][dirname($data[1])]);
-                        while(!empty($data[3]) && $data[3] != '/' && $data[3] != '\\'
-                              && $data[3] != '.') {
-                            unset($this->pkginfo['filelist']['dirtree']
-                                [$this->_prependPath($data[3], $data[2])]);
-                            $data[3] = dirname($data[3]);
-                        }
-                    }
-                    if (isset($this->pkginfo['filelist']['dirtree'])
-                          && !count($this->pkginfo['filelist']['dirtree'])) {
-                        unset($this->pkginfo['filelist']['dirtree']);
-                    }
-                    break;
-            }
-        }
-        $this->file_operations = array();
-    }
-
-    // }}}
-    // {{{ mkDirHier($dir)
-
-    function mkDirHier($dir)
-    {
-        $this->addFileOperation('mkdir', array($dir));
-        return parent::mkDirHier($dir);
-    }
-
-    // }}}
-    // {{{ download()
-
-    /**
-     * Download any files and their dependencies, if necessary
-     *
-     * @param array a mixed list of package names, local files, or package.xml
-     * @param PEAR_Config
-     * @param array options from the command line
-     * @param array this is the array that will be populated with packages to
-     *              install.  Format of each entry:
-     *
-     * <code>
-     * array('pkg' => 'package_name', 'file' => '/path/to/local/file',
-     *    'info' => array() // parsed package.xml
-     * );
-     * </code>
-     * @param array this will be populated with any error messages
-     * @param false private recursion variable
-     * @param false private recursion variable
-     * @param false private recursion variable
-     * @deprecated in favor of PEAR_Downloader
-     */
-    function download($packages, $options, &$config, &$installpackages,
-                      &$errors, $installed = false, $willinstall = false, $state = false)
-    {
-        // trickiness: initialize here
-        parent::PEAR_Downloader($this->ui, $options, $config);
-        $ret = parent::download($packages);
-        $errors = $this->getErrorMsgs();
-        $installpackages = $this->getDownloadedPackages();
-        trigger_error("PEAR Warning: PEAR_Installer::download() is deprecated " .
-                      "in favor of PEAR_Downloader class", E_USER_WARNING);
-        return $ret;
-    }
-
-    // }}}
-    // {{{ install()
-
-    /**
-     * Installs the files within the package file specified.
-     *
-     * @param string $pkgfile path to the package file
-     * @param array $options
-     * recognized options:
-     * - installroot   : optional prefix directory for installation
-     * - force         : force installation
-     * - register-only : update registry but don't install files
-     * - upgrade       : upgrade existing install
-     * - soft          : fail silently
-     * - nodeps        : ignore dependency conflicts/missing dependencies
-     * - alldeps       : install all dependencies
-     * - onlyreqdeps   : install only required dependencies
-     *
-     * @return array|PEAR_Error package info if successful
-     */
-
-    function install($pkgfile, $options = array())
-    {
-        $php_dir = $this->config->get('php_dir');
-        if (isset($options['installroot'])) {
-            if (substr($options['installroot'], -1) == DIRECTORY_SEPARATOR) {
-                $options['installroot'] = substr($options['installroot'], 0, -1);
-            }
-            $php_dir = $this->_prependPath($php_dir, $options['installroot']);
-            $this->installroot = $options['installroot'];
-        } else {
-            $this->installroot = '';
-        }
-        $this->registry = &new PEAR_Registry($php_dir);
-        //  ==> XXX should be removed later on
-        $flag_old_format = false;
-
-        if (substr($pkgfile, -4) == '.xml') {
-            $descfile = $pkgfile;
-        } else {
-            // {{{ Decompress pack in tmp dir -------------------------------------
-
-            // To allow relative package file names
-            $pkgfile = realpath($pkgfile);
-
-            if (PEAR::isError($tmpdir = System::mktemp('-d'))) {
-                return $tmpdir;
-            }
-            $this->log(3, '+ tmp dir created at ' . $tmpdir);
-
-            $tar = new Archive_Tar($pkgfile);
-            if (!@$tar->extract($tmpdir)) {
-                return $this->raiseError("unable to unpack $pkgfile");
-            }
-
-            // {{{ Look for existing package file
-            $descfile = $tmpdir . DIRECTORY_SEPARATOR . 'package.xml';
-
-            if (!is_file($descfile)) {
-                // ----- Look for old package archive format
-                // In this format the package.xml file was inside the
-                // Package-n.n directory
-                $dp = opendir($tmpdir);
-                do {
-                    $pkgdir = readdir($dp);
-                } while ($pkgdir{0} == '.');
-
-                $descfile = $tmpdir . DIRECTORY_SEPARATOR . $pkgdir . DIRECTORY_SEPARATOR . 'package.xml';
-                $flag_old_format = true;
-                $this->log(0, "warning : you are using an archive with an old format");
-            }
-            // }}}
-            // <== XXX This part should be removed later on
-            // }}}
-        }
-
-        if (!is_file($descfile)) {
-            return $this->raiseError("no package.xml file after extracting the archive");
-        }
-
-        // Parse xml file -----------------------------------------------
-        $pkginfo = $this->infoFromDescriptionFile($descfile);
-        if (PEAR::isError($pkginfo)) {
-            return $pkginfo;
-        }
-        $this->validatePackageInfo($pkginfo, $errors, $warnings);
-        // XXX We allow warnings, do we have to do it?
-        if (count($errors)) {
-            if (empty($options['force'])) {
-                return $this->raiseError("The following errors where found (use force option to install anyway):\n".
-                                         implode("\n", $errors));
-            } else {
-                $this->log(0, "warning : the following errors were found:\n".
-                           implode("\n", $errors));
-            }
-        }
-
-        $pkgname = $pkginfo['package'];
-
-        // {{{ Check dependencies -------------------------------------------
-        if (isset($pkginfo['release_deps']) && empty($options['nodeps'])) {
-            $dep_errors = '';
-            $error = $this->checkDeps($pkginfo, $dep_errors);
-            if ($error == true) {
-                if (empty($options['soft'])) {
-                    $this->log(0, substr($dep_errors, 1));
-                }
-                return $this->raiseError("$pkgname: Dependencies failed");
-            } else if (!empty($dep_errors)) {
-                // Print optional dependencies
-                if (empty($options['soft'])) {
-                    $this->log(0, $dep_errors);
-                }
-            }
-        }
-        // }}}
-
-        // {{{ checks to do when not in "force" mode
-        if (empty($options['force'])) {
-            $test = $this->registry->checkFileMap($pkginfo);
-            if (sizeof($test)) {
-                $tmp = $test;
-                foreach ($tmp as $file => $pkg) {
-                    if ($pkg == $pkgname) {
-                        unset($test[$file]);
-                    }
-                }
-                if (sizeof($test)) {
-                    $msg = "$pkgname: conflicting files found:\n";
-                    $longest = max(array_map("strlen", array_keys($test)));
-                    $fmt = "%${longest}s (%s)\n";
-                    foreach ($test as $file => $pkg) {
-                        $msg .= sprintf($fmt, $file, $pkg);
-                    }
-                    return $this->raiseError($msg);
-                }
-            }
-        }
-        // }}}
-
-        $this->startFileTransaction();
-
-        if (empty($options['upgrade'])) {
-            // checks to do only when installing new packages
-            if (empty($options['force']) && $this->registry->packageExists($pkgname)) {
-                return $this->raiseError("$pkgname already installed");
-            }
-        } else {
-            if ($this->registry->packageExists($pkgname)) {
-                $v1 = $this->registry->packageInfo($pkgname, 'version');
-                $v2 = $pkginfo['version'];
-                $cmp = version_compare("$v1", "$v2", 'gt');
-                if (empty($options['force']) && !version_compare("$v2", "$v1", 'gt')) {
-                    return $this->raiseError("upgrade to a newer version ($v2 is not newer than $v1)");
-                }
-                if (empty($options['register-only'])) {
-                    // when upgrading, remove old release's files first:
-                    if (PEAR::isError($err = $this->_deletePackageFiles($pkgname))) {
-                        return $this->raiseError($err);
-                    }
-                }
-            }
-        }
-
-        // {{{ Copy files to dest dir ---------------------------------------
-
-        // info from the package it self we want to access from _installFile
-        $this->pkginfo = &$pkginfo;
-        // used to determine whether we should build any C code
-        $this->source_files = 0;
-
-        if (empty($options['register-only'])) {
-            if (!is_dir($php_dir)) {
-                return $this->raiseError("no script destination directory\n",
-                                         null, PEAR_ERROR_DIE);
-            }
-
-            $tmp_path = dirname($descfile);
-            if (substr($pkgfile, -4) != '.xml') {
-                $tmp_path .= DIRECTORY_SEPARATOR . $pkgname . '-' . $pkginfo['version'];
-            }
-
-            //  ==> XXX This part should be removed later on
-            if ($flag_old_format) {
-                $tmp_path = dirname($descfile);
-            }
-            // <== XXX This part should be removed later on
-
-            // {{{ install files
-            foreach ($pkginfo['filelist'] as $file => $atts) {
-                $this->expectError(PEAR_INSTALLER_FAILED);
-                $res = $this->_installFile($file, $atts, $tmp_path, $options);
-                $this->popExpect();
-                if (PEAR::isError($res)) {
-                    if (empty($options['ignore-errors'])) {
-                        $this->rollbackFileTransaction();
-                        if ($res->getMessage() == "file does not exist") {
-                            $this->raiseError("file $file in package.xml does not exist");
-                        }
-                        return $this->raiseError($res);
-                    } else {
-                        $this->log(0, "Warning: " . $res->getMessage());
-                    }
-                }
-                if ($res != PEAR_INSTALLER_OK) {
-                    // Do not register files that were not installed
-                    unset($pkginfo['filelist'][$file]);
-                }
-            }
-            // }}}
-
-            // {{{ compile and install source files
-            if ($this->source_files > 0 && empty($options['nobuild'])) {
-                $this->log(1, "$this->source_files source files, building");
-                $bob = &new PEAR_Builder($this->ui);
-                $bob->debug = $this->debug;
-                $built = $bob->build($descfile, array(&$this, '_buildCallback'));
-                if (PEAR::isError($built)) {
-                    $this->rollbackFileTransaction();
-                    return $built;
-                }
-                $this->log(1, "\nBuild process completed successfully");
-                foreach ($built as $ext) {
-                    $bn = basename($ext['file']);
-                    list($_ext_name, $_ext_suff) = explode('.', $bn);
-                    if ($_ext_suff == '.so' || $_ext_suff == '.dll') {
-                        if (extension_loaded($_ext_name)) {
-                            $this->raiseError("Extension '$_ext_name' already loaded. " .
-                                              'Please unload it in your php.ini file ' .
-                                              'prior to install or upgrade');
-                        }
-                        $role = 'ext';
-                    } else {
-                        $role = 'src';
-                    }
-                    $dest = $ext['dest'];
-                    $this->log(1, "Installing '$ext[file]'");
-                    $copyto = $this->_prependPath($dest, $this->installroot);
-                    $copydir = dirname($copyto);
-                    if (!@is_dir($copydir)) {
-                        if (!$this->mkDirHier($copydir)) {
-                            return $this->raiseError("failed to mkdir $copydir",
-                                PEAR_INSTALLER_FAILED);
-                        }
-                        $this->log(3, "+ mkdir $copydir");
-                    }
-                    if (!@copy($ext['file'], $copyto)) {
-                        return $this->raiseError("failed to write $copyto", PEAR_INSTALLER_FAILED);
-                    }
-                    $this->log(3, "+ cp $ext[file] $copyto");
-                    if (!OS_WINDOWS) {
-                        $mode = 0666 & ~(int)octdec($this->config->get('umask'));
-                        $this->addFileOperation('chmod', array($mode, $copyto));
-                        if (!@chmod($copyto, $mode)) {
-                            $this->log(0, "failed to change mode of $copyto");
-                        }
-                    }
-                    $this->addFileOperation('rename', array($ext['file'], $copyto));
-
-                    $pkginfo['filelist'][$bn] = array(
-                        'role' => $role,
-                        'installed_as' => $dest,
-                        'php_api' => $ext['php_api'],
-                        'zend_mod_api' => $ext['zend_mod_api'],
-                        'zend_ext_api' => $ext['zend_ext_api'],
-                        );
-                }
-            }
-            // }}}
-        }
-
-        if (!$this->commitFileTransaction()) {
-            $this->rollbackFileTransaction();
-            return $this->raiseError("commit failed", PEAR_INSTALLER_FAILED);
-        }
-        // }}}
-
-        $ret = false;
-        // {{{ Register that the package is installed -----------------------
-        if (empty($options['upgrade'])) {
-            // if 'force' is used, replace the info in registry
-            if (!empty($options['force']) && $this->registry->packageExists($pkgname)) {
-                $this->registry->deletePackage($pkgname);
-            }
-            $ret = $this->registry->addPackage($pkgname, $pkginfo);
-        } else {
-            // new: upgrade installs a package if it isn't installed
-            if (!$this->registry->packageExists($pkgname)) {
-                $ret = $this->registry->addPackage($pkgname, $pkginfo);
-            } else {
-                $ret = $this->registry->updatePackage($pkgname, $pkginfo, false);
-            }
-        }
-        if (!$ret) {
-            return $this->raiseError("Adding package $pkgname to registry failed");
-        }
-        // }}}
-        return $pkginfo;
-    }
-
-    // }}}
-    // {{{ uninstall()
-
-    /**
-     * Uninstall a package
-     *
-     * This method removes all files installed by the application, and then
-     * removes any empty directories.
-     * @param string package name
-     * @param array Command-line options.  Possibilities include:
-     *
-     *              - installroot: base installation dir, if not the default
-     *              - nodeps: do not process dependencies of other packages to ensure
-     *                        uninstallation does not break things
-     */
-    function uninstall($package, $options = array())
-    {
-        $php_dir = $this->config->get('php_dir');
-        if (isset($options['installroot'])) {
-            if (substr($options['installroot'], -1) == DIRECTORY_SEPARATOR) {
-                $options['installroot'] = substr($options['installroot'], 0, -1);
-            }
-            $this->installroot = $options['installroot'];
-            $php_dir = $this->_prependPath($php_dir, $this->installroot);
-        } else {
-            $this->installroot = '';
-        }
-        $this->registry = &new PEAR_Registry($php_dir);
-        $filelist = $this->registry->packageInfo($package, 'filelist');
-        if ($filelist == null) {
-            return $this->raiseError("$package not installed");
-        }
-        if (empty($options['nodeps'])) {
-            $depchecker = &new PEAR_Dependency($this->registry);
-            $error = $depchecker->checkPackageUninstall($errors, $warning, $package);
-            if ($error) {
-                return $this->raiseError($errors . 'uninstall failed');
-            }
-            if ($warning) {
-                $this->log(0, $warning);
-            }
-        }
-        // {{{ Delete the files
-        $this->startFileTransaction();
-        if (PEAR::isError($err = $this->_deletePackageFiles($package))) {
-            $this->rollbackFileTransaction();
-            return $this->raiseError($err);
-        }
-        if (!$this->commitFileTransaction()) {
-            $this->rollbackFileTransaction();
-            return $this->raiseError("uninstall failed");
-        } else {
-            $this->startFileTransaction();
-            if (!isset($filelist['dirtree']) || !count($filelist['dirtree'])) {
-                return $this->registry->deletePackage($package);
-            }
-            // attempt to delete empty directories
-            uksort($filelist['dirtree'], array($this, '_sortDirs'));
-            foreach($filelist['dirtree'] as $dir => $notused) {
-                $this->addFileOperation('rmdir', array($dir));
-            }
-            if (!$this->commitFileTransaction()) {
-                $this->rollbackFileTransaction();
-            }
-        }
-        // }}}
-
-        // Register that the package is no longer installed
-        return $this->registry->deletePackage($package);
-    }
-
-    // }}}
-    // {{{ _sortDirs()
-    function _sortDirs($a, $b)
-    {
-        if (strnatcmp($a, $b) == -1) return 1;
-        if (strnatcmp($a, $b) == 1) return -1;
-        return 0;
-    }
-
-    // }}}
-    // {{{ checkDeps()
-
-    /**
-     * Check if the package meets all dependencies
-     *
-     * @param  array   Package information (passed by reference)
-     * @param  string  Error message (passed by reference)
-     * @return boolean False when no error occured, otherwise true
-     */
-    function checkDeps(&$pkginfo, &$errors)
-    {
-        if (empty($this->registry)) {
-            $this->registry = &new PEAR_Registry($this->config->get('php_dir'));
-        }
-        $depchecker = &new PEAR_Dependency($this->registry);
-        $error = $errors = '';
-        $failed_deps = $optional_deps = array();
-        if (is_array($pkginfo['release_deps'])) {
-            foreach($pkginfo['release_deps'] as $dep) {
-                $code = $depchecker->callCheckMethod($error, $dep);
-                if ($code) {
-                    if (isset($dep['optional']) && $dep['optional'] == 'yes') {
-                        $optional_deps[] = array($dep, $code, $error);
-                    } else {
-                        $failed_deps[] = array($dep, $code, $error);
-                    }
-                }
-            }
-            // {{{ failed dependencies
-            $n = count($failed_deps);
-            if ($n > 0) {
-                for ($i = 0; $i < $n; $i++) {
-                    if (isset($failed_deps[$i]['type'])) {
-                        $type = $failed_deps[$i]['type'];
-                    } else {
-                        $type = 'pkg';
-                    }
-                    switch ($failed_deps[$i][1]) {
-                        case PEAR_DEPENDENCY_MISSING:
-                            if ($type == 'pkg') {
-                                // install
-                            }
-                            $errors .= "\n" . $failed_deps[$i][2];
-                            break;
-                        case PEAR_DEPENDENCY_UPGRADE_MINOR:
-                            if ($type == 'pkg') {
-                                // upgrade
-                            }
-                            $errors .= "\n" . $failed_deps[$i][2];
-                            break;
-                        default:
-                            $errors .= "\n" . $failed_deps[$i][2];
-                            break;
-                    }
-                }
-                return true;
-            }
-            // }}}
-
-            // {{{ optional dependencies
-            $count_optional = count($optional_deps);
-            if ($count_optional > 0) {
-                $errors = "Optional dependencies:";
-
-                for ($i = 0; $i < $count_optional; $i++) {
-                    if (isset($optional_deps[$i]['type'])) {
-                        $type = $optional_deps[$i]['type'];
-                    } else {
-                        $type = 'pkg';
-                    }
-                    switch ($optional_deps[$i][1]) {
-                        case PEAR_DEPENDENCY_MISSING:
-                        case PEAR_DEPENDENCY_UPGRADE_MINOR:
-                        default:
-                            $errors .= "\n" . $optional_deps[$i][2];
-                            break;
-                    }
-                }
-                return false;
-            }
-            // }}}
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ _buildCallback()
-
-    function _buildCallback($what, $data)
-    {
-        if (($what == 'cmdoutput' && $this->debug > 1) ||
-            ($what == 'output' && $this->debug > 0)) {
-            $this->ui->outputData(rtrim($data), 'build');
-        }
-    }
-
-    // }}}
-}
-
-// {{{ md5_file() utility function
-if (!function_exists("md5_file")) {
-    function md5_file($filename) {
-        $fp = fopen($filename, "r");
-        if (!$fp) return null;
-        $contents = fread($fp, filesize($filename));
-        fclose($fp);
-        return md5($contents);
-    }
-}
-// }}}
-
-?>
diff --git a/3rdparty/PEAR/Packager.php b/3rdparty/PEAR/Packager.php
deleted file mode 100644
index 3ed209be8b2..00000000000
--- a/3rdparty/PEAR/Packager.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Stig Bakken <ssb@php.net>                                   |
-// |          Tomas V.V.Cox <cox@idecnet.com>                             |
-// +----------------------------------------------------------------------+
-//
-// $Id: Packager.php,v 1.53 2004/06/13 14:06:01 pajoye Exp $
-
-require_once 'PEAR/Common.php';
-require_once 'System.php';
-
-/**
- * Administration class used to make a PEAR release tarball.
- *
- * TODO:
- *  - add an extra param the dir where to place the created package
- *
- * @since PHP 4.0.2
- * @author Stig Bakken <ssb@php.net>
- */
-class PEAR_Packager extends PEAR_Common
-{
-    // {{{ constructor
-
-    function PEAR_Packager()
-    {
-        parent::PEAR_Common();
-    }
-
-    // }}}
-    // {{{ destructor
-
-    function _PEAR_Packager()
-    {
-        parent::_PEAR_Common();
-    }
-
-    // }}}
-
-    // {{{ package()
-
-    function package($pkgfile = null, $compress = true)
-    {
-        // {{{ validate supplied package.xml file
-        if (empty($pkgfile)) {
-            $pkgfile = 'package.xml';
-        }
-        // $this->pkginfo gets populated inside
-        $pkginfo = $this->infoFromDescriptionFile($pkgfile);
-        if (PEAR::isError($pkginfo)) {
-            return $this->raiseError($pkginfo);
-        }
-
-        $pkgdir = dirname(realpath($pkgfile));
-        $pkgfile = basename($pkgfile);
-
-        $errors = $warnings = array();
-        $this->validatePackageInfo($pkginfo, $errors, $warnings, $pkgdir);
-        foreach ($warnings as $w) {
-            $this->log(1, "Warning: $w");
-        }
-        foreach ($errors as $e) {
-            $this->log(0, "Error: $e");
-        }
-        if (sizeof($errors) > 0) {
-            return $this->raiseError('Errors in package');
-        }
-        // }}}
-
-        $pkgver = $pkginfo['package'] . '-' . $pkginfo['version'];
-
-        // {{{ Create the package file list
-        $filelist = array();
-        $i = 0;
-
-        foreach ($pkginfo['filelist'] as $fname => $atts) {
-            $file = $pkgdir . DIRECTORY_SEPARATOR . $fname;
-            if (!file_exists($file)) {
-                return $this->raiseError("File does not exist: $fname");
-            } else {
-                $filelist[$i++] = $file;
-                if (empty($pkginfo['filelist'][$fname]['md5sum'])) {
-                    $md5sum = md5_file($file);
-                    $pkginfo['filelist'][$fname]['md5sum'] = $md5sum;
-                }
-                $this->log(2, "Adding file $fname");
-            }
-        }
-        // }}}
-
-        // {{{ regenerate package.xml
-        $new_xml = $this->xmlFromInfo($pkginfo);
-        if (PEAR::isError($new_xml)) {
-            return $this->raiseError($new_xml);
-        }
-        if (!($tmpdir = System::mktemp(array('-d')))) {
-            return $this->raiseError("PEAR_Packager: mktemp failed");
-        }
-        $newpkgfile = $tmpdir . DIRECTORY_SEPARATOR . 'package.xml';
-        $np = @fopen($newpkgfile, 'wb');
-        if (!$np) {
-            return $this->raiseError("PEAR_Packager: unable to rewrite $pkgfile as $newpkgfile");
-        }
-        fwrite($np, $new_xml);
-        fclose($np);
-        // }}}
-
-        // {{{ TAR the Package -------------------------------------------
-        $ext = $compress ? '.tgz' : '.tar';
-        $dest_package = getcwd() . DIRECTORY_SEPARATOR . $pkgver . $ext;
-        $tar =& new Archive_Tar($dest_package, $compress);
-        $tar->setErrorHandling(PEAR_ERROR_RETURN); // XXX Don't print errors
-        // ----- Creates with the package.xml file
-        $ok = $tar->createModify(array($newpkgfile), '', $tmpdir);
-        if (PEAR::isError($ok)) {
-            return $this->raiseError($ok);
-        } elseif (!$ok) {
-            return $this->raiseError('PEAR_Packager: tarball creation failed');
-        }
-        // ----- Add the content of the package
-        if (!$tar->addModify($filelist, $pkgver, $pkgdir)) {
-            return $this->raiseError('PEAR_Packager: tarball creation failed');
-        }
-        $this->log(1, "Package $dest_package done");
-        if (file_exists("$pkgdir/CVS/Root")) {
-            $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $pkginfo['version']);
-            $cvstag = "RELEASE_$cvsversion";
-            $this->log(1, "Tag the released code with `pear cvstag $pkgfile'");
-            $this->log(1, "(or set the CVS tag $cvstag by hand)");
-        }
-        // }}}
-
-        return $dest_package;
-    }
-
-    // }}}
-}
-
-// {{{ md5_file() utility function
-if (!function_exists('md5_file')) {
-    function md5_file($file) {
-        if (!$fd = @fopen($file, 'r')) {
-            return false;
-        }
-        $md5 = md5(fread($fd, filesize($file)));
-        fclose($fd);
-        return $md5;
-    }
-}
-// }}}
-
-?>
diff --git a/3rdparty/PEAR/Registry.php b/3rdparty/PEAR/Registry.php
deleted file mode 100644
index f2510a38f15..00000000000
--- a/3rdparty/PEAR/Registry.php
+++ /dev/null
@@ -1,538 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Stig Bakken <ssb@php.net>                                    |
-// |         Tomas V.V.Cox <cox@idecnet.com>                              |
-// |                                                                      |
-// +----------------------------------------------------------------------+
-//
-// $Id: Registry.php,v 1.50.4.3 2004/10/26 19:19:56 cellog Exp $
-
-/*
-TODO:
-    - Transform into singleton()
-    - Add application level lock (avoid change the registry from the cmdline
-      while using the GTK interface, for ex.)
-*/
-require_once "System.php";
-require_once "PEAR.php";
-
-define('PEAR_REGISTRY_ERROR_LOCK',   -2);
-define('PEAR_REGISTRY_ERROR_FORMAT', -3);
-define('PEAR_REGISTRY_ERROR_FILE',   -4);
-
-/**
- * Administration class used to maintain the installed package database.
- */
-class PEAR_Registry extends PEAR
-{
-    // {{{ properties
-
-    /** Directory where registry files are stored.
-     * @var string
-     */
-    var $statedir = '';
-
-    /** File where the file map is stored
-     * @var string
-     */
-    var $filemap = '';
-
-    /** Name of file used for locking the registry
-     * @var string
-     */
-    var $lockfile = '';
-
-    /** File descriptor used during locking
-     * @var resource
-     */
-    var $lock_fp = null;
-
-    /** Mode used during locking
-     * @var int
-     */
-    var $lock_mode = 0; // XXX UNUSED
-
-    /** Cache of package information.  Structure:
-     * array(
-     *   'package' => array('id' => ... ),
-     *   ... )
-     * @var array
-     */
-    var $pkginfo_cache = array();
-
-    /** Cache of file map.  Structure:
-     * array( '/path/to/file' => 'package', ... )
-     * @var array
-     */
-    var $filemap_cache = array();
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * PEAR_Registry constructor.
-     *
-     * @param string (optional) PEAR install directory (for .php files)
-     *
-     * @access public
-     */
-    function PEAR_Registry($pear_install_dir = PEAR_INSTALL_DIR)
-    {
-        parent::PEAR();
-        $ds = DIRECTORY_SEPARATOR;
-        $this->install_dir = $pear_install_dir;
-        $this->statedir = $pear_install_dir.$ds.'.registry';
-        $this->filemap  = $pear_install_dir.$ds.'.filemap';
-        $this->lockfile = $pear_install_dir.$ds.'.lock';
-
-        // XXX Compatibility code should be removed in the future
-        // rename all registry files if any to lowercase
-        if (!OS_WINDOWS && $handle = @opendir($this->statedir)) {
-            $dest = $this->statedir . DIRECTORY_SEPARATOR;
-            while (false !== ($file = readdir($handle))) {
-                if (preg_match('/^.*[A-Z].*\.reg$/', $file)) {
-                    rename($dest . $file, $dest . strtolower($file));
-                }
-            }
-            closedir($handle);
-        }
-        if (!file_exists($this->filemap)) {
-            $this->rebuildFileMap();
-        }
-    }
-
-    // }}}
-    // {{{ destructor
-
-    /**
-     * PEAR_Registry destructor.  Makes sure no locks are forgotten.
-     *
-     * @access private
-     */
-    function _PEAR_Registry()
-    {
-        parent::_PEAR();
-        if (is_resource($this->lock_fp)) {
-            $this->_unlock();
-        }
-    }
-
-    // }}}
-
-    // {{{ _assertStateDir()
-
-    /**
-     * Make sure the directory where we keep registry files exists.
-     *
-     * @return bool TRUE if directory exists, FALSE if it could not be
-     * created
-     *
-     * @access private
-     */
-    function _assertStateDir()
-    {
-        if (!@is_dir($this->statedir)) {
-            if (!System::mkdir(array('-p', $this->statedir))) {
-                return $this->raiseError("could not create directory '{$this->statedir}'");
-            }
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ _packageFileName()
-
-    /**
-     * Get the name of the file where data for a given package is stored.
-     *
-     * @param string package name
-     *
-     * @return string registry file name
-     *
-     * @access public
-     */
-    function _packageFileName($package)
-    {
-        return $this->statedir . DIRECTORY_SEPARATOR . strtolower($package) . '.reg';
-    }
-
-    // }}}
-    // {{{ _openPackageFile()
-
-    function _openPackageFile($package, $mode)
-    {
-        $this->_assertStateDir();
-        $file = $this->_packageFileName($package);
-        $fp = @fopen($file, $mode);
-        if (!$fp) {
-            return null;
-        }
-        return $fp;
-    }
-
-    // }}}
-    // {{{ _closePackageFile()
-
-    function _closePackageFile($fp)
-    {
-        fclose($fp);
-    }
-
-    // }}}
-    // {{{ rebuildFileMap()
-
-    function rebuildFileMap()
-    {
-        $packages = $this->listPackages();
-        $files = array();
-        foreach ($packages as $package) {
-            $version = $this->packageInfo($package, 'version');
-            $filelist = $this->packageInfo($package, 'filelist');
-            if (!is_array($filelist)) {
-                continue;
-            }
-            foreach ($filelist as $name => $attrs) {
-                if (isset($attrs['role']) && $attrs['role'] != 'php') {
-                    continue;
-                }
-                if (isset($attrs['baseinstalldir'])) {
-                    $file = $attrs['baseinstalldir'].DIRECTORY_SEPARATOR.$name;
-                } else {
-                    $file = $name;
-                }
-                $file = preg_replace(',^/+,', '', $file);
-                $files[$file] = $package;
-            }
-        }
-        $this->_assertStateDir();
-        $fp = @fopen($this->filemap, 'wb');
-        if (!$fp) {
-            return false;
-        }
-        $this->filemap_cache = $files;
-        fwrite($fp, serialize($files));
-        fclose($fp);
-        return true;
-    }
-
-    // }}}
-    // {{{ readFileMap()
-
-    function readFileMap()
-    {
-        $fp = @fopen($this->filemap, 'r');
-        if (!$fp) {
-            return $this->raiseError('PEAR_Registry: could not open filemap', PEAR_REGISTRY_ERROR_FILE, null, null, $php_errormsg);
-        }
-        $fsize = filesize($this->filemap);
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-        $data = fread($fp, $fsize);
-        set_magic_quotes_runtime($rt);
-        fclose($fp);
-        $tmp = unserialize($data);
-        if (!$tmp && $fsize > 7) {
-            return $this->raiseError('PEAR_Registry: invalid filemap data', PEAR_REGISTRY_ERROR_FORMAT, null, null, $data);
-        }
-        $this->filemap_cache = $tmp;
-        return true;
-    }
-
-    // }}}
-    // {{{ _lock()
-
-    /**
-     * Lock the registry.
-     *
-     * @param integer lock mode, one of LOCK_EX, LOCK_SH or LOCK_UN.
-     *                See flock manual for more information.
-     *
-     * @return bool TRUE on success, FALSE if locking failed, or a
-     *              PEAR error if some other error occurs (such as the
-     *              lock file not being writable).
-     *
-     * @access private
-     */
-    function _lock($mode = LOCK_EX)
-    {
-        if (!eregi('Windows 9', php_uname())) {
-            if ($mode != LOCK_UN && is_resource($this->lock_fp)) {
-                // XXX does not check type of lock (LOCK_SH/LOCK_EX)
-                return true;
-            }
-            if (PEAR::isError($err = $this->_assertStateDir())) {
-                return $err;
-            }
-            $open_mode = 'w';
-            // XXX People reported problems with LOCK_SH and 'w'
-            if ($mode === LOCK_SH || $mode === LOCK_UN) {
-                if (@!is_file($this->lockfile)) {
-                    touch($this->lockfile);
-                }
-                $open_mode = 'r';
-            }
-
-            if (!is_resource($this->lock_fp)) {
-                $this->lock_fp = @fopen($this->lockfile, $open_mode);
-            }
-
-            if (!is_resource($this->lock_fp)) {
-                return $this->raiseError("could not create lock file" .
-                                         (isset($php_errormsg) ? ": " . $php_errormsg : ""));
-            }
-            if (!(int)flock($this->lock_fp, $mode)) {
-                switch ($mode) {
-                    case LOCK_SH: $str = 'shared';    break;
-                    case LOCK_EX: $str = 'exclusive'; break;
-                    case LOCK_UN: $str = 'unlock';    break;
-                    default:      $str = 'unknown';   break;
-                }
-                return $this->raiseError("could not acquire $str lock ($this->lockfile)",
-                                         PEAR_REGISTRY_ERROR_LOCK);
-            }
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ _unlock()
-
-    function _unlock()
-    {
-        $ret = $this->_lock(LOCK_UN);
-        if (is_resource($this->lock_fp)) {
-            fclose($this->lock_fp);
-        }
-        $this->lock_fp = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ _packageExists()
-
-    function _packageExists($package)
-    {
-        return file_exists($this->_packageFileName($package));
-    }
-
-    // }}}
-    // {{{ _packageInfo()
-
-    function _packageInfo($package = null, $key = null)
-    {
-        if ($package === null) {
-            return array_map(array($this, '_packageInfo'),
-                             $this->_listPackages());
-        }
-        $fp = $this->_openPackageFile($package, 'r');
-        if ($fp === null) {
-            return null;
-        }
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-        $data = fread($fp, filesize($this->_packageFileName($package)));
-        set_magic_quotes_runtime($rt);
-        $this->_closePackageFile($fp);
-        $data = unserialize($data);
-        if ($key === null) {
-            return $data;
-        }
-        if (isset($data[$key])) {
-            return $data[$key];
-        }
-        return null;
-    }
-
-    // }}}
-    // {{{ _listPackages()
-
-    function _listPackages()
-    {
-        $pkglist = array();
-        $dp = @opendir($this->statedir);
-        if (!$dp) {
-            return $pkglist;
-        }
-        while ($ent = readdir($dp)) {
-            if ($ent{0} == '.' || substr($ent, -4) != '.reg') {
-                continue;
-            }
-            $pkglist[] = substr($ent, 0, -4);
-        }
-        return $pkglist;
-    }
-
-    // }}}
-
-    // {{{ packageExists()
-
-    function packageExists($package)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_packageExists($package);
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ packageInfo()
-
-    function packageInfo($package = null, $key = null)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_packageInfo($package, $key);
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ listPackages()
-
-    function listPackages()
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_listPackages();
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ addPackage()
-
-    function addPackage($package, $info)
-    {
-        if ($this->packageExists($package)) {
-            return false;
-        }
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-        $fp = $this->_openPackageFile($package, 'wb');
-        if ($fp === null) {
-            $this->_unlock();
-            return false;
-        }
-        $info['_lastmodified'] = time();
-        fwrite($fp, serialize($info));
-        $this->_closePackageFile($fp);
-        $this->_unlock();
-        return true;
-    }
-
-    // }}}
-    // {{{ deletePackage()
-
-    function deletePackage($package)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-        $file = $this->_packageFileName($package);
-        $ret = @unlink($file);
-        $this->rebuildFileMap();
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ updatePackage()
-
-    function updatePackage($package, $info, $merge = true)
-    {
-        $oldinfo = $this->packageInfo($package);
-        if (empty($oldinfo)) {
-            return false;
-        }
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-        $fp = $this->_openPackageFile($package, 'w');
-        if ($fp === null) {
-            $this->_unlock();
-            return false;
-        }
-        $info['_lastmodified'] = time();
-        if ($merge) {
-            fwrite($fp, serialize(array_merge($oldinfo, $info)));
-        } else {
-            fwrite($fp, serialize($info));
-        }
-        $this->_closePackageFile($fp);
-        if (isset($info['filelist'])) {
-            $this->rebuildFileMap();
-        }
-        $this->_unlock();
-        return true;
-    }
-
-    // }}}
-    // {{{ checkFileMap()
-
-    /**
-     * Test whether a file belongs to a package.
-     *
-     * @param string $path file path, absolute or relative to the pear
-     * install dir
-     *
-     * @return string which package the file belongs to, or an empty
-     * string if the file does not belong to an installed package
-     *
-     * @access public
-     */
-    function checkFileMap($path)
-    {
-        if (is_array($path)) {
-            static $notempty;
-            if (empty($notempty)) {
-                $notempty = create_function('$a','return !empty($a);');
-            }
-            $pkgs = array();
-            foreach ($path as $name => $attrs) {
-                if (is_array($attrs) && isset($attrs['baseinstalldir'])) {
-                    $name = $attrs['baseinstalldir'].DIRECTORY_SEPARATOR.$name;
-                }
-                $pkgs[$name] = $this->checkFileMap($name);
-            }
-            return array_filter($pkgs, $notempty);
-        }
-        if (empty($this->filemap_cache) && PEAR::isError($this->readFileMap())) {
-            return $err;
-        }
-        if (isset($this->filemap_cache[$path])) {
-            return $this->filemap_cache[$path];
-        }
-        $l = strlen($this->install_dir);
-        if (substr($path, 0, $l) == $this->install_dir) {
-            $path = preg_replace('!^'.DIRECTORY_SEPARATOR.'+!', '', substr($path, $l));
-        }
-        if (isset($this->filemap_cache[$path])) {
-            return $this->filemap_cache[$path];
-        }
-        return '';
-    }
-
-    // }}}
-
-}
-
-?>
diff --git a/3rdparty/PEAR/Remote.php b/3rdparty/PEAR/Remote.php
deleted file mode 100644
index 7b1e314f903..00000000000
--- a/3rdparty/PEAR/Remote.php
+++ /dev/null
@@ -1,394 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Stig Bakken <ssb@php.net>                                    |
-// +----------------------------------------------------------------------+
-//
-// $Id: Remote.php,v 1.50 2004/06/08 18:03:46 cellog Exp $
-
-require_once 'PEAR.php';
-require_once 'PEAR/Config.php';
-
-/**
- * This is a class for doing remote operations against the central
- * PEAR database.
- *
- * @nodep XML_RPC_Value
- * @nodep XML_RPC_Message
- * @nodep XML_RPC_Client
- */
-class PEAR_Remote extends PEAR
-{
-    // {{{ properties
-
-    var $config = null;
-    var $cache  = null;
-
-    // }}}
-
-    // {{{ PEAR_Remote(config_object)
-
-    function PEAR_Remote(&$config)
-    {
-        $this->PEAR();
-        $this->config = &$config;
-    }
-
-    // }}}
-
-    // {{{ getCache()
-
-
-    function getCache($args)
-    {
-        $id       = md5(serialize($args));
-        $cachedir = $this->config->get('cache_dir');
-        $filename = $cachedir . DIRECTORY_SEPARATOR . 'xmlrpc_cache_' . $id;
-        if (!file_exists($filename)) {
-            return null;
-        };
-
-        $fp = fopen($filename, 'rb');
-        if (!$fp) {
-            return null;
-        }
-        $content  = fread($fp, filesize($filename));
-        fclose($fp);
-        $result   = array(
-            'age'        => time() - filemtime($filename),
-            'lastChange' => filemtime($filename),
-            'content'    => unserialize($content),
-            );
-        return $result;
-    }
-
-    // }}}
-
-    // {{{ saveCache()
-
-    function saveCache($args, $data)
-    {
-        $id       = md5(serialize($args));
-        $cachedir = $this->config->get('cache_dir');
-        if (!file_exists($cachedir)) {
-            System::mkdir(array('-p', $cachedir));
-        }
-        $filename = $cachedir.'/xmlrpc_cache_'.$id;
-
-        $fp = @fopen($filename, "wb");
-        if ($fp) {
-            fwrite($fp, serialize($data));
-            fclose($fp);
-        };
-    }
-
-    // }}}
-
-    // {{{ call(method, [args...])
-
-    function call($method)
-    {
-        $_args = $args = func_get_args();
-
-        $this->cache = $this->getCache($args);
-        $cachettl = $this->config->get('cache_ttl');
-        // If cache is newer than $cachettl seconds, we use the cache!
-        if ($this->cache !== null && $this->cache['age'] < $cachettl) {
-            return $this->cache['content'];
-        };
-
-        if (extension_loaded("xmlrpc")) {
-            $result = call_user_func_array(array(&$this, 'call_epi'), $args);
-            if (!PEAR::isError($result)) {
-                $this->saveCache($_args, $result);
-            };
-            return $result;
-        }
-        if (!@include_once("XML/RPC.php")) {
-            return $this->raiseError("For this remote PEAR operation you need to install the XML_RPC package");
-        }
-        array_shift($args);
-        $server_host = $this->config->get('master_server');
-        $username = $this->config->get('username');
-        $password = $this->config->get('password');
-        $eargs = array();
-        foreach($args as $arg) $eargs[] = $this->_encode($arg);
-        $f = new XML_RPC_Message($method, $eargs);
-        if ($this->cache !== null) {
-            $maxAge = '?maxAge='.$this->cache['lastChange'];
-        } else {
-            $maxAge = '';
-        };
-        $proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
-        if ($proxy = parse_url($this->config->get('http_proxy'))) {
-            $proxy_host = @$proxy['host'];
-            $proxy_port = @$proxy['port'];
-            $proxy_user = @urldecode(@$proxy['user']);
-            $proxy_pass = @urldecode(@$proxy['pass']);
-        }
-        $c = new XML_RPC_Client('/xmlrpc.php'.$maxAge, $server_host, 80, $proxy_host, $proxy_port, $proxy_user, $proxy_pass);
-        if ($username && $password) {
-            $c->setCredentials($username, $password);
-        }
-        if ($this->config->get('verbose') >= 3) {
-            $c->setDebug(1);
-        }
-        $r = $c->send($f);
-        if (!$r) {
-            return $this->raiseError("XML_RPC send failed");
-        }
-        $v = $r->value();
-        if ($e = $r->faultCode()) {
-            if ($e == $GLOBALS['XML_RPC_err']['http_error'] && strstr($r->faultString(), '304 Not Modified') !== false) {
-                return $this->cache['content'];
-            }
-            return $this->raiseError($r->faultString(), $e);
-        }
-
-        $result = XML_RPC_decode($v);
-        $this->saveCache($_args, $result);
-        return $result;
-    }
-
-    // }}}
-
-    // {{{ call_epi(method, [args...])
-
-    function call_epi($method)
-    {
-        do {
-            if (extension_loaded("xmlrpc")) {
-                break;
-            }
-            if (OS_WINDOWS) {
-                $ext = 'dll';
-            } elseif (PHP_OS == 'HP-UX') {
-                $ext = 'sl';
-            } elseif (PHP_OS == 'AIX') {
-                $ext = 'a';
-            } else {
-                $ext = 'so';
-            }
-            $ext = OS_WINDOWS ? 'dll' : 'so';
-            @dl("xmlrpc-epi.$ext");
-            if (extension_loaded("xmlrpc")) {
-                break;
-            }
-            @dl("xmlrpc.$ext");
-            if (extension_loaded("xmlrpc")) {
-                break;
-            }
-            return $this->raiseError("unable to load xmlrpc extension");
-        } while (false);
-        $params = func_get_args();
-        array_shift($params);
-        $method = str_replace("_", ".", $method);
-        $request = xmlrpc_encode_request($method, $params);
-        $server_host = $this->config->get("master_server");
-        if (empty($server_host)) {
-            return $this->raiseError("PEAR_Remote::call: no master_server configured");
-        }
-        $server_port = 80;
-        if ($http_proxy = $this->config->get('http_proxy')) {
-            $proxy = parse_url($http_proxy);
-            $proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
-            $proxy_host = @$proxy['host'];
-            $proxy_port = @$proxy['port'];
-            $proxy_user = @urldecode(@$proxy['user']);
-            $proxy_pass = @urldecode(@$proxy['pass']);
-            $fp = @fsockopen($proxy_host, $proxy_port);
-            $use_proxy = true;
-        } else {
-            $use_proxy = false;
-            $fp = @fsockopen($server_host, $server_port);
-        }
-        if (!$fp && $http_proxy) {
-            return $this->raiseError("PEAR_Remote::call: fsockopen(`$proxy_host', $proxy_port) failed");
-        } elseif (!$fp) {
-            return $this->raiseError("PEAR_Remote::call: fsockopen(`$server_host', $server_port) failed");
-        }
-        $len = strlen($request);
-        $req_headers = "Host: $server_host:$server_port\r\n" .
-             "Content-type: text/xml\r\n" .
-             "Content-length: $len\r\n";
-        $username = $this->config->get('username');
-        $password = $this->config->get('password');
-        if ($username && $password) {
-            $req_headers .= "Cookie: PEAR_USER=$username; PEAR_PW=$password\r\n";
-            $tmp = base64_encode("$username:$password");
-            $req_headers .= "Authorization: Basic $tmp\r\n";
-        }
-        if ($this->cache !== null) {
-            $maxAge = '?maxAge='.$this->cache['lastChange'];
-        } else {
-            $maxAge = '';
-        };
-
-        if ($use_proxy && $proxy_host != '' && $proxy_user != '') {
-            $req_headers .= 'Proxy-Authorization: Basic '
-                .base64_encode($proxy_user.':'.$proxy_pass)
-                ."\r\n";
-        }
-
-        if ($this->config->get('verbose') > 3) {
-            print "XMLRPC REQUEST HEADERS:\n";
-            var_dump($req_headers);
-            print "XMLRPC REQUEST BODY:\n";
-            var_dump($request);
-        }
-
-        if ($use_proxy && $proxy_host != '') {
-            $post_string = "POST http://".$server_host;
-            if ($proxy_port > '') {
-                $post_string .= ':'.$server_port;
-            }
-        } else {
-            $post_string = "POST ";
-        }
-
-        fwrite($fp, ($post_string."/xmlrpc.php$maxAge HTTP/1.0\r\n$req_headers\r\n$request"));
-        $response = '';
-        $line1 = fgets($fp, 2048);
-        if (!preg_match('!^HTTP/[0-9\.]+ (\d+) (.*)!', $line1, $matches)) {
-            return $this->raiseError("PEAR_Remote: invalid HTTP response from XML-RPC server");
-        }
-        switch ($matches[1]) {
-            case "200": // OK
-                break;
-            case "304": // Not Modified
-                return $this->cache['content'];
-            case "401": // Unauthorized
-                if ($username && $password) {
-                    return $this->raiseError("PEAR_Remote: authorization failed", 401);
-                } else {
-                    return $this->raiseError("PEAR_Remote: authorization required, please log in first", 401);
-                }
-            default:
-                return $this->raiseError("PEAR_Remote: unexpected HTTP response", (int)$matches[1], null, null, "$matches[1] $matches[2]");
-        }
-        while (trim(fgets($fp, 2048)) != ''); // skip rest of headers
-        while ($chunk = fread($fp, 10240)) {
-            $response .= $chunk;
-        }
-        fclose($fp);
-        if ($this->config->get('verbose') > 3) {
-            print "XMLRPC RESPONSE:\n";
-            var_dump($response);
-        }
-        $ret = xmlrpc_decode($response);
-        if (is_array($ret) && isset($ret['__PEAR_TYPE__'])) {
-            if ($ret['__PEAR_TYPE__'] == 'error') {
-                if (isset($ret['__PEAR_CLASS__'])) {
-                    $class = $ret['__PEAR_CLASS__'];
-                } else {
-                    $class = "PEAR_Error";
-                }
-                if ($ret['code']     === '') $ret['code']     = null;
-                if ($ret['message']  === '') $ret['message']  = null;
-                if ($ret['userinfo'] === '') $ret['userinfo'] = null;
-                if (strtolower($class) == 'db_error') {
-                    $ret = $this->raiseError(PEAR::errorMessage($ret['code']),
-                                             $ret['code'], null, null,
-                                             $ret['userinfo']);
-                } else {
-                    $ret = $this->raiseError($ret['message'], $ret['code'],
-                                             null, null, $ret['userinfo']);
-                }
-            }
-        } elseif (is_array($ret) && sizeof($ret) == 1 && isset($ret[0])
-                  && is_array($ret[0]) &&
-                  !empty($ret[0]['faultString']) &&
-                  !empty($ret[0]['faultCode'])) {
-            extract($ret[0]);
-            $faultString = "XML-RPC Server Fault: " .
-                 str_replace("\n", " ", $faultString);
-            return $this->raiseError($faultString, $faultCode);
-        }
-        return $ret;
-    }
-
-    // }}}
-
-    // {{{ _encode
-
-    // a slightly extended version of XML_RPC_encode
-    function _encode($php_val)
-    {
-        global $XML_RPC_Boolean, $XML_RPC_Int, $XML_RPC_Double;
-        global $XML_RPC_String, $XML_RPC_Array, $XML_RPC_Struct;
-
-        $type = gettype($php_val);
-        $xmlrpcval = new XML_RPC_Value;
-
-        switch($type) {
-            case "array":
-                reset($php_val);
-                $firstkey = key($php_val);
-                end($php_val);
-                $lastkey = key($php_val);
-                if ($firstkey === 0 && is_int($lastkey) &&
-                    ($lastkey + 1) == count($php_val)) {
-                    $is_continuous = true;
-                    reset($php_val);
-                    $size = count($php_val);
-                    for ($expect = 0; $expect < $size; $expect++, next($php_val)) {
-                        if (key($php_val) !== $expect) {
-                            $is_continuous = false;
-                            break;
-                        }
-                    }
-                    if ($is_continuous) {
-                        reset($php_val);
-                        $arr = array();
-                        while (list($k, $v) = each($php_val)) {
-                            $arr[$k] = $this->_encode($v);
-                        }
-                        $xmlrpcval->addArray($arr);
-                        break;
-                    }
-                }
-                // fall though if not numerical and continuous
-            case "object":
-                $arr = array();
-                while (list($k, $v) = each($php_val)) {
-                    $arr[$k] = $this->_encode($v);
-                }
-                $xmlrpcval->addStruct($arr);
-                break;
-            case "integer":
-                $xmlrpcval->addScalar($php_val, $XML_RPC_Int);
-                break;
-            case "double":
-                $xmlrpcval->addScalar($php_val, $XML_RPC_Double);
-                break;
-            case "string":
-            case "NULL":
-                $xmlrpcval->addScalar($php_val, $XML_RPC_String);
-                break;
-            case "boolean":
-                $xmlrpcval->addScalar($php_val, $XML_RPC_Boolean);
-                break;
-            case "unknown type":
-            default:
-                return null;
-        }
-        return $xmlrpcval;
-    }
-
-    // }}}
-
-}
-
-?>
diff --git a/3rdparty/PEAR/RunTest.php b/3rdparty/PEAR/RunTest.php
deleted file mode 100644
index 1aa02aab9df..00000000000
--- a/3rdparty/PEAR/RunTest.php
+++ /dev/null
@@ -1,363 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Tomas V.V.Cox <cox@idecnet.com>                             |
-// |          Greg Beaver <cellog@php.net>                                |
-// |                                                                      |
-// +----------------------------------------------------------------------+
-//
-// $Id: RunTest.php,v 1.3.2.4 2005/02/17 17:47:55 cellog Exp $
-//
-
-/**
- * Simplified version of PHP's test suite
- * -- EXPERIMENTAL --
-
- Try it with:
-
- $ php -r 'include "../PEAR/RunTest.php"; $t=new PEAR_RunTest; $o=$t->run("./pear_system.phpt");print_r($o);'
-
-
-TODO:
-
-Actually finish the development and testing
-
- */
-
-require_once 'PEAR.php';
-require_once 'PEAR/Config.php';
-
-define('DETAILED', 1);
-putenv("PHP_PEAR_RUNTESTS=1");
-
-class PEAR_RunTest
-{
-    var $_logger;
-
-    /**
-     * An object that supports the PEAR_Common->log() signature, or null
-     * @param PEAR_Common|null
-     */
-    function PEAR_RunTest($logger = null)
-    {
-        $this->_logger = $logger;
-    }
-
-    //
-    //  Run an individual test case.
-    //
-
-    function run($file, $ini_settings = '')
-    {
-        $cwd = getcwd();
-        $conf = &PEAR_Config::singleton();
-        $php = $conf->get('php_bin');
-        //var_dump($php);exit;
-        global $log_format, $info_params, $ini_overwrites;
-
-        $info_params = '';
-        $log_format = 'LEOD';
-
-        // Load the sections of the test file.
-        $section_text = array(
-            'TEST'    => '(unnamed test)',
-            'SKIPIF'  => '',
-            'GET'     => '',
-            'ARGS'    => '',
-        );
-
-        if (!is_file($file) || !$fp = fopen($file, "r")) {
-            return PEAR::raiseError("Cannot open test file: $file");
-        }
-
-        $section = '';
-        while (!feof($fp)) {
-            $line = fgets($fp);
-
-            // Match the beginning of a section.
-            if (ereg('^--([A-Z]+)--',$line,$r)) {
-                $section = $r[1];
-                $section_text[$section] = '';
-                continue;
-            }
-
-            // Add to the section text.
-            $section_text[$section] .= $line;
-        }
-        fclose($fp);
-
-        $shortname = str_replace($cwd.'/', '', $file);
-        $tested = trim($section_text['TEST'])." [$shortname]";
-
-        $tmp = realpath(dirname($file));
-        $tmp_skipif = $tmp . uniqid('/phpt.');
-        $tmp_file   = ereg_replace('\.phpt$','.php',$file);
-        $tmp_post   = $tmp . uniqid('/phpt.');
-
-        @unlink($tmp_skipif);
-        @unlink($tmp_file);
-        @unlink($tmp_post);
-
-        // unlink old test results
-        @unlink(ereg_replace('\.phpt$','.diff',$file));
-        @unlink(ereg_replace('\.phpt$','.log',$file));
-        @unlink(ereg_replace('\.phpt$','.exp',$file));
-        @unlink(ereg_replace('\.phpt$','.out',$file));
-
-        // Check if test should be skipped.
-        $info = '';
-        $warn = false;
-        if (array_key_exists('SKIPIF', $section_text)) {
-            if (trim($section_text['SKIPIF'])) {
-                $this->save_text($tmp_skipif, $section_text['SKIPIF']);
-                //$extra = substr(PHP_OS, 0, 3) !== "WIN" ?
-                //    "unset REQUEST_METHOD;": "";
-
-                //$output = `$extra $php $info_params -f $tmp_skipif`;
-                $output = `$php $info_params -f $tmp_skipif`;
-                unlink($tmp_skipif);
-                if (eregi("^skip", trim($output))) {
-                    $skipreason = "SKIP $tested";
-                    $reason = (eregi("^skip[[:space:]]*(.+)\$", trim($output))) ? eregi_replace("^skip[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
-                    if ($reason) {
-                        $skipreason .= " (reason: $reason)";
-                    }
-                    $this->_logger->log(0, $skipreason);
-                    if (isset($old_php)) {
-                        $php = $old_php;
-                    }
-                    return 'SKIPPED';
-                }
-                if (eregi("^info", trim($output))) {
-                    $reason = (ereg("^info[[:space:]]*(.+)\$", trim($output))) ? ereg_replace("^info[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
-                    if ($reason) {
-                        $info = " (info: $reason)";
-                    }
-                }
-                if (eregi("^warn", trim($output))) {
-                    $reason = (ereg("^warn[[:space:]]*(.+)\$", trim($output))) ? ereg_replace("^warn[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
-                    if ($reason) {
-                        $warn = true; /* only if there is a reason */
-                        $info = " (warn: $reason)";
-                    }
-                }
-            }
-        }
-
-        // We've satisfied the preconditions - run the test!
-        $this->save_text($tmp_file,$section_text['FILE']);
-
-        $args = $section_text['ARGS'] ? ' -- '.$section_text['ARGS'] : '';
-
-        $cmd = "$php$ini_settings -f $tmp_file$args 2>&1";
-        if (isset($this->_logger)) {
-            $this->_logger->log(2, 'Running command "' . $cmd . '"');
-        }
-
-        $savedir = getcwd(); // in case the test moves us around
-        if (isset($section_text['RETURNS'])) {
-            ob_start();
-            system($cmd, $return_value);
-            $out = ob_get_contents();
-            ob_end_clean();
-            @unlink($tmp_post);
-            $section_text['RETURNS'] = (int) trim($section_text['RETURNS']);
-            $returnfail = ($return_value != $section_text['RETURNS']);
-        } else {
-            $out = `$cmd`;
-            $returnfail = false;
-        }
-        chdir($savedir);
-        // Does the output match what is expected?
-        $output = trim($out);
-        $output = preg_replace('/\r\n/', "\n", $output);
-
-        if (isset($section_text['EXPECTF']) || isset($section_text['EXPECTREGEX'])) {
-            if (isset($section_text['EXPECTF'])) {
-                $wanted = trim($section_text['EXPECTF']);
-            } else {
-                $wanted = trim($section_text['EXPECTREGEX']);
-            }
-            $wanted_re = preg_replace('/\r\n/',"\n",$wanted);
-            if (isset($section_text['EXPECTF'])) {
-                $wanted_re = preg_quote($wanted_re, '/');
-                // Stick to basics
-                $wanted_re = str_replace("%s", ".+?", $wanted_re); //not greedy
-                $wanted_re = str_replace("%i", "[+\-]?[0-9]+", $wanted_re);
-                $wanted_re = str_replace("%d", "[0-9]+", $wanted_re);
-                $wanted_re = str_replace("%x", "[0-9a-fA-F]+", $wanted_re);
-                $wanted_re = str_replace("%f", "[+\-]?\.?[0-9]+\.?[0-9]*(E-?[0-9]+)?", $wanted_re);
-                $wanted_re = str_replace("%c", ".", $wanted_re);
-                // %f allows two points "-.0.0" but that is the best *simple* expression
-            }
-    /* DEBUG YOUR REGEX HERE
-            var_dump($wanted_re);
-            print(str_repeat('=', 80) . "\n");
-            var_dump($output);
-    */
-            if (!$returnfail && preg_match("/^$wanted_re\$/s", $output)) {
-                @unlink($tmp_file);
-                $this->_logger->log(0, "PASS $tested$info");
-                if (isset($old_php)) {
-                    $php = $old_php;
-                }
-                return 'PASSED';
-            }
-
-        } else {
-            $wanted = trim($section_text['EXPECT']);
-            $wanted = preg_replace('/\r\n/',"\n",$wanted);
-        // compare and leave on success
-            $ok = (0 == strcmp($output,$wanted));
-            if (!$returnfail && $ok) {
-                @unlink($tmp_file);
-                $this->_logger->log(0, "PASS $tested$info");
-                if (isset($old_php)) {
-                    $php = $old_php;
-                }
-                return 'PASSED';
-            }
-        }
-
-        // Test failed so we need to report details.
-        if ($warn) {
-            $this->_logger->log(0, "WARN $tested$info");
-        } else {
-            $this->_logger->log(0, "FAIL $tested$info");
-        }
-
-        if (isset($section_text['RETURNS'])) {
-            $GLOBALS['__PHP_FAILED_TESTS__'][] = array(
-                            'name' => $file,
-                            'test_name' => $tested,
-                            'output' => ereg_replace('\.phpt$','.log', $file),
-                            'diff'   => ereg_replace('\.phpt$','.diff', $file),
-                            'info'   => $info,
-                            'return' => $return_value
-                            );
-        } else {
-            $GLOBALS['__PHP_FAILED_TESTS__'][] = array(
-                            'name' => $file,
-                            'test_name' => $tested,
-                            'output' => ereg_replace('\.phpt$','.log', $file),
-                            'diff'   => ereg_replace('\.phpt$','.diff', $file),
-                            'info'   => $info,
-                            );
-        }
-
-        // write .exp
-        if (strpos($log_format,'E') !== FALSE) {
-            $logname = ereg_replace('\.phpt$','.exp',$file);
-            if (!$log = fopen($logname,'w')) {
-                return PEAR::raiseError("Cannot create test log - $logname");
-            }
-            fwrite($log,$wanted);
-            fclose($log);
-        }
-
-        // write .out
-        if (strpos($log_format,'O') !== FALSE) {
-            $logname = ereg_replace('\.phpt$','.out',$file);
-            if (!$log = fopen($logname,'w')) {
-                return PEAR::raiseError("Cannot create test log - $logname");
-            }
-            fwrite($log,$output);
-            fclose($log);
-        }
-
-        // write .diff
-        if (strpos($log_format,'D') !== FALSE) {
-            $logname = ereg_replace('\.phpt$','.diff',$file);
-            if (!$log = fopen($logname,'w')) {
-                return PEAR::raiseError("Cannot create test log - $logname");
-            }
-            fwrite($log, $this->generate_diff($wanted, $output,
-                isset($section_text['RETURNS']) ? array(trim($section_text['RETURNS']),
-                    $return_value) : null));
-            fclose($log);
-        }
-
-        // write .log
-        if (strpos($log_format,'L') !== FALSE) {
-            $logname = ereg_replace('\.phpt$','.log',$file);
-            if (!$log = fopen($logname,'w')) {
-                return PEAR::raiseError("Cannot create test log - $logname");
-            }
-            fwrite($log,"
----- EXPECTED OUTPUT
-$wanted
----- ACTUAL OUTPUT
-$output
----- FAILED
-");
-            if ($returnfail) {
-                fwrite($log,"
----- EXPECTED RETURN
-$section_text[RETURNS]
----- ACTUAL RETURN
-$return_value
-");
-            }
-            fclose($log);
-            //error_report($file,$logname,$tested);
-        }
-
-        if (isset($old_php)) {
-            $php = $old_php;
-        }
-
-        return $warn ? 'WARNED' : 'FAILED';
-    }
-
-    function generate_diff($wanted, $output, $return_value)
-    {
-        $w = explode("\n", $wanted);
-        $o = explode("\n", $output);
-        $w1 = array_diff_assoc($w,$o);
-        $o1 = array_diff_assoc($o,$w);
-        $w2 = array();
-        $o2 = array();
-        foreach($w1 as $idx => $val) $w2[sprintf("%03d<",$idx)] = sprintf("%03d- ", $idx+1).$val;
-        foreach($o1 as $idx => $val) $o2[sprintf("%03d>",$idx)] = sprintf("%03d+ ", $idx+1).$val;
-        $diff = array_merge($w2, $o2);
-        ksort($diff);
-        if ($return_value) {
-            $extra = "##EXPECTED: $return_value[0]\r\n##RETURNED: $return_value[1]";
-        } else {
-            $extra = '';
-        }
-        return implode("\r\n", $diff) . $extra;
-    }
-
-    //
-    //  Write the given text to a temporary file, and return the filename.
-    //
-
-    function save_text($filename, $text)
-    {
-        if (!$fp = fopen($filename, 'w')) {
-            return PEAR::raiseError("Cannot open file '" . $filename . "' (save_text)");
-        }
-        fwrite($fp,$text);
-        fclose($fp);
-    if (1 < DETAILED) echo "
-FILE $filename {{{
-$text
-}}}
-";
-    }
-
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/README b/3rdparty/README
new file mode 100644
index 00000000000..e577d414ada
--- /dev/null
+++ b/3rdparty/README
@@ -0,0 +1,2 @@
+the 3rdparty libraries are now located in a seperate repository. just copy https://gitorious.org/owncloud/3rdparty  into this directory and everything will work
+
diff --git a/3rdparty/Sabre.includes.php b/3rdparty/Sabre.includes.php
deleted file mode 100644
index d41b287b77d..00000000000
--- a/3rdparty/Sabre.includes.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-/**
- * Library include file
- *
- * This file contains all includes to the rest of the SabreDAV library
- * Make sure the lib/ directory is in PHP's include_path
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-/* Utilities */
-include 'Sabre/HTTP/Util.php';
-include 'Sabre/HTTP/Response.php';
-include 'Sabre/HTTP/Request.php';
-include 'Sabre/HTTP/AbstractAuth.php';
-include 'Sabre/HTTP/BasicAuth.php';
-include 'Sabre/HTTP/DigestAuth.php';
-include 'Sabre/HTTP/AWSAuth.php';
-
-/* Version */
-include 'Sabre/DAV/Version.php';
-include 'Sabre/HTTP/Version.php';
-
-/* Exceptions */
-include 'Sabre/DAV/Exception.php';
-include 'Sabre/DAV/Exception/BadRequest.php';
-include 'Sabre/DAV/Exception/Conflict.php';
-include 'Sabre/DAV/Exception/FileNotFound.php';
-include 'Sabre/DAV/Exception/InsufficientStorage.php';
-include 'Sabre/DAV/Exception/Locked.php';
-include 'Sabre/DAV/Exception/LockTokenMatchesRequestUri.php';
-include 'Sabre/DAV/Exception/MethodNotAllowed.php';
-include 'Sabre/DAV/Exception/NotImplemented.php';
-include 'Sabre/DAV/Exception/Forbidden.php';
-include 'Sabre/DAV/Exception/PreconditionFailed.php';
-include 'Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php';
-include 'Sabre/DAV/Exception/UnsupportedMediaType.php';
-include 'Sabre/DAV/Exception/NotAuthenticated.php';
-
-include 'Sabre/DAV/Exception/ConflictingLock.php';
-include 'Sabre/DAV/Exception/ReportNotImplemented.php';
-include 'Sabre/DAV/Exception/InvalidResourceType.php';
-
-/* Properties */
-include 'Sabre/DAV/Property.php';
-include 'Sabre/DAV/Property/GetLastModified.php';
-include 'Sabre/DAV/Property/ResourceType.php';
-include 'Sabre/DAV/Property/SupportedLock.php';
-include 'Sabre/DAV/Property/LockDiscovery.php';
-include 'Sabre/DAV/Property/IHref.php';
-include 'Sabre/DAV/Property/Href.php';
-include 'Sabre/DAV/Property/HrefList.php';
-include 'Sabre/DAV/Property/SupportedReportSet.php';
-include 'Sabre/DAV/Property/Response.php';
-include 'Sabre/DAV/Property/ResponseList.php';
-
-/* Node interfaces */
-include 'Sabre/DAV/INode.php';
-include 'Sabre/DAV/IFile.php';
-include 'Sabre/DAV/ICollection.php';
-include 'Sabre/DAV/IProperties.php';
-include 'Sabre/DAV/ILockable.php';
-include 'Sabre/DAV/IQuota.php';
-include 'Sabre/DAV/IExtendedCollection.php';
-
-/* Node abstract implementations */
-include 'Sabre/DAV/Node.php';
-include 'Sabre/DAV/File.php';
-include 'Sabre/DAV/Collection.php';
-include 'Sabre/DAV/Directory.php';
-
-/* Utilities */
-include 'Sabre/DAV/SimpleCollection.php';
-include 'Sabre/DAV/SimpleDirectory.php';
-include 'Sabre/DAV/XMLUtil.php';
-include 'Sabre/DAV/URLUtil.php';
-
-/* Filesystem implementation */
-include 'Sabre/DAV/FS/Node.php';
-include 'Sabre/DAV/FS/File.php';
-include 'Sabre/DAV/FS/Directory.php';
-
-/* Advanced filesystem implementation */
-include 'Sabre/DAV/FSExt/Node.php';
-include 'Sabre/DAV/FSExt/File.php';
-include 'Sabre/DAV/FSExt/Directory.php';
-
-/* Trees */
-include 'Sabre/DAV/Tree.php';
-include 'Sabre/DAV/ObjectTree.php';
-include 'Sabre/DAV/Tree/Filesystem.php';
-
-/* Server */
-include 'Sabre/DAV/Server.php';
-include 'Sabre/DAV/ServerPlugin.php';
-
-/* Browser */
-include 'Sabre/DAV/Browser/Plugin.php';
-include 'Sabre/DAV/Browser/MapGetToPropFind.php';
-include 'Sabre/DAV/Browser/GuessContentType.php';
-
-/* Locks */
-include 'Sabre/DAV/Locks/LockInfo.php';
-include 'Sabre/DAV/Locks/Plugin.php';
-include 'Sabre/DAV/Locks/Backend/Abstract.php';
-include 'Sabre/DAV/Locks/Backend/FS.php';
-include 'Sabre/DAV/Locks/Backend/PDO.php';
-
-/* Temporary File Filter plugin */
-include 'Sabre/DAV/TemporaryFileFilterPlugin.php';
-
-/* Authentication plugin */
-include 'Sabre/DAV/Auth/Plugin.php';
-include 'Sabre/DAV/Auth/IBackend.php';
-include 'Sabre/DAV/Auth/Backend/AbstractDigest.php';
-include 'Sabre/DAV/Auth/Backend/AbstractBasic.php';
-include 'Sabre/DAV/Auth/Backend/File.php';
-include 'Sabre/DAV/Auth/Backend/PDO.php';
-
-/* DavMount plugin */
-include 'Sabre/DAV/Mount/Plugin.php';
-
diff --git a/3rdparty/Sabre/CalDAV/Backend/Abstract.php b/3rdparty/Sabre/CalDAV/Backend/Abstract.php
deleted file mode 100644
index b694eef49e4..00000000000
--- a/3rdparty/Sabre/CalDAV/Backend/Abstract.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-/**
- * Abstract Calendaring backend. Extend this class to create your own backends.
- * 
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_CalDAV_Backend_Abstract {
-
-    /**
-     * Returns a list of calendars for a principal.
-     *
-     * Every project is an array with the following keys:
-     *  * id, a unique id that will be used by other functions to modify the
-     *    calendar. This can be the same as the uri or a database key.
-     *  * uri, which the basename of the uri with which the calendar is 
-     *    accessed.
-     *  * principalUri. The owner of the calendar. Almost always the same as
-     *    principalUri passed to this method.
-     *
-     * Furthermore it can contain webdav properties in clark notation. A very
-     * common one is '{DAV:}displayname'. 
-     *
-     * @param string $principalUri 
-     * @return array 
-     */
-    abstract function getCalendarsForUser($principalUri);
-
-    /**
-     * Creates a new calendar for a principal.
-     *
-     * If the creation was a success, an id must be returned that can be used to reference
-     * this calendar in other methods, such as updateCalendar.
-     *
-     * @param string $principalUri
-     * @param string $calendarUri
-     * @param array $properties
-     * @return void 
-     */
-    abstract function createCalendar($principalUri,$calendarUri,array $properties); 
-
-    /**
-     * Updates properties for a calendar.
-     *
-     * The mutations array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existant property is always succesful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname. 
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param string $calendarId
-     * @param array $mutations
-     * @return bool|array 
-     */
-    public function updateCalendar($calendarId, array $mutations) {
-        
-        return false; 
-
-    }
-
-    /**
-     * Delete a calendar and all it's objects 
-     * 
-     * @param string $calendarId 
-     * @return void
-     */
-    abstract function deleteCalendar($calendarId);
-
-    /**
-     * Returns all calendar objects within a calendar.
-     *
-     * Every item contains an array with the following keys:
-     *   * id - unique identifier which will be used for subsequent updates
-     *   * calendardata - The iCalendar-compatible calnedar data
-     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
-     *   * lastmodified - a timestamp of the last modification time
-     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.: 
-     *   '  "abcdef"')
-     *   * calendarid - The calendarid as it was passed to this function.
-     *
-     * Note that the etag is optional, but it's highly encouraged to return for 
-     * speed reasons.
-     *
-     * The calendardata is also optional. If it's not returned 
-     * 'getCalendarObject' will be called later, which *is* expected to return 
-     * calendardata.
-     * 
-     * @param string $calendarId 
-     * @return array 
-     */
-    abstract function getCalendarObjects($calendarId);
-
-    /**
-     * Returns information from a single calendar object, based on it's object
-     * uri.
-     *
-     * The returned array must have the same keys as getCalendarObjects. The 
-     * 'calendardata' object is required here though, while it's not required 
-     * for getCalendarObjects.
-     * 
-     * @param string $calendarId 
-     * @param string $objectUri 
-     * @return array 
-     */
-    abstract function getCalendarObject($calendarId,$objectUri);
-
-    /**
-     * Creates a new calendar object. 
-     * 
-     * @param string $calendarId 
-     * @param string $objectUri 
-     * @param string $calendarData 
-     * @return void
-     */
-    abstract function createCalendarObject($calendarId,$objectUri,$calendarData);
-
-    /**
-     * Updates an existing calendarobject, based on it's uri. 
-     * 
-     * @param string $calendarId 
-     * @param string $objectUri 
-     * @param string $calendarData 
-     * @return void
-     */
-    abstract function updateCalendarObject($calendarId,$objectUri,$calendarData);
-
-    /**
-     * Deletes an existing calendar object. 
-     * 
-     * @param string $calendarId 
-     * @param string $objectUri 
-     * @return void
-     */
-    abstract function deleteCalendarObject($calendarId,$objectUri);
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Backend/PDO.php b/3rdparty/Sabre/CalDAV/Backend/PDO.php
deleted file mode 100644
index 7b1b33b912e..00000000000
--- a/3rdparty/Sabre/CalDAV/Backend/PDO.php
+++ /dev/null
@@ -1,386 +0,0 @@
-<?php
-
-/**
- * PDO CalDAV backend
- *
- * This backend is used to store calendar-data in a PDO database, such as 
- * sqlite or MySQL
- * 
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
-
-    /**
-     * pdo 
-     * 
-     * @var PDO
-     */
-    protected $pdo;
-
-    /**
-     * The table name that will be used for calendars 
-     * 
-     * @var string 
-     */
-    protected $calendarTableName;
-
-    /**
-     * The table name that will be used for calendar objects  
-     * 
-     * @var string 
-     */
-    protected $calendarObjectTableName;
-
-    /**
-     * List of CalDAV properties, and how they map to database fieldnames
-     *
-     * Add your own properties by simply adding on to this array
-     * 
-     * @var array
-     */
-    public $propertyMap = array(
-        '{DAV:}displayname'                          => 'displayname',
-        '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description',
-        '{urn:ietf:params:xml:ns:caldav}calendar-timezone'    => 'timezone',
-        '{http://apple.com/ns/ical/}calendar-order'  => 'calendarorder',
-        '{http://apple.com/ns/ical/}calendar-color'  => 'calendarcolor',
-    );
-
-    /**
-     * Creates the backend 
-     * 
-     * @param PDO $pdo 
-     */
-    public function __construct(PDO $pdo, $calendarTableName = 'calendars', $calendarObjectTableName = 'calendarobjects') {
-
-        $this->pdo = $pdo;
-        $this->calendarTableName = $calendarTableName;
-        $this->calendarObjectTableName = $calendarObjectTableName;
-
-    }
-
-    /**
-     * Returns a list of calendars for a principal.
-     *
-     * Every project is an array with the following keys:
-     *  * id, a unique id that will be used by other functions to modify the
-     *    calendar. This can be the same as the uri or a database key.
-     *  * uri, which the basename of the uri with which the calendar is 
-     *    accessed.
-     *  * principalUri. The owner of the calendar. Almost always the same as
-     *    principalUri passed to this method.
-     *
-     * Furthermore it can contain webdav properties in clark notation. A very
-     * common one is '{DAV:}displayname'. 
-     *
-     * @param string $principalUri 
-     * @return array 
-     */
-    public function getCalendarsForUser($principalUri) {
-
-        $fields = array_values($this->propertyMap);
-        $fields[] = 'id';
-        $fields[] = 'uri';
-        $fields[] = 'ctag';
-        $fields[] = 'components';
-        $fields[] = 'principaluri';
-
-        // Making fields a comma-delimited list 
-        $fields = implode(', ', $fields);
-        $stmt = $this->pdo->prepare("SELECT " . $fields . " FROM `".$this->calendarTableName."` WHERE principaluri = ?"); 
-        $stmt->execute(array($principalUri));
-
-        $calendars = array();
-        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-            $components = explode(',',$row['components']);
-
-            $calendar = array(
-                'id' => $row['id'],
-                'uri' => $row['uri'],
-                'principaluri' => $row['principaluri'],
-                '{' . Sabre_CalDAV_Plugin::NS_CALENDARSERVER . '}getctag' => $row['ctag']?$row['ctag']:'0',
-                '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set' => new Sabre_CalDAV_Property_SupportedCalendarComponentSet($components),
-            );
-        
-
-            foreach($this->propertyMap as $xmlName=>$dbName) {
-                $calendar[$xmlName] = $row[$dbName];
-            }
-
-            $calendars[] = $calendar;
-
-        }
-
-        return $calendars;
-
-    }
-
-    /**
-     * Creates a new calendar for a principal.
-     *
-     * If the creation was a success, an id must be returned that can be used to reference
-     * this calendar in other methods, such as updateCalendar
-     *
-     * @param string $principalUri
-     * @param string $calendarUri
-     * @param array $properties
-     */
-    public function createCalendar($principalUri,$calendarUri, array $properties) {
-
-        $fieldNames = array(
-            'principaluri',
-            'uri',
-            'ctag',
-        );
-        $values = array(
-            ':principaluri' => $principalUri,
-            ':uri'          => $calendarUri,
-            ':ctag'         => 1,
-        );
-
-        // Default value
-        $sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
-        $fieldNames[] = 'components';
-        if (!isset($properties[$sccs])) {
-            $values[':components'] = 'VEVENT,VTODO';
-        } else {
-            if (!($properties[$sccs] instanceof Sabre_CalDAV_Property_SupportedCalendarComponentSet)) {
-                throw new Sabre_DAV_Exception('The ' . $sccs . ' property must be of type: Sabre_CalDAV_Property_SupportedCalendarComponentSet');
-            }
-            $values[':components'] = implode(',',$properties[$sccs]->getValue());
-        }
-
-        foreach($this->propertyMap as $xmlName=>$dbName) {
-            if (isset($properties[$xmlName])) {
-
-                $myValue = $properties[$xmlName];
-                $values[':' . $dbName] = $properties[$xmlName];
-                $fieldNames[] = $dbName;
-            }
-        }
-
-        $stmt = $this->pdo->prepare("INSERT INTO `".$this->calendarTableName."` (".implode(', ', $fieldNames).") VALUES (".implode(', ',array_keys($values)).")");
-        $stmt->execute($values);
-
-        return $this->pdo->lastInsertId();
-
-    }
-
-    /**
-     * Updates properties for a calendar.
-     *
-     * The mutations array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existant property is always succesful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname. 
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param string $calendarId
-     * @param array $mutations 
-     * @return bool|array 
-     */
-    public function updateCalendar($calendarId, array $mutations) {
-
-        $newValues = array();
-        $result = array(
-            200 => array(), // Ok
-            403 => array(), // Forbidden
-            424 => array(), // Failed Dependency
-        );
-
-        $hasError = false;
-
-        foreach($mutations as $propertyName=>$propertyValue) {
-
-            // We don't know about this property. 
-            if (!isset($this->propertyMap[$propertyName])) {
-                $hasError = true;
-                $result[403][$propertyName] = null;
-                unset($mutations[$propertyName]);
-                continue;
-            }
-
-            $fieldName = $this->propertyMap[$propertyName];
-            $newValues[$fieldName] = $propertyValue;
-                
-        }
-
-        // If there were any errors we need to fail the request
-        if ($hasError) {
-            // Properties has the remaining properties
-            foreach($mutations as $propertyName=>$propertyValue) {
-                $result[424][$propertyName] = null;
-            }
-
-            // Removing unused statuscodes for cleanliness
-            foreach($result as $status=>$properties) {
-                if (is_array($properties) && count($properties)===0) unset($result[$status]);
-            }
-
-            return $result;
-
-        }
-
-        // Success
-
-        // Now we're generating the sql query.
-        $valuesSql = array();
-        foreach($newValues as $fieldName=>$value) {
-            $valuesSql[] = $fieldName . ' = ?';
-        }
-        $valuesSql[] = 'ctag = ctag + 1';
-
-        $stmt = $this->pdo->prepare("UPDATE `" . $this->calendarTableName . "` SET " . implode(', ',$valuesSql) . " WHERE id = ?");
-        $newValues['id'] = $calendarId; 
-        $stmt->execute(array_values($newValues));
-
-        return true; 
-
-    }
-
-    /**
-     * Delete a calendar and all it's objects 
-     * 
-     * @param string $calendarId 
-     * @return void
-     */
-    public function deleteCalendar($calendarId) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM `'.$this->calendarObjectTableName.'` WHERE calendarid = ?');
-        $stmt->execute(array($calendarId));
-
-        $stmt = $this->pdo->prepare('DELETE FROM `'.$this->calendarTableName.'` WHERE id = ?');
-        $stmt->execute(array($calendarId));
-
-    }
-
-    /**
-     * Returns all calendar objects within a calendar. 
-     *
-     * Every item contains an array with the following keys:
-     *   * id - unique identifier which will be used for subsequent updates
-     *   * calendardata - The iCalendar-compatible calnedar data
-     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
-     *   * lastmodified - a timestamp of the last modification time
-     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.: 
-     *   '  "abcdef"')
-     *   * calendarid - The calendarid as it was passed to this function.
-     *
-     * Note that the etag is optional, but it's highly encouraged to return for 
-     * speed reasons.
-     *
-     * The calendardata is also optional. If it's not returned 
-     * 'getCalendarObject' will be called later, which *is* expected to return 
-     * calendardata.
-     * 
-     * @param string $calendarId 
-     * @return array 
-     */
-    public function getCalendarObjects($calendarId) {
-
-        $stmt = $this->pdo->prepare('SELECT * FROM `'.$this->calendarObjectTableName.'` WHERE calendarid = ?');
-        $stmt->execute(array($calendarId));
-        return $stmt->fetchAll();
-
-    }
-
-    /**
-     * Returns information from a single calendar object, based on it's object
-     * uri.
-     *
-     * The returned array must have the same keys as getCalendarObjects. The 
-     * 'calendardata' object is required here though, while it's not required 
-     * for getCalendarObjects.
-     * 
-     * @param string $calendarId 
-     * @param string $objectUri 
-     * @return array 
-     */
-    public function getCalendarObject($calendarId,$objectUri) {
-
-        $stmt = $this->pdo->prepare('SELECT * FROM `'.$this->calendarObjectTableName.'` WHERE calendarid = ? AND uri = ?');
-        $stmt->execute(array($calendarId, $objectUri));
-        return $stmt->fetch();
-
-    }
-
-    /**
-     * Creates a new calendar object. 
-     * 
-     * @param string $calendarId 
-     * @param string $objectUri 
-     * @param string $calendarData 
-     * @return void
-     */
-    public function createCalendarObject($calendarId,$objectUri,$calendarData) {
-
-        $stmt = $this->pdo->prepare('INSERT INTO `'.$this->calendarObjectTableName.'` (calendarid, uri, calendardata, lastmodified) VALUES (?,?,?,?)');
-        $stmt->execute(array($calendarId,$objectUri,$calendarData,time()));
-        $stmt = $this->pdo->prepare('UPDATE `'.$this->calendarTableName.'` SET ctag = ctag + 1 WHERE id = ?');
-        $stmt->execute(array($calendarId));
-
-    }
-
-    /**
-     * Updates an existing calendarobject, based on it's uri. 
-     * 
-     * @param string $calendarId 
-     * @param string $objectUri 
-     * @param string $calendarData 
-     * @return void
-     */
-    public function updateCalendarObject($calendarId,$objectUri,$calendarData) {
-
-        $stmt = $this->pdo->prepare('UPDATE `'.$this->calendarObjectTableName.'` SET calendardata = ?, lastmodified = ? WHERE calendarid = ? AND uri = ?');
-        $stmt->execute(array($calendarData,time(),$calendarId,$objectUri));
-        $stmt = $this->pdo->prepare('UPDATE `'.$this->calendarTableName.'` SET ctag = ctag + 1 WHERE id = ?');
-        $stmt->execute(array($calendarId));
-
-    }
-
-    /**
-     * Deletes an existing calendar object. 
-     * 
-     * @param string $calendarId 
-     * @param string $objectUri 
-     * @return void
-     */
-    public function deleteCalendarObject($calendarId,$objectUri) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM `'.$this->calendarObjectTableName.'` WHERE calendarid = ? AND uri = ?');
-        $stmt->execute(array($calendarId,$objectUri));
-        $stmt = $this->pdo->prepare('UPDATE `'. $this->calendarTableName .'` SET ctag = ctag + 1 WHERE id = ?');
-        $stmt->execute(array($calendarId));
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Calendar.php b/3rdparty/Sabre/CalDAV/Calendar.php
deleted file mode 100644
index 0d2b3875771..00000000000
--- a/3rdparty/Sabre/CalDAV/Calendar.php
+++ /dev/null
@@ -1,318 +0,0 @@
-<?php
-
-/**
- * This object represents a CalDAV calendar.
- *
- * A calendar can contain multiple TODO and or Events. These are represented
- * as Sabre_CalDAV_CalendarObject objects.
- * 
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
-
-    /**
-     * This is an array with calendar information 
-     * 
-     * @var array 
-     */
-    protected $calendarInfo;
-
-    /**
-     * CalDAV backend 
-     * 
-     * @var Sabre_CalDAV_Backend_Abstract 
-     */
-    protected $caldavBackend;
-
-    /**
-     * Principal backend
-     * 
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * Constructor 
-     * 
-     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend 
-     * @param array $calendarInfo 
-     * @return void
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, Sabre_CalDAV_Backend_Abstract $caldavBackend, $calendarInfo) {
-
-        $this->caldavBackend = $caldavBackend;
-        $this->principalBackend = $principalBackend;
-        $this->calendarInfo = $calendarInfo;
-
-
-    }
-
-    /**
-     * Returns the name of the calendar 
-     * 
-     * @return string 
-     */
-    public function getName() {
-
-        return $this->calendarInfo['uri'];
-
-    }
-
-    /**
-     * Updates properties such as the display name and description 
-     * 
-     * @param array $mutations 
-     * @return array 
-     */
-    public function updateProperties($mutations) {
-
-        return $this->caldavBackend->updateCalendar($this->calendarInfo['id'],$mutations);
-
-    }
-
-    /**
-     * Returns the list of properties 
-     * 
-     * @param array $properties 
-     * @return array 
-     */
-    public function getProperties($requestedProperties) {
-
-        $response = array();
-
-        foreach($requestedProperties as $prop) switch($prop) {
-
-            case '{urn:ietf:params:xml:ns:caldav}supported-calendar-data' : 
-                $response[$prop] = new Sabre_CalDAV_Property_SupportedCalendarData(); 
-                break;
-            case '{urn:ietf:params:xml:ns:caldav}supported-collation-set' : 
-                $response[$prop] =  new Sabre_CalDAV_Property_SupportedCollationSet(); 
-                break;
-            case '{DAV:}owner' :
-                $response[$prop] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::HREF,$this->calendarInfo['principaluri']);
-                break;
-            default : 
-                if (isset($this->calendarInfo[$prop])) $response[$prop] = $this->calendarInfo[$prop];
-                break;
-
-        }
-        return $response;
-
-    }
-
-    /**
-     * Returns a calendar object
-     *
-     * The contained calendar objects are for example Events or Todo's.
-     * 
-     * @param string $name 
-     * @return Sabre_DAV_ICalendarObject 
-     */
-    public function getChild($name) {
-
-        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
-        if (!$obj) throw new Sabre_DAV_Exception_FileNotFound('Calendar object not found');
-        return new Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
-
-    }
-
-    /**
-     * Returns the full list of calendar objects  
-     * 
-     * @return array 
-     */
-    public function getChildren() {
-
-        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
-        $children = array();
-        foreach($objs as $obj) {
-            $children[] = new Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
-        }
-        return $children;
-
-    }
-
-    /**
-     * Checks if a child-node exists. 
-     * 
-     * @param string $name 
-     * @return bool 
-     */
-    public function childExists($name) {
-
-        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
-        if (!$obj) 
-            return false;
-        else 
-            return true;
-
-    }
-
-    /**
-     * Creates a new directory
-     *
-     * We actually block this, as subdirectories are not allowed in calendars.
-     * 
-     * @param string $name 
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating collections in calendar objects is not allowed');
-
-    }
-
-    /**
-     * Creates a new file
-     *
-     * The contents of the new file must be a valid ICalendar string.
-     * 
-     * @param string $name 
-     * @param resource $calendarData 
-     * @return void
-     */
-    public function createFile($name,$calendarData = null) {
-
-        $calendarData = stream_get_contents($calendarData);
-        // Converting to UTF-8, if needed
-        $calendarData = Sabre_DAV_StringUtil::ensureUTF8($calendarData);
-
-        $supportedComponents = $this->calendarInfo['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set'];
-        if ($supportedComponents) {
-            $supportedComponents = $supportedComponents->getValue();
-        } else {
-            $supportedComponents = null;
-        }
-        Sabre_CalDAV_ICalendarUtil::validateICalendarObject($calendarData, $supportedComponents);
-
-        $this->caldavBackend->createCalendarObject($this->calendarInfo['id'],$name,$calendarData);
-
-    }
-
-    /**
-     * Deletes the calendar. 
-     * 
-     * @return void
-     */
-    public function delete() {
-
-        $this->caldavBackend->deleteCalendar($this->calendarInfo['id']);
-
-    }
-
-    /**
-     * Renames the calendar. Note that most calendars use the 
-     * {DAV:}displayname to display a name to display a name. 
-     * 
-     * @param string $newName 
-     * @return void
-     */
-    public function setName($newName) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Renaming calendars is not yet supported');
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp.
-     * 
-     * @return void
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner 
-     * 
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->calendarInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     * 
-     * @return string|null 
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to 
-     *      be updated. 
-     * 
-     * @return array 
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's. 
-     * 
-     * @param array $acl 
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-
-
-}
diff --git a/3rdparty/Sabre/CalDAV/CalendarObject.php b/3rdparty/Sabre/CalDAV/CalendarObject.php
deleted file mode 100644
index 0c99f18deb7..00000000000
--- a/3rdparty/Sabre/CalDAV/CalendarObject.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-
-/**
- * The CalendarObject represents a single VEVENT or VTODO within a Calendar. 
- * 
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_CalendarObject extends Sabre_DAV_File implements Sabre_CalDAV_ICalendarObject, Sabre_DAVACL_IACL {
-
-    /**
-     * Sabre_CalDAV_Backend_Abstract 
-     * 
-     * @var array 
-     */
-    protected $caldavBackend;
-
-    /**
-     * Array with information about this CalendarObject 
-     * 
-     * @var array 
-     */
-    protected $objectData;
-
-    /**
-     * Array with information about the containing calendar
-     * 
-     * @var array 
-     */
-    protected $calendarInfo;
-
-    /**
-     * Constructor 
-     * 
-     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
-     * @param array $calendarInfo
-     * @param array $objectData 
-     */
-    public function __construct(Sabre_CalDAV_Backend_Abstract $caldavBackend,array $calendarInfo,array $objectData) {
-
-        $this->caldavBackend = $caldavBackend;
-
-        if (!isset($objectData['calendarid'])) {
-            throw new InvalidArgumentException('The objectData argument must contain a \'calendarid\' property');
-        }
-        if (!isset($objectData['uri'])) {
-            throw new InvalidArgumentException('The objectData argument must contain an \'uri\' property');
-        }
-
-        $this->calendarInfo = $calendarInfo;
-        $this->objectData = $objectData;
-
-    }
-
-    /**
-     * Returns the uri for this object 
-     * 
-     * @return string 
-     */
-    public function getName() {
-
-        return $this->objectData['uri'];
-
-    }
-
-    /**
-     * Returns the ICalendar-formatted object 
-     * 
-     * @return string 
-     */
-    public function get() {
-
-        // Pre-populating the 'calendardata' is optional, if we don't have it
-        // already we fetch it from the backend.
-        if (!isset($this->objectData['calendardata'])) {
-            $this->objectData = $this->caldavBackend->getCalendarObject($this->objectData['calendarid'], $this->objectData['uri']);
-        }
-        return $this->objectData['calendardata'];
-
-    }
-
-    /**
-     * Updates the ICalendar-formatted object 
-     * 
-     * @param string $calendarData 
-     * @return void 
-     */
-    public function put($calendarData) {
-
-        if (is_resource($calendarData))
-            $calendarData = stream_get_contents($calendarData);
-
-        // Converting to UTF-8, if needed
-        $calendarData = Sabre_DAV_StringUtil::ensureUTF8($calendarData);
-
-        $supportedComponents = $this->calendarInfo['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set'];
-        if ($supportedComponents) {
-            $supportedComponents = $supportedComponents->getValue();
-        } else {
-            $supportedComponents = null;
-        }
-        Sabre_CalDAV_ICalendarUtil::validateICalendarObject($calendarData, $supportedComponents);
-
-        $this->caldavBackend->updateCalendarObject($this->calendarInfo['id'],$this->objectData['uri'],$calendarData);
-        $this->objectData['calendardata'] = $calendarData;
-
-    }
-
-    /**
-     * Deletes the calendar object 
-     * 
-     * @return void
-     */
-    public function delete() {
-
-        $this->caldavBackend->deleteCalendarObject($this->calendarInfo['id'],$this->objectData['uri']);
-
-    }
-
-    /**
-     * Returns the mime content-type 
-     * 
-     * @return string 
-     */
-    public function getContentType() {
-
-        return 'text/calendar';
-
-    }
-
-    /**
-     * Returns an ETag for this object.
-     *
-     * The ETag is an arbritrary string, but MUST be surrounded by double-quotes.
-     * 
-     * @return string 
-     */
-    public function getETag() {
-
-        if (isset($this->objectData['etag'])) {
-            return $this->objectData['etag'];
-        } else {
-            return '"' . md5($this->get()). '"';
-        }
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp
-     * 
-     * @return time 
-     */
-    public function getLastModified() {
-
-        return $this->objectData['lastmodified'];
-
-    }
-
-    /**
-     * Returns the size of this object in bytes 
-     * 
-     * @return int
-     */
-    public function getSize() {
-
-        return strlen($this->objectData['calendardata']);
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner 
-     * 
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->calendarInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     * 
-     * @return string|null 
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to 
-     *      be updated. 
-     * 
-     * @return array 
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's. 
-     * 
-     * @param array $acl 
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-
-}
-
diff --git a/3rdparty/Sabre/CalDAV/CalendarRootNode.php b/3rdparty/Sabre/CalDAV/CalendarRootNode.php
deleted file mode 100644
index 69669a9d7fd..00000000000
--- a/3rdparty/Sabre/CalDAV/CalendarRootNode.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * Users collection 
- *
- * This object is responsible for generating a collection of users.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_CalendarRootNode extends Sabre_DAVACL_AbstractPrincipalCollection {
-
-    /**
-     * CalDAV backend 
-     * 
-     * @var Sabre_CalDAV_Backend_Abstract 
-     */
-    protected $caldavBackend;
-
-    /**
-     * Constructor 
-     *
-     * This constructor needs both an authentication and a caldav backend.
-     *
-     * By default this class will show a list of calendar collections for 
-     * principals in the 'principals' collection. If your main principals are 
-     * actually located in a different path, use the $principalPrefix argument 
-     * to override this.
-     *
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend 
-     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend 
-     * @param string $principalPrefix
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend,Sabre_CalDAV_Backend_Abstract $caldavBackend, $principalPrefix = 'principals') {
-
-        parent::__construct($principalBackend, $principalPrefix);
-        $this->caldavBackend = $caldavBackend;
-
-    }
-
-    /**
-     * Returns the nodename
-     *
-     * We're overriding this, because the default will be the 'principalPrefix',
-     * and we want it to be Sabre_CalDAV_Plugin::CALENDAR_ROOT 
-     * 
-     * @return void
-     */
-    public function getName() {
-
-        return Sabre_CalDAV_Plugin::CALENDAR_ROOT;
-
-    }
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     * 
-     * @param array $principal 
-     * @return Sabre_DAV_INode 
-     */
-    public function getChildForPrincipal(array $principal) {
-
-        return new Sabre_CalDAV_UserCalendars($this->principalBackend, $this->caldavBackend, $principal['uri']);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Exception/InvalidICalendarObject.php b/3rdparty/Sabre/CalDAV/Exception/InvalidICalendarObject.php
deleted file mode 100644
index 656b7286a66..00000000000
--- a/3rdparty/Sabre/CalDAV/Exception/InvalidICalendarObject.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * InvalidICalendarObject
- *
- * This exception is thrown when an attempt is made to create or update
- * an invalid ICalendar object
- * 
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Exception_InvalidICalendarObject extends Sabre_DAV_Exception_PreconditionFailed {
-
-
-}
diff --git a/3rdparty/Sabre/CalDAV/ICSExportPlugin.php b/3rdparty/Sabre/CalDAV/ICSExportPlugin.php
deleted file mode 100644
index 4e2c6eb93d2..00000000000
--- a/3rdparty/Sabre/CalDAV/ICSExportPlugin.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-/**
- * ICS Exporter
- *
- * This plugin adds the ability to export entire calendars as .ics files.
- * This is useful for clients that don't support CalDAV yet. They often do 
- * support ics files.
- * 
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_ICSExportPlugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * Reference to Server class 
-     * 
-     * @var Sabre_DAV_Server 
-     */
-    private $server;
-
-    /**
-     * Initializes the plugin and registers event handlers 
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
-
-    }
-
-    /**
-     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
-     * with ?export
-     * 
-     * @param string $method
-     * @param string $uri
-     * @return void
-     */
-    public function beforeMethod($method, $uri) {
-
-        if ($method!='GET') return;
-        if ($this->server->httpRequest->getQueryString()!='export') return;
-
-        // splitting uri
-        list($uri) = explode('?',$uri,2);
-
-        $node = $this->server->tree->getNodeForPath($uri);
-
-        if (!($node instanceof Sabre_CalDAV_Calendar)) return;
-
-        $this->server->httpResponse->setHeader('Content-Type','text/calendar');
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->sendBody($this->generateICS($this->server->tree->getChildren($uri)));
-
-        // Returning false to break the event chain
-        return false;
-
-    }
-
-    /**
-     * Merges all calendar objects, and builds one big ics export 
-     * 
-     * @param array $nodes 
-     * @return void
-     */
-    public function generateICS(array $nodes) {
-
-        $calendar = new Sabre_VObject_Component('vcalendar');
-        $calendar->version = '2.0';
-        $calendar->prodid = '-//SabreDAV//SabreDAV ' . Sabre_DAV_Version::VERSION . '//EN';
-        $calendar->calscale = 'GREGORIAN';
-
-        $collectedTimezones = array();
-
-        $timezones = array();
-        $objects = array();
-
-        foreach($nodes as $node) {
-
-            $nodeData = $node->get();
-            $nodeComp = Sabre_VObject_Reader::read($nodeData);
-
-            foreach($nodeComp->children() as $child) {
-
-                switch($child->name) {
-                    case 'VEVENT' :
-                    case 'VTODO' :
-                    case 'VJOURNAL' :
-                        $objects[] = $child;
-                        break;
-
-                    // VTIMEZONE is special, because we need to filter out the duplicates
-                    case 'VTIMEZONE' :
-                        // Naively just checking tzid.
-                        if (in_array((string)$child->TZID, $collectedTimezones)) continue;
-
-                        $timezones[] = $child;
-                        $collectedTimezones[] = $child->TZID;
-                        break;
-
-
-                }
-
-
-            }
-
-
-        }
-
-        foreach($timezones as $tz) $calendar->add($tz);
-        foreach($objects as $obj) $calendar->add($obj);
-
-        return $calendar->serialize();
-
-    } 
-
-}
diff --git a/3rdparty/Sabre/CalDAV/ICalendar.php b/3rdparty/Sabre/CalDAV/ICalendar.php
deleted file mode 100644
index 8193dff3a83..00000000000
--- a/3rdparty/Sabre/CalDAV/ICalendar.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Calendar interface
- *
- * Implement this interface to allow a node to be recognized as an calendar.
- * 
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CalDAV_ICalendar extends Sabre_DAV_ICollection {
-
- 
-
-}
diff --git a/3rdparty/Sabre/CalDAV/ICalendarObject.php b/3rdparty/Sabre/CalDAV/ICalendarObject.php
deleted file mode 100644
index 708300ad7bd..00000000000
--- a/3rdparty/Sabre/CalDAV/ICalendarObject.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * CalendarObject interface 
-/**
- * Extend the ICalendarObject interface to allow your custom nodes to be picked up as 
- * CalendarObjects.
- *
- * Calendar objects are resources such as Events, Todo's or Journals.
- * 
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CalDAV_ICalendarObject extends Sabre_DAV_IFile { 
-
-}
-
diff --git a/3rdparty/Sabre/CalDAV/ICalendarUtil.php b/3rdparty/Sabre/CalDAV/ICalendarUtil.php
deleted file mode 100644
index 699abfdd6f5..00000000000
--- a/3rdparty/Sabre/CalDAV/ICalendarUtil.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/**
- * This class contains several utilities related to the ICalendar (rfc2445) format
- *
- * This class is now deprecated, and won't be further maintained. Please use 
- * the Sabre_VObject package for your ics parsing needs.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- * @deprecated Use Sabre_VObject instead.
- */
-class Sabre_CalDAV_ICalendarUtil {
-
-    /**
-     * Validates an ICalendar object
-     *
-     * This method makes sure this ICalendar object is properly formatted.
-     * If we can't parse it, we'll throw exceptions.
-     *
-     * @param string $icalData 
-     * @param array $allowedComponents 
-     * @return bool 
-     */
-    static function validateICalendarObject($icalData, array $allowedComponents = null) {
-
-        $xcal = simplexml_load_string(self::toXCal($icalData));
-        if (!$xcal) throw new Sabre_CalDAV_Exception_InvalidICalendarObject('Invalid calendarobject format');
-
-        $xcal->registerXPathNameSpace('cal','urn:ietf:params:xml:ns:xcal');
-        
-        // Check if there's only 1 component
-        $components = array('vevent','vtodo','vjournal','vfreebusy');
-        $componentsFound = array();
-
-        foreach($components as $component) {
-            $test = $xcal->xpath('/cal:iCalendar/cal:vcalendar/cal:' . $component);
-            if (is_array($test)) $componentsFound = array_merge($componentsFound, $test);
-        }
-        if (count($componentsFound)<1) {
-            throw new Sabre_CalDAV_Exception_InvalidICalendarObject('One VEVENT, VTODO, VJOURNAL or VFREEBUSY must be specified. 0 found.');
-        }
-        $component = $componentsFound[0];
-
-        if (is_null($allowedComponents)) return true;
-
-        // Check if the component is allowed
-        $name = $component->getName();
-        if (!in_array(strtoupper($name),$allowedComponents)) {
-            throw new Sabre_CalDAV_Exception_InvalidICalendarObject(strtoupper($name) . ' is not allowed in this calendar.');
-        }
-
-        if (count($xcal->xpath('/cal:iCalendar/cal:vcalendar/cal:method'))>0) {
-            throw new Sabre_CalDAV_Exception_InvalidICalendarObject('The METHOD property is not allowed in calendar objects');
-        }
-
-        return true;
-
-    }
-
-    /**
-     * Converts ICalendar data to XML.
-     *
-     * Properties are converted to lowercase xml elements. Parameters are;
-     * converted to attributes. BEGIN:VEVENT is converted to <vevent> and
-     * END:VEVENT </vevent> as well as other components.
-     *
-     * It's a very loose parser. If any line does not conform to the spec, it
-     * will simply be ignored. It will try to detect if \r\n or \n line endings
-     * are used.
-     *
-     * @todo Currently quoted attributes are not parsed correctly.
-     * @see http://tools.ietf.org/html/draft-royer-calsch-xcal-03
-     * @param string $icalData 
-     * @return string. 
-     */
-    static function toXCAL($icalData) {
-
-        // Detecting line endings
-        $lb="\r\n";
-        if (strpos($icalData,"\r\n")!==false) $lb = "\r\n";
-        elseif (strpos($icalData,"\n")!==false) $lb = "\n";
-
-        // Splitting up items per line
-        $lines = explode($lb,$icalData);
-
-        // Properties can be folded over 2 lines. In this case the second
-        // line will be preceeded by a space or tab.
-        $lines2 = array();
-        foreach($lines as $line) {
-
-            if (!$line) continue;
-            if ($line[0]===" " || $line[0]==="\t") {
-                $lines2[count($lines2)-1].=substr($line,1);
-                continue;
-            }
-
-            $lines2[]=$line;
-
-        }
-
-        $xml = '<?xml version="1.0"?>' . "\n";
-        $xml.= "<iCalendar xmlns=\"urn:ietf:params:xml:ns:xcal\">\n";
-
-        $spaces = 2;
-        foreach($lines2 as $line) {
-
-            $matches = array();
-            // This matches PROPERTYNAME;ATTRIBUTES:VALUE
-            if (!preg_match('/^([^:^;]*)(?:;([^:]*))?:(.*)$/',$line,$matches))
-                continue;
-
-            $propertyName = strtolower($matches[1]);
-            $attributes = $matches[2];
-            $value = $matches[3];
-
-            // If the line was in the format BEGIN:COMPONENT or END:COMPONENT, we need to special case it.
-            if ($propertyName === 'begin') {
-                $xml.=str_repeat(" ",$spaces);
-                $xml.='<' . strtolower($value) . ">\n";
-                $spaces+=2;
-                continue;
-            } elseif ($propertyName === 'end') {
-                $spaces-=2;
-                $xml.=str_repeat(" ",$spaces);
-                $xml.='</' . strtolower($value) . ">\n";
-                continue;
-            }
-
-            $xml.=str_repeat(" ",$spaces);
-            $xml.='<' . $propertyName;
-            if ($attributes) {
-                // There can be multiple attributes
-                $attributes = explode(';',$attributes);
-                foreach($attributes as $att) {
-  
-                    list($attName,$attValue) = explode('=',$att,2);
-                    $attName = strtolower($attName);
-                    if ($attName === 'language') $attName='xml:lang';
-                    $xml.=' ' . $attName . '="' . htmlspecialchars($attValue) . '"';
-
-                }
-            }
-
-            $xml.='>'. htmlspecialchars(trim($value)) . '</' . $propertyName . ">\n";
-          
-        }
-        $xml.="</iCalendar>";
-        return $xml;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/CalDAV/Plugin.php b/3rdparty/Sabre/CalDAV/Plugin.php
deleted file mode 100644
index 02747c8395e..00000000000
--- a/3rdparty/Sabre/CalDAV/Plugin.php
+++ /dev/null
@@ -1,788 +0,0 @@
-<?php
-
-/**
- * CalDAV plugin
- *
- * This plugin provides functionality added by CalDAV (RFC 4791)
- * It implements new reports, and the MKCALENDAR method.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * This is the official CalDAV namespace
-     */
-    const NS_CALDAV = 'urn:ietf:params:xml:ns:caldav';
-    
-    /**
-     * This is the namespace for the proprietary calendarserver extensions
-     */
-    const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
-
-    /**
-     * The following constants are used to differentiate
-     * the various filters for the calendar-query report
-     */
-    const FILTER_COMPFILTER   = 1;
-    const FILTER_TIMERANGE    = 3;
-    const FILTER_PROPFILTER   = 4;
-    const FILTER_PARAMFILTER  = 5;
-    const FILTER_TEXTMATCH    = 6;
-
-    /**
-     * The hardcoded root for calendar objects. It is unfortunate
-     * that we're stuck with it, but it will have to do for now
-     */
-    const CALENDAR_ROOT = 'calendars';
-
-    /**
-     * Reference to server object 
-     * 
-     * @var Sabre_DAV_Server 
-     */
-    private $server;
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are 
-     * available for the specified uri.
-     *
-     * @param string $uri
-     * @return array 
-     */
-    public function getHTTPMethods($uri) {
-
-        // The MKCALENDAR is only available on unmapped uri's, whose
-        // parents extend IExtendedCollection
-        list($parent, $name) = Sabre_DAV_URLUtil::splitPath($uri);
-
-        $node = $this->server->tree->getNodeForPath($parent);
-
-        if ($node instanceof Sabre_DAV_IExtendedCollection) {
-            try {
-                $node->getChild($name);
-            } catch (Sabre_DAV_Exception_FileNotFound $e) {
-                return array('MKCALENDAR');
-            }
-        }
-        return array();
-
-    }
-
-    /**
-     * Returns a list of features for the DAV: HTTP header. 
-     * 
-     * @return array 
-     */
-    public function getFeatures() {
-
-        return array('calendar-access', 'calendar-proxy');
-
-    }
-
-    /**
-     * Returns a plugin name.
-     * 
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre_DAV_Server::getPlugin 
-     * 
-     * @return string 
-     */
-    public function getPluginName() {
-
-        return 'caldav';
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually 
-     * implement them 
-     * 
-     * @param string $uri
-     * @return array 
-     */
-    public function getSupportedReportSet($uri) {
-
-        $node = $this->server->tree->getNodeForPath($uri);
-        if ($node instanceof Sabre_CalDAV_ICalendar || $node instanceof Sabre_CalDAV_ICalendarObject) {
-            return array(
-                 '{' . self::NS_CALDAV . '}calendar-multiget',
-                 '{' . self::NS_CALDAV . '}calendar-query',
-            );
-        }
-        return array();
-
-    }
-
-    /**
-     * Initializes the plugin 
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
-        //$server->subscribeEvent('unknownMethod',array($this,'unknownMethod2'),1000);
-        $server->subscribeEvent('report',array($this,'report'));
-        $server->subscribeEvent('beforeGetProperties',array($this,'beforeGetProperties'));
-
-        $server->xmlNamespaces[self::NS_CALDAV] = 'cal';
-        $server->xmlNamespaces[self::NS_CALENDARSERVER] = 'cs';
-
-        $server->propertyMap['{' . self::NS_CALDAV . '}supported-calendar-component-set'] = 'Sabre_CalDAV_Property_SupportedCalendarComponentSet';
-
-        $server->resourceTypeMapping['Sabre_CalDAV_ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
-        $server->resourceTypeMapping['Sabre_CalDAV_Principal_ProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
-        $server->resourceTypeMapping['Sabre_CalDAV_Principal_ProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
-
-        array_push($server->protectedProperties,
-
-            '{' . self::NS_CALDAV . '}supported-calendar-component-set',
-            '{' . self::NS_CALDAV . '}supported-calendar-data',
-            '{' . self::NS_CALDAV . '}max-resource-size',
-            '{' . self::NS_CALDAV . '}min-date-time',
-            '{' . self::NS_CALDAV . '}max-date-time',
-            '{' . self::NS_CALDAV . '}max-instances',
-            '{' . self::NS_CALDAV . '}max-attendees-per-instance',
-            '{' . self::NS_CALDAV . '}calendar-home-set',
-            '{' . self::NS_CALDAV . '}supported-collation-set',
-            '{' . self::NS_CALDAV . '}calendar-data',
-
-            // scheduling extension
-            '{' . self::NS_CALDAV . '}calendar-user-address-set',
-
-            // CalendarServer extensions
-            '{' . self::NS_CALENDARSERVER . '}getctag',
-            '{' . self::NS_CALENDARSERVER . '}calendar-proxy-read-for',
-            '{' . self::NS_CALENDARSERVER . '}calendar-proxy-write-for'
-
-        );
-    }
-
-    /**
-     * This function handles support for the MKCALENDAR method
-     * 
-     * @param string $method 
-     * @return bool 
-     */
-    public function unknownMethod($method, $uri) {
-
-        if ($method!=='MKCALENDAR') return;
-
-        $this->httpMkCalendar($uri);
-        // false is returned to stop the unknownMethod event
-        return false;
-
-    }
-
-    /**
-     * This functions handles REPORT requests specific to CalDAV 
-     * 
-     * @param string $reportName 
-     * @param DOMNode $dom 
-     * @return bool 
-     */
-    public function report($reportName,$dom) {
-
-        switch($reportName) { 
-            case '{'.self::NS_CALDAV.'}calendar-multiget' :
-                $this->calendarMultiGetReport($dom);
-                return false;
-            case '{'.self::NS_CALDAV.'}calendar-query' :
-                $this->calendarQueryReport($dom);
-                return false;
-
-        }
-
-
-    }
-
-    /**
-     * This function handles the MKCALENDAR HTTP method, which creates
-     * a new calendar.
-     * 
-     * @param string $uri
-     * @return void 
-     */
-    public function httpMkCalendar($uri) {
-
-        // Due to unforgivable bugs in iCal, we're completely disabling MKCALENDAR support
-        // for clients matching iCal in the user agent
-        //$ua = $this->server->httpRequest->getHeader('User-Agent');
-        //if (strpos($ua,'iCal/')!==false) {
-        //    throw new Sabre_DAV_Exception_Forbidden('iCal has major bugs in it\'s RFC3744 support. Therefore we are left with no other choice but disabling this feature.');
-        //}
-
-        $body = $this->server->httpRequest->getBody(true);
-        $properties = array();
-
-        if ($body) {
-
-            $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
-
-            foreach($dom->firstChild->childNodes as $child) {
-
-                if (Sabre_DAV_XMLUtil::toClarkNotation($child)!=='{DAV:}set') continue;
-                foreach(Sabre_DAV_XMLUtil::parseProperties($child,$this->server->propertyMap) as $k=>$prop) {
-                    $properties[$k] = $prop;
-                }
-            
-            }
-        }
-
-        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:caldav}calendar');
-
-        $this->server->createCollection($uri,$resourceType,$properties);
-
-        $this->server->httpResponse->sendStatus(201);
-        $this->server->httpResponse->setHeader('Content-Length',0);
-    }
-
-    /**
-     * beforeGetProperties
-     *
-     * This method handler is invoked before any after properties for a
-     * resource are fetched. This allows us to add in any CalDAV specific 
-     * properties. 
-     * 
-     * @param string $path
-     * @param Sabre_DAV_INode $node
-     * @param array $requestedProperties
-     * @param array $returnedProperties
-     * @return void
-     */
-    public function beforeGetProperties($path, Sabre_DAV_INode $node, &$requestedProperties, &$returnedProperties) {
-
-        if ($node instanceof Sabre_DAVACL_IPrincipal) {
-
-            // calendar-home-set property
-            $calHome = '{' . self::NS_CALDAV . '}calendar-home-set';
-            if (in_array($calHome,$requestedProperties)) {
-                $principalId = $node->getName(); 
-                $calendarHomePath = self::CALENDAR_ROOT . '/' . $principalId . '/';
-                unset($requestedProperties[$calHome]);
-                $returnedProperties[200][$calHome] = new Sabre_DAV_Property_Href($calendarHomePath);
-            }
-
-            // calendar-user-address-set property
-            $calProp = '{' . self::NS_CALDAV . '}calendar-user-address-set';
-            if (in_array($calProp,$requestedProperties)) {
-
-                $addresses = $node->getAlternateUriSet();
-                $addresses[] = $this->server->getBaseUri() . $node->getPrincipalUrl();
-                unset($requestedProperties[$calProp]);
-                $returnedProperties[200][$calProp] = new Sabre_DAV_Property_HrefList($addresses, false);
-
-            }
-
-            // These two properties are shortcuts for ical to easily find 
-            // other principals this principal has access to.
-            $propRead = '{' . self::NS_CALENDARSERVER . '}calendar-proxy-read-for';
-            $propWrite = '{' . self::NS_CALENDARSERVER . '}calendar-proxy-write-for';
-            if (in_array($propRead,$requestedProperties) || in_array($propWrite,$requestedProperties)) {
-
-                $membership = $node->getGroupMembership();
-                $readList = array();
-                $writeList = array();
-
-                foreach($membership as $group) {
-
-                    $groupNode = $this->server->tree->getNodeForPath($group);
-
-                    // If the node is either ap proxy-read or proxy-write 
-                    // group, we grab the parent principal and add it to the 
-                    // list.
-                    if ($groupNode instanceof Sabre_CalDAV_Principal_ProxyRead) {
-                        list($readList[]) = Sabre_DAV_URLUtil::splitPath($group);
-                    }
-                    if ($groupNode instanceof Sabre_CalDAV_Principal_ProxyWrite) {
-                        list($writeList[]) = Sabre_DAV_URLUtil::splitPath($group);
-                    }
-
-                }
-                if (in_array($propRead,$requestedProperties)) {
-                    unset($requestedProperties[$propRead]);
-                    $returnedProperties[200][$propRead] = new Sabre_DAV_Property_HrefList($readList);
-                }
-                if (in_array($propWrite,$requestedProperties)) {
-                    unset($requestedProperties[$propWrite]);
-                    $returnedProperties[200][$propWrite] = new Sabre_DAV_Property_HrefList($writeList);
-                }
-
-            }
-
-        } // instanceof IPrincipal
-
-
-        if ($node instanceof Sabre_CalDAV_ICalendarObject) {
-            // The calendar-data property is not supposed to be a 'real' 
-            // property, but in large chunks of the spec it does act as such. 
-            // Therefore we simply expose it as a property.
-            $calDataProp = '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data';
-            if (in_array($calDataProp, $requestedProperties)) {
-                unset($requestedProperties[$calDataProp]);
-                $val = $node->get();
-                if (is_resource($val))
-                    $val = stream_get_contents($val);
-
-                // Taking out \r to not screw up the xml output
-                $returnedProperties[200][$calDataProp] = str_replace("\r","", $val);
-
-            }
-        }
-
-    }
-
-    /**
-     * This function handles the calendar-multiget REPORT.
-     *
-     * This report is used by the client to fetch the content of a series
-     * of urls. Effectively avoiding a lot of redundant requests.
-     * 
-     * @param DOMNode $dom 
-     * @return void
-     */
-    public function calendarMultiGetReport($dom) {
-
-        $properties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
-
-        $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
-        foreach($hrefElems as $elem) {
-            $uri = $this->server->calculateUri($elem->nodeValue);
-            list($objProps) = $this->server->getPropertiesForPath($uri,$properties);
-            $propertyList[]=$objProps;
-
-        }
-
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($propertyList));
-
-    }
-
-    /**
-     * This function handles the calendar-query REPORT
-     *
-     * This report is used by clients to request calendar objects based on
-     * complex conditions.
-     * 
-     * @param DOMNode $dom 
-     * @return void
-     */
-    public function calendarQueryReport($dom) {
-
-        $requestedProperties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
-
-        $filterNode = $dom->getElementsByTagNameNS('urn:ietf:params:xml:ns:caldav','filter');
-        if ($filterNode->length!==1) {
-            throw new Sabre_DAV_Exception_BadRequest('The calendar-query report must have a filter element');
-        }
-        $filters = Sabre_CalDAV_XMLUtil::parseCalendarQueryFilters($filterNode->item(0));
-
-        $requestedCalendarData = true;
-
-        if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar-data', $requestedProperties)) {
-            // We always retrieve calendar-data, as we need it for filtering.
-            $requestedProperties[] = '{urn:ietf:params:xml:ns:caldav}calendar-data';
-
-            // If calendar-data wasn't explicitly requested, we need to remove 
-            // it after processing.
-            $requestedCalendarData = false;
-        }
-
-        // These are the list of nodes that potentially match the requirement
-        $candidateNodes = $this->server->getPropertiesForPath($this->server->getRequestUri(),$requestedProperties,$this->server->getHTTPDepth(0));
-
-        $verifiedNodes = array();
-
-        foreach($candidateNodes as $node) {
-
-            // If the node didn't have a calendar-data property, it must not be a calendar object
-            if (!isset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data'])) continue;
-
-            if ($this->validateFilters($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data'],$filters)) {
-                
-                if (!$requestedCalendarData) {
-                    unset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
-                }
-                $verifiedNodes[] = $node;
-            } 
-
-        }
-
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($verifiedNodes));
-
-    }
-
-
-    /**
-     * Verify if a list of filters applies to the calendar data object 
-     *
-     * The calendarData object must be a valid iCalendar blob. The list of 
-     * filters must be formatted as parsed by Sabre_CalDAV_Plugin::parseCalendarQueryFilters
-     *
-     * @param string $calendarData 
-     * @param array $filters 
-     * @return bool 
-     */
-    public function validateFilters($calendarData,$filters) {
-
-        // We are converting the calendar object to an XML structure
-        // This makes it far easier to parse
-        $xCalendarData = Sabre_CalDAV_ICalendarUtil::toXCal($calendarData);
-        $xml = simplexml_load_string($xCalendarData);
-        $xml->registerXPathNamespace('c','urn:ietf:params:xml:ns:xcal');
-
-        foreach($filters as $xpath=>$filter) {
-
-            // if-not-defined comes first
-            if (isset($filter['is-not-defined'])) {
-                if (!$xml->xpath($xpath))
-                    continue;
-                else
-                    return false;
-                
-            }
-
-            $elem = $xml->xpath($xpath);
-            
-            if (!$elem) return false;
-            $elem = $elem[0];
-
-            if (isset($filter['time-range'])) {
-
-                switch($elem->getName()) {
-                    case 'vevent' :
-                        $result = $this->validateTimeRangeFilterForEvent($xml,$xpath,$filter);
-                        if ($result===false) return false;
-                        break;
-                    case 'vtodo' :
-                        $result = $this->validateTimeRangeFilterForTodo($xml,$xpath,$filter);
-                        if ($result===false) return false;
-                        break;
-                    case 'vjournal' :
-                    case 'vfreebusy' :
-                    case 'valarm' :
-                        // TODO: not implemented
-                        break;
-
-                    /*
-
-                    case 'vjournal' :
-                        $result = $this->validateTimeRangeFilterForJournal($xml,$xpath,$filter);
-                        if ($result===false) return false;
-                        break;
-                    case 'vfreebusy' :
-                        $result = $this->validateTimeRangeFilterForFreeBusy($xml,$xpath,$filter);
-                        if ($result===false) return false;
-                        break;
-                    case 'valarm' :
-                        $result = $this->validateTimeRangeFilterForAlarm($xml,$xpath,$filter);
-                        if ($result===false) return false;
-                        break;
-
-                        */
-
-                }
-
-            } 
-
-            if (isset($filter['text-match'])) {
-                $currentString = (string)$elem;
-
-                $isMatching = Sabre_DAV_StringUtil::textMatch($currentString, $filter['text-match']['value'], $filter['text-match']['collation']);
-                if ($filter['text-match']['negate-condition'] && $isMatching) return false;
-                if (!$filter['text-match']['negate-condition'] && !$isMatching) return false;
-                
-            }
-
-        }
-        return true;
-        
-    }
-
-    /**
-     * Checks whether a time-range filter matches an event.
-     * 
-     * @param SimpleXMLElement $xml Event as xml object 
-     * @param string $currentXPath XPath to check 
-     * @param array $currentFilter Filter information 
-     * @return void
-     */
-    private function validateTimeRangeFilterForEvent(SimpleXMLElement $xml,$currentXPath,array $currentFilter) {
-
-        // Grabbing the DTSTART property
-        $xdtstart = $xml->xpath($currentXPath.'/c:dtstart');
-        if (!count($xdtstart)) {
-            throw new Sabre_DAV_Exception_BadRequest('DTSTART property missing from calendar object');
-        }
-
-        // The dtstart can be both a date, or datetime property
-        if ((string)$xdtstart[0]['value']==='DATE' || strlen((string)$xdtstart[0])===8) {
-            $isDateTime = false;
-        } else {
-            $isDateTime = true;
-        }
-
-        // Determining the timezone
-        if ($tzid = (string)$xdtstart[0]['tzid']) {
-            $tz = new DateTimeZone($tzid);
-        } else {
-            $tz = null;
-        }
-        if ($isDateTime) {
-            $dtstart = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdtstart[0],$tz);
-        } else {
-            $dtstart = Sabre_CalDAV_XMLUtil::parseICalendarDate((string)$xdtstart[0]);
-        }
-
-
-        // Grabbing the DTEND property
-        $xdtend = $xml->xpath($currentXPath.'/c:dtend');
-        $dtend = null;
-
-        if (count($xdtend)) {
-            // Determining the timezone
-            if ($tzid = (string)$xdtend[0]['tzid']) {
-                $tz = new DateTimeZone($tzid);
-            } else {
-                $tz = null;
-            }
-
-            // Since the VALUE prameter of both DTSTART and DTEND must be the same
-            // we can assume we don't need to check the VALUE paramter of DTEND.
-            if ($isDateTime) {
-                $dtend = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdtend[0],$tz);
-            } else {
-                $dtend = Sabre_CalDAV_XMLUtil::parseICalendarDate((string)$xdtend[0],$tz);
-            }
-
-        } 
-        
-        if (is_null($dtend)) {
-            // The DTEND property was not found. We will first see if the event has a duration
-            // property
-
-            $xduration = $xml->xpath($currentXPath.'/c:duration');
-            if (count($xduration)) {
-                $duration = Sabre_CalDAV_XMLUtil::parseICalendarDuration((string)$xduration[0]);
-
-                // Making sure that the duration is bigger than 0 seconds.
-                $tempDT = clone $dtstart;
-                $tempDT->modify($duration);
-                if ($tempDT > $dtstart) {
-
-                    // use DTEND = DTSTART + DURATION 
-                    $dtend = $tempDT;
-                } else {
-                    // use DTEND = DTSTART
-                    $dtend = $dtstart;
-                }
-
-            }
-        }
-
-        if (is_null($dtend)) {
-            if ($isDateTime) {
-                // DTEND = DTSTART
-                $dtend = $dtstart;
-            } else {
-                // DTEND = DTSTART + 1 DAY
-                $dtend = clone $dtstart;
-                $dtend->modify('+1 day');
-            }
-        }
-        // TODO: we need to properly parse RRULE's, but it's very difficult.
-        // For now, we're always returning events if they have an RRULE at all.
-        $rrule = $xml->xpath($currentXPath.'/c:rrule');
-        $hasRrule = (count($rrule))>0; 
-       
-        if (!is_null($currentFilter['time-range']['start']) && $currentFilter['time-range']['start'] >= $dtend)  return false;
-        if (!is_null($currentFilter['time-range']['end'])   && $currentFilter['time-range']['end']   <= $dtstart && !$hasRrule) return false;
-        return true;
-    
-    }
-
-    private function validateTimeRangeFilterForTodo(SimpleXMLElement $xml,$currentXPath,array $filter) {
-
-        // Gathering all relevant elements
-
-        $dtStart = null;
-        $duration = null;
-        $due = null;
-        $completed = null;
-        $created = null;
-
-        $xdt = $xml->xpath($currentXPath.'/c:dtstart');
-        if (count($xdt)) {
-            // The dtstart can be both a date, or datetime property
-            if ((string)$xdt[0]['value']==='DATE') {
-                $isDateTime = false;
-            } else {
-                $isDateTime = true;
-            }
-
-            // Determining the timezone
-            if ($tzid = (string)$xdt[0]['tzid']) {
-                $tz = new DateTimeZone($tzid);
-            } else {
-                $tz = null;
-            }
-            if ($isDateTime) {
-                $dtStart = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdt[0],$tz);
-            } else {
-                $dtStart = Sabre_CalDAV_XMLUtil::parseICalendarDate((string)$xdt[0]);
-            }
-        }
-
-        // Only need to grab duration if dtStart is set
-        if (!is_null($dtStart)) {
-
-            $xduration = $xml->xpath($currentXPath.'/c:duration');
-            if (count($xduration)) {
-                $duration = Sabre_CalDAV_XMLUtil::parseICalendarDuration((string)$xduration[0]);
-            }
-
-        }
-
-        if (!is_null($dtStart) && !is_null($duration)) {
-
-            // Comparision from RFC 4791:
-            // (start <= DTSTART+DURATION) AND ((end > DTSTART) OR (end >= DTSTART+DURATION))
-
-            $end = clone $dtStart;
-            $end->modify($duration);
-
-            if( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] <= $end) &&
-                (is_null($filter['time-range']['end']) || $filter['time-range']['end'] > $dtStart || $filter['time-range']['end'] >= $end) ) {
-                return true;
-            } else {
-                return false;
-            }
-
-        }
-
-        // Need to grab the DUE property
-        $xdt = $xml->xpath($currentXPath.'/c:due');
-        if (count($xdt)) {
-            // The due property can be both a date, or datetime property
-            if ((string)$xdt[0]['value']==='DATE') {
-                $isDateTime = false;
-            } else {
-                $isDateTime = true;
-            }
-            // Determining the timezone
-            if ($tzid = (string)$xdt[0]['tzid']) {
-                $tz = new DateTimeZone($tzid);
-            } else {
-                $tz = null;
-            }
-            if ($isDateTime) {
-                $due = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdt[0],$tz);
-            } else {
-                $due = Sabre_CalDAV_XMLUtil::parseICalendarDate((string)$xdt[0]);
-            }
-        }
-
-        if (!is_null($dtStart) && !is_null($due)) {
-
-            // Comparision from RFC 4791:
-            // ((start < DUE) OR (start <= DTSTART)) AND ((end > DTSTART) OR (end >= DUE))
-            
-            if( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] < $due || $filter['time-range']['start'] < $dtstart) &&
-                (is_null($filter['time-range']['end'])   || $filter['time-range']['end'] >= $due) ) {
-                return true;
-            } else {
-                return false;
-            }
-
-        }
-
-        if (!is_null($dtStart)) {
-            
-            // Comparision from RFC 4791
-            // (start <= DTSTART)  AND (end > DTSTART)
-            if ( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] <= $dtStart) &&
-                 (is_null($filter['time-range']['end'])   || $filter['time-range']['end'] > $dtStart) ) {
-                 return true;
-            } else {
-                return false;
-            }
-
-        }
-
-        if (!is_null($due)) {
-            
-            // Comparison from RFC 4791
-            // (start < DUE) AND (end >= DUE)
-            if ( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] < $due) &&
-                 (is_null($filter['time-range']['end'])   || $filter['time-range']['end'] >= $due) ) {
-                 return true;
-            } else {
-                return false;
-            }
-
-        }
-        // Need to grab the COMPLETED property
-        $xdt = $xml->xpath($currentXPath.'/c:completed');
-        if (count($xdt)) {
-            $completed = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdt[0]);
-        }
-        // Need to grab the CREATED property
-        $xdt = $xml->xpath($currentXPath.'/c:created');
-        if (count($xdt)) {
-            $created = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdt[0]);
-        }
-
-        if (!is_null($completed) && !is_null($created)) {
-            // Comparison from RFC 4791
-            // ((start <= CREATED) OR (start <= COMPLETED)) AND ((end >= CREATED) OR (end >= COMPLETED))
-            if( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] <= $created || $filter['time-range']['start'] <= $completed) &&
-                (is_null($filter['time-range']['end'])   || $filter['time-range']['end'] >= $created   || $filter['time-range']['end'] >= $completed)) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-
-        if (!is_null($completed)) {
-            // Comparison from RFC 4791
-            // (start <= COMPLETED) AND (end  >= COMPLETED)
-            if( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] <= $completed) &&
-                (is_null($filter['time-range']['end'])   || $filter['time-range']['end'] >= $completed)) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-
-        if (!is_null($created)) {
-            // Comparison from RFC 4791
-            // (end > CREATED)
-            if( (is_null($filter['time-range']['end']) || $filter['time-range']['end'] > $created) ) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-
-        // Everything else is TRUE
-        return true;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Principal/Collection.php b/3rdparty/Sabre/CalDAV/Principal/Collection.php
deleted file mode 100644
index 13435b2448e..00000000000
--- a/3rdparty/Sabre/CalDAV/Principal/Collection.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * Principal collection
- *
- * This is an alternative collection to the standard ACL principal collection.
- * This collection adds support for the calendar-proxy-read and 
- * calendar-proxy-write sub-principals, as defined by the caldav-proxy 
- * specification.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Principal_Collection extends Sabre_DAVACL_AbstractPrincipalCollection {
-
-    /**
-     * Returns a child object based on principal information 
-     * 
-     * @param array $principalInfo 
-     * @return Sabre_CalDAV_Principal_User 
-     */
-    public function getChildForPrincipal(array $principalInfo) {
-
-        return new Sabre_CalDAV_Principal_User($this->principalBackend, $principalInfo);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php b/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
deleted file mode 100644
index f531d85d1ff..00000000000
--- a/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-/**
- * ProxyRead principal
- *
- * This class represents a principal group, hosted under the main principal.
- * This is needed to implement 'Calendar delegation' support. This class is 
- * instantiated by Sabre_CalDAV_Principal_User.
- * 
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Principal_ProxyRead implements Sabre_DAVACL_IPrincipal {
-
-    /**
-     * Principal information from the parent principal. 
-     * 
-     * @var array 
-     */
-    protected $principalInfo;
-
-    /**
-     * Principal backend 
-     * 
-     * @var Sabre_DAVACL_IPrincipalBackend 
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the object.
-     *
-     * Note that you MUST supply the parent principal information. 
-     * 
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend 
-     * @param array $principalInfo 
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalInfo) {
-
-        $this->principalInfo = $principalInfo;
-        $this->principalBackend = $principalBackend;
-
-    }
-
-    /**
-     * Returns this principals name.
-     * 
-     * @return string 
-     */
-    public function getName() {
-
-        return 'calendar-proxy-read';
-
-    }
-
-    /**
-     * Returns the last modification time 
-     *
-     * @return null 
-     */
-    public function getLastModified() {
-
-        return null; 
-
-    }
-
-    /**
-     * Deletes the current node
-     *
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void 
-     */
-    public function delete() {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
-
-    }
-
-    /**
-     * Renames the node
-     * 
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
-
-    }
-
-
-    /**
-     * Returns a list of altenative urls for a principal
-     * 
-     * This can for example be an email address, or ldap url.
-     * 
-     * @return array 
-     */
-    public function getAlternateUriSet() {
-
-        return array();
-
-    }
-
-    /**
-     * Returns the full principal url 
-     * 
-     * @return string 
-     */
-    public function getPrincipalUrl() {
-
-        return $this->principalInfo['uri'] . '/' . $this->getName(); 
-
-    }
-
-    /**
-     * Returns the list of group members
-     * 
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group. 
-     * 
-     * @return array
-     */
-    public function getGroupMemberSet() {
-
-        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl()); 
-
-    }
-
-    /**
-     * Returns the list of groups this principal is member of
-     * 
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members. 
-     * 
-     * @return array 
-     */
-    public function getGroupMembership() {
-
-        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl()); 
-
-    }
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     * 
-     * This method should throw an exception if the members could not be set. 
-     * 
-     * @param array $principals 
-     * @return void 
-     */
-    public function setGroupMemberSet(array $principals) {
-
-        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
-
-    }
-
-    /**
-     * Returns the displayname
-     *
-     * This should be a human readable name for the principal.
-     * If none is available, return the nodename. 
-     * 
-     * @return string 
-     */
-    public function getDisplayName() {
-
-        return $this->getName();
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php b/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
deleted file mode 100644
index 4d8face2060..00000000000
--- a/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-/**
- * ProxyWrite principal
- *
- * This class represents a principal group, hosted under the main principal.
- * This is needed to implement 'Calendar delegation' support. This class is 
- * instantiated by Sabre_CalDAV_Principal_User.
- * 
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Principal_ProxyWrite implements Sabre_DAVACL_IPrincipal {
-
-    /**
-     * Parent principal information 
-     * 
-     * @var array 
-     */
-    protected $principalInfo;
-
-    /**
-     * Principal Backend 
-     * 
-     * @var Sabre_DAVACL_IPrincipalBackend 
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the object
-     *
-     * Note that you MUST supply the parent principal information. 
-     * 
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend 
-     * @param array $principalInfo 
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalInfo) {
-
-        $this->principalInfo = $principalInfo;
-        $this->principalBackend = $principalBackend;
-
-    }
-
-    /**
-     * Returns this principals name.
-     * 
-     * @return string 
-     */
-    public function getName() {
-
-        return 'calendar-proxy-write';
-
-    }
-
-    /**
-     * Returns the last modification time 
-     *
-     * @return null 
-     */
-    public function getLastModified() {
-
-        return null; 
-
-    }
-
-    /**
-     * Deletes the current node
-     *
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void 
-     */
-    public function delete() {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
-
-    }
-
-    /**
-     * Renames the node
-     * 
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
-
-    }
-
-
-    /**
-     * Returns a list of altenative urls for a principal
-     * 
-     * This can for example be an email address, or ldap url.
-     * 
-     * @return array 
-     */
-    public function getAlternateUriSet() {
-
-        return array();
-
-    }
-
-    /**
-     * Returns the full principal url 
-     * 
-     * @return string 
-     */
-    public function getPrincipalUrl() {
-
-        return $this->principalInfo['uri'] . '/' . $this->getName(); 
-
-    }
-
-    /**
-     * Returns the list of group members
-     * 
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group. 
-     * 
-     * @return array
-     */
-    public function getGroupMemberSet() {
-
-        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl()); 
-
-    }
-
-    /**
-     * Returns the list of groups this principal is member of
-     * 
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members. 
-     * 
-     * @return array 
-     */
-    public function getGroupMembership() {
-
-        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl()); 
-
-    }
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     * 
-     * This method should throw an exception if the members could not be set. 
-     * 
-     * @param array $principals 
-     * @return void 
-     */
-    public function setGroupMemberSet(array $principals) {
-
-        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
-
-    }
-
-    /**
-     * Returns the displayname
-     *
-     * This should be a human readable name for the principal.
-     * If none is available, return the nodename. 
-     * 
-     * @return string 
-     */
-    public function getDisplayName() {
-
-        return $this->getName();
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Principal/User.php b/3rdparty/Sabre/CalDAV/Principal/User.php
deleted file mode 100644
index 034629b89b3..00000000000
--- a/3rdparty/Sabre/CalDAV/Principal/User.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-/**
- * CalDAV principal 
- *
- * This is a standard user-principal for CalDAV. This principal is also a 
- * collection and returns the caldav-proxy-read and caldav-proxy-write child 
- * principals.
- * 
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Principal_User extends Sabre_DAVACL_Principal implements Sabre_DAV_ICollection {
-
-    /**
-     * Creates a new file in the directory 
-     * 
-     * @param string $name Name of the file 
-     * @param resource $data Initial payload, passed as a readable stream resource. 
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void
-     */
-    public function createFile($name, $data = null) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create file (filename ' . $name . ')');
-
-    }
-
-    /**
-     * Creates a new subdirectory 
-     * 
-     * @param string $name 
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create directory');
-
-    }
-
-    /**
-     * Returns a specific child node, referenced by its name 
-     * 
-     * @param string $name 
-     * @return Sabre_DAV_INode 
-     */
-    public function getChild($name) {
-
-        if ($name === 'calendar-proxy-read')
-            return new Sabre_CalDAV_Principal_ProxyRead($this->principalBackend, $this->principalProperties);
-
-        if ($name === 'calendar-proxy-write')
-            return new Sabre_CalDAV_Principal_ProxyWrite($this->principalBackend, $this->principalProperties);
-
-        throw new Sabre_DAV_Exception_FileNotFound('Node with name ' . $name . ' was not found');
-
-    }
-
-    /**
-     * Returns an array with all the child nodes 
-     * 
-     * @return Sabre_DAV_INode[] 
-     */
-    public function getChildren() {
-
-        return array(
-            new Sabre_CalDAV_Principal_ProxyRead($this->principalBackend, $this->principalProperties),
-            new Sabre_CalDAV_Principal_ProxyWrite($this->principalBackend, $this->principalProperties),
-        );
-
-    }
-
-    /**
-     * Checks if a child-node with the specified name exists 
-     * 
-     * @return bool 
-     */
-    public function childExists($name) {
-
-        return $name === 'calendar-proxy-read' ||  $name === 'calendar-proxy-write';
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to 
-     *      be updated. 
-     * 
-     * @return array 
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalProperties['uri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalProperties['uri'] . '/calendar-proxy-read',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalProperties['uri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-        );
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
deleted file mode 100644
index 1bbaca6b8a7..00000000000
--- a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * Supported component set property
- *
- * This property is a representation of the supported-calendar_component-set 
- * property in the CalDAV namespace. It simply requires an array of components,
- * such as VEVENT, VTODO
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Property_SupportedCalendarComponentSet extends Sabre_DAV_Property {
-
-    /**
-     * List of supported components, such as "VEVENT, VTODO" 
-     * 
-     * @var array 
-     */
-    private $components;
-
-    /**
-     * Creates the property 
-     * 
-     * @param array $components 
-     */
-    public function __construct(array $components) {
-
-       $this->components = $components; 
-
-    }
-
-    /**
-     * Returns the list of supported components 
-     * 
-     * @return array 
-     */
-    public function getValue() {
-
-        return $this->components;
-
-    }
-
-    /**
-     * Serializes the property in a DOMDocument 
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $node 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-       $doc = $node->ownerDocument;
-       foreach($this->components as $component) {
-
-            $xcomp = $doc->createElement('cal:comp');
-            $xcomp->setAttribute('name',$component);
-            $node->appendChild($xcomp); 
-
-       }
-
-    }
-
-    /**
-     * Unserializes the DOMElement back into a Property class.
-     * 
-     * @param DOMElement $node 
-     * @return void
-     */
-    static function unserialize(DOMElement $node) {
-
-        $components = array();
-        foreach($node->childNodes as $childNode) {
-            if (Sabre_DAV_XMLUtil::toClarkNotation($childNode)==='{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}comp') {
-                $components[] = $childNode->getAttribute('name');
-            }
-        }
-        return new self($components);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
deleted file mode 100644
index 5010ee6d525..00000000000
--- a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Supported-calendar-data property
- *
- * This property is a representation of the supported-calendar-data property
- * in the CalDAV namespace. SabreDAV only has support for text/calendar;2.0
- * so the value is currently hardcoded.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Property_SupportedCalendarData extends Sabre_DAV_Property {
-
-    /**
-     * Serializes the property in a DOMDocument 
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $node 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-
-        $prefix = isset($server->xmlNamespaces[Sabre_CalDAV_Plugin::NS_CALDAV])?$server->xmlNamespaces[Sabre_CalDAV_Plugin::NS_CALDAV]:'cal';
-
-        $caldata = $doc->createElement($prefix . ':calendar-data');
-        $caldata->setAttribute('content-type','text/calendar');
-        $caldata->setAttribute('version','2.0');
-
-        $node->appendChild($caldata); 
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php b/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
deleted file mode 100644
index e585e9db3d8..00000000000
--- a/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * supported-collation-set property
- *
- * This property is a representation of the supported-collation-set property
- * in the CalDAV namespace. 
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Property_SupportedCollationSet extends Sabre_DAV_Property {
-
-    /**
-     * Serializes the property in a DOM document 
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $node 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-        
-        $prefix = $node->lookupPrefix('urn:ietf:params:xml:ns:caldav');
-        if (!$prefix) $prefix = 'cal';
-
-        $node->appendChild(
-            $doc->createElement($prefix . ':supported-collation','i;ascii-casemap')
-        );
-        $node->appendChild(
-            $doc->createElement($prefix . ':supported-collation','i;octet')
-        );
-        $node->appendChild(
-            $doc->createElement($prefix . ':supported-collation','i;unicode-casemap')
-        );
-
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Server.php b/3rdparty/Sabre/CalDAV/Server.php
deleted file mode 100644
index 969d69c6279..00000000000
--- a/3rdparty/Sabre/CalDAV/Server.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * CalDAV server
- *
- * This script is a convenience script. It quickly sets up a WebDAV server
- * with caldav and ACL support, and it creates the root 'principals' and
- * 'calendars' collections.
- *
- * Note that if you plan to do anything moderately complex, you are advised to 
- * not subclass this server, but use Sabre_DAV_Server directly instead. This 
- * class is nothing more than an 'easy setup'.
- * 
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Server extends Sabre_DAV_Server {
-
-    /**
-     * The authentication realm
-     *
-     * Note that if this changes, the hashes in the auth backend must also 
-     * be recalculated. 
-     * 
-     * @var string
-     */
-    public $authRealm = 'SabreDAV';
-
-    /**
-     * Sets up the object. A PDO object must be passed to setup all the backends.
-     * 
-     * @param PDO $pdo 
-     */
-    public function __construct(PDO $pdo) {
-
-        /* Backends */
-        $authBackend = new Sabre_DAV_Auth_Backend_PDO($pdo);
-        $calendarBackend = new Sabre_CalDAV_Backend_PDO($pdo);
-        $principalBackend = new Sabre_DAVACL_PrincipalBackend_PDO($pdo);
-
-        /* Directory structure */
-        $tree = array(
-            new Sabre_CalDAV_Principal_Collection($principalBackend),
-            new Sabre_CalDAV_CalendarRootNode($principalBackend, $calendarBackend),
-        );
-
-        /* Initializing server */
-        parent::__construct($tree);
-
-        /* Server Plugins */
-        $authPlugin = new Sabre_DAV_Auth_Plugin($authBackend,$this->authRealm);
-        $this->addPlugin($authPlugin);
-
-        $aclPlugin = new Sabre_DAVACL_Plugin();
-        $this->addPlugin($aclPlugin);
-
-        $caldavPlugin = new Sabre_CalDAV_Plugin();
-        $this->addPlugin($caldavPlugin);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/UserCalendars.php b/3rdparty/Sabre/CalDAV/UserCalendars.php
deleted file mode 100644
index f52d65e9a73..00000000000
--- a/3rdparty/Sabre/CalDAV/UserCalendars.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-
-/**
- * The UserCalenders class contains all calendars associated to one user 
- * 
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre_DAVACL_IACL {
-
-    /**
-     * Principal backend 
-     * 
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * CalDAV backend
-     * 
-     * @var Sabre_CalDAV_Backend_Abstract
-     */
-    protected $caldavBackend;
-
-    /**
-     * Principal information 
-     * 
-     * @var array 
-     */
-    protected $principalInfo;
-    
-    /**
-     * Constructor 
-     * 
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
-     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend 
-     * @param mixed $userUri 
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, Sabre_CalDAV_Backend_Abstract $caldavBackend, $userUri) {
-
-        $this->principalBackend = $principalBackend;
-        $this->caldavBackend = $caldavBackend;
-        $this->principalInfo = $principalBackend->getPrincipalByPath($userUri);
-       
-    }
-
-    /**
-     * Returns the name of this object 
-     * 
-     * @return string
-     */
-    public function getName() {
-      
-        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalInfo['uri']);
-        return $name; 
-
-    }
-
-    /**
-     * Updates the name of this object 
-     * 
-     * @param string $name 
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden();
-
-    }
-
-    /**
-     * Deletes this object 
-     * 
-     * @return void
-     */
-    public function delete() {
-
-        throw new Sabre_DAV_Exception_Forbidden();
-
-    }
-
-    /**
-     * Returns the last modification date 
-     * 
-     * @return int 
-     */
-    public function getLastModified() {
-
-        return null; 
-
-    }
-
-    /**
-     * Creates a new file under this object.
-     *
-     * This is currently not allowed
-     * 
-     * @param string $filename 
-     * @param resource $data 
-     * @return void
-     */
-    public function createFile($filename, $data=null) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new files in this collection is not supported');
-
-    }
-
-    /**
-     * Creates a new directory under this object.
-     *
-     * This is currently not allowed.
-     * 
-     * @param string $filename 
-     * @return void
-     */
-    public function createDirectory($filename) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new collections in this collection is not supported');
-
-    }
-
-    /**
-     * Returns a single calendar, by name 
-     * 
-     * @param string $name
-     * @todo needs optimizing
-     * @return Sabre_CalDAV_Calendar 
-     */
-    public function getChild($name) {
-
-        foreach($this->getChildren() as $child) {
-            if ($name==$child->getName())
-                return $child;
-
-        }
-        throw new Sabre_DAV_Exception_FileNotFound('Calendar with name \'' . $name . '\' could not be found');
-
-    }
-
-    /**
-     * Checks if a calendar exists.
-     * 
-     * @param string $name
-     * @todo needs optimizing
-     * @return bool 
-     */
-    public function childExists($name) {
-
-        foreach($this->getChildren() as $child) {
-            if ($name==$child->getName())
-                return true; 
-
-        }
-        return false;
-
-    }
-
-    /**
-     * Returns a list of calendars
-     * 
-     * @return array 
-     */
-    public function getChildren() {
-
-        $calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
-        $objs = array();
-        foreach($calendars as $calendar) {
-            $objs[] = new Sabre_CalDAV_Calendar($this->principalBackend, $this->caldavBackend, $calendar);
-        }
-        return $objs;
-
-    }
-
-    /**
-     * Creates a new calendar
-     * 
-     * @param string $name 
-     * @param string $properties 
-     * @return void
-     */
-    public function createExtendedCollection($name, array $resourceType, array $properties) {
-
-        if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar',$resourceType) || count($resourceType)!==2) {
-            throw new Sabre_DAV_Exception_InvalidResourceType('Unknown resourceType for this collection');
-        }
-        $this->caldavBackend->createCalendar($this->principalInfo['uri'], $name, $properties);
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner 
-     * 
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalInfo['uri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     * 
-     * @return string|null 
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to 
-     *      be updated. 
-     * 
-     * @return array 
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalInfo['uri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->principalInfo['uri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-read',
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's. 
-     * 
-     * @param array $acl 
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-
-
-}
diff --git a/3rdparty/Sabre/CalDAV/Version.php b/3rdparty/Sabre/CalDAV/Version.php
deleted file mode 100644
index df8fe1f6bd6..00000000000
--- a/3rdparty/Sabre/CalDAV/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * This class contains the Sabre_CalDAV version constants.
- * 
- * @package Sabre
- * @subpackage CalDAV 
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.5.3';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/CalDAV/XMLUtil.php b/3rdparty/Sabre/CalDAV/XMLUtil.php
deleted file mode 100644
index bf349a36aae..00000000000
--- a/3rdparty/Sabre/CalDAV/XMLUtil.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-
-/**
- * XML utilities for CalDAV 
- *
- * This class contains a few static methods used for parsing certain CalDAV 
- * requests.
- *
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CalDAV_XMLUtil {
-
-    /**
-     * This function parses the calendar-query report request body
-     *
-     * The body is quite complicated, so we're turning it into a PHP
-     * array.
-     *
-     * The resulting associative array has xpath expressions as keys.
-     * By default the xpath expressions should simply be checked for existance
-     * The xpath expressions can point to elements or attributes.
-     * 
-     * The array values can contain a number of items, which alters the query
-     * filter. 
-     *
-     * * time-range. Must also check if the todo or event falls within the
-     *               specified timerange. How this is interpreted depends on
-     *               the type of object (VTODO, VEVENT, VJOURNAL, etc)
-     * * is-not-defined
-     *               Instead of checking if the attribute or element exist,
-     *               we must check if it doesn't.
-     * * text-match
-     *               Checks if the value of the attribute or element matches
-     *               the specified value. This is actually another array with
-     *               the 'collation', 'value' and 'negate-condition' items.
-     *
-     * Refer to the CalDAV spec for more information.
-     * 
-     * @param DOMNode $domNode 
-     * @param string $basePath used for recursive calls.
-     * @param array $filters used for recursive calls.
-     * @return array 
-     */
-    static public function parseCalendarQueryFilters($domNode,$basePath = '/c:iCalendar', &$filters = array()) {
-
-        foreach($domNode->childNodes as $child) {
-
-            switch(Sabre_DAV_XMLUtil::toClarkNotation($child)) {
-
-                case '{urn:ietf:params:xml:ns:caldav}comp-filter' :
-                case '{urn:ietf:params:xml:ns:caldav}prop-filter' :
-                   
-                    $filterName = $basePath . '/' . 'c:' . strtolower($child->getAttribute('name'));
-                    $filters[$filterName] = array(); 
-
-                    self::parseCalendarQueryFilters($child, $filterName,$filters);
-                    break;
-
-                case '{urn:ietf:params:xml:ns:caldav}time-range' :
-               
-                    if ($start = $child->getAttribute('start')) {
-                        $start = self::parseICalendarDateTime($start);
-                    } else {
-                        $start = null;
-                    }
-                    if ($end = $child->getAttribute('end')) {
-                        $end = self::parseICalendarDateTime($end);
-                    } else {
-                        $end = null;
-                    }
-
-                    if (!is_null($start) && !is_null($end) && $end <= $start) {
-                        throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the time-range filter');
-                    }
-
-                    $filters[$basePath]['time-range'] = array(
-                        'start' => $start,
-                        'end'   => $end
-                    );
-                    break;
-
-                case '{urn:ietf:params:xml:ns:caldav}is-not-defined' :
-                    $filters[$basePath]['is-not-defined'] = true;
-                    break;
-
-                case '{urn:ietf:params:xml:ns:caldav}param-filter' :
-               
-                    $filterName = $basePath . '/@' . strtolower($child->getAttribute('name'));
-                    $filters[$filterName] = array();
-                    self::parseCalendarQueryFilters($child, $filterName, $filters);
-                    break;
-
-                case '{urn:ietf:params:xml:ns:caldav}text-match' :
-               
-                    $collation = $child->getAttribute('collation');
-                    if (!$collation) $collation = 'i;ascii-casemap';
-
-                    $filters[$basePath]['text-match'] = array(
-                        'collation' => ($collation == 'default'?'i;ascii-casemap':$collation),
-                        'negate-condition' => $child->getAttribute('negate-condition')==='yes',
-                        'value' => $child->nodeValue,
-                    );
-                    break;
-
-            }
-
-        }
-
-        return $filters;
-
-    }
-
-    /**
-     * Parses an iCalendar (rfc5545) formatted datetime and returns a DateTime object
-     *
-     * Specifying a reference timezone is optional. It will only be used
-     * if the non-UTC format is used. The argument is used as a reference, the 
-     * returned DateTime object will still be in the UTC timezone.
-     *
-     * @param string $dt 
-     * @param DateTimeZone $tz 
-     * @return DateTime 
-     */
-    static public function parseICalendarDateTime($dt,DateTimeZone $tz = null) {
-
-        // Format is YYYYMMDD + "T" + hhmmss 
-        $result = preg_match('/^([1-3][0-9]{3})([0-1][0-9])([0-3][0-9])T([0-2][0-9])([0-5][0-9])([0-5][0-9])([Z]?)$/',$dt,$matches);
-
-        if (!$result) {
-            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar datetime value is incorrect: ' . $dt);
-        }
-
-        if ($matches[7]==='Z' || is_null($tz)) {
-            $tz = new DateTimeZone('UTC');
-        } 
-        $date = new DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3] . ' ' . $matches[4] . ':' . $matches[5] .':' . $matches[6], $tz);
-
-        // Still resetting the timezone, to normalize everything to UTC
-        $date->setTimeZone(new DateTimeZone('UTC'));
-        return $date;
-
-    }
-
-    /**
-     * Parses an iCalendar (rfc5545) formatted datetime and returns a DateTime object
-     *
-     * @param string $date 
-     * @param DateTimeZone $tz 
-     * @return DateTime 
-     */
-    static public function parseICalendarDate($date) {
-
-        // Format is YYYYMMDD
-        $result = preg_match('/^([1-3][0-9]{3})([0-1][0-9])([0-3][0-9])$/',$date,$matches);
-
-        if (!$result) {
-            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar date value is incorrect: ' . $date);
-        }
-
-        $date = new DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3], new DateTimeZone('UTC'));
-        return $date;
-
-    }
-   
-    /**
-     * Parses an iCalendar (RFC5545) formatted duration and returns a string suitable
-     * for strtotime or DateTime::modify.
-     *
-     * NOTE: When we require PHP 5.3 this can be replaced by the DateTimeInterval object, which
-     * supports ISO 8601 Intervals, which is a superset of ICalendar durations.
-     *
-     * For now though, we're just gonna live with this messy system
-     *
-     * @param string $duration
-     * @return string
-     */
-    static public function parseICalendarDuration($duration) {
-
-        $result = preg_match('/^(?P<plusminus>\+|-)?P((?P<week>\d+)W)?((?P<day>\d+)D)?(T((?P<hour>\d+)H)?((?P<minute>\d+)M)?((?P<second>\d+)S)?)?$/', $duration, $matches);
-        if (!$result) {
-            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar duration value is incorrect: ' . $duration);
-        }
-       
-        $parts = array(
-            'week',
-            'day',
-            'hour',
-            'minute',
-            'second',
-        );
-
-        $newDur = '';
-        foreach($parts as $part) {
-            if (isset($matches[$part]) && $matches[$part]) {
-                $newDur.=' '.$matches[$part] . ' ' . $part . 's';
-            }
-        }
-
-        $newDur = ($matches['plusminus']==='-'?'-':'+') . trim($newDur);
-        return $newDur;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CardDAV/AddressBook.php b/3rdparty/Sabre/CardDAV/AddressBook.php
deleted file mode 100644
index 471ca7b338a..00000000000
--- a/3rdparty/Sabre/CardDAV/AddressBook.php
+++ /dev/null
@@ -1,293 +0,0 @@
-<?php
-
-/**
- * The AddressBook class represents a CardDAV addressbook, owned by a specific user
- *
- * The AddressBook can contain multiple vcards
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_CardDAV_IAddressBook, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
-
-    /**
-     * This is an array with addressbook information 
-     * 
-     * @var array 
-     */
-    private $addressBookInfo;
-
-    /**
-     * CardDAV backend 
-     * 
-     * @var Sabre_CardDAV_Backend_Abstract 
-     */
-    private $carddavBackend;
-
-    /**
-     * Constructor 
-     * 
-     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend 
-     * @param array $addressBookInfo 
-     * @return void
-     */
-    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend,array $addressBookInfo) {
-
-        $this->carddavBackend = $carddavBackend;
-        $this->addressBookInfo = $addressBookInfo;
-
-    }
-
-    /**
-     * Returns the name of the addressbook 
-     * 
-     * @return string 
-     */
-    public function getName() {
-
-        return $this->addressBookInfo['uri'];
-
-    }
-
-    /**
-     * Returns a card
-     *
-     * @param string $name 
-     * @return Sabre_DAV_Card
-     */
-    public function getChild($name) {
-
-        $obj = $this->carddavBackend->getCard($this->addressBookInfo['id'],$name);
-        if (!$obj) throw new Sabre_DAV_Exception_FileNotFound('Card not found');
-        return new Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
-
-    }
-
-    /**
-     * Returns the full list of cards
-     * 
-     * @return array 
-     */
-    public function getChildren() {
-
-        $objs = $this->carddavBackend->getCards($this->addressBookInfo['id']);
-        $children = array();
-        foreach($objs as $obj) {
-            $children[] = new Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
-        }
-        return $children;
-
-    }
-
-    /**
-     * Creates a new directory
-     *
-     * We actually block this, as subdirectories are not allowed in addressbooks. 
-     * 
-     * @param string $name 
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating collections in addressbooks is not allowed');
-
-    }
-
-    /**
-     * Creates a new file
-     *
-     * The contents of the new file must be a valid VCARD
-     * 
-     * @param string $name 
-     * @param resource $vcardData 
-     * @return void
-     */
-    public function createFile($name,$vcardData = null) {
-
-        $vcardData = stream_get_contents($vcardData);
-        // Converting to UTF-8, if needed
-        $vcardData = Sabre_DAV_StringUtil::ensureUTF8($vcardData);
-
-        $this->carddavBackend->createCard($this->addressBookInfo['id'],$name,$vcardData);
-
-    }
-
-    /**
-     * Deletes the entire addressbook. 
-     * 
-     * @return void
-     */
-    public function delete() {
-
-        $this->carddavBackend->deleteAddressBook($this->addressBookInfo['id']);
-
-    }
-
-    /**
-     * Renames the addressbook
-     * 
-     * @param string $newName 
-     * @return void
-     */
-    public function setName($newName) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Renaming addressbooks is not yet supported');
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp.
-     * 
-     * @return void
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Updates properties on this node,
-     *
-     * The properties array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existant property is always succesful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname. 
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param array $mutations 
-     * @return bool|array 
-     */
-    public function updateProperties($mutations) {
-
-        return $this->carddavBackend->updateAddressBook($this->addressBookInfo['id'], $mutations); 
-
-    }
-
-    /**
-     * Returns a list of properties for this nodes.
-     *
-     * The properties list is a list of propertynames the client requested,
-     * encoded in clark-notation {xmlnamespace}tagname
-     *
-     * If the array is empty, it means 'all properties' were requested.
-     *
-     * @param array $properties 
-     * @return void
-     */
-    public function getProperties($properties) {
-
-        $response = array();
-        foreach($properties as $propertyName) {
-
-            if (isset($this->addressBookInfo[$propertyName])) {
-
-                $response[$propertyName] = $this->addressBookInfo[$propertyName];
-
-            }
-
-        }
-
-        return $response;
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner 
-     * 
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->addressBookInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     * 
-     * @return string|null 
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to 
-     *      be updated. 
-     * 
-     * @return array 
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's. 
-     * 
-     * @param array $acl 
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-
-
-}
diff --git a/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php b/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
deleted file mode 100644
index 08adc3b8157..00000000000
--- a/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-
-/**
- * Parses the addressbook-query report request body.
- *
- * Whoever designed this format, and the CalDAV equavalent even more so, 
- * has no feel for design.
- * 
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_AddressBookQueryParser {
-
-    const TEST_ANYOF = 'anyof';
-    const TEST_ALLOF = 'allof';
-
-    /**
-     * List of requested properties the client wanted
-     * 
-     * @var array 
-     */
-    public $requestedProperties;
-
-    /**
-     * The number of results the client wants
-     *
-     * null means it wasn't specified, which in most cases means 'all results'.
-     * 
-     * @var int|null 
-     */
-    public $limit;
-
-    /**
-     * List of property filters.
-     *
-     * @var array 
-     */
-    public $filters;
-
-    /**
-     * Either TEST_ANYOF or TEST_ALLOF
-     * 
-     * @var string 
-     */
-    public $test;
-
-    /**
-     * DOM Document
-     * 
-     * @var DOMDocument 
-     */
-    protected $dom;
-
-    /**
-     * DOM XPath object 
-     * 
-     * @var DOMXPath 
-     */
-    protected $xpath;
-
-    /**
-     * Creates the parser
-     * 
-     * @param DOMNode $dom 
-     * @return void
-     */
-    public function __construct(DOMDocument $dom) {
-
-        $this->dom = $dom;
-
-        $this->xpath = new DOMXPath($dom);
-        $this->xpath->registerNameSpace('card',Sabre_CardDAV_Plugin::NS_CARDDAV);
-
-    }
-
-    /**
-     * Parses the request. 
-     * 
-     * @param DOMNode $dom 
-     * @return void
-     */
-    public function parse() {
-
-        $filterNode = null;
-        
-        $limit = $this->xpath->evaluate('number(/card:addressbook-query/card:limit/card:nresults)');
-        if (is_nan($limit)) $limit = null;
-
-        $filter = $this->xpath->query('/card:addressbook-query/card:filter');
-        if ($filter->length !== 1) {
-            throw new Sabre_DAV_Exception_BadRequest('Only one filter element is allowed');
-        }
-
-        $filter = $filter->item(0);
-        $test = $this->xpath->evaluate('string(@test)', $filter);
-        if (!$test) $test = self::TEST_ANYOF;
-        if ($test !== self::TEST_ANYOF && $test !== self::TEST_ALLOF) {
-            throw new Sabre_DAV_Exception_BadRequest('The test attribute must either hold "anyof" or "allof"');
-        }
-
-        $propFilters = array();
-
-        $propFilterNodes = $this->xpath->query('card:prop-filter', $filter);
-        for($ii=0; $ii < $propFilterNodes->length; $ii++) {
-
-            $propFilters[] = $this->parsePropFilterNode($propFilterNodes->item($ii));
-
-
-        }
-
-        $this->filters = $propFilters;
-        $this->limit = $limit;
-        $this->requestedProperties = array_keys(Sabre_DAV_XMLUtil::parseProperties($this->dom->firstChild));
-        $this->test = $test;
-
-    }
-
-    /**
-     * Parses the prop-filter xml element
-     * 
-     * @param DOMElement $propFilterNode 
-     * @return array 
-     */
-    protected function parsePropFilterNode(DOMElement $propFilterNode) {
-
-        $propFilter = array();
-        $propFilter['name'] = $propFilterNode->getAttribute('name');
-        $propFilter['test'] = $propFilterNode->getAttribute('test');
-        if (!$propFilter['test']) $propFilter['test'] = 'anyof';
-
-        $propFilter['is-not-defined'] = $this->xpath->query('card:is-not-defined', $propFilterNode)->length>0;
-
-        $paramFilterNodes = $this->xpath->query('card:param-filter', $propFilterNode);
-
-        $propFilter['param-filters'] = array();
-
-
-        for($ii=0;$ii<$paramFilterNodes->length;$ii++) {
-
-            $propFilter['param-filters'][] = $this->parseParamFilterNode($paramFilterNodes->item($ii));
-
-        }
-        $propFilter['text-matches'] = array();
-        $textMatchNodes = $this->xpath->query('card:text-match', $propFilterNode);
-
-        for($ii=0;$ii<$textMatchNodes->length;$ii++) {
-
-            $propFilter['text-matches'][] = $this->parseTextMatchNode($textMatchNodes->item($ii));
-
-        }
-
-        return $propFilter;
-
-    }
-
-    /**
-     * Parses the param-filter element 
-     * 
-     * @param DOMElement $paramFilterNode 
-     * @return array 
-     */
-    public function parseParamFilterNode(DOMElement $paramFilterNode) {
-        
-        $paramFilter = array();
-        $paramFilter['name'] = $paramFilterNode->getAttribute('name');
-        $paramFilter['is-not-defined'] = $this->xpath->query('card:is-not-defined', $paramFilterNode)->length>0;
-        $paramFilter['text-match'] = null;
-
-        $textMatch = $this->xpath->query('card:text-match', $paramFilterNode);
-        if ($textMatch->length>0) {
-            $paramFilter['text-match'] = $this->parseTextMatchNode($textMatch->item(0));
-        }
-
-        return $paramFilter; 
-
-    }
-
-    /**
-     * Text match
-     * 
-     * @param DOMElement $textMatchNode 
-     * @return void
-     */
-    public function parseTextMatchNode(DOMElement $textMatchNode) {
-
-        $matchType = $textMatchNode->getAttribute('match-type');
-        if (!$matchType) $matchType = 'contains';
-
-        if (!in_array($matchType, array('contains', 'equals', 'starts-with', 'ends-with'))) {
-            throw new Sabre_DAV_Exception_BadRequest('Unknown match-type: ' . $matchType);
-        }
-
-        $negateCondition = $textMatchNode->getAttribute('negate-condition');
-        $negateCondition = $negateCondition==='yes';
-        $collation = $textMatchNode->getAttribute('collation');
-        if (!$collation) $collation = 'i;unicode-casemap';
-
-        return array(
-            'negate-condition' => $negateCondition,
-            'collation' => $collation,
-            'match-type' => $matchType,
-            'value' => $textMatchNode->nodeValue
-        );
-          
-
-    } 
-
-}
diff --git a/3rdparty/Sabre/CardDAV/AddressBookRoot.php b/3rdparty/Sabre/CardDAV/AddressBookRoot.php
deleted file mode 100644
index 1a80efba35e..00000000000
--- a/3rdparty/Sabre/CardDAV/AddressBookRoot.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * AddressBook rootnode 
- *
- * This object lists a collection of users, which can contain addressbooks.
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_AddressBookRoot extends Sabre_DAVACL_AbstractPrincipalCollection {
-
-    /**
-     * Principal Backend 
-     * 
-     * @var Sabre_DAVACL_IPrincipalBackend
-     */
-    protected $principalBackend;
-
-    /**
-     * CardDAV backend 
-     * 
-     * @var Sabre_CardDAV_Backend_Abstract 
-     */
-    protected $carddavBackend;
-
-    /**
-     * Constructor 
-     *
-     * This constructor needs both a principal and a carddav backend.
-     *
-     * By default this class will show a list of addressbook collections for 
-     * principals in the 'principals' collection. If your main principals are 
-     * actually located in a different path, use the $principalPrefix argument 
-     * to override this.
-     *
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend 
-     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
-     * @param string $principalPrefix 
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend,Sabre_CardDAV_Backend_Abstract $carddavBackend, $principalPrefix = 'principals') {
-
-        $this->carddavBackend = $carddavBackend;
-        parent::__construct($principalBackend, $principalPrefix);
-
-    }
-
-    /**
-     * Returns the name of the node 
-     * 
-     * @return string 
-     */
-    public function getName() {
-
-        return Sabre_CardDAV_Plugin::ADDRESSBOOK_ROOT;
-
-    }
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     * 
-     * @param array $principal 
-     * @return Sabre_DAV_INode 
-     */
-    public function getChildForPrincipal(array $principal) {
-
-        return new Sabre_CardDAV_UserAddressBooks($this->carddavBackend, $principal['uri']);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CardDAV/Backend/Abstract.php b/3rdparty/Sabre/CardDAV/Backend/Abstract.php
deleted file mode 100644
index 1f0253ddab8..00000000000
--- a/3rdparty/Sabre/CardDAV/Backend/Abstract.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-/**
- * Abstract Backend class
- *
- * This class serves as a base-class for addressbook backends
- *
- * Note that there are references to 'addressBookId' scattered throughout the 
- * class. The value of the addressBookId is completely up to you, it can be any 
- * arbitrary value you can use as an unique identifier.
- * 
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_CardDAV_Backend_Abstract {
-
-    /**
-     * Returns the list of addressbooks for a specific user.
-     *
-     * Every addressbook should have the following properties:
-     *   id - an arbitrary unique id
-     *   uri - the 'basename' part of the url
-     *   principaluri - Same as the passed parameter
-     *
-     * Any additional clark-notation property may be passed besides this. Some 
-     * common ones are :
-     *   {DAV:}displayname
-     *   {urn:ietf:params:xml:ns:carddav}addressbook-description
-     *   {http://calendarserver.org/ns/}getctag
-     * 
-     * @param string $principalUri 
-     * @return array 
-     */
-    public abstract function getAddressBooksForUser($principalUri); 
-
-    /**
-     * Updates an addressbook's properties
-     *
-     * See Sabre_DAV_IProperties for a description of the mutations array, as 
-     * well as the return value. 
-     *
-     * @param mixed $addressBookId
-     * @param array $mutations
-     * @see Sabre_DAV_IProperties::updateProperties
-     * @return bool|array
-     */
-    public abstract function updateAddressBook($addressBookId, array $mutations); 
-
-    /**
-     * Creates a new address book 
-     *
-     * @param string $principalUri 
-     * @param string $url Just the 'basename' of the url. 
-     * @param array $properties 
-     * @return void
-     */
-    abstract public function createAddressBook($principalUri, $url, array $properties); 
-
-    /**
-     * Deletes an entire addressbook and all its contents
-     *
-     * @param mixed $addressBookId 
-     * @return void
-     */
-    abstract public function deleteAddressBook($addressBookId); 
-
-    /**
-     * Returns all cards for a specific addressbook id. 
-     *
-     * This method should return the following properties for each card:
-     *   * carddata - raw vcard data
-     *   * uri - Some unique url
-     *   * lastmodified - A unix timestamp
-
-     * @param mixed $addressbookId 
-     * @return array 
-     */
-    public abstract function getCards($addressbookId); 
-
-    /**
-     * Returns a specfic card
-     * 
-     * @param mixed $addressBookId 
-     * @param string $cardUri 
-     * @return void
-     */
-    public abstract function getCard($addressBookId, $cardUri); 
-
-    /**
-     * Creates a new card
-     * 
-     * @param mixed $addressBookId 
-     * @param string $cardUri 
-     * @param string $cardData 
-     * @return bool 
-     */
-    abstract public function createCard($addressBookId, $cardUri, $cardData); 
-
-    /**
-     * Updates a card
-     * 
-     * @param mixed $addressBookId 
-     * @param string $cardUri 
-     * @param string $cardData 
-     * @return bool 
-     */
-    abstract public function updateCard($addressBookId, $cardUri, $cardData); 
-
-    /**
-     * Deletes a card
-     * 
-     * @param mixed $addressBookId 
-     * @param string $cardUri 
-     * @return bool 
-     */
-    abstract public function deleteCard($addressBookId, $cardUri); 
-
-}
diff --git a/3rdparty/Sabre/CardDAV/Backend/PDO.php b/3rdparty/Sabre/CardDAV/Backend/PDO.php
deleted file mode 100644
index f4e44610ccf..00000000000
--- a/3rdparty/Sabre/CardDAV/Backend/PDO.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-
-/**
- * PDO CardDAV backend
- *
- * This CardDAV backend uses PDO to store addressbooks
- * 
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_Backend_PDO extends Sabre_CardDAV_Backend_Abstract {
-
-    /**
-     * PDO connection 
-     * 
-     * @var PDO 
-     */
-    protected $pdo;
-
-    /**
-     * The PDO table name used to store addressbooks
-     */
-    protected $addressBooksTableName;
-
-    /**
-     * The PDO table name used to store cards
-     */
-    protected $cardsTableName;
-
-    /**
-     * Sets up the object 
-     * 
-     * @param PDO $pdo 
-     */
-    public function __construct(PDO $pdo, $addressBooksTableName = 'addressbooks', $cardsTableName = 'cards') {
-
-        $this->pdo = $pdo;
-        $this->addressBooksTableName = $addressBooksTableName;
-        $this->cardsTableName = $cardsTableName; 
-
-    }
-
-    /**
-     * Returns the list of addressbooks for a specific user. 
-     * 
-     * @param string $principalUri 
-     * @return array 
-     */
-    public function getAddressBooksForUser($principalUri) {
-
-        $stmt = $this->pdo->prepare('SELECT id, uri, displayname, principaluri, description, ctag FROM `'.$this->addressBooksTableName.'` WHERE principaluri = ?');
-        $result = $stmt->execute(array($principalUri));
-
-        $addressBooks = array();
-
-        foreach($stmt->fetchAll() as $row) {
-
-            $addressBooks[] = array(
-                'id'  => $row['id'],
-                'uri' => $row['uri'],
-                'principaluri' => $row['principaluri'],
-                '{DAV:}displayname' => $row['displayname'],
-                '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
-                '{http://calendarserver.org/ns/}getctag' => $row['ctag'],
-                '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}supported-address-data' => 
-                    new Sabre_CardDAV_Property_SupportedAddressData(),
-            );
-
-        }
-
-        return $addressBooks;
-
-    }
-
-
-    /**
-     * Updates an addressbook's properties
-     *
-     * See Sabre_DAV_IProperties for a description of the mutations array, as 
-     * well as the return value. 
-     *
-     * @param mixed $addressBookId
-     * @param array $mutations
-     * @see Sabre_DAV_IProperties::updateProperties
-     * @return bool|array
-     */
-    public function updateAddressBook($addressBookId, array $mutations) {
-        
-        $updates = array();
-
-        foreach($mutations as $property=>$newValue) {
-
-            switch($property) {
-                case '{DAV:}displayname' :
-                    $updates['displayname'] = $newValue;
-                    break;
-                case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' :
-                    $updates['description'] = $newValue;
-                    break;
-                default :
-                    // If any unsupported values were being updated, we must 
-                    // let the entire request fail.
-                    return false;
-            }
-
-        }
-
-        // No values are being updated?
-        if (!$updates) {
-            return false;
-        }
-
-        $query = 'UPDATE `' . $this->addressBooksTableName . '` SET ctag = ctag + 1 ';
-        foreach($updates as $key=>$value) {
-            $query.=', `' . $key . '` = :' . $key . ' ';
-        }
-        $query.=' WHERE id = :addressbookid';
-
-        $stmt = $this->pdo->prepare($query);
-        $updates['addressbookid'] = $addressBookId;
-
-        $stmt->execute($updates);
-
-        return true;
-
-    }
-
-    /**
-     * Creates a new address book 
-     *
-     * @param string $principalUri 
-     * @param string $url Just the 'basename' of the url. 
-     * @param array $properties 
-     * @return void
-     */
-    public function createAddressBook($principalUri, $url, array $properties) {
-
-        $values = array(
-            'displayname' => null,
-            'description' => null,
-            'principaluri' => $principalUri,
-            'uri' => $url,
-        );
-
-        foreach($properties as $property=>$newValue) {
-
-            switch($property) {
-                case '{DAV:}displayname' :
-                    $values['displayname'] = $newValue;
-                    break;
-                case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' :
-                    $values['description'] = $newValue;
-                    break;
-                default :
-                    throw new Sabre_DAV_Exception_BadRequest('Unknown property: ' . $property);
-            }
-
-        }
-
-        $query = 'INSERT INTO `' . $this->addressBooksTableName . '` (uri, displayname, description, principaluri, ctag) VALUES (:uri, :displayname, :description, :principaluri, 1)';
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($values);
-
-    }
-
-    /**
-     * Deletes an entire addressbook and all its contents
-     *
-     * @param int $addressBookId 
-     * @return void
-     */
-    public function deleteAddressBook($addressBookId) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM `' . $this->cardsTableName . '` WHERE addressbookid = ?');
-        $stmt->execute(array($addressBookId));
-
-        $stmt = $this->pdo->prepare('DELETE FROM `' . $this->addressBooksTableName . '` WHERE id = ?');
-        $stmt->execute(array($addressBookId));
-
-    }
-
-    /**
-     * Returns all cards for a specific addressbook id. 
-     * 
-     * @param mixed $addressbookId 
-     * @return array 
-     */
-    public function getCards($addressbookId) {
-
-        $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM `' . $this->cardsTableName . '` WHERE addressbookid = ?');
-        $stmt->execute(array($addressbookId));
-
-        return $stmt->fetchAll(PDO::FETCH_ASSOC);
-
-    
-    }
-    /**
-     * Returns a specfic card
-     * 
-     * @param mixed $addressBookId 
-     * @param string $cardUri 
-     * @return array 
-     */
-    public function getCard($addressBookId, $cardUri) {
-
-        $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM `' . $this->cardsTableName . '` WHERE addressbookid = ? AND uri = ? LIMIT 1');
-        $stmt->execute(array($addressBookId, $cardUri));
-
-        $result = $stmt->fetchAll(PDO::FETCH_ASSOC);
-
-        return (count($result)>0?$result[0]:false);
-
-    }
-
-    /**
-     * Creates a new card
-     * 
-     * @param mixed $addressBookId 
-     * @param string $cardUri 
-     * @param string $cardData 
-     * @return bool 
-     */
-    public function createCard($addressBookId, $cardUri, $cardData) {
-
-        $stmt = $this->pdo->prepare('INSERT INTO `' . $this->cardsTableName . '` (carddata, uri, lastmodified, addressbookid) VALUES (?, ?, ?, ?)');
-
-        $result = $stmt->execute(array($cardData, $cardUri, time(), $addressBookId));
-
-        $stmt2 = $this->pdo->prepare('UPDATE `' . $this->addressBooksTableName . '` SET ctag = ctag + 1 WHERE id = ?');
-        $stmt2->execute(array($addressBookId));
-
-        return $result;
-
-    }
-
-    /**
-     * Updates a card
-     * 
-     * @param mixed $addressBookId 
-     * @param string $cardUri 
-     * @param string $cardData 
-     * @return bool 
-     */
-    public function updateCard($addressBookId, $cardUri, $cardData) {
-
-        $stmt = $this->pdo->prepare('UPDATE `' . $this->cardsTableName . '` SET carddata = ?, lastmodified = ? WHERE uri = ? AND addressbookid =?');
-        $result = $stmt->execute(array($cardData, time(), $cardUri, $addressBookId));
-
-        $stmt2 = $this->pdo->prepare('UPDATE `' . $this->addressBooksTableName . '` SET ctag = ctag + 1 WHERE id = ?');
-        $stmt2->execute(array($addressBookId));
-
-        return $stmt->rowCount()===1;
-
-    }
-
-    /**
-     * Deletes a card
-     * 
-     * @param mixed $addressBookId 
-     * @param string $cardUri 
-     * @return bool 
-     */
-    public function deleteCard($addressBookId, $cardUri) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM `' . $this->cardsTableName . '` WHERE addressbookid = ? AND uri = ?');
-        $stmt->execute(array($addressBookId, $cardUri));
-
-        $stmt2 = $this->pdo->prepare('UPDATE `' . $this->addressBooksTableName . '` SET ctag = ctag + 1 WHERE id = ?');
-        $stmt2->execute(array($addressBookId));
-
-        return $stmt->rowCount()===1;
-
-    }
-}
diff --git a/3rdparty/Sabre/CardDAV/Card.php b/3rdparty/Sabre/CardDAV/Card.php
deleted file mode 100644
index 2844eaf7ed6..00000000000
--- a/3rdparty/Sabre/CardDAV/Card.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-
-/**
- * The Card object represents a single Card from an addressbook
- * 
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard, Sabre_DAVACL_IACL {
-
-    /**
-     * CardDAV backend
-     * 
-     * @var Sabre_CardDAV_Backend_Abstract 
-     */
-    private $carddavBackend;
-
-    /**
-     * Array with information about this Card
-     * 
-     * @var array 
-     */
-    private $cardData;
-
-    /**
-     * Array with information about the containing addressbook 
-     * 
-     * @var array 
-     */
-    private $addressBookInfo;
-
-    /**
-     * Constructor 
-     * 
-     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend 
-     * @param array $addressBookInfo
-     * @param array $cardData
-     */
-    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend,array $addressBookInfo,array $cardData) {
-
-        $this->carddavBackend = $carddavBackend;
-        $this->addressBookInfo = $addressBookInfo;
-        $this->cardData = $cardData;
-
-    }
-
-    /**
-     * Returns the uri for this object 
-     * 
-     * @return string 
-     */
-    public function getName() {
-
-        return $this->cardData['uri'];
-
-    }
-
-    /**
-     * Returns the VCard-formatted object 
-     * 
-     * @return string 
-     */
-    public function get() {
-
-        $cardData = $this->cardData['carddata'];
-        $s = fopen('php://temp','r+');
-        fwrite($s, $cardData);
-        rewind($s);
-        return $s;
-
-    }
-
-    /**
-     * Updates the VCard-formatted object 
-     * 
-     * @param string $cardData 
-     * @return void 
-     */
-    public function put($cardData) {
-
-        if (is_resource($cardData))
-            $cardData = stream_get_contents($cardData);
-
-        // Converting to UTF-8, if needed
-        $cardData = Sabre_DAV_StringUtil::ensureUTF8($cardData);
-
-        $this->carddavBackend->updateCard($this->addressBookInfo['id'],$this->cardData['uri'],$cardData);
-        $this->cardData['carddata'] = $cardData;
-
-    }
-
-    /**
-     * Deletes the card
-     * 
-     * @return void
-     */
-    public function delete() {
-
-        $this->carddavBackend->deleteCard($this->addressBookInfo['id'],$this->cardData['uri']);
-
-    }
-
-    /**
-     * Returns the mime content-type 
-     * 
-     * @return string 
-     */
-    public function getContentType() {
-
-        return 'text/x-vcard';
-
-    }
-
-    /**
-     * Returns an ETag for this object 
-     * 
-     * @return string 
-     */
-    public function getETag() {
-
-        return '"' . md5($this->cardData['carddata']) . '"';
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp
-     * 
-     * @return time 
-     */
-    public function getLastModified() {
-
-        return isset($this->cardData['lastmodified'])?$this->cardData['lastmodified']:null;
-
-    }
-
-    /**
-     * Returns the size of this object in bytes 
-     * 
-     * @return int
-     */
-    public function getSize() {
-
-        return strlen($this->cardData['carddata']);
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner 
-     * 
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->addressBookInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     * 
-     * @return string|null 
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to 
-     *      be updated. 
-     * 
-     * @return array 
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ),
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's. 
-     * 
-     * @param array $acl 
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/CardDAV/IAddressBook.php b/3rdparty/Sabre/CardDAV/IAddressBook.php
deleted file mode 100644
index a0dffb30aea..00000000000
--- a/3rdparty/Sabre/CardDAV/IAddressBook.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * AddressBook interface
- *
- * Implement this interface to allow a node to be recognized as an addressbook.
- * 
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CardDAV_IAddressBook extends Sabre_DAV_ICollection {
-
- 
-
-}
diff --git a/3rdparty/Sabre/CardDAV/ICard.php b/3rdparty/Sabre/CardDAV/ICard.php
deleted file mode 100644
index 25bcc551b73..00000000000
--- a/3rdparty/Sabre/CardDAV/ICard.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Card interface 
- *
- * Extend the ICard interface to allow your custom nodes to be picked up as 
- * 'Cards'. 
- * 
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CardDAV_ICard extends Sabre_DAV_IFile { 
-
-}
-
diff --git a/3rdparty/Sabre/CardDAV/IDirectory.php b/3rdparty/Sabre/CardDAV/IDirectory.php
deleted file mode 100644
index e0d0797d285..00000000000
--- a/3rdparty/Sabre/CardDAV/IDirectory.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * IDirectory interface
- *
- * Implement this interface to have an addressbook marked as a 'directory'. A 
- * directory is an (often) global addressbook.
- *
- * A full description can be found in the IETF draft:
- *   - draft-daboo-carddav-directory-gateway
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_CardDAV_IDirectory extends Sabre_CardDAV_IAddressBook {
-
-
-}
diff --git a/3rdparty/Sabre/CardDAV/Plugin.php b/3rdparty/Sabre/CardDAV/Plugin.php
deleted file mode 100644
index 14c9c72b0d5..00000000000
--- a/3rdparty/Sabre/CardDAV/Plugin.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?php
-
-/**
- * CardDAV plugin
- *
- * The CardDAV plugin adds CardDAV functionality to the WebDAV server
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * Url to the addressbooks
-     */
-    const ADDRESSBOOK_ROOT = 'addressbooks';
-
-    /**
-     * xml namespace for CardDAV elements
-     */
-    const NS_CARDDAV = 'urn:ietf:params:xml:ns:carddav';
-
-    /**
-     * Add urls to this property to have them automatically exposed as 
-     * 'directories' to the user.
-     * 
-     * @var array
-     */
-    public $directories = array();
-
-    /**
-     * Server class 
-     *
-     * @var Sabre_DAV_Server 
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin 
-     *
-     * @param Sabre_DAV_Server $server 
-     * @return void 
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        /* Events */
-        $server->subscribeEvent('beforeGetProperties', array($this, 'beforeGetProperties'));
-        $server->subscribeEvent('report', array($this,'report'));
-
-        /* Namespaces */
-        $server->xmlNamespaces[self::NS_CARDDAV] = 'card';
-
-        /* Mapping Interfaces to {DAV:}resourcetype values */
-        $server->resourceTypeMapping['Sabre_CardDAV_IAddressBook'] = '{' . self::NS_CARDDAV . '}addressbook';
-        $server->resourceTypeMapping['Sabre_CardDAV_IDirectory'] = '{' . self::NS_CARDDAV . '}directory';
-        
-        /* Adding properties that may never be changed */
-        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-address-data';
-        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}max-resource-size';
-
-
-        $this->server = $server;
-
-    }
-
-    /**
-     * Returns a list of supported features.
-     *
-     * This is used in the DAV: header in the OPTIONS and PROPFIND requests. 
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array('addressbook');
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually 
-     * implement them 
-     *
-     * @param string $uri
-     * @return array 
-     */
-    public function getSupportedReportSet($uri) {
-
-        $node = $this->server->tree->getNodeForPath($uri);
-        if ($node instanceof Sabre_CardDAV_IAddressBook || $node instanceof Sabre_CardDAV_ICard) {
-            return array(
-                 '{' . self::NS_CARDDAV . '}addressbook-multiget',
-                 '{' . self::NS_CARDDAV . '}addressbook-query',
-            );
-        }
-        return array();
-
-    }
-
-
-    /**
-     * Adds all CardDAV-specific properties 
-     *
-     * @param string $path
-     * @param Sabre_DAV_INode $node 
-     * @param array $requestedProperties
-     * @param array $returnedProperties 
-     * @return void
-     */
-    public function beforeGetProperties($path, Sabre_DAV_INode $node, array &$requestedProperties, array &$returnedProperties) { 
-
-        if ($node instanceof Sabre_DAVACL_IPrincipal) {
-
-            // calendar-home-set property
-            $addHome = '{' . self::NS_CARDDAV . '}addressbook-home-set';
-            if (in_array($addHome,$requestedProperties)) {
-                $principalId = $node->getName(); 
-                $addressbookHomePath = self::ADDRESSBOOK_ROOT . '/' . $principalId . '/';
-                unset($requestedProperties[array_search($addHome, $requestedProperties)]);
-                $returnedProperties[200][$addHome] = new Sabre_DAV_Property_Href($addressbookHomePath);
-            }
-
-            $directories = '{' . self::NS_CARDDAV . '}directory-gateway';
-            if ($this->directories && in_array($directories, $requestedProperties)) {
-                unset($requestedProperties[array_search($directories, $requestedProperties)]);
-                $returnedProperties[200][$directories] = new Sabre_DAV_Property_HrefList($this->directories);
-            }
-
-        }
-
-        if ($node instanceof Sabre_CardDAV_ICard) {
-
-            // The address-data property is not supposed to be a 'real' 
-            // property, but in large chunks of the spec it does act as such. 
-            // Therefore we simply expose it as a property.
-            $addressDataProp = '{' . self::NS_CARDDAV . '}address-data';
-            if (in_array($addressDataProp, $requestedProperties)) {
-                unset($requestedProperties[$addressDataProp]);
-                $val = $node->get();
-                if (is_resource($val))
-                    $val = stream_get_contents($val);
-
-                // Taking out \r to not screw up the xml output
-                $returnedProperties[200][$addressDataProp] = str_replace("\r","", $val);
-
-            }
-        }
-
-    }
-
-    /**
-     * This functions handles REPORT requests specific to CardDAV 
-     *
-     * @param string $reportName 
-     * @param DOMNode $dom
-     * @return bool 
-     */
-    public function report($reportName,$dom) {
-
-        switch($reportName) { 
-            case '{'.self::NS_CARDDAV.'}addressbook-multiget' :
-                $this->addressbookMultiGetReport($dom);
-                return false;
-            case '{'.self::NS_CARDDAV.'}addressbook-query' :
-                $this->addressBookQueryReport($dom);
-                return false; 
-            default :
-                return;
-
-        }
-
-
-    }
-
-    /**
-     * This function handles the addressbook-multiget REPORT.
-     *
-     * This report is used by the client to fetch the content of a series
-     * of urls. Effectively avoiding a lot of redundant requests.
-     *
-     * @param DOMNode $dom
-     * @return void
-     */
-    public function addressbookMultiGetReport($dom) {
-
-        $properties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
-
-        $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
-        $propertyList = array();
-
-        foreach($hrefElems as $elem) {
-
-            $uri = $this->server->calculateUri($elem->nodeValue);
-            list($propertyList[]) = $this->server->getPropertiesForPath($uri,$properties);
-
-        }
-
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($propertyList));
-
-    }
-
-    /**
-     * This function handles the addressbook-query REPORT
-     *
-     * This report is used by the client to filter an addressbook based on a
-     * complex query.
-     *
-     * @param DOMNode $dom
-     * @return void
-     */
-    protected function addressbookQueryReport($dom) {
-
-        $query = new Sabre_CardDAV_AddressBookQueryParser($dom);
-        $query->parse();
-
-        $depth = $this->server->getHTTPDepth(0);
-
-        if ($depth==0) {
-            $candidateNodes = array(
-                $this->server->tree->getNodeForPath($this->server->getRequestUri())
-            );
-        } else {
-            $candidateNodes = $this->server->tree->getChildren($this->server->getRequestUri());
-        }
-
-        $validNodes = array();
-        foreach($candidateNodes as $node) {
-
-            if (!$node instanceof Sabre_CardDAV_ICard)
-                continue;
-
-            $blob = $node->get();
-            if (is_resource($blob)) {
-                $blob = stream_get_contents($blob);
-            }
-
-            if (!$this->validateFilters($blob, $query->filters, $query->test)) {
-                continue;
-            }
-
-            $validNodes[] = $node;
-
-            if ($query->limit && $query->limit <= count($validNodes)) {
-                // We hit the maximum number of items, we can stop now.
-                break;
-            }
-
-        }
-
-        $result = array();
-        foreach($validNodes as $validNode) {
-            if ($depth==0) { 
-                $href = $this->server->getRequestUri();
-            } else {
-                $href = $this->server->getRequestUri() . '/' . $validNode->getName();
-            }
-
-            list($result[]) = $this->server->getPropertiesForPath($href, $query->requestedProperties, 0);
-
-        }
- 
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($result));
-
-    }
-
-    /**
-     * Validates if a vcard makes it throught a list of filters.
-     * 
-     * @param string $vcardData 
-     * @param array $filters 
-     * @param string $test anyof or allof (which means OR or AND) 
-     * @return bool 
-     */
-    public function validateFilters($vcardData, array $filters, $test) {
-
-        $vcard = Sabre_VObject_Reader::read($vcardData);
-        
-        $success = true;
-
-        foreach($filters as $filter) {
-
-            $isDefined = isset($vcard->{$filter['name']});
-            if ($filter['is-not-defined']) {
-                if ($isDefined) {
-                    $success = false;
-                } else {
-                    $success = true;
-                }
-            } elseif ((!$filter['param-filters'] && !$filter['text-matches']) || !$isDefined) {
-
-                // We only need to check for existence
-                $success = $isDefined;
-                
-            } else {
-
-                $vProperties = $vcard->select($filter['name']); 
-
-                $results = array();
-                if ($filter['param-filters']) {
-                    $results[] = $this->validateParamFilters($vProperties, $filter['param-filters'], $filter['test']);
-                }
-                if ($filter['text-matches']) {
-                    $texts = array();
-                    foreach($vProperties as $vProperty)
-                        $texts[] = $vProperty->value;
-
-                    $results[] = $this->validateTextMatches($texts, $filter['text-matches'], $filter['test']);
-                }
-
-                if (count($results)===1) {
-                    $success = $results[0];
-                } else {
-                    if ($filter['test'] === 'anyof') {
-                        $success = $results[0] || $results[1];
-                    } else {
-                        $success = $results[0] && $results[1];
-                    }
-                }
-
-            } // else
-
-            // There are two conditions where we can already determine wether 
-            // or not this filter succeeds.
-            if ($test==='anyof' && $success) {
-                return true;
-            }
-            if ($test==='allof' && !$success) {
-                return false;
-            }
-
-        } // foreach
-
-        // If we got all the way here, it means we haven't been able to 
-        // determine early if the test failed or not.
-        //
-        // This implies for 'anyof' that the test failed, and for 'allof' that 
-        // we succeeded. Sounds weird, but makes sense.
-        return $test==='allof';
-
-    }
-
-    /**
-     * Validates if a param-filter can be applied to a specific property. 
-     * 
-     * @todo currently we're only validating the first parameter of the passed 
-     *       property. Any subsequence parameters with the same name are
-     *       ignored.
-     * @param Sabre_VObject_Property $vProperty 
-     * @param array $filters 
-     * @param string $test 
-     * @return bool 
-     */
-    protected function validateParamFilters(array $vProperties, array $filters, $test) {
-
-        $success = false;
-        foreach($filters as $filter) {
-
-            $isDefined = false;
-            foreach($vProperties as $vProperty) {
-                $isDefined = isset($vProperty[$filter['name']]);
-                if ($isDefined) break;
-            }
-
-            if ($filter['is-not-defined']) {
-                if ($isDefined) {
-                    $success = false;
-                } else {
-                    $success = true;
-                }
-
-            // If there's no text-match, we can just check for existence 
-            } elseif (!$filter['text-match'] || !$isDefined) {
-
-                $success = $isDefined;
-                
-            } else {
-
-                $texts = array();
-                $success = false;
-                foreach($vProperties as $vProperty) {
-                    // If we got all the way here, we'll need to validate the 
-                    // text-match filter.
-                    $success = Sabre_DAV_StringUtil::textMatch($vProperty[$filter['name']]->value, $filter['text-match']['value'], $filter['text-match']['collation'], $filter['text-match']['match-type']);
-                    if ($success) break;
-                }
-                if ($filter['text-match']['negate-condition']) {
-                    $success = !$success;
-                }
-
-            } // else
-
-            // There are two conditions where we can already determine wether 
-            // or not this filter succeeds.
-            if ($test==='anyof' && $success) {
-                return true;
-            }
-            if ($test==='allof' && !$success) {
-                return false;
-            }
-
-        } 
-
-        // If we got all the way here, it means we haven't been able to 
-        // determine early if the test failed or not.
-        //
-        // This implies for 'anyof' that the test failed, and for 'allof' that 
-        // we succeeded. Sounds weird, but makes sense.
-        return $test==='allof';
-
-    }
-
-    /**
-     * Validates if a text-filter can be applied to a specific property. 
-     * 
-     * @param array $texts
-     * @param array $filters 
-     * @param string $test 
-     * @return bool 
-     */
-    protected function validateTextMatches(array $texts, array $filters, $test) {
-
-        foreach($filters as $filter) {
-
-            $success = false;
-            foreach($texts as $haystack) {
-                $success = Sabre_DAV_StringUtil::textMatch($haystack, $filter['value'], $filter['collation'], $filter['match-type']);
-
-                // Breaking on the first match
-                if ($success) break;
-            }
-            if ($filter['negate-condition']) {
-                $success = !$success;
-            }
-            
-            if ($success && $test==='anyof')
-                return true;
-
-            if (!$success && $test=='allof')
-                return false;
-
-
-        }
-
-        // If we got all the way here, it means we haven't been able to 
-        // determine early if the test failed or not.
-        //
-        // This implies for 'anyof' that the test failed, and for 'allof' that 
-        // we succeeded. Sounds weird, but makes sense.
-        return $test==='allof';
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php b/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
deleted file mode 100644
index d57d3a6e7bd..00000000000
--- a/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * Supported-address-data property
- *
- * This property is a representation of the supported-address-data property
- * in the CardDAV namespace. 
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_Property_SupportedAddressData extends Sabre_DAV_Property {
-
-    /**
-     * supported versions
-     * 
-     * @var array 
-     */
-    protected $supportedData = array();
-    
-    /**
-     * Creates the property 
-     * 
-     * @param array $components 
-     */
-    public function __construct(array $supportedData = null) {
-
-        if (is_null($supportedData)) {
-            $supportedData = array(
-                array('contentType' => 'text/vcard', 'version' => '3.0'),
-                array('contentType' => 'text/vcard', 'version' => '4.0'),
-            );
-        }
-
-       $this->supportedData = $supportedData; 
-
-    }
-    
-    /**
-     * Serializes the property in a DOMDocument 
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $node 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-
-        $prefix = 
-            isset($server->xmlNamespaces[Sabre_CardDAV_Plugin::NS_CARDDAV]) ?
-            $server->xmlNamespaces[Sabre_CardDAV_Plugin::NS_CARDDAV] :
-            'card';
-
-        foreach($this->supportedData as $supported) {
-
-            $caldata = $doc->createElementNS(Sabre_CardDAV_Plugin::NS_CARDDAV, $prefix . ':address-data-type');
-            $caldata->setAttribute('content-type',$supported['contentType']);
-            $caldata->setAttribute('version',$supported['version']);
-            $node->appendChild($caldata);
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/CardDAV/UserAddressBooks.php b/3rdparty/Sabre/CardDAV/UserAddressBooks.php
deleted file mode 100644
index e9f2de7f741..00000000000
--- a/3rdparty/Sabre/CardDAV/UserAddressBooks.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-
-/**
- * UserAddressBooks class
- *
- * The UserAddressBooks collection contains a list of addressbooks associated with a user
- *
- * @package Sabre
- * @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sabre_DAV_IExtendedCollection, Sabre_DAVACL_IACL {
-
-    /**
-     * Principal uri
-     * 
-     * @var array 
-     */
-    protected $principalUri;
-
-    /**
-     * carddavBackend 
-     * 
-     * @var Sabre_CardDAV_Backend_Abstract 
-     */
-    protected $carddavBackend;
-
-    /**
-     * Constructor 
-     * 
-     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend 
-     * @param string $principalUri 
-     */
-    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend, $principalUri) {
-
-        $this->carddavBackend = $carddavBackend;
-        $this->principalUri = $principalUri;
-       
-    }
-
-    /**
-     * Returns the name of this object 
-     * 
-     * @return string
-     */
-    public function getName() {
-      
-        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalUri);
-        return $name; 
-
-    }
-
-    /**
-     * Updates the name of this object 
-     * 
-     * @param string $name 
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed();
-
-    }
-
-    /**
-     * Deletes this object 
-     * 
-     * @return void
-     */
-    public function delete() {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed();
-
-    }
-
-    /**
-     * Returns the last modification date 
-     * 
-     * @return int 
-     */
-    public function getLastModified() {
-
-        return null; 
-
-    }
-
-    /**
-     * Creates a new file under this object.
-     *
-     * This is currently not allowed
-     * 
-     * @param string $filename 
-     * @param resource $data 
-     * @return void
-     */
-    public function createFile($filename, $data=null) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new files in this collection is not supported');
-
-    }
-
-    /**
-     * Creates a new directory under this object.
-     *
-     * This is currently not allowed.
-     * 
-     * @param string $filename 
-     * @return void
-     */
-    public function createDirectory($filename) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new collections in this collection is not supported');
-
-    }
-
-    /**
-     * Returns a single calendar, by name 
-     * 
-     * @param string $name
-     * @todo needs optimizing
-     * @return Sabre_CardDAV_AddressBook
-     */
-    public function getChild($name) {
-
-        foreach($this->getChildren() as $child) {
-            if ($name==$child->getName())
-                return $child;
-
-        }
-        throw new Sabre_DAV_Exception_FileNotFound('Addressbook with name \'' . $name . '\' could not be found');
-
-    }
-
-    /**
-     * Returns a list of addressbooks 
-     * 
-     * @return array 
-     */
-    public function getChildren() {
-
-        $addressbooks = $this->carddavBackend->getAddressbooksForUser($this->principalUri);
-        $objs = array();
-        foreach($addressbooks as $addressbook) {
-            $objs[] = new Sabre_CardDAV_AddressBook($this->carddavBackend, $addressbook);
-        }
-        return $objs;
-
-    }
-
-    /**
-     * Creates a new addressbook 
-     * 
-     * @param string $name
-     * @param array $resourceType 
-     * @param array $properties 
-     * @return void
-     */
-    public function createExtendedCollection($name, array $resourceType, array $properties) {
-
-        if (!in_array('{'.Sabre_CardDAV_Plugin::NS_CARDDAV.'}addressbook',$resourceType) || count($resourceType)!==2) {
-            throw new Sabre_DAV_Exception_InvalidResourceType('Unknown resourceType for this collection');
-        }
-        $this->carddavBackend->createAddressBook($this->principalUri, $name, $properties);
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner 
-     * 
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalUri;
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     * 
-     * @return string|null 
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to 
-     *      be updated. 
-     * 
-     * @return array 
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalUri,
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->principalUri,
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's. 
-     * 
-     * @param array $acl 
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/CardDAV/Version.php b/3rdparty/Sabre/CardDAV/Version.php
deleted file mode 100644
index 900fbf5e75c..00000000000
--- a/3rdparty/Sabre/CardDAV/Version.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Version Class
- *
- * This class contains the Sabre_CardDAV version information
- * 
- * @package Sabre
- * @subpackage CardDAV 
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_CardDAV_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.5.3';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php b/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
deleted file mode 100644
index 11bab8c7af7..00000000000
--- a/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * HTTP Basic authentication backend class
- *
- * This class can be used by authentication objects wishing to use HTTP Basic
- * Most of the digest logic is handled, implementors just need to worry about
- * the validateUserPass method.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author James David Low (http://jameslow.com/)
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Auth_Backend_AbstractBasic implements Sabre_DAV_Auth_IBackend {
-
-    /**
-     * This variable holds the currently logged in username.
-     *
-     * @var string|null
-     */
-    protected $currentUser;
-
-    /**
-     * Validates a username and password
-     *
-     * This method should return true or false depending on if login
-     * succeeded.
-     *
-     * @return bool
-     */
-    abstract protected function validateUserPass($username, $password);
-
-    /**
-     * Returns information about the currently logged in username.
-     *
-     * If nobody is currently logged in, this method should return null.
-     *
-     * @return string|null
-     */
-    public function getCurrentUser() {
-        return $this->currentUser;
-    }
-
-
-    /**
-     * Authenticates the user based on the current request.
-     *
-     * If authentication is succesful, true must be returned.
-     * If authentication fails, an exception must be thrown.
-     *
-     * @throws Sabre_DAV_Exception_NotAuthenticated
-     * @return bool
-     */
-    public function authenticate(Sabre_DAV_Server $server,$realm) {
-
-        $auth = new Sabre_HTTP_BasicAuth();
-        $auth->setHTTPRequest($server->httpRequest);
-        $auth->setHTTPResponse($server->httpResponse);
-        $auth->setRealm($realm);
-        $userpass = $auth->getUserPass();
-        if (!$userpass) {
-            $auth->requireLogin();
-            throw new Sabre_DAV_Exception_NotAuthenticated('No basic authentication headers were found');
-        }
-
-        // Authenticates the user
-        if (!$this->validateUserPass($userpass[0],$userpass[1])) {
-            $auth->requireLogin();
-            throw new Sabre_DAV_Exception_NotAuthenticated('Username or password does not match');
-        }
-        $this->currentUser = $userpass[0];
-        return true;
-    }
-
-
-} 
-
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php b/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
deleted file mode 100644
index 5bdc72753ec..00000000000
--- a/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * HTTP Digest authentication backend class
- *
- * This class can be used by authentication objects wishing to use HTTP Digest
- * Most of the digest logic is handled, implementors just need to worry about 
- * the getDigestHash method 
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Auth_Backend_AbstractDigest implements Sabre_DAV_Auth_IBackend {
-
-    /**
-     * This variable holds the currently logged in username.
-     * 
-     * @var array|null
-     */
-    protected $currentUser;
-
-    /**
-     * Returns a users digest hash based on the username and realm.
-     *
-     * If the user was not known, null must be returned. 
-     * 
-     * @param string $realm
-     * @param string $username 
-     * @return string|null 
-     */
-    abstract public function getDigestHash($realm,$username);
-
-    /**
-     * Authenticates the user based on the current request.
-     *
-     * If authentication is succesful, true must be returned.
-     * If authentication fails, an exception must be thrown.
-     *
-     * @throws Sabre_DAV_Exception_NotAuthenticated
-     * @return bool 
-     */
-    public function authenticate(Sabre_DAV_Server $server,$realm) {
-
-        $digest = new Sabre_HTTP_DigestAuth();
-
-        // Hooking up request and response objects
-        $digest->setHTTPRequest($server->httpRequest);
-        $digest->setHTTPResponse($server->httpResponse);
-
-        $digest->setRealm($realm);
-        $digest->init();
-
-        $username = $digest->getUsername();
-
-        // No username was given
-        if (!$username) {
-            $digest->requireLogin();
-            throw new Sabre_DAV_Exception_NotAuthenticated('No digest authentication headers were found');
-        }
-
-        $hash = $this->getDigestHash($realm, $username);
-        // If this was false, the user account didn't exist
-        if ($hash===false || is_null($hash)) {
-            $digest->requireLogin();
-            throw new Sabre_DAV_Exception_NotAuthenticated('The supplied username was not on file');
-        }
-        if (!is_string($hash)) {
-            throw new Sabre_DAV_Exception('The returned value from getDigestHash must be a string or null');
-        }
-
-        // If this was false, the password or part of the hash was incorrect.
-        if (!$digest->validateA1($hash)) {
-            $digest->requireLogin();
-            throw new Sabre_DAV_Exception_NotAuthenticated('Incorrect username');
-        }
-
-        $this->currentUser = $username;
-        return true;
-
-    }
-
-    /**
-     * Returns the currently logged in username. 
-     * 
-     * @return string|null 
-     */
-    public function getCurrentUser() {
-
-        return $this->currentUser;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/Apache.php b/3rdparty/Sabre/DAV/Auth/Backend/Apache.php
deleted file mode 100644
index 6bcd76bdcb0..00000000000
--- a/3rdparty/Sabre/DAV/Auth/Backend/Apache.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Apache authenticator
- *
- * This authentication backend assumes that authentication has been
- * conifgured in apache, rather than within SabreDAV.
- *
- * Make sure apache is properly configured for this to work.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Auth_Backend_Apache implements Sabre_DAV_Auth_IBackend {
-
-    /**
-     * Current apache user 
-     * 
-     * @var string 
-     */
-    protected $remoteUser;
-    
-    /**
-     * Authenticates the user based on the current request.
-     *
-     * If authentication is succesful, true must be returned.
-     * If authentication fails, an exception must be thrown.
-     *
-     * @return bool 
-     */
-    public function authenticate(Sabre_DAV_Server $server,$realm) {
-
-        $remoteUser = $server->httpRequest->getRawServerValue('REMOTE_USER');
-        if (is_null($remoteUser)) {
-            throw new Sabre_DAV_Exception('We did not receive the $_SERVER[REMOTE_USER] property. This means that apache might have been misconfigured');
-        }
-
-        $this->remoteUser = $remoteUser;
-        return true;
-
-    }
-
-    /**
-     * Returns information about the currently logged in user.
-     *
-     * If nobody is currently logged in, this method should return null.
-     * 
-     * @return array|null
-     */
-    public function getCurrentUser() {
-
-        return $this->remoteUser;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/File.php b/3rdparty/Sabre/DAV/Auth/Backend/File.php
deleted file mode 100644
index db1f04c4772..00000000000
--- a/3rdparty/Sabre/DAV/Auth/Backend/File.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * This is an authentication backend that uses a file to manage passwords.
- *
- * The backend file must conform to Apache's htdigest format
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Auth_Backend_File extends Sabre_DAV_Auth_Backend_AbstractDigest {
-
-    /**
-     * List of users 
-     * 
-     * @var array
-     */
-    protected $users = array();
-
-    /**
-     * Creates the backend object. 
-     *
-     * If the filename argument is passed in, it will parse out the specified file fist.
-     * 
-     * @param string $filename 
-     * @return void
-     */
-    public function __construct($filename=null) {
-
-        if (!is_null($filename))
-            $this->loadFile($filename);
-
-    }
-
-    /**
-     * Loads an htdigest-formatted file. This method can be called multiple times if
-     * more than 1 file is used.
-     * 
-     * @param string $filename 
-     * @return void
-     */
-    public function loadFile($filename) {
-
-        foreach(file($filename,FILE_IGNORE_NEW_LINES) as $line) {
-
-            if (substr_count($line, ":") !== 2) 
-                throw new Sabre_DAV_Exception('Malformed htdigest file. Every line should contain 2 colons');
-            
-            list($username,$realm,$A1) = explode(':',$line);
-
-            if (!preg_match('/^[a-zA-Z0-9]{32}$/', $A1))
-                throw new Sabre_DAV_Exception('Malformed htdigest file. Invalid md5 hash');
-                
-            $this->users[$realm . ':' . $username] = $A1;
-
-        }
-
-    }
-
-    /**
-     * Returns a users' information
-     * 
-     * @param string $realm 
-     * @param string $username 
-     * @return string 
-     */
-    public function getDigestHash($realm, $username) {
-
-        return isset($this->users[$realm . ':' . $username])?$this->users[$realm . ':' . $username]:false;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/PDO.php b/3rdparty/Sabre/DAV/Auth/Backend/PDO.php
deleted file mode 100644
index 0301503601e..00000000000
--- a/3rdparty/Sabre/DAV/Auth/Backend/PDO.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * This is an authentication backend that uses a file to manage passwords.
- *
- * The backend file must conform to Apache's htdigest format
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Auth_Backend_PDO extends Sabre_DAV_Auth_Backend_AbstractDigest {
-
-    /**
-     * Reference to PDO connection 
-     * 
-     * @var PDO 
-     */
-    protected $pdo;
-
-    /**
-     * PDO table name we'll be using  
-     * 
-     * @var string
-     */
-    protected $tableName;
-
-
-    /**
-     * Creates the backend object. 
-     *
-     * If the filename argument is passed in, it will parse out the specified file fist.
-     * 
-     * @param string $filename
-     * @param string $tableName The PDO table name to use 
-     * @return void
-     */
-    public function __construct(PDO $pdo, $tableName = 'users') {
-
-        $this->pdo = $pdo;
-        $this->tableName = $tableName;
-
-    }
-
-    /**
-     * Returns the digest hash for a user. 
-     * 
-     * @param string $realm 
-     * @param string $username 
-     * @return string|null 
-     */
-    public function getDigestHash($realm,$username) {
-
-        $stmt = $this->pdo->prepare('SELECT username, digesta1 FROM `'.$this->tableName.'` WHERE username = ?');
-        $stmt->execute(array($username));
-        $result = $stmt->fetchAll();
-
-        if (!count($result)) return;
-
-        return $result[0]['digesta1'];
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Auth/IBackend.php b/3rdparty/Sabre/DAV/Auth/IBackend.php
deleted file mode 100644
index 1f67af4c2d9..00000000000
--- a/3rdparty/Sabre/DAV/Auth/IBackend.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * This is the base class for any authentication object.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_Auth_IBackend {
-
-    /**
-     * Authenticates the user based on the current request.
-     *
-     * If authentication is succesful, true must be returned.
-     * If authentication fails, an exception must be thrown.
-     *
-     * @return bool 
-     */
-    function authenticate(Sabre_DAV_Server $server,$realm); 
-
-    /**
-     * Returns information about the currently logged in username.
-     *
-     * If nobody is currently logged in, this method should return null.
-     * 
-     * @return string|null
-     */
-    function getCurrentUser();
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Auth/Plugin.php b/3rdparty/Sabre/DAV/Auth/Plugin.php
deleted file mode 100644
index f3718fcf469..00000000000
--- a/3rdparty/Sabre/DAV/Auth/Plugin.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * This plugin provides Authentication for a WebDAV server.
- * 
- * It relies on a Backend object, which provides user information.
- *
- * Additionally, it provides support for:
- *  * {DAV:}current-user-principal property from RFC5397
- *  * {DAV:}principal-collection-set property from RFC3744
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Auth_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * Reference to main server object 
-     * 
-     * @var Sabre_DAV_Server 
-     */
-    private $server;
-
-    /**
-     * Authentication backend
-     * 
-     * @var Sabre_DAV_Auth_Backend_Abstract 
-     */
-    private $authBackend;
-
-    /**
-     * The authentication realm. 
-     * 
-     * @var string 
-     */
-    private $realm;
-
-    /**
-     * __construct 
-     * 
-     * @param Sabre_DAV_Auth_Backend_Abstract $authBackend 
-     * @param string $realm 
-     * @return void
-     */
-    public function __construct(Sabre_DAV_Auth_IBackend $authBackend, $realm) {
-
-        $this->authBackend = $authBackend;
-        $this->realm = $realm;
-
-    }
-
-    /**
-     * Initializes the plugin. This function is automatically called by the server  
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),10);
-
-    }
-
-    /**
-     * Returns a plugin name.
-     * 
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre_DAV_Server::getPlugin 
-     * 
-     * @return string 
-     */
-    public function getPluginName() {
-
-        return 'auth';
-
-    }
-
-    /**
-     * Returns the current users' principal uri.
-     * 
-     * If nobody is logged in, this will return null. 
-     * 
-     * @return string|null 
-     */
-    public function getCurrentUser() {
-
-        $userInfo = $this->authBackend->getCurrentUser();
-        if (!$userInfo) return null;
-
-        return $userInfo;
-
-    }
-
-    /**
-     * This method is called before any HTTP method and forces users to be authenticated
-     * 
-     * @param string $method
-     * @throws Sabre_DAV_Exception_NotAuthenticated
-     * @return bool 
-     */
-    public function beforeMethod($method, $uri) {
-
-        $this->authBackend->authenticate($this->server,$this->realm);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Browser/GuessContentType.php b/3rdparty/Sabre/DAV/Browser/GuessContentType.php
deleted file mode 100644
index ee8c698d782..00000000000
--- a/3rdparty/Sabre/DAV/Browser/GuessContentType.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
- * GuessContentType plugin
- *
- * A lot of the built-in File objects just return application/octet-stream
- * as a content-type by default. This is a problem for some clients, because
- * they expect a correct contenttype.
- *
- * There's really no accurate, fast and portable way to determine the contenttype
- * so this extension does what the rest of the world does, and guesses it based
- * on the file extension.
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Browser_GuessContentType extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * List of recognized file extensions
-     *
-     * Feel free to add more
-     *
-     * @var array
-     */
-    public $extensionMap = array(
-
-        // images
-        'jpg' => 'image/jpeg',
-        'gif' => 'image/gif',
-        'png' => 'image/png',
-
-        // groupware
-        'ics' => 'text/calendar',
-        'vcf' => 'text/x-vcard',
-
-        // text
-        'txt' => 'text/plain',
-
-    );
-
-    /**
-     * Initializes the plugin 
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        // Using a relatively low priority (200) to allow other extensions
-        // to set the content-type first.
-        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'),200);
-
-    }
-
-    /**
-     * Handler for teh afterGetProperties event 
-     * 
-     * @param string $path 
-     * @param array $properties 
-     * @return void
-     */
-    public function afterGetProperties($path, &$properties) {
-
-        if (array_key_exists('{DAV:}getcontenttype', $properties[404])) {
-           
-            list(, $fileName) = Sabre_DAV_URLUtil::splitPath($path);
-            $contentType = $this->getContentType($fileName);
-
-            if ($contentType) {
-                $properties[200]['{DAV:}getcontenttype'] = $contentType;
-                unset($properties[404]['{DAV:}getcontenttype']);
-            }
-
-        }
-
-    }
-
-    /**
-     * Simple method to return the contenttype
-     * 
-     * @param string $fileName 
-     * @return string 
-     */
-    protected function getContentType($fileName) {
-
-        // Just grabbing the extension
-        $extension = strtolower(substr($fileName,strrpos($fileName,'.')+1));
-        if (isset($this->extensionMap[$extension]))
-            return $this->extensionMap[$extension];
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php b/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
deleted file mode 100644
index a66b57a3a90..00000000000
--- a/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * This is a simple plugin that will map any GET request for non-files to 
- * PROPFIND allprops-requests.
- *
- * This should allow easy debugging of PROPFIND
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Browser_MapGetToPropFind extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * reference to server class 
-     * 
-     * @var Sabre_DAV_Server 
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin and subscribes to events 
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
-    }
-
-    /**
-     * This method intercepts GET requests to non-files, and changes it into an HTTP PROPFIND request 
-     * 
-     * @param string $method 
-     * @return bool 
-     */
-    public function httpGetInterceptor($method, $uri) {
-
-        if ($method!='GET') return true;
-       
-        $node = $this->server->tree->getNodeForPath($uri);
-        if ($node instanceof Sabre_DAV_IFile) return;
-
-        $this->server->invokeMethod('PROPFIND',$uri);
-        return false;
-        
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Browser/Plugin.php b/3rdparty/Sabre/DAV/Browser/Plugin.php
deleted file mode 100644
index cd5617babb1..00000000000
--- a/3rdparty/Sabre/DAV/Browser/Plugin.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-
-/**
- * Browser Plugin
- *
- * This plugin provides a html representation, so that a WebDAV server may be accessed
- * using a browser.
- *
- * The class intercepts GET requests to collection resources and generates a simple 
- * html index. 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Browser_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * reference to server class 
-     * 
-     * @var Sabre_DAV_Server 
-     */
-    protected $server;
-
-    /**
-     * enableEditing
-     * 
-     * @var bool 
-     */
-    protected $enablePost = true;
-
-    /**
-     * Creates the object.
-     *
-     * By default it will allow file creation and uploads.
-     * Specify the first argument as false to disable this
-     * 
-     * @param bool $enablePost 
-     * @return void
-     */
-    public function __construct($enablePost=true) {
-
-        $this->enablePost = $enablePost; 
-
-    }
-
-    /**
-     * Initializes the plugin and subscribes to events 
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
-        if ($this->enablePost) $this->server->subscribeEvent('unknownMethod',array($this,'httpPOSTHandler'));
-    }
-
-    /**
-     * This method intercepts GET requests to collections and returns the html 
-     * 
-     * @param string $method 
-     * @return bool 
-     */
-    public function httpGetInterceptor($method, $uri) {
-
-        if ($method!='GET') return true;
-
-        try { 
-            $node = $this->server->tree->getNodeForPath($uri);
-        } catch (Sabre_DAV_Exception_FileNotFound $e) {
-            // We're simply stopping when the file isn't found to not interfere 
-            // with other plugins.
-            return;
-        }
-        if ($node instanceof Sabre_DAV_IFile) 
-            return;
-
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->setHeader('Content-Type','text/html; charset=utf-8');
-
-        $this->server->httpResponse->sendBody(
-            $this->generateDirectoryIndex($uri)
-        );
-
-        return false;
-        
-    }
-
-    /**
-     * Handles POST requests for tree operations
-     * 
-     * This method is not yet used.
-     * 
-     * @param string $method 
-     * @return bool
-     */
-    public function httpPOSTHandler($method, $uri) {
-
-        if ($method!='POST') return true;
-        if (isset($_POST['sabreAction'])) switch($_POST['sabreAction']) {
-
-            case 'mkcol' :
-                if (isset($_POST['name']) && trim($_POST['name'])) {
-                    // Using basename() because we won't allow slashes
-                    list(, $folderName) = Sabre_DAV_URLUtil::splitPath(trim($_POST['name']));
-                    $this->server->createDirectory($uri . '/' . $folderName);
-                }
-                break;
-            case 'put' :
-                if ($_FILES) $file = current($_FILES);
-                else break;
-                $newName = trim($file['name']);
-                list(, $newName) = Sabre_DAV_URLUtil::splitPath(trim($file['name']));
-                if (isset($_POST['name']) && trim($_POST['name']))
-                    $newName = trim($_POST['name']);
-
-                // Making sure we only have a 'basename' component
-                list(, $newName) = Sabre_DAV_URLUtil::splitPath($newName);
-                    
-               
-                if (is_uploaded_file($file['tmp_name'])) {
-                    $parent = $this->server->tree->getNodeForPath(trim($uri,'/'));
-                    $parent->createFile($newName,fopen($file['tmp_name'],'r'));
-                }
-
-        }
-        $this->server->httpResponse->setHeader('Location',$this->server->httpRequest->getUri());
-        return false;
-
-    }
-
-    /**
-     * Escapes a string for html. 
-     * 
-     * @param string $value 
-     * @return void
-     */
-    public function escapeHTML($value) {
-
-        return htmlspecialchars($value,ENT_QUOTES,'UTF-8');
-
-    }
-
-    /**
-     * Generates the html directory index for a given url 
-     *
-     * @param string $path 
-     * @return string 
-     */
-    public function generateDirectoryIndex($path) {
-
-        $html = "<html>
-<head>
-  <title>Index for " . $this->escapeHTML($path) . "/ - SabreDAV " . Sabre_DAV_Version::VERSION . "</title>
-  <style type=\"text/css\"> body { Font-family: arial}</style>
-</head>
-<body>
-  <h1>Index for " . $this->escapeHTML($path) . "/</h1>
-  <table>
-    <tr><th>Name</th><th>Type</th><th>Size</th><th>Last modified</th></tr>
-    <tr><td colspan=\"4\"><hr /></td></tr>";
-    
-    $files = $this->server->getPropertiesForPath($path,array(
-        '{DAV:}displayname',
-        '{DAV:}resourcetype',
-        '{DAV:}getcontenttype',
-        '{DAV:}getcontentlength',
-        '{DAV:}getlastmodified',
-    ),1);
-
-    $parent = $this->server->tree->getNodeForPath($path);
-
-
-    if ($path) {
-
-        list($parentUri) = Sabre_DAV_URLUtil::splitPath($path);
-        $fullPath = Sabre_DAV_URLUtil::encodePath($this->server->getBaseUri() . $parentUri);
-
-        $html.= "<tr>
-<td><a href=\"{$fullPath}\">..</a></td>
-<td>[parent]</td>
-<td></td>
-<td></td>
-</tr>";
-
-    }
-
-    foreach($files as $k=>$file) {
-
-        // This is the current directory, we can skip it
-        if (rtrim($file['href'],'/')==$path) continue;
-
-        list(, $name) = Sabre_DAV_URLUtil::splitPath($file['href']);
-
-        $type = null;
-
-
-        if (isset($file[200]['{DAV:}resourcetype'])) {
-            $type = $file[200]['{DAV:}resourcetype']->getValue();
-
-            // resourcetype can have multiple values
-            if (!is_array($type)) $type = array($type);
-
-            foreach($type as $k=>$v) { 
-
-                // Some name mapping is preferred 
-                switch($v) {
-                    case '{DAV:}collection' :
-                        $type[$k] = 'Collection';
-                        break;
-                    case '{DAV:}principal' :
-                        $type[$k] = 'Principal';
-                        break;
-                    case '{urn:ietf:params:xml:ns:carddav}addressbook' :
-                        $type[$k] = 'Addressbook';
-                        break;
-                    case '{urn:ietf:params:xml:ns:caldav}calendar' :
-                        $type[$k] = 'Calendar';
-                        break;
-                }
-
-            }
-            $type = implode(', ', $type);
-        }
-
-        // If no resourcetype was found, we attempt to use
-        // the contenttype property
-        if (!$type && isset($file[200]['{DAV:}getcontenttype'])) {
-            $type = $file[200]['{DAV:}getcontenttype'];
-        }
-        if (!$type) $type = 'Unknown';
-
-        $size = isset($file[200]['{DAV:}getcontentlength'])?(int)$file[200]['{DAV:}getcontentlength']:'';
-        $lastmodified = isset($file[200]['{DAV:}getlastmodified'])?$file[200]['{DAV:}getlastmodified']->getTime()->format(DateTime::ATOM):'';
-
-        $fullPath = Sabre_DAV_URLUtil::encodePath('/' . trim($this->server->getBaseUri() . ($path?$path . '/':'') . $name,'/'));
-
-        $displayName = isset($file[200]['{DAV:}displayname'])?$file[200]['{DAV:}displayname']:$name;
-
-        $name = $this->escapeHTML($name);
-        $displayName = $this->escapeHTML($displayName);
-        $type = $this->escapeHTML($type);
-
-        $html.= "<tr>
-<td><a href=\"{$fullPath}\">{$displayName}</a></td>
-<td>{$type}</td>
-<td>{$size}</td>
-<td>{$lastmodified}</td>
-</tr>";
-
-    }
-
-  $html.= "<tr><td colspan=\"4\"><hr /></td></tr>";
-
-  if ($this->enablePost && $parent instanceof Sabre_DAV_ICollection) {
-      $html.= '<tr><td><form method="post" action="">
-            <h3>Create new folder</h3>
-            <input type="hidden" name="sabreAction" value="mkcol" />
-            Name: <input type="text" name="name" /><br />
-            <input type="submit" value="create" />
-            </form>
-            <form method="post" action="" enctype="multipart/form-data">
-            <h3>Upload file</h3>
-            <input type="hidden" name="sabreAction" value="put" />
-            Name (optional): <input type="text" name="name" /><br />
-            File: <input type="file" name="file" /><br />
-            <input type="submit" value="upload" />
-            </form>
-       </td></tr>';
-  }
-
-  $html.= "</table>
-  <address>Generated by SabreDAV " . Sabre_DAV_Version::VERSION ."-". Sabre_DAV_Version::STABILITY . " (c)2007-2011 <a href=\"http://code.google.com/p/sabredav/\">http://code.google.com/p/sabredav/</a></address>
-</body>
-</html>";
-
-        return $html; 
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Client.php b/3rdparty/Sabre/DAV/Client.php
deleted file mode 100644
index fc6a6fff083..00000000000
--- a/3rdparty/Sabre/DAV/Client.php
+++ /dev/null
@@ -1,431 +0,0 @@
-<?php
-
-/**
- * SabreDAV DAV client
- *
- * This client wraps around Curl to provide a convenient API to a WebDAV 
- * server.
- *
- * NOTE: This class is experimental, it's api will likely change in the future.
- * 
- * @package Sabre
- * @subpackage DAVClient
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Client {
-
-    public $propertyMap = array();
-
-    protected $baseUri;
-    protected $userName;
-    protected $password;
-    protected $proxy;
-
-    /**
-     * Constructor
-     *
-     * Settings are provided through the 'settings' argument. The following 
-     * settings are supported:
-     *
-     *   * baseUri
-     *   * userName (optional)
-     *   * password (optional)
-     *   * proxy (optional)
-     * 
-     * @param array $settings 
-     */
-    public function __construct(array $settings) {
-
-        if (!isset($settings['baseUri'])) {
-            throw new InvalidArgumentException('A baseUri must be provided');
-        }
-        
-        $validSettings = array(
-            'baseUri',
-            'userName',
-            'password',
-            'proxy'
-        );
-
-        foreach($validSettings as $validSetting) {
-            if (isset($settings[$validSetting])) {
-                $this->$validSetting = $settings[$validSetting];
-            }
-        }
-
-        $this->propertyMap['{DAV:}resourcetype'] = 'Sabre_DAV_Property_ResourceType';
-
-    }
-
-    /**
-     * Does a PROPFIND request
-     *
-     * The list of requested properties must be specified as an array, in clark 
-     * notation. 
-     *
-     * The returned array will contain a list of filenames as keys, and 
-     * properties as values.
-     *
-     * The properties array will contain the list of properties. Only properties 
-     * that are actually returned from the server (without error) will be 
-     * returned, anything else is discarded.
-     *
-     * Depth should be either 0 or 1. A depth of 1 will cause a request to be 
-     * made to the server to also return all child resources.
-     *
-     * @param string $url 
-     * @param array $properties 
-     * @param int $depth 
-     * @return array 
-     */
-    public function propFind($url, array $properties, $depth = 0) {
-
-        $body = '<?xml version="1.0"?>' . "\n";
-        $body.= '<d:propfind xmlns:d="DAV:">' . "\n";
-        $body.= '  <d:prop>' . "\n";
-
-        foreach($properties as $property) {
-
-            list(
-                $namespace,
-                $elementName
-            ) = Sabre_DAV_XMLUtil::parseClarkNotation($property);
-
-            if ($namespace === 'DAV:') {
-                $body.='    <d:' . $elementName . ' />' . "\n";
-            } else {
-                $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\"/>\n";
-            }
-
-        }
-
-        $body.= '  </d:prop>' . "\n";
-        $body.= '</d:propfind>';
-
-        $response = $this->request('PROPFIND', $url, $body, array(
-            'Depth' => $depth,
-            'Content-Type' => 'application/xml'
-        ));
-
-        $result = $this->parseMultiStatus($response['body']);
-
-        // If depth was 0, we only return the top item
-        if ($depth===0) {
-            reset($result);
-            $result = current($result);
-            return $result[200];
-        }
-
-        $newResult = array();
-        foreach($result as $href => $statusList) {
-
-            $newResult[$href] = $statusList[200];
-
-        }
-
-        return $newResult;
-
-    }
-
-    /**
-     * Updates a list of properties on the server
-     *
-     * The list of properties must have clark-notation properties for the keys, 
-     * and the actual (string) value for the value. If the value is null, an 
-     * attempt is made to delete the property. 
-     *
-     * @todo Must be building the request using the DOM, and does not yet 
-     *       support complex properties. 
-     * @param string $url 
-     * @param array $properties 
-     * @return void
-     */
-    public function propPatch($url, array $properties) {
-
-        $body = '<?xml version="1.0"?>' . "\n";
-        $body.= '<d:propertyupdate xmlns:d="DAV:">' . "\n";
-
-        foreach($properties as $propName => $propValue) {
-
-            list(
-                $namespace,
-                $elementName
-            ) = Sabre_DAV_XMLUtil::parseClarkNotation($propName);
-
-            if ($propValue === null) {
-
-                $body.="<d:remove><d:prop>\n";
-
-                if ($namespace === 'DAV:') {
-                    $body.='    <d:' . $elementName . ' />' . "\n";
-                } else {
-                    $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\"/>\n";
-                }
-
-                $body.="</d:prop></d:remove>\n";
-
-            } else {
-
-                $body.="<d:set><d:prop>\n";
-                if ($namespace === 'DAV:') {
-                    $body.='    <d:' . $elementName . '>';
-                } else {
-                    $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\">";
-                }
-                // Shitty.. i know
-                $body.=htmlspecialchars($propValue, ENT_NOQUOTES, 'UTF-8'); 
-                if ($namespace === 'DAV:') {
-                    $body.='</d:' . $elementName . '>' . "\n";
-                } else {
-                    $body.="</x:" . $elementName . ">\n";
-                }
-                $body.="</d:prop></d:set>\n";
-
-            }
-
-        }
-
-        $body.= '</d:propertyupdate>';
-
-        $response = $this->request('PROPPATCH', $url, $body, array(
-            'Content-Type' => 'application/xml'
-        ));
-
-    }
-
-    /**
-     * Performs an HTTP options request
-     *
-     * This method returns all the features from the 'DAV:' header as an array. 
-     * If there was no DAV header, or no contents this method will return an 
-     * empty array. 
-     * 
-     * @return array 
-     */
-    public function options() {
-
-        $result = $this->request('OPTIONS');
-        if (!isset($result['headers']['dav'])) {
-            return array();
-        }
-
-        $features = explode(',', $result['headers']['dav']);
-        foreach($features as &$v) {
-            $v = trim($v);
-        }
-        return $features;
-
-    }
-
-    /**
-     * Performs an actual HTTP request, and returns the result.
-     *
-     * If the specified url is relative, it will be expanded based on the base 
-     * url.
-     *
-     * The returned array contains 3 keys:
-     *   * body - the response body
-     *   * httpCode - a HTTP code (200, 404, etc)
-     *   * headers - a list of response http headers. The header names have 
-     *     been lowercased.
-     *
-     * @param string $method 
-     * @param string $url 
-     * @param string $body 
-     * @param array $headers 
-     * @return array 
-     */
-    public function request($method, $url = '', $body = null, $headers = array()) {
-
-        $url = $this->getAbsoluteUrl($url);
-
-        $curlSettings = array(
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_CUSTOMREQUEST => $method,
-            CURLOPT_POSTFIELDS => $body,
-            // Return headers as part of the response
-            CURLOPT_HEADER => true
-        );
-
-        // Adding HTTP headers
-        $nHeaders = array(); 
-        foreach($headers as $key=>$value) {
-
-            $nHeaders[] = $key . ': ' . $value;
-
-        }
-        $curlSettings[CURLOPT_HTTPHEADER] = $nHeaders;
-
-        if ($this->proxy) {
-            $curlSettings[CURLOPT_PROXY] = $this->proxy;
-        }
-
-        if ($this->userName) {
-            $curlSettings[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC | CURLAUTH_DIGEST;
-            $curlSettings[CURLOPT_USERPWD] = $this->userName . ':' . $this->password;
-        }
-
-        list(
-            $response,
-            $curlInfo,
-            $curlErrNo,
-            $curlError
-        ) = $this->curlRequest($url, $curlSettings);
-
-        $headerBlob = substr($response, 0, $curlInfo['header_size']);
-        $response = substr($response, $curlInfo['header_size']);
-
-        // In the case of 100 Continue, or redirects we'll have multiple lists 
-        // of headers for each separate HTTP response. We can easily split this 
-        // because they are separated by \r\n\r\n
-        $headerBlob = explode("\r\n\r\n", trim($headerBlob, "\r\n"));
-        
-        // We only care about the last set of headers
-        $headerBlob = $headerBlob[count($headerBlob)-1];
-
-        // Splitting headers
-        $headerBlob = explode("\r\n", $headerBlob);
-        
-        $headers = array();
-        foreach($headerBlob as $header) {
-            $parts = explode(':', $header, 2);
-            if (count($parts)==2) {
-                $headers[strtolower(trim($parts[0]))] = trim($parts[1]);
-            }
-        }
-
-        $response = array(
-            'body' => $response,
-            'statusCode' => $curlInfo['http_code'],
-            'headers' => $headers
-        );
-
-        if ($curlErrNo) {
-            throw new Sabre_DAV_Exception('[CURL] Error while making request: ' . $curlError . ' (error code: ' . $curlErrNo . ')');
-        } 
-
-        if ($response['statusCode']>=400) {
-            throw new Sabre_DAV_Exception('HTTP error response. (errorcode ' . $response['statusCode'] . ')');
-        }
-
-        return $response;
-
-    }
-
-    /**
-     * Wrapper for all curl functions.
-     *
-     * The only reason this was split out in a separate method, is so it 
-     * becomes easier to unittest. 
-     *
-     * @param string $url
-     * @param array $settings 
-     * @return  
-     */
-    protected function curlRequest($url, $settings) {
-
-        $curl = curl_init($url);
-        curl_setopt_array($curl, $settings);
-
-        return array(
-            curl_exec($curl),
-            curl_getinfo($curl),
-            curl_errno($curl),
-            curl_error($curl)
-        );
-
-    }
-
-    /**
-     * Returns the full url based on the given url (which may be relative). All 
-     * urls are expanded based on the base url as given by the server. 
-     * 
-     * @param string $url 
-     * @return string 
-     */
-    protected function getAbsoluteUrl($url) {
-
-        // If the url starts with http:// or https://, the url is already absolute. 
-        if (preg_match('/^http(s?):\/\//', $url)) {
-            return $url;
-        }
-
-        // If the url starts with a slash, we must calculate the url based off 
-        // the root of the base url.
-        if (strpos($url,'/') === 0) {
-            $parts = parse_url($this->baseUri);
-            return $parts['scheme'] . '://' . $parts['host'] . (isset($parts['port'])?':' . $parts['port']:'') . $url;
-        }
-
-        // Otherwise...
-        return $this->baseUri . $url;
-
-    }
-
-    /**
-     * Parses a WebDAV multistatus response body
-     * 
-     * This method returns an array with the following structure
-     *
-     * array(
-     *   'url/to/resource' => array(
-     *     '200' => array(
-     *        '{DAV:}property1' => 'value1',
-     *        '{DAV:}property2' => 'value2',
-     *     ),
-     *     '404' => array(
-     *        '{DAV:}property1' => null,
-     *        '{DAV:}property2' => null,
-     *     ),
-     *   )
-     *   'url/to/resource2' => array(
-     *      .. etc ..
-     *   )
-     * )
-     *
-     *
-     * @param string $body xml body
-     * @return array 
-     */
-    public function parseMultiStatus($body) {
-
-        $body = Sabre_DAV_XMLUtil::convertDAVNamespace($body);
-
-        $responseXML = simplexml_load_string($body, null, LIBXML_NOBLANKS | LIBXML_NOCDATA);
-        if ($responseXML===false) {
-            throw new InvalidArgumentException('The passed data is not valid XML');
-        }
-         
-        $responseXML->registerXPathNamespace('d','DAV:');
-
-        $propResult = array();
-
-        foreach($responseXML->xpath('d:response') as $response) {
-
-            $response->registerXPathNamespace('d','DAV:');
-            $href = $response->xpath('d:href');
-            $href = (string)$href[0];
-
-            $properties = array();
-
-            foreach($response->xpath('d:propstat') as $propStat) {
-
-                $propStat->registerXPathNamespace('d','DAV:');
-                $status = $propStat->xpath('d:status');
-                list($httpVersion, $statusCode, $message) = explode(' ', (string)$status[0],3);
-
-                $properties[$statusCode] = Sabre_DAV_XMLUtil::parseProperties(dom_import_simplexml($propStat), $this->propertyMap); 
-
-            }
-
-            $propResult[$href] = $properties;
-
-        }
-
-        return $propResult;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Collection.php b/3rdparty/Sabre/DAV/Collection.php
deleted file mode 100644
index 9da04c12792..00000000000
--- a/3rdparty/Sabre/DAV/Collection.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * Collection class
- *
- * This is a helper class, that should aid in getting collections classes setup.
- * Most of its methods are implemented, and throw permission denied exceptions 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Collection extends Sabre_DAV_Node implements Sabre_DAV_ICollection {
-
-    /**
-     * Returns a child object, by its name.
-     *
-     * This method makes use of the getChildren method to grab all the child nodes, and compares the name. 
-     * Generally its wise to override this, as this can usually be optimized
-     * 
-     * @param string $name
-     * @throws Sabre_DAV_Exception_FileNotFound
-     * @return Sabre_DAV_INode 
-     */
-    public function getChild($name) {
-
-        foreach($this->getChildren() as $child) {
-
-            if ($child->getName()==$name) return $child;
-
-        }
-        throw new Sabre_DAV_Exception_FileNotFound('File not found: ' . $name);
-
-    }
-
-    /**
-     * Checks is a child-node exists.
-     *
-     * It is generally a good idea to try and override this. Usually it can be optimized.
-     * 
-     * @param string $name 
-     * @return bool 
-     */
-    public function childExists($name) {
-
-        try {
-
-            $this->getChild($name);
-            return true;
-
-        } catch(Sabre_DAV_Exception_FileNotFound $e) {
-
-            return false;
-
-        }
-
-    }
-
-    /**
-     * Creates a new file in the directory 
-     * 
-     * @param string $name Name of the file 
-     * @param resource $data Initial payload, passed as a readable stream resource. 
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void
-     */
-    public function createFile($name, $data = null) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create file (filename ' . $name . ')');
-
-    }
-
-    /**
-     * Creates a new subdirectory 
-     * 
-     * @param string $name 
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create directory');
-
-    }
-
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Directory.php b/3rdparty/Sabre/DAV/Directory.php
deleted file mode 100644
index 86af4827b3e..00000000000
--- a/3rdparty/Sabre/DAV/Directory.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * Directory class
- *
- * This class is now deprecated in favor of the Sabre_DAV_Collection class.
- *
- * @package Sabre
- * @subpackage DAV
- * @deprecated Use Sabre_DAV_Collection instead
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Directory extends Sabre_DAV_Collection {
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception.php b/3rdparty/Sabre/DAV/Exception.php
deleted file mode 100644
index 61f8b87c0a6..00000000000
--- a/3rdparty/Sabre/DAV/Exception.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * SabreDAV base exception
- *
- * This is SabreDAV's base exception file, use this to implement your own exception.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-/**
- * Main Exception class. 
- *
- * This class defines a getHTTPCode method, which should return the appropriate HTTP code for the Exception occured.
- * The default for this is 500.
- *
- * This class also allows you to generate custom xml data for your exceptions. This will be displayed
- * in the 'error' element in the failing response.
- */
-class Sabre_DAV_Exception extends Exception { 
-
-    /**
-     * Returns the HTTP statuscode for this exception 
-     *
-     * @return int
-     */
-    public function getHTTPCode() { 
-
-        return 500;
-
-    }
-
-    /**
-     * This method allows the exception to include additonal information into the WebDAV error response 
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-    
-
-    }
-
-    /**
-     * This method allows the exception to return any extra HTTP response headers.
-     *
-     * The headers must be returned as an array.
-     * 
-     * @return array 
-     */
-    public function getHTTPHeaders(Sabre_DAV_Server $server) {
-
-        return array();
-
-    } 
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception/BadRequest.php b/3rdparty/Sabre/DAV/Exception/BadRequest.php
deleted file mode 100644
index 7025bb10317..00000000000
--- a/3rdparty/Sabre/DAV/Exception/BadRequest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * BadRequest
- *
- * The BadRequest is thrown when the user submitted an invalid HTTP request
- * BadRequest 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_BadRequest extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception 
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 400; 
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/Conflict.php b/3rdparty/Sabre/DAV/Exception/Conflict.php
deleted file mode 100644
index 7eaa08178ae..00000000000
--- a/3rdparty/Sabre/DAV/Exception/Conflict.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Conflict
- *
- * A 409 Conflict is thrown when a user tried to make a directory over an existing
- * file or in a parent directory that doesn't exist.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_Conflict extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception 
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 409;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/ConflictingLock.php b/3rdparty/Sabre/DAV/Exception/ConflictingLock.php
deleted file mode 100644
index 279f63dfde7..00000000000
--- a/3rdparty/Sabre/DAV/Exception/ConflictingLock.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * ConflictingLock 
- *
- * Similar to Exception_Locked, this exception thrown when a LOCK request 
- * was made, on a resource which was already locked
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_ConflictingLock extends Sabre_DAV_Exception_Locked {
-
-    /**
-     * This method allows the exception to include additonal information into the WebDAV error response 
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-        
-        if ($this->lock) {
-            $error = $errorNode->ownerDocument->createElementNS('DAV:','d:no-conflicting-lock');
-            $errorNode->appendChild($error);
-            if (!is_object($this->lock)) var_dump($this->lock);
-            $error->appendChild($errorNode->ownerDocument->createElementNS('DAV:','d:href',$this->lock->uri));
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/FileNotFound.php b/3rdparty/Sabre/DAV/Exception/FileNotFound.php
deleted file mode 100644
index b20e4a2fb3f..00000000000
--- a/3rdparty/Sabre/DAV/Exception/FileNotFound.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * FileNotFound
- *
- * This Exception is thrown when a Node couldn't be found. It returns HTTP error code 404
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_FileNotFound extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception 
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 404;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception/Forbidden.php b/3rdparty/Sabre/DAV/Exception/Forbidden.php
deleted file mode 100644
index 167f3c2760a..00000000000
--- a/3rdparty/Sabre/DAV/Exception/Forbidden.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Forbidden
- *
- * This exception is thrown whenever a user tries to do an operation he's not allowed to
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_Forbidden extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception 
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 403;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php b/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
deleted file mode 100644
index 15007cdd352..00000000000
--- a/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * InsufficientStorage 
- *
- * This Exception can be thrown, when for example a harddisk is full or a quota is exceeded
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_InsufficientStorage extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception 
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 507;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php b/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
deleted file mode 100644
index f06810a25ef..00000000000
--- a/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * InvalidResourceType 
- *
- * This exception is thrown when the user tried to create a new collection, with
- * a special resourcetype value that was not recognized by the server.
- *
- * See RFC5689 section 3.3
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_InvalidResourceType extends Sabre_DAV_Exception_Forbidden { 
-
-    /**
-     * This method allows the exception to include additonal information into the WebDAV error response 
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:valid-resourcetype');
-        $errorNode->appendChild($error);
-
-    }
-    
-}
diff --git a/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php b/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
deleted file mode 100644
index 47032cffc75..00000000000
--- a/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * LockTokenMatchesRequestUri 
- *
- * This exception is thrown by UNLOCK if a supplied lock-token is invalid 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_LockTokenMatchesRequestUri extends Sabre_DAV_Exception_Conflict {
-
-    /**
-     * Creates the exception
-     */
-    public function __construct() {
-
-        $this->message = 'The locktoken supplied does not match any locks on this entity';
-
-    }
-
-    /**
-     * This method allows the exception to include additonal information into the WebDAV error response 
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:lock-token-matches-request-uri');
-        $errorNode->appendChild($error);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/Locked.php b/3rdparty/Sabre/DAV/Exception/Locked.php
deleted file mode 100644
index b4bb2e0378c..00000000000
--- a/3rdparty/Sabre/DAV/Exception/Locked.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * Locked 
- *
- * The 423 is thrown when a client tried to access a resource that was locked, without supplying a valid lock token
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_Locked extends Sabre_DAV_Exception {
-
-    /**
-     * Lock information 
-     * 
-     * @var Sabre_DAV_Locks_LockInfo 
-     */
-    protected $lock;
-
-    /**
-     * Creates the exception
-     * 
-     * A LockInfo object should be passed if the user should be informed
-     * which lock actually has the file locked.
-     * 
-     * @param Sabre_DAV_Locks_LockInfo $lock 
-     */
-    public function __construct(Sabre_DAV_Locks_LockInfo $lock = null) {
-
-        $this->lock = $lock;
-
-    }
-
-    /**
-     * Returns the HTTP statuscode for this exception 
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 423;
-
-    }
-
-    /**
-     * This method allows the exception to include additonal information into the WebDAV error response 
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-        
-        if ($this->lock) {
-            $error = $errorNode->ownerDocument->createElementNS('DAV:','d:lock-token-submitted');
-            $errorNode->appendChild($error);
-            if (!is_object($this->lock)) var_dump($this->lock);
-            $error->appendChild($errorNode->ownerDocument->createElementNS('DAV:','d:href',$this->lock->uri));
-        }
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php b/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
deleted file mode 100644
index 02c145ffeb6..00000000000
--- a/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * MethodNotAllowed
- *
- * The 405 is thrown when a client tried to create a directory on an already existing directory
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_MethodNotAllowed extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception 
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 405;
-
-    }
-
-    /**
-     * This method allows the exception to return any extra HTTP response headers.
-     *
-     * The headers must be returned as an array.
-     * 
-     * @return array 
-     */
-    public function getHTTPHeaders(Sabre_DAV_Server $server) {
-
-        $methods = $server->getAllowedMethods($server->getRequestUri());
-
-        return array(
-            'Allow' => strtoupper(implode(', ',$methods)),
-        );
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php b/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
deleted file mode 100644
index 1faffddfa00..00000000000
--- a/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * NotAuthenticated
- *
- * This exception is thrown when the client did not provide valid
- * authentication credentials.
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_NotAuthenticated extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception 
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-        
-        return 401;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/NotImplemented.php b/3rdparty/Sabre/DAV/Exception/NotImplemented.php
deleted file mode 100644
index cd7f609b09d..00000000000
--- a/3rdparty/Sabre/DAV/Exception/NotImplemented.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * NotImplemented
- *
- * This exception is thrown when the client tried to call an unsupported HTTP method or other feature
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_NotImplemented extends Sabre_DAV_Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception 
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-        
-        return 501;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php b/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
deleted file mode 100644
index ebcb9f5b9ac..00000000000
--- a/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * PreconditionFailed 
- *
- * This exception is normally thrown when a client submitted a conditional request, 
- * like for example an If, If-None-Match or If-Match header, which caused the HTTP 
- * request to not execute (the condition of the header failed)
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_PreconditionFailed extends Sabre_DAV_Exception {
-
-    /**
-     * When this exception is thrown, the header-name might be set.
-     * 
-     * This allows the exception-catching code to determine which HTTP header
-     * caused the exception.
-     * 
-     * @var string 
-     */
-    public $header = null;
-
-    /**
-     * Create the exception 
-     * 
-     * @param string $message 
-     * @param string $header 
-     */
-    public function __construct($message, $header=null) {
-
-        parent::__construct($message);
-        $this->header = $header;
-
-    } 
-
-    /**
-     * Returns the HTTP statuscode for this exception 
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 412; 
-
-    }
-
-    /**
-     * This method allows the exception to include additonal information into the WebDAV error response 
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-        
-        if ($this->header) {
-            $prop = $errorNode->ownerDocument->createElement('s:header');
-            $prop->nodeValue = $this->header;
-            $errorNode->appendChild($prop);
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php b/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
deleted file mode 100644
index e4ed601b16c..00000000000
--- a/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * ReportNotImplemented
- *
- * This exception is thrown when the client requested an unknown report through the REPORT method
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_ReportNotImplemented extends Sabre_DAV_Exception_NotImplemented {
-
-    /**
-     * This method allows the exception to include additonal information into the WebDAV error response 
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-
-        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:supported-report');
-        $errorNode->appendChild($error);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php b/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
deleted file mode 100644
index 37abbd729d1..00000000000
--- a/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * RequestedRangeNotSatisfiable 
- *
- * This exception is normally thrown when the user 
- * request a range that is out of the entity bounds.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_RequestedRangeNotSatisfiable extends Sabre_DAV_Exception {
-
-    /**
-     * returns the http statuscode for this exception 
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 416;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php b/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
deleted file mode 100644
index 4c37d8997cf..00000000000
--- a/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * UnSupportedMediaType
- *
- * The 415 Unsupported Media Type status code is generally sent back when the client 
- * tried to call an HTTP method, with a body the server didn't understand
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Exception_UnsupportedMediaType extends Sabre_DAV_Exception { 
-
-    /**
-     * returns the http statuscode for this exception 
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 415;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/FS/Directory.php b/3rdparty/Sabre/DAV/FS/Directory.php
deleted file mode 100644
index ebd6a6c505e..00000000000
--- a/3rdparty/Sabre/DAV/FS/Directory.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-/**
- * Directory class 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_FS_Directory extends Sabre_DAV_FS_Node implements Sabre_DAV_ICollection, Sabre_DAV_IQuota {
-
-    /**
-     * Creates a new file in the directory 
-     * 
-     * data is a readable stream resource
-     *
-     * @param string $name Name of the file 
-     * @param resource $data Initial payload 
-     * @return void
-     */
-    public function createFile($name, $data = null) {
-
-        $newPath = $this->path . '/' . $name;
-        file_put_contents($newPath,$data);
-
-    }
-
-    /**
-     * Creates a new subdirectory 
-     * 
-     * @param string $name 
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        $newPath = $this->path . '/' . $name;
-        mkdir($newPath);
-
-    }
-
-    /**
-     * Returns a specific child node, referenced by its name 
-     * 
-     * @param string $name 
-     * @throws Sabre_DAV_Exception_FileNotFound
-     * @return Sabre_DAV_INode 
-     */
-    public function getChild($name) {
-
-        $path = $this->path . '/' . $name;
-
-        if (!file_exists($path)) throw new Sabre_DAV_Exception_FileNotFound('File with name ' . $path . ' could not be located');
-
-        if (is_dir($path)) {
-
-            return new Sabre_DAV_FS_Directory($path);
-
-        } else {
-
-            return new Sabre_DAV_FS_File($path);
-
-        }
-
-    }
-
-    /**
-     * Returns an array with all the child nodes 
-     * 
-     * @return Sabre_DAV_INode[] 
-     */
-    public function getChildren() {
-
-        $nodes = array();
-        foreach(scandir($this->path) as $node) if($node!='.' && $node!='..') $nodes[] = $this->getChild($node);
-        return $nodes;
-
-    }
-
-    /**
-     * Checks if a child exists. 
-     * 
-     * @param string $name 
-     * @return bool 
-     */
-    public function childExists($name) {
-
-        $path = $this->path . '/' . $name;
-        return file_exists($path);
-
-    }
-
-    /**
-     * Deletes all files in this directory, and then itself 
-     * 
-     * @return void
-     */
-    public function delete() {
-
-        foreach($this->getChildren() as $child) $child->delete();
-        rmdir($this->path);
-
-    }
-
-    /**
-     * Returns available diskspace information 
-     * 
-     * @return array 
-     */
-    public function getQuotaInfo() {
-
-        return array(
-            disk_total_space($this->path)-disk_free_space($this->path),
-            disk_free_space($this->path)
-            ); 
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/FS/File.php b/3rdparty/Sabre/DAV/FS/File.php
deleted file mode 100644
index 262187d7e8a..00000000000
--- a/3rdparty/Sabre/DAV/FS/File.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * File class 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_FS_File extends Sabre_DAV_FS_Node implements Sabre_DAV_IFile {
-
-    /**
-     * Updates the data 
-     * 
-     * @param resource $data 
-     * @return void 
-     */
-    public function put($data) {
-
-        file_put_contents($this->path,$data);
-
-    }
-
-    /**
-     * Returns the data 
-     * 
-     * @return string 
-     */
-    public function get() {
-
-        return fopen($this->path,'r');
-
-    }
-
-    /**
-     * Delete the current file
-     *
-     * @return void 
-     */
-    public function delete() {
-
-        unlink($this->path);
-
-    }
-
-    /**
-     * Returns the size of the node, in bytes 
-     * 
-     * @return int 
-     */
-    public function getSize() {
-        
-        return filesize($this->path);
-
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbritrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     * 
-     * @return mixed
-     */
-    public function getETag() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     *
-     * @return mixed 
-     */ 
-    public function getContentType() {
-
-        return null;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/FS/Node.php b/3rdparty/Sabre/DAV/FS/Node.php
deleted file mode 100644
index b8d7bcfe846..00000000000
--- a/3rdparty/Sabre/DAV/FS/Node.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Base node-class 
- *
- * The node class implements the method used by both the File and the Directory classes 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_FS_Node implements Sabre_DAV_INode {
-
-    /**
-     * The path to the current node
-     * 
-     * @var string 
-     */
-    protected $path; 
-
-    /**
-     * Sets up the node, expects a full path name 
-     * 
-     * @param string $path 
-     * @return void
-     */
-    public function __construct($path) {
-
-        $this->path = $path;
-
-    }
-
-
-
-    /**
-     * Returns the name of the node 
-     * 
-     * @return string 
-     */
-    public function getName() {
-
-        list(, $name)  = Sabre_DAV_URLUtil::splitPath($this->path);
-        return $name;
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path);
-        list(, $newName) = Sabre_DAV_URLUtil::splitPath($name);
-
-        $newPath = $parentPath . '/' . $newName;
-        rename($this->path,$newPath);
-        
-        $this->path = $newPath;
-
-    }
-
-
-
-    /**
-     * Returns the last modification time, as a unix timestamp 
-     * 
-     * @return int 
-     */
-    public function getLastModified() {
-
-        return filemtime($this->path);
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/FSExt/Directory.php b/3rdparty/Sabre/DAV/FSExt/Directory.php
deleted file mode 100644
index c43d4385ac7..00000000000
--- a/3rdparty/Sabre/DAV/FSExt/Directory.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/**
- * Directory class 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_FSExt_Directory extends Sabre_DAV_FSExt_Node implements Sabre_DAV_ICollection, Sabre_DAV_IQuota {
-
-    /**
-     * Creates a new file in the directory 
-     * 
-     * @param string $name Name of the file 
-     * @param resource $data Initial payload 
-     * @return void
-     */
-    public function createFile($name, $data = null) {
-
-        // We're not allowing dots
-        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
-        $newPath = $this->path . '/' . $name;
-        file_put_contents($newPath,$data);
-
-    }
-
-    /**
-     * Creates a new subdirectory 
-     * 
-     * @param string $name 
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        // We're not allowing dots
-        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
-        $newPath = $this->path . '/' . $name;
-        mkdir($newPath);
-
-    }
-
-    /**
-     * Returns a specific child node, referenced by its name 
-     * 
-     * @param string $name 
-     * @throws Sabre_DAV_Exception_FileNotFound
-     * @return Sabre_DAV_INode 
-     */
-    public function getChild($name) {
-
-        $path = $this->path . '/' . $name;
-
-        if (!file_exists($path)) throw new Sabre_DAV_Exception_FileNotFound('File could not be located');
-        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..'); 
-
-        if (is_dir($path)) {
-
-            return new Sabre_DAV_FSExt_Directory($path);
-
-        } else {
-
-            return new Sabre_DAV_FSExt_File($path);
-
-        }
-
-    }
-
-    /**
-     * Checks if a child exists. 
-     * 
-     * @param string $name 
-     * @return bool 
-     */
-    public function childExists($name) {
-
-        if ($name=='.' || $name=='..')
-            throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
-
-        $path = $this->path . '/' . $name;
-        return file_exists($path);
-
-    }
-
-    /**
-     * Returns an array with all the child nodes 
-     * 
-     * @return Sabre_DAV_INode[] 
-     */
-    public function getChildren() {
-
-        $nodes = array();
-        foreach(scandir($this->path) as $node) if($node!='.' && $node!='..' && $node!='.sabredav') $nodes[] = $this->getChild($node);
-        return $nodes;
-
-    }
-
-    /**
-     * Deletes all files in this directory, and then itself 
-     * 
-     * @return void
-     */
-    public function delete() {
-
-        // Deleting all children
-        foreach($this->getChildren() as $child) $child->delete();
-
-        // Removing resource info, if its still around
-        if (file_exists($this->path . '/.sabredav')) unlink($this->path . '/.sabredav');
-
-        // Removing the directory itself
-        rmdir($this->path);
-
-        return parent::delete();
-
-    }
-
-    /**
-     * Returns available diskspace information 
-     * 
-     * @return array 
-     */
-    public function getQuotaInfo() {
-
-        return array(
-            disk_total_space($this->path)-disk_free_space($this->path),
-            disk_free_space($this->path)
-            ); 
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/FSExt/File.php b/3rdparty/Sabre/DAV/FSExt/File.php
deleted file mode 100644
index 7a8e7a11f21..00000000000
--- a/3rdparty/Sabre/DAV/FSExt/File.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
- * File class 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_FSExt_File extends Sabre_DAV_FSExt_Node implements Sabre_DAV_IFile {
-
-    /**
-     * Updates the data 
-     *
-     * data is a readable stream resource.
-     *
-     * @param resource $data 
-     * @return void 
-     */
-    public function put($data) {
-
-        file_put_contents($this->path,$data);
-
-    }
-
-    /**
-     * Returns the data
-     *
-     * @return string 
-     */
-    public function get() {
-
-        return fopen($this->path,'r');
-
-    }
-
-    /**
-     * Delete the current file
-     *
-     * @return void 
-     */
-    public function delete() {
-
-        unlink($this->path);
-        return parent::delete();
-
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbritrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     */
-    public function getETag() {
-
-        return '"' . md5_file($this->path). '"';
-
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     */ 
-    public function getContentType() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns the size of the file, in bytes 
-     * 
-     * @return int 
-     */
-    public function getSize() {
-
-        return filesize($this->path);
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/FSExt/Node.php b/3rdparty/Sabre/DAV/FSExt/Node.php
deleted file mode 100644
index 9e36222bfd3..00000000000
--- a/3rdparty/Sabre/DAV/FSExt/Node.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-
-/**
- * Base node-class 
- *
- * The node class implements the method used by both the File and the Directory classes 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_FSExt_Node extends Sabre_DAV_FS_Node implements Sabre_DAV_ILockable, Sabre_DAV_IProperties {
-
-    /**
-     * Returns all the locks on this node
-     * 
-     * @return array 
-     */
-    function getLocks() {
-
-        $resourceData = $this->getResourceData();
-        $locks = $resourceData['locks'];
-        foreach($locks as $k=>$lock) {
-            if (time() > $lock->timeout + $lock->created) unset($locks[$k]); 
-        }
-        return $locks;
-
-    }
-
-    /**
-     * Locks this node 
-     * 
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
-     * @return void
-     */
-    function lock(Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        // We're making the lock timeout 30 minutes
-        $lockInfo->timeout = 1800;
-        $lockInfo->created = time();
-
-        $resourceData = $this->getResourceData();
-        if (!isset($resourceData['locks'])) $resourceData['locks'] = array();
-        $current = null;
-        foreach($resourceData['locks'] as $k=>$lock) {
-            if ($lock->token === $lockInfo->token) $current = $k;
-        }
-        if (!is_null($current)) $resourceData['locks'][$current] = $lockInfo;
-        else $resourceData['locks'][] = $lockInfo;
-
-        $this->putResourceData($resourceData);
-
-    }
-
-    /**
-     * Removes a lock from this node
-     * 
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
-     * @return bool 
-     */
-    function unlock(Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        //throw new Sabre_DAV_Exception('bla');
-        $resourceData = $this->getResourceData();
-        foreach($resourceData['locks'] as $k=>$lock) {
-
-            if ($lock->token === $lockInfo->token) {
-
-                unset($resourceData['locks'][$k]);
-                $this->putResourceData($resourceData);
-                return true;
-
-            }
-        }
-        return false;
-
-    }
-
-    /**
-     * Updates properties on this node,
-     *
-     * @param array $mutations
-     * @see Sabre_DAV_IProperties::updateProperties
-     * @return bool|array 
-     */
-    public function updateProperties($properties) {
-
-        $resourceData = $this->getResourceData();
-        
-        $result = array();
-
-        foreach($properties as $propertyName=>$propertyValue) {
-
-            // If it was null, we need to delete the property
-            if (is_null($propertyValue)) {
-                if (isset($resourceData['properties'][$propertyName])) {
-                    unset($resourceData['properties'][$propertyName]);
-                }
-            } else {
-                $resourceData['properties'][$propertyName] = $propertyValue;
-            }
-               
-        }
-
-        $this->putResourceData($resourceData);
-        return true; 
-    }
-
-    /**
-     * Returns a list of properties for this nodes.;
-     *
-     * The properties list is a list of propertynames the client requested, encoded as xmlnamespace#tagName, for example: http://www.example.org/namespace#author
-     * If the array is empty, all properties should be returned
-     *
-     * @param array $properties 
-     * @return void
-     */
-    function getProperties($properties) {
-
-        $resourceData = $this->getResourceData();
-
-        // if the array was empty, we need to return everything
-        if (!$properties) return $resourceData['properties'];
-
-        $props = array();
-        foreach($properties as $property) {
-            if (isset($resourceData['properties'][$property])) $props[$property] = $resourceData['properties'][$property];
-        }
-
-        return $props;
-
-    }
-
-    /**
-     * Returns the path to the resource file 
-     * 
-     * @return string 
-     */
-    protected function getResourceInfoPath() {
-
-        list($parentDir) = Sabre_DAV_URLUtil::splitPath($this->path);
-        return $parentDir . '/.sabredav';
-
-    }
-
-    /**
-     * Returns all the stored resource information 
-     * 
-     * @return array 
-     */
-    protected function getResourceData() {
-
-        $path = $this->getResourceInfoPath();
-        if (!file_exists($path)) return array('locks'=>array(), 'properties' => array());
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'r');
-        flock($handle,LOCK_SH);
-        $data = '';
-
-        // Reading data until the eof
-        while(!feof($handle)) {
-            $data.=fread($handle,8192);
-        }
-
-        // We're all good
-        fclose($handle);
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (!isset($data[$this->getName()])) {
-            return array('locks'=>array(), 'properties' => array());
-        }
-
-        $data = $data[$this->getName()];
-        if (!isset($data['locks'])) $data['locks'] = array();
-        if (!isset($data['properties'])) $data['properties'] = array();
-        return $data;
-
-    }
-
-    /**
-     * Updates the resource information 
-     * 
-     * @param array $newData 
-     * @return void
-     */
-    protected function putResourceData(array $newData) {
-
-        $path = $this->getResourceInfoPath();
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'a+');
-        flock($handle,LOCK_EX);
-        $data = '';
-
-        rewind($handle);
-
-        // Reading data until the eof
-        while(!feof($handle)) {
-            $data.=fread($handle,8192);
-        }
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        $data[$this->getName()] = $newData;
-        ftruncate($handle,0);
-        rewind($handle);
-
-        fwrite($handle,serialize($data));
-        fclose($handle);
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path);
-        list(, $newName) = Sabre_DAV_URLUtil::splitPath($name);
-        $newPath = $parentPath . '/' . $newName;
-
-        // We're deleting the existing resourcedata, and recreating it
-        // for the new path.
-        $resourceData = $this->getResourceData();
-        $this->deleteResourceData();
-
-        rename($this->path,$newPath);
-        $this->path = $newPath;
-        $this->putResourceData($resourceData);
-
-
-    }
-
-    public function deleteResourceData() {
-
-        // When we're deleting this node, we also need to delete any resource information
-        $path = $this->getResourceInfoPath();
-        if (!file_exists($path)) return true;
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'a+');
-        flock($handle,LOCK_EX);
-        $data = '';
-
-        rewind($handle);
-
-        // Reading data until the eof
-        while(!feof($handle)) {
-            $data.=fread($handle,8192);
-        }
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (isset($data[$this->getName()])) unset($data[$this->getName()]);
-        ftruncate($handle,0);
-        rewind($handle);
-        fwrite($handle,serialize($data));
-        fclose($handle);
-
-    }
-
-    public function delete() {
-
-        return $this->deleteResourceData();
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/File.php b/3rdparty/Sabre/DAV/File.php
deleted file mode 100644
index b74bd9525b3..00000000000
--- a/3rdparty/Sabre/DAV/File.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * File class
- *
- * This is a helper class, that should aid in getting file classes setup.
- * Most of its methods are implemented, and throw permission denied exceptions 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_File extends Sabre_DAV_Node implements Sabre_DAV_IFile {
-
-    /**
-     * Updates the data
-     *
-     * data is a readable stream resource.
-     * 
-     * @param resource $data 
-     * @return void 
-     */
-    public function put($data) { 
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to change data');
-
-    }
-
-    /**
-     * Returns the data 
-     *
-     * This method may either return a string or a readable stream resource
-     *
-     * @return mixed 
-     */
-    public function get() { 
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to read this file');
-
-    }
-    
-    /**
-     * Returns the size of the file, in bytes. 
-     * 
-     * @return int 
-     */
-    public function getSize() {
-
-        return 0;
-
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbritrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     */
-    public function getETag() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     */ 
-    public function getContentType() {
-
-        return null;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/ICollection.php b/3rdparty/Sabre/DAV/ICollection.php
deleted file mode 100644
index 0667d88899d..00000000000
--- a/3rdparty/Sabre/DAV/ICollection.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * The ICollection Interface
- *
- * This interface should be implemented by each class that represents a collection 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_ICollection extends Sabre_DAV_INode {
-
-    /**
-     * Creates a new file in the directory 
-     * 
-     * data is a readable stream resource
-     *
-     * @param string $name Name of the file 
-     * @param resource $data Initial payload 
-     * @return void
-     */
-    function createFile($name, $data = null);
-
-    /**
-     * Creates a new subdirectory 
-     * 
-     * @param string $name 
-     * @return void
-     */
-    function createDirectory($name);
-
-    /**
-     * Returns a specific child node, referenced by its name 
-     * 
-     * @param string $name 
-     * @return Sabre_DAV_INode 
-     */
-    function getChild($name);
-
-    /**
-     * Returns an array with all the child nodes 
-     * 
-     * @return Sabre_DAV_INode[] 
-     */
-    function getChildren();
-
-    /**
-     * Checks if a child-node with the specified name exists 
-     * 
-     * @return bool 
-     */
-    function childExists($name);
-
-}
-
diff --git a/3rdparty/Sabre/DAV/IExtendedCollection.php b/3rdparty/Sabre/DAV/IExtendedCollection.php
deleted file mode 100644
index b8db1ab2f26..00000000000
--- a/3rdparty/Sabre/DAV/IExtendedCollection.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * The IExtendedCollection interface.
- *
- * This interface can be used to create special-type of collection-resources
- * as defined by RFC 5689.
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_IExtendedCollection extends Sabre_DAV_ICollection {
-
-    /**
-     * Creates a new collection
-     *
-     * @param string $name 
-     * @param array $resourceType
-     * @param array $properties
-     * @return void
-     */
-    function createExtendedCollection($name, array $resourceType, array $properties);
-
-}
-
diff --git a/3rdparty/Sabre/DAV/IFile.php b/3rdparty/Sabre/DAV/IFile.php
deleted file mode 100644
index 446ec86187b..00000000000
--- a/3rdparty/Sabre/DAV/IFile.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * This interface represents a file or leaf in the tree.
- *
- * The nature of a file is, as you might be aware of, that it doesn't contain sub-nodes and has contents
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_IFile extends Sabre_DAV_INode {
-
-    /**
-     * Updates the data 
-     * 
-     * The data argument is a readable stream resource.
-     *
-     * @param resource $data 
-     * @return void 
-     */
-    function put($data);
-
-    /**
-     * Returns the data 
-     * 
-     * This method may either return a string or a readable stream resource
-     *
-     * @return mixed 
-     */
-    function get();
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     * 
-     * @return void
-     */
-    function getContentType();
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     *
-     * Return null if the ETag can not effectively be determined
-     * 
-     * @return void
-     */
-    function getETag();
-
-    /**
-     * Returns the size of the node, in bytes 
-     * 
-     * @return int 
-     */
-    function getSize();
-
-}
-
diff --git a/3rdparty/Sabre/DAV/ILockable.php b/3rdparty/Sabre/DAV/ILockable.php
deleted file mode 100644
index f9fb3a70251..00000000000
--- a/3rdparty/Sabre/DAV/ILockable.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Implement this class to support locking 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_ILockable extends Sabre_DAV_INode {
-
-    /**
-     * Returns an array with locks currently on the node 
-     * 
-     * @return Sabre_DAV_Locks_LockInfo[] 
-     */
-    function getLocks();
-
-    /**
-     * Creates a new lock on the file.  
-     * 
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo The lock information 
-     * @return void
-     */
-    function lock(Sabre_DAV_Locks_LockInfo $lockInfo);
-
-    /**
-     * Unlocks a file 
-     * 
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo The lock information 
-     * @return void 
-     */
-    function unlock(Sabre_DAV_Locks_LockInfo $lockInfo);
-
-}
-
diff --git a/3rdparty/Sabre/DAV/INode.php b/3rdparty/Sabre/DAV/INode.php
deleted file mode 100644
index c0b96bf5377..00000000000
--- a/3rdparty/Sabre/DAV/INode.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * The INode interface is the base interface, and the parent class of both ICollection and IFile
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_INode {
-
-    /**
-     * Deleted the current node
-     *
-     * @return void 
-     */
-    function delete();
-
-    /**
-     * Returns the name of the node 
-     * 
-     * @return string 
-     */
-    function getName();
-
-    /**
-     * Renames the node
-     *
-     * @param string $name The new name
-     * @return void
-     */
-    function setName($name);
-
-    /**
-     * Returns the last modification time, as a unix timestamp 
-     * 
-     * @return int 
-     */
-    function getLastModified();
-
-}
-
diff --git a/3rdparty/Sabre/DAV/IProperties.php b/3rdparty/Sabre/DAV/IProperties.php
deleted file mode 100644
index af17cad24af..00000000000
--- a/3rdparty/Sabre/DAV/IProperties.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * IProperties interface
- *
- * Implement this interface to support custom WebDAV properties requested and sent from clients.
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_IProperties extends Sabre_DAV_INode {
-
-    /**
-     * Updates properties on this node,
-     *
-     * The properties array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existant property is always succesful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname. 
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param array $mutations 
-     * @return bool|array 
-     */
-    function updateProperties($mutations);
-
-    /**
-     * Returns a list of properties for this nodes.
-     *
-     * The properties list is a list of propertynames the client requested,
-     * encoded in clark-notation {xmlnamespace}tagname
-     *
-     * If the array is empty, it means 'all properties' were requested.
-     *
-     * @param array $properties 
-     * @return void
-     */
-    function getProperties($properties);
-
-}
-
diff --git a/3rdparty/Sabre/DAV/IQuota.php b/3rdparty/Sabre/DAV/IQuota.php
deleted file mode 100644
index 8ff1a4597f8..00000000000
--- a/3rdparty/Sabre/DAV/IQuota.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * IQuota interface
- *
- * Implement this interface to add the ability to return quota information. The ObjectTree
- * will check for quota information on any given node. If the information is not available it will 
- * attempt to fetch the information from the root node.
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_IQuota extends Sabre_DAV_ICollection {
-
-    /**
-     * Returns the quota information
-     *
-     * This method MUST return an array with 2 values, the first being the total used space,
-     * the second the available space (in bytes)
-     */
-    function getQuotaInfo(); 
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php b/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
deleted file mode 100644
index b09f93ddac7..00000000000
--- a/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * The Lock manager allows you to handle all file-locks centrally.
- *
- * This is an alternative approach to doing this on a per-node basis
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Locks_Backend_Abstract {
-
-    /**
-     * Returns a list of Sabre_DAV_Locks_LockInfo objects  
-     * 
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri 
-     * @param bool $returnChildLocks
-     * @return array 
-     */
-    abstract function getLocks($uri, $returnChildLocks);
-
-    /**
-     * Locks a uri 
-     * 
-     * @param string $uri 
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
-     * @return bool 
-     */
-    abstract function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo);
-
-    /**
-     * Removes a lock from a uri 
-     * 
-     * @param string $uri 
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
-     * @return bool 
-     */
-    abstract function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo);
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/FS.php b/3rdparty/Sabre/DAV/Locks/Backend/FS.php
deleted file mode 100644
index 8653f55b1c6..00000000000
--- a/3rdparty/Sabre/DAV/Locks/Backend/FS.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/**
- * The Lock manager allows you to handle all file-locks centrally.
- *
- * This Lock Manager is now deprecated. It has a bug that allows parent 
- * collections to be deletes when children deeper in the tree are locked. 
- *
- * You are recommended to use either the PDO or the File backend instead.
- *
- * This Lock Manager stores all its data in the filesystem.
- * 
- * @package Sabre
- * @subpackage DAV
- * @deprecated
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Locks_Backend_FS extends Sabre_DAV_Locks_Backend_Abstract {
-
-    /**
-     * The default data directory 
-     * 
-     * @var string 
-     */
-    private $dataDir;
-
-    public function __construct($dataDir) {
-
-        $this->dataDir = $dataDir;
-
-    }
-
-    protected function getFileNameForUri($uri) {
-
-        return $this->dataDir . '/sabredav_' . md5($uri) . '.locks';
-
-    }
-
-
-    /**
-     * Returns a list of Sabre_DAV_Locks_LockInfo objects  
-     * 
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri 
-     * @param bool $returnChildLocks
-     * @return array 
-     */
-    public function getLocks($uri, $returnChildLocks) {
-
-        $lockList = array();
-        $currentPath = '';
-
-        foreach(explode('/',$uri) as $uriPart) {
-
-            // weird algorithm that can probably be improved, but we're traversing the path top down 
-            if ($currentPath) $currentPath.='/'; 
-            $currentPath.=$uriPart;
-
-            $uriLocks = $this->getData($currentPath);
-
-            foreach($uriLocks as $uriLock) {
-
-                // Unless we're on the leaf of the uri-tree we should ingore locks with depth 0
-                if($uri==$currentPath || $uriLock->depth!=0) {
-                    $uriLock->uri = $currentPath;
-                    $lockList[] = $uriLock;
-                }
-
-            }
-
-        }
-
-        // Checking if we can remove any of these locks
-        foreach($lockList as $k=>$lock) {
-            if (time() > $lock->timeout + $lock->created) unset($lockList[$k]); 
-        }
-        return $lockList;
-
-    }
-
-    /**
-     * Locks a uri 
-     * 
-     * @param string $uri 
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
-     * @return bool 
-     */
-    public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        // We're making the lock timeout 30 minutes
-        $lockInfo->timeout = 1800;
-        $lockInfo->created = time();
-
-        $locks = $this->getLocks($uri,false);
-        foreach($locks as $k=>$lock) {
-            if ($lock->token == $lockInfo->token) unset($locks[$k]);
-        }
-        $locks[] = $lockInfo;
-        $this->putData($uri,$locks);
-        return true;
-
-    }
-
-    /**
-     * Removes a lock from a uri 
-     * 
-     * @param string $uri 
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
-     * @return bool 
-     */
-    public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        $locks = $this->getLocks($uri,false);
-        foreach($locks as $k=>$lock) {
-
-            if ($lock->token == $lockInfo->token) {
-
-                unset($locks[$k]);
-                $this->putData($uri,$locks);
-                return true;
-
-            }
-        }
-        return false;
-
-    }
-
-    /**
-     * Returns the stored data for a uri
-     *
-     * @param string $uri
-     * @return array 
-     */
-    protected function getData($uri) {
-
-        $path = $this->getFilenameForUri($uri);
-        if (!file_exists($path)) return array();
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'r');
-        flock($handle,LOCK_SH);
-        $data = '';
-
-        // Reading data until the eof
-        while(!feof($handle)) {
-            $data.=fread($handle,8192);
-        }
-
-        // We're all good
-        fclose($handle);
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (!$data) return array();
-        return $data;
-
-    }
-
-    /**
-     * Updates the lock information
-     *
-     * @param string $uri
-     * @param array $newData 
-     * @return void
-     */
-    protected function putData($uri,array $newData) {
-
-        $path = $this->getFileNameForUri($uri);
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'a+');
-        flock($handle,LOCK_EX);
-        ftruncate($handle,0);
-        rewind($handle);
-
-        fwrite($handle,serialize($newData));
-        fclose($handle);
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/File.php b/3rdparty/Sabre/DAV/Locks/Backend/File.php
deleted file mode 100644
index f65b20c4306..00000000000
--- a/3rdparty/Sabre/DAV/Locks/Backend/File.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-/**
- * The Lock manager allows you to handle all file-locks centrally.
- *
- * This Lock Manager stores all its data in a single file. 
- *
- * Note that this is not nearly as robust as a database, you are encouraged
- * to use the PDO backend instead.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Locks_Backend_File extends Sabre_DAV_Locks_Backend_Abstract {
-
-    /**
-     * The storage file
-     * 
-     * @var string 
-     */
-    private $locksFile;
-
-    /**
-     * Constructor
-     *
-     * @param string $locksFile path to file 
-     */
-    public function __construct($locksFile) {
-
-        $this->locksFile = $locksFile;
-
-    }
-
-    /**
-     * Returns a list of Sabre_DAV_Locks_LockInfo objects  
-     * 
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri 
-     * @param bool $returnChildLocks
-     * @return array 
-     */
-    public function getLocks($uri, $returnChildLocks) {
-
-        $newLocks = array();
-        $currentPath = '';
-
-        $locks = $this->getData();
-        foreach($locks as $lock) {
-
-            if ($lock->uri === $uri ||
-                //deep locks on parents
-                ($lock->depth!=0 && strpos($uri, $lock->uri . '/')===0) ||
-
-                // locks on children
-                ($returnChildLocks && (strpos($lock->uri, $uri . '/')===0)) ) {
-
-                $newLocks[] = $lock;
-
-            }
-
-        }
-
-        // Checking if we can remove any of these locks
-        foreach($newLocks as $k=>$lock) {
-            if (time() > $lock->timeout + $lock->created) unset($newLocks[$k]); 
-        }
-        return $newLocks;
-
-    }
-
-    /**
-     * Locks a uri 
-     * 
-     * @param string $uri 
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
-     * @return bool 
-     */
-    public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        // We're making the lock timeout 30 minutes
-        $lockInfo->timeout = 1800;
-        $lockInfo->created = time();
-        $lockInfo->uri = $uri;
-
-        $locks = $this->getLocks($uri,false);
-        foreach($locks as $k=>$lock) {
-            if ($lock->token == $lockInfo->token) unset($locks[$k]);
-        }
-        $locks[] = $lockInfo;
-        $this->putData($locks);
-        return true;
-
-    }
-
-    /**
-     * Removes a lock from a uri 
-     * 
-     * @param string $uri 
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
-     * @return bool 
-     */
-    public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        $locks = $this->getLocks($uri,false);
-        foreach($locks as $k=>$lock) {
-
-            if ($lock->token == $lockInfo->token) {
-
-                unset($locks[$k]);
-                $this->putData($locks);
-                return true;
-
-            }
-        }
-        return false;
-
-    }
-
-    /**
-     * Loads the lockdata from the filesystem.
-     *
-     * @return array 
-     */
-    protected function getData() {
-
-        if (!file_exists($this->locksFile)) return array();
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($this->locksFile,'r');
-        flock($handle,LOCK_SH);
-
-        // Reading data until the eof
-        $data = stream_get_contents($handle);
-
-        // We're all good
-        fclose($handle);
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (!$data) return array();
-        return $data;
-
-    }
-
-    /**
-     * Saves the lockdata
-     *
-     * @param array $newData 
-     * @return void
-     */
-    protected function putData(array $newData) {
-
-        // opening up the file, and creating an exclusive lock
-        $handle = fopen($this->locksFile,'a+');
-        flock($handle,LOCK_EX);
-
-        // We can only truncate and rewind once the lock is acquired.
-        ftruncate($handle,0);
-        rewind($handle);
-
-        fwrite($handle,serialize($newData));
-        fclose($handle);
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/PDO.php b/3rdparty/Sabre/DAV/Locks/Backend/PDO.php
deleted file mode 100644
index c3923af19d3..00000000000
--- a/3rdparty/Sabre/DAV/Locks/Backend/PDO.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-
-/**
- * The Lock manager allows you to handle all file-locks centrally.
- *
- * This Lock Manager stores all its data in a database. You must pass a PDO
- * connection object in the constructor.
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Locks_Backend_PDO extends Sabre_DAV_Locks_Backend_Abstract {
-
-    /**
-     * The PDO connection object 
-     * 
-     * @var pdo 
-     */
-    private $pdo;
-
-    /**
-     * The PDO tablename this backend uses. 
-     * 
-     * @var string
-     */
-    protected $tableName;
-
-    /**
-     * Constructor 
-     * 
-     * @param PDO $pdo
-     * @param string $tableName 
-     */
-    public function __construct(PDO $pdo, $tableName = 'locks') {
-
-        $this->pdo = $pdo;
-        $this->tableName = $tableName;
-
-    }
-
-    /**
-     * Returns a list of Sabre_DAV_Locks_LockInfo objects  
-     * 
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri 
-     * @param bool $returnChildLocks
-     * @return array 
-     */
-    public function getLocks($uri, $returnChildLocks) {
-
-        // NOTE: the following 10 lines or so could be easily replaced by 
-        // pure sql. MySQL's non-standard string concatination prevents us
-        // from doing this though.
-        $query = 'SELECT owner, token, timeout, created, scope, depth, uri FROM `'.$this->tableName.'` WHERE ((created + timeout) > CAST(? AS UNSIGNED INTEGER)) AND ((uri = ?)';
-        $params = array(time(),$uri);
-
-        // We need to check locks for every part in the uri.
-        $uriParts = explode('/',$uri);
-
-        // We already covered the last part of the uri
-        array_pop($uriParts);
-
-        $currentPath='';
-
-        foreach($uriParts as $part) {
-
-            if ($currentPath) $currentPath.='/';
-            $currentPath.=$part;
-
-            $query.=' OR (depth!=0 AND uri = ?)';
-            $params[] = $currentPath;
-
-        }
-
-        if ($returnChildLocks) {
-
-            $query.=' OR (uri LIKE ?)';
-            $params[] = $uri . '/%';
-
-        }
-        $query.=')';
-
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($params);
-        $result = $stmt->fetchAll();
-
-        $lockList = array();
-        foreach($result as $row) {
-
-            $lockInfo = new Sabre_DAV_Locks_LockInfo();
-            $lockInfo->owner = $row['owner'];
-            $lockInfo->token = $row['token'];
-            $lockInfo->timeout = $row['timeout'];
-            $lockInfo->created = $row['created'];
-            $lockInfo->scope = $row['scope'];
-            $lockInfo->depth = $row['depth'];
-            $lockInfo->uri   = $row['uri'];
-            $lockList[] = $lockInfo;
-
-        }
-
-        return $lockList;
-
-    }
-
-    /**
-     * Locks a uri 
-     * 
-     * @param string $uri 
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
-     * @return bool 
-     */
-    public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        // We're making the lock timeout 30 minutes
-        $lockInfo->timeout = 30*60;
-        $lockInfo->created = time();
-        $lockInfo->uri = $uri;
-
-        $locks = $this->getLocks($uri,false);
-        $exists = false;
-        foreach($locks as $k=>$lock) {
-            if ($lock->token == $lockInfo->token) $exists = true;
-        }
-        
-        if ($exists) {
-            $stmt = $this->pdo->prepare('UPDATE `'.$this->tableName.'` SET owner = ?, timeout = ?, scope = ?, depth = ?, uri = ?, created = ? WHERE token = ?');
-            $stmt->execute(array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
-        } else {
-            $stmt = $this->pdo->prepare('INSERT INTO `'.$this->tableName.'` (owner,timeout,scope,depth,uri,created,token) VALUES (?,?,?,?,?,?,?)');
-            $stmt->execute(array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
-        }
-
-        return true;
-
-    }
-
-
-
-    /**
-     * Removes a lock from a uri 
-     * 
-     * @param string $uri 
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
-     * @return bool 
-     */
-    public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM `'.$this->tableName.'` WHERE uri = ? AND token = ?');
-        $stmt->execute(array($uri,$lockInfo->token));
-
-        return $stmt->rowCount()===1;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/LockInfo.php b/3rdparty/Sabre/DAV/Locks/LockInfo.php
deleted file mode 100644
index 6a064466f40..00000000000
--- a/3rdparty/Sabre/DAV/Locks/LockInfo.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * LockInfo class
- *
- * An object of the LockInfo class holds all the information relevant to a
- * single lock.
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Locks_LockInfo {
-
-    /**
-     * A shared lock
-     */
-    const SHARED = 1;
-
-    /**
-     * An exclusive lock
-     */
-    const EXCLUSIVE = 2;
-
-    /**
-     * A never expiring timeout
-     */
-    const TIMEOUT_INFINITE = -1;
-
-    /**
-     * The owner of the lock 
-     * 
-     * @var string 
-     */
-    public $owner;
-
-    /**
-     * The locktoken 
-     * 
-     * @var string 
-     */
-    public $token;
-
-    /**
-     * How long till the lock is expiring 
-     * 
-     * @var int 
-     */
-    public $timeout;
-
-    /**
-     * UNIX Timestamp of when this lock was created 
-     * 
-     * @var int 
-     */
-    public $created;
-
-    /**
-     * Exclusive or shared lock 
-     * 
-     * @var int 
-     */
-    public $scope = self::EXCLUSIVE;
-
-    /**
-     * Depth of lock, can be 0 or Sabre_DAV_Server::DEPTH_INFINITY
-     */
-    public $depth = 0;
-
-    /**
-     * The uri this lock locks
-     *
-     * TODO: This value is not always set 
-     * @var mixed
-     */
-    public $uri;
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Locks/Plugin.php b/3rdparty/Sabre/DAV/Locks/Plugin.php
deleted file mode 100644
index 461e2847e0a..00000000000
--- a/3rdparty/Sabre/DAV/Locks/Plugin.php
+++ /dev/null
@@ -1,680 +0,0 @@
-<?php
-
-/**
- * Locking plugin
- *
- * This plugin provides locking support to a WebDAV server.
- * The easiest way to get started, is by hooking it up as such:
- *
- * $lockBackend = new Sabre_DAV_Locks_Backend_File('./mylockdb');
- * $lockPlugin = new Sabre_DAV_Locks_Plugin($lockBackend);
- * $server->addPlugin($lockPlugin);
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Locks_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * locksBackend 
-     * 
-     * @var Sabre_DAV_Locks_Backend_Abstract 
-     */
-    private $locksBackend;
-
-    /**
-     * server
-     * 
-     * @var Sabre_DAV_Server 
-     */
-    private $server;
-
-    /**
-     * __construct 
-     * 
-     * @param Sabre_DAV_Locks_Backend_Abstract $locksBackend 
-     * @return void
-     */
-    public function __construct(Sabre_DAV_Locks_Backend_Abstract $locksBackend = null) {
-
-        $this->locksBackend = $locksBackend;        
-
-    }
-
-    /**
-     * Initializes the plugin
-     *
-     * This method is automatically called by the Server class after addPlugin.
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
-        $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),50);
-        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'));
-
-    }
-
-    /**
-     * Returns a plugin name.
-     * 
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre_DAV_Server::getPlugin 
-     * 
-     * @return string 
-     */
-    public function getPluginName() {
-
-        return 'locks';
-
-    }
-
-    /**
-     * This method is called by the Server if the user used an HTTP method 
-     * the server didn't recognize.
-     *
-     * This plugin intercepts the LOCK and UNLOCK methods.
-     * 
-     * @param string $method 
-     * @return bool 
-     */
-    public function unknownMethod($method, $uri) {
-
-        switch($method) { 
-
-            case 'LOCK'   : $this->httpLock($uri); return false; 
-            case 'UNLOCK' : $this->httpUnlock($uri); return false; 
-
-        }
-
-    }
-
-    /**
-     * This method is called after most properties have been found
-     * it allows us to add in any Lock-related properties
-     * 
-     * @param string $path 
-     * @param array $properties 
-     * @return bool 
-     */
-    public function afterGetProperties($path,&$newProperties) {
-
-        foreach($newProperties[404] as $propName=>$discard) {
-
-            $node = null;
-
-            switch($propName) {
-
-                case '{DAV:}supportedlock' :
-                    $val = false;
-                    if ($this->locksBackend) $val = true;
-                    else {
-                        if (!$node) $node = $this->server->tree->getNodeForPath($path);
-                        if ($node instanceof Sabre_DAV_ILockable) $val = true;
-                    }
-                    $newProperties[200][$propName] = new Sabre_DAV_Property_SupportedLock($val);
-                    unset($newProperties[404][$propName]);
-                    break;
-
-                case '{DAV:}lockdiscovery' :
-                    $newProperties[200][$propName] = new Sabre_DAV_Property_LockDiscovery($this->getLocks($path));
-                    unset($newProperties[404][$propName]);
-                    break;
-
-            }
-
-
-        }
-        return true;
-
-    }
-
-
-    /**
-     * This method is called before the logic for any HTTP method is
-     * handled.
-     *
-     * This plugin uses that feature to intercept access to locked resources.
-     * 
-     * @param string $method
-     * @param string $uri
-     * @return bool 
-     */
-    public function beforeMethod($method, $uri) {
-
-        switch($method) {
-
-            case 'DELETE' :
-                $lastLock = null;
-                if (!$this->validateLock($uri,$lastLock, true))
-                    throw new Sabre_DAV_Exception_Locked($lastLock);
-                break;
-            case 'MKCOL' :
-            case 'PROPPATCH' :
-            case 'PUT' :
-                $lastLock = null;
-                if (!$this->validateLock($uri,$lastLock))
-                    throw new Sabre_DAV_Exception_Locked($lastLock);
-                break;
-            case 'MOVE' :
-                $lastLock = null;
-                if (!$this->validateLock(array(
-                      $uri,
-                      $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
-                    ),$lastLock, true))
-                        throw new Sabre_DAV_Exception_Locked($lastLock);
-                break;
-            case 'COPY' :
-                $lastLock = null;
-                if (!$this->validateLock(
-                      $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
-                      $lastLock, true))
-                        throw new Sabre_DAV_Exception_Locked($lastLock);
-                break;
-        }
-
-        return true;
-
-    }
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are 
-     * available for the specified uri.
-     *
-     * @param string $uri
-     * @return array 
-     */
-    public function getHTTPMethods($uri) {
-
-        if ($this->locksBackend ||
-            $this->server->tree->getNodeForPath($uri) instanceof Sabre_DAV_ILocks) {
-            return array('LOCK','UNLOCK');
-        }
-        return array();
-
-    }
-
-    /**
-     * Returns a list of features for the HTTP OPTIONS Dav: header.
-     *
-     * In this case this is only the number 2. The 2 in the Dav: header
-     * indicates the server supports locks.
-     * 
-     * @return array 
-     */
-    public function getFeatures() {
-
-        return array(2);
-
-    }
-
-    /**
-     * Returns all lock information on a particular uri 
-     * 
-     * This function should return an array with Sabre_DAV_Locks_LockInfo objects. If there are no locks on a file, return an empty array.
-     *
-     * Additionally there is also the possibility of locks on parent nodes, so we'll need to traverse every part of the tree 
-     * If the $returnChildLocks argument is set to true, we'll also traverse all the children of the object
-     * for any possible locks and return those as well.
-     *
-     * @param string $uri 
-     * @param bool $returnChildLocks
-     * @return array 
-     */
-    public function getLocks($uri, $returnChildLocks = false) {
-
-        $lockList = array();
-        $currentPath = '';
-        foreach(explode('/',$uri) as $uriPart) {
-
-            $uriLocks = array();
-            if ($currentPath) $currentPath.='/'; 
-            $currentPath.=$uriPart;
-
-            try {
-
-                $node = $this->server->tree->getNodeForPath($currentPath);
-                if ($node instanceof Sabre_DAV_ILockable) $uriLocks = $node->getLocks();
-
-            } catch (Sabre_DAV_Exception_FileNotFound $e){
-                // In case the node didn't exist, this could be a lock-null request
-            }
-
-            foreach($uriLocks as $uriLock) {
-
-                // Unless we're on the leaf of the uri-tree we should ignore locks with depth 0
-                if($uri==$currentPath || $uriLock->depth!=0) {
-                    $uriLock->uri = $currentPath;
-                    $lockList[] = $uriLock;
-                }
-
-            }
-
-        }
-        if ($this->locksBackend) 
-            $lockList = array_merge($lockList,$this->locksBackend->getLocks($uri, $returnChildLocks));
-
-        return $lockList;
-
-    }
-
-    /**
-     * Locks an uri
-     *
-     * The WebDAV lock request can be operated to either create a new lock on a file, or to refresh an existing lock
-     * If a new lock is created, a full XML body should be supplied, containing information about the lock such as the type 
-     * of lock (shared or exclusive) and the owner of the lock
-     *
-     * If a lock is to be refreshed, no body should be supplied and there should be a valid If header containing the lock
-     *
-     * Additionally, a lock can be requested for a non-existant file. In these case we're obligated to create an empty file as per RFC4918:S7.3
-     * 
-     * @param string $uri
-     * @return void
-     */
-    protected function httpLock($uri) {
-
-        $lastLock = null;
-        if (!$this->validateLock($uri,$lastLock)) {
-
-            // If the existing lock was an exclusive lock, we need to fail
-            if (!$lastLock || $lastLock->scope == Sabre_DAV_Locks_LockInfo::EXCLUSIVE) {
-                //var_dump($lastLock);
-                throw new Sabre_DAV_Exception_ConflictingLock($lastLock);
-            }
-
-        }
-
-        if ($body = $this->server->httpRequest->getBody(true)) {
-            // This is a new lock request
-            $lockInfo = $this->parseLockRequest($body);
-            $lockInfo->depth = $this->server->getHTTPDepth(); 
-            $lockInfo->uri = $uri;
-            if($lastLock && $lockInfo->scope != Sabre_DAV_Locks_LockInfo::SHARED) throw new Sabre_DAV_Exception_ConflictingLock($lastLock);
-
-        } elseif ($lastLock) {
-
-            // This must have been a lock refresh
-            $lockInfo = $lastLock;
-
-            // The resource could have been locked through another uri. 
-            if ($uri!=$lockInfo->uri) $uri = $lockInfo->uri;
-
-        } else {
-            
-            // There was neither a lock refresh nor a new lock request
-            throw new Sabre_DAV_Exception_BadRequest('An xml body is required for lock requests');
-
-        }
-
-        if ($timeout = $this->getTimeoutHeader()) $lockInfo->timeout = $timeout;
-
-        $newFile = false;
-
-        // If we got this far.. we should go check if this node actually exists. If this is not the case, we need to create it first
-        try {
-            $node = $this->server->tree->getNodeForPath($uri);
-            
-            // We need to call the beforeWriteContent event for RFC3744
-            $this->server->broadcastEvent('beforeWriteContent',array($uri));
-
-        } catch (Sabre_DAV_Exception_FileNotFound $e) {
-            
-            // It didn't, lets create it
-            $this->server->createFile($uri,fopen('php://memory','r')); 
-            $newFile = true; 
-
-        }
-
-        $this->lockNode($uri,$lockInfo);
-
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Lock-Token','<opaquelocktoken:' . $lockInfo->token . '>');
-        $this->server->httpResponse->sendStatus($newFile?201:200);
-        $this->server->httpResponse->sendBody($this->generateLockResponse($lockInfo));
-
-    }
-
-    /**
-     * Unlocks a uri
-     *
-     * This WebDAV method allows you to remove a lock from a node. The client should provide a valid locktoken through the Lock-token http header
-     * The server should return 204 (No content) on success
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpUnlock($uri) {
-
-        $lockToken = $this->server->httpRequest->getHeader('Lock-Token');
-
-        // If the locktoken header is not supplied, we need to throw a bad request exception
-        if (!$lockToken) throw new Sabre_DAV_Exception_BadRequest('No lock token was supplied');
-
-        $locks = $this->getLocks($uri);
-
-        // Windows sometimes forgets to include < and > in the Lock-Token 
-        // header
-        if ($lockToken[0]!=='<') $lockToken = '<' . $lockToken . '>';
-
-        foreach($locks as $lock) {
-
-            if ('<opaquelocktoken:' . $lock->token . '>' == $lockToken) {
-
-                $this->server->broadcastEvent('beforeUnlock',array($uri, $lock));
-                $this->unlockNode($uri,$lock);
-                $this->server->httpResponse->setHeader('Content-Length','0');
-                $this->server->httpResponse->sendStatus(204);
-                return;
-
-            }
-
-        }
-
-        // If we got here, it means the locktoken was invalid
-        throw new Sabre_DAV_Exception_LockTokenMatchesRequestUri();
-
-    }
-
-    /**
-     * Locks a uri
-     *
-     * All the locking information is supplied in the lockInfo object. The object has a suggested timeout, but this can be safely ignored
-     * It is important that if the existing timeout is ignored, the property is overwritten, as this needs to be sent back to the client
-     * 
-     * @param string $uri 
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
-     * @return void
-     */
-    public function lockNode($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        if (!$this->server->broadcastEvent('beforeLock',array($uri,$lockInfo))) return;
-
-        try {
-            $node = $this->server->tree->getNodeForPath($uri);
-            if ($node instanceof Sabre_DAV_ILockable) return $node->lock($lockInfo);
-        } catch (Sabre_DAV_Exception_FileNotFound $e) {
-            // In case the node didn't exist, this could be a lock-null request
-        }
-        if ($this->locksBackend) return $this->locksBackend->lock($uri,$lockInfo);
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Locking support is not enabled for this resource. No Locking backend was found so if you didn\'t expect this error, please check your configuration.');
-
-    }
-
-    /**
-     * Unlocks a uri
-     *
-     * This method removes a lock from a uri. It is assumed all the supplied information is correct and verified
-     * 
-     * @param string $uri 
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
-     * @return void
-     */
-    public function unlockNode($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        if (!$this->server->broadcastEvent('beforeUnlock',array($uri,$lockInfo))) return;
-        try {
-            $node = $this->server->tree->getNodeForPath($uri);
-            if ($node instanceof Sabre_DAV_ILockable) return $node->unlock($lockInfo);
-        } catch (Sabre_DAV_Exception_FileNotFound $e) {
-            // In case the node didn't exist, this could be a lock-null request
-        }
-
-        if ($this->locksBackend) return $this->locksBackend->unlock($uri,$lockInfo);
-
-    }
-
-
-    /**
-     * Returns the contents of the HTTP Timeout header. 
-     * 
-     * The method formats the header into an integer.
-     *
-     * @return int
-     */
-    public function getTimeoutHeader() {
-
-        $header = $this->server->httpRequest->getHeader('Timeout');
-        
-        if ($header) {
-
-            if (stripos($header,'second-')===0) $header = (int)(substr($header,7));
-            else if (strtolower($header)=='infinite') $header=Sabre_DAV_Locks_LockInfo::TIMEOUT_INFINITE;
-            else throw new Sabre_DAV_Exception_BadRequest('Invalid HTTP timeout header');
-
-        } else {
-
-            $header = 0;
-
-        }
-
-        return $header;
-
-    }
-
-    /**
-     * Generates the response for successfull LOCK requests 
-     * 
-     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
-     * @return string 
-     */
-    protected function generateLockResponse(Sabre_DAV_Locks_LockInfo $lockInfo) {
-
-        $dom = new DOMDocument('1.0','utf-8');
-        $dom->formatOutput = true;
-        
-        $prop = $dom->createElementNS('DAV:','d:prop');
-        $dom->appendChild($prop);
-
-        $lockDiscovery = $dom->createElementNS('DAV:','d:lockdiscovery');
-        $prop->appendChild($lockDiscovery);
-
-        $lockObj = new Sabre_DAV_Property_LockDiscovery(array($lockInfo),true);
-        $lockObj->serialize($this->server,$lockDiscovery);
-
-        return $dom->saveXML();
-
-    }
-    
-    /**
-     * validateLock should be called when a write operation is about to happen
-     * It will check if the requested url is locked, and see if the correct lock tokens are passed 
-     *
-     * @param mixed $urls List of relevant urls. Can be an array, a string or nothing at all for the current request uri
-     * @param mixed $lastLock This variable will be populated with the last checked lock object (Sabre_DAV_Locks_LockInfo)
-     * @param bool $checkChildLocks If set to true, this function will also look for any locks set on child resources of the supplied urls. This is needed for for example deletion of entire trees.
-     * @return bool
-     */
-    protected function validateLock($urls = null,&$lastLock = null, $checkChildLocks = false) {
-
-        if (is_null($urls)) {
-            $urls = array($this->server->getRequestUri());
-        } elseif (is_string($urls)) {
-            $urls = array($urls);
-        } elseif (!is_array($urls)) {
-            throw new Sabre_DAV_Exception('The urls parameter should either be null, a string or an array');
-        }
-
-        $conditions = $this->getIfConditions();
-
-        // We're going to loop through the urls and make sure all lock conditions are satisfied
-        foreach($urls as $url) {
-
-            $locks = $this->getLocks($url, $checkChildLocks);
-
-            // If there were no conditions, but there were locks, we fail 
-            if (!$conditions && $locks) {
-                reset($locks);
-                $lastLock = current($locks);
-                return false;
-            }
-          
-            // If there were no locks or conditions, we go to the next url
-            if (!$locks && !$conditions) continue;
-
-            foreach($conditions as $condition) {
-
-                if (!$condition['uri']) {
-                    $conditionUri = $this->server->getRequestUri();
-                } else {
-                    $conditionUri = $this->server->calculateUri($condition['uri']);
-                }
-
-                // If the condition has a url, and it isn't part of the affected url at all, check the next condition
-                if ($conditionUri && strpos($url,$conditionUri)!==0) continue;
-
-                // The tokens array contians arrays with 2 elements. 0=true/false for normal/not condition, 1=locktoken
-                // At least 1 condition has to be satisfied
-                foreach($condition['tokens'] as $conditionToken) {
-
-                    $etagValid = true;
-                    $lockValid  = true;
-
-                    // key 2 can contain an etag
-                    if ($conditionToken[2]) {
-
-                        $uri = $conditionUri?$conditionUri:$this->server->getRequestUri(); 
-                        $node = $this->server->tree->getNodeForPath($uri);
-                        $etagValid = $node->getETag()==$conditionToken[2];
-
-                    }
-
-                    // key 1 can contain a lock token
-                    if ($conditionToken[1]) {
-
-                        $lockValid = false;
-                        // Match all the locks
-                        foreach($locks as $lockIndex=>$lock) {
-
-                            $lockToken = 'opaquelocktoken:' . $lock->token;
-
-                            // Checking NOT
-                            if (!$conditionToken[0] && $lockToken != $conditionToken[1]) {
-
-                                // Condition valid, onto the next
-                                $lockValid = true;
-                                break;
-                            }
-                            if ($conditionToken[0] && $lockToken == $conditionToken[1]) {
-
-                                $lastLock = $lock;
-                                // Condition valid and lock matched
-                                unset($locks[$lockIndex]);
-                                $lockValid = true;
-                                break;
-
-                            }
-
-                        }
-
-                    }
-
-                    // If, after checking both etags and locks they are stil valid,
-                    // we can continue with the next condition.
-                    if ($etagValid && $lockValid) continue 2;
-               }
-               // No conditions matched, so we fail
-               throw new Sabre_DAV_Exception_PreconditionFailed('The tokens provided in the if header did not match','If');
-            }
-
-            // Conditions were met, we'll also need to check if all the locks are gone
-            if (count($locks)) {
-
-                reset($locks);
-
-                // There's still locks, we fail
-                $lastLock = current($locks);
-                return false;
-
-            }
-
-
-        }
-
-        // We got here, this means every condition was satisfied
-        return true;
-
-    }
-
-    /**
-     * This method is created to extract information from the WebDAV HTTP 'If:' header
-     *
-     * The If header can be quite complex, and has a bunch of features. We're using a regex to extract all relevant information
-     * The function will return an array, containg structs with the following keys
-     *
-     *   * uri   - the uri the condition applies to. If this is returned as an 
-     *     empty string, this implies it's referring to the request url.
-     *   * tokens - The lock token. another 2 dimensional array containg 2 elements (0 = true/false.. If this is a negative condition its set to false, 1 = the actual token)
-     *   * etag - an etag, if supplied
-     * 
-     * @return void
-     */
-    public function getIfConditions() {
-
-        $header = $this->server->httpRequest->getHeader('If'); 
-        if (!$header) return array();
-
-        $matches = array();
-
-        $regex = '/(?:\<(?P<uri>.*?)\>\s)?\((?P<not>Not\s)?(?:\<(?P<token>[^\>]*)\>)?(?:\s?)(?:\[(?P<etag>[^\]]*)\])?\)/im'; 
-        preg_match_all($regex,$header,$matches,PREG_SET_ORDER);
-
-        $conditions = array();
-
-        foreach($matches as $match) {
-
-            $condition = array(
-                'uri'   => $match['uri'],
-                'tokens' => array(
-                    array($match['not']?0:1,$match['token'],isset($match['etag'])?$match['etag']:'')
-                ),    
-            );
-
-            if (!$condition['uri'] && count($conditions)) $conditions[count($conditions)-1]['tokens'][] = array(
-                $match['not']?0:1,
-                $match['token'],
-                isset($match['etag'])?$match['etag']:''
-            );
-            else {
-                $conditions[] = $condition;
-            }
-
-        }
-
-        return $conditions;
-
-    }
-
-    /**
-     * Parses a webdav lock xml body, and returns a new Sabre_DAV_Locks_LockInfo object 
-     * 
-     * @param string $body 
-     * @return Sabre_DAV_Locks_LockInfo
-     */
-    protected function parseLockRequest($body) {
-
-        $xml = simplexml_load_string($body,null,LIBXML_NOWARNING);
-        $xml->registerXPathNamespace('d','DAV:');
-        $lockInfo = new Sabre_DAV_Locks_LockInfo();
-
-        $children = $xml->children("DAV:");
-        $lockInfo->owner = (string)$children->owner;
-
-        $lockInfo->token = Sabre_DAV_UUIDUtil::getUUID();
-        $lockInfo->scope = count($xml->xpath('d:lockscope/d:exclusive'))>0?Sabre_DAV_Locks_LockInfo::EXCLUSIVE:Sabre_DAV_Locks_LockInfo::SHARED;
-
-        return $lockInfo;
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/DAV/Mount/Plugin.php b/3rdparty/Sabre/DAV/Mount/Plugin.php
deleted file mode 100644
index f93a1aa25a1..00000000000
--- a/3rdparty/Sabre/DAV/Mount/Plugin.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * This plugin provides support for RFC4709: Mounting WebDAV servers
- *
- * Simply append ?mount to any collection to generate the davmount response.
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- */
-class Sabre_DAV_Mount_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * Reference to Server class 
-     * 
-     * @var Sabre_DAV_Server 
-     */
-    private $server;
-
-    /**
-     * Initializes the plugin and registers event handles 
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
-
-    }
-
-    /**
-     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
-     * with ?mount
-     * 
-     * @param string $method 
-     * @return void
-     */
-    public function beforeMethod($method, $uri) {
-
-        if ($method!='GET') return;
-        if ($this->server->httpRequest->getQueryString()!='mount') return;
-
-        $currentUri = $this->server->httpRequest->getAbsoluteUri();
-
-        // Stripping off everything after the ?
-        list($currentUri) = explode('?',$currentUri);
-
-        $this->davMount($currentUri);
-
-        // Returning false to break the event chain
-        return false;
-
-    }
-
-    /**
-     * Generates the davmount response 
-     * 
-     * @param string $uri absolute uri 
-     * @return void
-     */
-    public function davMount($uri) {
-       
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->setHeader('Content-Type','application/davmount+xml');
-        ob_start();
-        echo '<?xml version="1.0"?>', "\n";
-        echo "<dm:mount xmlns:dm=\"http://purl.org/NET/webdav/mount\">\n";
-        echo "  <dm:url>", htmlspecialchars($uri, ENT_NOQUOTES, 'UTF-8'), "</dm:url>\n";
-        echo "</dm:mount>";
-        $this->server->httpResponse->sendBody(ob_get_clean());
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/DAV/Node.php b/3rdparty/Sabre/DAV/Node.php
deleted file mode 100644
index 0510df5fdf2..00000000000
--- a/3rdparty/Sabre/DAV/Node.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * Node class
- *
- * This is a helper class, that should aid in getting nodes setup. 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Node implements Sabre_DAV_INode {
-
-    /**
-     * Returns the last modification time 
-     *
-     * In this case, it will simply return the current time
-     *
-     * @return int 
-     */
-    public function getLastModified() {
-
-        return time();
-
-    }
-
-    /**
-     * Deleted the current node
-     *
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @return void 
-     */
-    public function delete() {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
-
-    }
-
-    /**
-     * Renames the node
-     * 
-     * @throws Sabre_DAV_Exception_Forbidden
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/ObjectTree.php b/3rdparty/Sabre/DAV/ObjectTree.php
deleted file mode 100644
index f12a3683705..00000000000
--- a/3rdparty/Sabre/DAV/ObjectTree.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-/**
- * ObjectTree class
- *
- * This implementation of the Tree class makes use of the INode, IFile and ICollection API's 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_ObjectTree extends Sabre_DAV_Tree {
-
-    /**
-     * The root node 
-     * 
-     * @var Sabre_DAV_ICollection
-     */
-    protected $rootNode;
-
-    /**
-     * This is the node cache. Accessed nodes are stored here 
-     * 
-     * @var array 
-     */
-    protected $cache = array();
-
-    /**
-     * Creates the object
-     *
-     * This method expects the rootObject to be passed as a parameter
-     * 
-     * @param Sabre_DAV_ICollection $rootNode 
-     * @return void
-     */
-    public function __construct(Sabre_DAV_ICollection $rootNode) {
-
-        $this->rootNode = $rootNode;
-
-    }
-
-    /**
-     * Returns the INode object for the requested path  
-     * 
-     * @param string $path 
-     * @return Sabre_DAV_INode 
-     */
-    public function getNodeForPath($path) {
-
-        $path = trim($path,'/');
-        if (isset($this->cache[$path])) return $this->cache[$path];
-
-        //if (!$path || $path=='.') return $this->rootNode;
-        $currentNode = $this->rootNode;
-        $i=0;
-        // We're splitting up the path variable into folder/subfolder components and traverse to the correct node.. 
-        foreach(explode('/',$path) as $pathPart) {
-
-            // If this part of the path is just a dot, it actually means we can skip it
-            if ($pathPart=='.' || $pathPart=='') continue;
-
-            if (!($currentNode instanceof Sabre_DAV_ICollection))
-                throw new Sabre_DAV_Exception_FileNotFound('Could not find node at path: ' . $path);
-
-            $currentNode = $currentNode->getChild($pathPart); 
-
-        }
-
-        $this->cache[$path] = $currentNode;
-        return $currentNode;
-
-    }
-
-    /**
-     * This function allows you to check if a node exists.
-     *
-     * @param string $path 
-     * @return bool 
-     */
-    public function nodeExists($path) {
-
-        try {
-
-            // The root always exists
-            if ($path==='') return true;
-
-            list($parent, $base) = Sabre_DAV_URLUtil::splitPath($path);
-
-            $parentNode = $this->getNodeForPath($parent);
-            if (!$parentNode instanceof Sabre_DAV_ICollection) return false;
-            return $parentNode->childExists($base);
-
-        } catch (Sabre_DAV_Exception_FileNotFound $e) {
-
-            return false;
-
-        }
-
-    }
-
-    /**
-     * Returns a list of childnodes for a given path. 
-     * 
-     * @param string $path 
-     * @return array 
-     */
-    public function getChildren($path) {
-
-        $node = $this->getNodeForPath($path);
-        $children = $node->getChildren();
-        foreach($children as $child) {
-
-            $this->cache[trim($path,'/') . '/' . $child->getName()] = $child;
-
-        }
-        return $children;
-
-    }
-
-    /**
-     * This method is called with every tree update
-     *
-     * Examples of tree updates are:
-     *   * node deletions
-     *   * node creations
-     *   * copy
-     *   * move
-     *   * renaming nodes 
-     * 
-     * If Tree classes implement a form of caching, this will allow
-     * them to make sure caches will be expired.
-     * 
-     * If a path is passed, it is assumed that the entire subtree is dirty
-     *
-     * @param string $path 
-     * @return void
-     */
-    public function markDirty($path) {
-
-        // We don't care enough about sub-paths
-        // flushing the entire cache
-        $path = trim($path,'/');
-        foreach($this->cache as $nodePath=>$node) {
-            if ($nodePath == $path || strpos($nodePath,$path.'/')===0)
-                unset($this->cache[$nodePath]);
-            
-        }
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Property.php b/3rdparty/Sabre/DAV/Property.php
deleted file mode 100644
index 577535b0127..00000000000
--- a/3rdparty/Sabre/DAV/Property.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Abstract property class
- *
- * Extend this class to create custom complex properties
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Property {
-
-    abstract function serialize(Sabre_DAV_Server $server, DOMElement $prop); 
-
-    static function unserialize(DOMElement $prop) {
-
-        throw new Sabre_DAV_Exception('Unserialize has not been implemented for this class');
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Property/GetLastModified.php b/3rdparty/Sabre/DAV/Property/GetLastModified.php
deleted file mode 100644
index 4a812629971..00000000000
--- a/3rdparty/Sabre/DAV/Property/GetLastModified.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * This property represents the {DAV:}getlastmodified property.
- * 
- * Although this is normally a simple property, windows requires us to add
- * some new attributes.
- *
- * This class uses unix timestamps internally, and converts them to RFC 1123 times for 
- * serialization
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_GetLastModified extends Sabre_DAV_Property {
-
-    /**
-     * time 
-     * 
-     * @var int 
-     */
-    public $time;
-
-    /**
-     * __construct 
-     * 
-     * @param int|DateTime $time 
-     * @return void
-     */
-    public function __construct($time) {
-
-        if ($time instanceof DateTime) {
-            $this->time = $time;
-        } elseif (is_int($time) || ctype_digit($time)) {
-            $this->time = new DateTime('@' . $time);
-        } else {
-            $this->time = new DateTime($time);
-        }
-
-        // Setting timezone to UTC
-        $this->time->setTimezone(new DateTimeZone('UTC'));
-
-    }
-
-    /**
-     * serialize 
-     * 
-     * @param DOMElement $prop 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
-
-        $doc = $prop->ownerDocument;
-        $prop->setAttribute('xmlns:b','urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/');
-        $prop->setAttribute('b:dt','dateTime.rfc1123');
-        $prop->nodeValue = $this->time->format(DateTime::RFC1123);
-
-    }
-
-    /**
-     * getTime 
-     * 
-     * @return DateTime 
-     */
-    public function getTime() {
-
-        return $this->time;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Property/Href.php b/3rdparty/Sabre/DAV/Property/Href.php
deleted file mode 100644
index 3294ff2ac68..00000000000
--- a/3rdparty/Sabre/DAV/Property/Href.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/**
- * Href property
- *
- * The href property represpents a url within a {DAV:}href element.
- * This is used by many WebDAV extensions, but not really within the WebDAV core spec
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_Href extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
-
-    /**
-     * href 
-     * 
-     * @var string 
-     */
-    private $href;
-
-    /**
-     * Automatically prefix the url with the server base directory 
-     * 
-     * @var bool 
-     */
-    private $autoPrefix = true;
-
-    /**
-     * __construct 
-     * 
-     * @param string $href 
-     * @return void
-     */
-    public function __construct($href, $autoPrefix = true) {
-
-        $this->href = $href;
-        $this->autoPrefix = $autoPrefix;
-
-    }
-
-    /**
-     * Returns the uri 
-     * 
-     * @return string 
-     */
-    public function getHref() {
-
-        return $this->href;
-
-    }
-
-    /**
-     * Serializes this property.
-     *
-     * It will additionally prepend the href property with the server's base uri.
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $dom 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
-
-        $prefix = $server->xmlNamespaces['DAV:'];
-
-        $elem = $dom->ownerDocument->createElement($prefix . ':href');
-        $elem->nodeValue = ($this->autoPrefix?$server->getBaseUri():'') . $this->href;
-        $dom->appendChild($elem);
-
-    }
-
-    /**
-     * Unserializes this property from a DOM Element 
-     *
-     * This method returns an instance of this class.
-     * It will only decode {DAV:}href values. For non-compatible elements null will be returned.
-     *
-     * @param DOMElement $dom 
-     * @return Sabre_DAV_Property_Href 
-     */
-    static function unserialize(DOMElement $dom) {
-
-        if (Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild)==='{DAV:}href') {
-            return new self($dom->firstChild->textContent,false);
-        }
-
-    } 
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/HrefList.php b/3rdparty/Sabre/DAV/Property/HrefList.php
deleted file mode 100644
index 76a5512901c..00000000000
--- a/3rdparty/Sabre/DAV/Property/HrefList.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * HrefList property
- *
- * This property contains multiple {DAV:}href elements, each containing a url. 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_HrefList extends Sabre_DAV_Property {
-
-    /**
-     * hrefs 
-     * 
-     * @var array 
-     */
-    private $hrefs;
-
-    /**
-     * Automatically prefix the url with the server base directory 
-     * 
-     * @var bool 
-     */
-    private $autoPrefix = true;
-
-    /**
-     * __construct 
-     * 
-     * @param array $hrefs
-     * @param bool $autoPrefix 
-     */
-    public function __construct(array $hrefs, $autoPrefix = true) {
-
-        $this->hrefs = $hrefs;
-        $this->autoPrefix = $autoPrefix;
-
-    }
-
-    /**
-     * Returns the uris 
-     * 
-     * @return array 
-     */
-    public function getHrefs() {
-
-        return $this->hrefs;
-
-    }
-
-    /**
-     * Serializes this property.
-     *
-     * It will additionally prepend the href property with the server's base uri.
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $dom 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
-
-        $prefix = $server->xmlNamespaces['DAV:'];
-
-        foreach($this->hrefs as $href) {
-            $elem = $dom->ownerDocument->createElement($prefix . ':href');
-            $elem->nodeValue = ($this->autoPrefix?$server->getBaseUri():'') . $href;
-            $dom->appendChild($elem);
-        }
-
-    }
-
-    /**
-     * Unserializes this property from a DOM Element 
-     *
-     * This method returns an instance of this class.
-     * It will only decode {DAV:}href values.
-     *
-     * @param DOMElement $dom 
-     * @return Sabre_DAV_Property_Href 
-     */
-    static function unserialize(DOMElement $dom) {
-
-        $hrefs = array();
-        foreach($dom->childNodes as $child) {
-            if (Sabre_DAV_XMLUtil::toClarkNotation($child)==='{DAV:}href') {
-                $hrefs[] = $child->textContent;
-            }
-        }
-        return new self($hrefs, false);
-
-    } 
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/IHref.php b/3rdparty/Sabre/DAV/Property/IHref.php
deleted file mode 100644
index 29d76a44fcd..00000000000
--- a/3rdparty/Sabre/DAV/Property/IHref.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * IHref interface
- *
- * Any property implementing this interface can expose a related url.
- * This is used by certain subsystems to aquire more information about for example
- * the owner of a file
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAV_Property_IHref {
-
-    /**
-     * getHref 
-     * 
-     * @return string 
-     */
-    function getHref();
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/LockDiscovery.php b/3rdparty/Sabre/DAV/Property/LockDiscovery.php
deleted file mode 100644
index 05c7470b4ed..00000000000
--- a/3rdparty/Sabre/DAV/Property/LockDiscovery.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * Represents {DAV:}lockdiscovery property
- *
- * This property contains all the open locks on a given resource
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_LockDiscovery extends Sabre_DAV_Property {
-
-    /**
-     * locks 
-     * 
-     * @var array 
-     */
-    public $locks;
- 
-    /**
-     * Should we show the locktoken as well? 
-     * 
-     * @var bool 
-     */
-    public $revealLockToken;
-
-    /**
-     * Hides the {DAV:}lockroot element from the response.
-     *
-     * It was reported that showing the lockroot in the response can break
-     * Office 2000 compatibility.
-     */
-    static public $hideLockRoot = false;
-
-    /**
-     * __construct 
-     * 
-     * @param array $locks 
-     * @param bool $revealLockToken 
-     * @return void
-     */
-    public function __construct($locks,$revealLockToken = false) {
-
-        $this->locks = $locks;
-        $this->revealLockToken = $revealLockToken;
-
-    }
-
-    /**
-     * serialize 
-     * 
-     * @param DOMElement $prop 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $prop) {
-
-        $doc = $prop->ownerDocument;
-
-        foreach($this->locks as $lock) {
-
-            $activeLock = $doc->createElementNS('DAV:','d:activelock');
-            $prop->appendChild($activeLock);
-
-            $lockScope = $doc->createElementNS('DAV:','d:lockscope');
-            $activeLock->appendChild($lockScope);
-
-            $lockScope->appendChild($doc->createElementNS('DAV:','d:' . ($lock->scope==Sabre_DAV_Locks_LockInfo::EXCLUSIVE?'exclusive':'shared')));
-
-            $lockType = $doc->createElementNS('DAV:','d:locktype');
-            $activeLock->appendChild($lockType);
-
-            $lockType->appendChild($doc->createElementNS('DAV:','d:write'));
-
-            /* {DAV:}lockroot */ 
-            if (!self::$hideLockRoot) {
-                $lockRoot = $doc->createElementNS('DAV:','d:lockroot');
-                $activeLock->appendChild($lockRoot);
-                $href = $doc->createElementNS('DAV:','d:href');
-                $href->appendChild($doc->createTextNode($server->getBaseUri() . $lock->uri));
-                $lockRoot->appendChild($href);
-            }
-
-            $activeLock->appendChild($doc->createElementNS('DAV:','d:depth',($lock->depth == Sabre_DAV_Server::DEPTH_INFINITY?'infinity':$lock->depth)));
-            $activeLock->appendChild($doc->createElementNS('DAV:','d:timeout','Second-' . $lock->timeout));
-
-            if ($this->revealLockToken) {
-                $lockToken = $doc->createElementNS('DAV:','d:locktoken');
-                $activeLock->appendChild($lockToken);
-                $lockToken->appendChild($doc->createElementNS('DAV:','d:href','opaquelocktoken:' . $lock->token));
-            }
-           
-            $activeLock->appendChild($doc->createElementNS('DAV:','d:owner',$lock->owner));
-
-        }
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Property/ResourceType.php b/3rdparty/Sabre/DAV/Property/ResourceType.php
deleted file mode 100644
index 2c606c22d60..00000000000
--- a/3rdparty/Sabre/DAV/Property/ResourceType.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/**
- * This class represents the {DAV:}resourcetype property
- *
- * Normally for files this is empty, and for collection {DAV:}collection.
- * However, other specs define different values for this. 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_ResourceType extends Sabre_DAV_Property {
-
-    /**
-     * resourceType 
-     * 
-     * @var array
-     */
-    public $resourceType = array();
-
-    /**
-     * __construct 
-     * 
-     * @param mixed $resourceType 
-     * @return void
-     */
-    public function __construct($resourceType = array()) {
-
-        if ($resourceType === Sabre_DAV_Server::NODE_FILE)
-            $this->resourceType = array();
-        elseif ($resourceType === Sabre_DAV_Server::NODE_DIRECTORY)
-            $this->resourceType = array('{DAV:}collection');
-        elseif (is_array($resourceType)) 
-            $this->resourceType = $resourceType;
-        else
-            $this->resourceType = array($resourceType);
-
-    }
-
-    /**
-     * serialize 
-     * 
-     * @param DOMElement $prop 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $prop) {
-
-        $propName = null;
-        $rt = $this->resourceType;
-        
-        foreach($rt as $resourceType) {
-            if (preg_match('/^{([^}]*)}(.*)$/',$resourceType,$propName)) { 
-       
-                if (isset($server->xmlNamespaces[$propName[1]])) {
-                    $prop->appendChild($prop->ownerDocument->createElement($server->xmlNamespaces[$propName[1]] . ':' . $propName[2]));
-                } else {
-                    $prop->appendChild($prop->ownerDocument->createElementNS($propName[1],'custom:' . $propName[2]));
-                }
-            
-            }
-        }
-
-    }
-
-    /**
-     * Returns the values in clark-notation
-     *
-     * For example array('{DAV:}collection')
-     * 
-     * @return array 
-     */
-    public function getValue() {
-
-        return $this->resourceType;
-
-    }
-
-    /**
-     * Checks if the principal contains a certain value 
-     * 
-     * @param string $type 
-     * @return bool 
-     */
-    public function is($type) {
-
-        return in_array($type, $this->resourceType);
-
-    }
-
-    /**
-     * Adds a resourcetype value to this property
-     *
-     * @param string $type
-     * @return void
-     */
-    public function add($type) {
-
-        $this->resourceType[] = $type;
-        $this->resourceType = array_unique($this->resourceType);
-
-    }
-
-    /**
-     * Unserializes a DOM element into a ResourceType property. 
-     * 
-     * @param DOMElement $dom 
-     * @return void
-     */
-    static public function unserialize(DOMElement $dom) {
-
-        $value = array();
-        foreach($dom->childNodes as $child) {
-
-            $value[] = Sabre_DAV_XMLUtil::toClarkNotation($child);
-
-        }
-
-        return new self($value);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/Response.php b/3rdparty/Sabre/DAV/Property/Response.php
deleted file mode 100644
index 7d3a2db0387..00000000000
--- a/3rdparty/Sabre/DAV/Property/Response.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-/**
- * Response property 
- * 
- * This class represents the {DAV:}response XML element.
- * This is used by the Server class to encode individual items within a multistatus 
- * response.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_Response extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
-
-    /**
-     * Url for the response 
-     * 
-     * @var string 
-     */
-    private $href;
-
-    /**
-     * Propertylist, ordered by HTTP status code 
-     * 
-     * @var array 
-     */
-    private $responseProperties;
-
-    /**
-     * The responseProperties argument is a list of properties
-     * within an array with keys representing HTTP status codes
-     * 
-     * @param string $href 
-     * @param array $responseProperties 
-     * @return void
-     */
-    public function __construct($href,array $responseProperties) {
-
-        $this->href = $href;
-        $this->responseProperties = $responseProperties; 
-
-    }
-
-    /**
-     * Returns the url 
-     * 
-     * @return string 
-     */
-    public function getHref() {
-
-        return $this->href;
-
-    }
-
-    /**
-     * Returns the property list 
-     * 
-     * @return array 
-     */
-    public function getResponseProperties() {
-
-        return $this->responseProperties;
-
-    }
-
-    /**
-     * serialize 
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $dom 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
-
-        $document = $dom->ownerDocument;
-        $properties = $this->responseProperties;
-        
-        $xresponse = $document->createElement('d:response');
-        $dom->appendChild($xresponse); 
-
-        $uri = Sabre_DAV_URLUtil::encodePath($this->href);
-
-        // Adding the baseurl to the beginning of the url
-        $uri = $server->getBaseUri() . $uri;
-
-        $xresponse->appendChild($document->createElement('d:href',$uri));
-       
-        // The properties variable is an array containing properties, grouped by
-        // HTTP status
-        foreach($properties as $httpStatus=>$propertyGroup) {
-
-            // The 'href' is also in this array, and it's special cased.
-            // We will ignore it
-            if ($httpStatus=='href') continue;
-
-            // If there are no properties in this group, we can also just carry on
-            if (!count($propertyGroup)) continue;
-
-            $xpropstat = $document->createElement('d:propstat');
-            $xresponse->appendChild($xpropstat);
-
-            $xprop = $document->createElement('d:prop');
-            $xpropstat->appendChild($xprop);
-
-            $nsList = $server->xmlNamespaces;
-
-            foreach($propertyGroup as $propertyName=>$propertyValue) {
-
-                $propName = null;
-                preg_match('/^{([^}]*)}(.*)$/',$propertyName,$propName);
-            
-                // special case for empty namespaces
-                if ($propName[1]=='') {
-
-                    $currentProperty = $document->createElement($propName[2]);
-                    $xprop->appendChild($currentProperty);
-                    $currentProperty->setAttribute('xmlns','');
-
-                } else {
-
-                    if (!isset($nsList[$propName[1]])) {
-                        $nsList[$propName[1]] = 'x' . count($nsList);
-                    }
-
-                    // If the namespace was defined in the top-level xml namespaces, it means 
-                    // there was already a namespace declaration, and we don't have to worry about it.
-                    if (isset($server->xmlNamespaces[$propName[1]])) {
-                        $currentProperty = $document->createElement($nsList[$propName[1]] . ':' . $propName[2]);
-                    } else {
-                        $currentProperty = $document->createElementNS($propName[1],$nsList[$propName[1]].':' . $propName[2]);
-                    }
-                    $xprop->appendChild($currentProperty);
-
-                }
-
-                if (is_scalar($propertyValue)) {
-                    $text = $document->createTextNode($propertyValue);
-                    $currentProperty->appendChild($text);
-                } elseif ($propertyValue instanceof Sabre_DAV_Property) {
-                    $propertyValue->serialize($server,$currentProperty);
-                } elseif (!is_null($propertyValue)) {
-                    throw new Sabre_DAV_Exception('Unknown property value type: ' . gettype($propertyValue) . ' for property: ' . $propertyName);
-                }
-
-            }
-
-            $xpropstat->appendChild($document->createElement('d:status',$server->httpResponse->getStatusMessage($httpStatus)));
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/ResponseList.php b/3rdparty/Sabre/DAV/Property/ResponseList.php
deleted file mode 100644
index cd70b12861d..00000000000
--- a/3rdparty/Sabre/DAV/Property/ResponseList.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * ResponseList property 
- * 
- * This class represents multiple {DAV:}response XML elements.
- * This is used by the Server class to encode items within a multistatus 
- * response.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_ResponseList extends Sabre_DAV_Property {
-
-    /**
-     * Response objects. 
-     * 
-     * @var array 
-     */
-    private $responses;
-
-    /**
-     * The only valid argument is a list of Sabre_DAV_Property_Response 
-     * objects.
-     * 
-     * @param array $responses; 
-     * @return void
-     */
-    public function __construct($responses) {
-
-        foreach($responses as $response) {
-            if (!($response instanceof Sabre_DAV_Property_Response)) {
-                throw new InvalidArgumentException('You must pass an array of Sabre_DAV_Property_Response objects');
-            }
-        }
-        $this->responses = $responses;
-
-    }
-
-    /**
-     * serialize 
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $dom 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
-
-        foreach($this->responses as $response) {
-            $response->serialize($server, $dom);
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Property/SupportedLock.php b/3rdparty/Sabre/DAV/Property/SupportedLock.php
deleted file mode 100644
index 01e63f58d9d..00000000000
--- a/3rdparty/Sabre/DAV/Property/SupportedLock.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * This class represents the {DAV:}supportedlock property
- *
- * This property contains information about what kind of locks
- * this server supports.
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_SupportedLock extends Sabre_DAV_Property {
-
-    /**
-     * supportsLocks 
-     * 
-     * @var mixed
-     */
-    public $supportsLocks = false;
-
-    /**
-     * __construct 
-     * 
-     * @param mixed $supportsLocks 
-     * @return void
-     */
-    public function __construct($supportsLocks) {
-
-        $this->supportsLocks = $supportsLocks;
-
-    }
-
-    /**
-     * serialize 
-     * 
-     * @param DOMElement $prop 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $prop) {
-
-        $doc = $prop->ownerDocument;
-
-        if (!$this->supportsLocks) return null;
-
-        $lockEntry1 = $doc->createElementNS('DAV:','d:lockentry');
-        $lockEntry2 = $doc->createElementNS('DAV:','d:lockentry');
-
-        $prop->appendChild($lockEntry1);
-        $prop->appendChild($lockEntry2);
-
-        $lockScope1 = $doc->createElementNS('DAV:','d:lockscope');
-        $lockScope2 = $doc->createElementNS('DAV:','d:lockscope');
-        $lockType1 = $doc->createElementNS('DAV:','d:locktype');
-        $lockType2 = $doc->createElementNS('DAV:','d:locktype');
-
-        $lockEntry1->appendChild($lockScope1);
-        $lockEntry1->appendChild($lockType1);
-        $lockEntry2->appendChild($lockScope2);
-        $lockEntry2->appendChild($lockType2);
-
-        $lockScope1->appendChild($doc->createElementNS('DAV:','d:exclusive'));
-        $lockScope2->appendChild($doc->createElementNS('DAV:','d:shared'));
-
-        $lockType1->appendChild($doc->createElementNS('DAV:','d:write'));
-        $lockType2->appendChild($doc->createElementNS('DAV:','d:write'));
-
-        //$frag->appendXML('<d:lockentry><d:lockscope><d:exclusive /></d:lockscope><d:locktype><d:write /></d:locktype></d:lockentry>');
-        //$frag->appendXML('<d:lockentry><d:lockscope><d:shared /></d:lockscope><d:locktype><d:write /></d:locktype></d:lockentry>');
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Property/SupportedReportSet.php b/3rdparty/Sabre/DAV/Property/SupportedReportSet.php
deleted file mode 100644
index acd9219c0f7..00000000000
--- a/3rdparty/Sabre/DAV/Property/SupportedReportSet.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * supported-report-set property.
- *
- * This property is defined in RFC3253, but since it's
- * so common in other webdav-related specs, it is part of the core server.
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Property_SupportedReportSet extends Sabre_DAV_Property {
-
-    /**
-     * List of reports 
-     * 
-     * @var array
-     */
-    protected $reports = array();
-
-    /**
-     * Creates the property
-     *
-     * Any reports passed in the constructor
-     * should be valid report-types in clark-notation.
-     *
-     * Either a string or an array of strings must be passed.
-     * 
-     * @param mixed $reports 
-     * @return void
-     */
-    public function __construct($reports = null) {
-
-        if (!is_null($reports)) 
-            $this->addReport($reports);
-
-    }
-
-    /**
-     * Adds a report to this property
-     *
-     * The report must be a string in clark-notation.
-     * Multiple reports can be specified as an array.
-     * 
-     * @param mixed $report 
-     * @return void
-     */
-    public function addReport($report) {
-
-        if (!is_array($report)) $report = array($report);
-
-        foreach($report as $r) {
-
-            if (!preg_match('/^{([^}]*)}(.*)$/',$r)) 
-                throw new Sabre_DAV_Exception('Reportname must be in clark-notation');
-
-            $this->reports[] = $r;
-
-        }
-
-    }
-
-    /**
-     * Returns the list of supported reports
-     * 
-     * @return array 
-     */
-    public function getValue() {
-
-        return $this->reports;
-
-    }
-
-    /**
-     * Serializes the node 
-     *
-     * @param Sabre_DAV_Server $server
-     * @param DOMElement $prop 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $prop) {
-
-        foreach($this->reports as $reportName) {
-     
-            $supportedReport = $prop->ownerDocument->createElement('d:supported-report');
-            $prop->appendChild($supportedReport);
-
-            $report = $prop->ownerDocument->createElement('d:report');
-            $supportedReport->appendChild($report);
-
-            preg_match('/^{([^}]*)}(.*)$/',$reportName,$matches);
-            
-            list(, $namespace, $element) = $matches;
-       
-            $prefix = isset($server->xmlNamespaces[$namespace])?$server->xmlNamespaces[$namespace]:null;
-
-            if ($prefix) {
-                $report->appendChild($prop->ownerDocument->createElement($prefix . ':' . $element));
-            } else {
-                $report->appendChild($prop->ownerDocument->createElementNS($namespace, 'x:' . $element));
-            }
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Server.php b/3rdparty/Sabre/DAV/Server.php
deleted file mode 100644
index 3d76d4f1918..00000000000
--- a/3rdparty/Sabre/DAV/Server.php
+++ /dev/null
@@ -1,1941 +0,0 @@
-<?php
-
-/**
- * Main DAV server class
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Server {
-
-    /**
-     * Inifinity is used for some request supporting the HTTP Depth header and indicates that the operation should traverse the entire tree
-     */
-    const DEPTH_INFINITY = -1;
-
-    /**
-     * Nodes that are files, should have this as the type property
-     */
-    const NODE_FILE = 1;
-
-    /**
-     * Nodes that are directories, should use this value as the type property
-     */
-    const NODE_DIRECTORY = 2;
-
-    const PROP_SET = 1;
-    const PROP_REMOVE = 2;
-
-    /**
-     * XML namespace for all SabreDAV related elements
-     */
-    const NS_SABREDAV = 'http://sabredav.org/ns';
-
-    /**
-     * The tree object
-     * 
-     * @var Sabre_DAV_Tree 
-     */
-    public $tree;
-
-    /**
-     * The base uri 
-     * 
-     * @var string 
-     */
-    protected $baseUri = null; 
-
-    /**
-     * httpResponse 
-     * 
-     * @var Sabre_HTTP_Response 
-     */
-    public $httpResponse;
-
-    /**
-     * httpRequest
-     * 
-     * @var Sabre_HTTP_Request 
-     */
-    public $httpRequest;
-
-    /**
-     * The list of plugins 
-     * 
-     * @var array 
-     */
-    protected $plugins = array();
-
-    /**
-     * This array contains a list of callbacks we should call when certain events are triggered 
-     * 
-     * @var array
-     */
-    protected $eventSubscriptions = array();
-
-    /**
-     * This is a default list of namespaces.
-     *
-     * If you are defining your own custom namespace, add it here to reduce
-     * bandwidth and improve legibility of xml bodies.
-     * 
-     * @var array
-     */
-    public $xmlNamespaces = array(
-        'DAV:' => 'd',
-        'http://sabredav.org/ns' => 's',
-    );
-
-    /**
-     * The propertymap can be used to map properties from 
-     * requests to property classes.
-     * 
-     * @var array
-     */
-    public $propertyMap = array(
-        '{DAV:}resourcetype' => 'Sabre_DAV_Property_ResourceType',
-    );
-
-    public $protectedProperties = array(
-        // RFC4918
-        '{DAV:}getcontentlength',
-        '{DAV:}getetag',
-        '{DAV:}getlastmodified',
-        '{DAV:}lockdiscovery',
-        '{DAV:}resourcetype',
-        '{DAV:}supportedlock',
-
-        // RFC4331
-        '{DAV:}quota-available-bytes',
-        '{DAV:}quota-used-bytes',
-
-        // RFC3744
-        '{DAV:}supported-privilege-set',
-        '{DAV:}current-user-privilege-set',
-        '{DAV:}acl',
-        '{DAV:}acl-restrictions',
-        '{DAV:}inherited-acl-set',
-
-    );
-
-    /**
-     * This is a flag that allow or not showing file, line and code
-     * of the exception in the returned XML
-     *
-     * @var bool 
-     */
-    public $debugExceptions = false;
-
-    /**
-     * This property allows you to automatically add the 'resourcetype' value 
-     * based on a node's classname or interface.
-     *
-     * The preset ensures that {DAV:}collection is automaticlly added for nodes 
-     * implementing Sabre_DAV_ICollection.
-     * 
-     * @var array
-     */
-    public $resourceTypeMapping = array(
-        'Sabre_DAV_ICollection' => '{DAV:}collection',
-    );
-
-
-    /**
-     * Sets up the server
-     *
-     * If a Sabre_DAV_Tree object is passed as an argument, it will
-     * use it as the directory tree. If a Sabre_DAV_INode is passed, it
-     * will create a Sabre_DAV_ObjectTree and use the node as the root.
-     *
-     * If nothing is passed, a Sabre_DAV_SimpleCollection is created in 
-     * a Sabre_DAV_ObjectTree.
-     *
-     * If an array is passed, we automatically create a root node, and use
-     * the nodes in the array as top-level children. 
-     * 
-     * @param Sabre_DAV_Tree $tree The tree object 
-     * @return void
-     */
-    public function __construct($treeOrNode = null) {
-
-        if ($treeOrNode instanceof Sabre_DAV_Tree) {
-            $this->tree = $treeOrNode;
-        } elseif ($treeOrNode instanceof Sabre_DAV_INode) {
-            $this->tree = new Sabre_DAV_ObjectTree($treeOrNode);
-        } elseif (is_array($treeOrNode)) {
-
-            // If it's an array, a list of nodes was passed, and we need to
-            // create the root node.
-            foreach($treeOrNode as $node) {
-                if (!($node instanceof Sabre_DAV_INode)) {
-                    throw new Sabre_DAV_Exception('Invalid argument passed to constructor. If you\'re passing an array, all the values must implement Sabre_DAV_INode');
-                }
-            }
-
-            $root = new Sabre_DAV_SimpleCollection('root', $treeOrNode);
-            $this->tree = new Sabre_DAV_ObjectTree($root);
-
-        } elseif (is_null($treeOrNode)) {
-            $root = new Sabre_DAV_SimpleCollection('root');
-            $this->tree = new Sabre_DAV_ObjectTree($root);
-        } else {
-            throw new Sabre_DAV_Exception('Invalid argument passed to constructor. Argument must either be an instance of Sabre_DAV_Tree, Sabre_DAV_INode, an array or null');
-        }
-        $this->httpResponse = new Sabre_HTTP_Response();
-        $this->httpRequest = new Sabre_HTTP_Request();
-
-    }
-
-    /**
-     * Starts the DAV Server 
-     *
-     * @return void
-     */
-    public function exec() {
-
-        try {
-
-            $this->invokeMethod($this->httpRequest->getMethod(), $this->getRequestUri());
-
-        } catch (Exception $e) {
-
-            $DOM = new DOMDocument('1.0','utf-8');
-            $DOM->formatOutput = true;
-
-            $error = $DOM->createElementNS('DAV:','d:error');
-            $error->setAttribute('xmlns:s',self::NS_SABREDAV);
-            $DOM->appendChild($error);
-
-            $error->appendChild($DOM->createElement('s:exception',get_class($e)));
-            $error->appendChild($DOM->createElement('s:message',$e->getMessage()));
-            if ($this->debugExceptions) {
-                $error->appendChild($DOM->createElement('s:file',$e->getFile()));
-                $error->appendChild($DOM->createElement('s:line',$e->getLine()));
-                $error->appendChild($DOM->createElement('s:code',$e->getCode()));
-                $error->appendChild($DOM->createElement('s:stacktrace',$e->getTraceAsString()));
-
-            }
-            $error->appendChild($DOM->createElement('s:sabredav-version',Sabre_DAV_Version::VERSION));
-
-            if($e instanceof Sabre_DAV_Exception) {
-
-                $httpCode = $e->getHTTPCode();
-                $e->serialize($this,$error);
-                $headers = $e->getHTTPHeaders($this);
-
-            } else {
-
-                $httpCode = 500;
-                $headers = array();
-
-            }
-            $headers['Content-Type'] = 'application/xml; charset=utf-8';
-            
-            $this->httpResponse->sendStatus($httpCode);
-            $this->httpResponse->setHeaders($headers);
-            $this->httpResponse->sendBody($DOM->saveXML());
-
-        }
-
-    }
-
-    /**
-     * Sets the base server uri
-     * 
-     * @param string $uri
-     * @return void
-     */
-    public function setBaseUri($uri) {
-
-        // If the baseUri does not end with a slash, we must add it
-        if ($uri[strlen($uri)-1]!=='/') 
-            $uri.='/';
-
-        $this->baseUri = $uri;    
-
-    }
-
-    /**
-     * Returns the base responding uri
-     * 
-     * @return string 
-     */
-    public function getBaseUri() {
-
-        if (is_null($this->baseUri)) $this->baseUri = $this->guessBaseUri();
-        return $this->baseUri;
-
-    }
-
-    /**
-     * This method attempts to detect the base uri.
-     * Only the PATH_INFO variable is considered. 
-     * 
-     * If this variable is not set, the root (/) is assumed. 
-     *
-     * @return void
-     */
-    public function guessBaseUri() {
-
-        $pathInfo = $this->httpRequest->getRawServerValue('PATH_INFO');
-        $uri = $this->httpRequest->getRawServerValue('REQUEST_URI');
-
-        // If PATH_INFO is found, we can assume it's accurate.
-        if (!empty($pathInfo)) {
-
-            // We need to make sure we ignore the QUERY_STRING part
-            if ($pos = strpos($uri,'?'))
-                $uri = substr($uri,0,$pos);
-
-            // PATH_INFO is only set for urls, such as: /example.php/path
-            // in that case PATH_INFO contains '/path'.
-            // Note that REQUEST_URI is percent encoded, while PATH_INFO is
-            // not, Therefore they are only comparable if we first decode
-            // REQUEST_INFO as well.
-            $decodedUri = Sabre_DAV_URLUtil::decodePath($uri);
-
-            // A simple sanity check:
-            if(substr($decodedUri,strlen($decodedUri)-strlen($pathInfo))===$pathInfo) {
-                $baseUri = substr($decodedUri,0,strlen($decodedUri)-strlen($pathInfo));
-                return rtrim($baseUri,'/') . '/';
-            }
-
-            throw new Sabre_DAV_Exception('The REQUEST_URI ('. $uri . ') did not end with the contents of PATH_INFO (' . $pathInfo . '). This server might be misconfigured.'); 
-
-        } 
-
-        // The last fallback is that we're just going to assume the server root. 
-        return '/';
-
-    }
-
-    /**
-     * Adds a plugin to the server
-     * 
-     * For more information, console the documentation of Sabre_DAV_ServerPlugin
-     *
-     * @param Sabre_DAV_ServerPlugin $plugin 
-     * @return void
-     */
-    public function addPlugin(Sabre_DAV_ServerPlugin $plugin) {
-
-        $this->plugins[$plugin->getPluginName()] = $plugin;
-        $plugin->initialize($this);
-
-    }
-
-    /**
-     * Returns an initialized plugin by it's name.
-     *
-     * This function returns null if the plugin was not found.
-     *
-     * @param string $name
-     * @return Sabre_DAV_ServerPlugin 
-     */
-    public function getPlugin($name) {
-
-        if (isset($this->plugins[$name])) 
-            return $this->plugins[$name];
-
-        // This is a fallback and deprecated.
-        foreach($this->plugins as $plugin) {
-            if (get_class($plugin)===$name) return $plugin;
-        }
-
-        return null;
-
-    }
-
-    /**
-     * Returns all plugins 
-     * 
-     * @return array 
-     */
-    public function getPlugins() {
-
-        return $this->plugins;
-
-    }
-
-
-
-    /**
-     * Subscribe to an event.
-     *
-     * When the event is triggered, we'll call all the specified callbacks.
-     * It is possible to control the order of the callbacks through the
-     * priority argument.
-     *
-     * This is for example used to make sure that the authentication plugin
-     * is triggered before anything else. If it's not needed to change this
-     * number, it is recommended to ommit.  
-     * 
-     * @param string $event 
-     * @param callback $callback
-     * @param int $priority
-     * @return void
-     */
-    public function subscribeEvent($event, $callback, $priority = 100) {
-
-        if (!isset($this->eventSubscriptions[$event])) {
-            $this->eventSubscriptions[$event] = array();
-        }
-        while(isset($this->eventSubscriptions[$event][$priority])) $priority++;
-        $this->eventSubscriptions[$event][$priority] = $callback;
-        ksort($this->eventSubscriptions[$event]);
-
-    }
-
-    /**
-     * Broadcasts an event
-     *
-     * This method will call all subscribers. If one of the subscribers returns false, the process stops.
-     *
-     * The arguments parameter will be sent to all subscribers
-     *
-     * @param string $eventName
-     * @param array $arguments
-     * @return bool 
-     */
-    public function broadcastEvent($eventName,$arguments = array()) {
-
-        if (isset($this->eventSubscriptions[$eventName])) {
-
-            foreach($this->eventSubscriptions[$eventName] as $subscriber) {
-
-                $result = call_user_func_array($subscriber,$arguments);
-                if ($result===false) return false;
-
-            }
-
-        }
-
-        return true;
-
-    }
-
-    /**
-     * Handles a http request, and execute a method based on its name 
-     *
-     * @param string $method
-     * @param string $uri
-     * @return void
-     */
-    public function invokeMethod($method, $uri) {
-
-        $method = strtoupper($method); 
-
-        if (!$this->broadcastEvent('beforeMethod',array($method, $uri))) return;
-
-        // Make sure this is a HTTP method we support
-        $internalMethods = array(
-            'OPTIONS',
-            'GET',
-            'HEAD',
-            'DELETE',
-            'PROPFIND',
-            'MKCOL',
-            'PUT',
-            'PROPPATCH',
-            'COPY',
-            'MOVE',
-            'REPORT'
-        );
-
-        if (in_array($method,$internalMethods)) {
-
-            call_user_func(array($this,'http' . $method), $uri);
-
-        } else {
-
-            if ($this->broadcastEvent('unknownMethod',array($method, $uri))) {
-                // Unsupported method
-                throw new Sabre_DAV_Exception_NotImplemented();
-            }
-
-        }
-
-    }
-
-    // {{{ HTTP Method implementations
-    
-    /**
-     * HTTP OPTIONS 
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpOptions($uri) {
-
-        $methods = $this->getAllowedMethods($uri);
-
-        $this->httpResponse->setHeader('Allow',strtoupper(implode(', ',$methods)));
-        $features = array('1','3', 'extended-mkcol');
-
-        foreach($this->plugins as $plugin) $features = array_merge($features,$plugin->getFeatures());
-        
-        $this->httpResponse->setHeader('DAV',implode(', ',$features));
-        $this->httpResponse->setHeader('MS-Author-Via','DAV');
-        $this->httpResponse->setHeader('Accept-Ranges','bytes');
-        $this->httpResponse->setHeader('X-Sabre-Version',Sabre_DAV_Version::VERSION);
-        $this->httpResponse->setHeader('Content-Length',0);
-        $this->httpResponse->sendStatus(200);
-
-    }
-
-    /**
-     * HTTP GET
-     *
-     * This method simply fetches the contents of a uri, like normal
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpGet($uri) {
-
-        $node = $this->tree->getNodeForPath($uri,0);
-
-        if (!$this->checkPreconditions(true)) return false; 
-
-        if (!($node instanceof Sabre_DAV_IFile)) throw new Sabre_DAV_Exception_NotImplemented('GET is only implemented on File objects');
-        $body = $node->get();
-
-        // Converting string into stream, if needed.
-        if (is_string($body)) {
-            $stream = fopen('php://temp','r+');
-            fwrite($stream,$body);
-            rewind($stream);
-            $body = $stream;
-        }
-
-        /*
-         * TODO: getetag, getlastmodified, getsize should also be used using
-         * this method
-         */
-        $httpHeaders = $this->getHTTPHeaders($uri);
-
-        /* ContentType needs to get a default, because many webservers will otherwise
-         * default to text/html, and we don't want this for security reasons.
-         */
-        if (!isset($httpHeaders['Content-Type'])) {
-            $httpHeaders['Content-Type'] = 'application/octet-stream';
-        }
-
-
-        if (isset($httpHeaders['Content-Length'])) {
-
-            $nodeSize = $httpHeaders['Content-Length'];
-
-            // Need to unset Content-Length, because we'll handle that during figuring out the range
-            unset($httpHeaders['Content-Length']);
-
-        } else {
-            $nodeSize = null;
-        }
-        
-        $this->httpResponse->setHeaders($httpHeaders);
-
-        $range = $this->getHTTPRange();
-        $ifRange = $this->httpRequest->getHeader('If-Range');
-        $ignoreRangeHeader = false;
-
-        // If ifRange is set, and range is specified, we first need to check
-        // the precondition.
-        if ($nodeSize && $range && $ifRange) {
-             
-            // if IfRange is parsable as a date we'll treat it as a DateTime
-            // otherwise, we must treat it as an etag.
-            try {
-                $ifRangeDate = new DateTime($ifRange);
-               
-                // It's a date. We must check if the entity is modified since
-                // the specified date.
-                if (!isset($httpHeaders['Last-Modified'])) $ignoreRangeHeader = true;
-                else {
-                    $modified = new DateTime($httpHeaders['Last-Modified']);
-                    if($modified > $ifRangeDate) $ignoreRangeHeader = true;
-                }
-
-            } catch (Exception $e) {
-               
-                // It's an entity. We can do a simple comparison. 
-                if (!isset($httpHeaders['ETag'])) $ignoreRangeHeader = true;
-                elseif ($httpHeaders['ETag']!==$ifRange) $ignoreRangeHeader = true;
-            }
-        }
-
-        // We're only going to support HTTP ranges if the backend provided a filesize
-        if (!$ignoreRangeHeader && $nodeSize && $range) {
-
-            // Determining the exact byte offsets
-            if (!is_null($range[0])) {
-
-                $start = $range[0];
-                $end = $range[1]?$range[1]:$nodeSize-1;
-                if($start >= $nodeSize) 
-                    throw new Sabre_DAV_Exception_RequestedRangeNotSatisfiable('The start offset (' . $range[0] . ') exceeded the size of the entity (' . $nodeSize . ')');
-
-                if($end < $start) throw new Sabre_DAV_Exception_RequestedRangeNotSatisfiable('The end offset (' . $range[1] . ') is lower than the start offset (' . $range[0] . ')');
-                if($end >= $nodeSize) $end = $nodeSize-1;
-
-            } else {
-
-                $start = $nodeSize-$range[1];
-                $end  = $nodeSize-1;
-
-                if ($start<0) $start = 0;
-
-            }
-
-            // New read/write stream
-            $newStream = fopen('php://temp','r+');
-
-            stream_copy_to_stream($body, $newStream, $end-$start+1, $start);
-            rewind($newStream);
-
-            $this->httpResponse->setHeader('Content-Length', $end-$start+1);
-            $this->httpResponse->setHeader('Content-Range','bytes ' . $start . '-' . $end . '/' . $nodeSize);
-            $this->httpResponse->sendStatus(206);
-            $this->httpResponse->sendBody($newStream);
-
-
-        } else {
-
-            if ($nodeSize) $this->httpResponse->setHeader('Content-Length',$nodeSize);
-            $this->httpResponse->sendStatus(200);
-            $this->httpResponse->sendBody($body);
-
-        }
-
-    }
-
-    /**
-     * HTTP HEAD
-     *
-     * This method is normally used to take a peak at a url, and only get the HTTP response headers, without the body
-     * This is used by clients to determine if a remote file was changed, so they can use a local cached version, instead of downloading it again
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpHead($uri) {
-
-        $node = $this->tree->getNodeForPath($uri);
-        /* This information is only collection for File objects.
-         * Ideally we want to throw 405 Method Not Allowed for every 
-         * non-file, but MS Office does not like this
-         */
-        if ($node instanceof Sabre_DAV_IFile) {
-            $headers = $this->getHTTPHeaders($this->getRequestUri());
-            if (!isset($headers['Content-Type'])) {
-                $headers['Content-Type'] = 'application/octet-stream';
-            }
-            $this->httpResponse->setHeaders($headers);
-        }
-        $this->httpResponse->sendStatus(200);
-
-    }
-
-    /**
-     * HTTP Delete 
-     *
-     * The HTTP delete method, deletes a given uri
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpDelete($uri) {
-
-        if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
-        $this->tree->delete($uri);
-
-        $this->httpResponse->sendStatus(204);
-        $this->httpResponse->setHeader('Content-Length','0');
-
-    }
-
-
-    /**
-     * WebDAV PROPFIND 
-     *
-     * This WebDAV method requests information about an uri resource, or a list of resources
-     * If a client wants to receive the properties for a single resource it will add an HTTP Depth: header with a 0 value
-     * If the value is 1, it means that it also expects a list of sub-resources (e.g.: files in a directory)
-     *
-     * The request body contains an XML data structure that has a list of properties the client understands 
-     * The response body is also an xml document, containing information about every uri resource and the requested properties
-     *
-     * It has to return a HTTP 207 Multi-status status code
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpPropfind($uri) {
-
-        // $xml = new Sabre_DAV_XMLReader(file_get_contents('php://input'));
-        $requestedProperties = $this->parsePropfindRequest($this->httpRequest->getBody(true));
-
-        $depth = $this->getHTTPDepth(1);
-        // The only two options for the depth of a propfind is 0 or 1 
-        if ($depth!=0) $depth = 1;
-
-        $newProperties = $this->getPropertiesForPath($uri,$requestedProperties,$depth);
-
-        // This is a multi-status response
-        $this->httpResponse->sendStatus(207);
-        $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-
-        // Normally this header is only needed for OPTIONS responses, however.. 
-        // iCal seems to also depend on these being set for PROPFIND. Since 
-        // this is not harmful, we'll add it.
-        $features = array('1','3', 'extended-mkcol');
-        foreach($this->plugins as $plugin) $features = array_merge($features,$plugin->getFeatures());
-        $this->httpResponse->setHeader('DAV',implode(', ',$features));
-
-        $data = $this->generateMultiStatus($newProperties);
-        $this->httpResponse->sendBody($data);
-
-    }
-
-    /**
-     * WebDAV PROPPATCH
-     *
-     * This method is called to update properties on a Node. The request is an XML body with all the mutations.
-     * In this XML body it is specified which properties should be set/updated and/or deleted
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpPropPatch($uri) {
-
-        $newProperties = $this->parsePropPatchRequest($this->httpRequest->getBody(true));
-        
-        $result = $this->updateProperties($uri, $newProperties);
-
-        $this->httpResponse->sendStatus(207);
-        $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-
-        $this->httpResponse->sendBody(
-            $this->generateMultiStatus(array($result))
-        );
-
-    }
-
-    /**
-     * HTTP PUT method 
-     * 
-     * This HTTP method updates a file, or creates a new one.
-     *
-     * If a new resource was created, a 201 Created status code should be returned. If an existing resource is updated, it's a 200 Ok
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpPut($uri) {
-
-        $body = $this->httpRequest->getBody();
-
-        // Intercepting Content-Range
-        if ($this->httpRequest->getHeader('Content-Range')) {
-            /**
-            Content-Range is dangerous for PUT requests:  PUT per definition
-            stores a full resource.  draft-ietf-httpbis-p2-semantics-15 says
-            in section 7.6:
-              An origin server SHOULD reject any PUT request that contains a
-              Content-Range header field, since it might be misinterpreted as
-              partial content (or might be partial content that is being mistakenly
-              PUT as a full representation).  Partial content updates are possible
-              by targeting a separately identified resource with state that
-              overlaps a portion of the larger resource, or by using a different
-              method that has been specifically defined for partial updates (for
-              example, the PATCH method defined in [RFC5789]).
-            This clarifies RFC2616 section 9.6:
-              The recipient of the entity MUST NOT ignore any Content-*
-              (e.g. Content-Range) headers that it does not understand or implement
-              and MUST return a 501 (Not Implemented) response in such cases.
-            OTOH is a PUT request with a Content-Range currently the only way to
-            continue an aborted upload request and is supported by curl, mod_dav,
-            Tomcat and others.  Since some clients do use this feature which results
-            in unexpected behaviour (cf PEAR::HTTP_WebDAV_Client 1.0.1), we reject
-            all PUT requests with a Content-Range for now.
-            */
-
-            throw new Sabre_DAV_Exception_NotImplemented('PUT with Content-Range is not allowed.');
-        }
-
-        // Intercepting the Finder problem
-        if (($expected = $this->httpRequest->getHeader('X-Expected-Entity-Length')) && $expected > 0) {
-           
-            /**
-            Many webservers will not cooperate well with Finder PUT requests, 
-            because it uses 'Chunked' transfer encoding for the request body.
-
-            The symptom of this problem is that Finder sends files to the 
-            server, but they arrive as 0-lenght files in PHP.
-
-            If we don't do anything, the user might think they are uploading
-            files successfully, but they end up empty on the server. Instead,
-            we throw back an error if we detect this.
-
-            The reason Finder uses Chunked, is because it thinks the files
-            might change as it's being uploaded, and therefore the
-            Content-Length can vary.
-
-            Instead it sends the X-Expected-Entity-Length header with the size
-            of the file at the very start of the request. If this header is set,
-            but we don't get a request body we will fail the request to
-            protect the end-user.
-            */
-
-            // Only reading first byte
-            $firstByte = fread($body,1);
-            if (strlen($firstByte)!==1) {
-                throw new Sabre_DAV_Exception_Forbidden('This server is not compatible with OS/X finder. Consider using a different WebDAV client or webserver.');
-            }
-
-            // The body needs to stay intact, so we copy everything to a
-            // temporary stream.
-
-            $newBody = fopen('php://temp','r+');
-            fwrite($newBody,$firstByte);
-            stream_copy_to_stream($body, $newBody);
-            rewind($newBody);
-
-            $body = $newBody;
-
-        }
-
-        if ($this->tree->nodeExists($uri)) { 
-
-            $node = $this->tree->getNodeForPath($uri);
-          
-            // Checking If-None-Match and related headers.
-            if (!$this->checkPreconditions()) return;
-            
-            // If the node is a collection, we'll deny it
-            if (!($node instanceof Sabre_DAV_IFile)) throw new Sabre_DAV_Exception_Conflict('PUT is not allowed on non-files.');
-            if (!$this->broadcastEvent('beforeWriteContent',array($this->getRequestUri()))) return false;
-
-            $node->put($body);
-            $this->httpResponse->setHeader('Content-Length','0');
-            $this->httpResponse->sendStatus(204);
-
-        } else {
-
-            // If we got here, the resource didn't exist yet.
-            if (!$this->createFile($this->getRequestUri(),$body)) {
-                // For one reason or another the file was not created.
-                return;
-            }
-            $this->httpResponse->setHeader('Content-Length','0');
-            $this->httpResponse->sendStatus(201);
-
-        }
-
-    }
-
-
-    /**
-     * WebDAV MKCOL
-     *
-     * The MKCOL method is used to create a new collection (directory) on the server
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpMkcol($uri) {
-
-        $requestBody = $this->httpRequest->getBody(true);
-
-        if ($requestBody) {
-
-            $contentType = $this->httpRequest->getHeader('Content-Type');
-            if (strpos($contentType,'application/xml')!==0 && strpos($contentType,'text/xml')!==0) {
-
-                // We must throw 415 for unsupport mkcol bodies
-                throw new Sabre_DAV_Exception_UnsupportedMediaType('The request body for the MKCOL request must have an xml Content-Type');
-
-            }
-
-            $dom = Sabre_DAV_XMLUtil::loadDOMDocument($requestBody);
-            if (Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild)!=='{DAV:}mkcol') {
-
-                // We must throw 415 for unsupport mkcol bodies
-                throw new Sabre_DAV_Exception_UnsupportedMediaType('The request body for the MKCOL request must be a {DAV:}mkcol request construct.');
-
-            }
-
-            $properties = array();
-            foreach($dom->firstChild->childNodes as $childNode) {
-
-                if (Sabre_DAV_XMLUtil::toClarkNotation($childNode)!=='{DAV:}set') continue;
-                $properties = array_merge($properties, Sabre_DAV_XMLUtil::parseProperties($childNode, $this->propertyMap));
-
-            }
-            if (!isset($properties['{DAV:}resourcetype'])) 
-                throw new Sabre_DAV_Exception_BadRequest('The mkcol request must include a {DAV:}resourcetype property');
-
-            $resourceType = $properties['{DAV:}resourcetype']->getValue();
-            unset($properties['{DAV:}resourcetype']);
-
-        } else {
-
-            $properties = array();
-            $resourceType = array('{DAV:}collection');
-
-        }
-
-        $result = $this->createCollection($uri, $resourceType, $properties);
-
-        if (is_array($result)) {
-            $this->httpResponse->sendStatus(207);
-            $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-
-            $this->httpResponse->sendBody(
-                $this->generateMultiStatus(array($result))
-            );
-
-        } else {
-            $this->httpResponse->setHeader('Content-Length','0');
-            $this->httpResponse->sendStatus(201);
-        }
-
-    }
-
-    /**
-     * WebDAV HTTP MOVE method
-     *
-     * This method moves one uri to a different uri. A lot of the actual request processing is done in getCopyMoveInfo
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpMove($uri) {
-
-        $moveInfo = $this->getCopyAndMoveInfo();
-
-        // If the destination is part of the source tree, we must fail
-        if ($moveInfo['destination']==$uri) 
-            throw new Sabre_DAV_Exception_Forbidden('Source and destination uri are identical.');
-
-        if ($moveInfo['destinationExists']) {
-
-            if (!$this->broadcastEvent('beforeUnbind',array($moveInfo['destination']))) return false;
-            $this->tree->delete($moveInfo['destination']);
-
-        }
-
-        if (!$this->broadcastEvent('beforeUnbind',array($uri))) return false;
-        if (!$this->broadcastEvent('beforeBind',array($moveInfo['destination']))) return false;
-        $this->tree->move($uri,$moveInfo['destination']);
-        $this->broadcastEvent('afterBind',array($moveInfo['destination']));
-
-        // If a resource was overwritten we should send a 204, otherwise a 201
-        $this->httpResponse->setHeader('Content-Length','0');
-        $this->httpResponse->sendStatus($moveInfo['destinationExists']?204:201);
-
-    }
-
-    /**
-     * WebDAV HTTP COPY method
-     *
-     * This method copies one uri to a different uri, and works much like the MOVE request
-     * A lot of the actual request processing is done in getCopyMoveInfo
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpCopy($uri) {
-
-        $copyInfo = $this->getCopyAndMoveInfo();
-        // If the destination is part of the source tree, we must fail
-        if ($copyInfo['destination']==$uri) 
-            throw new Sabre_DAV_Exception_Forbidden('Source and destination uri are identical.');
-
-        if ($copyInfo['destinationExists']) {
-            if (!$this->broadcastEvent('beforeUnbind',array($copyInfo['destination']))) return false;
-            $this->tree->delete($copyInfo['destination']);
-
-        }
-        if (!$this->broadcastEvent('beforeBind',array($copyInfo['destination']))) return false;
-        $this->tree->copy($uri,$copyInfo['destination']);
-        $this->broadcastEvent('afterBind',array($copyInfo['destination']));
-
-        // If a resource was overwritten we should send a 204, otherwise a 201
-        $this->httpResponse->setHeader('Content-Length','0');
-        $this->httpResponse->sendStatus($copyInfo['destinationExists']?204:201);
-
-    }
-
-
-
-    /**
-     * HTTP REPORT method implementation
-     *
-     * Although the REPORT method is not part of the standard WebDAV spec (it's from rfc3253)
-     * It's used in a lot of extensions, so it made sense to implement it into the core.
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpReport($uri) {
-
-        $body = $this->httpRequest->getBody(true);
-        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
-
-        $reportName = Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild);
-
-        if ($this->broadcastEvent('report',array($reportName,$dom, $uri))) {
-
-            // If broadcastEvent returned true, it means the report was not supported
-            throw new Sabre_DAV_Exception_ReportNotImplemented();
-
-        }
-
-    }
-
-    // }}}
-    // {{{ HTTP/WebDAV protocol helpers 
-
-    /**
-     * Returns an array with all the supported HTTP methods for a specific uri. 
-     *
-     * @param string $uri 
-     * @return array 
-     */
-    public function getAllowedMethods($uri) {
-
-        $methods = array(
-            'OPTIONS',
-            'GET',
-            'HEAD',
-            'DELETE',
-            'PROPFIND',
-            'PUT',
-            'PROPPATCH',
-            'COPY',
-            'MOVE',
-            'REPORT'
-        );
-
-        // The MKCOL is only allowed on an unmapped uri
-        try {
-            $node = $this->tree->getNodeForPath($uri);
-        } catch (Sabre_DAV_Exception_FileNotFound $e) {
-            $methods[] = 'MKCOL';
-        }
-
-        // We're also checking if any of the plugins register any new methods
-        foreach($this->plugins as $plugin) $methods = array_merge($methods,$plugin->getHTTPMethods($uri));
-        array_unique($methods);
-
-        return $methods;
-
-    }
-
-    /**
-     * Gets the uri for the request, keeping the base uri into consideration 
-     * 
-     * @return string
-     */
-    public function getRequestUri() {
-
-        return $this->calculateUri($this->httpRequest->getUri());
-
-    }
-
-    /**
-     * Calculates the uri for a request, making sure that the base uri is stripped out 
-     * 
-     * @param string $uri 
-     * @throws Sabre_DAV_Exception_Forbidden A permission denied exception is thrown whenever there was an attempt to supply a uri outside of the base uri
-     * @return string
-     */
-    public function calculateUri($uri) {
-
-        if ($uri[0]!='/' && strpos($uri,'://')) {
-
-            $uri = parse_url($uri,PHP_URL_PATH);
-
-        }
-
-        $uri = str_replace('//','/',$uri);
-
-        if (strpos($uri,$this->getBaseUri())===0) {
-
-            return trim(Sabre_DAV_URLUtil::decodePath(substr($uri,strlen($this->getBaseUri()))),'/');
-
-        // A special case, if the baseUri was accessed without a trailing 
-        // slash, we'll accept it as well. 
-        } elseif ($uri.'/' === $this->getBaseUri()) { 
-
-            return '';
-
-        } else {
-
-            throw new Sabre_DAV_Exception_Forbidden('Requested uri (' . $uri . ') is out of base uri (' . $this->getBaseUri() . ')');
-
-        }
-
-    }
-
-    /**
-     * Returns the HTTP depth header
-     *
-     * This method returns the contents of the HTTP depth request header. If the depth header was 'infinity' it will return the Sabre_DAV_Server::DEPTH_INFINITY object
-     * It is possible to supply a default depth value, which is used when the depth header has invalid content, or is completely non-existant
-     * 
-     * @param mixed $default 
-     * @return int 
-     */
-    public function getHTTPDepth($default = self::DEPTH_INFINITY) {
-
-        // If its not set, we'll grab the default
-        $depth = $this->httpRequest->getHeader('Depth');
-
-        if (is_null($depth)) return $default;
-
-        if ($depth == 'infinity') return self::DEPTH_INFINITY;
-
-           
-        // If its an unknown value. we'll grab the default
-        if (!ctype_digit($depth)) return $default;
-
-        return (int)$depth;
-
-    }
-
-    /**
-     * Returns the HTTP range header
-     *
-     * This method returns null if there is no well-formed HTTP range request
-     * header or array($start, $end).
-     *
-     * The first number is the offset of the first byte in the range.
-     * The second number is the offset of the last byte in the range.
-     *
-     * If the second offset is null, it should be treated as the offset of the last byte of the entity
-     * If the first offset is null, the second offset should be used to retrieve the last x bytes of the entity 
-     *
-     * return $mixed
-     */
-    public function getHTTPRange() {
-
-        $range = $this->httpRequest->getHeader('range');
-        if (is_null($range)) return null; 
-
-        // Matching "Range: bytes=1234-5678: both numbers are optional
-
-        if (!preg_match('/^bytes=([0-9]*)-([0-9]*)$/i',$range,$matches)) return null;
-
-        if ($matches[1]==='' && $matches[2]==='') return null;
-
-        return array(
-            $matches[1]!==''?$matches[1]:null,
-            $matches[2]!==''?$matches[2]:null,
-        );
-
-    }
-
-
-    /**
-     * Returns information about Copy and Move requests
-     * 
-     * This function is created to help getting information about the source and the destination for the 
-     * WebDAV MOVE and COPY HTTP request. It also validates a lot of information and throws proper exceptions 
-     * 
-     * The returned value is an array with the following keys:
-     *   * destination - Destination path
-     *   * destinationExists - Wether or not the destination is an existing url (and should therefore be overwritten)
-     *
-     * @return array 
-     */
-    public function getCopyAndMoveInfo() {
-
-        // Collecting the relevant HTTP headers
-        if (!$this->httpRequest->getHeader('Destination')) throw new Sabre_DAV_Exception_BadRequest('The destination header was not supplied');
-        $destination = $this->calculateUri($this->httpRequest->getHeader('Destination'));
-        $overwrite = $this->httpRequest->getHeader('Overwrite');
-        if (!$overwrite) $overwrite = 'T';
-        if (strtoupper($overwrite)=='T') $overwrite = true;
-        elseif (strtoupper($overwrite)=='F') $overwrite = false;
-        // We need to throw a bad request exception, if the header was invalid
-        else throw new Sabre_DAV_Exception_BadRequest('The HTTP Overwrite header should be either T or F');
-
-        list($destinationDir) = Sabre_DAV_URLUtil::splitPath($destination);
-
-        try {
-            $destinationParent = $this->tree->getNodeForPath($destinationDir);
-            if (!($destinationParent instanceof Sabre_DAV_ICollection)) throw new Sabre_DAV_Exception_UnsupportedMediaType('The destination node is not a collection');
-        } catch (Sabre_DAV_Exception_FileNotFound $e) {
-
-            // If the destination parent node is not found, we throw a 409
-            throw new Sabre_DAV_Exception_Conflict('The destination node is not found');
-        }
-
-        try {
-
-            $destinationNode = $this->tree->getNodeForPath($destination);
-            
-            // If this succeeded, it means the destination already exists
-            // we'll need to throw precondition failed in case overwrite is false
-            if (!$overwrite) throw new Sabre_DAV_Exception_PreconditionFailed('The destination node already exists, and the overwrite header is set to false','Overwrite');
-
-        } catch (Sabre_DAV_Exception_FileNotFound $e) {
-
-            // Destination didn't exist, we're all good
-            $destinationNode = false;
-
-
-
-        }
-
-        // These are the three relevant properties we need to return
-        return array(
-            'destination'       => $destination,
-            'destinationExists' => $destinationNode==true,
-            'destinationNode'   => $destinationNode,
-        );
-
-    }
-
-    /**
-     * Returns a list of properties for a path
-     *
-     * This is a simplified version getPropertiesForPath.
-     * if you aren't interested in status codes, but you just
-     * want to have a flat list of properties. Use this method.
-     *
-     * @param string $path
-     * @param array $propertyNames
-     */
-    public function getProperties($path, $propertyNames) {
-
-        $result = $this->getPropertiesForPath($path,$propertyNames,0);
-        return $result[0][200];
-
-    }
-
-    /**
-     * Returns a list of HTTP headers for a particular resource
-     *
-     * The generated http headers are based on properties provided by the 
-     * resource. The method basically provides a simple mapping between
-     * DAV property and HTTP header.
-     *
-     * The headers are intended to be used for HEAD and GET requests.
-     * 
-     * @param string $path
-     */
-    public function getHTTPHeaders($path) {
-
-        $propertyMap = array(
-            '{DAV:}getcontenttype'   => 'Content-Type',
-            '{DAV:}getcontentlength' => 'Content-Length',
-            '{DAV:}getlastmodified'  => 'Last-Modified', 
-            '{DAV:}getetag'          => 'ETag',
-        );
-
-        $properties = $this->getProperties($path,array_keys($propertyMap));
-
-        $headers = array();
-        foreach($propertyMap as $property=>$header) {
-            if (!isset($properties[$property])) continue;
-
-            if (is_scalar($properties[$property])) { 
-                $headers[$header] = $properties[$property];
-
-            // GetLastModified gets special cased 
-            } elseif ($properties[$property] instanceof Sabre_DAV_Property_GetLastModified) {
-                $headers[$header] = $properties[$property]->getTime()->format(DateTime::RFC1123);
-            }
-
-        }
-
-        return $headers;
-        
-    }
-
-    /**
-     * Returns a list of properties for a given path
-     * 
-     * The path that should be supplied should have the baseUrl stripped out
-     * The list of properties should be supplied in Clark notation. If the list is empty
-     * 'allprops' is assumed.
-     *
-     * If a depth of 1 is requested child elements will also be returned.
-     *
-     * @param string $path 
-     * @param array $propertyNames
-     * @param int $depth 
-     * @return array
-     */
-    public function getPropertiesForPath($path,$propertyNames = array(),$depth = 0) {
-
-        if ($depth!=0) $depth = 1;
-
-        $returnPropertyList = array();
-        
-        $parentNode = $this->tree->getNodeForPath($path);
-        $nodes = array(
-            $path => $parentNode
-        );
-        if ($depth==1 && $parentNode instanceof Sabre_DAV_ICollection) {
-            foreach($this->tree->getChildren($path) as $childNode)
-                $nodes[$path . '/' . $childNode->getName()] = $childNode;
-        }            
-       
-        // If the propertyNames array is empty, it means all properties are requested.
-        // We shouldn't actually return everything we know though, and only return a
-        // sensible list. 
-        $allProperties = count($propertyNames)==0;
-
-        foreach($nodes as $myPath=>$node) {
-
-            $currentPropertyNames = $propertyNames;
-
-            $newProperties = array(
-                '200' => array(),
-                '404' => array(),
-            );
-
-            if ($allProperties) {
-                // Default list of propertyNames, when all properties were requested.
-                $currentPropertyNames = array(
-                    '{DAV:}getlastmodified',
-                    '{DAV:}getcontentlength',
-                    '{DAV:}resourcetype',
-                    '{DAV:}quota-used-bytes',
-                    '{DAV:}quota-available-bytes',
-                    '{DAV:}getetag',
-                    '{DAV:}getcontenttype',
-                );
-            }
-
-            // If the resourceType was not part of the list, we manually add it 
-            // and mark it for removal. We need to know the resourcetype in order 
-            // to make certain decisions about the entry.
-            // WebDAV dictates we should add a / and the end of href's for collections
-            $removeRT = false;
-            if (!in_array('{DAV:}resourcetype',$currentPropertyNames)) {
-                $currentPropertyNames[] = '{DAV:}resourcetype';
-                $removeRT = true;
-            }
-
-            $result = $this->broadcastEvent('beforeGetProperties',array($myPath, $node, &$currentPropertyNames, &$newProperties));
-            // If this method explicitly returned false, we must ignore this 
-            // node as it is inacessible.
-            if ($result===false) continue;
-
-            if (count($currentPropertyNames) > 0) {
-
-                if ($node instanceof Sabre_DAV_IProperties) 
-                    $newProperties['200'] = $newProperties[200] + $node->getProperties($currentPropertyNames);
-
-            }
-
-
-            foreach($currentPropertyNames as $prop) {
-                
-                if (isset($newProperties[200][$prop])) continue;
-
-                switch($prop) {
-                    case '{DAV:}getlastmodified'       : if ($node->getLastModified()) $newProperties[200][$prop] = new Sabre_DAV_Property_GetLastModified($node->getLastModified()); break;
-                    case '{DAV:}getcontentlength'      : if ($node instanceof Sabre_DAV_IFile) $newProperties[200][$prop] = (int)$node->getSize(); break;
-                    case '{DAV:}quota-used-bytes'      : 
-                        if ($node instanceof Sabre_DAV_IQuota) {
-                            $quotaInfo = $node->getQuotaInfo();
-                            $newProperties[200][$prop] = $quotaInfo[0];
-                        }
-                        break;
-                    case '{DAV:}quota-available-bytes' : 
-                        if ($node instanceof Sabre_DAV_IQuota) {
-                            $quotaInfo = $node->getQuotaInfo();
-                            $newProperties[200][$prop] = $quotaInfo[1];
-                        }
-                        break;
-                    case '{DAV:}getetag'               : if ($node instanceof Sabre_DAV_IFile && $etag = $node->getETag())  $newProperties[200][$prop] = $etag; break;
-                    case '{DAV:}getcontenttype'        : if ($node instanceof Sabre_DAV_IFile && $ct = $node->getContentType())  $newProperties[200][$prop] = $ct; break;
-                    case '{DAV:}supported-report-set'  :
-                        $reports = array();
-                        foreach($this->plugins as $plugin) {
-                            $reports = array_merge($reports, $plugin->getSupportedReportSet($myPath));
-                        }
-                        $newProperties[200][$prop] = new Sabre_DAV_Property_SupportedReportSet($reports); 
-                        break;
-                    case '{DAV:}resourcetype' :
-                        $newProperties[200]['{DAV:}resourcetype'] = new Sabre_DAV_Property_ResourceType();
-                        foreach($this->resourceTypeMapping as $className => $resourceType) {
-                            if ($node instanceof $className) $newProperties[200]['{DAV:}resourcetype']->add($resourceType);
-                        }
-                        break;
-
-                }
-
-                // If we were unable to find the property, we will list it as 404.
-                if (!$allProperties && !isset($newProperties[200][$prop])) $newProperties[404][$prop] = null;
-
-            }
-         
-            $this->broadcastEvent('afterGetProperties',array(trim($myPath,'/'),&$newProperties));
-
-            $newProperties['href'] = trim($myPath,'/'); 
-
-            // Its is a WebDAV recommendation to add a trailing slash to collectionnames.
-            // Apple's iCal also requires a trailing slash for principals (rfc 3744).
-            // Therefore we add a trailing / for any non-file. This might need adjustments 
-            // if we find there are other edge cases.
-            if ($myPath!='' && isset($newProperties[200]['{DAV:}resourcetype']) && count($newProperties[200]['{DAV:}resourcetype']->getValue())>0) $newProperties['href'] .='/';
-
-            // If the resourcetype property was manually added to the requested property list,
-            // we will remove it again.
-            if ($removeRT) unset($newProperties[200]['{DAV:}resourcetype']);
-
-            $returnPropertyList[] = $newProperties;
-
-        }
-        
-        return $returnPropertyList;
-
-    }
-
-    /**
-     * This method is invoked by sub-systems creating a new file.
-     *
-     * Currently this is done by HTTP PUT and HTTP LOCK (in the Locks_Plugin).
-     * It was important to get this done through a centralized function, 
-     * allowing plugins to intercept this using the beforeCreateFile event.
-     *
-     * This method will return true if the file was actually created
-     * 
-     * @param string $uri 
-     * @param resource $data 
-     * @return bool 
-     */
-    public function createFile($uri,$data) {
-
-        list($dir,$name) = Sabre_DAV_URLUtil::splitPath($uri);
-
-        if (!$this->broadcastEvent('beforeBind',array($uri))) return false;
-        if (!$this->broadcastEvent('beforeCreateFile',array($uri,$data))) return false;
-
-        $parent = $this->tree->getNodeForPath($dir);
-        $parent->createFile($name,$data);
-        $this->tree->markDirty($dir);
-
-        $this->broadcastEvent('afterBind',array($uri));
-
-        return true;
-    }
-
-    /**
-     * This method is invoked by sub-systems creating a new directory.
-     *
-     * @param string $uri 
-     * @return void
-     */
-    public function createDirectory($uri) {
-
-        $this->createCollection($uri,array('{DAV:}collection'),array());
-
-    }
-
-    /**
-     * Use this method to create a new collection
-     *
-     * The {DAV:}resourcetype is specified using the resourceType array.
-     * At the very least it must contain {DAV:}collection. 
-     *
-     * The properties array can contain a list of additional properties.
-     * 
-     * @param string $uri The new uri 
-     * @param array $resourceType The resourceType(s) 
-     * @param array $properties A list of properties
-     * @return void
-     */
-    public function createCollection($uri, array $resourceType, array $properties) {
-
-        list($parentUri,$newName) = Sabre_DAV_URLUtil::splitPath($uri);
-
-        // Making sure {DAV:}collection was specified as resourceType
-        if (!in_array('{DAV:}collection', $resourceType)) {
-            throw new Sabre_DAV_Exception_InvalidResourceType('The resourceType for this collection must at least include {DAV:}collection');
-        }
-
-
-        // Making sure the parent exists
-        try {
-
-            $parent = $this->tree->getNodeForPath($parentUri);
-
-        } catch (Sabre_DAV_Exception_FileNotFound $e) {
-
-            throw new Sabre_DAV_Exception_Conflict('Parent node does not exist');
-
-        }
-
-        // Making sure the parent is a collection
-        if (!$parent instanceof Sabre_DAV_ICollection) {
-            throw new Sabre_DAV_Exception_Conflict('Parent node is not a collection');
-        }
-
-
-
-        // Making sure the child does not already exist
-        try {
-            $parent->getChild($newName);
-
-            // If we got here.. it means there's already a node on that url, and we need to throw a 405
-            throw new Sabre_DAV_Exception_MethodNotAllowed('The resource you tried to create already exists');
-
-        } catch (Sabre_DAV_Exception_FileNotFound $e) {
-            // This is correct
-        }
-
-        
-        if (!$this->broadcastEvent('beforeBind',array($uri))) return;
-
-        // There are 2 modes of operation. The standard collection 
-        // creates the directory, and then updates properties
-        // the extended collection can create it directly.
-        if ($parent instanceof Sabre_DAV_IExtendedCollection) {
-
-            $parent->createExtendedCollection($newName, $resourceType, $properties);
-
-        } else {
-
-            // No special resourcetypes are supported
-            if (count($resourceType)>1) {
-                throw new Sabre_DAV_Exception_InvalidResourceType('The {DAV:}resourcetype you specified is not supported here.');
-            }
-
-            $parent->createDirectory($newName);
-            $rollBack = false; 
-            $exception = null;
-            $errorResult = null;
-
-            if (count($properties)>0) {
-
-                try {
-
-                    $errorResult = $this->updateProperties($uri, $properties);
-                    if (!isset($errorResult[200])) {
-                        $rollBack = true;
-                    }
-
-                } catch (Sabre_DAV_Exception $e) {
-
-                    $rollBack = true;
-                    $exception = $e;
-
-                }
-
-            }
-
-            if ($rollBack) {
-                if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
-                $this->tree->delete($uri);
-
-                // Re-throwing exception
-                if ($exception) throw $exception;
-
-                return $errorResult;
-            }
-                
-        }
-        $this->tree->markDirty($parentUri);
-        $this->broadcastEvent('afterBind',array($uri));
-
-    }
-
-    /**
-     * This method updates a resource's properties
-     *
-     * The properties array must be a list of properties. Array-keys are
-     * property names in clarknotation, array-values are it's values.
-     * If a property must be deleted, the value should be null.
-     * 
-     * Note that this request should either completely succeed, or 
-     * completely fail.
-     *
-     * The response is an array with statuscodes for keys, which in turn
-     * contain arrays with propertynames. This response can be used
-     * to generate a multistatus body.
-     * 
-     * @param string $uri 
-     * @param array $properties 
-     * @return array 
-     */
-    public function updateProperties($uri, array $properties) {
-
-        // we'll start by grabbing the node, this will throw the appropriate
-        // exceptions if it doesn't. 
-        $node = $this->tree->getNodeForPath($uri);
-       
-        $result = array(
-            200 => array(),
-            403 => array(),
-            424 => array(),
-        ); 
-        $remainingProperties = $properties;
-        $hasError = false;
-
-        // Running through all properties to make sure none of them are protected
-        if (!$hasError) foreach($properties as $propertyName => $value) {
-            if(in_array($propertyName, $this->protectedProperties)) {
-                $result[403][$propertyName] = null;
-                unset($remainingProperties[$propertyName]);
-                $hasError = true;
-            }
-        }
-
-        if (!$hasError) {
-            // Allowing plugins to take care of property updating
-            $hasError = !$this->broadcastEvent('updateProperties',array(
-                &$remainingProperties,
-                &$result,
-                $node
-            ));
-        }
-
-        // If the node is not an instance of Sabre_DAV_IProperties, every
-        // property is 403 Forbidden
-        if (!$hasError && count($remainingProperties) && !($node instanceof Sabre_DAV_IProperties)) {
-            $hasError = true;
-            foreach($properties as $propertyName=> $value) {
-                $result[403][$propertyName] = null;
-            }
-            $remainingProperties = array();
-        }
-
-        // Only if there were no errors we may attempt to update the resource
-        if (!$hasError) {
-
-            if (count($remainingProperties)>0) {
-
-                $updateResult = $node->updateProperties($remainingProperties);
-
-                if ($updateResult===true) {
-                    // success
-                    foreach($remainingProperties as $propertyName=>$value) {
-                        $result[200][$propertyName] = null;
-                    }
-
-                } elseif ($updateResult===false) {
-                    // The node failed to update the properties for an
-                    // unknown reason
-                    foreach($remainingProperties as $propertyName=>$value) {
-                        $result[403][$propertyName] = null;
-                    }
-
-                } elseif (is_array($updateResult)) {
-
-                    // The node has detailed update information
-                    // We need to merge the results with the earlier results.
-                    foreach($updateResult as $status => $props) {
-                        if (is_array($props)) {
-                            if (!isset($result[$status]))
-                                $result[$status] = array();
-
-                            $result[$status] = array_merge($result[$status], $updateResult[$status]);
-                        }
-                    }
-
-                } else {
-                    throw new Sabre_DAV_Exception('Invalid result from updateProperties');
-                }
-                $remainingProperties = array();
-            }
-
-        }
-
-        foreach($remainingProperties as $propertyName=>$value) {
-            // if there are remaining properties, it must mean
-            // there's a dependency failure
-            $result[424][$propertyName] = null;
-        }
-
-        // Removing empty array values
-        foreach($result as $status=>$props) {
-
-            if (count($props)===0) unset($result[$status]);
-
-        }
-        $result['href'] = $uri;
-        return $result;
-
-    }
-
-    /**
-     * This method checks the main HTTP preconditions.
-     *
-     * Currently these are:
-     *   * If-Match
-     *   * If-None-Match
-     *   * If-Modified-Since
-     *   * If-Unmodified-Since
-     *
-     * The method will return true if all preconditions are met
-     * The method will return false, or throw an exception if preconditions
-     * failed. If false is returned the operation should be aborted, and
-     * the appropriate HTTP response headers are already set.
-     *
-     * Normally this method will throw 412 Precondition Failed for failures
-     * related to If-None-Match, If-Match and If-Unmodified Since. It will 
-     * set the status to 304 Not Modified for If-Modified_since.
-     *
-     * If the $handleAsGET argument is set to true, it will also return 304 
-     * Not Modified for failure of the If-None-Match precondition. This is the
-     * desired behaviour for HTTP GET and HTTP HEAD requests.
-     *
-     * @return bool 
-     */
-    public function checkPreconditions($handleAsGET = false) {
-
-        $uri = $this->getRequestUri();
-        $node = null;
-        $lastMod = null;
-        $etag = null;
-
-        if ($ifMatch = $this->httpRequest->getHeader('If-Match')) {
-
-            // If-Match contains an entity tag. Only if the entity-tag
-            // matches we are allowed to make the request succeed.
-            // If the entity-tag is '*' we are only allowed to make the
-            // request succeed if a resource exists at that url.
-            try {
-                $node = $this->tree->getNodeForPath($uri);
-            } catch (Sabre_DAV_Exception_FileNotFound $e) {
-                throw new Sabre_DAV_Exception_PreconditionFailed('An If-Match header was specified and the resource did not exist','If-Match');
-            }
-
-            // Only need to check entity tags if they are not *
-            if ($ifMatch!=='*') {
-
-                // There can be multiple etags
-                $ifMatch = explode(',',$ifMatch);
-                $haveMatch = false;
-                foreach($ifMatch as $ifMatchItem) {
-
-                    // Stripping any extra spaces
-                    $ifMatchItem = trim($ifMatchItem,' ');
-                    
-                    $etag = $node->getETag();
-                    if ($etag===$ifMatchItem) {
-                        $haveMatch = true;
-                    }
-                }
-                if (!$haveMatch) {
-                     throw new Sabre_DAV_Exception_PreconditionFailed('An If-Match header was specified, but none of the specified the ETags matched.','If-Match');
-                }
-            }
-        }
-
-        if ($ifNoneMatch = $this->httpRequest->getHeader('If-None-Match')) {
-
-            // The If-None-Match header contains an etag.
-            // Only if the ETag does not match the current ETag, the request will succeed
-            // The header can also contain *, in which case the request
-            // will only succeed if the entity does not exist at all.
-            $nodeExists = true;
-            if (!$node) {
-                try {
-                    $node = $this->tree->getNodeForPath($uri);
-                } catch (Sabre_DAV_Exception_FileNotFound $e) {
-                    $nodeExists = false;
-                }
-            }
-            if ($nodeExists) {
-                $haveMatch = false;
-                if ($ifNoneMatch==='*') $haveMatch = true;
-                else {
-
-                    // There might be multiple etags
-                    $ifNoneMatch = explode(',', $ifNoneMatch);
-                    $etag = $node->getETag();
-
-                    foreach($ifNoneMatch as $ifNoneMatchItem) {
-                        
-                        // Stripping any extra spaces
-                        $ifNoneMatchItem = trim($ifNoneMatchItem,' ');
-                        
-                        if ($etag===$ifNoneMatchItem) $haveMatch = true;
-
-                    }
-
-                }
-
-                if ($haveMatch) {
-                    if ($handleAsGET) {
-                        $this->httpResponse->sendStatus(304);
-                        return false;
-                    } else {
-                        throw new Sabre_DAV_Exception_PreconditionFailed('An If-None-Match header was specified, but the ETag matched (or * was specified).','If-None-Match');
-                    }
-                }
-            }
-
-        }
-
-        if (!$ifNoneMatch && ($ifModifiedSince = $this->httpRequest->getHeader('If-Modified-Since'))) {
-            
-            // The If-Modified-Since header contains a date. We
-            // will only return the entity if it has been changed since
-            // that date. If it hasn't been changed, we return a 304
-            // header
-            // Note that this header only has to be checked if there was no If-None-Match header
-            // as per the HTTP spec.
-            $date = Sabre_HTTP_Util::parseHTTPDate($ifModifiedSince);
-
-            if ($date) {
-                if (is_null($node)) {
-                    $node = $this->tree->getNodeForPath($uri);
-                }
-                $lastMod = $node->getLastModified();
-                if ($lastMod) {
-                    $lastMod = new DateTime('@' . $lastMod);
-                    if ($lastMod <= $date) {
-                        $this->httpResponse->sendStatus(304);
-                        return false;
-                    } 
-                }
-            }
-        }
-
-        if ($ifUnmodifiedSince = $this->httpRequest->getHeader('If-Unmodified-Since')) {
-            
-            // The If-Unmodified-Since will allow allow the request if the
-            // entity has not changed since the specified date.
-            $date = Sabre_HTTP_Util::parseHTTPDate($ifUnmodifiedSince);
-           
-            // We must only check the date if it's valid
-            if ($date) {
-                if (is_null($node)) {
-                    $node = $this->tree->getNodeForPath($uri);
-                }   
-                $lastMod = $node->getLastModified();
-                if ($lastMod) {
-                    $lastMod = new DateTime('@' . $lastMod);
-                    if ($lastMod > $date) {
-                        throw new Sabre_DAV_Exception_PreconditionFailed('An If-Unmodified-Since header was specified, but the entity has been changed since the specified date.','If-Unmodified-Since');
-                    }
-                }
-            }
-
-        }
-        return true;
-
-    }
-
-    // }}} 
-    // {{{ XML Readers & Writers  
-    
-    
-    /**
-     * Generates a WebDAV propfind response body based on a list of nodes 
-     * 
-     * @param array $fileProperties The list with nodes
-     * @param array $requestedProperties The properties that should be returned
-     * @return string 
-     */
-    public function generateMultiStatus(array $fileProperties) {
-
-        $dom = new DOMDocument('1.0','utf-8');
-        //$dom->formatOutput = true;
-        $multiStatus = $dom->createElement('d:multistatus');
-        $dom->appendChild($multiStatus);
-
-        // Adding in default namespaces
-        foreach($this->xmlNamespaces as $namespace=>$prefix) {
-
-            $multiStatus->setAttribute('xmlns:' . $prefix,$namespace);
-
-        }
-
-        foreach($fileProperties as $entry) {
-
-            $href = $entry['href'];
-            unset($entry['href']);
-            
-            $response = new Sabre_DAV_Property_Response($href,$entry);
-            $response->serialize($this,$multiStatus);
-
-        }
-
-        return $dom->saveXML();
-
-    }
-
-    /**
-     * This method parses a PropPatch request
-     *
-     * PropPatch changes the properties for a resource. This method
-     * returns a list of properties.
-     *
-     * The keys in the returned array contain the property name (e.g.: {DAV:}displayname,
-     * and the value contains the property value. If a property is to be removed the value
-     * will be null.
-     * 
-     * @param string $body xml body
-     * @return array list of properties in need of updating or deletion
-     */
-    public function parsePropPatchRequest($body) {
-
-        //We'll need to change the DAV namespace declaration to something else in order to make it parsable
-        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
-        
-        $newProperties = array();
-
-        foreach($dom->firstChild->childNodes as $child) {
-
-            if ($child->nodeType !== XML_ELEMENT_NODE) continue; 
-
-            $operation = Sabre_DAV_XMLUtil::toClarkNotation($child);
-
-            if ($operation!=='{DAV:}set' && $operation!=='{DAV:}remove') continue;
-            
-            $innerProperties = Sabre_DAV_XMLUtil::parseProperties($child, $this->propertyMap);
-
-            foreach($innerProperties as $propertyName=>$propertyValue) {
-
-                if ($operation==='{DAV:}remove') {
-                    $propertyValue = null;
-                }
-
-                $newProperties[$propertyName] = $propertyValue;
-
-            }
-
-        }
-
-        return $newProperties;
-
-    }
-
-    /**
-     * This method parses the PROPFIND request and returns its information
-     *
-     * This will either be a list of properties, or an empty array; in which case
-     * an {DAV:}allprop was requested.
-     * 
-     * @param string $body 
-     * @return array 
-     */
-    public function parsePropFindRequest($body) {
-
-        // If the propfind body was empty, it means IE is requesting 'all' properties
-        if (!$body) return array();
-
-        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
-        $elem = $dom->getElementsByTagNameNS('urn:DAV','propfind')->item(0);
-        return array_keys(Sabre_DAV_XMLUtil::parseProperties($elem)); 
-
-    }
-
-    // }}}
-
-}
-
diff --git a/3rdparty/Sabre/DAV/ServerPlugin.php b/3rdparty/Sabre/DAV/ServerPlugin.php
deleted file mode 100644
index 6909f600c21..00000000000
--- a/3rdparty/Sabre/DAV/ServerPlugin.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * The baseclass for all server plugins.
- *
- * Plugins can modify or extend the servers behaviour. 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_ServerPlugin {
-
-    /**
-     * This initializes the plugin.
-     *
-     * This function is called by Sabre_DAV_Server, after
-     * addPlugin is called.
-     *
-     * This method should set up the requires event subscriptions.
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @return void
-     */
-    abstract public function initialize(Sabre_DAV_Server $server);
-    
-    /**
-     * This method should return a list of server-features. 
-     *
-     * This is for example 'versioning' and is added to the DAV: header
-     * in an OPTIONS response.
-     * 
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array();
-
-    }
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are 
-     * available for the specified uri.
-     *
-     * @param string $uri
-     * @return array 
-     */
-    public function getHTTPMethods($uri) {
-
-        return array();
-
-    }
-
-    /**
-     * Returns a plugin name.
-     * 
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre_DAV_Server::getPlugin 
-     * 
-     * @return string 
-     */
-    public function getPluginName() {
-
-        return get_class($this);
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually 
-     * implement them 
-     * 
-     * @param string $uri
-     * @return array 
-     */
-    public function getSupportedReportSet($uri) {
-
-        return array();
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/SimpleCollection.php b/3rdparty/Sabre/DAV/SimpleCollection.php
deleted file mode 100644
index 223d05fed55..00000000000
--- a/3rdparty/Sabre/DAV/SimpleCollection.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * SimpleCollection
- *
- * The SimpleCollection is used to quickly setup static directory structures.
- * Just create the object with a proper name, and add children to use it.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_SimpleCollection extends Sabre_DAV_Collection {
-
-    /**
-     * List of childnodes 
-     *
-     * @var array
-     */
-    protected $children = array();
-
-    /**
-     * Name of this resource 
-     * 
-     * @var string 
-     */
-    protected $name;
-
-    /**
-     * Creates this node
-     *
-     * The name of the node must be passed, child nodes can also be bassed.
-     * This nodes must be instances of Sabre_DAV_INode
-     * 
-     * @param string $name 
-     * @param array $children 
-     * @return void
-     */
-    public function __construct($name,array $children = array()) {
-
-        $this->name = $name;
-        foreach($children as $child) {
-
-            if (!($child instanceof Sabre_DAV_INode)) throw new Sabre_DAV_Exception('Only instances of Sabre_DAV_INode are allowed to be passed in the children argument');
-            $this->addChild($child);
-
-        }
-
-    }
-
-    /**
-     * Adds a new childnode to this collection 
-     * 
-     * @param Sabre_DAV_INode $child 
-     * @return void
-     */
-    public function addChild(Sabre_DAV_INode $child) {
-
-        $this->children[$child->getName()] = $child;
-
-    }
-
-    /**
-     * Returns the name of the collection 
-     * 
-     * @return string 
-     */
-    public function getName() {
-
-        return $this->name;
-
-    }
-
-    /**
-     * Returns a child object, by its name.
-     *
-     * This method makes use of the getChildren method to grab all the child nodes, and compares the name. 
-     * Generally its wise to override this, as this can usually be optimized
-     * 
-     * @param string $name
-     * @throws Sabre_DAV_Exception_FileNotFound
-     * @return Sabre_DAV_INode 
-     */
-    public function getChild($name) {
-
-        if (isset($this->children[$name])) return $this->children[$name];
-        throw new Sabre_DAV_Exception_FileNotFound('File not found: ' . $name . ' in \'' . $this->getName() . '\'');
-
-    }
-
-    /**
-     * Returns a list of children for this collection 
-     * 
-     * @return array 
-     */
-    public function getChildren() {
-
-        return array_values($this->children);
-
-    }
-
-
-}
-
diff --git a/3rdparty/Sabre/DAV/SimpleDirectory.php b/3rdparty/Sabre/DAV/SimpleDirectory.php
deleted file mode 100644
index 516a3aa907c..00000000000
--- a/3rdparty/Sabre/DAV/SimpleDirectory.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * SimpleDirectory
- *
- * The SimpleDirectory is used to quickly setup static directory structures.
- * Just create the object with a proper name, and add children to use it.
- *
- * This class is now deprecated, use Sabre_DAV_SimpleCollection instead.
- *
- * @package Sabre
- * @subpackage DAV
- * @deprecated Use Sabre_DAV_SimpleCollection instead.
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_SimpleDirectory extends Sabre_DAV_SimpleCollection {
-
-}
-
diff --git a/3rdparty/Sabre/DAV/SimpleFile.php b/3rdparty/Sabre/DAV/SimpleFile.php
deleted file mode 100644
index 304dff1c5ec..00000000000
--- a/3rdparty/Sabre/DAV/SimpleFile.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/**
- * SimpleFile
- *
- * The 'SimpleFile' class is used to easily add read-only immutable files to 
- * the directory structure. One usecase would be to add a 'readme.txt' to a 
- * root of a webserver with some standard content.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_SimpleFile extends Sabre_DAV_File {
-
-    /**
-     * File contents 
-     *
-     * @var string 
-     */
-    protected $contents = array();
-
-    /**
-     * Name of this resource 
-     * 
-     * @var string 
-     */
-    protected $name;
-
-    /**
-     * A mimetype, such as 'text/plain' or 'text/html'
-     * 
-     * @var string 
-     */
-    protected $mimeType;
-
-    /**
-     * Creates this node
-     *
-     * The name of the node must be passed, as well as the contents of the 
-     * file.
-     * 
-     * @param string $name 
-     * @param string $contents 
-     */
-    public function __construct($name, $contents, $mimeType = null) {
-
-        $this->name = $name;
-        $this->contents = $contents;
-        $this->mimeType = $mimeType;
-
-    }
-
-    /**
-     * Returns the node name for this file.
-     *
-     * This name is used to construct the url.
-     * 
-     * @return string 
-     */
-    public function getName() {
-
-        return $this->name;
-
-    }
-
-    /**
-     * Returns the data 
-     *
-     * This method may either return a string or a readable stream resource
-     *
-     * @return mixed
-     */
-    public function get() {
-
-        return $this->contents; 
-
-    }
-
-    /**
-     * Returns the size of the file, in bytes. 
-     * 
-     * @return int 
-     */
-    public function getSize() {
-
-        return strlen($this->contents);
-
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbritrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     */
-    public function getETag() {
-
-        return '"' . md5($this->contents) . '"'; 
-
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     */ 
-    public function getContentType() {
-
-        return $this->mimeType; 
-
-    }
-
-}
-
-?>
diff --git a/3rdparty/Sabre/DAV/StringUtil.php b/3rdparty/Sabre/DAV/StringUtil.php
deleted file mode 100644
index 440cf6866ca..00000000000
--- a/3rdparty/Sabre/DAV/StringUtil.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/**
- * String utility
- *
- * This class is mainly used to implement the 'text-match' filter, used by both 
- * the CalDAV calendar-query REPORT, and CardDAV addressbook-query REPORT. 
- * Because they both need it, it was decided to put it in Sabre_DAV instead.
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_StringUtil {
-
-    /**
-     * Checks if a needle occurs in a haystack ;)
-     *
-     * @param string $haystack 
-     * @param string $needle 
-     * @param string $collation 
-     * @param string $matchType 
-     * @return bool 
-     */
-    static public function textMatch($haystack, $needle, $collation, $matchType = 'contains') {
-
-        switch($collation) {
-
-            case 'i;ascii-casemap' :
-                // default strtolower takes locale into consideration
-                // we don't want this.
-                $haystack = str_replace(range('a','z'), range('A','Z'), $haystack);
-                $needle = str_replace(range('a','z'), range('A','Z'), $needle);
-                break;
-
-            case 'i;octet' :
-                // Do nothing
-                break; 
-
-            case 'i;unicode-casemap' :
-                $haystack = mb_strtoupper($haystack, 'UTF-8');
-                $needle = mb_strtoupper($needle, 'UTF-8');
-                break;
-
-            default :
-                throw new Sabre_DAV_Exception_BadRequest('Collation type: ' . $collation . ' is not supported');
-
-        }
-
-        switch($matchType) {
-
-            case 'contains' :
-                return strpos($haystack, $needle)!==false;
-            case 'equals' :
-                return $haystack === $needle;
-            case 'starts-with' :
-                return strpos($haystack, $needle)===0;
-            case 'ends-with' :
-                return strrpos($haystack, $needle)===strlen($haystack)-strlen($needle);
-            default :
-                throw new Sabre_DAV_Exception_BadRequest('Match-type: ' . $matchType . ' is not supported');
-
-        }
-        
-    }
-
-    /**
-     * This method takes an input string, checks if it's not valid UTF-8 and 
-     * attempts to convert it to UTF-8 if it's not.
-     *
-     * Note that currently this can only convert ISO-8559-1 to UTF-8 (latin-1), 
-     * anything else will likely fail.
-     *
-     * @param string $input 
-     * @return string 
-     */
-    static public function ensureUTF8($input) {
-
-        $encoding = mb_detect_encoding($input , array('UTF-8','ISO-8859-1'), true);
-
-        if ($encoding === 'ISO-8859-1') {
-            return utf8_encode($input);
-        } else {
-            return $input;
-        } 
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php b/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
deleted file mode 100644
index e8276af5613..00000000000
--- a/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-
-/**
- * Temporary File Filter Plugin
- *
- * The purpose of this filter is to intercept some of the garbage files
- * operation systems and applications tend to generate when mounting
- * a WebDAV share as a disk.
- *
- * It will intercept these files and place them in a separate directory.
- * these files are not deleted automatically, so it is adviceable to
- * delete these after they are not accessed for 24 hours.
- *
- * Currently it supports:
- *   * OS/X style resource forks and .DS_Store
- *   * desktop.ini and Thumbs.db (windows)
- *   * .*.swp (vim temporary files)
- *   * .dat.* (smultron temporary files)
- *
- * Additional patterns can be added, by adding on to the
- * temporaryFilePatterns property.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_TemporaryFileFilterPlugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * This is the list of patterns we intercept.
-     * If new patterns are added, they must be valid patterns for preg_match.
-     * 
-     * @var array
-     */
-    public $temporaryFilePatterns = array(
-        '/^\._(.*)$/',     // OS/X resource forks
-        '/^.DS_Store$/',   // OS/X custom folder settings
-        '/^desktop.ini$/', // Windows custom folder settings
-        '/^Thumbs.db$/',   // Windows thumbnail cache
-        '/^.(.*).swp$/',   // ViM temporary files
-        '/^\.dat(.*)$/',   // Smultron seems to create these
-        '/^~lock.(.*)#$/', // Windows 7 lockfiles
-    );
-    
-    /**
-     * This is the directory where this plugin
-     * will store it's files.
-     * 
-     * @var string 
-     */
-    private $dataDir;
-
-    /**
-     * A reference to the main Server class
-     * 
-     * @var Sabre_DAV_Server 
-     */
-    private $server;
-
-    /**
-     * Creates the plugin.
-     *
-     * Make sure you specify a directory for your files. If you don't, we
-     * will use PHP's directory for session-storage instead, and you might
-     * not want that.
-     * 
-     * @param string $dataDir 
-     * @return void
-     */
-    public function __construct($dataDir = null) {
-
-        if (!$dataDir) $dataDir = ini_get('session.save_path').'/sabredav/';
-        if (!is_dir($dataDir)) mkdir($dataDir);
-        $this->dataDir = $dataDir;
-
-    } 
-
-    /**
-     * Initialize the plugin
-     *
-     * This is called automatically be the Server class after this plugin is
-     * added with Sabre_DAV_Server::addPlugin()
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'));
-        $server->subscribeEvent('beforeCreateFile',array($this,'beforeCreateFile'));
-
-    }
-
-    /**
-     * This method is called before any HTTP method handler
-     *
-     * This method intercepts any GET, DELETE, PUT and PROPFIND calls to 
-     * filenames that are known to match the 'temporary file' regex.
-     * 
-     * @param string $method 
-     * @return bool 
-     */
-    public function beforeMethod($method, $uri) {
-
-        if (!$tempLocation = $this->isTempFile($uri))
-            return true;
-
-        switch($method) {
-            case 'GET' :
-                return $this->httpGet($tempLocation);
-            case 'PUT' :
-                return $this->httpPut($tempLocation);
-            case 'PROPFIND' :
-                return $this->httpPropfind($tempLocation, $uri);
-            case 'DELETE' :
-                return $this->httpDelete($tempLocation);
-         }
-         return true;
-
-    }
-
-    /**
-     * This method is invoked if some subsystem creates a new file.
-     *
-     * This is used to deal with HTTP LOCK requests which create a new 
-     * file.
-     * 
-     * @param string $uri 
-     * @param resource $data 
-     * @return bool 
-     */
-    public function beforeCreateFile($uri,$data) {
-
-        if ($tempPath = $this->isTempFile($uri)) {
-            
-            $hR = $this->server->httpResponse;
-            $hR->setHeader('X-Sabre-Temp','true');
-            file_put_contents($tempPath,$data);
-            return false;
-        }
-        return true; 
-
-    }
-
-    /**
-     * This method will check if the url matches the temporary file pattern
-     * if it does, it will return an path based on $this->dataDir for the 
-     * temporary file storage.
-     * 
-     * @param string $path 
-     * @return boolean|string 
-     */
-    protected function isTempFile($path) {
-
-        // We're only interested in the basename.
-        list(, $tempPath) = Sabre_DAV_URLUtil::splitPath($path);
-
-        foreach($this->temporaryFilePatterns as $tempFile) {
-
-            if (preg_match($tempFile,$tempPath)) {
-                return $this->dataDir . '/sabredav_' . md5($path) . '.tempfile';
-            }
-
-        }
-
-        return false;
-
-    }
-
-
-    /**
-     * This method handles the GET method for temporary files.
-     * If the file doesn't exist, it will return false which will kick in
-     * the regular system for the GET method.
-     * 
-     * @param string $tempLocation 
-     * @return bool 
-     */
-    public function httpGet($tempLocation) {
-
-        if (!file_exists($tempLocation)) return true;
-
-        $hR = $this->server->httpResponse;
-        $hR->setHeader('Content-Type','application/octet-stream');
-        $hR->setHeader('Content-Length',filesize($tempLocation));
-        $hR->setHeader('X-Sabre-Temp','true');
-        $hR->sendStatus(200);
-        $hR->sendBody(fopen($tempLocation,'r'));
-        return false;
-
-    }
-
-    /**
-     * This method handles the PUT method.
-     * 
-     * @param string $tempLocation 
-     * @return bool 
-     */
-    public function httpPut($tempLocation) {
-
-        $hR = $this->server->httpResponse;
-        $hR->setHeader('X-Sabre-Temp','true');
-
-        $newFile = !file_exists($tempLocation);
-       
-        if (!$newFile && ($this->server->httpRequest->getHeader('If-None-Match'))) {
-             throw new Sabre_DAV_Exception_PreconditionFailed('The resource already exists, and an If-None-Match header was supplied');
-        }
-
-        file_put_contents($tempLocation,$this->server->httpRequest->getBody());
-        $hR->sendStatus($newFile?201:200);
-        return false;
-
-    }
-
-    /**
-     * This method handles the DELETE method.
-     *
-     * If the file didn't exist, it will return false, which will make the 
-     * standard HTTP DELETE handler kick in.
-     * 
-     * @param string $tempLocation 
-     * @return bool 
-     */
-    public function httpDelete($tempLocation) {
-
-        if (!file_exists($tempLocation)) return true;
-
-        unlink($tempLocation);
-        $hR = $this->server->httpResponse;
-        $hR->setHeader('X-Sabre-Temp','true');
-        $hR->sendStatus(204);
-        return false;
-
-    }
-
-    /**
-     * This method handles the PROPFIND method. 
-     *
-     * It's a very lazy method, it won't bother checking the request body
-     * for which properties were requested, and just sends back a default
-     * set of properties.
-     *
-     * @param string $tempLocation 
-     * @return void
-     */
-    public function httpPropfind($tempLocation, $uri) {
-
-        if (!file_exists($tempLocation)) return true;
-       
-        $hR = $this->server->httpResponse;
-        $hR->setHeader('X-Sabre-Temp','true');
-        $hR->sendStatus(207);
-        $hR->setHeader('Content-Type','application/xml; charset=utf-8');
-
-        $requestedProps = $this->server->parsePropFindRequest($this->server->httpRequest->getBody(true)); 
-
-        $properties = array(
-            'href' => $uri,
-            200 => array(
-                '{DAV:}getlastmodified' => new Sabre_DAV_Property_GetLastModified(filemtime($tempLocation)),
-                '{DAV:}getcontentlength' => filesize($tempLocation),
-                '{DAV:}resourcetype' => new Sabre_DAV_Property_ResourceType(null),
-                '{'.Sabre_DAV_Server::NS_SABREDAV.'}tempFile' => true, 
-
-            ),
-         );
-
-        $data = $this->server->generateMultiStatus(array($properties));
-        $hR->sendBody($data);
-        return false;
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/DAV/Tree.php b/3rdparty/Sabre/DAV/Tree.php
deleted file mode 100644
index 98e6f62c9e5..00000000000
--- a/3rdparty/Sabre/DAV/Tree.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-
-/**
- * Abstract tree object 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAV_Tree {
-    
-    /**
-     * This function must return an INode object for a path
-     * If a Path doesn't exist, thrown an Exception_FileNotFound
-     * 
-     * @param string $path 
-     * @throws Exception_FileNotFound
-     * @return Sabre_DAV_INode 
-     */
-    abstract function getNodeForPath($path);
-
-    /**
-     * This function allows you to check if a node exists.
-     *
-     * Implementors of this class should override this method to make 
-     * it cheaper.
-     * 
-     * @param string $path 
-     * @return bool 
-     */
-    public function nodeExists($path) {
-
-        try {
-
-            $this->getNodeForPath($path);
-            return true;
-
-        } catch (Sabre_DAV_Exception_FileNotFound $e) {
-
-            return false;
-
-        }
-
-    }
-
-    /**
-     * Copies a file from path to another
-     *
-     * @param string $sourcePath The source location
-     * @param string $destinationPath The full destination path
-     * @return void 
-     */
-    public function copy($sourcePath, $destinationPath) {
-
-        $sourceNode = $this->getNodeForPath($sourcePath);
-       
-        // grab the dirname and basename components
-        list($destinationDir, $destinationName) = Sabre_DAV_URLUtil::splitPath($destinationPath);
-
-        $destinationParent = $this->getNodeForPath($destinationDir);
-        $this->copyNode($sourceNode,$destinationParent,$destinationName);
-
-        $this->markDirty($destinationDir);
-
-    }
-
-    /**
-     * Moves a file from one location to another 
-     * 
-     * @param string $sourcePath The path to the file which should be moved 
-     * @param string $destinationPath The full destination path, so not just the destination parent node
-     * @return int
-     */
-    public function move($sourcePath, $destinationPath) {
-
-        list($sourceDir, $sourceName) = Sabre_DAV_URLUtil::splitPath($sourcePath);
-        list($destinationDir, $destinationName) = Sabre_DAV_URLUtil::splitPath($destinationPath);
-
-        if ($sourceDir===$destinationDir) {
-            $renameable = $this->getNodeForPath($sourcePath);
-            $renameable->setName($destinationName);
-        } else {
-            $this->copy($sourcePath,$destinationPath);
-            $this->getNodeForPath($sourcePath)->delete();
-        }
-        $this->markDirty($sourceDir);
-        $this->markDirty($destinationDir);
-
-    }
-
-    /**
-     * Deletes a node from the tree 
-     * 
-     * @param string $path 
-     * @return void
-     */
-    public function delete($path) {
-
-        $node = $this->getNodeForPath($path);
-        $node->delete();
-        
-        list($parent) = Sabre_DAV_URLUtil::splitPath($path);
-        $this->markDirty($parent);
-
-    }
-
-    /**
-     * Returns a list of childnodes for a given path. 
-     * 
-     * @param string $path 
-     * @return array 
-     */
-    public function getChildren($path) {
-
-        $node = $this->getNodeForPath($path);
-        return $node->getChildren();
-
-    }
-
-    /**
-     * This method is called with every tree update
-     *
-     * Examples of tree updates are:
-     *   * node deletions
-     *   * node creations
-     *   * copy
-     *   * move
-     *   * renaming nodes 
-     * 
-     * If Tree classes implement a form of caching, this will allow
-     * them to make sure caches will be expired.
-     * 
-     * If a path is passed, it is assumed that the entire subtree is dirty
-     *
-     * @param string $path 
-     * @return void
-     */
-    public function markDirty($path) {
-
-
-    }
-
-    /**
-     * copyNode 
-     * 
-     * @param Sabre_DAV_INode $source 
-     * @param Sabre_DAV_ICollection $destination 
-     * @return void
-     */
-    protected function copyNode(Sabre_DAV_INode $source,Sabre_DAV_ICollection $destinationParent,$destinationName = null) {
-
-        if (!$destinationName) $destinationName = $source->getName();
-
-        if ($source instanceof Sabre_DAV_IFile) {
-
-            $data = $source->get();
-
-            // If the body was a string, we need to convert it to a stream
-            if (is_string($data)) {
-                $stream = fopen('php://temp','r+');
-                fwrite($stream,$data);
-                rewind($stream);
-                $data = $stream;
-            } 
-            $destinationParent->createFile($destinationName,$data);
-            $destination = $destinationParent->getChild($destinationName);
-
-        } elseif ($source instanceof Sabre_DAV_ICollection) {
-
-            $destinationParent->createDirectory($destinationName);
-            
-            $destination = $destinationParent->getChild($destinationName);
-            foreach($source->getChildren() as $child) {
-
-                $this->copyNode($child,$destination);
-
-            }
-
-        }
-        if ($source instanceof Sabre_DAV_IProperties && $destination instanceof Sabre_DAV_IProperties) {
-
-            $props = $source->getProperties(array());
-            $destination->updateProperties($props);
-
-        }
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/Tree/Filesystem.php b/3rdparty/Sabre/DAV/Tree/Filesystem.php
deleted file mode 100644
index 5c611047e07..00000000000
--- a/3rdparty/Sabre/DAV/Tree/Filesystem.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-/**
- * Sabre_DAV_Tree_Filesystem 
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Tree_Filesystem extends Sabre_DAV_Tree {
-
-    /**
-     * Base url on the filesystem.
-     *
-     * @var string 
-     */
-    protected $basePath;
-
-    /**
-     * Creates this tree
-     *
-     * Supply the path you'd like to share.
-     * 
-     * @param string $basePath 
-     * @return void
-     */
-    public function __construct($basePath) {
-
-        $this->basePath = $basePath;
-
-    }
-
-    /**
-     * Returns a new node for the given path 
-     * 
-     * @param string $path 
-     * @return void
-     */
-    public function getNodeForPath($path) {
-
-        $realPath = $this->getRealPath($path);
-        if (!file_exists($realPath)) throw new Sabre_DAV_Exception_FileNotFound('File at location ' . $realPath . ' not found');
-        if (is_dir($realPath)) { 
-            return new Sabre_DAV_FS_Directory($path);
-        } else {
-            return new Sabre_DAV_FS_File($path);
-        }
-
-    }
-
-    /**
-     * Returns the real filesystem path for a webdav url. 
-     * 
-     * @param string $publicPath 
-     * @return string 
-     */
-    protected function getRealPath($publicPath) {
-
-        return rtrim($this->basePath,'/') . '/' . trim($publicPath,'/');
-
-    }
-
-    /**
-     * Copies a file or directory.
-     *
-     * This method must work recursively and delete the destination
-     * if it exists
-     * 
-     * @param string $source 
-     * @param string $destination 
-     * @return void
-     */
-    public function copy($source,$destination) {
-
-        $source = $this->getRealPath($source);
-        $destination = $this->getRealPath($destination);
-        $this->realCopy($source,$destination); 
-
-    }
-
-    /**
-     * Used by self::copy 
-     * 
-     * @param string $source 
-     * @param string $destination 
-     * @return void
-     */
-    protected function realCopy($source,$destination) {
-
-        if (is_file($source)) {
-            copy($source,$destination);
-        } else {
-            mkdir($destination);
-            foreach(scandir($source) as $subnode) {
-
-                if ($subnode=='.' || $subnode=='..') continue;
-                $this->realCopy($source.'/'.$subnode,$destination.'/'.$subnode);
-
-            }
-        }
-
-    }
-
-    /**
-     * Moves a file or directory recursively.
-     *
-     * If the destination exists, delete it first.
-     * 
-     * @param string $source 
-     * @param string $destination 
-     * @return void
-     */
-    public function move($source,$destination) {
-
-        $source = $this->getRealPath($source);
-        $destination = $this->getRealPath($destination);
-        rename($source,$destination);
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAV/URLUtil.php b/3rdparty/Sabre/DAV/URLUtil.php
deleted file mode 100644
index 8f38749264b..00000000000
--- a/3rdparty/Sabre/DAV/URLUtil.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/**
- * URL utility class
- *
- * This class provides methods to deal with encoding and decoding url (percent encoded) strings.
- *
- * It was not possible to use PHP's built-in methods for this, because some clients don't like
- * encoding of certain characters.
- *
- * Specifically, it was found that GVFS (gnome's webdav client) does not like encoding of ( and
- * ). Since these are reserved, but don't have a reserved meaning in url, these characters are
- * kept as-is.
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_URLUtil {
-
-    /**
-     * Encodes the path of a url.
-     *
-     * slashes (/) are treated as path-separators.
-     * 
-     * @param string $path 
-     * @return string 
-     */
-    static function encodePath($path) {
-
-    	$valid_chars = '/ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-.~()';
-        $newStr = '';
-        for( $i=0; isset($path[$i]); ++$i ) {
-            if( strpos($valid_chars,($c=$path[$i]))===false ) $newStr .= '%'.sprintf('%02x',ord($c));
-            else $newStr .= $c;
-        }
-        return $newStr;
-    	
-    }
-
-    /**
-     * Encodes a 1 segment of a path
-     *
-     * Slashes are considered part of the name, and are encoded as %2f
-     * 
-     * @param string $pathSegment 
-     * @return string 
-     */
-    static function encodePathSegment($pathSegment) {
-
-    	$valid_chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-.~()';
-        $newStr = '';
-        for( $i=0; isset($pathSegment[$i]); ++$i ) {
-            if( strpos($valid_chars,($c=$pathSegment[$i]))===false ) $newStr .= '%'.sprintf('%02x',ord($c));
-            else $newStr .= $c;
-        }
-        return $newStr;
-    }
-
-    /**
-     * Decodes a url-encoded path
-     *
-     * @param string $path 
-     * @return string 
-     */
-    static function decodePath($path) {
-
-        return self::decodePathSegment($path);
-
-    }
-
-    /**
-     * Decodes a url-encoded path segment
-     *
-     * @param string $path 
-     * @return string 
-     */
-    static function decodePathSegment($path) {
-
-        $path = urldecode($path);
-        $encoding = mb_detect_encoding($path, array('UTF-8','ISO-8859-1'));
-
-        switch($encoding) {
-
-            case 'ISO-8859-1' : 
-                $path = utf8_encode($path);
-
-        }
-
-        return $path;
-
-    }
-
-    /**
-     * Returns the 'dirname' and 'basename' for a path. 
-     *
-     * The reason there is a custom function for this purpose, is because
-     * basename() is locale aware (behaviour changes if C locale or a UTF-8 locale is used)
-     * and we need a method that just operates on UTF-8 characters.
-     *
-     * In addition basename and dirname are platform aware, and will treat backslash (\) as a
-     * directory separator on windows.
-     *
-     * This method returns the 2 components as an array.
-     *
-     * If there is no dirname, it will return an empty string. Any / appearing at the end of the
-     * string is stripped off.
-     *
-     * @param string $path 
-     * @return array 
-     */
-    static function splitPath($path) {
-
-        $matches = array();
-        if(preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u',$path,$matches)) {
-            return array($matches[1],$matches[2]);
-        } else {
-            return array(null,null);
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/UUIDUtil.php b/3rdparty/Sabre/DAV/UUIDUtil.php
deleted file mode 100644
index e42a536ad8a..00000000000
--- a/3rdparty/Sabre/DAV/UUIDUtil.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * UUID Utility
- *
- * This class has static methods to generate and validate UUID's.
- * UUIDs are used a decent amount within various *DAV standards, so it made 
- * sense to include it.
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_UUIDUtil {
-
-    /**
-     * Returns a pseudo-random v4 UUID
-     *
-     * This function is based on a comment by Andrew Moore on php.net 
-     * 
-     * @see http://www.php.net/manual/en/function.uniqid.php#94959
-     * @return void
-     */
-    static function getUUID() {
-
-        return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-            // 32 bits for "time_low"
-            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
-
-            // 16 bits for "time_mid"
-            mt_rand( 0, 0xffff ),
-
-            // 16 bits for "time_hi_and_version",
-            // four most significant bits holds version number 4
-            mt_rand( 0, 0x0fff ) | 0x4000,
-
-            // 16 bits, 8 bits for "clk_seq_hi_res",
-            // 8 bits for "clk_seq_low",
-            // two most significant bits holds zero and one for variant DCE1.1
-            mt_rand( 0, 0x3fff ) | 0x8000,
-
-            // 48 bits for "node"
-            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
-        );
-    }
-
-    /**
-     * Checks if a string is a valid UUID.
-     * 
-     * @param string $uuid 
-     * @return bool 
-     */
-    static function validateUUID($uuid) {
-
-        return preg_match(
-            '/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i',
-            $uuid
-        ) == true;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAV/Version.php b/3rdparty/Sabre/DAV/Version.php
deleted file mode 100644
index 6bece1985e4..00000000000
--- a/3rdparty/Sabre/DAV/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * This class contains the SabreDAV version constants.
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.5.4';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/DAV/XMLUtil.php b/3rdparty/Sabre/DAV/XMLUtil.php
deleted file mode 100644
index bd05be4b229..00000000000
--- a/3rdparty/Sabre/DAV/XMLUtil.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-/**
- * XML utilities for WebDAV
- * 
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAV_XMLUtil {
-
-    /**
-     * Returns the 'clark notation' for an element.
-     * 
-     * For example, and element encoded as:
-     * <b:myelem xmlns:b="http://www.example.org/" />
-     * will be returned as:
-     * {http://www.example.org}myelem
-     *
-     * This format is used throughout the SabreDAV sourcecode.
-     * Elements encoded with the urn:DAV namespace will 
-     * be returned as if they were in the DAV: namespace. This is to avoid
-     * compatibility problems.
-     *
-     * This function will return null if a nodetype other than an Element is passed.
-     *
-     * @param DOMElement $dom 
-     * @return string 
-     */
-    static function toClarkNotation(DOMNode $dom) {
-
-        if ($dom->nodeType !== XML_ELEMENT_NODE) return null;
-
-        // Mapping back to the real namespace, in case it was dav
-        if ($dom->namespaceURI=='urn:DAV') $ns = 'DAV:'; else $ns = $dom->namespaceURI;
-        
-        // Mapping to clark notation
-        return '{' . $ns . '}' . $dom->localName;
-
-    }
-
-    /**
-     * Parses a clark-notation string, and returns the namespace and element 
-     * name components.
-     *
-     * If the string was invalid, it will throw an InvalidArgumentException.
-     * 
-     * @param string $str
-     * @throws InvalidArgumentException 
-     * @return array 
-     */
-    static function parseClarkNotation($str) {
-
-        if (!preg_match('/^{([^}]*)}(.*)$/',$str,$matches)) {
-            throw new InvalidArgumentException('\'' . $str . '\' is not a valid clark-notation formatted string');
-        }
-
-        return array(
-            $matches[1],
-            $matches[2]
-        );
-
-    }
-
-    /**
-     * This method takes an XML document (as string) and converts all instances of the
-     * DAV: namespace to urn:DAV
-     *
-     * This is unfortunately needed, because the DAV: namespace violates the xml namespaces
-     * spec, and causes the DOM to throw errors
-     */
-    static function convertDAVNamespace($xmlDocument) {
-
-        // This is used to map the DAV: namespace to urn:DAV. This is needed, because the DAV:
-        // namespace is actually a violation of the XML namespaces specification, and will cause errors
-        return preg_replace("/xmlns(:[A-Za-z0-9_]*)?=(\"|\')DAV:(\\2)/","xmlns\\1=\\2urn:DAV\\2",$xmlDocument);
-
-    }
-
-    /**
-     * This method provides a generic way to load a DOMDocument for WebDAV use.
-     *
-     * This method throws a Sabre_DAV_Exception_BadRequest exception for any xml errors.
-     * It does not preserve whitespace, and it converts the DAV: namespace to urn:DAV. 
-     * 
-     * @param string $xml
-     * @throws Sabre_DAV_Exception_BadRequest 
-     * @return DOMDocument 
-     */
-    static function loadDOMDocument($xml) {
-
-        if (empty($xml))
-            throw new Sabre_DAV_Exception_BadRequest('Empty XML document sent');
-       
-        // The BitKinex client sends xml documents as UTF-16. PHP 5.3.1 (and presumably lower)
-        // does not support this, so we must intercept this and convert to UTF-8.
-        if (substr($xml,0,12) === "\x3c\x00\x3f\x00\x78\x00\x6d\x00\x6c\x00\x20\x00") {
-
-            // Note: the preceeding byte sequence is "<?xml" encoded as UTF_16, without the BOM.
-            $xml = iconv('UTF-16LE','UTF-8',$xml);
-
-            // Because the xml header might specify the encoding, we must also change this.
-            // This regex looks for the string encoding="UTF-16" and replaces it with
-            // encoding="UTF-8".
-            $xml = preg_replace('|<\?xml([^>]*)encoding="UTF-16"([^>]*)>|u','<?xml\1encoding="UTF-8"\2>',$xml);
-
-        }
-
-        // Retaining old error setting
-        $oldErrorSetting =  libxml_use_internal_errors(true);
-
-        // Clearing any previous errors 
-        libxml_clear_errors();
-
-        $dom = new DOMDocument();
-        $dom->loadXML(self::convertDAVNamespace($xml),LIBXML_NOWARNING | LIBXML_NOERROR);
-
-        // We don't generally care about any whitespace
-        $dom->preserveWhiteSpace = false;
-
-        if ($error = libxml_get_last_error()) {
-            libxml_clear_errors();
-            throw new Sabre_DAV_Exception_BadRequest('The request body had an invalid XML body. (message: ' . $error->message . ', errorcode: ' . $error->code . ', line: ' . $error->line . ')');
-        }
-
-        // Restoring old mechanism for error handling
-        if ($oldErrorSetting===false) libxml_use_internal_errors(false);
-
-        return $dom;
-
-    }
-
-    /**
-     * Parses all WebDAV properties out of a DOM Element
-     *
-     * Generally WebDAV properties are encloded in {DAV:}prop elements. This
-     * method helps by going through all these and pulling out the actual
-     * propertynames, making them array keys and making the property values,
-     * well.. the array values.
-     *
-     * If no value was given (self-closing element) null will be used as the
-     * value. This is used in for example PROPFIND requests.
-     *
-     * Complex values are supported through the propertyMap argument. The
-     * propertyMap should have the clark-notation properties as it's keys, and
-     * classnames as values. 
-     *
-     * When any of these properties are found, the unserialize() method will be
-     * (statically) called. The result of this method is used as the value.
-     *
-     * @param DOMElement $parentNode
-     * @param array $propertyMap
-     * @return array
-     */
-    static function parseProperties(DOMElement $parentNode, array $propertyMap = array()) {
-
-        $propList = array();
-        foreach($parentNode->childNodes as $propNode) {
-
-            if (Sabre_DAV_XMLUtil::toClarkNotation($propNode)!=='{DAV:}prop') continue;
-
-            foreach($propNode->childNodes as $propNodeData) {
-
-                /* If there are no elements in here, we actually get 1 text node, this special case is dedicated to netdrive */
-                if ($propNodeData->nodeType != XML_ELEMENT_NODE) continue;
-
-                $propertyName = Sabre_DAV_XMLUtil::toClarkNotation($propNodeData);
-                if (isset($propertyMap[$propertyName])) {
-                    $propList[$propertyName] = call_user_func(array($propertyMap[$propertyName],'unserialize'),$propNodeData); 
-                } else {
-                    $propList[$propertyName] = $propNodeData->textContent;
-                }
-            }
-
-
-        }
-        return $propList;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php b/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
deleted file mode 100644
index a361e054610..00000000000
--- a/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-/**
- * Principals Collection
- *
- * This is a helper class that easily allows you to create a collection that 
- * has a childnode for every principal.
- * 
- * To use this class, simply implement the getChildForPrincipal method. 
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_DAVACL_AbstractPrincipalCollection extends Sabre_DAV_Collection  {
-
-    /**
-     * Node or 'directory' name. 
-     * 
-     * @var string 
-     */
-    protected $path;
-
-    /**
-     * Principal backend 
-     * 
-     * @var Sabre_DAVACL_IPrincipalBackend 
-     */
-    protected $principalBackend;
-
-    /**
-     * If this value is set to true, it effectively disables listing of users
-     * it still allows user to find other users if they have an exact url. 
-     * 
-     * @var bool 
-     */
-    public $disableListing = false;
-
-    /**
-     * Creates the object
-     *
-     * This object must be passed the principal backend. This object will 
-     * filter all principals from a specfied prefix ($principalPrefix). The 
-     * default is 'principals', if your principals are stored in a different 
-     * collection, override $principalPrefix
-     * 
-     * 
-     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend 
-     * @param string $principalPrefix
-     * @param string $nodeName
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, $principalPrefix = 'principals') {
-
-        $this->principalPrefix = $principalPrefix;
-        $this->principalBackend = $principalBackend;
-
-    }
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     * 
-     * @param array $principalInfo 
-     * @return Sabre_DAVACL_IPrincipal
-     */
-    abstract function getChildForPrincipal(array $principalInfo);
-
-    /**
-     * Returns the name of this collection. 
-     * 
-     * @return string 
-     */
-    public function getName() {
-
-        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalPrefix);
-        return $name; 
-
-    }
-
-    /**
-     * Return the list of users 
-     * 
-     * @return void
-     */
-    public function getChildren() {
-
-        if ($this->disableListing)
-            throw new Sabre_DAV_Exception_MethodNotAllowed('Listing members of this collection is disabled');
-
-        $children = array();
-        foreach($this->principalBackend->getPrincipalsByPrefix($this->principalPrefix) as $principalInfo) {
-
-            $children[] = $this->getChildForPrincipal($principalInfo);
-
-
-        }
-        return $children; 
-
-    }
-
-    /**
-     * Returns a child object, by its name.
-     * 
-     * @param string $name
-     * @throws Sabre_DAV_Exception_FileNotFound
-     * @return Sabre_DAV_IPrincipal
-     */
-    public function getChild($name) {
-
-        $principalInfo = $this->principalBackend->getPrincipalByPath($this->principalPrefix . '/' . $name);
-        if (!$principalInfo) throw new Sabre_DAV_Exception_FileNotFound('Principal with name ' . $name . ' not found');
-        return $this->getChildForPrincipal($principalInfo);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Exception/AceConflict.php b/3rdparty/Sabre/DAVACL/Exception/AceConflict.php
deleted file mode 100644
index d10aeb4345c..00000000000
--- a/3rdparty/Sabre/DAVACL/Exception/AceConflict.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Sabre_DAVACL_Exception_AceConflict 
- * 
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Exception_AceConflict extends Sabre_DAV_Exception_Conflict {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}no-ace-conflict element as defined in rfc3744
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $errorNode 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-        
-        $doc = $errorNode->ownerDocument;
-        
-        $np = $doc->createElementNS('DAV:','d:no-ace-conflict');
-        $errorNode->appendChild($np);
-
-    }
-
-}
-
-?>
diff --git a/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php b/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
deleted file mode 100644
index 024ab6641f3..00000000000
--- a/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/**
- * NeedPrivileges 
- *
- * The 403-need privileges is thrown when a user didn't have the appropriate
- * permissions to perform an operation
- * 
- * @package Sabre
- * @subpackage DAVACL
- * @version $Id$
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Exception_NeedPrivileges extends Sabre_DAV_Exception_Forbidden {
-
-    /**
-     * The relevant uri 
-     * 
-     * @var string 
-     */
-    protected $uri;
-
-    /**
-     * The privileges the user didn't have. 
-     * 
-     * @var array 
-     */
-    protected $privileges;
-
-    /**
-     * Constructor 
-     * 
-     * @param string $uri 
-     * @param array $privileges 
-     */
-    public function __construct($uri,array $privileges) {
-
-        $this->uri = $uri;
-        $this->privileges = $privileges;
-
-    }
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}need-privileges element as defined in rfc3744
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $errorNode 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-        
-        $doc = $errorNode->ownerDocument;
-        
-        $np = $doc->createElementNS('DAV:','d:need-privileges');
-        $errorNode->appendChild($np);
-
-        foreach($this->privileges as $privilege) {
-
-            $resource = $doc->createElementNS('DAV:','d:resource');
-            $np->appendChild($resource);
-
-            $resource->appendChild($doc->createElementNS('DAV:','d:href',$server->getBaseUri() . $this->uri));
-
-            $priv = $doc->createElementNS('DAV:','d:privilege');
-            $resource->appendChild($priv);
-
-            preg_match('/^{([^}]*)}(.*)$/',$privilege,$privilegeParts);
-            $priv->appendChild($doc->createElementNS($privilegeParts[1],'d:' . $privilegeParts[2]));
-
-
-        }
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php b/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
deleted file mode 100644
index 60f49ebff4a..00000000000
--- a/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Sabre_DAVACL_Exception_NoAbstract
- * 
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Exception_NoAbstract extends Sabre_DAV_Exception_PreconditionFailed {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}no-abstract element as defined in rfc3744
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $errorNode 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-        
-        $doc = $errorNode->ownerDocument;
-        
-        $np = $doc->createElementNS('DAV:','d:no-abstract');
-        $errorNode->appendChild($np);
-
-    }
-
-}
-
-?>
diff --git a/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php b/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
deleted file mode 100644
index e056dc9e4f7..00000000000
--- a/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Sabre_DAVACL_Exception_NotRecognizedPrincipal
- * 
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Exception_NotRecognizedPrincipal extends Sabre_DAV_Exception_PreconditionFailed {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}recognized-principal element as defined in rfc3744
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $errorNode 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-        
-        $doc = $errorNode->ownerDocument;
-        
-        $np = $doc->createElementNS('DAV:','d:recognized-principal');
-        $errorNode->appendChild($np);
-
-    }
-
-}
-
-?>
diff --git a/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php b/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
deleted file mode 100644
index 27db7cdd7dd..00000000000
--- a/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Sabre_DAVACL_Exception_NotSupportedPrivilege
- * 
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Exception_NotSupportedPrivilege extends Sabre_DAV_Exception_PreconditionFailed {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}not-supported-privilege element as defined in rfc3744
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $errorNode 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-        
-        $doc = $errorNode->ownerDocument;
-        
-        $np = $doc->createElementNS('DAV:','d:not-supported-privilege');
-        $errorNode->appendChild($np);
-
-    }
-
-}
-
-?>
diff --git a/3rdparty/Sabre/DAVACL/IACL.php b/3rdparty/Sabre/DAVACL/IACL.php
deleted file mode 100644
index 506be4248d7..00000000000
--- a/3rdparty/Sabre/DAVACL/IACL.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * ACL-enabled node
- *
- * If you want to add WebDAV ACL to a node, you must implement this class
- * 
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAVACL_IACL extends Sabre_DAV_INode {
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner 
-     * 
-     * @return string|null
-     */
-    function getOwner();
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     * 
-     * @return string|null 
-     */
-    function getGroup();
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to 
-     *      be updated. 
-     * 
-     * @return array 
-     */
-    function getACL();
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's. 
-     * 
-     * @param array $acl 
-     * @return void
-     */
-    function setACL(array $acl);
-
-}
diff --git a/3rdparty/Sabre/DAVACL/IPrincipal.php b/3rdparty/Sabre/DAVACL/IPrincipal.php
deleted file mode 100644
index 7868811db76..00000000000
--- a/3rdparty/Sabre/DAVACL/IPrincipal.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * IPrincipal interface
- * 
- * Implement this interface to define your own principals
- * 
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAVACL_IPrincipal extends Sabre_DAV_INode {
-
-    /**
-     * Returns a list of altenative urls for a principal
-     * 
-     * This can for example be an email address, or ldap url.
-     * 
-     * @return array 
-     */
-    function getAlternateUriSet();
-
-    /**
-     * Returns the full principal url 
-     * 
-     * @return string 
-     */
-    function getPrincipalUrl();
-
-    /**
-     * Returns the list of group members
-     * 
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group. 
-     * 
-     * @return array
-     */
-    function getGroupMemberSet();
-
-    /**
-     * Returns the list of groups this principal is member of
-     * 
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members. 
-     * 
-     * @return array 
-     */
-    function getGroupMembership();
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     * 
-     * This method should throw an exception if the members could not be set. 
-     * 
-     * @param array $principals 
-     * @return void 
-     */
-    function setGroupMemberSet(array $principals);
-
-    /**
-     * Returns the displayname
-     *
-     * This should be a human readable name for the principal.
-     * If none is available, return the nodename. 
-     * 
-     * @return string 
-     */
-    function getDisplayName();
-
-}
diff --git a/3rdparty/Sabre/DAVACL/IPrincipalBackend.php b/3rdparty/Sabre/DAVACL/IPrincipalBackend.php
deleted file mode 100644
index 8899f6f80df..00000000000
--- a/3rdparty/Sabre/DAVACL/IPrincipalBackend.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * Implement this interface to create your own principal backends.
- *
- * Creating backends for principals is entirely optional. You can also 
- * implement Sabre_DAVACL_IPrincipal directly. This interface is used solely by 
- * Sabre_DAVACL_AbstractPrincipalCollection.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface Sabre_DAVACL_IPrincipalBackend {
-
-    /**
-     * Returns a list of principals based on a prefix.
-     *
-     * This prefix will often contain something like 'principals'. You are only 
-     * expected to return principals that are in this base path.
-     *
-     * You are expected to return at least a 'uri' for every user, you can 
-     * return any additional properties if you wish so. Common properties are:
-     *   {DAV:}displayname 
-     *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV 
-     *     field that's actualy injected in a number of other properties. If
-     *     you have an email address, use this property.
-     * 
-     * @param string $prefixPath 
-     * @return array 
-     */
-    function getPrincipalsByPrefix($prefixPath);
-
-    /**
-     * Returns a specific principal, specified by it's path.
-     * The returned structure should be the exact same as from 
-     * getPrincipalsByPrefix. 
-     * 
-     * @param string $path 
-     * @return array 
-     */
-    function getPrincipalByPath($path);
-
-    /**
-     * Returns the list of members for a group-principal 
-     * 
-     * @param string $principal 
-     * @return array 
-     */
-    function getGroupMemberSet($principal);
-
-    /**
-     * Returns the list of groups a principal is a member of 
-     * 
-     * @param string $principal 
-     * @return array 
-     */
-    function getGroupMembership($principal);
-
-    /**
-     * Updates the list of group members for a group principal.
-     *
-     * The principals should be passed as a list of uri's. 
-     * 
-     * @param string $principal 
-     * @param array $members 
-     * @return void
-     */
-    function setGroupMemberSet($principal, array $members); 
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Plugin.php b/3rdparty/Sabre/DAVACL/Plugin.php
deleted file mode 100644
index b964bdb5dec..00000000000
--- a/3rdparty/Sabre/DAVACL/Plugin.php
+++ /dev/null
@@ -1,1238 +0,0 @@
-<?php
-
-/**
- * SabreDAV ACL Plugin
- *
- * This plugin provides funcitonality to enforce ACL permissions.
- * ACL is defined in RFC3744.
- *
- * In addition it also provides support for the {DAV:}current-user-principal 
- * property, defined in RFC5397 and the {DAV:}expand-property report, as 
- * defined in RFC3253. 
- * 
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Plugin extends Sabre_DAV_ServerPlugin {
-
-    /**
-     * Recursion constants
-     *
-     * This only checks the base node
-     */
-    const R_PARENT = 1;
-
-    /**
-     * Recursion constants
-     *
-     * This checks every node in the tree
-     */
-    const R_RECURSIVE = 2;
-
-    /**
-     * Recursion constants
-     *
-     * This checks every parentnode in the tree, but not leaf-nodes.
-     */
-    const R_RECURSIVEPARENTS = 3;
-
-    /**
-     * Reference to server object. 
-     * 
-     * @var Sabre_DAV_Server 
-     */
-    protected $server;
-
-    /**
-     * List of urls containing principal collections.
-     * Modify this if your principals are located elsewhere. 
-     * 
-     * @var array
-     */
-    public $principalCollectionSet = array(
-        'principals',
-    );
-
-    /**
-     * By default ACL is only enforced for nodes that have ACL support (the 
-     * ones that implement Sabre_DAVACL_IACL). For any other node, access is 
-     * always granted.
-     *
-     * To override this behaviour you can turn this setting off. This is useful 
-     * if you plan to fully support ACL in the entire tree.
-     *
-     * @var bool 
-     */
-    public $allowAccessToNodesWithoutACL = true;
-
-    /**
-     * By default nodes that are inaccessible by the user, can still be seen
-     * in directory listings (PROPFIND on parent with Depth: 1)
-     *
-     * In certain cases it's desirable to hide inaccessible nodes. Setting this 
-     * to true will cause these nodes to be hidden from directory listings.
-     * 
-     * @var bool 
-     */
-    public $hideNodesFromListings = false;
-
-    /**
-     * This string is prepended to the username of the currently logged in 
-     * user. This allows the plugin to determine the principal path based on 
-     * the username.
-     * 
-     * @var string
-     */
-    public $defaultUsernamePath = 'principals';
-
-    /**
-     * Returns a list of features added by this plugin.
-     *
-     * This list is used in the response of a HTTP OPTIONS request.
-     * 
-     * @return array 
-     */
-    public function getFeatures() {
-
-        return array('access-control');
-
-    }
-
-    /**
-     * Returns a list of available methods for a given url 
-     * 
-     * @param string $uri 
-     * @return array 
-     */
-    public function getMethods($uri) {
-
-        return array('ACL');
-
-    }
-
-    /**
-     * Returns a plugin name.
-     * 
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre_DAV_Server::getPlugin 
-     * 
-     * @return string 
-     */
-    public function getPluginName() {
-
-        return 'acl';
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually 
-     * implement them 
-     * 
-     * @param string $uri
-     * @return array 
-     */
-    public function getSupportedReportSet($uri) {
-
-        return array(
-            '{DAV:}expand-property',
-            '{DAV:}principal-property-search',
-            '{DAV:}principal-search-property-set', 
-        );
-
-    }
-
-
-    /**
-     * Checks if the current user has the specified privilege(s). 
-     * 
-     * You can specify a single privilege, or a list of privileges.
-     * This method will throw an exception if the privilege is not available
-     * and return true otherwise.
-     *
-     * @param string $uri
-     * @param array|string $privileges
-     * @param bool $throwExceptions if set to false, this method won't through exceptions. 
-     * @throws Sabre_DAVACL_Exception_NeedPrivileges
-     * @return bool 
-     */
-    public function checkPrivileges($uri,$privileges,$recursion = self::R_PARENT, $throwExceptions = true) {
-
-        if (!is_array($privileges)) $privileges = array($privileges);
-
-        $acl = $this->getCurrentUserPrivilegeSet($uri);
-
-        if (is_null($acl)) {
-            if ($this->allowAccessToNodesWithoutACL) {
-                return true;
-            } else {
-                if ($throwExceptions) 
-                    throw new Sabre_DAVACL_Exception_NeedPrivileges($uri,$privileges);
-                else
-                    return false;
-
-            }
-        }
-
-        $failed = array();
-        foreach($privileges as $priv) {
-
-            if (!in_array($priv, $acl)) {
-                $failed[] = $priv;
-            }
-
-        }
-
-        if ($failed) {
-            if ($throwExceptions) 
-                throw new Sabre_DAVACL_Exception_NeedPrivileges($uri,$failed);
-            else
-                return false;
-        }
-        return true;
-
-    }
-
-    /**
-     * Returns the standard users' principal.
-     *
-     * This is one authorative principal url for the current user.
-     * This method will return null if the user wasn't logged in. 
-     * 
-     * @return string|null 
-     */
-    public function getCurrentUserPrincipal() {
-
-        $authPlugin = $this->server->getPlugin('auth');
-        if (is_null($authPlugin)) return null;
-
-        $userName = $authPlugin->getCurrentUser();
-        if (!$userName) return null;
-
-        return $this->defaultUsernamePath . '/' . $userName;
-
-    }
-
-    /**
-     * Returns a list of principals that's associated to the current
-     * user, either directly or through group membership. 
-     * 
-     * @return array 
-     */
-    public function getCurrentUserPrincipals() {
-
-        $currentUser = $this->getCurrentUserPrincipal();
-
-        if (is_null($currentUser)) return array();
-
-        $check = array($currentUser);
-        $principals = array($currentUser);
-
-        while(count($check)) {
-
-            $principal = array_shift($check);
- 
-            $node = $this->server->tree->getNodeForPath($principal);
-            if ($node instanceof Sabre_DAVACL_IPrincipal) {
-                foreach($node->getGroupMembership() as $groupMember) {
-
-                    if (!in_array($groupMember, $principals)) {
-
-                        $check[] = $groupMember;
-                        $principals[] = $groupMember;
-
-                    }
-
-                }
-
-            }
-
-        }
-
-        return $principals;
-
-    }
-
-    /**
-     * Returns the supported privilege structure for this ACL plugin.
-     *
-     * See RFC3744 for more details. Currently we default on a simple,
-     * standard structure. 
-     * 
-     * @return array 
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return array(
-            'privilege'  => '{DAV:}all',
-            'abstract'   => true,
-            'aggregates' => array(
-                array(
-                    'privilege'  => '{DAV:}read',
-                    'aggregates' => array(
-                        array(
-                            'privilege' => '{DAV:}read-acl',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}read-current-user-privilege-set',
-                            'abstract'  => true,
-                        ),
-                    ),
-                ), // {DAV:}read
-                array(
-                    'privilege'  => '{DAV:}write',
-                    'aggregates' => array(
-                        array(
-                            'privilege' => '{DAV:}write-acl',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}write-properties',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}write-content',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}bind',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}unbind',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}unlock',
-                            'abstract'  => true,
-                        ),
-                    ),
-                ), // {DAV:}write
-            ), 
-        ); // {DAV:}all
-
-    }
-
-    /**
-     * Returns the supported privilege set as a flat list
-     *
-     * This is much easier to parse.
-     *
-     * The returned list will be index by privilege name.
-     * The value is a struct containing the following properties:
-     *   - aggregates
-     *   - abstract
-     *   - concrete
-     * 
-     * @return array 
-     */
-    final public function getFlatPrivilegeSet() {
-
-        $privs = $this->getSupportedPrivilegeSet();
-
-        $flat = array();
-        $this->getFPSTraverse($privs, null, $flat);
-
-        return $flat;
-
-    }
-
-    /**
-     * Traverses the privilege set tree for reordering
-     *
-     * This function is solely used by getFlatPrivilegeSet, and would have been 
-     * a closure if it wasn't for the fact I need to support PHP 5.2.
-     * 
-     * @return void
-     */
-    final private function getFPSTraverse($priv, $concrete, &$flat) {
-
-        $myPriv = array(
-            'privilege' => $priv['privilege'],
-            'abstract' => isset($priv['abstract']) && $priv['abstract'],
-            'aggregates' => array(),
-            'concrete' => isset($priv['abstract']) && $priv['abstract']?$concrete:$priv['privilege'],
-        );
-
-        if (isset($priv['aggregates']))
-            foreach($priv['aggregates'] as $subPriv) $myPriv['aggregates'][] = $subPriv['privilege'];
-
-        $flat[$priv['privilege']] = $myPriv;
-
-        if (isset($priv['aggregates'])) {
-
-            foreach($priv['aggregates'] as $subPriv) {
-            
-                $this->getFPSTraverse($subPriv, $myPriv['concrete'], $flat);
-
-            }
-
-        }
-
-    }
-
-    /**
-     * Returns the full ACL list.
-     *
-     * Either a uri or a Sabre_DAV_INode may be passed.
-     *
-     * null will be returned if the node doesn't support ACLs. 
-     * 
-     * @param string|Sabre_DAV_INode $node
-     * @return array
-     */
-    public function getACL($node) {
-
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
-        if ($node instanceof Sabre_DAVACL_IACL) {
-            return $node->getACL();
-        }
-        return null; 
-
-    }
-
-    /**
-     * Returns a list of privileges the current user has
-     * on a particular node.
-     *
-     * Either a uri or a Sabre_DAV_INode may be passed.
-     *
-     * null will be returned if the node doesn't support ACLs. 
-     * 
-     * @param string|Sabre_DAV_INode $node 
-     * @return array 
-     */
-    public function getCurrentUserPrivilegeSet($node) {
-
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
-
-        $acl = $this->getACL($node);
-        if (is_null($acl)) return null;
-
-        $principals = $this->getCurrentUserPrincipals();
-
-        $collected = array();
-
-        foreach($acl as $ace) {
-
-            if (in_array($ace['principal'], $principals)) {
-                $collected[] = $ace;
-            }
-
-        }
-
-        // Now we deduct all aggregated privileges.
-        $flat = $this->getFlatPrivilegeSet();
-
-        $collected2 = array();
-        foreach($collected as $privilege) {
-
-            $collected2[] = $privilege['privilege'];
-            foreach($flat[$privilege['privilege']]['aggregates'] as $subPriv) {
-                if (!in_array($subPriv, $collected2)) 
-                    $collected2[] = $subPriv;
-            }
-
-        }
-
-        return $collected2;
-
-    }
-
-    /**
-     * Sets up the plugin
-     *
-     * This method is automatically called by the server class.
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @return void
-     */
-    public function initialize(Sabre_DAV_Server $server) {
-
-        $this->server = $server;
-        $server->subscribeEvent('beforeGetProperties',array($this,'beforeGetProperties'));
-
-        $server->subscribeEvent('beforeMethod', array($this,'beforeMethod'),20);
-        $server->subscribeEvent('beforeBind', array($this,'beforeBind'),20);
-        $server->subscribeEvent('beforeUnbind', array($this,'beforeUnbind'),20);
-        $server->subscribeEvent('updateProperties',array($this,'updateProperties'));
-        $server->subscribeEvent('beforeUnlock', array($this,'beforeUnlock'),20);
-        $server->subscribeEvent('report',array($this,'report'));
-        $server->subscribeEvent('unknownMethod', array($this, 'unknownMethod'));
-
-        array_push($server->protectedProperties,
-            '{DAV:}alternate-URI-set',
-            '{DAV:}principal-URL',
-            '{DAV:}group-membership',
-            '{DAV:}principal-collection-set',
-            '{DAV:}current-user-principal',
-            '{DAV:}supported-privilege-set',
-            '{DAV:}current-user-privilege-set',
-            '{DAV:}acl',
-            '{DAV:}acl-restrictions',
-            '{DAV:}inherited-acl-set',
-            '{DAV:}owner',
-            '{DAV:}group'
-        );
-
-        // Automatically mapping nodes implementing IPrincipal to the 
-        // {DAV:}principal resourcetype.
-        $server->resourceTypeMapping['Sabre_DAVACL_IPrincipal'] = '{DAV:}principal';
-
-        // Mapping the group-member-set property to the HrefList property 
-        // class.
-        $server->propertyMap['{DAV:}group-member-set'] = 'Sabre_DAV_Property_HrefList';
-
-    }
-
-
-    /* {{{ Event handlers */
-
-    /**
-     * Triggered before any method is handled 
-     * 
-     * @param string $method 
-     * @param string $uri 
-     * @return void
-     */
-    public function beforeMethod($method, $uri) {
-
-        $exists = $this->server->tree->nodeExists($uri);
-
-        // If the node doesn't exists, none of these checks apply
-        if (!$exists) return;
-
-        switch($method) {
-
-            case 'GET' :
-            case 'HEAD' :
-            case 'OPTIONS' :
-                // For these 3 we only need to know if the node is readable.
-                $this->checkPrivileges($uri,'{DAV:}read');
-                break;
-
-            case 'PUT' :
-            case 'LOCK' :
-            case 'UNLOCK' : 
-                // This method requires the write-content priv if the node 
-                // already exists, and bind on the parent if the node is being 
-                // created. 
-                // The bind privilege is handled in the beforeBind event. 
-                $this->checkPrivileges($uri,'{DAV:}write-content');
-                break;
-            
-
-            case 'PROPPATCH' :
-                $this->checkPrivileges($uri,'{DAV:}write-properties');
-                break;
-
-            case 'ACL' :
-                $this->checkPrivileges($uri,'{DAV:}write-acl');
-                break;
-
-            case 'COPY' :
-            case 'MOVE' :
-                // Copy requires read privileges on the entire source tree.
-                // If the target exists write-content normally needs to be 
-                // checked, however, we're deleting the node beforehand and 
-                // creating a new one after, so this is handled by the 
-                // beforeUnbind event.
-                // 
-                // The creation of the new node is handled by the beforeBind 
-                // event.
-                //
-                // If MOVE is used beforeUnbind will also be used to check if 
-                // the sourcenode can be deleted. 
-                $this->checkPrivileges($uri,'{DAV:}read',self::R_RECURSIVE);
-
-                break;
-
-        }
-
-    }
-
-    /**
-     * Triggered before a new node is created.
-     * 
-     * This allows us to check permissions for any operation that creates a
-     * new node, such as PUT, MKCOL, MKCALENDAR, LOCK, COPY and MOVE.
-     * 
-     * @param string $uri 
-     * @return void
-     */
-    public function beforeBind($uri) {
-
-        list($parentUri,$nodeName) = Sabre_DAV_URLUtil::splitPath($uri);
-        $this->checkPrivileges($parentUri,'{DAV:}bind');
-
-    }
-
-    /**
-     * Triggered before a node is deleted 
-     * 
-     * This allows us to check permissions for any operation that will delete 
-     * an existing node. 
-     * 
-     * @param string $uri 
-     * @return void
-     */
-    public function beforeUnbind($uri) {
-
-        list($parentUri,$nodeName) = Sabre_DAV_URLUtil::splitPath($uri);
-        $this->checkPrivileges($parentUri,'{DAV:}unbind',self::R_RECURSIVEPARENTS);
-
-    }
-
-    /**
-     * Triggered before a node is unlocked. 
-     * 
-     * @param string $uri 
-     * @param Sabre_DAV_Locks_LockInfo $lock
-     * @TODO: not yet implemented 
-     * @return void
-     */
-    public function beforeUnlock($uri, Sabre_DAV_Locks_LockInfo $lock) {
-           
-
-    }
-
-    /**
-     * Triggered before properties are looked up in specific nodes. 
-     * 
-     * @param string $uri 
-     * @param Sabre_DAV_INode $node 
-     * @param array $requestedProperties 
-     * @param array $returnedProperties
-     * @TODO really should be broken into multiple methods, or even a class. 
-     * @return void
-     */
-    public function beforeGetProperties($uri, Sabre_DAV_INode $node, &$requestedProperties, &$returnedProperties) {
-
-        // Checking the read permission
-        if (!$this->checkPrivileges($uri,'{DAV:}read',self::R_PARENT,false)) {
-
-            // User is not allowed to read properties
-            if ($this->hideNodesFromListings) {
-                return false;
-            }
-
-            // Marking all requested properties as '403'.
-            foreach($requestedProperties as $key=>$requestedProperty) {
-                unset($requestedProperties[$key]);
-                $returnedProperties[403][$requestedProperty] = null;
-            }
-            return;
-
-        } 
-
-        /* Adding principal properties */
-        if ($node instanceof Sabre_DAVACL_IPrincipal) {
-
-            if (false !== ($index = array_search('{DAV:}alternate-URI-set', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}alternate-URI-set'] = new Sabre_DAV_Property_HrefList($node->getAlternateUriSet());
-
-            }
-            if (false !== ($index = array_search('{DAV:}principal-URL', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}principal-URL'] = new Sabre_DAV_Property_Href($node->getPrincipalUrl() . '/');
-
-            }
-            if (false !== ($index = array_search('{DAV:}group-member-set', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}group-member-set'] = new Sabre_DAV_Property_HrefList($node->getGroupMemberSet());
-
-            }
-            if (false !== ($index = array_search('{DAV:}group-membership', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}group-membership'] = new Sabre_DAV_Property_HrefList($node->getGroupMembership());
-
-            }
-
-            if (false !== ($index = array_search('{DAV:}displayname', $requestedProperties))) {
-
-                $returnedProperties[200]['{DAV:}displayname'] = $node->getDisplayName();
-
-            }
-
-        }
-        if (false !== ($index = array_search('{DAV:}principal-collection-set', $requestedProperties))) {
-
-            unset($requestedProperties[$index]);
-            $val = $this->principalCollectionSet;
-            // Ensuring all collections end with a slash
-            foreach($val as $k=>$v) $val[$k] = $v . '/';
-            $returnedProperties[200]['{DAV:}principal-collection-set'] = new Sabre_DAV_Property_HrefList($val);
-
-        }
-        if (false !== ($index = array_search('{DAV:}current-user-principal', $requestedProperties))) {
-
-            unset($requestedProperties[$index]);
-            if ($url = $this->getCurrentUserPrincipal()) {
-                $returnedProperties[200]['{DAV:}current-user-principal'] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::HREF, $url . '/');
-            } else {
-                $returnedProperties[200]['{DAV:}current-user-principal'] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::UNAUTHENTICATED);
-            }
-
-        }
-        if (false !== ($index = array_search('{DAV:}supported-privilege-set', $requestedProperties))) {
-
-            unset($requestedProperties[$index]);
-            $returnedProperties[200]['{DAV:}supported-privilege-set'] = new Sabre_DAVACL_Property_SupportedPrivilegeSet($this->getSupportedPrivilegeSet());
-
-        }
-        if (false !== ($index = array_search('{DAV:}current-user-privilege-set', $requestedProperties))) {
-
-            if (!$this->checkPrivileges($uri, '{DAV:}read-current-user-privilege-set', self::R_PARENT, false)) {
-                $returnedProperties[403]['{DAV:}current-user-privilege-set'] = null;
-                unset($requestedProperties[$index]);
-            } else {
-                $val = $this->getCurrentUserPrivilegeSet($node);
-                if (!is_null($val)) {
-                    unset($requestedProperties[$index]);
-                    $returnedProperties[200]['{DAV:}current-user-privilege-set'] = new Sabre_DAVACL_Property_CurrentUserPrivilegeSet($val);
-                }
-            }
-
-        }
-
-        /* The ACL property contains all the permissions */
-        if (false !== ($index = array_search('{DAV:}acl', $requestedProperties))) {
-
-            if (!$this->checkPrivileges($uri, '{DAV:}read-acl', self::R_PARENT, false)) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[403]['{DAV:}acl'] = null;
-
-            } else {
-
-                $acl = $this->getACL($node);
-                if (!is_null($acl)) {
-                    unset($requestedProperties[$index]);
-                    $returnedProperties[200]['{DAV:}acl'] = new Sabre_DAVACL_Property_Acl($this->getACL($node));
-                }
-
-            }
-
-        }
-
-    }
-
-    /**
-     * This method intercepts PROPPATCH methods and make sure the 
-     * group-member-set is updated correctly. 
-     * 
-     * @param array $propertyDelta 
-     * @param array $result 
-     * @param Sabre_DAV_INode $node 
-     * @return void
-     */
-    public function updateProperties(&$propertyDelta, &$result, Sabre_DAV_INode $node) {
-
-        if (!array_key_exists('{DAV:}group-member-set', $propertyDelta))
-            return;
-
-        if (is_null($propertyDelta['{DAV:}group-member-set'])) {
-            $memberSet = array();
-        } elseif ($propertyDelta['{DAV:}group-member-set'] instanceof Sabre_DAV_Property_HrefList) {
-            $memberSet = $propertyDelta['{DAV:}group-member-set']->getHrefs();
-        } else {
-            throw new Sabre_DAV_Exception('The group-member-set property MUST be an instance of Sabre_DAV_Property_HrefList or null');
-        }
-
-        if (!($node instanceof Sabre_DAVACL_IPrincipal)) {
-            $result[403]['{DAV:}group-member-set'] = null;
-            unset($propertyDelta['{DAV:}group-member-set']);
-
-            // Returning false will stop the updateProperties process
-            return false;
-        }
-
-        $node->setGroupMemberSet($memberSet);
-        
-        $result[200]['{DAV:}group-member-set'] = null;
-        unset($propertyDelta['{DAV:}group-member-set']);
-
-    }
-
-    /**
-     * This method handels HTTP REPORT requests 
-     * 
-     * @param string $reportName 
-     * @param DOMNode $dom 
-     * @return void
-     */
-    public function report($reportName, $dom) {
-
-        switch($reportName) {
-
-            case '{DAV:}principal-property-search' :
-                $this->principalPropertySearchReport($dom);
-                return false;
-            case '{DAV:}principal-search-property-set' :
-                $this->principalSearchPropertySetReport($dom);
-                return false; 
-            case '{DAV:}expand-property' :
-                $this->expandPropertyReport($dom);
-                return false;
-
-        }
-
-    }
-
-    /**
-     * This event is triggered for any HTTP method that is not known by the 
-     * webserver. 
-     *
-     * @param string $method 
-     * @param string $uri 
-     * @return void
-     */
-    public function unknownMethod($method, $uri) {
-
-        if ($method!=='ACL') return;
-
-        $this->httpACL($uri);
-        return false;
-
-    }
-
-    /**
-     * This method is responsible for handling the 'ACL' event.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function httpACL($uri) { 
-
-        $body = $this->server->httpRequest->getBody(true);
-        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
-
-        $newAcl = 
-            Sabre_DAVACL_Property_Acl::unserialize($dom->firstChild)
-            ->getPrivileges();
-
-        // Normalizing urls
-        foreach($newAcl as $k=>$newAce) {
-            $newAcl[$k]['principal'] = $this->server->calculateUri($newAce['principal']);
-        }
-
-        $node = $this->server->tree->getNodeForPath($uri);
-
-        if (!($node instanceof Sabre_DAVACL_IACL)) {
-            throw new Sabre_DAV_Exception_MethodNotAllowed('This node does not support the ACL method');
-        }
-
-        $oldAcl = $this->getACL($node);
-
-        $supportedPrivileges = $this->getFlatPrivilegeSet(); 
-
-        /* Checking if protected principals from the existing principal set are 
-           not overwritten. */
-        foreach($oldAcl as $k=>$oldAce) {
-
-            if (!isset($oldAce['protected']) || !$oldAce['protected']) continue; 
-
-            $found = false;
-            foreach($newAcl as $newAce) {
-                if (
-                    $newAce['privilege'] === $oldAce['privilege'] &&
-                    $newAce['principal'] === $oldAce['principal'] &&
-                    $newAce['protected']
-                ) 
-                $found = true;
-            }
-
-            if (!$found) 
-                throw new Sabre_DAVACL_Exception_AceConflict('This resource contained a protected {DAV:}ace, but this privilege did not occur in the ACL request');
-
-        }
-
-        foreach($newAcl as $k=>$newAce) {
-
-            // Do we recognize the privilege
-            if (!isset($supportedPrivileges[$newAce['privilege']])) {
-                throw new Sabre_DAVACL_Exception_NotSupportedPrivilege('The privilege you specified (' . $newAce['privilege'] . ') is not recognized by this server');
-            }
-
-            if ($supportedPrivileges[$newAce['privilege']]['abstract']) {
-                throw new Sabre_DAVACL_Exception_NoAbstract('The privilege you specified (' . $newAce['privilege'] . ') is an abstract privilege');
-            }
-
-            // Looking up the principal
-            try {
-                $principal = $this->server->tree->getNodeForPath($newAce['principal']);
-            } catch (Sabre_DAV_Exception_FileNotFound $e) {
-                throw new Sabre_DAVACL_Exception_NotRecognizedPrincipal('The specified principal (' . $newAce['principal'] . ') does not exist');
-            }
-            if (!($principal instanceof Sabre_DAVACL_IPrincipal)) {
-                throw new Sabre_DAVACL_Exception_NotRecognizedPrincipal('The specified uri (' . $newAce['principal'] . ') is not a principal');
-            } 
-
-        }
-        $node->setACL($newAcl);
-
-    }
-
-    /* }}} */
-
-    /* Reports {{{ */
-
-    /**
-     * The expand-property report is defined in RFC3253 section 3-8. 
-     *
-     * This report is very similar to a standard PROPFIND. The difference is
-     * that it has the additional ability to look at properties containing a
-     * {DAV:}href element, follow that property and grab additional elements
-     * there.
-     *
-     * Other rfc's, such as ACL rely on this report, so it made sense to put
-     * it in this plugin.
-     *
-     * @param DOMElement $dom 
-     * @return void
-     */
-    protected function expandPropertyReport($dom) {
-
-        $requestedProperties = $this->parseExpandPropertyReportRequest($dom->firstChild->firstChild);
-        $depth = $this->server->getHTTPDepth(0);
-        $requestUri = $this->server->getRequestUri();
-
-        $result = $this->expandProperties($requestUri,$requestedProperties,$depth);
-
-        $dom = new DOMDocument('1.0','utf-8');
-        $dom->formatOutput = true;
-        $multiStatus = $dom->createElement('d:multistatus');
-        $dom->appendChild($multiStatus);
-
-        // Adding in default namespaces
-        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
-
-            $multiStatus->setAttribute('xmlns:' . $prefix,$namespace);
-
-        }
-
-        foreach($result as $response) {
-            $response->serialize($this->server, $multiStatus);
-        }
-
-        $xml = $dom->saveXML();
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->sendBody($xml);
-
-    }
-
-    /**
-     * This method is used by expandPropertyReport to parse
-     * out the entire HTTP request.
-     * 
-     * @param DOMElement $node 
-     * @return array 
-     */
-    protected function parseExpandPropertyReportRequest($node) {
-
-        $requestedProperties = array();
-        do {
-
-            if (Sabre_DAV_XMLUtil::toClarkNotation($node)!=='{DAV:}property') continue;
-                
-            if ($node->firstChild) {
-                
-                $children = $this->parseExpandPropertyReportRequest($node->firstChild);
-
-            } else {
-
-                $children = array();
-
-            }
-
-            $namespace = $node->getAttribute('namespace');
-            if (!$namespace) $namespace = 'DAV:';
-
-            $propName = '{'.$namespace.'}' . $node->getAttribute('name');
-            $requestedProperties[$propName] = $children; 
-
-        } while ($node = $node->nextSibling);
-
-        return $requestedProperties;
-
-    }
-
-    /**
-     * This method expands all the properties and returns
-     * a list with property values
-     *
-     * @param array $path
-     * @param array $requestedProperties the list of required properties
-     * @param array $depth
-     */
-    protected function expandProperties($path,array $requestedProperties,$depth) { 
-
-        $foundProperties = $this->server->getPropertiesForPath($path,array_keys($requestedProperties),$depth);
-
-        $result = array();
-
-        foreach($foundProperties as $node) {
-
-            foreach($requestedProperties as $propertyName=>$childRequestedProperties) {
-
-                // We're only traversing if sub-properties were requested
-                if(count($childRequestedProperties)===0) continue;
-                
-                // We only have to do the expansion if the property was found
-                // and it contains an href element.
-                if (!array_key_exists($propertyName,$node[200])) continue;
-
-                if ($node[200][$propertyName] instanceof Sabre_DAV_Property_IHref) {
-                    $hrefs = array($node[200][$propertyName]->getHref());
-                } elseif ($node[200][$propertyName] instanceof Sabre_DAV_Property_HrefList) {
-                    $hrefs = $node[200][$propertyName]->getHrefs();
-                }
-
-                $childProps = array();
-                foreach($hrefs as $href) {
-                    $childProps = array_merge($childProps, $this->expandProperties($href,$childRequestedProperties,0));
-                }
-                $node[200][$propertyName] = new Sabre_DAV_Property_ResponseList($childProps);
-
-            }
-            $result[] = new Sabre_DAV_Property_Response($path, $node);
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * principalSearchPropertySetReport
-     *
-     * This method responsible for handing the 
-     * {DAV:}principal-search-property-set report. This report returns a list
-     * of properties the client may search on, using the
-     * {DAV:}principal-property-search report.
-     * 
-     * @param DOMDocument $dom 
-     * @return void
-     */
-    protected function principalSearchPropertySetReport(DOMDocument $dom) {
-
-        $searchProperties = array(
-            '{DAV:}displayname' => 'display name'
-        );
-
-        $httpDepth = $this->server->getHTTPDepth(0);
-        if ($httpDepth!==0) {
-            throw new Sabre_DAV_Exception_BadRequest('This report is only defined when Depth: 0');
-        }
-        
-        if ($dom->firstChild->hasChildNodes()) 
-            throw new Sabre_DAV_Exception_BadRequest('The principal-search-property-set report element is not allowed to have child elements'); 
-
-        $dom = new DOMDocument('1.0','utf-8');
-        $dom->formatOutput = true;
-        $root = $dom->createElement('d:principal-search-property-set');
-        $dom->appendChild($root);
-        // Adding in default namespaces
-        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
-
-            $root->setAttribute('xmlns:' . $prefix,$namespace);
-
-        }
-
-        $nsList = $this->server->xmlNamespaces; 
-
-        foreach($searchProperties as $propertyName=>$description) {
-
-            $psp = $dom->createElement('d:principal-search-property');
-            $root->appendChild($psp);
-
-            $prop = $dom->createElement('d:prop');
-            $psp->appendChild($prop);
-  
-            $propName = null;
-            preg_match('/^{([^}]*)}(.*)$/',$propertyName,$propName);
-
-            $currentProperty = $dom->createElement($nsList[$propName[1]] . ':' . $propName[2]);
-            $prop->appendChild($currentProperty);
-
-            $descriptionElem = $dom->createElement('d:description');
-            $descriptionElem->setAttribute('xml:lang','en');
-            $descriptionElem->appendChild($dom->createTextNode($description));
-            $psp->appendChild($descriptionElem);
-
-
-        }
-
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->sendBody($dom->saveXML());
-
-    }
-
-    /**
-     * principalPropertySearchReport
-     *
-     * This method is reponsible for handing the 
-     * {DAV:}principal-property-search report. This report can be used for 
-     * clients to search for groups of principals, based on the value of one
-     * or more properties.
-     * 
-     * @param DOMDocument $dom 
-     * @return void
-     */
-    protected function principalPropertySearchReport(DOMDocument $dom) {
-
-        $searchableProperties = array(
-            '{DAV:}displayname' => 'display name'
-
-        );
-
-        list($searchProperties, $requestedProperties, $applyToPrincipalCollectionSet) = $this->parsePrincipalPropertySearchReportRequest($dom);
-
-        $result = array();
-
-        if ($applyToPrincipalCollectionSet) {
-            $uris = array();
-        } else {
-            $uris = array($this->server->getRequestUri());
-        }
-
-        $lookupResults = array();
-        foreach($uris as $uri) {
-
-            $p = array_keys($searchProperties);
-            $p[] = '{DAV:}resourcetype';
-            $r = $this->server->getPropertiesForPath($uri, $p, 1);
-
-            // The first item in the results is the parent, so we get rid of it.
-            array_shift($r);
-            $lookupResults = array_merge($lookupResults, $r);
-        } 
-
-        $matches = array();
-
-        foreach($lookupResults as $lookupResult) {
-
-            // We're only looking for principals 
-            if (!isset($lookupResult[200]['{DAV:}resourcetype']) || 
-                (!($lookupResult[200]['{DAV:}resourcetype'] instanceof Sabre_DAV_Property_ResourceType)) ||
-                !$lookupResult[200]['{DAV:}resourcetype']->is('{DAV:}principal')) continue;
-
-            foreach($searchProperties as $searchProperty=>$searchValue) {
-                if (!isset($searchableProperties[$searchProperty])) {
-                    // If a property is not 'searchable', the spec dictates 
-                    // this is not a match. 
-                    continue;
-                }
-
-                if (isset($lookupResult[200][$searchProperty]) &&
-                    mb_stripos($lookupResult[200][$searchProperty], $searchValue, 0, 'UTF-8')!==false) {
-                        $matches[] = $lookupResult['href'];
-                }
-
-            }
-
-        }
-
-        $matchProperties = array();
-
-        foreach($matches as $match) {
-            
-           list($result) = $this->server->getPropertiesForPath($match, $requestedProperties, 0);
-           $matchProperties[] = $result;
-
-        }
-
-        $xml = $this->server->generateMultiStatus($matchProperties);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->sendBody($xml);
-
-    }
-
-    /**
-     * parsePrincipalPropertySearchReportRequest
-     *
-     * This method parses the request body from a
-     * {DAV:}principal-property-search report.
-     *
-     * This method returns an array with two elements:
-     *  1. an array with properties to search on, and their values
-     *  2. a list of propertyvalues that should be returned for the request.
-     * 
-     * @param DOMDocument $dom 
-     * @return array 
-     */
-    protected function parsePrincipalPropertySearchReportRequest($dom) {
-
-        $httpDepth = $this->server->getHTTPDepth(0);
-        if ($httpDepth!==0) {
-            throw new Sabre_DAV_Exception_BadRequest('This report is only defined when Depth: 0');
-        }
-
-        $searchProperties = array();
-
-        $applyToPrincipalCollectionSet = false;
-
-        // Parsing the search request
-        foreach($dom->firstChild->childNodes as $searchNode) {
-
-            if (Sabre_DAV_XMLUtil::toClarkNotation($searchNode) == '{DAV:}apply-to-principal-collection-set')
-                $applyToPrincipalCollectionSet = true;
-
-            if (Sabre_DAV_XMLUtil::toClarkNotation($searchNode)!=='{DAV:}property-search')
-                continue;
-
-            $propertyName = null;
-            $propertyValue = null;
-
-            foreach($searchNode->childNodes as $childNode) {
-
-                switch(Sabre_DAV_XMLUtil::toClarkNotation($childNode)) {
-
-                    case '{DAV:}prop' :
-                        $property = Sabre_DAV_XMLUtil::parseProperties($searchNode);
-                        reset($property); 
-                        $propertyName = key($property);
-                        break;
-
-                    case '{DAV:}match' :
-                        $propertyValue = $childNode->textContent;
-                        break;
-
-                }
-
-
-            }
-
-            if (is_null($propertyName) || is_null($propertyValue))
-                throw new Sabre_DAV_Exception_BadRequest('Invalid search request. propertyname: ' . $propertyName . '. propertvvalue: ' . $propertyValue);
-
-            $searchProperties[$propertyName] = $propertyValue;
-
-        }
-
-        return array($searchProperties, array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild)), $applyToPrincipalCollectionSet);
-
-    }
-
-
-    /* }}} */
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Principal.php b/3rdparty/Sabre/DAVACL/Principal.php
deleted file mode 100644
index 790603c900f..00000000000
--- a/3rdparty/Sabre/DAVACL/Principal.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?php
-
-/**
- * Principal class
- *
- * This class is a representation of a simple principal
- * 
- * Many WebDAV specs require a user to show up in the directory 
- * structure. 
- *
- * This principal also has basic ACL settings, only allowing the principal
- * access it's own principal. 
- * 
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Principal extends Sabre_DAV_Node implements Sabre_DAVACL_IPrincipal, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
-
-    /**
-     * Struct with principal information.
-     *
-     * @var array 
-     */
-    protected $principalProperties;
-
-    /**
-     * Principal backend 
-     * 
-     * @var Sabre_DAVACL_IPrincipalBackend 
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the principal object 
-     *
-     * @param array $principalProperties
-     */
-    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalProperties = array()) {
-
-        if (!isset($principalProperties['uri'])) {
-            throw new Sabre_DAV_Exception('The principal properties must at least contain the \'uri\' key');
-        }
-        $this->principalBackend = $principalBackend;
-        $this->principalProperties = $principalProperties;
-
-    }
-
-    /**
-     * Returns the full principal url 
-     * 
-     * @return string 
-     */
-    public function getPrincipalUrl() {
-
-        return $this->principalProperties['uri'];
-
-    } 
-
-    /**
-     * Returns a list of altenative urls for a principal
-     * 
-     * This can for example be an email address, or ldap url.
-     * 
-     * @return array 
-     */
-    public function getAlternateUriSet() {
-
-        $uris = array();
-        if (isset($this->principalProperties['{DAV:}alternate-URI-set'])) {
-
-            $uris = $this->principalProperties['{DAV:}alternate-URI-set'];
-
-        }
-
-        if (isset($this->principalProperties['{http://sabredav.org/ns}email-address'])) {
-            $uris[] = 'mailto:' . $this->principalProperties['{http://sabredav.org/ns}email-address'];
-        }
-
-        return array_unique($uris); 
-
-    }
-
-    /**
-     * Returns the list of group members
-     * 
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group. 
-     * 
-     * @return array
-     */
-    public function getGroupMemberSet() {
-
-        return $this->principalBackend->getGroupMemberSet($this->principalProperties['uri']);
-
-    }
-
-    /**
-     * Returns the list of groups this principal is member of
-     * 
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members. 
-     * 
-     * @return array 
-     */
-    public function getGroupMembership() {
-
-        return $this->principalBackend->getGroupMemberShip($this->principalProperties['uri']);
-
-    }
-
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     * 
-     * This method should throw an exception if the members could not be set. 
-     * 
-     * @param array $principals 
-     * @return void 
-     */
-    public function setGroupMemberSet(array $groupMembers) {
-
-        $this->principalBackend->setGroupMemberSet($this->principalProperties['uri'], $groupMembers);
-
-    }
-
-
-    /**
-     * Returns this principals name.
-     * 
-     * @return string 
-     */
-    public function getName() {
-
-        $uri = $this->principalProperties['uri'];
-        list(, $name) = Sabre_DAV_URLUtil::splitPath($uri);
-
-        return $name;
-
-    }
-
-    /**
-     * Returns the name of the user 
-     * 
-     * @return void
-     */
-    public function getDisplayName() {
-
-        if (isset($this->principalProperties['{DAV:}displayname'])) {
-            return $this->principalProperties['{DAV:}displayname'];
-        } else {
-            return $this->getName();
-        }
-
-    }
-
-    /**
-     * Returns a list of properties 
-     * 
-     * @param array $requestedProperties 
-     * @return void
-     */
-    public function getProperties($requestedProperties) {
-
-        $newProperties = array();
-        foreach($requestedProperties as $propName) {
-            
-            if (isset($this->principalProperties[$propName])) {
-                $newProperties[$propName] = $this->principalProperties[$propName];
-            }
-
-        }
-
-        return $newProperties;
-        
-    }
-
-    /**
-     * Updates this principals properties.
-     *
-     * Currently this is not supported
-     * 
-     * @param array $properties
-     * @see Sabre_DAV_IProperties::updateProperties
-     * @return bool|array 
-     */
-    public function updateProperties($properties) {
-
-        return false;
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner 
-     * 
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalProperties['uri'];
-
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     * 
-     * @return string|null 
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to 
-     *      be updated. 
-     * 
-     * @return array 
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalProperties['uri'],
-                'protected' => true,
-            ),
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's. 
-     * 
-     * @param array $acl 
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Sabre_DAV_Exception_MethodNotAllowed('Updating ACLs is not allowed here');
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php b/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
deleted file mode 100644
index 55bd1903c9b..00000000000
--- a/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-/**
- * PDO principal backend
- *
- * This is a simple principal backend that maps exactly to the users table, as 
- * used by Sabre_DAV_Auth_Backend_PDO.
- *
- * It assumes all principals are in a single collection. The default collection 
- * is 'principals/', but this can be overriden.
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_PrincipalBackend_PDO implements Sabre_DAVACL_IPrincipalBackend {
-
-    /**
-     * pdo 
-     * 
-     * @var PDO 
-     */
-    protected $pdo;
-
-    /**
-     * PDO table name for 'principals' 
-     * 
-     * @var string 
-     */
-    protected $tableName;
-
-    /**
-     * PDO table name for 'group members' 
-     * 
-     * @var string 
-     */
-    protected $groupMembersTableName;
-
-    /**
-     * Sets up the backend.
-     * 
-     * @param PDO $pdo
-     * @param string $tableName 
-     */
-    public function __construct(PDO $pdo, $tableName = 'principals', $groupMembersTableName = 'groupmembers') {
-
-        $this->pdo = $pdo;
-        $this->tableName = $tableName;
-        $this->groupMembersTableName = $groupMembersTableName;
-
-    } 
-
-
-    /**
-     * Returns a list of principals based on a prefix.
-     *
-     * This prefix will often contain something like 'principals'. You are only 
-     * expected to return principals that are in this base path.
-     *
-     * You are expected to return at least a 'uri' for every user, you can 
-     * return any additional properties if you wish so. Common properties are:
-     *   {DAV:}displayname 
-     *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV 
-     *     field that's actualy injected in a number of other properties. If
-     *     you have an email address, use this property.
-     * 
-     * @param string $prefixPath 
-     * @return array 
-     */
-    public function getPrincipalsByPrefix($prefixPath) {
-        $result = $this->pdo->query('SELECT uri, email, displayname FROM `'. $this->tableName . '`');
-
-        $principals = array();
-
-        while($row = $result->fetch(PDO::FETCH_ASSOC)) {
-
-            // Checking if the principal is in the prefix
-            list($rowPrefix) = Sabre_DAV_URLUtil::splitPath($row['uri']);
-            if ($rowPrefix !== $prefixPath) continue;
-
-            $principals[] = array(
-                'uri' => $row['uri'],
-                '{DAV:}displayname' => $row['displayname']?$row['displayname']:basename($row['uri']),
-                '{http://sabredav.org/ns}email-address' => $row['email'],
-            );
-
-        }
-
-        return $principals;
-
-    }
-
-    /**
-     * Returns a specific principal, specified by it's path.
-     * The returned structure should be the exact same as from 
-     * getPrincipalsByPrefix. 
-     * 
-     * @param string $path 
-     * @return array 
-     */
-    public function getPrincipalByPath($path) {
-
-        $stmt = $this->pdo->prepare('SELECT id, uri, email, displayname FROM `'.$this->tableName.'` WHERE uri = ?');
-        $stmt->execute(array($path));
-
-        $users = array();
-
-        $row = $stmt->fetch(PDO::FETCH_ASSOC);
-        if (!$row) return;
-
-        return array(
-            'id'  => $row['id'],
-            'uri' => $row['uri'],
-            '{DAV:}displayname' => $row['displayname']?$row['displayname']:basename($row['uri']),
-            '{http://sabredav.org/ns}email-address' => $row['email'],
-        );
-
-    }
-
-    /**
-     * Returns the list of members for a group-principal 
-     * 
-     * @param string $principal 
-     * @return array 
-     */
-    public function getGroupMemberSet($principal) {
-
-        $principal = $this->getPrincipalByPath($principal);
-        if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
-
-        $stmt = $this->pdo->prepare('SELECT principals.uri as uri FROM `'.$this->groupMembersTableName.'` AS groupmembers LEFT JOIN `'.$this->tableName.'` AS principals ON groupmembers.member_id = principals.id WHERE groupmembers.principal_id = ?');
-        $stmt->execute(array($principal['id']));
-
-        $result = array();
-        while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $result[] = $row['uri'];
-        }
-        return $result;
-    
-    }
-
-    /**
-     * Returns the list of groups a principal is a member of 
-     * 
-     * @param string $principal 
-     * @return array 
-     */
-    public function getGroupMembership($principal) {
-
-        $principal = $this->getPrincipalByPath($principal);
-        if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
-
-        $stmt = $this->pdo->prepare('SELECT principals.uri as uri FROM `'.$this->groupMembersTableName.'` AS groupmembers LEFT JOIN `'.$this->tableName.'` AS principals ON groupmembers.principal_id = principals.id WHERE groupmembers.member_id = ?');
-        $stmt->execute(array($principal['id']));
-
-        $result = array();
-        while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $result[] = $row['uri'];
-        }
-        return $result;
-
-    }
-
-    /**
-     * Updates the list of group members for a group principal.
-     *
-     * The principals should be passed as a list of uri's. 
-     * 
-     * @param string $principal 
-     * @param array $members 
-     * @return void
-     */
-    public function setGroupMemberSet($principal, array $members) {
-
-        // Grabbing the list of principal id's.
-        $stmt = $this->pdo->prepare('SELECT id, uri FROM `'.$this->tableName.'` WHERE uri IN (? ' . str_repeat(', ? ', count($members)) . ');');
-        $stmt->execute(array_merge(array($principal), $members));
-
-        $memberIds = array();
-        $principalId = null;
-
-        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            if ($row['uri'] == $principal) {
-                $principalId = $row['id'];
-            } else {
-                $memberIds[] = $row['id'];
-            }
-        }
-        if (!$principalId) throw new Sabre_DAV_Exception('Principal not found');
-
-        // Wiping out old members
-        $stmt = $this->pdo->prepare('DELETE FROM `'.$this->groupMembersTableName.'` WHERE principal_id = ?;');
-        $stmt->execute(array($principalId));
-
-        foreach($memberIds as $memberId) {
-
-            $stmt = $this->pdo->prepare('INSERT INTO `'.$this->groupMembersTableName.'` (principal_id, member_id) VALUES (?, ?);');
-            $stmt->execute(array($principalId, $memberId));
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/PrincipalCollection.php b/3rdparty/Sabre/DAVACL/PrincipalCollection.php
deleted file mode 100644
index 4d22bf8aa75..00000000000
--- a/3rdparty/Sabre/DAVACL/PrincipalCollection.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Principals Collection
- *
- * This collection represents a list of users. It uses
- * Sabre_DAV_Auth_Backend to determine which users are available on the list.
- *
- * The users are instances of Sabre_DAV_Auth_Principal
- * 
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_PrincipalCollection extends Sabre_DAVACL_AbstractPrincipalCollection {
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     * 
-     * @param array $principal 
-     * @return Sabre_DAV_INode 
-     */
-    public function getChildForPrincipal(array $principal) {
-
-        return new Sabre_DAVACL_Principal($this->principalBackend, $principal);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Property/Acl.php b/3rdparty/Sabre/DAVACL/Property/Acl.php
deleted file mode 100644
index e41e7411310..00000000000
--- a/3rdparty/Sabre/DAVACL/Property/Acl.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-/**
- * This class represents the {DAV:}acl property 
- * 
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Property_Acl extends Sabre_DAV_Property {
-
-    /**
-     * List of privileges 
-     * 
-     * @var array 
-     */
-    private $privileges;
-
-    /**
-     * Wether or not the server base url is required to be prefixed when 
-     * serializing the property. 
-     * 
-     * @var boolean 
-     */
-    private $prefixBaseUrl;
-
-    /**
-     * Constructor
-     *
-     * This object requires a structure similar to the return value from 
-     * Sabre_DAVACL_Plugin::getACL().
-     *
-     * Each privilege is a an array with at least a 'privilege' property, and a 
-     * 'principal' property. A privilege may have a 'protected' property as 
-     * well. 
-     *
-     * The prefixBaseUrl should be set to false, if the supplied principal urls 
-     * are already full urls. If this is kept to true, the servers base url 
-     * will automatically be prefixed. 
-     *
-     * @param bool $prefixBaseUrl 
-     * @param array $privileges 
-     */
-    public function __construct(array $privileges, $prefixBaseUrl = true) {
-
-        $this->privileges = $privileges;
-        $this->prefixBaseUrl = $prefixBaseUrl;
-
-    }
-
-    /**
-     * Returns the list of privileges for this property 
-     * 
-     * @return array 
-     */
-    public function getPrivileges() {
-
-        return $this->privileges;
-
-    }
-
-    /**
-     * Serializes the property into a DOMElement 
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $node 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-        foreach($this->privileges as $ace) {
-
-            $this->serializeAce($doc, $node, $ace, $server);
-
-        }
-
-    }
-
-    /**
-     * Unserializes the {DAV:}acl xml element. 
-     * 
-     * @param DOMElement $dom 
-     * @return Sabre_DAVACL_Property_Acl 
-     */
-    static public function unserialize(DOMElement $dom) {
-
-        $privileges = array();
-        $xaces = $dom->getElementsByTagNameNS('urn:DAV','ace');
-        for($ii=0; $ii < $xaces->length; $ii++) {
-
-            $xace = $xaces->item($ii);
-            $principal = $xace->getElementsByTagNameNS('urn:DAV','principal');
-            if ($principal->length !== 1) {
-                throw new Sabre_DAV_Exception_BadRequest('Each {DAV:}ace element must have one {DAV:}principal element');
-            }
-            $principal = Sabre_DAVACL_Property_Principal::unserialize($principal->item(0));
-
-            if ($principal->getType()!==Sabre_DAVACL_Property_Principal::HREF) {
-                throw new Sabre_DAV_Exception_NotImplemented('Currently only uri based principals are support, {DAV:}all, {DAV:}unauthenticated and {DAV:}authenticated are not implemented yet');
-            }
-
-            $principal = $principal->getHref();
-            $protected = false;
-
-            if ($xace->getElementsByTagNameNS('urn:DAV','protected')->length > 0) {
-                $protected = true;
-            }
-
-            $grants = $xace->getElementsByTagNameNS('urn:DAV','grant');
-            if ($grants->length < 1) {
-                throw new Sabre_DAV_Exception_NotImplemented('Every {DAV:}ace element must have a {DAV:}grant element. {DAV:}deny is not yet supported');
-            }
-            $grant = $grants->item(0);
-
-            $xprivs = $grant->getElementsByTagNameNS('urn:DAV','privilege');
-            for($jj=0; $jj<$xprivs->length; $jj++) {
-
-                $xpriv = $xprivs->item($jj);
-
-                $privilegeName = null;
-
-                for ($kk=0;$kk<$xpriv->childNodes->length;$kk++) {
-
-                    $childNode = $xpriv->childNodes->item($kk);
-                    if ($t = Sabre_DAV_XMLUtil::toClarkNotation($childNode)) {
-                        $privilegeName = $t;
-                        break;
-                    }
-                }
-                if (is_null($privilegeName)) {
-                    throw new Sabre_DAV_Exception_BadRequest('{DAV:}privilege elements must have a privilege element contained within them.');
-                }
-
-                $privileges[] = array(
-                    'principal' => $principal,
-                    'protected' => $protected,
-                    'privilege' => $privilegeName,
-                );
-
-            } 
-
-        }
-
-        return new self($privileges);
-
-    }
-
-    /**
-     * Serializes a single access control entry. 
-     * 
-     * @param DOMDocument $doc 
-     * @param DOMElement $node 
-     * @param array $ace
-     * @param Sabre_DAV_Server $server 
-     * @return void
-     */
-    private function serializeAce($doc,$node,$ace, $server) {
-
-        $xace  = $doc->createElementNS('DAV:','d:ace');
-        $node->appendChild($xace);
-
-        $principal = $doc->createElementNS('DAV:','d:principal');
-        $xace->appendChild($principal);
-        $principal->appendChild($doc->createElementNS('DAV:','d:href',($this->prefixBaseUrl?$server->getBaseUri():'') . $ace['principal'] . '/'));
-
-        $grant = $doc->createElementNS('DAV:','d:grant');
-        $xace->appendChild($grant);
-
-        $privParts = null;
-
-        preg_match('/^{([^}]*)}(.*)$/',$ace['privilege'],$privParts);
-
-        $xprivilege = $doc->createElementNS('DAV:','d:privilege');
-        $grant->appendChild($xprivilege);
-
-        $xprivilege->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
-
-        if (isset($ace['protected']) && $ace['protected'])
-            $xace->appendChild($doc->createElement('d:protected'));
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php b/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
deleted file mode 100644
index 72274597b31..00000000000
--- a/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * CurrentUserPrivilegeSet
- * 
- * This class represents the current-user-privilege-set property. When 
- * requested, it contain all the privileges a user has on a specific node. 
- * 
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Property_CurrentUserPrivilegeSet extends Sabre_DAV_Property {
-
-    /**
-     * List of privileges 
-     * 
-     * @var array 
-     */
-    private $privileges;
-
-    /**
-     * Creates the object
-     *
-     * Pass the privileges in clark-notation 
-     * 
-     * @param array $privileges 
-     */
-    public function __construct(array $privileges) {
-
-        $this->privileges = $privileges;
-
-    }
-
-    /**
-     * Serializes the property in the DOM 
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $node 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-        foreach($this->privileges as $privName) {
-
-            $this->serializePriv($doc,$node,$privName);
-
-        }
-
-    }
-
-    /**
-     * Serializes one privilege 
-     * 
-     * @param DOMDocument $doc 
-     * @param DOMElement $node 
-     * @param string $privName 
-     * @return void
-     */
-    protected function serializePriv($doc,$node,$privName) {
-
-        $xp  = $doc->createElementNS('DAV:','d:privilege');
-        $node->appendChild($xp);
-
-        $privParts = null;
-        preg_match('/^{([^}]*)}(.*)$/',$privName,$privParts);
-
-        $xp->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Property/Principal.php b/3rdparty/Sabre/DAVACL/Property/Principal.php
deleted file mode 100644
index dad9a3550fb..00000000000
--- a/3rdparty/Sabre/DAVACL/Property/Principal.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-/**
- * Principal property
- *
- * The principal property represents a principal from RFC3744 (ACL).
- * The property can be used to specify a principal or pseudo principals. 
- *
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Property_Principal extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
-
-    /**
-     * To specify a not-logged-in user, use the UNAUTHENTICTED principal
-     */
-    const UNAUTHENTICATED = 1;
-
-    /**
-     * To specify any principal that is logged in, use AUTHENTICATED
-     */
-    const AUTHENTICATED = 2;
-
-    /**
-     * Specific princpals can be specified with the HREF
-     */
-    const HREF = 3;
-
-    /**
-     * Principal-type
-     *
-     * Must be one of the UNAUTHENTICATED, AUTHENTICATED or HREF constants.
-     * 
-     * @var int 
-     */
-    private $type;
-
-    /**
-     * Url to principal
-     *
-     * This value is only used for the HREF principal type.
-     * 
-     * @var string 
-     */
-    private $href;
-
-    /**
-     * Creates the property.
-     *
-     * The 'type' argument must be one of the type constants defined in this class.
-     *
-     * 'href' is only required for the HREF type.
-     * 
-     * @param int $type 
-     * @param string $href 
-     * @return void
-     */
-    public function __construct($type, $href = null) {
-
-        $this->type = $type;
-
-        if ($type===self::HREF && is_null($href)) {
-            throw new Sabre_DAV_Exception('The href argument must be specified for the HREF principal type.');
-        }
-        $this->href = $href;
-
-    }
-
-    /**
-     * Returns the principal type 
-     * 
-     * @return int 
-     */
-    public function getType() {
-
-        return $this->type;
-
-    }
-
-    /**
-     * Returns the principal uri. 
-     * 
-     * @return string
-     */
-    public function getHref() {
-
-        return $this->href;
-
-    }
-
-    /**
-     * Serializes the property into a DOMElement. 
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $node 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server, DOMElement $node) {
-
-        $prefix = $server->xmlNamespaces['DAV:'];
-        switch($this->type) {
-
-            case self::UNAUTHENTICATED :
-                $node->appendChild(
-                    $node->ownerDocument->createElement($prefix . ':unauthenticated')
-                );
-                break;
-            case self::AUTHENTICATED :
-                $node->appendChild(
-                    $node->ownerDocument->createElement($prefix . ':authenticated')
-                );
-                break;
-            case self::HREF :
-                $href = $node->ownerDocument->createElement($prefix . ':href');
-                $href->nodeValue = $server->getBaseUri() . $this->href;
-                $node->appendChild($href);
-                break;
-
-        }
-
-    }
-
-    /**
-     * Deserializes a DOM element into a property object. 
-     * 
-     * @param DOMElement $dom 
-     * @return Sabre_DAV_Property_Principal 
-     */
-    static public function unserialize(DOMElement $dom) {
-
-        $parent = $dom->firstChild;
-        while(!Sabre_DAV_XMLUtil::toClarkNotation($parent)) {
-            $parent = $parent->nextSibling;
-        }
-
-        switch(Sabre_DAV_XMLUtil::toClarkNotation($parent)) {
-
-            case '{DAV:}unauthenticated' :
-                return new self(self::UNAUTHENTICATED);
-            case '{DAV:}authenticated' :
-                return new self(self::AUTHENTICATED);
-            case '{DAV:}href':
-                return new self(self::HREF, $parent->textContent);
-            default :
-                throw new Sabre_DAV_Exception_BadRequest('Unexpected element (' . Sabre_DAV_XMLUtil::toClarkNotation($parent) . '). Could not deserialize');
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php b/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
deleted file mode 100644
index 93c3895035d..00000000000
--- a/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * SupportedPrivilegeSet property
- *
- * This property encodes the {DAV:}supported-privilege-set property, as defined 
- * in rfc3744. Please consult the rfc for details about it's structure.
- *
- * This class expects a structure like the one given from 
- * Sabre_DAVACL_Plugin::getSupportedPrivilegeSet as the argument in its 
- * constructor.
- *   
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Property_SupportedPrivilegeSet extends Sabre_DAV_Property {
-
-    /**
-     * privileges 
-     * 
-     * @var array 
-     */
-    private $privileges;
-
-    /**
-     * Constructor 
-     * 
-     * @param array $privileges 
-     */
-    public function __construct(array $privileges) {
-
-        $this->privileges = $privileges;
-
-    }
-
-    /**
-     * Serializes the property into a domdocument. 
-     * 
-     * @param Sabre_DAV_Server $server 
-     * @param DOMElement $node 
-     * @return void
-     */
-    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-        $this->serializePriv($doc, $node, $this->privileges);
-
-    }
-
-    /**
-     * Serializes a property
-     *
-     * This is a recursive function. 
-     * 
-     * @param DOMDocument $doc 
-     * @param DOMElement $node 
-     * @param array $privilege 
-     * @return void
-     */
-    private function serializePriv($doc,$node,$privilege) {
-
-        $xsp = $doc->createElementNS('DAV:','d:supported-privilege');
-        $node->appendChild($xsp);
-
-        $xp  = $doc->createElementNS('DAV:','d:privilege');
-        $xsp->appendChild($xp);
-
-        $privParts = null;
-        preg_match('/^{([^}]*)}(.*)$/',$privilege['privilege'],$privParts);
-
-        $xp->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
-
-        if (isset($privilege['abstract']) && $privilege['abstract']) {
-            $xsp->appendChild($doc->createElementNS('DAV:','d:abstract'));
-        }
-
-        if (isset($privilege['description'])) {
-            $xsp->appendChild($doc->createElementNS('DAV:','d:description',$privilege['description']));
-        }
-
-        if (isset($privilege['aggregates'])) { 
-            foreach($privilege['aggregates'] as $subPrivilege) {
-                $this->serializePriv($doc,$xsp,$subPrivilege);
-            }
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/DAVACL/Version.php b/3rdparty/Sabre/DAVACL/Version.php
deleted file mode 100644
index 124463e311e..00000000000
--- a/3rdparty/Sabre/DAVACL/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * This class contains the SabreDAV version constants.
- * 
- * @package Sabre
- * @subpackage DAVACL
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_DAVACL_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.5.2';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/HTTP/AWSAuth.php b/3rdparty/Sabre/HTTP/AWSAuth.php
deleted file mode 100644
index 5e4668cd94d..00000000000
--- a/3rdparty/Sabre/HTTP/AWSAuth.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-
-/**
- * HTTP AWS Authentication handler
- *
- * Use this class to leverage amazon's AWS authentication header
- * 
- * @package Sabre
- * @subpackage HTTP 
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_AWSAuth extends Sabre_HTTP_AbstractAuth {
-
-    /**
-     * The signature supplied by the HTTP client 
-     * 
-     * @var string 
-     */
-    private $signature = null;
-
-    /**
-     * The accesskey supplied by the HTTP client 
-     * 
-     * @var string 
-     */
-    private $accessKey = null;
-
-    /**
-     * An error code, if any
-     *
-     * This value will be filled with one of the ERR_* contants
-     * 
-     * @var int
-     */
-    public $errorCode = 0;
-
-    const ERR_NOAWSHEADER = 1;
-    const ERR_MD5CHECKSUMWRONG = 2;
-    const ERR_INVALIDDATEFORMAT = 3;
-    const ERR_REQUESTTIMESKEWED = 4;
-    const ERR_INVALIDSIGNATURE = 5;
-
-    /**
-     * Gathers all information from the headers
-     *
-     * This method needs to be called prior to anything else.
-     * 
-     * @return bool 
-     */
-    public function init() {
-
-        $authHeader = $this->httpRequest->getHeader('Authorization');
-        $authHeader = explode(' ',$authHeader);
-
-        if ($authHeader[0]!='AWS' || !isset($authHeader[1])) {
-            $this->errorCode = self::ERR_NOAWSHEADER;
-             return false;
-        }
-
-        list($this->accessKey,$this->signature) = explode(':',$authHeader[1]);
-
-        return true;
-
-    }
-
-    /**
-     * Returns the username for the request 
-     * 
-     * @return string 
-     */
-    public function getAccessKey() {
-
-        return $this->accessKey;
-
-    }
-
-    /**
-     * Validates the signature based on the secretKey
-     * 
-     * @return bool 
-     */
-    public function validate($secretKey) {
-
-        $contentMD5 = $this->httpRequest->getHeader('Content-MD5');
-
-        if ($contentMD5) {
-            // We need to validate the integrity of the request
-            $body = $this->httpRequest->getBody(true);
-            $this->httpRequest->setBody($body,true);
-           
-            if ($contentMD5!=base64_encode(md5($body,true))) {
-                // content-md5 header did not match md5 signature of body
-                $this->errorCode = self::ERR_MD5CHECKSUMWRONG;
-                return false;
-            }
-
-        }
-
-        if (!$requestDate = $this->httpRequest->getHeader('x-amz-date')) 
-            $requestDate = $this->httpRequest->getHeader('Date');
-
-        if (!$this->validateRFC2616Date($requestDate)) 
-            return false;
-
-        $amzHeaders = $this->getAmzHeaders();
-
-        $signature = base64_encode(
-            $this->hmacsha1($secretKey,
-                $this->httpRequest->getMethod() . "\n" .
-                $contentMD5 . "\n" . 
-                $this->httpRequest->getHeader('Content-type') . "\n" .
-                $requestDate . "\n" .
-                $amzHeaders . 
-                $this->httpRequest->getURI()
-            )
-        );
-
-        if ($this->signature != $signature) {
-
-            $this->errorCode = self::ERR_INVALIDSIGNATURE;
-            return false;
-
-        }
-
-        return true;
-
-    }
-
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $this->httpResponse->setHeader('WWW-Authenticate','AWS');
-        $this->httpResponse->sendStatus(401);
-
-    }
-
-    /**
-     * Makes sure the supplied value is a valid RFC2616 date.
-     *
-     * If we would just use strtotime to get a valid timestamp, we have no way of checking if a 
-     * user just supplied the word 'now' for the date header.
-     *
-     * This function also makes sure the Date header is within 15 minutes of the operating 
-     * system date, to prevent replay attacks.
-     * 
-     * @param string $dateHeader 
-     * @return bool 
-     */
-    protected function validateRFC2616Date($dateHeader) {
-
-        $date = Sabre_HTTP_Util::parseHTTPDate($dateHeader);
-
-        // Unknown format
-        if (!$date) {
-            $this->errorCode = self::ERR_INVALIDDATEFORMAT;
-            return false;
-        }
-
-        $min = new DateTime('-15 minutes');
-        $max = new DateTime('+15 minutes');
-
-        // We allow 15 minutes around the current date/time
-        if ($date > $max || $date < $min) {
-            $this->errorCode = self::ERR_REQUESTTIMESKEWED;
-            return false;
-        }
-
-        return $date;
-
-    }
-    
-    /**
-     * Returns a list of AMZ headers 
-     * 
-     * @return void
-     */
-    protected function getAmzHeaders() {
-
-        $amzHeaders = array();
-        $headers = $this->httpRequest->getHeaders();
-        foreach($headers as $headerName => $headerValue) {
-            if (strpos(strtolower($headerName),'x-amz-')===0) {
-                $amzHeaders[strtolower($headerName)] = str_replace(array("\r\n"),array(' '),$headerValue) . "\n";
-            }
-        }
-        ksort($amzHeaders);
-       
-        $headerStr = '';
-        foreach($amzHeaders as $h=>$v) {
-            $headerStr.=$h.':'.$v;
-        }
-
-        return $headerStr;
-
-    }
-
-    /**
-     * Generates an HMAC-SHA1 signature 
-     * 
-     * @param string $key 
-     * @param string $message 
-     * @return string 
-     */
-    private function hmacsha1($key, $message) {
-
-        $blocksize=64;
-        if (strlen($key)>$blocksize)
-            $key=pack('H*', sha1($key));
-        $key=str_pad($key,$blocksize,chr(0x00));
-        $ipad=str_repeat(chr(0x36),$blocksize);
-        $opad=str_repeat(chr(0x5c),$blocksize);
-        $hmac = pack('H*',sha1(($key^$opad).pack('H*',sha1(($key^$ipad).$message))));
-        return $hmac;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/HTTP/AbstractAuth.php b/3rdparty/Sabre/HTTP/AbstractAuth.php
deleted file mode 100644
index eb528f6fdee..00000000000
--- a/3rdparty/Sabre/HTTP/AbstractAuth.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * HTTP Authentication baseclass
- *
- * This class has the common functionality for BasicAuth and DigestAuth
- * 
- * @package Sabre
- * @subpackage HTTP 
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_HTTP_AbstractAuth {
-
-    /**
-     * The realm will be displayed in the dialog boxes
-     *
-     * This identifier can be changed through setRealm()
-     * 
-     * @var string
-     */
-    protected $realm = 'SabreDAV';
-
-    /**
-     * HTTP response helper 
-     * 
-     * @var Sabre_HTTP_Response 
-     */
-    protected $httpResponse;
-
-
-    /**
-     * HTTP request helper 
-     * 
-     * @var Sabre_HTTP_Request 
-     */
-    protected $httpRequest;
-
-    /**
-     * __construct 
-     * 
-     */
-    public function __construct() {
-
-        $this->httpResponse = new Sabre_HTTP_Response();
-        $this->httpRequest = new Sabre_HTTP_Request();
-
-    }
-
-    /**
-     * Sets an alternative HTTP response object 
-     * 
-     * @param Sabre_HTTP_Response $response 
-     * @return void
-     */
-    public function setHTTPResponse(Sabre_HTTP_Response $response) {
-
-        $this->httpResponse = $response;
-
-    }
-
-    /**
-     * Sets an alternative HTTP request object 
-     * 
-     * @param Sabre_HTTP_Request $request 
-     * @return void
-     */
-    public function setHTTPRequest(Sabre_HTTP_Request $request) {
-
-        $this->httpRequest = $request;
-
-    }
-
-
-    /**
-     * Sets the realm
-     *
-     * The realm is often displayed in authentication dialog boxes
-     * Commonly an application name displayed here
-     * 
-     * @param string $realm 
-     * @return void
-     */
-    public function setRealm($realm) {
-
-        $this->realm = $realm;
-
-    }
-
-    /**
-     * Returns the realm
-     *
-     * @return string 
-     */
-    public function getRealm() {
-
-        return $this->realm;
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    abstract public function requireLogin(); 
-
-}
diff --git a/3rdparty/Sabre/HTTP/BasicAuth.php b/3rdparty/Sabre/HTTP/BasicAuth.php
deleted file mode 100644
index 35c22d22dc3..00000000000
--- a/3rdparty/Sabre/HTTP/BasicAuth.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * HTTP Basic Authentication handler
- *
- * Use this class for easy http authentication setup
- * 
- * @package Sabre
- * @subpackage HTTP 
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_BasicAuth extends Sabre_HTTP_AbstractAuth {
-
-    /**
-     * Returns the supplied username and password.
-     *
-     * The returned array has two values:
-     *   * 0 - username
-     *   * 1 - password
-     *
-     * If nothing was supplied, 'false' will be returned
-     *
-     * @return mixed 
-     */
-    public function getUserPass() {
-
-        // Apache and mod_php
-        if (($user = $this->httpRequest->getRawServerValue('PHP_AUTH_USER')) && ($pass = $this->httpRequest->getRawServerValue('PHP_AUTH_PW'))) {
-
-            return array($user,$pass);
-
-        }
-
-        // Most other webservers 
-        $auth = $this->httpRequest->getHeader('Authorization');
-
-        if (!$auth) return false;
-
-        if (strpos(strtolower($auth),'basic')!==0) return false; 
-
-        return explode(':', base64_decode(substr($auth, 6)));
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $this->httpResponse->setHeader('WWW-Authenticate','Basic realm="' . $this->realm . '"');
-        $this->httpResponse->sendStatus(401);
-
-    }
-
-}
diff --git a/3rdparty/Sabre/HTTP/DigestAuth.php b/3rdparty/Sabre/HTTP/DigestAuth.php
deleted file mode 100644
index 5e755929571..00000000000
--- a/3rdparty/Sabre/HTTP/DigestAuth.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-
-/**
- * HTTP Digest Authentication handler
- *
- * Use this class for easy http digest authentication.
- * Instructions:
- *
- *  1. Create the object
- *  2. Call the setRealm() method with the realm you plan to use
- *  3. Call the init method function.
- *  4. Call the getUserName() function. This function may return false if no
- *     authentication information was supplied. Based on the username you 
- *     should check your internal database for either the associated password,
- *     or the so-called A1 hash of the digest.
- *  5. Call either validatePassword() or validateA1(). This will return true
- *     or false. 
- *  6. To make sure an authentication prompt is displayed, call the
- *     requireLogin() method.
- * 
- * 
- * @package Sabre
- * @subpackage HTTP 
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_DigestAuth extends Sabre_HTTP_AbstractAuth {
-
-    /**
-     * These constants are used in setQOP();
-     */
-    const QOP_AUTH = 1;
-    const QOP_AUTHINT = 2;
-
-    protected $nonce;
-    protected $opaque;
-    protected $digestParts;
-    protected $A1;
-    protected $qop = self::QOP_AUTH;
-
-    /**
-     * Initializes the object 
-     */
-    public function __construct() {
-
-        $this->nonce = uniqid();
-        $this->opaque = md5($this->realm);
-        parent::__construct();
-
-    }
-
-    /**
-     * Gathers all information from the headers
-     *
-     * This method needs to be called prior to anything else.
-     * 
-     * @return void
-     */
-    public function init() {
-
-        $digest = $this->getDigest();
-        $this->digestParts = $this->parseDigest($digest);
-
-    }
-
-    /**
-     * Sets the quality of protection value.
-     *
-     * Possible values are:
-     *   Sabre_HTTP_DigestAuth::QOP_AUTH
-     *   Sabre_HTTP_DigestAuth::QOP_AUTHINT
-     *
-     * Multiple values can be specified using logical OR.
-     *
-     * QOP_AUTHINT ensures integrity of the request body, but this is not 
-     * supported by most HTTP clients. QOP_AUTHINT also requires the entire 
-     * request body to be md5'ed, which can put strains on CPU and memory.
-     *
-     * @param int $qop 
-     * @return void
-     */
-    public function setQOP($qop) {
-
-        $this->qop = $qop;
-
-    }
-
-    /**
-     * Validates the user.
-     *
-     * The A1 parameter should be md5($username . ':' . $realm . ':' . $password);
-     *
-     * @param string $A1 
-     * @return bool 
-     */
-    public function validateA1($A1) {
-
-        $this->A1 = $A1;
-        return $this->validate();
-
-    }
-
-    /**
-     * Validates authentication through a password. The actual password must be provided here.
-     * It is strongly recommended not store the password in plain-text and use validateA1 instead.
-     * 
-     * @param string $password 
-     * @return bool 
-     */
-    public function validatePassword($password) {
-
-        $this->A1 = md5($this->digestParts['username'] . ':' . $this->realm . ':' . $password);
-        return $this->validate();
-
-    }
-
-    /**
-     * Returns the username for the request 
-     * 
-     * @return string 
-     */
-    public function getUsername() {
-
-        return $this->digestParts['username'];
-
-    }
-
-    /**
-     * Validates the digest challenge 
-     * 
-     * @return bool 
-     */
-    protected function validate() {
-
-        $A2 = $this->httpRequest->getMethod() . ':' . $this->digestParts['uri'];
-    
-        if ($this->digestParts['qop']=='auth-int') {
-            // Making sure we support this qop value
-            if (!($this->qop & self::QOP_AUTHINT)) return false;
-            // We need to add an md5 of the entire request body to the A2 part of the hash
-            $body = $this->httpRequest->getBody(true);
-            $this->httpRequest->setBody($body,true);
-            $A2 .= ':' . md5($body);
-        } else {
-
-            // We need to make sure we support this qop value 
-            if (!($this->qop & self::QOP_AUTH)) return false; 
-        }
-
-        $A2 = md5($A2);
-
-        $validResponse = md5("{$this->A1}:{$this->digestParts['nonce']}:{$this->digestParts['nc']}:{$this->digestParts['cnonce']}:{$this->digestParts['qop']}:{$A2}"); 
-
-        return $this->digestParts['response']==$validResponse;
-        
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $qop = '';
-        switch($this->qop) {
-            case self::QOP_AUTH    : $qop = 'auth'; break;
-            case self::QOP_AUTHINT : $qop = 'auth-int'; break;
-            case self::QOP_AUTH | self::QOP_AUTHINT : $qop = 'auth,auth-int'; break;
-        }
-
-        $this->httpResponse->setHeader('WWW-Authenticate','Digest realm="' . $this->realm . '",qop="'.$qop.'",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
-        $this->httpResponse->sendStatus(401);
-
-    }
-
-
-    /**
-     * This method returns the full digest string.
-     *
-     * It should be compatibile with mod_php format and other webservers.
-     *
-     * If the header could not be found, null will be returned
-     *
-     * @return mixed 
-     */
-    public function getDigest() {
-
-        // mod_php
-        $digest = $this->httpRequest->getRawServerValue('PHP_AUTH_DIGEST');
-        if ($digest) return $digest;
-
-        // most other servers
-        $digest = $this->httpRequest->getHeader('Authorization');
-
-        if ($digest && strpos(strtolower($digest),'digest')===0) {
-            return substr($digest,7);
-        } else {
-            return null;
-        }
-
-    }
-
-
-    /**
-     * Parses the different pieces of the digest string into an array.
-     * 
-     * This method returns false if an incomplete digest was supplied
-     *
-     * @param string $digest 
-     * @return mixed 
-     */
-    protected function parseDigest($digest) {
-
-        // protect against missing data
-        $needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
-        $data = array();
-
-        preg_match_all('@(\w+)=(?:(?:")([^"]+)"|([^\s,$]+))@', $digest, $matches, PREG_SET_ORDER);
-
-        foreach ($matches as $m) {
-            $data[$m[1]] = $m[2] ? $m[2] : $m[3];
-            unset($needed_parts[$m[1]]);
-        }
-
-        return $needed_parts ? false : $data; 
-
-    }
-
-}
diff --git a/3rdparty/Sabre/HTTP/Request.php b/3rdparty/Sabre/HTTP/Request.php
deleted file mode 100644
index 95a64171aab..00000000000
--- a/3rdparty/Sabre/HTTP/Request.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-
-/**
- * HTTP Request information
- *
- * This object can be used to easily access information about an HTTP request.
- * It can additionally be used to create 'mock' requests.
- *
- * This class mostly operates indepentend, but because of the nature of a single 
- * request per run it can operate as a singleton. For more information check out 
- * the behaviour around 'defaultInputStream'.
- *
- * @package Sabre
- * @subpackage HTTP 
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_Request {
-
-    /**
-     * PHP's $_SERVER data
-     * 
-     * @var string 
-     */
-    protected $_SERVER;
-
-    /**
-     * The request body, if any.
-     *
-     * This is stored in the form of a stream resource.
-     *
-     * @var resource 
-     */
-    protected $body = null;
-
-    /**
-     * This will be set as the 'default' inputStream for a specific HTTP request
-     * We sometimes need to retain, or rebuild this if we need multiple runs 
-     * of parsing the original HTTP request.
-     * 
-     * @var resource 
-     */
-    static $defaultInputStream=null;
-
-    /**
-     * Sets up the object
-     *
-     * The serverData array can be used to override usage of PHP's 
-     * global _SERVER variable. 
-     * 
-     * @param array $serverData 
-     */
-    public function __construct($serverData = null) {
-
-       if ($serverData) $this->_SERVER = $serverData;
-       else $this->_SERVER =& $_SERVER;
-
-    }
-
-    /**
-     * Returns the value for a specific http header.
-     *
-     * This method returns null if the header did not exist.
-     * 
-     * @param string $name 
-     * @return string 
-     */
-    public function getHeader($name) {
-
-        $name = strtoupper(str_replace(array('-'),array('_'),$name));
-        if (isset($this->_SERVER['HTTP_' . $name])) {
-            return $this->_SERVER['HTTP_' . $name];
-        } 
-
-        // There's a few headers that seem to end up in the top-level 
-        // server array.
-        switch($name) {
-            case 'CONTENT_TYPE' :
-            case 'CONTENT_LENGTH' :
-                if (isset($this->_SERVER[$name])) {
-                    return $this->_SERVER[$name];
-                }
-                break;
-
-        }
-        return;
-
-    }
-
-    /**
-     * Returns all (known) HTTP headers.
-     *
-     * All headers are converted to lower-case, and additionally all underscores
-     * are automatically converted to dashes 
-     * 
-     * @return array 
-     */
-    public function getHeaders() {
-
-        $hdrs = array();
-        foreach($this->_SERVER as $key=>$value) {
-
-            switch($key) {
-                case 'CONTENT_LENGTH' :
-                case 'CONTENT_TYPE' :
-                    $hdrs[strtolower(str_replace('_','-',$key))] = $value;
-                    break;
-                default :
-                    if (strpos($key,'HTTP_')===0) {
-                        $hdrs[substr(strtolower(str_replace('_','-',$key)),5)] = $value;
-                    }
-                    break;
-            }
-
-        }
-
-        return $hdrs;
-
-    }
-
-    /**
-     * Returns the HTTP request method
-     *
-     * This is for example POST or GET 
-     *
-     * @return string 
-     */
-    public function getMethod() {
-
-        return $this->_SERVER['REQUEST_METHOD'];
-
-    }
-
-    /**
-     * Returns the requested uri
-     *
-     * @return string 
-     */
-    public function getUri() {
-       
-        return $this->_SERVER['REQUEST_URI'];
-
-    }
-
-    /**
-     * Will return protocol + the hostname + the uri 
-     * 
-     * @return void
-     */
-    public function getAbsoluteUri() {
-
-        // Checking if the request was made through HTTPS. The last in line is for IIS
-        $protocol = isset($this->_SERVER['HTTPS']) && ($this->_SERVER['HTTPS']) && ($this->_SERVER['HTTPS']!='off');
-        return ($protocol?'https':'http') . '://'  . $this->getHeader('Host') . $this->getUri();
-
-    }
-
-    /**
-     * Returns everything after the ? from the current url 
-     * 
-     * @return string 
-     */
-    public function getQueryString() {
-
-        return isset($this->_SERVER['QUERY_STRING'])?$this->_SERVER['QUERY_STRING']:'';
-
-    }
-
-    /**
-     * Returns the HTTP request body body 
-     *
-     * This method returns a readable stream resource.
-     * If the asString parameter is set to true, a string is sent instead. 
-     *
-     * @param bool asString
-     * @return resource 
-     */
-    public function getBody($asString = false) {
-
-        if (is_null($this->body)) {
-            if (!is_null(self::$defaultInputStream)) {
-                $this->body = self::$defaultInputStream;
-            } else {
-                $this->body = fopen('php://input','r');
-                self::$defaultInputStream = $this->body;
-            }
-        }
-        if ($asString) {
-            $body = stream_get_contents($this->body);
-            return $body;
-        } else {
-            return $this->body;
-        }
-
-    }
-
-    /**
-     * Sets the contents of the HTTP request body 
-     * 
-     * This method can either accept a string, or a readable stream resource.
-     *
-     * If the setAsDefaultInputStream is set to true, it means for this run of the 
-     * script the supplied body will be used instead of php://input.
-     *
-     * @param mixed $body 
-     * @param bool $setAsDefaultInputStream
-     * @return void
-     */
-    public function setBody($body,$setAsDefaultInputStream = false) {
-
-        if(is_resource($body)) {
-            $this->body = $body;
-        } else {
-
-            $stream = fopen('php://temp','r+');
-            fputs($stream,$body);
-            rewind($stream);
-            // String is assumed
-            $this->body = $stream;
-        }
-        if ($setAsDefaultInputStream) {
-            self::$defaultInputStream = $this->body;
-        }
-
-    }
-
-    /**
-     * Returns a specific item from the _SERVER array. 
-     *
-     * Do not rely on this feature, it is for internal use only.
-     *
-     * @param string $field 
-     * @return string 
-     */
-    public function getRawServerValue($field) {
-
-        return isset($this->_SERVER[$field])?$this->_SERVER[$field]:null;
-
-    }
-
-}
-
diff --git a/3rdparty/Sabre/HTTP/Response.php b/3rdparty/Sabre/HTTP/Response.php
deleted file mode 100644
index dce6feac553..00000000000
--- a/3rdparty/Sabre/HTTP/Response.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/**
- * Sabre_HTTP_Response 
- * 
- * @package Sabre
- * @subpackage HTTP 
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_Response {
-
-    /**
-     * Returns a full HTTP status message for an HTTP status code 
-     * 
-     * @param int $code 
-     * @return string
-     */
-    public function getStatusMessage($code) {
-
-        $msg = array(
-            100 => 'Continue',
-            101 => 'Switching Protocols',
-            102 => 'Processing',
-            200 => 'OK',
-            201 => 'Created',
-            202 => 'Accepted',
-            203 => 'Non-Authorative Information',
-            204 => 'No Content',
-            205 => 'Reset Content',
-            206 => 'Partial Content',
-            207 => 'Multi-Status', // RFC 4918
-            208 => 'Already Reported', // RFC 5842
-            226 => 'IM Used', // RFC 3229
-            300 => 'Multiple Choices',
-            301 => 'Moved Permanently',
-            302 => 'Found',
-            303 => 'See Other',
-            304 => 'Not Modified',
-            305 => 'Use Proxy',
-            306 => 'Reserved',
-            307 => 'Temporary Redirect',
-            400 => 'Bad request',
-            401 => 'Unauthorized',
-            402 => 'Payment Required',
-            403 => 'Forbidden',
-            404 => 'Not Found',
-            405 => 'Method Not Allowed',
-            406 => 'Not Acceptable',
-            407 => 'Proxy Authentication Required',
-            408 => 'Request Timeout',
-            409 => 'Conflict',
-            410 => 'Gone',
-            411 => 'Length Required',
-            412 => 'Precondition failed',
-            413 => 'Request Entity Too Large',
-            414 => 'Request-URI Too Long',
-            415 => 'Unsupported Media Type',
-            416 => 'Requested Range Not Satisfiable',
-            417 => 'Expectation Failed',
-            418 => 'I\'m a teapot', // RFC 2324
-            422 => 'Unprocessable Entity', // RFC 4918
-            423 => 'Locked', // RFC 4918
-            424 => 'Failed Dependency', // RFC 4918
-            426 => 'Upgrade required',
-            500 => 'Internal Server Error',
-            501 => 'Not Implemented',
-            502 => 'Bad Gateway',
-            503 => 'Service Unavailable',
-            504 => 'Gateway Timeout',
-            505 => 'HTTP Version not supported',
-            506 => 'Variant Also Negotiates',
-            507 => 'Unsufficient Storage', // RFC 4918
-            508 => 'Loop Detected', // RFC 5842
-            509 => 'Bandwidth Limit Exceeded', // non-standard
-            510 => 'Not extended',
-       ); 
-
-       return 'HTTP/1.1 ' . $code . ' ' . $msg[$code];
-
-    }
-
-    /**
-     * Sends an HTTP status header to the client 
-     * 
-     * @param int $code HTTP status code 
-     * @return void
-     */
-    public function sendStatus($code) {
-
-        if (!headers_sent()) 
-            return header($this->getStatusMessage($code));
-        else return false;
-
-    }
-
-    /**
-     * Sets an HTTP header for the response
-     * 
-     * @param string $name 
-     * @param string $value 
-     * @return void
-     */
-    public function setHeader($name, $value, $replace = true) {
-
-        $value = str_replace(array("\r","\n"),array('\r','\n'),$value);
-        if (!headers_sent()) 
-            return header($name . ': ' . $value, $replace);
-        else return false;
-
-    }
-
-    /**
-     * Sets a bunch of HTTP Headers
-     *
-     * headersnames are specified as keys, value in the array value
-     * 
-     * @param array $headers 
-     * @return void
-     */
-    public function setHeaders(array $headers) {
-
-        foreach($headers as $key=>$value)
-            $this->setHeader($key, $value);
-
-    }
-
-    /**
-     * Sends the entire response body
-     *
-     * This method can accept either an open filestream, or a string.
-     * 
-     * @param mixed $body 
-     * @return void
-     */
-    public function sendBody($body) {
-
-        if (is_resource($body)) {
-        
-            fpassthru($body);
-
-        } else {
-
-            // We assume a string
-            echo $body;
-
-        }
-
-    }
-
-}
diff --git a/3rdparty/Sabre/HTTP/Util.php b/3rdparty/Sabre/HTTP/Util.php
deleted file mode 100644
index 8a6bd7df487..00000000000
--- a/3rdparty/Sabre/HTTP/Util.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * HTTP utility methods 
- * 
- * @package Sabre
- * @subpackage HTTP
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @author Paul Voegler
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_Util {
-
-    /**
-     * Parses a RFC2616-compatible date string
-     *
-     * This method returns false if the date is invalid
-     * 
-     * @param string $dateHeader 
-     * @return bool|DateTime 
-     */
-    static function parseHTTPDate($dateHeader) {
-
-        //RFC 2616 section 3.3.1 Full Date
-        //Only the format is checked, valid ranges are checked by strtotime below
-        $month = '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)';
-        $weekday = '(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)';
-        $wkday = '(Mon|Tue|Wed|Thu|Fri|Sat|Sun)';
-        $time = '[0-2]\d(\:[0-5]\d){2}';
-        $date3 = $month . ' ([1-3]\d| \d)';
-        $date2 = '[0-3]\d\-' . $month . '\-\d\d';
-        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
-        $date1 = '[0-3]\d ' . $month . ' [1-9]\d{3}';
-
-        //ANSI C's asctime() format
-        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
-        $asctime_date = $wkday . ' ' . $date3 . ' ' . $time . ' [1-9]\d{3}';
-        //RFC 850, obsoleted by RFC 1036
-        $rfc850_date = $weekday . ', ' . $date2 . ' ' . $time . ' GMT';
-        //RFC 822, updated by RFC 1123
-        $rfc1123_date = $wkday . ', ' . $date1 . ' ' . $time . ' GMT';
-        //allowed date formats by RFC 2616
-        $HTTP_date = "($rfc1123_date|$rfc850_date|$asctime_date)";
-        
-        //allow for space around the string and strip it
-        $dateHeader = trim($dateHeader, ' ');
-        if (!preg_match('/^' . $HTTP_date . '$/', $dateHeader))
-            return false;
-
-        //append implicit GMT timezone to ANSI C time format
-        if (strpos($dateHeader, ' GMT') === false)
-            $dateHeader .= ' GMT';
-
-
-        $realDate = strtotime($dateHeader);
-        //strtotime can return -1 or false in case of error
-        if ($realDate !== false && $realDate >= 0)
-            return new DateTime('@' . $realDate, new DateTimeZone('UTC'));
-
-        return false;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/HTTP/Version.php b/3rdparty/Sabre/HTTP/Version.php
deleted file mode 100644
index 67be232fc26..00000000000
--- a/3rdparty/Sabre/HTTP/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * This class contains the Sabre_HTTP version constants.
- * 
- * @package Sabre
- * @subpackage HTTP 
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_HTTP_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.5.3';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/LICENCE b/3rdparty/Sabre/LICENCE
deleted file mode 100644
index 3d07eaace83..00000000000
--- a/3rdparty/Sabre/LICENCE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (C) 2007-2011 Rooftop Solutions.
-Copyright (C) 2007-2009 FileMobile inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of the SabreDAV nor the names of its contributors
-      may be used to endorse or promote products derived from this software
-      without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE. 
diff --git a/3rdparty/Sabre/VObject/Component.php b/3rdparty/Sabre/VObject/Component.php
deleted file mode 100644
index 47cf9f3d812..00000000000
--- a/3rdparty/Sabre/VObject/Component.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-
-/**
- * VObject Component
- *
- * This class represents a VCALENDAR/VCARD component. A component is for example
- * VEVENT, VTODO and also VCALENDAR. It starts with BEGIN:COMPONENTNAME and 
- * ends with END:COMPONENTNAME
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Component extends Sabre_VObject_Element {
-
-    /**
-     * Name, for example VEVENT 
-     * 
-     * @var string 
-     */
-    public $name;
-
-    /**
-     * Children properties and components 
-     * 
-     * @var array
-     */
-    public $children = array();
-
-
-    /**
-     * Creates a new component.
-     *
-     * By default this object will iterate over its own children, but this can 
-     * be overridden with the iterator argument
-     * 
-     * @param string $name 
-     * @param Sabre_VObject_ElementList $iterator
-     */
-    public function __construct($name, Sabre_VObject_ElementList $iterator = null) {
-
-        $this->name = strtoupper($name);
-        if (!is_null($iterator)) $this->iterator = $iterator;
-
-    }
-
-    /**
-     * Turns the object back into a serialized blob. 
-     * 
-     * @return string 
-     */
-    public function serialize() {
-
-        $str = "BEGIN:" . $this->name . "\r\n";
-        foreach($this->children as $child) $str.=$child->serialize();
-        $str.= "END:" . $this->name . "\r\n";
-        
-        return $str;
-
-    }
-
-
-    /**
-     * Adds a new componenten or element
-     *
-     * You can call this method with the following syntaxes:
-     *
-     * add(Sabre_VObject_Element $element)
-     * add(string $name, $value)
-     *
-     * The first version adds an Element
-     * The second adds a property as a string. 
-     * 
-     * @param mixed $item 
-     * @param mixed $itemValue 
-     * @return void
-     */
-    public function add($item, $itemValue = null) {
-
-        if ($item instanceof Sabre_VObject_Element) {
-            if (!is_null($itemValue)) {
-                throw new InvalidArgumentException('The second argument must not be specified, when passing a VObject');
-            }
-            $item->parent = $this;
-            $this->children[] = $item;
-        } elseif(is_string($item)) {
-
-            if (!is_scalar($itemValue)) {
-                throw new InvalidArgumentException('The second argument must be scalar');
-            }
-            $item = new Sabre_VObject_Property($item,$itemValue);
-            $item->parent = $this;
-            $this->children[] = $item;
-
-        } else {
-            
-            throw new InvalidArgumentException('The first argument must either be a Sabre_VObject_Element or a string');
-
-        }
-
-    }
-
-    /**
-     * Returns an iterable list of children 
-     * 
-     * @return Sabre_VObject_ElementList 
-     */
-    public function children() {
-
-        return new Sabre_VObject_ElementList($this->children);
-
-    }
-
-    /**
-     * Returns an array with elements that match the specified name.
-     *
-     * This function is also aware of MIME-Directory groups (as they appear in 
-     * vcards). This means that if a property is grouped as "HOME.EMAIL", it 
-     * will also be returned when searching for just "EMAIL". If you want to 
-     * search for a property in a specific group, you can select on the entire 
-     * string ("HOME.EMAIL"). If you want to search on a specific property that 
-     * has not been assigned a group, specify ".EMAIL".
-     *
-     * Keys are retained from the 'children' array, which may be confusing in 
-     * certain cases. 
-     *
-     * @param string $name 
-     * @return array 
-     */
-    public function select($name) {
-
-        $group = null;
-        $name = strtoupper($name);
-        if (strpos($name,'.')!==false) {
-            list($group,$name) = explode('.', $name, 2);
-        }
-
-        $result = array();
-        foreach($this->children as $key=>$child) {
-
-            if (
-                strtoupper($child->name) === $name &&
-                (is_null($group) || ( $child instanceof Sabre_VObject_Property && strtoupper($child->group) === $group))
-            ) {
-                
-                $result[$key] = $child;
-
-            }
-        }
-
-        reset($result);
-        return $result;
-
-    }
-
-    /* Magic property accessors {{{ */
-
-    /**
-     * Using 'get' you will either get a propery or component, 
-     *
-     * If there were no child-elements found with the specified name,
-     * null is returned.
-     * 
-     * @param string $name 
-     * @return void
-     */
-    public function __get($name) {
-
-        $matches = $this->select($name);
-        if (count($matches)===0) {
-            return null;
-        } else {
-            $firstMatch = current($matches);
-            $firstMatch->setIterator(new Sabre_VObject_ElementList(array_values($matches)));
-            return $firstMatch;
-        }
-
-    }
-
-    /**
-     * This method checks if a sub-element with the specified name exists. 
-     * 
-     * @param string $name 
-     * @return bool 
-     */
-    public function __isset($name) {
-
-        $matches = $this->select($name);
-        return count($matches)>0;
-
-    }
-
-    /**
-     * Using the setter method you can add properties or subcomponents
-     *
-     * You can either pass a Sabre_VObject_Component, Sabre_VObject_Property
-     * object, or a string to automatically create a Property.
-     *
-     * If the item already exists, it will be removed. If you want to add
-     * a new item with the same name, always use the add() method.
-     * 
-     * @param string $name
-     * @param mixed $value
-     * @return void
-     */
-    public function __set($name, $value) {
-
-        $matches = $this->select($name);
-        $overWrite = count($matches)?key($matches):null;
-
-        if ($value instanceof Sabre_VObject_Component || $value instanceof Sabre_VObject_Property) {
-            $value->parent = $this;
-            if (!is_null($overWrite)) {
-                $this->children[$overWrite] = $value;
-            } else {
-                $this->children[] = $value;
-            }
-        } elseif (is_scalar($value)) {
-            $property = new Sabre_VObject_Property($name,$value);
-            $property->parent = $this;
-            if (!is_null($overWrite)) {
-                $this->children[$overWrite] = $property;
-            } else {
-                $this->children[] = $property;
-            }
-        } else {
-            throw new InvalidArgumentException('You must pass a Sabre_VObject_Component, Sabre_VObject_Property or scalar type');
-        }
-
-    }
-
-    /**
-     * Removes all properties and components within this component. 
-     * 
-     * @param string $name 
-     * @return void
-     */
-    public function __unset($name) {
-
-        $matches = $this->select($name);
-        foreach($matches as $k=>$child) {
-
-            unset($this->children[$k]);
-            $child->parent = null;
-
-        }
-
-    }
-
-    /* }}} */
-
-}
diff --git a/3rdparty/Sabre/VObject/Element.php b/3rdparty/Sabre/VObject/Element.php
deleted file mode 100644
index 8d2b0aaacd1..00000000000
--- a/3rdparty/Sabre/VObject/Element.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Base class for all elements
- * 
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_VObject_Element extends Sabre_VObject_Node {
-
-
-}
diff --git a/3rdparty/Sabre/VObject/Element/DateTime.php b/3rdparty/Sabre/VObject/Element/DateTime.php
deleted file mode 100644
index 3350ec02c88..00000000000
--- a/3rdparty/Sabre/VObject/Element/DateTime.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-
-/**
- * DateTime property 
- *
- * This element is used for iCalendar properties such as the DTSTART property. 
- * It basically provides a few helper functions that make it easier to deal 
- * with these. It supports both DATE-TIME and DATE values.
- *
- * In order to use this correctly, you must call setDateTime and getDateTime to 
- * retrieve and modify dates respectively.
- *
- * If you use the 'value' or properties directly, this object does not keep 
- * reference and results might appear incorrectly.
- * 
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Element_DateTime extends Sabre_VObject_Property {
-
-    /**
-     * Local 'floating' time
-     */
-    const LOCAL = 1;
-
-    /**
-     * UTC-based time
-     */
-    const UTC = 2;
-
-    /**
-     * Local time plus timezone
-     */
-    const LOCALTZ = 3;
-
-    /**
-     * Only a date, time is ignored
-     */
-    const DATE = 4;
-
-    /**
-     * DateTime representation
-     *
-     * @var DateTime
-     */
-    protected $dateTime;
-
-    /**
-     * dateType 
-     * 
-     * @var int 
-     */
-    protected $dateType;
-
-    /**
-     * Updates the Date and Time. 
-     * 
-     * @param DateTime $dt 
-     * @param int $dateType 
-     * @return void
-     */
-    public function setDateTime(DateTime $dt, $dateType = self::LOCALTZ) {
-
-        switch($dateType) {
-
-            case self::LOCAL :
-                $this->setValue($dt->format('Ymd\\THis'));
-                $this->offsetUnset('VALUE');
-                $this->offsetUnset('TZID');
-                $this->offsetSet('VALUE','DATE-TIME'); 
-                break;
-            case self::UTC :
-                $dt->setTimeZone(new DateTimeZone('UTC'));
-                $this->setValue($dt->format('Ymd\\THis\\Z'));
-                $this->offsetUnset('VALUE');
-                $this->offsetUnset('TZID');
-                $this->offsetSet('VALUE','DATE-TIME');
-                break;
-            case self::LOCALTZ :
-                $this->setValue($dt->format('Ymd\\THis'));
-                $this->offsetUnset('VALUE');
-                $this->offsetUnset('TZID');
-                $this->offsetSet('VALUE','DATE-TIME');
-                $this->offsetSet('TZID', $dt->getTimeZone()->getName());
-                break; 
-            case self::DATE :
-                $this->setValue($dt->format('Ymd'));
-                $this->offsetUnset('VALUE');
-                $this->offsetUnset('TZID');
-                $this->offsetSet('VALUE','DATE');
-                break;
-            default :
-                throw new InvalidArgumentException('You must pass a valid dateType constant');
-
-        }
-        $this->dateTime = $dt;
-        $this->dateType = $dateType;
-
-    }
-
-    /**
-     * Returns the current DateTime value.
-     *
-     * If no value was set, this method returns null.
-     *
-     * @return DateTime|null 
-     */
-    public function getDateTime() {
-
-        if ($this->dateTime)
-            return $this->dateTime;
-
-        list(
-            $this->dateType,
-            $this->dateTime
-        ) = self::parseData($this->value, $this);
-        return $this->dateTime;
-
-    }
-
-    /**
-     * Returns the type of Date format.
-     *
-     * This method returns one of the format constants. If no date was set, 
-     * this method will return null.
-     *
-     * @return int|null
-     */
-    public function getDateType() {
-
-        if ($this->dateType)
-            return $this->dateType;
-
-        list(
-            $this->dateType,
-            $this->dateTime,
-        ) = self::parseData($this->value, $this);
-        return $this->dateType;
-
-    }
-
-    /**
-     * Parses the internal data structure to figure out what the current date 
-     * and time is.
-     *
-     * The returned array contains two elements:
-     *   1. A 'DateType' constant (as defined on this class), or null. 
-     *   2. A DateTime object (or null)
-     *
-     * @param string|null $propertyValue The string to parse (yymmdd or 
-     *                                   ymmddThhmmss, etc..)
-     * @param Sabre_VObject_Property|null $property The instance of the 
-     *                                              property we're parsing. 
-     * @return array 
-     */
-    static public function parseData($propertyValue, Sabre_VObject_Property $property = null) {
-
-        if (is_null($propertyValue)) {
-            return array(null, null);
-        }
-
-        $date = '(?P<year>[1-2][0-9]{3})(?P<month>[0-1][0-9])(?P<date>[0-3][0-9])';
-        $time = '(?P<hour>[0-2][0-9])(?P<minute>[0-5][0-9])(?P<second>[0-5][0-9])';
-        $regex = "/^$date(T$time(?P<isutc>Z)?)?$/";
-
-        if (!preg_match($regex, $propertyValue, $matches)) {
-            throw new InvalidArgumentException($propertyValue . ' is not a valid DateTime or Date string');
-        }
-
-        if (!isset($matches['hour'])) {
-            // Date-only
-            return array(
-                self::DATE,
-                new DateTime($matches['year'] . '-' . $matches['month'] . '-' . $matches['date'] . ' 00:00:00'),
-            );
-        }
-
-        $dateStr = 
-            $matches['year'] .'-' . 
-            $matches['month'] . '-' . 
-            $matches['date'] . ' ' .
-            $matches['hour'] . ':' .
-            $matches['minute'] . ':' .
-            $matches['second']; 
-
-        if (isset($matches['isutc'])) {
-            $dt = new DateTime($dateStr,new DateTimeZone('UTC'));
-            $dt->setTimeZone(new DateTimeZone('UTC'));
-            return array(
-                self::UTC,
-                $dt
-            );
-        }
-
-        // Finding the timezone.
-        $tzid = $property['TZID'];
-        if (!$tzid) {
-            return array(
-                self::LOCAL,
-                new DateTime($dateStr)
-            );
-        }
-
-        try {
-            $tz = new DateTimeZone($tzid->value);
-        } catch (Exception $e) {
-
-            // The id was invalid, we're going to try to find the information 
-            // through the VTIMEZONE object.
-
-            // First we find the root object
-            $root = $property;
-            while($root->parent) {
-                $root = $root->parent;
-            }
-
-            if (isset($root->VTIMEZONE)) {
-                foreach($root->VTIMEZONE as $vtimezone) {
-                    if (((string)$vtimezone->TZID) == $tzid) {
-                        if (isset($vtimezone->{'X-LIC-LOCATION'})) {
-                            $tzid = (string)$vtimezone->{'X-LIC-LOCATION'};
-                        }
-                    }
-                }
-            }
-
-            $tz = new DateTimeZone($tzid);
-            
-        }
-        $dt = new DateTime($dateStr, $tz);
-        $dt->setTimeZone($tz);
-
-        return array(
-            self::LOCALTZ,
-            $dt
-        );
-
-    }
-
-}
-
-?>
diff --git a/3rdparty/Sabre/VObject/Element/MultiDateTime.php b/3rdparty/Sabre/VObject/Element/MultiDateTime.php
deleted file mode 100644
index dc6ca5abb80..00000000000
--- a/3rdparty/Sabre/VObject/Element/MultiDateTime.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-/**
- * Multi-DateTime property 
- *
- * This element is used for iCalendar properties such as the EXDATE property. 
- * It basically provides a few helper functions that make it easier to deal 
- * with these. It supports both DATE-TIME and DATE values.
- *
- * In order to use this correctly, you must call setDateTimes and getDateTimes 
- * to retrieve and modify dates respectively.
- *
- * If you use the 'value' or properties directly, this object does not keep 
- * reference and results might appear incorrectly.
- * 
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Element_MultiDateTime extends Sabre_VObject_Property {
-
-    /**
-     * DateTime representation
-     *
-     * @var DateTime[]
-     */
-    protected $dateTimes;
-
-    /**
-     * dateType
-     *
-     * This is one of the Sabre_VObject_Element_DateTime constants.
-     *
-     * @var int 
-     */
-    protected $dateType;
-
-    /**
-     * Updates the value 
-     * 
-     * @param array $dt Must be an array of DateTime objects. 
-     * @param int $dateType 
-     * @return void
-     */
-    public function setDateTimes(array $dt, $dateType = Sabre_VObject_Element_DateTime::LOCALTZ) {
-
-        foreach($dt as $i) 
-            if (!$i instanceof DateTime) 
-                throw new InvalidArgumentException('You must pass an array of DateTime objects');
-
-        $this->offsetUnset('VALUE');
-        $this->offsetUnset('TZID');
-        switch($dateType) {
-
-            case Sabre_VObject_Element_DateTime::LOCAL :
-                $val = array();
-                foreach($dt as $i) {
-                    $val[] = $i->format('Ymd\\THis');
-                }
-                $this->setValue(implode(',',$val));
-                $this->offsetSet('VALUE','DATE-TIME'); 
-                break;
-            case Sabre_VObject_Element_DateTime::UTC :
-                $val = array();
-                foreach($dt as $i) {
-                    $i->setTimeZone(new DateTimeZone('UTC'));
-                    $val[] = $i->format('Ymd\\THis\\Z');
-                }
-                $this->setValue(implode(',',$val));
-                $this->offsetSet('VALUE','DATE-TIME');
-                break;
-            case Sabre_VObject_Element_DateTime::LOCALTZ :
-                $val = array();
-                foreach($dt as $i) {
-                    $val[] = $i->format('Ymd\\THis');
-                }
-                $this->setValue(implode(',',$val));
-                $this->offsetSet('VALUE','DATE-TIME');
-                $this->offsetSet('TZID', $dt[0]->getTimeZone()->getName());
-                break; 
-            case Sabre_VObject_Element_DateTime::DATE :
-                $val = array();
-                foreach($dt as $i) {
-                    $val[] = $i->format('Ymd');
-                }
-                $this->setValue(implode(',',$val));
-                $this->offsetSet('VALUE','DATE');
-                break;
-            default :
-                throw new InvalidArgumentException('You must pass a valid dateType constant');
-
-        }
-        $this->dateTimes = $dt;
-        $this->dateType = $dateType;
-
-    }
-
-    /**
-     * Returns the current DateTime value.
-     *
-     * If no value was set, this method returns null.
-     *
-     * @return array|null 
-     */
-    public function getDateTimes() {
-
-        if ($this->dateTimes)
-            return $this->dateTimes;
-
-        $dts = array();
-    
-        if (!$this->value) {
-            $this->dateTimes = null;
-            $this->dateType = null;
-            return null;
-        }
-
-        foreach(explode(',',$this->value) as $val) {
-            list(
-                $type,
-                $dt
-            ) = Sabre_VObject_Element_DateTime::parseData($val, $this);
-            $dts[] = $dt;
-            $this->dateType = $type;
-        }
-        $this->dateTimes = $dts;
-        return $this->dateTimes;
-
-    }
-
-    /**
-     * Returns the type of Date format.
-     *
-     * This method returns one of the format constants. If no date was set, 
-     * this method will return null.
-     *
-     * @return int|null
-     */
-    public function getDateType() {
-
-        if ($this->dateType)
-            return $this->dateType;
-    
-        if (!$this->value) {
-            $this->dateTimes = null;
-            $this->dateType = null;
-            return null;
-        }
-
-        $dts = array();
-        foreach(explode(',',$this->value) as $val) {
-            list(
-                $type,
-                $dt
-            ) = Sabre_VObject_Element_DateTime::parseData($val, $this);
-            $dts[] = $dt;
-            $this->dateType = $type; 
-        }
-        $this->dateTimes = $dts;
-        return $this->dateType;
-
-    }
-
-}
-
-?>
diff --git a/3rdparty/Sabre/VObject/ElementList.php b/3rdparty/Sabre/VObject/ElementList.php
deleted file mode 100644
index 9922cd587bc..00000000000
--- a/3rdparty/Sabre/VObject/ElementList.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-/**
- * VObject ElementList
- *
- * This class represents a list of elements. Lists are the result of queries,
- * such as doing $vcalendar->vevent where there's multiple VEVENT objects.
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_ElementList implements Iterator, Countable, ArrayAccess {
-
-    /**
-     * Inner elements 
-     * 
-     * @var array
-     */
-    protected $elements = array();
-
-    /**
-     * Creates the element list.
-     *
-     * @param array $elements 
-     */
-    public function __construct(array $elements) {
-
-        $this->elements = $elements;
-
-    } 
-
-    /* {{{ Iterator interface */
-
-    /**
-     * Current position  
-     * 
-     * @var int 
-     */
-    private $key = 0;
-
-    /**
-     * Returns current item in iteration 
-     * 
-     * @return Sabre_VObject_Element 
-     */
-    public function current() {
-
-        return $this->elements[$this->key];
-
-    }
-   
-    /**
-     * To the next item in the iterator 
-     * 
-     * @return void
-     */
-    public function next() {
-
-        $this->key++;
-
-    }
-
-    /**
-     * Returns the current iterator key 
-     * 
-     * @return int
-     */
-    public function key() {
-
-        return $this->key;
-
-    }
-
-    /**
-     * Returns true if the current position in the iterator is a valid one 
-     * 
-     * @return bool 
-     */
-    public function valid() {
-
-        return isset($this->elements[$this->key]);
-
-    }
-
-    /**
-     * Rewinds the iterator 
-     * 
-     * @return void 
-     */
-    public function rewind() {
-
-        $this->key = 0;
-
-    }
-
-    /* }}} */
-
-    /* {{{ Countable interface */
-
-    /**
-     * Returns the number of elements 
-     * 
-     * @return int 
-     */
-    public function count() {
-
-        return count($this->elements);
-
-    }
-
-    /* }}} */
-
-    /* {{{ ArrayAccess Interface */
-
-    
-    /**
-     * Checks if an item exists through ArrayAccess.
-     *
-     * @param int $offset 
-     * @return bool 
-     */
-    public function offsetExists($offset) {
-
-        return isset($this->elements[$offset]);
-
-    }
-
-    /**
-     * Gets an item through ArrayAccess.
-     *
-     * @param int $offset 
-     * @return mixed 
-     */
-    public function offsetGet($offset) {
-
-        return $this->elements[$offset];
-
-    }
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * @param int $offset 
-     * @param mixed $value 
-     * @return void
-     */
-    public function offsetSet($offset,$value) {
-
-        throw new LogicException('You can not add new objects to an ElementList');
-
-    }
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset 
-     * @return void
-     */
-    public function offsetUnset($offset) {
-
-        throw new LogicException('You can not remove objects from an ElementList');
-
-    }
-
-    /* }}} */
-
-}
diff --git a/3rdparty/Sabre/VObject/Node.php b/3rdparty/Sabre/VObject/Node.php
deleted file mode 100644
index 7100b62f1cb..00000000000
--- a/3rdparty/Sabre/VObject/Node.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-/**
- * Base class for all nodes 
- * 
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Sabre_VObject_Node implements IteratorAggregate, ArrayAccess, Countable {
-
-    /**
-     * Turns the object back into a serialized blob. 
-     * 
-     * @return string 
-     */
-    abstract function serialize();
-
-    /**
-     * Iterator override 
-     * 
-     * @var Sabre_VObject_ElementList 
-     */
-    protected $iterator = null;
-
-    /**
-     * A link to the parent node
-     * 
-     * @var Sabre_VObject_Node 
-     */
-    protected $parent = null;
-
-    /* {{{ IteratorAggregator interface */
-
-    /**
-     * Returns the iterator for this object 
-     * 
-     * @return Sabre_VObject_ElementList 
-     */
-    public function getIterator() {
-
-        if (!is_null($this->iterator)) 
-            return $this->iterator;
-
-        return new Sabre_VObject_ElementList(array($this));
-
-    }
-
-    /**
-     * Sets the overridden iterator
-     *
-     * Note that this is not actually part of the iterator interface
-     * 
-     * @param Sabre_VObject_ElementList $iterator 
-     * @return void
-     */
-    public function setIterator(Sabre_VObject_ElementList $iterator) {
-
-        $this->iterator = $iterator;
-
-    }
-
-    /* }}} */
-
-    /* {{{ Countable interface */
-
-    /**
-     * Returns the number of elements 
-     * 
-     * @return int 
-     */
-    public function count() {
-
-        $it = $this->getIterator();
-        return $it->count();
-
-    }
-
-    /* }}} */
-
-    /* {{{ ArrayAccess Interface */
-
-    
-    /**
-     * Checks if an item exists through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     * 
-     * @param int $offset 
-     * @return bool 
-     */
-    public function offsetExists($offset) {
-
-        $iterator = $this->getIterator();
-        return $iterator->offsetExists($offset);
-
-    }
-
-    /**
-     * Gets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset 
-     * @return mixed 
-     */
-    public function offsetGet($offset) {
-
-        $iterator = $this->getIterator();
-        return $iterator->offsetGet($offset);
-
-    }
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset 
-     * @param mixed $value 
-     * @return void
-     */
-    public function offsetSet($offset,$value) {
-
-        $iterator = $this->getIterator();
-        return $iterator->offsetSet($offset,$value);
-
-    }
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset 
-     * @return void
-     */
-    public function offsetUnset($offset) {
-
-        $iterator = $this->getIterator();
-        return $iterator->offsetUnset($offset);
-
-    }
-
-    /* }}} */
-
-}
diff --git a/3rdparty/Sabre/VObject/Parameter.php b/3rdparty/Sabre/VObject/Parameter.php
deleted file mode 100644
index 9ebab6ec69b..00000000000
--- a/3rdparty/Sabre/VObject/Parameter.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * VObject Parameter
- *
- * This class represents a parameter. A parameter is always tied to a property.
- * In the case of:
- *   DTSTART;VALUE=DATE:20101108 
- * VALUE=DATE would be the parameter name and value.
- * 
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Parameter extends Sabre_VObject_Node {
-
-    /**
-     * Parameter name 
-     * 
-     * @var string 
-     */
-    public $name;
-
-    /**
-     * Parameter value 
-     * 
-     * @var string 
-     */
-    public $value;
-
-    /**
-     * Sets up the object 
-     * 
-     * @param string $name 
-     * @param string $value 
-     */
-    public function __construct($name, $value = null) {
-
-        $this->name = strtoupper($name);
-        $this->value = $value;
-
-    } 
-
-    /**
-     * Turns the object back into a serialized blob. 
-     * 
-     * @return string 
-     */
-    public function serialize() {
-
-        $src = array(
-            '\\',
-            "\n",
-            ';',
-            ',',
-        );
-        $out = array(
-            '\\\\',
-            '\n',
-            '\;',
-            '\,',
-        );
-
-        return $this->name . '=' . str_replace($src, $out, $this->value);
-
-    }
-
-    /**
-     * Called when this object is being cast to a string 
-     * 
-     * @return string 
-     */
-    public function __toString() {
-
-        return $this->value;
-
-    }
-
-}
diff --git a/3rdparty/Sabre/VObject/ParseException.php b/3rdparty/Sabre/VObject/ParseException.php
deleted file mode 100644
index ed4ef2e8592..00000000000
--- a/3rdparty/Sabre/VObject/ParseException.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Exception thrown by Sabre_VObject_Reader if an invalid object was attempted to be parsed.
- * 
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_ParseException extends Exception { }
diff --git a/3rdparty/Sabre/VObject/Property.php b/3rdparty/Sabre/VObject/Property.php
deleted file mode 100644
index 06058229043..00000000000
--- a/3rdparty/Sabre/VObject/Property.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-
-/**
- * VObject Property
- *
- * A property in VObject is usually in the form PARAMNAME:paramValue.
- * An example is : SUMMARY:Weekly meeting 
- *
- * Properties can also have parameters:
- * SUMMARY;LANG=en:Weekly meeting.
- *
- * Parameters can be accessed using the ArrayAccess interface. 
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Property extends Sabre_VObject_Element {
-
-    /**
-     * Propertyname 
-     * 
-     * @var string 
-     */
-    public $name;
-
-    /**
-     * Group name
-     * 
-     * This may be something like 'HOME' for vcards.
-     *
-     * @var string 
-     */
-    public $group;
-
-    /**
-     * Property parameters 
-     * 
-     * @var array 
-     */
-    public $parameters = array();
-
-    /**
-     * Property value 
-     * 
-     * @var string 
-     */
-    public $value;
-
-    /**
-     * Creates a new property object
-     * 
-     * By default this object will iterate over its own children, but this can 
-     * be overridden with the iterator argument
-     * 
-     * @param string $name 
-     * @param string $value
-     * @param Sabre_VObject_ElementList $iterator
-     */
-    public function __construct($name, $value = null, $iterator = null) {
-
-        $name = strtoupper($name);
-        $group = null;
-        if (strpos($name,'.')!==false) {
-            list($group, $name) = explode('.', $name);
-        }
-        $this->name = $name;
-        $this->group = $group;
-        if (!is_null($iterator)) $this->iterator = $iterator;
-        $this->setValue($value);
-
-    }
-
-    /**
-     * Updates the internal value 
-     * 
-     * @param string $value 
-     * @return void
-     */
-    public function setValue($value) {
-
-        $this->value = $value;
-
-    }
-
-    /**
-     * Turns the object back into a serialized blob. 
-     * 
-     * @return string 
-     */
-    public function serialize() {
-
-        $str = $this->name;
-        if ($this->group) $str = $this->group . '.' . $this->name;
-
-        if (count($this->parameters)) {
-            foreach($this->parameters as $param) {
-                
-                $str.=';' . $param->serialize();
-
-            }
-        }
-        $src = array(
-            '\\',
-            "\n",
-        );
-        $out = array(
-            '\\\\',
-            '\n',
-        );
-        $str.=':' . str_replace($src, $out, $this->value);
-
-        $out = '';
-        while(strlen($str)>0) {
-            if (strlen($str)>75) {
-                $out.= substr($str,0,75) . "\r\n";
-                $str = ' ' . substr($str,75);
-            } else {
-                $out.=$str . "\r\n";
-                $str='';
-                break;
-            }
-        }
-
-        return $out;
-
-    }
-
-    /**
-     * Adds a new componenten or element
-     *
-     * You can call this method with the following syntaxes:
-     *
-     * add(Sabre_VObject_Parameter $element)
-     * add(string $name, $value)
-     *
-     * The first version adds an Parameter 
-     * The second adds a property as a string. 
-     * 
-     * @param mixed $item 
-     * @param mixed $itemValue 
-     * @return void
-     */
-    public function add($item, $itemValue = null) {
-
-        if ($item instanceof Sabre_VObject_Parameter) {
-            if (!is_null($itemValue)) {
-                throw new InvalidArgumentException('The second argument must not be specified, when passing a VObject');
-            }
-            $item->parent = $this;
-            $this->parameters[] = $item;
-        } elseif(is_string($item)) {
-
-            if (!is_scalar($itemValue)) {
-                throw new InvalidArgumentException('The second argument must be scalar');
-            }
-            $parameter = new Sabre_VObject_Parameter($item,$itemValue);
-            $parameter->parent = $this;
-            $this->parameters[] = $parameter;
-
-        } else {
-            
-            throw new InvalidArgumentException('The first argument must either be a Sabre_VObject_Element or a string');
-
-        }
-
-    }
-
-
-    /* ArrayAccess interface {{{ */
-
-    /**
-     * Checks if an array element exists
-     * 
-     * @param mixed $name 
-     * @return bool 
-     */
-    public function offsetExists($name) {
-
-        if (is_int($name)) return parent::offsetExists($name);
-
-        $name = strtoupper($name);
-
-        foreach($this->parameters as $parameter) {
-            if ($parameter->name == $name) return true;
-        }
-        return false;
-
-    }
-
-    /**
-     * Returns a parameter, or parameter list. 
-     * 
-     * @param string $name 
-     * @return Sabre_VObject_Element 
-     */
-    public function offsetGet($name) {
-
-        if (is_int($name)) return parent::offsetGet($name);
-        $name = strtoupper($name);
-        
-        $result = array();
-        foreach($this->parameters as $parameter) {
-            if ($parameter->name == $name)
-                $result[] = $parameter;
-        }
-
-        if (count($result)===0) {
-            return null;
-        } elseif (count($result)===1) {
-            return $result[0];
-        } else {
-            $result[0]->setIterator(new Sabre_VObject_ElementList($result));
-            return $result[0];
-        }
-
-    }
-
-    /**
-     * Creates a new parameter 
-     * 
-     * @param string $name
-     * @param mixed $value
-     * @return void
-     */
-    public function offsetSet($name, $value) {
-
-        if (is_int($name)) return parent::offsetSet($name, $value);
-
-        if (is_scalar($value)) {
-            if (!is_string($name)) 
-                throw new InvalidArgumentException('A parameter name must be specified. This means you cannot use the $array[]="string" to add parameters.');
-
-            $this->offsetUnset($name);
-            $parameter = new Sabre_VObject_Parameter($name, $value);
-            $parameter->parent = $this;
-            $this->parameters[] = $parameter;
-
-        } elseif ($value instanceof Sabre_VObject_Parameter) {
-            if (!is_null($name))
-                throw new InvalidArgumentException('Don\'t specify a parameter name if you\'re passing a Sabre_VObject_Parameter. Add using $array[]=$parameterObject.');
-
-            $value->parent = $this; 
-            $this->parameters[] = $value;
-        } else {
-            throw new InvalidArgumentException('You can only add parameters to the property object');
-        }
-
-    }
-
-    /**
-     * Removes one or more parameters with the specified name 
-     * 
-     * @param string $name 
-     * @return void 
-     */
-    public function offsetUnset($name) {
-
-        if (is_int($name)) return parent::offsetUnset($name, $value);
-        $name = strtoupper($name);
-        
-        $result = array();
-        foreach($this->parameters as $key=>$parameter) {
-            if ($parameter->name == $name) {
-                $parameter->parent = null;
-                unset($this->parameters[$key]);
-            }
-
-        }
-
-    }
-
-    /* }}} */
-
-    /**
-     * Called when this object is being cast to a string 
-     * 
-     * @return string 
-     */
-    public function __toString() {
-
-        return $this->value;
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/VObject/Reader.php b/3rdparty/Sabre/VObject/Reader.php
deleted file mode 100644
index 7d1c282838e..00000000000
--- a/3rdparty/Sabre/VObject/Reader.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-/**
- * VCALENDAR/VCARD reader
- *
- * This class reads the vobject file, and returns a full element tree.
- *
- *
- * TODO: this class currently completely works 'statically'. This is pointless, 
- * and defeats OOP principals. Needs refaxtoring in a future version.
- * 
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Reader {
-
-    /**
-     * This array contains a list of Property names that are automatically 
-     * mapped to specific class names.
-     *
-     * Adding to this list allows you to specify custom property classes, 
-     * adding extra functionality. 
-     * 
-     * @var array
-     */
-    static public $elementMap = array(
-        'DTSTART'   => 'Sabre_VObject_Element_DateTime',
-        'DTEND'     => 'Sabre_VObject_Element_DateTime',
-        'COMPLETED' => 'Sabre_VObject_Element_DateTime',
-        'DUE'       => 'Sabre_VObject_Element_DateTime',
-        'EXDATE'    => 'Sabre_VObject_Element_MultiDateTime',
-    );
-
-    /**
-     * Parses the file and returns the top component 
-     * 
-     * @param string $data 
-     * @return Sabre_VObject_Element 
-     */
-    static function read($data) {
-
-        // Normalizing newlines
-        $data = str_replace(array("\r","\n\n"), array("\n","\n"), $data);
-
-        $lines = explode("\n", $data);
-
-        // Unfolding lines
-        $lines2 = array();
-        foreach($lines as $line) {
-
-            // Skipping empty lines
-            if (!$line) continue;
-
-            if ($line[0]===" " || $line[0]==="\t") {
-                $lines2[count($lines2)-1].=substr($line,1);
-            } else {
-                $lines2[] = $line;
-            }
-
-        }
-
-        unset($lines);
-        
-        reset($lines2);
-
-        return self::readLine($lines2);
-       
-    }
-
-    /**
-     * Reads and parses a single line.
-     *
-     * This method receives the full array of lines. The array pointer is used
-     * to traverse.
-     * 
-     * @param array $lines 
-     * @return Sabre_VObject_Element 
-     */
-    static private function readLine(&$lines) {
-
-        $line = current($lines);
-        $lineNr = key($lines);
-        next($lines);
-
-        // Components
-        if (stripos($line,"BEGIN:")===0) {
-
-            // This is a component
-            $obj = new Sabre_VObject_Component(strtoupper(substr($line,6)));
-
-            $nextLine = current($lines);
-
-            while(stripos($nextLine,"END:")!==0) {
-
-                $obj->add(self::readLine($lines));
-                $nextLine = current($lines);
-
-                if ($nextLine===false) 
-                    throw new Sabre_VObject_ParseException('Invalid VObject. Document ended prematurely.');
-
-            }
-
-            // Checking component name of the 'END:' line. 
-            if (substr($nextLine,4)!==$obj->name) {
-                throw new Sabre_VObject_ParseException('Invalid VObject, expected: "END:' . $obj->name . '" got: "' . $nextLine . '"');
-            }
-            next($lines);
-
-            return $obj;
-
-        }
-
-        // Properties
-        //$result = preg_match('/(?P<name>[A-Z0-9-]+)(?:;(?P<parameters>^(?<!:):))(.*)$/',$line,$matches);
-
-
-        $token = '[A-Z0-9-\/\.]+';
-        $parameters = "(?:;(?P<parameters>([^:^\"]|\"([^\"]*)\")*))?";
-        $regex = "/^(?P<name>$token)$parameters:(?P<value>.*)$/i";
-
-        $result = preg_match($regex,$line,$matches);
-
-        if (!$result) {
-            throw new Sabre_VObject_ParseException('Invalid VObject, line ' . ($lineNr+1) . ' did not follow the icalendar/vcard format');
-        }
-
-        $propertyName = strtoupper($matches['name']);
-        $propertyValue = stripcslashes($matches['value']);
-
-        if (isset(self::$elementMap[$propertyName])) {
-            $className = self::$elementMap[$propertyName];
-        } else {
-            $className = 'Sabre_VObject_Property';
-        }
-
-        $obj = new $className($propertyName, $propertyValue);
-
-        if ($matches['parameters']) {
-
-            foreach(self::readParameters($matches['parameters']) as $param) {
-                $obj->add($param);
-            }
-        } 
-
-        return $obj;
-
-
-    }
-
-    /**
-     * Reads a parameter list from a property 
-     *
-     * This method returns an array of Sabre_VObject_Parameter
-     *
-     * @param string $parameters 
-     * @return array 
-     */
-    static private function readParameters($parameters) {
-
-        $token = '[A-Z0-9-]+';
-
-        $paramValue = '(?P<paramValue>[^\"^;]*|"[^"]*")';
-
-        $regex = "/(?<=^|;)(?P<paramName>$token)(=$paramValue(?=$|;))?/i";
-        preg_match_all($regex, $parameters, $matches,  PREG_SET_ORDER);
-
-        $params = array();
-        foreach($matches as $match) {
-
-            $value = isset($match['paramValue'])?$match['paramValue']:null;
-
-            if (isset($value[0])) {
-                // Stripping quotes, if needed
-                if ($value[0] === '"') $value = substr($value,1,strlen($value)-2);
-            } else {
-                $value = '';
-            }
-
-            $params[] = new Sabre_VObject_Parameter($match['paramName'], stripcslashes($value));
-
-        }
-
-        return $params;
-
-    }
-
-
-}
diff --git a/3rdparty/Sabre/VObject/Version.php b/3rdparty/Sabre/VObject/Version.php
deleted file mode 100644
index 937c367e222..00000000000
--- a/3rdparty/Sabre/VObject/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * This class contains the version number for the VObject package
- * 
- * @package Sabre
- * @subpackage VObject 
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sabre_VObject_Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.2.4';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/3rdparty/Sabre/VObject/includes.php b/3rdparty/Sabre/VObject/includes.php
deleted file mode 100644
index f21010fb275..00000000000
--- a/3rdparty/Sabre/VObject/includes.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * VObject includes 
- *
- * This file automatically includes all VObject classes 
- *
- * @package Sabre
- * @subpackage VObject
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-
-include dirname(__FILE__) . '/ParseException.php';
-
-include dirname(__FILE__) . '/Node.php';
-include dirname(__FILE__) . '/Element.php';
-include dirname(__FILE__) . '/ElementList.php';
-include dirname(__FILE__) . '/Parameter.php';
-include dirname(__FILE__) . '/Property.php';
-include dirname(__FILE__) . '/Component.php';
-
-include dirname(__FILE__) . '/Element/DateTime.php';
-include dirname(__FILE__) . '/Element/MultiDateTime.php';
-
-include dirname(__FILE__) . '/Reader.php';
-include dirname(__FILE__) . '/Version.php';
diff --git a/3rdparty/Sabre/autoload.php b/3rdparty/Sabre/autoload.php
deleted file mode 100644
index 0649df655b0..00000000000
--- a/3rdparty/Sabre/autoload.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * SabreDAV's PHP autoloader
- *
- * If you love the autoloader, and don't care as much about performance, this
- * file register a new autoload function using spl_autoload_register.
- *
- * @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-function Sabre_autoload($className) {
-
-    if(strpos($className,'Sabre_')===0) {
-
-        include dirname(__FILE__) . '/' . str_replace('_','/',substr($className,6)) . '.php';
-
-    }
-
-}
-
-spl_autoload_register('Sabre_autoload');
-
diff --git a/3rdparty/System.php b/3rdparty/System.php
deleted file mode 100644
index 97de96b14ca..00000000000
--- a/3rdparty/System.php
+++ /dev/null
@@ -1,540 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Tomas V.V.Cox <cox@idecnet.com>                             |
-// +----------------------------------------------------------------------+
-//
-// $Id: System.php,v 1.36 2004/06/15 16:33:46 pajoye Exp $
-//
-
-require_once( 'PEAR.php');
-require_once( 'Console/Getopt.php');
-
-$GLOBALS['_System_temp_files'] = array();
-
-/**
-* System offers cross plattform compatible system functions
-*
-* Static functions for different operations. Should work under
-* Unix and Windows. The names and usage has been taken from its respectively
-* GNU commands. The functions will return (bool) false on error and will
-* trigger the error with the PHP trigger_error() function (you can silence
-* the error by prefixing a '@' sign after the function call).
-*
-* Documentation on this class you can find in:
-* http://pear.php.net/manual/
-*
-* Example usage:
-* if (!@System::rm('-r file1 dir1')) {
-*    print "could not delete file1 or dir1";
-* }
-*
-* In case you need to to pass file names with spaces,
-* pass the params as an array:
-*
-* System::rm(array('-r', $file1, $dir1));
-*
-* @package  System
-* @author   Tomas V.V.Cox <cox@idecnet.com>
-* @version  $Revision: 1.36 $
-* @access   public
-* @see      http://pear.php.net/manual/
-*/
-class System
-{
-    /**
-    * returns the commandline arguments of a function
-    *
-    * @param    string  $argv           the commandline
-    * @param    string  $short_options  the allowed option short-tags
-    * @param    string  $long_options   the allowed option long-tags
-    * @return   array   the given options and there values
-    * @access private
-    */
-    function _parseArgs($argv, $short_options, $long_options = null)
-    {
-        if (!is_array($argv) && $argv !== null) {
-            $argv = preg_split('/\s+/', $argv);
-        }
-        return Console_Getopt::getopt2($argv, $short_options);
-    }
-
-    /**
-    * Output errors with PHP trigger_error(). You can silence the errors
-    * with prefixing a "@" sign to the function call: @System::mkdir(..);
-    *
-    * @param mixed $error a PEAR error or a string with the error message
-    * @return bool false
-    * @access private
-    */
-    function raiseError($error)
-    {
-        if (PEAR::isError($error)) {
-            $error = $error->getMessage();
-        }
-        trigger_error($error, E_USER_WARNING);
-        return false;
-    }
-
-    /**
-    * Creates a nested array representing the structure of a directory
-    *
-    * System::_dirToStruct('dir1', 0) =>
-    *   Array
-    *    (
-    *    [dirs] => Array
-    *        (
-    *            [0] => dir1
-    *        )
-    *
-    *    [files] => Array
-    *        (
-    *            [0] => dir1/file2
-    *            [1] => dir1/file3
-    *        )
-    *    )
-    * @param    string  $sPath      Name of the directory
-    * @param    integer $maxinst    max. deep of the lookup
-    * @param    integer $aktinst    starting deep of the lookup
-    * @return   array   the structure of the dir
-    * @access   private
-    */
-
-    function _dirToStruct($sPath, $maxinst, $aktinst = 0)
-    {
-        $struct = array('dirs' => array(), 'files' => array());
-        if (($dir = @opendir($sPath)) === false) {
-            System::raiseError("Could not open dir $sPath");
-            return $struct; // XXX could not open error
-        }
-        $struct['dirs'][] = $sPath; // XXX don't add if '.' or '..' ?
-        $list = array();
-        while ($file = readdir($dir)) {
-            if ($file != '.' && $file != '..') {
-                $list[] = $file;
-            }
-        }
-        closedir($dir);
-        sort($list);
-        if ($aktinst < $maxinst || $maxinst == 0) {
-            foreach($list as $val) {
-                $path = $sPath . DIRECTORY_SEPARATOR . $val;
-                if (is_dir($path)) {
-                    $tmp = System::_dirToStruct($path, $maxinst, $aktinst+1);
-                    $struct = array_merge_recursive($tmp, $struct);
-                } else {
-                    $struct['files'][] = $path;
-                }
-            }
-        }
-        return $struct;
-    }
-
-    /**
-    * Creates a nested array representing the structure of a directory and files
-    *
-    * @param    array $files Array listing files and dirs
-    * @return   array
-    * @see System::_dirToStruct()
-    */
-    function _multipleToStruct($files)
-    {
-        $struct = array('dirs' => array(), 'files' => array());
-        settype($files, 'array');
-        foreach ($files as $file) {
-            if (is_dir($file)) {
-                $tmp = System::_dirToStruct($file, 0);
-                $struct = array_merge_recursive($tmp, $struct);
-            } else {
-                $struct['files'][] = $file;
-            }
-        }
-        return $struct;
-    }
-
-    /**
-    * The rm command for removing files.
-    * Supports multiple files and dirs and also recursive deletes
-    *
-    * @param    string  $args   the arguments for rm
-    * @return   mixed   PEAR_Error or true for success
-    * @access   public
-    */
-    function rm($args)
-    {
-        $opts = System::_parseArgs($args, 'rf'); // "f" do nothing but like it :-)
-        if (PEAR::isError($opts)) {
-            return System::raiseError($opts);
-        }
-        foreach($opts[0] as $opt) {
-            if ($opt[0] == 'r') {
-                $do_recursive = true;
-            }
-        }
-        $ret = true;
-        if (isset($do_recursive)) {
-            $struct = System::_multipleToStruct($opts[1]);
-            foreach($struct['files'] as $file) {
-                if (!@unlink($file)) {
-                    $ret = false;
-                }
-            }
-            foreach($struct['dirs'] as $dir) {
-                if (!@rmdir($dir)) {
-                    $ret = false;
-                }
-            }
-        } else {
-            foreach ($opts[1] as $file) {
-                $delete = (is_dir($file)) ? 'rmdir' : 'unlink';
-                if (!@$delete($file)) {
-                    $ret = false;
-                }
-            }
-        }
-        return $ret;
-    }
-
-    /**
-    * Make directories. Note that we use call_user_func('mkdir') to avoid
-    * a problem with ZE2 calling System::mkDir instead of the native PHP func.
-    *
-    * @param    string  $args    the name of the director(y|ies) to create
-    * @return   bool    True for success
-    * @access   public
-    */
-    function mkDir($args)
-    {
-        $opts = System::_parseArgs($args, 'pm:');
-        if (PEAR::isError($opts)) {
-            return System::raiseError($opts);
-        }
-        $mode = 0777; // default mode
-        foreach($opts[0] as $opt) {
-            if ($opt[0] == 'p') {
-                $create_parents = true;
-            } elseif($opt[0] == 'm') {
-                // if the mode is clearly an octal number (starts with 0)
-                // convert it to decimal
-                if (strlen($opt[1]) && $opt[1]{0} == '0') {
-                    $opt[1] = octdec($opt[1]);
-                } else {
-                    // convert to int
-                    $opt[1] += 0;
-                }
-                $mode = $opt[1];
-            }
-        }
-        $ret = true;
-        if (isset($create_parents)) {
-            foreach($opts[1] as $dir) {
-                $dirstack = array();
-                while (!@is_dir($dir) && $dir != DIRECTORY_SEPARATOR) {
-                    array_unshift($dirstack, $dir);
-                    $dir = dirname($dir);
-                }
-                while ($newdir = array_shift($dirstack)) {
-                    if (!call_user_func('mkdir', $newdir, $mode)) {
-                        $ret = false;
-                    }
-                }
-            }
-        } else {
-            foreach($opts[1] as $dir) {
-                if (!@is_dir($dir) && !call_user_func('mkdir', $dir, $mode)) {
-                    $ret = false;
-                }
-            }
-        }
-        return $ret;
-    }
-
-    /**
-    * Concatenate files
-    *
-    * Usage:
-    * 1) $var = System::cat('sample.txt test.txt');
-    * 2) System::cat('sample.txt test.txt > final.txt');
-    * 3) System::cat('sample.txt test.txt >> final.txt');
-    *
-    * Note: as the class use fopen, urls should work also (test that)
-    *
-    * @param    string  $args   the arguments
-    * @return   boolean true on success
-    * @access   public
-    */
-    function &cat($args)
-    {
-        $ret = null;
-        $files = array();
-        if (!is_array($args)) {
-            $args = preg_split('/\s+/', $args);
-        }
-        for($i=0; $i < count($args); $i++) {
-            if ($args[$i] == '>') {
-                $mode = 'wb';
-                $outputfile = $args[$i+1];
-                break;
-            } elseif ($args[$i] == '>>') {
-                $mode = 'ab+';
-                $outputfile = $args[$i+1];
-                break;
-            } else {
-                $files[] = $args[$i];
-            }
-        }
-        if (isset($mode)) {
-            if (!$outputfd = fopen($outputfile, $mode)) {
-                $err = System::raiseError("Could not open $outputfile");
-                return $err;
-            }
-            $ret = true;
-        }
-        foreach ($files as $file) {
-            if (!$fd = fopen($file, 'r')) {
-                System::raiseError("Could not open $file");
-                continue;
-            }
-            while ($cont = fread($fd, 2048)) {
-                if (isset($outputfd)) {
-                    fwrite($outputfd, $cont);
-                } else {
-                    $ret .= $cont;
-                }
-            }
-            fclose($fd);
-        }
-        if (@is_resource($outputfd)) {
-            fclose($outputfd);
-        }
-        return $ret;
-    }
-
-    /**
-    * Creates temporary files or directories. This function will remove
-    * the created files when the scripts finish its execution.
-    *
-    * Usage:
-    *   1) $tempfile = System::mktemp("prefix");
-    *   2) $tempdir  = System::mktemp("-d prefix");
-    *   3) $tempfile = System::mktemp();
-    *   4) $tempfile = System::mktemp("-t /var/tmp prefix");
-    *
-    * prefix -> The string that will be prepended to the temp name
-    *           (defaults to "tmp").
-    * -d     -> A temporary dir will be created instead of a file.
-    * -t     -> The target dir where the temporary (file|dir) will be created. If
-    *           this param is missing by default the env vars TMP on Windows or
-    *           TMPDIR in Unix will be used. If these vars are also missing
-    *           c:\windows\temp or /tmp will be used.
-    *
-    * @param   string  $args  The arguments
-    * @return  mixed   the full path of the created (file|dir) or false
-    * @see System::tmpdir()
-    * @access  public
-    */
-    function mktemp($args = null)
-    {
-        static $first_time = true;
-        $opts = System::_parseArgs($args, 't:d');
-        if (PEAR::isError($opts)) {
-            return System::raiseError($opts);
-        }
-        foreach($opts[0] as $opt) {
-            if($opt[0] == 'd') {
-                $tmp_is_dir = true;
-            } elseif($opt[0] == 't') {
-                $tmpdir = $opt[1];
-            }
-        }
-        $prefix = (isset($opts[1][0])) ? $opts[1][0] : 'tmp';
-        if (!isset($tmpdir)) {
-            $tmpdir = System::tmpdir();
-        }
-        if (!System::mkDir("-p $tmpdir")) {
-            return false;
-        }
-        $tmp = tempnam($tmpdir, $prefix);
-        if (isset($tmp_is_dir)) {
-            unlink($tmp); // be careful possible race condition here
-            if (!call_user_func('mkdir', $tmp, 0700)) {
-                return System::raiseError("Unable to create temporary directory $tmpdir");
-            }
-        }
-        $GLOBALS['_System_temp_files'][] = $tmp;
-        if ($first_time) {
-            PEAR::registerShutdownFunc(array('System', '_removeTmpFiles'));
-            $first_time = false;
-        }
-        return $tmp;
-    }
-
-    /**
-    * Remove temporary files created my mkTemp. This function is executed
-    * at script shutdown time
-    *
-    * @access private
-    */
-    function _removeTmpFiles()
-    {
-        if (count($GLOBALS['_System_temp_files'])) {
-            $delete = $GLOBALS['_System_temp_files'];
-            array_unshift($delete, '-r');
-            System::rm($delete);
-        }
-    }
-
-    /**
-    * Get the path of the temporal directory set in the system
-    * by looking in its environments variables.
-    * Note: php.ini-recommended removes the "E" from the variables_order setting,
-    * making unavaible the $_ENV array, that s why we do tests with _ENV
-    *
-    * @return string The temporal directory on the system
-    */
-    function tmpdir()
-    {
-        if (OS_WINDOWS) {
-            if ($var = isset($_ENV['TEMP']) ? $_ENV['TEMP'] : getenv('TEMP')) {
-                return $var;
-            }
-            if ($var = isset($_ENV['TMP']) ? $_ENV['TMP'] : getenv('TMP')) {
-                return $var;
-            }
-            if ($var = isset($_ENV['windir']) ? $_ENV['windir'] : getenv('windir')) {
-                return $var;
-            }
-            return getenv('SystemRoot') . '\temp';
-        }
-        if ($var = isset($_ENV['TMPDIR']) ? $_ENV['TMPDIR'] : getenv('TMPDIR')) {
-            return $var;
-        }
-        return '/tmp';
-    }
-
-    /**
-    * The "which" command (show the full path of a command)
-    *
-    * @param string $program The command to search for
-    * @return mixed A string with the full path or false if not found
-    * @author Stig Bakken <ssb@php.net>
-    */
-    function which($program, $fallback = false)
-    {
-        // is_executable() is not available on windows
-        if (OS_WINDOWS) {
-            $pear_is_executable = 'is_file';
-        } else {
-            $pear_is_executable = 'is_executable';
-        }
-
-        // full path given
-        if (basename($program) != $program) {
-            return (@$pear_is_executable($program)) ? $program : $fallback;
-        }
-
-        // XXX FIXME honor safe mode
-        $path_delim = OS_WINDOWS ? ';' : ':';
-        $exe_suffixes = OS_WINDOWS ? array('.exe','.bat','.cmd','.com') : array('');
-        $path_elements = explode($path_delim, getenv('PATH'));
-        foreach ($exe_suffixes as $suff) {
-            foreach ($path_elements as $dir) {
-                $file = $dir . DIRECTORY_SEPARATOR . $program . $suff;
-                if (@is_file($file) && @$pear_is_executable($file)) {
-                    return $file;
-                }
-            }
-        }
-        return $fallback;
-    }
-
-    /**
-    * The "find" command
-    *
-    * Usage:
-    *
-    * System::find($dir);
-    * System::find("$dir -type d");
-    * System::find("$dir -type f");
-    * System::find("$dir -name *.php");
-    * System::find("$dir -name *.php -name *.htm*");
-    * System::find("$dir -maxdepth 1");
-    *
-    * Params implmented:
-    * $dir            -> Start the search at this directory
-    * -type d         -> return only directories
-    * -type f         -> return only files
-    * -maxdepth <n>   -> max depth of recursion
-    * -name <pattern> -> search pattern (bash style). Multiple -name param allowed
-    *
-    * @param  mixed Either array or string with the command line
-    * @return array Array of found files
-    *
-    */
-    function find($args)
-    {
-        if (!is_array($args)) {
-            $args = preg_split('/\s+/', $args, -1, PREG_SPLIT_NO_EMPTY);
-        }
-        $dir = array_shift($args);
-        $patterns = array();
-        $depth = 0;
-        $do_files = $do_dirs = true;
-        for ($i = 0; $i < count($args); $i++) {
-            switch ($args[$i]) {
-                case '-type':
-                    if (in_array($args[$i+1], array('d', 'f'))) {
-                        if ($args[$i+1] == 'd') {
-                             $do_files = false;
-                        } else {
-                            $do_dirs = false;
-                        }
-                    }
-                    $i++;
-                    break;
-                case '-name':
-                    $patterns[] = "(" . preg_replace(array('/\./', '/\*/'),
-                                                     array('\.', '.*'),
-                                                     $args[$i+1])
-                                      . ")";
-                    $i++;
-                    break;
-                case '-maxdepth':
-                    $depth = $args[$i+1];
-                    break;
-            }
-        }
-        $path = System::_dirToStruct($dir, $depth);
-        if ($do_files && $do_dirs) {
-            $files = array_merge($path['files'], $path['dirs']);
-        } elseif ($do_dirs) {
-            $files = $path['dirs'];
-        } else {
-            $files = $path['files'];
-        }
-        if (count($patterns)) {
-            $patterns = implode('|', $patterns);
-            $ret = array();
-            for ($i = 0; $i < count($files); $i++) {
-                if (preg_match("#^$patterns\$#", $files[$i])) {
-                    $ret[] = $files[$i];
-                }
-            }
-            return $ret;
-        }
-        return $files;
-    }
-}
-?>
diff --git a/3rdparty/XML/Parser.php b/3rdparty/XML/Parser.php
deleted file mode 100644
index 38b4f8fe8a6..00000000000
--- a/3rdparty/XML/Parser.php
+++ /dev/null
@@ -1,667 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Stig Bakken <ssb@fast.no>                                    |
-// |         Tomas V.V.Cox <cox@idecnet.com>                              |
-// |         Stephan Schmidt <schst@php-tools.net>                        |
-// +----------------------------------------------------------------------+
-//
-// $Id: Parser.php,v 1.25 2005/03/25 17:13:10 schst Exp $
-
-/**
- * XML Parser class.
- *
- * This is an XML parser based on PHP's "xml" extension,
- * based on the bundled expat library.
- *
- * @category XML
- * @package XML_Parser
- * @author  Stig Bakken <ssb@fast.no>
- * @author  Tomas V.V.Cox <cox@idecnet.com>
- * @author  Stephan Schmidt <schst@php-tools.net>
- */
-
-/**
- * uses PEAR's error handling
- */
-require_once('PEAR.php');
-
-/**
- * resource could not be created
- */
-define('XML_PARSER_ERROR_NO_RESOURCE', 200);
-
-/**
- * unsupported mode
- */
-define('XML_PARSER_ERROR_UNSUPPORTED_MODE', 201);
-
-/**
- * invalid encoding was given
- */
-define('XML_PARSER_ERROR_INVALID_ENCODING', 202);
-
-/**
- * specified file could not be read
- */
-define('XML_PARSER_ERROR_FILE_NOT_READABLE', 203);
-
-/**
- * invalid input
- */
-define('XML_PARSER_ERROR_INVALID_INPUT', 204);
-
-/**
- * remote file cannot be retrieved in safe mode
- */
-define('XML_PARSER_ERROR_REMOTE', 205);
-
-/**
- * XML Parser class.
- *
- * This is an XML parser based on PHP's "xml" extension,
- * based on the bundled expat library.
- *
- * Notes:
- * - It requires PHP 4.0.4pl1 or greater
- * - From revision 1.17, the function names used by the 'func' mode
- *   are in the format "xmltag_$elem", for example: use "xmltag_name"
- *   to handle the <name></name> tags of your xml file.
- *
- * @category XML
- * @package XML_Parser
- * @author  Stig Bakken <ssb@fast.no>
- * @author  Tomas V.V.Cox <cox@idecnet.com>
- * @author  Stephan Schmidt <schst@php-tools.net>
- * @todo    create XML_Parser_Namespace to parse documents with namespaces
- * @todo    create XML_Parser_Pull
- * @todo    Tests that need to be made:
- *          - mixing character encodings
- *          - a test using all expat handlers
- *          - options (folding, output charset)
- *          - different parsing modes
- */
-class XML_Parser extends PEAR
-{
-    // {{{ properties
-
-   /**
-     * XML parser handle
-     *
-     * @var  resource
-     * @see  xml_parser_create()
-     */
-    var $parser;
-
-    /**
-     * File handle if parsing from a file
-     *
-     * @var  resource
-     */
-    var $fp;
-
-    /**
-     * Whether to do case folding
-     *
-     * If set to true, all tag and attribute names will
-     * be converted to UPPER CASE.
-     *
-     * @var  boolean
-     */
-    var $folding = true;
-
-    /**
-     * Mode of operation, one of "event" or "func"
-     *
-     * @var  string
-     */
-    var $mode;
-
-    /**
-     * Mapping from expat handler function to class method.
-     *
-     * @var  array
-     */
-    var $handler = array(
-        'character_data_handler'            => 'cdataHandler',
-        'default_handler'                   => 'defaultHandler',
-        'processing_instruction_handler'    => 'piHandler',
-        'unparsed_entity_decl_handler'      => 'unparsedHandler',
-        'notation_decl_handler'             => 'notationHandler',
-        'external_entity_ref_handler'       => 'entityrefHandler'
-    );
-
-    /**
-     * source encoding
-     *
-     * @var string
-     */
-    var $srcenc;
-
-    /**
-     * target encoding
-     *
-     * @var string
-     */
-    var $tgtenc;
-
-    /**
-     * handler object
-     *
-     * @var object
-     */
-    var $_handlerObj;
-
-    // }}}
-
-    /**
-     * PHP5 constructor
-     *
-     * @param string $srcenc source charset encoding, use NULL (default) to use
-     *                       whatever the document specifies
-     * @param string $mode   how this parser object should work, "event" for
-     *                       startelement/endelement-type events, "func"
-     *                       to have it call functions named after elements
-     * @param string $tgenc  a valid target encoding
-     */
-    function __construct($srcenc = null, $mode = 'event', $tgtenc = null)
-    {
-        $this->PEAR('XML_Parser_Error');
-
-        $this->mode   = $mode;
-        $this->srcenc = $srcenc;
-        $this->tgtenc = $tgtenc;
-    }
-    // }}}
-
-    /**
-     * Sets the mode of the parser.
-     *
-     * Possible modes are:
-     * - func
-     * - event
-     *
-     * You can set the mode using the second parameter
-     * in the constructor.
-     *
-     * This method is only needed, when switching to a new
-     * mode at a later point.
-     *
-     * @access  public
-     * @param   string          mode, either 'func' or 'event'
-     * @return  boolean|object  true on success, PEAR_Error otherwise   
-     */
-    function setMode($mode)
-    {
-        if ($mode != 'func' && $mode != 'event') {
-            $this->raiseError('Unsupported mode given', XML_PARSER_ERROR_UNSUPPORTED_MODE);
-        }
-
-        $this->mode = $mode;
-        return true;
-    }
-
-    /**
-     * Sets the object, that will handle the XML events
-     *
-     * This allows you to create a handler object independent of the
-     * parser object that you are using and easily switch the underlying
-     * parser.
-     *
-     * If no object will be set, XML_Parser assumes that you
-     * extend this class and handle the events in $this.
-     *
-     * @access  public
-     * @param   object      object to handle the events
-     * @return  boolean     will always return true
-     * @since   v1.2.0beta3
-     */
-    function setHandlerObj(&$obj)
-    {
-        $this->_handlerObj = &$obj;
-        return true;
-    }
-
-    /**
-     * Init the element handlers
-     *
-     * @access  private
-     */
-    function _initHandlers()
-    {
-        if (!is_resource($this->parser)) {
-            return false;
-        }
-
-        if (!is_object($this->_handlerObj)) {
-            $this->_handlerObj = &$this;
-        }
-        switch ($this->mode) {
-
-            case 'func':
-                xml_set_object($this->parser, $this->_handlerObj);
-                xml_set_element_handler($this->parser, array(&$this, 'funcStartHandler'), array(&$this, 'funcEndHandler'));
-                break;
-
-            case 'event':
-                xml_set_object($this->parser, $this->_handlerObj);
-                xml_set_element_handler($this->parser, 'startHandler', 'endHandler');
-                break;
-            default:
-                return $this->raiseError('Unsupported mode given', XML_PARSER_ERROR_UNSUPPORTED_MODE);
-                break;
-        }
-
-
-        /**
-         * set additional handlers for character data, entities, etc.
-         */
-        foreach ($this->handler as $xml_func => $method) {
-            if (method_exists($this->_handlerObj, $method)) {
-                $xml_func = 'xml_set_' . $xml_func;
-                $xml_func($this->parser, $method);
-            }
-		}
-    }
-
-    // {{{ _create()
-
-    /**
-     * create the XML parser resource
-     *
-     * Has been moved from the constructor to avoid
-     * problems with object references.
-     *
-     * Furthermore it allows us returning an error
-     * if something fails.
-     *
-     * @access   private
-     * @return   boolean|object     true on success, PEAR_Error otherwise
-     *
-     * @see xml_parser_create
-     */
-    function _create()
-    {
-        if ($this->srcenc === null) {
-            $xp = @xml_parser_create();
-        } else {
-            $xp = @xml_parser_create($this->srcenc);
-        }
-        if (is_resource($xp)) {
-            if ($this->tgtenc !== null) {
-                if (!@xml_parser_set_option($xp, XML_OPTION_TARGET_ENCODING,
-                                            $this->tgtenc)) {
-                    return $this->raiseError('invalid target encoding', XML_PARSER_ERROR_INVALID_ENCODING);
-                }
-            }
-            $this->parser = $xp;
-            $result = $this->_initHandlers($this->mode);
-            if ($this->isError($result)) {
-                return $result;
-            }
-            xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, $this->folding);
-
-            return true;
-        }
-        return $this->raiseError('Unable to create XML parser resource.', XML_PARSER_ERROR_NO_RESOURCE);
-    }
-
-    // }}}
-    // {{{ reset()
-
-    /**
-     * Reset the parser.
-     *
-     * This allows you to use one parser instance
-     * to parse multiple XML documents.
-     *
-     * @access   public
-     * @return   boolean|object     true on success, PEAR_Error otherwise
-     */
-    function reset()
-    {
-        $result = $this->_create();
-        if ($this->isError( $result )) {
-            return $result;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ setInputFile()
-
-    /**
-     * Sets the input xml file to be parsed
-     *
-     * @param    string      Filename (full path)
-     * @return   resource    fopen handle of the given file
-     * @throws   XML_Parser_Error
-     * @see      setInput(), setInputString(), parse()
-     * @access   public
-     */
-    function setInputFile($file)
-    {
-        /**
-         * check, if file is a remote file
-         */
-        if (preg_match('[^(http|ftp)://]', substr($file, 0, 10))) {
-            if (!ini_get('allow_url_fopen')) {
-            	return $this->raiseError('Remote files cannot be parsed, as safe mode is enabled.', XML_PARSER_ERROR_REMOTE);
-            }
-        }
-        $fp = fopen($file, 'rb');
-        if (is_resource($fp)) {
-            $this->fp = $fp;
-            return $fp;
-        }
-        return $this->raiseError('File could not be opened.', XML_PARSER_ERROR_FILE_NOT_READABLE);
-    }
-
-    // }}}
-    // {{{ setInputString()
-    
-    /**
-     * XML_Parser::setInputString()
-     * 
-     * Sets the xml input from a string
-     * 
-     * @param string $data a string containing the XML document
-     * @return null
-     **/
-    function setInputString($data)
-    {
-        $this->fp = $data;
-        return null;
-    }
-    
-    // }}}
-    // {{{ setInput()
-
-    /**
-     * Sets the file handle to use with parse().
-     *
-     * You should use setInputFile() or setInputString() if you
-     * pass a string 
-     *
-     * @param    mixed  $fp  Can be either a resource returned from fopen(),
-     *                       a URL, a local filename or a string.
-     * @access   public
-     * @see      parse()
-     * @uses     setInputString(), setInputFile()
-     */
-    function setInput($fp)
-    {
-        if (is_resource($fp)) {
-            $this->fp = $fp;
-            return true;
-        }
-        // see if it's an absolute URL (has a scheme at the beginning)
-        elseif (eregi('^[a-z]+://', substr($fp, 0, 10))) {
-            return $this->setInputFile($fp);
-        }
-        // see if it's a local file
-        elseif (file_exists($fp)) {
-            return $this->setInputFile($fp);
-        }
-        // it must be a string
-        else {
-            $this->fp = $fp;
-            return true;
-        }
-
-        return $this->raiseError('Illegal input format', XML_PARSER_ERROR_INVALID_INPUT);
-    }
-
-    // }}}
-    // {{{ parse()
-
-    /**
-     * Central parsing function.
-     *
-     * @return   true|object PEAR error     returns true on success, or a PEAR_Error otherwise
-     * @access   public
-     */
-    function parse()
-    {
-        /**
-         * reset the parser
-         */
-        $result = $this->reset();
-        if ($this->isError($result)) {
-            return $result;
-        }
-        // if $this->fp was fopened previously
-        if (is_resource($this->fp)) {
-        
-            while ($data = fread($this->fp, 4096)) {
-                if (!$this->_parseString($data, feof($this->fp))) {
-                    $error = &$this->raiseError();
-                    $this->free();
-                    return $error;
-                }
-            }
-        // otherwise, $this->fp must be a string
-        } else {
-            if (!$this->_parseString($this->fp, true)) {
-                $error = &$this->raiseError();
-                $this->free();
-                return $error;
-            }
-        }
-        $this->free();
-
-        return true;
-    }
-
-    /**
-     * XML_Parser::_parseString()
-     * 
-     * @param string $data
-     * @param boolean $eof
-     * @return bool
-     * @access private
-     * @see parseString()
-     **/
-    function _parseString($data, $eof = false)
-    {
-        return xml_parse($this->parser, $data, $eof);
-    }
-    
-    // }}}
-    // {{{ parseString()
-
-    /**
-     * XML_Parser::parseString()
-     * 
-     * Parses a string.
-     *
-     * @param    string  $data XML data
-     * @param    boolean $eof  If set and TRUE, data is the last piece of data sent in this parser
-     * @throws   XML_Parser_Error
-     * @return   Pear Error|true   true on success or a PEAR Error
-     * @see      _parseString()
-     */
-    function parseString($data, $eof = false)
-    {
-        if (!isset($this->parser) || !is_resource($this->parser)) {
-            $this->reset();
-        }
-        
-        if (!$this->_parseString($data, $eof)) {
-           $error = &$this->raiseError();
-           $this->free();
-           return $error;
-        }
-
-        if ($eof === true) {
-            $this->free();
-        }
-        return true;
-    }
-    
-    /**
-     * XML_Parser::free()
-     * 
-     * Free the internal resources associated with the parser
-     * 
-     * @return null
-     **/
-    function free()
-    {
-        if (isset($this->parser) && is_resource($this->parser)) {
-            xml_parser_free($this->parser);
-            unset( $this->parser );
-        }
-        if (isset($this->fp) && is_resource($this->fp)) {
-            fclose($this->fp);
-        }
-        unset($this->fp);
-        return null;
-    }
-    
-    /**
-     * XML_Parser::raiseError()
-     * 
-     * Throws a XML_Parser_Error
-     * 
-     * @param string  $msg   the error message
-     * @param integer $ecode the error message code
-     * @return XML_Parser_Error 
-     **/
-    function raiseError($msg = null, $ecode = 0,$mode = null,
-                         $options = null,
-                         $userinfo = null,
-                         $error_class = null,
-                         $skipmsg = false)
-    {
-        $msg = !is_null($msg) ? $msg : $this->parser;
-        $err = new XML_Parser_Error($msg, $ecode);
-        return parent::raiseError($err);
-    }
-    
-    // }}}
-    // {{{ funcStartHandler()
-
-    function funcStartHandler($xp, $elem, $attribs)
-    {
-        $func = 'xmltag_' . $elem;
-        if (strchr($func, '.')) {
-            $func = str_replace('.', '_', $func);
-        }
-        if (method_exists($this->_handlerObj, $func)) {
-            call_user_func(array(&$this->_handlerObj, $func), $xp, $elem, $attribs);
-        } elseif (method_exists($this->_handlerObj, 'xmltag')) {
-            call_user_func(array(&$this->_handlerObj, 'xmltag'), $xp, $elem, $attribs);
-        }
-    }
-
-    // }}}
-    // {{{ funcEndHandler()
-
-    function funcEndHandler($xp, $elem)
-    {
-        $func = 'xmltag_' . $elem . '_';
-        if (strchr($func, '.')) {
-            $func = str_replace('.', '_', $func);
-        }
-        if (method_exists($this->_handlerObj, $func)) {
-            call_user_func(array(&$this->_handlerObj, $func), $xp, $elem);
-        } elseif (method_exists($this->_handlerObj, 'xmltag_')) {
-            call_user_func(array(&$this->_handlerObj, 'xmltag_'), $xp, $elem);
-        }
-    }
-
-    // }}}
-    // {{{ startHandler()
-
-    /**
-     *
-     * @abstract
-     */
-    function startHandler($xp, $elem, $attribs)
-    {
-        return NULL;
-    }
-
-    // }}}
-    // {{{ endHandler()
-
-    /**
-     *
-     * @abstract
-     */
-    function endHandler($xp, $elem)
-    {
-        return NULL;
-    }
-
-
-    // }}}me
-}
-
-/**
- * error class, replaces PEAR_Error
- *
- * An instance of this class will be returned
- * if an error occurs inside XML_Parser.
- *
- * There are three advantages over using the standard PEAR_Error:
- * - All messages will be prefixed
- * - check for XML_Parser error, using is_a( $error, 'XML_Parser_Error' )
- * - messages can be generated from the xml_parser resource
- *
- * @package XML_Parser
- * @access  public
- * @see     PEAR_Error
- */
-class XML_Parser_Error extends PEAR_Error
-{
-    // {{{ properties
-
-   /**
-    * prefix for all messages
-    *
-    * @var      string
-    */    
-    var $error_message_prefix = 'XML_Parser: ';
-
-    // }}}
-    // {{{ constructor()
-   /**
-    * construct a new error instance
-    *
-    * You may either pass a message or an xml_parser resource as first
-    * parameter. If a resource has been passed, the last error that
-    * happened will be retrieved and returned.
-    *
-    * @access   public
-    * @param    string|resource     message or parser resource
-    * @param    integer             error code
-    * @param    integer             error handling
-    * @param    integer             error level
-    */    
-    function XML_Parser_Error($msgorparser = 'unknown error', $code = 0, $mode = PEAR_ERROR_RETURN, $level = E_USER_NOTICE)
-    {
-        if (is_resource($msgorparser)) {
-            $code = xml_get_error_code($msgorparser);
-            $msgorparser = sprintf('%s at XML input line %d',
-                                   xml_error_string($code),
-                                   xml_get_current_line_number($msgorparser));
-        }
-        $this->PEAR_Error($msgorparser, $code, $mode, $level);
-    }
-    // }}}
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/XML/RPC.php b/3rdparty/XML/RPC.php
deleted file mode 100644
index 096b22a0ab5..00000000000
--- a/3rdparty/XML/RPC.php
+++ /dev/null
@@ -1,1951 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP implementation of the XML-RPC protocol
- *
- * This is a PEAR-ified version of Useful inc's XML-RPC for PHP.
- * It has support for HTTP transport, proxies and authentication.
- *
- * PHP versions 4 and 5
- *
- * LICENSE: License is granted to use or modify this software
- * ("XML-RPC for PHP") for commercial or non-commercial use provided the
- * copyright of the author is preserved in any distributed or derivative work.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESSED OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Edd Dumbill <edd@usefulinc.com>
- * @author     Stig Bakken <stig@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
- * @version    CVS: $Id: RPC.php,v 1.83 2005/08/14 20:25:35 danielc Exp $
- * @link       http://pear.php.net/package/XML_RPC
- */
-
-
-if (!function_exists('xml_parser_create')) {
-    PEAR::loadExtension('xml');
-}
-
-/**#@+
- * Error constants
- */
-/**
- * Parameter values don't match parameter types
- */
-define('XML_RPC_ERROR_INVALID_TYPE', 101);
-/**
- * Parameter declared to be numeric but the values are not
- */
-define('XML_RPC_ERROR_NON_NUMERIC_FOUND', 102);
-/**
- * Communication error
- */
-define('XML_RPC_ERROR_CONNECTION_FAILED', 103);
-/**
- * The array or struct has already been started
- */
-define('XML_RPC_ERROR_ALREADY_INITIALIZED', 104);
-/**
- * Incorrect parameters submitted
- */
-define('XML_RPC_ERROR_INCORRECT_PARAMS', 105);
-/**
- * Programming error by developer
- */
-define('XML_RPC_ERROR_PROGRAMMING', 106);
-/**#@-*/
-
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_I4']
- */
-$GLOBALS['XML_RPC_I4'] = 'i4';
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_Int']
- */
-$GLOBALS['XML_RPC_Int'] = 'int';
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_Boolean']
- */
-$GLOBALS['XML_RPC_Boolean'] = 'boolean';
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_Double']
- */
-$GLOBALS['XML_RPC_Double'] = 'double';
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_String']
- */
-$GLOBALS['XML_RPC_String'] = 'string';
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_DateTime']
- */
-$GLOBALS['XML_RPC_DateTime'] = 'dateTime.iso8601';
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_Base64']
- */
-$GLOBALS['XML_RPC_Base64'] = 'base64';
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_Array']
- */
-$GLOBALS['XML_RPC_Array'] = 'array';
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_Struct']
- */
-$GLOBALS['XML_RPC_Struct'] = 'struct';
-
-
-/**
- * Data type meta-types
- * @global array $GLOBALS['XML_RPC_Types']
- */
-$GLOBALS['XML_RPC_Types'] = array(
-    $GLOBALS['XML_RPC_I4']       => 1,
-    $GLOBALS['XML_RPC_Int']      => 1,
-    $GLOBALS['XML_RPC_Boolean']  => 1,
-    $GLOBALS['XML_RPC_String']   => 1,
-    $GLOBALS['XML_RPC_Double']   => 1,
-    $GLOBALS['XML_RPC_DateTime'] => 1,
-    $GLOBALS['XML_RPC_Base64']   => 1,
-    $GLOBALS['XML_RPC_Array']    => 2,
-    $GLOBALS['XML_RPC_Struct']   => 3,
-);
-
-
-/**
- * Error message numbers
- * @global array $GLOBALS['XML_RPC_err']
- */
-$GLOBALS['XML_RPC_err'] = array(
-    'unknown_method'      => 1,
-    'invalid_return'      => 2,
-    'incorrect_params'    => 3,
-    'introspect_unknown'  => 4,
-    'http_error'          => 5,
-    'not_response_object' => 6,
-    'invalid_request'     => 7,
-);
-
-/**
- * Error message strings
- * @global array $GLOBALS['XML_RPC_str']
- */
-$GLOBALS['XML_RPC_str'] = array(
-    'unknown_method'      => 'Unknown method',
-    'invalid_return'      => 'Invalid return payload: enable debugging to examine incoming payload',
-    'incorrect_params'    => 'Incorrect parameters passed to method',
-    'introspect_unknown'  => 'Can\'t introspect: method unknown',
-    'http_error'          => 'Didn\'t receive 200 OK from remote server.',
-    'not_response_object' => 'The requested method didn\'t return an XML_RPC_Response object.',
-    'invalid_request'     => 'Invalid request payload',
-);
-
-
-/**
- * Default XML encoding (ISO-8859-1, UTF-8 or US-ASCII)
- * @global string $GLOBALS['XML_RPC_defencoding']
- */
-$GLOBALS['XML_RPC_defencoding'] = 'UTF-8';
-
-/**
- * User error codes start at 800
- * @global int $GLOBALS['XML_RPC_erruser']
- */
-$GLOBALS['XML_RPC_erruser'] = 800;
-
-/**
- * XML parse error codes start at 100
- * @global int $GLOBALS['XML_RPC_errxml']
- */
-$GLOBALS['XML_RPC_errxml'] = 100;
-
-
-/**
- * Compose backslashes for escaping regexp
- * @global string $GLOBALS['XML_RPC_backslash']
- */
-$GLOBALS['XML_RPC_backslash'] = chr(92) . chr(92);
-
-
-/**
- * Valid parents of XML elements
- * @global array $GLOBALS['XML_RPC_valid_parents']
- */
-$GLOBALS['XML_RPC_valid_parents'] = array(
-    'BOOLEAN' => array('VALUE'),
-    'I4' => array('VALUE'),
-    'INT' => array('VALUE'),
-    'STRING' => array('VALUE'),
-    'DOUBLE' => array('VALUE'),
-    'DATETIME.ISO8601' => array('VALUE'),
-    'BASE64' => array('VALUE'),
-    'ARRAY' => array('VALUE'),
-    'STRUCT' => array('VALUE'),
-    'PARAM' => array('PARAMS'),
-    'METHODNAME' => array('METHODCALL'),
-    'PARAMS' => array('METHODCALL', 'METHODRESPONSE'),
-    'MEMBER' => array('STRUCT'),
-    'NAME' => array('MEMBER'),
-    'DATA' => array('ARRAY'),
-    'FAULT' => array('METHODRESPONSE'),
-    'VALUE' => array('MEMBER', 'DATA', 'PARAM', 'FAULT'),
-);
-
-
-/**
- * Stores state during parsing
- *
- * quick explanation of components:
- *   + ac     = accumulates values
- *   + qt     = decides if quotes are needed for evaluation
- *   + cm     = denotes struct or array (comma needed)
- *   + isf    = indicates a fault
- *   + lv     = indicates "looking for a value": implements the logic
- *               to allow values with no types to be strings
- *   + params = stores parameters in method calls
- *   + method = stores method name
- *
- * @global array $GLOBALS['XML_RPC_xh']
- */
-$GLOBALS['XML_RPC_xh'] = array();
-
-
-/**
- * Start element handler for the XML parser
- *
- * @return void
- */
-function XML_RPC_se($parser_resource, $name, $attrs)
-{
-    global $XML_RPC_xh, $XML_RPC_DateTime, $XML_RPC_String, $XML_RPC_valid_parents;
-    $parser = (int) $parser_resource;
-
-    // if invalid xmlrpc already detected, skip all processing
-    if ($XML_RPC_xh[$parser]['isf'] >= 2) {
-        return;
-    }
-
-    // check for correct element nesting
-    // top level element can only be of 2 types
-    if (count($XML_RPC_xh[$parser]['stack']) == 0) {
-        if ($name != 'METHODRESPONSE' && $name != 'METHODCALL') {
-            $XML_RPC_xh[$parser]['isf'] = 2;
-            $XML_RPC_xh[$parser]['isf_reason'] = 'missing top level xmlrpc element';
-            return;
-        }
-    } else {
-        // not top level element: see if parent is OK
-        if (!in_array($XML_RPC_xh[$parser]['stack'][0], $XML_RPC_valid_parents[$name])) {
-            $name = preg_replace('[^a-zA-Z0-9._-]', '', $name);
-            $XML_RPC_xh[$parser]['isf'] = 2;
-            $XML_RPC_xh[$parser]['isf_reason'] = "xmlrpc element $name cannot be child of {$XML_RPC_xh[$parser]['stack'][0]}";
-            return;
-        }
-    }
-
-    switch ($name) {
-    case 'STRUCT':
-        $XML_RPC_xh[$parser]['cm']++;
-
-        // turn quoting off
-        $XML_RPC_xh[$parser]['qt'] = 0;
-
-        $cur_val = array();
-        $cur_val['value'] = array();
-        $cur_val['members'] = 1;
-        array_unshift($XML_RPC_xh[$parser]['valuestack'], $cur_val);
-        break;
-
-    case 'ARRAY':
-        $XML_RPC_xh[$parser]['cm']++;
-
-        // turn quoting off
-        $XML_RPC_xh[$parser]['qt'] = 0;
-
-        $cur_val = array();
-        $cur_val['value'] = array();
-        $cur_val['members'] = 0;
-        array_unshift($XML_RPC_xh[$parser]['valuestack'], $cur_val);
-        break;
-
-    case 'NAME':
-        $XML_RPC_xh[$parser]['ac'] = '';
-        break;
-
-    case 'FAULT':
-        $XML_RPC_xh[$parser]['isf'] = 1;
-        break;
-
-    case 'PARAM':
-        $XML_RPC_xh[$parser]['valuestack'] = array();
-        break;
-
-    case 'VALUE':
-        $XML_RPC_xh[$parser]['lv'] = 1;
-        $XML_RPC_xh[$parser]['vt'] = $XML_RPC_String;
-        $XML_RPC_xh[$parser]['ac'] = '';
-        $XML_RPC_xh[$parser]['qt'] = 0;
-        // look for a value: if this is still 1 by the
-        // time we reach the first data segment then the type is string
-        // by implication and we need to add in a quote
-        break;
-
-    case 'I4':
-    case 'INT':
-    case 'STRING':
-    case 'BOOLEAN':
-    case 'DOUBLE':
-    case 'DATETIME.ISO8601':
-    case 'BASE64':
-        $XML_RPC_xh[$parser]['ac'] = ''; // reset the accumulator
-
-        if ($name == 'DATETIME.ISO8601' || $name == 'STRING') {
-            $XML_RPC_xh[$parser]['qt'] = 1;
-
-            if ($name == 'DATETIME.ISO8601') {
-                $XML_RPC_xh[$parser]['vt'] = $XML_RPC_DateTime;
-            }
-
-        } elseif ($name == 'BASE64') {
-            $XML_RPC_xh[$parser]['qt'] = 2;
-        } else {
-            // No quoting is required here -- but
-            // at the end of the element we must check
-            // for data format errors.
-            $XML_RPC_xh[$parser]['qt'] = 0;
-        }
-        break;
-
-    case 'MEMBER':
-        $XML_RPC_xh[$parser]['ac'] = '';
-        break;
-
-    case 'DATA':
-    case 'METHODCALL':
-    case 'METHODNAME':
-    case 'METHODRESPONSE':
-    case 'PARAMS':
-        // valid elements that add little to processing
-        break;
-    }
-
-
-    // Save current element to stack
-    array_unshift($XML_RPC_xh[$parser]['stack'], $name);
-
-    if ($name != 'VALUE') {
-        $XML_RPC_xh[$parser]['lv'] = 0;
-    }
-}
-
-/**
- * End element handler for the XML parser
- *
- * @return void
- */
-function XML_RPC_ee($parser_resource, $name)
-{
-    global $XML_RPC_xh, $XML_RPC_Types, $XML_RPC_String;
-    $parser = (int) $parser_resource;
-
-    if ($XML_RPC_xh[$parser]['isf'] >= 2) {
-        return;
-    }
-
-    // push this element from stack
-    // NB: if XML validates, correct opening/closing is guaranteed and
-    // we do not have to check for $name == $curr_elem.
-    // we also checked for proper nesting at start of elements...
-    $curr_elem = array_shift($XML_RPC_xh[$parser]['stack']);
-
-    switch ($name) {
-    case 'STRUCT':
-    case 'ARRAY':
-    $cur_val = array_shift($XML_RPC_xh[$parser]['valuestack']);
-    $XML_RPC_xh[$parser]['value'] = $cur_val['value'];
-        $XML_RPC_xh[$parser]['vt'] = strtolower($name);
-        $XML_RPC_xh[$parser]['cm']--;
-        break;
-
-    case 'NAME':
-    $XML_RPC_xh[$parser]['valuestack'][0]['name'] = $XML_RPC_xh[$parser]['ac'];
-        break;
-
-    case 'BOOLEAN':
-        // special case here: we translate boolean 1 or 0 into PHP
-        // constants true or false
-        if ($XML_RPC_xh[$parser]['ac'] == '1') {
-            $XML_RPC_xh[$parser]['ac'] = 'true';
-        } else {
-            $XML_RPC_xh[$parser]['ac'] = 'false';
-        }
-
-        $XML_RPC_xh[$parser]['vt'] = strtolower($name);
-        // Drop through intentionally.
-
-    case 'I4':
-    case 'INT':
-    case 'STRING':
-    case 'DOUBLE':
-    case 'DATETIME.ISO8601':
-    case 'BASE64':
-        if ($XML_RPC_xh[$parser]['qt'] == 1) {
-            // we use double quotes rather than single so backslashification works OK
-            $XML_RPC_xh[$parser]['value'] = $XML_RPC_xh[$parser]['ac'];
-        } elseif ($XML_RPC_xh[$parser]['qt'] == 2) {
-            $XML_RPC_xh[$parser]['value'] = base64_decode($XML_RPC_xh[$parser]['ac']);
-        } elseif ($name == 'BOOLEAN') {
-            $XML_RPC_xh[$parser]['value'] = $XML_RPC_xh[$parser]['ac'];
-        } else {
-            // we have an I4, INT or a DOUBLE
-            // we must check that only 0123456789-.<space> are characters here
-            if (!ereg("^[+-]?[0123456789 \t\.]+$", $XML_RPC_xh[$parser]['ac'])) {
-                XML_RPC_Base::raiseError('Non-numeric value received in INT or DOUBLE',
-                                         XML_RPC_ERROR_NON_NUMERIC_FOUND);
-                $XML_RPC_xh[$parser]['value'] = XML_RPC_ERROR_NON_NUMERIC_FOUND;
-            } else {
-                // it's ok, add it on
-                $XML_RPC_xh[$parser]['value'] = $XML_RPC_xh[$parser]['ac'];
-            }
-        }
-
-        $XML_RPC_xh[$parser]['ac'] = '';
-        $XML_RPC_xh[$parser]['qt'] = 0;
-        $XML_RPC_xh[$parser]['lv'] = 3; // indicate we've found a value
-        break;
-
-    case 'VALUE':
-        // deal with a string value
-        if (strlen($XML_RPC_xh[$parser]['ac']) > 0 &&
-            $XML_RPC_xh[$parser]['vt'] == $XML_RPC_String) {
-            $XML_RPC_xh[$parser]['value'] = $XML_RPC_xh[$parser]['ac'];
-        }
-
-        $temp = new XML_RPC_Value($XML_RPC_xh[$parser]['value'], $XML_RPC_xh[$parser]['vt']);
-
-        $cur_val = array_shift($XML_RPC_xh[$parser]['valuestack']);
-        if (is_array($cur_val)) {
-            if ($cur_val['members']==0) {
-                $cur_val['value'][] = $temp;
-            } else {
-                $XML_RPC_xh[$parser]['value'] = $temp;
-            }
-            array_unshift($XML_RPC_xh[$parser]['valuestack'], $cur_val);
-        } else {
-            $XML_RPC_xh[$parser]['value'] = $temp;
-        }
-        break;
-
-    case 'MEMBER':
-        $XML_RPC_xh[$parser]['ac'] = '';
-        $XML_RPC_xh[$parser]['qt'] = 0;
-
-        $cur_val = array_shift($XML_RPC_xh[$parser]['valuestack']);
-        if (is_array($cur_val)) {
-            if ($cur_val['members']==1) {
-                $cur_val['value'][$cur_val['name']] = $XML_RPC_xh[$parser]['value'];
-            }
-            array_unshift($XML_RPC_xh[$parser]['valuestack'], $cur_val);
-        }
-        break;
-
-    case 'DATA':
-        $XML_RPC_xh[$parser]['ac'] = '';
-        $XML_RPC_xh[$parser]['qt'] = 0;
-        break;
-
-    case 'PARAM':
-        $XML_RPC_xh[$parser]['params'][] = $XML_RPC_xh[$parser]['value'];
-        break;
-
-    case 'METHODNAME':
-    case 'RPCMETHODNAME':
-        $XML_RPC_xh[$parser]['method'] = ereg_replace("^[\n\r\t ]+", '',
-                                                      $XML_RPC_xh[$parser]['ac']);
-        break;
-    }
-
-    // if it's a valid type name, set the type
-    if (isset($XML_RPC_Types[strtolower($name)])) {
-        $XML_RPC_xh[$parser]['vt'] = strtolower($name);
-    }
-}
-
-/**
- * Character data handler for the XML parser
- *
- * @return void
- */
-function XML_RPC_cd($parser_resource, $data)
-{
-    global $XML_RPC_xh, $XML_RPC_backslash;
-    $parser = (int) $parser_resource;
-
-    if ($XML_RPC_xh[$parser]['lv'] != 3) {
-        // "lookforvalue==3" means that we've found an entire value
-        // and should discard any further character data
-
-        if ($XML_RPC_xh[$parser]['lv'] == 1) {
-            // if we've found text and we're just in a <value> then
-            // turn quoting on, as this will be a string
-            $XML_RPC_xh[$parser]['qt'] = 1;
-            // and say we've found a value
-            $XML_RPC_xh[$parser]['lv'] = 2;
-        }
-
-        // replace characters that eval would
-        // do special things with
-        if (!isset($XML_RPC_xh[$parser]['ac'])) {
-            $XML_RPC_xh[$parser]['ac'] = '';
-        }
-        $XML_RPC_xh[$parser]['ac'] .= $data;
-    }
-}
-
-/**
- * The common methods and properties for all of the XML_RPC classes
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Edd Dumbill <edd@usefulinc.com>
- * @author     Stig Bakken <stig@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
- * @version    Release: 1.4.0
- * @link       http://pear.php.net/package/XML_RPC
- */
-class XML_RPC_Base {
-
-    /**
-     * PEAR Error handling
-     *
-     * @return object  PEAR_Error object
-     */
-    function raiseError($msg, $code)
-    {
-        include_once 'PEAR.php';
-        if (is_object(@$this)) {
-            return PEAR::raiseError(get_class($this) . ': ' . $msg, $code);
-        } else {
-            return PEAR::raiseError('XML_RPC: ' . $msg, $code);
-        }
-    }
-
-    /**
-     * Tell whether something is a PEAR_Error object
-     *
-     * @param mixed $value  the item to check
-     *
-     * @return bool  whether $value is a PEAR_Error object or not
-     *
-     * @access public
-     */
-    function isError($value)
-    {
-        return is_a($value, 'PEAR_Error');
-    }
-}
-
-/**
- * The methods and properties for submitting XML RPC requests
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Edd Dumbill <edd@usefulinc.com>
- * @author     Stig Bakken <stig@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
- * @version    Release: 1.4.0
- * @link       http://pear.php.net/package/XML_RPC
- */
-class XML_RPC_Client extends XML_RPC_Base {
-
-    /**
-     * The path and name of the RPC server script you want the request to go to
-     * @var string
-     */
-    var $path = '';
-
-    /**
-     * The name of the remote server to connect to
-     * @var string
-     */
-    var $server = '';
-
-    /**
-     * The protocol to use in contacting the remote server
-     * @var string
-     */
-    var $protocol = 'http://';
-
-    /**
-     * The port for connecting to the remote server
-     *
-     * The default is 80 for http:// connections
-     * and 443 for https:// and ssl:// connections.
-     *
-     * @var integer
-     */
-    var $port = 80;
-
-    /**
-     * A user name for accessing the RPC server
-     * @var string
-     * @see XML_RPC_Client::setCredentials()
-     */
-    var $username = '';
-
-    /**
-     * A password for accessing the RPC server
-     * @var string
-     * @see XML_RPC_Client::setCredentials()
-     */
-    var $password = '';
-
-    /**
-     * The name of the proxy server to use, if any
-     * @var string
-     */
-    var $proxy = '';
-
-    /**
-     * The protocol to use in contacting the proxy server, if any
-     * @var string
-     */
-    var $proxy_protocol = 'http://';
-
-    /**
-     * The port for connecting to the proxy server
-     *
-     * The default is 8080 for http:// connections
-     * and 443 for https:// and ssl:// connections.
-     *
-     * @var integer
-     */
-    var $proxy_port = 8080;
-
-    /**
-     * A user name for accessing the proxy server
-     * @var string
-     */
-    var $proxy_user = '';
-
-    /**
-     * A password for accessing the proxy server
-     * @var string
-     */
-    var $proxy_pass = '';
-
-    /**
-     * The error number, if any
-     * @var integer
-     */
-    var $errno = 0;
-
-    /**
-     * The error message, if any
-     * @var string
-     */
-    var $errstr = '';
-
-    /**
-     * The current debug mode (1 = on, 0 = off)
-     * @var integer
-     */
-    var $debug = 0;
-
-    /**
-     * The HTTP headers for the current request.
-     * @var string
-     */
-    var $headers = '';
-
-
-    /**
-     * Sets the object's properties
-     *
-     * @param string  $path        the path and name of the RPC server script
-     *                              you want the request to go to
-     * @param string  $server      the URL of the remote server to connect to.
-     *                              If this parameter doesn't specify a
-     *                              protocol and $port is 443, ssl:// is
-     *                              assumed.
-     * @param integer $port        a port for connecting to the remote server.
-     *                              Defaults to 80 for http:// connections and
-     *                              443 for https:// and ssl:// connections.
-     * @param string  $proxy       the URL of the proxy server to use, if any.
-     *                              If this parameter doesn't specify a
-     *                              protocol and $port is 443, ssl:// is
-     *                              assumed.
-     * @param integer $proxy_port  a port for connecting to the remote server.
-     *                              Defaults to 8080 for http:// connections and
-     *                              443 for https:// and ssl:// connections.
-     * @param string  $proxy_user  a user name for accessing the proxy server
-     * @param string  $proxy_pass  a password for accessing the proxy server
-     *
-     * @return void
-     */
-    function XML_RPC_Client($path, $server, $port = 0,
-                            $proxy = '', $proxy_port = 0,
-                            $proxy_user = '', $proxy_pass = '')
-    {
-        $this->path       = $path;
-        $this->proxy_user = $proxy_user;
-        $this->proxy_pass = $proxy_pass;
-
-        preg_match('@^(http://|https://|ssl://)?(.*)$@', $server, $match);
-        if ($match[1] == '') {
-            if ($port == 443) {
-                $this->server   = $match[2];
-                $this->protocol = 'ssl://';
-                $this->port     = 443;
-            } else {
-                $this->server = $match[2];
-                if ($port) {
-                    $this->port = $port;
-                }
-            }
-        } elseif ($match[1] == 'http://') {
-            $this->server = $match[2];
-            if ($port) {
-                $this->port = $port;
-            }
-        } else {
-            $this->server   = $match[2];
-            $this->protocol = 'ssl://';
-            if ($port) {
-                $this->port = $port;
-            } else {
-                $this->port = 443;
-            }
-        }
-
-        if ($proxy) {
-            preg_match('@^(http://|https://|ssl://)?(.*)$@', $proxy, $match);
-            if ($match[1] == '') {
-                if ($proxy_port == 443) {
-                    $this->proxy          = $match[2];
-                    $this->proxy_protocol = 'ssl://';
-                    $this->proxy_port     = 443;
-                } else {
-                    $this->proxy = $match[2];
-                    if ($proxy_port) {
-                        $this->proxy_port = $proxy_port;
-                    }
-                }
-            } elseif ($match[1] == 'http://') {
-                $this->proxy = $match[2];
-                if ($proxy_port) {
-                    $this->proxy_port = $proxy_port;
-                }
-            } else {
-                $this->proxy          = $match[2];
-                $this->proxy_protocol = 'ssl://';
-                if ($proxy_port) {
-                    $this->proxy_port = $proxy_port;
-                } else {
-                    $this->proxy_port = 443;
-                }
-            }
-        }
-    }
-
-    /**
-     * Change the current debug mode
-     *
-     * @param int $in  where 1 = on, 0 = off
-     *
-     * @return void
-     */
-    function setDebug($in)
-    {
-        if ($in) {
-            $this->debug = 1;
-        } else {
-            $this->debug = 0;
-        }
-    }
-
-    /**
-     * Set username and password properties for connecting to the RPC server
-     *
-     * @param string $u  the user name
-     * @param string $p  the password
-     *
-     * @return void
-     *
-     * @see XML_RPC_Client::$username, XML_RPC_Client::$password
-     */
-    function setCredentials($u, $p)
-    {
-        $this->username = $u;
-        $this->password = $p;
-    }
-
-    /**
-     * Transmit the RPC request via HTTP 1.0 protocol
-     *
-     * @param object $msg       the XML_RPC_Message object
-     * @param int    $timeout   how many seconds to wait for the request
-     *
-     * @return object  an XML_RPC_Response object.  0 is returned if any
-     *                  problems happen.
-     *
-     * @see XML_RPC_Message, XML_RPC_Client::XML_RPC_Client(),
-     *      XML_RPC_Client::setCredentials()
-     */
-    function send($msg, $timeout = 0)
-    {
-        if (strtolower(get_class($msg)) != 'xml_rpc_message') {
-            $this->errstr = 'send()\'s $msg parameter must be an'
-                          . ' XML_RPC_Message object.';
-            $this->raiseError($this->errstr, XML_RPC_ERROR_PROGRAMMING);
-            return 0;
-        }
-        $msg->debug = $this->debug;
-        return $this->sendPayloadHTTP10($msg, $this->server, $this->port,
-                                        $timeout, $this->username,
-                                        $this->password);
-    }
-
-    /**
-     * Transmit the RPC request via HTTP 1.0 protocol
-     *
-     * Requests should be sent using XML_RPC_Client send() rather than
-     * calling this method directly.
-     *
-     * @param object $msg       the XML_RPC_Message object
-     * @param string $server    the server to send the request to
-     * @param int    $port      the server port send the request to
-     * @param int    $timeout   how many seconds to wait for the request
-     *                           before giving up
-     * @param string $username  a user name for accessing the RPC server
-     * @param string $password  a password for accessing the RPC server
-     *
-     * @return object  an XML_RPC_Response object.  0 is returned if any
-     *                  problems happen.
-     *
-     * @access protected
-     * @see XML_RPC_Client::send()
-     */
-    function sendPayloadHTTP10($msg, $server, $port, $timeout = 0,
-                               $username = '', $password = '')
-    {
-        /*
-         * If we're using a proxy open a socket to the proxy server
-         * instead to the xml-rpc server
-         */
-        if ($this->proxy) {
-            if ($this->proxy_protocol == 'http://') {
-                $protocol = '';
-            } else {
-                $protocol = $this->proxy_protocol;
-            }
-            if ($timeout > 0) {
-                $fp = @fsockopen($protocol . $this->proxy, $this->proxy_port,
-                                 $this->errno, $this->errstr, $timeout);
-            } else {
-                $fp = @fsockopen($protocol . $this->proxy, $this->proxy_port,
-                                 $this->errno, $this->errstr);
-            }
-        } else {
-            if ($this->protocol == 'http://') {
-                $protocol = '';
-            } else {
-                $protocol = $this->protocol;
-            }
-            if ($timeout > 0) {
-                $fp = @fsockopen($protocol . $server, $port,
-                                 $this->errno, $this->errstr, $timeout);
-            } else {
-                $fp = @fsockopen($protocol . $server, $port,
-                                 $this->errno, $this->errstr);
-            }
-        }
-
-        /*
-         * Just raising the error without returning it is strange,
-         * but keep it here for backwards compatibility.
-         */
-        if (!$fp && $this->proxy) {
-            $this->raiseError('Connection to proxy server '
-                              . $this->proxy . ':' . $this->proxy_port
-                              . ' failed. ' . $this->errstr,
-                              XML_RPC_ERROR_CONNECTION_FAILED);
-            return 0;
-        } elseif (!$fp) {
-            $this->raiseError('Connection to RPC server '
-                              . $server . ':' . $port
-                              . ' failed. ' . $this->errstr,
-                              XML_RPC_ERROR_CONNECTION_FAILED);
-            return 0;
-        }
-
-        if ($timeout) {
-            /*
-             * Using socket_set_timeout() because stream_set_timeout()
-             * was introduced in 4.3.0, but we need to support 4.2.0.
-             */
-            socket_set_timeout($fp, $timeout);
-        }
-
-        // Pre-emptive BC hacks for fools calling sendPayloadHTTP10() directly
-        if ($username != $this->username) {
-            $this->setCredentials($username, $password);
-        }
-
-        // Only create the payload if it was not created previously
-        if (empty($msg->payload)) {
-            $msg->createPayload();
-        }
-        $this->createHeaders($msg);
-
-        $op  = $this->headers . "\r\n\r\n";
-        $op .= $msg->payload;
-
-        if (!fputs($fp, $op, strlen($op))) {
-            $this->errstr = 'Write error';
-            return 0;
-        }
-        $resp = $msg->parseResponseFile($fp);
-
-        $meta = socket_get_status($fp);
-        if ($meta['timed_out']) {
-            fclose($fp);
-            $this->errstr = 'RPC server did not send response before timeout.';
-            $this->raiseError($this->errstr, XML_RPC_ERROR_CONNECTION_FAILED);
-            return 0;
-        }
-
-        fclose($fp);
-        return $resp;
-    }
-
-    /**
-     * Determines the HTTP headers and puts it in the $headers property
-     *
-     * @param object $msg       the XML_RPC_Message object
-     *
-     * @return boolean  TRUE if okay, FALSE if the message payload isn't set.
-     *
-     * @access protected
-     */
-    function createHeaders($msg)
-    {
-        if (empty($msg->payload)) {
-            return false;
-        }
-        if ($this->proxy) {
-            $this->headers = 'POST ' . $this->protocol . $this->server;
-            if ($this->proxy_port) {
-                $this->headers .= ':' . $this->port;
-            }
-        } else {
-           $this->headers = 'POST ';
-        }
-        $this->headers .= $this->path. " HTTP/1.0\r\n";
-
-        $this->headers .= "User-Agent: PEAR XML_RPC\r\n";
-        $this->headers .= 'Host: ' . $this->server . "\r\n";
-
-        if ($this->proxy && $this->proxy_user) {
-            $this->headers .= 'Proxy-Authorization: Basic '
-                     . base64_encode("$this->proxy_user:$this->proxy_pass")
-                     . "\r\n";
-        }
-
-        // thanks to Grant Rauscher <grant7@firstworld.net> for this
-        if ($this->username) {
-            $this->headers .= 'Authorization: Basic '
-                     . base64_encode("$this->username:$this->password")
-                     . "\r\n";
-        }
-
-        $this->headers .= "Content-Type: text/xml\r\n";
-        $this->headers .= 'Content-Length: ' . strlen($msg->payload);
-        return true;
-    }
-}
-
-/**
- * The methods and properties for interpreting responses to XML RPC requests
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Edd Dumbill <edd@usefulinc.com>
- * @author     Stig Bakken <stig@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
- * @version    Release: 1.4.0
- * @link       http://pear.php.net/package/XML_RPC
- */
-class XML_RPC_Response extends XML_RPC_Base
-{
-    var $xv;
-    var $fn;
-    var $fs;
-    var $hdrs;
-
-    /**
-     * @return void
-     */
-    function XML_RPC_Response($val, $fcode = 0, $fstr = '')
-    {
-        if ($fcode != 0) {
-            $this->fn = $fcode;
-            $this->fs = htmlspecialchars($fstr);
-        } else {
-            $this->xv = $val;
-        }
-    }
-
-    /**
-     * @return int  the error code
-     */
-    function faultCode()
-    {
-        if (isset($this->fn)) {
-            return $this->fn;
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * @return string  the error string
-     */
-    function faultString()
-    {
-        return $this->fs;
-    }
-
-    /**
-     * @return mixed  the value
-     */
-    function value()
-    {
-        return $this->xv;
-    }
-
-    /**
-     * @return string  the error message in XML format
-     */
-    function serialize()
-    {
-        $rs = "<methodResponse>\n";
-        if ($this->fn) {
-            $rs .= "<fault>
-  <value>
-    <struct>
-      <member>
-        <name>faultCode</name>
-        <value><int>" . $this->fn . "</int></value>
-      </member>
-      <member>
-        <name>faultString</name>
-        <value><string>" . $this->fs . "</string></value>
-      </member>
-    </struct>
-  </value>
-</fault>";
-        } else {
-            $rs .= "<params>\n<param>\n" . $this->xv->serialize() .
-        "</param>\n</params>";
-        }
-        $rs .= "\n</methodResponse>";
-        return $rs;
-    }
-}
-
-/**
- * The methods and properties for composing XML RPC messages
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Edd Dumbill <edd@usefulinc.com>
- * @author     Stig Bakken <stig@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
- * @version    Release: 1.4.0
- * @link       http://pear.php.net/package/XML_RPC
- */
-class XML_RPC_Message extends XML_RPC_Base
-{
-    /**
-     * The current debug mode (1 = on, 0 = off)
-     * @var integer
-     */
-    var $debug = 0;
-
-    /**
-     * The encoding to be used for outgoing messages
-     *
-     * Defaults to the value of <var>$GLOBALS['XML_RPC_defencoding']</var>
-     *
-     * @var string
-     * @see XML_RPC_Message::setSendEncoding(),
-     *      $GLOBALS['XML_RPC_defencoding'], XML_RPC_Message::xml_header()
-     */
-    var $send_encoding = '';
-
-    /**
-     * The method presently being evaluated
-     * @var string
-     */
-    var $methodname = '';
-
-    /**
-     * @var array
-     */
-    var $params = array();
-
-    /**
-     * The XML message being generated
-     * @var string
-     */
-    var $payload = '';
-
-    /**
-     * @return void
-     */
-    function XML_RPC_Message($meth, $pars = 0)
-    {
-        $this->methodname = $meth;
-        if (is_array($pars) && sizeof($pars) > 0) {
-            for ($i = 0; $i < sizeof($pars); $i++) {
-                $this->addParam($pars[$i]);
-            }
-        }
-    }
-
-    /**
-     * Produces the XML declaration including the encoding attribute
-     *
-     * The encoding is determined by this class' <var>$send_encoding</var>
-     * property.  If the <var>$send_encoding</var> property is not set, use
-     * <var>$GLOBALS['XML_RPC_defencoding']</var>.
-     *
-     * @return string  the XML declaration and <methodCall> element
-     *
-     * @see XML_RPC_Message::setSendEncoding(),
-     *      XML_RPC_Message::$send_encoding, $GLOBALS['XML_RPC_defencoding']
-     */
-    function xml_header()
-    {
-        global $XML_RPC_defencoding;
-        if (!$this->send_encoding) {
-            $this->send_encoding = $XML_RPC_defencoding;
-        }
-        return '<?xml version="1.0" encoding="' . $this->send_encoding . '"?>'
-               . "\n<methodCall>\n";
-    }
-
-    /**
-     * @return string  the closing </methodCall> tag
-     */
-    function xml_footer()
-    {
-        return "</methodCall>\n";
-    }
-
-    /**
-     * @return void
-     *
-     * @uses XML_RPC_Message::xml_header(), XML_RPC_Message::xml_footer()
-     */
-    function createPayload()
-    {
-        $this->payload = $this->xml_header();
-        $this->payload .= '<methodName>' . $this->methodname . "</methodName>\n";
-        $this->payload .= "<params>\n";
-        for ($i = 0; $i < sizeof($this->params); $i++) {
-            $p = $this->params[$i];
-            $this->payload .= "<param>\n" . $p->serialize() . "</param>\n";
-        }
-        $this->payload .= "</params>\n";
-        $this->payload .= $this->xml_footer();
-        $this->payload = ereg_replace("[\r\n]+", "\r\n", $this->payload);
-    }
-
-    /**
-     * @return string  the name of the method
-     */
-    function method($meth = '')
-    {
-        if ($meth != '') {
-            $this->methodname = $meth;
-        }
-        return $this->methodname;
-    }
-
-    /**
-     * @return string  the payload
-     */
-    function serialize()
-    {
-        $this->createPayload();
-        return $this->payload;
-    }
-
-    /**
-     * @return void
-     */
-    function addParam($par)
-    {
-        $this->params[] = $par;
-    }
-
-    /**
-     * Obtains an XML_RPC_Value object for the given parameter
-     *
-     * @param int $i  the index number of the parameter to obtain
-     *
-     * @return object  the XML_RPC_Value object.
-     *                  If the parameter doesn't exist, an XML_RPC_Response object.
-     *
-     * @since Returns XML_RPC_Response object on error since Release 1.3.0
-     */
-    function getParam($i)
-    {
-        global $XML_RPC_err, $XML_RPC_str;
-
-        if (isset($this->params[$i])) {
-            return $this->params[$i];
-        } else {
-            $this->raiseError('The submitted request did not contain this parameter',
-                              XML_RPC_ERROR_INCORRECT_PARAMS);
-            return new XML_RPC_Response(0, $XML_RPC_err['incorrect_params'],
-                                        $XML_RPC_str['incorrect_params']);
-        }
-    }
-
-    /**
-     * @return int  the number of parameters
-     */
-    function getNumParams()
-    {
-        return sizeof($this->params);
-    }
-
-    /**
-     * Sets the XML declaration's encoding attribute
-     *
-     * @param string $type  the encoding type (ISO-8859-1, UTF-8 or US-ASCII)
-     *
-     * @return void
-     *
-     * @see XML_RPC_Message::$send_encoding, XML_RPC_Message::xml_header()
-     * @since Method available since Release 1.2.0
-     */
-    function setSendEncoding($type)
-    {
-        $this->send_encoding = $type;
-    }
-
-    /**
-     * Determine the XML's encoding via the encoding attribute
-     * in the XML declaration
-     *
-     * If the encoding parameter is not set or is not ISO-8859-1, UTF-8
-     * or US-ASCII, $XML_RPC_defencoding will be returned.
-     *
-     * @param string $data  the XML that will be parsed
-     *
-     * @return string  the encoding to be used
-     *
-     * @link   http://php.net/xml_parser_create
-     * @since  Method available since Release 1.2.0
-     */
-    function getEncoding($data)
-    {
-        global $XML_RPC_defencoding;
-
-        if (preg_match('/<\?xml[^>]*\s*encoding\s*=\s*[\'"]([^"\']*)[\'"]/i',
-                       $data, $match))
-        {
-            $match[1] = trim(strtoupper($match[1]));
-            switch ($match[1]) {
-                case 'ISO-8859-1':
-                case 'UTF-8':
-                case 'US-ASCII':
-                    return $match[1];
-                    break;
-
-                default:
-                    return $XML_RPC_defencoding;
-            }
-        } else {
-            return $XML_RPC_defencoding;
-        }
-    }
-
-    /**
-     * @return object  a new XML_RPC_Response object
-     */
-    function parseResponseFile($fp)
-    {
-        $ipd = '';
-        while ($data = @fread($fp, 8192)) {
-            $ipd .= $data;
-        }
-        return $this->parseResponse($ipd);
-    }
-
-    /**
-     * @return object  a new XML_RPC_Response object
-     */
-    function parseResponse($data = '')
-    {
-        global $XML_RPC_xh, $XML_RPC_err, $XML_RPC_str, $XML_RPC_defencoding;
-
-        $encoding = $this->getEncoding($data);
-        $parser_resource = xml_parser_create($encoding);
-        $parser = (int) $parser_resource;
-
-        $XML_RPC_xh = array();
-        $XML_RPC_xh[$parser] = array();
-
-        $XML_RPC_xh[$parser]['cm'] = 0;
-        $XML_RPC_xh[$parser]['isf'] = 0;
-        $XML_RPC_xh[$parser]['ac'] = '';
-        $XML_RPC_xh[$parser]['qt'] = '';
-        $XML_RPC_xh[$parser]['stack'] = array();
-        $XML_RPC_xh[$parser]['valuestack'] = array();
-
-        xml_parser_set_option($parser_resource, XML_OPTION_CASE_FOLDING, true);
-        xml_set_element_handler($parser_resource, 'XML_RPC_se', 'XML_RPC_ee');
-        xml_set_character_data_handler($parser_resource, 'XML_RPC_cd');
-
-        $hdrfnd = 0;
-        if ($this->debug) {
-            print "\n<pre>---GOT---\n";
-            print isset($_SERVER['SERVER_PROTOCOL']) ? htmlspecialchars($data) : $data;
-            print "\n---END---</pre>\n";
-        }
-
-        // See if response is a 200 or a 100 then a 200, else raise error.
-        // But only do this if we're using the HTTP protocol.
-        if (ereg('^HTTP', $data) &&
-            !ereg('^HTTP/[0-9\.]+ 200 ', $data) &&
-            !preg_match('@^HTTP/[0-9\.]+ 10[0-9]([A-Za-z ]+)?[\r\n]+HTTP/[0-9\.]+ 200@', $data))
-        {
-                $errstr = substr($data, 0, strpos($data, "\n") - 1);
-                if(defined("DEBUG") && DEBUG) {error_log('HTTP error, got response: ' . $errstr);}
-                $r = new XML_RPC_Response(0, $XML_RPC_err['http_error'],
-                                          $XML_RPC_str['http_error'] . ' (' .
-                                          $errstr . ')');
-                xml_parser_free($parser_resource);
-                return $r;
-        }
-
-        // gotta get rid of headers here
-        if (!$hdrfnd && ($brpos = strpos($data,"\r\n\r\n"))) {
-            $XML_RPC_xh[$parser]['ha'] = substr($data, 0, $brpos);
-            $data = substr($data, $brpos + 4);
-            $hdrfnd = 1;
-        }
-
-        /*
-         * be tolerant of junk after methodResponse
-         * (e.g. javascript automatically inserted by free hosts)
-         * thanks to Luca Mariano <luca.mariano@email.it>
-         */
-        $data = substr($data, 0, strpos($data, "</methodResponse>") + 17);
-
-        if (!xml_parse($parser_resource, $data, sizeof($data))) {
-            // thanks to Peter Kocks <peter.kocks@baygate.com>
-            if (xml_get_current_line_number($parser_resource) == 1) {
-                $errstr = 'XML error at line 1, check URL';
-            } else {
-                $errstr = sprintf('XML error: %s at line %d',
-                                  xml_error_string(xml_get_error_code($parser_resource)),
-                                  xml_get_current_line_number($parser_resource));
-            }
-            if(defined("DEBUG") && DEBUG) {error_log($errstr);}
-            $r = new XML_RPC_Response(0, $XML_RPC_err['invalid_return'],
-                                      $XML_RPC_str['invalid_return']);
-            xml_parser_free($parser_resource);
-            return $r;
-        }
-
-        xml_parser_free($parser_resource);
-
-        if ($this->debug) {
-            print "\n<pre>---PARSED---\n";
-            var_dump($XML_RPC_xh[$parser]['value']);
-            print "---END---</pre>\n";
-        }
-
-        if ($XML_RPC_xh[$parser]['isf'] > 1) {
-            $r = new XML_RPC_Response(0, $XML_RPC_err['invalid_return'],
-                                      $XML_RPC_str['invalid_return'].' '.$XML_RPC_xh[$parser]['isf_reason']);
-        } elseif (!is_object($XML_RPC_xh[$parser]['value'])) {
-            // then something odd has happened
-            // and it's time to generate a client side error
-            // indicating something odd went on
-            $r = new XML_RPC_Response(0, $XML_RPC_err['invalid_return'],
-                                      $XML_RPC_str['invalid_return']);
-        } else {
-            $v = $XML_RPC_xh[$parser]['value'];
-            $allOK=1;
-            if ($XML_RPC_xh[$parser]['isf']) {
-                $f = $v->structmem('faultCode');
-                $fs = $v->structmem('faultString');
-                $r = new XML_RPC_Response($v, $f->scalarval(),
-                                          $fs->scalarval());
-            } else {
-                $r = new XML_RPC_Response($v);
-            }
-        }
-        $r->hdrs = split("\r?\n", $XML_RPC_xh[$parser]['ha'][1]);
-        return $r;
-    }
-}
-
-/**
- * The methods and properties that represent data in XML RPC format
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Edd Dumbill <edd@usefulinc.com>
- * @author     Stig Bakken <stig@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
- * @version    Release: 1.4.0
- * @link       http://pear.php.net/package/XML_RPC
- */
-class XML_RPC_Value extends XML_RPC_Base
-{
-    var $me = array();
-    var $mytype = 0;
-
-    /**
-     * @return void
-     */
-    function XML_RPC_Value($val = -1, $type = '')
-    {
-        global $XML_RPC_Types;
-        $this->me = array();
-        $this->mytype = 0;
-        if ($val != -1 || $type != '') {
-            if ($type == '') {
-                $type = 'string';
-            }
-            if (!array_key_exists($type, $XML_RPC_Types)) {
-                // XXX
-                // need some way to report this error
-            } elseif ($XML_RPC_Types[$type] == 1) {
-                $this->addScalar($val, $type);
-            } elseif ($XML_RPC_Types[$type] == 2) {
-                $this->addArray($val);
-            } elseif ($XML_RPC_Types[$type] == 3) {
-                $this->addStruct($val);
-            }
-        }
-    }
-
-    /**
-     * @return int  returns 1 if successful or 0 if there are problems
-     */
-    function addScalar($val, $type = 'string')
-    {
-        global $XML_RPC_Types, $XML_RPC_Boolean;
-
-        if ($this->mytype == 1) {
-            $this->raiseError('Scalar can have only one value',
-                              XML_RPC_ERROR_INVALID_TYPE);
-            return 0;
-        }
-        $typeof = $XML_RPC_Types[$type];
-        if ($typeof != 1) {
-            $this->raiseError("Not a scalar type (${typeof})",
-                              XML_RPC_ERROR_INVALID_TYPE);
-            return 0;
-        }
-
-        if ($type == $XML_RPC_Boolean) {
-            if (strcasecmp($val, 'true') == 0
-                || $val == 1
-                || ($val == true && strcasecmp($val, 'false')))
-            {
-                $val = 1;
-            } else {
-                $val = 0;
-            }
-        }
-
-        if ($this->mytype == 2) {
-            // we're adding to an array here
-            $ar = $this->me['array'];
-            $ar[] = new XML_RPC_Value($val, $type);
-            $this->me['array'] = $ar;
-        } else {
-            // a scalar, so set the value and remember we're scalar
-            $this->me[$type] = $val;
-            $this->mytype = $typeof;
-        }
-        return 1;
-    }
-
-    /**
-     * @return int  returns 1 if successful or 0 if there are problems
-     */
-    function addArray($vals)
-    {
-        global $XML_RPC_Types;
-        if ($this->mytype != 0) {
-            $this->raiseError(
-                    'Already initialized as a [' . $this->kindOf() . ']',
-                    XML_RPC_ERROR_ALREADY_INITIALIZED);
-            return 0;
-        }
-        $this->mytype = $XML_RPC_Types['array'];
-        $this->me['array'] = $vals;
-        return 1;
-    }
-
-    /**
-     * @return int  returns 1 if successful or 0 if there are problems
-     */
-    function addStruct($vals)
-    {
-        global $XML_RPC_Types;
-        if ($this->mytype != 0) {
-            $this->raiseError(
-                    'Already initialized as a [' . $this->kindOf() . ']',
-                    XML_RPC_ERROR_ALREADY_INITIALIZED);
-            return 0;
-        }
-        $this->mytype = $XML_RPC_Types['struct'];
-        $this->me['struct'] = $vals;
-        return 1;
-    }
-
-    /**
-     * @return void
-     */
-    function dump($ar)
-    {
-        reset($ar);
-        foreach ($ar as $key => $val) {
-            echo "$key => $val<br />";
-            if ($key == 'array') {
-                foreach ($val as $key2 => $val2) {
-                    echo "-- $key2 => $val2<br />";
-                }
-            }
-        }
-    }
-
-    /**
-     * @return string  the data type of the current value
-     */
-    function kindOf()
-    {
-        switch ($this->mytype) {
-        case 3:
-            return 'struct';
-
-        case 2:
-            return 'array';
-
-        case 1:
-            return 'scalar';
-
-        default:
-            return 'undef';
-        }
-    }
-
-    /**
-     * @return string  the data in XML format
-     */
-    function serializedata($typ, $val)
-    {
-        $rs = '';
-        global $XML_RPC_Types, $XML_RPC_Base64, $XML_RPC_String, $XML_RPC_Boolean;
-        if (!array_key_exists($typ, $XML_RPC_Types)) {
-            // XXX
-            // need some way to report this error
-            return;
-        }
-        switch ($XML_RPC_Types[$typ]) {
-        case 3:
-            // struct
-            $rs .= "<struct>\n";
-            reset($val);
-            foreach ($val as $key2 => $val2) {
-                $rs .= "<member><name>${key2}</name>\n";
-                $rs .= $this->serializeval($val2);
-                $rs .= "</member>\n";
-            }
-            $rs .= '</struct>';
-            break;
-
-        case 2:
-            // array
-            $rs .= "<array>\n<data>\n";
-            for ($i = 0; $i < sizeof($val); $i++) {
-                $rs .= $this->serializeval($val[$i]);
-            }
-            $rs .= "</data>\n</array>";
-            break;
-
-        case 1:
-            switch ($typ) {
-            case $XML_RPC_Base64:
-                $rs .= "<${typ}>" . base64_encode($val) . "</${typ}>";
-                break;
-            case $XML_RPC_Boolean:
-                $rs .= "<${typ}>" . ($val ? '1' : '0') . "</${typ}>";
-                break;
-            case $XML_RPC_String:
-                $rs .= "<${typ}>" . htmlspecialchars($val). "</${typ}>";
-                break;
-            default:
-                $rs .= "<${typ}>${val}</${typ}>";
-            }
-        }
-        return $rs;
-    }
-
-    /**
-     * @return string  the data in XML format
-     */
-    function serialize()
-    {
-        return $this->serializeval($this);
-    }
-
-    /**
-     * @return string  the data in XML format
-     */
-    function serializeval($o)
-    {
-        if (!is_object($o) || empty($o->me) || !is_array($o->me)) {
-            return '';
-        }
-        $ar = $o->me;
-        reset($ar);
-        list($typ, $val) = each($ar);
-        return '<value>' .  $this->serializedata($typ, $val) .  "</value>\n";
-    }
-
-    /**
-     * @return mixed  the contents of the element requested
-     */
-    function structmem($m)
-    {
-        return $this->me['struct'][$m];
-    }
-
-    /**
-     * @return void
-     */
-    function structreset()
-    {
-        reset($this->me['struct']);
-    }
-
-    /**
-     * @return  the key/value pair of the struct's current element
-     */
-    function structeach()
-    {
-        return each($this->me['struct']);
-    }
-
-    /**
-     * @return mixed  the current value
-     */
-    function getval()
-    {
-        // UNSTABLE
-        global $XML_RPC_BOOLEAN, $XML_RPC_Base64;
-
-        reset($this->me);
-        $b = current($this->me);
-
-        // contributed by I Sofer, 2001-03-24
-        // add support for nested arrays to scalarval
-        // i've created a new method here, so as to
-        // preserve back compatibility
-
-        if (is_array($b)) {
-            foreach ($b as $id => $cont) {
-                $b[$id] = $cont->scalarval();
-            }
-        }
-
-        // add support for structures directly encoding php objects
-        if (is_object($b)) {
-            $t = get_object_vars($b);
-            foreach ($t as $id => $cont) {
-                $t[$id] = $cont->scalarval();
-            }
-            foreach ($t as $id => $cont) {
-                $b->$id = $cont;
-            }
-        }
-
-        // end contrib
-        return $b;
-    }
-
-    /**
-     * @return mixed
-     */
-    function scalarval()
-    {
-        global $XML_RPC_Boolean, $XML_RPC_Base64;
-        reset($this->me);
-        return current($this->me);
-    }
-
-    /**
-     * @return string
-     */
-    function scalartyp()
-    {
-        global $XML_RPC_I4, $XML_RPC_Int;
-        reset($this->me);
-        $a = key($this->me);
-        if ($a == $XML_RPC_I4) {
-            $a = $XML_RPC_Int;
-        }
-        return $a;
-    }
-
-    /**
-     * @return mixed  the struct's current element
-     */
-    function arraymem($m)
-    {
-        return $this->me['array'][$m];
-    }
-
-    /**
-     * @return int  the number of elements in the array
-     */
-    function arraysize()
-    {
-        reset($this->me);
-        list($a, $b) = each($this->me);
-        return sizeof($b);
-    }
-
-    /**
-     * Determines if the item submitted is an XML_RPC_Value object
-     *
-     * @param mixed $val  the variable to be evaluated
-     *
-     * @return bool  TRUE if the item is an XML_RPC_Value object
-     *
-     * @static
-     * @since Method available since Release 1.3.0
-     */
-    function isValue($val)
-    {
-        return (strtolower(get_class($val)) == 'xml_rpc_value');
-    }
-}
-
-/**
- * Return an ISO8601 encoded string
- *
- * While timezones ought to be supported, the XML-RPC spec says:
- *
- * "Don't assume a timezone. It should be specified by the server in its
- * documentation what assumptions it makes about timezones."
- *
- * This routine always assumes localtime unless $utc is set to 1, in which
- * case UTC is assumed and an adjustment for locale is made when encoding.
- *
- * @return string  the formatted date
- */
-function XML_RPC_iso8601_encode($timet, $utc = 0)
-{
-    if (!$utc) {
-        $t = strftime('%Y%m%dT%H:%M:%S', $timet);
-    } else {
-        if (function_exists('gmstrftime')) {
-            // gmstrftime doesn't exist in some versions
-            // of PHP
-            $t = gmstrftime('%Y%m%dT%H:%M:%S', $timet);
-        } else {
-            $t = strftime('%Y%m%dT%H:%M:%S', $timet - date('Z'));
-        }
-    }
-    return $t;
-}
-
-/**
- * Convert a datetime string into a Unix timestamp
- *
- * While timezones ought to be supported, the XML-RPC spec says:
- *
- * "Don't assume a timezone. It should be specified by the server in its
- * documentation what assumptions it makes about timezones."
- *
- * This routine always assumes localtime unless $utc is set to 1, in which
- * case UTC is assumed and an adjustment for locale is made when encoding.
- *
- * @return int  the unix timestamp of the date submitted
- */
-function XML_RPC_iso8601_decode($idate, $utc = 0)
-{
-    $t = 0;
-    if (ereg('([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})', $idate, $regs)) {
-        if ($utc) {
-            $t = gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
-        } else {
-            $t = mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
-        }
-    }
-    return $t;
-}
-
-/**
- * Converts an XML_RPC_Value object into native PHP types
- *
- * @param object $XML_RPC_val  the XML_RPC_Value object to decode
- *
- * @return mixed  the PHP values
- */
-function XML_RPC_decode($XML_RPC_val)
-{
-    $kind = $XML_RPC_val->kindOf();
-
-    if ($kind == 'scalar') {
-        return $XML_RPC_val->scalarval();
-
-    } elseif ($kind == 'array') {
-        $size = $XML_RPC_val->arraysize();
-        $arr = array();
-        for ($i = 0; $i < $size; $i++) {
-            $arr[] = XML_RPC_decode($XML_RPC_val->arraymem($i));
-        }
-        return $arr;
-
-    } elseif ($kind == 'struct') {
-        $XML_RPC_val->structreset();
-        $arr = array();
-        while (list($key, $value) = $XML_RPC_val->structeach()) {
-            $arr[$key] = XML_RPC_decode($value);
-        }
-        return $arr;
-    }
-}
-
-/**
- * Converts native PHP types into an XML_RPC_Value object
- *
- * @param mixed $php_val  the PHP value or variable you want encoded
- *
- * @return object  the XML_RPC_Value object
- */
-function XML_RPC_encode($php_val)
-{
-    global $XML_RPC_Boolean, $XML_RPC_Int, $XML_RPC_Double, $XML_RPC_String,
-           $XML_RPC_Array, $XML_RPC_Struct;
-
-    $type = gettype($php_val);
-    $XML_RPC_val = new XML_RPC_Value;
-
-    switch ($type) {
-    case 'array':
-        if (empty($php_val)) {
-            $XML_RPC_val->addArray($php_val);
-            break;
-        }
-        $tmp = array_diff(array_keys($php_val), range(0, count($php_val)-1));
-        if (empty($tmp)) {
-           $arr = array();
-           foreach ($php_val as $k => $v) {
-               $arr[$k] = XML_RPC_encode($v);
-           }
-           $XML_RPC_val->addArray($arr);
-           break;
-        }
-        // fall though if it's not an enumerated array
-
-    case 'object':
-        $arr = array();
-        foreach ($php_val as $k => $v) {
-            $arr[$k] = XML_RPC_encode($v);
-        }
-        $XML_RPC_val->addStruct($arr);
-        break;
-
-    case 'integer':
-        $XML_RPC_val->addScalar($php_val, $XML_RPC_Int);
-        break;
-
-    case 'double':
-        $XML_RPC_val->addScalar($php_val, $XML_RPC_Double);
-        break;
-
-    case 'string':
-    case 'NULL':
-        $XML_RPC_val->addScalar($php_val, $XML_RPC_String);
-        break;
-
-    case 'boolean':
-        // Add support for encoding/decoding of booleans, since they
-        // are supported in PHP
-        // by <G_Giunta_2001-02-29>
-        $XML_RPC_val->addScalar($php_val, $XML_RPC_Boolean);
-        break;
-
-    case 'unknown type':
-    default:
-        $XML_RPC_val = false;
-    }
-    return $XML_RPC_val;
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
-?>
diff --git a/3rdparty/XML/RPC/Server.php b/3rdparty/XML/RPC/Server.php
deleted file mode 100644
index 5c5c04b1f7a..00000000000
--- a/3rdparty/XML/RPC/Server.php
+++ /dev/null
@@ -1,624 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Server commands for our PHP implementation of the XML-RPC protocol
- *
- * This is a PEAR-ified version of Useful inc's XML-RPC for PHP.
- * It has support for HTTP transport, proxies and authentication.
- *
- * PHP versions 4 and 5
- *
- * LICENSE: License is granted to use or modify this software
- * ("XML-RPC for PHP") for commercial or non-commercial use provided the
- * copyright of the author is preserved in any distributed or derivative work.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESSED OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Edd Dumbill <edd@usefulinc.com>
- * @author     Stig Bakken <stig@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
- * @version    CVS: $Id: Server.php,v 1.29 2005/08/14 20:25:35 danielc Exp $
- * @link       http://pear.php.net/package/XML_RPC
- */
-
-
-/**
- * Pull in the XML_RPC class
- */
-require_once 'XML/RPC.php';
-
-
-/**
- * signature for system.listMethods: return = array,
- * parameters = a string or nothing
- * @global array $GLOBALS['XML_RPC_Server_listMethods_sig']
- */
-$GLOBALS['XML_RPC_Server_listMethods_sig'] = array(
-    array($GLOBALS['XML_RPC_Array'],
-          $GLOBALS['XML_RPC_String']
-    ),
-    array($GLOBALS['XML_RPC_Array'])
-);
-
-/**
- * docstring for system.listMethods
- * @global string $GLOBALS['XML_RPC_Server_listMethods_doc']
- */
-$GLOBALS['XML_RPC_Server_listMethods_doc'] = 'This method lists all the'
-        . ' methods that the XML-RPC server knows how to dispatch';
-
-/**
- * signature for system.methodSignature: return = array,
- * parameters = string
- * @global array $GLOBALS['XML_RPC_Server_methodSignature_sig']
- */
-$GLOBALS['XML_RPC_Server_methodSignature_sig'] = array(
-    array($GLOBALS['XML_RPC_Array'],
-          $GLOBALS['XML_RPC_String']
-    )
-);
-
-/**
- * docstring for system.methodSignature
- * @global string $GLOBALS['XML_RPC_Server_methodSignature_doc']
- */
-$GLOBALS['XML_RPC_Server_methodSignature_doc'] = 'Returns an array of known'
-        . ' signatures (an array of arrays) for the method name passed. If'
-        . ' no signatures are known, returns a none-array (test for type !='
-        . ' array to detect missing signature)';
-
-/**
- * signature for system.methodHelp: return = string,
- * parameters = string
- * @global array $GLOBALS['XML_RPC_Server_methodHelp_sig']
- */
-$GLOBALS['XML_RPC_Server_methodHelp_sig'] = array(
-    array($GLOBALS['XML_RPC_String'],
-          $GLOBALS['XML_RPC_String']
-    )
-);
-
-/**
- * docstring for methodHelp
- * @global string $GLOBALS['XML_RPC_Server_methodHelp_doc']
- */
-$GLOBALS['XML_RPC_Server_methodHelp_doc'] = 'Returns help text if defined'
-        . ' for the method passed, otherwise returns an empty string';
-
-/**
- * dispatch map for the automatically declared XML-RPC methods.
- * @global array $GLOBALS['XML_RPC_Server_dmap']
- */
-$GLOBALS['XML_RPC_Server_dmap'] = array(
-    'system.listMethods' => array(
-        'function'  => 'XML_RPC_Server_listMethods',
-        'signature' => $GLOBALS['XML_RPC_Server_listMethods_sig'],
-        'docstring' => $GLOBALS['XML_RPC_Server_listMethods_doc']
-    ),
-    'system.methodHelp' => array(
-        'function'  => 'XML_RPC_Server_methodHelp',
-        'signature' => $GLOBALS['XML_RPC_Server_methodHelp_sig'],
-        'docstring' => $GLOBALS['XML_RPC_Server_methodHelp_doc']
-    ),
-    'system.methodSignature' => array(
-        'function'  => 'XML_RPC_Server_methodSignature',
-        'signature' => $GLOBALS['XML_RPC_Server_methodSignature_sig'],
-        'docstring' => $GLOBALS['XML_RPC_Server_methodSignature_doc']
-    )
-);
-
-/**
- * @global string $GLOBALS['XML_RPC_Server_debuginfo']
- */
-$GLOBALS['XML_RPC_Server_debuginfo'] = '';
-
-
-/**
- * Lists all the methods that the XML-RPC server knows how to dispatch
- *
- * @return object  a new XML_RPC_Response object
- */
-function XML_RPC_Server_listMethods($server, $m)
-{
-    global $XML_RPC_err, $XML_RPC_str, $XML_RPC_Server_dmap;
-
-    $v = new XML_RPC_Value();
-    $outAr = array();
-    foreach ($server->dmap as $key => $val) {
-        $outAr[] = new XML_RPC_Value($key, 'string');
-    }
-    foreach ($XML_RPC_Server_dmap as $key => $val) {
-        $outAr[] = new XML_RPC_Value($key, 'string');
-    }
-    $v->addArray($outAr);
-    return new XML_RPC_Response($v);
-}
-
-/**
- * Returns an array of known signatures (an array of arrays)
- * for the given method
- *
- * If no signatures are known, returns a none-array
- * (test for type != array to detect missing signature)
- *
- * @return object  a new XML_RPC_Response object
- */
-function XML_RPC_Server_methodSignature($server, $m)
-{
-    global $XML_RPC_err, $XML_RPC_str, $XML_RPC_Server_dmap;
-
-    $methName = $m->getParam(0);
-    $methName = $methName->scalarval();
-    if (strpos($methName, 'system.') === 0) {
-        $dmap = $XML_RPC_Server_dmap;
-        $sysCall = 1;
-    } else {
-        $dmap = $server->dmap;
-        $sysCall = 0;
-    }
-    //  print "<!-- ${methName} -->\n";
-    if (isset($dmap[$methName])) {
-        if ($dmap[$methName]['signature']) {
-            $sigs = array();
-            $thesigs = $dmap[$methName]['signature'];
-            for ($i = 0; $i < sizeof($thesigs); $i++) {
-                $cursig = array();
-                $inSig = $thesigs[$i];
-                for ($j = 0; $j < sizeof($inSig); $j++) {
-                    $cursig[] = new XML_RPC_Value($inSig[$j], 'string');
-                }
-                $sigs[] = new XML_RPC_Value($cursig, 'array');
-            }
-            $r = new XML_RPC_Response(new XML_RPC_Value($sigs, 'array'));
-        } else {
-            $r = new XML_RPC_Response(new XML_RPC_Value('undef', 'string'));
-        }
-    } else {
-        $r = new XML_RPC_Response(0, $XML_RPC_err['introspect_unknown'],
-                                  $XML_RPC_str['introspect_unknown']);
-    }
-    return $r;
-}
-
-/**
- * Returns help text if defined for the method passed, otherwise returns
- * an empty string
- *
- * @return object  a new XML_RPC_Response object
- */
-function XML_RPC_Server_methodHelp($server, $m)
-{
-    global $XML_RPC_err, $XML_RPC_str, $XML_RPC_Server_dmap;
-
-    $methName = $m->getParam(0);
-    $methName = $methName->scalarval();
-    if (strpos($methName, 'system.') === 0) {
-        $dmap = $XML_RPC_Server_dmap;
-        $sysCall = 1;
-    } else {
-        $dmap = $server->dmap;
-        $sysCall = 0;
-    }
-
-    if (isset($dmap[$methName])) {
-        if ($dmap[$methName]['docstring']) {
-            $r = new XML_RPC_Response(new XML_RPC_Value($dmap[$methName]['docstring']),
-                                                        'string');
-        } else {
-            $r = new XML_RPC_Response(new XML_RPC_Value('', 'string'));
-        }
-    } else {
-        $r = new XML_RPC_Response(0, $XML_RPC_err['introspect_unknown'],
-                                     $XML_RPC_str['introspect_unknown']);
-    }
-    return $r;
-}
-
-/**
- * @return void
- */
-function XML_RPC_Server_debugmsg($m)
-{
-    global $XML_RPC_Server_debuginfo;
-    $XML_RPC_Server_debuginfo = $XML_RPC_Server_debuginfo . $m . "\n";
-}
-
-
-/**
- * A server for receiving and replying to XML RPC requests
- *
- * <code>
- * $server = new XML_RPC_Server(
- *     array(
- *         'isan8' =>
- *             array(
- *                 'function' => 'is_8',
- *                 'signature' =>
- *                      array(
- *                          array('boolean', 'int'),
- *                          array('boolean', 'int', 'boolean'),
- *                          array('boolean', 'string'),
- *                          array('boolean', 'string', 'boolean'),
- *                      ),
- *                 'docstring' => 'Is the value an 8?'
- *             ),
- *     ),
- *     1,
- *     0
- * ); 
- * </code>
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Edd Dumbill <edd@usefulinc.com>
- * @author     Stig Bakken <stig@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
- * @version    Release: 1.4.0
- * @link       http://pear.php.net/package/XML_RPC
- */
-class XML_RPC_Server
-{
-    /**
-     * The dispatch map, listing the methods this server provides.
-     * @var array
-     */
-    var $dmap = array();
-
-    /**
-     * The present response's encoding
-     * @var string
-     * @see XML_RPC_Message::getEncoding()
-     */
-    var $encoding = '';
-
-    /**
-     * Debug mode (0 = off, 1 = on)
-     * @var integer
-     */
-    var $debug = 0;
-
-    /**
-     * The response's HTTP headers
-     * @var string
-     */
-    var $server_headers = '';
-
-    /**
-     * The response's XML payload
-     * @var string
-     */
-    var $server_payload = '';
-
-
-    /**
-     * Constructor for the XML_RPC_Server class
-     *
-     * @param array $dispMap   the dispatch map. An associative array
-     *                          explaining each function. The keys of the main
-     *                          array are the procedure names used by the
-     *                          clients. The value is another associative array
-     *                          that contains up to three elements:
-     *                            + The 'function' element's value is the name
-     *                              of the function or method that gets called.
-     *                              To define a class' method: 'class::method'.
-     *                            + The 'signature' element (optional) is an
-     *                              array describing the return values and
-     *                              parameters
-     *                            + The 'docstring' element (optional) is a
-     *                              string describing what the method does
-     * @param int $serviceNow  should the HTTP response be sent now?
-     *                          (1 = yes, 0 = no)
-     * @param int $debug       should debug output be displayed?
-     *                          (1 = yes, 0 = no)
-     *
-     * @return void
-     */
-    function XML_RPC_Server($dispMap, $serviceNow = 1, $debug = 0)
-    {
-        global $HTTP_RAW_POST_DATA;
-
-        if ($debug) {
-            $this->debug = 1;
-        } else {
-            $this->debug = 0;
-        }
-
-        $this->dmap = $dispMap;
-
-        if ($serviceNow) {
-            $this->service();
-        } else {
-            $this->createServerPayload();
-            $this->createServerHeaders();
-        }
-    }
-
-    /**
-     * @return string  the debug information if debug debug mode is on
-     */
-    function serializeDebug()
-    {
-        global $XML_RPC_Server_debuginfo, $HTTP_RAW_POST_DATA;
-
-        if ($this->debug) {
-            XML_RPC_Server_debugmsg('vvv POST DATA RECEIVED BY SERVER vvv' . "\n"
-                                    . $HTTP_RAW_POST_DATA
-                                    . "\n" . '^^^ END POST DATA ^^^');
-        }
-
-        if ($XML_RPC_Server_debuginfo != '') {
-            return "<!-- PEAR XML_RPC SERVER DEBUG INFO:\n\n"
-                   . preg_replace('/-(?=-)/', '- ', $XML_RPC_Server_debuginfo)
-                   . "-->\n";
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Sends the response
-     *
-     * The encoding and content-type are determined by
-     * XML_RPC_Message::getEncoding()
-     *
-     * @return void
-     *
-     * @uses XML_RPC_Server::createServerPayload(),
-     *       XML_RPC_Server::createServerHeaders()
-     */
-    function service()
-    {
-        if (!$this->server_payload) {
-            $this->createServerPayload();
-        }
-        if (!$this->server_headers) {
-            $this->createServerHeaders();
-        }
-        header($this->server_headers);
-        print $this->server_payload;
-    }
-
-    /**
-     * Generates the payload and puts it in the $server_payload property
-     *
-     * @return void
-     *
-     * @uses XML_RPC_Server::parseRequest(), XML_RPC_Server::$encoding,
-     *       XML_RPC_Response::serialize(), XML_RPC_Server::serializeDebug()
-     */
-    function createServerPayload()
-    {
-        $r = $this->parseRequest();
-        $this->server_payload = '<?xml version="1.0" encoding="'
-                              . $this->encoding . '"?>' . "\n"
-                              . $this->serializeDebug()
-                              . $r->serialize();
-    }
-
-    /**
-     * Determines the HTTP headers and puts them in the $server_headers
-     * property
-     *
-     * @return boolean  TRUE if okay, FALSE if $server_payload isn't set.
-     *
-     * @uses XML_RPC_Server::createServerPayload(),
-     *       XML_RPC_Server::$server_headers
-     */
-    function createServerHeaders()
-    {
-        if (!$this->server_payload) {
-            return false;
-        }
-        $this->server_headers = 'Content-Length: '
-                              . strlen($this->server_payload) . "\r\n"
-                              . 'Content-Type: text/xml;'
-                              . ' charset=' . $this->encoding;
-        return true;
-    }
-
-    /**
-     * @return array
-     */
-    function verifySignature($in, $sig)
-    {
-        for ($i = 0; $i < sizeof($sig); $i++) {
-            // check each possible signature in turn
-            $cursig = $sig[$i];
-            if (sizeof($cursig) == $in->getNumParams() + 1) {
-                $itsOK = 1;
-                for ($n = 0; $n < $in->getNumParams(); $n++) {
-                    $p = $in->getParam($n);
-                    // print "<!-- $p -->\n";
-                    if ($p->kindOf() == 'scalar') {
-                        $pt = $p->scalartyp();
-                    } else {
-                        $pt = $p->kindOf();
-                    }
-                    // $n+1 as first type of sig is return type
-                    if ($pt != $cursig[$n+1]) {
-                        $itsOK = 0;
-                        $pno = $n+1;
-                        $wanted = $cursig[$n+1];
-                        $got = $pt;
-                        break;
-                    }
-                }
-                if ($itsOK) {
-                    return array(1);
-                }
-            }
-        }
-        if (isset($wanted)) {
-            return array(0, "Wanted ${wanted}, got ${got} at param ${pno}");
-        } else {
-            $allowed = array();
-            foreach ($sig as $val) {
-                end($val);
-                $allowed[] = key($val);
-            }
-            $allowed = array_unique($allowed);
-            $last = count($allowed) - 1;
-            if ($last > 0) {
-                $allowed[$last] = 'or ' . $allowed[$last];
-            }
-            return array(0,
-                         'Signature permits ' . implode(', ', $allowed)
-                                . ' parameters but the request had '
-                                . $in->getNumParams());
-        }
-    }
-
-    /**
-     * @return object  a new XML_RPC_Response object
-     *
-     * @uses XML_RPC_Message::getEncoding(), XML_RPC_Server::$encoding
-     */
-    function parseRequest($data = '')
-    {
-        global $XML_RPC_xh, $HTTP_RAW_POST_DATA,
-                $XML_RPC_err, $XML_RPC_str, $XML_RPC_errxml,
-                $XML_RPC_defencoding, $XML_RPC_Server_dmap;
-
-        if ($data == '') {
-            $data = $HTTP_RAW_POST_DATA;
-        }
-
-        $this->encoding = XML_RPC_Message::getEncoding($data);
-        $parser_resource = xml_parser_create($this->encoding);
-        $parser = (int) $parser_resource;
-
-        $XML_RPC_xh[$parser] = array();
-        $XML_RPC_xh[$parser]['cm']     = 0;
-        $XML_RPC_xh[$parser]['isf']    = 0;
-        $XML_RPC_xh[$parser]['params'] = array();
-        $XML_RPC_xh[$parser]['method'] = '';
-        $XML_RPC_xh[$parser]['stack'] = array();	
-        $XML_RPC_xh[$parser]['valuestack'] = array();	
-
-        $plist = '';
-
-        // decompose incoming XML into request structure
-
-        xml_parser_set_option($parser_resource, XML_OPTION_CASE_FOLDING, true);
-        xml_set_element_handler($parser_resource, 'XML_RPC_se', 'XML_RPC_ee');
-        xml_set_character_data_handler($parser_resource, 'XML_RPC_cd');
-        if (!xml_parse($parser_resource, $data, 1)) {
-            // return XML error as a faultCode
-            $r = new XML_RPC_Response(0,
-                                      $XML_RPC_errxml+xml_get_error_code($parser_resource),
-                                      sprintf('XML error: %s at line %d',
-                                              xml_error_string(xml_get_error_code($parser_resource)),
-                                              xml_get_current_line_number($parser_resource)));
-            xml_parser_free($parser_resource);
-        } elseif ($XML_RPC_xh[$parser]['isf']>1) {
-            $r = new XML_RPC_Response(0,
-                                      $XML_RPC_err['invalid_request'],
-                                      $XML_RPC_str['invalid_request']
-                                      . ': '
-                                      . $XML_RPC_xh[$parser]['isf_reason']);
-            xml_parser_free($parser_resource);
-        } else {
-            xml_parser_free($parser_resource);
-            $m = new XML_RPC_Message($XML_RPC_xh[$parser]['method']);
-            // now add parameters in
-            for ($i = 0; $i < sizeof($XML_RPC_xh[$parser]['params']); $i++) {
-                // print '<!-- ' . $XML_RPC_xh[$parser]['params'][$i]. "-->\n";
-                $plist .= "$i - " . var_export($XML_RPC_xh[$parser]['params'][$i], true) . " \n";
-                $m->addParam($XML_RPC_xh[$parser]['params'][$i]);
-            }
-            XML_RPC_Server_debugmsg($plist);
-
-            // now to deal with the method
-            $methName = $XML_RPC_xh[$parser]['method'];
-            if (strpos($methName, 'system.') === 0) {
-                $dmap = $XML_RPC_Server_dmap;
-                $sysCall = 1;
-            } else {
-                $dmap = $this->dmap;
-                $sysCall = 0;
-            }
-
-            if (isset($dmap[$methName]['function'])
-                && is_string($dmap[$methName]['function'])
-                && strpos($dmap[$methName]['function'], '::') !== false)
-            {
-                $dmap[$methName]['function'] =
-                        explode('::', $dmap[$methName]['function']);
-            }
-
-            if (isset($dmap[$methName]['function'])
-                && is_callable($dmap[$methName]['function']))
-            {
-                // dispatch if exists
-                if (isset($dmap[$methName]['signature'])) {
-                    $sr = $this->verifySignature($m,
-                                                 $dmap[$methName]['signature'] );
-                }
-                if (!isset($dmap[$methName]['signature']) || $sr[0]) {
-                    // if no signature or correct signature
-                    if ($sysCall) {
-                        $r = call_user_func($dmap[$methName]['function'], $this, $m);
-                    } else {
-                        $r = call_user_func($dmap[$methName]['function'], $m);
-                    }
-                    if (!is_a($r, 'XML_RPC_Response')) {
-                        $r = new XML_RPC_Response(0, $XML_RPC_err['not_response_object'],
-                                                  $XML_RPC_str['not_response_object']);
-                    }
-                } else {
-                    $r = new XML_RPC_Response(0, $XML_RPC_err['incorrect_params'],
-                                              $XML_RPC_str['incorrect_params']
-                                              . ': ' . $sr[1]);
-                }
-            } else {
-                // else prepare error response
-                $r = new XML_RPC_Response(0, $XML_RPC_err['unknown_method'],
-                                          $XML_RPC_str['unknown_method']);
-            }
-        }
-        return $r;
-    }
-
-    /**
-     * Echos back the input packet as a string value
-     *
-     * @return void
-     *
-     * Useful for debugging.
-     */
-    function echoInput()
-    {
-        global $HTTP_RAW_POST_DATA;
-
-        $r = new XML_RPC_Response(0);
-        $r->xv = new XML_RPC_Value("'Aha said I: '" . $HTTP_RAW_POST_DATA, 'string');
-        print $r->serialize();
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
-?>
diff --git a/3rdparty/css/chosen-sprite.png b/3rdparty/css/chosen-sprite.png
deleted file mode 100644
index f20db4439ea5c1038126bf326c8fd048b03a8226..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 742
zcmeAS@N?(olHy`uVBq!ia0vp^HbAV#!3-qV=X2}@QlA5SLR>pKI{yFvKXc~Hw6wJT
z{{AOVo_zoQeZqtZ&!0cvw{PF?-@ki%d;k6WS6EoMdiClhOP1WeeS7cTz4PYH`}FD4
zt5>h?-n~0()~rX59=&++V%xTD`T6-@zI<7}eEIzO^LOst`S<VN6)RS3+_>@T)vFse
zZ0PFhnmc#y*RNl9?AVc)msea|{PX9}Ns}gR+O%o+?%jtD9eVii;l+y=r%jvo;K760
zvu76+6kNZ4ed^SyPoF-WIC0|Z*ROy4_>r5N`~Lm=&!0c{_4O@WxbWAnUpYBBmoHy_
z_Uzfgg9n!`T{?O4<drK|-nw<`@#DuQPoDht?c1F@ciz5z+tbriR8$1?tnK5A`9SXn
zmIV0)1G!WM3>j}$9Asc%4D@ty45_&F_R{g9Lk0qD52mW_e8hCD#Hn3?L-tbj`>OxT
zJ7v;md~}?7W?s>W`VVqX@=db;D+pYCKd;4N)z`osoP6iyoB9teW8`B#?2;Ii#BfGM
zL+6u_bqvF)z6Qwy7F^e#>{}{m61e02bdHnN$L$~3eq~pF@_OO1hcV%@q4${;^UfV+
znXY)w;%ghbu4vj9l}FCEd^hZyc+KPP6}AS4MsdBpQGw+X69gF?tV83O8O(MiJx^-A
zboXW1bFqq*pAC;_YOi~??#RV$D!*(*_VfK;FjaJ|%YuJ~uPm<26>Fce&`YSSyXC`g
zaTdR+Ec5IClowvmjG1!3;Krqz><Q8Pl0Ga>yXh1n|0<p1&CfC$pSO~Y++jw=)*OF&
z-#pc2;;&l%amTf5964fH?1$!kEt<}uvuKxE@bxk&4xLrT*_*a)zE#H@d%ow&OqRzb
gV%<yUl|1^$Is0l?nEJ6OP)cU-boFyt=akR{0B7jC4*&oF

diff --git a/3rdparty/css/chosen.css b/3rdparty/css/chosen.css
deleted file mode 100644
index 96bae0fe95a..00000000000
--- a/3rdparty/css/chosen.css
+++ /dev/null
@@ -1,341 +0,0 @@
-/* @group Base */
-select.chzn-select {
-  visibility: hidden;
-  height: 28px !important;
-  min-height: 28px !important;
-}
-.chzn-container {
-  font-size: 13px;
-  position: relative;
-  display: inline-block;
-  zoom: 1;
-  *display: inline;
-  vertical-align: bottom;
-}
-.chzn-container .chzn-drop {
-  background: #fff;
-  border: 1px solid #aaa;
-  border-top: 0;
-  position: absolute;
-  top: 29px;
-  left: 0;
-  -webkit-box-shadow: 0 4px 5px rgba(0,0,0,.15);
-  -moz-box-shadow   : 0 4px 5px rgba(0,0,0,.15);
-  -o-box-shadow     : 0 4px 5px rgba(0,0,0,.15);
-  box-shadow        : 0 4px 5px rgba(0,0,0,.15);
-  z-index: 999;
-}
-/* @end */
-
-/* @group Single Chosen */
-.chzn-container-single .chzn-single {
-  background-color: #fff;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.5, white));
-  background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 50%);
-  background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 50%);
-  background-image: -o-linear-gradient(top, #eeeeee 0%,#ffffff 50%);
-  background-image: -ms-linear-gradient(top, #eeeeee 0%,#ffffff 50%);
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#ffffff',GradientType=0 );
-  background-image: linear-gradient(top, #eeeeee 0%,#ffffff 50%);
-  -webkit-border-radius: 4px;
-  -moz-border-radius   : 4px;
-  border-radius        : 4px;
-  -moz-background-clip   : padding;
-  -webkit-background-clip: padding-box;
-  background-clip        : padding-box;
-  border: 1px solid #aaa;
-  display: block;
-  overflow: hidden;
-  white-space: nowrap;
-  position: relative;
-  height: 26px;
-  line-height: 26px;
-  padding: 0 0 0 8px;
-  color: #444;
-  text-decoration: none;
-}
-.chzn-container-single .chzn-single span {
-  margin-right: 26px;
-  display: block;
-  overflow: hidden;
-  white-space: nowrap;
-  -o-text-overflow: ellipsis;
-  -ms-text-overflow: ellipsis;
-  -moz-binding: url('/xml/ellipsis.xml#ellipsis');
-  text-overflow: ellipsis;
-}
-.chzn-container-single .chzn-single div {
-  -webkit-border-radius: 0 4px 4px 0;
-  -moz-border-radius   : 0 4px 4px 0;
-  border-radius        : 0 4px 4px 0;
-  -moz-background-clip   : padding;
-  -webkit-background-clip: padding-box;
-  background-clip        : padding-box;
-  background: #ccc;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee));
-  background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%);
-  background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%);
-  background-image: -o-linear-gradient(bottom, #ccc 0%, #eee 60%);
-  background-image: -ms-linear-gradient(top, #cccccc 0%,#eeeeee 60%);
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cccccc', endColorstr='#eeeeee',GradientType=0 );
-  background-image: linear-gradient(top, #cccccc 0%,#eeeeee 60%);
-  border-left: 1px solid #aaa;
-  position: absolute;
-  right: 0;
-  top: 0;
-  display: block;
-  height: 100%;
-  width: 18px;
-}
-.chzn-container-single .chzn-single div b {
-  background: url('chosen-sprite.png') no-repeat 0 1px;
-  display: block;
-  width: 100%;
-  height: 100%;
-}
-.chzn-container-single .chzn-search {
-  padding: 3px 4px;
-  margin: 0;
-  white-space: nowrap;
-}
-.chzn-container-single .chzn-search input {
-  background: #fff url('chosen-sprite.png') no-repeat 100% -20px;
-  background: url('chosen-sprite.png') no-repeat 100% -20px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
-  background: url('chosen-sprite.png') no-repeat 100% -20px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat 100% -20px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat 100% -20px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat 100% -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat 100% -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat 100% -20px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  margin: 1px 0;
-  padding: 4px 20px 4px 5px;
-  outline: 0;
-  border: 1px solid #aaa;
-  font-family: sans-serif;
-  font-size: 1em;
-}
-.chzn-container-single .chzn-drop {
-  -webkit-border-radius: 0 0 4px 4px;
-  -moz-border-radius   : 0 0 4px 4px;
-  border-radius        : 0 0 4px 4px;
-  -moz-background-clip   : padding;
-  -webkit-background-clip: padding-box;
-  background-clip        : padding-box;
-}
-/* @end */
-
-/* @group Multi Chosen */
-.chzn-container-multi .chzn-choices {
-  background-color: #fff;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
-  background-image: -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background-image: -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background-image: -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
-  background-image: -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
-  background-image: linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  border: 1px solid #aaa;
-  margin: 0;
-  padding: 0;
-  cursor: text;
-  overflow: hidden;
-  height: auto !important;
-  height: 1%;
-  position: relative;
-}
-.chzn-container-multi .chzn-choices li {
-  float: left;
-  list-style: none;
-}
-.chzn-container-multi .chzn-choices .search-field {
-  white-space: nowrap;
-  margin: 0;
-  padding: 0;
-}
-.chzn-container-multi .chzn-choices .search-field input {
-  color: #666;
-  background: transparent !important;
-  border: 0 !important;
-  padding: 5px;
-  margin: 1px 0;
-  outline: 0;
-  -webkit-box-shadow: none;
-  -moz-box-shadow   : none;
-  -o-box-shadow     : none;
-  box-shadow        : none;
-}
-.chzn-container-multi .chzn-choices .search-field .default {
-  color: #999;
-}
-.chzn-container-multi .chzn-choices .search-choice {
-  -webkit-border-radius: 3px;
-  -moz-border-radius   : 3px;
-  border-radius        : 3px;
-  -moz-background-clip   : padding;
-  -webkit-background-clip: padding-box;
-  background-clip        : padding-box;
-  background-color: #e4e4e4;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #e4e4e4), color-stop(0.7, #eeeeee));
-  background-image: -webkit-linear-gradient(center bottom, #e4e4e4 0%, #eeeeee 70%);
-  background-image: -moz-linear-gradient(center bottom, #e4e4e4 0%, #eeeeee 70%);
-  background-image: -o-linear-gradient(bottom, #e4e4e4 0%, #eeeeee 70%);
-  background-image: -ms-linear-gradient(top, #e4e4e4 0%,#eeeeee 70%);
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e4e4e4', endColorstr='#eeeeee',GradientType=0 );
-  background-image: linear-gradient(top, #e4e4e4 0%,#eeeeee 70%);
-  color: #333;
-  border: 1px solid #b4b4b4;
-  line-height: 13px;
-  padding: 3px 19px 3px 6px;
-  margin: 3px 0 3px 5px;
-  position: relative;
-}
-.chzn-container-multi .chzn-choices .search-choice span {
-  cursor: default;
-}
-.chzn-container-multi .chzn-choices .search-choice-focus {
-  background: #d4d4d4;
-}
-.chzn-container-multi .chzn-choices .search-choice .search-choice-close {
-  display: block;
-  position: absolute;
-  right: 5px;
-  top: 6px;
-  width: 8px;
-  height: 9px;
-  font-size: 1px;
-  background: url(chosen-sprite.png) right top no-repeat;
-}
-.chzn-container-multi .chzn-choices .search-choice .search-choice-close:hover {
-  background-position: right -9px;
-}
-.chzn-container-multi .chzn-choices .search-choice-focus .search-choice-close {
-  background-position: right -9px;
-}
-/* @end */
-
-/* @group Results */
-.chzn-container .chzn-results {
-  margin: 0 4px 4px 0;
-  max-height: 190px;
-  padding: 0 0 0 4px;
-  position: relative;
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-.chzn-container-multi .chzn-results {
-  margin: -1px 0 0;
-  padding: 0;
-}
-.chzn-container .chzn-results li {
-  line-height: 80%;
-  padding: 7px 7px 8px;
-  margin: 0;
-  list-style: none;
-}
-.chzn-container .chzn-results .active-result {
-  cursor: pointer;
-}
-.chzn-container .chzn-results .highlighted {
-  background: #3875d7;
-  color: #fff;
-}
-.chzn-container .chzn-results li em {
-  background: #feffde;
-  font-style: normal;
-}
-.chzn-container .chzn-results .highlighted em {
-  background: transparent;
-}
-.chzn-container .chzn-results .no-results {
-  background: #f4f4f4;
-}
-.chzn-container .chzn-results .group-result {
-  cursor: default;
-  color: #999;
-  font-weight: bold;
-}
-.chzn-container .chzn-results .group-option {
-  padding-left: 20px;
-}
-.chzn-container-multi .chzn-drop .result-selected {
-  display: none;
-}
-/* @end */
-
-/* @group Active  */
-.chzn-container-active .chzn-single {
-  -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
-  -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
-  -o-box-shadow     : 0 0 5px rgba(0,0,0,.3);
-  box-shadow        : 0 0 5px rgba(0,0,0,.3);
-  border: 1px solid #5897fb;
-}
-.chzn-container-active .chzn-single-with-drop {
-  border: 1px solid #aaa;
-  -webkit-box-shadow: 0 1px 0 #fff inset;
-  -moz-box-shadow   : 0 1px 0 #fff inset;
-  -o-box-shadow     : 0 1px 0 #fff inset;
-  box-shadow        : 0 1px 0 #fff inset;
-  background-color: #eee;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, white), color-stop(0.5, #eeeeee));
-  background-image: -webkit-linear-gradient(center bottom, white 0%, #eeeeee 50%);
-  background-image: -moz-linear-gradient(center bottom, white 0%, #eeeeee 50%);
-  background-image: -o-linear-gradient(bottom, white 0%, #eeeeee 50%);
-  background-image: -ms-linear-gradient(top, #ffffff 0%,#eeeeee 50%);
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
-  background-image: linear-gradient(top, #ffffff 0%,#eeeeee 50%);
-  -webkit-border-bottom-left-radius : 0;
-  -webkit-border-bottom-right-radius: 0;
-  -moz-border-radius-bottomleft : 0;
-  -moz-border-radius-bottomright: 0;
-  border-bottom-left-radius : 0;
-  border-bottom-right-radius: 0;
-}
-.chzn-container-active .chzn-single-with-drop div {
-  background: transparent;
-  border-left: none;
-}
-.chzn-container-active .chzn-single-with-drop div b {
-  background-position: -18px 1px;
-}
-.chzn-container-active .chzn-choices {
-  -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
-  -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
-  -o-box-shadow     : 0 0 5px rgba(0,0,0,.3);
-  box-shadow        : 0 0 5px rgba(0,0,0,.3);
-  border: 1px solid #5897fb;
-}
-.chzn-container-active .chzn-choices .search-field input {
-  color: #111 !important;
-}
-/* @end */
-
-/* @group Right to Left */
-.chzn-rtl { direction:rtl;text-align: right; }
-.chzn-rtl .chzn-single { padding-left: 0; padding-right: 8px; }
-.chzn-rtl .chzn-single span { margin-left: 26px; margin-right: 0; }
-.chzn-rtl .chzn-single div { 
-  left: 0; right: auto; 
-  border-left: none; border-right: 1px solid #aaaaaa;
-  -webkit-border-radius: 4px 0 0 4px;
-  -moz-border-radius   : 4px 0 0 4px;
-  border-radius        : 4px 0 0 4px; 
-}
-.chzn-rtl .chzn-choices li { float: right; }
-.chzn-rtl .chzn-choices .search-choice { padding: 3px 6px 3px 19px; margin: 3px 5px 3px 0; }
-.chzn-rtl .chzn-choices .search-choice .search-choice-close { left: 5px; right: auto; background-position: right top;}
-.chzn-rtl.chzn-container-single .chzn-results { margin-left: 4px; margin-right: 0; padding-left: 0; padding-right: 4px; }
-.chzn-rtl .chzn-results .group-option { padding-left: 0; padding-right: 20px; }
-.chzn-rtl.chzn-container-active .chzn-single-with-drop div { border-right: none; }
-.chzn-rtl .chzn-search input {
-  background: url('chosen-sprite.png') no-repeat -38px -20px, #ffffff;
-  background: url('chosen-sprite.png') no-repeat -38px -20px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
-  background: url('chosen-sprite.png') no-repeat -38px -20px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);  
-  background: url('chosen-sprite.png') no-repeat -38px -20px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat -38px -20px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat -38px -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat -38px -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat -38px -20px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  padding: 4px 5px 4px 20px;
-}
-/* @end */
\ No newline at end of file
diff --git a/3rdparty/css/chosen/chosen-sprite.png b/3rdparty/css/chosen/chosen-sprite.png
deleted file mode 100644
index 9edce05a6a899eaf98481d12dddbc433331a01ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3998
zcmb`J^;Z<%|9}Tkx<o=ne1jk&(kUHFr@$gD&C(^hgy7OCh;%Fx(hagmN;gY)Nec)l
z;Uf9Hpa0=I=iIqxewzDwo@dUPh!>hl<Rte=AP6E?QI^*My98M5MEKyIXk$MFHexqr
z!`Bc*dgp%&4@%3p3qd4W_AuCs7j~|muCMJ}-I!EhFeWz-S6h208wm26L+c{oy4!S;
zxTRw`wQy8|nyU^i5tEKw6pAK}jf0t(N;RB0dzMza?Y4r#O@`jAaQv7UR5YzNCs`!P
z4B<L+PE1g4cx3<iif^vtR1<D<=&E*FYOC}JT{BGBN<@~VETAofA}f-6c>70CPiOba
zI=4&!39B1KMO0(W{Q8mw4?6Xika+f}m9PcE^BN~5f?74wTX`RZT~qGJrJCTOg7I2C
z<DRP#p=cl(pBTA(NJbG4g-&79g|co!<^xuiYtRcW$o$Fs&2b2YK27z-gNzfHY4Nh+
zAf`Ju;qs83I8-|PGExCD;Du;x)jCC?87_!dMc-B#s;q-ru~ekh5D^)~s~sNl6uRjP
znfJ1=ctOFb5RKxYzQmtr<y2c7fK+O=L_MphLVz(5mph@pKKDa*tP1@z8exkY7HKlv
z?cS;P_yYtfe;f@$P*xl*nD*$>3rkUs#R|t@D9pHaz7t$Ovb0>g+88czlYyWWPyf*?
zPM(_kC~*Rm^Ht8{{hM~LNVDGHqHL=vWon_U?K%A;xBszG$o^PAJG-&IKBL+xXKc~0
z?{|f0H*3|ubo%Enae+Je(Xz@Kz;7C$bo2B_`{1#9-h<&!#KD#eo3Tn4b)?r9jN^|w
zRV?cbIB3?isoi7b)1r^~^BzUWeR|sUc<kDGb(!-VUuszhs&tUT^Nr&wG_}J2tM-J-
zz_WD~2SJC8u5A+_GL&7=$}sZ!K>AWC>oJ6~Rr%x&L9gUlx#9ga(mg~FB%c+)Q7OxC
z+;*3<mEb|!t%Wwy3v=OMIo8g0IVw34Yt#b|^QWbOa_pf)m5dzbJQFgEg00$iq491M
z-0gbbC?wq|&n$>C+t`}|h;PdF65X+2o(spbj5J`0A)-$WIc08BzDXU$%G4K5qy0!N
zPDq(gClb!2r_6XL>2X6e%tWyvPP`Z554;F%QsPSpsMeO8AghJd7mC~uR?HzCvG(Lk
zi>1p-AMyBlUou)aduyb`j&d$m3f9Bh`tvTKK&KNgcXx+e)pJhbc&mY`N2O#X-S;bB
zmf|-?oLCK4A#YL#D6|p_-$cqWSv-_gHc&UvoKY@hdcZ1pdyZIy7(ZCM{mG;FLbb1K
z4Y&Vw-nHcC3o}sWWSOFly~9K08xHFfVWp0M@jt2mctfS?3w(@vOmWObhh>|yC|ywb
zK1+PxoV8;$p=bgp)3e@?b@Y12y1+WaI`g413EEP|{mZHDD!Wd<gX+Bvstv&n0-F?m
zS-speoyEdz_-&zBBe}9{j827iSm7PPH)*0nL3Ao=d1X0?<M-|8?Qr%LKRp|6FD5?J
zOdio68`xI*nfw#~7)eGRN*mM@j$pr+ewXkr;vVvDMT&a<z454fJ#bzTzTK3qRLWFW
zJp&F5$2;1%ev(AhM7Bf*4jy<>aenbqF{$2>-T*wd=#{QtxuTwc?phJ?L{f=fG5W=>
zE`u(jNW3tt7*Xg7m;T~!co{)p*rDE`1^c3%Rb{r;)XhX{b+5*Yli88HB=k*yP$yf}
z(CoXn9E~ZLjEzx}#YNeoFacEo{TiL41Y2pswG{W$3{OqsE%t)sBmc-HnuDjSPZ{zB
z)$93eOdN}ol9LQdluNWrly;ki%l8V<`OONAhUWnkvOTI#Or9tqVzIZ-Te`Eliv=VF
zbQ+RkC*|D5j(H5(jq=FvE(QB3nJuqSnd+_uOWw^}XAk^%F5#EXX9XupWCjE^WUK`9
zWZ1hBT|(}z5{x`O^MABqrX4b{Jc~q&<dxvK`caA8NyQI}l+pIxCTpx~&fU)4xoiY%
z%xr2JI~x0GIvVx)PxHmq#npR;28VKnrc#B{CHbcLx6-%Lr_-0~%#FN^I5CBoZ#F8`
z>qhy8`<Nz|5F=5;JOe!=(;CGxblKyn#<IqO+XeNS@tP%>Q;3erKbSsDQQf`DjTwUZ
za*Q*^&jMjdkErV^@7RxTj`wTu`*0~qNFFvzQNn1%=>Phw2aVWEv86O@#=f*)*KyJ|
z55i!WYIsIq4RdGUX{S9}H+@_QL64|^9dr~P6`>Y5z@03`ozBp`*xS6W>UrXBy5ci-
zf=;hVZ{I7Nuh<vfx8Dz2_&g~1`Dv!1!0VBYUf2)qjZtaR&xyQ_%ccHWFs%SY?G_7<
z6;GUg*>q)H9<mr`aX>HiSIXn_n$((v$P)jOq1m8FYh7>MfL4cVrdh}`>^;l1^|jCS
zC{%!YjEBIF2#^ghzHxr)^N#s@jI`Li&EM+TJ=y52dRbc8*ub*DjkYpoyWU?P%b0On
zDcCryJw?b1|DRJMgch3?Q62tdPeQ^%^h2d%+`<j+kMbo8Ax9Trub1V|<dfu=(h+=G
zq7_`KLL5@X+zt|RA`OBK(%sy)hJ%v^Xaf}|wFjcy9Oc3;PA$t9dq-ib=vC4+U-}fD
zUQ;*kY;5~+NC90DH#MhNl8kz|=JSN#vQ!*}bkUCw?;sz?ka)K<wj&<#j0%s2&%jJL
z9%>#cb7=T{`W4qC<jvY8kjJ@EAN-`~W0N|$`eM3RCSBTFCTD(0v1Y!YPjMgJ<%*d#
z;xULF#HQ`rfl`~0>Z>l7s5+j9iG+QQH6KfF8FG<e<nn*Qjo7C-2&)k``nKPPBKk#>
zN;01f?G4uS&wmujIQV?MN8L`n@(Gg{s;1AyXt3E_>L6Mz;qE<8vPOIBS?EiGQi*So
z7!K!2t&%<c<Z}OJHXjYgfLCq(fo-*Tj=Q9KBpV@qy9?8MrdkF(hRd}UXQ5~YDcXq0
za+-PiWZL&L><eBS3}LSQ-%}S7z7~~q)>{wTj@fQ+E^%cVQzR89ZzfZ?kk8J2C0~B|
zb?@Y_!aPs%5c_;%5C&GC`(5H&lTAS%c1T<r{sn#vKZ6VJk1f_(OrN@p?lbr{{T2K*
zId9yAyOio{nb*V9)0niKv^iHfufa)|M-*?LCY?K*mT5Y>@Acr1;a?K6P++F(Cng!k
zB;h)-Q_pslD0=>Dxk4WxxyXgd^*&^Dud=wwd#`Wfh?j8>$;Ia0M*Eho5RU)%mJz|o
z;~<xIn5LMnn|5w&Y22VSC^b5@v*dH3H2)uEhM<I@x9SnR&wg$@a6BGyI2?^mMEm)3
z|64Gh&%yX^Sz(tQC|wU4s61E36t1JT#GAyiCWqfV53A=l?&yEhPpc3!bKddXk+_N<
z*Xn7^XiO`wH*u`r_i3*6wZ&~SWQt%HkDI;!&|ObWW{OHKHXr%8;<|7r%XEwW9#1Z@
z1C6uDC;MehT1{rhGJCSKu*I-RY2&MfnS+J*4z0+nqtOK=96?CX@KxMNEG6t#Y-;R4
zD0%2^=5r}g(N$@W%k7H-*s%35TPFQg&ecFUJspq#>E!M-b~I%)JNYm<{=4(Lyvv=|
z-Fp@D-R<2ETl%~N_+A~qJl|_WE+82Xa+fK!*55I`XTP@lS9PL0Qg9xBFFyYICVtA%
zg_Qu;Jow*avQpO3fFPg85QGYXpnun3--e(!yb!cw4nblm5Jd0#$*fBeg7Bdi>Tred
z@bK&F>(ta#TU*=M*x2>;bsP@&@#Dv>t*w@pmh<!T4<9~UU0u1myO)%deEITaety2W
zxj8d4^YHL+XJ=<|aWO3|ZFP0^=g*%Q493;f_4xR>prGLM=g;-^^_Q2Ig@uJxRaKLd
zla-Z~k&%&TH2UP^<lDDzE-o&wU%&qM@873SpQ@{?8yg$j+uK)GRz^ohlai8t{P>Zc
zp6=%6Ha$I^n3%Y+u@M&+x4XN0dV1>Y?0j%=aCCGO6BCo2oqcw8=H%owK0dy=x!Km%
zmY0_oA0J;-R5Uj?x3;#{*Vp&=@85-mg}uGK=;&w<4-YV`wzjs8j*hObE*uWm)6;wT
z@}<7MzJY;(p`oFXk&&^nv5AR^sj2C!SFg;>%*@TrEi5c7EiJ9AtgNlAZES1+C<Fpw
zXJ=<`Z|~sX;OOWG4ggLCCIaJwGXqxOMPNElPtP}R-n@PL7Kuc9d3kwzd;9qK`1<<3
zd-u-I&(GiA|NZ;-C=@CnARsU>FeoS}I5;>YBqTI6G%PF(c!`LJ0K}rAqQJ?41u!oV
z1k?Z&02&xGAt3?40l1QrlT%VsfJEQ|aLdTZ0Gxp%U?D3j3sB0*$;r*l1^NJ={QP_%
z2zUXMii?YZ*3#0_va+)B^74v`3ZM!20!C_TYQBE`T3cHSwAR(t0cAjFLqh{F)zs7k
z8UT5G|NgzTwH06o?m9X;Iy*bNy1Kf%yL)<idV6~T{Qmy_fq{X+!NH-SAuJX<JUl!y
zG6EEjjg0|i6B834jH#(9V0mU{W_ETKSOb9pU!bd{rKRQNWl#dB0t5zZf;d45Ks1OG
z^tQdd4GIKR{QC6^_}$;%2VwmF{rk_KKOjy}2uKmc1_A&{gK|J@pcaty#l;0E6I2ai
zxN}3K5PUb<o;sSk;PL<Ug6w`3wm}e{xr)3j+-q)PV%niYhU(TxiRqhqHIIX4q<Aw<
z>iSy9yArl)&L9wgI;jjyqzDv8-a6|DdEb4ucxO}_gKbxMo`wwPB~2%IKpWcEuBvkj
zuDfz;vj~;@=f;uP3-ZFbmkUdkpF=Fz#Mxas_La@9vmR=4MAD00wLgVqkQ-<!RfZe7
z2^-a|XAe+Shk5*{UKjExh`nN>7vh~pmLQ0;6EC?TrrH?mB^G&+t$mRxrTy|;osEc!
zTI&;~xjpoj1Vw*I5m}7)iTam3CyJDli9j7;zgLpAl&P8hUx(Xc$SA0}imEG(HP|EH
zUbmC}(wD@oAJo5pt`lMQWyx!X+M?ukdXvZR+)AgMLD+tD0L&siyq9K}>_HtJ&LA@&
zxi@ox-!1p8s=OzcEtyky4WTuqW0e}V@FIgsZe6~m^{I-j-3j6?{FvmI4?#{2y*W~x
kidOrojp+E9y!>Z;D448bs%_%b1&D-H6g1__<;(;B4?`9=;Q#;t

diff --git a/3rdparty/css/chosen/chosen.css b/3rdparty/css/chosen/chosen.css
deleted file mode 100644
index b9c6d88028f..00000000000
--- a/3rdparty/css/chosen/chosen.css
+++ /dev/null
@@ -1,368 +0,0 @@
-/* @group Base */
-.chzn-container {
-  font-size: 13px;
-  position: relative;
-  display: inline-block;
-  zoom: 1;
-  *display: inline;
-}
-.chzn-container .chzn-drop {
-  background: #fff;
-  border: 1px solid #aaa;
-  border-top: 0;
-  position: absolute;
-  top: 29px;
-  left: 0;
-  -webkit-box-shadow: 0 4px 5px rgba(0,0,0,.15);
-  -moz-box-shadow   : 0 4px 5px rgba(0,0,0,.15);
-  -o-box-shadow     : 0 4px 5px rgba(0,0,0,.15);
-  box-shadow        : 0 4px 5px rgba(0,0,0,.15);
-  z-index: 999;
-}
-/* @end */
-
-/* @group Single Chosen */
-.chzn-container-single .chzn-single {
-  background-color: #fff;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.5, white));
-  background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 50%);
-  background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 50%);
-  background-image: -o-linear-gradient(top, #eeeeee 0%,#ffffff 50%);
-  background-image: -ms-linear-gradient(top, #eeeeee 0%,#ffffff 50%);
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#ffffff',GradientType=0 );
-  background-image: linear-gradient(top, #eeeeee 0%,#ffffff 50%);
-  -webkit-border-radius: 4px;
-  -moz-border-radius   : 4px;
-  border-radius        : 4px;
-  -moz-background-clip   : padding;
-  -webkit-background-clip: padding-box;
-  background-clip        : padding-box;
-  border: 1px solid #aaa;
-  display: block;
-  overflow: hidden;
-  white-space: nowrap;
-  position: relative;
-  height: 26px;
-  line-height: 26px;
-  padding: 0 0 0 8px;
-  color: #444;
-  text-decoration: none;
-}
-.chzn-container-single .chzn-single span {
-  margin-right: 26px;
-  display: block;
-  overflow: hidden;
-  white-space: nowrap;
-  -o-text-overflow: ellipsis;
-  -ms-text-overflow: ellipsis;
-  text-overflow: ellipsis;
-}
-.chzn-container-single .chzn-single abbr {
-  display: block;
-  position: absolute;
-  right: 26px;
-  top: 8px;
-  width: 12px;
-  height: 13px;
-  font-size: 1px;
-  background: url(chosen-sprite.png) right top no-repeat;
-}
-.chzn-container-single .chzn-single abbr:hover {
-  background-position: right -11px;
-}
-.chzn-container-single .chzn-single div {
-  -webkit-border-radius: 0 4px 4px 0;
-  -moz-border-radius   : 0 4px 4px 0;
-  border-radius        : 0 4px 4px 0;
-  -moz-background-clip   : padding;
-  -webkit-background-clip: padding-box;
-  background-clip        : padding-box;
-  background: #ccc;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee));
-  background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%);
-  background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%);
-  background-image: -o-linear-gradient(bottom, #ccc 0%, #eee 60%);
-  background-image: -ms-linear-gradient(top, #cccccc 0%,#eeeeee 60%);
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cccccc', endColorstr='#eeeeee',GradientType=0 );
-  background-image: linear-gradient(top, #cccccc 0%,#eeeeee 60%);
-  border-left: 1px solid #aaa;
-  position: absolute;
-  right: 0;
-  top: 0;
-  display: block;
-  height: 100%;
-  width: 18px;
-}
-.chzn-container-single .chzn-single div b {
-  background: url('chosen-sprite.png') no-repeat 0 1px;
-  display: block;
-  width: 100%;
-  height: 100%;
-}
-.chzn-container-single .chzn-search {
-  padding: 3px 4px;
-  position: relative;
-  margin: 0;
-  white-space: nowrap;
-}
-.chzn-container-single .chzn-search input {
-  background: #fff url('chosen-sprite.png') no-repeat 100% -22px;
-  background: url('chosen-sprite.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
-  background: url('chosen-sprite.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat 100% -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat 100% -22px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  margin: 1px 0;
-  padding: 4px 20px 4px 5px;
-  outline: 0;
-  border: 1px solid #aaa;
-  font-family: sans-serif;
-  font-size: 1em;
-}
-.chzn-container-single .chzn-drop {
-  -webkit-border-radius: 0 0 4px 4px;
-  -moz-border-radius   : 0 0 4px 4px;
-  border-radius        : 0 0 4px 4px;
-  -moz-background-clip   : padding;
-  -webkit-background-clip: padding-box;
-  background-clip        : padding-box;
-}
-/* @end */
-
-.chzn-container-single-nosearch .chzn-search input {
-  position: absolute;
-  left: -9000px;
-}
-
-/* @group Multi Chosen */
-.chzn-container-multi .chzn-choices {
-  background-color: #fff;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
-  background-image: -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background-image: -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background-image: -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
-  background-image: -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
-  background-image: linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  border: 1px solid #aaa;
-  margin: 0;
-  padding: 0;
-  cursor: text;
-  overflow: hidden;
-  height: auto !important;
-  height: 1%;
-  position: relative;
-}
-.chzn-container-multi .chzn-choices li {
-  float: left;
-  list-style: none;
-}
-.chzn-container-multi .chzn-choices .search-field {
-  white-space: nowrap;
-  margin: 0;
-  padding: 0;
-}
-.chzn-container-multi .chzn-choices .search-field input {
-  color: #666;
-  background: transparent !important;
-  border: 0 !important;
-  padding: 5px;
-  margin: 1px 0;
-  outline: 0;
-  -webkit-box-shadow: none;
-  -moz-box-shadow   : none;
-  -o-box-shadow     : none;
-  box-shadow        : none;
-}
-.chzn-container-multi .chzn-choices .search-field .default {
-  color: #999;
-}
-.chzn-container-multi .chzn-choices .search-choice {
-  -webkit-border-radius: 3px;
-  -moz-border-radius   : 3px;
-  border-radius        : 3px;
-  -moz-background-clip   : padding;
-  -webkit-background-clip: padding-box;
-  background-clip        : padding-box;
-  background-color: #e4e4e4;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #e4e4e4), color-stop(0.7, #eeeeee));
-  background-image: -webkit-linear-gradient(center bottom, #e4e4e4 0%, #eeeeee 70%);
-  background-image: -moz-linear-gradient(center bottom, #e4e4e4 0%, #eeeeee 70%);
-  background-image: -o-linear-gradient(bottom, #e4e4e4 0%, #eeeeee 70%);
-  background-image: -ms-linear-gradient(top, #e4e4e4 0%,#eeeeee 70%);
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e4e4e4', endColorstr='#eeeeee',GradientType=0 );
-  background-image: linear-gradient(top, #e4e4e4 0%,#eeeeee 70%);
-  color: #333;
-  border: 1px solid #b4b4b4;
-  line-height: 13px;
-  padding: 3px 19px 3px 6px;
-  margin: 3px 0 3px 5px;
-  position: relative;
-}
-.chzn-container-multi .chzn-choices .search-choice span {
-  cursor: default;
-}
-.chzn-container-multi .chzn-choices .search-choice-focus {
-  background: #d4d4d4;
-}
-.chzn-container-multi .chzn-choices .search-choice .search-choice-close {
-  display: block;
-  position: absolute;
-  right: 3px;
-  top: 4px;
-  width: 12px;
-  height: 13px;
-  font-size: 1px;
-  background: url(chosen-sprite.png) right top no-repeat;
-}
-.chzn-container-multi .chzn-choices .search-choice .search-choice-close:hover {
-  background-position: right -11px;
-}
-.chzn-container-multi .chzn-choices .search-choice-focus .search-choice-close {
-  background-position: right -11px;
-}
-/* @end */
-
-/* @group Results */
-.chzn-container .chzn-results {
-  margin: 0 4px 4px 0;
-  max-height: 190px;
-  padding: 0 0 0 4px;
-  position: relative;
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-.chzn-container-multi .chzn-results {
-  margin: -1px 0 0;
-  padding: 0;
-}
-.chzn-container .chzn-results li {
-  display: none;
-  line-height: 80%;
-  padding: 7px 7px 8px;
-  margin: 0;
-  list-style: none;
-}
-.chzn-container .chzn-results .active-result {
-  cursor: pointer;
-  display: list-item;
-}
-.chzn-container .chzn-results .highlighted {
-  background: #3875d7;
-  color: #fff;
-}
-.chzn-container .chzn-results li em {
-  background: #feffde;
-  font-style: normal;
-}
-.chzn-container .chzn-results .highlighted em {
-  background: transparent;
-}
-.chzn-container .chzn-results .no-results {
-  background: #f4f4f4;
-  display: list-item;
-}
-.chzn-container .chzn-results .group-result {
-  cursor: default;
-  color: #999;
-  font-weight: bold;
-}
-.chzn-container .chzn-results .group-option {
-  padding-left: 20px;
-}
-.chzn-container-multi .chzn-drop .result-selected {
-  display: none;
-}
-/* @end */
-
-/* @group Active  */
-.chzn-container-active .chzn-single {
-  -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
-  -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
-  -o-box-shadow     : 0 0 5px rgba(0,0,0,.3);
-  box-shadow        : 0 0 5px rgba(0,0,0,.3);
-  border: 1px solid #5897fb;
-}
-.chzn-container-active .chzn-single-with-drop {
-  border: 1px solid #aaa;
-  -webkit-box-shadow: 0 1px 0 #fff inset;
-  -moz-box-shadow   : 0 1px 0 #fff inset;
-  -o-box-shadow     : 0 1px 0 #fff inset;
-  box-shadow        : 0 1px 0 #fff inset;
-  background-color: #eee;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, white), color-stop(0.5, #eeeeee));
-  background-image: -webkit-linear-gradient(center bottom, white 0%, #eeeeee 50%);
-  background-image: -moz-linear-gradient(center bottom, white 0%, #eeeeee 50%);
-  background-image: -o-linear-gradient(bottom, white 0%, #eeeeee 50%);
-  background-image: -ms-linear-gradient(top, #ffffff 0%,#eeeeee 50%);
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
-  background-image: linear-gradient(top, #ffffff 0%,#eeeeee 50%);
-  -webkit-border-bottom-left-radius : 0;
-  -webkit-border-bottom-right-radius: 0;
-  -moz-border-radius-bottomleft : 0;
-  -moz-border-radius-bottomright: 0;
-  border-bottom-left-radius : 0;
-  border-bottom-right-radius: 0;
-}
-.chzn-container-active .chzn-single-with-drop div {
-  background: transparent;
-  border-left: none;
-}
-.chzn-container-active .chzn-single-with-drop div b {
-  background-position: -18px 1px;
-}
-.chzn-container-active .chzn-choices {
-  -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
-  -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
-  -o-box-shadow     : 0 0 5px rgba(0,0,0,.3);
-  box-shadow        : 0 0 5px rgba(0,0,0,.3);
-  border: 1px solid #5897fb;
-}
-.chzn-container-active .chzn-choices .search-field input {
-  color: #111 !important;
-}
-/* @end */
-
-/* @group Disabled Support */
-.chzn-disabled {
-  cursor: default;
-  opacity:0.5 !important;
-}
-.chzn-disabled .chzn-single {
-  cursor: default;
-}
-.chzn-disabled .chzn-choices .search-choice .search-choice-close {
-  cursor: default;
-}
-
-/* @group Right to Left */
-.chzn-rtl { direction:rtl;text-align: right; }
-.chzn-rtl .chzn-single { padding-left: 0; padding-right: 8px; }
-.chzn-rtl .chzn-single span { margin-left: 26px; margin-right: 0; }
-.chzn-rtl .chzn-single div { 
-  left: 0; right: auto; 
-  border-left: none; border-right: 1px solid #aaaaaa;
-  -webkit-border-radius: 4px 0 0 4px;
-  -moz-border-radius   : 4px 0 0 4px;
-  border-radius        : 4px 0 0 4px; 
-}
-.chzn-rtl .chzn-choices li { float: right; }
-.chzn-rtl .chzn-choices .search-choice { padding: 3px 6px 3px 19px; margin: 3px 5px 3px 0; }
-.chzn-rtl .chzn-choices .search-choice .search-choice-close { left: 5px; right: auto; background-position: right top;}
-.chzn-rtl.chzn-container-single .chzn-results { margin-left: 4px; margin-right: 0; padding-left: 0; padding-right: 4px; }
-.chzn-rtl .chzn-results .group-option { padding-left: 0; padding-right: 20px; }
-.chzn-rtl.chzn-container-active .chzn-single-with-drop div { border-right: none; }
-.chzn-rtl .chzn-search input {
-  background: url('chosen-sprite.png') no-repeat -38px -22px, #ffffff;
-  background: url('chosen-sprite.png') no-repeat -38px -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
-  background: url('chosen-sprite.png') no-repeat -38px -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat -38px -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat -38px -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat -38px -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat -38px -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat -38px -22px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  padding: 4px 5px 4px 20px;
-}
-/* @end */
\ No newline at end of file
diff --git a/3rdparty/fullcalendar/GPL-LICENSE.txt b/3rdparty/fullcalendar/GPL-LICENSE.txt
deleted file mode 100644
index 11dddd00ef0..00000000000
--- a/3rdparty/fullcalendar/GPL-LICENSE.txt
+++ /dev/null
@@ -1,278 +0,0 @@
-        GNU GENERAL PUBLIC LICENSE
-           Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-          Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-        GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-          NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
diff --git a/3rdparty/fullcalendar/MIT-LICENSE.txt b/3rdparty/fullcalendar/MIT-LICENSE.txt
deleted file mode 100644
index 46d47544964..00000000000
--- a/3rdparty/fullcalendar/MIT-LICENSE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2009 Adam Shaw
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/3rdparty/fullcalendar/changelog.txt b/3rdparty/fullcalendar/changelog.txt
deleted file mode 100644
index 50d0880fd7a..00000000000
--- a/3rdparty/fullcalendar/changelog.txt
+++ /dev/null
@@ -1,313 +0,0 @@
-
-version 1.5.2 (8/21/11)
-	- correctly process UTC "Z" ISO8601 date strings (issue 750)
-
-version 1.5.1 (4/9/11)
-	- more flexible ISO8601 date parsing (issue 814)
-	- more flexible parsing of UNIX timestamps (issue 826)
-	- FullCalendar now buildable from source on a Mac (issue 795)
-	- FullCalendar QA'd in FF4 (issue 883)
-	- upgraded to jQuery 1.5.2 (which supports IE9) and jQuery UI 1.8.11
-
-version 1.5 (3/19/11)
-	- slicker default styling for buttons
-	- reworked a lot of the calendar's HTML and accompanying CSS
-	  (solves issues 327 and 395)
-	- more printer-friendly (fullcalendar-print.css)
-	- fullcalendar now inherits styles from jquery-ui themes differently.
-	  styles for buttons are distinct from styles for calendar cells.
-	  (solves issue 299)
-	- can now color events through FullCalendar options and Event-Object properties (issue 117)
-	  THIS IS NOW THE PREFERRED METHOD OF COLORING EVENTS (as opposed to using className and CSS)
-		- FullCalendar options:
-			- eventColor (changes both background and border)
-			- eventBackgroundColor
-			- eventBorderColor
-			- eventTextColor
-		- Event-Object options:
-			- color (changes both background and border)
-			- backgroundColor
-			- borderColor
-			- textColor
-	- can now specify an event source as an *object* with a `url` property (json feed) or
-	  an `events` property (function or array) with additional properties that will
-	  be applied to the entire event source:
-		- color (changes both background and border)
-		- backgroudColor
-		- borderColor
-		- textColor
-		- className
-		- editable
-		- allDayDefault
-		- ignoreTimezone
-		- startParam (for a feed)
-		- endParam   (for a feed)
-		- ANY OF THE JQUERY $.ajax OPTIONS
-		  allows for easily changing from GET to POST and sending additional parameters (issue 386)
-		  allows for easily attaching ajax handlers such as `error` (issue 754)
-		  allows for turning caching on (issue 355)
-	- Google Calendar feeds are now specified differently:
-		- specify a simple string of your feed's URL
-		- specify an *object* with a `url` property of your feed's URL.
-		  you can include any of the new Event-Source options in this object.
-		- the old `$.fullCalendar.gcalFeed` method still works
-	- no more IE7 SSL popup (issue 504)
-	- remove `cacheParam` - use json event source `cache` option instead
-	- latest jquery/jquery-ui
-
-version 1.4.11 (2/22/11)
-	- fixed rerenderEvents bug (issue 790)
-	- fixed bug with faulty dragging of events from all-day slot in agenda views
-	- bundled with jquery 1.5 and jquery-ui 1.8.9
-
-version 1.4.10 (1/2/11)
-	- fixed bug with resizing event to different week in 5-day month view (issue 740)
-	- fixed bug with events not sticking after a removeEvents call (issue 757)
-	- fixed bug with underlying parseTime method, and other uses of parseInt (issue 688)
-
-version 1.4.9 (11/16/10)
-	- new algorithm for vertically stacking events (issue 111)
-	- resizing an event to a different week (issue 306)
-	- bug: some events not rendered with consecutive calls to addEventSource (issue 679)
-
-version 1.4.8 (10/16/10)
-	- ignoreTimezone option (set to `false` to process UTC offsets in ISO8601 dates)
-	- bugfixes
-		- event refetching not being called under certain conditions (issues 417, 554)
-		- event refetching being called multiple times under certain conditions (issues 586, 616)
-		- selection cannot be triggered by right mouse button (issue 558)
-		- agenda view left axis sized incorrectly (issue 465)
-		- IE js error when calendar is too narrow (issue 517)
-		- agenda view looks strange when no scrollbars (issue 235)
-		- improved parsing of ISO8601 dates with UTC offsets
-	- $.fullCalendar.version
-	- an internal refactor of the code, for easier future development and modularity
-
-version 1.4.7 (7/5/10)
-	- "dropping" external objects onto the calendar
-		- droppable (boolean, to turn on/off)
-		- dropAccept (to filter which events the calendar will accept)
-		- drop (trigger)
-	- selectable options can now be specified with a View Option Hash
-	- bugfixes
-		- dragged & reverted events having wrong time text (issue 406)
-		- bug rendering events that have an endtime with seconds, but no hours/minutes (issue 477)
-		- gotoDate date overflow bug (issue 429)
-		- wrong date reported when clicking on edge of last column in agenda views (412)
-	- support newlines in event titles
-	- select/unselect callbacks now passes native js event
-
-version 1.4.6 (5/31/10)
-	- "selecting" days or timeslots
-		- options: selectable, selectHelper, unselectAuto, unselectCancel
-		- callbacks: select, unselect
-		- methods: select, unselect
-	- when dragging an event, the highlighting reflects the duration of the event
-	- code compressing by Google Closure Compiler
-	- bundled with jQuery 1.4.2 and jQuery UI 1.8.1
-
-version 1.4.5 (2/21/10)
-	- lazyFetching option, which can force the calendar to fetch events on every view/date change
-	- scroll state of agenda views are preserved when switching back to view
-	- bugfixes
-		- calling methods on an uninitialized fullcalendar throws error
-		- IE6/7 bug where an entire view becomes invisible (issue 320)
-		- error when rendering a hidden calendar (in jquery ui tabs for example) in IE (issue 340)
-		- interconnected bugs related to calendar resizing and scrollbars
-			- when switching views or clicking prev/next, calendar would "blink" (issue 333)
-			- liquid-width calendar's events shifted (depending on initial height of browser) (issue 341)
-			- more robust underlying algorithm for calendar resizing
-
-version 1.4.4 (2/3/10)
-	- optimized event rendering in all views (events render in 1/10 the time)
-	- gotoDate() does not force the calendar to unnecessarily rerender
-	- render() method now correctly readjusts height
-
-version 1.4.3 (12/22/09)
-	- added destroy method
-	- Google Calendar event pages respect currentTimezone
-	- caching now handled by jQuery's ajax
-	- protection from setting aspectRatio to zero
-	- bugfixes
-		- parseISO8601 and DST caused certain events to display day before
-		- button positioning problem in IE6
-		- ajax event source removed after recently being added, events still displayed
-		- event not displayed when end is an empty string
-		- dynamically setting calendar height when no events have been fetched, throws error
-
-version 1.4.2 (12/02/09)
-	- eventAfterRender trigger
-	- getDate & getView methods
-	- height & contentHeight options (explicitly sets the pixel height)
-	- minTime & maxTime options (restricts shown hours in agenda view)
-	- getters [for all options] and setters [for height, contentHeight, and aspectRatio ONLY! stay tuned..]
-	- render method now readjusts calendar's size
-	- bugfixes
-		- lightbox scripts that use iframes (like fancybox)
-		- day-of-week classNames were off when firstDay=1
-		- guaranteed space on right side of agenda events (even when stacked)
-		- accepts ISO8601 dates with a space (instead of 'T')
-
-version 1.4.1 (10/31/09)
-	- can exclude weekends with new 'weekends' option
-	- gcal feed 'currentTimezone' option
-	- bugfixes
-		- year/month/date option sometimes wouldn't set correctly (depending on current date)
-		- daylight savings issue caused agenda views to start at 1am (for BST users)
-	- cleanup of gcal.js code
-
-version 1.4 (10/19/09)
-	- agendaWeek and agendaDay views
-	- added some options for agenda views:
-		- allDaySlot
-		- allDayText
-		- firstHour
-		- slotMinutes
-		- defaultEventMinutes
-		- axisFormat
-	- modified some existing options/triggers to work with agenda views:
-		- dragOpacity and timeFormat can now accept a "View Hash" (a new concept)
-		- dayClick now has an allDay parameter
-		- eventDrop now has an an allDay parameter
-		  (this will affect those who use revertFunc, adjust parameter list)
-	- added 'prevYear' and 'nextYear' for buttons in header
-	- minor change for theme users, ui-state-hover not applied to active/inactive buttons
-	- added event-color-changing example in docs
-	- better defaults for right-to-left themed button icons
-
-version 1.3.2 (10/13/09)
-	- Bugfixes (please upgrade from 1.3.1!)
-		- squashed potential infinite loop when addMonths and addDays
-		  is called with an invalid date
-		- $.fullCalendar.parseDate() now correctly parses IETF format
-		- when switching views, the 'today' button sticks inactive, fixed
-	- gotoDate now can accept a single Date argument
-	- documentation for changes in 1.3.1 and 1.3.2 now on website
-
-version 1.3.1 (9/30/09)
-	- Important Bugfixes (please upgrade from 1.3!)
-		- When current date was late in the month, for long months, and prev/next buttons
-		  were clicked in month-view, some months would be skipped/repeated
-		- In certain time zones, daylight savings time would cause certain days
-		  to be misnumbered in month-view
-	- Subtle change in way week interval is chosen when switching from month to basicWeek/basicDay view
-	- Added 'allDayDefault' option
-	- Added 'changeView' and 'render' methods
-
-version 1.3 (9/21/09)
-	- different 'views': month/basicWeek/basicDay
-	- more flexible 'header' system for buttons
-	- themable by jQuery UI themes
-	- resizable events (require jQuery UI resizable plugin)
-	- rescoped & rewritten CSS, enhanced default look
-	- cleaner css & rendering techniques for right-to-left
-	- reworked options & API to support multiple views / be consistent with jQuery UI
-	- refactoring of entire codebase
-		- broken into different JS & CSS files, assembled w/ build scripts
-		- new test suite for new features, uses firebug-lite
-	- refactored docs
-	- Options
-		+ date
-		+ defaultView
-		+ aspectRatio
-		+ disableResizing
-		+ monthNames      (use instead of $.fullCalendar.monthNames)
-		+ monthNamesShort (use instead of $.fullCalendar.monthAbbrevs)
-		+ dayNames        (use instead of $.fullCalendar.dayNames)
-		+ dayNamesShort   (use instead of $.fullCalendar.dayAbbrevs)
-		+ theme
-		+ buttonText
-		+ buttonIcons
-		x draggable           -> editable/disableDragging
-		x fixedWeeks          -> weekMode
-		x abbrevDayHeadings   -> columnFormat
-		x buttons/title       -> header
-		x eventDragOpacity    -> dragOpacity
-		x eventRevertDuration -> dragRevertDuration
-		x weekStart           -> firstDay
-		x rightToLeft         -> isRTL
-		x showTime (use 'allDay' CalEvent property instead)
-	- Triggered Actions
-		+ eventResizeStart
-		+ eventResizeStop
-		+ eventResize
-		x monthDisplay -> viewDisplay
-		x resize       -> windowResize
-		'eventDrop' params changed, can revert if ajax cuts out
-	- CalEvent Properties
-		x showTime  -> allDay
-		x draggable -> editable
-		'end' is now INCLUSIVE when allDay=true
-		'url' now produces a real <a> tag, more native clicking/tab behavior
-	- Methods:
-		+ renderEvent
-		x prevMonth         -> prev
-		x nextMonth         -> next
-		x prevYear/nextYear -> moveDate
-		x refresh           -> rerenderEvents/refetchEvents
-		x removeEvent       -> removeEvents
-		x getEventsByID     -> clientEvents
-	- Utilities:
-		'formatDate' format string completely changed (inspired by jQuery UI datepicker + datejs)
-		'formatDates' added to support date-ranges
-	- Google Calendar Options:
-		x draggable -> editable
-	- Bugfixes
-		- gcal extension fetched 25 results max, now fetches all
-
-version 1.2.1 (6/29/09)
-	- bugfixes
-		- allows and corrects invalid end dates for events
-		- doesn't throw an error in IE while rendering when display:none
-		- fixed 'loading' callback when used w/ multiple addEventSource calls
-		- gcal className can now be an array
-
-version 1.2 (5/31/09)
-	- expanded API
-		- 'className' CalEvent attribute
-		- 'source' CalEvent attribute
-		- dynamically get/add/remove/update events of current month
-		- locale improvements: change month/day name text
-		- better date formatting ($.fullCalendar.formatDate)
-		- multiple 'event sources' allowed
-			- dynamically add/remove event sources
-	- options for prevYear and nextYear buttons
-	- docs have been reworked (include addition of Google Calendar docs)
-	- changed behavior of parseDate for number strings
-	  (now interpets as unix timestamp, not MS times)
-	- bugfixes
-		- rightToLeft month start bug
-		- off-by-one errors with month formatting commands
-		- events from previous months sticking when clicking prev/next quickly
-	- Google Calendar API changed to work w/ multiple event sources
-		- can also provide 'className' and 'draggable' options
-	- date utilties moved from $ to $.fullCalendar
-	- more documentation in source code
-	- minified version of fullcalendar.js
-	- test suit (available from svn)
-	- top buttons now use <button> w/ an inner <span> for better css cusomization
-		- thus CSS has changed. IF UPGRADING FROM PREVIOUS VERSIONS,
-		  UPGRADE YOUR FULLCALENDAR.CSS FILE!!!
-
-version 1.1 (5/10/09)
-	- Added the following options:
-		- weekStart
-		- rightToLeft
-		- titleFormat
-		- timeFormat
-		- cacheParam
-		- resize
-	- Fixed rendering bugs
-		- Opera 9.25 (events placement & window resizing)
-		- IE6 (window resizing)
-	- Optimized window resizing for ALL browsers
-	- Events on same day now sorted by start time (but first by timespan)
-	- Correct z-index when dragging
-	- Dragging contained in overflow DIV for IE6
-	- Modified fullcalendar.css
-		- for right-to-left support
-		- for variable start-of-week
-		- for IE6 resizing bug
-		- for THEAD and TBODY (in 1.0, just used TBODY, restructured in 1.1)
-		- IF UPGRADING FROM FULLCALENDAR 1.0, YOU MUST UPGRADE FULLCALENDAR.CSS
-		  !!!!!!!!!!!
diff --git a/3rdparty/fullcalendar/css/fullcalendar.css b/3rdparty/fullcalendar/css/fullcalendar.css
deleted file mode 100644
index 4e9e95e894f..00000000000
--- a/3rdparty/fullcalendar/css/fullcalendar.css
+++ /dev/null
@@ -1,616 +0,0 @@
-/*
- * FullCalendar v1.5.2 Stylesheet
- *
- * Copyright (c) 2011 Adam Shaw
- * Dual licensed under the MIT and GPL licenses, located in
- * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
- *
- * Date: Sun Aug 21 22:06:09 2011 -0700
- *
- */
-
-
-.fc {
-	direction: ltr;
-	text-align: left;
-	}
-
-.fc table {
-	border-collapse: collapse;
-	border-spacing: 0;
-	}
-
-html .fc,
-.fc table {
-	font-size: 1em;
-	}
-
-.fc td,
-.fc th {
-	padding: 0;
-	vertical-align: top;
-	}
-
-
-
-/* Header
-------------------------------------------------------------------------*/
-
-.fc-header td {
-	white-space: nowrap;
-	}
-
-.fc-header-left {
-	width: 25%;
-	text-align: left;
-	}
-
-.fc-header-center {
-	text-align: center;
-	}
-
-.fc-header-right {
-	width: 25%;
-	text-align: right;
-	}
-
-.fc-header-title {
-	display: inline-block;
-	vertical-align: top;
-	}
-
-.fc-header-title h2 {
-	margin-top: 0;
-	white-space: nowrap;
-	}
-
-.fc .fc-header-space {
-	padding-left: 10px;
-	}
-
-.fc-header .fc-button {
-	margin-bottom: 1em;
-	vertical-align: top;
-	}
-
-/* buttons edges butting together */
-
-.fc-header .fc-button {
-	margin-right: -1px;
-	}
-
-.fc-header .fc-corner-right {
-	margin-right: 1px; /* back to normal */
-	}
-
-.fc-header .ui-corner-right {
-	margin-right: 0; /* back to normal */
-	}
-
-/* button layering (for border precedence) */
-
-.fc-header .fc-state-hover,
-.fc-header .ui-state-hover {
-	z-index: 2;
-	}
-
-.fc-header .fc-state-down {
-	z-index: 3;
-	}
-
-.fc-header .fc-state-active,
-.fc-header .ui-state-active {
-	z-index: 4;
-	}
-
-
-
-/* Content
-------------------------------------------------------------------------*/
-
-.fc-content {
-	clear: both;
-	}
-
-.fc-view {
-	width: 100%; /* needed for view switching (when view is absolute) */
-	overflow: hidden;
-	}
-
-
-
-/* Cell Styles
-------------------------------------------------------------------------*/
-
-.fc-widget-header,    /* <th>, usually */
-.fc-widget-content {  /* <td>, usually */
-	border: 1px solid #ccc;
-	}
-
-.fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */
-	background: #ffc;
-	}
-
-.fc-cell-overlay { /* semi-transparent rectangle while dragging */
-	background: #9cf;
-	opacity: .2;
-	filter: alpha(opacity=20); /* for IE */
-	}
-
-
-
-/* Buttons
-------------------------------------------------------------------------*/
-
-.fc-button {
-	position: relative;
-	display: inline-block;
-	cursor: pointer;
-	}
-
-.fc-state-default { /* non-theme */
-	border-style: solid;
-	border-width: 1px 0;
-	}
-
-.fc-button-inner {
-	position: relative;
-	float: left;
-	overflow: hidden;
-	}
-
-.fc-state-default .fc-button-inner { /* non-theme */
-	border-style: solid;
-	border-width: 0 1px;
-	}
-
-.fc-button-content {
-	position: relative;
-	float: left;
-	height: 1.9em;
-	line-height: 1.9em;
-	padding: 0 .6em;
-	white-space: nowrap;
-	}
-
-/* icon (for jquery ui) */
-
-.fc-button-content .fc-icon-wrap {
-	position: relative;
-	float: left;
-	top: 50%;
-	}
-
-.fc-button-content .ui-icon {
-	position: relative;
-	float: left;
-	margin-top: -50%;
-	*margin-top: 0;
-	*top: -50%;
-	}
-
-/* gloss effect */
-
-.fc-state-default .fc-button-effect {
-	position: absolute;
-	top: 50%;
-	left: 0;
-	}
-
-.fc-state-default .fc-button-effect span {
-	position: absolute;
-	top: -100px;
-	left: 0;
-	width: 500px;
-	height: 100px;
-	border-width: 100px 0 0 1px;
-	border-style: solid;
-	border-color: #fff;
-	background: #444;
-	opacity: .09;
-	filter: alpha(opacity=9);
-	}
-
-/* button states (determines colors)  */
-
-.fc-state-default,
-.fc-state-default .fc-button-inner {
-	border-style: solid;
-	border-color: #ccc #bbb #aaa;
-	background: #F3F3F3;
-	color: #000;
-	}
-
-.fc-state-hover,
-.fc-state-hover .fc-button-inner {
-	border-color: #999;
-	}
-
-.fc-state-down,
-.fc-state-down .fc-button-inner {
-	border-color: #555;
-	background: #777;
-	}
-
-.fc-state-active,
-.fc-state-active .fc-button-inner {
-	border-color: #555;
-	background: #777;
-	color: #fff;
-	}
-
-.fc-state-disabled,
-.fc-state-disabled .fc-button-inner {
-	color: #999;
-	border-color: #ddd;
-	}
-
-.fc-state-disabled {
-	cursor: default;
-	}
-
-.fc-state-disabled .fc-button-effect {
-	display: none;
-	}
-
-
-
-/* Global Event Styles
-------------------------------------------------------------------------*/
-
-.fc-event {
-	border-style: solid;
-	border-width: 0;
-	font-size: .85em;
-	cursor: default;
-	}
-
-a.fc-event,
-.fc-event-draggable {
-	cursor: pointer;
-	}
-
-a.fc-event {
-	text-decoration: none;
-	}
-
-.fc-rtl .fc-event {
-	text-align: right;
-	}
-
-.fc-event-skin {
-	border-color: #36c;     /* default BORDER color */
-	background-color: #36c; /* default BACKGROUND color */
-	color: #fff;            /* default TEXT color */
-	}
-
-.fc-event-inner {
-	position: relative;
-	width: 100%;
-	height: 100%;
-	border-style: solid;
-	border-width: 0;
-	overflow: hidden;
-	}
-
-.fc-event-time,
-.fc-event-title {
-	padding: 0 1px;
-	}
-
-.fc .ui-resizable-handle { /*** TODO: don't use ui-resizable anymore, change class ***/
-	display: block;
-	position: absolute;
-	z-index: 99999;
-	overflow: hidden; /* hacky spaces (IE6/7) */
-	font-size: 300%;  /* */
-	line-height: 50%; /* */
-	}
-
-
-
-/* Horizontal Events
-------------------------------------------------------------------------*/
-
-.fc-event-hori {
-	border-width: 1px 0;
-	margin-bottom: 1px;
-	}
-
-/* resizable */
-
-.fc-event-hori .ui-resizable-e {
-	top: 0           !important; /* importants override pre jquery ui 1.7 styles */
-	right: -3px      !important;
-	width: 7px       !important;
-	height: 100%     !important;
-	cursor: e-resize;
-	}
-
-.fc-event-hori .ui-resizable-w {
-	top: 0           !important;
-	left: -3px       !important;
-	width: 7px       !important;
-	height: 100%     !important;
-	cursor: w-resize;
-	}
-
-.fc-event-hori .ui-resizable-handle {
-	_padding-bottom: 14px; /* IE6 had 0 height */
-	}
-
-
-
-/* Fake Rounded Corners (for buttons and events)
-------------------------------------------------------------*/
-
-.fc-corner-left {
-	margin-left: 1px;
-	}
-
-.fc-corner-left .fc-button-inner,
-.fc-corner-left .fc-event-inner {
-	margin-left: -1px;
-	}
-
-.fc-corner-right {
-	margin-right: 1px;
-	}
-
-.fc-corner-right .fc-button-inner,
-.fc-corner-right .fc-event-inner {
-	margin-right: -1px;
-	}
-
-.fc-corner-top {
-	margin-top: 1px;
-	}
-
-.fc-corner-top .fc-event-inner {
-	margin-top: -1px;
-	}
-
-.fc-corner-bottom {
-	margin-bottom: 1px;
-	}
-
-.fc-corner-bottom .fc-event-inner {
-	margin-bottom: -1px;
-	}
-
-
-
-/* Fake Rounded Corners SPECIFICALLY FOR EVENTS
------------------------------------------------------------------*/
-
-.fc-corner-left .fc-event-inner {
-	border-left-width: 1px;
-	}
-
-.fc-corner-right .fc-event-inner {
-	border-right-width: 1px;
-	}
-
-.fc-corner-top .fc-event-inner {
-	border-top-width: 1px;
-	}
-
-.fc-corner-bottom .fc-event-inner {
-	border-bottom-width: 1px;
-	}
-
-
-
-/* Reusable Separate-border Table
-------------------------------------------------------------*/
-
-table.fc-border-separate {
-	border-collapse: separate;
-	}
-
-.fc-border-separate th,
-.fc-border-separate td {
-	border-width: 1px 0 0 1px;
-	}
-
-.fc-border-separate th.fc-last,
-.fc-border-separate td.fc-last {
-	border-right-width: 1px;
-	}
-
-.fc-border-separate tr.fc-last th,
-.fc-border-separate tr.fc-last td {
-	border-bottom-width: 1px;
-	}
-
-.fc-border-separate tbody tr.fc-first td,
-.fc-border-separate tbody tr.fc-first th {
-	border-top-width: 0;
-	}
-
-
-
-/* Month View, Basic Week View, Basic Day View
-------------------------------------------------------------------------*/
-
-.fc-grid th {
-	text-align: center;
-	}
-
-.fc-grid .fc-day-number {
-	float: right;
-	padding: 0 2px;
-	}
-
-.fc-grid .fc-other-month .fc-day-number {
-	opacity: 0.3;
-	filter: alpha(opacity=30); /* for IE */
-	/* opacity with small font can sometimes look too faded
-	   might want to set the 'color' property instead
-	   making day-numbers bold also fixes the problem */
-	}
-
-.fc-grid .fc-day-content {
-	clear: both;
-	padding: 2px 2px 1px; /* distance between events and day edges */
-	}
-
-/* event styles */
-
-.fc-grid .fc-event-time {
-	font-weight: bold;
-	}
-
-/* right-to-left */
-
-.fc-rtl .fc-grid .fc-day-number {
-	float: left;
-	}
-
-.fc-rtl .fc-grid .fc-event-time {
-	float: right;
-	}
-
-
-
-/* Agenda Week View, Agenda Day View
-------------------------------------------------------------------------*/
-
-.fc-agenda table {
-	border-collapse: separate;
-	}
-
-.fc-agenda-days th {
-	text-align: center;
-	}
-
-.fc-agenda .fc-agenda-axis {
-	width: 50px;
-	padding: 0 4px;
-	vertical-align: middle;
-	text-align: right;
-	white-space: nowrap;
-	font-weight: normal;
-	}
-
-.fc-agenda .fc-day-content {
-	padding: 2px 2px 1px;
-	}
-
-/* make axis border take precedence */
-
-.fc-agenda-days .fc-agenda-axis {
-	border-right-width: 1px;
-	}
-
-.fc-agenda-days .fc-col0 {
-	border-left-width: 0;
-	}
-
-/* all-day area */
-
-.fc-agenda-allday th {
-	border-width: 0 1px;
-	}
-
-.fc-agenda-allday .fc-day-content {
-	min-height: 34px; /* TODO: doesnt work well in quirksmode */
-	_height: 34px;
-	}
-
-/* divider (between all-day and slots) */
-
-.fc-agenda-divider-inner {
-	height: 2px;
-	overflow: hidden;
-	}
-
-.fc-widget-header .fc-agenda-divider-inner {
-	background: #eee;
-	}
-
-/* slot rows */
-
-.fc-agenda-slots th {
-	border-width: 1px 1px 0;
-	}
-
-.fc-agenda-slots td {
-	border-width: 1px 0 0;
-	background: none;
-	}
-
-.fc-agenda-slots td div {
-	height: 20px;
-	}
-
-.fc-agenda-slots tr.fc-slot0 th,
-.fc-agenda-slots tr.fc-slot0 td {
-	border-top-width: 0;
-	}
-
-.fc-agenda-slots tr.fc-minor th,
-.fc-agenda-slots tr.fc-minor td {
-	border-top-style: dotted;
-	}
-
-.fc-agenda-slots tr.fc-minor th.ui-widget-header {
-	*border-top-style: solid; /* doesn't work with background in IE6/7 */
-	}
-
-
-
-/* Vertical Events
-------------------------------------------------------------------------*/
-
-.fc-event-vert {
-	border-width: 0 1px;
-	}
-
-.fc-event-vert .fc-event-head,
-.fc-event-vert .fc-event-content {
-	position: relative;
-	z-index: 2;
-	width: 100%;
-	overflow: hidden;
-	}
-
-.fc-event-vert .fc-event-time {
-	white-space: nowrap;
-	font-size: 10px;
-	}
-
-.fc-event-vert .fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay  */
-	position: absolute;
-	z-index: 1;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	background: #fff;
-	opacity: .3;
-	filter: alpha(opacity=30);
-	}
-
-.fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */
-.fc-select-helper .fc-event-bg {
-	display: none\9; /* for IE6/7/8. nested opacity filters while dragging don't work */
-	}
-
-/* resizable */
-
-.fc-event-vert .ui-resizable-s {
-	bottom: 0        !important; /* importants override pre jquery ui 1.7 styles */
-	width: 100%      !important;
-	height: 8px      !important;
-	overflow: hidden !important;
-	line-height: 8px !important;
-	font-size: 11px  !important;
-	font-family: monospace;
-	text-align: center;
-	cursor: s-resize;
-	}
-
-.fc-agenda .ui-resizable-resizing { /* TODO: better selector */
-	_overflow: hidden;
-	}
diff --git a/3rdparty/fullcalendar/css/fullcalendar.print.css b/3rdparty/fullcalendar/css/fullcalendar.print.css
deleted file mode 100644
index 18c7c9b10af..00000000000
--- a/3rdparty/fullcalendar/css/fullcalendar.print.css
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * FullCalendar v1.5.2 Print Stylesheet
- *
- * Include this stylesheet on your page to get a more printer-friendly calendar.
- * When including this stylesheet, use the media='print' attribute of the <link> tag.
- * Make sure to include this stylesheet IN ADDITION to the regular fullcalendar.css.
- *
- * Copyright (c) 2011 Adam Shaw
- * Dual licensed under the MIT and GPL licenses, located in
- * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
- *
- * Date: Sun Aug 21 22:06:09 2011 -0700
- *
- */
-
-
- /* Events
------------------------------------------------------*/
-
-.fc-event-skin {
-	background: none !important;
-	color: #000 !important;
-	}
-
-/* horizontal events */
-
-.fc-event-hori {
-	border-width: 0 0 1px 0 !important;
-	border-bottom-style: dotted !important;
-	border-bottom-color: #000 !important;
-	padding: 1px 0 0 0 !important;
-	}
-
-.fc-event-hori .fc-event-inner {
-	border-width: 0 !important;
-	padding: 0 1px !important;
-	}
-
-/* vertical events */
-
-.fc-event-vert {
-	border-width: 0 0 0 1px !important;
-	border-left-style: dotted !important;
-	border-left-color: #000 !important;
-	padding: 0 1px 0 0 !important;
-	}
-
-.fc-event-vert .fc-event-inner {
-	border-width: 0 !important;
-	padding: 1px 0 !important;
-	}
-
-.fc-event-bg {
-	display: none !important;
-	}
-
-.fc-event .ui-resizable-handle {
-	display: none !important;
-	}
diff --git a/3rdparty/fullcalendar/js/fullcalendar.js b/3rdparty/fullcalendar/js/fullcalendar.js
deleted file mode 100644
index fcdafbfca49..00000000000
--- a/3rdparty/fullcalendar/js/fullcalendar.js
+++ /dev/null
@@ -1,5210 +0,0 @@
-/**
- * @preserve
- * FullCalendar v1.5.2
- * http://arshaw.com/fullcalendar/
- *
- * Use fullcalendar.css for basic styling.
- * For event drag & drop, requires jQuery UI draggable.
- * For event resizing, requires jQuery UI resizable.
- *
- * Copyright (c) 2011 Adam Shaw
- * Dual licensed under the MIT and GPL licenses, located in
- * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
- *
- * Date: Sun Aug 21 22:06:09 2011 -0700
- *
- */
-
-(function($, undefined) {
-
-
-var defaults = {
-
-	// display
-	defaultView: 'month',
-	aspectRatio: 1.35,
-	header: {
-		left: 'title',
-		center: '',
-		right: 'today prev,next'
-	},
-	weekends: true,
-
-	// editing
-	//editable: false,
-	//disableDragging: false,
-	//disableResizing: false,
-
-	allDayDefault: true,
-	ignoreTimezone: true,
-
-	// event ajax
-	lazyFetching: true,
-	startParam: 'start',
-	endParam: 'end',
-
-	// time formats
-	titleFormat: {
-		month: 'MMMM yyyy',
-		week: "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-		day: 'dddd, MMM d, yyyy'
-	},
-	columnFormat: {
-		month: 'ddd',
-		week: 'ddd M/d',
-		day: 'dddd M/d'
-	},
-	timeFormat: { // for event elements
-		'': 'h(:mm)t' // default
-	},
-
-	// locale
-	isRTL: false,
-	firstDay: 0,
-	monthNames: ['January','February','March','April','May','June','July','August','September','October','November','December'],
-	monthNamesShort: ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'],
-	dayNames: ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'],
-	dayNamesShort: ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'],
-	buttonText: {
-		prev: '&nbsp;&#9668;&nbsp;',
-		next: '&nbsp;&#9658;&nbsp;',
-		prevYear: '&nbsp;&lt;&lt;&nbsp;',
-		nextYear: '&nbsp;&gt;&gt;&nbsp;',
-		today: 'today',
-		month: 'month',
-		week: 'week',
-		day: 'day'
-	},
-
-	// jquery-ui theming
-	theme: false,
-	buttonIcons: {
-		prev: 'circle-triangle-w',
-		next: 'circle-triangle-e'
-	},
-
-	//selectable: false,
-	unselectAuto: true,
-
-	dropAccept: '*'
-
-};
-
-// right-to-left defaults
-var rtlDefaults = {
-	header: {
-		left: 'next,prev today',
-		center: '',
-		right: 'title'
-	},
-	buttonText: {
-		prev: '&nbsp;&#9658;&nbsp;',
-		next: '&nbsp;&#9668;&nbsp;',
-		prevYear: '&nbsp;&gt;&gt;&nbsp;',
-		nextYear: '&nbsp;&lt;&lt;&nbsp;'
-	},
-	buttonIcons: {
-		prev: 'circle-triangle-e',
-		next: 'circle-triangle-w'
-	}
-};
-
-
-
-var fc = $.fullCalendar = { version: "1.5.2" };
-var fcViews = fc.views = {};
-
-
-$.fn.fullCalendar = function(options) {
-
-
-	// method calling
-	if (typeof options == 'string') {
-		var args = Array.prototype.slice.call(arguments, 1);
-		var res;
-		this.each(function() {
-			var calendar = $.data(this, 'fullCalendar');
-			if (calendar && $.isFunction(calendar[options])) {
-				var r = calendar[options].apply(calendar, args);
-				if (res === undefined) {
-					res = r;
-				}
-				if (options == 'destroy') {
-					$.removeData(this, 'fullCalendar');
-				}
-			}
-		});
-		if (res !== undefined) {
-			return res;
-		}
-		return this;
-	}
-
-
-	// would like to have this logic in EventManager, but needs to happen before options are recursively extended
-	var eventSources = options.eventSources || [];
-	delete options.eventSources;
-	if (options.events) {
-		eventSources.push(options.events);
-		delete options.events;
-	}
-
-
-	options = $.extend(true, {},
-		defaults,
-		(options.isRTL || options.isRTL===undefined && defaults.isRTL) ? rtlDefaults : {},
-		options
-	);
-
-
-	this.each(function(i, _element) {
-		var element = $(_element);
-		var calendar = new Calendar(element, options, eventSources);
-		element.data('fullCalendar', calendar); // TODO: look into memory leak implications
-		calendar.render();
-	});
-
-
-	return this;
-
-};
-
-
-// function for adding/overriding defaults
-function setDefaults(d) {
-	$.extend(true, defaults, d);
-}
-
-
-
-
-function Calendar(element, options, eventSources) {
-	var t = this;
-
-
-	// exports
-	t.options = options;
-	t.render = render;
-	t.destroy = destroy;
-	t.refetchEvents = refetchEvents;
-	t.reportEvents = reportEvents;
-	t.reportEventChange = reportEventChange;
-	t.rerenderEvents = rerenderEvents;
-	t.changeView = changeView;
-	t.select = select;
-	t.unselect = unselect;
-	t.prev = prev;
-	t.next = next;
-	t.prevYear = prevYear;
-	t.nextYear = nextYear;
-	t.today = today;
-	t.gotoDate = gotoDate;
-	t.incrementDate = incrementDate;
-	t.formatDate = function(format, date) { return formatDate(format, date, options) };
-	t.formatDates = function(format, date1, date2) { return formatDates(format, date1, date2, options) };
-	t.getDate = getDate;
-	t.getView = getView;
-	t.option = option;
-	t.trigger = trigger;
-
-
-	// imports
-	EventManager.call(t, options, eventSources);
-	var isFetchNeeded = t.isFetchNeeded;
-	var fetchEvents = t.fetchEvents;
-
-
-	// locals
-	var _element = element[0];
-	var header;
-	var headerElement;
-	var content;
-	var tm; // for making theme classes
-	var currentView;
-	var viewInstances = {};
-	var elementOuterWidth;
-	var suggestedViewHeight;
-	var absoluteViewElement;
-	var resizeUID = 0;
-	var ignoreWindowResize = 0;
-	var date = new Date();
-	var events = [];
-	var _dragElement;
-
-
-
-	/* Main Rendering
-	-----------------------------------------------------------------------------*/
-
-
-	setYMD(date, options.year, options.month, options.date);
-
-
-	function render(inc) {
-		if (!content) {
-			initialRender();
-		}else{
-			calcSize();
-			markSizesDirty();
-			markEventsDirty();
-			renderView(inc);
-		}
-	}
-
-
-	function initialRender() {
-		tm = options.theme ? 'ui' : 'fc';
-		element.addClass('fc');
-		if (options.isRTL) {
-			element.addClass('fc-rtl');
-		}
-		if (options.theme) {
-			element.addClass('ui-widget');
-		}
-		content = $("<div class='fc-content' style='position:relative'/>")
-			.prependTo(element);
-		header = new Header(t, options);
-		headerElement = header.render();
-		if (headerElement) {
-			element.prepend(headerElement);
-		}
-		changeView(options.defaultView);
-		$(window).resize(windowResize);
-		// needed for IE in a 0x0 iframe, b/c when it is resized, never triggers a windowResize
-		if (!bodyVisible()) {
-			lateRender();
-		}
-	}
-
-
-	// called when we know the calendar couldn't be rendered when it was initialized,
-	// but we think it's ready now
-	function lateRender() {
-		setTimeout(function() { // IE7 needs this so dimensions are calculated correctly
-			if (!currentView.start && bodyVisible()) { // !currentView.start makes sure this never happens more than once
-				renderView();
-			}
-		},0);
-	}
-
-
-	function destroy() {
-		$(window).unbind('resize', windowResize);
-		header.destroy();
-		content.remove();
-		element.removeClass('fc fc-rtl ui-widget');
-	}
-
-
-
-	function elementVisible() {
-		return _element.offsetWidth !== 0;
-	}
-
-
-	function bodyVisible() {
-		return $('body')[0].offsetWidth !== 0;
-	}
-
-
-
-	/* View Rendering
-	-----------------------------------------------------------------------------*/
-
-	// TODO: improve view switching (still weird transition in IE, and FF has whiteout problem)
-
-	function changeView(newViewName) {
-		if (!currentView || newViewName != currentView.name) {
-			ignoreWindowResize++; // because setMinHeight might change the height before render (and subsequently setSize) is reached
-
-			unselect();
-
-			var oldView = currentView;
-			var newViewElement;
-
-			if (oldView) {
-				(oldView.beforeHide || noop)(); // called before changing min-height. if called after, scroll state is reset (in Opera)
-				setMinHeight(content, content.height());
-				oldView.element.hide();
-			}else{
-				setMinHeight(content, 1); // needs to be 1 (not 0) for IE7, or else view dimensions miscalculated
-			}
-			content.css('overflow', 'hidden');
-
-			currentView = viewInstances[newViewName];
-			if (currentView) {
-				currentView.element.show();
-			}else{
-				currentView = viewInstances[newViewName] = new fcViews[newViewName](
-					newViewElement = absoluteViewElement =
-						$("<div class='fc-view fc-view-" + newViewName + "' style='position:absolute'/>")
-							.appendTo(content),
-					t // the calendar object
-				);
-			}
-
-			if (oldView) {
-				header.deactivateButton(oldView.name);
-			}
-			header.activateButton(newViewName);
-
-			renderView(); // after height has been set, will make absoluteViewElement's position=relative, then set to null
-
-			content.css('overflow', '');
-			if (oldView) {
-				setMinHeight(content, 1);
-			}
-
-			if (!newViewElement) {
-				(currentView.afterShow || noop)(); // called after setting min-height/overflow, so in final scroll state (for Opera)
-			}
-
-			ignoreWindowResize--;
-		}
-	}
-
-
-
-	function renderView(inc) {
-		if (elementVisible()) {
-			ignoreWindowResize++; // because renderEvents might temporarily change the height before setSize is reached
-
-			unselect();
-
-			if (suggestedViewHeight === undefined) {
-				calcSize();
-			}
-
-			var forceEventRender = false;
-			if (!currentView.start || inc || date < currentView.start || date >= currentView.end) {
-				// view must render an entire new date range (and refetch/render events)
-				currentView.render(date, inc || 0); // responsible for clearing events
-				setSize(true);
-				forceEventRender = true;
-			}
-			else if (currentView.sizeDirty) {
-				// view must resize (and rerender events)
-				currentView.clearEvents();
-				setSize();
-				forceEventRender = true;
-			}
-			else if (currentView.eventsDirty) {
-				currentView.clearEvents();
-				forceEventRender = true;
-			}
-			currentView.sizeDirty = false;
-			currentView.eventsDirty = false;
-			updateEvents(forceEventRender);
-
-			elementOuterWidth = element.outerWidth();
-
-			header.updateTitle(currentView.title);
-			var today = new Date();
-			if (today >= currentView.start && today < currentView.end) {
-				header.disableButton('today');
-			}else{
-				header.enableButton('today');
-			}
-
-			ignoreWindowResize--;
-			currentView.trigger('viewDisplay', _element);
-		}
-	}
-
-
-
-	/* Resizing
-	-----------------------------------------------------------------------------*/
-
-
-	function updateSize() {
-		markSizesDirty();
-		if (elementVisible()) {
-			calcSize();
-			setSize();
-			unselect();
-			currentView.clearEvents();
-			currentView.renderEvents(events);
-			currentView.sizeDirty = false;
-		}
-	}
-
-
-	function markSizesDirty() {
-		$.each(viewInstances, function(i, inst) {
-			inst.sizeDirty = true;
-		});
-	}
-
-
-	function calcSize() {
-		if (options.contentHeight) {
-			suggestedViewHeight = options.contentHeight;
-		}
-		else if (options.height) {
-			suggestedViewHeight = options.height - (headerElement ? headerElement.height() : 0) - vsides(content);
-		}
-		else {
-			suggestedViewHeight = Math.round(content.width() / Math.max(options.aspectRatio, .5));
-		}
-	}
-
-
-	function setSize(dateChanged) { // todo: dateChanged?
-		ignoreWindowResize++;
-		currentView.setHeight(suggestedViewHeight, dateChanged);
-		if (absoluteViewElement) {
-			absoluteViewElement.css('position', 'relative');
-			absoluteViewElement = null;
-		}
-		currentView.setWidth(content.width(), dateChanged);
-		ignoreWindowResize--;
-	}
-
-
-	function windowResize() {
-		if (!ignoreWindowResize) {
-			if (currentView.start) { // view has already been rendered
-				var uid = ++resizeUID;
-				setTimeout(function() { // add a delay
-					if (uid == resizeUID && !ignoreWindowResize && elementVisible()) {
-						if (elementOuterWidth != (elementOuterWidth = element.outerWidth())) {
-							ignoreWindowResize++; // in case the windowResize callback changes the height
-							updateSize();
-							currentView.trigger('windowResize', _element);
-							ignoreWindowResize--;
-						}
-					}
-				}, 200);
-			}else{
-				// calendar must have been initialized in a 0x0 iframe that has just been resized
-				lateRender();
-			}
-		}
-	}
-
-
-
-	/* Event Fetching/Rendering
-	-----------------------------------------------------------------------------*/
-
-
-	// fetches events if necessary, rerenders events if necessary (or if forced)
-	function updateEvents(forceRender) {
-		if (!options.lazyFetching || isFetchNeeded(currentView.visStart, currentView.visEnd)) {
-			refetchEvents();
-		}
-		else if (forceRender) {
-			rerenderEvents();
-		}
-	}
-
-
-	function refetchEvents() {
-		fetchEvents(currentView.visStart, currentView.visEnd); // will call reportEvents
-	}
-
-
-	// called when event data arrives
-	function reportEvents(_events) {
-		events = _events;
-		rerenderEvents();
-	}
-
-
-	// called when a single event's data has been changed
-	function reportEventChange(eventID) {
-		rerenderEvents(eventID);
-	}
-
-
-	// attempts to rerenderEvents
-	function rerenderEvents(modifiedEventID) {
-		markEventsDirty();
-		if (elementVisible()) {
-			currentView.clearEvents();
-			currentView.renderEvents(events, modifiedEventID);
-			currentView.eventsDirty = false;
-		}
-	}
-
-
-	function markEventsDirty() {
-		$.each(viewInstances, function(i, inst) {
-			inst.eventsDirty = true;
-		});
-	}
-
-
-
-	/* Selection
-	-----------------------------------------------------------------------------*/
-
-
-	function select(start, end, allDay) {
-		currentView.select(start, end, allDay===undefined ? true : allDay);
-	}
-
-
-	function unselect() { // safe to be called before renderView
-		if (currentView) {
-			currentView.unselect();
-		}
-	}
-
-
-
-	/* Date
-	-----------------------------------------------------------------------------*/
-
-
-	function prev() {
-		renderView(-1);
-	}
-
-
-	function next() {
-		renderView(1);
-	}
-
-
-	function prevYear() {
-		addYears(date, -1);
-		renderView();
-	}
-
-
-	function nextYear() {
-		addYears(date, 1);
-		renderView();
-	}
-
-
-	function today() {
-		date = new Date();
-		renderView();
-	}
-
-
-	function gotoDate(year, month, dateOfMonth) {
-		if (year instanceof Date) {
-			date = cloneDate(year); // provided 1 argument, a Date
-		}else{
-			setYMD(date, year, month, dateOfMonth);
-		}
-		renderView();
-	}
-
-
-	function incrementDate(years, months, days) {
-		if (years !== undefined) {
-			addYears(date, years);
-		}
-		if (months !== undefined) {
-			addMonths(date, months);
-		}
-		if (days !== undefined) {
-			addDays(date, days);
-		}
-		renderView();
-	}
-
-
-	function getDate() {
-		return cloneDate(date);
-	}
-
-
-
-	/* Misc
-	-----------------------------------------------------------------------------*/
-
-
-	function getView() {
-		return currentView;
-	}
-
-
-	function option(name, value) {
-		if (value === undefined) {
-			return options[name];
-		}
-		if (name == 'height' || name == 'contentHeight' || name == 'aspectRatio') {
-			options[name] = value;
-			updateSize();
-		}
-	}
-
-
-	function trigger(name, thisObj) {
-		if (options[name]) {
-			return options[name].apply(
-				thisObj || _element,
-				Array.prototype.slice.call(arguments, 2)
-			);
-		}
-	}
-
-
-
-	/* External Dragging
-	------------------------------------------------------------------------*/
-
-	if (options.droppable) {
-		$(document)
-			.bind('dragstart', function(ev, ui) {
-				var _e = ev.target;
-				var e = $(_e);
-				if (!e.parents('.fc').length) { // not already inside a calendar
-					var accept = options.dropAccept;
-					if ($.isFunction(accept) ? accept.call(_e, e) : e.is(accept)) {
-						_dragElement = _e;
-						currentView.dragStart(_dragElement, ev, ui);
-					}
-				}
-			})
-			.bind('dragstop', function(ev, ui) {
-				if (_dragElement) {
-					currentView.dragStop(_dragElement, ev, ui);
-					_dragElement = null;
-				}
-			});
-	}
-
-
-}
-
-function Header(calendar, options) {
-	var t = this;
-
-
-	// exports
-	t.render = render;
-	t.destroy = destroy;
-	t.updateTitle = updateTitle;
-	t.activateButton = activateButton;
-	t.deactivateButton = deactivateButton;
-	t.disableButton = disableButton;
-	t.enableButton = enableButton;
-
-
-	// locals
-	var element = $([]);
-	var tm;
-
-
-
-	function render() {
-		tm = options.theme ? 'ui' : 'fc';
-		var sections = options.header;
-		if (sections) {
-			element = $("<table class='fc-header' style='width:100%'/>")
-				.append(
-					$("<tr/>")
-						.append(renderSection('left'))
-						.append(renderSection('center'))
-						.append(renderSection('right'))
-				);
-			return element;
-		}
-	}
-
-
-	function destroy() {
-		element.remove();
-	}
-
-
-	function renderSection(position) {
-		var e = $("<td class='fc-header-" + position + "'/>");
-		var buttonStr = options.header[position];
-		if (buttonStr) {
-			$.each(buttonStr.split(' '), function(i) {
-				if (i > 0) {
-					e.append("<span class='fc-header-space'/>");
-				}
-				var prevButton;
-				$.each(this.split(','), function(j, buttonName) {
-					if (buttonName == 'title') {
-						e.append("<span class='fc-header-title'><h2>&nbsp;</h2></span>");
-						if (prevButton) {
-							prevButton.addClass(tm + '-corner-right');
-						}
-						prevButton = null;
-					}else{
-						var buttonClick;
-						if (calendar[buttonName]) {
-							buttonClick = calendar[buttonName]; // calendar method
-						}
-						else if (fcViews[buttonName]) {
-							buttonClick = function() {
-								button.removeClass(tm + '-state-hover'); // forget why
-								calendar.changeView(buttonName);
-							};
-						}
-						if (buttonClick) {
-							var icon = options.theme ? smartProperty(options.buttonIcons, buttonName) : null; // why are we using smartProperty here?
-							var text = smartProperty(options.buttonText, buttonName); // why are we using smartProperty here?
-							var button = $(
-								"<span class='fc-button fc-button-" + buttonName + " " + tm + "-state-default'>" +
-									"<span class='fc-button-inner'>" +
-										"<span class='fc-button-content'>" +
-											(icon ?
-												"<span class='fc-icon-wrap'>" +
-													"<span class='ui-icon ui-icon-" + icon + "'/>" +
-												"</span>" :
-												text
-												) +
-										"</span>" +
-										"<span class='fc-button-effect'><span></span></span>" +
-									"</span>" +
-								"</span>"
-							);
-							if (button) {
-								button
-									.click(function() {
-										if (!button.hasClass(tm + '-state-disabled')) {
-											buttonClick();
-										}
-									})
-									.mousedown(function() {
-										button
-											.not('.' + tm + '-state-active')
-											.not('.' + tm + '-state-disabled')
-											.addClass(tm + '-state-down');
-									})
-									.mouseup(function() {
-										button.removeClass(tm + '-state-down');
-									})
-									.hover(
-										function() {
-											button
-												.not('.' + tm + '-state-active')
-												.not('.' + tm + '-state-disabled')
-												.addClass(tm + '-state-hover');
-										},
-										function() {
-											button
-												.removeClass(tm + '-state-hover')
-												.removeClass(tm + '-state-down');
-										}
-									)
-									.appendTo(e);
-								if (!prevButton) {
-									button.addClass(tm + '-corner-left');
-								}
-								prevButton = button;
-							}
-						}
-					}
-				});
-				if (prevButton) {
-					prevButton.addClass(tm + '-corner-right');
-				}
-			});
-		}
-		return e;
-	}
-
-
-	function updateTitle(html) {
-		element.find('h2')
-			.html(html);
-	}
-
-
-	function activateButton(buttonName) {
-		element.find('span.fc-button-' + buttonName)
-			.addClass(tm + '-state-active');
-	}
-
-
-	function deactivateButton(buttonName) {
-		element.find('span.fc-button-' + buttonName)
-			.removeClass(tm + '-state-active');
-	}
-
-
-	function disableButton(buttonName) {
-		element.find('span.fc-button-' + buttonName)
-			.addClass(tm + '-state-disabled');
-	}
-
-
-	function enableButton(buttonName) {
-		element.find('span.fc-button-' + buttonName)
-			.removeClass(tm + '-state-disabled');
-	}
-
-
-}
-
-fc.sourceNormalizers = [];
-fc.sourceFetchers = [];
-
-var ajaxDefaults = {
-	dataType: 'json',
-	cache: false
-};
-
-var eventGUID = 1;
-
-
-function EventManager(options, _sources) {
-	var t = this;
-
-
-	// exports
-	t.isFetchNeeded = isFetchNeeded;
-	t.fetchEvents = fetchEvents;
-	t.addEventSource = addEventSource;
-	t.removeEventSource = removeEventSource;
-	t.updateEvent = updateEvent;
-	t.renderEvent = renderEvent;
-	t.removeEvents = removeEvents;
-	t.clientEvents = clientEvents;
-	t.normalizeEvent = normalizeEvent;
-
-
-	// imports
-	var trigger = t.trigger;
-	var getView = t.getView;
-	var reportEvents = t.reportEvents;
-
-
-	// locals
-	var stickySource = { events: [] };
-	var sources = [ stickySource ];
-	var rangeStart, rangeEnd;
-	var currentFetchID = 0;
-	var pendingSourceCnt = 0;
-	var loadingLevel = 0;
-	var cache = [];
-
-
-	for (var i=0; i<_sources.length; i++) {
-		_addEventSource(_sources[i]);
-	}
-
-
-
-	/* Fetching
-	-----------------------------------------------------------------------------*/
-
-
-	function isFetchNeeded(start, end) {
-		return !rangeStart || start < rangeStart || end > rangeEnd;
-	}
-
-
-	function fetchEvents(start, end) {
-		rangeStart = start;
-		rangeEnd = end;
-		cache = [];
-		var fetchID = ++currentFetchID;
-		var len = sources.length;
-		pendingSourceCnt = len;
-		for (var i=0; i<len; i++) {
-			fetchEventSource(sources[i], fetchID);
-		}
-	}
-
-
-	function fetchEventSource(source, fetchID) {
-		_fetchEventSource(source, function(events) {
-			if (fetchID == currentFetchID) {
-				if (events) {
-					for (var i=0; i<events.length; i++) {
-						events[i].source = source;
-						normalizeEvent(events[i]);
-					}
-					cache = cache.concat(events);
-				}
-				pendingSourceCnt--;
-				if (!pendingSourceCnt) {
-					reportEvents(cache);
-				}
-			}
-		});
-	}
-
-
-	function _fetchEventSource(source, callback) {
-		var i;
-		var fetchers = fc.sourceFetchers;
-		var res;
-		for (i=0; i<fetchers.length; i++) {
-			res = fetchers[i](source, rangeStart, rangeEnd, callback);
-			if (res === true) {
-				// the fetcher is in charge. made its own async request
-				return;
-			}
-			else if (typeof res == 'object') {
-				// the fetcher returned a new source. process it
-				_fetchEventSource(res, callback);
-				return;
-			}
-		}
-		var events = source.events;
-		if (events) {
-			if ($.isFunction(events)) {
-				pushLoading();
-				events(cloneDate(rangeStart), cloneDate(rangeEnd), function(events) {
-					callback(events);
-					popLoading();
-				});
-			}
-			else if ($.isArray(events)) {
-				callback(events);
-			}
-			else {
-				callback();
-			}
-		}else{
-			var url = source.url;
-			if (url) {
-				var success = source.success;
-				var error = source.error;
-				var complete = source.complete;
-				var data = $.extend({}, source.data || {});
-				var startParam = firstDefined(source.startParam, options.startParam);
-				var endParam = firstDefined(source.endParam, options.endParam);
-				if (startParam) {
-					data[startParam] = Math.round(+rangeStart / 1000);
-				}
-				if (endParam) {
-					data[endParam] = Math.round(+rangeEnd / 1000);
-				}
-				pushLoading();
-				$.ajax($.extend({}, ajaxDefaults, source, {
-					data: data,
-					success: function(events) {
-						events = events || [];
-						var res = applyAll(success, this, arguments);
-						if ($.isArray(res)) {
-							events = res;
-						}
-						callback(events);
-					},
-					error: function() {
-						applyAll(error, this, arguments);
-						callback();
-					},
-					complete: function() {
-						applyAll(complete, this, arguments);
-						popLoading();
-					}
-				}));
-			}else{
-				callback();
-			}
-		}
-	}
-
-
-
-	/* Sources
-	-----------------------------------------------------------------------------*/
-
-
-	function addEventSource(source) {
-		source = _addEventSource(source);
-		if (source) {
-			pendingSourceCnt++;
-			fetchEventSource(source, currentFetchID); // will eventually call reportEvents
-		}
-	}
-
-
-	function _addEventSource(source) {
-		if ($.isFunction(source) || $.isArray(source)) {
-			source = { events: source };
-		}
-		else if (typeof source == 'string') {
-			source = { url: source };
-		}
-		if (typeof source == 'object') {
-			normalizeSource(source);
-			sources.push(source);
-			return source;
-		}
-	}
-
-
-	function removeEventSource(source) {
-		sources = $.grep(sources, function(src) {
-			return !isSourcesEqual(src, source);
-		});
-		// remove all client events from that source
-		cache = $.grep(cache, function(e) {
-			return !isSourcesEqual(e.source, source);
-		});
-		reportEvents(cache);
-	}
-
-
-
-	/* Manipulation
-	-----------------------------------------------------------------------------*/
-
-
-	function updateEvent(event) { // update an existing event
-		var i, len = cache.length, e,
-			defaultEventEnd = getView().defaultEventEnd, // getView???
-			startDelta = event.start - event._start,
-			endDelta = event.end ?
-				(event.end - (event._end || defaultEventEnd(event))) // event._end would be null if event.end
-				: 0;                                                      // was null and event was just resized
-		for (i=0; i<len; i++) {
-			e = cache[i];
-			if (e._id == event._id && e != event) {
-				e.start = new Date(+e.start + startDelta);
-				if (event.end) {
-					if (e.end) {
-						e.end = new Date(+e.end + endDelta);
-					}else{
-						e.end = new Date(+defaultEventEnd(e) + endDelta);
-					}
-				}else{
-					e.end = null;
-				}
-				e.title = event.title;
-				e.url = event.url;
-				e.allDay = event.allDay;
-				e.className = event.className;
-				e.editable = event.editable;
-				e.color = event.color;
-				e.backgroudColor = event.backgroudColor;
-				e.borderColor = event.borderColor;
-				e.textColor = event.textColor;
-				normalizeEvent(e);
-			}
-		}
-		normalizeEvent(event);
-		reportEvents(cache);
-	}
-
-
-	function renderEvent(event, stick) {
-		normalizeEvent(event);
-		if (!event.source) {
-			if (stick) {
-				stickySource.events.push(event);
-				event.source = stickySource;
-			}
-			cache.push(event);
-		}
-		reportEvents(cache);
-	}
-
-
-	function removeEvents(filter) {
-		if (!filter) { // remove all
-			cache = [];
-			// clear all array sources
-			for (var i=0; i<sources.length; i++) {
-				if ($.isArray(sources[i].events)) {
-					sources[i].events = [];
-				}
-			}
-		}else{
-			if (!$.isFunction(filter)) { // an event ID
-				var id = filter + '';
-				filter = function(e) {
-					return e._id == id;
-				};
-			}
-			cache = $.grep(cache, filter, true);
-			// remove events from array sources
-			for (var i=0; i<sources.length; i++) {
-				if ($.isArray(sources[i].events)) {
-					sources[i].events = $.grep(sources[i].events, filter, true);
-				}
-			}
-		}
-		reportEvents(cache);
-	}
-
-
-	function clientEvents(filter) {
-		if ($.isFunction(filter)) {
-			return $.grep(cache, filter);
-		}
-		else if (filter) { // an event ID
-			filter += '';
-			return $.grep(cache, function(e) {
-				return e._id == filter;
-			});
-		}
-		return cache; // else, return all
-	}
-
-
-
-	/* Loading State
-	-----------------------------------------------------------------------------*/
-
-
-	function pushLoading() {
-		if (!loadingLevel++) {
-			trigger('loading', null, true);
-		}
-	}
-
-
-	function popLoading() {
-		if (!--loadingLevel) {
-			trigger('loading', null, false);
-		}
-	}
-
-
-
-	/* Event Normalization
-	-----------------------------------------------------------------------------*/
-
-
-	function normalizeEvent(event) {
-		var source = event.source || {};
-		var ignoreTimezone = firstDefined(source.ignoreTimezone, options.ignoreTimezone);
-		event._id = event._id || (event.id === undefined ? '_fc' + eventGUID++ : event.id + '');
-		if (event.date) {
-			if (!event.start) {
-				event.start = event.date;
-			}
-			delete event.date;
-		}
-		event._start = cloneDate(event.start = parseDate(event.start, ignoreTimezone));
-		event.end = parseDate(event.end, ignoreTimezone);
-		if (event.end && event.end <= event.start) {
-			event.end = null;
-		}
-		event._end = event.end ? cloneDate(event.end) : null;
-		if (event.allDay === undefined) {
-			event.allDay = firstDefined(source.allDayDefault, options.allDayDefault);
-		}
-		if (event.className) {
-			if (typeof event.className == 'string') {
-				event.className = event.className.split(/\s+/);
-			}
-		}else{
-			event.className = [];
-		}
-		// TODO: if there is no start date, return false to indicate an invalid event
-	}
-
-
-
-	/* Utils
-	------------------------------------------------------------------------------*/
-
-
-	function normalizeSource(source) {
-		if (source.className) {
-			// TODO: repeat code, same code for event classNames
-			if (typeof source.className == 'string') {
-				source.className = source.className.split(/\s+/);
-			}
-		}else{
-			source.className = [];
-		}
-		var normalizers = fc.sourceNormalizers;
-		for (var i=0; i<normalizers.length; i++) {
-			normalizers[i](source);
-		}
-	}
-
-
-	function isSourcesEqual(source1, source2) {
-		return source1 && source2 && getSourcePrimitive(source1) == getSourcePrimitive(source2);
-	}
-
-
-	function getSourcePrimitive(source) {
-		return ((typeof source == 'object') ? (source.events || source.url) : '') || source;
-	}
-
-
-}
-
-
-fc.addDays = addDays;
-fc.cloneDate = cloneDate;
-fc.parseDate = parseDate;
-fc.parseISO8601 = parseISO8601;
-fc.parseTime = parseTime;
-fc.formatDate = formatDate;
-fc.formatDates = formatDates;
-
-
-
-/* Date Math
------------------------------------------------------------------------------*/
-
-var dayIDs = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'],
-	DAY_MS = 86400000,
-	HOUR_MS = 3600000,
-	MINUTE_MS = 60000;
-
-
-function addYears(d, n, keepTime) {
-	d.setFullYear(d.getFullYear() + n);
-	if (!keepTime) {
-		clearTime(d);
-	}
-	return d;
-}
-
-
-function addMonths(d, n, keepTime) { // prevents day overflow/underflow
-	if (+d) { // prevent infinite looping on invalid dates
-		var m = d.getMonth() + n,
-			check = cloneDate(d);
-		check.setDate(1);
-		check.setMonth(m);
-		d.setMonth(m);
-		if (!keepTime) {
-			clearTime(d);
-		}
-		while (d.getMonth() != check.getMonth()) {
-			d.setDate(d.getDate() + (d < check ? 1 : -1));
-		}
-	}
-	return d;
-}
-
-
-function addDays(d, n, keepTime) { // deals with daylight savings
-	if (+d) {
-		var dd = d.getDate() + n,
-			check = cloneDate(d);
-		check.setHours(9); // set to middle of day
-		check.setDate(dd);
-		d.setDate(dd);
-		if (!keepTime) {
-			clearTime(d);
-		}
-		fixDate(d, check);
-	}
-	return d;
-}
-
-
-function fixDate(d, check) { // force d to be on check's YMD, for daylight savings purposes
-	if (+d) { // prevent infinite looping on invalid dates
-		while (d.getDate() != check.getDate()) {
-			d.setTime(+d + (d < check ? 1 : -1) * HOUR_MS);
-		}
-	}
-}
-
-
-function addMinutes(d, n) {
-	d.setMinutes(d.getMinutes() + n);
-	return d;
-}
-
-
-function clearTime(d) {
-	d.setHours(0);
-	d.setMinutes(0);
-	d.setSeconds(0);
-	d.setMilliseconds(0);
-	return d;
-}
-
-
-function cloneDate(d, dontKeepTime) {
-	if (dontKeepTime) {
-		return clearTime(new Date(+d));
-	}
-	return new Date(+d);
-}
-
-
-function zeroDate() { // returns a Date with time 00:00:00 and dateOfMonth=1
-	var i=0, d;
-	do {
-		d = new Date(1970, i++, 1);
-	} while (d.getHours()); // != 0
-	return d;
-}
-
-
-function skipWeekend(date, inc, excl) {
-	inc = inc || 1;
-	while (!date.getDay() || (excl && date.getDay()==1 || !excl && date.getDay()==6)) {
-		addDays(date, inc);
-	}
-	return date;
-}
-
-
-function dayDiff(d1, d2) { // d1 - d2
-	return Math.round((cloneDate(d1, true) - cloneDate(d2, true)) / DAY_MS);
-}
-
-
-function setYMD(date, y, m, d) {
-	if (y !== undefined && y != date.getFullYear()) {
-		date.setDate(1);
-		date.setMonth(0);
-		date.setFullYear(y);
-	}
-	if (m !== undefined && m != date.getMonth()) {
-		date.setDate(1);
-		date.setMonth(m);
-	}
-	if (d !== undefined) {
-		date.setDate(d);
-	}
-}
-
-
-
-/* Date Parsing
------------------------------------------------------------------------------*/
-
-
-function parseDate(s, ignoreTimezone) { // ignoreTimezone defaults to true
-	if (typeof s == 'object') { // already a Date object
-		return s;
-	}
-	if (typeof s == 'number') { // a UNIX timestamp
-		return new Date(s * 1000);
-	}
-	if (typeof s == 'string') {
-		if (s.match(/^\d+(\.\d+)?$/)) { // a UNIX timestamp
-			return new Date(parseFloat(s) * 1000);
-		}
-		if (ignoreTimezone === undefined) {
-			ignoreTimezone = true;
-		}
-		return parseISO8601(s, ignoreTimezone) || (s ? new Date(s) : null);
-	}
-	// TODO: never return invalid dates (like from new Date(<string>)), return null instead
-	return null;
-}
-
-
-function parseISO8601(s, ignoreTimezone) { // ignoreTimezone defaults to false
-	// derived from http://delete.me.uk/2005/03/iso8601.html
-	// TODO: for a know glitch/feature, read tests/issue_206_parseDate_dst.html
-	var m = s.match(/^([0-9]{4})(-([0-9]{2})(-([0-9]{2})([T ]([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?(Z|(([-+])([0-9]{2})(:?([0-9]{2}))?))?)?)?)?$/);
-	if (!m) {
-		return null;
-	}
-	var date = new Date(m[1], 0, 1);
-	if (ignoreTimezone || !m[13]) {
-		var check = new Date(m[1], 0, 1, 9, 0);
-		if (m[3]) {
-			date.setMonth(m[3] - 1);
-			check.setMonth(m[3] - 1);
-		}
-		if (m[5]) {
-			date.setDate(m[5]);
-			check.setDate(m[5]);
-		}
-		fixDate(date, check);
-		if (m[7]) {
-			date.setHours(m[7]);
-		}
-		if (m[8]) {
-			date.setMinutes(m[8]);
-		}
-		if (m[10]) {
-			date.setSeconds(m[10]);
-		}
-		if (m[12]) {
-			date.setMilliseconds(Number("0." + m[12]) * 1000);
-		}
-		fixDate(date, check);
-	}else{
-		date.setUTCFullYear(
-			m[1],
-			m[3] ? m[3] - 1 : 0,
-			m[5] || 1
-		);
-		date.setUTCHours(
-			m[7] || 0,
-			m[8] || 0,
-			m[10] || 0,
-			m[12] ? Number("0." + m[12]) * 1000 : 0
-		);
-		if (m[14]) {
-			var offset = Number(m[16]) * 60 + (m[18] ? Number(m[18]) : 0);
-			offset *= m[15] == '-' ? 1 : -1;
-			date = new Date(+date + (offset * 60 * 1000));
-		}
-	}
-	return date;
-}
-
-
-function parseTime(s) { // returns minutes since start of day
-	if (typeof s == 'number') { // an hour
-		return s * 60;
-	}
-	if (typeof s == 'object') { // a Date object
-		return s.getHours() * 60 + s.getMinutes();
-	}
-	var m = s.match(/(\d+)(?::(\d+))?\s*(\w+)?/);
-	if (m) {
-		var h = parseInt(m[1], 10);
-		if (m[3]) {
-			h %= 12;
-			if (m[3].toLowerCase().charAt(0) == 'p') {
-				h += 12;
-			}
-		}
-		return h * 60 + (m[2] ? parseInt(m[2], 10) : 0);
-	}
-}
-
-
-
-/* Date Formatting
------------------------------------------------------------------------------*/
-// TODO: use same function formatDate(date, [date2], format, [options])
-
-
-function formatDate(date, format, options) {
-	return formatDates(date, null, format, options);
-}
-
-
-function formatDates(date1, date2, format, options) {
-	options = options || defaults;
-	var date = date1,
-		otherDate = date2,
-		i, len = format.length, c,
-		i2, formatter,
-		res = '';
-	for (i=0; i<len; i++) {
-		c = format.charAt(i);
-		if (c == "'") {
-			for (i2=i+1; i2<len; i2++) {
-				if (format.charAt(i2) == "'") {
-					if (date) {
-						if (i2 == i+1) {
-							res += "'";
-						}else{
-							res += format.substring(i+1, i2);
-						}
-						i = i2;
-					}
-					break;
-				}
-			}
-		}
-		else if (c == '(') {
-			for (i2=i+1; i2<len; i2++) {
-				if (format.charAt(i2) == ')') {
-					var subres = formatDate(date, format.substring(i+1, i2), options);
-					if (parseInt(subres.replace(/\D/, ''), 10)) {
-						res += subres;
-					}
-					i = i2;
-					break;
-				}
-			}
-		}
-		else if (c == '[') {
-			for (i2=i+1; i2<len; i2++) {
-				if (format.charAt(i2) == ']') {
-					var subformat = format.substring(i+1, i2);
-					var subres = formatDate(date, subformat, options);
-					if (subres != formatDate(otherDate, subformat, options)) {
-						res += subres;
-					}
-					i = i2;
-					break;
-				}
-			}
-		}
-		else if (c == '{') {
-			date = date2;
-			otherDate = date1;
-		}
-		else if (c == '}') {
-			date = date1;
-			otherDate = date2;
-		}
-		else {
-			for (i2=len; i2>i; i2--) {
-				if (formatter = dateFormatters[format.substring(i, i2)]) {
-					if (date) {
-						res += formatter(date, options);
-					}
-					i = i2 - 1;
-					break;
-				}
-			}
-			if (i2 == i) {
-				if (date) {
-					res += c;
-				}
-			}
-		}
-	}
-	return res;
-};
-
-
-var dateFormatters = {
-	s	: function(d)	{ return d.getSeconds() },
-	ss	: function(d)	{ return zeroPad(d.getSeconds()) },
-	m	: function(d)	{ return d.getMinutes() },
-	mm	: function(d)	{ return zeroPad(d.getMinutes()) },
-	h	: function(d)	{ return d.getHours() % 12 || 12 },
-	hh	: function(d)	{ return zeroPad(d.getHours() % 12 || 12) },
-	H	: function(d)	{ return d.getHours() },
-	HH	: function(d)	{ return zeroPad(d.getHours()) },
-	d	: function(d)	{ return d.getDate() },
-	dd	: function(d)	{ return zeroPad(d.getDate()) },
-	ddd	: function(d,o)	{ return o.dayNamesShort[d.getDay()] },
-	dddd: function(d,o)	{ return o.dayNames[d.getDay()] },
-	M	: function(d)	{ return d.getMonth() + 1 },
-	MM	: function(d)	{ return zeroPad(d.getMonth() + 1) },
-	MMM	: function(d,o)	{ return o.monthNamesShort[d.getMonth()] },
-	MMMM: function(d,o)	{ return o.monthNames[d.getMonth()] },
-	yy	: function(d)	{ return (d.getFullYear()+'').substring(2) },
-	yyyy: function(d)	{ return d.getFullYear() },
-	t	: function(d)	{ return d.getHours() < 12 ? 'a' : 'p' },
-	tt	: function(d)	{ return d.getHours() < 12 ? 'am' : 'pm' },
-	T	: function(d)	{ return d.getHours() < 12 ? 'A' : 'P' },
-	TT	: function(d)	{ return d.getHours() < 12 ? 'AM' : 'PM' },
-	u	: function(d)	{ return formatDate(d, "yyyy-MM-dd'T'HH:mm:ss'Z'") },
-	S	: function(d)	{
-		var date = d.getDate();
-		if (date > 10 && date < 20) {
-			return 'th';
-		}
-		return ['st', 'nd', 'rd'][date%10-1] || 'th';
-	}
-};
-
-
-
-fc.applyAll = applyAll;
-
-
-/* Event Date Math
------------------------------------------------------------------------------*/
-
-
-function exclEndDay(event) {
-	if (event.end) {
-		return _exclEndDay(event.end, event.allDay);
-	}else{
-		return addDays(cloneDate(event.start), 1);
-	}
-}
-
-
-function _exclEndDay(end, allDay) {
-	end = cloneDate(end);
-	return allDay || end.getHours() || end.getMinutes() ? addDays(end, 1) : clearTime(end);
-}
-
-
-function segCmp(a, b) {
-	return (b.msLength - a.msLength) * 100 + (a.event.start - b.event.start);
-}
-
-
-function segsCollide(seg1, seg2) {
-	return seg1.end > seg2.start && seg1.start < seg2.end;
-}
-
-
-
-/* Event Sorting
------------------------------------------------------------------------------*/
-
-
-// event rendering utilities
-function sliceSegs(events, visEventEnds, start, end) {
-	var segs = [],
-		i, len=events.length, event,
-		eventStart, eventEnd,
-		segStart, segEnd,
-		isStart, isEnd;
-	for (i=0; i<len; i++) {
-		event = events[i];
-		eventStart = event.start;
-		eventEnd = visEventEnds[i];
-		if (eventEnd > start && eventStart < end) {
-			if (eventStart < start) {
-				segStart = cloneDate(start);
-				isStart = false;
-			}else{
-				segStart = eventStart;
-				isStart = true;
-			}
-			if (eventEnd > end) {
-				segEnd = cloneDate(end);
-				isEnd = false;
-			}else{
-				segEnd = eventEnd;
-				isEnd = true;
-			}
-			segs.push({
-				event: event,
-				start: segStart,
-				end: segEnd,
-				isStart: isStart,
-				isEnd: isEnd,
-				msLength: segEnd - segStart
-			});
-		}
-	}
-	return segs.sort(segCmp);
-}
-
-
-// event rendering calculation utilities
-function stackSegs(segs) {
-	var levels = [],
-		i, len = segs.length, seg,
-		j, collide, k;
-	for (i=0; i<len; i++) {
-		seg = segs[i];
-		j = 0; // the level index where seg should belong
-		while (true) {
-			collide = false;
-			if (levels[j]) {
-				for (k=0; k<levels[j].length; k++) {
-					if (segsCollide(levels[j][k], seg)) {
-						collide = true;
-						break;
-					}
-				}
-			}
-			if (collide) {
-				j++;
-			}else{
-				break;
-			}
-		}
-		if (levels[j]) {
-			levels[j].push(seg);
-		}else{
-			levels[j] = [seg];
-		}
-	}
-	return levels;
-}
-
-
-
-/* Event Element Binding
------------------------------------------------------------------------------*/
-
-
-function lazySegBind(container, segs, bindHandlers) {
-	container.unbind('mouseover').mouseover(function(ev) {
-		var parent=ev.target, e,
-			i, seg;
-		while (parent != this) {
-			e = parent;
-			parent = parent.parentNode;
-		}
-		if ((i = e._fci) !== undefined) {
-			e._fci = undefined;
-			seg = segs[i];
-			bindHandlers(seg.event, seg.element, seg);
-			$(ev.target).trigger(ev);
-		}
-		ev.stopPropagation();
-	});
-}
-
-
-
-/* Element Dimensions
------------------------------------------------------------------------------*/
-
-
-function setOuterWidth(element, width, includeMargins) {
-	for (var i=0, e; i<element.length; i++) {
-		e = $(element[i]);
-		e.width(Math.max(0, width - hsides(e, includeMargins)));
-	}
-}
-
-
-function setOuterHeight(element, height, includeMargins) {
-	for (var i=0, e; i<element.length; i++) {
-		e = $(element[i]);
-		e.height(Math.max(0, height - vsides(e, includeMargins)));
-	}
-}
-
-
-// TODO: curCSS has been deprecated (jQuery 1.4.3 - 10/16/2010)
-
-
-function hsides(element, includeMargins) {
-	return hpadding(element) + hborders(element) + (includeMargins ? hmargins(element) : 0);
-}
-
-
-function hpadding(element) {
-	return (parseFloat($.curCSS(element[0], 'paddingLeft', true)) || 0) +
-	       (parseFloat($.curCSS(element[0], 'paddingRight', true)) || 0);
-}
-
-
-function hmargins(element) {
-	return (parseFloat($.curCSS(element[0], 'marginLeft', true)) || 0) +
-	       (parseFloat($.curCSS(element[0], 'marginRight', true)) || 0);
-}
-
-
-function hborders(element) {
-	return (parseFloat($.curCSS(element[0], 'borderLeftWidth', true)) || 0) +
-	       (parseFloat($.curCSS(element[0], 'borderRightWidth', true)) || 0);
-}
-
-
-function vsides(element, includeMargins) {
-	return vpadding(element) +  vborders(element) + (includeMargins ? vmargins(element) : 0);
-}
-
-
-function vpadding(element) {
-	return (parseFloat($.curCSS(element[0], 'paddingTop', true)) || 0) +
-	       (parseFloat($.curCSS(element[0], 'paddingBottom', true)) || 0);
-}
-
-
-function vmargins(element) {
-	return (parseFloat($.curCSS(element[0], 'marginTop', true)) || 0) +
-	       (parseFloat($.curCSS(element[0], 'marginBottom', true)) || 0);
-}
-
-
-function vborders(element) {
-	return (parseFloat($.curCSS(element[0], 'borderTopWidth', true)) || 0) +
-	       (parseFloat($.curCSS(element[0], 'borderBottomWidth', true)) || 0);
-}
-
-
-function setMinHeight(element, height) {
-	height = (typeof height == 'number' ? height + 'px' : height);
-	element.each(function(i, _element) {
-		_element.style.cssText += ';min-height:' + height + ';_height:' + height;
-		// why can't we just use .css() ? i forget
-	});
-}
-
-
-
-/* Misc Utils
------------------------------------------------------------------------------*/
-
-
-//TODO: arraySlice
-//TODO: isFunction, grep ?
-
-
-function noop() { }
-
-
-function cmp(a, b) {
-	return a - b;
-}
-
-
-function arrayMax(a) {
-	return Math.max.apply(Math, a);
-}
-
-
-function zeroPad(n) {
-	return (n < 10 ? '0' : '') + n;
-}
-
-
-function smartProperty(obj, name) { // get a camel-cased/namespaced property of an object
-	if (obj[name] !== undefined) {
-		return obj[name];
-	}
-	var parts = name.split(/(?=[A-Z])/),
-		i=parts.length-1, res;
-	for (; i>=0; i--) {
-		res = obj[parts[i].toLowerCase()];
-		if (res !== undefined) {
-			return res;
-		}
-	}
-	return obj[''];
-}
-
-
-function htmlEscape(s) {
-	return s.replace(/&/g, '&amp;')
-		.replace(/</g, '&lt;')
-		.replace(/>/g, '&gt;')
-		.replace(/'/g, '&#039;')
-		.replace(/"/g, '&quot;')
-		.replace(/\n/g, '<br />');
-}
-
-
-function cssKey(_element) {
-	return _element.id + '/' + _element.className + '/' + _element.style.cssText.replace(/(^|;)\s*(top|left|width|height)\s*:[^;]*/ig, '');
-}
-
-
-function disableTextSelection(element) {
-	element
-		.attr('unselectable', 'on')
-		.css('MozUserSelect', 'none')
-		.bind('selectstart.ui', function() { return false; });
-}
-
-
-/*
-function enableTextSelection(element) {
-	element
-		.attr('unselectable', 'off')
-		.css('MozUserSelect', '')
-		.unbind('selectstart.ui');
-}
-*/
-
-
-function markFirstLast(e) {
-	e.children()
-		.removeClass('fc-first fc-last')
-		.filter(':first-child')
-			.addClass('fc-first')
-		.end()
-		.filter(':last-child')
-			.addClass('fc-last');
-}
-
-
-function setDayID(cell, date) {
-	cell.each(function(i, _cell) {
-		_cell.className = _cell.className.replace(/^fc-\w*/, 'fc-' + dayIDs[date.getDay()]);
-		// TODO: make a way that doesn't rely on order of classes
-	});
-}
-
-
-function getSkinCss(event, opt) {
-	var source = event.source || {};
-	var eventColor = event.color;
-	var sourceColor = source.color;
-	var optionColor = opt('eventColor');
-	var backgroundColor =
-		event.backgroundColor ||
-		eventColor ||
-		source.backgroundColor ||
-		sourceColor ||
-		opt('eventBackgroundColor') ||
-		optionColor;
-	var borderColor =
-		event.borderColor ||
-		eventColor ||
-		source.borderColor ||
-		sourceColor ||
-		opt('eventBorderColor') ||
-		optionColor;
-	var textColor =
-		event.textColor ||
-		source.textColor ||
-		opt('eventTextColor');
-	var statements = [];
-	if (backgroundColor) {
-		statements.push('background-color:' + backgroundColor);
-	}
-	if (borderColor) {
-		statements.push('border-color:' + borderColor);
-	}
-	if (textColor) {
-		statements.push('color:' + textColor);
-	}
-	return statements.join(';');
-}
-
-
-function applyAll(functions, thisObj, args) {
-	if ($.isFunction(functions)) {
-		functions = [ functions ];
-	}
-	if (functions) {
-		var i;
-		var ret;
-		for (i=0; i<functions.length; i++) {
-			ret = functions[i].apply(thisObj, args) || ret;
-		}
-		return ret;
-	}
-}
-
-
-function firstDefined() {
-	for (var i=0; i<arguments.length; i++) {
-		if (arguments[i] !== undefined) {
-			return arguments[i];
-		}
-	}
-}
-
-
-
-fcViews.month = MonthView;
-
-function MonthView(element, calendar) {
-	var t = this;
-
-
-	// exports
-	t.render = render;
-
-
-	// imports
-	BasicView.call(t, element, calendar, 'month');
-	var opt = t.opt;
-	var renderBasic = t.renderBasic;
-	var formatDate = calendar.formatDate;
-
-
-
-	function render(date, delta) {
-		if (delta) {
-			addMonths(date, delta);
-			date.setDate(1);
-		}
-		var start = cloneDate(date, true);
-		start.setDate(1);
-		var end = addMonths(cloneDate(start), 1);
-		var visStart = cloneDate(start);
-		var visEnd = cloneDate(end);
-		var firstDay = opt('firstDay');
-		var nwe = opt('weekends') ? 0 : 1;
-		if (nwe) {
-			skipWeekend(visStart);
-			skipWeekend(visEnd, -1, true);
-		}
-		addDays(visStart, -((visStart.getDay() - Math.max(firstDay, nwe) + 7) % 7));
-		addDays(visEnd, (7 - visEnd.getDay() + Math.max(firstDay, nwe)) % 7);
-		var rowCnt = Math.round((visEnd - visStart) / (DAY_MS * 7));
-		if (opt('weekMode') == 'fixed') {
-			addDays(visEnd, (6 - rowCnt) * 7);
-			rowCnt = 6;
-		}
-		t.title = formatDate(start, opt('titleFormat'));
-		t.start = start;
-		t.end = end;
-		t.visStart = visStart;
-		t.visEnd = visEnd;
-		renderBasic(6, rowCnt, nwe ? 5 : 7, true);
-	}
-
-
-}
-
-fcViews.basicWeek = BasicWeekView;
-
-function BasicWeekView(element, calendar) {
-	var t = this;
-
-
-	// exports
-	t.render = render;
-
-
-	// imports
-	BasicView.call(t, element, calendar, 'basicWeek');
-	var opt = t.opt;
-	var renderBasic = t.renderBasic;
-	var formatDates = calendar.formatDates;
-
-
-
-	function render(date, delta) {
-		if (delta) {
-			addDays(date, delta * 7);
-		}
-		var start = addDays(cloneDate(date), -((date.getDay() - opt('firstDay') + 7) % 7));
-		var end = addDays(cloneDate(start), 7);
-		var visStart = cloneDate(start);
-		var visEnd = cloneDate(end);
-		var weekends = opt('weekends');
-		if (!weekends) {
-			skipWeekend(visStart);
-			skipWeekend(visEnd, -1, true);
-		}
-		t.title = formatDates(
-			visStart,
-			addDays(cloneDate(visEnd), -1),
-			opt('titleFormat')
-		);
-		t.start = start;
-		t.end = end;
-		t.visStart = visStart;
-		t.visEnd = visEnd;
-		renderBasic(1, 1, weekends ? 7 : 5, false);
-	}
-
-
-}
-
-fcViews.basicDay = BasicDayView;
-
-//TODO: when calendar's date starts out on a weekend, shouldn't happen
-
-
-function BasicDayView(element, calendar) {
-	var t = this;
-
-
-	// exports
-	t.render = render;
-
-
-	// imports
-	BasicView.call(t, element, calendar, 'basicDay');
-	var opt = t.opt;
-	var renderBasic = t.renderBasic;
-	var formatDate = calendar.formatDate;
-
-
-
-	function render(date, delta) {
-		if (delta) {
-			addDays(date, delta);
-			if (!opt('weekends')) {
-				skipWeekend(date, delta < 0 ? -1 : 1);
-			}
-		}
-		t.title = formatDate(date, opt('titleFormat'));
-		t.start = t.visStart = cloneDate(date, true);
-		t.end = t.visEnd = addDays(cloneDate(t.start), 1);
-		renderBasic(1, 1, 1, false);
-	}
-
-
-}
-
-setDefaults({
-	weekMode: 'fixed'
-});
-
-
-function BasicView(element, calendar, viewName) {
-	var t = this;
-
-
-	// exports
-	t.renderBasic = renderBasic;
-	t.setHeight = setHeight;
-	t.setWidth = setWidth;
-	t.renderDayOverlay = renderDayOverlay;
-	t.defaultSelectionEnd = defaultSelectionEnd;
-	t.renderSelection = renderSelection;
-	t.clearSelection = clearSelection;
-	t.reportDayClick = reportDayClick; // for selection (kinda hacky)
-	t.dragStart = dragStart;
-	t.dragStop = dragStop;
-	t.defaultEventEnd = defaultEventEnd;
-	t.getHoverListener = function() { return hoverListener };
-	t.colContentLeft = colContentLeft;
-	t.colContentRight = colContentRight;
-	t.dayOfWeekCol = dayOfWeekCol;
-	t.dateCell = dateCell;
-	t.cellDate = cellDate;
-	t.cellIsAllDay = function() { return true };
-	t.allDayRow = allDayRow;
-	t.allDayBounds = allDayBounds;
-	t.getRowCnt = function() { return rowCnt };
-	t.getColCnt = function() { return colCnt };
-	t.getColWidth = function() { return colWidth };
-	t.getDaySegmentContainer = function() { return daySegmentContainer };
-
-
-	// imports
-	View.call(t, element, calendar, viewName);
-	OverlayManager.call(t);
-	SelectionManager.call(t);
-	BasicEventRenderer.call(t);
-	var opt = t.opt;
-	var trigger = t.trigger;
-	var clearEvents = t.clearEvents;
-	var renderOverlay = t.renderOverlay;
-	var clearOverlays = t.clearOverlays;
-	var daySelectionMousedown = t.daySelectionMousedown;
-	var formatDate = calendar.formatDate;
-
-
-	// locals
-
-	var head;
-	var headCells;
-	var body;
-	var bodyRows;
-	var bodyCells;
-	var bodyFirstCells;
-	var bodyCellTopInners;
-	var daySegmentContainer;
-
-	var viewWidth;
-	var viewHeight;
-	var colWidth;
-
-	var rowCnt, colCnt;
-	var coordinateGrid;
-	var hoverListener;
-	var colContentPositions;
-
-	var rtl, dis, dit;
-	var firstDay;
-	var nwe;
-	var tm;
-	var colFormat;
-
-
-
-	/* Rendering
-	------------------------------------------------------------*/
-
-
-	disableTextSelection(element.addClass('fc-grid'));
-
-
-	function renderBasic(maxr, r, c, showNumbers) {
-		rowCnt = r;
-		colCnt = c;
-		updateOptions();
-		var firstTime = !body;
-		if (firstTime) {
-			buildSkeleton(maxr, showNumbers);
-		}else{
-			clearEvents();
-		}
-		updateCells(firstTime);
-	}
-
-
-
-	function updateOptions() {
-		rtl = opt('isRTL');
-		if (rtl) {
-			dis = -1;
-			dit = colCnt - 1;
-		}else{
-			dis = 1;
-			dit = 0;
-		}
-		firstDay = opt('firstDay');
-		nwe = opt('weekends') ? 0 : 1;
-		tm = opt('theme') ? 'ui' : 'fc';
-		colFormat = opt('columnFormat');
-	}
-
-
-
-	function buildSkeleton(maxRowCnt, showNumbers) {
-		var s;
-		var headerClass = tm + "-widget-header";
-		var contentClass = tm + "-widget-content";
-		var i, j;
-		var table;
-
-		s =
-			"<table class='fc-border-separate' style='width:100%' cellspacing='0'>" +
-			"<thead>" +
-			"<tr>";
-		for (i=0; i<colCnt; i++) {
-			s +=
-				"<th class='fc- " + headerClass + "'/>"; // need fc- for setDayID
-		}
-		s +=
-			"</tr>" +
-			"</thead>" +
-			"<tbody>";
-		for (i=0; i<maxRowCnt; i++) {
-			s +=
-				"<tr class='fc-week" + i + "'>";
-			for (j=0; j<colCnt; j++) {
-				s +=
-					"<td class='fc- " + contentClass + " fc-day" + (i*colCnt+j) + "'>" + // need fc- for setDayID
-					"<div>" +
-					(showNumbers ?
-						"<div class='fc-day-number'/>" :
-						''
-						) +
-					"<div class='fc-day-content'>" +
-					"<div style='position:relative'>&nbsp;</div>" +
-					"</div>" +
-					"</div>" +
-					"</td>";
-			}
-			s +=
-				"</tr>";
-		}
-		s +=
-			"</tbody>" +
-			"</table>";
-		table = $(s).appendTo(element);
-
-		head = table.find('thead');
-		headCells = head.find('th');
-		body = table.find('tbody');
-		bodyRows = body.find('tr');
-		bodyCells = body.find('td');
-		bodyFirstCells = bodyCells.filter(':first-child');
-		bodyCellTopInners = bodyRows.eq(0).find('div.fc-day-content div');
-
-		markFirstLast(head.add(head.find('tr'))); // marks first+last tr/th's
-		markFirstLast(bodyRows); // marks first+last td's
-		bodyRows.eq(0).addClass('fc-first'); // fc-last is done in updateCells
-
-		dayBind(bodyCells);
-
-		daySegmentContainer =
-			$("<div style='position:absolute;z-index:8;top:0;left:0'/>")
-				.appendTo(element);
-	}
-
-
-
-	function updateCells(firstTime) {
-		var dowDirty = firstTime || rowCnt == 1; // could the cells' day-of-weeks need updating?
-		var month = t.start.getMonth();
-		var today = clearTime(new Date());
-		var cell;
-		var date;
-		var row;
-
-		if (dowDirty) {
-			headCells.each(function(i, _cell) {
-				cell = $(_cell);
-				date = indexDate(i);
-				cell.html(formatDate(date, colFormat));
-				setDayID(cell, date);
-			});
-		}
-
-		bodyCells.each(function(i, _cell) {
-			cell = $(_cell);
-			date = indexDate(i);
-			if (date.getMonth() == month) {
-				cell.removeClass('fc-other-month');
-			}else{
-				cell.addClass('fc-other-month');
-			}
-			if (+date == +today) {
-				cell.addClass(tm + '-state-highlight fc-today');
-			}else{
-				cell.removeClass(tm + '-state-highlight fc-today');
-			}
-			cell.find('div.fc-day-number').text(date.getDate());
-			if (dowDirty) {
-				setDayID(cell, date);
-			}
-		});
-
-		bodyRows.each(function(i, _row) {
-			row = $(_row);
-			if (i < rowCnt) {
-				row.show();
-				if (i == rowCnt-1) {
-					row.addClass('fc-last');
-				}else{
-					row.removeClass('fc-last');
-				}
-			}else{
-				row.hide();
-			}
-		});
-	}
-
-
-
-	function setHeight(height) {
-		viewHeight = height;
-
-		var bodyHeight = viewHeight - head.height();
-		var rowHeight;
-		var rowHeightLast;
-		var cell;
-
-		if (opt('weekMode') == 'variable') {
-			rowHeight = rowHeightLast = Math.floor(bodyHeight / (rowCnt==1 ? 2 : 6));
-		}else{
-			rowHeight = Math.floor(bodyHeight / rowCnt);
-			rowHeightLast = bodyHeight - rowHeight * (rowCnt-1);
-		}
-
-		bodyFirstCells.each(function(i, _cell) {
-			if (i < rowCnt) {
-				cell = $(_cell);
-				setMinHeight(
-					cell.find('> div'),
-					(i==rowCnt-1 ? rowHeightLast : rowHeight) - vsides(cell)
-				);
-			}
-		});
-
-	}
-
-
-	function setWidth(width) {
-		viewWidth = width;
-		colContentPositions.clear();
-		colWidth = Math.floor(viewWidth / colCnt);
-		setOuterWidth(headCells.slice(0, -1), colWidth);
-	}
-
-
-
-	/* Day clicking and binding
-	-----------------------------------------------------------*/
-
-
-	function dayBind(days) {
-		days.click(dayClick)
-			.mousedown(daySelectionMousedown);
-	}
-
-
-	function dayClick(ev) {
-		if (!opt('selectable')) { // if selectable, SelectionManager will worry about dayClick
-			var index = parseInt(this.className.match(/fc\-day(\d+)/)[1]); // TODO: maybe use .data
-			var date = indexDate(index);
-			trigger('dayClick', this, date, true, ev);
-		}
-	}
-
-
-
-	/* Semi-transparent Overlay Helpers
-	------------------------------------------------------*/
-
-
-	function renderDayOverlay(overlayStart, overlayEnd, refreshCoordinateGrid) { // overlayEnd is exclusive
-		if (refreshCoordinateGrid) {
-			coordinateGrid.build();
-		}
-		var rowStart = cloneDate(t.visStart);
-		var rowEnd = addDays(cloneDate(rowStart), colCnt);
-		for (var i=0; i<rowCnt; i++) {
-			var stretchStart = new Date(Math.max(rowStart, overlayStart));
-			var stretchEnd = new Date(Math.min(rowEnd, overlayEnd));
-			if (stretchStart < stretchEnd) {
-				var colStart, colEnd;
-				if (rtl) {
-					colStart = dayDiff(stretchEnd, rowStart)*dis+dit+1;
-					colEnd = dayDiff(stretchStart, rowStart)*dis+dit+1;
-				}else{
-					colStart = dayDiff(stretchStart, rowStart);
-					colEnd = dayDiff(stretchEnd, rowStart);
-				}
-				dayBind(
-					renderCellOverlay(i, colStart, i, colEnd-1)
-				);
-			}
-			addDays(rowStart, 7);
-			addDays(rowEnd, 7);
-		}
-	}
-
-
-	function renderCellOverlay(row0, col0, row1, col1) { // row1,col1 is inclusive
-		var rect = coordinateGrid.rect(row0, col0, row1, col1, element);
-		return renderOverlay(rect, element);
-	}
-
-
-
-	/* Selection
-	-----------------------------------------------------------------------*/
-
-
-	function defaultSelectionEnd(startDate, allDay) {
-		return cloneDate(startDate);
-	}
-
-
-	function renderSelection(startDate, endDate, allDay) {
-		renderDayOverlay(startDate, addDays(cloneDate(endDate), 1), true); // rebuild every time???
-	}
-
-
-	function clearSelection() {
-		clearOverlays();
-	}
-
-
-	function reportDayClick(date, allDay, ev) {
-		var cell = dateCell(date);
-		var _element = bodyCells[cell.row*colCnt + cell.col];
-		trigger('dayClick', _element, date, allDay, ev);
-	}
-
-
-
-	/* External Dragging
-	-----------------------------------------------------------------------*/
-
-
-	function dragStart(_dragElement, ev, ui) {
-		hoverListener.start(function(cell) {
-			clearOverlays();
-			if (cell) {
-				renderCellOverlay(cell.row, cell.col, cell.row, cell.col);
-			}
-		}, ev);
-	}
-
-
-	function dragStop(_dragElement, ev, ui) {
-		var cell = hoverListener.stop();
-		clearOverlays();
-		if (cell) {
-			var d = cellDate(cell);
-			trigger('drop', _dragElement, d, true, ev, ui);
-		}
-	}
-
-
-
-	/* Utilities
-	--------------------------------------------------------*/
-
-
-	function defaultEventEnd(event) {
-		return cloneDate(event.start);
-	}
-
-
-	coordinateGrid = new CoordinateGrid(function(rows, cols) {
-		var e, n, p;
-		headCells.each(function(i, _e) {
-			e = $(_e);
-			n = e.offset().left;
-			if (i) {
-				p[1] = n;
-			}
-			p = [n];
-			cols[i] = p;
-		});
-		p[1] = n + e.outerWidth();
-		bodyRows.each(function(i, _e) {
-			if (i < rowCnt) {
-				e = $(_e);
-				n = e.offset().top;
-				if (i) {
-					p[1] = n;
-				}
-				p = [n];
-				rows[i] = p;
-			}
-		});
-		p[1] = n + e.outerHeight();
-	});
-
-
-	hoverListener = new HoverListener(coordinateGrid);
-
-
-	colContentPositions = new HorizontalPositionCache(function(col) {
-		return bodyCellTopInners.eq(col);
-	});
-
-
-	function colContentLeft(col) {
-		return colContentPositions.left(col);
-	}
-
-
-	function colContentRight(col) {
-		return colContentPositions.right(col);
-	}
-
-
-
-
-	function dateCell(date) {
-		return {
-			row: Math.floor(dayDiff(date, t.visStart) / 7),
-			col: dayOfWeekCol(date.getDay())
-		};
-	}
-
-
-	function cellDate(cell) {
-		return _cellDate(cell.row, cell.col);
-	}
-
-
-	function _cellDate(row, col) {
-		return addDays(cloneDate(t.visStart), row*7 + col*dis+dit);
-		// what about weekends in middle of week?
-	}
-
-
-	function indexDate(index) {
-		return _cellDate(Math.floor(index/colCnt), index%colCnt);
-	}
-
-
-	function dayOfWeekCol(dayOfWeek) {
-		return ((dayOfWeek - Math.max(firstDay, nwe) + colCnt) % colCnt) * dis + dit;
-	}
-
-
-
-
-	function allDayRow(i) {
-		return bodyRows.eq(i);
-	}
-
-
-	function allDayBounds(i) {
-		return {
-			left: 0,
-			right: viewWidth
-		};
-	}
-
-
-}
-
-function BasicEventRenderer() {
-	var t = this;
-
-
-	// exports
-	t.renderEvents = renderEvents;
-	t.compileDaySegs = compileSegs; // for DayEventRenderer
-	t.clearEvents = clearEvents;
-	t.bindDaySeg = bindDaySeg;
-
-
-	// imports
-	DayEventRenderer.call(t);
-	var opt = t.opt;
-	var trigger = t.trigger;
-	//var setOverflowHidden = t.setOverflowHidden;
-	var isEventDraggable = t.isEventDraggable;
-	var isEventResizable = t.isEventResizable;
-	var reportEvents = t.reportEvents;
-	var reportEventClear = t.reportEventClear;
-	var eventElementHandlers = t.eventElementHandlers;
-	var showEvents = t.showEvents;
-	var hideEvents = t.hideEvents;
-	var eventDrop = t.eventDrop;
-	var getDaySegmentContainer = t.getDaySegmentContainer;
-	var getHoverListener = t.getHoverListener;
-	var renderDayOverlay = t.renderDayOverlay;
-	var clearOverlays = t.clearOverlays;
-	var getRowCnt = t.getRowCnt;
-	var getColCnt = t.getColCnt;
-	var renderDaySegs = t.renderDaySegs;
-	var resizableDayEvent = t.resizableDayEvent;
-
-
-
-	/* Rendering
-	--------------------------------------------------------------------*/
-
-
-	function renderEvents(events, modifiedEventId) {
-		reportEvents(events);
-		renderDaySegs(compileSegs(events), modifiedEventId);
-	}
-
-
-	function clearEvents() {
-		reportEventClear();
-		getDaySegmentContainer().empty();
-	}
-
-
-	function compileSegs(events) {
-		var rowCnt = getRowCnt(),
-			colCnt = getColCnt(),
-			d1 = cloneDate(t.visStart),
-			d2 = addDays(cloneDate(d1), colCnt),
-			visEventsEnds = $.map(events, exclEndDay),
-			i, row,
-			j, level,
-			k, seg,
-			segs=[];
-		for (i=0; i<rowCnt; i++) {
-			row = stackSegs(sliceSegs(events, visEventsEnds, d1, d2));
-			for (j=0; j<row.length; j++) {
-				level = row[j];
-				for (k=0; k<level.length; k++) {
-					seg = level[k];
-					seg.row = i;
-					seg.level = j; // not needed anymore
-					segs.push(seg);
-				}
-			}
-			addDays(d1, 7);
-			addDays(d2, 7);
-		}
-		return segs;
-	}
-
-
-	function bindDaySeg(event, eventElement, seg) {
-		if (isEventDraggable(event)) {
-			draggableDayEvent(event, eventElement);
-		}
-		if (seg.isEnd && isEventResizable(event)) {
-			resizableDayEvent(event, eventElement, seg);
-		}
-		eventElementHandlers(event, eventElement);
-			// needs to be after, because resizableDayEvent might stopImmediatePropagation on click
-	}
-
-
-
-	/* Dragging
-	----------------------------------------------------------------------------*/
-
-
-	function draggableDayEvent(event, eventElement) {
-		var hoverListener = getHoverListener();
-		var dayDelta;
-		eventElement.draggable({
-			zIndex: 9,
-			delay: 50,
-			opacity: opt('dragOpacity'),
-			revertDuration: opt('dragRevertDuration'),
-			start: function(ev, ui) {
-				trigger('eventDragStart', eventElement, event, ev, ui);
-				hideEvents(event, eventElement);
-				hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
-					eventElement.draggable('option', 'revert', !cell || !rowDelta && !colDelta);
-					clearOverlays();
-					if (cell) {
-						//setOverflowHidden(true);
-						dayDelta = rowDelta*7 + colDelta * (opt('isRTL') ? -1 : 1);
-						renderDayOverlay(
-							addDays(cloneDate(event.start), dayDelta),
-							addDays(exclEndDay(event), dayDelta)
-						);
-					}else{
-						//setOverflowHidden(false);
-						dayDelta = 0;
-					}
-				}, ev, 'drag');
-			},
-			stop: function(ev, ui) {
-				hoverListener.stop();
-				clearOverlays();
-				trigger('eventDragStop', eventElement, event, ev, ui);
-				if (dayDelta) {
-					eventDrop(this, event, dayDelta, 0, event.allDay, ev, ui);
-				}else{
-					eventElement.css('filter', ''); // clear IE opacity side-effects
-					showEvents(event, eventElement);
-				}
-				//setOverflowHidden(false);
-			}
-		});
-	}
-
-
-}
-
-fcViews.agendaWeek = AgendaWeekView;
-
-function AgendaWeekView(element, calendar) {
-	var t = this;
-
-
-	// exports
-	t.render = render;
-
-
-	// imports
-	AgendaView.call(t, element, calendar, 'agendaWeek');
-	var opt = t.opt;
-	var renderAgenda = t.renderAgenda;
-	var formatDates = calendar.formatDates;
-
-
-
-	function render(date, delta) {
-		if (delta) {
-			addDays(date, delta * 7);
-		}
-		var start = addDays(cloneDate(date), -((date.getDay() - opt('firstDay') + 7) % 7));
-		var end = addDays(cloneDate(start), 7);
-		var visStart = cloneDate(start);
-		var visEnd = cloneDate(end);
-		var weekends = opt('weekends');
-		if (!weekends) {
-			skipWeekend(visStart);
-			skipWeekend(visEnd, -1, true);
-		}
-		t.title = formatDates(
-			visStart,
-			addDays(cloneDate(visEnd), -1),
-			opt('titleFormat')
-		);
-		t.start = start;
-		t.end = end;
-		t.visStart = visStart;
-		t.visEnd = visEnd;
-		renderAgenda(weekends ? 7 : 5);
-	}
-
-
-}
-
-fcViews.agendaDay = AgendaDayView;
-
-function AgendaDayView(element, calendar) {
-	var t = this;
-
-
-	// exports
-	t.render = render;
-
-
-	// imports
-	AgendaView.call(t, element, calendar, 'agendaDay');
-	var opt = t.opt;
-	var renderAgenda = t.renderAgenda;
-	var formatDate = calendar.formatDate;
-
-
-
-	function render(date, delta) {
-		if (delta) {
-			addDays(date, delta);
-			if (!opt('weekends')) {
-				skipWeekend(date, delta < 0 ? -1 : 1);
-			}
-		}
-		var start = cloneDate(date, true);
-		var end = addDays(cloneDate(start), 1);
-		t.title = formatDate(date, opt('titleFormat'));
-		t.start = t.visStart = start;
-		t.end = t.visEnd = end;
-		renderAgenda(1);
-	}
-
-
-}
-
-setDefaults({
-	allDaySlot: true,
-	allDayText: 'all-day',
-	firstHour: 6,
-	slotMinutes: 30,
-	defaultEventMinutes: 120,
-	axisFormat: 'h(:mm)tt',
-	timeFormat: {
-		agenda: 'h:mm{ - h:mm}'
-	},
-	dragOpacity: {
-		agenda: .5
-	},
-	minTime: 0,
-	maxTime: 24
-});
-
-
-// TODO: make it work in quirks mode (event corners, all-day height)
-// TODO: test liquid width, especially in IE6
-
-
-function AgendaView(element, calendar, viewName) {
-	var t = this;
-
-
-	// exports
-	t.renderAgenda = renderAgenda;
-	t.setWidth = setWidth;
-	t.setHeight = setHeight;
-	t.beforeHide = beforeHide;
-	t.afterShow = afterShow;
-	t.defaultEventEnd = defaultEventEnd;
-	t.timePosition = timePosition;
-	t.dayOfWeekCol = dayOfWeekCol;
-	t.dateCell = dateCell;
-	t.cellDate = cellDate;
-	t.cellIsAllDay = cellIsAllDay;
-	t.allDayRow = getAllDayRow;
-	t.allDayBounds = allDayBounds;
-	t.getHoverListener = function() { return hoverListener };
-	t.colContentLeft = colContentLeft;
-	t.colContentRight = colContentRight;
-	t.getDaySegmentContainer = function() { return daySegmentContainer };
-	t.getSlotSegmentContainer = function() { return slotSegmentContainer };
-	t.getMinMinute = function() { return minMinute };
-	t.getMaxMinute = function() { return maxMinute };
-	t.getBodyContent = function() { return slotContent }; // !!??
-	t.getRowCnt = function() { return 1 };
-	t.getColCnt = function() { return colCnt };
-	t.getColWidth = function() { return colWidth };
-	t.getSlotHeight = function() { return slotHeight };
-	t.defaultSelectionEnd = defaultSelectionEnd;
-	t.renderDayOverlay = renderDayOverlay;
-	t.renderSelection = renderSelection;
-	t.clearSelection = clearSelection;
-	t.reportDayClick = reportDayClick; // selection mousedown hack
-	t.dragStart = dragStart;
-	t.dragStop = dragStop;
-
-
-	// imports
-	View.call(t, element, calendar, viewName);
-	OverlayManager.call(t);
-	SelectionManager.call(t);
-	AgendaEventRenderer.call(t);
-	var opt = t.opt;
-	var trigger = t.trigger;
-	var clearEvents = t.clearEvents;
-	var renderOverlay = t.renderOverlay;
-	var clearOverlays = t.clearOverlays;
-	var reportSelection = t.reportSelection;
-	var unselect = t.unselect;
-	var daySelectionMousedown = t.daySelectionMousedown;
-	var slotSegHtml = t.slotSegHtml;
-	var formatDate = calendar.formatDate;
-
-
-	// locals
-
-	var dayTable;
-	var dayHead;
-	var dayHeadCells;
-	var dayBody;
-	var dayBodyCells;
-	var dayBodyCellInners;
-	var dayBodyFirstCell;
-	var dayBodyFirstCellStretcher;
-	var slotLayer;
-	var daySegmentContainer;
-	var allDayTable;
-	var allDayRow;
-	var slotScroller;
-	var slotContent;
-	var slotSegmentContainer;
-	var slotTable;
-	var slotTableFirstInner;
-	var axisFirstCells;
-	var gutterCells;
-	var selectionHelper;
-
-	var viewWidth;
-	var viewHeight;
-	var axisWidth;
-	var colWidth;
-	var gutterWidth;
-	var slotHeight; // TODO: what if slotHeight changes? (see issue 650)
-	var savedScrollTop;
-
-	var colCnt;
-	var slotCnt;
-	var coordinateGrid;
-	var hoverListener;
-	var colContentPositions;
-	var slotTopCache = {};
-
-	var tm;
-	var firstDay;
-	var nwe;            // no weekends (int)
-	var rtl, dis, dit;  // day index sign / translate
-	var minMinute, maxMinute;
-	var colFormat;
-
-
-
-	/* Rendering
-	-----------------------------------------------------------------------------*/
-
-
-	disableTextSelection(element.addClass('fc-agenda'));
-
-
-	function renderAgenda(c) {
-		colCnt = c;
-		updateOptions();
-		if (!dayTable) {
-			buildSkeleton();
-		}else{
-			clearEvents();
-		}
-		updateCells();
-	}
-
-
-
-	function updateOptions() {
-		tm = opt('theme') ? 'ui' : 'fc';
-		nwe = opt('weekends') ? 0 : 1;
-		firstDay = opt('firstDay');
-		if (rtl = opt('isRTL')) {
-			dis = -1;
-			dit = colCnt - 1;
-		}else{
-			dis = 1;
-			dit = 0;
-		}
-		minMinute = parseTime(opt('minTime'));
-		maxMinute = parseTime(opt('maxTime'));
-		colFormat = opt('columnFormat');
-	}
-
-
-
-	function buildSkeleton() {
-		var headerClass = tm + "-widget-header";
-		var contentClass = tm + "-widget-content";
-		var s;
-		var i;
-		var d;
-		var maxd;
-		var minutes;
-		var slotNormal = opt('slotMinutes') % 15 == 0;
-
-		s =
-			"<table style='width:100%' class='fc-agenda-days fc-border-separate' cellspacing='0'>" +
-			"<thead>" +
-			"<tr>" +
-			"<th class='fc-agenda-axis " + headerClass + "'>&nbsp;</th>";
-		for (i=0; i<colCnt; i++) {
-			s +=
-				"<th class='fc- fc-col" + i + ' ' + headerClass + "'/>"; // fc- needed for setDayID
-		}
-		s +=
-			"<th class='fc-agenda-gutter " + headerClass + "'>&nbsp;</th>" +
-			"</tr>" +
-			"</thead>" +
-			"<tbody>" +
-			"<tr>" +
-			"<th class='fc-agenda-axis " + headerClass + "'>&nbsp;</th>";
-		for (i=0; i<colCnt; i++) {
-			s +=
-				"<td class='fc- fc-col" + i + ' ' + contentClass + "'>" + // fc- needed for setDayID
-				"<div>" +
-				"<div class='fc-day-content'>" +
-				"<div style='position:relative'>&nbsp;</div>" +
-				"</div>" +
-				"</div>" +
-				"</td>";
-		}
-		s +=
-			"<td class='fc-agenda-gutter " + contentClass + "'>&nbsp;</td>" +
-			"</tr>" +
-			"</tbody>" +
-			"</table>";
-		dayTable = $(s).appendTo(element);
-		dayHead = dayTable.find('thead');
-		dayHeadCells = dayHead.find('th').slice(1, -1);
-		dayBody = dayTable.find('tbody');
-		dayBodyCells = dayBody.find('td').slice(0, -1);
-		dayBodyCellInners = dayBodyCells.find('div.fc-day-content div');
-		dayBodyFirstCell = dayBodyCells.eq(0);
-		dayBodyFirstCellStretcher = dayBodyFirstCell.find('> div');
-
-		markFirstLast(dayHead.add(dayHead.find('tr')));
-		markFirstLast(dayBody.add(dayBody.find('tr')));
-
-		axisFirstCells = dayHead.find('th:first');
-		gutterCells = dayTable.find('.fc-agenda-gutter');
-
-		slotLayer =
-			$("<div style='position:absolute;z-index:2;left:0;width:100%'/>")
-				.appendTo(element);
-
-		if (opt('allDaySlot')) {
-
-			daySegmentContainer =
-				$("<div style='position:absolute;z-index:8;top:0;left:0'/>")
-					.appendTo(slotLayer);
-
-			s =
-				"<table style='width:100%' class='fc-agenda-allday' cellspacing='0'>" +
-				"<tr>" +
-				"<th class='" + headerClass + " fc-agenda-axis'>" + opt('allDayText') + "</th>" +
-				"<td>" +
-				"<div class='fc-day-content'><div style='position:relative'/></div>" +
-				"</td>" +
-				"<th class='" + headerClass + " fc-agenda-gutter'>&nbsp;</th>" +
-				"</tr>" +
-				"</table>";
-			allDayTable = $(s).appendTo(slotLayer);
-			allDayRow = allDayTable.find('tr');
-
-			dayBind(allDayRow.find('td'));
-
-			axisFirstCells = axisFirstCells.add(allDayTable.find('th:first'));
-			gutterCells = gutterCells.add(allDayTable.find('th.fc-agenda-gutter'));
-
-			slotLayer.append(
-				"<div class='fc-agenda-divider " + headerClass + "'>" +
-				"<div class='fc-agenda-divider-inner'/>" +
-				"</div>"
-			);
-
-		}else{
-
-			daySegmentContainer = $([]); // in jQuery 1.4, we can just do $()
-
-		}
-
-		slotScroller =
-			$("<div style='position:absolute;width:100%;overflow-x:hidden;overflow-y:auto'/>")
-				.appendTo(slotLayer);
-
-		slotContent =
-			$("<div style='position:relative;width:100%;overflow:hidden'/>")
-				.appendTo(slotScroller);
-
-		slotSegmentContainer =
-			$("<div style='position:absolute;z-index:8;top:0;left:0'/>")
-				.appendTo(slotContent);
-
-		s =
-			"<table class='fc-agenda-slots' style='width:100%' cellspacing='0'>" +
-			"<tbody>";
-		d = zeroDate();
-		maxd = addMinutes(cloneDate(d), maxMinute);
-		addMinutes(d, minMinute);
-		slotCnt = 0;
-		for (i=0; d < maxd; i++) {
-			minutes = d.getMinutes();
-			s +=
-				"<tr class='fc-slot" + i + ' ' + (!minutes ? '' : 'fc-minor') + "'>" +
-				"<th class='fc-agenda-axis " + headerClass + "'>" +
-				((!slotNormal || !minutes) ? formatDate(d, opt('axisFormat')) : '&nbsp;') +
-				"</th>" +
-				"<td class='" + contentClass + "'>" +
-				"<div style='position:relative'>&nbsp;</div>" +
-				"</td>" +
-				"</tr>";
-			addMinutes(d, opt('slotMinutes'));
-			slotCnt++;
-		}
-		s +=
-			"</tbody>" +
-			"</table>";
-		slotTable = $(s).appendTo(slotContent);
-		slotTableFirstInner = slotTable.find('div:first');
-
-		slotBind(slotTable.find('td'));
-
-		axisFirstCells = axisFirstCells.add(slotTable.find('th:first'));
-	}
-
-
-
-	function updateCells() {
-		var i;
-		var headCell;
-		var bodyCell;
-		var date;
-		var today = clearTime(new Date());
-		for (i=0; i<colCnt; i++) {
-			date = colDate(i);
-			headCell = dayHeadCells.eq(i);
-			headCell.html(formatDate(date, colFormat));
-			bodyCell = dayBodyCells.eq(i);
-			if (+date == +today) {
-				bodyCell.addClass(tm + '-state-highlight fc-today');
-			}else{
-				bodyCell.removeClass(tm + '-state-highlight fc-today');
-			}
-			setDayID(headCell.add(bodyCell), date);
-		}
-	}
-
-
-
-	function setHeight(height, dateChanged) {
-		if (height === undefined) {
-			height = viewHeight;
-		}
-		viewHeight = height;
-		slotTopCache = {};
-
-		var headHeight = dayBody.position().top;
-		var allDayHeight = slotScroller.position().top; // including divider
-		var bodyHeight = Math.min( // total body height, including borders
-			height - headHeight,   // when scrollbars
-			slotTable.height() + allDayHeight + 1 // when no scrollbars. +1 for bottom border
-		);
-
-		dayBodyFirstCellStretcher
-			.height(bodyHeight - vsides(dayBodyFirstCell));
-
-		slotLayer.css('top', headHeight);
-
-		slotScroller.height(bodyHeight - allDayHeight - 1);
-
-		slotHeight = slotTableFirstInner.height() + 1; // +1 for border
-
-		if (dateChanged) {
-			resetScroll();
-		}
-	}
-
-
-
-	function setWidth(width) {
-		viewWidth = width;
-		colContentPositions.clear();
-
-		axisWidth = 0;
-		setOuterWidth(
-			axisFirstCells
-				.width('')
-				.each(function(i, _cell) {
-					axisWidth = Math.max(axisWidth, $(_cell).outerWidth());
-				}),
-			axisWidth
-		);
-
-		var slotTableWidth = slotScroller[0].clientWidth; // needs to be done after axisWidth (for IE7)
-		//slotTable.width(slotTableWidth);
-
-		gutterWidth = slotScroller.width() - slotTableWidth;
-		if (gutterWidth) {
-			setOuterWidth(gutterCells, gutterWidth);
-			gutterCells
-				.show()
-				.prev()
-				.removeClass('fc-last');
-		}else{
-			gutterCells
-				.hide()
-				.prev()
-				.addClass('fc-last');
-		}
-
-		colWidth = Math.floor((slotTableWidth - axisWidth) / colCnt);
-		setOuterWidth(dayHeadCells.slice(0, -1), colWidth);
-	}
-
-
-
-	function resetScroll() {
-		var d0 = zeroDate();
-		var scrollDate = cloneDate(d0);
-		scrollDate.setHours(opt('firstHour'));
-		var top = timePosition(d0, scrollDate) + 1; // +1 for the border
-		function scroll() {
-			slotScroller.scrollTop(top);
-		}
-		scroll();
-		setTimeout(scroll, 0); // overrides any previous scroll state made by the browser
-	}
-
-
-	function beforeHide() {
-		savedScrollTop = slotScroller.scrollTop();
-	}
-
-
-	function afterShow() {
-		slotScroller.scrollTop(savedScrollTop);
-	}
-
-
-
-	/* Slot/Day clicking and binding
-	-----------------------------------------------------------------------*/
-
-
-	function dayBind(cells) {
-		cells.click(slotClick)
-			.mousedown(daySelectionMousedown);
-	}
-
-
-	function slotBind(cells) {
-		cells.click(slotClick)
-			.mousedown(slotSelectionMousedown);
-	}
-
-
-	function slotClick(ev) {
-		if (!opt('selectable')) { // if selectable, SelectionManager will worry about dayClick
-			var col = Math.min(colCnt-1, Math.floor((ev.pageX - dayTable.offset().left - axisWidth) / colWidth));
-			var date = colDate(col);
-			var rowMatch = this.parentNode.className.match(/fc-slot(\d+)/); // TODO: maybe use data
-			if (rowMatch) {
-				var mins = parseInt(rowMatch[1]) * opt('slotMinutes');
-				var hours = Math.floor(mins/60);
-				date.setHours(hours);
-				date.setMinutes(mins%60 + minMinute);
-				trigger('dayClick', dayBodyCells[col], date, false, ev);
-			}else{
-				trigger('dayClick', dayBodyCells[col], date, true, ev);
-			}
-		}
-	}
-
-
-
-	/* Semi-transparent Overlay Helpers
-	-----------------------------------------------------*/
-
-
-	function renderDayOverlay(startDate, endDate, refreshCoordinateGrid) { // endDate is exclusive
-		if (refreshCoordinateGrid) {
-			coordinateGrid.build();
-		}
-		var visStart = cloneDate(t.visStart);
-		var startCol, endCol;
-		if (rtl) {
-			startCol = dayDiff(endDate, visStart)*dis+dit+1;
-			endCol = dayDiff(startDate, visStart)*dis+dit+1;
-		}else{
-			startCol = dayDiff(startDate, visStart);
-			endCol = dayDiff(endDate, visStart);
-		}
-		startCol = Math.max(0, startCol);
-		endCol = Math.min(colCnt, endCol);
-		if (startCol < endCol) {
-			dayBind(
-				renderCellOverlay(0, startCol, 0, endCol-1)
-			);
-		}
-	}
-
-
-	function renderCellOverlay(row0, col0, row1, col1) { // only for all-day?
-		var rect = coordinateGrid.rect(row0, col0, row1, col1, slotLayer);
-		return renderOverlay(rect, slotLayer);
-	}
-
-
-	function renderSlotOverlay(overlayStart, overlayEnd) {
-		var dayStart = cloneDate(t.visStart);
-		var dayEnd = addDays(cloneDate(dayStart), 1);
-		for (var i=0; i<colCnt; i++) {
-			var stretchStart = new Date(Math.max(dayStart, overlayStart));
-			var stretchEnd = new Date(Math.min(dayEnd, overlayEnd));
-			if (stretchStart < stretchEnd) {
-				var col = i*dis+dit;
-				var rect = coordinateGrid.rect(0, col, 0, col, slotContent); // only use it for horizontal coords
-				var top = timePosition(dayStart, stretchStart);
-				var bottom = timePosition(dayStart, stretchEnd);
-				rect.top = top;
-				rect.height = bottom - top;
-				slotBind(
-					renderOverlay(rect, slotContent)
-				);
-			}
-			addDays(dayStart, 1);
-			addDays(dayEnd, 1);
-		}
-	}
-
-
-
-	/* Coordinate Utilities
-	-----------------------------------------------------------------------------*/
-
-
-	coordinateGrid = new CoordinateGrid(function(rows, cols) {
-		var e, n, p;
-		dayHeadCells.each(function(i, _e) {
-			e = $(_e);
-			n = e.offset().left;
-			if (i) {
-				p[1] = n;
-			}
-			p = [n];
-			cols[i] = p;
-		});
-		p[1] = n + e.outerWidth();
-		if (opt('allDaySlot')) {
-			e = allDayRow;
-			n = e.offset().top;
-			rows[0] = [n, n+e.outerHeight()];
-		}
-		var slotTableTop = slotContent.offset().top;
-		var slotScrollerTop = slotScroller.offset().top;
-		var slotScrollerBottom = slotScrollerTop + slotScroller.outerHeight();
-		function constrain(n) {
-			return Math.max(slotScrollerTop, Math.min(slotScrollerBottom, n));
-		}
-		for (var i=0; i<slotCnt; i++) {
-			rows.push([
-				constrain(slotTableTop + slotHeight*i),
-				constrain(slotTableTop + slotHeight*(i+1))
-			]);
-		}
-	});
-
-
-	hoverListener = new HoverListener(coordinateGrid);
-
-
-	colContentPositions = new HorizontalPositionCache(function(col) {
-		return dayBodyCellInners.eq(col);
-	});
-
-
-	function colContentLeft(col) {
-		return colContentPositions.left(col);
-	}
-
-
-	function colContentRight(col) {
-		return colContentPositions.right(col);
-	}
-
-
-
-
-	function dateCell(date) { // "cell" terminology is now confusing
-		return {
-			row: Math.floor(dayDiff(date, t.visStart) / 7),
-			col: dayOfWeekCol(date.getDay())
-		};
-	}
-
-
-	function cellDate(cell) {
-		var d = colDate(cell.col);
-		var slotIndex = cell.row;
-		if (opt('allDaySlot')) {
-			slotIndex--;
-		}
-		if (slotIndex >= 0) {
-			addMinutes(d, minMinute + slotIndex * opt('slotMinutes'));
-		}
-		return d;
-	}
-
-
-	function colDate(col) { // returns dates with 00:00:00
-		return addDays(cloneDate(t.visStart), col*dis+dit);
-	}
-
-
-	function cellIsAllDay(cell) {
-		return opt('allDaySlot') && !cell.row;
-	}
-
-
-	function dayOfWeekCol(dayOfWeek) {
-		return ((dayOfWeek - Math.max(firstDay, nwe) + colCnt) % colCnt)*dis+dit;
-	}
-
-
-
-
-	// get the Y coordinate of the given time on the given day (both Date objects)
-	function timePosition(day, time) { // both date objects. day holds 00:00 of current day
-		day = cloneDate(day, true);
-		if (time < addMinutes(cloneDate(day), minMinute)) {
-			return 0;
-		}
-		if (time >= addMinutes(cloneDate(day), maxMinute)) {
-			return slotTable.height();
-		}
-		var slotMinutes = opt('slotMinutes'),
-			minutes = time.getHours()*60 + time.getMinutes() - minMinute,
-			slotI = Math.floor(minutes / slotMinutes),
-			slotTop = slotTopCache[slotI];
-		if (slotTop === undefined) {
-			slotTop = slotTopCache[slotI] = slotTable.find('tr:eq(' + slotI + ') td div')[0].offsetTop; //.position().top; // need this optimization???
-		}
-		return Math.max(0, Math.round(
-			slotTop - 1 + slotHeight * ((minutes % slotMinutes) / slotMinutes)
-		));
-	}
-
-
-	function allDayBounds() {
-		return {
-			left: axisWidth,
-			right: viewWidth - gutterWidth
-		}
-	}
-
-
-	function getAllDayRow(index) {
-		return allDayRow;
-	}
-
-
-	function defaultEventEnd(event) {
-		var start = cloneDate(event.start);
-		if (event.allDay) {
-			return start;
-		}
-		return addMinutes(start, opt('defaultEventMinutes'));
-	}
-
-
-
-	/* Selection
-	---------------------------------------------------------------------------------*/
-
-
-	function defaultSelectionEnd(startDate, allDay) {
-		if (allDay) {
-			return cloneDate(startDate);
-		}
-		return addMinutes(cloneDate(startDate), opt('slotMinutes'));
-	}
-
-
-	function renderSelection(startDate, endDate, allDay) { // only for all-day
-		if (allDay) {
-			if (opt('allDaySlot')) {
-				renderDayOverlay(startDate, addDays(cloneDate(endDate), 1), true);
-			}
-		}else{
-			renderSlotSelection(startDate, endDate);
-		}
-	}
-
-
-	function renderSlotSelection(startDate, endDate) {
-		var helperOption = opt('selectHelper');
-		coordinateGrid.build();
-		if (helperOption) {
-			var col = dayDiff(startDate, t.visStart) * dis + dit;
-			if (col >= 0 && col < colCnt) { // only works when times are on same day
-				var rect = coordinateGrid.rect(0, col, 0, col, slotContent); // only for horizontal coords
-				var top = timePosition(startDate, startDate);
-				var bottom = timePosition(startDate, endDate);
-				if (bottom > top) { // protect against selections that are entirely before or after visible range
-					rect.top = top;
-					rect.height = bottom - top;
-					rect.left += 2;
-					rect.width -= 5;
-					if ($.isFunction(helperOption)) {
-						var helperRes = helperOption(startDate, endDate);
-						if (helperRes) {
-							rect.position = 'absolute';
-							rect.zIndex = 8;
-							selectionHelper = $(helperRes)
-								.css(rect)
-								.appendTo(slotContent);
-						}
-					}else{
-						rect.isStart = true; // conside rect a "seg" now
-						rect.isEnd = true;   //
-						selectionHelper = $(slotSegHtml(
-							{
-								title: '',
-								start: startDate,
-								end: endDate,
-								className: ['fc-select-helper'],
-								editable: false
-							},
-							rect
-						));
-						selectionHelper.css('opacity', opt('dragOpacity'));
-					}
-					if (selectionHelper) {
-						slotBind(selectionHelper);
-						slotContent.append(selectionHelper);
-						setOuterWidth(selectionHelper, rect.width, true); // needs to be after appended
-						setOuterHeight(selectionHelper, rect.height, true);
-					}
-				}
-			}
-		}else{
-			renderSlotOverlay(startDate, endDate);
-		}
-	}
-
-
-	function clearSelection() {
-		clearOverlays();
-		if (selectionHelper) {
-			selectionHelper.remove();
-			selectionHelper = null;
-		}
-	}
-
-
-	function slotSelectionMousedown(ev) {
-		if (ev.which == 1 && opt('selectable')) { // ev.which==1 means left mouse button
-			unselect(ev);
-			var dates;
-			hoverListener.start(function(cell, origCell) {
-				clearSelection();
-				if (cell && cell.col == origCell.col && !cellIsAllDay(cell)) {
-					var d1 = cellDate(origCell);
-					var d2 = cellDate(cell);
-					dates = [
-						d1,
-						addMinutes(cloneDate(d1), opt('slotMinutes')),
-						d2,
-						addMinutes(cloneDate(d2), opt('slotMinutes'))
-					].sort(cmp);
-					renderSlotSelection(dates[0], dates[3]);
-				}else{
-					dates = null;
-				}
-			}, ev);
-			$(document).one('mouseup', function(ev) {
-				hoverListener.stop();
-				if (dates) {
-					if (+dates[0] == +dates[1]) {
-						reportDayClick(dates[0], false, ev);
-					}
-					reportSelection(dates[0], dates[3], false, ev);
-				}
-			});
-		}
-	}
-
-
-	function reportDayClick(date, allDay, ev) {
-		trigger('dayClick', dayBodyCells[dayOfWeekCol(date.getDay())], date, allDay, ev);
-	}
-
-
-
-	/* External Dragging
-	--------------------------------------------------------------------------------*/
-
-
-	function dragStart(_dragElement, ev, ui) {
-		hoverListener.start(function(cell) {
-			clearOverlays();
-			if (cell) {
-				if (cellIsAllDay(cell)) {
-					renderCellOverlay(cell.row, cell.col, cell.row, cell.col);
-				}else{
-					var d1 = cellDate(cell);
-					var d2 = addMinutes(cloneDate(d1), opt('defaultEventMinutes'));
-					renderSlotOverlay(d1, d2);
-				}
-			}
-		}, ev);
-	}
-
-
-	function dragStop(_dragElement, ev, ui) {
-		var cell = hoverListener.stop();
-		clearOverlays();
-		if (cell) {
-			trigger('drop', _dragElement, cellDate(cell), cellIsAllDay(cell), ev, ui);
-		}
-	}
-
-
-}
-
-function AgendaEventRenderer() {
-	var t = this;
-
-
-	// exports
-	t.renderEvents = renderEvents;
-	t.compileDaySegs = compileDaySegs; // for DayEventRenderer
-	t.clearEvents = clearEvents;
-	t.slotSegHtml = slotSegHtml;
-	t.bindDaySeg = bindDaySeg;
-
-
-	// imports
-	DayEventRenderer.call(t);
-	var opt = t.opt;
-	var trigger = t.trigger;
-	//var setOverflowHidden = t.setOverflowHidden;
-	var isEventDraggable = t.isEventDraggable;
-	var isEventResizable = t.isEventResizable;
-	var eventEnd = t.eventEnd;
-	var reportEvents = t.reportEvents;
-	var reportEventClear = t.reportEventClear;
-	var eventElementHandlers = t.eventElementHandlers;
-	var setHeight = t.setHeight;
-	var getDaySegmentContainer = t.getDaySegmentContainer;
-	var getSlotSegmentContainer = t.getSlotSegmentContainer;
-	var getHoverListener = t.getHoverListener;
-	var getMaxMinute = t.getMaxMinute;
-	var getMinMinute = t.getMinMinute;
-	var timePosition = t.timePosition;
-	var colContentLeft = t.colContentLeft;
-	var colContentRight = t.colContentRight;
-	var renderDaySegs = t.renderDaySegs;
-	var resizableDayEvent = t.resizableDayEvent; // TODO: streamline binding architecture
-	var getColCnt = t.getColCnt;
-	var getColWidth = t.getColWidth;
-	var getSlotHeight = t.getSlotHeight;
-	var getBodyContent = t.getBodyContent;
-	var reportEventElement = t.reportEventElement;
-	var showEvents = t.showEvents;
-	var hideEvents = t.hideEvents;
-	var eventDrop = t.eventDrop;
-	var eventResize = t.eventResize;
-	var renderDayOverlay = t.renderDayOverlay;
-	var clearOverlays = t.clearOverlays;
-	var calendar = t.calendar;
-	var formatDate = calendar.formatDate;
-	var formatDates = calendar.formatDates;
-
-
-
-	/* Rendering
-	----------------------------------------------------------------------------*/
-
-
-	function renderEvents(events, modifiedEventId) {
-		reportEvents(events);
-		var i, len=events.length,
-			dayEvents=[],
-			slotEvents=[];
-		for (i=0; i<len; i++) {
-			if (events[i].allDay) {
-				dayEvents.push(events[i]);
-			}else{
-				slotEvents.push(events[i]);
-			}
-		}
-		if (opt('allDaySlot')) {
-			renderDaySegs(compileDaySegs(dayEvents), modifiedEventId);
-			setHeight(); // no params means set to viewHeight
-		}
-		renderSlotSegs(compileSlotSegs(slotEvents), modifiedEventId);
-	}
-
-
-	function clearEvents() {
-		reportEventClear();
-		getDaySegmentContainer().empty();
-		getSlotSegmentContainer().empty();
-	}
-
-
-	function compileDaySegs(events) {
-		var levels = stackSegs(sliceSegs(events, $.map(events, exclEndDay), t.visStart, t.visEnd)),
-			i, levelCnt=levels.length, level,
-			j, seg,
-			segs=[];
-		for (i=0; i<levelCnt; i++) {
-			level = levels[i];
-			for (j=0; j<level.length; j++) {
-				seg = level[j];
-				seg.row = 0;
-				seg.level = i; // not needed anymore
-				segs.push(seg);
-			}
-		}
-		return segs;
-	}
-
-
-	function compileSlotSegs(events) {
-		var colCnt = getColCnt(),
-			minMinute = getMinMinute(),
-			maxMinute = getMaxMinute(),
-			d = addMinutes(cloneDate(t.visStart), minMinute),
-			visEventEnds = $.map(events, slotEventEnd),
-			i, col,
-			j, level,
-			k, seg,
-			segs=[];
-		for (i=0; i<colCnt; i++) {
-			col = stackSegs(sliceSegs(events, visEventEnds, d, addMinutes(cloneDate(d), maxMinute-minMinute)));
-			countForwardSegs(col);
-			for (j=0; j<col.length; j++) {
-				level = col[j];
-				for (k=0; k<level.length; k++) {
-					seg = level[k];
-					seg.col = i;
-					seg.level = j;
-					segs.push(seg);
-				}
-			}
-			addDays(d, 1, true);
-		}
-		return segs;
-	}
-
-
-	function slotEventEnd(event) {
-		if (event.end) {
-			return cloneDate(event.end);
-		}else{
-			return addMinutes(cloneDate(event.start), opt('defaultEventMinutes'));
-		}
-	}
-
-
-	// renders events in the 'time slots' at the bottom
-
-	function renderSlotSegs(segs, modifiedEventId) {
-
-		var i, segCnt=segs.length, seg,
-			event,
-			classes,
-			top, bottom,
-			colI, levelI, forward,
-			leftmost,
-			availWidth,
-			outerWidth,
-			left,
-			html='',
-			eventElements,
-			eventElement,
-			triggerRes,
-			vsideCache={},
-			hsideCache={},
-			key, val,
-			contentElement,
-			height,
-			slotSegmentContainer = getSlotSegmentContainer(),
-			rtl, dis, dit,
-			colCnt = getColCnt();
-
-		if (rtl = opt('isRTL')) {
-			dis = -1;
-			dit = colCnt - 1;
-		}else{
-			dis = 1;
-			dit = 0;
-		}
-
-		// calculate position/dimensions, create html
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			event = seg.event;
-			top = timePosition(seg.start, seg.start);
-			bottom = timePosition(seg.start, seg.end);
-			colI = seg.col;
-			levelI = seg.level;
-			forward = seg.forward || 0;
-			leftmost = colContentLeft(colI*dis + dit);
-			availWidth = colContentRight(colI*dis + dit) - leftmost;
-			availWidth = Math.min(availWidth-6, availWidth*.95); // TODO: move this to CSS
-			if (levelI) {
-				// indented and thin
-				outerWidth = availWidth / (levelI + forward + 1);
-			}else{
-				if (forward) {
-					// moderately wide, aligned left still
-					outerWidth = ((availWidth / (forward + 1)) - (12/2)) * 2; // 12 is the predicted width of resizer =
-				}else{
-					// can be entire width, aligned left
-					outerWidth = availWidth;
-				}
-			}
-			left = leftmost +                                  // leftmost possible
-				(availWidth / (levelI + forward + 1) * levelI) // indentation
-				* dis + (rtl ? availWidth - outerWidth : 0);   // rtl
-			seg.top = top;
-			seg.left = left;
-			seg.outerWidth = outerWidth;
-			seg.outerHeight = bottom - top;
-			html += slotSegHtml(event, seg);
-		}
-		slotSegmentContainer[0].innerHTML = html; // faster than html()
-		eventElements = slotSegmentContainer.children();
-
-		// retrieve elements, run through eventRender callback, bind event handlers
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			event = seg.event;
-			eventElement = $(eventElements[i]); // faster than eq()
-			triggerRes = trigger('eventRender', event, event, eventElement);
-			if (triggerRes === false) {
-				eventElement.remove();
-			}else{
-				if (triggerRes && triggerRes !== true) {
-					eventElement.remove();
-					eventElement = $(triggerRes)
-						.css({
-							position: 'absolute',
-							top: seg.top,
-							left: seg.left
-						})
-						.appendTo(slotSegmentContainer);
-				}
-				seg.element = eventElement;
-				if (event._id === modifiedEventId) {
-					bindSlotSeg(event, eventElement, seg);
-				}else{
-					eventElement[0]._fci = i; // for lazySegBind
-				}
-				reportEventElement(event, eventElement);
-			}
-		}
-
-		lazySegBind(slotSegmentContainer, segs, bindSlotSeg);
-
-		// record event sides and title positions
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			if (eventElement = seg.element) {
-				val = vsideCache[key = seg.key = cssKey(eventElement[0])];
-				seg.vsides = val === undefined ? (vsideCache[key] = vsides(eventElement, true)) : val;
-				val = hsideCache[key];
-				seg.hsides = val === undefined ? (hsideCache[key] = hsides(eventElement, true)) : val;
-				contentElement = eventElement.find('div.fc-event-content');
-				if (contentElement.length) {
-					seg.contentTop = contentElement[0].offsetTop;
-				}
-			}
-		}
-
-		// set all positions/dimensions at once
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			if (eventElement = seg.element) {
-				eventElement[0].style.width = Math.max(0, seg.outerWidth - seg.hsides) + 'px';
-				height = Math.max(0, seg.outerHeight - seg.vsides);
-				eventElement[0].style.height = height + 'px';
-				event = seg.event;
-				if (seg.contentTop !== undefined && height - seg.contentTop < 10) {
-					// not enough room for title, put it in the time header
-					eventElement.find('div.fc-event-time')
-						.text(formatDate(event.start, opt('timeFormat')) + ' - ' + event.title);
-					eventElement.find('div.fc-event-title')
-						.remove();
-				}
-				trigger('eventAfterRender', event, event, eventElement);
-			}
-		}
-
-	}
-
-
-	function slotSegHtml(event, seg) {
-		var html = "<";
-		var url = event.url;
-		var skinCss = getSkinCss(event, opt);
-		var skinCssAttr = (skinCss ? " style='" + skinCss + "'" : '');
-		var classes = ['fc-event', 'fc-event-skin', 'fc-event-vert'];
-		if (isEventDraggable(event)) {
-			classes.push('fc-event-draggable');
-		}
-		if (seg.isStart) {
-			classes.push('fc-corner-top');
-		}
-		if (seg.isEnd) {
-			classes.push('fc-corner-bottom');
-		}
-		classes = classes.concat(event.className);
-		if (event.source) {
-			classes = classes.concat(event.source.className || []);
-		}
-		if (url) {
-			html += "a href='" + htmlEscape(event.url) + "'";
-		}else{
-			html += "div";
-		}
-		html +=
-			" class='" + classes.join(' ') + "'" +
-			" style='position:absolute;z-index:8;top:" + seg.top + "px;left:" + seg.left + "px;" + skinCss + "'" +
-			">" +
-			"<div class='fc-event-inner fc-event-skin'" + skinCssAttr + ">" +
-			"<div class='fc-event-head fc-event-skin'" + skinCssAttr + ">" +
-			"<div class='fc-event-time'>" +
-			htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) +
-			"</div>" +
-			"</div>" +
-			"<div class='fc-event-content'>" +
-			"<div class='fc-event-title'>" +
-			htmlEscape(event.title) +
-			"</div>" +
-			"</div>" +
-			"<div class='fc-event-bg'></div>" +
-			"</div>"; // close inner
-		if (seg.isEnd && isEventResizable(event)) {
-			html +=
-				"<div class='ui-resizable-handle ui-resizable-s'>=</div>";
-		}
-		html +=
-			"</" + (url ? "a" : "div") + ">";
-		return html;
-	}
-
-
-	function bindDaySeg(event, eventElement, seg) {
-		if (isEventDraggable(event)) {
-			draggableDayEvent(event, eventElement, seg.isStart);
-		}
-		if (seg.isEnd && isEventResizable(event)) {
-			resizableDayEvent(event, eventElement, seg);
-		}
-		eventElementHandlers(event, eventElement);
-			// needs to be after, because resizableDayEvent might stopImmediatePropagation on click
-	}
-
-
-	function bindSlotSeg(event, eventElement, seg) {
-		var timeElement = eventElement.find('div.fc-event-time');
-		if (isEventDraggable(event)) {
-			draggableSlotEvent(event, eventElement, timeElement);
-		}
-		if (seg.isEnd && isEventResizable(event)) {
-			resizableSlotEvent(event, eventElement, timeElement);
-		}
-		eventElementHandlers(event, eventElement);
-	}
-
-
-
-	/* Dragging
-	-----------------------------------------------------------------------------------*/
-
-
-	// when event starts out FULL-DAY
-
-	function draggableDayEvent(event, eventElement, isStart) {
-		var origWidth;
-		var revert;
-		var allDay=true;
-		var dayDelta;
-		var dis = opt('isRTL') ? -1 : 1;
-		var hoverListener = getHoverListener();
-		var colWidth = getColWidth();
-		var slotHeight = getSlotHeight();
-		var minMinute = getMinMinute();
-		eventElement.draggable({
-			zIndex: 9,
-			opacity: opt('dragOpacity', 'month'), // use whatever the month view was using
-			revertDuration: opt('dragRevertDuration'),
-			start: function(ev, ui) {
-				trigger('eventDragStart', eventElement, event, ev, ui);
-				hideEvents(event, eventElement);
-				origWidth = eventElement.width();
-				hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
-					clearOverlays();
-					if (cell) {
-						//setOverflowHidden(true);
-						revert = false;
-						dayDelta = colDelta * dis;
-						if (!cell.row) {
-							// on full-days
-							renderDayOverlay(
-								addDays(cloneDate(event.start), dayDelta),
-								addDays(exclEndDay(event), dayDelta)
-							);
-							resetElement();
-						}else{
-							// mouse is over bottom slots
-							if (isStart) {
-								if (allDay) {
-									// convert event to temporary slot-event
-									eventElement.width(colWidth - 10); // don't use entire width
-									setOuterHeight(
-										eventElement,
-										slotHeight * Math.round(
-											(event.end ? ((event.end - event.start) / MINUTE_MS) : opt('defaultEventMinutes'))
-											/ opt('slotMinutes')
-										)
-									);
-									eventElement.draggable('option', 'grid', [colWidth, 1]);
-									allDay = false;
-								}
-							}else{
-								revert = true;
-							}
-						}
-						revert = revert || (allDay && !dayDelta);
-					}else{
-						resetElement();
-						//setOverflowHidden(false);
-						revert = true;
-					}
-					eventElement.draggable('option', 'revert', revert);
-				}, ev, 'drag');
-			},
-			stop: function(ev, ui) {
-				hoverListener.stop();
-				clearOverlays();
-				trigger('eventDragStop', eventElement, event, ev, ui);
-				if (revert) {
-					// hasn't moved or is out of bounds (draggable has already reverted)
-					resetElement();
-					eventElement.css('filter', ''); // clear IE opacity side-effects
-					showEvents(event, eventElement);
-				}else{
-					// changed!
-					var minuteDelta = 0;
-					if (!allDay) {
-						minuteDelta = Math.round((eventElement.offset().top - getBodyContent().offset().top) / slotHeight)
-							* opt('slotMinutes')
-							+ minMinute
-							- (event.start.getHours() * 60 + event.start.getMinutes());
-					}
-					eventDrop(this, event, dayDelta, minuteDelta, allDay, ev, ui);
-				}
-				//setOverflowHidden(false);
-			}
-		});
-		function resetElement() {
-			if (!allDay) {
-				eventElement
-					.width(origWidth)
-					.height('')
-					.draggable('option', 'grid', null);
-				allDay = true;
-			}
-		}
-	}
-
-
-	// when event starts out IN TIMESLOTS
-
-	function draggableSlotEvent(event, eventElement, timeElement) {
-		var origPosition;
-		var allDay=false;
-		var dayDelta;
-		var minuteDelta;
-		var prevMinuteDelta;
-		var dis = opt('isRTL') ? -1 : 1;
-		var hoverListener = getHoverListener();
-		var colCnt = getColCnt();
-		var colWidth = getColWidth();
-		var slotHeight = getSlotHeight();
-		eventElement.draggable({
-			zIndex: 9,
-			scroll: false,
-			grid: [colWidth, slotHeight],
-			axis: colCnt==1 ? 'y' : false,
-			opacity: opt('dragOpacity'),
-			revertDuration: opt('dragRevertDuration'),
-			start: function(ev, ui) {
-				trigger('eventDragStart', eventElement, event, ev, ui);
-				hideEvents(event, eventElement);
-				origPosition = eventElement.position();
-				minuteDelta = prevMinuteDelta = 0;
-				hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
-					eventElement.draggable('option', 'revert', !cell);
-					clearOverlays();
-					if (cell) {
-						dayDelta = colDelta * dis;
-						if (opt('allDaySlot') && !cell.row) {
-							// over full days
-							if (!allDay) {
-								// convert to temporary all-day event
-								allDay = true;
-								timeElement.hide();
-								eventElement.draggable('option', 'grid', null);
-							}
-							renderDayOverlay(
-								addDays(cloneDate(event.start), dayDelta),
-								addDays(exclEndDay(event), dayDelta)
-							);
-						}else{
-							// on slots
-							resetElement();
-						}
-					}
-				}, ev, 'drag');
-			},
-			drag: function(ev, ui) {
-				minuteDelta = Math.round((ui.position.top - origPosition.top) / slotHeight) * opt('slotMinutes');
-				if (minuteDelta != prevMinuteDelta) {
-					if (!allDay) {
-						updateTimeText(minuteDelta);
-					}
-					prevMinuteDelta = minuteDelta;
-				}
-			},
-			stop: function(ev, ui) {
-				var cell = hoverListener.stop();
-				clearOverlays();
-				trigger('eventDragStop', eventElement, event, ev, ui);
-				if (cell && (dayDelta || minuteDelta || allDay)) {
-					// changed!
-					eventDrop(this, event, dayDelta, allDay ? 0 : minuteDelta, allDay, ev, ui);
-				}else{
-					// either no change or out-of-bounds (draggable has already reverted)
-					resetElement();
-					eventElement.css('filter', ''); // clear IE opacity side-effects
-					eventElement.css(origPosition); // sometimes fast drags make event revert to wrong position
-					updateTimeText(0);
-					showEvents(event, eventElement);
-				}
-			}
-		});
-		function updateTimeText(minuteDelta) {
-			var newStart = addMinutes(cloneDate(event.start), minuteDelta);
-			var newEnd;
-			if (event.end) {
-				newEnd = addMinutes(cloneDate(event.end), minuteDelta);
-			}
-			timeElement.text(formatDates(newStart, newEnd, opt('timeFormat')));
-		}
-		function resetElement() {
-			// convert back to original slot-event
-			if (allDay) {
-				timeElement.css('display', ''); // show() was causing display=inline
-				eventElement.draggable('option', 'grid', [colWidth, slotHeight]);
-				allDay = false;
-			}
-		}
-	}
-
-
-
-	/* Resizing
-	--------------------------------------------------------------------------------------*/
-
-
-	function resizableSlotEvent(event, eventElement, timeElement) {
-		var slotDelta, prevSlotDelta;
-		var slotHeight = getSlotHeight();
-		eventElement.resizable({
-			handles: {
-				s: 'div.ui-resizable-s'
-			},
-			grid: slotHeight,
-			start: function(ev, ui) {
-				slotDelta = prevSlotDelta = 0;
-				hideEvents(event, eventElement);
-				eventElement.css('z-index', 9);
-				trigger('eventResizeStart', this, event, ev, ui);
-			},
-			resize: function(ev, ui) {
-				// don't rely on ui.size.height, doesn't take grid into account
-				slotDelta = Math.round((Math.max(slotHeight, eventElement.height()) - ui.originalSize.height) / slotHeight);
-				if (slotDelta != prevSlotDelta) {
-					timeElement.text(
-						formatDates(
-							event.start,
-							(!slotDelta && !event.end) ? null : // no change, so don't display time range
-								addMinutes(eventEnd(event), opt('slotMinutes')*slotDelta),
-							opt('timeFormat')
-						)
-					);
-					prevSlotDelta = slotDelta;
-				}
-			},
-			stop: function(ev, ui) {
-				trigger('eventResizeStop', this, event, ev, ui);
-				if (slotDelta) {
-					eventResize(this, event, 0, opt('slotMinutes')*slotDelta, ev, ui);
-				}else{
-					eventElement.css('z-index', 8);
-					showEvents(event, eventElement);
-					// BUG: if event was really short, need to put title back in span
-				}
-			}
-		});
-	}
-
-
-}
-
-
-function countForwardSegs(levels) {
-	var i, j, k, level, segForward, segBack;
-	for (i=levels.length-1; i>0; i--) {
-		level = levels[i];
-		for (j=0; j<level.length; j++) {
-			segForward = level[j];
-			for (k=0; k<levels[i-1].length; k++) {
-				segBack = levels[i-1][k];
-				if (segsCollide(segForward, segBack)) {
-					segBack.forward = Math.max(segBack.forward||0, (segForward.forward||0)+1);
-				}
-			}
-		}
-	}
-}
-
-
-
-
-function View(element, calendar, viewName) {
-	var t = this;
-
-
-	// exports
-	t.element = element;
-	t.calendar = calendar;
-	t.name = viewName;
-	t.opt = opt;
-	t.trigger = trigger;
-	//t.setOverflowHidden = setOverflowHidden;
-	t.isEventDraggable = isEventDraggable;
-	t.isEventResizable = isEventResizable;
-	t.reportEvents = reportEvents;
-	t.eventEnd = eventEnd;
-	t.reportEventElement = reportEventElement;
-	t.reportEventClear = reportEventClear;
-	t.eventElementHandlers = eventElementHandlers;
-	t.showEvents = showEvents;
-	t.hideEvents = hideEvents;
-	t.eventDrop = eventDrop;
-	t.eventResize = eventResize;
-	// t.title
-	// t.start, t.end
-	// t.visStart, t.visEnd
-
-
-	// imports
-	var defaultEventEnd = t.defaultEventEnd;
-	var normalizeEvent = calendar.normalizeEvent; // in EventManager
-	var reportEventChange = calendar.reportEventChange;
-
-
-	// locals
-	var eventsByID = {};
-	var eventElements = [];
-	var eventElementsByID = {};
-	var options = calendar.options;
-
-
-
-	function opt(name, viewNameOverride) {
-		var v = options[name];
-		if (typeof v == 'object') {
-			return smartProperty(v, viewNameOverride || viewName);
-		}
-		return v;
-	}
-
-
-	function trigger(name, thisObj) {
-		return calendar.trigger.apply(
-			calendar,
-			[name, thisObj || t].concat(Array.prototype.slice.call(arguments, 2), [t])
-		);
-	}
-
-
-	/*
-	function setOverflowHidden(bool) {
-		element.css('overflow', bool ? 'hidden' : '');
-	}
-	*/
-
-
-	function isEventDraggable(event) {
-		return isEventEditable(event) && !opt('disableDragging');
-	}
-
-
-	function isEventResizable(event) { // but also need to make sure the seg.isEnd == true
-		return isEventEditable(event) && !opt('disableResizing');
-	}
-
-
-	function isEventEditable(event) {
-		return firstDefined(event.editable, (event.source || {}).editable, opt('editable'));
-	}
-
-
-
-	/* Event Data
-	------------------------------------------------------------------------------*/
-
-
-	// report when view receives new events
-	function reportEvents(events) { // events are already normalized at this point
-		eventsByID = {};
-		var i, len=events.length, event;
-		for (i=0; i<len; i++) {
-			event = events[i];
-			if (eventsByID[event._id]) {
-				eventsByID[event._id].push(event);
-			}else{
-				eventsByID[event._id] = [event];
-			}
-		}
-	}
-
-
-	// returns a Date object for an event's end
-	function eventEnd(event) {
-		return event.end ? cloneDate(event.end) : defaultEventEnd(event);
-	}
-
-
-
-	/* Event Elements
-	------------------------------------------------------------------------------*/
-
-
-	// report when view creates an element for an event
-	function reportEventElement(event, element) {
-		eventElements.push(element);
-		if (eventElementsByID[event._id]) {
-			eventElementsByID[event._id].push(element);
-		}else{
-			eventElementsByID[event._id] = [element];
-		}
-	}
-
-
-	function reportEventClear() {
-		eventElements = [];
-		eventElementsByID = {};
-	}
-
-
-	// attaches eventClick, eventMouseover, eventMouseout
-	function eventElementHandlers(event, eventElement) {
-		eventElement
-			.click(function(ev) {
-				if (!eventElement.hasClass('ui-draggable-dragging') &&
-					!eventElement.hasClass('ui-resizable-resizing')) {
-						return trigger('eventClick', this, event, ev);
-					}
-			})
-			.hover(
-				function(ev) {
-					trigger('eventMouseover', this, event, ev);
-				},
-				function(ev) {
-					trigger('eventMouseout', this, event, ev);
-				}
-			);
-		// TODO: don't fire eventMouseover/eventMouseout *while* dragging is occuring (on subject element)
-		// TODO: same for resizing
-	}
-
-
-	function showEvents(event, exceptElement) {
-		eachEventElement(event, exceptElement, 'show');
-	}
-
-
-	function hideEvents(event, exceptElement) {
-		eachEventElement(event, exceptElement, 'hide');
-	}
-
-
-	function eachEventElement(event, exceptElement, funcName) {
-		var elements = eventElementsByID[event._id],
-			i, len = elements.length;
-		for (i=0; i<len; i++) {
-			if (!exceptElement || elements[i][0] != exceptElement[0]) {
-				elements[i][funcName]();
-			}
-		}
-	}
-
-
-
-	/* Event Modification Reporting
-	---------------------------------------------------------------------------------*/
-
-
-	function eventDrop(e, event, dayDelta, minuteDelta, allDay, ev, ui) {
-		var oldAllDay = event.allDay;
-		var eventId = event._id;
-		moveEvents(eventsByID[eventId], dayDelta, minuteDelta, allDay);
-		trigger(
-			'eventDrop',
-			e,
-			event,
-			dayDelta,
-			minuteDelta,
-			allDay,
-			function() {
-				// TODO: investigate cases where this inverse technique might not work
-				moveEvents(eventsByID[eventId], -dayDelta, -minuteDelta, oldAllDay);
-				reportEventChange(eventId);
-			},
-			ev,
-			ui
-		);
-		reportEventChange(eventId);
-	}
-
-
-	function eventResize(e, event, dayDelta, minuteDelta, ev, ui) {
-		var eventId = event._id;
-		elongateEvents(eventsByID[eventId], dayDelta, minuteDelta);
-		trigger(
-			'eventResize',
-			e,
-			event,
-			dayDelta,
-			minuteDelta,
-			function() {
-				// TODO: investigate cases where this inverse technique might not work
-				elongateEvents(eventsByID[eventId], -dayDelta, -minuteDelta);
-				reportEventChange(eventId);
-			},
-			ev,
-			ui
-		);
-		reportEventChange(eventId);
-	}
-
-
-
-	/* Event Modification Math
-	---------------------------------------------------------------------------------*/
-
-
-	function moveEvents(events, dayDelta, minuteDelta, allDay) {
-		minuteDelta = minuteDelta || 0;
-		for (var e, len=events.length, i=0; i<len; i++) {
-			e = events[i];
-			if (allDay !== undefined) {
-				e.allDay = allDay;
-			}
-			addMinutes(addDays(e.start, dayDelta, true), minuteDelta);
-			if (e.end) {
-				e.end = addMinutes(addDays(e.end, dayDelta, true), minuteDelta);
-			}
-			normalizeEvent(e, options);
-		}
-	}
-
-
-	function elongateEvents(events, dayDelta, minuteDelta) {
-		minuteDelta = minuteDelta || 0;
-		for (var e, len=events.length, i=0; i<len; i++) {
-			e = events[i];
-			e.end = addMinutes(addDays(eventEnd(e), dayDelta, true), minuteDelta);
-			normalizeEvent(e, options);
-		}
-	}
-
-
-}
-
-function DayEventRenderer() {
-	var t = this;
-
-
-	// exports
-	t.renderDaySegs = renderDaySegs;
-	t.resizableDayEvent = resizableDayEvent;
-
-
-	// imports
-	var opt = t.opt;
-	var trigger = t.trigger;
-	var isEventDraggable = t.isEventDraggable;
-	var isEventResizable = t.isEventResizable;
-	var eventEnd = t.eventEnd;
-	var reportEventElement = t.reportEventElement;
-	var showEvents = t.showEvents;
-	var hideEvents = t.hideEvents;
-	var eventResize = t.eventResize;
-	var getRowCnt = t.getRowCnt;
-	var getColCnt = t.getColCnt;
-	var getColWidth = t.getColWidth;
-	var allDayRow = t.allDayRow;
-	var allDayBounds = t.allDayBounds;
-	var colContentLeft = t.colContentLeft;
-	var colContentRight = t.colContentRight;
-	var dayOfWeekCol = t.dayOfWeekCol;
-	var dateCell = t.dateCell;
-	var compileDaySegs = t.compileDaySegs;
-	var getDaySegmentContainer = t.getDaySegmentContainer;
-	var bindDaySeg = t.bindDaySeg; //TODO: streamline this
-	var formatDates = t.calendar.formatDates;
-	var renderDayOverlay = t.renderDayOverlay;
-	var clearOverlays = t.clearOverlays;
-	var clearSelection = t.clearSelection;
-
-
-
-	/* Rendering
-	-----------------------------------------------------------------------------*/
-
-
-	function renderDaySegs(segs, modifiedEventId) {
-		var segmentContainer = getDaySegmentContainer();
-		var rowDivs;
-		var rowCnt = getRowCnt();
-		var colCnt = getColCnt();
-		var i = 0;
-		var rowI;
-		var levelI;
-		var colHeights;
-		var j;
-		var segCnt = segs.length;
-		var seg;
-		var top;
-		var k;
-		segmentContainer[0].innerHTML = daySegHTML(segs); // faster than .html()
-		daySegElementResolve(segs, segmentContainer.children());
-		daySegElementReport(segs);
-		daySegHandlers(segs, segmentContainer, modifiedEventId);
-		daySegCalcHSides(segs);
-		daySegSetWidths(segs);
-		daySegCalcHeights(segs);
-		rowDivs = getRowDivs();
-		// set row heights, calculate event tops (in relation to row top)
-		for (rowI=0; rowI<rowCnt; rowI++) {
-			levelI = 0;
-			colHeights = [];
-			for (j=0; j<colCnt; j++) {
-				colHeights[j] = 0;
-			}
-			while (i<segCnt && (seg = segs[i]).row == rowI) {
-				// loop through segs in a row
-				top = arrayMax(colHeights.slice(seg.startCol, seg.endCol));
-				seg.top = top;
-				top += seg.outerHeight;
-				for (k=seg.startCol; k<seg.endCol; k++) {
-					colHeights[k] = top;
-				}
-				i++;
-			}
-			rowDivs[rowI].height(arrayMax(colHeights));
-		}
-		daySegSetTops(segs, getRowTops(rowDivs));
-	}
-
-
-	function renderTempDaySegs(segs, adjustRow, adjustTop) {
-		var tempContainer = $("<div/>");
-		var elements;
-		var segmentContainer = getDaySegmentContainer();
-		var i;
-		var segCnt = segs.length;
-		var element;
-		tempContainer[0].innerHTML = daySegHTML(segs); // faster than .html()
-		elements = tempContainer.children();
-		segmentContainer.append(elements);
-		daySegElementResolve(segs, elements);
-		daySegCalcHSides(segs);
-		daySegSetWidths(segs);
-		daySegCalcHeights(segs);
-		daySegSetTops(segs, getRowTops(getRowDivs()));
-		elements = [];
-		for (i=0; i<segCnt; i++) {
-			element = segs[i].element;
-			if (element) {
-				if (segs[i].row === adjustRow) {
-					element.css('top', adjustTop);
-				}
-				elements.push(element[0]);
-			}
-		}
-		return $(elements);
-	}
-
-
-	function daySegHTML(segs) { // also sets seg.left and seg.outerWidth
-		var rtl = opt('isRTL');
-		var i;
-		var segCnt=segs.length;
-		var seg;
-		var event;
-		var url;
-		var classes;
-		var bounds = allDayBounds();
-		var minLeft = bounds.left;
-		var maxLeft = bounds.right;
-		var leftCol;
-		var rightCol;
-		var left;
-		var right;
-		var skinCss;
-		var html = '';
-		// calculate desired position/dimensions, create html
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			event = seg.event;
-			classes = ['fc-event', 'fc-event-skin', 'fc-event-hori'];
-			if (isEventDraggable(event)) {
-				classes.push('fc-event-draggable');
-			}
-			if (rtl) {
-				if (seg.isStart) {
-					classes.push('fc-corner-right');
-				}
-				if (seg.isEnd) {
-					classes.push('fc-corner-left');
-				}
-				leftCol = dayOfWeekCol(seg.end.getDay()-1);
-				rightCol = dayOfWeekCol(seg.start.getDay());
-				left = seg.isEnd ? colContentLeft(leftCol) : minLeft;
-				right = seg.isStart ? colContentRight(rightCol) : maxLeft;
-			}else{
-				if (seg.isStart) {
-					classes.push('fc-corner-left');
-				}
-				if (seg.isEnd) {
-					classes.push('fc-corner-right');
-				}
-				leftCol = dayOfWeekCol(seg.start.getDay());
-				rightCol = dayOfWeekCol(seg.end.getDay()-1);
-				left = seg.isStart ? colContentLeft(leftCol) : minLeft;
-				right = seg.isEnd ? colContentRight(rightCol) : maxLeft;
-			}
-			classes = classes.concat(event.className);
-			if (event.source) {
-				classes = classes.concat(event.source.className || []);
-			}
-			url = event.url;
-			skinCss = getSkinCss(event, opt);
-			if (url) {
-				html += "<a href='" + htmlEscape(url) + "'";
-			}else{
-				html += "<div";
-			}
-			html +=
-				" class='" + classes.join(' ') + "'" +
-				" style='position:absolute;z-index:8;left:"+left+"px;" + skinCss + "'" +
-				">" +
-				"<div" +
-				" class='fc-event-inner fc-event-skin'" +
-				(skinCss ? " style='" + skinCss + "'" : '') +
-				">";
-			if (!event.allDay && seg.isStart) {
-				html +=
-					"<span class='fc-event-time'>" +
-					htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) +
-					"</span>";
-			}
-			html +=
-				"<span class='fc-event-title'>" + htmlEscape(event.title) + "</span>" +
-				"</div>";
-			if (seg.isEnd && isEventResizable(event)) {
-				html +=
-					"<div class='ui-resizable-handle ui-resizable-" + (rtl ? 'w' : 'e') + "'>" +
-					"&nbsp;&nbsp;&nbsp;" + // makes hit area a lot better for IE6/7
-					"</div>";
-			}
-			html +=
-				"</" + (url ? "a" : "div" ) + ">";
-			seg.left = left;
-			seg.outerWidth = right - left;
-			seg.startCol = leftCol;
-			seg.endCol = rightCol + 1; // needs to be exclusive
-		}
-		return html;
-	}
-
-
-	function daySegElementResolve(segs, elements) { // sets seg.element
-		var i;
-		var segCnt = segs.length;
-		var seg;
-		var event;
-		var element;
-		var triggerRes;
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			event = seg.event;
-			element = $(elements[i]); // faster than .eq()
-			triggerRes = trigger('eventRender', event, event, element);
-			if (triggerRes === false) {
-				element.remove();
-			}else{
-				if (triggerRes && triggerRes !== true) {
-					triggerRes = $(triggerRes)
-						.css({
-							position: 'absolute',
-							left: seg.left
-						});
-					element.replaceWith(triggerRes);
-					element = triggerRes;
-				}
-				seg.element = element;
-			}
-		}
-	}
-
-
-	function daySegElementReport(segs) {
-		var i;
-		var segCnt = segs.length;
-		var seg;
-		var element;
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			element = seg.element;
-			if (element) {
-				reportEventElement(seg.event, element);
-			}
-		}
-	}
-
-
-	function daySegHandlers(segs, segmentContainer, modifiedEventId) {
-		var i;
-		var segCnt = segs.length;
-		var seg;
-		var element;
-		var event;
-		// retrieve elements, run through eventRender callback, bind handlers
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			element = seg.element;
-			if (element) {
-				event = seg.event;
-				if (event._id === modifiedEventId) {
-					bindDaySeg(event, element, seg);
-				}else{
-					element[0]._fci = i; // for lazySegBind
-				}
-			}
-		}
-		lazySegBind(segmentContainer, segs, bindDaySeg);
-	}
-
-
-	function daySegCalcHSides(segs) { // also sets seg.key
-		var i;
-		var segCnt = segs.length;
-		var seg;
-		var element;
-		var key, val;
-		var hsideCache = {};
-		// record event horizontal sides
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			element = seg.element;
-			if (element) {
-				key = seg.key = cssKey(element[0]);
-				val = hsideCache[key];
-				if (val === undefined) {
-					val = hsideCache[key] = hsides(element, true);
-				}
-				seg.hsides = val;
-			}
-		}
-	}
-
-
-	function daySegSetWidths(segs) {
-		var i;
-		var segCnt = segs.length;
-		var seg;
-		var element;
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			element = seg.element;
-			if (element) {
-				element[0].style.width = Math.max(0, seg.outerWidth - seg.hsides) + 'px';
-			}
-		}
-	}
-
-
-	function daySegCalcHeights(segs) {
-		var i;
-		var segCnt = segs.length;
-		var seg;
-		var element;
-		var key, val;
-		var vmarginCache = {};
-		// record event heights
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			element = seg.element;
-			if (element) {
-				key = seg.key; // created in daySegCalcHSides
-				val = vmarginCache[key];
-				if (val === undefined) {
-					val = vmarginCache[key] = vmargins(element);
-				}
-				seg.outerHeight = element[0].offsetHeight + val;
-			}
-		}
-	}
-
-
-	function getRowDivs() {
-		var i;
-		var rowCnt = getRowCnt();
-		var rowDivs = [];
-		for (i=0; i<rowCnt; i++) {
-			rowDivs[i] = allDayRow(i)
-				.find('td:first div.fc-day-content > div'); // optimal selector?
-		}
-		return rowDivs;
-	}
-
-
-	function getRowTops(rowDivs) {
-		var i;
-		var rowCnt = rowDivs.length;
-		var tops = [];
-		for (i=0; i<rowCnt; i++) {
-			tops[i] = rowDivs[i][0].offsetTop; // !!?? but this means the element needs position:relative if in a table cell!!!!
-		}
-		return tops;
-	}
-
-
-	function daySegSetTops(segs, rowTops) { // also triggers eventAfterRender
-		var i;
-		var segCnt = segs.length;
-		var seg;
-		var element;
-		var event;
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			element = seg.element;
-			if (element) {
-				element[0].style.top = rowTops[seg.row] + (seg.top||0) + 'px';
-				event = seg.event;
-				trigger('eventAfterRender', event, event, element);
-			}
-		}
-	}
-
-
-
-	/* Resizing
-	-----------------------------------------------------------------------------------*/
-
-
-	function resizableDayEvent(event, element, seg) {
-		var rtl = opt('isRTL');
-		var direction = rtl ? 'w' : 'e';
-		var handle = element.find('div.ui-resizable-' + direction);
-		var isResizing = false;
-
-		// TODO: look into using jquery-ui mouse widget for this stuff
-		disableTextSelection(element); // prevent native <a> selection for IE
-		element
-			.mousedown(function(ev) { // prevent native <a> selection for others
-				ev.preventDefault();
-			})
-			.click(function(ev) {
-				if (isResizing) {
-					ev.preventDefault(); // prevent link from being visited (only method that worked in IE6)
-					ev.stopImmediatePropagation(); // prevent fullcalendar eventClick handler from being called
-					                               // (eventElementHandlers needs to be bound after resizableDayEvent)
-				}
-			});
-
-		handle.mousedown(function(ev) {
-			if (ev.which != 1) {
-				return; // needs to be left mouse button
-			}
-			isResizing = true;
-			var hoverListener = t.getHoverListener();
-			var rowCnt = getRowCnt();
-			var colCnt = getColCnt();
-			var dis = rtl ? -1 : 1;
-			var dit = rtl ? colCnt-1 : 0;
-			var elementTop = element.css('top');
-			var dayDelta;
-			var helpers;
-			var eventCopy = $.extend({}, event);
-			var minCell = dateCell(event.start);
-			clearSelection();
-			$('body')
-				.css('cursor', direction + '-resize')
-				.one('mouseup', mouseup);
-			trigger('eventResizeStart', this, event, ev);
-			hoverListener.start(function(cell, origCell) {
-				if (cell) {
-					var r = Math.max(minCell.row, cell.row);
-					var c = cell.col;
-					if (rowCnt == 1) {
-						r = 0; // hack for all-day area in agenda views
-					}
-					if (r == minCell.row) {
-						if (rtl) {
-							c = Math.min(minCell.col, c);
-						}else{
-							c = Math.max(minCell.col, c);
-						}
-					}
-					dayDelta = (r*7 + c*dis+dit) - (origCell.row*7 + origCell.col*dis+dit);
-					var newEnd = addDays(eventEnd(event), dayDelta, true);
-					if (dayDelta) {
-						eventCopy.end = newEnd;
-						var oldHelpers = helpers;
-						helpers = renderTempDaySegs(compileDaySegs([eventCopy]), seg.row, elementTop);
-						helpers.find('*').css('cursor', direction + '-resize');
-						if (oldHelpers) {
-							oldHelpers.remove();
-						}
-						hideEvents(event);
-					}else{
-						if (helpers) {
-							showEvents(event);
-							helpers.remove();
-							helpers = null;
-						}
-					}
-					clearOverlays();
-					renderDayOverlay(event.start, addDays(cloneDate(newEnd), 1)); // coordinate grid already rebuild at hoverListener.start
-				}
-			}, ev);
-
-			function mouseup(ev) {
-				trigger('eventResizeStop', this, event, ev);
-				$('body').css('cursor', '');
-				hoverListener.stop();
-				clearOverlays();
-				if (dayDelta) {
-					eventResize(this, event, dayDelta, 0, ev);
-					// event redraw will clear helpers
-				}
-				// otherwise, the drag handler already restored the old events
-
-				setTimeout(function() { // make this happen after the element's click event
-					isResizing = false;
-				},0);
-			}
-
-		});
-	}
-
-
-}
-
-//BUG: unselect needs to be triggered when events are dragged+dropped
-
-function SelectionManager() {
-	var t = this;
-
-
-	// exports
-	t.select = select;
-	t.unselect = unselect;
-	t.reportSelection = reportSelection;
-	t.daySelectionMousedown = daySelectionMousedown;
-
-
-	// imports
-	var opt = t.opt;
-	var trigger = t.trigger;
-	var defaultSelectionEnd = t.defaultSelectionEnd;
-	var renderSelection = t.renderSelection;
-	var clearSelection = t.clearSelection;
-
-
-	// locals
-	var selected = false;
-
-
-
-	// unselectAuto
-	if (opt('selectable') && opt('unselectAuto')) {
-		$(document).mousedown(function(ev) {
-			var ignore = opt('unselectCancel');
-			if (ignore) {
-				if ($(ev.target).parents(ignore).length) { // could be optimized to stop after first match
-					return;
-				}
-			}
-			unselect(ev);
-		});
-	}
-
-
-	function select(startDate, endDate, allDay) {
-		unselect();
-		if (!endDate) {
-			endDate = defaultSelectionEnd(startDate, allDay);
-		}
-		renderSelection(startDate, endDate, allDay);
-		reportSelection(startDate, endDate, allDay);
-	}
-
-
-	function unselect(ev) {
-		if (selected) {
-			selected = false;
-			clearSelection();
-			trigger('unselect', null, ev);
-		}
-	}
-
-
-	function reportSelection(startDate, endDate, allDay, ev) {
-		selected = true;
-		trigger('select', null, startDate, endDate, allDay, ev);
-	}
-
-
-	function daySelectionMousedown(ev) { // not really a generic manager method, oh well
-		var cellDate = t.cellDate;
-		var cellIsAllDay = t.cellIsAllDay;
-		var hoverListener = t.getHoverListener();
-		var reportDayClick = t.reportDayClick; // this is hacky and sort of weird
-		if (ev.which == 1 && opt('selectable')) { // which==1 means left mouse button
-			unselect(ev);
-			var _mousedownElement = this;
-			var dates;
-			hoverListener.start(function(cell, origCell) { // TODO: maybe put cellDate/cellIsAllDay info in cell
-				clearSelection();
-				if (cell && cellIsAllDay(cell)) {
-					dates = [ cellDate(origCell), cellDate(cell) ].sort(cmp);
-					renderSelection(dates[0], dates[1], true);
-				}else{
-					dates = null;
-				}
-			}, ev);
-			$(document).one('mouseup', function(ev) {
-				hoverListener.stop();
-				if (dates) {
-					if (+dates[0] == +dates[1]) {
-						reportDayClick(dates[0], true, ev);
-					}
-					reportSelection(dates[0], dates[1], true, ev);
-				}
-			});
-		}
-	}
-
-
-}
-
-function OverlayManager() {
-	var t = this;
-
-
-	// exports
-	t.renderOverlay = renderOverlay;
-	t.clearOverlays = clearOverlays;
-
-
-	// locals
-	var usedOverlays = [];
-	var unusedOverlays = [];
-
-
-	function renderOverlay(rect, parent) {
-		var e = unusedOverlays.shift();
-		if (!e) {
-			e = $("<div class='fc-cell-overlay' style='position:absolute;z-index:3'/>");
-		}
-		if (e[0].parentNode != parent[0]) {
-			e.appendTo(parent);
-		}
-		usedOverlays.push(e.css(rect).show());
-		return e;
-	}
-
-
-	function clearOverlays() {
-		var e;
-		while (e = usedOverlays.shift()) {
-			unusedOverlays.push(e.hide().unbind());
-		}
-	}
-
-
-}
-
-function CoordinateGrid(buildFunc) {
-
-	var t = this;
-	var rows;
-	var cols;
-
-
-	t.build = function() {
-		rows = [];
-		cols = [];
-		buildFunc(rows, cols);
-	};
-
-
-	t.cell = function(x, y) {
-		var rowCnt = rows.length;
-		var colCnt = cols.length;
-		var i, r=-1, c=-1;
-		for (i=0; i<rowCnt; i++) {
-			if (y >= rows[i][0] && y < rows[i][1]) {
-				r = i;
-				break;
-			}
-		}
-		for (i=0; i<colCnt; i++) {
-			if (x >= cols[i][0] && x < cols[i][1]) {
-				c = i;
-				break;
-			}
-		}
-		return (r>=0 && c>=0) ? { row:r, col:c } : null;
-	};
-
-
-	t.rect = function(row0, col0, row1, col1, originElement) { // row1,col1 is inclusive
-		var origin = originElement.offset();
-		return {
-			top: rows[row0][0] - origin.top,
-			left: cols[col0][0] - origin.left,
-			width: cols[col1][1] - cols[col0][0],
-			height: rows[row1][1] - rows[row0][0]
-		};
-	};
-
-}
-
-function HoverListener(coordinateGrid) {
-
-
-	var t = this;
-	var bindType;
-	var change;
-	var firstCell;
-	var cell;
-
-
-	t.start = function(_change, ev, _bindType) {
-		change = _change;
-		firstCell = cell = null;
-		coordinateGrid.build();
-		mouse(ev);
-		bindType = _bindType || 'mousemove';
-		$(document).bind(bindType, mouse);
-	};
-
-
-	function mouse(ev) {
-		var newCell = coordinateGrid.cell(ev.pageX, ev.pageY);
-		if (!newCell != !cell || newCell && (newCell.row != cell.row || newCell.col != cell.col)) {
-			if (newCell) {
-				if (!firstCell) {
-					firstCell = newCell;
-				}
-				change(newCell, firstCell, newCell.row-firstCell.row, newCell.col-firstCell.col);
-			}else{
-				change(newCell, firstCell);
-			}
-			cell = newCell;
-		}
-	}
-
-
-	t.stop = function() {
-		$(document).unbind(bindType, mouse);
-		return cell;
-	};
-
-
-}
-
-function HorizontalPositionCache(getElement) {
-
-	var t = this,
-		elements = {},
-		lefts = {},
-		rights = {};
-
-	function e(i) {
-		return elements[i] = elements[i] || getElement(i);
-	}
-
-	t.left = function(i) {
-		return lefts[i] = lefts[i] === undefined ? e(i).position().left : lefts[i];
-	};
-
-	t.right = function(i) {
-		return rights[i] = rights[i] === undefined ? t.left(i) + e(i).width() : rights[i];
-	};
-
-	t.clear = function() {
-		elements = {};
-		lefts = {};
-		rights = {};
-	};
-
-}
-
-})(jQuery);
diff --git a/3rdparty/fullcalendar/js/fullcalendar.min.js b/3rdparty/fullcalendar/js/fullcalendar.min.js
deleted file mode 100644
index fc06a89a610..00000000000
--- a/3rdparty/fullcalendar/js/fullcalendar.min.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-
- FullCalendar v1.5.2
- http://arshaw.com/fullcalendar/
-
- Use fullcalendar.css for basic styling.
- For event drag & drop, requires jQuery UI draggable.
- For event resizing, requires jQuery UI resizable.
-
- Copyright (c) 2011 Adam Shaw
- Dual licensed under the MIT and GPL licenses, located in
- MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
-
- Date: Sun Aug 21 22:06:09 2011 -0700
-
-*/
-(function(m,oa){function wb(a){m.extend(true,Ya,a)}function Yb(a,b,e){function d(k){if(E){u();q();ma();S(k)}else f()}function f(){B=b.theme?"ui":"fc";a.addClass("fc");b.isRTL&&a.addClass("fc-rtl");b.theme&&a.addClass("ui-widget");E=m("<div class='fc-content' style='position:relative'/>").prependTo(a);C=new Zb(X,b);(P=C.render())&&a.prepend(P);y(b.defaultView);m(window).resize(na);t()||g()}function g(){setTimeout(function(){!n.start&&t()&&S()},0)}function l(){m(window).unbind("resize",na);C.destroy();
-E.remove();a.removeClass("fc fc-rtl ui-widget")}function j(){return i.offsetWidth!==0}function t(){return m("body")[0].offsetWidth!==0}function y(k){if(!n||k!=n.name){F++;pa();var D=n,Z;if(D){(D.beforeHide||xb)();Za(E,E.height());D.element.hide()}else Za(E,1);E.css("overflow","hidden");if(n=Y[k])n.element.show();else n=Y[k]=new Ja[k](Z=s=m("<div class='fc-view fc-view-"+k+"' style='position:absolute'/>").appendTo(E),X);D&&C.deactivateButton(D.name);C.activateButton(k);S();E.css("overflow","");D&&
-Za(E,1);Z||(n.afterShow||xb)();F--}}function S(k){if(j()){F++;pa();o===oa&&u();var D=false;if(!n.start||k||r<n.start||r>=n.end){n.render(r,k||0);fa(true);D=true}else if(n.sizeDirty){n.clearEvents();fa();D=true}else if(n.eventsDirty){n.clearEvents();D=true}n.sizeDirty=false;n.eventsDirty=false;ga(D);W=a.outerWidth();C.updateTitle(n.title);k=new Date;k>=n.start&&k<n.end?C.disableButton("today"):C.enableButton("today");F--;n.trigger("viewDisplay",i)}}function Q(){q();if(j()){u();fa();pa();n.clearEvents();
-n.renderEvents(J);n.sizeDirty=false}}function q(){m.each(Y,function(k,D){D.sizeDirty=true})}function u(){o=b.contentHeight?b.contentHeight:b.height?b.height-(P?P.height():0)-Sa(E):Math.round(E.width()/Math.max(b.aspectRatio,0.5))}function fa(k){F++;n.setHeight(o,k);if(s){s.css("position","relative");s=null}n.setWidth(E.width(),k);F--}function na(){if(!F)if(n.start){var k=++v;setTimeout(function(){if(k==v&&!F&&j())if(W!=(W=a.outerWidth())){F++;Q();n.trigger("windowResize",i);F--}},200)}else g()}function ga(k){if(!b.lazyFetching||
-ya(n.visStart,n.visEnd))ra();else k&&da()}function ra(){K(n.visStart,n.visEnd)}function sa(k){J=k;da()}function ha(k){da(k)}function da(k){ma();if(j()){n.clearEvents();n.renderEvents(J,k);n.eventsDirty=false}}function ma(){m.each(Y,function(k,D){D.eventsDirty=true})}function ua(k,D,Z){n.select(k,D,Z===oa?true:Z)}function pa(){n&&n.unselect()}function U(){S(-1)}function ca(){S(1)}function ka(){gb(r,-1);S()}function qa(){gb(r,1);S()}function G(){r=new Date;S()}function p(k,D,Z){if(k instanceof Date)r=
-N(k);else yb(r,k,D,Z);S()}function L(k,D,Z){k!==oa&&gb(r,k);D!==oa&&hb(r,D);Z!==oa&&ba(r,Z);S()}function c(){return N(r)}function z(){return n}function H(k,D){if(D===oa)return b[k];if(k=="height"||k=="contentHeight"||k=="aspectRatio"){b[k]=D;Q()}}function T(k,D){if(b[k])return b[k].apply(D||i,Array.prototype.slice.call(arguments,2))}var X=this;X.options=b;X.render=d;X.destroy=l;X.refetchEvents=ra;X.reportEvents=sa;X.reportEventChange=ha;X.rerenderEvents=da;X.changeView=y;X.select=ua;X.unselect=pa;
-X.prev=U;X.next=ca;X.prevYear=ka;X.nextYear=qa;X.today=G;X.gotoDate=p;X.incrementDate=L;X.formatDate=function(k,D){return Oa(k,D,b)};X.formatDates=function(k,D,Z){return ib(k,D,Z,b)};X.getDate=c;X.getView=z;X.option=H;X.trigger=T;$b.call(X,b,e);var ya=X.isFetchNeeded,K=X.fetchEvents,i=a[0],C,P,E,B,n,Y={},W,o,s,v=0,F=0,r=new Date,J=[],M;yb(r,b.year,b.month,b.date);b.droppable&&m(document).bind("dragstart",function(k,D){var Z=k.target,ja=m(Z);if(!ja.parents(".fc").length){var ia=b.dropAccept;if(m.isFunction(ia)?
-ia.call(Z,ja):ja.is(ia)){M=Z;n.dragStart(M,k,D)}}}).bind("dragstop",function(k,D){if(M){n.dragStop(M,k,D);M=null}})}function Zb(a,b){function e(){q=b.theme?"ui":"fc";if(b.header)return Q=m("<table class='fc-header' style='width:100%'/>").append(m("<tr/>").append(f("left")).append(f("center")).append(f("right")))}function d(){Q.remove()}function f(u){var fa=m("<td class='fc-header-"+u+"'/>");(u=b.header[u])&&m.each(u.split(" "),function(na){na>0&&fa.append("<span class='fc-header-space'/>");var ga;
-m.each(this.split(","),function(ra,sa){if(sa=="title"){fa.append("<span class='fc-header-title'><h2>&nbsp;</h2></span>");ga&&ga.addClass(q+"-corner-right");ga=null}else{var ha;if(a[sa])ha=a[sa];else if(Ja[sa])ha=function(){ma.removeClass(q+"-state-hover");a.changeView(sa)};if(ha){ra=b.theme?jb(b.buttonIcons,sa):null;var da=jb(b.buttonText,sa),ma=m("<span class='fc-button fc-button-"+sa+" "+q+"-state-default'><span class='fc-button-inner'><span class='fc-button-content'>"+(ra?"<span class='fc-icon-wrap'><span class='ui-icon ui-icon-"+
-ra+"'/></span>":da)+"</span><span class='fc-button-effect'><span></span></span></span></span>");if(ma){ma.click(function(){ma.hasClass(q+"-state-disabled")||ha()}).mousedown(function(){ma.not("."+q+"-state-active").not("."+q+"-state-disabled").addClass(q+"-state-down")}).mouseup(function(){ma.removeClass(q+"-state-down")}).hover(function(){ma.not("."+q+"-state-active").not("."+q+"-state-disabled").addClass(q+"-state-hover")},function(){ma.removeClass(q+"-state-hover").removeClass(q+"-state-down")}).appendTo(fa);
-ga||ma.addClass(q+"-corner-left");ga=ma}}}});ga&&ga.addClass(q+"-corner-right")});return fa}function g(u){Q.find("h2").html(u)}function l(u){Q.find("span.fc-button-"+u).addClass(q+"-state-active")}function j(u){Q.find("span.fc-button-"+u).removeClass(q+"-state-active")}function t(u){Q.find("span.fc-button-"+u).addClass(q+"-state-disabled")}function y(u){Q.find("span.fc-button-"+u).removeClass(q+"-state-disabled")}var S=this;S.render=e;S.destroy=d;S.updateTitle=g;S.activateButton=l;S.deactivateButton=
-j;S.disableButton=t;S.enableButton=y;var Q=m([]),q}function $b(a,b){function e(c,z){return!ca||c<ca||z>ka}function d(c,z){ca=c;ka=z;L=[];c=++qa;G=z=U.length;for(var H=0;H<z;H++)f(U[H],c)}function f(c,z){g(c,function(H){if(z==qa){if(H){for(var T=0;T<H.length;T++){H[T].source=c;na(H[T])}L=L.concat(H)}G--;G||ua(L)}})}function g(c,z){var H,T=Aa.sourceFetchers,X;for(H=0;H<T.length;H++){X=T[H](c,ca,ka,z);if(X===true)return;else if(typeof X=="object"){g(X,z);return}}if(H=c.events)if(m.isFunction(H)){u();
-H(N(ca),N(ka),function(C){z(C);fa()})}else m.isArray(H)?z(H):z();else if(c.url){var ya=c.success,K=c.error,i=c.complete;H=m.extend({},c.data||{});T=Ta(c.startParam,a.startParam);X=Ta(c.endParam,a.endParam);if(T)H[T]=Math.round(+ca/1E3);if(X)H[X]=Math.round(+ka/1E3);u();m.ajax(m.extend({},ac,c,{data:H,success:function(C){C=C||[];var P=$a(ya,this,arguments);if(m.isArray(P))C=P;z(C)},error:function(){$a(K,this,arguments);z()},complete:function(){$a(i,this,arguments);fa()}}))}else z()}function l(c){if(c=
-j(c)){G++;f(c,qa)}}function j(c){if(m.isFunction(c)||m.isArray(c))c={events:c};else if(typeof c=="string")c={url:c};if(typeof c=="object"){ga(c);U.push(c);return c}}function t(c){U=m.grep(U,function(z){return!ra(z,c)});L=m.grep(L,function(z){return!ra(z.source,c)});ua(L)}function y(c){var z,H=L.length,T,X=ma().defaultEventEnd,ya=c.start-c._start,K=c.end?c.end-(c._end||X(c)):0;for(z=0;z<H;z++){T=L[z];if(T._id==c._id&&T!=c){T.start=new Date(+T.start+ya);T.end=c.end?T.end?new Date(+T.end+K):new Date(+X(T)+
-K):null;T.title=c.title;T.url=c.url;T.allDay=c.allDay;T.className=c.className;T.editable=c.editable;T.color=c.color;T.backgroudColor=c.backgroudColor;T.borderColor=c.borderColor;T.textColor=c.textColor;na(T)}}na(c);ua(L)}function S(c,z){na(c);if(!c.source){if(z){pa.events.push(c);c.source=pa}L.push(c)}ua(L)}function Q(c){if(c){if(!m.isFunction(c)){var z=c+"";c=function(T){return T._id==z}}L=m.grep(L,c,true);for(H=0;H<U.length;H++)if(m.isArray(U[H].events))U[H].events=m.grep(U[H].events,c,true)}else{L=
-[];for(var H=0;H<U.length;H++)if(m.isArray(U[H].events))U[H].events=[]}ua(L)}function q(c){if(m.isFunction(c))return m.grep(L,c);else if(c){c+="";return m.grep(L,function(z){return z._id==c})}return L}function u(){p++||da("loading",null,true)}function fa(){--p||da("loading",null,false)}function na(c){var z=c.source||{},H=Ta(z.ignoreTimezone,a.ignoreTimezone);c._id=c._id||(c.id===oa?"_fc"+bc++:c.id+"");if(c.date){if(!c.start)c.start=c.date;delete c.date}c._start=N(c.start=kb(c.start,H));c.end=kb(c.end,
-H);if(c.end&&c.end<=c.start)c.end=null;c._end=c.end?N(c.end):null;if(c.allDay===oa)c.allDay=Ta(z.allDayDefault,a.allDayDefault);if(c.className){if(typeof c.className=="string")c.className=c.className.split(/\s+/)}else c.className=[]}function ga(c){if(c.className){if(typeof c.className=="string")c.className=c.className.split(/\s+/)}else c.className=[];for(var z=Aa.sourceNormalizers,H=0;H<z.length;H++)z[H](c)}function ra(c,z){return c&&z&&sa(c)==sa(z)}function sa(c){return(typeof c=="object"?c.events||
-c.url:"")||c}var ha=this;ha.isFetchNeeded=e;ha.fetchEvents=d;ha.addEventSource=l;ha.removeEventSource=t;ha.updateEvent=y;ha.renderEvent=S;ha.removeEvents=Q;ha.clientEvents=q;ha.normalizeEvent=na;var da=ha.trigger,ma=ha.getView,ua=ha.reportEvents,pa={events:[]},U=[pa],ca,ka,qa=0,G=0,p=0,L=[];for(ha=0;ha<b.length;ha++)j(b[ha])}function gb(a,b,e){a.setFullYear(a.getFullYear()+b);e||Ka(a);return a}function hb(a,b,e){if(+a){b=a.getMonth()+b;var d=N(a);d.setDate(1);d.setMonth(b);a.setMonth(b);for(e||Ka(a);a.getMonth()!=
-d.getMonth();)a.setDate(a.getDate()+(a<d?1:-1))}return a}function ba(a,b,e){if(+a){b=a.getDate()+b;var d=N(a);d.setHours(9);d.setDate(b);a.setDate(b);e||Ka(a);lb(a,d)}return a}function lb(a,b){if(+a)for(;a.getDate()!=b.getDate();)a.setTime(+a+(a<b?1:-1)*cc)}function xa(a,b){a.setMinutes(a.getMinutes()+b);return a}function Ka(a){a.setHours(0);a.setMinutes(0);a.setSeconds(0);a.setMilliseconds(0);return a}function N(a,b){if(b)return Ka(new Date(+a));return new Date(+a)}function zb(){var a=0,b;do b=new Date(1970,
-a++,1);while(b.getHours());return b}function Fa(a,b,e){for(b=b||1;!a.getDay()||e&&a.getDay()==1||!e&&a.getDay()==6;)ba(a,b);return a}function Ca(a,b){return Math.round((N(a,true)-N(b,true))/Ab)}function yb(a,b,e,d){if(b!==oa&&b!=a.getFullYear()){a.setDate(1);a.setMonth(0);a.setFullYear(b)}if(e!==oa&&e!=a.getMonth()){a.setDate(1);a.setMonth(e)}d!==oa&&a.setDate(d)}function kb(a,b){if(typeof a=="object")return a;if(typeof a=="number")return new Date(a*1E3);if(typeof a=="string"){if(a.match(/^\d+(\.\d+)?$/))return new Date(parseFloat(a)*
-1E3);if(b===oa)b=true;return Bb(a,b)||(a?new Date(a):null)}return null}function Bb(a,b){a=a.match(/^([0-9]{4})(-([0-9]{2})(-([0-9]{2})([T ]([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?(Z|(([-+])([0-9]{2})(:?([0-9]{2}))?))?)?)?)?$/);if(!a)return null;var e=new Date(a[1],0,1);if(b||!a[13]){b=new Date(a[1],0,1,9,0);if(a[3]){e.setMonth(a[3]-1);b.setMonth(a[3]-1)}if(a[5]){e.setDate(a[5]);b.setDate(a[5])}lb(e,b);a[7]&&e.setHours(a[7]);a[8]&&e.setMinutes(a[8]);a[10]&&e.setSeconds(a[10]);a[12]&&e.setMilliseconds(Number("0."+
-a[12])*1E3);lb(e,b)}else{e.setUTCFullYear(a[1],a[3]?a[3]-1:0,a[5]||1);e.setUTCHours(a[7]||0,a[8]||0,a[10]||0,a[12]?Number("0."+a[12])*1E3:0);if(a[14]){b=Number(a[16])*60+(a[18]?Number(a[18]):0);b*=a[15]=="-"?1:-1;e=new Date(+e+b*60*1E3)}}return e}function mb(a){if(typeof a=="number")return a*60;if(typeof a=="object")return a.getHours()*60+a.getMinutes();if(a=a.match(/(\d+)(?::(\d+))?\s*(\w+)?/)){var b=parseInt(a[1],10);if(a[3]){b%=12;if(a[3].toLowerCase().charAt(0)=="p")b+=12}return b*60+(a[2]?parseInt(a[2],
-10):0)}}function Oa(a,b,e){return ib(a,null,b,e)}function ib(a,b,e,d){d=d||Ya;var f=a,g=b,l,j=e.length,t,y,S,Q="";for(l=0;l<j;l++){t=e.charAt(l);if(t=="'")for(y=l+1;y<j;y++){if(e.charAt(y)=="'"){if(f){Q+=y==l+1?"'":e.substring(l+1,y);l=y}break}}else if(t=="(")for(y=l+1;y<j;y++){if(e.charAt(y)==")"){l=Oa(f,e.substring(l+1,y),d);if(parseInt(l.replace(/\D/,""),10))Q+=l;l=y;break}}else if(t=="[")for(y=l+1;y<j;y++){if(e.charAt(y)=="]"){t=e.substring(l+1,y);l=Oa(f,t,d);if(l!=Oa(g,t,d))Q+=l;l=y;break}}else if(t==
-"{"){f=b;g=a}else if(t=="}"){f=a;g=b}else{for(y=j;y>l;y--)if(S=dc[e.substring(l,y)]){if(f)Q+=S(f,d);l=y-1;break}if(y==l)if(f)Q+=t}}return Q}function Ua(a){return a.end?ec(a.end,a.allDay):ba(N(a.start),1)}function ec(a,b){a=N(a);return b||a.getHours()||a.getMinutes()?ba(a,1):Ka(a)}function fc(a,b){return(b.msLength-a.msLength)*100+(a.event.start-b.event.start)}function Cb(a,b){return a.end>b.start&&a.start<b.end}function nb(a,b,e,d){var f=[],g,l=a.length,j,t,y,S,Q;for(g=0;g<l;g++){j=a[g];t=j.start;
-y=b[g];if(y>e&&t<d){if(t<e){t=N(e);S=false}else{t=t;S=true}if(y>d){y=N(d);Q=false}else{y=y;Q=true}f.push({event:j,start:t,end:y,isStart:S,isEnd:Q,msLength:y-t})}}return f.sort(fc)}function ob(a){var b=[],e,d=a.length,f,g,l,j;for(e=0;e<d;e++){f=a[e];for(g=0;;){l=false;if(b[g])for(j=0;j<b[g].length;j++)if(Cb(b[g][j],f)){l=true;break}if(l)g++;else break}if(b[g])b[g].push(f);else b[g]=[f]}return b}function Db(a,b,e){a.unbind("mouseover").mouseover(function(d){for(var f=d.target,g;f!=this;){g=f;f=f.parentNode}if((f=
-g._fci)!==oa){g._fci=oa;g=b[f];e(g.event,g.element,g);m(d.target).trigger(d)}d.stopPropagation()})}function Va(a,b,e){for(var d=0,f;d<a.length;d++){f=m(a[d]);f.width(Math.max(0,b-pb(f,e)))}}function Eb(a,b,e){for(var d=0,f;d<a.length;d++){f=m(a[d]);f.height(Math.max(0,b-Sa(f,e)))}}function pb(a,b){return gc(a)+hc(a)+(b?ic(a):0)}function gc(a){return(parseFloat(m.curCSS(a[0],"paddingLeft",true))||0)+(parseFloat(m.curCSS(a[0],"paddingRight",true))||0)}function ic(a){return(parseFloat(m.curCSS(a[0],
-"marginLeft",true))||0)+(parseFloat(m.curCSS(a[0],"marginRight",true))||0)}function hc(a){return(parseFloat(m.curCSS(a[0],"borderLeftWidth",true))||0)+(parseFloat(m.curCSS(a[0],"borderRightWidth",true))||0)}function Sa(a,b){return jc(a)+kc(a)+(b?Fb(a):0)}function jc(a){return(parseFloat(m.curCSS(a[0],"paddingTop",true))||0)+(parseFloat(m.curCSS(a[0],"paddingBottom",true))||0)}function Fb(a){return(parseFloat(m.curCSS(a[0],"marginTop",true))||0)+(parseFloat(m.curCSS(a[0],"marginBottom",true))||0)}
-function kc(a){return(parseFloat(m.curCSS(a[0],"borderTopWidth",true))||0)+(parseFloat(m.curCSS(a[0],"borderBottomWidth",true))||0)}function Za(a,b){b=typeof b=="number"?b+"px":b;a.each(function(e,d){d.style.cssText+=";min-height:"+b+";_height:"+b})}function xb(){}function Gb(a,b){return a-b}function Hb(a){return Math.max.apply(Math,a)}function Pa(a){return(a<10?"0":"")+a}function jb(a,b){if(a[b]!==oa)return a[b];b=b.split(/(?=[A-Z])/);for(var e=b.length-1,d;e>=0;e--){d=a[b[e].toLowerCase()];if(d!==
-oa)return d}return a[""]}function Qa(a){return a.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#039;").replace(/"/g,"&quot;").replace(/\n/g,"<br />")}function Ib(a){return a.id+"/"+a.className+"/"+a.style.cssText.replace(/(^|;)\s*(top|left|width|height)\s*:[^;]*/ig,"")}function qb(a){a.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})}function ab(a){a.children().removeClass("fc-first fc-last").filter(":first-child").addClass("fc-first").end().filter(":last-child").addClass("fc-last")}
-function rb(a,b){a.each(function(e,d){d.className=d.className.replace(/^fc-\w*/,"fc-"+lc[b.getDay()])})}function Jb(a,b){var e=a.source||{},d=a.color,f=e.color,g=b("eventColor"),l=a.backgroundColor||d||e.backgroundColor||f||b("eventBackgroundColor")||g;d=a.borderColor||d||e.borderColor||f||b("eventBorderColor")||g;a=a.textColor||e.textColor||b("eventTextColor");b=[];l&&b.push("background-color:"+l);d&&b.push("border-color:"+d);a&&b.push("color:"+a);return b.join(";")}function $a(a,b,e){if(m.isFunction(a))a=
-[a];if(a){var d,f;for(d=0;d<a.length;d++)f=a[d].apply(b,e)||f;return f}}function Ta(){for(var a=0;a<arguments.length;a++)if(arguments[a]!==oa)return arguments[a]}function mc(a,b){function e(j,t){if(t){hb(j,t);j.setDate(1)}j=N(j,true);j.setDate(1);t=hb(N(j),1);var y=N(j),S=N(t),Q=f("firstDay"),q=f("weekends")?0:1;if(q){Fa(y);Fa(S,-1,true)}ba(y,-((y.getDay()-Math.max(Q,q)+7)%7));ba(S,(7-S.getDay()+Math.max(Q,q))%7);Q=Math.round((S-y)/(Ab*7));if(f("weekMode")=="fixed"){ba(S,(6-Q)*7);Q=6}d.title=l(j,
-f("titleFormat"));d.start=j;d.end=t;d.visStart=y;d.visEnd=S;g(6,Q,q?5:7,true)}var d=this;d.render=e;sb.call(d,a,b,"month");var f=d.opt,g=d.renderBasic,l=b.formatDate}function nc(a,b){function e(j,t){t&&ba(j,t*7);j=ba(N(j),-((j.getDay()-f("firstDay")+7)%7));t=ba(N(j),7);var y=N(j),S=N(t),Q=f("weekends");if(!Q){Fa(y);Fa(S,-1,true)}d.title=l(y,ba(N(S),-1),f("titleFormat"));d.start=j;d.end=t;d.visStart=y;d.visEnd=S;g(1,1,Q?7:5,false)}var d=this;d.render=e;sb.call(d,a,b,"basicWeek");var f=d.opt,g=d.renderBasic,
-l=b.formatDates}function oc(a,b){function e(j,t){if(t){ba(j,t);f("weekends")||Fa(j,t<0?-1:1)}d.title=l(j,f("titleFormat"));d.start=d.visStart=N(j,true);d.end=d.visEnd=ba(N(d.start),1);g(1,1,1,false)}var d=this;d.render=e;sb.call(d,a,b,"basicDay");var f=d.opt,g=d.renderBasic,l=b.formatDate}function sb(a,b,e){function d(w,I,R,V){v=I;F=R;f();(I=!C)?g(w,V):z();l(I)}function f(){if(k=L("isRTL")){D=-1;Z=F-1}else{D=1;Z=0}ja=L("firstDay");ia=L("weekends")?0:1;la=L("theme")?"ui":"fc";$=L("columnFormat")}function g(w,
-I){var R,V=la+"-widget-header",ea=la+"-widget-content",aa;R="<table class='fc-border-separate' style='width:100%' cellspacing='0'><thead><tr>";for(aa=0;aa<F;aa++)R+="<th class='fc- "+V+"'/>";R+="</tr></thead><tbody>";for(aa=0;aa<w;aa++){R+="<tr class='fc-week"+aa+"'>";for(V=0;V<F;V++)R+="<td class='fc- "+ea+" fc-day"+(aa*F+V)+"'><div>"+(I?"<div class='fc-day-number'/>":"")+"<div class='fc-day-content'><div style='position:relative'>&nbsp;</div></div></div></td>";R+="</tr>"}R+="</tbody></table>";w=
-m(R).appendTo(a);K=w.find("thead");i=K.find("th");C=w.find("tbody");P=C.find("tr");E=C.find("td");B=E.filter(":first-child");n=P.eq(0).find("div.fc-day-content div");ab(K.add(K.find("tr")));ab(P);P.eq(0).addClass("fc-first");y(E);Y=m("<div style='position:absolute;z-index:8;top:0;left:0'/>").appendTo(a)}function l(w){var I=w||v==1,R=p.start.getMonth(),V=Ka(new Date),ea,aa,va;I&&i.each(function(wa,Ga){ea=m(Ga);aa=ca(wa);ea.html(ya(aa,$));rb(ea,aa)});E.each(function(wa,Ga){ea=m(Ga);aa=ca(wa);aa.getMonth()==
-R?ea.removeClass("fc-other-month"):ea.addClass("fc-other-month");+aa==+V?ea.addClass(la+"-state-highlight fc-today"):ea.removeClass(la+"-state-highlight fc-today");ea.find("div.fc-day-number").text(aa.getDate());I&&rb(ea,aa)});P.each(function(wa,Ga){va=m(Ga);if(wa<v){va.show();wa==v-1?va.addClass("fc-last"):va.removeClass("fc-last")}else va.hide()})}function j(w){o=w;w=o-K.height();var I,R,V;if(L("weekMode")=="variable")I=R=Math.floor(w/(v==1?2:6));else{I=Math.floor(w/v);R=w-I*(v-1)}B.each(function(ea,
-aa){if(ea<v){V=m(aa);Za(V.find("> div"),(ea==v-1?R:I)-Sa(V))}})}function t(w){W=w;M.clear();s=Math.floor(W/F);Va(i.slice(0,-1),s)}function y(w){w.click(S).mousedown(X)}function S(w){if(!L("selectable")){var I=parseInt(this.className.match(/fc\-day(\d+)/)[1]);I=ca(I);c("dayClick",this,I,true,w)}}function Q(w,I,R){R&&r.build();R=N(p.visStart);for(var V=ba(N(R),F),ea=0;ea<v;ea++){var aa=new Date(Math.max(R,w)),va=new Date(Math.min(V,I));if(aa<va){var wa;if(k){wa=Ca(va,R)*D+Z+1;aa=Ca(aa,R)*D+Z+1}else{wa=
-Ca(aa,R);aa=Ca(va,R)}y(q(ea,wa,ea,aa-1))}ba(R,7);ba(V,7)}}function q(w,I,R,V){w=r.rect(w,I,R,V,a);return H(w,a)}function u(w){return N(w)}function fa(w,I){Q(w,ba(N(I),1),true)}function na(){T()}function ga(w,I,R){var V=ua(w);c("dayClick",E[V.row*F+V.col],w,I,R)}function ra(w,I){J.start(function(R){T();R&&q(R.row,R.col,R.row,R.col)},I)}function sa(w,I,R){var V=J.stop();T();if(V){V=pa(V);c("drop",w,V,true,I,R)}}function ha(w){return N(w.start)}function da(w){return M.left(w)}function ma(w){return M.right(w)}
-function ua(w){return{row:Math.floor(Ca(w,p.visStart)/7),col:ka(w.getDay())}}function pa(w){return U(w.row,w.col)}function U(w,I){return ba(N(p.visStart),w*7+I*D+Z)}function ca(w){return U(Math.floor(w/F),w%F)}function ka(w){return(w-Math.max(ja,ia)+F)%F*D+Z}function qa(w){return P.eq(w)}function G(){return{left:0,right:W}}var p=this;p.renderBasic=d;p.setHeight=j;p.setWidth=t;p.renderDayOverlay=Q;p.defaultSelectionEnd=u;p.renderSelection=fa;p.clearSelection=na;p.reportDayClick=ga;p.dragStart=ra;p.dragStop=
-sa;p.defaultEventEnd=ha;p.getHoverListener=function(){return J};p.colContentLeft=da;p.colContentRight=ma;p.dayOfWeekCol=ka;p.dateCell=ua;p.cellDate=pa;p.cellIsAllDay=function(){return true};p.allDayRow=qa;p.allDayBounds=G;p.getRowCnt=function(){return v};p.getColCnt=function(){return F};p.getColWidth=function(){return s};p.getDaySegmentContainer=function(){return Y};Kb.call(p,a,b,e);Lb.call(p);Mb.call(p);pc.call(p);var L=p.opt,c=p.trigger,z=p.clearEvents,H=p.renderOverlay,T=p.clearOverlays,X=p.daySelectionMousedown,
-ya=b.formatDate,K,i,C,P,E,B,n,Y,W,o,s,v,F,r,J,M,k,D,Z,ja,ia,la,$;qb(a.addClass("fc-grid"));r=new Nb(function(w,I){var R,V,ea;i.each(function(aa,va){R=m(va);V=R.offset().left;if(aa)ea[1]=V;ea=[V];I[aa]=ea});ea[1]=V+R.outerWidth();P.each(function(aa,va){if(aa<v){R=m(va);V=R.offset().top;if(aa)ea[1]=V;ea=[V];w[aa]=ea}});ea[1]=V+R.outerHeight()});J=new Ob(r);M=new Pb(function(w){return n.eq(w)})}function pc(){function a(U,ca){S(U);ua(e(U),ca)}function b(){Q();ga().empty()}function e(U){var ca=da(),ka=
-ma(),qa=N(g.visStart);ka=ba(N(qa),ka);var G=m.map(U,Ua),p,L,c,z,H,T,X=[];for(p=0;p<ca;p++){L=ob(nb(U,G,qa,ka));for(c=0;c<L.length;c++){z=L[c];for(H=0;H<z.length;H++){T=z[H];T.row=p;T.level=c;X.push(T)}}ba(qa,7);ba(ka,7)}return X}function d(U,ca,ka){t(U)&&f(U,ca);ka.isEnd&&y(U)&&pa(U,ca,ka);q(U,ca)}function f(U,ca){var ka=ra(),qa;ca.draggable({zIndex:9,delay:50,opacity:l("dragOpacity"),revertDuration:l("dragRevertDuration"),start:function(G,p){j("eventDragStart",ca,U,G,p);fa(U,ca);ka.start(function(L,
-c,z,H){ca.draggable("option","revert",!L||!z&&!H);ha();if(L){qa=z*7+H*(l("isRTL")?-1:1);sa(ba(N(U.start),qa),ba(Ua(U),qa))}else qa=0},G,"drag")},stop:function(G,p){ka.stop();ha();j("eventDragStop",ca,U,G,p);if(qa)na(this,U,qa,0,U.allDay,G,p);else{ca.css("filter","");u(U,ca)}}})}var g=this;g.renderEvents=a;g.compileDaySegs=e;g.clearEvents=b;g.bindDaySeg=d;Qb.call(g);var l=g.opt,j=g.trigger,t=g.isEventDraggable,y=g.isEventResizable,S=g.reportEvents,Q=g.reportEventClear,q=g.eventElementHandlers,u=g.showEvents,
-fa=g.hideEvents,na=g.eventDrop,ga=g.getDaySegmentContainer,ra=g.getHoverListener,sa=g.renderDayOverlay,ha=g.clearOverlays,da=g.getRowCnt,ma=g.getColCnt,ua=g.renderDaySegs,pa=g.resizableDayEvent}function qc(a,b){function e(j,t){t&&ba(j,t*7);j=ba(N(j),-((j.getDay()-f("firstDay")+7)%7));t=ba(N(j),7);var y=N(j),S=N(t),Q=f("weekends");if(!Q){Fa(y);Fa(S,-1,true)}d.title=l(y,ba(N(S),-1),f("titleFormat"));d.start=j;d.end=t;d.visStart=y;d.visEnd=S;g(Q?7:5)}var d=this;d.render=e;Rb.call(d,a,b,"agendaWeek");
-var f=d.opt,g=d.renderAgenda,l=b.formatDates}function rc(a,b){function e(j,t){if(t){ba(j,t);f("weekends")||Fa(j,t<0?-1:1)}t=N(j,true);var y=ba(N(t),1);d.title=l(j,f("titleFormat"));d.start=d.visStart=t;d.end=d.visEnd=y;g(1)}var d=this;d.render=e;Rb.call(d,a,b,"agendaDay");var f=d.opt,g=d.renderAgenda,l=b.formatDate}function Rb(a,b,e){function d(h){Ba=h;f();v?P():g();l()}function f(){Wa=i("theme")?"ui":"fc";Sb=i("weekends")?0:1;Tb=i("firstDay");if(Ub=i("isRTL")){Ha=-1;Ia=Ba-1}else{Ha=1;Ia=0}La=mb(i("minTime"));
-bb=mb(i("maxTime"));Vb=i("columnFormat")}function g(){var h=Wa+"-widget-header",O=Wa+"-widget-content",x,A,ta,za,Da,Ea=i("slotMinutes")%15==0;x="<table style='width:100%' class='fc-agenda-days fc-border-separate' cellspacing='0'><thead><tr><th class='fc-agenda-axis "+h+"'>&nbsp;</th>";for(A=0;A<Ba;A++)x+="<th class='fc- fc-col"+A+" "+h+"'/>";x+="<th class='fc-agenda-gutter "+h+"'>&nbsp;</th></tr></thead><tbody><tr><th class='fc-agenda-axis "+h+"'>&nbsp;</th>";for(A=0;A<Ba;A++)x+="<td class='fc- fc-col"+
-A+" "+O+"'><div><div class='fc-day-content'><div style='position:relative'>&nbsp;</div></div></div></td>";x+="<td class='fc-agenda-gutter "+O+"'>&nbsp;</td></tr></tbody></table>";v=m(x).appendTo(a);F=v.find("thead");r=F.find("th").slice(1,-1);J=v.find("tbody");M=J.find("td").slice(0,-1);k=M.find("div.fc-day-content div");D=M.eq(0);Z=D.find("> div");ab(F.add(F.find("tr")));ab(J.add(J.find("tr")));aa=F.find("th:first");va=v.find(".fc-agenda-gutter");ja=m("<div style='position:absolute;z-index:2;left:0;width:100%'/>").appendTo(a);
-if(i("allDaySlot")){ia=m("<div style='position:absolute;z-index:8;top:0;left:0'/>").appendTo(ja);x="<table style='width:100%' class='fc-agenda-allday' cellspacing='0'><tr><th class='"+h+" fc-agenda-axis'>"+i("allDayText")+"</th><td><div class='fc-day-content'><div style='position:relative'/></div></td><th class='"+h+" fc-agenda-gutter'>&nbsp;</th></tr></table>";la=m(x).appendTo(ja);$=la.find("tr");q($.find("td"));aa=aa.add(la.find("th:first"));va=va.add(la.find("th.fc-agenda-gutter"));ja.append("<div class='fc-agenda-divider "+
-h+"'><div class='fc-agenda-divider-inner'/></div>")}else ia=m([]);w=m("<div style='position:absolute;width:100%;overflow-x:hidden;overflow-y:auto'/>").appendTo(ja);I=m("<div style='position:relative;width:100%;overflow:hidden'/>").appendTo(w);R=m("<div style='position:absolute;z-index:8;top:0;left:0'/>").appendTo(I);x="<table class='fc-agenda-slots' style='width:100%' cellspacing='0'><tbody>";ta=zb();za=xa(N(ta),bb);xa(ta,La);for(A=tb=0;ta<za;A++){Da=ta.getMinutes();x+="<tr class='fc-slot"+A+" "+
-(!Da?"":"fc-minor")+"'><th class='fc-agenda-axis "+h+"'>"+(!Ea||!Da?s(ta,i("axisFormat")):"&nbsp;")+"</th><td class='"+O+"'><div style='position:relative'>&nbsp;</div></td></tr>";xa(ta,i("slotMinutes"));tb++}x+="</tbody></table>";V=m(x).appendTo(I);ea=V.find("div:first");u(V.find("td"));aa=aa.add(V.find("th:first"))}function l(){var h,O,x,A,ta=Ka(new Date);for(h=0;h<Ba;h++){A=ua(h);O=r.eq(h);O.html(s(A,Vb));x=M.eq(h);+A==+ta?x.addClass(Wa+"-state-highlight fc-today"):x.removeClass(Wa+"-state-highlight fc-today");
-rb(O.add(x),A)}}function j(h,O){if(h===oa)h=Wb;Wb=h;ub={};var x=J.position().top,A=w.position().top;h=Math.min(h-x,V.height()+A+1);Z.height(h-Sa(D));ja.css("top",x);w.height(h-A-1);Xa=ea.height()+1;O&&y()}function t(h){Ga=h;cb.clear();Ma=0;Va(aa.width("").each(function(O,x){Ma=Math.max(Ma,m(x).outerWidth())}),Ma);h=w[0].clientWidth;if(vb=w.width()-h){Va(va,vb);va.show().prev().removeClass("fc-last")}else va.hide().prev().addClass("fc-last");db=Math.floor((h-Ma)/Ba);Va(r.slice(0,-1),db)}function y(){function h(){w.scrollTop(A)}
-var O=zb(),x=N(O);x.setHours(i("firstHour"));var A=ca(O,x)+1;h();setTimeout(h,0)}function S(){Xb=w.scrollTop()}function Q(){w.scrollTop(Xb)}function q(h){h.click(fa).mousedown(W)}function u(h){h.click(fa).mousedown(H)}function fa(h){if(!i("selectable")){var O=Math.min(Ba-1,Math.floor((h.pageX-v.offset().left-Ma)/db)),x=ua(O),A=this.parentNode.className.match(/fc-slot(\d+)/);if(A){A=parseInt(A[1])*i("slotMinutes");var ta=Math.floor(A/60);x.setHours(ta);x.setMinutes(A%60+La);C("dayClick",M[O],x,false,
-h)}else C("dayClick",M[O],x,true,h)}}function na(h,O,x){x&&Na.build();var A=N(K.visStart);if(Ub){x=Ca(O,A)*Ha+Ia+1;h=Ca(h,A)*Ha+Ia+1}else{x=Ca(h,A);h=Ca(O,A)}x=Math.max(0,x);h=Math.min(Ba,h);x<h&&q(ga(0,x,0,h-1))}function ga(h,O,x,A){h=Na.rect(h,O,x,A,ja);return E(h,ja)}function ra(h,O){for(var x=N(K.visStart),A=ba(N(x),1),ta=0;ta<Ba;ta++){var za=new Date(Math.max(x,h)),Da=new Date(Math.min(A,O));if(za<Da){var Ea=ta*Ha+Ia;Ea=Na.rect(0,Ea,0,Ea,I);za=ca(x,za);Da=ca(x,Da);Ea.top=za;Ea.height=Da-za;u(E(Ea,
-I))}ba(x,1);ba(A,1)}}function sa(h){return cb.left(h)}function ha(h){return cb.right(h)}function da(h){return{row:Math.floor(Ca(h,K.visStart)/7),col:U(h.getDay())}}function ma(h){var O=ua(h.col);h=h.row;i("allDaySlot")&&h--;h>=0&&xa(O,La+h*i("slotMinutes"));return O}function ua(h){return ba(N(K.visStart),h*Ha+Ia)}function pa(h){return i("allDaySlot")&&!h.row}function U(h){return(h-Math.max(Tb,Sb)+Ba)%Ba*Ha+Ia}function ca(h,O){h=N(h,true);if(O<xa(N(h),La))return 0;if(O>=xa(N(h),bb))return V.height();
-h=i("slotMinutes");O=O.getHours()*60+O.getMinutes()-La;var x=Math.floor(O/h),A=ub[x];if(A===oa)A=ub[x]=V.find("tr:eq("+x+") td div")[0].offsetTop;return Math.max(0,Math.round(A-1+Xa*(O%h/h)))}function ka(){return{left:Ma,right:Ga-vb}}function qa(){return $}function G(h){var O=N(h.start);if(h.allDay)return O;return xa(O,i("defaultEventMinutes"))}function p(h,O){if(O)return N(h);return xa(N(h),i("slotMinutes"))}function L(h,O,x){if(x)i("allDaySlot")&&na(h,ba(N(O),1),true);else c(h,O)}function c(h,O){var x=
-i("selectHelper");Na.build();if(x){var A=Ca(h,K.visStart)*Ha+Ia;if(A>=0&&A<Ba){A=Na.rect(0,A,0,A,I);var ta=ca(h,h),za=ca(h,O);if(za>ta){A.top=ta;A.height=za-ta;A.left+=2;A.width-=5;if(m.isFunction(x)){if(h=x(h,O)){A.position="absolute";A.zIndex=8;wa=m(h).css(A).appendTo(I)}}else{A.isStart=true;A.isEnd=true;wa=m(o({title:"",start:h,end:O,className:["fc-select-helper"],editable:false},A));wa.css("opacity",i("dragOpacity"))}if(wa){u(wa);I.append(wa);Va(wa,A.width,true);Eb(wa,A.height,true)}}}}else ra(h,
-O)}function z(){B();if(wa){wa.remove();wa=null}}function H(h){if(h.which==1&&i("selectable")){Y(h);var O;Ra.start(function(x,A){z();if(x&&x.col==A.col&&!pa(x)){A=ma(A);x=ma(x);O=[A,xa(N(A),i("slotMinutes")),x,xa(N(x),i("slotMinutes"))].sort(Gb);c(O[0],O[3])}else O=null},h);m(document).one("mouseup",function(x){Ra.stop();if(O){+O[0]==+O[1]&&T(O[0],false,x);n(O[0],O[3],false,x)}})}}function T(h,O,x){C("dayClick",M[U(h.getDay())],h,O,x)}function X(h,O){Ra.start(function(x){B();if(x)if(pa(x))ga(x.row,
-x.col,x.row,x.col);else{x=ma(x);var A=xa(N(x),i("defaultEventMinutes"));ra(x,A)}},O)}function ya(h,O,x){var A=Ra.stop();B();A&&C("drop",h,ma(A),pa(A),O,x)}var K=this;K.renderAgenda=d;K.setWidth=t;K.setHeight=j;K.beforeHide=S;K.afterShow=Q;K.defaultEventEnd=G;K.timePosition=ca;K.dayOfWeekCol=U;K.dateCell=da;K.cellDate=ma;K.cellIsAllDay=pa;K.allDayRow=qa;K.allDayBounds=ka;K.getHoverListener=function(){return Ra};K.colContentLeft=sa;K.colContentRight=ha;K.getDaySegmentContainer=function(){return ia};
-K.getSlotSegmentContainer=function(){return R};K.getMinMinute=function(){return La};K.getMaxMinute=function(){return bb};K.getBodyContent=function(){return I};K.getRowCnt=function(){return 1};K.getColCnt=function(){return Ba};K.getColWidth=function(){return db};K.getSlotHeight=function(){return Xa};K.defaultSelectionEnd=p;K.renderDayOverlay=na;K.renderSelection=L;K.clearSelection=z;K.reportDayClick=T;K.dragStart=X;K.dragStop=ya;Kb.call(K,a,b,e);Lb.call(K);Mb.call(K);sc.call(K);var i=K.opt,C=K.trigger,
-P=K.clearEvents,E=K.renderOverlay,B=K.clearOverlays,n=K.reportSelection,Y=K.unselect,W=K.daySelectionMousedown,o=K.slotSegHtml,s=b.formatDate,v,F,r,J,M,k,D,Z,ja,ia,la,$,w,I,R,V,ea,aa,va,wa,Ga,Wb,Ma,db,vb,Xa,Xb,Ba,tb,Na,Ra,cb,ub={},Wa,Tb,Sb,Ub,Ha,Ia,La,bb,Vb;qb(a.addClass("fc-agenda"));Na=new Nb(function(h,O){function x(eb){return Math.max(Ea,Math.min(tc,eb))}var A,ta,za;r.each(function(eb,uc){A=m(uc);ta=A.offset().left;if(eb)za[1]=ta;za=[ta];O[eb]=za});za[1]=ta+A.outerWidth();if(i("allDaySlot")){A=
-$;ta=A.offset().top;h[0]=[ta,ta+A.outerHeight()]}for(var Da=I.offset().top,Ea=w.offset().top,tc=Ea+w.outerHeight(),fb=0;fb<tb;fb++)h.push([x(Da+Xa*fb),x(Da+Xa*(fb+1))])});Ra=new Ob(Na);cb=new Pb(function(h){return k.eq(h)})}function sc(){function a(o,s){sa(o);var v,F=o.length,r=[],J=[];for(v=0;v<F;v++)o[v].allDay?r.push(o[v]):J.push(o[v]);if(u("allDaySlot")){L(e(r),s);ma()}g(d(J),s)}function b(){ha();ua().empty();pa().empty()}function e(o){o=ob(nb(o,m.map(o,Ua),q.visStart,q.visEnd));var s,v=o.length,
-F,r,J,M=[];for(s=0;s<v;s++){F=o[s];for(r=0;r<F.length;r++){J=F[r];J.row=0;J.level=s;M.push(J)}}return M}function d(o){var s=z(),v=ka(),F=ca(),r=xa(N(q.visStart),v),J=m.map(o,f),M,k,D,Z,ja,ia,la=[];for(M=0;M<s;M++){k=ob(nb(o,J,r,xa(N(r),F-v)));vc(k);for(D=0;D<k.length;D++){Z=k[D];for(ja=0;ja<Z.length;ja++){ia=Z[ja];ia.col=M;ia.level=D;la.push(ia)}}ba(r,1,true)}return la}function f(o){return o.end?N(o.end):xa(N(o.start),u("defaultEventMinutes"))}function g(o,s){var v,F=o.length,r,J,M,k,D,Z,ja,ia,la,
-$="",w,I,R={},V={},ea=pa(),aa;v=z();if(w=u("isRTL")){I=-1;aa=v-1}else{I=1;aa=0}for(v=0;v<F;v++){r=o[v];J=r.event;M=qa(r.start,r.start);k=qa(r.start,r.end);D=r.col;Z=r.level;ja=r.forward||0;ia=G(D*I+aa);la=p(D*I+aa)-ia;la=Math.min(la-6,la*0.95);D=Z?la/(Z+ja+1):ja?(la/(ja+1)-6)*2:la;Z=ia+la/(Z+ja+1)*Z*I+(w?la-D:0);r.top=M;r.left=Z;r.outerWidth=D;r.outerHeight=k-M;$+=l(J,r)}ea[0].innerHTML=$;w=ea.children();for(v=0;v<F;v++){r=o[v];J=r.event;$=m(w[v]);I=fa("eventRender",J,J,$);if(I===false)$.remove();
-else{if(I&&I!==true){$.remove();$=m(I).css({position:"absolute",top:r.top,left:r.left}).appendTo(ea)}r.element=$;if(J._id===s)t(J,$,r);else $[0]._fci=v;ya(J,$)}}Db(ea,o,t);for(v=0;v<F;v++){r=o[v];if($=r.element){J=R[s=r.key=Ib($[0])];r.vsides=J===oa?(R[s]=Sa($,true)):J;J=V[s];r.hsides=J===oa?(V[s]=pb($,true)):J;s=$.find("div.fc-event-content");if(s.length)r.contentTop=s[0].offsetTop}}for(v=0;v<F;v++){r=o[v];if($=r.element){$[0].style.width=Math.max(0,r.outerWidth-r.hsides)+"px";R=Math.max(0,r.outerHeight-
-r.vsides);$[0].style.height=R+"px";J=r.event;if(r.contentTop!==oa&&R-r.contentTop<10){$.find("div.fc-event-time").text(Y(J.start,u("timeFormat"))+" - "+J.title);$.find("div.fc-event-title").remove()}fa("eventAfterRender",J,J,$)}}}function l(o,s){var v="<",F=o.url,r=Jb(o,u),J=r?" style='"+r+"'":"",M=["fc-event","fc-event-skin","fc-event-vert"];na(o)&&M.push("fc-event-draggable");s.isStart&&M.push("fc-corner-top");s.isEnd&&M.push("fc-corner-bottom");M=M.concat(o.className);if(o.source)M=M.concat(o.source.className||
-[]);v+=F?"a href='"+Qa(o.url)+"'":"div";v+=" class='"+M.join(" ")+"' style='position:absolute;z-index:8;top:"+s.top+"px;left:"+s.left+"px;"+r+"'><div class='fc-event-inner fc-event-skin'"+J+"><div class='fc-event-head fc-event-skin'"+J+"><div class='fc-event-time'>"+Qa(W(o.start,o.end,u("timeFormat")))+"</div></div><div class='fc-event-content'><div class='fc-event-title'>"+Qa(o.title)+"</div></div><div class='fc-event-bg'></div></div>";if(s.isEnd&&ga(o))v+="<div class='ui-resizable-handle ui-resizable-s'>=</div>";
-v+="</"+(F?"a":"div")+">";return v}function j(o,s,v){na(o)&&y(o,s,v.isStart);v.isEnd&&ga(o)&&c(o,s,v);da(o,s)}function t(o,s,v){var F=s.find("div.fc-event-time");na(o)&&S(o,s,F);v.isEnd&&ga(o)&&Q(o,s,F);da(o,s)}function y(o,s,v){function F(){if(!M){s.width(r).height("").draggable("option","grid",null);M=true}}var r,J,M=true,k,D=u("isRTL")?-1:1,Z=U(),ja=H(),ia=T(),la=ka();s.draggable({zIndex:9,opacity:u("dragOpacity","month"),revertDuration:u("dragRevertDuration"),start:function($,w){fa("eventDragStart",
-s,o,$,w);i(o,s);r=s.width();Z.start(function(I,R,V,ea){B();if(I){J=false;k=ea*D;if(I.row)if(v){if(M){s.width(ja-10);Eb(s,ia*Math.round((o.end?(o.end-o.start)/wc:u("defaultEventMinutes"))/u("slotMinutes")));s.draggable("option","grid",[ja,1]);M=false}}else J=true;else{E(ba(N(o.start),k),ba(Ua(o),k));F()}J=J||M&&!k}else{F();J=true}s.draggable("option","revert",J)},$,"drag")},stop:function($,w){Z.stop();B();fa("eventDragStop",s,o,$,w);if(J){F();s.css("filter","");K(o,s)}else{var I=0;M||(I=Math.round((s.offset().top-
-X().offset().top)/ia)*u("slotMinutes")+la-(o.start.getHours()*60+o.start.getMinutes()));C(this,o,k,I,M,$,w)}}})}function S(o,s,v){function F(I){var R=xa(N(o.start),I),V;if(o.end)V=xa(N(o.end),I);v.text(W(R,V,u("timeFormat")))}function r(){if(M){v.css("display","");s.draggable("option","grid",[$,w]);M=false}}var J,M=false,k,D,Z,ja=u("isRTL")?-1:1,ia=U(),la=z(),$=H(),w=T();s.draggable({zIndex:9,scroll:false,grid:[$,w],axis:la==1?"y":false,opacity:u("dragOpacity"),revertDuration:u("dragRevertDuration"),
-start:function(I,R){fa("eventDragStart",s,o,I,R);i(o,s);J=s.position();D=Z=0;ia.start(function(V,ea,aa,va){s.draggable("option","revert",!V);B();if(V){k=va*ja;if(u("allDaySlot")&&!V.row){if(!M){M=true;v.hide();s.draggable("option","grid",null)}E(ba(N(o.start),k),ba(Ua(o),k))}else r()}},I,"drag")},drag:function(I,R){D=Math.round((R.position.top-J.top)/w)*u("slotMinutes");if(D!=Z){M||F(D);Z=D}},stop:function(I,R){var V=ia.stop();B();fa("eventDragStop",s,o,I,R);if(V&&(k||D||M))C(this,o,k,M?0:D,M,I,R);
-else{r();s.css("filter","");s.css(J);F(0);K(o,s)}}})}function Q(o,s,v){var F,r,J=T();s.resizable({handles:{s:"div.ui-resizable-s"},grid:J,start:function(M,k){F=r=0;i(o,s);s.css("z-index",9);fa("eventResizeStart",this,o,M,k)},resize:function(M,k){F=Math.round((Math.max(J,s.height())-k.originalSize.height)/J);if(F!=r){v.text(W(o.start,!F&&!o.end?null:xa(ra(o),u("slotMinutes")*F),u("timeFormat")));r=F}},stop:function(M,k){fa("eventResizeStop",this,o,M,k);if(F)P(this,o,0,u("slotMinutes")*F,M,k);else{s.css("z-index",
-8);K(o,s)}}})}var q=this;q.renderEvents=a;q.compileDaySegs=e;q.clearEvents=b;q.slotSegHtml=l;q.bindDaySeg=j;Qb.call(q);var u=q.opt,fa=q.trigger,na=q.isEventDraggable,ga=q.isEventResizable,ra=q.eventEnd,sa=q.reportEvents,ha=q.reportEventClear,da=q.eventElementHandlers,ma=q.setHeight,ua=q.getDaySegmentContainer,pa=q.getSlotSegmentContainer,U=q.getHoverListener,ca=q.getMaxMinute,ka=q.getMinMinute,qa=q.timePosition,G=q.colContentLeft,p=q.colContentRight,L=q.renderDaySegs,c=q.resizableDayEvent,z=q.getColCnt,
-H=q.getColWidth,T=q.getSlotHeight,X=q.getBodyContent,ya=q.reportEventElement,K=q.showEvents,i=q.hideEvents,C=q.eventDrop,P=q.eventResize,E=q.renderDayOverlay,B=q.clearOverlays,n=q.calendar,Y=n.formatDate,W=n.formatDates}function vc(a){var b,e,d,f,g,l;for(b=a.length-1;b>0;b--){f=a[b];for(e=0;e<f.length;e++){g=f[e];for(d=0;d<a[b-1].length;d++){l=a[b-1][d];if(Cb(g,l))l.forward=Math.max(l.forward||0,(g.forward||0)+1)}}}}function Kb(a,b,e){function d(G,p){G=qa[G];if(typeof G=="object")return jb(G,p||e);
-return G}function f(G,p){return b.trigger.apply(b,[G,p||da].concat(Array.prototype.slice.call(arguments,2),[da]))}function g(G){return j(G)&&!d("disableDragging")}function l(G){return j(G)&&!d("disableResizing")}function j(G){return Ta(G.editable,(G.source||{}).editable,d("editable"))}function t(G){U={};var p,L=G.length,c;for(p=0;p<L;p++){c=G[p];if(U[c._id])U[c._id].push(c);else U[c._id]=[c]}}function y(G){return G.end?N(G.end):ma(G)}function S(G,p){ca.push(p);if(ka[G._id])ka[G._id].push(p);else ka[G._id]=
-[p]}function Q(){ca=[];ka={}}function q(G,p){p.click(function(L){if(!p.hasClass("ui-draggable-dragging")&&!p.hasClass("ui-resizable-resizing"))return f("eventClick",this,G,L)}).hover(function(L){f("eventMouseover",this,G,L)},function(L){f("eventMouseout",this,G,L)})}function u(G,p){na(G,p,"show")}function fa(G,p){na(G,p,"hide")}function na(G,p,L){G=ka[G._id];var c,z=G.length;for(c=0;c<z;c++)if(!p||G[c][0]!=p[0])G[c][L]()}function ga(G,p,L,c,z,H,T){var X=p.allDay,ya=p._id;sa(U[ya],L,c,z);f("eventDrop",
-G,p,L,c,z,function(){sa(U[ya],-L,-c,X);pa(ya)},H,T);pa(ya)}function ra(G,p,L,c,z,H){var T=p._id;ha(U[T],L,c);f("eventResize",G,p,L,c,function(){ha(U[T],-L,-c);pa(T)},z,H);pa(T)}function sa(G,p,L,c){L=L||0;for(var z,H=G.length,T=0;T<H;T++){z=G[T];if(c!==oa)z.allDay=c;xa(ba(z.start,p,true),L);if(z.end)z.end=xa(ba(z.end,p,true),L);ua(z,qa)}}function ha(G,p,L){L=L||0;for(var c,z=G.length,H=0;H<z;H++){c=G[H];c.end=xa(ba(y(c),p,true),L);ua(c,qa)}}var da=this;da.element=a;da.calendar=b;da.name=e;da.opt=
-d;da.trigger=f;da.isEventDraggable=g;da.isEventResizable=l;da.reportEvents=t;da.eventEnd=y;da.reportEventElement=S;da.reportEventClear=Q;da.eventElementHandlers=q;da.showEvents=u;da.hideEvents=fa;da.eventDrop=ga;da.eventResize=ra;var ma=da.defaultEventEnd,ua=b.normalizeEvent,pa=b.reportEventChange,U={},ca=[],ka={},qa=b.options}function Qb(){function a(i,C){var P=z(),E=pa(),B=U(),n=0,Y,W,o=i.length,s,v;P[0].innerHTML=e(i);d(i,P.children());f(i);g(i,P,C);l(i);j(i);t(i);C=y();for(P=0;P<E;P++){Y=[];for(W=
-0;W<B;W++)Y[W]=0;for(;n<o&&(s=i[n]).row==P;){W=Hb(Y.slice(s.startCol,s.endCol));s.top=W;W+=s.outerHeight;for(v=s.startCol;v<s.endCol;v++)Y[v]=W;n++}C[P].height(Hb(Y))}Q(i,S(C))}function b(i,C,P){var E=m("<div/>"),B=z(),n=i.length,Y;E[0].innerHTML=e(i);E=E.children();B.append(E);d(i,E);l(i);j(i);t(i);Q(i,S(y()));E=[];for(B=0;B<n;B++)if(Y=i[B].element){i[B].row===C&&Y.css("top",P);E.push(Y[0])}return m(E)}function e(i){var C=fa("isRTL"),P,E=i.length,B,n,Y,W;P=ka();var o=P.left,s=P.right,v,F,r,J,M,k=
-"";for(P=0;P<E;P++){B=i[P];n=B.event;W=["fc-event","fc-event-skin","fc-event-hori"];ga(n)&&W.push("fc-event-draggable");if(C){B.isStart&&W.push("fc-corner-right");B.isEnd&&W.push("fc-corner-left");v=p(B.end.getDay()-1);F=p(B.start.getDay());r=B.isEnd?qa(v):o;J=B.isStart?G(F):s}else{B.isStart&&W.push("fc-corner-left");B.isEnd&&W.push("fc-corner-right");v=p(B.start.getDay());F=p(B.end.getDay()-1);r=B.isStart?qa(v):o;J=B.isEnd?G(F):s}W=W.concat(n.className);if(n.source)W=W.concat(n.source.className||
-[]);Y=n.url;M=Jb(n,fa);k+=Y?"<a href='"+Qa(Y)+"'":"<div";k+=" class='"+W.join(" ")+"' style='position:absolute;z-index:8;left:"+r+"px;"+M+"'><div class='fc-event-inner fc-event-skin'"+(M?" style='"+M+"'":"")+">";if(!n.allDay&&B.isStart)k+="<span class='fc-event-time'>"+Qa(T(n.start,n.end,fa("timeFormat")))+"</span>";k+="<span class='fc-event-title'>"+Qa(n.title)+"</span></div>";if(B.isEnd&&ra(n))k+="<div class='ui-resizable-handle ui-resizable-"+(C?"w":"e")+"'>&nbsp;&nbsp;&nbsp;</div>";k+="</"+(Y?
-"a":"div")+">";B.left=r;B.outerWidth=J-r;B.startCol=v;B.endCol=F+1}return k}function d(i,C){var P,E=i.length,B,n,Y;for(P=0;P<E;P++){B=i[P];n=B.event;Y=m(C[P]);n=na("eventRender",n,n,Y);if(n===false)Y.remove();else{if(n&&n!==true){n=m(n).css({position:"absolute",left:B.left});Y.replaceWith(n);Y=n}B.element=Y}}}function f(i){var C,P=i.length,E,B;for(C=0;C<P;C++){E=i[C];(B=E.element)&&ha(E.event,B)}}function g(i,C,P){var E,B=i.length,n,Y,W;for(E=0;E<B;E++){n=i[E];if(Y=n.element){W=n.event;if(W._id===
-P)H(W,Y,n);else Y[0]._fci=E}}Db(C,i,H)}function l(i){var C,P=i.length,E,B,n,Y,W={};for(C=0;C<P;C++){E=i[C];if(B=E.element){n=E.key=Ib(B[0]);Y=W[n];if(Y===oa)Y=W[n]=pb(B,true);E.hsides=Y}}}function j(i){var C,P=i.length,E,B;for(C=0;C<P;C++){E=i[C];if(B=E.element)B[0].style.width=Math.max(0,E.outerWidth-E.hsides)+"px"}}function t(i){var C,P=i.length,E,B,n,Y,W={};for(C=0;C<P;C++){E=i[C];if(B=E.element){n=E.key;Y=W[n];if(Y===oa)Y=W[n]=Fb(B);E.outerHeight=B[0].offsetHeight+Y}}}function y(){var i,C=pa(),
-P=[];for(i=0;i<C;i++)P[i]=ca(i).find("td:first div.fc-day-content > div");return P}function S(i){var C,P=i.length,E=[];for(C=0;C<P;C++)E[C]=i[C][0].offsetTop;return E}function Q(i,C){var P,E=i.length,B,n;for(P=0;P<E;P++){B=i[P];if(n=B.element){n[0].style.top=C[B.row]+(B.top||0)+"px";B=B.event;na("eventAfterRender",B,B,n)}}}function q(i,C,P){var E=fa("isRTL"),B=E?"w":"e",n=C.find("div.ui-resizable-"+B),Y=false;qb(C);C.mousedown(function(W){W.preventDefault()}).click(function(W){if(Y){W.preventDefault();
-W.stopImmediatePropagation()}});n.mousedown(function(W){function o(ia){na("eventResizeStop",this,i,ia);m("body").css("cursor","");s.stop();ya();k&&ua(this,i,k,0,ia);setTimeout(function(){Y=false},0)}if(W.which==1){Y=true;var s=u.getHoverListener(),v=pa(),F=U(),r=E?-1:1,J=E?F-1:0,M=C.css("top"),k,D,Z=m.extend({},i),ja=L(i.start);K();m("body").css("cursor",B+"-resize").one("mouseup",o);na("eventResizeStart",this,i,W);s.start(function(ia,la){if(ia){var $=Math.max(ja.row,ia.row);ia=ia.col;if(v==1)$=0;
-if($==ja.row)ia=E?Math.min(ja.col,ia):Math.max(ja.col,ia);k=$*7+ia*r+J-(la.row*7+la.col*r+J);la=ba(sa(i),k,true);if(k){Z.end=la;$=D;D=b(c([Z]),P.row,M);D.find("*").css("cursor",B+"-resize");$&&$.remove();ma(i)}else if(D){da(i);D.remove();D=null}ya();X(i.start,ba(N(la),1))}},W)}})}var u=this;u.renderDaySegs=a;u.resizableDayEvent=q;var fa=u.opt,na=u.trigger,ga=u.isEventDraggable,ra=u.isEventResizable,sa=u.eventEnd,ha=u.reportEventElement,da=u.showEvents,ma=u.hideEvents,ua=u.eventResize,pa=u.getRowCnt,
-U=u.getColCnt,ca=u.allDayRow,ka=u.allDayBounds,qa=u.colContentLeft,G=u.colContentRight,p=u.dayOfWeekCol,L=u.dateCell,c=u.compileDaySegs,z=u.getDaySegmentContainer,H=u.bindDaySeg,T=u.calendar.formatDates,X=u.renderDayOverlay,ya=u.clearOverlays,K=u.clearSelection}function Mb(){function a(Q,q,u){b();q||(q=j(Q,u));t(Q,q,u);e(Q,q,u)}function b(Q){if(S){S=false;y();l("unselect",null,Q)}}function e(Q,q,u,fa){S=true;l("select",null,Q,q,u,fa)}function d(Q){var q=f.cellDate,u=f.cellIsAllDay,fa=f.getHoverListener(),
-na=f.reportDayClick;if(Q.which==1&&g("selectable")){b(Q);var ga;fa.start(function(ra,sa){y();if(ra&&u(ra)){ga=[q(sa),q(ra)].sort(Gb);t(ga[0],ga[1],true)}else ga=null},Q);m(document).one("mouseup",function(ra){fa.stop();if(ga){+ga[0]==+ga[1]&&na(ga[0],true,ra);e(ga[0],ga[1],true,ra)}})}}var f=this;f.select=a;f.unselect=b;f.reportSelection=e;f.daySelectionMousedown=d;var g=f.opt,l=f.trigger,j=f.defaultSelectionEnd,t=f.renderSelection,y=f.clearSelection,S=false;g("selectable")&&g("unselectAuto")&&m(document).mousedown(function(Q){var q=
-g("unselectCancel");if(q)if(m(Q.target).parents(q).length)return;b(Q)})}function Lb(){function a(g,l){var j=f.shift();j||(j=m("<div class='fc-cell-overlay' style='position:absolute;z-index:3'/>"));j[0].parentNode!=l[0]&&j.appendTo(l);d.push(j.css(g).show());return j}function b(){for(var g;g=d.shift();)f.push(g.hide().unbind())}var e=this;e.renderOverlay=a;e.clearOverlays=b;var d=[],f=[]}function Nb(a){var b=this,e,d;b.build=function(){e=[];d=[];a(e,d)};b.cell=function(f,g){var l=e.length,j=d.length,
-t,y=-1,S=-1;for(t=0;t<l;t++)if(g>=e[t][0]&&g<e[t][1]){y=t;break}for(t=0;t<j;t++)if(f>=d[t][0]&&f<d[t][1]){S=t;break}return y>=0&&S>=0?{row:y,col:S}:null};b.rect=function(f,g,l,j,t){t=t.offset();return{top:e[f][0]-t.top,left:d[g][0]-t.left,width:d[j][1]-d[g][0],height:e[l][1]-e[f][0]}}}function Ob(a){function b(j){j=a.cell(j.pageX,j.pageY);if(!j!=!l||j&&(j.row!=l.row||j.col!=l.col)){if(j){g||(g=j);f(j,g,j.row-g.row,j.col-g.col)}else f(j,g);l=j}}var e=this,d,f,g,l;e.start=function(j,t,y){f=j;g=l=null;
-a.build();b(t);d=y||"mousemove";m(document).bind(d,b)};e.stop=function(){m(document).unbind(d,b);return l}}function Pb(a){function b(l){return d[l]=d[l]||a(l)}var e=this,d={},f={},g={};e.left=function(l){return f[l]=f[l]===oa?b(l).position().left:f[l]};e.right=function(l){return g[l]=g[l]===oa?e.left(l)+b(l).width():g[l]};e.clear=function(){d={};f={};g={}}}var Ya={defaultView:"month",aspectRatio:1.35,header:{left:"title",center:"",right:"today prev,next"},weekends:true,allDayDefault:true,ignoreTimezone:true,
-lazyFetching:true,startParam:"start",endParam:"end",titleFormat:{month:"MMMM yyyy",week:"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",day:"dddd, MMM d, yyyy"},columnFormat:{month:"ddd",week:"ddd M/d",day:"dddd M/d"},timeFormat:{"":"h(:mm)t"},isRTL:false,firstDay:0,monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday",
-"Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],buttonText:{prev:"&nbsp;&#9668;&nbsp;",next:"&nbsp;&#9658;&nbsp;",prevYear:"&nbsp;&lt;&lt;&nbsp;",nextYear:"&nbsp;&gt;&gt;&nbsp;",today:"today",month:"month",week:"week",day:"day"},theme:false,buttonIcons:{prev:"circle-triangle-w",next:"circle-triangle-e"},unselectAuto:true,dropAccept:"*"},xc={header:{left:"next,prev today",center:"",right:"title"},buttonText:{prev:"&nbsp;&#9658;&nbsp;",next:"&nbsp;&#9668;&nbsp;",
-prevYear:"&nbsp;&gt;&gt;&nbsp;",nextYear:"&nbsp;&lt;&lt;&nbsp;"},buttonIcons:{prev:"circle-triangle-e",next:"circle-triangle-w"}},Aa=m.fullCalendar={version:"1.5.2"},Ja=Aa.views={};m.fn.fullCalendar=function(a){if(typeof a=="string"){var b=Array.prototype.slice.call(arguments,1),e;this.each(function(){var f=m.data(this,"fullCalendar");if(f&&m.isFunction(f[a])){f=f[a].apply(f,b);if(e===oa)e=f;a=="destroy"&&m.removeData(this,"fullCalendar")}});if(e!==oa)return e;return this}var d=a.eventSources||[];
-delete a.eventSources;if(a.events){d.push(a.events);delete a.events}a=m.extend(true,{},Ya,a.isRTL||a.isRTL===oa&&Ya.isRTL?xc:{},a);this.each(function(f,g){f=m(g);g=new Yb(f,a,d);f.data("fullCalendar",g);g.render()});return this};Aa.sourceNormalizers=[];Aa.sourceFetchers=[];var ac={dataType:"json",cache:false},bc=1;Aa.addDays=ba;Aa.cloneDate=N;Aa.parseDate=kb;Aa.parseISO8601=Bb;Aa.parseTime=mb;Aa.formatDate=Oa;Aa.formatDates=ib;var lc=["sun","mon","tue","wed","thu","fri","sat"],Ab=864E5,cc=36E5,wc=
-6E4,dc={s:function(a){return a.getSeconds()},ss:function(a){return Pa(a.getSeconds())},m:function(a){return a.getMinutes()},mm:function(a){return Pa(a.getMinutes())},h:function(a){return a.getHours()%12||12},hh:function(a){return Pa(a.getHours()%12||12)},H:function(a){return a.getHours()},HH:function(a){return Pa(a.getHours())},d:function(a){return a.getDate()},dd:function(a){return Pa(a.getDate())},ddd:function(a,b){return b.dayNamesShort[a.getDay()]},dddd:function(a,b){return b.dayNames[a.getDay()]},
-M:function(a){return a.getMonth()+1},MM:function(a){return Pa(a.getMonth()+1)},MMM:function(a,b){return b.monthNamesShort[a.getMonth()]},MMMM:function(a,b){return b.monthNames[a.getMonth()]},yy:function(a){return(a.getFullYear()+"").substring(2)},yyyy:function(a){return a.getFullYear()},t:function(a){return a.getHours()<12?"a":"p"},tt:function(a){return a.getHours()<12?"am":"pm"},T:function(a){return a.getHours()<12?"A":"P"},TT:function(a){return a.getHours()<12?"AM":"PM"},u:function(a){return Oa(a,
-"yyyy-MM-dd'T'HH:mm:ss'Z'")},S:function(a){a=a.getDate();if(a>10&&a<20)return"th";return["st","nd","rd"][a%10-1]||"th"}};Aa.applyAll=$a;Ja.month=mc;Ja.basicWeek=nc;Ja.basicDay=oc;wb({weekMode:"fixed"});Ja.agendaWeek=qc;Ja.agendaDay=rc;wb({allDaySlot:true,allDayText:"all-day",firstHour:6,slotMinutes:30,defaultEventMinutes:120,axisFormat:"h(:mm)tt",timeFormat:{agenda:"h:mm{ - h:mm}"},dragOpacity:{agenda:0.5},minTime:0,maxTime:24})})(jQuery);
diff --git a/3rdparty/fullcalendar/js/gcal.js b/3rdparty/fullcalendar/js/gcal.js
deleted file mode 100644
index 709e25cb262..00000000000
--- a/3rdparty/fullcalendar/js/gcal.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * FullCalendar v1.5.2 Google Calendar Plugin
- *
- * Copyright (c) 2011 Adam Shaw
- * Dual licensed under the MIT and GPL licenses, located in
- * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
- *
- * Date: Sun Aug 21 22:06:09 2011 -0700
- *
- */
-
-(function($) {
-
-
-var fc = $.fullCalendar;
-var formatDate = fc.formatDate;
-var parseISO8601 = fc.parseISO8601;
-var addDays = fc.addDays;
-var applyAll = fc.applyAll;
-
-
-fc.sourceNormalizers.push(function(sourceOptions) {
-	if (sourceOptions.dataType == 'gcal' ||
-		sourceOptions.dataType === undefined &&
-		(sourceOptions.url || '').match(/^(http|https):\/\/www.google.com\/calendar\/feeds\//)) {
-			sourceOptions.dataType = 'gcal';
-			if (sourceOptions.editable === undefined) {
-				sourceOptions.editable = false;
-			}
-		}
-});
-
-
-fc.sourceFetchers.push(function(sourceOptions, start, end) {
-	if (sourceOptions.dataType == 'gcal') {
-		return transformOptions(sourceOptions, start, end);
-	}
-});
-
-
-function transformOptions(sourceOptions, start, end) {
-
-	var success = sourceOptions.success;
-	var data = $.extend({}, sourceOptions.data || {}, {
-		'start-min': formatDate(start, 'u'),
-		'start-max': formatDate(end, 'u'),
-		'singleevents': true,
-		'max-results': 9999
-	});
-
-	var ctz = sourceOptions.currentTimezone;
-	if (ctz) {
-		data.ctz = ctz = ctz.replace(' ', '_');
-	}
-
-	return $.extend({}, sourceOptions, {
-		url: sourceOptions.url.replace(/\/basic$/, '/full') + '?alt=json-in-script&callback=?',
-		dataType: 'jsonp',
-		data: data,
-		startParam: false,
-		endParam: false,
-		success: function(data) {
-			var events = [];
-			if (data.feed.entry) {
-				$.each(data.feed.entry, function(i, entry) {
-					var startStr = entry['gd$when'][0]['startTime'];
-					var start = parseISO8601(startStr, true);
-					var end = parseISO8601(entry['gd$when'][0]['endTime'], true);
-					var allDay = startStr.indexOf('T') == -1;
-					var url;
-					$.each(entry.link, function(i, link) {
-						if (link.type == 'text/html') {
-							url = link.href;
-							if (ctz) {
-								url += (url.indexOf('?') == -1 ? '?' : '&') + 'ctz=' + ctz;
-							}
-						}
-					});
-					if (allDay) {
-						addDays(end, -1); // make inclusive
-					}
-					events.push({
-						id: entry['gCal$uid']['value'],
-						title: entry['title']['$t'],
-						url: url,
-						start: start,
-						end: end,
-						allDay: allDay,
-						location: entry['gd$where'][0]['valueString'],
-						description: entry['content']['$t']
-					});
-				});
-			}
-			var args = [events].concat(Array.prototype.slice.call(arguments, 1));
-			var res = applyAll(success, this, args);
-			if ($.isArray(res)) {
-				return res;
-			}
-			return events;
-		}
-	});
-
-}
-
-
-// legacy
-fc.gcalFeed = function(url, sourceOptions) {
-	return $.extend({}, sourceOptions, { url: url, dataType: 'gcal' });
-};
-
-
-})(jQuery);
diff --git a/3rdparty/js/chosen/LICENSE.md b/3rdparty/js/chosen/LICENSE.md
deleted file mode 100644
index 80109bba802..00000000000
--- a/3rdparty/js/chosen/LICENSE.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Chosen, a Select Box Enhancer for jQuery and Protoype
-## by Patrick Filler for [Harvest](http://getharvest.com)
-
-Available for use under the [MIT License](http://en.wikipedia.org/wiki/MIT_License)
-
-Copyright (c) 2011 by Harvest
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/3rdparty/js/chosen/README.md b/3rdparty/js/chosen/README.md
deleted file mode 100644
index cee8ed1cc08..00000000000
--- a/3rdparty/js/chosen/README.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Chosen
-
-Chosen is a library for making long, unwieldy select boxes more user friendly.
-
-- jQuery support: 1.4+
-- Prototype support: 1.7+
-
-For documentation, usage, and examples, see:  
-http://harvesthq.github.com/chosen
-
-### Contributing to Chosen
-
-Contributions and pull requests are very welcome. Please follow these guidelines when submitting new code.
-
-1. Make all changes in Coffeescript files, **not** JavaScript files.
-2. For feature changes, update both jQuery *and* Prototype versions
-3. Use 'cake build' to generate Chosen's JavaScript file and minified version.
-4. Don't touch the VERSION file
-5. Submit a Pull Request using GitHub.
-
-### Using CoffeeScript & Cake
-
-First, make sure you have the proper CoffeeScript / Cake set-up in place.
-
-1. Install Coffeescript: the [CoffeeScript documentation](http://jashkenas.github.com/coffee-script/) provides easy-to-follow instructions.
-2. Install UglifyJS: <code>npm -g install uglify-js</code>
-3. Verify that your $NODE_PATH is properly configured using <code>echo $NODE_PATH</code>
-
-Once you're configured, building the JavasScript from the command line is easy:
-
-    cake build                # build Chosen from source
-    cake watch                # watch coffee/ for changes and build Chosen
-    
-If you're interested, you can find the recipes in Cakefile.
-
-
-### Chosen Credits
-
-- Built by [Harvest](http://www.getharvest.com/)
-- Concept and development by [Patrick Filler](http://www.patrickfiller.com/)
-- Design and CSS by [Matthew Lettini](http://matthewlettini.com/)
-
-### Notable Forks
-
-- [Chosen for MooTools](https://github.com/julesjanssen/chosen), by Jules Janssen
-- [Chosen Drupal 7 Module](https://github.com/Polzme/chosen), by Pol Dell'Aiera
\ No newline at end of file
diff --git a/3rdparty/js/chosen/VERSION b/3rdparty/js/chosen/VERSION
deleted file mode 100644
index b0bb878545d..00000000000
--- a/3rdparty/js/chosen/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.9.5
diff --git a/3rdparty/js/chosen/chosen.jquery.js b/3rdparty/js/chosen/chosen.jquery.js
deleted file mode 100644
index e7e661c0962..00000000000
--- a/3rdparty/js/chosen/chosen.jquery.js
+++ /dev/null
@@ -1,857 +0,0 @@
-// Chosen, a Select Box Enhancer for jQuery and Protoype
-// by Patrick Filler for Harvest, http://getharvest.com
-// 
-// Version 0.9.5
-// Full source at https://github.com/harvesthq/chosen
-// Copyright (c) 2011 Harvest http://getharvest.com
-
-// MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
-// This file is generated by `cake build`, do not edit it by hand.
-(function() {
-  /*
-  Chosen source: generate output using 'cake build'
-  Copyright (c) 2011 by Harvest
-  */  var $, Chosen, get_side_border_padding, root;
-  var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
-  root = this;
-  $ = jQuery;
-  $.fn.extend({
-    chosen: function(options) {
-      if ($.browser === "msie" && ($.browser.version === "6.0" || $.browser.version === "7.0")) {
-        return this;
-      }
-      return $(this).each(function(input_field) {
-        if (!($(this)).hasClass("chzn-done")) {
-          return new Chosen(this, options);
-        }
-      });
-    }
-  });
-  Chosen = (function() {
-    function Chosen(form_field, options) {
-      this.form_field = form_field;
-      this.options = options != null ? options : {};
-      this.set_default_values();
-      this.form_field_jq = $(this.form_field);
-      this.is_multiple = this.form_field.multiple;
-      this.is_rtl = this.form_field_jq.hasClass("chzn-rtl");
-      this.default_text_default = this.form_field.multiple ? "Select Some Options" : "Select an Option";
-      this.set_up_html();
-      this.register_observers();
-      this.form_field_jq.addClass("chzn-done");
-    }
-    Chosen.prototype.set_default_values = function() {
-      this.click_test_action = __bind(function(evt) {
-        return this.test_active_click(evt);
-      }, this);
-      this.activate_action = __bind(function(evt) {
-        return this.activate_field(evt);
-      }, this);
-      this.active_field = false;
-      this.mouse_on_container = false;
-      this.results_showing = false;
-      this.result_highlighted = null;
-      this.result_single_selected = null;
-      this.allow_single_deselect = (this.options.allow_single_deselect != null) && this.form_field.options[0].text === "" ? this.options.allow_single_deselect : false;
-      this.disable_search_threshold = this.options.disable_search_threshold || 0;
-      this.choices = 0;
-      return this.results_none_found = this.options.no_results_text || "No results match";
-    };
-    Chosen.prototype.set_up_html = function() {
-      var container_div, dd_top, dd_width, sf_width;
-      this.container_id = this.form_field.id.length ? this.form_field.id.replace(/(:|\.)/g, '_') : this.generate_field_id();
-      this.container_id += "_chzn";
-      this.f_width = this.form_field_jq.outerWidth();
-      this.default_text = this.form_field_jq.data('placeholder') ? this.form_field_jq.data('placeholder') : this.default_text_default;
-      container_div = $("<div />", {
-        id: this.container_id,
-        "class": "chzn-container" + (this.is_rtl ? ' chzn-rtl' : ''),
-        style: 'width: ' + this.f_width + 'px;'
-      });
-      if (this.is_multiple) {
-        container_div.html('<ul class="chzn-choices"><li class="search-field"><input type="text" value="' + this.default_text + '" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chzn-drop" style="left:-9000px;"><ul class="chzn-results"></ul></div>');
-      } else {
-        container_div.html('<a href="javascript:void(0)" class="chzn-single"><span>' + this.default_text + '</span><div><b></b></div></a><div class="chzn-drop" style="left:-9000px;"><div class="chzn-search"><input type="text" autocomplete="off" /></div><ul class="chzn-results"></ul></div>');
-      }
-      this.form_field_jq.hide().after(container_div);
-      this.container = $('#' + this.container_id);
-      this.container.addClass("chzn-container-" + (this.is_multiple ? "multi" : "single"));
-      if (!this.is_multiple && this.form_field.options.length <= this.disable_search_threshold) {
-        this.container.addClass("chzn-container-single-nosearch");
-      }
-      this.dropdown = this.container.find('div.chzn-drop').first();
-      dd_top = this.container.height();
-      dd_width = this.f_width - get_side_border_padding(this.dropdown);
-      this.dropdown.css({
-        "width": dd_width + "px",
-        "top": dd_top + "px"
-      });
-      this.search_field = this.container.find('input').first();
-      this.search_results = this.container.find('ul.chzn-results').first();
-      this.search_field_scale();
-      this.search_no_results = this.container.find('li.no-results').first();
-      if (this.is_multiple) {
-        this.search_choices = this.container.find('ul.chzn-choices').first();
-        this.search_container = this.container.find('li.search-field').first();
-      } else {
-        this.search_container = this.container.find('div.chzn-search').first();
-        this.selected_item = this.container.find('.chzn-single').first();
-        sf_width = dd_width - get_side_border_padding(this.search_container) - get_side_border_padding(this.search_field);
-        this.search_field.css({
-          "width": sf_width + "px"
-        });
-      }
-      this.results_build();
-      return this.set_tab_index();
-    };
-    Chosen.prototype.register_observers = function() {
-      this.container.mousedown(__bind(function(evt) {
-        return this.container_mousedown(evt);
-      }, this));
-      this.container.mouseup(__bind(function(evt) {
-        return this.container_mouseup(evt);
-      }, this));
-      this.container.mouseenter(__bind(function(evt) {
-        return this.mouse_enter(evt);
-      }, this));
-      this.container.mouseleave(__bind(function(evt) {
-        return this.mouse_leave(evt);
-      }, this));
-      this.search_results.mouseup(__bind(function(evt) {
-        return this.search_results_mouseup(evt);
-      }, this));
-      this.search_results.mouseover(__bind(function(evt) {
-        return this.search_results_mouseover(evt);
-      }, this));
-      this.search_results.mouseout(__bind(function(evt) {
-        return this.search_results_mouseout(evt);
-      }, this));
-      this.form_field_jq.bind("liszt:updated", __bind(function(evt) {
-        return this.results_update_field(evt);
-      }, this));
-      this.search_field.blur(__bind(function(evt) {
-        return this.input_blur(evt);
-      }, this));
-      this.search_field.keyup(__bind(function(evt) {
-        return this.keyup_checker(evt);
-      }, this));
-      this.search_field.keydown(__bind(function(evt) {
-        return this.keydown_checker(evt);
-      }, this));
-      if (this.is_multiple) {
-        this.search_choices.click(__bind(function(evt) {
-          return this.choices_click(evt);
-        }, this));
-        return this.search_field.focus(__bind(function(evt) {
-          return this.input_focus(evt);
-        }, this));
-      }
-    };
-    Chosen.prototype.search_field_disabled = function() {
-      this.is_disabled = this.form_field_jq.attr('disabled');
-      if (this.is_disabled) {
-        this.container.addClass('chzn-disabled');
-        this.search_field.attr('disabled', true);
-        if (!this.is_multiple) {
-          this.selected_item.unbind("focus", this.activate_action);
-        }
-        return this.close_field();
-      } else {
-        this.container.removeClass('chzn-disabled');
-        this.search_field.attr('disabled', false);
-        if (!this.is_multiple) {
-          return this.selected_item.bind("focus", this.activate_action);
-        }
-      }
-    };
-    Chosen.prototype.container_mousedown = function(evt) {
-      var target_closelink;
-      if (!this.is_disabled) {
-        target_closelink = evt != null ? ($(evt.target)).hasClass("search-choice-close") : false;
-        if (evt && evt.type === "mousedown") {
-          evt.stopPropagation();
-        }
-        if (!this.pending_destroy_click && !target_closelink) {
-          if (!this.active_field) {
-            if (this.is_multiple) {
-              this.search_field.val("");
-            }
-            $(document).click(this.click_test_action);
-            this.results_show();
-          } else if (!this.is_multiple && evt && ($(evt.target) === this.selected_item || $(evt.target).parents("a.chzn-single").length)) {
-            evt.preventDefault();
-            this.results_toggle();
-          }
-          return this.activate_field();
-        } else {
-          return this.pending_destroy_click = false;
-        }
-      }
-    };
-    Chosen.prototype.container_mouseup = function(evt) {
-      if (evt.target.nodeName === "ABBR") {
-        return this.results_reset(evt);
-      }
-    };
-    Chosen.prototype.mouse_enter = function() {
-      return this.mouse_on_container = true;
-    };
-    Chosen.prototype.mouse_leave = function() {
-      return this.mouse_on_container = false;
-    };
-    Chosen.prototype.input_focus = function(evt) {
-      if (!this.active_field) {
-        return setTimeout((__bind(function() {
-          return this.container_mousedown();
-        }, this)), 50);
-      }
-    };
-    Chosen.prototype.input_blur = function(evt) {
-      if (!this.mouse_on_container) {
-        this.active_field = false;
-        return setTimeout((__bind(function() {
-          return this.blur_test();
-        }, this)), 100);
-      }
-    };
-    Chosen.prototype.blur_test = function(evt) {
-      if (!this.active_field && this.container.hasClass("chzn-container-active")) {
-        return this.close_field();
-      }
-    };
-    Chosen.prototype.close_field = function() {
-      $(document).unbind("click", this.click_test_action);
-      if (!this.is_multiple) {
-        this.selected_item.attr("tabindex", this.search_field.attr("tabindex"));
-        this.search_field.attr("tabindex", -1);
-      }
-      this.active_field = false;
-      this.results_hide();
-      this.container.removeClass("chzn-container-active");
-      this.winnow_results_clear();
-      this.clear_backstroke();
-      this.show_search_field_default();
-      return this.search_field_scale();
-    };
-    Chosen.prototype.activate_field = function() {
-      if (!this.is_multiple && !this.active_field) {
-        this.search_field.attr("tabindex", this.selected_item.attr("tabindex"));
-        this.selected_item.attr("tabindex", -1);
-      }
-      this.container.addClass("chzn-container-active");
-      this.active_field = true;
-      this.search_field.val(this.search_field.val());
-      return this.search_field.focus();
-    };
-    Chosen.prototype.test_active_click = function(evt) {
-      if ($(evt.target).parents('#' + this.container_id).length) {
-        return this.active_field = true;
-      } else {
-        return this.close_field();
-      }
-    };
-    Chosen.prototype.results_build = function() {
-      var content, data, startTime, _i, _len, _ref;
-      startTime = new Date();
-      this.parsing = true;
-      this.results_data = root.SelectParser.select_to_array(this.form_field);
-      if (this.is_multiple && this.choices > 0) {
-        this.search_choices.find("li.search-choice").remove();
-        this.choices = 0;
-      } else if (!this.is_multiple) {
-        this.selected_item.find("span").text(this.default_text);
-      }
-      content = '';
-      _ref = this.results_data;
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        data = _ref[_i];
-        if (data.group) {
-          content += this.result_add_group(data);
-        } else if (!data.empty) {
-          content += this.result_add_option(data);
-          if (data.selected && this.is_multiple) {
-            this.choice_build(data);
-          } else if (data.selected && !this.is_multiple) {
-            this.selected_item.find("span").text(data.text);
-            if (this.allow_single_deselect) {
-              this.selected_item.find("span").first().after("<abbr class=\"search-choice-close\"></abbr>");
-            }
-          }
-        }
-      }
-      this.search_field_disabled();
-      this.show_search_field_default();
-      this.search_field_scale();
-      this.search_results.html(content);
-      return this.parsing = false;
-    };
-    Chosen.prototype.result_add_group = function(group) {
-      if (!group.disabled) {
-        group.dom_id = this.container_id + "_g_" + group.array_index;
-        return '<li id="' + group.dom_id + '" class="group-result">' + $("<div />").text(group.label).html() + '</li>';
-      } else {
-        return "";
-      }
-    };
-    Chosen.prototype.result_add_option = function(option) {
-      var classes, style;
-      if (!option.disabled) {
-        option.dom_id = this.container_id + "_o_" + option.array_index;
-        classes = option.selected && this.is_multiple ? [] : ["active-result"];
-        if (option.selected) {
-          classes.push("result-selected");
-        }
-        if (option.group_array_index != null) {
-          classes.push("group-option");
-        }
-        if (option.classes !== "") {
-          classes.push(option.classes);
-        }
-        style = option.style.cssText !== "" ? " style=\"" + option.style + "\"" : "";
-        return '<li id="' + option.dom_id + '" class="' + classes.join(' ') + '"' + style + '>' + option.html + '</li>';
-      } else {
-        return "";
-      }
-    };
-    Chosen.prototype.results_update_field = function() {
-      this.result_clear_highlight();
-      this.result_single_selected = null;
-      return this.results_build();
-    };
-    Chosen.prototype.result_do_highlight = function(el) {
-      var high_bottom, high_top, maxHeight, visible_bottom, visible_top;
-      if (el.length) {
-        this.result_clear_highlight();
-        this.result_highlight = el;
-        this.result_highlight.addClass("highlighted");
-        maxHeight = parseInt(this.search_results.css("maxHeight"), 10);
-        visible_top = this.search_results.scrollTop();
-        visible_bottom = maxHeight + visible_top;
-        high_top = this.result_highlight.position().top + this.search_results.scrollTop();
-        high_bottom = high_top + this.result_highlight.outerHeight();
-        if (high_bottom >= visible_bottom) {
-          return this.search_results.scrollTop((high_bottom - maxHeight) > 0 ? high_bottom - maxHeight : 0);
-        } else if (high_top < visible_top) {
-          return this.search_results.scrollTop(high_top);
-        }
-      }
-    };
-    Chosen.prototype.result_clear_highlight = function() {
-      if (this.result_highlight) {
-        this.result_highlight.removeClass("highlighted");
-      }
-      return this.result_highlight = null;
-    };
-    Chosen.prototype.results_toggle = function() {
-      if (this.results_showing) {
-        return this.results_hide();
-      } else {
-        return this.results_show();
-      }
-    };
-    Chosen.prototype.results_show = function() {
-      var dd_top;
-      if (!this.is_multiple) {
-        this.selected_item.addClass("chzn-single-with-drop");
-        if (this.result_single_selected) {
-          this.result_do_highlight(this.result_single_selected);
-        }
-      }
-      dd_top = this.is_multiple ? this.container.height() : this.container.height() - 1;
-      this.dropdown.css({
-        "top": dd_top + "px",
-        "left": 0
-      });
-      this.results_showing = true;
-      this.search_field.focus();
-      this.search_field.val(this.search_field.val());
-      return this.winnow_results();
-    };
-    Chosen.prototype.results_hide = function() {
-      if (!this.is_multiple) {
-        this.selected_item.removeClass("chzn-single-with-drop");
-      }
-      this.result_clear_highlight();
-      this.dropdown.css({
-        "left": "-9000px"
-      });
-      return this.results_showing = false;
-    };
-    Chosen.prototype.set_tab_index = function(el) {
-      var ti;
-      if (this.form_field_jq.attr("tabindex")) {
-        ti = this.form_field_jq.attr("tabindex");
-        this.form_field_jq.attr("tabindex", -1);
-        if (this.is_multiple) {
-          return this.search_field.attr("tabindex", ti);
-        } else {
-          this.selected_item.attr("tabindex", ti);
-          return this.search_field.attr("tabindex", -1);
-        }
-      }
-    };
-    Chosen.prototype.show_search_field_default = function() {
-      if (this.is_multiple && this.choices < 1 && !this.active_field) {
-        this.search_field.val(this.default_text);
-        return this.search_field.addClass("default");
-      } else {
-        this.search_field.val("");
-        return this.search_field.removeClass("default");
-      }
-    };
-    Chosen.prototype.search_results_mouseup = function(evt) {
-      var target;
-      target = $(evt.target).hasClass("active-result") ? $(evt.target) : $(evt.target).parents(".active-result").first();
-      if (target.length) {
-        this.result_highlight = target;
-        return this.result_select(evt);
-      }
-    };
-    Chosen.prototype.search_results_mouseover = function(evt) {
-      var target;
-      target = $(evt.target).hasClass("active-result") ? $(evt.target) : $(evt.target).parents(".active-result").first();
-      if (target) {
-        return this.result_do_highlight(target);
-      }
-    };
-    Chosen.prototype.search_results_mouseout = function(evt) {
-      if ($(evt.target).hasClass("active-result" || $(evt.target).parents('.active-result').first())) {
-        return this.result_clear_highlight();
-      }
-    };
-    Chosen.prototype.choices_click = function(evt) {
-      evt.preventDefault();
-      if (this.active_field && !($(evt.target).hasClass("search-choice" || $(evt.target).parents('.search-choice').first)) && !this.results_showing) {
-        return this.results_show();
-      }
-    };
-    Chosen.prototype.choice_build = function(item) {
-      var choice_id, link;
-      choice_id = this.container_id + "_c_" + item.array_index;
-      this.choices += 1;
-      this.search_container.before('<li class="search-choice" id="' + choice_id + '"><span>' + item.html + '</span><a href="javascript:void(0)" class="search-choice-close" rel="' + item.array_index + '"></a></li>');
-      link = $('#' + choice_id).find("a").first();
-      return link.click(__bind(function(evt) {
-        return this.choice_destroy_link_click(evt);
-      }, this));
-    };
-    Chosen.prototype.choice_destroy_link_click = function(evt) {
-      evt.preventDefault();
-      if (!this.is_disabled) {
-        this.pending_destroy_click = true;
-        return this.choice_destroy($(evt.target));
-      } else {
-        return evt.stopPropagation;
-      }
-    };
-    Chosen.prototype.choice_destroy = function(link) {
-      this.choices -= 1;
-      this.show_search_field_default();
-      if (this.is_multiple && this.choices > 0 && this.search_field.val().length < 1) {
-        this.results_hide();
-      }
-      this.result_deselect(link.attr("rel"));
-      return link.parents('li').first().remove();
-    };
-    Chosen.prototype.results_reset = function(evt) {
-      this.form_field.options[0].selected = true;
-      this.selected_item.find("span").text(this.default_text);
-      this.show_search_field_default();
-      $(evt.target).remove();
-      this.form_field_jq.trigger("change");
-      if (this.active_field) {
-        return this.results_hide();
-      }
-    };
-    Chosen.prototype.result_select = function(evt) {
-      var high, high_id, item, position;
-      if (this.result_highlight) {
-        high = this.result_highlight;
-        high_id = high.attr("id");
-        this.result_clear_highlight();
-        if (this.is_multiple) {
-          this.result_deactivate(high);
-        } else {
-          this.search_results.find(".result-selected").removeClass("result-selected");
-          this.result_single_selected = high;
-        }
-        high.addClass("result-selected");
-        position = high_id.substr(high_id.lastIndexOf("_") + 1);
-        item = this.results_data[position];
-        item.selected = true;
-        this.form_field.options[item.options_index].selected = true;
-        if (this.is_multiple) {
-          this.choice_build(item);
-        } else {
-          this.selected_item.find("span").first().text(item.text);
-          if (this.allow_single_deselect) {
-            this.selected_item.find("span").first().after("<abbr class=\"search-choice-close\"></abbr>");
-          }
-        }
-        if (!(evt.metaKey && this.is_multiple)) {
-          this.results_hide();
-        }
-        this.search_field.val("");
-        this.form_field_jq.trigger("change");
-        return this.search_field_scale();
-      }
-    };
-    Chosen.prototype.result_activate = function(el) {
-      return el.addClass("active-result");
-    };
-    Chosen.prototype.result_deactivate = function(el) {
-      return el.removeClass("active-result");
-    };
-    Chosen.prototype.result_deselect = function(pos) {
-      var result, result_data;
-      result_data = this.results_data[pos];
-      result_data.selected = false;
-      this.form_field.options[result_data.options_index].selected = false;
-      result = $("#" + this.container_id + "_o_" + pos);
-      result.removeClass("result-selected").addClass("active-result").show();
-      this.result_clear_highlight();
-      this.winnow_results();
-      this.form_field_jq.trigger("change");
-      return this.search_field_scale();
-    };
-    Chosen.prototype.results_search = function(evt) {
-      if (this.results_showing) {
-        return this.winnow_results();
-      } else {
-        return this.results_show();
-      }
-    };
-    Chosen.prototype.winnow_results = function() {
-      var found, option, part, parts, regex, result_id, results, searchText, startTime, startpos, text, zregex, _i, _j, _len, _len2, _ref;
-      startTime = new Date();
-      this.no_results_clear();
-      results = 0;
-      searchText = this.search_field.val() === this.default_text ? "" : $('<div/>').text($.trim(this.search_field.val())).html();
-      regex = new RegExp('^' + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i');
-      zregex = new RegExp(searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i');
-      _ref = this.results_data;
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        option = _ref[_i];
-        if (!option.disabled && !option.empty) {
-          if (option.group) {
-            $('#' + option.dom_id).hide();
-          } else if (!(this.is_multiple && option.selected)) {
-            found = false;
-            result_id = option.dom_id;
-            if (regex.test(option.html)) {
-              found = true;
-              results += 1;
-            } else if (option.html.indexOf(" ") >= 0 || option.html.indexOf("[") === 0) {
-              parts = option.html.replace(/\[|\]/g, "").split(" ");
-              if (parts.length) {
-                for (_j = 0, _len2 = parts.length; _j < _len2; _j++) {
-                  part = parts[_j];
-                  if (regex.test(part)) {
-                    found = true;
-                    results += 1;
-                  }
-                }
-              }
-            }
-            if (found) {
-              if (searchText.length) {
-                startpos = option.html.search(zregex);
-                text = option.html.substr(0, startpos + searchText.length) + '</em>' + option.html.substr(startpos + searchText.length);
-                text = text.substr(0, startpos) + '<em>' + text.substr(startpos);
-              } else {
-                text = option.html;
-              }
-              if ($("#" + result_id).html !== text) {
-                $("#" + result_id).html(text);
-              }
-              this.result_activate($("#" + result_id));
-              if (option.group_array_index != null) {
-                $("#" + this.results_data[option.group_array_index].dom_id).show();
-              }
-            } else {
-              if (this.result_highlight && result_id === this.result_highlight.attr('id')) {
-                this.result_clear_highlight();
-              }
-              this.result_deactivate($("#" + result_id));
-            }
-          }
-        }
-      }
-      if (results < 1 && searchText.length) {
-        return this.no_results(searchText);
-      } else {
-        return this.winnow_results_set_highlight();
-      }
-    };
-    Chosen.prototype.winnow_results_clear = function() {
-      var li, lis, _i, _len, _results;
-      this.search_field.val("");
-      lis = this.search_results.find("li");
-      _results = [];
-      for (_i = 0, _len = lis.length; _i < _len; _i++) {
-        li = lis[_i];
-        li = $(li);
-        _results.push(li.hasClass("group-result") ? li.show() : !this.is_multiple || !li.hasClass("result-selected") ? this.result_activate(li) : void 0);
-      }
-      return _results;
-    };
-    Chosen.prototype.winnow_results_set_highlight = function() {
-      var do_high, selected_results;
-      if (!this.result_highlight) {
-        selected_results = !this.is_multiple ? this.search_results.find(".result-selected.active-result") : [];
-        do_high = selected_results.length ? selected_results.first() : this.search_results.find(".active-result").first();
-        if (do_high != null) {
-          return this.result_do_highlight(do_high);
-        }
-      }
-    };
-    Chosen.prototype.no_results = function(terms) {
-      var no_results_html;
-      no_results_html = $('<li class="no-results">' + this.results_none_found + ' "<span></span>"</li>');
-      no_results_html.find("span").first().html(terms);
-      return this.search_results.append(no_results_html);
-    };
-    Chosen.prototype.no_results_clear = function() {
-      return this.search_results.find(".no-results").remove();
-    };
-    Chosen.prototype.keydown_arrow = function() {
-      var first_active, next_sib;
-      if (!this.result_highlight) {
-        first_active = this.search_results.find("li.active-result").first();
-        if (first_active) {
-          this.result_do_highlight($(first_active));
-        }
-      } else if (this.results_showing) {
-        next_sib = this.result_highlight.nextAll("li.active-result").first();
-        if (next_sib) {
-          this.result_do_highlight(next_sib);
-        }
-      }
-      if (!this.results_showing) {
-        return this.results_show();
-      }
-    };
-    Chosen.prototype.keyup_arrow = function() {
-      var prev_sibs;
-      if (!this.results_showing && !this.is_multiple) {
-        return this.results_show();
-      } else if (this.result_highlight) {
-        prev_sibs = this.result_highlight.prevAll("li.active-result");
-        if (prev_sibs.length) {
-          return this.result_do_highlight(prev_sibs.first());
-        } else {
-          if (this.choices > 0) {
-            this.results_hide();
-          }
-          return this.result_clear_highlight();
-        }
-      }
-    };
-    Chosen.prototype.keydown_backstroke = function() {
-      if (this.pending_backstroke) {
-        this.choice_destroy(this.pending_backstroke.find("a").first());
-        return this.clear_backstroke();
-      } else {
-        this.pending_backstroke = this.search_container.siblings("li.search-choice").last();
-        return this.pending_backstroke.addClass("search-choice-focus");
-      }
-    };
-    Chosen.prototype.clear_backstroke = function() {
-      if (this.pending_backstroke) {
-        this.pending_backstroke.removeClass("search-choice-focus");
-      }
-      return this.pending_backstroke = null;
-    };
-    Chosen.prototype.keyup_checker = function(evt) {
-      var stroke, _ref;
-      stroke = (_ref = evt.which) != null ? _ref : evt.keyCode;
-      this.search_field_scale();
-      switch (stroke) {
-        case 8:
-          if (this.is_multiple && this.backstroke_length < 1 && this.choices > 0) {
-            return this.keydown_backstroke();
-          } else if (!this.pending_backstroke) {
-            this.result_clear_highlight();
-            return this.results_search();
-          }
-          break;
-        case 13:
-          evt.preventDefault();
-          if (this.results_showing) {
-            return this.result_select(evt);
-          }
-          break;
-        case 27:
-          if (this.results_showing) {
-            return this.results_hide();
-          }
-          break;
-        case 9:
-        case 38:
-        case 40:
-        case 16:
-        case 91:
-        case 17:
-          break;
-        default:
-          return this.results_search();
-      }
-    };
-    Chosen.prototype.keydown_checker = function(evt) {
-      var stroke, _ref;
-      stroke = (_ref = evt.which) != null ? _ref : evt.keyCode;
-      this.search_field_scale();
-      if (stroke !== 8 && this.pending_backstroke) {
-        this.clear_backstroke();
-      }
-      switch (stroke) {
-        case 8:
-          this.backstroke_length = this.search_field.val().length;
-          break;
-        case 9:
-          this.mouse_on_container = false;
-          break;
-        case 13:
-          evt.preventDefault();
-          break;
-        case 38:
-          evt.preventDefault();
-          this.keyup_arrow();
-          break;
-        case 40:
-          this.keydown_arrow();
-          break;
-      }
-    };
-    Chosen.prototype.search_field_scale = function() {
-      var dd_top, div, h, style, style_block, styles, w, _i, _len;
-      if (this.is_multiple) {
-        h = 0;
-        w = 0;
-        style_block = "position:absolute; left: -1000px; top: -1000px; display:none;";
-        styles = ['font-size', 'font-style', 'font-weight', 'font-family', 'line-height', 'text-transform', 'letter-spacing'];
-        for (_i = 0, _len = styles.length; _i < _len; _i++) {
-          style = styles[_i];
-          style_block += style + ":" + this.search_field.css(style) + ";";
-        }
-        div = $('<div />', {
-          'style': style_block
-        });
-        div.text(this.search_field.val());
-        $('body').append(div);
-        w = div.width() + 25;
-        div.remove();
-        if (w > this.f_width - 10) {
-          w = this.f_width - 10;
-        }
-        this.search_field.css({
-          'width': w + 'px'
-        });
-        dd_top = this.container.height();
-        return this.dropdown.css({
-          "top": dd_top + "px"
-        });
-      }
-    };
-    Chosen.prototype.generate_field_id = function() {
-      var new_id;
-      new_id = this.generate_random_id();
-      this.form_field.id = new_id;
-      return new_id;
-    };
-    Chosen.prototype.generate_random_id = function() {
-      var string;
-      string = "sel" + this.generate_random_char() + this.generate_random_char() + this.generate_random_char();
-      while ($("#" + string).length > 0) {
-        string += this.generate_random_char();
-      }
-      return string;
-    };
-    Chosen.prototype.generate_random_char = function() {
-      var chars, newchar, rand;
-      chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZ";
-      rand = Math.floor(Math.random() * chars.length);
-      return newchar = chars.substring(rand, rand + 1);
-    };
-    return Chosen;
-  })();
-  get_side_border_padding = function(elmt) {
-    var side_border_padding;
-    return side_border_padding = elmt.outerWidth() - elmt.width();
-  };
-  root.get_side_border_padding = get_side_border_padding;
-}).call(this);
-(function() {
-  var SelectParser;
-  SelectParser = (function() {
-    function SelectParser() {
-      this.options_index = 0;
-      this.parsed = [];
-    }
-    SelectParser.prototype.add_node = function(child) {
-      if (child.nodeName === "OPTGROUP") {
-        return this.add_group(child);
-      } else {
-        return this.add_option(child);
-      }
-    };
-    SelectParser.prototype.add_group = function(group) {
-      var group_position, option, _i, _len, _ref, _results;
-      group_position = this.parsed.length;
-      this.parsed.push({
-        array_index: group_position,
-        group: true,
-        label: group.label,
-        children: 0,
-        disabled: group.disabled
-      });
-      _ref = group.childNodes;
-      _results = [];
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        option = _ref[_i];
-        _results.push(this.add_option(option, group_position, group.disabled));
-      }
-      return _results;
-    };
-    SelectParser.prototype.add_option = function(option, group_position, group_disabled) {
-      if (option.nodeName === "OPTION") {
-        if (option.text !== "") {
-          if (group_position != null) {
-            this.parsed[group_position].children += 1;
-          }
-          this.parsed.push({
-            array_index: this.parsed.length,
-            options_index: this.options_index,
-            value: option.value,
-            text: option.text,
-            html: option.innerHTML,
-            selected: option.selected,
-            disabled: group_disabled === true ? group_disabled : option.disabled,
-            group_array_index: group_position,
-            classes: option.className,
-            style: option.style.cssText
-          });
-        } else {
-          this.parsed.push({
-            array_index: this.parsed.length,
-            options_index: this.options_index,
-            empty: true
-          });
-        }
-        return this.options_index += 1;
-      }
-    };
-    return SelectParser;
-  })();
-  SelectParser.select_to_array = function(select) {
-    var child, parser, _i, _len, _ref;
-    parser = new SelectParser();
-    _ref = select.childNodes;
-    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-      child = _ref[_i];
-      parser.add_node(child);
-    }
-    return parser.parsed;
-  };
-  this.SelectParser = SelectParser;
-}).call(this);
diff --git a/3rdparty/js/chosen/chosen.jquery.min.js b/3rdparty/js/chosen/chosen.jquery.min.js
deleted file mode 100644
index 371ee53e7a3..00000000000
--- a/3rdparty/js/chosen/chosen.jquery.min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Chosen, a Select Box Enhancer for jQuery and Protoype
-// by Patrick Filler for Harvest, http://getharvest.com
-// 
-// Version 0.9.5
-// Full source at https://github.com/harvesthq/chosen
-// Copyright (c) 2011 Harvest http://getharvest.com
-
-// MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
-// This file is generated by `cake build`, do not edit it by hand.
-(function(){var a,b,c,d,e=function(a,b){return function(){return a.apply(b,arguments)}};d=this,a=jQuery,a.fn.extend({chosen:function(c){return a.browser!=="msie"||a.browser.version!=="6.0"&&a.browser.version!=="7.0"?a(this).each(function(d){if(!a(this).hasClass("chzn-done"))return new b(this,c)}):this}}),b=function(){function b(b,c){this.form_field=b,this.options=c!=null?c:{},this.set_default_values(),this.form_field_jq=a(this.form_field),this.is_multiple=this.form_field.multiple,this.is_rtl=this.form_field_jq.hasClass("chzn-rtl"),this.default_text_default=this.form_field.multiple?"Select Some Options":"Select an Option",this.set_up_html(),this.register_observers(),this.form_field_jq.addClass("chzn-done")}b.prototype.set_default_values=function(){this.click_test_action=e(function(a){return this.test_active_click(a)},this),this.activate_action=e(function(a){return this.activate_field(a)},this),this.active_field=!1,this.mouse_on_container=!1,this.results_showing=!1,this.result_highlighted=null,this.result_single_selected=null,this.allow_single_deselect=this.options.allow_single_deselect!=null&&this.form_field.options[0].text===""?this.options.allow_single_deselect:!1,this.disable_search_threshold=this.options.disable_search_threshold||0,this.choices=0;return this.results_none_found=this.options.no_results_text||"No results match"},b.prototype.set_up_html=function(){var b,d,e,f;this.container_id=this.form_field.id.length?this.form_field.id.replace(/(:|\.)/g,"_"):this.generate_field_id(),this.container_id+="_chzn",this.f_width=this.form_field_jq.outerWidth(),this.default_text=this.form_field_jq.data("placeholder")?this.form_field_jq.data("placeholder"):this.default_text_default,b=a("<div />",{id:this.container_id,"class":"chzn-container"+(this.is_rtl?" chzn-rtl":""),style:"width: "+this.f_width+"px;"}),this.is_multiple?b.html('<ul class="chzn-choices"><li class="search-field"><input type="text" value="'+this.default_text+'" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chzn-drop" style="left:-9000px;"><ul class="chzn-results"></ul></div>'):b.html('<a href="javascript:void(0)" class="chzn-single"><span>'+this.default_text+'</span><div><b></b></div></a><div class="chzn-drop" style="left:-9000px;"><div class="chzn-search"><input type="text" autocomplete="off" /></div><ul class="chzn-results"></ul></div>'),this.form_field_jq.hide().after(b),this.container=a("#"+this.container_id),this.container.addClass("chzn-container-"+(this.is_multiple?"multi":"single")),!this.is_multiple&&this.form_field.options.length<=this.disable_search_threshold&&this.container.addClass("chzn-container-single-nosearch"),this.dropdown=this.container.find("div.chzn-drop").first(),d=this.container.height(),e=this.f_width-c(this.dropdown),this.dropdown.css({width:e+"px",top:d+"px"}),this.search_field=this.container.find("input").first(),this.search_results=this.container.find("ul.chzn-results").first(),this.search_field_scale(),this.search_no_results=this.container.find("li.no-results").first(),this.is_multiple?(this.search_choices=this.container.find("ul.chzn-choices").first(),this.search_container=this.container.find("li.search-field").first()):(this.search_container=this.container.find("div.chzn-search").first(),this.selected_item=this.container.find(".chzn-single").first(),f=e-c(this.search_container)-c(this.search_field),this.search_field.css({width:f+"px"})),this.results_build();return this.set_tab_index()},b.prototype.register_observers=function(){this.container.mousedown(e(function(a){return this.container_mousedown(a)},this)),this.container.mouseup(e(function(a){return this.container_mouseup(a)},this)),this.container.mouseenter(e(function(a){return this.mouse_enter(a)},this)),this.container.mouseleave(e(function(a){return this.mouse_leave(a)},this)),this.search_results.mouseup(e(function(a){return this.search_results_mouseup(a)},this)),this.search_results.mouseover(e(function(a){return this.search_results_mouseover(a)},this)),this.search_results.mouseout(e(function(a){return this.search_results_mouseout(a)},this)),this.form_field_jq.bind("liszt:updated",e(function(a){return this.results_update_field(a)},this)),this.search_field.blur(e(function(a){return this.input_blur(a)},this)),this.search_field.keyup(e(function(a){return this.keyup_checker(a)},this)),this.search_field.keydown(e(function(a){return this.keydown_checker(a)},this));if(this.is_multiple){this.search_choices.click(e(function(a){return this.choices_click(a)},this));return this.search_field.focus(e(function(a){return this.input_focus(a)},this))}},b.prototype.search_field_disabled=function(){this.is_disabled=this.form_field_jq.attr("disabled");if(this.is_disabled){this.container.addClass("chzn-disabled"),this.search_field.attr("disabled",!0),this.is_multiple||this.selected_item.unbind("focus",this.activate_action);return this.close_field()}this.container.removeClass("chzn-disabled"),this.search_field.attr("disabled",!1);if(!this.is_multiple)return this.selected_item.bind("focus",this.activate_action)},b.prototype.container_mousedown=function(b){var c;if(!this.is_disabled){c=b!=null?a(b.target).hasClass("search-choice-close"):!1,b&&b.type==="mousedown"&&b.stopPropagation();if(!this.pending_destroy_click&&!c){this.active_field?!this.is_multiple&&b&&(a(b.target)===this.selected_item||a(b.target).parents("a.chzn-single").length)&&(b.preventDefault(),this.results_toggle()):(this.is_multiple&&this.search_field.val(""),a(document).click(this.click_test_action),this.results_show());return this.activate_field()}return this.pending_destroy_click=!1}},b.prototype.container_mouseup=function(a){if(a.target.nodeName==="ABBR")return this.results_reset(a)},b.prototype.mouse_enter=function(){return this.mouse_on_container=!0},b.prototype.mouse_leave=function(){return this.mouse_on_container=!1},b.prototype.input_focus=function(a){if(!this.active_field)return setTimeout(e(function(){return this.container_mousedown()},this),50)},b.prototype.input_blur=function(a){if(!this.mouse_on_container){this.active_field=!1;return setTimeout(e(function(){return this.blur_test()},this),100)}},b.prototype.blur_test=function(a){if(!this.active_field&&this.container.hasClass("chzn-container-active"))return this.close_field()},b.prototype.close_field=function(){a(document).unbind("click",this.click_test_action),this.is_multiple||(this.selected_item.attr("tabindex",this.search_field.attr("tabindex")),this.search_field.attr("tabindex",-1)),this.active_field=!1,this.results_hide(),this.container.removeClass("chzn-container-active"),this.winnow_results_clear(),this.clear_backstroke(),this.show_search_field_default();return this.search_field_scale()},b.prototype.activate_field=function(){!this.is_multiple&&!this.active_field&&(this.search_field.attr("tabindex",this.selected_item.attr("tabindex")),this.selected_item.attr("tabindex",-1)),this.container.addClass("chzn-container-active"),this.active_field=!0,this.search_field.val(this.search_field.val());return this.search_field.focus()},b.prototype.test_active_click=function(b){return a(b.target).parents("#"+this.container_id).length?this.active_field=!0:this.close_field()},b.prototype.results_build=function(){var a,b,c,e,f,g;c=new Date,this.parsing=!0,this.results_data=d.SelectParser.select_to_array(this.form_field),this.is_multiple&&this.choices>0?(this.search_choices.find("li.search-choice").remove(),this.choices=0):this.is_multiple||this.selected_item.find("span").text(this.default_text),a="",g=this.results_data;for(e=0,f=g.length;e<f;e++)b=g[e],b.group?a+=this.result_add_group(b):b.empty||(a+=this.result_add_option(b),b.selected&&this.is_multiple?this.choice_build(b):b.selected&&!this.is_multiple&&(this.selected_item.find("span").text(b.text),this.allow_single_deselect&&this.selected_item.find("span").first().after('<abbr class="search-choice-close"></abbr>')));this.search_field_disabled(),this.show_search_field_default(),this.search_field_scale(),this.search_results.html(a);return this.parsing=!1},b.prototype.result_add_group=function(b){if(!b.disabled){b.dom_id=this.container_id+"_g_"+b.array_index;return'<li id="'+b.dom_id+'" class="group-result">'+a("<div />").text(b.label).html()+"</li>"}return""},b.prototype.result_add_option=function(a){var b,c;if(!a.disabled){a.dom_id=this.container_id+"_o_"+a.array_index,b=a.selected&&this.is_multiple?[]:["active-result"],a.selected&&b.push("result-selected"),a.group_array_index!=null&&b.push("group-option"),a.classes!==""&&b.push(a.classes),c=a.style.cssText!==""?' style="'+a.style+'"':"";return'<li id="'+a.dom_id+'" class="'+b.join(" ")+'"'+c+">"+a.html+"</li>"}return""},b.prototype.results_update_field=function(){this.result_clear_highlight(),this.result_single_selected=null;return this.results_build()},b.prototype.result_do_highlight=function(a){var b,c,d,e,f;if(a.length){this.result_clear_highlight(),this.result_highlight=a,this.result_highlight.addClass("highlighted"),d=parseInt(this.search_results.css("maxHeight"),10),f=this.search_results.scrollTop(),e=d+f,c=this.result_highlight.position().top+this.search_results.scrollTop(),b=c+this.result_highlight.outerHeight();if(b>=e)return this.search_results.scrollTop(b-d>0?b-d:0);if(c<f)return this.search_results.scrollTop(c)}},b.prototype.result_clear_highlight=function(){this.result_highlight&&this.result_highlight.removeClass("highlighted");return this.result_highlight=null},b.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},b.prototype.results_show=function(){var a;this.is_multiple||(this.selected_item.addClass("chzn-single-with-drop"),this.result_single_selected&&this.result_do_highlight(this.result_single_selected)),a=this.is_multiple?this.container.height():this.container.height()-1,this.dropdown.css({top:a+"px",left:0}),this.results_showing=!0,this.search_field.focus(),this.search_field.val(this.search_field.val());return this.winnow_results()},b.prototype.results_hide=function(){this.is_multiple||this.selected_item.removeClass("chzn-single-with-drop"),this.result_clear_highlight(),this.dropdown.css({left:"-9000px"});return this.results_showing=!1},b.prototype.set_tab_index=function(a){var b;if(this.form_field_jq.attr("tabindex")){b=this.form_field_jq.attr("tabindex"),this.form_field_jq.attr("tabindex",-1);if(this.is_multiple)return this.search_field.attr("tabindex",b);this.selected_item.attr("tabindex",b);return this.search_field.attr("tabindex",-1)}},b.prototype.show_search_field_default=function(){if(this.is_multiple&&this.choices<1&&!this.active_field){this.search_field.val(this.default_text);return this.search_field.addClass("default")}this.search_field.val("");return this.search_field.removeClass("default")},b.prototype.search_results_mouseup=function(b){var c;c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first();if(c.length){this.result_highlight=c;return this.result_select(b)}},b.prototype.search_results_mouseover=function(b){var c;c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first();if(c)return this.result_do_highlight(c)},b.prototype.search_results_mouseout=function(b){if(a(b.target).hasClass("active-result"))return this.result_clear_highlight()},b.prototype.choices_click=function(b){b.preventDefault();if(this.active_field&&!a(b.target).hasClass("search-choice")&&!this.results_showing)return this.results_show()},b.prototype.choice_build=function(b){var c,d;c=this.container_id+"_c_"+b.array_index,this.choices+=1,this.search_container.before('<li class="search-choice" id="'+c+'"><span>'+b.html+'</span><a href="javascript:void(0)" class="search-choice-close" rel="'+b.array_index+'"></a></li>'),d=a("#"+c).find("a").first();return d.click(e(function(a){return this.choice_destroy_link_click(a)},this))},b.prototype.choice_destroy_link_click=function(b){b.preventDefault();if(!this.is_disabled){this.pending_destroy_click=!0;return this.choice_destroy(a(b.target))}return b.stopPropagation},b.prototype.choice_destroy=function(a){this.choices-=1,this.show_search_field_default(),this.is_multiple&&this.choices>0&&this.search_field.val().length<1&&this.results_hide(),this.result_deselect(a.attr("rel"));return a.parents("li").first().remove()},b.prototype.results_reset=function(b){this.form_field.options[0].selected=!0,this.selected_item.find("span").text(this.default_text),this.show_search_field_default(),a(b.target).remove(),this.form_field_jq.trigger("change");if(this.active_field)return this.results_hide()},b.prototype.result_select=function(a){var b,c,d,e;if(this.result_highlight){b=this.result_highlight,c=b.attr("id"),this.result_clear_highlight(),this.is_multiple?this.result_deactivate(b):(this.search_results.find(".result-selected").removeClass("result-selected"),this.result_single_selected=b),b.addClass("result-selected"),e=c.substr(c.lastIndexOf("_")+1),d=this.results_data[e],d.selected=!0,this.form_field.options[d.options_index].selected=!0,this.is_multiple?this.choice_build(d):(this.selected_item.find("span").first().text(d.text),this.allow_single_deselect&&this.selected_item.find("span").first().after('<abbr class="search-choice-close"></abbr>')),(!a.metaKey||!this.is_multiple)&&this.results_hide(),this.search_field.val(""),this.form_field_jq.trigger("change");return this.search_field_scale()}},b.prototype.result_activate=function(a){return a.addClass("active-result")},b.prototype.result_deactivate=function(a){return a.removeClass("active-result")},b.prototype.result_deselect=function(b){var c,d;d=this.results_data[b],d.selected=!1,this.form_field.options[d.options_index].selected=!1,c=a("#"+this.container_id+"_o_"+b),c.removeClass("result-selected").addClass("active-result").show(),this.result_clear_highlight(),this.winnow_results(),this.form_field_jq.trigger("change");return this.search_field_scale()},b.prototype.results_search=function(a){return this.results_showing?this.winnow_results():this.results_show()},b.prototype.winnow_results=function(){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r;j=new Date,this.no_results_clear(),h=0,i=this.search_field.val()===this.default_text?"":a("<div/>").text(a.trim(this.search_field.val())).html(),f=new RegExp("^"+i.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),m=new RegExp(i.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),r=this.results_data;for(n=0,p=r.length;n<p;n++){c=r[n];if(!c.disabled&&!c.empty)if(c.group)a("#"+c.dom_id).hide();else if(!this.is_multiple||!c.selected){b=!1,g=c.dom_id;if(f.test(c.html))b=!0,h+=1;else if(c.html.indexOf(" ")>=0||c.html.indexOf("[")===0){e=c.html.replace(/\[|\]/g,"").split(" ");if(e.length)for(o=0,q=e.length;o<q;o++)d=e[o],f.test(d)&&(b=!0,h+=1)}b?(i.length?(k=c.html.search(m),l=c.html.substr(0,k+i.length)+"</em>"+c.html.substr(k+i.length),l=l.substr(0,k)+"<em>"+l.substr(k)):l=c.html,a("#"+g).html!==l&&a("#"+g).html(l),this.result_activate(a("#"+g)),c.group_array_index!=null&&a("#"+this.results_data[c.group_array_index].dom_id).show()):(this.result_highlight&&g===this.result_highlight.attr("id")&&this.result_clear_highlight(),this.result_deactivate(a("#"+g)))}}return h<1&&i.length?this.no_results(i):this.winnow_results_set_highlight()},b.prototype.winnow_results_clear=function(){var b,c,d,e,f;this.search_field.val(""),c=this.search_results.find("li"),f=[];for(d=0,e=c.length;d<e;d++)b=c[d],b=a(b),f.push(b.hasClass("group-result")?b.show():!this.is_multiple||!b.hasClass("result-selected")?this.result_activate(b):void 0);return f},b.prototype.winnow_results_set_highlight=function(){var a,b;if(!this.result_highlight){b=this.is_multiple?[]:this.search_results.find(".result-selected.active-result"),a=b.length?b.first():this.search_results.find(".active-result").first();if(a!=null)return this.result_do_highlight(a)}},b.prototype.no_results=function(b){var c;c=a('<li class="no-results">'+this.results_none_found+' "<span></span>"</li>'),c.find("span").first().html(b);return this.search_results.append(c)},b.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()},b.prototype.keydown_arrow=function(){var b,c;this.result_highlight?this.results_showing&&(c=this.result_highlight.nextAll("li.active-result").first(),c&&this.result_do_highlight(c)):(b=this.search_results.find("li.active-result").first(),b&&this.result_do_highlight(a(b)));if(!this.results_showing)return this.results_show()},b.prototype.keyup_arrow=function(){var a;if(!this.results_showing&&!this.is_multiple)return this.results_show();if(this.result_highlight){a=this.result_highlight.prevAll("li.active-result");if(a.length)return this.result_do_highlight(a.first());this.choices>0&&this.results_hide();return this.result_clear_highlight()}},b.prototype.keydown_backstroke=function(){if(this.pending_backstroke){this.choice_destroy(this.pending_backstroke.find("a").first());return this.clear_backstroke()}this.pending_backstroke=this.search_container.siblings("li.search-choice").last();return this.pending_backstroke.addClass("search-choice-focus")},b.prototype.clear_backstroke=function(){this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus");return this.pending_backstroke=null},b.prototype.keyup_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale();switch(b){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices>0)return this.keydown_backstroke();if(!this.pending_backstroke){this.result_clear_highlight();return this.results_search()}break;case 13:a.preventDefault();if(this.results_showing)return this.result_select(a);break;case 27:if(this.results_showing)return this.results_hide();break;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}},b.prototype.keydown_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale(),b!==8&&this.pending_backstroke&&this.clear_backstroke();switch(b){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.mouse_on_container=!1;break;case 13:a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:this.keydown_arrow()}},b.prototype.search_field_scale=function(){var b,c,d,e,f,g,h,i,j;if(this.is_multiple){d=0,h=0,f="position:absolute; left: -1000px; top: -1000px; display:none;",g=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"];for(i=0,j=g.length;i<j;i++)e=g[i],f+=e+":"+this.search_field.css(e)+";";c=a("<div />",{style:f}),c.text(this.search_field.val()),a("body").append(c),h=c.width()+25,c.remove(),h>this.f_width-10&&(h=this.f_width-10),this.search_field.css({width:h+"px"}),b=this.container.height();return this.dropdown.css({top:b+"px"})}},b.prototype.generate_field_id=function(){var a;a=this.generate_random_id(),this.form_field.id=a;return a},b.prototype.generate_random_id=function(){var b;b="sel"+this.generate_random_char()+this.generate_random_char()+this.generate_random_char();while(a("#"+b).length>0)b+=this.generate_random_char();return b},b.prototype.generate_random_char=function(){var a,b,c;a="0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZ",c=Math.floor(Math.random()*a.length);return b=a.substring(c,c+1)};return b}(),c=function(a){var b;return b=a.outerWidth()-a.width()},d.get_side_border_padding=c}).call(this),function(){var a;a=function(){function a(){this.options_index=0,this.parsed=[]}a.prototype.add_node=function(a){return a.nodeName==="OPTGROUP"?this.add_group(a):this.add_option(a)},a.prototype.add_group=function(a){var b,c,d,e,f,g;b=this.parsed.length,this.parsed.push({array_index:b,group:!0,label:a.label,children:0,disabled:a.disabled}),f=a.childNodes,g=[];for(d=0,e=f.length;d<e;d++)c=f[d],g.push(this.add_option(c,b,a.disabled));return g},a.prototype.add_option=function(a,b,c){if(a.nodeName==="OPTION"){a.text!==""?(b!=null&&(this.parsed[b].children+=1),this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:a.value,text:a.text,html:a.innerHTML,selected:a.selected,disabled:c===!0?c:a.disabled,group_array_index:b,classes:a.className,style:a.style.cssText})):this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:!0});return this.options_index+=1}};return a}(),a.select_to_array=function(b){var c,d,e,f,g;d=new a,g=b.childNodes;for(e=0,f=g.length;e<f;e++)c=g[e],d.add_node(c);return d.parsed},this.SelectParser=a}.call(this)
\ No newline at end of file
diff --git a/3rdparty/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE b/3rdparty/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
deleted file mode 100755
index a65e83e8762..00000000000
--- a/3rdparty/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
+++ /dev/null
@@ -1,399 +0,0 @@
-Simple Test interface changes
-=============================
-Because the SimpleTest tool set is still evolving it is likely that tests
-written with earlier versions will fail with the newest ones. The most
-dramatic changes are in the alpha releases. Here is a list of possible
-problems and their fixes...
-
-assertText() no longer finds a string inside a <script> tag
------------------------------------------------------------
-The assertText() method is intended to match only visible,
-human-readable text on the web page. Therefore, the contents of script
-tags should not be matched by this assertion. However there was a bug
-in the text normalisation code of simpletest which meant that <script>
-tags spanning multiple lines would not have their content stripped
-out. If you want to check the content of a <script> tag, use
-assertPattern(), or write a custom expectation.
-
-Overloaded method not working
------------------------------
-All protected and private methods had underscores
-removed. This means that any private/protected methods that
-you overloaded with those names need to be updated.
-
-Fatal error: Call to undefined method Classname::classname()
-------------------------------------------------------------
-SimpleTest renamed all of its constructors from 
-Classname to __construct; derived classes invoking
-their parent constructors should replace parent::Classname()
-with parent::__construct().
-
-Custom CSS in HtmlReporter not being applied
---------------------------------------------
-Batch rename of protected and private methods 
-means that _getCss() was renamed to getCss().
-Please rename your method and it should work again.
-
-setReturnReference() throws errors in E_STRICT
-----------------------------------------------
-Happens when an object is passed by reference.
-This also happens with setReturnReferenceAt().
-If you want to return objects then replace these
-with calls to returns() and returnsAt() with the
-same arguments. This change was forced in the 1.1
-version for E_STRICT compatibility.
-
-assertReference() throws errors in E_STRICT
--------------------------------------------
-Due to language restrictions you cannot compare
-both variables and objects in E_STRICT mode. Use
-assertSame() in this mode with objects. This change
-was forced the 1.1 version.
-
-Cannot create GroupTest
------------------------
-The GroupTest has been renamed TestSuite (see below).
-It was removed completely in 1.1 in favour of this
-name.
-
-No method getRelativeUrls() or getAbsoluteUrls()
-------------------------------------------------
-These methods were always a bit weird anyway, and
-the new parsing of the base tag makes them more so.
-They have been replaced with getUrls() instead. If
-you want the old functionality then simply chop
-off the current domain from getUrls().
-
-Method setWildcard() removed in mocks
--------------------------------------
-Even setWildcard() has been removed in 1.0.1beta now.
-If you want to test explicitely for a '*' string, then
-simply pass in new IdenticalExpectation('*') instead.
-
-No method _getTest() on mocks
------------------------------
-This has finally been removed. It was a pretty esoteric
-flex point anyway. It was there to allow the mocks to
-work with other test tools, but no one does this.
-
-No method assertError(), assertNoErrors(), swallowErrors()
-----------------------------------------------------------
-These have been deprecated in 1.0.1beta in favour of
-expectError() and expectException(). assertNoErrors() is
-redundant if you use expectError() as failures are now reported
-immediately.
-
-No method TestCase::signal()
-----------------------------
-This has been deprecated in favour of triggering an error or
-throwing an exception. Deprecated as of 1.0.1beta.
-
-No method TestCase::sendMessage()
----------------------------------
-This has been deprecated as of 1.0.1beta.
-
-Failure to connect now emits failures
--------------------------------------
-It used to be that you would have to use the
-getTransferError() call on the web tester to see if
-there was a socket level error in a fetch. This check
-is now always carried out by the WebTestCase unless
-the fetch is prefaced with WebTestCase::ignoreErrors().
-The ignore directive only lasts for the next fetching
-action such as get() and click().
-
-No method SimpleTestOptions::ignore()
--------------------------------------
-This is deprecated in version 1.0.1beta and has been moved
-to SimpleTest::ignore() as that is more readable. In
-addition, parent classes are also ignored automatically.
-If you are using PHP5 you can skip this directive simply
-by marking your test case as abstract.
-
-No method assertCopy()
-----------------------
-This is deprecated in 1.0.1 in favour of assertClone().
-The assertClone() method is slightly different in that
-the objects must be identical, but without being a
-reference. It is thus not a strict inversion of
-assertReference().
-
-Constructor wildcard override has no effect in mocks
-----------------------------------------------------
-As of 1.0.1beta this is now set with setWildcard() instead
-of in the constructor.
-
-No methods setStubBaseClass()/getStubBaseClass()
-------------------------------------------------
-As mocks are now used instead of stubs, these methods
-stopped working and are now removed as of the 1.0.1beta
-release. The mock objects may be freely used instead.
-
-No method addPartialMockCode()
-------------------------------
-The ability to insert arbitrary partial mock code
-has been removed. This was a low value feature
-causing needless complications. It was removed
-in the 1.0.1beta release.
-
-No method setMockBaseClass()
-----------------------------
-The ability to change the mock base class has been
-scheduled for removal and is deprecated since the
-1.0.1beta version. This was a rarely used feature
-except as a workaround for PHP5 limitations. As
-these limitations are being resolved it's hoped
-that the bundled mocks can be used directly.
-
-No class Stub
--------------
-Server stubs are deprecated from 1.0.1 as the mocks now
-have exactly the same interface. Just use mock objects
-instead.
-
-No class SimpleTestOptions
---------------------------
-This was replced by the shorter SimpleTest in 1.0.1beta1
-and is since deprecated.
-
-No file simple_test.php
------------------------
-This was renamed test_case.php in 1.0.1beta to more accurately
-reflect it's purpose. This file should never be directly
-included in test suites though, as it's part of the
-underlying mechanics and has a tendency to be refactored.
-
-No class WantedPatternExpectation
----------------------------------
-This was deprecated in 1.0.1alpha in favour of the simpler
-name PatternExpectation.
-
-No class NoUnwantedPatternExpectation
--------------------------------------
-This was deprecated in 1.0.1alpha in favour of the simpler
-name NoPatternExpectation.
-
-No method assertNoUnwantedPattern()
------------------------------------
-This has been renamed to assertNoPattern() in 1.0.1alpha and
-the old form is deprecated.
-
-No method assertWantedPattern()
--------------------------------
-This has been renamed to assertPattern() in 1.0.1alpha and
-the old form is deprecated.
-
-No method assertExpectation()
------------------------------
-This was renamed as assert() in 1.0.1alpha and the old form
-has been deprecated.
-
-No class WildcardExpectation
-----------------------------
-This was a mostly internal class for the mock objects. It was
-renamed AnythingExpectation to bring it closer to JMock and
-NMock in version 1.0.1alpha.
-
-Missing UnitTestCase::assertErrorPattern()
-------------------------------------------
-This method is deprecated for version 1.0.1 onwards.
-This method has been subsumed by assertError() that can now
-take an expectation. Simply pass a PatternExpectation
-into assertError() to simulate the old behaviour.
-
-No HTML when matching page elements
------------------------------------
-This behaviour has been switched to using plain text as if it
-were seen by the user of the browser. This means that HTML tags
-are suppressed, entities are converted and whitespace is
-normalised. This should make it easier to match items in forms.
-Also images are replaced with their "alt" text so that they
-can be matched as well.
-
-No method SimpleRunner::_getTestCase()
---------------------------------------
-This was made public as getTestCase() in 1.0RC2.
-
-No method restartSession()
---------------------------
-This was renamed to restart() in the WebTestCase, SimpleBrowser
-and the underlying SimpleUserAgent in 1.0RC2. Because it was
-undocumented anyway, no attempt was made at backward
-compatibility.
-
-My custom test case ignored by tally()
---------------------------------------
-The _assertTrue method has had it's signature changed due to a bug
-in the PHP 5.0.1 release. You must now use getTest() from within
-that method to get the test case. Mock compatibility with other
-unit testers is now deprecated as of 1.0.1alpha as PEAR::PHPUnit2
-should soon have mock support of it's own.
-
-Broken code extending SimpleRunner
-----------------------------------
-This was replaced with SimpleScorer so that I could use the runner
-name in another class. This happened in RC1 development and there
-is no easy backward compatibility fix. The solution is simply to
-extend SimpleScorer instead.
-
-Missing method getBaseCookieValue()
------------------------------------
-This was renamed getCurrentCookieValue() in RC1.
-
-Missing files from the SimpleTest suite
----------------------------------------
-Versions of SimpleTest prior to Beta6 required a SIMPLE_TEST constant
-to point at the SimpleTest folder location before any of the toolset
-was loaded. This is no longer documented as it is now unnecessary
-for later versions. If you are using an earlier version you may
-need this constant. Consult the documentation that was bundled with
-the release that you are using or upgrade to Beta6 or later.
-
-No method SimpleBrowser::getCurrentUrl()
---------------------------------------
-This is replaced with the more versatile showRequest() for
-debugging. It only existed in this context for version Beta5.
-Later versions will have SimpleBrowser::getHistory() for tracking
-paths through pages. It is renamed as getUrl() since 1.0RC1.
-
-No method Stub::setStubBaseClass()
-----------------------------------
-This method has finally been removed in 1.0RC1. Use
-SimpleTestOptions::setStubBaseClass() instead.
-
-No class CommandLineReporter
-----------------------------
-This was renamed to TextReporter in Beta3 and the deprecated version
-was removed in 1.0RC1.
-
-No method requireReturn()
--------------------------
-This was deprecated in Beta3 and is now removed.
-
-No method expectCookie()
-------------------------
-This method was abruptly removed in Beta4 so as to simplify the internals
-until another mechanism can replace it. As a workaround it is necessary
-to assert that the cookie has changed by setting it before the page
-fetch and then assert the desired value.
-
-No method clickSubmitByFormId()
--------------------------------
-This method had an incorrect name as no button was involved. It was
-renamed to submitByFormId() in Beta4 and the old version deprecated.
-Now removed.
-
-No method paintStart() or paintEnd()
-------------------------------------
-You should only get this error if you have subclassed the lower level
-reporting and test runner machinery. These methods have been broken
-down into events for test methods, events for test cases and events
-for group tests. The new methods are...
-
-paintStart() --> paintMethodStart(), paintCaseStart(), paintGroupStart()
-paintEnd() --> paintMethodEnd(), paintCaseEnd(), paintGroupEnd()
-
-This change was made in Beta3, ironically to make it easier to subclass
-the inner machinery. Simply duplicating the code you had in the previous
-methods should provide a temporary fix.
-
-No class TestDisplay
---------------------
-This has been folded into SimpleReporter in Beta3 and is now deprecated.
-It was removed in RC1.
-
-No method WebTestCase::fetch()
-------------------------------
-This was renamed get() in Alpha8. It is removed in Beta3.
-
-No method submit()
-------------------
-This has been renamed clickSubmit() in Beta1. The old method was
-removed in Beta2.
-
-No method clearHistory()
-------------------------
-This method is deprecated in Beta2 and removed in RC1.
-
-No method getCallCount()
-------------------------
-This method has been deprecated since Beta1 and has now been
-removed. There are now more ways to set expectations on counts
-and so this method should be unecessery. Removed in RC1.
-
-Cannot find file *
-------------------
-The following public name changes have occoured...
-
-simple_html_test.php --> reporter.php
-simple_mock.php --> mock_objects.php
-simple_unit.php --> unit_tester.php
-simple_web.php --> web_tester.php
-
-The old names were deprecated in Alpha8 and removed in Beta1.
-
-No method attachObserver()
---------------------------
-Prior to the Alpha8 release the old internal observer pattern was
-gutted and replaced with a visitor. This is to trade flexibility of
-test case expansion against the ease of writing user interfaces.
-
-Code such as...
-
-$test = &new MyTestCase();
-$test->attachObserver(new TestHtmlDisplay());
-$test->run();
-
-...should be rewritten as...
-
-$test = &new MyTestCase();
-$test->run(new HtmlReporter());
-
-If you previously attached multiple observers then the workaround
-is to run the tests twice, once with each, until they can be combined.
-For one observer the old method is simulated in Alpha 8, but is
-removed in Beta1.
-
-No class TestHtmlDisplay
-------------------------
-This class has been renamed to HtmlReporter in Alpha8. It is supported,
-but deprecated in Beta1 and removed in Beta2. If you have subclassed
-the display for your own design, then you will have to extend this
-class (HtmlReporter) instead.
-
-If you have accessed the event queue by overriding the notify() method
-then I am afraid you are in big trouble :(. The reporter is now
-carried around the test suite by the runner classes and the methods
-called directly. In the unlikely event that this is a problem and
-you don't want to upgrade the test tool then simplest is to write your
-own runner class and invoke the tests with...
-
-$test->accept(new MyRunner(new MyReporter()));
-
-...rather than the run method. This should be easier to extend
-anyway and gives much more control. Even this method is overhauled
-in Beta3 where the runner class can be set within the test case. Really
-the best thing to do is to upgrade to this version as whatever you were
-trying to achieve before should now be very much easier.
-
-Missing set options method
---------------------------
-All test suite options are now in one class called SimpleTestOptions.
-This means that options are set differently...
-
-GroupTest::ignore() --> SimpleTestOptions::ignore()
-Mock::setMockBaseClass() --> SimpleTestOptions::setMockBaseClass()
-
-These changed in Alpha8 and the old versions are now removed in RC1.
-
-No method setExpected*()
-------------------------
-The mock expectations changed their names in Alpha4 and the old names
-ceased to be supported in Alpha8. The changes are...
-
-setExpectedArguments() --> expectArguments()
-setExpectedArgumentsSequence() --> expectArgumentsAt()
-setExpectedCallCount() --> expectCallCount()
-setMaximumCallCount() --> expectMaximumCallCount()
-
-The parameters remained the same.
diff --git a/3rdparty/simpletest/LICENSE b/3rdparty/simpletest/LICENSE
deleted file mode 100755
index 09f465ab703..00000000000
--- a/3rdparty/simpletest/LICENSE
+++ /dev/null
@@ -1,502 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/3rdparty/simpletest/README b/3rdparty/simpletest/README
deleted file mode 100755
index 40f41666d40..00000000000
--- a/3rdparty/simpletest/README
+++ /dev/null
@@ -1,102 +0,0 @@
-SimpleTest
-==========
-
-You probably got this package from:
-
-    http://simpletest.org/en/download.html
-
-If there is no licence agreement with this package please download
-a version from the location above. You must read and accept that
-licence to use this software. The file is titled simply LICENSE.
-
-What is it? It's a framework for unit testing, web site testing and
-mock objects for PHP 5.0.5+.
-
-If you have used JUnit, you will find this PHP unit testing version very
-similar. Also included is a mock objects and server stubs generator.
-The stubs can have return values set for different arguments, can have
-sequences set also by arguments and can return items by reference.
-The mocks inherit all of this functionality and can also have
-expectations set, again in sequences and for different arguments.
-
-A web tester similar in concept to JWebUnit is also included. There is no
-JavaScript or tables support, but forms, authentication, cookies and
-frames are handled.
-
-You can see a release schedule at http://simpletest.org/en/overview.html
-which is also copied to the documentation folder with this release.
-A full PHPDocumenter API documentation exists at
-http://simpletest.org/api/.
-
-The user interface is minimal in the extreme, but a lot of information 
-flows from the test suite. After version 1.0 we will release a better 
-web UI, but we are leaving XUL and GTK versions to volunteers as 
-everybody has their own opinion on a good GUI, and we don't want to 
-discourage development by shipping one with the toolkit. You can 
-download an Eclipse plug-in separately. 
-
-The unit tests for SimpleTest itself can be run here:
-
-    test/unit_tests.php
-
-And tests involving live network connections as well are here:
-
-    test/all_tests.php
-
-The full tests will typically overrun the 8Mb limit often allowed
-to a PHP process. A workaround is to run the tests on the command
-with a custom php.ini file or with the switch -dmemory_limit=-1
-if you do not have access to your server version.
-
-The full tests read some test data from simpletest.org. If the site
-is down or has been modified for a later version then you will get
-spurious errors. A unit_tests.php failure on the other hand would be
-very serious. Please notify us if you find one.
-
-Even if all of the tests run please verify that your existing test suites
-also function as expected. The file:
-
-    HELP_MY_TESTS_DONT_WORK_ANYMORE
-
-...contains information on interface changes. It also points out
-deprecated interfaces, so you should read this even if all of
-your current tests appear to run.
-
-There is a documentation folder which contains the core reference information
-in English and French, although this information is fairly basic.
-You can find a tutorial on...
-
-    http://simpletest.org/en/first_test_tutorial.html
-
-...to get you started and this material will eventually become included
-with the project documentation. A French translation exists at:
-
-    http://simpletest.org/fr/first_test_tutorial.html
-
-If you download and use, and possibly even extend this tool, please let us
-know. Any feedback, even bad, is always welcome and we will work to get
-your suggestions into the next release. Ideally please send your
-comments to:
-
-    simpletest-support@lists.sourceforge.net
-
-...so that others can read them too. We usually try to respond within 48
-hours.
-
-There is no change log except at Sourceforge. You can visit the
-release notes to see the completed TODO list after each cycle and also the
-status of any bugs, but if the bug is recent then it will be fixed in SVN only.
-The SVN check-ins always have all the tests passing and so SVN snapshots should
-be pretty usable, although the code may not look so good internally.
-
-Oh, and one last thing: SimpleTest is called "Simple" because it should 
-be simple to use. We intend to add a complete set of tools for a test 
-first and "test as you code" type of development. "Simple" does not mean 
-"Lite" in this context. 
-
-Thanks to everyone who has sent comments and offered suggestions. They
-really are invaluable, but sadly you are too many to mention in full.
-Thanks to all on the advanced PHP forum on SitePoint, especially Harry
-Fuecks. Early adopters are always an inspiration.
-
- -- Marcus Baker, Jason Sweat, Travis Swicegood, Perrick Penet and Edward Z. Yang.
diff --git a/3rdparty/simpletest/VERSION b/3rdparty/simpletest/VERSION
deleted file mode 100755
index 9084fa2f716..00000000000
--- a/3rdparty/simpletest/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.1.0
diff --git a/3rdparty/simpletest/arguments.php b/3rdparty/simpletest/arguments.php
deleted file mode 100755
index 89e7f9de6ef..00000000000
--- a/3rdparty/simpletest/arguments.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: dumper.php 1909 2009-07-29 15:58:11Z dgheath $
- */
-
-/**
- *    Parses the command line arguments.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleArguments {
-    private $all = array();
-
-    /**
-     * Parses the command line arguments. The usual formats
-     * are supported:
-     * -f value
-     * -f=value
-     * --flag=value
-     * --flag value
-     * -f           (true)
-     * --flag       (true)
-     * @param array $arguments      Normally the PHP $argv.
-     */
-    function __construct($arguments) {
-        array_shift($arguments);
-        while (count($arguments) > 0) {
-            list($key, $value) = $this->parseArgument($arguments);
-            $this->assign($key, $value);
-        }
-    }
-
-    /**
-     * Sets the value in the argments object. If multiple
-     * values are added under the same key, the key will
-     * give an array value in the order they were added.
-     * @param string $key    The variable to assign to.
-     * @param string value   The value that would norally
-     *                       be colected on the command line.
-     */
-    function assign($key, $value) {
-        if ($this->$key === false) {
-            $this->all[$key] = $value;
-        } elseif (! is_array($this->$key)) {
-            $this->all[$key] = array($this->$key, $value);
-        } else {
-            $this->all[$key][] = $value;
-        }
-    }
-
-    /**
-     * Extracts the next key and value from the argument list.
-     * @param array $arguments      The remaining arguments to be parsed.
-     *                              The argument list will be reduced.
-     * @return array                Two item array of key and value.
-     *                              If no value can be found it will
-     *                              have the value true assigned instead.
-     */
-    private function parseArgument(&$arguments) {
-        $argument = array_shift($arguments);
-        if (preg_match('/^-(\w)=(.+)$/', $argument, $matches)) {
-            return array($matches[1], $matches[2]);
-        } elseif (preg_match('/^-(\w)$/', $argument, $matches)) {
-            return array($matches[1], $this->nextNonFlagElseTrue($arguments));
-        } elseif (preg_match('/^--(\w+)=(.+)$/', $argument, $matches)) {
-            return array($matches[1], $matches[2]);
-        } elseif (preg_match('/^--(\w+)$/', $argument, $matches)) {
-            return array($matches[1], $this->nextNonFlagElseTrue($arguments));
-        }
-    }
-
-    /**
-     * Attempts to use the next argument as a value. It
-     * won't use what it thinks is a flag.
-     * @param array $arguments    Remaining arguments to be parsed.
-     *                            This variable is modified if there
-     *                            is a value to be extracted.
-     * @return string/boolean     The next value unless it's a flag.
-     */
-    private function nextNonFlagElseTrue(&$arguments) {
-        return $this->valueIsNext($arguments) ? array_shift($arguments) : true;
-    }
-
-    /**
-     * Test to see if the next available argument is a valid value.
-     * If it starts with "-" or "--" it's a flag and doesn't count.
-     * @param array $arguments    Remaining arguments to be parsed.
-     *                            Not affected by this call.
-     * boolean                    True if valid value.
-     */
-    function valueIsNext($arguments) {
-        return isset($arguments[0]) && ! $this->isFlag($arguments[0]);
-    }
-
-    /**
-     * It's a flag if it starts with "-" or "--".
-     * @param string $argument       Value to be tested.
-     * @return boolean               True if it's a flag.
-     */
-    function isFlag($argument) {
-        return strncmp($argument, '-', 1) == 0;
-    }
-
-    /**
-     * The arguments are available as individual member
-     * variables on the object.
-     * @param string $key              Argument name.
-     * @return string/array/boolean    Either false for no value,
-     *                                 the value as a string or
-     *                                 a list of multiple values if
-     *                                 the flag had been specified more
-     *                                 than once.
-     */
-    function __get($key) {
-        if (isset($this->all[$key])) {
-            return $this->all[$key];
-        }
-        return false;
-    }
-
-    /**
-     * The entire argument set as a hash.
-     * @return hash         Each argument and it's value(s).
-     */
-    function all() {
-        return $this->all;
-    }
-}
-
-/**
- *    Renders the help for the command line arguments.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleHelp {
-    private $overview;
-    private $flag_sets = array();
-    private $explanations = array();
-
-    /**
-     * Sets up the top level explanation for the program.
-     * @param string $overview        Summary of program.
-     */
-    function __construct($overview = '') {
-        $this->overview = $overview;
-    }
-
-    /**
-     * Adds the explanation for a group of flags that all
-     * have the same function.
-     * @param string/array $flags       Flag and alternates. Don't
-     *                                  worry about leading dashes
-     *                                  as these are inserted automatically.
-     * @param string $explanation       What that flag group does.
-     */
-    function explainFlag($flags, $explanation) {
-        $flags = is_array($flags) ? $flags : array($flags);
-        $this->flag_sets[] = $flags;
-        $this->explanations[] = $explanation;
-    }
-
-    /**
-     * Generates the help text.
-     * @returns string      The complete formatted text.
-     */
-    function render() {
-        $tab_stop = $this->longestFlag($this->flag_sets) + 4;
-        $text = $this->overview . "\n";
-        for ($i = 0; $i < count($this->flag_sets); $i++) {
-            $text .= $this->renderFlagSet($this->flag_sets[$i], $this->explanations[$i], $tab_stop);
-        }
-        return $this->noDuplicateNewLines($text);
-    }
-
-    /**
-     * Works out the longest flag for formatting purposes.
-     * @param array $flag_sets      The internal flag set list.
-     */
-    private function longestFlag($flag_sets) {
-        $longest = 0;
-        foreach ($flag_sets as $flags) {
-            foreach ($flags as $flag) {
-                $longest = max($longest, strlen($this->renderFlag($flag)));
-            }
-        }
-        return $longest;
-    }
-
-    /**
-     * Generates the text for a single flag and it's alternate flags.
-     * @returns string           Help text for that flag group.
-     */
-    private function renderFlagSet($flags, $explanation, $tab_stop) {
-        $flag = array_shift($flags);
-        $text = str_pad($this->renderFlag($flag), $tab_stop, ' ') . $explanation . "\n";
-        foreach ($flags as $flag) {
-            $text .= '  ' . $this->renderFlag($flag) . "\n";
-        }
-        return $text;
-    }
-
-    /**
-     * Generates the flag name including leading dashes.
-     * @param string $flag          Just the name.
-     * @returns                     Fag with apropriate dashes.
-     */
-    private function renderFlag($flag) {
-        return (strlen($flag) == 1 ? '-' : '--') . $flag;
-    }
-
-    /**
-     * Converts multiple new lines into a single new line.
-     * Just there to trap accidental duplicate new lines.
-     * @param string $text      Text to clean up.
-     * @returns string          Text with no blank lines.
-     */
-    private function noDuplicateNewLines($text) {
-        return preg_replace('/(\n+)/', "\n", $text);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/authentication.php b/3rdparty/simpletest/authentication.php
deleted file mode 100644
index fcd4efd3f0a..00000000000
--- a/3rdparty/simpletest/authentication.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: authentication.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-/**
- *  include http class
- */
-require_once(dirname(__FILE__) . '/http.php');
-
-/**
- *    Represents a single security realm's identity.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleRealm {
-    private $type;
-    private $root;
-    private $username;
-    private $password;
-
-    /**
-     *    Starts with the initial entry directory.
-     *    @param string $type      Authentication type for this
-     *                             realm. Only Basic authentication
-     *                             is currently supported.
-     *    @param SimpleUrl $url    Somewhere in realm.
-     *    @access public
-     */
-    function SimpleRealm($type, $url) {
-        $this->type = $type;
-        $this->root = $url->getBasePath();
-        $this->username = false;
-        $this->password = false;
-    }
-
-    /**
-     *    Adds another location to the realm.
-     *    @param SimpleUrl $url    Somewhere in realm.
-     *    @access public
-     */
-    function stretch($url) {
-        $this->root = $this->getCommonPath($this->root, $url->getPath());
-    }
-
-    /**
-     *    Finds the common starting path.
-     *    @param string $first        Path to compare.
-     *    @param string $second       Path to compare.
-     *    @return string              Common directories.
-     *    @access private
-     */
-    protected function getCommonPath($first, $second) {
-        $first = explode('/', $first);
-        $second = explode('/', $second);
-        for ($i = 0; $i < min(count($first), count($second)); $i++) {
-            if ($first[$i] != $second[$i]) {
-                return implode('/', array_slice($first, 0, $i)) . '/';
-            }
-        }
-        return implode('/', $first) . '/';
-    }
-
-    /**
-     *    Sets the identity to try within this realm.
-     *    @param string $username    Username in authentication dialog.
-     *    @param string $username    Password in authentication dialog.
-     *    @access public
-     */
-    function setIdentity($username, $password) {
-        $this->username = $username;
-        $this->password = $password;
-    }
-
-    /**
-     *    Accessor for current identity.
-     *    @return string        Last succesful username.
-     *    @access public
-     */
-    function getUsername() {
-        return $this->username;
-    }
-
-    /**
-     *    Accessor for current identity.
-     *    @return string        Last succesful password.
-     *    @access public
-     */
-    function getPassword() {
-        return $this->password;
-    }
-
-    /**
-     *    Test to see if the URL is within the directory
-     *    tree of the realm.
-     *    @param SimpleUrl $url    URL to test.
-     *    @return boolean          True if subpath.
-     *    @access public
-     */
-    function isWithin($url) {
-        if ($this->isIn($this->root, $url->getBasePath())) {
-            return true;
-        }
-        if ($this->isIn($this->root, $url->getBasePath() . $url->getPage() . '/')) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     *    Tests to see if one string is a substring of
-     *    another.
-     *    @param string $part        Small bit.
-     *    @param string $whole       Big bit.
-     *    @return boolean            True if the small bit is
-     *                               in the big bit.
-     *    @access private
-     */
-    protected function isIn($part, $whole) {
-        return strpos($whole, $part) === 0;
-    }
-}
-
-/**
- *    Manages security realms.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleAuthenticator {
-    private $realms;
-
-    /**
-     *    Clears the realms.
-     *    @access public
-     */
-    function SimpleAuthenticator() {
-        $this->restartSession();
-    }
-
-    /**
-     *    Starts with no realms set up.
-     *    @access public
-     */
-    function restartSession() {
-        $this->realms = array();
-    }
-
-    /**
-     *    Adds a new realm centered the current URL.
-     *    Browsers privatey wildly on their behaviour in this
-     *    regard. Mozilla ignores the realm and presents
-     *    only when challenged, wasting bandwidth. IE
-     *    just carries on presenting until a new challenge
-     *    occours. SimpleTest tries to follow the spirit of
-     *    the original standards committee and treats the
-     *    base URL as the root of a file tree shaped realm.
-     *    @param SimpleUrl $url    Base of realm.
-     *    @param string $type      Authentication type for this
-     *                             realm. Only Basic authentication
-     *                             is currently supported.
-     *    @param string $realm     Name of realm.
-     *    @access public
-     */
-    function addRealm($url, $type, $realm) {
-        $this->realms[$url->getHost()][$realm] = new SimpleRealm($type, $url);
-    }
-
-    /**
-     *    Sets the current identity to be presented
-     *    against that realm.
-     *    @param string $host        Server hosting realm.
-     *    @param string $realm       Name of realm.
-     *    @param string $username    Username for realm.
-     *    @param string $password    Password for realm.
-     *    @access public
-     */
-    function setIdentityForRealm($host, $realm, $username, $password) {
-        if (isset($this->realms[$host][$realm])) {
-            $this->realms[$host][$realm]->setIdentity($username, $password);
-        }
-    }
-
-    /**
-     *    Finds the name of the realm by comparing URLs.
-     *    @param SimpleUrl $url        URL to test.
-     *    @return SimpleRealm          Name of realm.
-     *    @access private
-     */
-    protected function findRealmFromUrl($url) {
-        if (! isset($this->realms[$url->getHost()])) {
-            return false;
-        }
-        foreach ($this->realms[$url->getHost()] as $name => $realm) {
-            if ($realm->isWithin($url)) {
-                return $realm;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Presents the appropriate headers for this location.
-     *    @param SimpleHttpRequest $request  Request to modify.
-     *    @param SimpleUrl $url              Base of realm.
-     *    @access public
-     */
-    function addHeaders(&$request, $url) {
-        if ($url->getUsername() && $url->getPassword()) {
-            $username = $url->getUsername();
-            $password = $url->getPassword();
-        } elseif ($realm = $this->findRealmFromUrl($url)) {
-            $username = $realm->getUsername();
-            $password = $realm->getPassword();
-        } else {
-            return;
-        }
-        $this->addBasicHeaders($request, $username, $password);
-    }
-
-    /**
-     *    Presents the appropriate headers for this
-     *    location for basic authentication.
-     *    @param SimpleHttpRequest $request  Request to modify.
-     *    @param string $username            Username for realm.
-     *    @param string $password            Password for realm.
-     *    @access public
-     */
-    static function addBasicHeaders(&$request, $username, $password) {
-        if ($username && $password) {
-            $request->addHeaderLine(
-                'Authorization: Basic ' . base64_encode("$username:$password"));
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/autorun.php b/3rdparty/simpletest/autorun.php
deleted file mode 100644
index 8faf84d3ceb..00000000000
--- a/3rdparty/simpletest/autorun.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- *  Autorunner which runs all tests cases found in a file
- *  that includes this module.
- *  @package    SimpleTest
- *  @version    $Id: autorun.php 2037 2011-11-30 17:58:21Z pp11 $
- */
-
-/**#@+
- * include simpletest files
- */
-require_once dirname(__FILE__) . '/unit_tester.php';
-require_once dirname(__FILE__) . '/mock_objects.php';
-require_once dirname(__FILE__) . '/collector.php';
-require_once dirname(__FILE__) . '/default_reporter.php';
-/**#@-*/
-
-$GLOBALS['SIMPLETEST_AUTORUNNER_INITIAL_CLASSES'] = get_declared_classes();
-$GLOBALS['SIMPLETEST_AUTORUNNER_INITIAL_PATH'] = getcwd();
-register_shutdown_function('simpletest_autorun');
-
-/**
- *    Exit handler to run all recent test cases and exit system if in CLI
- */
-function simpletest_autorun() {
-	chdir($GLOBALS['SIMPLETEST_AUTORUNNER_INITIAL_PATH']);
-    if (tests_have_run()) {
-        return;
-    }
-    $result = run_local_tests();
-    if (SimpleReporter::inCli()) {
-        exit($result ? 0 : 1);
-    }
-}
-
-/**
- *    run all recent test cases if no test has
- *    so far been run. Uses the DefaultReporter which can have
- *    it's output controlled with SimpleTest::prefer().
- *    @return boolean/null false if there were test failures, true if
- *                         there were no failures, null if tests are
- *                         already running
- */
-function run_local_tests() {
-    try {
-        if (tests_have_run()) {
-            return;
-        }
-        $candidates = capture_new_classes();
-        $loader = new SimpleFileLoader();
-        $suite = $loader->createSuiteFromClasses(
-                basename(initial_file()),
-                $loader->selectRunnableTests($candidates));
-        return $suite->run(new DefaultReporter());
-    } catch (Exception $stack_frame_fix) {
-        print $stack_frame_fix->getMessage();
-        return false;
-    }
-}
-
-/**
- *    Checks the current test context to see if a test has
- *    ever been run.
- *    @return boolean        True if tests have run.
- */
-function tests_have_run() {
-    if ($context = SimpleTest::getContext()) {
-        return (boolean)$context->getTest();
-    }
-    return false;
-}
-
-/**
- *    The first autorun file.
- *    @return string        Filename of first autorun script.
- */
-function initial_file() {
-    static $file = false;
-    if (! $file) {
-        if (isset($_SERVER, $_SERVER['SCRIPT_FILENAME'])) {
-            $file = $_SERVER['SCRIPT_FILENAME'];
-        } else {
-            $included_files = get_included_files();
-            $file = reset($included_files);
-        }
-    }
-    return $file;
-}
-
-/**
- *    Every class since the first autorun include. This
- *    is safe enough if require_once() is always used.
- *    @return array        Class names.
- */
-function capture_new_classes() {
-    global $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES;
-    return array_map('strtolower', array_diff(get_declared_classes(),
-                            $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES ?
-                            $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES : array()));
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/browser.php b/3rdparty/simpletest/browser.php
deleted file mode 100644
index 615e738d350..00000000000
--- a/3rdparty/simpletest/browser.php
+++ /dev/null
@@ -1,1144 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: browser.php 2013 2011-04-29 09:29:45Z pp11 $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/simpletest.php');
-require_once(dirname(__FILE__) . '/http.php');
-require_once(dirname(__FILE__) . '/encoding.php');
-require_once(dirname(__FILE__) . '/page.php');
-require_once(dirname(__FILE__) . '/php_parser.php');
-require_once(dirname(__FILE__) . '/tidy_parser.php');
-require_once(dirname(__FILE__) . '/selector.php');
-require_once(dirname(__FILE__) . '/frames.php');
-require_once(dirname(__FILE__) . '/user_agent.php');
-if (! SimpleTest::getParsers()) {
-    SimpleTest::setParsers(array(new SimpleTidyPageBuilder(), new SimplePHPPageBuilder()));
-    //SimpleTest::setParsers(array(new SimplePHPPageBuilder()));
-}
-/**#@-*/
-
-if (! defined('DEFAULT_MAX_NESTED_FRAMES')) {
-    define('DEFAULT_MAX_NESTED_FRAMES', 3);
-}
-
-/**
- *    Browser history list.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleBrowserHistory {
-    private $sequence = array();
-    private $position = -1;
-
-    /**
-     *    Test for no entries yet.
-     *    @return boolean        True if empty.
-     *    @access private
-     */
-    protected function isEmpty() {
-        return ($this->position == -1);
-    }
-
-    /**
-     *    Test for being at the beginning.
-     *    @return boolean        True if first.
-     *    @access private
-     */
-    protected function atBeginning() {
-        return ($this->position == 0) && ! $this->isEmpty();
-    }
-
-    /**
-     *    Test for being at the last entry.
-     *    @return boolean        True if last.
-     *    @access private
-     */
-    protected function atEnd() {
-        return ($this->position + 1 >= count($this->sequence)) && ! $this->isEmpty();
-    }
-
-    /**
-     *    Adds a successfully fetched page to the history.
-     *    @param SimpleUrl $url                 URL of fetch.
-     *    @param SimpleEncoding $parameters     Any post data with the fetch.
-     *    @access public
-     */
-    function recordEntry($url, $parameters) {
-        $this->dropFuture();
-        array_push(
-                $this->sequence,
-                array('url' => $url, 'parameters' => $parameters));
-        $this->position++;
-    }
-
-    /**
-     *    Last fully qualified URL for current history
-     *    position.
-     *    @return SimpleUrl        URL for this position.
-     *    @access public
-     */
-    function getUrl() {
-        if ($this->isEmpty()) {
-            return false;
-        }
-        return $this->sequence[$this->position]['url'];
-    }
-
-    /**
-     *    Parameters of last fetch from current history
-     *    position.
-     *    @return SimpleFormEncoding    Post parameters.
-     *    @access public
-     */
-    function getParameters() {
-        if ($this->isEmpty()) {
-            return false;
-        }
-        return $this->sequence[$this->position]['parameters'];
-    }
-
-    /**
-     *    Step back one place in the history. Stops at
-     *    the first page.
-     *    @return boolean     True if any previous entries.
-     *    @access public
-     */
-    function back() {
-        if ($this->isEmpty() || $this->atBeginning()) {
-            return false;
-        }
-        $this->position--;
-        return true;
-    }
-
-    /**
-     *    Step forward one place. If already at the
-     *    latest entry then nothing will happen.
-     *    @return boolean     True if any future entries.
-     *    @access public
-     */
-    function forward() {
-        if ($this->isEmpty() || $this->atEnd()) {
-            return false;
-        }
-        $this->position++;
-        return true;
-    }
-
-    /**
-     *    Ditches all future entries beyond the current
-     *    point.
-     *    @access private
-     */
-    protected function dropFuture() {
-        if ($this->isEmpty()) {
-            return;
-        }
-        while (! $this->atEnd()) {
-            array_pop($this->sequence);
-        }
-    }
-}
-
-/**
- *    Simulated web browser. This is an aggregate of
- *    the user agent, the HTML parsing, request history
- *    and the last header set.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleBrowser {
-    private $user_agent;
-    private $page;
-    private $history;
-    private $ignore_frames;
-    private $maximum_nested_frames;
-    private $parser;
-
-    /**
-     *    Starts with a fresh browser with no
-     *    cookie or any other state information. The
-     *    exception is that a default proxy will be
-     *    set up if specified in the options.
-     *    @access public
-     */
-    function __construct() {
-        $this->user_agent = $this->createUserAgent();
-        $this->user_agent->useProxy(
-                SimpleTest::getDefaultProxy(),
-                SimpleTest::getDefaultProxyUsername(),
-                SimpleTest::getDefaultProxyPassword());
-        $this->page = new SimplePage();
-        $this->history = $this->createHistory();
-        $this->ignore_frames = false;
-        $this->maximum_nested_frames = DEFAULT_MAX_NESTED_FRAMES;
-    }
-
-    /**
-     *    Creates the underlying user agent.
-     *    @return SimpleFetcher    Content fetcher.
-     *    @access protected
-     */
-    protected function createUserAgent() {
-        return new SimpleUserAgent();
-    }
-
-    /**
-     *    Creates a new empty history list.
-     *    @return SimpleBrowserHistory    New list.
-     *    @access protected
-     */
-    protected function createHistory() {
-        return new SimpleBrowserHistory();
-    }
-
-    /**
-     *    Get the HTML parser to use. Can be overridden by
-     *    setParser. Otherwise scans through the available parsers and
-     *    uses the first one which is available.
-     *    @return object SimplePHPPageBuilder or SimpleTidyPageBuilder
-     */
-    protected function getParser() {
-        if ($this->parser) {
-            return $this->parser;
-        }
-        foreach (SimpleTest::getParsers() as $parser) {
-            if ($parser->can()) {
-                return $parser;
-            }
-        }
-    }
-
-    /**
-     *    Override the default HTML parser, allowing parsers to be plugged in.
-     *    @param object           A parser object instance.
-     */
-    public function setParser($parser) {
-        $this->parser = $parser;
-    }
-
-    /**
-     *    Disables frames support. Frames will not be fetched
-     *    and the frameset page will be used instead.
-     *    @access public
-     */
-    function ignoreFrames() {
-        $this->ignore_frames = true;
-    }
-
-    /**
-     *    Enables frames support. Frames will be fetched from
-     *    now on.
-     *    @access public
-     */
-    function useFrames() {
-        $this->ignore_frames = false;
-    }
-
-    /**
-     *    Switches off cookie sending and recieving.
-     *    @access public
-     */
-    function ignoreCookies() {
-        $this->user_agent->ignoreCookies();
-    }
-
-    /**
-     *    Switches back on the cookie sending and recieving.
-     *    @access public
-     */
-    function useCookies() {
-        $this->user_agent->useCookies();
-    }
-
-    /**
-     *    Parses the raw content into a page. Will load further
-     *    frame pages unless frames are disabled.
-     *    @param SimpleHttpResponse $response    Response from fetch.
-     *    @param integer $depth                  Nested frameset depth.
-     *    @return SimplePage                     Parsed HTML.
-     *    @access private
-     */
-    protected function parse($response, $depth = 0) {
-        $page = $this->buildPage($response);
-        if ($this->ignore_frames || ! $page->hasFrames() || ($depth > $this->maximum_nested_frames)) {
-            return $page;
-        }
-        $frameset = new SimpleFrameset($page);
-        foreach ($page->getFrameset() as $key => $url) {
-            $frame = $this->fetch($url, new SimpleGetEncoding(), $depth + 1);
-            $frameset->addFrame($frame, $key);
-        }
-        return $frameset;
-    }
-
-    /**
-     *    Assembles the parsing machinery and actually parses
-     *    a single page. Frees all of the builder memory and so
-     *    unjams the PHP memory management.
-     *    @param SimpleHttpResponse $response    Response from fetch.
-     *    @return SimplePage                     Parsed top level page.
-     */
-    protected function buildPage($response) {
-        return $this->getParser()->parse($response);
-    }
-
-    /**
-     *    Fetches a page. Jointly recursive with the parse()
-     *    method as it descends a frameset.
-     *    @param string/SimpleUrl $url          Target to fetch.
-     *    @param SimpleEncoding $encoding       GET/POST parameters.
-     *    @param integer $depth                 Nested frameset depth protection.
-     *    @return SimplePage                    Parsed page.
-     *    @access private
-     */
-    protected function fetch($url, $encoding, $depth = 0) {
-        $response = $this->user_agent->fetchResponse($url, $encoding);
-        if ($response->isError()) {
-            return new SimplePage($response);
-        }
-        return $this->parse($response, $depth);
-    }
-
-    /**
-     *    Fetches a page or a single frame if that is the current
-     *    focus.
-     *    @param SimpleUrl $url                   Target to fetch.
-     *    @param SimpleEncoding $parameters       GET/POST parameters.
-     *    @return string                          Raw content of page.
-     *    @access private
-     */
-    protected function load($url, $parameters) {
-        $frame = $url->getTarget();
-        if (! $frame || ! $this->page->hasFrames() || (strtolower($frame) == '_top')) {
-            return $this->loadPage($url, $parameters);
-        }
-        return $this->loadFrame(array($frame), $url, $parameters);
-    }
-
-    /**
-     *    Fetches a page and makes it the current page/frame.
-     *    @param string/SimpleUrl $url            Target to fetch as string.
-     *    @param SimplePostEncoding $parameters   POST parameters.
-     *    @return string                          Raw content of page.
-     *    @access private
-     */
-    protected function loadPage($url, $parameters) {
-        $this->page = $this->fetch($url, $parameters);
-        $this->history->recordEntry(
-                $this->page->getUrl(),
-                $this->page->getRequestData());
-        return $this->page->getRaw();
-    }
-
-    /**
-     *    Fetches a frame into the existing frameset replacing the
-     *    original.
-     *    @param array $frames                    List of names to drill down.
-     *    @param string/SimpleUrl $url            Target to fetch as string.
-     *    @param SimpleFormEncoding $parameters   POST parameters.
-     *    @return string                          Raw content of page.
-     *    @access private
-     */
-    protected function loadFrame($frames, $url, $parameters) {
-        $page = $this->fetch($url, $parameters);
-        $this->page->setFrame($frames, $page);
-        return $page->getRaw();
-    }
-
-    /**
-     *    Removes expired and temporary cookies as if
-     *    the browser was closed and re-opened.
-     *    @param string/integer $date   Time when session restarted.
-     *                                  If omitted then all persistent
-     *                                  cookies are kept.
-     *    @access public
-     */
-    function restart($date = false) {
-        $this->user_agent->restart($date);
-    }
-
-    /**
-     *    Adds a header to every fetch.
-     *    @param string $header       Header line to add to every
-     *                                request until cleared.
-     *    @access public
-     */
-    function addHeader($header) {
-        $this->user_agent->addHeader($header);
-    }
-
-    /**
-     *    Ages the cookies by the specified time.
-     *    @param integer $interval    Amount in seconds.
-     *    @access public
-     */
-    function ageCookies($interval) {
-        $this->user_agent->ageCookies($interval);
-    }
-
-    /**
-     *    Sets an additional cookie. If a cookie has
-     *    the same name and path it is replaced.
-     *    @param string $name       Cookie key.
-     *    @param string $value      Value of cookie.
-     *    @param string $host       Host upon which the cookie is valid.
-     *    @param string $path       Cookie path if not host wide.
-     *    @param string $expiry     Expiry date.
-     *    @access public
-     */
-    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
-        $this->user_agent->setCookie($name, $value, $host, $path, $expiry);
-    }
-
-    /**
-     *    Reads the most specific cookie value from the
-     *    browser cookies.
-     *    @param string $host        Host to search.
-     *    @param string $path        Applicable path.
-     *    @param string $name        Name of cookie to read.
-     *    @return string             False if not present, else the
-     *                               value as a string.
-     *    @access public
-     */
-    function getCookieValue($host, $path, $name) {
-        return $this->user_agent->getCookieValue($host, $path, $name);
-    }
-
-    /**
-     *    Reads the current cookies for the current URL.
-     *    @param string $name   Key of cookie to find.
-     *    @return string        Null if there is no current URL, false
-     *                          if the cookie is not set.
-     *    @access public
-     */
-    function getCurrentCookieValue($name) {
-        return $this->user_agent->getBaseCookieValue($name, $this->page->getUrl());
-    }
-
-    /**
-     *    Sets the maximum number of redirects before
-     *    a page will be loaded anyway.
-     *    @param integer $max        Most hops allowed.
-     *    @access public
-     */
-    function setMaximumRedirects($max) {
-        $this->user_agent->setMaximumRedirects($max);
-    }
-
-    /**
-     *    Sets the maximum number of nesting of framed pages
-     *    within a framed page to prevent loops.
-     *    @param integer $max        Highest depth allowed.
-     *    @access public
-     */
-    function setMaximumNestedFrames($max) {
-        $this->maximum_nested_frames = $max;
-    }
-
-    /**
-     *    Sets the socket timeout for opening a connection.
-     *    @param integer $timeout      Maximum time in seconds.
-     *    @access public
-     */
-    function setConnectionTimeout($timeout) {
-        $this->user_agent->setConnectionTimeout($timeout);
-    }
-
-    /**
-     *    Sets proxy to use on all requests for when
-     *    testing from behind a firewall. Set URL
-     *    to false to disable.
-     *    @param string $proxy        Proxy URL.
-     *    @param string $username     Proxy username for authentication.
-     *    @param string $password     Proxy password for authentication.
-     *    @access public
-     */
-    function useProxy($proxy, $username = false, $password = false) {
-        $this->user_agent->useProxy($proxy, $username, $password);
-    }
-
-    /**
-     *    Fetches the page content with a HEAD request.
-     *    Will affect cookies, but will not change the base URL.
-     *    @param string/SimpleUrl $url                Target to fetch as string.
-     *    @param hash/SimpleHeadEncoding $parameters  Additional parameters for
-     *                                                HEAD request.
-     *    @return boolean                             True if successful.
-     *    @access public
-     */
-    function head($url, $parameters = false) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        if ($this->getUrl()) {
-            $url = $url->makeAbsolute($this->getUrl());
-        }
-        $response = $this->user_agent->fetchResponse($url, new SimpleHeadEncoding($parameters));
-        $this->page = new SimplePage($response);
-        return ! $response->isError();
-    }
-
-    /**
-     *    Fetches the page content with a simple GET request.
-     *    @param string/SimpleUrl $url                Target to fetch.
-     *    @param hash/SimpleFormEncoding $parameters  Additional parameters for
-     *                                                GET request.
-     *    @return string                              Content of page or false.
-     *    @access public
-     */
-    function get($url, $parameters = false) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        if ($this->getUrl()) {
-            $url = $url->makeAbsolute($this->getUrl());
-        }
-        return $this->load($url, new SimpleGetEncoding($parameters));
-    }
-
-    /**
-     *    Fetches the page content with a POST request.
-     *    @param string/SimpleUrl $url                Target to fetch as string.
-     *    @param hash/SimpleFormEncoding $parameters  POST parameters or request body.
-     *    @param string $content_type                 MIME Content-Type of the request body
-     *    @return string                              Content of page.
-     *    @access public
-     */
-    function post($url, $parameters = false, $content_type = false) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        if ($this->getUrl()) {
-            $url = $url->makeAbsolute($this->getUrl());
-        }
-        return $this->load($url, new SimplePostEncoding($parameters, $content_type));
-    }
-
-    /**
-     *    Fetches the page content with a PUT request.
-     *    @param string/SimpleUrl $url                Target to fetch as string.
-     *    @param hash/SimpleFormEncoding $parameters  PUT request body.
-     *    @param string $content_type                 MIME Content-Type of the request body
-     *    @return string                              Content of page.
-     *    @access public
-     */
-    function put($url, $parameters = false, $content_type = false) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        return $this->load($url, new SimplePutEncoding($parameters, $content_type));
-    }
-
-    /**
-     *    Sends a DELETE request and fetches the response.
-     *    @param string/SimpleUrl $url                Target to fetch.
-     *    @param hash/SimpleFormEncoding $parameters  Additional parameters for
-     *                                                DELETE request.
-     *    @return string                              Content of page or false.
-     *    @access public
-     */
-    function delete($url, $parameters = false) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        return $this->load($url, new SimpleDeleteEncoding($parameters));
-    }
-
-    /**
-     *    Equivalent to hitting the retry button on the
-     *    browser. Will attempt to repeat the page fetch. If
-     *    there is no history to repeat it will give false.
-     *    @return string/boolean   Content if fetch succeeded
-     *                             else false.
-     *    @access public
-     */
-    function retry() {
-        $frames = $this->page->getFrameFocus();
-        if (count($frames) > 0) {
-            $this->loadFrame(
-                    $frames,
-                    $this->page->getUrl(),
-                    $this->page->getRequestData());
-            return $this->page->getRaw();
-        }
-        if ($url = $this->history->getUrl()) {
-            $this->page = $this->fetch($url, $this->history->getParameters());
-            return $this->page->getRaw();
-        }
-        return false;
-    }
-
-    /**
-     *    Equivalent to hitting the back button on the
-     *    browser. The browser history is unchanged on
-     *    failure. The page content is refetched as there
-     *    is no concept of content caching in SimpleTest.
-     *    @return boolean     True if history entry and
-     *                        fetch succeeded
-     *    @access public
-     */
-    function back() {
-        if (! $this->history->back()) {
-            return false;
-        }
-        $content = $this->retry();
-        if (! $content) {
-            $this->history->forward();
-        }
-        return $content;
-    }
-
-    /**
-     *    Equivalent to hitting the forward button on the
-     *    browser. The browser history is unchanged on
-     *    failure. The page content is refetched as there
-     *    is no concept of content caching in SimpleTest.
-     *    @return boolean     True if history entry and
-     *                        fetch succeeded
-     *    @access public
-     */
-    function forward() {
-        if (! $this->history->forward()) {
-            return false;
-        }
-        $content = $this->retry();
-        if (! $content) {
-            $this->history->back();
-        }
-        return $content;
-    }
-
-    /**
-     *    Retries a request after setting the authentication
-     *    for the current realm.
-     *    @param string $username    Username for realm.
-     *    @param string $password    Password for realm.
-     *    @return boolean            True if successful fetch. Note
-     *                               that authentication may still have
-     *                               failed.
-     *    @access public
-     */
-    function authenticate($username, $password) {
-        if (! $this->page->getRealm()) {
-            return false;
-        }
-        $url = $this->page->getUrl();
-        if (! $url) {
-            return false;
-        }
-        $this->user_agent->setIdentity(
-                $url->getHost(),
-                $this->page->getRealm(),
-                $username,
-                $password);
-        return $this->retry();
-    }
-
-    /**
-     *    Accessor for a breakdown of the frameset.
-     *    @return array   Hash tree of frames by name
-     *                    or index if no name.
-     *    @access public
-     */
-    function getFrames() {
-        return $this->page->getFrames();
-    }
-
-    /**
-     *    Accessor for current frame focus. Will be
-     *    false if no frame has focus.
-     *    @return integer/string/boolean    Label if any, otherwise
-     *                                      the position in the frameset
-     *                                      or false if none.
-     *    @access public
-     */
-    function getFrameFocus() {
-        return $this->page->getFrameFocus();
-    }
-
-    /**
-     *    Sets the focus by index. The integer index starts from 1.
-     *    @param integer $choice    Chosen frame.
-     *    @return boolean           True if frame exists.
-     *    @access public
-     */
-    function setFrameFocusByIndex($choice) {
-        return $this->page->setFrameFocusByIndex($choice);
-    }
-
-    /**
-     *    Sets the focus by name.
-     *    @param string $name    Chosen frame.
-     *    @return boolean        True if frame exists.
-     *    @access public
-     */
-    function setFrameFocus($name) {
-        return $this->page->setFrameFocus($name);
-    }
-
-    /**
-     *    Clears the frame focus. All frames will be searched
-     *    for content.
-     *    @access public
-     */
-    function clearFrameFocus() {
-        return $this->page->clearFrameFocus();
-    }
-
-    /**
-     *    Accessor for last error.
-     *    @return string        Error from last response.
-     *    @access public
-     */
-    function getTransportError() {
-        return $this->page->getTransportError();
-    }
-
-    /**
-     *    Accessor for current MIME type.
-     *    @return string    MIME type as string; e.g. 'text/html'
-     *    @access public
-     */
-    function getMimeType() {
-        return $this->page->getMimeType();
-    }
-
-    /**
-     *    Accessor for last response code.
-     *    @return integer    Last HTTP response code received.
-     *    @access public
-     */
-    function getResponseCode() {
-        return $this->page->getResponseCode();
-    }
-
-    /**
-     *    Accessor for last Authentication type. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Description of challenge type.
-     *    @access public
-     */
-    function getAuthentication() {
-        return $this->page->getAuthentication();
-    }
-
-    /**
-     *    Accessor for last Authentication realm. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Name of security realm.
-     *    @access public
-     */
-    function getRealm() {
-        return $this->page->getRealm();
-    }
-
-    /**
-     *    Accessor for current URL of page or frame if
-     *    focused.
-     *    @return string    Location of current page or frame as
-     *                      a string.
-     */
-    function getUrl() {
-        $url = $this->page->getUrl();
-        return $url ? $url->asString() : false;
-    }
-
-    /**
-     *    Accessor for base URL of page if set via BASE tag
-     *    @return string    base URL
-     */
-    function getBaseUrl() {
-        $url = $this->page->getBaseUrl();
-        return $url ? $url->asString() : false;
-    }
-
-    /**
-     *    Accessor for raw bytes sent down the wire.
-     *    @return string      Original text sent.
-     *    @access public
-     */
-    function getRequest() {
-        return $this->page->getRequest();
-    }
-
-    /**
-     *    Accessor for raw header information.
-     *    @return string      Header block.
-     *    @access public
-     */
-    function getHeaders() {
-        return $this->page->getHeaders();
-    }
-
-    /**
-     *    Accessor for raw page information.
-     *    @return string      Original text content of web page.
-     *    @access public
-     */
-    function getContent() {
-        return $this->page->getRaw();
-    }
-
-    /**
-     *    Accessor for plain text version of the page.
-     *    @return string      Normalised text representation.
-     *    @access public
-     */
-    function getContentAsText() {
-        return $this->page->getText();
-    }
-
-    /**
-     *    Accessor for parsed title.
-     *    @return string     Title or false if no title is present.
-     *    @access public
-     */
-    function getTitle() {
-        return $this->page->getTitle();
-    }
-
-    /**
-     *    Accessor for a list of all links in current page.
-     *    @return array   List of urls with scheme of
-     *                    http or https and hostname.
-     *    @access public
-     */
-    function getUrls() {
-        return $this->page->getUrls();
-    }
-
-    /**
-     *    Sets all form fields with that name.
-     *    @param string $label   Name or label of field in forms.
-     *    @param string $value   New value of field.
-     *    @return boolean        True if field exists, otherwise false.
-     *    @access public
-     */
-    function setField($label, $value, $position=false) {
-        return $this->page->setField(new SimpleByLabelOrName($label), $value, $position);
-    }
-
-    /**
-     *    Sets all form fields with that name. Will use label if
-     *    one is available (not yet implemented).
-     *    @param string $name    Name of field in forms.
-     *    @param string $value   New value of field.
-     *    @return boolean        True if field exists, otherwise false.
-     *    @access public
-     */
-    function setFieldByName($name, $value, $position=false) {
-        return $this->page->setField(new SimpleByName($name), $value, $position);
-    }
-
-    /**
-     *    Sets all form fields with that id attribute.
-     *    @param string/integer $id   Id of field in forms.
-     *    @param string $value        New value of field.
-     *    @return boolean             True if field exists, otherwise false.
-     *    @access public
-     */
-    function setFieldById($id, $value) {
-        return $this->page->setField(new SimpleById($id), $value);
-    }
-
-    /**
-     *    Accessor for a form element value within the page.
-     *    Finds the first match.
-     *    @param string $label       Field label.
-     *    @return string/boolean     A value if the field is
-     *                               present, false if unchecked
-     *                               and null if missing.
-     *    @access public
-     */
-    function getField($label) {
-        return $this->page->getField(new SimpleByLabelOrName($label));
-    }
-
-    /**
-     *    Accessor for a form element value within the page.
-     *    Finds the first match.
-     *    @param string $name        Field name.
-     *    @return string/boolean     A string if the field is
-     *                               present, false if unchecked
-     *                               and null if missing.
-     *    @access public
-     */
-    function getFieldByName($name) {
-        return $this->page->getField(new SimpleByName($name));
-    }
-
-    /**
-     *    Accessor for a form element value within the page.
-     *    @param string/integer $id  Id of field in forms.
-     *    @return string/boolean     A string if the field is
-     *                               present, false if unchecked
-     *                               and null if missing.
-     *    @access public
-     */
-    function getFieldById($id) {
-        return $this->page->getField(new SimpleById($id));
-    }
-
-    /**
-     *    Clicks the submit button by label. The owning
-     *    form will be submitted by this.
-     *    @param string $label    Button label. An unlabeled
-     *                            button can be triggered by 'Submit'.
-     *    @param hash $additional Additional form data.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function clickSubmit($label = 'Submit', $additional = false) {
-        if (! ($form = $this->page->getFormBySubmit(new SimpleByLabel($label)))) {
-            return false;
-        }
-        $success = $this->load(
-                $form->getAction(),
-                $form->submitButton(new SimpleByLabel($label), $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Clicks the submit button by name attribute. The owning
-     *    form will be submitted by this.
-     *    @param string $name     Button name.
-     *    @param hash $additional Additional form data.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function clickSubmitByName($name, $additional = false) {
-        if (! ($form = $this->page->getFormBySubmit(new SimpleByName($name)))) {
-            return false;
-        }
-        $success = $this->load(
-                $form->getAction(),
-                $form->submitButton(new SimpleByName($name), $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Clicks the submit button by ID attribute of the button
-     *    itself. The owning form will be submitted by this.
-     *    @param string $id       Button ID.
-     *    @param hash $additional Additional form data.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function clickSubmitById($id, $additional = false) {
-        if (! ($form = $this->page->getFormBySubmit(new SimpleById($id)))) {
-            return false;
-        }
-        $success = $this->load(
-                $form->getAction(),
-                $form->submitButton(new SimpleById($id), $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Tests to see if a submit button exists with this
-     *    label.
-     *    @param string $label    Button label.
-     *    @return boolean         True if present.
-     *    @access public
-     */
-    function isSubmit($label) {
-        return (boolean)$this->page->getFormBySubmit(new SimpleByLabel($label));
-    }
-
-    /**
-     *    Clicks the submit image by some kind of label. Usually
-     *    the alt tag or the nearest equivalent. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param string $label    ID attribute of button.
-     *    @param integer $x       X-coordinate of imaginary click.
-     *    @param integer $y       Y-coordinate of imaginary click.
-     *    @param hash $additional Additional form data.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function clickImage($label, $x = 1, $y = 1, $additional = false) {
-        if (! ($form = $this->page->getFormByImage(new SimpleByLabel($label)))) {
-            return false;
-        }
-        $success = $this->load(
-                $form->getAction(),
-                $form->submitImage(new SimpleByLabel($label), $x, $y, $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Clicks the submit image by the name. Usually
-     *    the alt tag or the nearest equivalent. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param string $name     Name attribute of button.
-     *    @param integer $x       X-coordinate of imaginary click.
-     *    @param integer $y       Y-coordinate of imaginary click.
-     *    @param hash $additional Additional form data.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
-        if (! ($form = $this->page->getFormByImage(new SimpleByName($name)))) {
-            return false;
-        }
-        $success = $this->load(
-                $form->getAction(),
-                $form->submitImage(new SimpleByName($name), $x, $y, $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Clicks the submit image by ID attribute. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param integer/string $id    ID attribute of button.
-     *    @param integer $x            X-coordinate of imaginary click.
-     *    @param integer $y            Y-coordinate of imaginary click.
-     *    @param hash $additional      Additional form data.
-     *    @return string/boolean       Page on success.
-     *    @access public
-     */
-    function clickImageById($id, $x = 1, $y = 1, $additional = false) {
-        if (! ($form = $this->page->getFormByImage(new SimpleById($id)))) {
-            return false;
-        }
-        $success = $this->load(
-                $form->getAction(),
-                $form->submitImage(new SimpleById($id), $x, $y, $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Tests to see if an image exists with this
-     *    title or alt text.
-     *    @param string $label    Image text.
-     *    @return boolean         True if present.
-     *    @access public
-     */
-    function isImage($label) {
-        return (boolean)$this->page->getFormByImage(new SimpleByLabel($label));
-    }
-
-    /**
-     *    Submits a form by the ID.
-     *    @param string $id       The form ID. No submit button value
-     *                            will be sent.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function submitFormById($id, $additional = false) {
-        if (! ($form = $this->page->getFormById($id))) {
-            return false;
-        }
-        $success = $this->load(
-                $form->getAction(),
-                $form->submit($additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Finds a URL by label. Will find the first link
-     *    found with this link text by default, or a later
-     *    one if an index is given. The match ignores case and
-     *    white space issues.
-     *    @param string $label     Text between the anchor tags.
-     *    @param integer $index    Link position counting from zero.
-     *    @return string/boolean   URL on success.
-     *    @access public
-     */
-    function getLink($label, $index = 0) {
-        $urls = $this->page->getUrlsByLabel($label);
-        if (count($urls) == 0) {
-            return false;
-        }
-        if (count($urls) < $index + 1) {
-            return false;
-        }
-        return $urls[$index];
-    }
-
-    /**
-     *    Follows a link by label. Will click the first link
-     *    found with this link text by default, or a later
-     *    one if an index is given. The match ignores case and
-     *    white space issues.
-     *    @param string $label     Text between the anchor tags.
-     *    @param integer $index    Link position counting from zero.
-     *    @return string/boolean   Page on success.
-     *    @access public
-     */
-    function clickLink($label, $index = 0) {
-        $url = $this->getLink($label, $index);
-        if ($url === false) {
-            return false;
-        }
-        $this->load($url, new SimpleGetEncoding());
-        return $this->getContent();
-    }
-
-    /**
-     *    Finds a link by id attribute.
-     *    @param string $id        ID attribute value.
-     *    @return string/boolean   URL on success.
-     *    @access public
-     */
-    function getLinkById($id) {
-        return $this->page->getUrlById($id);
-    }
-
-    /**
-     *    Follows a link by id attribute.
-     *    @param string $id        ID attribute value.
-     *    @return string/boolean   Page on success.
-     *    @access public
-     */
-    function clickLinkById($id) {
-        if (! ($url = $this->getLinkById($id))) {
-            return false;
-        }
-        $this->load($url, new SimpleGetEncoding());
-        return $this->getContent();
-    }
-
-    /**
-     *    Clicks a visible text item. Will first try buttons,
-     *    then links and then images.
-     *    @param string $label        Visible text or alt text.
-     *    @return string/boolean      Raw page or false.
-     *    @access public
-     */
-    function click($label) {
-        $raw = $this->clickSubmit($label);
-        if (! $raw) {
-            $raw = $this->clickLink($label);
-        }
-        if (! $raw) {
-            $raw = $this->clickImage($label);
-        }
-        return $raw;
-    }
-
-    /**
-     *    Tests to see if a click target exists.
-     *    @param string $label    Visible text or alt text.
-     *    @return boolean         True if target present.
-     *    @access public
-     */
-    function isClickable($label) {
-        return $this->isSubmit($label) || ($this->getLink($label) !== false) || $this->isImage($label);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/collector.php b/3rdparty/simpletest/collector.php
deleted file mode 100644
index ac49937aada..00000000000
--- a/3rdparty/simpletest/collector.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * This file contains the following classes: {@link SimpleCollector},
- * {@link SimplePatternCollector}.
- *
- * @author Travis Swicegood <development@domain51.com>
- * @package SimpleTest
- * @subpackage UnitTester
- * @version $Id: collector.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-
-/**
- * The basic collector for {@link GroupTest}
- *
- * @see collect(), GroupTest::collect()
- * @package SimpleTest
- * @subpackage UnitTester
- */
-class SimpleCollector {
-
-    /**
-     * Strips off any kind of slash at the end so as to normalise the path.
-     * @param string $path    Path to normalise.
-     * @return string         Path without trailing slash.
-     */
-    protected function removeTrailingSlash($path) {
-        if (substr($path, -1) == DIRECTORY_SEPARATOR) {
-            return substr($path, 0, -1);
-        } elseif (substr($path, -1) == '/') {
-            return substr($path, 0, -1);
-        } else {
-            return $path;
-        }
-    }
-
-    /**
-     * Scans the directory and adds what it can.
-     * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
-     * @param string $path    Directory to scan.
-     * @see _attemptToAdd()
-     */
-    function collect(&$test, $path) {
-        $path = $this->removeTrailingSlash($path);
-        if ($handle = opendir($path)) {
-            while (($entry = readdir($handle)) !== false) {
-                if ($this->isHidden($entry)) {
-                    continue;
-                }
-                $this->handle($test, $path . DIRECTORY_SEPARATOR . $entry);
-            }
-            closedir($handle);
-        }
-    }
-
-    /**
-     * This method determines what should be done with a given file and adds
-     * it via {@link GroupTest::addTestFile()} if necessary.
-     *
-     * This method should be overriden to provide custom matching criteria,
-     * such as pattern matching, recursive matching, etc.  For an example, see
-     * {@link SimplePatternCollector::_handle()}.
-     *
-     * @param object $test      Group test with {@link GroupTest::addTestFile()} method.
-     * @param string $filename  A filename as generated by {@link collect()}
-     * @see collect()
-     * @access protected
-     */
-    protected function handle(&$test, $file) {
-        if (is_dir($file)) {
-            return;
-        }
-        $test->addFile($file);
-    }
-
-    /**
-     *  Tests for hidden files so as to skip them. Currently
-     *  only tests for Unix hidden files.
-     *  @param string $filename        Plain filename.
-     *  @return boolean                True if hidden file.
-     *  @access private
-     */
-    protected function isHidden($filename) {
-        return strncmp($filename, '.', 1) == 0;
-    }
-}
-
-/**
- * An extension to {@link SimpleCollector} that only adds files matching a
- * given pattern.
- *
- * @package SimpleTest
- * @subpackage UnitTester
- * @see SimpleCollector
- */
-class SimplePatternCollector extends SimpleCollector {
-    private $pattern;
-
-    /**
-     *
-     * @param string $pattern   Perl compatible regex to test name against
-     *  See {@link http://us4.php.net/manual/en/reference.pcre.pattern.syntax.php PHP's PCRE}
-     *  for full documentation of valid pattern.s
-     */
-    function __construct($pattern = '/php$/i') {
-        $this->pattern = $pattern;
-    }
-
-    /**
-     * Attempts to add files that match a given pattern.
-     *
-     * @see SimpleCollector::_handle()
-     * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
-     * @param string $path    Directory to scan.
-     * @access protected
-     */
-    protected function handle(&$test, $filename) {
-        if (preg_match($this->pattern, $filename)) {
-            parent::handle($test, $filename);
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/compatibility.php b/3rdparty/simpletest/compatibility.php
deleted file mode 100755
index e313db0cb51..00000000000
--- a/3rdparty/simpletest/compatibility.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @version    $Id: compatibility.php 1900 2009-07-29 11:44:37Z lastcraft $
- */
-
-/**
- *  Static methods for compatibility between different
- *  PHP versions.
- *  @package    SimpleTest
- */
-class SimpleTestCompatibility {
-
-    /**
-     *    Creates a copy whether in PHP5 or PHP4.
-     *    @param object $object     Thing to copy.
-     *    @return object            A copy.
-     *    @access public
-     */
-    static function copy($object) {
-        if (version_compare(phpversion(), '5') >= 0) {
-            eval('$copy = clone $object;');
-            return $copy;
-        }
-        return $object;
-    }
-
-    /**
-     *    Identity test. Drops back to equality + types for PHP5
-     *    objects as the === operator counts as the
-     *    stronger reference constraint.
-     *    @param mixed $first    Test subject.
-     *    @param mixed $second   Comparison object.
-     *    @return boolean        True if identical.
-     *    @access public
-     */
-    static function isIdentical($first, $second) {
-        if (version_compare(phpversion(), '5') >= 0) {
-            return SimpleTestCompatibility::isIdenticalType($first, $second);
-        }
-        if ($first != $second) {
-            return false;
-        }
-        return ($first === $second);
-    }
-
-    /**
-     *    Recursive type test.
-     *    @param mixed $first    Test subject.
-     *    @param mixed $second   Comparison object.
-     *    @return boolean        True if same type.
-     *    @access private
-     */
-    protected static function isIdenticalType($first, $second) {
-        if (gettype($first) != gettype($second)) {
-            return false;
-        }
-        if (is_object($first) && is_object($second)) {
-            if (get_class($first) != get_class($second)) {
-                return false;
-            }
-            return SimpleTestCompatibility::isArrayOfIdenticalTypes(
-                    (array) $first,
-                    (array) $second);
-        }
-        if (is_array($first) && is_array($second)) {
-            return SimpleTestCompatibility::isArrayOfIdenticalTypes($first, $second);
-        }
-        if ($first !== $second) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     *    Recursive type test for each element of an array.
-     *    @param mixed $first    Test subject.
-     *    @param mixed $second   Comparison object.
-     *    @return boolean        True if identical.
-     *    @access private
-     */
-    protected static function isArrayOfIdenticalTypes($first, $second) {
-        if (array_keys($first) != array_keys($second)) {
-            return false;
-        }
-        foreach (array_keys($first) as $key) {
-            $is_identical = SimpleTestCompatibility::isIdenticalType(
-                    $first[$key],
-                    $second[$key]);
-            if (! $is_identical) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    Test for two variables being aliases.
-     *    @param mixed $first    Test subject.
-     *    @param mixed $second   Comparison object.
-     *    @return boolean        True if same.
-     *    @access public
-     */
-    static function isReference(&$first, &$second) {
-        if (version_compare(phpversion(), '5', '>=') && is_object($first)) {
-            return ($first === $second);
-        }
-        if (is_object($first) && is_object($second)) {
-            $id = uniqid("test");
-            $first->$id = true;
-            $is_ref = isset($second->$id);
-            unset($first->$id);
-            return $is_ref;
-        }
-        $temp = $first;
-        $first = uniqid("test");
-        $is_ref = ($first === $second);
-        $first = $temp;
-        return $is_ref;
-    }
-
-    /**
-     *    Test to see if an object is a member of a
-     *    class hiearchy.
-     *    @param object $object    Object to test.
-     *    @param string $class     Root name of hiearchy.
-     *    @return boolean         True if class in hiearchy.
-     *    @access public
-     */
-    static function isA($object, $class) {
-        if (version_compare(phpversion(), '5') >= 0) {
-            if (! class_exists($class, false)) {
-                if (function_exists('interface_exists')) {
-                    if (! interface_exists($class, false))  {
-                        return false;
-                    }
-                }
-            }
-            eval("\$is_a = \$object instanceof $class;");
-            return $is_a;
-        }
-        if (function_exists('is_a')) {
-            return is_a($object, $class);
-        }
-        return ((strtolower($class) == get_class($object))
-                or (is_subclass_of($object, $class)));
-    }
-
-    /**
-     *    Sets a socket timeout for each chunk.
-     *    @param resource $handle    Socket handle.
-     *    @param integer $timeout    Limit in seconds.
-     *    @access public
-     */
-    static function setTimeout($handle, $timeout) {
-        if (function_exists('stream_set_timeout')) {
-            stream_set_timeout($handle, $timeout, 0);
-        } elseif (function_exists('socket_set_timeout')) {
-            socket_set_timeout($handle, $timeout, 0);
-        } elseif (function_exists('set_socket_timeout')) {
-            set_socket_timeout($handle, $timeout, 0);
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/cookies.php b/3rdparty/simpletest/cookies.php
deleted file mode 100644
index 7a28f4a5bcc..00000000000
--- a/3rdparty/simpletest/cookies.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: cookies.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/url.php');
-/**#@-*/
-
-/**
- *    Cookie data holder. Cookie rules are full of pretty
- *    arbitary stuff. I have used...
- *    http://wp.netscape.com/newsref/std/cookie_spec.html
- *    http://www.cookiecentral.com/faq/
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleCookie {
-    private $host;
-    private $name;
-    private $value;
-    private $path;
-    private $expiry;
-    private $is_secure;
-
-    /**
-     *    Constructor. Sets the stored values.
-     *    @param string $name            Cookie key.
-     *    @param string $value           Value of cookie.
-     *    @param string $path            Cookie path if not host wide.
-     *    @param string $expiry          Expiry date as string.
-     *    @param boolean $is_secure      Currently ignored.
-     */
-    function __construct($name, $value = false, $path = false, $expiry = false, $is_secure = false) {
-        $this->host = false;
-        $this->name = $name;
-        $this->value = $value;
-        $this->path = ($path ? $this->fixPath($path) : "/");
-        $this->expiry = false;
-        if (is_string($expiry)) {
-            $this->expiry = strtotime($expiry);
-        } elseif (is_integer($expiry)) {
-            $this->expiry = $expiry;
-        }
-        $this->is_secure = $is_secure;
-    }
-
-    /**
-     *    Sets the host. The cookie rules determine
-     *    that the first two parts are taken for
-     *    certain TLDs and three for others. If the
-     *    new host does not match these rules then the
-     *    call will fail.
-     *    @param string $host       New hostname.
-     *    @return boolean           True if hostname is valid.
-     *    @access public
-     */
-    function setHost($host) {
-        if ($host = $this->truncateHost($host)) {
-            $this->host = $host;
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for the truncated host to which this
-     *    cookie applies.
-     *    @return string       Truncated hostname.
-     *    @access public
-     */
-    function getHost() {
-        return $this->host;
-    }
-
-    /**
-     *    Test for a cookie being valid for a host name.
-     *    @param string $host    Host to test against.
-     *    @return boolean        True if the cookie would be valid
-     *                           here.
-     */
-    function isValidHost($host) {
-        return ($this->truncateHost($host) === $this->getHost());
-    }
-
-    /**
-     *    Extracts just the domain part that determines a
-     *    cookie's host validity.
-     *    @param string $host    Host name to truncate.
-     *    @return string        Domain or false on a bad host.
-     *    @access private
-     */
-    protected function truncateHost($host) {
-        $tlds = SimpleUrl::getAllTopLevelDomains();
-        if (preg_match('/[a-z\-]+\.(' . $tlds . ')$/i', $host, $matches)) {
-            return $matches[0];
-        } elseif (preg_match('/[a-z\-]+\.[a-z\-]+\.[a-z\-]+$/i', $host, $matches)) {
-            return $matches[0];
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for name.
-     *    @return string       Cookie key.
-     *    @access public
-     */
-    function getName() {
-        return $this->name;
-    }
-
-    /**
-     *    Accessor for value. A deleted cookie will
-     *    have an empty string for this.
-     *    @return string       Cookie value.
-     *    @access public
-     */
-    function getValue() {
-        return $this->value;
-    }
-
-    /**
-     *    Accessor for path.
-     *    @return string       Valid cookie path.
-     *    @access public
-     */
-    function getPath() {
-        return $this->path;
-    }
-
-    /**
-     *    Tests a path to see if the cookie applies
-     *    there. The test path must be longer or
-     *    equal to the cookie path.
-     *    @param string $path       Path to test against.
-     *    @return boolean           True if cookie valid here.
-     *    @access public
-     */
-    function isValidPath($path) {
-        return (strncmp(
-                $this->fixPath($path),
-                $this->getPath(),
-                strlen($this->getPath())) == 0);
-    }
-
-    /**
-     *    Accessor for expiry.
-     *    @return string       Expiry string.
-     *    @access public
-     */
-    function getExpiry() {
-        if (! $this->expiry) {
-            return false;
-        }
-        return gmdate("D, d M Y H:i:s", $this->expiry) . " GMT";
-    }
-
-    /**
-     *    Test to see if cookie is expired against
-     *    the cookie format time or timestamp.
-     *    Will give true for a session cookie.
-     *    @param integer/string $now  Time to test against. Result
-     *                                will be false if this time
-     *                                is later than the cookie expiry.
-     *                                Can be either a timestamp integer
-     *                                or a cookie format date.
-     *    @access public
-     */
-    function isExpired($now) {
-        if (! $this->expiry) {
-            return true;
-        }
-        if (is_string($now)) {
-            $now = strtotime($now);
-        }
-        return ($this->expiry < $now);
-    }
-
-    /**
-     *    Ages the cookie by the specified number of
-     *    seconds.
-     *    @param integer $interval   In seconds.
-     *    @public
-     */
-    function agePrematurely($interval) {
-        if ($this->expiry) {
-            $this->expiry -= $interval;
-        }
-    }
-
-    /**
-     *    Accessor for the secure flag.
-     *    @return boolean       True if cookie needs SSL.
-     *    @access public
-     */
-    function isSecure() {
-        return $this->is_secure;
-    }
-
-    /**
-     *    Adds a trailing and leading slash to the path
-     *    if missing.
-     *    @param string $path            Path to fix.
-     *    @access private
-     */
-    protected function fixPath($path) {
-        if (substr($path, 0, 1) != '/') {
-            $path = '/' . $path;
-        }
-        if (substr($path, -1, 1) != '/') {
-            $path .= '/';
-        }
-        return $path;
-    }
-}
-
-/**
- *    Repository for cookies. This stuff is a
- *    tiny bit browser dependent.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleCookieJar {
-    private $cookies;
-
-    /**
-     *    Constructor. Jar starts empty.
-     *    @access public
-     */
-    function __construct() {
-        $this->cookies = array();
-    }
-
-    /**
-     *    Removes expired and temporary cookies as if
-     *    the browser was closed and re-opened.
-     *    @param string/integer $now   Time to test expiry against.
-     *    @access public
-     */
-    function restartSession($date = false) {
-        $surviving_cookies = array();
-        for ($i = 0; $i < count($this->cookies); $i++) {
-            if (! $this->cookies[$i]->getValue()) {
-                continue;
-            }
-            if (! $this->cookies[$i]->getExpiry()) {
-                continue;
-            }
-            if ($date && $this->cookies[$i]->isExpired($date)) {
-                continue;
-            }
-            $surviving_cookies[] = $this->cookies[$i];
-        }
-        $this->cookies = $surviving_cookies;
-    }
-
-    /**
-     *    Ages all cookies in the cookie jar.
-     *    @param integer $interval     The old session is moved
-     *                                 into the past by this number
-     *                                 of seconds. Cookies now over
-     *                                 age will be removed.
-     *    @access public
-     */
-    function agePrematurely($interval) {
-        for ($i = 0; $i < count($this->cookies); $i++) {
-            $this->cookies[$i]->agePrematurely($interval);
-        }
-    }
-
-    /**
-     *    Sets an additional cookie. If a cookie has
-     *    the same name and path it is replaced.
-     *    @param string $name       Cookie key.
-     *    @param string $value      Value of cookie.
-     *    @param string $host       Host upon which the cookie is valid.
-     *    @param string $path       Cookie path if not host wide.
-     *    @param string $expiry     Expiry date.
-     *    @access public
-     */
-    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
-        $cookie = new SimpleCookie($name, $value, $path, $expiry);
-        if ($host) {
-            $cookie->setHost($host);
-        }
-        $this->cookies[$this->findFirstMatch($cookie)] = $cookie;
-    }
-
-    /**
-     *    Finds a matching cookie to write over or the
-     *    first empty slot if none.
-     *    @param SimpleCookie $cookie    Cookie to write into jar.
-     *    @return integer                Available slot.
-     *    @access private
-     */
-    protected function findFirstMatch($cookie) {
-        for ($i = 0; $i < count($this->cookies); $i++) {
-            $is_match = $this->isMatch(
-                    $cookie,
-                    $this->cookies[$i]->getHost(),
-                    $this->cookies[$i]->getPath(),
-                    $this->cookies[$i]->getName());
-            if ($is_match) {
-                return $i;
-            }
-        }
-        return count($this->cookies);
-    }
-
-    /**
-     *    Reads the most specific cookie value from the
-     *    browser cookies. Looks for the longest path that
-     *    matches.
-     *    @param string $host        Host to search.
-     *    @param string $path        Applicable path.
-     *    @param string $name        Name of cookie to read.
-     *    @return string             False if not present, else the
-     *                               value as a string.
-     *    @access public
-     */
-    function getCookieValue($host, $path, $name) {
-        $longest_path = '';
-        foreach ($this->cookies as $cookie) {
-            if ($this->isMatch($cookie, $host, $path, $name)) {
-                if (strlen($cookie->getPath()) > strlen($longest_path)) {
-                    $value = $cookie->getValue();
-                    $longest_path = $cookie->getPath();
-                }
-            }
-        }
-        return (isset($value) ? $value : false);
-    }
-
-    /**
-     *    Tests cookie for matching against search
-     *    criteria.
-     *    @param SimpleTest $cookie    Cookie to test.
-     *    @param string $host          Host must match.
-     *    @param string $path          Cookie path must be shorter than
-     *                                 this path.
-     *    @param string $name          Name must match.
-     *    @return boolean              True if matched.
-     *    @access private
-     */
-    protected function isMatch($cookie, $host, $path, $name) {
-        if ($cookie->getName() != $name) {
-            return false;
-        }
-        if ($host && $cookie->getHost() && ! $cookie->isValidHost($host)) {
-            return false;
-        }
-        if (! $cookie->isValidPath($path)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     *    Uses a URL to sift relevant cookies by host and
-     *    path. Results are list of strings of form "name=value".
-     *    @param SimpleUrl $url       Url to select by.
-     *    @return array               Valid name and value pairs.
-     *    @access public
-     */
-    function selectAsPairs($url) {
-        $pairs = array();
-        foreach ($this->cookies as $cookie) {
-            if ($this->isMatch($cookie, $url->getHost(), $url->getPath(), $cookie->getName())) {
-                $pairs[] = $cookie->getName() . '=' . $cookie->getValue();
-            }
-        }
-        return $pairs;
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/default_reporter.php b/3rdparty/simpletest/default_reporter.php
deleted file mode 100644
index 6feb67a3088..00000000000
--- a/3rdparty/simpletest/default_reporter.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
- *  Optional include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: default_reporter.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/simpletest.php');
-require_once(dirname(__FILE__) . '/scorer.php');
-require_once(dirname(__FILE__) . '/reporter.php');
-require_once(dirname(__FILE__) . '/xml.php');
-/**#@-*/
-
-/**
- *    Parser for command line arguments. Extracts
- *    the a specific test to run and engages XML
- *    reporting when necessary.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleCommandLineParser {
-    private $to_property = array(
-            'case' => 'case', 'c' => 'case',
-            'test' => 'test', 't' => 'test',
-    );
-    private $case = '';
-    private $test = '';
-    private $xml = false;
-    private $help = false;
-    private $no_skips = false;
-
-    /**
-     *    Parses raw command line arguments into object properties.
-     *    @param string $arguments        Raw commend line arguments.
-     */
-    function __construct($arguments) {
-        if (! is_array($arguments)) {
-            return;
-        }
-        foreach ($arguments as $i => $argument) {
-            if (preg_match('/^--?(test|case|t|c)=(.+)$/', $argument, $matches)) {
-                $property = $this->to_property[$matches[1]];
-                $this->$property = $matches[2];
-            } elseif (preg_match('/^--?(test|case|t|c)$/', $argument, $matches)) {
-                $property = $this->to_property[$matches[1]];
-                if (isset($arguments[$i + 1])) {
-                    $this->$property = $arguments[$i + 1];
-                }
-            } elseif (preg_match('/^--?(xml|x)$/', $argument)) {
-                $this->xml = true;
-            } elseif (preg_match('/^--?(no-skip|no-skips|s)$/', $argument)) {
-                $this->no_skips = true;
-            } elseif (preg_match('/^--?(help|h)$/', $argument)) {
-                $this->help = true;
-            }
-        }
-    }
-
-    /**
-     *    Run only this test.
-     *    @return string        Test name to run.
-     */
-    function getTest() {
-        return $this->test;
-    }
-
-    /**
-     *    Run only this test suite.
-     *    @return string        Test class name to run.
-     */
-    function getTestCase() {
-        return $this->case;
-    }
-
-    /**
-     *    Output should be XML or not.
-     *    @return boolean        True if XML desired.
-     */
-    function isXml() {
-        return $this->xml;
-    }
-
-    /**
-     *    Output should suppress skip messages.
-     *    @return boolean        True for no skips.
-     */
-    function noSkips() {
-        return $this->no_skips;
-    }
-
-    /**
-     *    Output should be a help message. Disabled during XML mode.
-     *    @return boolean        True if help message desired.
-     */
-    function help() {
-        return $this->help && ! $this->xml;
-    }
-
-    /**
-     *    Returns plain-text help message for command line runner.
-     *    @return string         String help message
-     */
-    function getHelpText() {
-        return <<<HELP
-SimpleTest command line default reporter (autorun)
-Usage: php <test_file> [args...]
-
-    -c <class>      Run only the test-case <class>
-    -t <method>     Run only the test method <method>
-    -s              Suppress skip messages
-    -x              Return test results in XML
-    -h              Display this help message
-
-HELP;
-    }
-
-}
-
-/**
- *    The default reporter used by SimpleTest's autorun
- *    feature. The actual reporters used are dependency
- *    injected and can be overridden.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class DefaultReporter extends SimpleReporterDecorator {
-
-    /**
-     *  Assembles the appropriate reporter for the environment.
-     */
-    function __construct() {
-        if (SimpleReporter::inCli()) {
-            $parser = new SimpleCommandLineParser($_SERVER['argv']);
-            $interfaces = $parser->isXml() ? array('XmlReporter') : array('TextReporter');
-            if ($parser->help()) {
-                // I'm not sure if we should do the echo'ing here -- ezyang
-                echo $parser->getHelpText();
-                exit(1);
-            }
-            $reporter = new SelectiveReporter(
-                    SimpleTest::preferred($interfaces),
-                    $parser->getTestCase(),
-                    $parser->getTest());
-            if ($parser->noSkips()) {
-                $reporter = new NoSkipsReporter($reporter);
-            }
-        } else {
-            $reporter = new SelectiveReporter(
-                    SimpleTest::preferred('HtmlReporter'),
-                    @$_GET['c'],
-                    @$_GET['t']);
-            if (@$_GET['skips'] == 'no' || @$_GET['show-skips'] == 'no') {
-                $reporter = new NoSkipsReporter($reporter);
-            }
-        }
-        parent::__construct($reporter);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/detached.php b/3rdparty/simpletest/detached.php
deleted file mode 100755
index a325e140d02..00000000000
--- a/3rdparty/simpletest/detached.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: detached.php 1784 2008-04-26 13:07:14Z pp11 $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/xml.php');
-require_once(dirname(__FILE__) . '/shell_tester.php');
-/**#@-*/
-
-/**
- *    Runs an XML formated test in a separate process.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class DetachedTestCase {
-    private $command;
-    private $dry_command;
-    private $size;
-
-    /**
-     *    Sets the location of the remote test.
-     *    @param string $command       Test script.
-     *    @param string $dry_command   Script for dry run.
-     *    @access public
-     */
-    function __construct($command, $dry_command = false) {
-        $this->command = $command;
-        $this->dry_command = $dry_command ? $dry_command : $command;
-        $this->size = false;
-    }
-
-    /**
-     *    Accessor for the test name for subclasses.
-     *    @return string       Name of the test.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->command;
-    }
-
-    /**
-     *    Runs the top level test for this class. Currently
-     *    reads the data as a single chunk. I'll fix this
-     *    once I have added iteration to the browser.
-     *    @param SimpleReporter $reporter    Target of test results.
-     *    @returns boolean                   True if no failures.
-     *    @access public
-     */
-    function run(&$reporter) {
-        $shell = &new SimpleShell();
-        $shell->execute($this->command);
-        $parser = &$this->createParser($reporter);
-        if (! $parser->parse($shell->getOutput())) {
-            trigger_error('Cannot parse incoming XML from [' . $this->command . ']');
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     *    Accessor for the number of subtests.
-     *    @return integer       Number of test cases.
-     *    @access public
-     */
-    function getSize() {
-        if ($this->size === false) {
-            $shell = &new SimpleShell();
-            $shell->execute($this->dry_command);
-            $reporter = &new SimpleReporter();
-            $parser = &$this->createParser($reporter);
-            if (! $parser->parse($shell->getOutput())) {
-                trigger_error('Cannot parse incoming XML from [' . $this->dry_command . ']');
-                return false;
-            }
-            $this->size = $reporter->getTestCaseCount();
-        }
-        return $this->size;
-    }
-
-    /**
-     *    Creates the XML parser.
-     *    @param SimpleReporter $reporter    Target of test results.
-     *    @return SimpleTestXmlListener      XML reader.
-     *    @access protected
-     */
-    protected function &createParser(&$reporter) {
-        return new SimpleTestXmlParser($reporter);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/docs/en/authentication_documentation.html b/3rdparty/simpletest/docs/en/authentication_documentation.html
deleted file mode 100644
index e058e19a111..00000000000
--- a/3rdparty/simpletest/docs/en/authentication_documentation.html
+++ /dev/null
@@ -1,378 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleTest documentation for testing log-in and authentication</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <span class="chosen">Authentication</span>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Authentication documentation</h1>
-        This page...
-        <ul>
-<li>
-            Getting through <a href="#basic">Basic HTTP authentication</a>
-        </li>
-<li>
-            Testing <a href="#cookies">cookie based authentication</a>
-        </li>
-<li>
-            Managing <a href="#session">browser sessions</a> and timeouts
-        </li>
-</ul>
-<div class="content">
-        
-            <p>
-                One of the trickiest, and yet most important, areas
-                of testing web sites is the security.
-                Testing these schemes is one of the core goals of
-                the SimpleTest web tester.
-            </p>
-        
-        <h2>
-<a class="target" name="basic"></a>Basic HTTP authentication</h2>
-            <p>
-                If you fetch a page protected by basic authentication then
-                rather than receiving content, you will instead get a 401
-                header.
-                We can illustrate this with this test...
-<pre>
-class AuthenticationTest extends WebTestCase {<strong>
-    function test401Header() {
-        $this-&gt;get('http://www.lastcraft.com/protected/');
-        $this-&gt;showHeaders();
-    }</strong>
-}
-</pre>
-                This allows us to see the challenge header...
-                <div class="demo">
-                    <h1>File test</h1>
-<pre>
-HTTP/1.1 401 Authorization Required
-Date: Sat, 18 Sep 2004 19:25:18 GMT
-Server: Apache/1.3.29 (Unix) PHP/4.3.4
-WWW-Authenticate: Basic realm="SimpleTest basic authentication"
-Connection: close
-Content-Type: text/html; charset=iso-8859-1
-</pre>
-                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
-                    <strong>0</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
-                </div>
-                We are trying to get away from visual inspection though, and so SimpleTest
-                allows to make automated assertions against the challenge.
-                Here is a thorough test of our header...
-<pre>
-class AuthenticationTest extends WebTestCase {
-    function test401Header() {
-        $this-&gt;get('http://www.lastcraft.com/protected/');<strong>
-        $this-&gt;assertAuthentication('Basic');
-        $this-&gt;assertResponse(401);
-        $this-&gt;assertRealm('SimpleTest basic authentication');</strong>
-    }
-}
-</pre>
-                Any one of these tests would normally do on it's own depending
-                on the amount of detail you want to see.
-            </p>
-            <p>
-                One theme that runs through SimpleTest is the ability to use
-                <span class="new_code">SimpleExpectation</span> objects wherever a simple
-                match is not enough.
-                If you want only an approximate match to the realm for
-                example, you can do this...
-<pre>
-class AuthenticationTest extends WebTestCase {
-    function test401Header() {
-        $this-&gt;get('http://www.lastcraft.com/protected/');
-        $this-&gt;assertRealm(<strong>new PatternExpectation('/simpletest/i')</strong>);
-    }
-}
-</pre>
-                This type of test, testing HTTP responses, is not typical.
-            </p>
-            <p>
-                Most of the time we are not interested in testing the
-                authentication itself, but want to get past it to test
-                the pages underneath.
-                As soon as the challenge has been issued we can reply with
-                an authentication response...
-<pre>
-class AuthenticationTest extends WebTestCase {
-    function testCanAuthenticate() {
-        $this-&gt;get('http://www.lastcraft.com/protected/');<strong>
-        $this-&gt;authenticate('Me', 'Secret');</strong>
-        $this-&gt;assertTitle(...);
-    }
-}
-</pre>
-                The username and password will now be sent with every
-                subsequent request to that directory and subdirectories.
-                You will have to authenticate again if you step outside
-                the authenticated directory, but SimpleTest is smart enough
-                to merge subdirectories into a common realm.
-            </p>
-            <p>
-                If you want, you can shortcut this step further by encoding
-                the log in details straight into the URL...
-<pre>
-class AuthenticationTest extends WebTestCase {
-    function testCanReadAuthenticatedPages() {
-        $this-&gt;get('http://<strong>Me:Secret@</strong>www.lastcraft.com/protected/');
-        $this-&gt;assertTitle(...);
-    }
-}
-</pre>
-                If your username or password has special characters, then you
-                will have to URL encode them or the request will not be parsed
-                correctly.
-                I'm afraid we leave this up to you.
-            </p>
-            <p>
-                A problem with encoding the login details directly in the URL is
-                the authentication header will not be sent on subsequent requests.
-                If you navigate with relative URLs though, the authentication
-                information will be preserved along with the domain name.
-            </p>
-            <p>
-                Normally though, you use the <span class="new_code">authenticate()</span> call.
-                SimpleTest will then remember your login information on each request.
-            </p>
-            <p>
-                Only testing with basic authentication is currently supported, and
-                this is only really secure in tandem with HTTPS connections.
-                This is usually good enough to protect test server from prying eyes,
-                however.
-                Digest authentication and NTLM authentication may be added
-                in the future if enough people request this feature.
-            </p>
-        
-        <h2>
-<a class="target" name="cookies"></a>Cookies</h2>
-            <p>
-                Basic authentication doesn't give enough control over the
-                user interface for web developers.
-                More likely this functionality will be coded directly into
-                the web architecture using cookies with complicated timeouts.
-                We need to be able to test this too.
-            </p>
-            <p>
-                Starting with a simple log-in form...
-<pre>
-&lt;form&gt;
-    Username:
-    &lt;input type="text" name="u" value="" /&gt;&lt;br /&gt;
-    Password:
-    &lt;input type="password" name="p" value="" /&gt;&lt;br /&gt;
-    &lt;input type="submit" value="Log in" /&gt;
-&lt;/form&gt;
-</pre>
-                Which looks like...
-            </p>
-            <p>
-                <form class="demo">
-                    Username:
-                    <input type="text" name="u" value=""><br>
-                    Password:
-                    <input type="password" name="p" value=""><br>
-                    <input type="submit" value="Log in">
-                </form>
-            </p>
-            <p>
-                Let's suppose that in fetching this page a cookie has been
-                set with a session ID.
-                We are not going to fill the form in yet, just test that
-                we are tracking the user.
-                Here is the test...
-<pre>
-class LogInTest extends WebTestCase {
-    function testSessionCookieSetBeforeForm() {
-        $this-&gt;get('http://www.my-site.com/login.php');<strong>
-        $this-&gt;assertCookie('SID');</strong>
-    }
-}
-</pre>
-                All we are doing is confirming that the cookie is set.
-                As the value is likely to be rather cryptic it's not
-                really worth testing this with...
-<pre>
-class LogInTest extends WebTestCase {
-    function testSessionCookieIsCorrectPattern() {
-        $this-&gt;get('http://www.my-site.com/login.php');
-        $this-&gt;assertCookie('SID', <strong>new PatternExpectation('/[a-f0-9]{32}/i')</strong>);
-    }
-}
-</pre>
-                If you are using PHP to handle sessions for you then
-                this test is even more useless, as we are just testing PHP itself.
-            </p>
-            <p>
-                The simplest test of logging in is to visually inspect the
-                next page to see if you are really logged in.
-                Just test the next page with <span class="new_code">WebTestCase::assertText()</span>.
-            </p>
-            <p>
-                The test is similar to any other form test,
-                but we might want to confirm that we still have the same
-                cookie after log-in as before we entered.
-                We wouldn't want to lose track of this after all.
-                Here is a possible test for this...
-<pre>
-class LogInTest extends WebTestCase {
-    ...
-    function testSessionCookieSameAfterLogIn() {
-        $this-&gt;get('http://www.my-site.com/login.php');<strong>
-        $session = $this-&gt;getCookie('SID');
-        $this-&gt;setField('u', 'Me');
-        $this-&gt;setField('p', 'Secret');
-        $this-&gt;click('Log in');
-        $this-&gt;assertText('Welcome Me');
-        $this-&gt;assertCookie('SID', $session);</strong>
-    }
-}
-</pre>
-                This confirms that the session identifier is maintained
-                afer log-in and we haven't accidently reset it.
-            </p>
-            <p>
-                We could even attempt to hack our own system by setting
-                arbitrary cookies to gain access...
-<pre>
-class LogInTest extends WebTestCase {
-    ...
-    function testSessionCookieSameAfterLogIn() {
-        $this-&gt;get('http://www.my-site.com/login.php');<strong>
-        $this-&gt;setCookie('SID', 'Some other session');
-        $this-&gt;get('http://www.my-site.com/restricted.php');</strong>
-        $this-&gt;assertText('Access denied');
-    }
-}
-</pre>
-                Is your site protected from this attack?
-            </p>
-        
-        <h2>
-<a class="target" name="session"></a>Browser sessions</h2>
-            <p>
-                If you are testing an authentication system a critical piece
-                of behaviour is what happens when a user logs back in.
-                We would like to simulate closing and reopening a browser...
-<pre>
-class LogInTest extends WebTestCase {
-    ...
-    function testLoseAuthenticationAfterBrowserClose() {
-        $this-&gt;get('http://www.my-site.com/login.php');
-        $this-&gt;setField('u', 'Me');
-        $this-&gt;setField('p', 'Secret');
-        $this-&gt;click('Log in');
-        $this-&gt;assertText('Welcome Me');<strong>
-        
-        $this-&gt;restart();
-        $this-&gt;get('http://www.my-site.com/restricted.php');
-        $this-&gt;assertText('Access denied');</strong>
-    }
-}
-</pre>
-                The <span class="new_code">WebTestCase::restart()</span> method will
-                preserve cookies that have unexpired timeouts, but throw away
-                those that are temporary or expired.
-                You can optionally specify the time and date that the restart
-                happened.
-            </p>
-            <p>
-                Expiring cookies can be a problem.
-                After all, if you have a cookie that expires after an hour,
-                you don't want to stall the test for an hour while waiting
-                for the cookie to pass it's timeout.
-            </p>
-            <p>
-                To push the cookies over the hour limit you can age them
-                before you restart the session...
-<pre>
-class LogInTest extends WebTestCase {
-    ...
-    function testLoseAuthenticationAfterOneHour() {
-        $this-&gt;get('http://www.my-site.com/login.php');
-        $this-&gt;setField('u', 'Me');
-        $this-&gt;setField('p', 'Secret');
-        $this-&gt;click('Log in');
-        $this-&gt;assertText('Welcome Me');
-        <strong>
-        $this-&gt;ageCookies(3600);</strong>
-        $this-&gt;restart();
-        $this-&gt;get('http://www.my-site.com/restricted.php');
-        $this-&gt;assertText('Access denied');
-    }
-}
-</pre>
-                After the restart it will appear that cookies are an
-                hour older, and any that pass their expiry will have
-                disappeared.
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-<li>
-            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
-            gives full detail on the classes and assertions available.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <span class="chosen">Authentication</span>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/en/browser_documentation.html b/3rdparty/simpletest/docs/en/browser_documentation.html
deleted file mode 100644
index 809c1431137..00000000000
--- a/3rdparty/simpletest/docs/en/browser_documentation.html
+++ /dev/null
@@ -1,501 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleTest documentation for the scriptable web browser component</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <span class="chosen">Scriptable browser</span>
-</div></div>
-<h1>PHP Scriptable Web Browser</h1>
-        This page...
-        <ul>
-<li>
-            Using the bundled <a href="#scripting">web browser in scripts</a>
-        </li>
-<li>
-            <a href="#debug">Debugging</a> failed pages
-        </li>
-<li>
-            Complex <a href="#unit">tests with multiple web browsers</a>
-        </li>
-</ul>
-<div class="content">
-        
-            <p>
-                SimpleTest's web browser component can be used not just
-                outside of the <span class="new_code">WebTestCase</span> class, but also
-                independently of the SimpleTest framework itself.
-            </p>
-        
-        <h2>
-<a class="target" name="scripting"></a>The Scriptable Browser</h2>
-            <p>
-                You can use the web browser in PHP scripts to confirm
-                services are up and running, or to extract information
-                from them at a regular basis.
-                For example, here is a small script to extract the current number of
-                open PHP 5 bugs from the <a href="http://www.php.net/">PHP web site</a>...
-<pre>
-<strong>&lt;?php
-require_once('simpletest/browser.php');
-    
-$browser = &amp;new SimpleBrowser();
-$browser-&gt;get('http://php.net/');
-$browser-&gt;click('reporting bugs');
-$browser-&gt;click('statistics');
-$page = $browser-&gt;click('PHP 5 bugs only');
-preg_match('/status=Open.*?by=Any.*?(\d+)&lt;\/a&gt;/', $page, $matches);
-print $matches[1];
-?&gt;</strong>
-</pre>
-                There are simpler methods to do this particular example in PHP
-                of course.
-                For example you can just use the PHP <span class="new_code">file()</span>
-                command against what here is a pretty fixed page.
-                However, using the web browser for scripts allows authentication,
-                correct handling of cookies, automatic loading of frames, redirects,
-                form submission and the ability to examine the page headers.
-            <p>
-            </p>
-                Methods such as periodic scraping are fragile against a site that is constantly
-                evolving and you would want a more direct way of accessing
-                data in a permanent set up, but for simple tasks this can provide
-                a very rapid solution.
-            </p>
-            <p>
-                All of the navigation methods used in the
-                <a href="web_tester_documentation.html">WebTestCase</a>
-                are present in the <span class="new_code">SimpleBrowser</span> class, but
-                the assertions are replaced with simpler accessors.
-                Here is a full list of the page navigation methods...
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">addHeader($header)</span></td>
-<td>Adds a header to every fetch</td>
-</tr>
-                    <tr>
-<td><span class="new_code">useProxy($proxy, $username, $password)</span></td>
-<td>Use this proxy from now on</td>
-</tr>
-                    <tr>
-<td><span class="new_code">head($url, $parameters)</span></td>
-<td>Perform a HEAD request</td>
-</tr>
-                    <tr>
-<td><span class="new_code">get($url, $parameters)</span></td>
-<td>Fetch a page with GET</td>
-</tr>
-                    <tr>
-<td><span class="new_code">post($url, $parameters)</span></td>
-<td>Fetch a page with POST</td>
-</tr>
-                    <tr>
-<td><span class="new_code">click($label)</span></td>
-<td>Clicks visible link or button text</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickLink($label)</span></td>
-<td>Follows a link by label</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickLinkById($id)</span></td>
-<td>Follows a link by attribute</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getUrl()</span></td>
-<td>Current URL of page or frame</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getTitle()</span></td>
-<td>Page title</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getContent()</span></td>
-<td>Raw page or frame</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getContentAsText()</span></td>
-<td>HTML removed except for alt text</td>
-</tr>
-                    <tr>
-<td><span class="new_code">retry()</span></td>
-<td>Repeat the last request</td>
-</tr>
-                    <tr>
-<td><span class="new_code">back()</span></td>
-<td>Use the browser back button</td>
-</tr>
-                    <tr>
-<td><span class="new_code">forward()</span></td>
-<td>Use the browser forward button</td>
-</tr>
-                    <tr>
-<td><span class="new_code">authenticate($username, $password)</span></td>
-<td>Retry page or frame after a 401 response</td>
-</tr>
-                    <tr>
-<td><span class="new_code">restart($date)</span></td>
-<td>Restarts the browser for a new session</td>
-</tr>
-                    <tr>
-<td><span class="new_code">ageCookies($interval)</span></td>
-<td>Ages the cookies by the specified time</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setCookie($name, $value)</span></td>
-<td>Sets an additional cookie</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getCookieValue($host, $path, $name)</span></td>
-<td>Reads the most specific cookie</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getCurrentCookieValue($name)</span></td>
-<td>Reads cookie for the current context</td>
-</tr>
-                </tbody></table>
-                The methods <span class="new_code">SimpleBrowser::useProxy()</span> and
-                <span class="new_code">SimpleBrowser::addHeader()</span> are special.
-                Once called they continue to apply to all subsequent fetches.
-            </p>
-            <p>
-                Navigating forms is similar to the
-                <a href="form_testing_documentation.html">WebTestCase form navigation</a>...
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">setField($label, $value)</span></td>
-<td>Sets all form fields with that label or name</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setFieldByName($name, $value)</span></td>
-<td>Sets all form fields with that name</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setFieldById($id, $value)</span></td>
-<td>Sets all form fields with that id</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getField($label)</span></td>
-<td>Accessor for a form element value by label tag and then name</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getFieldByName($name)</span></td>
-<td>Accessor for a form element value using name attribute</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getFieldById($id)</span></td>
-<td>Accessor for a form element value</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickSubmit($label)</span></td>
-<td>Submits form by button label</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickSubmitByName($name)</span></td>
-<td>Submits form by button attribute</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickSubmitById($id)</span></td>
-<td>Submits form by button attribute</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickImage($label, $x, $y)</span></td>
-<td>Clicks an input tag of type image by title or alt text</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickImageByName($name, $x, $y)</span></td>
-<td>Clicks an input tag of type image by name</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickImageById($id, $x, $y)</span></td>
-<td>Clicks an input tag of type image by ID attribute</td>
-</tr>
-                    <tr>
-<td><span class="new_code">submitFormById($id)</span></td>
-<td>Submits by the form tag attribute</td>
-</tr>
-                </tbody></table>
-                At the moment there aren't many methods to list available links and fields.
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">isClickable($label)</span></td>
-<td>Test to see if a click target exists by label or name</td>
-</tr>
-                    <tr>
-<td><span class="new_code">isSubmit($label)</span></td>
-<td>Test for the existence of a button with that label or name</td>
-</tr>
-                    <tr>
-<td><span class="new_code">isImage($label)</span></td>
-<td>Test for the existence of an image button with that label or name</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getLink($label)</span></td>
-<td>Finds a URL from its label</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getLinkById($label)</span></td>
-<td>Finds a URL from its ID attribute</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getUrls()</span></td>
-<td>Lists available links in the current page</td>
-</tr>
-                </tbody></table>
-                This will be expanded in later versions of SimpleTest.
-            </p>
-            <p>
-                Frames are a rather esoteric feature these days, but SimpleTest has
-                retained support for them.
-            </p>
-            <p>
-                Within a page, individual frames can be selected.
-                If no selection is made then all the frames are merged together
-                in one large conceptual page.
-                The content of the current page will be a concatenation of all of the
-                frames in the order that they were specified in the "frameset"
-                tags.
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">getFrames()</span></td>
-<td>A dump of the current frame structure</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getFrameFocus()</span></td>
-<td>Current frame label or index</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setFrameFocusByIndex($choice)</span></td>
-<td>Select a frame numbered from 1</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setFrameFocus($name)</span></td>
-<td>Select frame by label</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clearFrameFocus()</span></td>
-<td>Treat all the frames as a single page</td>
-</tr>
-                </tbody></table>
-                When focused on a single frame, the content will come from
-                that frame only.
-                This includes links to click and forms to submit.
-            </p>
-        
-        <h2>
-<a class="target" name="debug"></a>What went wrong?</h2>
-            <p>
-                All of this functionality is great when we actually manage to fetch pages,
-                but that doesn't always happen.
-                To help figure out what went wrong, the browser has some methods to
-                aid in debugging...
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">setConnectionTimeout($timeout)</span></td>
-<td>Close the socket on overrun</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getUrl()</span></td>
-<td>Url of most recent page fetched</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getRequest()</span></td>
-<td>Raw request header of page or frame</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getHeaders()</span></td>
-<td>Raw response header of page or frame</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getTransportError()</span></td>
-<td>Any socket level errors in the last fetch</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getResponseCode()</span></td>
-<td>HTTP response of page or frame</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getMimeType()</span></td>
-<td>Mime type of page or frame</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getAuthentication()</span></td>
-<td>Authentication type in 401 challenge header</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getRealm()</span></td>
-<td>Authentication realm in 401 challenge header</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getBaseUrl()</span></td>
-<td>Base url only of most recent page fetched</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setMaximumRedirects($max)</span></td>
-<td>Number of redirects before page is loaded anyway</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setMaximumNestedFrames($max)</span></td>
-<td>Protection against recursive framesets</td>
-</tr>
-                    <tr>
-<td><span class="new_code">ignoreFrames()</span></td>
-<td>Disables frames support</td>
-</tr>
-                    <tr>
-<td><span class="new_code">useFrames()</span></td>
-<td>Enables frames support</td>
-</tr>
-                    <tr>
-<td><span class="new_code">ignoreCookies()</span></td>
-<td>Disables sending and receiving of cookies</td>
-</tr>
-                    <tr>
-<td><span class="new_code">useCookies()</span></td>
-<td>Enables cookie support</td>
-</tr>
-                </tbody></table>
-                The methods <span class="new_code">SimpleBrowser::setConnectionTimeout()</span>
-                <span class="new_code">SimpleBrowser::setMaximumRedirects()</span>,
-                <span class="new_code">SimpleBrowser::setMaximumNestedFrames()</span>,
-                <span class="new_code">SimpleBrowser::ignoreFrames()</span>,
-                <span class="new_code">SimpleBrowser::useFrames()</span>,
-                <span class="new_code">SimpleBrowser::ignoreCookies()</span> and
-                <span class="new_code">SimpleBrowser::useCokies()</span> continue to apply
-                to every subsequent request.
-                The other methods are frames aware.
-                This means that if you have an individual frame that is not
-                loading, navigate to it using <span class="new_code">SimpleBrowser::setFrameFocus()</span>
-                and you can then use <span class="new_code">SimpleBrowser::getRequest()</span>, etc to
-                see what happened.
-            </p>
-        
-        <h2>
-<a class="target" name="unit"></a>Complex unit tests with multiple browsers</h2>
-            <p>
-                Anything that could be done in a
-                <a href="web_tester_documentation.html">WebTestCase</a> can
-                now be done in a <a href="unit_tester_documentation.html">UnitTestCase</a>.
-                This means that we could freely mix domain object testing with the
-                web interface...
-<pre>
-<strong>class TestOfRegistration extends UnitTestCase {
-    function testNewUserAddedToAuthenticator() {</strong>
-        $browser = new SimpleBrowser();
-        $browser-&gt;get('http://my-site.com/register.php');
-        $browser-&gt;setField('email', 'me@here');
-        $browser-&gt;setField('password', 'Secret');
-        $browser-&gt;click('Register');
-        <strong>
-        $authenticator = new Authenticator();
-        $member = $authenticator-&gt;findByEmail('me@here');
-        $this-&gt;assertEqual($member-&gt;getPassword(), 'Secret');
-    }
-}</strong>
-</pre>
-                While this may be a useful temporary expediency, I am not a fan
-                of this type of testing.
-                The testing has cut across application layers, make it twice as
-                likely it will need refactoring when the code changes.
-            </p>
-            <p>
-                A more useful case of where using the browser directly can be helpful
-                is where the <span class="new_code">WebTestCase</span> cannot cope.
-                An example is where two browsers are needed at the same time.
-            </p>
-            <p>
-                For example, say we want to disallow multiple simultaneous
-                usage of a site with the same username.
-                This test case will do the job...
-<pre>
-class TestOfSecurity extends UnitTestCase {
-    function testNoMultipleLoginsFromSameUser() {<strong>
-        $first_attempt = new SimpleBrowser();
-        $first_attempt-&gt;get('http://my-site.com/login.php');
-        $first_attempt-&gt;setField('name', 'Me');
-        $first_attempt-&gt;setField('password', 'Secret');
-        $first_attempt-&gt;click('Enter');
-        $this-&gt;assertEqual($first_attempt-&gt;getTitle(), 'Welcome');
-        
-        $second_attempt = new SimpleBrowser();
-        $second_attempt-&gt;get('http://my-site.com/login.php');
-        $second_attempt-&gt;setField('name', 'Me');
-        $second_attempt-&gt;setField('password', 'Secret');
-        $second_attempt-&gt;click('Enter');
-        $this-&gt;assertEqual($second_attempt-&gt;getTitle(), 'Access Denied');</strong>
-    }
-}
-</pre>
-                You can also use the <span class="new_code">SimpleBrowser</span> class
-                directly when you want to write test cases using a different
-                test tool than SimpleTest, such as PHPUnit.
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-<li>
-            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
-            gives full detail on the classes and assertions available.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <span class="chosen">Scriptable browser</span>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/en/docs.css b/3rdparty/simpletest/docs/en/docs.css
deleted file mode 100755
index 18368a04f7a..00000000000
--- a/3rdparty/simpletest/docs/en/docs.css
+++ /dev/null
@@ -1,121 +0,0 @@
-body {
-    padding-left: 3%;
-    padding-right: 3%;
-}
-h1, h2, h3 {
-	font-family: sans-serif;
-}
-h1 {
-    text-align: center;
-}
-pre {
-    font-family: "courier new", courier, typewriter, monospace;
-    font-size: 90%;
-    border: 1px solid;
-	border-color: #999966;
-    background-color: #ffffcc;
-    padding: 5px;
-    margin-left: 20px;
-    margin-right: 40px;
-}
-.code, .new_code, pre.new_code {
-    font-family: "courier new", courier, typewriter, monospace;
-    font-weight: bold;
-}
-div.copyright {
-    font-size: 80%;
-    color: gray;
-}
-div.copyright a {
-    margin-top: 1em;
-    color: gray;
-}
-ul.api {
-    border: 2px outset;
-    border-color: gray;
-    background-color: white;
-    margin: 5px;
-    margin-left: 5%;
-    margin-right: 5%;
-}
-ul.api li {
-    margin-top: 0.2em;
-    margin-bottom: 0.2em;
-    list-style: none;
-    text-indent: -3em;
-    padding-left: 1em;
-}
-div.demo {
-    border: 4px ridge;
-    border-color: gray;
-    padding: 10px;
-    margin: 5px;
-    margin-left: 20px;
-    margin-right: 40px;
-    background-color: white;
-}
-div.demo span.fail {
-    color: red;
-}
-div.demo span.pass {
-    color: green;
-}
-div.demo h1 {
-    font-size: 12pt;
-    text-align: left;
-    font-weight: bold;
-}
-div.menu {
-    text-align: center;
-}
-table {
-    border: 2px outset;
-    border-color: gray;
-    background-color: white;
-    margin: 5px;
-    margin-left: 5%;
-    margin-right: 5%;
-}
-td {
-    font-size: 90%;
-}
-.shell {
-    color: white;
-}
-pre.shell {
-    border: 4px ridge;
-    border-color: gray;
-    padding: 10px;
-    margin: 5px;
-    margin-left: 20px;
-    margin-right: 40px;
-    background-color: #000100;
-	color: #99ff99;
-    font-size: 90%;
-}
-pre.file {
-    color: black;
-    border: 1px solid;
-    border-color: black;
-    padding: 10px;
-    margin: 5px;
-    margin-left: 20px;
-    margin-right: 40px;
-    background-color: white;
-    font-size: 90%;
-}
-form.demo {
-    background-color: lightgray;
-    border: 4px outset;
-    border-color: lightgray;
-    padding: 10px;
-    margin-right: 40%;
-}
-dl, dd {
-	margin:  10px;
-	margin-left:  30px;
-}
-em {
-    font-weight: bold;
-    font-family: "courier new", courier, typewriter, monospace;
-}
diff --git a/3rdparty/simpletest/docs/en/expectation_documentation.html b/3rdparty/simpletest/docs/en/expectation_documentation.html
deleted file mode 100644
index 26704d5ae83..00000000000
--- a/3rdparty/simpletest/docs/en/expectation_documentation.html
+++ /dev/null
@@ -1,476 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>
-        Extending the SimpleTest unit tester with additional expectation classes
-    </title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <span class="chosen">Expectations</span>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Expectation documentation</h1>
-        This page...
-        <ul>
-<li>
-            Using expectations for
-            <a href="#mock">more precise testing with mock objects</a>
-        </li>
-<li>
-            <a href="#behaviour">Changing mock object behaviour</a> with expectations
-        </li>
-<li>
-            <a href="#extending">Extending the expectations</a>
-        </li>
-<li>
-            Underneath SimpleTest <a href="#unit">uses expectation classes</a>
-        </li>
-</ul>
-<div class="content">
-        <h2>
-<a class="target" name="mock"></a>More control over mock objects</h2>
-            <p>
-                The default behaviour of the
-                <a href="mock_objects_documentation.html">mock objects</a>
-                in
-                <a href="http://sourceforge.net/projects/simpletest/">SimpleTest</a>
-                is either an identical match on the argument or to allow any argument at all.
-                For almost all tests this is sufficient.
-                Sometimes, though, you want to weaken a test case.
-            </p>
-            <p>
-                One place where a test can be too tightly coupled is with
-                text matching.
-                Suppose we have a component that outputs a helpful error
-                message when something goes wrong.
-                You want to test that the correct error was sent, but the actual
-                text may be rather long.
-                If you test for the text exactly, then every time the exact wording
-                of the message changes, you will have to go back and edit the test suite.
-            </p>
-            <p>
-                For example, suppose we have a news service that has failed
-                to connect to its remote source.
-<pre>
-<strong>class NewsService {
-    ...
-    function publish($writer) {
-        if (! $this-&gt;isConnected()) {
-            $writer-&gt;write('Cannot connect to news service "' .
-                    $this-&gt;_name . '" at this time. ' .
-                    'Please try again later.');
-        }
-        ...
-    }
-}</strong>
-</pre>
-                Here it is sending its content to a
-                <span class="new_code">Writer</span> class.
-                We could test this behaviour with a
-                <span class="new_code">MockWriter</span> like so...
-<pre>
-class TestOfNewsService extends UnitTestCase {
-    ...
-    function testConnectionFailure() {<strong>
-        $writer = new MockWriter();
-        $writer-&gt;expectOnce('write', array(
-                'Cannot connect to news service ' .
-                '"BBC News" at this time. ' .
-                'Please try again later.'));
-        
-        $service = new NewsService('BBC News');
-        $service-&gt;publish($writer);</strong>
-    }
-}
-</pre>
-                This is a good example of a brittle test.
-                If we decide to add additional instructions, such as
-                suggesting an alternative news source, we will break
-                our tests even though no underlying functionality
-                has been altered.
-            </p>
-            <p>
-                To get around this, we would like to do a regular expression
-                test rather than an exact match.
-                We can actually do this with...
-<pre>
-class TestOfNewsService extends UnitTestCase {
-    ...
-    function testConnectionFailure() {
-        $writer = new MockWriter();<strong>
-        $writer-&gt;expectOnce(
-                'write',
-                array(new PatternExpectation('/cannot connect/i')));</strong>
-        
-        $service = new NewsService('BBC News');
-        $service-&gt;publish($writer);
-    }
-}
-</pre>
-                Instead of passing in the expected parameter to the
-                <span class="new_code">MockWriter</span> we pass an
-                expectation class called
-                <span class="new_code">PatternExpectation</span>.
-                The mock object is smart enough to recognise this as special
-                and to treat it differently.
-                Rather than simply comparing the incoming argument to this
-                object, it uses the expectation object itself to
-                perform the test.
-            </p>
-            <p>
-                The <span class="new_code">PatternExpectation</span> takes
-                the regular expression to match in its constructor.
-                Whenever a comparison is made by the <span class="new_code">MockWriter</span>
-                against this expectation class, it will do a
-                <span class="new_code">preg_match()</span> with this pattern.
-                With our test case above, as long as "cannot connect"
-                appears in the text of the string, the mock will issue a pass
-                to the unit tester.
-                The rest of the text does not matter.
-            </p>
-            <p>
-                The possible expectation classes are...
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">AnythingExpectation</span></td>
-<td>Will always match</td>
-</tr>
-                    <tr>
-<td><span class="new_code">EqualExpectation</span></td>
-<td>An equality, rather than the stronger identity comparison</td>
-</tr>
-                    <tr>
-<td><span class="new_code">NotEqualExpectation</span></td>
-<td>An inequality comparison</td>
-</tr>
-                    <tr>
-<td><span class="new_code">IndenticalExpectation</span></td>
-<td>The default mock object check which must match exactly</td>
-</tr>
-                    <tr>
-<td><span class="new_code">NotIndenticalExpectation</span></td>
-<td>Inverts the mock object logic</td>
-</tr>
-                    <tr>
-<td><span class="new_code">WithinMarginExpectation</span></td>
-<td>Compares a value to within a margin</td>
-</tr>
-                    <tr>
-<td><span class="new_code">OutsideMarginExpectation</span></td>
-<td>Checks that a value is out side the margin</td>
-</tr>
-                    <tr>
-<td><span class="new_code">PatternExpectation</span></td>
-<td>Uses a Perl Regex to match a string</td>
-</tr>
-                    <tr>
-<td><span class="new_code">NoPatternExpectation</span></td>
-<td>Passes only if failing a Perl Regex</td>
-</tr>
-                    <tr>
-<td><span class="new_code">IsAExpectation</span></td>
-<td>Checks the type or class name only</td>
-</tr>
-                    <tr>
-<td><span class="new_code">NotAExpectation</span></td>
-<td>Opposite of the <span class="new_code">IsAExpectation</span>
-</td>
-</tr>
-                    <tr>
-<td><span class="new_code">MethodExistsExpectation</span></td>
-<td>Checks a method is available on an object</td>
-</tr>
-                    <tr>
-<td><span class="new_code">TrueExpectation</span></td>
-<td>Accepts any PHP variable that evaluates to true</td>
-</tr>
-                    <tr>
-<td><span class="new_code">FalseExpectation</span></td>
-<td>Accepts any PHP variable that evaluates to false</td>
-</tr>
-                </tbody></table>
-                Most take the expected value in the constructor.
-                The exceptions are the pattern matchers, which take a regular expression,
-                and the <span class="new_code">IsAExpectation</span> and <span class="new_code">NotAExpectation</span> which takes a type
-                or class name as a string.
-            </p>
-            <p>
-                Some examples...
-            </p>
-            <p>
-<pre>
-$mock-&gt;expectOnce('method', array(new IdenticalExpectation(14)));
-</pre>
-                This is the same as <span class="new_code">$mock-&gt;expectOnce('method', array(14))</span>.
-<pre>
-$mock-&gt;expectOnce('method', array(new EqualExpectation(14)));
-</pre>
-                This is different from the previous version in that the string
-                <span class="new_code">"14"</span> as a parameter will also pass.
-                Sometimes the additional type checks of SimpleTest are too restrictive.
-<pre>
-$mock-&gt;expectOnce('method', array(new AnythingExpectation(14)));
-</pre>
-                This is the same as <span class="new_code">$mock-&gt;expectOnce('method', array('*'))</span>.
-<pre>
-$mock-&gt;expectOnce('method', array(new IdenticalExpectation('*')));
-</pre>
-                This is handy if you want to assert a literal <span class="new_code">"*"</span>.
-<pre>
-new NotIdenticalExpectation(14)
-</pre>
-                This matches on anything other than integer 14.
-                Even the string <span class="new_code">"14"</span> would pass.
-<pre>
-new WithinMarginExpectation(14.0, 0.001)
-</pre>
-                This will accept any value from 13.999 to 14.001 inclusive.
-            </p>
-        
-        <h2>
-<a class="target" name="behaviour"></a>Using expectations to control stubs</h2>
-            <p>
-                The expectation classes can be used not just for sending assertions
-                from mock objects, but also for selecting behaviour for the
-                <a href="mock_objects_documentation.html">mock objects</a>.
-                Anywhere a list of arguments is given, a list of expectation objects
-                can be inserted instead.
-            </p>
-            <p>
-                Suppose we want a mock authorisation server to simulate a successful login,
-                but only if it receives a valid session object.
-                We can do this as follows...
-<pre>
-Mock::generate('Authorisation');
-<strong>
-$authorisation = new MockAuthorisation();
-$authorisation-&gt;returns(
-        'isAllowed',
-        true,
-        array(new IsAExpectation('Session', 'Must be a session')));
-$authorisation-&gt;returns('isAllowed', false);</strong>
-</pre>
-                We have set the default mock behaviour to return false when
-                <span class="new_code">isAllowed</span> is called.
-                When we call the method with a single parameter that
-                is a <span class="new_code">Session</span> object, it will return true.
-                We have also added a second parameter as a message.
-                This will be displayed as part of the mock object
-                failure message if this expectation is the cause of
-                a failure.
-            </p>
-            <p>
-                This kind of sophistication is rarely useful, but is included for
-                completeness.
-            </p>
-        
-        <h2>
-<a class="target" name="extending"></a>Creating your own expectations</h2>
-            <p>
-                The expectation classes have a very simple structure.
-                So simple that it is easy to create your own versions for
-                commonly used test logic.
-            </p>
-            <p>
-                As an example here is the creation of a class to test for
-                valid IP addresses.
-                In order to work correctly with the stubs and mocks the new
-                expectation class should extend
-                <span class="new_code">SimpleExpectation</span> or further extend a subclass...
-<pre>
-<strong>class ValidIp extends SimpleExpectation {
-    
-    function test($ip) {
-        return (ip2long($ip) != -1);
-    }
-    
-    function testMessage($ip) {
-        return "Address [$ip] should be a valid IP address";
-    }
-}</strong>
-</pre>
-                There are only two methods to implement.
-                The <span class="new_code">test()</span> method should
-                evaluate to true if the expectation is to pass, and
-                false otherwise.
-                The <span class="new_code">testMessage()</span> method
-                should simply return some helpful text explaining the test
-                that was carried out.
-            </p>
-            <p>
-                This class can now be used in place of the earlier expectation
-                classes.
-            </p>
-            <p>
-                Here is a more typical example, matching part of a hash...
-<pre>
-<strong>class JustField extends EqualExpectation {
-    private $key;
-    
-    function __construct($key, $expected) {
-        parent::__construct($expected);
-        $this-&gt;key = $key;
-    }
-    
-    function test($compare) {
-        if (! isset($compare[$this-&gt;key])) {
-            return false;
-        }
-        return parent::test($compare[$this-&gt;key]);
-    }
-    
-    function testMessage($compare) {
-        if (! isset($compare[$this-&gt;key])) {
-            return 'Key [' . $this-&gt;key . '] does not exist';
-        }
-        return 'Key [' . $this-&gt;key . '] -&gt; ' .
-                parent::testMessage($compare[$this-&gt;key]);
-    }
-}</strong>
-</pre>
-                We tend to seperate message clauses with
-                "&amp;nbsp;-&gt;&amp;nbsp;".
-                This allows derivative tools to reformat the output.
-            </p>
-            <p>
-                Suppose some authenticator is expecting to be given
-                a database row corresponding to the user, and we
-                only need to confirm the username is correct.
-                We can assert just their username with...
-<pre>
-$mock-&gt;expectOnce('authenticate',
-                  array(new JustKey('username', 'marcus')));
-</pre>
-            </p>
-        
-        <h2>
-<a class="target" name="unit"></a>Under the bonnet of the unit tester</h2>
-            <p>
-                The <a href="http://sourceforge.net/projects/simpletest/">SimpleTest unit testing framework</a>
-                also uses the expectation classes internally for the
-                <a href="unit_test_documentation.html">UnitTestCase class</a>.
-                We can also take advantage of these mechanisms to reuse our
-                homebrew expectation classes within the test suites directly.
-            </p>
-            <p>
-                The most crude way of doing this is to use the generic
-                <span class="new_code">SimpleTest::assert()</span> method to
-                test against it directly...
-<pre>
-<strong>class TestOfNetworking extends UnitTestCase {
-    ...
-    function testGetValidIp() {
-        $server = &amp;new Server();
-        $this-&gt;assert(
-                new ValidIp(),
-                $server-&gt;getIp(),
-                'Server IP address-&gt;%s');
-    }
-}</strong>
-</pre>
-                <span class="new_code">assert()</span> will test any expectation class directly.
-            </p>
-            <p>
-                This is a little untidy compared with our usual
-                <span class="new_code">assert...()</span> syntax.
-            </p>
-            <p>
-                For such a simple case we would normally create a
-                separate assertion method on our test case rather
-                than bother using the expectation class.
-                If we pretend that our expectation is a little more
-                complicated for a moment, so that we want to reuse it,
-                we get...
-<pre>
-class TestOfNetworking extends UnitTestCase {
-    ...<strong>
-    function assertValidIp($ip, $message = '%s') {
-        $this-&gt;assert(new ValidIp(), $ip, $message);
-    }</strong>
-    
-    function testGetValidIp() {
-        $server = &amp;new Server();<strong>
-        $this-&gt;assertValidIp(
-                $server-&gt;getIp(),
-                'Server IP address-&gt;%s');</strong>
-    }
-}
-</pre>
-                It is rare to need the expectations for more than pattern
-                matching, but these facilities do allow testers to build
-                some sort of domain language for testing their application.
-                Also, complex expectation classes could make the tests
-                harder to read and debug.
-                In effect extending the test framework to create their own tool set.
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-<li>
-            The expectations mimic the constraints in <a href="http://www.jmock.org/">JMock</a>.
-        </li>
-<li>
-            <a href="http://simpletest.org/api/">Full API for SimpleTest</a>
-            from the PHPDoc.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <span class="chosen">Expectations</span>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/en/form_testing_documentation.html b/3rdparty/simpletest/docs/en/form_testing_documentation.html
deleted file mode 100644
index 328735c9dca..00000000000
--- a/3rdparty/simpletest/docs/en/form_testing_documentation.html
+++ /dev/null
@@ -1,351 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleTest documentation for testing HTML forms</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <span class="chosen">Testing forms</span>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Form testing documentation</h1>
-        This page...
-        <ul>
-<li>
-            Changing form values and successfully
-            <a href="#submit">Submitting a simple form</a>
-        </li>
-<li>
-            Handling <a href="#multiple">widgets with multiple values</a>
-            by setting lists.
-        </li>
-<li>
-            Bypassing javascript to <a href="#hidden-field">set a hidden field</a>.
-        </li>
-<li>
-            <a href="#raw">Raw posting</a> when you don't have a button
-            to click.
-        </li>
-</ul>
-<div class="content">
-        <h2>
-<a class="target" name="submit"></a>Submitting a simple form</h2>
-            <p>
-                When a page is fetched by the <span class="new_code">WebTestCase</span>
-                using <span class="new_code">get()</span> or
-                <span class="new_code">post()</span> the page content is
-                automatically parsed.
-                This results in any form controls that are inside &lt;form&gt; tags
-                being available from within the test case.
-                For example, if we have this snippet of HTML...
-<pre>
-&lt;form&gt;
-    &lt;input type="text" name="a" value="A default" /&gt;
-    &lt;input type="submit" value="Go" /&gt;
-&lt;/form&gt;
-</pre>
-                Which looks like this...
-            </p>
-            <p>
-                <form class="demo">
-                    <input type="text" name="a" value="A default">
-                    <input type="submit" value="Go">
-                </form>
-            </p>
-            <p>
-                We can navigate to this code, via the
-                <a href="http://www.lastcraft.com/form_testing_documentation.php">LastCraft</a>
-                site, with the following test...
-<pre>
-class SimpleFormTests extends WebTestCase {<strong>
-    function testDefaultValue() {
-        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
-        $this-&gt;assertField('a', 'A default');
-    }</strong>
-}
-</pre>
-                Immediately after loading the page all of the HTML controls are set at
-                their default values just as they would appear in the web browser.
-                The assertion tests that a HTML widget exists in the page with the
-                name "a" and that it is currently set to the value
-                "A default".
-                As usual, we could use a pattern expectation instead of a fixed
-                string.
-<pre>
-class SimpleFormTests extends WebTestCase {
-    function testDefaultValue() {
-        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
-        $this-&gt;assertField('a', <strong>new PatternExpectation('/default/')</strong>);
-    }
-}
-</pre>
-                We could submit the form straight away, but first we'll change
-                the value of the text field and only then submit it...
-<pre>
-class SimpleFormTests extends WebTestCase {
-    function testDefaultValue() {
-        $this-&gt;get('http://www.my-site.com/');
-        $this-&gt;assertField('a', 'A default');<strong>
-        $this-&gt;setField('a', 'New value');
-        $this-&gt;click('Go');</strong>
-    }
-}
-</pre>
-                Because we didn't specify a method attribute on the form tag, and
-                didn't specify an action either, the test case will follow
-                the usual browser behaviour of submitting the form data as a <em>GET</em>
-                request back to the same location.
-                In general SimpleTest tries to emulate typical browser behaviour as much as possible,
-                rather than attempting to catch any form of HTML omission.
-                This is because the target of the testing framework is the PHP application
-                logic, not syntax or other errors in the HTML code.
-                For HTML errors, other tools such as
-                <a href="http://www.w3.org/People/Raggett/tidy/">HTMLTidy</a> should be used,
-                or any of the HTML and CSS validators already out there.
-            </p>
-            <p>
-                If a field is not present in any form, or if an option is unavailable,
-                then <span class="new_code">WebTestCase::setField()</span> will return
-                <span class="new_code">false</span>.
-                For example, suppose we wish to verify that a "Superuser"
-                option is not present in this form...
-<pre>
-&lt;strong&gt;Select type of user to add:&lt;/strong&gt;
-&lt;select name="type"&gt;
-    &lt;option&gt;Subscriber&lt;/option&gt;
-    &lt;option&gt;Author&lt;/option&gt;
-    &lt;option&gt;Administrator&lt;/option&gt;
-&lt;/select&gt;
-</pre>
-                Which looks like...
-            </p>
-            <p>
-                <form class="demo">
-                    <strong>Select type of user to add:</strong>
-                    <select name="type">
-                        <option>Subscriber</option>
-                        <option>Author</option>
-                        <option>Administrator</option>
-                    </select>
-                </form>
-            </p>
-            <p>
-                The following test will confirm it...
-<pre>
-class SimpleFormTests extends WebTestCase {
-    ...
-    function testNoSuperuserChoiceAvailable() {<strong>
-        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
-        $this-&gt;assertFalse($this-&gt;setField('type', 'Superuser'));</strong>
-    }
-}
-</pre>
-                The current selection will not be changed if the new value is not an option.
-            </p>
-            <p>
-                Here is the full list of widgets currently supported...
-                <ul>
-                    <li>Text fields, including hidden and password fields.</li>
-                    <li>Submit buttons including the button tag, although not yet reset buttons</li>
-                    <li>Text area. This includes text wrapping behaviour.</li>
-                    <li>Checkboxes, including multiple checkboxes in the same form.</li>
-                    <li>Drop down selections, including multiple selects.</li>
-                    <li>Radio buttons.</li>
-                    <li>Images.</li>
-                </ul>
-            </p>
-            <p>
-                The browser emulation offered by SimpleTest mimics
-                the actions which can be perform by a user on a
-                standard HTML page. Javascript is not supported, and
-                it's unlikely that support will be added any time
-                soon.
-            </p>
-            <p>
-                Of particular note is that the Javascript idiom of
-                passing form results by setting a hidden field cannot
-                be performed using the normal SimpleTest
-                commands. See below for a way to test such forms.
-            </p>
-        
-        <h2>
-<a class="target" name="multiple"></a>Fields with multiple values</h2>
-            <p>
-                SimpleTest can cope with two types of multivalue controls: Multiple
-                selection drop downs, and multiple checkboxes with the same name
-                within a form.
-                The multivalue nature of these means that setting and testing
-                are slightly different.
-                Using checkboxes as an example...
-<pre>
-&lt;form class="demo"&gt;
-    &lt;strong&gt;Create privileges allowed:&lt;/strong&gt;
-    &lt;input type="checkbox" name="crud" value="c" checked&gt;&lt;br&gt;
-    &lt;strong&gt;Retrieve privileges allowed:&lt;/strong&gt;
-    &lt;input type="checkbox" name="crud" value="r" checked&gt;&lt;br&gt;
-    &lt;strong&gt;Update privileges allowed:&lt;/strong&gt;
-    &lt;input type="checkbox" name="crud" value="u" checked&gt;&lt;br&gt;
-    &lt;strong&gt;Destroy privileges allowed:&lt;/strong&gt;
-    &lt;input type="checkbox" name="crud" value="d" checked&gt;&lt;br&gt;
-    &lt;input type="submit" value="Enable Privileges"&gt;
-&lt;/form&gt;
-</pre>
-                Which renders as...
-            </p>
-            <p>
-                <form class="demo">
-                    <strong>Create privileges allowed:</strong>
-                    <input type="checkbox" name="crud" value="c" checked><br>
-                    <strong>Retrieve privileges allowed:</strong>
-                    <input type="checkbox" name="crud" value="r" checked><br>
-                    <strong>Update privileges allowed:</strong>
-                    <input type="checkbox" name="crud" value="u" checked><br>
-                    <strong>Destroy privileges allowed:</strong>
-                    <input type="checkbox" name="crud" value="d" checked><br>
-                    <input type="submit" value="Enable Privileges">
-                </form>
-            </p>
-            <p>
-                If we wish to disable all but the retrieval privileges and
-                submit this information we can do it like this...
-<pre>
-class SimpleFormTests extends WebTestCase {
-    ...<strong>
-    function testDisableNastyPrivileges() {
-        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
-        $this-&gt;assertField('crud', array('c', 'r', 'u', 'd'));
-        $this-&gt;setField('crud', array('r'));
-        $this-&gt;click('Enable Privileges');
-    }</strong>
-}
-</pre>
-                Instead of setting the field to a single value, we give it a list
-                of values.
-                We do the same when testing expected values.
-                We can then write other test code to confirm the effect of this, perhaps
-                by logging in as that user and attempting an update.
-            </p>
-        
-        <h2>
-<a class="target" name="hidden-field"></a>Forms which use javascript to set a hidden field</h2>
-            <p>
-                If you want to test a form which relies on javascript to set a hidden
-                field, you can't just call setField().
-                The following code will <em>not</em> work:
-<pre>
-class SimpleFormTests extends WebTestCase {
-    function testEmulateMyJavascriptForm() {
-        <strong>// This does *not* work</strong>
-        $this-&gt;setField('a_hidden_field', '123');
-        $this-&gt;clickSubmit('OK');
-    }
-}
-</pre>
-                Instead, you need to pass the additional form parameters to the
-                clickSubmit() method:
-<pre>
-class SimpleFormTests extends WebTestCase {
-    function testMyJavascriptForm() {
-        <strong>$this-&gt;clickSubmit('OK', array('a_hidden_field'=&gt;'123'));</strong>
-    }
-
-}
-</pre>
-                Bear in mind that in doing this you're effectively stubbing out a
-                part of your software (the javascript code in the form), and
-                perhaps you might be better off using something like 
-                <a href="http://selenium.openqa.org/">Selenium</a> to ensure a complete
-                test.
-            </p>
-        
-        <h2>
-<a class="target" name="raw"></a>Raw posting</h2>
-            <p>
-                If you want to test a form handler, but have not yet written
-                or do not have access to the form itself, you can create a
-                form submission by hand.
-<pre>
-class SimpleFormTests extends WebTestCase {
-    ...<strong>    
-    function testAttemptedHack() {
-        $this-&gt;post(
-                'http://www.my-site.com/add_user.php',
-                array('type' =&gt; 'superuser'));
-        $this-&gt;assertNoText('user created');
-    }</strong>
-}
-</pre>
-                By adding data to the <span class="new_code">WebTestCase::post()</span>
-                method, we are emulating a form submission.
-                You would normally only do this as a temporary expedient, or where
-                you are expecting a 3rd party to submit to a form.
-                The exception is when you want tests to protect you from
-                attempts to spoof your pages.
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-<li>
-            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
-            gives full detail on the classes and assertions available.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <span class="chosen">Testing forms</span>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/en/group_test_documentation.html b/3rdparty/simpletest/docs/en/group_test_documentation.html
deleted file mode 100644
index 10f22a2b1b9..00000000000
--- a/3rdparty/simpletest/docs/en/group_test_documentation.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleTest for PHP test suites</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <span class="chosen">Group tests</span>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Test suite documentation</h1>
-        This page...
-        <ul>
-<li>
-            Different ways to <a href="#group">group tests</a> together.
-        </li>
-<li>
-            Combining group tests into <a href="#higher">larger groups</a>.
-        </li>
-</ul>
-<div class="content">
-        <h2>
-<a class="target" name="group"></a>Grouping tests into suites</h2>
-            <p>
-                There are many ways to group tests together into test suites.
-                One way is to simply place multiple test cases into a single file...
-<pre>
-<strong>&lt;?php
-require_once(dirname(__FILE__) . '/simpletest/autorun.php');
-require_once(dirname(__FILE__) . '/../classes/io.php');
-
-class FileTester extends UnitTestCase {
-    ...
-}
-
-class SocketTester extends UnitTestCase {
-    ...
-}
-?&gt;</strong>
-</pre>
-                As many cases as needed can appear in a single file.
-                They should include any code they need, such as the library
-                being tested, but need none of the SimpleTest libraries.
-            </p>
-            <p>
-                Occasionally special subclasses are created that methods useful
-                for testing part of the application.
-                These new base classes are then used in place of <span class="new_code">UnitTestCase</span>
-                or <span class="new_code">WebTestCase</span>.
-                You don't normally want to run these as test cases.
-                Simply mark any base test cases that should not be run as abstract...
-<pre>
-<strong>abstract</strong> class MyFileTestCase extends UnitTestCase {
-    ...
-}
-
-class FileTester extends MyFileTestCase { ... }
-
-class SocketTester extends UnitTestCase { ... }
-</pre>
-                Here the <span class="new_code">FileTester</span> class does
-                not contain any actual tests, but is the base class for other
-                test cases.
-            </p>
-            <p>
-                We will call this sample <em>file_test.php</em>.
-                Currently the test cases are grouped simply by being in the same file.
-                We can build larger constructs just by including other test files in.
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-require_once('file_test.php');
-?&gt;
-</pre>
-                This will work, but create a purely flat hierarchy.
-                INstead we create a test suite file.
-                Our top level test suite can look like this...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-class AllFileTests extends TestSuite {
-    function __construct() {
-        parent::__construct();
-        <strong>$this-&gt;addFile('file_test.php');</strong>
-    }
-}
-?&gt;
-</pre>
-                What happens here is that the <span class="new_code">TestSuite</span>
-                class will do the <span class="new_code">require_once()</span>
-                for us.
-                It then checks to see if any new test case classes
-                have been created by the new file and automatically composes
-                them to the test suite.
-                This method gives us the most control as we just manually add
-                more test files as our test suite grows.
-            </p>
-            <p>
-                If this is too much typing, and you are willing to group
-                test suites together in their own directories or otherwise
-                tag the file names, then there is a more automatic way...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-class AllFileTests extends TestSuite {
-    function __construct() {
-        parent::__construct();
-        $this-&gt;collect(dirname(__FILE__) . '/unit',
-                       new SimplePatternCollector('/_test.php/'));
-    }
-}
-?&gt;
-</pre>
-                This will scan a directory called "unit" for any files
-                ending with "_test.php" and load them.
-                You don't have to use <span class="new_code">SimplePatternCollector</span> to
-                filter by a pattern in the filename, but this is the most common
-                usage.
-            </p>
-            <p>
-                That snippet above is very common in practice.
-                Now all you have to do is drop a file of test cases into the
-                directory and it will run just by running the test suite script.
-            </p>
-            <p>
-                The catch is that you cannot control the order in which the test
-                cases are run.
-                If you want to see lower level components fail first in the test suite,
-                and this will make diagnosis a lot easier, then you should manually
-                call <span class="new_code">addFile()</span> for these.
-                Tests cases are only loaded once, so it's fine to have these included
-                again by a directory scan.
-            </p>
-            <p>
-                Test cases loaded with the <span class="new_code">addFile</span> method have some
-                useful properties.
-                You can guarantee that the constructor is run
-                just before the first test method and the destructor
-                is run just after the last test method.
-                This allows you to place test case wide set up and tear down
-                code in the constructor and destructor, just like a normal
-                class.
-            </p>
-        
-        <h2>
-<a class="target" name="higher"></a>Composite suites</h2>
-            <p>
-                The above method places all of the test cases into one large suite.
-                For larger projects though this may not be flexible enough; you
-                may want to group the tests together in all sorts of ways.
-            </p>
-            <p>
-                Everything we have described so far with test scripts applies to
-                <span class="new_code">TestSuite</span>s as well...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-<strong>
-class BigTestSuite extends TestSuite {
-    function __construct() {
-        parent::__construct();
-        $this-&gt;addFile('file_tests.php');
-    }
-}</strong>
-?&gt;
-</pre>
-                This effectively adds our test cases and a single suite below
-                the first.
-                When a test fails, we see the breadcrumb trail of the nesting.
-                We can even mix groups and test cases freely as long as
-                we are careful about loops in our includes.
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-class BigTestSuite extends TestSuite {
-    function __construct() {
-        parent::__construct();
-        $this-&gt;addFile('file_tests.php');
-        <strong>$this-&gt;addFile('some_other_test.php');</strong>
-    }
-}
-?&gt;
-</pre>
-                Note that in the event of a double include, ony the first instance
-                of the test case will be run.
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <span class="chosen">Group tests</span>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/en/index.html b/3rdparty/simpletest/docs/en/index.html
deleted file mode 100644
index 9f022d6b10b..00000000000
--- a/3rdparty/simpletest/docs/en/index.html
+++ /dev/null
@@ -1,542 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>
-        Download the SimpleTest testing framework -
-        Unit tests and mock objects for PHP
-    </title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<span class="chosen">SimpleTest</span>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>SimpleTest for PHP</h1>
-        This page...
-        <ul>
-<li>
-            <a href="#unit">Using unit tester</a>
-            with an example.
-        </li>
-<li>
-            <a href="#group">Grouping tests</a>
-            for testing with one click.
-        </li>
-<li>
-            <a href="#mock">Using mock objects</a>
-            to ease testing and gain tighter control.
-        </li>
-<li>
-            <a href="#web">Testing web pages</a>
-            at the browser level.
-        </li>
-</ul>
-<div class="content">
-        
-        
-            <p>
-                The following assumes that you are familiar with the concept
-                of unit testing as well as the PHP web development language.
-                It is a guide for the impatient new user of
-                <a href="https://sourceforge.net/project/showfiles.php?group_id=76550">SimpleTest</a>.
-                For fuller documentation, especially if you are new
-                to unit testing see the ongoing
-                <a href="unit_test_documentation.html">documentation</a>, and for
-                example test cases see the
-                <a href="http://www.lastcraft.com/first_test_tutorial.php">unit testing tutorial</a>.
-            </p>
-        
-        <h2>
-<a class="target" name="unit"></a>Using the tester quickly</h2>
-            <p>
-                Amongst software testing tools, a unit tester is the one
-                closest to the developer.
-                In the context of agile development the test code sits right
-                next to the source code as both are written simultaneously.
-                In this context SimpleTest aims to be a complete PHP developer
-                test solution and is called "Simple" because it
-                should be easy to use and extend.
-                It wasn't a good choice of name really.
-                It includes all of the typical functions you would expect from
-                <a href="http://www.junit.org/">JUnit</a> and the
-                <a href="http://sourceforge.net/projects/phpunit/">PHPUnit</a>
-                ports, and includes
-                <a href="http://www.mockobjects.com">mock objects</a>.
-            </p>
-            <p>
-                What makes this tool immediately useful to the PHP developer is the internal
-                web browser.
-                This allows tests that navigate web sites, fill in forms and test pages.
-                Being able to write these test in PHP means that it is easy to write
-                integrated tests.
-                An example might be confirming that a user was written to a database
-                after a signing up through the web site.
-            </p>
-            <p>
-                The quickest way to demonstrate SimpleTest is with an example.
-            </p>
-            <p>
-                Let us suppose we are testing a simple file logging class called
-                <span class="new_code">Log</span> in <em>classes/log.php</em>.
-                We start by creating a test script which we will call
-                <em>tests/log_test.php</em> and populate it as follows...
-<pre>
-&lt;?php
-<strong>require_once('simpletest/autorun.php');</strong>
-require_once('../classes/log.php');
-
-class TestOfLogging extends <strong>UnitTestCase</strong> {
-}
-?&gt;
-</pre>
-                Here the <em>simpletest</em> folder is either local or in the path.
-                You would have to edit these locations depending on where you
-                unpacked the toolset.
-                The "autorun.php" file does more than just include the
-                SimpleTest files, it also runs our test for us.
-            </p>
-            <p>
-                The <span class="new_code">TestOfLogging</span> is our first test case and it's
-                currently empty.
-                Each test case is a class that extends one of the SimpleTet base classes
-                and we can have as many of these in the file as we want.
-            </p>
-            <p>
-                With three lines of scaffolding, and our <span class="new_code">Log</span> class
-                include, we have a test suite.
-                No tests though.
-            </p>
-            <p>
-                For our first test, we'll assume that the <span class="new_code">Log</span> class
-                takes the file name to write to in the constructor, and we have
-                a temporary folder in which to place this file...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-require_once('../classes/log.php');
-
-class TestOfLogging extends UnitTestCase {
-    function <strong>testLogCreatesNewFileOnFirstMessage()</strong> {
-        @unlink('/temp/test.log');
-        $log = new Log('/temp/test.log');
-        <strong>$this-&gt;assertFalse(file_exists('/temp/test.log'));</strong>
-        $log-&gt;message('Should write this to a file');
-        <strong>$this-&gt;assertTrue(file_exists('/temp/test.log'));</strong>
-    }
-}
-?&gt;
-</pre>
-                When a test case runs, it will search for any method that
-                starts with the string "test"
-                and execute that method.
-                If the method starts "test", it's a test.
-                Note the very long name <span class="new_code">testLogCreatesNewFileOnFirstMessage()</span>.
-                This is considered good style and makes the test output more readable.
-            </p>
-            <p>
-                We would normally have more than one test method in a test case,
-                but that's for later.
-            </p>
-            <p>
-                Assertions within the test methods trigger messages to the
-                test framework which displays the result immediately.
-                This immediate response is important, not just in the event
-                of the code causing a crash, but also so that
-                <span class="new_code">print</span> statements can display
-                their debugging content right next to the assertion concerned.
-            </p>
-            <p>
-                To see these results we have to actually run the tests.
-                No other code is necessary - we can just open the page
-                with our browser.
-            </p>
-            <p>
-                On failure the display looks like this...
-                <div class="demo">
-                    <h1>TestOfLogging</h1>
-                    <span class="fail">Fail</span>: testLogCreatesNewFileOnFirstMessage-&gt;True assertion failed.<br>
-                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
-                    <strong>1</strong> passes and <strong>1</strong> fails.</div>
-                </div>
-                ...and if it passes like this...
-                <div class="demo">
-                    <h1>TestOfLogging</h1>
-                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
-                    <strong>2</strong> passes and <strong>0</strong> fails.</div>
-                </div>
-                And if you get this...
-                <div class="demo">
-                    <b>Fatal error</b>:  Failed opening required '../classes/log.php' (include_path='') in <b>/home/marcus/projects/lastcraft/tutorial_tests/Log/tests/log_test.php</b> on line <b>7</b>
-                </div>
-                it means you're missing the <em>classes/Log.php</em> file that could look like...
-<pre>
-&lt;?php<strong>
-class Log {
-    function Log($file_path) {
-    }
-
-    function message() {
-    }
-}</strong>
-?&gt;
-</pre>
-                It's fun to write the code after the test.
-                More than fun even -
-                this system is called "Test Driven Development".
-            </p>
-            <p>
-                For more information about <span class="new_code">UnitTestCase</span>, see
-                the <a href="unit_test_documentation.html">unit test documentation</a>.
-            </p>
-        
-        <h2>
-<a class="target" name="group"></a>Building test suites</h2>
-            <p>
-                It is unlikely in a real application that we will only ever run
-                one test case.
-                This means that we need a way of grouping cases into a test
-                script that can, if need be, run every test for the application.
-            </p>
-            <p>
-                Our first step is to create a new file called <em>tests/all_tests.php</em>
-                and insert the following code...
-<pre>
-&lt;?php
-<strong>require_once('simpletest/autorun.php');</strong>
-
-class AllTests extends <strong>TestSuite</strong> {
-    function AllTests() {
-        $this-&gt;TestSuite(<strong>'All tests'</strong>);
-        <strong>$this-&gt;addFile('log_test.php');</strong>
-    }
-}
-?&gt;
-</pre>
-                The "autorun" include allows our upcoming test suite
-                to be run just by invoking this script.
-            </p>
-            <p>
-                The <span class="new_code">TestSuite</span> subclass must chain it's constructor.
-                This limitation will be removed in future versions.
-            </p>
-            <p>
-                The method <span class="new_code">TestSuite::addFile()</span>
-                will include the test case file and read any new classes
-                that are descended from <span class="new_code">SimpleTestCase</span>.
-                <span class="new_code">UnitTestCase</span> is just one example of a class derived from
-                <span class="new_code">SimpleTestCase</span>, and you can create your own.
-                <span class="new_code">TestSuite::addFile()</span> can include other test suites.
-            </p>
-            <p>
-                The class will not be instantiated yet.
-                When the test suite runs it will construct each instance once
-                it reaches that test, then destroy it straight after.
-                This means that the constructor is run just before each run
-                of that test case, and the destructor is run before the next test case starts.
-            </p>
-            <p>
-                It is common to group test case code into superclasses which are not
-                supposed to run, but become the base classes of other tests.
-                For "autorun" to work properly the test case file should not blindly run
-                any other test case extensions that do not actually run tests.
-                This could result in extra test cases being counted during the test
-                run.
-                Hardly a major problem, but to avoid this inconvenience simply mark your
-                base class as <span class="new_code">abstract</span>.
-                SimpleTest won't run abstract classes.
-                If you are still using PHP4, then
-                a <span class="new_code">SimpleTestOptions::ignore()</span> directive
-                somewhere in the test case file will have the same effect.
-            </p>
-            <p>
-                Also, the test case file should not have been included
-                elsewhere or no cases will be added to this group test.
-                This would be a more serious error as if the test case classes are
-                already loaded by PHP the <span class="new_code">TestSuite::addFile()</span>
-                method will not detect them.
-            </p>
-            <p>
-                To display the results it is necessary only to invoke
-                <em>tests/all_tests.php</em> from the web server or the command line.
-            </p>
-            <p>
-                For more information about building test suites,
-                see the <a href="group_test_documentation.html">test suite documentation</a>.
-            </p>
-        
-        <h2>
-<a class="target" name="mock"></a>Using mock objects</h2>
-            <p>
-                Let's move further into the future and do something really complicated.
-            </p>
-            <p>
-                Assume that our logging class is tested and completed.
-                Assume also that we are testing another class that is
-                required to write log messages, say a
-                <span class="new_code">SessionPool</span>.
-                We want to test a method that will probably end up looking
-                like this...
-<pre><strong>
-class SessionPool {
-    ...
-    function logIn($username) {
-        ...
-        $this-&gt;_log-&gt;message("User $username logged in.");
-        ...
-    }
-    ...
-}
-</strong>
-</pre>
-                In the spirit of reuse, we are using our
-                <span class="new_code">Log</span> class.
-                A conventional test case might look like this...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-require_once('../classes/log.php');
-<strong>require_once('../classes/session_pool.php');</strong>
-
-class <strong>TestOfSessionLogging</strong> extends UnitTestCase {
-    
-    function setUp() {
-        <strong>@unlink('/temp/test.log');</strong>
-    }
-    
-    function tearDown() {
-        <strong>@unlink('/temp/test.log');</strong>
-    }
-    
-    function testLoggingInIsLogged() {
-        <strong>$log = new Log('/temp/test.log');
-        $session_pool = &amp;new SessionPool($log);
-        $session_pool-&gt;logIn('fred');</strong>
-        $messages = file('/temp/test.log');
-        $this-&gt;assertEqual($messages[0], "User fred logged in.<strong>\n</strong>");
-    }
-}
-?&gt;
-</pre>
-                We'll explain the <span class="new_code">setUp()</span> and <span class="new_code">tearDown()</span>
-                methods later.
-            </p>
-            <p>
-                This test case design is not all bad, but it could be improved.
-                We are spending time fiddling with log files which are
-                not part of our test.
-                We have created close ties with the <span class="new_code">Log</span> class and
-                this test.
-                What if we don't use files any more, but use ths
-                <em>syslog</em> library instead?
-                It means that our <span class="new_code">TestOfSessionLogging</span> test will
-                fail, even thouh it's not testing Logging.
-            </p>
-            <p>
-                It's fragile in smaller ways too.
-                Did you notice the extra carriage return in the message?
-                Was that added by the logger?
-                What if it also added a time stamp or other data?
-            </p>
-            <p>
-                The only part that we really want to test is that a particular
-                message was sent to the logger.
-                We can reduce coupling if we pass in a fake logging class
-                that simply records the message calls for testing, but
-                takes no action.
-                It would have to look exactly like our original though.
-            </p>
-            <p>
-                If the fake object doesn't write to a file then we save on deleting
-                the file before and after each test. We could save even more
-                test code if the fake object would kindly run the assertion for us.
-            <p>
-            </p>
-                Too good to be true?
-                We can create such an object easily...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-require_once('../classes/log.php');
-require_once('../classes/session_pool.php');
-
-<strong>Mock::generate('Log');</strong>
-
-class TestOfSessionLogging extends UnitTestCase {
-    
-    function testLoggingInIsLogged() {<strong>
-        $log = &amp;new MockLog();
-        $log-&gt;expectOnce('message', array('User fred logged in.'));</strong>
-        $session_pool = &amp;new SessionPool(<strong>$log</strong>);
-        $session_pool-&gt;logIn('fred');
-    }
-}
-?&gt;
-</pre>
-                The <span class="new_code">Mock::generate()</span> call code generated a new class
-                called <span class="new_code">MockLog</span>.
-                This looks like an identical clone, except that we can wire test code
-                to it.
-                That's what <span class="new_code">expectOnce()</span> does.
-                It says that if <span class="new_code">message()</span> is ever called on me, it had
-                better be with the parameter "User fred logged in.".
-            </p>
-            <p>
-                The test will be triggered when the call to
-                <span class="new_code">message()</span> is invoked on the
-                <span class="new_code">MockLog</span> object by <span class="new_code">SessionPool::logIn()</span> code.
-                The mock call will trigger a parameter comparison and then send the
-                resulting pass or fail event to the test display.
-                Wildcards can be included here too, so you don't have to test every parameter of
-                a call when you only want to test one.
-            </p>
-            <p>
-                If the mock reaches the end of the test case without the
-                method being called, the <span class="new_code">expectOnce()</span>
-                expectation will trigger a test failure.
-                In other words the mocks can detect the absence of
-                behaviour as well as the presence.
-            </p>
-            <p>
-                The mock objects in the SimpleTest suite can have arbitrary
-                return values set, sequences of returns, return values
-                selected according to the incoming arguments, sequences of
-                parameter expectations and limits on the number of times
-                a method is to be invoked.
-            </p>
-            <p>
-                For more information about mocking and stubbing, see the
-                <a href="mock_objects_documentation.html">mock objects documentation</a>.
-            </p>
-        
-        <h2>
-<a class="target" name="web"></a>Web page testing</h2>
-            <p>
-                One of the requirements of web sites is that they produce web
-                pages.
-                If you are building a project top-down and you want to fully
-                integrate testing along the way then you will want a way of
-                automatically navigating a site and examining output for
-                correctness.
-                This is the job of a web tester.
-            </p>
-            <p>
-                The web testing in SimpleTest is fairly primitive, as there is
-                no JavaScript.
-                Most other browser operations are simulated.
-            </p>
-            <p>
-                To give an idea here is a trivial example where a home
-                page is fetched, from which we navigate to an "about"
-                page and then test some client determined content.
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-<strong>require_once('simpletest/web_tester.php');</strong>
-
-class TestOfAbout extends <strong>WebTestCase</strong> {
-    function testOurAboutPageGivesFreeReignToOurEgo() {
-        <strong>$this-&gt;get('http://test-server/index.php');
-        $this-&gt;click('About');
-        $this-&gt;assertTitle('About why we are so great');
-        $this-&gt;assertText('We are really great');</strong>
-    }
-}
-?&gt;
-</pre>
-                With this code as an acceptance test, you can ensure that
-                the content always meets the specifications of both the
-                developers, and the other project stakeholders.
-            </p>
-            <p>
-                You can navigate forms too...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-require_once('simpletest/web_tester.php');
-
-class TestOfRankings extends WebTestCase {
-    function testWeAreTopOfGoogle() {
-        $this-&gt;get('http://google.com/');
-        $this-&gt;setField('q', 'simpletest');
-        $this-&gt;click("I'm Feeling Lucky");
-        $this-&gt;assertTitle('SimpleTest - Unit Testing for PHP');
-    }
-}
-?&gt;
-</pre>
-                ...although this could violate Google's(tm) terms and conditions.
-            </p>
-            <p>
-                For more information about web testing, see the
-                <a href="browser_documentation.html">scriptable
-                browser documentation</a> and the
-                <a href="web_tester_documentation.html">WebTestCase</a>.
-            </p>
-            <p>
-                <a href="http://sourceforge.net/projects/simpletest/"><img src="http://sourceforge.net/sflogo.php?group_id=76550&amp;type=5" width="210" height="62" border="0" alt="SourceForge.net Logo"></a>
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            <a href="https://sourceforge.net/project/showfiles.php?group_id=76550&amp;release_id=153280">Download PHP SimpleTest</a>
-            from <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
-            gives full detail on the classes and assertions available.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<span class="chosen">SimpleTest</span>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/en/mock_objects_documentation.html b/3rdparty/simpletest/docs/en/mock_objects_documentation.html
deleted file mode 100644
index b4697f9ee3b..00000000000
--- a/3rdparty/simpletest/docs/en/mock_objects_documentation.html
+++ /dev/null
@@ -1,870 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleTest for PHP mock objects documentation</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <span class="chosen">Mock objects</span>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Mock objects documentation</h1>
-        This page...
-        <ul>
-<li>
-            <a href="#what">What are mock objects?</a>
-        </li>
-<li>
-            <a href="#creation">Creating mock objects</a>.
-        </li>
-<li>
-            <a href="#expectations">Mocks as critics</a> with expectations.
-        </li>
-</ul>
-<div class="content">
-        <h2>
-<a class="target" name="what"></a>What are mock objects?</h2>
-            <p>
-                Mock objects have two roles during a test case: actor and critic.
-            </p>
-            <p>
-                The actor behaviour is to simulate objects that are difficult to
-                set up or time consuming to set up for a test.
-                The classic example is a database connection.
-                Setting up a test database at the start of each test would slow
-                testing to a crawl and would require the installation of the
-                database engine and test data on the test machine.
-                If we can simulate the connection and return data of our
-                choosing we not only win on the pragmatics of testing, but can
-                also feed our code spurious data to see how it responds.
-                We can simulate databases being down or other extremes
-                without having to create a broken database for real.
-                In other words, we get greater control of the test environment.
-            </p>
-            <p>
-                If mock objects only behaved as actors they would simply be
-                known as "server stubs".
-                This was originally a pattern named by Robert Binder (<a href="">Testing
-                object-oriented systems</a>: models, patterns, and tools,
-                Addison-Wesley) in 1999.
-            </p>
-            <p>
-                A server stub is a simulation of an object or component.
-                It should exactly replace a component in a system for test
-                or prototyping purposes, but remain lightweight.
-                This allows tests to run more quickly, or if the simulated
-                class has not been written, to run at all.
-            </p>
-            <p>
-                However, the mock objects not only play a part (by supplying chosen
-                return values on demand) they are also sensitive to the
-                messages sent to them (via expectations).
-                By setting expected parameters for a method call they act
-                as a guard that the calls upon them are made correctly.
-                If expectations are not met they save us the effort of
-                writing a failed test assertion by performing that duty on our
-                behalf.
-            </p>
-            <p>
-                In the case of an imaginary database connection they can
-                test that the query, say SQL, was correctly formed by
-                the object that is using the connection.
-                Set them up with fairly tight expectations and you will
-                hardly need manual assertions at all.
-            </p>
-        
-        <h2>
-<a class="target" name="creation"></a>Creating mock objects</h2>
-            <p>
-                All we need is an existing class or interface, say a database connection
-                that looks like this...
-<pre>
-<strong>class DatabaseConnection {
-    function DatabaseConnection() { }
-    function query($sql) { }
-    function selectQuery($sql) { }
-}</strong>
-</pre>
-                To create a mock version of the class we need to run a
-                code generator...
-<pre>
-require_once('simpletest/autorun.php');
-require_once('database_connection.php');
-
-<strong>Mock::generate('DatabaseConnection');</strong>
-</pre>
-                This code generates a clone class called
-                <span class="new_code">MockDatabaseConnection</span>.
-                This new class appears to be the same, but actually has no behaviour at all.
-            </p>
-            <p>
-                The new class is usually a subclass of <span class="new_code">DatabaseConnection</span>.
-                Unfortunately, there is no way to create a mock version of a
-                class with a <span class="new_code">final</span> method without having a living version of
-                that method.
-                We consider that unsafe.
-                If the target is an interface, or if <span class="new_code">final</span> methods are
-                present in a target class, then a whole new class
-                is created, but one implemeting the same interfaces.
-                If you try to pass this separate class through a type hint that specifies
-                the old concrete class name, it will fail.
-                Code like that insists on type hinting to a class with <span class="new_code">final</span>
-                methods probably cannot be safely tested with mocks.
-            </p>
-            <p>
-                If you want to see the generated code, then simply <span class="new_code">print</span>
-                the output of <span class="new_code">Mock::generate()</span>.
-                Here is the generated code for the <span class="new_code">DatabaseConnection</span>
-                class rather than the interface version...
-<pre>
-class MockDatabaseConnection extends DatabaseConnection {
-    public $mock;
-    protected $mocked_methods = array('databaseconnection', 'query', 'selectquery');
-
-    function MockDatabaseConnection() {
-        $this-&gt;mock = new SimpleMock();
-        $this-&gt;mock-&gt;disableExpectationNameChecks();
-    }
-    ...
-    function DatabaseConnection() {
-        $args = func_get_args();
-        $result = &amp;$this-&gt;mock-&gt;invoke("DatabaseConnection", $args);
-        return $result;
-    }
-    function query($sql) {
-        $args = func_get_args();
-        $result = &amp;$this-&gt;mock-&gt;invoke("query", $args);
-        return $result;
-    }
-    function selectQuery($sql) {
-        $args = func_get_args();
-        $result = &amp;$this-&gt;mock-&gt;invoke("selectQuery", $args);
-        return $result;
-    }
-}
-</pre>
-                Your output may vary depending on the exact version
-                of SimpleTest you are using.
-            </p>
-            <p>
-                Besides the original methods of the class, you will see some extra
-                methods that help testing.
-                More on these later.
-            </p>
-            <p>
-                We can now create instances of the new class within
-                our test case...
-<pre>
-require_once('simpletest/autorun.php');
-require_once('database_connection.php');
-
-Mock::generate('DatabaseConnection');
-
-class MyTestCase extends UnitTestCase {
-
-    function testSomething() {
-        <strong>$connection = new MockDatabaseConnection();</strong>
-    }
-}
-</pre>
-                The mock version now has all the methods of the original.
-                Also, any type hints will be faithfully preserved.
-                Say our query methods expect a <span class="new_code">Query</span> object...
-<pre>
-<strong>class DatabaseConnection {
-    function DatabaseConnection() { }
-    function query(Query $query) { }
-    function selectQuery(Query $query) { }
-}</strong>
-</pre>
-                If we now pass the wrong type of object, or worse a non-object...
-<pre>
-class MyTestCase extends UnitTestCase {
-
-    function testSomething() {
-        $connection = new MockDatabaseConnection();
-        $connection-&gt;query('insert into accounts () values ()');
-    }
-}
-</pre>
-                ...the code will throw a type violation at you just as the
-                original class would.
-            </p>
-            <p>
-                The mock version now has all the methods of the original.
-                Unfortunately, they all return <span class="new_code">null</span>.
-                As methods that always return <span class="new_code">null</span> are not that useful,
-                we need to be able to set them to something else...
-            </p>
-            <p>
-                <a class="target" name="stub"><h2>Mocks as actors</h2></a>
-            </p>
-            <p>
-                Changing the return value of a method from <span class="new_code">null</span>
-                to something else is pretty easy...
-<pre>
-<strong>$connection-&gt;returns('query', 37)</strong>
-</pre>
-                Now every time we call
-                <span class="new_code">$connection-&gt;query()</span> we get
-                the result of 37.
-                There is nothing special about 37.
-                The return value can be arbitrarily complicated.
-            </p>
-            <p>
-                Parameters are irrelevant here, we always get the same
-                values back each time once they have been set up this way.
-                That may not sound like a convincing replica of a
-                database connection, but for the half a dozen lines of
-                a test method it is usually all you need.
-            </p>
-            <p>
-                Things aren't always that simple though.
-                One common problem is iterators, where constantly returning
-                the same value could cause an endless loop in the object
-                being tested.
-                For these we need to set up sequences of values.
-                Let's say we have a simple iterator that looks like this...
-<pre>
-class Iterator {
-    function Iterator() { }
-    function next() { }
-}
-</pre>
-                This is about the simplest iterator you could have.
-                Assuming that this iterator only returns text until it
-                reaches the end, when it returns false, we can simulate it
-                with...
-<pre>
-Mock::generate('Iterator');
-
-class IteratorTest extends UnitTestCase() {
-
-    function testASequence() {<strong>
-        $iterator = new MockIterator();
-        $iterator-&gt;returns('next', false);
-        $iterator-&gt;returnsAt(0, 'next', 'First string');
-        $iterator-&gt;returnsAt(1, 'next', 'Second string');</strong>
-        ...
-    }
-}
-</pre>
-                When <span class="new_code">next()</span> is called on the
-                <span class="new_code">MockIterator</span> it will first return "First string",
-                on the second call "Second string" will be returned
-                and on any other call <span class="new_code">false</span> will
-                be returned.
-                The sequenced return values take precedence over the constant
-                return value.
-                The constant one is a kind of default if you like.
-            </p>
-            <p>
-                Another tricky situation is an overloaded
-                <span class="new_code">get()</span> operation.
-                An example of this is an information holder with name/value pairs.
-                Say we have a configuration class like...
-<pre>
-class Configuration {
-    function Configuration() { ... }
-    function get($key) { ... }
-}
-</pre>
-                This is a likely situation for using mock objects, as
-                actual configuration will vary from machine to machine and
-                even from test to test.
-                The problem though is that all the data comes through the
-                <span class="new_code">get()</span> method and yet
-                we want different results for different keys.
-                Luckily the mocks have a filter system...
-<pre>
-<strong>$config = &amp;new MockConfiguration();
-$config-&gt;returns('get', 'primary', array('db_host'));
-$config-&gt;returns('get', 'admin', array('db_user'));
-$config-&gt;returns('get', 'secret', array('db_password'));</strong>
-</pre>
-                The extra parameter is a list of arguments to attempt
-                to match.
-                In this case we are trying to match only one argument which
-                is the look up key.
-                Now when the mock object has the
-                <span class="new_code">get()</span> method invoked
-                like this...
-<pre>
-$config-&gt;get('db_user')
-</pre>
-                ...it will return "admin".
-                It finds this by attempting to match the calling arguments
-                to its list of returns one after another until
-                a complete match is found.
-            </p>
-            <p>
-                You can set a default argument argument like so...
-<pre><strong>
-$config-&gt;returns('get', false, array('*'));</strong>
-</pre>
-                This is not the same as setting the return value without
-                any argument requirements like this...
-<pre><strong>
-$config-&gt;returns('get', false);</strong>
-</pre>
-                In the first case it will accept any single argument,
-                but exactly one is required.
-                In the second case any number of arguments will do and
-                it acts as a catchall after all other matches.
-                Note that if we add further single parameter options after
-                the wildcard in the first case, they will be ignored as the wildcard
-                will match first.
-                With complex parameter lists the ordering could be important
-                or else desired matches could be masked by earlier wildcard
-                ones.
-                Declare the most specific matches first if you are not sure.
-            </p>
-            <p>
-                There are times when you want a specific reference to be
-                dished out by the mock rather than a copy or object handle.
-                This a rarity to say the least, but you might be simulating
-                a container that can hold primitives such as strings.
-                For example...
-<pre>
-class Pad {
-    function Pad() { }
-    function &amp;note($index) { }
-}
-</pre>
-                In this case you can set a reference into the mock's
-                return list...
-<pre>
-function testTaskReads() {
-    $note = 'Buy books';
-    $pad = new MockPad();
-    $vector-&gt;<strong>returnsByReference(</strong>'note', $note, array(3)<strong>)</strong>;
-    $task = new Task($pad);
-    ...
-}
-</pre>
-                With this arrangement you know that every time
-                <span class="new_code">$pad-&gt;note(3)</span> is
-                called it will return the same <span class="new_code">$note</span> each time,
-                even if it get's modified.
-            </p>
-            <p>
-                These three factors, timing, parameters and whether to copy,
-                can be combined orthogonally.
-                For example...
-<pre>
-$buy_books = 'Buy books';
-$write_code = 'Write code';
-$pad = new MockPad();
-$vector-&gt;<strong>returnsByReferenceAt(0, 'note', $buy_books, array('*', 3));</strong>
-$vector-&gt;<strong>returnsByReferenceAt(1, 'note', $write_code, array('*', 3));</strong>
-</pre>
-                This will return a reference to <span class="new_code">$buy_books</span> and
-                then to <span class="new_code">$write_code</span>, but only if two parameters
-                were set the second of which must be the integer 3.
-                That should cover most situations.
-            </p>
-            <p>
-                A final tricky case is one object creating another, known
-                as a factory pattern.
-                Suppose that on a successful query to our imaginary
-                database, a result set is returned as an iterator, with
-                each call to the the iterator's <span class="new_code">next()</span> giving
-                one row until false.
-                This sounds like a simulation nightmare, but in fact it can all
-                be mocked using the mechanics above...
-<pre>
-Mock::generate('DatabaseConnection');
-Mock::generate('ResultIterator');
-
-class DatabaseTest extends UnitTestCase {
-
-    function testUserFinderReadsResultsFromDatabase() {<strong>
-        $result = new MockResultIterator();
-        $result-&gt;returns('next', false);
-        $result-&gt;returnsAt(0, 'next', array(1, 'tom'));
-        $result-&gt;returnsAt(1, 'next', array(3, 'dick'));
-        $result-&gt;returnsAt(2, 'next', array(6, 'harry'));
-
-        $connection = new MockDatabaseConnection();
-        $connection-&gt;returns('selectQuery', $result);</strong>
-
-        $finder = new UserFinder(<strong>$connection</strong>);
-        $this-&gt;assertIdentical(
-                $finder-&gt;findNames(),
-                array('tom', 'dick', 'harry'));
-    }
-}
-</pre>
-                Now only if our
-                <span class="new_code">$connection</span> is called with the
-                <span class="new_code">query()</span> method will the
-                <span class="new_code">$result</span> be returned that is
-                itself exhausted after the third call to <span class="new_code">next()</span>.
-                This should be enough
-                information for our <span class="new_code">UserFinder</span> class,
-                the class actually
-                being tested here, to come up with goods.
-                A very precise test and not a real database in sight.
-            </p>
-            <p>
-                We could refine this test further by insisting that the correct
-                query is sent...
-<pre>
-$connection-&gt;returns('selectQuery', $result, array(<strong>'select name, id from people'</strong>));
-</pre>
-                This is actually a bad idea.
-            </p>
-            <p>
-                We have a <span class="new_code">UserFinder</span> in object land, talking to
-                database tables using a large interface - the whole of SQL.
-                Imagine that we have written a lot of tests that now depend
-                on the exact SQL string passed.
-                These queries could change en masse for all sorts of reasons
-                not related to the specific test.
-                For example the quoting rules could change, a table name could
-                change, a link table added or whatever.
-                This would require the rewriting of every single test any time
-                one of these refactoring is made, yet the intended behaviour has
-                stayed the same.
-                Tests are supposed to help refactoring, not hinder it.
-                I'd certainly like to have a test suite that passes while I change
-                table names.
-            </p>
-            <p>
-                As a rule it is best not to mock a fat interface.
-            </p>
-            <p>
-                By contrast, here is the round trip test...
-<pre>
-class DatabaseTest extends UnitTestCase {<strong>
-    function setUp() { ... }
-    function tearDown() { ... }</strong>
-
-    function testUserFinderReadsResultsFromDatabase() {
-        $finder = new UserFinder(<strong>new DatabaseConnection()</strong>);
-        $finder-&gt;add('tom');
-        $finder-&gt;add('dick');
-        $finder-&gt;add('harry');
-        $this-&gt;assertIdentical(
-                $finder-&gt;findNames(),
-                array('tom', 'dick', 'harry'));
-    }
-}
-</pre>
-                This test is immune to schema changes.
-                It will only fail if you actually break the functionality, which
-                is what you want a test to do.
-            </p>
-            <p>
-                The catch is those <span class="new_code">setUp()</span> and <span class="new_code">tearDown()</span>
-                methods that we've rather glossed over.
-                They have to clear out the database tables and ensure that the
-                schema is defined correctly.
-                That can be a chunk of extra work, but you usually have this code
-                lying around anyway for deployment purposes.
-            </p>
-            <p>
-                One place where you definitely need a mock is simulating failures.
-                Say the database goes down while <span class="new_code">UserFinder</span> is doing
-                it's work.
-                Does <span class="new_code">UserFinder</span> behave well...?
-<pre>
-class DatabaseTest extends UnitTestCase {
-
-    function testUserFinder() {
-        $connection = new MockDatabaseConnection();<strong>
-        $connection-&gt;throwOn('selectQuery', new TimedOut('Ouch!'));</strong>
-        $alert = new MockAlerts();<strong>
-        $alert-&gt;expectOnce('notify', 'Database is busy - please retry');</strong>
-        $finder = new UserFinder($connection, $alert);
-        $this-&gt;assertIdentical($finder-&gt;findNames(), array());
-    }
-}
-</pre>
-                We've passed the <span class="new_code">UserFinder</span> an <span class="new_code">$alert</span>
-                object.
-                This is going to do some kind of pretty notifications in the
-                user interface in the event of an error.
-                We'd rather not sprinkle our code with hard wired <span class="new_code">print</span>
-                statements if we can avoid it.
-                Wrapping the means of output means we can use this code anywhere.
-                It also makes testing easier.
-            </p>
-            <p>
-                To pass this test, the finder has to write a nice user friendly
-                message to <span class="new_code">$alert</span>, rather than propogating the exception.
-                So far, so good.
-            </p>
-            <p>
-                How do we get the mock <span class="new_code">DatabaseConnection</span> to throw an exception?
-                We generate the exception using the <span class="new_code">throwOn</span> method
-                on the mock.
-            </p>
-            <p>
-                Finally, what if the method you want to simulate does not exist yet?
-                If you set a return value on a method that is not there, SimpleTest
-                will throw an error.
-                What if you are using <span class="new_code">__call()</span> to simulate dynamic methods?
-            </p>
-            <p>
-                Objects with dynamic interfaces, using <span class="new_code">__call</span>, can
-                be problematic with the current mock objects implementation.
-                You can mock the <span class="new_code">__call()</span> method, but this is ugly.
-                Why should a test know anything about such low level implementation details?
-                It just wants to simulate the call.
-            </p>
-            <p>
-                The way round this is to add extra methods to the mock when
-                generating it.
-<pre>
-<strong>Mock::generate('DatabaseConnection', 'MockDatabaseConnection', array('setOptions'));</strong>
-</pre>
-                In a large test suite this could cause trouble, as you probably
-                already have a mock version of the class called
-                <span class="new_code">MockDatabaseConnection</span> without the extra methods.
-                The code generator will not generate a mock version of the class if
-                one of the same name already exists.
-                You will confusingly fail to see your method if another definition
-                was run first.
-            </p>
-            <p>
-                To cope with this, SimpleTest allows you to choose any name for the
-                new class at the same time as you add the extra methods.
-<pre>
-Mock::generate('DatabaseConnection', <strong>'MockDatabaseConnectionWithOptions'</strong>, array('setOptions'));
-</pre>
-                Here the mock will behave as if the <span class="new_code">setOptions()</span>
-                existed in the original class.
-            </p>
-            <p>
-                Mock objects can only be used within test cases, as upon expectations
-                they send messages straight to the currently running test case.
-                Creating them outside a test case will cause a run time error
-                when an expectation is triggered and there is no running test case
-                for the message to end up.
-                We cover expectations next.
-            </p>
-        
-        <h2>
-<a class="target" name="expectations"></a>Mocks as critics</h2>
-            <p>
-                Although the server stubs approach insulates your tests from
-                real world disruption, it is only half the benefit.
-                You can have the class under test receiving the required
-                messages, but is your new class sending correct ones?
-                Testing this can get messy without a mock objects library.
-            </p>
-			<p>
-                By way of example, let's take a simple <span class="new_code">PageController</span>
-                class to handle a credit card payment form...
-<pre>
-class PaymentForm extends PageController {
-    function __construct($alert, $payment_gateway) { ... }
-    function makePayment($request) { ... }
-}
-</pre>
-                This class takes a <span class="new_code">PaymentGateway</span> to actually talk
-                to the bank.
-                It also takes an <span class="new_code">Alert</span> object to handle errors.
-                This class talks to the page or template.
-                It's responsible for painting the error message and highlighting any
-                form fields that are incorrect.
-            </p>
-            <p>
-                It might look something like...
-<pre>
-class Alert {
-    function warn($warning, $id) {
-        print '&lt;div class="warning"&gt;' . $warning . '&lt;/div&gt;';
-        print '&lt;style type="text/css"&gt;#' . $id . ' { background-color: red }&lt;/style&gt;';
-    }
-}
-</pre>
-            </p>
-            <p>
-                Our interest is in the <span class="new_code">makePayment()</span> method.
-                If we fail to enter a "CVV2" number (the three digit number
-                on the back of the credit card), we want to show an error rather than
-                try to process the payment.
-                In test form...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-require_once('payment_form.php');
-Mock::generate('Alert');
-Mock::generate('PaymentGateway');
-
-class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
-
-    function testMissingCvv2CausesAlert() {
-        $alert = new MockAlert();
-        <strong>$alert-&gt;expectOnce(
-                    'warn',
-                    array('Missing three digit security code', 'cvv2'));</strong>
-        $controller = new PaymentForm(<strong>$alert</strong>, new MockPaymentGateway());
-        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
-    }
-
-    function requestWithMissingCvv2() { ... }
-}
-?&gt;
-</pre>
-                The first question you may be asking is, where are the assertions?
-            </p>
-            <p>
-                The call to <span class="new_code">expectOnce('warn', array(...))</span> instructs the mock
-                to expect a call to <span class="new_code">warn()</span> before the test ends.
-                When it gets a call to <span class="new_code">warn()</span>, it checks the arguments.
-                If the arguments don't match, then a failure is generated.
-                It also fails if the method is never called at all.
-            </p>
-            <p>
-                The test above not only asserts that <span class="new_code">warn</span> was called,
-                but that it received the string "Missing three digit security code"
-                and also the tag "cvv2".
-                The equivalent of <span class="new_code">assertIdentical()</span> is applied to both
-                fields when the parameters are compared.
-            </p>
-            <p>
-                If you are not interested in the actual message, and we are not
-                for user interface code that changes often, we can skip that
-                parameter with the "*" operator...
-<pre>
-class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
-
-    function testMissingCvv2CausesAlert() {
-        $alert = new MockAlert();
-        $alert-&gt;expectOnce('warn', array(<strong>'*'</strong>, 'cvv2'));
-        $controller = new PaymentForm($alert, new MockPaymentGateway());
-        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
-    }
-
-    function requestWithMissingCvv2() { ... }
-}
-</pre>
-                We can weaken the test further by missing
-                out the parameters array...
-<pre>
-function testMissingCvv2CausesAlert() {
-    $alert = new MockAlert();
-    <strong>$alert-&gt;expectOnce('warn');</strong>
-    $controller = new PaymentForm($alert, new MockPaymentGateway());
-    $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
-}
-</pre>
-                This will only test that the method is called,
-                which is a bit drastic in this case.
-                Later on, we'll see how we can weaken the expectations more precisely.
-            </p>
-            <p>
-                Tests without assertions can be both compact and very expressive.
-                Because we intercept the call on the way into an object, here of
-                the <span class="new_code">Alert</span> class, we avoid having to assert its state
-                afterwards.
-                This not only avoids the assertions in the tests, but also having
-                to add extra test only accessors to the original code.
-                If you catch yourself adding such accessors, called "state based testing",
-                it's probably time to consider using mocks in the tests.
-                This is called "behaviour based testing", and is normally superior.
-            </p>
-            <p>
-                Let's add another test.
-                Let's make sure that we don't even attempt a payment without a CVV2...
-<pre>
-class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
-
-    function testMissingCvv2CausesAlert() { ... }
-
-    function testNoPaymentAttemptedWithMissingCvv2() {
-        $payment_gateway = new MockPaymentGateway();
-        <strong>$payment_gateway-&gt;expectNever('pay');</strong>
-        $controller = new PaymentForm(new MockAlert(), $payment_gateway);
-        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
-    }
-
-    ...
-}
-</pre>
-                Asserting a negative can be very hard in tests, but
-                <span class="new_code">expectNever()</span> makes it easy.
-            </p>
-            <p>
-                <span class="new_code">expectOnce()</span> and <span class="new_code">expectNever()</span> are
-                sufficient for most tests, but
-                occasionally you want to test multiple events.
-                Normally for usability purposes we want all missing fields
-                in the form to light up, not just the first one.
-                This means that we should get multiple calls to
-                <span class="new_code">Alert::warn()</span>, not just one...
-<pre>
-function testAllRequiredFieldsHighlightedOnEmptyRequest() {
-    $alert = new MockAlert();<strong>
-    $alert-&gt;expectAt(0, 'warn', array('*', 'cc_number'));
-    $alert-&gt;expectAt(1, 'warn', array('*', 'expiry'));
-    $alert-&gt;expectAt(2, 'warn', array('*', 'cvv2'));
-    $alert-&gt;expectAt(3, 'warn', array('*', 'card_holder'));
-    $alert-&gt;expectAt(4, 'warn', array('*', 'address'));
-    $alert-&gt;expectAt(5, 'warn', array('*', 'postcode'));
-    $alert-&gt;expectAt(6, 'warn', array('*', 'country'));
-    $alert-&gt;expectCallCount('warn', 7);</strong>
-    $controller = new PaymentForm($alert, new MockPaymentGateway());
-    $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
-}
-</pre>
-                The counter in <span class="new_code">expectAt()</span> is the number of times
-                the method has been called already.
-                Here we are asserting that every field will be highlighted.
-            </p>
-            <p>
-                Note that we are forced to assert the order too.
-                SimpleTest does not yet have a way to avoid this, but
-                this will be fixed in future versions.
-            </p>
-            <p>
-                Here is the full list of expectations you can set on a mock object
-                in <a href="http://simpletest.org/">SimpleTest</a>.
-                As with the assertions, these methods take an optional failure message.
-                <table>
-                    <thead><tr>
-<th>Expectation</th>
-<th>Description</th>
-</tr></thead>
-                    <tbody>
-                        <tr>
-                            <td><span class="new_code">expect($method, $args)</span></td>
-                            <td>Arguments must match if called</td>
-                        </tr>
-                        <tr>
-                            <td><span class="new_code">expectAt($timing, $method, $args)</span></td>
-                            <td>Arguments must match when called on the <span class="new_code">$timing</span>'th time</td>
-                        </tr>
-                        <tr>
-                            <td><span class="new_code">expectCallCount($method, $count)</span></td>
-                            <td>The method must be called exactly this many times</td>
-                        </tr>
-                        <tr>
-                            <td><span class="new_code">expectMaximumCallCount($method, $count)</span></td>
-                            <td>Call this method no more than <span class="new_code">$count</span> times</td>
-                        </tr>
-                        <tr>
-                            <td><span class="new_code">expectMinimumCallCount($method, $count)</span></td>
-                            <td>Must be called at least <span class="new_code">$count</span> times</td>
-                        </tr>
-                        <tr>
-                            <td><span class="new_code">expectNever($method)</span></td>
-                            <td>Must never be called</td>
-                        </tr>
-                        <tr>
-                            <td><span class="new_code">expectOnce($method, $args)</span></td>
-                            <td>Must be called once and with the expected arguments if supplied</td>
-                        </tr>
-                        <tr>
-                            <td><span class="new_code">expectAtLeastOnce($method, $args)</span></td>
-                            <td>Must be called at least once, and always with any expected arguments</td>
-                        </tr>
-                    </tbody>
-                </table>
-                Where the parameters are...
-                <dl>
-                    <dt class="new_code">$method</dt>
-                    <dd>The method name, as a string, to apply the condition to.</dd>
-                    <dt class="new_code">$args</dt>
-                    <dd>
-                        The arguments as a list. Wildcards can be included in the same
-                        manner as for <span class="new_code">setReturn()</span>.
-                        This argument is optional for <span class="new_code">expectOnce()</span>
-                        and <span class="new_code">expectAtLeastOnce()</span>.
-                    </dd>
-                    <dt class="new_code">$timing</dt>
-                    <dd>
-                        The only point in time to test the condition.
-                        The first call starts at zero and the count is for
-                        each method independently.
-                    </dd>
-                    <dt class="new_code">$count</dt>
-                    <dd>The number of calls expected.</dd>
-                </dl>
-            </p>
-            <p>
-                If you have just one call in your test, make sure you're using
-                <span class="new_code">expectOnce</span>.<br>
-                Using <span class="new_code">$mocked-&gt;expectAt(0, 'method', 'args);</span>
-                on its own will allow the method to never be called.
-                Checking the arguments and the overall call count
-                are currently independant.
-                Add an <span class="new_code">expectCallCount()</span> expectation when you
-                are using <span class="new_code">expectAt()</span> unless zero calls is allowed.
-            </p>
-            <p>
-                Like the assertions within test cases, all of the expectations
-                can take a message override as an extra parameter.
-                Also the original failure message can be embedded in the output
-                as "%s".
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            The original
-            <a href="http://www.mockobjects.com/">Mock objects</a> paper.
-        </li>
-<li>
-            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            SimpleTest home page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <span class="chosen">Mock objects</span>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/en/overview.html b/3rdparty/simpletest/docs/en/overview.html
deleted file mode 100644
index 85ea9407749..00000000000
--- a/3rdparty/simpletest/docs/en/overview.html
+++ /dev/null
@@ -1,487 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>
-        Overview and feature list for the SimpleTest PHP unit tester and web tester
-    </title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <span class="chosen">Overview</span>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Overview of SimpleTest</h1>
-        This page...
-        <ul>
-<li>
-            <a href="#summary">Quick summary</a>
-            of the SimpleTest tool for PHP.
-        </li>
-<li>
-            <a href="#features">List of features</a>,
-            both current ones and those planned.
-        </li>
-</ul>
-<div class="content">
-        <h2>
-<a class="target" name="summary"></a>What is SimpleTest?</h2>
-            <p>
-                The heart of SimpleTest is a testing framework built around
-                test case classes.
-                These are written as extensions of base test case classes,
-                each extended with methods that actually contain test code.
-                Each test method of a test case class is written to invoke
-                various assertions that the developer expects to be true such as
-                <span class="new_code">assertEqual()</span>.
-                If the expectation is correct, then a successful result is
-                dispatched to the observing test reporter, but any failure
-                or unexpected exception triggers an alert and a description
-                of the mismatch.
-                These test case declarations are transformed into executable
-                test scripts by including a SimpleTest aurorun.php file.
-            </p>
-            <p>
-                These documents apply to SimpleTest version 1.1, although we
-                try hard to maintain compatibility between versions.
-                If you get a test failure after an upgrade, check out the
-                file "HELP_MY_TESTS_DONT_WORK_ANYMORE" in the
-                simpletest directory to see if a feature you are using
-                has since been deprecated and later removed.
-            </p>
-            <p>
-                A <a href="unit_test_documentation.html">test case</a> looks like this...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-class <strong>CanAddUp</strong> extends UnitTestCase {<strong>
-    function testOneAndOneMakesTwo() {
-        $this-&gt;assertEqual(1 + 1, 2);
-    }</strong>
-}
-?&gt;
-</pre>
-                Tests are grouped into test cases, which are just
-                PHP classes that extend <span class="new_code">UnitTestCase</span>
-                or <span class="new_code">WebTestCase</span>.
-                The tests themselves are just normal methods that start
-                their name with the letters "test".
-                You can have as many test cases as you want in a test
-                script and each test case can have as many test methods
-                as it wants too.
-            </p>
-            <p>
-                This test script is immediately runnable.
-                You just invoke it on the command line like so...
-<pre class="shell">
-php adding_test.php
-</pre>
-            </p>
-            <p>
-                When run on the command line you should see something like...
-<pre class="shell">
-adding_test.php
-OK
-Test cases run: 1/1, Passes: 1, Failures: 0, Exceptions: 0
-</pre>
-            </p>
-            <p>
-                If you place it on a web server and point your
-                web browser at it...
-                <div class="demo">
-                    <h1>adding_test.php</h1>
-                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
-                    <strong>6</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
-                </div>
-            </p>
-            <p>
-                Of course this is a silly example.
-                A more realistic example might be...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-require_once('log.php');
-
-class <strong>TestOfLogging</strong> extends UnitTestCase {
-    function testWillCreateLogFileOnFirstMessage() {
-        $log = new Log('my.log');
-        $this-&gt;assertFalse(file_exists('my.log'));
-        $log-&gt;message('Hello');
-        $this-&gt;assertTrue(file_exists('my.log'));
-    }&lt;/strong&gt;
-}
-?&gt;
-</pre>
-            </p>
-            <p>
-                This tool is designed for the developer.
-                The target audience of this tool is anyone developing a small
-                to medium PHP application, including developers new to
-                unit and web regression testing.
-                The core principles are ease of use first, with extendibility and
-                essential features.
-            </p>
-            <p>
-                Tests are written in the PHP language itself more or less
-                as the application itself is built.
-                The advantage of using PHP as the testing language is that
-                there are no new languages to learn, testing can start straight away,
-                and the developer can test any part of the code.
-                Basically, all parts that can be accessed by the application code can also be
-                accessed by the test code when they are in the same programming language.
-            </p>
-            <p>
-                The simplest type of test case is the
-                <a href="unit_tester_documentation.html">UnitTestCase</a>.
-                This class of test case includes standard tests for equality,
-                references and pattern matching.
-                All these test the typical expectations of what you would
-                expect the result of a function or method to be.
-                This is by far the most common type of test in the daily
-                routine of development, making up about 95% of test cases.
-            </p>
-            <p>
-                The top level task of a web application though is not to
-                produce correct output from its methods and objects, but
-                to generate web pages.
-                The <a href="web_tester_documentation.html">WebTestCase</a> class tests web
-                pages.
-                It simulates a web browser requesting a page, complete with
-                cookies, proxies, secure connections, authentication, forms, frames and most
-                navigation elements.
-                With this type of test case, the developer can assert that
-                information is present in the page and that forms and
-                sessions are handled correctly.
-            </p>
-            <p>
-                A <a href="web_tester_documentation.html">WebTestCase</a> looks like this...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-require_once('simpletest/web_tester.php');
-
-class <strong>MySiteTest</strong> extends WebTestCase {
-    <strong>
-    function testHomePageHasContactDetailsLink() {
-        $this-&gt;get('http://www.my-site.com/index.php');
-        $this-&gt;assertTitle('My Home Page');
-        $this-&gt;clickLink('Contact');
-        $this-&gt;assertTitle('Contact me');
-        $this-&gt;assertText('/Email me at/');
-    }</strong>
-}
-?&gt;
-</pre>
-            </p>
-        
-        <h2>
-<a class="target" name="features"></a>Feature list</h2>
-            <p>
-                The following is a very rough outline of past and future features
-                and their expected point of release.
-                I am afraid it is liable to change without warning, as meeting the
-                milestones rather depends on time available.
-            </p>
-            <p>
-                Green stuff has been coded, but not necessarily released yet.
-                If you have a pressing need for a green but unreleased feature
-                then you should check-out the code from Sourceforge SVN directly.
-                <table>
-<thead>
-                    <tr>
-<th>Feature</th>
-<th>Description</th>
-<th>Release</th>
-</tr>
-                    </thead>
-<tbody>
-<tr>
-                        <td>Unit test case</td>
-                        <td>Core test case class and assertions</td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>Html display</td>
-                        <td>Simplest possible display</td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>Autoloading of test cases</td>
-                        <td>
-                            Reading a file with test cases and loading them into a
-                            group test automatically
-                        </td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>Mock objects</td>
-                        <td>
-                            Objects capable of simulating other objects removing
-                            test dependencies
-                        </td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>Web test case</td>
-                        <td>Allows link following and title tag matching</td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>Partial mocks</td>
-                        <td>
-                            Mocking parts of a class for testing less than a class
-                            or for complex simulations
-                        </td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>Web cookie handling</td>
-                        <td>Correct handling of cookies when fetching pages</td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>Following redirects</td>
-                        <td>Page fetching automatically follows 300 redirects</td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>Form parsing</td>
-                        <td>Ability to submit simple forms and read default form values</td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>Command line interface</td>
-                        <td>Test display without the need of a web browser</td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>Exposure of expectation classes</td>
-                        <td>Can create precise tests with mocks as well as test cases</td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>XML output and parsing</td>
-                        <td>
-                            Allows multi host testing and the integration of acceptance
-                            testing extensions
-                        </td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>Browser component</td>
-                        <td>
-                            Exposure of lower level web browser interface for more
-                            detailed test cases
-                        </td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>HTTP authentication</td>
-                        <td>
-                            Fetching protected web pages with basic authentication
-                            only
-                        </td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>SSL support</td>
-                        <td>Can connect to https: pages</td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>Proxy support</td>
-                        <td>Can connect via. common proxies</td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>Frames support</td>
-                        <td>Handling of frames in web test cases</td>
-                        <td style="color: green;">1.0</td>
-                    </tr>
-                    <tr>
-                        <td>File upload testing</td>
-                        <td>Can simulate the input type file tag</td>
-                        <td style="color: green;">1.0.1</td>
-                    </tr>
-                    <tr>
-                        <td>Mocking interfaces</td>
-                        <td>
-                            Can generate mock objects to interfaces as well as classes
-                            and class interfaces are carried for type hints
-                        </td>
-                        <td style="color: green;">1.0.1</td>
-                    </tr>
-                    <tr>
-                        <td>Testing exceptions</td>
-                        <td>Similar to testing PHP errors</td>
-                        <td style="color: green;">1.0.1</td>
-                    </tr>
-                    <tr>
-                        <td>HTML label support</td>
-                        <td>Can access all controls using the visual label</td>
-                        <td style="color: green;">1.0.1</td>
-                    </tr>
-                    <tr>
-                        <td>Base tag support</td>
-                        <td>Respects page base tag when clicking</td>
-                        <td style="color: green;">1.0.1</td>
-                    </tr>
-                    <tr>
-                        <td>PHP 5 E_STRICT compliant</td>
-                        <td>PHP 5 only version that works with the E_STRICT error level</td>
-                        <td style="color: green;">1.1</td>
-                    </tr>
-                    <tr>
-                        <td>Alternate HTML parsers</td>
-                        <td>Can detect compiled parsers for performance improvements</td>
-                        <td style="color: green;">1.1</td>
-                    </tr>
-                    <tr>
-                        <td>REST support</td>
-                        <td>Support for REST verbs as put(), delete(), etc.</td>
-                        <td style="color: green;">1.1</td>
-                    </tr>
-                    <tr>
-                        <td>BDD style fixtures</td>
-                        <td>Can import fixtures using a mixin like given() method</td>
-                        <td style="color: red;">1.5</td>
-                    </tr>
-                    <tr>
-                        <td>Plug-in architecture</td>
-                        <td>Automatic import of extensions including command line options</td>
-                        <td style="color: red;">1.5</td>
-                    </tr>
-                    <tr>
-                        <td>Reporting machinery enhancements</td>
-                        <td>Improved message passing for better cooperation with IDEs</td>
-                        <td style="color: red;">1.5</td>
-                    </tr>
-                    <tr>
-                        <td>Fluent mock interface</td>
-                        <td>More flexible and concise mock objects</td>
-                        <td style="color: red;">1.6</td>
-                    </tr>
-                    <tr>
-                        <td>Localisation</td>
-                        <td>Messages abstracted and code generated as well as UTF support</td>
-                        <td style="color: red;">1.6</td>
-                    </tr>
-                    <tr>
-                        <td>CSS selectors</td>
-                        <td>HTML content can be examined using CSS selectors</td>
-                        <td style="color: red;">1.7</td>
-                    </tr>
-                    <tr>
-                        <td>HTML table assertions</td>
-                        <td>Can match HTML or other table elements to expectations</td>
-                        <td style="color: red;">1.7</td>
-                    </tr>
-                    <tr>
-                        <td>Unified acceptance testing model</td>
-                        <td>Content searchable through selectors combined with expectations</td>
-                        <td style="color: red;">1.7</td>
-                    </tr>
-                    <tr>
-                        <td>DatabaseTestCase</td>
-                        <td>SQL selectors and DB drivers</td>
-                        <td style="color: red;">1.7</td>
-                    </tr>
-                    <tr>
-                        <td>IFrame support</td>
-                        <td>Reads IFrame content that can be refreshed</td>
-                        <td style="color: red;">1.8</td>
-                    </tr>
-                    <tr>
-                        <td>Integrated Selenium support</td>
-                        <td>Easy to use built in Selenium driver and tutorial or similar browser automation</td>
-                        <td style="color: red;">1.9</td>
-                    </tr>
-                    <tr>
-                        <td>Code coverage</td>
-                        <td>Reports using the bundled tool when using XDebug</td>
-                        <td style="color: red;">1.9</td>
-                    </tr>
-                    <tr>
-                        <td>Deprecation of old methods</td>
-                        <td>Simpler interface for SimpleTest2</td>
-                        <td style="color: red;">2.0</td>
-                    </tr>
-                    <tr>
-                        <td>Javascript suport</td>
-                        <td>Use of PECL module to add Javascript to the native browser</td>
-                        <td style="color: red;">3.0</td>
-                    </tr>
-                </tbody>
-</table>
-                PHP 5 migration is complete, which means that only PHP 5.0.3+
-                will be supported in SimpleTest version 1.1+.
-                Earlier versions of SimpleTest are compatible with PHP 4.2 up to
-                PHP 5 (non E_STRICT).
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            <a href="unit_test_documentation.html">Documentation for SimpleTest</a>.
-        </li>
-<li>
-            <a href="http://www.lastcraft.com/first_test_tutorial.php">How to write PHP test cases</a>
-            is a fairly advanced tutorial.
-        </li>
-<li>
-            <a href="http://simpletest.org/api/">SimpleTest API</a> from phpdoc.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <span class="chosen">Overview</span>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/en/partial_mocks_documentation.html b/3rdparty/simpletest/docs/en/partial_mocks_documentation.html
deleted file mode 100644
index cb70b1f86df..00000000000
--- a/3rdparty/simpletest/docs/en/partial_mocks_documentation.html
+++ /dev/null
@@ -1,457 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleTest for PHP partial mocks documentation</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <span class="chosen">Partial mocks</span>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Partial mock objects documentation</h1>
-        This page...
-        <ul>
-<li>
-            <a href="#inject">The mock injection problem</a>.
-        </li>
-<li>
-            Moving creation to a <a href="#creation">protected factory</a> method.
-        </li>
-<li>
-            <a href="#partial">Partial mocks</a> generate subclasses.
-        </li>
-<li>
-            Partial mocks <a href="#less">test less than a class</a>.
-        </li>
-</ul>
-<div class="content">
-        
-            <p>
-                A partial mock is simply a pattern to alleviate a specific problem
-                in testing with mock objects,
-                that of getting mock objects into tight corners.
-                It's quite a limited tool and possibly not even a good idea.
-                It is included with SimpleTest because I have found it useful
-                on more than one occasion and has saved a lot of work at that point.
-            </p>
-        
-        <h2>
-<a class="target" name="inject"></a>The mock injection problem</h2>
-            <p>
-                When one object uses another it is very simple to just pass a mock
-                version in already set up with its expectations.
-                Things are rather tricker if one object creates another and the
-                creator is the one you want to test.
-                This means that the created object should be mocked, but we can
-                hardly tell our class under test to create a mock instead.
-                The tested class doesn't even know it is running inside a test
-                after all.
-            </p>
-            <p>
-                For example, suppose we are building a telnet client and it
-                needs to create a network socket to pass its messages.
-                The connection method might look something like...
-<pre>
-<strong>&lt;?php
-require_once('socket.php');
-
-class Telnet {
-    ...
-    function connect($ip, $port, $username, $password) {
-        $socket = new Socket($ip, $port);
-        $socket-&gt;read( ... );
-        ...
-    }
-}
-?&gt;</strong>
-</pre>
-                We would really like to have a mock object version of the socket
-                here, what can we do?
-            </p>
-            <p>
-                The first solution is to pass the socket in as a parameter,
-                forcing the creation up a level.
-                Having the client handle this is actually a very good approach
-                if you can manage it and should lead to factoring the creation from
-                the doing.
-                In fact, this is one way in which testing with mock objects actually
-                forces you to code more tightly focused solutions.
-                They improve your programming.
-            </p>
-            <p>
-                Here this would be...
-<pre>
-&lt;?php
-require_once('socket.php');
-
-class Telnet {
-    ...
-    <strong>function connect($socket, $username, $password) {
-        $socket-&gt;read( ... );
-        ...
-    }</strong>
-}
-?&gt;
-</pre>
-                This means that the test code is typical for a test involving
-                mock objects.
-<pre>
-class TelnetTest extends UnitTestCase {
-    ...
-    function testConnection() {<strong>
-        $socket = new MockSocket();
-        ...
-        $telnet = new Telnet();
-        $telnet-&gt;connect($socket, 'Me', 'Secret');
-        ...</strong>
-    }
-}
-</pre>
-                It is pretty obvious though that one level is all you can go.
-                You would hardly want your top level application creating
-                every low level file, socket and database connection ever
-                needed.
-                It wouldn't know the constructor parameters anyway.
-            </p>
-            <p>
-                The next simplest compromise is to have the created object passed
-                in as an optional parameter...
-<pre>
-&lt;?php
-require_once('socket.php');
-
-class Telnet {
-    ...<strong>
-    function connect($ip, $port, $username, $password, $socket = false) {
-        if (! $socket) {
-            $socket = new Socket($ip, $port);
-        }
-        $socket-&gt;read( ... );</strong>
-        ...
-        return $socket;
-    }
-}
-?&gt;
-</pre>
-                For a quick solution this is usually good enough.
-                The test now looks almost the same as if the parameter
-                was formally passed...
-<pre>
-class TelnetTest extends UnitTestCase {
-    ...
-    function testConnection() {<strong>
-        $socket = new MockSocket();
-        ...
-        $telnet = new Telnet();
-        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret', $socket);
-        ...</strong>
-    }
-}
-</pre>
-                The problem with this approach is its untidiness.
-                There is test code in the main class and parameters passed
-                in the test case that are never used.
-                This is a quick and dirty approach, but nevertheless effective
-                in most situations.
-            </p>
-            <p>
-                The next method is to pass in a factory object to do the creation...
-<pre>
-&lt;?php
-require_once('socket.php');
-
-class Telnet {<strong>
-   function Telnet($network) {
-        $this-&gt;_network = $network;
-    }</strong>
-    ...
-    function connect($ip, $port, $username, $password) {<strong>
-        $socket = $this-&gt;_network-&gt;createSocket($ip, $port);
-        $socket-&gt;read( ... );</strong>
-        ...
-        return $socket;
-    }
-}
-?&gt;
-</pre>
-                This is probably the most highly factored answer as creation
-                is now moved into a small specialist class.
-                The networking factory can now be tested separately, but mocked
-                easily when we are testing the telnet class...
-<pre>
-class TelnetTest extends UnitTestCase {
-    ...
-    function testConnection() {<strong>
-        $socket = new MockSocket();
-        ...
-        $network = new MockNetwork();
-        $network-&gt;returnsByReference('createSocket', $socket);
-        $telnet = new Telnet($network);
-        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
-    }
-}
-</pre>
-                The downside is that we are adding a lot more classes to the
-                library.
-                Also we are passing a lot of factories around which will
-                make the code a little less intuitive.
-                The most flexible solution, but the most complex.
-            </p>
-            <p>
-                Well techniques like "Dependency Injection" tackle the problem of
-                instantiating a lot of constructor parameters.
-                Unfortunately knowledge of this pattern is not widespread, and if you
-                are trying to get older code to work, rearchitecting the whole
-                application is not really an option.
-            </p>
-            <p>
-                Is there a middle ground?
-            </p>
-        
-        <h2>
-<a class="target" name="creation"></a>Protected factory method</h2>
-            <p>
-                There is a way we can circumvent the problem without creating
-                any new application classes, but it involves creating a subclass
-                when we do the actual testing.
-                Firstly we move the socket creation into its own method...
-<pre>
-&lt;?php
-require_once('socket.php');
-
-class Telnet {
-    ...
-    function connect($ip, $port, $username, $password) {
-        <strong>$socket = $this-&gt;createSocket($ip, $port);</strong>
-        $socket-&gt;read( ... );
-        ...
-    }<strong>
-
-    protected function createSocket($ip, $port) {
-        return new Socket($ip, $port);
-    }</strong>
-}
-?&gt;
-</pre>
-                This is a pretty safe step even for very tangled legacy code.
-                This is the only change we make to the application.
-            </p>
-            <p>
-                For the test case we have to create a subclass so that
-                we can intercept the socket creation...
-<pre>
-<strong>class TelnetTestVersion extends Telnet {
-    var $mock;
-
-    function TelnetTestVersion($mock) {
-        $this-&gt;mock = $mock;
-        $this-&gt;Telnet();
-    }
-
-    protected function createSocket() {
-        return $this-&gt;mock;
-    }
-}</strong>
-</pre>
-                Here I have passed the mock in the constructor, but a
-                setter would have done just as well.
-                Note that the mock was set into the object variable
-                before the constructor was chained.
-                This is necessary in case the constructor calls
-                <span class="new_code">connect()</span>.
-                Otherwise it could get a null value from
-                <span class="new_code">createSocket()</span>.
-            </p>
-            <p>
-                After the completion of all of this extra work the
-                actual test case is fairly easy.
-                We just test our new class instead...
-<pre>
-class TelnetTest extends UnitTestCase {
-    ...
-    function testConnection() {<strong>
-        $socket = new MockSocket();
-        ...
-        $telnet = new TelnetTestVersion($socket);
-        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
-    }
-}
-</pre>
-                The new class is very simple of course.
-                It just sets up a return value, rather like a mock.
-                It would be nice if it also checked the incoming parameters
-                as well.
-                Just like a mock.
-                It seems we are likely to do this often, can
-                we automate the subclass creation?
-            </p>
-        
-        <h2>
-<a class="target" name="partial"></a>A partial mock</h2>
-            <p>
-                Of course the answer is "yes" or I would have stopped writing
-                this by now!
-                The previous test case was a lot of work, but we can
-                generate the subclass using a similar approach to the mock objects.
-            </p>
-            <p>
-                Here is the partial mock version of the test...
-<pre>
-<strong>Mock::generatePartial(
-        'Telnet',
-        'TelnetTestVersion',
-        array('createSocket'));</strong>
-
-class TelnetTest extends UnitTestCase {
-    ...
-    function testConnection() {<strong>
-        $socket = new MockSocket();
-        ...
-        $telnet = new TelnetTestVersion();
-        $telnet-&gt;setReturnReference('createSocket', $socket);
-        $telnet-&gt;Telnet();
-        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
-    }
-}
-</pre>
-                The partial mock is a subclass of the original with
-                selected methods "knocked out" with test
-                versions.
-                The <span class="new_code">generatePartial()</span> call
-                takes three parameters: the class to be subclassed,
-                the new test class name and a list of methods to mock.
-            </p>
-            <p>
-                Instantiating the resulting objects is slightly tricky.
-                The only constructor parameter of a partial mock is
-                the unit tester reference.
-                As with the normal mock objects this is needed for sending
-                test results in response to checked expectations.
-            </p>
-            <p>
-                The original constructor is not run yet.
-                This is necessary in case the constructor is going to
-                make use of the as yet unset mocked methods.
-                We set any return values at this point and then run the
-                constructor with its normal parameters.
-                This three step construction of "new", followed
-                by setting up the methods, followed by running the constructor
-                proper is what distinguishes the partial mock code.
-            </p>
-            <p>
-                Apart from construction, all of the mocked methods have
-                the same features as mock objects and all of the unmocked
-                methods behave as before.
-                We can set expectations very easily...
-<pre>
-class TelnetTest extends UnitTestCase {
-    ...
-    function testConnection() {
-        $socket = new MockSocket();
-        ...
-        $telnet = new TelnetTestVersion();
-        $telnet-&gt;setReturnReference('createSocket', $socket);
-        <strong>$telnet-&gt;expectOnce('createSocket', array('127.0.0.1', 21));</strong>
-        $telnet-&gt;Telnet();
-        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');
-    }
-}
-</pre>
-                Partial mocks are not used often.
-                I consider them transitory.
-                Useful while refactoring, but once the application has
-                all of it's dependencies nicely separated then the
-                partial mocks can wither away.
-            </p>
-        
-        <h2>
-<a class="target" name="less"></a>Testing less than a class</h2>
-            <p>
-                The mocked out methods don't have to be factory methods,
-                they could be any sort of method.
-                In this way partial mocks allow us to take control of any part of
-                a class except the constructor.
-                We could even go as far as to mock every method
-                except one we actually want to test.
-            </p>
-            <p>
-                This last situation is all rather hypothetical, as I've hardly
-                tried it.
-                I am a little worried that
-                forcing object granularity may be better for the code quality.
-                I personally use partial mocks as a way of overriding creation
-                or for occasional testing of the TemplateMethod pattern.
-            </p>
-            <p>
-                It's all going to come down to the coding standards of your
-                project to decide if you allow test mechanisms like this.
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            <a href="http://simpletest.org/api/">Full API for SimpleTest</a>
-            from the PHPDoc.
-        </li>
-<li>
-            The protected factory is described in
-            <a href="http://www-106.ibm.com/developerworks/java/library/j-mocktest.html">this paper from IBM</a>.
-            This is the only formal comment I have seen on this problem.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <span class="chosen">Partial mocks</span>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/en/reporter_documentation.html b/3rdparty/simpletest/docs/en/reporter_documentation.html
deleted file mode 100644
index 8924b7bb67a..00000000000
--- a/3rdparty/simpletest/docs/en/reporter_documentation.html
+++ /dev/null
@@ -1,616 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleTest for PHP test runner and display documentation</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <span class="chosen">Reporting</span>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Test reporter documentation</h1>
-        This page...
-        <ul>
-<li>
-            Displaying <a href="#html">results in HTML</a>
-        </li>
-<li>
-            Displaying and <a href="#other">reporting results</a>
-            in other formats
-        </li>
-<li>
-            Using <a href="#cli">SimpleTest from the command line</a>
-        </li>
-<li>
-            <a href="#xml">Using XML</a> for remote testing
-        </li>
-</ul>
-<div class="content">
-        
-            <p>
-                SimpleTest pretty much follows the MVC-ish pattern
-                (Model-View-Controller).
-                The reporter classes are the view and the model is your
-                test cases and their hiearchy.
-                The controller is mostly hidden from the user of
-                SimpleTest unless you want to change how the test cases
-                are actually run, in which case it is possible to
-                override the runner objects from within the test case.
-                As usual with MVC, the controller is mostly undefined
-                and there are other places to control the test run.
-            </p>
-        
-        <h2>
-<a class="target" name="html"></a>Reporting results in HTML</h2>
-            <p>
-                The default HTML display is minimal in the extreme.
-                It reports success and failure with the conventional red and
-                green bars and shows a breadcrumb trail of test groups
-                for every failed assertion.
-                Here's a fail...
-                <div class="demo">
-                    <h1>File test</h1>
-                    <span class="fail">Fail</span>: createnewfile-&gt;True assertion failed.<br>
-                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
-                    <strong>0</strong> passes, <strong>1</strong> fails and <strong>0</strong> exceptions.</div>
-                </div>
-                And here all tests passed...
-                <div class="demo">
-                    <h1>File test</h1>
-                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
-                    <strong>1</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
-                </div>
-                The good news is that there are several points in the display
-                hiearchy for subclassing.
-            </p>
-            <p>
-                For web page based displays there is the
-                <span class="new_code">HtmlReporter</span> class with the following
-                signature...
-<pre>
-class HtmlReporter extends SimpleReporter {
-    public __construct($encoding) { ... }
-    public makeDry(boolean $is_dry) { ... }
-    public void paintHeader(string $test_name) { ... }
-    public void sendNoCacheHeaders() { ... }
-    public void paintFooter(string $test_name) { ... }
-    public void paintGroupStart(string $test_name, integer $size) { ... }
-    public void paintGroupEnd(string $test_name) { ... }
-    public void paintCaseStart(string $test_name) { ... }
-    public void paintCaseEnd(string $test_name) { ... }
-    public void paintMethodStart(string $test_name) { ... }
-    public void paintMethodEnd(string $test_name) { ... }
-    public void paintFail(string $message) { ... }
-    public void paintPass(string $message) { ... }
-    public void paintError(string $message) { ... }
-    public void paintException(string $message) { ... }
-    public void paintMessage(string $message) { ... }
-    public void paintFormattedMessage(string $message) { ... }
-    protected string getCss() { ... }
-    public array getTestList() { ... }
-    public integer getPassCount() { ... }
-    public integer getFailCount() { ... }
-    public integer getExceptionCount() { ... }
-    public integer getTestCaseCount() { ... }
-    public integer getTestCaseProgress() { ... }
-}
-</pre>
-                Here is what some of these methods mean. First the display methods
-                that you will probably want to override...
-                <ul class="api">
-                    <li>
-                        <span class="new_code">HtmlReporter(string $encoding)</span><br>
-                        is the constructor.
-                        Note that the unit test sets up the link to the display
-                        rather than the other way around.
-                        The display is a mostly passive receiver of test events.
-                        This allows easy adaption of the display for other test
-                        systems beside unit tests, such as monitoring servers.
-                        The encoding is the character encoding you wish to
-                        display the test output in.
-                        In order to correctly render debug output when
-                        using the web tester, this should match the encoding
-                        of the site you are trying to test.
-                        The available character set strings are described in
-                        the PHP <a href="http://www.php.net/manual/en/function.htmlentities.php">html_entities()</a>
-                        function.
-                    </li>
-                    <li>
-                        <span class="new_code">void paintHeader(string $test_name)</span><br>
-                        is called once at the very start of the test when the first
-                        start event arrives.
-                        The first start event is usually delivered by the top level group
-                        test and so this is where <span class="new_code">$test_name</span>
-                        comes from.
-                        It paints the page title, CSS, body tag, etc.
-                        It returns nothing (<span class="new_code">void</span>).
-                    </li>
-                    <li>
-                        <span class="new_code">void paintFooter(string $test_name)</span><br>
-                        Called at the very end of the test to close any tags opened
-                        by the page header.
-                        By default it also displays the red/green bar and the final
-                        count of results.
-                        Actually the end of the test happens when a test end event
-                        comes in with the same name as the one that started it all
-                        at the same level.
-                        The tests nest you see.
-                        Closing the last test finishes the display.
-                    </li>
-                    <li>
-                        <span class="new_code">void paintMethodStart(string $test_name)</span><br>
-                        is called at the start of each test method.
-                        The name normally comes from method name.
-                        The other test start events behave the same way except
-                        that the group test one tells the reporter how large
-                        it is in number of held test cases.
-                        This is so that the reporter can display a progress bar
-                        as the runner churns through the test cases.
-                    </li>
-                    <li>
-                        <span class="new_code">void paintMethodEnd(string $test_name)</span><br>
-                        backs out of the test started with the same name.
-                    </li>
-                    <li>
-                        <span class="new_code">void paintFail(string $message)</span><br>
-                        paints a failure.
-                        By default it just displays the word fail, a breadcrumbs trail
-                        showing the current test nesting and the message issued by
-                        the assertion.
-                    </li>
-                    <li>
-                        <span class="new_code">void paintPass(string $message)</span><br>
-                        by default does nothing.
-                    </li>
-                    <li>
-                        <span class="new_code">string getCss()</span><br>
-                        Returns the CSS styles as a string for the page header
-                        method.
-                        Additional styles have to be appended here if you are
-                        not overriding the page header.
-                        You will want to use this method in an overriden page header
-                        if you want to include the original CSS.
-                    </li>
-                </ul>
-                There are also some accessors to get information on the current
-                state of the test suite.
-                Use these to enrich the display...
-                <ul class="api">
-                    <li>
-                        <span class="new_code">array getTestList()</span><br>
-                        is the first convenience method for subclasses.
-                        Lists the current nesting of the tests as a list
-                        of test names.
-                        The first, top level test case, is first in the
-                        list and the current test method will be last.
-                    </li>
-                    <li>
-                        <span class="new_code">integer getPassCount()</span><br>
-                        returns the number of passes chalked up so far.
-                        Needed for the display at the end.
-                    </li>
-                    <li>
-                        <span class="new_code">integer getFailCount()</span><br>
-                        is likewise the number of fails so far.
-                    </li>
-                    <li>
-                        <span class="new_code">integer getExceptionCount()</span><br>
-                        is likewise the number of errors so far.
-                    </li>
-                    <li>
-                        <span class="new_code">integer getTestCaseCount()</span><br>
-                        is the total number of test cases in the test run.
-                        This includes the grouping tests themselves.
-                    </li>
-                    <li>
-                        <span class="new_code">integer getTestCaseProgress()</span><br>
-                        is the number of test cases completed so far.
-                    </li>
-                </ul>
-                One simple modification is to get the HtmlReporter to display
-                the passes as well as the failures and errors...
-<pre>
-<strong>class ReporterShowingPasses extends HtmlReporter {
-    
-    function paintPass($message) {
-        parent::paintPass($message);
-        print "&lt;span class=\"pass\"&gt;Pass&lt;/span&gt;: ";
-        $breadcrumb = $this-&gt;getTestList();
-        array_shift($breadcrumb);
-        print implode("-&amp;gt;", $breadcrumb);
-        print "-&amp;gt;$message&lt;br /&gt;\n";
-    }
-    
-    protected function getCss() {
-        return parent::getCss() . ' .pass { color: green; }';
-    }
-}</strong>
-</pre>
-            </p>
-            <p>
-                One method that was glossed over was the <span class="new_code">makeDry()</span>
-                method.
-                If you run this method, with no parameters, on the reporter
-                before the test suite is run no actual test methods
-                will be called.
-                You will still get the events of entering and leaving the
-                test methods and test cases, but no passes or failures etc,
-                because the test code will not actually be executed.
-            </p>
-            <p>
-                The reason for this is to allow for more sophistcated
-                GUI displays that allow the selection of individual test
-                cases.
-                In order to build a list of possible tests they need a
-                report on the test structure for drawing, say a tree view
-                of the test suite.
-                With a reporter set to dry run that just sends drawing events
-                this is easily accomplished.
-            </p>
-        
-        <h2>
-<a class="target" name="other"></a>Extending the reporter</h2>
-            <p>
-                Rather than simply modifying the existing display, you might want to
-                produce a whole new HTML look, or even generate text or XML.
-                Rather than override every method in
-                <span class="new_code">HtmlReporter</span> we can take one
-                step up the class hiearchy to <span class="new_code">SimpleReporter</span>
-                in the <em>simple_test.php</em> source file.
-            </p>
-            <p>
-                A do nothing display, a blank canvas for your own creation, would
-                be...
-<pre>
-<strong>require_once('simpletest/simpletest.php');</strong>
-
-class MyDisplay extends SimpleReporter {<strong>
-    </strong>
-    function paintHeader($test_name) { }
-    
-    function paintFooter($test_name) { }
-    
-    function paintStart($test_name, $size) {<strong>
-        parent::paintStart($test_name, $size);</strong>
-    }
-    
-    function paintEnd($test_name, $size) {<strong>
-        parent::paintEnd($test_name, $size);</strong>
-    }
-    
-    function paintPass($message) {<strong>
-        parent::paintPass($message);</strong>
-    }
-    
-    function paintFail($message) {<strong>
-        parent::paintFail($message);</strong>
-    }
-    
-    function paintError($message) {<strong>
-        parent::paintError($message);</strong>
-    }
-    
-    function paintException($exception) {<strong>
-        parent::paintException($exception);</strong>
-    }
-}
-</pre>
-                No output would come from this class until you add it.
-            </p>
-            <p>
-                The catch with using this low level class is that you must
-                explicitely invoke it in the test script.
-                The "autorun" facility will not be able to use
-                its runtime context (whether it's running in a web browser
-                or the command line) to select the reporter.
-            </p>
-            <p>
-                You explicitely invoke the test runner like so...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-$test = new TestSuite('File test');
-$test-&gt;addFile('tests/file_test.php');
-$test-&gt;run(<strong>new MyReporter()</strong>);
-?&gt;
-</pre>
-                ...perhaps like this...
-<pre>
-&lt;?php
-require_once('simpletest/simpletest.php');
-require_once('my_reporter.php');
-
-class MyTest extends TestSuite {
-    function __construct() {
-        parent::__construct();
-        $this-&gt;addFile('tests/file_test.php');
-    }
-}
-
-$test = new MyTest();
-$test-&gt;run(<strong>new MyReporter()</strong>);
-?&gt;
-</pre>
-                We'll show how to fit in with "autorun" later.
-            </p>
-        
-        <h2>
-<a class="target" name="cli"></a>The command line reporter</h2>
-            <p>
-                SimpleTest also ships with a minimal command line reporter.
-                The interface mimics JUnit to some extent, but paints the
-                failure messages as they arrive.
-                To use the command line reporter explicitely, substitute it
-                for the HTML version...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-$test = new TestSuite('File test');
-$test-&gt;addFile('tests/file_test.php');
-$test-&gt;run(<strong>new TextReporter()</strong>);
-?&gt;
-</pre>
-                Then invoke the test suite from the command line...
-<pre class="shell">
-php file_test.php
-</pre>
-                You will need the command line version of PHP installed
-                of course.
-                A passing test suite looks like this...
-<pre class="shell">
-File test
-OK
-Test cases run: 1/1, Passes: 1, Failures: 0, Exceptions: 0
-</pre>
-                A failure triggers a display like this...
-<pre class="shell">
-File test
-1) True assertion failed.
-    in createNewFile
-FAILURES!!!
-Test cases run: 1/1, Passes: 0, Failures: 1, Exceptions: 0
-</pre>
-            </p>
-            <p>
-                One of the main reasons for using a command line driven
-                test suite is of using the tester as part of some automated
-                process.
-                To function properly in shell scripts the test script should
-                return a non-zero exit code on failure.
-                If a test suite fails the value <span class="new_code">false</span>
-                is returned from the <span class="new_code">SimpleTest::run()</span>
-                method.
-                We can use that result to exit the script with the desired return
-                code...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-$test = new TestSuite('File test');
-$test-&gt;addFile('tests/file_test.php');
-<strong>exit ($test-&gt;run(new TextReporter()) ? 0 : 1);</strong>
-?&gt;
-</pre>
-                Of course we wouldn't really want to create two test scripts,
-                a command line one and a web browser one, for each test suite.
-                The command line reporter includes a method to sniff out the
-                run time environment...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-$test = new TestSuite('File test');
-$test-&gt;addFile('tests/file_test.php');
-<strong>if (TextReporter::inCli()) {</strong>
-    exit ($test-&gt;run(new TextReporter()) ? 0 : 1);
-<strong>}</strong>
-$test-&gt;run(new HtmlReporter());
-?&gt;
-</pre>
-                This is the form used within SimpleTest itself.
-                When you use the "autorun.php", and no
-                test has been run by the end, this is pretty much
-                the code that SimpleTest will run for you implicitely.
-            </p>
-            <p>
-                In other words, this is gives the same result...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-class MyTest extends TestSuite {
-    function __construct() {
-        parent::__construct();
-        $this-&gt;addFile('tests/file_test.php');
-    }
-}
-?&gt;
-</pre>
-            </p>
-        
-        <h2>
-<a class="target" name="xml"></a>Remote testing</h2>
-            <p>
-                SimpleTest ships with an <span class="new_code">XmlReporter</span> class
-                used for internal communication.
-                When run the output looks like...
-<pre class="shell">
-&lt;?xml version="1.0"?&gt;
-&lt;run&gt;
-  &lt;group size="4"&gt;
-    &lt;name&gt;Remote tests&lt;/name&gt;
-    &lt;group size="4"&gt;
-      &lt;name&gt;Visual test with 48 passes, 48 fails and 4 exceptions&lt;/name&gt;
-      &lt;case&gt;
-        &lt;name&gt;testofunittestcaseoutput&lt;/name&gt;
-        &lt;test&gt;
-          &lt;name&gt;testofresults&lt;/name&gt;
-          &lt;pass&gt;This assertion passed&lt;/pass&gt;
-          &lt;fail&gt;This assertion failed&lt;/fail&gt;
-        &lt;/test&gt;
-        &lt;test&gt;
-          ...
-        &lt;/test&gt;
-      &lt;/case&gt;
-    &lt;/group&gt;
-  &lt;/group&gt;
-&lt;/run&gt;
-</pre>
-                To get your normal test cases to produce this format, on the
-                command line add the <span class="new_code">--xml</span> flag.
-<pre class="shell">
-php my_test.php --xml
-</pre>
-                You can do teh same thing in the web browser by adding the
-                URL parameter <span class="new_code">xml=1</span>.
-                Any true value will do.
-            </p>
-            <p>
-                You can consume this format with the parser
-                supplied as part of SimpleTest itself.
-                This is called <span class="new_code">SimpleTestXmlParser</span> and
-                resides in <em>xml.php</em> within the SimpleTest package...
-<pre>
-&lt;?php
-require_once('simpletest/xml.php');
-    
-...
-$parser = new SimpleTestXmlParser(new HtmlReporter());
-$parser-&gt;parse($test_output);
-?&gt;
-</pre>
-                The <span class="new_code">$test_output</span> should be the XML format
-                from the XML reporter, and could come from say a command
-                line run of a test case.
-                The parser sends events to the reporter just like any
-                other test run.
-                There are some odd occasions where this is actually useful.
-            </p>
-            <p>
-                Most likely it's when you want to isolate a problematic crash
-                prone test.
-                You can collect the XML output using the backtick operator
-                from another test.
-                In that way it runs in its own process...
-<pre>
-&lt;?php
-require_once('simpletest/xml.php');
-
-if (TextReporter::inCli()) {
-    $parser = new SimpleTestXmlParser(new TextReporter());
-} else {
-    $parser = new SimpleTestXmlParser(new HtmlReporter());
-}
-$parser-&gt;parse(`php flakey_test.php --xml`);
-?&gt;
-</pre>
-            </p>
-            <p>
-                Another use is breaking up large test suites.
-            </p>
-            <p>
-                A problem with large test suites is thet they can exhaust
-                the default 16Mb memory limit on a PHP process.
-                By having the test groups output in XML and run in
-                separate processes, the output can be reparsed to
-                aggregate the results into a much smaller footprint top level
-                test.
-            </p>
-            <p>
-                Because the XML output can come from anywhere, this opens
-                up the possibility of aggregating test runs from remote
-                servers.
-                A test case already exists to do this within the SimpleTest
-                framework, but it is currently experimental...
-<pre>
-&lt;?php
-<strong>require_once('../remote.php');</strong>
-require_once('simpletest/autorun.php');
-    
-$test_url = ...;
-$dry_url = ...;
-
-class MyTestOnAnotherServer extends RemoteTestCase {
-    function __construct() {
-        $test_url = ...
-        parent::__construct($test_url, $test_url . ' --dry');
-    }
-}
-?&gt;
-</pre>
-                The <span class="new_code">RemoteTestCase</span> takes the actual location
-                of the test runner, basically a web page in XML format.
-                It also takes the URL of a reporter set to do a dry run.
-                This is so that progress can be reported upward correctly.
-                The <span class="new_code">RemoteTestCase</span> can be added to test suites
-                just like any other test suite.
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-<li>
-            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
-            gives full detail on the classes and assertions available.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <span class="chosen">Reporting</span>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/en/unit_test_documentation.html b/3rdparty/simpletest/docs/en/unit_test_documentation.html
deleted file mode 100644
index a399bf34cb1..00000000000
--- a/3rdparty/simpletest/docs/en/unit_test_documentation.html
+++ /dev/null
@@ -1,442 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleTest for PHP regression test documentation</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <span class="chosen">Unit tester</span>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>PHP Unit Test documentation</h1>
-        This page...
-        <ul>
-<li>
-            <a href="#unit">Unit test cases</a> and basic assertions.
-        </li>
-<li>
-            <a href="#extending_unit">Extending test cases</a> to
-            customise them for your own project.
-        </li>
-<li>
-            <a href="#running_unit">Running a single case</a> as
-            a single script.
-        </li>
-</ul>
-<div class="content">
-        <h2>
-<a class="target" name="unit"></a>Unit test cases</h2>
-            <p>
-                The core system is a regression testing framework built around
-                test cases.
-                A sample test case looks like this...
-<pre>
-<strong>class FileTestCase extends UnitTestCase {
-}</strong>
-</pre>
-                Actual tests are added as methods in the test case whose names
-                by default start with the string "test" and
-                when the test case is invoked all such methods are run in
-                the order that PHP introspection finds them.
-                As many test methods can be added as needed.
-            </p>
-            <p>
-                For example...
-<pre>
-require_once('simpletest/autorun.php');
-require_once('../classes/writer.php');
-
-class FileTestCase extends UnitTestCase {
-    function FileTestCase() {
-        $this-&gt;UnitTestCase('File test');
-    }<strong>
-
-    function setUp() {
-        @unlink('../temp/test.txt');
-    }
-
-    function tearDown() {
-        @unlink('../temp/test.txt');
-    }
-
-    function testCreation() {
-        $writer = &amp;new FileWriter('../temp/test.txt');
-        $writer-&gt;write('Hello');
-        $this-&gt;assertTrue(file_exists('../temp/test.txt'), 'File created');
-    }</strong>
-}
-</pre>
-                The constructor is optional and usually omitted.
-                Without a name, the class name is taken as the name of the test case.
-            </p>
-            <p>
-                Our only test method at the moment is <span class="new_code">testCreation()</span>
-                where we check that a file has been created by our
-                <span class="new_code">Writer</span> object.
-                We could have put the <span class="new_code">unlink()</span>
-                code into this method as well, but by placing it in
-                <span class="new_code">setUp()</span> and
-                <span class="new_code">tearDown()</span> we can use it with
-                other test methods that we add.
-            </p>
-            <p>
-                The <span class="new_code">setUp()</span> method is run
-                just before each and every test method.
-                <span class="new_code">tearDown()</span> is run just after
-                each and every test method.
-            </p>
-            <p>
-                You can place some test case set up into the constructor to
-                be run once for all the methods in the test case, but
-                you risk test interference that way.
-                This way is slightly slower, but it is safer.
-                Note that if you come from a JUnit background this will not
-                be the behaviour you are used to.
-                JUnit surprisingly reinstantiates the test case for each test
-                method to prevent such interference.
-                SimpleTest requires the end user to use <span class="new_code">setUp()</span>, but
-                supplies additional hooks for library writers.
-            </p>
-            <p>
-                The means of reporting test results (see below) are by a
-                visiting display class
-                that is notified by various <span class="new_code">assert...()</span>
-                methods.
-                Here is the full list for the <span class="new_code">UnitTestCase</span>
-                class, the default for SimpleTest...
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">assertTrue($x)</span></td>
-<td>Fail if $x is false</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertFalse($x)</span></td>
-<td>Fail if $x is true</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNull($x)</span></td>
-<td>Fail if $x is set</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNotNull($x)</span></td>
-<td>Fail if $x not set</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertIsA($x, $t)</span></td>
-<td>Fail if $x is not the class or type $t</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNotA($x, $t)</span></td>
-<td>Fail if $x is of the class or type $t</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertEqual($x, $y)</span></td>
-<td>Fail if $x == $y is false</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNotEqual($x, $y)</span></td>
-<td>Fail if $x == $y is true</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertWithinMargin($x, $y, $m)</span></td>
-<td>Fail if abs($x - $y) &lt; $m is false</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertOutsideMargin($x, $y, $m)</span></td>
-<td>Fail if abs($x - $y) &lt; $m is true</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertIdentical($x, $y)</span></td>
-<td>Fail if $x == $y is false or a type mismatch</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNotIdentical($x, $y)</span></td>
-<td>Fail if $x == $y is true and types match</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertReference($x, $y)</span></td>
-<td>Fail unless $x and $y are the same variable</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertClone($x, $y)</span></td>
-<td>Fail unless $x and $y are identical copies</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertPattern($p, $x)</span></td>
-<td>Fail unless the regex $p matches $x</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNoPattern($p, $x)</span></td>
-<td>Fail if the regex $p matches $x</td>
-</tr>
-                    <tr>
-<td><span class="new_code">expectError($x)</span></td>
-<td>Fail if matching error does not occour</td>
-</tr>
-                    <tr>
-<td><span class="new_code">expectException($x)</span></td>
-<td>Fail if matching exception is not thrown</td>
-</tr>
-                    <tr>
-<td><span class="new_code">ignoreException($x)</span></td>
-<td>Swallows any upcoming matching exception</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assert($e)</span></td>
-<td>Fail on failed <a href="expectation_documentation.html">expectation</a> object $e</td>
-</tr>
-                </tbody></table>
-                All assertion methods can take an optional description as a
-                last parameter.
-                This is to label the displayed result with.
-                If omitted a default message is sent instead, which is usually
-                sufficient.
-                This default message can still be embedded in your own message
-                if you include "%s" within the string.
-                All the assertions return true on a pass or false on failure.
-            </p>
-            <p>
-                Some examples...
-<pre>
-$variable = null;
-<strong>$this-&gt;assertNull($variable, 'Should be cleared');</strong>
-</pre>
-                ...will pass and normally show no message.
-                If you have
-                <a href="http://www.lastcraft.com/display_subclass_tutorial.php">set up the tester to display passes</a>
-                as well then the message will be displayed as is.
-<pre>
-<strong>$this-&gt;assertIdentical(0, false, 'Zero is not false [%s]');</strong>
-</pre>
-                This will fail as it performs a type
-                check, as well as a comparison, between the two values.
-                The "%s" part is replaced by the default
-                error message that would have been shown if we had not
-                supplied our own.
-<pre>
-$a = 1;
-$b = $a;
-<strong>$this-&gt;assertReference($a, $b);</strong>
-</pre>
-                Will fail as the variable <span class="new_code">$a</span> is a copy of <span class="new_code">$b</span>.
-<pre>
-<strong>$this-&gt;assertPattern('/hello/i', 'Hello world');</strong>
-</pre>
-                This will pass as using a case insensitive match the string
-                <span class="new_code">hello</span> is contained in <span class="new_code">Hello world</span>.
-<pre>
-<strong>$this-&gt;expectError();</strong>
-trigger_error('Catastrophe');
-</pre>
-                Here the check catches the "Catastrophe"
-                message without checking the text and passes.
-                This removes the error from the queue.
-<pre>
-<strong>$this-&gt;expectError('Catastrophe');</strong>
-trigger_error('Catastrophe');
-</pre>
-                The next error check tests not only the existence of the error,
-                but also the text which, here matches so another pass.
-                If any unchecked errors are left at the end of a test method then
-                an exception will be reported in the test.
-            </p>
-            <p>
-                Note that SimpleTest cannot catch compile time PHP errors.
-            </p>
-            <p>
-                The test cases also have some convenience methods for debugging
-                code or extending the suite...
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">setUp()</span></td>
-<td>Runs this before each test method</td>
-</tr>
-                    <tr>
-<td><span class="new_code">tearDown()</span></td>
-<td>Runs this after each test method</td>
-</tr>
-                    <tr>
-<td><span class="new_code">pass()</span></td>
-<td>Sends a test pass</td>
-</tr>
-                    <tr>
-<td><span class="new_code">fail()</span></td>
-<td>Sends a test failure</td>
-</tr>
-                    <tr>
-<td><span class="new_code">error()</span></td>
-<td>Sends an exception event</td>
-</tr>
-                    <tr>
-<td><span class="new_code">signal($type, $payload)</span></td>
-<td>Sends a user defined message to the test reporter</td>
-</tr>
-                    <tr>
-<td><span class="new_code">dump($var)</span></td>
-<td>Does a formatted <span class="new_code">print_r()</span> for quick and dirty debugging</td>
-</tr>
-                </tbody></table>
-            </p>
-        
-        <h2>
-<a class="target" name="extending_unit"></a>Extending test cases</h2>
-            <p>
-                Of course additional test methods can be added to create
-                specific types of test case, so as to extend framework...
-<pre>
-require_once('simpletest/autorun.php');
-<strong>
-class FileTester extends UnitTestCase {
-    function FileTester($name = false) {
-        $this-&gt;UnitTestCase($name);
-    }
-
-    function assertFileExists($filename, $message = '%s') {
-        $this-&gt;assertTrue(
-                file_exists($filename),
-                sprintf($message, 'File [$filename] existence check'));
-    }</strong>
-}
-</pre>
-                Here the SimpleTest library is held in a folder called
-                <em>simpletest</em> that is local.
-                Substitute your own path for this.
-            </p>
-            <p>
-                To prevent this test case being run accidently, it is
-                advisable to mark it as <span class="new_code">abstract</span>.
-            </p>
-            <p>
-                Alternatively you could add a
-                <span class="new_code">SimpleTestOptions::ignore('FileTester');</span>
-                directive in your code.
-            </p>
-            <p>
-                This new case can be now be inherited just like
-                a normal test case...
-<pre>
-class FileTestCase extends <strong>FileTester</strong> {
-
-    function setUp() {
-        @unlink('../temp/test.txt');
-    }
-
-    function tearDown() {
-        @unlink('../temp/test.txt');
-    }
-
-    function testCreation() {
-        $writer = &amp;new FileWriter('../temp/test.txt');
-        $writer-&gt;write('Hello');<strong>
-        $this-&gt;assertFileExists('../temp/test.txt');</strong>
-    }
-}
-</pre>
-            </p>
-            <p>
-                If you want a test case that does not have all of the
-                <span class="new_code">UnitTestCase</span> assertions,
-                only your own and a few basics,
-                you need to extend the <span class="new_code">SimpleTestCase</span>
-                class instead.
-                It is found in <em>simple_test.php</em> rather than
-                <em>unit_tester.php</em>.
-                See <a href="group_test_documentation.html">later</a> if you
-                want to incorporate other unit tester's
-                test cases in your test suites.
-            </p>
-        
-        <h2>
-<a class="target" name="running_unit"></a>Running a single test case</h2>
-            <p>
-                You won't often run single test cases except when bashing
-                away at a module that is having difficulty, and you don't
-                want to upset the main test suite.
-                With <em>autorun</em> no particular scaffolding is needed,
-                just launch your particular test file and you're ready to go.
-            </p>
-            <p>
-                You can even decide which reporter (for example,
-                <span class="new_code">TextReporter</span> or <span class="new_code">HtmlReporter</span>)
-                you prefer for a specific file when launched on its own...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');<strong>
-SimpleTest :: prefer(new TextReporter());</strong>
-require_once('../classes/writer.php');
-
-class FileTestCase extends UnitTestCase {
-    ...
-}
-?&gt;
-</pre>
-                This script will run as is, but of course will output zero passes
-                and zero failures until test methods are added.
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-<li>
-            <a href="http://simpletest.org/api/">Full API for SimpleTest</a>
-            from the PHPDoc.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <span class="chosen">Unit tester</span>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/en/web_tester_documentation.html b/3rdparty/simpletest/docs/en/web_tester_documentation.html
deleted file mode 100644
index aa9df50a679..00000000000
--- a/3rdparty/simpletest/docs/en/web_tester_documentation.html
+++ /dev/null
@@ -1,588 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleTest for PHP web script testing documentation</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <span class="chosen">Web tester</span>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Web tester documentation</h1>
-        This page...
-        <ul>
-<li>
-            Successfully <a href="#fetch">fetching a web page</a>
-        </li>
-<li>
-            Testing the <a href="#content">page content</a>
-        </li>
-<li>
-            <a href="#navigation">Navigating a web site</a>
-            while testing
-        </li>
-<li>
-            <a href="#request">Raw request modifications</a> and debugging methods
-        </li>
-</ul>
-<div class="content">
-        <h2>
-<a class="target" name="fetch"></a>Fetching a page</h2>
-            <p>
-                Testing classes is all very well, but PHP is predominately
-                a language for creating functionality within web pages.
-                How do we test the front end presentation role of our PHP
-                applications?
-                Well the web pages are just text, so we should be able to
-                examine them just like any other test data.
-            </p>
-            <p>
-                This leads to a tricky issue.
-                If we test at too low a level, testing for matching tags
-                in the page with pattern matching for example, our tests will
-                be brittle.
-                The slightest change in layout could break a large number of
-                tests.
-                If we test at too high a level, say using mock versions of a
-                template engine, then we lose the ability to automate some classes
-                of test.
-                For example, the interaction of forms and navigation will
-                have to be tested manually.
-                These types of test are extremely repetitive and error prone.
-            </p>
-            <p>
-                SimpleTest includes a special form of test case for the testing
-                of web page actions.
-                The <span class="new_code">WebTestCase</span> includes facilities
-                for navigation, content and cookie checks and form handling.
-                Usage of these test cases is similar to the
-                <a href="unit_tester_documentation.html">UnitTestCase</a>...
-<pre>
-<strong>class TestOfLastcraft extends WebTestCase {
-}</strong>
-</pre>
-                Here we are about to test the
-                <a href="http://www.lastcraft.com/">Last Craft</a> site itself.
-                If this test case is in a file called <em>lastcraft_test.php</em>
-                then it can be loaded in a runner script just like unit tests...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');<strong>
-require_once('simpletest/web_tester.php');</strong>
-SimpleTest::prefer(new TextReporter());
-
-class WebTests extends TestSuite {
-    function WebTests() {
-        $this-&gt;TestSuite('Web site tests');<strong>
-        $this-&gt;addFile('lastcraft_test.php');</strong>
-    }
-}
-?&gt;
-</pre>
-                I am using the text reporter here to more clearly
-                distinguish the web content from the test output.
-            </p>
-            <p>
-                Nothing is being tested yet.
-                We can fetch the home page by using the
-                <span class="new_code">get()</span> method...
-<pre>
-class TestOfLastcraft extends WebTestCase {
-    <strong>
-    function testHomepage() {
-        $this-&gt;assertTrue($this-&gt;get('http://www.lastcraft.com/'));
-    }</strong>
-}
-</pre>
-                The <span class="new_code">get()</span> method will
-                return true only if page content was successfully
-                loaded.
-                It is a simple, but crude way to check that a web page
-                was actually delivered by the web server.
-                However that content may be a 404 response and yet
-                our <span class="new_code">get()</span> method will still return true.
-            </p>
-            <p>
-                Assuming that the web server for the Last Craft site is up
-                (sadly not always the case), we should see...
-<pre class="shell">
-Web site tests
-OK
-Test cases run: 1/1, Failures: 0, Exceptions: 0
-</pre>
-                All we have really checked is that any kind of page was
-                returned.
-                We don't yet know if it was the right one.
-            </p>
-        
-        <h2>
-<a class="target" name="content"></a>Testing page content</h2>
-            <p>
-                To confirm that the page we think we are on is actually the
-                page we are on, we need to verify the page content.
-<pre>
-class TestOfLastcraft extends WebTestCase {
-    
-    function testHomepage() {<strong>
-        $this-&gt;get('http://www.lastcraft.com/');
-        $this-&gt;assertText('Why the last craft');</strong>
-    }
-}
-</pre>
-                The page from the last fetch is held in a buffer in
-                the test case, so there is no need to refer to it directly.
-                The pattern match is always made against the buffer.
-            </p>
-            <p>
-                Here is the list of possible content assertions...
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">assertTitle($title)</span></td>
-<td>Pass if title is an exact match</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertText($text)</span></td>
-<td>Pass if matches visible and "alt" text</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNoText($text)</span></td>
-<td>Pass if doesn't match visible and "alt" text</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertPattern($pattern)</span></td>
-<td>A Perl pattern match against the page content</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNoPattern($pattern)</span></td>
-<td>A Perl pattern match to not find content</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertLink($label)</span></td>
-<td>Pass if a link with this text is present</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNoLink($label)</span></td>
-<td>Pass if no link with this text is present</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertLinkById($id)</span></td>
-<td>Pass if a link with this id attribute is present</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNoLinkById($id)</span></td>
-<td>Pass if no link with this id attribute is present</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertField($name, $value)</span></td>
-<td>Pass if an input tag with this name has this value</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertFieldById($id, $value)</span></td>
-<td>Pass if an input tag with this id has this value</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertResponse($codes)</span></td>
-<td>Pass if HTTP response matches this list</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertMime($types)</span></td>
-<td>Pass if MIME type is in this list</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertAuthentication($protocol)</span></td>
-<td>Pass if the current challenge is this protocol</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNoAuthentication()</span></td>
-<td>Pass if there is no current challenge</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertRealm($name)</span></td>
-<td>Pass if the current challenge realm matches</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertHeader($header, $content)</span></td>
-<td>Pass if a header was fetched matching this value</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNoHeader($header)</span></td>
-<td>Pass if a header was not fetched</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertCookie($name, $value)</span></td>
-<td>Pass if there is currently a matching cookie</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNoCookie($name)</span></td>
-<td>Pass if there is currently no cookie of this name</td>
-</tr>
-                </tbody></table>
-                As usual with the SimpleTest assertions, they all return
-                false on failure and true on pass.
-                They also allow an optional test message and you can embed
-                the original test message inside using "%s" inside
-                your custom message.
-            </p>
-            <p>
-                So now we could instead test against the title tag with...
-<pre>
-<strong>$this-&gt;assertTitle('The Last Craft? Web developer tutorials on PHP, Extreme programming and Object Oriented development');</strong>
-</pre>
-                ...or, if that is too long and fragile...
-<pre>
-<strong>$this-&gt;assertTitle(new PatternExpectation('/The Last Craft/'));</strong>
-</pre>
-                As well as the simple HTML content checks we can check
-                that the MIME type is in a list of allowed types with...
-<pre>
-<strong>$this-&gt;assertMime(array('text/plain', 'text/html'));</strong>
-</pre>
-                More interesting is checking the HTTP response code.
-                Like the MIME type, we can assert that the response code
-                is in a list of allowed values...
-<pre>
-class TestOfLastcraft extends WebTestCase {
-    
-    function testRedirects() {
-        $this-&gt;get('http://www.lastcraft.com/test/redirect.php');
-        $this-&gt;assertResponse(200);&lt;/strong&gt;
-    }
-}
-</pre>
-                Here we are checking that the fetch is successful by
-                allowing only a 200 HTTP response.
-                This test will pass, but it is not actually correct to do so.
-                There is no page, instead the server issues a redirect.
-                The <span class="new_code">WebTestCase</span> will
-                automatically follow up to three such redirects.
-                The tests are more robust this way and we are usually
-                interested in the interaction with the pages rather
-                than their delivery.
-                If the redirects are of interest then this ability must
-                be disabled...
-<pre>
-class TestOfLastcraft extends WebTestCase {
-    
-    function testHomepage() {<strong>
-        $this-&gt;setMaximumRedirects(0);</strong>
-        $this-&gt;get('http://www.lastcraft.com/test/redirect.php');
-        $this-&gt;assertResponse(200);
-    }
-}
-</pre>
-                The assertion now fails as expected...
-<pre class="shell">
-Web site tests
-1) Expecting response in [200] got [302]
-    in testhomepage
-    in testoflastcraft
-    in lastcraft_test.php
-FAILURES!!!
-Test cases run: 1/1, Failures: 1, Exceptions: 0
-</pre>
-                We can modify the test to correctly assert redirects with...
-<pre>
-class TestOfLastcraft extends WebTestCase {
-    
-    function testHomepage() {
-        $this-&gt;setMaximumRedirects(0);
-        $this-&gt;get('http://www.lastcraft.com/test/redirect.php');
-        $this-&gt;assertResponse(<strong>array(301, 302, 303, 307)</strong>);
-    }
-}
-</pre>
-                This now passes.
-            </p>
-        
-        <h2>
-<a class="target" name="navigation"></a>Navigating a web site</h2>
-            <p>
-                Users don't often navigate sites by typing in URLs, but by
-                clicking links and buttons.
-                Here we confirm that the contact details can be reached
-                from the home page...
-<pre>
-class TestOfLastcraft extends WebTestCase {
-    ...
-    function testContact() {
-        $this-&gt;get('http://www.lastcraft.com/');<strong>
-        $this-&gt;clickLink('About');
-        $this-&gt;assertTitle(new PatternExpectation('/About Last Craft/'));</strong>
-    }
-}
-</pre>
-                The parameter is the text of the link.
-            </p>
-            <p>
-                If the target is a button rather than an anchor tag, then
-                <span class="new_code">clickSubmit()</span> can be used
-                with the button title...
-<pre>
-<strong>$this-&gt;clickSubmit('Go!');</strong>
-</pre>
-                If you are not sure or don't care, the usual case, then just
-                use the <span class="new_code">click()</span> method...
-<pre>
-<strong>$this-&gt;click('Go!');</strong>
-</pre>
-            </p>
-            <p>
-                The list of navigation methods is...
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">getUrl()</span></td>
-<td>The current location</td>
-</tr>
-                    <tr>
-<td><span class="new_code">get($url, $parameters)</span></td>
-<td>Send a GET request with these parameters</td>
-</tr>
-                    <tr>
-<td><span class="new_code">post($url, $parameters)</span></td>
-<td>Send a POST request with these parameters</td>
-</tr>
-                    <tr>
-<td><span class="new_code">head($url, $parameters)</span></td>
-<td>Send a HEAD request without replacing the page content</td>
-</tr>
-                    <tr>
-<td><span class="new_code">retry()</span></td>
-<td>Reload the last request</td>
-</tr>
-                    <tr>
-<td><span class="new_code">back()</span></td>
-<td>Like the browser back button</td>
-</tr>
-                    <tr>
-<td><span class="new_code">forward()</span></td>
-<td>Like the browser forward button</td>
-</tr>
-                    <tr>
-<td><span class="new_code">authenticate($name, $password)</span></td>
-<td>Retry after a challenge</td>
-</tr>
-                    <tr>
-<td><span class="new_code">restart()</span></td>
-<td>Restarts the browser as if a new session</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getCookie($name)</span></td>
-<td>Gets the cookie value for the current context</td>
-</tr>
-                    <tr>
-<td><span class="new_code">ageCookies($interval)</span></td>
-<td>Ages current cookies prior to a restart</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clearFrameFocus()</span></td>
-<td>Go back to treating all frames as one page</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickSubmit($label)</span></td>
-<td>Click the first button with this label</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickSubmitByName($name)</span></td>
-<td>Click the button with this name attribute</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickSubmitById($id)</span></td>
-<td>Click the button with this ID attribute</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickImage($label, $x, $y)</span></td>
-<td>Click an input tag of type image by title or alt text</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickImageByName($name, $x, $y)</span></td>
-<td>Click an input tag of type image by name</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickImageById($id, $x, $y)</span></td>
-<td>Click an input tag of type image by ID attribute</td>
-</tr>
-                    <tr>
-<td><span class="new_code">submitFormById($id)</span></td>
-<td>Submit a form without the submit value</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickLink($label, $index)</span></td>
-<td>Click an anchor by the visible label text</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickLinkById($id)</span></td>
-<td>Click an anchor by the ID attribute</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getFrameFocus()</span></td>
-<td>The name of the currently selected frame</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setFrameFocusByIndex($choice)</span></td>
-<td>Focus on a frame counting from 1</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setFrameFocus($name)</span></td>
-<td>Focus on a frame by name</td>
-</tr>
-                </tbody></table>
-            </p>
-            <p>
-                The parameters in the <span class="new_code">get()</span>, <span class="new_code">post()</span> or
-                <span class="new_code">head()</span> methods are optional.
-                The HTTP HEAD fetch does not change the browser context, only loads
-                cookies.
-                This can be useful for when an image or stylesheet sets a cookie
-                for crafty robot blocking.
-            </p>
-            <p>
-                The <span class="new_code">retry()</span>, <span class="new_code">back()</span> and
-                <span class="new_code">forward()</span> commands work as they would on
-                your web browser.
-                They use the history to retry pages.
-                This can be handy for checking the effect of hitting the
-                back button on your forms.
-            </p>
-            <p>
-                The frame methods need a little explanation.
-                By default a framed page is treated just like any other.
-                Content will be searced for throughout the entire frameset,
-                so clicking a link will work no matter which frame
-                the anchor tag is in.
-                You can override this behaviour by focusing on a single
-                frame.
-                If you do that, all searches and actions will apply to that
-                frame alone, such as authentication and retries.
-                If a link or button is not in a focused frame then it cannot
-                be clicked.
-            </p>
-            <p>
-                Testing navigation on fixed pages only tells you when you
-                have broken an entire script.
-                For highly dynamic pages, such as for bulletin boards, this can
-                be crucial for verifying the correctness of the application.
-                For most applications though, the really tricky logic is usually in
-                the handling of forms and sessions.
-                Fortunately SimpleTest includes
-                <a href="form_testing_documentation.html">tools for testing web forms</a>
-                as well.
-            </p>
-        
-        <h2>
-<a class="target" name="request"></a>Modifying the request</h2>
-            <p>
-                Although SimpleTest does not have the goal of testing networking
-                problems, it does include some methods to modify and debug
-                the requests it makes.
-                Here is another method list...
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">getTransportError()</span></td>
-<td>The last socket error</td>
-</tr>
-                    <tr>
-<td><span class="new_code">showRequest()</span></td>
-<td>Dump the outgoing request</td>
-</tr>
-                    <tr>
-<td><span class="new_code">showHeaders()</span></td>
-<td>Dump the incoming headers</td>
-</tr>
-                    <tr>
-<td><span class="new_code">showSource()</span></td>
-<td>Dump the raw HTML page content</td>
-</tr>
-                    <tr>
-<td><span class="new_code">ignoreFrames()</span></td>
-<td>Do not load framesets</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setCookie($name, $value)</span></td>
-<td>Set a cookie from now on</td>
-</tr>
-                    <tr>
-<td><span class="new_code">addHeader($header)</span></td>
-<td>Always add this header to the request</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setMaximumRedirects($max)</span></td>
-<td>Stop after this many redirects</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setConnectionTimeout($timeout)</span></td>
-<td>Kill the connection after this time between bytes</td>
-</tr>
-                    <tr>
-<td><span class="new_code">useProxy($proxy, $name, $password)</span></td>
-<td>Make requests via this proxy URL</td>
-</tr>
-                </tbody></table>
-                These methods are principally for debugging.
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-<li>
-            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
-            gives full detail on the classes and assertions available.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <span class="chosen">Web tester</span>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/fr/authentication_documentation.html b/3rdparty/simpletest/docs/fr/authentication_documentation.html
deleted file mode 100644
index fe70e035593..00000000000
--- a/3rdparty/simpletest/docs/fr/authentication_documentation.html
+++ /dev/null
@@ -1,372 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Documentation Simple Test : tester l'authentification</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Documentation sur l'authentification</h1>
-        This page...
-        <ul>
-<li>
-            Passer au travers d'une <a href="#basique">authentification HTTP basique</a>
-        </li>
-<li>
-            Tester l'<a href="#cookies">authentification basée sur des cookies</a>
-        </li>
-<li>
-            Gérer les <a href="#session">sessions du navigateur</a> et les timeouts
-        </li>
-</ul>
-<div class="content">
-        
-            <p>
-                Un des secteurs à la fois délicat et important lors d'un test
-                de site web reste la sécurité. Tester ces schémas est au coeur
-                des objectifs du testeur web de SimpleTest.
-            </p>
-        
-        <h2>
-<a class="target" name="basique"></a>Authentification HTTP basique</h2>
-            <p>
-                Si vous allez chercher une page web protégée
-                par une authentification basique, vous hériterez d'une entête 401.
-                Nous pouvons représenter ceci par ce test...
-<pre>
-class AuthenticationTest extends WebTestCase {<strong>
-    function test401Header() {
-        $this-&gt;get('http://www.lastcraft.com/protected/');
-        $this-&gt;showHeaders();
-    }</strong>
-}
-</pre>
-                Ce qui nous permet de voir les entêtes reçues...
-                <div class="demo">
-                    <h1>File test</h1>
-<pre style="background-color: lightgray; color: black">
-HTTP/1.1 401 Authorization Required
-Date: Sat, 18 Sep 2004 19:25:18 GMT
-Server: Apache/1.3.29 (Unix) PHP/4.3.4
-WWW-Authenticate: Basic realm="SimpleTest basic authentication"
-Connection: close
-Content-Type: text/html; charset=iso-8859-1
-</pre>
-                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
-                    <strong>0</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
-                </div>
-                Sauf que nous voulons éviter l'inspection visuelle,
-                on souhaite que SimpleTest puisse nous dire si oui ou non
-                la page est protégée. Voici un test en profondeur sur nos entêtes...
-<pre>
-class AuthenticationTest extends WebTestCase {
-    function test401Header() {
-        $this-&gt;get('http://www.lastcraft.com/protected/');<strong>
-        $this-&gt;assertAuthentication('Basic');
-        $this-&gt;assertResponse(401);
-        $this-&gt;assertRealm('SimpleTest basic authentication');</strong>
-    }
-}
-</pre>
-                N'importe laquelle de ces assertions suffirait,
-                tout dépend de la masse de détails que vous souhaitez voir.
-            </p>
-            <p>
-                Un des axes qui traverse SimpleTest est la possibilité d'utiliser
-				des objets <span class="new_code">SimpleExpectation</span> à chaque fois qu'une
-				vérification simple suffit.
-				Si vous souhaitez vérifiez simplement le contenu du realm - l'identification
-				du domaine - dans notre exemple, il suffit de faire...
-<pre>
-class AuthenticationTest extends WebTestCase {
-    function test401Header() {
-        $this-&gt;get('http://www.lastcraft.com/protected/');
-        $this-&gt;assertRealm(<strong>new PatternExpectation('/simpletest/i')</strong>);
-    }
-}
-</pre>
-                Ce type de test, vérifier les réponses HTTP, n'est cependant pas commun.
-            </p>
-			<p>
-                La plupart du temps, nous ne souhaitons pas tester
-                l'authentification en elle-même, mais plutôt
-                les pages protégées par cette authentification.
-                Dès que la tentative d'authentification est reçue,
-                nous pouvons y répondre à l'aide d'une réponse d'authentification :
-<pre>
-class AuthenticationTest extends WebTestCase {
-    function testAuthentication() {
-        $this-&gt;get('http://www.lastcraft.com/protected/');<strong>
-        $this-&gt;authenticate('Me', 'Secret');</strong>
-        $this-&gt;assertTitle(...);
-    }
-}
-</pre>
-                Le nom d'utilisateur et le mot de passe seront désormais
-                envoyés à chaque requête vers ce répertoire
-                et ses sous-répertoires.
-                En revanche vous devrez vous authentifier à nouveau
-                si vous sortez de ce répertoire mais SimpleTest est assez
-                intelligent pour fusionner les sous-répertoires dans un même domaine.
-            </p>
-            <p>
-                Vous pouvez gagner une ligne en définissant
-                l'authentification au niveau de l'URL...
-<pre>
-class AuthenticationTest extends WebTestCase {
-    function testCanReadAuthenticatedPages() {
-        $this-&gt;get('http://<strong>Me:Secret@</strong>www.lastcraft.com/protected/');
-        $this-&gt;assertTitle(...);
-    }
-}
-</pre>
-                Si votre nom d'utilisateur ou mot de passe comporte
-                des caractères spéciaux, alors n'oubliez pas de les encoder,
-                sinon la requête ne sera pas analysée correctement.
-                De plus cette entête ne sera pas envoyée aux
-                sous requêtes si vous la définissez avec une URL absolue.
-                Par contre si vous naviguez avec des URL relatives,
-                l'information d'authentification sera préservée.
-            </p>
-            <p>
-                Normalement, vous utilisez l'appel <span class="new_code">authenticate()</span>. SimpleTest
-				utilisera alors vos informations de connexion à chaque requête.
-            </p>
-            <p>
-                 Pour l'instant, seule l'authentification de base est implémentée
-                 et elle n'est réellement fiable qu'en tandem avec une connexion HTTPS.
-                 C'est généralement suffisant pour protéger
-                 le serveur testé des regards malveillants.
-                 Les authentifications Digest et NTLM pourraient être ajoutées prochainement.
-            </p>
-        
-        <h2>
-<a class="target" name="cookies"></a>Cookies</h2>
-            <p>
-                L'authentification de base ne donne pas assez de contrôle
-                au développeur Web sur l'interface utilisateur.
-                Il y a de forte chance pour que cette fonctionnalité
-                soit codée directement dans l'architecture web
-                à grand renfort de cookies et de timeouts compliqués.
-            </p>
-            <p>
-                Commençons par un simple formulaire de connexion...
-<pre>
-&lt;form&gt;
-    Username:
-    &lt;input type="text" name="u" value="" /&gt;&lt;br /&gt;
-    Password:
-    &lt;input type="password" name="p" value="" /&gt;&lt;br /&gt;
-    &lt;input type="submit" value="Log in" /&gt;
-&lt;/form&gt;
-</pre>
-                Lequel doit ressembler à...
-            </p>
-            <p>
-                <form class="demo">
-                    Username:
-                    <input type="text" name="u" value=""><br>
-                    Password:
-                    <input type="password" name="p" value=""><br>
-                    <input type="submit" value="Log in">
-                </form>
-            </p>
-            <p>
-                Supposons que, durant le chargement de la page,
-                un cookie ait été inscrit avec un numéro d'identifiant de session.
-                Nous n'allons pas encore remplir le formulaire,
-                juste tester que nous pistons bien l'utilisateur.
-                Voici le test...
-<pre>
-class LogInTest extends WebTestCase {
-    function testSessionCookieSetBeforeForm() {
-        $this-&gt;get('http://www.my-site.com/login.php');<strong>
-        $this-&gt;assertCookie('SID');</strong>
-    }
-}
-</pre>
-                Nous nous contentons ici de vérifier que le cookie a bien été défini.
-                Etant donné que sa valeur est plutôt énigmatique,
-                elle ne vaudrait pas la peine d'être testée avec...
-<pre>
-class LogInTest extends WebTestCase {
-    function testSessionCookieIsCorrectPattern() {
-        $this-&gt;get('http://www.my-site.com/login.php');
-        $this-&gt;assertCookie('SID', <strong>new PatternExpectation('/[a-f0-9]{32}/i')</strong>);
-    }
-}
-</pre>
-                Si vous utilisez PHP pour gérer vos sessions alors
-				ce test est encore plus inutile, étant donné qu'il ne fait
-				que tester PHP lui-même.
-            </p>
-            <p>
-                Le test le plus simple pour vérifier que la connexion a bien eu lieu
-				reste d'inspecter visuellement la page suivante :
-				un simple appel à <span class="new_code">WebTestCase::assertText()</span> et le tour est joué.
-            </p>
-            <p>
-                Le reste du test est le même que dans n'importe quel autre formulaire,
-                mais nous pourrions souhaiter nous assurer
-                que le cookie n'a pas été modifié depuis la phase de connexion.
-                Voici comment cela pourrait être testé :
-<pre>
-class LogInTest extends WebTestCase {
-    ...
-    function testSessionCookieSameAfterLogIn() {
-        $this-&gt;get('http://www.my-site.com/login.php');<strong>
-        $session = $this-&gt;getCookie('SID');
-        $this-&gt;setField('u', 'Me');
-        $this-&gt;setField('p', 'Secret');
-        $this-&gt;clickSubmit('Log in');
-        $this-&gt;assertWantedPattern('/Welcome Me/');
-        $this-&gt;assertCookie('SID', $session);</strong>
-    }
-}
-</pre>
-                Ceci confirme que l'identifiant de session
-                est identique avant et après la connexion.
-            </p>
-            <p>
-                Nous pouvons même essayer de duper notre propre système
-                en créant un cookie arbitraire pour se connecter...
-<pre>
-class LogInTest extends WebTestCase {
-    ...
-    function testSessionCookieSameAfterLogIn() {
-        $this-&gt;get('http://www.my-site.com/login.php');<strong>
-        $this-&gt;setCookie('SID', 'Some other session');
-        $this-&gt;get('http://www.my-site.com/restricted.php');</strong>
-        $this-&gt;assertWantedPattern('/Access denied/');
-    }
-}
-</pre>
-                Votre site est-il protégé contre ce type d'attaque ?
-            </p>
-        
-        <h2>
-<a class="target" name="session"></a>Sessions de navigateur</h2>
-            <p>
-                Si vous testez un système d'authentification,
-                la reconnexion par un utilisateur est un point sensible.
-                Essayons de simuler ce qui se passe dans ce cas :
-<pre>
-class LogInTest extends WebTestCase {
-    ...
-    function testLoseAuthenticationAfterBrowserClose() {
-        $this-&gt;get('http://www.my-site.com/login.php');
-        $this-&gt;setField('u', 'Me');
-        $this-&gt;setField('p', 'Secret');
-        $this-&gt;clickSubmit('Log in');
-        $this-&gt;assertWantedPattern('/Welcome Me/');<strong>
-        
-        $this-&gt;restart();
-        $this-&gt;get('http://www.my-site.com/restricted.php');
-        $this-&gt;assertWantedPattern('/Access denied/');</strong>
-    }
-}
-</pre>
-                La méthode <span class="new_code">WebTestCase::restart()</span> préserve
-                les cookies dont le timeout n'a pas expiré,
-                mais jette les cookies temporaires ou expirés.
-                Vous pouvez spécifier l'heure et la date de leur réactivation.
-            </p>
-            <p>
-                L'expiration des cookies peut être un problème.
-                Si vous avez un cookie qui doit expirer au bout d'une heure,
-                nous n'allons pas mettre le test en veille en attendant
-                que le cookie expire...
-            </p>
-            <p>
-                Afin de provoquer leur expiration,
-                vous pouvez dater manuellement les cookies,
-                avant le début de la session.
-<pre>
-class LogInTest extends WebTestCase {
-    ...
-    function testLoseAuthenticationAfterOneHour() {
-        $this-&gt;get('http://www.my-site.com/login.php');
-        $this-&gt;setField('u', 'Me');
-        $this-&gt;setField('p', 'Secret');
-        $this-&gt;clickSubmit('Log in');
-        $this-&gt;assertWantedPattern('/Welcome Me/');
-        <strong>
-        $this-&gt;ageCookies(3600);</strong>
-        $this-&gt;restart();
-        $this-&gt;get('http://www.my-site.com/restricted.php');
-        $this-&gt;assertWantedPattern('/Access denied/');
-    }
-}
-</pre>
-                Après le redémarrage, les cookies seront plus vieux
-                d'une heure et que tous ceux dont la date d'expiration
-                sera passée auront disparus.
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            La page du projet SimpleTest sur <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            La page de téléchargement de SimpleTest sur <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-<li>
-            <a href="http://simpletest.org/api/">L'API du développeur pour SimpleTest</a> donne tous les détails sur les classes et les assertions disponibles.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/fr/browser_documentation.html b/3rdparty/simpletest/docs/fr/browser_documentation.html
deleted file mode 100644
index 6be1267773b..00000000000
--- a/3rdparty/simpletest/docs/fr/browser_documentation.html
+++ /dev/null
@@ -1,500 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Documentation SimpleTest : le composant de navigation web scriptable</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Documentation sur le navigateur scriptable</h1>
-        This page...
-        <ul>
-<li>
-            Utiliser le <a href="#scripting">navigateur web dans des scripts</a>
-        </li>
-<li>
-            <a href="#deboguer">Déboguer</a> les erreurs sur les pages
-        </li>
-<li>
-            <a href="#unit">Tests complexes avec des navigateurs web multiples</a>
-        </li>
-</ul>
-<div class="content">
-        
-            <p>
-                Le composant de navigation web de SimpleTest peut être utilisé
-                non seulement à l'extérieur de la classe <span class="new_code">WebTestCase</span>,
-                mais aussi indépendamment du framework SimpleTest lui-même.
-            </p>
-        
-        <h2>
-<a class="target" name="script"></a>Le navigateur scriptable</h2>
-            <p>
-                Vous pouvez utiliser le navigateur web dans des scripts PHP
-                pour confirmer que des services marchent bien comme il faut
-                ou pour extraire des informations à partir de ceux-ci de façon régulière.
-                Par exemple, voici un petit script pour extraire
-                le nombre de bogues ouverts dans PHP 5 à partir
-                du <a href="http://www.php.net/">site web PHP</a>...
-<pre>
-&lt;?php
-    require_once('simpletest/browser.php');
-    
-    $browser = &amp;new SimpleBrowser();
-    $browser-&gt;get('http://php.net/');
-    $browser-&gt;clickLink('reporting bugs');
-    $browser-&gt;clickLink('statistics');
-    $browser-&gt;clickLink('PHP 5 bugs only');
-    $page = $browser-&gt;getContent();
-    preg_match('/status=Open.*?by=Any.*?(\d+)&lt;\/a&gt;/', $page, $matches);
-    print $matches[1];
-?&gt;
-</pre>
-                Bien sûr Il y a des méthodes plus simple pour réaliser
-                cet exemple en PHP. Par exemple, vous pourriez juste
-                utiliser la commande PHP <span class="new_code">file()</span> sur ce qui est
-                ici une page fixe. Cependant, en utilisant des scripts
-                avec le navigateur web vous vous autorisez l'authentification,
-                la gestion des cookies, le chargement automatique des fenêtres,
-                les redirections, la transmission de formulaires et la capacité
-                d'examiner les entêtes.
-			</p>
-			<p>
-				Ces méthodes qui se basent sur le contenu textuel des pages
-				sont fragiles dans un site en constante évolution
-				et vous voudrez employer une méthode plus directe
-				pour accéder aux données de façon permanente,
-                mais pour des tâches simples cette technique peut s'avérer
-                une solution très rapide.
-            </p>
-            <p>
-                Toutes les méthode de navigation utilisées dans <a href="web_tester_documentation.html">WebTestCase</a> sont présente dans la classe <span class="new_code">SimpleBrowser</span>, mais les assertions sont remplacées par de simples accesseurs. Voici une liste complète des méthodes de navigation de page à page...
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">addHeader($header)</span></td>
-<td>Ajouter une entête à chaque téléchargement</td>
-</tr>
-                    <tr>
-<td><span class="new_code">useProxy($proxy, $username, $password)</span></td>
-<td>Utilise ce proxy à partir de maintenant</td>
-</tr> 
-                    <tr>
-<td><span class="new_code">head($url, $parameters)</span></td>
-<td>Effectue une requête HEAD</td>
-</tr>
-                    <tr>
-<td><span class="new_code">get($url, $parameters)</span></td>
-<td>Télécharge une page avec un GET</td>
-</tr>
-                    <tr>
-<td><span class="new_code">post($url, $parameters)</span></td>
-<td>Télécharge une page avec un POST</td>
-</tr>
-                    <tr>
-<td><span class="new_code">click($label)</span></td>
-<td>Suit un lien visible ou un bouton texte par son étiquette</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickLink($label)</span></td>
-<td>Suit un lien par son étiquette</td>
-</tr>
-                    <tr>
-<td><span class="new_code">isLink($label)</span></td>
-<td>Vérifie l'existance d'un lien par son étiquette</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickLinkById($id)</span></td>
-<td>Suit un lien par son attribut d'identification</td>
-</tr>
-                    <tr>
-<td><span class="new_code">isLinkById($id)</span></td>
-<td>Vérifie l'existance d'un lien par son attribut d'identification</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getUrl()</span></td>
-<td>La page ou la fenêtre URL en cours</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getTitle()</span></td>
-<td>Le titre de la page</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getContent()</span></td>
-<td>Le page ou la fenêtre brute</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getContentAsText()</span></td>
-<td>Sans code HTML à l'exception du text "alt"</td>
-</tr>
-                    <tr>
-<td><span class="new_code">retry()</span></td>
-<td>Répète la dernière requête</td>
-</tr>
-                    <tr>
-<td><span class="new_code">back()</span></td>
-<td>Utilise le bouton "précédent" du navigateur</td>
-</tr>
-                    <tr>
-<td><span class="new_code">forward()</span></td>
-<td>Utilise le bouton "suivant" du navigateur</td>
-</tr>
-                    <tr>
-<td><span class="new_code">authenticate($username, $password)</span></td>
-<td>Retente la page ou la fenêtre après une réponse 401</td>
-</tr>
-                    <tr>
-<td><span class="new_code">restart($date)</span></td>
-<td>Relance le navigateur pour une nouvelle session</td>
-</tr>
-                    <tr>
-<td><span class="new_code">ageCookies($interval)</span></td>
-<td>Change la date des cookies</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setCookie($name, $value)</span></td>
-<td>Lance un nouveau cookie</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getCookieValue($host, $path, $name)</span></td>
-<td>Lit le cookie le plus spécifique</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getCurrentCookieValue($name)</span></td>
-<td>Lit le contenue du cookie en cours</td>
-</tr>
-                </tbody></table>
-                Les méthode <span class="new_code">SimpleBrowser::useProxy()</span> et
-                <span class="new_code">SimpleBrowser::addHeader()</span> sont spéciales.
-                Une fois appelées, elles continuent à s'appliquer sur les téléchargements suivants.
-            </p>
-            <p>
-                Naviguer dans les formulaires est similaire à la <a href="form_testing_documentation.html">navigation des formulaires via WebTestCase</a>...
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">setField($label, $value)</span></td>
-<td>Modifie tous les champs avec cette étiquette ou ce nom</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setFieldByName($name, $value)</span></td>
-<td>Modifie tous les champs avec ce nom</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setFieldById($id, $value)</span></td>
-<td>Modifie tous les champs avec cet identifiant</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getField($label)</span></td>
-<td>Accesseur de la valeur d'un élément de formulaire avec cette étiquette ou ce nom</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getFieldByName($name)</span></td>
-<td>Accesseur de la valeur d'un élément de formulaire avec ce nom</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getFieldById($id)</span></td>
-<td>Accesseur de la valeur de l'élément de formulaire avec cet identifiant</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickSubmit($label)</span></td>
-<td>Transmet le formulaire avec l'étiquette de son bouton</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickSubmitByName($name)</span></td>
-<td>Transmet le formulaire avec l'attribut de son bouton</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickSubmitById($id)</span></td>
-<td>Transmet le formulaire avec l'identifiant de son bouton</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickImage($label, $x, $y)</span></td>
-<td>Clique sur une balise input de type image par son titre (title="*") our son texte alternatif (alt="*")</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickImageByName($name, $x, $y)</span></td>
-<td>Clique sur une balise input de type image par son attribut (name="*")</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickImageById($id, $x, $y)</span></td>
-<td>Clique sur une balise input de type image par son identifiant (id="*")</td>
-</tr>
-                    <tr>
-<td><span class="new_code">submitFormById($id)</span></td>
-<td>Transmet le formulaire par son identifiant propre</td>
-</tr>
-                </tbody></table>
-                Au jourd d'aujourd'hui il n'existe pas beaucoup de méthodes pour lister
-                les formulaires et les champs disponibles.
-				<table><tbody>
-                    <tr>
-<td><span class="new_code">isClickable($label)</span></td>
-<td>Vérifie si un lien existe avec cette étiquette ou ce nom</td>
-</tr>
-                    <tr>
-<td><span class="new_code">isSubmit($label)</span></td>
-<td>Vérifie si un bouton existe avec cette étiquette ou ce nom</td>
-</tr>
-                    <tr>
-<td><span class="new_code">isImage($label)</span></td>
-<td>Vérifie si un bouton image existe avec cette étiquette ou ce nom</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getLink($label)</span></td>
-<td>Trouve une URL à partir de son label</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getLinkById($label)</span></td>
-<td>Trouve une URL à partir de son identifiant</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getUrls()</span></td>
-<td>Liste l'ensemble des liens de la page courante</td>
-</tr>
-                </tbody></table>
-				Ce sera probablement
-                ajouté dans des versions successives de SimpleTest.
-            </p>
-            <p>
-                A l'intérieur d'une page, les fenêtres individuelles peuvent être
-                sélectionnées. Si aucune sélection n'est réalisée alors
-                toutes les fenêtres sont fusionnées ensemble dans
-                une unique et grande page.
-                Le contenu de la page en cours sera une concaténation des
-                toutes les fenêtres dans l'ordre spécifié par les balises "frameset".
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">getFrames()</span></td>
-<td>Un déchargement de la structure de la fenêtre courante</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getFrameFocus()</span></td>
-<td>L'index ou l'étiquette de la fenêtre en courante</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setFrameFocusByIndex($choice)</span></td>
-<td>Sélectionne la fenêtre numérotée à partir de 1</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setFrameFocus($name)</span></td>
-<td>Sélectionne une fenêtre par son étiquette</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clearFrameFocus()</span></td>
-<td>Traite toutes les fenêtres comme une seule page</td>
-</tr>
-                </tbody></table>
-                Lorsqu'on est focalisé sur une fenêtre unique,
-                le contenu viendra de celle-ci uniquement.
-                Cela comprend les liens à cliquer et les formulaires à transmettre.
-            </p>
-        
-        <h2>
-<a class="target" name="deboguer"></a>Où sont les erreurs ?</h2>
-            <p>
-                Toute cette masse de fonctionnalités est géniale
-                lorsqu'on arrive à bien télécharger les pages,
-                mais ce n'est pas toujours évident.
-                Pour aider à découvrir les erreurs, le navigateur a aussi
-                des méthodes pour aider au débogage.
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">setConnectionTimeout($timeout)</span></td>
-<td>Ferme la socket avec un délai trop long</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getUrl()</span></td>
-<td>L'URL de la page chargée le plus récemment</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getRequest()</span></td>
-<td>L'entête de la requête brute de la page ou de la fenêtre</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getHeaders()</span></td>
-<td>L'entête de réponse de la page ou de la fenêtre</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getTransportError()</span></td>
-<td>N'importe quel erreur au niveau de la socket dans le dernier téléchargement</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getResponseCode()</span></td>
-<td>La réponse HTTP de la page ou de la fenêtre</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getMimeType()</span></td>
-<td>Le type Mime de la page our de la fenêtre</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getAuthentication()</span></td>
-<td>Le type d'authentification dans l'entête d'une provocation 401</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getRealm()</span></td>
-<td>Le realm d'authentification dans l'entête d'une provocation 401</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getBaseUrl()</span></td>
-<td>Uniquement la base de l'URL de la page chargée le plus récemment</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setMaximumRedirects($max)</span></td>
-<td>Nombre de redirections avant que la page ne soit chargée automatiquement</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setMaximumNestedFrames($max)</span></td>
-<td>Protection contre des framesets récursifs</td>
-</tr>
-                    <tr>
-<td><span class="new_code">ignoreFrames()</span></td>
-<td>Neutralise le support des fenêtres</td>
-</tr>
-                    <tr>
-<td><span class="new_code">useFrames()</span></td>
-<td>Autorise le support des fenêtres</td>
-</tr>
-                </tbody></table>
-                Les méthodes <span class="new_code">SimpleBrowser::setConnectionTimeout()</span>,
-                <span class="new_code">SimpleBrowser::setMaximumRedirects()</span>,
-                <span class="new_code">SimpleBrowser::setMaximumNestedFrames()</span>,
-                <span class="new_code">SimpleBrowser::ignoreFrames()</span>
-                et <span class="new_code">SimpleBrowser::useFrames()</span> continuent à s'appliquer
-                sur toutes les requêtes suivantes.
-                Les autres méthodes tiennent compte des fenêtres.
-                Cela veut dire que si une fenêtre individuelle ne se charge pas,
-                il suffit de se diriger vers elle avec
-                <span class="new_code">SimpleBrowser::setFrameFocus()</span> : ensuite on utilisera
-                <span class="new_code">SimpleBrowser::getRequest()</span>, etc. pour voir ce qui se passe.
-            </p>
-        
-        <h2>
-<a class="target" name="unit"></a>Tests unitaires complexes avec des navigateurs multiples</h2>
-            <p>
-                Tout ce qui peut être fait dans
-                <a href="web_tester_documentation.html">WebTestCase</a> peut maintenant
-                être fait dans un <a href="unit_tester_documentation.html">UnitTestCase</a>.
-                Ce qui revient à dire que nous pouvons librement mélanger
-                des tests sur des objets de domaine avec l'interface web...
-<pre><strong>
-class TestOfRegistration extends UnitTestCase {
-    function testNewUserAddedToAuthenticator() {</strong>
-        $browser = new SimpleBrowser();
-        $browser-&gt;get('http://my-site.com/register.php');
-        $browser-&gt;setField('email', 'me@here');
-        $browser-&gt;setField('password', 'Secret');
-        $browser-&gt;clickSubmit('Register');
-        <strong>
-        $authenticator = new Authenticator();
-        $member = $authenticator-&gt;findByEmail('me@here');
-        $this-&gt;assertEqual($member-&gt;getPassword(), 'Secret');</strong>
-    }
-}
-</pre>
-                Bien que ça puisse être utile par convenance temporaire,
-                je ne suis pas fan de ce genre de test. Ce test s'applique
-                à plusieurs couches de l'application, ça implique qu'il est
-                plus que probable qu'il faudra le remanier lorsque le code changera.
-            </p>
-            <p>
-                Un cas plus utile d'utilisation directe du navigateur est
-                le moment où le <span class="new_code">WebTestCase</span> ne peut plus suivre.
-                Un exemple ? Quand deux navigateurs doivent être utilisés en même temps.
-            </p>
-            <p>
-                Par exemple, supposons que nous voulions interdire
-                des usages simultanés d'un site avec le même login d'identification.
-                Ce scénario de test le vérifie...
-<pre>
-class TestOfSecurity extends UnitTestCase {
-    function testNoMultipleLoginsFromSameUser() {
-        $first = &amp;new SimpleBrowser();
-        $first-&gt;get('http://my-site.com/login.php');
-        $first-&gt;setField('name', 'Me');
-        $first-&gt;setField('password', 'Secret');
-        $first-&gt;clickSubmit('Enter');
-        $this-&gt;assertEqual($first-&gt;getTitle(), 'Welcome');
-        
-        $second = &amp;new SimpleBrowser();
-        $second-&gt;get('http://my-site.com/login.php');
-        $second-&gt;setField('name', 'Me');
-        $second-&gt;setField('password', 'Secret');
-        $second-&gt;clickSubmit('Enter');
-        $this-&gt;assertEqual($second-&gt;getTitle(), 'Access Denied');
-    }
-}
-</pre>
-                Vous pouvez aussi utiliser la classe <span class="new_code">SimpleBrowser</span>
-                quand vous souhaitez écrire des scénarios de test en utilisant
-                un autre outil que SimpleTest, comme PHPUnit par exemple.
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            La page du projet SimpleTest sur
-            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            La page de téléchargement de SimpleTest sur
-            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-<li>
-            <a href="http://simpletest.org/api/">L'API de développeur pour SimpleTest</a>
-            donne tous les détails sur les classes et les assertions disponibles.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/fr/docs.css b/3rdparty/simpletest/docs/fr/docs.css
deleted file mode 100755
index 49170486ab3..00000000000
--- a/3rdparty/simpletest/docs/fr/docs.css
+++ /dev/null
@@ -1,84 +0,0 @@
-body {
-    padding-left: 3%;
-    padding-right: 3%;
-}
-pre {
-    font-family: "courier new", courier;
-    font-size: 80%;
-    border: 1px solid;
-    background-color: #cccccc;
-    padding: 5px;
-    margin-left: 5%;
-    margin-right: 8%;
-}
-.code, .new_code, pre.new_code {
-    font-weight: bold;
-}
-div.copyright {
-    font-size: 80%;
-    color: gray;
-}
-div.copyright a {
-    color: gray;
-}
-ul.api {
-    padding-left: 0em;
-    padding-right: 25%;
-}
-ul.api li {
-    margin-top: 0.2em;
-    margin-bottom: 0.2em;
-    list-style: none;
-    text-indent: -3em;
-    padding-left: 3em;
-}
-div.demo {
-    border: 4px ridge;
-    border-color: gray;
-    padding: 10px;
-    margin: 5px;
-    margin-left: 20px;
-    margin-right: 40px;
-    background-color: white;
-}
-div.demo span.fail {
-    color: red;
-}
-div.demo span.pass {
-    color: green;
-}
-div.demo h1 {
-    font-size: 12pt;
-    text-align: left;
-    font-weight: bold;
-}
-table {
-    border: 2px outset;
-    border-color: gray;
-    background-color: white;
-    margin: 5px;
-    margin-left: 5%;
-    margin-right: 5%;
-}
-td {
-    font-size: 80%;
-}
-.shell {
-    color: white;
-}
-pre.shell {
-    border: 4px ridge;
-    border-color: gray;
-    padding: 10px;
-    margin: 5px;
-    margin-left: 20px;
-    margin-right: 40px;
-    background-color: black;
-}
-form.demo {
-    background-color: lightgray;
-    border: 4px outset;
-    border-color: lightgray;
-    padding: 10px;
-    margin-right: 40%;
-}
diff --git a/3rdparty/simpletest/docs/fr/expectation_documentation.html b/3rdparty/simpletest/docs/fr/expectation_documentation.html
deleted file mode 100644
index ee579110a6d..00000000000
--- a/3rdparty/simpletest/docs/fr/expectation_documentation.html
+++ /dev/null
@@ -1,451 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Documentation SimpleTest : étendre le testeur unitaire avec des classes d'attentes supplémentaires</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Documentation sur les attentes</h1>
-        This page...
-        <ul>
-<li>
-            Utiliser les attentes <a href="#fantaisie">pour des tests
-            plus précis avec des objets fantaisie</a>
-        </li>
-<li>
-            <a href="#comportement">Changer le comportement d'un objet fantaisie</a>
-            avec des attentes
-        </li>
-<li>
-            <a href="#etendre">Créer des attentes</a>
-        </li>
-<li>
-            Par dessous SimpleTest <a href="#unitaire">utilise des classes d'attente</a>
-        </li>
-</ul>
-<div class="content">
-        <h2>
-<a class="target" name="fantaisie"></a>Plus de contrôle sur les objets fantaisie</h2>
-            <p>
-                Le comportement par défaut des
-                <a href="mock_objects_documentation.html">objets fantaisie</a> dans
-                <a href="http://sourceforge.net/projects/simpletest/">SimpleTest</a>
-                est soit une correspondance identique sur l'argument,
-                soit l'acceptation de n'importe quel argument.
-                Pour la plupart des tests, c'est suffisant.
-                Cependant il est parfois nécessaire de ramollir un scénario de test.
-            </p>
-            <p>
-                Un des endroits où un test peut être trop serré
-                est la reconnaissance textuelle. Prenons l'exemple
-                d'un composant qui produirait un message d'erreur
-                utile lorsque quelque chose plante. Il serait utile de tester
-                que l'erreur correcte est renvoyée,
-                mais le texte proprement dit risque d'être plutôt long.
-                Si vous testez le texte dans son ensemble alors
-                à chaque modification de ce même message
-                -- même un point ou une virgule -- vous aurez
-                à revenir sur la suite de test pour la modifier.
-            </p>
-            <p>
-                Voici un cas concret, nous avons un service d'actualités
-                qui a échoué dans sa tentative de connexion à sa source distante.
-<pre>
-<strong>class NewsService {
-    ...
-    function publish($writer) {
-        if (! $this-&gt;isConnected()) {
-            $writer-&gt;write('Cannot connect to news service "' .
-                    $this-&gt;_name . '" at this time. ' .
-                    'Please try again later.');
-        }
-        ...
-    }
-}</strong>
-</pre>
-                Là il envoie son contenu vers un classe <span class="new_code">Writer</span>.
-                Nous pourrions tester ce comportement avec un <span class="new_code">MockWriter</span>...
-<pre>
-class TestOfNewsService extends UnitTestCase {
-    ...
-    function testConnectionFailure() {<strong>
-        $writer = new MockWriter($this);
-        $writer-&gt;expectOnce('write', array(
-                'Cannot connect to news service ' .
-                '"BBC News" at this time. ' .
-                'Please try again later.'));
-        
-        $service = new NewsService('BBC News');
-        $service-&gt;publish($writer);
-        
-        $writer-&gt;tally();</strong>
-    }
-}
-</pre>
-                C'est un bon exemple d'un test fragile.
-                Si nous décidons d'ajouter des instructions complémentaires,
-                par exemple proposer une source d'actualités alternative,
-                nous casserons nos tests par la même occasion sans pourtant
-                avoir modifié une seule fonctionnalité.
-            </p>
-            <p>
-                Pour contourner ce problème, nous voudrions utiliser
-                un test avec une expression rationnelle plutôt
-                qu'une correspondance exacte. Nous pouvons y parvenir avec...
-<pre>
-class TestOfNewsService extends UnitTestCase {
-    ...
-    function testConnectionFailure() {
-        $writer = new MockWriter($this);<strong>
-        $writer-&gt;expectOnce(
-                'write',
-                array(new PatternExpectation('/cannot connect/i')));</strong>
-        
-        $service = new NewsService('BBC News');
-        $service-&gt;publish($writer);
-        
-        $writer-&gt;tally();
-    }
-}
-</pre>
-                Plutôt que de transmettre le paramètre attendu au <span class="new_code">MockWriter</span>,
-                nous envoyons une classe d'attente appelée <span class="new_code">PatternExpectation</span>.
-                L'objet fantaisie est suffisamment élégant pour reconnaître
-                qu'il s'agit d'un truc spécial et pour le traiter différemment.
-                Plutôt que de comparer l'argument entrant à cet objet,
-                il utilise l'objet attente lui-même pour exécuter le test.
-            </p>
-            <p>
-                <span class="new_code">PatternExpectation</span> utilise
-                l'expression rationnelle pour la comparaison avec son constructeur.
-                A chaque fois qu'une comparaison est fait à travers
-                <span class="new_code">MockWriter</span> par rapport à cette classe attente,
-                elle fera un <span class="new_code">preg_match()</span> avec ce motif.
-                Dans notre scénario de test ci-dessus, aussi longtemps
-                que la chaîne "cannot connect" apparaît dans le texte,
-                la fantaisie transmettra un succès au testeur unitaire.
-                Peu importe le reste du texte.
-            </p>
-            <p>
-                Les classes attente possibles sont...
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">AnythingExpectation</span></td>
-<td>Sera toujours validé</td>
-</tr>
-                    <tr>
-<td><span class="new_code">EqualExpectation</span></td>
-<td>Une égalité, plutôt que la plus forte comparaison à l'identique</td>
-</tr>
-                    <tr>
-<td><span class="new_code">NotEqualExpectation</span></td>
-<td>Une comparaison sur la non-égalité</td>
-</tr>
-                    <tr>
-<td><span class="new_code">IndenticalExpectation</span></td>
-<td>La vérification par défaut de l'objet fantaisie qui doit correspondre exactement</td>
-</tr>
-                    <tr>
-<td><span class="new_code">NotIndenticalExpectation</span></td>
-<td>Inverse la logique de l'objet fantaisie</td>
-</tr>
-                    <tr>
-<td><span class="new_code">PatternExpectation</span></td>
-<td>Utilise une expression rationnelle Perl pour comparer une chaîne</td>
-</tr>
-                    <tr>
-<td><span class="new_code">NoPatternExpectation</span></td>
-<td>Passe seulement si l'expression rationnelle Perl échoue</td>
-</tr>
-                    <tr>
-<td><span class="new_code">IsAExpectation</span></td>
-<td>Vérifie le type ou le nom de la classe uniquement</td>
-</tr>
-                    <tr>
-<td><span class="new_code">NotAExpectation</span></td>
-<td>L'opposé de <span class="new_code">IsAExpectation</span>
-</td>
-</tr>
-                    <tr>
-<td><span class="new_code">MethodExistsExpectation</span></td>
-<td>Vérifie si la méthode est disponible sur un objet</td>
-</tr>
-					<tr>
-<td><span class="new_code">TrueExpectation</span></td>
-<td>Accepte n'importe quelle variable PHP qui vaut vrai</td>
-</tr>
-                    <tr>
-<td><span class="new_code">FalseExpectation</span></td>
-<td>Accepte n'importe quelle variable PHP qui vaut faux</td>
-</tr>
-                </tbody></table>
-                La plupart utilisent la valeur attendue dans le constructeur.
-                Les exceptions sont les vérifications sur motif,
-                qui utilisent une expression rationnelle, ainsi que
-                <span class="new_code">IsAExpectation</span> et <span class="new_code">NotAExpectation</span>,
-                qui prennent un type ou un nom de classe comme chaîne.
-            </p>
-        
-        <h2>
-<a class="target" name="comportement"></a>Utiliser les attentes pour contrôler les bouchons serveur</h2>
-            <p>
-                Les classes attente peuvent servir à autre chose
-                que l'envoi d'assertions depuis les objets fantaisie,
-                afin de choisir le comportement d'un
-                <a href="mock_objects_documentation.html">objet fantaisie</a>
-                ou celui d'un <a href="server_stubs_documentation.html">bouchon serveur</a>.
-                A chaque fois qu'une liste d'arguments est donnée,
-                une liste d'objets d'attente peut être insérée à la place.
-            </p>
-            <p>
-                Mettons que nous voulons qu'un bouchon serveur
-                d'autorisation simule une connexion réussie seulement
-                si il reçoit un objet de session valide.
-                Nous pouvons y arriver avec ce qui suit...
-<pre>
-Stub::generate('Authorisation');
-<strong>
-$authorisation = new StubAuthorisation();
-$authorisation-&gt;returns(
-        'isAllowed',
-        true,
-        array(new IsAExpectation('Session', 'Must be a session')));
-$authorisation-&gt;returns('isAllowed', false);</strong>
-</pre>
-                Le comportement par défaut du bouchon serveur
-                est défini pour renvoyer <span class="new_code">false</span>
-                quand <span class="new_code">isAllowed</span> est appelé.
-                Lorsque nous appelons cette méthode avec un unique paramètre
-                qui est un objet <span class="new_code">Session</span>, il renverra <span class="new_code">true</span>.
-                Nous avons aussi ajouté un deuxième paramètre comme message.
-                Il sera affiché dans le message d'erreur de l'objet fantaisie
-                si l'attente est la cause de l'échec.
-            </p>
-            <p>
-                Ce niveau de sophistication est rarement utile :
-                il n'est inclut que pour être complet.
-            </p>
-        
-        <h2>
-<a class="target" name="etendre"></a>Créer vos propres attentes</h2>
-            <p>
-                Les classes d'attentes ont une structure très simple.
-                Tellement simple qu'il devient très simple de créer
-                vos propres version de logique pour des tests utilisés couramment.
-            </p>
-            <p>
-                Par exemple voici la création d'une classe pour tester
-                la validité d'adresses IP. Pour fonctionner correctement
-                avec les bouchons serveurs et les objets fantaisie,
-                cette nouvelle classe d'attente devrait étendre
-                <span class="new_code">SimpleExpectation</span> ou une autre de ses sous-classes...
-<pre>
-<strong>class ValidIp extends SimpleExpectation {
-    
-    function test($ip) {
-        return (ip2long($ip) != -1);
-    }
-    
-    function testMessage($ip) {
-        return "Address [$ip] should be a valid IP address";
-    }
-}</strong>
-</pre> 
-               Il n'y a véritablement que deux méthodes à mettre en place.
-               La méthode <span class="new_code">test()</span> devrait renvoyer un <span class="new_code">true</span>
-               si l'attente doit passer, et une erreur <span class="new_code">false</span>
-               dans le cas contraire. La méthode <span class="new_code">testMessage()</span>
-               ne devrait renvoyer que du texte utile à la compréhension du test en lui-même.
-            </p>
-            <p>
-                Cette classe peut désormais être employée à la place
-                des classes d'attente précédentes.
-            </p>
-			<p>
-				Voici un exemple plus typique, vérifier un hash...
-<pre>
-<strong>class JustField extends EqualExpectation {
-    private $key;
-    
-    function __construct($key, $expected) {
-        parent::__construct($expected);
-        $this-&gt;key = $key;
-    }
-    
-    function test($compare) {
-        if (! isset($compare[$this-&gt;key])) {
-            return false;
-        }
-        return parent::test($compare[$this-&gt;key]);
-    }
-    
-    function testMessage($compare) {
-        if (! isset($compare[$this-&gt;key])) {
-            return 'Key [' . $this-&gt;key . '] does not exist';
-        }
-        return 'Key [' . $this-&gt;key . '] -&gt; ' .
-                parent::testMessage($compare[$this-&gt;key]);
-    }
-}</strong>
-</pre>
-                L'habitude a été prise pour séparer les clauses du message avec
-                "&amp;nbsp;-&gt;&amp;nbsp;".
-				Cela permet aux outils dérivés de reformater la sortie.
-            </p>
-            <p>
-                Supposons qu'un authentificateur s'attend à recevoir
-				une ligne de base de données correspondant à l'utilisateur,
-				et que nous avons juste besoin de valider le nom d'utilisateur.
-				Nous pouvons le faire très simplement avec... 
-<pre>
-$mock-&gt;expectOnce('authenticate',
-                  array(new JustKey('username', 'marcus')));
-</pre>
-            </p>
-        
-        <h2>
-<a class="target" name="unitaire"></a>Sous le capot du testeur unitaire</h2>
-            <p>
-                Le <a href="http://sourceforge.net/projects/simpletest/">framework
-                de test unitaire SimpleTest</a> utilise aussi dans son coeur
-                des classes d'attente pour
-                la <a href="unit_test_documentation.html">classe UnitTestCase</a>.
-                Nous pouvons aussi tirer parti de ces mécanismes pour réutiliser
-                nos propres classes attente à l'intérieur même des suites de test.
-            </p>
-            <p>
-                La méthode la plus directe est d'utiliser la méthode
-                <span class="new_code">SimpleTest::assert()</span> pour effectuer le test...
-<pre>
-<strong>class TestOfNetworking extends UnitTestCase {
-    ...
-    function testGetValidIp() {
-        $server = &amp;new Server();
-        $this-&gt;assert(
-                new ValidIp(),
-                $server-&gt;getIp(),
-                'Server IP address-&gt;%s');
-    }
-}</strong>
-</pre>
-                <span class="new_code">assert()</span> testera toute attente directement.
-            </p>
-			<p>
-				C'est plutôt sale par rapport à notre syntaxe habituelle
-                du type <span class="new_code">assert...()</span>.
-            </p>
-            <p>
-                Pour un cas aussi simple, nous créons d'ordinaire une méthode
-                d'assertion distincte en utilisant la classe d'attente.
-                Supposons un instant que notre attente soit un peu plus
-                compliquée et que par conséquent nous souhaitions la réutiliser,
-                nous obtenons...
-<pre>
-class TestOfNetworking extends UnitTestCase {
-    ...<strong>
-    function assertValidIp($ip, $message = '%s') {
-        $this-&gt;assertExpectation(new ValidIp(), $ip, $message);
-    }</strong>
-    
-    function testGetValidIp() {
-        $server = &amp;new Server();<strong>
-        $this-&gt;assertValidIp(
-                $server-&gt;getIp(),
-                'Server IP address-&gt;%s');</strong>
-    }
-}
-</pre>
-                It is rare to need the expectations for more than pattern
-                matching, but these facilities do allow testers to build
-                some sort of domain language for testing their application.
-                Also, complex expectation classes could make the tests
-                harder to read and debug.
-                In effect extending the test framework to create their own tool set.
-            
-			
-                Il est assez rare que le besoin d'une attente dépasse
-                le stade de la reconnaissance d'un motif, mais ils permettent
-				aux testeurs de construire leur propre langage dédié ou DSL
-				(Domain Specific Language) pour tester leurs applications.
-                Attention, les classes d'attente complexes peuvent rendre
-                les tests difficiles à lire et à déboguer.
-                Ces mécanismes sont véritablement là pour les auteurs
-                de système qui étendront le framework de test
-                pour leurs propres outils de test.
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            La page du projet SimpleTest sur
-            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            La page de téléchargement de SimpleTest sur
-            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-<li>
-            Les attentes imitent les contraintes dans
-            <a href="http://www.jmock.org/">JMock</a>.
-        </li>
-<li>
-            <a href="http://simpletest.org/api/">L'API complète pour SimpleTest</a>
-            réalisé avec PHPDoc.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/fr/form_testing_documentation.html b/3rdparty/simpletest/docs/fr/form_testing_documentation.html
deleted file mode 100644
index e3cb6a10a19..00000000000
--- a/3rdparty/simpletest/docs/fr/form_testing_documentation.html
+++ /dev/null
@@ -1,363 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Documentation SimpleTest : tester des formulaires HTML</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Documentation sur les tests de formulaire</h1>
-        This page...
-        <ul>
-<li>
-            Modifier les valeurs d'un formulaire et
-            <a href="#submit">réussir à transmettre un simple formulaire</a>
-        </li>
-<li>
-            Gérer des <a href="#multiple">objets à valeurs multiples</a>
-            en initialisant des listes.
-        </li>
-<li>
-            Le cas des formulaires utilisant Javascript pour
-            modifier <a href="#hidden-field">un champ caché</a>
-        </li>
-<li>
-            <a href="#brut">Envoi brut</a> quand il n'existe pas de bouton à cliquer.
-        </li>
-</ul>
-<div class="content">
-        <h2>
-<a class="target" name="submit"></a>Valider un formulaire simple</h2>
-            <p>
-                Lorsqu'une page est téléchargée par <span class="new_code">WebTestCase</span>
-                en utilisant <span class="new_code">get()</span> ou <span class="new_code">post()</span>
-                le contenu de la page est automatiquement analysé.
-                De cette analyse découle le fait que toutes les commandes
-                à l'intérieur de la balise &lt;form&gt; sont disponibles
-                depuis l'intérieur du scénario de test.
-                Prenons par exemple cet extrait de code HTML...
-<pre>
-&lt;form&gt;
-    &lt;input type="text" name="a" value="A default" /&gt;
-    &lt;input type="submit" value="Go" /&gt;
-&lt;/form&gt;
-</pre>
-                Il ressemble à...
-            </p>
-            <p>
-                <form class="demo">
-                    <input type="text" name="a" value="A default">
-                    <input type="submit" value="Go">
-                </form>
-            </p>
-            <p>
-                Nous pouvons naviguer vers ce code, via le site
-                <a href="http://www.lastcraft.com/form_testing_documentation.php">LastCraft</a>,
-                avec le test suivant...
-<pre>
-class SimpleFormTests extends WebTestCase {<strong>
-    function testDefaultValue() {
-        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
-        $this-&gt;assertField('a', 'A default');
-    }</strong>
-}
-</pre>
-                Directement après le chargement de la page toutes les commandes HTML
-                sont initiées avec leur valeur par défaut, comme elles apparaîtraient
-                dans un navigateur web. L'assertion teste qu'un objet HTML
-                avec le nom "a" existe dans la page
-                et qu'il contient la valeur "A default".
-            </p>
-            <p>
-                Nous pourrions retourner le formulaire tout de suite...
-<pre>
-class SimpleFormTests extends WebTestCase {
-    function testDefaultValue() {
-        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
-        $this-&gt;assertField('a', <strong>new PatternExpectation('/default/')</strong>);
-    }
-}
-</pre>
-                Mais d'abord nous allons changer la valeur du champ texte.
-                Ce n'est qu'après que nous le transmettrons...
-<pre>
-class SimpleFormTests extends WebTestCase {
-
-    function testDefaultValue() {
-        $this-&gt;get('http://www.my-site.com/');
-        $this-&gt;assertField('a', 'A default');<strong>
-        $this-&gt;setField('a', 'New value');
-        $this-&gt;clickSubmit('Go');</strong>
-    }
-}
-</pre>
-                Parce que nous n'avons spécifié ni attribut "method"
-                sur la balise form, ni attribut "action",
-                le scénario de test suivra le comportement classique d'un navigateur :
-                transmission des données avec une requête <em>GET</em>
-                vers la même page. En règle générale SimpleTest essaie d'émuler
-                le comportement typique d'un navigateur autant que possible,
-                plutôt que d'essayer d'attraper des attributs manquants sur les balises.
-                La raison est simple : la cible d'un framework de test est
-                la logique d'une application PHP, pas les erreurs
-                -- de syntaxe ou autres -- du code HTML.
-                Pour les erreurs HTML, d'autres outils tel
-				<a href="http://www.w3.org/People/Raggett/tidy/">HTMLTidy</a>
-                devraient être employés, ou même n'importe lequel des validateurs HTML et CSS
-				déjà sur le marché.
-            </p>
-            <p>
-                Si un champ manque dans n'importe quel formulaire ou si
-                une option est indisponible alors <span class="new_code">WebTestCase::setField()</span>
-                renverra <span class="new_code">false</span>. Par exemple, supposons que
-                nous souhaitons vérifier qu'une option "Superuser"
-                n'est pas présente dans ce formulaire...
-<pre>
-<strong>Select type of user to add:</strong>
-&lt;select name="type"&gt;
-    &lt;option&gt;Subscriber&lt;/option&gt;
-    &lt;option&gt;Author&lt;/option&gt;
-    &lt;option&gt;Administrator&lt;/option&gt;
-&lt;/select&gt;
-</pre>
-                Qui ressemble à...
-            </p>
-            <p>
-                <form class="demo">
-                    <strong>Select type of user to add:</strong>
-                    <select name="type">
-                        <option>Subscriber</option>
-                        <option>Author</option>
-                        <option>Administrator</option>
-                    </select>
-                </form>
-            </p>
-            <p>
-                Le test suivant le confirmera...
-<pre>
-class SimpleFormTests extends WebTestCase {
-    ...
-    function testNoSuperuserChoiceAvailable() {<strong>
-        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
-        $this-&gt;assertFalse($this-&gt;setField('type', 'Superuser'));</strong>
-    }
-}
-</pre>
-                La sélection ne sera pas changée si la nouvelle valeur n'est pas une des options.
-            </p>
-            <p>
-                Voici la liste complète des objets supportés à aujourd'hui...
-                <ul>
-                    <li>Champs texte, y compris les champs masqués (hidden) ou cryptés (password).</li>
-                    <li>Boutons submit, en incluant aussi la balise button, mais pas encore les boutons reset</li>
-                    <li>Aires texte (textarea) avec leur gestion des retours à la ligne (wrap).</li> 
-                    <li>Cases à cocher, y compris les cases à cocher multiples dans un même formulaire.</li>
-                    <li>Listes à menu déroulant, y compris celles à sélections multiples.</li>
-                    <li>Boutons radio.</li>
-                    <li>Images.</li>
-                </ul>
-            </p>
-            <p>
-                Le navigateur proposé par SimpleTest émule les actions
-                qui peuvent être réalisées par un utilisateur sur
-                une page HTML standard. Javascript n'est pas supporté et
-                il y a peu de chance pour qu'il le soit prochainement.
-            </p>
-            <p>
-                Une attention particulière doit être porté aux techniques Javascript
-                qui changent la valeur d'un champ caché : elles ne peuvent pas être
-                réalisées avec les commandes classiques de SimpleTest.
-                Une méthode alternative est proposée plus loin.
-            </p>
-        
-        <h2>
-<a class="target" name="multiple"></a>Champs à valeurs multiples</h2>
-            <p>
-                SimpleTest peut gérer deux types de commandes à valeur multiple :
-                les menus déroulants à sélection multiple et les cases à cocher
-                avec le même nom à l'intérieur même d'un formulaire.
-                La nature de ceux-ci implique que leur initialisation
-                et leur test sont légèrement différents.
-                Voici un exemple avec des cases à cocher...
-<pre>
-&lt;form class="demo"&gt;
-    <strong>Create privileges allowed:</strong>
-    &lt;input type="checkbox" name="crud" value="c" checked&gt;&lt;br&gt;
-    <strong>Retrieve privileges allowed:</strong>
-    &lt;input type="checkbox" name="crud" value="r" checked&gt;&lt;br&gt;
-    <strong>Update privileges allowed:</strong>
-    &lt;input type="checkbox" name="crud" value="u" checked&gt;&lt;br&gt;
-    <strong>Destroy privileges allowed:</strong>
-    &lt;input type="checkbox" name="crud" value="d" checked&gt;&lt;br&gt;
-    &lt;input type="submit" value="Enable Privileges"&gt;
-&lt;/form&gt;
-</pre>
-                Qui se traduit par...
-            </p>
-            <p>
-                <form class="demo">
-                    <strong>Create privileges allowed:</strong>
-                    <input type="checkbox" name="crud" value="c" checked><br>
-                    <strong>Retrieve privileges allowed:</strong>
-                    <input type="checkbox" name="crud" value="r" checked><br>
-                    <strong>Update privileges allowed:</strong>
-                    <input type="checkbox" name="crud" value="u" checked><br>
-                    <strong>Destroy privileges allowed:</strong>
-                    <input type="checkbox" name="crud" value="d" checked><br>
-                    <input type="submit" value="Enable Privileges">
-                </form>
-            </p>
-            <p>
-                Si nous souhaitons désactiver tous les privilèges sauf
-                ceux de téléchargement (Retrieve) et transmettre cette information,
-                nous pouvons y arriver par...
-<pre>
-class SimpleFormTests extends WebTestCase {
-    ...<strong>
-    function testDisableNastyPrivileges() {
-        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
-        $this-&gt;assertField('crud', array('c', 'r', 'u', 'd'));
-        $this-&gt;setField('crud', array('r'));
-        $this-&gt;clickSubmit('Enable Privileges');
-    }</strong>
-}
-</pre>
-                Plutôt que d'initier le champ à une valeur unique,
-                nous lui donnons une liste de valeurs.
-                Nous faisons la même chose pour tester les valeurs attendues.
-                Nous pouvons écrire d'autres bouts de code de test
-                pour confirmer cet effet, peut-être en nous connectant
-                comme utilisateur et en essayant d'effectuer une mise à jour.
-            </p>
-        
-        <h2>
-<a class="target" name="hidden-field"></a>Formulaires utilisant Javascript pour changer un champ caché</h2>
-            <p>
-                Si vous souhaitez tester un formulaire dépendant de Javascript
-                pour la modification d'un champ caché, vous ne pouvez pas
-                simplement utiliser setField().
-                Le code suivant <em>ne fonctionnera pas</em> :
-<pre>
-class SimpleFormTests extends WebTestCase {
-    function testEmulateMyJavascriptForm() {
-        <strong>// This does *not* work</strong>
-        $this-&gt;setField('a_hidden_field', '123');
-        $this-&gt;clickSubmit('OK');
-    }
-}
-</pre>
-                A la place, vous aurez besoin d'ajouter le paramètre supplémentaire
-                du formulaire à la méthode clickSubmit() :
-<pre>
-class SimpleFormTests extends WebTestCase {
-    function testMyJavascriptForm() {
-        <strong>$this-&gt;clickSubmit('OK', array('a_hidden_field'=&gt;'123'));</strong>
-    }
-
-}
-</pre>
-            </p>
-            <p>
-                N'oubliez pas que de la sorte, vous êtes effectivement en train
-                de court-circuitez une partie de votre application (le code Javascript
-                dans le formulaire) et que peut-être serait-il plus prudent
-                d'utiliser un outil comme
-                <a href="http://selenium.openqa.org/">Selenium</a> pour mettre sur pied
-                un test complet.
-            </p>
-        
-        <h2>
-<a class="target" name="brut"></a>Envoi brut</h2>
-            <p>
-                Si vous souhaitez tester un gestionnaire de formulaire
-                mais que vous ne l'avez pas écrit ou que vous n'y avez
-                pas encore accès, vous pouvez créer un envoi de formulaire à la main.
-<pre>
-class SimpleFormTests extends WebTestCase {
-    ...<strong>    
-    function testAttemptedHack() {
-        $this-&gt;post(
-                'http://www.my-site.com/add_user.php',
-                array('type' =&gt; 'superuser'));
-        $this-&gt;assertNoUnwantedPattern('/user created/i');
-    }</strong>
-}
-</pre>
-                En ajoutant des données à la méthode <span class="new_code">WebTestCase::post()</span>,
-                nous émulons la transmission d'un formulaire.
-				D'ordinaire, vous ne ferez cela que pour parer au plus pressé,
-				ou alors si vous espérez un tiers (javascript ?) transmette le formulaire.
-				Il reste quand même exception : si vous souhaitez vous protégez
-				d'attaques de type "spoofing".  
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            La page du projet SimpleTest sur
-            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            La page de téléchargement de SimpleTest sur
-            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-<li> 
-           <a href="http://simpletest.org/api/">L'API du développeur pour SimpleTest</a>
-           donne tous les détails sur les classes et les assertions disponibles.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/fr/group_test_documentation.html b/3rdparty/simpletest/docs/fr/group_test_documentation.html
deleted file mode 100644
index fb546af4603..00000000000
--- a/3rdparty/simpletest/docs/fr/group_test_documentation.html
+++ /dev/null
@@ -1,265 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Documentation SimpleTest : Grouper des tests</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Documentation sur le groupement des tests</h1>
-        This page...
-        <ul>
-<li>
-            Plusieurs approches pour <a href="#group">grouper des tests</a> ensemble.
-        </li>
-<li>
-            Combiner des groupes des tests dans des
-            <a href="#plus-haut">groupes plus grands</a>.
-        </li>
-</ul>
-<div class="content">
-        <h2>
-<a class="target" name="grouper"></a>Grouper des tests</h2>
-            <p>
-                Il existe beaucoup de moyens pour grouper des tests dans des suites de tests.
-                Le premier d'entre eux est tout simplement ajouter tous les scénarios de test
-				au fur et à mesure d'un unique fichier...
-<pre>
-<strong>&lt;?php
-require_once(dirname(__FILE__) . '/simpletest/autorun.php');
-require_once(dirname(__FILE__) . '/../classes/io.php');
-
-class FileTester extends UnitTestCase {
-    ...
-}
-
-class SocketTester extends UnitTestCase {
-    ...
-}
-?&gt;</strong>
-</pre>
-                Autant de scénarios que nécessaires peuvent être
-                mis dans cet unique fichier. Ils doivent contenir
-                tout le code nécessaire, entre autres la bibliothèque testée,
-                mais aucune des bibliothèques de SimpleTest.
-            </p>
-			<p>
-				Occasionnellement des sous-classes spéciales sont créés pour
-				ajouter des méthodes nécessaires à certains tests spécifiques
-				au sein de l'application.
-                Ces nouvelles classes de base sont ensuite utilisées
-				à la place de <span class="new_code">UnitTestCase</span>
-                ou de <span class="new_code">WebTestCase</span>.
-                Bien sûr vous ne souhaitez pas les lancer en tant que
-				scénario de tests : il suffit alors de les identifier
-				comme "abstraites"...
-<pre>
-<strong>abstract</strong> class MyFileTestCase extends UnitTestCase {
-    ...
-}
-
-class FileTester extends MyFileTestCase { ... }
-
-class SocketTester extends UnitTestCase { ... }
-</pre>
-                La classe <span class="new_code">FileTester</span> ne contient aucun test véritable,
-                il s'agit d'une classe de base pour d'autres scénarios de test.
-			</p>
-			<p>
-                Nous appelons ce fichier <em>file_test.php</em>.
-				Pour l'instant les scénarios de tests sont simplement groupés dans le même fichier.
-                Nous pouvons mettre en place des structures plus importantes
-				en incluant d'autres fichiers de tests.
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-require_once('file_test.php');
-?&gt;
-</pre>
-				Ceci fontionnera, tout en créant une hiérarchie tout à fait plate.
-                A la place, nous créons un fichier de suite de tests.
-                Notre suite des tests de premier niveau devient...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-class AllFileTests extends TestSuite {
-    function __construct() {
-        parent::__construct();
-        <strong>$this-&gt;addFile('file_test.php');</strong>
-    }
-}
-?&gt;
-</pre>
-				Voici ce qui arrive : la class <span class="new_code">TestSuite</span>
-                effecturera le <span class="new_code">require_once()</span> pour nous.
-				Ensuite elle vérifie si de nouvelles classes de test
-				ont été créées par ce nouveau fichier et les inclut
-				automatiquement dans la suite de tests.
-				Cette méthode nous donne un maximum de contrôle
-				tout comme le ferait des ajouts manuels de fichiers de tests
-				au fur et à mesure où notre suite grandit.
-            </p>
-            <p>
-                Si c'est trop de boulot pour vos petits doigts et qu'en plus
-				vous avez envie de grouper vos suites de tests par répertoire
-				ou par un tag dans le nom des fichiers, alors il y a un moyen
-				encore plus automatique... 
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-class AllFileTests extends TestSuite {
-    function __construct() {
-        parent::__construct();
-        $this-&gt;collect(dirname(__FILE__) . '/unit',
-                       new SimplePatternCollector('/_test.php/'));
-    }
-}
-?&gt;
-</pre>
-				Cette fonctionnalités va scanner un répertoire appelé "unit",
-				y détecter tous les fichiers finissant par "_test.php"
-				et les charger.
-                Vous n'avez pas besoin d'utiliser <span class="new_code">SimplePatternCollector</span> pour
-				filtrer en fonction d'un motif dans le nom de fichier,
-				mais c'est son usage le plus courant. 
-            </p>
-			<p>
-                Ce morceau de code est très courant.
-				Désormais la seule chose qu'il vous reste à faire, c'est de
-				déposer un fichier avec des scénarios de tests dans ce répertoire
-				et il sera lancé directement par le script de la suite de tests. 
-            </p>
-			<p>
-                Juste un bémol : vous ne pouvez pas contrôler l'ordre de lancement
-				des tests.
-				Si vous souhaitez voir des composants de bas niveau renvoyer leurs erreurs
-				dès le début de la suite de tests - en particulier pour se facilier le travail
-				de diagnostic - alors vous devriez plutôt passer par <span class="new_code">addFile()</span>
-				pour ces cas spécifiques.
-                Les scénarios de tests ne sont chargés qu'une fois, pas d'inquiétude donc
-				lors du scan de votre répertoire avec tous les tests.
-            </p>
-			<p>
-                Les tests chargés avec la méthode <span class="new_code">addFile</span> ont certaines propriétés
-				qui peuvent s'avérer intéressantes.
-				Elle vous assure que le constructeur est lancé avant la première méthode
-				de test et que le destructeur est lancé après la dernière méthode de test.
-				Cela vous permet de placer une initialisation (setUp et tearDown) globale
-				au sein de ce destructeur et desctructeur, comme dans n'importe
-				quelle classe. 
-            </p>
-        
-        <h2>
-<a class="target" name="plus-haut"></a>Groupements de plus haut niveau</h2>
-			<p>
-                La technique ci-dessus place tous les scénarios de test
-                dans un unique et grand groupe.
-                Sauf que pour des projets plus conséquents,
-                ce n'est probablement pas assez souple;
-                vous voudriez peut-être grouper les tests tout à fait différemment.
-            </p>
-<p>
-                Tout ce que nous avons décrit avec des scripts de tests 
-				s'applique pareillement avec des <span class="new_code">TestSuite</span>s...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-<strong>
-class BigTestSuite extends TestSuite {
-    function __construct() {
-        parent::__construct();
-        $this-&gt;addFile('file_tests.php');
-    }
-}</strong>
-?&gt;
-</pre>
-				Cette opération additionne nos scénarios de tests et une unique suite
-				sous la première.
-                Quand un test échoue, nous voyons le fil d'ariane avec l'enchainement.
-                Nous pouvons même mélanger groupes et tests librement en prenant
-				quand même soin d'éviter les inclusions en boucle.
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-class BigTestSuite extends TestSuite {
-    function __construct() {
-        parent::__construct();
-        $this-&gt;addFile('file_tests.php');
-        <strong>$this-&gt;addFile('some_other_test.php');</strong>
-    }
-}
-?&gt;
-</pre>
-                Petite précision, en cas de double inclusion, seule la première instance
-				sera lancée. 
-            </p>
-		
-    </div>
-        References and related information...
-        <ul>
-<li>
-            La page du projet SimpleTest sur
-            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            La page de téléchargement de SimpleTest sur
-            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/fr/index.html b/3rdparty/simpletest/docs/fr/index.html
deleted file mode 100644
index f7e022c36ec..00000000000
--- a/3rdparty/simpletest/docs/fr/index.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>
-        Prise en main rapide de SimpleTest pour PHP -
-        Tests unitaire et objets fantaisie pour PHP
-    </title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Prise en main rapide de SimpleTest</h1>
-        This page...
-        <ul>
-<li>
-            <a href="#unit">Utiliser le testeur rapidement</a>
-            avec un exemple.
-        </li>
-<li>
-            <a href="#group">Groupes de tests</a>
-            pour tester en un seul clic.
-        </li>
-<li>
-            <a href="#mock">Utiliser les objets fantaisie</a>
-            pour faciliter les tests et gagner en contrôle.
-        </li>
-<li>
-            <a href="#web">Tester des pages web</a>
-            au niveau de l'HTML.
-        </li>
-</ul>
-<div class="content">
-        
-            <p>
-                Le présent article présuppose que vous soyez familier avec
-                le concept de tests unitaires ainsi que celui de développement
-                web avec le langage PHP. Il s'agit d'un guide pour le nouvel
-                et impatient utilisateur de
-                <a href="https://sourceforge.net/project/showfiles.php?group_id=76550">SimpleTest</a>.
-                Pour une documentation plus complète, particulièrement si
-                vous découvrez les tests unitaires, consultez la
-                <a href="http://www.lastcraft.com/unit_test_documentation.php">documentation
-                en cours</a>, et pour des exemples de scénarios de test,
-                consultez le
-                <a href="http://www.lastcraft.com/first_test_tutorial.php">tutorial
-                sur les tests unitaires</a>.
-            </p>
-        
-        <h2>
-<a class="target" name="unit"></a>Utiliser le testeur rapidement</h2>
-            <p>
-                Parmi les outils de test pour logiciel, le testeur unitaire
-                est le plus proche du développeur. Dans un contexte de
-                développement agile, le code de test se place juste à côté
-                du code source étant donné que tous les deux sont écrits
-                simultanément. Dans ce contexte, SimpleTest aspire à être
-                une solution complète de test pour un développeur PHP et
-                s'appelle "Simple" parce qu'elle devrait être simple à
-                utiliser et à étendre. Ce nom n'était pas vraiment un bon
-                choix. Non seulement cette solution inclut toutes les
-                fonctions classiques qu'on est en droit d'attendre de la
-                part des portages de <a href="http://www.junit.org/">JUnit</a> et des <a href="http://sourceforge.net/projects/phpunit/">PHPUnit</a>,
-                mais elle inclut aussi les <a href="http://www.mockobjects.com/">objets fantaisie ou
-                "mock objects"</a>.
-            </p>
-            <p>
-                Ce qui rend cet outil immédiatement utile pour un développeur PHP,
-                c'est son navigateur web interne.
-                Il permet des tests qui parcourent des sites web, remplissent
-                des formulaires et testent le contenu des pages.
-                Etre capable d'écrire ces tests en PHP veut dire qu'il devient
-                facile d'écrire des tests de recette (ou d'intégration).
-                Un exemple serait de confirmer qu'un utilisateur a bien été ajouté
-                dans une base de données après s'être enregistré sur une site web.
-            </p>
-            <p>
-                La démonstration la plus rapide : l'exemple
-            </p>
-            <p>
-                Supposons que nous sommes en train de tester une simple
-                classe de log dans un fichier : elle s'appelle
-                <span class="new_code">Log</span> dans <em>classes/Log.php</em>. Commençons
-                par créer un script de test, appelé
-                <em>tests/log_test.php</em>. Son contenu est le suivant...
-<pre>
-&lt;?php
-<strong>require_once('simpletest/autorun.php');</strong>
-require_once('../classes/log.php');
-
-class TestOfLogging extends <strong>UnitTestCase</strong> {
-}
-?&gt;
-</pre>
-                Ici le répertoire <em>simpletest</em> est soit dans le
-                dossier courant, soit dans les dossiers pour fichiers
-                inclus. Vous auriez à éditer ces arborescences suivant
-                l'endroit où vous avez installé SimpleTest.
-                Le fichier "autorun.php" fait plus que juste inclure
-                les éléments de SimpleTest : il lance aussi les tests pour nous.  
-            </p>
-            <p>
-                <span class="new_code">TestOfLogging</span> est notre premier scénario de test
-                et il est pour l'instant vide.
-                Chaque scénario de test est une classe qui étend une des classes
-                de base de SimpleTest. Nous pouvons avoir autant de classes de ce type
-                que nous voulons.
-            </p>
-            <p>
-                Avec ces trois lignes d'échafaudage
-                l'inclusion de notre classe <span class="new_code">Log</span>, nous avons une suite
-                de tests. Mais pas encore de test !
-            </p>
-            <p>
-                Pour notre premier test, supposons que la classe <span class="new_code">Log</span>
-                prenne le nom du fichier à écrire au sein du constructeur,
-                et que nous avons un répertoire temporaire dans lequel placer
-                ce fichier.
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-require_once('../classes/log.php');
-
-class TestOfLogging extends UnitTestCase {
-    function <strong>testLogCreatesNewFileOnFirstMessage()</strong> {
-        @unlink('/temp/test.log');
-        $log = new Log('/temp/test.log');
-        <strong>$this-&gt;assertFalse(file_exists('/temp/test.log'));</strong>
-        $log-&gt;message('Should write this to a file');
-        <strong>$this-&gt;assertTrue(file_exists('/temp/test.log'));</strong>
-    }
-}
-?&gt;
-</pre>
-                Au lancement du scénario de test, toutes les méthodes qui
-                commencent avec la chaîne <span class="new_code">test</span> sont
-                identifiées puis exécutées.
-                Si la méthode commence par <span class="new_code">test</span>, c'est un test.
-                Remarquez bien le nom très long de notre exemple :
-                <span class="new_code">testLogCreatesNewFileOnFirstMessage()</span>.
-                C'est bel et bien délibéré : ce style est considéré désirable
-                et il rend la sortie du test plus lisible.
-            </p>
-            <p>
-                D'ordinaire nous avons bien plusieurs méthodes de tests.
-                Mais ce sera pour plus tard.
-            </p>
-            <p>
-                Les assertions dans les
-                méthodes de test envoient des messages vers le framework de
-                test qui affiche immédiatement le résultat. Cette réponse
-                immédiate est importante, non seulement lors d'un crash
-                causé par le code, mais aussi de manière à rapprocher
-                l'affichage de l'erreur au plus près du scénario de test
-                concerné via un appel à <span class="new_code">print</span>code&gt;.
-            </p>
-            <p>
-                Pour voir ces résultats lançons effectivement les tests.
-                Aucun autre code n'est nécessaire, il suffit d'ouvrir
-                la page dans un navigateur.
-            </p>
-            <p>
-                En cas échec, l'affichage ressemble à...
-                <div class="demo">
-                    <h1>TestOfLogging</h1>
-                    <span class="fail">Fail</span>: testcreatingnewfile-&gt;True assertion failed.<br>
-                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
-                    <strong>1</strong> passes and <strong>1</strong> fails.</div>
-                </div>
-                ...et si ça passe, on obtient...
-                <div class="demo">
-                    <h1>TestOfLogging</h1>
-                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
-                    <strong>2</strong> passes and <strong>0</strong> fails.</div>
-                </div>
-                Et si vous obtenez ça...
-                <div class="demo">
-                    <b>Fatal error</b>:  Failed opening required '../classes/log.php' (include_path='') in <b>/home/marcus/projects/lastcraft/tutorial_tests/Log/tests/log_test.php</b> on line <b>7</b>
-                </div>
-                c'est qu'il vous manque le fichier <em>classes/Log.php</em>
-                qui pourrait ressembler à : 
-<pre>
-&lt;?php<strong>
-class Log {
-    function Log($file_path) {
-    }
-
-    function message() {
-    }
-}</strong>
-?&gt;
-</pre>
-                C'est largement plus sympathique d'écrire le code après le test.
-                Plus que sympatique même - cette technique s'appelle
-                "Développement Piloté par les Tests" ou 
-                "Test Driven Development" en anglais.
-            </p>
-            <p>
-                Pour plus de renseignements sur le testeur, voyez la
-                <a href="unit_test_documentation.html">documentation pour les tests de régression</a>.
-            </p>
-        
-        <h2>
-<a class="target" name="group"></a>Construire des groupes de tests</h2>
-            <p>
-                Il est peu probable que dans une véritable application on
-                ait uniquement besoin de passer un seul scénario de test.
-                Cela veut dire que nous avons besoin de grouper les
-                scénarios dans un script de test qui peut, si nécessaire,
-                lancer tous les tests de l'application.
-            </p>
-            <p>
-                Notre première étape est de créer un nouveau fichier appelé
-                <em>tests/all_tests.php</em> et d'y inclure le code suivant...
-<pre>
-&lt;?php
-<strong>require_once('simpletest/autorun.php');</strong>
-
-class AllTests extends <strong>TestSuite</strong> {
-    function AllTests() {
-        $this-&gt;TestSuite(<strong>'All tests'</strong>);
-        <strong>$this-&gt;addFile('log_test.php');</strong>
-    }
-}
-?&gt;
-</pre>
-                L'inclusion de "autorun" permettra à notre future suite
-                de tests d'être lancée juste en invoquant ce script.
-            </p>
-            <p>
-                La sous-classe <span class="new_code">TestSuite</span> doit chaîner
-                son constructeur. Cette limitation sera supprimée dans
-                les versions à venir.   
-            </p>
-            <p>
-                The method <span class="new_code">TestSuite::addFile()</span>
-                will include the test case file and read any new classes
-                that are descended from <span class="new_code">SimpleTestCase</span>.
-
-                Cette méthode <span class="new_code">TestSuite::addTestFile()</span> va
-                inclure le fichier de scénarios de test et lire parmi
-                toutes les nouvelles classes créées celles qui sont issues
-                de <span class="new_code">SimpleTestCase</span>.
-                <span class="new_code">UnitTestCase</span> est juste un exemple de classe dérivée
-                depuis <span class="new_code">SimpleTestCase</span> et vous pouvez créer les vôtres.
-                <span class="new_code">TestSuite::addFile()</span> peut aussi inclure d'autres suites.
-            </p>
-            <p>
-                La classe ne sera pas encore instanciée.
-                Quand la suite de tests est lancée, elle construira chaque instance
-                une fois le test atteint, et le détuira juste ensuite.
-                Cela veut dire que le constructeur n'est lancé qu'une fois avant
-                chaque initialisation de ce scénario de test et que le destructeur
-                est lui aussi lancé avant que le test suivant ne commence.
-            </p>
-            <p>
-                Il est commun de grouper des scénarios de test dans des super-classes
-                qui ne sont pas sensées être lancées, mais qui deviennent une classe de base
-                pour d'autres tests.
-                Pour que "autorun" fonctionne proprement les fichiers
-                des scénarios de test ne devraient pas lancer aveuglement
-                d'autres extensions de scénarios de test qui ne lanceraient pas
-                effectivement des tests.
-                Cela pourrait aboutir à un mauvais comptages des scénarios de test
-                pendant la procédure.
-                Pas vraiement un problème majeure, mais pour éviter cet inconvénient
-                il suffit de marquer vos classes de base comme <span class="new_code">abstract</span>.
-                SimpleTest ne lance pas les classes abstraites. Et si vous utilisez encore
-                PHP4 alors une directive <span class="new_code">SimpleTestOptions::ignore()</span>
-                dans votre fichier de scénario de test aura le même effet.
-            </p>
-            <p>
-                Par ailleurs, le fichier avec le scénario de test ne devrait pas
-                avoir été inclus ailleurs. Sinon aucun scénario de test
-                ne sera inclus à ce groupe.
-                Ceci pourrait se transformer en un problème plus grave :
-                si des fichiers ont déjà été inclus par PHP alors la méthode
-                <span class="new_code">TestSuite::addFile()</span> ne les détectera pas.
-            </p>
-            <p>
-                Pour afficher les résultats, il est seulement nécessaire
-                d'invoquer <em>tests/all_tests.php</em> à partir du serveur
-                web.
-            </p>
-            <p>
-                Pour plus de renseignements des groupes de tests, voyez le
-                <a href="group_test_documentation.html">documentation sur le groupement des tests</a>.
-            </p>
-        
-        <h2>
-<a class="target" name="mock"></a>Utiliser les objets fantaisie</h2>
-            <p>
-                Avançons un peu plus dans le futur.
-            </p>
-            <p>
-                Supposons que notre class logging soit testée et terminée.
-                Supposons aussi que nous testons une autre classe qui ait
-                besoin d'écrire des messages de log, disons
-                <span class="new_code">SessionPool</span>. Nous voulons tester une méthode
-                qui ressemblera probablement à quelque chose comme...
-<pre><strong>
-class SessionPool {
-    ...
-    function logIn($username) {
-        ...
-        $this-&gt;_log-&gt;message('User $username logged in.');
-        ...
-    }
-    ...
-}
-</strong>
-</pre>
-                Avec le concept de "réutilisation de code" comme fil
-                conducteur, nous utilisons notre class <span class="new_code">Log</span>. Un
-                scénario de test classique ressemblera peut-être à...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-require_once('../classes/log.php');
-<strong>require_once('../classes/session_pool.php');</strong>
-
-class <strong>TestOfSessionLogging</strong> extends UnitTestCase {
-    
-    function setUp() {
-        <strong>@unlink('/temp/test.log');</strong>
-    }
-    
-    function tearDown() {
-        <strong>@unlink('/temp/test.log');</strong>
-    }
-    
-    function testLoggingInIsLogged() {
-        <strong>$log = new Log('/temp/test.log');
-        $session_pool = &amp;new SessionPool($log);
-        $session_pool-&gt;logIn('fred');</strong>
-        $messages = file('/temp/test.log');
-        $this-&gt;assertEqual($messages[0], "User fred logged in.<strong>\n</strong>");
-    }
-}
-?&gt;
-</pre>
-                Nous expliquerons les méthodes <span class="new_code">setUp()</span>
-                et <span class="new_code">tearDown()</span> plus tard.
-            </p>
-            <p>
-                Le design de ce scénario de test n'est pas complètement
-                mauvais, mais on peut l'améliorer. Nous passons du temps à
-                tripoter les fichiers de log qui ne font pas partie de
-                notre test.
-                Pire, nous avons créé des liens de proximité
-                entre la classe <span class="new_code">Log</span> et ce test. Que se
-                passerait-il si nous n'utilisions plus de fichiers, mais la
-                bibliothèque <em>syslog</em> à la place ?
-                
-                Cela veut dire que notre test <span class="new_code">TestOfSessionLogging</span>
-                enverra un échec alors même qu'il ne teste pas Logging.
-            </p>
-            <p>
-                Il est aussi fragile sur des petites retouches. Avez-vous
-                remarqué le retour chariot supplémentaire à la fin du
-                message ? A-t-il été ajouté par le loggueur ? Et si il
-                ajoutait aussi un timestamp ou d'autres données ?
-            </p>
-            <p>
-                L'unique partie à tester réellement est l'envoi d'un
-                message précis au loggueur.
-                Nous pouvons réduire le couplage en
-                créant une fausse classe de logging : elle ne fait
-                qu'enregistrer le message pour le test, mais ne produit
-                aucun résultat. Sauf qu'elle doit ressembler exactement à
-                l'original.
-            </p>
-            <p>
-                Si l'objet fantaisie n'écrit pas dans un fichier alors nous
-                nous épargnons la suppression du fichier avant et après le
-                test. Nous pourrions même nous épargner quelques lignes de
-                code supplémentaires si l'objet fantaisie pouvait exécuter
-                l'assertion.
-            <p>
-            </p>
-                Trop beau pour être vrai ? Pas vraiement on peut créer un tel
-                objet très facilement...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-require_once('../classes/log.php');
-require_once('../classes/session_pool.php');
-
-<strong>Mock::generate('Log');</strong>
-
-class TestOfSessionLogging extends UnitTestCase {
-    
-    function testLoggingInIsLogged() {<strong>
-        $log = &amp;new MockLog();
-        $log-&gt;expectOnce('message', array('User fred logged in.'));</strong>
-        $session_pool = &amp;new SessionPool(<strong>$log</strong>);
-        $session_pool-&gt;logIn('fred');
-    }
-}
-?&gt;
-</pre>
-                L'appel <span class="new_code">Mock::generate()</span> a généré
-                une nouvelle classe appelé <span class="new_code">MockLog</span>.
-                Cela ressemble à un clone identique, sauf que nous pouvons
-                y adjoindre du code de test.
-                C'est ce que fait <span class="new_code">expectOnce()</span>.
-                Cela dit que si <span class="new_code">message()</span> m'est appelé,
-                il a intérêt à l'être avec le paramètre
-                "User fred logged in.".
-            </p>
-            <p>
-                L'appel <span class="new_code">tally()</span> est nécessaire pour annoncer à
-                l'objet fantaisie qu'il n'y aura plus d'appels ultérieurs.
-                Sans ça l'objet fantaisie pourrait attendre pendant une
-                éternité l'appel de la méthode sans jamais prévenir le
-                scénario de test. Les autres tests sont déclenchés
-                automatiquement quand l'appel à <span class="new_code">message()</span> est
-                invoqué sur l'objet <span class="new_code">MockLog</span> par le code 
-                <span class="new_code">SessionPool::logIn()</span>.
-                L'appel <span class="new_code">mock</span> va déclencher une comparaison des
-                paramètres et ensuite envoyer le message "pass" ou "fail"
-                au test pour l'affichage. Des jokers peuvent être inclus
-                pour ne pas avoir à tester tous les paramètres d'un appel
-                alors que vous ne souhaitez qu'en tester un.
-            </p>
-            <p>
-                Les objets fantaisie dans la suite SimpleTest peuvent avoir
-                un ensemble de valeurs de sortie arbitraires, des séquences
-                de sorties, des valeurs de sortie sélectionnées à partir
-                des arguments d'entrée, des séquences de paramètres
-                attendus et des limites sur le nombre de fois qu'une
-                méthode peut être invoquée.
-            </p>
-            <p>
-                Pour que ce test fonctionne la librairie avec les objets
-                fantaisie doit être incluse dans la suite de tests, par
-                exemple dans <em>all_tests.php</em>.
-            </p>
-            <p>
-                Pour plus de renseignements sur les objets fantaisie, voyez le
-                <a href="mock_objects_documentation.html">documentation sur les objets fantaisie</a>.
-            </p>
-        
-        <h2>
-<a class="target" name="web"></a>Tester une page web</h2>
-            <p>
-                Une des exigences des sites web, c'est qu'ils produisent
-                des pages web. Si vous construisez un projet de A à Z et
-                que vous voulez intégrer des tests au fur et à mesure alors
-                vous voulez un outil qui puisse effectuer une navigation
-                automatique et en examiner le résultat. C'est le boulot
-                d'un testeur web.
-            </p>
-            <p>
-                Effectuer un test web via SimpleTest reste assez primitif :
-                il n'y a pas de javascript par exemple.
-                La plupart des autres opérations d'un navigateur sont simulées.
-            </p>
-            <p>
-                Pour vous donner une idée, voici un exemple assez trivial :
-                aller chercher une page web,
-                à partir de là naviguer vers la page "about"
-                et finalement tester un contenu déterminé par le client.
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-<strong>require_once('simpletest/web_tester.php');</strong>
-
-class TestOfAbout extends <strong>WebTestCase</strong> {
-    function testOurAboutPageGivesFreeReignToOurEgo() {
-        <strong>$this-&gt;get('http://test-server/index.php');
-        $this-&gt;click('About');
-        $this-&gt;assertTitle('About why we are so great');
-        $this-&gt;assertText('We are really great');</strong>
-    }
-}
-?&gt;
-</pre>
-                Avec ce code comme test de recette, vous pouvez vous
-                assurer que le contenu corresponde toujours aux
-                spécifications à la fois des développeurs et des autres
-                parties prenantes au projet.
-            </p>
-            <p>
-                Vous pouvez aussi naviguer à travers des formulaires...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-require_once('simpletest/web_tester.php');
-
-class TestOfRankings extends WebTestCase {
-    function testWeAreTopOfGoogle() {
-        $this-&gt;get('http://google.com/');
-        $this-&gt;setField('q', 'simpletest');
-        $this-&gt;click("I'm Feeling Lucky");
-        $this-&gt;assertTitle('SimpleTest - Unit Testing for PHP');
-    }
-}
-?&gt;
-</pre>
-                ...même si cela pourrait constituer une violation
-                des documents juridiques de Google(tm).
-            </p>
-            <p>
-                Pour plus de renseignements sur comment tester une page web, voyez la
-                <a href="web_tester_documentation.html">documentation sur tester des scripts web</a>.
-            </p>
-            <p>
-                <a href="http://sourceforge.net/projects/simpletest/"><img src="http://sourceforge.net/sflogo.php?group_id=76550&amp;type=5" width="210" height="62" border="0" alt="SourceForge.net Logo"></a>
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            <a href="https://sourceforge.net/project/showfiles.php?group_id=76550&amp;release_id=153280">Télécharger PHP SimpleTest</a>
-            depuis <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            L'<a href="http://simpletest.org/api/">API de SimpleTest pour développeur</a>
-            donne tous les détails sur les classes et assertions existantes.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/fr/mock_objects_documentation.html b/3rdparty/simpletest/docs/fr/mock_objects_documentation.html
deleted file mode 100644
index 97e2c86ee73..00000000000
--- a/3rdparty/simpletest/docs/fr/mock_objects_documentation.html
+++ /dev/null
@@ -1,933 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Documentation SimpleTest : les objets fantaise</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Documentation sur les objets fantaisie</h1>
-        This page...
-        <ul>
-<li>
-            <a href="#what">Que sont les objets fantaisie ?</a>
-        </li>
-<li>
-            <a href="#creation">Créer des objets fantaisie</a>.
-        </li>
-<li>
-            <a href="#expectations">Les objets fantaisie en tant que critiques</a> avec les attentes.
-        </li>
-</ul>
-<div class="content">
-        <h2>
-<a class="target" name="what"></a>Que sont les objets fantaisie ?</h2>
-            <p>
-                Les objets fantaisie - ou "mock objects" en anglais -
-                ont deux rôles pendant un scénario de test : acteur et critique.
-            </p>
-            <p>
-                Le comportement d'acteur est celui de simuler
-                des objets difficiles à initialiser ou trop consommateurs
-                en temps pendant un test.
-                Le cas classique est celui de la connexion à une base de données.
-                Mettre sur pied une base de données de test au lancement
-                de chaque test ralentirait considérablement les tests
-                et en plus exigerait l'installation d'un moteur
-                de base de données ainsi que des données sur la machine de test.
-                Si nous pouvons simuler la connexion
-                et renvoyer des données à notre guise
-                alors non seulement nous gagnons en pragmatisme
-                sur les tests mais en sus nous pouvons nourrir
-                notre base avec des données falsifiées
-                et voir comment il répond. Nous pouvons
-                simuler une base de données en suspens ou
-                d'autres cas extrêmes sans avoir à créer
-                une véritable panne de base de données.
-                En d'autres termes nous pouvons gagner
-                en contrôle sur l'environnement de test.
-            </p>
-            <p>
-                Si les objets fantaisie ne se comportaient que comme
-                des acteurs alors on les connaîtrait sous le nom de
-                <a href="server_stubs_documentation.html">bouchons serveur</a>.
-                Il s'agissait originairement d'un patron de conception
-                identifié par Robert Binder (<a href="">Testing
-                object-oriented systems</a>: models, patterns, and tools,
-                Addison-Wesley) en 1999.
-            </p>
-            <p>
-                Un bouchon serveur est une simulation d'un objet ou d'un composant.
-                Il doit remplacer exactement un composant dans un système
-                en vue d'effectuer des tests ou un prototypage,
-                tout en restant ultra-léger.
-                Il permet aux tests de s'exécuter plus rapidement, ou 
-                si la classe simulée n'a pas encore été écrite,
-                de se lancer tout court.
-            </p>
-            <p>
-                Cependant non seulement les objets fantaisie jouent
-                un rôle (en fournissant à la demande les valeurs requises)
-                mais en plus ils sont aussi sensibles aux messages qui
-                leur sont envoyés (par le biais d'attentes).
-                En posant les paramètres attendus d'une méthode
-                ils agissent comme des gardiens :
-                un appel sur eux doit être réalisé correctement.
-                Si les attentes ne sont pas atteintes ils nous épargnent
-                l'effort de l'écriture d'une assertion de test avec
-                échec en réalisant cette tâche à notre place.
-            </p>
-            <p>
-                Dans le cas d'une connexion à une base de données
-                imaginaire ils peuvent tester si la requête, disons SQL,
-                a bien été formé par l'objet qui utilise cette connexion.
-                Mettez-les sur pied avec des attentes assez précises
-                et vous verrez que vous n'aurez presque plus d'assertion à écrire manuellement.
-            </p>
-        
-        <h2>
-<a class="target" name="creation"></a>Créer des objets fantaisie</h2>
-            <p>
-                Tout ce dont nous avons besoin est une classe existante ou une interface,
-                par exemple une connexion à la base de données qui ressemblerait à...
-<pre>
-<strong>class DatabaseConnection {
-    function DatabaseConnection() { }
-    function query($sql) { }
-    function selectQuery($sql) { }
-}</strong>
-</pre>
-                Pour en créer sa version fantaisie nous devons juste
-				lancer le générateur...
-<pre>
-require_once('simpletest/autorun.php');
-require_once('database_connection.php');
-
-<strong>Mock::generate('DatabaseConnection');</strong>
-</pre>
-                Ce code génère une classe clone appelée <span class="new_code">MockDatabaseConnection</span>.
-                Cette nouvelle classe lui ressemble en tout point,
-                sauf qu'elle ne fait rien du tout.
-            </p>
-            <p>
-            	Cette nouvelle classe est génératlement
-            	une sous-classe de <span class="new_code">DatabaseConnection</span>.
-            	Malheureusement, il n'y as aucun moyen de créer une version fantaisie
-            	d'une classe avec une méthode <span class="new_code">final</span> sans avoir
-            	une version fonctionnelle de cette méthode.
-            	Ce n'est pas pas très satisfaisant.
-            	Si la cible est une interface ou si les méthodes <span class="new_code">final</span>
-            	existent dans la classe cible, alors une toute nouvelle classe
-            	est créée, elle implémente juste les même interfaces.
-            	Si vous essayer de faire passer cette classe à travers un indice de type
-            	qui spécifie le véritable nom de l'ancienne classe, alors il échouera.
-            	Du code qui forcerait un indice de type tout en utilisant
-            	des méthodes <span class="new_code">final</span> ne pourrait probablement pas être
-            	testé efficacement avec des objets fantaisie.
-            </p>
-            <p>
-                Si vous voulez voir le code généré, il suffit de faire un <span class="new_code">print</span>
-                de la sortie de <span class="new_code">Mock::generate()</span>.
-                VOici le code généré pour la classe <span class="new_code">DatabaseConnection</span>
-                à la place de son interface...
-<pre>
-class MockDatabaseConnection extends DatabaseConnection {
-    public $mock;
-    protected $mocked_methods = array('databaseconnection', 'query', 'selectquery');
-
-    function MockDatabaseConnection() {
-        $this-&gt;mock = new SimpleMock();
-        $this-&gt;mock-&gt;disableExpectationNameChecks();
-    }
-    ...
-    function DatabaseConnection() {
-        $args = func_get_args();
-        $result = &amp;$this-&gt;mock-&gt;invoke("DatabaseConnection", $args);
-        return $result;
-    }
-    function query($sql) {
-        $args = func_get_args();
-        $result = &amp;$this-&gt;mock-&gt;invoke("query", $args);
-        return $result;
-    }
-    function selectQuery($sql) {
-        $args = func_get_args();
-        $result = &amp;$this-&gt;mock-&gt;invoke("selectQuery", $args);
-        return $result;
-    }
-}
-</pre>
-                Votre sortie dépendra quelque peu de votre version précise de SimpleTest.
-            </p>
-            <p>
-                En plus des méthodes d'origine de la classe, vous en verrez d'autres
-                pour faciliter les tests.
-                Nous y reviendrons.
-            </p>
-            <p>
-                Nous pouvons désormais créer des instances de
-                cette nouvelle classe à l'intérieur même de notre scénario de test...
-<pre>
-require_once('simpletest/autorun.php');
-require_once('database_connection.php');
-
-Mock::generate('DatabaseConnection');
-
-class MyTestCase extends UnitTestCase {
-
-    function testSomething() {
-        <strong>$connection = new MockDatabaseConnection();</strong>
-    }
-}
-</pre>
-                La version fantaisie contient toutles méthodes de l'originale.
-                En outre, tous les indices de type seront préservés.
-                Dison que nos méthodes de requête attend un objet <span class="new_code">Query</span>...
-<pre>
-<strong>class DatabaseConnection {
-    function DatabaseConnection() { }
-    function query(Query $query) { }
-    function selectQuery(Query $query) { }
-}</strong>
-</pre>
-                Si nous lui passons le mauvais type d'objet
-                ou même pire un non-objet...
-<pre>
-class MyTestCase extends UnitTestCase {
-
-    function testSomething() {
-        $connection = new MockDatabaseConnection();
-        $connection-&gt;query('insert into accounts () values ()');
-    }
-}
-</pre>
-                ...alors le code renverra une violation de typage,
-                exactement comme on aurait pû s'y attendre
-                avec la classe d'origine.
-            </p>
-            <p>
-                Si la version fantaisie implémente bien toutes les méthodes
-                de l'originale, elle renvoit aussi systématiquement <span class="new_code">null</span>.
-                Et comme toutes les méthodes qui renvoient toujours <span class="new_code">null</span>
-                ne sont pas très utiles, nous avons besoin de leur faire dire
-                autre chose...
-            </p>
-        
-        <h2>
-<a class="target" name="bouchon"></a>Objets fantaisie en action</h2>
-            <p>
-                Changer le <span class="new_code">null</span> renvoyé par la méthode fantaisie
-                en autre chose est assez facile...
-<pre>
-<strong>$connection-&gt;returns('query', 37)</strong>
-</pre>
-                Désormais à chaque appel de <span class="new_code">$connection-&gt;query()</span>
-                nous obtenons un résultat de 37.
-                Il n'y a rien de particulier à cette valeur de 37.
-                Cette valeur de retour peut être aussi compliqué que nécessaire.
-            </p>
-            <p>
-                Ici les paramètres ne sont pas significatifs,
-                nous aurons systématiquement la même valeur en retour
-                une fois initialisés de la sorte.
-                Cela pourrait ne pas ressembler à une copie convaincante
-                de notre connexion à la base de données, mais pour
-                la demi-douzaine de lignes de code de notre méthode de test
-                c'est généralement largement assez.
-            </p>
-            <p>
-                Sauf que les choses ne sont pas toujours si simples.
-                Les itérateurs sont un problème récurrent, si par exemple
-                renvoyer systématiquement la même valeur entraine
-                une boucle infinie dans l'objet testé.
-                Pour ces cas-là, nous avons besoin d'une séquence de valeurs.
-				Supposons que nous avons un itérateur simple qui ressemble à...
-<pre>
-class Iterator {
-    function Iterator() { }
-    function next() { }
-}
-</pre>
-                Il s'agit là de l'itérateur le plus basique que nous puissions imaginer.
-                Supponsons que cet itérateur ne renvoit que du texte
-                jusqu'à ce qu'il atteigne la fin et qu'il renvoie alors un false,
-                nous pouvons le simuler avec...
-<pre>
-Mock::generate('Iterator');
-
-class IteratorTest extends UnitTestCase() {
-
-    function testASequence() {<strong>
-        $iterator = new MockIterator();
-        $iterator-&gt;returns('next', false);
-        $iterator-&gt;returnsAt(0, 'next', 'First string');
-        $iterator-&gt;returnsAt(1, 'next', 'Second string');</strong>
-        ...
-    }
-}
-</pre>
-                Quand <span class="new_code">next()</span> est appelé par le <span class="new_code">MockIterator</span>
-                il commencera par renvoyer "First string",
-                au deuxième passage "Second string" sera renvoyé
-                et sur n'importe quel autre appel <span class="new_code">false</span> sera renvoyé
-                à son tour.
-                Les valeurs renvoyées les unes après les autres auront la priorité
-                sur la valeur constante.
-                Cette dernière est la valeur par défaut en quelque sorte.
-            </p>
-            <p>
-                Une autre situation délicate serait une opération
-                <span class="new_code">get()</span> surchargée.
-                Un exemple serait un conteneur d'information avec des pairs clef/valeur.
-                Nous partons cette fois d'une classe de configuration telle...
-<pre>
-class Configuration {
-    function Configuration() { ... }
-    function get($key) { ... }
-}
-</pre>
-                C'est une situation courante pour utiliser des objets fantaisie,
-                étant donné que la véritable configuration sera différente
-                d'une machine à l'autre et parfois même d'un test à l'autre.
-                Cependant un problème apparaît quand toutes les données passent
-                par la méthode <span class="new_code">get()</span> et que nous souhaitons
-                quand même des résultats différents pour des clefs différentes.
-                Par chance les objets fantaisie ont un système de filtre...
-<pre>
-<strong>$config = &amp;new MockConfiguration();
-$config-&gt;returns('get', 'primary', array('db_host'));
-$config-&gt;returns('get', 'admin', array('db_user'));
-$config-&gt;returns('get', 'secret', array('db_password'));</strong>
-</pre>
-                Le dernier paramètre est une liste d'arguements
-                pour vérifier une correspondance.
-                Dans ce cas, nous essayons de faire correspondre un argument
-                qui se trouve être la clef de recherche.
-                Désormais quand l'objet fantaisie voit
-                sa méthode <span class="new_code">get()</span> invoquée...
-<pre>
-$config-&gt;get('db_user')
-</pre>
-                ...il renverra "admin".
-                Il trouve cette valeur en essayant de faire correspondre
-                l'argument reçu à ceux de ses propres listes : dès qu'une
-                correspondance complète est trouvé, il s'arrête.
-            </p>
-            <p>
-                Vous pouvez préciser un argument par défaut via...
-<pre><strong>
-$config-&gt;returns('get', false, array('*'));</strong>
-</pre>
-                Ce n'est pas la même chose que de définir la valeur renvoyée
-                sans aucun arguement...
-<pre><strong>
-$config-&gt;returns('get', false);</strong>
-</pre>
-                Dans le premier cas, il acceptera n'importe quel argument,
-                mais il en faut au moins un.
-                Dans le deuxième cas, n'importe quel nombre d'arguments
-                fera l'affaire and il agit comme un attrape-tout après
-                toutes les autres vérifications.
-                Notez que si - dans le premier cas - nous ajoutons
-                d'autres options avec paramètre unique après le joker,
-                alors elle seront ignorés puisque le joker fera
-                la première correspondance.
-                Avec des listes complexes de paramètres, l'ordre devient
-                important au risque de voir la correspondance souhaitée
-                masqué par un joker apparu plus tôt.
-                Déclarez les plus spécifiques d'abord si vous n'êtes pas sûr.
-            </p>
-            <p>
-                Il y a des moments où vous souhaitez qu'une référence
-                bien spécifique soit servie par l'objet fantaisie plutôt
-                qu'une copie.
-                C'est plutôt rare pour dire le moins, mais vous pourriez 
-                être en train de simuler un conteneur qui détiendrait
-                des primitives, tels des chaînes de caractères.
-                Par exemple.
-<pre>
-class Pad {
-    function Pad() { }
-    function &amp;note($index) { }
-}
-</pre>
-                Dans ce cas, vous pouvez définir une référence dans la liste
-                des valeurs retournées par l'objet fantaisie...
-<pre>
-function testTaskReads() {
-    $note = 'Buy books';
-    $pad = new MockPad();
-    $vector-&gt;<strong>returnsByReference(</strong>'note', $note, array(3)<strong>)</strong>;
-    $task = new Task($pad);
-    ...
-}
-</pre>
-                Avec cet assemblage vous savez qu'à chaque fois
-                que <span class="new_code">$pad-&gt;note(3)</span> est appelé
-                il renverra toujours la même <span class="new_code">$note</span>,
-                même si celle-ci est modifiée.
-            </p>
-            <p>
-                Ces trois facteurs, timing, paramètres et références,
-                peuvent être combinés orthogonalement.
-                Par exemple...
-<pre>
-$buy_books = 'Buy books';
-$write_code = 'Write code';
-$pad = new MockPad();
-$vector-&gt;<strong>returnsByReferenceAt(0, 'note', $buy_books, array('*', 3));</strong>
-$vector-&gt;<strong>returnsByReferenceAt(1, 'note', $write_code, array('*', 3));</strong>
-</pre>
-                Cela renverra une référence à <span class="new_code">$buy_books</span> et
-                ensuite à <span class="new_code">$write_code</span>, mais seuleent si deux paramètres
-                sont utilisés, le deuxième devant être l'entier 3.
-                Cela devrait couvrir la plupart des situations.
-            </p>
-            <p>
-                Un dernier cas délicat reste : celui d'un objet créant
-                un autre objet, plus connu sous le patron de conception "fabrique"
-                (ou "factory").
-                Supponsons qu'à la réussite d'une requête à
-                notre base de données imaginaire, un jeu d'enregistrements
-                est renvoyé sous la forme d'un itérateur, où chaque appel
-                au <span class="new_code">next()</span> sur notre itérateur donne une ligne
-                avant de s'arrêtre avec un false.
-                Cela semble à un cauchemar à simuler, alors qu'en fait un objet
-                fantaisie peut être créé avec les mécansimes ci-dessus...
-<pre>
-Mock::generate('DatabaseConnection');
-Mock::generate('ResultIterator');
-
-class DatabaseTest extends UnitTestCase {
-
-    function testUserFinderReadsResultsFromDatabase() {<strong>
-        $result = new MockResultIterator();
-        $result-&gt;returns('next', false);
-        $result-&gt;returnsAt(0, 'next', array(1, 'tom'));
-        $result-&gt;returnsAt(1, 'next', array(3, 'dick'));
-        $result-&gt;returnsAt(2, 'next', array(6, 'harry'));
-
-        $connection = new MockDatabaseConnection();
-        $connection-&gt;returns('selectQuery', $result);</strong>
-
-        $finder = new UserFinder(<strong>$connection</strong>);
-        $this-&gt;assertIdentical(
-                $finder-&gt;findNames(),
-                array('tom', 'dick', 'harry'));
-    }
-}
-</pre>
-                Désormais ce n'est que si notre <span class="new_code">$connection</span>
-                est appelée par la méthode <span class="new_code">query()</span>
-                que sera retourné le <span class="new_code">$result</span>,
-                lui-même s'arrêtant au troisième appel
-                à <span class="new_code">next()</span>.
-                Ce devrait être suffisant comme information
-                pour que notre classe <span class="new_code">UserFinder</span>,
-                la classe effectivement testée ici,
-                fasse son boulot.
-                Un test très précis et toujours pas
-                de base de données en vue.
-            </p>
-            <p>
-                Nous pourrsion affiner ce test encore plus
-                en insistant pour que la bonne requête
-                soit envoyée...
-<pre>
-$connection-&gt;returns('selectQuery', $result, array(<strong>'select name, id from people'</strong>));
-</pre>
-                Là, c'est une mauvaise idée.
-            </p>
-            <p>
-                Niveau objet, nous avons un <span class="new_code">UserFinder</span>
-                qui parle à une base de données à travers une interface géante -
-                l'ensemble du SQL.
-                Imaginez si nous avions écrit un grand nombre de tests
-                qui dépendrait désormais de cette requête SQL précise.
-                Ces requêtes pourraient changer en masse pour tout un tas
-                de raisons non liés à ce test spécifique.
-                Par exemple, la règle pour les quotes pourrait changer,
-                un nom de table pourrait évoluer, une table de liaison pourrait
-                être ajouté, etc.
-                Cela entrainerait une ré-écriture de tous les tests à chaque fois
-                qu'un remaniement est fait, alors même que le comportement lui
-                n'a pas bougé.
-                Les tests sont censés aider au remaniement, pas le bloquer.
-                Pour ma part, je préfère avoir une suite de tests qui passent
-                quand je fais évoluer le nom des tables.
-            </p>
-            <p>
-                Et si vous voulez une règle, c'est toujours mieux de ne pas
-                créer un objet fantaisie sur une grosse interface.
-            </p>
-            <p>
-            	Par contrast, voici le test complet...
-<pre>
-class DatabaseTest extends UnitTestCase {<strong>
-    function setUp() { ... }
-    function tearDown() { ... }</strong>
-
-    function testUserFinderReadsResultsFromDatabase() {
-        $finder = new UserFinder(<strong>new DatabaseConnection()</strong>);
-        $finder-&gt;add('tom');
-        $finder-&gt;add('dick');
-        $finder-&gt;add('harry');
-        $this-&gt;assertIdentical(
-                $finder-&gt;findNames(),
-                array('tom', 'dick', 'harry'));
-    }
-}
-</pre>
-                Ce test est immunisé contre le changement de schéma.
-                Il échouera uniquement si vous changez la fonctionnalité,
-                ce qui correspond bien à ce qu'un test doit faire.
-            </p>
-            <p>
-            	Il faut juste faire attention à ces méthodes <span class="new_code">setUp()</span>
-            	et <span class="new_code">tearDown()</span> que nous avons survolé pour l'instant.
-            	Elles doivent vider les tables de la base de données
-            	et s'assurer que le schéma est bien défini.
-            	Cela peut se engendrer un peu de travail supplémentaire,
-            	mais d'ordinaire ce type de code existe déjà - à commencer pour
-            	le déploiement.
-            </p>
-            <p>
-                Il y a au moins un endroit où vous aurez besoin d'objets fantaisie :
-                c'est la simulation des erreurs.
-                Exemple, la base de données tombe pendant que <span class="new_code">UserFinder</span>
-                fait son travail. Le <span class="new_code">UserFinder</span> se comporte-t-il bien ?
-<pre>
-class DatabaseTest extends UnitTestCase {
-
-    function testUserFinder() {
-        $connection = new MockDatabaseConnection();<strong>
-        $connection-&gt;throwOn('selectQuery', new TimedOut('Ouch!'));</strong>
-        $alert = new MockAlerts();<strong>
-        $alert-&gt;expectOnce('notify', 'Database is busy - please retry');</strong>
-        $finder = new UserFinder($connection, $alert);
-        $this-&gt;assertIdentical($finder-&gt;findNames(), array());
-    }
-}
-</pre>
-                Nous avons transmis au <span class="new_code">UserFinder</span>
-                un objet <span class="new_code">$alert</span>.
-                Il va transmettre un certain nombre de belles notifications
-                à l'interface utilisatuer en cas d'erreur.
-                Nous préfèrerions éviter de saupoudrer notre code avec
-                des commandes <span class="new_code">print</span> codées en dur si nous pouvons
-                l'éviter.
-                Emballer les moyens de sortie veut dire que nous pouvons utiliser
-                ce code partout. Et cela rend notre code plus facile.
-            </p>
-            <p>
-                Pour faire passer ce test, le finder doit écrire un message sympathique
-                et compréhensible à l'<span class="new_code">$alert</span>, plutôt que de propager
-                l'exception. Jusque là, tout va bien.
-            </p>
-            <p>
-                Comment faire en sorte que la <span class="new_code">DatabaseConnection</span> fantaisie
-                soulève une exception ?
-                Nous la générons avec la méthode <span class="new_code">throwOn</span> sur l'objet fantaisie.
-            </p>
-            <p>
-                Enfin, que se passe-t-il si la méthode voulue pour la simulation
-                n'existe pas encore ?
-                Si vous définissez une valeur de retour sur une méthode absente,
-                alors SimpleTest vous répondra avec une erreur.
-                Et si vous utilisez <span class="new_code">__call()</span> pour simuler
-                des méthodes dynamiques ?
-            </p>
-            <p>
-                Les objets avec des interfaces dynamiques, avec <span class="new_code">__call</span>,
-                peuvent être problématiques dans l'implémentation courante
-                des objets fantaisie.
-                Vous pouvez en créer un autour de la méthode <span class="new_code">__call()</span>
-                mais c'est très laid.
-                Et pourquoi un test devrait connaître quelque chose avec un niveau
-                si bas dans l'implémentation. Il n'a besoin que de simuler l'appel.
-            </p>
-            <p>
-                Il y a bien moyen de contournement : ajouter des méthodes complémentaires
-                à l'objet fantaisie à la génération.
-<pre>
-<strong>Mock::generate('DatabaseConnection', 'MockDatabaseConnection', array('setOptions'));</strong>
-</pre>
-                Dans une longue suite de tests cela pourrait entraîner des problèmes,
-                puisque vous avez probablement déjà une version fantaisie
-                de la classe appellée <span class="new_code">MockDatabaseConnection</span>
-                sans les méthodes complémentaires.
-                Le générateur de code ne générera pas la version fantaisie de la classe
-                s'il en existe déjà une version avec le même nom.
-                Il vous deviendra impossible de déterminer où est passée votre méthode
-                si une autre définition a été lancé au préalable.
-            </p>
-            <p>
-                Pour pallier à ce problème, SimpleTest vous permet de choisir
-                n'importe autre nom pour la nouvelle classe au moment même où
-                vous ajouter les méthodes complémentaires.
-<pre>
-Mock::generate('DatabaseConnection', <strong>'MockDatabaseConnectionWithOptions'</strong>, array('setOptions'));
-</pre>
-                Ici l'objet fantaisie se comportera comme si
-                <span class="new_code">setOptions()</span> existait bel et bien
-                dans la classe originale.
-            </p>
-            <p>
-                Les objets fantaisie ne peuvent être utilisés qu'à l'intérieur
-                des scénarios de test, étant donné qu'à l'apparition d'une attente
-                ils envoient des messages directement au scénario de test courant.
-                Les créer en dehors d'un scénario de test entraînera une erreur
-                de run time quand une attente est déclenchée et qu'il n'y a pas
-                de scénario de test en cours pour recevoir le message.
-                Nous pouvons désormais couvrir ces attentes.
-            </p>
-        
-        <h2>
-<a class="target" name="expectations"></a>Objets fantaisie en tant que critiques</h2>
-            <p>
-                Même si les bouchons serveur isolent vos tests des perturbations
-				du monde réel, ils n'apportent que le moitié des bénéfices possibles.
-				Vous pouvez obtenir une classe de test qui reçoive les bons messages,
-				mais cette nouvelle classe envoie-t-elle les bons ?
-				Le tester peut devenir très bordélique sans
-				une librairie d'objets fantaise.
-            </p>
-			<p>
-                Voici un exemple, prenons une classe <span class="new_code">PageController</span>
-				toute simple qui traitera un formulaire de paiement
-				par carte bleue...
-<pre>
-class PaymentForm extends PageController {
-    function __construct($alert, $payment_gateway) { ... }
-    function makePayment($request) { ... }
-}
-</pre>
-                Cette classe a besoin d'un <span class="new_code">PaymentGateway</span>
-				pour parler concrètement à la banque.
-				Il utilise aussi un objet <span class="new_code">Alert</span>
-				pour gérer les erreurs.
-				Cette dernière classe parle à la page ou au template.
-				Elle est responsable de l'affichage du message d'erreur
-				et de la mise en valeur de tout champ du formulaire
-				qui serait incorrecte.
-            </p>
-            <p>
-                Elle pourrait ressembler à...
-<pre>
-class Alert {
-    function warn($warning, $id) {
-        print '&lt;div class="warning"&gt;' . $warning . '&lt;/div&gt;';
-        print '&lt;style type="text/css"&gt;#' . $id . ' { background-color: red }&lt;/style&gt;';
-    }
-}
-</pre>
-            </p>
-            <p>
-                Portons notre attention à la méthode <span class="new_code">makePayment()</span>.
-				Si nous n'inscrivons pas un numéro "CVV2" (celui à trois
-				chiffre au dos de la carte bleue), nous souhaitons afficher
-				une erreur plutôt que d'essayer de traiter le paiement. 
-				En mode test...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-require_once('payment_form.php');
-Mock::generate('Alert');
-Mock::generate('PaymentGateway');
-
-class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
-
-    function testMissingCvv2CausesAlert() {
-        $alert = new MockAlert();
-        <strong>$alert-&gt;expectOnce(
-                    'warn',
-                    array('Missing three digit security code', 'cvv2'));</strong>
-        $controller = new PaymentForm(<strong>$alert</strong>, new MockPaymentGateway());
-        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
-    }
-
-    function requestWithMissingCvv2() { ... }
-}
-?&gt;
-</pre>
-                Première question : où sont passés les assertions ?
-            </p>
-            <p>
-                L'appel à <span class="new_code">expectOnce('warn', array(...))</span> annonce
-				à l'objet fantaisie qu'il faut s'attendre à un appel à <span class="new_code">warn()</span>
-				avant la fin du test.
-				Quand il débouche sur l'appel à <span class="new_code">warn()</span>, il vérifie
-				les arguments. Si ceux-ci ne correspondent pas, alors un échec
-				est généré. Il échouera aussi si la méthode n'est jamais appelée.
-            </p>
-            <p>
-                Non seulement le test ci-dessus s'assure que <span class="new_code">warn</span>
-				a bien été appelé, mais en plus qu'il a bien reçu la chaîne
-				de caractère "Missing three digit security code"
-				et même le tag "cvv2".
-				L'équivalent de <span class="new_code">assertIdentical()</span> est appliqué
-				aux deux champs quand les paramètres sont comparés.
-            </p>
-            <p>
-                Si le contenu du message vous importe peu, surtout dans le cas
-				d'une interface utilisateur qui change régulièrement,
-				nous pouvons passer ce paramètre avec l'opérateur "*"...
-<pre>
-class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
-
-    function testMissingCvv2CausesAlert() {
-        $alert = new MockAlert();
-        $alert-&gt;expectOnce('warn', array(<strong>'*'</strong>, 'cvv2'));
-        $controller = new PaymentForm($alert, new MockPaymentGateway());
-        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
-    }
-
-    function requestWithMissingCvv2() { ... }
-}
-</pre>
-                Nous pouvons même rendre le test encore moins spécifique
-				en supprimant complètement la liste des paramètres...
-<pre>
-function testMissingCvv2CausesAlert() {
-    $alert = new MockAlert();
-    <strong>$alert-&gt;expectOnce('warn');</strong>
-    $controller = new PaymentForm($alert, new MockPaymentGateway());
-    $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
-}
-</pre>
-                Ceci vérifiera uniquement si la méthode a été appelé,
-				ce qui est peut-être un peu drastique dans ce cas.
-				Plus tard, nous verrons comment alléger les attentes
-				plus précisement.
-            </p>
-            <p>
-                Des tests sans assertions peuvent être à la fois compacts
-				et très expressifs. Parce que nous interceptons l'appel
-				sur le chemin de l'objet, ici de classe <span class="new_code">Alert</span>,
-				nous évitons de tester l'état par la suite.
-				Cela évite les assertions dans les tests, mais aussi
-				l'obligation d'ajouter des accesseurs uniquement
-				pour les tests dans le code original.
-				Si vous en arrivez à ajouter des accesseurs de ce type,
-				on parle alors de "state based testing" dans le jargon
-				("test piloté par l'état"),
-				il est probablement plus que temps d'utiliser
-				des objets fantaisie dans vos tests.
-				On peut alors parler de "behaviour based testing"
-				(ou "test piloté par le comportement") :
-				c'est largement mieux !
-            </p>
-            <p>
-                Ajoutons un autre test.
-				Assurons nous que nous essayons même pas un paiement sans CVV2...
-<pre>
-class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
-
-    function testMissingCvv2CausesAlert() { ... }
-
-    function testNoPaymentAttemptedWithMissingCvv2() {
-        $payment_gateway = new MockPaymentGateway();
-        <strong>$payment_gateway-&gt;expectNever('pay');</strong>
-        $controller = new PaymentForm(new MockAlert(), $payment_gateway);
-        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
-    }
-
-    ...
-}
-</pre>
-                Vérifier une négation peut être très difficile
-				dans les tests, mais <span class="new_code">expectNever()</span>
-				rend l'opération très facile heureusement.
-            </p>
-            <p>
-                <span class="new_code">expectOnce()</span> et <span class="new_code">expectNever()</span> sont
-				suffisants pour la plupart des tests, mais
-				occasionnellement vous voulez tester plusieurs évènements.
-				D'ordinaire pour des raisons d'usabilité, nous souhaitons
-				que tous les champs manquants du formulaire soient
-				mis en relief, et pas uniquement le premier.
-				Cela veut dire que nous devrions voir de multiples appels
-				à <span class="new_code">Alert::warn()</span>, pas juste un...
-<pre>
-function testAllRequiredFieldsHighlightedOnEmptyRequest() {
-    $alert = new MockAlert();<strong>
-    $alert-&gt;expectAt(0, 'warn', array('*', 'cc_number'));
-    $alert-&gt;expectAt(1, 'warn', array('*', 'expiry'));
-    $alert-&gt;expectAt(2, 'warn', array('*', 'cvv2'));
-    $alert-&gt;expectAt(3, 'warn', array('*', 'card_holder'));
-    $alert-&gt;expectAt(4, 'warn', array('*', 'address'));
-    $alert-&gt;expectAt(5, 'warn', array('*', 'postcode'));
-    $alert-&gt;expectAt(6, 'warn', array('*', 'country'));
-    $alert-&gt;expectCallCount('warn', 7);</strong>
-    $controller = new PaymentForm($alert, new MockPaymentGateway());
-    $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
-}
-</pre>
-                Le compteur dans <span class="new_code">expectAt()</span> précise
-				le nombre de fois que la méthode a déjà été appelée.
-				Ici nous vérifions que chaque champ sera bien mis en relief.
-            </p>
-            <p>
-                Notez que nous sommes forcé de tester l'ordre en même temps.
-				SimpleTest n'a pas encore de moyen pour éviter cela,
-				mais dans une version future ce sera corrigé.
-            </p>
-            <p>
-                Voici la liste complètes des attentes
-				que vous pouvez préciser sur une objet fantaisie
-				dans <a href="http://simpletest.org/">SimpleTest</a>.
-				Comme pour les assertions, ces méthodes prennent en option
-				un message d'erreur.
-                <table>
-                    <thead><tr>
-<th>Attente</th>
-<th>Description</th>
-</tr></thead>
-                    <tbody>
-                        <tr>
-                            <td><span class="new_code">expect($method, $args)</span></td>
-                            <td>Les arguements doivent correspondre si appelés</td>
-                        </tr>
-                        <tr>
-                            <td><span class="new_code">expectAt($timing, $method, $args)</span></td>
-                            <td>Les arguements doiven correspondre si appelés lors du passage numéro <span class="new_code">$timing</span>
-</td>
-                        </tr>
-                        <tr>
-                            <td><span class="new_code">expectCallCount($method, $count)</span></td>
-                            <td>La méthode doit être appelée exactement <span class="new_code">$count</span> fois</td>
-                        </tr>
-                        <tr>
-                            <td><span class="new_code">expectMaximumCallCount($method, $count)</span></td>
-                            <td>La méthode ne doit pas être appelée plus de <span class="new_code">$count</span> fois</td>
-                        </tr>
-                        <tr>
-                            <td><span class="new_code">expectMinimumCallCount($method, $count)</span></td>
-                            <td>La méthode ne doit pas être appelée moins de <span class="new_code">$count</span> fois</td>
-                        </tr>
-                        <tr>
-                            <td><span class="new_code">expectNever($method)</span></td>
-                            <td>La méthode ne doit jamais être appelée</td>
-                        </tr>
-                        <tr>
-                            <td><span class="new_code">expectOnce($method, $args)</span></td>
-                            <td>La méthode ne doit être appelée qu'une seule fois et avec les arguments (en option)</td>
-                        </tr>
-                        <tr>
-                            <td><span class="new_code">expectAtLeastOnce($method, $args)</span></td>
-                            <td>La méthode doit être appelée au moins une seule fois et toujours avec au moins un des arguments attendus</td>
-                        </tr>
-                    </tbody>
-                </table>
-                Où les paramètres sont...
-                <dl>
-                    <dt class="new_code">$method</dt>
-                    <dd>
-                    	Le nom de la méthode, sous la forme d'une chaîne de caractères,
-						à laquelle il faut appliquer la condition.
-					</dd>
-                    <dt class="new_code">$args</dt>
-                    <dd>
-                        Les argumetns sous la forme d'une liste.
-						Les jokers peuvent être inclus de la même manière
-						que pour <span class="new_code">setReturn()</span>.
-						Cet argument est optionnel pour <span class="new_code">expectOnce()</span>
-                        et <span class="new_code">expectAtLeastOnce()</span>.
-                    </dd>
-                    <dt class="new_code">$timing</dt>
-                    <dd>
-                        La seule marque dans le temps pour tester la condition.
-						Le premier appel commence à zéro et le comptage se fait
-						séparement sur chaque méthode.
-                    </dd>
-                    <dt class="new_code">$count</dt>
-                    <dd>Le nombre d'appels attendu.</dd>
-                </dl>
-            </p>
-            <p>
-                Si vous n'avez qu'un seul appel dans votre test, assurez vous
-				d'utiliser <span class="new_code">expectOnce</span>.<br>
-                Utiliser <span class="new_code">$mocked-&gt;expectAt(0, 'method', 'args);</span>
-				tout seul ne permettra qu'à la méthode de ne jamais être appelée.
-				Vérifier les arguements et le comptage total sont pour le moment
-				indépendants.
-				Ajouter une attente <span class="new_code">expectCallCount()</span> quand
-				vous utilisez <span class="new_code">expectAt()</span> (dans le cas sans appel)
-				est permis.
-            </p>
-            <p>
-                Comme les assertions à l'intérieur des scénarios de test,
-				toutes ces attentes peuvent incorporer une surchage
-				sur le message sous la forme d'un paramètre supplémentaire.
-				Par ailleurs le message original peut être inclus dans la sortie
-				avec "%s".
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            Le papier original sur les Objets fantaisie ou
-            <a href="http://www.mockobjects.com/">Mock objects</a>.
-        </li>
-<li>
-            La page du projet SimpleTest sur <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            La page d'accueil de SimpleTest sur <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/fr/overview.html b/3rdparty/simpletest/docs/fr/overview.html
deleted file mode 100644
index 968bbc48e50..00000000000
--- a/3rdparty/simpletest/docs/fr/overview.html
+++ /dev/null
@@ -1,321 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>
-        Aperçu et liste des fonctionnalités des testeurs unitaires PHP et web de SimpleTest PHP
-    </title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Apercu de SimpleTest</h1>
-        This page...
-        <ul>
-<li>
-            <a href="#resume">Résumé rapide</a> de l'outil SimpleTest pour PHP.
-        </li>
-<li>
-            <a href="#fonctionnalites">La liste des fonctionnalites</a>, à la fois présentes et à venir.
-        </li>
-<li>
-            Il y a beaucoup de <a href="#ressources">ressources sur les tests unitaires</a> sur le web.
-        </li>
-</ul>
-<div class="content">
-        <h2>
-<a class="target" name="resume"></a>Qu'est-ce que SimpleTest ?</h2>
-            <p>
-                Le coeur de SimpleTest est un framework de test construit autour de classes de scénarios de test. Celles-ci sont écrites comme des extensions des classes premières de scénarios de test, chacune élargie avec des méthodes qui contiennent le code de test effectif. Les scripts de test de haut niveau invoque la méthode <span class="new_code">run()</span> à chaque scénario de test successivement. Chaque méthode de test est écrite pour appeler des assertions diverses que le développeur suppose être vraies, <span class="new_code">assertEqual()</span> par exemple. Si l'assertion est correcte, alors un succès est expédié au rapporteur observant le test, mais toute erreur déclenche une alerte et une description de la dissension.
-            </p>
-            <p>
-                Un <a href="unit_test_documentation.html">scénario de test</a> ressemble à...
-<pre>
-class <strong>MyTestCase</strong> extends UnitTestCase {
-    <strong>
-    function testLog() {
-        $log = &amp;new Log('my.log');
-        $log-&gt;message('Hello');
-        $this-&gt;assertTrue(file_exists('my.log'));
-    }</strong>
-}
-</pre>
-            </p>
-            <p>
-                Ces outils sont conçus pour le développeur. Les tests sont écrits en PHP directement, plus ou moins simultanément avec la construction de l'application elle-même. L'avantage d'utiliser PHP lui-même comme langage de test est qu'il n'y a pas de nouveau langage à apprendre, les tests peuvent commencer directement et le développeur peut tester n'importe quelle partie du code. Plus simplement, toutes les parties qui peuvent être accédées par le code de l'application peuvent aussi être accédées par le code de test si ils sont tous les deux dans le même langage.
-            </p>
-            <p>
-                Le type de scénario de test le plus simple est le <span class="new_code">UnitTestCase</span>. Cette classe de scénario de test inclut les tests standards pour l'égalité, les références et l'appariement de motifs (via les expressions rationnelles). Ceux-ci testent ce que vous seriez en droit d'attendre du résultat d'une fonction ou d'une méthode. Il s'agit du type de test le plus commun pendant le quotidien du développeur, peut-être 95% des scénarios de test.
-            </p>
-            <p>
-                La tâche ultime d'une application web n'est cependant pas de produire une sortie correcte à partir de méthodes ou d'objets, mais plutôt de produire des pages web. La classe <span class="new_code">WebTestCase</span> teste des pages web. Elle simule un navigateur web demandant une page, de façon exhaustive : cookies, proxies, connexions sécurisées, authentification, formulaires, cadres et la plupart des éléments de navigation. Avec ce type de scénario de test, le développeur peut garantir que telle ou telle information est présente dans la page et que les formulaires ainsi que les sessions sont gérés comme il faut.
-            </p>
-            <p>
-                Un <a href="web_tester_documentation.html">scénario de test web</a> ressemble à...
-<pre>
-class <strong>MySiteTest</strong> extends WebTestCase {
-    <strong>
-    function testHomePage() {
-        $this-&gt;get('http://www.my-site.com/index.php');
-        $this-&gt;assertTitle('My Home Page');
-        $this-&gt;clickLink('Contact');
-        $this-&gt;assertTitle('Contact me');
-        $this-&gt;assertWantedPattern('/Email me at/');
-    }</strong>
-}
-</pre>
-            </p>
-        
-        <h2>
-<a class="target" name="fonctionnalites"></a>Liste des fonctionnalites</h2>
-            <p>
-                Ci-dessous vous trouverez un canevas assez brut des fonctionnalités à aujourd'hui et pour demain, sans oublier leur date approximative de publication. J'ai bien peur qu'il soit modifiable sans pré-avis étant donné que les jalons dépendent beaucoup sur le temps disponible. Les trucs en vert ont été codés, mais pas forcément déjà rendus public. Si vous avez une besoin pressant pour une fonctionnalité verte mais pas encore publique alors vous devriez retirer le code directement sur le  CVS chez SourceFourge. Une fonctionnalitée publiée est indiqué par "Fini".
-                <table>
-<thead>
-                    <tr>
-<th>Fonctionnalité</th>
-<th>Description</th>
-<th>Publication</th>
-</tr>
-                    </thead>
-<tbody>
-<tr>
-                        <td>Scénariot de test unitaire</td>
-                        <td>Les classes de test et assertions de base</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Affichage HTML</td>
-                        <td>L'affichage le plus simple possible</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Autochargement des scénarios de test</td>
-                        <td>Lire un fichier avec des scénarios de test et les charger dans un groupe de tests automatiquement</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Générateur de code d'objets fantaisie</td>
-                        <td>Des objets capable de simuler d'autres objets, supprimant les dépendances dans les tests</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Bouchons serveur</td>
-                        <td>Des objets fantaisie sans résultat attendu à utiliser à l'extérieur des scénarios de test, pour le prototypage par exemple.</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Intégration d'autres testeurs unitaires</td>
-                        <td>
-                            La capacité de lire et simuler d'autres scénarios de test en provenance de PHPUnit et de PEAR::Phpunit.</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Scénario de test web</td>
-                        <td>Appariement basique de motifs dans une page téléchargée.</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Analyse de page HTML</td>
-                        <td>Permet de suivre les liens et de trouver la balise de titre</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Simulacre partiel</td>
-                        <td>Simuler des parties d'une classe pour tester moins qu'une classe ou dans des cas complexes.</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Gestion des cookies Web</td>
-                        <td>Gestion correcte des cookies au téléchargement d'une page.</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Suivi des redirections</td>
-                        <td>Le téléchargement d'une page suit automatiquement une redirection 300.</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Analyse d'un formulaire</td>
-                        <td>La capacité de valider un formulaire simple et d'en lire les valeurs par défaut.</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Interface en ligne de commande</td>
-                        <td>Affiche le résultat des tests sans navigateur web.</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Mise à nu des attentes d'une classe</td>
-                        <td>Peut créer des tests précis avec des simulacres ainsi que des scénarios de test.</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Sortie et analyse XML</td>
-                        <td>Permet de tester sur plusieurs hôtes et d'intégrer des extensions d'acceptation de test.</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Scénario de test en ligne de commande</td>
-                        <td>Permet de tester des outils ou scripts en ligne de commande et de manier des fichiers.</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Compatibilité avec PHP Documentor</td>
-                        <td>Génération automatique et complète de la documentation au niveau des classes.</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Interface navigateur</td>
-                        <td>Mise à nu des niveaux bas de l'interface du navigateur web pour des scénarios de test plus précis.</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Authentification HTTP</td>
-                        <td>Téléchargement des pages web protégées avec une authentification basique seulement.</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Boutons de navigation d'un navigateur</td>
-                        <td>Arrière, avant et recommencer</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Support de SSL</td>
-                        <td>Peut se connecter à des pages de type https.</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Support de proxy</td>
-                        <td>Peut se connecter via des proxys communs</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Support des cadres</td>
-                        <td>Gère les cadres dans les scénarios de test web.</td>
-                        <td style="color: green;">Fini</td>
-                    </tr>
-                    <tr>
-                        <td>Test de l'upload de fichier</td>
-                        <td>Peut simuler la balise input de type file</td>
-                        <td style="color: red;">1.0.1</td>
-                    </tr>
-                    <tr>
-                        <td>Amélioration sur la machinerie des rapports</td>
-                        <td>Retouche sur la transmission des messages pour une meilleur coopération avec les IDEs</td>
-                        <td style="color: red;">1.1</td>
-                    </tr>
-                    <tr>
-                        <td>Amélioration de l'affichage des tests</td>
-                        <td>Une meilleure interface graphique web, avec un arbre des scénarios de test.</td>
-                        <td style="color: red;">1.1</td>
-                    </tr>
-                    <tr>
-                        <td>Localisation</td>
-                        <td>Abstraction des messages et génration du code à partir de fichiers XML.</td>
-                        <td style="color: red;">1.1</td>
-                    </tr>
-                    <tr>
-                        <td>Simulation d'interface</td>
-                        <td>Peut générer des objets fantaisie tant vers des interfaces que vers des classes.</td>
-                        <td style="color: red;">2.0</td>
-                    </tr>
-                    <tr>
-                        <td>Test sur es exceptions</td>
-                        <td>Dans le même esprit que sur les tests des erreurs PHP.</td>
-                        <td style="color: red;">2.0</td>
-                    </tr>
-                    <tr>
-                        <td>Rercherche d'éléments avec XPath</td>
-                        <td>Peut utiliser Tidy HTML pour un appariement plus rapide et plus souple.</td>
-                        <td style="color: red;">2.0</td>
-                    </tr>
-                </tbody>
-</table>
-                La migration vers PHP5 commencera juste après la série des 1.0, à partir de là PHP4 ne sera plus supporté. SimpleTest est actuellement compatible avec PHP5 mais n'utilisera aucune des nouvelles fonctionnalités avant la version 2.
-            </p>
-        
-        <h2>
-<a class="target" name="ressources"></a>Ressources sur le web pour les tests</h2>
-            <p>
-                Le processus est au moins aussi important que les outils. Le type de procédure que fait un usage le plus intensif des outils de test pour développeur est bien sûr l'<a href="http://www.extremeprogramming.org/">Extreme Programming</a>. Il s'agit là d'une des <a href="http://www.agilealliance.com/articles/index">méthodes agiles</a> qui combinent plusieurs pratiques pour "lisser la courbe de coût" du développement logiciel. La plus extrème reste le <a href="http://www.testdriven.com/modules/news/">développement piloté par les tests</a>, où vous devez adhérer à la règle du <cite>pas de code avant d'avoir un test</cite>. Si vous êtes plutôt du genre planninficateur ou que vous estimez que l'expérience compte plus que l'évolution, vous préférerez peut-être l'approche <a href="http://www.therationaledge.com/content/dec_01/f_spiritOfTheRUP_pk.html">RUP</a>. Je ne l'ai pas testé mais je peux voir où vous aurez besoin d'outils de test (cf. illustration 9).
-            </p>
-            <p>
-                La plupart des testeurs unitaires sont dans une certaine mesure un clone de <a href="http://www.junit.org/">JUnit</a>, au moins dans l'interface. Il y a énormément d'information sur le site de JUnit, à commencer par la <a href="http://junit.sourceforge.net/doc/faq/faq.htm">FAQ</a> quie contient pas mal de conseils généraux sur les tests. Une fois mordu par le bogue vous apprécierez sûrement la phrase <a href="http://junit.sourceforge.net/doc/testinfected/testing.htm">infecté par les tests</a> trouvée par Eric Gamma. Si vous êtes encore en train de tergiverser sur un testeur unitaire, sachez que les choix principaux sont <a href="http://phpunit.sourceforge.net/">PHPUnit</a> et <a href="http://pear.php.net/manual/en/package.php.phpunit.php">Pear PHP::PHPUnit</a>. De nombreuses fonctionnalités de SimpleTest leurs font défaut, mais la version PEAR a d'ores et déjà été mise à jour pour PHP5. Elle est aussi recommandée si vous portez des scénarios de test existant depuis <a href="http://www.junit.org/">JUnit</a>.
-            </p>
-            <p>
-                Les développeurs de bibliothèque n'ont pas l'air de livrer très souvent des tests avec leur code : c'est bien dommage. Le code d'une bibliothèque qui inclut des tests peut être remanié avec plus de sécurité et le code de test sert de documentation additionnelle dans un format assez standard. Ceci peut épargner la pêche aux indices dans le code source lorsque qu'un problème survient, en particulier lors de la mise à jour d'une telle bibliothèque. Parmi les bibliothèques utilisant SimpleTest comme testeur unitaire on retrouve <a href="http://wact.sourceforge.net/">WACT</a> et <a href="http://sourceforge.net/projects/htmlsax">PEAR::XML_HTMLSax</a>.
-            </p>
-            <p>
-                Au jour d'aujourd'hui il manque tristement beaucoup de matière sur les objets fantaisie : dommage, surtout que tester unitairement sans eux représente pas mal de travail en plus. L'<a href="http://www.sidewize.com/company/mockobjects.pdf">article original sur les objets fantaisie</a> est très orienté Java, mais reste intéressant à lire. Etant donné qu'il s'agit d'une nouvelle technologie il y a beaucoup de discussions et de débats sur comment les utiliser, souvent sur des wikis comme <a href="http://xpdeveloper.com/cgi-bin/oldwiki.cgi?MockObjects">Extreme Tuesday</a> ou <a href="http://www.mockobjects.com/MocksObjectsPaper.html">www.mockobjects.com</a>ou <a href="http://c2.com/cgi/wiki?MockObject">the original C2 Wiki</a>. Injecter des objets fantaisie dans une classe est un des champs principaux du débat : cet <a href="http://www-106.ibm.com/developerworks/java/library/j-mocktest.html">article chez IBM</a> en est un bon point de départ.
-            </p>
-            <p>
-                Il y a énormement d'outils de test web mais la plupart sont écrits en Java. De plus les tutoriels et autres conseils sont plutôt rares. Votre seul espoir est de regarder directement la documentation pour <a href="http://httpunit.sourceforge.net/">HTTPUnit</a>, <a href="http://htmlunit.sourceforge.net/">HTMLUnit</a> ou <a href="http://jwebunit.sourceforge.net/">JWebUnit</a> et d'espérer y trouver pour des indices. Il y a aussi des frameworks basés sur XML, mais de nouveau la plupart ont besoin de Java pour tourner.
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            <a href="unit_test_documentation.html">Documentation pour SimpleTest</a>.
-        </li>
-<li>
-            <a href="http://www.lastcraft.com/first_test_tutorial.php">Comment écrire des scénarios de test en PHP</a> est un tutoriel plutôt avancé.
-        </li>
-<li>
-            <a href="http://simpletest.org/api/">L'API de SimpleTest</a> par phpdoc.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/fr/partial_mocks_documentation.html b/3rdparty/simpletest/docs/fr/partial_mocks_documentation.html
deleted file mode 100644
index 740ae7b4026..00000000000
--- a/3rdparty/simpletest/docs/fr/partial_mocks_documentation.html
+++ /dev/null
@@ -1,475 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Documentation SimpleTest : les objets fantaisie partiels</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Documentation sur les objets fantaisie partiels</h1>
-        This page...
-        <ul>
-<li>
-            <a href="#injection">Le problème de l'injection d'un objet fantaisie</a>.
-        </li>
-<li>
-            Déplacer la création vers une méthode <a href="#creation">fabrique protégée</a>.
-        </li>
-<li>
-            <a href="#partiel">L'objet fantaisie partiel</a> génère une sous-classe.
-        </li>
-<li>
-            Les objets fantaisie partiels <a href="#moins">testent moins qu'une classe</a>.
-        </li>
-</ul>
-<div class="content">
-        
-            <p>
-                Un objet fantaisie partiel n'est ni plus ni moins
-                qu'un modèle de conception pour soulager un problème spécifique
-                du test avec des objets fantaisie, celui de placer
-                des objets fantaisie dans des coins serrés.
-                Il s'agit d'un outil assez limité et peut-être même
-                une idée pas si bonne que ça. Elle est incluse dans SimpleTest
-                pour la simple raison que je l'ai trouvée utile
-                à plus d'une occasion et qu'elle m'a épargnée
-                pas mal de travail dans ces moments-là.
-            </p>
-        
-        <h2>
-<a class="target" name="injection"></a>Le problème de l'injection dans un objet fantaisie</h2>
-            <p>
-                Quand un objet en utilise un autre il est très simple
-                d'y faire circuler une version fantaisie déjà prête
-                avec ses attentes. Les choses deviennent un peu plus délicates
-                si un objet en crée un autre et que le créateur est celui
-                que l'on souhaite tester. Cela revient à dire que l'objet
-                créé devrait être une fantaisie, mais nous pouvons
-                difficilement dire à notre classe sous test de créer
-                un objet fantaisie plutôt qu'un "vrai" objet.
-                La classe testée ne sait même pas qu'elle travaille dans un environnement de test.
-            </p>
-            <p>
-                Par exemple, supposons que nous sommes en train
-                de construire un client telnet et qu'il a besoin
-                de créer une socket réseau pour envoyer ses messages.
-                La méthode de connexion pourrait ressemble à quelque chose comme...
-<pre>
-<strong>&lt;?php
-require_once('socket.php');
-
-class Telnet {
-    ...
-    function connect($ip, $port, $username, $password) {
-        $socket = new Socket($ip, $port);
-        $socket-&gt;read( ... );
-        ...
-    }
-}
-?&gt;</strong>
-</pre>
-                Nous voudrions vraiment avoir une version fantaisie
-                de l'objet socket, que pouvons nous faire ?
-            </p>
-            <p>
-                La première solution est de passer la socket en
-                tant que paramètre, ce qui force la création
-                au niveau inférieur. Charger le client de cette tâche
-                est effectivement une bonne approche si c'est possible
-                et devrait conduire à un remaniement -- de la création
-                à partir de l'action. En fait, c'est là une des manières
-                avec lesquels tester en s'appuyant sur des objets fantaisie
-                vous force à coder des solutions plus resserrées sur leur objectif.
-                Ils améliorent votre programmation.
-            </p>
-            <p>
-                Voici ce que ça devrait être...
-<pre>
-&lt;?php
-require_once('socket.php');
-
-class Telnet {
-    ...
-    <strong>function connect($socket, $username, $password) {
-        $socket-&gt;read( ... );
-        ...
-    }</strong>
-}
-?&gt;
-</pre>
-                Sous-entendu, votre code de test est typique d'un cas
-                de test avec un objet fantaisie.
-<pre>
-class TelnetTest extends UnitTestCase {
-    ...
-    function testConnection() {<strong>
-        $socket = new MockSocket();
-        ...
-        $telnet = new Telnet();
-        $telnet-&gt;connect($socket, 'Me', 'Secret');
-        ...</strong>
-    }
-}
-</pre>
-                C'est assez évident que vous ne pouvez descendre que d'un niveau.
-                Vous ne voudriez pas que votre application de haut niveau
-                crée tous les fichiers de bas niveau, sockets et autres connexions
-                à la base de données dont elle aurait besoin.
-                Elle ne connaîtrait pas les paramètres du constructeur de toute façon.
-            </p>
-            <p>
-                La solution suivante est de passer l'objet créé sous la forme
-                d'un paramètre optionnel...
-<pre>
-&lt;?php
-require_once('socket.php');
-
-class Telnet {
-    ...<strong>
-    function connect($ip, $port, $username, $password, $socket = false) {
-        if (! $socket) {
-            $socket = new Socket($ip, $port);
-        }
-        $socket-&gt;read( ... );</strong>
-        ...
-        return $socket;
-    }
-}
-?&gt;
-</pre>
-                Pour une solution rapide, c'est généralement suffisant.
-                Ensuite le test est très similaire : comme si le paramètre
-                était transmis formellement...
-<pre>
-class TelnetTest extends UnitTestCase {
-    ...
-    function testConnection() {<strong>
-        $socket = new MockSocket();
-        ...
-        $telnet = new Telnet();
-        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret', $socket);
-        ...</strong>
-    }
-}
-</pre>
-                Le problème de cette approche tient dans son manque de netteté.
-                Il y a du code de test dans la classe principale et aussi
-                des paramètres transmis dans le scénario de test
-                qui ne sont jamais utilisés. Il s'agit là d'une approche
-                rapide et sale, mais qui ne reste pas moins efficace
-                dans la plupart des situations.
-            </p>
-            <p>
-                Une autre solution encore est de laisser un objet fabrique
-                s'occuper de la création...
-<pre>
-&lt;?php
-require_once('socket.php');
-
-class Telnet {<strong>
-   function Telnet($network) {
-        $this-&gt;_network = $network;
-    }</strong>
-    ...
-    function connect($ip, $port, $username, $password) {<strong>
-        $socket = $this-&gt;_network-&gt;createSocket($ip, $port);
-        $socket-&gt;read( ... );</strong>
-        ...
-        return $socket;
-    }
-}
-?&gt;
-</pre>
-                Il s'agit là probablement de la réponse la plus travaillée
-                étant donné que la création est maintenant située
-                dans une petite classe spécialisée. La fabrique réseau
-                peut être testée séparément et utilisée en tant que fantaisie
-                quand nous testons la classe telnet...
-<pre>
-class TelnetTest extends UnitTestCase {
-    ...
-    function testConnection() {<strong>
-        $socket = new MockSocket();
-        ...
-        $network = new MockNetwork();
-        $network-&gt;returnsByReference('createSocket', $socket);
-        $telnet = new Telnet($network);
-        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
-    }
-}
-</pre>
-                Le problème reste que nous ajoutons beaucoup de classes
-                à la bibliothèque. Et aussi que nous utilisons beaucoup
-                de fabriques ce qui rend notre code un peu moins intuitif.
-                La solution la plus flexible, mais aussi la plus complexe.
-            </p>
-			<p>
-                Des techniques comme "l'Injection de Dépendance"
-				(ou "Dependency Injection") s'attelle au problème
-				de l'instanciation d'une classe avec beaucoup de paramètres.
-				Malheureusement la connaissance de ce patron de conception
-				n'est pas très répandue et si vous êtes en train d'essayer
-				de faire fonctionner du vieux code, ré-achitecturer toute
-				l'application n'est pas vraiment une option.
-            </p>
-            <p>
-                Peut-on trouver un juste milieu ?
-            </p>
-        
-        <h2>
-<a class="target" name="creation"></a>Méthode fabrique protégée</h2>
-            <p>
-                Il existe une technique pour palier à ce problème
-                sans créer de nouvelle classe dans l'application;
-                par contre elle induit la création d'une sous-classe au moment du test.
-                Premièrement nous déplaçons la création de la socket dans sa propre méthode...
-<pre>
-&lt;?php
-require_once('socket.php');
-
-class Telnet {
-    ...
-    function connect($ip, $port, $username, $password) {
-        <strong>$socket = $this-&gt;createSocket($ip, $port);</strong>
-        $socket-&gt;read( ... );
-        ...
-    }<strong>
-
-    protected function createSocket($ip, $port) {
-        return new Socket($ip, $port);
-    }</strong>
-}
-?&gt;
-</pre>
-				Une première étape plutôt précautionneuse même pour
-				du code legacy et intermélé.
-                Il s'agit là de la seule modification dans le code de l'application.
-            </p>
-            <p>
-                Pour le scénario de test, nous devons créer
-                une sous-classe de manière à intercepter la création de la socket...
-<pre>
-<strong>class TelnetTestVersion extends Telnet {
-    var $mock;
-
-    function TelnetTestVersion($mock) {
-        $this-&gt;mock = $mock;
-        $this-&gt;Telnet();
-    }
-
-    protected function createSocket() {
-        return $this-&gt;mock;
-    }
-}</strong>
-</pre>
-                Ici j'ai déplacé la fantaisie dans le constructeur,
-                mais un setter aurait fonctionné tout aussi bien.
-                Notez bien que la fantaisie est placée dans une variable
-                d'objet avant que le constructeur ne soit attaché.
-                C'est nécessaire dans le cas où le constructeur appelle 
-                <span class="new_code">connect()</span>.
-                Autrement il pourrait donner un valeur nulle à partir de
-                <span class="new_code">createSocket()</span>.
-            </p>
-            <p>
-                Après la réalisation de tout ce travail supplémentaire
-                le scénario de test est assez simple.
-                Nous avons juste besoin de tester notre nouvelle classe à la place...
-<pre>
-class TelnetTest extends UnitTestCase {
-    ...
-    function testConnection() {<strong>
-        $socket = new MockSocket();
-        ...
-        $telnet = new TelnetTestVersion($socket);
-        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
-    }
-}
-</pre>
-                Cette nouvelle classe est très simple bien sûr.
-                Elle ne fait qu'initier une valeur renvoyée, à la manière
-                d'une fantaisie. Ce serait pas mal non plus si elle pouvait
-                vérifier les paramètres entrants.
-                Exactement comme un objet fantaisie.
-                Il se pourrait bien que nous ayons à réaliser cette astuce régulièrement :
-                serait-il possible d'automatiser la création de cette sous-classe ?
-            </p>
-        
-        <h2>
-<a class="target" name="partiel"></a>Un objet fantaisie partiel</h2>
-            <p>
-                Bien sûr la réponse est "oui"
-                ou alors j'aurais arrêté d'écrire depuis quelques temps déjà !
-                Le test précédent a représenté beaucoup de travail,
-                mais nous pouvons générer la sous-classe en utilisant
-                une approche à celle des objets fantaisie.
-            </p>
-            <p>
-                Voici donc une version avec objet fantaisie partiel du test...
-<pre>
-<strong>Mock::generatePartial(
-        'Telnet',
-        'TelnetTestVersion',
-        array('createSocket'));</strong>
-
-class TelnetTest extends UnitTestCase {
-    ...
-    function testConnection() {<strong>
-        $socket = new MockSocket();
-        ...
-        $telnet = new TelnetTestVersion();
-        $telnet-&gt;setReturnReference('createSocket', $socket);
-        $telnet-&gt;Telnet();
-        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
-    }
-}
-</pre>
-                La fantaisie partielle est une sous-classe de l'original
-                dont on aurait "remplacé" les méthodes sélectionnées
-                avec des versions de test. L'appel à <span class="new_code">generatePartial()</span>
-                nécessite trois paramètres : la classe à sous classer,
-                le nom de la nouvelle classe et une liste des méthodes à simuler.
-            </p>
-            <p>
-                Instancier les objets qui en résultent est plutôt délicat.
-                L'unique paramètre du constructeur d'un objet fantaisie partiel
-                est la référence du testeur unitaire.
-                Comme avec les objets fantaisie classiques c'est nécessaire
-                pour l'envoi des résultats de test en réponse à la vérification des attentes.
-            </p>
-            <p>
-                Une nouvelle fois le constructeur original n'est pas lancé.
-                Indispensable dans le cas où le constructeur aurait besoin
-                des méthodes fantaisie : elles n'ont pas encore été initiées !
-                Nous initions les valeurs retournées à cet instant et
-                ensuite lançons le constructeur avec ses paramètres normaux.
-                Cette construction en trois étapes de "new",
-                suivie par la mise en place des méthodes et ensuite
-                par la lancement du constructeur proprement dit est
-                ce qui distingue le code d'un objet fantaisie partiel.
-            </p>
-            <p>
-                A part pour leur construction, toutes ces méthodes
-                fantaisie ont les mêmes fonctionnalités que dans
-                le cas des objets fantaisie et toutes les méthodes
-                non fantaisie se comportent comme avant.
-                Nous pouvons mettre en place des attentes très facilement...
-<pre>
-class TelnetTest extends UnitTestCase {
-    ...
-    function testConnection() {
-        $socket = new MockSocket();
-        ...
-        $telnet = new TelnetTestVersion();
-        $telnet-&gt;setReturnReference('createSocket', $socket);
-        <strong>$telnet-&gt;expectOnce('createSocket', array('127.0.0.1', 21));</strong>
-        $telnet-&gt;Telnet();
-        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');
-    }
-}
-</pre>
-                Les objets fantaisie partiels ne sont pas très utilisés.
-				Je les considère comme transitoire.
-				Utile lors d'un remaniement, mais une fois que l'application
-				a eu toutes ses dépendances bien séparées alors
-				ils peuvent disparaître.
-            </p>
-        
-        <h2>
-<a class="target" name="moins"></a>Tester moins qu'une classe</h2>
-            <p>
-                Les méthodes issues d'un objet fantaisie n'ont pas
-                besoin d'être des méthodes fabrique, Il peut s'agir
-                de n'importe quelle sorte de méthode.
-                Ainsi les objets fantaisie partiels nous permettent
-                de prendre le contrôle de n'importe quelle partie d'une classe,
-                le constructeur excepté. Nous pourrions même aller jusqu'à
-                créer des fantaisies sur toutes les méthodes à part celle
-                que nous voulons effectivement tester.
-            </p>
-            <p>
-                Cette situation est assez hypothétique, étant donné
-                que je ne l'ai pas souvent essayée.
-				Je crains qu'en forçant la granularité d'un objet
-                on n'obtienne pas forcément un code de meilleur qualité.
-                Personnellement j'utilise les objets fantaisie partiels
-                comme moyen de passer outre la création ou alors
-                de temps en temps pour tester le modèle de conception TemplateMethod.
-            </p>
-            <p>
-                On en revient toujours aux standards de code de votre projet :
-				c'est à vous de trancher si vous autorisez ce mécanisme ou non.
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            La page du projet SimpleTest sur
-            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            <a href="http://simpletest.org/api/">L'API complète pour SimpleTest</a>
-            à partir de PHPDoc.
-        </li>
-<li>
-            La méthode fabrique protégée est décrite dans
-            <a href="http://www-106.ibm.com/developerworks/java/library/j-mocktest.html">
-            cet article d'IBM</a>. Il s'agit de l'unique papier
-            formel que j'ai vu sur ce problème.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/fr/reporter_documentation.html b/3rdparty/simpletest/docs/fr/reporter_documentation.html
deleted file mode 100644
index 485fc74c7a4..00000000000
--- a/3rdparty/simpletest/docs/fr/reporter_documentation.html
+++ /dev/null
@@ -1,630 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Documentation SimpleTest : le rapporteur de test</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Documentation sur le rapporteur de test</h1>
-        This page...
-        <ul>
-<li>
-            Afficher <a href="#html">les résultats en HTML</a>
-        </li>
-<li>
-            Afficher et <a href="#autres">rapporter les résultats</a>
-            dans d'autres formats
-        </li>
-<li>
-            Utilisé <a href="#cli">SimpleTest depuis la ligne de commande</a>
-        </li>
-<li>
-            <a href="#xml">Utiliser XML</a> pour des tests distants
-        </li>
-</ul>
-<div class="content">
-        
-            <p>
-                SimpleTest suit plutôt plus que moins le modèle MVC (Modèle-Vue-Contrôleur).
-                Les classes "reporter" sont les vues et les modèles
-                sont vos scénarios de test et leur hiérarchie.
-                Le contrôleur est le plus souvent masqué à l'utilisateur
-                de SimpleTest à moins de vouloir changer la façon
-                dont les tests sont effectivement exécutés,
-                auquel cas il est possible de surcharger les objets
-                "runner" (ceux de l'exécuteur) depuis l'intérieur
-                d'un scénario de test. Comme d'habitude avec MVC,
-                le contrôleur est plutôt indéfini et il existe d'autres endroits
-                pour contrôler l'exécution des tests.
-            </p>
-        
-        <h2>
-<a class="target" name="html"></a>Les résultats rapportés au format HTML</h2>
-            <p>
-                L'affichage par défaut est minimal à l'extrême.
-                Il renvoie le succès ou l'échec avec les barres conventionnelles
-                - rouge et verte - et affichent une trace d'arborescence
-                des groupes de test pour chaque assertion erronée. Voici un tel échec...
-                <div class="demo">
-                    <h1>File test</h1>
-                    <span class="fail">Fail</span>: createnewfile-&gt;True assertion failed.<br>
-                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
-                    <strong>0</strong> passes, <strong>1</strong> fails and <strong>0</strong> exceptions.</div>
-                </div>
-                Alors qu'ici tous les tests passent...
-                <div class="demo">
-                    <h1>File test</h1>
-                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
-                    <strong>1</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
-                </div>
-                La bonne nouvelle, c'est qu'il existe pas mal de points
-                dans la hiérarchie de l'affichage pour créer des sous-classes.
-            </p>
-            <p>
-                Pour l'affichage basé sur des pages web,
-                il y a la classe <span class="new_code">HtmlReporter</span> avec la signature suivante...
-<pre>
-class HtmlReporter extends SimpleReporter {
-    public __construct($encoding) { ... }
-    public makeDry(boolean $is_dry) { ... }
-    public void paintHeader(string $test_name) { ... }
-    public void sendNoCacheHeaders() { ... }
-    public void paintFooter(string $test_name) { ... }
-    public void paintGroupStart(string $test_name, integer $size) { ... }
-    public void paintGroupEnd(string $test_name) { ... }
-    public void paintCaseStart(string $test_name) { ... }
-    public void paintCaseEnd(string $test_name) { ... }
-    public void paintMethodStart(string $test_name) { ... }
-    public void paintMethodEnd(string $test_name) { ... }
-    public void paintFail(string $message) { ... }
-    public void paintPass(string $message) { ... }
-    public void paintError(string $message) { ... }
-    public void paintException(string $message) { ... }
-    public void paintMessage(string $message) { ... }
-    public void paintFormattedMessage(string $message) { ... }
-    protected string getCss() { ... }
-    public array getTestList() { ... }
-    public integer getPassCount() { ... }
-    public integer getFailCount() { ... }
-    public integer getExceptionCount() { ... }
-    public integer getTestCaseCount() { ... }
-    public integer getTestCaseProgress() { ... }
-}
-</pre>
-                Voici ce que certaines de ces méthodes veulent dire.
-                Premièrement les méthodes d'affichage que vous voudrez probablement surcharger...
-                <ul class="api">
-                    <li>
-                        <span class="new_code">HtmlReporter(string $encoding)</span><br>
-                        est le constructeur. Notez que le test unitaire initie
-                        le lien à l'affichage plutôt que l'opposé.
-                        L'affichage est principalement un receveur passif
-                        des évènements de tests. Cela permet d'adapter
-                        facilement l'affichage pour d'autres systèmes
-                        en dehors des tests unitaires, tel le suivi
-                        de la charge de serveurs.
-                        L'"encoding" est le type d'encodage
-                        que vous souhaitez utiliser pour l'affichage du test.
-                        Pour pouvoir effectuer un rendu correct de la sortie
-                        de débogage quand on utilise le testeur web,
-                        il doit correspondre à l'encodage du site testé.
-                        Les chaînes de caractères disponibles
-                        sont indiquées dans la fonction PHP
-                        <a href="http://www.php.net/manual/fr/function.htmlentities.php">html_entities()</a>.
-                    </li>
-                    <li>
-                        <span class="new_code">void paintHeader(string $test_name)</span><br>
-                        est appelé une fois, au début du test quand l'évènement
-                        de démarrage survient. Le premier évènement de démarrage
-                        est souvent délivré par le groupe de tests du niveau
-                        le plus haut et donc c'est de là que le
-                        <span class="new_code">$test_name</span> arrive.
-                        Il peint le titre de la page, CSS, la balise "body", etc.
-                        Il ne renvoie rien du tout (<span class="new_code">void</span>).
-                    </li>
-                    <li>
-                        <span class="new_code">void paintFooter(string $test_name)</span><br>
-                        est appelé à la toute fin du test pour fermer
-                        les balises ouvertes par l'entête de la page.
-                        Par défaut il affiche aussi la barre rouge ou verte
-                        et le décompte final des résultats.
-                        En fait la fin des tests arrive quand l'évènement
-                        de fin de test arrive avec le même nom
-                        que celui qui l'a initié au même niveau.
-                        Le nid des tests en quelque sorte.
-                        Fermer le dernier test finit l'affichage.
-                    </li>
-                    <li>
-                        <span class="new_code">void paintMethodStart(string $test_name)</span><br>
-                        est appelé au début de chaque méthode de test.
-                        Normalement le nom vient de celui de la méthode.
-                        Les autres évènements de départ de test
-                        se comportent de la même manière sauf que
-                        celui du groupe de tests indique au rapporteur
-                        le nombre de scénarios de test qu'il contient.
-                        De la sorte le rapporteur peut afficher une barre
-                        de progrès au fur et à mesure que l'exécuteur
-                        passe en revue les scénarios de test.
-                    </li>
-                    <li>
-                        <span class="new_code">void paintMethodEnd(string $test_name)</span><br>
-                        clôt le test lancé avec le même nom.
-                    </li>
-                    <li>
-                        <span class="new_code">void paintFail(string $message)</span><br>
-                        peint un échec. Par défaut il ne fait qu'afficher
-                        le mot "fail", une trace d'arborescence
-                        affichant la position du test en cours
-                        et le message transmis par l'assertion.
-                    </li>
-                    <li>
-                        <span class="new_code">void paintPass(string $message)</span><br>
-                        ne fait rien, par défaut.
-                    </li>
-                    <li>
-                        <span class="new_code">string getCss()</span><br>
-                        renvoie les styles CSS sous la forme d'une chaîne
-                        à l'attention de la méthode d'entêtes d'une page.
-                        Des styles additionnels peuvent être ajoutés ici
-                        si vous ne surchargez pas les entêtes de la page.
-                        Vous ne voudrez pas utiliser cette méthode dans
-                        des entêtes d'une page surchargée si vous souhaitez
-                        inclure le feuille de style CSS d'origine.
-                    </li>
-                </ul>
-                Il y a aussi des accesseurs pour aller chercher l'information
-                sur l'état courant de la suite de test. Vous les utiliserez
-                pour enrichir l'affichage...
-                <ul class="api">
-                    <li>
-                        <span class="new_code">array getTestList()</span><br>
-                        est la première méthode très commode pour les sous-classes.
-                        Elle liste l'arborescence courante des tests
-                        sous la forme d'une liste de noms de tests.
-                        Le premier test -- celui de premier niveau --
-                        sera le premier dans la liste et la méthode de test
-                        en cours sera la dernière.
-                    </li>
-                    <li>
-                        <span class="new_code">integer getPassCount()</span><br>
-                        renvoie le nombre de succès atteint. Il est nécessaire
-                        pour l'affichage à la fin.
-                    </li>
-                    <li>
-                        <span class="new_code">integer getFailCount()</span><br>
-                        renvoie de la même manière le nombre d'échecs.
-                    </li>
-                    <li>
-                        <span class="new_code">integer getExceptionCount()</span><br>
-                        renvoie quant à lui le nombre d'erreurs.
-                    </li>
-                    <li>
-                        <span class="new_code">integer getTestCaseCount()</span><br>
-                        est le nombre total de scénarios lors de l'exécution des tests.
-                        Il comprend aussi les tests groupés.
-                    </li>
-                    <li>
-                        <span class="new_code">integer getTestCaseProgress()</span><br>
-                        est le nombre de scénarios réalisés jusqu'à présent.
-                    </li>
-                </ul>
-                Une modification simple : demander à l'HtmlReporter d'afficher
-                aussi bien les succès que les échecs et les erreurs...
-<pre>
-<strong>class ReporterShowingPasses extends HtmlReporter {
-    
-    function paintPass($message) {
-        parent::paintPass($message);
-        print "&lt;span class=\"pass\"&gt;Pass&lt;/span&gt;: ";
-        $breadcrumb = $this-&gt;getTestList();
-        array_shift($breadcrumb);
-        print implode("-&amp;gt;", $breadcrumb);
-        print "-&amp;gt;$message&lt;br /&gt;\n";
-    }
-    
-    protected function getCss() {
-        return parent::getCss() . ' .pass { color: green; }';
-    }
-}</strong>
-</pre>
-            </p>
-            <p>
-                Une méthode qui a beaucoup fait jaser reste la méthode <span class="new_code">makeDry()</span>.
-                Si vous lancez cette méthode, sans paramètre,
-                sur le rapporteur avant que la suite de test
-                ne soit exécutée alors aucune méthode de test
-                ne sera appelée. Vous continuerez à avoir
-                les évènements entrants et sortants des méthodes
-                et scénarios de test, mais aucun succès ni échec ou erreur,
-                parce que le code de test ne sera pas exécuté.
-            </p>
-            <p>
-                La raison ? Pour permettre un affichage complexe
-                d'une IHM (ou GUI) qui permettrait la sélection
-                de scénarios de test individuels.
-                Afin de construire une liste de tests possibles,
-                ils ont besoin d'un rapport sur la structure du test
-                pour l'affichage, par exemple, d'une vue en arbre
-                de la suite de test. Avec un rapporteur lancé
-                sur une exécution sèche qui ne renverrait
-                que les évènements d'affichage, cela devient
-                facilement réalisable.
-            </p>
-        
-        <h2>
-<a class="target" name="autre"></a>Etendre le rapporteur</h2>
-            <p>
-                Plutôt que de modifier l'affichage existant,
-                vous voudrez peut-être produire une présentation HTML
-                complètement différente, ou même générer une version texte ou XML.
-                Plutôt que de surcharger chaque méthode dans 
-                <span class="new_code">HtmlReporter</span> nous pouvons nous rendre
-                une étape plus haut dans la hiérarchie de classe vers
-                <span class="new_code">SimpleReporter</span> dans le fichier source <em>simple_test.php</em>.
-            </p>
-            <p>
-                Un affichage sans rien, un canevas vierge
-                pour votre propre création, serait...
-<pre>
-<strong>require_once('simpletest/simpletest.php');</strong>
-
-class MyDisplay extends SimpleReporter {<strong>
-    </strong>
-    function paintHeader($test_name) { }
-    
-    function paintFooter($test_name) { }
-    
-    function paintStart($test_name, $size) {<strong>
-        parent::paintStart($test_name, $size);</strong>
-    }
-    
-    function paintEnd($test_name, $size) {<strong>
-        parent::paintEnd($test_name, $size);</strong>
-    }
-    
-    function paintPass($message) {<strong>
-        parent::paintPass($message);</strong>
-    }
-    
-    function paintFail($message) {<strong>
-        parent::paintFail($message);</strong>
-    }
-    
-    function paintError($message) {<strong>
-        parent::paintError($message);</strong>
-    }
-    
-    function paintException($exception) {<strong>
-        parent::paintException($exception);</strong>
-    }
-}
-</pre>
-                Aucune sortie ne viendrait de cette classe jusqu'à un ajout de votre part.
-            </p>
-			 <p>
-                Sauf qu'il y a un problème : en utilisant cette cette classe
-				de bas niveau, vous devez explicitement l'invoquer
-				dans les scripts de test.
-				La commande "autorun" ne sera pas capable
-				d'utiliser son contexte courant (qu'elle soit lancée
-				dans un navigateur web ou via une ligne de commande)
-				pour sélectionner le rapporteur.
-            </p>
-            <p>
-                Vous invoquez explicitement la lanceur de tests comme suit...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-$test = new TestSuite('File test');
-$test-&gt;addFile('tests/file_test.php');
-$test-&gt;run(<strong>new MyReporter()</strong>);
-?&gt;
-</pre>
-                ...ou peut-être comme cela...
-<pre>
-&lt;?php
-require_once('simpletest/simpletest.php');
-require_once('my_reporter.php');
-
-class MyTest extends TestSuite {
-    function __construct() {
-        parent::__construct();
-        $this-&gt;addFile('tests/file_test.php');
-    }
-}
-
-$test = new MyTest();
-$test-&gt;run(<strong>new MyReporter()</strong>);
-?&gt;
-</pre>
-                Nous verrons plus comment l'intégrer avec l'"autorun".
-            </p>
-        
-        <h2>
-<a class="target" name="cli"></a>Le rapporteur en ligne de commande</h2>
-            <p>
-                SimpleTest est aussi livré avec un rapporteur
-                en ligne de commande, minime lui aussi.
-                Pour utiliser le rapporteur en ligne de commande explicitement,
-                il suffit de l'intervertir avec celui de la version HTML...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-$test = new TestSuite('File test');
-$test-&gt;addFile('tests/file_test.php');
-$test-&gt;run(<strong>new TextReporter()</strong>);
-?&gt;
-</pre>
-                Et ensuite d'invoquer la suite de test à partir d'une ligne de commande...
-<pre class="shell">
-php file_test.php
-</pre>
-                Bien sûr vous aurez besoin d'installer PHP
-                en ligne de commande. Une suite de test qui
-                passerait toutes ses assertions ressemble à...
-<pre class="shell">
-File test
-OK
-Test cases run: 1/1, Passes: 1, Failures: 0, Exceptions: 0
-</pre>
-                Un échec déclenche un affichage comme...
-<pre class="shell">
-File test
-1) True assertion failed.
-    in createNewFile
-FAILURES!!!
-Test cases run: 1/1, Passes: 0, Failures: 1, Exceptions: 0
-</pre>
-            </p>
-            <p>
-                Une des principales raisons pour utiliser
-                une suite de test en ligne de commande tient
-                dans l'utilisation possible du testeur avec
-                un processus automatisé. Pour fonctionner comme
-                il faut dans des scripts shell le script de test
-                devrait renvoyer un code de sortie non-nul suite à un échec.
-                Si une suite de test échoue la valeur <span class="new_code">false</span>
-                est renvoyée par la méthode <span class="new_code">SimpleTest::run()</span>.
-                Nous pouvons utiliser ce résultat pour terminer le script
-                avec la bonne valeur renvoyée...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-$test = new TestSuite('File test');
-$test-&gt;addFile('tests/file_test.php');
-<strong>exit ($test-&gt;run(new TextReporter()) ? 0 : 1);</strong>
-?&gt;
-</pre>
-                Bien sûr l'objectif ne serait pas de créer deux scripts de test,
-                l'un en ligne de commande et l'autre pour un navigateur web,
-                pour chaque suite de test.
-                Le rapporteur en ligne de commande inclut
-                une méthode pour déterminer l'environnement d'exécution...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-$test = new TestSuite('File test');
-$test-&gt;addFile('tests/file_test.php');
-<strong>if (TextReporter::inCli()) {</strong>
-    exit ($test-&gt;run(new TextReporter()) ? 0 : 1);
-<strong>}</strong>
-$test-&gt;run(new HtmlReporter());
-?&gt;
-</pre>
-                Il s'agit là de la forme utilisée par SimpleTest lui-même.
-                Quand vous utilisez l'"autorun.php"
-				et qu'aucun test n'a été lancé avant la fin,
-				c'est quasiment le code que SimpleTest lancera
-				pour vous implicitement.
-            </p>
-            <p>
-                En d'autres termes, ceci donne le même résultat...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');
-
-class MyTest extends TestSuite {
-    function __construct() {
-        parent::__construct();
-        $this-&gt;addFile('tests/file_test.php');
-    }
-}
-?&gt;
-</pre>            </p>
-        
-        <h2>
-<a class="target" name="xml"></a>Test distant</h2>
-            <p>
-                SimpleTest est livré avec une classe <span class="new_code">XmlReporter</span>
-                utilisée pour de la communication interne.
-                Lors de son exécution, le résultat ressemble à...
-<pre class="shell">
-&lt;?xml version="1.0"?&gt;
-&lt;run&gt;
-  &lt;group size="4"&gt;
-    &lt;name&gt;Remote tests&lt;/name&gt;
-    &lt;group size="4"&gt;
-      &lt;name&gt;Visual test with 48 passes, 48 fails and 4 exceptions&lt;/name&gt;
-      &lt;case&gt;
-        &lt;name&gt;testofunittestcaseoutput&lt;/name&gt;
-        &lt;test&gt;
-          &lt;name&gt;testofresults&lt;/name&gt;
-          &lt;pass&gt;This assertion passed&lt;/pass&gt;
-          &lt;fail&gt;This assertion failed&lt;/fail&gt;
-        &lt;/test&gt;
-        &lt;test&gt;
-          ...
-        &lt;/test&gt;
-      &lt;/case&gt;
-    &lt;/group&gt;
-  &lt;/group&gt;
-&lt;/run&gt;
-</pre>
-                Pour faire en sorte ue vos scénarios de test produisent ce format,
-				dans la ligne de commande, ajoutez le flag <span class="new_code">--xml</span>.
-<pre class="shell">
-php my_test.php --xml
-</pre>
-                Vous pouvez faire la même chose dans le navigation web
-				en ajoutant le paramètre <span class="new_code">xml=1</span> dans l'URL.
-				N'importe quelle valeur "true" fera l'affaire.
-            </p>
-            <p>
-				Vous pouvez utiliser ce format avec le parseur
-                fourni dans SimpleTest lui-même.
-                Il s'agit de <span class="new_code">SimpleTestXmlParser</span>
-                et se trouve <em>xml.php</em> à l'intérieur du paquet SimpleTest...
-<pre>
-&lt;?php
-require_once('simpletest/xml.php');
-    
-...
-$parser = new SimpleTestXmlParser(new HtmlReporter());
-$parser-&gt;parse($test_output);
-?&gt;
-</pre>
-                <span class="new_code">$test_output</span> devrait être au format XML,
-                à partir du rapporteur XML, et pourrait venir
-                d'une exécution en ligne de commande d'un scénario de test.
-                Le parseur envoie des évènements au rapporteur exactement
-                comme tout autre exécution de test.
-                Il y a des occasions bizarres dans lesquelles c'est en fait très utile.
-            </p>
-			<p>
-                Le plus courant, c'est quand vous voulez isoler
-				un test sensible au crash.
-				Vous pouvez collecter la sortie XML en utilisant
-				l'opérateur antiquote (Ndt : backtick) à partir
-				d'un autre test.
-				De la sorte, il tourne dans son propre processus...
-<pre>
-&lt;?php
-require_once('simpletest/xml.php');
-
-if (TextReporter::inCli()) {
-    $parser = new SimpleTestXmlParser(new TextReporter());
-} else {
-    $parser = new SimpleTestXmlParser(new HtmlReporter());
-}
-$parser-&gt;parse(`php flakey_test.php --xml`);
-?&gt;
-</pre>
-            </p>
-            <p>
-                Un autre cas est celui des très longues suites de tests.
-            </p>
-			<p>
-                Elles peuvent venir à bout de la limite de mémoire
-                par défaut d'un process PHP - 16Mb.
-                En plaçant la sortie des groupes de test dans du XML
-                et leur exécution dans des process différents,
-                le résultat peut être parsé à nouveau pour agréger
-                les résultats avec moins d'impact sur le test au premier niveau.
-            </p>
-            <p>
-                Parce que la sortie XML peut venir de n'importe où,
-                ça ouvre des possibilités d'agrégation d'exécutions de test
-                depuis des serveur distants.
-                Un scénario de test pour le réaliser existe déjà
-                à l'intérieur du framework SimpleTest, mais il est encore expérimental...
-<pre>
-&lt;?php
-<strong>require_once('../remote.php');</strong>
-require_once('simpletest/autorun.php');
-    
-$test_url = ...;
-$dry_url = ...;
-
-class MyTestOnAnotherServer extends RemoteTestCase {
-    function __construct() {
-        $test_url = ...
-        parent::__construct($test_url, $test_url . ' --dry');
-    }
-}
-?&gt;
-</pre>
-                <span class="new_code">RemoteTestCase</span> prend la localisation réelle
-                du lanceur de test, tout simplement un page web au format XML.
-                Il prend aussi l'URL d'un rapporteur initié
-                pour effectuer une exécution sèche.
-                Cette technique est employée pour que les progrès
-                soient correctement rapportés vers le haut.
-                <span class="new_code">RemoteTestCase</span> peut être ajouté à
-                une suite de test comme n'importe quelle autre suite de tests.
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            La page du projet SimpleTest sur
-            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            La page de téléchargement de SimpleTest sur
-            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-<li>
-            L'<a href="http://simpletest.org/api/">API pour développeur de SimpleTest</a>
-            donne tous les détails sur les classes et les assertions disponibles.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/fr/unit_test_documentation.html b/3rdparty/simpletest/docs/fr/unit_test_documentation.html
deleted file mode 100644
index a7c31f95dbb..00000000000
--- a/3rdparty/simpletest/docs/fr/unit_test_documentation.html
+++ /dev/null
@@ -1,447 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Documentation SimpleTest pour les tests de régression en PHP</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Documentation sur les tests unitaires en PHP</h1>
-        This page...
-        <ul>
-<li>
-            <a href="#unitaire">Scénarios de test unitaire</a>
-            et opérations basiques.
-        </li>
-<li>
-            <a href="#extension_unitaire">Étendre des scénarios de test</a>
-            pour les personnaliser à votre propre projet.
-        </li>
-<li>
-            <a href="#lancement_unitaire">Lancer un scénario seul</a>
-            comme un script unique.
-        </li>
-</ul>
-<div class="content">
-        <h2>
-<a class="target" name="unitaire"></a>Scénarios de tests unitaires</h2>
-            <p>
-                Le coeur du système est un framework de tests de régression
-                construit autour des scénarios de test.
-                Un exemple de scénario de test ressemble à...
-<pre>
-<strong>class FileTestCase extends UnitTestCase {
-}</strong>
-</pre>
-                Si aucun nom de test n'est fourni au moment
-                de la liaison avec le constructeur alors
-                le nom de la classe sera utilisé.
-                Il s'agit du nom qui sera affiché dans les résultats du test.
-            </p>
-            <p>
-                Les véritables tests sont ajoutés en tant que méthode
-                dans le scénario de test dont le nom par défaut
-                commence par la chaîne "test"
-                et quand le scénario de test est appelé toutes les méthodes
-                de ce type sont exécutées dans l'ordre utilisé
-                par l'introspection de PHP pour les trouver.
-                Peuvent être ajoutées autant de méthodes de test que nécessaires.
-                Par exemple...
-<pre>
-require_once('simpletest/autorun.php');
-require_once('../classes/writer.php');
-
-class FileTestCase extends UnitTestCase {
-    function FileTestCase() {
-        $this-&gt;UnitTestCase('File test');
-    }<strong>
-
-    function setUp() {
-        @unlink('../temp/test.txt');
-    }
-
-    function tearDown() {
-        @unlink('../temp/test.txt');
-    }
-
-    function testCreation() {
-        $writer = &amp;new FileWriter('../temp/test.txt');
-        $writer-&gt;write('Hello');
-        $this-&gt;assertTrue(file_exists('../temp/test.txt'), 'File created');
-    }</strong>
-}
-</pre>
-                Le constructeur est optionnel et souvent omis. Sans nom,
-                le nom de la classe est utilisé comme nom pour le scénario de test.
-            </p>
-            <p>
-                Notre unique méthode de test pour le moment est
-                <span class="new_code">testCreation()</span> où nous vérifions
-                qu'un fichier a bien été créé par notre objet
-                <span class="new_code">Writer</span>. Nous pourrions avoir mis
-                le code <span class="new_code">unlink()</span> dans cette méthode,
-                mais en la plaçant dans <span class="new_code">setUp()</span>
-                et <span class="new_code">tearDown()</span> nous pouvons l'utiliser
-                pour nos autres méthodes de test que nous ajouterons.
-            </p>
-            <p>
-                La méthode <span class="new_code">setUp()</span> est lancé
-                juste avant chaque méthode de test.
-                <span class="new_code">tearDown()</span> est lancé après chaque méthode de test.
-            </p>
-            <p>
-                Vous pouvez placer une initialisation de
-                scénario de test dans le constructeur afin qu'elle soit lancée
-                pour toutes les méthodes dans le scénario de test
-                mais dans un tel cas vous vous exposeriez à des interférences.
-                Cette façon de faire est légèrement moins rapide,
-                mais elle est plus sûre.
-                Notez que si vous arrivez avec des notions de JUnit,
-                il ne s'agit pas du comportement auquel vous êtes habitués.
-                Bizarrement JUnit re-instancie le scénario de test
-                pour chaque méthode de test pour se prévenir
-                d'une telle interférence.
-                SimpleTest demande à l'utilisateur final d'utiliser
-                <span class="new_code">setUp()</span>, mais fournit aux codeurs de bibliothèque d'autres crochets.
-            </p>
-            <p>
-                Pour rapporter les résultats de test,
-                le passage par une classe d'affichage - notifiée par
-                les différentes méthodes de type <span class="new_code">assert...()</span> -
-                est utilisée. En voici la liste complète pour
-                la classe <span class="new_code">UnitTestCase</span>,
-                celle par défaut dans SimpleTest...
-            <table><tbody>
-                <tr>
-<td><span class="new_code">assertTrue($x)</span></td>
-<td>Echoue si $x est faux</td>
-</tr>
-                <tr>
-<td><span class="new_code">assertFalse($x)</span></td>
-<td>Echoue si $x est vrai</td>
-</tr>
-                <tr>
-<td><span class="new_code">assertNull($x)</span></td>
-<td>Echoue si $x est initialisé</td>
-</tr>
-                <tr>
-<td><span class="new_code">assertNotNull($x)</span></td>
-<td>Echoue si $x n'est pas initialisé</td>
-</tr>
-                <tr>
-<td><span class="new_code">assertIsA($x, $t)</span></td>
-<td>Echoue si $x n'est pas de la classe ou du type $t</td>
-</tr>
-                <tr>
-<td><span class="new_code">assertEqual($x, $y)</span></td>
-<td>Echoue si $x == $y est faux</td>
-</tr>
-                <tr>
-<td><span class="new_code">assertNotEqual($x, $y)</span></td>
-<td>Echoue si $x == $y est vrai</td>
-</tr>
-                <tr>
-<td><span class="new_code">assertIdentical($x, $y)</span></td>
-<td>Echoue si $x === $y est faux</td>
-</tr>
-                <tr>
-<td><span class="new_code">assertNotIdentical($x, $y)</span></td>
-<td>Echoue si $x === $y est vrai</td>
-</tr>
-                <tr>
-<td><span class="new_code">assertReference($x, $y)</span></td>
-<td>Echoue sauf si $x et $y sont la même variable</td>
-</tr>
-                <tr>
-<td><span class="new_code">assertCopy($x, $y)</span></td>
-<td>Echoue si $x et $y sont la même variable</td>
-</tr>
-                <tr>
-<td><span class="new_code">assertPattern($p, $x)</span></td>
-<td>Echoue sauf si l'expression rationnelle $p capture $x</td>
-</tr>
-                <tr>
-<td><span class="new_code">assertNoPattern($p, $x)</span></td>
-<td>Echoue si l'expression rationnelle $p capture $x</td>
-</tr>
-                <tr>
-<td><span class="new_code">expectError($x)</span></td>
-<td>Echoue si l'erreur correspondante n'arrive pas</td>
-</tr>
-                <tr>
-<td><span class="new_code">expectException($x)</span></td>
-<td>Echoue si l'exception correspondante n'est pas levée</td>
-</tr>
-                <tr>
-<td><span class="new_code">ignoreException($x)</span></td>
-<td>Avale toutes les exceptions correspondantes qui surviendraient</td>
-</tr>
-                <tr>
-<td><span class="new_code">assert($e)</span></td>
-<td>Echoue sur un objet <a href="expectation_documentation.html">attente</a> $e qui échouerait</td>
-</tr>
-            </tbody></table>
-                Toutes les méthodes d'assertion peuvent recevoir
-                une description optionnelle :
-                cette description sert pour étiqueter le résultat.
-                Sans elle, une message par défaut est envoyée à la place :
-                il est généralement suffisant.
-                Ce message par défaut peut encore être encadré
-                dans votre propre message si vous incluez "%s"
-                dans la chaîne.
-                Toutes les assertions renvoient vrai / true en cas de succès
-                et faux / false en cas d'échec.
-            </p>
-            <p>
-                D'autres exemples...
-<pre>
-<strong>$variable = null;
-$this-&gt;assertNull($variable, 'Should be cleared');</strong>
-</pre>
-                ...passera et normalement n'affichera aucun message.
-                Si vous avez <a href="http://www.lastcraft.com/display_subclass_tutorial.php">
-                configuré le testeur pour afficher aussi les succès</a>
-                alors le message sera affiché comme tel.
-<pre>
-<strong>$this-&gt;assertIdentical(0, false, 'Zero is not false [%s]');</strong>
-</pre>
-                Ceci échouera étant donné qu'il effectue une vérification
-                sur le type en plus d'une comparaison sur les deux valeurs.
-                La partie "%s" est remplacée par le message d'erreur
-                par défaut qui aurait été affiché si nous n'avions pas fourni le nôtre.
-                Cela nous permet d'emboîter les messages de test.
-<pre>
-<strong>$a = 1;
-$b = $a;
-$this-&gt;assertReference($a, $b);</strong>
-</pre>
-                Échouera étant donné que la variable <span class="new_code">$b</span>
-                est une copie de <span class="new_code">$a</span>.
-<pre>
-<strong>$this-&gt;assertPattern('/hello/i', 'Hello world');</strong>
-</pre>
-                Là, ça passe puisque la recherche est insensible
-                à la casse et que donc <span class="new_code">hello</span>
-                est bien repérable dans <span class="new_code">Hello world</span>.
-<pre>
-<strong>$this-&gt;expectError();</strong>
-trigger_error('Catastrophe');
-</pre>
-                Ici la vérification attrape le message "Catastrophe"
-				sans vérifier le texte et passe.
-				Elle enlève l'erreur de la queue au passage.
-<pre>
-<strong>$this-&gt;expectError('Catastrophe');</strong>
-trigger_error('Catastrophe');
-</pre>
-                La vérification d'erreur suivante teste non seulement
-				l'existance de l'erreur mais aussi le texte qui,
-				dans le cas présent, correspond et donc un nouveau succès.
-				Si des erreurs non vérifiées sont laissées pour compte
-				à la fin d'une méthode de test alors un exception sera levé
-				dans le test.
-            </p>
-            <p>
-                Notez que SimpleTest ne peut pas attraper des erreurs PHP
-				au moment de la compilation.
-            </p>
-            <p>
-                Les scénarios de tests peuvent utiliser des méthodes
-                bien pratiques pour déboguer le code ou pour étendre la suite...
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">setUp()</span></td>
-<td>Est lancée avant chaque méthode de test</td>
-</tr>
-                    <tr>
-<td><span class="new_code">tearDown()</span></td>
-<td>Est lancée après chaque méthode de test</td>
-</tr>
-                    <tr>
-<td><span class="new_code">pass()</span></td>
-<td>Envoie un succès</td>
-</tr>
-                    <tr>
-<td><span class="new_code">fail()</span></td>
-<td>Envoie un échec</td>
-</tr>
-                    <tr>
-<td><span class="new_code">error()</span></td>
-<td>Envoi un évènement exception</td>
-</tr>
-                    <tr>
-<td><span class="new_code">signal($type, $payload)</span></td>
-<td>Envoie un message défini par l'utilisateur au rapporteur du test</td>
-</tr>
-                    <tr>
-<td><span class="new_code">dump($var)</span></td>
-<td>Effectue un <span class="new_code">print_r()</span> formaté pour du déboguage rapide et grossier</td>
-</tr>
-                </tbody></table>
-            </p>
-        
-        <h2>
-<a class="target" name="extension_unitaire"></a>Etendre les scénarios de test</h2>
-            <p>
-                Bien sûr des méthodes supplémentaires de test
-                peuvent être ajoutées pour créer d'autres types
-                de scénario de test afin d'étendre le framework...
-<pre>
-require_once('simpletest/autorun.php');
-<strong>
-class FileTester extends UnitTestCase {
-    function FileTester($name = false) {
-        $this-&gt;UnitTestCase($name);
-    }
-
-    function assertFileExists($filename, $message = '%s') {
-        $this-&gt;assertTrue(
-                file_exists($filename),
-                sprintf($message, 'File [$filename] existence check'));
-    }</strong>
-}
-</pre>
-                Ici la bibliothèque SimpleTest est localisée
-                dans un répertoire local appelé <em>simpletest</em>.
-                Pensez à le modifier pour votre propre environnement.
-            </p>
-            <p>
-                Alternativement vous pourriez utiliser dans votre code
-                un directive <span class="new_code">SimpleTestOptions::ignore('FileTester');</span>.
-            </p>
-            <p>
-                Ce nouveau scénario peut être hérité exactement
-                comme un scénario de test classique...
-<pre>
-class FileTestCase extends <strong>FileTester</strong> {
-
-    function setUp() {
-        @unlink('../temp/test.txt');
-    }
-
-    function tearDown() {
-        @unlink('../temp/test.txt');
-    }
-
-    function testCreation() {
-        $writer = &amp;new FileWriter('../temp/test.txt');
-        $writer-&gt;write('Hello');<strong>
-        $this-&gt;assertFileExists('../temp/test.txt');</strong>
-    }
-}
-</pre>
-            </p>
-            <p>
-                Si vous souhaitez un scénario de test sans
-                toutes les assertions de <span class="new_code">UnitTestCase</span>
-                mais uniquement avec les vôtres propres,
-                vous aurez besoin d'étendre la classe
-                <span class="new_code">SimpleTestCase</span> à la place.
-                Elle se trouve dans <em>simple_test.php</em>
-                en lieu et place de <em>unit_tester.php</em>.
-                A consulter <a href="group_test_documentation.html">plus tard</a>
-                si vous souhaitez incorporer les scénarios
-                d'autres testeurs unitaires dans votre suite de test.
-            </p>
-        
-        <h2>
-<a class="target" name="lancement_unitaire"></a>Lancer un unique scénario de test</h2>
-            <p>
-                Ce n'est pas souvent qu'il faille lancer des scénarios
-                avec un unique test. Sauf lorsqu'il s'agit de s'arracher
-                les cheveux sur un module à problème sans pour
-                autant désorganiser la suite de test principale.
-                Avec <em>autorun</em> aucun échafaudage particulier
-                n'est nécessaire, il suffit de lancer votre test et
-                vous y êtes.
-            </p>
-            <p>
-                Vous pouvez même décider quel rapporteur
-                (par exemple, <span class="new_code">TextReporter</span> ou <span class="new_code">HtmlReporter</span>)
-                vous préférez pour un fichier spécifique quand il est lancé
-                tout seul...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');<strong>
-SimpleTest :: prefer(new TextReporter());</strong>
-require_once('../classes/writer.php');
-
-class FileTestCase extends UnitTestCase {
-    ...
-}
-?&gt;
-</pre>
-                Ce script sera lancé tel que mais il n'y aura
-                aucun succès ou échec avant que des méthodes de test soient ajoutées.
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            La page de SimpleTest sur
-            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            La page de téléchargement de SimpleTest sur
-            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-<li>
-            <a href="http://simpletest.org/api/">L'API complète de SimpleTest</a>
-            à partir de PHPDoc.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/docs/fr/web_tester_documentation.html b/3rdparty/simpletest/docs/fr/web_tester_documentation.html
deleted file mode 100644
index 308fbc9ccbb..00000000000
--- a/3rdparty/simpletest/docs/fr/web_tester_documentation.html
+++ /dev/null
@@ -1,570 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Documentation SimpleTest : tester des scripts web</title>
-<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
-</head>
-<body>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<h1>Documentation sur le testeur web</h1>
-        This page...
-        <ul>
-<li>
-            Réussir à <a href="#telecharger">télécharger une page web</a>
-        </li>
-<li>
-            Tester le <a href="#contenu">contenu de la page</a>
-        </li>
-<li>
-            <a href="#navigation">Naviguer sur un site web</a> pendant le test
-        </li>
-<li>
-            Méthodes pour <a href="#requete">modifier une requête</a> et pour déboguer
-        </li>
-</ul>
-<div class="content">
-        <h2>
-<a class="target" name="telecharger"></a>Télécharger une page</h2>
-            <p>
-                Tester des classes c'est très bien.
-                Reste que PHP est avant tout un langage
-                pour créer des fonctionnalités à l'intérieur de pages web.
-                Comment pouvons tester la partie de devant
-                -- celle de l'interface -- dans nos applications en PHP ?
-                Etant donné qu'une page web n'est constituée que de texte,
-                nous devrions pouvoir les examiner exactement
-                comme n'importe quelle autre donnée de test.
-            </p>
-            <p>
-                Cela nous amène à une situation délicate.
-                Si nous testons dans un niveau trop bas,
-                vérifier des balises avec un motif ad hoc par exemple,
-                nos tests seront trop fragiles. Le moindre changement
-                dans la présentation pourrait casser un grand nombre de test.
-                Si nos tests sont situés trop haut, en utilisant
-                une version fantaisie du moteur de template pour
-                donner un cas précis, alors nous perdons complètement
-                la capacité à automatiser certaines classes de test.
-                Par exemple, l'interaction entre des formulaires
-                et la navigation devra être testé manuellement.
-                Ces types de test sont extrêmement fastidieux
-                et plutôt sensibles aux erreurs.
-            </p>
-            <p>
-                SimpleTest comprend une forme spéciale de scénario
-                de test pour tester les actions d'une page web.
-                <span class="new_code">WebTestCase</span> inclut des facilités pour la navigation,
-                des vérifications sur le contenu
-                et les cookies ainsi que la gestion des formulaires.
-                Utiliser ces scénarios de test ressemble
-                fortement à <span class="new_code">UnitTestCase</span>...
-<pre>
-<strong>class TestOfLastcraft extends WebTestCase {
-}</strong>
-</pre>
-                Ici nous sommes sur le point de tester
-                le site de <a href="http://www.lastcraft.com/">Last Craft</a>.
-                Si ce scénario de test est situé dans un fichier appelé
-                <em>lastcraft_test.php</em> alors il peut être chargé
-                dans un script de lancement tout comme des tests unitaires...
-<pre>
-&lt;?php
-require_once('simpletest/autorun.php');<strong>
-require_once('simpletest/web_tester.php');</strong>
-SimpleTest::prefer(new TextReporter());
-
-class WebTests extends TestSuite {
-    function WebTests() {
-        $this-&gt;TestSuite('Web site tests');<strong>
-        $this-&gt;addFile('lastcraft_test.php');</strong>
-    }
-}
-?&gt;
-</pre>
-                J'utilise ici le rapporteur en mode texte
-                pour mieux distinguer le contenu au format HTML
-                du résultat du test proprement dit.
-            </p>
-            <p>
-                Rien n'est encore testé. Nous pouvons télécharger
-                la page d'accueil en utilisant la méthode <span class="new_code">get()</span>...
-<pre>
-class TestOfLastcraft extends WebTestCase {
-    <strong>
-    function testHomepage() {
-        $this-&gt;assertTrue($this-&gt;get('http://www.lastcraft.com/'));
-    }</strong>
-}
-</pre>
-                La méthode <span class="new_code">get()</span> renverra "true"
-                uniquement si le contenu de la page a bien été téléchargé.
-                C'est un moyen simple, mais efficace pour vérifier
-                qu'une page web a bien été délivré par le serveur web.
-                Cependant le contenu peut révéler être une erreur 404
-                et dans ce cas notre méthode <span class="new_code">get()</span> renverrait encore un succès.
-            </p>
-            <p>
-                En supposant que le serveur web pour le site Last Craft
-                soit opérationnel (malheureusement ce n'est pas toujours le cas),
-                nous devrions voir...
-<pre class="shell">
-Web site tests
-OK
-Test cases run: 1/1, Failures: 0, Exceptions: 0
-</pre>
-                Nous avons vérifié qu'une page, de n'importe quel type,
-                a bien été renvoyée. Nous ne savons pas encore
-                s'il s'agit de celle que nous souhaitions.
-            </p>
-        
-        <h2>
-<a class="target" name="contenu"></a>Tester le contenu d'une page</h2>
-            <p>
-                Pour obtenir la confirmation que la page téléchargée
-                est bien celle que nous attendions,
-                nous devons vérifier son contenu.
-<pre>
-class TestOfLastcraft extends WebTestCase {
-    
-    function testHomepage() {<strong>
-        $this-&gt;get('http://www.lastcraft.com/');
-        $this-&gt;assertWantedPattern('/why the last craft/i');</strong>
-    }
-}
-</pre>
-                La page obtenue par le dernier téléchargement est
-                placée dans un buffer au sein même du scénario de test.
-                Il n'est donc pas nécessaire de s'y référer directement.
-                La correspondance du motif est toujours effectuée
-                par rapport à ce buffer.
-            </p>
-            <p>
-                Voici une liste possible d'assertions sur le contenu...
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">assertWantedPattern($pattern)</span></td>
-<td>Vérifier une correspondance sur le contenu via une expression rationnelle Perl</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNoUnwantedPattern($pattern)</span></td>
-<td>Une expression rationnelle Perl pour vérifier une absence</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertTitle($title)</span></td>
-<td>Passe si le titre de la page correspond exactement</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertLink($label)</span></td>
-<td>Passe si un lien avec ce texte est présent</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNoLink($label)</span></td>
-<td>Passe si aucun lien avec ce texte est présent</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertLinkById($id)</span></td>
-<td>Passe si un lien avec cet attribut d'identification est présent</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertField($name, $value)</span></td>
-<td>Passe si une balise input avec ce nom contient cette valeur</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertFieldById($id, $value)</span></td>
-<td>Passe si une balise input avec cet identifiant contient cette valeur</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertResponse($codes)</span></td>
-<td>Passe si la réponse HTTP trouve une correspondance dans la liste</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertMime($types)</span></td>
-<td>Passe si le type MIME se retrouve dans cette liste</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertAuthentication($protocol)</span></td>
-<td>Passe si l'authentification provoquée est de ce type de protocole</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNoAuthentication()</span></td>
-<td>Passe s'il n'y pas d'authentification provoquée en cours</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertRealm($name)</span></td>
-<td>Passe si le domaine provoqué correspond</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertHeader($header, $content)</span></td>
-<td>Passe si une entête téléchargée correspond à cette valeur</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNoUnwantedHeader($header)</span></td>
-<td>Passe si une entête n'a pas été téléchargé</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertHeaderPattern($header, $pattern)</span></td>
-<td>Passe si une entête téléchargée correspond à cette expression rationnelle Perl</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertCookie($name, $value)</span></td>
-<td>Passe s'il existe un cookie correspondant</td>
-</tr>
-                    <tr>
-<td><span class="new_code">assertNoCookie($name)</span></td>
-<td>Passe s'il n'y a pas de cookie avec un tel nom</td>
-</tr>
-                </tbody></table>
-                Comme d'habitude avec les assertions de SimpleTest,
-                elles renvoient toutes "false" en cas d'échec
-                et "true" si c'est un succès.
-                Elles renvoient aussi un message de test optionnel :
-                vous pouvez l'ajouter dans votre propre message en utilisant "%s".
-            </p>
-            <p>
-                A présent nous pourrions effectué le test sur le titre uniquement...
-<pre>
-<strong>$this-&gt;assertTitle('The Last Craft?');</strong>
-</pre>
-                En plus d'une simple vérification sur le contenu HTML,
-                nous pouvons aussi vérifier que le type MIME est bien d'un type acceptable...
-<pre>
-<strong>$this-&gt;assertMime(array('text/plain', 'text/html'));</strong>
-</pre>
-                Plus intéressant encore est la vérification sur
-                le code de la réponse HTTP. Pareillement au type MIME,
-                nous pouvons nous assurer que le code renvoyé se trouve
-                bien dans un liste de valeurs possibles...
-<pre>
-class TestOfLastcraft extends WebTestCase {
-    
-    function testHomepage() {
-        $this-&gt;get('http://simpletest.sourceforge.net/');<strong>
-        $this-&gt;assertResponse(200);</strong>
-    }
-}
-</pre>
-                Ici nous vérifions que le téléchargement s'est
-                bien terminé en ne permettant qu'une réponse HTTP 200.
-                Ce test passera, mais ce n'est pas la meilleure façon de procéder.
-                Il n'existe aucune page sur <em>http://simpletest.sourceforge.net/</em>,
-                à la place le serveur renverra une redirection vers
-                <em>http://www.lastcraft.com/simple_test.php</em>.
-                <span class="new_code">WebTestCase</span> suit automatiquement trois
-                de ces redirections. Les tests sont quelque peu plus
-                robustes de la sorte. Surtout qu'on est souvent plus intéressé
-                par l'interaction entre les pages que de leur simple livraison.
-                Si les redirections se révèlent être digne d'intérêt,
-                il reste possible de les supprimer...
-<pre>
-class TestOfLastcraft extends WebTestCase {
-    
-    function testHomepage() {<strong>
-        $this-&gt;setMaximumRedirects(0);</strong>
-        $this-&gt;get('http://simpletest.sourceforge.net/');
-        $this-&gt;assertResponse(200);
-    }
-}
-</pre>
-                Alors l'assertion échoue comme prévue...
-<pre class="shell">
-Web site tests
-1) Expecting response in [200] got [302]
-    in testhomepage
-    in testoflastcraft
-    in lastcraft_test.php
-FAILURES!!!
-Test cases run: 1/1, Failures: 1, Exceptions: 0
-</pre>
-                Nous pouvons modifier le test pour accepter les redirections...
-<pre>
-class TestOfLastcraft extends WebTestCase {
-    
-    function testHomepage() {
-        $this-&gt;setMaximumRedirects(0);
-        $this-&gt;get('http://simpletest.sourceforge.net/');
-        $this-&gt;assertResponse(<strong>array(301, 302, 303, 307)</strong>);
-    }
-}
-</pre>
-                Maitenant ça passe.
-            </p>
-        
-        <h2>
-<a class="target" name="navigation"></a>Navigeur dans un site web</h2>
-            <p>
-                Les utilisateurs ne naviguent pas souvent en tapant les URLs,
-                mais surtout en cliquant sur des liens et des boutons.
-                Ici nous confirmons que les informations sur le contact
-                peuvent être atteintes depuis la page d'accueil...
-<pre>
-class TestOfLastcraft extends WebTestCase {
-    ...
-    function testContact() {
-        $this-&gt;get('http://www.lastcraft.com/');<strong>
-        $this-&gt;clickLink('About');
-        $this-&gt;assertTitle('About Last Craft');</strong>
-    }
-}
-</pre>
-                Le paramètre est le texte du lien.
-            </p>
-            <p>
-                Il l'objectif est un bouton plutôt qu'une balise ancre,
-                alors <span class="new_code">clickSubmit()</span> doit être utilisé avec
-                le titre du bouton...
-<pre>
-<strong>$this-&gt;clickSubmit('Go!');</strong>
-</pre>
-            </p>
-            <p>
-                La liste des méthodes de navigation est...
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">get($url, $parameters)</span></td>
-<td>Envoie une requête GET avec ces paramètres</td>
-</tr>
-                    <tr>
-<td><span class="new_code">post($url, $parameters)</span></td>
-<td>Envoie une requête POST avec ces paramètres</td>
-</tr>
-                    <tr>
-<td><span class="new_code">head($url, $parameters)</span></td>
-<td>Envoie une requête HEAD sans remplacer le contenu de la page</td>
-</tr>
-                    <tr>
-<td><span class="new_code">retry()</span></td>
-<td>Relance la dernière requête</td>
-</tr>
-                    <tr>
-<td><span class="new_code">back()</span></td>
-<td>Identique au bouton "Précédent" du navigateur</td>
-</tr>
-                    <tr>
-<td><span class="new_code">forward()</span></td>
-<td>Identique au bouton "Suivant" du navigateur</td>
-</tr>
-                    <tr>
-<td><span class="new_code">authenticate($name, $password)</span></td>
-<td>Re-essaye avec une tentative d'authentification</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getFrameFocus()</span></td>
-<td>Le nom de la fenêtre en cours d'utilisation</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setFrameFocusByIndex($choice)</span></td>
-<td>Change le focus d'une fenêtre en commençant par 1</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setFrameFocus($name)</span></td>
-<td>Change le focus d'une fenêtre en utilisant son nom</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clearFrameFocus()</span></td>
-<td>Revient à un traitement de toutes les fenêtres comme une seule</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickSubmit($label)</span></td>
-<td>Clique sur le premier bouton avec cette étiquette</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickSubmitByName($name)</span></td>
-<td>Clique sur le bouton avec cet attribut de nom</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickSubmitById($id)</span></td>
-<td>Clique sur le bouton avec cet attribut d'identification</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickImage($label, $x, $y)</span></td>
-<td>Clique sur une balise input de type image par son titre (title="*") our son texte alternatif (alt="*")</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickImageByName($name, $x, $y)</span></td>
-<td>Clique sur une balise input de type image par son attribut (name="*")</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickImageById($id, $x, $y)</span></td>
-<td>Clique sur une balise input de type image par son identifiant (id="*")</td>
-</tr>
-                    <tr>
-<td><span class="new_code">submitFormById($id)</span></td>
-<td>Soumet un formulaire sans valeur de soumission</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickLink($label, $index)</span></td>
-<td>Clique sur une ancre avec ce texte d'étiquette visible</td>
-</tr>
-                    <tr>
-<td><span class="new_code">clickLinkById($id)</span></td>
-<td>Clique sur une ancre avec cet attribut d'identification</td>
-</tr>
-                </tbody></table>
-            </p>
-            <p>
-                Les paramètres dans les méthodes <span class="new_code">get()</span>, 
-                <span class="new_code">post()</span> et <span class="new_code">head()</span> sont optionnels.
-                Le téléchargement via  HTTP HEAD ne modifie pas
-                le contexte du navigateur, il se limite au chargement des cookies.
-                Cela peut être utilise lorsqu'une image ou une feuille de style
-                initie un cookie pour bloquer un robot trop entreprenant.
-            </p>
-            <p>
-                Les commandes <span class="new_code">retry()</span>, <span class="new_code">back()</span>
-                et <span class="new_code">forward()</span> fonctionnent exactement comme
-                dans un navigateur. Elles utilisent l'historique pour
-                relancer les pages. Une technique bien pratique pour
-                vérifier les effets d'un bouton retour sur vos formulaires.
-            </p>
-            <p>
-                Les méthodes sur les fenêtres méritent une petite explication.
-                Par défaut, une page avec des fenêtres est traitée comme toutes
-                les autres. Le contenu sera vérifié à travers l'ensemble de
-                la "frameset", par conséquent un lien fonctionnera,
-                peu importe la fenêtre qui contient la balise ancre.
-                Vous pouvez outrepassé ce comportement en exigeant
-                le focus sur une unique fenêtre. Si vous réalisez cela,
-                toutes les recherches et toutes les actions se limiteront
-                à cette unique fenêtre, y compris les demandes d'authentification.
-                Si un lien ou un bouton n'est pas dans la fenêtre en focus alors
-                il ne peut pas être cliqué.
-            </p>
-            <p>
-                Tester la navigation sur des pages fixes ne vous alerte que
-                quand vous avez cassé un script entier.
-                Pour des pages fortement dynamiques,
-                un forum de discussion par exemple,
-                ça peut être crucial pour vérifier l'état de l'application.
-                Pour la plupart des applications cependant,
-                la logique vraiment délicate se situe dans la gestion
-                des formulaires et des sessions.
-                Heureusement SimpleTest aussi inclut
-                <a href="form_testing_documentation.html">
-                des outils pour tester des formulaires web</a>.
-            </p>
-        
-        <h2>
-<a class="target" name="requete"></a>Modifier la requête</h2>
-            <p>
-                Bien que SimpleTest n'ait pas comme objectif
-                de contrôler des erreurs réseau, il contient quand même
-                des méthodes pour modifier et déboguer les requêtes qu'il lance.
-                Voici une autre liste de méthode...
-                <table><tbody>
-                    <tr>
-<td><span class="new_code">getTransportError()</span></td>
-<td>La dernière erreur de socket</td>
-</tr>
-                    <tr>
-<td><span class="new_code">getUrl()</span></td>
-<td>La localisation courante</td>
-</tr>
-                    <tr>
-<td><span class="new_code">showRequest()</span></td>
-<td>Déverse la requête sortante</td>
-</tr>
-                    <tr>
-<td><span class="new_code">showHeaders()</span></td>
-<td>Déverse les entêtes d'entrée</td>
-</tr>
-                    <tr>
-<td><span class="new_code">showSource()</span></td>
-<td>Déverse le contenu brut de la page HTML</td>
-</tr>
-                    <tr>
-<td><span class="new_code">ignoreFrames()</span></td>
-<td>Ne recharge pas les framesets</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setCookie($name, $value)</span></td>
-<td>Initie un cookie à partir de maintenant</td>
-</tr>
-                    <tr>
-<td><span class="new_code">addHeader($header)</span></td>
-<td>Ajoute toujours cette entête à la requête</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setMaximumRedirects($max)</span></td>
-<td>S'arrête après autant de redirections</td>
-</tr>
-                    <tr>
-<td><span class="new_code">setConnectionTimeout($timeout)</span></td>
-<td>Termine la connexion après autant de temps entre les bytes</td>
-</tr>
-                    <tr>
-<td><span class="new_code">useProxy($proxy, $name, $password)</span></td>
-<td>Effectue les requêtes à travers ce proxy d'URL</td>
-</tr>
-                </tbody></table>
-            </p>
-        
-    </div>
-        References and related information...
-        <ul>
-<li>
-            La page du projet SimpleTest sur
-            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
-        </li>
-<li>
-            La page de téléchargement de SimpleTest sur
-            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
-        </li>
-<li>
-            <a href="http://simpletest.org/api/">L'API du développeur pour SimpleTest</a>
-            donne tous les détails sur les classes et les assertions disponibles.
-        </li>
-</ul>
-<div class="menu_back"><div class="menu">
-<a href="index.html">SimpleTest</a>
-                |
-                <a href="overview.html">Overview</a>
-                |
-                <a href="unit_test_documentation.html">Unit tester</a>
-                |
-                <a href="group_test_documentation.html">Group tests</a>
-                |
-                <a href="mock_objects_documentation.html">Mock objects</a>
-                |
-                <a href="partial_mocks_documentation.html">Partial mocks</a>
-                |
-                <a href="reporter_documentation.html">Reporting</a>
-                |
-                <a href="expectation_documentation.html">Expectations</a>
-                |
-                <a href="web_tester_documentation.html">Web tester</a>
-                |
-                <a href="form_testing_documentation.html">Testing forms</a>
-                |
-                <a href="authentication_documentation.html">Authentication</a>
-                |
-                <a href="browser_documentation.html">Scriptable browser</a>
-</div></div>
-<div class="copyright">
-            Copyright<br>Marcus Baker 2006
-        </div>
-</body>
-</html>
diff --git a/3rdparty/simpletest/dumper.php b/3rdparty/simpletest/dumper.php
deleted file mode 100755
index 339923c224f..00000000000
--- a/3rdparty/simpletest/dumper.php
+++ /dev/null
@@ -1,407 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: dumper.php 1909 2009-07-29 15:58:11Z dgheath $
- */
-/**
- * does type matter
- */
-if (! defined('TYPE_MATTERS')) {
-    define('TYPE_MATTERS', true);
-}
-
-/**
- *    Displays variables as text and does diffs.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleDumper {
-
-    /**
-     *    Renders a variable in a shorter form than print_r().
-     *    @param mixed $value      Variable to render as a string.
-     *    @return string           Human readable string form.
-     *    @access public
-     */
-    function describeValue($value) {
-        $type = $this->getType($value);
-        switch($type) {
-            case "Null":
-                return "NULL";
-            case "Boolean":
-                return "Boolean: " . ($value ? "true" : "false");
-            case "Array":
-                return "Array: " . count($value) . " items";
-            case "Object":
-                return "Object: of " . get_class($value);
-            case "String":
-                return "String: " . $this->clipString($value, 200);
-            default:
-                return "$type: $value";
-        }
-        return "Unknown";
-    }
-
-    /**
-     *    Gets the string representation of a type.
-     *    @param mixed $value    Variable to check against.
-     *    @return string         Type.
-     *    @access public
-     */
-    function getType($value) {
-        if (! isset($value)) {
-            return "Null";
-        } elseif (is_bool($value)) {
-            return "Boolean";
-        } elseif (is_string($value)) {
-            return "String";
-        } elseif (is_integer($value)) {
-            return "Integer";
-        } elseif (is_float($value)) {
-            return "Float";
-        } elseif (is_array($value)) {
-            return "Array";
-        } elseif (is_resource($value)) {
-            return "Resource";
-        } elseif (is_object($value)) {
-            return "Object";
-        }
-        return "Unknown";
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between two variables. Uses a
-     *    dynamic call.
-     *    @param mixed $first        First variable.
-     *    @param mixed $second       Value to compare with.
-     *    @param boolean $identical  If true then type anomolies count.
-     *    @return string             Description of difference.
-     *    @access public
-     */
-    function describeDifference($first, $second, $identical = false) {
-        if ($identical) {
-            if (! $this->isTypeMatch($first, $second)) {
-                return "with type mismatch as [" . $this->describeValue($first) .
-                    "] does not match [" . $this->describeValue($second) . "]";
-            }
-        }
-        $type = $this->getType($first);
-        if ($type == "Unknown") {
-            return "with unknown type";
-        }
-        $method = 'describe' . $type . 'Difference';
-        return $this->$method($first, $second, $identical);
-    }
-
-    /**
-     *    Tests to see if types match.
-     *    @param mixed $first        First variable.
-     *    @param mixed $second       Value to compare with.
-     *    @return boolean            True if matches.
-     *    @access private
-     */
-    protected function isTypeMatch($first, $second) {
-        return ($this->getType($first) == $this->getType($second));
-    }
-
-    /**
-     *    Clips a string to a maximum length.
-     *    @param string $value         String to truncate.
-     *    @param integer $size         Minimum string size to show.
-     *    @param integer $position     Centre of string section.
-     *    @return string               Shortened version.
-     *    @access public
-     */
-    function clipString($value, $size, $position = 0) {
-        $length = strlen($value);
-        if ($length <= $size) {
-            return $value;
-        }
-        $position = min($position, $length);
-        $start = ($size/2 > $position ? 0 : $position - $size/2);
-        if ($start + $size > $length) {
-            $start = $length - $size;
-        }
-        $value = substr($value, $start, $size);
-        return ($start > 0 ? "..." : "") . $value . ($start + $size < $length ? "..." : "");
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between two variables. The minimal
-     *    version.
-     *    @param null $first          First value.
-     *    @param mixed $second        Value to compare with.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    protected function describeGenericDifference($first, $second) {
-        return "as [" . $this->describeValue($first) .
-                "] does not match [" .
-                $this->describeValue($second) . "]";
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between a null and another variable.
-     *    @param null $first          First null.
-     *    @param mixed $second        Null to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    protected function describeNullDifference($first, $second, $identical) {
-        return $this->describeGenericDifference($first, $second);
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between a boolean and another variable.
-     *    @param boolean $first       First boolean.
-     *    @param mixed $second        Boolean to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    protected function describeBooleanDifference($first, $second, $identical) {
-        return $this->describeGenericDifference($first, $second);
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between a string and another variable.
-     *    @param string $first        First string.
-     *    @param mixed $second        String to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    protected function describeStringDifference($first, $second, $identical) {
-        if (is_object($second) || is_array($second)) {
-            return $this->describeGenericDifference($first, $second);
-        }
-        $position = $this->stringDiffersAt($first, $second);
-        $message = "at character $position";
-        $message .= " with [" .
-                $this->clipString($first, 200, $position) . "] and [" .
-                $this->clipString($second, 200, $position) . "]";
-        return $message;
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between an integer and another variable.
-     *    @param integer $first       First number.
-     *    @param mixed $second        Number to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    protected function describeIntegerDifference($first, $second, $identical) {
-        if (is_object($second) || is_array($second)) {
-            return $this->describeGenericDifference($first, $second);
-        }
-        return "because [" . $this->describeValue($first) .
-                "] differs from [" .
-                $this->describeValue($second) . "] by " .
-                abs($first - $second);
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between two floating point numbers.
-     *    @param float $first         First float.
-     *    @param mixed $second        Float to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    protected function describeFloatDifference($first, $second, $identical) {
-        if (is_object($second) || is_array($second)) {
-            return $this->describeGenericDifference($first, $second);
-        }
-        return "because [" . $this->describeValue($first) .
-                "] differs from [" .
-                $this->describeValue($second) . "] by " .
-                abs($first - $second);
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between two arrays.
-     *    @param array $first         First array.
-     *    @param mixed $second        Array to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    protected function describeArrayDifference($first, $second, $identical) {
-        if (! is_array($second)) {
-            return $this->describeGenericDifference($first, $second);
-        }
-        if (! $this->isMatchingKeys($first, $second, $identical)) {
-            return "as key list [" .
-                    implode(", ", array_keys($first)) . "] does not match key list [" .
-                    implode(", ", array_keys($second)) . "]";
-        }
-        foreach (array_keys($first) as $key) {
-            if ($identical && ($first[$key] === $second[$key])) {
-                continue;
-            }
-            if (! $identical && ($first[$key] == $second[$key])) {
-                continue;
-            }
-            return "with member [$key] " . $this->describeDifference(
-                    $first[$key],
-                    $second[$key],
-                    $identical);
-        }
-        return "";
-    }
-
-    /**
-     *    Compares two arrays to see if their key lists match.
-     *    For an identical match, the ordering and types of the keys
-     *    is significant.
-     *    @param array $first         First array.
-     *    @param array $second        Array to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return boolean             True if matching.
-     *    @access private
-     */
-    protected function isMatchingKeys($first, $second, $identical) {
-        $first_keys = array_keys($first);
-        $second_keys = array_keys($second);
-        if ($identical) {
-            return ($first_keys === $second_keys);
-        }
-        sort($first_keys);
-        sort($second_keys);
-        return ($first_keys == $second_keys);
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between a resource and another variable.
-     *    @param resource $first       First resource.
-     *    @param mixed $second         Resource to compare with.
-     *    @param boolean $identical    If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    protected function describeResourceDifference($first, $second, $identical) {
-        return $this->describeGenericDifference($first, $second);
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between two objects.
-     *    @param object $first        First object.
-     *    @param mixed $second        Object to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     */
-    protected function describeObjectDifference($first, $second, $identical) {
-        if (! is_object($second)) {
-            return $this->describeGenericDifference($first, $second);
-        }
-        return $this->describeArrayDifference(
-                $this->getMembers($first),
-                $this->getMembers($second),
-                $identical);
-    }
-
-    /**
-     *    Get all members of an object including private and protected ones.
-     *    A safer form of casting to an array.
-     *    @param object $object     Object to list members of,
-     *                              including private ones.
-     *    @return array             Names and values in the object.
-     */
-    protected function getMembers($object) {
-        $reflection = new ReflectionObject($object);
-        $members = array();
-        foreach ($reflection->getProperties() as $property) {
-            if (method_exists($property, 'setAccessible')) {
-                $property->setAccessible(true);
-            }
-            try {
-                $members[$property->getName()] = $property->getValue($object);
-            } catch (ReflectionException $e) {
-                $members[$property->getName()] =
-                    $this->getPrivatePropertyNoMatterWhat($property->getName(), $object);
-            }
-        }
-        return $members;
-    }
-
-    /**
-     *    Extracts a private member's value when reflection won't play ball.
-     *    @param string $name        Property name.
-     *    @param object $object      Object to read.
-     *    @return mixed              Value of property.
-     */
-    private function getPrivatePropertyNoMatterWhat($name, $object) {
-        foreach ((array)$object as $mangled_name => $value) {
-            if ($this->unmangle($mangled_name) == $name) {
-                return $value;
-            }
-        }
-    }
-
-    /**
-     *    Removes crud from property name after it's been converted
-     *    to an array.
-     *    @param string $mangled     Name from array cast.
-     *    @return string             Cleaned up name.
-     */
-    function unmangle($mangled) {
-        $parts = preg_split('/[^a-zA-Z0-9_\x7f-\xff]+/', $mangled);
-        return array_pop($parts);
-    }
-
-    /**
-     *    Find the first character position that differs
-     *    in two strings by binary chop.
-     *    @param string $first        First string.
-     *    @param string $second       String to compare with.
-     *    @return integer             Position of first differing
-     *                                character.
-     *    @access private
-     */
-    protected function stringDiffersAt($first, $second) {
-        if (! $first || ! $second) {
-            return 0;
-        }
-        if (strlen($first) < strlen($second)) {
-            list($first, $second) = array($second, $first);
-        }
-        $position = 0;
-        $step = strlen($first);
-        while ($step > 1) {
-            $step = (integer)(($step + 1) / 2);
-            if (strncmp($first, $second, $position + $step) == 0) {
-                $position += $step;
-            }
-        }
-        return $position;
-    }
-
-    /**
-     *    Sends a formatted dump of a variable to a string.
-     *    @param mixed $variable    Variable to display.
-     *    @return string            Output from print_r().
-     *    @access public
-     */
-    function dump($variable) {
-        ob_start();
-        print_r($variable);
-        $formatted = ob_get_contents();
-        ob_end_clean();
-        return $formatted;
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/eclipse.php b/3rdparty/simpletest/eclipse.php
deleted file mode 100644
index 20bd4530bb6..00000000000
--- a/3rdparty/simpletest/eclipse.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- *  base include file for eclipse plugin
- *  @package    SimpleTest
- *  @subpackage Eclipse
- *  @version    $Id: eclipse.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-/**#@+
- * simpletest include files
- */
-include_once 'unit_tester.php';
-include_once 'test_case.php';
-include_once 'invoker.php';
-include_once 'socket.php';
-include_once 'mock_objects.php';
-/**#@-*/
-
-/**
- *  base reported class for eclipse plugin
- *  @package    SimpleTest
- *  @subpackage Eclipse
- */
-class EclipseReporter extends SimpleScorer {
-
-    /**
-     *    Reporter to be run inside of Eclipse interface.
-     *    @param object $listener   Eclipse listener (?).
-     *    @param boolean $cc        Whether to include test coverage.
-     */
-    function __construct(&$listener, $cc=false){
-        $this->listener = &$listener;
-        $this->SimpleScorer();
-        $this->case = "";
-        $this->group = "";
-        $this->method = "";
-        $this->cc = $cc;
-        $this->error = false;
-        $this->fail = false;
-    }
-
-    /**
-     *    Means to display human readable object comparisons.
-     *    @return SimpleDumper        Visual comparer.
-     */
-    function getDumper() {
-        return new SimpleDumper();
-    }
-
-    /**
-     *    Localhost connection from Eclipse.
-     *    @param integer $port      Port to connect to Eclipse.
-     *    @param string $host       Normally localhost.
-     *    @return SimpleSocket      Connection to Eclipse.
-     */
-    function &createListener($port, $host="127.0.0.1"){
-        $tmplistener = &new SimpleSocket($host, $port, 5);
-        return $tmplistener;
-    }
-
-    /**
-     *    Wraps the test in an output buffer.
-     *    @param SimpleInvoker $invoker     Current test runner.
-     *    @return EclipseInvoker            Decorator with output buffering.
-     *    @access public
-     */
-    function &createInvoker(&$invoker){
-        $eclinvoker = &new EclipseInvoker($invoker, $this->listener);
-        return $eclinvoker;
-    }
-
-    /**
-     *    C style escaping.
-     *    @param string $raw    String with backslashes, quotes and whitespace.
-     *    @return string        Replaced with C backslashed tokens.
-     */
-    function escapeVal($raw){
-        $needle = array("\\","\"","/","\b","\f","\n","\r","\t");
-        $replace = array('\\\\','\"','\/','\b','\f','\n','\r','\t');
-        return str_replace($needle, $replace, $raw);
-    }
-
-    /**
-     *    Stash the first passing item. Clicking the test
-     *    item goes to first pass.
-     *    @param string $message    Test message, but we only wnat the first.
-     *    @access public
-     */
-    function paintPass($message){
-        if (! $this->pass){
-            $this->message = $this->escapeVal($message);
-        }
-        $this->pass = true;
-    }
-
-    /**
-     *    Stash the first failing item. Clicking the test
-     *    item goes to first fail.
-     *    @param string $message    Test message, but we only wnat the first.
-     *    @access public
-     */
-    function paintFail($message){
-        //only get the first failure or error
-        if (! $this->fail && ! $this->error){
-            $this->fail = true;
-            $this->message = $this->escapeVal($message);
-            $this->listener->write('{status:"fail",message:"'.$this->message.'",group:"'.$this->group.'",case:"'.$this->case.'",method:"'.$this->method.'"}');
-        }
-    }
-
-    /**
-     *    Stash the first error. Clicking the test
-     *    item goes to first error.
-     *    @param string $message    Test message, but we only wnat the first.
-     *    @access public
-     */
-    function paintError($message){
-        if (! $this->fail && ! $this->error){
-            $this->error = true;
-            $this->message = $this->escapeVal($message);
-            $this->listener->write('{status:"error",message:"'.$this->message.'",group:"'.$this->group.'",case:"'.$this->case.'",method:"'.$this->method.'"}');
-        }
-    }
-
-
-    /**
-     *    Stash the first exception. Clicking the test
-     *    item goes to first message.
-     *    @param string $message    Test message, but we only wnat the first.
-     *    @access public
-     */
-    function paintException($exception){
-        if (! $this->fail && ! $this->error){
-            $this->error = true;
-            $message = 'Unexpected exception of type[' . get_class($exception) .
-                    '] with message [' . $exception->getMessage() . '] in [' .
-                    $exception->getFile() .' line '. $exception->getLine() . ']';
-            $this->message = $this->escapeVal($message);
-            $this->listener->write(
-                    '{status:"error",message:"' . $this->message . '",group:"' .
-                    $this->group . '",case:"' . $this->case . '",method:"' . $this->method
-                    . '"}');
-        }
-    }
-
-
-    /**
-     *    We don't display any special header.
-     *    @param string $test_name     First test top level
-     *                                 to start.
-     *    @access public
-     */
-    function paintHeader($test_name) {
-    }
-
-    /**
-     *    We don't display any special footer.
-     *    @param string $test_name        The top level test.
-     *    @access public
-     */
-    function paintFooter($test_name) {
-    }
-
-    /**
-     *    Paints nothing at the start of a test method, but stash
-     *    the method name for later.
-     *    @param string $test_name   Name of test that is starting.
-     *    @access public
-     */
-    function paintMethodStart($method) {
-        $this->pass = false;
-        $this->fail = false;
-        $this->error = false;
-        $this->method = $this->escapeVal($method);
-    }
-
-    /**
-     *    Only send one message if the test passes, after that
-     *    suppress the message.
-     *    @param string $test_name   Name of test that is ending.
-     *    @access public
-     */
-    function paintMethodEnd($method){
-        if ($this->fail || $this->error || ! $this->pass){
-        } else {
-            $this->listener->write(
-                        '{status:"pass",message:"' . $this->message . '",group:"' .
-                        $this->group . '",case:"' . $this->case . '",method:"' .
-                        $this->method . '"}');
-        }
-    }
-
-    /**
-     *    Stashes the test case name for the later failure message.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseStart($case){
-        $this->case = $this->escapeVal($case);
-    }
-
-    /**
-     *    Drops the name.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseEnd($case){
-        $this->case = "";
-    }
-
-    /**
-     *    Stashes the name of the test suite. Starts test coverage
-     *    if enabled.
-     *    @param string $group     Name of test or other label.
-     *    @param integer $size     Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($group, $size){
-        $this->group = $this->escapeVal($group);
-        if ($this->cc){
-            if (extension_loaded('xdebug')){
-                xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
-            }
-        }
-    }
-
-    /**
-     *    Paints coverage report if enabled.
-     *    @param string $group     Name of test or other label.
-     *    @access public
-     */
-    function paintGroupEnd($group){
-        $this->group = "";
-        $cc = "";
-        if ($this->cc){
-            if (extension_loaded('xdebug')){
-                $arrfiles = xdebug_get_code_coverage();
-                xdebug_stop_code_coverage();
-                $thisdir = dirname(__FILE__);
-                $thisdirlen = strlen($thisdir);
-                foreach ($arrfiles as $index=>$file){
-                    if (substr($index, 0, $thisdirlen)===$thisdir){
-                        continue;
-                    }
-                    $lcnt = 0;
-                    $ccnt = 0;
-                    foreach ($file as $line){
-                        if ($line == -2){
-                            continue;
-                        }
-                        $lcnt++;
-                        if ($line==1){
-                            $ccnt++;
-                        }
-                    }
-                    if ($lcnt > 0){
-                        $cc .= round(($ccnt/$lcnt) * 100, 2) . '%';
-                    }else{
-                        $cc .= "0.00%";
-                    }
-                    $cc.= "\t". $index . "\n";
-                }
-            }
-        }
-        $this->listener->write('{status:"coverage",message:"' .
-                                EclipseReporter::escapeVal($cc) . '"}');
-    }
-}
-
-/**
- *  Invoker decorator for Eclipse. Captures output until
- *  the end of the test.
- *  @package    SimpleTest
- *  @subpackage Eclipse
- */
-class EclipseInvoker extends SimpleInvokerDecorator{
-    function __construct(&$invoker, &$listener) {
-        $this->listener = &$listener;
-        $this->SimpleInvokerDecorator($invoker);
-    }
-
-    /**
-     *    Starts output buffering.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function before($method){
-        ob_start();
-        $this->invoker->before($method);
-    }
-
-    /**
-     *    Stops output buffering and send the captured output
-     *    to the listener.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function after($method) {
-        $this->invoker->after($method);
-        $output = ob_get_contents();
-        ob_end_clean();
-        if ($output !== ""){
-            $result = $this->listener->write('{status:"info",message:"' .
-                                              EclipseReporter::escapeVal($output) . '"}');
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/encoding.php b/3rdparty/simpletest/encoding.php
deleted file mode 100644
index cadc84e7a3b..00000000000
--- a/3rdparty/simpletest/encoding.php
+++ /dev/null
@@ -1,649 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: encoding.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/socket.php');
-/**#@-*/
-
-/**
- *    Single post parameter.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleEncodedPair {
-    private $key;
-    private $value;
-
-    /**
-     *    Stashes the data for rendering later.
-     *    @param string $key       Form element name.
-     *    @param string $value     Data to send.
-     */
-    function __construct($key, $value) {
-        $this->key = $key;
-        $this->value = $value;
-    }
-
-    /**
-     *    The pair as a single string.
-     *    @return string        Encoded pair.
-     *    @access public
-     */
-    function asRequest() {
-        return urlencode($this->key) . '=' . urlencode($this->value);
-    }
-
-    /**
-     *    The MIME part as a string.
-     *    @return string        MIME part encoding.
-     *    @access public
-     */
-    function asMime() {
-        $part = 'Content-Disposition: form-data; ';
-        $part .= "name=\"" . $this->key . "\"\r\n";
-        $part .= "\r\n" . $this->value;
-        return $part;
-    }
-
-    /**
-     *    Is this the value we are looking for?
-     *    @param string $key    Identifier.
-     *    @return boolean       True if matched.
-     *    @access public
-     */
-    function isKey($key) {
-        return $key == $this->key;
-    }
-
-    /**
-     *    Is this the value we are looking for?
-     *    @return string       Identifier.
-     *    @access public
-     */
-    function getKey() {
-        return $this->key;
-    }
-
-    /**
-     *    Is this the value we are looking for?
-     *    @return string       Content.
-     *    @access public
-     */
-    function getValue() {
-        return $this->value;
-    }
-}
-
-/**
- *    Single post parameter.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleAttachment {
-    private $key;
-    private $content;
-    private $filename;
-
-    /**
-     *    Stashes the data for rendering later.
-     *    @param string $key          Key to add value to.
-     *    @param string $content      Raw data.
-     *    @param hash $filename       Original filename.
-     */
-    function __construct($key, $content, $filename) {
-        $this->key = $key;
-        $this->content = $content;
-        $this->filename = $filename;
-    }
-
-    /**
-     *    The pair as a single string.
-     *    @return string        Encoded pair.
-     *    @access public
-     */
-    function asRequest() {
-        return '';
-    }
-
-    /**
-     *    The MIME part as a string.
-     *    @return string        MIME part encoding.
-     *    @access public
-     */
-    function asMime() {
-        $part = 'Content-Disposition: form-data; ';
-        $part .= 'name="' . $this->key . '"; ';
-        $part .= 'filename="' . $this->filename . '"';
-        $part .= "\r\nContent-Type: " . $this->deduceMimeType();
-        $part .= "\r\n\r\n" . $this->content;
-        return $part;
-    }
-
-    /**
-     *    Attempts to figure out the MIME type from the
-     *    file extension and the content.
-     *    @return string        MIME type.
-     *    @access private
-     */
-    protected function deduceMimeType() {
-        if ($this->isOnlyAscii($this->content)) {
-            return 'text/plain';
-        }
-        return 'application/octet-stream';
-    }
-
-    /**
-     *    Tests each character is in the range 0-127.
-     *    @param string $ascii    String to test.
-     *    @access private
-     */
-    protected function isOnlyAscii($ascii) {
-        for ($i = 0, $length = strlen($ascii); $i < $length; $i++) {
-            if (ord($ascii[$i]) > 127) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    Is this the value we are looking for?
-     *    @param string $key    Identifier.
-     *    @return boolean       True if matched.
-     *    @access public
-     */
-    function isKey($key) {
-        return $key == $this->key;
-    }
-
-    /**
-     *    Is this the value we are looking for?
-     *    @return string       Identifier.
-     *    @access public
-     */
-    function getKey() {
-        return $this->key;
-    }
-
-    /**
-     *    Is this the value we are looking for?
-     *    @return string       Content.
-     *    @access public
-     */
-    function getValue() {
-        return $this->filename;
-    }
-}
-
-/**
- *    Bundle of GET/POST parameters. Can include
- *    repeated parameters.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleEncoding {
-    private $request;
-
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function __construct($query = false) {
-        if (! $query) {
-            $query = array();
-        }
-        $this->clear();
-        $this->merge($query);
-    }
-
-    /**
-     *    Empties the request of parameters.
-     *    @access public
-     */
-    function clear() {
-        $this->request = array();
-    }
-
-    /**
-     *    Adds a parameter to the query.
-     *    @param string $key            Key to add value to.
-     *    @param string/array $value    New data.
-     *    @access public
-     */
-    function add($key, $value) {
-        if ($value === false) {
-            return;
-        }
-        if (is_array($value)) {
-            foreach ($value as $item) {
-                $this->addPair($key, $item);
-            }
-        } else {
-            $this->addPair($key, $value);
-        }
-    }
-
-    /**
-     *    Adds a new value into the request.
-     *    @param string $key            Key to add value to.
-     *    @param string/array $value    New data.
-     *    @access private
-     */
-    protected function addPair($key, $value) {
-        $this->request[] = new SimpleEncodedPair($key, $value);
-    }
-
-    /**
-     *    Adds a MIME part to the query. Does nothing for a
-     *    form encoded packet.
-     *    @param string $key          Key to add value to.
-     *    @param string $content      Raw data.
-     *    @param hash $filename       Original filename.
-     *    @access public
-     */
-    function attach($key, $content, $filename) {
-        $this->request[] = new SimpleAttachment($key, $content, $filename);
-    }
-
-    /**
-     *    Adds a set of parameters to this query.
-     *    @param array/SimpleQueryString $query  Multiple values are
-     *                                           as lists on a single key.
-     *    @access public
-     */
-    function merge($query) {
-        if (is_object($query)) {
-            $this->request = array_merge($this->request, $query->getAll());
-        } elseif (is_array($query)) {
-            foreach ($query as $key => $value) {
-                $this->add($key, $value);
-            }
-        }
-    }
-
-    /**
-     *    Accessor for single value.
-     *    @return string/array    False if missing, string
-     *                            if present and array if
-     *                            multiple entries.
-     *    @access public
-     */
-    function getValue($key) {
-        $values = array();
-        foreach ($this->request as $pair) {
-            if ($pair->isKey($key)) {
-                $values[] = $pair->getValue();
-            }
-        }
-        if (count($values) == 0) {
-            return false;
-        } elseif (count($values) == 1) {
-            return $values[0];
-        } else {
-            return $values;
-        }
-    }
-
-    /**
-     *    Accessor for listing of pairs.
-     *    @return array        All pair objects.
-     *    @access public
-     */
-    function getAll() {
-        return $this->request;
-    }
-
-    /**
-     *    Renders the query string as a URL encoded
-     *    request part.
-     *    @return string        Part of URL.
-     *    @access protected
-     */
-    protected function encode() {
-        $statements = array();
-        foreach ($this->request as $pair) {
-            if ($statement = $pair->asRequest()) {
-                $statements[] = $statement;
-            }
-        }
-        return implode('&', $statements);
-    }
-}
-
-/**
- *    Bundle of GET parameters. Can include
- *    repeated parameters.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleGetEncoding extends SimpleEncoding {
-
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function __construct($query = false) {
-        parent::__construct($query);
-    }
-
-    /**
-     *    HTTP request method.
-     *    @return string        Always GET.
-     *    @access public
-     */
-    function getMethod() {
-        return 'GET';
-    }
-
-    /**
-     *    Writes no extra headers.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeHeadersTo(&$socket) {
-    }
-
-    /**
-     *    No data is sent to the socket as the data is encoded into
-     *    the URL.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeTo(&$socket) {
-    }
-
-    /**
-     *    Renders the query string as a URL encoded
-     *    request part for attaching to a URL.
-     *    @return string        Part of URL.
-     *    @access public
-     */
-    function asUrlRequest() {
-        return $this->encode();
-    }
-}
-
-/**
- *    Bundle of URL parameters for a HEAD request.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHeadEncoding extends SimpleGetEncoding {
-
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function __construct($query = false) {
-        parent::__construct($query);
-    }
-
-    /**
-     *    HTTP request method.
-     *    @return string        Always HEAD.
-     *    @access public
-     */
-    function getMethod() {
-        return 'HEAD';
-    }
-}
-
-/**
- *    Bundle of URL parameters for a DELETE request.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleDeleteEncoding extends SimpleGetEncoding {
-
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function __construct($query = false) {
-        parent::__construct($query);
-    }
-
-    /**
-     *    HTTP request method.
-     *    @return string        Always DELETE.
-     *    @access public
-     */
-    function getMethod() {
-        return 'DELETE';
-    }
-}
-
-/**
- *    Bundles an entity-body for transporting
- *    a raw content payload with the request.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleEntityEncoding extends SimpleEncoding {
-    private $content_type;
-    private $body;
-
-    function __construct($query = false, $content_type = false) {
-        $this->content_type = $content_type;
-    	if (is_string($query)) {
-            $this->body = $query;
-            parent::__construct();
-        } else {
-            parent::__construct($query);
-        }
-    }
-
-    /**
-     *    Returns the media type of the entity body
-     *    @return string
-     *    @access public
-     */
-    function getContentType() {
-        if (!$this->content_type) {
-        	return ($this->body) ? 'text/plain' : 'application/x-www-form-urlencoded';
-        }
-    	return $this->content_type;
-    }
-
-    /**
-     *    Dispatches the form headers down the socket.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeHeadersTo(&$socket) {
-        $socket->write("Content-Length: " . (integer)strlen($this->encode()) . "\r\n");
-        $socket->write("Content-Type: " .  $this->getContentType() . "\r\n");
-    }
-
-    /**
-     *    Dispatches the form data down the socket.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeTo(&$socket) {
-        $socket->write($this->encode());
-    }
-
-    /**
-     *    Renders the request body
-     *    @return Encoded entity body
-     *    @access protected
-     */
-    protected function encode() {
-        return ($this->body) ? $this->body : parent::encode();
-    }
-}
-
-/**
- *    Bundle of POST parameters. Can include
- *    repeated parameters.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimplePostEncoding extends SimpleEntityEncoding {
-
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function __construct($query = false, $content_type = false) {
-        if (is_array($query) and $this->hasMoreThanOneLevel($query)) {
-            $query = $this->rewriteArrayWithMultipleLevels($query);
-        }
-        parent::__construct($query, $content_type);
-    }
-
-    function hasMoreThanOneLevel($query) {
-        foreach ($query as $key => $value) {
-            if (is_array($value)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function rewriteArrayWithMultipleLevels($query) {
-        $query_ = array();
-        foreach ($query as $key => $value) {
-            if (is_array($value)) {
-                foreach ($value as $sub_key => $sub_value) {
-                    $query_[$key."[".$sub_key."]"] = $sub_value;
-                }
-            } else {
-                $query_[$key] = $value;
-            }
-        }
-        if ($this->hasMoreThanOneLevel($query_)) {
-            $query_ = $this->rewriteArrayWithMultipleLevels($query_);
-        }
-
-        return $query_;
-    }
-
-    /**
-     *    HTTP request method.
-     *    @return string        Always POST.
-     *    @access public
-     */
-    function getMethod() {
-        return 'POST';
-    }
-
-    /**
-     *    Renders the query string as a URL encoded
-     *    request part for attaching to a URL.
-     *    @return string        Part of URL.
-     *    @access public
-     */
-    function asUrlRequest() {
-        return '';
-    }
-}
-
-/**
- *    Encoded entity body for a PUT request.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimplePutEncoding extends SimpleEntityEncoding {
-
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function __construct($query = false, $content_type = false) {
-        parent::__construct($query, $content_type);
-    }
-
-    /**
-     *    HTTP request method.
-     *    @return string        Always PUT.
-     *    @access public
-     */
-    function getMethod() {
-        return 'PUT';
-    }
-}
-
-/**
- *    Bundle of POST parameters in the multipart
- *    format. Can include file uploads.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleMultipartEncoding extends SimplePostEncoding {
-    private $boundary;
-
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function __construct($query = false, $boundary = false) {
-        parent::__construct($query);
-        $this->boundary = ($boundary === false ? uniqid('st') : $boundary);
-    }
-
-    /**
-     *    Dispatches the form headers down the socket.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeHeadersTo(&$socket) {
-        $socket->write("Content-Length: " . (integer)strlen($this->encode()) . "\r\n");
-        $socket->write("Content-Type: multipart/form-data; boundary=" . $this->boundary . "\r\n");
-    }
-
-    /**
-     *    Dispatches the form data down the socket.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeTo(&$socket) {
-        $socket->write($this->encode());
-    }
-
-    /**
-     *    Renders the query string as a URL encoded
-     *    request part.
-     *    @return string        Part of URL.
-     *    @access public
-     */
-    function encode() {
-        $stream = '';
-        foreach ($this->getAll() as $pair) {
-            $stream .= "--" . $this->boundary . "\r\n";
-            $stream .= $pair->asMime() . "\r\n";
-        }
-        $stream .= "--" . $this->boundary . "--\r\n";
-        return $stream;
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/errors.php b/3rdparty/simpletest/errors.php
deleted file mode 100644
index b3d0c2a0753..00000000000
--- a/3rdparty/simpletest/errors.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: errors.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-
-/**#@+
- * Includes SimpleTest files.
- */
-require_once dirname(__FILE__) . '/invoker.php';
-require_once dirname(__FILE__) . '/test_case.php';
-require_once dirname(__FILE__) . '/expectation.php';
-/**#@-*/
-
-/**
- *    Extension that traps errors into an error queue.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleErrorTrappingInvoker extends SimpleInvokerDecorator {
-
-    /**
-     *    Stores the invoker to wrap.
-     *    @param SimpleInvoker $invoker  Test method runner.
-     */
-    function __construct($invoker) {
-        parent::__construct($invoker);
-    }
-
-    /**
-     *    Invokes a test method and dispatches any
-     *    untrapped errors. Called back from
-     *    the visiting runner.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function invoke($method) {
-        $queue = $this->createErrorQueue();
-        set_error_handler('SimpleTestErrorHandler');
-        parent::invoke($method);
-        restore_error_handler();
-        $queue->tally();
-    }
-
-    /**
-     *    Wires up the error queue for a single test.
-     *    @return SimpleErrorQueue    Queue connected to the test.
-     *    @access private
-     */
-    protected function createErrorQueue() {
-        $context = SimpleTest::getContext();
-        $test = $this->getTestCase();
-        $queue = $context->get('SimpleErrorQueue');
-        $queue->setTestCase($test);
-        return $queue;
-    }
-}
-
-/**
- *    Error queue used to record trapped
- *    errors.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleErrorQueue {
-    private $queue;
-    private $expectation_queue;
-    private $test;
-    private $using_expect_style = false;
-
-    /**
-     *    Starts with an empty queue.
-     */
-    function __construct() {
-        $this->clear();
-    }
-
-    /**
-     *    Discards the contents of the error queue.
-     *    @access public
-     */
-    function clear() {
-        $this->queue = array();
-        $this->expectation_queue = array();
-    }
-
-    /**
-     *    Sets the currently running test case.
-     *    @param SimpleTestCase $test    Test case to send messages to.
-     *    @access public
-     */
-    function setTestCase($test) {
-        $this->test = $test;
-    }
-
-    /**
-     *    Sets up an expectation of an error. If this is
-     *    not fulfilled at the end of the test, a failure
-     *    will occour. If the error does happen, then this
-     *    will cancel it out and send a pass message.
-     *    @param SimpleExpectation $expected    Expected error match.
-     *    @param string $message                Message to display.
-     *    @access public
-     */
-    function expectError($expected, $message) {
-        array_push($this->expectation_queue, array($expected, $message));
-    }
-
-    /**
-     *    Adds an error to the front of the queue.
-     *    @param integer $severity       PHP error code.
-     *    @param string $content         Text of error.
-     *    @param string $filename        File error occoured in.
-     *    @param integer $line           Line number of error.
-     *    @access public
-     */
-    function add($severity, $content, $filename, $line) {
-        $content = str_replace('%', '%%', $content);
-        $this->testLatestError($severity, $content, $filename, $line);
-    }
-
-    /**
-     *    Any errors still in the queue are sent to the test
-     *    case. Any unfulfilled expectations trigger failures.
-     *    @access public
-     */
-    function tally() {
-        while (list($severity, $message, $file, $line) = $this->extract()) {
-            $severity = $this->getSeverityAsString($severity);
-            $this->test->error($severity, $message, $file, $line);
-        }
-        while (list($expected, $message) = $this->extractExpectation()) {
-            $this->test->assert($expected, false, "%s -> Expected error not caught");
-        }
-    }
-
-    /**
-     *    Tests the error against the most recent expected
-     *    error.
-     *    @param integer $severity       PHP error code.
-     *    @param string $content         Text of error.
-     *    @param string $filename        File error occoured in.
-     *    @param integer $line           Line number of error.
-     *    @access private
-     */
-    protected function testLatestError($severity, $content, $filename, $line) {
-        if ($expectation = $this->extractExpectation()) {
-            list($expected, $message) = $expectation;
-            $this->test->assert($expected, $content, sprintf(
-                    $message,
-                    "%s -> PHP error [$content] severity [" .
-                            $this->getSeverityAsString($severity) .
-                            "] in [$filename] line [$line]"));
-        } else {
-            $this->test->error($severity, $content, $filename, $line);
-        }
-    }
-
-    /**
-     *    Pulls the earliest error from the queue.
-     *    @return  mixed    False if none, or a list of error
-     *                      information. Elements are: severity
-     *                      as the PHP error code, the error message,
-     *                      the file with the error, the line number
-     *                      and a list of PHP super global arrays.
-     *    @access public
-     */
-    function extract() {
-        if (count($this->queue)) {
-            return array_shift($this->queue);
-        }
-        return false;
-    }
-
-    /**
-     *    Pulls the earliest expectation from the queue.
-     *    @return     SimpleExpectation    False if none.
-     *    @access private
-     */
-    protected function extractExpectation() {
-        if (count($this->expectation_queue)) {
-            return array_shift($this->expectation_queue);
-        }
-        return false;
-    }
-
-    /**
-     *    Converts an error code into it's string
-     *    representation.
-     *    @param $severity  PHP integer error code.
-     *    @return           String version of error code.
-     *    @access public
-     */
-    static function getSeverityAsString($severity) {
-        static $map = array(
-                E_STRICT => 'E_STRICT',
-                E_ERROR => 'E_ERROR',
-                E_WARNING => 'E_WARNING',
-                E_PARSE => 'E_PARSE',
-                E_NOTICE => 'E_NOTICE',
-                E_CORE_ERROR => 'E_CORE_ERROR',
-                E_CORE_WARNING => 'E_CORE_WARNING',
-                E_COMPILE_ERROR => 'E_COMPILE_ERROR',
-                E_COMPILE_WARNING => 'E_COMPILE_WARNING',
-                E_USER_ERROR => 'E_USER_ERROR',
-                E_USER_WARNING => 'E_USER_WARNING',
-                E_USER_NOTICE => 'E_USER_NOTICE');
-        if (defined('E_RECOVERABLE_ERROR')) {
-            $map[E_RECOVERABLE_ERROR] = 'E_RECOVERABLE_ERROR';
-        }
-        if (defined('E_DEPRECATED')) {
-            $map[E_DEPRECATED] = 'E_DEPRECATED';
-        }
-        return $map[$severity];
-    }
-}
-
-/**
- *    Error handler that simply stashes any errors into the global
- *    error queue. Simulates the existing behaviour with respect to
- *    logging errors, but this feature may be removed in future.
- *    @param $severity        PHP error code.
- *    @param $message         Text of error.
- *    @param $filename        File error occoured in.
- *    @param $line            Line number of error.
- *    @param $super_globals   Hash of PHP super global arrays.
- *    @access public
- */
-function SimpleTestErrorHandler($severity, $message, $filename = null, $line = null, $super_globals = null, $mask = null) {
-    $severity = $severity & error_reporting();
-    if ($severity) {
-        restore_error_handler();
-        if (IsNotCausedBySimpleTest($message) && IsNotTimeZoneNag($message)) {
-            if (ini_get('log_errors')) {
-                $label = SimpleErrorQueue::getSeverityAsString($severity);
-                error_log("$label: $message in $filename on line $line");
-            }
-            $queue = SimpleTest::getContext()->get('SimpleErrorQueue');
-            $queue->add($severity, $message, $filename, $line);
-        }
-        set_error_handler('SimpleTestErrorHandler');
-    }
-    return true;
-}
-
-/**
- *  Certain messages can be caused by the unit tester itself.
- *  These have to be filtered.
- *  @param string $message      Message to filter.
- *  @return boolean             True if genuine failure.
- */
-function IsNotCausedBySimpleTest($message) {
-    return ! preg_match('/returned by reference/', $message);
-}
-
-/**
- *  Certain messages caused by PHP are just noise.
- *  These have to be filtered.
- *  @param string $message      Message to filter.
- *  @return boolean             True if genuine failure.
- */
-function IsNotTimeZoneNag($message) {
-    return ! preg_match('/not safe to rely .* timezone settings/', $message);
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/exceptions.php b/3rdparty/simpletest/exceptions.php
deleted file mode 100755
index 2f469e93a45..00000000000
--- a/3rdparty/simpletest/exceptions.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: exceptions.php 1882 2009-07-01 14:30:05Z lastcraft $
- */
-
-/**#@+
- * Include required SimpleTest files
- */
-require_once dirname(__FILE__) . '/invoker.php';
-require_once dirname(__FILE__) . '/expectation.php';
-/**#@-*/
-
-/**
- *    Extension that traps exceptions and turns them into
- *    an error message. PHP5 only.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleExceptionTrappingInvoker extends SimpleInvokerDecorator {
-
-    /**
-     *    Stores the invoker to be wrapped.
-     *    @param SimpleInvoker $invoker   Test method runner.
-     */
-    function __construct($invoker) {
-        parent::__construct($invoker);
-    }
-
-    /**
-     *    Invokes a test method whilst trapping expected
-     *    exceptions. Any left over unthrown exceptions
-     *    are then reported as failures.
-     *    @param string $method    Test method to call.
-     */
-    function invoke($method) {
-        $trap = SimpleTest::getContext()->get('SimpleExceptionTrap');
-        $trap->clear();
-        try {
-            $has_thrown = false;
-            parent::invoke($method);
-        } catch (Exception $exception) {
-            $has_thrown = true;
-            if (! $trap->isExpected($this->getTestCase(), $exception)) {
-                $this->getTestCase()->exception($exception);
-            }
-            $trap->clear();
-        }
-        if ($message = $trap->getOutstanding()) {
-            $this->getTestCase()->fail($message);
-        }
-        if ($has_thrown) {
-            try {
-                parent::getTestCase()->tearDown();
-            } catch (Exception $e) { }
-        }
-    }
-}
-
-/**
- *    Tests exceptions either by type or the exact
- *    exception. This could be improved to accept
- *    a pattern expectation to test the error
- *    message, but that will have to come later.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class ExceptionExpectation extends SimpleExpectation {
-    private $expected;
-
-    /**
-     *    Sets up the conditions to test against.
-     *    If the expected value is a string, then
-     *    it will act as a test of the class name.
-     *    An exception as the comparison will
-     *    trigger an identical match. Writing this
-     *    down now makes it look doubly dumb. I hope
-     *    come up with a better scheme later.
-     *    @param mixed $expected   A class name or an actual
-     *                             exception to compare with.
-     *    @param string $message   Message to display.
-     */
-    function __construct($expected, $message = '%s') {
-        $this->expected = $expected;
-        parent::__construct($message);
-    }
-
-    /**
-     *    Carry out the test.
-     *    @param Exception $compare    Value to check.
-     *    @return boolean              True if matched.
-     */
-    function test($compare) {
-        if (is_string($this->expected)) {
-            return ($compare instanceof $this->expected);
-        }
-        if (get_class($compare) != get_class($this->expected)) {
-            return false;
-        }
-        return $compare->getMessage() == $this->expected->getMessage();
-    }
-
-    /**
-     *    Create the message to display describing the test.
-     *    @param Exception $compare     Exception to match.
-     *    @return string                Final message.
-     */
-    function testMessage($compare) {
-        if (is_string($this->expected)) {
-            return "Exception [" . $this->describeException($compare) .
-                    "] should be type [" . $this->expected . "]";
-        }
-        return "Exception [" . $this->describeException($compare) .
-                "] should match [" .
-                $this->describeException($this->expected) . "]";
-    }
-
-    /**
-     *    Summary of an Exception object.
-     *    @param Exception $compare     Exception to describe.
-     *    @return string                Text description.
-     */
-    protected function describeException($exception) {
-        return get_class($exception) . ": " . $exception->getMessage();
-    }
-}
-
-/**
- *    Stores expected exceptions for when they
- *    get thrown. Saves the irritating try...catch
- *    block.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleExceptionTrap {
-    private $expected;
-    private $ignored;
-    private $message;
-
-    /**
-     *    Clears down the queue ready for action.
-     */
-    function __construct() {
-        $this->clear();
-    }
-
-    /**
-     *    Sets up an expectation of an exception.
-     *    This has the effect of intercepting an
-     *    exception that matches.
-     *    @param SimpleExpectation $expected    Expected exception to match.
-     *    @param string $message                Message to display.
-     *    @access public
-     */
-    function expectException($expected = false, $message = '%s') {
-        $this->expected = $this->coerceToExpectation($expected);
-        $this->message = $message;
-    }
-
-    /**
-     *    Adds an exception to the ignore list. This is the list
-     *    of exceptions that when thrown do not affect the test.
-     *    @param SimpleExpectation $ignored    Exception to skip.
-     *    @access public
-     */
-    function ignoreException($ignored) {
-        $this->ignored[] = $this->coerceToExpectation($ignored);
-    }
-
-    /**
-     *    Compares the expected exception with any
-     *    in the queue. Issues a pass or fail and
-     *    returns the state of the test.
-     *    @param SimpleTestCase $test    Test case to send messages to.
-     *    @param Exception $exception    Exception to compare.
-     *    @return boolean                False on no match.
-     */
-    function isExpected($test, $exception) {
-        if ($this->expected) {
-            return $test->assert($this->expected, $exception, $this->message);
-        }
-        foreach ($this->ignored as $ignored) {
-            if ($ignored->test($exception)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Turns an expected exception into a SimpleExpectation object.
-     *    @param mixed $exception      Exception, expectation or
-     *                                 class name of exception.
-     *    @return SimpleExpectation    Expectation that will match the
-     *                                 exception.
-     */
-    private function coerceToExpectation($exception) {
-        if ($exception === false) {
-            return new AnythingExpectation();
-        }
-        if (! SimpleExpectation::isExpectation($exception)) {
-            return new ExceptionExpectation($exception);
-        }
-        return $exception;
-    }
-
-    /**
-     *    Tests for any left over exception.
-     *    @return string/false     The failure message or false if none.
-     */
-    function getOutstanding() {
-        return sprintf($this->message, 'Failed to trap exception');
-    }
-
-    /**
-     *    Discards the contents of the error queue.
-     */
-    function clear() {
-        $this->expected = false;
-        $this->message = false;
-        $this->ignored = array();
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/expectation.php b/3rdparty/simpletest/expectation.php
deleted file mode 100755
index a480a366c5c..00000000000
--- a/3rdparty/simpletest/expectation.php
+++ /dev/null
@@ -1,984 +0,0 @@
-<?php
-/**
- *    base include file for SimpleTest
- *    @package    SimpleTest
- *    @subpackage    UnitTester
- *    @version    $Id: expectation.php 2009 2011-04-28 08:57:25Z pp11 $
- */
-
-/**#@+
- *    include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/dumper.php');
-require_once(dirname(__FILE__) . '/compatibility.php');
-/**#@-*/
-
-/**
- *    Assertion that can display failure information.
- *    Also includes various helper methods.
- *    @package SimpleTest
- *    @subpackage UnitTester
- *    @abstract
- */
-class SimpleExpectation {
-    protected $dumper = false;
-    private $message;
-
-    /**
-     *    Creates a dumper for displaying values and sets
-     *    the test message.
-     *    @param string $message    Customised message on failure.
-     */
-    function __construct($message = '%s') {
-        $this->message = $message;
-    }
-
-    /**
-     *    Tests the expectation. True if correct.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     *    @abstract
-     */
-    function test($compare) {
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     *    @abstract
-     */
-    function testMessage($compare) {
-    }
-
-    /**
-     *    Overlays the generated message onto the stored user
-     *    message. An additional message can be interjected.
-     *    @param mixed $compare        Comparison value.
-     *    @param SimpleDumper $dumper  For formatting the results.
-     *    @return string               Description of success
-     *                                 or failure.
-     *    @access public
-     */
-    function overlayMessage($compare, $dumper) {
-        $this->dumper = $dumper;
-        return sprintf($this->message, $this->testMessage($compare));
-    }
-
-    /**
-     *    Accessor for the dumper.
-     *    @return SimpleDumper    Current value dumper.
-     *    @access protected
-     */
-    protected function getDumper() {
-        if (! $this->dumper) {
-            $dumper = new SimpleDumper();
-            return $dumper;
-        }
-        return $this->dumper;
-    }
-
-    /**
-     *    Test to see if a value is an expectation object.
-     *    A useful utility method.
-     *    @param mixed $expectation    Hopefully an Expectation
-     *                                 class.
-     *    @return boolean              True if descended from
-     *                                 this class.
-     *    @access public
-     */
-    static function isExpectation($expectation) {
-        return is_object($expectation) &&
-                SimpleTestCompatibility::isA($expectation, 'SimpleExpectation');
-    }
-}
-
-/**
- *    A wildcard expectation always matches.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class AnythingExpectation extends SimpleExpectation {
-
-    /**
-     *    Tests the expectation. Always true.
-     *    @param mixed $compare  Ignored.
-     *    @return boolean        True.
-     *    @access public
-     */
-    function test($compare) {
-        return true;
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = $this->getDumper();
-        return 'Anything always matches [' . $dumper->describeValue($compare) . ']';
-    }
-}
-
-/**
- *    An expectation that never matches.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class FailedExpectation extends SimpleExpectation {
-
-    /**
-     *    Tests the expectation. Always false.
-     *    @param mixed $compare  Ignored.
-     *    @return boolean        True.
-     *    @access public
-     */
-    function test($compare) {
-        return false;
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = $this->getDumper();
-        return 'Failed expectation never matches [' . $dumper->describeValue($compare) . ']';
-    }
-}
-
-/**
- *    An expectation that passes on boolean true.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class TrueExpectation extends SimpleExpectation {
-
-    /**
-     *    Tests the expectation.
-     *    @param mixed $compare  Should be true.
-     *    @return boolean        True on match.
-     *    @access public
-     */
-    function test($compare) {
-        return (boolean)$compare;
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = $this->getDumper();
-        return 'Expected true, got [' . $dumper->describeValue($compare) . ']';
-    }
-}
-
-/**
- *    An expectation that passes on boolean false.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class FalseExpectation extends SimpleExpectation {
-
-    /**
-     *    Tests the expectation.
-     *    @param mixed $compare  Should be false.
-     *    @return boolean        True on match.
-     *    @access public
-     */
-    function test($compare) {
-        return ! (boolean)$compare;
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = $this->getDumper();
-        return 'Expected false, got [' . $dumper->describeValue($compare) . ']';
-    }
-}
-
-/**
- *    Test for equality.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class EqualExpectation extends SimpleExpectation {
-    private $value;
-
-    /**
-     *    Sets the value to compare against.
-     *    @param mixed $value        Test value to match.
-     *    @param string $message     Customised message on failure.
-     *    @access public
-     */
-    function __construct($value, $message = '%s') {
-        parent::__construct($message);
-        $this->value = $value;
-    }
-
-    /**
-     *    Tests the expectation. True if it matches the
-     *    held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return (($this->value == $compare) && ($compare == $this->value));
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            return "Equal expectation [" . $this->dumper->describeValue($this->value) . "]";
-        } else {
-            return "Equal expectation fails " .
-                    $this->dumper->describeDifference($this->value, $compare);
-        }
-    }
-
-    /**
-     *    Accessor for comparison value.
-     *    @return mixed       Held value to compare with.
-     *    @access protected
-     */
-    protected function getValue() {
-        return $this->value;
-    }
-}
-
-/**
- *    Test for inequality.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NotEqualExpectation extends EqualExpectation {
-
-    /**
-     *    Sets the value to compare against.
-     *    @param mixed $value       Test value to match.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function __construct($value, $message = '%s') {
-        parent::__construct($value, $message);
-    }
-
-    /**
-     *    Tests the expectation. True if it differs from the
-     *    held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = $this->getDumper();
-        if ($this->test($compare)) {
-            return "Not equal expectation passes " .
-                    $dumper->describeDifference($this->getValue(), $compare);
-        } else {
-            return "Not equal expectation fails [" .
-                    $dumper->describeValue($this->getValue()) .
-                    "] matches";
-        }
-    }
-}
-
-/**
- *    Test for being within a range.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class WithinMarginExpectation extends SimpleExpectation {
-    private $upper;
-    private $lower;
-
-    /**
-     *    Sets the value to compare against and the fuzziness of
-     *    the match. Used for comparing floating point values.
-     *    @param mixed $value        Test value to match.
-     *    @param mixed $margin       Fuzziness of match.
-     *    @param string $message     Customised message on failure.
-     *    @access public
-     */
-    function __construct($value, $margin, $message = '%s') {
-        parent::__construct($message);
-        $this->upper = $value + $margin;
-        $this->lower = $value - $margin;
-    }
-
-    /**
-     *    Tests the expectation. True if it matches the
-     *    held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return (($compare <= $this->upper) && ($compare >= $this->lower));
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            return $this->withinMessage($compare);
-        } else {
-            return $this->outsideMessage($compare);
-        }
-    }
-
-    /**
-     *    Creates a the message for being within the range.
-     *    @param mixed $compare        Value being tested.
-     *    @access private
-     */
-    protected function withinMessage($compare) {
-        return "Within expectation [" . $this->dumper->describeValue($this->lower) . "] and [" .
-                $this->dumper->describeValue($this->upper) . "]";
-    }
-
-    /**
-     *    Creates a the message for being within the range.
-     *    @param mixed $compare        Value being tested.
-     *    @access private
-     */
-    protected function outsideMessage($compare) {
-        if ($compare > $this->upper) {
-            return "Outside expectation " .
-                    $this->dumper->describeDifference($compare, $this->upper);
-        } else {
-            return "Outside expectation " .
-                    $this->dumper->describeDifference($compare, $this->lower);
-        }
-    }
-}
-
-/**
- *    Test for being outside of a range.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class OutsideMarginExpectation extends WithinMarginExpectation {
-
-    /**
-     *    Sets the value to compare against and the fuzziness of
-     *    the match. Used for comparing floating point values.
-     *    @param mixed $value        Test value to not match.
-     *    @param mixed $margin       Fuzziness of match.
-     *    @param string $message     Customised message on failure.
-     *    @access public
-     */
-    function __construct($value, $margin, $message = '%s') {
-        parent::__construct($value, $margin, $message);
-    }
-
-    /**
-     *    Tests the expectation. True if it matches the
-     *    held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if (! $this->test($compare)) {
-            return $this->withinMessage($compare);
-        } else {
-            return $this->outsideMessage($compare);
-        }
-    }
-}
-
-/**
- *    Test for reference.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class ReferenceExpectation {
-    private $value;
-
-    /**
-     *    Sets the reference value to compare against.
-     *    @param mixed $value       Test reference to match.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function __construct(&$value, $message = '%s') {
-        $this->message = $message;
-        $this->value = &$value;
-    }
-
-    /**
-     *    Tests the expectation. True if it exactly
-     *    references the held value.
-     *    @param mixed $compare        Comparison reference.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test(&$compare) {
-        return SimpleTestCompatibility::isReference($this->value, $compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            return "Reference expectation [" . $this->dumper->describeValue($this->value) . "]";
-        } else {
-            return "Reference expectation fails " .
-                    $this->dumper->describeDifference($this->value, $compare);
-        }
-    }
-
-    /**
-     *    Overlays the generated message onto the stored user
-     *    message. An additional message can be interjected.
-     *    @param mixed $compare        Comparison value.
-     *    @param SimpleDumper $dumper  For formatting the results.
-     *    @return string               Description of success
-     *                                 or failure.
-     *    @access public
-     */
-    function overlayMessage($compare, $dumper) {
-        $this->dumper = $dumper;
-        return sprintf($this->message, $this->testMessage($compare));
-    }
-
-    /**
-     *    Accessor for the dumper.
-     *    @return SimpleDumper    Current value dumper.
-     *    @access protected
-     */
-    protected function getDumper() {
-        if (! $this->dumper) {
-            $dumper = new SimpleDumper();
-            return $dumper;
-        }
-        return $this->dumper;
-    }
-}
-
-/**
- *    Test for identity.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class IdenticalExpectation extends EqualExpectation {
-
-    /**
-     *    Sets the value to compare against.
-     *    @param mixed $value       Test value to match.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function __construct($value, $message = '%s') {
-        parent::__construct($value, $message);
-    }
-
-    /**
-     *    Tests the expectation. True if it exactly
-     *    matches the held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return SimpleTestCompatibility::isIdentical($this->getValue(), $compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = $this->getDumper();
-        if ($this->test($compare)) {
-            return "Identical expectation [" . $dumper->describeValue($this->getValue()) . "]";
-        } else {
-            return "Identical expectation [" . $dumper->describeValue($this->getValue()) .
-                    "] fails with [" .
-                    $dumper->describeValue($compare) . "] " .
-                    $dumper->describeDifference($this->getValue(), $compare, TYPE_MATTERS);
-        }
-    }
-}
-
-/**
- *    Test for non-identity.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NotIdenticalExpectation extends IdenticalExpectation {
-
-    /**
-     *    Sets the value to compare against.
-     *    @param mixed $value        Test value to match.
-     *    @param string $message     Customised message on failure.
-     *    @access public
-     */
-    function __construct($value, $message = '%s') {
-        parent::__construct($value, $message);
-    }
-
-    /**
-     *    Tests the expectation. True if it differs from the
-     *    held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = $this->getDumper();
-        if ($this->test($compare)) {
-            return "Not identical expectation passes " .
-                    $dumper->describeDifference($this->getValue(), $compare, TYPE_MATTERS);
-        } else {
-            return "Not identical expectation [" . $dumper->describeValue($this->getValue()) . "] matches";
-        }
-    }
-}
-
-/**
- *    Test for a pattern using Perl regex rules.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class PatternExpectation extends SimpleExpectation {
-    private $pattern;
-
-    /**
-     *    Sets the value to compare against.
-     *    @param string $pattern    Pattern to search for.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function __construct($pattern, $message = '%s') {
-        parent::__construct($message);
-        $this->pattern = $pattern;
-    }
-
-    /**
-     *    Accessor for the pattern.
-     *    @return string       Perl regex as string.
-     *    @access protected
-     */
-    protected function getPattern() {
-        return $this->pattern;
-    }
-
-    /**
-     *    Tests the expectation. True if the Perl regex
-     *    matches the comparison value.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return (boolean)preg_match($this->getPattern(), $compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            return $this->describePatternMatch($this->getPattern(), $compare);
-        } else {
-            $dumper = $this->getDumper();
-            return "Pattern [" . $this->getPattern() .
-                    "] not detected in [" .
-                    $dumper->describeValue($compare) . "]";
-        }
-    }
-
-    /**
-     *    Describes a pattern match including the string
-     *    found and it's position.
-     *    @param string $pattern        Regex to match against.
-     *    @param string $subject        Subject to search.
-     *    @access protected
-     */
-    protected function describePatternMatch($pattern, $subject) {
-        preg_match($pattern, $subject, $matches);
-        $position = strpos($subject, $matches[0]);
-        $dumper = $this->getDumper();
-        return "Pattern [$pattern] detected at character [$position] in [" .
-                $dumper->describeValue($subject) . "] as [" .
-                $matches[0] . "] in region [" .
-                $dumper->clipString($subject, 100, $position) . "]";
-    }
-}
-
-/**
- *    Fail if a pattern is detected within the
- *    comparison.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NoPatternExpectation extends PatternExpectation {
-
-    /**
-     *    Sets the reject pattern
-     *    @param string $pattern    Pattern to search for.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function __construct($pattern, $message = '%s') {
-        parent::__construct($pattern, $message);
-    }
-
-    /**
-     *    Tests the expectation. False if the Perl regex
-     *    matches the comparison value.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param string $compare      Comparison value.
-     *    @return string              Description of success
-     *                                or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            $dumper = $this->getDumper();
-            return "Pattern [" . $this->getPattern() .
-                    "] not detected in [" .
-                    $dumper->describeValue($compare) . "]";
-        } else {
-            return $this->describePatternMatch($this->getPattern(), $compare);
-        }
-    }
-}
-
-/**
- *    Tests either type or class name if it's an object.
- *      @package SimpleTest
- *      @subpackage UnitTester
- */
-class IsAExpectation extends SimpleExpectation {
-    private $type;
-
-    /**
-     *    Sets the type to compare with.
-     *    @param string $type       Type or class name.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function __construct($type, $message = '%s') {
-        parent::__construct($message);
-        $this->type = $type;
-    }
-
-    /**
-     *    Accessor for type to check against.
-     *    @return string    Type or class name.
-     *    @access protected
-     */
-    protected function getType() {
-        return $this->type;
-    }
-
-    /**
-     *    Tests the expectation. True if the type or
-     *    class matches the string value.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        if (is_object($compare)) {
-            return SimpleTestCompatibility::isA($compare, $this->type);
-        } else {
-            $function = 'is_'.$this->canonicalType($this->type);
-            if (is_callable($function)) {
-                return $function($compare);
-            }
-            return false;
-        }
-    }
-
-    /**
-     *    Coerces type name into a is_*() match.
-     *    @param string $type        User type.
-     *    @return string             Simpler type.
-     *    @access private
-     */
-    protected function canonicalType($type) {
-        $type = strtolower($type);
-        $map = array('boolean' => 'bool');
-        if (isset($map[$type])) {
-            $type = $map[$type];
-        }
-        return $type;
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = $this->getDumper();
-        return "Value [" . $dumper->describeValue($compare) .
-                "] should be type [" . $this->type . "]";
-    }
-}
-
-/**
- *    Tests either type or class name if it's an object.
- *    Will succeed if the type does not match.
- *      @package SimpleTest
- *      @subpackage UnitTester
- */
-class NotAExpectation extends IsAExpectation {
-    private $type;
-
-    /**
-     *    Sets the type to compare with.
-     *    @param string $type       Type or class name.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function __construct($type, $message = '%s') {
-        parent::__construct($type, $message);
-    }
-
-    /**
-     *    Tests the expectation. False if the type or
-     *    class matches the string value.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if different.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = $this->getDumper();
-        return "Value [" . $dumper->describeValue($compare) .
-                "] should not be type [" . $this->getType() . "]";
-    }
-}
-
-/**
- *    Tests for existance of a method in an object
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class MethodExistsExpectation extends SimpleExpectation {
-    private $method;
-
-    /**
-     *    Sets the value to compare against.
-     *    @param string $method     Method to check.
-     *    @param string $message    Customised message on failure.
-     *    @return void
-     */
-    function __construct($method, $message = '%s') {
-        parent::__construct($message);
-        $this->method = &$method;
-    }
-
-    /**
-     *    Tests the expectation. True if the method exists in the test object.
-     *    @param string $compare        Comparison method name.
-     *    @return boolean               True if correct.
-     */
-    function test($compare) {
-        return (boolean)(is_object($compare) && method_exists($compare, $this->method));
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     */
-    function testMessage($compare) {
-        $dumper = $this->getDumper();
-        if (! is_object($compare)) {
-            return 'No method on non-object [' . $dumper->describeValue($compare) . ']';
-        }
-        $method = $this->method;
-        return "Object [" . $dumper->describeValue($compare) .
-                "] should contain method [$method]";
-    }
-}
-
-/**
- *    Compares an object member's value even if private.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class MemberExpectation extends IdenticalExpectation {
-    private $name;
-
-    /**
-     *    Sets the value to compare against.
-     *    @param string $method     Method to check.
-     *    @param string $message    Customised message on failure.
-     *    @return void
-     */
-    function __construct($name, $expected) {
-        $this->name = $name;
-        parent::__construct($expected);
-    }
-
-    /**
-     *    Tests the expectation. True if the property value is identical.
-     *    @param object $actual         Comparison object.
-     *    @return boolean               True if identical.
-     */
-    function test($actual) {
-        if (! is_object($actual)) {
-            return false;
-        }
-        return parent::test($this->getProperty($this->name, $actual));
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     */
-    function testMessage($actual) {
-        return parent::testMessage($this->getProperty($this->name, $actual));
-    }
-
-    /**
-     *    Extracts the member value even if private using reflection.
-     *    @param string $name        Property name.
-     *    @param object $object      Object to read.
-     *    @return mixed              Value of property.
-     */
-    private function getProperty($name, $object) {
-        $reflection = new ReflectionObject($object);
-        $property = $reflection->getProperty($name);
-        if (method_exists($property, 'setAccessible')) {
-            $property->setAccessible(true);
-        }
-        try {
-            return $property->getValue($object);
-        } catch (ReflectionException $e) {
-            return $this->getPrivatePropertyNoMatterWhat($name, $object);
-        }
-    }
-
-    /**
-     *    Extracts a private member's value when reflection won't play ball.
-     *    @param string $name        Property name.
-     *    @param object $object      Object to read.
-     *    @return mixed              Value of property.
-     */
-    private function getPrivatePropertyNoMatterWhat($name, $object) {
-        foreach ((array)$object as $mangled_name => $value) {
-            if ($this->unmangle($mangled_name) == $name) {
-                return $value;
-            }
-        }
-    }
-
-    /**
-     *    Removes crud from property name after it's been converted
-     *    to an array.
-     *    @param string $mangled     Name from array cast.
-     *    @return string             Cleaned up name.
-     */
-    function unmangle($mangled) {
-        $parts = preg_split('/[^a-zA-Z0-9_\x7f-\xff]+/', $mangled);
-        return array_pop($parts);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/pear_test_case.php b/3rdparty/simpletest/extensions/pear_test_case.php
deleted file mode 100755
index 71657ae4cea..00000000000
--- a/3rdparty/simpletest/extensions/pear_test_case.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-    /**
-     *	adapter for SimpleTest to use PEAR PHPUnit test cases
-     *	@package	SimpleTest
-     *	@subpackage Extensions
-     *	@version	$Id: pear_test_case.php 1836 2008-12-21 00:02:26Z edwardzyang $
-     */
-    
-    /**#@+
-     * include SimpleTest files
-     */
-    require_once(dirname(__FILE__) . '/../dumper.php');
-    require_once(dirname(__FILE__) . '/../compatibility.php');
-    require_once(dirname(__FILE__) . '/../test_case.php');
-    require_once(dirname(__FILE__) . '/../expectation.php');
-	/**#@-*/
-   
-    /**
-     *    Adapter for PEAR PHPUnit test case to allow
-     *    legacy PEAR test cases to be used with SimpleTest.
-     *    @package      SimpleTest
-     *    @subpackage   Extensions
-     */
-    class PHPUnit_TestCase extends SimpleTestCase {
-        private $_loosely_typed;
-        
-        /**
-         *    Constructor. Sets the test name.
-         *    @param $label        Test name to display.
-         *    @public
-         */
-        function __construct($label = false) {
-            parent::__construct($label);
-            $this->_loosely_typed = false;
-        }
-        
-        /**
-         *    Will test straight equality if set to loose
-         *    typing, or identity if not.
-         *    @param $first          First value.
-         *    @param $second         Comparison value.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertEquals($first, $second, $message = "%s", $delta = 0) {
-            if ($this->_loosely_typed) {
-                $expectation = new EqualExpectation($first);
-            } else {
-                $expectation = new IdenticalExpectation($first);
-            }
-            $this->assert($expectation, $second, $message);
-        }
-        
-        /**
-         *    Passes if the value tested is not null.
-         *    @param $value          Value to test against.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertNotNull($value, $message = "%s") {
-            parent::assert(new TrueExpectation(), isset($value), $message);
-        }
-        
-        /**
-         *    Passes if the value tested is null.
-         *    @param $value          Value to test against.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertNull($value, $message = "%s") {
-            parent::assert(new TrueExpectation(), !isset($value), $message);
-        }
-        
-        /**
-         *    Identity test tests for the same object.
-         *    @param $first          First object handle.
-         *    @param $second         Hopefully the same handle.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertSame($first, $second, $message = "%s") {
-            $dumper = new SimpleDumper();
-            $message = sprintf(
-                    $message,
-                    "[" . $dumper->describeValue($first) .
-                            "] and [" . $dumper->describeValue($second) .
-                            "] should reference the same object");
-            return $this->assert(
-					new TrueExpectation(),
-                    SimpleTestCompatibility::isReference($first, $second),
-                    $message);
-        }
-        
-        /**
-         *    Inverted identity test.
-         *    @param $first          First object handle.
-         *    @param $second         Hopefully a different handle.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertNotSame($first, $second, $message = "%s") {
-            $dumper = new SimpleDumper();
-            $message = sprintf(
-                    $message,
-                    "[" . $dumper->describeValue($first) .
-                            "] and [" . $dumper->describeValue($second) .
-                            "] should not be the same object");
-            return $this->assert(
-					new falseExpectation(),
-                    SimpleTestCompatibility::isReference($first, $second),
-                    $message);
-        }
-        
-        /**
-         *    Sends pass if the test condition resolves true,
-         *    a fail otherwise.
-         *    @param $condition      Condition to test true.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertTrue($condition, $message = "%s") {
-            parent::assert(new TrueExpectation(), $condition, $message);
-        }
-        
-        /**
-         *    Sends pass if the test condition resolves false,
-         *    a fail otherwise.
-         *    @param $condition      Condition to test false.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertFalse($condition, $message = "%s") {
-            parent::assert(new FalseExpectation(), $condition, $message);
-        }
-        
-        /**
-         *    Tests a regex match. Needs refactoring.
-         *    @param $pattern        Regex to match.
-         *    @param $subject        String to search in.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertRegExp($pattern, $subject, $message = "%s") {
-            $this->assert(new PatternExpectation($pattern), $subject, $message);
-        }
-        
-        /**
-         *    Tests the type of a value.
-         *    @param $value          Value to take type of.
-         *    @param $type           Hoped for type.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertType($value, $type, $message = "%s") {
-            parent::assert(new TrueExpectation(), gettype($value) == strtolower($type), $message);
-        }
-        
-        /**
-         *    Sets equality operation to act as a simple equal
-         *    comparison only, allowing a broader range of
-         *    matches.
-         *    @param $loosely_typed     True for broader comparison.
-         *    @public
-         */
-        function setLooselyTyped($loosely_typed) {
-            $this->_loosely_typed = $loosely_typed;
-        }
-
-        /**
-         *    For progress indication during
-         *    a test amongst other things.
-         *    @return            Usually one.
-         *    @public
-         */
-        function countTestCases() {
-            return $this->getSize();
-        }
-        
-        /**
-         *    Accessor for name, normally just the class
-         *    name.
-         *    @public
-         */
-        function getName() {
-            return $this->getLabel();
-        }
-        
-        /**
-         *    Does nothing. For compatibility only.
-         *    @param $name        Dummy
-         *    @public
-         */
-        function setName($name) {
-        }
-    }
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/testdox.php b/3rdparty/simpletest/extensions/testdox.php
deleted file mode 100755
index 5cf32f35162..00000000000
--- a/3rdparty/simpletest/extensions/testdox.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- *	Extension for a TestDox reporter
- *	@package	SimpleTest
- *	@subpackage	Extensions
- *	@version	$Id: testdox.php 2004 2010-10-31 13:44:14Z jsweat $
- */
-
-/**
- * 	TestDox reporter 
- *	@package	SimpleTest
- *	@subpackage	Extensions
- */
-class TestDoxReporter extends SimpleReporter
-{
-    var $_test_case_pattern = '/^TestOf(.*)$/';
-
-    function __construct($test_case_pattern = '/^TestOf(.*)$/') {
-        parent::__construct();
-        $this->_test_case_pattern = empty($test_case_pattern) ? '/^(.*)$/' : $test_case_pattern;
-    }
-
-    function paintCaseStart($test_name) {
-        preg_match($this->_test_case_pattern, $test_name, $matches);
-        if (!empty($matches[1])) {
-            echo $matches[1] . "\n";
-        } else {
-            echo $test_name . "\n";
-        }
-    }
-
-    function paintCaseEnd($test_name) {
-        echo "\n";
-    }
-
-    function paintMethodStart($test_name) {
-        if (!preg_match('/^test(.*)$/i', $test_name, $matches)) {
-            return;
-        }
-        $test_name = $matches[1];
-        $test_name = preg_replace('/([A-Z])([A-Z])/', '$1 $2', $test_name);
-        echo '- ' . strtolower(preg_replace('/([a-zA-Z])([A-Z0-9])/', '$1 $2', $test_name));
-    }
-
-    function paintMethodEnd($test_name) {
-        echo "\n";
-    }
-
-    function paintFail($message) {
-        echo " [FAILED]";
-    }
-}
-?>
diff --git a/3rdparty/simpletest/extensions/testdox/test.php b/3rdparty/simpletest/extensions/testdox/test.php
deleted file mode 100755
index b03abe510ab..00000000000
--- a/3rdparty/simpletest/extensions/testdox/test.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-// $Id: test.php 1748 2008-04-14 01:50:41Z lastcraft $
-require_once dirname(__FILE__) . '/../../autorun.php';
-require_once dirname(__FILE__) . '/../testdox.php';
-
-// uncomment to see test dox in action
-//SimpleTest::prefer(new TestDoxReporter());
-
-class TestOfTestDoxReporter extends UnitTestCase
-{
-    function testIsAnInstanceOfSimpleScorerAndReporter() {
-        $dox = new TestDoxReporter();
-        $this->assertIsA($dox, 'SimpleScorer');
-        $this->assertIsA($dox, 'SimpleReporter');
-    }
-
-    function testOutputsNameOfTestCase() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintCaseStart('TestOfTestDoxReporter');
-        $buffer = ob_get_clean();
-        $this->assertPattern('/^TestDoxReporter/', $buffer);
-    }
-
-    function testOutputOfTestCaseNameFilteredByConstructParameter() {
-        $dox = new TestDoxReporter('/^(.*)Test$/');
-        ob_start();
-        $dox->paintCaseStart('SomeGreatWidgetTest');
-        $buffer = ob_get_clean();
-        $this->assertPattern('/^SomeGreatWidget/', $buffer);
-    }
-
-    function testIfTest_case_patternIsEmptyAssumeEverythingMatches() {
-        $dox = new TestDoxReporter('');
-        ob_start();
-        $dox->paintCaseStart('TestOfTestDoxReporter');
-        $buffer = ob_get_clean();
-        $this->assertPattern('/^TestOfTestDoxReporter/', $buffer);
-    }
-
-    function testEmptyLineInsertedWhenCaseEnds() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintCaseEnd('TestOfTestDoxReporter');
-        $buffer = ob_get_clean();
-        $this->assertEqual("\n", $buffer);
-    }
-
-    function testPaintsTestMethodInTestDoxFormat() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintMethodStart('testSomeGreatTestCase');
-        $buffer = ob_get_clean();
-        $this->assertEqual("- some great test case", $buffer);
-        unset($buffer);
-
-        $random = rand(100, 200);
-        ob_start();
-        $dox->paintMethodStart("testRandomNumberIs{$random}");
-        $buffer = ob_get_clean();
-        $this->assertEqual("- random number is {$random}", $buffer);
-    }
-
-    function testDoesNotOutputAnythingOnNoneTestMethods() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintMethodStart('nonMatchingMethod');
-        $buffer = ob_get_clean();
-        $this->assertEqual('', $buffer);
-    }
-
-    function testPaintMethodAddLineBreak() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintMethodEnd('someMethod');
-        $buffer = ob_get_clean();
-        $this->assertEqual("\n", $buffer);
-    }
-
-    function testProperlySpacesSingleLettersInMethodName() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintMethodStart('testAVerySimpleAgainAVerySimpleMethod');
-        $buffer = ob_get_clean();
-        $this->assertEqual('- a very simple again a very simple method', $buffer);
-    }
-
-    function testOnFailureThisPrintsFailureNotice() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintFail('');
-        $buffer = ob_get_clean();
-        $this->assertEqual(' [FAILED]', $buffer);
-    }
-
-    function testWhenMatchingMethodNamesTestPrefixIsCaseInsensitive() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintMethodStart('TESTSupportsAllUppercaseTestPrefixEvenThoughIDoNotKnowWhyYouWouldDoThat');
-        $buffer = ob_get_clean();
-        $this->assertEqual(
-            '- supports all uppercase test prefix even though i do not know why you would do that',
-            $buffer
-        );
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/form.php b/3rdparty/simpletest/form.php
deleted file mode 100644
index 5e423a9df82..00000000000
--- a/3rdparty/simpletest/form.php
+++ /dev/null
@@ -1,361 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest.
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: form.php 2013 2011-04-29 09:29:45Z pp11 $
- */
-
-/**#@+
- * include SimpleTest files
- */
-require_once(dirname(__FILE__) . '/tag.php');
-require_once(dirname(__FILE__) . '/encoding.php');
-require_once(dirname(__FILE__) . '/selector.php');
-/**#@-*/
-
-/**
- *    Form tag class to hold widget values.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleForm {
-    private $method;
-    private $action;
-    private $encoding;
-    private $default_target;
-    private $id;
-    private $buttons;
-    private $images;
-    private $widgets;
-    private $radios;
-    private $checkboxes;
-
-    /**
-     *    Starts with no held controls/widgets.
-     *    @param SimpleTag $tag        Form tag to read.
-     *    @param SimplePage $page      Holding page.
-     */
-    function __construct($tag, $page) {
-        $this->method = $tag->getAttribute('method');
-        $this->action = $this->createAction($tag->getAttribute('action'), $page);
-        $this->encoding = $this->setEncodingClass($tag);
-        $this->default_target = false;
-        $this->id = $tag->getAttribute('id');
-        $this->buttons = array();
-        $this->images = array();
-        $this->widgets = array();
-        $this->radios = array();
-        $this->checkboxes = array();
-    }
-
-    /**
-     *    Creates the request packet to be sent by the form.
-     *    @param SimpleTag $tag        Form tag to read.
-     *    @return string               Packet class.
-     *    @access private
-     */
-    protected function setEncodingClass($tag) {
-        if (strtolower($tag->getAttribute('method')) == 'post') {
-            if (strtolower($tag->getAttribute('enctype')) == 'multipart/form-data') {
-                return 'SimpleMultipartEncoding';
-            }
-            return 'SimplePostEncoding';
-        }
-        return 'SimpleGetEncoding';
-    }
-
-    /**
-     *    Sets the frame target within a frameset.
-     *    @param string $frame        Name of frame.
-     *    @access public
-     */
-    function setDefaultTarget($frame) {
-        $this->default_target = $frame;
-    }
-
-    /**
-     *    Accessor for method of form submission.
-     *    @return string           Either get or post.
-     *    @access public
-     */
-    function getMethod() {
-        return ($this->method ? strtolower($this->method) : 'get');
-    }
-
-    /**
-     *    Combined action attribute with current location
-     *    to get an absolute form target.
-     *    @param string $action    Action attribute from form tag.
-     *    @param SimpleUrl $base   Page location.
-     *    @return SimpleUrl        Absolute form target.
-     */
-    protected function createAction($action, $page) {
-        if (($action === '') || ($action === false)) {
-            return $page->expandUrl($page->getUrl());
-        }
-        return $page->expandUrl(new SimpleUrl($action));;
-    }
-
-    /**
-     *    Absolute URL of the target.
-     *    @return SimpleUrl           URL target.
-     *    @access public
-     */
-    function getAction() {
-        $url = $this->action;
-        if ($this->default_target && ! $url->getTarget()) {
-            $url->setTarget($this->default_target);
-        }
-        if ($this->getMethod() == 'get') {
-            $url->clearRequest();
-        }
-        return $url;
-    }
-
-    /**
-     *    Creates the encoding for the current values in the
-     *    form.
-     *    @return SimpleFormEncoding    Request to submit.
-     *    @access private
-     */
-    protected function encode() {
-        $class = $this->encoding;
-        $encoding = new $class();
-        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
-            $this->widgets[$i]->write($encoding);
-        }
-        return $encoding;
-    }
-
-    /**
-     *    ID field of form for unique identification.
-     *    @return string           Unique tag ID.
-     *    @access public
-     */
-    function getId() {
-        return $this->id;
-    }
-
-    /**
-     *    Adds a tag contents to the form.
-     *    @param SimpleWidget $tag        Input tag to add.
-     */
-    function addWidget($tag) {
-        if (strtolower($tag->getAttribute('type')) == 'submit') {
-            $this->buttons[] = $tag;
-        } elseif (strtolower($tag->getAttribute('type')) == 'image') {
-            $this->images[] = $tag;
-        } elseif ($tag->getName()) {
-            $this->setWidget($tag);
-        }
-    }
-
-    /**
-     *    Sets the widget into the form, grouping radio
-     *    buttons if any.
-     *    @param SimpleWidget $tag   Incoming form control.
-     *    @access private
-     */
-    protected function setWidget($tag) {
-        if (strtolower($tag->getAttribute('type')) == 'radio') {
-            $this->addRadioButton($tag);
-        } elseif (strtolower($tag->getAttribute('type')) == 'checkbox') {
-            $this->addCheckbox($tag);
-        } else {
-            $this->widgets[] = &$tag;
-        }
-    }
-
-    /**
-     *    Adds a radio button, building a group if necessary.
-     *    @param SimpleRadioButtonTag $tag   Incoming form control.
-     *    @access private
-     */
-    protected function addRadioButton($tag) {
-        if (! isset($this->radios[$tag->getName()])) {
-            $this->widgets[] = new SimpleRadioGroup();
-            $this->radios[$tag->getName()] = count($this->widgets) - 1;
-        }
-        $this->widgets[$this->radios[$tag->getName()]]->addWidget($tag);
-    }
-
-    /**
-     *    Adds a checkbox, making it a group on a repeated name.
-     *    @param SimpleCheckboxTag $tag   Incoming form control.
-     *    @access private
-     */
-    protected function addCheckbox($tag) {
-        if (! isset($this->checkboxes[$tag->getName()])) {
-            $this->widgets[] = $tag;
-            $this->checkboxes[$tag->getName()] = count($this->widgets) - 1;
-        } else {
-            $index = $this->checkboxes[$tag->getName()];
-            if (! SimpleTestCompatibility::isA($this->widgets[$index], 'SimpleCheckboxGroup')) {
-                $previous = $this->widgets[$index];
-                $this->widgets[$index] = new SimpleCheckboxGroup();
-                $this->widgets[$index]->addWidget($previous);
-            }
-            $this->widgets[$index]->addWidget($tag);
-        }
-    }
-
-    /**
-     *    Extracts current value from form.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @return string/array              Value(s) as string or null
-     *                                      if not set.
-     *    @access public
-     */
-    function getValue($selector) {
-        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
-            if ($selector->isMatch($this->widgets[$i])) {
-                return $this->widgets[$i]->getValue();
-            }
-        }
-        foreach ($this->buttons as $button) {
-            if ($selector->isMatch($button)) {
-                return $button->getValue();
-            }
-        }
-        return null;
-    }
-
-    /**
-     *    Sets a widget value within the form.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @param string $value              Value to input into the widget.
-     *    @return boolean                   True if value is legal, false
-     *                                      otherwise. If the field is not
-     *                                      present, nothing will be set.
-     *    @access public
-     */
-    function setField($selector, $value, $position=false) {
-        $success = false;
-        $_position = 0;
-        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
-            if ($selector->isMatch($this->widgets[$i])) {
-                $_position++;
-                if ($position === false or $_position === (int)$position) {
-                    if ($this->widgets[$i]->setValue($value)) {
-                        $success = true;
-                    }
-                }
-            }
-        }
-        return $success;
-    }
-
-    /**
-     *    Used by the page object to set widgets labels to
-     *    external label tags.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @access public
-     */
-    function attachLabelBySelector($selector, $label) {
-        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
-            if ($selector->isMatch($this->widgets[$i])) {
-                if (method_exists($this->widgets[$i], 'setLabel')) {
-                    $this->widgets[$i]->setLabel($label);
-                    return;
-                }
-            }
-        }
-    }
-
-    /**
-     *    Test to see if a form has a submit button.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @return boolean                   True if present.
-     *    @access public
-     */
-    function hasSubmit($selector) {
-        foreach ($this->buttons as $button) {
-            if ($selector->isMatch($button)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Test to see if a form has an image control.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @return boolean                   True if present.
-     *    @access public
-     */
-    function hasImage($selector) {
-        foreach ($this->images as $image) {
-            if ($selector->isMatch($image)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Gets the submit values for a selected button.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @param hash $additional           Additional data for the form.
-     *    @return SimpleEncoding            Submitted values or false
-     *                                      if there is no such button
-     *                                      in the form.
-     *    @access public
-     */
-    function submitButton($selector, $additional = false) {
-        $additional = $additional ? $additional : array();
-        foreach ($this->buttons as $button) {
-            if ($selector->isMatch($button)) {
-                $encoding = $this->encode();
-                $button->write($encoding);
-                if ($additional) {
-                    $encoding->merge($additional);
-                }
-                return $encoding;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Gets the submit values for an image.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @param integer $x                 X-coordinate of click.
-     *    @param integer $y                 Y-coordinate of click.
-     *    @param hash $additional           Additional data for the form.
-     *    @return SimpleEncoding            Submitted values or false
-     *                                      if there is no such button in the
-     *                                      form.
-     *    @access public
-     */
-    function submitImage($selector, $x, $y, $additional = false) {
-        $additional = $additional ? $additional : array();
-        foreach ($this->images as $image) {
-            if ($selector->isMatch($image)) {
-                $encoding = $this->encode();
-                $image->write($encoding, $x, $y);
-                if ($additional) {
-                    $encoding->merge($additional);
-                }
-                return $encoding;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Simply submits the form without the submit button
-     *    value. Used when there is only one button or it
-     *    is unimportant.
-     *    @return hash           Submitted values.
-     *    @access public
-     */
-    function submit($additional = false) {
-        $encoding = $this->encode();
-        if ($additional) {
-            $encoding->merge($additional);
-        }
-        return $encoding;
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/frames.php b/3rdparty/simpletest/frames.php
deleted file mode 100755
index d6d8e96fd0c..00000000000
--- a/3rdparty/simpletest/frames.php
+++ /dev/null
@@ -1,592 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: frames.php 1784 2008-04-26 13:07:14Z pp11 $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/page.php');
-require_once(dirname(__FILE__) . '/user_agent.php');
-/**#@-*/
-
-/**
- *    A composite page. Wraps a frameset page and
- *    adds subframes. The original page will be
- *    mostly ignored. Implements the SimplePage
- *    interface so as to be interchangeable.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleFrameset {
-    private $frameset;
-    private $frames;
-    private $focus;
-    private $names;
-
-    /**
-     *    Stashes the frameset page. Will make use of the
-     *    browser to fetch the sub frames recursively.
-     *    @param SimplePage $page        Frameset page.
-     */
-    function __construct($page) {
-        $this->frameset = $page;
-        $this->frames = array();
-        $this->focus = false;
-        $this->names = array();
-    }
-
-    /**
-     *    Adds a parsed page to the frameset.
-     *    @param SimplePage $page    Frame page.
-     *    @param string $name        Name of frame in frameset.
-     *    @access public
-     */
-    function addFrame($page, $name = false) {
-        $this->frames[] = $page;
-        if ($name) {
-            $this->names[$name] = count($this->frames) - 1;
-        }
-    }
-
-    /**
-     *    Replaces existing frame with another. If the
-     *    frame is nested, then the call is passed down
-     *    one level.
-     *    @param array $path        Path of frame in frameset.
-     *    @param SimplePage $page   Frame source.
-     *    @access public
-     */
-    function setFrame($path, $page) {
-        $name = array_shift($path);
-        if (isset($this->names[$name])) {
-            $index = $this->names[$name];
-        } else {
-            $index = $name - 1;
-        }
-        if (count($path) == 0) {
-            $this->frames[$index] = &$page;
-            return;
-        }
-        $this->frames[$index]->setFrame($path, $page);
-    }
-
-    /**
-     *    Accessor for current frame focus. Will be
-     *    false if no frame has focus. Will have the nested
-     *    frame focus if any.
-     *    @return array     Labels or indexes of nested frames.
-     *    @access public
-     */
-    function getFrameFocus() {
-        if ($this->focus === false) {
-            return array();
-        }
-        return array_merge(
-                array($this->getPublicNameFromIndex($this->focus)),
-                $this->frames[$this->focus]->getFrameFocus());
-    }
-
-    /**
-     *    Turns an internal array index into the frames list
-     *    into a public name, or if none, then a one offset
-     *    index.
-     *    @param integer $subject    Internal index.
-     *    @return integer/string     Public name.
-     *    @access private
-     */
-    protected function getPublicNameFromIndex($subject) {
-        foreach ($this->names as $name => $index) {
-            if ($subject == $index) {
-                return $name;
-            }
-        }
-        return $subject + 1;
-    }
-
-    /**
-     *    Sets the focus by index. The integer index starts from 1.
-     *    If already focused and the target frame also has frames,
-     *    then the nested frame will be focused.
-     *    @param integer $choice    Chosen frame.
-     *    @return boolean           True if frame exists.
-     *    @access public
-     */
-    function setFrameFocusByIndex($choice) {
-        if (is_integer($this->focus)) {
-            if ($this->frames[$this->focus]->hasFrames()) {
-                return $this->frames[$this->focus]->setFrameFocusByIndex($choice);
-            }
-        }
-        if (($choice < 1) || ($choice > count($this->frames))) {
-            return false;
-        }
-        $this->focus = $choice - 1;
-        return true;
-    }
-
-    /**
-     *    Sets the focus by name. If already focused and the
-     *    target frame also has frames, then the nested frame
-     *    will be focused.
-     *    @param string $name    Chosen frame.
-     *    @return boolean        True if frame exists.
-     *    @access public
-     */
-    function setFrameFocus($name) {
-        if (is_integer($this->focus)) {
-            if ($this->frames[$this->focus]->hasFrames()) {
-                return $this->frames[$this->focus]->setFrameFocus($name);
-            }
-        }
-        if (in_array($name, array_keys($this->names))) {
-            $this->focus = $this->names[$name];
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     *    Clears the frame focus.
-     *    @access public
-     */
-    function clearFrameFocus() {
-        $this->focus = false;
-        $this->clearNestedFramesFocus();
-    }
-
-    /**
-     *    Clears the frame focus for any nested frames.
-     *    @access private
-     */
-    protected function clearNestedFramesFocus() {
-        for ($i = 0; $i < count($this->frames); $i++) {
-            $this->frames[$i]->clearFrameFocus();
-        }
-    }
-
-    /**
-     *    Test for the presence of a frameset.
-     *    @return boolean        Always true.
-     *    @access public
-     */
-    function hasFrames() {
-        return true;
-    }
-
-    /**
-     *    Accessor for frames information.
-     *    @return array/string      Recursive hash of frame URL strings.
-     *                              The key is either a numerical
-     *                              index or the name attribute.
-     *    @access public
-     */
-    function getFrames() {
-        $report = array();
-        for ($i = 0; $i < count($this->frames); $i++) {
-            $report[$this->getPublicNameFromIndex($i)] =
-                    $this->frames[$i]->getFrames();
-        }
-        return $report;
-    }
-
-    /**
-     *    Accessor for raw text of either all the pages or
-     *    the frame in focus.
-     *    @return string        Raw unparsed content.
-     *    @access public
-     */
-    function getRaw() {
-        if (is_integer($this->focus)) {
-            return $this->frames[$this->focus]->getRaw();
-        }
-        $raw = '';
-        for ($i = 0; $i < count($this->frames); $i++) {
-            $raw .= $this->frames[$i]->getRaw();
-        }
-        return $raw;
-    }
-
-    /**
-     *    Accessor for plain text of either all the pages or
-     *    the frame in focus.
-     *    @return string        Plain text content.
-     *    @access public
-     */
-    function getText() {
-        if (is_integer($this->focus)) {
-            return $this->frames[$this->focus]->getText();
-        }
-        $raw = '';
-        for ($i = 0; $i < count($this->frames); $i++) {
-            $raw .= ' ' . $this->frames[$i]->getText();
-        }
-        return trim($raw);
-    }
-
-    /**
-     *    Accessor for last error.
-     *    @return string        Error from last response.
-     *    @access public
-     */
-    function getTransportError() {
-        if (is_integer($this->focus)) {
-            return $this->frames[$this->focus]->getTransportError();
-        }
-        return $this->frameset->getTransportError();
-    }
-
-    /**
-     *    Request method used to fetch this frame.
-     *    @return string      GET, POST or HEAD.
-     *    @access public
-     */
-    function getMethod() {
-        if (is_integer($this->focus)) {
-            return $this->frames[$this->focus]->getMethod();
-        }
-        return $this->frameset->getMethod();
-    }
-
-    /**
-     *    Original resource name.
-     *    @return SimpleUrl        Current url.
-     *    @access public
-     */
-    function getUrl() {
-        if (is_integer($this->focus)) {
-            $url = $this->frames[$this->focus]->getUrl();
-            $url->setTarget($this->getPublicNameFromIndex($this->focus));
-        } else {
-            $url = $this->frameset->getUrl();
-        }
-        return $url;
-    }
-
-    /**
-     *    Page base URL.
-     *    @return SimpleUrl        Current url.
-     *    @access public
-     */
-    function getBaseUrl() {
-        if (is_integer($this->focus)) {
-            $url = $this->frames[$this->focus]->getBaseUrl();
-        } else {
-            $url = $this->frameset->getBaseUrl();
-        }
-        return $url;
-    }
-
-    /**
-     *    Expands expandomatic URLs into fully qualified
-     *    URLs for the frameset page.
-     *    @param SimpleUrl $url        Relative URL.
-     *    @return SimpleUrl            Absolute URL.
-     *    @access public
-     */
-    function expandUrl($url) {
-        return $this->frameset->expandUrl($url);
-    }
-
-    /**
-     *    Original request data.
-     *    @return mixed              Sent content.
-     *    @access public
-     */
-    function getRequestData() {
-        if (is_integer($this->focus)) {
-            return $this->frames[$this->focus]->getRequestData();
-        }
-        return $this->frameset->getRequestData();
-    }
-
-    /**
-     *    Accessor for current MIME type.
-     *    @return string    MIME type as string; e.g. 'text/html'
-     *    @access public
-     */
-    function getMimeType() {
-        if (is_integer($this->focus)) {
-            return $this->frames[$this->focus]->getMimeType();
-        }
-        return $this->frameset->getMimeType();
-    }
-
-    /**
-     *    Accessor for last response code.
-     *    @return integer    Last HTTP response code received.
-     *    @access public
-     */
-    function getResponseCode() {
-        if (is_integer($this->focus)) {
-            return $this->frames[$this->focus]->getResponseCode();
-        }
-        return $this->frameset->getResponseCode();
-    }
-
-    /**
-     *    Accessor for last Authentication type. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Description of challenge type.
-     *    @access public
-     */
-    function getAuthentication() {
-        if (is_integer($this->focus)) {
-            return $this->frames[$this->focus]->getAuthentication();
-        }
-        return $this->frameset->getAuthentication();
-    }
-
-    /**
-     *    Accessor for last Authentication realm. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Name of security realm.
-     *    @access public
-     */
-    function getRealm() {
-        if (is_integer($this->focus)) {
-            return $this->frames[$this->focus]->getRealm();
-        }
-        return $this->frameset->getRealm();
-    }
-
-    /**
-     *    Accessor for outgoing header information.
-     *    @return string      Header block.
-     *    @access public
-     */
-    function getRequest() {
-        if (is_integer($this->focus)) {
-            return $this->frames[$this->focus]->getRequest();
-        }
-        return $this->frameset->getRequest();
-    }
-
-    /**
-     *    Accessor for raw header information.
-     *    @return string      Header block.
-     *    @access public
-     */
-    function getHeaders() {
-        if (is_integer($this->focus)) {
-            return $this->frames[$this->focus]->getHeaders();
-        }
-        return $this->frameset->getHeaders();
-    }
-
-    /**
-     *    Accessor for parsed title.
-     *    @return string     Title or false if no title is present.
-     *    @access public
-     */
-    function getTitle() {
-        return $this->frameset->getTitle();
-    }
-
-    /**
-     *    Accessor for a list of all fixed links.
-     *    @return array   List of urls as strings.
-     *    @access public
-     */
-    function getUrls() {
-        if (is_integer($this->focus)) {
-            return $this->frames[$this->focus]->getUrls();
-        }
-        $urls = array();
-        foreach ($this->frames as $frame) {
-            $urls = array_merge($urls, $frame->getUrls());
-        }
-        return array_values(array_unique($urls));
-    }
-
-    /**
-     *    Accessor for URLs by the link label. Label will match
-     *    regardess of whitespace issues and case.
-     *    @param string $label    Text of link.
-     *    @return array           List of links with that label.
-     *    @access public
-     */
-    function getUrlsByLabel($label) {
-        if (is_integer($this->focus)) {
-            return $this->tagUrlsWithFrame(
-                    $this->frames[$this->focus]->getUrlsByLabel($label),
-                    $this->focus);
-        }
-        $urls = array();
-        foreach ($this->frames as $index => $frame) {
-            $urls = array_merge(
-                    $urls,
-                    $this->tagUrlsWithFrame(
-                                $frame->getUrlsByLabel($label),
-                                $index));
-        }
-        return $urls;
-    }
-
-    /**
-     *    Accessor for a URL by the id attribute. If in a frameset
-     *    then the first link found with that ID attribute is
-     *    returned only. Focus on a frame if you want one from
-     *    a specific part of the frameset.
-     *    @param string $id       Id attribute of link.
-     *    @return string          URL with that id.
-     *    @access public
-     */
-    function getUrlById($id) {
-        foreach ($this->frames as $index => $frame) {
-            if ($url = $frame->getUrlById($id)) {
-                if (! $url->gettarget()) {
-                    $url->setTarget($this->getPublicNameFromIndex($index));
-                }
-                return $url;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Attaches the intended frame index to a list of URLs.
-     *    @param array $urls        List of SimpleUrls.
-     *    @param string $frame      Name of frame or index.
-     *    @return array             List of tagged URLs.
-     *    @access private
-     */
-    protected function tagUrlsWithFrame($urls, $frame) {
-        $tagged = array();
-        foreach ($urls as $url) {
-            if (! $url->getTarget()) {
-                $url->setTarget($this->getPublicNameFromIndex($frame));
-            }
-            $tagged[] = $url;
-        }
-        return $tagged;
-    }
-
-    /**
-     *    Finds a held form by button label. Will only
-     *    search correctly built forms.
-     *    @param SimpleSelector $selector       Button finder.
-     *    @return SimpleForm                    Form object containing
-     *                                          the button.
-     *    @access public
-     */
-    function getFormBySubmit($selector) {
-        return $this->findForm('getFormBySubmit', $selector);
-    }
-
-    /**
-     *    Finds a held form by image using a selector.
-     *    Will only search correctly built forms. The first
-     *    form found either within the focused frame, or
-     *    across frames, will be the one returned.
-     *    @param SimpleSelector $selector  Image finder.
-     *    @return SimpleForm               Form object containing
-     *                                     the image.
-     *    @access public
-     */
-    function getFormByImage($selector) {
-        return $this->findForm('getFormByImage', $selector);
-    }
-
-    /**
-     *    Finds a held form by the form ID. A way of
-     *    identifying a specific form when we have control
-     *    of the HTML code. The first form found
-     *    either within the focused frame, or across frames,
-     *    will be the one returned.
-     *    @param string $id     Form label.
-     *    @return SimpleForm    Form object containing the matching ID.
-     *    @access public
-     */
-    function getFormById($id) {
-        return $this->findForm('getFormById', $id);
-    }
-
-    /**
-        *    General form finder. Will search all the frames or
-        *    just the one in focus.
-        *    @param string $method    Method to use to find in a page.
-        *    @param string $attribute Label, name or ID.
-        *    @return SimpleForm    Form object containing the matching ID.
-        *    @access private
-        */
-    protected function findForm($method, $attribute) {
-        if (is_integer($this->focus)) {
-            return $this->findFormInFrame(
-                    $this->frames[$this->focus],
-                    $this->focus,
-                    $method,
-                    $attribute);
-        }
-        for ($i = 0; $i < count($this->frames); $i++) {
-            $form = $this->findFormInFrame(
-                    $this->frames[$i],
-                    $i,
-                    $method,
-                    $attribute);
-            if ($form) {
-                return $form;
-            }
-        }
-        $null = null;
-        return $null;
-    }
-
-    /**
-     *    Finds a form in a page using a form finding method. Will
-     *    also tag the form with the frame name it belongs in.
-     *    @param SimplePage $page  Page content of frame.
-     *    @param integer $index    Internal frame representation.
-     *    @param string $method    Method to use to find in a page.
-     *    @param string $attribute Label, name or ID.
-     *    @return SimpleForm       Form object containing the matching ID.
-     *    @access private
-     */
-    protected function findFormInFrame($page, $index, $method, $attribute) {
-        $form = $this->frames[$index]->$method($attribute);
-        if (isset($form)) {
-            $form->setDefaultTarget($this->getPublicNameFromIndex($index));
-        }
-        return $form;
-    }
-
-    /**
-     *    Sets a field on each form in which the field is
-     *    available.
-     *    @param SimpleSelector $selector    Field finder.
-     *    @param string $value               Value to set field to.
-     *    @return boolean                    True if value is valid.
-     *    @access public
-     */
-    function setField($selector, $value) {
-        if (is_integer($this->focus)) {
-            $this->frames[$this->focus]->setField($selector, $value);
-        } else {
-            for ($i = 0; $i < count($this->frames); $i++) {
-                $this->frames[$i]->setField($selector, $value);
-            }
-        }
-    }
-
-    /**
-     *    Accessor for a form element value within a page.
-     *    @param SimpleSelector $selector    Field finder.
-     *    @return string/boolean             A string if the field is
-     *                                       present, false if unchecked
-     *                                       and null if missing.
-     *    @access public
-     */
-    function getField($selector) {
-        for ($i = 0; $i < count($this->frames); $i++) {
-            $value = $this->frames[$i]->getField($selector);
-            if (isset($value)) {
-                return $value;
-            }
-        }
-        return null;
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/http.php b/3rdparty/simpletest/http.php
deleted file mode 100644
index 1bd74031a48..00000000000
--- a/3rdparty/simpletest/http.php
+++ /dev/null
@@ -1,628 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: http.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/socket.php');
-require_once(dirname(__FILE__) . '/cookies.php');
-require_once(dirname(__FILE__) . '/url.php');
-/**#@-*/
-
-/**
- *    Creates HTTP headers for the end point of
- *    a HTTP request.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleRoute {
-    private $url;
-
-    /**
-     *    Sets the target URL.
-     *    @param SimpleUrl $url   URL as object.
-     *    @access public
-     */
-    function __construct($url) {
-        $this->url = $url;
-    }
-
-    /**
-     *    Resource name.
-     *    @return SimpleUrl        Current url.
-     *    @access protected
-     */
-    function getUrl() {
-        return $this->url;
-    }
-
-    /**
-     *    Creates the first line which is the actual request.
-     *    @param string $method   HTTP request method, usually GET.
-     *    @return string          Request line content.
-     *    @access protected
-     */
-    protected function getRequestLine($method) {
-        return $method . ' ' . $this->url->getPath() .
-                $this->url->getEncodedRequest() . ' HTTP/1.0';
-    }
-
-    /**
-     *    Creates the host part of the request.
-     *    @return string          Host line content.
-     *    @access protected
-     */
-    protected function getHostLine() {
-        $line = 'Host: ' . $this->url->getHost();
-        if ($this->url->getPort()) {
-            $line .= ':' . $this->url->getPort();
-        }
-        return $line;
-    }
-
-    /**
-     *    Opens a socket to the route.
-     *    @param string $method      HTTP request method, usually GET.
-     *    @param integer $timeout    Connection timeout.
-     *    @return SimpleSocket       New socket.
-     *    @access public
-     */
-    function createConnection($method, $timeout) {
-        $default_port = ('https' == $this->url->getScheme()) ? 443 : 80;
-        $socket = $this->createSocket(
-                $this->url->getScheme() ? $this->url->getScheme() : 'http',
-                $this->url->getHost(),
-                $this->url->getPort() ? $this->url->getPort() : $default_port,
-                $timeout);
-        if (! $socket->isError()) {
-            $socket->write($this->getRequestLine($method) . "\r\n");
-            $socket->write($this->getHostLine() . "\r\n");
-            $socket->write("Connection: close\r\n");
-        }
-        return $socket;
-    }
-
-    /**
-     *    Factory for socket.
-     *    @param string $scheme                   Protocol to use.
-     *    @param string $host                     Hostname to connect to.
-     *    @param integer $port                    Remote port.
-     *    @param integer $timeout                 Connection timeout.
-     *    @return SimpleSocket/SimpleSecureSocket New socket.
-     *    @access protected
-     */
-    protected function createSocket($scheme, $host, $port, $timeout) {
-        if (in_array($scheme, array('file'))) {
-            return new SimpleFileSocket($this->url);
-        } elseif (in_array($scheme, array('https'))) {
-            return new SimpleSecureSocket($host, $port, $timeout);
-        } else {
-            return new SimpleSocket($host, $port, $timeout);
-        }
-    }
-}
-
-/**
- *    Creates HTTP headers for the end point of
- *    a HTTP request via a proxy server.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleProxyRoute extends SimpleRoute {
-    private $proxy;
-    private $username;
-    private $password;
-
-    /**
-     *    Stashes the proxy address.
-     *    @param SimpleUrl $url     URL as object.
-     *    @param string $proxy      Proxy URL.
-     *    @param string $username   Username for autentication.
-     *    @param string $password   Password for autentication.
-     *    @access public
-     */
-    function __construct($url, $proxy, $username = false, $password = false) {
-        parent::__construct($url);
-        $this->proxy = $proxy;
-        $this->username = $username;
-        $this->password = $password;
-    }
-
-    /**
-     *    Creates the first line which is the actual request.
-     *    @param string $method   HTTP request method, usually GET.
-     *    @param SimpleUrl $url   URL as object.
-     *    @return string          Request line content.
-     *    @access protected
-     */
-    function getRequestLine($method) {
-        $url = $this->getUrl();
-        $scheme = $url->getScheme() ? $url->getScheme() : 'http';
-        $port = $url->getPort() ? ':' . $url->getPort() : '';
-        return $method . ' ' . $scheme . '://' . $url->getHost() . $port .
-                $url->getPath() . $url->getEncodedRequest() . ' HTTP/1.0';
-    }
-
-    /**
-     *    Creates the host part of the request.
-     *    @param SimpleUrl $url   URL as object.
-     *    @return string          Host line content.
-     *    @access protected
-     */
-    function getHostLine() {
-        $host = 'Host: ' . $this->proxy->getHost();
-        $port = $this->proxy->getPort() ? $this->proxy->getPort() : 8080;
-        return "$host:$port";
-    }
-
-    /**
-     *    Opens a socket to the route.
-     *    @param string $method       HTTP request method, usually GET.
-     *    @param integer $timeout     Connection timeout.
-     *    @return SimpleSocket        New socket.
-     *    @access public
-     */
-    function createConnection($method, $timeout) {
-        $socket = $this->createSocket(
-                $this->proxy->getScheme() ? $this->proxy->getScheme() : 'http',
-                $this->proxy->getHost(),
-                $this->proxy->getPort() ? $this->proxy->getPort() : 8080,
-                $timeout);
-        if ($socket->isError()) {
-            return $socket;
-        }
-        $socket->write($this->getRequestLine($method) . "\r\n");
-        $socket->write($this->getHostLine() . "\r\n");
-        if ($this->username && $this->password) {
-            $socket->write('Proxy-Authorization: Basic ' .
-                    base64_encode($this->username . ':' . $this->password) .
-                    "\r\n");
-        }
-        $socket->write("Connection: close\r\n");
-        return $socket;
-    }
-}
-
-/**
- *    HTTP request for a web page. Factory for
- *    HttpResponse object.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHttpRequest {
-    private $route;
-    private $encoding;
-    private $headers;
-    private $cookies;
-
-    /**
-     *    Builds the socket request from the different pieces.
-     *    These include proxy information, URL, cookies, headers,
-     *    request method and choice of encoding.
-     *    @param SimpleRoute $route              Request route.
-     *    @param SimpleFormEncoding $encoding    Content to send with
-     *                                           request.
-     *    @access public
-     */
-    function __construct($route, $encoding) {
-        $this->route = $route;
-        $this->encoding = $encoding;
-        $this->headers = array();
-        $this->cookies = array();
-    }
-
-    /**
-     *    Dispatches the content to the route's socket.
-     *    @param integer $timeout      Connection timeout.
-     *    @return SimpleHttpResponse   A response which may only have
-     *                                 an error, but hopefully has a
-     *                                 complete web page.
-     *    @access public
-     */
-    function fetch($timeout) {
-        $socket = $this->route->createConnection($this->encoding->getMethod(), $timeout);
-        if (! $socket->isError()) {
-            $this->dispatchRequest($socket, $this->encoding);
-        }
-        return $this->createResponse($socket);
-    }
-
-    /**
-     *    Sends the headers.
-     *    @param SimpleSocket $socket           Open socket.
-     *    @param string $method                 HTTP request method,
-     *                                          usually GET.
-     *    @param SimpleFormEncoding $encoding   Content to send with request.
-     *    @access private
-     */
-    protected function dispatchRequest($socket, $encoding) {
-        foreach ($this->headers as $header_line) {
-            $socket->write($header_line . "\r\n");
-        }
-        if (count($this->cookies) > 0) {
-            $socket->write("Cookie: " . implode(";", $this->cookies) . "\r\n");
-        }
-        $encoding->writeHeadersTo($socket);
-        $socket->write("\r\n");
-        $encoding->writeTo($socket);
-    }
-
-    /**
-     *    Adds a header line to the request.
-     *    @param string $header_line    Text of full header line.
-     *    @access public
-     */
-    function addHeaderLine($header_line) {
-        $this->headers[] = $header_line;
-    }
-
-    /**
-     *    Reads all the relevant cookies from the
-     *    cookie jar.
-     *    @param SimpleCookieJar $jar     Jar to read
-     *    @param SimpleUrl $url           Url to use for scope.
-     *    @access public
-     */
-    function readCookiesFromJar($jar, $url) {
-        $this->cookies = $jar->selectAsPairs($url);
-    }
-
-    /**
-     *    Wraps the socket in a response parser.
-     *    @param SimpleSocket $socket   Responding socket.
-     *    @return SimpleHttpResponse    Parsed response object.
-     *    @access protected
-     */
-    protected function createResponse($socket) {
-        $response = new SimpleHttpResponse(
-                $socket,
-                $this->route->getUrl(),
-                $this->encoding);
-        $socket->close();
-        return $response;
-    }
-}
-
-/**
- *    Collection of header lines in the response.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHttpHeaders {
-    private $raw_headers;
-    private $response_code;
-    private $http_version;
-    private $mime_type;
-    private $location;
-    private $cookies;
-    private $authentication;
-    private $realm;
-
-    /**
-     *    Parses the incoming header block.
-     *    @param string $headers     Header block.
-     *    @access public
-     */
-    function __construct($headers) {
-        $this->raw_headers = $headers;
-        $this->response_code = false;
-        $this->http_version = false;
-        $this->mime_type = '';
-        $this->location = false;
-        $this->cookies = array();
-        $this->authentication = false;
-        $this->realm = false;
-        foreach (explode("\r\n", $headers) as $header_line) {
-            $this->parseHeaderLine($header_line);
-        }
-    }
-
-    /**
-     *    Accessor for parsed HTTP protocol version.
-     *    @return integer           HTTP error code.
-     *    @access public
-     */
-    function getHttpVersion() {
-        return $this->http_version;
-    }
-
-    /**
-     *    Accessor for raw header block.
-     *    @return string        All headers as raw string.
-     *    @access public
-     */
-    function getRaw() {
-        return $this->raw_headers;
-    }
-
-    /**
-     *    Accessor for parsed HTTP error code.
-     *    @return integer           HTTP error code.
-     *    @access public
-     */
-    function getResponseCode() {
-        return (integer)$this->response_code;
-    }
-
-    /**
-     *    Returns the redirected URL or false if
-     *    no redirection.
-     *    @return string      URL or false for none.
-     *    @access public
-     */
-    function getLocation() {
-        return $this->location;
-    }
-
-    /**
-     *    Test to see if the response is a valid redirect.
-     *    @return boolean       True if valid redirect.
-     *    @access public
-     */
-    function isRedirect() {
-        return in_array($this->response_code, array(301, 302, 303, 307)) &&
-                (boolean)$this->getLocation();
-    }
-
-    /**
-     *    Test to see if the response is an authentication
-     *    challenge.
-     *    @return boolean       True if challenge.
-     *    @access public
-     */
-    function isChallenge() {
-        return ($this->response_code == 401) &&
-                (boolean)$this->authentication &&
-                (boolean)$this->realm;
-    }
-
-    /**
-     *    Accessor for MIME type header information.
-     *    @return string           MIME type.
-     *    @access public
-     */
-    function getMimeType() {
-        return $this->mime_type;
-    }
-
-    /**
-     *    Accessor for authentication type.
-     *    @return string        Type.
-     *    @access public
-     */
-    function getAuthentication() {
-        return $this->authentication;
-    }
-
-    /**
-     *    Accessor for security realm.
-     *    @return string        Realm.
-     *    @access public
-     */
-    function getRealm() {
-        return $this->realm;
-    }
-
-    /**
-     *    Writes new cookies to the cookie jar.
-     *    @param SimpleCookieJar $jar   Jar to write to.
-     *    @param SimpleUrl $url         Host and path to write under.
-     *    @access public
-     */
-    function writeCookiesToJar($jar, $url) {
-        foreach ($this->cookies as $cookie) {
-            $jar->setCookie(
-                    $cookie->getName(),
-                    $cookie->getValue(),
-                    $url->getHost(),
-                    $cookie->getPath(),
-                    $cookie->getExpiry());
-        }
-    }
-
-    /**
-     *    Called on each header line to accumulate the held
-     *    data within the class.
-     *    @param string $header_line        One line of header.
-     *    @access protected
-     */
-    protected function parseHeaderLine($header_line) {
-        if (preg_match('/HTTP\/(\d+\.\d+)\s+(\d+)/i', $header_line, $matches)) {
-            $this->http_version = $matches[1];
-            $this->response_code = $matches[2];
-        }
-        if (preg_match('/Content-type:\s*(.*)/i', $header_line, $matches)) {
-            $this->mime_type = trim($matches[1]);
-        }
-        if (preg_match('/Location:\s*(.*)/i', $header_line, $matches)) {
-            $this->location = trim($matches[1]);
-        }
-        if (preg_match('/Set-cookie:(.*)/i', $header_line, $matches)) {
-            $this->cookies[] = $this->parseCookie($matches[1]);
-        }
-        if (preg_match('/WWW-Authenticate:\s+(\S+)\s+realm=\"(.*?)\"/i', $header_line, $matches)) {
-            $this->authentication = $matches[1];
-            $this->realm = trim($matches[2]);
-        }
-    }
-
-    /**
-     *    Parse the Set-cookie content.
-     *    @param string $cookie_line    Text after "Set-cookie:"
-     *    @return SimpleCookie          New cookie object.
-     *    @access private
-     */
-    protected function parseCookie($cookie_line) {
-        $parts = explode(";", $cookie_line);
-        $cookie = array();
-        preg_match('/\s*(.*?)\s*=(.*)/', array_shift($parts), $cookie);
-        foreach ($parts as $part) {
-            if (preg_match('/\s*(.*?)\s*=(.*)/', $part, $matches)) {
-                $cookie[$matches[1]] = trim($matches[2]);
-            }
-        }
-        return new SimpleCookie(
-                $cookie[1],
-                trim($cookie[2]),
-                isset($cookie["path"]) ? $cookie["path"] : "",
-                isset($cookie["expires"]) ? $cookie["expires"] : false);
-    }
-}
-
-/**
- *    Basic HTTP response.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHttpResponse extends SimpleStickyError {
-    private $url;
-    private $encoding;
-    private $sent;
-    private $content;
-    private $headers;
-
-    /**
-     *    Constructor. Reads and parses the incoming
-     *    content and headers.
-     *    @param SimpleSocket $socket   Network connection to fetch
-     *                                  response text from.
-     *    @param SimpleUrl $url         Resource name.
-     *    @param mixed $encoding        Record of content sent.
-     *    @access public
-     */
-    function __construct($socket, $url, $encoding) {
-        parent::__construct();
-        $this->url = $url;
-        $this->encoding = $encoding;
-        $this->sent = $socket->getSent();
-        $this->content = false;
-        $raw = $this->readAll($socket);
-        if ($socket->isError()) {
-            $this->setError('Error reading socket [' . $socket->getError() . ']');
-            return;
-        }
-        $this->parse($raw);
-    }
-
-    /**
-     *    Splits up the headers and the rest of the content.
-     *    @param string $raw    Content to parse.
-     *    @access private
-     */
-    protected function parse($raw) {
-        if (! $raw) {
-            $this->setError('Nothing fetched');
-            $this->headers = new SimpleHttpHeaders('');
-        } elseif ('file' == $this->url->getScheme()) {
-            $this->headers = new SimpleHttpHeaders('');
-            $this->content = $raw;
-        } elseif (! strstr($raw, "\r\n\r\n")) {
-            $this->setError('Could not split headers from content');
-            $this->headers = new SimpleHttpHeaders($raw);
-        } else {
-            list($headers, $this->content) = explode("\r\n\r\n", $raw, 2);
-            $this->headers = new SimpleHttpHeaders($headers);
-        }
-    }
-
-    /**
-     *    Original request method.
-     *    @return string        GET, POST or HEAD.
-     *    @access public
-     */
-    function getMethod() {
-        return $this->encoding->getMethod();
-    }
-
-    /**
-     *    Resource name.
-     *    @return SimpleUrl        Current url.
-     *    @access public
-     */
-    function getUrl() {
-        return $this->url;
-    }
-
-    /**
-     *    Original request data.
-     *    @return mixed              Sent content.
-     *    @access public
-     */
-    function getRequestData() {
-        return $this->encoding;
-    }
-
-    /**
-     *    Raw request that was sent down the wire.
-     *    @return string        Bytes actually sent.
-     *    @access public
-     */
-    function getSent() {
-        return $this->sent;
-    }
-
-    /**
-     *    Accessor for the content after the last
-     *    header line.
-     *    @return string           All content.
-     *    @access public
-     */
-    function getContent() {
-        return $this->content;
-    }
-
-    /**
-     *    Accessor for header block. The response is the
-     *    combination of this and the content.
-     *    @return SimpleHeaders        Wrapped header block.
-     *    @access public
-     */
-    function getHeaders() {
-        return $this->headers;
-    }
-
-    /**
-     *    Accessor for any new cookies.
-     *    @return array       List of new cookies.
-     *    @access public
-     */
-    function getNewCookies() {
-        return $this->headers->getNewCookies();
-    }
-
-    /**
-     *    Reads the whole of the socket output into a
-     *    single string.
-     *    @param SimpleSocket $socket  Unread socket.
-     *    @return string               Raw output if successful
-     *                                 else false.
-     *    @access private
-     */
-    protected function readAll($socket) {
-        $all = '';
-        while (! $this->isLastPacket($next = $socket->read())) {
-            $all .= $next;
-        }
-        return $all;
-    }
-
-    /**
-     *    Test to see if the packet from the socket is the
-     *    last one.
-     *    @param string $packet    Chunk to interpret.
-     *    @return boolean          True if empty or EOF.
-     *    @access private
-     */
-    protected function isLastPacket($packet) {
-        if (is_string($packet)) {
-            return $packet === '';
-        }
-        return ! $packet;
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/invoker.php b/3rdparty/simpletest/invoker.php
deleted file mode 100755
index ee310343fc7..00000000000
--- a/3rdparty/simpletest/invoker.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: invoker.php 1785 2008-04-26 13:56:41Z pp11 $
- */
-
-/**#@+
- * Includes SimpleTest files and defined the root constant
- * for dependent libraries.
- */
-require_once(dirname(__FILE__) . '/errors.php');
-require_once(dirname(__FILE__) . '/compatibility.php');
-require_once(dirname(__FILE__) . '/scorer.php');
-require_once(dirname(__FILE__) . '/expectation.php');
-require_once(dirname(__FILE__) . '/dumper.php');
-if (! defined('SIMPLE_TEST')) {
-    define('SIMPLE_TEST', dirname(__FILE__) . '/');
-}
-/**#@-*/
-
-/**
- *    This is called by the class runner to run a
- *    single test method. Will also run the setUp()
- *    and tearDown() methods.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleInvoker {
-    private $test_case;
-
-    /**
-     *    Stashes the test case for later.
-     *    @param SimpleTestCase $test_case  Test case to run.
-     */
-    function __construct($test_case) {
-        $this->test_case = $test_case;
-    }
-
-    /**
-     *    Accessor for test case being run.
-     *    @return SimpleTestCase    Test case.
-     *    @access public
-     */
-    function getTestCase() {
-        return $this->test_case;
-    }
-
-    /**
-     *    Runs test level set up. Used for changing
-     *    the mechanics of base test cases.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function before($method) {
-        $this->test_case->before($method);
-    }
-
-    /**
-     *    Invokes a test method and buffered with setUp()
-     *    and tearDown() calls.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function invoke($method) {
-        $this->test_case->setUp();
-        $this->test_case->$method();
-        $this->test_case->tearDown();
-    }
-
-    /**
-     *    Runs test level clean up. Used for changing
-     *    the mechanics of base test cases.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function after($method) {
-        $this->test_case->after($method);
-    }
-}
-
-/**
- *    Do nothing decorator. Just passes the invocation
- *    straight through.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleInvokerDecorator {
-    private $invoker;
-
-    /**
-     *    Stores the invoker to wrap.
-     *    @param SimpleInvoker $invoker  Test method runner.
-     */
-    function __construct($invoker) {
-        $this->invoker = $invoker;
-    }
-
-    /**
-     *    Accessor for test case being run.
-     *    @return SimpleTestCase    Test case.
-     *    @access public
-     */
-    function getTestCase() {
-        return $this->invoker->getTestCase();
-    }
-
-    /**
-     *    Runs test level set up. Used for changing
-     *    the mechanics of base test cases.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function before($method) {
-        $this->invoker->before($method);
-    }
-
-    /**
-     *    Invokes a test method and buffered with setUp()
-     *    and tearDown() calls.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function invoke($method) {
-        $this->invoker->invoke($method);
-    }
-
-    /**
-     *    Runs test level clean up. Used for changing
-     *    the mechanics of base test cases.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function after($method) {
-        $this->invoker->after($method);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/mock_objects.php b/3rdparty/simpletest/mock_objects.php
deleted file mode 100755
index 93a827b6c02..00000000000
--- a/3rdparty/simpletest/mock_objects.php
+++ /dev/null
@@ -1,1641 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage MockObjects
- *  @version    $Id: mock_objects.php 1973 2009-12-22 01:16:59Z lastcraft $
- */
-
-/**#@+
- * include SimpleTest files
- */
-require_once(dirname(__FILE__) . '/expectation.php');
-require_once(dirname(__FILE__) . '/simpletest.php');
-require_once(dirname(__FILE__) . '/dumper.php');
-require_once(dirname(__FILE__) . '/reflection_php5.php');
-/**#@-*/
-
-/**
- * Default character simpletest will substitute for any value
- */
-if (! defined('MOCK_ANYTHING')) {
-    define('MOCK_ANYTHING', '*');
-}
-
-/**
- *    Parameter comparison assertion.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class ParametersExpectation extends SimpleExpectation {
-    private $expected;
-
-    /**
-     *    Sets the expected parameter list.
-     *    @param array $parameters  Array of parameters including
-     *                              those that are wildcarded.
-     *                              If the value is not an array
-     *                              then it is considered to match any.
-     *    @param string $message    Customised message on failure.
-     */
-    function __construct($expected = false, $message = '%s') {
-        parent::__construct($message);
-        $this->expected = $expected;
-    }
-
-    /**
-     *    Tests the assertion. True if correct.
-     *    @param array $parameters     Comparison values.
-     *    @return boolean              True if correct.
-     */
-    function test($parameters) {
-        if (! is_array($this->expected)) {
-            return true;
-        }
-        if (count($this->expected) != count($parameters)) {
-            return false;
-        }
-        for ($i = 0; $i < count($this->expected); $i++) {
-            if (! $this->testParameter($parameters[$i], $this->expected[$i])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    Tests an individual parameter.
-     *    @param mixed $parameter    Value to test.
-     *    @param mixed $expected     Comparison value.
-     *    @return boolean            True if expectation
-     *                               fulfilled.
-     */
-    protected function testParameter($parameter, $expected) {
-        $comparison = $this->coerceToExpectation($expected);
-        return $comparison->test($parameter);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param array $comparison   Incoming parameter list.
-     *    @return string             Description of success
-     *                               or failure.
-     */
-    function testMessage($parameters) {
-        if ($this->test($parameters)) {
-            return "Expectation of " . count($this->expected) .
-                    " arguments of [" . $this->renderArguments($this->expected) .
-                    "] is correct";
-        } else {
-            return $this->describeDifference($this->expected, $parameters);
-        }
-    }
-
-    /**
-     *    Message to display if expectation differs from
-     *    the parameters actually received.
-     *    @param array $expected      Expected parameters as list.
-     *    @param array $parameters    Actual parameters received.
-     *    @return string              Description of difference.
-     */
-    protected function describeDifference($expected, $parameters) {
-        if (count($expected) != count($parameters)) {
-            return "Expected " . count($expected) .
-                    " arguments of [" . $this->renderArguments($expected) .
-                    "] but got " . count($parameters) .
-                    " arguments of [" . $this->renderArguments($parameters) . "]";
-        }
-        $messages = array();
-        for ($i = 0; $i < count($expected); $i++) {
-            $comparison = $this->coerceToExpectation($expected[$i]);
-            if (! $comparison->test($parameters[$i])) {
-                $messages[] = "parameter " . ($i + 1) . " with [" .
-                        $comparison->overlayMessage($parameters[$i], $this->getDumper()) . "]";
-            }
-        }
-        return "Parameter expectation differs at " . implode(" and ", $messages);
-    }
-
-    /**
-     *    Creates an identical expectation if the
-     *    object/value is not already some type
-     *    of expectation.
-     *    @param mixed $expected      Expected value.
-     *    @return SimpleExpectation   Expectation object.
-     */
-    protected function coerceToExpectation($expected) {
-        if (SimpleExpectation::isExpectation($expected)) {
-            return $expected;
-        }
-        return new IdenticalExpectation($expected);
-    }
-
-    /**
-     *    Renders the argument list as a string for
-     *    messages.
-     *    @param array $args    Incoming arguments.
-     *    @return string        Simple description of type and value.
-     */
-    protected function renderArguments($args) {
-        $descriptions = array();
-        if (is_array($args)) {
-            foreach ($args as $arg) {
-                $dumper = new SimpleDumper();
-                $descriptions[] = $dumper->describeValue($arg);
-            }
-        }
-        return implode(', ', $descriptions);
-    }
-}
-
-/**
- *    Confirms that the number of calls on a method is as expected.
- *  @package    SimpleTest
- *  @subpackage MockObjects
- */
-class CallCountExpectation extends SimpleExpectation {
-    private $method;
-    private $count;
-
-    /**
-     *    Stashes the method and expected count for later
-     *    reporting.
-     *    @param string $method    Name of method to confirm against.
-     *    @param integer $count    Expected number of calls.
-     *    @param string $message   Custom error message.
-     */
-    function __construct($method, $count, $message = '%s') {
-        $this->method = $method;
-        $this->count = $count;
-        parent::__construct($message);
-    }
-
-    /**
-     *    Tests the assertion. True if correct.
-     *    @param integer $compare     Measured call count.
-     *    @return boolean             True if expected.
-     */
-    function test($compare) {
-        return ($this->count == $compare);
-    }
-
-    /**
-     *    Reports the comparison.
-     *    @param integer $compare     Measured call count.
-     *    @return string              Message to show.
-     */
-    function testMessage($compare) {
-        return 'Expected call count for [' . $this->method .
-                '] was [' . $this->count .
-                '] got [' . $compare . ']';
-    }
-}
-
-/**
- *    Confirms that the number of calls on a method is as expected.
- *  @package    SimpleTest
- *  @subpackage MockObjects
- */
-class MinimumCallCountExpectation extends SimpleExpectation {
-    private $method;
-    private $count;
-
-    /**
-     *    Stashes the method and expected count for later
-     *    reporting.
-     *    @param string $method    Name of method to confirm against.
-     *    @param integer $count    Minimum number of calls.
-     *    @param string $message   Custom error message.
-     */
-    function __construct($method, $count, $message = '%s') {
-        $this->method = $method;
-        $this->count = $count;
-        parent::__construct($message);
-    }
-
-    /**
-     *    Tests the assertion. True if correct.
-     *    @param integer $compare     Measured call count.
-     *    @return boolean             True if enough.
-     */
-    function test($compare) {
-        return ($this->count <= $compare);
-    }
-
-    /**
-     *    Reports the comparison.
-     *    @param integer $compare     Measured call count.
-     *    @return string              Message to show.
-     */
-    function testMessage($compare) {
-        return 'Minimum call count for [' . $this->method .
-                '] was [' . $this->count .
-                '] got [' . $compare . ']';
-    }
-}
-
-/**
- *    Confirms that the number of calls on a method is as expected.
- *    @package      SimpleTest
- *    @subpackage   MockObjects
- */
-class MaximumCallCountExpectation extends SimpleExpectation {
-    private $method;
-    private $count;
-
-    /**
-     *    Stashes the method and expected count for later
-     *    reporting.
-     *    @param string $method    Name of method to confirm against.
-     *    @param integer $count    Minimum number of calls.
-     *    @param string $message   Custom error message.
-     */
-    function __construct($method, $count, $message = '%s') {
-        $this->method = $method;
-        $this->count = $count;
-        parent::__construct($message);
-    }
-
-    /**
-     *    Tests the assertion. True if correct.
-     *    @param integer $compare     Measured call count.
-     *    @return boolean             True if not over.
-     */
-    function test($compare) {
-        return ($this->count >= $compare);
-    }
-
-    /**
-     *    Reports the comparison.
-     *    @param integer $compare     Measured call count.
-     *    @return string              Message to show.
-     */
-    function testMessage($compare) {
-        return 'Maximum call count for [' . $this->method .
-                '] was [' . $this->count .
-                '] got [' . $compare . ']';
-    }
-}
-
-/**
- *    Retrieves method actions by searching the
- *    parameter lists until an expected match is found.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleSignatureMap {
-    private $map;
-
-    /**
-     *    Creates an empty call map.
-     */
-    function __construct() {
-        $this->map = array();
-    }
-
-    /**
-     *    Stashes a reference against a method call.
-     *    @param array $parameters    Array of arguments (including wildcards).
-     *    @param mixed $action        Reference placed in the map.
-     */
-    function add($parameters, $action) {
-        $place = count($this->map);
-        $this->map[$place] = array();
-        $this->map[$place]['params'] = new ParametersExpectation($parameters);
-        $this->map[$place]['content'] = $action;
-    }
-
-    /**
-     *    Searches the call list for a matching parameter
-     *    set. Returned by reference.
-     *    @param array $parameters    Parameters to search by
-     *                                without wildcards.
-     *    @return object              Object held in the first matching
-     *                                slot, otherwise null.
-     */
-    function &findFirstAction($parameters) {
-        $slot = $this->findFirstSlot($parameters);
-        if (isset($slot) && isset($slot['content'])) {
-            return $slot['content'];
-        }
-        $null = null;
-        return $null;
-    }
-
-    /**
-     *    Searches the call list for a matching parameter
-     *    set. True if successful.
-     *    @param array $parameters    Parameters to search by
-     *                                without wildcards.
-     *    @return boolean             True if a match is present.
-     */
-    function isMatch($parameters) {
-        return ($this->findFirstSlot($parameters) != null);
-    }
-
-    /**
-     *    Compares the incoming parameters with the
-     *    internal expectation. Uses the incoming $test
-     *    to dispatch the test message.
-     *    @param SimpleTestCase $test   Test to dispatch to.
-     *    @param array $parameters      The actual calling arguments.
-     *    @param string $message        The message to overlay.
-     */
-    function test($test, $parameters, $message) {
-    }
-
-    /**
-     *    Searches the map for a matching item.
-     *    @param array $parameters    Parameters to search by
-     *                                without wildcards.
-     *    @return array               Reference to slot or null.
-     */
-    function &findFirstSlot($parameters) {
-        $count = count($this->map);
-        for ($i = 0; $i < $count; $i++) {
-            if ($this->map[$i]["params"]->test($parameters)) {
-                return $this->map[$i];
-            }
-        }
-        $null = null;
-        return $null;
-    }
-}
-
-/**
- *    Allows setting of actions against call signatures either
- *    at a specific time, or always. Specific time settings
- *    trump lasting ones, otherwise the most recently added
- *    will mask an earlier match.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleCallSchedule {
-    private $wildcard = MOCK_ANYTHING;
-    private $always;
-    private $at;
-
-    /**
-     *    Sets up an empty response schedule.
-     *    Creates an empty call map.
-     */
-    function __construct() {
-        $this->always = array();
-        $this->at = array();
-    }
-
-    /**
-     *    Stores an action against a signature that
-     *    will always fire unless masked by a time
-     *    specific one.
-     *    @param string $method        Method name.
-     *    @param array $args           Calling parameters.
-     *    @param SimpleAction $action  Actually simpleByValue, etc.
-     */
-    function register($method, $args, $action) {
-        $args = $this->replaceWildcards($args);
-        $method = strtolower($method);
-        if (! isset($this->always[$method])) {
-            $this->always[$method] = new SimpleSignatureMap();
-        }
-        $this->always[$method]->add($args, $action);
-    }
-
-    /**
-     *    Stores an action against a signature that
-     *    will fire at a specific time in the future.
-     *    @param integer $step         delay of calls to this method,
-     *                                 0 is next.
-     *    @param string $method        Method name.
-     *    @param array $args           Calling parameters.
-     *    @param SimpleAction $action  Actually SimpleByValue, etc.
-     */
-    function registerAt($step, $method, $args, $action) {
-        $args = $this->replaceWildcards($args);
-        $method = strtolower($method);
-        if (! isset($this->at[$method])) {
-            $this->at[$method] = array();
-        }
-        if (! isset($this->at[$method][$step])) {
-            $this->at[$method][$step] = new SimpleSignatureMap();
-        }
-        $this->at[$method][$step]->add($args, $action);
-    }
-
-    /**
-     *  Sets up an expectation on the argument list.
-     *  @param string $method       Method to test.
-     *  @param array $args          Bare arguments or list of
-     *                              expectation objects.
-     *  @param string $message      Failure message.
-     */
-    function expectArguments($method, $args, $message) {
-        $args = $this->replaceWildcards($args);
-        $message .= Mock::getExpectationLine();
-        $this->expected_args[strtolower($method)] =
-                new ParametersExpectation($args, $message);
-
-    }
-
-    /**
-     *    Actually carry out the action stored previously,
-     *    if the parameters match.
-     *    @param integer $step      Time of call.
-     *    @param string $method     Method name.
-     *    @param array $args        The parameters making up the
-     *                              rest of the call.
-     *    @return mixed             The result of the action.
-     */
-    function &respond($step, $method, $args) {
-        $method = strtolower($method);
-        if (isset($this->at[$method][$step])) {
-            if ($this->at[$method][$step]->isMatch($args)) {
-                $action = $this->at[$method][$step]->findFirstAction($args);
-                if (isset($action)) {
-                    return $action->act();
-                }
-            }
-        }
-        if (isset($this->always[$method])) {
-            $action = $this->always[$method]->findFirstAction($args);
-            if (isset($action)) {
-                return $action->act();
-            }
-        }
-        $null = null;
-        return $null;
-    }
-
-    /**
-     *    Replaces wildcard matches with wildcard
-     *    expectations in the argument list.
-     *    @param array $args      Raw argument list.
-     *    @return array           Argument list with
-     *                            expectations.
-     */
-    protected function replaceWildcards($args) {
-        if ($args === false) {
-            return false;
-        }
-        for ($i = 0; $i < count($args); $i++) {
-            if ($args[$i] === $this->wildcard) {
-                $args[$i] = new AnythingExpectation();
-            }
-        }
-        return $args;
-    }
-}
-
-/**
- *    A type of SimpleMethodAction.
- *    Stashes a value for returning later. Follows usual
- *    PHP5 semantics of objects being returned by reference.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleReturn {
-    private $value;
-
-    /**
-     *    Stashes it for later.
-     *    @param mixed $value     You need to clone objects
-     *                            if you want copy semantics
-     *                            for these.
-     */
-    function __construct($value) {
-        $this->value = $value;
-    }
-
-    /**
-     *    Returns the value stored earlier.
-     *    @return mixed    Whatever was stashed.
-     */
-    function act() {
-        return $this->value;
-    }
-}
-
-/**
- *    A type of SimpleMethodAction.
- *    Stashes a reference for returning later.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleByReference {
-    private $reference;
-
-    /**
-     *    Stashes it for later.
-     *    @param mixed $reference     Actual PHP4 style reference.
-     */
-    function __construct(&$reference) {
-        $this->reference = &$reference;
-    }
-
-    /**
-     *    Returns the reference stored earlier.
-     *    @return mixed    Whatever was stashed.
-     */
-    function &act() {
-        return $this->reference;
-    }
-}
-
-/**
- *    A type of SimpleMethodAction.
- *    Stashes a value for returning later.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleByValue {
-    private $value;
-
-    /**
-     *    Stashes it for later.
-     *    @param mixed $value     You need to clone objects
-     *                            if you want copy semantics
-     *                            for these.
-     */
-    function __construct($value) {
-        $this->value = $value;
-    }
-
-    /**
-     *    Returns the value stored earlier.
-     *    @return mixed    Whatever was stashed.
-     */
-    function &act() {
-        $dummy = $this->value;
-        return $dummy;
-    }
-}
-
-/**
- *    A type of SimpleMethodAction.
- *    Stashes an exception for throwing later.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleThrower {
-    private $exception;
-
-    /**
-     *    Stashes it for later.
-     *    @param Exception $exception    The exception object to throw.
-     */
-    function __construct($exception) {
-        $this->exception = $exception;
-    }
-
-    /**
-     *    Throws the exceptins stashed earlier.
-     */
-    function act() {
-        throw $this->exception;
-    }
-}
-
-/**
- *    A type of SimpleMethodAction.
- *    Stashes an error for emitting later.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleErrorThrower {
-    private $error;
-    private $severity;
-
-    /**
-     *    Stashes an error to throw later.
-     *    @param string $error      Error message.
-     *    @param integer $severity  PHP error constant, e.g E_USER_ERROR.
-     */
-    function __construct($error, $severity) {
-        $this->error = $error;
-        $this->severity = $severity;
-    }
-
-    /**
-     *    Triggers the stashed error.
-     */
-    function &act() {
-        trigger_error($this->error, $this->severity);
-        $null = null;
-        return $null;
-    }
-}
-
-/**
- *    A base class or delegate that extends an
- *    empty collection of methods that can have their
- *    return values set and expectations made of the
- *    calls upon them. The mock will assert the
- *    expectations against it's attached test case in
- *    addition to the server stub behaviour or returning
- *    preprogrammed responses.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleMock {
-    private $actions;
-    private $expectations;
-    private $wildcard = MOCK_ANYTHING;
-    private $is_strict = true;
-    private $call_counts;
-    private $expected_counts;
-    private $max_counts;
-    private $expected_args;
-    private $expected_args_at;
-
-    /**
-     *    Creates an empty action list and expectation list.
-     *    All call counts are set to zero.
-     */
-    function SimpleMock() {
-        $this->actions = new SimpleCallSchedule();
-        $this->expectations = new SimpleCallSchedule();
-        $this->call_counts = array();
-        $this->expected_counts = array();
-        $this->max_counts = array();
-        $this->expected_args = array();
-        $this->expected_args_at = array();
-        $this->getCurrentTestCase()->tell($this);
-    }
-
-    /**
-     *    Disables a name check when setting expectations.
-     *    This hack is needed for the partial mocks.
-     */
-    function disableExpectationNameChecks() {
-        $this->is_strict = false;
-    }
-
-    /**
-     *    Finds currently running test.
-     *    @return SimpeTestCase    Current test case.
-     */
-    protected function getCurrentTestCase() {
-        return SimpleTest::getContext()->getTest();
-    }
-
-    /**
-     *    Die if bad arguments array is passed.
-     *    @param mixed $args     The arguments value to be checked.
-     *    @param string $task    Description of task attempt.
-     *    @return boolean        Valid arguments
-     */
-    protected function checkArgumentsIsArray($args, $task) {
-        if (! is_array($args)) {
-            trigger_error(
-                "Cannot $task as \$args parameter is not an array",
-                E_USER_ERROR);
-        }
-    }
-
-    /**
-     *    Triggers a PHP error if the method is not part
-     *    of this object.
-     *    @param string $method        Name of method.
-     *    @param string $task          Description of task attempt.
-     */
-    protected function dieOnNoMethod($method, $task) {
-        if ($this->is_strict && ! method_exists($this, $method)) {
-            trigger_error(
-                    "Cannot $task as no ${method}() in class " . get_class($this),
-                    E_USER_ERROR);
-        }
-    }
-
-    /**
-     *    Replaces wildcard matches with wildcard
-     *    expectations in the argument list.
-     *    @param array $args      Raw argument list.
-     *    @return array           Argument list with
-     *                            expectations.
-     */
-    function replaceWildcards($args) {
-        if ($args === false) {
-            return false;
-        }
-        for ($i = 0; $i < count($args); $i++) {
-            if ($args[$i] === $this->wildcard) {
-                $args[$i] = new AnythingExpectation();
-            }
-        }
-        return $args;
-    }
-
-    /**
-     *    Adds one to the call count of a method.
-     *    @param string $method        Method called.
-     *    @param array $args           Arguments as an array.
-     */
-    protected function addCall($method, $args) {
-        if (! isset($this->call_counts[$method])) {
-            $this->call_counts[$method] = 0;
-        }
-        $this->call_counts[$method]++;
-    }
-
-    /**
-     *    Fetches the call count of a method so far.
-     *    @param string $method        Method name called.
-     *    @return integer              Number of calls so far.
-     */
-    function getCallCount($method) {
-        $this->dieOnNoMethod($method, "get call count");
-        $method = strtolower($method);
-        if (! isset($this->call_counts[$method])) {
-            return 0;
-        }
-        return $this->call_counts[$method];
-    }
-
-    /**
-     *    Sets a return for a parameter list that will
-     *    be passed on by all calls to this method that match.
-     *    @param string $method       Method name.
-     *    @param mixed $value         Result of call by value/handle.
-     *    @param array $args          List of parameters to match
-     *                                including wildcards.
-     */
-    function returns($method, $value, $args = false) {
-        $this->dieOnNoMethod($method, "set return");
-        $this->actions->register($method, $args, new SimpleReturn($value));
-    }
-
-    /**
-     *    Sets a return for a parameter list that will
-     *    be passed only when the required call count
-     *    is reached.
-     *    @param integer $timing   Number of calls in the future
-     *                             to which the result applies. If
-     *                             not set then all calls will return
-     *                             the value.
-     *    @param string $method    Method name.
-     *    @param mixed $value      Result of call passed.
-     *    @param array $args       List of parameters to match
-     *                             including wildcards.
-     */
-    function returnsAt($timing, $method, $value, $args = false) {
-        $this->dieOnNoMethod($method, "set return value sequence");
-        $this->actions->registerAt($timing, $method, $args, new SimpleReturn($value));
-    }
-
-    /**
-     *    Sets a return for a parameter list that will
-     *    be passed by value for all calls to this method.
-     *    @param string $method       Method name.
-     *    @param mixed $value         Result of call passed by value.
-     *    @param array $args          List of parameters to match
-     *                                including wildcards.
-     */
-    function returnsByValue($method, $value, $args = false) {
-        $this->dieOnNoMethod($method, "set return value");
-        $this->actions->register($method, $args, new SimpleByValue($value));
-    }
-
-    /** @deprecated */
-    function setReturnValue($method, $value, $args = false) {
-        $this->returnsByValue($method, $value, $args);
-    }
-
-    /**
-     *    Sets a return for a parameter list that will
-     *    be passed by value only when the required call count
-     *    is reached.
-     *    @param integer $timing   Number of calls in the future
-     *                             to which the result applies. If
-     *                             not set then all calls will return
-     *                             the value.
-     *    @param string $method    Method name.
-     *    @param mixed $value      Result of call passed by value.
-     *    @param array $args       List of parameters to match
-     *                             including wildcards.
-     */
-    function returnsByValueAt($timing, $method, $value, $args = false) {
-        $this->dieOnNoMethod($method, "set return value sequence");
-        $this->actions->registerAt($timing, $method, $args, new SimpleByValue($value));
-    }
-
-    /** @deprecated */
-    function setReturnValueAt($timing, $method, $value, $args = false) {
-        $this->returnsByValueAt($timing, $method, $value, $args);
-    }
-
-    /**
-     *    Sets a return for a parameter list that will
-     *    be passed by reference for all calls.
-     *    @param string $method       Method name.
-     *    @param mixed $reference     Result of the call will be this object.
-     *    @param array $args          List of parameters to match
-     *                                including wildcards.
-     */
-    function returnsByReference($method, &$reference, $args = false) {
-        $this->dieOnNoMethod($method, "set return reference");
-        $this->actions->register($method, $args, new SimpleByReference($reference));
-    }
-
-    /** @deprecated */
-    function setReturnReference($method, &$reference, $args = false) {
-        $this->returnsByReference($method, $reference, $args);
-    }
-
-    /**
-     *    Sets a return for a parameter list that will
-     *    be passed by value only when the required call count
-     *    is reached.
-     *    @param integer $timing    Number of calls in the future
-     *                              to which the result applies. If
-     *                              not set then all calls will return
-     *                              the value.
-     *    @param string $method     Method name.
-     *    @param mixed $reference   Result of the call will be this object.
-     *    @param array $args        List of parameters to match
-     *                              including wildcards.
-     */
-    function returnsByReferenceAt($timing, $method, &$reference, $args = false) {
-        $this->dieOnNoMethod($method, "set return reference sequence");
-        $this->actions->registerAt($timing, $method, $args, new SimpleByReference($reference));
-    }
-
-    /** @deprecated */
-    function setReturnReferenceAt($timing, $method, &$reference, $args = false) {
-        $this->returnsByReferenceAt($timing, $method, $reference, $args);
-    }
-
-    /**
-     *    Sets up an expected call with a set of
-     *    expected parameters in that call. All
-     *    calls will be compared to these expectations
-     *    regardless of when the call is made.
-     *    @param string $method        Method call to test.
-     *    @param array $args           Expected parameters for the call
-     *                                 including wildcards.
-     *    @param string $message       Overridden message.
-     */
-    function expect($method, $args, $message = '%s') {
-        $this->dieOnNoMethod($method, 'set expected arguments');
-        $this->checkArgumentsIsArray($args, 'set expected arguments');
-        $this->expectations->expectArguments($method, $args, $message);
-        $args = $this->replaceWildcards($args);
-        $message .= Mock::getExpectationLine();
-        $this->expected_args[strtolower($method)] =
-                new ParametersExpectation($args, $message);
-    }
-
-    /**
-     *    Sets up an expected call with a set of
-     *    expected parameters in that call. The
-     *    expected call count will be adjusted if it
-     *    is set too low to reach this call.
-     *    @param integer $timing    Number of calls in the future at
-     *                              which to test. Next call is 0.
-     *    @param string $method     Method call to test.
-     *    @param array $args        Expected parameters for the call
-     *                              including wildcards.
-     *    @param string $message    Overridden message.
-     */
-    function expectAt($timing, $method, $args, $message = '%s') {
-        $this->dieOnNoMethod($method, 'set expected arguments at time');
-        $this->checkArgumentsIsArray($args, 'set expected arguments at time');
-        $args = $this->replaceWildcards($args);
-        if (! isset($this->expected_args_at[$timing])) {
-            $this->expected_args_at[$timing] = array();
-        }
-        $method = strtolower($method);
-        $message .= Mock::getExpectationLine();
-        $this->expected_args_at[$timing][$method] =
-                new ParametersExpectation($args, $message);
-    }
-
-    /**
-     *    Sets an expectation for the number of times
-     *    a method will be called. The tally method
-     *    is used to check this.
-     *    @param string $method        Method call to test.
-     *    @param integer $count        Number of times it should
-     *                                 have been called at tally.
-     *    @param string $message       Overridden message.
-     */
-    function expectCallCount($method, $count, $message = '%s') {
-        $this->dieOnNoMethod($method, 'set expected call count');
-        $message .= Mock::getExpectationLine();
-        $this->expected_counts[strtolower($method)] =
-                new CallCountExpectation($method, $count, $message);
-    }
-
-    /**
-     *    Sets the number of times a method may be called
-     *    before a test failure is triggered.
-     *    @param string $method        Method call to test.
-     *    @param integer $count        Most number of times it should
-     *                                 have been called.
-     *    @param string $message       Overridden message.
-     */
-    function expectMaximumCallCount($method, $count, $message = '%s') {
-        $this->dieOnNoMethod($method, 'set maximum call count');
-        $message .= Mock::getExpectationLine();
-        $this->max_counts[strtolower($method)] =
-                new MaximumCallCountExpectation($method, $count, $message);
-    }
-
-    /**
-     *    Sets the number of times to call a method to prevent
-     *    a failure on the tally.
-     *    @param string $method      Method call to test.
-     *    @param integer $count      Least number of times it should
-     *                               have been called.
-     *    @param string $message     Overridden message.
-     */
-    function expectMinimumCallCount($method, $count, $message = '%s') {
-        $this->dieOnNoMethod($method, 'set minimum call count');
-        $message .= Mock::getExpectationLine();
-        $this->expected_counts[strtolower($method)] =
-                new MinimumCallCountExpectation($method, $count, $message);
-    }
-
-    /**
-     *    Convenience method for barring a method
-     *    call.
-     *    @param string $method        Method call to ban.
-     *    @param string $message       Overridden message.
-     */
-    function expectNever($method, $message = '%s') {
-        $this->expectMaximumCallCount($method, 0, $message);
-    }
-
-    /**
-     *    Convenience method for a single method
-     *    call.
-     *    @param string $method     Method call to track.
-     *    @param array $args        Expected argument list or
-     *                              false for any arguments.
-     *    @param string $message    Overridden message.
-     */
-    function expectOnce($method, $args = false, $message = '%s') {
-        $this->expectCallCount($method, 1, $message);
-        if ($args !== false) {
-            $this->expect($method, $args, $message);
-        }
-    }
-
-    /**
-     *    Convenience method for requiring a method
-     *    call.
-     *    @param string $method       Method call to track.
-     *    @param array $args          Expected argument list or
-     *                                false for any arguments.
-     *    @param string $message      Overridden message.
-     */
-    function expectAtLeastOnce($method, $args = false, $message = '%s') {
-        $this->expectMinimumCallCount($method, 1, $message);
-        if ($args !== false) {
-            $this->expect($method, $args, $message);
-        }
-    }
-
-    /**
-     *    Sets up a trigger to throw an exception upon the
-     *    method call.
-     *    @param string $method     Method name to throw on.
-     *    @param object $exception  Exception object to throw.
-     *                              If not given then a simple
-     *                              Exception object is thrown.
-     *    @param array $args        Optional argument list filter.
-     *                              If given then the exception
-     *                              will only be thrown if the
-     *                              method call matches the arguments.
-     */
-    function throwOn($method, $exception = false, $args = false) {
-        $this->dieOnNoMethod($method, "throw on");
-        $this->actions->register($method, $args,
-                new SimpleThrower($exception ? $exception : new Exception()));
-    }
-
-    /**
-     *    Sets up a trigger to throw an exception upon the
-     *    method call.
-     *    @param integer $timing    When to throw the exception. A
-     *                              value of 0 throws immediately.
-     *                              A value of 1 actually allows one call
-     *                              to this method before throwing. 2
-     *                              will allow two calls before throwing
-     *                              and so on.
-     *    @param string $method     Method name to throw on.
-     *    @param object $exception  Exception object to throw.
-     *                              If not given then a simple
-     *                              Exception object is thrown.
-     *    @param array $args        Optional argument list filter.
-     *                              If given then the exception
-     *                              will only be thrown if the
-     *                              method call matches the arguments.
-     */
-    function throwAt($timing, $method, $exception = false, $args = false) {
-        $this->dieOnNoMethod($method, "throw at");
-        $this->actions->registerAt($timing, $method, $args,
-                new SimpleThrower($exception ? $exception : new Exception()));
-    }
-
-    /**
-     *    Sets up a trigger to throw an error upon the
-     *    method call.
-     *    @param string $method     Method name to throw on.
-     *    @param object $error      Error message to trigger.
-     *    @param array $args        Optional argument list filter.
-     *                              If given then the exception
-     *                              will only be thrown if the
-     *                              method call matches the arguments.
-     *    @param integer $severity  The PHP severity level. Defaults
-     *                              to E_USER_ERROR.
-     */
-    function errorOn($method, $error = 'A mock error', $args = false, $severity = E_USER_ERROR) {
-        $this->dieOnNoMethod($method, "error on");
-        $this->actions->register($method, $args, new SimpleErrorThrower($error, $severity));
-    }
-
-    /**
-     *    Sets up a trigger to throw an error upon a specific
-     *    method call.
-     *    @param integer $timing    When to throw the exception. A
-     *                              value of 0 throws immediately.
-     *                              A value of 1 actually allows one call
-     *                              to this method before throwing. 2
-     *                              will allow two calls before throwing
-     *                              and so on.
-     *    @param string $method     Method name to throw on.
-     *    @param object $error      Error message to trigger.
-     *    @param array $args        Optional argument list filter.
-     *                              If given then the exception
-     *                              will only be thrown if the
-     *                              method call matches the arguments.
-     *    @param integer $severity  The PHP severity level. Defaults
-     *                              to E_USER_ERROR.
-     */
-    function errorAt($timing, $method, $error = 'A mock error', $args = false, $severity = E_USER_ERROR) {
-        $this->dieOnNoMethod($method, "error at");
-        $this->actions->registerAt($timing, $method, $args, new SimpleErrorThrower($error, $severity));
-    }
-
-    /**
-     *    Receives event from unit test that the current
-     *    test method has finished. Totals up the call
-     *    counts and triggers a test assertion if a test
-     *    is present for expected call counts.
-     *    @param string $test_method      Current method name.
-     *    @param SimpleTestCase $test     Test to send message to.
-     */
-    function atTestEnd($test_method, &$test) {
-        foreach ($this->expected_counts as $method => $expectation) {
-            $test->assert($expectation, $this->getCallCount($method));
-        }
-        foreach ($this->max_counts as $method => $expectation) {
-            if ($expectation->test($this->getCallCount($method))) {
-                $test->assert($expectation, $this->getCallCount($method));
-            }
-        }
-    }
-
-    /**
-     *    Returns the expected value for the method name
-     *    and checks expectations. Will generate any
-     *    test assertions as a result of expectations
-     *    if there is a test present.
-     *    @param string $method       Name of method to simulate.
-     *    @param array $args          Arguments as an array.
-     *    @return mixed               Stored return.
-     */
-    function &invoke($method, $args) {
-        $method = strtolower($method);
-        $step = $this->getCallCount($method);
-        $this->addCall($method, $args);
-        $this->checkExpectations($method, $args, $step);
-        $was = $this->disableEStrict();
-        try {
-            $result = &$this->emulateCall($method, $args, $step);
-        } catch (Exception $e) {
-            $this->restoreEStrict($was);
-            throw $e;
-        }
-        $this->restoreEStrict($was);
-        return $result;
-    }
-
-    /**
-     *    Finds the return value matching the incoming
-     *    arguments. If there is no matching value found
-     *    then an error is triggered.
-     *    @param string $method      Method name.
-     *    @param array $args         Calling arguments.
-     *    @param integer $step       Current position in the
-     *                               call history.
-     *    @return mixed              Stored return or other action.
-     */
-    protected function &emulateCall($method, $args, $step) {
-        return $this->actions->respond($step, $method, $args);
-    }
-
-    /**
-     *    Tests the arguments against expectations.
-     *    @param string $method        Method to check.
-     *    @param array $args           Argument list to match.
-     *    @param integer $timing       The position of this call
-     *                                 in the call history.
-     */
-    protected function checkExpectations($method, $args, $timing) {
-        $test = $this->getCurrentTestCase();
-        if (isset($this->max_counts[$method])) {
-            if (! $this->max_counts[$method]->test($timing + 1)) {
-                $test->assert($this->max_counts[$method], $timing + 1);
-            }
-        }
-        if (isset($this->expected_args_at[$timing][$method])) {
-            $test->assert(
-                    $this->expected_args_at[$timing][$method],
-                    $args,
-                    "Mock method [$method] at [$timing] -> %s");
-        } elseif (isset($this->expected_args[$method])) {
-            $test->assert(
-                    $this->expected_args[$method],
-                    $args,
-                    "Mock method [$method] -> %s");
-        }
-    }
-
-    /**
-     *   Our mock has to be able to return anything, including
-     *   variable references. To allow for these mixed returns
-     *   we have to disable the E_STRICT warnings while the
-     *   method calls are emulated.
-     */
-    private function disableEStrict() {
-        $was = error_reporting();
-        error_reporting($was & ~E_STRICT);
-        return $was;
-    }
-
-    /**
-     *  Restores the E_STRICT level if it was previously set.
-     *  @param integer $was     Previous error reporting level.
-     */
-    private function restoreEStrict($was) {
-        error_reporting($was);
-    }
-}
-
-/**
- *    Static methods only service class for code generation of
- *    mock objects.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class Mock {
-
-    /**
-     *    Factory for mock object classes.
-     */
-    function __construct() {
-        trigger_error('Mock factory methods are static.');
-    }
-
-    /**
-     *    Clones a class' interface and creates a mock version
-     *    that can have return values and expectations set.
-     *    @param string $class         Class to clone.
-     *    @param string $mock_class    New class name. Default is
-     *                                 the old name with "Mock"
-     *                                 prepended.
-     *    @param array $methods        Additional methods to add beyond
-     *                                 those in the cloned class. Use this
-     *                                 to emulate the dynamic addition of
-     *                                 methods in the cloned class or when
-     *                                 the class hasn't been written yet.sta
-     */
-    static function generate($class, $mock_class = false, $methods = false) {
-        $generator = new MockGenerator($class, $mock_class);
-        return @$generator->generateSubclass($methods);
-    }
-
-    /**
-     *    Generates a version of a class with selected
-     *    methods mocked only. Inherits the old class
-     *    and chains the mock methods of an aggregated
-     *    mock object.
-     *    @param string $class            Class to clone.
-     *    @param string $mock_class       New class name.
-     *    @param array $methods           Methods to be overridden
-     *                                    with mock versions.
-     */
-    static function generatePartial($class, $mock_class, $methods) {
-        $generator = new MockGenerator($class, $mock_class);
-        return @$generator->generatePartial($methods);
-    }
-
-    /**
-     *    Uses a stack trace to find the line of an assertion.
-     */
-    static function getExpectationLine() {
-        $trace = new SimpleStackTrace(array('expect'));
-        return $trace->traceMethod();
-    }
-}
-
-/**
- *    Service class for code generation of mock objects.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class MockGenerator {
-    private $class;
-    private $mock_class;
-    private $mock_base;
-    private $reflection;
-
-    /**
-     *    Builds initial reflection object.
-     *    @param string $class        Class to be mocked.
-     *    @param string $mock_class   New class with identical interface,
-     *                                but no behaviour.
-     */
-    function __construct($class, $mock_class) {
-        $this->class = $class;
-        $this->mock_class = $mock_class;
-        if (! $this->mock_class) {
-            $this->mock_class = 'Mock' . $this->class;
-        }
-        $this->mock_base = SimpleTest::getMockBaseClass();
-        $this->reflection = new SimpleReflection($this->class);
-    }
-
-    /**
-     *    Clones a class' interface and creates a mock version
-     *    that can have return values and expectations set.
-     *    @param array $methods        Additional methods to add beyond
-     *                                 those in th cloned class. Use this
-     *                                 to emulate the dynamic addition of
-     *                                 methods in the cloned class or when
-     *                                 the class hasn't been written yet.
-     */
-    function generate($methods) {
-        if (! $this->reflection->classOrInterfaceExists()) {
-            return false;
-        }
-        $mock_reflection = new SimpleReflection($this->mock_class);
-        if ($mock_reflection->classExistsSansAutoload()) {
-            return false;
-        }
-        $code = $this->createClassCode($methods ? $methods : array());
-        return eval("$code return \$code;");
-    }
-
-    /**
-     *    Subclasses a class and overrides every method with a mock one
-     *    that can have return values and expectations set. Chains
-     *    to an aggregated SimpleMock.
-     *    @param array $methods        Additional methods to add beyond
-     *                                 those in the cloned class. Use this
-     *                                 to emulate the dynamic addition of
-     *                                 methods in the cloned class or when
-     *                                 the class hasn't been written yet.
-     */
-    function generateSubclass($methods) {
-        if (! $this->reflection->classOrInterfaceExists()) {
-            return false;
-        }
-        $mock_reflection = new SimpleReflection($this->mock_class);
-        if ($mock_reflection->classExistsSansAutoload()) {
-            return false;
-        }
-        if ($this->reflection->isInterface() || $this->reflection->hasFinal()) {
-            $code = $this->createClassCode($methods ? $methods : array());
-            return eval("$code return \$code;");
-        } else {
-            $code = $this->createSubclassCode($methods ? $methods : array());
-            return eval("$code return \$code;");
-        }
-    }
-
-    /**
-     *    Generates a version of a class with selected
-     *    methods mocked only. Inherits the old class
-     *    and chains the mock methods of an aggregated
-     *    mock object.
-     *    @param array $methods           Methods to be overridden
-     *                                    with mock versions.
-     */
-    function generatePartial($methods) {
-        if (! $this->reflection->classExists($this->class)) {
-            return false;
-        }
-        $mock_reflection = new SimpleReflection($this->mock_class);
-        if ($mock_reflection->classExistsSansAutoload()) {
-            trigger_error('Partial mock class [' . $this->mock_class . '] already exists');
-            return false;
-        }
-        $code = $this->extendClassCode($methods);
-        return eval("$code return \$code;");
-    }
-
-    /**
-     *    The new mock class code as a string.
-     *    @param array $methods          Additional methods.
-     *    @return string                 Code for new mock class.
-     */
-    protected function createClassCode($methods) {
-        $implements = '';
-        $interfaces = $this->reflection->getInterfaces();
-        if (function_exists('spl_classes')) {
-            $interfaces = array_diff($interfaces, array('Traversable'));
-        }
-        if (count($interfaces) > 0) {
-            $implements = 'implements ' . implode(', ', $interfaces);
-        }
-        $code = "class " . $this->mock_class . " extends " . $this->mock_base . " $implements {\n";
-        $code .= "    function " . $this->mock_class . "() {\n";
-        $code .= "        \$this->" . $this->mock_base . "();\n";
-        $code .= "    }\n";
-        if (in_array('__construct', $this->reflection->getMethods())) {
-            $code .= "    function __construct() {\n";
-            $code .= "        \$this->" . $this->mock_base . "();\n";
-            $code .= "    }\n";
-        }
-        $code .= $this->createHandlerCode($methods);
-        $code .= "}\n";
-        return $code;
-    }
-
-    /**
-     *    The new mock class code as a string. The mock will
-     *    be a subclass of the original mocked class.
-     *    @param array $methods          Additional methods.
-     *    @return string                 Code for new mock class.
-     */
-    protected function createSubclassCode($methods) {
-        $code  = "class " . $this->mock_class . " extends " . $this->class . " {\n";
-        $code .= "    public \$mock;\n";
-        $code .= $this->addMethodList(array_merge($methods, $this->reflection->getMethods()));
-        $code .= "\n";
-        $code .= "    function " . $this->mock_class . "() {\n";
-        $code .= "        \$this->mock = new " . $this->mock_base . "();\n";
-        $code .= "        \$this->mock->disableExpectationNameChecks();\n";
-        $code .= "    }\n";
-        $code .= $this->chainMockReturns();
-        $code .= $this->chainMockExpectations();
-        $code .= $this->chainThrowMethods();
-        $code .= $this->overrideMethods($this->reflection->getMethods());
-        $code .= $this->createNewMethodCode($methods);
-        $code .= "}\n";
-        return $code;
-    }
-
-    /**
-     *    The extension class code as a string. The class
-     *    composites a mock object and chains mocked methods
-     *    to it.
-     *    @param array  $methods       Mocked methods.
-     *    @return string               Code for a new class.
-     */
-    protected function extendClassCode($methods) {
-        $code  = "class " . $this->mock_class . " extends " . $this->class . " {\n";
-        $code .= "    protected \$mock;\n";
-        $code .= $this->addMethodList($methods);
-        $code .= "\n";
-        $code .= "    function " . $this->mock_class . "() {\n";
-        $code .= "        \$this->mock = new " . $this->mock_base . "();\n";
-        $code .= "        \$this->mock->disableExpectationNameChecks();\n";
-        $code .= "    }\n";
-        $code .= $this->chainMockReturns();
-        $code .= $this->chainMockExpectations();
-        $code .= $this->chainThrowMethods();
-        $code .= $this->overrideMethods($methods);
-        $code .= "}\n";
-        return $code;
-    }
-
-    /**
-     *    Creates code within a class to generate replaced
-     *    methods. All methods call the invoke() handler
-     *    with the method name and the arguments in an
-     *    array.
-     *    @param array $methods    Additional methods.
-     */
-    protected function createHandlerCode($methods) {
-        $code = '';
-        $methods = array_merge($methods, $this->reflection->getMethods());
-        foreach ($methods as $method) {
-            if ($this->isConstructor($method)) {
-                continue;
-            }
-            $mock_reflection = new SimpleReflection($this->mock_base);
-            if (in_array($method, $mock_reflection->getMethods())) {
-                continue;
-            }
-            $code .= "    " . $this->reflection->getSignature($method) . " {\n";
-            $code .= "        \$args = func_get_args();\n";
-            $code .= "        \$result = &\$this->invoke(\"$method\", \$args);\n";
-            $code .= "        return \$result;\n";
-            $code .= "    }\n";
-        }
-        return $code;
-    }
-
-    /**
-     *    Creates code within a class to generate a new
-     *    methods. All methods call the invoke() handler
-     *    on the internal mock with the method name and
-     *    the arguments in an array.
-     *    @param array $methods    Additional methods.
-     */
-    protected function createNewMethodCode($methods) {
-        $code = '';
-        foreach ($methods as $method) {
-            if ($this->isConstructor($method)) {
-                continue;
-            }
-            $mock_reflection = new SimpleReflection($this->mock_base);
-            if (in_array($method, $mock_reflection->getMethods())) {
-                continue;
-            }
-            $code .= "    " . $this->reflection->getSignature($method) . " {\n";
-            $code .= "        \$args = func_get_args();\n";
-            $code .= "        \$result = &\$this->mock->invoke(\"$method\", \$args);\n";
-            $code .= "        return \$result;\n";
-            $code .= "    }\n";
-        }
-        return $code;
-    }
-
-    /**
-     *    Tests to see if a special PHP method is about to
-     *    be stubbed by mistake.
-     *    @param string $method    Method name.
-     *    @return boolean          True if special.
-     */
-    protected function isConstructor($method) {
-        return in_array(
-                strtolower($method),
-                array('__construct', '__destruct'));
-    }
-
-    /**
-     *    Creates a list of mocked methods for error checking.
-     *    @param array $methods       Mocked methods.
-     *    @return string              Code for a method list.
-     */
-    protected function addMethodList($methods) {
-        return "    protected \$mocked_methods = array('" .
-                implode("', '", array_map('strtolower', $methods)) .
-                "');\n";
-    }
-
-    /**
-     *    Creates code to abandon the expectation if not mocked.
-     *    @param string $alias       Parameter name of method name.
-     *    @return string             Code for bail out.
-     */
-    protected function bailOutIfNotMocked($alias) {
-        $code  = "        if (! in_array(strtolower($alias), \$this->mocked_methods)) {\n";
-        $code .= "            trigger_error(\"Method [$alias] is not mocked\");\n";
-        $code .= "            \$null = null;\n";
-        $code .= "            return \$null;\n";
-        $code .= "        }\n";
-        return $code;
-    }
-
-    /**
-     *    Creates source code for chaining to the composited
-     *    mock object.
-     *    @return string           Code for mock set up.
-     */
-    protected function chainMockReturns() {
-        $code  = "    function returns(\$method, \$value, \$args = false) {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->returns(\$method, \$value, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function returnsAt(\$timing, \$method, \$value, \$args = false) {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->returnsAt(\$timing, \$method, \$value, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function returnsByValue(\$method, \$value, \$args = false) {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->setReturnValue(\$method, \$value, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function returnsByValueAt(\$timing, \$method, \$value, \$args = false) {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->setReturnValueAt(\$timing, \$method, \$value, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function returnsByReference(\$method, &\$ref, \$args = false) {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->setReturnReference(\$method, \$ref, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function returnsByReferenceAt(\$timing, \$method, &\$ref, \$args = false) {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->setReturnReferenceAt(\$timing, \$method, \$ref, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function setReturnValue(\$method, \$value, \$args = false) {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->setReturnValue(\$method, \$value, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function setReturnValueAt(\$timing, \$method, \$value, \$args = false) {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->setReturnValueAt(\$timing, \$method, \$value, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function setReturnReference(\$method, &\$ref, \$args = false) {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->setReturnReference(\$method, \$ref, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function setReturnReferenceAt(\$timing, \$method, &\$ref, \$args = false) {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->setReturnReferenceAt(\$timing, \$method, \$ref, \$args);\n";
-        $code .= "    }\n";
-        return $code;
-    }
-
-    /**
-     *    Creates source code for chaining to an aggregated
-     *    mock object.
-     *    @return string                 Code for expectations.
-     */
-    protected function chainMockExpectations() {
-        $code  = "    function expect(\$method, \$args = false, \$msg = '%s') {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->expect(\$method, \$args, \$msg);\n";
-        $code .= "    }\n";
-        $code .= "    function expectAt(\$timing, \$method, \$args = false, \$msg = '%s') {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->expectAt(\$timing, \$method, \$args, \$msg);\n";
-        $code .= "    }\n";
-        $code .= "    function expectCallCount(\$method, \$count) {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->expectCallCount(\$method, \$count, \$msg = '%s');\n";
-        $code .= "    }\n";
-        $code .= "    function expectMaximumCallCount(\$method, \$count, \$msg = '%s') {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->expectMaximumCallCount(\$method, \$count, \$msg = '%s');\n";
-        $code .= "    }\n";
-        $code .= "    function expectMinimumCallCount(\$method, \$count, \$msg = '%s') {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->expectMinimumCallCount(\$method, \$count, \$msg = '%s');\n";
-        $code .= "    }\n";
-        $code .= "    function expectNever(\$method) {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->expectNever(\$method);\n";
-        $code .= "    }\n";
-        $code .= "    function expectOnce(\$method, \$args = false, \$msg = '%s') {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->expectOnce(\$method, \$args, \$msg);\n";
-        $code .= "    }\n";
-        $code .= "    function expectAtLeastOnce(\$method, \$args = false, \$msg = '%s') {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->expectAtLeastOnce(\$method, \$args, \$msg);\n";
-        $code .= "    }\n";
-        return $code;
-    }
-
-    /**
-     *    Adds code for chaining the throw methods.
-     *    @return string           Code for chains.
-     */
-    protected function chainThrowMethods() {
-        $code  = "    function throwOn(\$method, \$exception = false, \$args = false) {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->throwOn(\$method, \$exception, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function throwAt(\$timing, \$method, \$exception = false, \$args = false) {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->throwAt(\$timing, \$method, \$exception, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function errorOn(\$method, \$error = 'A mock error', \$args = false, \$severity = E_USER_ERROR) {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->errorOn(\$method, \$error, \$args, \$severity);\n";
-        $code .= "    }\n";
-        $code .= "    function errorAt(\$timing, \$method, \$error = 'A mock error', \$args = false, \$severity = E_USER_ERROR) {\n";
-        $code .= $this->bailOutIfNotMocked("\$method");
-        $code .= "        \$this->mock->errorAt(\$timing, \$method, \$error, \$args, \$severity);\n";
-        $code .= "    }\n";
-        return $code;
-    }
-
-    /**
-     *    Creates source code to override a list of methods
-     *    with mock versions.
-     *    @param array $methods    Methods to be overridden
-     *                             with mock versions.
-     *    @return string           Code for overridden chains.
-     */
-    protected function overrideMethods($methods) {
-        $code = "";
-        foreach ($methods as $method) {
-            if ($this->isConstructor($method)) {
-                continue;
-            }
-            $code .= "    " . $this->reflection->getSignature($method) . " {\n";
-            $code .= "        \$args = func_get_args();\n";
-            $code .= "        \$result = &\$this->mock->invoke(\"$method\", \$args);\n";
-            $code .= "        return \$result;\n";
-            $code .= "    }\n";
-        }
-        return $code;
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/page.php b/3rdparty/simpletest/page.php
deleted file mode 100755
index 5c0bce7079d..00000000000
--- a/3rdparty/simpletest/page.php
+++ /dev/null
@@ -1,542 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: page.php 1938 2009-08-05 17:16:23Z dgheath $
- */
-
-/**#@+
-    *   include other SimpleTest class files
-    */
-require_once(dirname(__FILE__) . '/http.php');
-require_once(dirname(__FILE__) . '/php_parser.php');
-require_once(dirname(__FILE__) . '/tag.php');
-require_once(dirname(__FILE__) . '/form.php');
-require_once(dirname(__FILE__) . '/selector.php');
-/**#@-*/
-
-/**
- *    A wrapper for a web page.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimplePage {
-    private $links = array();
-    private $title = false;
-    private $last_widget;
-    private $label;
-    private $forms = array();
-    private $frames = array();
-    private $transport_error;
-    private $raw;
-    private $text = false;
-    private $sent;
-    private $headers;
-    private $method;
-    private $url;
-    private $base = false;
-    private $request_data;
-
-    /**
-     *    Parses a page ready to access it's contents.
-     *    @param SimpleHttpResponse $response     Result of HTTP fetch.
-     *    @access public
-     */
-    function __construct($response = false) {
-        if ($response) {
-            $this->extractResponse($response);
-        } else {
-            $this->noResponse();
-        }
-    }
-
-    /**
-     *    Extracts all of the response information.
-     *    @param SimpleHttpResponse $response    Response being parsed.
-     *    @access private
-     */
-    protected function extractResponse($response) {
-        $this->transport_error = $response->getError();
-        $this->raw = $response->getContent();
-        $this->sent = $response->getSent();
-        $this->headers = $response->getHeaders();
-        $this->method = $response->getMethod();
-        $this->url = $response->getUrl();
-        $this->request_data = $response->getRequestData();
-    }
-
-    /**
-     *    Sets up a missing response.
-     *    @access private
-     */
-    protected function noResponse() {
-        $this->transport_error = 'No page fetched yet';
-        $this->raw = false;
-        $this->sent = false;
-        $this->headers = false;
-        $this->method = 'GET';
-        $this->url = false;
-        $this->request_data = false;
-    }
-
-    /**
-     *    Original request as bytes sent down the wire.
-     *    @return mixed              Sent content.
-     *    @access public
-     */
-    function getRequest() {
-        return $this->sent;
-    }
-
-    /**
-     *    Accessor for raw text of page.
-     *    @return string        Raw unparsed content.
-     *    @access public
-     */
-    function getRaw() {
-        return $this->raw;
-    }
-
-    /**
-     *    Accessor for plain text of page as a text browser
-     *    would see it.
-     *    @return string        Plain text of page.
-     *    @access public
-     */
-    function getText() {
-        if (! $this->text) {
-            $this->text = SimplePage::normalise($this->raw);
-        }
-        return $this->text;
-    }
-
-    /**
-     *    Accessor for raw headers of page.
-     *    @return string       Header block as text.
-     *    @access public
-     */
-    function getHeaders() {
-        if ($this->headers) {
-            return $this->headers->getRaw();
-        }
-        return false;
-    }
-
-    /**
-     *    Original request method.
-     *    @return string        GET, POST or HEAD.
-     *    @access public
-     */
-    function getMethod() {
-        return $this->method;
-    }
-
-    /**
-     *    Original resource name.
-     *    @return SimpleUrl        Current url.
-     *    @access public
-     */
-    function getUrl() {
-        return $this->url;
-    }
-
-    /**
-     *    Base URL if set via BASE tag page url otherwise
-     *    @return SimpleUrl        Base url.
-     *    @access public
-     */
-    function getBaseUrl() {
-        return $this->base;
-    }
-
-    /**
-     *    Original request data.
-     *    @return mixed              Sent content.
-     *    @access public
-     */
-    function getRequestData() {
-        return $this->request_data;
-    }
-
-    /**
-     *    Accessor for last error.
-     *    @return string        Error from last response.
-     *    @access public
-     */
-    function getTransportError() {
-        return $this->transport_error;
-    }
-
-    /**
-     *    Accessor for current MIME type.
-     *    @return string    MIME type as string; e.g. 'text/html'
-     *    @access public
-     */
-    function getMimeType() {
-        if ($this->headers) {
-            return $this->headers->getMimeType();
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for HTTP response code.
-     *    @return integer    HTTP response code received.
-     *    @access public
-     */
-    function getResponseCode() {
-        if ($this->headers) {
-            return $this->headers->getResponseCode();
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for last Authentication type. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Description of challenge type.
-     *    @access public
-     */
-    function getAuthentication() {
-        if ($this->headers) {
-            return $this->headers->getAuthentication();
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for last Authentication realm. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Name of security realm.
-     *    @access public
-     */
-    function getRealm() {
-        if ($this->headers) {
-            return $this->headers->getRealm();
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for current frame focus. Will be
-     *    false as no frames.
-     *    @return array    Always empty.
-     *    @access public
-     */
-    function getFrameFocus() {
-        return array();
-    }
-
-    /**
-     *    Sets the focus by index. The integer index starts from 1.
-     *    @param integer $choice    Chosen frame.
-     *    @return boolean           Always false.
-     *    @access public
-     */
-    function setFrameFocusByIndex($choice) {
-        return false;
-    }
-
-    /**
-     *    Sets the focus by name. Always fails for a leaf page.
-     *    @param string $name    Chosen frame.
-     *    @return boolean        False as no frames.
-     *    @access public
-     */
-    function setFrameFocus($name) {
-        return false;
-    }
-
-    /**
-     *    Clears the frame focus. Does nothing for a leaf page.
-     *    @access public
-     */
-    function clearFrameFocus() {
-    }
-
-    /**
-     *    TODO: write docs
-     */
-    function setFrames($frames) {
-        $this->frames = $frames;
-    }
-
-    /**
-     *    Test to see if link is an absolute one.
-     *    @param string $url     Url to test.
-     *    @return boolean        True if absolute.
-     *    @access protected
-     */
-    protected function linkIsAbsolute($url) {
-        $parsed = new SimpleUrl($url);
-        return (boolean)($parsed->getScheme() && $parsed->getHost());
-    }
-
-    /**
-     *    Adds a link to the page.
-     *    @param SimpleAnchorTag $tag      Link to accept.
-     */
-    function addLink($tag) {
-        $this->links[] = $tag;
-    }
-
-    /**
-     *    Set the forms
-     *    @param array $forms           An array of SimpleForm objects
-     */
-    function setForms($forms) {
-        $this->forms = $forms;
-    }
-
-    /**
-     *    Test for the presence of a frameset.
-     *    @return boolean        True if frameset.
-     *    @access public
-     */
-    function hasFrames() {
-        return count($this->frames) > 0;
-    }
-
-    /**
-     *    Accessor for frame name and source URL for every frame that
-     *    will need to be loaded. Immediate children only.
-     *    @return boolean/array     False if no frameset or
-     *                              otherwise a hash of frame URLs.
-     *                              The key is either a numerical
-     *                              base one index or the name attribute.
-     *    @access public
-     */
-    function getFrameset() {
-        if (! $this->hasFrames()) {
-            return false;
-        }
-        $urls = array();
-        for ($i = 0; $i < count($this->frames); $i++) {
-            $name = $this->frames[$i]->getAttribute('name');
-            $url = new SimpleUrl($this->frames[$i]->getAttribute('src'));
-            $urls[$name ? $name : $i + 1] = $this->expandUrl($url);
-        }
-        return $urls;
-    }
-
-    /**
-     *    Fetches a list of loaded frames.
-     *    @return array/string    Just the URL for a single page.
-     *    @access public
-     */
-    function getFrames() {
-        $url = $this->expandUrl($this->getUrl());
-        return $url->asString();
-    }
-
-    /**
-     *    Accessor for a list of all links.
-     *    @return array   List of urls with scheme of
-     *                    http or https and hostname.
-     *    @access public
-     */
-    function getUrls() {
-        $all = array();
-        foreach ($this->links as $link) {
-            $url = $this->getUrlFromLink($link);
-            $all[] = $url->asString();
-        }
-        return $all;
-    }
-
-    /**
-     *    Accessor for URLs by the link label. Label will match
-     *    regardess of whitespace issues and case.
-     *    @param string $label    Text of link.
-     *    @return array           List of links with that label.
-     *    @access public
-     */
-    function getUrlsByLabel($label) {
-        $matches = array();
-        foreach ($this->links as $link) {
-            if ($link->getText() == $label) {
-                $matches[] = $this->getUrlFromLink($link);
-            }
-        }
-        return $matches;
-    }
-
-    /**
-     *    Accessor for a URL by the id attribute.
-     *    @param string $id       Id attribute of link.
-     *    @return SimpleUrl       URL with that id of false if none.
-     *    @access public
-     */
-    function getUrlById($id) {
-        foreach ($this->links as $link) {
-            if ($link->getAttribute('id') === (string)$id) {
-                return $this->getUrlFromLink($link);
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Converts a link tag into a target URL.
-     *    @param SimpleAnchor $link    Parsed link.
-     *    @return SimpleUrl            URL with frame target if any.
-     *    @access private
-     */
-    protected function getUrlFromLink($link) {
-        $url = $this->expandUrl($link->getHref());
-        if ($link->getAttribute('target')) {
-            $url->setTarget($link->getAttribute('target'));
-        }
-        return $url;
-    }
-
-    /**
-     *    Expands expandomatic URLs into fully qualified
-     *    URLs.
-     *    @param SimpleUrl $url        Relative URL.
-     *    @return SimpleUrl            Absolute URL.
-     *    @access public
-     */
-    function expandUrl($url) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        $location = $this->getBaseUrl() ? $this->getBaseUrl() : new SimpleUrl();
-        return $url->makeAbsolute($location->makeAbsolute($this->getUrl()));
-    }
-
-    /**
-     *    Sets the base url for the page.
-     *    @param string $url    Base URL for page.
-     */
-    function setBase($url) {
-        $this->base = new SimpleUrl($url);
-    }
-
-    /**
-     *    Sets the title tag contents.
-     *    @param SimpleTitleTag $tag    Title of page.
-     */
-    function setTitle($tag) {
-        $this->title = $tag;
-    }
-
-    /**
-     *    Accessor for parsed title.
-     *    @return string     Title or false if no title is present.
-     *    @access public
-     */
-    function getTitle() {
-        if ($this->title) {
-            return $this->title->getText();
-        }
-        return false;
-    }
-
-    /**
-     *    Finds a held form by button label. Will only
-     *    search correctly built forms.
-     *    @param SimpleSelector $selector       Button finder.
-     *    @return SimpleForm                    Form object containing
-     *                                          the button.
-     *    @access public
-     */
-    function getFormBySubmit($selector) {
-        for ($i = 0; $i < count($this->forms); $i++) {
-            if ($this->forms[$i]->hasSubmit($selector)) {
-                return $this->forms[$i];
-            }
-        }
-        return null;
-    }
-
-    /**
-     *    Finds a held form by image using a selector.
-     *    Will only search correctly built forms.
-     *    @param SimpleSelector $selector  Image finder.
-     *    @return SimpleForm               Form object containing
-     *                                     the image.
-     *    @access public
-     */
-    function getFormByImage($selector) {
-        for ($i = 0; $i < count($this->forms); $i++) {
-            if ($this->forms[$i]->hasImage($selector)) {
-                return $this->forms[$i];
-            }
-        }
-        return null;
-    }
-
-    /**
-     *    Finds a held form by the form ID. A way of
-     *    identifying a specific form when we have control
-     *    of the HTML code.
-     *    @param string $id     Form label.
-     *    @return SimpleForm    Form object containing the matching ID.
-     *    @access public
-     */
-    function getFormById($id) {
-        for ($i = 0; $i < count($this->forms); $i++) {
-            if ($this->forms[$i]->getId() == $id) {
-                return $this->forms[$i];
-            }
-        }
-        return null;
-    }
-
-    /**
-     *    Sets a field on each form in which the field is
-     *    available.
-     *    @param SimpleSelector $selector    Field finder.
-     *    @param string $value               Value to set field to.
-     *    @return boolean                    True if value is valid.
-     *    @access public
-     */
-    function setField($selector, $value, $position=false) {
-        $is_set = false;
-        for ($i = 0; $i < count($this->forms); $i++) {
-            if ($this->forms[$i]->setField($selector, $value, $position)) {
-                $is_set = true;
-            }
-        }
-        return $is_set;
-    }
-
-    /**
-     *    Accessor for a form element value within a page.
-     *    @param SimpleSelector $selector    Field finder.
-     *    @return string/boolean             A string if the field is
-     *                                       present, false if unchecked
-     *                                       and null if missing.
-     *    @access public
-     */
-    function getField($selector) {
-        for ($i = 0; $i < count($this->forms); $i++) {
-            $value = $this->forms[$i]->getValue($selector);
-            if (isset($value)) {
-                return $value;
-            }
-        }
-        return null;
-    }
-
-    /**
-     *    Turns HTML into text browser visible text. Images
-     *    are converted to their alt text and tags are supressed.
-     *    Entities are converted to their visible representation.
-     *    @param string $html        HTML to convert.
-     *    @return string             Plain text.
-     *    @access public
-     */
-    static function normalise($html) {
-        $text = preg_replace('#<!--.*?-->#si', '', $html);
-        $text = preg_replace('#<(script|option|textarea)[^>]*>.*?</\1>#si', '', $text);
-        $text = preg_replace('#<img[^>]*alt\s*=\s*("([^"]*)"|\'([^\']*)\'|([a-zA-Z_]+))[^>]*>#', ' \2\3\4 ', $text);
-        $text = preg_replace('#<[^>]*>#', '', $text);
-        $text = html_entity_decode($text, ENT_QUOTES);
-        $text = preg_replace('#\s+#', ' ', $text);
-        return trim(trim($text), "\xA0");        // TODO: The \xAO is a &nbsp;. Add a test for this.
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/php_parser.php b/3rdparty/simpletest/php_parser.php
deleted file mode 100755
index 4c5b8f00bae..00000000000
--- a/3rdparty/simpletest/php_parser.php
+++ /dev/null
@@ -1,1054 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: php_parser.php 1927 2009-07-31 12:45:36Z dgheath $
- */
-
-/**#@+
- * Lexer mode stack constants
- */
-foreach (array('LEXER_ENTER', 'LEXER_MATCHED',
-                'LEXER_UNMATCHED', 'LEXER_EXIT',
-                'LEXER_SPECIAL') as $i => $constant) {
-    if (! defined($constant)) {
-        define($constant, $i + 1);
-    }
-}
-/**#@-*/
-
-/**
- *    Compounded regular expression. Any of
- *    the contained patterns could match and
- *    when one does, it's label is returned.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class ParallelRegex {
-    private $patterns;
-    private $labels;
-    private $regex;
-    private $case;
-
-    /**
-     *    Constructor. Starts with no patterns.
-     *    @param boolean $case    True for case sensitive, false
-     *                            for insensitive.
-     *    @access public
-     */
-    function __construct($case) {
-        $this->case = $case;
-        $this->patterns = array();
-        $this->labels = array();
-        $this->regex = null;
-    }
-
-    /**
-     *    Adds a pattern with an optional label.
-     *    @param string $pattern      Perl style regex, but ( and )
-     *                                lose the usual meaning.
-     *    @param string $label        Label of regex to be returned
-     *                                on a match.
-     *    @access public
-     */
-    function addPattern($pattern, $label = true) {
-        $count = count($this->patterns);
-        $this->patterns[$count] = $pattern;
-        $this->labels[$count] = $label;
-        $this->regex = null;
-    }
-
-    /**
-     *    Attempts to match all patterns at once against
-     *    a string.
-     *    @param string $subject      String to match against.
-     *    @param string $match        First matched portion of
-     *                                subject.
-     *    @return boolean             True on success.
-     *    @access public
-     */
-    function match($subject, &$match) {
-        if (count($this->patterns) == 0) {
-            return false;
-        }
-        if (! preg_match($this->getCompoundedRegex(), $subject, $matches)) {
-            $match = '';
-            return false;
-        }
-        $match = $matches[0];
-        for ($i = 1; $i < count($matches); $i++) {
-            if ($matches[$i]) {
-                return $this->labels[$i - 1];
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    Compounds the patterns into a single
-     *    regular expression separated with the
-     *    "or" operator. Caches the regex.
-     *    Will automatically escape (, ) and / tokens.
-     *    @param array $patterns    List of patterns in order.
-     *    @access private
-     */
-    protected function getCompoundedRegex() {
-        if ($this->regex == null) {
-            for ($i = 0, $count = count($this->patterns); $i < $count; $i++) {
-                $this->patterns[$i] = '(' . str_replace(
-                        array('/', '(', ')'),
-                        array('\/', '\(', '\)'),
-                        $this->patterns[$i]) . ')';
-            }
-            $this->regex = "/" . implode("|", $this->patterns) . "/" . $this->getPerlMatchingFlags();
-        }
-        return $this->regex;
-    }
-
-    /**
-     *    Accessor for perl regex mode flags to use.
-     *    @return string       Perl regex flags.
-     *    @access private
-     */
-    protected function getPerlMatchingFlags() {
-        return ($this->case ? "msS" : "msSi");
-    }
-}
-
-/**
- *    States for a stack machine.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleStateStack {
-    private $stack;
-
-    /**
-     *    Constructor. Starts in named state.
-     *    @param string $start        Starting state name.
-     *    @access public
-     */
-    function __construct($start) {
-        $this->stack = array($start);
-    }
-
-    /**
-     *    Accessor for current state.
-     *    @return string       State.
-     *    @access public
-     */
-    function getCurrent() {
-        return $this->stack[count($this->stack) - 1];
-    }
-
-    /**
-     *    Adds a state to the stack and sets it
-     *    to be the current state.
-     *    @param string $state        New state.
-     *    @access public
-     */
-    function enter($state) {
-        array_push($this->stack, $state);
-    }
-
-    /**
-     *    Leaves the current state and reverts
-     *    to the previous one.
-     *    @return boolean    False if we drop off
-     *                       the bottom of the list.
-     *    @access public
-     */
-    function leave() {
-        if (count($this->stack) == 1) {
-            return false;
-        }
-        array_pop($this->stack);
-        return true;
-    }
-}
-
-/**
- *    Accepts text and breaks it into tokens.
- *    Some optimisation to make the sure the
- *    content is only scanned by the PHP regex
- *    parser once. Lexer modes must not start
- *    with leading underscores.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleLexer {
-    private $regexes;
-    private $parser;
-    private $mode;
-    private $mode_handlers;
-    private $case;
-
-    /**
-     *    Sets up the lexer in case insensitive matching
-     *    by default.
-     *    @param SimpleSaxParser $parser  Handling strategy by
-     *                                    reference.
-     *    @param string $start            Starting handler.
-     *    @param boolean $case            True for case sensitive.
-     *    @access public
-     */
-    function __construct($parser, $start = "accept", $case = false) {
-        $this->case = $case;
-        $this->regexes = array();
-        $this->parser = $parser;
-        $this->mode = new SimpleStateStack($start);
-        $this->mode_handlers = array($start => $start);
-    }
-
-    /**
-     *    Adds a token search pattern for a particular
-     *    parsing mode. The pattern does not change the
-     *    current mode.
-     *    @param string $pattern      Perl style regex, but ( and )
-     *                                lose the usual meaning.
-     *    @param string $mode         Should only apply this
-     *                                pattern when dealing with
-     *                                this type of input.
-     *    @access public
-     */
-    function addPattern($pattern, $mode = "accept") {
-        if (! isset($this->regexes[$mode])) {
-            $this->regexes[$mode] = new ParallelRegex($this->case);
-        }
-        $this->regexes[$mode]->addPattern($pattern);
-        if (! isset($this->mode_handlers[$mode])) {
-            $this->mode_handlers[$mode] = $mode;
-        }
-    }
-
-    /**
-     *    Adds a pattern that will enter a new parsing
-     *    mode. Useful for entering parenthesis, strings,
-     *    tags, etc.
-     *    @param string $pattern      Perl style regex, but ( and )
-     *                                lose the usual meaning.
-     *    @param string $mode         Should only apply this
-     *                                pattern when dealing with
-     *                                this type of input.
-     *    @param string $new_mode     Change parsing to this new
-     *                                nested mode.
-     *    @access public
-     */
-    function addEntryPattern($pattern, $mode, $new_mode) {
-        if (! isset($this->regexes[$mode])) {
-            $this->regexes[$mode] = new ParallelRegex($this->case);
-        }
-        $this->regexes[$mode]->addPattern($pattern, $new_mode);
-        if (! isset($this->mode_handlers[$new_mode])) {
-            $this->mode_handlers[$new_mode] = $new_mode;
-        }
-    }
-
-    /**
-     *    Adds a pattern that will exit the current mode
-     *    and re-enter the previous one.
-     *    @param string $pattern      Perl style regex, but ( and )
-     *                                lose the usual meaning.
-     *    @param string $mode         Mode to leave.
-     *    @access public
-     */
-    function addExitPattern($pattern, $mode) {
-        if (! isset($this->regexes[$mode])) {
-            $this->regexes[$mode] = new ParallelRegex($this->case);
-        }
-        $this->regexes[$mode]->addPattern($pattern, "__exit");
-        if (! isset($this->mode_handlers[$mode])) {
-            $this->mode_handlers[$mode] = $mode;
-        }
-    }
-
-    /**
-     *    Adds a pattern that has a special mode. Acts as an entry
-     *    and exit pattern in one go, effectively calling a special
-     *    parser handler for this token only.
-     *    @param string $pattern      Perl style regex, but ( and )
-     *                                lose the usual meaning.
-     *    @param string $mode         Should only apply this
-     *                                pattern when dealing with
-     *                                this type of input.
-     *    @param string $special      Use this mode for this one token.
-     *    @access public
-     */
-    function addSpecialPattern($pattern, $mode, $special) {
-        if (! isset($this->regexes[$mode])) {
-            $this->regexes[$mode] = new ParallelRegex($this->case);
-        }
-        $this->regexes[$mode]->addPattern($pattern, "_$special");
-        if (! isset($this->mode_handlers[$special])) {
-            $this->mode_handlers[$special] = $special;
-        }
-    }
-
-    /**
-     *    Adds a mapping from a mode to another handler.
-     *    @param string $mode        Mode to be remapped.
-     *    @param string $handler     New target handler.
-     *    @access public
-     */
-    function mapHandler($mode, $handler) {
-        $this->mode_handlers[$mode] = $handler;
-    }
-
-    /**
-     *    Splits the page text into tokens. Will fail
-     *    if the handlers report an error or if no
-     *    content is consumed. If successful then each
-     *    unparsed and parsed token invokes a call to the
-     *    held listener.
-     *    @param string $raw        Raw HTML text.
-     *    @return boolean           True on success, else false.
-     *    @access public
-     */
-    function parse($raw) {
-        if (! isset($this->parser)) {
-            return false;
-        }
-        $length = strlen($raw);
-        while (is_array($parsed = $this->reduce($raw))) {
-            list($raw, $unmatched, $matched, $mode) = $parsed;
-            if (! $this->dispatchTokens($unmatched, $matched, $mode)) {
-                return false;
-            }
-            if ($raw === '') {
-                return true;
-            }
-            if (strlen($raw) == $length) {
-                return false;
-            }
-            $length = strlen($raw);
-        }
-        if (! $parsed) {
-            return false;
-        }
-        return $this->invokeParser($raw, LEXER_UNMATCHED);
-    }
-
-    /**
-     *    Sends the matched token and any leading unmatched
-     *    text to the parser changing the lexer to a new
-     *    mode if one is listed.
-     *    @param string $unmatched    Unmatched leading portion.
-     *    @param string $matched      Actual token match.
-     *    @param string $mode         Mode after match. A boolean
-     *                                false mode causes no change.
-     *    @return boolean             False if there was any error
-     *                                from the parser.
-     *    @access private
-     */
-    protected function dispatchTokens($unmatched, $matched, $mode = false) {
-        if (! $this->invokeParser($unmatched, LEXER_UNMATCHED)) {
-            return false;
-        }
-        if (is_bool($mode)) {
-            return $this->invokeParser($matched, LEXER_MATCHED);
-        }
-        if ($this->isModeEnd($mode)) {
-            if (! $this->invokeParser($matched, LEXER_EXIT)) {
-                return false;
-            }
-            return $this->mode->leave();
-        }
-        if ($this->isSpecialMode($mode)) {
-            $this->mode->enter($this->decodeSpecial($mode));
-            if (! $this->invokeParser($matched, LEXER_SPECIAL)) {
-                return false;
-            }
-            return $this->mode->leave();
-        }
-        $this->mode->enter($mode);
-        return $this->invokeParser($matched, LEXER_ENTER);
-    }
-
-    /**
-     *    Tests to see if the new mode is actually to leave
-     *    the current mode and pop an item from the matching
-     *    mode stack.
-     *    @param string $mode    Mode to test.
-     *    @return boolean        True if this is the exit mode.
-     *    @access private
-     */
-    protected function isModeEnd($mode) {
-        return ($mode === "__exit");
-    }
-
-    /**
-     *    Test to see if the mode is one where this mode
-     *    is entered for this token only and automatically
-     *    leaves immediately afterwoods.
-     *    @param string $mode    Mode to test.
-     *    @return boolean        True if this is the exit mode.
-     *    @access private
-     */
-    protected function isSpecialMode($mode) {
-        return (strncmp($mode, "_", 1) == 0);
-    }
-
-    /**
-     *    Strips the magic underscore marking single token
-     *    modes.
-     *    @param string $mode    Mode to decode.
-     *    @return string         Underlying mode name.
-     *    @access private
-     */
-    protected function decodeSpecial($mode) {
-        return substr($mode, 1);
-    }
-
-    /**
-     *    Calls the parser method named after the current
-     *    mode. Empty content will be ignored. The lexer
-     *    has a parser handler for each mode in the lexer.
-     *    @param string $content        Text parsed.
-     *    @param boolean $is_match      Token is recognised rather
-     *                                  than unparsed data.
-     *    @access private
-     */
-    protected function invokeParser($content, $is_match) {
-        if (($content === '') || ($content === false)) {
-            return true;
-        }
-        $handler = $this->mode_handlers[$this->mode->getCurrent()];
-        return $this->parser->$handler($content, $is_match);
-    }
-
-    /**
-     *    Tries to match a chunk of text and if successful
-     *    removes the recognised chunk and any leading
-     *    unparsed data. Empty strings will not be matched.
-     *    @param string $raw         The subject to parse. This is the
-     *                               content that will be eaten.
-     *    @return array/boolean      Three item list of unparsed
-     *                               content followed by the
-     *                               recognised token and finally the
-     *                               action the parser is to take.
-     *                               True if no match, false if there
-     *                               is a parsing error.
-     *    @access private
-     */
-    protected function reduce($raw) {
-        if ($action = $this->regexes[$this->mode->getCurrent()]->match($raw, $match)) {
-            $unparsed_character_count = strpos($raw, $match);
-            $unparsed = substr($raw, 0, $unparsed_character_count);
-            $raw = substr($raw, $unparsed_character_count + strlen($match));
-            return array($raw, $unparsed, $match, $action);
-        }
-        return true;
-    }
-}
-
-/**
- *    Breaks HTML into SAX events.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHtmlLexer extends SimpleLexer {
-
-    /**
-     *    Sets up the lexer with case insensitive matching
-     *    and adds the HTML handlers.
-     *    @param SimpleSaxParser $parser  Handling strategy by
-     *                                    reference.
-     *    @access public
-     */
-    function __construct($parser) {
-        parent::__construct($parser, 'text');
-        $this->mapHandler('text', 'acceptTextToken');
-        $this->addSkipping();
-        foreach ($this->getParsedTags() as $tag) {
-            $this->addTag($tag);
-        }
-        $this->addInTagTokens();
-    }
-
-    /**
-     *    List of parsed tags. Others are ignored.
-     *    @return array        List of searched for tags.
-     *    @access private
-     */
-    protected function getParsedTags() {
-        return array('a', 'base', 'title', 'form', 'input', 'button', 'textarea', 'select',
-                'option', 'frameset', 'frame', 'label');
-    }
-
-    /**
-     *    The lexer has to skip certain sections such
-     *    as server code, client code and styles.
-     *    @access private
-     */
-    protected function addSkipping() {
-        $this->mapHandler('css', 'ignore');
-        $this->addEntryPattern('<style', 'text', 'css');
-        $this->addExitPattern('</style>', 'css');
-        $this->mapHandler('js', 'ignore');
-        $this->addEntryPattern('<script', 'text', 'js');
-        $this->addExitPattern('</script>', 'js');
-        $this->mapHandler('comment', 'ignore');
-        $this->addEntryPattern('<!--', 'text', 'comment');
-        $this->addExitPattern('-->', 'comment');
-    }
-
-    /**
-     *    Pattern matches to start and end a tag.
-     *    @param string $tag          Name of tag to scan for.
-     *    @access private
-     */
-    protected function addTag($tag) {
-        $this->addSpecialPattern("</$tag>", 'text', 'acceptEndToken');
-        $this->addEntryPattern("<$tag", 'text', 'tag');
-    }
-
-    /**
-     *    Pattern matches to parse the inside of a tag
-     *    including the attributes and their quoting.
-     *    @access private
-     */
-    protected function addInTagTokens() {
-        $this->mapHandler('tag', 'acceptStartToken');
-        $this->addSpecialPattern('\s+', 'tag', 'ignore');
-        $this->addAttributeTokens();
-        $this->addExitPattern('/>', 'tag');
-        $this->addExitPattern('>', 'tag');
-    }
-
-    /**
-     *    Matches attributes that are either single quoted,
-     *    double quoted or unquoted.
-     *    @access private
-     */
-    protected function addAttributeTokens() {
-        $this->mapHandler('dq_attribute', 'acceptAttributeToken');
-        $this->addEntryPattern('=\s*"', 'tag', 'dq_attribute');
-        $this->addPattern("\\\\\"", 'dq_attribute');
-        $this->addExitPattern('"', 'dq_attribute');
-        $this->mapHandler('sq_attribute', 'acceptAttributeToken');
-        $this->addEntryPattern("=\s*'", 'tag', 'sq_attribute');
-        $this->addPattern("\\\\'", 'sq_attribute');
-        $this->addExitPattern("'", 'sq_attribute');
-        $this->mapHandler('uq_attribute', 'acceptAttributeToken');
-        $this->addSpecialPattern('=\s*[^>\s]*', 'tag', 'uq_attribute');
-    }
-}
-
-/**
- *    Converts HTML tokens into selected SAX events.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHtmlSaxParser {
-    private $lexer;
-    private $listener;
-    private $tag;
-    private $attributes;
-    private $current_attribute;
-
-    /**
-     *    Sets the listener.
-     *    @param SimplePhpPageBuilder $listener    SAX event handler.
-     *    @access public
-     */
-    function __construct($listener) {
-        $this->listener = $listener;
-        $this->lexer = $this->createLexer($this);
-        $this->tag = '';
-        $this->attributes = array();
-        $this->current_attribute = '';
-    }
-
-    /**
-     *    Runs the content through the lexer which
-     *    should call back to the acceptors.
-     *    @param string $raw      Page text to parse.
-     *    @return boolean         False if parse error.
-     *    @access public
-     */
-    function parse($raw) {
-        return $this->lexer->parse($raw);
-    }
-
-    /**
-     *    Sets up the matching lexer. Starts in 'text' mode.
-     *    @param SimpleSaxParser $parser    Event generator, usually $self.
-     *    @return SimpleLexer               Lexer suitable for this parser.
-     *    @access public
-     */
-    static function createLexer(&$parser) {
-        return new SimpleHtmlLexer($parser);
-    }
-
-    /**
-     *    Accepts a token from the tag mode. If the
-     *    starting element completes then the element
-     *    is dispatched and the current attributes
-     *    set back to empty. The element or attribute
-     *    name is converted to lower case.
-     *    @param string $token     Incoming characters.
-     *    @param integer $event    Lexer event type.
-     *    @return boolean          False if parse error.
-     *    @access public
-     */
-    function acceptStartToken($token, $event) {
-        if ($event == LEXER_ENTER) {
-            $this->tag = strtolower(substr($token, 1));
-            return true;
-        }
-        if ($event == LEXER_EXIT) {
-            $success = $this->listener->startElement(
-                    $this->tag,
-                    $this->attributes);
-            $this->tag = '';
-            $this->attributes = array();
-            return $success;
-        }
-        if ($token != '=') {
-            $this->current_attribute = strtolower(html_entity_decode($token, ENT_QUOTES));
-            $this->attributes[$this->current_attribute] = '';
-        }
-        return true;
-    }
-
-    /**
-     *    Accepts a token from the end tag mode.
-     *    The element name is converted to lower case.
-     *    @param string $token     Incoming characters.
-     *    @param integer $event    Lexer event type.
-     *    @return boolean          False if parse error.
-     *    @access public
-     */
-    function acceptEndToken($token, $event) {
-        if (! preg_match('/<\/(.*)>/', $token, $matches)) {
-            return false;
-        }
-        return $this->listener->endElement(strtolower($matches[1]));
-    }
-
-    /**
-     *    Part of the tag data.
-     *    @param string $token     Incoming characters.
-     *    @param integer $event    Lexer event type.
-     *    @return boolean          False if parse error.
-     *    @access public
-     */
-    function acceptAttributeToken($token, $event) {
-        if ($this->current_attribute) {
-            if ($event == LEXER_UNMATCHED) {
-                $this->attributes[$this->current_attribute] .=
-                        html_entity_decode($token, ENT_QUOTES);
-            }
-            if ($event == LEXER_SPECIAL) {
-                $this->attributes[$this->current_attribute] .=
-                        preg_replace('/^=\s*/' , '', html_entity_decode($token, ENT_QUOTES));
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    A character entity.
-     *    @param string $token    Incoming characters.
-     *    @param integer $event   Lexer event type.
-     *    @return boolean         False if parse error.
-     *    @access public
-     */
-    function acceptEntityToken($token, $event) {
-    }
-
-    /**
-     *    Character data between tags regarded as
-     *    important.
-     *    @param string $token     Incoming characters.
-     *    @param integer $event    Lexer event type.
-     *    @return boolean          False if parse error.
-     *    @access public
-     */
-    function acceptTextToken($token, $event) {
-        return $this->listener->addContent($token);
-    }
-
-    /**
-     *    Incoming data to be ignored.
-     *    @param string $token     Incoming characters.
-     *    @param integer $event    Lexer event type.
-     *    @return boolean          False if parse error.
-     *    @access public
-     */
-    function ignore($token, $event) {
-        return true;
-    }
-}
-
-/**
- *    SAX event handler. Maintains a list of
- *    open tags and dispatches them as they close.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimplePhpPageBuilder {
-    private $tags;
-    private $page;
-    private $private_content_tag;
-    private $open_forms = array();
-    private $complete_forms = array();
-    private $frameset = false;
-    private $loading_frames = array();
-    private $frameset_nesting_level = 0;
-    private $left_over_labels = array();
-
-    /**
-     *    Frees up any references so as to allow the PHP garbage
-     *    collection from unset() to work.
-     *    @access public
-     */
-    function free() {
-        unset($this->tags);
-        unset($this->page);
-        unset($this->private_content_tags);
-        $this->open_forms = array();
-        $this->complete_forms = array();
-        $this->frameset = false;
-        $this->loading_frames = array();
-        $this->frameset_nesting_level = 0;
-        $this->left_over_labels = array();
-    }
-
-    /**
-     *    This builder is always available.
-     *    @return boolean       Always true.
-     */
-    function can() {
-        return true;
-    }
-
-    /**
-     *    Reads the raw content and send events
-     *    into the page to be built.
-     *    @param $response SimpleHttpResponse  Fetched response.
-     *    @return SimplePage                   Newly parsed page.
-     *    @access public
-     */
-    function parse($response) {
-        $this->tags = array();
-        $this->page = $this->createPage($response);
-        $parser = $this->createParser($this);
-        $parser->parse($response->getContent());
-        $this->acceptPageEnd();
-        $page = $this->page;
-        $this->free();
-        return $page;
-    }
-
-    /**
-     *    Creates an empty page.
-     *    @return SimplePage        New unparsed page.
-     *    @access protected
-     */
-    protected function createPage($response) {
-        return new SimplePage($response);
-    }
-
-    /**
-     *    Creates the parser used with the builder.
-     *    @param SimplePhpPageBuilder $listener   Target of parser.
-     *    @return SimpleSaxParser              Parser to generate
-     *                                         events for the builder.
-     *    @access protected
-     */
-    protected function createParser(&$listener) {
-        return new SimpleHtmlSaxParser($listener);
-    }
-
-    /**
-     *    Start of element event. Opens a new tag.
-     *    @param string $name         Element name.
-     *    @param hash $attributes     Attributes without content
-     *                                are marked as true.
-     *    @return boolean             False on parse error.
-     *    @access public
-     */
-    function startElement($name, $attributes) {
-        $factory = new SimpleTagBuilder();
-        $tag = $factory->createTag($name, $attributes);
-        if (! $tag) {
-            return true;
-        }
-        if ($tag->getTagName() == 'label') {
-            $this->acceptLabelStart($tag);
-            $this->openTag($tag);
-            return true;
-        }
-        if ($tag->getTagName() == 'form') {
-            $this->acceptFormStart($tag);
-            return true;
-        }
-        if ($tag->getTagName() == 'frameset') {
-            $this->acceptFramesetStart($tag);
-            return true;
-        }
-        if ($tag->getTagName() == 'frame') {
-            $this->acceptFrame($tag);
-            return true;
-        }
-        if ($tag->isPrivateContent() && ! isset($this->private_content_tag)) {
-            $this->private_content_tag = &$tag;
-        }
-        if ($tag->expectEndTag()) {
-            $this->openTag($tag);
-            return true;
-        }
-        $this->acceptTag($tag);
-        return true;
-    }
-
-    /**
-     *    End of element event.
-     *    @param string $name        Element name.
-     *    @return boolean            False on parse error.
-     *    @access public
-     */
-    function endElement($name) {
-        if ($name == 'label') {
-            $this->acceptLabelEnd();
-            return true;
-        }
-        if ($name == 'form') {
-            $this->acceptFormEnd();
-            return true;
-        }
-        if ($name == 'frameset') {
-            $this->acceptFramesetEnd();
-            return true;
-        }
-        if ($this->hasNamedTagOnOpenTagStack($name)) {
-            $tag = array_pop($this->tags[$name]);
-            if ($tag->isPrivateContent() && $this->private_content_tag->getTagName() == $name) {
-                unset($this->private_content_tag);
-            }
-            $this->addContentTagToOpenTags($tag);
-            $this->acceptTag($tag);
-            return true;
-        }
-        return true;
-    }
-
-    /**
-     *    Test to see if there are any open tags awaiting
-     *    closure that match the tag name.
-     *    @param string $name        Element name.
-     *    @return boolean            True if any are still open.
-     *    @access private
-     */
-    protected function hasNamedTagOnOpenTagStack($name) {
-        return isset($this->tags[$name]) && (count($this->tags[$name]) > 0);
-    }
-
-    /**
-     *    Unparsed, but relevant data. The data is added
-     *    to every open tag.
-     *    @param string $text        May include unparsed tags.
-     *    @return boolean            False on parse error.
-     *    @access public
-     */
-    function addContent($text) {
-        if (isset($this->private_content_tag)) {
-            $this->private_content_tag->addContent($text);
-        } else {
-            $this->addContentToAllOpenTags($text);
-        }
-        return true;
-    }
-
-    /**
-     *    Any content fills all currently open tags unless it
-     *    is part of an option tag.
-     *    @param string $text        May include unparsed tags.
-     *    @access private
-     */
-    protected function addContentToAllOpenTags($text) {
-        foreach (array_keys($this->tags) as $name) {
-            for ($i = 0, $count = count($this->tags[$name]); $i < $count; $i++) {
-                $this->tags[$name][$i]->addContent($text);
-            }
-        }
-    }
-
-    /**
-     *    Parsed data in tag form. The parsed tag is added
-     *    to every open tag. Used for adding options to select
-     *    fields only.
-     *    @param SimpleTag $tag        Option tags only.
-     *    @access private
-     */
-    protected function addContentTagToOpenTags(&$tag) {
-        if ($tag->getTagName() != 'option') {
-            return;
-        }
-        foreach (array_keys($this->tags) as $name) {
-            for ($i = 0, $count = count($this->tags[$name]); $i < $count; $i++) {
-                $this->tags[$name][$i]->addTag($tag);
-            }
-        }
-    }
-
-    /**
-     *    Opens a tag for receiving content. Multiple tags
-     *    will be receiving input at the same time.
-     *    @param SimpleTag $tag        New content tag.
-     *    @access private
-     */
-    protected function openTag($tag) {
-        $name = $tag->getTagName();
-        if (! in_array($name, array_keys($this->tags))) {
-            $this->tags[$name] = array();
-        }
-        $this->tags[$name][] = $tag;
-    }
-
-    /**
-     *    Adds a tag to the page.
-     *    @param SimpleTag $tag        Tag to accept.
-     *    @access public
-     */
-    protected function acceptTag($tag) {
-        if ($tag->getTagName() == "a") {
-            $this->page->addLink($tag);
-        } elseif ($tag->getTagName() == "base") {
-            $this->page->setBase($tag->getAttribute('href'));
-        } elseif ($tag->getTagName() == "title") {
-            $this->page->setTitle($tag);
-        } elseif ($this->isFormElement($tag->getTagName())) {
-            for ($i = 0; $i < count($this->open_forms); $i++) {
-                $this->open_forms[$i]->addWidget($tag);
-            }
-            $this->last_widget = $tag;
-        }
-    }
-
-    /**
-     *    Opens a label for a described widget.
-     *    @param SimpleFormTag $tag      Tag to accept.
-     *    @access public
-     */
-    protected function acceptLabelStart($tag) {
-        $this->label = $tag;
-        unset($this->last_widget);
-    }
-
-    /**
-     *    Closes the most recently opened label.
-     *    @access public
-     */
-    protected function acceptLabelEnd() {
-        if (isset($this->label)) {
-            if (isset($this->last_widget)) {
-                $this->last_widget->setLabel($this->label->getText());
-                unset($this->last_widget);
-            } else {
-                $this->left_over_labels[] = SimpleTestCompatibility::copy($this->label);
-            }
-            unset($this->label);
-        }
-    }
-
-    /**
-     *    Tests to see if a tag is a possible form
-     *    element.
-     *    @param string $name     HTML element name.
-     *    @return boolean         True if form element.
-     *    @access private
-     */
-    protected function isFormElement($name) {
-        return in_array($name, array('input', 'button', 'textarea', 'select'));
-    }
-
-    /**
-     *    Opens a form. New widgets go here.
-     *    @param SimpleFormTag $tag      Tag to accept.
-     *    @access public
-     */
-    protected function acceptFormStart($tag) {
-        $this->open_forms[] = new SimpleForm($tag, $this->page);
-    }
-
-    /**
-     *    Closes the most recently opened form.
-     *    @access public
-     */
-    protected function acceptFormEnd() {
-        if (count($this->open_forms)) {
-            $this->complete_forms[] = array_pop($this->open_forms);
-        }
-    }
-
-    /**
-     *    Opens a frameset. A frameset may contain nested
-     *    frameset tags.
-     *    @param SimpleFramesetTag $tag      Tag to accept.
-     *    @access public
-     */
-    protected function acceptFramesetStart($tag) {
-        if (! $this->isLoadingFrames()) {
-            $this->frameset = $tag;
-        }
-        $this->frameset_nesting_level++;
-    }
-
-    /**
-     *    Closes the most recently opened frameset.
-     *    @access public
-     */
-    protected function acceptFramesetEnd() {
-        if ($this->isLoadingFrames()) {
-            $this->frameset_nesting_level--;
-        }
-    }
-
-    /**
-     *    Takes a single frame tag and stashes it in
-     *    the current frame set.
-     *    @param SimpleFrameTag $tag      Tag to accept.
-     *    @access public
-     */
-    protected function acceptFrame($tag) {
-        if ($this->isLoadingFrames()) {
-            if ($tag->getAttribute('src')) {
-                $this->loading_frames[] = $tag;
-            }
-        }
-    }
-
-    /**
-     *    Test to see if in the middle of reading
-     *    a frameset.
-     *    @return boolean        True if inframeset.
-     *    @access private
-     */
-    protected function isLoadingFrames() {
-        return $this->frameset and $this->frameset_nesting_level > 0;
-    }
-
-    /**
-     *    Marker for end of complete page. Any work in
-     *    progress can now be closed.
-     *    @access public
-     */
-    protected function acceptPageEnd() {
-        while (count($this->open_forms)) {
-            $this->complete_forms[] = array_pop($this->open_forms);
-        }
-        foreach ($this->left_over_labels as $label) {
-            for ($i = 0, $count = count($this->complete_forms); $i < $count; $i++) {
-                $this->complete_forms[$i]->attachLabelBySelector(
-                        new SimpleById($label->getFor()),
-                        $label->getText());
-            }
-        }
-        $this->page->setForms($this->complete_forms);
-        $this->page->setFrames($this->loading_frames);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/recorder.php b/3rdparty/simpletest/recorder.php
deleted file mode 100644
index b3d0d01c625..00000000000
--- a/3rdparty/simpletest/recorder.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- *	base include file for SimpleTest
- *	@package	SimpleTest
- *	@subpackage	Extensions
- *  @author Rene vd O (original code)
- *  @author Perrick Penet
- *  @author Marcus Baker
- *	@version	$Id: recorder.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-
-/**
- *	include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/scorer.php');
-
-/**
- *	A single test result.
- *	@package	SimpleTest
- *	@subpackage	Extensions
- */
-abstract class SimpleResult {
-	public $time;
-	public $breadcrumb;
-	public $message;
-
-	/**
-	 * Records the test result as public members.
-	 * @param array $breadcrumb		Test stack at the time of the event.
-	 * @param string $message       The messsage to the human.
-	 */
-	function __construct($breadcrumb, $message) {
-		list($this->time, $this->breadcrumb, $this->message) =
-				array(time(), $breadcrumb, $message);
-	}
-}
-
-/**
- *	A single pass captured for later.
- *	@package	SimpleTest
- *	@subpackage	Extensions
- */
-class SimpleResultOfPass extends SimpleResult { }
-
-/**
- *	A single failure captured for later.
- *	@package	SimpleTest
- *	@subpackage	Extensions
- */
-class SimpleResultOfFail extends SimpleResult { }
-
-/**
- *	A single exception captured for later.
- *	@package	SimpleTest
- *	@subpackage	Extensions
- */
-class SimpleResultOfException extends SimpleResult { }
-
-/**
- *    Array-based test recorder. Returns an array
- *    with timestamp, status, test name and message for each pass and failure.
- *	@package	SimpleTest
- *	@subpackage	Extensions
- */
-class Recorder extends SimpleReporterDecorator {
-    public $results = array();
-
-	/**
-	 *    Stashes the pass as a SimpleResultOfPass
-	 *    for later retrieval.
-     *    @param string $message    Pass message to be displayed
-     *    							eventually.
-	 */
-	function paintPass($message) {
-        parent::paintPass($message);
-        $this->results[] = new SimpleResultOfPass(parent::getTestList(), $message);
-	}
-
-	/**
-	 * 	  Stashes the fail as a SimpleResultOfFail
-	 * 	  for later retrieval.
-     *    @param string $message    Failure message to be displayed
-     *    							eventually.
-	 */
-	function paintFail($message) {
-        parent::paintFail($message);
-        $this->results[] = new SimpleResultOfFail(parent::getTestList(), $message);
-	}
-
-	/**
-	 * 	  Stashes the exception as a SimpleResultOfException
-	 * 	  for later retrieval.
-     *    @param string $message    Exception message to be displayed
-     *    							eventually.
-	 */
-	function paintException($message) {
-        parent::paintException($message);
-        $this->results[] = new SimpleResultOfException(parent::getTestList(), $message);
-	}
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/reflection_php4.php b/3rdparty/simpletest/reflection_php4.php
deleted file mode 100644
index 39801ea1bdb..00000000000
--- a/3rdparty/simpletest/reflection_php4.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: reflection_php4.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-
-/**
- *  Version specific reflection API.
- *  @package SimpleTest
- *  @subpackage UnitTester
- *  @ignore duplicate with reflection_php5.php
- */
-class SimpleReflection {
-    var $_interface;
-
-    /**
-     *    Stashes the class/interface.
-     *    @param string $interface    Class or interface
-     *                                to inspect.
-     */
-    function SimpleReflection($interface) {
-        $this->_interface = $interface;
-    }
-
-    /**
-     *    Checks that a class has been declared.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classExists() {
-        return class_exists($this->_interface);
-    }
-
-    /**
-     *    Needed to kill the autoload feature in PHP5
-     *    for classes created dynamically.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classExistsSansAutoload() {
-        return class_exists($this->_interface);
-    }
-
-    /**
-     *    Checks that a class or interface has been
-     *    declared.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classOrInterfaceExists() {
-        return class_exists($this->_interface);
-    }
-
-    /**
-     *    Needed to kill the autoload feature in PHP5
-     *    for classes created dynamically.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classOrInterfaceExistsSansAutoload() {
-        return class_exists($this->_interface);
-    }
-
-    /**
-     *    Gets the list of methods on a class or
-     *    interface.
-     *    @returns array          List of method names.
-     *    @access public
-     */
-    function getMethods() {
-        return get_class_methods($this->_interface);
-    }
-
-    /**
-     *    Gets the list of interfaces from a class. If the
-     *    class name is actually an interface then just that
-     *    interface is returned.
-     *    @returns array          List of interfaces.
-     *    @access public
-     */
-    function getInterfaces() {
-        return array();
-    }
-
-    /**
-     *    Finds the parent class name.
-     *    @returns string      Parent class name.
-     *    @access public
-     */
-    function getParent() {
-        return strtolower(get_parent_class($this->_interface));
-    }
-
-    /**
-     *    Determines if the class is abstract, which for PHP 4
-     *    will never be the case.
-     *    @returns boolean      True if abstract.
-     *    @access public
-     */
-    function isAbstract() {
-        return false;
-    }
-
-    /**
-     *    Determines if the the entity is an interface, which for PHP 4
-     *    will never be the case.
-     *    @returns boolean      True if interface.
-     *    @access public
-     */
-    function isInterface() {
-        return false;
-    }
-
-    /**
-     *    Scans for final methods, but as it's PHP 4 there
-     *    aren't any.
-     *    @returns boolean   True if the class has a final method.
-     *    @access public
-     */
-    function hasFinal() {
-        return false;
-    }
-
-    /**
-     *    Gets the source code matching the declaration
-     *    of a method.
-     *    @param string $method       Method name.
-     *    @access public
-     */
-    function getSignature($method) {
-        return "function &$method()";
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/reflection_php5.php b/3rdparty/simpletest/reflection_php5.php
deleted file mode 100644
index 43d8a7b287f..00000000000
--- a/3rdparty/simpletest/reflection_php5.php
+++ /dev/null
@@ -1,386 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: reflection_php5.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-
-/**
- *    Version specific reflection API.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleReflection {
-    private $interface;
-
-    /**
-     *    Stashes the class/interface.
-     *    @param string $interface    Class or interface
-     *                                to inspect.
-     */
-    function __construct($interface) {
-        $this->interface = $interface;
-    }
-
-    /**
-     *    Checks that a class has been declared. Versions
-     *    before PHP5.0.2 need a check that it's not really
-     *    an interface.
-     *    @return boolean            True if defined.
-     *    @access public
-     */
-    function classExists() {
-        if (! class_exists($this->interface)) {
-            return false;
-        }
-        $reflection = new ReflectionClass($this->interface);
-        return ! $reflection->isInterface();
-    }
-
-    /**
-     *    Needed to kill the autoload feature in PHP5
-     *    for classes created dynamically.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classExistsSansAutoload() {
-        return class_exists($this->interface, false);
-    }
-
-    /**
-     *    Checks that a class or interface has been
-     *    declared.
-     *    @return boolean            True if defined.
-     *    @access public
-     */
-    function classOrInterfaceExists() {
-        return $this->classOrInterfaceExistsWithAutoload($this->interface, true);
-    }
-
-    /**
-     *    Needed to kill the autoload feature in PHP5
-     *    for classes created dynamically.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classOrInterfaceExistsSansAutoload() {
-        return $this->classOrInterfaceExistsWithAutoload($this->interface, false);
-    }
-
-    /**
-     *    Needed to select the autoload feature in PHP5
-     *    for classes created dynamically.
-     *    @param string $interface       Class or interface name.
-     *    @param boolean $autoload       True totriggerautoload.
-     *    @return boolean                True if interface defined.
-     *    @access private
-     */
-    protected function classOrInterfaceExistsWithAutoload($interface, $autoload) {
-        if (function_exists('interface_exists')) {
-            if (interface_exists($this->interface, $autoload)) {
-                return true;
-            }
-        }
-        return class_exists($this->interface, $autoload);
-    }
-
-    /**
-     *    Gets the list of methods on a class or
-     *    interface.
-     *    @returns array              List of method names.
-     *    @access public
-     */
-    function getMethods() {
-        return array_unique(get_class_methods($this->interface));
-    }
-
-    /**
-     *    Gets the list of interfaces from a class. If the
-     *    class name is actually an interface then just that
-     *    interface is returned.
-     *    @returns array          List of interfaces.
-     *    @access public
-     */
-    function getInterfaces() {
-        $reflection = new ReflectionClass($this->interface);
-        if ($reflection->isInterface()) {
-            return array($this->interface);
-        }
-        return $this->onlyParents($reflection->getInterfaces());
-    }
-
-    /**
-     *    Gets the list of methods for the implemented
-     *    interfaces only.
-     *    @returns array      List of enforced method signatures.
-     *    @access public
-     */
-    function getInterfaceMethods() {
-        $methods = array();
-        foreach ($this->getInterfaces() as $interface) {
-            $methods = array_merge($methods, get_class_methods($interface));
-        }
-        return array_unique($methods);
-    }
-
-    /**
-     *    Checks to see if the method signature has to be tightly
-     *    specified.
-     *    @param string $method        Method name.
-     *    @returns boolean             True if enforced.
-     *    @access private
-     */
-    protected function isInterfaceMethod($method) {
-        return in_array($method, $this->getInterfaceMethods());
-    }
-
-    /**
-     *    Finds the parent class name.
-     *    @returns string      Parent class name.
-     *    @access public
-     */
-    function getParent() {
-        $reflection = new ReflectionClass($this->interface);
-        $parent = $reflection->getParentClass();
-        if ($parent) {
-            return $parent->getName();
-        }
-        return false;
-    }
-
-    /**
-     *    Trivially determines if the class is abstract.
-     *    @returns boolean      True if abstract.
-     *    @access public
-     */
-    function isAbstract() {
-        $reflection = new ReflectionClass($this->interface);
-        return $reflection->isAbstract();
-    }
-
-    /**
-     *    Trivially determines if the class is an interface.
-     *    @returns boolean      True if interface.
-     *    @access public
-     */
-    function isInterface() {
-        $reflection = new ReflectionClass($this->interface);
-        return $reflection->isInterface();
-    }
-
-    /**
-     *    Scans for final methods, as they screw up inherited
-     *    mocks by not allowing you to override them.
-     *    @returns boolean   True if the class has a final method.
-     *    @access public
-     */
-    function hasFinal() {
-        $reflection = new ReflectionClass($this->interface);
-        foreach ($reflection->getMethods() as $method) {
-            if ($method->isFinal()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Whittles a list of interfaces down to only the
-     *    necessary top level parents.
-     *    @param array $interfaces     Reflection API interfaces
-     *                                 to reduce.
-     *    @returns array               List of parent interface names.
-     *    @access private
-     */
-    protected function onlyParents($interfaces) {
-        $parents = array();
-        $blacklist = array();
-        foreach ($interfaces as $interface) {
-            foreach($interfaces as $possible_parent) {
-                if ($interface->getName() == $possible_parent->getName()) {
-                    continue;
-                }
-                if ($interface->isSubClassOf($possible_parent)) {
-                    $blacklist[$possible_parent->getName()] = true;
-                }
-            }
-            if (!isset($blacklist[$interface->getName()])) {
-                $parents[] = $interface->getName();
-            }
-        }
-        return $parents;
-    }
-
-    /**
-     * Checks whether a method is abstract or not.
-     * @param   string   $name  Method name.
-     * @return  bool            true if method is abstract, else false
-     * @access  private
-     */
-    protected function isAbstractMethod($name) {
-        $interface = new ReflectionClass($this->interface);
-        if (! $interface->hasMethod($name)) {
-            return false;
-        }
-        return $interface->getMethod($name)->isAbstract();
-    }
-
-    /**
-     * Checks whether a method is the constructor.
-     * @param   string   $name  Method name.
-     * @return  bool            true if method is the constructor
-     * @access  private
-     */
-    protected function isConstructor($name) {
-        return ($name == '__construct') || ($name == $this->interface);
-    }
-
-    /**
-     * Checks whether a method is abstract in all parents or not.
-     * @param   string   $name  Method name.
-     * @return  bool            true if method is abstract in parent, else false
-     * @access  private
-     */
-    protected function isAbstractMethodInParents($name) {
-        $interface = new ReflectionClass($this->interface);
-        $parent = $interface->getParentClass();
-        while($parent) {
-            if (! $parent->hasMethod($name)) {
-                return false;
-            }
-            if ($parent->getMethod($name)->isAbstract()) {
-                return true;
-            }
-            $parent = $parent->getParentClass();
-        }
-        return false;
-    }
-
-    /**
-     * Checks whether a method is static or not.
-     * @param   string  $name   Method name
-     * @return  bool            true if method is static, else false
-     * @access  private
-     */
-    protected function isStaticMethod($name) {
-        $interface = new ReflectionClass($this->interface);
-        if (! $interface->hasMethod($name)) {
-            return false;
-        }
-        return $interface->getMethod($name)->isStatic();
-    }
-
-    /**
-     *    Writes the source code matching the declaration
-     *    of a method.
-     *    @param string $name    Method name.
-     *    @return string         Method signature up to last
-     *                           bracket.
-     *    @access public
-     */
-    function getSignature($name) {
-        if ($name == '__set') {
-            return 'function __set($key, $value)';
-        }
-        if ($name == '__call') {
-            return 'function __call($method, $arguments)';
-        }
-        if (version_compare(phpversion(), '5.1.0', '>=')) {
-            if (in_array($name, array('__get', '__isset', $name == '__unset'))) {
-                return "function {$name}(\$key)";
-            }
-        }
-        if ($name == '__toString') {
-            return "function $name()";
-        }
-
-        // This wonky try-catch is a work around for a faulty method_exists()
-        // in early versions of PHP 5 which would return false for static
-        // methods. The Reflection classes work fine, but hasMethod()
-        // doesn't exist prior to PHP 5.1.0, so we need to use a more crude
-        // detection method.
-        try {
-            $interface = new ReflectionClass($this->interface);
-            $interface->getMethod($name);
-        } catch (ReflectionException $e) {
-            return "function $name()";
-        }
-        return $this->getFullSignature($name);
-    }
-
-    /**
-     *    For a signature specified in an interface, full
-     *    details must be replicated to be a valid implementation.
-     *    @param string $name    Method name.
-     *    @return string         Method signature up to last
-     *                           bracket.
-     *    @access private
-     */
-    protected function getFullSignature($name) {
-        $interface = new ReflectionClass($this->interface);
-        $method = $interface->getMethod($name);
-        $reference = $method->returnsReference() ? '&' : '';
-        $static = $method->isStatic() ? 'static ' : '';
-        return "{$static}function $reference$name(" .
-                implode(', ', $this->getParameterSignatures($method)) .
-                ")";
-    }
-
-    /**
-     *    Gets the source code for each parameter.
-     *    @param ReflectionMethod $method   Method object from
-     *                                      reflection API
-     *    @return array                     List of strings, each
-     *                                      a snippet of code.
-     *    @access private
-     */
-    protected function getParameterSignatures($method) {
-        $signatures = array();
-        foreach ($method->getParameters() as $parameter) {
-            $signature = '';
-            $type = $parameter->getClass();
-            if (is_null($type) && version_compare(phpversion(), '5.1.0', '>=') && $parameter->isArray()) {
-                $signature .= 'array ';
-            } elseif (!is_null($type)) {
-                $signature .= $type->getName() . ' ';
-            }
-            if ($parameter->isPassedByReference()) {
-                $signature .= '&';
-            }
-            $signature .= '$' . $this->suppressSpurious($parameter->getName());
-            if ($this->isOptional($parameter)) {
-                $signature .= ' = null';
-            }
-            $signatures[] = $signature;
-        }
-        return $signatures;
-    }
-
-    /**
-     *    The SPL library has problems with the
-     *    Reflection library. In particular, you can
-     *    get extra characters in parameter names :(.
-     *    @param string $name    Parameter name.
-     *    @return string         Cleaner name.
-     *    @access private
-     */
-    protected function suppressSpurious($name) {
-        return str_replace(array('[', ']', ' '), '', $name);
-    }
-
-    /**
-     *    Test of a reflection parameter being optional
-     *    that works with early versions of PHP5.
-     *    @param reflectionParameter $parameter    Is this optional.
-     *    @return boolean                          True if optional.
-     *    @access private
-     */
-    protected function isOptional($parameter) {
-        if (method_exists($parameter, 'isOptional')) {
-            return $parameter->isOptional();
-        }
-        return false;
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/remote.php b/3rdparty/simpletest/remote.php
deleted file mode 100644
index 4bb37b7c51b..00000000000
--- a/3rdparty/simpletest/remote.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: remote.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/browser.php');
-require_once(dirname(__FILE__) . '/xml.php');
-require_once(dirname(__FILE__) . '/test_case.php');
-/**#@-*/
-
-/**
- *    Runs an XML formated test on a remote server.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class RemoteTestCase {
-    private $url;
-    private $dry_url;
-    private $size;
-
-    /**
-     *    Sets the location of the remote test.
-     *    @param string $url       Test location.
-     *    @param string $dry_url   Location for dry run.
-     *    @access public
-     */
-    function __construct($url, $dry_url = false) {
-        $this->url = $url;
-        $this->dry_url = $dry_url ? $dry_url : $url;
-        $this->size = false;
-    }
-
-    /**
-     *    Accessor for the test name for subclasses.
-     *    @return string           Name of the test.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->url;
-    }
-
-    /**
-     *    Runs the top level test for this class. Currently
-     *    reads the data as a single chunk. I'll fix this
-     *    once I have added iteration to the browser.
-     *    @param SimpleReporter $reporter    Target of test results.
-     *    @returns boolean                   True if no failures.
-     *    @access public
-     */
-    function run($reporter) {
-        $browser = $this->createBrowser();
-        $xml = $browser->get($this->url);
-        if (! $xml) {
-            trigger_error('Cannot read remote test URL [' . $this->url . ']');
-            return false;
-        }
-        $parser = $this->createParser($reporter);
-        if (! $parser->parse($xml)) {
-            trigger_error('Cannot parse incoming XML from [' . $this->url . ']');
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     *    Creates a new web browser object for fetching
-     *    the XML report.
-     *    @return SimpleBrowser           New browser.
-     *    @access protected
-     */
-    protected function createBrowser() {
-        return new SimpleBrowser();
-    }
-
-    /**
-     *    Creates the XML parser.
-     *    @param SimpleReporter $reporter    Target of test results.
-     *    @return SimpleTestXmlListener      XML reader.
-     *    @access protected
-     */
-    protected function createParser($reporter) {
-        return new SimpleTestXmlParser($reporter);
-    }
-
-    /**
-     *    Accessor for the number of subtests.
-     *    @return integer           Number of test cases.
-     *    @access public
-     */
-    function getSize() {
-        if ($this->size === false) {
-            $browser = $this->createBrowser();
-            $xml = $browser->get($this->dry_url);
-            if (! $xml) {
-                trigger_error('Cannot read remote test URL [' . $this->dry_url . ']');
-                return false;
-            }
-            $reporter = new SimpleReporter();
-            $parser = $this->createParser($reporter);
-            if (! $parser->parse($xml)) {
-                trigger_error('Cannot parse incoming XML from [' . $this->dry_url . ']');
-                return false;
-            }
-            $this->size = $reporter->getTestCaseCount();
-        }
-        return $this->size;
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/reporter.php b/3rdparty/simpletest/reporter.php
deleted file mode 100755
index bd4f3fa41dd..00000000000
--- a/3rdparty/simpletest/reporter.php
+++ /dev/null
@@ -1,445 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: reporter.php 2005 2010-11-02 14:09:34Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/scorer.php');
-//require_once(dirname(__FILE__) . '/arguments.php');
-/**#@-*/
-
-/**
- *    Sample minimal test displayer. Generates only
- *    failure messages and a pass count.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class HtmlReporter extends SimpleReporter {
-    private $character_set;
-
-    /**
-     *    Does nothing yet. The first output will
-     *    be sent on the first test start. For use
-     *    by a web browser.
-     *    @access public
-     */
-    function __construct($character_set = 'ISO-8859-1') {
-        parent::__construct();
-        $this->character_set = $character_set;
-    }
-
-    /**
-     *    Paints the top of the web page setting the
-     *    title to the name of the starting test.
-     *    @param string $test_name      Name class of test.
-     *    @access public
-     */
-    function paintHeader($test_name) {
-        $this->sendNoCacheHeaders();
-        print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">";
-        print "<html>\n<head>\n<title>$test_name</title>\n";
-        print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=" .
-                $this->character_set . "\">\n";
-        print "<style type=\"text/css\">\n";
-        print $this->getCss() . "\n";
-        print "</style>\n";
-        print "</head>\n<body>\n";
-        print "<h1>$test_name</h1>\n";
-        flush();
-    }
-
-    /**
-     *    Send the headers necessary to ensure the page is
-     *    reloaded on every request. Otherwise you could be
-     *    scratching your head over out of date test data.
-     *    @access public
-     */
-    static function sendNoCacheHeaders() {
-        if (! headers_sent()) {
-            header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-            header("Cache-Control: no-store, no-cache, must-revalidate");
-            header("Cache-Control: post-check=0, pre-check=0", false);
-            header("Pragma: no-cache");
-        }
-    }
-
-    /**
-     *    Paints the CSS. Add additional styles here.
-     *    @return string            CSS code as text.
-     *    @access protected
-     */
-    protected function getCss() {
-        return ".fail { background-color: inherit; color: red; }" .
-                ".pass { background-color: inherit; color: green; }" .
-                " pre { background-color: lightgray; color: inherit; }";
-    }
-
-    /**
-     *    Paints the end of the test with a summary of
-     *    the passes and failures.
-     *    @param string $test_name        Name class of test.
-     *    @access public
-     */
-    function paintFooter($test_name) {
-        $colour = ($this->getFailCount() + $this->getExceptionCount() > 0 ? "red" : "green");
-        print "<div style=\"";
-        print "padding: 8px; margin-top: 1em; background-color: $colour; color: white;";
-        print "\">";
-        print $this->getTestCaseProgress() . "/" . $this->getTestCaseCount();
-        print " test cases complete:\n";
-        print "<strong>" . $this->getPassCount() . "</strong> passes, ";
-        print "<strong>" . $this->getFailCount() . "</strong> fails and ";
-        print "<strong>" . $this->getExceptionCount() . "</strong> exceptions.";
-        print "</div>\n";
-        print "</body>\n</html>\n";
-    }
-
-    /**
-     *    Paints the test failure with a breadcrumbs
-     *    trail of the nesting test suites below the
-     *    top level test.
-     *    @param string $message    Failure message displayed in
-     *                              the context of the other tests.
-     */
-    function paintFail($message) {
-        parent::paintFail($message);
-        print "<span class=\"fail\">Fail</span>: ";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print implode(" -&gt; ", $breadcrumb);
-        print " -&gt; " . $this->htmlEntities($message) . "<br />\n";
-    }
-
-    /**
-     *    Paints a PHP error.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintError($message) {
-        parent::paintError($message);
-        print "<span class=\"fail\">Exception</span>: ";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print implode(" -&gt; ", $breadcrumb);
-        print " -&gt; <strong>" . $this->htmlEntities($message) . "</strong><br />\n";
-    }
-
-    /**
-     *    Paints a PHP exception.
-     *    @param Exception $exception        Exception to display.
-     *    @access public
-     */
-    function paintException($exception) {
-        parent::paintException($exception);
-        print "<span class=\"fail\">Exception</span>: ";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print implode(" -&gt; ", $breadcrumb);
-        $message = 'Unexpected exception of type [' . get_class($exception) .
-                '] with message ['. $exception->getMessage() .
-                '] in ['. $exception->getFile() .
-                ' line ' . $exception->getLine() . ']';
-        print " -&gt; <strong>" . $this->htmlEntities($message) . "</strong><br />\n";
-    }
-
-    /**
-     *    Prints the message for skipping tests.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) {
-        parent::paintSkip($message);
-        print "<span class=\"pass\">Skipped</span>: ";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print implode(" -&gt; ", $breadcrumb);
-        print " -&gt; " . $this->htmlEntities($message) . "<br />\n";
-    }
-
-    /**
-     *    Paints formatted text such as dumped privateiables.
-     *    @param string $message        Text to show.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-        print '<pre>' . $this->htmlEntities($message) . '</pre>';
-    }
-
-    /**
-     *    Character set adjusted entity conversion.
-     *    @param string $message    Plain text or Unicode message.
-     *    @return string            Browser readable message.
-     *    @access protected
-     */
-    protected function htmlEntities($message) {
-        return htmlentities($message, ENT_COMPAT, $this->character_set);
-    }
-}
-
-/**
- *    Sample minimal test displayer. Generates only
- *    failure messages and a pass count. For command
- *    line use. I've tried to make it look like JUnit,
- *    but I wanted to output the errors as they arrived
- *    which meant dropping the dots.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class TextReporter extends SimpleReporter {
-
-    /**
-     *    Does nothing yet. The first output will
-     *    be sent on the first test start.
-     */
-    function __construct() {
-        parent::__construct();
-    }
-
-    /**
-     *    Paints the title only.
-     *    @param string $test_name        Name class of test.
-     *    @access public
-     */
-    function paintHeader($test_name) {
-        if (! SimpleReporter::inCli()) {
-            header('Content-type: text/plain');
-        }
-        print "$test_name\n";
-        flush();
-    }
-
-    /**
-     *    Paints the end of the test with a summary of
-     *    the passes and failures.
-     *    @param string $test_name        Name class of test.
-     *    @access public
-     */
-    function paintFooter($test_name) {
-        if ($this->getFailCount() + $this->getExceptionCount() == 0) {
-            print "OK\n";
-        } else {
-            print "FAILURES!!!\n";
-        }
-        print "Test cases run: " . $this->getTestCaseProgress() .
-                "/" . $this->getTestCaseCount() .
-                ", Passes: " . $this->getPassCount() .
-                ", Failures: " . $this->getFailCount() .
-                ", Exceptions: " . $this->getExceptionCount() . "\n";
-    }
-
-    /**
-     *    Paints the test failure as a stack trace.
-     *    @param string $message    Failure message displayed in
-     *                              the context of the other tests.
-     *    @access public
-     */
-    function paintFail($message) {
-        parent::paintFail($message);
-        print $this->getFailCount() . ") $message\n";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
-        print "\n";
-    }
-
-    /**
-     *    Paints a PHP error or exception.
-     *    @param string $message        Message to be shown.
-     *    @access public
-     *    @abstract
-     */
-    function paintError($message) {
-        parent::paintError($message);
-        print "Exception " . $this->getExceptionCount() . "!\n$message\n";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
-        print "\n";
-    }
-
-    /**
-     *    Paints a PHP error or exception.
-     *    @param Exception $exception      Exception to describe.
-     *    @access public
-     *    @abstract
-     */
-    function paintException($exception) {
-        parent::paintException($exception);
-        $message = 'Unexpected exception of type [' . get_class($exception) .
-                '] with message ['. $exception->getMessage() .
-                '] in ['. $exception->getFile() .
-                ' line ' . $exception->getLine() . ']';
-        print "Exception " . $this->getExceptionCount() . "!\n$message\n";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
-        print "\n";
-    }
-
-    /**
-     *    Prints the message for skipping tests.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) {
-        parent::paintSkip($message);
-        print "Skip: $message\n";
-    }
-
-    /**
-     *    Paints formatted text such as dumped privateiables.
-     *    @param string $message        Text to show.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-        print "$message\n";
-        flush();
-    }
-}
-
-/**
- *    Runs just a single test group, a single case or
- *    even a single test within that case.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SelectiveReporter extends SimpleReporterDecorator {
-    private $just_this_case = false;
-    private $just_this_test = false;
-    private $on;
-
-    /**
-     *    Selects the test case or group to be run,
-     *    and optionally a specific test.
-     *    @param SimpleScorer $reporter    Reporter to receive events.
-     *    @param string $just_this_case    Only this case or group will run.
-     *    @param string $just_this_test    Only this test method will run.
-     */
-    function __construct($reporter, $just_this_case = false, $just_this_test = false) {
-        if (isset($just_this_case) && $just_this_case) {
-            $this->just_this_case = strtolower($just_this_case);
-            $this->off();
-        } else {
-            $this->on();
-        }
-        if (isset($just_this_test) && $just_this_test) {
-            $this->just_this_test = strtolower($just_this_test);
-        }
-        parent::__construct($reporter);
-    }
-
-    /**
-     *    Compares criteria to actual the case/group name.
-     *    @param string $test_case    The incoming test.
-     *    @return boolean             True if matched.
-     *    @access protected
-     */
-    protected function matchesTestCase($test_case) {
-        return $this->just_this_case == strtolower($test_case);
-    }
-
-    /**
-     *    Compares criteria to actual the test name. If no
-     *    name was specified at the beginning, then all tests
-     *    can run.
-     *    @param string $method       The incoming test method.
-     *    @return boolean             True if matched.
-     *    @access protected
-     */
-    protected function shouldRunTest($test_case, $method) {
-        if ($this->isOn() || $this->matchesTestCase($test_case)) {
-            if ($this->just_this_test) {
-                return $this->just_this_test == strtolower($method);
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Switch on testing for the group or subgroup.
-     *    @access private
-     */
-    protected function on() {
-        $this->on = true;
-    }
-
-    /**
-     *    Switch off testing for the group or subgroup.
-     *    @access private
-     */
-    protected function off() {
-        $this->on = false;
-    }
-
-    /**
-     *    Is this group actually being tested?
-     *    @return boolean     True if the current test group is active.
-     *    @access private
-     */
-    protected function isOn() {
-        return $this->on;
-    }
-
-    /**
-     *    Veto everything that doesn't match the method wanted.
-     *    @param string $test_case       Name of test case.
-     *    @param string $method          Name of test method.
-     *    @return boolean                True if test should be run.
-     *    @access public
-     */
-    function shouldInvoke($test_case, $method) {
-        if ($this->shouldRunTest($test_case, $method)) {
-            return $this->reporter->shouldInvoke($test_case, $method);
-        }
-        return false;
-    }
-
-    /**
-     *    Paints the start of a group test.
-     *    @param string $test_case     Name of test or other label.
-     *    @param integer $size         Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_case, $size) {
-        if ($this->just_this_case && $this->matchesTestCase($test_case)) {
-            $this->on();
-        }
-        $this->reporter->paintGroupStart($test_case, $size);
-    }
-
-    /**
-     *    Paints the end of a group test.
-     *    @param string $test_case     Name of test or other label.
-     *    @access public
-     */
-    function paintGroupEnd($test_case) {
-        $this->reporter->paintGroupEnd($test_case);
-        if ($this->just_this_case && $this->matchesTestCase($test_case)) {
-            $this->off();
-        }
-    }
-}
-
-/**
- *    Suppresses skip messages.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NoSkipsReporter extends SimpleReporterDecorator {
-
-    /**
-     *    Does nothing.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) { }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/scorer.php b/3rdparty/simpletest/scorer.php
deleted file mode 100644
index 27776f4b631..00000000000
--- a/3rdparty/simpletest/scorer.php
+++ /dev/null
@@ -1,875 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: scorer.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-
-/**#@+*/
-require_once(dirname(__FILE__) . '/invoker.php');
-/**#@-*/
-
-/**
- *    Can receive test events and display them. Display
- *    is achieved by making display methods available
- *    and visiting the incoming event.
- *    @package SimpleTest
- *    @subpackage UnitTester
- *    @abstract
- */
-class SimpleScorer {
-    private $passes;
-    private $fails;
-    private $exceptions;
-    private $is_dry_run;
-
-    /**
-     *    Starts the test run with no results.
-     *    @access public
-     */
-    function __construct() {
-        $this->passes = 0;
-        $this->fails = 0;
-        $this->exceptions = 0;
-        $this->is_dry_run = false;
-    }
-
-    /**
-     *    Signals that the next evaluation will be a dry
-     *    run. That is, the structure events will be
-     *    recorded, but no tests will be run.
-     *    @param boolean $is_dry        Dry run if true.
-     *    @access public
-     */
-    function makeDry($is_dry = true) {
-        $this->is_dry_run = $is_dry;
-    }
-
-    /**
-     *    The reporter has a veto on what should be run.
-     *    @param string $test_case_name  name of test case.
-     *    @param string $method          Name of test method.
-     *    @access public
-     */
-    function shouldInvoke($test_case_name, $method) {
-        return ! $this->is_dry_run;
-    }
-
-    /**
-     *    Can wrap the invoker in preperation for running
-     *    a test.
-     *    @param SimpleInvoker $invoker   Individual test runner.
-     *    @return SimpleInvoker           Wrapped test runner.
-     *    @access public
-     */
-    function createInvoker($invoker) {
-        return $invoker;
-    }
-
-    /**
-     *    Accessor for current status. Will be false
-     *    if there have been any failures or exceptions.
-     *    Used for command line tools.
-     *    @return boolean        True if no failures.
-     *    @access public
-     */
-    function getStatus() {
-        if ($this->exceptions + $this->fails > 0) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     *    Paints the start of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @param integer $size         Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_name, $size) {
-    }
-
-    /**
-     *    Paints the end of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintGroupEnd($test_name) {
-    }
-
-    /**
-     *    Paints the start of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseStart($test_name) {
-    }
-
-    /**
-     *    Paints the end of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseEnd($test_name) {
-    }
-
-    /**
-     *    Paints the start of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodStart($test_name) {
-    }
-
-    /**
-     *    Paints the end of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodEnd($test_name) {
-    }
-
-    /**
-     *    Increments the pass count.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintPass($message) {
-        $this->passes++;
-    }
-
-    /**
-     *    Increments the fail count.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintFail($message) {
-        $this->fails++;
-    }
-
-    /**
-     *    Deals with PHP 4 throwing an error.
-     *    @param string $message    Text of error formatted by
-     *                              the test case.
-     *    @access public
-     */
-    function paintError($message) {
-        $this->exceptions++;
-    }
-
-    /**
-     *    Deals with PHP 5 throwing an exception.
-     *    @param Exception $exception    The actual exception thrown.
-     *    @access public
-     */
-    function paintException($exception) {
-        $this->exceptions++;
-    }
-
-    /**
-     *    Prints the message for skipping tests.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) {
-    }
-
-    /**
-     *    Accessor for the number of passes so far.
-     *    @return integer       Number of passes.
-     *    @access public
-     */
-    function getPassCount() {
-        return $this->passes;
-    }
-
-    /**
-     *    Accessor for the number of fails so far.
-     *    @return integer       Number of fails.
-     *    @access public
-     */
-    function getFailCount() {
-        return $this->fails;
-    }
-
-    /**
-     *    Accessor for the number of untrapped errors
-     *    so far.
-     *    @return integer       Number of exceptions.
-     *    @access public
-     */
-    function getExceptionCount() {
-        return $this->exceptions;
-    }
-
-    /**
-     *    Paints a simple supplementary message.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintMessage($message) {
-    }
-
-    /**
-     *    Paints a formatted ASCII message such as a
-     *    privateiable dump.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-    }
-
-    /**
-     *    By default just ignores user generated events.
-     *    @param string $type        Event type as text.
-     *    @param mixed $payload      Message or object.
-     *    @access public
-     */
-    function paintSignal($type, $payload) {
-    }
-}
-
-/**
- *    Recipient of generated test messages that can display
- *    page footers and headers. Also keeps track of the
- *    test nesting. This is the main base class on which
- *    to build the finished test (page based) displays.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleReporter extends SimpleScorer {
-    private $test_stack;
-    private $size;
-    private $progress;
-
-    /**
-     *    Starts the display with no results in.
-     *    @access public
-     */
-    function __construct() {
-        parent::__construct();
-        $this->test_stack = array();
-        $this->size = null;
-        $this->progress = 0;
-    }
-
-    /**
-     *    Gets the formatter for small generic data items.
-     *    @return SimpleDumper          Formatter.
-     *    @access public
-     */
-    function getDumper() {
-        return new SimpleDumper();
-    }
-
-    /**
-     *    Paints the start of a group test. Will also paint
-     *    the page header and footer if this is the
-     *    first test. Will stash the size if the first
-     *    start.
-     *    @param string $test_name   Name of test that is starting.
-     *    @param integer $size       Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_name, $size) {
-        if (! isset($this->size)) {
-            $this->size = $size;
-        }
-        if (count($this->test_stack) == 0) {
-            $this->paintHeader($test_name);
-        }
-        $this->test_stack[] = $test_name;
-    }
-
-    /**
-     *    Paints the end of a group test. Will paint the page
-     *    footer if the stack of tests has unwound.
-     *    @param string $test_name   Name of test that is ending.
-     *    @param integer $progress   Number of test cases ending.
-     *    @access public
-     */
-    function paintGroupEnd($test_name) {
-        array_pop($this->test_stack);
-        if (count($this->test_stack) == 0) {
-            $this->paintFooter($test_name);
-        }
-    }
-
-    /**
-     *    Paints the start of a test case. Will also paint
-     *    the page header and footer if this is the
-     *    first test. Will stash the size if the first
-     *    start.
-     *    @param string $test_name   Name of test that is starting.
-     *    @access public
-     */
-    function paintCaseStart($test_name) {
-        if (! isset($this->size)) {
-            $this->size = 1;
-        }
-        if (count($this->test_stack) == 0) {
-            $this->paintHeader($test_name);
-        }
-        $this->test_stack[] = $test_name;
-    }
-
-    /**
-     *    Paints the end of a test case. Will paint the page
-     *    footer if the stack of tests has unwound.
-     *    @param string $test_name   Name of test that is ending.
-     *    @access public
-     */
-    function paintCaseEnd($test_name) {
-        $this->progress++;
-        array_pop($this->test_stack);
-        if (count($this->test_stack) == 0) {
-            $this->paintFooter($test_name);
-        }
-    }
-
-    /**
-     *    Paints the start of a test method.
-     *    @param string $test_name   Name of test that is starting.
-     *    @access public
-     */
-    function paintMethodStart($test_name) {
-        $this->test_stack[] = $test_name;
-    }
-
-    /**
-     *    Paints the end of a test method. Will paint the page
-     *    footer if the stack of tests has unwound.
-     *    @param string $test_name   Name of test that is ending.
-     *    @access public
-     */
-    function paintMethodEnd($test_name) {
-        array_pop($this->test_stack);
-    }
-
-    /**
-     *    Paints the test document header.
-     *    @param string $test_name     First test top level
-     *                                 to start.
-     *    @access public
-     *    @abstract
-     */
-    function paintHeader($test_name) {
-    }
-
-    /**
-     *    Paints the test document footer.
-     *    @param string $test_name        The top level test.
-     *    @access public
-     *    @abstract
-     */
-    function paintFooter($test_name) {
-    }
-
-    /**
-     *    Accessor for internal test stack. For
-     *    subclasses that need to see the whole test
-     *    history for display purposes.
-     *    @return array     List of methods in nesting order.
-     *    @access public
-     */
-    function getTestList() {
-        return $this->test_stack;
-    }
-
-    /**
-     *    Accessor for total test size in number
-     *    of test cases. Null until the first
-     *    test is started.
-     *    @return integer   Total number of cases at start.
-     *    @access public
-     */
-    function getTestCaseCount() {
-        return $this->size;
-    }
-
-    /**
-     *    Accessor for the number of test cases
-     *    completed so far.
-     *    @return integer   Number of ended cases.
-     *    @access public
-     */
-    function getTestCaseProgress() {
-        return $this->progress;
-    }
-
-    /**
-     *    Static check for running in the comand line.
-     *    @return boolean        True if CLI.
-     *    @access public
-     */
-    static function inCli() {
-        return php_sapi_name() == 'cli';
-    }
-}
-
-/**
- *    For modifying the behaviour of the visual reporters.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleReporterDecorator {
-    protected $reporter;
-
-    /**
-     *    Mediates between the reporter and the test case.
-     *    @param SimpleScorer $reporter       Reporter to receive events.
-     */
-    function __construct($reporter) {
-        $this->reporter = $reporter;
-    }
-
-    /**
-     *    Signals that the next evaluation will be a dry
-     *    run. That is, the structure events will be
-     *    recorded, but no tests will be run.
-     *    @param boolean $is_dry        Dry run if true.
-     *    @access public
-     */
-    function makeDry($is_dry = true) {
-        $this->reporter->makeDry($is_dry);
-    }
-
-    /**
-     *    Accessor for current status. Will be false
-     *    if there have been any failures or exceptions.
-     *    Used for command line tools.
-     *    @return boolean        True if no failures.
-     *    @access public
-     */
-    function getStatus() {
-        return $this->reporter->getStatus();
-    }
-
-    /**
-     *    The nesting of the test cases so far. Not
-     *    all reporters have this facility.
-     *    @return array        Test list if accessible.
-     *    @access public
-     */
-    function getTestList() {
-        if (method_exists($this->reporter, 'getTestList')) {
-            return $this->reporter->getTestList();
-        } else {
-            return array();
-        }
-    }
-
-    /**
-     *    The reporter has a veto on what should be run.
-     *    @param string $test_case_name  Name of test case.
-     *    @param string $method          Name of test method.
-     *    @return boolean                True if test should be run.
-     *    @access public
-     */
-    function shouldInvoke($test_case_name, $method) {
-        return $this->reporter->shouldInvoke($test_case_name, $method);
-    }
-
-    /**
-     *    Can wrap the invoker in preparation for running
-     *    a test.
-     *    @param SimpleInvoker $invoker   Individual test runner.
-     *    @return SimpleInvoker           Wrapped test runner.
-     *    @access public
-     */
-    function createInvoker($invoker) {
-        return $this->reporter->createInvoker($invoker);
-    }
-
-    /**
-     *    Gets the formatter for privateiables and other small
-     *    generic data items.
-     *    @return SimpleDumper          Formatter.
-     *    @access public
-     */
-    function getDumper() {
-        return $this->reporter->getDumper();
-    }
-
-    /**
-     *    Paints the start of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @param integer $size         Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_name, $size) {
-        $this->reporter->paintGroupStart($test_name, $size);
-    }
-
-    /**
-     *    Paints the end of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintGroupEnd($test_name) {
-        $this->reporter->paintGroupEnd($test_name);
-    }
-
-    /**
-     *    Paints the start of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseStart($test_name) {
-        $this->reporter->paintCaseStart($test_name);
-    }
-
-    /**
-     *    Paints the end of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseEnd($test_name) {
-        $this->reporter->paintCaseEnd($test_name);
-    }
-
-    /**
-     *    Paints the start of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodStart($test_name) {
-        $this->reporter->paintMethodStart($test_name);
-    }
-
-    /**
-     *    Paints the end of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodEnd($test_name) {
-        $this->reporter->paintMethodEnd($test_name);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintPass($message) {
-        $this->reporter->paintPass($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintFail($message) {
-        $this->reporter->paintFail($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message    Text of error formatted by
-     *                              the test case.
-     *    @access public
-     */
-    function paintError($message) {
-        $this->reporter->paintError($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param Exception $exception        Exception to show.
-     *    @access public
-     */
-    function paintException($exception) {
-        $this->reporter->paintException($exception);
-    }
-
-    /**
-     *    Prints the message for skipping tests.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) {
-        $this->reporter->paintSkip($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintMessage($message) {
-        $this->reporter->paintMessage($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-        $this->reporter->paintFormattedMessage($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $type        Event type as text.
-     *    @param mixed $payload      Message or object.
-     *    @return boolean            Should return false if this
-     *                               type of signal should fail the
-     *                               test suite.
-     *    @access public
-     */
-    function paintSignal($type, $payload) {
-        $this->reporter->paintSignal($type, $payload);
-    }
-}
-
-/**
- *    For sending messages to multiple reporters at
- *    the same time.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class MultipleReporter {
-    private $reporters = array();
-
-    /**
-     *    Adds a reporter to the subscriber list.
-     *    @param SimpleScorer $reporter     Reporter to receive events.
-     *    @access public
-     */
-    function attachReporter($reporter) {
-        $this->reporters[] = $reporter;
-    }
-
-    /**
-     *    Signals that the next evaluation will be a dry
-     *    run. That is, the structure events will be
-     *    recorded, but no tests will be run.
-     *    @param boolean $is_dry        Dry run if true.
-     *    @access public
-     */
-    function makeDry($is_dry = true) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            $this->reporters[$i]->makeDry($is_dry);
-        }
-    }
-
-    /**
-     *    Accessor for current status. Will be false
-     *    if there have been any failures or exceptions.
-     *    If any reporter reports a failure, the whole
-     *    suite fails.
-     *    @return boolean        True if no failures.
-     *    @access public
-     */
-    function getStatus() {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            if (! $this->reporters[$i]->getStatus()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    The reporter has a veto on what should be run.
-     *    It requires all reporters to want to run the method.
-     *    @param string $test_case_name  name of test case.
-     *    @param string $method          Name of test method.
-     *    @access public
-     */
-    function shouldInvoke($test_case_name, $method) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            if (! $this->reporters[$i]->shouldInvoke($test_case_name, $method)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    Every reporter gets a chance to wrap the invoker.
-     *    @param SimpleInvoker $invoker   Individual test runner.
-     *    @return SimpleInvoker           Wrapped test runner.
-     *    @access public
-     */
-    function createInvoker($invoker) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            $invoker = $this->reporters[$i]->createInvoker($invoker);
-        }
-        return $invoker;
-    }
-
-    /**
-     *    Gets the formatter for privateiables and other small
-     *    generic data items.
-     *    @return SimpleDumper          Formatter.
-     *    @access public
-     */
-    function getDumper() {
-        return new SimpleDumper();
-    }
-
-    /**
-     *    Paints the start of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @param integer $size         Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_name, $size) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            $this->reporters[$i]->paintGroupStart($test_name, $size);
-        }
-    }
-
-    /**
-     *    Paints the end of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintGroupEnd($test_name) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            $this->reporters[$i]->paintGroupEnd($test_name);
-        }
-    }
-
-    /**
-     *    Paints the start of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseStart($test_name) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            $this->reporters[$i]->paintCaseStart($test_name);
-        }
-    }
-
-    /**
-     *    Paints the end of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseEnd($test_name) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            $this->reporters[$i]->paintCaseEnd($test_name);
-        }
-    }
-
-    /**
-     *    Paints the start of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodStart($test_name) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            $this->reporters[$i]->paintMethodStart($test_name);
-        }
-    }
-
-    /**
-     *    Paints the end of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodEnd($test_name) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            $this->reporters[$i]->paintMethodEnd($test_name);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintPass($message) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            $this->reporters[$i]->paintPass($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintFail($message) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            $this->reporters[$i]->paintFail($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message    Text of error formatted by
-     *                              the test case.
-     *    @access public
-     */
-    function paintError($message) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            $this->reporters[$i]->paintError($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param Exception $exception    Exception to display.
-     *    @access public
-     */
-    function paintException($exception) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            $this->reporters[$i]->paintException($exception);
-        }
-    }
-
-    /**
-     *    Prints the message for skipping tests.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            $this->reporters[$i]->paintSkip($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintMessage($message) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            $this->reporters[$i]->paintMessage($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            $this->reporters[$i]->paintFormattedMessage($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $type        Event type as text.
-     *    @param mixed $payload      Message or object.
-     *    @return boolean            Should return false if this
-     *                               type of signal should fail the
-     *                               test suite.
-     *    @access public
-     */
-    function paintSignal($type, $payload) {
-        for ($i = 0; $i < count($this->reporters); $i++) {
-            $this->reporters[$i]->paintSignal($type, $payload);
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/selector.php b/3rdparty/simpletest/selector.php
deleted file mode 100755
index ba2fed312a8..00000000000
--- a/3rdparty/simpletest/selector.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest.
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: selector.php 1786 2008-04-26 17:32:20Z pp11 $
- */
-
-/**#@+
- * include SimpleTest files
- */
-require_once(dirname(__FILE__) . '/tag.php');
-require_once(dirname(__FILE__) . '/encoding.php');
-/**#@-*/
-
-/**
- *    Used to extract form elements for testing against.
- *    Searches by name attribute.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleByName {
-    private $name;
-
-    /**
-     *    Stashes the name for later comparison.
-     *    @param string $name     Name attribute to match.
-     */
-    function __construct($name) {
-        $this->name = $name;
-    }
-
-    /**
-     *  Accessor for name.
-     *  @returns string $name       Name to match.
-     */
-    function getName() {
-        return $this->name;
-    }
-
-    /**
-     *    Compares with name attribute of widget.
-     *    @param SimpleWidget $widget    Control to compare.
-     *    @access public
-     */
-    function isMatch($widget) {
-        return ($widget->getName() == $this->name);
-    }
-}
-
-/**
- *    Used to extract form elements for testing against.
- *    Searches by visible label or alt text.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleByLabel {
-    private $label;
-
-    /**
-     *    Stashes the name for later comparison.
-     *    @param string $label     Visible text to match.
-     */
-    function __construct($label) {
-        $this->label = $label;
-    }
-
-    /**
-     *    Comparison. Compares visible text of widget or
-     *    related label.
-     *    @param SimpleWidget $widget    Control to compare.
-     *    @access public
-     */
-    function isMatch($widget) {
-        if (! method_exists($widget, 'isLabel')) {
-            return false;
-        }
-        return $widget->isLabel($this->label);
-    }
-}
-
-/**
- *    Used to extract form elements for testing against.
- *    Searches dy id attribute.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleById {
-    private $id;
-
-    /**
-     *    Stashes the name for later comparison.
-     *    @param string $id     ID atribute to match.
-     */
-    function __construct($id) {
-        $this->id = $id;
-    }
-
-    /**
-     *    Comparison. Compares id attribute of widget.
-     *    @param SimpleWidget $widget    Control to compare.
-     *    @access public
-     */
-    function isMatch($widget) {
-        return $widget->isId($this->id);
-    }
-}
-
-/**
- *    Used to extract form elements for testing against.
- *    Searches by visible label, name or alt text.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleByLabelOrName {
-    private $label;
-
-    /**
-     *    Stashes the name/label for later comparison.
-     *    @param string $label     Visible text to match.
-     */
-    function __construct($label) {
-        $this->label = $label;
-    }
-
-    /**
-     *    Comparison. Compares visible text of widget or
-     *    related label or name.
-     *    @param SimpleWidget $widget    Control to compare.
-     *    @access public
-     */
-    function isMatch($widget) {
-        if (method_exists($widget, 'isLabel')) {
-            if ($widget->isLabel($this->label)) {
-                return true;
-            }
-        }
-        return ($widget->getName() == $this->label);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/shell_tester.php b/3rdparty/simpletest/shell_tester.php
deleted file mode 100644
index 9a3bd389eeb..00000000000
--- a/3rdparty/simpletest/shell_tester.php
+++ /dev/null
@@ -1,330 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: shell_tester.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/test_case.php');
-/**#@-*/
-
-/**
- *    Wrapper for exec() functionality.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleShell {
-    private $output;
-
-    /**
-     *    Executes the shell comand and stashes the output.
-     *    @access public
-     */
-    function __construct() {
-        $this->output = false;
-    }
-
-    /**
-     *    Actually runs the command. Does not trap the
-     *    error stream output as this need PHP 4.3+.
-     *    @param string $command    The actual command line
-     *                              to run.
-     *    @return integer           Exit code.
-     *    @access public
-     */
-    function execute($command) {
-        $this->output = false;
-        exec($command, $this->output, $ret);
-        return $ret;
-    }
-
-    /**
-     *    Accessor for the last output.
-     *    @return string        Output as text.
-     *    @access public
-     */
-    function getOutput() {
-        return implode("\n", $this->output);
-    }
-
-    /**
-     *    Accessor for the last output.
-     *    @return array         Output as array of lines.
-     *    @access public
-     */
-    function getOutputAsList() {
-        return $this->output;
-    }
-}
-
-/**
- *    Test case for testing of command line scripts and
- *    utilities. Usually scripts that are external to the
- *    PHP code, but support it in some way.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class ShellTestCase extends SimpleTestCase {
-    private $current_shell;
-    private $last_status;
-    private $last_command;
-
-    /**
-     *    Creates an empty test case. Should be subclassed
-     *    with test methods for a functional test case.
-     *    @param string $label     Name of test case. Will use
-     *                             the class name if none specified.
-     *    @access public
-     */
-    function __construct($label = false) {
-        parent::__construct($label);
-        $this->current_shell = $this->createShell();
-        $this->last_status = false;
-        $this->last_command = '';
-    }
-
-    /**
-     *    Executes a command and buffers the results.
-     *    @param string $command     Command to run.
-     *    @return boolean            True if zero exit code.
-     *    @access public
-     */
-    function execute($command) {
-        $shell = $this->getShell();
-        $this->last_status = $shell->execute($command);
-        $this->last_command = $command;
-        return ($this->last_status === 0);
-    }
-
-    /**
-     *    Dumps the output of the last command.
-     *    @access public
-     */
-    function dumpOutput() {
-        $this->dump($this->getOutput());
-    }
-
-    /**
-     *    Accessor for the last output.
-     *    @return string        Output as text.
-     *    @access public
-     */
-    function getOutput() {
-        $shell = $this->getShell();
-        return $shell->getOutput();
-    }
-
-    /**
-     *    Accessor for the last output.
-     *    @return array         Output as array of lines.
-     *    @access public
-     */
-    function getOutputAsList() {
-        $shell = $this->getShell();
-        return $shell->getOutputAsList();
-    }
-
-    /**
-     *    Called from within the test methods to register
-     *    passes and failures.
-     *    @param boolean $result    Pass on true.
-     *    @param string $message    Message to display describing
-     *                              the test state.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertTrue($result, $message = false) {
-        return $this->assert(new TrueExpectation(), $result, $message);
-    }
-
-    /**
-     *    Will be true on false and vice versa. False
-     *    is the PHP definition of false, so that null,
-     *    empty strings, zero and an empty array all count
-     *    as false.
-     *    @param boolean $result    Pass on false.
-     *    @param string $message    Message to display.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertFalse($result, $message = '%s') {
-        return $this->assert(new FalseExpectation(), $result, $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    the same value only. Otherwise a fail. This
-     *    is for testing hand extracted text, etc.
-     *    @param mixed $first          Value to compare.
-     *    @param mixed $second         Value to compare.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass
-     *    @access public
-     */
-    function assertEqual($first, $second, $message = "%s") {
-        return $this->assert(
-                new EqualExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    a different value. Otherwise a fail. This
-     *    is for testing hand extracted text, etc.
-     *    @param mixed $first           Value to compare.
-     *    @param mixed $second          Value to compare.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertNotEqual($first, $second, $message = "%s") {
-        return $this->assert(
-                new NotEqualExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Tests the last status code from the shell.
-     *    @param integer $status   Expected status of last
-     *                             command.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertExitCode($status, $message = "%s") {
-        $message = sprintf($message, "Expected status code of [$status] from [" .
-                $this->last_command . "], but got [" .
-                $this->last_status . "]");
-        return $this->assertTrue($status === $this->last_status, $message);
-    }
-
-    /**
-     *    Attempt to exactly match the combined STDERR and
-     *    STDOUT output.
-     *    @param string $expected  Expected output.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertOutput($expected, $message = "%s") {
-        $shell = $this->getShell();
-        return $this->assert(
-                new EqualExpectation($expected),
-                $shell->getOutput(),
-                $message);
-    }
-
-    /**
-     *    Scans the output for a Perl regex. If found
-     *    anywhere it passes, else it fails.
-     *    @param string $pattern    Regex to search for.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertOutputPattern($pattern, $message = "%s") {
-        $shell = $this->getShell();
-        return $this->assert(
-                new PatternExpectation($pattern),
-                $shell->getOutput(),
-                $message);
-    }
-
-    /**
-     *    If a Perl regex is found anywhere in the current
-     *    output then a failure is generated, else a pass.
-     *    @param string $pattern    Regex to search for.
-     *    @param $message           Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertNoOutputPattern($pattern, $message = "%s") {
-        $shell = $this->getShell();
-        return $this->assert(
-                new NoPatternExpectation($pattern),
-                $shell->getOutput(),
-                $message);
-    }
-
-    /**
-     *    File existence check.
-     *    @param string $path      Full filename and path.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertFileExists($path, $message = "%s") {
-        $message = sprintf($message, "File [$path] should exist");
-        return $this->assertTrue(file_exists($path), $message);
-    }
-
-    /**
-     *    File non-existence check.
-     *    @param string $path      Full filename and path.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertFileNotExists($path, $message = "%s") {
-        $message = sprintf($message, "File [$path] should not exist");
-        return $this->assertFalse(file_exists($path), $message);
-    }
-
-    /**
-     *    Scans a file for a Perl regex. If found
-     *    anywhere it passes, else it fails.
-     *    @param string $pattern    Regex to search for.
-     *    @param string $path       Full filename and path.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertFilePattern($pattern, $path, $message = "%s") {
-        return $this->assert(
-                new PatternExpectation($pattern),
-                implode('', file($path)),
-                $message);
-    }
-
-    /**
-     *    If a Perl regex is found anywhere in the named
-     *    file then a failure is generated, else a pass.
-     *    @param string $pattern    Regex to search for.
-     *    @param string $path       Full filename and path.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertNoFilePattern($pattern, $path, $message = "%s") {
-        return $this->assert(
-                new NoPatternExpectation($pattern),
-                implode('', file($path)),
-                $message);
-    }
-
-    /**
-     *    Accessor for current shell. Used for testing the
-     *    the tester itself.
-     *    @return Shell        Current shell.
-     *    @access protected
-     */
-    protected function getShell() {
-        return $this->current_shell;
-    }
-
-    /**
-     *    Factory for the shell to run the command on.
-     *    @return Shell        New shell object.
-     *    @access protected
-     */
-    protected function createShell() {
-        return new SimpleShell();
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/simpletest.php b/3rdparty/simpletest/simpletest.php
deleted file mode 100644
index 425c869a825..00000000000
--- a/3rdparty/simpletest/simpletest.php
+++ /dev/null
@@ -1,391 +0,0 @@
-<?php
-/**
- *  Global state for SimpleTest and kicker script in future versions.
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: simpletest.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-
-/**#@+
- * include SimpleTest files
- */
-require_once(dirname(__FILE__) . '/reflection_php5.php');
-require_once(dirname(__FILE__) . '/default_reporter.php');
-require_once(dirname(__FILE__) . '/compatibility.php');
-/**#@-*/
-
-/**
- *    Registry and test context. Includes a few
- *    global options that I'm slowly getting rid of.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleTest {
-
-    /**
-     *    Reads the SimpleTest version from the release file.
-     *    @return string        Version string.
-     */
-    static function getVersion() {
-        $content = file(dirname(__FILE__) . '/VERSION');
-        return trim($content[0]);
-    }
-
-    /**
-     *    Sets the name of a test case to ignore, usually
-     *    because the class is an abstract case that should
-     *    @param string $class        Add a class to ignore.
-     */
-    static function ignore($class) {
-        $registry = &SimpleTest::getRegistry();
-        $registry['IgnoreList'][strtolower($class)] = true;
-    }
-
-    /**
-     *    Scans the now complete ignore list, and adds
-     *    all parent classes to the list. If a class
-     *    is not a runnable test case, then it's parents
-     *    wouldn't be either. This is syntactic sugar
-     *    to cut down on ommissions of ignore()'s or
-     *    missing abstract declarations. This cannot
-     *    be done whilst loading classes wiithout forcing
-     *    a particular order on the class declarations and
-     *    the ignore() calls. It's just nice to have the ignore()
-     *    calls at the top of the file before the actual declarations.
-     *    @param array $classes     Class names of interest.
-     */
-    static function ignoreParentsIfIgnored($classes) {
-        $registry = &SimpleTest::getRegistry();
-        foreach ($classes as $class) {
-            if (SimpleTest::isIgnored($class)) {
-                $reflection = new SimpleReflection($class);
-                if ($parent = $reflection->getParent()) {
-                    SimpleTest::ignore($parent);
-                }
-            }
-        }
-    }
-
-    /**
-     *   Puts the object to the global pool of 'preferred' objects
-     *   which can be retrieved with SimpleTest :: preferred() method.
-     *   Instances of the same class are overwritten.
-     *   @param object $object      Preferred object
-     *   @see preferred()
-     */
-    static function prefer($object) {
-        $registry = &SimpleTest::getRegistry();
-        $registry['Preferred'][] = $object;
-    }
-
-    /**
-     *   Retrieves 'preferred' objects from global pool. Class filter
-     *   can be applied in order to retrieve the object of the specific
-     *   class
-     *   @param array|string $classes       Allowed classes or interfaces.
-     *   @return array|object|null
-     *   @see prefer()
-     */
-    static function preferred($classes) {
-        if (! is_array($classes)) {
-            $classes = array($classes);
-        }
-        $registry = &SimpleTest::getRegistry();
-        for ($i = count($registry['Preferred']) - 1; $i >= 0; $i--) {
-            foreach ($classes as $class) {
-                if (SimpleTestCompatibility::isA($registry['Preferred'][$i], $class)) {
-                    return $registry['Preferred'][$i];
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     *    Test to see if a test case is in the ignore
-     *    list. Quite obviously the ignore list should
-     *    be a separate object and will be one day.
-     *    This method is internal to SimpleTest. Don't
-     *    use it.
-     *    @param string $class        Class name to test.
-     *    @return boolean             True if should not be run.
-     */
-    static function isIgnored($class) {
-        $registry = &SimpleTest::getRegistry();
-        return isset($registry['IgnoreList'][strtolower($class)]);
-    }
-
-    /**
-     *    Sets proxy to use on all requests for when
-     *    testing from behind a firewall. Set host
-     *    to false to disable. This will take effect
-     *    if there are no other proxy settings.
-     *    @param string $proxy     Proxy host as URL.
-     *    @param string $username  Proxy username for authentication.
-     *    @param string $password  Proxy password for authentication.
-     */
-    static function useProxy($proxy, $username = false, $password = false) {
-        $registry = &SimpleTest::getRegistry();
-        $registry['DefaultProxy'] = $proxy;
-        $registry['DefaultProxyUsername'] = $username;
-        $registry['DefaultProxyPassword'] = $password;
-    }
-
-    /**
-     *    Accessor for default proxy host.
-     *    @return string       Proxy URL.
-     */
-    static function getDefaultProxy() {
-        $registry = &SimpleTest::getRegistry();
-        return $registry['DefaultProxy'];
-    }
-
-    /**
-     *    Accessor for default proxy username.
-     *    @return string    Proxy username for authentication.
-     */
-    static function getDefaultProxyUsername() {
-        $registry = &SimpleTest::getRegistry();
-        return $registry['DefaultProxyUsername'];
-    }
-
-    /**
-     *    Accessor for default proxy password.
-     *    @return string    Proxy password for authentication.
-     */
-    static function getDefaultProxyPassword() {
-        $registry = &SimpleTest::getRegistry();
-        return $registry['DefaultProxyPassword'];
-    }
-
-    /**
-     *    Accessor for default HTML parsers.
-     *    @return array     List of parsers to try in
-     *                      order until one responds true
-     *                      to can().
-     */
-    static function getParsers() {
-        $registry = &SimpleTest::getRegistry();
-        return $registry['Parsers'];
-    }
-
-    /**
-     *    Set the list of HTML parsers to attempt to use by default.
-     *    @param array $parsers    List of parsers to try in
-     *                             order until one responds true
-     *                             to can().
-     */
-    static function setParsers($parsers) {
-        $registry = &SimpleTest::getRegistry();
-        $registry['Parsers'] = $parsers;
-    }
-
-    /**
-     *    Accessor for global registry of options.
-     *    @return hash           All stored values.
-     */
-    protected static function &getRegistry() {
-        static $registry = false;
-        if (! $registry) {
-            $registry = SimpleTest::getDefaults();
-        }
-        return $registry;
-    }
-
-    /**
-     *    Accessor for the context of the current
-     *    test run.
-     *    @return SimpleTestContext    Current test run.
-     */
-    static function getContext() {
-        static $context = false;
-        if (! $context) {
-            $context = new SimpleTestContext();
-        }
-        return $context;
-    }
-
-    /**
-     *    Constant default values.
-     *    @return hash       All registry defaults.
-     */
-    protected static function getDefaults() {
-        return array(
-                'Parsers' => false,
-                'MockBaseClass' => 'SimpleMock',
-                'IgnoreList' => array(),
-                'DefaultProxy' => false,
-                'DefaultProxyUsername' => false,
-                'DefaultProxyPassword' => false,
-                'Preferred' => array(new HtmlReporter(), new TextReporter(), new XmlReporter()));
-    }
-
-    /**
-     *    @deprecated
-     */
-    static function setMockBaseClass($mock_base) {
-        $registry = &SimpleTest::getRegistry();
-        $registry['MockBaseClass'] = $mock_base;
-    }
-
-    /**
-     *    @deprecated
-     */
-    static function getMockBaseClass() {
-        $registry = &SimpleTest::getRegistry();
-        return $registry['MockBaseClass'];
-    }
-}
-
-/**
- *    Container for all components for a specific
- *    test run. Makes things like error queues
- *    available to PHP event handlers, and also
- *    gets around some nasty reference issues in
- *    the mocks.
- *    @package  SimpleTest
- */
-class SimpleTestContext {
-    private $test;
-    private $reporter;
-    private $resources;
-
-    /**
-     *    Clears down the current context.
-     *    @access public
-     */
-    function clear() {
-        $this->resources = array();
-    }
-
-    /**
-     *    Sets the current test case instance. This
-     *    global instance can be used by the mock objects
-     *    to send message to the test cases.
-     *    @param SimpleTestCase $test        Test case to register.
-     */
-    function setTest($test) {
-        $this->clear();
-        $this->test = $test;
-    }
-
-    /**
-     *    Accessor for currently running test case.
-     *    @return SimpleTestCase    Current test.
-     */
-    function getTest() {
-        return $this->test;
-    }
-
-    /**
-     *    Sets the current reporter. This
-     *    global instance can be used by the mock objects
-     *    to send messages.
-     *    @param SimpleReporter $reporter     Reporter to register.
-     */
-    function setReporter($reporter) {
-        $this->clear();
-        $this->reporter = $reporter;
-    }
-
-    /**
-     *    Accessor for current reporter.
-     *    @return SimpleReporter    Current reporter.
-     */
-    function getReporter() {
-        return $this->reporter;
-    }
-
-    /**
-     *    Accessor for the Singleton resource.
-     *    @return object       Global resource.
-     */
-    function get($resource) {
-        if (! isset($this->resources[$resource])) {
-            $this->resources[$resource] = new $resource();
-        }
-        return $this->resources[$resource];
-    }
-}
-
-/**
- *    Interrogates the stack trace to recover the
- *    failure point.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleStackTrace {
-    private $prefixes;
-
-    /**
-     *    Stashes the list of target prefixes.
-     *    @param array $prefixes      List of method prefixes
-     *                                to search for.
-     */
-    function __construct($prefixes) {
-        $this->prefixes = $prefixes;
-    }
-
-    /**
-     *    Extracts the last method name that was not within
-     *    Simpletest itself. Captures a stack trace if none given.
-     *    @param array $stack      List of stack frames.
-     *    @return string           Snippet of test report with line
-     *                             number and file.
-     */
-    function traceMethod($stack = false) {
-        $stack = $stack ? $stack : $this->captureTrace();
-        foreach ($stack as $frame) {
-            if ($this->frameLiesWithinSimpleTestFolder($frame)) {
-                continue;
-            }
-            if ($this->frameMatchesPrefix($frame)) {
-                return ' at [' . $frame['file'] . ' line ' . $frame['line'] . ']';
-            }
-        }
-        return '';
-    }
-
-    /**
-     *    Test to see if error is generated by SimpleTest itself.
-     *    @param array $frame     PHP stack frame.
-     *    @return boolean         True if a SimpleTest file.
-     */
-    protected function frameLiesWithinSimpleTestFolder($frame) {
-        if (isset($frame['file'])) {
-            $path = substr(SIMPLE_TEST, 0, -1);
-            if (strpos($frame['file'], $path) === 0) {
-                if (dirname($frame['file']) == $path) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Tries to determine if the method call is an assert, etc.
-     *    @param array $frame     PHP stack frame.
-     *    @return boolean         True if matches a target.
-     */
-    protected function frameMatchesPrefix($frame) {
-        foreach ($this->prefixes as $prefix) {
-            if (strncmp($frame['function'], $prefix, strlen($prefix)) == 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Grabs a current stack trace.
-     *    @return array        Fulle trace.
-     */
-    protected function captureTrace() {
-        if (function_exists('debug_backtrace')) {
-            return array_reverse(debug_backtrace());
-        }
-        return array();
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/socket.php b/3rdparty/simpletest/socket.php
deleted file mode 100755
index 06e8ca62d00..00000000000
--- a/3rdparty/simpletest/socket.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage MockObjects
- *  @version    $Id: socket.php 1953 2009-09-20 01:26:25Z jsweat $
- */
-
-/**#@+
- * include SimpleTest files
- */
-require_once(dirname(__FILE__) . '/compatibility.php');
-/**#@-*/
-
-/**
- *    Stashes an error for later. Useful for constructors
- *    until PHP gets exceptions.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleStickyError {
-    private $error = 'Constructor not chained';
-
-    /**
-     *    Sets the error to empty.
-     *    @access public
-     */
-    function __construct() {
-        $this->clearError();
-    }
-
-    /**
-     *    Test for an outstanding error.
-     *    @return boolean           True if there is an error.
-     *    @access public
-     */
-    function isError() {
-        return ($this->error != '');
-    }
-
-    /**
-     *    Accessor for an outstanding error.
-     *    @return string     Empty string if no error otherwise
-     *                       the error message.
-     *    @access public
-     */
-    function getError() {
-        return $this->error;
-    }
-
-    /**
-     *    Sets the internal error.
-     *    @param string       Error message to stash.
-     *    @access protected
-     */
-    function setError($error) {
-        $this->error = $error;
-    }
-
-    /**
-     *    Resets the error state to no error.
-     *    @access protected
-     */
-    function clearError() {
-        $this->setError('');
-    }
-}
-
-/**
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleFileSocket extends SimpleStickyError {
-    private $handle;
-    private $is_open = false;
-    private $sent = '';
-    private $block_size;
-
-    /**
-     *    Opens a socket for reading and writing.
-     *    @param SimpleUrl $file       Target URI to fetch.
-     *    @param integer $block_size   Size of chunk to read.
-     *    @access public
-     */
-    function __construct($file, $block_size = 1024) {
-        parent::__construct();
-        if (! ($this->handle = $this->openFile($file, $error))) {
-            $file_string = $file->asString();
-            $this->setError("Cannot open [$file_string] with [$error]");
-            return;
-        }
-        $this->is_open = true;
-        $this->block_size = $block_size;
-    }
-
-    /**
-     *    Writes some data to the socket and saves alocal copy.
-     *    @param string $message       String to send to socket.
-     *    @return boolean              True if successful.
-     *    @access public
-     */
-    function write($message) {
-        return true;
-    }
-
-    /**
-     *    Reads data from the socket. The error suppresion
-     *    is a workaround for PHP4 always throwing a warning
-     *    with a secure socket.
-     *    @return integer/boolean           Incoming bytes. False
-     *                                     on error.
-     *    @access public
-     */
-    function read() {
-        $raw = @fread($this->handle, $this->block_size);
-        if ($raw === false) {
-            $this->setError('Cannot read from socket');
-            $this->close();
-        }
-        return $raw;
-    }
-
-    /**
-     *    Accessor for socket open state.
-     *    @return boolean           True if open.
-     *    @access public
-     */
-    function isOpen() {
-        return $this->is_open;
-    }
-
-    /**
-     *    Closes the socket preventing further reads.
-     *    Cannot be reopened once closed.
-     *    @return boolean           True if successful.
-     *    @access public
-     */
-    function close() {
-        if (!$this->is_open) return false;
-        $this->is_open = false;
-        return fclose($this->handle);
-    }
-
-    /**
-     *    Accessor for content so far.
-     *    @return string        Bytes sent only.
-     *    @access public
-     */
-    function getSent() {
-        return $this->sent;
-    }
-
-    /**
-     *    Actually opens the low level socket.
-     *    @param SimpleUrl $file       SimpleUrl file target.
-     *    @param string $error         Recipient of error message.
-     *    @param integer $timeout      Maximum time to wait for connection.
-     *    @access protected
-     */
-    protected function openFile($file, &$error) {
-        return @fopen($file->asString(), 'r');
-    }
-}
-
-/**
- *    Wrapper for TCP/IP socket.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleSocket extends SimpleStickyError {
-    private $handle;
-    private $is_open = false;
-    private $sent = '';
-    private $lock_size;
-
-    /**
-     *    Opens a socket for reading and writing.
-     *    @param string $host          Hostname to send request to.
-     *    @param integer $port         Port on remote machine to open.
-     *    @param integer $timeout      Connection timeout in seconds.
-     *    @param integer $block_size   Size of chunk to read.
-     *    @access public
-     */
-    function __construct($host, $port, $timeout, $block_size = 255) {
-        parent::__construct();
-        if (! ($this->handle = $this->openSocket($host, $port, $error_number, $error, $timeout))) {
-            $this->setError("Cannot open [$host:$port] with [$error] within [$timeout] seconds");
-            return;
-        }
-        $this->is_open = true;
-        $this->block_size = $block_size;
-        SimpleTestCompatibility::setTimeout($this->handle, $timeout);
-    }
-
-    /**
-     *    Writes some data to the socket and saves alocal copy.
-     *    @param string $message       String to send to socket.
-     *    @return boolean              True if successful.
-     *    @access public
-     */
-    function write($message) {
-        if ($this->isError() || ! $this->isOpen()) {
-            return false;
-        }
-        $count = fwrite($this->handle, $message);
-        if (! $count) {
-            if ($count === false) {
-                $this->setError('Cannot write to socket');
-                $this->close();
-            }
-            return false;
-        }
-        fflush($this->handle);
-        $this->sent .= $message;
-        return true;
-    }
-
-    /**
-     *    Reads data from the socket. The error suppresion
-     *    is a workaround for PHP4 always throwing a warning
-     *    with a secure socket.
-     *    @return integer/boolean           Incoming bytes. False
-     *                                     on error.
-     *    @access public
-     */
-    function read() {
-        if ($this->isError() || ! $this->isOpen()) {
-            return false;
-        }
-        $raw = @fread($this->handle, $this->block_size);
-        if ($raw === false) {
-            $this->setError('Cannot read from socket');
-            $this->close();
-        }
-        return $raw;
-    }
-
-    /**
-     *    Accessor for socket open state.
-     *    @return boolean           True if open.
-     *    @access public
-     */
-    function isOpen() {
-        return $this->is_open;
-    }
-
-    /**
-     *    Closes the socket preventing further reads.
-     *    Cannot be reopened once closed.
-     *    @return boolean           True if successful.
-     *    @access public
-     */
-    function close() {
-        $this->is_open = false;
-        return fclose($this->handle);
-    }
-
-    /**
-     *    Accessor for content so far.
-     *    @return string        Bytes sent only.
-     *    @access public
-     */
-    function getSent() {
-        return $this->sent;
-    }
-
-    /**
-     *    Actually opens the low level socket.
-     *    @param string $host          Host to connect to.
-     *    @param integer $port         Port on host.
-     *    @param integer $error_number Recipient of error code.
-     *    @param string $error         Recipoent of error message.
-     *    @param integer $timeout      Maximum time to wait for connection.
-     *    @access protected
-     */
-    protected function openSocket($host, $port, &$error_number, &$error, $timeout) {
-        return @fsockopen($host, $port, $error_number, $error, $timeout);
-    }
-}
-
-/**
- *    Wrapper for TCP/IP socket over TLS.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleSecureSocket extends SimpleSocket {
-
-    /**
-     *    Opens a secure socket for reading and writing.
-     *    @param string $host      Hostname to send request to.
-     *    @param integer $port     Port on remote machine to open.
-     *    @param integer $timeout  Connection timeout in seconds.
-     *    @access public
-     */
-    function __construct($host, $port, $timeout) {
-        parent::__construct($host, $port, $timeout);
-    }
-
-    /**
-     *    Actually opens the low level socket.
-     *    @param string $host          Host to connect to.
-     *    @param integer $port         Port on host.
-     *    @param integer $error_number Recipient of error code.
-     *    @param string $error         Recipient of error message.
-     *    @param integer $timeout      Maximum time to wait for connection.
-     *    @access protected
-     */
-    function openSocket($host, $port, &$error_number, &$error, $timeout) {
-        return parent::openSocket("tls://$host", $port, $error_number, $error, $timeout);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/tag.php b/3rdparty/simpletest/tag.php
deleted file mode 100644
index afe649ec5dd..00000000000
--- a/3rdparty/simpletest/tag.php
+++ /dev/null
@@ -1,1527 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest.
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: tag.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-
-/**#@+
- * include SimpleTest files
- */
-require_once(dirname(__FILE__) . '/page.php');
-require_once(dirname(__FILE__) . '/encoding.php');
-/**#@-*/
-
-/**
- *    Creates tags and widgets given HTML tag
- *    attributes.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTagBuilder {
-
-    /**
-     *    Factory for the tag objects. Creates the
-     *    appropriate tag object for the incoming tag name
-     *    and attributes.
-     *    @param string $name        HTML tag name.
-     *    @param hash $attributes    Element attributes.
-     *    @return SimpleTag          Tag object.
-     *    @access public
-     */
-    function createTag($name, $attributes) {
-        static $map = array(
-                'a' => 'SimpleAnchorTag',
-                'title' => 'SimpleTitleTag',
-                'base' => 'SimpleBaseTag',
-                'button' => 'SimpleButtonTag',
-                'textarea' => 'SimpleTextAreaTag',
-                'option' => 'SimpleOptionTag',
-                'label' => 'SimpleLabelTag',
-                'form' => 'SimpleFormTag',
-                'frame' => 'SimpleFrameTag');
-        $attributes = $this->keysToLowerCase($attributes);
-        if (array_key_exists($name, $map)) {
-            $tag_class = $map[$name];
-            return new $tag_class($attributes);
-        } elseif ($name == 'select') {
-            return $this->createSelectionTag($attributes);
-        } elseif ($name == 'input') {
-            return $this->createInputTag($attributes);
-        }
-        return new SimpleTag($name, $attributes);
-    }
-
-    /**
-     *    Factory for selection fields.
-     *    @param hash $attributes    Element attributes.
-     *    @return SimpleTag          Tag object.
-     *    @access protected
-     */
-    protected function createSelectionTag($attributes) {
-        if (isset($attributes['multiple'])) {
-            return new MultipleSelectionTag($attributes);
-        }
-        return new SimpleSelectionTag($attributes);
-    }
-
-    /**
-     *    Factory for input tags.
-     *    @param hash $attributes    Element attributes.
-     *    @return SimpleTag          Tag object.
-     *    @access protected
-     */
-    protected function createInputTag($attributes) {
-        if (! isset($attributes['type'])) {
-            return new SimpleTextTag($attributes);
-        }
-        $type = strtolower(trim($attributes['type']));
-        $map = array(
-                'submit' => 'SimpleSubmitTag',
-                'image' => 'SimpleImageSubmitTag',
-                'checkbox' => 'SimpleCheckboxTag',
-                'radio' => 'SimpleRadioButtonTag',
-                'text' => 'SimpleTextTag',
-                'hidden' => 'SimpleTextTag',
-                'password' => 'SimpleTextTag',
-                'file' => 'SimpleUploadTag');
-        if (array_key_exists($type, $map)) {
-            $tag_class = $map[$type];
-            return new $tag_class($attributes);
-        }
-        return false;
-    }
-
-    /**
-     *    Make the keys lower case for case insensitive look-ups.
-     *    @param hash $map   Hash to convert.
-     *    @return hash       Unchanged values, but keys lower case.
-     *    @access private
-     */
-    protected function keysToLowerCase($map) {
-        $lower = array();
-        foreach ($map as $key => $value) {
-            $lower[strtolower($key)] = $value;
-        }
-        return $lower;
-    }
-}
-
-/**
- *    HTML or XML tag.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTag {
-    private $name;
-    private $attributes;
-    private $content;
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param string $name        Tag name.
-     *    @param hash $attributes    Attribute names and
-     *                               string values. Note that
-     *                               the keys must have been
-     *                               converted to lower case.
-     */
-    function __construct($name, $attributes) {
-        $this->name = strtolower(trim($name));
-        $this->attributes = $attributes;
-        $this->content = '';
-    }
-
-    /**
-     *    Check to see if the tag can have both start and
-     *    end tags with content in between.
-     *    @return boolean        True if content allowed.
-     *    @access public
-     */
-    function expectEndTag() {
-        return true;
-    }
-
-    /**
-     *    The current tag should not swallow all content for
-     *    itself as it's searchable page content. Private
-     *    content tags are usually widgets that contain default
-     *    values.
-     *    @return boolean        False as content is available
-     *                           to other tags by default.
-     *    @access public
-     */
-    function isPrivateContent() {
-        return false;
-    }
-
-    /**
-     *    Appends string content to the current content.
-     *    @param string $content        Additional text.
-     *    @access public
-     */
-    function addContent($content) {
-        $this->content .= (string)$content;
-        return $this;
-    }
-
-    /**
-     *    Adds an enclosed tag to the content.
-     *    @param SimpleTag $tag    New tag.
-     *    @access public
-     */
-    function addTag($tag) {
-    }
-
-    /**
-     *    Adds multiple enclosed tags to the content.
-     *    @param array            List of SimpleTag objects to be added.
-     */
-    function addTags($tags) {
-        foreach ($tags as $tag) {
-            $this->addTag($tag);
-        }
-    }
-
-    /**
-     *    Accessor for tag name.
-     *    @return string       Name of tag.
-     *    @access public
-     */
-    function getTagName() {
-        return $this->name;
-    }
-
-    /**
-     *    List of legal child elements.
-     *    @return array        List of element names.
-     *    @access public
-     */
-    function getChildElements() {
-        return array();
-    }
-
-    /**
-     *    Accessor for an attribute.
-     *    @param string $label    Attribute name.
-     *    @return string          Attribute value.
-     *    @access public
-     */
-    function getAttribute($label) {
-        $label = strtolower($label);
-        if (! isset($this->attributes[$label])) {
-            return false;
-        }
-        return (string)$this->attributes[$label];
-    }
-
-    /**
-     *    Sets an attribute.
-     *    @param string $label    Attribute name.
-     *    @return string $value   New attribute value.
-     *    @access protected
-     */
-    protected function setAttribute($label, $value) {
-        $this->attributes[strtolower($label)] = $value;
-    }
-
-    /**
-     *    Accessor for the whole content so far.
-     *    @return string       Content as big raw string.
-     *    @access public
-     */
-    function getContent() {
-        return $this->content;
-    }
-
-    /**
-     *    Accessor for content reduced to visible text. Acts
-     *    like a text mode browser, normalising space and
-     *    reducing images to their alt text.
-     *    @return string       Content as plain text.
-     *    @access public
-     */
-    function getText() {
-        return SimplePage::normalise($this->content);
-    }
-
-    /**
-     *    Test to see if id attribute matches.
-     *    @param string $id        ID to test against.
-     *    @return boolean          True on match.
-     *    @access public
-     */
-    function isId($id) {
-        return ($this->getAttribute('id') == $id);
-    }
-}
-
-/**
- *    Base url.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleBaseTag extends SimpleTag {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function __construct($attributes) {
-        parent::__construct('base', $attributes);
-    }
-
-    /**
-     *    Base tag is not a block tag.
-     *    @return boolean       false
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-}
-
-/**
- *    Page title.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTitleTag extends SimpleTag {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function __construct($attributes) {
-        parent::__construct('title', $attributes);
-    }
-}
-
-/**
- *    Link.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleAnchorTag extends SimpleTag {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function __construct($attributes) {
-        parent::__construct('a', $attributes);
-    }
-
-    /**
-     *    Accessor for URL as string.
-     *    @return string    Coerced as string.
-     *    @access public
-     */
-    function getHref() {
-        $url = $this->getAttribute('href');
-        if (is_bool($url)) {
-            $url = '';
-        }
-        return $url;
-    }
-}
-
-/**
- *    Form element.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleWidget extends SimpleTag {
-    private $value;
-    private $label;
-    private $is_set;
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param string $name        Tag name.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function __construct($name, $attributes) {
-        parent::__construct($name, $attributes);
-        $this->value = false;
-        $this->label = false;
-        $this->is_set = false;
-    }
-
-    /**
-     *    Accessor for name submitted as the key in
-     *    GET/POST privateiables hash.
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getName() {
-        return $this->getAttribute('name');
-    }
-
-    /**
-     *    Accessor for default value parsed with the tag.
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getDefault() {
-        return $this->getAttribute('value');
-    }
-
-    /**
-     *    Accessor for currently set value or default if
-     *    none.
-     *    @return string      Value set by form or default
-     *                        if none.
-     *    @access public
-     */
-    function getValue() {
-        if (! $this->is_set) {
-            return $this->getDefault();
-        }
-        return $this->value;
-    }
-
-    /**
-     *    Sets the current form element value.
-     *    @param string $value       New value.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        $this->value = $value;
-        $this->is_set = true;
-        return true;
-    }
-
-    /**
-     *    Resets the form element value back to the
-     *    default.
-     *    @access public
-     */
-    function resetValue() {
-        $this->is_set = false;
-    }
-
-    /**
-     *    Allows setting of a label externally, say by a
-     *    label tag.
-     *    @param string $label    Label to attach.
-     *    @access public
-     */
-    function setLabel($label) {
-        $this->label = trim($label);
-        return $this;
-    }
-
-    /**
-     *    Reads external or internal label.
-     *    @param string $label    Label to test.
-     *    @return boolean         True is match.
-     *    @access public
-     */
-    function isLabel($label) {
-        return $this->label == trim($label);
-    }
-
-    /**
-     *    Dispatches the value into the form encoded packet.
-     *    @param SimpleEncoding $encoding    Form packet.
-     *    @access public
-     */
-    function write($encoding) {
-        if ($this->getName()) {
-            $encoding->add($this->getName(), $this->getValue());
-        }
-    }
-}
-
-/**
- *    Text, password and hidden field.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTextTag extends SimpleWidget {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function __construct($attributes) {
-        parent::__construct('input', $attributes);
-        if ($this->getAttribute('value') === false) {
-            $this->setAttribute('value', '');
-        }
-    }
-
-    /**
-     *    Tag contains no content.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-
-    /**
-     *    Sets the current form element value. Cannot
-     *    change the value of a hidden field.
-     *    @param string $value       New value.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        if ($this->getAttribute('type') == 'hidden') {
-            return false;
-        }
-        return parent::setValue($value);
-    }
-}
-
-/**
- *    Submit button as input tag.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleSubmitTag extends SimpleWidget {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function __construct($attributes) {
-        parent::__construct('input', $attributes);
-        if ($this->getAttribute('value') === false) {
-            $this->setAttribute('value', 'Submit');
-        }
-    }
-
-    /**
-     *    Tag contains no end element.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-
-    /**
-     *    Disables the setting of the button value.
-     *    @param string $value       Ignored.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        return false;
-    }
-
-    /**
-     *    Value of browser visible text.
-     *    @return string        Visible label.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->getValue();
-    }
-
-    /**
-     *    Test for a label match when searching.
-     *    @param string $label     Label to test.
-     *    @return boolean          True on match.
-     *    @access public
-     */
-    function isLabel($label) {
-        return trim($label) == trim($this->getLabel());
-    }
-}
-
-/**
- *    Image button as input tag.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleImageSubmitTag extends SimpleWidget {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function __construct($attributes) {
-        parent::__construct('input', $attributes);
-    }
-
-    /**
-     *    Tag contains no end element.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-
-    /**
-     *    Disables the setting of the button value.
-     *    @param string $value       Ignored.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        return false;
-    }
-
-    /**
-     *    Value of browser visible text.
-     *    @return string        Visible label.
-     *    @access public
-     */
-    function getLabel() {
-        if ($this->getAttribute('title')) {
-            return $this->getAttribute('title');
-        }
-        return $this->getAttribute('alt');
-    }
-
-    /**
-     *    Test for a label match when searching.
-     *    @param string $label     Label to test.
-     *    @return boolean          True on match.
-     *    @access public
-     */
-    function isLabel($label) {
-        return trim($label) == trim($this->getLabel());
-    }
-
-    /**
-     *    Dispatches the value into the form encoded packet.
-     *    @param SimpleEncoding $encoding    Form packet.
-     *    @param integer $x                  X coordinate of click.
-     *    @param integer $y                  Y coordinate of click.
-     *    @access public
-     */
-    function write($encoding, $x = 1, $y = 1) {
-        if ($this->getName()) {
-            $encoding->add($this->getName() . '.x', $x);
-            $encoding->add($this->getName() . '.y', $y);
-        } else {
-            $encoding->add('x', $x);
-            $encoding->add('y', $y);
-        }
-    }
-}
-
-/**
- *    Submit button as button tag.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleButtonTag extends SimpleWidget {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    Defaults are very browser dependent.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function __construct($attributes) {
-        parent::__construct('button', $attributes);
-    }
-
-    /**
-     *    Check to see if the tag can have both start and
-     *    end tags with content in between.
-     *    @return boolean        True if content allowed.
-     *    @access public
-     */
-    function expectEndTag() {
-        return true;
-    }
-
-    /**
-     *    Disables the setting of the button value.
-     *    @param string $value       Ignored.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        return false;
-    }
-
-    /**
-     *    Value of browser visible text.
-     *    @return string        Visible label.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->getContent();
-    }
-
-    /**
-     *    Test for a label match when searching.
-     *    @param string $label     Label to test.
-     *    @return boolean          True on match.
-     *    @access public
-     */
-    function isLabel($label) {
-        return trim($label) == trim($this->getLabel());
-    }
-}
-
-/**
- *    Content tag for text area.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTextAreaTag extends SimpleWidget {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function __construct($attributes) {
-        parent::__construct('textarea', $attributes);
-    }
-
-    /**
-     *    Accessor for starting value.
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getDefault() {
-        return $this->wrap(html_entity_decode($this->getContent(), ENT_QUOTES));
-    }
-
-    /**
-     *    Applies word wrapping if needed.
-     *    @param string $value      New value.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        return parent::setValue($this->wrap($value));
-    }
-
-    /**
-     *    Test to see if text should be wrapped.
-     *    @return boolean        True if wrapping on.
-     *    @access private
-     */
-    function wrapIsEnabled() {
-        if ($this->getAttribute('cols')) {
-            $wrap = $this->getAttribute('wrap');
-            if (($wrap == 'physical') || ($wrap == 'hard')) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Performs the formatting that is peculiar to
-     *    this tag. There is strange behaviour in this
-     *    one, including stripping a leading new line.
-     *    Go figure. I am using Firefox as a guide.
-     *    @param string $text    Text to wrap.
-     *    @return string         Text wrapped with carriage
-     *                           returns and line feeds
-     *    @access private
-     */
-    protected function wrap($text) {
-        $text = str_replace("\r\r\n", "\r\n", str_replace("\n", "\r\n", $text));
-        $text = str_replace("\r\n\n", "\r\n", str_replace("\r", "\r\n", $text));
-        if (strncmp($text, "\r\n", strlen("\r\n")) == 0) {
-            $text = substr($text, strlen("\r\n"));
-        }
-        if ($this->wrapIsEnabled()) {
-            return wordwrap(
-                    $text,
-                    (integer)$this->getAttribute('cols'),
-                    "\r\n");
-        }
-        return $text;
-    }
-
-    /**
-     *    The content of textarea is not part of the page.
-     *    @return boolean        True.
-     *    @access public
-     */
-    function isPrivateContent() {
-        return true;
-    }
-}
-
-/**
- *    File upload widget.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleUploadTag extends SimpleWidget {
-
-    /**
-     *    Starts with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function __construct($attributes) {
-        parent::__construct('input', $attributes);
-    }
-
-    /**
-     *    Tag contains no content.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-
-    /**
-     *    Dispatches the value into the form encoded packet.
-     *    @param SimpleEncoding $encoding    Form packet.
-     *    @access public
-     */
-    function write($encoding) {
-        if (! file_exists($this->getValue())) {
-            return;
-        }
-        $encoding->attach(
-                $this->getName(),
-                implode('', file($this->getValue())),
-                basename($this->getValue()));
-    }
-}
-
-/**
- *    Drop down widget.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleSelectionTag extends SimpleWidget {
-    private $options;
-    private $choice;
-
-    /**
-     *    Starts with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function __construct($attributes) {
-        parent::__construct('select', $attributes);
-        $this->options = array();
-        $this->choice = false;
-    }
-
-    /**
-     *    Adds an option tag to a selection field.
-     *    @param SimpleOptionTag $tag     New option.
-     *    @access public
-     */
-    function addTag($tag) {
-        if ($tag->getTagName() == 'option') {
-            $this->options[] = $tag;
-        }
-    }
-
-    /**
-     *    Text within the selection element is ignored.
-     *    @param string $content        Ignored.
-     *    @access public
-     */
-    function addContent($content) {
-        return $this;
-    }
-
-    /**
-     *    Scans options for defaults. If none, then
-     *    the first option is selected.
-     *    @return string        Selected field.
-     *    @access public
-     */
-    function getDefault() {
-        for ($i = 0, $count = count($this->options); $i < $count; $i++) {
-            if ($this->options[$i]->getAttribute('selected') !== false) {
-                return $this->options[$i]->getDefault();
-            }
-        }
-        if ($count > 0) {
-            return $this->options[0]->getDefault();
-        }
-        return '';
-    }
-
-    /**
-     *    Can only set allowed values.
-     *    @param string $value       New choice.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        for ($i = 0, $count = count($this->options); $i < $count; $i++) {
-            if ($this->options[$i]->isValue($value)) {
-                $this->choice = $i;
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for current selection value.
-     *    @return string      Value attribute or
-     *                        content of opton.
-     *    @access public
-     */
-    function getValue() {
-        if ($this->choice === false) {
-            return $this->getDefault();
-        }
-        return $this->options[$this->choice]->getValue();
-    }
-}
-
-/**
- *    Drop down widget.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class MultipleSelectionTag extends SimpleWidget {
-    private $options;
-    private $values;
-
-    /**
-     *    Starts with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function __construct($attributes) {
-        parent::__construct('select', $attributes);
-        $this->options = array();
-        $this->values = false;
-    }
-
-    /**
-     *    Adds an option tag to a selection field.
-     *    @param SimpleOptionTag $tag     New option.
-     *    @access public
-     */
-    function addTag($tag) {
-        if ($tag->getTagName() == 'option') {
-            $this->options[] = &$tag;
-        }
-    }
-
-    /**
-     *    Text within the selection element is ignored.
-     *    @param string $content        Ignored.
-     *    @access public
-     */
-    function addContent($content) {
-        return $this;
-    }
-
-    /**
-     *    Scans options for defaults to populate the
-     *    value array().
-     *    @return array        Selected fields.
-     *    @access public
-     */
-    function getDefault() {
-        $default = array();
-        for ($i = 0, $count = count($this->options); $i < $count; $i++) {
-            if ($this->options[$i]->getAttribute('selected') !== false) {
-                $default[] = $this->options[$i]->getDefault();
-            }
-        }
-        return $default;
-    }
-
-    /**
-     *    Can only set allowed values. Any illegal value
-     *    will result in a failure, but all correct values
-     *    will be set.
-     *    @param array $desired      New choices.
-     *    @return boolean            True if all allowed.
-     *    @access public
-     */
-    function setValue($desired) {
-        $achieved = array();
-        foreach ($desired as $value) {
-            $success = false;
-            for ($i = 0, $count = count($this->options); $i < $count; $i++) {
-                if ($this->options[$i]->isValue($value)) {
-                    $achieved[] = $this->options[$i]->getValue();
-                    $success = true;
-                    break;
-                }
-            }
-            if (! $success) {
-                return false;
-            }
-        }
-        $this->values = $achieved;
-        return true;
-    }
-
-    /**
-     *    Accessor for current selection value.
-     *    @return array      List of currently set options.
-     *    @access public
-     */
-    function getValue() {
-        if ($this->values === false) {
-            return $this->getDefault();
-        }
-        return $this->values;
-    }
-}
-
-/**
- *    Option for selection field.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleOptionTag extends SimpleWidget {
-
-    /**
-     *    Stashes the attributes.
-     */
-    function __construct($attributes) {
-        parent::__construct('option', $attributes);
-    }
-
-    /**
-     *    Does nothing.
-     *    @param string $value      Ignored.
-     *    @return boolean           Not allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        return false;
-    }
-
-    /**
-     *    Test to see if a value matches the option.
-     *    @param string $compare    Value to compare with.
-     *    @return boolean           True if possible match.
-     *    @access public
-     */
-    function isValue($compare) {
-        $compare = trim($compare);
-        if (trim($this->getValue()) == $compare) {
-            return true;
-        }
-        return trim(strip_tags($this->getContent())) == $compare;
-    }
-
-    /**
-     *    Accessor for starting value. Will be set to
-     *    the option label if no value exists.
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getDefault() {
-        if ($this->getAttribute('value') === false) {
-            return strip_tags($this->getContent());
-        }
-        return $this->getAttribute('value');
-    }
-
-    /**
-     *    The content of options is not part of the page.
-     *    @return boolean        True.
-     *    @access public
-     */
-    function isPrivateContent() {
-        return true;
-    }
-}
-
-/**
- *    Radio button.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleRadioButtonTag extends SimpleWidget {
-
-    /**
-     *    Stashes the attributes.
-     *    @param array $attributes        Hash of attributes.
-     */
-    function __construct($attributes) {
-        parent::__construct('input', $attributes);
-        if ($this->getAttribute('value') === false) {
-            $this->setAttribute('value', 'on');
-        }
-    }
-
-    /**
-     *    Tag contains no content.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-
-    /**
-     *    The only allowed value sn the one in the
-     *    "value" attribute.
-     *    @param string $value      New value.
-     *    @return boolean           True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        if ($value === false) {
-            return parent::setValue($value);
-        }
-        if ($value != $this->getAttribute('value')) {
-            return false;
-        }
-        return parent::setValue($value);
-    }
-
-    /**
-     *    Accessor for starting value.
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getDefault() {
-        if ($this->getAttribute('checked') !== false) {
-            return $this->getAttribute('value');
-        }
-        return false;
-    }
-}
-
-/**
- *    Checkbox widget.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleCheckboxTag extends SimpleWidget {
-
-    /**
-     *    Starts with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function __construct($attributes) {
-        parent::__construct('input', $attributes);
-        if ($this->getAttribute('value') === false) {
-            $this->setAttribute('value', 'on');
-        }
-    }
-
-    /**
-     *    Tag contains no content.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-
-    /**
-     *    The only allowed value in the one in the
-     *    "value" attribute. The default for this
-     *    attribute is "on". If this widget is set to
-     *    true, then the usual value will be taken.
-     *    @param string $value      New value.
-     *    @return boolean           True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        if ($value === false) {
-            return parent::setValue($value);
-        }
-        if ($value === true) {
-            return parent::setValue($this->getAttribute('value'));
-        }
-        if ($value != $this->getAttribute('value')) {
-            return false;
-        }
-        return parent::setValue($value);
-    }
-
-    /**
-     *    Accessor for starting value. The default
-     *    value is "on".
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getDefault() {
-        if ($this->getAttribute('checked') !== false) {
-            return $this->getAttribute('value');
-        }
-        return false;
-    }
-}
-
-/**
- *    A group of multiple widgets with some shared behaviour.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTagGroup {
-    private $widgets = array();
-
-    /**
-     *    Adds a tag to the group.
-     *    @param SimpleWidget $widget
-     *    @access public
-     */
-    function addWidget($widget) {
-        $this->widgets[] = $widget;
-    }
-
-    /**
-     *    Accessor to widget set.
-     *    @return array        All widgets.
-     *    @access protected
-     */
-    protected function &getWidgets() {
-        return $this->widgets;
-    }
-
-    /**
-     *    Accessor for an attribute.
-     *    @param string $label    Attribute name.
-     *    @return boolean         Always false.
-     *    @access public
-     */
-    function getAttribute($label) {
-        return false;
-    }
-
-    /**
-     *    Fetches the name for the widget from the first
-     *    member.
-     *    @return string        Name of widget.
-     *    @access public
-     */
-    function getName() {
-        if (count($this->widgets) > 0) {
-            return $this->widgets[0]->getName();
-        }
-    }
-
-    /**
-     *    Scans the widgets for one with the appropriate
-     *    ID field.
-     *    @param string $id        ID value to try.
-     *    @return boolean          True if matched.
-     *    @access public
-     */
-    function isId($id) {
-        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
-            if ($this->widgets[$i]->isId($id)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Scans the widgets for one with the appropriate
-     *    attached label.
-     *    @param string $label     Attached label to try.
-     *    @return boolean          True if matched.
-     *    @access public
-     */
-    function isLabel($label) {
-        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
-            if ($this->widgets[$i]->isLabel($label)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Dispatches the value into the form encoded packet.
-     *    @param SimpleEncoding $encoding    Form packet.
-     *    @access public
-     */
-    function write($encoding) {
-        $encoding->add($this->getName(), $this->getValue());
-    }
-}
-
-/**
- *    A group of tags with the same name within a form.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleCheckboxGroup extends SimpleTagGroup {
-
-    /**
-     *    Accessor for current selected widget or false
-     *    if none.
-     *    @return string/array     Widget values or false if none.
-     *    @access public
-     */
-    function getValue() {
-        $values = array();
-        $widgets = $this->getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if ($widgets[$i]->getValue() !== false) {
-                $values[] = $widgets[$i]->getValue();
-            }
-        }
-        return $this->coerceValues($values);
-    }
-
-    /**
-     *    Accessor for starting value that is active.
-     *    @return string/array      Widget values or false if none.
-     *    @access public
-     */
-    function getDefault() {
-        $values = array();
-        $widgets = $this->getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if ($widgets[$i]->getDefault() !== false) {
-                $values[] = $widgets[$i]->getDefault();
-            }
-        }
-        return $this->coerceValues($values);
-    }
-
-    /**
-     *    Accessor for current set values.
-     *    @param string/array/boolean $values   Either a single string, a
-     *                                          hash or false for nothing set.
-     *    @return boolean                       True if all values can be set.
-     *    @access public
-     */
-    function setValue($values) {
-        $values = $this->makeArray($values);
-        if (! $this->valuesArePossible($values)) {
-            return false;
-        }
-        $widgets = $this->getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            $possible = $widgets[$i]->getAttribute('value');
-            if (in_array($widgets[$i]->getAttribute('value'), $values)) {
-                $widgets[$i]->setValue($possible);
-            } else {
-                $widgets[$i]->setValue(false);
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    Tests to see if a possible value set is legal.
-     *    @param string/array/boolean $values   Either a single string, a
-     *                                          hash or false for nothing set.
-     *    @return boolean                       False if trying to set a
-     *                                          missing value.
-     *    @access private
-     */
-    protected function valuesArePossible($values) {
-        $matches = array();
-        $widgets = &$this->getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            $possible = $widgets[$i]->getAttribute('value');
-            if (in_array($possible, $values)) {
-                $matches[] = $possible;
-            }
-        }
-        return ($values == $matches);
-    }
-
-    /**
-     *    Converts the output to an appropriate format. This means
-     *    that no values is false, a single value is just that
-     *    value and only two or more are contained in an array.
-     *    @param array $values           List of values of widgets.
-     *    @return string/array/boolean   Expected format for a tag.
-     *    @access private
-     */
-    protected function coerceValues($values) {
-        if (count($values) == 0) {
-            return false;
-        } elseif (count($values) == 1) {
-            return $values[0];
-        } else {
-            return $values;
-        }
-    }
-
-    /**
-     *    Converts false or string into array. The opposite of
-     *    the coercian method.
-     *    @param string/array/boolean $value  A single item is converted
-     *                                        to a one item list. False
-     *                                        gives an empty list.
-     *    @return array                       List of values, possibly empty.
-     *    @access private
-     */
-    protected function makeArray($value) {
-        if ($value === false) {
-            return array();
-        }
-        if (is_string($value)) {
-            return array($value);
-        }
-        return $value;
-    }
-}
-
-/**
- *    A group of tags with the same name within a form.
- *    Used for radio buttons.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleRadioGroup extends SimpleTagGroup {
-
-    /**
-     *    Each tag is tried in turn until one is
-     *    successfully set. The others will be
-     *    unchecked if successful.
-     *    @param string $value      New value.
-     *    @return boolean           True if any allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        if (! $this->valueIsPossible($value)) {
-            return false;
-        }
-        $index = false;
-        $widgets = $this->getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if (! $widgets[$i]->setValue($value)) {
-                $widgets[$i]->setValue(false);
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    Tests to see if a value is allowed.
-     *    @param string    Attempted value.
-     *    @return boolean  True if a valid value.
-     *    @access private
-     */
-    protected function valueIsPossible($value) {
-        $widgets = $this->getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if ($widgets[$i]->getAttribute('value') == $value) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for current selected widget or false
-     *    if none.
-     *    @return string/boolean   Value attribute or
-     *                             content of opton.
-     *    @access public
-     */
-    function getValue() {
-        $widgets = $this->getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if ($widgets[$i]->getValue() !== false) {
-                return $widgets[$i]->getValue();
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for starting value that is active.
-     *    @return string/boolean      Value of first checked
-     *                                widget or false if none.
-     *    @access public
-     */
-    function getDefault() {
-        $widgets = $this->getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if ($widgets[$i]->getDefault() !== false) {
-                return $widgets[$i]->getDefault();
-            }
-        }
-        return false;
-    }
-}
-
-/**
- *    Tag to keep track of labels.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleLabelTag extends SimpleTag {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function __construct($attributes) {
-        parent::__construct('label', $attributes);
-    }
-
-    /**
-     *    Access for the ID to attach the label to.
-     *    @return string        For attribute.
-     *    @access public
-     */
-    function getFor() {
-        return $this->getAttribute('for');
-    }
-}
-
-/**
- *    Tag to aid parsing the form.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleFormTag extends SimpleTag {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function __construct($attributes) {
-        parent::__construct('form', $attributes);
-    }
-}
-
-/**
- *    Tag to aid parsing the frames in a page.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleFrameTag extends SimpleTag {
-
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function __construct($attributes) {
-        parent::__construct('frame', $attributes);
-    }
-
-    /**
-     *    Tag contains no content.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/acceptance_test.php b/3rdparty/simpletest/test/acceptance_test.php
deleted file mode 100644
index e96fe737e5f..00000000000
--- a/3rdparty/simpletest/test/acceptance_test.php
+++ /dev/null
@@ -1,1729 +0,0 @@
-<?php
-// $Id: acceptance_test.php 2013 2011-04-29 09:29:45Z pp11 $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../compatibility.php');
-require_once(dirname(__FILE__) . '/../browser.php');
-require_once(dirname(__FILE__) . '/../web_tester.php');
-require_once(dirname(__FILE__) . '/../unit_tester.php');
-
-class SimpleTestAcceptanceTest extends WebTestCase {
-    static function samples() {
-        return 'http://www.lastcraft.com/test/';
-    }
-}
-
-class TestOfLiveBrowser extends UnitTestCase {
-    function samples() {
-        return SimpleTestAcceptanceTest::samples();
-    }
-
-    function testGet() {
-        $browser = new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $this->assertTrue($browser->get($this->samples() . 'network_confirm.php'));
-        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/', $browser->getContent());
-        $this->assertEqual($browser->getTitle(), 'Simple test target file');
-        $this->assertEqual($browser->getResponseCode(), 200);
-        $this->assertEqual($browser->getMimeType(), 'text/html');
-    }
-
-    function testPost() {
-        $browser = new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $this->assertTrue($browser->post($this->samples() . 'network_confirm.php'));
-        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/', $browser->getContent());
-    }
-
-    function testAbsoluteLinkFollowing() {
-        $browser = new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $browser->get($this->samples() . 'link_confirm.php');
-        $this->assertTrue($browser->clickLink('Absolute'));
-        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
-    }
-
-    function testRelativeEncodedLinkFollowing() {
-        $browser = new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $browser->get($this->samples() . 'link_confirm.php');
-        // Warning: the below data is ISO 8859-1 encoded
-        $this->assertTrue($browser->clickLink("m\xE4rc\xEAl kiek'eboe"));
-        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
-    }
-
-    function testRelativeLinkFollowing() {
-        $browser = new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $browser->get($this->samples() . 'link_confirm.php');
-        $this->assertTrue($browser->clickLink('Relative'));
-        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
-    }
-
-    function testUnifiedClickLinkClicking() {
-        $browser = new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $browser->get($this->samples() . 'link_confirm.php');
-        $this->assertTrue($browser->click('Relative'));
-        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
-    }
-
-    function testIdLinkFollowing() {
-        $browser = new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $browser->get($this->samples() . 'link_confirm.php');
-        $this->assertTrue($browser->clickLinkById(1));
-        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
-    }
-
-    function testCookieReading() {
-        $browser = new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $browser->get($this->samples() . 'set_cookies.php');
-        $this->assertEqual($browser->getCurrentCookieValue('session_cookie'), 'A');
-        $this->assertEqual($browser->getCurrentCookieValue('short_cookie'), 'B');
-        $this->assertEqual($browser->getCurrentCookieValue('day_cookie'), 'C');
-    }
-
-    function testSimpleSubmit() {
-        $browser = new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $browser->get($this->samples() . 'form.html');
-        $this->assertTrue($browser->clickSubmit('Go!'));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/', $browser->getContent());
-        $this->assertPattern('/go=\[Go!\]/', $browser->getContent());
-    }
-
-    function testUnifiedClickCanSubmit() {
-        $browser = new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $browser->get($this->samples() . 'form.html');
-        $this->assertTrue($browser->click('Go!'));
-        $this->assertPattern('/go=\[Go!\]/', $browser->getContent());
-    }
-}
-
-class TestOfLocalFileBrowser extends UnitTestCase {
-    function samples() {
-        return 'file://'.dirname(__FILE__).'/site/';
-    }
-
-    function testGet() {
-        $browser = new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $this->assertTrue($browser->get($this->samples() . 'file.html'));
-        $this->assertPattern('/Link to SimpleTest/', $browser->getContent());
-        $this->assertEqual($browser->getTitle(), 'Link to SimpleTest');
-        $this->assertFalse($browser->getResponseCode());
-        $this->assertEqual($browser->getMimeType(), '');
-    }
-}
-
-class TestOfRequestMethods extends UnitTestCase {
-    function samples() {
-        return SimpleTestAcceptanceTest::samples();
-    }
-
-	function testHeadRequest() {
-		$browser = new SimpleBrowser();
-		$this->assertTrue($browser->head($this->samples() . 'request_methods.php'));
-		$this->assertEqual($browser->getResponseCode(), 202);
-	}
-
-	function testGetRequest() {
-		$browser = new SimpleBrowser();
-		$this->assertTrue($browser->get($this->samples() . 'request_methods.php'));
-		$this->assertEqual($browser->getResponseCode(), 405);
-	}
-
-	function testPostWithPlainEncoding() {
-		$browser = new SimpleBrowser();
-		$this->assertTrue($browser->post($this->samples() . 'request_methods.php', 'A content message'));
-		$this->assertEqual($browser->getResponseCode(), 406);
-		$this->assertPattern('/Please ensure content type is an XML format/', $browser->getContent());
-	}
-
-	function testPostWithXmlEncoding() {
-		$browser = new SimpleBrowser();
-		$this->assertTrue($browser->post($this->samples() . 'request_methods.php', '<a><b>c</b></a>', 'text/xml'));
-		$this->assertEqual($browser->getResponseCode(), 201);
-		$this->assertPattern('/c/', $browser->getContent());
-	}
-
-	function testPutWithPlainEncoding() {
-		$browser = new SimpleBrowser();
-		$this->assertTrue($browser->put($this->samples() . 'request_methods.php', 'A content message'));
-		$this->assertEqual($browser->getResponseCode(), 406);
-		$this->assertPattern('/Please ensure content type is an XML format/', $browser->getContent());
-	}
-
-	function testPutWithXmlEncoding() {
-		$browser = new SimpleBrowser();
-		$this->assertTrue($browser->put($this->samples() . 'request_methods.php', '<a><b>c</b></a>', 'application/xml'));
-		$this->assertEqual($browser->getResponseCode(), 201);
-		$this->assertPattern('/c/', $browser->getContent());
-	}
-
-	function testDeleteRequest() {
-		$browser = new SimpleBrowser();
-		$browser->delete($this->samples() . 'request_methods.php');
-		$this->assertEqual($browser->getResponseCode(), 202);
-		$this->assertPattern('/Your delete request was accepted/', $browser->getContent());
-	}
-
-}
-
-class TestRadioFields extends SimpleTestAcceptanceTest {
-    function testSetFieldAsInteger() {
-        $this->get($this->samples() . 'form_with_radio_buttons.html');
-        $this->assertTrue($this->setField('tested_field', 2));
-        $this->clickSubmitByName('send');
-        $this->assertEqual($this->getUrl(), $this->samples() . 'form_with_radio_buttons.html?tested_field=2&send=click+me');
-    }
-
-    function testSetFieldAsString() {
-        $this->get($this->samples() . 'form_with_radio_buttons.html');
-        $this->assertTrue($this->setField('tested_field', '2'));
-        $this->clickSubmitByName('send');
-        $this->assertEqual($this->getUrl(), $this->samples() . 'form_with_radio_buttons.html?tested_field=2&send=click+me');
-    }
-}
-
-class TestOfLiveFetching extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-
-    function testFormWithArrayBasedInputs() {
-        $this->get($this->samples() . 'form_with_array_based_inputs.php');
-        $this->setField('value[]', '3', '1');
-        $this->setField('value[]', '4', '2');
-        $this->clickSubmit('Go');
-        $this->assertPattern('/QUERY_STRING : value%5B%5D=3&value%5B%5D=4&submit=Go/');
-    }
-
-    function testFormWithQuotedValues() {
-        $this->get($this->samples() . 'form_with_quoted_values.php');
-        $this->assertField('a', 'default');
-        $this->assertFieldById('text_field', 'default');
-        $this->clickSubmit('Go');
-        $this->assertPattern('/a=default&submit=Go/');
-    }
-
-    function testGet() {
-        $this->assertTrue($this->get($this->samples() . 'network_confirm.php'));
-        $this->assertEqual($this->getUrl(), $this->samples() . 'network_confirm.php');
-        $this->assertText('target for the SimpleTest');
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
-        $this->assertTitle('Simple test target file');
-        $this->assertTitle(new PatternExpectation('/target file/'));
-        $this->assertResponse(200);
-        $this->assertMime('text/html');
-        $this->assertHeader('connection', 'close');
-        $this->assertHeader('connection', new PatternExpectation('/los/'));
-    }
-
-    function testSlowGet() {
-        $this->assertTrue($this->get($this->samples() . 'slow_page.php'));
-    }
-
-    function testTimedOutGet() {
-        $this->setConnectionTimeout(1);
-        $this->ignoreErrors();
-        $this->assertFalse($this->get($this->samples() . 'slow_page.php'));
-    }
-
-    function testPost() {
-        $this->assertTrue($this->post($this->samples() . 'network_confirm.php'));
-        $this->assertText('target for the SimpleTest');
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-    }
-
-    function testGetWithData() {
-        $this->get($this->samples() . 'network_confirm.php', array("a" => "aaa"));
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
-        $this->assertText('a=[aaa]');
-    }
-
-    function testPostWithData() {
-        $this->post($this->samples() . 'network_confirm.php', array("a" => "aaa"));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('a=[aaa]');
-    }
-
-    function testPostWithRecursiveData() {
-        $this->post($this->samples() . 'network_confirm.php', array("a" => "aaa"));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('a=[aaa]');
-
-        $this->post($this->samples() . 'network_confirm.php', array("a[aa]" => "aaa"));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('a=[aa=[aaa]]');
-
-        $this->post($this->samples() . 'network_confirm.php', array("a[aa][aaa]" => "aaaa"));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('a=[aa=[aaa=[aaaa]]]');
-
-        $this->post($this->samples() . 'network_confirm.php', array("a" => array("aa" => "aaa")));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('a=[aa=[aaa]]');
-
-        $this->post($this->samples() . 'network_confirm.php', array("a" => array("aa" => array("aaa" => "aaaa"))));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('a=[aa=[aaa=[aaaa]]]');
-    }
-
-    function testRelativeGet() {
-        $this->get($this->samples() . 'link_confirm.php');
-        $this->assertTrue($this->get('network_confirm.php'));
-        $this->assertText('target for the SimpleTest');
-    }
-
-    function testRelativePost() {
-        $this->post($this->samples() . 'link_confirm.php', array('a' => '123'));
-        $this->assertTrue($this->post('network_confirm.php'));
-        $this->assertText('target for the SimpleTest');
-    }
-}
-
-class TestOfLinkFollowing extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-
-    function testLinkAssertions() {
-        $this->get($this->samples() . 'link_confirm.php');
-        $this->assertLink('Absolute', $this->samples() . 'network_confirm.php');
-        $this->assertLink('Absolute', new PatternExpectation('/confirm/'));
-        $this->assertClickable('Absolute');
-    }
-
-    function testAbsoluteLinkFollowing() {
-        $this->get($this->samples() . 'link_confirm.php');
-        $this->assertTrue($this->clickLink('Absolute'));
-        $this->assertText('target for the SimpleTest');
-    }
-
-    function testRelativeLinkFollowing() {
-        $this->get($this->samples() . 'link_confirm.php');
-        $this->assertTrue($this->clickLink('Relative'));
-        $this->assertText('target for the SimpleTest');
-    }
-
-    function testLinkIdFollowing() {
-        $this->get($this->samples() . 'link_confirm.php');
-        $this->assertLinkById(1);
-        $this->assertTrue($this->clickLinkById(1));
-        $this->assertText('target for the SimpleTest');
-    }
-
-    function testAbsoluteUrlBehavesAbsolutely() {
-        $this->get($this->samples() . 'link_confirm.php');
-        $this->get('http://www.lastcraft.com');
-        $this->assertText('No guarantee of quality is given or even intended');
-    }
-
-    function testRelativeUrlRespectsBaseTag() {
-        $this->get($this->samples() . 'base_tag/base_link.html');
-        $this->click('Back to test pages');
-        $this->assertTitle('Simple test target file');
-    }
-}
-
-class TestOfLivePageLinkingWithMinimalLinks extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-
-    function testClickToExplicitelyNamedSelfReturns() {
-        $this->get($this->samples() . 'front_controller_style/a_page.php');
-        $this->assertEqual($this->getUrl(), $this->samples() . 'front_controller_style/a_page.php');
-        $this->assertTitle('Simple test page with links');
-        $this->assertLink('Self');
-        $this->clickLink('Self');
-        $this->assertTitle('Simple test page with links');
-    }
-
-    function testClickToMissingPageReturnsToSamePage() {
-        $this->get($this->samples() . 'front_controller_style/a_page.php');
-        $this->clickLink('No page');
-        $this->assertTitle('Simple test page with links');
-        $this->assertText('[action=no_page]');
-    }
-
-    function testClickToBareActionReturnsToSamePage() {
-        $this->get($this->samples() . 'front_controller_style/a_page.php');
-        $this->clickLink('Bare action');
-        $this->assertTitle('Simple test page with links');
-        $this->assertText('[action=]');
-    }
-
-    function testClickToSingleQuestionMarkReturnsToSamePage() {
-        $this->get($this->samples() . 'front_controller_style/a_page.php');
-        $this->clickLink('Empty query');
-        $this->assertTitle('Simple test page with links');
-    }
-
-    function testClickToEmptyStringReturnsToSamePage() {
-        $this->get($this->samples() . 'front_controller_style/a_page.php');
-        $this->clickLink('Empty link');
-        $this->assertTitle('Simple test page with links');
-    }
-
-    function testClickToSingleDotGoesToCurrentDirectory() {
-        $this->get($this->samples() . 'front_controller_style/a_page.php');
-        $this->clickLink('Current directory');
-        $this->assertTitle(
-                'Simple test front controller',
-                '%s -> index.php needs to be set as a default web server home page');
-    }
-
-    function testClickBackADirectoryLevel() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->clickLink('Down one');
-        $this->assertPattern('|Index of .*?/test|i');
-    }
-}
-
-class TestOfLiveFrontControllerEmulation extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-
-    function testJumpToNamedPage() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->assertText('Simple test front controller');
-        $this->clickLink('Index');
-        $this->assertResponse(200);
-        $this->assertText('[action=index]');
-    }
-
-    function testJumpToUnnamedPage() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->clickLink('No page');
-        $this->assertResponse(200);
-        $this->assertText('Simple test front controller');
-        $this->assertText('[action=no_page]');
-    }
-
-    function testJumpToUnnamedPageWithBareParameter() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->clickLink('Bare action');
-        $this->assertResponse(200);
-        $this->assertText('Simple test front controller');
-        $this->assertText('[action=]');
-    }
-
-    function testJumpToUnnamedPageWithEmptyQuery() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->clickLink('Empty query');
-        $this->assertResponse(200);
-        $this->assertPattern('/Simple test front controller/');
-        $this->assertPattern('/raw get data.*?\[\].*?get data/si');
-    }
-
-    function testJumpToUnnamedPageWithEmptyLink() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->clickLink('Empty link');
-        $this->assertResponse(200);
-        $this->assertPattern('/Simple test front controller/');
-        $this->assertPattern('/raw get data.*?\[\].*?get data/si');
-    }
-
-    function testJumpBackADirectoryLevel() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->clickLink('Down one');
-        $this->assertPattern('|Index of .*?/test|');
-    }
-
-    function testSubmitToNamedPage() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->assertText('Simple test front controller');
-        $this->clickSubmit('Index');
-        $this->assertResponse(200);
-        $this->assertText('[action=Index]');
-    }
-
-    function testSubmitToSameDirectory() {
-        $this->get($this->samples() . 'front_controller_style/index.php');
-        $this->clickSubmit('Same directory');
-        $this->assertResponse(200);
-        $this->assertText('[action=Same+directory]');
-    }
-
-    function testSubmitToEmptyAction() {
-        $this->get($this->samples() . 'front_controller_style/index.php');
-        $this->clickSubmit('Empty action');
-        $this->assertResponse(200);
-        $this->assertText('[action=Empty+action]');
-    }
-
-    function testSubmitToNoAction() {
-        $this->get($this->samples() . 'front_controller_style/index.php');
-        $this->clickSubmit('No action');
-        $this->assertResponse(200);
-        $this->assertText('[action=No+action]');
-    }
-
-    function testSubmitBackADirectoryLevel() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->clickSubmit('Down one');
-        $this->assertPattern('|Index of .*?/test|');
-    }
-
-    function testSubmitToNamedPageWithMixedPostAndGet() {
-        $this->get($this->samples() . 'front_controller_style/?a=A');
-        $this->assertText('Simple test front controller');
-        $this->clickSubmit('Index post');
-        $this->assertText('action=[Index post]');
-        $this->assertNoText('[a=A]');
-    }
-
-    function testSubmitToSameDirectoryMixedPostAndGet() {
-        $this->get($this->samples() . 'front_controller_style/index.php?a=A');
-        $this->clickSubmit('Same directory post');
-        $this->assertText('action=[Same directory post]');
-        $this->assertNoText('[a=A]');
-    }
-
-    function testSubmitToEmptyActionMixedPostAndGet() {
-        $this->get($this->samples() . 'front_controller_style/index.php?a=A');
-        $this->clickSubmit('Empty action post');
-        $this->assertText('action=[Empty action post]');
-        $this->assertText('[a=A]');
-    }
-
-    function testSubmitToNoActionMixedPostAndGet() {
-        $this->get($this->samples() . 'front_controller_style/index.php?a=A');
-        $this->clickSubmit('No action post');
-        $this->assertText('action=[No action post]');
-        $this->assertText('[a=A]');
-    }
-}
-
-class TestOfLiveHeaders extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-
-    function testConfirmingHeaderExistence() {
-        $this->get('http://www.lastcraft.com/');
-        $this->assertHeader('content-type');
-        $this->assertHeader('content-type', 'text/html');
-        $this->assertHeader('content-type', new PatternExpectation('/HTML/i'));
-        $this->assertNoHeader('WWW-Authenticate');
-    }
-}
-
-class TestOfLiveRedirects extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-
-    function testNoRedirects() {
-        $this->setMaximumRedirects(0);
-        $this->get($this->samples() . 'redirect.php');
-        $this->assertTitle('Redirection test');
-    }
-
-    function testRedirects() {
-        $this->setMaximumRedirects(1);
-        $this->get($this->samples() . 'redirect.php');
-        $this->assertTitle('Simple test target file');
-    }
-
-    function testRedirectLosesGetData() {
-        $this->get($this->samples() . 'redirect.php', array('a' => 'aaa'));
-        $this->assertNoText('a=[aaa]');
-    }
-
-    function testRedirectKeepsExtraRequestDataOfItsOwn() {
-        $this->get($this->samples() . 'redirect.php');
-        $this->assertText('r=[rrr]');
-    }
-
-    function testRedirectLosesPostData() {
-        $this->post($this->samples() . 'redirect.php', array('a' => 'aaa'));
-        $this->assertTitle('Simple test target file');
-        $this->assertNoText('a=[aaa]');
-    }
-
-    function testRedirectWithBaseUrlChange() {
-        $this->get($this->samples() . 'base_change_redirect.php');
-        $this->assertTitle('Simple test target file in folder');
-        $this->get($this->samples() . 'path/base_change_redirect.php');
-        $this->assertTitle('Simple test target file');
-    }
-
-    function testRedirectWithDoubleBaseUrlChange() {
-        $this->get($this->samples() . 'double_base_change_redirect.php');
-        $this->assertTitle('Simple test target file');
-    }
-}
-
-class TestOfLiveCookies extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-
-    function here() {
-        return new SimpleUrl($this->samples());
-    }
-
-    function thisHost() {
-        $here = $this->here();
-        return $here->getHost();
-    }
-
-    function thisPath() {
-        $here = $this->here();
-        return $here->getPath();
-    }
-
-    function testCookieSettingAndAssertions() {
-        $this->setCookie('a', 'Test cookie a');
-        $this->setCookie('b', 'Test cookie b', $this->thisHost());
-        $this->setCookie('c', 'Test cookie c', $this->thisHost(), $this->thisPath());
-        $this->get($this->samples() . 'network_confirm.php');
-        $this->assertText('Test cookie a');
-        $this->assertText('Test cookie b');
-        $this->assertText('Test cookie c');
-        $this->assertCookie('a');
-        $this->assertCookie('b', 'Test cookie b');
-        $this->assertTrue($this->getCookie('c') == 'Test cookie c');
-    }
-
-    function testNoCookieSetWhenCookiesDisabled() {
-        $this->setCookie('a', 'Test cookie a');
-        $this->ignoreCookies();
-        $this->get($this->samples() . 'network_confirm.php');
-        $this->assertNoText('Test cookie a');
-    }
-
-    function testCookieReading() {
-        $this->get($this->samples() . 'set_cookies.php');
-        $this->assertCookie('session_cookie', 'A');
-        $this->assertCookie('short_cookie', 'B');
-        $this->assertCookie('day_cookie', 'C');
-    }
-
-    function testNoCookie() {
-        $this->assertNoCookie('aRandomCookie');
-    }
-
-    function testNoCookieReadingWhenCookiesDisabled() {
-        $this->ignoreCookies();
-        $this->get($this->samples() . 'set_cookies.php');
-        $this->assertNoCookie('session_cookie');
-        $this->assertNoCookie('short_cookie');
-        $this->assertNoCookie('day_cookie');
-    }
-
-    function testCookiePatternAssertions() {
-        $this->get($this->samples() . 'set_cookies.php');
-        $this->assertCookie('session_cookie', new PatternExpectation('/a/i'));
-    }
-
-    function testTemporaryCookieExpiry() {
-        $this->get($this->samples() . 'set_cookies.php');
-        $this->restart();
-        $this->assertNoCookie('session_cookie');
-        $this->assertCookie('day_cookie', 'C');
-    }
-
-    function testTimedCookieExpiryWith100SecondMargin() {
-        $this->get($this->samples() . 'set_cookies.php');
-        $this->ageCookies(3600);
-        $this->restart(time() + 100);
-        $this->assertNoCookie('session_cookie');
-        $this->assertNoCookie('hour_cookie');
-        $this->assertCookie('day_cookie', 'C');
-    }
-
-    function testNoClockOverDriftBy100Seconds() {
-        $this->get($this->samples() . 'set_cookies.php');
-        $this->restart(time() + 200);
-        $this->assertNoCookie(
-                'short_cookie',
-                '%s -> Please check your computer clock setting if you are not using NTP');
-    }
-
-    function testNoClockUnderDriftBy100Seconds() {
-        $this->get($this->samples() . 'set_cookies.php');
-        $this->restart(time() + 0);
-        $this->assertCookie(
-                'short_cookie',
-                'B',
-                '%s -> Please check your computer clock setting if you are not using NTP');
-    }
-
-    function testCookiePath() {
-        $this->get($this->samples() . 'set_cookies.php');
-        $this->assertNoCookie('path_cookie', 'D');
-        $this->get('./path/show_cookies.php');
-        $this->assertPattern('/path_cookie/');
-        $this->assertCookie('path_cookie', 'D');
-    }
-}
-
-class LiveTestOfForms extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-
-    function testSimpleSubmit() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('go=[Go!]');
-    }
-
-    function testDefaultFormValues() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertFieldByName('a', '');
-        $this->assertFieldByName('b', 'Default text');
-        $this->assertFieldByName('c', '');
-        $this->assertFieldByName('d', 'd1');
-        $this->assertFieldByName('e', false);
-        $this->assertFieldByName('f', 'on');
-        $this->assertFieldByName('g', 'g3');
-        $this->assertFieldByName('h', 2);
-        $this->assertFieldByName('go', 'Go!');
-        $this->assertClickable('Go!');
-        $this->assertSubmit('Go!');
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('go=[Go!]');
-        $this->assertText('a=[]');
-        $this->assertText('b=[Default text]');
-        $this->assertText('c=[]');
-        $this->assertText('d=[d1]');
-        $this->assertNoText('e=[');
-        $this->assertText('f=[on]');
-        $this->assertText('g=[g3]');
-    }
-
-    function testFormSubmissionByButtonLabel() {
-        $this->get($this->samples() . 'form.html');
-        $this->setFieldByName('a', 'aaa');
-        $this->setFieldByName('b', 'bbb');
-        $this->setFieldByName('c', 'ccc');
-        $this->setFieldByName('d', 'D2');
-        $this->setFieldByName('e', 'on');
-        $this->setFieldByName('f', false);
-        $this->setFieldByName('g', 'g2');
-        $this->setFieldByName('h', 1);
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('a=[aaa]');
-        $this->assertText('b=[bbb]');
-        $this->assertText('c=[ccc]');
-        $this->assertText('d=[d2]');
-        $this->assertText('e=[on]');
-        $this->assertNoText('f=[');
-        $this->assertText('g=[g2]');
-    }
-
-    function testAdditionalFormValues() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickSubmit('Go!', array('add' => 'A')));
-        $this->assertText('go=[Go!]');
-        $this->assertText('add=[A]');
-    }
-
-    function testFormSubmissionByName() {
-        $this->get($this->samples() . 'form.html');
-        $this->setFieldByName('a', 'A');
-        $this->assertTrue($this->clickSubmitByName('go'));
-        $this->assertText('a=[A]');
-    }
-
-    function testFormSubmissionByNameAndAdditionalParameters() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickSubmitByName('go', array('add' => 'A')));
-        $this->assertText('go=[Go!]');
-        $this->assertText('add=[A]');
-    }
-
-    function testFormSubmissionBySubmitButtonLabeledSubmit() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickSubmitByName('test'));
-        $this->assertText('test=[Submit]');
-    }
-
-    function testFormSubmissionWithIds() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertFieldById(1, '');
-        $this->assertFieldById(2, 'Default text');
-        $this->assertFieldById(3, '');
-        $this->assertFieldById(4, 'd1');
-        $this->assertFieldById(5, false);
-        $this->assertFieldById(6, 'on');
-        $this->assertFieldById(8, 'g3');
-        $this->assertFieldById(11, 2);
-        $this->setFieldById(1, 'aaa');
-        $this->setFieldById(2, 'bbb');
-        $this->setFieldById(3, 'ccc');
-        $this->setFieldById(4, 'D2');
-        $this->setFieldById(5, 'on');
-        $this->setFieldById(6, false);
-        $this->setFieldById(8, 'g2');
-        $this->setFieldById(11, 'H1');
-        $this->assertTrue($this->clickSubmitById(99));
-        $this->assertText('a=[aaa]');
-        $this->assertText('b=[bbb]');
-        $this->assertText('c=[ccc]');
-        $this->assertText('d=[d2]');
-        $this->assertText('e=[on]');
-        $this->assertNoText('f=[');
-        $this->assertText('g=[g2]');
-        $this->assertText('h=[1]');
-        $this->assertText('go=[Go!]');
-    }
-
-    function testFormSubmissionWithIdsAndAdditionnalData() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickSubmitById(99, array('additionnal' => "data")));
-        $this->assertText('additionnal=[data]');
-    }
-
-    function testFormSubmissionWithLabels() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertField('Text A', '');
-        $this->assertField('Text B', 'Default text');
-        $this->assertField('Text area C', '');
-        $this->assertField('Selection D', 'd1');
-        $this->assertField('Checkbox E', false);
-        $this->assertField('Checkbox F', 'on');
-        $this->assertField('3', 'g3');
-        $this->assertField('Selection H', 2);
-        $this->setField('Text A', 'aaa');
-        $this->setField('Text B', 'bbb');
-        $this->setField('Text area C', 'ccc');
-        $this->setField('Selection D', 'D2');
-        $this->setField('Checkbox E', 'on');
-        $this->setField('Checkbox F', false);
-        $this->setField('2', 'g2');
-        $this->setField('Selection H', 'H1');
-        $this->clickSubmit('Go!');
-        $this->assertText('a=[aaa]');
-        $this->assertText('b=[bbb]');
-        $this->assertText('c=[ccc]');
-        $this->assertText('d=[d2]');
-        $this->assertText('e=[on]');
-        $this->assertNoText('f=[');
-        $this->assertText('g=[g2]');
-        $this->assertText('h=[1]');
-        $this->assertText('go=[Go!]');
-    }
-
-    function testSettingCheckboxWithBooleanTrueSetsUnderlyingValue() {
-        $this->get($this->samples() . 'form.html');
-        $this->setField('Checkbox E', true);
-        $this->assertField('Checkbox E', 'on');
-        $this->clickSubmit('Go!');
-        $this->assertText('e=[on]');
-    }
-
-    function testFormSubmissionWithMixedPostAndGet() {
-        $this->get($this->samples() . 'form_with_mixed_post_and_get.html');
-        $this->setField('Text A', 'Hello');
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('a=[Hello]');
-        $this->assertText('x=[X]');
-        $this->assertText('y=[Y]');
-    }
-
-    function testFormSubmissionWithMixedPostAndEncodedGet() {
-        $this->get($this->samples() . 'form_with_mixed_post_and_get.html');
-        $this->setField('Text B', 'Hello');
-        $this->assertTrue($this->clickSubmit('Go encoded!'));
-        $this->assertText('b=[Hello]');
-        $this->assertText('x=[X]');
-        $this->assertText('y=[Y]');
-    }
-
-    function testFormSubmissionWithoutAction() {
-        $this->get($this->samples() . 'form_without_action.php?test=test');
-        $this->assertText('_GET : [test]');
-        $this->assertTrue($this->clickSubmit('Submit Post With Empty Action'));
-        $this->assertText('_GET : [test]');
-        $this->assertText('_POST : [test]');
-    }
-
-    function testImageSubmissionByLabel() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertImage('Image go!');
-        $this->assertTrue($this->clickImage('Image go!', 10, 12));
-        $this->assertText('go_x=[10]');
-        $this->assertText('go_y=[12]');
-    }
-
-    function testImageSubmissionByLabelWithAdditionalParameters() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickImage('Image go!', 10, 12, array('add' => 'A')));
-        $this->assertText('add=[A]');
-    }
-
-    function testImageSubmissionByName() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickImageByName('go', 10, 12));
-        $this->assertText('go_x=[10]');
-        $this->assertText('go_y=[12]');
-    }
-
-    function testImageSubmissionById() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickImageById(97, 10, 12));
-        $this->assertText('go_x=[10]');
-        $this->assertText('go_y=[12]');
-    }
-
-    function testButtonSubmissionByLabel() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickSubmit('Button go!', 10, 12));
-        $this->assertPattern('/go=\[ButtonGo\]/s');
-    }
-
-    function testNamelessSubmitSendsNoValue() {
-        $this->get($this->samples() . 'form_with_unnamed_submit.html');
-        $this->click('Go!');
-        $this->assertNoText('Go!');
-        $this->assertNoText('submit');
-    }
-
-    function testNamelessImageSendsXAndYValues() {
-        $this->get($this->samples() . 'form_with_unnamed_submit.html');
-        $this->clickImage('Image go!', 4, 5);
-        $this->assertNoText('ImageGo');
-        $this->assertText('x=[4]');
-        $this->assertText('y=[5]');
-    }
-
-    function testNamelessButtonSendsNoValue() {
-        $this->get($this->samples() . 'form_with_unnamed_submit.html');
-        $this->click('Button Go!');
-        $this->assertNoText('ButtonGo');
-    }
-
-    function testSelfSubmit() {
-        $this->get($this->samples() . 'self_form.php');
-        $this->assertNoText('[Submitted]');
-        $this->assertNoText('[Wrong form]');
-        $this->assertTrue($this->clickSubmit());
-        $this->assertText('[Submitted]');
-        $this->assertNoText('[Wrong form]');
-        $this->assertTitle('Test of form self submission');
-    }
-
-    function testSelfSubmitWithParameters() {
-        $this->get($this->samples() . 'self_form.php');
-        $this->setFieldByName('visible', 'Resent');
-        $this->assertTrue($this->clickSubmit());
-        $this->assertText('[Resent]');
-    }
-
-    function testSettingOfBlankOption() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->setFieldByName('d', ''));
-        $this->clickSubmit('Go!');
-        $this->assertText('d=[]');
-    }
-
-    function testAssertingFieldValueWithPattern() {
-        $this->get($this->samples() . 'form.html');
-        $this->setField('c', 'A very long string');
-        $this->assertField('c', new PatternExpectation('/very long/'));
-    }
-
-    function testSendingMultipartFormDataEncodedForm() {
-        $this->get($this->samples() . 'form_data_encoded_form.html');
-        $this->assertField('Text A', '');
-        $this->assertField('Text B', 'Default text');
-        $this->assertField('Text area C', '');
-        $this->assertField('Selection D', 'd1');
-        $this->assertField('Checkbox E', false);
-        $this->assertField('Checkbox F', 'on');
-        $this->assertField('3', 'g3');
-        $this->assertField('Selection H', 2);
-        $this->setField('Text A', 'aaa');
-        $this->setField('Text B', 'bbb');
-        $this->setField('Text area C', 'ccc');
-        $this->setField('Selection D', 'D2');
-        $this->setField('Checkbox E', 'on');
-        $this->setField('Checkbox F', false);
-        $this->setField('2', 'g2');
-        $this->setField('Selection H', 'H1');
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('a=[aaa]');
-        $this->assertText('b=[bbb]');
-        $this->assertText('c=[ccc]');
-        $this->assertText('d=[d2]');
-        $this->assertText('e=[on]');
-        $this->assertNoText('f=[');
-        $this->assertText('g=[g2]');
-        $this->assertText('h=[1]');
-        $this->assertText('go=[Go!]');
-    }
-
-    function testSettingVariousBlanksInFields() {
-        $this->get($this->samples() . 'form_with_false_defaults.html');
-        $this->assertField('Text A', '');
-        $this->setField('Text A', '0');
-        $this->assertField('Text A', '0');
-        $this->assertField('Text area B', '');
-        $this->setField('Text area B', '0');
-        $this->assertField('Text area B', '0');
-        $this->assertField('Selection D', '');
-        $this->setField('Selection D', 'D2');
-        $this->assertField('Selection D', 'D2');
-        $this->setField('Selection D', 'D3');
-        $this->assertField('Selection D', '0');
-        $this->setField('Selection D', 'D4');
-        $this->assertField('Selection D', '?');
-        $this->assertField('Checkbox E', '');
-        $this->assertField('Checkbox F', 'on');
-        $this->assertField('Checkbox G', '0');
-        $this->assertField('Checkbox H', '?');
-        $this->assertFieldByName('i', 'on');
-        $this->setFieldByName('i', '');
-        $this->assertFieldByName('i', '');
-        $this->setFieldByName('i', '0');
-        $this->assertFieldByName('i', '0');
-        $this->setFieldByName('i', '?');
-        $this->assertFieldByName('i', '?');
-    }
-
-    function testDefaultValueOfTextareaHasNewlinesAndWhitespacePreserved() {
-        $this->get($this->samples() . 'form_with_false_defaults.html');
-        $this->assertField('Text area C', '                ');
-    }
-
-    function chars($t) {
-        for ($i = 0; $i < strlen($t); $i++) {
-            print "[$t[$i]]";
-        }
-    }
-
-    function testSubmissionOfBlankFields() {
-        $this->get($this->samples() . 'form_with_false_defaults.html');
-        $this->setField('Text A', '');
-        $this->setField('Text area B', '');
-        $this->setFieldByName('i', '');
-        $this->click('Go!');
-        $this->assertText('a=[]');
-        $this->assertText('b=[]');
-        $this->assertText('d=[]');
-        $this->assertText('e=[]');
-        $this->assertText('i=[]');
-    }
-
-    function testDefaultValueOfTextareaHasNewlinesAndWhitespacePreservedOnSubmission() {
-        $this->get($this->samples() . 'form_with_false_defaults.html');
-        $this->click('Go!');
-        $this->assertPattern('/c=\[                \]/');
-    }
-
-    function testSubmissionOfEmptyValues() {
-        $this->get($this->samples() . 'form_with_false_defaults.html');
-        $this->setField('Selection D', 'D2');
-        $this->click('Go!');
-        $this->assertText('a=[]');
-        $this->assertText('b=[]');
-        $this->assertText('d=[D2]');
-        $this->assertText('f=[on]');
-        $this->assertText('i=[on]');
-    }
-
-    function testSubmissionOfZeroes() {
-        $this->get($this->samples() . 'form_with_false_defaults.html');
-        $this->setField('Text A', '0');
-        $this->setField('Text area B', '0');
-        $this->setField('Selection D', 'D3');
-        $this->setFieldByName('i', '0');
-        $this->click('Go!');
-        $this->assertText('a=[0]');
-        $this->assertText('b=[0]');
-        $this->assertText('d=[0]');
-        $this->assertText('g=[0]');
-        $this->assertText('i=[0]');
-    }
-
-    function testSubmissionOfQuestionMarks() {
-        $this->get($this->samples() . 'form_with_false_defaults.html');
-        $this->setField('Text A', '?');
-        $this->setField('Text area B', '?');
-        $this->setField('Selection D', 'D4');
-        $this->setFieldByName('i', '?');
-        $this->click('Go!');
-        $this->assertText('a=[?]');
-        $this->assertText('b=[?]');
-        $this->assertText('d=[?]');
-        $this->assertText('h=[?]');
-        $this->assertText('i=[?]');
-    }
-
-    function testSubmissionOfHtmlEncodedValues() {
-        $this->get($this->samples() . 'form_with_tricky_defaults.html');
-        $this->assertField('Text A', '&\'"<>');
-        $this->assertField('Text B', '"');
-        $this->assertField('Text area C', '&\'"<>');
-        $this->assertField('Selection D', "'");
-        $this->assertField('Checkbox E', '&\'"<>');
-        $this->assertField('Checkbox F', false);
-        $this->assertFieldByname('i', "'");
-        $this->click('Go!');
-        $this->assertText('a=[&\'"<>, "]');
-        $this->assertText('c=[&\'"<>]');
-        $this->assertText("d=[']");
-        $this->assertText('e=[&\'"<>]');
-        $this->assertText("i=[']");
-    }
-
-    function testFormActionRespectsBaseTag() {
-        $this->get($this->samples() . 'base_tag/form.html');
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('go=[Go!]');
-        $this->assertText('a=[]');
-    }
-}
-
-class TestOfLiveMultiValueWidgets extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-
-    function testDefaultFormValueSubmission() {
-        $this->get($this->samples() . 'multiple_widget_form.html');
-        $this->assertFieldByName('a', array('a2', 'a3'));
-        $this->assertFieldByName('b', array('b2', 'b3'));
-        $this->assertFieldByName('c[]', array('c2', 'c3'));
-        $this->assertFieldByName('d', array('2', '3'));
-        $this->assertFieldByName('e', array('2', '3'));
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('a=[a2, a3]');
-        $this->assertText('b=[b2, b3]');
-        $this->assertText('c=[c2, c3]');
-        $this->assertText('d=[2, 3]');
-        $this->assertText('e=[2, 3]');
-    }
-
-    function testSubmittingMultipleValues() {
-        $this->get($this->samples() . 'multiple_widget_form.html');
-        $this->setFieldByName('a', array('a1', 'a4'));
-        $this->assertFieldByName('a', array('a1', 'a4'));
-        $this->assertFieldByName('a', array('a4', 'a1'));
-        $this->setFieldByName('b', array('b1', 'b4'));
-        $this->assertFieldByName('b', array('b1', 'b4'));
-        $this->setFieldByName('c[]', array('c1', 'c4'));
-        $this->assertField('c[]', array('c1', 'c4'));
-        $this->setFieldByName('d', array('1', '4'));
-        $this->assertField('d', array('1', '4'));
-        $this->setFieldByName('e', array('e1', 'e4'));
-        $this->assertField('e', array('1', '4'));
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('a=[a1, a4]');
-        $this->assertText('b=[b1, b4]');
-        $this->assertText('c=[c1, c4]');
-        $this->assertText('d=[1, 4]');
-        $this->assertText('e=[1, 4]');
-    }
-
-    function testSettingByOptionValue() {
-        $this->get($this->samples() . 'multiple_widget_form.html');
-        $this->setFieldByName('d', array('1', '4'));
-        $this->assertField('d', array('1', '4'));
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('d=[1, 4]');
-    }
-
-    function testSubmittingMultipleValuesByLabel() {
-        $this->get($this->samples() . 'multiple_widget_form.html');
-        $this->setField('Multiple selection A', array('a1', 'a4'));
-        $this->assertField('Multiple selection A', array('a1', 'a4'));
-        $this->assertField('Multiple selection A', array('a4', 'a1'));
-        $this->setField('multiple selection C', array('c1', 'c4'));
-        $this->assertField('multiple selection C', array('c1', 'c4'));
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('a=[a1, a4]');
-        $this->assertText('c=[c1, c4]');
-    }
-
-    function testSavantStyleHiddenFieldDefaults() {
-        $this->get($this->samples() . 'savant_style_form.html');
-        $this->assertFieldByName('a', array('a0'));
-        $this->assertFieldByName('b', array('b0'));
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('a=[a0]');
-        $this->assertText('b=[b0]');
-    }
-
-    function testSavantStyleHiddenDefaultsAreOverridden() {
-        $this->get($this->samples() . 'savant_style_form.html');
-        $this->assertTrue($this->setFieldByName('a', array('a1')));
-        $this->assertTrue($this->setFieldByName('b', 'b1'));
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('a=[a1]');
-        $this->assertText('b=[b1]');
-    }
-
-    function testSavantStyleFormSettingById() {
-        $this->get($this->samples() . 'savant_style_form.html');
-        $this->assertFieldById(1, array('a0'));
-        $this->assertFieldById(4, array('b0'));
-        $this->assertTrue($this->setFieldById(2, 'a1'));
-        $this->assertTrue($this->setFieldById(5, 'b1'));
-        $this->assertTrue($this->clickSubmitById(99));
-        $this->assertText('a=[a1]');
-        $this->assertText('b=[b1]');
-    }
-}
-
-class TestOfFileUploads extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-
-    function testSingleFileUpload() {
-        $this->get($this->samples() . 'upload_form.html');
-        $this->assertTrue($this->setField('Content:',
-                dirname(__FILE__) . '/support/upload_sample.txt'));
-        $this->assertField('Content:', dirname(__FILE__) . '/support/upload_sample.txt');
-        $this->click('Go!');
-        $this->assertText('Sample for testing file upload');
-    }
-
-    function testMultipleFileUpload() {
-        $this->get($this->samples() . 'upload_form.html');
-        $this->assertTrue($this->setField('Content:',
-                dirname(__FILE__) . '/support/upload_sample.txt'));
-        $this->assertTrue($this->setField('Supplemental:',
-                dirname(__FILE__) . '/support/supplementary_upload_sample.txt'));
-        $this->assertField('Supplemental:',
-                dirname(__FILE__) . '/support/supplementary_upload_sample.txt');
-        $this->click('Go!');
-        $this->assertText('Sample for testing file upload');
-        $this->assertText('Some more text content');
-    }
-
-    function testBinaryFileUpload() {
-        $this->get($this->samples() . 'upload_form.html');
-        $this->assertTrue($this->setField('Content:',
-                dirname(__FILE__) . '/support/latin1_sample'));
-        $this->click('Go!');
-        $this->assertText(
-                implode('', file(dirname(__FILE__) . '/support/latin1_sample')));
-    }
-}
-
-class TestOfLiveHistoryNavigation extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-
-    function testRetry() {
-        $this->get($this->samples() . 'cookie_based_counter.php');
-        $this->assertPattern('/count: 1/i');
-        $this->retry();
-        $this->assertPattern('/count: 2/i');
-        $this->retry();
-        $this->assertPattern('/count: 3/i');
-    }
-
-    function testOfBackButton() {
-        $this->get($this->samples() . '1.html');
-        $this->clickLink('2');
-        $this->assertTitle('2');
-        $this->assertTrue($this->back());
-        $this->assertTitle('1');
-        $this->assertTrue($this->forward());
-        $this->assertTitle('2');
-        $this->assertFalse($this->forward());
-    }
-
-    function testGetRetryResubmitsData() {
-        $this->assertTrue($this->get(
-                $this->samples() . 'network_confirm.php?a=aaa'));
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
-        $this->assertText('a=[aaa]');
-        $this->retry();
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
-        $this->assertText('a=[aaa]');
-    }
-
-    function testGetRetryResubmitsExtraData() {
-        $this->assertTrue($this->get(
-                $this->samples() . 'network_confirm.php',
-                array('a' => 'aaa')));
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
-        $this->assertText('a=[aaa]');
-        $this->retry();
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
-        $this->assertText('a=[aaa]');
-    }
-
-    function testPostRetryResubmitsData() {
-        $this->assertTrue($this->post(
-                $this->samples() . 'network_confirm.php',
-                array('a' => 'aaa')));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('a=[aaa]');
-        $this->retry();
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('a=[aaa]');
-    }
-
-    function testGetRetryResubmitsRepeatedData() {
-        $this->assertTrue($this->get(
-                $this->samples() . 'network_confirm.php?a=1&a=2'));
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
-        $this->assertText('a=[1, 2]');
-        $this->retry();
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
-        $this->assertText('a=[1, 2]');
-    }
-}
-
-class TestOfLiveAuthentication extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-
-    function testChallengeFromProtectedPage() {
-        $this->get($this->samples() . 'protected/');
-        $this->assertResponse(401);
-        $this->assertAuthentication('Basic');
-        $this->assertRealm('SimpleTest basic authentication');
-        $this->assertRealm(new PatternExpectation('/simpletest/i'));
-        $this->authenticate('test', 'secret');
-        $this->assertResponse(200);
-        $this->retry();
-        $this->assertResponse(200);
-    }
-
-    function testTrailingSlashImpliedWithinRealm() {
-        $this->get($this->samples() . 'protected/');
-        $this->authenticate('test', 'secret');
-        $this->assertResponse(200);
-        $this->get($this->samples() . 'protected');
-        $this->assertResponse(200);
-    }
-
-    function testTrailingSlashImpliedSettingRealm() {
-        $this->get($this->samples() . 'protected');
-        $this->authenticate('test', 'secret');
-        $this->assertResponse(200);
-        $this->get($this->samples() . 'protected/');
-        $this->assertResponse(200);
-    }
-
-    function testEncodedAuthenticationFetchesPage() {
-        $this->get('http://test:secret@www.lastcraft.com/test/protected/');
-        $this->assertResponse(200);
-    }
-
-    function testEncodedAuthenticationFetchesPageAfterTrailingSlashRedirect() {
-        $this->get('http://test:secret@www.lastcraft.com/test/protected');
-        $this->assertResponse(200);
-    }
-
-    function testRealmExtendsToWholeDirectory() {
-        $this->get($this->samples() . 'protected/1.html');
-        $this->authenticate('test', 'secret');
-        $this->clickLink('2');
-        $this->assertResponse(200);
-        $this->clickLink('3');
-        $this->assertResponse(200);
-    }
-
-    function testRedirectKeepsAuthentication() {
-        $this->get($this->samples() . 'protected/local_redirect.php');
-        $this->authenticate('test', 'secret');
-        $this->assertTitle('Simple test target file');
-    }
-
-    function testRedirectKeepsEncodedAuthentication() {
-        $this->get('http://test:secret@www.lastcraft.com/test/protected/local_redirect.php');
-        $this->assertResponse(200);
-        $this->assertTitle('Simple test target file');
-    }
-
-    function testSessionRestartLosesAuthentication() {
-        $this->get($this->samples() . 'protected/');
-        $this->authenticate('test', 'secret');
-        $this->assertResponse(200);
-        $this->restart();
-        $this->get($this->samples() . 'protected/');
-        $this->assertResponse(401);
-    }
-}
-
-class TestOfLoadingFrames extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-
-    function testNoFramesContentWhenFramesDisabled() {
-        $this->ignoreFrames();
-        $this->get($this->samples() . 'one_page_frameset.html');
-        $this->assertTitle('Frameset for testing of SimpleTest');
-        $this->assertText('This content is for no frames only');
-    }
-
-    function testPatternMatchCanReadTheOnlyFrame() {
-        $this->get($this->samples() . 'one_page_frameset.html');
-        $this->assertText('A target for the SimpleTest test suite');
-        $this->assertNoText('This content is for no frames only');
-    }
-
-    function testMessyFramesetResponsesByName() {
-        $this->assertTrue($this->get(
-                $this->samples() . 'messy_frameset.html'));
-        $this->assertTitle('Frameset for testing of SimpleTest');
-
-        $this->assertTrue($this->setFrameFocus('Front controller'));
-        $this->assertResponse(200);
-        $this->assertText('Simple test front controller');
-
-        $this->assertTrue($this->setFrameFocus('One'));
-        $this->assertResponse(200);
-        $this->assertLink('2');
-
-        $this->assertTrue($this->setFrameFocus('Frame links'));
-        $this->assertResponse(200);
-        $this->assertLink('Set one to 2');
-
-        $this->assertTrue($this->setFrameFocus('Counter'));
-        $this->assertResponse(200);
-        $this->assertText('Count: 1');
-
-        $this->assertTrue($this->setFrameFocus('Redirected'));
-        $this->assertResponse(200);
-        $this->assertText('r=rrr');
-
-        $this->assertTrue($this->setFrameFocus('Protected'));
-        $this->assertResponse(401);
-
-        $this->assertTrue($this->setFrameFocus('Protected redirect'));
-        $this->assertResponse(401);
-
-        $this->assertTrue($this->setFrameFocusByIndex(1));
-        $this->assertResponse(200);
-        $this->assertText('Simple test front controller');
-
-        $this->assertTrue($this->setFrameFocusByIndex(2));
-        $this->assertResponse(200);
-        $this->assertLink('2');
-
-        $this->assertTrue($this->setFrameFocusByIndex(3));
-        $this->assertResponse(200);
-        $this->assertLink('Set one to 2');
-
-        $this->assertTrue($this->setFrameFocusByIndex(4));
-        $this->assertResponse(200);
-        $this->assertText('Count: 1');
-
-        $this->assertTrue($this->setFrameFocusByIndex(5));
-        $this->assertResponse(200);
-        $this->assertText('r=rrr');
-
-        $this->assertTrue($this->setFrameFocusByIndex(6));
-        $this->assertResponse(401);
-
-        $this->assertTrue($this->setFrameFocusByIndex(7));
-    }
-
-    function testReloadingFramesetPage() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->assertText('Count: 1');
-        $this->retry();
-        $this->assertText('Count: 2');
-        $this->retry();
-        $this->assertText('Count: 3');
-    }
-
-    function testReloadingSingleFrameWithCookieCounter() {
-        $this->get($this->samples() . 'counting_frameset.html');
-        $this->setFrameFocus('a');
-        $this->assertText('Count: 1');
-        $this->setFrameFocus('b');
-        $this->assertText('Count: 2');
-
-        $this->setFrameFocus('a');
-        $this->retry();
-        $this->assertText('Count: 3');
-        $this->retry();
-        $this->assertText('Count: 4');
-        $this->setFrameFocus('b');
-        $this->assertText('Count: 2');
-    }
-
-    function testReloadingFrameWhenUnfocusedReloadsWholeFrameset() {
-        $this->get($this->samples() . 'counting_frameset.html');
-        $this->setFrameFocus('a');
-        $this->assertText('Count: 1');
-        $this->setFrameFocus('b');
-        $this->assertText('Count: 2');
-
-        $this->clearFrameFocus('a');
-        $this->retry();
-
-        $this->assertTitle('Frameset for testing of SimpleTest');
-        $this->setFrameFocus('a');
-        $this->assertText('Count: 3');
-        $this->setFrameFocus('b');
-        $this->assertText('Count: 4');
-    }
-
-    function testClickingNormalLinkReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickLink('2');
-        $this->assertLink('3');
-        $this->assertText('Simple test front controller');
-    }
-
-    function testJumpToNamedPageReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->assertPattern('/Simple test front controller/');
-        $this->clickLink('Index');
-        $this->assertResponse(200);
-        $this->assertText('[action=index]');
-        $this->assertText('Count: 1');
-    }
-
-    function testJumpToUnnamedPageReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickLink('No page');
-        $this->assertResponse(200);
-        $this->assertText('Simple test front controller');
-        $this->assertText('[action=no_page]');
-        $this->assertText('Count: 1');
-    }
-
-    function testJumpToUnnamedPageWithBareParameterReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickLink('Bare action');
-        $this->assertResponse(200);
-        $this->assertText('Simple test front controller');
-        $this->assertText('[action=]');
-        $this->assertText('Count: 1');
-    }
-
-    function testJumpToUnnamedPageWithEmptyQueryReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickLink('Empty query');
-        $this->assertResponse(200);
-        $this->assertPattern('/Simple test front controller/');
-        $this->assertPattern('/raw get data.*?\[\].*?get data/si');
-        $this->assertPattern('/Count: 1/');
-    }
-
-    function testJumpToUnnamedPageWithEmptyLinkReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickLink('Empty link');
-        $this->assertResponse(200);
-        $this->assertPattern('/Simple test front controller/');
-        $this->assertPattern('/raw get data.*?\[\].*?get data/si');
-        $this->assertPattern('/Count: 1/');
-    }
-
-    function testJumpBackADirectoryLevelReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickLink('Down one');
-        $this->assertPattern('/index of .*\/test/i');
-        $this->assertPattern('/Count: 1/');
-    }
-
-    function testSubmitToNamedPageReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->assertPattern('/Simple test front controller/');
-        $this->clickSubmit('Index');
-        $this->assertResponse(200);
-        $this->assertText('[action=Index]');
-        $this->assertText('Count: 1');
-    }
-
-    function testSubmitToSameDirectoryReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickSubmit('Same directory');
-        $this->assertResponse(200);
-        $this->assertText('[action=Same+directory]');
-        $this->assertText('Count: 1');
-    }
-
-    function testSubmitToEmptyActionReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickSubmit('Empty action');
-        $this->assertResponse(200);
-        $this->assertText('[action=Empty+action]');
-        $this->assertText('Count: 1');
-    }
-
-    function testSubmitToNoActionReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickSubmit('No action');
-        $this->assertResponse(200);
-        $this->assertText('[action=No+action]');
-        $this->assertText('Count: 1');
-    }
-
-    function testSubmitBackADirectoryLevelReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickSubmit('Down one');
-        $this->assertPattern('/index of .*\/test/i');
-        $this->assertPattern('/Count: 1/');
-    }
-
-    function testTopLinkExitsFrameset() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickLink('Exit the frameset');
-        $this->assertTitle('Simple test target file');
-    }
-
-    function testLinkInOnePageCanLoadAnother() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->assertNoLink('3');
-        $this->clickLink('Set one to 2');
-        $this->assertLink('3');
-        $this->assertNoLink('2');
-        $this->assertTitle('Frameset for testing of SimpleTest');
-    }
-
-    function testFrameWithRelativeLinksRespectsBaseTagForThatPage() {
-        $this->get($this->samples() . 'base_tag/frameset.html');
-        $this->click('Back to test pages');
-        $this->assertTitle('Frameset for testing of SimpleTest');
-        $this->assertText('A target for the SimpleTest test suite');
-    }
-
-    function testRelativeLinkInFrameIsNotAffectedByFramesetBaseTag() {
-        $this->get($this->samples() . 'base_tag/frameset_with_base_tag.html');
-        $this->assertText('This is page 1');
-        $this->click('To page 2');
-        $this->assertTitle('Frameset for testing of SimpleTest');
-        $this->assertText('This is page 2');
-    }
-}
-
-class TestOfFrameAuthentication extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-
-    function testUnauthenticatedFrameSendsChallenge() {
-        $this->get($this->samples() . 'protected/');
-        $this->setFrameFocus('Protected');
-        $this->assertAuthentication('Basic');
-        $this->assertRealm('SimpleTest basic authentication');
-        $this->assertResponse(401);
-    }
-
-    function testCanReadFrameFromAlreadyAuthenticatedRealm() {
-        $this->get($this->samples() . 'protected/');
-        $this->authenticate('test', 'secret');
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->setFrameFocus('Protected');
-        $this->assertResponse(200);
-        $this->assertText('A target for the SimpleTest test suite');
-    }
-
-    function testCanAuthenticateFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->setFrameFocus('Protected');
-        $this->authenticate('test', 'secret');
-        $this->assertResponse(200);
-        $this->assertText('A target for the SimpleTest test suite');
-        $this->clearFrameFocus();
-        $this->assertText('Count: 1');
-    }
-
-    function testCanAuthenticateRedirectedFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->setFrameFocus('Protected redirect');
-        $this->assertResponse(401);
-        $this->authenticate('test', 'secret');
-        $this->assertResponse(200);
-        $this->assertText('A target for the SimpleTest test suite');
-        $this->clearFrameFocus();
-        $this->assertText('Count: 1');
-    }
-}
-
-class TestOfNestedFrames extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-
-    function testCanNavigateToSpecificContent() {
-        $this->get($this->samples() . 'nested_frameset.html');
-        $this->assertTitle('Nested frameset for testing of SimpleTest');
-
-        $this->assertPattern('/This is frame A/');
-        $this->assertPattern('/This is frame B/');
-        $this->assertPattern('/Simple test front controller/');
-        $this->assertLink('2');
-        $this->assertLink('Set one to 2');
-        $this->assertPattern('/Count: 1/');
-        $this->assertPattern('/r=rrr/');
-
-        $this->setFrameFocus('pair');
-        $this->assertPattern('/This is frame A/');
-        $this->assertPattern('/This is frame B/');
-        $this->assertNoPattern('/Simple test front controller/');
-        $this->assertNoLink('2');
-
-        $this->setFrameFocus('aaa');
-        $this->assertPattern('/This is frame A/');
-        $this->assertNoPattern('/This is frame B/');
-
-        $this->clearFrameFocus();
-        $this->assertResponse(200);
-        $this->setFrameFocus('messy');
-        $this->assertResponse(200);
-        $this->setFrameFocus('Front controller');
-        $this->assertResponse(200);
-        $this->assertPattern('/Simple test front controller/');
-        $this->assertNoLink('2');
-    }
-
-    function testReloadingFramesetPage() {
-        $this->get($this->samples() . 'nested_frameset.html');
-        $this->assertPattern('/Count: 1/');
-        $this->retry();
-        $this->assertPattern('/Count: 2/');
-        $this->retry();
-        $this->assertPattern('/Count: 3/');
-    }
-
-    function testRetryingNestedPageOnlyRetriesThatSet() {
-        $this->get($this->samples() . 'nested_frameset.html');
-        $this->assertPattern('/Count: 1/');
-        $this->setFrameFocus('messy');
-        $this->retry();
-        $this->assertPattern('/Count: 2/');
-        $this->setFrameFocus('Counter');
-        $this->retry();
-        $this->assertPattern('/Count: 3/');
-
-        $this->clearFrameFocus();
-        $this->setFrameFocus('messy');
-        $this->setFrameFocus('Front controller');
-        $this->retry();
-
-        $this->clearFrameFocus();
-        $this->assertPattern('/Count: 3/');
-    }
-
-    function testAuthenticatingNestedPage() {
-        $this->get($this->samples() . 'nested_frameset.html');
-        $this->setFrameFocus('messy');
-        $this->setFrameFocus('Protected');
-        $this->assertAuthentication('Basic');
-        $this->assertRealm('SimpleTest basic authentication');
-        $this->assertResponse(401);
-
-        $this->authenticate('test', 'secret');
-        $this->assertResponse(200);
-        $this->assertPattern('/A target for the SimpleTest test suite/');
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/adapter_test.php b/3rdparty/simpletest/test/adapter_test.php
deleted file mode 100755
index c1a06a2f653..00000000000
--- a/3rdparty/simpletest/test/adapter_test.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-// $Id: adapter_test.php 1748 2008-04-14 01:50:41Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../extensions/pear_test_case.php');
-
-class SameTestClass {
-}
-
-class TestOfPearAdapter extends PHPUnit_TestCase {
-    
-    function testBoolean() {
-        $this->assertTrue(true, "PEAR true");
-        $this->assertFalse(false, "PEAR false");
-    }
-    
-    function testName() {
-        $this->assertTrue($this->getName() == get_class($this));
-    }
-    
-    function testPass() {
-        $this->pass("PEAR pass");
-    }
-    
-    function testNulls() {
-        $value = null;
-        $this->assertNull($value, "PEAR null");
-        $value = 0;
-        $this->assertNotNull($value, "PEAR not null");
-    }
-    
-    function testType() {
-        $this->assertType("Hello", "string", "PEAR type");
-    }
-    
-    function testEquals() {
-        $this->assertEquals(12, 12, "PEAR identity");
-        $this->setLooselyTyped(true);
-        $this->assertEquals("12", 12, "PEAR equality");
-    }
-    
-    function testSame() {
-        $same = new SameTestClass();
-        $this->assertSame($same, $same, "PEAR same");
-    }
-    
-    function testRegExp() {
-        $this->assertRegExp('/hello/', "A big hello from me", "PEAR regex");
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/all_tests.php b/3rdparty/simpletest/test/all_tests.php
deleted file mode 100755
index 99ce9451e32..00000000000
--- a/3rdparty/simpletest/test/all_tests.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../autorun.php');
-
-class AllTests extends TestSuite {
-    function AllTests() {
-        $this->TestSuite('All tests for SimpleTest ' . SimpleTest::getVersion());
-        $this->addFile(dirname(__FILE__) . '/unit_tests.php');
-        $this->addFile(dirname(__FILE__) . '/shell_test.php');
-        $this->addFile(dirname(__FILE__) . '/live_test.php');
-        $this->addFile(dirname(__FILE__) . '/acceptance_test.php');
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/arguments_test.php b/3rdparty/simpletest/test/arguments_test.php
deleted file mode 100755
index 0cca4e99b24..00000000000
--- a/3rdparty/simpletest/test/arguments_test.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-// $Id: cookies_test.php 1506 2007-05-07 00:58:03Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../arguments.php');
-
-class TestOfCommandLineArgumentParsing extends UnitTestCase {
-    function testArgumentListWithJustProgramNameGivesFalseToEveryName() {
-        $arguments = new SimpleArguments(array('me'));
-        $this->assertIdentical($arguments->a, false);
-        $this->assertIdentical($arguments->all(), array());
-    }
-    
-    function testSingleArgumentNameRecordedAsTrue() {
-        $arguments = new SimpleArguments(array('me', '-a'));
-        $this->assertIdentical($arguments->a, true);
-    }
-    
-    function testSingleArgumentCanBeGivenAValue() {
-        $arguments = new SimpleArguments(array('me', '-a=AAA'));
-        $this->assertIdentical($arguments->a, 'AAA');
-    }
-    
-    function testSingleArgumentCanBeGivenSpaceSeparatedValue() {
-        $arguments = new SimpleArguments(array('me', '-a', 'AAA'));
-        $this->assertIdentical($arguments->a, 'AAA');
-    }
-    
-    function testWillBuildArrayFromRepeatedValue() {
-        $arguments = new SimpleArguments(array('me', '-a', 'A', '-a', 'AA'));
-        $this->assertIdentical($arguments->a, array('A', 'AA'));
-    }
-    
-    function testWillBuildArrayFromMultiplyRepeatedValues() {
-        $arguments = new SimpleArguments(array('me', '-a', 'A', '-a', 'AA', '-a', 'AAA'));
-        $this->assertIdentical($arguments->a, array('A', 'AA', 'AAA'));
-    }
-    
-    function testCanParseLongFormArguments() {
-        $arguments = new SimpleArguments(array('me', '--aa=AA', '--bb', 'BB'));
-        $this->assertIdentical($arguments->aa, 'AA');
-        $this->assertIdentical($arguments->bb, 'BB');
-    }
-    
-    function testGetsFullSetOfResultsAsHash() {
-        $arguments = new SimpleArguments(array('me', '-a', '-b=1', '-b', '2', '--aa=AA', '--bb', 'BB', '-c'));
-        $this->assertEqual($arguments->all(),
-                           array('a' => true, 'b' => array('1', '2'), 'aa' => 'AA', 'bb' => 'BB', 'c' => true));
-    }
-}
-
-class TestOfHelpOutput extends UnitTestCase {
-    function testDisplaysGeneralHelpBanner() {
-        $help = new SimpleHelp('Cool program');
-        $this->assertEqual($help->render(), "Cool program\n");
-    }
-    
-    function testDisplaysOnlySingleLineEndings() {
-        $help = new SimpleHelp("Cool program\n");
-        $this->assertEqual($help->render(), "Cool program\n");
-    }
-    
-    function testDisplaysHelpOnShortFlag() {
-        $help = new SimpleHelp('Cool program');
-        $help->explainFlag('a', 'Enables A');
-        $this->assertEqual($help->render(), "Cool program\n-a    Enables A\n");
-    }
-    
-    function testHasAtleastFourSpacesAfterLongestFlag() {
-        $help = new SimpleHelp('Cool program');
-        $help->explainFlag('a', 'Enables A');
-        $help->explainFlag('long', 'Enables Long');
-        $this->assertEqual($help->render(),
-                           "Cool program\n-a        Enables A\n--long    Enables Long\n");
-    }
-    
-    function testCanDisplaysMultipleFlagsForEachOption() {
-        $help = new SimpleHelp('Cool program');
-        $help->explainFlag(array('a', 'aa'), 'Enables A');
-        $this->assertEqual($help->render(), "Cool program\n-a      Enables A\n  --aa\n");
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/authentication_test.php b/3rdparty/simpletest/test/authentication_test.php
deleted file mode 100755
index 081cccddfae..00000000000
--- a/3rdparty/simpletest/test/authentication_test.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-// $Id: authentication_test.php 1748 2008-04-14 01:50:41Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../authentication.php');
-require_once(dirname(__FILE__) . '/../http.php');
-Mock::generate('SimpleHttpRequest');
-
-class TestOfRealm extends UnitTestCase {
-    
-    function testWithinSameUrl() {
-        $realm = new SimpleRealm(
-                'Basic',
-                new SimpleUrl('http://www.here.com/path/hello.html'));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path/hello.html')));
-    }
-    
-    function testInsideWithLongerUrl() {
-        $realm = new SimpleRealm(
-                'Basic',
-                new SimpleUrl('http://www.here.com/path/'));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path/hello.html')));
-    }
-    
-    function testBelowRootIsOutside() {
-        $realm = new SimpleRealm(
-                'Basic',
-                new SimpleUrl('http://www.here.com/path/'));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path/more/hello.html')));
-    }
-    
-    function testOldNetscapeDefinitionIsOutside() {
-        $realm = new SimpleRealm(
-                'Basic',
-                new SimpleUrl('http://www.here.com/path/'));
-        $this->assertFalse($realm->isWithin(
-                new SimpleUrl('http://www.here.com/pathmore/hello.html')));
-    }
-    
-    function testInsideWithMissingTrailingSlash() {
-        $realm = new SimpleRealm(
-                'Basic',
-                new SimpleUrl('http://www.here.com/path/'));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path')));
-    }
-    
-    function testDifferentPageNameStillInside() {
-        $realm = new SimpleRealm(
-                'Basic',
-                new SimpleUrl('http://www.here.com/path/hello.html'));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path/goodbye.html')));
-    }
-    
-    function testNewUrlInSameDirectoryDoesNotChangeRealm() {
-        $realm = new SimpleRealm(
-                'Basic',
-                new SimpleUrl('http://www.here.com/path/hello.html'));
-        $realm->stretch(new SimpleUrl('http://www.here.com/path/goodbye.html'));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path/index.html')));
-        $this->assertFalse($realm->isWithin(
-                new SimpleUrl('http://www.here.com/index.html')));
-    }
-    
-    function testNewUrlMakesRealmTheCommonPath() {
-        $realm = new SimpleRealm(
-                'Basic',
-                new SimpleUrl('http://www.here.com/path/here/hello.html'));
-        $realm->stretch(new SimpleUrl('http://www.here.com/path/there/goodbye.html'));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path/here/index.html')));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path/there/index.html')));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path/index.html')));
-        $this->assertFalse($realm->isWithin(
-                new SimpleUrl('http://www.here.com/index.html')));
-        $this->assertFalse($realm->isWithin(
-                new SimpleUrl('http://www.here.com/paths/index.html')));
-        $this->assertFalse($realm->isWithin(
-                new SimpleUrl('http://www.here.com/pathindex.html')));
-    }
-}
-
-class TestOfAuthenticator extends UnitTestCase {
-    
-    function testNoRealms() {
-        $request = new MockSimpleHttpRequest();
-        $request->expectNever('addHeaderLine');
-        $authenticator = new SimpleAuthenticator();
-        $authenticator->addHeaders($request, new SimpleUrl('http://here.com/'));
-    }
-    
-    function &createSingleRealm() {
-        $authenticator = new SimpleAuthenticator();
-        $authenticator->addRealm(
-                new SimpleUrl('http://www.here.com/path/hello.html'),
-                'Basic',
-                'Sanctuary');
-        $authenticator->setIdentityForRealm('www.here.com', 'Sanctuary', 'test', 'secret');
-        return $authenticator;
-    }
-    
-    function testOutsideRealm() {
-        $request = new MockSimpleHttpRequest();
-        $request->expectNever('addHeaderLine');
-        $authenticator = &$this->createSingleRealm();
-        $authenticator->addHeaders(
-                $request,
-                new SimpleUrl('http://www.here.com/hello.html'));
-    }
-    
-    function testWithinRealm() {
-        $request = new MockSimpleHttpRequest();
-        $request->expectOnce('addHeaderLine');
-        $authenticator = &$this->createSingleRealm();
-        $authenticator->addHeaders(
-                $request,
-                new SimpleUrl('http://www.here.com/path/more/hello.html'));
-    }
-    
-    function testRestartingClearsRealm() {
-        $request = new MockSimpleHttpRequest();
-        $request->expectNever('addHeaderLine');
-        $authenticator = &$this->createSingleRealm();
-        $authenticator->restartSession();
-        $authenticator->addHeaders(
-                $request,
-                new SimpleUrl('http://www.here.com/hello.html'));
-    }
-    
-    function testDifferentHostIsOutsideRealm() {
-        $request = new MockSimpleHttpRequest();
-        $request->expectNever('addHeaderLine');
-        $authenticator = &$this->createSingleRealm();
-        $authenticator->addHeaders(
-                $request,
-                new SimpleUrl('http://here.com/path/hello.html'));
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/autorun_test.php b/3rdparty/simpletest/test/autorun_test.php
deleted file mode 100755
index d85ea19897c..00000000000
--- a/3rdparty/simpletest/test/autorun_test.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/support/test1.php');
-
-class TestOfAutorun extends UnitTestCase {
-    function testLoadIfIncluded() {
-        $tests = new TestSuite();
-        $tests->addFile(dirname(__FILE__) . '/support/test1.php');
-        $this->assertEqual($tests->getSize(), 1);
-    }
-
-    function testExitStatusOneIfTestsFail() {
-        exec('php ' . dirname(__FILE__) . '/support/failing_test.php', $output, $exit_status);
-        $this->assertEqual($exit_status, 1);
-    }
-
-    function testExitStatusZeroIfTestsPass() {
-        exec('php ' . dirname(__FILE__) . '/support/passing_test.php', $output, $exit_status);
-        $this->assertEqual($exit_status, 0);
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/bad_test_suite.php b/3rdparty/simpletest/test/bad_test_suite.php
deleted file mode 100755
index b426013be40..00000000000
--- a/3rdparty/simpletest/test/bad_test_suite.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../autorun.php');
-
-class BadTestCases extends TestSuite {
-    function BadTestCases() {
-        $this->TestSuite('Two bad test cases');
-        $this->addFile(dirname(__FILE__) . '/support/empty_test_file.php');
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/browser_test.php b/3rdparty/simpletest/test/browser_test.php
deleted file mode 100755
index 3a52aaa8ff4..00000000000
--- a/3rdparty/simpletest/test/browser_test.php
+++ /dev/null
@@ -1,802 +0,0 @@
-<?php
-// $Id: browser_test.php 1964 2009-10-13 15:27:31Z maetl_ $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../browser.php');
-require_once(dirname(__FILE__) . '/../user_agent.php');
-require_once(dirname(__FILE__) . '/../http.php');
-require_once(dirname(__FILE__) . '/../page.php');
-require_once(dirname(__FILE__) . '/../encoding.php');
-
-Mock::generate('SimpleHttpResponse');
-Mock::generate('SimplePage');
-Mock::generate('SimpleForm');
-Mock::generate('SimpleUserAgent');
-Mock::generatePartial(
-        'SimpleBrowser',
-        'MockParseSimpleBrowser',
-        array('createUserAgent', 'parse'));
-Mock::generatePartial(
-        'SimpleBrowser',
-        'MockUserAgentSimpleBrowser',
-        array('createUserAgent'));
-
-class TestOfHistory extends UnitTestCase {
-
-    function testEmptyHistoryHasFalseContents() {
-        $history = new SimpleBrowserHistory();
-        $this->assertIdentical($history->getUrl(), false);
-        $this->assertIdentical($history->getParameters(), false);
-    }
-
-    function testCannotMoveInEmptyHistory() {
-        $history = new SimpleBrowserHistory();
-        $this->assertFalse($history->back());
-        $this->assertFalse($history->forward());
-    }
-
-    function testCurrentTargetAccessors() {
-        $history = new SimpleBrowserHistory();
-        $history->recordEntry(
-                new SimpleUrl('http://www.here.com/'),
-                new SimpleGetEncoding());
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.here.com/'));
-        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
-    }
-
-    function testSecondEntryAccessors() {
-        $history = new SimpleBrowserHistory();
-        $history->recordEntry(
-                new SimpleUrl('http://www.first.com/'),
-                new SimpleGetEncoding());
-        $history->recordEntry(
-                new SimpleUrl('http://www.second.com/'),
-                new SimplePostEncoding(array('a' => 1)));
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.second.com/'));
-        $this->assertIdentical(
-                $history->getParameters(),
-                new SimplePostEncoding(array('a' => 1)));
-    }
-
-    function testGoingBackwards() {
-        $history = new SimpleBrowserHistory();
-        $history->recordEntry(
-                new SimpleUrl('http://www.first.com/'),
-                new SimpleGetEncoding());
-        $history->recordEntry(
-                new SimpleUrl('http://www.second.com/'),
-                new SimplePostEncoding(array('a' => 1)));
-        $this->assertTrue($history->back());
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
-        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
-    }
-
-    function testGoingBackwardsOffBeginning() {
-        $history = new SimpleBrowserHistory();
-        $history->recordEntry(
-                new SimpleUrl('http://www.first.com/'),
-                new SimpleGetEncoding());
-        $this->assertFalse($history->back());
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
-        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
-    }
-
-    function testGoingForwardsOffEnd() {
-        $history = new SimpleBrowserHistory();
-        $history->recordEntry(
-                new SimpleUrl('http://www.first.com/'),
-                new SimpleGetEncoding());
-        $this->assertFalse($history->forward());
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
-        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
-    }
-
-    function testGoingBackwardsAndForwards() {
-        $history = new SimpleBrowserHistory();
-        $history->recordEntry(
-                new SimpleUrl('http://www.first.com/'),
-                new SimpleGetEncoding());
-        $history->recordEntry(
-                new SimpleUrl('http://www.second.com/'),
-                new SimplePostEncoding(array('a' => 1)));
-        $this->assertTrue($history->back());
-        $this->assertTrue($history->forward());
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.second.com/'));
-        $this->assertIdentical(
-                $history->getParameters(),
-                new SimplePostEncoding(array('a' => 1)));
-    }
-
-    function testNewEntryReplacesNextOne() {
-        $history = new SimpleBrowserHistory();
-        $history->recordEntry(
-                new SimpleUrl('http://www.first.com/'),
-                new SimpleGetEncoding());
-        $history->recordEntry(
-                new SimpleUrl('http://www.second.com/'),
-                new SimplePostEncoding(array('a' => 1)));
-        $history->back();
-        $history->recordEntry(
-                new SimpleUrl('http://www.third.com/'),
-                new SimpleGetEncoding());
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.third.com/'));
-        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
-    }
-
-    function testNewEntryDropsFutureEntries() {
-        $history = new SimpleBrowserHistory();
-        $history->recordEntry(
-                new SimpleUrl('http://www.first.com/'),
-                new SimpleGetEncoding());
-        $history->recordEntry(
-                new SimpleUrl('http://www.second.com/'),
-                new SimpleGetEncoding());
-        $history->recordEntry(
-                new SimpleUrl('http://www.third.com/'),
-                new SimpleGetEncoding());
-        $history->back();
-        $history->back();
-        $history->recordEntry(
-                new SimpleUrl('http://www.fourth.com/'),
-                new SimpleGetEncoding());
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.fourth.com/'));
-        $this->assertFalse($history->forward());
-        $history->back();
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
-        $this->assertFalse($history->back());
-    }
-}
-
-class TestOfParsedPageAccess extends UnitTestCase {
-
-    function loadPage(&$page) {
-        $response = new MockSimpleHttpResponse($this);
-        $agent = new MockSimpleUserAgent($this);
-        $agent->returns('fetchResponse', $response);
-
-        $browser = new MockParseSimpleBrowser($this);
-        $browser->returns('createUserAgent', $agent);
-        $browser->returns('parse', $page);
-        $browser->__construct();
-
-        $browser->get('http://this.com/page.html');
-        return $browser;
-    }
-
-    function testAccessorsWhenNoPage() {
-        $agent = new MockSimpleUserAgent($this);
-        $browser = new MockParseSimpleBrowser($this);
-        $browser->returns('createUserAgent', $agent);
-        $browser->__construct();
-        $this->assertEqual($browser->getContent(), '');
-    }
-
-    function testParse() {
-        $page = new MockSimplePage();
-        $page->setReturnValue('getRequest', "GET here.html\r\n\r\n");
-        $page->setReturnValue('getRaw', 'Raw HTML');
-        $page->setReturnValue('getTitle', 'Here');
-        $page->setReturnValue('getFrameFocus', 'Frame');
-        $page->setReturnValue('getMimeType', 'text/html');
-        $page->setReturnValue('getResponseCode', 200);
-        $page->setReturnValue('getAuthentication', 'Basic');
-        $page->setReturnValue('getRealm', 'Somewhere');
-        $page->setReturnValue('getTransportError', 'Ouch!');
-
-        $browser = $this->loadPage($page);
-        $this->assertEqual($browser->getRequest(), "GET here.html\r\n\r\n");
-        $this->assertEqual($browser->getContent(), 'Raw HTML');
-        $this->assertEqual($browser->getTitle(), 'Here');
-        $this->assertEqual($browser->getFrameFocus(), 'Frame');
-        $this->assertIdentical($browser->getResponseCode(), 200);
-        $this->assertEqual($browser->getMimeType(), 'text/html');
-        $this->assertEqual($browser->getAuthentication(), 'Basic');
-        $this->assertEqual($browser->getRealm(), 'Somewhere');
-        $this->assertEqual($browser->getTransportError(), 'Ouch!');
-    }
-
-    function testLinkAffirmationWhenPresent() {
-        $page = new MockSimplePage();
-        $page->setReturnValue('getUrlsByLabel', array('http://www.nowhere.com'));
-        $page->expectOnce('getUrlsByLabel', array('a link label'));
-        $browser = $this->loadPage($page);
-        $this->assertIdentical($browser->getLink('a link label'), 'http://www.nowhere.com');
-    }
-
-    function testLinkAffirmationByIdWhenPresent() {
-        $page = new MockSimplePage();
-        $page->setReturnValue('getUrlById', 'a_page.com', array(99));
-        $page->setReturnValue('getUrlById', false, array('*'));
-        $browser = $this->loadPage($page);
-        $this->assertIdentical($browser->getLinkById(99), 'a_page.com');
-        $this->assertFalse($browser->getLinkById(98));
-    }
-
-    function testSettingFieldIsPassedToPage() {
-        $page = new MockSimplePage();
-        $page->expectOnce('setField', array(new SimpleByLabelOrName('key'), 'Value', false));
-        $page->setReturnValue('getField', 'Value');
-        $browser = $this->loadPage($page);
-        $this->assertEqual($browser->getField('key'), 'Value');
-        $browser->setField('key', 'Value');
-    }
-}
-
-class TestOfBrowserNavigation extends UnitTestCase {
-    function createBrowser($agent, $page) {
-        $browser = new MockParseSimpleBrowser();
-        $browser->returns('createUserAgent', $agent);
-        $browser->returns('parse', $page);
-        $browser->__construct();
-        return $browser;
-    }
-
-    function testBrowserRequestMethods() {
-        $agent = new MockSimpleUserAgent();
-        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
-        $agent->expectAt(
-                0,
-                'fetchResponse',
-                array(new SimpleUrl('http://this.com/get.req'), new SimpleGetEncoding()));
-        $agent->expectAt(
-                1,
-                'fetchResponse',
-                array(new SimpleUrl('http://this.com/post.req'), new SimplePostEncoding()));
-        $agent->expectAt(
-                2,
-                'fetchResponse',
-                array(new SimpleUrl('http://this.com/put.req'), new SimplePutEncoding()));
-        $agent->expectAt(
-                3,
-                'fetchResponse',
-                array(new SimpleUrl('http://this.com/delete.req'), new SimpleDeleteEncoding()));
-        $agent->expectAt(
-                4,
-                'fetchResponse',
-                array(new SimpleUrl('http://this.com/head.req'), new SimpleHeadEncoding()));                               
-        $agent->expectCallCount('fetchResponse', 5);
-
-        $page = new MockSimplePage();
-
-        $browser = $this->createBrowser($agent, $page);
-        $browser->get('http://this.com/get.req');
-        $browser->post('http://this.com/post.req');
-        $browser->put('http://this.com/put.req');
-        $browser->delete('http://this.com/delete.req');
-        $browser->head('http://this.com/head.req');
-    }  
-    
-    function testClickLinkRequestsPage() {
-        $agent = new MockSimpleUserAgent();
-        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
-        $agent->expectAt(
-                0,
-                'fetchResponse',
-                array(new SimpleUrl('http://this.com/page.html'), new SimpleGetEncoding()));
-        $agent->expectAt(
-                1,
-                'fetchResponse',
-                array(new SimpleUrl('http://this.com/new.html'), new SimpleGetEncoding()));
-        $agent->expectCallCount('fetchResponse', 2);
-
-        $page = new MockSimplePage();
-        $page->setReturnValue('getUrlsByLabel', array(new SimpleUrl('http://this.com/new.html')));
-        $page->expectOnce('getUrlsByLabel', array('New'));
-        $page->setReturnValue('getRaw', 'A page');
-
-        $browser = $this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickLink('New'));
-    }
-
-    function testClickLinkWithUnknownFrameStillRequestsWholePage() {
-        $agent = new MockSimpleUserAgent();
-        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
-        $agent->expectAt(
-                0,
-                'fetchResponse',
-                array(new SimpleUrl('http://this.com/page.html'), new SimpleGetEncoding()));
-        $target = new SimpleUrl('http://this.com/new.html');
-        $target->setTarget('missing');
-        $agent->expectAt(
-                1,
-                'fetchResponse',
-                array($target, new SimpleGetEncoding()));
-        $agent->expectCallCount('fetchResponse', 2);
-
-        $parsed_url = new SimpleUrl('http://this.com/new.html');
-        $parsed_url->setTarget('missing');
-
-        $page = new MockSimplePage();
-        $page->setReturnValue('getUrlsByLabel', array($parsed_url));
-        $page->setReturnValue('hasFrames', false);
-        $page->expectOnce('getUrlsByLabel', array('New'));
-        $page->setReturnValue('getRaw', 'A page');
-
-        $browser = $this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickLink('New'));
-    }
-
-    function testClickingMissingLinkFails() {
-        $agent = new MockSimpleUserAgent($this);
-        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
-
-        $page = new MockSimplePage();
-        $page->setReturnValue('getUrlsByLabel', array());
-        $page->setReturnValue('getRaw', 'stuff');
-
-        $browser = $this->createBrowser($agent, $page);
-        $this->assertTrue($browser->get('http://this.com/page.html'));
-        $this->assertFalse($browser->clickLink('New'));
-    }
-
-    function testClickIndexedLink() {
-        $agent = new MockSimpleUserAgent();
-        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
-        $agent->expectAt(
-                1,
-                'fetchResponse',
-                array(new SimpleUrl('1.html'), new SimpleGetEncoding()));
-        $agent->expectCallCount('fetchResponse', 2);
-
-        $page = new MockSimplePage();
-        $page->setReturnValue(
-                'getUrlsByLabel',
-                array(new SimpleUrl('0.html'), new SimpleUrl('1.html')));
-        $page->setReturnValue('getRaw', 'A page');
-
-        $browser = $this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickLink('New', 1));
-    }
-
-    function testClinkLinkById() {
-        $agent = new MockSimpleUserAgent();
-        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
-        $agent->expectAt(1, 'fetchResponse', array(
-                new SimpleUrl('http://this.com/link.html'),
-                new SimpleGetEncoding()));
-        $agent->expectCallCount('fetchResponse', 2);
-
-        $page = new MockSimplePage();
-        $page->setReturnValue('getUrlById', new SimpleUrl('http://this.com/link.html'));
-        $page->expectOnce('getUrlById', array(2));
-        $page->setReturnValue('getRaw', 'A page');
-
-        $browser = $this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickLinkById(2));
-    }
-
-    function testClickingMissingLinkIdFails() {
-        $agent = new MockSimpleUserAgent();
-        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
-
-        $page = new MockSimplePage();
-        $page->setReturnValue('getUrlById', false);
-
-        $browser = $this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertFalse($browser->clickLink(0));
-    }
-
-    function testSubmitFormByLabel() {
-        $agent = new MockSimpleUserAgent();
-        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
-        $agent->expectAt(1, 'fetchResponse', array(
-                new SimpleUrl('http://this.com/handler.html'),
-                new SimplePostEncoding(array('a' => 'A'))));
-        $agent->expectCallCount('fetchResponse', 2);
-
-        $form = new MockSimpleForm();
-        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
-        $form->setReturnValue('getMethod', 'post');
-        $form->setReturnValue('submitButton', new SimplePostEncoding(array('a' => 'A')));
-        $form->expectOnce('submitButton', array(new SimpleByLabel('Go'), false));
-
-        $page = new MockSimplePage();
-        $page->returns('getFormBySubmit', $form);
-        $page->expectOnce('getFormBySubmit', array(new SimpleByLabel('Go')));
-        $page->setReturnValue('getRaw', 'stuff');
-
-        $browser = $this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickSubmit('Go'));
-    }
-
-    function testDefaultSubmitFormByLabel() {
-        $agent = new MockSimpleUserAgent();
-        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
-        $agent->expectAt(1,  'fetchResponse', array(
-                new SimpleUrl('http://this.com/page.html'),
-                new SimpleGetEncoding(array('a' => 'A'))));
-        $agent->expectCallCount('fetchResponse', 2);
-
-        $form = new MockSimpleForm();
-        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/page.html'));
-        $form->setReturnValue('getMethod', 'get');
-        $form->setReturnValue('submitButton', new SimpleGetEncoding(array('a' => 'A')));
-
-        $page = new MockSimplePage();
-        $page->returns('getFormBySubmit', $form);
-        $page->expectOnce('getFormBySubmit', array(new SimpleByLabel('Submit')));
-        $page->setReturnValue('getRaw', 'stuff');
-        $page->setReturnValue('getUrl', new SimpleUrl('http://this.com/page.html'));
-
-        $browser = $this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickSubmit());
-    }
-
-    function testSubmitFormByName() {
-        $agent = new MockSimpleUserAgent();
-        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
-
-        $form = new MockSimpleForm();
-        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
-        $form->setReturnValue('getMethod', 'post');
-        $form->setReturnValue('submitButton', new SimplePostEncoding(array('a' => 'A')));
-
-        $page = new MockSimplePage();
-        $page->returns('getFormBySubmit', $form);
-        $page->expectOnce('getFormBySubmit', array(new SimpleByName('me')));
-        $page->setReturnValue('getRaw', 'stuff');
-
-        $browser = $this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickSubmitByName('me'));
-    }
-
-    function testSubmitFormById() {
-        $agent = new MockSimpleUserAgent();
-        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
-
-        $form = new MockSimpleForm();
-        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
-        $form->setReturnValue('getMethod', 'post');
-        $form->setReturnValue('submitButton', new SimplePostEncoding(array('a' => 'A')));
-        $form->expectOnce('submitButton', array(new SimpleById(99), false));
-
-        $page = new MockSimplePage();
-        $page->returns('getFormBySubmit', $form);
-        $page->expectOnce('getFormBySubmit', array(new SimpleById(99)));
-        $page->setReturnValue('getRaw', 'stuff');
-
-        $browser = $this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickSubmitById(99));
-    }
-
-    function testSubmitFormByImageLabel() {
-        $agent = new MockSimpleUserAgent();
-        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
-
-        $form = new MockSimpleForm();
-        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
-        $form->setReturnValue('getMethod', 'post');
-        $form->setReturnValue('submitImage', new SimplePostEncoding(array('a' => 'A')));
-        $form->expectOnce('submitImage', array(new SimpleByLabel('Go!'), 10, 11, false));
-
-        $page = new MockSimplePage();
-        $page->returns('getFormByImage', $form);
-        $page->expectOnce('getFormByImage', array(new SimpleByLabel('Go!')));
-        $page->setReturnValue('getRaw', 'stuff');
-
-        $browser = $this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickImage('Go!', 10, 11));
-    }
-
-    function testSubmitFormByImageName() {
-        $agent = new MockSimpleUserAgent();
-        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
-
-        $form = new MockSimpleForm();
-        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
-        $form->setReturnValue('getMethod', 'post');
-        $form->setReturnValue('submitImage', new SimplePostEncoding(array('a' => 'A')));
-        $form->expectOnce('submitImage', array(new SimpleByName('a'), 10, 11, false));
-
-        $page = new MockSimplePage();
-        $page->returns('getFormByImage', $form);
-        $page->expectOnce('getFormByImage', array(new SimpleByName('a')));
-        $page->setReturnValue('getRaw', 'stuff');
-
-        $browser = $this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickImageByName('a', 10, 11));
-    }
-
-    function testSubmitFormByImageId() {
-        $agent = new MockSimpleUserAgent();
-        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
-
-        $form = new MockSimpleForm();
-        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
-        $form->setReturnValue('getMethod', 'post');
-        $form->setReturnValue('submitImage', new SimplePostEncoding(array('a' => 'A')));
-        $form->expectOnce('submitImage', array(new SimpleById(99), 10, 11, false));
-
-        $page = new MockSimplePage();
-        $page->returns('getFormByImage', $form);
-        $page->expectOnce('getFormByImage', array(new SimpleById(99)));
-        $page->setReturnValue('getRaw', 'stuff');
-
-        $browser = $this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickImageById(99, 10, 11));
-    }
-
-    function testSubmitFormByFormId() {
-        $agent = new MockSimpleUserAgent();
-        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
-        $agent->expectAt(1, 'fetchResponse', array(
-                new SimpleUrl('http://this.com/handler.html'),
-                new SimplePostEncoding(array('a' => 'A'))));
-        $agent->expectCallCount('fetchResponse', 2);
-
-        $form = new MockSimpleForm();
-        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
-        $form->setReturnValue('getMethod', 'post');
-        $form->setReturnValue('submit', new SimplePostEncoding(array('a' => 'A')));
-
-        $page = new MockSimplePage();
-        $page->returns('getFormById', $form);
-        $page->expectOnce('getFormById', array(33));
-        $page->setReturnValue('getRaw', 'stuff');
-
-        $browser = $this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->submitFormById(33));
-    }
-}
-
-class TestOfBrowserFrames extends UnitTestCase {
-
-    function createBrowser($agent) {
-        $browser = new MockUserAgentSimpleBrowser();
-        $browser->returns('createUserAgent', $agent);
-        $browser->__construct();
-        return $browser;
-    }
-
-    function createUserAgent($pages) {
-        $agent = new MockSimpleUserAgent();
-        foreach ($pages as $url => $raw) {
-            $url = new SimpleUrl($url);
-            $response = new MockSimpleHttpResponse();
-            $response->setReturnValue('getUrl', $url);
-            $response->setReturnValue('getContent', $raw);
-            $agent->returns('fetchResponse', $response, array($url, '*'));
-        }
-        return $agent;
-    }
-
-    function testSimplePageHasNoFrames() {
-        $browser = $this->createBrowser($this->createUserAgent(
-                array('http://site.with.no.frames/' => 'A non-framed page')));
-        $this->assertEqual(
-                $browser->get('http://site.with.no.frames/'),
-                'A non-framed page');
-        $this->assertIdentical($browser->getFrames(), 'http://site.with.no.frames/');
-    }
-
-    function testFramesetWithSingleFrame() {
-        $frameset = '<frameset><frame name="a" src="frame.html"></frameset>';
-        $browser = $this->createBrowser($this->createUserAgent(array(
-                'http://site.with.one.frame/' => $frameset,
-                'http://site.with.one.frame/frame.html' => 'A frame')));
-        $this->assertEqual($browser->get('http://site.with.one.frame/'), 'A frame');
-        $this->assertIdentical(
-                $browser->getFrames(),
-                array('a' => 'http://site.with.one.frame/frame.html'));
-    }
-
-    function testTitleTakenFromFramesetPage() {
-        $frameset = '<title>Frameset title</title>' .
-                '<frameset><frame name="a" src="frame.html"></frameset>';
-        $browser = $this->createBrowser($this->createUserAgent(array(
-                'http://site.with.one.frame/' => $frameset,
-                'http://site.with.one.frame/frame.html' => '<title>Page title</title>')));
-        $browser->get('http://site.with.one.frame/');
-        $this->assertEqual($browser->getTitle(), 'Frameset title');
-    }
-
-    function testFramesetWithSingleUnnamedFrame() {
-        $frameset = '<frameset><frame src="frame.html"></frameset>';
-        $browser = $this->createBrowser($this->createUserAgent(array(
-                'http://site.with.one.frame/' => $frameset,
-                'http://site.with.one.frame/frame.html' => 'One frame')));
-        $this->assertEqual(
-                $browser->get('http://site.with.one.frame/'),
-                'One frame');
-        $this->assertIdentical(
-                $browser->getFrames(),
-                array(1 => 'http://site.with.one.frame/frame.html'));
-    }
-
-    function testFramesetWithMultipleFrames() {
-        $frameset = '<frameset>' .
-                '<frame name="a" src="frame_a.html">' .
-                '<frame name="b" src="frame_b.html">' .
-                '<frame name="c" src="frame_c.html">' .
-                '</frameset>';
-        $browser = $this->createBrowser($this->createUserAgent(array(
-                'http://site.with.frames/' => $frameset,
-                'http://site.with.frames/frame_a.html' => 'A frame',
-                'http://site.with.frames/frame_b.html' => 'B frame',
-                'http://site.with.frames/frame_c.html' => 'C frame')));
-        $this->assertEqual(
-                $browser->get('http://site.with.frames/'),
-                'A frameB frameC frame');
-        $this->assertIdentical($browser->getFrames(), array(
-                'a' => 'http://site.with.frames/frame_a.html',
-                'b' => 'http://site.with.frames/frame_b.html',
-                'c' => 'http://site.with.frames/frame_c.html'));
-    }
-
-    function testFrameFocusByName() {
-        $frameset = '<frameset>' .
-                '<frame name="a" src="frame_a.html">' .
-                '<frame name="b" src="frame_b.html">' .
-                '<frame name="c" src="frame_c.html">' .
-                '</frameset>';
-        $browser = $this->createBrowser($this->createUserAgent(array(
-                'http://site.with.frames/' => $frameset,
-                'http://site.with.frames/frame_a.html' => 'A frame',
-                'http://site.with.frames/frame_b.html' => 'B frame',
-                'http://site.with.frames/frame_c.html' => 'C frame')));
-        $browser->get('http://site.with.frames/');
-        $browser->setFrameFocus('a');
-        $this->assertEqual($browser->getContent(), 'A frame');
-        $browser->setFrameFocus('b');
-        $this->assertEqual($browser->getContent(), 'B frame');
-        $browser->setFrameFocus('c');
-        $this->assertEqual($browser->getContent(), 'C frame');
-    }
-
-    function testFramesetWithSomeNamedFrames() {
-        $frameset = '<frameset>' .
-                '<frame name="a" src="frame_a.html">' .
-                '<frame src="frame_b.html">' .
-                '<frame name="c" src="frame_c.html">' .
-                '<frame src="frame_d.html">' .
-                '</frameset>';
-        $browser = $this->createBrowser($this->createUserAgent(array(
-                'http://site.with.frames/' => $frameset,
-                'http://site.with.frames/frame_a.html' => 'A frame',
-                'http://site.with.frames/frame_b.html' => 'B frame',
-                'http://site.with.frames/frame_c.html' => 'C frame',
-                'http://site.with.frames/frame_d.html' => 'D frame')));
-        $this->assertEqual(
-                $browser->get('http://site.with.frames/'),
-                'A frameB frameC frameD frame');
-        $this->assertIdentical($browser->getFrames(), array(
-                'a' => 'http://site.with.frames/frame_a.html',
-                2 => 'http://site.with.frames/frame_b.html',
-                'c' => 'http://site.with.frames/frame_c.html',
-                4 => 'http://site.with.frames/frame_d.html'));
-    }
-
-    function testFrameFocusWithMixedNamesAndIndexes() {
-        $frameset = '<frameset>' .
-                '<frame name="a" src="frame_a.html">' .
-                '<frame src="frame_b.html">' .
-                '<frame name="c" src="frame_c.html">' .
-                '<frame src="frame_d.html">' .
-                '</frameset>';
-        $browser = $this->createBrowser($this->createUserAgent(array(
-                'http://site.with.frames/' => $frameset,
-                'http://site.with.frames/frame_a.html' => 'A frame',
-                'http://site.with.frames/frame_b.html' => 'B frame',
-                'http://site.with.frames/frame_c.html' => 'C frame',
-                'http://site.with.frames/frame_d.html' => 'D frame')));
-        $browser->get('http://site.with.frames/');
-        $browser->setFrameFocus('a');
-        $this->assertEqual($browser->getContent(), 'A frame');
-        $browser->setFrameFocus(2);
-        $this->assertEqual($browser->getContent(), 'B frame');
-        $browser->setFrameFocus('c');
-        $this->assertEqual($browser->getContent(), 'C frame');
-        $browser->setFrameFocus(4);
-        $this->assertEqual($browser->getContent(), 'D frame');
-        $browser->clearFrameFocus();
-        $this->assertEqual($browser->getContent(), 'A frameB frameC frameD frame');
-    }
-
-    function testNestedFrameset() {
-        $inner = '<frameset>' .
-                '<frame name="page" src="page.html">' .
-                '</frameset>';
-        $outer = '<frameset>' .
-                '<frame name="inner" src="inner.html">' .
-                '</frameset>';
-        $browser = $this->createBrowser($this->createUserAgent(array(
-                'http://site.with.nested.frame/' => $outer,
-                'http://site.with.nested.frame/inner.html' => $inner,
-                'http://site.with.nested.frame/page.html' => 'The page')));
-        $this->assertEqual(
-                $browser->get('http://site.with.nested.frame/'),
-                'The page');
-        $this->assertIdentical($browser->getFrames(), array(
-                'inner' => array(
-                        'page' => 'http://site.with.nested.frame/page.html')));
-    }
-
-    function testCanNavigateToNestedFrame() {
-        $inner = '<frameset>' .
-                '<frame name="one" src="one.html">' .
-                '<frame name="two" src="two.html">' .
-                '</frameset>';
-        $outer = '<frameset>' .
-                '<frame name="inner" src="inner.html">' .
-                '<frame name="three" src="three.html">' .
-                '</frameset>';
-        $browser = $this->createBrowser($this->createUserAgent(array(
-                'http://site.with.nested.frames/' => $outer,
-                'http://site.with.nested.frames/inner.html' => $inner,
-                'http://site.with.nested.frames/one.html' => 'Page one',
-                'http://site.with.nested.frames/two.html' => 'Page two',
-                'http://site.with.nested.frames/three.html' => 'Page three')));
-
-        $browser->get('http://site.with.nested.frames/');
-        $this->assertEqual($browser->getContent(), 'Page onePage twoPage three');
-
-        $this->assertTrue($browser->setFrameFocus('inner'));
-        $this->assertEqual($browser->getFrameFocus(), array('inner'));
-        $this->assertTrue($browser->setFrameFocus('one'));
-        $this->assertEqual($browser->getFrameFocus(), array('inner', 'one'));
-        $this->assertEqual($browser->getContent(), 'Page one');
-
-        $this->assertTrue($browser->setFrameFocus('two'));
-        $this->assertEqual($browser->getFrameFocus(), array('inner', 'two'));
-        $this->assertEqual($browser->getContent(), 'Page two');
-
-        $browser->clearFrameFocus();
-        $this->assertTrue($browser->setFrameFocus('three'));
-        $this->assertEqual($browser->getFrameFocus(), array('three'));
-        $this->assertEqual($browser->getContent(), 'Page three');
-
-        $this->assertTrue($browser->setFrameFocus('inner'));
-        $this->assertEqual($browser->getContent(), 'Page onePage two');
-    }
-
-    function testCanNavigateToNestedFrameByIndex() {
-        $inner = '<frameset>' .
-                '<frame src="one.html">' .
-                '<frame src="two.html">' .
-                '</frameset>';
-        $outer = '<frameset>' .
-                '<frame src="inner.html">' .
-                '<frame src="three.html">' .
-                '</frameset>';
-        $browser = $this->createBrowser($this->createUserAgent(array(
-                'http://site.with.nested.frames/' => $outer,
-                'http://site.with.nested.frames/inner.html' => $inner,
-                'http://site.with.nested.frames/one.html' => 'Page one',
-                'http://site.with.nested.frames/two.html' => 'Page two',
-                'http://site.with.nested.frames/three.html' => 'Page three')));
-
-        $browser->get('http://site.with.nested.frames/');
-        $this->assertEqual($browser->getContent(), 'Page onePage twoPage three');
-
-        $this->assertTrue($browser->setFrameFocusByIndex(1));
-        $this->assertEqual($browser->getFrameFocus(), array(1));
-        $this->assertTrue($browser->setFrameFocusByIndex(1));
-        $this->assertEqual($browser->getFrameFocus(), array(1, 1));
-        $this->assertEqual($browser->getContent(), 'Page one');
-
-        $this->assertTrue($browser->setFrameFocusByIndex(2));
-        $this->assertEqual($browser->getFrameFocus(), array(1, 2));
-        $this->assertEqual($browser->getContent(), 'Page two');
-
-        $browser->clearFrameFocus();
-        $this->assertTrue($browser->setFrameFocusByIndex(2));
-        $this->assertEqual($browser->getFrameFocus(), array(2));
-        $this->assertEqual($browser->getContent(), 'Page three');
-
-        $this->assertTrue($browser->setFrameFocusByIndex(1));
-        $this->assertEqual($browser->getContent(), 'Page onePage two');
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/collector_test.php b/3rdparty/simpletest/test/collector_test.php
deleted file mode 100755
index efdbf377ece..00000000000
--- a/3rdparty/simpletest/test/collector_test.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-// $Id: collector_test.php 1769 2008-04-19 14:39:00Z pp11 $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../collector.php');
-SimpleTest::ignore('MockTestSuite');
-Mock::generate('TestSuite');
-
-class PathEqualExpectation extends EqualExpectation {
-	function __construct($value, $message = '%s') {
-    	parent::__construct(str_replace("\\", '/', $value), $message);
-	}
-
-    function test($compare) {
-        return parent::test(str_replace("\\", '/', $compare));
-    }
-}
-
-class TestOfCollector extends UnitTestCase {
-    function testCollectionIsAddedToGroup() {
-        $suite = new MockTestSuite();
-        $suite->expectMinimumCallCount('addFile', 2);
-        $suite->expect(
-                'addFile',
-                array(new PatternExpectation('/collectable\\.(1|2)$/')));
-        $collector = new SimpleCollector();
-        $collector->collect($suite, dirname(__FILE__) . '/support/collector/');
-    }
-}
-
-class TestOfPatternCollector extends UnitTestCase {
-
-    function testAddingEverythingToGroup() {
-        $suite = new MockTestSuite();
-        $suite->expectCallCount('addFile', 2);
-        $suite->expect(
-                'addFile',
-                array(new PatternExpectation('/collectable\\.(1|2)$/')));
-        $collector = new SimplePatternCollector('/.*/');
-        $collector->collect($suite, dirname(__FILE__) . '/support/collector/');
-    }
-
-    function testOnlyMatchedFilesAreAddedToGroup() {
-        $suite = new MockTestSuite();
-        $suite->expectOnce('addFile', array(new PathEqualExpectation(
-        		dirname(__FILE__) . '/support/collector/collectable.1')));
-        $collector = new SimplePatternCollector('/1$/');
-        $collector->collect($suite, dirname(__FILE__) . '/support/collector/');
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/command_line_test.php b/3rdparty/simpletest/test/command_line_test.php
deleted file mode 100755
index 5baabff33c6..00000000000
--- a/3rdparty/simpletest/test/command_line_test.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../default_reporter.php');
-
-class TestOfCommandLineParsing extends UnitTestCase {
-    
-    function testDefaultsToEmptyStringToMeanNullToTheSelectiveReporter() {
-        $parser = new SimpleCommandLineParser(array());
-        $this->assertIdentical($parser->getTest(), '');
-        $this->assertIdentical($parser->getTestCase(), '');
-    }
-    
-    function testNotXmlByDefault() {
-        $parser = new SimpleCommandLineParser(array());
-        $this->assertFalse($parser->isXml());
-    }
-    
-    function testCanDetectRequestForXml() {
-        $parser = new SimpleCommandLineParser(array('--xml'));
-        $this->assertTrue($parser->isXml());
-    }
-    
-    function testCanReadAssignmentSyntax() {
-        $parser = new SimpleCommandLineParser(array('--test=myTest'));
-        $this->assertEqual($parser->getTest(), 'myTest');
-    }
-    
-    function testCanReadFollowOnSyntax() {
-        $parser = new SimpleCommandLineParser(array('--test', 'myTest'));
-        $this->assertEqual($parser->getTest(), 'myTest');
-    }
-    
-    function testCanReadShortForms() {
-        $parser = new SimpleCommandLineParser(array('-t', 'myTest', '-c', 'MyClass', '-x'));
-        $this->assertEqual($parser->getTest(), 'myTest');
-        $this->assertEqual($parser->getTestCase(), 'MyClass');
-        $this->assertTrue($parser->isXml());
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/compatibility_test.php b/3rdparty/simpletest/test/compatibility_test.php
deleted file mode 100755
index b8635e5bb83..00000000000
--- a/3rdparty/simpletest/test/compatibility_test.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-// $Id: compatibility_test.php 1748 2008-04-14 01:50:41Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../compatibility.php');
-
-class ComparisonClass { }
-class ComparisonSubclass extends ComparisonClass { }
-interface ComparisonInterface { }
-class ComparisonClassWithInterface implements ComparisonInterface { }
-
-class TestOfCompatibility extends UnitTestCase {
-    
-    function testIsA() {
-        $this->assertTrue(SimpleTestCompatibility::isA(
-                new ComparisonClass(),
-                'ComparisonClass'));
-        $this->assertFalse(SimpleTestCompatibility::isA(
-                new ComparisonClass(),
-                'ComparisonSubclass'));
-        $this->assertTrue(SimpleTestCompatibility::isA(
-                new ComparisonSubclass(),
-                'ComparisonClass'));
-    }
-    
-    function testIdentityOfNumericStrings() {
-        $numericString1 = "123";
-        $numericString2 = "00123";
-        $this->assertNotIdentical($numericString1, $numericString2);
-    }
-    
-    function testIdentityOfObjects() {
-        $object1 = new ComparisonClass();
-        $object2 = new ComparisonClass();
-        $this->assertIdentical($object1, $object2);
-    }
-    
-    function testReferences () {
-        $thing = "Hello";
-        $thing_reference = &$thing;
-        $thing_copy = $thing;
-        $this->assertTrue(SimpleTestCompatibility::isReference(
-                $thing,
-                $thing));
-        $this->assertTrue(SimpleTestCompatibility::isReference(
-                $thing,
-                $thing_reference));
-        $this->assertFalse(SimpleTestCompatibility::isReference(
-                $thing,
-                $thing_copy));
-    }
-    
-    function testObjectReferences () {
-        $object = new ComparisonClass();
-        $object_reference = $object;
-        $object_copy = new ComparisonClass();
-        $object_assignment = $object;
-        $this->assertTrue(SimpleTestCompatibility::isReference(
-                $object,
-                $object));
-        $this->assertTrue(SimpleTestCompatibility::isReference(
-                $object,
-                $object_reference));
-        $this->assertFalse(SimpleTestCompatibility::isReference(
-                $object,
-                $object_copy));
-        if (version_compare(phpversion(), '5', '>=')) {
-            $this->assertTrue(SimpleTestCompatibility::isReference(
-                    $object,
-                    $object_assignment));
-        } else {
-            $this->assertFalse(SimpleTestCompatibility::isReference(
-                    $object,
-                    $object_assignment));
-        }
-    }
-    
-    function testInteraceComparison() {
-        $object = new ComparisonClassWithInterface();
-        $this->assertFalse(SimpleTestCompatibility::isA(
-                new ComparisonClass(),
-                'ComparisonInterface'));
-        $this->assertTrue(SimpleTestCompatibility::isA(
-                new ComparisonClassWithInterface(),
-                'ComparisonInterface'));
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/cookies_test.php b/3rdparty/simpletest/test/cookies_test.php
deleted file mode 100755
index 0b49e43bf9f..00000000000
--- a/3rdparty/simpletest/test/cookies_test.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-// $Id: cookies_test.php 1506 2007-05-07 00:58:03Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../cookies.php');
-
-class TestOfCookie extends UnitTestCase {
-    
-    function testCookieDefaults() {
-        $cookie = new SimpleCookie("name");
-        $this->assertFalse($cookie->getValue());
-        $this->assertEqual($cookie->getPath(), "/");
-        $this->assertIdentical($cookie->getHost(), false);
-        $this->assertFalse($cookie->getExpiry());
-        $this->assertFalse($cookie->isSecure());
-    }
-    
-    function testCookieAccessors() {
-        $cookie = new SimpleCookie(
-                "name",
-                "value",
-                "/path",
-                "Mon, 18 Nov 2002 15:50:29 GMT",
-                true);
-        $this->assertEqual($cookie->getName(), "name");
-        $this->assertEqual($cookie->getValue(), "value");
-        $this->assertEqual($cookie->getPath(), "/path/");
-        $this->assertEqual($cookie->getExpiry(), "Mon, 18 Nov 2002 15:50:29 GMT");
-        $this->assertTrue($cookie->isSecure());
-    }
-    
-    function testFullHostname() {
-        $cookie = new SimpleCookie("name");
-        $this->assertTrue($cookie->setHost("host.name.here"));
-        $this->assertEqual($cookie->getHost(), "host.name.here");
-        $this->assertTrue($cookie->setHost("host.com"));
-        $this->assertEqual($cookie->getHost(), "host.com");
-    }
-    
-    function testHostTruncation() {
-        $cookie = new SimpleCookie("name");
-        $cookie->setHost("this.host.name.here");
-        $this->assertEqual($cookie->getHost(), "host.name.here");
-        $cookie->setHost("this.host.com");
-        $this->assertEqual($cookie->getHost(), "host.com");
-        $this->assertTrue($cookie->setHost("dashes.in-host.com"));
-        $this->assertEqual($cookie->getHost(), "in-host.com");
-    }
-    
-    function testBadHosts() {
-        $cookie = new SimpleCookie("name");
-        $this->assertFalse($cookie->setHost("gibberish"));
-        $this->assertFalse($cookie->setHost("host.here"));
-        $this->assertFalse($cookie->setHost("host..com"));
-        $this->assertFalse($cookie->setHost("..."));
-        $this->assertFalse($cookie->setHost("host.com."));
-    }
-    
-    function testHostValidity() {
-        $cookie = new SimpleCookie("name");
-        $cookie->setHost("this.host.name.here");
-        $this->assertTrue($cookie->isValidHost("host.name.here"));
-        $this->assertTrue($cookie->isValidHost("that.host.name.here"));
-        $this->assertFalse($cookie->isValidHost("bad.host"));
-        $this->assertFalse($cookie->isValidHost("nearly.name.here"));
-    }
-    
-    function testPathValidity() {
-        $cookie = new SimpleCookie("name", "value", "/path");
-        $this->assertFalse($cookie->isValidPath("/"));
-        $this->assertTrue($cookie->isValidPath("/path/"));
-        $this->assertTrue($cookie->isValidPath("/path/more"));
-    }
-    
-    function testSessionExpiring() {
-        $cookie = new SimpleCookie("name", "value", "/path");
-        $this->assertTrue($cookie->isExpired(0));
-    }
-    
-    function testTimestampExpiry() {
-        $cookie = new SimpleCookie("name", "value", "/path", 456);
-        $this->assertFalse($cookie->isExpired(0));
-        $this->assertTrue($cookie->isExpired(457));
-        $this->assertFalse($cookie->isExpired(455));
-    }
-    
-    function testDateExpiry() {
-        $cookie = new SimpleCookie(
-                "name",
-                "value",
-                "/path",
-                "Mon, 18 Nov 2002 15:50:29 GMT");
-        $this->assertTrue($cookie->isExpired("Mon, 18 Nov 2002 15:50:30 GMT"));
-        $this->assertFalse($cookie->isExpired("Mon, 18 Nov 2002 15:50:28 GMT"));
-    }
-    
-    function testAging() {
-        $cookie = new SimpleCookie("name", "value", "/path", 200);
-        $cookie->agePrematurely(199);
-        $this->assertFalse($cookie->isExpired(0));
-        $cookie->agePrematurely(2);
-        $this->assertTrue($cookie->isExpired(0));
-    }
-}
-
-class TestOfCookieJar extends UnitTestCase {
-    
-    function testAddCookie() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie("a", "A");
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=A'));
-    }
-    
-    function testHostFilter() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'A', 'my-host.com');
-        $jar->setCookie('b', 'B', 'another-host.com');
-        $jar->setCookie('c', 'C');
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('my-host.com')),
-                array('a=A', 'c=C'));
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('another-host.com')),
-                array('b=B', 'c=C'));
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('www.another-host.com')),
-                array('b=B', 'c=C'));
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('new-host.org')),
-                array('c=C'));
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('/')),
-                array('a=A', 'b=B', 'c=C'));
-    }
-    
-    function testPathFilter() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'A', false, '/path/');
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/elsewhere')), array());
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/')), array('a=A'));
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path')), array('a=A'));
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/pa')), array());
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/here')), array('a=A'));
-    }
-    
-    function testPathFilterDeeply() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'A', false, '/path/more_path/');
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/')), array());
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path')), array());
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/pa')), array());
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/more_path/')), array('a=A'));
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/more_path/and_more')), array('a=A'));
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/not_here/')), array());
-    }
-    
-    function testMultipleCookieWithDifferentPathsButSameName() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'abc', false, '/');
-        $jar->setCookie('a', '123', false, '/path/here/');
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('/')),
-                array('a=abc'));
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('my-host.com/')),
-                array('a=abc'));
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('my-host.com/path/')),
-                array('a=abc'));
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('my-host.com/path/here')),
-                array('a=abc', 'a=123'));
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('my-host.com/path/here/there')),
-                array('a=abc', 'a=123'));
-    }
-    
-    function testOverwrite() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'abc', false, '/');
-        $jar->setCookie('a', 'cde', false, '/');
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=cde'));
-    }
-    
-    function testClearSessionCookies() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'A', false, '/');
-        $jar->restartSession();
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
-    }
-    
-    function testExpiryFilterByDate() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'A', false, '/', 'Wed, 25-Dec-02 04:24:20 GMT');
-        $jar->restartSession("Wed, 25-Dec-02 04:24:19 GMT");
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=A'));
-        $jar->restartSession("Wed, 25-Dec-02 04:24:21 GMT");
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
-    }
-    
-    function testExpiryFilterByAgeing() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'A', false, '/', 'Wed, 25-Dec-02 04:24:20 GMT');
-        $jar->restartSession("Wed, 25-Dec-02 04:24:19 GMT");
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=A'));
-        $jar->agePrematurely(2);
-        $jar->restartSession("Wed, 25-Dec-02 04:24:19 GMT");
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
-    }
-    
-    function testCookieClearing() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'abc', false, '/');
-        $jar->setCookie('a', '', false, '/');
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a='));
-    }
-    
-    function testCookieClearByLoweringDate() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'abc', false, '/', 'Wed, 25-Dec-02 04:24:21 GMT');
-        $jar->setCookie('a', 'def', false, '/', 'Wed, 25-Dec-02 04:24:19 GMT');
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=def'));
-        $jar->restartSession('Wed, 25-Dec-02 04:24:20 GMT');
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/detached_test.php b/3rdparty/simpletest/test/detached_test.php
deleted file mode 100755
index f651d97eb61..00000000000
--- a/3rdparty/simpletest/test/detached_test.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-// $Id: detached_test.php 1884 2009-07-01 16:30:40Z lastcraft $
-require_once('../detached.php');
-require_once('../reporter.php');
-
-// The following URL will depend on your own installation.
-$command = 'php ' . dirname(__FILE__) . '/visual_test.php xml';
-
-$test = new TestSuite('Remote tests');
-$test->add(new DetachedTestCase($command));
-if (SimpleReporter::inCli()) {
-    exit ($test->run(new TextReporter()) ? 0 : 1);
-}
-$test->run(new HtmlReporter());
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/dumper_test.php b/3rdparty/simpletest/test/dumper_test.php
deleted file mode 100755
index 789047de924..00000000000
--- a/3rdparty/simpletest/test/dumper_test.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-// $Id: dumper_test.php 1505 2007-04-30 23:39:59Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-
-class DumperDummy {
-}
-
-class TestOfTextFormatting extends UnitTestCase {
-    
-    function testClipping() {
-        $dumper = new SimpleDumper();
-        $this->assertEqual(
-                $dumper->clipString("Hello", 6),
-                "Hello",
-                "Hello, 6->%s");
-        $this->assertEqual(
-                $dumper->clipString("Hello", 5),
-                "Hello",
-                "Hello, 5->%s");
-        $this->assertEqual(
-                $dumper->clipString("Hello world", 3),
-                "Hel...",
-                "Hello world, 3->%s");
-        $this->assertEqual(
-                $dumper->clipString("Hello world", 6, 3),
-                "Hello ...",
-                "Hello world, 6, 3->%s");
-        $this->assertEqual(
-                $dumper->clipString("Hello world", 3, 6),
-                "...o w...",
-                "Hello world, 3, 6->%s");
-        $this->assertEqual(
-                $dumper->clipString("Hello world", 4, 11),
-                "...orld",
-                "Hello world, 4, 11->%s");
-        $this->assertEqual(
-                $dumper->clipString("Hello world", 4, 12),
-                "...orld",
-                "Hello world, 4, 12->%s");
-    }
-    
-    function testDescribeNull() {
-        $dumper = new SimpleDumper();
-        $this->assertPattern('/null/i', $dumper->describeValue(null));
-    }
-    
-    function testDescribeBoolean() {
-        $dumper = new SimpleDumper();
-        $this->assertPattern('/boolean/i', $dumper->describeValue(true));
-        $this->assertPattern('/true/i', $dumper->describeValue(true));
-        $this->assertPattern('/false/i', $dumper->describeValue(false));
-    }
-    
-    function testDescribeString() {
-        $dumper = new SimpleDumper();
-        $this->assertPattern('/string/i', $dumper->describeValue('Hello'));
-        $this->assertPattern('/Hello/', $dumper->describeValue('Hello'));
-    }
-    
-    function testDescribeInteger() {
-        $dumper = new SimpleDumper();
-        $this->assertPattern('/integer/i', $dumper->describeValue(35));
-        $this->assertPattern('/35/', $dumper->describeValue(35));
-    }
-    
-    function testDescribeFloat() {
-        $dumper = new SimpleDumper();
-        $this->assertPattern('/float/i', $dumper->describeValue(0.99));
-        $this->assertPattern('/0\.99/', $dumper->describeValue(0.99));
-    }
-    
-    function testDescribeArray() {
-        $dumper = new SimpleDumper();
-        $this->assertPattern('/array/i', $dumper->describeValue(array(1, 4)));
-        $this->assertPattern('/2/i', $dumper->describeValue(array(1, 4)));
-    }
-    
-    function testDescribeObject() {
-        $dumper = new SimpleDumper();
-        $this->assertPattern(
-                '/object/i',
-                $dumper->describeValue(new DumperDummy()));
-        $this->assertPattern(
-                '/DumperDummy/i',
-                $dumper->describeValue(new DumperDummy()));
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/eclipse_test.php b/3rdparty/simpletest/test/eclipse_test.php
deleted file mode 100755
index c90cbc918fd..00000000000
--- a/3rdparty/simpletest/test/eclipse_test.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-// $Id: eclipse_test.php 1739 2008-04-09 20:48:37Z edwardzyang $
-
-//To run this from the eclipse plugin...you need to make sure that the 
-//SimpleTest path in the preferences is the same as the location of the 
-//eclipse.php file below otherwise you end up with two "different" eclipse.php 
-//files included and that does not work...
-
-include_once(dirname(__FILE__) . '/../eclipse.php');
-Mock::generate('SimpleSocket');
-
-class TestOfEclipse extends UnitTestCase {
-	
-	function testPass() {
-		$listener = &new MockSimpleSocket();
-		
-		$fullpath = realpath(dirname(__FILE__).'/support/test1.php');
-		$testpath = EclipseReporter::escapeVal($fullpath);
-		$expected = "{status:\"pass\",message:\"pass1 at [$testpath line 4]\",group:\"$testpath\",case:\"test1\",method:\"test_pass\"}";
-		//this should work...but it doesn't so the next line and the last line are the hacks
-		//$listener->expectOnce('write',array($expected));
-		$listener->setReturnValue('write',-1);
-		
-		$pathparts = pathinfo($fullpath);
-		$filename = $pathparts['basename'];
-		$test= &new TestSuite($filename);
-		$test->addTestFile($fullpath);
-		$test->run(new EclipseReporter($listener));
-		$this->assertEqual($expected,$listener->output);
-	}
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/encoding_test.php b/3rdparty/simpletest/test/encoding_test.php
deleted file mode 100755
index a09236e057c..00000000000
--- a/3rdparty/simpletest/test/encoding_test.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-// $Id: encoding_test.php 1963 2009-10-07 11:57:52Z maetl_ $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../url.php');
-require_once(dirname(__FILE__) . '/../socket.php');
-
-Mock::generate('SimpleSocket');
-
-class TestOfEncodedParts extends UnitTestCase {
-    
-    function testFormEncodedAsKeyEqualsValue() {
-        $pair = new SimpleEncodedPair('a', 'A');
-        $this->assertEqual($pair->asRequest(), 'a=A');
-    }
-    
-    function testMimeEncodedAsHeadersAndContent() {
-        $pair = new SimpleEncodedPair('a', 'A');
-        $this->assertEqual(
-                $pair->asMime(),
-                "Content-Disposition: form-data; name=\"a\"\r\n\r\nA");
-    }
-    
-    function testAttachmentEncodedAsHeadersWithDispositionAndContent() {
-        $part = new SimpleAttachment('a', 'A', 'aaa.txt');
-        $this->assertEqual(
-                $part->asMime(),
-                "Content-Disposition: form-data; name=\"a\"; filename=\"aaa.txt\"\r\n" .
-                        "Content-Type: text/plain\r\n\r\nA");
-    }
-}
-
-class TestOfEncoding extends UnitTestCase {
-    private $content_so_far;
-    
-    function write($content) {
-        $this->content_so_far .= $content;
-    }
-    
-    function clear() {
-        $this->content_so_far = '';
-    }
-    
-    function assertWritten($encoding, $content, $message = '%s') {
-        $this->clear();
-        $encoding->writeTo($this);
-        $this->assertIdentical($this->content_so_far, $content, $message);
-    }
-    
-    function testGetEmpty() {
-        $encoding = new SimpleGetEncoding();
-        $this->assertIdentical($encoding->getValue('a'), false);
-        $this->assertIdentical($encoding->asUrlRequest(), '');
-    }
-    
-    function testPostEmpty() {
-        $encoding = new SimplePostEncoding();
-        $this->assertIdentical($encoding->getValue('a'), false);
-        $this->assertWritten($encoding, '');
-    }
-    
-    function testPrefilled() {
-        $encoding = new SimplePostEncoding(array('a' => 'aaa'));
-        $this->assertIdentical($encoding->getValue('a'), 'aaa');
-        $this->assertWritten($encoding, 'a=aaa');
-    }
-    
-    function testPrefilledWithTwoLevels() {
-        $query = array('a' => array('aa' => 'aaa'));
-        $encoding = new SimplePostEncoding($query);
-        $this->assertTrue($encoding->hasMoreThanOneLevel($query));
-        $this->assertEqual($encoding->rewriteArrayWithMultipleLevels($query), array('a[aa]' => 'aaa'));
-        $this->assertIdentical($encoding->getValue('a[aa]'), 'aaa');
-        $this->assertWritten($encoding, 'a%5Baa%5D=aaa');
-    }
-    
-    function testPrefilledWithThreeLevels() {
-        $query = array('a' => array('aa' => array('aaa' => 'aaaa')));
-        $encoding = new SimplePostEncoding($query);
-        $this->assertTrue($encoding->hasMoreThanOneLevel($query));
-        $this->assertEqual($encoding->rewriteArrayWithMultipleLevels($query), array('a[aa][aaa]' => 'aaaa'));
-        $this->assertIdentical($encoding->getValue('a[aa][aaa]'), 'aaaa');
-        $this->assertWritten($encoding, 'a%5Baa%5D%5Baaa%5D=aaaa');
-    }
-    
-    function testPrefilledWithObject() {
-        $encoding = new SimplePostEncoding(new SimpleEncoding(array('a' => 'aaa')));
-        $this->assertIdentical($encoding->getValue('a'), 'aaa');
-        $this->assertWritten($encoding, 'a=aaa');
-    }
-    
-    function testMultiplePrefilled() {
-        $query = array('a' => array('a1', 'a2'));
-        $encoding = new SimplePostEncoding($query);
-        $this->assertTrue($encoding->hasMoreThanOneLevel($query));
-        $this->assertEqual($encoding->rewriteArrayWithMultipleLevels($query), array('a[0]' => 'a1', 'a[1]' => 'a2'));
-        $this->assertIdentical($encoding->getValue('a[0]'), 'a1');
-        $this->assertIdentical($encoding->getValue('a[1]'), 'a2');
-        $this->assertWritten($encoding, 'a%5B0%5D=a1&a%5B1%5D=a2');
-    }
-    
-    function testSingleParameter() {
-        $encoding = new SimplePostEncoding();
-        $encoding->add('a', 'Hello');
-        $this->assertEqual($encoding->getValue('a'), 'Hello');
-        $this->assertWritten($encoding, 'a=Hello');
-    }
-    
-    function testFalseParameter() {
-        $encoding = new SimplePostEncoding();
-        $encoding->add('a', false);
-        $this->assertEqual($encoding->getValue('a'), false);
-        $this->assertWritten($encoding, '');
-    }
-    
-    function testUrlEncoding() {
-        $encoding = new SimplePostEncoding();
-        $encoding->add('a', 'Hello there!');
-        $this->assertWritten($encoding, 'a=Hello+there%21');
-    }
-    
-    function testUrlEncodingOfKey() {
-        $encoding = new SimplePostEncoding();
-        $encoding->add('a!', 'Hello');
-        $this->assertWritten($encoding, 'a%21=Hello');
-    }
-    
-    function testMultipleParameter() {
-        $encoding = new SimplePostEncoding();
-        $encoding->add('a', 'Hello');
-        $encoding->add('b', 'Goodbye');
-        $this->assertWritten($encoding, 'a=Hello&b=Goodbye');
-    }
-    
-    function testEmptyParameters() {
-        $encoding = new SimplePostEncoding();
-        $encoding->add('a', '');
-        $encoding->add('b', '');
-        $this->assertWritten($encoding, 'a=&b=');
-    }
-    
-    function testRepeatedParameter() {
-        $encoding = new SimplePostEncoding();
-        $encoding->add('a', 'Hello');
-        $encoding->add('a', 'Goodbye');
-        $this->assertIdentical($encoding->getValue('a'), array('Hello', 'Goodbye'));
-        $this->assertWritten($encoding, 'a=Hello&a=Goodbye');
-    }
-    
-    function testAddingLists() {
-        $encoding = new SimplePostEncoding();
-        $encoding->add('a', array('Hello', 'Goodbye'));
-        $this->assertIdentical($encoding->getValue('a'), array('Hello', 'Goodbye'));
-        $this->assertWritten($encoding, 'a=Hello&a=Goodbye');
-    }
-    
-    function testMergeInHash() {
-        $encoding = new SimpleGetEncoding(array('a' => 'A1', 'b' => 'B'));
-        $encoding->merge(array('a' => 'A2'));
-        $this->assertIdentical($encoding->getValue('a'), array('A1', 'A2'));
-        $this->assertIdentical($encoding->getValue('b'), 'B');
-    }
-    
-    function testMergeInObject() {
-        $encoding = new SimpleGetEncoding(array('a' => 'A1', 'b' => 'B'));
-        $encoding->merge(new SimpleEncoding(array('a' => 'A2')));
-        $this->assertIdentical($encoding->getValue('a'), array('A1', 'A2'));
-        $this->assertIdentical($encoding->getValue('b'), 'B');
-    }
-    
-    function testPrefilledMultipart() {
-        $encoding = new SimpleMultipartEncoding(array('a' => 'aaa'), 'boundary');
-        $this->assertIdentical($encoding->getValue('a'), 'aaa');
-        $this->assertwritten($encoding,
-                "--boundary\r\n" .
-                "Content-Disposition: form-data; name=\"a\"\r\n" .
-                "\r\n" .
-                "aaa\r\n" .
-                "--boundary--\r\n");
-    }
-    
-    function testAttachment() {
-        $encoding = new SimpleMultipartEncoding(array(), 'boundary');
-        $encoding->attach('a', 'aaa', 'aaa.txt');
-        $this->assertIdentical($encoding->getValue('a'), 'aaa.txt');
-        $this->assertwritten($encoding,
-                "--boundary\r\n" .
-                "Content-Disposition: form-data; name=\"a\"; filename=\"aaa.txt\"\r\n" .
-                "Content-Type: text/plain\r\n" .
-                "\r\n" .
-                "aaa\r\n" .
-                "--boundary--\r\n");
-    }
-    
-    function testEntityEncodingDefaultContentType() {
-        $encoding = new SimpleEntityEncoding();
-        $this->assertIdentical($encoding->getContentType(), 'application/x-www-form-urlencoded');
-        $this->assertWritten($encoding, '');
-    }
-    
-    function testEntityEncodingTextBody() {
-        $encoding = new SimpleEntityEncoding('plain text');
-        $this->assertIdentical($encoding->getContentType(), 'text/plain');
-        $this->assertWritten($encoding, 'plain text');
-    }
-    
-    function testEntityEncodingXmlBody() {
-        $encoding = new SimpleEntityEncoding('<p><a>xml</b><b>text</b></p>', 'text/xml');
-        $this->assertIdentical($encoding->getContentType(), 'text/xml');
-        $this->assertWritten($encoding, '<p><a>xml</b><b>text</b></p>');
-    }
-}
-
-class TestOfEncodingHeaders extends UnitTestCase {
-    
-    function testEmptyEncodingWritesZeroContentLength() {
-        $socket = new MockSimpleSocket();
-        $socket->expectAt(0, 'write', array("Content-Length: 0\r\n"));
-        $socket->expectAt(1, 'write', array("Content-Type: application/x-www-form-urlencoded\r\n"));
-        $encoding = new SimpleEntityEncoding();
-        $encoding->writeHeadersTo($socket);
-    }
-    
-    function testTextEncodingWritesDefaultContentType() {
-        $socket = new MockSimpleSocket();
-        $socket->expectAt(0, 'write', array("Content-Length: 18\r\n"));
-        $socket->expectAt(1, 'write', array("Content-Type: text/plain\r\n"));
-        $encoding = new SimpleEntityEncoding('one two three four');
-        $encoding->writeHeadersTo($socket);
-    }
-    
-    function testEmptyMultipartEncodingWritesEndBoundaryContentLength() {
-        $socket = new MockSimpleSocket();
-        $socket->expectAt(0, 'write', array("Content-Length: 14\r\n"));
-        $socket->expectAt(1, 'write', array("Content-Type: multipart/form-data; boundary=boundary\r\n"));
-        $encoding = new SimpleMultipartEncoding(array(), 'boundary');
-        $encoding->writeHeadersTo($socket);
-    }
-    
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/errors_test.php b/3rdparty/simpletest/test/errors_test.php
deleted file mode 100755
index ebb9e05891f..00000000000
--- a/3rdparty/simpletest/test/errors_test.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../errors.php');
-require_once(dirname(__FILE__) . '/../expectation.php');
-require_once(dirname(__FILE__) . '/../test_case.php');
-Mock::generate('SimpleTestCase');
-Mock::generate('SimpleExpectation');
-SimpleTest::ignore('MockSimpleTestCase');
-
-class TestOfErrorQueue extends UnitTestCase {
-
-    function setUp() {
-        $context = SimpleTest::getContext();
-        $queue = $context->get('SimpleErrorQueue');
-        $queue->clear();
-    }
-
-    function tearDown() {
-        $context = SimpleTest::getContext();
-        $queue = $context->get('SimpleErrorQueue');
-        $queue->clear();
-    }
-
-    function testExpectationMatchCancelsIncomingError() {
-        $test = new MockSimpleTestCase();
-        $test->expectOnce('assert', array(
-                new IdenticalExpectation(new AnythingExpectation()),
-                'B',
-                'a message'));
-        $test->setReturnValue('assert', true);
-        $test->expectNever('error');
-        $queue = new SimpleErrorQueue();
-        $queue->setTestCase($test);
-        $queue->expectError(new AnythingExpectation(), 'a message');
-        $queue->add(1024, 'B', 'b.php', 100);
-    }
-}
-
-class TestOfErrorTrap extends UnitTestCase {
-    private $old;
-
-    function setUp() {
-        $this->old = error_reporting(E_ALL);
-        set_error_handler('SimpleTestErrorHandler');
-    }
-
-    function tearDown() {
-        restore_error_handler();
-        error_reporting($this->old);
-    }
-
-    function testQueueStartsEmpty() {
-        $context = SimpleTest::getContext();
-        $queue = $context->get('SimpleErrorQueue');
-        $this->assertFalse($queue->extract());
-    }
-
-    function testErrorsAreSwallowedByMatchingExpectation() {
-        $this->expectError('Ouch!');
-        trigger_error('Ouch!');
-    }
-
-    function testErrorsAreSwallowedInOrder() {
-        $this->expectError('a');
-        $this->expectError('b');
-        trigger_error('a');
-        trigger_error('b');
-    }
-
-    function testAnyErrorCanBeSwallowed() {
-        $this->expectError();
-        trigger_error('Ouch!');
-    }
-
-    function testErrorCanBeSwallowedByPatternMatching() {
-        $this->expectError(new PatternExpectation('/ouch/i'));
-        trigger_error('Ouch!');
-    }
-
-    function testErrorWithPercentsPassesWithNoSprintfError() {
-        $this->expectError("%");
-        trigger_error('%');
-    }
-}
-
-class TestOfErrors extends UnitTestCase {
-    private $old;
-
-    function setUp() {
-        $this->old = error_reporting(E_ALL);
-    }
-
-    function tearDown() {
-        error_reporting($this->old);
-    }
-
-    function testDefaultWhenAllReported() {
-        error_reporting(E_ALL);
-        $this->expectError('Ouch!');
-        trigger_error('Ouch!');
-    }
-
-    function testNoticeWhenReported() {
-        error_reporting(E_ALL);
-        $this->expectError('Ouch!');
-        trigger_error('Ouch!', E_USER_NOTICE);
-    }
-
-    function testWarningWhenReported() {
-        error_reporting(E_ALL);
-        $this->expectError('Ouch!');
-        trigger_error('Ouch!', E_USER_WARNING);
-    }
-
-    function testErrorWhenReported() {
-        error_reporting(E_ALL);
-        $this->expectError('Ouch!');
-        trigger_error('Ouch!', E_USER_ERROR);
-    }
-
-    function testNoNoticeWhenNotReported() {
-        error_reporting(0);
-        trigger_error('Ouch!', E_USER_NOTICE);
-    }
-
-    function testNoWarningWhenNotReported() {
-        error_reporting(0);
-        trigger_error('Ouch!', E_USER_WARNING);
-    }
-
-    function testNoticeSuppressedWhenReported() {
-        error_reporting(E_ALL);
-        @trigger_error('Ouch!', E_USER_NOTICE);
-    }
-
-    function testWarningSuppressedWhenReported() {
-        error_reporting(E_ALL);
-        @trigger_error('Ouch!', E_USER_WARNING);
-    }
-
-    function testErrorWithPercentsReportedWithNoSprintfError() {
-        $this->expectError('%');
-        trigger_error('%');
-    }
-}
-
-class TestOfPHP52RecoverableErrors extends UnitTestCase {
-    function skip() {
-        $this->skipIf(
-                version_compare(phpversion(), '5.2', '<'),
-                'E_RECOVERABLE_ERROR not tested for PHP below 5.2');
-    }
-
-    function testError() {
-        eval('
-            class RecoverableErrorTestingStub {
-                function ouch(RecoverableErrorTestingStub $obj) {
-                }
-            }
-        ');
-
-        $stub = new RecoverableErrorTestingStub();
-        $this->expectError(new PatternExpectation('/must be an instance of RecoverableErrorTestingStub/i'));
-        $stub->ouch(new stdClass());
-    }
-}
-
-class TestOfErrorsExcludingPHP52AndAbove extends UnitTestCase {
-    function skip() {
-        $this->skipIf(
-                version_compare(phpversion(), '5.2', '>='),
-                'E_USER_ERROR not tested for PHP 5.2 and above');
-    }
-
-    function testNoErrorWhenNotReported() {
-        error_reporting(0);
-        trigger_error('Ouch!', E_USER_ERROR);
-    }
-
-    function testErrorSuppressedWhenReported() {
-        error_reporting(E_ALL);
-        @trigger_error('Ouch!', E_USER_ERROR);
-    }
-}
-
-SimpleTest::ignore('TestOfNotEnoughErrors');
-/**
- * This test is ignored as it is used by {@link TestRunnerForLeftOverAndNotEnoughErrors}
- * to verify that it fails as expected.
- *
- * @ignore
- */
-class TestOfNotEnoughErrors extends UnitTestCase {
-    function testExpectTwoErrorsThrowOne() {
-        $this->expectError('Error 1');
-        trigger_error('Error 1');
-        $this->expectError('Error 2');
-    }
-}
-
-SimpleTest::ignore('TestOfLeftOverErrors');
-/**
- * This test is ignored as it is used by {@link TestRunnerForLeftOverAndNotEnoughErrors}
- * to verify that it fails as expected.
- *
- * @ignore
- */
-class TestOfLeftOverErrors extends UnitTestCase {
-    function testExpectOneErrorGetTwo() {
-        $this->expectError('Error 1');
-        trigger_error('Error 1');
-        trigger_error('Error 2');
-    }
-}
-
-class TestRunnerForLeftOverAndNotEnoughErrors extends UnitTestCase {
-    function testRunLeftOverErrorsTestCase() {
-        $test = new TestOfLeftOverErrors();
-        $this->assertFalse($test->run(new SimpleReporter()));
-    }
-
-    function testRunNotEnoughErrors() {
-        $test = new TestOfNotEnoughErrors();
-        $this->assertFalse($test->run(new SimpleReporter()));
-    }
-}
-
-// TODO: Add stacked error handler test
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/exceptions_test.php b/3rdparty/simpletest/test/exceptions_test.php
deleted file mode 100755
index 1011543d4fa..00000000000
--- a/3rdparty/simpletest/test/exceptions_test.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-// $Id: exceptions_test.php 1882 2009-07-01 14:30:05Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../exceptions.php');
-require_once(dirname(__FILE__) . '/../expectation.php');
-require_once(dirname(__FILE__) . '/../test_case.php');
-Mock::generate('SimpleTestCase');
-Mock::generate('SimpleExpectation');
-
-class MyTestException extends Exception {}
-class HigherTestException extends MyTestException {}
-class OtherTestException extends Exception {}
-
-class TestOfExceptionExpectation extends UnitTestCase {
-
-    function testExceptionClassAsStringWillMatchExceptionsRootedOnThatClass() {
-        $expectation = new ExceptionExpectation('MyTestException');
-        $this->assertTrue($expectation->test(new MyTestException()));
-        $this->assertTrue($expectation->test(new HigherTestException()));
-        $this->assertFalse($expectation->test(new OtherTestException()));
-    }
-
-    function testMatchesClassAndMessageWhenExceptionExpected() {
-        $expectation = new ExceptionExpectation(new MyTestException('Hello'));
-        $this->assertTrue($expectation->test(new MyTestException('Hello')));
-        $this->assertFalse($expectation->test(new HigherTestException('Hello')));
-        $this->assertFalse($expectation->test(new OtherTestException('Hello')));
-        $this->assertFalse($expectation->test(new MyTestException('Goodbye')));
-        $this->assertFalse($expectation->test(new MyTestException()));
-    }
-
-    function testMessagelessExceptionMatchesOnlyOnClass() {
-        $expectation = new ExceptionExpectation(new MyTestException());
-        $this->assertTrue($expectation->test(new MyTestException()));
-        $this->assertFalse($expectation->test(new HigherTestException()));
-    }
-}
-
-class TestOfExceptionTrap extends UnitTestCase {
-
-    function testNoExceptionsInQueueMeansNoTestMessages() {
-        $test = new MockSimpleTestCase();
-        $test->expectNever('assert');
-        $queue = new SimpleExceptionTrap();
-        $this->assertFalse($queue->isExpected($test, new Exception()));
-    }
-
-    function testMatchingExceptionGivesTrue() {
-        $expectation = new MockSimpleExpectation();
-        $expectation->setReturnValue('test', true);
-        $test = new MockSimpleTestCase();
-        $test->setReturnValue('assert', true);
-        $queue = new SimpleExceptionTrap();
-        $queue->expectException($expectation, 'message');
-        $this->assertTrue($queue->isExpected($test, new Exception()));
-    }
-
-    function testMatchingExceptionTriggersAssertion() {
-        $test = new MockSimpleTestCase();
-        $test->expectOnce('assert', array(
-                '*',
-                new ExceptionExpectation(new Exception()),
-                'message'));
-        $queue = new SimpleExceptionTrap();
-        $queue->expectException(new ExceptionExpectation(new Exception()), 'message');
-        $queue->isExpected($test, new Exception());
-    }
-}
-
-class TestOfCatchingExceptions extends UnitTestCase {
-
-    function testCanCatchAnyExpectedException() {
-        $this->expectException();
-        throw new Exception();
-    }
-
-    function testCanMatchExceptionByClass() {
-        $this->expectException('MyTestException');
-        throw new HigherTestException();
-    }
-
-    function testCanMatchExceptionExactly() {
-        $this->expectException(new Exception('Ouch'));
-        throw new Exception('Ouch');
-    }
-
-    function testLastListedExceptionIsTheOneThatCounts() {
-        $this->expectException('OtherTestException');
-        $this->expectException('MyTestException');
-        throw new HigherTestException();
-    }
-}
-
-class TestOfIgnoringExceptions extends UnitTestCase {
-
-    function testCanIgnoreAnyException() {
-        $this->ignoreException();
-        throw new Exception();
-    }
-
-    function testCanIgnoreSpecificException() {
-        $this->ignoreException('MyTestException');
-        throw new MyTestException();
-    }
-
-    function testCanIgnoreExceptionExactly() {
-        $this->ignoreException(new Exception('Ouch'));
-        throw new Exception('Ouch');
-    }
-
-    function testIgnoredExceptionsDoNotMaskExpectedExceptions() {
-        $this->ignoreException('Exception');
-        $this->expectException('MyTestException');
-        throw new MyTestException();
-    }
-
-    function testCanIgnoreMultipleExceptions() {
-        $this->ignoreException('MyTestException');
-        $this->ignoreException('OtherTestException');
-        throw new OtherTestException();
-    }
-}
-
-class TestOfCallingTearDownAfterExceptions extends UnitTestCase {
-    private $debri = 0;
-
-    function tearDown() {
-        $this->debri--;
-    }
-
-    function testLeaveSomeDebri() {
-        $this->debri++;
-        $this->expectException();
-        throw new Exception(__FUNCTION__);
-    }
-
-	function testDebriWasRemovedOnce() {
-        $this->assertEqual($this->debri, 0);
-	}
-}
-
-class TestOfExceptionThrownInSetUpDoesNotRunTestBody extends UnitTestCase {
-
-	function setUp() {
-        $this->expectException();
-        throw new Exception();
-	}
-
-	function testShouldNotBeRun() {
-        $this->fail('This test body should not be run');
-	}
-
-	function testShouldNotBeRunEither() {
-        $this->fail('This test body should not be run either');
-	}
-}
-
-class TestOfExpectExceptionWithSetUp extends UnitTestCase {
-
-	function setUp() {
-        $this->expectException();
-	}
-
-	function testThisExceptionShouldBeCaught() {
-        throw new Exception();
-	}
-
-	function testJustThrowingMyTestException() {
-        throw new MyTestException();
-	}
-}
-
-class TestOfThrowingExceptionsInTearDown extends UnitTestCase {
-
-    function tearDown() {
-        throw new Exception();
-    }
-
-    function testDoesntFatal() {
-        $this->expectException();
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/expectation_test.php b/3rdparty/simpletest/test/expectation_test.php
deleted file mode 100755
index 31fbe65e683..00000000000
--- a/3rdparty/simpletest/test/expectation_test.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-// $Id: expectation_test.php 2009 2011-04-28 08:57:25Z pp11 $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../expectation.php');
-
-class TestOfEquality extends UnitTestCase {
-
-    function testBoolean() {
-        $is_true = new EqualExpectation(true);
-        $this->assertTrue($is_true->test(true));
-        $this->assertFalse($is_true->test(false));
-    }
-
-    function testStringMatch() {
-        $hello = new EqualExpectation("Hello");
-        $this->assertTrue($hello->test("Hello"));
-        $this->assertFalse($hello->test("Goodbye"));
-    }
-
-    function testInteger() {
-        $fifteen = new EqualExpectation(15);
-        $this->assertTrue($fifteen->test(15));
-        $this->assertFalse($fifteen->test(14));
-    }
-
-    function testFloat() {
-        $pi = new EqualExpectation(3.14);
-        $this->assertTrue($pi->test(3.14));
-        $this->assertFalse($pi->test(3.15));
-    }
-
-    function testArray() {
-        $colours = new EqualExpectation(array("r", "g", "b"));
-        $this->assertTrue($colours->test(array("r", "g", "b")));
-        $this->assertFalse($colours->test(array("g", "b", "r")));
-    }
-
-    function testHash() {
-        $is_blue = new EqualExpectation(array("r" => 0, "g" => 0, "b" => 255));
-        $this->assertTrue($is_blue->test(array("r" => 0, "g" => 0, "b" => 255)));
-        $this->assertFalse($is_blue->test(array("r" => 0, "g" => 255, "b" => 0)));
-    }
-
-    function testHashWithOutOfOrderKeysShouldStillMatch() {
-        $any_order = new EqualExpectation(array('a' => 1, 'b' => 2));
-        $this->assertTrue($any_order->test(array('b' => 2, 'a' => 1)));
-    }
-}
-
-class TestOfWithin extends UnitTestCase {
-
-    function testWithinFloatingPointMargin() {
-        $within = new WithinMarginExpectation(1.0, 0.2);
-        $this->assertFalse($within->test(0.7));
-        $this->assertTrue($within->test(0.8));
-        $this->assertTrue($within->test(0.9));
-        $this->assertTrue($within->test(1.1));
-        $this->assertTrue($within->test(1.2));
-        $this->assertFalse($within->test(1.3));
-    }
-
-    function testOutsideFloatingPointMargin() {
-        $within = new OutsideMarginExpectation(1.0, 0.2);
-        $this->assertTrue($within->test(0.7));
-        $this->assertFalse($within->test(0.8));
-        $this->assertFalse($within->test(1.2));
-        $this->assertTrue($within->test(1.3));
-    }
-}
-
-class TestOfInequality extends UnitTestCase {
-
-    function testStringMismatch() {
-        $not_hello = new NotEqualExpectation("Hello");
-        $this->assertTrue($not_hello->test("Goodbye"));
-        $this->assertFalse($not_hello->test("Hello"));
-    }
-}
-
-class RecursiveNasty {
-    private $me;
-
-    function RecursiveNasty() {
-        $this->me = $this;
-    }
-}
-
-class OpaqueContainer {
-    private $stuff;
-    private $value;
-
-    public function __construct($value) {
-        $this->value = $value;
-    }
-}
-
-class DerivedOpaqueContainer extends OpaqueContainer {
-    // Deliberately have a variable whose name with the same suffix as a later
-    // variable
-    private $new_value = 1;
-
-    // Deliberately obscures the variable of the same name in the base
-    // class.
-    private $value;
-
-    public function __construct($value, $base_value) {
-        parent::__construct($base_value);
-        $this->value = $value;
-    }
-}
-
-class TestOfIdentity extends UnitTestCase {
-
-    function testType() {
-        $string = new IdenticalExpectation("37");
-        $this->assertTrue($string->test("37"));
-        $this->assertFalse($string->test(37));
-        $this->assertFalse($string->test("38"));
-    }
-
-    function _testNastyPhp5Bug() {
-        $this->assertFalse(new RecursiveNasty() != new RecursiveNasty());
-    }
-
-    function _testReallyHorribleRecursiveStructure() {
-        $hopeful = new IdenticalExpectation(new RecursiveNasty());
-        $this->assertTrue($hopeful->test(new RecursiveNasty()));
-    }
-
-    function testCanComparePrivateMembers() {
-        $expectFive = new IdenticalExpectation(new OpaqueContainer(5));
-        $this->assertTrue($expectFive->test(new OpaqueContainer(5)));
-        $this->assertFalse($expectFive->test(new OpaqueContainer(6)));
-    }
-
-    function testCanComparePrivateMembersOfObjectsInArrays() {
-        $expectFive = new IdenticalExpectation(array(new OpaqueContainer(5)));
-        $this->assertTrue($expectFive->test(array(new OpaqueContainer(5))));
-        $this->assertFalse($expectFive->test(array(new OpaqueContainer(6))));
-    }
-
-    function testCanComparePrivateMembersOfObjectsWherePrivateMemberOfBaseClassIsObscured() {
-        $expectFive = new IdenticalExpectation(array(new DerivedOpaqueContainer(1,2)));
-        $this->assertTrue($expectFive->test(array(new DerivedOpaqueContainer(1,2))));
-        $this->assertFalse($expectFive->test(array(new DerivedOpaqueContainer(0,2))));
-        $this->assertFalse($expectFive->test(array(new DerivedOpaqueContainer(0,9))));
-        $this->assertFalse($expectFive->test(array(new DerivedOpaqueContainer(1,0))));
-    }
-}
-
-class TransparentContainer {
-    public $value;
-
-    public function __construct($value) {
-        $this->value = $value;
-    }
-}
-
-class TestOfMemberComparison extends UnitTestCase {
-
-    function testMemberExpectationCanMatchPublicMember() {
-        $expect_five = new MemberExpectation('value', 5);
-        $this->assertTrue($expect_five->test(new TransparentContainer(5)));
-        $this->assertFalse($expect_five->test(new TransparentContainer(8)));
-    }
-
-    function testMemberExpectationCanMatchPrivateMember() {
-        $expect_five = new MemberExpectation('value', 5);
-        $this->assertTrue($expect_five->test(new OpaqueContainer(5)));
-        $this->assertFalse($expect_five->test(new OpaqueContainer(8)));
-    }
-
-    function testMemberExpectationCanMatchPrivateMemberObscuredByDerivedClass() {
-        $expect_five = new MemberExpectation('value', 5);
-        $this->assertTrue($expect_five->test(new DerivedOpaqueContainer(5,8)));
-        $this->assertTrue($expect_five->test(new DerivedOpaqueContainer(5,5)));
-        $this->assertFalse($expect_five->test(new DerivedOpaqueContainer(8,8)));
-        $this->assertFalse($expect_five->test(new DerivedOpaqueContainer(8,5)));
-    }
-
-}
-
-class DummyReferencedObject{}
-
-class TestOfReference extends UnitTestCase {
-
-    function testReference() {
-        $foo = "foo";
-        $ref = &$foo;
-        $not_ref = $foo;
-        $bar = "bar";
-
-        $expect = new ReferenceExpectation($foo);
-        $this->assertTrue($expect->test($ref));
-        $this->assertFalse($expect->test($not_ref));
-        $this->assertFalse($expect->test($bar));
-    }
-}
-
-class TestOfNonIdentity extends UnitTestCase {
-
-    function testType() {
-        $string = new NotIdenticalExpectation("37");
-        $this->assertTrue($string->test("38"));
-        $this->assertTrue($string->test(37));
-        $this->assertFalse($string->test("37"));
-    }
-}
-
-class TestOfPatterns extends UnitTestCase {
-
-    function testWanted() {
-        $pattern = new PatternExpectation('/hello/i');
-        $this->assertTrue($pattern->test("Hello world"));
-        $this->assertFalse($pattern->test("Goodbye world"));
-    }
-
-    function testUnwanted() {
-        $pattern = new NoPatternExpectation('/hello/i');
-        $this->assertFalse($pattern->test("Hello world"));
-        $this->assertTrue($pattern->test("Goodbye world"));
-    }
-}
-
-class ExpectedMethodTarget {
-    function hasThisMethod() {}
-}
-
-class TestOfMethodExistence extends UnitTestCase {
-
-    function testHasMethod() {
-        $instance = new ExpectedMethodTarget();
-        $expectation = new MethodExistsExpectation('hasThisMethod');
-        $this->assertTrue($expectation->test($instance));
-        $expectation = new MethodExistsExpectation('doesNotHaveThisMethod');
-        $this->assertFalse($expectation->test($instance));
-    }
-}
-
-class TestOfIsA extends UnitTestCase {
-
-    function testString() {
-        $expectation = new IsAExpectation('string');
-        $this->assertTrue($expectation->test('Hello'));
-        $this->assertFalse($expectation->test(5));
-    }
-
-    function testBoolean() {
-        $expectation = new IsAExpectation('boolean');
-        $this->assertTrue($expectation->test(true));
-        $this->assertFalse($expectation->test(1));
-    }
-
-    function testBool() {
-        $expectation = new IsAExpectation('bool');
-        $this->assertTrue($expectation->test(true));
-        $this->assertFalse($expectation->test(1));
-    }
-
-    function testDouble() {
-        $expectation = new IsAExpectation('double');
-        $this->assertTrue($expectation->test(5.0));
-        $this->assertFalse($expectation->test(5));
-    }
-
-    function testFloat() {
-        $expectation = new IsAExpectation('float');
-        $this->assertTrue($expectation->test(5.0));
-        $this->assertFalse($expectation->test(5));
-    }
-
-    function testReal() {
-        $expectation = new IsAExpectation('real');
-        $this->assertTrue($expectation->test(5.0));
-        $this->assertFalse($expectation->test(5));
-    }
-
-    function testInteger() {
-        $expectation = new IsAExpectation('integer');
-        $this->assertTrue($expectation->test(5));
-        $this->assertFalse($expectation->test(5.0));
-    }
-
-    function testInt() {
-        $expectation = new IsAExpectation('int');
-        $this->assertTrue($expectation->test(5));
-        $this->assertFalse($expectation->test(5.0));
-    }
-
-    function testScalar() {
-        $expectation = new IsAExpectation('scalar');
-        $this->assertTrue($expectation->test(5));
-        $this->assertFalse($expectation->test(array(5)));
-    }
-
-    function testNumeric() {
-        $expectation = new IsAExpectation('numeric');
-        $this->assertTrue($expectation->test(5));
-        $this->assertFalse($expectation->test('string'));
-    }
-
-    function testNull() {
-        $expectation = new IsAExpectation('null');
-        $this->assertTrue($expectation->test(null));
-        $this->assertFalse($expectation->test('string'));
-    }
-}
-
-class TestOfNotA extends UnitTestCase {
-
-    function testString() {
-        $expectation = new NotAExpectation('string');
-        $this->assertFalse($expectation->test('Hello'));
-        $this->assertTrue($expectation->test(5));
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/form_test.php b/3rdparty/simpletest/test/form_test.php
deleted file mode 100755
index 70a18f2b3a0..00000000000
--- a/3rdparty/simpletest/test/form_test.php
+++ /dev/null
@@ -1,344 +0,0 @@
-<?php
-// $Id: form_test.php 1996 2010-07-27 09:11:59Z pp11 $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../url.php');
-require_once(dirname(__FILE__) . '/../form.php');
-require_once(dirname(__FILE__) . '/../page.php');
-require_once(dirname(__FILE__) . '/../encoding.php');
-Mock::generate('SimplePage');
-
-class TestOfForm extends UnitTestCase {
-    
-    function page($url, $action = false) {
-        $page = new MockSimplePage();
-        $page->returns('getUrl', new SimpleUrl($url));
-        $page->returns('expandUrl', new SimpleUrl($url));
-        return $page;
-    }
-    
-    function testFormAttributes() {
-        $tag = new SimpleFormTag(array('method' => 'GET', 'action' => 'here.php', 'id' => '33'));
-        $form = new SimpleForm($tag, $this->page('http://host/a/index.html'));
-        $this->assertEqual($form->getMethod(), 'get');
-        $this->assertIdentical($form->getId(), '33');
-        $this->assertNull($form->getValue(new SimpleByName('a')));
-    }
-    
-    function testAction() {
-        $page = new MockSimplePage();
-        $page->expectOnce('expandUrl', array(new SimpleUrl('here.php')));
-        $page->setReturnValue('expandUrl', new SimpleUrl('http://host/here.php'));
-        $tag = new SimpleFormTag(array('method' => 'GET', 'action' => 'here.php'));
-        $form = new SimpleForm($tag, $page);
-        $this->assertEqual($form->getAction(), new SimpleUrl('http://host/here.php'));
-    }
-    
-    function testEmptyAction() {
-        $tag = new SimpleFormTag(array('method' => 'GET', 'action' => '', 'id' => '33'));
-        $form = new SimpleForm($tag, $this->page('http://host/a/index.html'));
-        $this->assertEqual(
-                $form->getAction(),
-                new SimpleUrl('http://host/a/index.html'));
-    }
-    
-    function testMissingAction() {
-        $tag = new SimpleFormTag(array('method' => 'GET'));
-        $form = new SimpleForm($tag, $this->page('http://host/a/index.html'));
-        $this->assertEqual(
-                $form->getAction(),
-                new SimpleUrl('http://host/a/index.html'));
-    }
-    
-    function testRootAction() {
-        $page = new MockSimplePage();
-        $page->expectOnce('expandUrl', array(new SimpleUrl('/')));
-        $page->setReturnValue('expandUrl', new SimpleUrl('http://host/'));
-        $tag = new SimpleFormTag(array('method' => 'GET', 'action' => '/'));
-        $form = new SimpleForm($tag, $page);
-        $this->assertEqual(
-                $form->getAction(),
-                new SimpleUrl('http://host/'));
-    }
-    
-    function testDefaultFrameTargetOnForm() {
-        $page = new MockSimplePage();
-        $page->expectOnce('expandUrl', array(new SimpleUrl('here.php')));
-        $page->setReturnValue('expandUrl', new SimpleUrl('http://host/here.php'));
-        $tag = new SimpleFormTag(array('method' => 'GET', 'action' => 'here.php'));
-        $form = new SimpleForm($tag, $page);
-        $form->setDefaultTarget('frame');
-        $expected = new SimpleUrl('http://host/here.php');
-        $expected->setTarget('frame');
-        $this->assertEqual($form->getAction(), $expected);
-    }
-    
-    function testTextWidget() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleTextTag(
-                array('name' => 'me', 'type' => 'text', 'value' => 'Myself')));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'Myself');
-        $this->assertTrue($form->setField(new SimpleByName('me'), 'Not me'));
-        $this->assertFalse($form->setField(new SimpleByName('not_present'), 'Not me'));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'Not me');
-        $this->assertNull($form->getValue(new SimpleByName('not_present')));
-    }
-    
-    function testTextWidgetById() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleTextTag(
-                array('name' => 'me', 'type' => 'text', 'value' => 'Myself', 'id' => 50)));
-        $this->assertIdentical($form->getValue(new SimpleById(50)), 'Myself');
-        $this->assertTrue($form->setField(new SimpleById(50), 'Not me'));
-        $this->assertIdentical($form->getValue(new SimpleById(50)), 'Not me');
-    }
-    
-    function testTextWidgetByLabel() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $widget = new SimpleTextTag(array('name' => 'me', 'type' => 'text', 'value' => 'a'));
-        $form->addWidget($widget);
-        $widget->setLabel('thing');
-        $this->assertIdentical($form->getValue(new SimpleByLabel('thing')), 'a');
-        $this->assertTrue($form->setField(new SimpleByLabel('thing'), 'b'));
-        $this->assertIdentical($form->getValue(new SimpleByLabel('thing')), 'b');
-    }
-    
-    function testSubmitEmpty() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $this->assertIdentical($form->submit(), new SimpleGetEncoding());
-    }
-    
-    function testSubmitButton() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
-        $form->addWidget(new SimpleSubmitTag(
-                array('type' => 'submit', 'name' => 'go', 'value' => 'Go!', 'id' => '9')));
-        $this->assertTrue($form->hasSubmit(new SimpleByName('go')));
-        $this->assertEqual($form->getValue(new SimpleByName('go')), 'Go!');
-        $this->assertEqual($form->getValue(new SimpleById(9)), 'Go!');
-        $this->assertEqual(
-                $form->submitButton(new SimpleByName('go')),
-                new SimpleGetEncoding(array('go' => 'Go!')));            
-        $this->assertEqual(
-                $form->submitButton(new SimpleByLabel('Go!')),
-                new SimpleGetEncoding(array('go' => 'Go!')));
-        $this->assertEqual(
-                $form->submitButton(new SimpleById(9)),
-                new SimpleGetEncoding(array('go' => 'Go!')));            
-    }
-    
-    function testSubmitWithAdditionalParameters() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
-        $form->addWidget(new SimpleSubmitTag(
-                array('type' => 'submit', 'name' => 'go', 'value' => 'Go!')));
-        $this->assertEqual(
-                $form->submitButton(new SimpleByLabel('Go!'), array('a' => 'A')),
-                new SimpleGetEncoding(array('go' => 'Go!', 'a' => 'A')));            
-    }
-    
-    function testSubmitButtonWithLabelOfSubmit() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
-        $form->addWidget(new SimpleSubmitTag(
-                array('type' => 'submit', 'name' => 'test', 'value' => 'Submit')));
-        $this->assertEqual(
-                $form->submitButton(new SimpleByName('test')),
-                new SimpleGetEncoding(array('test' => 'Submit')));            
-        $this->assertEqual(
-                $form->submitButton(new SimpleByLabel('Submit')),
-                new SimpleGetEncoding(array('test' => 'Submit')));            
-    }
-    
-    function testSubmitButtonWithWhitespacePaddedLabelOfSubmit() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
-        $form->addWidget(new SimpleSubmitTag(
-                array('type' => 'submit', 'name' => 'test', 'value' => ' Submit ')));
-        $this->assertEqual(
-                $form->submitButton(new SimpleByLabel('Submit')),
-                new SimpleGetEncoding(array('test' => ' Submit ')));            
-    }
-    
-    function testImageSubmitButton() {
-        $form = new SimpleForm(new SimpleFormTag(array()),  $this->page('htp://host'));
-        $form->addWidget(new SimpleImageSubmitTag(array(
-                'type' => 'image',
-                'src' => 'source.jpg',
-                'name' => 'go',
-                'alt' => 'Go!',
-                'id' => '9')));
-        $this->assertTrue($form->hasImage(new SimpleByLabel('Go!')));
-        $this->assertEqual(
-                $form->submitImage(new SimpleByLabel('Go!'), 100, 101),
-                new SimpleGetEncoding(array('go.x' => 100, 'go.y' => 101)));
-        $this->assertTrue($form->hasImage(new SimpleByName('go')));
-        $this->assertEqual(
-                $form->submitImage(new SimpleByName('go'), 100, 101),
-                new SimpleGetEncoding(array('go.x' => 100, 'go.y' => 101)));
-        $this->assertTrue($form->hasImage(new SimpleById(9)));
-        $this->assertEqual(
-                $form->submitImage(new SimpleById(9), 100, 101),
-                new SimpleGetEncoding(array('go.x' => 100, 'go.y' => 101)));
-    }
-    
-    function testImageSubmitButtonWithAdditionalData() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleImageSubmitTag(array(
-                'type' => 'image',
-                'src' => 'source.jpg',
-                'name' => 'go',
-                'alt' => 'Go!')));
-        $this->assertEqual(
-                $form->submitImage(new SimpleByLabel('Go!'), 100, 101, array('a' => 'A')),
-                new SimpleGetEncoding(array('go.x' => 100, 'go.y' => 101, 'a' => 'A')));
-    }
-    
-    function testButtonTag() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
-        $widget = new SimpleButtonTag(
-                array('type' => 'submit', 'name' => 'go', 'value' => 'Go', 'id' => '9'));
-        $widget->addContent('Go!');
-        $form->addWidget($widget);
-        $this->assertTrue($form->hasSubmit(new SimpleByName('go')));
-        $this->assertTrue($form->hasSubmit(new SimpleByLabel('Go!')));
-        $this->assertEqual(
-                $form->submitButton(new SimpleByName('go')),
-                new SimpleGetEncoding(array('go' => 'Go')));
-        $this->assertEqual(
-                $form->submitButton(new SimpleByLabel('Go!')),
-                new SimpleGetEncoding(array('go' => 'Go')));
-        $this->assertEqual(
-                $form->submitButton(new SimpleById(9)),
-                new SimpleGetEncoding(array('go' => 'Go')));
-    }
-    
-    function testMultipleFieldsWithSameNameSubmitted() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $input = new SimpleTextTag(array('name' => 'elements[]', 'value' => '1'));
-        $form->addWidget($input);
-        $input = new SimpleTextTag(array('name' => 'elements[]', 'value' => '2'));
-        $form->addWidget($input);
-        $form->setField(new SimpleByLabelOrName('elements[]'), '3', 1);
-        $form->setField(new SimpleByLabelOrName('elements[]'), '4', 2);
-		$submit = $form->submit();
-		$requests = $submit->getAll();
-        $this->assertEqual(count($requests), 2);
-        $this->assertIdentical($requests[0], new SimpleEncodedPair('elements[]', '3'));
-        $this->assertIdentical($requests[1], new SimpleEncodedPair('elements[]', '4'));
-    }
-    
-    function testSingleSelectFieldSubmitted() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $select = new SimpleSelectionTag(array('name' => 'a'));
-        $select->addTag(new SimpleOptionTag(
-                array('value' => 'aaa', 'selected' => '')));
-        $form->addWidget($select);
-        $this->assertIdentical(
-                $form->submit(),
-                new SimpleGetEncoding(array('a' => 'aaa')));
-    }
-    
-    function testSingleSelectFieldSubmittedWithPost() {
-        $form = new SimpleForm(new SimpleFormTag(array('method' => 'post')), $this->page('htp://host'));
-        $select = new SimpleSelectionTag(array('name' => 'a'));
-        $select->addTag(new SimpleOptionTag(
-                array('value' => 'aaa', 'selected' => '')));
-        $form->addWidget($select);
-        $this->assertIdentical(
-                $form->submit(),
-                new SimplePostEncoding(array('a' => 'aaa')));
-    }
-    
-    function testUnchecked() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleCheckboxTag(
-                array('name' => 'me', 'type' => 'checkbox')));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), false);
-        $this->assertTrue($form->setField(new SimpleByName('me'), 'on'));
-        $this->assertEqual($form->getValue(new SimpleByName('me')), 'on');
-        $this->assertFalse($form->setField(new SimpleByName('me'), 'other'));
-        $this->assertEqual($form->getValue(new SimpleByName('me')), 'on');
-    }
-    
-    function testChecked() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleCheckboxTag(
-                array('name' => 'me', 'value' => 'a', 'type' => 'checkbox', 'checked' => '')));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'a');
-        $this->assertTrue($form->setField(new SimpleByName('me'), 'a'));
-        $this->assertEqual($form->getValue(new SimpleByName('me')), 'a');
-        $this->assertTrue($form->setField(new SimpleByName('me'), false));
-        $this->assertEqual($form->getValue(new SimpleByName('me')), false);
-    }
-    
-    function testSingleUncheckedRadioButton() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleRadioButtonTag(
-                array('name' => 'me', 'value' => 'a', 'type' => 'radio')));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), false);
-        $this->assertTrue($form->setField(new SimpleByName('me'), 'a'));
-        $this->assertEqual($form->getValue(new SimpleByName('me')), 'a');
-    }
-    
-    function testSingleCheckedRadioButton() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleRadioButtonTag(
-                array('name' => 'me', 'value' => 'a', 'type' => 'radio', 'checked' => '')));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'a');
-        $this->assertFalse($form->setField(new SimpleByName('me'), 'other'));
-    }
-    
-    function testUncheckedRadioButtons() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleRadioButtonTag(
-                array('name' => 'me', 'value' => 'a', 'type' => 'radio')));
-        $form->addWidget(new SimpleRadioButtonTag(
-                array('name' => 'me', 'value' => 'b', 'type' => 'radio')));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), false);
-        $this->assertTrue($form->setField(new SimpleByName('me'), 'a'));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'a');
-        $this->assertTrue($form->setField(new SimpleByName('me'), 'b'));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'b');
-        $this->assertFalse($form->setField(new SimpleByName('me'), 'c'));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'b');
-    }
-    
-    function testCheckedRadioButtons() {
-        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleRadioButtonTag(
-                array('name' => 'me', 'value' => 'a', 'type' => 'radio')));
-        $form->addWidget(new SimpleRadioButtonTag(
-                array('name' => 'me', 'value' => 'b', 'type' => 'radio', 'checked' => '')));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'b');
-        $this->assertTrue($form->setField(new SimpleByName('me'), 'a'));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'a');
-    }
-    
-    function testMultipleFieldsWithSameKey() {
-        $form = new SimpleForm(new SimpleFormTag(array()),  $this->page('htp://host'));
-        $form->addWidget(new SimpleCheckboxTag(
-                array('name' => 'a', 'type' => 'checkbox', 'value' => 'me')));
-        $form->addWidget(new SimpleCheckboxTag(
-                array('name' => 'a', 'type' => 'checkbox', 'value' => 'you')));
-        $this->assertIdentical($form->getValue(new SimpleByName('a')), false);
-        $this->assertTrue($form->setField(new SimpleByName('a'), 'me'));
-        $this->assertIdentical($form->getValue(new SimpleByName('a')), 'me');
-    }
-
-    function testRemoveGetParamsFromAction() {
-        Mock::generatePartial('SimplePage', 'MockPartialSimplePage', array('getUrl'));
-        $page = new MockPartialSimplePage();
-        $page->returns('getUrl', new SimpleUrl('htp://host/'));
-
-        # Keep GET params in "action", if the form has no widgets
-        $form = new SimpleForm(new SimpleFormTag(array('action'=>'?test=1')), $page);
-        $this->assertEqual($form->getAction()->asString(), 'htp://host/');
-
-        $form = new SimpleForm(new SimpleFormTag(array('action'=>'?test=1')),  $page);
-        $form->addWidget(new SimpleTextTag(array('name' => 'me', 'type' => 'text', 'value' => 'a')));
-        $this->assertEqual($form->getAction()->asString(), 'htp://host/');
-
-        $form = new SimpleForm(new SimpleFormTag(array('action'=>'')),  $page);
-        $this->assertEqual($form->getAction()->asString(), 'htp://host/');
-
-        $form = new SimpleForm(new SimpleFormTag(array('action'=>'?test=1', 'method'=>'post')),  $page);
-        $this->assertEqual($form->getAction()->asString(), 'htp://host/?test=1');
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/frames_test.php b/3rdparty/simpletest/test/frames_test.php
deleted file mode 100755
index 29309700e31..00000000000
--- a/3rdparty/simpletest/test/frames_test.php
+++ /dev/null
@@ -1,549 +0,0 @@
-<?php
-// $Id: frames_test.php 1899 2009-07-28 19:33:42Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../tag.php');
-require_once(dirname(__FILE__) . '/../page.php');
-require_once(dirname(__FILE__) . '/../frames.php');
-Mock::generate('SimplePage');
-Mock::generate('SimpleForm');
-
-class TestOfFrameset extends UnitTestCase {
-
-    function testTitleReadFromFramesetPage() {
-        $page = new MockSimplePage();
-        $page->setReturnValue('getTitle', 'This page');
-        $frameset = new SimpleFrameset($page);
-        $this->assertEqual($frameset->getTitle(), 'This page');
-    }
-
-    function TestHeadersReadFromFramesetByDefault() {
-        $page = new MockSimplePage();
-        $page->setReturnValue('getHeaders', 'Header: content');
-        $page->setReturnValue('getMimeType', 'text/xml');
-        $page->setReturnValue('getResponseCode', 401);
-        $page->setReturnValue('getTransportError', 'Could not parse headers');
-        $page->setReturnValue('getAuthentication', 'Basic');
-        $page->setReturnValue('getRealm', 'Safe place');
-
-        $frameset = new SimpleFrameset($page);
-
-        $this->assertIdentical($frameset->getHeaders(), 'Header: content');
-        $this->assertIdentical($frameset->getMimeType(), 'text/xml');
-        $this->assertIdentical($frameset->getResponseCode(), 401);
-        $this->assertIdentical($frameset->getTransportError(), 'Could not parse headers');
-        $this->assertIdentical($frameset->getAuthentication(), 'Basic');
-        $this->assertIdentical($frameset->getRealm(), 'Safe place');
-    }
-
-    function testEmptyFramesetHasNoContent() {
-        $page = new MockSimplePage();
-        $page->setReturnValue('getRaw', 'This content');
-        $frameset = new SimpleFrameset($page);
-        $this->assertEqual($frameset->getRaw(), '');
-    }
-
-    function testRawContentIsFromOnlyFrame() {
-        $page = new MockSimplePage();
-        $page->expectNever('getRaw');
-
-        $frame = new MockSimplePage();
-        $frame->setReturnValue('getRaw', 'Stuff');
-
-        $frameset = new SimpleFrameset($page);
-        $frameset->addFrame($frame);
-        $this->assertEqual($frameset->getRaw(), 'Stuff');
-    }
-
-    function testRawContentIsFromAllFrames() {
-        $page = new MockSimplePage();
-        $page->expectNever('getRaw');
-
-        $frame1 = new MockSimplePage();
-        $frame1->setReturnValue('getRaw', 'Stuff1');
-
-        $frame2 = new MockSimplePage();
-        $frame2->setReturnValue('getRaw', 'Stuff2');
-
-        $frameset = new SimpleFrameset($page);
-        $frameset->addFrame($frame1);
-        $frameset->addFrame($frame2);
-        $this->assertEqual($frameset->getRaw(), 'Stuff1Stuff2');
-    }
-
-    function testTextContentIsFromOnlyFrame() {
-        $page = new MockSimplePage();
-        $page->expectNever('getText');
-
-        $frame = new MockSimplePage();
-        $frame->setReturnValue('getText', 'Stuff');
-
-        $frameset = new SimpleFrameset($page);
-        $frameset->addFrame($frame);
-        $this->assertEqual($frameset->getText(), 'Stuff');
-    }
-
-    function testTextContentIsFromAllFrames() {
-        $page = new MockSimplePage();
-        $page->expectNever('getText');
-
-        $frame1 = new MockSimplePage();
-        $frame1->setReturnValue('getText', 'Stuff1');
-
-        $frame2 = new MockSimplePage();
-        $frame2->setReturnValue('getText', 'Stuff2');
-
-        $frameset = new SimpleFrameset($page);
-        $frameset->addFrame($frame1);
-        $frameset->addFrame($frame2);
-        $this->assertEqual($frameset->getText(), 'Stuff1 Stuff2');
-    }
-
-    function testFieldFoundIsFirstInFramelist() {
-        $frame1 = new MockSimplePage();
-        $frame1->setReturnValue('getField', null);
-        $frame1->expectOnce('getField', array(new SimpleByName('a')));
-
-        $frame2 = new MockSimplePage();
-        $frame2->setReturnValue('getField', 'A');
-        $frame2->expectOnce('getField', array(new SimpleByName('a')));
-
-        $frame3 = new MockSimplePage();
-        $frame3->expectNever('getField');
-
-        $page = new MockSimplePage();
-        $frameset = new SimpleFrameset($page);
-        $frameset->addFrame($frame1);
-        $frameset->addFrame($frame2);
-        $frameset->addFrame($frame3);
-        $this->assertIdentical($frameset->getField(new SimpleByName('a')), 'A');
-    }
-
-    function testFrameReplacementByIndex() {
-        $page = new MockSimplePage();
-        $page->expectNever('getRaw');
-
-        $frame1 = new MockSimplePage();
-        $frame1->setReturnValue('getRaw', 'Stuff1');
-
-        $frame2 = new MockSimplePage();
-        $frame2->setReturnValue('getRaw', 'Stuff2');
-
-        $frameset = new SimpleFrameset($page);
-        $frameset->addFrame($frame1);
-        $frameset->setFrame(array(1), $frame2);
-        $this->assertEqual($frameset->getRaw(), 'Stuff2');
-    }
-
-    function testFrameReplacementByName() {
-        $page = new MockSimplePage();
-        $page->expectNever('getRaw');
-
-        $frame1 = new MockSimplePage();
-        $frame1->setReturnValue('getRaw', 'Stuff1');
-
-        $frame2 = new MockSimplePage();
-        $frame2->setReturnValue('getRaw', 'Stuff2');
-
-        $frameset = new SimpleFrameset($page);
-        $frameset->addFrame($frame1, 'a');
-        $frameset->setFrame(array('a'), $frame2);
-        $this->assertEqual($frameset->getRaw(), 'Stuff2');
-    }
-}
-
-class TestOfFrameNavigation extends UnitTestCase {
-
-    function testStartsWithoutFrameFocus() {
-        $page = new MockSimplePage();
-        $frameset = new SimpleFrameset($page);
-        $frameset->addFrame(new MockSimplePage());
-        $this->assertFalse($frameset->getFrameFocus());
-    }
-
-    function testCanFocusOnSingleFrame() {
-        $page = new MockSimplePage();
-        $page->expectNever('getRaw');
-
-        $frame = new MockSimplePage();
-        $frame->setReturnValue('getFrameFocus', array());
-        $frame->setReturnValue('getRaw', 'Stuff');
-
-        $frameset = new SimpleFrameset($page);
-        $frameset->addFrame($frame);
-
-        $this->assertFalse($frameset->setFrameFocusByIndex(0));
-        $this->assertTrue($frameset->setFrameFocusByIndex(1));
-        $this->assertEqual($frameset->getRaw(), 'Stuff');
-        $this->assertFalse($frameset->setFrameFocusByIndex(2));
-        $this->assertIdentical($frameset->getFrameFocus(), array(1));
-    }
-
-    function testContentComesFromFrameInFocus() {
-        $page = new MockSimplePage();
-
-        $frame1 = new MockSimplePage();
-        $frame1->setReturnValue('getRaw', 'Stuff1');
-        $frame1->setReturnValue('getFrameFocus', array());
-
-        $frame2 = new MockSimplePage();
-        $frame2->setReturnValue('getRaw', 'Stuff2');
-        $frame2->setReturnValue('getFrameFocus', array());
-
-        $frameset = new SimpleFrameset($page);
-        $frameset->addFrame($frame1);
-        $frameset->addFrame($frame2);
-
-        $this->assertTrue($frameset->setFrameFocusByIndex(1));
-        $this->assertEqual($frameset->getFrameFocus(), array(1));
-        $this->assertEqual($frameset->getRaw(), 'Stuff1');
-
-        $this->assertTrue($frameset->setFrameFocusByIndex(2));
-        $this->assertEqual($frameset->getFrameFocus(), array(2));
-        $this->assertEqual($frameset->getRaw(), 'Stuff2');
-
-        $this->assertFalse($frameset->setFrameFocusByIndex(3));
-        $this->assertEqual($frameset->getFrameFocus(), array(2));
-
-        $frameset->clearFrameFocus();
-        $this->assertEqual($frameset->getRaw(), 'Stuff1Stuff2');
-    }
-
-    function testCanFocusByName() {
-        $page = new MockSimplePage();
-
-        $frame1 = new MockSimplePage();
-        $frame1->setReturnValue('getRaw', 'Stuff1');
-        $frame1->setReturnValue('getFrameFocus', array());
-
-        $frame2 = new MockSimplePage();
-        $frame2->setReturnValue('getRaw', 'Stuff2');
-        $frame2->setReturnValue('getFrameFocus', array());
-
-        $frameset = new SimpleFrameset($page);
-        $frameset->addFrame($frame1, 'A');
-        $frameset->addFrame($frame2, 'B');
-
-        $this->assertTrue($frameset->setFrameFocus('A'));
-        $this->assertEqual($frameset->getFrameFocus(), array('A'));
-        $this->assertEqual($frameset->getRaw(), 'Stuff1');
-
-        $this->assertTrue($frameset->setFrameFocusByIndex(2));
-        $this->assertEqual($frameset->getFrameFocus(), array('B'));
-        $this->assertEqual($frameset->getRaw(), 'Stuff2');
-
-        $this->assertFalse($frameset->setFrameFocus('z'));
-
-        $frameset->clearFrameFocus();
-        $this->assertEqual($frameset->getRaw(), 'Stuff1Stuff2');
-    }
-}
-
-class TestOfFramesetPageInterface extends UnitTestCase {
-    private $page_interface;
-    private $frameset_interface;
-
-    function __construct() {
-        parent::__construct();
-        $this->page_interface = $this->getPageMethods();
-        $this->frameset_interface = $this->getFramesetMethods();
-    }
-
-    function assertListInAnyOrder($list, $expected) {
-        sort($list);
-        sort($expected);
-        $this->assertEqual($list, $expected);
-    }
-
-    private function getPageMethods() {
-        $methods = array();
-        foreach (get_class_methods('SimplePage') as $method) {
-            if (strtolower($method) == strtolower('SimplePage')) {
-                continue;
-            }
-            if (strtolower($method) == strtolower('getFrameset')) {
-                continue;
-            }
-            if (strncmp($method, '_', 1) == 0) {
-                continue;
-            }
-            if (in_array($method, array('setTitle', 'setBase', 'setForms', 'normalise', 'setFrames', 'addLink'))) {
-                continue;
-            }
-            $methods[] = $method;
-        }
-        return $methods;
-    }
-
-    private function getFramesetMethods() {
-        $methods = array();
-        foreach (get_class_methods('SimpleFrameset') as $method) {
-            if (strtolower($method) == strtolower('SimpleFrameset')) {
-                continue;
-            }
-            if (strncmp($method, '_', 1) == 0) {
-                continue;
-            }
-            if (strncmp($method, 'add', 3) == 0) {
-                continue;
-            }
-            $methods[] = $method;
-        }
-        return $methods;
-    }
-
-    function testFramsetHasPageInterface() {
-        $difference = array();
-        foreach ($this->page_interface as $method) {
-            if (! in_array($method, $this->frameset_interface)) {
-                $this->fail("No [$method] in Frameset class");
-                return;
-            }
-        }
-        $this->pass('Frameset covers Page interface');
-    }
-
-    function testHeadersReadFromFrameIfInFocus() {
-        $frame = new MockSimplePage();
-        $frame->setReturnValue('getUrl', new SimpleUrl('http://localhost/stuff'));
-
-        $frame->setReturnValue('getRequest', 'POST stuff');
-        $frame->setReturnValue('getMethod', 'POST');
-        $frame->setReturnValue('getRequestData', array('a' => 'A'));
-        $frame->setReturnValue('getHeaders', 'Header: content');
-        $frame->setReturnValue('getMimeType', 'text/xml');
-        $frame->setReturnValue('getResponseCode', 401);
-        $frame->setReturnValue('getTransportError', 'Could not parse headers');
-        $frame->setReturnValue('getAuthentication', 'Basic');
-        $frame->setReturnValue('getRealm', 'Safe place');
-
-        $frameset = new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame($frame);
-        $frameset->setFrameFocusByIndex(1);
-
-        $url = new SimpleUrl('http://localhost/stuff');
-        $url->setTarget(1);
-        $this->assertIdentical($frameset->getUrl(), $url);
-
-        $this->assertIdentical($frameset->getRequest(), 'POST stuff');
-        $this->assertIdentical($frameset->getMethod(), 'POST');
-        $this->assertIdentical($frameset->getRequestData(), array('a' => 'A'));
-        $this->assertIdentical($frameset->getHeaders(), 'Header: content');
-        $this->assertIdentical($frameset->getMimeType(), 'text/xml');
-        $this->assertIdentical($frameset->getResponseCode(), 401);
-        $this->assertIdentical($frameset->getTransportError(), 'Could not parse headers');
-        $this->assertIdentical($frameset->getAuthentication(), 'Basic');
-        $this->assertIdentical($frameset->getRealm(), 'Safe place');
-    }
-
-    function testUrlsComeFromBothFrames() {
-        $page = new MockSimplePage();
-        $page->expectNever('getUrls');
-
-        $frame1 = new MockSimplePage();
-        $frame1->setReturnValue(
-                'getUrls',
-                array('http://www.lastcraft.com/', 'http://myserver/'));
-
-        $frame2 = new MockSimplePage();
-        $frame2->setReturnValue(
-                'getUrls',
-                array('http://www.lastcraft.com/', 'http://test/'));
-
-        $frameset = new SimpleFrameset($page);
-        $frameset->addFrame($frame1);
-        $frameset->addFrame($frame2);
-        $this->assertListInAnyOrder(
-                $frameset->getUrls(),
-                array('http://www.lastcraft.com/', 'http://myserver/', 'http://test/'));
-    }
-
-    function testLabelledUrlsComeFromBothFrames() {
-        $frame1 = new MockSimplePage();
-        $frame1->setReturnValue(
-                'getUrlsByLabel',
-                array(new SimpleUrl('goodbye.php')),
-                array('a'));
-
-        $frame2 = new MockSimplePage();
-        $frame2->setReturnValue(
-                'getUrlsByLabel',
-                array(new SimpleUrl('hello.php')),
-                array('a'));
-
-        $frameset = new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame($frame1);
-        $frameset->addFrame($frame2, 'Two');
-
-        $expected1 = new SimpleUrl('goodbye.php');
-        $expected1->setTarget(1);
-        $expected2 = new SimpleUrl('hello.php');
-        $expected2->setTarget('Two');
-        $this->assertEqual(
-                $frameset->getUrlsByLabel('a'),
-                array($expected1, $expected2));
-    }
-
-    function testUrlByIdComesFromFirstFrameToRespond() {
-        $frame1 = new MockSimplePage();
-        $frame1->setReturnValue('getUrlById', new SimpleUrl('four.php'), array(4));
-        $frame1->setReturnValue('getUrlById', false, array(5));
-
-        $frame2 = new MockSimplePage();
-        $frame2->setReturnValue('getUrlById', false, array(4));
-        $frame2->setReturnValue('getUrlById', new SimpleUrl('five.php'), array(5));
-
-        $frameset = new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame($frame1);
-        $frameset->addFrame($frame2);
-
-        $four = new SimpleUrl('four.php');
-        $four->setTarget(1);
-        $this->assertEqual($frameset->getUrlById(4), $four);
-        $five = new SimpleUrl('five.php');
-        $five->setTarget(2);
-        $this->assertEqual($frameset->getUrlById(5), $five);
-    }
-
-    function testReadUrlsFromFrameInFocus() {
-        $frame1 = new MockSimplePage();
-        $frame1->setReturnValue('getUrls', array('a'));
-        $frame1->setReturnValue('getUrlsByLabel', array(new SimpleUrl('l')));
-        $frame1->setReturnValue('getUrlById', new SimpleUrl('i'));
-
-        $frame2 = new MockSimplePage();
-        $frame2->expectNever('getUrls');
-        $frame2->expectNever('getUrlsByLabel');
-        $frame2->expectNever('getUrlById');
-
-        $frameset = new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame($frame1, 'A');
-        $frameset->addFrame($frame2, 'B');
-        $frameset->setFrameFocus('A');
-
-        $this->assertIdentical($frameset->getUrls(), array('a'));
-        $expected = new SimpleUrl('l');
-        $expected->setTarget('A');
-        $this->assertIdentical($frameset->getUrlsByLabel('label'), array($expected));
-        $expected = new SimpleUrl('i');
-        $expected->setTarget('A');
-        $this->assertIdentical($frameset->getUrlById(99), $expected);
-    }
-
-    function testReadFrameTaggedUrlsFromFrameInFocus() {
-        $frame = new MockSimplePage();
-
-        $by_label = new SimpleUrl('l');
-        $by_label->setTarget('L');
-        $frame->setReturnValue('getUrlsByLabel', array($by_label));
-
-        $by_id = new SimpleUrl('i');
-        $by_id->setTarget('I');
-        $frame->setReturnValue('getUrlById', $by_id);
-
-        $frameset = new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame($frame, 'A');
-        $frameset->setFrameFocus('A');
-
-        $this->assertIdentical($frameset->getUrlsByLabel('label'), array($by_label));
-        $this->assertIdentical($frameset->getUrlById(99), $by_id);
-    }
-
-    function testFindingFormsById() {
-        $frame = new MockSimplePage();
-        $form = new MockSimpleForm();
-        $frame->returns('getFormById', $form, array('a'));
-
-        $frameset = new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame(new MockSimplePage(), 'A');
-        $frameset->addFrame($frame, 'B');
-        $this->assertSame($frameset->getFormById('a'), $form);
-
-        $frameset->setFrameFocus('A');
-        $this->assertNull($frameset->getFormById('a'));
-
-        $frameset->setFrameFocus('B');
-        $this->assertSame($frameset->getFormById('a'), $form);
-    }
-
-    function testFindingFormsBySubmit() {
-        $frame = new MockSimplePage();
-        $form = new MockSimpleForm();
-        $frame->returns(
-                'getFormBySubmit',
-                $form,
-                array(new SimpleByLabel('a')));
-
-        $frameset = new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame(new MockSimplePage(), 'A');
-        $frameset->addFrame($frame, 'B');
-        $this->assertSame($frameset->getFormBySubmit(new SimpleByLabel('a')), $form);
-
-        $frameset->setFrameFocus('A');
-        $this->assertNull($frameset->getFormBySubmit(new SimpleByLabel('a')));
-
-        $frameset->setFrameFocus('B');
-        $this->assertSame($frameset->getFormBySubmit(new SimpleByLabel('a')), $form);
-    }
-
-    function testFindingFormsByImage() {
-        $frame = new MockSimplePage();
-        $form = new MockSimpleForm();
-        $frame->returns(
-                'getFormByImage',
-                $form,
-                array(new SimpleByLabel('a')));
-
-        $frameset = new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame(new MockSimplePage(), 'A');
-        $frameset->addFrame($frame, 'B');
-        $this->assertSame($frameset->getFormByImage(new SimpleByLabel('a')), $form);
-
-        $frameset->setFrameFocus('A');
-        $this->assertNull($frameset->getFormByImage(new SimpleByLabel('a')));
-
-        $frameset->setFrameFocus('B');
-        $this->assertSame($frameset->getFormByImage(new SimpleByLabel('a')), $form);
-    }
-
-    function testSettingAllFrameFieldsWhenNoFrameFocus() {
-        $frame1 = new MockSimplePage();
-        $frame1->expectOnce('setField', array(new SimpleById(22), 'A'));
-
-        $frame2 = new MockSimplePage();
-        $frame2->expectOnce('setField', array(new SimpleById(22), 'A'));
-
-        $frameset = new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame($frame1, 'A');
-        $frameset->addFrame($frame2, 'B');
-        $frameset->setField(new SimpleById(22), 'A');
-    }
-
-    function testOnlySettingFieldFromFocusedFrame() {
-        $frame1 = new MockSimplePage();
-        $frame1->expectOnce('setField', array(new SimpleByLabelOrName('a'), 'A'));
-
-        $frame2 = new MockSimplePage();
-        $frame2->expectNever('setField');
-
-        $frameset = new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame($frame1, 'A');
-        $frameset->addFrame($frame2, 'B');
-        $frameset->setFrameFocus('A');
-        $frameset->setField(new SimpleByLabelOrName('a'), 'A');
-    }
-
-    function testOnlyGettingFieldFromFocusedFrame() {
-        $frame1 = new MockSimplePage();
-        $frame1->setReturnValue('getField', 'f', array(new SimpleByName('a')));
-
-        $frame2 = new MockSimplePage();
-        $frame2->expectNever('getField');
-
-        $frameset = new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame($frame1, 'A');
-        $frameset->addFrame($frame2, 'B');
-        $frameset->setFrameFocus('A');
-        $this->assertIdentical($frameset->getField(new SimpleByName('a')), 'f');
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/http_test.php b/3rdparty/simpletest/test/http_test.php
deleted file mode 100755
index bd3fdd0d028..00000000000
--- a/3rdparty/simpletest/test/http_test.php
+++ /dev/null
@@ -1,492 +0,0 @@
-<?php
-// $Id: http_test.php 1964 2009-10-13 15:27:31Z maetl_ $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../encoding.php');
-require_once(dirname(__FILE__) . '/../http.php');
-require_once(dirname(__FILE__) . '/../socket.php');
-require_once(dirname(__FILE__) . '/../cookies.php');
-Mock::generate('SimpleSocket');
-Mock::generate('SimpleCookieJar');
-Mock::generate('SimpleRoute');
-Mock::generatePartial(
-		'SimpleRoute',
-		'PartialSimpleRoute',
-array('createSocket'));
-Mock::generatePartial(
-        'SimpleProxyRoute',
-        'PartialSimpleProxyRoute',
-array('createSocket'));
-
-class TestOfDirectRoute extends UnitTestCase {
-
-	function testDefaultGetRequest() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("GET /here.html HTTP/1.0\r\n"));
-		$socket->expectAt(1, 'write', array("Host: a.valid.host\r\n"));
-		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
-		$socket->expectCallCount('write', 3);
-		$route = new PartialSimpleRoute();
-		$route->setReturnReference('createSocket', $socket);
-		$route->__construct(new SimpleUrl('http://a.valid.host/here.html'));
-		$this->assertSame($route->createConnection('GET', 15), $socket);
-	}
-
-	function testDefaultPostRequest() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("POST /here.html HTTP/1.0\r\n"));
-		$socket->expectAt(1, 'write', array("Host: a.valid.host\r\n"));
-		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
-		$socket->expectCallCount('write', 3);
-		$route = new PartialSimpleRoute();
-		$route->setReturnReference('createSocket', $socket);
-		$route->__construct(new SimpleUrl('http://a.valid.host/here.html'));
-
-		$route->createConnection('POST', 15);
-	}
-	
-	function testDefaultDeleteRequest() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("DELETE /here.html HTTP/1.0\r\n"));
-		$socket->expectAt(1, 'write', array("Host: a.valid.host\r\n"));
-		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
-		$socket->expectCallCount('write', 3);
-		$route = new PartialSimpleRoute();
-		$route->setReturnReference('createSocket', $socket);
-		$route->__construct(new SimpleUrl('http://a.valid.host/here.html'));
-		$this->assertSame($route->createConnection('DELETE', 15), $socket);
-	}
-	
-	function testDefaultHeadRequest() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("HEAD /here.html HTTP/1.0\r\n"));
-		$socket->expectAt(1, 'write', array("Host: a.valid.host\r\n"));
-		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
-		$socket->expectCallCount('write', 3);
-		$route = new PartialSimpleRoute();
-		$route->setReturnReference('createSocket', $socket);
-		$route->__construct(new SimpleUrl('http://a.valid.host/here.html'));
-		$this->assertSame($route->createConnection('HEAD', 15), $socket);
-	}
-
-	function testGetWithPort() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("GET /here.html HTTP/1.0\r\n"));
-		$socket->expectAt(1, 'write', array("Host: a.valid.host:81\r\n"));
-		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
-		$socket->expectCallCount('write', 3);
-
-		$route = new PartialSimpleRoute();
-		$route->setReturnReference('createSocket', $socket);
-		$route->__construct(new SimpleUrl('http://a.valid.host:81/here.html'));
-
-		$route->createConnection('GET', 15);
-	}
-
-	function testGetWithParameters() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("GET /here.html?a=1&b=2 HTTP/1.0\r\n"));
-		$socket->expectAt(1, 'write', array("Host: a.valid.host\r\n"));
-		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
-		$socket->expectCallCount('write', 3);
-
-		$route = new PartialSimpleRoute();
-		$route->setReturnReference('createSocket', $socket);
-		$route->__construct(new SimpleUrl('http://a.valid.host/here.html?a=1&b=2'));
-
-		$route->createConnection('GET', 15);
-	}
-}
-
-class TestOfProxyRoute extends UnitTestCase {
-
-	function testDefaultGet() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("GET http://a.valid.host/here.html HTTP/1.0\r\n"));
-		$socket->expectAt(1, 'write', array("Host: my-proxy:8080\r\n"));
-		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
-		$socket->expectCallCount('write', 3);
-
-		$route = new PartialSimpleProxyRoute();
-		$route->setReturnReference('createSocket', $socket);
-		$route->__construct(
-		new SimpleUrl('http://a.valid.host/here.html'),
-		new SimpleUrl('http://my-proxy'));
-		$route->createConnection('GET', 15);
-	}
-
-	function testDefaultPost() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("POST http://a.valid.host/here.html HTTP/1.0\r\n"));
-		$socket->expectAt(1, 'write', array("Host: my-proxy:8080\r\n"));
-		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
-		$socket->expectCallCount('write', 3);
-
-		$route = new PartialSimpleProxyRoute();
-		$route->setReturnReference('createSocket', $socket);
-		$route->__construct(
-		new SimpleUrl('http://a.valid.host/here.html'),
-		new SimpleUrl('http://my-proxy'));
-		$route->createConnection('POST', 15);
-	}
-
-	function testGetWithPort() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("GET http://a.valid.host:81/here.html HTTP/1.0\r\n"));
-		$socket->expectAt(1, 'write', array("Host: my-proxy:8081\r\n"));
-		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
-		$socket->expectCallCount('write', 3);
-
-		$route = new PartialSimpleProxyRoute();
-		$route->setReturnReference('createSocket', $socket);
-		$route->__construct(
-		new SimpleUrl('http://a.valid.host:81/here.html'),
-		new SimpleUrl('http://my-proxy:8081'));
-		$route->createConnection('GET', 15);
-	}
-
-	function testGetWithParameters() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("GET http://a.valid.host/here.html?a=1&b=2 HTTP/1.0\r\n"));
-		$socket->expectAt(1, 'write', array("Host: my-proxy:8080\r\n"));
-		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
-		$socket->expectCallCount('write', 3);
-
-		$route = new PartialSimpleProxyRoute();
-		$route->setReturnReference('createSocket', $socket);
-		$route->__construct(
-		new SimpleUrl('http://a.valid.host/here.html?a=1&b=2'),
-		new SimpleUrl('http://my-proxy'));
-		$route->createConnection('GET', 15);
-	}
-
-	function testGetWithAuthentication() {
-		$encoded = base64_encode('Me:Secret');
-
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("GET http://a.valid.host/here.html HTTP/1.0\r\n"));
-		$socket->expectAt(1, 'write', array("Host: my-proxy:8080\r\n"));
-		$socket->expectAt(2, 'write', array("Proxy-Authorization: Basic $encoded\r\n"));
-		$socket->expectAt(3, 'write', array("Connection: close\r\n"));
-		$socket->expectCallCount('write', 4);
-
-		$route = new PartialSimpleProxyRoute();
-		$route->setReturnReference('createSocket', $socket);
-		$route->__construct(
-		new SimpleUrl('http://a.valid.host/here.html'),
-		new SimpleUrl('http://my-proxy'),
-                'Me',
-                'Secret');
-		$route->createConnection('GET', 15);
-	}
-}
-
-class TestOfHttpRequest extends UnitTestCase {
-
-	function testReadingBadConnection() {
-		$socket = new MockSimpleSocket();
-		$route = new MockSimpleRoute();
-		$route->setReturnReference('createConnection', $socket);
-		$request = new SimpleHttpRequest($route, new SimpleGetEncoding());
-		$reponse = $request->fetch(15);
-		$this->assertTrue($reponse->isError());
-	}
-
-	function testReadingGoodConnection() {
-		$socket = new MockSimpleSocket();
-		$socket->expectOnce('write', array("\r\n"));
-
-		$route = new MockSimpleRoute();
-		$route->setReturnReference('createConnection', $socket);
-		$route->expect('createConnection', array('GET', 15));
-
-		$request = new SimpleHttpRequest($route, new SimpleGetEncoding());
-		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
-	}
-
-	function testWritingAdditionalHeaders() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("My: stuff\r\n"));
-		$socket->expectAt(1, 'write', array("\r\n"));
-		$socket->expectCallCount('write', 2);
-
-		$route = new MockSimpleRoute();
-		$route->setReturnReference('createConnection', $socket);
-
-		$request = new SimpleHttpRequest($route, new SimpleGetEncoding());
-		$request->addHeaderLine('My: stuff');
-		$request->fetch(15);
-	}
-
-	function testCookieWriting() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("Cookie: a=A\r\n"));
-		$socket->expectAt(1, 'write', array("\r\n"));
-		$socket->expectCallCount('write', 2);
-
-		$route = new MockSimpleRoute();
-		$route->setReturnReference('createConnection', $socket);
-
-		$jar = new SimpleCookieJar();
-		$jar->setCookie('a', 'A');
-
-		$request = new SimpleHttpRequest($route, new SimpleGetEncoding());
-		$request->readCookiesFromJar($jar, new SimpleUrl('/'));
-		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
-	}
-
-	function testMultipleCookieWriting() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("Cookie: a=A;b=B\r\n"));
-
-		$route = new MockSimpleRoute();
-		$route->setReturnReference('createConnection', $socket);
-
-		$jar = new SimpleCookieJar();
-		$jar->setCookie('a', 'A');
-		$jar->setCookie('b', 'B');
-
-		$request = new SimpleHttpRequest($route, new SimpleGetEncoding());
-		$request->readCookiesFromJar($jar, new SimpleUrl('/'));
-		$request->fetch(15);
-	}
-	
-    function testReadingDeleteConnection() {
-		$socket = new MockSimpleSocket();
-
-		$route = new MockSimpleRoute();
-		$route->setReturnReference('createConnection', $socket);
-		$route->expect('createConnection', array('DELETE', 15));
-
-		$request = new SimpleHttpRequest($route, new SimpleDeleteEncoding());
-		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');    	
-    }
-}
-
-class TestOfHttpPostRequest extends UnitTestCase {
-
-	function testReadingBadConnectionCausesErrorBecauseOfDeadSocket() {
-		$socket = new MockSimpleSocket();
-		$route = new MockSimpleRoute();
-		$route->setReturnReference('createConnection', $socket);
-		$request = new SimpleHttpRequest($route, new SimplePostEncoding());
-		$reponse = $request->fetch(15);
-		$this->assertTrue($reponse->isError());
-	}
-
-	function testReadingGoodConnection() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("Content-Length: 0\r\n"));
-		$socket->expectAt(1, 'write', array("Content-Type: application/x-www-form-urlencoded\r\n"));
-		$socket->expectAt(2, 'write', array("\r\n"));
-		$socket->expectAt(3, 'write', array(""));
-
-		$route = new MockSimpleRoute();
-		$route->setReturnReference('createConnection', $socket);
-		$route->expect('createConnection', array('POST', 15));
-
-		$request = new SimpleHttpRequest($route, new SimplePostEncoding());
-		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
-	}
-
-	function testContentHeadersCalculatedWithUrlEncodedParams() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("Content-Length: 3\r\n"));
-		$socket->expectAt(1, 'write', array("Content-Type: application/x-www-form-urlencoded\r\n"));
-		$socket->expectAt(2, 'write', array("\r\n"));
-		$socket->expectAt(3, 'write', array("a=A"));
-
-		$route = new MockSimpleRoute();
-		$route->setReturnReference('createConnection', $socket);
-		$route->expect('createConnection', array('POST', 15));
-
-		$request = new SimpleHttpRequest(
-		$route,
-		new SimplePostEncoding(array('a' => 'A')));
-		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
-	}
-
-	function testContentHeadersCalculatedWithRawEntityBody() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("Content-Length: 8\r\n"));
-		$socket->expectAt(1, 'write', array("Content-Type: text/plain\r\n"));
-		$socket->expectAt(2, 'write', array("\r\n"));
-		$socket->expectAt(3, 'write', array("raw body"));
-
-		$route = new MockSimpleRoute();
-		$route->setReturnReference('createConnection', $socket);
-		$route->expect('createConnection', array('POST', 15));
-
-		$request = new SimpleHttpRequest(
-		$route,
-		new SimplePostEncoding('raw body'));
-		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
-	}
-
-	function testContentHeadersCalculatedWithXmlEntityBody() {
-		$socket = new MockSimpleSocket();
-		$socket->expectAt(0, 'write', array("Content-Length: 27\r\n"));
-		$socket->expectAt(1, 'write', array("Content-Type: text/xml\r\n"));
-		$socket->expectAt(2, 'write', array("\r\n"));
-		$socket->expectAt(3, 'write', array("<a><b>one</b><c>two</c></a>"));
-
-		$route = new MockSimpleRoute();
-		$route->setReturnReference('createConnection', $socket);
-		$route->expect('createConnection', array('POST', 15));
-
-		$request = new SimpleHttpRequest(
-		$route,
-		new SimplePostEncoding('<a><b>one</b><c>two</c></a>', 'text/xml'));
-		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
-	}
-}
-
-class TestOfHttpHeaders extends UnitTestCase {
-
-	function testParseBasicHeaders() {
-		$headers = new SimpleHttpHeaders(
-                "HTTP/1.1 200 OK\r\n" .
-                "Date: Mon, 18 Nov 2002 15:50:29 GMT\r\n" .
-                "Content-Type: text/plain\r\n" .
-                "Server: Apache/1.3.24 (Win32) PHP/4.2.3\r\n" .
-                "Connection: close");
-		$this->assertIdentical($headers->getHttpVersion(), "1.1");
-		$this->assertIdentical($headers->getResponseCode(), 200);
-		$this->assertEqual($headers->getMimeType(), "text/plain");
-	}
-
-	function testNonStandardResponseHeader() {
-		$headers = new SimpleHttpHeaders(
-                "HTTP/1.1 302 (HTTP-Version SP Status-Code CRLF)\r\n" .
-                "Connection: close");
-		$this->assertIdentical($headers->getResponseCode(), 302);
-	}
-
-	function testCanParseMultipleCookies() {
-		$jar = new MockSimpleCookieJar();
-		$jar->expectAt(0, 'setCookie', array('a', 'aaa', 'host', '/here/', 'Wed, 25 Dec 2002 04:24:20 GMT'));
-		$jar->expectAt(1, 'setCookie', array('b', 'bbb', 'host', '/', false));
-
-		$headers = new SimpleHttpHeaders(
-                "HTTP/1.1 200 OK\r\n" .
-                "Date: Mon, 18 Nov 2002 15:50:29 GMT\r\n" .
-                "Content-Type: text/plain\r\n" .
-                "Server: Apache/1.3.24 (Win32) PHP/4.2.3\r\n" .
-                "Set-Cookie: a=aaa; expires=Wed, 25-Dec-02 04:24:20 GMT; path=/here/\r\n" .
-                "Set-Cookie: b=bbb\r\n" .
-                "Connection: close");
-		$headers->writeCookiesToJar($jar, new SimpleUrl('http://host'));
-	}
-
-	function testCanRecogniseRedirect() {
-		$headers = new SimpleHttpHeaders("HTTP/1.1 301 OK\r\n" .
-                "Content-Type: text/plain\r\n" .
-                "Content-Length: 0\r\n" .
-                "Location: http://www.somewhere-else.com/\r\n" .
-                "Connection: close");
-		$this->assertIdentical($headers->getResponseCode(), 301);
-		$this->assertEqual($headers->getLocation(), "http://www.somewhere-else.com/");
-		$this->assertTrue($headers->isRedirect());
-	}
-
-	function testCanParseChallenge() {
-		$headers = new SimpleHttpHeaders("HTTP/1.1 401 Authorization required\r\n" .
-                "Content-Type: text/plain\r\n" .
-                "Connection: close\r\n" .
-                "WWW-Authenticate: Basic realm=\"Somewhere\"");
-		$this->assertEqual($headers->getAuthentication(), 'Basic');
-		$this->assertEqual($headers->getRealm(), 'Somewhere');
-		$this->assertTrue($headers->isChallenge());
-	}
-}
-
-class TestOfHttpResponse extends UnitTestCase {
-
-	function testBadRequest() {
-		$socket = new MockSimpleSocket();
-		$socket->setReturnValue('getSent', '');
-
-		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
-		$this->assertTrue($response->isError());
-		$this->assertPattern('/Nothing fetched/', $response->getError());
-		$this->assertIdentical($response->getContent(), false);
-		$this->assertIdentical($response->getSent(), '');
-	}
-
-	function testBadSocketDuringResponse() {
-		$socket = new MockSimpleSocket();
-		$socket->setReturnValueAt(0, "read", "HTTP/1.1 200 OK\r\n");
-		$socket->setReturnValueAt(1, "read", "Date: Mon, 18 Nov 2002 15:50:29 GMT\r\n");
-		$socket->setReturnValue("read", "");
-		$socket->setReturnValue('getSent', 'HTTP/1.1 ...');
-
-		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
-		$this->assertTrue($response->isError());
-		$this->assertEqual($response->getContent(), '');
-		$this->assertEqual($response->getSent(), 'HTTP/1.1 ...');
-	}
-
-	function testIncompleteHeader() {
-		$socket = new MockSimpleSocket();
-		$socket->setReturnValueAt(0, "read", "HTTP/1.1 200 OK\r\n");
-		$socket->setReturnValueAt(1, "read", "Date: Mon, 18 Nov 2002 15:50:29 GMT\r\n");
-		$socket->setReturnValueAt(2, "read", "Content-Type: text/plain\r\n");
-		$socket->setReturnValue("read", "");
-
-		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
-		$this->assertTrue($response->isError());
-		$this->assertEqual($response->getContent(), "");
-	}
-
-	function testParseOfResponseHeadersWhenChunked() {
-		$socket = new MockSimpleSocket();
-		$socket->setReturnValueAt(0, "read", "HTTP/1.1 200 OK\r\nDate: Mon, 18 Nov 2002 15:50:29 GMT\r\n");
-		$socket->setReturnValueAt(1, "read", "Content-Type: text/plain\r\n");
-		$socket->setReturnValueAt(2, "read", "Server: Apache/1.3.24 (Win32) PHP/4.2.3\r\nConne");
-		$socket->setReturnValueAt(3, "read", "ction: close\r\n\r\nthis is a test file\n");
-		$socket->setReturnValueAt(4, "read", "with two lines in it\n");
-		$socket->setReturnValue("read", "");
-
-		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
-		$this->assertFalse($response->isError());
-		$this->assertEqual(
-		$response->getContent(),
-                "this is a test file\nwith two lines in it\n");
-		$headers = $response->getHeaders();
-		$this->assertIdentical($headers->getHttpVersion(), "1.1");
-		$this->assertIdentical($headers->getResponseCode(), 200);
-		$this->assertEqual($headers->getMimeType(), "text/plain");
-		$this->assertFalse($headers->isRedirect());
-		$this->assertFalse($headers->getLocation());
-	}
-
-	function testRedirect() {
-		$socket = new MockSimpleSocket();
-		$socket->setReturnValueAt(0, "read", "HTTP/1.1 301 OK\r\n");
-		$socket->setReturnValueAt(1, "read", "Content-Type: text/plain\r\n");
-		$socket->setReturnValueAt(2, "read", "Location: http://www.somewhere-else.com/\r\n");
-		$socket->setReturnValueAt(3, "read", "Connection: close\r\n");
-		$socket->setReturnValueAt(4, "read", "\r\n");
-		$socket->setReturnValue("read", "");
-
-		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
-		$headers = $response->getHeaders();
-		$this->assertTrue($headers->isRedirect());
-		$this->assertEqual($headers->getLocation(), "http://www.somewhere-else.com/");
-	}
-
-	function testRedirectWithPort() {
-		$socket = new MockSimpleSocket();
-		$socket->setReturnValueAt(0, "read", "HTTP/1.1 301 OK\r\n");
-		$socket->setReturnValueAt(1, "read", "Content-Type: text/plain\r\n");
-		$socket->setReturnValueAt(2, "read", "Location: http://www.somewhere-else.com:80/\r\n");
-		$socket->setReturnValueAt(3, "read", "Connection: close\r\n");
-		$socket->setReturnValueAt(4, "read", "\r\n");
-		$socket->setReturnValue("read", "");
-
-		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
-		$headers = $response->getHeaders();
-		$this->assertTrue($headers->isRedirect());
-		$this->assertEqual($headers->getLocation(), "http://www.somewhere-else.com:80/");
-	}
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/interfaces_test.php b/3rdparty/simpletest/test/interfaces_test.php
deleted file mode 100755
index ab30fe47ff8..00000000000
--- a/3rdparty/simpletest/test/interfaces_test.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-// $Id: interfaces_test.php 1981 2010-03-23 23:29:56Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-if (function_exists('spl_classes')) {
-    include(dirname(__FILE__) . '/support/spl_examples.php');
-}
-if (version_compare(PHP_VERSION, '5.1', '>=')) {
-    include(dirname(__FILE__) . '/interfaces_test_php5_1.php');
-}
-
-interface DummyInterface {
-    function aMethod();
-    function anotherMethod($a);
-    function &referenceMethod(&$a);
-}
-
-Mock::generate('DummyInterface');
-Mock::generatePartial('DummyInterface', 'PartialDummyInterface', array());
-
-class TestOfMockInterfaces extends UnitTestCase {
-
-    function testCanMockAnInterface() {
-        $mock = new MockDummyInterface();
-        $this->assertIsA($mock, 'SimpleMock');
-        $this->assertIsA($mock, 'MockDummyInterface');
-        $this->assertTrue(method_exists($mock, 'aMethod'));
-        $this->assertTrue(method_exists($mock, 'anotherMethod'));
-        $this->assertNull($mock->aMethod());
-    }
-
-    function testMockedInterfaceExpectsParameters() {
-        $mock = new MockDummyInterface();
-        $this->expectError();
-        $mock->anotherMethod();
-    }
-
-    function testCannotPartiallyMockAnInterface() {
-        $this->assertFalse(class_exists('PartialDummyInterface'));
-    }
-}
-
-class TestOfSpl extends UnitTestCase {
-    
-    function skip() {
-        $this->skipUnless(function_exists('spl_classes'), 'No SPL module loaded');
-    }
-
-    function testCanMockAllSplClasses() {
-        if (! function_exists('spl_classes')) {
-            return;
-        }
-        foreach(spl_classes() as $class) {
-            if ($class == 'SplHeap' or $class = 'SplFileObject') {
-                continue;
-            }
-            if (version_compare(PHP_VERSION, '5.1', '<') &&
-                $class == 'CachingIterator' ||
-                $class == 'CachingRecursiveIterator' ||
-                $class == 'FilterIterator' ||
-                $class == 'LimitIterator' ||
-                $class == 'ParentIterator') {
-                // These iterators require an iterator be passed to them during
-                // construction in PHP 5.0; there is no way for SimpleTest
-                // to supply such an iterator, however, so support for it is
-                // disabled.
-                continue;
-            }
-            $mock_class = "Mock$class";
-            Mock::generate($class);
-            $this->assertIsA(new $mock_class(), $mock_class);
-        }
-    }
-
-    function testExtensionOfCommonSplClasses() {
-        Mock::generate('IteratorImplementation');
-        $this->assertIsA(
-                new IteratorImplementation(),
-                'IteratorImplementation');
-        Mock::generate('IteratorAggregateImplementation');
-        $this->assertIsA(
-                new IteratorAggregateImplementation(),
-                'IteratorAggregateImplementation');
-   }
-}
-
-class WithHint {
-    function hinted(DummyInterface $object) { }
-}
-
-class ImplementsDummy implements DummyInterface {
-    function aMethod() { }
-    function anotherMethod($a) { }
-    function &referenceMethod(&$a) { }
-    function extraMethod($a = false) { }
-}
-Mock::generate('ImplementsDummy');
-
-class TestOfImplementations extends UnitTestCase {
-
-    function testMockedInterfaceCanPassThroughTypeHint() {
-        $mock = new MockDummyInterface();
-        $hinter = new WithHint();
-        $hinter->hinted($mock);
-    }
-
-    function testImplementedInterfacesAreCarried() {
-        $mock = new MockImplementsDummy();
-        $hinter = new WithHint();
-        $hinter->hinted($mock);
-    }
-    
-    function testNoSpuriousWarningsWhenSkippingDefaultedParameter() {
-        $mock = new MockImplementsDummy();
-        $mock->extraMethod();
-    }
-}
-
-interface SampleInterfaceWithConstruct {
-    function __construct($something);
-}
-
-class TestOfInterfaceMocksWithConstruct extends UnitTestCase {
-    function TODO_testBasicConstructOfAnInterface() {   // Fails in PHP 5.3dev
-        Mock::generate('SampleInterfaceWithConstruct');
-    }
-}
-
-interface SampleInterfaceWithClone {
-    function __clone();
-}
-
-class TestOfSampleInterfaceWithClone extends UnitTestCase {
-    function testCanMockWithoutErrors() {
-        Mock::generate('SampleInterfaceWithClone');
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/interfaces_test_php5_1.php b/3rdparty/simpletest/test/interfaces_test_php5_1.php
deleted file mode 100755
index 3d154f99539..00000000000
--- a/3rdparty/simpletest/test/interfaces_test_php5_1.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-interface SampleInterfaceWithHintInSignature {
-    function method(array $hinted);
-}
-
-class TestOfInterfaceMocksWithHintInSignature extends UnitTestCase {
-    function testBasicConstructOfAnInterfaceWithHintInSignature() {
-        Mock::generate('SampleInterfaceWithHintInSignature');
-        $mock = new MockSampleInterfaceWithHintInSignature();
-        $this->assertIsA($mock, 'SampleInterfaceWithHintInSignature');
-    }
-}
-
diff --git a/3rdparty/simpletest/test/live_test.php b/3rdparty/simpletest/test/live_test.php
deleted file mode 100755
index 3fbb54499d3..00000000000
--- a/3rdparty/simpletest/test/live_test.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-// $Id: live_test.php 1748 2008-04-14 01:50:41Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../socket.php');
-require_once(dirname(__FILE__) . '/../http.php');
-require_once(dirname(__FILE__) . '/../compatibility.php');
-
-if (SimpleTest::getDefaultProxy()) {
-    SimpleTest::ignore('LiveHttpTestCase');
-}
-
-class LiveHttpTestCase extends UnitTestCase {
-
-    function testBadSocket() {
-        $socket = new SimpleSocket('bad_url', 111, 5);
-        $this->assertTrue($socket->isError());
-        $this->assertPattern(
-                '/Cannot open \\[bad_url:111\\] with \\[/',
-                $socket->getError());
-        $this->assertFalse($socket->isOpen());
-        $this->assertFalse($socket->write('A message'));
-    }
-    
-    function testSocketClosure() {
-        $socket = new SimpleSocket('www.lastcraft.com', 80, 15, 8);
-        $this->assertTrue($socket->isOpen());
-        $this->assertTrue($socket->write("GET /test/network_confirm.php HTTP/1.0\r\n"));
-        $socket->write("Host: www.lastcraft.com\r\n");
-        $socket->write("Connection: close\r\n\r\n");
-        $this->assertEqual($socket->read(), "HTTP/1.1");
-        $socket->close();
-        $this->assertIdentical($socket->read(), false);
-    }
-    
-    function testRecordOfSentCharacters() {
-        $socket = new SimpleSocket('www.lastcraft.com', 80, 15);
-        $this->assertTrue($socket->write("GET /test/network_confirm.php HTTP/1.0\r\n"));
-        $socket->write("Host: www.lastcraft.com\r\n");
-        $socket->write("Connection: close\r\n\r\n");
-        $socket->close();
-        $this->assertEqual($socket->getSent(),
-                "GET /test/network_confirm.php HTTP/1.0\r\n" .
-                "Host: www.lastcraft.com\r\n" .
-                "Connection: close\r\n\r\n");
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/mock_objects_test.php b/3rdparty/simpletest/test/mock_objects_test.php
deleted file mode 100755
index 7f3178995a7..00000000000
--- a/3rdparty/simpletest/test/mock_objects_test.php
+++ /dev/null
@@ -1,985 +0,0 @@
-<?php
-// $Id: mock_objects_test.php 1900 2009-07-29 11:44:37Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../expectation.php');
-require_once(dirname(__FILE__) . '/../mock_objects.php');
-
-class TestOfAnythingExpectation extends UnitTestCase {
-    function testSimpleInteger() {
-        $expectation = new AnythingExpectation();
-        $this->assertTrue($expectation->test(33));
-        $this->assertTrue($expectation->test(false));
-        $this->assertTrue($expectation->test(null));
-    }
-}
-
-class TestOfParametersExpectation extends UnitTestCase {
-
-    function testEmptyMatch() {
-        $expectation = new ParametersExpectation(array());
-        $this->assertTrue($expectation->test(array()));
-        $this->assertFalse($expectation->test(array(33)));
-    }
-
-    function testSingleMatch() {
-        $expectation = new ParametersExpectation(array(0));
-        $this->assertFalse($expectation->test(array(1)));
-        $this->assertTrue($expectation->test(array(0)));
-    }
-
-    function testAnyMatch() {
-        $expectation = new ParametersExpectation(false);
-        $this->assertTrue($expectation->test(array()));
-        $this->assertTrue($expectation->test(array(1, 2)));
-    }
-
-    function testMissingParameter() {
-        $expectation = new ParametersExpectation(array(0));
-        $this->assertFalse($expectation->test(array()));
-    }
-
-    function testNullParameter() {
-        $expectation = new ParametersExpectation(array(null));
-        $this->assertTrue($expectation->test(array(null)));
-        $this->assertFalse($expectation->test(array()));
-    }
-
-    function testAnythingExpectations() {
-        $expectation = new ParametersExpectation(array(new AnythingExpectation()));
-        $this->assertFalse($expectation->test(array()));
-        $this->assertIdentical($expectation->test(array(null)), true);
-        $this->assertIdentical($expectation->test(array(13)), true);
-    }
-
-    function testOtherExpectations() {
-        $expectation = new ParametersExpectation(
-                array(new PatternExpectation('/hello/i')));
-        $this->assertFalse($expectation->test(array('Goodbye')));
-        $this->assertTrue($expectation->test(array('hello')));
-        $this->assertTrue($expectation->test(array('Hello')));
-    }
-
-    function testIdentityOnly() {
-        $expectation = new ParametersExpectation(array("0"));
-        $this->assertFalse($expectation->test(array(0)));
-        $this->assertTrue($expectation->test(array("0")));
-    }
-
-    function testLongList() {
-        $expectation = new ParametersExpectation(
-                array("0", 0, new AnythingExpectation(), false));
-        $this->assertTrue($expectation->test(array("0", 0, 37, false)));
-        $this->assertFalse($expectation->test(array("0", 0, 37, true)));
-        $this->assertFalse($expectation->test(array("0", 0, 37)));
-    }
-}
-
-class TestOfSimpleSignatureMap extends UnitTestCase {
-
-    function testEmpty() {
-        $map = new SimpleSignatureMap();
-        $this->assertFalse($map->isMatch("any", array()));
-        $this->assertNull($map->findFirstAction("any", array()));
-    }
-
-    function testDifferentCallSignaturesCanHaveDifferentReferences() {
-        $map = new SimpleSignatureMap();
-        $fred = 'Fred';
-        $jim = 'jim';
-        $map->add(array(0), $fred);
-        $map->add(array('0'), $jim);
-        $this->assertSame($fred, $map->findFirstAction(array(0)));
-        $this->assertSame($jim, $map->findFirstAction(array('0')));
-    }
-
-    function testWildcard() {
-        $fred = 'Fred';
-        $map = new SimpleSignatureMap();
-        $map->add(array(new AnythingExpectation(), 1, 3), $fred);
-        $this->assertTrue($map->isMatch(array(2, 1, 3)));
-        $this->assertSame($map->findFirstAction(array(2, 1, 3)), $fred);
-    }
-
-    function testAllWildcard() {
-        $fred = 'Fred';
-        $map = new SimpleSignatureMap();
-        $this->assertFalse($map->isMatch(array(2, 1, 3)));
-        $map->add('', $fred);
-        $this->assertTrue($map->isMatch(array(2, 1, 3)));
-        $this->assertSame($map->findFirstAction(array(2, 1, 3)), $fred);
-    }
-
-    function testOrdering() {
-        $map = new SimpleSignatureMap();
-        $map->add(array(1, 2), new SimpleByValue("1, 2"));
-        $map->add(array(1, 3), new SimpleByValue("1, 3"));
-        $map->add(array(1), new SimpleByValue("1"));
-        $map->add(array(1, 4), new SimpleByValue("1, 4"));
-        $map->add(array(new AnythingExpectation()), new SimpleByValue("Any"));
-        $map->add(array(2), new SimpleByValue("2"));
-        $map->add("", new SimpleByValue("Default"));
-        $map->add(array(), new SimpleByValue("None"));
-        $this->assertEqual($map->findFirstAction(array(1, 2)), new SimpleByValue("1, 2"));
-        $this->assertEqual($map->findFirstAction(array(1, 3)), new SimpleByValue("1, 3"));
-        $this->assertEqual($map->findFirstAction(array(1, 4)), new SimpleByValue("1, 4"));
-        $this->assertEqual($map->findFirstAction(array(1)), new SimpleByValue("1"));
-        $this->assertEqual($map->findFirstAction(array(2)), new SimpleByValue("Any"));
-        $this->assertEqual($map->findFirstAction(array(3)), new SimpleByValue("Any"));
-        $this->assertEqual($map->findFirstAction(array()), new SimpleByValue("Default"));
-    }
-}
-
-class TestOfCallSchedule extends UnitTestCase {
-    function testCanBeSetToAlwaysReturnTheSameReference() {
-        $a = 5;
-        $schedule = new SimpleCallSchedule();
-        $schedule->register('aMethod', false, new SimpleByReference($a));
-        $this->assertReference($schedule->respond(0, 'aMethod', array()), $a);
-        $this->assertReference($schedule->respond(1, 'aMethod', array()), $a);
-    }
-
-    function testSpecificSignaturesOverrideTheAlwaysCase() {
-        $any = 'any';
-        $one = 'two';
-        $schedule = new SimpleCallSchedule();
-        $schedule->register('aMethod', array(1), new SimpleByReference($one));
-        $schedule->register('aMethod', false, new SimpleByReference($any));
-        $this->assertReference($schedule->respond(0, 'aMethod', array(2)), $any);
-        $this->assertReference($schedule->respond(0, 'aMethod', array(1)), $one);
-    }
-
-    function testReturnsCanBeSetOverTime() {
-        $one = 'one';
-        $two = 'two';
-        $schedule = new SimpleCallSchedule();
-        $schedule->registerAt(0, 'aMethod', false, new SimpleByReference($one));
-        $schedule->registerAt(1, 'aMethod', false, new SimpleByReference($two));
-        $this->assertReference($schedule->respond(0, 'aMethod', array()), $one);
-        $this->assertReference($schedule->respond(1, 'aMethod', array()), $two);
-    }
-
-    function testReturnsOverTimecanBeAlteredByTheArguments() {
-        $one = '1';
-        $two = '2';
-        $two_a = '2a';
-        $schedule = new SimpleCallSchedule();
-        $schedule->registerAt(0, 'aMethod', false, new SimpleByReference($one));
-        $schedule->registerAt(1, 'aMethod', array('a'), new SimpleByReference($two_a));
-        $schedule->registerAt(1, 'aMethod', false, new SimpleByReference($two));
-        $this->assertReference($schedule->respond(0, 'aMethod', array()), $one);
-        $this->assertReference($schedule->respond(1, 'aMethod', array()), $two);
-        $this->assertReference($schedule->respond(1, 'aMethod', array('a')), $two_a);
-    }
-
-    function testCanReturnByValue() {
-        $a = 5;
-        $schedule = new SimpleCallSchedule();
-        $schedule->register('aMethod', false, new SimpleByValue($a));
-        $this->assertCopy($schedule->respond(0, 'aMethod', array()), $a);
-    }
-
-    function testCanThrowException() {
-        if (version_compare(phpversion(), '5', '>=')) {
-            $schedule = new SimpleCallSchedule();
-            $schedule->register('aMethod', false, new SimpleThrower(new Exception('Ouch')));
-            $this->expectException(new Exception('Ouch'));
-            $schedule->respond(0, 'aMethod', array());
-        }
-    }
-
-    function testCanEmitError() {
-        $schedule = new SimpleCallSchedule();
-        $schedule->register('aMethod', false, new SimpleErrorThrower('Ouch', E_USER_WARNING));
-        $this->expectError('Ouch');
-        $schedule->respond(0, 'aMethod', array());
-    }
-}
-
-class Dummy {
-    function Dummy() {
-    }
-
-    function aMethod() {
-        return true;
-    }
-
-    function &aReferenceMethod() {
-        return true;
-    }
-
-    function anotherMethod() {
-        return true;
-    }
-}
-Mock::generate('Dummy');
-Mock::generate('Dummy', 'AnotherMockDummy');
-Mock::generate('Dummy', 'MockDummyWithExtraMethods', array('extraMethod'));
-
-class TestOfMockGeneration extends UnitTestCase {
-
-    function testCloning() {
-        $mock = new MockDummy();
-        $this->assertTrue(method_exists($mock, "aMethod"));
-        $this->assertNull($mock->aMethod());
-    }
-
-    function testCloningWithExtraMethod() {
-        $mock = new MockDummyWithExtraMethods();
-        $this->assertTrue(method_exists($mock, "extraMethod"));
-    }
-
-    function testCloningWithChosenClassName() {
-        $mock = new AnotherMockDummy();
-        $this->assertTrue(method_exists($mock, "aMethod"));
-    }
-}
-
-class TestOfMockReturns extends UnitTestCase {
-
-    function testDefaultReturn() {
-        $mock = new MockDummy();
-        $mock->returnsByValue("aMethod", "aaa");
-        $this->assertIdentical($mock->aMethod(), "aaa");
-        $this->assertIdentical($mock->aMethod(), "aaa");
-    }
-
-    function testParameteredReturn() {
-        $mock = new MockDummy();
-        $mock->returnsByValue('aMethod', 'aaa', array(1, 2, 3));
-        $this->assertNull($mock->aMethod());
-        $this->assertIdentical($mock->aMethod(1, 2, 3), 'aaa');
-    }
-
-    function testSetReturnGivesObjectReference() {
-        $mock = new MockDummy();
-        $object = new Dummy();
-        $mock->returns('aMethod', $object, array(1, 2, 3));
-        $this->assertSame($mock->aMethod(1, 2, 3), $object);
-    }
-
-    function testSetReturnReferenceGivesOriginalReference() {
-        $mock = new MockDummy();
-        $object = 1;
-        $mock->returnsByReference('aReferenceMethod', $object, array(1, 2, 3));
-        $this->assertReference($mock->aReferenceMethod(1, 2, 3), $object);
-    }
-
-    function testReturnValueCanBeChosenJustByPatternMatchingArguments() {
-        $mock = new MockDummy();
-        $mock->returnsByValue(
-                "aMethod",
-                "aaa",
-                array(new PatternExpectation('/hello/i')));
-        $this->assertIdentical($mock->aMethod('Hello'), 'aaa');
-        $this->assertNull($mock->aMethod('Goodbye'));
-    }
-
-    function testMultipleMethods() {
-        $mock = new MockDummy();
-        $mock->returnsByValue("aMethod", 100, array(1));
-        $mock->returnsByValue("aMethod", 200, array(2));
-        $mock->returnsByValue("anotherMethod", 10, array(1));
-        $mock->returnsByValue("anotherMethod", 20, array(2));
-        $this->assertIdentical($mock->aMethod(1), 100);
-        $this->assertIdentical($mock->anotherMethod(1), 10);
-        $this->assertIdentical($mock->aMethod(2), 200);
-        $this->assertIdentical($mock->anotherMethod(2), 20);
-    }
-
-    function testReturnSequence() {
-        $mock = new MockDummy();
-        $mock->returnsByValueAt(0, "aMethod", "aaa");
-        $mock->returnsByValueAt(1, "aMethod", "bbb");
-        $mock->returnsByValueAt(3, "aMethod", "ddd");
-        $this->assertIdentical($mock->aMethod(), "aaa");
-        $this->assertIdentical($mock->aMethod(), "bbb");
-        $this->assertNull($mock->aMethod());
-        $this->assertIdentical($mock->aMethod(), "ddd");
-    }
-
-    function testSetReturnReferenceAtGivesOriginal() {
-        $mock = new MockDummy();
-        $object = 100;
-        $mock->returnsByReferenceAt(1, "aReferenceMethod", $object);
-        $this->assertNull($mock->aReferenceMethod());
-        $this->assertReference($mock->aReferenceMethod(), $object);
-        $this->assertNull($mock->aReferenceMethod());
-    }
-
-    function testReturnsAtGivesOriginalObjectHandle() {
-        $mock = new MockDummy();
-        $object = new Dummy();
-        $mock->returnsAt(1, "aMethod", $object);
-        $this->assertNull($mock->aMethod());
-        $this->assertSame($mock->aMethod(), $object);
-        $this->assertNull($mock->aMethod());
-    }
-
-    function testComplicatedReturnSequence() {
-        $mock = new MockDummy();
-        $object = new Dummy();
-        $mock->returnsAt(1, "aMethod", "aaa", array("a"));
-        $mock->returnsAt(1, "aMethod", "bbb");
-        $mock->returnsAt(2, "aMethod", $object, array('*', 2));
-        $mock->returnsAt(2, "aMethod", "value", array('*', 3));
-        $mock->returns("aMethod", 3, array(3));
-        $this->assertNull($mock->aMethod());
-        $this->assertEqual($mock->aMethod("a"), "aaa");
-        $this->assertSame($mock->aMethod(1, 2), $object);
-        $this->assertEqual($mock->aMethod(3), 3);
-        $this->assertNull($mock->aMethod());
-    }
-
-    function testMultipleMethodSequences() {
-        $mock = new MockDummy();
-        $mock->returnsByValueAt(0, "aMethod", "aaa");
-        $mock->returnsByValueAt(1, "aMethod", "bbb");
-        $mock->returnsByValueAt(0, "anotherMethod", "ccc");
-        $mock->returnsByValueAt(1, "anotherMethod", "ddd");
-        $this->assertIdentical($mock->aMethod(), "aaa");
-        $this->assertIdentical($mock->anotherMethod(), "ccc");
-        $this->assertIdentical($mock->aMethod(), "bbb");
-        $this->assertIdentical($mock->anotherMethod(), "ddd");
-    }
-
-    function testSequenceFallback() {
-        $mock = new MockDummy();
-        $mock->returnsByValueAt(0, "aMethod", "aaa", array('a'));
-        $mock->returnsByValueAt(1, "aMethod", "bbb", array('a'));
-        $mock->returnsByValue("aMethod", "AAA");
-        $this->assertIdentical($mock->aMethod('a'), "aaa");
-        $this->assertIdentical($mock->aMethod('b'), "AAA");
-    }
-
-    function testMethodInterference() {
-        $mock = new MockDummy();
-        $mock->returnsByValueAt(0, "anotherMethod", "aaa");
-        $mock->returnsByValue("aMethod", "AAA");
-        $this->assertIdentical($mock->aMethod(), "AAA");
-        $this->assertIdentical($mock->anotherMethod(), "aaa");
-    }
-}
-
-class TestOfMockExpectationsThatPass extends UnitTestCase {
-
-    function testAnyArgument() {
-        $mock = new MockDummy();
-        $mock->expect('aMethod', array('*'));
-        $mock->aMethod(1);
-        $mock->aMethod('hello');
-    }
-
-    function testAnyTwoArguments() {
-        $mock = new MockDummy();
-        $mock->expect('aMethod', array('*', '*'));
-        $mock->aMethod(1, 2);
-    }
-
-    function testSpecificArgument() {
-        $mock = new MockDummy();
-        $mock->expect('aMethod', array(1));
-        $mock->aMethod(1);
-    }
-
-    function testExpectation() {
-        $mock = new MockDummy();
-        $mock->expect('aMethod', array(new IsAExpectation('Dummy')));
-        $mock->aMethod(new Dummy());
-    }
-
-    function testArgumentsInSequence() {
-        $mock = new MockDummy();
-        $mock->expectAt(0, 'aMethod', array(1, 2));
-        $mock->expectAt(1, 'aMethod', array(3, 4));
-        $mock->aMethod(1, 2);
-        $mock->aMethod(3, 4);
-    }
-
-    function testAtLeastOnceSatisfiedByOneCall() {
-        $mock = new MockDummy();
-        $mock->expectAtLeastOnce('aMethod');
-        $mock->aMethod();
-    }
-
-    function testAtLeastOnceSatisfiedByTwoCalls() {
-        $mock = new MockDummy();
-        $mock->expectAtLeastOnce('aMethod');
-        $mock->aMethod();
-        $mock->aMethod();
-    }
-
-    function testOnceSatisfiedByOneCall() {
-        $mock = new MockDummy();
-        $mock->expectOnce('aMethod');
-        $mock->aMethod();
-    }
-
-    function testMinimumCallsSatisfiedByEnoughCalls() {
-        $mock = new MockDummy();
-        $mock->expectMinimumCallCount('aMethod', 1);
-        $mock->aMethod();
-    }
-
-    function testMinimumCallsSatisfiedByTooManyCalls() {
-        $mock = new MockDummy();
-        $mock->expectMinimumCallCount('aMethod', 3);
-        $mock->aMethod();
-        $mock->aMethod();
-        $mock->aMethod();
-        $mock->aMethod();
-    }
-
-    function testMaximumCallsSatisfiedByEnoughCalls() {
-        $mock = new MockDummy();
-        $mock->expectMaximumCallCount('aMethod', 1);
-        $mock->aMethod();
-    }
-
-    function testMaximumCallsSatisfiedByNoCalls() {
-        $mock = new MockDummy();
-        $mock->expectMaximumCallCount('aMethod', 1);
-    }
-}
-
-class MockWithInjectedTestCase extends SimpleMock {
-    protected function getCurrentTestCase() {
-        return SimpleTest::getContext()->getTest()->getMockedTest();
-    }
-}
-SimpleTest::setMockBaseClass('MockWithInjectedTestCase');
-Mock::generate('Dummy', 'MockDummyWithInjectedTestCase');
-SimpleTest::setMockBaseClass('SimpleMock');
-Mock::generate('SimpleTestCase');
-
-class LikeExpectation extends IdenticalExpectation {
-    function __construct($expectation) {
-        $expectation->message = '';
-        parent::__construct($expectation);
-    }
-
-    function test($compare) {
-        $compare->message = '';
-        return parent::test($compare);
-    }
-
-    function testMessage($compare) {
-        $compare->message = '';
-        return parent::testMessage($compare);
-    }
-}
-
-class TestOfMockExpectations extends UnitTestCase {
-    private $test;
-
-    function setUp() {
-        $this->test = new MockSimpleTestCase();
-    }
-
-    function getMockedTest() {
-        return $this->test;
-    }
-
-    function testSettingExpectationOnNonMethodThrowsError() {
-        $mock = new MockDummyWithInjectedTestCase();
-        $this->expectError();
-        $mock->expectMaximumCallCount('aMissingMethod', 2);
-    }
-
-    function testMaxCallsDetectsOverrun() {
-        $this->test->expectOnce('assert', array(new MemberExpectation('count', 2), 3));
-        $mock = new MockDummyWithInjectedTestCase();
-        $mock->expectMaximumCallCount('aMethod', 2);
-        $mock->aMethod();
-        $mock->aMethod();
-        $mock->aMethod();
-        $mock->mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testTallyOnMaxCallsSendsPassOnUnderrun() {
-        $this->test->expectOnce('assert', array(new MemberExpectation('count', 2), 2));
-        $mock = new MockDummyWithInjectedTestCase();
-        $mock->expectMaximumCallCount("aMethod", 2);
-        $mock->aMethod();
-        $mock->aMethod();
-        $mock->mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testExpectNeverDetectsOverrun() {
-        $this->test->expectOnce('assert', array(new MemberExpectation('count', 0), 1));
-        $mock = new MockDummyWithInjectedTestCase();
-        $mock->expectNever('aMethod');
-        $mock->aMethod();
-        $mock->mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testTallyOnExpectNeverStillSendsPassOnUnderrun() {
-        $this->test->expectOnce('assert', array(new MemberExpectation('count', 0), 0));
-        $mock = new MockDummyWithInjectedTestCase();
-        $mock->expectNever('aMethod');
-        $mock->mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testMinCalls() {
-        $this->test->expectOnce('assert', array(new MemberExpectation('count', 2), 2));
-        $mock = new MockDummyWithInjectedTestCase();
-        $mock->expectMinimumCallCount('aMethod', 2);
-        $mock->aMethod();
-        $mock->aMethod();
-        $mock->mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testFailedNever() {
-        $this->test->expectOnce('assert', array(new MemberExpectation('count', 0), 1));
-        $mock = new MockDummyWithInjectedTestCase();
-        $mock->expectNever('aMethod');
-        $mock->aMethod();
-        $mock->mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testUnderOnce() {
-        $this->test->expectOnce('assert', array(new MemberExpectation('count', 1), 0));
-        $mock = new MockDummyWithInjectedTestCase();
-        $mock->expectOnce('aMethod');
-        $mock->mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testOverOnce() {
-        $this->test->expectOnce('assert', array(new MemberExpectation('count', 1), 2));
-        $mock = new MockDummyWithInjectedTestCase();
-        $mock->expectOnce('aMethod');
-        $mock->aMethod();
-        $mock->aMethod();
-        $mock->mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testUnderAtLeastOnce() {
-        $this->test->expectOnce('assert', array(new MemberExpectation('count', 1), 0));
-        $mock = new MockDummyWithInjectedTestCase();
-        $mock->expectAtLeastOnce("aMethod");
-        $mock->mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testZeroArguments() {
-        $this->test->expectOnce('assert',
-                                array(new MemberExpectation('expected', array()), array(), '*'));
-        $mock = new MockDummyWithInjectedTestCase();
-        $mock->expect('aMethod', array());
-        $mock->aMethod();
-        $mock->mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testExpectedArguments() {
-        $this->test->expectOnce('assert',
-                                array(new MemberExpectation('expected', array(1, 2, 3)), array(1, 2, 3), '*'));
-        $mock = new MockDummyWithInjectedTestCase();
-        $mock->expect('aMethod', array(1, 2, 3));
-        $mock->aMethod(1, 2, 3);
-        $mock->mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testFailedArguments() {
-        $this->test->expectOnce('assert',
-                                array(new MemberExpectation('expected', array('this')), array('that'), '*'));
-        $mock = new MockDummyWithInjectedTestCase();
-        $mock->expect('aMethod', array('this'));
-        $mock->aMethod('that');
-        $mock->mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testWildcardsAreTranslatedToAnythingExpectations() {
-        $this->test->expectOnce('assert',
-                                array(new MemberExpectation('expected',
-                                                            array(new AnythingExpectation(),
-                                                                  123,
-                                                                  new AnythingExpectation())),
-                                      array(100, 123, 101), '*'));
-        $mock = new MockDummyWithInjectedTestCase($this);
-        $mock->expect("aMethod", array('*', 123, '*'));
-        $mock->aMethod(100, 123, 101);
-        $mock->mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testSpecificPassingSequence() {
-        $this->test->expectAt(0, 'assert',
-                              array(new MemberExpectation('expected', array(1, 2, 3)), array(1, 2, 3), '*'));
-        $this->test->expectAt(1, 'assert',
-                              array(new MemberExpectation('expected', array('Hello')), array('Hello'), '*'));
-        $mock = new MockDummyWithInjectedTestCase();
-        $mock->expectAt(1, 'aMethod', array(1, 2, 3));
-        $mock->expectAt(2, 'aMethod', array('Hello'));
-        $mock->aMethod();
-        $mock->aMethod(1, 2, 3);
-        $mock->aMethod('Hello');
-        $mock->aMethod();
-        $mock->mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testNonArrayForExpectedParametersGivesError() {
-        $mock = new MockDummyWithInjectedTestCase();
-        $this->expectError(new PatternExpectation('/\$args.*not an array/i'));
-        $mock->expect("aMethod", "foo");
-        $mock->aMethod();
-        $mock->mock->atTestEnd('testSomething', $this->test);
-   }
-}
-
-class TestOfMockComparisons extends UnitTestCase {
-
-    function testEqualComparisonOfMocksDoesNotCrash() {
-        $expectation = new EqualExpectation(new MockDummy());
-        $this->assertTrue($expectation->test(new MockDummy(), true));
-    }
-
-    function testIdenticalComparisonOfMocksDoesNotCrash() {
-        $expectation = new IdenticalExpectation(new MockDummy());
-        $this->assertTrue($expectation->test(new MockDummy()));
-    }
-}
-
-class ClassWithSpecialMethods {
-    function __get($name) { }
-    function __set($name, $value) { }
-    function __isset($name) { }
-    function __unset($name) { }
-    function __call($method, $arguments) { }
-    function __toString() { }
-}
-Mock::generate('ClassWithSpecialMethods');
-
-class TestOfSpecialMethodsAfterPHP51 extends UnitTestCase {
-
-    function skip() {
-        $this->skipIf(version_compare(phpversion(), '5.1', '<'), '__isset and __unset overloading not tested unless PHP 5.1+');
-    }
-
-    function testCanEmulateIsset() {
-        $mock = new MockClassWithSpecialMethods();
-        $mock->returnsByValue('__isset', true);
-        $this->assertIdentical(isset($mock->a), true);
-    }
-
-    function testCanExpectUnset() {
-        $mock = new MockClassWithSpecialMethods();
-        $mock->expectOnce('__unset', array('a'));
-        unset($mock->a);
-    }
-
-}
-
-class TestOfSpecialMethods extends UnitTestCase {
-    function skip() {
-        $this->skipIf(version_compare(phpversion(), '5', '<'), 'Overloading not tested unless PHP 5+');
-    }
-
-    function testCanMockTheThingAtAll() {
-        $mock = new MockClassWithSpecialMethods();
-    }
-
-    function testReturnFromSpecialAccessor() {
-        $mock = new MockClassWithSpecialMethods();
-        $mock->returnsByValue('__get', '1st Return', array('first'));
-        $mock->returnsByValue('__get', '2nd Return', array('second'));
-        $this->assertEqual($mock->first, '1st Return');
-        $this->assertEqual($mock->second, '2nd Return');
-    }
-
-    function testcanExpectTheSettingOfValue() {
-        $mock = new MockClassWithSpecialMethods();
-        $mock->expectOnce('__set', array('a', 'A'));
-        $mock->a = 'A';
-    }
-
-    function testCanSimulateAnOverloadmethod() {
-        $mock = new MockClassWithSpecialMethods();
-        $mock->expectOnce('__call', array('amOverloaded', array('A')));
-        $mock->returnsByValue('__call', 'aaa');
-        $this->assertIdentical($mock->amOverloaded('A'), 'aaa');
-    }
-
-    function testToStringMagic() {
-        $mock = new MockClassWithSpecialMethods();
-        $mock->expectOnce('__toString');
-        $mock->returnsByValue('__toString', 'AAA');
-        ob_start();
-        print $mock;
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertEqual($output, 'AAA');
-    }
-}
-
-class WithStaticMethod {
-    static function aStaticMethod() { }
-}
-Mock::generate('WithStaticMethod');
-
-class TestOfMockingClassesWithStaticMethods extends UnitTestCase {
-
-    function testStaticMethodIsMockedAsStatic() {
-        $mock = new WithStaticMethod();
-        $reflection = new ReflectionClass($mock);
-        $method = $reflection->getMethod('aStaticMethod');
-        $this->assertTrue($method->isStatic());
-    }
-}
-
-class MockTestException extends Exception { }
-
-class TestOfThrowingExceptionsFromMocks extends UnitTestCase {
-
-    function testCanThrowOnMethodCall() {
-        $mock = new MockDummy();
-        $mock->throwOn('aMethod');
-        $this->expectException();
-        $mock->aMethod();
-    }
-
-    function testCanThrowSpecificExceptionOnMethodCall() {
-        $mock = new MockDummy();
-        $mock->throwOn('aMethod', new MockTestException());
-        $this->expectException();
-        $mock->aMethod();
-    }
-
-    function testThrowsOnlyWhenCallSignatureMatches() {
-        $mock = new MockDummy();
-        $mock->throwOn('aMethod', new MockTestException(), array(3));
-        $mock->aMethod(1);
-        $mock->aMethod(2);
-        $this->expectException();
-        $mock->aMethod(3);
-    }
-
-    function testCanThrowOnParticularInvocation() {
-        $mock = new MockDummy();
-        $mock->throwAt(2, 'aMethod', new MockTestException());
-        $mock->aMethod();
-        $mock->aMethod();
-        $this->expectException();
-        $mock->aMethod();
-    }
-}
-
-class TestOfThrowingErrorsFromMocks extends UnitTestCase {
-
-    function testCanGenerateErrorFromMethodCall() {
-        $mock = new MockDummy();
-        $mock->errorOn('aMethod', 'Ouch!');
-        $this->expectError('Ouch!');
-        $mock->aMethod();
-    }
-
-    function testGeneratesErrorOnlyWhenCallSignatureMatches() {
-        $mock = new MockDummy();
-        $mock->errorOn('aMethod', 'Ouch!', array(3));
-        $mock->aMethod(1);
-        $mock->aMethod(2);
-        $this->expectError();
-        $mock->aMethod(3);
-    }
-
-    function testCanGenerateErrorOnParticularInvocation() {
-        $mock = new MockDummy();
-        $mock->errorAt(2, 'aMethod', 'Ouch!');
-        $mock->aMethod();
-        $mock->aMethod();
-        $this->expectError();
-        $mock->aMethod();
-    }
-}
-
-Mock::generatePartial('Dummy', 'TestDummy', array('anotherMethod', 'aReferenceMethod'));
-
-class TestOfPartialMocks extends UnitTestCase {
-
-    function testMethodReplacementWithNoBehaviourReturnsNull() {
-        $mock = new TestDummy();
-        $this->assertEqual($mock->aMethod(99), 99);
-        $this->assertNull($mock->anotherMethod());
-    }
-
-    function testSettingReturns() {
-        $mock = new TestDummy();
-        $mock->returnsByValue('anotherMethod', 33, array(3));
-        $mock->returnsByValue('anotherMethod', 22);
-        $mock->returnsByValueAt(2, 'anotherMethod', 44, array(3));
-        $this->assertEqual($mock->anotherMethod(), 22);
-        $this->assertEqual($mock->anotherMethod(3), 33);
-        $this->assertEqual($mock->anotherMethod(3), 44);
-    }
-
-    function testSetReturnReferenceGivesOriginal() {
-        $mock = new TestDummy();
-        $object = 99;
-        $mock->returnsByReferenceAt(0, 'aReferenceMethod', $object, array(3));
-        $this->assertReference($mock->aReferenceMethod(3), $object);
-    }
-
-    function testReturnsAtGivesOriginalObjectHandle() {
-        $mock = new TestDummy();
-        $object = new Dummy();
-        $mock->returnsAt(0, 'anotherMethod', $object, array(3));
-        $this->assertSame($mock->anotherMethod(3), $object);
-    }
-
-    function testExpectations() {
-        $mock = new TestDummy();
-        $mock->expectCallCount('anotherMethod', 2);
-        $mock->expect('anotherMethod', array(77));
-        $mock->expectAt(1, 'anotherMethod', array(66));
-        $mock->anotherMethod(77);
-        $mock->anotherMethod(66);
-    }
-
-    function testSettingExpectationOnMissingMethodThrowsError() {
-        $mock = new TestDummy();
-        $this->expectError();
-        $mock->expectCallCount('aMissingMethod', 2);
-    }
-}
-
-class ConstructorSuperClass {
-    function ConstructorSuperClass() { }
-}
-
-class ConstructorSubClass extends ConstructorSuperClass { }
-
-class TestOfPHP4StyleSuperClassConstruct extends UnitTestCase {
-    function testBasicConstruct() {
-        Mock::generate('ConstructorSubClass');
-        $mock = new MockConstructorSubClass();
-        $this->assertIsA($mock, 'ConstructorSubClass');
-        $this->assertTrue(method_exists($mock, 'ConstructorSuperClass'));
-    }
-}
-
-class TestOfPHP5StaticMethodMocking extends UnitTestCase {
-    function testCanCreateAMockObjectWithStaticMethodsWithoutError() {
-        eval('
-            class SimpleObjectContainingStaticMethod {
-                static function someStatic() { }
-            }
-        ');
-        Mock::generate('SimpleObjectContainingStaticMethod');
-    }
-}
-
-class TestOfPHP5AbstractMethodMocking extends UnitTestCase {
-    function testCanCreateAMockObjectFromAnAbstractWithProperFunctionDeclarations() {
-        eval('
-            abstract class SimpleAbstractClassContainingAbstractMethods {
-                abstract function anAbstract();
-                abstract function anAbstractWithParameter($foo);
-                abstract function anAbstractWithMultipleParameters($foo, $bar);
-            }
-        ');
-        Mock::generate('SimpleAbstractClassContainingAbstractMethods');
-        $this->assertTrue(
-            method_exists(
-                // Testing with class name alone does not work in PHP 5.0
-                new MockSimpleAbstractClassContainingAbstractMethods,
-                'anAbstract'
-            )
-        );
-        $this->assertTrue(
-            method_exists(
-                new MockSimpleAbstractClassContainingAbstractMethods,
-                'anAbstractWithParameter'
-            )
-        );
-        $this->assertTrue(
-            method_exists(
-                new MockSimpleAbstractClassContainingAbstractMethods,
-                'anAbstractWithMultipleParameters'
-            )
-        );
-    }
-
-    function testMethodsDefinedAsAbstractInParentShouldHaveFullSignature() {
-        eval('
-             abstract class SimpleParentAbstractClassContainingAbstractMethods {
-                abstract function anAbstract();
-                abstract function anAbstractWithParameter($foo);
-                abstract function anAbstractWithMultipleParameters($foo, $bar);
-            }
-
-             class SimpleChildAbstractClassContainingAbstractMethods extends SimpleParentAbstractClassContainingAbstractMethods {
-                function anAbstract(){}
-                function anAbstractWithParameter($foo){}
-                function anAbstractWithMultipleParameters($foo, $bar){}
-            }
-
-            class EvenDeeperEmptyChildClass extends SimpleChildAbstractClassContainingAbstractMethods {}
-        ');
-        Mock::generate('SimpleChildAbstractClassContainingAbstractMethods');
-        $this->assertTrue(
-            method_exists(
-                new MockSimpleChildAbstractClassContainingAbstractMethods,
-                'anAbstract'
-            )
-        );
-        $this->assertTrue(
-            method_exists(
-                new MockSimpleChildAbstractClassContainingAbstractMethods,
-                'anAbstractWithParameter'
-            )
-        );
-        $this->assertTrue(
-            method_exists(
-                new MockSimpleChildAbstractClassContainingAbstractMethods,
-                'anAbstractWithMultipleParameters'
-            )
-        );
-        Mock::generate('EvenDeeperEmptyChildClass');
-        $this->assertTrue(
-            method_exists(
-                new MockEvenDeeperEmptyChildClass,
-                'anAbstract'
-            )
-        );
-        $this->assertTrue(
-            method_exists(
-                new MockEvenDeeperEmptyChildClass,
-                'anAbstractWithParameter'
-            )
-        );
-        $this->assertTrue(
-            method_exists(
-                new MockEvenDeeperEmptyChildClass,
-                'anAbstractWithMultipleParameters'
-            )
-        );
-    }
-}
-
-class DummyWithProtected
-{
-    public function aMethodCallsProtected() { return $this->aProtectedMethod(); }
-    protected function aProtectedMethod() { return true; }
-}
-
-Mock::generatePartial('DummyWithProtected', 'TestDummyWithProtected', array('aProtectedMethod'));
-class TestOfProtectedMethodPartialMocks extends UnitTestCase
-{
-    function testProtectedMethodExists() {
-        $this->assertTrue(
-            method_exists(
-                new TestDummyWithProtected,
-                'aProtectedMethod'
-            )
-        );
-    }
-
-    function testProtectedMethodIsCalled() {
-        $object = new DummyWithProtected();
-        $this->assertTrue($object->aMethodCallsProtected(), 'ensure original was called');
-    }
-
-    function testMockedMethodIsCalled() {
-        $object = new TestDummyWithProtected();
-        $object->returnsByValue('aProtectedMethod', false);
-        $this->assertFalse($object->aMethodCallsProtected());
-    }
-}
-
-?>
diff --git a/3rdparty/simpletest/test/page_test.php b/3rdparty/simpletest/test/page_test.php
deleted file mode 100755
index fdc15c5d008..00000000000
--- a/3rdparty/simpletest/test/page_test.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-// $Id: page_test.php 1913 2009-07-29 16:50:56Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../expectation.php');
-require_once(dirname(__FILE__) . '/../http.php');
-require_once(dirname(__FILE__) . '/../page.php');
-Mock::generate('SimpleHttpHeaders');
-Mock::generate('SimpleHttpResponse');
-
-class TestOfPageInterface extends UnitTestCase {
-    function testInterfaceOnEmptyPage() {
-        $page = new SimplePage();
-        $this->assertEqual($page->getTransportError(), 'No page fetched yet');
-        $this->assertIdentical($page->getRaw(), false);
-        $this->assertIdentical($page->getHeaders(), false);
-        $this->assertIdentical($page->getMimeType(), false);
-        $this->assertIdentical($page->getResponseCode(), false);
-        $this->assertIdentical($page->getAuthentication(), false);
-        $this->assertIdentical($page->getRealm(), false);
-        $this->assertFalse($page->hasFrames());
-        $this->assertIdentical($page->getUrls(), array());
-        $this->assertIdentical($page->getTitle(), false);
-    }
-}
-
-class TestOfPageHeaders extends UnitTestCase {
-
-    function testUrlAccessor() {
-        $headers = new MockSimpleHttpHeaders();
-
-        $response = new MockSimpleHttpResponse();
-        $response->setReturnValue('getHeaders', $headers);
-        $response->setReturnValue('getMethod', 'POST');
-        $response->setReturnValue('getUrl', new SimpleUrl('here'));
-        $response->setReturnValue('getRequestData', array('a' => 'A'));
-
-        $page = new SimplePage($response);
-        $this->assertEqual($page->getMethod(), 'POST');
-        $this->assertEqual($page->getUrl(), new SimpleUrl('here'));
-        $this->assertEqual($page->getRequestData(), array('a' => 'A'));
-    }
-
-    function testTransportError() {
-        $response = new MockSimpleHttpResponse();
-        $response->setReturnValue('getError', 'Ouch');
-
-        $page = new SimplePage($response);
-        $this->assertEqual($page->getTransportError(), 'Ouch');
-    }
-
-    function testHeadersAccessor() {
-        $headers = new MockSimpleHttpHeaders();
-        $headers->setReturnValue('getRaw', 'My: Headers');
-
-        $response = new MockSimpleHttpResponse();
-        $response->setReturnValue('getHeaders', $headers);
-
-        $page = new SimplePage($response);
-        $this->assertEqual($page->getHeaders(), 'My: Headers');
-    }
-
-    function testMimeAccessor() {
-        $headers = new MockSimpleHttpHeaders();
-        $headers->setReturnValue('getMimeType', 'text/html');
-
-        $response = new MockSimpleHttpResponse();
-        $response->setReturnValue('getHeaders', $headers);
-
-        $page = new SimplePage($response);
-        $this->assertEqual($page->getMimeType(), 'text/html');
-    }
-
-    function testResponseAccessor() {
-        $headers = new MockSimpleHttpHeaders();
-        $headers->setReturnValue('getResponseCode', 301);
-
-        $response = new MockSimpleHttpResponse();
-        $response->setReturnValue('getHeaders', $headers);
-
-        $page = new SimplePage($response);
-        $this->assertIdentical($page->getResponseCode(), 301);
-    }
-
-    function testAuthenticationAccessors() {
-        $headers = new MockSimpleHttpHeaders();
-        $headers->setReturnValue('getAuthentication', 'Basic');
-        $headers->setReturnValue('getRealm', 'Secret stuff');
-
-        $response = new MockSimpleHttpResponse();
-        $response->setReturnValue('getHeaders', $headers);
-
-        $page = new SimplePage($response);
-        $this->assertEqual($page->getAuthentication(), 'Basic');
-        $this->assertEqual($page->getRealm(), 'Secret stuff');
-    }
-}
-
-class TestOfHtmlStrippingAndNormalisation extends UnitTestCase {
-
-	function testImageSuppressionWhileKeepingParagraphsAndAltText() {
-        $this->assertEqual(
-                SimplePage::normalise('<img src="foo.png" /><p>some text</p><img src="bar.png" alt="bar" />'),
-                'some text bar');
-	}
-
-    function testSpaceNormalisation() {
-        $this->assertEqual(
-                SimplePage::normalise("\nOne\tTwo   \nThree\t"),
-                'One Two Three');
-    }
-
-    function testMultilinesCommentSuppression() {
-        $this->assertEqual(
-                SimplePage::normalise('<!--\n Hello \n-->'),
-                '');
-    }
-
-    function testCommentSuppression() {
-        $this->assertEqual(
-                SimplePage::normalise('<!--Hello-->'),
-                '');
-    }
-
-    function testJavascriptSuppression() {
-        $this->assertEqual(
-                SimplePage::normalise('<script attribute="test">\nHello\n</script>'),
-                '');
-        $this->assertEqual(
-                SimplePage::normalise('<script attribute="test">Hello</script>'),
-                '');
-        $this->assertEqual(
-                SimplePage::normalise('<script>Hello</script>'),
-                '');
-    }
-
-    function testTagSuppression() {
-        $this->assertEqual(
-                SimplePage::normalise('<b>Hello</b>'),
-                'Hello');
-    }
-
-    function testAdjoiningTagSuppression() {
-        $this->assertEqual(
-                SimplePage::normalise('<b>Hello</b><em>Goodbye</em>'),
-                'HelloGoodbye');
-    }
-
-    function testExtractImageAltTextWithDifferentQuotes() {
-        $this->assertEqual(
-                SimplePage::normalise('<img alt="One"><img alt=\'Two\'><img alt=Three>'),
-                'One Two Three');
-    }
-
-    function testExtractImageAltTextMultipleTimes() {
-        $this->assertEqual(
-                SimplePage::normalise('<img alt="One"><img alt="Two"><img alt="Three">'),
-                'One Two Three');
-    }
-
-    function testHtmlEntityTranslation() {
-        $this->assertEqual(
-                SimplePage::normalise('&lt;&gt;&quot;&amp;&#039;'),
-                '<>"&\'');
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/parse_error_test.php b/3rdparty/simpletest/test/parse_error_test.php
deleted file mode 100755
index c3ffb3d4205..00000000000
--- a/3rdparty/simpletest/test/parse_error_test.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-// $Id: parse_error_test.php 1509 2007-05-08 22:11:49Z lastcraft $
-require_once('../unit_tester.php');
-require_once('../reporter.php');
-
-$test = &new TestSuite('This should fail');
-$test->addFile('test_with_parse_error.php');
-$test->run(new HtmlReporter());
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/parsing_test.php b/3rdparty/simpletest/test/parsing_test.php
deleted file mode 100755
index 2c5e6cafe1d..00000000000
--- a/3rdparty/simpletest/test/parsing_test.php
+++ /dev/null
@@ -1,642 +0,0 @@
-<?php
-// $Id: page_test.php 1912 2009-07-29 16:39:17Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../page.php');
-require_once(dirname(__FILE__) . '/../php_parser.php');
-require_once(dirname(__FILE__) . '/../tidy_parser.php');
-Mock::generate('SimpleHttpResponse');
-
-abstract class TestOfParsing extends UnitTestCase {
-
-    function testRawAccessor() {
-        $page = $this->whenVisiting('http://host/', 'Raw HTML');
-        $this->assertEqual($page->getRaw(), 'Raw HTML');
-    }
-
-    function testTextAccessor() {
-        $page = $this->whenVisiting('http://host/', '<b>Some</b> &quot;messy&quot; HTML');
-        $this->assertEqual($page->getText(), 'Some "messy" HTML');
-    }
-
-    function testFramesetAbsence() {
-        $page = $this->whenVisiting('http://here/', '');
-        $this->assertFalse($page->hasFrames());
-        $this->assertIdentical($page->getFrameset(), false);
-    }
-
-    function testPageWithNoUrlsGivesEmptyArrayOfLinks() {
-        $page = $this->whenVisiting('http://here/', '<html><body><p>Stuff</p></body></html>');
-        $this->assertIdentical($page->getUrls(), array());
-    }
-
-    function testAddAbsoluteLink() {
-        $page = $this->whenVisiting('http://host',
-                                    '<html><a href="http://somewhere.com">Label</a></html>');
-        $this->assertEqual(
-                $page->getUrlsByLabel('Label'),
-                array(new SimpleUrl('http://somewhere.com')));
-    }
-
-    function testUrlLabelsHaveHtmlTagsStripped() {
-        $page = $this->whenVisiting('http://host',
-                                    '<html><a href="http://somewhere.com"><b>Label</b></a></html>');
-        $this->assertEqual(
-                $page->getUrlsByLabel('Label'),
-                array(new SimpleUrl('http://somewhere.com')));
-    }
-
-    function testAddStrictRelativeLink() {
-        $page = $this->whenVisiting('http://host',
-                                    '<html><a href="./somewhere.php">Label</a></html>');
-        $this->assertEqual(
-                $page->getUrlsByLabel('Label'),
-                array(new SimpleUrl('http://host/somewhere.php')));
-    }
-
-    function testAddBareRelativeLink() {
-        $page = $this->whenVisiting('http://host',
-                                    '<html><a href="somewhere.php">Label</a></html>');
-        $this->assertEqual(
-                $page->getUrlsByLabel('Label'),
-                array(new SimpleUrl('http://host/somewhere.php')));
-    }
-
-    function testAddRelativeLinkWithBaseTag() {
-        $raw = '<html><head><base href="http://www.lastcraft.com/stuff/"></head>' .
-               '<body><a href="somewhere.php">Label</a></body>' .
-               '</html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual(
-                $page->getUrlsByLabel('Label'),
-                array(new SimpleUrl('http://www.lastcraft.com/stuff/somewhere.php')));
-    }
-
-    function testAddAbsoluteLinkWithBaseTag() {
-        $raw = '<html><head><base href="http://www.lastcraft.com/stuff/"></head>' .
-               '<body><a href="http://here.com/somewhere.php">Label</a></body>' .
-               '</html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual(
-                $page->getUrlsByLabel('Label'),
-                array(new SimpleUrl('http://here.com/somewhere.php')));
-    }
-
-    function testCanFindLinkInsideForm() {
-        $raw = '<html><body><form><a href="./somewhere.php">Label</a></form></body></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual(
-                $page->getUrlsByLabel('Label'),
-                array(new SimpleUrl('http://host/somewhere.php')));
-    }
-
-    function testCanGetLinksByIdOrLabel() {
-        $raw = '<html><body><a href="./somewhere.php" id="33">Label</a></body></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual(
-                $page->getUrlsByLabel('Label'),
-                array(new SimpleUrl('http://host/somewhere.php')));
-        $this->assertFalse($page->getUrlById(0));
-        $this->assertEqual(
-                $page->getUrlById(33),
-                new SimpleUrl('http://host/somewhere.php'));
-    }
-
-    function testCanFindLinkByNormalisedLabel() {
-        $raw = '<html><body><a href="./somewhere.php" id="33"><em>Long &amp; thin</em></a></body></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual(
-                $page->getUrlsByLabel('Long & thin'),
-                array(new SimpleUrl('http://host/somewhere.php')));
-    }
-
-    function testCanFindLinkByImageAltText() {
-        $raw = '<a href="./somewhere.php" id="33"><img src="pic.jpg" alt="&lt;A picture&gt;"></a>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual(
-                array_map(array($this, 'urlToString'), $page->getUrlsByLabel('<A picture>')),
-                array('http://host/somewhere.php'));
-    }
-
-    function testTitle() {
-        $page = $this->whenVisiting('http://host',
-                                    '<html><head><title>Me</title></head></html>');
-        $this->assertEqual($page->getTitle(), 'Me');
-    }
-
-    function testTitleWithEntityReference() {
-        $page = $this->whenVisiting('http://host',
-                                    '<html><head><Title>Me&amp;Me</TITLE></head></html>');
-        $this->assertEqual($page->getTitle(), "Me&Me");
-    }
-
-    function testOnlyFramesInFramesetAreRecognised() {
-        $raw =
-            '<frameset>' .
-            '  <frame src="2.html"></frame>' .
-            '  <frame src="3.html"></frame>' .
-            '</frameset>' .
-            '<frame src="4.html"></frame>';
-        $page = $this->whenVisiting('http://here', $raw);
-        $this->assertTrue($page->hasFrames());
-        $this->assertSameFrameset($page->getFrameset(), array(
-                1 => new SimpleUrl('http://here/2.html'),
-                2 => new SimpleUrl('http://here/3.html')));
-    }
-
-    function testReadsNamesInFrames() {
-        $raw =
-            '<frameset>' .
-            '  <frame src="1.html"></frame>' .
-            '  <frame src="2.html" name="A"></frame>' .
-            '  <frame src="3.html" name="B"></frame>' .
-            '  <frame src="4.html"></frame>' .
-            '</frameset>';
-        $page = $this->whenVisiting('http://here', $raw);
-        $this->assertTrue($page->hasFrames());
-        $this->assertSameFrameset($page->getFrameset(), array(
-                1 => new SimpleUrl('http://here/1.html'),
-                'A' => new SimpleUrl('http://here/2.html'),
-                'B' => new SimpleUrl('http://here/3.html'),
-                4 => new SimpleUrl('http://here/4.html')));
-    }
-
-    function testRelativeFramesRespectBaseTag() {
-        $raw = '<base href="https://there.com/stuff/"><frameset><frame src="1.html"></frameset>';
-        $page = $this->whenVisiting('http://here', $raw);
-        $this->assertSameFrameset(
-                $page->getFrameset(),
-                array(1 => new SimpleUrl('https://there.com/stuff/1.html')));
-    }
-
-    function testSingleFrameInNestedFrameset() {
-        $raw = '<html><frameset><frameset>' .
-                '<frame src="a.html">' .
-                '</frameset></frameset></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertTrue($page->hasFrames());
-        $this->assertIdentical(
-                $page->getFrameset(),
-                array(1 => new SimpleUrl('http://host/a.html')));
-    }
-
-    function testFramesCollectedWithNestedFramesetTags() {
-        $raw = '<html><frameset>' .
-                '<frame src="a.html">' .
-                '<frameset><frame src="b.html"></frameset>' .
-                '<frame src="c.html">' .
-                '</frameset></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertTrue($page->hasFrames());
-        $this->assertIdentical($page->getFrameset(), array(
-                1 => new SimpleUrl('http://host/a.html'),
-                2 => new SimpleUrl('http://host/b.html'),
-                3 => new SimpleUrl('http://host/c.html')));
-    }
-
-    function testNamedFrames() {
-        $raw = '<html><frameset>' .
-                '<frame src="a.html">' .
-                '<frame name="_one" src="b.html">' .
-                '<frame src="c.html">' .
-                '<frame src="d.html" name="_two">' .
-                '</frameset></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertTrue($page->hasFrames());
-        $this->assertIdentical($page->getFrameset(), array(
-                1 => new SimpleUrl('http://host/a.html'),
-                '_one' => new SimpleUrl('http://host/b.html'),
-                3 => new SimpleUrl('http://host/c.html'),
-                '_two' => new SimpleUrl('http://host/d.html')));
-    }
-
-    function testCanReadElementOfCompleteForm() {
-        $raw = '<html><head><form>' .
-                '<input type="text" name="here" value="Hello">' .
-                '</form></head></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByName('here')), "Hello");
-    }
-
-    function testCanReadElementOfUnclosedForm() {
-        $raw = '<html><head><form>' .
-                '<input type="text" name="here" value="Hello">' .
-                '</head></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByName('here')), "Hello");
-    }
-
-    function testCanReadElementByLabel() {
-        $raw = '<html><head><form>' .
-                '<label>Where<input type="text" name="here" value="Hello"></label>' .
-                '</head></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByLabel('Where')), "Hello");
-    }
-
-    function testCanFindFormByLabel() {
-        $raw = '<html><head><form><input type="submit"></form></head></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertNull($page->getFormBySubmit(new SimpleByLabel('submit')));
-        $this->assertNull($page->getFormBySubmit(new SimpleByName('submit')));
-        $this->assertIsA(
-                $page->getFormBySubmit(new SimpleByLabel('Submit')),
-                'SimpleForm');
-    }
-
-    function testConfirmSubmitAttributesAreCaseSensitive() {
-        $raw = '<html><head><FORM><INPUT TYPE="SUBMIT" NAME="S" VALUE="S"></FORM></head></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertIsA(
-                $page->getFormBySubmit(new SimpleByName('S')),
-                'SimpleForm');
-        $this->assertIsA(
-                $page->getFormBySubmit(new SimpleByLabel('S')),
-                'SimpleForm');
-    }
-
-    function testCanFindFormByImage() {
-        $raw = '<html><head><form>' .
-                '<input type="image" id=100 alt="Label" name="me">' .
-                '</form></head></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertIsA(
-                $page->getFormByImage(new SimpleByLabel('Label')),
-                'SimpleForm');
-        $this->assertIsA(
-                $page->getFormByImage(new SimpleByName('me')),
-                'SimpleForm');
-        $this->assertIsA(
-                $page->getFormByImage(new SimpleById(100)),
-                'SimpleForm');
-    }
-
-    function testCanFindFormByButtonTag() {
-        $raw = '<html><head><form>' .
-                '<button type="submit" name="b" value="B">BBB</button>' .
-                '</form></head></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertNull($page->getFormBySubmit(new SimpleByLabel('b')));
-        $this->assertNull($page->getFormBySubmit(new SimpleByLabel('B')));
-        $this->assertIsA(
-                $page->getFormBySubmit(new SimpleByName('b')),
-                'SimpleForm');
-        $this->assertIsA(
-                $page->getFormBySubmit(new SimpleByLabel('BBB')),
-                'SimpleForm');
-    }
-
-    function testCanFindFormById() {
-        $raw = '<html><head><form id="55"><input type="submit"></form></head></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertNull($page->getFormById(54));
-        $this->assertIsA($page->getFormById(55), 'SimpleForm');
-    }
-
-    function testFormCanBeSubmitted() {
-        $raw = '<html><head><form method="GET" action="here.php">' .
-                '<input type="submit" name="s" value="Submit">' .
-                '</form></head></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $form = $page->getFormBySubmit(new SimpleByLabel('Submit'));
-        $this->assertEqual(
-                $form->submitButton(new SimpleByLabel('Submit')),
-                new SimpleGetEncoding(array('s' => 'Submit')));
-    }
-
-    function testUnparsedTagDoesNotCrash() {
-        $raw = '<form><input type="reset" name="Clear"></form>';
-        $this->whenVisiting('http://host', $raw);
-    }
-
-    function testReadingTextField() {
-        $raw = '<html><head><form>' .
-                '<input type="text" name="a">' .
-                '<input type="text" name="b" value="bbb" id=3>' .
-                '</form></head></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertNull($page->getField(new SimpleByName('missing')));
-        $this->assertIdentical($page->getField(new SimpleByName('a')), '');
-        $this->assertIdentical($page->getField(new SimpleByName('b')), 'bbb');
-    }
-
-    function testEntitiesAreDecodedInDefaultTextFieldValue() {
-        $raw = '<form><input type="text" name="a" value="&amp;\'&quot;&lt;&gt;"></form>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByName('a')), '&\'"<>');
-    }
-
-    function testReadingTextFieldIsCaseInsensitive() {
-        $raw = '<html><head><FORM>' .
-                '<INPUT TYPE="TEXT" NAME="a">' .
-                '<INPUT TYPE="TEXT" NAME="b" VALUE="bbb" id=3>' .
-                '</FORM></head></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertNull($page->getField(new SimpleByName('missing')));
-        $this->assertIdentical($page->getField(new SimpleByName('a')), '');
-        $this->assertIdentical($page->getField(new SimpleByName('b')), 'bbb');
-    }
-
-    function testSettingTextField() {
-        $raw = '<html><head><form>' .
-                '<input type="text" name="a">' .
-                '<input type="text" name="b" id=3>' .
-                '<input type="submit">' .
-                '</form></head></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertTrue($page->setField(new SimpleByName('a'), 'aaa'));
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'aaa');
-        $this->assertTrue($page->setField(new SimpleById(3), 'bbb'));
-        $this->assertEqual($page->getField(new SimpleBYId(3)), 'bbb');
-        $this->assertFalse($page->setField(new SimpleByName('z'), 'zzz'));
-        $this->assertNull($page->getField(new SimpleByName('z')));
-    }
-
-    function testSettingTextFieldByEnclosingLabel() {
-        $raw = '<html><head><form>' .
-                '<label>Stuff' .
-                '<input type="text" name="a" value="A">' .
-                '</label>' .
-                '</form></head></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'A');
-        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'A');
-        $this->assertTrue($page->setField(new SimpleByLabel('Stuff'), 'aaa'));
-        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'aaa');
-    }
-
-    function testLabelsWithoutForDoNotAttachToInputsWithNoId() {
-        $raw = '<form action="network_confirm.php?x=X&y=Y" method="post">
-            <label>Text A <input type="text" name="a" value="one"></label>
-            <label>Text B <input type="text" name="b" value="two"></label>
-        </form>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByLabelOrName('Text A')), 'one');
-        $this->assertEqual($page->getField(new SimpleByLabelOrName('Text B')), 'two');
-        $this->assertTrue($page->setField(new SimpleByLabelOrName('Text A'), '1'));
-        $this->assertTrue($page->setField(new SimpleByLabelOrName('Text B'), '2'));
-        $this->assertEqual($page->getField(new SimpleByLabelOrName('Text A')), '1');
-        $this->assertEqual($page->getField(new SimpleByLabelOrName('Text B')), '2');
-    }
-
-    function testGettingTextFieldByEnclosingLabelWithConflictingOtherFields() {
-        $raw = '<html><head><form>' .
-                '<label>Stuff' .
-                '<input type="text" name="a" value="A">' .
-                '</label>' .
-                '<input type="text" name="b" value="B">' .
-                '</form></head></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'A');
-        $this->assertEqual($page->getField(new SimpleByName('b')), 'B');
-        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'A');
-    }
-
-    function testSettingTextFieldByExternalLabel() {
-        $raw = '<html><head><form>' .
-                '<label for="aaa">Stuff</label>' .
-                '<input id="aaa" type="text" name="a" value="A">' .
-                '</form></head></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'A');
-        $this->assertTrue($page->setField(new SimpleByLabel('Stuff'), 'aaa'));
-        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'aaa');
-    }
-
-    function testReadingTextArea() {
-        $raw = '<html><head><form>' .
-                '<textarea name="a">aaa</textarea>' .
-                '<input type="submit">' .
-                '</form></head></html>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'aaa');
-    }
-
-    function testEntitiesAreDecodedInTextareaValue() {
-        $raw = '<form><textarea name="a">&amp;\'&quot;&lt;&gt;</textarea></form>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByName('a')), '&\'"<>');
-    }
-
-    function testNewlinesPreservedInTextArea() {
-        $raw = "<form><textarea name=\"a\">hello\r\nworld</textarea></form>";
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByName('a')), "hello\r\nworld");
-    }
-
-    function testWhitespacePreservedInTextArea() {
-        $raw = '<form><textarea name="a">     </textarea></form>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByName('a')), '     ');
-    }
-
-    function testComplexWhitespaceInTextArea() {
-        $raw = "<html>\n" .
-                "    <head><title></title></head>\n" .
-                "    <body>\n" .
-                "        <form>\n".
-                "            <label>Text area C\n" .
-                "                <textarea name='c'>\n" .
-                "                </textarea>\n" .
-                "            </label>\n" .
-                "        </form>\n" .
-                "    </body>\n" .
-                "</html>";
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByName('c')), "                ");
-    }
-
-    function testSettingTextArea() {
-        $raw = '<form>' .
-                '<textarea name="a">aaa</textarea>' .
-                '<input type="submit">' .
-                '</form>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertTrue($page->setField(new SimpleByName('a'), 'AAA'));
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'AAA');
-    }
-
-    function testDontIncludeTextAreaContentInLabel() {
-        $raw = '<form><label>Text area C<textarea id=3 name="c">mouse</textarea></label></form>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByLabel('Text area C')), 'mouse');
-    }
-
-    function testSettingSelectionField() {
-        $raw = '<form>' .
-                '<select name="a">' .
-                '<option>aaa</option>' .
-                '<option selected>bbb</option>' .
-                '</select>' .
-                '<input type="submit">' .
-                '</form>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'bbb');
-        $this->assertFalse($page->setField(new SimpleByName('a'), 'ccc'));
-        $this->assertTrue($page->setField(new SimpleByName('a'), 'aaa'));
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'aaa');
-    }
-
-    function testSelectionOptionsAreNormalised() {
-        $raw = '<form>' .
-                '<select name="a">' .
-                '<option selected><b>Big</b> bold</option>' .
-                '<option>small <em>italic</em></option>' .
-                '</select>' .
-                '</form>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'Big bold');
-        $this->assertTrue($page->setField(new SimpleByName('a'), 'small italic'));
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'small italic');
-    }
-
-    function testCanParseBlankOptions() {
-        $raw = '<form>
-                <select id=4 name="d">
-                    <option value="d1">D1</option>
-                    <option value="d2">D2</option>
-                    <option></option>
-                </select>
-                </form>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertTrue($page->setField(new SimpleByName('d'), ''));
-    }
-
-    function testTwoSelectionFieldsAreIndependent() {
-        $raw = '<form>
-                    <select id=4 name="d">
-                        <option value="d1" selected>D1</option>
-                        <option value="d2">D2</option>
-                    </select>
-                    <select id=11 name="h">
-                        <option value="h1">H1</option>
-                        <option value="h2" selected>H2</option>
-                    </select>
-                </form>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertTrue($page->setField(new SimpleByName('d'), 'd2'));
-        $this->assertTrue($page->setField(new SimpleByName('h'), 'h1'));
-        $this->assertEqual($page->getField(new SimpleByName('d')), 'd2');
-    }
-
-    function testEmptyOptionDoesNotScrewUpTwoSelectionFields() {
-        $raw = '<form>
-                    <select name="d">
-                        <option value="d1" selected>D1</option>
-                        <option value="d2">D2</option>
-                        <option></option>
-                    </select>
-                    <select name="h">
-                        <option value="h1">H1</option>
-                        <option value="h2" selected>H2</option>
-                    </select>
-                </form>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertTrue($page->setField(new SimpleByName('d'), 'd2'));
-        $this->assertTrue($page->setField(new SimpleByName('h'), 'h1'));
-        $this->assertEqual($page->getField(new SimpleByName('d')), 'd2');
-    }
-
-    function testSettingSelectionFieldByEnclosingLabel() {
-        $raw = '<form>' .
-                '<label>Stuff' .
-                '<select name="a"><option selected>A</option><option>B</option></select>' .
-                '</label>' .
-                '</form>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'A');
-        $this->assertTrue($page->setField(new SimpleByLabel('Stuff'), 'B'));
-        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'B');
-    }
-
-    function testTwoSelectionFieldsWithLabelsAreIndependent() {
-        $raw = '<form>
-                    <label>Labelled D
-                        <select id=4 name="d">
-                            <option value="d1" selected>D1</option>
-                            <option value="d2">D2</option>
-                        </select>
-                    </label>
-                    <label>Labelled H
-                        <select id=11 name="h">
-                            <option value="h1">H1</option>
-                            <option value="h2" selected>H2</option>
-                        </select>
-                    </label>
-                </form>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertTrue($page->setField(new SimpleByLabel('Labelled D'), 'd2'));
-        $this->assertTrue($page->setField(new SimpleByLabel('Labelled H'), 'h1'));
-        $this->assertEqual($page->getField(new SimpleByLabel('Labelled D')), 'd2');
-    }
-
-    function testSettingRadioButtonByEnclosingLabel() {
-        $raw = '<form>' .
-                '<label>A<input type="radio" name="r" value="a" checked></label>' .
-                '<label>B<input type="radio" name="r" value="b"></label>' .
-                '</form>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByLabel('A')), 'a');
-        $this->assertTrue($page->setField(new SimpleBylabel('B'), 'b'));
-        $this->assertEqual($page->getField(new SimpleByLabel('B')), 'b');
-    }
-
-    function testCanParseInputsWithAllKindsOfAttributeQuoting() {
-        $raw = '<form>' .
-                '<input type="checkbox" name=\'first\' value=one checked></input>' .
-                '<input type=checkbox name="second" value="two"></input>' .
-                '<input type=checkbox name="third" value=\'three\' checked="checked" />' .
-                '</form>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByName('first')), 'one');
-        $this->assertEqual($page->getField(new SimpleByName('second')), false);
-        $this->assertEqual($page->getField(new SimpleByName('third')), 'three');
-    }
-
-    function urlToString($url) {
-        return $url->asString();
-    }
-
-    function assertSameFrameset($actual, $expected) {
-        $this->assertIdentical(array_map(array($this, 'urlToString'), $actual),
-                               array_map(array($this, 'urlToString'), $expected));
-    }
-}
-
-class TestOfParsingUsingPhpParser extends TestOfParsing {
-
-    function whenVisiting($url, $content) {
-        $response = new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent', $content);
-        $response->setReturnValue('getUrl', new SimpleUrl($url));
-        $builder = new SimplePhpPageBuilder();
-        return $builder->parse($response);
-    }
-
-    function testNastyTitle() {
-        $page = $this->whenVisiting('http://host',
-                                    '<html><head><Title> <b>Me&amp;Me </TITLE></b></head></html>');
-        $this->assertEqual($page->getTitle(), "Me&Me");
-    }
-
-    function testLabelShouldStopAtClosingLabelTag() {
-        $raw = '<form><label>start<textarea id=3 name="c" wrap="hard">stuff</textarea>end</label>stuff</form>';
-        $page = $this->whenVisiting('http://host', $raw);
-        $this->assertEqual($page->getField(new SimpleByLabel('startend')), 'stuff');
-    }
-}
-
-class TestOfParsingUsingTidyParser extends TestOfParsing {
-
-    function skip() {
-        $this->skipUnless(extension_loaded('tidy'), 'Install \'tidy\' php extension to enable html tidy based parser');
-    }
-
-    function whenVisiting($url, $content) {
-        $response = new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent', $content);
-        $response->setReturnValue('getUrl', new SimpleUrl($url));
-        $builder = new SimpleTidyPageBuilder();
-        return $builder->parse($response);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/php_parser_test.php b/3rdparty/simpletest/test/php_parser_test.php
deleted file mode 100755
index d95c7d06a60..00000000000
--- a/3rdparty/simpletest/test/php_parser_test.php
+++ /dev/null
@@ -1,489 +0,0 @@
-<?php
-// $Id: php_parser_test.php 1911 2009-07-29 16:38:04Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../php_parser.php');
-require_once(dirname(__FILE__) . '/../tag.php');
-Mock::generate('SimplePage');
-Mock::generate('SimplePhpPageBuilder');
-Mock::generate('SimpleHttpResponse');
-Mock::generatePartial(
-        'SimplePhpPageBuilder',
-        'PartialSimplePhpPageBuilder',
-        array('createPage', 'createParser'));
-Mock::generate('SimpleHtmlSaxParser');
-Mock::generate('SimplePhpPageBuilder');
-
-class TestOfParallelRegex extends UnitTestCase {
-
-    function testNoPatterns() {
-        $regex = new ParallelRegex(false);
-        $this->assertFalse($regex->match("Hello", $match));
-        $this->assertEqual($match, "");
-    }
-
-    function testNoSubject() {
-        $regex = new ParallelRegex(false);
-        $regex->addPattern(".*");
-        $this->assertTrue($regex->match("", $match));
-        $this->assertEqual($match, "");
-    }
-
-    function testMatchAll() {
-        $regex = new ParallelRegex(false);
-        $regex->addPattern(".*");
-        $this->assertTrue($regex->match("Hello", $match));
-        $this->assertEqual($match, "Hello");
-    }
-
-    function testCaseSensitive() {
-        $regex = new ParallelRegex(true);
-        $regex->addPattern("abc");
-        $this->assertTrue($regex->match("abcdef", $match));
-        $this->assertEqual($match, "abc");
-        $this->assertTrue($regex->match("AAABCabcdef", $match));
-        $this->assertEqual($match, "abc");
-    }
-
-    function testCaseInsensitive() {
-        $regex = new ParallelRegex(false);
-        $regex->addPattern("abc");
-        $this->assertTrue($regex->match("abcdef", $match));
-        $this->assertEqual($match, "abc");
-        $this->assertTrue($regex->match("AAABCabcdef", $match));
-        $this->assertEqual($match, "ABC");
-    }
-
-    function testMatchMultiple() {
-        $regex = new ParallelRegex(true);
-        $regex->addPattern("abc");
-        $regex->addPattern("ABC");
-        $this->assertTrue($regex->match("abcdef", $match));
-        $this->assertEqual($match, "abc");
-        $this->assertTrue($regex->match("AAABCabcdef", $match));
-        $this->assertEqual($match, "ABC");
-        $this->assertFalse($regex->match("Hello", $match));
-    }
-
-    function testPatternLabels() {
-        $regex = new ParallelRegex(false);
-        $regex->addPattern("abc", "letter");
-        $regex->addPattern("123", "number");
-        $this->assertIdentical($regex->match("abcdef", $match), "letter");
-        $this->assertEqual($match, "abc");
-        $this->assertIdentical($regex->match("0123456789", $match), "number");
-        $this->assertEqual($match, "123");
-    }
-}
-
-class TestOfStateStack extends UnitTestCase {
-
-    function testStartState() {
-        $stack = new SimpleStateStack("one");
-        $this->assertEqual($stack->getCurrent(), "one");
-    }
-
-    function testExhaustion() {
-        $stack = new SimpleStateStack("one");
-        $this->assertFalse($stack->leave());
-    }
-
-    function testStateMoves() {
-        $stack = new SimpleStateStack("one");
-        $stack->enter("two");
-        $this->assertEqual($stack->getCurrent(), "two");
-        $stack->enter("three");
-        $this->assertEqual($stack->getCurrent(), "three");
-        $this->assertTrue($stack->leave());
-        $this->assertEqual($stack->getCurrent(), "two");
-        $stack->enter("third");
-        $this->assertEqual($stack->getCurrent(), "third");
-        $this->assertTrue($stack->leave());
-        $this->assertTrue($stack->leave());
-        $this->assertEqual($stack->getCurrent(), "one");
-    }
-}
-
-class TestParser {
-
-    function accept() {
-    }
-
-    function a() {
-    }
-
-    function b() {
-    }
-}
-Mock::generate('TestParser');
-
-class TestOfLexer extends UnitTestCase {
-
-    function testEmptyPage() {
-        $handler = new MockTestParser();
-        $handler->expectNever("accept");
-        $handler->setReturnValue("accept", true);
-        $handler->expectNever("accept");
-        $handler->setReturnValue("accept", true);
-        $lexer = new SimpleLexer($handler);
-        $lexer->addPattern("a+");
-        $this->assertTrue($lexer->parse(""));
-    }
-
-    function testSinglePattern() {
-        $handler = new MockTestParser();
-        $handler->expectAt(0, "accept", array("aaa", LEXER_MATCHED));
-        $handler->expectAt(1, "accept", array("x", LEXER_UNMATCHED));
-        $handler->expectAt(2, "accept", array("a", LEXER_MATCHED));
-        $handler->expectAt(3, "accept", array("yyy", LEXER_UNMATCHED));
-        $handler->expectAt(4, "accept", array("a", LEXER_MATCHED));
-        $handler->expectAt(5, "accept", array("x", LEXER_UNMATCHED));
-        $handler->expectAt(6, "accept", array("aaa", LEXER_MATCHED));
-        $handler->expectAt(7, "accept", array("z", LEXER_UNMATCHED));
-        $handler->expectCallCount("accept", 8);
-        $handler->setReturnValue("accept", true);
-        $lexer = new SimpleLexer($handler);
-        $lexer->addPattern("a+");
-        $this->assertTrue($lexer->parse("aaaxayyyaxaaaz"));
-    }
-
-    function testMultiplePattern() {
-        $handler = new MockTestParser();
-        $target = array("a", "b", "a", "bb", "x", "b", "a", "xxxxxx", "a", "x");
-        for ($i = 0; $i < count($target); $i++) {
-            $handler->expectAt($i, "accept", array($target[$i], '*'));
-        }
-        $handler->expectCallCount("accept", count($target));
-        $handler->setReturnValue("accept", true);
-        $lexer = new SimpleLexer($handler);
-        $lexer->addPattern("a+");
-        $lexer->addPattern("b+");
-        $this->assertTrue($lexer->parse("ababbxbaxxxxxxax"));
-    }
-}
-
-class TestOfLexerModes extends UnitTestCase {
-
-    function testIsolatedPattern() {
-        $handler = new MockTestParser();
-        $handler->expectAt(0, "a", array("a", LEXER_MATCHED));
-        $handler->expectAt(1, "a", array("b", LEXER_UNMATCHED));
-        $handler->expectAt(2, "a", array("aa", LEXER_MATCHED));
-        $handler->expectAt(3, "a", array("bxb", LEXER_UNMATCHED));
-        $handler->expectAt(4, "a", array("aaa", LEXER_MATCHED));
-        $handler->expectAt(5, "a", array("x", LEXER_UNMATCHED));
-        $handler->expectAt(6, "a", array("aaaa", LEXER_MATCHED));
-        $handler->expectAt(7, "a", array("x", LEXER_UNMATCHED));
-        $handler->expectCallCount("a", 8);
-        $handler->setReturnValue("a", true);
-        $lexer = new SimpleLexer($handler, "a");
-        $lexer->addPattern("a+", "a");
-        $lexer->addPattern("b+", "b");
-        $this->assertTrue($lexer->parse("abaabxbaaaxaaaax"));
-    }
-
-    function testModeChange() {
-        $handler = new MockTestParser();
-        $handler->expectAt(0, "a", array("a", LEXER_MATCHED));
-        $handler->expectAt(1, "a", array("b", LEXER_UNMATCHED));
-        $handler->expectAt(2, "a", array("aa", LEXER_MATCHED));
-        $handler->expectAt(3, "a", array("b", LEXER_UNMATCHED));
-        $handler->expectAt(4, "a", array("aaa", LEXER_MATCHED));
-        $handler->expectAt(0, "b", array(":", LEXER_ENTER));
-        $handler->expectAt(1, "b", array("a", LEXER_UNMATCHED));
-        $handler->expectAt(2, "b", array("b", LEXER_MATCHED));
-        $handler->expectAt(3, "b", array("a", LEXER_UNMATCHED));
-        $handler->expectAt(4, "b", array("bb", LEXER_MATCHED));
-        $handler->expectAt(5, "b", array("a", LEXER_UNMATCHED));
-        $handler->expectAt(6, "b", array("bbb", LEXER_MATCHED));
-        $handler->expectAt(7, "b", array("a", LEXER_UNMATCHED));
-        $handler->expectCallCount("a", 5);
-        $handler->expectCallCount("b", 8);
-        $handler->setReturnValue("a", true);
-        $handler->setReturnValue("b", true);
-        $lexer = new SimpleLexer($handler, "a");
-        $lexer->addPattern("a+", "a");
-        $lexer->addEntryPattern(":", "a", "b");
-        $lexer->addPattern("b+", "b");
-        $this->assertTrue($lexer->parse("abaabaaa:ababbabbba"));
-    }
-
-    function testNesting() {
-        $handler = new MockTestParser();
-        $handler->setReturnValue("a", true);
-        $handler->setReturnValue("b", true);
-        $handler->expectAt(0, "a", array("aa", LEXER_MATCHED));
-        $handler->expectAt(1, "a", array("b", LEXER_UNMATCHED));
-        $handler->expectAt(2, "a", array("aa", LEXER_MATCHED));
-        $handler->expectAt(3, "a", array("b", LEXER_UNMATCHED));
-        $handler->expectAt(0, "b", array("(", LEXER_ENTER));
-        $handler->expectAt(1, "b", array("bb", LEXER_MATCHED));
-        $handler->expectAt(2, "b", array("a", LEXER_UNMATCHED));
-        $handler->expectAt(3, "b", array("bb", LEXER_MATCHED));
-        $handler->expectAt(4, "b", array(")", LEXER_EXIT));
-        $handler->expectAt(4, "a", array("aa", LEXER_MATCHED));
-        $handler->expectAt(5, "a", array("b", LEXER_UNMATCHED));
-        $handler->expectCallCount("a", 6);
-        $handler->expectCallCount("b", 5);
-        $lexer = new SimpleLexer($handler, "a");
-        $lexer->addPattern("a+", "a");
-        $lexer->addEntryPattern("(", "a", "b");
-        $lexer->addPattern("b+", "b");
-        $lexer->addExitPattern(")", "b");
-        $this->assertTrue($lexer->parse("aabaab(bbabb)aab"));
-    }
-
-    function testSingular() {
-        $handler = new MockTestParser();
-        $handler->setReturnValue("a", true);
-        $handler->setReturnValue("b", true);
-        $handler->expectAt(0, "a", array("aa", LEXER_MATCHED));
-        $handler->expectAt(1, "a", array("aa", LEXER_MATCHED));
-        $handler->expectAt(2, "a", array("xx", LEXER_UNMATCHED));
-        $handler->expectAt(3, "a", array("xx", LEXER_UNMATCHED));
-        $handler->expectAt(0, "b", array("b", LEXER_SPECIAL));
-        $handler->expectAt(1, "b", array("bbb", LEXER_SPECIAL));
-        $handler->expectCallCount("a", 4);
-        $handler->expectCallCount("b", 2);
-        $lexer = new SimpleLexer($handler, "a");
-        $lexer->addPattern("a+", "a");
-        $lexer->addSpecialPattern("b+", "a", "b");
-        $this->assertTrue($lexer->parse("aabaaxxbbbxx"));
-    }
-
-    function testUnwindTooFar() {
-        $handler = new MockTestParser();
-        $handler->setReturnValue("a", true);
-        $handler->expectAt(0, "a", array("aa", LEXER_MATCHED));
-        $handler->expectAt(1, "a", array(")", LEXER_EXIT));
-        $handler->expectCallCount("a", 2);
-        $lexer = new SimpleLexer($handler, "a");
-        $lexer->addPattern("a+", "a");
-        $lexer->addExitPattern(")", "a");
-        $this->assertFalse($lexer->parse("aa)aa"));
-    }
-}
-
-class TestOfLexerHandlers extends UnitTestCase {
-
-    function testModeMapping() {
-        $handler = new MockTestParser();
-        $handler->setReturnValue("a", true);
-        $handler->expectAt(0, "a", array("aa", LEXER_MATCHED));
-        $handler->expectAt(1, "a", array("(", LEXER_ENTER));
-        $handler->expectAt(2, "a", array("bb", LEXER_MATCHED));
-        $handler->expectAt(3, "a", array("a", LEXER_UNMATCHED));
-        $handler->expectAt(4, "a", array("bb", LEXER_MATCHED));
-        $handler->expectAt(5, "a", array(")", LEXER_EXIT));
-        $handler->expectAt(6, "a", array("b", LEXER_UNMATCHED));
-        $handler->expectCallCount("a", 7);
-        $lexer = new SimpleLexer($handler, "mode_a");
-        $lexer->addPattern("a+", "mode_a");
-        $lexer->addEntryPattern("(", "mode_a", "mode_b");
-        $lexer->addPattern("b+", "mode_b");
-        $lexer->addExitPattern(")", "mode_b");
-        $lexer->mapHandler("mode_a", "a");
-        $lexer->mapHandler("mode_b", "a");
-        $this->assertTrue($lexer->parse("aa(bbabb)b"));
-    }
-}
-
-class TestOfSimpleHtmlLexer extends UnitTestCase {
-
-    function &createParser() {
-        $parser = new MockSimpleHtmlSaxParser();
-        $parser->setReturnValue('acceptStartToken', true);
-        $parser->setReturnValue('acceptEndToken', true);
-        $parser->setReturnValue('acceptAttributeToken', true);
-        $parser->setReturnValue('acceptEntityToken', true);
-        $parser->setReturnValue('acceptTextToken', true);
-        $parser->setReturnValue('ignore', true);
-        return $parser;
-    }
-
-    function testNoContent() {
-        $parser = $this->createParser();
-        $parser->expectNever('acceptStartToken');
-        $parser->expectNever('acceptEndToken');
-        $parser->expectNever('acceptAttributeToken');
-        $parser->expectNever('acceptEntityToken');
-        $parser->expectNever('acceptTextToken');
-        $lexer = new SimpleHtmlLexer($parser);
-        $this->assertTrue($lexer->parse(''));
-    }
-
-    function testUninteresting() {
-        $parser = $this->createParser();
-        $parser->expectOnce('acceptTextToken', array('<html></html>', '*'));
-        $lexer = new SimpleHtmlLexer($parser);
-        $this->assertTrue($lexer->parse('<html></html>'));
-    }
-
-    function testSkipCss() {
-        $parser = $this->createParser();
-        $parser->expectNever('acceptTextToken');
-        $parser->expectAtLeastOnce('ignore');
-        $lexer = new SimpleHtmlLexer($parser);
-        $this->assertTrue($lexer->parse("<style>Lot's of styles</style>"));
-    }
-
-    function testSkipJavaScript() {
-        $parser = $this->createParser();
-        $parser->expectNever('acceptTextToken');
-        $parser->expectAtLeastOnce('ignore');
-        $lexer = new SimpleHtmlLexer($parser);
-        $this->assertTrue($lexer->parse("<SCRIPT>Javascript code {';:^%^%£$'@\"*(}</SCRIPT>"));
-    }
-
-    function testSkipHtmlComments() {
-        $parser = $this->createParser();
-        $parser->expectNever('acceptTextToken');
-        $parser->expectAtLeastOnce('ignore');
-        $lexer = new SimpleHtmlLexer($parser);
-        $this->assertTrue($lexer->parse("<!-- <title>title</title><style>styles</style> -->"));
-    }
-
-    function testTagWithNoAttributes() {
-        $parser = $this->createParser();
-        $parser->expectAt(0, 'acceptStartToken', array('<title', '*'));
-        $parser->expectAt(1, 'acceptStartToken', array('>', '*'));
-        $parser->expectCallCount('acceptStartToken', 2);
-        $parser->expectOnce('acceptTextToken', array('Hello', '*'));
-        $parser->expectOnce('acceptEndToken', array('</title>', '*'));
-        $lexer = new SimpleHtmlLexer($parser);
-        $this->assertTrue($lexer->parse('<title>Hello</title>'));
-    }
-
-    function testTagWithAttributes() {
-        $parser = $this->createParser();
-        $parser->expectOnce('acceptTextToken', array('label', '*'));
-        $parser->expectAt(0, 'acceptStartToken', array('<a', '*'));
-        $parser->expectAt(1, 'acceptStartToken', array('href', '*'));
-        $parser->expectAt(2, 'acceptStartToken', array('>', '*'));
-        $parser->expectCallCount('acceptStartToken', 3);
-        $parser->expectAt(0, 'acceptAttributeToken', array('= "', '*'));
-        $parser->expectAt(1, 'acceptAttributeToken', array('here.html', '*'));
-        $parser->expectAt(2, 'acceptAttributeToken', array('"', '*'));
-        $parser->expectCallCount('acceptAttributeToken', 3);
-        $parser->expectOnce('acceptEndToken', array('</a>', '*'));
-        $lexer = new SimpleHtmlLexer($parser);
-        $this->assertTrue($lexer->parse('<a href = "here.html">label</a>'));
-    }
-}
-
-class TestOfHtmlSaxParser extends UnitTestCase {
-
-    function createListener() {
-        $listener = new MockSimplePhpPageBuilder();
-        $listener->setReturnValue('startElement', true);
-        $listener->setReturnValue('addContent', true);
-        $listener->setReturnValue('endElement', true);
-        return $listener;
-    }
-
-    function testFramesetTag() {
-        $listener = $this->createListener();
-        $listener->expectOnce('startElement', array('frameset', array()));
-        $listener->expectOnce('addContent', array('Frames'));
-        $listener->expectOnce('endElement', array('frameset'));
-        $parser = new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse('<frameset>Frames</frameset>'));
-    }
-
-    function testTagWithUnquotedAttributes() {
-        $listener = $this->createListener();
-        $listener->expectOnce(
-                'startElement',
-                array('input', array('name' => 'a.b.c', 'value' => 'd')));
-        $parser = new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse('<input name=a.b.c value = d>'));
-    }
-
-    function testTagInsideContent() {
-        $listener = $this->createListener();
-        $listener->expectOnce('startElement', array('a', array()));
-        $listener->expectAt(0, 'addContent', array('<html>'));
-        $listener->expectAt(1, 'addContent', array('</html>'));
-        $parser = new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse('<html><a></a></html>'));
-    }
-
-    function testTagWithInternalContent() {
-        $listener = $this->createListener();
-        $listener->expectOnce('startElement', array('a', array()));
-        $listener->expectOnce('addContent', array('label'));
-        $listener->expectOnce('endElement', array('a'));
-        $parser = new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse('<a>label</a>'));
-    }
-
-    function testLinkAddress() {
-        $listener = $this->createListener();
-        $listener->expectOnce('startElement', array('a', array('href' => 'here.html')));
-        $listener->expectOnce('addContent', array('label'));
-        $listener->expectOnce('endElement', array('a'));
-        $parser = new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse("<a href = 'here.html'>label</a>"));
-    }
-
-    function testEncodedAttribute() {
-        $listener = $this->createListener();
-        $listener->expectOnce('startElement', array('a', array('href' => 'here&there.html')));
-        $listener->expectOnce('addContent', array('label'));
-        $listener->expectOnce('endElement', array('a'));
-        $parser = new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse("<a href = 'here&amp;there.html'>label</a>"));
-    }
-
-    function testTagWithId() {
-        $listener = $this->createListener();
-        $listener->expectOnce('startElement', array('a', array('id' => '0')));
-        $listener->expectOnce('addContent', array('label'));
-        $listener->expectOnce('endElement', array('a'));
-        $parser = new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse('<a id="0">label</a>'));
-    }
-
-    function testTagWithEmptyAttributes() {
-        $listener = $this->createListener();
-        $listener->expectOnce(
-                'startElement',
-                array('option', array('value' => '', 'selected' => '')));
-        $listener->expectOnce('addContent', array('label'));
-        $listener->expectOnce('endElement', array('option'));
-        $parser = new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse('<option value="" selected>label</option>'));
-    }
-
-    function testComplexTagWithLotsOfCaseVariations() {
-        $listener = $this->createListener();
-        $listener->expectOnce(
-                'startElement',
-                array('a', array('href' => 'here.html', 'style' => "'cool'")));
-        $listener->expectOnce('addContent', array('label'));
-        $listener->expectOnce('endElement', array('a'));
-        $parser = new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse('<A HREF = \'here.html\' Style="\'cool\'">label</A>'));
-    }
-
-    function testXhtmlSelfClosingTag() {
-        $listener = $this->createListener();
-        $listener->expectOnce(
-                'startElement',
-                array('input', array('type' => 'submit', 'name' => 'N', 'value' => 'V')));
-        $parser = new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse('<input type="submit" name="N" value="V" />'));
-    }
-
-    function testNestedFrameInFrameset() {
-        $listener = $this->createListener();
-        $listener->expectAt(0, 'startElement', array('frameset', array()));
-        $listener->expectAt(1, 'startElement', array('frame', array('src' => 'frame.html')));
-        $listener->expectCallCount('startElement', 2);
-        $listener->expectOnce('addContent', array('<noframes>Hello</noframes>'));
-        $listener->expectOnce('endElement', array('frameset'));
-        $parser = new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse(
-                '<frameset><frame src="frame.html"><noframes>Hello</noframes></frameset>'));
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/recorder_test.php b/3rdparty/simpletest/test/recorder_test.php
deleted file mode 100755
index fdae4c1cccc..00000000000
--- a/3rdparty/simpletest/test/recorder_test.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-// $Id: test.php 1500 2007-04-29 14:33:31Z pp11 $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../recorder.php');
-
-class TestOfRecorder extends UnitTestCase {
-    
-    function testContentOfRecorderWithOnePassAndOneFailure() {
-        $test = new TestSuite();
-        $test->addFile(dirname(__FILE__) . '/support/recorder_sample.php');
-        $recorder = new Recorder(new SimpleReporter());
-        $test->run($recorder);
-        $this->assertEqual(count($recorder->results), 2);
-        $this->assertIsA($recorder->results[0], 'SimpleResultOfPass');
-        $this->assertEqual('testTrueIsTrue', array_pop($recorder->results[0]->breadcrumb));
-        $this->assertPattern('/ at \[.*\Wrecorder_sample\.php line 7\]/', $recorder->results[0]->message);
-        $this->assertIsA($recorder->results[1], 'SimpleResultOfFail');
-        $this->assertEqual('testFalseIsTrue', array_pop($recorder->results[1]->breadcrumb));
-        $this->assertPattern("/Expected false, got \[Boolean: true\] at \[.*\Wrecorder_sample\.php line 11\]/",
-                             $recorder->results[1]->message);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/reflection_php5_test.php b/3rdparty/simpletest/test/reflection_php5_test.php
deleted file mode 100755
index d9f46e6db78..00000000000
--- a/3rdparty/simpletest/test/reflection_php5_test.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?php
-// $Id: reflection_php5_test.php 1778 2008-04-21 16:13:08Z edwardzyang $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../reflection_php5.php');
-
-class AnyOldLeafClass {
-	function aMethod() { }
-}
-
-abstract class AnyOldClass {
-	function aMethod() { }
-}
-
-class AnyOldLeafClassWithAFinal {
-	final function aMethod() { }
-}
-
-interface AnyOldInterface {
-	function aMethod();
-}
-
-interface AnyOldArgumentInterface {
-	function aMethod(AnyOldInterface $argument);
-}
-
-interface AnyDescendentInterface extends AnyOldInterface {
-}
-
-class AnyOldImplementation implements AnyOldInterface {
-	function aMethod() { }
-	function extraMethod() { }
-}
-
-abstract class AnyAbstractImplementation implements AnyOldInterface {
-}
-
-abstract class AnotherOldAbstractClass {
-    protected abstract function aMethod(AnyOldInterface $argument);
-}
-
-class AnyOldSubclass extends AnyOldImplementation { }
-
-class AnyOldArgumentClass {
-	function aMethod($argument) { }
-}
-
-class AnyOldArgumentImplementation implements AnyOldArgumentInterface {
-	function aMethod(AnyOldInterface $argument) { }
-}
-
-class AnyOldTypeHintedClass implements AnyOldArgumentInterface {
-	function aMethod(AnyOldInterface $argument) { }
-}
-
-class AnyDescendentImplementation implements AnyDescendentInterface {
-	function aMethod() { }
-}
-
-class AnyOldOverloadedClass {
-	function __isset($key) { }
-	function __unset($key) { }
-}
-
-class AnyOldClassWithStaticMethods {
-	static function aStatic() { }
-	static function aStaticWithParameters($arg1, $arg2) { }
-}
-
-abstract class AnyOldAbstractClassWithAbstractMethods {
-    abstract function anAbstract();
-    abstract function anAbstractWithParameter($foo);
-    abstract function anAbstractWithMultipleParameters($foo, $bar);
-}
-
-class TestOfReflection extends UnitTestCase {
-
-	function testClassExistence() {
-		$reflection = new SimpleReflection('AnyOldLeafClass');
-		$this->assertTrue($reflection->classOrInterfaceExists());
-		$this->assertTrue($reflection->classOrInterfaceExistsSansAutoload());
-		$this->assertFalse($reflection->isAbstract());
-		$this->assertFalse($reflection->isInterface());
-	}
-
-	function testClassNonExistence() {
-		$reflection = new SimpleReflection('UnknownThing');
-		$this->assertFalse($reflection->classOrInterfaceExists());
-		$this->assertFalse($reflection->classOrInterfaceExistsSansAutoload());
-	}
-
-	function testDetectionOfAbstractClass() {
-		$reflection = new SimpleReflection('AnyOldClass');
-		$this->assertTrue($reflection->isAbstract());
-	}
-
-	function testDetectionOfFinalMethods() {
-		$reflection = new SimpleReflection('AnyOldClass');
-		$this->assertFalse($reflection->hasFinal());
-		$reflection = new SimpleReflection('AnyOldLeafClassWithAFinal');
-		$this->assertTrue($reflection->hasFinal());
-	}
-
-	function testFindingParentClass() {
-		$reflection = new SimpleReflection('AnyOldSubclass');
-		$this->assertEqual($reflection->getParent(), 'AnyOldImplementation');
-	}
-
-	function testInterfaceExistence() {
-		$reflection = new SimpleReflection('AnyOldInterface');
-		$this->assertTrue($reflection->classOrInterfaceExists());
-		$this->assertTrue($reflection->classOrInterfaceExistsSansAutoload());
-		$this->assertTrue($reflection->isInterface());
-	}
-
-	function testMethodsListFromClass() {
-		$reflection = new SimpleReflection('AnyOldClass');
-		$this->assertIdentical($reflection->getMethods(), array('aMethod'));
-	}
-
-	function testMethodsListFromInterface() {
-		$reflection = new SimpleReflection('AnyOldInterface');
-		$this->assertIdentical($reflection->getMethods(), array('aMethod'));
-		$this->assertIdentical($reflection->getInterfaceMethods(), array('aMethod'));
-	}
-
-	function testMethodsComeFromDescendentInterfacesASWell() {
-		$reflection = new SimpleReflection('AnyDescendentInterface');
-		$this->assertIdentical($reflection->getMethods(), array('aMethod'));
-	}
-	
-	function testCanSeparateInterfaceMethodsFromOthers() {
-		$reflection = new SimpleReflection('AnyOldImplementation');
-		$this->assertIdentical($reflection->getMethods(), array('aMethod', 'extraMethod'));
-		$this->assertIdentical($reflection->getInterfaceMethods(), array('aMethod'));
-	}
-
-	function testMethodsComeFromDescendentInterfacesInAbstractClass() {
-		$reflection = new SimpleReflection('AnyAbstractImplementation');
-		$this->assertIdentical($reflection->getMethods(), array('aMethod'));
-	}
-
-	function testInterfaceHasOnlyItselfToImplement() {
-		$reflection = new SimpleReflection('AnyOldInterface');
-		$this->assertEqual(
-				$reflection->getInterfaces(),
-				array('AnyOldInterface'));
-	}
-
-	function testInterfacesListedForClass() {
-		$reflection = new SimpleReflection('AnyOldImplementation');
-		$this->assertEqual(
-				$reflection->getInterfaces(),
-				array('AnyOldInterface'));
-	}
-
-	function testInterfacesListedForSubclass() {
-		$reflection = new SimpleReflection('AnyOldSubclass');
-		$this->assertEqual(
-				$reflection->getInterfaces(),
-				array('AnyOldInterface'));
-	}
-
-	function testNoParameterCreationWhenNoInterface() {
-		$reflection = new SimpleReflection('AnyOldArgumentClass');
-		$function = $reflection->getSignature('aMethod');
-		if (version_compare(phpversion(), '5.0.2', '<=')) {
-			$this->assertEqual('function amethod($argument)', strtolower($function));
-		} else {
-			$this->assertEqual('function aMethod($argument)', $function);
-		}
-	}
-
-	function testParameterCreationWithoutTypeHinting() {
-		$reflection = new SimpleReflection('AnyOldArgumentImplementation');
-		$function = $reflection->getSignature('aMethod');
-		if (version_compare(phpversion(), '5.0.2', '<=')) {
-			$this->assertEqual('function amethod(AnyOldInterface $argument)', $function);
-		} else {
-			$this->assertEqual('function aMethod(AnyOldInterface $argument)', $function);
-		}
-	}
-
-	function testParameterCreationForTypeHinting() {
-		$reflection = new SimpleReflection('AnyOldTypeHintedClass');
-		$function = $reflection->getSignature('aMethod');
-		if (version_compare(phpversion(), '5.0.2', '<=')) {
-			$this->assertEqual('function amethod(AnyOldInterface $argument)', $function);
-		} else {
-			$this->assertEqual('function aMethod(AnyOldInterface $argument)', $function);
-		}
-	}
-
-	function testIssetFunctionSignature() {
-		$reflection = new SimpleReflection('AnyOldOverloadedClass');
-		$function = $reflection->getSignature('__isset');
-		$this->assertEqual('function __isset($key)', $function);
-	}
-	
-	function testUnsetFunctionSignature() {
-		$reflection = new SimpleReflection('AnyOldOverloadedClass');
-		$function = $reflection->getSignature('__unset');
-		$this->assertEqual('function __unset($key)', $function);
-	}
-
-	function testProperlyReflectsTheFinalInterfaceWhenObjectImplementsAnExtendedInterface() {
-		$reflection = new SimpleReflection('AnyDescendentImplementation');
-		$interfaces = $reflection->getInterfaces();
-		$this->assertEqual(1, count($interfaces));
-		$this->assertEqual('AnyDescendentInterface', array_shift($interfaces));
-	}
-	
-	function testCreatingSignatureForAbstractMethod() {
-	    $reflection = new SimpleReflection('AnotherOldAbstractClass');
-	    $this->assertEqual($reflection->getSignature('aMethod'), 'function aMethod(AnyOldInterface $argument)');
-	}
-	
-	function testCanProperlyGenerateStaticMethodSignatures() {
-		$reflection = new SimpleReflection('AnyOldClassWithStaticMethods');
-		$this->assertEqual('static function aStatic()', $reflection->getSignature('aStatic'));
-		$this->assertEqual(
-			'static function aStaticWithParameters($arg1, $arg2)',
-			$reflection->getSignature('aStaticWithParameters')
-		);
-	}
-}
-
-class TestOfReflectionWithTypeHints extends UnitTestCase {
-	function skip() {
-		$this->skipIf(version_compare(phpversion(), '5.1.0', '<'), 'Reflection with type hints only tested for PHP 5.1.0 and above');
-	}
-
-	function testParameterCreationForTypeHintingWithArray() {
-		eval('interface AnyOldArrayTypeHintedInterface {
-				  function amethod(array $argument);
-			  } 
-			  class AnyOldArrayTypeHintedClass implements AnyOldArrayTypeHintedInterface {
-				  function amethod(array $argument) {}
-			  }');
-		$reflection = new SimpleReflection('AnyOldArrayTypeHintedClass');
-		$function = $reflection->getSignature('amethod');
-		$this->assertEqual('function amethod(array $argument)', $function);
-	}
-}
-
-class TestOfAbstractsWithAbstractMethods extends UnitTestCase {
-    function testCanProperlyGenerateAbstractMethods() {
-        $reflection = new SimpleReflection('AnyOldAbstractClassWithAbstractMethods');
-        $this->assertEqual(
-            'function anAbstract()',
-            $reflection->getSignature('anAbstract')
-        );
-        $this->assertEqual(
-            'function anAbstractWithParameter($foo)',
-            $reflection->getSignature('anAbstractWithParameter')
-        );
-        $this->assertEqual(
-            'function anAbstractWithMultipleParameters($foo, $bar)',
-            $reflection->getSignature('anAbstractWithMultipleParameters')
-        );
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/remote_test.php b/3rdparty/simpletest/test/remote_test.php
deleted file mode 100755
index 5f3f96a4de9..00000000000
--- a/3rdparty/simpletest/test/remote_test.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-// $Id: remote_test.php 1759 2008-04-15 02:37:07Z edwardzyang $
-require_once('../remote.php');
-require_once('../reporter.php');
-
-// The following URL will depend on your own installation.
-if (isset($_SERVER['SCRIPT_URI'])) {
-    $base_uri = $_SERVER['SCRIPT_URI'];
-} elseif (isset($_SERVER['HTTP_HOST']) && isset($_SERVER['PHP_SELF'])) {
-    $base_uri = 'http://'. $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
-};
-$test_url = str_replace('remote_test.php', 'visual_test.php', $base_uri);
-
-$test = new TestSuite('Remote tests');
-$test->add(new RemoteTestCase($test_url . '?xml=yes', $test_url . '?xml=yes&dry=yes'));
-if (SimpleReporter::inCli()) {
-    exit ($test->run(new TextReporter()) ? 0 : 1);
-}
-$test->run(new HtmlReporter());
diff --git a/3rdparty/simpletest/test/shell_test.php b/3rdparty/simpletest/test/shell_test.php
deleted file mode 100755
index d1d769a6795..00000000000
--- a/3rdparty/simpletest/test/shell_test.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-// $Id: shell_test.php 1748 2008-04-14 01:50:41Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../shell_tester.php');
-
-class TestOfShell extends UnitTestCase {
-    
-    function testEcho() {
-        $shell = new SimpleShell();
-        $this->assertIdentical($shell->execute('echo Hello'), 0);
-        $this->assertPattern('/Hello/', $shell->getOutput());
-    }
-    
-    function testBadCommand() {
-        $shell = new SimpleShell();
-        $this->assertNotEqual($ret = $shell->execute('blurgh! 2>&1'), 0);
-    }
-}
-
-class TestOfShellTesterAndShell extends ShellTestCase {
-    
-    function testEcho() {
-        $this->assertTrue($this->execute('echo Hello'));
-        $this->assertExitCode(0);
-        $this->assertoutput('Hello');
-    }
-    
-    function testFileExistence() {
-        $this->assertFileExists(dirname(__FILE__) . '/all_tests.php');
-        $this->assertFileNotExists('wibble');
-    }
-    
-    function testFilePatterns() {
-        $this->assertFilePattern('/all[_ ]tests/i', dirname(__FILE__) . '/all_tests.php');
-        $this->assertNoFilePattern('/sputnik/i', dirname(__FILE__) . '/all_tests.php');
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/shell_tester_test.php b/3rdparty/simpletest/test/shell_tester_test.php
deleted file mode 100755
index b12c602a39f..00000000000
--- a/3rdparty/simpletest/test/shell_tester_test.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-// $Id: shell_tester_test.php 1787 2008-04-26 20:35:39Z pp11 $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../shell_tester.php');
-Mock::generate('SimpleShell');
-
-class TestOfShellTestCase extends ShellTestCase {
-    private $mock_shell = false;
-    
-    function getShell() {
-        return $this->mock_shell;
-    }
-    
-    function testGenericEquality() {
-        $this->assertEqual('a', 'a');
-        $this->assertNotEqual('a', 'A');
-    }
-    
-    function testExitCode() {
-        $this->mock_shell = new MockSimpleShell();
-        $this->mock_shell->setReturnValue('execute', 0);
-        $this->mock_shell->expectOnce('execute', array('ls'));
-        $this->assertTrue($this->execute('ls'));
-        $this->assertExitCode(0);
-    }
-    
-    function testOutput() {
-        $this->mock_shell = new MockSimpleShell();
-        $this->mock_shell->setReturnValue('execute', 0);
-        $this->mock_shell->setReturnValue('getOutput', "Line 1\nLine 2\n");
-        $this->assertOutput("Line 1\nLine 2\n");
-    }
-    
-    function testOutputPatterns() {
-        $this->mock_shell = new MockSimpleShell();
-        $this->mock_shell->setReturnValue('execute', 0);
-        $this->mock_shell->setReturnValue('getOutput', "Line 1\nLine 2\n");
-        $this->assertOutputPattern('/line/i');
-        $this->assertNoOutputPattern('/line 2/');
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/simpletest_test.php b/3rdparty/simpletest/test/simpletest_test.php
deleted file mode 100755
index daa65c6f472..00000000000
--- a/3rdparty/simpletest/test/simpletest_test.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-// $Id: simpletest_test.php 1748 2008-04-14 01:50:41Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../simpletest.php');
-
-SimpleTest::ignore('ShouldNeverBeRunEither');
-
-class ShouldNeverBeRun extends UnitTestCase {
-    function testWithNoChanceOfSuccess() {
-        $this->fail('Should be ignored');
-    }
-}
-
-class ShouldNeverBeRunEither extends ShouldNeverBeRun { }
-
-class TestOfStackTrace extends UnitTestCase {
-
-    function testCanFindAssertInTrace() {
-        $trace = new SimpleStackTrace(array('assert'));
-        $this->assertEqual(
-                $trace->traceMethod(array(array(
-                        'file' => '/my_test.php',
-                        'line' => 24,
-                        'function' => 'assertSomething'))),
-                ' at [/my_test.php line 24]');
-    }
-}
-
-class DummyResource { }
-
-class TestOfContext extends UnitTestCase {
-
-    function testCurrentContextIsUnique() {
-        $this->assertSame(
-                SimpleTest::getContext(),
-                SimpleTest::getContext());
-    }
-
-    function testContextHoldsCurrentTestCase() {
-        $context = SimpleTest::getContext();
-        $this->assertSame($this, $context->getTest());
-    }
-
-    function testResourceIsSingleInstanceWithContext() {
-        $context = new SimpleTestContext();
-        $this->assertSame(
-                $context->get('DummyResource'),
-                $context->get('DummyResource'));
-    }
-
-    function testClearingContextResetsResources() {
-        $context = new SimpleTestContext();
-        $resource = $context->get('DummyResource');
-        $context->clear();
-        $this->assertClone($resource, $context->get('DummyResource'));
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/site/file.html b/3rdparty/simpletest/test/site/file.html
deleted file mode 100755
index cc41aee1b8b..00000000000
--- a/3rdparty/simpletest/test/site/file.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-    <head><title>Link to SimpleTest</title></head>
-    <body>
-        <a href="http://simpletest.org/">Link to SimpleTest</a>
-    </body>
-</html>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/socket_test.php b/3rdparty/simpletest/test/socket_test.php
deleted file mode 100755
index 729adda4960..00000000000
--- a/3rdparty/simpletest/test/socket_test.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-// $Id: socket_test.php 1782 2008-04-25 17:09:06Z pp11 $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../socket.php');
-Mock::generate('SimpleSocket');
-
-class TestOfSimpleStickyError extends UnitTestCase {
-    
-    function testSettingError() {
-        $error = new SimpleStickyError();
-        $this->assertFalse($error->isError());
-        $error->setError('Ouch');
-        $this->assertTrue($error->isError());
-        $this->assertEqual($error->getError(), 'Ouch');
-    }
-    
-    function testClearingError() {
-        $error = new SimpleStickyError();
-        $error->setError('Ouch');
-        $this->assertTrue($error->isError());
-        $error->clearError();
-        $this->assertFalse($error->isError());
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/collector/collectable.1 b/3rdparty/simpletest/test/support/collector/collectable.1
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/3rdparty/simpletest/test/support/collector/collectable.2 b/3rdparty/simpletest/test/support/collector/collectable.2
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/3rdparty/simpletest/test/support/empty_test_file.php b/3rdparty/simpletest/test/support/empty_test_file.php
deleted file mode 100755
index 31e3f7bed62..00000000000
--- a/3rdparty/simpletest/test/support/empty_test_file.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../../autorun.php');
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/failing_test.php b/3rdparty/simpletest/test/support/failing_test.php
deleted file mode 100755
index 30f0d7507d9..00000000000
--- a/3rdparty/simpletest/test/support/failing_test.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../../autorun.php');
-
-class FailingTest extends UnitTestCase {
-    function test_fail() {
-        $this->assertEqual(1,2);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/latin1_sample b/3rdparty/simpletest/test/support/latin1_sample
deleted file mode 100755
index 19035257766..00000000000
--- a/3rdparty/simpletest/test/support/latin1_sample
+++ /dev/null
@@ -1 +0,0 @@
-£¹²³¼½¾@¶øþðßæ«»¢µ
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/passing_test.php b/3rdparty/simpletest/test/support/passing_test.php
deleted file mode 100755
index b7863216353..00000000000
--- a/3rdparty/simpletest/test/support/passing_test.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../../autorun.php');
-
-class PassingTest extends UnitTestCase {
-    function test_pass() {
-        $this->assertEqual(2,2);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/recorder_sample.php b/3rdparty/simpletest/test/support/recorder_sample.php
deleted file mode 100755
index 4f157f6b601..00000000000
--- a/3rdparty/simpletest/test/support/recorder_sample.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-// $Id: sample_test.php 1500 2007-04-29 14:33:31Z pp11 $
-require_once dirname(__FILE__) . '/../../autorun.php';
-
-class SampleTestForRecorder extends UnitTestCase {
-    function testTrueIsTrue() {
-        $this->assertTrue(true);
-    }
-
-    function testFalseIsTrue() {
-        $this->assertFalse(true);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/spl_examples.php b/3rdparty/simpletest/test/support/spl_examples.php
deleted file mode 100755
index 45add356c44..00000000000
--- a/3rdparty/simpletest/test/support/spl_examples.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-    // $Id: spl_examples.php 1262 2006-02-05 19:35:31Z lastcraft $
-
-    class IteratorImplementation implements Iterator {
-        function current() { }
-        function next() { }
-        function key() { }
-        function valid() { }
-        function rewind() { }
-    }
-
-    class IteratorAggregateImplementation implements IteratorAggregate {
-        function getIterator() { }
-    }
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/supplementary_upload_sample.txt b/3rdparty/simpletest/test/support/supplementary_upload_sample.txt
deleted file mode 100755
index d8aa9e81013..00000000000
--- a/3rdparty/simpletest/test/support/supplementary_upload_sample.txt
+++ /dev/null
@@ -1 +0,0 @@
-Some more text content
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/test1.php b/3rdparty/simpletest/test/support/test1.php
deleted file mode 100755
index b414586d642..00000000000
--- a/3rdparty/simpletest/test/support/test1.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-class test1 extends UnitTestCase {
-	function test_pass(){
-		$this->assertEqual(3,1+2, "pass1");
-	}
-}
-?>
diff --git a/3rdparty/simpletest/test/support/upload_sample.txt b/3rdparty/simpletest/test/support/upload_sample.txt
deleted file mode 100755
index ec98d7c5e3f..00000000000
--- a/3rdparty/simpletest/test/support/upload_sample.txt
+++ /dev/null
@@ -1 +0,0 @@
-Sample for testing file upload
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/tag_test.php b/3rdparty/simpletest/test/tag_test.php
deleted file mode 100755
index 5e8a377f089..00000000000
--- a/3rdparty/simpletest/test/tag_test.php
+++ /dev/null
@@ -1,554 +0,0 @@
-<?php
-// $Id: tag_test.php 1748 2008-04-14 01:50:41Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../tag.php');
-require_once(dirname(__FILE__) . '/../encoding.php');
-Mock::generate('SimpleMultipartEncoding');
-
-class TestOfTag extends UnitTestCase {
-    
-    function testStartValuesWithoutAdditionalContent() {
-        $tag = new SimpleTitleTag(array('a' => '1', 'b' => ''));
-        $this->assertEqual($tag->getTagName(), 'title');
-        $this->assertIdentical($tag->getAttribute('a'), '1');
-        $this->assertIdentical($tag->getAttribute('b'), '');
-        $this->assertIdentical($tag->getAttribute('c'), false);
-        $this->assertIdentical($tag->getContent(), '');
-    }
-    
-    function testTitleContent() {
-        $tag = new SimpleTitleTag(array());
-        $this->assertTrue($tag->expectEndTag());
-        $tag->addContent('Hello');
-        $tag->addContent('World');
-        $this->assertEqual($tag->getText(), 'HelloWorld');
-    }
-    
-    function testMessyTitleContent() {
-        $tag = new SimpleTitleTag(array());
-        $this->assertTrue($tag->expectEndTag());
-        $tag->addContent('<b>Hello</b>');
-        $tag->addContent('<em>World</em>');
-        $this->assertEqual($tag->getText(), 'HelloWorld');
-    }
-    
-    function testTagWithNoEnd() {
-        $tag = new SimpleTextTag(array());
-        $this->assertFalse($tag->expectEndTag());
-    }
-    
-    function testAnchorHref() {
-        $tag = new SimpleAnchorTag(array('href' => 'http://here/'));
-        $this->assertEqual($tag->getHref(), 'http://here/');
-        
-        $tag = new SimpleAnchorTag(array('href' => ''));
-        $this->assertIdentical($tag->getAttribute('href'), '');
-        $this->assertIdentical($tag->getHref(), '');
-        
-        $tag = new SimpleAnchorTag(array());
-        $this->assertIdentical($tag->getAttribute('href'), false);
-        $this->assertIdentical($tag->getHref(), '');
-    }
-    
-    function testIsIdMatchesIdAttribute() {
-        $tag = new SimpleAnchorTag(array('href' => 'http://here/', 'id' => 7));
-        $this->assertIdentical($tag->getAttribute('id'), '7');
-        $this->assertTrue($tag->isId(7));
-    }
-}
-
-class TestOfWidget extends UnitTestCase {
-    
-    function testTextEmptyDefault() {
-        $tag = new SimpleTextTag(array('type' => 'text'));
-        $this->assertIdentical($tag->getDefault(), '');
-        $this->assertIdentical($tag->getValue(), '');
-    }
-    
-    function testSettingOfExternalLabel() {
-        $tag = new SimpleTextTag(array('type' => 'text'));
-        $tag->setLabel('it');
-        $this->assertTrue($tag->isLabel('it'));
-    }
-    
-    function testTextDefault() {
-        $tag = new SimpleTextTag(array('value' => 'aaa'));
-        $this->assertEqual($tag->getDefault(), 'aaa');
-        $this->assertEqual($tag->getValue(), 'aaa');
-    }
-    
-    function testSettingTextValue() {
-        $tag = new SimpleTextTag(array('value' => 'aaa'));
-        $tag->setValue('bbb');
-        $this->assertEqual($tag->getValue(), 'bbb');
-        $tag->resetValue();
-        $this->assertEqual($tag->getValue(), 'aaa');
-    }
-    
-    function testFailToSetHiddenValue() {
-        $tag = new SimpleTextTag(array('value' => 'aaa', 'type' => 'hidden'));
-        $this->assertFalse($tag->setValue('bbb'));
-        $this->assertEqual($tag->getValue(), 'aaa');
-    }
-    
-    function testSubmitDefaults() {
-        $tag = new SimpleSubmitTag(array('type' => 'submit'));
-        $this->assertIdentical($tag->getName(), false);
-        $this->assertEqual($tag->getValue(), 'Submit');
-        $this->assertFalse($tag->setValue('Cannot set this'));
-        $this->assertEqual($tag->getValue(), 'Submit');
-        $this->assertEqual($tag->getLabel(), 'Submit');
-        
-        $encoding = new MockSimpleMultipartEncoding();
-        $encoding->expectNever('add');
-        $tag->write($encoding);
-    }
-    
-    function testPopulatedSubmit() {
-        $tag = new SimpleSubmitTag(
-                array('type' => 'submit', 'name' => 's', 'value' => 'Ok!'));
-        $this->assertEqual($tag->getName(), 's');
-        $this->assertEqual($tag->getValue(), 'Ok!');
-        $this->assertEqual($tag->getLabel(), 'Ok!');
-        
-        $encoding = new MockSimpleMultipartEncoding();
-        $encoding->expectOnce('add', array('s', 'Ok!'));
-        $tag->write($encoding);
-    }
-    
-    function testImageSubmit() {
-        $tag = new SimpleImageSubmitTag(
-                array('type' => 'image', 'name' => 's', 'alt' => 'Label'));
-        $this->assertEqual($tag->getName(), 's');
-        $this->assertEqual($tag->getLabel(), 'Label');
-        
-        $encoding = new MockSimpleMultipartEncoding();
-        $encoding->expectAt(0, 'add', array('s.x', 20));
-        $encoding->expectAt(1, 'add', array('s.y', 30));
-        $tag->write($encoding, 20, 30);
-    }
-    
-    function testImageSubmitTitlePreferredOverAltForLabel() {
-        $tag = new SimpleImageSubmitTag(
-                array('type' => 'image', 'name' => 's', 'alt' => 'Label', 'title' => 'Title'));
-        $this->assertEqual($tag->getLabel(), 'Title');
-    }
-    
-    function testButton() {
-        $tag = new SimpleButtonTag(
-                array('type' => 'submit', 'name' => 's', 'value' => 'do'));
-        $tag->addContent('I am a button');
-        $this->assertEqual($tag->getName(), 's');
-        $this->assertEqual($tag->getValue(), 'do');
-        $this->assertEqual($tag->getLabel(), 'I am a button');
-
-        $encoding = new MockSimpleMultipartEncoding();
-        $encoding->expectOnce('add', array('s', 'do'));
-        $tag->write($encoding);
-    }
-}
-
-class TestOfTextArea extends UnitTestCase {
-    
-    function testDefault() {
-        $tag = new SimpleTextAreaTag(array('name' => 'a'));
-        $tag->addContent('Some text');
-        $this->assertEqual($tag->getName(), 'a');
-        $this->assertEqual($tag->getDefault(), 'Some text');
-    }
-    
-    function testWrapping() {
-        $tag = new SimpleTextAreaTag(array('cols' => '10', 'wrap' => 'physical'));
-        $tag->addContent("Lot's of text that should be wrapped");
-        $this->assertEqual(
-                $tag->getDefault(),
-                "Lot's of\r\ntext that\r\nshould be\r\nwrapped");
-        $tag->setValue("New long text\r\nwith two lines");
-        $this->assertEqual(
-                $tag->getValue(),
-                "New long\r\ntext\r\nwith two\r\nlines");
-    }
-    
-    function testWrappingRemovesLeadingcariageReturn() {
-        $tag = new SimpleTextAreaTag(array('cols' => '20', 'wrap' => 'physical'));
-        $tag->addContent("\rStuff");
-        $this->assertEqual($tag->getDefault(), 'Stuff');
-        $tag->setValue("\nNew stuff\n");
-        $this->assertEqual($tag->getValue(), "New stuff\r\n");
-    }
-    
-    function testBreaksAreNewlineAndCarriageReturn() {
-        $tag = new SimpleTextAreaTag(array('cols' => '10'));
-        $tag->addContent("Some\nText\rwith\r\nbreaks");
-        $this->assertEqual($tag->getValue(), "Some\r\nText\r\nwith\r\nbreaks");
-    }
-}
-
-class TestOfCheckbox extends UnitTestCase {
-    
-    function testCanSetCheckboxToNamedValueWithBooleanTrue() {
-        $tag = new SimpleCheckboxTag(array('name' => 'a', 'value' => 'A'));
-        $this->assertEqual($tag->getValue(), false);
-        $tag->setValue(true);
-        $this->assertIdentical($tag->getValue(), 'A');
-    }
-}
-
-class TestOfSelection extends UnitTestCase {
-    
-    function testEmpty() {
-        $tag = new SimpleSelectionTag(array('name' => 'a'));
-        $this->assertIdentical($tag->getValue(), '');
-    }
-    
-    function testSingle() {
-        $tag = new SimpleSelectionTag(array('name' => 'a'));
-        $option = new SimpleOptionTag(array());
-        $option->addContent('AAA');
-        $tag->addTag($option);
-        $this->assertEqual($tag->getValue(), 'AAA');
-    }
-    
-    function testSingleDefault() {
-        $tag = new SimpleSelectionTag(array('name' => 'a'));
-        $option = new SimpleOptionTag(array('selected' => ''));
-        $option->addContent('AAA');
-        $tag->addTag($option);
-        $this->assertEqual($tag->getValue(), 'AAA');
-    }
-    
-    function testSingleMappedDefault() {
-        $tag = new SimpleSelectionTag(array('name' => 'a'));
-        $option = new SimpleOptionTag(array('selected' => '', 'value' => 'aaa'));
-        $option->addContent('AAA');
-        $tag->addTag($option);
-        $this->assertEqual($tag->getValue(), 'aaa');
-    }
-    
-    function testStartsWithDefault() {
-        $tag = new SimpleSelectionTag(array('name' => 'a'));
-        $a = new SimpleOptionTag(array());
-        $a->addContent('AAA');
-        $tag->addTag($a);
-        $b = new SimpleOptionTag(array('selected' => ''));
-        $b->addContent('BBB');
-        $tag->addTag($b);
-        $c = new SimpleOptionTag(array());
-        $c->addContent('CCC');
-        $tag->addTag($c);
-        $this->assertEqual($tag->getValue(), 'BBB');
-    }
-    
-    function testSettingOption() {
-        $tag = new SimpleSelectionTag(array('name' => 'a'));
-        $a = new SimpleOptionTag(array());
-        $a->addContent('AAA');
-        $tag->addTag($a);
-        $b = new SimpleOptionTag(array('selected' => ''));
-        $b->addContent('BBB');
-        $tag->addTag($b);
-        $c = new SimpleOptionTag(array());
-        $c->addContent('CCC');
-        $tag->setValue('AAA');
-        $this->assertEqual($tag->getValue(), 'AAA');
-    }
-    
-    function testSettingMappedOption() {
-        $tag = new SimpleSelectionTag(array('name' => 'a'));
-        $a = new SimpleOptionTag(array('value' => 'aaa'));
-        $a->addContent('AAA');
-        $tag->addTag($a);
-        $b = new SimpleOptionTag(array('value' => 'bbb', 'selected' => ''));
-        $b->addContent('BBB');
-        $tag->addTag($b);
-        $c = new SimpleOptionTag(array('value' => 'ccc'));
-        $c->addContent('CCC');
-        $tag->addTag($c);
-        $tag->setValue('AAA');
-        $this->assertEqual($tag->getValue(), 'aaa');
-        $tag->setValue('ccc');
-        $this->assertEqual($tag->getValue(), 'ccc');
-    }
-    
-    function testSelectionDespiteSpuriousWhitespace() {
-        $tag = new SimpleSelectionTag(array('name' => 'a'));
-        $a = new SimpleOptionTag(array());
-        $a->addContent(' AAA ');
-        $tag->addTag($a);
-        $b = new SimpleOptionTag(array('selected' => ''));
-        $b->addContent(' BBB ');
-        $tag->addTag($b);
-        $c = new SimpleOptionTag(array());
-        $c->addContent(' CCC ');
-        $tag->addTag($c);
-        $this->assertEqual($tag->getValue(), ' BBB ');
-        $tag->setValue('AAA');
-        $this->assertEqual($tag->getValue(), ' AAA ');
-    }
-    
-    function testFailToSetIllegalOption() {
-        $tag = new SimpleSelectionTag(array('name' => 'a'));
-        $a = new SimpleOptionTag(array());
-        $a->addContent('AAA');
-        $tag->addTag($a);
-        $b = new SimpleOptionTag(array('selected' => ''));
-        $b->addContent('BBB');
-        $tag->addTag($b);
-        $c = new SimpleOptionTag(array());
-        $c->addContent('CCC');
-        $tag->addTag($c);
-        $this->assertFalse($tag->setValue('Not present'));
-        $this->assertEqual($tag->getValue(), 'BBB');
-    }
-    
-    function testNastyOptionValuesThatLookLikeFalse() {
-        $tag = new SimpleSelectionTag(array('name' => 'a'));
-        $a = new SimpleOptionTag(array('value' => '1'));
-        $a->addContent('One');
-        $tag->addTag($a);
-        $b = new SimpleOptionTag(array('value' => '0'));
-        $b->addContent('Zero');
-        $tag->addTag($b);
-        $this->assertIdentical($tag->getValue(), '1');
-        $tag->setValue('Zero');
-        $this->assertIdentical($tag->getValue(), '0');
-    }
-    
-    function testBlankOption() {
-        $tag = new SimpleSelectionTag(array('name' => 'A'));
-        $a = new SimpleOptionTag(array());
-        $tag->addTag($a);
-        $b = new SimpleOptionTag(array());
-        $b->addContent('b');
-        $tag->addTag($b);
-        $this->assertIdentical($tag->getValue(), '');
-        $tag->setValue('b');
-        $this->assertIdentical($tag->getValue(), 'b');
-        $tag->setValue('');
-        $this->assertIdentical($tag->getValue(), '');
-    }
-    
-    function testMultipleDefaultWithNoSelections() {
-        $tag = new MultipleSelectionTag(array('name' => 'a', 'multiple' => ''));
-        $a = new SimpleOptionTag(array());
-        $a->addContent('AAA');
-        $tag->addTag($a);
-        $b = new SimpleOptionTag(array());
-        $b->addContent('BBB');
-        $tag->addTag($b);
-        $this->assertIdentical($tag->getDefault(), array());
-        $this->assertIdentical($tag->getValue(), array());
-    }
-    
-    function testMultipleDefaultWithSelections() {
-        $tag = new MultipleSelectionTag(array('name' => 'a', 'multiple' => ''));
-        $a = new SimpleOptionTag(array('selected' => ''));
-        $a->addContent('AAA');
-        $tag->addTag($a);
-        $b = new SimpleOptionTag(array('selected' => ''));
-        $b->addContent('BBB');
-        $tag->addTag($b);
-        $this->assertIdentical($tag->getDefault(), array('AAA', 'BBB'));
-        $this->assertIdentical($tag->getValue(), array('AAA', 'BBB'));
-    }
-    
-    function testSettingMultiple() {
-        $tag = new MultipleSelectionTag(array('name' => 'a', 'multiple' => ''));
-        $a = new SimpleOptionTag(array('selected' => ''));
-        $a->addContent('AAA');
-        $tag->addTag($a);
-        $b = new SimpleOptionTag(array());
-        $b->addContent('BBB');
-        $tag->addTag($b);
-        $c = new SimpleOptionTag(array('selected' => '', 'value' => 'ccc'));
-        $c->addContent('CCC');
-        $tag->addTag($c);
-        $this->assertIdentical($tag->getDefault(), array('AAA', 'ccc'));
-        $this->assertTrue($tag->setValue(array('BBB', 'ccc')));
-        $this->assertIdentical($tag->getValue(), array('BBB', 'ccc'));
-        $this->assertTrue($tag->setValue(array()));
-        $this->assertIdentical($tag->getValue(), array());
-    }
-    
-    function testFailToSetIllegalOptionsInMultiple() {
-        $tag = new MultipleSelectionTag(array('name' => 'a', 'multiple' => ''));
-        $a = new SimpleOptionTag(array('selected' => ''));
-        $a->addContent('AAA');
-        $tag->addTag($a);
-        $b = new SimpleOptionTag(array());
-        $b->addContent('BBB');
-        $tag->addTag($b);
-        $this->assertFalse($tag->setValue(array('CCC')));
-        $this->assertTrue($tag->setValue(array('AAA', 'BBB')));
-        $this->assertFalse($tag->setValue(array('AAA', 'CCC')));
-    }
-}
-
-class TestOfRadioGroup extends UnitTestCase {
-    
-    function testEmptyGroup() {
-        $group = new SimpleRadioGroup();
-        $this->assertIdentical($group->getDefault(), false);
-        $this->assertIdentical($group->getValue(), false);
-        $this->assertFalse($group->setValue('a'));
-    }
-    
-    function testReadingSingleButtonGroup() {
-        $group = new SimpleRadioGroup();
-        $group->addWidget(new SimpleRadioButtonTag(
-                array('value' => 'A', 'checked' => '')));
-        $this->assertIdentical($group->getDefault(), 'A');
-        $this->assertIdentical($group->getValue(), 'A');
-    }
-    
-    function testReadingMultipleButtonGroup() {
-        $group = new SimpleRadioGroup();
-        $group->addWidget(new SimpleRadioButtonTag(
-                array('value' => 'A')));
-        $group->addWidget(new SimpleRadioButtonTag(
-                array('value' => 'B', 'checked' => '')));
-        $this->assertIdentical($group->getDefault(), 'B');
-        $this->assertIdentical($group->getValue(), 'B');
-    }
-    
-    function testFailToSetUnlistedValue() {
-        $group = new SimpleRadioGroup();
-        $group->addWidget(new SimpleRadioButtonTag(array('value' => 'z')));
-        $this->assertFalse($group->setValue('a'));
-        $this->assertIdentical($group->getValue(), false);
-    }
-    
-    function testSettingNewValueClearsTheOldOne() {
-        $group = new SimpleRadioGroup();
-        $group->addWidget(new SimpleRadioButtonTag(
-                array('value' => 'A')));
-        $group->addWidget(new SimpleRadioButtonTag(
-                array('value' => 'B', 'checked' => '')));
-        $this->assertTrue($group->setValue('A'));
-        $this->assertIdentical($group->getValue(), 'A');
-    }
-    
-    function testIsIdMatchesAnyWidgetInSet() {
-        $group = new SimpleRadioGroup();
-        $group->addWidget(new SimpleRadioButtonTag(
-                array('value' => 'A', 'id' => 'i1')));
-        $group->addWidget(new SimpleRadioButtonTag(
-                array('value' => 'B', 'id' => 'i2')));
-        $this->assertFalse($group->isId('i0'));
-        $this->assertTrue($group->isId('i1'));
-        $this->assertTrue($group->isId('i2'));
-    }
-    
-    function testIsLabelMatchesAnyWidgetInSet() {
-        $group = new SimpleRadioGroup();
-        $button1 = new SimpleRadioButtonTag(array('value' => 'A'));
-        $button1->setLabel('one');
-        $group->addWidget($button1);
-        $button2 = new SimpleRadioButtonTag(array('value' => 'B'));
-        $button2->setLabel('two');
-        $group->addWidget($button2);
-        $this->assertFalse($group->isLabel('three'));
-        $this->assertTrue($group->isLabel('one'));
-        $this->assertTrue($group->isLabel('two'));
-    }
-}
-
-class TestOfTagGroup extends UnitTestCase {
-    
-    function testReadingMultipleCheckboxGroup() {
-        $group = new SimpleCheckboxGroup();
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
-        $group->addWidget(new SimpleCheckboxTag(
-                array('value' => 'B', 'checked' => '')));
-        $this->assertIdentical($group->getDefault(), 'B');
-        $this->assertIdentical($group->getValue(), 'B');
-    }
-    
-    function testReadingMultipleUncheckedItems() {
-        $group = new SimpleCheckboxGroup();
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'B')));            
-        $this->assertIdentical($group->getDefault(), false);
-        $this->assertIdentical($group->getValue(), false);
-    }
-    
-    function testReadingMultipleCheckedItems() {
-        $group = new SimpleCheckboxGroup();
-        $group->addWidget(new SimpleCheckboxTag(
-                array('value' => 'A', 'checked' => '')));
-        $group->addWidget(new SimpleCheckboxTag(
-                array('value' => 'B', 'checked' => '')));
-        $this->assertIdentical($group->getDefault(), array('A', 'B'));
-        $this->assertIdentical($group->getValue(), array('A', 'B'));
-    }
-    
-    function testSettingSingleValue() {
-        $group = new SimpleCheckboxGroup();
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'B')));
-        $this->assertTrue($group->setValue('A'));
-        $this->assertIdentical($group->getValue(), 'A');
-        $this->assertTrue($group->setValue('B'));
-        $this->assertIdentical($group->getValue(), 'B');
-    }
-    
-    function testSettingMultipleValues() {
-        $group = new SimpleCheckboxGroup();
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'B')));
-        $this->assertTrue($group->setValue(array('A', 'B')));
-        $this->assertIdentical($group->getValue(), array('A', 'B'));
-    }
-    
-    function testSettingNoValue() {
-        $group = new SimpleCheckboxGroup();
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'B')));
-        $this->assertTrue($group->setValue(false));
-        $this->assertIdentical($group->getValue(), false);
-    }
-    
-    function testIsIdMatchesAnyIdInSet() {
-        $group = new SimpleCheckboxGroup();
-        $group->addWidget(new SimpleCheckboxTag(array('id' => 1, 'value' => 'A')));
-        $group->addWidget(new SimpleCheckboxTag(array('id' => 2, 'value' => 'B')));
-        $this->assertFalse($group->isId(0));
-        $this->assertTrue($group->isId(1));
-        $this->assertTrue($group->isId(2));
-    }
-}
-
-class TestOfUploadWidget extends UnitTestCase {
-    
-    function testValueIsFilePath() {
-        $upload = new SimpleUploadTag(array('name' => 'a'));
-        $upload->setValue(dirname(__FILE__) . '/support/upload_sample.txt');
-        $this->assertEqual($upload->getValue(), dirname(__FILE__) . '/support/upload_sample.txt');
-    }
-    
-    function testSubmitsFileContents() {
-        $encoding = new MockSimpleMultipartEncoding();
-        $encoding->expectOnce('attach', array(
-                'a',
-                'Sample for testing file upload',
-                'upload_sample.txt'));
-        $upload = new SimpleUploadTag(array('name' => 'a'));
-        $upload->setValue(dirname(__FILE__) . '/support/upload_sample.txt');
-        $upload->write($encoding);
-    }
-}
-
-class TestOfLabelTag extends UnitTestCase {
-    
-    function testLabelShouldHaveAnEndTag() {
-        $label = new SimpleLabelTag(array());
-        $this->assertTrue($label->expectEndTag());
-    }
-    
-    function testContentIsTextOnly() {
-        $label = new SimpleLabelTag(array());
-        $label->addContent('Here <tag>are</tag> words');
-        $this->assertEqual($label->getText(), 'Here are words');
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/test_with_parse_error.php b/3rdparty/simpletest/test/test_with_parse_error.php
deleted file mode 100755
index 41a5832a5cb..00000000000
--- a/3rdparty/simpletest/test/test_with_parse_error.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-    // $Id: test_with_parse_error.php 901 2005-01-24 00:32:14Z lastcraft $
-    
-    class TestCaseWithParseError extends UnitTestCase {
-        wibble
-    }
-    
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/unit_tester_test.php b/3rdparty/simpletest/test/unit_tester_test.php
deleted file mode 100755
index ce9850f09ab..00000000000
--- a/3rdparty/simpletest/test/unit_tester_test.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-// $Id: unit_tester_test.php 1748 2008-04-14 01:50:41Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-
-class ReferenceForTesting {
-}
-
-class TestOfUnitTester extends UnitTestCase {
-    
-    function testAssertTrueReturnsAssertionAsBoolean() {
-        $this->assertTrue($this->assertTrue(true));
-    }
-    
-    function testAssertFalseReturnsAssertionAsBoolean() {
-        $this->assertTrue($this->assertFalse(false));
-    }
-    
-    function testAssertEqualReturnsAssertionAsBoolean() {
-        $this->assertTrue($this->assertEqual(5, 5));
-    }
-    
-    function testAssertIdenticalReturnsAssertionAsBoolean() {
-        $this->assertTrue($this->assertIdentical(5, 5));
-    }
-    
-    function testCoreAssertionsDoNotThrowErrors() {
-        $this->assertIsA($this, 'UnitTestCase');
-        $this->assertNotA($this, 'WebTestCase');
-    }
-    
-    function testReferenceAssertionOnObjects() {
-        $a = new ReferenceForTesting();
-        $b = $a;
-        $this->assertSame($a, $b);
-    }
-    
-    function testReferenceAssertionOnScalars() {
-        $a = 25;
-        $b = &$a;
-        $this->assertReference($a, $b);
-    }
-    
-    function testCloneOnObjects() {
-        $a = new ReferenceForTesting();
-        $b = new ReferenceForTesting();
-        $this->assertClone($a, $b);
-    }
-
-    function TODO_testCloneOnScalars() {
-        $a = 25;
-        $b = 25;
-        $this->assertClone($a, $b);
-    }
-
-    function testCopyOnScalars() {
-        $a = 25;
-        $b = 25;
-        $this->assertCopy($a, $b);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/unit_tests.php b/3rdparty/simpletest/test/unit_tests.php
deleted file mode 100755
index 9e621293f9e..00000000000
--- a/3rdparty/simpletest/test/unit_tests.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-// $Id: unit_tests.php 1986 2010-04-02 10:02:42Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../unit_tester.php');
-require_once(dirname(__FILE__) . '/../shell_tester.php');
-require_once(dirname(__FILE__) . '/../mock_objects.php');
-require_once(dirname(__FILE__) . '/../web_tester.php');
-require_once(dirname(__FILE__) . '/../extensions/pear_test_case.php');
-
-class UnitTests extends TestSuite {
-    function UnitTests() {
-        $this->TestSuite('Unit tests');
-        $path = dirname(__FILE__);
-        $this->addFile($path . '/errors_test.php');
-        $this->addFile($path . '/exceptions_test.php');
-        $this->addFile($path . '/arguments_test.php');
-        $this->addFile($path . '/autorun_test.php');
-        $this->addFile($path . '/compatibility_test.php');
-        $this->addFile($path . '/simpletest_test.php');
-        $this->addFile($path . '/dumper_test.php');
-        $this->addFile($path . '/expectation_test.php');
-        $this->addFile($path . '/unit_tester_test.php');
-        $this->addFile($path . '/reflection_php5_test.php');
-        $this->addFile($path . '/mock_objects_test.php');
-        $this->addFile($path . '/interfaces_test.php');
-        $this->addFile($path . '/collector_test.php');
-        $this->addFile($path . '/recorder_test.php');
-        $this->addFile($path . '/adapter_test.php');
-        $this->addFile($path . '/socket_test.php');
-        $this->addFile($path . '/encoding_test.php');
-        $this->addFile($path . '/url_test.php');
-        $this->addFile($path . '/cookies_test.php');
-        $this->addFile($path . '/http_test.php');
-        $this->addFile($path . '/authentication_test.php');
-        $this->addFile($path . '/user_agent_test.php');
-        $this->addFile($path . '/php_parser_test.php');
-        $this->addFile($path . '/parsing_test.php');
-        $this->addFile($path . '/tag_test.php');
-        $this->addFile($path . '/form_test.php');
-        $this->addFile($path . '/page_test.php');
-        $this->addFile($path . '/frames_test.php');
-        $this->addFile($path . '/browser_test.php');
-        $this->addFile($path . '/web_tester_test.php');
-        $this->addFile($path . '/shell_tester_test.php');
-        $this->addFile($path . '/xml_test.php');
-        $this->addFile($path . '/../extensions/testdox/test.php');
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/url_test.php b/3rdparty/simpletest/test/url_test.php
deleted file mode 100755
index 80119afbdde..00000000000
--- a/3rdparty/simpletest/test/url_test.php
+++ /dev/null
@@ -1,515 +0,0 @@
-<?php
-// $Id: url_test.php 1998 2010-07-27 09:55:55Z pp11 $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../url.php');
-
-class TestOfUrl extends UnitTestCase {
-    
-    function testDefaultUrl() {
-        $url = new SimpleUrl('');
-        $this->assertEqual($url->getScheme(), '');
-        $this->assertEqual($url->getHost(), '');
-        $this->assertEqual($url->getScheme('http'), 'http');
-        $this->assertEqual($url->getHost('localhost'), 'localhost');
-        $this->assertEqual($url->getPath(), '');
-    }
-    
-    function testBasicParsing() {
-        $url = new SimpleUrl('https://www.lastcraft.com/test/');
-        $this->assertEqual($url->getScheme(), 'https');
-        $this->assertEqual($url->getHost(), 'www.lastcraft.com');
-        $this->assertEqual($url->getPath(), '/test/');
-    }
-    
-    function testRelativeUrls() {
-        $url = new SimpleUrl('../somewhere.php');
-        $this->assertEqual($url->getScheme(), false);
-        $this->assertEqual($url->getHost(), false);
-        $this->assertEqual($url->getPath(), '../somewhere.php');
-    }
-    
-    function testParseBareParameter() {
-        $url = new SimpleUrl('?a');
-        $this->assertEqual($url->getPath(), '');
-        $this->assertEqual($url->getEncodedRequest(), '?a');
-        $url->addRequestParameter('x', 'X');
-        $this->assertEqual($url->getEncodedRequest(), '?a=&x=X');
-    }
-    
-    function testParseEmptyParameter() {
-        $url = new SimpleUrl('?a=');
-        $this->assertEqual($url->getPath(), '');
-        $this->assertEqual($url->getEncodedRequest(), '?a=');
-        $url->addRequestParameter('x', 'X');
-        $this->assertEqual($url->getEncodedRequest(), '?a=&x=X');
-    }
-    
-    function testParseParameterPair() {
-        $url = new SimpleUrl('?a=A');
-        $this->assertEqual($url->getPath(), '');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A');
-        $url->addRequestParameter('x', 'X');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&x=X');
-    }
-    
-    function testParseMultipleParameters() {
-        $url = new SimpleUrl('?a=A&b=B');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=B');
-        $url->addRequestParameter('x', 'X');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=B&x=X');
-    }
-    
-    function testParsingParameterMixture() {
-        $url = new SimpleUrl('?a=A&b=&c');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=&c');
-        $url->addRequestParameter('x', 'X');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=&c=&x=X');
-    }
-    
-    function testAddParametersFromScratch() {
-        $url = new SimpleUrl('');
-        $url->addRequestParameter('a', 'A');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A');
-        $url->addRequestParameter('b', 'B');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=B');
-        $url->addRequestParameter('a', 'aaa');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=B&a=aaa');
-    }
-    
-    function testClearingParameters() {
-        $url = new SimpleUrl('');
-        $url->addRequestParameter('a', 'A');
-        $url->clearRequest();
-        $this->assertIdentical($url->getEncodedRequest(), '');
-    }
-    
-    function testEncodingParameters() {
-        $url = new SimpleUrl('');
-        $url->addRequestParameter('a', '?!"\'#~@[]{}:;<>,./|$%^&*()_+-=');
-        $this->assertIdentical(
-                $request = $url->getEncodedRequest(),
-                '?a=%3F%21%22%27%23%7E%40%5B%5D%7B%7D%3A%3B%3C%3E%2C.%2F%7C%24%25%5E%26%2A%28%29_%2B-%3D');
-    }
-    
-    function testDecodingParameters() {            
-        $url = new SimpleUrl('?a=%3F%21%22%27%23%7E%40%5B%5D%7B%7D%3A%3B%3C%3E%2C.%2F%7C%24%25%5E%26%2A%28%29_%2B-%3D');
-        $this->assertEqual(
-                $url->getEncodedRequest(),
-                '?a=' . urlencode('?!"\'#~@[]{}:;<>,./|$%^&*()_+-='));
-    }
-    
-    function testUrlInQueryDoesNotConfuseParsing() {
-        $url = new SimpleUrl('wibble/login.php?url=http://www.google.com/moo/');
-        $this->assertFalse($url->getScheme());
-        $this->assertFalse($url->getHost());
-        $this->assertEqual($url->getPath(), 'wibble/login.php');
-        $this->assertEqual($url->getEncodedRequest(), '?url=http://www.google.com/moo/');
-    }
-    
-    function testSettingCordinates() {
-        $url = new SimpleUrl('');
-        $url->setCoordinates('32', '45');
-        $this->assertIdentical($url->getX(), 32);
-        $this->assertIdentical($url->getY(), 45);
-        $this->assertEqual($url->getEncodedRequest(), '');
-    }
-    
-    function testParseCordinates() {
-        $url = new SimpleUrl('?32,45');
-        $this->assertIdentical($url->getX(), 32);
-        $this->assertIdentical($url->getY(), 45);
-    }
-    
-    function testClearingCordinates() {
-        $url = new SimpleUrl('?32,45');
-        $url->setCoordinates();
-        $this->assertIdentical($url->getX(), false);
-        $this->assertIdentical($url->getY(), false);
-    }
-    
-    function testParsingParameterCordinateMixture() {
-        $url = new SimpleUrl('?a=A&b=&c?32,45');
-        $this->assertIdentical($url->getX(), 32);
-        $this->assertIdentical($url->getY(), 45);
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=&c');
-    }
-    
-    function testParsingParameterWithBadCordinates() {
-        $url = new SimpleUrl('?a=A&b=&c?32');
-        $this->assertIdentical($url->getX(), false);
-        $this->assertIdentical($url->getY(), false);
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=&c?32');
-    }
-    
-    function testPageSplitting() {
-        $url = new SimpleUrl('./here/../there/somewhere.php');
-        $this->assertEqual($url->getPath(), './here/../there/somewhere.php');
-        $this->assertEqual($url->getPage(), 'somewhere.php');
-        $this->assertEqual($url->getBasePath(), './here/../there/');
-    }
-    
-    function testAbsolutePathPageSplitting() {
-        $url = new SimpleUrl("http://host.com/here/there/somewhere.php");
-        $this->assertEqual($url->getPath(), "/here/there/somewhere.php");
-        $this->assertEqual($url->getPage(), "somewhere.php");
-        $this->assertEqual($url->getBasePath(), "/here/there/");
-    }
-    
-    function testSplittingUrlWithNoPageGivesEmptyPage() {
-        $url = new SimpleUrl('/here/there/');
-        $this->assertEqual($url->getPath(), '/here/there/');
-        $this->assertEqual($url->getPage(), '');
-        $this->assertEqual($url->getBasePath(), '/here/there/');
-    }
-    
-    function testPathNormalisation() {
-        $url = new SimpleUrl();
-        $this->assertEqual(
-                $url->normalisePath('https://host.com/I/am/here/../there/somewhere.php'),
-                'https://host.com/I/am/there/somewhere.php');
-    }
-
-    // regression test for #1535407
-    function testPathNormalisationWithSinglePeriod() {
-        $url = new SimpleUrl();
-        $this->assertEqual(
-            $url->normalisePath('https://host.com/I/am/here/./../there/somewhere.php'),
-            'https://host.com/I/am/there/somewhere.php');
-    }
-    
-    // regression test for #1852413
-    function testHostnameExtractedFromUContainingAtSign() {
-        $url = new SimpleUrl("http://localhost/name@example.com");
-        $this->assertEqual($url->getScheme(), "http");
-        $this->assertEqual($url->getUsername(), "");
-        $this->assertEqual($url->getPassword(), "");
-        $this->assertEqual($url->getHost(), "localhost");
-        $this->assertEqual($url->getPath(), "/name@example.com");
-    }
-
-    function testHostnameInLocalhost() {
-        $url = new SimpleUrl("http://localhost/name/example.com");
-        $this->assertEqual($url->getScheme(), "http");
-        $this->assertEqual($url->getUsername(), "");
-        $this->assertEqual($url->getPassword(), "");
-        $this->assertEqual($url->getHost(), "localhost");
-        $this->assertEqual($url->getPath(), "/name/example.com");
-    }
-
-    function testUsernameAndPasswordAreUrlDecoded() {
-        $url = new SimpleUrl('http://' . urlencode('test@test') .
-                ':' . urlencode('$!�@*&%') . '@www.lastcraft.com');
-        $this->assertEqual($url->getUsername(), 'test@test');
-        $this->assertEqual($url->getPassword(), '$!�@*&%');
-    }
-    
-    function testBlitz() {
-        $this->assertUrl(
-                "https://username:password@www.somewhere.com:243/this/that/here.php?a=1&b=2#anchor",
-                array("https", "username", "password", "www.somewhere.com", 243, "/this/that/here.php", "com", "?a=1&b=2", "anchor"),
-                array("a" => "1", "b" => "2"));
-        $this->assertUrl(
-                "username:password@www.somewhere.com/this/that/here.php?a=1",
-                array(false, "username", "password", "www.somewhere.com", false, "/this/that/here.php", "com", "?a=1", false),
-                array("a" => "1"));
-        $this->assertUrl(
-                "username:password@somewhere.com:243?1,2",
-                array(false, "username", "password", "somewhere.com", 243, "/", "com", "", false),
-                array(),
-                array(1, 2));
-        $this->assertUrl(
-                "https://www.somewhere.com",
-                array("https", false, false, "www.somewhere.com", false, "/", "com", "", false));
-        $this->assertUrl(
-                "username@www.somewhere.com:243#anchor",
-                array(false, "username", false, "www.somewhere.com", 243, "/", "com", "", "anchor"));
-        $this->assertUrl(
-                "/this/that/here.php?a=1&b=2?3,4",
-                array(false, false, false, false, false, "/this/that/here.php", false, "?a=1&b=2", false),
-                array("a" => "1", "b" => "2"),
-                array(3, 4));
-        $this->assertUrl(
-                "username@/here.php?a=1&b=2",
-                array(false, "username", false, false, false, "/here.php", false, "?a=1&b=2", false),
-                array("a" => "1", "b" => "2"));
-    }
-    
-    function testAmbiguousHosts() {
-        $this->assertUrl(
-                "tigger",
-                array(false, false, false, false, false, "tigger", false, "", false));
-        $this->assertUrl(
-                "/tigger",
-                array(false, false, false, false, false, "/tigger", false, "", false));
-        $this->assertUrl(
-                "//tigger",
-                array(false, false, false, "tigger", false, "/", false, "", false));
-        $this->assertUrl(
-                "//tigger/",
-                array(false, false, false, "tigger", false, "/", false, "", false));
-        $this->assertUrl(
-                "tigger.com",
-                array(false, false, false, "tigger.com", false, "/", "com", "", false));
-        $this->assertUrl(
-                "me.net/tigger",
-                array(false, false, false, "me.net", false, "/tigger", "net", "", false));
-    }
-    
-    function testAsString() {
-        $this->assertPreserved('https://www.here.com');
-        $this->assertPreserved('http://me:secret@www.here.com');
-        $this->assertPreserved('http://here/there');
-        $this->assertPreserved('http://here/there?a=A&b=B');
-        $this->assertPreserved('http://here/there?a=1&a=2');
-        $this->assertPreserved('http://here/there?a=1&a=2?9,8');
-        $this->assertPreserved('http://host?a=1&a=2');
-        $this->assertPreserved('http://host#stuff');
-        $this->assertPreserved('http://me:secret@www.here.com/a/b/c/here.html?a=A?7,6');
-        $this->assertPreserved('http://www.here.com/?a=A__b=B');
-        $this->assertPreserved('http://www.example.com:8080/');
-    }
-    
-    function testUrlWithTwoSlashesInPath() {
-        $url = new SimpleUrl('/article/categoryedit/insert//');
-        $this->assertEqual($url->getPath(), '/article/categoryedit/insert//');
-    }
-    
-    function testUrlWithRequestKeyEncoded() {
-        $url = new SimpleUrl('/?foo%5B1%5D=bar');
-        $this->assertEqual($url->getEncodedRequest(), '?foo%5B1%5D=bar');
-        $url->addRequestParameter('a[1]', 'b[]');
-        $this->assertEqual($url->getEncodedRequest(), '?foo%5B1%5D=bar&a%5B1%5D=b%5B%5D');
-
-        $url = new SimpleUrl('/');
-        $url->addRequestParameter('a[1]', 'b[]');
-        $this->assertEqual($url->getEncodedRequest(), '?a%5B1%5D=b%5B%5D');
-    }
-
-    function testUrlWithRequestKeyEncodedAndParamNamLookingLikePair() {
-        $url = new SimpleUrl('/');
-        $url->addRequestParameter('foo[]=bar', '');
-        $this->assertEqual($url->getEncodedRequest(), '?foo%5B%5D%3Dbar=');
-        $url = new SimpleUrl('/?foo%5B%5D%3Dbar=');
-        $this->assertEqual($url->getEncodedRequest(), '?foo%5B%5D%3Dbar=');
-    }
-
-    function assertUrl($raw, $parts, $params = false, $coords = false) {
-        if (! is_array($params)) {
-            $params = array();
-        }
-        $url = new SimpleUrl($raw);
-        $this->assertIdentical($url->getScheme(), $parts[0], "[$raw] scheme -> %s");
-        $this->assertIdentical($url->getUsername(), $parts[1], "[$raw] username -> %s");
-        $this->assertIdentical($url->getPassword(), $parts[2], "[$raw] password -> %s");
-        $this->assertIdentical($url->getHost(), $parts[3], "[$raw] host -> %s");
-        $this->assertIdentical($url->getPort(), $parts[4], "[$raw] port -> %s");
-        $this->assertIdentical($url->getPath(), $parts[5], "[$raw] path -> %s");
-        $this->assertIdentical($url->getTld(), $parts[6], "[$raw] tld -> %s");
-        $this->assertIdentical($url->getEncodedRequest(), $parts[7], "[$raw] encoded -> %s");
-        $this->assertIdentical($url->getFragment(), $parts[8], "[$raw] fragment -> %s");
-        if ($coords) {
-            $this->assertIdentical($url->getX(), $coords[0], "[$raw] x -> %s");
-            $this->assertIdentical($url->getY(), $coords[1], "[$raw] y -> %s");
-        }
-    }
-    
-    function assertPreserved($string) {
-        $url = new SimpleUrl($string);
-        $this->assertEqual($url->asString(), $string);
-    }
-}
-
-class TestOfAbsoluteUrls extends UnitTestCase {
-    
-	function testDirectoriesAfterFilename() {
-		$string = '../../index.php/foo/bar';
-		$url = new SimpleUrl($string);
-		$this->assertEqual($url->asString(), $string);
-		
-		$absolute = $url->makeAbsolute('http://www.domain.com/some/path/');
-		$this->assertEqual($absolute->asString(), 'http://www.domain.com/index.php/foo/bar');
-	}
-
-    function testMakingAbsolute() {
-        $url = new SimpleUrl('../there/somewhere.php');
-        $this->assertEqual($url->getPath(), '../there/somewhere.php');
-        $absolute = $url->makeAbsolute('https://host.com:1234/I/am/here/');
-        $this->assertEqual($absolute->getScheme(), 'https');
-        $this->assertEqual($absolute->getHost(), 'host.com');
-        $this->assertEqual($absolute->getPort(), 1234);
-        $this->assertEqual($absolute->getPath(), '/I/am/there/somewhere.php');
-    }
-    
-    function testMakingAnEmptyUrlAbsolute() {
-        $url = new SimpleUrl('');
-        $this->assertEqual($url->getPath(), '');
-        $absolute = $url->makeAbsolute('http://host.com/I/am/here/page.html');
-        $this->assertEqual($absolute->getScheme(), 'http');
-        $this->assertEqual($absolute->getHost(), 'host.com');
-        $this->assertEqual($absolute->getPath(), '/I/am/here/page.html');
-    }
-    
-    function testMakingAnEmptyUrlAbsoluteWithMissingPageName() {
-        $url = new SimpleUrl('');
-        $this->assertEqual($url->getPath(), '');
-        $absolute = $url->makeAbsolute('http://host.com/I/am/here/');
-        $this->assertEqual($absolute->getScheme(), 'http');
-        $this->assertEqual($absolute->getHost(), 'host.com');
-        $this->assertEqual($absolute->getPath(), '/I/am/here/');
-    }
-    
-    function testMakingAShortQueryUrlAbsolute() {
-        $url = new SimpleUrl('?a#b');
-        $this->assertEqual($url->getPath(), '');
-        $absolute = $url->makeAbsolute('http://host.com/I/am/here/');
-        $this->assertEqual($absolute->getScheme(), 'http');
-        $this->assertEqual($absolute->getHost(), 'host.com');
-        $this->assertEqual($absolute->getPath(), '/I/am/here/');
-        $this->assertEqual($absolute->getEncodedRequest(), '?a');
-        $this->assertEqual($absolute->getFragment(), 'b');
-    }
-    
-    function testMakingADirectoryUrlAbsolute() {
-        $url = new SimpleUrl('hello/');
-        $this->assertEqual($url->getPath(), 'hello/');
-        $this->assertEqual($url->getBasePath(), 'hello/');
-        $this->assertEqual($url->getPage(), '');
-        $absolute = $url->makeAbsolute('http://host.com/I/am/here/page.html');
-        $this->assertEqual($absolute->getPath(), '/I/am/here/hello/');
-    }
-    
-    function testMakingARootUrlAbsolute() {
-        $url = new SimpleUrl('/');
-        $this->assertEqual($url->getPath(), '/');
-        $absolute = $url->makeAbsolute('http://host.com/I/am/here/page.html');
-        $this->assertEqual($absolute->getPath(), '/');
-    }
-    
-    function testMakingARootPageUrlAbsolute() {
-        $url = new SimpleUrl('/here.html');
-        $absolute = $url->makeAbsolute('http://host.com/I/am/here/page.html');
-        $this->assertEqual($absolute->getPath(), '/here.html');
-    }
-    
-    function testCarryAuthenticationFromRootPage() {
-        $url = new SimpleUrl('here.html');
-        $absolute = $url->makeAbsolute('http://test:secret@host.com/');
-        $this->assertEqual($absolute->getPath(), '/here.html');
-        $this->assertEqual($absolute->getUsername(), 'test');
-        $this->assertEqual($absolute->getPassword(), 'secret');
-    }
-    
-    function testMakingCoordinateUrlAbsolute() {
-        $url = new SimpleUrl('?1,2');
-        $this->assertEqual($url->getPath(), '');
-        $absolute = $url->makeAbsolute('http://host.com/I/am/here/');
-        $this->assertEqual($absolute->getScheme(), 'http');
-        $this->assertEqual($absolute->getHost(), 'host.com');
-        $this->assertEqual($absolute->getPath(), '/I/am/here/');
-        $this->assertEqual($absolute->getX(), 1);
-        $this->assertEqual($absolute->getY(), 2);
-    }
-    
-    function testMakingAbsoluteAppendedPath() {
-        $url = new SimpleUrl('./there/somewhere.php');
-        $absolute = $url->makeAbsolute('https://host.com/here/');
-        $this->assertEqual($absolute->getPath(), '/here/there/somewhere.php');
-    }
-    
-    function testMakingAbsoluteBadlyFormedAppendedPath() {
-        $url = new SimpleUrl('there/somewhere.php');
-        $absolute = $url->makeAbsolute('https://host.com/here/');
-        $this->assertEqual($absolute->getPath(), '/here/there/somewhere.php');
-    }
-    
-    function testMakingAbsoluteHasNoEffectWhenAlreadyAbsolute() {
-        $url = new SimpleUrl('https://test:secret@www.lastcraft.com:321/stuff/?a=1#f');
-        $absolute = $url->makeAbsolute('http://host.com/here/');
-        $this->assertEqual($absolute->getScheme(), 'https');
-        $this->assertEqual($absolute->getUsername(), 'test');
-        $this->assertEqual($absolute->getPassword(), 'secret');
-        $this->assertEqual($absolute->getHost(), 'www.lastcraft.com');
-        $this->assertEqual($absolute->getPort(), 321);
-        $this->assertEqual($absolute->getPath(), '/stuff/');
-        $this->assertEqual($absolute->getEncodedRequest(), '?a=1');
-        $this->assertEqual($absolute->getFragment(), 'f');
-    }
-    
-    function testMakingAbsoluteCarriesAuthenticationWhenAlreadyAbsolute() {
-        $url = new SimpleUrl('https://www.lastcraft.com');
-        $absolute = $url->makeAbsolute('http://test:secret@host.com/here/');
-        $this->assertEqual($absolute->getHost(), 'www.lastcraft.com');
-        $this->assertEqual($absolute->getUsername(), 'test');
-        $this->assertEqual($absolute->getPassword(), 'secret');
-    }
-    
-    function testMakingHostOnlyAbsoluteDoesNotCarryAnyOtherInformation() {
-        $url = new SimpleUrl('http://www.lastcraft.com');
-        $absolute = $url->makeAbsolute('https://host.com:81/here/');
-        $this->assertEqual($absolute->getScheme(), 'http');
-        $this->assertEqual($absolute->getHost(), 'www.lastcraft.com');
-        $this->assertIdentical($absolute->getPort(), false);
-        $this->assertEqual($absolute->getPath(), '/');
-    }
-}
-
-class TestOfFrameUrl extends UnitTestCase {
-    
-    function testTargetAttachment() {
-        $url = new SimpleUrl('http://www.site.com/home.html');
-        $this->assertIdentical($url->getTarget(), false);
-        $url->setTarget('A frame');
-        $this->assertIdentical($url->getTarget(), 'A frame');
-    }
-}
-
-/**
- * @note Based off of http://www.mozilla.org/quality/networking/testing/filetests.html
- */
-class TestOfFileUrl extends UnitTestCase {
-    
-    function testMinimalUrl() {
-        $url = new SimpleUrl('file:///');
-        $this->assertEqual($url->getScheme(), 'file');
-        $this->assertIdentical($url->getHost(), false);
-        $this->assertEqual($url->getPath(), '/');
-    }
-    
-    function testUnixUrl() {
-        $url = new SimpleUrl('file:///fileInRoot');
-        $this->assertEqual($url->getScheme(), 'file');
-        $this->assertIdentical($url->getHost(), false);
-        $this->assertEqual($url->getPath(), '/fileInRoot');
-    }
-    
-    function testDOSVolumeUrl() {
-        $url = new SimpleUrl('file:///C:/config.sys');
-        $this->assertEqual($url->getScheme(), 'file');
-        $this->assertIdentical($url->getHost(), false);
-        $this->assertEqual($url->getPath(), '/C:/config.sys');
-    }
-    
-    function testDOSVolumePromotion() {
-        $url = new SimpleUrl('file://C:/config.sys');
-        $this->assertEqual($url->getScheme(), 'file');
-        $this->assertIdentical($url->getHost(), false);
-        $this->assertEqual($url->getPath(), '/C:/config.sys');
-    }
-    
-    function testDOSBackslashes() {
-        $url = new SimpleUrl('file:///C:\config.sys');
-        $this->assertEqual($url->getScheme(), 'file');
-        $this->assertIdentical($url->getHost(), false);
-        $this->assertEqual($url->getPath(), '/C:/config.sys');
-    }
-    
-    function testDOSDirnameAfterFile() {
-        $url = new SimpleUrl('file://C:\config.sys');
-        $this->assertEqual($url->getScheme(), 'file');
-        $this->assertIdentical($url->getHost(), false);
-        $this->assertEqual($url->getPath(), '/C:/config.sys');
-    }
-    
-}
-
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/user_agent_test.php b/3rdparty/simpletest/test/user_agent_test.php
deleted file mode 100755
index 030abeb257d..00000000000
--- a/3rdparty/simpletest/test/user_agent_test.php
+++ /dev/null
@@ -1,348 +0,0 @@
-<?php
-// $Id: user_agent_test.php 1788 2008-04-27 11:01:59Z pp11 $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../user_agent.php');
-require_once(dirname(__FILE__) . '/../authentication.php');
-require_once(dirname(__FILE__) . '/../http.php');
-require_once(dirname(__FILE__) . '/../encoding.php');
-Mock::generate('SimpleHttpRequest');
-Mock::generate('SimpleHttpResponse');
-Mock::generate('SimpleHttpHeaders');
-Mock::generatePartial('SimpleUserAgent', 'MockRequestUserAgent', array('createHttpRequest'));
-
-class TestOfFetchingUrlParameters extends UnitTestCase {
-    
-    function setUp() {
-        $this->headers = new MockSimpleHttpHeaders();
-        $this->response = new MockSimpleHttpResponse();
-        $this->response->setReturnValue('isError', false);
-        $this->response->returns('getHeaders', new MockSimpleHttpHeaders());
-        $this->request = new MockSimpleHttpRequest();
-        $this->request->returns('fetch', $this->response);
-    }
-    
-    function testGetRequestWithoutIncidentGivesNoErrors() {
-        $url = new SimpleUrl('http://test:secret@this.com/page.html');
-        $url->addRequestParameters(array('a' => 'A', 'b' => 'B'));
-        
-        $agent = new MockRequestUserAgent();
-        $agent->returns('createHttpRequest', $this->request);
-        $agent->__construct();
-        
-        $response = $agent->fetchResponse(
-                new SimpleUrl('http://test:secret@this.com/page.html'),
-                new SimpleGetEncoding(array('a' => 'A', 'b' => 'B')));
-        $this->assertFalse($response->isError());
-    }
-}
-
-class TestOfAdditionalHeaders extends UnitTestCase {
-    
-    function testAdditionalHeaderAddedToRequest() {
-        $response = new MockSimpleHttpResponse();
-        $response->setReturnReference('getHeaders', new MockSimpleHttpHeaders());
-        
-        $request = new MockSimpleHttpRequest();
-        $request->setReturnReference('fetch', $response);
-        $request->expectOnce(
-                'addHeaderLine',
-                array('User-Agent: SimpleTest'));
-        
-        $agent = new MockRequestUserAgent();
-        $agent->setReturnReference('createHttpRequest', $request);
-        $agent->__construct();
-        $agent->addHeader('User-Agent: SimpleTest');
-        $response = $agent->fetchResponse(new SimpleUrl('http://this.host/'), new SimpleGetEncoding());
-    }
-}
-
-class TestOfBrowserCookies extends UnitTestCase {
-
-    private function createStandardResponse() {
-        $response = new MockSimpleHttpResponse();
-        $response->setReturnValue("isError", false);
-        $response->setReturnValue("getContent", "stuff");
-        $response->setReturnReference("getHeaders", new MockSimpleHttpHeaders());
-        return $response;
-    }
-    
-    private function createCookieSite($header_lines) {
-        $headers = new SimpleHttpHeaders($header_lines);
-        $response = new MockSimpleHttpResponse();
-        $response->setReturnValue("isError", false);
-        $response->setReturnReference("getHeaders", $headers);
-        $response->setReturnValue("getContent", "stuff");
-        $request = new MockSimpleHttpRequest();
-        $request->setReturnReference("fetch", $response);
-        return $request;
-    }
-    
-    private function createMockedRequestUserAgent(&$request) {
-        $agent = new MockRequestUserAgent();
-        $agent->setReturnReference('createHttpRequest', $request);
-        $agent->__construct();
-        return $agent;
-    }
-    
-    function testCookieJarIsSentToRequest() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'A');
-        
-        $request = new MockSimpleHttpRequest();
-        $request->returns('fetch', $this->createStandardResponse());
-        $request->expectOnce('readCookiesFromJar', array($jar, '*'));
-        
-        $agent = $this->createMockedRequestUserAgent($request);
-        $agent->setCookie('a', 'A');
-        $agent->fetchResponse(
-                new SimpleUrl('http://this.com/this/path/page.html'),
-                new SimpleGetEncoding());
-    }
-      
-    function testNoCookieJarIsSentToRequestWhenCookiesAreDisabled() {
-        $request = new MockSimpleHttpRequest();
-        $request->returns('fetch', $this->createStandardResponse());
-        $request->expectNever('readCookiesFromJar');
-        
-        $agent = $this->createMockedRequestUserAgent($request);
-        $agent->setCookie('a', 'A');
-        $agent->ignoreCookies();
-        $agent->fetchResponse(
-                new SimpleUrl('http://this.com/this/path/page.html'),
-                new SimpleGetEncoding());
-    }
-  
-    function testReadingNewCookie() {
-        $request = $this->createCookieSite('Set-cookie: a=AAAA');
-        $agent = $this->createMockedRequestUserAgent($request);
-        $agent->fetchResponse(
-                new SimpleUrl('http://this.com/this/path/page.html'),
-                new SimpleGetEncoding());
-        $this->assertEqual($agent->getCookieValue("this.com", "this/path/", "a"), "AAAA");
-    }
-  
-    function testIgnoringNewCookieWhenCookiesDisabled() {
-        $request = $this->createCookieSite('Set-cookie: a=AAAA');
-        $agent = $this->createMockedRequestUserAgent($request);
-        $agent->ignoreCookies();
-        $agent->fetchResponse(
-                new SimpleUrl('http://this.com/this/path/page.html'),
-                new SimpleGetEncoding());
-        $this->assertIdentical($agent->getCookieValue("this.com", "this/path/", "a"), false);
-    }
-   
-    function testOverwriteCookieThatAlreadyExists() {
-        $request = $this->createCookieSite('Set-cookie: a=AAAA');
-        $agent = $this->createMockedRequestUserAgent($request);
-        $agent->setCookie('a', 'A');
-        $agent->fetchResponse(
-                new SimpleUrl('http://this.com/this/path/page.html'),
-                new SimpleGetEncoding());
-        $this->assertEqual($agent->getCookieValue("this.com", "this/path/", "a"), "AAAA");
-    }
-   
-    function testClearCookieBySettingExpiry() {
-        $request = $this->createCookieSite('Set-cookie: a=b');
-        $agent = $this->createMockedRequestUserAgent($request);
-        
-        $agent->setCookie("a", "A", "this/path/", "Wed, 25-Dec-02 04:24:21 GMT");
-        $agent->fetchResponse(
-                new SimpleUrl('http://this.com/this/path/page.html'),
-                new SimpleGetEncoding());
-        $this->assertIdentical(
-                $agent->getCookieValue("this.com", "this/path/", "a"),
-                "b");
-        $agent->restart("Wed, 25-Dec-02 04:24:20 GMT");
-        $this->assertIdentical(
-                $agent->getCookieValue("this.com", "this/path/", "a"),
-                false);
-    }
-    
-    function testAgeingAndClearing() {
-        $request = $this->createCookieSite('Set-cookie: a=A; expires=Wed, 25-Dec-02 04:24:21 GMT; path=/this/path');
-        $agent = $this->createMockedRequestUserAgent($request);
-        
-        $agent->fetchResponse(
-                new SimpleUrl('http://this.com/this/path/page.html'),
-                new SimpleGetEncoding());
-        $agent->restart("Wed, 25-Dec-02 04:24:20 GMT");
-        $this->assertIdentical(
-                $agent->getCookieValue("this.com", "this/path/", "a"),
-                "A");
-        $agent->ageCookies(2);
-        $agent->restart("Wed, 25-Dec-02 04:24:20 GMT");
-        $this->assertIdentical(
-                $agent->getCookieValue("this.com", "this/path/", "a"),
-                false);
-    }
-    
-    function testReadingIncomingAndSettingNewCookies() {
-        $request = $this->createCookieSite('Set-cookie: a=AAA');
-        $agent = $this->createMockedRequestUserAgent($request);
-        
-        $this->assertNull($agent->getBaseCookieValue("a", false));
-        $agent->fetchResponse(
-                new SimpleUrl('http://this.com/this/path/page.html'),
-                new SimpleGetEncoding());
-        $agent->setCookie("b", "BBB", "this.com", "this/path/");
-        $this->assertEqual(
-                $agent->getBaseCookieValue("a", new SimpleUrl('http://this.com/this/path/page.html')),
-                "AAA");
-        $this->assertEqual(
-                $agent->getBaseCookieValue("b", new SimpleUrl('http://this.com/this/path/page.html')),
-                "BBB");
-    }
-}
-
-class TestOfHttpRedirects extends UnitTestCase {
-    
-    function createRedirect($content, $redirect) {
-        $headers = new MockSimpleHttpHeaders();
-        $headers->setReturnValue('isRedirect', (boolean)$redirect);
-        $headers->setReturnValue('getLocation', $redirect);
-        $response = new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent', $content);
-        $response->setReturnReference('getHeaders', $headers);
-        $request = new MockSimpleHttpRequest();
-        $request->setReturnReference('fetch', $response);
-        return $request;
-    }
-    
-    function testDisabledRedirects() {
-        $agent = new MockRequestUserAgent();
-        $agent->returns(
-                'createHttpRequest',
-                $this->createRedirect('stuff', 'there.html'));
-        $agent->expectOnce('createHttpRequest');
-        $agent->__construct();
-        $agent->setMaximumRedirects(0);
-        $response = $agent->fetchResponse(new SimpleUrl('here.html'), new SimpleGetEncoding());
-        $this->assertEqual($response->getContent(), 'stuff');
-    }
-    
-    function testSingleRedirect() {
-        $agent = new MockRequestUserAgent();
-        $agent->returnsAt(
-                0,
-                'createHttpRequest',
-                $this->createRedirect('first', 'two.html'));
-        $agent->returnsAt(
-                1,
-                'createHttpRequest',
-                $this->createRedirect('second', 'three.html'));
-        $agent->expectCallCount('createHttpRequest', 2);
-        $agent->__construct();
-        
-        $agent->setMaximumRedirects(1);
-        $response = $agent->fetchResponse(new SimpleUrl('one.html'), new SimpleGetEncoding());
-        $this->assertEqual($response->getContent(), 'second');
-    }
-    
-    function testDoubleRedirect() {
-        $agent = new MockRequestUserAgent();
-        $agent->returnsAt(
-                0,
-                'createHttpRequest',
-                $this->createRedirect('first', 'two.html'));
-        $agent->returnsAt(
-                1,
-                'createHttpRequest',
-                $this->createRedirect('second', 'three.html'));
-        $agent->returnsAt(
-                2,
-                'createHttpRequest',
-                $this->createRedirect('third', 'four.html'));
-        $agent->expectCallCount('createHttpRequest', 3);
-        $agent->__construct();
-        
-        $agent->setMaximumRedirects(2);
-        $response = $agent->fetchResponse(new SimpleUrl('one.html'), new SimpleGetEncoding());
-        $this->assertEqual($response->getContent(), 'third');
-    }
-    
-    function testSuccessAfterRedirect() {
-        $agent = new MockRequestUserAgent();
-        $agent->returnsAt(
-                0,
-                'createHttpRequest',
-                $this->createRedirect('first', 'two.html'));
-        $agent->returnsAt(
-                1,
-                'createHttpRequest',
-                $this->createRedirect('second', false));
-        $agent->returnsAt(
-                2,
-                'createHttpRequest',
-                $this->createRedirect('third', 'four.html'));
-        $agent->expectCallCount('createHttpRequest', 2);
-        $agent->__construct();
-        
-        $agent->setMaximumRedirects(2);
-        $response = $agent->fetchResponse(new SimpleUrl('one.html'), new SimpleGetEncoding());
-        $this->assertEqual($response->getContent(), 'second');
-    }
-    
-    function testRedirectChangesPostToGet() {
-        $agent = new MockRequestUserAgent();
-        $agent->returnsAt(
-                0,
-                'createHttpRequest',
-                $this->createRedirect('first', 'two.html'));
-        $agent->expectAt(0, 'createHttpRequest', array('*', new IsAExpectation('SimplePostEncoding')));
-        $agent->returnsAt(
-                1,
-                'createHttpRequest',
-                $this->createRedirect('second', 'three.html'));
-        $agent->expectAt(1, 'createHttpRequest', array('*', new IsAExpectation('SimpleGetEncoding')));
-        $agent->expectCallCount('createHttpRequest', 2);
-        $agent->__construct();
-        $agent->setMaximumRedirects(1);
-        $response = $agent->fetchResponse(new SimpleUrl('one.html'), new SimplePostEncoding());
-    }
-}
-
-class TestOfBadHosts extends UnitTestCase {
-    
-    private function createSimulatedBadHost() {
-        $response = new MockSimpleHttpResponse();
-        $response->setReturnValue('isError', true);
-        $response->setReturnValue('getError', 'Bad socket');
-        $response->setReturnValue('getContent', false);
-        $request = new MockSimpleHttpRequest();
-        $request->setReturnReference('fetch', $response);
-        return $request;
-    }
-    
-    function testUntestedHost() {
-        $request = $this->createSimulatedBadHost();
-        $agent = new MockRequestUserAgent();
-        $agent->setReturnReference('createHttpRequest', $request);
-        $agent->__construct();
-        $response = $agent->fetchResponse(
-                new SimpleUrl('http://this.host/this/path/page.html'),
-                new SimpleGetEncoding());
-        $this->assertTrue($response->isError());
-    }
-}
-
-class TestOfAuthorisation extends UnitTestCase {
-    
-    function testAuthenticateHeaderAdded() {
-        $response = new MockSimpleHttpResponse();
-        $response->setReturnReference('getHeaders', new MockSimpleHttpHeaders());
-        
-        $request = new MockSimpleHttpRequest();
-        $request->returns('fetch', $response);
-        $request->expectOnce(
-                'addHeaderLine',
-                array('Authorization: Basic ' . base64_encode('test:secret')));
-        
-        $agent = new MockRequestUserAgent();
-        $agent->returns('createHttpRequest', $request);
-        $agent->__construct();
-        $response = $agent->fetchResponse(
-                new SimpleUrl('http://test:secret@this.host'),
-                new SimpleGetEncoding());
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/visual_test.php b/3rdparty/simpletest/test/visual_test.php
deleted file mode 100755
index 6b9d085d67f..00000000000
--- a/3rdparty/simpletest/test/visual_test.php
+++ /dev/null
@@ -1,495 +0,0 @@
-<?php
-// $Id: visual_test.php 1884 2009-07-01 16:30:40Z lastcraft $
-
-// NOTE:
-// Some of these tests are designed to fail! Do not be alarmed.
-//                         ----------------
-
-// The following tests are a bit hacky. Whilst Kent Beck tried to
-// build a unit tester with a unit tester, I am not that brave.
-// Instead I have just hacked together odd test scripts until
-// I have enough of a tester to procede more formally.
-//
-// The proper tests start in all_tests.php
-require_once('../unit_tester.php');
-require_once('../shell_tester.php');
-require_once('../mock_objects.php');
-require_once('../reporter.php');
-require_once('../xml.php');
-
-class TestDisplayClass {
-    private $a;
-
-    function TestDisplayClass($a) {
-        $this->a = $a;
-    }
-}
-
-class PassingUnitTestCaseOutput extends UnitTestCase {
-
-    function testOfResults() {
-        $this->pass('Pass');
-    }
-
-    function testTrue() {
-        $this->assertTrue(true);
-    }
-
-    function testFalse() {
-        $this->assertFalse(false);
-    }
-
-    function testExpectation() {
-        $expectation = &new EqualExpectation(25, 'My expectation message: %s');
-        $this->assert($expectation, 25, 'My assert message : %s');
-    }
-
-    function testNull() {
-        $this->assertNull(null, "%s -> Pass");
-        $this->assertNotNull(false, "%s -> Pass");
-    }
-
-    function testType() {
-        $this->assertIsA("hello", "string", "%s -> Pass");
-        $this->assertIsA($this, "PassingUnitTestCaseOutput", "%s -> Pass");
-        $this->assertIsA($this, "UnitTestCase", "%s -> Pass");
-    }
-
-    function testTypeEquality() {
-        $this->assertEqual("0", 0, "%s -> Pass");
-    }
-
-    function testNullEquality() {
-        $this->assertNotEqual(null, 1, "%s -> Pass");
-        $this->assertNotEqual(1, null, "%s -> Pass");
-    }
-
-    function testIntegerEquality() {
-        $this->assertNotEqual(1, 2, "%s -> Pass");
-    }
-
-    function testStringEquality() {
-        $this->assertEqual("a", "a", "%s -> Pass");
-        $this->assertNotEqual("aa", "ab", "%s -> Pass");
-    }
-
-    function testHashEquality() {
-        $this->assertEqual(array("a" => "A", "b" => "B"), array("b" => "B", "a" => "A"), "%s -> Pass");
-    }
-
-    function testWithin() {
-        $this->assertWithinMargin(5, 5.4, 0.5, "%s -> Pass");
-    }
-
-    function testOutside() {
-        $this->assertOutsideMargin(5, 5.6, 0.5, "%s -> Pass");
-    }
-
-    function testStringIdentity() {
-        $a = "fred";
-        $b = $a;
-        $this->assertIdentical($a, $b, "%s -> Pass");
-    }
-
-    function testTypeIdentity() {
-        $a = "0";
-        $b = 0;
-        $this->assertNotIdentical($a, $b, "%s -> Pass");
-    }
-
-    function testNullIdentity() {
-        $this->assertNotIdentical(null, 1, "%s -> Pass");
-        $this->assertNotIdentical(1, null, "%s -> Pass");
-    }
-
-    function testHashIdentity() {
-    }
-
-    function testObjectEquality() {
-        $this->assertEqual(new TestDisplayClass(4), new TestDisplayClass(4), "%s -> Pass");
-        $this->assertNotEqual(new TestDisplayClass(4), new TestDisplayClass(5), "%s -> Pass");
-    }
-
-    function testObjectIndentity() {
-        $this->assertIdentical(new TestDisplayClass(false), new TestDisplayClass(false), "%s -> Pass");
-        $this->assertNotIdentical(new TestDisplayClass(false), new TestDisplayClass(0), "%s -> Pass");
-    }
-
-    function testReference() {
-        $a = "fred";
-        $b = &$a;
-        $this->assertReference($a, $b, "%s -> Pass");
-    }
-
-    function testCloneOnDifferentObjects() {
-        $a = "fred";
-        $b = $a;
-        $c = "Hello";
-        $this->assertClone($a, $b, "%s -> Pass");
-    }
-
-    function testPatterns() {
-        $this->assertPattern('/hello/i', "Hello there", "%s -> Pass");
-        $this->assertNoPattern('/hello/', "Hello there", "%s -> Pass");
-    }
-
-    function testLongStrings() {
-        $text = "";
-        for ($i = 0; $i < 10; $i++) {
-            $text .= "0123456789";
-        }
-        $this->assertEqual($text, $text);
-    }
-}
-
-class FailingUnitTestCaseOutput extends UnitTestCase {
-
-    function testOfResults() {
-        $this->fail('Fail');        // Fail.
-    }
-
-    function testTrue() {
-        $this->assertTrue(false);        // Fail.
-    }
-
-    function testFalse() {
-        $this->assertFalse(true);        // Fail.
-    }
-
-    function testExpectation() {
-        $expectation = &new EqualExpectation(25, 'My expectation message: %s');
-        $this->assert($expectation, 24, 'My assert message : %s');        // Fail.
-    }
-
-    function testNull() {
-        $this->assertNull(false, "%s -> Fail");        // Fail.
-        $this->assertNotNull(null, "%s -> Fail");        // Fail.
-    }
-
-    function testType() {
-        $this->assertIsA(14, "string", "%s -> Fail");        // Fail.
-        $this->assertIsA(14, "TestOfUnitTestCaseOutput", "%s -> Fail");        // Fail.
-        $this->assertIsA($this, "TestReporter", "%s -> Fail");        // Fail.
-    }
-
-    function testTypeEquality() {
-        $this->assertNotEqual("0", 0, "%s -> Fail");        // Fail.
-    }
-
-    function testNullEquality() {
-        $this->assertEqual(null, 1, "%s -> Fail");        // Fail.
-        $this->assertEqual(1, null, "%s -> Fail");        // Fail.
-    }
-
-    function testIntegerEquality() {
-        $this->assertEqual(1, 2, "%s -> Fail");        // Fail.
-    }
-
-    function testStringEquality() {
-        $this->assertNotEqual("a", "a", "%s -> Fail");    // Fail.
-        $this->assertEqual("aa", "ab", "%s -> Fail");        // Fail.
-    }
-
-    function testHashEquality() {
-        $this->assertEqual(array("a" => "A", "b" => "B"), array("b" => "B", "a" => "Z"), "%s -> Fail");
-    }
-
-    function testWithin() {
-        $this->assertWithinMargin(5, 5.6, 0.5, "%s -> Fail");   // Fail.
-    }
-
-    function testOutside() {
-        $this->assertOutsideMargin(5, 5.4, 0.5, "%s -> Fail");   // Fail.
-    }
-
-    function testStringIdentity() {
-        $a = "fred";
-        $b = $a;
-        $this->assertNotIdentical($a, $b, "%s -> Fail");       // Fail.
-    }
-
-    function testTypeIdentity() {
-        $a = "0";
-        $b = 0;
-        $this->assertIdentical($a, $b, "%s -> Fail");        // Fail.
-    }
-
-    function testNullIdentity() {
-        $this->assertIdentical(null, 1, "%s -> Fail");        // Fail.
-        $this->assertIdentical(1, null, "%s -> Fail");        // Fail.
-    }
-
-    function testHashIdentity() {
-        $this->assertIdentical(array("a" => "A", "b" => "B"), array("b" => "B", "a" => "A"), "%s -> fail");        // Fail.
-    }
-
-    function testObjectEquality() {
-        $this->assertNotEqual(new TestDisplayClass(4), new TestDisplayClass(4), "%s -> Fail");    // Fail.
-        $this->assertEqual(new TestDisplayClass(4), new TestDisplayClass(5), "%s -> Fail");        // Fail.
-    }
-
-    function testObjectIndentity() {
-        $this->assertNotIdentical(new TestDisplayClass(false), new TestDisplayClass(false), "%s -> Fail");    // Fail.
-        $this->assertIdentical(new TestDisplayClass(false), new TestDisplayClass(0), "%s -> Fail");        // Fail.
-    }
-
-    function testReference() {
-        $a = "fred";
-        $b = &$a;
-        $this->assertClone($a, $b, "%s -> Fail");        // Fail.
-    }
-
-    function testCloneOnDifferentObjects() {
-        $a = "fred";
-        $b = $a;
-        $c = "Hello";
-        $this->assertClone($a, $c, "%s -> Fail");        // Fail.
-    }
-
-    function testPatterns() {
-        $this->assertPattern('/hello/', "Hello there", "%s -> Fail");            // Fail.
-        $this->assertNoPattern('/hello/i', "Hello there", "%s -> Fail");      // Fail.
-    }
-
-    function testLongStrings() {
-        $text = "";
-        for ($i = 0; $i < 10; $i++) {
-            $text .= "0123456789";
-        }
-        $this->assertEqual($text . $text, $text . "a" . $text);        // Fail.
-    }
-}
-
-class Dummy {
-    function Dummy() {
-    }
-
-    function a() {
-    }
-}
-Mock::generate('Dummy');
-
-class TestOfMockObjectsOutput extends UnitTestCase {
-
-    function testCallCounts() {
-        $dummy = &new MockDummy();
-        $dummy->expectCallCount('a', 1, 'My message: %s');
-        $dummy->a();
-        $dummy->a();
-    }
-
-    function testMinimumCallCounts() {
-        $dummy = &new MockDummy();
-        $dummy->expectMinimumCallCount('a', 2, 'My message: %s');
-        $dummy->a();
-        $dummy->a();
-    }
-
-    function testEmptyMatching() {
-        $dummy = &new MockDummy();
-        $dummy->expect('a', array());
-        $dummy->a();
-        $dummy->a(null);        // Fail.
-    }
-
-    function testEmptyMatchingWithCustomMessage() {
-        $dummy = &new MockDummy();
-        $dummy->expect('a', array(), 'My expectation message: %s');
-        $dummy->a();
-        $dummy->a(null);        // Fail.
-    }
-
-    function testNullMatching() {
-        $dummy = &new MockDummy();
-        $dummy->expect('a', array(null));
-        $dummy->a(null);
-        $dummy->a();        // Fail.
-    }
-
-    function testBooleanMatching() {
-        $dummy = &new MockDummy();
-        $dummy->expect('a', array(true, false));
-        $dummy->a(true, false);
-        $dummy->a(true, true);        // Fail.
-    }
-
-    function testIntegerMatching() {
-        $dummy = &new MockDummy();
-        $dummy->expect('a', array(32, 33));
-        $dummy->a(32, 33);
-        $dummy->a(32, 34);        // Fail.
-    }
-
-    function testFloatMatching() {
-        $dummy = &new MockDummy();
-        $dummy->expect('a', array(3.2, 3.3));
-        $dummy->a(3.2, 3.3);
-        $dummy->a(3.2, 3.4);        // Fail.
-    }
-
-    function testStringMatching() {
-        $dummy = &new MockDummy();
-        $dummy->expect('a', array('32', '33'));
-        $dummy->a('32', '33');
-        $dummy->a('32', '34');        // Fail.
-    }
-
-    function testEmptyMatchingWithCustomExpectationMessage() {
-        $dummy = &new MockDummy();
-        $dummy->expect(
-                'a',
-                array(new EqualExpectation('A', 'My part expectation message: %s')),
-                'My expectation message: %s');
-        $dummy->a('A');
-        $dummy->a('B');        // Fail.
-    }
-
-    function testArrayMatching() {
-        $dummy = &new MockDummy();
-        $dummy->expect('a', array(array(32), array(33)));
-        $dummy->a(array(32), array(33));
-        $dummy->a(array(32), array('33'));        // Fail.
-    }
-
-    function testObjectMatching() {
-        $a = new Dummy();
-        $a->a = 'a';
-        $b = new Dummy();
-        $b->b = 'b';
-        $dummy = &new MockDummy();
-        $dummy->expect('a', array($a, $b));
-        $dummy->a($a, $b);
-        $dummy->a($a, $a);        // Fail.
-    }
-
-    function testBigList() {
-        $dummy = &new MockDummy();
-        $dummy->expect('a', array(false, 0, 1, 1.0));
-        $dummy->a(false, 0, 1, 1.0);
-        $dummy->a(true, false, 2, 2.0);        // Fail.
-    }
-}
-
-class TestOfPastBugs extends UnitTestCase {
-
-    function testMixedTypes() {
-        $this->assertEqual(array(), null, "%s -> Pass");
-        $this->assertIdentical(array(), null, "%s -> Fail");    // Fail.
-    }
-
-    function testMockWildcards() {
-        $dummy = &new MockDummy();
-        $dummy->expect('a', array('*', array(33)));
-        $dummy->a(array(32), array(33));
-        $dummy->a(array(32), array('33'));        // Fail.
-    }
-}
-
-class TestOfVisualShell extends ShellTestCase {
-
-    function testDump() {
-        $this->execute('ls');
-        $this->dumpOutput();
-        $this->execute('dir');
-        $this->dumpOutput();
-    }
-
-    function testDumpOfList() {
-        $this->execute('ls');
-        $this->dump($this->getOutputAsList());
-    }
-}
-
-class PassesAsWellReporter extends HtmlReporter {
-
-    protected function getCss() {
-        return parent::getCss() . ' .pass { color: darkgreen; }';
-    }
-
-    function paintPass($message) {
-        parent::paintPass($message);
-        print "<span class=\"pass\">Pass</span>: ";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print implode(" -&gt; ", $breadcrumb);
-        print " -&gt; " . htmlentities($message) . "<br />\n";
-    }
-
-    function paintSignal($type, &$payload) {
-        print "<span class=\"fail\">$type</span>: ";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print implode(" -&gt; ", $breadcrumb);
-        print " -&gt; " . htmlentities(serialize($payload)) . "<br />\n";
-    }
-}
-
-class TestOfSkippingNoMatterWhat extends UnitTestCase {
-    function skip() {
-        $this->skipIf(true, 'Always skipped -> %s');
-    }
-
-    function testFail() {
-        $this->fail('This really shouldn\'t have happened');
-    }
-}
-
-class TestOfSkippingOrElse extends UnitTestCase {
-    function skip() {
-        $this->skipUnless(false, 'Always skipped -> %s');
-    }
-
-    function testFail() {
-        $this->fail('This really shouldn\'t have happened');
-    }
-}
-
-class TestOfSkippingTwiceOver extends UnitTestCase {
-    function skip() {
-        $this->skipIf(true, 'First reason -> %s');
-        $this->skipIf(true, 'Second reason -> %s');
-    }
-
-    function testFail() {
-        $this->fail('This really shouldn\'t have happened');
-    }
-}
-
-class TestThatShouldNotBeSkipped extends UnitTestCase {
-    function skip() {
-        $this->skipIf(false);
-        $this->skipUnless(true);
-    }
-
-    function testFail() {
-        $this->fail('We should see this message');
-    }
-
-    function testPass() {
-        $this->pass('We should see this message');
-    }
-}
-
-$test = &new TestSuite('Visual test with 46 passes, 47 fails and 0 exceptions');
-$test->add(new PassingUnitTestCaseOutput());
-$test->add(new FailingUnitTestCaseOutput());
-$test->add(new TestOfMockObjectsOutput());
-$test->add(new TestOfPastBugs());
-$test->add(new TestOfVisualShell());
-$test->add(new TestOfSkippingNoMatterWhat());
-$test->add(new TestOfSkippingOrElse());
-$test->add(new TestOfSkippingTwiceOver());
-$test->add(new TestThatShouldNotBeSkipped());
-
-if (isset($_GET['xml']) || in_array('xml', (isset($argv) ? $argv : array()))) {
-    $reporter = new XmlReporter();
-} elseif (TextReporter::inCli()) {
-    $reporter = new TextReporter();
-} else {
-    $reporter = new PassesAsWellReporter();
-}
-if (isset($_GET['dry']) || in_array('dry', (isset($argv) ? $argv : array()))) {
-    $reporter->makeDry();
-}
-exit ($test->run($reporter) ? 0 : 1);
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/web_tester_test.php b/3rdparty/simpletest/test/web_tester_test.php
deleted file mode 100755
index 8c3bf1adf63..00000000000
--- a/3rdparty/simpletest/test/web_tester_test.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-// $Id: web_tester_test.php 1748 2008-04-14 01:50:41Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../web_tester.php');
-
-class TestOfFieldExpectation extends UnitTestCase {
-    
-    function testStringMatchingIsCaseSensitive() {
-        $expectation = new FieldExpectation('a');
-        $this->assertTrue($expectation->test('a'));
-        $this->assertTrue($expectation->test(array('a')));
-        $this->assertFalse($expectation->test('A'));
-    }
-    
-    function testMatchesInteger() {
-        $expectation = new FieldExpectation('1');
-        $this->assertTrue($expectation->test('1'));
-        $this->assertTrue($expectation->test(1));
-        $this->assertTrue($expectation->test(array('1')));
-        $this->assertTrue($expectation->test(array(1)));
-    }
-    
-    function testNonStringFailsExpectation() {
-        $expectation = new FieldExpectation('a');
-        $this->assertFalse($expectation->test(null));
-    }
-    
-    function testUnsetFieldCanBeTestedFor() {
-        $expectation = new FieldExpectation(false);
-        $this->assertTrue($expectation->test(false));
-    }
-    
-    function testMultipleValuesCanBeInAnyOrder() {
-        $expectation = new FieldExpectation(array('a', 'b'));
-        $this->assertTrue($expectation->test(array('a', 'b')));
-        $this->assertTrue($expectation->test(array('b', 'a')));
-        $this->assertFalse($expectation->test(array('a', 'a')));            
-        $this->assertFalse($expectation->test('a'));            
-    }
-    
-    function testSingleItemCanBeArrayOrString() {
-        $expectation = new FieldExpectation(array('a'));
-        $this->assertTrue($expectation->test(array('a')));
-        $this->assertTrue($expectation->test('a'));
-    }
-}
-
-class TestOfHeaderExpectations extends UnitTestCase {
-    
-    function testExpectingOnlyTheHeaderName() {
-        $expectation = new HttpHeaderExpectation('a');
-        $this->assertIdentical($expectation->test(false), false);
-        $this->assertIdentical($expectation->test('a: A'), true);
-        $this->assertIdentical($expectation->test('A: A'), true);
-        $this->assertIdentical($expectation->test('a: B'), true);
-        $this->assertIdentical($expectation->test(' a : A '), true);
-    }
-    
-    function testHeaderValueAsWell() {
-        $expectation = new HttpHeaderExpectation('a', 'A');
-        $this->assertIdentical($expectation->test(false), false);
-        $this->assertIdentical($expectation->test('a: A'), true);
-        $this->assertIdentical($expectation->test('A: A'), true);
-        $this->assertIdentical($expectation->test('A: a'), false);
-        $this->assertIdentical($expectation->test('a: B'), false);
-        $this->assertIdentical($expectation->test(' a : A '), true);
-        $this->assertIdentical($expectation->test(' a : AB '), false);
-    }
-    
-    function testHeaderValueWithColons() {
-        $expectation = new HttpHeaderExpectation('a', 'A:B:C');
-        $this->assertIdentical($expectation->test('a: A'), false);
-        $this->assertIdentical($expectation->test('a: A:B'), false);
-        $this->assertIdentical($expectation->test('a: A:B:C'), true);
-        $this->assertIdentical($expectation->test('a: A:B:C:D'), false);
-    }
-    
-    function testMultilineSearch() {
-        $expectation = new HttpHeaderExpectation('a', 'A');
-        $this->assertIdentical($expectation->test("aa: A\r\nb: B\r\nc: C"), false);
-        $this->assertIdentical($expectation->test("aa: A\r\na: A\r\nb: B"), true);
-    }
-    
-    function testMultilineSearchWithPadding() {
-        $expectation = new HttpHeaderExpectation('a', ' A ');
-        $this->assertIdentical($expectation->test("aa:A\r\nb:B\r\nc:C"), false);
-        $this->assertIdentical($expectation->test("aa:A\r\na:A\r\nb:B"), true);
-    }
-    
-    function testPatternMatching() {
-        $expectation = new HttpHeaderExpectation('a', new PatternExpectation('/A/'));
-        $this->assertIdentical($expectation->test('a: A'), true);
-        $this->assertIdentical($expectation->test('A: A'), true);
-        $this->assertIdentical($expectation->test('A: a'), false);
-        $this->assertIdentical($expectation->test('a: B'), false);
-        $this->assertIdentical($expectation->test(' a : A '), true);
-        $this->assertIdentical($expectation->test(' a : AB '), true);
-    }
-    
-    function testCaseInsensitivePatternMatching() {
-        $expectation = new HttpHeaderExpectation('a', new PatternExpectation('/A/i'));
-        $this->assertIdentical($expectation->test('a: a'), true);
-        $this->assertIdentical($expectation->test('a: B'), false);
-        $this->assertIdentical($expectation->test(' a : A '), true);
-        $this->assertIdentical($expectation->test(' a : BAB '), true);
-        $this->assertIdentical($expectation->test(' a : bab '), true);
-    }
-    
-    function testUnwantedHeader() {
-        $expectation = new NoHttpHeaderExpectation('a');
-        $this->assertIdentical($expectation->test(''), true);
-        $this->assertIdentical($expectation->test('stuff'), true);
-        $this->assertIdentical($expectation->test('b: B'), true);
-        $this->assertIdentical($expectation->test('a: A'), false);
-        $this->assertIdentical($expectation->test('A: A'), false);
-    }
-    
-    function testMultilineUnwantedSearch() {
-        $expectation = new NoHttpHeaderExpectation('a');
-        $this->assertIdentical($expectation->test("aa:A\r\nb:B\r\nc:C"), true);
-        $this->assertIdentical($expectation->test("aa:A\r\na:A\r\nb:B"), false);
-    }
-    
-    function testLocationHeaderSplitsCorrectly() {
-        $expectation = new HttpHeaderExpectation('Location', 'http://here/');
-        $this->assertIdentical($expectation->test('Location: http://here/'), true);
-    }
-}
-
-class TestOfTextExpectations extends UnitTestCase {
-    
-    function testMatchingSubString() {
-        $expectation = new TextExpectation('wanted');
-        $this->assertIdentical($expectation->test(''), false);
-        $this->assertIdentical($expectation->test('Wanted'), false);
-        $this->assertIdentical($expectation->test('wanted'), true);
-        $this->assertIdentical($expectation->test('the wanted text is here'), true);
-    }
-    
-    function testNotMatchingSubString() {
-        $expectation = new NoTextExpectation('wanted');
-        $this->assertIdentical($expectation->test(''), true);
-        $this->assertIdentical($expectation->test('Wanted'), true);
-        $this->assertIdentical($expectation->test('wanted'), false);
-        $this->assertIdentical($expectation->test('the wanted text is here'), false);
-    }
-}
-
-class TestOfGenericAssertionsInWebTester extends WebTestCase {
-    function testEquality() {
-        $this->assertEqual('a', 'a');
-        $this->assertNotEqual('a', 'A');
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/xml_test.php b/3rdparty/simpletest/test/xml_test.php
deleted file mode 100755
index f99e0dcd98b..00000000000
--- a/3rdparty/simpletest/test/xml_test.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-// $Id: xml_test.php 1787 2008-04-26 20:35:39Z pp11 $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../xml.php');
-Mock::generate('SimpleScorer');
-
-if (! function_exists('xml_parser_create')) {
-    SimpleTest::ignore('TestOfXmlStructureParsing');
-    SimpleTest::ignore('TestOfXmlResultsParsing');
-}
-
-class TestOfNestingTags extends UnitTestCase {
-    function testGroupSize() {
-        $nesting = new NestingGroupTag(array('SIZE' => 2));
-        $this->assertEqual($nesting->getSize(), 2);
-    }
-}
-
-class TestOfXmlStructureParsing extends UnitTestCase {
-    function testValidXml() {
-        $listener = new MockSimpleScorer();
-        $listener->expectNever('paintGroupStart');
-        $listener->expectNever('paintGroupEnd');
-        $listener->expectNever('paintCaseStart');
-        $listener->expectNever('paintCaseEnd');
-        $parser = new SimpleTestXmlParser($listener);
-        $this->assertTrue($parser->parse("<?xml version=\"1.0\"?>\n"));
-        $this->assertTrue($parser->parse("<run>\n"));
-        $this->assertTrue($parser->parse("</run>\n"));
-    }
-
-    function testEmptyGroup() {
-        $listener = new MockSimpleScorer();
-        $listener->expectOnce('paintGroupStart', array('a_group', 7));
-        $listener->expectOnce('paintGroupEnd', array('a_group'));
-        $parser = new SimpleTestXmlParser($listener);
-        $parser->parse("<?xml version=\"1.0\"?>\n");
-        $parser->parse("<run>\n");
-        $this->assertTrue($parser->parse("<group size=\"7\">\n"));
-        $this->assertTrue($parser->parse("<name>a_group</name>\n"));
-        $this->assertTrue($parser->parse("</group>\n"));
-        $parser->parse("</run>\n");
-    }
-
-    function testEmptyCase() {
-        $listener = new MockSimpleScorer();
-        $listener->expectOnce('paintCaseStart', array('a_case'));
-        $listener->expectOnce('paintCaseEnd', array('a_case'));
-        $parser = new SimpleTestXmlParser($listener);
-        $parser->parse("<?xml version=\"1.0\"?>\n");
-        $parser->parse("<run>\n");
-        $this->assertTrue($parser->parse("<case>\n"));
-        $this->assertTrue($parser->parse("<name>a_case</name>\n"));
-        $this->assertTrue($parser->parse("</case>\n"));
-        $parser->parse("</run>\n");
-    }
-
-    function testEmptyMethod() {
-        $listener = new MockSimpleScorer();
-        $listener->expectOnce('paintCaseStart', array('a_case'));
-        $listener->expectOnce('paintCaseEnd', array('a_case'));
-        $listener->expectOnce('paintMethodStart', array('a_method'));
-        $listener->expectOnce('paintMethodEnd', array('a_method'));
-        $parser = new SimpleTestXmlParser($listener);
-        $parser->parse("<?xml version=\"1.0\"?>\n");
-        $parser->parse("<run>\n");
-        $parser->parse("<case>\n");
-        $parser->parse("<name>a_case</name>\n");
-        $this->assertTrue($parser->parse("<test>\n"));
-        $this->assertTrue($parser->parse("<name>a_method</name>\n"));
-        $this->assertTrue($parser->parse("</test>\n"));
-        $parser->parse("</case>\n");
-        $parser->parse("</run>\n");
-    }
-
-    function testNestedGroup() {
-        $listener = new MockSimpleScorer();
-        $listener->expectAt(0, 'paintGroupStart', array('a_group', 7));
-        $listener->expectAt(1, 'paintGroupStart', array('b_group', 3));
-        $listener->expectCallCount('paintGroupStart', 2);
-        $listener->expectAt(0, 'paintGroupEnd', array('b_group'));
-        $listener->expectAt(1, 'paintGroupEnd', array('a_group'));
-        $listener->expectCallCount('paintGroupEnd', 2);
-
-        $parser = new SimpleTestXmlParser($listener);
-        $parser->parse("<?xml version=\"1.0\"?>\n");
-        $parser->parse("<run>\n");
-
-        $this->assertTrue($parser->parse("<group size=\"7\">\n"));
-        $this->assertTrue($parser->parse("<name>a_group</name>\n"));
-        $this->assertTrue($parser->parse("<group size=\"3\">\n"));
-        $this->assertTrue($parser->parse("<name>b_group</name>\n"));
-        $this->assertTrue($parser->parse("</group>\n"));
-        $this->assertTrue($parser->parse("</group>\n"));
-        $parser->parse("</run>\n");
-    }
-}
-
-class AnyOldSignal {
-    public $stuff = true;
-}
-
-class TestOfXmlResultsParsing extends UnitTestCase {
-
-    function sendValidStart(&$parser) {
-        $parser->parse("<?xml version=\"1.0\"?>\n");
-        $parser->parse("<run>\n");
-        $parser->parse("<case>\n");
-        $parser->parse("<name>a_case</name>\n");
-        $parser->parse("<test>\n");
-        $parser->parse("<name>a_method</name>\n");
-    }
-
-    function sendValidEnd(&$parser) {
-        $parser->parse("</test>\n");
-        $parser->parse("</case>\n");
-        $parser->parse("</run>\n");
-    }
-
-    function testPass() {
-        $listener = new MockSimpleScorer();
-        $listener->expectOnce('paintPass', array('a_message'));
-        $parser = new SimpleTestXmlParser($listener);
-        $this->sendValidStart($parser);
-        $this->assertTrue($parser->parse("<pass>a_message</pass>\n"));
-        $this->sendValidEnd($parser);
-    }
-
-    function testFail() {
-        $listener = new MockSimpleScorer();
-        $listener->expectOnce('paintFail', array('a_message'));
-        $parser = new SimpleTestXmlParser($listener);
-        $this->sendValidStart($parser);
-        $this->assertTrue($parser->parse("<fail>a_message</fail>\n"));
-        $this->sendValidEnd($parser);
-    }
-
-    function testException() {
-        $listener = new MockSimpleScorer();
-        $listener->expectOnce('paintError', array('a_message'));
-        $parser = new SimpleTestXmlParser($listener);
-        $this->sendValidStart($parser);
-        $this->assertTrue($parser->parse("<exception>a_message</exception>\n"));
-        $this->sendValidEnd($parser);
-    }
-
-    function testSkip() {
-        $listener = new MockSimpleScorer();
-        $listener->expectOnce('paintSkip', array('a_message'));
-        $parser = new SimpleTestXmlParser($listener);
-        $this->sendValidStart($parser);
-        $this->assertTrue($parser->parse("<skip>a_message</skip>\n"));
-        $this->sendValidEnd($parser);
-    }
-
-    function testSignal() {
-        $signal = new AnyOldSignal();
-        $signal->stuff = "Hello";
-        $listener = new MockSimpleScorer();
-        $listener->expectOnce('paintSignal', array('a_signal', $signal));
-        $parser = new SimpleTestXmlParser($listener);
-        $this->sendValidStart($parser);
-        $this->assertTrue($parser->parse(
-                "<signal type=\"a_signal\"><![CDATA[" .
-                serialize($signal) . "]]></signal>\n"));
-        $this->sendValidEnd($parser);
-    }
-
-    function testMessage() {
-        $listener = new MockSimpleScorer();
-        $listener->expectOnce('paintMessage', array('a_message'));
-        $parser = new SimpleTestXmlParser($listener);
-        $this->sendValidStart($parser);
-        $this->assertTrue($parser->parse("<message>a_message</message>\n"));
-        $this->sendValidEnd($parser);
-    }
-
-    function testFormattedMessage() {
-        $listener = new MockSimpleScorer();
-        $listener->expectOnce('paintFormattedMessage', array("\na\tmessage\n"));
-        $parser = new SimpleTestXmlParser($listener);
-        $this->sendValidStart($parser);
-        $this->assertTrue($parser->parse("<formatted><![CDATA[\na\tmessage\n]]></formatted>\n"));
-        $this->sendValidEnd($parser);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test_case.php b/3rdparty/simpletest/test_case.php
deleted file mode 100644
index ba023c3b2ea..00000000000
--- a/3rdparty/simpletest/test_case.php
+++ /dev/null
@@ -1,658 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: test_case.php 2012 2011-04-29 08:57:00Z pp11 $
- */
-
-/**#@+
- * Includes SimpleTest files and defined the root constant
- * for dependent libraries.
- */
-require_once(dirname(__FILE__) . '/invoker.php');
-require_once(dirname(__FILE__) . '/errors.php');
-require_once(dirname(__FILE__) . '/compatibility.php');
-require_once(dirname(__FILE__) . '/scorer.php');
-require_once(dirname(__FILE__) . '/expectation.php');
-require_once(dirname(__FILE__) . '/dumper.php');
-require_once(dirname(__FILE__) . '/simpletest.php');
-require_once(dirname(__FILE__) . '/exceptions.php');
-require_once(dirname(__FILE__) . '/reflection_php5.php');
-/**#@-*/
-if (! defined('SIMPLE_TEST')) {
-    /**
-     * @ignore
-     */
-    define('SIMPLE_TEST', dirname(__FILE__) . DIRECTORY_SEPARATOR);
-}
-
-/**
- *    Basic test case. This is the smallest unit of a test
- *    suite. It searches for
- *    all methods that start with the the string "test" and
- *    runs them. Working test cases extend this class.
- *    @package      SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleTestCase {
-    private $label = false;
-    protected $reporter;
-    private $observers;
-    private $should_skip = false;
-
-    /**
-     *    Sets up the test with no display.
-     *    @param string $label    If no test name is given then
-     *                            the class name is used.
-     *    @access public
-     */
-    function __construct($label = false) {
-        if ($label) {
-            $this->label = $label;
-        }
-    }
-
-    /**
-     *    Accessor for the test name for subclasses.
-     *    @return string           Name of the test.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->label ? $this->label : get_class($this);
-    }
-
-    /**
-     *    This is a placeholder for skipping tests. In this
-     *    method you place skipIf() and skipUnless() calls to
-     *    set the skipping state.
-     *    @access public
-     */
-    function skip() {
-    }
-
-    /**
-     *    Will issue a message to the reporter and tell the test
-     *    case to skip if the incoming flag is true.
-     *    @param string $should_skip    Condition causing the tests to be skipped.
-     *    @param string $message        Text of skip condition.
-     *    @access public
-     */
-    function skipIf($should_skip, $message = '%s') {
-        if ($should_skip && ! $this->should_skip) {
-            $this->should_skip = true;
-            $message = sprintf($message, 'Skipping [' . get_class($this) . ']');
-            $this->reporter->paintSkip($message . $this->getAssertionLine());
-        }
-    }
-
-    /**
-     *    Accessor for the private variable $_shoud_skip
-     *    @access public
-     */
-    function shouldSkip() {
-        return $this->should_skip;
-    }
-
-    /**
-     *    Will issue a message to the reporter and tell the test
-     *    case to skip if the incoming flag is false.
-     *    @param string $shouldnt_skip  Condition causing the tests to be run.
-     *    @param string $message        Text of skip condition.
-     *    @access public
-     */
-    function skipUnless($shouldnt_skip, $message = false) {
-        $this->skipIf(! $shouldnt_skip, $message);
-    }
-
-    /**
-     *    Used to invoke the single tests.
-     *    @return SimpleInvoker        Individual test runner.
-     *    @access public
-     */
-    function createInvoker() {
-        return new SimpleErrorTrappingInvoker(
-                new SimpleExceptionTrappingInvoker(new SimpleInvoker($this)));
-    }
-
-    /**
-     *    Uses reflection to run every method within itself
-     *    starting with the string "test" unless a method
-     *    is specified.
-     *    @param SimpleReporter $reporter    Current test reporter.
-     *    @return boolean                    True if all tests passed.
-     *    @access public
-     */
-    function run($reporter) {
-        $context = SimpleTest::getContext();
-        $context->setTest($this);
-        $context->setReporter($reporter);
-        $this->reporter = $reporter;
-        $started = false;
-        foreach ($this->getTests() as $method) {
-            if ($reporter->shouldInvoke($this->getLabel(), $method)) {
-                $this->skip();
-                if ($this->should_skip) {
-                    break;
-                }
-                if (! $started) {
-                    $reporter->paintCaseStart($this->getLabel());
-                    $started = true;
-                }
-                $invoker = $this->reporter->createInvoker($this->createInvoker());
-                $invoker->before($method);
-                $invoker->invoke($method);
-                $invoker->after($method);
-            }
-        }
-        if ($started) {
-            $reporter->paintCaseEnd($this->getLabel());
-        }
-        unset($this->reporter);
-        $context->setTest(null);
-        return $reporter->getStatus();
-    }
-
-    /**
-     *    Gets a list of test names. Normally that will
-     *    be all internal methods that start with the
-     *    name "test". This method should be overridden
-     *    if you want a different rule.
-     *    @return array        List of test names.
-     *    @access public
-     */
-    function getTests() {
-        $methods = array();
-        foreach (get_class_methods(get_class($this)) as $method) {
-            if ($this->isTest($method)) {
-                $methods[] = $method;
-            }
-        }
-        return $methods;
-    }
-
-    /**
-     *    Tests to see if the method is a test that should
-     *    be run. Currently any method that starts with 'test'
-     *    is a candidate unless it is the constructor.
-     *    @param string $method        Method name to try.
-     *    @return boolean              True if test method.
-     *    @access protected
-     */
-    protected function isTest($method) {
-        if (strtolower(substr($method, 0, 4)) == 'test') {
-            return ! SimpleTestCompatibility::isA($this, strtolower($method));
-        }
-        return false;
-    }
-
-    /**
-     *    Announces the start of the test.
-     *    @param string $method    Test method just started.
-     *    @access public
-     */
-    function before($method) {
-        $this->reporter->paintMethodStart($method);
-        $this->observers = array();
-    }
-
-    /**
-     *    Sets up unit test wide variables at the start
-     *    of each test method. To be overridden in
-     *    actual user test cases.
-     *    @access public
-     */
-    function setUp() {
-    }
-
-    /**
-     *    Clears the data set in the setUp() method call.
-     *    To be overridden by the user in actual user test cases.
-     *    @access public
-     */
-    function tearDown() {
-    }
-
-    /**
-     *    Announces the end of the test. Includes private clean up.
-     *    @param string $method    Test method just finished.
-     *    @access public
-     */
-    function after($method) {
-        for ($i = 0; $i < count($this->observers); $i++) {
-            $this->observers[$i]->atTestEnd($method, $this);
-        }
-        $this->reporter->paintMethodEnd($method);
-    }
-
-    /**
-     *    Sets up an observer for the test end.
-     *    @param object $observer    Must have atTestEnd()
-     *                               method.
-     *    @access public
-     */
-    function tell($observer) {
-        $this->observers[] = &$observer;
-    }
-
-    /**
-     *    @deprecated
-     */
-    function pass($message = "Pass") {
-        if (! isset($this->reporter)) {
-            trigger_error('Can only make assertions within test methods');
-        }
-        $this->reporter->paintPass(
-                $message . $this->getAssertionLine());
-        return true;
-    }
-
-    /**
-     *    Sends a fail event with a message.
-     *    @param string $message        Message to send.
-     *    @access public
-     */
-    function fail($message = "Fail") {
-        if (! isset($this->reporter)) {
-            trigger_error('Can only make assertions within test methods');
-        }
-        $this->reporter->paintFail(
-                $message . $this->getAssertionLine());
-        return false;
-    }
-
-    /**
-     *    Formats a PHP error and dispatches it to the
-     *    reporter.
-     *    @param integer $severity  PHP error code.
-     *    @param string $message    Text of error.
-     *    @param string $file       File error occoured in.
-     *    @param integer $line      Line number of error.
-     *    @access public
-     */
-    function error($severity, $message, $file, $line) {
-        if (! isset($this->reporter)) {
-            trigger_error('Can only make assertions within test methods');
-        }
-        $this->reporter->paintError(
-                "Unexpected PHP error [$message] severity [$severity] in [$file line $line]");
-    }
-
-    /**
-     *    Formats an exception and dispatches it to the
-     *    reporter.
-     *    @param Exception $exception    Object thrown.
-     *    @access public
-     */
-    function exception($exception) {
-        $this->reporter->paintException($exception);
-    }
-
-    /**
-     *    For user defined expansion of the available messages.
-     *    @param string $type       Tag for sorting the signals.
-     *    @param mixed $payload     Extra user specific information.
-     */
-    function signal($type, $payload) {
-        if (! isset($this->reporter)) {
-            trigger_error('Can only make assertions within test methods');
-        }
-        $this->reporter->paintSignal($type, $payload);
-    }
-
-    /**
-     *    Runs an expectation directly, for extending the
-     *    tests with new expectation classes.
-     *    @param SimpleExpectation $expectation  Expectation subclass.
-     *    @param mixed $compare               Value to compare.
-     *    @param string $message                 Message to display.
-     *    @return boolean                        True on pass
-     *    @access public
-     */
-    function assert($expectation, $compare, $message = '%s') {
-        if ($expectation->test($compare)) {
-            return $this->pass(sprintf(
-                    $message,
-                    $expectation->overlayMessage($compare, $this->reporter->getDumper())));
-        } else {
-            return $this->fail(sprintf(
-                    $message,
-                    $expectation->overlayMessage($compare, $this->reporter->getDumper())));
-        }
-    }
-
-    /**
-     *    Uses a stack trace to find the line of an assertion.
-     *    @return string           Line number of first assert*
-     *                             method embedded in format string.
-     *    @access public
-     */
-    function getAssertionLine() {
-        $trace = new SimpleStackTrace(array('assert', 'expect', 'pass', 'fail', 'skip'));
-        return $trace->traceMethod();
-    }
-
-    /**
-     *    Sends a formatted dump of a variable to the
-     *    test suite for those emergency debugging
-     *    situations.
-     *    @param mixed $variable    Variable to display.
-     *    @param string $message    Message to display.
-     *    @return mixed             The original variable.
-     *    @access public
-     */
-    function dump($variable, $message = false) {
-        $dumper = $this->reporter->getDumper();
-        $formatted = $dumper->dump($variable);
-        if ($message) {
-            $formatted = $message . "\n" . $formatted;
-        }
-        $this->reporter->paintFormattedMessage($formatted);
-        return $variable;
-    }
-
-    /**
-     *    Accessor for the number of subtests including myelf.
-     *    @return integer           Number of test cases.
-     *    @access public
-     */
-    function getSize() {
-        return 1;
-    }
-}
-
-/**
- *  Helps to extract test cases automatically from a file.
- *    @package      SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleFileLoader {
-
-    /**
-     *    Builds a test suite from a library of test cases.
-     *    The new suite is composed into this one.
-     *    @param string $test_file        File name of library with
-     *                                    test case classes.
-     *    @return TestSuite               The new test suite.
-     *    @access public
-     */
-    function load($test_file) {
-        $existing_classes = get_declared_classes();
-        $existing_globals = get_defined_vars();
-        include_once($test_file);
-        $new_globals = get_defined_vars();
-        $this->makeFileVariablesGlobal($existing_globals, $new_globals);
-        $new_classes = array_diff(get_declared_classes(), $existing_classes);
-        if (empty($new_classes)) {
-            $new_classes = $this->scrapeClassesFromFile($test_file);
-        }
-        $classes = $this->selectRunnableTests($new_classes);
-        return $this->createSuiteFromClasses($test_file, $classes);
-    }
-
-    /**
-     *    Imports new variables into the global namespace.
-     *    @param hash $existing   Variables before the file was loaded.
-     *    @param hash $new        Variables after the file was loaded.
-     *    @access private
-     */
-    protected function makeFileVariablesGlobal($existing, $new) {
-        $globals = array_diff(array_keys($new), array_keys($existing));
-        foreach ($globals as $global) {
-            $GLOBALS[$global] = $new[$global];
-        }
-    }
-
-    /**
-     *    Lookup classnames from file contents, in case the
-     *    file may have been included before.
-     *    Note: This is probably too clever by half. Figuring this
-     *    out after a failed test case is going to be tricky for us,
-     *    never mind the user. A test case should not be included
-     *    twice anyway.
-     *    @param string $test_file        File name with classes.
-     *    @access private
-     */
-    protected function scrapeClassesFromFile($test_file) {
-        preg_match_all('~^\s*class\s+(\w+)(\s+(extends|implements)\s+\w+)*\s*\{~mi',
-                        file_get_contents($test_file),
-                        $matches );
-        return $matches[1];
-    }
-
-    /**
-     *    Calculates the incoming test cases. Skips abstract
-     *    and ignored classes.
-     *    @param array $candidates   Candidate classes.
-     *    @return array              New classes which are test
-     *                               cases that shouldn't be ignored.
-     *    @access public
-     */
-    function selectRunnableTests($candidates) {
-        $classes = array();
-        foreach ($candidates as $class) {
-            if (TestSuite::getBaseTestCase($class)) {
-                $reflection = new SimpleReflection($class);
-                if ($reflection->isAbstract()) {
-                    SimpleTest::ignore($class);
-                } else {
-                    $classes[] = $class;
-                }
-            }
-        }
-        return $classes;
-    }
-
-    /**
-     *    Builds a test suite from a class list.
-     *    @param string $title       Title of new group.
-     *    @param array $classes      Test classes.
-     *    @return TestSuite          Group loaded with the new
-     *                               test cases.
-     *    @access public
-     */
-    function createSuiteFromClasses($title, $classes) {
-        if (count($classes) == 0) {
-            $suite = new BadTestSuite($title, "No runnable test cases in [$title]");
-            return $suite;
-        }
-        SimpleTest::ignoreParentsIfIgnored($classes);
-        $suite = new TestSuite($title);
-        foreach ($classes as $class) {
-            if (! SimpleTest::isIgnored($class)) {
-                $suite->add($class);
-            }
-        }
-        return $suite;
-    }
-}
-
-/**
- *    This is a composite test class for combining
- *    test cases and other RunnableTest classes into
- *    a group test.
- *    @package      SimpleTest
- *    @subpackage   UnitTester
- */
-class TestSuite {
-    private $label;
-    private $test_cases;
-
-    /**
-     *    Sets the name of the test suite.
-     *    @param string $label    Name sent at the start and end
-     *                            of the test.
-     *    @access public
-     */
-    function TestSuite($label = false) {
-        $this->label = $label;
-        $this->test_cases = array();
-    }
-
-    /**
-     *    Accessor for the test name for subclasses. If the suite
-     *    wraps a single test case the label defaults to the name of that test.
-     *    @return string           Name of the test.
-     *    @access public
-     */
-    function getLabel() {
-        if (! $this->label) {
-            return ($this->getSize() == 1) ?
-                    get_class($this->test_cases[0]) : get_class($this);
-        } else {
-            return $this->label;
-        }
-    }
-
-    /**
-     *    Adds a test into the suite by instance or class. The class will
-     *    be instantiated if it's a test suite.
-     *    @param SimpleTestCase $test_case  Suite or individual test
-     *                                      case implementing the
-     *                                      runnable test interface.
-     *    @access public
-     */
-    function add($test_case) {
-        if (! is_string($test_case)) {
-            $this->test_cases[] = $test_case;
-        } elseif (TestSuite::getBaseTestCase($test_case) == 'testsuite') {
-            $this->test_cases[] = new $test_case();
-        } else {
-            $this->test_cases[] = $test_case;
-        }
-    }
-
-    /**
-     *    Builds a test suite from a library of test cases.
-     *    The new suite is composed into this one.
-     *    @param string $test_file        File name of library with
-     *                                    test case classes.
-     *    @access public
-     */
-    function addFile($test_file) {
-        $extractor = new SimpleFileLoader();
-        $this->add($extractor->load($test_file));
-    }
-
-    /**
-     *    Delegates to a visiting collector to add test
-     *    files.
-     *    @param string $path                  Path to scan from.
-     *    @param SimpleCollector $collector    Directory scanner.
-     *    @access public
-     */
-    function collect($path, $collector) {
-        $collector->collect($this, $path);
-    }
-
-    /**
-     *    Invokes run() on all of the held test cases, instantiating
-     *    them if necessary.
-     *    @param SimpleReporter $reporter    Current test reporter.
-     *    @access public
-     */
-    function run($reporter) {
-        $reporter->paintGroupStart($this->getLabel(), $this->getSize());
-        for ($i = 0, $count = count($this->test_cases); $i < $count; $i++) {
-            if (is_string($this->test_cases[$i])) {
-                $class = $this->test_cases[$i];
-                $test = new $class();
-                $test->run($reporter);
-                unset($test);
-            } else {
-                $this->test_cases[$i]->run($reporter);
-            }
-        }
-        $reporter->paintGroupEnd($this->getLabel());
-        return $reporter->getStatus();
-    }
-
-    /**
-     *    Number of contained test cases.
-     *    @return integer     Total count of cases in the group.
-     *    @access public
-     */
-    function getSize() {
-        $count = 0;
-        foreach ($this->test_cases as $case) {
-            if (is_string($case)) {
-                if (! SimpleTest::isIgnored($case)) {
-                    $count++;
-                }
-            } else {
-                $count += $case->getSize();
-            }
-        }
-        return $count;
-    }
-
-    /**
-     *    Test to see if a class is derived from the
-     *    SimpleTestCase class.
-     *    @param string $class     Class name.
-     *    @access public
-     */
-    static function getBaseTestCase($class) {
-        while ($class = get_parent_class($class)) {
-            $class = strtolower($class);
-            if ($class == 'simpletestcase' || $class == 'testsuite') {
-                return $class;
-            }
-        }
-        return false;
-    }
-}
-
-/**
- *    This is a failing group test for when a test suite hasn't
- *    loaded properly.
- *    @package      SimpleTest
- *    @subpackage   UnitTester
- */
-class BadTestSuite {
-    private $label;
-    private $error;
-
-    /**
-     *    Sets the name of the test suite and error message.
-     *    @param string $label    Name sent at the start and end
-     *                            of the test.
-     *    @access public
-     */
-    function BadTestSuite($label, $error) {
-        $this->label = $label;
-        $this->error = $error;
-    }
-
-    /**
-     *    Accessor for the test name for subclasses.
-     *    @return string           Name of the test.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->label;
-    }
-
-    /**
-     *    Sends a single error to the reporter.
-     *    @param SimpleReporter $reporter    Current test reporter.
-     *    @access public
-     */
-    function run($reporter) {
-        $reporter->paintGroupStart($this->getLabel(), $this->getSize());
-        $reporter->paintFail('Bad TestSuite [' . $this->getLabel() .
-                '] with error [' . $this->error . ']');
-        $reporter->paintGroupEnd($this->getLabel());
-        return $reporter->getStatus();
-    }
-
-    /**
-     *    Number of contained test cases. Always zero.
-     *    @return integer     Total count of cases in the group.
-     *    @access public
-     */
-    function getSize() {
-        return 0;
-    }
-}
-?>
diff --git a/3rdparty/simpletest/tidy_parser.php b/3rdparty/simpletest/tidy_parser.php
deleted file mode 100755
index 3d8b4b2ac7d..00000000000
--- a/3rdparty/simpletest/tidy_parser.php
+++ /dev/null
@@ -1,382 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: php_parser.php 1911 2009-07-29 16:38:04Z lastcraft $
- */
-
-/**
- *    Builds the page object.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTidyPageBuilder {
-    private $page;
-    private $forms = array();
-    private $labels = array();
-    private $widgets_by_id = array();
-
-    public function __destruct() {
-        $this->free();
-    }
-
-    /**
-     *    Frees up any references so as to allow the PHP garbage
-     *    collection from unset() to work.
-     */
-    private function free() {
-        unset($this->page);
-        $this->forms = array();
-        $this->labels = array();
-    }
-
-    /**
-     *    This builder is only available if the 'tidy' extension is loaded.
-     *    @return boolean       True if available.
-     */
-    function can() {
-        return extension_loaded('tidy');
-    }
-
-    /**
-     *    Reads the raw content the page using HTML Tidy.
-     *    @param $response SimpleHttpResponse  Fetched response.
-     *    @return SimplePage                   Newly parsed page.
-     */
-    function parse($response) {
-        $this->page = new SimplePage($response);
-        $tidied = tidy_parse_string($input = $this->insertGuards($response->getContent()),
-                                    array('output-xml' => false, 'wrap' => '0', 'indent' => 'no'),
-                                    'latin1');
-        $this->walkTree($tidied->html());
-        $this->attachLabels($this->widgets_by_id, $this->labels);
-        $this->page->setForms($this->forms);
-        $page = $this->page;
-        $this->free();
-        return $page;
-    }
-
-    /**
-     *    Stops HTMLTidy stripping content that we wish to preserve.
-     *    @param string      The raw html.
-     *    @return string     The html with guard tags inserted.
-     */
-    private function insertGuards($html) {
-        return $this->insertEmptyTagGuards($this->insertTextareaSimpleWhitespaceGuards($html));
-    }
-
-    /**
-     *    Removes the extra content added during the parse stage
-     *    in order to preserve content we don't want stripped
-     *    out by HTMLTidy.
-     *    @param string      The raw html.
-     *    @return string     The html with guard tags removed.
-     */
-    private function stripGuards($html) {
-        return $this->stripTextareaWhitespaceGuards($this->stripEmptyTagGuards($html));
-    }
-
-    /**
-     *    HTML tidy strips out empty tags such as <option> which we
-     *    need to preserve. This method inserts an additional marker.
-     *    @param string      The raw html.
-     *    @return string     The html with guards inserted.
-     */
-    private function insertEmptyTagGuards($html) {
-        return preg_replace('#<(option|textarea)([^>]*)>(\s*)</(option|textarea)>#is',
-                            '<\1\2>___EMPTY___\3</\4>',
-                            $html);
-    }
-
-    /**
-     *    HTML tidy strips out empty tags such as <option> which we
-     *    need to preserve. This method strips additional markers
-     *    inserted by SimpleTest to the tidy output used to make the
-     *    tags non-empty. This ensures their preservation.
-     *    @param string      The raw html.
-     *    @return string     The html with guards removed.
-     */
-    private function stripEmptyTagGuards($html) {
-        return preg_replace('#(^|>)(\s*)___EMPTY___(\s*)(</|$)#i', '\2\3', $html);
-    }
-
-    /**
-     *    By parsing the XML output of tidy, we lose some whitespace
-     *    information in textarea tags. We temporarily recode this
-     *    data ourselves so as not to lose it.
-     *    @param string      The raw html.
-     *    @return string     The html with guards inserted.
-     */
-    private function insertTextareaSimpleWhitespaceGuards($html) {
-        return preg_replace_callback('#<textarea([^>]*)>(.*?)</textarea>#is',
-                                     array($this, 'insertWhitespaceGuards'),
-                                     $html);
-    }
-
-    /**
-     *  Callback for insertTextareaSimpleWhitespaceGuards().
-     *  @param array $matches       Result of preg_replace_callback().
-     *  @return string              Guard tags now replace whitespace.
-     */
-    private function insertWhitespaceGuards($matches) {
-        return '<textarea' . $matches[1] . '>' .
-                str_replace(array("\n", "\r", "\t", ' '),
-                            array('___NEWLINE___', '___CR___', '___TAB___', '___SPACE___'),
-                            $matches[2]) .
-                '</textarea>';
-    }
-
-    /**
-     *    Removes the whitespace preserving guards we added
-     *    before parsing.
-     *    @param string      The raw html.
-     *    @return string     The html with guards removed.
-     */
-    private function stripTextareaWhitespaceGuards($html) {
-        return str_replace(array('___NEWLINE___', '___CR___', '___TAB___', '___SPACE___'),
-                           array("\n", "\r", "\t", ' '),
-                           $html);
-    }
-
-    /**
-     *  Visits the given node and all children
-     *  @param object $node      Tidy XML node.
-     */
-    private function walkTree($node) {
-        if ($node->name == 'a') {
-            $this->page->addLink($this->tags()->createTag($node->name, (array)$node->attribute)
-                                        ->addContent($this->innerHtml($node)));
-        } elseif ($node->name == 'base' and isset($node->attribute['href'])) {
-            $this->page->setBase($node->attribute['href']);
-        } elseif ($node->name == 'title') {
-            $this->page->setTitle($this->tags()->createTag($node->name, (array)$node->attribute)
-                                         ->addContent($this->innerHtml($node)));
-        } elseif ($node->name == 'frameset') {
-            $this->page->setFrames($this->collectFrames($node));
-        } elseif ($node->name == 'form') {
-            $this->forms[] = $this->walkForm($node, $this->createEmptyForm($node));
-        } elseif ($node->name == 'label') {
-            $this->labels[] = $this->tags()->createTag($node->name, (array)$node->attribute)
-                                           ->addContent($this->innerHtml($node));
-        } else {
-            $this->walkChildren($node);
-        }
-    }
-
-    /**
-     *  Helper method for traversing the XML tree.
-     *  @param object $node     Tidy XML node.
-     */
-    private function walkChildren($node) {
-        if ($node->hasChildren()) {
-            foreach ($node->child as $child) {
-                $this->walkTree($child);
-            }
-        }
-    }
-
-    /**
-     *  Facade for forms containing preparsed widgets.
-     *  @param object $node     Tidy XML node.
-     *  @return SimpleForm      Facade for SimpleBrowser.
-     */
-    private function createEmptyForm($node) {
-        return new SimpleForm($this->tags()->createTag($node->name, (array)$node->attribute), $this->page);
-    }
-
-    /**
-     *  Visits the given node and all children
-     *  @param object $node      Tidy XML node.
-     */
-    private function walkForm($node, $form, $enclosing_label = '') {
-        if ($node->name == 'a') {
-            $this->page->addLink($this->tags()->createTag($node->name, (array)$node->attribute)
-                                              ->addContent($this->innerHtml($node)));
-        } elseif (in_array($node->name, array('input', 'button', 'textarea', 'select'))) {
-            $this->addWidgetToForm($node, $form, $enclosing_label);
-        } elseif ($node->name == 'label') {
-            $this->labels[] = $this->tags()->createTag($node->name, (array)$node->attribute)
-                                           ->addContent($this->innerHtml($node));
-            if ($node->hasChildren()) {
-                foreach ($node->child as $child) {
-                    $this->walkForm($child, $form, SimplePage::normalise($this->innerHtml($node)));
-                }
-            }
-        } elseif ($node->hasChildren()) {
-            foreach ($node->child as $child) {
-                $this->walkForm($child, $form);
-            }
-        }
-        return $form;
-    }
-
-    /**
-     *  Tests a node for a "for" atribute. Used for
-     *  attaching labels.
-     *  @param object $node      Tidy XML node.
-     *  @return boolean          True if the "for" attribute exists.
-     */
-    private function hasFor($node) {
-        return isset($node->attribute) and $node->attribute['for'];
-    }
-
-    /**
-     *  Adds the widget into the form container.
-     *  @param object $node             Tidy XML node of widget.
-     *  @param SimpleForm $form         Form to add it to.
-     *  @param string $enclosing_label  The label of any label
-     *                                  tag we might be in.
-     */
-    private function addWidgetToForm($node, $form, $enclosing_label) {
-        $widget = $this->tags()->createTag($node->name, $this->attributes($node));
-        if (! $widget) {
-            return;
-        }
-        $widget->setLabel($enclosing_label)
-               ->addContent($this->innerHtml($node));
-        if ($node->name == 'select') {
-            $widget->addTags($this->collectSelectOptions($node));
-        }
-        $form->addWidget($widget);
-        $this->indexWidgetById($widget);
-    }
-
-    /**
-     *  Fills the widget cache to speed up searching.
-     *  @param SimpleTag $widget    Parsed widget to cache.
-     */
-    private function indexWidgetById($widget) {
-        $id = $widget->getAttribute('id');
-        if (! $id) {
-            return;
-        }
-        if (! isset($this->widgets_by_id[$id])) {
-            $this->widgets_by_id[$id] = array();
-        }
-        $this->widgets_by_id[$id][] = $widget;
-    }
-
-    /**
-     *  Parses the options from inside an XML select node.
-     *  @param object $node      Tidy XML node.
-     *  @return array            List of SimpleTag options.
-     */
-    private function collectSelectOptions($node) {
-        $options = array();
-        if ($node->name == 'option') {
-            $options[] = $this->tags()->createTag($node->name, $this->attributes($node))
-                                      ->addContent($this->innerHtml($node));
-        }
-        if ($node->hasChildren()) {
-            foreach ($node->child as $child) {
-                $options = array_merge($options, $this->collectSelectOptions($child));
-            }
-        }
-        return $options;
-    }
-
-    /**
-     *  Convenience method for collecting all the attributes
-     *  of a tag. Not sure why Tidy does not have this.
-     *  @param object $node      Tidy XML node.
-     *  @return array            Hash of attribute strings.
-     */
-    private function attributes($node) {
-        if (! preg_match('|<[^ ]+\s(.*?)/?>|s', $node->value, $first_tag_contents)) {
-            return array();
-        }
-        $attributes = array();
-        preg_match_all('/\S+\s*=\s*\'[^\']*\'|(\S+\s*=\s*"[^"]*")|([^ =]+\s*=\s*[^ "\']+?)|[^ "\']+/', $first_tag_contents[1], $matches);
-        foreach($matches[0] as $unparsed) {
-            $attributes = $this->mergeAttribute($attributes, $unparsed);
-        }
-        return $attributes;
-    }
-
-    /**
-     *  Overlay an attribute into the attributes hash.
-     *  @param array $attributes        Current attribute list.
-     *  @param string $raw              Raw attribute string with
-     *                                  both key and value.
-     *  @return array                   New attribute hash.
-     */
-    private function mergeAttribute($attributes, $raw) {
-        $parts = explode('=', $raw);
-        list($name, $value) = count($parts) == 1 ? array($parts[0], $parts[0]) : $parts;
-        $attributes[trim($name)] = html_entity_decode($this->dequote(trim($value)), ENT_QUOTES);
-        return $attributes;
-    }
-
-    /**
-     *  Remove start and end quotes.
-     *  @param string $quoted    A quoted string.
-     *  @return string           Quotes are gone.
-     */
-    private function dequote($quoted) {
-        if (preg_match('/^(\'([^\']*)\'|"([^"]*)")$/', $quoted, $matches)) {
-            return isset($matches[3]) ? $matches[3] : $matches[2];
-        }
-        return $quoted;
-    }
-
-    /**
-     *  Collects frame information inside a frameset tag.
-     *  @param object $node     Tidy XML node.
-     *  @return array           List of SimpleTag frame descriptions.
-     */
-    private function collectFrames($node) {
-        $frames = array();
-        if ($node->name == 'frame') {
-            $frames = array($this->tags()->createTag($node->name, (array)$node->attribute));
-        } else if ($node->hasChildren()) {
-            $frames = array();
-            foreach ($node->child as $child) {
-                $frames = array_merge($frames, $this->collectFrames($child));
-            }
-        }
-        return $frames;
-    }
-
-    /**
-     *  Extracts the XML node text.
-     *  @param object $node     Tidy XML node.
-     *  @return string          The text only.
-     */
-    private function innerHtml($node) {
-        $raw = '';
-        if ($node->hasChildren()) {
-            foreach ($node->child as $child) {
-                $raw .= $child->value;
-            }
-        }
-        return $this->stripGuards($raw);
-    }
-
-    /**
-     *  Factory for parsed content holders.
-     *  @return SimpleTagBuilder    Factory.
-     */
-    private function tags() {
-        return new SimpleTagBuilder();
-    }
-
-    /**
-     *  Called at the end of a parse run. Attaches any
-     *  non-wrapping labels to their form elements.
-     *  @param array $widgets_by_id     Cached SimpleTag hash.
-     *  @param array $labels            SimpleTag label elements.
-     */
-    private function attachLabels($widgets_by_id, $labels) {
-        foreach ($labels as $label) {
-            $for = $label->getFor();
-            if ($for and isset($widgets_by_id[$for])) {
-                $text = $label->getText();
-                foreach ($widgets_by_id[$for] as $widget) {
-                    $widget->setLabel($text);
-                }
-            }
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/unit_tester.php b/3rdparty/simpletest/unit_tester.php
deleted file mode 100755
index ce82660afa2..00000000000
--- a/3rdparty/simpletest/unit_tester.php
+++ /dev/null
@@ -1,413 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: unit_tester.php 1882 2009-07-01 14:30:05Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/test_case.php');
-require_once(dirname(__FILE__) . '/dumper.php');
-/**#@-*/
-
-/**
- *    Standard unit test class for day to day testing
- *    of PHP code XP style. Adds some useful standard
- *    assertions.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class UnitTestCase extends SimpleTestCase {
-
-    /**
-     *    Creates an empty test case. Should be subclassed
-     *    with test methods for a functional test case.
-     *    @param string $label     Name of test case. Will use
-     *                             the class name if none specified.
-     *    @access public
-     */
-    function __construct($label = false) {
-        if (! $label) {
-            $label = get_class($this);
-        }
-        parent::__construct($label);
-    }
-
-    /**
-     *    Called from within the test methods to register
-     *    passes and failures.
-     *    @param boolean $result    Pass on true.
-     *    @param string $message    Message to display describing
-     *                              the test state.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertTrue($result, $message = '%s') {
-        return $this->assert(new TrueExpectation(), $result, $message);
-    }
-
-    /**
-     *    Will be true on false and vice versa. False
-     *    is the PHP definition of false, so that null,
-     *    empty strings, zero and an empty array all count
-     *    as false.
-     *    @param boolean $result    Pass on false.
-     *    @param string $message    Message to display.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertFalse($result, $message = '%s') {
-        return $this->assert(new FalseExpectation(), $result, $message);
-    }
-
-    /**
-     *    Will be true if the value is null.
-     *    @param null $value       Supposedly null value.
-     *    @param string $message   Message to display.
-     *    @return boolean                        True on pass
-     *    @access public
-     */
-    function assertNull($value, $message = '%s') {
-        $dumper = new SimpleDumper();
-        $message = sprintf(
-                $message,
-                '[' . $dumper->describeValue($value) . '] should be null');
-        return $this->assertTrue(! isset($value), $message);
-    }
-
-    /**
-     *    Will be true if the value is set.
-     *    @param mixed $value           Supposedly set value.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass.
-     *    @access public
-     */
-    function assertNotNull($value, $message = '%s') {
-        $dumper = new SimpleDumper();
-        $message = sprintf(
-                $message,
-                '[' . $dumper->describeValue($value) . '] should not be null');
-        return $this->assertTrue(isset($value), $message);
-    }
-
-    /**
-     *    Type and class test. Will pass if class
-     *    matches the type name or is a subclass or
-     *    if not an object, but the type is correct.
-     *    @param mixed $object         Object to test.
-     *    @param string $type          Type name as string.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass.
-     *    @access public
-     */
-    function assertIsA($object, $type, $message = '%s') {
-        return $this->assert(
-                new IsAExpectation($type),
-                $object,
-                $message);
-    }
-
-    /**
-     *    Type and class mismatch test. Will pass if class
-     *    name or underling type does not match the one
-     *    specified.
-     *    @param mixed $object         Object to test.
-     *    @param string $type          Type name as string.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass.
-     *    @access public
-     */
-    function assertNotA($object, $type, $message = '%s') {
-        return $this->assert(
-                new NotAExpectation($type),
-                $object,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    the same value only. Otherwise a fail.
-     *    @param mixed $first          Value to compare.
-     *    @param mixed $second         Value to compare.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass
-     *    @access public
-     */
-    function assertEqual($first, $second, $message = '%s') {
-        return $this->assert(
-                new EqualExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    a different value. Otherwise a fail.
-     *    @param mixed $first           Value to compare.
-     *    @param mixed $second          Value to compare.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertNotEqual($first, $second, $message = '%s') {
-        return $this->assert(
-                new NotEqualExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the if the first parameter
-     *    is near enough to the second by the margin.
-     *    @param mixed $first          Value to compare.
-     *    @param mixed $second         Value to compare.
-     *    @param mixed $margin         Fuzziness of match.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass
-     *    @access public
-     */
-    function assertWithinMargin($first, $second, $margin, $message = '%s') {
-        return $this->assert(
-                new WithinMarginExpectation($first, $margin),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters differ
-     *    by more than the margin.
-     *    @param mixed $first          Value to compare.
-     *    @param mixed $second         Value to compare.
-     *    @param mixed $margin         Fuzziness of match.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass
-     *    @access public
-     */
-    function assertOutsideMargin($first, $second, $margin, $message = '%s') {
-        return $this->assert(
-                new OutsideMarginExpectation($first, $margin),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    the same value and same type. Otherwise a fail.
-     *    @param mixed $first           Value to compare.
-     *    @param mixed $second          Value to compare.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertIdentical($first, $second, $message = '%s') {
-        return $this->assert(
-                new IdenticalExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    the different value or different type.
-     *    @param mixed $first           Value to compare.
-     *    @param mixed $second          Value to compare.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertNotIdentical($first, $second, $message = '%s') {
-        return $this->assert(
-                new NotIdenticalExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if both parameters refer
-     *    to the same object or value. Fail otherwise.
-     *    This will cause problems testing objects under
-     *    E_STRICT.
-     *    TODO: Replace with expectation.
-     *    @param mixed $first           Reference to check.
-     *    @param mixed $second          Hopefully the same variable.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertReference(&$first, &$second, $message = '%s') {
-        $dumper = new SimpleDumper();
-        $message = sprintf(
-                $message,
-                '[' . $dumper->describeValue($first) .
-                        '] and [' . $dumper->describeValue($second) .
-                        '] should reference the same object');
-        return $this->assertTrue(
-                SimpleTestCompatibility::isReference($first, $second),
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if both parameters refer
-     *    to the same object. Fail otherwise. This has
-     *    the same semantics at the PHPUnit assertSame.
-     *    That is, if values are passed in it has roughly
-     *    the same affect as assertIdentical.
-     *    TODO: Replace with expectation.
-     *    @param mixed $first           Object reference to check.
-     *    @param mixed $second          Hopefully the same object.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertSame($first, $second, $message = '%s') {
-        $dumper = new SimpleDumper();
-        $message = sprintf(
-                $message,
-                '[' . $dumper->describeValue($first) .
-                        '] and [' . $dumper->describeValue($second) .
-                        '] should reference the same object');
-        return $this->assertTrue($first === $second, $message);
-    }
-
-    /**
-     *    Will trigger a pass if both parameters refer
-     *    to different objects. Fail otherwise. The objects
-     *    have to be identical though.
-     *    @param mixed $first           Object reference to check.
-     *    @param mixed $second          Hopefully not the same object.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertClone($first, $second, $message = '%s') {
-        $dumper = new SimpleDumper();
-        $message = sprintf(
-                $message,
-                '[' . $dumper->describeValue($first) .
-                        '] and [' . $dumper->describeValue($second) .
-                        '] should not be the same object');
-        $identical = new IdenticalExpectation($first);
-        return $this->assertTrue(
-                $identical->test($second) && ! ($first === $second),
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if both parameters refer
-     *    to different variables. Fail otherwise. The objects
-     *    have to be identical references though.
-     *    This will fail under E_STRICT with objects. Use
-     *    assertClone() for this.
-     *    @param mixed $first           Object reference to check.
-     *    @param mixed $second          Hopefully not the same object.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertCopy(&$first, &$second, $message = "%s") {
-        $dumper = new SimpleDumper();
-        $message = sprintf(
-                $message,
-                "[" . $dumper->describeValue($first) .
-                        "] and [" . $dumper->describeValue($second) .
-                        "] should not be the same object");
-        return $this->assertFalse(
-                SimpleTestCompatibility::isReference($first, $second),
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the Perl regex pattern
-     *    is found in the subject. Fail otherwise.
-     *    @param string $pattern    Perl regex to look for including
-     *                              the regex delimiters.
-     *    @param string $subject    String to search in.
-     *    @param string $message    Message to display.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertPattern($pattern, $subject, $message = '%s') {
-        return $this->assert(
-                new PatternExpectation($pattern),
-                $subject,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the perl regex pattern
-     *    is not present in subject. Fail if found.
-     *    @param string $pattern    Perl regex to look for including
-     *                              the regex delimiters.
-     *    @param string $subject    String to search in.
-     *    @param string $message    Message to display.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertNoPattern($pattern, $subject, $message = '%s') {
-        return $this->assert(
-                new NoPatternExpectation($pattern),
-                $subject,
-                $message);
-    }
-
-    /**
-     *    Prepares for an error. If the error mismatches it
-     *    passes through, otherwise it is swallowed. Any
-     *    left over errors trigger failures.
-     *    @param SimpleExpectation/string $expected   The error to match.
-     *    @param string $message                      Message on failure.
-     *    @access public
-     */
-    function expectError($expected = false, $message = '%s') {
-        $queue = SimpleTest::getContext()->get('SimpleErrorQueue');
-        $queue->expectError($this->coerceExpectation($expected), $message);
-    }
-
-    /**
-     *    Prepares for an exception. If the error mismatches it
-     *    passes through, otherwise it is swallowed. Any
-     *    left over errors trigger failures.
-     *    @param SimpleExpectation/Exception $expected  The error to match.
-     *    @param string $message                        Message on failure.
-     *    @access public
-     */
-    function expectException($expected = false, $message = '%s') {
-        $queue = SimpleTest::getContext()->get('SimpleExceptionTrap');
-        $line = $this->getAssertionLine();
-        $queue->expectException($expected, $message . $line);
-    }
-
-    /**
-     *    Tells SimpleTest to ignore an upcoming exception as not relevant
-     *    to the current test. It doesn't affect the test, whether thrown or
-     *    not.
-     *    @param SimpleExpectation/Exception $ignored  The error to ignore.
-     *    @access public
-     */
-    function ignoreException($ignored = false) {
-        SimpleTest::getContext()->get('SimpleExceptionTrap')->ignoreException($ignored);
-    }
-
-    /**
-     *    Creates an equality expectation if the
-     *    object/value is not already some type
-     *    of expectation.
-     *    @param mixed $expected      Expected value.
-     *    @return SimpleExpectation   Expectation object.
-     *    @access private
-     */
-    protected function coerceExpectation($expected) {
-        if ($expected == false) {
-            return new TrueExpectation();
-        }
-        if (SimpleTestCompatibility::isA($expected, 'SimpleExpectation')) {
-            return $expected;
-        }
-        return new EqualExpectation(
-                is_string($expected) ? str_replace('%', '%%', $expected) : $expected);
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/url.php b/3rdparty/simpletest/url.php
deleted file mode 100644
index 11d70e745ee..00000000000
--- a/3rdparty/simpletest/url.php
+++ /dev/null
@@ -1,550 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: url.php 2011 2011-04-29 08:22:48Z pp11 $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/encoding.php');
-/**#@-*/
-
-/**
- *    URL parser to replace parse_url() PHP function which
- *    got broken in PHP 4.3.0. Adds some browser specific
- *    functionality such as expandomatics.
- *    Guesses a bit trying to separate the host from
- *    the path and tries to keep a raw, possibly unparsable,
- *    request string as long as possible.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleUrl {
-    private $scheme;
-    private $username;
-    private $password;
-    private $host;
-    private $port;
-    public $path;
-    private $request;
-    private $fragment;
-    private $x;
-    private $y;
-    private $target;
-    private $raw = false;
-
-    /**
-     *    Constructor. Parses URL into sections.
-     *    @param string $url        Incoming URL.
-     *    @access public
-     */
-    function __construct($url = '') {
-        list($x, $y) = $this->chompCoordinates($url);
-        $this->setCoordinates($x, $y);
-        $this->scheme = $this->chompScheme($url);
-        if ($this->scheme === 'file') {
-            // Unescaped backslashes not used in directory separator context
-            // will get caught by this, but they should have been urlencoded
-            // anyway so we don't care. If this ends up being a problem, the
-            // host regexp must be modified to match for backslashes when
-            // the scheme is file.
-            $url = str_replace('\\', '/', $url);
-        }
-        list($this->username, $this->password) = $this->chompLogin($url);
-        $this->host = $this->chompHost($url);
-        $this->port = false;
-        if (preg_match('/(.*?):(.*)/', $this->host, $host_parts)) {
-            if ($this->scheme === 'file' && strlen($this->host) === 2) {
-                // DOS drive was placed in authority; promote it to path.
-                $url = '/' . $this->host . $url;
-                $this->host = false;
-            } else {
-                $this->host = $host_parts[1];
-                $this->port = (integer)$host_parts[2];
-            }
-        }
-        $this->path = $this->chompPath($url);
-        $this->request = $this->parseRequest($this->chompRequest($url));
-        $this->fragment = (strncmp($url, "#", 1) == 0 ? substr($url, 1) : false);
-        $this->target = false;
-    }
-
-    /**
-     *    Extracts the X, Y coordinate pair from an image map.
-     *    @param string $url   URL so far. The coordinates will be
-     *                         removed.
-     *    @return array        X, Y as a pair of integers.
-     *    @access private
-     */
-    protected function chompCoordinates(&$url) {
-        if (preg_match('/(.*)\?(\d+),(\d+)$/', $url, $matches)) {
-            $url = $matches[1];
-            return array((integer)$matches[2], (integer)$matches[3]);
-        }
-        return array(false, false);
-    }
-
-    /**
-     *    Extracts the scheme part of an incoming URL.
-     *    @param string $url   URL so far. The scheme will be
-     *                         removed.
-     *    @return string       Scheme part or false.
-     *    @access private
-     */
-    protected function chompScheme(&$url) {
-        if (preg_match('#^([^/:]*):(//)(.*)#', $url, $matches)) {
-            $url = $matches[2] . $matches[3];
-            return $matches[1];
-        }
-        return false;
-    }
-
-    /**
-     *    Extracts the username and password from the
-     *    incoming URL. The // prefix will be reattached
-     *    to the URL after the doublet is extracted.
-     *    @param string $url    URL so far. The username and
-     *                          password are removed.
-     *    @return array         Two item list of username and
-     *                          password. Will urldecode() them.
-     *    @access private
-     */
-    protected function chompLogin(&$url) {
-        $prefix = '';
-        if (preg_match('#^(//)(.*)#', $url, $matches)) {
-            $prefix = $matches[1];
-            $url = $matches[2];
-        }
-        if (preg_match('#^([^/]*)@(.*)#', $url, $matches)) {
-            $url = $prefix . $matches[2];
-            $parts = explode(":", $matches[1]);
-            return array(
-                    urldecode($parts[0]),
-                    isset($parts[1]) ? urldecode($parts[1]) : false);
-        }
-        $url = $prefix . $url;
-        return array(false, false);
-    }
-
-    /**
-     *    Extracts the host part of an incoming URL.
-     *    Includes the port number part. Will extract
-     *    the host if it starts with // or it has
-     *    a top level domain or it has at least two
-     *    dots.
-     *    @param string $url    URL so far. The host will be
-     *                          removed.
-     *    @return string        Host part guess or false.
-     *    @access private
-     */
-    protected function chompHost(&$url) {
-        if (preg_match('!^(//)(.*?)(/.*|\?.*|#.*|$)!', $url, $matches)) {
-            $url = $matches[3];
-            return $matches[2];
-        }
-        if (preg_match('!(.*?)(\.\./|\./|/|\?|#|$)(.*)!', $url, $matches)) {
-            $tlds = SimpleUrl::getAllTopLevelDomains();
-            if (preg_match('/[a-z0-9\-]+\.(' . $tlds . ')/i', $matches[1])) {
-                $url = $matches[2] . $matches[3];
-                return $matches[1];
-            } elseif (preg_match('/[a-z0-9\-]+\.[a-z0-9\-]+\.[a-z0-9\-]+/i', $matches[1])) {
-                $url = $matches[2] . $matches[3];
-                return $matches[1];
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Extracts the path information from the incoming
-     *    URL. Strips this path from the URL.
-     *    @param string $url     URL so far. The host will be
-     *                           removed.
-     *    @return string         Path part or '/'.
-     *    @access private
-     */
-    protected function chompPath(&$url) {
-        if (preg_match('/(.*?)(\?|#|$)(.*)/', $url, $matches)) {
-            $url = $matches[2] . $matches[3];
-            return ($matches[1] ? $matches[1] : '');
-        }
-        return '';
-    }
-
-    /**
-     *    Strips off the request data.
-     *    @param string $url  URL so far. The request will be
-     *                        removed.
-     *    @return string      Raw request part.
-     *    @access private
-     */
-    protected function chompRequest(&$url) {
-        if (preg_match('/\?(.*?)(#|$)(.*)/', $url, $matches)) {
-            $url = $matches[2] . $matches[3];
-            return $matches[1];
-        }
-        return '';
-    }
-
-    /**
-     *    Breaks the request down into an object.
-     *    @param string $raw           Raw request.
-     *    @return SimpleFormEncoding    Parsed data.
-     *    @access private
-     */
-    protected function parseRequest($raw) {
-        $this->raw = $raw;
-        $request = new SimpleGetEncoding();
-        foreach (explode("&", $raw) as $pair) {
-            if (preg_match('/(.*?)=(.*)/', $pair, $matches)) {
-                $request->add(urldecode($matches[1]), urldecode($matches[2]));
-            } elseif ($pair) {
-                $request->add(urldecode($pair), '');
-            }
-        }
-        return $request;
-    }
-
-    /**
-     *    Accessor for protocol part.
-     *    @param string $default    Value to use if not present.
-     *    @return string            Scheme name, e.g "http".
-     *    @access public
-     */
-    function getScheme($default = false) {
-        return $this->scheme ? $this->scheme : $default;
-    }
-
-    /**
-     *    Accessor for user name.
-     *    @return string    Username preceding host.
-     *    @access public
-     */
-    function getUsername() {
-        return $this->username;
-    }
-
-    /**
-     *    Accessor for password.
-     *    @return string    Password preceding host.
-     *    @access public
-     */
-    function getPassword() {
-        return $this->password;
-    }
-
-    /**
-     *    Accessor for hostname and port.
-     *    @param string $default    Value to use if not present.
-     *    @return string            Hostname only.
-     *    @access public
-     */
-    function getHost($default = false) {
-        return $this->host ? $this->host : $default;
-    }
-
-    /**
-     *    Accessor for top level domain.
-     *    @return string       Last part of host.
-     *    @access public
-     */
-    function getTld() {
-        $path_parts = pathinfo($this->getHost());
-        return (isset($path_parts['extension']) ? $path_parts['extension'] : false);
-    }
-
-    /**
-     *    Accessor for port number.
-     *    @return integer    TCP/IP port number.
-     *    @access public
-     */
-    function getPort() {
-        return $this->port;
-    }
-
-    /**
-     *    Accessor for path.
-     *    @return string    Full path including leading slash if implied.
-     *    @access public
-     */
-    function getPath() {
-        if (! $this->path && $this->host) {
-            return '/';
-        }
-        return $this->path;
-    }
-
-    /**
-     *    Accessor for page if any. This may be a
-     *    directory name if ambiguious.
-     *    @return            Page name.
-     *    @access public
-     */
-    function getPage() {
-        if (! preg_match('/([^\/]*?)$/', $this->getPath(), $matches)) {
-            return false;
-        }
-        return $matches[1];
-    }
-
-    /**
-     *    Gets the path to the page.
-     *    @return string       Path less the page.
-     *    @access public
-     */
-    function getBasePath() {
-        if (! preg_match('/(.*\/)[^\/]*?$/', $this->getPath(), $matches)) {
-            return false;
-        }
-        return $matches[1];
-    }
-
-    /**
-     *    Accessor for fragment at end of URL after the "#".
-     *    @return string    Part after "#".
-     *    @access public
-     */
-    function getFragment() {
-        return $this->fragment;
-    }
-
-    /**
-     *    Sets image coordinates. Set to false to clear
-     *    them.
-     *    @param integer $x    Horizontal position.
-     *    @param integer $y    Vertical position.
-     *    @access public
-     */
-    function setCoordinates($x = false, $y = false) {
-        if (($x === false) || ($y === false)) {
-            $this->x = $this->y = false;
-            return;
-        }
-        $this->x = (integer)$x;
-        $this->y = (integer)$y;
-    }
-
-    /**
-     *    Accessor for horizontal image coordinate.
-     *    @return integer        X value.
-     *    @access public
-     */
-    function getX() {
-        return $this->x;
-    }
-
-    /**
-     *    Accessor for vertical image coordinate.
-     *    @return integer        Y value.
-     *    @access public
-     */
-    function getY() {
-        return $this->y;
-    }
-
-    /**
-     *    Accessor for current request parameters
-     *    in URL string form. Will return teh original request
-     *    if at all possible even if it doesn't make much
-     *    sense.
-     *    @return string   Form is string "?a=1&b=2", etc.
-     *    @access public
-     */
-    function getEncodedRequest() {
-        if ($this->raw) {
-            $encoded = $this->raw;
-        } else {
-            $encoded = $this->request->asUrlRequest();
-        }
-        if ($encoded) {
-            return '?' . preg_replace('/^\?/', '', $encoded);
-        }
-        return '';
-    }
-
-    /**
-     *    Adds an additional parameter to the request.
-     *    @param string $key            Name of parameter.
-     *    @param string $value          Value as string.
-     *    @access public
-     */
-    function addRequestParameter($key, $value) {
-        $this->raw = false;
-        $this->request->add($key, $value);
-    }
-
-    /**
-     *    Adds additional parameters to the request.
-     *    @param hash/SimpleFormEncoding $parameters   Additional
-     *                                                parameters.
-     *    @access public
-     */
-    function addRequestParameters($parameters) {
-        $this->raw = false;
-        $this->request->merge($parameters);
-    }
-
-    /**
-     *    Clears down all parameters.
-     *    @access public
-     */
-    function clearRequest() {
-        $this->raw = false;
-        $this->request = new SimpleGetEncoding();
-    }
-
-    /**
-     *    Gets the frame target if present. Although
-     *    not strictly part of the URL specification it
-     *    acts as similarily to the browser.
-     *    @return boolean/string    Frame name or false if none.
-     *    @access public
-     */
-    function getTarget() {
-        return $this->target;
-    }
-
-    /**
-     *    Attaches a frame target.
-     *    @param string $frame        Name of frame.
-     *    @access public
-     */
-    function setTarget($frame) {
-        $this->raw = false;
-        $this->target = $frame;
-    }
-
-    /**
-     *    Renders the URL back into a string.
-     *    @return string        URL in canonical form.
-     *    @access public
-     */
-    function asString() {
-        $path = $this->path;
-        $scheme = $identity = $host = $port = $encoded = $fragment = '';
-        if ($this->username && $this->password) {
-            $identity = $this->username . ':' . $this->password . '@';
-        }
-        if ($this->getHost()) {
-            $scheme = $this->getScheme() ? $this->getScheme() : 'http';
-            $scheme .= '://';
-            $host = $this->getHost();
-        } elseif ($this->getScheme() === 'file') {
-            // Safest way; otherwise, file URLs on Windows have an extra
-            // leading slash. It might be possible to convert file://
-            // URIs to local file paths, but that requires more research.
-            $scheme = 'file://';
-        }
-        if ($this->getPort() && $this->getPort() != 80 ) {
-            $port = ':'.$this->getPort();
-        }
-
-        if (substr($this->path, 0, 1) == '/') {
-            $path = $this->normalisePath($this->path);
-        }
-        $encoded = $this->getEncodedRequest();
-        $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
-        $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
-        return "$scheme$identity$host$port$path$encoded$fragment$coords";
-    }
-
-    /**
-     *    Replaces unknown sections to turn a relative
-     *    URL into an absolute one. The base URL can
-     *    be either a string or a SimpleUrl object.
-     *    @param string/SimpleUrl $base       Base URL.
-     *    @access public
-     */
-    function makeAbsolute($base) {
-        if (! is_object($base)) {
-            $base = new SimpleUrl($base);
-        }
-        if ($this->getHost()) {
-            $scheme = $this->getScheme();
-            $host = $this->getHost();
-            $port = $this->getPort() ? ':' . $this->getPort() : '';
-            $identity = $this->getIdentity() ? $this->getIdentity() . '@' : '';
-            if (! $identity) {
-                $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
-            }
-        } else {
-            $scheme = $base->getScheme();
-            $host = $base->getHost();
-            $port = $base->getPort() ? ':' . $base->getPort() : '';
-            $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
-        }
-        $path = $this->normalisePath($this->extractAbsolutePath($base));
-        $encoded = $this->getEncodedRequest();
-        $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
-        $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
-        return new SimpleUrl("$scheme://$identity$host$port$path$encoded$fragment$coords");
-    }
-
-    /**
-     *    Replaces unknown sections of the path with base parts
-     *    to return a complete absolute one.
-     *    @param string/SimpleUrl $base       Base URL.
-     *    @param string                       Absolute path.
-     *    @access private
-     */
-    protected function extractAbsolutePath($base) {
-        if ($this->getHost()) {
-            return $this->path;
-        }
-        if (! $this->isRelativePath($this->path)) {
-            return $this->path;
-        }
-        if ($this->path) {
-            return $base->getBasePath() . $this->path;
-        }
-        return $base->getPath();
-    }
-
-    /**
-     *    Simple test to see if a path part is relative.
-     *    @param string $path        Path to test.
-     *    @return boolean            True if starts with a "/".
-     *    @access private
-     */
-    protected function isRelativePath($path) {
-        return (substr($path, 0, 1) != '/');
-    }
-
-    /**
-     *    Extracts the username and password for use in rendering
-     *    a URL.
-     *    @return string/boolean    Form of username:password or false.
-     *    @access public
-     */
-    function getIdentity() {
-        if ($this->username && $this->password) {
-            return $this->username . ':' . $this->password;
-        }
-        return false;
-    }
-
-    /**
-     *    Replaces . and .. sections of the path.
-     *    @param string $path    Unoptimised path.
-     *    @return string         Path with dots removed if possible.
-     *    @access public
-     */
-    function normalisePath($path) {
-        $path = preg_replace('|/\./|', '/', $path);
-        return preg_replace('|/[^/]+/\.\./|', '/', $path);
-    }
-
-    /**
-     *    A pipe seperated list of all TLDs that result in two part
-     *    domain names.
-     *    @return string        Pipe separated list.
-     *    @access public
-     */
-    static function getAllTopLevelDomains() {
-        return 'com|edu|net|org|gov|mil|int|biz|info|name|pro|aero|coop|museum';
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/user_agent.php b/3rdparty/simpletest/user_agent.php
deleted file mode 100644
index ea536020017..00000000000
--- a/3rdparty/simpletest/user_agent.php
+++ /dev/null
@@ -1,328 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: user_agent.php 2039 2011-11-30 18:16:15Z pp11 $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/cookies.php');
-require_once(dirname(__FILE__) . '/http.php');
-require_once(dirname(__FILE__) . '/encoding.php');
-require_once(dirname(__FILE__) . '/authentication.php');
-/**#@-*/
-
-if (! defined('DEFAULT_MAX_REDIRECTS')) {
-    define('DEFAULT_MAX_REDIRECTS', 3);
-}
-if (! defined('DEFAULT_CONNECTION_TIMEOUT')) {
-    define('DEFAULT_CONNECTION_TIMEOUT', 15);
-}
-
-/**
- *    Fetches web pages whilst keeping track of
- *    cookies and authentication.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleUserAgent {
-    private $cookie_jar;
-    private $cookies_enabled = true;
-    private $authenticator;
-    private $max_redirects = DEFAULT_MAX_REDIRECTS;
-    private $proxy = false;
-    private $proxy_username = false;
-    private $proxy_password = false;
-    private $connection_timeout = DEFAULT_CONNECTION_TIMEOUT;
-    private $additional_headers = array();
-
-    /**
-     *    Starts with no cookies, realms or proxies.
-     *    @access public
-     */
-    function __construct() {
-        $this->cookie_jar = new SimpleCookieJar();
-        $this->authenticator = new SimpleAuthenticator();
-    }
-
-    /**
-     *    Removes expired and temporary cookies as if
-     *    the browser was closed and re-opened. Authorisation
-     *    has to be obtained again as well.
-     *    @param string/integer $date   Time when session restarted.
-     *                                  If omitted then all persistent
-     *                                  cookies are kept.
-     *    @access public
-     */
-    function restart($date = false) {
-        $this->cookie_jar->restartSession($date);
-        $this->authenticator->restartSession();
-    }
-
-    /**
-     *    Adds a header to every fetch.
-     *    @param string $header       Header line to add to every
-     *                                request until cleared.
-     *    @access public
-     */
-    function addHeader($header) {
-        $this->additional_headers[] = $header;
-    }
-
-    /**
-     *    Ages the cookies by the specified time.
-     *    @param integer $interval    Amount in seconds.
-     *    @access public
-     */
-    function ageCookies($interval) {
-        $this->cookie_jar->agePrematurely($interval);
-    }
-
-    /**
-     *    Sets an additional cookie. If a cookie has
-     *    the same name and path it is replaced.
-     *    @param string $name            Cookie key.
-     *    @param string $value           Value of cookie.
-     *    @param string $host            Host upon which the cookie is valid.
-     *    @param string $path            Cookie path if not host wide.
-     *    @param string $expiry          Expiry date.
-     *    @access public
-     */
-    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
-        $this->cookie_jar->setCookie($name, $value, $host, $path, $expiry);
-    }
-
-    /**
-     *    Reads the most specific cookie value from the
-     *    browser cookies.
-     *    @param string $host        Host to search.
-     *    @param string $path        Applicable path.
-     *    @param string $name        Name of cookie to read.
-     *    @return string             False if not present, else the
-     *                               value as a string.
-     *    @access public
-     */
-    function getCookieValue($host, $path, $name) {
-        return $this->cookie_jar->getCookieValue($host, $path, $name);
-    }
-
-    /**
-     *    Reads the current cookies within the base URL.
-     *    @param string $name     Key of cookie to find.
-     *    @param SimpleUrl $base  Base URL to search from.
-     *    @return string/boolean  Null if there is no base URL, false
-     *                            if the cookie is not set.
-     *    @access public
-     */
-    function getBaseCookieValue($name, $base) {
-        if (! $base) {
-            return null;
-        }
-        return $this->getCookieValue($base->getHost(), $base->getPath(), $name);
-    }
-
-    /**
-     *    Switches off cookie sending and recieving.
-     *    @access public
-     */
-    function ignoreCookies() {
-        $this->cookies_enabled = false;
-    }
-
-    /**
-     *    Switches back on the cookie sending and recieving.
-     *    @access public
-     */
-    function useCookies() {
-        $this->cookies_enabled = true;
-    }
-
-    /**
-     *    Sets the socket timeout for opening a connection.
-     *    @param integer $timeout      Maximum time in seconds.
-     *    @access public
-     */
-    function setConnectionTimeout($timeout) {
-        $this->connection_timeout = $timeout;
-    }
-
-    /**
-     *    Sets the maximum number of redirects before
-     *    a page will be loaded anyway.
-     *    @param integer $max        Most hops allowed.
-     *    @access public
-     */
-    function setMaximumRedirects($max) {
-        $this->max_redirects = $max;
-    }
-
-    /**
-     *    Sets proxy to use on all requests for when
-     *    testing from behind a firewall. Set URL
-     *    to false to disable.
-     *    @param string $proxy        Proxy URL.
-     *    @param string $username     Proxy username for authentication.
-     *    @param string $password     Proxy password for authentication.
-     *    @access public
-     */
-    function useProxy($proxy, $username, $password) {
-        if (! $proxy) {
-            $this->proxy = false;
-            return;
-        }
-        if ((strncmp($proxy, 'http://', 7) != 0) && (strncmp($proxy, 'https://', 8) != 0)) {
-            $proxy = 'http://'. $proxy;
-        }
-        $this->proxy = new SimpleUrl($proxy);
-        $this->proxy_username = $username;
-        $this->proxy_password = $password;
-    }
-
-    /**
-     *    Test to see if the redirect limit is passed.
-     *    @param integer $redirects        Count so far.
-     *    @return boolean                  True if over.
-     *    @access private
-     */
-    protected function isTooManyRedirects($redirects) {
-        return ($redirects > $this->max_redirects);
-    }
-
-    /**
-     *    Sets the identity for the current realm.
-     *    @param string $host        Host to which realm applies.
-     *    @param string $realm       Full name of realm.
-     *    @param string $username    Username for realm.
-     *    @param string $password    Password for realm.
-     *    @access public
-     */
-    function setIdentity($host, $realm, $username, $password) {
-        $this->authenticator->setIdentityForRealm($host, $realm, $username, $password);
-    }
-
-    /**
-     *    Fetches a URL as a response object. Will keep trying if redirected.
-     *    It will also collect authentication realm information.
-     *    @param string/SimpleUrl $url      Target to fetch.
-     *    @param SimpleEncoding $encoding   Additional parameters for request.
-     *    @return SimpleHttpResponse        Hopefully the target page.
-     *    @access public
-     */
-    function fetchResponse($url, $encoding) {
-        if ($encoding->getMethod() != 'POST') {
-            $url->addRequestParameters($encoding);
-            $encoding->clear();
-        }
-        $response = $this->fetchWhileRedirected($url, $encoding);
-        if ($headers = $response->getHeaders()) {
-            if ($headers->isChallenge()) {
-                $this->authenticator->addRealm(
-                        $url,
-                        $headers->getAuthentication(),
-                        $headers->getRealm());
-            }
-        }
-        return $response;
-    }
-
-    /**
-     *    Fetches the page until no longer redirected or
-     *    until the redirect limit runs out.
-     *    @param SimpleUrl $url                  Target to fetch.
-     *    @param SimpelFormEncoding $encoding    Additional parameters for request.
-     *    @return SimpleHttpResponse             Hopefully the target page.
-     *    @access private
-     */
-    protected function fetchWhileRedirected($url, $encoding) {
-        $redirects = 0;
-        do {
-            $response = $this->fetch($url, $encoding);
-            if ($response->isError()) {
-                return $response;
-            }
-            $headers = $response->getHeaders();
-            if ($this->cookies_enabled) {
-                $headers->writeCookiesToJar($this->cookie_jar, $url);
-            }
-            if (! $headers->isRedirect()) {
-                break;
-            }
-            $location = new SimpleUrl($headers->getLocation());
-            $url = $location->makeAbsolute($url);
-            $encoding = new SimpleGetEncoding();
-        } while (! $this->isTooManyRedirects(++$redirects));
-        return $response;
-    }
-
-    /**
-     *    Actually make the web request.
-     *    @param SimpleUrl $url                   Target to fetch.
-     *    @param SimpleFormEncoding $encoding     Additional parameters for request.
-     *    @return SimpleHttpResponse              Headers and hopefully content.
-     *    @access protected
-     */
-    protected function fetch($url, $encoding) {
-        $request = $this->createRequest($url, $encoding);
-        return $request->fetch($this->connection_timeout);
-    }
-
-    /**
-     *    Creates a full page request.
-     *    @param SimpleUrl $url                 Target to fetch as url object.
-     *    @param SimpleFormEncoding $encoding   POST/GET parameters.
-     *    @return SimpleHttpRequest             New request.
-     *    @access private
-     */
-    protected function createRequest($url, $encoding) {
-        $request = $this->createHttpRequest($url, $encoding);
-        $this->addAdditionalHeaders($request);
-        if ($this->cookies_enabled) {
-            $request->readCookiesFromJar($this->cookie_jar, $url);
-        }
-        $this->authenticator->addHeaders($request, $url);
-        return $request;
-    }
-
-    /**
-     *    Builds the appropriate HTTP request object.
-     *    @param SimpleUrl $url                  Target to fetch as url object.
-     *    @param SimpleFormEncoding $parameters  POST/GET parameters.
-     *    @return SimpleHttpRequest              New request object.
-     *    @access protected
-     */
-    protected function createHttpRequest($url, $encoding) {
-        return new SimpleHttpRequest($this->createRoute($url), $encoding);
-    }
-
-    /**
-     *    Sets up either a direct route or via a proxy.
-     *    @param SimpleUrl $url   Target to fetch as url object.
-     *    @return SimpleRoute     Route to take to fetch URL.
-     *    @access protected
-     */
-    protected function createRoute($url) {
-        if ($this->proxy) {
-            return new SimpleProxyRoute(
-                    $url,
-                    $this->proxy,
-                    $this->proxy_username,
-                    $this->proxy_password);
-        }
-        return new SimpleRoute($url);
-    }
-
-    /**
-     *    Adds additional manual headers.
-     *    @param SimpleHttpRequest $request    Outgoing request.
-     *    @access private
-     */
-    protected function addAdditionalHeaders(&$request) {
-        foreach ($this->additional_headers as $header) {
-            $request->addHeaderLine($header);
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/web_tester.php b/3rdparty/simpletest/web_tester.php
deleted file mode 100644
index a17230e7b33..00000000000
--- a/3rdparty/simpletest/web_tester.php
+++ /dev/null
@@ -1,1532 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest.
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: web_tester.php 2013 2011-04-29 09:29:45Z pp11 $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/test_case.php');
-require_once(dirname(__FILE__) . '/browser.php');
-require_once(dirname(__FILE__) . '/page.php');
-require_once(dirname(__FILE__) . '/expectation.php');
-/**#@-*/
-
-/**
- *    Test for an HTML widget value match.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class FieldExpectation extends SimpleExpectation {
-    private $value;
-
-    /**
-     *    Sets the field value to compare against.
-     *    @param mixed $value     Test value to match. Can be an
-     *                            expectation for say pattern matching.
-     *    @param string $message  Optiona message override. Can use %s as
-     *                            a placeholder for the original message.
-     *    @access public
-     */
-    function __construct($value, $message = '%s') {
-        parent::__construct($message);
-        if (is_array($value)) {
-            sort($value);
-        }
-        $this->value = $value;
-    }
-
-    /**
-     *    Tests the expectation. True if it matches
-     *    a string value or an array value in any order.
-     *    @param mixed $compare        Comparison value. False for
-     *                                 an unset field.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        if ($this->value === false) {
-            return ($compare === false);
-        }
-        if ($this->isSingle($this->value)) {
-            return $this->testSingle($compare);
-        }
-        if (is_array($this->value)) {
-            return $this->testMultiple($compare);
-        }
-        return false;
-    }
-
-    /**
-     *    Tests for valid field comparisons with a single option.
-     *    @param mixed $value       Value to type check.
-     *    @return boolean           True if integer, string or float.
-     *    @access private
-     */
-    protected function isSingle($value) {
-        return is_string($value) || is_integer($value) || is_float($value);
-    }
-
-    /**
-     *    String comparison for simple field with a single option.
-     *    @param mixed $compare    String to test against.
-     *    @returns boolean         True if matching.
-     *    @access private
-     */
-    protected function testSingle($compare) {
-        if (is_array($compare) && count($compare) == 1) {
-            $compare = $compare[0];
-        }
-        if (! $this->isSingle($compare)) {
-            return false;
-        }
-        return ($this->value == $compare);
-    }
-
-    /**
-     *    List comparison for multivalue field.
-     *    @param mixed $compare    List in any order to test against.
-     *    @returns boolean         True if matching.
-     *    @access private
-     */
-    protected function testMultiple($compare) {
-        if (is_string($compare)) {
-            $compare = array($compare);
-        }
-        if (! is_array($compare)) {
-            return false;
-        }
-        sort($compare);
-        return ($this->value === $compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = $this->getDumper();
-        if (is_array($compare)) {
-            sort($compare);
-        }
-        if ($this->test($compare)) {
-            return "Field expectation [" . $dumper->describeValue($this->value) . "]";
-        } else {
-            return "Field expectation [" . $dumper->describeValue($this->value) .
-                    "] fails with [" .
-                    $dumper->describeValue($compare) . "] " .
-                    $dumper->describeDifference($this->value, $compare);
-        }
-    }
-}
-
-/**
- *    Test for a specific HTTP header within a header block.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class HttpHeaderExpectation extends SimpleExpectation {
-    private $expected_header;
-    private $expected_value;
-
-    /**
-     *    Sets the field and value to compare against.
-     *    @param string $header   Case insenstive trimmed header name.
-     *    @param mixed $value     Optional value to compare. If not
-     *                            given then any value will match. If
-     *                            an expectation object then that will
-     *                            be used instead.
-     *    @param string $message  Optiona message override. Can use %s as
-     *                            a placeholder for the original message.
-     */
-    function __construct($header, $value = false, $message = '%s') {
-        parent::__construct($message);
-        $this->expected_header = $this->normaliseHeader($header);
-        $this->expected_value = $value;
-    }
-
-    /**
-     *    Accessor for aggregated object.
-     *    @return mixed        Expectation set in constructor.
-     *    @access protected
-     */
-    protected function getExpectation() {
-        return $this->expected_value;
-    }
-
-    /**
-     *    Removes whitespace at ends and case variations.
-     *    @param string $header    Name of header.
-     *    @param string            Trimmed and lowecased header
-     *                             name.
-     *    @access private
-     */
-    protected function normaliseHeader($header) {
-        return strtolower(trim($header));
-    }
-
-    /**
-     *    Tests the expectation. True if it matches
-     *    a string value or an array value in any order.
-     *    @param mixed $compare   Raw header block to search.
-     *    @return boolean         True if header present.
-     *    @access public
-     */
-    function test($compare) {
-        return is_string($this->findHeader($compare));
-    }
-
-    /**
-     *    Searches the incoming result. Will extract the matching
-     *    line as text.
-     *    @param mixed $compare   Raw header block to search.
-     *    @return string          Matching header line.
-     *    @access protected
-     */
-    protected function findHeader($compare) {
-        $lines = explode("\r\n", $compare);
-        foreach ($lines as $line) {
-            if ($this->testHeaderLine($line)) {
-                return $line;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Compares a single header line against the expectation.
-     *    @param string $line      A single line to compare.
-     *    @return boolean          True if matched.
-     *    @access private
-     */
-    protected function testHeaderLine($line) {
-        if (count($parsed = explode(':', $line, 2)) < 2) {
-            return false;
-        }
-        list($header, $value) = $parsed;
-        if ($this->normaliseHeader($header) != $this->expected_header) {
-            return false;
-        }
-        return $this->testHeaderValue($value, $this->expected_value);
-    }
-
-    /**
-     *    Tests the value part of the header.
-     *    @param string $value        Value to test.
-     *    @param mixed $expected      Value to test against.
-     *    @return boolean             True if matched.
-     *    @access protected
-     */
-    protected function testHeaderValue($value, $expected) {
-        if ($expected === false) {
-            return true;
-        }
-        if (SimpleExpectation::isExpectation($expected)) {
-            return $expected->test(trim($value));
-        }
-        return (trim($value) == trim($expected));
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Raw header block to search.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if (SimpleExpectation::isExpectation($this->expected_value)) {
-            $message = $this->expected_value->overlayMessage($compare, $this->getDumper());
-        } else {
-            $message = $this->expected_header .
-                    ($this->expected_value ? ': ' . $this->expected_value : '');
-        }
-        if (is_string($line = $this->findHeader($compare))) {
-            return "Searching for header [$message] found [$line]";
-        } else {
-            return "Failed to find header [$message]";
-        }
-    }
-}
-
-/**
- *    Test for a specific HTTP header within a header block that
- *    should not be found.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class NoHttpHeaderExpectation extends HttpHeaderExpectation {
-    private $expected_header;
-    private $expected_value;
-
-    /**
-     *    Sets the field and value to compare against.
-     *    @param string $unwanted   Case insenstive trimmed header name.
-     *    @param string $message    Optiona message override. Can use %s as
-     *                              a placeholder for the original message.
-     */
-    function __construct($unwanted, $message = '%s') {
-        parent::__construct($unwanted, false, $message);
-    }
-
-    /**
-     *    Tests that the unwanted header is not found.
-     *    @param mixed $compare   Raw header block to search.
-     *    @return boolean         True if header present.
-     *    @access public
-     */
-    function test($compare) {
-        return ($this->findHeader($compare) === false);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Raw header block to search.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $expectation = $this->getExpectation();
-        if (is_string($line = $this->findHeader($compare))) {
-            return "Found unwanted header [$expectation] with [$line]";
-        } else {
-            return "Did not find unwanted header [$expectation]";
-        }
-    }
-}
-
-/**
- *    Test for a text substring.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class TextExpectation extends SimpleExpectation {
-    private $substring;
-
-    /**
-     *    Sets the value to compare against.
-     *    @param string $substring  Text to search for.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function __construct($substring, $message = '%s') {
-        parent::__construct($message);
-        $this->substring = $substring;
-    }
-
-    /**
-     *    Accessor for the substring.
-     *    @return string       Text to match.
-     *    @access protected
-     */
-    protected function getSubstring() {
-        return $this->substring;
-    }
-
-    /**
-     *    Tests the expectation. True if the text contains the
-     *    substring.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return (strpos($compare, $this->substring) !== false);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            return $this->describeTextMatch($this->getSubstring(), $compare);
-        } else {
-            $dumper = $this->getDumper();
-            return "Text [" . $this->getSubstring() .
-                    "] not detected in [" .
-                    $dumper->describeValue($compare) . "]";
-        }
-    }
-
-    /**
-     *    Describes a pattern match including the string
-     *    found and it's position.
-     *    @param string $substring      Text to search for.
-     *    @param string $subject        Subject to search.
-     *    @access protected
-     */
-    protected function describeTextMatch($substring, $subject) {
-        $position = strpos($subject, $substring);
-        $dumper = $this->getDumper();
-        return "Text [$substring] detected at character [$position] in [" .
-                $dumper->describeValue($subject) . "] in region [" .
-                $dumper->clipString($subject, 100, $position) . "]";
-    }
-}
-
-/**
- *    Fail if a substring is detected within the
- *    comparison text.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NoTextExpectation extends TextExpectation {
-
-    /**
-     *    Sets the reject pattern
-     *    @param string $substring  Text to search for.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function __construct($substring, $message = '%s') {
-        parent::__construct($substring, $message);
-    }
-
-    /**
-     *    Tests the expectation. False if the substring appears
-     *    in the text.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param string $compare      Comparison value.
-     *    @return string              Description of success
-     *                                or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            $dumper = $this->getDumper();
-            return "Text [" . $this->getSubstring() .
-                    "] not detected in [" .
-                    $dumper->describeValue($compare) . "]";
-        } else {
-            return $this->describeTextMatch($this->getSubstring(), $compare);
-        }
-    }
-}
-
-/**
- *    Test case for testing of web pages. Allows
- *    fetching of pages, parsing of HTML and
- *    submitting forms.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class WebTestCase extends SimpleTestCase {
-    private $browser;
-    private $ignore_errors = false;
-
-    /**
-     *    Creates an empty test case. Should be subclassed
-     *    with test methods for a functional test case.
-     *    @param string $label     Name of test case. Will use
-     *                             the class name if none specified.
-     *    @access public
-     */
-    function __construct($label = false) {
-        parent::__construct($label);
-    }
-
-    /**
-     *    Announces the start of the test.
-     *    @param string $method    Test method just started.
-     *    @access public
-     */
-    function before($method) {
-        parent::before($method);
-        $this->setBrowser($this->createBrowser());
-    }
-
-    /**
-     *    Announces the end of the test. Includes private clean up.
-     *    @param string $method    Test method just finished.
-     *    @access public
-     */
-    function after($method) {
-        $this->unsetBrowser();
-        parent::after($method);
-    }
-
-    /**
-     *    Gets a current browser reference for setting
-     *    special expectations or for detailed
-     *    examination of page fetches.
-     *    @return SimpleBrowser     Current test browser object.
-     *    @access public
-     */
-    function getBrowser() {
-        return $this->browser;
-    }
-
-    /**
-     *    Gets a current browser reference for setting
-     *    special expectations or for detailed
-     *    examination of page fetches.
-     *    @param SimpleBrowser $browser    New test browser object.
-     *    @access public
-     */
-    function setBrowser($browser) {
-        return $this->browser = $browser;
-    }
-
-    /**
-     *    Sets the HTML parser to use within this browser.
-     *    @param object         The parser, one of SimplePHPPageBuilder or
-     *                          SimpleTidyPageBuilder.
-     */
-    function setParser($parser) {
-        $this->browser->setParser($parser);
-    }
-
-    /**
-     *    Clears the current browser reference to help the
-     *    PHP garbage collector.
-     *    @access public
-     */
-    function unsetBrowser() {
-        unset($this->browser);
-    }
-
-    /**
-     *    Creates a new default web browser object.
-     *    Will be cleared at the end of the test method.
-     *    @return TestBrowser           New browser.
-     *    @access public
-     */
-    function createBrowser() {
-        return new SimpleBrowser();
-    }
-
-    /**
-     *    Gets the last response error.
-     *    @return string    Last low level HTTP error.
-     *    @access public
-     */
-    function getTransportError() {
-        return $this->browser->getTransportError();
-    }
-
-    /**
-     *    Accessor for the currently selected URL.
-     *    @return string        Current location or false if
-     *                          no page yet fetched.
-     *    @access public
-     */
-    function getUrl() {
-        return $this->browser->getUrl();
-    }
-
-    /**
-     *    Dumps the current request for debugging.
-     *    @access public
-     */
-    function showRequest() {
-        $this->dump($this->browser->getRequest());
-    }
-
-    /**
-     *    Dumps the current HTTP headers for debugging.
-     *    @access public
-     */
-    function showHeaders() {
-        $this->dump($this->browser->getHeaders());
-    }
-
-    /**
-     *    Dumps the current HTML source for debugging.
-     *    @access public
-     */
-    function showSource() {
-        $this->dump($this->browser->getContent());
-    }
-
-    /**
-     *    Dumps the visible text only for debugging.
-     *    @access public
-     */
-    function showText() {
-        $this->dump(wordwrap($this->browser->getContentAsText(), 80));
-    }
-
-    /**
-     *    Simulates the closing and reopening of the browser.
-     *    Temporary cookies will be discarded and timed
-     *    cookies will be expired if later than the
-     *    specified time.
-     *    @param string/integer $date Time when session restarted.
-     *                                If ommitted then all persistent
-     *                                cookies are kept. Time is either
-     *                                Cookie format string or timestamp.
-     *    @access public
-     */
-    function restart($date = false) {
-        if ($date === false) {
-            $date = time();
-        }
-        $this->browser->restart($date);
-    }
-
-    /**
-     *    Moves cookie expiry times back into the past.
-     *    Useful for testing timeouts and expiries.
-     *    @param integer $interval    Amount to age in seconds.
-     *    @access public
-     */
-    function ageCookies($interval) {
-        $this->browser->ageCookies($interval);
-    }
-
-    /**
-     *    Disables frames support. Frames will not be fetched
-     *    and the frameset page will be used instead.
-     *    @access public
-     */
-    function ignoreFrames() {
-        $this->browser->ignoreFrames();
-    }
-
-    /**
-     *    Switches off cookie sending and recieving.
-     *    @access public
-     */
-    function ignoreCookies() {
-        $this->browser->ignoreCookies();
-    }
-
-    /**
-     *    Skips errors for the next request only. You might
-     *    want to confirm that a page is unreachable for
-     *    example.
-     *    @access public
-     */
-    function ignoreErrors() {
-        $this->ignore_errors = true;
-    }
-
-    /**
-     *    Issues a fail if there is a transport error anywhere
-     *    in the current frameset. Only one such error is
-     *    reported.
-     *    @param string/boolean $result   HTML or failure.
-     *    @return string/boolean $result  Passes through result.
-     *    @access private
-     */
-    protected function failOnError($result) {
-        if (! $this->ignore_errors) {
-            if ($error = $this->browser->getTransportError()) {
-                $this->fail($error);
-            }
-        }
-        $this->ignore_errors = false;
-        return $result;
-    }
-
-    /**
-     *    Adds a header to every fetch.
-     *    @param string $header       Header line to add to every
-     *                                request until cleared.
-     *    @access public
-     */
-    function addHeader($header) {
-        $this->browser->addHeader($header);
-    }
-
-    /**
-     *    Sets the maximum number of redirects before
-     *    the web page is loaded regardless.
-     *    @param integer $max        Maximum hops.
-     *    @access public
-     */
-    function setMaximumRedirects($max) {
-        if (! $this->browser) {
-            trigger_error(
-                    'Can only set maximum redirects in a test method, setUp() or tearDown()');
-        }
-        $this->browser->setMaximumRedirects($max);
-    }
-
-    /**
-     *    Sets the socket timeout for opening a connection and
-     *    receiving at least one byte of information.
-     *    @param integer $timeout      Maximum time in seconds.
-     *    @access public
-     */
-    function setConnectionTimeout($timeout) {
-        $this->browser->setConnectionTimeout($timeout);
-    }
-
-    /**
-     *    Sets proxy to use on all requests for when
-     *    testing from behind a firewall. Set URL
-     *    to false to disable.
-     *    @param string $proxy        Proxy URL.
-     *    @param string $username     Proxy username for authentication.
-     *    @param string $password     Proxy password for authentication.
-     *    @access public
-     */
-    function useProxy($proxy, $username = false, $password = false) {
-        $this->browser->useProxy($proxy, $username, $password);
-    }
-
-    /**
-     *    Fetches a page into the page buffer. If
-     *    there is no base for the URL then the
-     *    current base URL is used. After the fetch
-     *    the base URL reflects the new location.
-     *    @param string $url          URL to fetch.
-     *    @param hash $parameters     Optional additional GET data.
-     *    @return boolean/string      Raw page on success.
-     *    @access public
-     */
-    function get($url, $parameters = false) {
-        return $this->failOnError($this->browser->get($url, $parameters));
-    }
-
-    /**
-     *    Fetches a page by POST into the page buffer.
-     *    If there is no base for the URL then the
-     *    current base URL is used. After the fetch
-     *    the base URL reflects the new location.
-     *    @param string $url          URL to fetch.
-     *    @param mixed $parameters    Optional POST parameters or content body to send
-     *    @param string $content_type Content type of provided body
-     *    @return boolean/string      Raw page on success.
-     *    @access public
-     */
-    function post($url, $parameters = false, $content_type = false) {
-        return $this->failOnError($this->browser->post($url, $parameters, $content_type));
-    }
-
-    /**
-     *    Fetches a page by PUT into the page buffer.
-     *    If there is no base for the URL then the
-     *    current base URL is used. After the fetch
-     *    the base URL reflects the new location.
-     *    @param string $url          URL to fetch.
-     *    @param mixed $body          Optional content body to send
-     *    @param string $content_type Content type of provided body
-     *    @return boolean/string      Raw page on success.
-     *    @access public
-     */
-    function put($url, $body = false, $content_type = false) {
-        return $this->failOnError($this->browser->put($url, $body, $content_type));
-    }
-
-    /**
-     *    Fetches a page by a DELETE request
-     *    @param string $url          URL to fetch.
-     *    @param hash $parameters     Optional additional parameters.
-     *    @return boolean/string      Raw page on success.
-     *    @access public
-     */
-    function delete($url, $parameters = false) {
-        return $this->failOnError($this->browser->delete($url, $parameters));
-    }
-
-
-    /**
-     *    Does a HTTP HEAD fetch, fetching only the page
-     *    headers. The current base URL is unchanged by this.
-     *    @param string $url          URL to fetch.
-     *    @param hash $parameters     Optional additional GET data.
-     *    @return boolean             True on success.
-     *    @access public
-     */
-    function head($url, $parameters = false) {
-        return $this->failOnError($this->browser->head($url, $parameters));
-    }
-
-    /**
-     *    Equivalent to hitting the retry button on the
-     *    browser. Will attempt to repeat the page fetch.
-     *    @return boolean     True if fetch succeeded.
-     *    @access public
-     */
-    function retry() {
-        return $this->failOnError($this->browser->retry());
-    }
-
-    /**
-     *    Equivalent to hitting the back button on the
-     *    browser.
-     *    @return boolean     True if history entry and
-     *                        fetch succeeded.
-     *    @access public
-     */
-    function back() {
-        return $this->failOnError($this->browser->back());
-    }
-
-    /**
-     *    Equivalent to hitting the forward button on the
-     *    browser.
-     *    @return boolean     True if history entry and
-     *                        fetch succeeded.
-     *    @access public
-     */
-    function forward() {
-        return $this->failOnError($this->browser->forward());
-    }
-
-    /**
-     *    Retries a request after setting the authentication
-     *    for the current realm.
-     *    @param string $username    Username for realm.
-     *    @param string $password    Password for realm.
-     *    @return boolean/string     HTML on successful fetch. Note
-     *                               that authentication may still have
-     *                               failed.
-     *    @access public
-     */
-    function authenticate($username, $password) {
-        return $this->failOnError(
-                $this->browser->authenticate($username, $password));
-    }
-
-    /**
-     *    Gets the cookie value for the current browser context.
-     *    @param string $name          Name of cookie.
-     *    @return string               Value of cookie or false if unset.
-     *    @access public
-     */
-    function getCookie($name) {
-        return $this->browser->getCurrentCookieValue($name);
-    }
-
-    /**
-     *    Sets a cookie in the current browser.
-     *    @param string $name          Name of cookie.
-     *    @param string $value         Cookie value.
-     *    @param string $host          Host upon which the cookie is valid.
-     *    @param string $path          Cookie path if not host wide.
-     *    @param string $expiry        Expiry date.
-     *    @access public
-     */
-    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
-        $this->browser->setCookie($name, $value, $host, $path, $expiry);
-    }
-
-    /**
-     *    Accessor for current frame focus. Will be
-     *    false if no frame has focus.
-     *    @return integer/string/boolean    Label if any, otherwise
-     *                                      the position in the frameset
-     *                                      or false if none.
-     *    @access public
-     */
-    function getFrameFocus() {
-        return $this->browser->getFrameFocus();
-    }
-
-    /**
-     *    Sets the focus by index. The integer index starts from 1.
-     *    @param integer $choice    Chosen frame.
-     *    @return boolean           True if frame exists.
-     *    @access public
-     */
-    function setFrameFocusByIndex($choice) {
-        return $this->browser->setFrameFocusByIndex($choice);
-    }
-
-    /**
-     *    Sets the focus by name.
-     *    @param string $name    Chosen frame.
-     *    @return boolean        True if frame exists.
-     *    @access public
-     */
-    function setFrameFocus($name) {
-        return $this->browser->setFrameFocus($name);
-    }
-
-    /**
-     *    Clears the frame focus. All frames will be searched
-     *    for content.
-     *    @access public
-     */
-    function clearFrameFocus() {
-        return $this->browser->clearFrameFocus();
-    }
-
-    /**
-     *    Clicks a visible text item. Will first try buttons,
-     *    then links and then images.
-     *    @param string $label        Visible text or alt text.
-     *    @return string/boolean      Raw page or false.
-     *    @access public
-     */
-    function click($label) {
-        return $this->failOnError($this->browser->click($label));
-    }
-
-    /**
-     *    Checks for a click target.
-     *    @param string $label        Visible text or alt text.
-     *    @return boolean             True if click target.
-     *    @access public
-     */
-    function assertClickable($label, $message = '%s') {
-        return $this->assertTrue(
-                $this->browser->isClickable($label),
-                sprintf($message, "Click target [$label] should exist"));
-    }
-
-    /**
-     *    Clicks the submit button by label. The owning
-     *    form will be submitted by this.
-     *    @param string $label    Button label. An unlabeled
-     *                            button can be triggered by 'Submit'.
-     *    @param hash $additional Additional form values.
-     *    @return boolean/string  Page on success, else false.
-     *    @access public
-     */
-    function clickSubmit($label = 'Submit', $additional = false) {
-        return $this->failOnError(
-                $this->browser->clickSubmit($label, $additional));
-    }
-
-    /**
-     *    Clicks the submit button by name attribute. The owning
-     *    form will be submitted by this.
-     *    @param string $name     Name attribute of button.
-     *    @param hash $additional Additional form values.
-     *    @return boolean/string  Page on success.
-     *    @access public
-     */
-    function clickSubmitByName($name, $additional = false) {
-        return $this->failOnError(
-                $this->browser->clickSubmitByName($name, $additional));
-    }
-
-    /**
-     *    Clicks the submit button by ID attribute. The owning
-     *    form will be submitted by this.
-     *    @param string $id       ID attribute of button.
-     *    @param hash $additional Additional form values.
-     *    @return boolean/string  Page on success.
-     *    @access public
-     */
-    function clickSubmitById($id, $additional = false) {
-        return $this->failOnError(
-                $this->browser->clickSubmitById($id, $additional));
-    }
-
-    /**
-     *    Checks for a valid button label.
-     *    @param string $label        Visible text.
-     *    @return boolean             True if click target.
-     *    @access public
-     */
-    function assertSubmit($label, $message = '%s') {
-        return $this->assertTrue(
-                $this->browser->isSubmit($label),
-                sprintf($message, "Submit button [$label] should exist"));
-    }
-
-    /**
-     *    Clicks the submit image by some kind of label. Usually
-     *    the alt tag or the nearest equivalent. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param string $label    Alt attribute of button.
-     *    @param integer $x       X-coordinate of imaginary click.
-     *    @param integer $y       Y-coordinate of imaginary click.
-     *    @param hash $additional Additional form values.
-     *    @return boolean/string  Page on success.
-     *    @access public
-     */
-    function clickImage($label, $x = 1, $y = 1, $additional = false) {
-        return $this->failOnError(
-                $this->browser->clickImage($label, $x, $y, $additional));
-    }
-
-    /**
-     *    Clicks the submit image by the name. Usually
-     *    the alt tag or the nearest equivalent. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param string $name     Name attribute of button.
-     *    @param integer $x       X-coordinate of imaginary click.
-     *    @param integer $y       Y-coordinate of imaginary click.
-     *    @param hash $additional Additional form values.
-     *    @return boolean/string  Page on success.
-     *    @access public
-     */
-    function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
-        return $this->failOnError(
-                $this->browser->clickImageByName($name, $x, $y, $additional));
-    }
-
-    /**
-     *    Clicks the submit image by ID attribute. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param integer/string $id   ID attribute of button.
-     *    @param integer $x           X-coordinate of imaginary click.
-     *    @param integer $y           Y-coordinate of imaginary click.
-     *    @param hash $additional     Additional form values.
-     *    @return boolean/string      Page on success.
-     *    @access public
-     */
-    function clickImageById($id, $x = 1, $y = 1, $additional = false) {
-        return $this->failOnError(
-                $this->browser->clickImageById($id, $x, $y, $additional));
-    }
-
-    /**
-     *    Checks for a valid image with atht alt text or title.
-     *    @param string $label        Visible text.
-     *    @return boolean             True if click target.
-     *    @access public
-     */
-    function assertImage($label, $message = '%s') {
-        return $this->assertTrue(
-                $this->browser->isImage($label),
-                sprintf($message, "Image with text [$label] should exist"));
-    }
-
-    /**
-     *    Submits a form by the ID.
-     *    @param string $id       Form ID. No button information
-     *                            is submitted this way.
-     *    @return boolean/string  Page on success.
-     *    @access public
-     */
-    function submitFormById($id, $additional = false) {
-        return $this->failOnError($this->browser->submitFormById($id, $additional));
-    }
-
-    /**
-     *    Follows a link by name. Will click the first link
-     *    found with this link text by default, or a later
-     *    one if an index is given. Match is case insensitive
-     *    with normalised space.
-     *    @param string $label     Text between the anchor tags.
-     *    @param integer $index    Link position counting from zero.
-     *    @return boolean/string   Page on success.
-     *    @access public
-     */
-    function clickLink($label, $index = 0) {
-        return $this->failOnError($this->browser->clickLink($label, $index));
-    }
-
-    /**
-     *    Follows a link by id attribute.
-     *    @param string $id        ID attribute value.
-     *    @return boolean/string   Page on success.
-     *    @access public
-     */
-    function clickLinkById($id) {
-        return $this->failOnError($this->browser->clickLinkById($id));
-    }
-
-    /**
-     *    Tests for the presence of a link label. Match is
-     *    case insensitive with normalised space.
-     *    @param string $label     Text between the anchor tags.
-     *    @param mixed $expected   Expected URL or expectation object.
-     *    @param string $message   Message to display. Default
-     *                             can be embedded with %s.
-     *    @return boolean          True if link present.
-     *    @access public
-     */
-    function assertLink($label, $expected = true, $message = '%s') {
-        $url = $this->browser->getLink($label);
-        if ($expected === true || ($expected !== true && $url === false)) {
-            return $this->assertTrue($url !== false, sprintf($message, "Link [$label] should exist"));
-        }
-        if (! SimpleExpectation::isExpectation($expected)) {
-            $expected = new IdenticalExpectation($expected);
-        }
-        return $this->assert($expected, $url->asString(), sprintf($message, "Link [$label] should match"));
-    }
-
-    /**
-     *    Tests for the non-presence of a link label. Match is
-     *    case insensitive with normalised space.
-     *    @param string/integer $label    Text between the anchor tags
-     *                                    or ID attribute.
-     *    @param string $message          Message to display. Default
-     *                                    can be embedded with %s.
-     *    @return boolean                 True if link missing.
-     *    @access public
-     */
-    function assertNoLink($label, $message = '%s') {
-        return $this->assertTrue(
-                $this->browser->getLink($label) === false,
-                sprintf($message, "Link [$label] should not exist"));
-    }
-
-    /**
-     *    Tests for the presence of a link id attribute.
-     *    @param string $id        Id attribute value.
-     *    @param mixed $expected   Expected URL or expectation object.
-     *    @param string $message   Message to display. Default
-     *                             can be embedded with %s.
-     *    @return boolean          True if link present.
-     *    @access public
-     */
-    function assertLinkById($id, $expected = true, $message = '%s') {
-        $url = $this->browser->getLinkById($id);
-        if ($expected === true) {
-            return $this->assertTrue($url !== false, sprintf($message, "Link ID [$id] should exist"));
-        }
-        if (! SimpleExpectation::isExpectation($expected)) {
-            $expected = new IdenticalExpectation($expected);
-        }
-        return $this->assert($expected, $url->asString(), sprintf($message, "Link ID [$id] should match"));
-    }
-
-    /**
-     *    Tests for the non-presence of a link label. Match is
-     *    case insensitive with normalised space.
-     *    @param string $id        Id attribute value.
-     *    @param string $message   Message to display. Default
-     *                             can be embedded with %s.
-     *    @return boolean          True if link missing.
-     *    @access public
-     */
-    function assertNoLinkById($id, $message = '%s') {
-        return $this->assertTrue(
-                $this->browser->getLinkById($id) === false,
-                sprintf($message, "Link ID [$id] should not exist"));
-    }
-
-    /**
-     *    Sets all form fields with that label, or name if there
-     *    is no label attached.
-     *    @param string $name    Name of field in forms.
-     *    @param string $value   New value of field.
-     *    @return boolean        True if field exists, otherwise false.
-     *    @access public
-     */
-    function setField($label, $value, $position=false) {
-        return $this->browser->setField($label, $value, $position);
-    }
-
-    /**
-     *    Sets all form fields with that name.
-     *    @param string $name    Name of field in forms.
-     *    @param string $value   New value of field.
-     *    @return boolean        True if field exists, otherwise false.
-     *    @access public
-     */
-    function setFieldByName($name, $value, $position=false) {
-        return $this->browser->setFieldByName($name, $value, $position);
-    }
-
-    /**
-     *    Sets all form fields with that id.
-     *    @param string/integer $id   Id of field in forms.
-     *    @param string $value        New value of field.
-     *    @return boolean             True if field exists, otherwise false.
-     *    @access public
-     */
-    function setFieldById($id, $value) {
-        return $this->browser->setFieldById($id, $value);
-    }
-
-    /**
-     *    Confirms that the form element is currently set
-     *    to the expected value. A missing form will always
-     *    fail. If no value is given then only the existence
-     *    of the field is checked.
-     *    @param string $name       Name of field in forms.
-     *    @param mixed $expected    Expected string/array value or
-     *                              false for unset fields.
-     *    @param string $message    Message to display. Default
-     *                              can be embedded with %s.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertField($label, $expected = true, $message = '%s') {
-        $value = $this->browser->getField($label);
-        return $this->assertFieldValue($label, $value, $expected, $message);
-    }
-
-    /**
-     *    Confirms that the form element is currently set
-     *    to the expected value. A missing form element will always
-     *    fail. If no value is given then only the existence
-     *    of the field is checked.
-     *    @param string $name       Name of field in forms.
-     *    @param mixed $expected    Expected string/array value or
-     *                              false for unset fields.
-     *    @param string $message    Message to display. Default
-     *                              can be embedded with %s.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertFieldByName($name, $expected = true, $message = '%s') {
-        $value = $this->browser->getFieldByName($name);
-        return $this->assertFieldValue($name, $value, $expected, $message);
-    }
-
-    /**
-     *    Confirms that the form element is currently set
-     *    to the expected value. A missing form will always
-     *    fail. If no ID is given then only the existence
-     *    of the field is checked.
-     *    @param string/integer $id  Name of field in forms.
-     *    @param mixed $expected     Expected string/array value or
-     *                               false for unset fields.
-     *    @param string $message     Message to display. Default
-     *                               can be embedded with %s.
-     *    @return boolean            True if pass.
-     *    @access public
-     */
-    function assertFieldById($id, $expected = true, $message = '%s') {
-        $value = $this->browser->getFieldById($id);
-        return $this->assertFieldValue($id, $value, $expected, $message);
-    }
-
-    /**
-     *    Tests the field value against the expectation.
-     *    @param string $identifier      Name, ID or label.
-     *    @param mixed $value            Current field value.
-     *    @param mixed $expected         Expected value to match.
-     *    @param string $message         Failure message.
-     *    @return boolean                True if pass
-     *    @access protected
-     */
-    protected function assertFieldValue($identifier, $value, $expected, $message) {
-        if ($expected === true) {
-            return $this->assertTrue(
-                    isset($value),
-                    sprintf($message, "Field [$identifier] should exist"));
-        }
-        if (! SimpleExpectation::isExpectation($expected)) {
-            $identifier = str_replace('%', '%%', $identifier);
-            $expected = new FieldExpectation(
-                    $expected,
-                    "Field [$identifier] should match with [%s]");
-        }
-        return $this->assert($expected, $value, $message);
-    }
-
-    /**
-     *    Checks the response code against a list
-     *    of possible values.
-     *    @param array $responses    Possible responses for a pass.
-     *    @param string $message     Message to display. Default
-     *                               can be embedded with %s.
-     *    @return boolean            True if pass.
-     *    @access public
-     */
-    function assertResponse($responses, $message = '%s') {
-        $responses = (is_array($responses) ? $responses : array($responses));
-        $code = $this->browser->getResponseCode();
-        $message = sprintf($message, "Expecting response in [" .
-                implode(", ", $responses) . "] got [$code]");
-        return $this->assertTrue(in_array($code, $responses), $message);
-    }
-
-    /**
-     *    Checks the mime type against a list
-     *    of possible values.
-     *    @param array $types      Possible mime types for a pass.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertMime($types, $message = '%s') {
-        $types = (is_array($types) ? $types : array($types));
-        $type = $this->browser->getMimeType();
-        $message = sprintf($message, "Expecting mime type in [" .
-                implode(", ", $types) . "] got [$type]");
-        return $this->assertTrue(in_array($type, $types), $message);
-    }
-
-    /**
-     *    Attempt to match the authentication type within
-     *    the security realm we are currently matching.
-     *    @param string $authentication   Usually basic.
-     *    @param string $message          Message to display.
-     *    @return boolean                 True if pass.
-     *    @access public
-     */
-    function assertAuthentication($authentication = false, $message = '%s') {
-        if (! $authentication) {
-            $message = sprintf($message, "Expected any authentication type, got [" .
-                    $this->browser->getAuthentication() . "]");
-            return $this->assertTrue(
-                    $this->browser->getAuthentication(),
-                    $message);
-        } else {
-            $message = sprintf($message, "Expected authentication [$authentication] got [" .
-                    $this->browser->getAuthentication() . "]");
-            return $this->assertTrue(
-                    strtolower($this->browser->getAuthentication()) == strtolower($authentication),
-                    $message);
-        }
-    }
-
-    /**
-     *    Checks that no authentication is necessary to view
-     *    the desired page.
-     *    @param string $message     Message to display.
-     *    @return boolean            True if pass.
-     *    @access public
-     */
-    function assertNoAuthentication($message = '%s') {
-        $message = sprintf($message, "Expected no authentication type, got [" .
-                $this->browser->getAuthentication() . "]");
-        return $this->assertFalse($this->browser->getAuthentication(), $message);
-    }
-
-    /**
-     *    Attempts to match the current security realm.
-     *    @param string $realm     Name of security realm.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertRealm($realm, $message = '%s') {
-        if (! SimpleExpectation::isExpectation($realm)) {
-            $realm = new EqualExpectation($realm);
-        }
-        return $this->assert(
-                $realm,
-                $this->browser->getRealm(),
-                "Expected realm -> $message");
-    }
-
-    /**
-     *    Checks each header line for the required value. If no
-     *    value is given then only an existence check is made.
-     *    @param string $header    Case insensitive header name.
-     *    @param mixed $value      Case sensitive trimmed string to
-     *                             match against. An expectation object
-     *                             can be used for pattern matching.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertHeader($header, $value = false, $message = '%s') {
-        return $this->assert(
-                new HttpHeaderExpectation($header, $value),
-                $this->browser->getHeaders(),
-                $message);
-    }
-
-    /**
-     *    Confirms that the header type has not been received.
-     *    Only the landing page is checked. If you want to check
-     *    redirect pages, then you should limit redirects so
-     *    as to capture the page you want.
-     *    @param string $header    Case insensitive header name.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertNoHeader($header, $message = '%s') {
-        return $this->assert(
-                new NoHttpHeaderExpectation($header),
-                $this->browser->getHeaders(),
-                $message);
-    }
-
-    /**
-     *    Tests the text between the title tags.
-     *    @param string/SimpleExpectation $title    Expected title.
-     *    @param string $message                    Message to display.
-     *    @return boolean                           True if pass.
-     *    @access public
-     */
-    function assertTitle($title = false, $message = '%s') {
-        if (! SimpleExpectation::isExpectation($title)) {
-            $title = new EqualExpectation($title);
-        }
-        return $this->assert($title, $this->browser->getTitle(), $message);
-    }
-
-    /**
-     *    Will trigger a pass if the text is found in the plain
-     *    text form of the page.
-     *    @param string $text       Text to look for.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertText($text, $message = '%s') {
-        return $this->assert(
-                new TextExpectation($text),
-                $this->browser->getContentAsText(),
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the text is not found in the plain
-     *    text form of the page.
-     *    @param string $text       Text to look for.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertNoText($text, $message = '%s') {
-        return $this->assert(
-                new NoTextExpectation($text),
-                $this->browser->getContentAsText(),
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the Perl regex pattern
-     *    is found in the raw content.
-     *    @param string $pattern    Perl regex to look for including
-     *                              the regex delimiters.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertPattern($pattern, $message = '%s') {
-        return $this->assert(
-                new PatternExpectation($pattern),
-                $this->browser->getContent(),
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the perl regex pattern
-     *    is not present in raw content.
-     *    @param string $pattern    Perl regex to look for including
-     *                              the regex delimiters.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertNoPattern($pattern, $message = '%s') {
-        return $this->assert(
-                new NoPatternExpectation($pattern),
-                $this->browser->getContent(),
-                $message);
-    }
-
-    /**
-     *    Checks that a cookie is set for the current page
-     *    and optionally checks the value.
-     *    @param string $name        Name of cookie to test.
-     *    @param string $expected    Expected value as a string or
-     *                               false if any value will do.
-     *    @param string $message     Message to display.
-     *    @return boolean            True if pass.
-     *    @access public
-     */
-    function assertCookie($name, $expected = false, $message = '%s') {
-        $value = $this->getCookie($name);
-        if (! $expected) {
-            return $this->assertTrue(
-                    $value,
-                    sprintf($message, "Expecting cookie [$name]"));
-        }
-        if (! SimpleExpectation::isExpectation($expected)) {
-            $expected = new EqualExpectation($expected);
-        }
-        return $this->assert($expected, $value, "Expecting cookie [$name] -> $message");
-    }
-
-    /**
-     *    Checks that no cookie is present or that it has
-     *    been successfully cleared.
-     *    @param string $name        Name of cookie to test.
-     *    @param string $message     Message to display.
-     *    @return boolean            True if pass.
-     *    @access public
-     */
-    function assertNoCookie($name, $message = '%s') {
-        return $this->assertTrue(
-                $this->getCookie($name) === null or $this->getCookie($name) === false,
-                sprintf($message, "Not expecting cookie [$name]"));
-    }
-
-    /**
-     *    Called from within the test methods to register
-     *    passes and failures.
-     *    @param boolean $result    Pass on true.
-     *    @param string $message    Message to display describing
-     *                              the test state.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertTrue($result, $message = '%s') {
-        return $this->assert(new TrueExpectation(), $result, $message);
-    }
-
-    /**
-     *    Will be true on false and vice versa. False
-     *    is the PHP definition of false, so that null,
-     *    empty strings, zero and an empty array all count
-     *    as false.
-     *    @param boolean $result    Pass on false.
-     *    @param string $message    Message to display.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertFalse($result, $message = '%s') {
-        return $this->assert(new FalseExpectation(), $result, $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    the same value only. Otherwise a fail. This
-     *    is for testing hand extracted text, etc.
-     *    @param mixed $first          Value to compare.
-     *    @param mixed $second         Value to compare.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass
-     *    @access public
-     */
-    function assertEqual($first, $second, $message = '%s') {
-        return $this->assert(
-                new EqualExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    a different value. Otherwise a fail. This
-     *    is for testing hand extracted text, etc.
-     *    @param mixed $first           Value to compare.
-     *    @param mixed $second          Value to compare.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertNotEqual($first, $second, $message = '%s') {
-        return $this->assert(
-                new NotEqualExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Uses a stack trace to find the line of an assertion.
-     *    @return string           Line number of first assert*
-     *                             method embedded in format string.
-     *    @access public
-     */
-    function getAssertionLine() {
-        $trace = new SimpleStackTrace(array('assert', 'click', 'pass', 'fail'));
-        return $trace->traceMethod();
-    }
-}
-?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/xml.php b/3rdparty/simpletest/xml.php
deleted file mode 100755
index 54fb6f5b16d..00000000000
--- a/3rdparty/simpletest/xml.php
+++ /dev/null
@@ -1,647 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: xml.php 1787 2008-04-26 20:35:39Z pp11 $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/scorer.php');
-/**#@-*/
-
-/**
- *    Creates the XML needed for remote communication
- *    by SimpleTest.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class XmlReporter extends SimpleReporter {
-    private $indent;
-    private $namespace;
-
-    /**
-     *    Sets up indentation and namespace.
-     *    @param string $namespace        Namespace to add to each tag.
-     *    @param string $indent           Indenting to add on each nesting.
-     *    @access public
-     */
-    function __construct($namespace = false, $indent = '  ') {
-        parent::__construct();
-        $this->namespace = ($namespace ? $namespace . ':' : '');
-        $this->indent = $indent;
-    }
-
-    /**
-     *    Calculates the pretty printing indent level
-     *    from the current level of nesting.
-     *    @param integer $offset  Extra indenting level.
-     *    @return string          Leading space.
-     *    @access protected
-     */
-    protected function getIndent($offset = 0) {
-        return str_repeat(
-                $this->indent,
-                count($this->getTestList()) + $offset);
-    }
-
-    /**
-     *    Converts character string to parsed XML
-     *    entities string.
-     *    @param string text        Unparsed character data.
-     *    @return string            Parsed character data.
-     *    @access public
-     */
-    function toParsedXml($text) {
-        return str_replace(
-                array('&', '<', '>', '"', '\''),
-                array('&amp;', '&lt;', '&gt;', '&quot;', '&apos;'),
-                $text);
-    }
-
-    /**
-     *    Paints the start of a group test.
-     *    @param string $test_name   Name of test that is starting.
-     *    @param integer $size       Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_name, $size) {
-        parent::paintGroupStart($test_name, $size);
-        print $this->getIndent();
-        print "<" . $this->namespace . "group size=\"$size\">\n";
-        print $this->getIndent(1);
-        print "<" . $this->namespace . "name>" .
-                $this->toParsedXml($test_name) .
-                "</" . $this->namespace . "name>\n";
-    }
-
-    /**
-     *    Paints the end of a group test.
-     *    @param string $test_name   Name of test that is ending.
-     *    @access public
-     */
-    function paintGroupEnd($test_name) {
-        print $this->getIndent();
-        print "</" . $this->namespace . "group>\n";
-        parent::paintGroupEnd($test_name);
-    }
-
-    /**
-     *    Paints the start of a test case.
-     *    @param string $test_name   Name of test that is starting.
-     *    @access public
-     */
-    function paintCaseStart($test_name) {
-        parent::paintCaseStart($test_name);
-        print $this->getIndent();
-        print "<" . $this->namespace . "case>\n";
-        print $this->getIndent(1);
-        print "<" . $this->namespace . "name>" .
-                $this->toParsedXml($test_name) .
-                "</" . $this->namespace . "name>\n";
-    }
-
-    /**
-     *    Paints the end of a test case.
-     *    @param string $test_name   Name of test that is ending.
-     *    @access public
-     */
-    function paintCaseEnd($test_name) {
-        print $this->getIndent();
-        print "</" . $this->namespace . "case>\n";
-        parent::paintCaseEnd($test_name);
-    }
-
-    /**
-     *    Paints the start of a test method.
-     *    @param string $test_name   Name of test that is starting.
-     *    @access public
-     */
-    function paintMethodStart($test_name) {
-        parent::paintMethodStart($test_name);
-        print $this->getIndent();
-        print "<" . $this->namespace . "test>\n";
-        print $this->getIndent(1);
-        print "<" . $this->namespace . "name>" .
-                $this->toParsedXml($test_name) .
-                "</" . $this->namespace . "name>\n";
-    }
-
-    /**
-     *    Paints the end of a test method.
-     *    @param string $test_name   Name of test that is ending.
-     *    @param integer $progress   Number of test cases ending.
-     *    @access public
-     */
-    function paintMethodEnd($test_name) {
-        print $this->getIndent();
-        print "</" . $this->namespace . "test>\n";
-        parent::paintMethodEnd($test_name);
-    }
-
-    /**
-     *    Paints pass as XML.
-     *    @param string $message        Message to encode.
-     *    @access public
-     */
-    function paintPass($message) {
-        parent::paintPass($message);
-        print $this->getIndent(1);
-        print "<" . $this->namespace . "pass>";
-        print $this->toParsedXml($message);
-        print "</" . $this->namespace . "pass>\n";
-    }
-
-    /**
-     *    Paints failure as XML.
-     *    @param string $message        Message to encode.
-     *    @access public
-     */
-    function paintFail($message) {
-        parent::paintFail($message);
-        print $this->getIndent(1);
-        print "<" . $this->namespace . "fail>";
-        print $this->toParsedXml($message);
-        print "</" . $this->namespace . "fail>\n";
-    }
-
-    /**
-     *    Paints error as XML.
-     *    @param string $message        Message to encode.
-     *    @access public
-     */
-    function paintError($message) {
-        parent::paintError($message);
-        print $this->getIndent(1);
-        print "<" . $this->namespace . "exception>";
-        print $this->toParsedXml($message);
-        print "</" . $this->namespace . "exception>\n";
-    }
-
-    /**
-     *    Paints exception as XML.
-     *    @param Exception $exception    Exception to encode.
-     *    @access public
-     */
-    function paintException($exception) {
-        parent::paintException($exception);
-        print $this->getIndent(1);
-        print "<" . $this->namespace . "exception>";
-        $message = 'Unexpected exception of type [' . get_class($exception) .
-                '] with message ['. $exception->getMessage() .
-                '] in ['. $exception->getFile() .
-                ' line ' . $exception->getLine() . ']';
-        print $this->toParsedXml($message);
-        print "</" . $this->namespace . "exception>\n";
-    }
-
-    /**
-     *    Paints the skipping message and tag.
-     *    @param string $message        Text to display in skip tag.
-     *    @access public
-     */
-    function paintSkip($message) {
-        parent::paintSkip($message);
-        print $this->getIndent(1);
-        print "<" . $this->namespace . "skip>";
-        print $this->toParsedXml($message);
-        print "</" . $this->namespace . "skip>\n";
-    }
-
-    /**
-     *    Paints a simple supplementary message.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintMessage($message) {
-        parent::paintMessage($message);
-        print $this->getIndent(1);
-        print "<" . $this->namespace . "message>";
-        print $this->toParsedXml($message);
-        print "</" . $this->namespace . "message>\n";
-    }
-
-    /**
-     *    Paints a formatted ASCII message such as a
-     *    privateiable dump.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-        parent::paintFormattedMessage($message);
-        print $this->getIndent(1);
-        print "<" . $this->namespace . "formatted>";
-        print "<![CDATA[$message]]>";
-        print "</" . $this->namespace . "formatted>\n";
-    }
-
-    /**
-     *    Serialises the event object.
-     *    @param string $type        Event type as text.
-     *    @param mixed $payload      Message or object.
-     *    @access public
-     */
-    function paintSignal($type, $payload) {
-        parent::paintSignal($type, $payload);
-        print $this->getIndent(1);
-        print "<" . $this->namespace . "signal type=\"$type\">";
-        print "<![CDATA[" . serialize($payload) . "]]>";
-        print "</" . $this->namespace . "signal>\n";
-    }
-
-    /**
-     *    Paints the test document header.
-     *    @param string $test_name     First test top level
-     *                                 to start.
-     *    @access public
-     *    @abstract
-     */
-    function paintHeader($test_name) {
-        if (! SimpleReporter::inCli()) {
-            header('Content-type: text/xml');
-        }
-        print "<?xml version=\"1.0\"";
-        if ($this->namespace) {
-            print " xmlns:" . $this->namespace .
-                    "=\"www.lastcraft.com/SimpleTest/Beta3/Report\"";
-        }
-        print "?>\n";
-        print "<" . $this->namespace . "run>\n";
-    }
-
-    /**
-     *    Paints the test document footer.
-     *    @param string $test_name        The top level test.
-     *    @access public
-     *    @abstract
-     */
-    function paintFooter($test_name) {
-        print "</" . $this->namespace . "run>\n";
-    }
-}
-
-/**
- *    Accumulator for incoming tag. Holds the
- *    incoming test structure information for
- *    later dispatch to the reporter.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NestingXmlTag {
-    private $name;
-    private $attributes;
-
-    /**
-     *    Sets the basic test information except
-     *    the name.
-     *    @param hash $attributes   Name value pairs.
-     *    @access public
-     */
-    function NestingXmlTag($attributes) {
-        $this->name = false;
-        $this->attributes = $attributes;
-    }
-
-    /**
-     *    Sets the test case/method name.
-     *    @param string $name        Name of test.
-     *    @access public
-     */
-    function setName($name) {
-        $this->name = $name;
-    }
-
-    /**
-     *    Accessor for name.
-     *    @return string        Name of test.
-     *    @access public
-     */
-    function getName() {
-        return $this->name;
-    }
-
-    /**
-     *    Accessor for attributes.
-     *    @return hash        All attributes.
-     *    @access protected
-     */
-    protected function getAttributes() {
-        return $this->attributes;
-    }
-}
-
-/**
- *    Accumulator for incoming method tag. Holds the
- *    incoming test structure information for
- *    later dispatch to the reporter.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NestingMethodTag extends NestingXmlTag {
-
-    /**
-     *    Sets the basic test information except
-     *    the name.
-     *    @param hash $attributes   Name value pairs.
-     *    @access public
-     */
-    function NestingMethodTag($attributes) {
-        $this->NestingXmlTag($attributes);
-    }
-
-    /**
-     *    Signals the appropriate start event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintStart(&$listener) {
-        $listener->paintMethodStart($this->getName());
-    }
-
-    /**
-     *    Signals the appropriate end event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintEnd(&$listener) {
-        $listener->paintMethodEnd($this->getName());
-    }
-}
-
-/**
- *    Accumulator for incoming case tag. Holds the
- *    incoming test structure information for
- *    later dispatch to the reporter.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NestingCaseTag extends NestingXmlTag {
-
-    /**
-     *    Sets the basic test information except
-     *    the name.
-     *    @param hash $attributes   Name value pairs.
-     *    @access public
-     */
-    function NestingCaseTag($attributes) {
-        $this->NestingXmlTag($attributes);
-    }
-
-    /**
-     *    Signals the appropriate start event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintStart(&$listener) {
-        $listener->paintCaseStart($this->getName());
-    }
-
-    /**
-     *    Signals the appropriate end event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintEnd(&$listener) {
-        $listener->paintCaseEnd($this->getName());
-    }
-}
-
-/**
- *    Accumulator for incoming group tag. Holds the
- *    incoming test structure information for
- *    later dispatch to the reporter.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NestingGroupTag extends NestingXmlTag {
-
-    /**
-     *    Sets the basic test information except
-     *    the name.
-     *    @param hash $attributes   Name value pairs.
-     *    @access public
-     */
-    function NestingGroupTag($attributes) {
-        $this->NestingXmlTag($attributes);
-    }
-
-    /**
-     *    Signals the appropriate start event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintStart(&$listener) {
-        $listener->paintGroupStart($this->getName(), $this->getSize());
-    }
-
-    /**
-     *    Signals the appropriate end event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintEnd(&$listener) {
-        $listener->paintGroupEnd($this->getName());
-    }
-
-    /**
-     *    The size in the attributes.
-     *    @return integer     Value of size attribute or zero.
-     *    @access public
-     */
-    function getSize() {
-        $attributes = $this->getAttributes();
-        if (isset($attributes['SIZE'])) {
-            return (integer)$attributes['SIZE'];
-        }
-        return 0;
-    }
-}
-
-/**
- *    Parser for importing the output of the XmlReporter.
- *    Dispatches that output to another reporter.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleTestXmlParser {
-    private $listener;
-    private $expat;
-    private $tag_stack;
-    private $in_content_tag;
-    private $content;
-    private $attributes;
-
-    /**
-     *    Loads a listener with the SimpleReporter
-     *    interface.
-     *    @param SimpleReporter $listener   Listener of tag events.
-     *    @access public
-     */
-    function SimpleTestXmlParser(&$listener) {
-        $this->listener = &$listener;
-        $this->expat = &$this->createParser();
-        $this->tag_stack = array();
-        $this->in_content_tag = false;
-        $this->content = '';
-        $this->attributes = array();
-    }
-
-    /**
-     *    Parses a block of XML sending the results to
-     *    the listener.
-     *    @param string $chunk        Block of text to read.
-     *    @return boolean             True if valid XML.
-     *    @access public
-     */
-    function parse($chunk) {
-        if (! xml_parse($this->expat, $chunk)) {
-            trigger_error('XML parse error with ' .
-                    xml_error_string(xml_get_error_code($this->expat)));
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     *    Sets up expat as the XML parser.
-     *    @return resource        Expat handle.
-     *    @access protected
-     */
-    protected function &createParser() {
-        $expat = xml_parser_create();
-        xml_set_object($expat, $this);
-        xml_set_element_handler($expat, 'startElement', 'endElement');
-        xml_set_character_data_handler($expat, 'addContent');
-        xml_set_default_handler($expat, 'defaultContent');
-        return $expat;
-    }
-
-    /**
-     *    Opens a new test nesting level.
-     *    @return NestedXmlTag     The group, case or method tag
-     *                             to start.
-     *    @access private
-     */
-    protected function pushNestingTag($nested) {
-        array_unshift($this->tag_stack, $nested);
-    }
-
-    /**
-     *    Accessor for current test structure tag.
-     *    @return NestedXmlTag     The group, case or method tag
-     *                             being parsed.
-     *    @access private
-     */
-    protected function &getCurrentNestingTag() {
-        return $this->tag_stack[0];
-    }
-
-    /**
-     *    Ends a nesting tag.
-     *    @return NestedXmlTag     The group, case or method tag
-     *                             just finished.
-     *    @access private
-     */
-    protected function popNestingTag() {
-        return array_shift($this->tag_stack);
-    }
-
-    /**
-     *    Test if tag is a leaf node with only text content.
-     *    @param string $tag        XML tag name.
-     *    @return @boolean          True if leaf, false if nesting.
-     *    @private
-     */
-    protected function isLeaf($tag) {
-        return in_array($tag, array(
-                'NAME', 'PASS', 'FAIL', 'EXCEPTION', 'SKIP', 'MESSAGE', 'FORMATTED', 'SIGNAL'));
-    }
-
-    /**
-     *    Handler for start of event element.
-     *    @param resource $expat     Parser handle.
-     *    @param string $tag         Element name.
-     *    @param hash $attributes    Name value pairs.
-     *                               Attributes without content
-     *                               are marked as true.
-     *    @access protected
-     */
-    protected function startElement($expat, $tag, $attributes) {
-        $this->attributes = $attributes;
-        if ($tag == 'GROUP') {
-            $this->pushNestingTag(new NestingGroupTag($attributes));
-        } elseif ($tag == 'CASE') {
-            $this->pushNestingTag(new NestingCaseTag($attributes));
-        } elseif ($tag == 'TEST') {
-            $this->pushNestingTag(new NestingMethodTag($attributes));
-        } elseif ($this->isLeaf($tag)) {
-            $this->in_content_tag = true;
-            $this->content = '';
-        }
-    }
-
-    /**
-     *    End of element event.
-     *    @param resource $expat     Parser handle.
-     *    @param string $tag         Element name.
-     *    @access protected
-     */
-    protected function endElement($expat, $tag) {
-        $this->in_content_tag = false;
-        if (in_array($tag, array('GROUP', 'CASE', 'TEST'))) {
-            $nesting_tag = $this->popNestingTag();
-            $nesting_tag->paintEnd($this->listener);
-        } elseif ($tag == 'NAME') {
-            $nesting_tag = &$this->getCurrentNestingTag();
-            $nesting_tag->setName($this->content);
-            $nesting_tag->paintStart($this->listener);
-        } elseif ($tag == 'PASS') {
-            $this->listener->paintPass($this->content);
-        } elseif ($tag == 'FAIL') {
-            $this->listener->paintFail($this->content);
-        } elseif ($tag == 'EXCEPTION') {
-            $this->listener->paintError($this->content);
-        } elseif ($tag == 'SKIP') {
-            $this->listener->paintSkip($this->content);
-        } elseif ($tag == 'SIGNAL') {
-            $this->listener->paintSignal(
-                    $this->attributes['TYPE'],
-                    unserialize($this->content));
-        } elseif ($tag == 'MESSAGE') {
-            $this->listener->paintMessage($this->content);
-        } elseif ($tag == 'FORMATTED') {
-            $this->listener->paintFormattedMessage($this->content);
-        }
-    }
-
-    /**
-     *    Content between start and end elements.
-     *    @param resource $expat     Parser handle.
-     *    @param string $text        Usually output messages.
-     *    @access protected
-     */
-    protected function addContent($expat, $text) {
-        if ($this->in_content_tag) {
-            $this->content .= $text;
-        }
-        return true;
-    }
-
-    /**
-     *    XML and Doctype handler. Discards all such content.
-     *    @param resource $expat     Parser handle.
-     *    @param string $default     Text of default content.
-     *    @access protected
-     */
-    protected function defaultContent($expat, $default) {
-    }
-}
-?>
diff --git a/3rdparty/timepicker/GPL-LICENSE.txt b/3rdparty/timepicker/GPL-LICENSE.txt
deleted file mode 100644
index 932f11115fe..00000000000
--- a/3rdparty/timepicker/GPL-LICENSE.txt
+++ /dev/null
@@ -1,278 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-        the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-        this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-    distribute and/or modify the software.
-
-    Also, for each author's protection and ours, we want to make certain
-    that everyone understands that there is no warranty for this free
-    software.  If the software is modified by someone else and passed on, we
-    want its recipients to know that what they have is not the original, so
-    that any problems introduced by others will not reflect on the original
-    authors' reputations.
-
-    Finally, any free program is threatened constantly by software
-    patents.  We wish to avoid the danger that redistributors of a free
-    program will individually obtain patent licenses, in effect making the
-    program proprietary.  To prevent this, we have made it clear that any
-    patent must be licensed for everyone's free use or not licensed at all.
-
-    The precise terms and conditions for copying, distribution and
-    modification follow.
-
-    GNU GENERAL PUBLIC LICENSE
-    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-    0. This License applies to any program or other work which contains
-    a notice placed by the copyright holder saying it may be distributed
-    under the terms of this General Public License.  The "Program", below,
-    refers to any such program or work, and a "work based on the Program"
-    means either the Program or any derivative work under copyright law:
-    that is to say, a work containing the Program or a portion of it,
-    either verbatim or with modifications and/or translated into another
-    language.  (Hereinafter, translation is included without limitation in
-            the term "modification".)  Each licensee is addressed as "you".
-
-    Activities other than copying, distribution and modification are not
-    covered by this License; they are outside its scope.  The act of
-    running the Program is not restricted, and the output from the Program
-    is covered only if its contents constitute a work based on the
-    Program (independent of having been made by running the Program).
-    Whether that is true depends on what the Program does.
-
-    1. You may copy and distribute verbatim copies of the Program's
-    source code as you receive it, in any medium, provided that you
-    conspicuously and appropriately publish on each copy an appropriate
-    copyright notice and disclaimer of warranty; keep intact all the
-    notices that refer to this License and to the absence of any warranty;
-    and give any other recipients of the Program a copy of this License
-    along with the Program.
-
-    You may charge a fee for the physical act of transferring a copy, and
-    you may at your option offer warranty protection in exchange for a fee.
-
-    2. You may modify your copy or copies of the Program or any portion
-    of it, thus forming a work based on the Program, and copy and
-    distribute such modifications or work under the terms of Section 1
-    above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-            a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-            does not normally print such an announcement, your work based on
-            the Program is not required to print an announcement.)
-
-    These requirements apply to the modified work as a whole.  If
-    identifiable sections of that work are not derived from the Program,
-    and can be reasonably considered independent and separate works in
-    themselves, then this License, and its terms, do not apply to those
-    sections when you distribute them as separate works.  But when you
-    distribute the same sections as part of a whole which is a work based
-    on the Program, the distribution of the whole must be on the terms of
-    this License, whose permissions for other licensees extend to the
-    entire whole, and thus to each and every part regardless of who wrote it.
-
-    Thus, it is not the intent of this section to claim rights or contest
-    your rights to work written entirely by you; rather, the intent is to
-    exercise the right to control the distribution of derivative or
-    collective works based on the Program.
-
-    In addition, mere aggregation of another work not based on the Program
-    with the Program (or with a work based on the Program) on a volume of
-    a storage or distribution medium does not bring the other work under
-    the scope of this License.
-
-    3. You may copy and distribute the Program (or a work based on it,
-            under Section 2) in object code or executable form under the terms of
-    Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-            allowed only for noncommercial distribution and only if you
-            received the program in object code or executable form with such
-            an offer, in accord with Subsection b above.)
-
-    The source code for a work means the preferred form of the work for
-    making modifications to it.  For an executable work, complete source
-    code means all the source code for all modules it contains, plus any
-    associated interface definition files, plus the scripts used to
-    control compilation and installation of the executable.  However, as a
-    special exception, the source code distributed need not include
-    anything that is normally distributed (in either source or binary
-            form) with the major components (compiler, kernel, and so on) of the
-    operating system on which the executable runs, unless that component
-    itself accompanies the executable.
-
-    If distribution of executable or object code is made by offering
-    access to copy from a designated place, then offering equivalent
-    access to copy the source code from the same place counts as
-    distribution of the source code, even though third parties are not
-    compelled to copy the source along with the object code.
-
-    4. You may not copy, modify, sublicense, or distribute the Program
-    except as expressly provided under this License.  Any attempt
-    otherwise to copy, modify, sublicense or distribute the Program is
-    void, and will automatically terminate your rights under this License.
-    However, parties who have received copies, or rights, from you under
-    this License will not have their licenses terminated so long as such
-    parties remain in full compliance.
-
-    5. You are not required to accept this License, since you have not
-    signed it.  However, nothing else grants you permission to modify or
-    distribute the Program or its derivative works.  These actions are
-    prohibited by law if you do not accept this License.  Therefore, by
-    modifying or distributing the Program (or any work based on the
-            Program), you indicate your acceptance of this License to do so, and
-    all its terms and conditions for copying, distributing or modifying
-    the Program or works based on it.
-
-    6. Each time you redistribute the Program (or any work based on the
-            Program), the recipient automatically receives a license from the
-    original licensor to copy, distribute or modify the Program subject to
-    these terms and conditions.  You may not impose any further
-    restrictions on the recipients' exercise of the rights granted herein.
-    You are not responsible for enforcing compliance by third parties to
-    this License.
-
-    7. If, as a consequence of a court judgment or allegation of patent
-    infringement or for any other reason (not limited to patent issues),
-    conditions are imposed on you (whether by court order, agreement or
-            otherwise) that contradict the conditions of this License, they do not
-    excuse you from the conditions of this License.  If you cannot
-    distribute so as to satisfy simultaneously your obligations under this
-    License and any other pertinent obligations, then as a consequence you
-    may not distribute the Program at all.  For example, if a patent
-    license would not permit royalty-free redistribution of the Program by
-    all those who receive copies directly or indirectly through you, then
-    the only way you could satisfy both it and this License would be to
-    refrain entirely from distribution of the Program.
-
-    If any portion of this section is held invalid or unenforceable under
-    any particular circumstance, the balance of the section is intended to
-    apply and the section as a whole is intended to apply in other
-    circumstances.
-
-    It is not the purpose of this section to induce you to infringe any
-    patents or other property right claims or to contest validity of any
-    such claims; this section has the sole purpose of protecting the
-    integrity of the free software distribution system, which is
-    implemented by public license practices.  Many people have made
-    generous contributions to the wide range of software distributed
-    through that system in reliance on consistent application of that
-    system; it is up to the author/donor to decide if he or she is willing
-    to distribute software through any other system and a licensee cannot
-    impose that choice.
-
-    This section is intended to make thoroughly clear what is believed to
-    be a consequence of the rest of this License.
-
-    8. If the distribution and/or use of the Program is restricted in
-    certain countries either by patents or by copyrighted interfaces, the
-    original copyright holder who places the Program under this License
-    may add an explicit geographical distribution limitation excluding
-    those countries, so that distribution is permitted only in or among
-    countries not thus excluded.  In such case, this License incorporates
-    the limitation as if written in the body of this License.
-
-    9. The Free Software Foundation may publish revised and/or new versions
-    of the General Public License from time to time.  Such new versions will
-    be similar in spirit to the present version, but may differ in detail to
-    address new problems or concerns.
-
-    Each version is given a distinguishing version number.  If the Program
-    specifies a version number of this License which applies to it and "any
-    later version", you have the option of following the terms and conditions
-    either of that version or of any later version published by the Free
-    Software Foundation.  If the Program does not specify a version number of
-    this License, you may choose any version ever published by the Free Software
-    Foundation.
-
-    10. If you wish to incorporate parts of the Program into other free
-    programs whose distribution conditions are different, write to the author
-    to ask for permission.  For software which is copyrighted by the Free
-    Software Foundation, write to the Free Software Foundation; we sometimes
-    make exceptions for this.  Our decision will be guided by the two goals
-    of preserving the free status of all derivatives of our free software and
-    of promoting the sharing and reuse of software generally.
-
-    NO WARRANTY
-
-    11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-    FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-    PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-    OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-    TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-    PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-    REPAIR OR CORRECTION.
-
-    12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-    WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-    REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-    INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-    OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-            TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-            YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-            PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.""''''''
diff --git a/3rdparty/timepicker/MIT-LICENSE.txt b/3rdparty/timepicker/MIT-LICENSE.txt
deleted file mode 100644
index 532704636b7..00000000000
--- a/3rdparty/timepicker/MIT-LICENSE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2011 John Resig, http://jquery.com/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_18_b81900_40x40.png
deleted file mode 100644
index 954e22dbd99e8c6dd7091335599abf2d10bf8003..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 260
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEr#)R9Ln2z=UU%d=WFXS=@V?HT
z#xG*`>Yvsgk=}99w^d^D^d*@m74oMo<%#FcopJf?u00-~YVKV2wzrI*_R6;UORMea
zBFVSEnN~eiVA6V&z`E)YLz5Aok^D)In}Yn=OzDpgR5Wv0XfT8pOkmV{sKAJ-PO9#T
zZK}IXj&Q-V!U)!LcB_3K<j6=ku*!%uXjy#leKdQ?`ZvP&RiaPVOzxQ$`O)`M(6sLS
yN%J;Y?DO0<r7?ff#!c6LsA*2U`f2*?C%gsKpMo6zvorv`#o+1c=d#Wzp$Py>0&C*{

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_20_666666_40x40.png b/3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_20_666666_40x40.png
deleted file mode 100644
index 64ece5707d91a6edf9fad4bfcce0c4dbcafcf58d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 251
zcmV<X00jSuP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70002ONkl<ZScUD^
zT?&IR7(~(AY#^)6!n1<<Vj)fQYm^M-n@5r1C}@~h2;ohZ7-N3vC*J$+J$LlEJIhL0
z?fU|%;UEDj;@||T;sBg74hkR1O4$<++XU{$LE{Z7;GhCj!9fA2go6yIhJysCh=UWT
ziUV-UI2ia*&y+p!utUI|$6*(^`>bvPcjKS|RKP(6sDcCAB(_QB%0978a<$Ah$!b|E
zwn;|HO0i8cQ<lay$(1s&O|n)t8rvkbvR?jjlN@>j@~)s!ajF0S002ovPDHLkV1oEp
BYH0uf

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_flat_10_000000_40x100.png b/3rdparty/timepicker/css/include/images/ui-bg_flat_10_000000_40x100.png
deleted file mode 100644
index abdc01082bf3534eafecc5819d28c9574d44ea89..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FsY*{5$B>N1x91EQ4=4yQY-ImG
zFPf9b{J;c_6SHRK%WcbN_hZpM=(Ry;4Rxv2@@2Y=$K57eF$X$=!PC{xWt~$(69B)$
BI)4BF

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_glass_100_f6f6f6_1x400.png b/3rdparty/timepicker/css/include/images/ui-bg_glass_100_f6f6f6_1x400.png
deleted file mode 100644
index 9b383f4d2eab09c0f2a739d6b232c32934bc620b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 104
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnour1U*q978O6-yYw{%b*}|_(02F
z@qbE9)0CJMo;*v*PWv`Vh2h6EmG8IS-Cm{3U~`<YvxSSFU3)<QP%DF{tDnm{r-UW|
Dvd<uf

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_glass_100_fdf5ce_1x400.png b/3rdparty/timepicker/css/include/images/ui-bg_glass_100_fdf5ce_1x400.png
deleted file mode 100644
index a23baad25b1d1ff36e17361eab24271f2e9b7326..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouq+C2*978O6lYjjF{IFh)jg74>
zFlmZ}YMcJY=eo?o%*@I?2`NblNeMudl#t?<YIry`QK*OGr~otD9plAEGz`5G6d9zp
Wa55e{GUW=;JO)o!KbLh*2~7a@&m@!p

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_glass_65_ffffff_1x400.png b/3rdparty/timepicker/css/include/images/ui-bg_glass_65_ffffff_1x400.png
deleted file mode 100644
index 42ccba269b6e91bef12ad0fa18be651b5ef0ee68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouqzpV=978O6-=0?FV^9z|eBtf=
z|7WztIJ;WT>{+tN>ySr~=F{k$>;_x^_y?afmf9pRKH0)6?eSP?3s5hEr>mdKI;Vst
E0O<Z9>;M1&

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/3rdparty/timepicker/css/include/images/ui-bg_gloss-wave_35_f6a828_500x100.png
deleted file mode 100644
index 39d5824d6af5456f1e89fc7847ea3599ea5fd815..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3762
zcmb_eYgiKKwx-=Q?P<E4nMM;$eWu2m#PU%`&Ae^LOv^6gctJ3vM8!lUG!aCxQ#0eJ
zq?xIqDJi9<fFp>di0+w!yaC|_1uvA>yaxz|iX3eB<LqajpXblFzRUBi^{w~$)_UKp
zpDz0D*=4#5008Vc>v#HR0ASmSVIKMS&kf`CSAV4g0DJLgPkRO79xj%J<(hH6`bTGj
zrr^$JeiHJI?;s&<5pRw-^kj}=E;X0OX+pgz+f5GVt0NQv_gbu0>-8J+F$O>HpW?Lx
z+YFO`CV&6VV9fsEwG#js0_-|v*!ujZ*M=jfo457?0Do-z<^}+8bI+qk+W~+$zz%Z&
z;L7&@&ns`l8Ofh*Wd<Cp_>U0pO%RP^?Xa_h7I}7K#}4Xt`s%-(m-enaPWX<H>$O&-
zX~a1aOzn?!r?5wJVBNPJ_o8-(9Fz<_c1LYGxUl(E+Wdx?wkNHH2T%eWq9Kz00h#RB
zYKI~=a<9_QqC^n<>hyWlS66waWgyAP#t&TfTWP=Sxa)ukRY%j7WH}(@r=B^W_;b&M
zRzPYsb*j^Kou%%`K6VP+dKtR@x~qEHq4rXMxoX-gcSf&->lMY%TMXF!Gw_A)(tp6}
z2A%kN3twbr%KyUrrmw24V3d%wzK<-q(M;MTr41}un`P!!xejADEv_CJ{CTif907B&
zEP`pDJIZHVgnmxh$EZnBOUxz~Ap+ZzKbFmg39_n-)$wY!Q@i~5aGmHbN7&*gk<HNQ
z!$-sS))5(#?qPW$1C^3#;cFvQMWTd)d(I_4awE^ZjGC%XcnSGez>q9zWgV|2(Zhxl
zoDqJp&MxW(qX#C@oF8L)*r$RdSjVFSc$%z?*9%YoZ6sOZ!vtxXtBM<*r82<p7}?1@
zveQI&tiNm{;57jipQbO}b?9l*l4nGAT4Y=-w()@*#J1?%2{)nY^{|NO=xM)s?jR6<
ziJ!fSOOPs*$8->vyC}_Eiz1PJ2L$bttko`=+fH{Ne@G#lMDxkKt_y)O(J5&Ak)w-I
znm!vzYX3$kLDG$hOp-KJg~7}M;73BFWA{!a61fe?NJkjR_}Xw+*`O0=AGg7&dU<kQ
zA;d%-zM*iwS2t8Y)Gu@JK&A)fV=HHvbW`6mV+EZrtJSauApMCndBS~F>A`A?9`whW
zM{fkFf`G`P^9j*|-q9KLvS<191z9a^mK3Lss}W8O=sZ}N$V4Fh*SWF5NbZQ>p{0>$
z0pe}d$*s!y<I6P@1-n$GE>*R&NSXbjmld6{4Y;O89MuDTK0Hn0C?QdL9z1qGegXs!
z7$MIGkPkwdHF2os-Z-e85B?5An>yc|m<}>!Iirg%H-<NQ%ws0uIi51-a5phDmp{k5
zD(zjPC;t}@{w)+0&{l~FS*>%F11XY{{>@kgL>a#6fM9JzBE&an&F>eWh|b0^kJ<?n
zs=7WyuX=fIhvAjTTX`c}HUH)bTTI;OJGlyB{(NK&G;Htmn6^?c?TaAsOV}uBUtAa>
zNBM5*nCa~(xwn~rG~<cfPp*ub4V(WF)lGbJpS(|MvAA83yV}}9bfbt(>>GSG9mz3h
z9F~64y}giIrz^lfl|_5HpUsG}?Wpr*&f?bS=|9biqivN)-a~u>uK<{Lfcng{663QL
zLXzO@*N5)q4C=j6E8nC+P%lEwI#~0wkt;M4Y8!+DYzN2rBuYao1*HRIa^NC9nFeep
z+ns5$X9Bh48S-`ss!k&!J#Ddd=j1O-9}?`v(B|<M1@-U18t+Js;ZNHIk3$u$U;Eyu
z3exyGipUQbO;S|Bzp(hX{&!NB@oq*gb}e^)68}5#!kH$BhK<@5!ubu^XDa&d1C#@|
z3yY}&(~QVLCVdv){)I_ECxKsIlmW8LZ!;=rtk4ZaX!xm*=*Z(|P+Uqf*Rg<I!Tau&
z85{4>>R7wD97BV;nK~quUHx^mj^G6K2GZ1*uSN?iLm!7vHB7_1^TGbKhmnK+K`GYA
zocp2=on8LxJH^`7^1ch0ft(MTU$vJB!R@gQ^R`qoX>(=iY#u++3K>oqSpG={?#YVw
zp3m99FXk^~<6#X9X1oKYXEH%8t2btG65(u0zF-J)^>8dj0Evc+9_Bd^Y)k9AfW~FV
z%iDV(ClS6)TC7eVzh{ml;p4cx8)$TV&qhRWp+dqiw>i32?1;5d>HLrNj=^OdJ<}L)
zWxqw8aFI<~_TkMDQHS?`z+KQ?+{ASoy%}RBu6i9?BXbh%OEx1OuZ}?n(VjrT(!B1;
zQ!#WA0NBx=^6rJrFVsDCuT4)OTG<Ikaz*O8tFTZ)QL^`qbYu)jq*kTD>zZ3$Z4Yqz
z&c9+7%g!%zxtv#p2fhHbo98KBwfE<e9Z<Yr%uRWj-5Hd3hTYY<&ve`je8y8RV)knu
zYCT0K`*JrRv<nx%jAf>&Y(&2#=}qEEU`ECEjlCp=X^_tIoMx>%kBT5k)^c=zyV5w3
zc>DLKY6%=y0igWi9B@4hB}bR6K|+jYBt+}i6Ld|b`*s62c6Ge?zGYvdW)=p90~$Ad
zxGB>c<3Dy~hPJ#vNXierOl41xBn_0L<5NhK6JO-LvtS&Z{xjGKfIC6*9%*?tv*?+!
zv;Q{?mHN2b|3DEJO}R9w11ZT5QVC(H0u|0n9cVK_@2r%C<)OnZ(3aS0Ux^6G$ja*<
z9R~o~9XjhPL)w@vYi6r;H$tR>wW`0-Z&Qed`X0LZY9-~mfso!@dt?5Q;@|K6$mAB&
z$J41&y)<{N;QATPeU}BC{lM_<D4HZA)B)i-;gJ1pwusq$h>@-LlQ2hjX;}6~qdglT
zGm%qJm*F^in=w*?j;@C_P<fNuR>CMnXK5Fd^wXV**pZOdS1KbSJsC~s#R;tmXIMb`
zHB>sx<rNDl@4+*>Qg&E5Yf@}d#~Z9D4R{}ZpLm7S=bY0x#k<=H?=R+=W$=Bm2aU*n
z)qgD*0#4>GGlHhQ`bx#k=Njc;+9D@{F5`xI^tMkBf{XIzwB=b9KbuuLF7jMTR~Mwt
zN#!)9J4&^V@JRe9Y!b2!;$rCLPWZfG`C;Qz`u~TJdCzv->e`=R8uHX_2{Fp&pWJ*h
z#A60&bY(j(^P@t_`_pktBV7{tFVoeNWlNA|zgNr&DMjJ_!k2%2s2~F@la$M6k%hWi
z7}}hoDuoaN7?lchVk@4DunpEIS$72&uuF&F;&4uhC$L)6IzHHUryR9emzpxwsRXmj
zfc}pI#oRCB7Y1;t=*58Gsv7x3PGuW^spn6V&dWf#?*TQ0(|*rr=EeE1o~y1<q=XbB
zH7M1n6!fSD?pm#tnQqCt>wyQi%)e*oX6iX@$m0F1R<jp2X5!4xYkF7J+;bthC|!^_
zfGt{`v`5@+vH^moN%0^eXsq^fv|D%^4d2~y%?^q=-Nv+wR>tKUT0vgg!8^fWhYLqS
zF@EOpFld7>f^kprb~YwMq=^<<pan6S!*H@g7t}eQJLhuWeLGTkT2P+Ck3!Te1lk%)
zt9TCz)oC3>e|gw?QFyf8ck|ZC^>)3c`b$^C>jCB4Fne_1e$Cqt=4Ud#K~~8Nfa91W
zwk17&D?X?4FRzR+5qCiIqPf0};K4$tW$}l~A?u_E=JSe;*f_DO>r{z=U4_<)dY)M!
z7O#mizC+GN&#;)k)vkBU<tXnqP_^|-tGmZcT8Dlxt6Pn?`uypBX@1fVrNePVd#ALp
zF4$80+@AG;7xl5W_sE^yNYES$<C6}`Zb1&JCZx~nYEbc%r#1d%Mn0pgS$5QlwG(ot
z!Za{>S@fZesb{v?YuFlCPRjsT5bxB4@+sqdq}xvvBhTngZ(N1LUCS-ei=5sgE-Tbc
z7HK+A_O23MP@sUoc?I?*ZB|F)&%us|2<oRU<$~ApQ%f%RU*aE`VmGrB<J4ieMCirV
zP_~OQ;txr2WBgPQtAbapRV&BoULc}?@}z*gAAJEFNo(?(iOCZhqe)W78eZ*UvaN@7
zhKKGvt0!}(rjB;qc0K^%h|5n7(;vc+uHx|Dg@=F~<I;s3VT_=D#he%5p2SoOly<_w
z*HKrz@ej3W?Y+xd+RJZ;9WZCGEGI{ETYg8h6;=d~Oi`<7@VfdE&iUPi>O$#G7V$6z
zq>G%6!cu7OEf+_#^A=23Hd6Db9-yK*NQ#<PGnv3oz%Gl*Ib##q`dB%MvY>S+kjJI7
zhLiLz{>zKKtHH>H;B-cALzj`>@+-~?X2aP7ypf9WMf8q0m)wS!Nkf+&R&&zEjFOUx
zlq^>v#VAq}=)?dKRMe+010g9O;qAiaTA4dV+==mw%i3Re)DwZ$Wd5CK1m4Ivy&&Ef
zO8W!SpcgA>zfTGAE!{IPJMhdZ`T4{K#7ndDT8K2&*jf=J8O>H*iDJ}ZK}z|$C3U62
z$nZhk4v$QIYzMaV+0`B8S!=9RSYzi*QG#tp>ZY|lY_`}A-zI7)(tV$B9G-tC#zt8m
z<!M@MT<43;wMNmuo-kSmPm5UQboY7uH(`#(7slpt#=BnL_;t>re~pD7oIFkmIAM=s
zw+Iili%nSC?yks)t~q4lTlZW(#5^yUV@+^KvIuQzZDO^*TBz!<CtQh2rfO<z=TS{H
zzIH*$V56H0{EnCR^XrG!ZG7AjD4r}Q(t2l9(P&QU6M<44;NxCby12gE#~t-zco3A+
rQq8KZ5e*fKEaO{0Ke0s~Qmy6Xh5m%FO!wV}CE%>j#nX%*uiW|{x9q0w

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
deleted file mode 100644
index f1273672d253263b7564e9e21d69d7d9d0b337d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 90
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l%l7LV~E7m<R2d&AFo$qV`FPm
oboulDzr6KyA+fs7hb{~ZQx+&qVC9&67pR!Q)78&qol`;+0H8b=ng9R*

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
deleted file mode 100644
index 359397acffdd84bd102f0e8a951c9d744f278db5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l!vE_V~E7mtNjN#8yp0f)nD%C
z{k^&2ZZH4W#qke67#j$%IepV*`yn{#P|600IVRJjChwXe(ssyZ>xPQ=F85a&M@g_{
d|GeK{$Y5lo%PMu^>wln`44$rjF6*2UngE4^EGqy2

diff --git a/3rdparty/timepicker/css/include/images/ui-icons_222222_256x240.png b/3rdparty/timepicker/css/include/images/ui-icons_222222_256x240.png
deleted file mode 100644
index b273ff111d219c9b9a8b96d57683d0075fb7871a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{;aID?ElVL?Rdohw{Ucz9r_YL7=D6<&8F>PmYTG^FX}c%
zl<zAi(m>GE{DS1Q;~I7<vD)$Yj(fd>-6ze&TN@+F-xsI6sd%SwK#*O5K|pDRZqEy<
zJg0Nd8F@!OxqElm`~U#piM22@u@8B<<ecI*S<egUH7}csd8!)jLBD2s`p(8v&--KE
z71^q9MglFywkSt_5FCr2F%o&UR(5j7-O>moyKE%ct`B(jysxK+1m?G)UyIFs1t0}L
zemGR&?jGaM1YQblj?v&@0iXS#fi-VbR9zLEnHLP?xQ|=%Ihrc7^yPWR!tW$yH!zrw
z#I2}_!JnT^(qk)VgJr`NGdPtT^dmQIZc%=6nTAyJDXk+^3}wUOilJuwq>s=T_!9V)
zr1)DT6VQ2~rgd@!Jlrte3}}m~j}juCS`J4(d-5+e-3@EzzTJNCE2z)w(kJ90z*QE)
zBtnV@4mM>jTrZZ*$01SnGov0&=A-JrX5Ge%Pce1Vj}=5YQqBD^W@n4KmFxxpFK`uH
zP;(xKV+6VJ2|g+?_Lct7`uElL<&jzGS8Gfva2+=8A@#V+xsAj9|Dkg)vL5yhX@~B=
zN2KZSAUD%QH`x>H+@Ou(D1~Pyv#0nc&$!1kI?IO01yw3jD0@80qvc?T*Nr8?-%rC8
z@5$|WY?Hqp`ixmEkzeJTz_`_<!oE0dsO`po1=$i_1k<Um_}caMZcrpqA*x-}Rw(fX
z3Qyh8;-4^Fe)UICI@ayzmyV?48GbR;1*s>wsSRi1%Zivd`#+T{Aib6-rf$}M8sz6v
zb6ERbr-SniO2wbOv!M4)nb}6UVzoVZEh5kQWh_5x4rYy3<sHrHJLqL+DcLT5`t$L@
z5_J8#H;PWO1GW@oId1Y>c!871NeaM(_p=4(kbS6U#x<*k8Wg^KHs2ttCz<+pBxQ$Z
zQMv;kVm5_fF_vH`Mzrq$Y&6u?j6~f<juy`C^I0O`4mfXK0lrRY*VoeJX&k$9aL;Hl
zlp63sf~-1z_419)A8^j|LeQSmK&T8R7nA=Ki3^H;YaeL&hF6>tIV0Yg)Nw7JysIN_
z-_n*K_v1c&D}-1{NbBwS2h#m1y0a5RiEcYil+58$8IDh49bPnzE7R8In6P%V{2IZU
z7#clr=V4<zT-gP2u}DD>yyrRe@oXNqbqo^^LvlLE?%8XaI&N(Np90-psU}7kqmbWk
zZ;YBwJNnNs<m6GqjV2(cCX2e+#tSOgIGm~J&Djknhy!e`&p)NTq>$~d!mx9oMGyT(
znaBoj0d}gpQ^aRr?6nW)$4god*`@Uh2e+YpS@0(Mw{|z|6ko3NbTvDiCu3YO+)egL
z>uW(^ahKFj>iJ-JF!^KhKQyPTznJa;xyHYwxJgr16&Wid_9)-%*mEwo{B_|M9t@S1
zf@T@q?b2Qgl!~_(Roe;fdK)y|XG0;ls;ZbT)w-aOVttk#daQcY7$cpY496H*`m@+L
zeP#$&yRbBjFWv}B)|5-1v=(66M_;V1SWv6MHnO}}1=vby&9l+gaP?|pXwp0AFDe#L
z&MRJ^*qX6wgxhA_`*o=LGZ>G_NTX%AKHPz4bO^R72ZYK}ale3lffDgM8H!Wrw{B7A
z{?c_|dh2J*y<H{`M3l!HEtOc{;H{lJx}(C|*lvPQ+RAcV`>8b04c37OmqUw;#;G<*
z@nz@dV`;7&^$)e!B}cd5tl<nF(??uM#|`*5pIKe!DEUl5-&9M=s_3Yn@-P(czyPQ~
zTU3I3bk%z<*w;9V(oQvt^2H`kBAW;=2oA<L1<qVIK(Z{Hk@5&E&_2mS+|}+?g@FBu
zK+e=OWg<)e?RO;llNw00>0{g(Q>5_7H^@bEJi7;fQ4B$NGZerH#Ae1#8WDTH`iB&)
zC6Et3BYY#mcJxh&)b2C^{aLq~psFN)Q1SucCaBaBUr%5PYX{~-q{KGEh)*;n;?75k
z=hq%i^I}rd;z-#YyI`8-OfMpWz5kgJE3<X7ptj0dmPk5UrEf%nVD%<Giiw4wVh!K0
zFjy-VAnpOFJIDm=jqqahP0Wam<9qv4UMIazx8J<YJz>I!3ean6=UZi!BxG7i(YBk?
z02HM7wS0)Wni{dWbQMRtd-A)_Az!t>F;IwWf~!*)-Az4}yryNkz&9)w>ElA80Oc`6
zHo#9H!Y3*Qx9n@Jn)!w6G^hb;e_n8zpIyXCN`JFkPc)^Q?2MsLNFhMgrcZI-<#1ne
zjH;KFf?4eAT9<t<iUSC5BsF-<$q+H@@j%Yk>mQZ}ZfHLGA#d%s;SZK4p0FwZT2S^{
zQ2BG1xJsbK6?yrHTjJi|5C0u=!|r!?*4FL%y%3q#(d+e>b_2I9!*iI!30}42Ia0bq
zUf`Z?LGSEvtz8s``Tg5o_CP(FbR0X$FlE0yCnB7su<mcL>DPmI2=yOg^*2#cY9o`X
z;NY-3VBHZjnVcGS){GZ98{e+l<X|f4%S*+x526SE1mJ%6M<Nt*!}czEQf{?H1U0br
z^Y7cXNxH@=Ve^#j3H@BPU>q~O$u6pEcgd0CrnIsWffN1MbCZDH<7c^hv+Z0Ucf0{w
zSzi^qKuUHD9Dgp0EAGg@@$zr32dQx>N=ws`MESEsmzgT2&L;?MSTo&ky&!-JR3g~1
zPGTt515X)wr+Bx(G9lWd;@Y3^Vl}50Wb&6-Tiy;HPS0drF`rC}qYq22K4)G#AoD0X
zYw$E+Bz@Zr^50MAwu@$?%f9$r4WHH?*2|67&FXFhXBrVFGmg)6?h3^-1?t;UzH0*I
zNVf9wQLNLnG2@q>6CGm>&y|lC`iCFfYd}9i%+xkl^5oBJ?<;aneCfcHqJh7Yl5uLS
z9Fx-(kMdcNyZejXh22N{mCw_rX1O!cOE&3>e(ZH81PR95wQC37En4O{w;{3q9n1<A
zPC{;HRD3#A!@Lk)+k!~onQ0|-U%#uGd$&L?ZhNC&R)V(mb`NhUqrYysoMQ;Z)sq!y
zW_WwV!+jO*nGT8-Hx_JVmFK^=>t&;p)D%&Z%Nw$gSPa!nz8Slh7=ko2am)XARwOWw
zpsz0~K!s{(dM$NB=(A=kkp>T(*yU6<_dwIx>cH4+LWl282hXa6-EUq>R3t?G2623<
z*RwTN%-fgBmD{fu*ejNn)1@KG?Sg<bw3hQ~jCP9_dLp#J9Fi#nX3wGv<cLwQ;8x0`
zA<%pA%E0S;<5FJhw8e#?n&IA5g19Fv!v7YC%Gxqd<x1=+hht1t>*8z3hYtkQJQjB6
zQ|x>wA=o$=O)+nLmgTXW3<g>_6diA;b4EY{*i<HxX2Q~PA|R-tJ=V1~4KO3h7H~CG
ztNFL#J=a@4Q5K7Ogvj-+3N_IJUjc}x34}a7@bDE3!)Kj4s7ME<v)`yP${V~G_J@6l
zp{&i)CGxx1)X`lnwc}#g;g<(rA1#7Ez8@J}tuMD3bB{Wifbe~LWT0zYNjgb_qn|+G
z2TCDZw1rV|wPx@~-H8<4^MGxfR0aLq+_k+{JT<mckxWLsw*J%G%YH0>*R%6dO2EMg
z@6g?M3rpbnfB@hOdUeb9<OD{Zt&T^7p>6=~I?OIA3@BWAGmTwiQ{x5Cqq<8c10L!P
zd@Qk^BseTX%$Q7^s}5n%HB|)gKx}H$d8Sb$bBnq9-AglT2dGR2(+I;_fL|R4p$odJ
zllfb0NqI)7=^z~qAm1V{(PkpxXsQ#4*NH9yYZ`Vf@)?#ueGgtCmGGY|9U#v|hRdg-
zQ%0#cGIfXCd{Y)JB~qykO;KPvHu|5Ck&(Hn%DF~cct@}j+87xhs2ew;fLm5#2+mb|
z8{9e*YI(u|gt|{x1G+U=DA3y)9s2w7@cvQ($ZJIA)x$e~5_3L<r=v~@?aZ+642@!3
z&nTpp8p^rR@IEsq`uhzfD&i>KFV~ASci8W}jF&VeJoPDUy(BB>ExJpck;%;!`0AAo
zAcHgcnT8%OX&UW_n|%{2B|<6Wp2MMGvd5`T2KKv;ltt_~H+w00x6+SlAD`{K4!9zx
z*1?EpQ%Lwiik){3n{-+YNrT;fH_niD_Ng9|58@m8RsKFVF!6pk@qxa{BH-&8tsim0
zdAQ(GyC^9ane7_KW*#^vMIoeQdpJqmPp%%px3GIftbwESu#+vPyI*YTuJ6+4`z{s?
zpkv~0x4c_PFH`-tqafw5)>4AuQ78SkZ!$8}INLK;Egr;2tS18hEO5=t;QDmZ-qu?I
zG+=DN`nR72Xto{{bJp||`k}-2G;5#xg8E~xgz22)^_Z;=K|4@(E&5J)SY2of=olcw
z5)@L)_Ntcm!*5nEy0M9v0`S33;pO4T<mv%0Rx6?c2H~TA%zOO^T2$@D<Cut3{ae}|
zAT@Uzc>N;>4(Z+<j5j2DQ*r;U|6a;YfP1jST$I3mSn3aNn!?<=B-XkzG?hQH;@bu%
zmFYDDgbC%Wt{6LBrs%88L}deF9pse}dmIp4lmp@Tir9q)JKESa=h>19p_0>u#e-vE
zXCU(6gAvu~I7Cw(xd%0e59MNLw^U37ZDbsBrj%eDCexw8a3G`nTcXVNL6{B7Hj@i&
zbVB{;ApEtHk76q08DJ48dSxd$C(;$K6=FpU<~l9pVoT9arW^Vu{%Bcn4`eIpkOVC|
z$)AKYG_`ypM{0@BUb3^9lqi_c?ONH|4UJMJWDowMVjacycX7}9g={O7swOB+{;+?;
zjBo!9?+nd)ie#x5IbFW-zBOo0c4q@9wGVt5;pNt`=-~Zgcw#*`m($6ibxtZ`H=e=}
zF#GZ~5$%AUn};8U#tRem0J(JTR}<qii}wxmUzVwVIg2$uE2;GN{hhT&GE1i;_fi(_
z9KKXP)ds1Q)XnUhr?uXO-HbKE%5f%+-C>d4vR(dgK2ML~lZsPhayJ2h1%sD4FVst|
zKF)+@`iNzLRjg4=K8@**0=5cE>%?FDc({I^+g9USk<8$&^qD~@%W0i4b|yMG*p4`N
zh}I!ltTRI8Ex$+@V{02Br%xq#O?UlhO{r8WsaZnZCZq0MK9%AXU%MDLT;3=0A9(BV
z9VxxxJd7jo$hw3q;3o?yBLmA=azBUrd9>-<_ANs0n3?-Ic*6&ytb@H~?0E(*d>T5n
z-HiH2jsDf6uWhID%#n>SzOqrFCPDfUcu5QPd?<(=w6pv1BE#nsxS{n!UnC9qAha1<
z;3cpZ9A-e$+Y)%b;w@!!YRA9p%Kf9IHGGg^{+p`mh;q8i7}&e@V3EQaMsItEMS&=X
plT@$;k0WcB_jb;cn%_Idz4HO$QU*abf4}+wi?e96N>fbq{{i|W0@(ln

diff --git a/3rdparty/timepicker/css/include/images/ui-icons_228ef1_256x240.png b/3rdparty/timepicker/css/include/images/ui-icons_228ef1_256x240.png
deleted file mode 100644
index a641a371afa0fbb08ba599dc7ddf14b9bfc3c84f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{;X{3=KszyL1xbWEgT(ahrR?5hM!<zvuS&nr6z6fi@J>w
z<@?HsG!Qg3zaV+-xQ3ldtad!U<6iGz_enGH*2akP_r)o1D&8p^5M)<i5Kvm7+w+1d
z&*|KAM&6N6?%o|XKL7xDVlB)}>_c8IIj6Wy*7HJo&CBLuo~nj>(63pZzO(Vv^ZuB3
zMYigjkwA;FEy|G}1jpiMj6|NTm7Uyiw=@FDE*nX<>jR!W@9XIyf%$Fd*J5*D0Z0Lm
z9}ZQxyT|x5ftNy?V>EbJz-K>bV9gs9RaXUP<^=;e?&Fqxj;6{ieR-a-@H<J_4GiWZ
zaVu(K@aJcf^w<j8VA*iR3{E8n{m4z5Ta=$%rXkgQO6v#}L)oynVyGEE=_51-z65?H
zDgGA81aw}gX`NgF4>ycA1KMKhql8GOmcx<Hp8QKqcf*>wZ?_-(3hMK^^a*(gaFvBH
ziIC!fgH4$W*NbKIaY&T?%&13``KbD@S-0`xQ%v3TV+B!;RC7O!+1a9QCA$H@3tR;k
z)SSoR7(s4)f{zM}eWgFN{(ZH5d1O}l)f$ruT!)Q&NImXyZsTzOf9TwctcSfr+M)aJ
z5otO+$jvm-P4)ykH)x|cO5xeb>?!`qGw$(>&axqLL6yoB${vsMXgL_-bz@2J_tS92
zdvZG-+vKl@K4Vr(<X8D7Fm5%eurE#<YP<1YLAHb!!E~xCzIMI68x%=Yh-w$L6-vB;
z!c#Z2_$LgPU;Po3j&(cwr6cKhhF=VILF!3vYQvfMvLYtV{!ir!NUtS|shjnm2Kl+v
z9M*o<>EL{WQt@Z+Ea-hxX0}nTSZxnpi^#Kn8Ox8FgIS|hc}KJQ4tm*HO16ui{(O9}
z1YN)GjiQt6fGq`Cj+^`zUf?8hk^(T{{cOQGWFP98am}is28A!5%{R#ENv8fCN!j69
zl<vTXm`x#Aj3pR~5$!tw8x6HJBT;veqlI((e3l5f1J0XQfUi^9^|f?)8pp02+%sAX
zr3QSEAghjFy?kTy2b}Y~5VYqs5GsSo#pFLl;)0^z+6P*`;T5Mu&WLv=bzI9Q@9K!#
zx3ne5{kTux3L#b!(t3OTfpmY0?(76nqT7xWC3Cn`hU1f1hZjxb%CxmPCafJTzecbo
zhDHzEdDz$vS9U>MEK(2z?|BY=Je$XD9mB-Kkem*(d-j^9j$2#6r$Dz?s)-TCDCGCs
z8>6Pvj{Y+YIeFA@qY22V$)awy@q!9A4rgk5b9TcC;s9Ig^G|6nDP+5=Fzg&?(L=vc
zCbGd>fSu~@6!94td+o#d@sid<c4_^>!EI<?7QBi6t=$bf#g{8RUCj>X$rx7*cawe6
z`dScJ+$HssdOjE)O#Ybs56vm-FQ$7yuJJD^Zqk%hMaIgAJ<2yb_MFQte_i;62ScT$
zpjifYyR_E=rQ+>H)pmlr-Udzg*-!|ssw(D7wJvC+Sf8bb9;;q8#z?0p!!bsd{wy|5
zpBaMHE-Ve>i#LLjHRaMLtp%9&(HCng7Sw96jVv!#0k%?F^K7&=T)mnYn)D9(i;4x5
z^NJTJwq~pv;kH@#ejTd*48~(J(r6j34|m`h9fEDj0im)~+%I5XphWymhT;_Zty|Q&
zzjPg#-ufAHZ<omf5#{klOC=UKcxxw*?x^rKwwoZ7wz3@8eku)ggLNRn<<KIdajH#H
zeA)T=Seh$G{X;Ew$<Zx1YdFKl^buFmaRdI%XI9raN<LH2H`S7|Dmv<?JPd_9FaRph
z7M0*0UG<&|_BGC;v{TKZe6h)s$R@%If`c(mfiu?)kSq&lq&xx(v`_L7ceQ&}Az*(Z
zkTW$+naI+A`yGk?qy`dg`WSb{6e&FN4RX;O&+frr6hjc+3<Yokv6*p`M#SE){vkzc
z3FL#%2;YdX9eq<GwL48ff7Y!gs4B@Hlzc$A2`aV3*Atk++JX5HDY4Bk;uB4Yxbu<X
z`L&1ByqMIqI8t`UE|_LH(~F2;?|){*%50r1sI9V=C6bO-=^K$CSiOmlVqzhvSi?6g
z4AzPTh<iZl4l)6IBfJ=W6EkAt_}>1M*Gccw?Kf|8Pnhtb0`!{N`Bqsa37J+>wC$!e
z00k+2Egzz;rbcWoUB%Jvp8W1}$XD%e3>4y;;OZ1ccT-O#uW6Ys@C}Pa`nZrNKzR(2
z4e%3)@QI4SE&E!lW`5y14QhbepBG%_XBV-O(%<aX6HVzRJ7ee*QV3AB=~LWyIoy{V
zqv~a)U>5tj)@9#|;sC-MNev!zGDHk}JdpGC`iJF#8=8-P$Xoku_=Dw%Cv3{U7L>gf
zRQ?<$t`cZ*MP5GQmbmx#!+*!zu>0MewRO9GFGS{b^m_fJ-N0?j@EqoFf>$khj+E|@
z7r3We&^tR^YZrxKe*d<YJy4G(9mh^GOxZ8bi3n#Ytos{m`t{%)Lj8wW{Y{jV+Q_6T
zI5_MMSa-xsCZ~p-HRDCj#<#0BIhacN@>22agXqCO0l44&kqCv{u)T|(lv`~PK@DvE
z{QI_TlCH5z*gR!>LO)k67{^R+vWx24U2^2ODXpwT;6y+6+$5m)_*w4WY&#do9dCeE
z)>p+Ykdhq($DhmMiaYXey!@N%L26uz($aJ!QT{B^Wu}U$^9e#5)=c+XF9@Ill?ZmM
zlNgHiz*9!vDc&uxOo;ZVxb`Q!Sk0*gnfxWzmbZh4(=%CD%qP?0=);n$&zaW_$UKV9
z8axdcN#AyZ{P)wj?V{P}vM)YY!>6@}^>U+iv$`9>nMTCPjN>z%yF&3yf%>+T@0vh4
zlC8Xa6zeo?%=o3}M8{aebLHcO{^1Ar8qiM=Gquf?Jo)q5`-+?sUpg?QXyEUpWSm+n
z$K-UyqkI<R?*3wTVfWE~<@2<uS?-MVl1;jzAA8*iL4xsi?b?BNi<UXgZAh$t2eX2O
zlaSjP6`u~(FfWAHwjdICW?Bi|*YB$4-Yt-e+urDxm7s0C-NReT=&xHY=NLk9^<)K_
z8Qvc8a9@Rcrh{U|jRjj-<@xXJdfDhCHAU3q@`fxV7DF|YZ^rH=h9J#M-17gO6$#8E
z=<ACLP@x){UQ68&`mEVXq`?Cxb~%;JJ<xQvIxsey(BZq&!Lur1_nVgz6$w$lK^&jz
z^=yq5^Y*23<@W0Z_KKzDbZLlkyC5J9t>wHLquru~o(OF)hhz$Y*|X>ZIbswnxRvr~
z2=rdOGVuD|xRlpAZE<0!X1F(%Anpl^@V^D3vbM}qxe|NI;TTiZy7(IM;R69RkA>a&
z6gwYE2sREzQ_LHmWqB+ogMk(fMaSFeoDq-!HkFB_nXt5+2ncFuk9BQL1I&oB1zZi)
zYW{6_&-Ip1l*OVRA##1ILQS;5R{-K^0wGTiJbVSi@LA^$D$;@J>^G{6@&+%4{b3(s
zC~LEHiTv(0b#zxt?YJ0r_~pUZM~mQ(??(n#>&tD%+@nq=Abj5*8R!~Ul1`G~=qFJ4
zfl|m8ZDCYgtr`4LcOpgiJYX9qRY5;DcWti~PmS$VB$E-Zt^f4)vLDOe_3XTq5^ylW
zJ9PKm!V-8sAOJXnUfuFNIf0R9tK-pNs2hO04zr620}5B(Ok>yB)Of-3sP59qfQNbm
zA4{w!2@cB;GbR(~szVrbO%(w=5S!X`o@o@x++wbN_tMPT0V<QhG{UeJ;8({%=z{L*
zWd0UgQl1fNI!H$Y$hXK#w3!Gvn(74Nb)t*FnucAAe1;`Z--B03CHyB#2gq}g;qs~I
zlu;^<Ox+<j-;_m5iBxJsQxuqvjs7QOWMpota<0)9-Vv;XHb%w=>c)*I;Fgsbf^*g0
z2Di?HTApwKq3+YwfNsqd3iP%{hyK1iyuVZc@*0tO_3+N0#GFsz>8MjeJ2UJ%L!%hi
zGYYAthH`E+ywA*u{(eJ=ia3h*%k?779rk-K<0VZAPkl;TFUbmei|$fqWO8!_zIvqt
z$ly$VrlH46nnpX~X5Yk0iBJl;=WuA4>~X4-f&K0yWf42h&0b30t@NYX$7egQ1Fp!a
zbui-D6cWCWV&|R1CY@G8(qOmWjWeX3eX7UggZPGimA}soOuQdXe4uZ#2>5zN>qlI0
z9xk}lE=tNpX1m6*nFr2EQ3xs79!^sCldDJYE$m(qYv3q7>}1R7?iZW7>$~*%zKaC|
z=$N?ME$>#+%T&MZC`dW1wUl6Z)JgyCn~V%K&i0H|iwE%$>xsZW3tTfZxIUe<xAj&4
z4Hz4+{_ST0nym-LoHhM~e(110&D!U_p#In^VLIn{J!Y#z&<>Pci@p;cRu|d=ItIwF
z1clVHy{hH?@SD|(Zfqi^0DQ1hczHN7xq85h)rzQqLHMX2^IkuK7FB!kI40s$|CY7~
zNX^{_UjN8}L%Med;|+=4RNTMozn8KT;2tb77bUPCmioh+rZBfIiM6f_P34cQ__o1G
zWqQp3VL~~pE5?qODf%iiQQ3f42YF@09tQ*$<v=*TB6gv{jy879dA6iNsN{5E@!(k4
z8HhaiU_^B~4$+iH?m^ArL%A5*Efo_%8ySb3DJ2+($#iHi9LOmDmMF7*5N3n2&E!HG
zolrkI2!HM5qnOHg23Q1&UfD^`iFCzlg;)`TxlRkY*i!V9>4v_EKUx;t1KCPCBtgqg
z@+Tn;O)a0uky_%jm+WjNB?=~VyH>V#L!*=l*@OS6SVyt_UEH&NA=?V2stHPyKkVNy
z<J*73J43UcB3bH1PM2@IZw;E0-Pr(2?E_y%c)4{fI(WYro>&jg<#cjros){#ji)dK
z%)We0L_478=HZ8-@xnwsKrWs8)x`MB;(Y`Cmu2c-&SH(vN-F(*e`l?c%+l$|y_AJJ
zhcDGnwLvN+bu;_sX|1<mH)GAPa-4}{cUWY%Y?nWr&(mZ0q~a8r+)V&r!Qf@i3-wZ~
zk29f}K4Mv56>AiePh<L{fUUyPI`J1j9<HC~w$=DnBr|v`eP$5Ka$0AMorz8kwj<6R
zqIF0X>x@u&%P$hf*xE+O=~D?_(_KGWQ!158YL-y9$*6mmPo;Rp*Dl5lm-mVM2i`h-
zM@nxv590_tvMwPD_{l=b$iOm|+|S{D9&P%zeT$GgX6Akl-tfUF>tL@Ld!B&{pN39t
zH>3Vhqkr}2Yul+jb7UiouWVGPNsxX7Ueba+9|~dz?d*QM$ng0DZfO0`7fAy?2yMm|
zcnRzUhZ&IcwgjH9cuU!w+VStYa{p*)4IgBf|E8)sqMYtB2KH_}SfsFq(c9i(Q6S3U
oBo%DI<H*|Oy`A%<=J$?q?|gu`ltGZq->*Kv;w;*%(i9W@e{{5C=l}o!

diff --git a/3rdparty/timepicker/css/include/images/ui-icons_ef8c08_256x240.png b/3rdparty/timepicker/css/include/images/ui-icons_ef8c08_256x240.png
deleted file mode 100644
index 85e63e9f604ce042d59eb06a8428eeb7cb7896c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{wzI}^MB`Dm+sH{TR1w<4t)tA3_robX4CdCOHJC|7j+vW
z%J-EMX&`87enIluaSc0_SnYUx$GzUc?vrNXt&I`o?~7C3RJ>C-Ajq!3AfU8Dx90^_
zp3}MKjJzYC+`T(&egFXQ#9Ek{*oVAaa!zrZtmlRFnwQPRJXH<%pkK2*eP`pT=lwD7
zifq+4BY_rUTa+U|2#&?i7>PVvD?7R4ZfOLPT{e<z*9Sa%-q+JZ0`uF@uf^uR0+0eA
zKOCxXcaQOB0xyL&$7t}dfX{x=z?wHIs;&yo%nJr`+{Z2X98Hy3`tm$u;dhd<8yL(-
z;#Sne;Lpz{>9G~G!Ls3s8JtQE`jMM9w<tfkOhc;ql-3a{hO%LC#ZWVT(nn|vd<pzY
zQv5BF3Fy2~(>l2V9&Q+K2DHW0M+uQmEr%nYJ^7cK?uIpU-)=wn71ZZ-=@ar0;3^AY
z5+TI{2b(e%t{2PZ<B%x(nNg1>^HKF*vu@+Xr<l6w#|okxspftdv$I9rN_GQ)7q|*8
zs5y_rF@oIq1RoU``$~Uk{rhVB^2n_8t2HJSxDFflkb2zZ+{WSl|IoP?Sr2=Mv_tpb
zBhqwukeg|uo9qd8ZqP<?l)|%<*;D+JXWZi%on=Ghf-03Mlsz8h(Q+`v>&BAc@2BC4
z_vCgww#i=)ea5Vo$glEEVBBg_VPBj!)OO>)f@}#dg6ULOeC>LBHz<;*5Y;YfE0lNx
zg{N+4@lO~ozxpF69qV@VOGnc248Iuag4C1T)P^(hWkpP!{h!JekX}m^Q#b2B4f1oT
zIjsGz)4}-$rQ*-tS<w5Y%xt4vvDzNI7LjNDGL|1T2eU@2@{VTp9rUuZlx!D2{rUJ{
z3A%pW8$~DC0b2^P95?wbyueB1Bn4o?``LnX$Uf9F<C;}N4GLdAn{SZSlT7_PlCs0I
zDBXb%F`GiL7)vk|BieTWHX3ScMxyQ_M+@in`79A|2b?#r0AHuH>uc%qG>%<4xM#E&
zN)7lRK~^2VdiloY4>;#}A!yHOAXEmEi^+eA#05pawGXs>!z)gSoDuI#>bRCq-qjJe
zZ)r=A`*EMX6+)~er1kdv1L^)0-PsAEM7JF$O6G8>496$24lkO<m1%2pOjtWwevM#F
z42>SR^RTfUuIz%iSfn5b-t!##cs7sQI);gdAvqmn_v|%I9k;fCPl0Z)R1+hNQONJN
zH%3jT9sOq*a`LF*MiY=zlSSQZ;{_FL9M07A=In+O!~wR}=bzGEQpk2!Vc0p)qKAH?
zOk{(%06W#)DdICQ_S%Q@<0Y+!?9%#$gWJ%)EO-<BTe}-}iZ54sx|$u%lQFIs?k4-B
z^|c_dxJ&9M^?WcqnEWyMADUCvUrhIaT;pF-+@vY1ij0*Jdz5c>>^YZP{<`oB4~9xh
zL9-0*c4@B#O2ylYs_g`Ky$zb~v!M`NRaMNFYF*Gsu|7)=JyyMHjFC=HhGUE@{aI|B
zJ~ITXU052%7jFb5Ys#fhS_?4kqc7H0EU49B8(Chg0&JzU=Gka#xOz1)H0d4m7ZnRA
z=M^tdY|U6T!fmte{W?_r8H~qdq|q{5AMU_2It1I4143n~xL?4&K#BOB48<w*Teqll
zf9X0fz4bHZ-Y$~|BFf{9mP#ye@YYTq-BICfY&StDZDl#G{Ztz02J1kC%b`U^<5ZiZ
z__Fi!u{2kX`iENVlA~L2)^LW8=_9VB;|Bbj&#bO<lzgV3Z>l9_Rdm!(c^C?JU;tF0
zEh@o1y6Qa_>}#AwX{VY+`C^kNkxhgb1P5cB0%xupAXyg9NO=SnXrJUE?rQg{Lcsn+
zAZKctGLfbK_B#^&Nev|0^fB&?DN=ak8|0!np524LD25=s84BP8Vl(3=jflNp{X>e@
z637Ri5xx;&JNl+XYImA|{;XR~P*svYDEWYJ6I5!6uO~2twFC1ZQevB7#3z~(apxn&
z^J@>Mc`>PJair{yT`<jZrWX;x-v7*qmDxI3P+Mg!OC%kw(l;VOuzC|8#l%8Tv4(G0
z7_1cw5ch!89b^LbMtCv$CT7IO@xA>iuan-V+i%|Ho-pA<1?V-k^R2Q<5;Co%XxmL`
z018t4T0TTwO^w)Gx{9OSJ^9_|kgwX`7%0Rw!PO~@?xvnfUehvN;2Rc;^l>3kfbtk3
z8{j7p;S&{uTlTe9&HTc38q@%_KQFk<&n{vmrN7y&Cz{etcE->rq!6HL)2F!aa=0%!
zM%Bwo!7TQ5t;@a_#Q}sjk{UebWQZ8{cp&HN^$*JfH#8spkhk{R@CVBiPuP@yEhu{}
zsQfuhTqV%rioATpEphMfhyRYbVfVW`YwLFXUWm-===J(byMf!5;W^CV1g~2194Xx)
zFK|z{pm%n-)-DRe{Qhk(d!QaoI*y%Wn6h7<6A{i*Sob&B^y|Spg!&J$`kN>zwUJ3x
zaB$ciu<nSNOim3uYsQP5jc-?Naxj(j<)z};2hoFn0&u_kBM}O@VS5)nDYx1pf*RQR
z`S)$xBwb^buzAY%gnq7CFpintWEa)7yX44mQ(9Sxz=?kBxk*6p@w42$*>*0FJKg}T
ztgnh)ASF8njz5>h6?f#{c=<QigVeYbrKRaeqWoE+%S;th=M#iBteNh&UJyV9DiQ2h
zCovT3fv1eTQ@mSXnGo$!aqUldv6@p0GWkoaEpG=8r)RRRm`|p~(T62hpEIu=ka-lH
zHFz2@lD_Q*`R}K5+eNd{WnX-*hEHn`>*Yr4W_34$GmVIo8OLWjcZK4a0`+Yv-!*}9
zBwKm;DAsA(nDI-`iH@;`=gP+m{lgFLHK3m$W@?)&dGhDA_Z2xOzI0$p(ZJtH$vCxE
zj>+kYNBJzs-TlSx!tSH}%I9fQv)mc!C7X0bKlZv4f&}C3+O-4k7A<p}+mKlQ4rT=l
zCn2{pDn1>mVO|KYZ9ydP%(N1^uisV8y;~p`x4qFXD?!_OyN9=w(O<V*&M}1I>d6W;
zGrT?G;l2v@Ob5k^8w<9w%Jbjb^|H}PYKo}I<qcU#EQV?(-;CW$3_+TixaI#lD-xJT
z(AO6gph7h?y_UKm^jWi&NP`DX>~bobd!XrTbzp2Zp~H8lgJ)I3?l&(bDiWf8gE&6b
z>)9GB=Iu-6%I((+>=jGP>CzD8c0oWITFZGgM!Q7|JrUYq4#^Y(vuDu-a>OWDa4Y4}
z5a_*lW#IL_aVf8L+Ty}c&2VojLEIA-;eQK6Wo?<KawYbZ!!f3+b@4Ui!v_Lt9t*qk
zDRw@T5NsTbrkFQA%ko%G1_Lb|ijKF_IU^teY$_8;Ght~t5fIeS9_!kg2AC0L3%DAp
z)%@G=p6e~2D2qisLge~Zg_>xAuK>i;1VWx3c=!s2;j_*iRHOsb*>6-C<qcj8`@=rO
zP}XMY68YV0>gcYP+Ho=L@XLd*j~2ln-;WHg)|cCixksH$K={5rGSD@yB%LI|(NCc8
z1Er8H+QO)~S~K{g?nH|2dB8SKs)BxQ?%G}}o*LV!NG2m*TmR|pWj~g`>)ClJCE#F$
zcj)fBg(dKOKmc$Cy}IRlasngIR>z~kP&WW~9cC951{AKmnZ~ZMsqup6QQf7J0T1;C
zK9*Qd5*(HxW=tl|RfjO>nkoW#AU3t>JkuzWxy4-l?xmTv15_r1X@p@dz^{&j&;{Mq
z$^0$0q&y?kbdZh)kZ+NfXfqLTG}Q^j>qHlUH4VEK`3y^-z6Y<6O88Hf4v^;}!{t-a
zDWg;znYu%6zA1~A5~<XNrYJBS8~snn$jIDO<y@mJydzi%ZH$Z$)QuZaz%45=1m~)~
z4Q`zYwLIYfLfxmU0o|G_6zFY@4*h+3cz>w?<TWDm>fxO~i8-Ib(^02{c4pXjhDI^2
zXB1LP4dvWuc%PXQ{r!d#6>${rm+M8EJM8yf#!H$Kp8AxwUXm5`7Tu-J$mHe<eDz8P
zkinV!Ohb>CG>vw|&Ay415}_1w&*9K8+2d3v1N+@a$|820o4u60Tj@u&kI!~q2V9X;
z>tMvQDI|O$#m+m2O**ZHq`_{#8)ry6`&5s~2k{O4Du16Fn0P;&_(0!e5%Bel){nU0
zJX~<8U6hoI%yx}qGY_1Tq7YKDJ)ETOCs&W)TiCrK*1%DE*vXdD-7hwE*LUgjeHRM`
z&@pkhTi&gtm#Kc+QIK+2Ybn9-sFVKNHyIgfob4H_77yYh))Rq$7Pw|+aD6&yZ|ki9
z8Zb6s{oBt1G+PgfIcxd}{m@~1nzhe;LH)5;!gS8@ddyabpdBc?7JVl?tS+<#bPSMT
z2@0uYdsWN(;Ww)n-PlA-0r+62@bYkEa`k{0s})fJgYZ#5=DmIdEvok7aZJRi{w-|}
zkea&<y#A2`hji}_#v2m7skndFe=lVxz&%)EE=piOEcJ&sO<`_b5^G%<n#vzp@oj^X
z%JiB6!h~{GSBxDmQ}k74qOt+84)V%~Jq`#i%7JivMeIU@9c}EI^K40lP|4}S;=!@7
zGZ1<3!HDW~9HJ?Y+=H6KhjKBrTPh}kHZl%5Q%W!nlj+c4IFM2PEm3CsAj}43o5_VX
zI-!1a5dPZ9M=_Q046q0ky|R;>6X}ZA3b7&vbDb7)v8CuI(+zzSf3z&P2eOrPNP?D~
z<WE8xnp!@QBele5FWK2lN)$}!cCBpfhDIq9vIqZBv5sQ<ySQilLber3RTGpZf7ria
z#<%~5cZOy?MY7b3oG#yZ-x@S0yR!k5+6TUj@N(-|bnt#LJh2{}%jx9MIwuve8&6>f
zn0@)0h;~5F&BG5v<AsTOfLuEFtBLWM#rp>OFU!=woW&ZSl~nrs{?1w>nWfW_dnpTd
z4qvLDYJ*ft>Sp%M(^_xCZpNBn<v0_^?y$&i*)D%LpQp$0NyRBLxtjpMg2Bt27wV-}
zA7?@{eZ;cBD%L0_pT_h@0b7Nob>c66JX}A|ZL9IENM`U>`ph7d<+RQiI}@E8Y)70s
zMC*_&))}GlmR}@{v9*nm)29-=rn`Q$rc^4G)GVQHlTr6BpGxtHuU(8AF7Ffh54?5w
zj+EYT9>x)PWL-iQ@RNm<k%46_xu3)RJlgba`xYU0%*_29yy1gU*1=vg_B;a@J`J7P
zZbtp1M*r&3*S1r6=Ez1EU)iWolOX*FyrcztJ`}_b+S&bhk>T?R+|c@=FOmj)5Za6_
z@DkVy4l^L>Z3#SI@s_eVwd3D)<^Ivq8a~J{|4mhOL^<7M4D8){ut;GIqqn`oqCk|x
pNh;Wa$C0(mdpqYz&F>xK-uVD=DT5%Jzh8ZT#aXmjr70%*{{RacS`YvL

diff --git a/3rdparty/timepicker/css/include/images/ui-icons_ffd27a_256x240.png b/3rdparty/timepicker/css/include/images/ui-icons_ffd27a_256x240.png
deleted file mode 100644
index e117effa3dca24e7978cfc5f8b967f661e81044f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
zcmd^?`8O2)_s3@pGmLE*`#M>&Z`mr_kcwz5Nh&g=McJ3E!;CE1E0ryV5Ro;>nvtvt
zk&I==Xd;cVGZ@>q_xtnx{1u<ad7XP-_m_Llz31NZdcG2EQRlg#Vo(48z-?(^ZVvze
z|6T#B?4ZAvXnA4xuUoRUb~w8~68XP#e)ZtVe+x$i*`qE2L|`Xa*=^e&W~<9M_#tnj
z#rVH+Aq<7gEG|f0JFaQ38mE(h>%7-D)N|5YqOB>i;(bZ#o62{J2Y9&^D3~R^$o+X?
zwbxAEIb)xwCwK3TSR4QVym6N1rVgPmmt0caryBUceHP_&u}{?^Jn7f0PT$#h>UDqI
zr!q(F&1jJ2_!jxdAB<)7H$foI*2zuncvu;;$SoU7br=AiJ@4=BC4vNO>DS`&UIB=K
z;2)0F*t^FBvVfPuT4FVMSwUw%Xksjyl+;#*DDy%=ocFOyzDLvLR(`zCSOuJ=?FWYn
z5ZD!UaoF>-$@=Vt?a&;UQYM$Oqe0ZB?Je?8ZnMxDe&uzzs*zlHd<n!{fcOy-3tIxc
zl9G6fU;?@>)V58nfJPc8S^({_4bj5HQ_B&EXHWj6wx@B;!mr04b_Mx)UFL)W7`V!c
zpMp#C!a!!sh3h491y}^qfimXVY%!+sYu0_D<P=jc<5*#|6V<{WZGN`6N7;T5@B&-O
z4YA;LJcgH_nB=Dd<6apIuYX_dSRS2~d9}u*0@tAvp3;xIUD`Q4{vSHeBHLl#uuj<i
zdw9AoFJd!YY?C9=-W}2;fmD2UGG|&~>WoJMqpN(FR9LM#jdZ{vJzEck`P^9(1N=4J
za9%u4$2J8TAkUaJk_FX%iHuv#svL_mMmp{SR}ifc#ZcXv%CFsT?*>N^6r(%D?1YnU
zAaT?UZGlOn<yU`%Wa8Y9e(6d%oe>a6UXXs0m)3YDp}d%hb@)@Y!lK_A&D6{OPlNnj
zYY*$b>vnRzL8=CDbQSi!DL3D!P^xhNtwrYByo?h-&OvQZYJ6ka{Re#<tfku}Pk%l>
zSc0ry_d(K$_Q2M{Y^O~DOK(szDOnMi_<pwV9HJlj%%pbJNR!N8!0s1p{Upoaj+ETU
zEK+aqL+qw7G}a0PL5uYtfQ*ORTM)>*h_Rx%eSRxA%n|FuC&=F=<MvvnBAs(r9_AGz
zj#LLeNR-pStzN#d`2)svUKrAQ8VHd^=b;OpBCx?RZykcH-tb9~qbL$x$(`2<NV~cc
z4z2Bp@;~m=w?YY3`1HQse<0qUrn@+UmFad91gTtZ)sci`wvk1%_;MW`&Pf|5tFMu4
zNntUAcOEu%z*Jn}7mF2zKzm-pAJ69V*u*k%Pz0Bw+@6D$nbX!5@F~#!m0D7y2@>)B
z_Qsgmj8g!GA+LZOX)<MTZnmtSZMvX}iN~6m-JIQU20KF6`U6rsN{iU<Dvr1WS@zOz
zl#6cg6=J4)x<q{k$6xz$eY~XokVD3xXlNVKpABoKf9r6^O!Mc-%+zqecrz!IBHZPk
zw7nJrmUK)1q@E9fg^)g`{6kCX`iq%f7Po|#WOo_zsuE*m)B)+26L-$_R)8Mt!h_+m
zGL~5ePlt^60=e?-MYRsRhyDgl@7ZuDwz@j@ON}1OXo&%9FFj79dYq9#Pl2J0tpZqW
zoj)^#YFt?xCl+r6r)bG%OxXxB9bzulRW7L4VwzZAtOD$$wddJsYuE;LaTM_#<QEkK
zsNj<*RBFpyHO6kU?fp7b`x$~mXQtCK-5&11GCPIZRRY80sMue?{vgSOolK=^)LZxH
zbARbRFuV0L_TDa&7c9o>gOW}vbo9|l8QW3iYw9qCD{o~xt^HIU>;dV5MJgc0#uHTA
z<b?9`^Kmpc&W4BD98zOjFt!MWuh}E+<l}|{o6oGTbC!N4qi(7vXIFMMOnVxMbfN)N
zpdB*NBc}R2H}q?~Wm%WHWyNB%7lB=rj|B!oI|os&8zNX2&PaO(73!SiCG6_-sewTO
z1Rz&hx(b1H;PyKr{Yfo2#_Tcnj2S{?^c(o11&+g0pg0yUvKa>80%Ee_r;G`GUjssm
z*AhtwpW%Ly;X4Lq1Zq#ZpuwzrZE$sR087dN{w7PA6|Mo#6wwJP085K+h7+D>NyeX#
zk|?M<oZ&;KrN<L<I(I=dD@q?cl4IbRF&ndOs<5uwMvg!{TBUD9u|OM4eU*}mSV}bg
z!o#6$7=VN)xc(puus6zwHZV0OG)?U7PkW#AIo)ydHqWFfKQd6ixr2X|O$wi7Elt~Q
zP6v<?64wgA8tUqVma<hW?e59%zK8rZ0VY6U?n&-05mXQLRLYvR*#iHFc$BXzkqlHo
z6W9SifpFjGSnRT&jat?h?$a!d5Qp<Z%K{vt*3t%>J^Es)JtP-2eNr0EQe*ZM`&}OU
zCD*uSSviE&p}uX|@1g_%|3*ra*MbBV#~cshdcFQ(dGLnTqaO-3{u==x1;Pp2im!#`
zuZ2`ThfAmiSzb|4h`c4?^ZoGOF*oXYcV}(ge!v@^bse?daA`Ma+bSZLIg;pIN17vM
zIOYfK=@s_Pj?~#lqnY2o?d1$MpoqsYQw%eX%X6Y4*^27{hMWGqILEMnVYUEMW#x7f
zu^I*nzXQ@6HJ8n;<zUNvk-PEjs%<X1ioU#5GW#HA=uaT__dpa}F)w`Yq8IsAdt`7U
z`+&f{UAvT9oH8a~#Q{IST?fK4Gn(zAyLXqIIB&|RDC4<MkG(eWs67GJyEog<1@R;p
zqErmjFbl*Kr=W@Fa@dm2f*UXY=6aA8pQ^kx6Gc!sOK_!BGj%_KX(L)0{_BN-RG>26
zo^1+Ewi$fN$Unum1(FTb8I#cYgcGklwIExt#Mb(D=x~OTeZ^ubJ)S-ywfdZS?SRCq
z<f6&jh?er}Ff4dKlh+}ZgDU^xdo^N4XGA|QMlZXk36y0_n94j(>Dm=eU<x+0r+(K0
z$`kDr6r$N?XyYa?y(T-y8=tEjFA9h_xYvk!0;klqRPh$f>+CCWO@8S_m!W{alT)zj
zZJbjxm5&No5xe_~Jw-i7`&G}=r)POGGfFq<O8y-6Cxq}O+jVOPKCRjoSodM^fgSV;
z21Z0|XI6eXR7bxMS=$0j;+W~BbU**AT6?!xT;2D^zN`dq>+c@kQbB#)ay`coj&C3-
z(#&xV@Q3@VJd{qdH4g@4ZJi&mx9e@Io7@~(o5vTrkW>QEO1T-gmlTRHH+3)gcUC0P
zk07rvDnf*7Y5J}8!>F_7D^Z3IoH^uGH}_a(ax{Q(IrvV$olf3WN&DY?<mf1{#tp*6
zbe~sSoVbr4l{;@hKd4VUJ-1s^jK>uYZfvXI(;Vv&EAoQtfH<X6@yy;uSMU*|aKXKd
zS5vU>;+4VI_a>yh*J+Cj!?h!QX?O`QXk@@G7AjloJe51Cw*rPXQ>#y?B^^ExRQFui
zolmv*C5K|-p){rZiCNai^0H`1(Qr(Hz3v%7NnmriXu2tD>xsbN#*R3*wsZhRj6Lvb
zn0Cu=qkC?*e4{NF_3=^bTb1f!g?@ryFH<mSX7J%FD4O3UZ%By_%;30DZJa-JG5in5
zFhfO$wOjOepP7?~dRphj@WU?;zCKz6eSAMUwAxT%JMIyEG7;|g_Q+7rq>6Zw2tz%A
zzz&o{w`dDv66!6Wk9w1-dglS#Sm{doxw&h5Z8&ONmlBBte{J)puaDzc!LC==rPRQK
zQNH23?-rIo^MQdt3Tk!B@8l#}fxVtrlc8Y<>ORaVE($DKc{77qV^`+`%_DotrUD=8
z4}L7QnZi3RgUy*tteY-=$SqA2@IZWe(}mI`nzhAT{qC)my#rJsfoS*<ZNRV2gRlj?
z)v1Cl_T+qH<V>)xCXj!Tk6=3)cr@Jw#OcNqgS3pg7x|4!A$|w15X!huR*vB3q9Ya4
zF{xuzEQz{9YPl(gk`}Gffut%jotgqp$jZvzRO4EsExf~93vY~04AxH=lR>R3v3Qs2
zy$v4SN%ee@Kz#kDtARaQD`d!R%}#@T1=v8DAow*r>+0d1KS{ZtA~KMtgm)+$JHumW
zw=;@qWk&MuG@LKx#K3@&WMw?r=jD2_)(*$LmkCm4_@};QZI|SPe8hIC6xqBy!LQyK
z01_xmfNA9UlBU@Kzu7;zQYxHE>OCADA$gwaVqm`eN?XQF@NkrocB}lU4hcCf>wqir
z>Ya=PcE!Xm#JG8v@G0lj&~)hScM}X57vGw3g<$^SUls53f|Bk>5FQwqE&{%u(f$!1
zl8+53vyYZ`mEEp&YT<=(krhKrw?~pS{N)?q{0qBR#2Y!w4!hWMdj`a(@A@r$zVB+u
z06Hb@_9(cQ_AxbXI|-2w>#QUhp7k<+`z9+(jkh~v-Renr#C9U+&jL4vg6-E$f7@UU
z(1fxB8{U2vq}h3rE!Z+n7=(>D&}@9~3mJ^R5}|WVG@!RSh3r{!>QHwg!t29YS&jiR
ztyn_q*k9H0efZ7hO*b(WR|G!TDY`rol~Ob4&1OwdM8kbGj`^$~L5gd<d7YB5YJW@H
z1El3`1FwJN#3DR;LU2X|A1e0W_1{a~3G@h&oQoFR4^R8yLsOhvm%`Xog{28ZResyx
zqB6ZHK&Wu;>WYceWwL=PB{~NX=cu3p-{S;hqaE?bSHv$g+SA6bxy+VU3YVTPDj6CN
zKLb_(9gM2Y#KW8ONxjH9To^Y)r?ql2cq8+WE438uIF$hjfdLs6-;!jv55jGcc3Ipg
z;}aT32NAEGeU;J}&j5=+u`4?%xlwL7?NDn%2={4WS39yn3f;&r=|}5=M-Y2yrxeSw
zv%*PmV{_{#Qk1sD>?M2KDapb~z3!E*-LPmCe9q86D%MGSe;4~~K-jKQxq6b^902_{
z%>4G>@Xqk8muR*|vGe5{@7sds<aRcI()+-dk>2i|i;g}oMkd!o^0=HG+vcPrcN54A
zLGv$PlTePRxp~-OSb_*aACO1qc{MpfS-fv(@UmRv%UO)cSt;ee@9(S)f>|~bwU@eZ
z=kTS*sdjLclwMZ<Jgx0E^k$qnMxHBa{0^(!mfiA)^ZEJ=-!!ZelcyN~EF8Mbb)i9e
z^>G#?%U3)bq-uj?@@vj~6tq)ZS||Jxz`+di-M5<Fie`muWl)A7tfzIyIhd%F5PQPh
zAxf8Mxy}evu=*ltf~ji)pFWl7J=6W8EwxIyv~~%3n}ob~`BbWRLfvBgNJYQsf8eXf
zb*A=3@G_1-qwA7#fS;_y%uEbp$>SXM=h3EL`?pB>W9A;`V2vM)vk&%KFy|TAh#AQA
zb_?<!HTqYNzP6jrw?H&O`OC+In}z5{pe1eS^Wk6)mYv;?7a6{vK#gr5`lD#T2VpIk
zLT|ynkZ?ny{+8hL6(4EaQ#%3OSMDDzt>J==3f@%LL{`vU$3Z@A2a9C3aC-YY43dR>
pI7J0n@;b3~`)ubvsr|iU(l;L{A#E6J`}eC4usn-0uQEf&{2ws1m(l<L

diff --git a/3rdparty/timepicker/css/include/images/ui-icons_ffffff_256x240.png b/3rdparty/timepicker/css/include/images/ui-icons_ffffff_256x240.png
deleted file mode 100644
index 42f8f992c727ddaa617da224a522e463df690387..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
zcmd^?`8O2)_s3^p#%>t<I$5%B*(%$RifAlJDl()+*_W)tj4atJl`V!4ku}Mhk*o=k
zjAh1XB8{;#7~8k^`}6($6`#j>oqJ#RmwV2==ic*rz7lOw=eaq=H~;_ux21)-Jpcgw
zdj+hrf&W^f<%Qk9Zpqf#;q3n5{{POY;f!wmTR1An9(4&I0z1LNX50QSTV2M%4|y9c
z#{ZQIVJKu~aY5?ZaZP*GIGqGs=e@q6o|EPhZB3CC?@LnORK8O@z{{<0KtSn5?#~OW
zy=L;x8T&*%xqElS;s5~Pjk7d2bqIaA<dW(>)xZbovnZd7eX17WNxx=w`p(8vulwUZ
zl{so}MuRNJx5!8S5G;$o2?BApPHt+)!^#*Ww`?rcVE}mcyuY`X2o|uVUyI9o1t11O
zemGWR?;aD#0$vJhiPhv~0iXS#iLq!>Qd<?G%nJo^-p4Na9!-~9`SCtu5pb5a9~>$`
zU{}<|Vb9Md>$4TMbL7C3GP#r;4Wc$}Z;^j;n}yc!E3d;<jpV}POQ7Zg#E;Ne*b?}a
zl*C&E6VP>`wry$!JkmJP0%(tIh!!TET8=<Gd-5-}J&kJ?em(xME6C65GA9%uz*QFf
z6kM7Y1~y|ZTrZI;z#@<ilrhg{i!qH~v+ffmr<i&f#|opJs22Wc^RvZ0%JzeR7uZT}
zs0FX%F}(c5BtI1x_sU>+{rhUi^60G0t2HJSxXv-*DgC(HrJd8`|Dp3NvL5yg>xAvU
zho|fEA~w^-HrW&H-JwkqNX2I-bEXBR&Uhp+y2^)1h1IIlNCzC!v-Mz@&z&VPz+cl1
z=f&f6Y*U~C`ixm4Sy1hl$hg(4%Dy;bq~k7d1<@K&%%NLT`L+A)-QXyKVswX?op90(
zB#yeFEih@c{OXU8Oq~1CFI_38GXmns3(`;W(i+bslovCx4u7gvK>DrGOug*?G|1nz
z_OR}|ZYS3pq-p?rS7G0qa`TM}r5XqDT4cV>%Qyk#9ES}`jc+Ww|DcbZrF6UG>CeXp
zOVIV}K1e#z9@tu#?X)Ri=?zXMB`X3G-_I7FL-Zq`nbfWtX_EO1*!+U6pJW-_k&+vk
zMd}THh}{(Ch_wPk(PI4vVB_KT76kGxVytLxpWg}&bHw`a3G#QzxV@ICNax&@hk3<_
zBh`Tq66G{-tCw$V{(y0v7l!tp20~@gdFX<t2yAf7TZbU4H+&N0D2hZ^a_6-I(yp$A
zLu-4Y{Ez$etx!T0KE1E^ABgv-=`PL?WxCx2K`NJ9btEB~b!5>jzFbF#bJE7i>T4ux
zQdrF3org^wFcnw$#bQMv@SfN3$Fuo7HnB_`2ZGB{ZqGr>%xP;2_!Q{=N-ZhU1c~^5
zdt=OO#wmcpkXJyCG?{{&n=R{Sn=Ytg;<09CH)l7TA&wkt{Q;>RrA2Ia6-QixEPLrU
z%0)N$3Nh0?U825&<F9?WK3>v($Sz}0G_(!v&xSSAzje4{rup+^W@^}ByqOb95$<wN
z+FlC*OS+|hQqPCLLP#G|{-Gsx{l!c#$SvU|*<FUbs>E0sbwK*%#GP}!6`%*Z@L;&C
z3^dE&>5%bWAXmP<sMdk^(BGixJsS?iR#(S<snG+CmKd<~(&IF$#~B&)6d2mrDuBh-
z`7=YP#+9XUV(~_Bik5uFl#L+MA?9LT<$`)GritanD!@)!d!CK9hHX$6M-ksae^D`j
z3O<QKrMApfW9&BT-mgQopCLGOW;!j??cokAvs0*DB`{2miv0!b50XsS$yAy~y>*X1
z_m}Pivs*u7@9i>qA!58fDCwj^M<1P(u^m;urVdlM@>aIf+E3-d9<VM%qyk!OJVCWh
zPAES=A4hZJY<Q^6E;Y6VV~t?=nmyu9K5i(m`ONw{XX$4$>ZW>fc4cS7w5O3sCmKKn
z+94A?VyfSBb9{}rEbCIYtXORJBCv__fnZ>?a}edaA%bP$jI?J^q0UKO!mduA8U!3b
z0CJ_Js}NWQZoebapVUHP%pPOUm?1<)zd<fq;MhF{ievF2n_&PhASNq*%9zmiH6XNj
zEs=Ea8SWPuzGGlUp!TE-8qB)a23IEsfKm?dH$i1qxCT5^L?@^KA}zidPI#gv8Gk-X
zqM+_@h7X;V9#72a+y&FDD1Goq_JL={tjxBl!n$f3IRf!$mA(-L;%G4SRZ1!Xm1z2f
zhjX-H01}>%`hzUM-Y6g1z|@@3G_kio?S0bcbjQuxJd>vU$Uyz(4*peEDSVc-G;O;%
z9Y97%Tq}TRsH+oN%2u(oyC=W<9`e@&m;i;jC%L;sP(9RBDQnth3;ZMEQNFH3GEf0c
zU<3RF!hNG-vCDooYFS^nPlFnv4(ElI1=vNcr42TF^u<zpNG@plq%<5<WA+sLT^{=-
z*SKa`IfTWbzHQm>q67f{MoN>{f&>xA91r4pz5Zc&@P^i-9||`98v$Si!U@}ouZ88W
zg;YL=OQ;4}UQtkpyd~lD{qWy0H|lwJXKmenz#E=*9kt$YX*X!wDk7ITlIUGWnj>a7
z<_GQR752@J)Y(U)ncu(d<qS5Uh{rKg3^Vr2bD|>Iit7P}oBq8x$FP85)&Nsw<#rOW
z8U_x(1J)Zgm(8tZXU%+(yYcO+Z7#ZszPwa2`ygiMPayX9KondtFMRK!7x`9uWN;(f
zfWW?8yOdj;GA3We0YAW92gWipn(d>zcbA+vZ_21B<GE0ey*BZvJpq=xH`~tz@gx|c
zR1DNG3&a$spo!;l*pkkI8!!LndXN^Ms=PE4MNl|PaHUi;bw5F9BU%~$>xF?-pfcW`
zbqY<k8GOpfKgG8NmJQVzlhFBu6R$nBAX~7++WL0raE6k7#bPQwo<1VA`kZ;~fW)ih
zqRHEcmh$T`EO<YY*CCdJD*xhpHDX3*L_aS^FT1A+oMlXy$~;c#+7(V<3O2N-e%AuZ
z6YUffqFHBX<0db?COgL)pQ{`%3Wzwk*NA!or_{An@fOVM>??6ie(6M)p@6@WQ?Tl7
zoKrKEj|x~2yZehhMLkFRRnOC>XL&L+N;m0B{_OQ9gzzTYb!!Jct=bk?_hIpY9rOwY
zMnr69R(?8EN52qR+k!~qnCYc-KmV&*d$&NY?t5cjR)V+ncMor=puTRoo?{5dH;@!*
z<~RrV!+ljAN+;Qx2LraY&JWnz^|sYbZjP+Y;|pC#DuHUH+>F~x3PqTkx)=OAE0X9(
z(AO6gp~AH^{nq+n)LHYDD8mQN?DDFcd!U&d4PaajzSD1~lXq3p{x=^vItrq3gD^4O
z=hYS`?&C-0&KuAV>Jv}T?ba0IafL$~+bZ}p$9lwyyx=-uPN`Hpvv<)Ia>OWHa4+N4
z6zscrW$^XA32E<j+Ty}+?MPo5Uc!qbGT;`7%Gx?l<xc9YfT7LQ>Jw^7hYtkRJr{Q8
zQ|*1pp_q6Mno|D6EX!kgSv0h0I3~ef_l%$<u(@0`-IS&EL||}ZN1R(*I)Ea^7I-yG
zyXCjhJ-1uF(Uyz)_^9=*N_DY9KS79>DTFjL`0y16n%^dGNQn;2V82mqoIi9i{15vu
zLq&(BTl9CInUjZlTIa>^!!HlMK3W8Sd_Ow0+E8IT?h$=55$^Z)$WYIuig=O;Lp_1Q
z4wOT;XbWQ!>Mh`pdXuSo=K<ST=}P*!xodlEIBHy%5{U$VZS$wEkNsG|u2<Kk)WCyL
zzTvy?7M8&Cfq_5@YIV!+<Rn^wt)5qtp<xK_KFldD3M^WAGlN-UQ|ANEBYVoG0w3xR
zek`?_!aFWQ%$ZEAn=XFHElm{gKzw@Bh0-LNwZ&Zh?yZ%*15_b_Y4{Osz^~4Oum!!<
zse&!G<a}e~Ot7vdkbjYnU^^LjG~ETn>Bba;wT!wK`Hf1Ueh04*%D7Kfj*#b~BNfvz
zsbf?uiMm5-xhaQ|7Om2OrYbU>ngUM9%F5nU<65IFyu(`yZ;Vb1)=wCd!L2K?c$ezE
z4IbS|^?Z>)eEp}ZfjwF)Waw?pPJ?{~*g%;e<TX6&>fxO~Nx7dQGLWZ)cPQ*T!((W-
zGm2?tM)K}7oG<0Xz<`ltWjxvE<$AH!4*R{A2~uYGr@m!vm*j+e#CE9^*}Oc#uihB|
z5;#kMY2^8mrr80%*+02bDx6B{Jsch(d7kQGV7~iGTgFZBu$Pf`tNf`B2{|t7fGhIq
zos0xF#l$bfxOtcGDd*MDbdKBaCKxg<zBS_t!TiI&D&FS>CEbr8JTNd_1bjWC{Ubgk
z9~)9;A1&=FyIt$l!VBXfD~6VCk0fjO%QwLJ7k00RH*%I8cCqF542VzP^;`OU-_?=<
zbV}OoQE)HqV`|)X5+WbgSxGWH>t+7-O;(l~Z+FJJ)sygu^+eF01#Suj+pnAcw!s>p
z$-xF}c>7t9X6H$^V9hvT5H{jKv+=zzWHA0pgw8e5fZpm9vIphVq3%S4*N3%&jsY^Q
zK%sSPuj=?d{ATs0o0y6#0w3%YT^@-_sTuTUwI(Q{;l3KjeAbVk#Wmi%PDxm`zoqQ~
z((<-}*FSP%5gt7uI3t1&75ne{@1^bpdW1;MMGNkSr~UAuDbB4+VQi|x(gdO^zin_)
zncfs2hj8xdiiy)@vVkfkItLKvsGtJh<Ah+N9r4Fk#4j}3)5fp4%$8OPm!2*v85$2i
z15p4UjH=DV!<+L-y~sIS7&k+wwQ@3eBlD0ewG{0*l>rTb0T~tFl4Q3J!flauS==b&
z6B<Vc5wD$nmC_i`0E<AeD?2H<QEoWxP-{X6_i15QJF-Cv-N-NLN9%$|5L;=d6lmF5
z;UuK7x%Cq%N?T&~lD+MeWZ|S<_sZ68ShNa0XXqal>m<Ivi+wgAY*(pVJxOj3;P^Mp
z{Py4Q&hV_4XtqYN^W_`w+k)rhb~b?0`@olx-tL`?jy^9&Cf7sqxSSo^=A<Kc6UYof
z^DkeMP>!g%dDvlCf(St$kVofvH90|9yl-gmvRvcKS&Ye9DdoTK@2m}iSvC{3m%4E0
z@TJD7c1V?!URM7+t?f3)%{X(6JXg~A9TvGQyX6n(^Yt0NX;>vDPcr~mICPooLWA_`
z<1A>FuXr|C)dtDr*PQt%Xs5WePWUB&gBj$zZ#BIY%?jDdpbSA-PV0`dGf^oa_Jp}Z
zlrGV7oe`#B^+nPIQ`ZDJeJas=ru#=*YL#+n?Go}f33>1GsZ{TTy2bdBihj}mz*mp!
zOzn%{WgLM=*CpiuKUs*GnHa{B$2siJqfNi|Z;|rH%stM*8b26kAMCYY&NHwPGtlYn
z7UVx_^sgR$Z8x27foS63FCP<b7NQ@4m$W&a4+pb@c6L8rWcYppH@1D~kD>t|gtcG_
zy#@C|!VQV~TY}G5e57qp?F4jRxqq~@h6^?-cvD>ySwVLl2m7=gERtEn>Fw_@ND%pO
oiVC*mbz<%I+0K1Z`+LWvZ$3~$+A!Gm?^hpSc@||}WrmLVKLvuzv;Y7A

diff --git a/3rdparty/timepicker/css/include/jquery-1.5.1.min.js b/3rdparty/timepicker/css/include/jquery-1.5.1.min.js
deleted file mode 100644
index 6437874c699..00000000000
--- a/3rdparty/timepicker/css/include/jquery-1.5.1.min.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.5.1
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Wed Feb 23 13:55:29 2011 -0500
- */
-(function(a,b){function cg(a){return d.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cd(a){if(!bZ[a]){var b=d("<"+a+">").appendTo("body"),c=b.css("display");b.remove();if(c==="none"||c==="")c="block";bZ[a]=c}return bZ[a]}function cc(a,b){var c={};d.each(cb.concat.apply([],cb.slice(0,b)),function(){c[this]=a});return c}function bY(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function bX(){try{return new a.XMLHttpRequest}catch(b){}}function bW(){d(a).unload(function(){for(var a in bU)bU[a](0,1)})}function bQ(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var e=a.dataTypes,f={},g,h,i=e.length,j,k=e[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h==="string"&&(f[h.toLowerCase()]=a.converters[h]);l=k,k=e[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=f[m]||f["* "+k];if(!n){p=b;for(o in f){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=f[j[1]+" "+k];if(p){o=f[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&d.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bP(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bO(a,b,c,e){if(d.isArray(b)&&b.length)d.each(b,function(b,f){c||bq.test(a)?e(a,f):bO(a+"["+(typeof f==="object"||d.isArray(f)?b:"")+"]",f,c,e)});else if(c||b==null||typeof b!=="object")e(a,b);else if(d.isArray(b)||d.isEmptyObject(b))e(a,"");else for(var f in b)bO(a+"["+f+"]",b[f],c,e)}function bN(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bH,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l==="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bN(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bN(a,c,d,e,"*",g));return l}function bM(a){return function(b,c){typeof b!=="string"&&(c=b,b="*");if(d.isFunction(c)){var e=b.toLowerCase().split(bB),f=0,g=e.length,h,i,j;for(;f<g;f++)h=e[f],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bo(a,b,c){var e=b==="width"?bi:bj,f=b==="width"?a.offsetWidth:a.offsetHeight;if(c==="border")return f;d.each(e,function(){c||(f-=parseFloat(d.css(a,"padding"+this))||0),c==="margin"?f+=parseFloat(d.css(a,"margin"+this))||0:f-=parseFloat(d.css(a,"border"+this+"Width"))||0});return f}function ba(a,b){b.src?d.ajax({url:b.src,async:!1,dataType:"script"}):d.globalEval(b.text||b.textContent||b.innerHTML||""),b.parentNode&&b.parentNode.removeChild(b)}function _(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function $(a,b){if(b.nodeType===1){var c=b.nodeName.toLowerCase();b.clearAttributes(),b.mergeAttributes(a);if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(d.expando)}}function Z(a,b){if(b.nodeType===1&&d.hasData(a)){var c=d.expando,e=d.data(a),f=d.data(b,e);if(e=e[c]){var g=e.events;f=f[c]=d.extend({},e);if(g){delete f.handle,f.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)d.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function Y(a,b){return d.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function O(a,b,c){if(d.isFunction(b))return d.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return d.grep(a,function(a,d){return a===b===c});if(typeof b==="string"){var e=d.grep(a,function(a){return a.nodeType===1});if(J.test(b))return d.filter(b,e,!c);b=d.filter(b,e)}return d.grep(a,function(a,e){return d.inArray(a,b)>=0===c})}function N(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function F(a,b){return(a&&a!=="*"?a+".":"")+b.replace(r,"`").replace(s,"&")}function E(a){var b,c,e,f,g,h,i,j,k,l,m,n,o,q=[],r=[],s=d._data(this,"events");if(a.liveFired!==this&&s&&s.live&&!a.target.disabled&&(!a.button||a.type!=="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var t=s.live.slice(0);for(i=0;i<t.length;i++)g=t[i],g.origType.replace(p,"")===a.type?r.push(g.selector):t.splice(i--,1);f=d(a.target).closest(r,a.currentTarget);for(j=0,k=f.length;j<k;j++){m=f[j];for(i=0;i<t.length;i++){g=t[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,e=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,e=d(a.relatedTarget).closest(g.selector)[0];(!e||e!==h)&&q.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=q.length;j<k;j++){f=q[j];if(c&&f.level>c)break;a.currentTarget=f.elem,a.data=f.handleObj.data,a.handleObj=f.handleObj,o=f.handleObj.origHandler.apply(f.elem,arguments);if(o===!1||a.isPropagationStopped()){c=f.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function C(a,c,e){var f=d.extend({},e[0]);f.type=a,f.originalEvent={},f.liveFired=b,d.event.handle.call(c,f),f.isDefaultPrevented()&&e[0].preventDefault()}function w(){return!0}function v(){return!1}function g(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function f(a,c,f){if(f===b&&a.nodeType===1){f=a.getAttribute("data-"+c);if(typeof f==="string"){try{f=f==="true"?!0:f==="false"?!1:f==="null"?null:d.isNaN(f)?e.test(f)?d.parseJSON(f):f:parseFloat(f)}catch(g){}d.data(a,c,f)}else f=b}return f}var c=a.document,d=function(){function I(){if(!d.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(I,1);return}d.ready()}}var d=function(a,b){return new d.fn.init(a,b,g)},e=a.jQuery,f=a.$,g,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,i=/\S/,j=/^\s+/,k=/\s+$/,l=/\d/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=navigator.userAgent,w,x=!1,y,z="then done fail isResolved isRejected promise".split(" "),A,B=Object.prototype.toString,C=Object.prototype.hasOwnProperty,D=Array.prototype.push,E=Array.prototype.slice,F=String.prototype.trim,G=Array.prototype.indexOf,H={};d.fn=d.prototype={constructor:d,init:function(a,e,f){var g,i,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!e&&c.body){this.context=c,this[0]=c.body,this.selector="body",this.length=1;return this}if(typeof a==="string"){g=h.exec(a);if(!g||!g[1]&&e)return!e||e.jquery?(e||f).find(a):this.constructor(e).find(a);if(g[1]){e=e instanceof d?e[0]:e,k=e?e.ownerDocument||e:c,j=m.exec(a),j?d.isPlainObject(e)?(a=[c.createElement(j[1])],d.fn.attr.call(a,e,!0)):a=[k.createElement(j[1])]:(j=d.buildFragment([g[1]],[k]),a=(j.cacheable?d.clone(j.fragment):j.fragment).childNodes);return d.merge(this,a)}i=c.getElementById(g[2]);if(i&&i.parentNode){if(i.id!==g[2])return f.find(a);this.length=1,this[0]=i}this.context=c,this.selector=a;return this}if(d.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return d.makeArray(a,this)},selector:"",jquery:"1.5.1",length:0,size:function(){return this.length},toArray:function(){return E.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var e=this.constructor();d.isArray(a)?D.apply(e,a):d.merge(e,a),e.prevObject=this,e.context=this.context,b==="find"?e.selector=this.selector+(this.selector?" ":"")+c:b&&(e.selector=this.selector+"."+b+"("+c+")");return e},each:function(a,b){return d.each(this,a,b)},ready:function(a){d.bindReady(),y.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(E.apply(this,arguments),"slice",E.call(arguments).join(","))},map:function(a){return this.pushStack(d.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:D,sort:[].sort,splice:[].splice},d.fn.init.prototype=d.fn,d.extend=d.fn.extend=function(){var a,c,e,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i==="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!=="object"&&!d.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){e=i[c],f=a[c];if(i===f)continue;l&&f&&(d.isPlainObject(f)||(g=d.isArray(f)))?(g?(g=!1,h=e&&d.isArray(e)?e:[]):h=e&&d.isPlainObject(e)?e:{},i[c]=d.extend(l,h,f)):f!==b&&(i[c]=f)}return i},d.extend({noConflict:function(b){a.$=f,b&&(a.jQuery=e);return d},isReady:!1,readyWait:1,ready:function(a){a===!0&&d.readyWait--;if(!d.readyWait||a!==!0&&!d.isReady){if(!c.body)return setTimeout(d.ready,1);d.isReady=!0;if(a!==!0&&--d.readyWait>0)return;y.resolveWith(c,[d]),d.fn.trigger&&d(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!x){x=!0;if(c.readyState==="complete")return setTimeout(d.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",A,!1),a.addEventListener("load",d.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",A),a.attachEvent("onload",d.ready);var b=!1;try{b=a.frameElement==null}catch(e){}c.documentElement.doScroll&&b&&I()}}},isFunction:function(a){return d.type(a)==="function"},isArray:Array.isArray||function(a){return d.type(a)==="array"},isWindow:function(a){return a&&typeof a==="object"&&"setInterval"in a},isNaN:function(a){return a==null||!l.test(a)||isNaN(a)},type:function(a){return a==null?String(a):H[B.call(a)]||"object"},isPlainObject:function(a){if(!a||d.type(a)!=="object"||a.nodeType||d.isWindow(a))return!1;if(a.constructor&&!C.call(a,"constructor")&&!C.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a){}return c===b||C.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!=="string"||!b)return null;b=d.trim(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return a.JSON&&a.JSON.parse?a.JSON.parse(b):(new Function("return "+b))();d.error("Invalid JSON: "+b)},parseXML:function(b,c,e){a.DOMParser?(e=new DOMParser,c=e.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),e=c.documentElement,(!e||!e.nodeName||e.nodeName==="parsererror")&&d.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(a){if(a&&i.test(a)){var b=c.head||c.getElementsByTagName("head")[0]||c.documentElement,e=c.createElement("script");d.support.scriptEval()?e.appendChild(c.createTextNode(a)):e.text=a,b.insertBefore(e,b.firstChild),b.removeChild(e)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,e){var f,g=0,h=a.length,i=h===b||d.isFunction(a);if(e){if(i){for(f in a)if(c.apply(a[f],e)===!1)break}else for(;g<h;)if(c.apply(a[g++],e)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(var j=a[0];g<h&&c.call(j,g,j)!==!1;j=a[++g]){}return a},trim:F?function(a){return a==null?"":F.call(a)}:function(a){return a==null?"":(a+"").replace(j,"").replace(k,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var e=d.type(a);a.length==null||e==="string"||e==="function"||e==="regexp"||d.isWindow(a)?D.call(c,a):d.merge(c,a)}return c},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length==="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,b,c){var d=[],e;for(var f=0,g=a.length;f<g;f++)e=b(a[f],f,c),e!=null&&(d[d.length]=e);return d.concat.apply([],d)},guid:1,proxy:function(a,c,e){arguments.length===2&&(typeof c==="string"?(e=a,a=e[c],c=b):c&&!d.isFunction(c)&&(e=c,c=b)),!c&&a&&(c=function(){return a.apply(e||this,arguments)}),a&&(c.guid=a.guid=a.guid||c.guid||d.guid++);return c},access:function(a,c,e,f,g,h){var i=a.length;if(typeof c==="object"){for(var j in c)d.access(a,j,c[j],f,g,e);return a}if(e!==b){f=!h&&f&&d.isFunction(e);for(var k=0;k<i;k++)g(a[k],c,f?e.call(a[k],k,g(a[k],c)):e,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},_Deferred:function(){var a=[],b,c,e,f={done:function(){if(!e){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=d.type(i),j==="array"?f.done.apply(f,i):j==="function"&&a.push(i);k&&f.resolveWith(k[0],k[1])}return this},resolveWith:function(d,f){if(!e&&!b&&!c){c=1;try{while(a[0])a.shift().apply(d,f)}catch(g){throw g}finally{b=[d,f],c=0}}return this},resolve:function(){f.resolveWith(d.isFunction(this.promise)?this.promise():this,arguments);return this},isResolved:function(){return c||b},cancel:function(){e=1,a=[];return this}};return f},Deferred:function(a){var b=d._Deferred(),c=d._Deferred(),e;d.extend(b,{then:function(a,c){b.done(a).fail(c);return this},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,promise:function(a){if(a==null){if(e)return e;e=a={}}var c=z.length;while(c--)a[z[c]]=b[z[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){var b=arguments.length,c=b<=1&&a&&d.isFunction(a.promise)?a:d.Deferred(),e=c.promise();if(b>1){var f=E.call(arguments,0),g=b,h=function(a){return function(b){f[a]=arguments.length>1?E.call(arguments,0):b,--g||c.resolveWith(e,f)}};while(b--)a=f[b],a&&d.isFunction(a.promise)?a.promise().then(h(b),c.reject):--g;g||c.resolveWith(e,f)}else c!==a&&c.resolve(a);return e},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}d.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.subclass=this.subclass,a.fn.init=function b(b,c){c&&c instanceof d&&!(c instanceof a)&&(c=a(c));return d.fn.init.call(this,b,c,e)},a.fn.init.prototype=a.fn;var e=a(c);return a},browser:{}}),y=d._Deferred(),d.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){H["[object "+b+"]"]=b.toLowerCase()}),w=d.uaMatch(v),w.browser&&(d.browser[w.browser]=!0,d.browser.version=w.version),d.browser.webkit&&(d.browser.safari=!0),G&&(d.inArray=function(a,b){return G.call(b,a)}),i.test(" ")&&(j=/^[\s\xA0]+/,k=/[\s\xA0]+$/),g=d(c),c.addEventListener?A=function(){c.removeEventListener("DOMContentLoaded",A,!1),d.ready()}:c.attachEvent&&(A=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",A),d.ready())});return d}();(function(){d.support={};var b=c.createElement("div");b.style.display="none",b.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var e=b.getElementsByTagName("*"),f=b.getElementsByTagName("a")[0],g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=b.getElementsByTagName("input")[0];if(e&&e.length&&f){d.support={leadingWhitespace:b.firstChild.nodeType===3,tbody:!b.getElementsByTagName("tbody").length,htmlSerialize:!!b.getElementsByTagName("link").length,style:/red/.test(f.getAttribute("style")),hrefNormalized:f.getAttribute("href")==="/a",opacity:/^0.55$/.test(f.style.opacity),cssFloat:!!f.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,deleteExpando:!0,optDisabled:!1,checkClone:!1,noCloneEvent:!0,noCloneChecked:!0,boxModel:null,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableHiddenOffsets:!0},i.checked=!0,d.support.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,d.support.optDisabled=!h.disabled;var j=null;d.support.scriptEval=function(){if(j===null){var b=c.documentElement,e=c.createElement("script"),f="script"+d.now();try{e.appendChild(c.createTextNode("window."+f+"=1;"))}catch(g){}b.insertBefore(e,b.firstChild),a[f]?(j=!0,delete a[f]):j=!1,b.removeChild(e),b=e=f=null}return j};try{delete b.test}catch(k){d.support.deleteExpando=!1}!b.addEventListener&&b.attachEvent&&b.fireEvent&&(b.attachEvent("onclick",function l(){d.support.noCloneEvent=!1,b.detachEvent("onclick",l)}),b.cloneNode(!0).fireEvent("onclick")),b=c.createElement("div"),b.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";var m=c.createDocumentFragment();m.appendChild(b.firstChild),d.support.checkClone=m.cloneNode(!0).cloneNode(!0).lastChild.checked,d(function(){var a=c.createElement("div"),b=c.getElementsByTagName("body")[0];if(b){a.style.width=a.style.paddingLeft="1px",b.appendChild(a),d.boxModel=d.support.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,d.support.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",d.support.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";var e=a.getElementsByTagName("td");d.support.reliableHiddenOffsets=e[0].offsetHeight===0,e[0].style.display="",e[1].style.display="none",d.support.reliableHiddenOffsets=d.support.reliableHiddenOffsets&&e[0].offsetHeight===0,a.innerHTML="",b.removeChild(a).style.display="none",a=e=null}});var n=function(a){var b=c.createElement("div");a="on"+a;if(!b.attachEvent)return!0;var d=a in b;d||(b.setAttribute(a,"return;"),d=typeof b[a]==="function"),b=null;return d};d.support.submitBubbles=n("submit"),d.support.changeBubbles=n("change"),b=e=f=null}})();var e=/^(?:\{.*\}|\[.*\])$/;d.extend({cache:{},uuid:0,expando:"jQuery"+(d.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?d.cache[a[d.expando]]:a[d.expando];return!!a&&!g(a)},data:function(a,c,e,f){if(d.acceptData(a)){var g=d.expando,h=typeof c==="string",i,j=a.nodeType,k=j?d.cache:a,l=j?a[d.expando]:a[d.expando]&&d.expando;if((!l||f&&l&&!k[l][g])&&h&&e===b)return;l||(j?a[d.expando]=l=++d.uuid:l=d.expando),k[l]||(k[l]={},j||(k[l].toJSON=d.noop));if(typeof c==="object"||typeof c==="function")f?k[l][g]=d.extend(k[l][g],c):k[l]=d.extend(k[l],c);i=k[l],f&&(i[g]||(i[g]={}),i=i[g]),e!==b&&(i[c]=e);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[c]:i}},removeData:function(b,c,e){if(d.acceptData(b)){var f=d.expando,h=b.nodeType,i=h?d.cache:b,j=h?b[d.expando]:d.expando;if(!i[j])return;if(c){var k=e?i[j][f]:i[j];if(k){delete k[c];if(!g(k))return}}if(e){delete i[j][f];if(!g(i[j]))return}var l=i[j][f];d.support.deleteExpando||i!=a?delete i[j]:i[j]=null,l?(i[j]={},h||(i[j].toJSON=d.noop),i[j][f]=l):h&&(d.support.deleteExpando?delete b[d.expando]:b.removeAttribute?b.removeAttribute(d.expando):b[d.expando]=null)}},_data:function(a,b,c){return d.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=d.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),d.fn.extend({data:function(a,c){var e=null;if(typeof a==="undefined"){if(this.length){e=d.data(this[0]);if(this[0].nodeType===1){var g=this[0].attributes,h;for(var i=0,j=g.length;i<j;i++)h=g[i].name,h.indexOf("data-")===0&&(h=h.substr(5),f(this[0],h,e[h]))}}return e}if(typeof a==="object")return this.each(function(){d.data(this,a)});var k=a.split(".");k[1]=k[1]?"."+k[1]:"";if(c===b){e=this.triggerHandler("getData"+k[1]+"!",[k[0]]),e===b&&this.length&&(e=d.data(this[0],a),e=f(this[0],a,e));return e===b&&k[1]?this.data(k[0]):e}return this.each(function(){var b=d(this),e=[k[0],c];b.triggerHandler("setData"+k[1]+"!",e),d.data(this,a,c),b.triggerHandler("changeData"+k[1]+"!",e)})},removeData:function(a){return this.each(function(){d.removeData(this,a)})}}),d.extend({queue:function(a,b,c){if(a){b=(b||"fx")+"queue";var e=d._data(a,b);if(!c)return e||[];!e||d.isArray(c)?e=d._data(a,b,d.makeArray(c)):e.push(c);return e}},dequeue:function(a,b){b=b||"fx";var c=d.queue(a,b),e=c.shift();e==="inprogress"&&(e=c.shift()),e&&(b==="fx"&&c.unshift("inprogress"),e.call(a,function(){d.dequeue(a,b)})),c.length||d.removeData(a,b+"queue",!0)}}),d.fn.extend({queue:function(a,c){typeof a!=="string"&&(c=a,a="fx");if(c===b)return d.queue(this[0],a);return this.each(function(b){var e=d.queue(this,a,c);a==="fx"&&e[0]!=="inprogress"&&d.dequeue(this,a)})},dequeue:function(a){return this.each(function(){d.dequeue(this,a)})},delay:function(a,b){a=d.fx?d.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){d.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var h=/[\n\t\r]/g,i=/\s+/,j=/\r/g,k=/^(?:href|src|style)$/,l=/^(?:button|input)$/i,m=/^(?:button|input|object|select|textarea)$/i,n=/^a(?:rea)?$/i,o=/^(?:radio|checkbox)$/i;d.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"},d.fn.extend({attr:function(a,b){return d.access(this,a,b,!0,d.attr)},removeAttr:function(a,b){return this.each(function(){d.attr(this,a,""),this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.addClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"){var b=(a||"").split(i);for(var c=0,e=this.length;c<e;c++){var f=this[c];if(f.nodeType===1)if(f.className){var g=" "+f.className+" ",h=f.className;for(var j=0,k=b.length;j<k;j++)g.indexOf(" "+b[j]+" ")<0&&(h+=" "+b[j]);f.className=d.trim(h)}else f.className=a}}return this},removeClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.removeClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"||a===b){var c=(a||"").split(i);for(var e=0,f=this.length;e<f;e++){var g=this[e];if(g.nodeType===1&&g.className)if(a){var j=(" "+g.className+" ").replace(h," ");for(var k=0,l=c.length;k<l;k++)j=j.replace(" "+c[k]+" "," ");g.className=d.trim(j)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,e=typeof b==="boolean";if(d.isFunction(a))return this.each(function(c){var e=d(this);e.toggleClass(a.call(this,c,e.attr("class"),b),b)});return this.each(function(){if(c==="string"){var f,g=0,h=d(this),j=b,k=a.split(i);while(f=k[g++])j=e?j:!h.hasClass(f),h[j?"addClass":"removeClass"](f)}else if(c==="undefined"||c==="boolean")this.className&&d._data(this,"__className__",this.className),this.className=this.className||a===!1?"":d._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(h," ").indexOf(b)>-1)return!0;return!1},val:function(a){if(!arguments.length){var c=this[0];if(c){if(d.nodeName(c,"option")){var e=c.attributes.value;return!e||e.specified?c.value:c.text}if(d.nodeName(c,"select")){var f=c.selectedIndex,g=[],h=c.options,i=c.type==="select-one";if(f<0)return null;for(var k=i?f:0,l=i?f+1:h.length;k<l;k++){var m=h[k];if(m.selected&&(d.support.optDisabled?!m.disabled:m.getAttribute("disabled")===null)&&(!m.parentNode.disabled||!d.nodeName(m.parentNode,"optgroup"))){a=d(m).val();if(i)return a;g.push(a)}}if(i&&!g.length&&h.length)return d(h[f]).val();return g}if(o.test(c.type)&&!d.support.checkOn)return c.getAttribute("value")===null?"on":c.value;return(c.value||"").replace(j,"")}return b}var n=d.isFunction(a);return this.each(function(b){var c=d(this),e=a;if(this.nodeType===1){n&&(e=a.call(this,b,c.val())),e==null?e="":typeof e==="number"?e+="":d.isArray(e)&&(e=d.map(e,function(a){return a==null?"":a+""}));if(d.isArray(e)&&o.test(this.type))this.checked=d.inArray(c.val(),e)>=0;else if(d.nodeName(this,"select")){var f=d.makeArray(e);d("option",this).each(function(){this.selected=d.inArray(d(this).val(),f)>=0}),f.length||(this.selectedIndex=-1)}else this.value=e}})}}),d.extend({attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,e,f){if(!a||a.nodeType===3||a.nodeType===8||a.nodeType===2)return b;if(f&&c in d.attrFn)return d(a)[c](e);var g=a.nodeType!==1||!d.isXMLDoc(a),h=e!==b;c=g&&d.props[c]||c;if(a.nodeType===1){var i=k.test(c);if(c==="selected"&&!d.support.optSelected){var j=a.parentNode;j&&(j.selectedIndex,j.parentNode&&j.parentNode.selectedIndex)}if((c in a||a[c]!==b)&&g&&!i){h&&(c==="type"&&l.test(a.nodeName)&&a.parentNode&&d.error("type property can't be changed"),e===null?a.nodeType===1&&a.removeAttribute(c):a[c]=e);if(d.nodeName(a,"form")&&a.getAttributeNode(c))return a.getAttributeNode(c).nodeValue;if(c==="tabIndex"){var o=a.getAttributeNode("tabIndex");return o&&o.specified?o.value:m.test(a.nodeName)||n.test(a.nodeName)&&a.href?0:b}return a[c]}if(!d.support.style&&g&&c==="style"){h&&(a.style.cssText=""+e);return a.style.cssText}h&&a.setAttribute(c,""+e);if(!a.attributes[c]&&(a.hasAttribute&&!a.hasAttribute(c)))return b;var p=!d.support.hrefNormalized&&g&&i?a.getAttribute(c,2):a.getAttribute(c);return p===null?b:p}h&&(a[c]=e);return a[c]}});var p=/\.(.*)$/,q=/^(?:textarea|input|select)$/i,r=/\./g,s=/ /g,t=/[^\w\s.|`]/g,u=function(a){return a.replace(t,"\\$&")};d.event={add:function(c,e,f,g){if(c.nodeType!==3&&c.nodeType!==8){try{d.isWindow(c)&&(c!==a&&!c.frameElement)&&(c=a)}catch(h){}if(f===!1)f=v;else if(!f)return;var i,j;f.handler&&(i=f,f=i.handler),f.guid||(f.guid=d.guid++);var k=d._data(c);if(!k)return;var l=k.events,m=k.handle;l||(k.events=l={}),m||(k.handle=m=function(){return typeof d!=="undefined"&&!d.event.triggered?d.event.handle.apply(m.elem,arguments):b}),m.elem=c,e=e.split(" ");var n,o=0,p;while(n=e[o++]){j=i?d.extend({},i):{handler:f,data:g},n.indexOf(".")>-1?(p=n.split("."),n=p.shift(),j.namespace=p.slice(0).sort().join(".")):(p=[],j.namespace=""),j.type=n,j.guid||(j.guid=f.guid);var q=l[n],r=d.event.special[n]||{};if(!q){q=l[n]=[];if(!r.setup||r.setup.call(c,g,p,m)===!1)c.addEventListener?c.addEventListener(n,m,!1):c.attachEvent&&c.attachEvent("on"+n,m)}r.add&&(r.add.call(c,j),j.handler.guid||(j.handler.guid=f.guid)),q.push(j),d.event.global[n]=!0}c=null}},global:{},remove:function(a,c,e,f){if(a.nodeType!==3&&a.nodeType!==8){e===!1&&(e=v);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=d.hasData(a)&&d._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(e=c.handler,c=c.type);if(!c||typeof c==="string"&&c.charAt(0)==="."){c=c||"";for(h in t)d.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+d.map(m.slice(0).sort(),u).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!e){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))d.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=d.event.special[h]||{};for(j=f||0;j<p.length;j++){q=p[j];if(e.guid===q.guid){if(l||n.test(q.namespace))f==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(f!=null)break}}if(p.length===0||f!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&d.removeEvent(a,h,s.handle),g=null,delete t[h]}if(d.isEmptyObject(t)){var w=s.handle;w&&(w.elem=null),delete s.events,delete s.handle,d.isEmptyObject(s)&&d.removeData(a,b,!0)}}},trigger:function(a,c,e){var f=a.type||a,g=arguments[3];if(!g){a=typeof a==="object"?a[d.expando]?a:d.extend(d.Event(f),a):d.Event(f),f.indexOf("!")>=0&&(a.type=f=f.slice(0,-1),a.exclusive=!0),e||(a.stopPropagation(),d.event.global[f]&&d.each(d.cache,function(){var b=d.expando,e=this[b];e&&e.events&&e.events[f]&&d.event.trigger(a,c,e.handle.elem)}));if(!e||e.nodeType===3||e.nodeType===8)return b;a.result=b,a.target=e,c=d.makeArray(c),c.unshift(a)}a.currentTarget=e;var h=d._data(e,"handle");h&&h.apply(e,c);var i=e.parentNode||e.ownerDocument;try{e&&e.nodeName&&d.noData[e.nodeName.toLowerCase()]||e["on"+f]&&e["on"+f].apply(e,c)===!1&&(a.result=!1,a.preventDefault())}catch(j){}if(!a.isPropagationStopped()&&i)d.event.trigger(a,c,i,!0);else if(!a.isDefaultPrevented()){var k,l=a.target,m=f.replace(p,""),n=d.nodeName(l,"a")&&m==="click",o=d.event.special[m]||{};if((!o._default||o._default.call(e,a)===!1)&&!n&&!(l&&l.nodeName&&d.noData[l.nodeName.toLowerCase()])){try{l[m]&&(k=l["on"+m],k&&(l["on"+m]=null),d.event.triggered=!0,l[m]())}catch(q){}k&&(l["on"+m]=k),d.event.triggered=!1}}},handle:function(c){var e,f,g,h,i,j=[],k=d.makeArray(arguments);c=k[0]=d.event.fix(c||a.event),c.currentTarget=this,e=c.type.indexOf(".")<0&&!c.exclusive,e||(g=c.type.split("."),c.type=g.shift(),j=g.slice(0).sort(),h=new RegExp("(^|\\.)"+j.join("\\.(?:.*\\.)?")+"(\\.|$)")),c.namespace=c.namespace||j.join("."),i=d._data(this,"events"),f=(i||{})[c.type];if(i&&f){f=f.slice(0);for(var l=0,m=f.length;l<m;l++){var n=f[l];if(e||h.test(n.namespace)){c.handler=n.handler,c.data=n.data,c.handleObj=n;var o=n.handler.apply(this,k);o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[d.expando])return a;var e=a;a=d.Event(e);for(var f=this.props.length,g;f;)g=this.props[--f],a[g]=e[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=c.documentElement,i=c.body;a.pageX=a.clientX+(h&&h.scrollLeft||i&&i.scrollLeft||0)-(h&&h.clientLeft||i&&i.clientLeft||0),a.pageY=a.clientY+(h&&h.scrollTop||i&&i.scrollTop||0)-(h&&h.clientTop||i&&i.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:d.proxy,special:{ready:{setup:d.bindReady,teardown:d.noop},live:{add:function(a){d.event.add(this,F(a.origType,a.selector),d.extend({},a,{handler:E,guid:a.handler.guid}))},remove:function(a){d.event.remove(this,F(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){d.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},d.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},d.Event=function(a){if(!this.preventDefault)return new d.Event(a);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?w:v):this.type=a,this.timeStamp=d.now(),this[d.expando]=!0},d.Event.prototype={preventDefault:function(){this.isDefaultPrevented=w;var a=this.originalEvent;a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=w;var a=this.originalEvent;a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=w,this.stopPropagation()},isDefaultPrevented:v,isPropagationStopped:v,isImmediatePropagationStopped:v};var x=function(a){var b=a.relatedTarget;try{if(b!==c&&!b.parentNode)return;while(b&&b!==this)b=b.parentNode;b!==this&&(a.type=a.data,d.event.handle.apply(this,arguments))}catch(e){}},y=function(a){a.type=a.data,d.event.handle.apply(this,arguments)};d.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){d.event.special[a]={setup:function(c){d.event.add(this,b,c&&c.selector?y:x,a)},teardown:function(a){d.event.remove(this,b,a&&a.selector?y:x)}}}),d.support.submitBubbles||(d.event.special.submit={setup:function(a,b){if(this.nodeName&&this.nodeName.toLowerCase()!=="form")d.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&d(b).closest("form").length&&C("submit",this,arguments)}),d.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&d(b).closest("form").length&&a.keyCode===13&&C("submit",this,arguments)});else return!1},teardown:function(a){d.event.remove(this,".specialSubmit")}});if(!d.support.changeBubbles){var z,A=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?d.map(a.options,function(a){return a.selected}).join("-"):"":a.nodeName.toLowerCase()==="select"&&(c=a.selectedIndex);return c},B=function B(a){var c=a.target,e,f;if(q.test(c.nodeName)&&!c.readOnly){e=d._data(c,"_change_data"),f=A(c),(a.type!=="focusout"||c.type!=="radio")&&d._data(c,"_change_data",f);if(e===b||f===e)return;if(e!=null||f)a.type="change",a.liveFired=b,d.event.trigger(a,arguments[1],c)}};d.event.special.change={filters:{focusout:B,beforedeactivate:B,click:function(a){var b=a.target,c=b.type;(c==="radio"||c==="checkbox"||b.nodeName.toLowerCase()==="select")&&B.call(this,a)},keydown:function(a){var b=a.target,c=b.type;(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&B.call(this,a)},beforeactivate:function(a){var b=a.target;d._data(b,"_change_data",A(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in z)d.event.add(this,c+".specialChange",z[c]);return q.test(this.nodeName)},teardown:function(a){d.event.remove(this,".specialChange");return q.test(this.nodeName)}},z=d.event.special.change.filters,z.focus=z.beforeactivate}c.addEventListener&&d.each({focus:"focusin",blur:"focusout"},function(a,b){function c(a){a=d.event.fix(a),a.type=b;return d.event.handle.call(this,a)}d.event.special[b]={setup:function(){this.addEventListener(a,c,!0)},teardown:function(){this.removeEventListener(a,c,!0)}}}),d.each(["bind","one"],function(a,c){d.fn[c]=function(a,e,f){if(typeof a==="object"){for(var g in a)this[c](g,e,a[g],f);return this}if(d.isFunction(e)||e===!1)f=e,e=b;var h=c==="one"?d.proxy(f,function(a){d(this).unbind(a,h);return f.apply(this,arguments)}):f;if(a==="unload"&&c!=="one")this.one(a,e,f);else for(var i=0,j=this.length;i<j;i++)d.event.add(this[i],a,h,e);return this}}),d.fn.extend({unbind:function(a,b){if(typeof a!=="object"||a.preventDefault)for(var e=0,f=this.length;e<f;e++)d.event.remove(this[e],a,b);else for(var c in a)this.unbind(c,a[c]);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){d.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){var c=d.Event(a);c.preventDefault(),c.stopPropagation(),d.event.trigger(c,b,this[0]);return c.result}},toggle:function(a){var b=arguments,c=1;while(c<b.length)d.proxy(a,b[c++]);return this.click(d.proxy(a,function(e){var f=(d._data(this,"lastToggle"+a.guid)||0)%c;d._data(this,"lastToggle"+a.guid,f+1),e.preventDefault();return b[f].apply(this,arguments)||!1}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var D={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};d.each(["live","die"],function(a,c){d.fn[c]=function(a,e,f,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:d(this.context);if(typeof a==="object"&&!a.preventDefault){for(var o in a)n[c](o,e,a[o],m);return this}d.isFunction(e)&&(f=e,e=b),a=(a||"").split(" ");while((h=a[i++])!=null){j=p.exec(h),k="",j&&(k=j[0],h=h.replace(p,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,h==="focus"||h==="blur"?(a.push(D[h]+k),h=h+k):h=(D[h]||h)+k;if(c==="live")for(var q=0,r=n.length;q<r;q++)d.event.add(n[q],"live."+F(h,m),{data:e,selector:m,handler:f,origType:h,origHandler:f,preType:l});else n.unbind("live."+F(h,m),f)}return this}}),d.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){d.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},d.attrFn&&(d.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!=="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,e,g){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!=="string")return e;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(f.call(n)==="[object Array]")if(u)if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&e.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&e.push(j[t]);else e.push.apply(e,n);else p(n,e);o&&(k(o,h,e,g),k.uniqueSort(e));return e};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!=="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(f){if(f===!0)continue}else g=o=!0}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b==="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1){}a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b==="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!=="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!=="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!=="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){return"text"===a.getAttribute("type")},radio:function(a){return"radio"===a.type},checkbox:function(a){return"checkbox"===a.type},file:function(a){return"file"===a.type},password:function(a){return"password"===a.type},submit:function(a){return"submit"===a.type},image:function(a){return"image"===a.type},reset:function(a){return"reset"===a.type},button:function(a){return"button"===a.type||a.nodeName.toLowerCase()==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(f.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length==="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(a===b){g=!0;return 0}if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!=="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!=="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!=="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!=="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector,d=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(e){d=!0}b&&(k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(d||!l.match.PSEUDO.test(c)&&!/!=/.test(c))return b.call(a,c)}catch(e){}return k(c,null,null,[a]).length>0})}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!=="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};d.find=k,d.expr=k.selectors,d.expr[":"]=d.expr.filters,d.unique=k.uniqueSort,d.text=k.getText,d.isXMLDoc=k.isXML,d.contains=k.contains}();var G=/Until$/,H=/^(?:parents|prevUntil|prevAll)/,I=/,/,J=/^.[^:#\[\.,]*$/,K=Array.prototype.slice,L=d.expr.match.POS,M={children:!0,contents:!0,next:!0,prev:!0};d.fn.extend({find:function(a){var b=this.pushStack("","find",a),c=0;for(var e=0,f=this.length;e<f;e++){c=b.length,d.find(a,this[e],b);if(e>0)for(var g=c;g<b.length;g++)for(var h=0;h<c;h++)if(b[h]===b[g]){b.splice(g--,1);break}}return b},has:function(a){var b=d(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(d.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(O(this,a,!1),"not",a)},filter:function(a){return this.pushStack(O(this,a,!0),"filter",a)},is:function(a){return!!a&&d.filter(a,this).length>0},closest:function(a,b){var c=[],e,f,g=this[0];if(d.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(e=0,f=a.length;e<f;e++)i=a[e],j[i]||(j[i]=d.expr.match.POS.test(i)?d(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:d(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=L.test(a)?d(a,b||this.context):null;for(e=0,f=this.length;e<f;e++){g=this[e];while(g){if(l?l.index(g)>-1:d.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b)break}}c=c.length>1?d.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a==="string")return d.inArray(this[0],a?d(a):this.parent().children());return d.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a==="string"?d(a,b):d.makeArray(a),e=d.merge(this.get(),c);return this.pushStack(N(c[0])||N(e[0])?e:d.unique(e))},andSelf:function(){return this.add(this.prevObject)}}),d.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return d.dir(a,"parentNode")},parentsUntil:function(a,b,c){return d.dir(a,"parentNode",c)},next:function(a){return d.nth(a,2,"nextSibling")},prev:function(a){return d.nth(a,2,"previousSibling")},nextAll:function(a){return d.dir(a,"nextSibling")},prevAll:function(a){return d.dir(a,"previousSibling")},nextUntil:function(a,b,c){return d.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return d.dir(a,"previousSibling",c)},siblings:function(a){return d.sibling(a.parentNode.firstChild,a)},children:function(a){return d.sibling(a.firstChild)},contents:function(a){return d.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:d.makeArray(a.childNodes)}},function(a,b){d.fn[a]=function(c,e){var f=d.map(this,b,c),g=K.call(arguments);G.test(a)||(e=c),e&&typeof e==="string"&&(f=d.filter(e,f)),f=this.length>1&&!M[a]?d.unique(f):f,(this.length>1||I.test(e))&&H.test(a)&&(f=f.reverse());return this.pushStack(f,a,g.join(","))}}),d.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?d.find.matchesSelector(b[0],a)?[b[0]]:[]:d.find.matches(a,b)},dir:function(a,c,e){var f=[],g=a[c];while(g&&g.nodeType!==9&&(e===b||g.nodeType!==1||!d(g).is(e)))g.nodeType===1&&f.push(g),g=g[c];return f},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var P=/ jQuery\d+="(?:\d+|null)"/g,Q=/^\s+/,R=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,S=/<([\w:]+)/,T=/<tbody/i,U=/<|&#?\w+;/,V=/<(?:script|object|embed|option|style)/i,W=/checked\s*(?:[^=]|=\s*.checked.)/i,X={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};X.optgroup=X.option,X.tbody=X.tfoot=X.colgroup=X.caption=X.thead,X.th=X.td,d.support.htmlSerialize||(X._default=[1,"div<div>","</div>"]),d.fn.extend({text:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.text(a.call(this,b,c.text()))});if(typeof a!=="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return d.text(this)},wrapAll:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapAll(a.call(this,b))});if(this[0]){var b=d(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapInner(a.call(this,b))});return this.each(function(){var b=d(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){d(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){d.nodeName(this,"body")||d(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=d(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,d(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,e;(e=this[c])!=null;c++)if(!a||d.filter(a,[e]).length)!b&&e.nodeType===1&&(d.cleanData(e.getElementsByTagName("*")),d.cleanData([e])),e.parentNode&&e.parentNode.removeChild(e);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&d.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return d.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(P,""):null;if(typeof a!=="string"||V.test(a)||!d.support.leadingWhitespace&&Q.test(a)||X[(S.exec(a)||["",""])[1].toLowerCase()])d.isFunction(a)?this.each(function(b){var c=d(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);else{a=a.replace(R,"<$1></$2>");try{for(var c=0,e=this.length;c<e;c++)this[c].nodeType===1&&(d.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(f){this.empty().append(a)}}return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(d.isFunction(a))return this.each(function(b){var c=d(this),e=c.html();c.replaceWith(a.call(this,b,e))});typeof a!=="string"&&(a=d(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;d(this).remove(),b?d(b).before(a):d(c).append(a)})}return this.pushStack(d(d.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,e){var f,g,h,i,j=a[0],k=[];if(!d.support.checkClone&&arguments.length===3&&typeof j==="string"&&W.test(j))return this.each(function(){d(this).domManip(a,c,e,!0)});if(d.isFunction(j))return this.each(function(f){var g=d(this);a[0]=j.call(this,f,c?g.html():b),g.domManip(a,c,e)});if(this[0]){i=j&&j.parentNode,d.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?f={fragment:i}:f=d.buildFragment(a,this,k),h=f.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&d.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)e.call(c?Y(this[l],g):this[l],f.cacheable||m>1&&l<n?d.clone(h,!0,!0):h)}k.length&&d.each(k,ba)}return this}}),d.buildFragment=function(a,b,e){var f,g,h,i=b&&b[0]?b[0].ownerDocument||b[0]:c;a.length===1&&typeof a[0]==="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!V.test(a[0])&&(d.support.checkClone||!W.test(a[0]))&&(g=!0,h=d.fragments[a[0]],h&&(h!==1&&(f=h))),f||(f=i.createDocumentFragment(),d.clean(a,i,f,e)),g&&(d.fragments[a[0]]=h?f:1);return{fragment:f,cacheable:g}},d.fragments={},d.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){d.fn[a]=function(c){var e=[],f=d(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&f.length===1){f[b](this[0]);return this}for(var h=0,i=f.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();d(f[h])[b](j),e=e.concat(j)}return this.pushStack(e,a,f.selector)}}),d.extend({clone:function(a,b,c){var e=a.cloneNode(!0),f,g,h;if((!d.support.noCloneEvent||!d.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!d.isXMLDoc(a)){$(a,e),f=_(a),g=_(e);for(h=0;f[h];++h)$(f[h],g[h])}if(b){Z(a,e);if(c){f=_(a),g=_(e);for(h=0;f[h];++h)Z(f[h],g[h])}}return e},clean:function(a,b,e,f){b=b||c,typeof b.createElement==="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var g=[];for(var h=0,i;(i=a[h])!=null;h++){typeof i==="number"&&(i+="");if(!i)continue;if(typeof i!=="string"||U.test(i)){if(typeof i==="string"){i=i.replace(R,"<$1></$2>");var j=(S.exec(i)||["",""])[1].toLowerCase(),k=X[j]||X._default,l=k[0],m=b.createElement("div");m.innerHTML=k[1]+i+k[2];while(l--)m=m.lastChild;if(!d.support.tbody){var n=T.test(i),o=j==="table"&&!n?m.firstChild&&m.firstChild.childNodes:k[1]==="<table>"&&!n?m.childNodes:[];for(var p=o.length-1;p>=0;--p)d.nodeName(o[p],"tbody")&&!o[p].childNodes.length&&o[p].parentNode.removeChild(o[p])}!d.support.leadingWhitespace&&Q.test(i)&&m.insertBefore(b.createTextNode(Q.exec(i)[0]),m.firstChild),i=m.childNodes}}else i=b.createTextNode(i);i.nodeType?g.push(i):g=d.merge(g,i)}if(e)for(h=0;g[h];h++)!f||!d.nodeName(g[h],"script")||g[h].type&&g[h].type.toLowerCase()!=="text/javascript"?(g[h].nodeType===1&&g.splice.apply(g,[h+1,0].concat(d.makeArray(g[h].getElementsByTagName("script")))),e.appendChild(g[h])):f.push(g[h].parentNode?g[h].parentNode.removeChild(g[h]):g[h]);return g},cleanData:function(a){var b,c,e=d.cache,f=d.expando,g=d.event.special,h=d.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&d.noData[j.nodeName.toLowerCase()])continue;c=j[d.expando];if(c){b=e[c]&&e[c][f];if(b&&b.events){for(var k in b.events)g[k]?d.event.remove(j,k):d.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[d.expando]:j.removeAttribute&&j.removeAttribute(d.expando),delete e[c]}}}});var bb=/alpha\([^)]*\)/i,bc=/opacity=([^)]*)/,bd=/-([a-z])/ig,be=/([A-Z])/g,bf=/^-?\d+(?:px)?$/i,bg=/^-?\d/,bh={position:"absolute",visibility:"hidden",display:"block"},bi=["Left","Right"],bj=["Top","Bottom"],bk,bl,bm,bn=function(a,b){return b.toUpperCase()};d.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return d.access(this,a,c,!0,function(a,c,e){return e!==b?d.style(a,c,e):d.css(a,c)})},d.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bk(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{zIndex:!0,fontWeight:!0,opacity:!0,zoom:!0,lineHeight:!0},cssProps:{"float":d.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,e,f){if(a&&a.nodeType!==3&&a.nodeType!==8&&a.style){var g,h=d.camelCase(c),i=a.style,j=d.cssHooks[h];c=d.cssProps[h]||h;if(e===b){if(j&&"get"in j&&(g=j.get(a,!1,f))!==b)return g;return i[c]}if(typeof e==="number"&&isNaN(e)||e==null)return;typeof e==="number"&&!d.cssNumber[h]&&(e+="px");if(!j||!("set"in j)||(e=j.set(a,e))!==b)try{i[c]=e}catch(k){}}},css:function(a,c,e){var f,g=d.camelCase(c),h=d.cssHooks[g];c=d.cssProps[g]||g;if(h&&"get"in h&&(f=h.get(a,!0,e))!==b)return f;if(bk)return bk(a,c,g)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]},camelCase:function(a){return a.replace(bd,bn)}}),d.curCSS=d.css,d.each(["height","width"],function(a,b){d.cssHooks[b]={get:function(a,c,e){var f;if(c){a.offsetWidth!==0?f=bo(a,b,e):d.swap(a,bh,function(){f=bo(a,b,e)});if(f<=0){f=bk(a,b,b),f==="0px"&&bm&&(f=bm(a,b,b));if(f!=null)return f===""||f==="auto"?"0px":f}if(f<0||f==null){f=a.style[b];return f===""||f==="auto"?"0px":f}return typeof f==="string"?f:f+"px"}},set:function(a,b){if(!bf.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),d.support.opacity||(d.cssHooks.opacity={get:function(a,b){return bc.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style;c.zoom=1;var e=d.isNaN(b)?"":"alpha(opacity="+b*100+")",f=c.filter||"";c.filter=bb.test(f)?f.replace(bb,e):c.filter+" "+e}}),c.defaultView&&c.defaultView.getComputedStyle&&(bl=function(a,c,e){var f,g,h;e=e.replace(be,"-$1").toLowerCase();if(!(g=a.ownerDocument.defaultView))return b;if(h=g.getComputedStyle(a,null))f=h.getPropertyValue(e),f===""&&!d.contains(a.ownerDocument.documentElement,a)&&(f=d.style(a,e));return f}),c.documentElement.currentStyle&&(bm=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bf.test(d)&&bg.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bk=bl||bm,d.expr&&d.expr.filters&&(d.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!d.support.reliableHiddenOffsets&&(a.style.display||d.css(a,"display"))==="none"},d.expr.filters.visible=function(a){return!d.expr.filters.hidden(a)});var bp=/%20/g,bq=/\[\]$/,br=/\r?\n/g,bs=/#.*$/,bt=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bu=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bv=/(?:^file|^widget|\-extension):$/,bw=/^(?:GET|HEAD)$/,bx=/^\/\//,by=/\?/,bz=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bA=/^(?:select|textarea)/i,bB=/\s+/,bC=/([?&])_=[^&]*/,bD=/(^|\-)([a-z])/g,bE=function(a,b,c){return b+c.toUpperCase()},bF=/^([\w\+\.\-]+:)\/\/([^\/?#:]*)(?::(\d+))?/,bG=d.fn.load,bH={},bI={},bJ,bK;try{bJ=c.location.href}catch(bL){bJ=c.createElement("a"),bJ.href="",bJ=bJ.href}bK=bF.exec(bJ.toLowerCase()),d.fn.extend({load:function(a,c,e){if(typeof a!=="string"&&bG)return bG.apply(this,arguments);if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var g=a.slice(f,a.length);a=a.slice(0,f)}var h="GET";c&&(d.isFunction(c)?(e=c,c=b):typeof c==="object"&&(c=d.param(c,d.ajaxSettings.traditional),h="POST"));var i=this;d.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?d("<div>").append(c.replace(bz,"")).find(g):c)),e&&i.each(e,[c,b,a])}});return this},serialize:function(){return d.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?d.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bA.test(this.nodeName)||bu.test(this.type))}).map(function(a,b){var c=d(this).val();return c==null?null:d.isArray(c)?d.map(c,function(a,c){return{name:b.name,value:a.replace(br,"\r\n")}}):{name:b.name,value:c.replace(br,"\r\n")}}).get()}}),d.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){d.fn[b]=function(a){return this.bind(b,a)}}),d.each(["get","post"],function(a,c){d[c]=function(a,e,f,g){d.isFunction(e)&&(g=g||f,f=e,e=b);return d.ajax({type:c,url:a,data:e,success:f,dataType:g})}}),d.extend({getScript:function(a,c){return d.get(a,b,c,"script")},getJSON:function(a,b,c){return d.get(a,b,c,"json")},ajaxSetup:function(a,b){b?d.extend(!0,a,d.ajaxSettings,b):(b=a,a=d.extend(!0,d.ajaxSettings,b));for(var c in {context:1,url:1})c in b?a[c]=b[c]:c in d.ajaxSettings&&(a[c]=d.ajaxSettings[c]);return a},ajaxSettings:{url:bJ,isLocal:bv.test(bK[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":d.parseJSON,"text xml":d.parseXML}},ajaxPrefilter:bM(bH),ajaxTransport:bM(bI),ajax:function(a,c){function v(a,c,l,n){if(r!==2){r=2,p&&clearTimeout(p),o=b,m=n||"",u.readyState=a?4:0;var q,t,v,w=l?bP(e,u,l):b,x,y;if(a>=200&&a<300||a===304){if(e.ifModified){if(x=u.getResponseHeader("Last-Modified"))d.lastModified[k]=x;if(y=u.getResponseHeader("Etag"))d.etag[k]=y}if(a===304)c="notmodified",q=!0;else try{t=bQ(e,w),c="success",q=!0}catch(z){c="parsererror",v=z}}else{v=c;if(!c||a)c="error",a<0&&(a=0)}u.status=a,u.statusText=c,q?h.resolveWith(f,[t,c,u]):h.rejectWith(f,[u,c,v]),u.statusCode(j),j=b,s&&g.trigger("ajax"+(q?"Success":"Error"),[u,e,q?t:v]),i.resolveWith(f,[u,c]),s&&(g.trigger("ajaxComplete",[u,e]),--d.active||d.event.trigger("ajaxStop"))}}typeof a==="object"&&(c=a,a=b),c=c||{};var e=d.ajaxSetup({},c),f=e.context||e,g=f!==e&&(f.nodeType||f instanceof d)?d(f):d.event,h=d.Deferred(),i=d._Deferred(),j=e.statusCode||{},k,l={},m,n,o,p,q,r=0,s,t,u={readyState:0,setRequestHeader:function(a,b){r||(l[a.toLowerCase().replace(bD,bE)]=b);return this},getAllResponseHeaders:function(){return r===2?m:null},getResponseHeader:function(a){var c;if(r===2){if(!n){n={};while(c=bt.exec(m))n[c[1].toLowerCase()]=c[2]}c=n[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){r||(e.mimeType=a);return this},abort:function(a){a=a||"abort",o&&o.abort(a),v(0,a);return this}};h.promise(u),u.success=u.done,u.error=u.fail,u.complete=i.done,u.statusCode=function(a){if(a){var b;if(r<2)for(b in a)j[b]=[j[b],a[b]];else b=a[u.status],u.then(b,b)}return this},e.url=((a||e.url)+"").replace(bs,"").replace(bx,bK[1]+"//"),e.dataTypes=d.trim(e.dataType||"*").toLowerCase().split(bB),e.crossDomain||(q=bF.exec(e.url.toLowerCase()),e.crossDomain=q&&(q[1]!=bK[1]||q[2]!=bK[2]||(q[3]||(q[1]==="http:"?80:443))!=(bK[3]||(bK[1]==="http:"?80:443)))),e.data&&e.processData&&typeof e.data!=="string"&&(e.data=d.param(e.data,e.traditional)),bN(bH,e,c,u);if(r===2)return!1;s=e.global,e.type=e.type.toUpperCase(),e.hasContent=!bw.test(e.type),s&&d.active++===0&&d.event.trigger("ajaxStart");if(!e.hasContent){e.data&&(e.url+=(by.test(e.url)?"&":"?")+e.data),k=e.url;if(e.cache===!1){var w=d.now(),x=e.url.replace(bC,"$1_="+w);e.url=x+(x===e.url?(by.test(e.url)?"&":"?")+"_="+w:"")}}if(e.data&&e.hasContent&&e.contentType!==!1||c.contentType)l["Content-Type"]=e.contentType;e.ifModified&&(k=k||e.url,d.lastModified[k]&&(l["If-Modified-Since"]=d.lastModified[k]),d.etag[k]&&(l["If-None-Match"]=d.etag[k])),l.Accept=e.dataTypes[0]&&e.accepts[e.dataTypes[0]]?e.accepts[e.dataTypes[0]]+(e.dataTypes[0]!=="*"?", */*; q=0.01":""):e.accepts["*"];for(t in e.headers)u.setRequestHeader(t,e.headers[t]);if(e.beforeSend&&(e.beforeSend.call(f,u,e)===!1||r===2)){u.abort();return!1}for(t in {success:1,error:1,complete:1})u[t](e[t]);o=bN(bI,e,c,u);if(o){u.readyState=1,s&&g.trigger("ajaxSend",[u,e]),e.async&&e.timeout>0&&(p=setTimeout(function(){u.abort("timeout")},e.timeout));try{r=1,o.send(l,v)}catch(y){status<2?v(-1,y):d.error(y)}}else v(-1,"No Transport");return u},param:function(a,c){var e=[],f=function(a,b){b=d.isFunction(b)?b():b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=d.ajaxSettings.traditional);if(d.isArray(a)||a.jquery&&!d.isPlainObject(a))d.each(a,function(){f(this.name,this.value)});else for(var g in a)bO(g,a[g],c,f);return e.join("&").replace(bp,"+")}}),d.extend({active:0,lastModified:{},etag:{}});var bR=d.now(),bS=/(\=)\?(&|$)|()\?\?()/i;d.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return d.expando+"_"+bR++}}),d.ajaxPrefilter("json jsonp",function(b,c,e){var f=typeof b.data==="string";if(b.dataTypes[0]==="jsonp"||c.jsonpCallback||c.jsonp!=null||b.jsonp!==!1&&(bS.test(b.url)||f&&bS.test(b.data))){var g,h=b.jsonpCallback=d.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2",m=function(){a[h]=i,g&&d.isFunction(i)&&a[h](g[0])};b.jsonp!==!1&&(j=j.replace(bS,l),b.url===j&&(f&&(k=k.replace(bS,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},e.then(m,m),b.converters["script json"]=function(){g||d.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),d.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){d.globalEval(a);return a}}}),d.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),d.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var bT=d.now(),bU,bV;d.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&bX()||bY()}:bX,bV=d.ajaxSettings.xhr(),d.support.ajax=!!bV,d.support.cors=bV&&"withCredentials"in bV,bV=b,d.support.ajax&&d.ajaxTransport(function(a){if(!a.crossDomain||d.support.cors){var c;return{send:function(e,f){var g=a.xhr(),h,i;a.username?g.open(a.type,a.url,a.async,a.username,a.password):g.open(a.type,a.url,a.async);if(a.xhrFields)for(i in a.xhrFields)g[i]=a.xhrFields[i];a.mimeType&&g.overrideMimeType&&g.overrideMimeType(a.mimeType),(!a.crossDomain||a.hasContent)&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(i in e)g.setRequestHeader(i,e[i])}catch(j){}g.send(a.hasContent&&a.data||null),c=function(e,i){var j,k,l,m,n;try{if(c&&(i||g.readyState===4)){c=b,h&&(g.onreadystatechange=d.noop,delete bU[h]);if(i)g.readyState!==4&&g.abort();else{j=g.status,l=g.getAllResponseHeaders(),m={},n=g.responseXML,n&&n.documentElement&&(m.xml=n),m.text=g.responseText;try{k=g.statusText}catch(o){k=""}j||!a.isLocal||a.crossDomain?j===1223&&(j=204):j=m.text?200:404}}}catch(p){i||f(-1,p)}m&&f(j,k,m,l)},a.async&&g.readyState!==4?(bU||(bU={},bW()),h=bT++,g.onreadystatechange=bU[h]=c):c()},abort:function(){c&&c(0,1)}}}});var bZ={},b$=/^(?:toggle|show|hide)$/,b_=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,ca,cb=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];d.fn.extend({show:function(a,b,c){var e,f;if(a||a===0)return this.animate(cc("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)e=this[g],f=e.style.display,!d._data(e,"olddisplay")&&f==="none"&&(f=e.style.display=""),f===""&&d.css(e,"display")==="none"&&d._data(e,"olddisplay",cd(e.nodeName));for(g=0;g<h;g++){e=this[g],f=e.style.display;if(f===""||f==="none")e.style.display=d._data(e,"olddisplay")||""}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cc("hide",3),a,b,c);for(var e=0,f=this.length;e<f;e++){var g=d.css(this[e],"display");g!=="none"&&!d._data(this[e],"olddisplay")&&d._data(this[e],"olddisplay",g)}for(e=0;e<f;e++)this[e].style.display="none";return this},_toggle:d.fn.toggle,toggle:function(a,b,c){var e=typeof a==="boolean";d.isFunction(a)&&d.isFunction(b)?this._toggle.apply(this,arguments):a==null||e?this.each(function(){var b=e?a:d(this).is(":hidden");d(this)[b?"show":"hide"]()}):this.animate(cc("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,e){var f=d.speed(b,c,e);if(d.isEmptyObject(a))return this.each(f.complete);return this[f.queue===!1?"each":"queue"](function(){var b=d.extend({},f),c,e=this.nodeType===1,g=e&&d(this).is(":hidden"),h=this;for(c in a){var i=d.camelCase(c);c!==i&&(a[i]=a[c],delete a[c],c=i);if(a[c]==="hide"&&g||a[c]==="show"&&!g)return b.complete.call(this);if(e&&(c==="height"||c==="width")){b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY];if(d.css(this,"display")==="inline"&&d.css(this,"float")==="none")if(d.support.inlineBlockNeedsLayout){var j=cd(this.nodeName);j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)}else this.style.display="inline-block"}d.isArray(a[c])&&((b.specialEasing=b.specialEasing||{})[c]=a[c][1],a[c]=a[c][0])}b.overflow!=null&&(this.style.overflow="hidden"),b.curAnim=d.extend({},a),d.each(a,function(c,e){var f=new d.fx(h,b,c);if(b$.test(e))f[e==="toggle"?g?"show":"hide":e](a);else{var i=b_.exec(e),j=f.cur();if(i){var k=parseFloat(i[2]),l=i[3]||(d.cssNumber[c]?"":"px");l!=="px"&&(d.style(h,c,(k||1)+l),j=(k||1)/f.cur()*j,d.style(h,c,j+l)),i[1]&&(k=(i[1]==="-="?-1:1)*k+j),f.custom(j,k,l)}else f.custom(j,e,"")}});return!0})},stop:function(a,b){var c=d.timers;a&&this.queue([]),this.each(function(){for(var a=c.length-1;a>=0;a--)c[a].elem===this&&(b&&c[a](!0),c.splice(a,1))}),b||this.dequeue();return this}}),d.each({slideDown:cc("show",1),slideUp:cc("hide",1),slideToggle:cc("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){d.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),d.extend({speed:function(a,b,c){var e=a&&typeof a==="object"?d.extend({},a):{complete:c||!c&&b||d.isFunction(a)&&a,duration:a,easing:c&&b||b&&!d.isFunction(b)&&b};e.duration=d.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in d.fx.speeds?d.fx.speeds[e.duration]:d.fx.speeds._default,e.old=e.complete,e.complete=function(){e.queue!==!1&&d(this).dequeue(),d.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig||(b.orig={})}}),d.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(d.fx.step[this.prop]||d.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=d.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function g(a){return e.step(a)}var e=this,f=d.fx;this.startTime=d.now(),this.start=a,this.end=b,this.unit=c||this.unit||(d.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,g.elem=this.elem,g()&&d.timers.push(g)&&!ca&&(ca=setInterval(f.tick,f.interval))},show:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),d(this.elem).show()},hide:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=d.now(),c=!0;if(a||b>=this.options.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),this.options.curAnim[this.prop]=!0;for(var e in this.options.curAnim)this.options.curAnim[e]!==!0&&(c=!1);if(c){if(this.options.overflow!=null&&!d.support.shrinkWrapBlocks){var f=this.elem,g=this.options;d.each(["","X","Y"],function(a,b){f.style["overflow"+b]=g.overflow[a]})}this.options.hide&&d(this.elem).hide();if(this.options.hide||this.options.show)for(var h in this.options.curAnim)d.style(this.elem,h,this.options.orig[h]);this.options.complete.call(this.elem)}return!1}var i=b-this.startTime;this.state=i/this.options.duration;var j=this.options.specialEasing&&this.options.specialEasing[this.prop],k=this.options.easing||(d.easing.swing?"swing":"linear");this.pos=d.easing[j||k](this.state,i,0,1,this.options.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update();return!0}},d.extend(d.fx,{tick:function(){var a=d.timers;for(var b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||d.fx.stop()},interval:13,stop:function(){clearInterval(ca),ca=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){d.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),d.expr&&d.expr.filters&&(d.expr.filters.animated=function(a){return d.grep(d.timers,function(b){return a===b.elem}).length});var ce=/^t(?:able|d|h)$/i,cf=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?d.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(e){}var f=b.ownerDocument,g=f.documentElement;if(!c||!d.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=f.body,i=cg(f),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||d.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||d.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:d.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);d.offset.initialize();var c,e=b.offsetParent,f=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(d.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===e&&(l+=b.offsetTop,m+=b.offsetLeft,d.offset.doesNotAddBorder&&(!d.offset.doesAddBorderForTableAndCells||!ce.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),f=e,e=b.offsetParent),d.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;d.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},d.offset={initialize:function(){var a=c.body,b=c.createElement("div"),e,f,g,h,i=parseFloat(d.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";d.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),e=b.firstChild,f=e.firstChild,h=e.nextSibling.firstChild.firstChild,this.doesNotAddBorder=f.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,f.style.position="fixed",f.style.top="20px",this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15,f.style.position=f.style.top="",e.style.overflow="hidden",e.style.position="relative",this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),a=b=e=f=g=h=null,d.offset.initialize=d.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;d.offset.initialize(),d.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(d.css(a,"marginTop"))||0,c+=parseFloat(d.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var e=d.css(a,"position");e==="static"&&(a.style.position="relative");var f=d(a),g=f.offset(),h=d.css(a,"top"),i=d.css(a,"left"),j=e==="absolute"&&d.inArray("auto",[h,i])>-1,k={},l={},m,n;j&&(l=f.position()),m=j?l.top:parseInt(h,10)||0,n=j?l.left:parseInt(i,10)||0,d.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):f.css(k)}},d.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),e=cf.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(d.css(a,"marginTop"))||0,c.left-=parseFloat(d.css(a,"marginLeft"))||0,e.top+=parseFloat(d.css(b[0],"borderTopWidth"))||0,e.left+=parseFloat(d.css(b[0],"borderLeftWidth"))||0;return{top:c.top-e.top,left:c.left-e.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&(!cf.test(a.nodeName)&&d.css(a,"position")==="static"))a=a.offsetParent;return a})}}),d.each(["Left","Top"],function(a,c){var e="scroll"+c;d.fn[e]=function(c){var f=this[0],g;if(!f)return null;if(c!==b)return this.each(function(){g=cg(this),g?g.scrollTo(a?d(g).scrollLeft():c,a?c:d(g).scrollTop()):this[e]=c});g=cg(f);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:d.support.boxModel&&g.document.documentElement[e]||g.document.body[e]:f[e]}}),d.each(["Height","Width"],function(a,c){var e=c.toLowerCase();d.fn["inner"+c]=function(){return this[0]?parseFloat(d.css(this[0],e,"padding")):null},d.fn["outer"+c]=function(a){return this[0]?parseFloat(d.css(this[0],e,a?"margin":"border")):null},d.fn[e]=function(a){var f=this[0];if(!f)return a==null?null:this;if(d.isFunction(a))return this.each(function(b){var c=d(this);c[e](a.call(this,b,c[e]()))});if(d.isWindow(f)){var g=f.document.documentElement["client"+c];return f.document.compatMode==="CSS1Compat"&&g||f.document.body["client"+c]||g}if(f.nodeType===9)return Math.max(f.documentElement["client"+c],f.body["scroll"+c],f.documentElement["scroll"+c],f.body["offset"+c],f.documentElement["offset"+c]);if(a===b){var h=d.css(f,e),i=parseFloat(h);return d.isNaN(i)?h:i}return this.css(e,typeof a==="string"?a:a+"px")}}),a.jQuery=a.$=d})(window);
\ No newline at end of file
diff --git a/3rdparty/timepicker/css/include/jquery-ui-1.8.14.custom.css b/3rdparty/timepicker/css/include/jquery-ui-1.8.14.custom.css
deleted file mode 100644
index fe310705756..00000000000
--- a/3rdparty/timepicker/css/include/jquery-ui-1.8.14.custom.css
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
- * jQuery UI CSS Framework 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-.ui-helper-clearfix { display: inline-block; }
-/* required comment for clearfix to work in Opera \*/
-* html .ui-helper-clearfix { height:1%; }
-.ui-helper-clearfix { display:block; }
-/* end clearfix */
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-
-/*
- * jQuery UI CSS Framework 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS,%20Tahoma,%20Verdana,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
- */
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1.1em; }
-.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; }
-.ui-widget-content a { color: #333333; }
-.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
-.ui-widget-header a { color: #ffffff; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; }
-.ui-widget :active { outline: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fed22f; background: #ffe45c url(images/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_ef8c08_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_228ef1_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffd27a_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); }
-.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/*
- * jQuery UI Resizable 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Resizable#theming
- */
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
- * jQuery UI Selectable 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Selectable#theming
- */
-.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
-/*
- * jQuery UI Accordion 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Accordion#theming
- */
-/* IE/Win - Fix animation bug - #4615 */
-.ui-accordion { width: 100%; }
-.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
-.ui-accordion .ui-accordion-li-fix { display: inline; }
-.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
-.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }
-/*
- * jQuery UI Autocomplete 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Autocomplete#theming
- */
-.ui-autocomplete { position: absolute; cursor: default; }	
-
-/* workarounds */
-* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
-
-/*
- * jQuery UI Menu 1.8.14
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Menu#theming
- */
-.ui-menu {
-	list-style:none;
-	padding: 2px;
-	margin: 0;
-	display:block;
-	float: left;
-}
-.ui-menu .ui-menu {
-	margin-top: -3px;
-}
-.ui-menu .ui-menu-item {
-	margin:0;
-	padding: 0;
-	zoom: 1;
-	float: left;
-	clear: left;
-	width: 100%;
-}
-.ui-menu .ui-menu-item a {
-	text-decoration:none;
-	display:block;
-	padding:.2em .4em;
-	line-height:1.5;
-	zoom:1;
-}
-.ui-menu .ui-menu-item a.ui-state-hover,
-.ui-menu .ui-menu-item a.ui-state-active {
-	font-weight: normal;
-	margin: -1px;
-}
-/*
- * jQuery UI Button 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Button#theming
- */
-.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
-.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
-button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
-.ui-button-icons-only { width: 3.4em; } 
-button.ui-button-icons-only { width: 3.7em; } 
-
-/*button text element */
-.ui-button .ui-button-text { display: block; line-height: 1.4;  }
-.ui-button-text-only .ui-button-text { padding: .4em 1em; }
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
-.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
-.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
-/* no icon support for input elements, provide padding by default */
-input.ui-button { padding: .4em 1em; }
-
-/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
-.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
-.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-
-/*button sets*/
-.ui-buttonset { margin-right: 7px; }
-.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
-
-/* workarounds */
-button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
-/*
- * jQuery UI Dialog 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Dialog#theming
- */
-.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
-.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-/*
- * jQuery UI Slider 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Slider#theming
- */
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
- * jQuery UI Tabs 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Tabs#theming
- */
-.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
-.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
-.ui-tabs .ui-tabs-hide { display: none !important; }
-/*
- * jQuery UI Datepicker 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker#theming
- */
-.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month, 
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
-    display: none; /*sorry for IE5*/
-    display/**/: block; /*sorry for IE5*/
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}/*
- * jQuery UI Progressbar 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Progressbar#theming
- */
-.ui-progressbar { height:2em; text-align: left; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
diff --git a/3rdparty/timepicker/css/include/jquery.ui.core.min.js b/3rdparty/timepicker/css/include/jquery.ui.core.min.js
deleted file mode 100644
index 577548e7882..00000000000
--- a/3rdparty/timepicker/css/include/jquery.ui.core.min.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
- * jQuery UI 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI
- */
-(function(c,j){function k(a,b){var d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function l(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.14",
-keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus();
-b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,
-"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",
-function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,m,n){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(m)g-=parseFloat(c.curCSS(f,"border"+this+"Width",true))||0;if(n)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth,
-outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){return k(a,!isNaN(c.attr(a,"tabindex")))},tabbable:function(a){var b=c.attr(a,"tabindex"),d=isNaN(b);
-return(d||b>=0)&&k(a,!d)}});c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e=
-0;e<b.length;e++)a.options[b[e][0]]&&b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&c.ui.isOverAxis(b,e,i)}})}})(jQuery);
diff --git a/3rdparty/timepicker/css/include/jquery.ui.position.min.js b/3rdparty/timepicker/css/include/jquery.ui.position.min.js
deleted file mode 100644
index 9f550be8e21..00000000000
--- a/3rdparty/timepicker/css/include/jquery.ui.position.min.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * jQuery UI Position 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Position
- */
-(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY,
-left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+=
-k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-=
-m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left=
-d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+=
-a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b),
-g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
diff --git a/3rdparty/timepicker/css/include/jquery.ui.tabs.min.js b/3rdparty/timepicker/css/include/jquery.ui.tabs.min.js
deleted file mode 100644
index 11a67c144a6..00000000000
--- a/3rdparty/timepicker/css/include/jquery.ui.tabs.min.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * jQuery UI Tabs 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Tabs
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- */
-(function(d,p){function u(){return++v}function w(){return++x}var v=0,x=0;d.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(b,e){if(b=="selected")this.options.collapsible&&
-e==this.options.selected||this.select(e);else{this.options[b]=e;this._tabify()}},_tabId:function(b){return b.title&&b.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+u()},_sanitizeSelector:function(b){return b.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+w());return d.cookie.apply(null,[b].concat(d.makeArray(arguments)))},_ui:function(b,e){return{tab:b,panel:e,index:this.anchors.index(b)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b=
-d(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(b){function e(g,f){g.css("display","");!d.support.opacity&&f.opacity&&g[0].style.removeAttribute("filter")}var a=this,c=this.options,h=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=d(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return d("a",this)[0]});this.panels=d([]);this.anchors.each(function(g,f){var i=d(f).attr("href"),l=i.split("#")[0],q;if(l&&(l===location.toString().split("#")[0]||
-(q=d("base")[0])&&l===q.href)){i=f.hash;f.href=i}if(h.test(i))a.panels=a.panels.add(a.element.find(a._sanitizeSelector(i)));else if(i&&i!=="#"){d.data(f,"href.tabs",i);d.data(f,"load.tabs",i.replace(/#.*$/,""));i=a._tabId(f);f.href="#"+i;f=a.element.find("#"+i);if(!f.length){f=d(c.panelTemplate).attr("id",i).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(a.panels[g-1]||a.list);f.data("destroy.tabs",true)}a.panels=a.panels.add(f)}else c.disabled.push(g)});if(b){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");
-this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(c.selected===p){location.hash&&this.anchors.each(function(g,f){if(f.hash==location.hash){c.selected=g;return false}});if(typeof c.selected!=="number"&&c.cookie)c.selected=parseInt(a._cookie(),10);if(typeof c.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)c.selected=
-this.lis.index(this.lis.filter(".ui-tabs-selected"));c.selected=c.selected||(this.lis.length?0:-1)}else if(c.selected===null)c.selected=-1;c.selected=c.selected>=0&&this.anchors[c.selected]||c.selected<0?c.selected:0;c.disabled=d.unique(c.disabled.concat(d.map(this.lis.filter(".ui-state-disabled"),function(g){return a.lis.index(g)}))).sort();d.inArray(c.selected,c.disabled)!=-1&&c.disabled.splice(d.inArray(c.selected,c.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");
-if(c.selected>=0&&this.anchors.length){a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(c.selected).addClass("ui-tabs-selected ui-state-active");a.element.queue("tabs",function(){a._trigger("show",null,a._ui(a.anchors[c.selected],a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash))[0]))});this.load(c.selected)}d(window).bind("unload",function(){a.lis.add(a.anchors).unbind(".tabs");a.lis=a.anchors=a.panels=null})}else c.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));
-this.element[c.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");c.cookie&&this._cookie(c.selected,c.cookie);b=0;for(var j;j=this.lis[b];b++)d(j)[d.inArray(b,c.disabled)!=-1&&!d(j).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");c.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(c.event!=="mouseover"){var k=function(g,f){f.is(":not(.ui-state-disabled)")&&f.addClass("ui-state-"+g)},n=function(g,f){f.removeClass("ui-state-"+
-g)};this.lis.bind("mouseover.tabs",function(){k("hover",d(this))});this.lis.bind("mouseout.tabs",function(){n("hover",d(this))});this.anchors.bind("focus.tabs",function(){k("focus",d(this).closest("li"))});this.anchors.bind("blur.tabs",function(){n("focus",d(this).closest("li"))})}var m,o;if(c.fx)if(d.isArray(c.fx)){m=c.fx[0];o=c.fx[1]}else m=o=c.fx;var r=o?function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.hide().removeClass("ui-tabs-hide").animate(o,o.duration||"normal",
-function(){e(f,o);a._trigger("show",null,a._ui(g,f[0]))})}:function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.removeClass("ui-tabs-hide");a._trigger("show",null,a._ui(g,f[0]))},s=m?function(g,f){f.animate(m,m.duration||"normal",function(){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");e(f,m);a.element.dequeue("tabs")})}:function(g,f){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");a.element.dequeue("tabs")};
-this.anchors.bind(c.event+".tabs",function(){var g=this,f=d(g).closest("li"),i=a.panels.filter(":not(.ui-tabs-hide)"),l=a.element.find(a._sanitizeSelector(g.hash));if(f.hasClass("ui-tabs-selected")&&!c.collapsible||f.hasClass("ui-state-disabled")||f.hasClass("ui-state-processing")||a.panels.filter(":animated").length||a._trigger("select",null,a._ui(this,l[0]))===false){this.blur();return false}c.selected=a.anchors.index(this);a.abort();if(c.collapsible)if(f.hasClass("ui-tabs-selected")){c.selected=
--1;c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){s(g,i)}).dequeue("tabs");this.blur();return false}else if(!i.length){c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this));this.blur();return false}c.cookie&&a._cookie(c.selected,c.cookie);if(l.length){i.length&&a.element.queue("tabs",function(){s(g,i)});a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier.";
-d.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(b){if(typeof b=="string")b=this.anchors.index(this.anchors.filter("[href$="+b+"]"));return b},destroy:function(){var b=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var e=
-d.data(this,"href.tabs");if(e)this.href=e;var a=d(this).unbind(".tabs");d.each(["href","load","cache"],function(c,h){a.removeData(h+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){d.data(this,"destroy.tabs")?d(this).remove():d(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});b.cookie&&this._cookie(null,b.cookie);return this},add:function(b,
-e,a){if(a===p)a=this.anchors.length;var c=this,h=this.options;e=d(h.tabTemplate.replace(/#\{href\}/g,b).replace(/#\{label\}/g,e));b=!b.indexOf("#")?b.replace("#",""):this._tabId(d("a",e)[0]);e.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var j=c.element.find("#"+b);j.length||(j=d(h.panelTemplate).attr("id",b).data("destroy.tabs",true));j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(a>=this.lis.length){e.appendTo(this.list);j.appendTo(this.list[0].parentNode)}else{e.insertBefore(this.lis[a]);
-j.insertBefore(this.panels[a])}h.disabled=d.map(h.disabled,function(k){return k>=a?++k:k});this._tabify();if(this.anchors.length==1){h.selected=0;e.addClass("ui-tabs-selected ui-state-active");j.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){c._trigger("show",null,c._ui(c.anchors[0],c.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[a],this.panels[a]));return this},remove:function(b){b=this._getIndex(b);var e=this.options,a=this.lis.eq(b).remove(),c=this.panels.eq(b).remove();
-if(a.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(b+(b+1<this.anchors.length?1:-1));e.disabled=d.map(d.grep(e.disabled,function(h){return h!=b}),function(h){return h>=b?--h:h});this._tabify();this._trigger("remove",null,this._ui(a.find("a")[0],c[0]));return this},enable:function(b){b=this._getIndex(b);var e=this.options;if(d.inArray(b,e.disabled)!=-1){this.lis.eq(b).removeClass("ui-state-disabled");e.disabled=d.grep(e.disabled,function(a){return a!=b});this._trigger("enable",null,
-this._ui(this.anchors[b],this.panels[b]));return this}},disable:function(b){b=this._getIndex(b);var e=this.options;if(b!=e.selected){this.lis.eq(b).addClass("ui-state-disabled");e.disabled.push(b);e.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[b],this.panels[b]))}return this},select:function(b){b=this._getIndex(b);if(b==-1)if(this.options.collapsible&&this.options.selected!=-1)b=this.options.selected;else return this;this.anchors.eq(b).trigger(this.options.event+".tabs");return this},
-load:function(b){b=this._getIndex(b);var e=this,a=this.options,c=this.anchors.eq(b)[0],h=d.data(c,"load.tabs");this.abort();if(!h||this.element.queue("tabs").length!==0&&d.data(c,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(b).addClass("ui-state-processing");if(a.spinner){var j=d("span",c);j.data("label.tabs",j.html()).html(a.spinner)}this.xhr=d.ajax(d.extend({},a.ajaxOptions,{url:h,success:function(k,n){e.element.find(e._sanitizeSelector(c.hash)).html(k);e._cleanup();a.cache&&d.data(c,
-"cache.tabs",true);e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.success(k,n)}catch(m){}},error:function(k,n){e._cleanup();e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.error(k,n,b,c)}catch(m){}}}));e.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},
-url:function(b,e){this.anchors.eq(b).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.14"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(b,e){var a=this,c=this.options,h=a._rotate||(a._rotate=function(j){clearTimeout(a.rotation);a.rotation=setTimeout(function(){var k=c.selected;a.select(++k<a.anchors.length?k:0)},b);j&&j.stopPropagation()});e=a._unrotate||(a._unrotate=!e?function(j){j.clientX&&
-a.rotate(null)}:function(){t=c.selected;h()});if(b){this.element.bind("tabsshow",h);this.anchors.bind(c.event+".tabs",e);h()}else{clearTimeout(a.rotation);this.element.unbind("tabsshow",h);this.anchors.unbind(c.event+".tabs",e);delete this._rotate;delete this._unrotate}return this}})})(jQuery);
diff --git a/3rdparty/timepicker/css/include/jquery.ui.widget.min.js b/3rdparty/timepicker/css/include/jquery.ui.widget.min.js
deleted file mode 100644
index 39ab91a0963..00000000000
--- a/3rdparty/timepicker/css/include/jquery.ui.widget.min.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*!
- * jQuery UI Widget 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Widget
- */
-(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)b(d).triggerHandler("remove");k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){b(this).triggerHandler("remove")});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h,
-a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.charAt(0)==="_")return h;
-e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options,
-this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")},
-widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this},
-enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
deleted file mode 100644
index 954e22dbd99e8c6dd7091335599abf2d10bf8003..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 260
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEr#)R9Ln2z=UU%d=WFXS=@V?HT
z#xG*`>Yvsgk=}99w^d^D^d*@m74oMo<%#FcopJf?u00-~YVKV2wzrI*_R6;UORMea
zBFVSEnN~eiVA6V&z`E)YLz5Aok^D)In}Yn=OzDpgR5Wv0XfT8pOkmV{sKAJ-PO9#T
zZK}IXj&Q-V!U)!LcB_3K<j6=ku*!%uXjy#leKdQ?`ZvP&RiaPVOzxQ$`O)`M(6sLS
yN%J;Y?DO0<r7?ff#!c6LsA*2U`f2*?C%gsKpMo6zvorv`#o+1c=d#Wzp$Py>0&C*{

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
deleted file mode 100644
index 64ece5707d91a6edf9fad4bfcce0c4dbcafcf58d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 251
zcmV<X00jSuP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70002ONkl<ZScUD^
zT?&IR7(~(AY#^)6!n1<<Vj)fQYm^M-n@5r1C}@~h2;ohZ7-N3vC*J$+J$LlEJIhL0
z?fU|%;UEDj;@||T;sBg74hkR1O4$<++XU{$LE{Z7;GhCj!9fA2go6yIhJysCh=UWT
ziUV-UI2ia*&y+p!utUI|$6*(^`>bvPcjKS|RKP(6sDcCAB(_QB%0978a<$Ah$!b|E
zwn;|HO0i8cQ<lay$(1s&O|n)t8rvkbvR?jjlN@>j@~)s!ajF0S002ovPDHLkV1oEp
BYH0uf

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
deleted file mode 100644
index abdc01082bf3534eafecc5819d28c9574d44ea89..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FsY*{5$B>N1x91EQ4=4yQY-ImG
zFPf9b{J;c_6SHRK%WcbN_hZpM=(Ry;4Rxv2@@2Y=$K57eF$X$=!PC{xWt~$(69B)$
BI)4BF

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
deleted file mode 100644
index 9b383f4d2eab09c0f2a739d6b232c32934bc620b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 104
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnour1U*q978O6-yYw{%b*}|_(02F
z@qbE9)0CJMo;*v*PWv`Vh2h6EmG8IS-Cm{3U~`<YvxSSFU3)<QP%DF{tDnm{r-UW|
Dvd<uf

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
deleted file mode 100644
index a23baad25b1d1ff36e17361eab24271f2e9b7326..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouq+C2*978O6lYjjF{IFh)jg74>
zFlmZ}YMcJY=eo?o%*@I?2`NblNeMudl#t?<YIry`QK*OGr~otD9plAEGz`5G6d9zp
Wa55e{GUW=;JO)o!KbLh*2~7a@&m@!p

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
deleted file mode 100644
index 42ccba269b6e91bef12ad0fa18be651b5ef0ee68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouqzpV=978O6-=0?FV^9z|eBtf=
z|7WztIJ;WT>{+tN>ySr~=F{k$>;_x^_y?afmf9pRKH0)6?eSP?3s5hEr>mdKI;Vst
E0O<Z9>;M1&

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
deleted file mode 100644
index 39d5824d6af5456f1e89fc7847ea3599ea5fd815..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3762
zcmb_eYgiKKwx-=Q?P<E4nMM;$eWu2m#PU%`&Ae^LOv^6gctJ3vM8!lUG!aCxQ#0eJ
zq?xIqDJi9<fFp>di0+w!yaC|_1uvA>yaxz|iX3eB<LqajpXblFzRUBi^{w~$)_UKp
zpDz0D*=4#5008Vc>v#HR0ASmSVIKMS&kf`CSAV4g0DJLgPkRO79xj%J<(hH6`bTGj
zrr^$JeiHJI?;s&<5pRw-^kj}=E;X0OX+pgz+f5GVt0NQv_gbu0>-8J+F$O>HpW?Lx
z+YFO`CV&6VV9fsEwG#js0_-|v*!ujZ*M=jfo457?0Do-z<^}+8bI+qk+W~+$zz%Z&
z;L7&@&ns`l8Ofh*Wd<Cp_>U0pO%RP^?Xa_h7I}7K#}4Xt`s%-(m-enaPWX<H>$O&-
zX~a1aOzn?!r?5wJVBNPJ_o8-(9Fz<_c1LYGxUl(E+Wdx?wkNHH2T%eWq9Kz00h#RB
zYKI~=a<9_QqC^n<>hyWlS66waWgyAP#t&TfTWP=Sxa)ukRY%j7WH}(@r=B^W_;b&M
zRzPYsb*j^Kou%%`K6VP+dKtR@x~qEHq4rXMxoX-gcSf&->lMY%TMXF!Gw_A)(tp6}
z2A%kN3twbr%KyUrrmw24V3d%wzK<-q(M;MTr41}un`P!!xejADEv_CJ{CTif907B&
zEP`pDJIZHVgnmxh$EZnBOUxz~Ap+ZzKbFmg39_n-)$wY!Q@i~5aGmHbN7&*gk<HNQ
z!$-sS))5(#?qPW$1C^3#;cFvQMWTd)d(I_4awE^ZjGC%XcnSGez>q9zWgV|2(Zhxl
zoDqJp&MxW(qX#C@oF8L)*r$RdSjVFSc$%z?*9%YoZ6sOZ!vtxXtBM<*r82<p7}?1@
zveQI&tiNm{;57jipQbO}b?9l*l4nGAT4Y=-w()@*#J1?%2{)nY^{|NO=xM)s?jR6<
ziJ!fSOOPs*$8->vyC}_Eiz1PJ2L$bttko`=+fH{Ne@G#lMDxkKt_y)O(J5&Ak)w-I
znm!vzYX3$kLDG$hOp-KJg~7}M;73BFWA{!a61fe?NJkjR_}Xw+*`O0=AGg7&dU<kQ
zA;d%-zM*iwS2t8Y)Gu@JK&A)fV=HHvbW`6mV+EZrtJSauApMCndBS~F>A`A?9`whW
zM{fkFf`G`P^9j*|-q9KLvS<191z9a^mK3Lss}W8O=sZ}N$V4Fh*SWF5NbZQ>p{0>$
z0pe}d$*s!y<I6P@1-n$GE>*R&NSXbjmld6{4Y;O89MuDTK0Hn0C?QdL9z1qGegXs!
z7$MIGkPkwdHF2os-Z-e85B?5An>yc|m<}>!Iirg%H-<NQ%ws0uIi51-a5phDmp{k5
zD(zjPC;t}@{w)+0&{l~FS*>%F11XY{{>@kgL>a#6fM9JzBE&an&F>eWh|b0^kJ<?n
zs=7WyuX=fIhvAjTTX`c}HUH)bTTI;OJGlyB{(NK&G;Htmn6^?c?TaAsOV}uBUtAa>
zNBM5*nCa~(xwn~rG~<cfPp*ub4V(WF)lGbJpS(|MvAA83yV}}9bfbt(>>GSG9mz3h
z9F~64y}giIrz^lfl|_5HpUsG}?Wpr*&f?bS=|9biqivN)-a~u>uK<{Lfcng{663QL
zLXzO@*N5)q4C=j6E8nC+P%lEwI#~0wkt;M4Y8!+DYzN2rBuYao1*HRIa^NC9nFeep
z+ns5$X9Bh48S-`ss!k&!J#Ddd=j1O-9}?`v(B|<M1@-U18t+Js;ZNHIk3$u$U;Eyu
z3exyGipUQbO;S|Bzp(hX{&!NB@oq*gb}e^)68}5#!kH$BhK<@5!ubu^XDa&d1C#@|
z3yY}&(~QVLCVdv){)I_ECxKsIlmW8LZ!;=rtk4ZaX!xm*=*Z(|P+Uqf*Rg<I!Tau&
z85{4>>R7wD97BV;nK~quUHx^mj^G6K2GZ1*uSN?iLm!7vHB7_1^TGbKhmnK+K`GYA
zocp2=on8LxJH^`7^1ch0ft(MTU$vJB!R@gQ^R`qoX>(=iY#u++3K>oqSpG={?#YVw
zp3m99FXk^~<6#X9X1oKYXEH%8t2btG65(u0zF-J)^>8dj0Evc+9_Bd^Y)k9AfW~FV
z%iDV(ClS6)TC7eVzh{ml;p4cx8)$TV&qhRWp+dqiw>i32?1;5d>HLrNj=^OdJ<}L)
zWxqw8aFI<~_TkMDQHS?`z+KQ?+{ASoy%}RBu6i9?BXbh%OEx1OuZ}?n(VjrT(!B1;
zQ!#WA0NBx=^6rJrFVsDCuT4)OTG<Ikaz*O8tFTZ)QL^`qbYu)jq*kTD>zZ3$Z4Yqz
z&c9+7%g!%zxtv#p2fhHbo98KBwfE<e9Z<Yr%uRWj-5Hd3hTYY<&ve`je8y8RV)knu
zYCT0K`*JrRv<nx%jAf>&Y(&2#=}qEEU`ECEjlCp=X^_tIoMx>%kBT5k)^c=zyV5w3
zc>DLKY6%=y0igWi9B@4hB}bR6K|+jYBt+}i6Ld|b`*s62c6Ge?zGYvdW)=p90~$Ad
zxGB>c<3Dy~hPJ#vNXierOl41xBn_0L<5NhK6JO-LvtS&Z{xjGKfIC6*9%*?tv*?+!
zv;Q{?mHN2b|3DEJO}R9w11ZT5QVC(H0u|0n9cVK_@2r%C<)OnZ(3aS0Ux^6G$ja*<
z9R~o~9XjhPL)w@vYi6r;H$tR>wW`0-Z&Qed`X0LZY9-~mfso!@dt?5Q;@|K6$mAB&
z$J41&y)<{N;QATPeU}BC{lM_<D4HZA)B)i-;gJ1pwusq$h>@-LlQ2hjX;}6~qdglT
zGm%qJm*F^in=w*?j;@C_P<fNuR>CMnXK5Fd^wXV**pZOdS1KbSJsC~s#R;tmXIMb`
zHB>sx<rNDl@4+*>Qg&E5Yf@}d#~Z9D4R{}ZpLm7S=bY0x#k<=H?=R+=W$=Bm2aU*n
z)qgD*0#4>GGlHhQ`bx#k=Njc;+9D@{F5`xI^tMkBf{XIzwB=b9KbuuLF7jMTR~Mwt
zN#!)9J4&^V@JRe9Y!b2!;$rCLPWZfG`C;Qz`u~TJdCzv->e`=R8uHX_2{Fp&pWJ*h
z#A60&bY(j(^P@t_`_pktBV7{tFVoeNWlNA|zgNr&DMjJ_!k2%2s2~F@la$M6k%hWi
z7}}hoDuoaN7?lchVk@4DunpEIS$72&uuF&F;&4uhC$L)6IzHHUryR9emzpxwsRXmj
zfc}pI#oRCB7Y1;t=*58Gsv7x3PGuW^spn6V&dWf#?*TQ0(|*rr=EeE1o~y1<q=XbB
zH7M1n6!fSD?pm#tnQqCt>wyQi%)e*oX6iX@$m0F1R<jp2X5!4xYkF7J+;bthC|!^_
zfGt{`v`5@+vH^moN%0^eXsq^fv|D%^4d2~y%?^q=-Nv+wR>tKUT0vgg!8^fWhYLqS
zF@EOpFld7>f^kprb~YwMq=^<<pan6S!*H@g7t}eQJLhuWeLGTkT2P+Ck3!Te1lk%)
zt9TCz)oC3>e|gw?QFyf8ck|ZC^>)3c`b$^C>jCB4Fne_1e$Cqt=4Ud#K~~8Nfa91W
zwk17&D?X?4FRzR+5qCiIqPf0};K4$tW$}l~A?u_E=JSe;*f_DO>r{z=U4_<)dY)M!
z7O#mizC+GN&#;)k)vkBU<tXnqP_^|-tGmZcT8Dlxt6Pn?`uypBX@1fVrNePVd#ALp
zF4$80+@AG;7xl5W_sE^yNYES$<C6}`Zb1&JCZx~nYEbc%r#1d%Mn0pgS$5QlwG(ot
z!Za{>S@fZesb{v?YuFlCPRjsT5bxB4@+sqdq}xvvBhTngZ(N1LUCS-ei=5sgE-Tbc
z7HK+A_O23MP@sUoc?I?*ZB|F)&%us|2<oRU<$~ApQ%f%RU*aE`VmGrB<J4ieMCirV
zP_~OQ;txr2WBgPQtAbapRV&BoULc}?@}z*gAAJEFNo(?(iOCZhqe)W78eZ*UvaN@7
zhKKGvt0!}(rjB;qc0K^%h|5n7(;vc+uHx|Dg@=F~<I;s3VT_=D#he%5p2SoOly<_w
z*HKrz@ej3W?Y+xd+RJZ;9WZCGEGI{ETYg8h6;=d~Oi`<7@VfdE&iUPi>O$#G7V$6z
zq>G%6!cu7OEf+_#^A=23Hd6Db9-yK*NQ#<PGnv3oz%Gl*Ib##q`dB%MvY>S+kjJI7
zhLiLz{>zKKtHH>H;B-cALzj`>@+-~?X2aP7ypf9WMf8q0m)wS!Nkf+&R&&zEjFOUx
zlq^>v#VAq}=)?dKRMe+010g9O;qAiaTA4dV+==mw%i3Re)DwZ$Wd5CK1m4Ivy&&Ef
zO8W!SpcgA>zfTGAE!{IPJMhdZ`T4{K#7ndDT8K2&*jf=J8O>H*iDJ}ZK}z|$C3U62
z$nZhk4v$QIYzMaV+0`B8S!=9RSYzi*QG#tp>ZY|lY_`}A-zI7)(tV$B9G-tC#zt8m
z<!M@MT<43;wMNmuo-kSmPm5UQboY7uH(`#(7slpt#=BnL_;t>re~pD7oIFkmIAM=s
zw+Iili%nSC?yks)t~q4lTlZW(#5^yUV@+^KvIuQzZDO^*TBz!<CtQh2rfO<z=TS{H
zzIH*$V56H0{EnCR^XrG!ZG7AjD4r}Q(t2l9(P&QU6M<44;NxCby12gE#~t-zco3A+
rQq8KZ5e*fKEaO{0Ke0s~Qmy6Xh5m%FO!wV}CE%>j#nX%*uiW|{x9q0w

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
deleted file mode 100644
index f1273672d253263b7564e9e21d69d7d9d0b337d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 90
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l%l7LV~E7m<R2d&AFo$qV`FPm
oboulDzr6KyA+fs7hb{~ZQx+&qVC9&67pR!Q)78&qol`;+0H8b=ng9R*

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
deleted file mode 100644
index 359397acffdd84bd102f0e8a951c9d744f278db5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l!vE_V~E7mtNjN#8yp0f)nD%C
z{k^&2ZZH4W#qke67#j$%IepV*`yn{#P|600IVRJjChwXe(ssyZ>xPQ=F85a&M@g_{
d|GeK{$Y5lo%PMu^>wln`44$rjF6*2UngE4^EGqy2

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_222222_256x240.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_222222_256x240.png
deleted file mode 100644
index b273ff111d219c9b9a8b96d57683d0075fb7871a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{;aID?ElVL?Rdohw{Ucz9r_YL7=D6<&8F>PmYTG^FX}c%
zl<zAi(m>GE{DS1Q;~I7<vD)$Yj(fd>-6ze&TN@+F-xsI6sd%SwK#*O5K|pDRZqEy<
zJg0Nd8F@!OxqElm`~U#piM22@u@8B<<ecI*S<egUH7}csd8!)jLBD2s`p(8v&--KE
z71^q9MglFywkSt_5FCr2F%o&UR(5j7-O>moyKE%ct`B(jysxK+1m?G)UyIFs1t0}L
zemGR&?jGaM1YQblj?v&@0iXS#fi-VbR9zLEnHLP?xQ|=%Ihrc7^yPWR!tW$yH!zrw
z#I2}_!JnT^(qk)VgJr`NGdPtT^dmQIZc%=6nTAyJDXk+^3}wUOilJuwq>s=T_!9V)
zr1)DT6VQ2~rgd@!Jlrte3}}m~j}juCS`J4(d-5+e-3@EzzTJNCE2z)w(kJ90z*QE)
zBtnV@4mM>jTrZZ*$01SnGov0&=A-JrX5Ge%Pce1Vj}=5YQqBD^W@n4KmFxxpFK`uH
zP;(xKV+6VJ2|g+?_Lct7`uElL<&jzGS8Gfva2+=8A@#V+xsAj9|Dkg)vL5yhX@~B=
zN2KZSAUD%QH`x>H+@Ou(D1~Pyv#0nc&$!1kI?IO01yw3jD0@80qvc?T*Nr8?-%rC8
z@5$|WY?Hqp`ixmEkzeJTz_`_<!oE0dsO`po1=$i_1k<Um_}caMZcrpqA*x-}Rw(fX
z3Qyh8;-4^Fe)UICI@ayzmyV?48GbR;1*s>wsSRi1%Zivd`#+T{Aib6-rf$}M8sz6v
zb6ERbr-SniO2wbOv!M4)nb}6UVzoVZEh5kQWh_5x4rYy3<sHrHJLqL+DcLT5`t$L@
z5_J8#H;PWO1GW@oId1Y>c!871NeaM(_p=4(kbS6U#x<*k8Wg^KHs2ttCz<+pBxQ$Z
zQMv;kVm5_fF_vH`Mzrq$Y&6u?j6~f<juy`C^I0O`4mfXK0lrRY*VoeJX&k$9aL;Hl
zlp63sf~-1z_419)A8^j|LeQSmK&T8R7nA=Ki3^H;YaeL&hF6>tIV0Yg)Nw7JysIN_
z-_n*K_v1c&D}-1{NbBwS2h#m1y0a5RiEcYil+58$8IDh49bPnzE7R8In6P%V{2IZU
z7#clr=V4<zT-gP2u}DD>yyrRe@oXNqbqo^^LvlLE?%8XaI&N(Np90-psU}7kqmbWk
zZ;YBwJNnNs<m6GqjV2(cCX2e+#tSOgIGm~J&Djknhy!e`&p)NTq>$~d!mx9oMGyT(
znaBoj0d}gpQ^aRr?6nW)$4god*`@Uh2e+YpS@0(Mw{|z|6ko3NbTvDiCu3YO+)egL
z>uW(^ahKFj>iJ-JF!^KhKQyPTznJa;xyHYwxJgr16&Wid_9)-%*mEwo{B_|M9t@S1
zf@T@q?b2Qgl!~_(Roe;fdK)y|XG0;ls;ZbT)w-aOVttk#daQcY7$cpY496H*`m@+L
zeP#$&yRbBjFWv}B)|5-1v=(66M_;V1SWv6MHnO}}1=vby&9l+gaP?|pXwp0AFDe#L
z&MRJ^*qX6wgxhA_`*o=LGZ>G_NTX%AKHPz4bO^R72ZYK}ale3lffDgM8H!Wrw{B7A
z{?c_|dh2J*y<H{`M3l!HEtOc{;H{lJx}(C|*lvPQ+RAcV`>8b04c37OmqUw;#;G<*
z@nz@dV`;7&^$)e!B}cd5tl<nF(??uM#|`*5pIKe!DEUl5-&9M=s_3Yn@-P(czyPQ~
zTU3I3bk%z<*w;9V(oQvt^2H`kBAW;=2oA<L1<qVIK(Z{Hk@5&E&_2mS+|}+?g@FBu
zK+e=OWg<)e?RO;llNw00>0{g(Q>5_7H^@bEJi7;fQ4B$NGZerH#Ae1#8WDTH`iB&)
zC6Et3BYY#mcJxh&)b2C^{aLq~psFN)Q1SucCaBaBUr%5PYX{~-q{KGEh)*;n;?75k
z=hq%i^I}rd;z-#YyI`8-OfMpWz5kgJE3<X7ptj0dmPk5UrEf%nVD%<Giiw4wVh!K0
zFjy-VAnpOFJIDm=jqqahP0Wam<9qv4UMIazx8J<YJz>I!3ean6=UZi!BxG7i(YBk?
z02HM7wS0)Wni{dWbQMRtd-A)_Az!t>F;IwWf~!*)-Az4}yryNkz&9)w>ElA80Oc`6
zHo#9H!Y3*Qx9n@Jn)!w6G^hb;e_n8zpIyXCN`JFkPc)^Q?2MsLNFhMgrcZI-<#1ne
zjH;KFf?4eAT9<t<iUSC5BsF-<$q+H@@j%Yk>mQZ}ZfHLGA#d%s;SZK4p0FwZT2S^{
zQ2BG1xJsbK6?yrHTjJi|5C0u=!|r!?*4FL%y%3q#(d+e>b_2I9!*iI!30}42Ia0bq
zUf`Z?LGSEvtz8s``Tg5o_CP(FbR0X$FlE0yCnB7su<mcL>DPmI2=yOg^*2#cY9o`X
z;NY-3VBHZjnVcGS){GZ98{e+l<X|f4%S*+x526SE1mJ%6M<Nt*!}czEQf{?H1U0br
z^Y7cXNxH@=Ve^#j3H@BPU>q~O$u6pEcgd0CrnIsWffN1MbCZDH<7c^hv+Z0Ucf0{w
zSzi^qKuUHD9Dgp0EAGg@@$zr32dQx>N=ws`MESEsmzgT2&L;?MSTo&ky&!-JR3g~1
zPGTt515X)wr+Bx(G9lWd;@Y3^Vl}50Wb&6-Tiy;HPS0drF`rC}qYq22K4)G#AoD0X
zYw$E+Bz@Zr^50MAwu@$?%f9$r4WHH?*2|67&FXFhXBrVFGmg)6?h3^-1?t;UzH0*I
zNVf9wQLNLnG2@q>6CGm>&y|lC`iCFfYd}9i%+xkl^5oBJ?<;aneCfcHqJh7Yl5uLS
z9Fx-(kMdcNyZejXh22N{mCw_rX1O!cOE&3>e(ZH81PR95wQC37En4O{w;{3q9n1<A
zPC{;HRD3#A!@Lk)+k!~onQ0|-U%#uGd$&L?ZhNC&R)V(mb`NhUqrYysoMQ;Z)sq!y
zW_WwV!+jO*nGT8-Hx_JVmFK^=>t&;p)D%&Z%Nw$gSPa!nz8Slh7=ko2am)XARwOWw
zpsz0~K!s{(dM$NB=(A=kkp>T(*yU6<_dwIx>cH4+LWl282hXa6-EUq>R3t?G2623<
z*RwTN%-fgBmD{fu*ejNn)1@KG?Sg<bw3hQ~jCP9_dLp#J9Fi#nX3wGv<cLwQ;8x0`
zA<%pA%E0S;<5FJhw8e#?n&IA5g19Fv!v7YC%Gxqd<x1=+hht1t>*8z3hYtkQJQjB6
zQ|x>wA=o$=O)+nLmgTXW3<g>_6diA;b4EY{*i<HxX2Q~PA|R-tJ=V1~4KO3h7H~CG
ztNFL#J=a@4Q5K7Ogvj-+3N_IJUjc}x34}a7@bDE3!)Kj4s7ME<v)`yP${V~G_J@6l
zp{&i)CGxx1)X`lnwc}#g;g<(rA1#7Ez8@J}tuMD3bB{Wifbe~LWT0zYNjgb_qn|+G
z2TCDZw1rV|wPx@~-H8<4^MGxfR0aLq+_k+{JT<mckxWLsw*J%G%YH0>*R%6dO2EMg
z@6g?M3rpbnfB@hOdUeb9<OD{Zt&T^7p>6=~I?OIA3@BWAGmTwiQ{x5Cqq<8c10L!P
zd@Qk^BseTX%$Q7^s}5n%HB|)gKx}H$d8Sb$bBnq9-AglT2dGR2(+I;_fL|R4p$odJ
zllfb0NqI)7=^z~qAm1V{(PkpxXsQ#4*NH9yYZ`Vf@)?#ueGgtCmGGY|9U#v|hRdg-
zQ%0#cGIfXCd{Y)JB~qykO;KPvHu|5Ck&(Hn%DF~cct@}j+87xhs2ew;fLm5#2+mb|
z8{9e*YI(u|gt|{x1G+U=DA3y)9s2w7@cvQ($ZJIA)x$e~5_3L<r=v~@?aZ+642@!3
z&nTpp8p^rR@IEsq`uhzfD&i>KFV~ASci8W}jF&VeJoPDUy(BB>ExJpck;%;!`0AAo
zAcHgcnT8%OX&UW_n|%{2B|<6Wp2MMGvd5`T2KKv;ltt_~H+w00x6+SlAD`{K4!9zx
z*1?EpQ%Lwiik){3n{-+YNrT;fH_niD_Ng9|58@m8RsKFVF!6pk@qxa{BH-&8tsim0
zdAQ(GyC^9ane7_KW*#^vMIoeQdpJqmPp%%px3GIftbwESu#+vPyI*YTuJ6+4`z{s?
zpkv~0x4c_PFH`-tqafw5)>4AuQ78SkZ!$8}INLK;Egr;2tS18hEO5=t;QDmZ-qu?I
zG+=DN`nR72Xto{{bJp||`k}-2G;5#xg8E~xgz22)^_Z;=K|4@(E&5J)SY2of=olcw
z5)@L)_Ntcm!*5nEy0M9v0`S33;pO4T<mv%0Rx6?c2H~TA%zOO^T2$@D<Cut3{ae}|
zAT@Uzc>N;>4(Z+<j5j2DQ*r;U|6a;YfP1jST$I3mSn3aNn!?<=B-XkzG?hQH;@bu%
zmFYDDgbC%Wt{6LBrs%88L}deF9pse}dmIp4lmp@Tir9q)JKESa=h>19p_0>u#e-vE
zXCU(6gAvu~I7Cw(xd%0e59MNLw^U37ZDbsBrj%eDCexw8a3G`nTcXVNL6{B7Hj@i&
zbVB{;ApEtHk76q08DJ48dSxd$C(;$K6=FpU<~l9pVoT9arW^Vu{%Bcn4`eIpkOVC|
z$)AKYG_`ypM{0@BUb3^9lqi_c?ONH|4UJMJWDowMVjacycX7}9g={O7swOB+{;+?;
zjBo!9?+nd)ie#x5IbFW-zBOo0c4q@9wGVt5;pNt`=-~Zgcw#*`m($6ibxtZ`H=e=}
zF#GZ~5$%AUn};8U#tRem0J(JTR}<qii}wxmUzVwVIg2$uE2;GN{hhT&GE1i;_fi(_
z9KKXP)ds1Q)XnUhr?uXO-HbKE%5f%+-C>d4vR(dgK2ML~lZsPhayJ2h1%sD4FVst|
zKF)+@`iNzLRjg4=K8@**0=5cE>%?FDc({I^+g9USk<8$&^qD~@%W0i4b|yMG*p4`N
zh}I!ltTRI8Ex$+@V{02Br%xq#O?UlhO{r8WsaZnZCZq0MK9%AXU%MDLT;3=0A9(BV
z9VxxxJd7jo$hw3q;3o?yBLmA=azBUrd9>-<_ANs0n3?-Ic*6&ytb@H~?0E(*d>T5n
z-HiH2jsDf6uWhID%#n>SzOqrFCPDfUcu5QPd?<(=w6pv1BE#nsxS{n!UnC9qAha1<
z;3cpZ9A-e$+Y)%b;w@!!YRA9p%Kf9IHGGg^{+p`mh;q8i7}&e@V3EQaMsItEMS&=X
plT@$;k0WcB_jb;cn%_Idz4HO$QU*abf4}+wi?e96N>fbq{{i|W0@(ln

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_228ef1_256x240.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_228ef1_256x240.png
deleted file mode 100644
index a641a371afa0fbb08ba599dc7ddf14b9bfc3c84f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{;X{3=KszyL1xbWEgT(ahrR?5hM!<zvuS&nr6z6fi@J>w
z<@?HsG!Qg3zaV+-xQ3ldtad!U<6iGz_enGH*2akP_r)o1D&8p^5M)<i5Kvm7+w+1d
z&*|KAM&6N6?%o|XKL7xDVlB)}>_c8IIj6Wy*7HJo&CBLuo~nj>(63pZzO(Vv^ZuB3
zMYigjkwA;FEy|G}1jpiMj6|NTm7Uyiw=@FDE*nX<>jR!W@9XIyf%$Fd*J5*D0Z0Lm
z9}ZQxyT|x5ftNy?V>EbJz-K>bV9gs9RaXUP<^=;e?&Fqxj;6{ieR-a-@H<J_4GiWZ
zaVu(K@aJcf^w<j8VA*iR3{E8n{m4z5Ta=$%rXkgQO6v#}L)oynVyGEE=_51-z65?H
zDgGA81aw}gX`NgF4>ycA1KMKhql8GOmcx<Hp8QKqcf*>wZ?_-(3hMK^^a*(gaFvBH
ziIC!fgH4$W*NbKIaY&T?%&13``KbD@S-0`xQ%v3TV+B!;RC7O!+1a9QCA$H@3tR;k
z)SSoR7(s4)f{zM}eWgFN{(ZH5d1O}l)f$ruT!)Q&NImXyZsTzOf9TwctcSfr+M)aJ
z5otO+$jvm-P4)ykH)x|cO5xeb>?!`qGw$(>&axqLL6yoB${vsMXgL_-bz@2J_tS92
zdvZG-+vKl@K4Vr(<X8D7Fm5%eurE#<YP<1YLAHb!!E~xCzIMI68x%=Yh-w$L6-vB;
z!c#Z2_$LgPU;Po3j&(cwr6cKhhF=VILF!3vYQvfMvLYtV{!ir!NUtS|shjnm2Kl+v
z9M*o<>EL{WQt@Z+Ea-hxX0}nTSZxnpi^#Kn8Ox8FgIS|hc}KJQ4tm*HO16ui{(O9}
z1YN)GjiQt6fGq`Cj+^`zUf?8hk^(T{{cOQGWFP98am}is28A!5%{R#ENv8fCN!j69
zl<vTXm`x#Aj3pR~5$!tw8x6HJBT;veqlI((e3l5f1J0XQfUi^9^|f?)8pp02+%sAX
zr3QSEAghjFy?kTy2b}Y~5VYqs5GsSo#pFLl;)0^z+6P*`;T5Mu&WLv=bzI9Q@9K!#
zx3ne5{kTux3L#b!(t3OTfpmY0?(76nqT7xWC3Cn`hU1f1hZjxb%CxmPCafJTzecbo
zhDHzEdDz$vS9U>MEK(2z?|BY=Je$XD9mB-Kkem*(d-j^9j$2#6r$Dz?s)-TCDCGCs
z8>6Pvj{Y+YIeFA@qY22V$)awy@q!9A4rgk5b9TcC;s9Ig^G|6nDP+5=Fzg&?(L=vc
zCbGd>fSu~@6!94td+o#d@sid<c4_^>!EI<?7QBi6t=$bf#g{8RUCj>X$rx7*cawe6
z`dScJ+$HssdOjE)O#Ybs56vm-FQ$7yuJJD^Zqk%hMaIgAJ<2yb_MFQte_i;62ScT$
zpjifYyR_E=rQ+>H)pmlr-Udzg*-!|ssw(D7wJvC+Sf8bb9;;q8#z?0p!!bsd{wy|5
zpBaMHE-Ve>i#LLjHRaMLtp%9&(HCng7Sw96jVv!#0k%?F^K7&=T)mnYn)D9(i;4x5
z^NJTJwq~pv;kH@#ejTd*48~(J(r6j34|m`h9fEDj0im)~+%I5XphWymhT;_Zty|Q&
zzjPg#-ufAHZ<omf5#{klOC=UKcxxw*?x^rKwwoZ7wz3@8eku)ggLNRn<<KIdajH#H
zeA)T=Seh$G{X;Ew$<Zx1YdFKl^buFmaRdI%XI9raN<LH2H`S7|Dmv<?JPd_9FaRph
z7M0*0UG<&|_BGC;v{TKZe6h)s$R@%If`c(mfiu?)kSq&lq&xx(v`_L7ceQ&}Az*(Z
zkTW$+naI+A`yGk?qy`dg`WSb{6e&FN4RX;O&+frr6hjc+3<Yokv6*p`M#SE){vkzc
z3FL#%2;YdX9eq<GwL48ff7Y!gs4B@Hlzc$A2`aV3*Atk++JX5HDY4Bk;uB4Yxbu<X
z`L&1ByqMIqI8t`UE|_LH(~F2;?|){*%50r1sI9V=C6bO-=^K$CSiOmlVqzhvSi?6g
z4AzPTh<iZl4l)6IBfJ=W6EkAt_}>1M*Gccw?Kf|8Pnhtb0`!{N`Bqsa37J+>wC$!e
z00k+2Egzz;rbcWoUB%Jvp8W1}$XD%e3>4y;;OZ1ccT-O#uW6Ys@C}Pa`nZrNKzR(2
z4e%3)@QI4SE&E!lW`5y14QhbepBG%_XBV-O(%<aX6HVzRJ7ee*QV3AB=~LWyIoy{V
zqv~a)U>5tj)@9#|;sC-MNev!zGDHk}JdpGC`iJF#8=8-P$Xoku_=Dw%Cv3{U7L>gf
zRQ?<$t`cZ*MP5GQmbmx#!+*!zu>0MewRO9GFGS{b^m_fJ-N0?j@EqoFf>$khj+E|@
z7r3We&^tR^YZrxKe*d<YJy4G(9mh^GOxZ8bi3n#Ytos{m`t{%)Lj8wW{Y{jV+Q_6T
zI5_MMSa-xsCZ~p-HRDCj#<#0BIhacN@>22agXqCO0l44&kqCv{u)T|(lv`~PK@DvE
z{QI_TlCH5z*gR!>LO)k67{^R+vWx24U2^2ODXpwT;6y+6+$5m)_*w4WY&#do9dCeE
z)>p+Ykdhq($DhmMiaYXey!@N%L26uz($aJ!QT{B^Wu}U$^9e#5)=c+XF9@Ill?ZmM
zlNgHiz*9!vDc&uxOo;ZVxb`Q!Sk0*gnfxWzmbZh4(=%CD%qP?0=);n$&zaW_$UKV9
z8axdcN#AyZ{P)wj?V{P}vM)YY!>6@}^>U+iv$`9>nMTCPjN>z%yF&3yf%>+T@0vh4
zlC8Xa6zeo?%=o3}M8{aebLHcO{^1Ar8qiM=Gquf?Jo)q5`-+?sUpg?QXyEUpWSm+n
z$K-UyqkI<R?*3wTVfWE~<@2<uS?-MVl1;jzAA8*iL4xsi?b?BNi<UXgZAh$t2eX2O
zlaSjP6`u~(FfWAHwjdICW?Bi|*YB$4-Yt-e+urDxm7s0C-NReT=&xHY=NLk9^<)K_
z8Qvc8a9@Rcrh{U|jRjj-<@xXJdfDhCHAU3q@`fxV7DF|YZ^rH=h9J#M-17gO6$#8E
z=<ACLP@x){UQ68&`mEVXq`?Cxb~%;JJ<xQvIxsey(BZq&!Lur1_nVgz6$w$lK^&jz
z^=yq5^Y*23<@W0Z_KKzDbZLlkyC5J9t>wHLquru~o(OF)hhz$Y*|X>ZIbswnxRvr~
z2=rdOGVuD|xRlpAZE<0!X1F(%Anpl^@V^D3vbM}qxe|NI;TTiZy7(IM;R69RkA>a&
z6gwYE2sREzQ_LHmWqB+ogMk(fMaSFeoDq-!HkFB_nXt5+2ncFuk9BQL1I&oB1zZi)
zYW{6_&-Ip1l*OVRA##1ILQS;5R{-K^0wGTiJbVSi@LA^$D$;@J>^G{6@&+%4{b3(s
zC~LEHiTv(0b#zxt?YJ0r_~pUZM~mQ(??(n#>&tD%+@nq=Abj5*8R!~Ul1`G~=qFJ4
zfl|m8ZDCYgtr`4LcOpgiJYX9qRY5;DcWti~PmS$VB$E-Zt^f4)vLDOe_3XTq5^ylW
zJ9PKm!V-8sAOJXnUfuFNIf0R9tK-pNs2hO04zr620}5B(Ok>yB)Of-3sP59qfQNbm
zA4{w!2@cB;GbR(~szVrbO%(w=5S!X`o@o@x++wbN_tMPT0V<QhG{UeJ;8({%=z{L*
zWd0UgQl1fNI!H$Y$hXK#w3!Gvn(74Nb)t*FnucAAe1;`Z--B03CHyB#2gq}g;qs~I
zlu;^<Ox+<j-;_m5iBxJsQxuqvjs7QOWMpota<0)9-Vv;XHb%w=>c)*I;Fgsbf^*g0
z2Di?HTApwKq3+YwfNsqd3iP%{hyK1iyuVZc@*0tO_3+N0#GFsz>8MjeJ2UJ%L!%hi
zGYYAthH`E+ywA*u{(eJ=ia3h*%k?779rk-K<0VZAPkl;TFUbmei|$fqWO8!_zIvqt
z$ly$VrlH46nnpX~X5Yk0iBJl;=WuA4>~X4-f&K0yWf42h&0b30t@NYX$7egQ1Fp!a
zbui-D6cWCWV&|R1CY@G8(qOmWjWeX3eX7UggZPGimA}soOuQdXe4uZ#2>5zN>qlI0
z9xk}lE=tNpX1m6*nFr2EQ3xs79!^sCldDJYE$m(qYv3q7>}1R7?iZW7>$~*%zKaC|
z=$N?ME$>#+%T&MZC`dW1wUl6Z)JgyCn~V%K&i0H|iwE%$>xsZW3tTfZxIUe<xAj&4
z4Hz4+{_ST0nym-LoHhM~e(110&D!U_p#In^VLIn{J!Y#z&<>Pci@p;cRu|d=ItIwF
z1clVHy{hH?@SD|(Zfqi^0DQ1hczHN7xq85h)rzQqLHMX2^IkuK7FB!kI40s$|CY7~
zNX^{_UjN8}L%Med;|+=4RNTMozn8KT;2tb77bUPCmioh+rZBfIiM6f_P34cQ__o1G
zWqQp3VL~~pE5?qODf%iiQQ3f42YF@09tQ*$<v=*TB6gv{jy879dA6iNsN{5E@!(k4
z8HhaiU_^B~4$+iH?m^ArL%A5*Efo_%8ySb3DJ2+($#iHi9LOmDmMF7*5N3n2&E!HG
zolrkI2!HM5qnOHg23Q1&UfD^`iFCzlg;)`TxlRkY*i!V9>4v_EKUx;t1KCPCBtgqg
z@+Tn;O)a0uky_%jm+WjNB?=~VyH>V#L!*=l*@OS6SVyt_UEH&NA=?V2stHPyKkVNy
z<J*73J43UcB3bH1PM2@IZw;E0-Pr(2?E_y%c)4{fI(WYro>&jg<#cjros){#ji)dK
z%)We0L_478=HZ8-@xnwsKrWs8)x`MB;(Y`Cmu2c-&SH(vN-F(*e`l?c%+l$|y_AJJ
zhcDGnwLvN+bu;_sX|1<mH)GAPa-4}{cUWY%Y?nWr&(mZ0q~a8r+)V&r!Qf@i3-wZ~
zk29f}K4Mv56>AiePh<L{fUUyPI`J1j9<HC~w$=DnBr|v`eP$5Ka$0AMorz8kwj<6R
zqIF0X>x@u&%P$hf*xE+O=~D?_(_KGWQ!158YL-y9$*6mmPo;Rp*Dl5lm-mVM2i`h-
zM@nxv590_tvMwPD_{l=b$iOm|+|S{D9&P%zeT$GgX6Akl-tfUF>tL@Ld!B&{pN39t
zH>3Vhqkr}2Yul+jb7UiouWVGPNsxX7Ueba+9|~dz?d*QM$ng0DZfO0`7fAy?2yMm|
zcnRzUhZ&IcwgjH9cuU!w+VStYa{p*)4IgBf|E8)sqMYtB2KH_}SfsFq(c9i(Q6S3U
oBo%DI<H*|Oy`A%<=J$?q?|gu`ltGZq->*Kv;w;*%(i9W@e{{5C=l}o!

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ef8c08_256x240.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ef8c08_256x240.png
deleted file mode 100644
index 85e63e9f604ce042d59eb06a8428eeb7cb7896c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{wzI}^MB`Dm+sH{TR1w<4t)tA3_robX4CdCOHJC|7j+vW
z%J-EMX&`87enIluaSc0_SnYUx$GzUc?vrNXt&I`o?~7C3RJ>C-Ajq!3AfU8Dx90^_
zp3}MKjJzYC+`T(&egFXQ#9Ek{*oVAaa!zrZtmlRFnwQPRJXH<%pkK2*eP`pT=lwD7
zifq+4BY_rUTa+U|2#&?i7>PVvD?7R4ZfOLPT{e<z*9Sa%-q+JZ0`uF@uf^uR0+0eA
zKOCxXcaQOB0xyL&$7t}dfX{x=z?wHIs;&yo%nJr`+{Z2X98Hy3`tm$u;dhd<8yL(-
z;#Sne;Lpz{>9G~G!Ls3s8JtQE`jMM9w<tfkOhc;ql-3a{hO%LC#ZWVT(nn|vd<pzY
zQv5BF3Fy2~(>l2V9&Q+K2DHW0M+uQmEr%nYJ^7cK?uIpU-)=wn71ZZ-=@ar0;3^AY
z5+TI{2b(e%t{2PZ<B%x(nNg1>^HKF*vu@+Xr<l6w#|okxspftdv$I9rN_GQ)7q|*8
zs5y_rF@oIq1RoU``$~Uk{rhVB^2n_8t2HJSxDFflkb2zZ+{WSl|IoP?Sr2=Mv_tpb
zBhqwukeg|uo9qd8ZqP<?l)|%<*;D+JXWZi%on=Ghf-03Mlsz8h(Q+`v>&BAc@2BC4
z_vCgww#i=)ea5Vo$glEEVBBg_VPBj!)OO>)f@}#dg6ULOeC>LBHz<;*5Y;YfE0lNx
zg{N+4@lO~ozxpF69qV@VOGnc248Iuag4C1T)P^(hWkpP!{h!JekX}m^Q#b2B4f1oT
zIjsGz)4}-$rQ*-tS<w5Y%xt4vvDzNI7LjNDGL|1T2eU@2@{VTp9rUuZlx!D2{rUJ{
z3A%pW8$~DC0b2^P95?wbyueB1Bn4o?``LnX$Uf9F<C;}N4GLdAn{SZSlT7_PlCs0I
zDBXb%F`GiL7)vk|BieTWHX3ScMxyQ_M+@in`79A|2b?#r0AHuH>uc%qG>%<4xM#E&
zN)7lRK~^2VdiloY4>;#}A!yHOAXEmEi^+eA#05pawGXs>!z)gSoDuI#>bRCq-qjJe
zZ)r=A`*EMX6+)~er1kdv1L^)0-PsAEM7JF$O6G8>496$24lkO<m1%2pOjtWwevM#F
z42>SR^RTfUuIz%iSfn5b-t!##cs7sQI);gdAvqmn_v|%I9k;fCPl0Z)R1+hNQONJN
zH%3jT9sOq*a`LF*MiY=zlSSQZ;{_FL9M07A=In+O!~wR}=bzGEQpk2!Vc0p)qKAH?
zOk{(%06W#)DdICQ_S%Q@<0Y+!?9%#$gWJ%)EO-<BTe}-}iZ54sx|$u%lQFIs?k4-B
z^|c_dxJ&9M^?WcqnEWyMADUCvUrhIaT;pF-+@vY1ij0*Jdz5c>>^YZP{<`oB4~9xh
zL9-0*c4@B#O2ylYs_g`Ky$zb~v!M`NRaMNFYF*Gsu|7)=JyyMHjFC=HhGUE@{aI|B
zJ~ITXU052%7jFb5Ys#fhS_?4kqc7H0EU49B8(Chg0&JzU=Gka#xOz1)H0d4m7ZnRA
z=M^tdY|U6T!fmte{W?_r8H~qdq|q{5AMU_2It1I4143n~xL?4&K#BOB48<w*Teqll
zf9X0fz4bHZ-Y$~|BFf{9mP#ye@YYTq-BICfY&StDZDl#G{Ztz02J1kC%b`U^<5ZiZ
z__Fi!u{2kX`iENVlA~L2)^LW8=_9VB;|Bbj&#bO<lzgV3Z>l9_Rdm!(c^C?JU;tF0
zEh@o1y6Qa_>}#AwX{VY+`C^kNkxhgb1P5cB0%xupAXyg9NO=SnXrJUE?rQg{Lcsn+
zAZKctGLfbK_B#^&Nev|0^fB&?DN=ak8|0!np524LD25=s84BP8Vl(3=jflNp{X>e@
z637Ri5xx;&JNl+XYImA|{;XR~P*svYDEWYJ6I5!6uO~2twFC1ZQevB7#3z~(apxn&
z^J@>Mc`>PJair{yT`<jZrWX;x-v7*qmDxI3P+Mg!OC%kw(l;VOuzC|8#l%8Tv4(G0
z7_1cw5ch!89b^LbMtCv$CT7IO@xA>iuan-V+i%|Ho-pA<1?V-k^R2Q<5;Co%XxmL`
z018t4T0TTwO^w)Gx{9OSJ^9_|kgwX`7%0Rw!PO~@?xvnfUehvN;2Rc;^l>3kfbtk3
z8{j7p;S&{uTlTe9&HTc38q@%_KQFk<&n{vmrN7y&Cz{etcE->rq!6HL)2F!aa=0%!
zM%Bwo!7TQ5t;@a_#Q}sjk{UebWQZ8{cp&HN^$*JfH#8spkhk{R@CVBiPuP@yEhu{}
zsQfuhTqV%rioATpEphMfhyRYbVfVW`YwLFXUWm-===J(byMf!5;W^CV1g~2194Xx)
zFK|z{pm%n-)-DRe{Qhk(d!QaoI*y%Wn6h7<6A{i*Sob&B^y|Spg!&J$`kN>zwUJ3x
zaB$ciu<nSNOim3uYsQP5jc-?Naxj(j<)z};2hoFn0&u_kBM}O@VS5)nDYx1pf*RQR
z`S)$xBwb^buzAY%gnq7CFpintWEa)7yX44mQ(9Sxz=?kBxk*6p@w42$*>*0FJKg}T
ztgnh)ASF8njz5>h6?f#{c=<QigVeYbrKRaeqWoE+%S;th=M#iBteNh&UJyV9DiQ2h
zCovT3fv1eTQ@mSXnGo$!aqUldv6@p0GWkoaEpG=8r)RRRm`|p~(T62hpEIu=ka-lH
zHFz2@lD_Q*`R}K5+eNd{WnX-*hEHn`>*Yr4W_34$GmVIo8OLWjcZK4a0`+Yv-!*}9
zBwKm;DAsA(nDI-`iH@;`=gP+m{lgFLHK3m$W@?)&dGhDA_Z2xOzI0$p(ZJtH$vCxE
zj>+kYNBJzs-TlSx!tSH}%I9fQv)mc!C7X0bKlZv4f&}C3+O-4k7A<p}+mKlQ4rT=l
zCn2{pDn1>mVO|KYZ9ydP%(N1^uisV8y;~p`x4qFXD?!_OyN9=w(O<V*&M}1I>d6W;
zGrT?G;l2v@Ob5k^8w<9w%Jbjb^|H}PYKo}I<qcU#EQV?(-;CW$3_+TixaI#lD-xJT
z(AO6gph7h?y_UKm^jWi&NP`DX>~bobd!XrTbzp2Zp~H8lgJ)I3?l&(bDiWf8gE&6b
z>)9GB=Iu-6%I((+>=jGP>CzD8c0oWITFZGgM!Q7|JrUYq4#^Y(vuDu-a>OWDa4Y4}
z5a_*lW#IL_aVf8L+Ty}c&2VojLEIA-;eQK6Wo?<KawYbZ!!f3+b@4Ui!v_Lt9t*qk
zDRw@T5NsTbrkFQA%ko%G1_Lb|ijKF_IU^teY$_8;Ght~t5fIeS9_!kg2AC0L3%DAp
z)%@G=p6e~2D2qisLge~Zg_>xAuK>i;1VWx3c=!s2;j_*iRHOsb*>6-C<qcj8`@=rO
zP}XMY68YV0>gcYP+Ho=L@XLd*j~2ln-;WHg)|cCixksH$K={5rGSD@yB%LI|(NCc8
z1Er8H+QO)~S~K{g?nH|2dB8SKs)BxQ?%G}}o*LV!NG2m*TmR|pWj~g`>)ClJCE#F$
zcj)fBg(dKOKmc$Cy}IRlasngIR>z~kP&WW~9cC951{AKmnZ~ZMsqup6QQf7J0T1;C
zK9*Qd5*(HxW=tl|RfjO>nkoW#AU3t>JkuzWxy4-l?xmTv15_r1X@p@dz^{&j&;{Mq
z$^0$0q&y?kbdZh)kZ+NfXfqLTG}Q^j>qHlUH4VEK`3y^-z6Y<6O88Hf4v^;}!{t-a
zDWg;znYu%6zA1~A5~<XNrYJBS8~snn$jIDO<y@mJydzi%ZH$Z$)QuZaz%45=1m~)~
z4Q`zYwLIYfLfxmU0o|G_6zFY@4*h+3cz>w?<TWDm>fxO~i8-Ib(^02{c4pXjhDI^2
zXB1LP4dvWuc%PXQ{r!d#6>${rm+M8EJM8yf#!H$Kp8AxwUXm5`7Tu-J$mHe<eDz8P
zkinV!Ohb>CG>vw|&Ay415}_1w&*9K8+2d3v1N+@a$|820o4u60Tj@u&kI!~q2V9X;
z>tMvQDI|O$#m+m2O**ZHq`_{#8)ry6`&5s~2k{O4Du16Fn0P;&_(0!e5%Bel){nU0
zJX~<8U6hoI%yx}qGY_1Tq7YKDJ)ETOCs&W)TiCrK*1%DE*vXdD-7hwE*LUgjeHRM`
z&@pkhTi&gtm#Kc+QIK+2Ybn9-sFVKNHyIgfob4H_77yYh))Rq$7Pw|+aD6&yZ|ki9
z8Zb6s{oBt1G+PgfIcxd}{m@~1nzhe;LH)5;!gS8@ddyabpdBc?7JVl?tS+<#bPSMT
z2@0uYdsWN(;Ww)n-PlA-0r+62@bYkEa`k{0s})fJgYZ#5=DmIdEvok7aZJRi{w-|}
zkea&<y#A2`hji}_#v2m7skndFe=lVxz&%)EE=piOEcJ&sO<`_b5^G%<n#vzp@oj^X
z%JiB6!h~{GSBxDmQ}k74qOt+84)V%~Jq`#i%7JivMeIU@9c}EI^K40lP|4}S;=!@7
zGZ1<3!HDW~9HJ?Y+=H6KhjKBrTPh}kHZl%5Q%W!nlj+c4IFM2PEm3CsAj}43o5_VX
zI-!1a5dPZ9M=_Q046q0ky|R;>6X}ZA3b7&vbDb7)v8CuI(+zzSf3z&P2eOrPNP?D~
z<WE8xnp!@QBele5FWK2lN)$}!cCBpfhDIq9vIqZBv5sQ<ySQilLber3RTGpZf7ria
z#<%~5cZOy?MY7b3oG#yZ-x@S0yR!k5+6TUj@N(-|bnt#LJh2{}%jx9MIwuve8&6>f
zn0@)0h;~5F&BG5v<AsTOfLuEFtBLWM#rp>OFU!=woW&ZSl~nrs{?1w>nWfW_dnpTd
z4qvLDYJ*ft>Sp%M(^_xCZpNBn<v0_^?y$&i*)D%LpQp$0NyRBLxtjpMg2Bt27wV-}
zA7?@{eZ;cBD%L0_pT_h@0b7Nob>c66JX}A|ZL9IENM`U>`ph7d<+RQiI}@E8Y)70s
zMC*_&))}GlmR}@{v9*nm)29-=rn`Q$rc^4G)GVQHlTr6BpGxtHuU(8AF7Ffh54?5w
zj+EYT9>x)PWL-iQ@RNm<k%46_xu3)RJlgba`xYU0%*_29yy1gU*1=vg_B;a@J`J7P
zZbtp1M*r&3*S1r6=Ez1EU)iWolOX*FyrcztJ`}_b+S&bhk>T?R+|c@=FOmj)5Za6_
z@DkVy4l^L>Z3#SI@s_eVwd3D)<^Ivq8a~J{|4mhOL^<7M4D8){ut;GIqqn`oqCk|x
pNh;Wa$C0(mdpqYz&F>xK-uVD=DT5%Jzh8ZT#aXmjr70%*{{RacS`YvL

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffd27a_256x240.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffd27a_256x240.png
deleted file mode 100644
index e117effa3dca24e7978cfc5f8b967f661e81044f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
zcmd^?`8O2)_s3@pGmLE*`#M>&Z`mr_kcwz5Nh&g=McJ3E!;CE1E0ryV5Ro;>nvtvt
zk&I==Xd;cVGZ@>q_xtnx{1u<ad7XP-_m_Llz31NZdcG2EQRlg#Vo(48z-?(^ZVvze
z|6T#B?4ZAvXnA4xuUoRUb~w8~68XP#e)ZtVe+x$i*`qE2L|`Xa*=^e&W~<9M_#tnj
z#rVH+Aq<7gEG|f0JFaQ38mE(h>%7-D)N|5YqOB>i;(bZ#o62{J2Y9&^D3~R^$o+X?
zwbxAEIb)xwCwK3TSR4QVym6N1rVgPmmt0caryBUceHP_&u}{?^Jn7f0PT$#h>UDqI
zr!q(F&1jJ2_!jxdAB<)7H$foI*2zuncvu;;$SoU7br=AiJ@4=BC4vNO>DS`&UIB=K
z;2)0F*t^FBvVfPuT4FVMSwUw%Xksjyl+;#*DDy%=ocFOyzDLvLR(`zCSOuJ=?FWYn
z5ZD!UaoF>-$@=Vt?a&;UQYM$Oqe0ZB?Je?8ZnMxDe&uzzs*zlHd<n!{fcOy-3tIxc
zl9G6fU;?@>)V58nfJPc8S^({_4bj5HQ_B&EXHWj6wx@B;!mr04b_Mx)UFL)W7`V!c
zpMp#C!a!!sh3h491y}^qfimXVY%!+sYu0_D<P=jc<5*#|6V<{WZGN`6N7;T5@B&-O
z4YA;LJcgH_nB=Dd<6apIuYX_dSRS2~d9}u*0@tAvp3;xIUD`Q4{vSHeBHLl#uuj<i
zdw9AoFJd!YY?C9=-W}2;fmD2UGG|&~>WoJMqpN(FR9LM#jdZ{vJzEck`P^9(1N=4J
za9%u4$2J8TAkUaJk_FX%iHuv#svL_mMmp{SR}ifc#ZcXv%CFsT?*>N^6r(%D?1YnU
zAaT?UZGlOn<yU`%Wa8Y9e(6d%oe>a6UXXs0m)3YDp}d%hb@)@Y!lK_A&D6{OPlNnj
zYY*$b>vnRzL8=CDbQSi!DL3D!P^xhNtwrYByo?h-&OvQZYJ6ka{Re#<tfku}Pk%l>
zSc0ry_d(K$_Q2M{Y^O~DOK(szDOnMi_<pwV9HJlj%%pbJNR!N8!0s1p{Upoaj+ETU
zEK+aqL+qw7G}a0PL5uYtfQ*ORTM)>*h_Rx%eSRxA%n|FuC&=F=<MvvnBAs(r9_AGz
zj#LLeNR-pStzN#d`2)svUKrAQ8VHd^=b;OpBCx?RZykcH-tb9~qbL$x$(`2<NV~cc
z4z2Bp@;~m=w?YY3`1HQse<0qUrn@+UmFad91gTtZ)sci`wvk1%_;MW`&Pf|5tFMu4
zNntUAcOEu%z*Jn}7mF2zKzm-pAJ69V*u*k%Pz0Bw+@6D$nbX!5@F~#!m0D7y2@>)B
z_Qsgmj8g!GA+LZOX)<MTZnmtSZMvX}iN~6m-JIQU20KF6`U6rsN{iU<Dvr1WS@zOz
zl#6cg6=J4)x<q{k$6xz$eY~XokVD3xXlNVKpABoKf9r6^O!Mc-%+zqecrz!IBHZPk
zw7nJrmUK)1q@E9fg^)g`{6kCX`iq%f7Po|#WOo_zsuE*m)B)+26L-$_R)8Mt!h_+m
zGL~5ePlt^60=e?-MYRsRhyDgl@7ZuDwz@j@ON}1OXo&%9FFj79dYq9#Pl2J0tpZqW
zoj)^#YFt?xCl+r6r)bG%OxXxB9bzulRW7L4VwzZAtOD$$wddJsYuE;LaTM_#<QEkK
zsNj<*RBFpyHO6kU?fp7b`x$~mXQtCK-5&11GCPIZRRY80sMue?{vgSOolK=^)LZxH
zbARbRFuV0L_TDa&7c9o>gOW}vbo9|l8QW3iYw9qCD{o~xt^HIU>;dV5MJgc0#uHTA
z<b?9`^Kmpc&W4BD98zOjFt!MWuh}E+<l}|{o6oGTbC!N4qi(7vXIFMMOnVxMbfN)N
zpdB*NBc}R2H}q?~Wm%WHWyNB%7lB=rj|B!oI|os&8zNX2&PaO(73!SiCG6_-sewTO
z1Rz&hx(b1H;PyKr{Yfo2#_Tcnj2S{?^c(o11&+g0pg0yUvKa>80%Ee_r;G`GUjssm
z*AhtwpW%Ly;X4Lq1Zq#ZpuwzrZE$sR087dN{w7PA6|Mo#6wwJP085K+h7+D>NyeX#
zk|?M<oZ&;KrN<L<I(I=dD@q?cl4IbRF&ndOs<5uwMvg!{TBUD9u|OM4eU*}mSV}bg
z!o#6$7=VN)xc(puus6zwHZV0OG)?U7PkW#AIo)ydHqWFfKQd6ixr2X|O$wi7Elt~Q
zP6v<?64wgA8tUqVma<hW?e59%zK8rZ0VY6U?n&-05mXQLRLYvR*#iHFc$BXzkqlHo
z6W9SifpFjGSnRT&jat?h?$a!d5Qp<Z%K{vt*3t%>J^Es)JtP-2eNr0EQe*ZM`&}OU
zCD*uSSviE&p}uX|@1g_%|3*ra*MbBV#~cshdcFQ(dGLnTqaO-3{u==x1;Pp2im!#`
zuZ2`ThfAmiSzb|4h`c4?^ZoGOF*oXYcV}(ge!v@^bse?daA`Ma+bSZLIg;pIN17vM
zIOYfK=@s_Pj?~#lqnY2o?d1$MpoqsYQw%eX%X6Y4*^27{hMWGqILEMnVYUEMW#x7f
zu^I*nzXQ@6HJ8n;<zUNvk-PEjs%<X1ioU#5GW#HA=uaT__dpa}F)w`Yq8IsAdt`7U
z`+&f{UAvT9oH8a~#Q{IST?fK4Gn(zAyLXqIIB&|RDC4<MkG(eWs67GJyEog<1@R;p
zqErmjFbl*Kr=W@Fa@dm2f*UXY=6aA8pQ^kx6Gc!sOK_!BGj%_KX(L)0{_BN-RG>26
zo^1+Ewi$fN$Unum1(FTb8I#cYgcGklwIExt#Mb(D=x~OTeZ^ubJ)S-ywfdZS?SRCq
z<f6&jh?er}Ff4dKlh+}ZgDU^xdo^N4XGA|QMlZXk36y0_n94j(>Dm=eU<x+0r+(K0
z$`kDr6r$N?XyYa?y(T-y8=tEjFA9h_xYvk!0;klqRPh$f>+CCWO@8S_m!W{alT)zj
zZJbjxm5&No5xe_~Jw-i7`&G}=r)POGGfFq<O8y-6Cxq}O+jVOPKCRjoSodM^fgSV;
z21Z0|XI6eXR7bxMS=$0j;+W~BbU**AT6?!xT;2D^zN`dq>+c@kQbB#)ay`coj&C3-
z(#&xV@Q3@VJd{qdH4g@4ZJi&mx9e@Io7@~(o5vTrkW>QEO1T-gmlTRHH+3)gcUC0P
zk07rvDnf*7Y5J}8!>F_7D^Z3IoH^uGH}_a(ax{Q(IrvV$olf3WN&DY?<mf1{#tp*6
zbe~sSoVbr4l{;@hKd4VUJ-1s^jK>uYZfvXI(;Vv&EAoQtfH<X6@yy;uSMU*|aKXKd
zS5vU>;+4VI_a>yh*J+Cj!?h!QX?O`QXk@@G7AjloJe51Cw*rPXQ>#y?B^^ExRQFui
zolmv*C5K|-p){rZiCNai^0H`1(Qr(Hz3v%7NnmriXu2tD>xsbN#*R3*wsZhRj6Lvb
zn0Cu=qkC?*e4{NF_3=^bTb1f!g?@ryFH<mSX7J%FD4O3UZ%By_%;30DZJa-JG5in5
zFhfO$wOjOepP7?~dRphj@WU?;zCKz6eSAMUwAxT%JMIyEG7;|g_Q+7rq>6Zw2tz%A
zzz&o{w`dDv66!6Wk9w1-dglS#Sm{doxw&h5Z8&ONmlBBte{J)puaDzc!LC==rPRQK
zQNH23?-rIo^MQdt3Tk!B@8l#}fxVtrlc8Y<>ORaVE($DKc{77qV^`+`%_DotrUD=8
z4}L7QnZi3RgUy*tteY-=$SqA2@IZWe(}mI`nzhAT{qC)my#rJsfoS*<ZNRV2gRlj?
z)v1Cl_T+qH<V>)xCXj!Tk6=3)cr@Jw#OcNqgS3pg7x|4!A$|w15X!huR*vB3q9Ya4
zF{xuzEQz{9YPl(gk`}Gffut%jotgqp$jZvzRO4EsExf~93vY~04AxH=lR>R3v3Qs2
zy$v4SN%ee@Kz#kDtARaQD`d!R%}#@T1=v8DAow*r>+0d1KS{ZtA~KMtgm)+$JHumW
zw=;@qWk&MuG@LKx#K3@&WMw?r=jD2_)(*$LmkCm4_@};QZI|SPe8hIC6xqBy!LQyK
z01_xmfNA9UlBU@Kzu7;zQYxHE>OCADA$gwaVqm`eN?XQF@NkrocB}lU4hcCf>wqir
z>Ya=PcE!Xm#JG8v@G0lj&~)hScM}X57vGw3g<$^SUls53f|Bk>5FQwqE&{%u(f$!1
zl8+53vyYZ`mEEp&YT<=(krhKrw?~pS{N)?q{0qBR#2Y!w4!hWMdj`a(@A@r$zVB+u
z06Hb@_9(cQ_AxbXI|-2w>#QUhp7k<+`z9+(jkh~v-Renr#C9U+&jL4vg6-E$f7@UU
z(1fxB8{U2vq}h3rE!Z+n7=(>D&}@9~3mJ^R5}|WVG@!RSh3r{!>QHwg!t29YS&jiR
ztyn_q*k9H0efZ7hO*b(WR|G!TDY`rol~Ob4&1OwdM8kbGj`^$~L5gd<d7YB5YJW@H
z1El3`1FwJN#3DR;LU2X|A1e0W_1{a~3G@h&oQoFR4^R8yLsOhvm%`Xog{28ZResyx
zqB6ZHK&Wu;>WYceWwL=PB{~NX=cu3p-{S;hqaE?bSHv$g+SA6bxy+VU3YVTPDj6CN
zKLb_(9gM2Y#KW8ONxjH9To^Y)r?ql2cq8+WE438uIF$hjfdLs6-;!jv55jGcc3Ipg
z;}aT32NAEGeU;J}&j5=+u`4?%xlwL7?NDn%2={4WS39yn3f;&r=|}5=M-Y2yrxeSw
zv%*PmV{_{#Qk1sD>?M2KDapb~z3!E*-LPmCe9q86D%MGSe;4~~K-jKQxq6b^902_{
z%>4G>@Xqk8muR*|vGe5{@7sds<aRcI()+-dk>2i|i;g}oMkd!o^0=HG+vcPrcN54A
zLGv$PlTePRxp~-OSb_*aACO1qc{MpfS-fv(@UmRv%UO)cSt;ee@9(S)f>|~bwU@eZ
z=kTS*sdjLclwMZ<Jgx0E^k$qnMxHBa{0^(!mfiA)^ZEJ=-!!ZelcyN~EF8Mbb)i9e
z^>G#?%U3)bq-uj?@@vj~6tq)ZS||Jxz`+di-M5<Fie`muWl)A7tfzIyIhd%F5PQPh
zAxf8Mxy}evu=*ltf~ji)pFWl7J=6W8EwxIyv~~%3n}ob~`BbWRLfvBgNJYQsf8eXf
zb*A=3@G_1-qwA7#fS;_y%uEbp$>SXM=h3EL`?pB>W9A;`V2vM)vk&%KFy|TAh#AQA
zb_?<!HTqYNzP6jrw?H&O`OC+In}z5{pe1eS^Wk6)mYv;?7a6{vK#gr5`lD#T2VpIk
zLT|ynkZ?ny{+8hL6(4EaQ#%3OSMDDzt>J==3f@%LL{`vU$3Z@A2a9C3aC-YY43dR>
pI7J0n@;b3~`)ubvsr|iU(l;L{A#E6J`}eC4usn-0uQEf&{2ws1m(l<L

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffffff_256x240.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffffff_256x240.png
deleted file mode 100644
index 42f8f992c727ddaa617da224a522e463df690387..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
zcmd^?`8O2)_s3^p#%>t<I$5%B*(%$RifAlJDl()+*_W)tj4atJl`V!4ku}Mhk*o=k
zjAh1XB8{;#7~8k^`}6($6`#j>oqJ#RmwV2==ic*rz7lOw=eaq=H~;_ux21)-Jpcgw
zdj+hrf&W^f<%Qk9Zpqf#;q3n5{{POY;f!wmTR1An9(4&I0z1LNX50QSTV2M%4|y9c
z#{ZQIVJKu~aY5?ZaZP*GIGqGs=e@q6o|EPhZB3CC?@LnORK8O@z{{<0KtSn5?#~OW
zy=L;x8T&*%xqElS;s5~Pjk7d2bqIaA<dW(>)xZbovnZd7eX17WNxx=w`p(8vulwUZ
zl{so}MuRNJx5!8S5G;$o2?BApPHt+)!^#*Ww`?rcVE}mcyuY`X2o|uVUyI9o1t11O
zemGWR?;aD#0$vJhiPhv~0iXS#iLq!>Qd<?G%nJo^-p4Na9!-~9`SCtu5pb5a9~>$`
zU{}<|Vb9Md>$4TMbL7C3GP#r;4Wc$}Z;^j;n}yc!E3d;<jpV}POQ7Zg#E;Ne*b?}a
zl*C&E6VP>`wry$!JkmJP0%(tIh!!TET8=<Gd-5-}J&kJ?em(xME6C65GA9%uz*QFf
z6kM7Y1~y|ZTrZI;z#@<ilrhg{i!qH~v+ffmr<i&f#|opJs22Wc^RvZ0%JzeR7uZT}
zs0FX%F}(c5BtI1x_sU>+{rhUi^60G0t2HJSxXv-*DgC(HrJd8`|Dp3NvL5yg>xAvU
zho|fEA~w^-HrW&H-JwkqNX2I-bEXBR&Uhp+y2^)1h1IIlNCzC!v-Mz@&z&VPz+cl1
z=f&f6Y*U~C`ixm4Sy1hl$hg(4%Dy;bq~k7d1<@K&%%NLT`L+A)-QXyKVswX?op90(
zB#yeFEih@c{OXU8Oq~1CFI_38GXmns3(`;W(i+bslovCx4u7gvK>DrGOug*?G|1nz
z_OR}|ZYS3pq-p?rS7G0qa`TM}r5XqDT4cV>%Qyk#9ES}`jc+Ww|DcbZrF6UG>CeXp
zOVIV}K1e#z9@tu#?X)Ri=?zXMB`X3G-_I7FL-Zq`nbfWtX_EO1*!+U6pJW-_k&+vk
zMd}THh}{(Ch_wPk(PI4vVB_KT76kGxVytLxpWg}&bHw`a3G#QzxV@ICNax&@hk3<_
zBh`Tq66G{-tCw$V{(y0v7l!tp20~@gdFX<t2yAf7TZbU4H+&N0D2hZ^a_6-I(yp$A
zLu-4Y{Ez$etx!T0KE1E^ABgv-=`PL?WxCx2K`NJ9btEB~b!5>jzFbF#bJE7i>T4ux
zQdrF3org^wFcnw$#bQMv@SfN3$Fuo7HnB_`2ZGB{ZqGr>%xP;2_!Q{=N-ZhU1c~^5
zdt=OO#wmcpkXJyCG?{{&n=R{Sn=Ytg;<09CH)l7TA&wkt{Q;>RrA2Ia6-QixEPLrU
z%0)N$3Nh0?U825&<F9?WK3>v($Sz}0G_(!v&xSSAzje4{rup+^W@^}ByqOb95$<wN
z+FlC*OS+|hQqPCLLP#G|{-Gsx{l!c#$SvU|*<FUbs>E0sbwK*%#GP}!6`%*Z@L;&C
z3^dE&>5%bWAXmP<sMdk^(BGixJsS?iR#(S<snG+CmKd<~(&IF$#~B&)6d2mrDuBh-
z`7=YP#+9XUV(~_Bik5uFl#L+MA?9LT<$`)GritanD!@)!d!CK9hHX$6M-ksae^D`j
z3O<QKrMApfW9&BT-mgQopCLGOW;!j??cokAvs0*DB`{2miv0!b50XsS$yAy~y>*X1
z_m}Pivs*u7@9i>qA!58fDCwj^M<1P(u^m;urVdlM@>aIf+E3-d9<VM%qyk!OJVCWh
zPAES=A4hZJY<Q^6E;Y6VV~t?=nmyu9K5i(m`ONw{XX$4$>ZW>fc4cS7w5O3sCmKKn
z+94A?VyfSBb9{}rEbCIYtXORJBCv__fnZ>?a}edaA%bP$jI?J^q0UKO!mduA8U!3b
z0CJ_Js}NWQZoebapVUHP%pPOUm?1<)zd<fq;MhF{ievF2n_&PhASNq*%9zmiH6XNj
zEs=Ea8SWPuzGGlUp!TE-8qB)a23IEsfKm?dH$i1qxCT5^L?@^KA}zidPI#gv8Gk-X
zqM+_@h7X;V9#72a+y&FDD1Goq_JL={tjxBl!n$f3IRf!$mA(-L;%G4SRZ1!Xm1z2f
zhjX-H01}>%`hzUM-Y6g1z|@@3G_kio?S0bcbjQuxJd>vU$Uyz(4*peEDSVc-G;O;%
z9Y97%Tq}TRsH+oN%2u(oyC=W<9`e@&m;i;jC%L;sP(9RBDQnth3;ZMEQNFH3GEf0c
zU<3RF!hNG-vCDooYFS^nPlFnv4(ElI1=vNcr42TF^u<zpNG@plq%<5<WA+sLT^{=-
z*SKa`IfTWbzHQm>q67f{MoN>{f&>xA91r4pz5Zc&@P^i-9||`98v$Si!U@}ouZ88W
zg;YL=OQ;4}UQtkpyd~lD{qWy0H|lwJXKmenz#E=*9kt$YX*X!wDk7ITlIUGWnj>a7
z<_GQR752@J)Y(U)ncu(d<qS5Uh{rKg3^Vr2bD|>Iit7P}oBq8x$FP85)&Nsw<#rOW
z8U_x(1J)Zgm(8tZXU%+(yYcO+Z7#ZszPwa2`ygiMPayX9KondtFMRK!7x`9uWN;(f
zfWW?8yOdj;GA3We0YAW92gWipn(d>zcbA+vZ_21B<GE0ey*BZvJpq=xH`~tz@gx|c
zR1DNG3&a$spo!;l*pkkI8!!LndXN^Ms=PE4MNl|PaHUi;bw5F9BU%~$>xF?-pfcW`
zbqY<k8GOpfKgG8NmJQVzlhFBu6R$nBAX~7++WL0raE6k7#bPQwo<1VA`kZ;~fW)ih
zqRHEcmh$T`EO<YY*CCdJD*xhpHDX3*L_aS^FT1A+oMlXy$~;c#+7(V<3O2N-e%AuZ
z6YUffqFHBX<0db?COgL)pQ{`%3Wzwk*NA!or_{An@fOVM>??6ie(6M)p@6@WQ?Tl7
zoKrKEj|x~2yZehhMLkFRRnOC>XL&L+N;m0B{_OQ9gzzTYb!!Jct=bk?_hIpY9rOwY
zMnr69R(?8EN52qR+k!~qnCYc-KmV&*d$&NY?t5cjR)V+ncMor=puTRoo?{5dH;@!*
z<~RrV!+ljAN+;Qx2LraY&JWnz^|sYbZjP+Y;|pC#DuHUH+>F~x3PqTkx)=OAE0X9(
z(AO6gp~AH^{nq+n)LHYDD8mQN?DDFcd!U&d4PaajzSD1~lXq3p{x=^vItrq3gD^4O
z=hYS`?&C-0&KuAV>Jv}T?ba0IafL$~+bZ}p$9lwyyx=-uPN`Hpvv<)Ia>OWHa4+N4
z6zscrW$^XA32E<j+Ty}+?MPo5Uc!qbGT;`7%Gx?l<xc9YfT7LQ>Jw^7hYtkRJr{Q8
zQ|*1pp_q6Mno|D6EX!kgSv0h0I3~ef_l%$<u(@0`-IS&EL||}ZN1R(*I)Ea^7I-yG
zyXCjhJ-1uF(Uyz)_^9=*N_DY9KS79>DTFjL`0y16n%^dGNQn;2V82mqoIi9i{15vu
zLq&(BTl9CInUjZlTIa>^!!HlMK3W8Sd_Ow0+E8IT?h$=55$^Z)$WYIuig=O;Lp_1Q
z4wOT;XbWQ!>Mh`pdXuSo=K<ST=}P*!xodlEIBHy%5{U$VZS$wEkNsG|u2<Kk)WCyL
zzTvy?7M8&Cfq_5@YIV!+<Rn^wt)5qtp<xK_KFldD3M^WAGlN-UQ|ANEBYVoG0w3xR
zek`?_!aFWQ%$ZEAn=XFHElm{gKzw@Bh0-LNwZ&Zh?yZ%*15_b_Y4{Osz^~4Oum!!<
zse&!G<a}e~Ot7vdkbjYnU^^LjG~ETn>Bba;wT!wK`Hf1Ueh04*%D7Kfj*#b~BNfvz
zsbf?uiMm5-xhaQ|7Om2OrYbU>ngUM9%F5nU<65IFyu(`yZ;Vb1)=wCd!L2K?c$ezE
z4IbS|^?Z>)eEp}ZfjwF)Waw?pPJ?{~*g%;e<TX6&>fxO~Nx7dQGLWZ)cPQ*T!((W-
zGm2?tM)K}7oG<0Xz<`ltWjxvE<$AH!4*R{A2~uYGr@m!vm*j+e#CE9^*}Oc#uihB|
z5;#kMY2^8mrr80%*+02bDx6B{Jsch(d7kQGV7~iGTgFZBu$Pf`tNf`B2{|t7fGhIq
zos0xF#l$bfxOtcGDd*MDbdKBaCKxg<zBS_t!TiI&D&FS>CEbr8JTNd_1bjWC{Ubgk
z9~)9;A1&=FyIt$l!VBXfD~6VCk0fjO%QwLJ7k00RH*%I8cCqF542VzP^;`OU-_?=<
zbV}OoQE)HqV`|)X5+WbgSxGWH>t+7-O;(l~Z+FJJ)sygu^+eF01#Suj+pnAcw!s>p
z$-xF}c>7t9X6H$^V9hvT5H{jKv+=zzWHA0pgw8e5fZpm9vIphVq3%S4*N3%&jsY^Q
zK%sSPuj=?d{ATs0o0y6#0w3%YT^@-_sTuTUwI(Q{;l3KjeAbVk#Wmi%PDxm`zoqQ~
z((<-}*FSP%5gt7uI3t1&75ne{@1^bpdW1;MMGNkSr~UAuDbB4+VQi|x(gdO^zin_)
zncfs2hj8xdiiy)@vVkfkItLKvsGtJh<Ah+N9r4Fk#4j}3)5fp4%$8OPm!2*v85$2i
z15p4UjH=DV!<+L-y~sIS7&k+wwQ@3eBlD0ewG{0*l>rTb0T~tFl4Q3J!flauS==b&
z6B<Vc5wD$nmC_i`0E<AeD?2H<QEoWxP-{X6_i15QJF-Cv-N-NLN9%$|5L;=d6lmF5
z;UuK7x%Cq%N?T&~lD+MeWZ|S<_sZ68ShNa0XXqal>m<Ivi+wgAY*(pVJxOj3;P^Mp
z{Py4Q&hV_4XtqYN^W_`w+k)rhb~b?0`@olx-tL`?jy^9&Cf7sqxSSo^=A<Kc6UYof
z^DkeMP>!g%dDvlCf(St$kVofvH90|9yl-gmvRvcKS&Ye9DdoTK@2m}iSvC{3m%4E0
z@TJD7c1V?!URM7+t?f3)%{X(6JXg~A9TvGQyX6n(^Yt0NX;>vDPcr~mICPooLWA_`
z<1A>FuXr|C)dtDr*PQt%Xs5WePWUB&gBj$zZ#BIY%?jDdpbSA-PV0`dGf^oa_Jp}Z
zlrGV7oe`#B^+nPIQ`ZDJeJas=ru#=*YL#+n?Go}f33>1GsZ{TTy2bdBihj}mz*mp!
zOzn%{WgLM=*CpiuKUs*GnHa{B$2siJqfNi|Z;|rH%stM*8b26kAMCYY&NHwPGtlYn
z7UVx_^sgR$Z8x27foS63FCP<b7NQ@4m$W&a4+pb@c6L8rWcYppH@1D~kD>t|gtcG_
zy#@C|!VQV~TY}G5e57qp?F4jRxqq~@h6^?-cvD>ySwVLl2m7=gERtEn>Fw_@ND%pO
oiVC*mbz<%I+0K1Z`+LWvZ$3~$+A!Gm?^hpSc@||}WrmLVKLvuzv;Y7A

diff --git a/3rdparty/timepicker/css/jquery.ui.timepicker.css b/3rdparty/timepicker/css/jquery.ui.timepicker.css
deleted file mode 100644
index 08b442a7e53..00000000000
--- a/3rdparty/timepicker/css/jquery.ui.timepicker.css
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Timepicker stylesheet
- * Highly inspired from datepicker
- * FG - Nov 2010 - Web3R 
- *
- * version 0.0.3 : Fixed some settings, more dynamic
- * version 0.0.4 : Removed width:100% on tables
- * version 0.1.1 : set width 0 on tables to fix an ie6 bug
- */
-
-.ui-timepicker-inline { display: inline; }
-
-#ui-timepicker-div { padding: 0.2em }
-.ui-timepicker-table { display: inline-table; width: 0; }
-.ui-timepicker-table table { margin:0.15em 0 0 0; border-collapse: collapse; }
-
-.ui-timepicker-hours, .ui-timepicker-minutes { padding: 0.2em;  }
-
-.ui-timepicker-table .ui-timepicker-title { line-height: 1.8em; text-align: center; }
-.ui-timepicker-table td { padding: 0.1em; width: 2.2em; }
-.ui-timepicker-table th.periods { padding: 0.1em; width: 2.2em; }
-
-/* span for disabled cells */
-.ui-timepicker-table td span {
-	display:block;
-    padding:0.2em 0.3em 0.2em 0.5em;
-    width: 1.2em;
-
-    text-align:right;
-    text-decoration:none;
-}
-/* anchors for clickable cells */
-.ui-timepicker-table td a {
-    display:block;
-    padding:0.2em 0.3em 0.2em 0.5em;
-    width: 1.2em;
-    cursor: pointer;
-    text-align:right;
-    text-decoration:none;
-}
-
-
-/* buttons and button pane styling */
-.ui-timepicker .ui-timepicker-buttonpane {
-    background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0;
-}
-.ui-timepicker .ui-timepicker-buttonpane button { margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-/* The close button */
-.ui-timepicker .ui-timepicker-close { float: right }
-
-/* the now button */
-.ui-timepicker .ui-timepicker-now { float: left; }
-
-/* the deselect button */
-.ui-timepicker .ui-timepicker-deselect { float: left; }
-
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-timepicker-cover {
-    display: none; /*sorry for IE5*/
-    display/**/: block; /*sorry for IE5*/
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}
\ No newline at end of file
diff --git a/3rdparty/timepicker/js/i18n/i18n.html b/3rdparty/timepicker/js/i18n/i18n.html
deleted file mode 100644
index 83cb5e3f30c..00000000000
--- a/3rdparty/timepicker/js/i18n/i18n.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<title>Internationalisation page for the jquery ui timepicker</title>
-
-    <script src="../include/jquery-1.5.1.min.js"></script>
-    <script src="../include/jquery.ui.core.min.js"></script>
-    <script src="../include/jquery.ui.widget.min.js"></script>
-    <script src="../jquery.ui.timepicker.js"></script>
-    
-    <link rel="stylesheet" href="../include/jquery-ui-1.8.14.custom.css" />
-    <link rel="stylesheet" href="../jquery.ui.timepicker.css" />
-    <style>
-        #timepicker { font-size: 10px }
-    </style>
-
-    <script src='jquery.ui.timepicker-de.js'></script>
-    <script src='jquery.ui.timepicker-fr.js'></script>
-    <script src='jquery.ui.timepicker-ja.js'></script>
-</head>
-<body>
-
-    <script type="text/javascript">
-        $(document).ready(function() {
-
-            $.timepicker.setDefaults( $.timepicker.regional[ "" ] );
-
-            $('#timepicker').timepicker({
-                showCloseButton: true,
-                showNowButton: true,
-                showDeselectButton: true
-            });
-
-            $('#locale').change(function() {
-                $('#timepicker').timepicker( "option",
-                				$.timepicker.regional[ $( this ).val() ] );
-            });
-        });
-    </script>
-
-    Select a localisation :
-    <select id='locale'>
-        <option value='fr'>Fran&ccedil;ais</option>
-        <option value='de'>Deutsch</option>
-        <option value='ja'>Japanese</option>
-    </select>
-
-    <br>
-
-    <div id="timepicker">
-
-    </div>
-
-    <br>
-
-    List of localisations : 
-<ul>
-    <li>
-        <a href="jquery.ui.timepicker-de.js">Deutsch (jquery.ui.timepicker-de.js</a>
-    </li>
-    
-    <li>
-        <a href="jquery.ui.timepicker-fr.js">Fran&ccedil;ais (jquery.ui.timepicker-fr.js</a>
-    </li>
-
-    <li>
-        <a href="jquery.ui.timepicker-ja.js">Japanese (jquery.ui.timepicker-ja.js</a>
-    </li>
-
-</ul>
-
-</body>
\ No newline at end of file
diff --git a/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js b/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js
deleted file mode 100644
index c010a498e15..00000000000
--- a/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Deutsch initialisation for the timepicker plugin */
-/* Written by Bernd Plagge (bplagge@choicenet.ne.jp). */
-jQuery(function($){
-    $.timepicker.regional['de'] = {
-                hourText: 'Stunde',
-                minuteText: 'Minuten',
-                amPmText: ['AM', 'PM'] }
-    $.timepicker.setDefaults($.timepicker.regional['de']);
-});
\ No newline at end of file
diff --git a/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-fr.js b/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-fr.js
deleted file mode 100644
index bd37d731c8d..00000000000
--- a/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-fr.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/* French initialisation for the jQuery time picker plugin. */
-/* Written by Bernd Plagge (bplagge@choicenet.ne.jp),
-              Francois Gelinas (frank@fgelinas.com) */
-jQuery(function($){
-    $.timepicker.regional['fr'] = {
-                hourText: 'Heures',
-                minuteText: 'Minutes',
-                amPmText: ['AM', 'PM'],
-                closeButtonText: 'Fermer',
-                nowButtonText: 'Maintenant',
-                deselectButtonText: 'Désélectionner' }
-    $.timepicker.setDefaults($.timepicker.regional['fr']);
-});
\ No newline at end of file
diff --git a/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js b/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js
deleted file mode 100644
index 01b2c8a3de5..00000000000
--- a/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Japanese initialisation for the jQuery time picker plugin. */
-/* Written by Bernd Plagge (bplagge@choicenet.ne.jp). */
-jQuery(function($){
-    $.timepicker.regional['ja'] = {
-                hourText: '時間',
-                minuteText: '分',
-                amPmText: ['��', '�後'] }
-    $.timepicker.setDefaults($.timepicker.regional['ja']);
-});
diff --git a/3rdparty/timepicker/js/jquery.ui.timepicker.js b/3rdparty/timepicker/js/jquery.ui.timepicker.js
deleted file mode 100644
index d086b674b7b..00000000000
--- a/3rdparty/timepicker/js/jquery.ui.timepicker.js
+++ /dev/null
@@ -1,1345 +0,0 @@
-/*
- * jQuery UI Timepicker 0.2.9
- *
- * Copyright 2010-2011, Francois Gelinas
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://fgelinas.com/code/timepicker
- *
- * Depends:
- *	jquery.ui.core.js
- *  jquery.ui.position.js (only if position settngs are used)
- *
- * Change version 0.1.0 - moved the t-rex up here
- *
-                                                  ____
-       ___                                      .-~. /_"-._
-      `-._~-.                                  / /_ "~o\  :Y
-          \  \                                / : \~x.  ` ')
-           ]  Y                              /  |  Y< ~-.__j
-          /   !                        _.--~T : l  l<  /.-~
-         /   /                 ____.--~ .   ` l /~\ \<|Y
-        /   /             .-~~"        /| .    ',-~\ \L|
-       /   /             /     .^   \ Y~Y \.^>/l_   "--'
-      /   Y           .-"(  .  l__  j_j l_/ /~_.-~    .
-     Y    l          /    \  )    ~~~." / `/"~ / \.__/l_
-     |     \     _.-"      ~-{__     l  :  l._Z~-.___.--~
-     |      ~---~           /   ~~"---\_  ' __[>
-     l  .                _.^   ___     _>-y~
-      \  \     .      .-~   .-~   ~>--"  /
-       \  ~---"            /     ./  _.-'
-        "-.,_____.,_  _.--~\     _.-~
-                    ~~     (   _}       -Row
-                           `. ~(
-                             )  \
-                            /,`--'~\--'~\
-                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-                             ->T-Rex<-
-*/
-
-(function ($, undefined) {
-
-    $.extend($.ui, { timepicker: { version: "0.2.9"} });
-
-    var PROP_NAME = 'timepicker';
-    var tpuuid = new Date().getTime();
-
-    /* Time picker manager.
-    Use the singleton instance of this class, $.timepicker, to interact with the time picker.
-    Settings for (groups of) time pickers are maintained in an instance object,
-    allowing multiple different settings on the same page. */
-
-    function Timepicker() {
-        this.debug = true; // Change this to true to start debugging
-        this._curInst = null; // The current instance in use
-        this._isInline = false; // true if the instance is displayed inline
-        this._disabledInputs = []; // List of time picker inputs that have been disabled
-        this._timepickerShowing = false; // True if the popup picker is showing , false if not
-        this._inDialog = false; // True if showing within a "dialog", false if not
-        this._dialogClass = 'ui-timepicker-dialog'; // The name of the dialog marker class
-        this._mainDivId = 'ui-timepicker-div'; // The ID of the main timepicker division
-        this._inlineClass = 'ui-timepicker-inline'; // The name of the inline marker class
-        this._currentClass = 'ui-timepicker-current'; // The name of the current hour / minutes marker class
-        this._dayOverClass = 'ui-timepicker-days-cell-over'; // The name of the day hover marker class
-
-        this.regional = []; // Available regional settings, indexed by language code
-        this.regional[''] = { // Default regional settings
-            hourText: 'Hour',           // Display text for hours section
-            minuteText: 'Minute',       // Display text for minutes link
-            amPmText: ['AM', 'PM'],     // Display text for AM PM
-            closeButtonText: 'Done',        // Text for the confirmation button (ok button)
-            nowButtonText: 'Now',           // Text for the now button
-            deselectButtonText: 'Deselect'  // Text for the deselect button
-        };
-        this._defaults = { // Global defaults for all the time picker instances
-            showOn: 'focus',    // 'focus' for popup on focus,
-                                // 'button' for trigger button, or 'both' for either (not yet implemented)
-            button: null,                   // 'button' element that will trigger the timepicker
-            showAnim: 'fadeIn',             // Name of jQuery animation for popup
-            showOptions: {},                // Options for enhanced animations
-            appendText: '',                 // Display text following the input box, e.g. showing the format
-
-            beforeShow: null,               // Define a callback function executed before the timepicker is shown
-            onSelect: null,                 // Define a callback function when a hour / minutes is selected
-            onClose: null,                  // Define a callback function when the timepicker is closed
-
-            timeSeparator: ':',             // The character to use to separate hours and minutes.
-            periodSeparator: ' ',           // The character to use to separate the time from the time period.
-            showPeriod: false,              // Define whether or not to show AM/PM with selected time
-            showPeriodLabels: true,         // Show the AM/PM labels on the left of the time picker
-            showLeadingZero: true,          // Define whether or not to show a leading zero for hours < 10. [true/false]
-            showMinutesLeadingZero: true,   // Define whether or not to show a leading zero for minutes < 10.
-            altField: '',                   // Selector for an alternate field to store selected time into
-            defaultTime: 'now',             // Used as default time when input field is empty or for inline timePicker
-                                            // (set to 'now' for the current time, '' for no highlighted time)
-            myPosition: 'left top',         // Position of the dialog relative to the input.
-                                            // see the position utility for more info : http://jqueryui.com/demos/position/
-            atPosition: 'left bottom',      // Position of the input element to match
-                                            // Note : if the position utility is not loaded, the timepicker will attach left top to left bottom
-            //NEW: 2011-02-03
-            onHourShow: null,			    // callback for enabling / disabling on selectable hours  ex : function(hour) { return true; }
-            onMinuteShow: null,             // callback for enabling / disabling on time selection  ex : function(hour,minute) { return true; }
-
-            hours: {
-                starts: 0,                  // first displayed hour
-                ends: 23                    // last displayed hour
-            },
-            minutes: {
-                starts: 0,                  // first displayed minute
-                ends: 55,                   // last displayed minute
-                interval: 5                 // interval of displayed minutes
-            },
-            rows: 4,                        // number of rows for the input tables, minimum 2, makes more sense if you use multiple of 2
-            // 2011-08-05 0.2.4
-            showHours: true,                // display the hours section of the dialog
-            showMinutes: true,              // display the minute section of the dialog
-            optionalMinutes: false,         // optionally parse inputs of whole hours with minutes omitted
-						
-            // buttons
-            showCloseButton: false,         // shows an OK button to confirm the edit
-            showNowButton: false,           // Shows the 'now' button
-            showDeselectButton: false       // Shows the deselect time button
-
-        };
-        $.extend(this._defaults, this.regional['']);
-
-        this.tpDiv = $('<div id="' + this._mainDivId + '" class="ui-timepicker ui-widget ui-helper-clearfix ui-corner-all " style="display: none"></div>');
-    }
-
-    $.extend(Timepicker.prototype, {
-        /* Class name added to elements to indicate already configured with a time picker. */
-        markerClassName: 'hasTimepicker',
-
-        /* Debug logging (if enabled). */
-        log: function () {
-            if (this.debug)
-                console.log.apply('', arguments);
-        },
-
-        _widgetTimepicker: function () {
-            return this.tpDiv;
-        },
-
-        /* Override the default settings for all instances of the time picker.
-        @param  settings  object - the new settings to use as defaults (anonymous object)
-        @return the manager object */
-        setDefaults: function (settings) {
-            extendRemove(this._defaults, settings || {});
-            return this;
-        },
-
-        /* Attach the time picker to a jQuery selection.
-        @param  target    element - the target input field or division or span
-        @param  settings  object - the new settings to use for this time picker instance (anonymous) */
-        _attachTimepicker: function (target, settings) {
-            // check for settings on the control itself - in namespace 'time:'
-            var inlineSettings = null;
-            for (var attrName in this._defaults) {
-                var attrValue = target.getAttribute('time:' + attrName);
-                if (attrValue) {
-                    inlineSettings = inlineSettings || {};
-                    try {
-                        inlineSettings[attrName] = eval(attrValue);
-                    } catch (err) {
-                        inlineSettings[attrName] = attrValue;
-                    }
-                }
-            }
-            var nodeName = target.nodeName.toLowerCase();
-            var inline = (nodeName == 'div' || nodeName == 'span');
-
-            if (!target.id) {
-                this.uuid += 1;
-                target.id = 'tp' + this.uuid;
-            }
-            var inst = this._newInst($(target), inline);
-            inst.settings = $.extend({}, settings || {}, inlineSettings || {});
-            if (nodeName == 'input') {
-                this._connectTimepicker(target, inst);
-                // init inst.hours and inst.minutes from the input value
-                this._setTimeFromField(inst);
-            } else if (inline) {
-                this._inlineTimepicker(target, inst);
-            }
-
-
-        },
-
-        /* Create a new instance object. */
-        _newInst: function (target, inline) {
-            var id = target[0].id.replace(/([^A-Za-z0-9_-])/g, '\\\\$1'); // escape jQuery meta chars
-            return {
-                id: id, input: target, // associated target
-                inline: inline, // is timepicker inline or not :
-                tpDiv: (!inline ? this.tpDiv : // presentation div
-                    $('<div class="' + this._inlineClass + ' ui-timepicker ui-widget  ui-helper-clearfix"></div>'))
-            };
-        },
-
-        /* Attach the time picker to an input field. */
-        _connectTimepicker: function (target, inst) {
-            var input = $(target);
-            inst.append = $([]);
-            inst.trigger = $([]);
-            if (input.hasClass(this.markerClassName)) { return; }
-            this._attachments(input, inst);
-            input.addClass(this.markerClassName).
-                keydown(this._doKeyDown).
-                keyup(this._doKeyUp).
-                bind("setData.timepicker", function (event, key, value) {
-                    inst.settings[key] = value;
-                }).
-                bind("getData.timepicker", function (event, key) {
-                    return this._get(inst, key);
-                });
-            $.data(target, PROP_NAME, inst);
-        },
-
-        /* Handle keystrokes. */
-        _doKeyDown: function (event) {
-            var inst = $.timepicker._getInst(event.target);
-            var handled = true;
-            inst._keyEvent = true;
-            if ($.timepicker._timepickerShowing) {
-                switch (event.keyCode) {
-                    case 9: $.timepicker._hideTimepicker();
-                        handled = false;
-                        break; // hide on tab out
-                    case 13:
-                        $.timepicker._updateSelectedValue(inst);
-                        $.timepicker._hideTimepicker();
-                            
-						return false; // don't submit the form
-						break; // select the value on enter
-                    case 27: $.timepicker._hideTimepicker();
-                        break; // hide on escape
-                    default: handled = false;
-                }
-            }
-            else if (event.keyCode == 36 && event.ctrlKey) { // display the time picker on ctrl+home
-                $.timepicker._showTimepicker(this);
-            }
-            else {
-                handled = false;
-            }
-            if (handled) {
-                event.preventDefault();
-                event.stopPropagation();
-            }
-        },
-
-        /* Update selected time on keyUp */
-        /* Added verion 0.0.5 */
-        _doKeyUp: function (event) {
-            var inst = $.timepicker._getInst(event.target);
-            $.timepicker._setTimeFromField(inst);
-            $.timepicker._updateTimepicker(inst);
-        },
-
-        /* Make attachments based on settings. */
-        _attachments: function (input, inst) {
-            var appendText = this._get(inst, 'appendText');
-            var isRTL = this._get(inst, 'isRTL');
-            if (inst.append) { inst.append.remove(); }
-            if (appendText) {
-                inst.append = $('<span class="' + this._appendClass + '">' + appendText + '</span>');
-                input[isRTL ? 'before' : 'after'](inst.append);
-            }
-            input.unbind('focus.timepicker', this._showTimepicker);
-            if (inst.trigger) { inst.trigger.remove(); }
-
-            var showOn = this._get(inst, 'showOn');
-            if (showOn == 'focus' || showOn == 'both') { // pop-up time picker when in the marked field
-                input.bind("focus.timepicker", this._showTimepicker);
-            }
-            if (showOn == 'button' || showOn == 'both') { // pop-up time picker when 'button' element is clicked
-                var button = this._get(inst, 'button');
-                $(button).bind("click.timepicker", function () {
-                    if ($.timepicker._timepickerShowing && $.timepicker._lastInput == input[0]) { $.timepicker._hideTimepicker(); }
-                    else { $.timepicker._showTimepicker(input[0]); }
-                    return false;
-                });
-
-            }
-        },
-
-
-        /* Attach an inline time picker to a div. */
-        _inlineTimepicker: function(target, inst) {
-            var divSpan = $(target);
-            if (divSpan.hasClass(this.markerClassName))
-                return;
-            divSpan.addClass(this.markerClassName).append(inst.tpDiv).
-                bind("setData.timepicker", function(event, key, value){
-                    inst.settings[key] = value;
-                }).bind("getData.timepicker", function(event, key){
-                    return this._get(inst, key);
-                });
-            $.data(target, PROP_NAME, inst);
-
-            this._setTimeFromField(inst);
-            this._updateTimepicker(inst);
-            inst.tpDiv.show();
-        },
-
-        /* Pop-up the time picker for a given input field.
-        @param  input  element - the input field attached to the time picker or
-        event - if triggered by focus */
-        _showTimepicker: function (input) {
-            input = input.target || input;
-            if (input.nodeName.toLowerCase() != 'input') { input = $('input', input.parentNode)[0]; } // find from button/image trigger
-            if ($.timepicker._isDisabledTimepicker(input) || $.timepicker._lastInput == input) { return; } // already here
-
-            // fix v 0.0.8 - close current timepicker before showing another one
-            $.timepicker._hideTimepicker();
-
-            var inst = $.timepicker._getInst(input);
-            if ($.timepicker._curInst && $.timepicker._curInst != inst) {
-                $.timepicker._curInst.tpDiv.stop(true, true);
-            }
-            var beforeShow = $.timepicker._get(inst, 'beforeShow');
-            extendRemove(inst.settings, (beforeShow ? beforeShow.apply(input, [input, inst]) : {}));
-            inst.lastVal = null;
-            $.timepicker._lastInput = input;
-
-            $.timepicker._setTimeFromField(inst);
-
-            // calculate default position
-            if ($.timepicker._inDialog) { input.value = ''; } // hide cursor
-            if (!$.timepicker._pos) { // position below input
-                $.timepicker._pos = $.timepicker._findPos(input);
-                $.timepicker._pos[1] += input.offsetHeight; // add the height
-            }
-            var isFixed = false;
-            $(input).parents().each(function () {
-                isFixed |= $(this).css('position') == 'fixed';
-                return !isFixed;
-            });
-            if (isFixed && $.browser.opera) { // correction for Opera when fixed and scrolled
-                $.timepicker._pos[0] -= document.documentElement.scrollLeft;
-                $.timepicker._pos[1] -= document.documentElement.scrollTop;
-            }
-
-            var offset = { left: $.timepicker._pos[0], top: $.timepicker._pos[1] };
-
-            $.timepicker._pos = null;
-            // determine sizing offscreen
-            inst.tpDiv.css({ position: 'absolute', display: 'block', top: '-1000px' });
-            $.timepicker._updateTimepicker(inst);
-
-
-            // position with the ui position utility, if loaded
-            if ( ( ! inst.inline )  && ( typeof $.ui.position == 'object' ) ) {
-                inst.tpDiv.position({
-                    of: inst.input,
-                    my: $.timepicker._get( inst, 'myPosition' ),
-                    at: $.timepicker._get( inst, 'atPosition' ),
-                    // offset: $( "#offset" ).val(),
-                    // using: using,
-                    collision: 'flip'
-                });
-                var offset = inst.tpDiv.offset();
-                $.timepicker._pos = [offset.top, offset.left];
-            }
-
-
-            // reset clicked state
-            inst._hoursClicked = false;
-            inst._minutesClicked = false;
-
-            // fix width for dynamic number of time pickers
-            // and adjust position before showing
-            offset = $.timepicker._checkOffset(inst, offset, isFixed);
-            inst.tpDiv.css({ position: ($.timepicker._inDialog && $.blockUI ?
-			    'static' : (isFixed ? 'fixed' : 'absolute')), display: 'none',
-                left: offset.left + 'px', top: offset.top + 'px'
-            });
-            if ( ! inst.inline ) {
-                var showAnim = $.timepicker._get(inst, 'showAnim');
-                var duration = $.timepicker._get(inst, 'duration');
-
-                var postProcess = function () {
-                    $.timepicker._timepickerShowing = true;
-                    var borders = $.timepicker._getBorders(inst.tpDiv);
-                    inst.tpDiv.find('iframe.ui-timepicker-cover'). // IE6- only
-					css({ left: -borders[0], top: -borders[1],
-					    width: inst.tpDiv.outerWidth(), height: inst.tpDiv.outerHeight()
-					});
-                };
-
-                // Fixed the zIndex problem for real (I hope) - FG - v 0.2.9
-                inst.tpDiv.css('zIndex', $.timepicker._getZIndex(input) +1);
-
-                if ($.effects && $.effects[showAnim]) {
-                    inst.tpDiv.show(showAnim, $.timepicker._get(inst, 'showOptions'), duration, postProcess);
-                }
-                else {
-                    inst.tpDiv[showAnim || 'show']((showAnim ? duration : null), postProcess);
-                }
-                if (!showAnim || !duration) { postProcess(); }
-                if (inst.input.is(':visible') && !inst.input.is(':disabled')) { inst.input.focus(); }
-                $.timepicker._curInst = inst;
-            }
-        },
-
-        // This is a copy of the zIndex function of UI core 1.8.??
-        // Copied in the timepicker to stay backward compatible.
-        _getZIndex: function (target) {
-            var elem = $( target ), position, value;
-            while ( elem.length && elem[ 0 ] !== document ) {
-                position = elem.css( "position" );
-                if ( position === "absolute" || position === "relative" || position === "fixed" ) {
-                    value = parseInt( elem.css( "zIndex" ), 10 );
-                    if ( !isNaN( value ) && value !== 0 ) {
-                        return value;
-                    }
-                }
-                elem = elem.parent();
-            }
-        },
-
-        /* Generate the time picker content. */
-        _updateTimepicker: function (inst) {
-            inst.tpDiv.empty().append(this._generateHTML(inst));
-            this._rebindDialogEvents(inst);
-
-        },
-
-        _rebindDialogEvents: function (inst) {
-            var borders = $.timepicker._getBorders(inst.tpDiv),
-                self = this;
-            inst.tpDiv
-			.find('iframe.ui-timepicker-cover') // IE6- only
-				.css({ left: -borders[0], top: -borders[1],
-				    width: inst.tpDiv.outerWidth(), height: inst.tpDiv.outerHeight()
-				})
-			.end()
-            // after the picker html is appended bind the click & double click events (faster in IE this way
-            // then letting the browser interpret the inline events)
-            // the binding for the minute cells also exists in _updateMinuteDisplay
-            .find('.ui-timepicker-minute-cell')
-                .unbind()
-                .bind("click", { fromDoubleClick:false }, $.proxy($.timepicker.selectMinutes, this))
-                .bind("dblclick", { fromDoubleClick:true }, $.proxy($.timepicker.selectMinutes, this))
-            .end()
-            .find('.ui-timepicker-hour-cell')
-                .unbind()
-                .bind("click", { fromDoubleClick:false }, $.proxy($.timepicker.selectHours, this))
-                .bind("dblclick", { fromDoubleClick:true }, $.proxy($.timepicker.selectHours, this))
-            .end()
-			.find('.ui-timepicker td a')
-                .unbind()
-				.bind('mouseout', function () {
-				    $(this).removeClass('ui-state-hover');
-				    if (this.className.indexOf('ui-timepicker-prev') != -1) $(this).removeClass('ui-timepicker-prev-hover');
-				    if (this.className.indexOf('ui-timepicker-next') != -1) $(this).removeClass('ui-timepicker-next-hover');
-				})
-				.bind('mouseover', function () {
-				    if ( ! self._isDisabledTimepicker(inst.inline ? inst.tpDiv.parent()[0] : inst.input[0])) {
-				        $(this).parents('.ui-timepicker-calendar').find('a').removeClass('ui-state-hover');
-				        $(this).addClass('ui-state-hover');
-				        if (this.className.indexOf('ui-timepicker-prev') != -1) $(this).addClass('ui-timepicker-prev-hover');
-				        if (this.className.indexOf('ui-timepicker-next') != -1) $(this).addClass('ui-timepicker-next-hover');
-				    }
-				})
-			.end()
-			.find('.' + this._dayOverClass + ' a')
-				.trigger('mouseover')
-			.end()
-            .find('.ui-timepicker-now').bind("click",function(e) {
-                    $.timepicker.selectNow(e);
-            }).end()
-            .find('.ui-timepicker-deselect').bind("click",function(e) {
-                    $.timepicker.deselectTime(e);
-            }).end()
-            .find('.ui-timepicker-close').bind("click",function(e) {
-                    $.timepicker._hideTimepicker();
-            }).end();
-        },
-
-        /* Generate the HTML for the current state of the time picker. */
-        _generateHTML: function (inst) {
-
-            var h, m, row, col, html, hoursHtml, minutesHtml = '',
-                showPeriod = (this._get(inst, 'showPeriod') == true),
-                showPeriodLabels = (this._get(inst, 'showPeriodLabels') == true),
-                showLeadingZero = (this._get(inst, 'showLeadingZero') == true),
-                showHours = (this._get(inst, 'showHours') == true),
-                showMinutes = (this._get(inst, 'showMinutes') == true),
-                amPmText = this._get(inst, 'amPmText'),
-                rows = this._get(inst, 'rows'),
-                amRows = 0,
-                pmRows = 0,
-                amItems = 0,
-                pmItems = 0,
-                amFirstRow = 0,
-                pmFirstRow = 0,
-                hours = Array(),
-                hours_options = this._get(inst, 'hours'),
-                hoursPerRow = null,
-                hourCounter = 0,
-                hourLabel = this._get(inst, 'hourText'),
-                showCloseButton = this._get(inst, 'showCloseButton'),
-                closeButtonText = this._get(inst, 'closeButtonText'),
-                showNowButton = this._get(inst, 'showNowButton'),
-                nowButtonText = this._get(inst, 'nowButtonText'),
-                showDeselectButton = this._get(inst, 'showDeselectButton'),
-                deselectButtonText = this._get(inst, 'deselectButtonText'),
-                showButtonPanel = showCloseButton || showNowButton || showDeselectButton;
-            
-
-
-            // prepare all hours and minutes, makes it easier to distribute by rows
-            for (h = hours_options.starts; h <= hours_options.ends; h++) {
-                hours.push (h);
-            }
-            hoursPerRow = Math.ceil(hours.length / rows); // always round up
-
-            if (showPeriodLabels) {
-                for (hourCounter = 0; hourCounter < hours.length; hourCounter++) {
-                    if (hours[hourCounter] < 12) {
-                        amItems++;
-                    }
-                    else {
-                        pmItems++;
-                    }
-                }
-                hourCounter = 0; 
-
-                amRows = Math.floor(amItems / hours.length * rows);
-                pmRows = Math.floor(pmItems / hours.length * rows);
-
-                // assign the extra row to the period that is more densly populated
-                if (rows != amRows + pmRows) {
-                    // Make sure: AM Has Items and either PM Does Not, AM has no rows yet, or AM is more dense
-                    if (amItems && (!pmItems || !amRows || (pmRows && amItems / amRows >= pmItems / pmRows))) {
-                        amRows++;
-                    } else {
-                        pmRows++;
-                    }
-                }
-                amFirstRow = Math.min(amRows, 1);
-                pmFirstRow = amRows + 1;
-                hoursPerRow = Math.ceil(Math.max(amItems / amRows, pmItems / pmRows));
-            }
-
-
-            html = '<table class="ui-timepicker-table ui-widget-content ui-corner-all"><tr>';
-
-            if (showHours) {
-
-                html += '<td class="ui-timepicker-hours">' +
-                        '<div class="ui-timepicker-title ui-widget-header ui-helper-clearfix ui-corner-all">' +
-                        hourLabel +
-                        '</div>' +
-                        '<table class="ui-timepicker">';
-
-                for (row = 1; row <= rows; row++) {
-                    html += '<tr>';
-                    // AM
-                    if (row == amFirstRow && showPeriodLabels) {
-                        html += '<th rowspan="' + amRows.toString() + '" class="periods" scope="row">' + amPmText[0] + '</th>';
-                    }
-                    // PM
-                    if (row == pmFirstRow && showPeriodLabels) {
-                        html += '<th rowspan="' + pmRows.toString() + '" class="periods" scope="row">' + amPmText[1] + '</th>';
-                    }
-                    for (col = 1; col <= hoursPerRow; col++) {
-                        if (showPeriodLabels && row < pmFirstRow && hours[hourCounter] >= 12) {
-                            html += this._generateHTMLHourCell(inst, undefined, showPeriod, showLeadingZero);
-                        } else {
-                            html += this._generateHTMLHourCell(inst, hours[hourCounter], showPeriod, showLeadingZero);
-                            hourCounter++;
-                        }
-                    }
-                    html += '</tr>';
-                }
-                html += '</tr></table>' + // Close the hours cells table
-                        '</td>';          // Close the Hour td
-            }
-
-            if (showMinutes) {
-                html += '<td class="ui-timepicker-minutes">';
-                html += this._generateHTMLMinutes(inst);
-                html += '</td>';
-            }
-            
-            html += '</tr>';
-
-
-            if (showButtonPanel) {
-                var buttonPanel = '<tr><td colspan="3"><div class="ui-timepicker-buttonpane ui-widget-content">';
-                if (showNowButton) {
-                    buttonPanel += '<button type="button" class="ui-timepicker-now ui-state-default ui-corner-all" '
-                                   + ' data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" >'
-                                   + nowButtonText + '</button>';
-                }
-                if (showDeselectButton) {
-                    buttonPanel += '<button type="button" class="ui-timepicker-deselect ui-state-default ui-corner-all" '
-                                   + ' data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" >'
-                                   + deselectButtonText + '</button>';
-                }
-                if (showCloseButton) {
-                    buttonPanel += '<button type="button" class="ui-timepicker-close ui-state-default ui-corner-all" '
-                                   + ' data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" >'
-                                   + closeButtonText + '</button>';
-                }
-
-                html += buttonPanel + '</div></td></tr>';
-            }
-            html += '</table>';
-
-             /* IE6 IFRAME FIX (taken from datepicker 1.5.3, fixed in 0.1.2 */
-            html += ($.browser.msie && parseInt($.browser.version,10) < 7 && !inst.inline ?
-                '<iframe src="javascript:false;" class="ui-timepicker-cover" frameborder="0"></iframe>' : '');
-
-            return html;
-        },
-
-        /* Special function that update the minutes selection in currently visible timepicker
-         * called on hour selection when onMinuteShow is defined  */
-        _updateMinuteDisplay: function (inst) {
-            var newHtml = this._generateHTMLMinutes(inst);
-            inst.tpDiv.find('td.ui-timepicker-minutes').html(newHtml);
-            this._rebindDialogEvents(inst);
-                // after the picker html is appended bind the click & double click events (faster in IE this way
-                // then letting the browser interpret the inline events)
-                // yes I know, duplicate code, sorry
-/*                .find('.ui-timepicker-minute-cell')
-                    .bind("click", { fromDoubleClick:false }, $.proxy($.timepicker.selectMinutes, this))
-                    .bind("dblclick", { fromDoubleClick:true }, $.proxy($.timepicker.selectMinutes, this));
-*/
-
-        },
-
-        /*
-         * Generate the minutes table
-         * This is separated from the _generateHTML function because is can be called separately (when hours changes)
-         */
-        _generateHTMLMinutes: function (inst) {
-
-            var m, row, html = '',
-                rows = this._get(inst, 'rows'),
-                minutes = Array(),
-                minutes_options = this._get(inst, 'minutes'),
-                minutesPerRow = null,
-                minuteCounter = 0,
-                showMinutesLeadingZero = (this._get(inst, 'showMinutesLeadingZero') == true),
-                onMinuteShow = this._get(inst, 'onMinuteShow'),
-                minuteLabel = this._get(inst, 'minuteText');
-
-            if ( ! minutes_options.starts) {
-                minutes_options.starts = 0;
-            }
-            if ( ! minutes_options.ends) {
-                minutes_options.ends = 59;
-            }
-            for (m = minutes_options.starts; m <= minutes_options.ends; m += minutes_options.interval) {
-                minutes.push(m);
-            }
-            minutesPerRow = Math.round(minutes.length / rows + 0.49); // always round up
-
-            /*
-             * The minutes table
-             */
-            // if currently selected minute is not enabled, we have a problem and need to select a new minute.
-            if (onMinuteShow &&
-                (onMinuteShow.apply((inst.input ? inst.input[0] : null), [inst.hours , inst.minutes]) == false) ) {
-                // loop minutes and select first available
-                for (minuteCounter = 0; minuteCounter < minutes.length; minuteCounter += 1) {
-                    m = minutes[minuteCounter];
-                    if (onMinuteShow.apply((inst.input ? inst.input[0] : null), [inst.hours, m])) {
-                        inst.minutes = m;
-                        break;
-                    }
-                }
-            }
-
-
-
-            html += '<div class="ui-timepicker-title ui-widget-header ui-helper-clearfix ui-corner-all">' +
-                    minuteLabel +
-                    '</div>' +
-                    '<table class="ui-timepicker">';
-            
-            minuteCounter = 0;
-            for (row = 1; row <= rows; row++) {
-                html += '<tr>';
-                while (minuteCounter < row * minutesPerRow) {
-                    var m = minutes[minuteCounter];
-                    var displayText = '';
-                    if (m !== undefined ) {
-                        displayText = (m < 10) && showMinutesLeadingZero ? "0" + m.toString() : m.toString();
-                    }
-                    html += this._generateHTMLMinuteCell(inst, m, displayText);
-                    minuteCounter++;
-                }
-                html += '</tr>';
-            }
-
-            html += '</table>';
-
-            return html;
-        },
-
-        /* Generate the content of a "Hour" cell */
-        _generateHTMLHourCell: function (inst, hour, showPeriod, showLeadingZero) {
-
-            var displayHour = hour;
-            if ((hour > 12) && showPeriod) {
-                displayHour = hour - 12;
-            }
-            if ((displayHour == 0) && showPeriod) {
-                displayHour = 12;
-            }
-            if ((displayHour < 10) && showLeadingZero) {
-                displayHour = '0' + displayHour;
-            }
-
-            var html = "";
-            var enabled = true;
-            var onHourShow = this._get(inst, 'onHourShow');		//custom callback
-
-            if (hour == undefined) {
-                html = '<td><span class="ui-state-default ui-state-disabled">&nbsp;</span></td>';
-                return html;
-            }
-
-            if (onHourShow) {
-            	enabled = onHourShow.apply((inst.input ? inst.input[0] : null), [hour]);
-            }
-
-            if (enabled) {
-                html = '<td class="ui-timepicker-hour-cell" data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" data-hour="' + hour.toString() + '">' +
-                   '<a class="ui-state-default ' +
-                   (hour == inst.hours ? 'ui-state-active' : '') +
-                   '">' +
-                   displayHour.toString() +
-                   '</a></td>';
-            }
-            else {
-            	html =
-            		'<td>' +
-		                '<span class="ui-state-default ui-state-disabled ' +
-		                (hour == inst.hours ? ' ui-state-active ' : ' ') +
-		                '">' +
-		                displayHour.toString() +
-		                '</span>' +
-		            '</td>';
-            }
-            return html;
-        },
-
-        /* Generate the content of a "Hour" cell */
-        _generateHTMLMinuteCell: function (inst, minute, displayText) {
-        	 var html = "";
-             var enabled = true;
-             var onMinuteShow = this._get(inst, 'onMinuteShow');		//custom callback
-             if (onMinuteShow) {
-            	 //NEW: 2011-02-03  we should give the hour as a parameter as well!
-             	enabled = onMinuteShow.apply((inst.input ? inst.input[0] : null), [inst.hours,minute]);		//trigger callback
-             }
-
-             if (minute == undefined) {
-                 html = '<td><span class="ui-state-default ui-state-disabled">&nbsp;</span></td>';
-                 return html;
-             }
-
-             if (enabled) {
-	             html = '<td class="ui-timepicker-minute-cell" data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" data-minute="' + minute.toString() + '" >' +
-	                   '<a class="ui-state-default ' +
-	                   (minute == inst.minutes ? 'ui-state-active' : '') +
-	                   '" >' +
-	                   displayText +
-	                   '</a></td>';
-             }
-             else {
-
-            	html = '<td>' +
-	                 '<span class="ui-state-default ui-state-disabled" >' +
-	                 	displayText +
-	                 '</span>' +
-                 '</td>';
-             }
-             return html;
-        },
-
-
-        /* Enable the date picker to a jQuery selection.
-           @param  target    element - the target input field or division or span */
-        _enableTimepicker: function(target) {
-            var $target = $(target),
-                target_id = $target.attr('id'),
-                inst = $.data(target, PROP_NAME);
-            
-            if (!$target.hasClass(this.markerClassName)) {
-                return;
-            }
-            var nodeName = target.nodeName.toLowerCase();
-            if (nodeName == 'input') {
-                target.disabled = false;
-                inst.trigger.filter('button').
-                    each(function() { this.disabled = false; }).end();
-            }
-            else if (nodeName == 'div' || nodeName == 'span') {
-                var inline = $target.children('.' + this._inlineClass);
-                inline.children().removeClass('ui-state-disabled');
-            }
-            this._disabledInputs = $.map(this._disabledInputs,
-                function(value) { return (value == target_id ? null : value); }); // delete entry
-        },
-
-        /* Disable the time picker to a jQuery selection.
-           @param  target    element - the target input field or division or span */
-        _disableTimepicker: function(target) {
-            var $target = $(target);
-            var inst = $.data(target, PROP_NAME);
-            if (!$target.hasClass(this.markerClassName)) {
-                return;
-            }
-            var nodeName = target.nodeName.toLowerCase();
-            if (nodeName == 'input') {
-                target.disabled = true;
-
-                inst.trigger.filter('button').
-                    each(function() { this.disabled = true; }).end();
-
-            }
-            else if (nodeName == 'div' || nodeName == 'span') {
-                var inline = $target.children('.' + this._inlineClass);
-                inline.children().addClass('ui-state-disabled');
-            }
-            this._disabledInputs = $.map(this._disabledInputs,
-                function(value) { return (value == target ? null : value); }); // delete entry
-            this._disabledInputs[this._disabledInputs.length] = $target.attr('id');
-        },
-
-        /* Is the first field in a jQuery collection disabled as a timepicker?
-        @param  target_id element - the target input field or division or span
-        @return boolean - true if disabled, false if enabled */
-        _isDisabledTimepicker: function (target_id) {
-            if ( ! target_id) { return false; }
-            for (var i = 0; i < this._disabledInputs.length; i++) {
-                if (this._disabledInputs[i] == target_id) { return true; }
-            }
-            return false;
-        },
-
-        /* Check positioning to remain on screen. */
-        _checkOffset: function (inst, offset, isFixed) {
-            var tpWidth = inst.tpDiv.outerWidth();
-            var tpHeight = inst.tpDiv.outerHeight();
-            var inputWidth = inst.input ? inst.input.outerWidth() : 0;
-            var inputHeight = inst.input ? inst.input.outerHeight() : 0;
-            var viewWidth = document.documentElement.clientWidth + $(document).scrollLeft();
-            var viewHeight = document.documentElement.clientHeight + $(document).scrollTop();
-
-            offset.left -= (this._get(inst, 'isRTL') ? (tpWidth - inputWidth) : 0);
-            offset.left -= (isFixed && offset.left == inst.input.offset().left) ? $(document).scrollLeft() : 0;
-            offset.top -= (isFixed && offset.top == (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0;
-
-            // now check if datepicker is showing outside window viewport - move to a better place if so.
-            offset.left -= Math.min(offset.left, (offset.left + tpWidth > viewWidth && viewWidth > tpWidth) ?
-			Math.abs(offset.left + tpWidth - viewWidth) : 0);
-            offset.top -= Math.min(offset.top, (offset.top + tpHeight > viewHeight && viewHeight > tpHeight) ?
-			Math.abs(tpHeight + inputHeight) : 0);
-
-            return offset;
-        },
-
-        /* Find an object's position on the screen. */
-        _findPos: function (obj) {
-            var inst = this._getInst(obj);
-            var isRTL = this._get(inst, 'isRTL');
-            while (obj && (obj.type == 'hidden' || obj.nodeType != 1)) {
-                obj = obj[isRTL ? 'previousSibling' : 'nextSibling'];
-            }
-            var position = $(obj).offset();
-            return [position.left, position.top];
-        },
-
-        /* Retrieve the size of left and top borders for an element.
-        @param  elem  (jQuery object) the element of interest
-        @return  (number[2]) the left and top borders */
-        _getBorders: function (elem) {
-            var convert = function (value) {
-                return { thin: 1, medium: 2, thick: 3}[value] || value;
-            };
-            return [parseFloat(convert(elem.css('border-left-width'))),
-			parseFloat(convert(elem.css('border-top-width')))];
-        },
-
-
-        /* Close time picker if clicked elsewhere. */
-        _checkExternalClick: function (event) {
-            if (!$.timepicker._curInst) { return; }
-            var $target = $(event.target);
-            if ($target[0].id != $.timepicker._mainDivId &&
-				$target.parents('#' + $.timepicker._mainDivId).length == 0 &&
-				!$target.hasClass($.timepicker.markerClassName) &&
-				!$target.hasClass($.timepicker._triggerClass) &&
-				$.timepicker._timepickerShowing && !($.timepicker._inDialog && $.blockUI))
-                $.timepicker._hideTimepicker();
-        },
-
-        /* Hide the time picker from view.
-        @param  input  element - the input field attached to the time picker */
-        _hideTimepicker: function (input) {
-            var inst = this._curInst;
-            if (!inst || (input && inst != $.data(input, PROP_NAME))) { return; }
-            if (this._timepickerShowing) {
-                var showAnim = this._get(inst, 'showAnim');
-                var duration = this._get(inst, 'duration');
-                var postProcess = function () {
-                    $.timepicker._tidyDialog(inst);
-                    this._curInst = null;
-                };
-                if ($.effects && $.effects[showAnim]) {
-                    inst.tpDiv.hide(showAnim, $.timepicker._get(inst, 'showOptions'), duration, postProcess);
-                }
-                else {
-                    inst.tpDiv[(showAnim == 'slideDown' ? 'slideUp' :
-					    (showAnim == 'fadeIn' ? 'fadeOut' : 'hide'))]((showAnim ? duration : null), postProcess);
-                }
-                if (!showAnim) { postProcess(); }
-                var onClose = this._get(inst, 'onClose');
-                if (onClose) {
-                    onClose.apply(
-                        (inst.input ? inst.input[0] : null),
-					    [(inst.input ? inst.input.val() : ''), inst]);  // trigger custom callback
-                }
-                this._timepickerShowing = false;
-                this._lastInput = null;
-                if (this._inDialog) {
-                    this._dialogInput.css({ position: 'absolute', left: '0', top: '-100px' });
-                    if ($.blockUI) {
-                        $.unblockUI();
-                        $('body').append(this.tpDiv);
-                    }
-                }
-                this._inDialog = false;
-            }
-        },
-
-
-
-        /* Tidy up after a dialog display. */
-        _tidyDialog: function (inst) {
-            inst.tpDiv.removeClass(this._dialogClass).unbind('.ui-timepicker');
-        },
-
-        /* Retrieve the instance data for the target control.
-        @param  target  element - the target input field or division or span
-        @return  object - the associated instance data
-        @throws  error if a jQuery problem getting data */
-        _getInst: function (target) {
-            try {
-                return $.data(target, PROP_NAME);
-            }
-            catch (err) {
-                throw 'Missing instance data for this timepicker';
-            }
-        },
-
-        /* Get a setting value, defaulting if necessary. */
-        _get: function (inst, name) {
-            return inst.settings[name] !== undefined ?
-			inst.settings[name] : this._defaults[name];
-        },
-
-        /* Parse existing time and initialise time picker. */
-        _setTimeFromField: function (inst) {
-            if (inst.input.val() == inst.lastVal) { return; }
-            var defaultTime = this._get(inst, 'defaultTime');
-
-            var timeToParse = defaultTime == 'now' ? this._getCurrentTimeRounded(inst) : defaultTime;
-            if ((inst.inline == false) && (inst.input.val() != '')) { timeToParse = inst.input.val() }
-
-            if (timeToParse instanceof Date) {
-                inst.hours = timeToParse.getHours();
-                inst.minutes = timeToParse.getMinutes();
-            } else {
-                var timeVal = inst.lastVal = timeToParse;
-                if (timeToParse == '') {
-                    inst.hours = -1;
-                    inst.minutes = -1;
-                } else {
-                    var time = this.parseTime(inst, timeVal);
-                    inst.hours = time.hours;
-                    inst.minutes = time.minutes;
-                }
-            }
-
-
-            $.timepicker._updateTimepicker(inst);
-        },
-
-        /* Update or retrieve the settings for an existing time picker.
-           @param  target  element - the target input field or division or span
-           @param  name    object - the new settings to update or
-                           string - the name of the setting to change or retrieve,
-                           when retrieving also 'all' for all instance settings or
-                           'defaults' for all global defaults
-           @param  value   any - the new value for the setting
-                       (omit if above is an object or to retrieve a value) */
-        _optionTimepicker: function(target, name, value) {
-            var inst = this._getInst(target);
-            if (arguments.length == 2 && typeof name == 'string') {
-                return (name == 'defaults' ? $.extend({}, $.timepicker._defaults) :
-                    (inst ? (name == 'all' ? $.extend({}, inst.settings) :
-                    this._get(inst, name)) : null));
-            }
-            var settings = name || {};
-            if (typeof name == 'string') {
-                settings = {};
-                settings[name] = value;
-            }
-            if (inst) {
-                if (this._curInst == inst) {
-                    this._hideTimepicker();
-                }
-                extendRemove(inst.settings, settings);
-                this._updateTimepicker(inst);
-            }
-        },
-
-
-        /* Set the time for a jQuery selection.
-	    @param  target  element - the target input field or division or span
-	    @param  time    String - the new time */
-	    _setTimeTimepicker: function(target, time) {
-		    var inst = this._getInst(target);
-		    if (inst) {
-			    this._setTime(inst, time);
-    			this._updateTimepicker(inst);
-	    		this._updateAlternate(inst, time);
-		    }
-	    },
-
-        /* Set the time directly. */
-        _setTime: function(inst, time, noChange) {
-            var origHours = inst.hours;
-            var origMinutes = inst.minutes;
-            var time = this.parseTime(inst, time);
-            inst.hours = time.hours;
-            inst.minutes = time.minutes;
-
-            if ((origHours != inst.hours || origMinutes != inst.minuts) && !noChange) {
-                inst.input.trigger('change');
-            }
-            this._updateTimepicker(inst);
-            this._updateSelectedValue(inst);
-        },
-
-        /* Return the current time, ready to be parsed, rounded to the closest 5 minute */
-        _getCurrentTimeRounded: function (inst) {
-            var currentTime = new Date(),
-                currentMinutes = currentTime.getMinutes(),
-                // round to closest 5
-                adjustedMinutes = Math.round( currentMinutes / 5 ) * 5;
-            currentTime.setMinutes(adjustedMinutes);
-            return currentTime;
-        },
-
-        /*
-        * Parse a time string into hours and minutes
-        */
-        parseTime: function (inst, timeVal) {
-            var retVal = new Object();
-            retVal.hours = -1;
-            retVal.minutes = -1;
-
-            var timeSeparator = this._get(inst, 'timeSeparator'),
-                amPmText = this._get(inst, 'amPmText'),
-                showHours = this._get(inst, 'showHours'),
-                showMinutes = this._get(inst, 'showMinutes'),
-                optionalMinutes = this._get(inst, 'optionalMinutes'),
-                showPeriod = (this._get(inst, 'showPeriod') == true),
-                p = timeVal.indexOf(timeSeparator);
-
-            // check if time separator found
-            if (p != -1) {
-                retVal.hours = parseInt(timeVal.substr(0, p), 10);
-                retVal.minutes = parseInt(timeVal.substr(p + 1), 10);
-            }
-            // check for hours only
-            else if ( (showHours) && ( !showMinutes || optionalMinutes ) ) {
-                retVal.hours = parseInt(timeVal, 10);
-            }
-            // check for minutes only
-            else if ( ( ! showHours) && (showMinutes) ) {
-                retVal.minutes = parseInt(timeVal, 10);
-            }
-
-            if (showHours) {
-                var timeValUpper = timeVal.toUpperCase();
-                if ((retVal.hours < 12) && (showPeriod) && (timeValUpper.indexOf(amPmText[1].toUpperCase()) != -1)) {
-                    retVal.hours += 12;
-                }
-                // fix for 12 AM
-                if ((retVal.hours == 12) && (showPeriod) && (timeValUpper.indexOf(amPmText[0].toUpperCase()) != -1)) {
-                    retVal.hours = 0;
-                }
-            }
-            
-            return retVal;
-        },
-
-        selectNow: function(e) {
-
-            var id = $(e.target).attr("data-timepicker-instance-id"),
-                $target = $(id),
-                inst = this._getInst($target[0]);
-
-            //if (!inst || (input && inst != $.data(input, PROP_NAME))) { return; }
-            var currentTime = new Date();
-            inst.hours = currentTime.getHours();
-            inst.minutes = currentTime.getMinutes();
-            this._updateSelectedValue(inst);
-            this._updateTimepicker(inst);
-            this._hideTimepicker();
-        },
-
-        deselectTime: function(e) {
-            var id = $(e.target).attr("data-timepicker-instance-id"),
-                $target = $(id),
-                inst = this._getInst($target[0]);
-            inst.hours = -1;
-            inst.minutes = -1;
-            this._updateSelectedValue(inst);
-            this._hideTimepicker();
-        },
-
-
-        selectHours: function (event) {
-            var $td = $(event.currentTarget),
-                id = $td.attr("data-timepicker-instance-id"),
-                newHours = $td.attr("data-hour"),
-                fromDoubleClick = event.data.fromDoubleClick,
-                $target = $(id),
-                inst = this._getInst($target[0]),
-                showMinutes = (this._get(inst, 'showMinutes') == true);
-
-            // don't select if disabled
-            if ( $.timepicker._isDisabledTimepicker($target.attr('id')) ) { return false }
-
-            $td.parents('.ui-timepicker-hours:first').find('a').removeClass('ui-state-active');
-            $td.children('a').addClass('ui-state-active');
-            inst.hours = newHours;
-
-            // added for onMinuteShow callback
-            var onMinuteShow = this._get(inst, 'onMinuteShow');
-            if (onMinuteShow) {
-                // this will trigger a callback on selected hour to make sure selected minute is allowed. 
-                this._updateMinuteDisplay(inst);
-            }
-
-            this._updateSelectedValue(inst);
-
-            inst._hoursClicked = true;
-            if ((inst._minutesClicked) || (fromDoubleClick) || (showMinutes == false)) {
-                $.timepicker._hideTimepicker();
-            }
-            // return false because if used inline, prevent the url to change to a hashtag
-            return false;
-        },
-
-        selectMinutes: function (event) {
-            var $td = $(event.currentTarget),
-                id = $td.attr("data-timepicker-instance-id"),
-                newMinutes = $td.attr("data-minute"),
-                fromDoubleClick = event.data.fromDoubleClick,
-                $target = $(id),
-                inst = this._getInst($target[0]),
-                showHours = (this._get(inst, 'showHours') == true);
-
-            // don't select if disabled
-            if ( $.timepicker._isDisabledTimepicker($target.attr('id')) ) { return false }
-
-            $td.parents('.ui-timepicker-minutes:first').find('a').removeClass('ui-state-active');
-            $td.children('a').addClass('ui-state-active');
-
-            inst.minutes = newMinutes;
-            this._updateSelectedValue(inst);
-
-            inst._minutesClicked = true;
-            if ((inst._hoursClicked) || (fromDoubleClick) || (showHours == false)) {
-                $.timepicker._hideTimepicker();
-                // return false because if used inline, prevent the url to change to a hashtag
-                return false;
-            }
-
-            // return false because if used inline, prevent the url to change to a hashtag
-            return false;
-        },
-
-        _updateSelectedValue: function (inst) {
-            var newTime = this._getParsedTime(inst);
-            if (inst.input) {
-                inst.input.val(newTime);
-                inst.input.trigger('change');
-            }
-            var onSelect = this._get(inst, 'onSelect');
-            if (onSelect) { onSelect.apply((inst.input ? inst.input[0] : null), [newTime, inst]); } // trigger custom callback
-            this._updateAlternate(inst, newTime);
-            return newTime;
-        },
-        
-        /* this function process selected time and return it parsed according to instance options */
-        _getParsedTime: function(inst) {
-
-            if (inst.hours == -1 && inst.minutes == -1) {
-                return '';
-            }
-
-            if ((inst.hours < 0) || (inst.hours > 23)) { inst.hours = 12; }
-            if ((inst.minutes < 0) || (inst.minutes > 59)) { inst.minutes = 0; }
-
-            var period = "",
-                showPeriod = (this._get(inst, 'showPeriod') == true),
-                showLeadingZero = (this._get(inst, 'showLeadingZero') == true),
-                showHours = (this._get(inst, 'showHours') == true),
-                showMinutes = (this._get(inst, 'showMinutes') == true),
-                optionalMinutes = (this._get(inst, 'optionalMinutes') == true),
-                amPmText = this._get(inst, 'amPmText'),
-                selectedHours = inst.hours ? inst.hours : 0,
-                selectedMinutes = inst.minutes ? inst.minutes : 0,
-                displayHours = selectedHours ? selectedHours : 0,
-                parsedTime = '';
-
-            if (showPeriod) { 
-                if (inst.hours == 0) {
-                    displayHours = 12;
-                }
-                if (inst.hours < 12) {
-                    period = amPmText[0];
-                }
-                else {
-                    period = amPmText[1];
-                    if (displayHours > 12) {
-                        displayHours -= 12;
-                    }
-                }
-            }
-
-            var h = displayHours.toString();
-            if (showLeadingZero && (displayHours < 10)) { h = '0' + h; }
-
-            var m = selectedMinutes.toString();
-            if (selectedMinutes < 10) { m = '0' + m; }
-
-            if (showHours) {
-                parsedTime += h;
-            }
-            if (showHours && showMinutes && (!optionalMinutes || m != 0)) {
-                parsedTime += this._get(inst, 'timeSeparator');
-            }
-            if (showMinutes && (!optionalMinutes || m != 0)) {
-                parsedTime += m;
-            }
-            if (showHours) {
-                if (period.length > 0) { parsedTime += this._get(inst, 'periodSeparator') + period; }
-            }
-            
-            return parsedTime;
-        },
-        
-        /* Update any alternate field to synchronise with the main field. */
-        _updateAlternate: function(inst, newTime) {
-            var altField = this._get(inst, 'altField');
-            if (altField) { // update alternate field too
-                $(altField).each(function(i,e) {
-                    $(e).val(newTime);
-                });
-            }
-        },
-
-        /* This might look unused but it's called by the $.fn.timepicker function with param getTime */
-        /* added v 0.2.3 - gitHub issue #5 - Thanks edanuff */
-        _getTimeTimepicker : function(input) {
-            var inst = this._getInst(input);
-            return this._getParsedTime(inst);
-        },
-        _getHourTimepicker: function(input) {
-            var inst = this._getInst(input);
-            if ( inst == undefined) { return -1; }
-            return inst.hours;
-        },
-        _getMinuteTimepicker: function(input) {
-            var inst= this._getInst(input);
-            if ( inst == undefined) { return -1; }
-            return inst.minutes;
-        }
-
-    });
-
-
-
-    /* Invoke the timepicker functionality.
-    @param  options  string - a command, optionally followed by additional parameters or
-    Object - settings for attaching new timepicker functionality
-    @return  jQuery object */
-    $.fn.timepicker = function (options) {
-
-        /* Initialise the time picker. */
-        if (!$.timepicker.initialized) {
-            $(document).mousedown($.timepicker._checkExternalClick).
-			find('body').append($.timepicker.tpDiv);
-            $.timepicker.initialized = true;
-        }
-
-        var otherArgs = Array.prototype.slice.call(arguments, 1);
-        if (typeof options == 'string' && (options == 'getTime' || options == 'getHour' || options == 'getMinute' ))
-            return $.timepicker['_' + options + 'Timepicker'].
-			    apply($.timepicker, [this[0]].concat(otherArgs));
-        if (options == 'option' && arguments.length == 2 && typeof arguments[1] == 'string')
-            return $.timepicker['_' + options + 'Timepicker'].
-                apply($.timepicker, [this[0]].concat(otherArgs));
-        return this.each(function () {
-            typeof options == 'string' ?
-			$.timepicker['_' + options + 'Timepicker'].
-				apply($.timepicker, [this].concat(otherArgs)) :
-			$.timepicker._attachTimepicker(this, options);
-        });
-    };
-
-    /* jQuery extend now ignores nulls! */
-    function extendRemove(target, props) {
-        $.extend(target, props);
-        for (var name in props)
-            if (props[name] == null || props[name] == undefined)
-                target[name] = props[name];
-        return target;
-    };
-
-    $.timepicker = new Timepicker(); // singleton instance
-    $.timepicker.initialized = false;
-    $.timepicker.uuid = new Date().getTime();
-    $.timepicker.version = "0.2.9";
-
-    // Workaround for #4055
-    // Add another global to avoid noConflict issues with inline event handlers
-    window['TP_jQuery_' + tpuuid] = $;
-
-})(jQuery);
diff --git a/3rdparty/timepicker/releases.txt b/3rdparty/timepicker/releases.txt
deleted file mode 100644
index 64622d49429..00000000000
--- a/3rdparty/timepicker/releases.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-Release 0.2.9 - November 13, 2011
-Fixed the zIndex problem and removed the zIndex option (Thanks everyone who reported the problem)
-Fix a bug where repeatedly clicking on hour cells made the timepicker very slow.
-Added Italian translation, thanks to Serge Margarita.
-
-Release 0.2.8 - November 5, 2011
-Updated "defaultTime" to allow for Date object (github issue #26)
-Fixed the now and deselect buttons in IE
-
-Release 0.2.7 - October 19, 2011
-Added option to omit minutes in parsed time when user select 0 for minutes. (Thanks tribalvibes, Github issue #23)
-Added support for internationalisation (fr, de and ja, Thanks Bernd Plagge).
-
-Release 0.2.6 - October 12, 2011
-Fixed a bug when input ID have more then one special char. (Thamks Jacqueline Krijnen)
-Fixed a bug when parsing hours only or minutes only time. (Thanks protron, <a href="https://github.com/fgelinas/timepicker/issues/20">github issue #20</a>)
-Added 'Now', 'Deselect' and 'Close' buttons. (Thanks Christian Grobmeier for the close button code, <a href="https://github.com/fgelinas/timepicker/issues/20">github issue #22</a>)
-
-Release 0.2.5 - September 13, 2011
-Added support for disable and enable. (Suggested by danielrex, github issue #17)
-Added an example for 2 timepicker to behave as a period selector (start time and end time). (Thanks Bill Pellowe)
-Renamed the stylesheet to jquery.ui.timepicker.css to be more consistent with jQuery UI file name convention.
-
-Release 0.2.4 - August 5, 2011
-Fixed the hand cursor in the css file. (Thanks Mike Neumegen)
-Added position option to use with the jquery ui position utility.
-Added option to display only hours or only minutes.
-
-Release 0.2.3 - July 11, 2011
-Fix github issue #3 : Bug when hours or minutes choices does not divide by number of rows (thanks wukimus)
-Changed default behavior of the defaultTime option, if set to '' and input is empty, there will be no highlighted time in the popup (Thanks Rasmus Schultz)
-Fix github issue #4 : Error when generating empty minute cell. (Thanks 123Haynes)
-Fix github issue #5 : Add functionality for "getTime" option. (Thanks edanuff)
-Added the periodSeparator option. (thanks jrchamp)
-Fixed "getTime" for inline timepickers. (thanks Mike Neumegen)
-Added "getHour" and "getMinute" to get individual values.
-
-Release 0.2.2 - June 16, 2011
-Fixed a "console.log" line that I forgot to remove before release 0.2.1
-
-Release 0.2.1 - June 12, 2011
-Timepicker does not give the focus back to the input any more after time selection. This is similar to the datepicker behaviour and is more natural to the user because it shows the dialog again when the user click on the input again, as expected.
-Added options to customize the hours and minutes ranges and interval for more customization.
-
-Release 0.2 - May 28, 2011
-So in the previous release I mixed up versions and lost some changes, I guess that's what happen when you drink and code.
-
-Release 0.1.2 - May 26, 2011
-Fixed a bug with inline timepickers that would append a #timepickr hashtag when selecting hours and minutes.
-Fixed z-index problem with IE6 (Thanks Graham Bentley)
-Added selection of highlighted text when enter is pressed on the input field (Thanks Glen Chiacchieri)
-Adjusted some focus problems, now the input gets the focus back when the used click on hours / minutes.
-
-Release 0.1.something aka the lost release - around April 11
-Fixed a bug for when input Id had a dot in it, it was getting double escaped when it should not. (Thanks Zdenek Machac)
-So in 0.1.1 I created a bug that made timepicker changes the location hash, well now it's fixed. (Thanks Lucas Falk)
-
-Release 0.1.1 - April 6, 2011
-Changed the cells click and dblclick binding for faster rendering in IE6/7 (Thanks Blair Parsons)
-Fixed a class naming bug created in 0.1.0 (Thanks Morlion Peter)
-
-Release 0.1.0 - March 23, 2011
-Fixed some bugs with release 0.0.9
-
-Release 0.0.9 - March 22, 2011
-Added zIndex option (Thanks Frank Enderle)
-Added option showPeriodLabels that defines if the AM/PM labels are displayed on the left (Thanks Frank Enderle)
-Added showOn ['focus'|'button'|'both'] and button options for alternate trigger method
-
-Release 0.0.8 - Fev 17, 2011
-Fixed close event not triggered when switching to another input with time picker (thanks Stuart Gregg)
-
-Release 0.0.7 - Fev 10, 2011
-Added function to set time after initialisation :$('#timepicker').timepicker('setTime',newTime);
-Added support for disabled period of time : onHourShow and onMinuteShow (thanks Rene Felgentr�ger)
-
-Release 0.0.6 - Jan 19, 2011
-Added standard "change" event being triggered on the input when the content changes. (Thanks Rasmus Schultz)
-Added support for inline timePicker, attached to div or span
-Added altField that receive the parsed time value when selected time changes
-Added defaultTime value to use when input field is missing (inline) or input value is empty
-      if defaultTime is missing, current time is used
-
-Release 0.0.5 - Jan 18, 2011
-Now updating time picker selected value when manually typing in the text field (thanks Rasmus Schultz)
-Fixed : with showPeriod: true and showLeadingZero: true, PM hours did not show leading zeros (thanks Chandler May)
-Fixed : with showPeriod: true and showLeadingZero: true, Selecting 12 AM shows as 00 AM in the input field, also parsing 12AM did not work correctly (thanks Rasmus Schultz)
-
-Release 0.0.4 - jan 10, 2011
-changed showLeadingZero to affect only hours, added showMinutesLeadingZero for minutes display
-Removed width:100% for tables in css
-
-Release 0.0.3 - Jan 8, 2011
-Re-added a display:none on the main div (fix a small empty div visible at the bottom of the page before timepicker is called) (Thanks Gertjan van Roekel)
-Fixed a problem where the timepicker was never displayed with jquery ui 1.8.7 css,
-    the problem was the class ui-helper-hidden-accessible, witch I removed.
-    Thanks Alexander Fietz and StackOverflow : http://stackoverflow.com/questions/4522274/jquery-timepicker-and-jqueryui-1-8-7-conflict
-
-Release 0.0.2 - Jan 6, 2011
-Updated to include common display options for USA users
-Stephen Commisso - Jan 2011
-
-As it is a timepicker, I inspired most of the code from the datepicker
-Francois Gelinas - Nov 2010
-
diff --git a/3rdparty/when/MIT-LICENSE.txt b/3rdparty/when/MIT-LICENSE.txt
deleted file mode 100644
index b4429c89ac1..00000000000
--- a/3rdparty/when/MIT-LICENSE.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-License
-
-Copyright (c) 2010 Thomas Planer
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/3rdparty/when/When.php b/3rdparty/when/When.php
deleted file mode 100755
index d54f296ed61..00000000000
--- a/3rdparty/when/When.php
+++ /dev/null
@@ -1,731 +0,0 @@
-<?php
-/**
- * Name: When
- * Author: Thomas Planer <tplaner@gmail.com>
- * Location: http://github.com/tplaner/When
- * Created: September 2010
- * Description: Determines the next date of recursion given an iCalendar "rrule" like pattern.
- * Requirements: PHP 5.3+ - makes extensive use of the Date and Time library (http://us2.php.net/manual/en/book.datetime.php)
- */
-class When
-{
-	protected $frequency;
-	
-	protected $start_date;
-	protected $try_date;
-	
-	protected $end_date;
-	
-	protected $gobymonth;
-	protected $bymonth;
-	
-	protected $gobyweekno;
-	protected $byweekno;
-	
-	protected $gobyyearday;
-	protected $byyearday;
-	
-	protected $gobymonthday;
-	protected $bymonthday;
-	
-	protected $gobyday;
-	protected $byday;
-	
-	protected $gobysetpos;
-	protected $bysetpos;
-		
-	protected $suggestions;
-	
-	protected $count;
-	protected $counter;
-	
-	protected $goenddate;
-	
-	protected $interval;
-	
-	protected $wkst;
-	
-	protected $valid_week_days;
-	protected $valid_frequency;
-		
-	/**
-	 * __construct
-	 */
-	public function __construct()
-	{
-		$this->frequency = null;
-		
-		$this->gobymonth = false;
-		$this->bymonth = range(1,12);
-		
-		$this->gobymonthday = false;
-		$this->bymonthday = range(1,31);
-		
-		$this->gobyday = false;
-		// setup the valid week days (0 = sunday)
-		$this->byday = range(0,6);
-		
-		$this->gobyyearday = false;
-		$this->byyearday = range(0,366);
-		
-		$this->gobysetpos = false;
-		$this->bysetpos = range(1,366);
-		
-		$this->gobyweekno = false;
-		// setup the range for valid weeks
-		$this->byweekno = range(0,54);
-		
-		$this->suggestions = array();
-		
-		// this will be set if a count() is specified
-		$this->count = 0;
-		// how many *valid* results we returned
-		$this->counter = 0;
-		
-		// max date we'll return
-		$this->end_date = new DateTime('9999-12-31');
-		
-		// the interval to increase the pattern by
-		$this->interval = 1;
-		
-		// what day does the week start on? (0 = sunday)
-		$this->wkst = 0;
-		
-		$this->valid_week_days = array('SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA');
-		
-		$this->valid_frequency = array('SECONDLY', 'MINUTELY', 'HOURLY', 'DAILY', 'WEEKLY', 'MONTHLY', 'YEARLY');
-	}
-	
-	/**
-	 * @param DateTime|string $start_date of the recursion - also is the first return value.
-	 * @param string $frequency of the recrusion, valid frequencies: secondly, minutely, hourly, daily, weekly, monthly, yearly
-	 */
-	public function recur($start_date, $frequency = "daily")
-	{
-		try
-		{
-			if(is_object($start_date))
-			{
-				$this->start_date = clone $start_date;
-			}
-			else
-			{
-				// timestamps within the RFC have a 'Z' at the end of them, remove this.
-				$start_date = trim($start_date, 'Z');
-				$this->start_date = new DateTime($start_date);
-			}
-			
-			$this->try_date = clone $this->start_date;
-		}
-		catch(Exception $e)
-		{
-			throw new InvalidArgumentException('Invalid start date DateTime: ' . $e);
-		}
-		
-		$this->freq($frequency);
-		
-		return $this;
-	}
-
-	public function freq($frequency)
-	{
-		if(in_array(strtoupper($frequency), $this->valid_frequency))
-		{
-			$this->frequency = strtoupper($frequency);
-		}
-		else
-		{
-			throw new InvalidArgumentException('Invalid frequency type.');
-		}
-
-		return $this;
-	}
-
-	// accepts an rrule directly
-	public function rrule($rrule)
-	{
-		// strip off a trailing semi-colon
-		$rrule = trim($rrule, ";");
-		
-		$parts = explode(";", $rrule);
-
-		foreach($parts as $part)
-		{
-			list($rule, $param) = explode("=", $part);
-
-			$rule = strtoupper($rule);
-			$param = strtoupper($param);
-
-			switch($rule)
-			{
-				case "FREQ":
-					$this->frequency = $param;
-					break;
-				case "UNTIL":
-					$this->until($param);
-					break;
-				case "COUNT":
-					$this->count($param);
-					break;
-				case "INTERVAL":
-					$this->interval($param);
-					break;
-				case "BYDAY":
-					$params = explode(",", $param);
-					$this->byday($params);
-					break;
-				case "BYMONTHDAY":
-					$params = explode(",", $param);
-					$this->bymonthday($params);
-					break;
-				case "BYYEARDAY":
-					$params = explode(",", $param);
-					$this->byyearday($params);
-					break;
-				case "BYWEEKNO":
-					$params = explode(",", $param);
-					$this->byweekno($params);
-					break;
-				case "BYMONTH":
-					$params = explode(",", $param);
-					$this->bymonth($params);
-					break;
-				case "BYSETPOS":
-					$params = explode(",", $param);
-					$this->bysetpos($params);
-					break;
-				case "WKST":
-					$this->wkst($param);
-					break;
-			}
-		}
-
-		return $this;
-	}
-	
-	//max number of items to return based on the pattern
-	public function count($count)
-	{
-		$this->count = (int)$count;
-		
-		return $this;
-	}
-	
-	// how often the recurrence rule repeats
-	public function interval($interval)
-	{
-		$this->interval = (int)$interval;
-		
-		return $this;
-	}
-	
-	// starting day of the week
-	public function wkst($day)
-	{
-		switch($day)
-		{
-			case 'SU':
-				$this->wkst = 0;
-				break;
-			case 'MO':
-				$this->wkst = 1;
-				break;
-			case 'TU':
-				$this->wkst = 2;
-				break;
-			case 'WE':
-				$this->wkst = 3;
-				break;
-			case 'TH':
-				$this->wkst = 4;
-				break;
-			case 'FR':
-				$this->wkst = 5;
-				break;
-			case 'SA':
-				$this->wkst = 6;
-				break;
-		}
-		
-		return $this;
-	}
-	
-	// max date
-	public function until($end_date)
-	{		
-		try
-		{
-			if(is_object($end_date))
-			{
-				$this->end_date = clone $end_date;
-			}
-			else
-			{
-				// timestamps within the RFC have a 'Z' at the end of them, remove this.
-				$end_date = trim($end_date, 'Z');
-				$this->end_date = new DateTime($end_date);
-			}
-		}
-		catch(Exception $e)
-		{
-			throw new InvalidArgumentException('Invalid end date DateTime: ' . $e);
-		}
-		
-		return $this;
-	}
-
-	public function bymonth($months)
-	{	
-		if(is_array($months))
-		{
-			$this->gobymonth = true;
-			$this->bymonth = $months;
-		}
-		
-		return $this;
-	}
-	
-	public function bymonthday($days)
-	{	
-		if(is_array($days))
-		{
-			$this->gobymonthday = true;
-			$this->bymonthday = $days;
-		}
-		
-		return $this;
-	}
-	
-	public function byweekno($weeks)
-	{
-		$this->gobyweekno = true;
-		
-		if(is_array($weeks))
-		{
-			$this->byweekno = $weeks;
-		}
-		
-		return $this;
-	}
-	
-	public function bysetpos($days)
-	{
-		$this->gobysetpos = true;
-		
-		if(is_array($days))
-		{
-			$this->bysetpos = $days;
-		}
-		
-		return $this;
-	}
-	
-	public function byday($days)
-	{		
-		$this->gobyday = true;
-		
-		if(is_array($days))
-		{
-			$this->byday = array();
-			foreach($days as $day)
-			{
-				$len = strlen($day);
-				
-				$as = '+';
-				
-				// 0 mean no occurence is set
-				$occ = 0;
-				
-				if($len == 3)
-				{
-					$occ = substr($day, 0, 1);
-				}
-				if($len == 4)
-				{
-					$as = substr($day, 0, 1);
-					$occ = substr($day, 1, 1);
-				}
-				
-				if($as == '-')
-				{
-					$occ = '-' . $occ;
-				}
-				else
-				{
-					$occ = '+' . $occ;
-				}
-				
-				$day = substr($day, -2, 2);
-				switch($day)
-				{
-					case 'SU':
-						$this->byday[] = $occ . 'SU';
-						break;
-					case 'MO':
-						$this->byday[] = $occ . 'MO';
-						break;
-					case 'TU':
-						$this->byday[] = $occ . 'TU';
-						break;
-					case 'WE':
-						$this->byday[] = $occ . 'WE';
-						break;
-					case 'TH':
-						$this->byday[] = $occ . 'TH';
-						break;
-					case 'FR':
-						$this->byday[] = $occ . 'FR';
-						break;
-					case 'SA':
-						$this->byday[] = $occ . 'SA';
-						break;
-				}
-			}
-		}
-		
-		return $this;
-	}
-	
-	public function byyearday($days)
-	{
-		$this->gobyyearday = true;
-		
-		if(is_array($days))
-		{
-			$this->byyearday = $days;
-		}
-		
-		return $this;
-	}
-	
-	// this creates a basic list of dates to "try"
-	protected function create_suggestions()
-	{
-		switch($this->frequency)
-		{
-			case "YEARLY":
-				$interval = 'year';
-				break;
-			case "MONTHLY":
-				$interval = 'month';
-				break;
-			case "WEEKLY":
-				$interval = 'week';
-				break;
-			case "DAILY":
-				$interval = 'day';
-				break;
-			case "HOURLY":
-				$interval = 'hour';
-				break;
-			case "MINUTELY":
-				$interval = 'minute';
-				break;
-			case "SECONDLY":
-				$interval = 'second';
-				break;
-		}
-					
-		$month_day = $this->try_date->format('j');
-		$month = $this->try_date->format('n');
-		$year = $this->try_date->format('Y');
-		
-		$timestamp = $this->try_date->format('H:i:s');
-					
-		if($this->gobysetpos)
-		{				
-			if($this->try_date == $this->start_date)
-			{
-				$this->suggestions[] = clone $this->try_date;
-			}
-			else
-			{
-				if($this->gobyday)
-				{
-					foreach($this->bysetpos as $_pos)
-					{
-						$tmp_array = array();
-						$_mdays = range(1, date('t',mktime(0,0,0,$month,1,$year)));
-						foreach($_mdays as $_mday)
-						{
-							$date_time = new DateTime($year . '-' . $month . '-' . $_mday . ' ' . $timestamp);
-							
-							$occur = ceil($_mday / 7);
-							
-							$day_of_week = $date_time->format('l');
-							$dow_abr = strtoupper(substr($day_of_week, 0, 2));
-							
-							// set the day of the month + (positive)
-							$occur = '+' . $occur . $dow_abr;
-							$occur_zero = '+0' . $dow_abr;
-							
-							// set the day of the month - (negative)
-							$total_days = $date_time->format('t') - $date_time->format('j');
-							$occur_neg = '-' . ceil(($total_days + 1)/7) . $dow_abr;
-							
-							$day_from_end_of_month = $date_time->format('t') + 1 - $_mday;
-							
-							if(in_array($occur, $this->byday) || in_array($occur_zero, $this->byday) || in_array($occur_neg, $this->byday))
-							{								
-								$tmp_array[] = clone $date_time;
-							}
-						}
-						
-						if($_pos > 0)
-						{
-							$this->suggestions[] = clone $tmp_array[$_pos - 1];
-						}
-						else
-						{
-							$this->suggestions[] = clone $tmp_array[count($tmp_array) + $_pos];
-						}
-						
-					}
-				}
-			}
-		}
-		elseif($this->gobyyearday)
-		{
-			foreach($this->byyearday as $_day)
-			{
-				if($_day >= 0)
-				{
-					$_day--;
-					
-					$_time = strtotime('+' . $_day . ' days', mktime(0, 0, 0, 1, 1, $year));
-					$this->suggestions[] = new Datetime(date('Y-m-d', $_time) . ' ' . $timestamp);
-				}
-				else
-				{
-					$year_day_neg = 365 + $_day;
-					$leap_year = $this->try_date->format('L');
-					if($leap_year == 1)
-					{
-						$year_day_neg = 366 + $_day;
-					}
-					
-					$_time = strtotime('+' . $year_day_neg . ' days', mktime(0, 0, 0, 1, 1, $year));
-					$this->suggestions[] = new Datetime(date('Y-m-d', $_time) . ' ' . $timestamp);
-				}					
-			}
-		}
-		// special case because for years you need to loop through the months too
-		elseif($this->gobyday && $interval == "year")
-		{
-			foreach($this->bymonth as $_month)
-			{
-				// this creates an array of days of the month
-				$_mdays = range(1, date('t',mktime(0,0,0,$_month,1,$year)));
-				foreach($_mdays as $_mday)
-				{
-					$date_time = new DateTime($year . '-' . $_month . '-' . $_mday . ' ' . $timestamp);
-					
-					// get the week of the month (1, 2, 3, 4, 5, etc)
-					$week = $date_time->format('W');
-					
-					if($date_time >= $this->start_date && in_array($week, $this->byweekno))
-					{
-						$this->suggestions[] = clone $date_time;
-					}
-				}
-			}
-		}
-		elseif($interval == "day")
-		{
-			$this->suggestions[] = clone $this->try_date;
-		}
-		elseif($interval == "week")
-		{
-			$this->suggestions[] = clone $this->try_date;
-			
-			if($this->gobyday)
-			{
-				$week_day = $this->try_date->format('w');
-				
-				$days_in_month = $this->try_date->format('t');
-				
-				$overflow_count = 1;
-				$_day = $month_day;
-				
-				$run = true;
-				while($run)
-				{
-					$_day++;
-					if($_day <= $days_in_month)
-					{
-						$tmp_date = new DateTime($year . '-' . $month . '-' . $_day . ' ' . $timestamp);
-					}
-					else
-					{
-						//$tmp_month = $month+1;
-						$tmp_date = new DateTime($year . '-' . $month . '-' . $overflow_count . ' ' . $timestamp);
-						$tmp_date->modify('+1 month');
-						$overflow_count++;
-					}
-					
-					$week_day = $tmp_date->format('w');
-					
-					if($this->try_date == $this->start_date)
-					{
-						if($week_day == $this->wkst)
-						{
-							$this->try_date = clone $tmp_date;
-							$this->try_date->modify('-7 days');
-							$run = false;
-						}
-					}
-
-					if($week_day != $this->wkst)
-					{
-						$this->suggestions[] = clone $tmp_date;
-					}
-					else
-					{
-						$run = false;
-					}
-				}
-			}
-		}
-		elseif($this->gobyday && $interval == "month")
-		{
-			$_mdays = range(1, date('t',mktime(0,0,0,$month,1,$year)));
-			foreach($_mdays as $_mday)
-			{
-				$date_time = new DateTime($year . '-' . $month . '-' . $_mday . ' ' . $timestamp);
-				
-				// get the week of the month (1, 2, 3, 4, 5, etc)
-				$week = $date_time->format('W');
-				
-				if($date_time >= $this->start_date && in_array($week, $this->byweekno))
-				{
-					$this->suggestions[] = clone $date_time;
-				}
-			}
-		}
-		elseif($this->gobymonth)
-		{
-			foreach($this->bymonth as $_month)
-			{
-				$date_time = new DateTime($year . '-' . $_month . '-' . $month_day . ' ' . $timestamp);
-				
-				if($date_time >= $this->start_date)
-				{
-					$this->suggestions[] = clone $date_time;
-				}
-			}
-		} 
-		else 
-		{
-			$this->suggestions[] = clone $this->try_date;
-		}
-		
-		if($interval == "month")
-		{
-			
-			$this->try_date->modify('first day of next month');
-			if((int) date('t', $this->try_date->format('U')) > (int) $this->start_date->format('j')){
-				$this->try_date->modify('+' . (int) $this->start_date->format('j') - 1 . ' day'); 
-			}else{
-				$this->try_date->modify('+' . (int) date('t', $this->try_date->format('U')) - 1 . ' day'); 
-			}
-		}
-		else
-		{
-			$this->try_date->modify($this->interval . ' ' . $interval);
-		}
-	}
-	
-	protected function valid_date($date)
-	{
-		$year = $date->format('Y');
-		$month = $date->format('n');
-		$day = $date->format('j');
-		
-		$year_day = $date->format('z') + 1;
-		
-		$year_day_neg = -366 + $year_day;
-		$leap_year = $date->format('L');
-		if($leap_year == 1)
-		{
-			$year_day_neg = -367 + $year_day;
-		}
-		
-		// this is the nth occurence of the date
-		$occur = ceil($day / 7);
-		
-		$week = $date->format('W');
-		
-		$day_of_week = $date->format('l');
-		$dow_abr = strtoupper(substr($day_of_week, 0, 2));
-		
-		// set the day of the month + (positive)
-		$occur = '+' . $occur . $dow_abr;
-		$occur_zero = '+0' . $dow_abr;
-		
-		// set the day of the month - (negative)
-		$total_days = $date->format('t') - $date->format('j');
-		$occur_neg = '-' . ceil(($total_days + 1)/7) . $dow_abr;
-		
-		$day_from_end_of_month = $date->format('t') + 1 - $day;
-		
-		if(in_array($month, $this->bymonth) && 
-		   (in_array($occur, $this->byday) || in_array($occur_zero, $this->byday) || in_array($occur_neg, $this->byday)) && 
-		   in_array($week, $this->byweekno) &&
-		   (in_array($day, $this->bymonthday) || in_array(-$day_from_end_of_month, $this->bymonthday)) &&
-		   (in_array($year_day, $this->byyearday) || in_array($year_day_neg, $this->byyearday)))
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	// return the next valid DateTime object which matches the pattern and follows the rules
-	public function next()
-	{		
-		// check the counter is set
-		if($this->count !== 0)
-		{
-			if($this->counter >= $this->count)
-			{
-				return false;
-			}
-		}
-		
-		// create initial set of suggested dates
-		if(count($this->suggestions) === 0)
-		{
-			$this->create_suggestions();
-		}
-		
-		// loop through the suggested dates
-		while(count($this->suggestions) > 0)
-		{
-			// get the first one on the array
-			$try_date = array_shift($this->suggestions);
-			
-			// make sure the date doesn't exceed the max date
-			if($try_date > $this->end_date)
-			{
-				return false;
-			}
-			
-			// make sure it falls within the allowed days
-			if($this->valid_date($try_date) === true)
-			{
-				$this->counter++;
-				return $try_date;
-			}
-			else
-			{
-				// we might be out of suggested days, so load some more
-				if(count($this->suggestions) === 0)
-				{
-					$this->create_suggestions();
-				}
-			}
-		}
-	}
-}
-- 
GitLab


From 20553c1afe035b2e020409fd516d0288b748dc7f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 16 Feb 2012 09:44:49 +0100
Subject: [PATCH 507/546] Revert "remove the 3rdparty files. everything is now
 in https://gitorious.org/owncloud/3rdparty"

This reverts commit dccdeca2581f705c69eb4266aa646173f588a9de.
---
 3rdparty/Console/Getopt.php                   |  251 +
 3rdparty/Crypt_Blowfish/Blowfish.php          |  317 +
 .../Crypt_Blowfish/Blowfish/DefaultKey.php    |  327 ++
 3rdparty/MDB2.php                             | 4316 ++++++++++++++
 3rdparty/MDB2/Date.php                        |  183 +
 3rdparty/MDB2/Driver/Datatype/Common.php      | 1824 ++++++
 3rdparty/MDB2/Driver/Datatype/mysql.php       |  553 ++
 3rdparty/MDB2/Driver/Datatype/pgsql.php       |  554 ++
 3rdparty/MDB2/Driver/Datatype/sqlite.php      |  409 ++
 3rdparty/MDB2/Driver/Function/Common.php      |  293 +
 3rdparty/MDB2/Driver/Function/mysql.php       |  136 +
 3rdparty/MDB2/Driver/Function/pgsql.php       |  115 +
 3rdparty/MDB2/Driver/Function/sqlite.php      |  162 +
 3rdparty/MDB2/Driver/Manager/Common.php       | 1014 ++++
 3rdparty/MDB2/Driver/Manager/mysql.php        | 1432 +++++
 3rdparty/MDB2/Driver/Manager/pgsql.php        |  951 +++
 3rdparty/MDB2/Driver/Manager/sqlite.php       | 1366 +++++
 3rdparty/MDB2/Driver/Native/Common.php        |   61 +
 3rdparty/MDB2/Driver/Native/mysql.php         |   60 +
 3rdparty/MDB2/Driver/Native/pgsql.php         |   88 +
 3rdparty/MDB2/Driver/Native/sqlite.php        |   60 +
 3rdparty/MDB2/Driver/Reverse/Common.php       |  517 ++
 3rdparty/MDB2/Driver/Reverse/mysql.php        |  536 ++
 3rdparty/MDB2/Driver/Reverse/pgsql.php        |  573 ++
 3rdparty/MDB2/Driver/Reverse/sqlite.php       |  609 ++
 3rdparty/MDB2/Driver/mysql.php                | 1700 ++++++
 3rdparty/MDB2/Driver/pgsql.php                | 1519 +++++
 3rdparty/MDB2/Driver/sqlite.php               | 1088 ++++
 3rdparty/MDB2/Extended.php                    |  721 +++
 3rdparty/MDB2/Iterator.php                    |  259 +
 3rdparty/MDB2/LOB.php                         |  264 +
 3rdparty/MDB2/Schema.php                      | 2763 +++++++++
 3rdparty/MDB2/Schema/Parser.php               |  812 +++
 3rdparty/MDB2/Schema/Parser2.php              |  624 ++
 3rdparty/MDB2/Schema/Reserved/ibase.php       |  436 ++
 3rdparty/MDB2/Schema/Reserved/mssql.php       |  258 +
 3rdparty/MDB2/Schema/Reserved/mysql.php       |  284 +
 3rdparty/MDB2/Schema/Reserved/oci8.php        |  171 +
 3rdparty/MDB2/Schema/Reserved/pgsql.php       |  147 +
 3rdparty/MDB2/Schema/Tool.php                 |  560 ++
 .../MDB2/Schema/Tool/ParameterException.php   |    6 +
 3rdparty/MDB2/Schema/Validate.php             |  917 +++
 3rdparty/MDB2/Schema/Writer.php               |  581 ++
 3rdparty/PEAR.php                             | 1055 ++++
 3rdparty/PEAR/Autoloader.php                  |  208 +
 3rdparty/PEAR/Builder.php                     |  426 ++
 3rdparty/PEAR/Command.php                     |  398 ++
 3rdparty/PEAR/Command/Auth.php                |  155 +
 3rdparty/PEAR/Command/Build.php               |   89 +
 3rdparty/PEAR/Command/Common.php              |  249 +
 3rdparty/PEAR/Command/Config.php              |  225 +
 3rdparty/PEAR/Command/Install.php             |  470 ++
 3rdparty/PEAR/Command/Mirror.php              |  101 +
 3rdparty/PEAR/Command/Package.php             |  819 +++
 3rdparty/PEAR/Command/Registry.php            |  351 ++
 3rdparty/PEAR/Command/Remote.php              |  435 ++
 3rdparty/PEAR/Common.php                      | 2094 +++++++
 3rdparty/PEAR/Config.php                      | 1169 ++++
 3rdparty/PEAR/Dependency.php                  |  487 ++
 3rdparty/PEAR/Downloader.php                  |  680 +++
 3rdparty/PEAR/ErrorStack.php                  |  981 ++++
 3rdparty/PEAR/Exception.php                   |  359 ++
 3rdparty/PEAR/Frontend/CLI.php                |  509 ++
 3rdparty/PEAR/Installer.php                   | 1068 ++++
 3rdparty/PEAR/Packager.php                    |  165 +
 3rdparty/PEAR/Registry.php                    |  538 ++
 3rdparty/PEAR/Remote.php                      |  394 ++
 3rdparty/PEAR/RunTest.php                     |  363 ++
 3rdparty/README                               |    2 -
 3rdparty/Sabre.includes.php                   |  127 +
 3rdparty/Sabre/CalDAV/Backend/Abstract.php    |  163 +
 3rdparty/Sabre/CalDAV/Backend/PDO.php         |  386 ++
 3rdparty/Sabre/CalDAV/Calendar.php            |  318 +
 3rdparty/Sabre/CalDAV/CalendarObject.php      |  260 +
 3rdparty/Sabre/CalDAV/CalendarRootNode.php    |   75 +
 .../Exception/InvalidICalendarObject.php      |   18 +
 3rdparty/Sabre/CalDAV/ICSExportPlugin.php     |  124 +
 3rdparty/Sabre/CalDAV/ICalendar.php           |   18 +
 3rdparty/Sabre/CalDAV/ICalendarObject.php     |   20 +
 3rdparty/Sabre/CalDAV/ICalendarUtil.php       |  157 +
 3rdparty/Sabre/CalDAV/Plugin.php              |  788 +++
 .../Sabre/CalDAV/Principal/Collection.php     |   31 +
 3rdparty/Sabre/CalDAV/Principal/ProxyRead.php |  178 +
 .../Sabre/CalDAV/Principal/ProxyWrite.php     |  178 +
 3rdparty/Sabre/CalDAV/Principal/User.php      |  122 +
 .../SupportedCalendarComponentSet.php         |   85 +
 .../CalDAV/Property/SupportedCalendarData.php |   38 +
 .../CalDAV/Property/SupportedCollationSet.php |   44 +
 3rdparty/Sabre/CalDAV/Server.php              |   65 +
 3rdparty/Sabre/CalDAV/UserCalendars.php       |  280 +
 3rdparty/Sabre/CalDAV/Version.php             |   24 +
 3rdparty/Sabre/CalDAV/XMLUtil.php             |  208 +
 3rdparty/Sabre/CardDAV/AddressBook.php        |  293 +
 .../Sabre/CardDAV/AddressBookQueryParser.php  |  211 +
 3rdparty/Sabre/CardDAV/AddressBookRoot.php    |   78 +
 3rdparty/Sabre/CardDAV/Backend/Abstract.php   |  121 +
 3rdparty/Sabre/CardDAV/Backend/PDO.php        |  277 +
 3rdparty/Sabre/CardDAV/Card.php               |  220 +
 3rdparty/Sabre/CardDAV/IAddressBook.php       |   18 +
 3rdparty/Sabre/CardDAV/ICard.php              |   18 +
 3rdparty/Sabre/CardDAV/IDirectory.php         |   21 +
 3rdparty/Sabre/CardDAV/Plugin.php             |  463 ++
 .../CardDAV/Property/SupportedAddressData.php |   69 +
 3rdparty/Sabre/CardDAV/UserAddressBooks.php   |  240 +
 3rdparty/Sabre/CardDAV/Version.php            |   26 +
 .../Sabre/DAV/Auth/Backend/AbstractBasic.php  |   79 +
 .../Sabre/DAV/Auth/Backend/AbstractDigest.php |   96 +
 3rdparty/Sabre/DAV/Auth/Backend/Apache.php    |   60 +
 3rdparty/Sabre/DAV/Auth/Backend/File.php      |   76 +
 3rdparty/Sabre/DAV/Auth/Backend/PDO.php       |   66 +
 3rdparty/Sabre/DAV/Auth/IBackend.php          |   34 +
 3rdparty/Sabre/DAV/Auth/Plugin.php            |  111 +
 .../Sabre/DAV/Browser/GuessContentType.php    |   97 +
 .../Sabre/DAV/Browser/MapGetToPropFind.php    |   54 +
 3rdparty/Sabre/DAV/Browser/Plugin.php         |  285 +
 3rdparty/Sabre/DAV/Client.php                 |  431 ++
 3rdparty/Sabre/DAV/Collection.php             |   90 +
 3rdparty/Sabre/DAV/Directory.php              |   17 +
 3rdparty/Sabre/DAV/Exception.php              |   63 +
 3rdparty/Sabre/DAV/Exception/BadRequest.php   |   28 +
 3rdparty/Sabre/DAV/Exception/Conflict.php     |   28 +
 .../Sabre/DAV/Exception/ConflictingLock.php   |   35 +
 3rdparty/Sabre/DAV/Exception/FileNotFound.php |   28 +
 3rdparty/Sabre/DAV/Exception/Forbidden.php    |   27 +
 .../DAV/Exception/InsufficientStorage.php     |   27 +
 .../DAV/Exception/InvalidResourceType.php     |   33 +
 .../Exception/LockTokenMatchesRequestUri.php  |   39 +
 3rdparty/Sabre/DAV/Exception/Locked.php       |   67 +
 .../Sabre/DAV/Exception/MethodNotAllowed.php  |   44 +
 .../Sabre/DAV/Exception/NotAuthenticated.php  |   28 +
 .../Sabre/DAV/Exception/NotImplemented.php    |   27 +
 .../DAV/Exception/PreconditionFailed.php      |   69 +
 .../DAV/Exception/ReportNotImplemented.php    |   30 +
 .../RequestedRangeNotSatisfiable.php          |   29 +
 .../DAV/Exception/UnsupportedMediaType.php    |   28 +
 3rdparty/Sabre/DAV/FS/Directory.php           |  121 +
 3rdparty/Sabre/DAV/FS/File.php                |   89 +
 3rdparty/Sabre/DAV/FS/Node.php                |   81 +
 3rdparty/Sabre/DAV/FSExt/Directory.php        |  135 +
 3rdparty/Sabre/DAV/FSExt/File.php             |   88 +
 3rdparty/Sabre/DAV/FSExt/Node.php             |  276 +
 3rdparty/Sabre/DAV/File.php                   |   81 +
 3rdparty/Sabre/DAV/ICollection.php            |   58 +
 3rdparty/Sabre/DAV/IExtendedCollection.php    |   28 +
 3rdparty/Sabre/DAV/IFile.php                  |   63 +
 3rdparty/Sabre/DAV/ILockable.php              |   38 +
 3rdparty/Sabre/DAV/INode.php                  |   44 +
 3rdparty/Sabre/DAV/IProperties.php            |   67 +
 3rdparty/Sabre/DAV/IQuota.php                 |   27 +
 3rdparty/Sabre/DAV/Locks/Backend/Abstract.php |   50 +
 3rdparty/Sabre/DAV/Locks/Backend/FS.php       |  189 +
 3rdparty/Sabre/DAV/Locks/Backend/File.php     |  175 +
 3rdparty/Sabre/DAV/Locks/Backend/PDO.php      |  165 +
 3rdparty/Sabre/DAV/Locks/LockInfo.php         |   81 +
 3rdparty/Sabre/DAV/Locks/Plugin.php           |  680 +++
 3rdparty/Sabre/DAV/Mount/Plugin.php           |   79 +
 3rdparty/Sabre/DAV/Node.php                   |   55 +
 3rdparty/Sabre/DAV/ObjectTree.php             |  154 +
 3rdparty/Sabre/DAV/Property.php               |   25 +
 .../Sabre/DAV/Property/GetLastModified.php    |   75 +
 3rdparty/Sabre/DAV/Property/Href.php          |   91 +
 3rdparty/Sabre/DAV/Property/HrefList.php      |   96 +
 3rdparty/Sabre/DAV/Property/IHref.php         |   25 +
 3rdparty/Sabre/DAV/Property/LockDiscovery.php |  102 +
 3rdparty/Sabre/DAV/Property/ResourceType.php  |  125 +
 3rdparty/Sabre/DAV/Property/Response.php      |  156 +
 3rdparty/Sabre/DAV/Property/ResponseList.php  |   58 +
 3rdparty/Sabre/DAV/Property/SupportedLock.php |   76 +
 .../Sabre/DAV/Property/SupportedReportSet.php |  110 +
 3rdparty/Sabre/DAV/Server.php                 | 1941 ++++++
 3rdparty/Sabre/DAV/ServerPlugin.php           |   90 +
 3rdparty/Sabre/DAV/SimpleCollection.php       |  106 +
 3rdparty/Sabre/DAV/SimpleDirectory.php        |   21 +
 3rdparty/Sabre/DAV/SimpleFile.php             |  120 +
 3rdparty/Sabre/DAV/StringUtil.php             |   91 +
 .../Sabre/DAV/TemporaryFileFilterPlugin.php   |  279 +
 3rdparty/Sabre/DAV/Tree.php                   |  192 +
 3rdparty/Sabre/DAV/Tree/Filesystem.php        |  124 +
 3rdparty/Sabre/DAV/URLUtil.php                |  125 +
 3rdparty/Sabre/DAV/UUIDUtil.php               |   64 +
 3rdparty/Sabre/DAV/Version.php                |   24 +
 3rdparty/Sabre/DAV/XMLUtil.php                |  183 +
 .../DAVACL/AbstractPrincipalCollection.php    |  121 +
 .../Sabre/DAVACL/Exception/AceConflict.php    |   34 +
 .../Sabre/DAVACL/Exception/NeedPrivileges.php |   80 +
 .../Sabre/DAVACL/Exception/NoAbstract.php     |   34 +
 .../Exception/NotRecognizedPrincipal.php      |   34 +
 .../Exception/NotSupportedPrivilege.php       |   34 +
 3rdparty/Sabre/DAVACL/IACL.php                |   58 +
 3rdparty/Sabre/DAVACL/IPrincipal.php          |   75 +
 3rdparty/Sabre/DAVACL/IPrincipalBackend.php   |   73 +
 3rdparty/Sabre/DAVACL/Plugin.php              | 1238 ++++
 3rdparty/Sabre/DAVACL/Principal.php           |  263 +
 .../Sabre/DAVACL/PrincipalBackend/PDO.php     |  206 +
 3rdparty/Sabre/DAVACL/PrincipalCollection.php |   35 +
 3rdparty/Sabre/DAVACL/Property/Acl.php        |  186 +
 .../Property/CurrentUserPrivilegeSet.php      |   75 +
 3rdparty/Sabre/DAVACL/Property/Principal.php  |  154 +
 .../DAVACL/Property/SupportedPrivilegeSet.php |   92 +
 3rdparty/Sabre/DAVACL/Version.php             |   24 +
 3rdparty/Sabre/HTTP/AWSAuth.php               |  226 +
 3rdparty/Sabre/HTTP/AbstractAuth.php          |  111 +
 3rdparty/Sabre/HTTP/BasicAuth.php             |   61 +
 3rdparty/Sabre/HTTP/DigestAuth.php            |  234 +
 3rdparty/Sabre/HTTP/Request.php               |  243 +
 3rdparty/Sabre/HTTP/Response.php              |  152 +
 3rdparty/Sabre/HTTP/Util.php                  |   65 +
 3rdparty/Sabre/HTTP/Version.php               |   24 +
 3rdparty/Sabre/LICENCE                        |   27 +
 3rdparty/Sabre/VObject/Component.php          |  254 +
 3rdparty/Sabre/VObject/Element.php            |   15 +
 3rdparty/Sabre/VObject/Element/DateTime.php   |  245 +
 .../Sabre/VObject/Element/MultiDateTime.php   |  168 +
 3rdparty/Sabre/VObject/ElementList.php        |  172 +
 3rdparty/Sabre/VObject/Node.php               |  149 +
 3rdparty/Sabre/VObject/Parameter.php          |   81 +
 3rdparty/Sabre/VObject/ParseException.php     |   12 +
 3rdparty/Sabre/VObject/Property.php           |  289 +
 3rdparty/Sabre/VObject/Reader.php             |  191 +
 3rdparty/Sabre/VObject/Version.php            |   24 +
 3rdparty/Sabre/VObject/includes.php           |   29 +
 3rdparty/Sabre/autoload.php                   |   27 +
 3rdparty/System.php                           |  540 ++
 3rdparty/XML/Parser.php                       |  667 +++
 3rdparty/XML/RPC.php                          | 1951 ++++++
 3rdparty/XML/RPC/Server.php                   |  624 ++
 3rdparty/css/chosen-sprite.png                |  Bin 0 -> 742 bytes
 3rdparty/css/chosen.css                       |  341 ++
 3rdparty/css/chosen/chosen-sprite.png         |  Bin 0 -> 3998 bytes
 3rdparty/css/chosen/chosen.css                |  368 ++
 3rdparty/fullcalendar/GPL-LICENSE.txt         |  278 +
 3rdparty/fullcalendar/MIT-LICENSE.txt         |   20 +
 3rdparty/fullcalendar/changelog.txt           |  313 +
 3rdparty/fullcalendar/css/fullcalendar.css    |  616 ++
 .../fullcalendar/css/fullcalendar.print.css   |   59 +
 3rdparty/fullcalendar/js/fullcalendar.js      | 5210 +++++++++++++++++
 3rdparty/fullcalendar/js/fullcalendar.min.js  |  113 +
 3rdparty/fullcalendar/js/gcal.js              |  112 +
 3rdparty/js/chosen/LICENSE.md                 |   24 +
 3rdparty/js/chosen/README.md                  |   46 +
 3rdparty/js/chosen/VERSION                    |    1 +
 3rdparty/js/chosen/chosen.jquery.js           |  857 +++
 3rdparty/js/chosen/chosen.jquery.min.js       |   10 +
 .../HELP_MY_TESTS_DONT_WORK_ANYMORE           |  399 ++
 3rdparty/simpletest/LICENSE                   |  502 ++
 3rdparty/simpletest/README                    |  102 +
 3rdparty/simpletest/VERSION                   |    1 +
 3rdparty/simpletest/arguments.php             |  224 +
 3rdparty/simpletest/authentication.php        |  237 +
 3rdparty/simpletest/autorun.php               |  101 +
 3rdparty/simpletest/browser.php               | 1144 ++++
 3rdparty/simpletest/collector.php             |  122 +
 3rdparty/simpletest/compatibility.php         |  166 +
 3rdparty/simpletest/cookies.php               |  380 ++
 3rdparty/simpletest/default_reporter.php      |  163 +
 3rdparty/simpletest/detached.php              |   96 +
 .../docs/en/authentication_documentation.html |  378 ++
 .../docs/en/browser_documentation.html        |  501 ++
 3rdparty/simpletest/docs/en/docs.css          |  121 +
 .../docs/en/expectation_documentation.html    |  476 ++
 .../docs/en/form_testing_documentation.html   |  351 ++
 .../docs/en/group_test_documentation.html     |  252 +
 3rdparty/simpletest/docs/en/index.html        |  542 ++
 .../docs/en/mock_objects_documentation.html   |  870 +++
 3rdparty/simpletest/docs/en/overview.html     |  487 ++
 .../docs/en/partial_mocks_documentation.html  |  457 ++
 .../docs/en/reporter_documentation.html       |  616 ++
 .../docs/en/unit_test_documentation.html      |  442 ++
 .../docs/en/web_tester_documentation.html     |  588 ++
 .../docs/fr/authentication_documentation.html |  372 ++
 .../docs/fr/browser_documentation.html        |  500 ++
 3rdparty/simpletest/docs/fr/docs.css          |   84 +
 .../docs/fr/expectation_documentation.html    |  451 ++
 .../docs/fr/form_testing_documentation.html   |  363 ++
 .../docs/fr/group_test_documentation.html     |  265 +
 3rdparty/simpletest/docs/fr/index.html        |  576 ++
 .../docs/fr/mock_objects_documentation.html   |  933 +++
 3rdparty/simpletest/docs/fr/overview.html     |  321 +
 .../docs/fr/partial_mocks_documentation.html  |  475 ++
 .../docs/fr/reporter_documentation.html       |  630 ++
 .../docs/fr/unit_test_documentation.html      |  447 ++
 .../docs/fr/web_tester_documentation.html     |  570 ++
 3rdparty/simpletest/dumper.php                |  407 ++
 3rdparty/simpletest/eclipse.php               |  307 +
 3rdparty/simpletest/encoding.php              |  649 ++
 3rdparty/simpletest/errors.php                |  267 +
 3rdparty/simpletest/exceptions.php            |  226 +
 3rdparty/simpletest/expectation.php           |  984 ++++
 .../simpletest/extensions/pear_test_case.php  |  196 +
 3rdparty/simpletest/extensions/testdox.php    |   53 +
 .../simpletest/extensions/testdox/test.php    |  107 +
 3rdparty/simpletest/form.php                  |  361 ++
 3rdparty/simpletest/frames.php                |  592 ++
 3rdparty/simpletest/http.php                  |  628 ++
 3rdparty/simpletest/invoker.php               |  139 +
 3rdparty/simpletest/mock_objects.php          | 1641 ++++++
 3rdparty/simpletest/page.php                  |  542 ++
 3rdparty/simpletest/php_parser.php            | 1054 ++++
 3rdparty/simpletest/recorder.php              |  101 +
 3rdparty/simpletest/reflection_php4.php       |  136 +
 3rdparty/simpletest/reflection_php5.php       |  386 ++
 3rdparty/simpletest/remote.php                |  115 +
 3rdparty/simpletest/reporter.php              |  445 ++
 3rdparty/simpletest/scorer.php                |  875 +++
 3rdparty/simpletest/selector.php              |  141 +
 3rdparty/simpletest/shell_tester.php          |  330 ++
 3rdparty/simpletest/simpletest.php            |  391 ++
 3rdparty/simpletest/socket.php                |  312 +
 3rdparty/simpletest/tag.php                   | 1527 +++++
 3rdparty/simpletest/test/acceptance_test.php  | 1729 ++++++
 3rdparty/simpletest/test/adapter_test.php     |   50 +
 3rdparty/simpletest/test/all_tests.php        |   13 +
 3rdparty/simpletest/test/arguments_test.php   |   82 +
 .../simpletest/test/authentication_test.php   |  145 +
 3rdparty/simpletest/test/autorun_test.php     |   23 +
 3rdparty/simpletest/test/bad_test_suite.php   |   10 +
 3rdparty/simpletest/test/browser_test.php     |  802 +++
 3rdparty/simpletest/test/collector_test.php   |   50 +
 .../simpletest/test/command_line_test.php     |   40 +
 .../simpletest/test/compatibility_test.php    |   87 +
 3rdparty/simpletest/test/cookies_test.php     |  227 +
 3rdparty/simpletest/test/detached_test.php    |   15 +
 3rdparty/simpletest/test/dumper_test.php      |   88 +
 3rdparty/simpletest/test/eclipse_test.php     |   32 +
 3rdparty/simpletest/test/encoding_test.php    |  240 +
 3rdparty/simpletest/test/errors_test.php      |  229 +
 3rdparty/simpletest/test/exceptions_test.php  |  183 +
 3rdparty/simpletest/test/expectation_test.php |  317 +
 3rdparty/simpletest/test/form_test.php        |  344 ++
 3rdparty/simpletest/test/frames_test.php      |  549 ++
 3rdparty/simpletest/test/http_test.php        |  492 ++
 3rdparty/simpletest/test/interfaces_test.php  |  137 +
 .../test/interfaces_test_php5_1.php           |   14 +
 3rdparty/simpletest/test/live_test.php        |   47 +
 .../simpletest/test/mock_objects_test.php     |  985 ++++
 3rdparty/simpletest/test/page_test.php        |  166 +
 3rdparty/simpletest/test/parse_error_test.php |    9 +
 3rdparty/simpletest/test/parsing_test.php     |  642 ++
 3rdparty/simpletest/test/php_parser_test.php  |  489 ++
 3rdparty/simpletest/test/recorder_test.php    |   23 +
 .../simpletest/test/reflection_php5_test.php  |  263 +
 3rdparty/simpletest/test/remote_test.php      |   19 +
 3rdparty/simpletest/test/shell_test.php       |   38 +
 .../simpletest/test/shell_tester_test.php     |   42 +
 3rdparty/simpletest/test/simpletest_test.php  |   58 +
 3rdparty/simpletest/test/site/file.html       |    6 +
 3rdparty/simpletest/test/socket_test.php      |   25 +
 .../test/support/collector/collectable.1      |    0
 .../test/support/collector/collectable.2      |    0
 .../test/support/empty_test_file.php          |    3 +
 .../simpletest/test/support/failing_test.php  |    9 +
 .../simpletest/test/support/latin1_sample     |    1 +
 .../simpletest/test/support/passing_test.php  |    9 +
 .../test/support/recorder_sample.php          |   14 +
 .../simpletest/test/support/spl_examples.php  |   15 +
 .../support/supplementary_upload_sample.txt   |    1 +
 3rdparty/simpletest/test/support/test1.php    |    7 +
 .../simpletest/test/support/upload_sample.txt |    1 +
 3rdparty/simpletest/test/tag_test.php         |  554 ++
 .../simpletest/test/test_with_parse_error.php |    8 +
 3rdparty/simpletest/test/unit_tester_test.php |   61 +
 3rdparty/simpletest/test/unit_tests.php       |   49 +
 3rdparty/simpletest/test/url_test.php         |  515 ++
 3rdparty/simpletest/test/user_agent_test.php  |  348 ++
 3rdparty/simpletest/test/visual_test.php      |  495 ++
 3rdparty/simpletest/test/web_tester_test.php  |  155 +
 3rdparty/simpletest/test/xml_test.php         |  187 +
 3rdparty/simpletest/test_case.php             |  658 +++
 3rdparty/simpletest/tidy_parser.php           |  382 ++
 3rdparty/simpletest/unit_tester.php           |  413 ++
 3rdparty/simpletest/url.php                   |  550 ++
 3rdparty/simpletest/user_agent.php            |  328 ++
 3rdparty/simpletest/web_tester.php            | 1532 +++++
 3rdparty/simpletest/xml.php                   |  647 ++
 3rdparty/timepicker/GPL-LICENSE.txt           |  278 +
 3rdparty/timepicker/MIT-LICENSE.txt           |   20 +
 .../ui-bg_diagonals-thick_18_b81900_40x40.png |  Bin 0 -> 260 bytes
 .../ui-bg_diagonals-thick_20_666666_40x40.png |  Bin 0 -> 251 bytes
 .../images/ui-bg_flat_10_000000_40x100.png    |  Bin 0 -> 178 bytes
 .../images/ui-bg_glass_100_f6f6f6_1x400.png   |  Bin 0 -> 104 bytes
 .../images/ui-bg_glass_100_fdf5ce_1x400.png   |  Bin 0 -> 125 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png    |  Bin 0 -> 105 bytes
 .../ui-bg_gloss-wave_35_f6a828_500x100.png    |  Bin 0 -> 3762 bytes
 .../ui-bg_highlight-soft_100_eeeeee_1x100.png |  Bin 0 -> 90 bytes
 .../ui-bg_highlight-soft_75_ffe45c_1x100.png  |  Bin 0 -> 129 bytes
 .../images/ui-icons_222222_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_228ef1_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_ef8c08_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_ffd27a_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_ffffff_256x240.png        |  Bin 0 -> 4369 bytes
 .../css/include/jquery-1.5.1.min.js           |   16 +
 .../css/include/jquery-ui-1.8.14.custom.css   |  568 ++
 .../css/include/jquery.ui.core.min.js         |   17 +
 .../css/include/jquery.ui.position.min.js     |   16 +
 .../css/include/jquery.ui.tabs.min.js         |   35 +
 .../css/include/jquery.ui.widget.min.js       |   15 +
 .../ui-bg_diagonals-thick_18_b81900_40x40.png |  Bin 0 -> 260 bytes
 .../ui-bg_diagonals-thick_20_666666_40x40.png |  Bin 0 -> 251 bytes
 .../images/ui-bg_flat_10_000000_40x100.png    |  Bin 0 -> 178 bytes
 .../images/ui-bg_glass_100_f6f6f6_1x400.png   |  Bin 0 -> 104 bytes
 .../images/ui-bg_glass_100_fdf5ce_1x400.png   |  Bin 0 -> 125 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png    |  Bin 0 -> 105 bytes
 .../ui-bg_gloss-wave_35_f6a828_500x100.png    |  Bin 0 -> 3762 bytes
 .../ui-bg_highlight-soft_100_eeeeee_1x100.png |  Bin 0 -> 90 bytes
 .../ui-bg_highlight-soft_75_ffe45c_1x100.png  |  Bin 0 -> 129 bytes
 .../images/ui-icons_222222_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_228ef1_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_ef8c08_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_ffd27a_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_ffffff_256x240.png        |  Bin 0 -> 4369 bytes
 .../timepicker/css/jquery.ui.timepicker.css   |   69 +
 3rdparty/timepicker/js/i18n/i18n.html         |   73 +
 .../js/i18n/jquery.ui.timepicker-de.js        |    9 +
 .../js/i18n/jquery.ui.timepicker-fr.js        |   13 +
 .../js/i18n/jquery.ui.timepicker-ja.js        |    9 +
 .../timepicker/js/jquery.ui.timepicker.js     | 1345 +++++
 3rdparty/timepicker/releases.txt              |  105 +
 3rdparty/when/MIT-LICENSE.txt                 |    9 +
 3rdparty/when/When.php                        |  731 +++
 419 files changed, 123978 insertions(+), 2 deletions(-)
 create mode 100644 3rdparty/Console/Getopt.php
 create mode 100644 3rdparty/Crypt_Blowfish/Blowfish.php
 create mode 100644 3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php
 create mode 100644 3rdparty/MDB2.php
 create mode 100644 3rdparty/MDB2/Date.php
 create mode 100644 3rdparty/MDB2/Driver/Datatype/Common.php
 create mode 100644 3rdparty/MDB2/Driver/Datatype/mysql.php
 create mode 100644 3rdparty/MDB2/Driver/Datatype/pgsql.php
 create mode 100644 3rdparty/MDB2/Driver/Datatype/sqlite.php
 create mode 100644 3rdparty/MDB2/Driver/Function/Common.php
 create mode 100644 3rdparty/MDB2/Driver/Function/mysql.php
 create mode 100644 3rdparty/MDB2/Driver/Function/pgsql.php
 create mode 100644 3rdparty/MDB2/Driver/Function/sqlite.php
 create mode 100644 3rdparty/MDB2/Driver/Manager/Common.php
 create mode 100644 3rdparty/MDB2/Driver/Manager/mysql.php
 create mode 100644 3rdparty/MDB2/Driver/Manager/pgsql.php
 create mode 100644 3rdparty/MDB2/Driver/Manager/sqlite.php
 create mode 100644 3rdparty/MDB2/Driver/Native/Common.php
 create mode 100644 3rdparty/MDB2/Driver/Native/mysql.php
 create mode 100644 3rdparty/MDB2/Driver/Native/pgsql.php
 create mode 100644 3rdparty/MDB2/Driver/Native/sqlite.php
 create mode 100644 3rdparty/MDB2/Driver/Reverse/Common.php
 create mode 100644 3rdparty/MDB2/Driver/Reverse/mysql.php
 create mode 100644 3rdparty/MDB2/Driver/Reverse/pgsql.php
 create mode 100644 3rdparty/MDB2/Driver/Reverse/sqlite.php
 create mode 100644 3rdparty/MDB2/Driver/mysql.php
 create mode 100644 3rdparty/MDB2/Driver/pgsql.php
 create mode 100644 3rdparty/MDB2/Driver/sqlite.php
 create mode 100644 3rdparty/MDB2/Extended.php
 create mode 100644 3rdparty/MDB2/Iterator.php
 create mode 100644 3rdparty/MDB2/LOB.php
 create mode 100644 3rdparty/MDB2/Schema.php
 create mode 100644 3rdparty/MDB2/Schema/Parser.php
 create mode 100644 3rdparty/MDB2/Schema/Parser2.php
 create mode 100644 3rdparty/MDB2/Schema/Reserved/ibase.php
 create mode 100644 3rdparty/MDB2/Schema/Reserved/mssql.php
 create mode 100644 3rdparty/MDB2/Schema/Reserved/mysql.php
 create mode 100644 3rdparty/MDB2/Schema/Reserved/oci8.php
 create mode 100644 3rdparty/MDB2/Schema/Reserved/pgsql.php
 create mode 100644 3rdparty/MDB2/Schema/Tool.php
 create mode 100644 3rdparty/MDB2/Schema/Tool/ParameterException.php
 create mode 100644 3rdparty/MDB2/Schema/Validate.php
 create mode 100644 3rdparty/MDB2/Schema/Writer.php
 create mode 100644 3rdparty/PEAR.php
 create mode 100644 3rdparty/PEAR/Autoloader.php
 create mode 100644 3rdparty/PEAR/Builder.php
 create mode 100644 3rdparty/PEAR/Command.php
 create mode 100644 3rdparty/PEAR/Command/Auth.php
 create mode 100644 3rdparty/PEAR/Command/Build.php
 create mode 100644 3rdparty/PEAR/Command/Common.php
 create mode 100644 3rdparty/PEAR/Command/Config.php
 create mode 100644 3rdparty/PEAR/Command/Install.php
 create mode 100644 3rdparty/PEAR/Command/Mirror.php
 create mode 100644 3rdparty/PEAR/Command/Package.php
 create mode 100644 3rdparty/PEAR/Command/Registry.php
 create mode 100644 3rdparty/PEAR/Command/Remote.php
 create mode 100644 3rdparty/PEAR/Common.php
 create mode 100644 3rdparty/PEAR/Config.php
 create mode 100644 3rdparty/PEAR/Dependency.php
 create mode 100644 3rdparty/PEAR/Downloader.php
 create mode 100644 3rdparty/PEAR/ErrorStack.php
 create mode 100644 3rdparty/PEAR/Exception.php
 create mode 100644 3rdparty/PEAR/Frontend/CLI.php
 create mode 100644 3rdparty/PEAR/Installer.php
 create mode 100644 3rdparty/PEAR/Packager.php
 create mode 100644 3rdparty/PEAR/Registry.php
 create mode 100644 3rdparty/PEAR/Remote.php
 create mode 100644 3rdparty/PEAR/RunTest.php
 delete mode 100644 3rdparty/README
 create mode 100644 3rdparty/Sabre.includes.php
 create mode 100644 3rdparty/Sabre/CalDAV/Backend/Abstract.php
 create mode 100644 3rdparty/Sabre/CalDAV/Backend/PDO.php
 create mode 100644 3rdparty/Sabre/CalDAV/Calendar.php
 create mode 100644 3rdparty/Sabre/CalDAV/CalendarObject.php
 create mode 100644 3rdparty/Sabre/CalDAV/CalendarRootNode.php
 create mode 100644 3rdparty/Sabre/CalDAV/Exception/InvalidICalendarObject.php
 create mode 100644 3rdparty/Sabre/CalDAV/ICSExportPlugin.php
 create mode 100644 3rdparty/Sabre/CalDAV/ICalendar.php
 create mode 100644 3rdparty/Sabre/CalDAV/ICalendarObject.php
 create mode 100644 3rdparty/Sabre/CalDAV/ICalendarUtil.php
 create mode 100644 3rdparty/Sabre/CalDAV/Plugin.php
 create mode 100644 3rdparty/Sabre/CalDAV/Principal/Collection.php
 create mode 100644 3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
 create mode 100644 3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
 create mode 100644 3rdparty/Sabre/CalDAV/Principal/User.php
 create mode 100644 3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
 create mode 100644 3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
 create mode 100644 3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
 create mode 100644 3rdparty/Sabre/CalDAV/Server.php
 create mode 100644 3rdparty/Sabre/CalDAV/UserCalendars.php
 create mode 100644 3rdparty/Sabre/CalDAV/Version.php
 create mode 100644 3rdparty/Sabre/CalDAV/XMLUtil.php
 create mode 100644 3rdparty/Sabre/CardDAV/AddressBook.php
 create mode 100644 3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
 create mode 100644 3rdparty/Sabre/CardDAV/AddressBookRoot.php
 create mode 100644 3rdparty/Sabre/CardDAV/Backend/Abstract.php
 create mode 100644 3rdparty/Sabre/CardDAV/Backend/PDO.php
 create mode 100644 3rdparty/Sabre/CardDAV/Card.php
 create mode 100644 3rdparty/Sabre/CardDAV/IAddressBook.php
 create mode 100644 3rdparty/Sabre/CardDAV/ICard.php
 create mode 100644 3rdparty/Sabre/CardDAV/IDirectory.php
 create mode 100644 3rdparty/Sabre/CardDAV/Plugin.php
 create mode 100644 3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
 create mode 100644 3rdparty/Sabre/CardDAV/UserAddressBooks.php
 create mode 100644 3rdparty/Sabre/CardDAV/Version.php
 create mode 100644 3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
 create mode 100644 3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
 create mode 100644 3rdparty/Sabre/DAV/Auth/Backend/Apache.php
 create mode 100644 3rdparty/Sabre/DAV/Auth/Backend/File.php
 create mode 100644 3rdparty/Sabre/DAV/Auth/Backend/PDO.php
 create mode 100644 3rdparty/Sabre/DAV/Auth/IBackend.php
 create mode 100644 3rdparty/Sabre/DAV/Auth/Plugin.php
 create mode 100644 3rdparty/Sabre/DAV/Browser/GuessContentType.php
 create mode 100644 3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
 create mode 100644 3rdparty/Sabre/DAV/Browser/Plugin.php
 create mode 100644 3rdparty/Sabre/DAV/Client.php
 create mode 100644 3rdparty/Sabre/DAV/Collection.php
 create mode 100644 3rdparty/Sabre/DAV/Directory.php
 create mode 100644 3rdparty/Sabre/DAV/Exception.php
 create mode 100644 3rdparty/Sabre/DAV/Exception/BadRequest.php
 create mode 100644 3rdparty/Sabre/DAV/Exception/Conflict.php
 create mode 100644 3rdparty/Sabre/DAV/Exception/ConflictingLock.php
 create mode 100644 3rdparty/Sabre/DAV/Exception/FileNotFound.php
 create mode 100644 3rdparty/Sabre/DAV/Exception/Forbidden.php
 create mode 100644 3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
 create mode 100644 3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
 create mode 100644 3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
 create mode 100644 3rdparty/Sabre/DAV/Exception/Locked.php
 create mode 100644 3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
 create mode 100644 3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
 create mode 100644 3rdparty/Sabre/DAV/Exception/NotImplemented.php
 create mode 100644 3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
 create mode 100644 3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
 create mode 100644 3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
 create mode 100644 3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
 create mode 100644 3rdparty/Sabre/DAV/FS/Directory.php
 create mode 100644 3rdparty/Sabre/DAV/FS/File.php
 create mode 100644 3rdparty/Sabre/DAV/FS/Node.php
 create mode 100644 3rdparty/Sabre/DAV/FSExt/Directory.php
 create mode 100644 3rdparty/Sabre/DAV/FSExt/File.php
 create mode 100644 3rdparty/Sabre/DAV/FSExt/Node.php
 create mode 100644 3rdparty/Sabre/DAV/File.php
 create mode 100644 3rdparty/Sabre/DAV/ICollection.php
 create mode 100644 3rdparty/Sabre/DAV/IExtendedCollection.php
 create mode 100644 3rdparty/Sabre/DAV/IFile.php
 create mode 100644 3rdparty/Sabre/DAV/ILockable.php
 create mode 100644 3rdparty/Sabre/DAV/INode.php
 create mode 100644 3rdparty/Sabre/DAV/IProperties.php
 create mode 100644 3rdparty/Sabre/DAV/IQuota.php
 create mode 100644 3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
 create mode 100644 3rdparty/Sabre/DAV/Locks/Backend/FS.php
 create mode 100644 3rdparty/Sabre/DAV/Locks/Backend/File.php
 create mode 100644 3rdparty/Sabre/DAV/Locks/Backend/PDO.php
 create mode 100644 3rdparty/Sabre/DAV/Locks/LockInfo.php
 create mode 100644 3rdparty/Sabre/DAV/Locks/Plugin.php
 create mode 100644 3rdparty/Sabre/DAV/Mount/Plugin.php
 create mode 100644 3rdparty/Sabre/DAV/Node.php
 create mode 100644 3rdparty/Sabre/DAV/ObjectTree.php
 create mode 100644 3rdparty/Sabre/DAV/Property.php
 create mode 100644 3rdparty/Sabre/DAV/Property/GetLastModified.php
 create mode 100644 3rdparty/Sabre/DAV/Property/Href.php
 create mode 100644 3rdparty/Sabre/DAV/Property/HrefList.php
 create mode 100644 3rdparty/Sabre/DAV/Property/IHref.php
 create mode 100644 3rdparty/Sabre/DAV/Property/LockDiscovery.php
 create mode 100644 3rdparty/Sabre/DAV/Property/ResourceType.php
 create mode 100644 3rdparty/Sabre/DAV/Property/Response.php
 create mode 100644 3rdparty/Sabre/DAV/Property/ResponseList.php
 create mode 100644 3rdparty/Sabre/DAV/Property/SupportedLock.php
 create mode 100644 3rdparty/Sabre/DAV/Property/SupportedReportSet.php
 create mode 100644 3rdparty/Sabre/DAV/Server.php
 create mode 100644 3rdparty/Sabre/DAV/ServerPlugin.php
 create mode 100644 3rdparty/Sabre/DAV/SimpleCollection.php
 create mode 100644 3rdparty/Sabre/DAV/SimpleDirectory.php
 create mode 100644 3rdparty/Sabre/DAV/SimpleFile.php
 create mode 100644 3rdparty/Sabre/DAV/StringUtil.php
 create mode 100644 3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
 create mode 100644 3rdparty/Sabre/DAV/Tree.php
 create mode 100644 3rdparty/Sabre/DAV/Tree/Filesystem.php
 create mode 100644 3rdparty/Sabre/DAV/URLUtil.php
 create mode 100644 3rdparty/Sabre/DAV/UUIDUtil.php
 create mode 100644 3rdparty/Sabre/DAV/Version.php
 create mode 100644 3rdparty/Sabre/DAV/XMLUtil.php
 create mode 100644 3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
 create mode 100644 3rdparty/Sabre/DAVACL/Exception/AceConflict.php
 create mode 100644 3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
 create mode 100644 3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
 create mode 100644 3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
 create mode 100644 3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
 create mode 100644 3rdparty/Sabre/DAVACL/IACL.php
 create mode 100644 3rdparty/Sabre/DAVACL/IPrincipal.php
 create mode 100644 3rdparty/Sabre/DAVACL/IPrincipalBackend.php
 create mode 100644 3rdparty/Sabre/DAVACL/Plugin.php
 create mode 100644 3rdparty/Sabre/DAVACL/Principal.php
 create mode 100644 3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
 create mode 100644 3rdparty/Sabre/DAVACL/PrincipalCollection.php
 create mode 100644 3rdparty/Sabre/DAVACL/Property/Acl.php
 create mode 100644 3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
 create mode 100644 3rdparty/Sabre/DAVACL/Property/Principal.php
 create mode 100644 3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
 create mode 100644 3rdparty/Sabre/DAVACL/Version.php
 create mode 100644 3rdparty/Sabre/HTTP/AWSAuth.php
 create mode 100644 3rdparty/Sabre/HTTP/AbstractAuth.php
 create mode 100644 3rdparty/Sabre/HTTP/BasicAuth.php
 create mode 100644 3rdparty/Sabre/HTTP/DigestAuth.php
 create mode 100644 3rdparty/Sabre/HTTP/Request.php
 create mode 100644 3rdparty/Sabre/HTTP/Response.php
 create mode 100644 3rdparty/Sabre/HTTP/Util.php
 create mode 100644 3rdparty/Sabre/HTTP/Version.php
 create mode 100644 3rdparty/Sabre/LICENCE
 create mode 100644 3rdparty/Sabre/VObject/Component.php
 create mode 100644 3rdparty/Sabre/VObject/Element.php
 create mode 100644 3rdparty/Sabre/VObject/Element/DateTime.php
 create mode 100644 3rdparty/Sabre/VObject/Element/MultiDateTime.php
 create mode 100644 3rdparty/Sabre/VObject/ElementList.php
 create mode 100644 3rdparty/Sabre/VObject/Node.php
 create mode 100644 3rdparty/Sabre/VObject/Parameter.php
 create mode 100644 3rdparty/Sabre/VObject/ParseException.php
 create mode 100644 3rdparty/Sabre/VObject/Property.php
 create mode 100644 3rdparty/Sabre/VObject/Reader.php
 create mode 100644 3rdparty/Sabre/VObject/Version.php
 create mode 100644 3rdparty/Sabre/VObject/includes.php
 create mode 100644 3rdparty/Sabre/autoload.php
 create mode 100644 3rdparty/System.php
 create mode 100644 3rdparty/XML/Parser.php
 create mode 100644 3rdparty/XML/RPC.php
 create mode 100644 3rdparty/XML/RPC/Server.php
 create mode 100644 3rdparty/css/chosen-sprite.png
 create mode 100644 3rdparty/css/chosen.css
 create mode 100644 3rdparty/css/chosen/chosen-sprite.png
 create mode 100644 3rdparty/css/chosen/chosen.css
 create mode 100644 3rdparty/fullcalendar/GPL-LICENSE.txt
 create mode 100644 3rdparty/fullcalendar/MIT-LICENSE.txt
 create mode 100644 3rdparty/fullcalendar/changelog.txt
 create mode 100644 3rdparty/fullcalendar/css/fullcalendar.css
 create mode 100644 3rdparty/fullcalendar/css/fullcalendar.print.css
 create mode 100644 3rdparty/fullcalendar/js/fullcalendar.js
 create mode 100644 3rdparty/fullcalendar/js/fullcalendar.min.js
 create mode 100644 3rdparty/fullcalendar/js/gcal.js
 create mode 100644 3rdparty/js/chosen/LICENSE.md
 create mode 100644 3rdparty/js/chosen/README.md
 create mode 100644 3rdparty/js/chosen/VERSION
 create mode 100644 3rdparty/js/chosen/chosen.jquery.js
 create mode 100644 3rdparty/js/chosen/chosen.jquery.min.js
 create mode 100755 3rdparty/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
 create mode 100755 3rdparty/simpletest/LICENSE
 create mode 100755 3rdparty/simpletest/README
 create mode 100755 3rdparty/simpletest/VERSION
 create mode 100755 3rdparty/simpletest/arguments.php
 create mode 100644 3rdparty/simpletest/authentication.php
 create mode 100644 3rdparty/simpletest/autorun.php
 create mode 100644 3rdparty/simpletest/browser.php
 create mode 100644 3rdparty/simpletest/collector.php
 create mode 100755 3rdparty/simpletest/compatibility.php
 create mode 100644 3rdparty/simpletest/cookies.php
 create mode 100644 3rdparty/simpletest/default_reporter.php
 create mode 100755 3rdparty/simpletest/detached.php
 create mode 100644 3rdparty/simpletest/docs/en/authentication_documentation.html
 create mode 100644 3rdparty/simpletest/docs/en/browser_documentation.html
 create mode 100755 3rdparty/simpletest/docs/en/docs.css
 create mode 100644 3rdparty/simpletest/docs/en/expectation_documentation.html
 create mode 100644 3rdparty/simpletest/docs/en/form_testing_documentation.html
 create mode 100644 3rdparty/simpletest/docs/en/group_test_documentation.html
 create mode 100644 3rdparty/simpletest/docs/en/index.html
 create mode 100644 3rdparty/simpletest/docs/en/mock_objects_documentation.html
 create mode 100644 3rdparty/simpletest/docs/en/overview.html
 create mode 100644 3rdparty/simpletest/docs/en/partial_mocks_documentation.html
 create mode 100644 3rdparty/simpletest/docs/en/reporter_documentation.html
 create mode 100644 3rdparty/simpletest/docs/en/unit_test_documentation.html
 create mode 100644 3rdparty/simpletest/docs/en/web_tester_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/authentication_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/browser_documentation.html
 create mode 100755 3rdparty/simpletest/docs/fr/docs.css
 create mode 100644 3rdparty/simpletest/docs/fr/expectation_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/form_testing_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/group_test_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/index.html
 create mode 100644 3rdparty/simpletest/docs/fr/mock_objects_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/overview.html
 create mode 100644 3rdparty/simpletest/docs/fr/partial_mocks_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/reporter_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/unit_test_documentation.html
 create mode 100644 3rdparty/simpletest/docs/fr/web_tester_documentation.html
 create mode 100755 3rdparty/simpletest/dumper.php
 create mode 100644 3rdparty/simpletest/eclipse.php
 create mode 100644 3rdparty/simpletest/encoding.php
 create mode 100644 3rdparty/simpletest/errors.php
 create mode 100755 3rdparty/simpletest/exceptions.php
 create mode 100755 3rdparty/simpletest/expectation.php
 create mode 100755 3rdparty/simpletest/extensions/pear_test_case.php
 create mode 100755 3rdparty/simpletest/extensions/testdox.php
 create mode 100755 3rdparty/simpletest/extensions/testdox/test.php
 create mode 100644 3rdparty/simpletest/form.php
 create mode 100755 3rdparty/simpletest/frames.php
 create mode 100644 3rdparty/simpletest/http.php
 create mode 100755 3rdparty/simpletest/invoker.php
 create mode 100755 3rdparty/simpletest/mock_objects.php
 create mode 100755 3rdparty/simpletest/page.php
 create mode 100755 3rdparty/simpletest/php_parser.php
 create mode 100644 3rdparty/simpletest/recorder.php
 create mode 100644 3rdparty/simpletest/reflection_php4.php
 create mode 100644 3rdparty/simpletest/reflection_php5.php
 create mode 100644 3rdparty/simpletest/remote.php
 create mode 100755 3rdparty/simpletest/reporter.php
 create mode 100644 3rdparty/simpletest/scorer.php
 create mode 100755 3rdparty/simpletest/selector.php
 create mode 100644 3rdparty/simpletest/shell_tester.php
 create mode 100644 3rdparty/simpletest/simpletest.php
 create mode 100755 3rdparty/simpletest/socket.php
 create mode 100644 3rdparty/simpletest/tag.php
 create mode 100644 3rdparty/simpletest/test/acceptance_test.php
 create mode 100755 3rdparty/simpletest/test/adapter_test.php
 create mode 100755 3rdparty/simpletest/test/all_tests.php
 create mode 100755 3rdparty/simpletest/test/arguments_test.php
 create mode 100755 3rdparty/simpletest/test/authentication_test.php
 create mode 100755 3rdparty/simpletest/test/autorun_test.php
 create mode 100755 3rdparty/simpletest/test/bad_test_suite.php
 create mode 100755 3rdparty/simpletest/test/browser_test.php
 create mode 100755 3rdparty/simpletest/test/collector_test.php
 create mode 100755 3rdparty/simpletest/test/command_line_test.php
 create mode 100755 3rdparty/simpletest/test/compatibility_test.php
 create mode 100755 3rdparty/simpletest/test/cookies_test.php
 create mode 100755 3rdparty/simpletest/test/detached_test.php
 create mode 100755 3rdparty/simpletest/test/dumper_test.php
 create mode 100755 3rdparty/simpletest/test/eclipse_test.php
 create mode 100755 3rdparty/simpletest/test/encoding_test.php
 create mode 100755 3rdparty/simpletest/test/errors_test.php
 create mode 100755 3rdparty/simpletest/test/exceptions_test.php
 create mode 100755 3rdparty/simpletest/test/expectation_test.php
 create mode 100755 3rdparty/simpletest/test/form_test.php
 create mode 100755 3rdparty/simpletest/test/frames_test.php
 create mode 100755 3rdparty/simpletest/test/http_test.php
 create mode 100755 3rdparty/simpletest/test/interfaces_test.php
 create mode 100755 3rdparty/simpletest/test/interfaces_test_php5_1.php
 create mode 100755 3rdparty/simpletest/test/live_test.php
 create mode 100755 3rdparty/simpletest/test/mock_objects_test.php
 create mode 100755 3rdparty/simpletest/test/page_test.php
 create mode 100755 3rdparty/simpletest/test/parse_error_test.php
 create mode 100755 3rdparty/simpletest/test/parsing_test.php
 create mode 100755 3rdparty/simpletest/test/php_parser_test.php
 create mode 100755 3rdparty/simpletest/test/recorder_test.php
 create mode 100755 3rdparty/simpletest/test/reflection_php5_test.php
 create mode 100755 3rdparty/simpletest/test/remote_test.php
 create mode 100755 3rdparty/simpletest/test/shell_test.php
 create mode 100755 3rdparty/simpletest/test/shell_tester_test.php
 create mode 100755 3rdparty/simpletest/test/simpletest_test.php
 create mode 100755 3rdparty/simpletest/test/site/file.html
 create mode 100755 3rdparty/simpletest/test/socket_test.php
 create mode 100755 3rdparty/simpletest/test/support/collector/collectable.1
 create mode 100755 3rdparty/simpletest/test/support/collector/collectable.2
 create mode 100755 3rdparty/simpletest/test/support/empty_test_file.php
 create mode 100755 3rdparty/simpletest/test/support/failing_test.php
 create mode 100755 3rdparty/simpletest/test/support/latin1_sample
 create mode 100755 3rdparty/simpletest/test/support/passing_test.php
 create mode 100755 3rdparty/simpletest/test/support/recorder_sample.php
 create mode 100755 3rdparty/simpletest/test/support/spl_examples.php
 create mode 100755 3rdparty/simpletest/test/support/supplementary_upload_sample.txt
 create mode 100755 3rdparty/simpletest/test/support/test1.php
 create mode 100755 3rdparty/simpletest/test/support/upload_sample.txt
 create mode 100755 3rdparty/simpletest/test/tag_test.php
 create mode 100755 3rdparty/simpletest/test/test_with_parse_error.php
 create mode 100755 3rdparty/simpletest/test/unit_tester_test.php
 create mode 100755 3rdparty/simpletest/test/unit_tests.php
 create mode 100755 3rdparty/simpletest/test/url_test.php
 create mode 100755 3rdparty/simpletest/test/user_agent_test.php
 create mode 100755 3rdparty/simpletest/test/visual_test.php
 create mode 100755 3rdparty/simpletest/test/web_tester_test.php
 create mode 100755 3rdparty/simpletest/test/xml_test.php
 create mode 100644 3rdparty/simpletest/test_case.php
 create mode 100755 3rdparty/simpletest/tidy_parser.php
 create mode 100755 3rdparty/simpletest/unit_tester.php
 create mode 100644 3rdparty/simpletest/url.php
 create mode 100644 3rdparty/simpletest/user_agent.php
 create mode 100644 3rdparty/simpletest/web_tester.php
 create mode 100755 3rdparty/simpletest/xml.php
 create mode 100644 3rdparty/timepicker/GPL-LICENSE.txt
 create mode 100644 3rdparty/timepicker/MIT-LICENSE.txt
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_20_666666_40x40.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_flat_10_000000_40x100.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_glass_100_f6f6f6_1x400.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_glass_100_fdf5ce_1x400.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_glass_65_ffffff_1x400.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_gloss-wave_35_f6a828_500x100.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-icons_222222_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-icons_228ef1_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-icons_ef8c08_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-icons_ffd27a_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/images/ui-icons_ffffff_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/jquery-1.5.1.min.js
 create mode 100644 3rdparty/timepicker/css/include/jquery-ui-1.8.14.custom.css
 create mode 100644 3rdparty/timepicker/css/include/jquery.ui.core.min.js
 create mode 100644 3rdparty/timepicker/css/include/jquery.ui.position.min.js
 create mode 100644 3rdparty/timepicker/css/include/jquery.ui.tabs.min.js
 create mode 100644 3rdparty/timepicker/css/include/jquery.ui.widget.min.js
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_222222_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_228ef1_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ef8c08_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffd27a_256x240.png
 create mode 100644 3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffffff_256x240.png
 create mode 100644 3rdparty/timepicker/css/jquery.ui.timepicker.css
 create mode 100644 3rdparty/timepicker/js/i18n/i18n.html
 create mode 100644 3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js
 create mode 100644 3rdparty/timepicker/js/i18n/jquery.ui.timepicker-fr.js
 create mode 100644 3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js
 create mode 100644 3rdparty/timepicker/js/jquery.ui.timepicker.js
 create mode 100644 3rdparty/timepicker/releases.txt
 create mode 100644 3rdparty/when/MIT-LICENSE.txt
 create mode 100755 3rdparty/when/When.php

diff --git a/3rdparty/Console/Getopt.php b/3rdparty/Console/Getopt.php
new file mode 100644
index 00000000000..aec980b34d5
--- /dev/null
+++ b/3rdparty/Console/Getopt.php
@@ -0,0 +1,251 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Andrei Zmievski <andrei@php.net>                             |
+// +----------------------------------------------------------------------+
+//
+// $Id: Getopt.php,v 1.21.4.7 2003/12/05 21:57:01 andrei Exp $
+
+require_once( 'PEAR.php');
+
+/**
+ * Command-line options parsing class.
+ *
+ * @author Andrei Zmievski <andrei@php.net>
+ *
+ */
+class Console_Getopt {
+    /**
+     * Parses the command-line options.
+     *
+     * The first parameter to this function should be the list of command-line
+     * arguments without the leading reference to the running program.
+     *
+     * The second parameter is a string of allowed short options. Each of the
+     * option letters can be followed by a colon ':' to specify that the option
+     * requires an argument, or a double colon '::' to specify that the option
+     * takes an optional argument.
+     *
+     * The third argument is an optional array of allowed long options. The
+     * leading '--' should not be included in the option name. Options that
+     * require an argument should be followed by '=', and options that take an
+     * option argument should be followed by '=='.
+     *
+     * The return value is an array of two elements: the list of parsed
+     * options and the list of non-option command-line arguments. Each entry in
+     * the list of parsed options is a pair of elements - the first one
+     * specifies the option, and the second one specifies the option argument,
+     * if there was one.
+     *
+     * Long and short options can be mixed.
+     *
+     * Most of the semantics of this function are based on GNU getopt_long().
+     *
+     * @param array  $args           an array of command-line arguments
+     * @param string $short_options  specifies the list of allowed short options
+     * @param array  $long_options   specifies the list of allowed long options
+     *
+     * @return array two-element array containing the list of parsed options and
+     * the non-option arguments
+     *
+     * @access public
+     *
+     */
+    function getopt2($args, $short_options, $long_options = null)
+    {
+        return Console_Getopt::doGetopt(2, $args, $short_options, $long_options);
+    }
+
+    /**
+     * This function expects $args to start with the script name (POSIX-style).
+     * Preserved for backwards compatibility.
+     * @see getopt2()
+     */
+    function getopt($args, $short_options, $long_options = null)
+    {
+        return Console_Getopt::doGetopt(1, $args, $short_options, $long_options);
+    }
+
+    /**
+     * The actual implementation of the argument parsing code.
+     */
+    function doGetopt($version, $args, $short_options, $long_options = null)
+    {
+        // in case you pass directly readPHPArgv() as the first arg
+        if (PEAR::isError($args)) {
+            return $args;
+        }
+        if (empty($args)) {
+            return array(array(), array());
+        }
+        $opts     = array();
+        $non_opts = array();
+
+        settype($args, 'array');
+
+        if ($long_options) {
+            sort($long_options);
+        }
+
+        /*
+         * Preserve backwards compatibility with callers that relied on
+         * erroneous POSIX fix.
+         */
+        if ($version < 2) {
+            if (isset($args[0]{0}) && $args[0]{0} != '-') {
+                array_shift($args);
+            }
+        }
+
+        reset($args);
+        while (list($i, $arg) = each($args)) {
+
+            /* The special element '--' means explicit end of
+               options. Treat the rest of the arguments as non-options
+               and end the loop. */
+            if ($arg == '--') {
+                $non_opts = array_merge($non_opts, array_slice($args, $i + 1));
+                break;
+            }
+
+            if ($arg{0} != '-' || (strlen($arg) > 1 && $arg{1} == '-' && !$long_options)) {
+                $non_opts = array_merge($non_opts, array_slice($args, $i));
+                break;
+            } elseif (strlen($arg) > 1 && $arg{1} == '-') {
+                $error = Console_Getopt::_parseLongOption(substr($arg, 2), $long_options, $opts, $args);
+                if (PEAR::isError($error))
+                    return $error;
+            } else {
+                $error = Console_Getopt::_parseShortOption(substr($arg, 1), $short_options, $opts, $args);
+                if (PEAR::isError($error))
+                    return $error;
+            }
+        }
+
+        return array($opts, $non_opts);
+    }
+
+    /**
+     * @access private
+     *
+     */
+    function _parseShortOption($arg, $short_options, &$opts, &$args)
+    {
+        for ($i = 0; $i < strlen($arg); $i++) {
+            $opt = $arg{$i};
+            $opt_arg = null;
+
+            /* Try to find the short option in the specifier string. */
+            if (($spec = strstr($short_options, $opt)) === false || $arg{$i} == ':')
+            {
+                return PEAR::raiseError("Console_Getopt: unrecognized option -- $opt");
+            }
+
+            if (strlen($spec) > 1 && $spec{1} == ':') {
+                if (strlen($spec) > 2 && $spec{2} == ':') {
+                    if ($i + 1 < strlen($arg)) {
+                        /* Option takes an optional argument. Use the remainder of
+                           the arg string if there is anything left. */
+                        $opts[] = array($opt, substr($arg, $i + 1));
+                        break;
+                    }
+                } else {
+                    /* Option requires an argument. Use the remainder of the arg
+                       string if there is anything left. */
+                    if ($i + 1 < strlen($arg)) {
+                        $opts[] = array($opt,  substr($arg, $i + 1));
+                        break;
+                    } else if (list(, $opt_arg) = each($args))
+                        /* Else use the next argument. */;
+                    else
+                        return PEAR::raiseError("Console_Getopt: option requires an argument -- $opt");
+                }
+            }
+
+            $opts[] = array($opt, $opt_arg);
+        }
+    }
+
+    /**
+     * @access private
+     *
+     */
+    function _parseLongOption($arg, $long_options, &$opts, &$args)
+    {
+        @list($opt, $opt_arg) = explode('=', $arg);
+        $opt_len = strlen($opt);
+
+        for ($i = 0; $i < count($long_options); $i++) {
+            $long_opt  = $long_options[$i];
+            $opt_start = substr($long_opt, 0, $opt_len);
+
+            /* Option doesn't match. Go on to the next one. */
+            if ($opt_start != $opt)
+                continue;
+
+            $opt_rest  = substr($long_opt, $opt_len);
+
+            /* Check that the options uniquely matches one of the allowed
+               options. */
+            if ($opt_rest != '' && $opt{0} != '=' &&
+                $i + 1 < count($long_options) &&
+                $opt == substr($long_options[$i+1], 0, $opt_len)) {
+                return PEAR::raiseError("Console_Getopt: option --$opt is ambiguous");
+            }
+
+            if (substr($long_opt, -1) == '=') {
+                if (substr($long_opt, -2) != '==') {
+                    /* Long option requires an argument.
+                       Take the next argument if one wasn't specified. */;
+                    if (!strlen($opt_arg) && !(list(, $opt_arg) = each($args))) {
+                        return PEAR::raiseError("Console_Getopt: option --$opt requires an argument");
+                    }
+                }
+            } else if ($opt_arg) {
+                return PEAR::raiseError("Console_Getopt: option --$opt doesn't allow an argument");
+            }
+
+            $opts[] = array('--' . $opt, $opt_arg);
+            return;
+        }
+
+        return PEAR::raiseError("Console_Getopt: unrecognized option --$opt");
+    }
+
+    /**
+    * Safely read the $argv PHP array across different PHP configurations.
+    * Will take care on register_globals and register_argc_argv ini directives
+    *
+    * @access public
+    * @return mixed the $argv PHP array or PEAR error if not registered
+    */
+    function readPHPArgv()
+    {
+        global $argv;
+        if (!is_array($argv)) {
+            if (!@is_array($_SERVER['argv'])) {
+                if (!@is_array($GLOBALS['HTTP_SERVER_VARS']['argv'])) {
+                    return PEAR::raiseError("Console_Getopt: Could not read cmd args (register_argc_argv=Off?)");
+                }
+                return $GLOBALS['HTTP_SERVER_VARS']['argv'];
+            }
+            return $_SERVER['argv'];
+        }
+        return $argv;
+    }
+
+}
+
+?>
diff --git a/3rdparty/Crypt_Blowfish/Blowfish.php b/3rdparty/Crypt_Blowfish/Blowfish.php
new file mode 100644
index 00000000000..a7b8948f043
--- /dev/null
+++ b/3rdparty/Crypt_Blowfish/Blowfish.php
@@ -0,0 +1,317 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Crypt_Blowfish allows for encryption and decryption on the fly using
+ * the Blowfish algorithm. Crypt_Blowfish does not require the mcrypt
+ * PHP extension, it uses only PHP.
+ * Crypt_Blowfish support encryption/decryption with or without a secret key.
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Encryption
+ * @package    Crypt_Blowfish
+ * @author     Matthew Fonda <mfonda@php.net>
+ * @copyright  2005 Matthew Fonda
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    CVS: $Id: Blowfish.php,v 1.81 2005/05/30 18:40:36 mfonda Exp $
+ * @link       http://pear.php.net/package/Crypt_Blowfish
+ */
+
+
+require_once 'PEAR.php';
+
+
+/**
+ *
+ * Example usage:
+ * $bf = new Crypt_Blowfish('some secret key!');
+ * $encrypted = $bf->encrypt('this is some example plain text');
+ * $plaintext = $bf->decrypt($encrypted);
+ * echo "plain text: $plaintext";
+ *
+ *
+ * @category   Encryption
+ * @package    Crypt_Blowfish
+ * @author     Matthew Fonda <mfonda@php.net>
+ * @copyright  2005 Matthew Fonda
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @link       http://pear.php.net/package/Crypt_Blowfish
+ * @version    @package_version@
+ * @access     public
+ */
+class Crypt_Blowfish
+{
+    /**
+     * P-Array contains 18 32-bit subkeys
+     *
+     * @var array
+     * @access private
+     */
+    var $_P = array();
+    
+    
+    /**
+     * Array of four S-Blocks each containing 256 32-bit entries
+     *
+     * @var array
+     * @access private
+     */
+    var $_S = array();
+
+    /**
+     * Mcrypt td resource
+     *
+     * @var resource
+     * @access private
+     */
+    var $_td = null;
+
+    /**
+     * Initialization vector
+     *
+     * @var string
+     * @access private
+     */
+    var $_iv = null;
+
+    
+    /**
+     * Crypt_Blowfish Constructor
+     * Initializes the Crypt_Blowfish object, and gives a sets
+     * the secret key
+     *
+     * @param string $key
+     * @access public
+     */
+    function Crypt_Blowfish($key)
+    {
+        if (extension_loaded('mcrypt')) {
+            $this->_td = mcrypt_module_open(MCRYPT_BLOWFISH, '', 'ecb', '');
+            $this->_iv = mcrypt_create_iv(8, MCRYPT_RAND);
+        }
+        $this->setKey($key);
+    }
+    
+    /**
+     * Deprecated isReady method
+     *
+     * @return bool
+     * @access public
+     * @deprecated
+     */
+    function isReady()
+    {
+        return true;
+    }
+    
+    /**
+     * Deprecated init method - init is now a private
+     * method and has been replaced with _init
+     *
+     * @return bool
+     * @access public
+     * @deprecated
+     * @see Crypt_Blowfish::_init()
+     */
+    function init()
+    {
+        $this->_init();
+    }
+    
+    /**
+     * Initializes the Crypt_Blowfish object
+     *
+     * @access private
+     */
+    function _init()
+    {
+        $defaults = new Crypt_Blowfish_DefaultKey();
+        $this->_P = $defaults->P;
+        $this->_S = $defaults->S;
+    }
+            
+    /**
+     * Enciphers a single 64 bit block
+     *
+     * @param int &$Xl
+     * @param int &$Xr
+     * @access private
+     */
+    function _encipher(&$Xl, &$Xr)
+    {
+        for ($i = 0; $i < 16; $i++) {
+            $temp = $Xl ^ $this->_P[$i];
+            $Xl = ((($this->_S[0][($temp>>24) & 255] +
+                            $this->_S[1][($temp>>16) & 255]) ^
+                            $this->_S[2][($temp>>8) & 255]) +
+                            $this->_S[3][$temp & 255]) ^ $Xr;
+            $Xr = $temp;
+        }
+        $Xr = $Xl ^ $this->_P[16];
+        $Xl = $temp ^ $this->_P[17];
+    }
+    
+    
+    /**
+     * Deciphers a single 64 bit block
+     *
+     * @param int &$Xl
+     * @param int &$Xr
+     * @access private
+     */
+    function _decipher(&$Xl, &$Xr)
+    {
+        for ($i = 17; $i > 1; $i--) {
+            $temp = $Xl ^ $this->_P[$i];
+            $Xl = ((($this->_S[0][($temp>>24) & 255] +
+                            $this->_S[1][($temp>>16) & 255]) ^
+                            $this->_S[2][($temp>>8) & 255]) +
+                            $this->_S[3][$temp & 255]) ^ $Xr;
+            $Xr = $temp;
+        }
+        $Xr = $Xl ^ $this->_P[1];
+        $Xl = $temp ^ $this->_P[0];
+    }
+    
+    
+    /**
+     * Encrypts a string
+     *
+     * @param string $plainText
+     * @return string Returns cipher text on success, PEAR_Error on failure
+     * @access public
+     */
+    function encrypt($plainText)
+    {
+        if (!is_string($plainText)) {
+            PEAR::raiseError('Plain text must be a string', 0, PEAR_ERROR_DIE);
+        }
+
+        if (extension_loaded('mcrypt')) {
+            return mcrypt_generic($this->_td, $plainText);
+        }
+
+        $cipherText = '';
+        $len = strlen($plainText);
+        $plainText .= str_repeat(chr(0),(8 - ($len%8))%8);
+        for ($i = 0; $i < $len; $i += 8) {
+            list(,$Xl,$Xr) = unpack("N2",substr($plainText,$i,8));
+            $this->_encipher($Xl, $Xr);
+            $cipherText .= pack("N2", $Xl, $Xr);
+        }
+        return $cipherText;
+    }
+    
+    
+    /**
+     * Decrypts an encrypted string
+     *
+     * @param string $cipherText
+     * @return string Returns plain text on success, PEAR_Error on failure
+     * @access public
+     */
+    function decrypt($cipherText)
+    {
+        if (!is_string($cipherText)) {
+            PEAR::raiseError('Chiper text must be a string', 1, PEAR_ERROR_DIE);
+        }
+
+        if (extension_loaded('mcrypt')) {
+            return mdecrypt_generic($this->_td, $cipherText);
+        }
+
+        $plainText = '';
+        $len = strlen($cipherText);
+        $cipherText .= str_repeat(chr(0),(8 - ($len%8))%8);
+        for ($i = 0; $i < $len; $i += 8) {
+            list(,$Xl,$Xr) = unpack("N2",substr($cipherText,$i,8));
+            $this->_decipher($Xl, $Xr);
+            $plainText .= pack("N2", $Xl, $Xr);
+        }
+        return $plainText;
+    }
+    
+    
+    /**
+     * Sets the secret key
+     * The key must be non-zero, and less than or equal to
+     * 56 characters in length.
+     *
+     * @param string $key
+     * @return bool  Returns true on success, PEAR_Error on failure
+     * @access public
+     */
+    function setKey($key)
+    {
+        if (!is_string($key)) {
+            PEAR::raiseError('Key must be a string', 2, PEAR_ERROR_DIE);
+        }
+
+        $len = strlen($key);
+
+        if ($len > 56 || $len == 0) {
+            PEAR::raiseError('Key must be less than 56 characters and non-zero. Supplied key length: ' . $len, 3, PEAR_ERROR_DIE);
+        }
+
+        if (extension_loaded('mcrypt')) {
+            mcrypt_generic_init($this->_td, $key, $this->_iv);
+            return true;
+        }
+
+        require_once 'Blowfish/DefaultKey.php';
+        $this->_init();
+        
+        $k = 0;
+        $data = 0;
+        $datal = 0;
+        $datar = 0;
+        
+        for ($i = 0; $i < 18; $i++) {
+            $data = 0;
+            for ($j = 4; $j > 0; $j--) {
+                    $data = $data << 8 | ord($key{$k});
+                    $k = ($k+1) % $len;
+            }
+            $this->_P[$i] ^= $data;
+        }
+        
+        for ($i = 0; $i <= 16; $i += 2) {
+            $this->_encipher($datal, $datar);
+            $this->_P[$i] = $datal;
+            $this->_P[$i+1] = $datar;
+        }
+        for ($i = 0; $i < 256; $i += 2) {
+            $this->_encipher($datal, $datar);
+            $this->_S[0][$i] = $datal;
+            $this->_S[0][$i+1] = $datar;
+        }
+        for ($i = 0; $i < 256; $i += 2) {
+            $this->_encipher($datal, $datar);
+            $this->_S[1][$i] = $datal;
+            $this->_S[1][$i+1] = $datar;
+        }
+        for ($i = 0; $i < 256; $i += 2) {
+            $this->_encipher($datal, $datar);
+            $this->_S[2][$i] = $datal;
+            $this->_S[2][$i+1] = $datar;
+        }
+        for ($i = 0; $i < 256; $i += 2) {
+            $this->_encipher($datal, $datar);
+            $this->_S[3][$i] = $datal;
+            $this->_S[3][$i+1] = $datar;
+        }
+        
+        return true;
+    }
+    
+}
+
+?>
diff --git a/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php b/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php
new file mode 100644
index 00000000000..2ff8ac788a6
--- /dev/null
+++ b/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php
@@ -0,0 +1,327 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Crypt_Blowfish allows for encryption and decryption on the fly using
+ * the Blowfish algorithm. Crypt_Blowfish does not require the mcrypt
+ * PHP extension, it uses only PHP.
+ * Crypt_Blowfish support encryption/decryption with or without a secret key.
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Encryption
+ * @package    Crypt_Blowfish
+ * @author     Matthew Fonda <mfonda@php.net>
+ * @copyright  2005 Matthew Fonda
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    CVS: $Id: DefaultKey.php,v 1.81 2005/05/30 18:40:37 mfonda Exp $
+ * @link       http://pear.php.net/package/Crypt_Blowfish
+ */
+
+
+/**
+ * Class containing default key
+ *
+ * @category   Encryption
+ * @package    Crypt_Blowfish
+ * @author     Matthew Fonda <mfonda@php.net>
+ * @copyright  2005 Matthew Fonda
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @link       http://pear.php.net/package/Crypt_Blowfish
+ * @version    @package_version@
+ * @access     public
+ */
+class Crypt_Blowfish_DefaultKey
+{
+    var $P = array();
+    
+    var $S = array();
+    
+    function Crypt_Blowfish_DefaultKey()
+    {
+        $this->P = array(
+            0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
+            0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,
+            0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,
+            0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,
+            0x9216D5D9, 0x8979FB1B
+        );
+        
+        $this->S = array(
+            array(
+                0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,
+                0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,
+                0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,
+                0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,
+                0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,
+                0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,
+                0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,
+                0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,
+                0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,
+                0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,
+                0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,
+                0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,
+                0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,
+                0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,
+                0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,
+                0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,
+                0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,
+                0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,
+                0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,
+                0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,
+                0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,
+                0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,
+                0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,
+                0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,
+                0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,
+                0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,
+                0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,
+                0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,
+                0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,
+                0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,
+                0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,
+                0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,
+                0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,
+                0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,
+                0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,
+                0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,
+                0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,
+                0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,
+                0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,
+                0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,
+                0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,
+                0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,
+                0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,
+                0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,
+                0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,
+                0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,
+                0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,
+                0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,
+                0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,
+                0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,
+                0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,
+                0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,
+                0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,
+                0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,
+                0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,
+                0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,
+                0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,
+                0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,
+                0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,
+                0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,
+                0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,
+                0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,
+                0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,
+                0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A
+            ),
+            array(
+                0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,
+                0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,
+                0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,
+                0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,
+                0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,
+                0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,
+                0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,
+                0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,
+                0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,
+                0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,
+                0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,
+                0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,
+                0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,
+                0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,
+                0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,
+                0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,
+                0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,
+                0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,
+                0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,
+                0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,
+                0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,
+                0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,
+                0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,
+                0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,
+                0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,
+                0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,
+                0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,
+                0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,
+                0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,
+                0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,
+                0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,
+                0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,
+                0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,
+                0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,
+                0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,
+                0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,
+                0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,
+                0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,
+                0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,
+                0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,
+                0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,
+                0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,
+                0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,
+                0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,
+                0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,
+                0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,
+                0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,
+                0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,
+                0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,
+                0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,
+                0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,
+                0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,
+                0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,
+                0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,
+                0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,
+                0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,
+                0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,
+                0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,
+                0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,
+                0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,
+                0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,
+                0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,
+                0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,
+                0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7
+            ),
+            array(
+                0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,
+                0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,
+                0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,
+                0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,
+                0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,
+                0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,
+                0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,
+                0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,
+                0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,
+                0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,
+                0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,
+                0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,
+                0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,
+                0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,
+                0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,
+                0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,
+                0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,
+                0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,
+                0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,
+                0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,
+                0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,
+                0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,
+                0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,
+                0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,
+                0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,
+                0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,
+                0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,
+                0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,
+                0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,
+                0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,
+                0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,
+                0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,
+                0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,
+                0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,
+                0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,
+                0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,
+                0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,
+                0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,
+                0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,
+                0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,
+                0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,
+                0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,
+                0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,
+                0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,
+                0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,
+                0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,
+                0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,
+                0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,
+                0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,
+                0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,
+                0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,
+                0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,
+                0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,
+                0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,
+                0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,
+                0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,
+                0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,
+                0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,
+                0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,
+                0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,
+                0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,
+                0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,
+                0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,
+                0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0
+            ),
+            array(
+                0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,
+                0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,
+                0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,
+                0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,
+                0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,
+                0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,
+                0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,
+                0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,
+                0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,
+                0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,
+                0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,
+                0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,
+                0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,
+                0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,
+                0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,
+                0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,
+                0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,
+                0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,
+                0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,
+                0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,
+                0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,
+                0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,
+                0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,
+                0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,
+                0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,
+                0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,
+                0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,
+                0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,
+                0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,
+                0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,
+                0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,
+                0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,
+                0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,
+                0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,
+                0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,
+                0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,
+                0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,
+                0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,
+                0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,
+                0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,
+                0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,
+                0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,
+                0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,
+                0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,
+                0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,
+                0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,
+                0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,
+                0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,
+                0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,
+                0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,
+                0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,
+                0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,
+                0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,
+                0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,
+                0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,
+                0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,
+                0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,
+                0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,
+                0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,
+                0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,
+                0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,
+                0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,
+                0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,
+                0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6
+            )
+        );
+    }
+    
+}
+
+?>
diff --git a/3rdparty/MDB2.php b/3rdparty/MDB2.php
new file mode 100644
index 00000000000..aa7ec6ba093
--- /dev/null
+++ b/3rdparty/MDB2.php
@@ -0,0 +1,4316 @@
+<?php
+// vim: set et ts=4 sw=4 fdm=marker:
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: MDB2.php,v 1.335 2008/11/29 14:57:01 afz Exp $
+//
+
+/**
+ * @package     MDB2
+ * @category    Database
+ * @author      Lukas Smith <smith@pooteeweet.org>
+ */
+
+require_once('PEAR.php');
+
+// {{{ Error constants
+
+/**
+ * The method mapErrorCode in each MDB2_dbtype implementation maps
+ * native error codes to one of these.
+ *
+ * If you add an error code here, make sure you also add a textual
+ * version of it in MDB2::errorMessage().
+ */
+
+define('MDB2_OK',                      true);
+define('MDB2_ERROR',                     -1);
+define('MDB2_ERROR_SYNTAX',              -2);
+define('MDB2_ERROR_CONSTRAINT',          -3);
+define('MDB2_ERROR_NOT_FOUND',           -4);
+define('MDB2_ERROR_ALREADY_EXISTS',      -5);
+define('MDB2_ERROR_UNSUPPORTED',         -6);
+define('MDB2_ERROR_MISMATCH',            -7);
+define('MDB2_ERROR_INVALID',             -8);
+define('MDB2_ERROR_NOT_CAPABLE',         -9);
+define('MDB2_ERROR_TRUNCATED',          -10);
+define('MDB2_ERROR_INVALID_NUMBER',     -11);
+define('MDB2_ERROR_INVALID_DATE',       -12);
+define('MDB2_ERROR_DIVZERO',            -13);
+define('MDB2_ERROR_NODBSELECTED',       -14);
+define('MDB2_ERROR_CANNOT_CREATE',      -15);
+define('MDB2_ERROR_CANNOT_DELETE',      -16);
+define('MDB2_ERROR_CANNOT_DROP',        -17);
+define('MDB2_ERROR_NOSUCHTABLE',        -18);
+define('MDB2_ERROR_NOSUCHFIELD',        -19);
+define('MDB2_ERROR_NEED_MORE_DATA',     -20);
+define('MDB2_ERROR_NOT_LOCKED',         -21);
+define('MDB2_ERROR_VALUE_COUNT_ON_ROW', -22);
+define('MDB2_ERROR_INVALID_DSN',        -23);
+define('MDB2_ERROR_CONNECT_FAILED',     -24);
+define('MDB2_ERROR_EXTENSION_NOT_FOUND',-25);
+define('MDB2_ERROR_NOSUCHDB',           -26);
+define('MDB2_ERROR_ACCESS_VIOLATION',   -27);
+define('MDB2_ERROR_CANNOT_REPLACE',     -28);
+define('MDB2_ERROR_CONSTRAINT_NOT_NULL',-29);
+define('MDB2_ERROR_DEADLOCK',           -30);
+define('MDB2_ERROR_CANNOT_ALTER',       -31);
+define('MDB2_ERROR_MANAGER',            -32);
+define('MDB2_ERROR_MANAGER_PARSE',      -33);
+define('MDB2_ERROR_LOADMODULE',         -34);
+define('MDB2_ERROR_INSUFFICIENT_DATA',  -35);
+define('MDB2_ERROR_NO_PERMISSION',      -36);
+define('MDB2_ERROR_DISCONNECT_FAILED',  -37);
+
+// }}}
+// {{{ Verbose constants
+/**
+ * These are just helper constants to more verbosely express parameters to prepare()
+ */
+
+define('MDB2_PREPARE_MANIP', false);
+define('MDB2_PREPARE_RESULT', null);
+
+// }}}
+// {{{ Fetchmode constants
+
+/**
+ * This is a special constant that tells MDB2 the user hasn't specified
+ * any particular get mode, so the default should be used.
+ */
+define('MDB2_FETCHMODE_DEFAULT', 0);
+
+/**
+ * Column data indexed by numbers, ordered from 0 and up
+ */
+define('MDB2_FETCHMODE_ORDERED', 1);
+
+/**
+ * Column data indexed by column names
+ */
+define('MDB2_FETCHMODE_ASSOC', 2);
+
+/**
+ * Column data as object properties
+ */
+define('MDB2_FETCHMODE_OBJECT', 3);
+
+/**
+ * For multi-dimensional results: normally the first level of arrays
+ * is the row number, and the second level indexed by column number or name.
+ * MDB2_FETCHMODE_FLIPPED switches this order, so the first level of arrays
+ * is the column name, and the second level the row number.
+ */
+define('MDB2_FETCHMODE_FLIPPED', 4);
+
+// }}}
+// {{{ Portability mode constants
+
+/**
+ * Portability: turn off all portability features.
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_NONE', 0);
+
+/**
+ * Portability: convert names of tables and fields to case defined in the
+ * "field_case" option when using the query*(), fetch*() and tableInfo() methods.
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_FIX_CASE', 1);
+
+/**
+ * Portability: right trim the data output by query*() and fetch*().
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_RTRIM', 2);
+
+/**
+ * Portability: force reporting the number of rows deleted.
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_DELETE_COUNT', 4);
+
+/**
+ * Portability: not needed in MDB2 (just left here for compatibility to DB)
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_NUMROWS', 8);
+
+/**
+ * Portability: makes certain error messages in certain drivers compatible
+ * with those from other DBMS's.
+ *
+ * + mysql, mysqli:  change unique/primary key constraints
+ *   MDB2_ERROR_ALREADY_EXISTS -> MDB2_ERROR_CONSTRAINT
+ *
+ * + odbc(access):  MS's ODBC driver reports 'no such field' as code
+ *   07001, which means 'too few parameters.'  When this option is on
+ *   that code gets mapped to MDB2_ERROR_NOSUCHFIELD.
+ *
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_ERRORS', 16);
+
+/**
+ * Portability: convert empty values to null strings in data output by
+ * query*() and fetch*().
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_EMPTY_TO_NULL', 32);
+
+/**
+ * Portability: removes database/table qualifiers from associative indexes
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES', 64);
+
+/**
+ * Portability: turn on all portability features.
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_ALL', 127);
+
+// }}}
+// {{{ Globals for class instance tracking
+
+/**
+ * These are global variables that are used to track the various class instances
+ */
+
+$GLOBALS['_MDB2_databases'] = array();
+$GLOBALS['_MDB2_dsninfo_default'] = array(
+    'phptype'  => false,
+    'dbsyntax' => false,
+    'username' => false,
+    'password' => false,
+    'protocol' => false,
+    'hostspec' => false,
+    'port'     => false,
+    'socket'   => false,
+    'database' => false,
+    'mode'     => false,
+);
+
+// }}}
+// {{{ class MDB2
+
+/**
+ * The main 'MDB2' class is simply a container class with some static
+ * methods for creating DB objects as well as some utility functions
+ * common to all parts of DB.
+ *
+ * The object model of MDB2 is as follows (indentation means inheritance):
+ *
+ * MDB2          The main MDB2 class.  This is simply a utility class
+ *              with some 'static' methods for creating MDB2 objects as
+ *              well as common utility functions for other MDB2 classes.
+ *
+ * MDB2_Driver_Common   The base for each MDB2 implementation.  Provides default
+ * |            implementations (in OO lingo virtual methods) for
+ * |            the actual DB implementations as well as a bunch of
+ * |            query utility functions.
+ * |
+ * +-MDB2_Driver_mysql  The MDB2 implementation for MySQL. Inherits MDB2_Driver_Common.
+ *              When calling MDB2::factory or MDB2::connect for MySQL
+ *              connections, the object returned is an instance of this
+ *              class.
+ * +-MDB2_Driver_pgsql  The MDB2 implementation for PostGreSQL. Inherits MDB2_Driver_Common.
+ *              When calling MDB2::factory or MDB2::connect for PostGreSQL
+ *              connections, the object returned is an instance of this
+ *              class.
+ *
+ * @package     MDB2
+ * @category    Database
+ * @author      Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2
+{
+    // {{{ function setOptions(&$db, $options)
+
+    /**
+     * set option array   in an exiting database object
+     *
+     * @param   MDB2_Driver_Common  MDB2 object
+     * @param   array   An associative array of option names and their values.
+     *
+     * @return mixed   MDB2_OK or a PEAR Error object
+     *
+     * @access  public
+     */
+    static function setOptions(&$db, $options)
+    {
+        if (is_array($options)) {
+            foreach ($options as $option => $value) {
+                $test = $db->setOption($option, $value);
+                if (PEAR::isError($test)) {
+                    return $test;
+                }
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function classExists($classname)
+
+    /**
+     * Checks if a class exists without triggering __autoload
+     *
+     * @param   string  classname
+     *
+     * @return  bool    true success and false on error
+     * @static
+     * @access  public
+     */
+    static function classExists($classname)
+    {
+        if (version_compare(phpversion(), "5.0", ">=")) {
+            return class_exists($classname, false);
+        }
+        return class_exists($classname);
+    }
+
+    // }}}
+    // {{{ function loadClass($class_name, $debug)
+
+    /**
+     * Loads a PEAR class.
+     *
+     * @param   string  classname to load
+     * @param   bool    if errors should be suppressed
+     *
+     * @return  mixed   true success or PEAR_Error on failure
+     *
+     * @access  public
+     */
+    static function loadClass($class_name, $debug)
+    {
+        if (!MDB2::classExists($class_name)) {
+            $file_name = str_replace('_', DIRECTORY_SEPARATOR, $class_name).'.php';
+            if ($debug) {
+                $include = include_once($file_name);
+            } else {
+                $include = include_once($file_name);
+            }
+            if (!$include) {
+                if (!MDB2::fileExists($file_name)) {
+                    $msg = "unable to find package '$class_name' file '$file_name'";
+                } else {
+                    $msg = "unable to load class '$class_name' from file '$file_name'";
+                }
+                $err =MDB2::raiseErrorStatic(MDB2_ERROR_NOT_FOUND, null, null, $msg);
+                return $err;
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function &factory($dsn, $options = false)
+
+    /**
+     * Create a new MDB2 object for the specified database type
+     *
+     * IMPORTANT: In order for MDB2 to work properly it is necessary that
+     * you make sure that you work with a reference of the original
+     * object instead of a copy (this is a PHP4 quirk).
+     *
+     * For example:
+     *     $db =& MDB2::factory($dsn);
+     *          ^^
+     * And not:
+     *     $db = MDB2::factory($dsn);
+     *
+     * @param   mixed   'data source name', see the MDB2::parseDSN
+     *                      method for a description of the dsn format.
+     *                      Can also be specified as an array of the
+     *                      format returned by MDB2::parseDSN.
+     * @param   array   An associative array of option names and
+     *                            their values.
+     *
+     * @return  mixed   a newly created MDB2 object, or false on error
+     *
+     * @access  public
+     */
+    static function factory($dsn, $options = false)
+    {
+        $dsninfo = MDB2::parseDSN($dsn);
+        if (empty($dsninfo['phptype'])) {
+            $err =MDB2::raiseErrorStatic(MDB2_ERROR_NOT_FOUND,
+                null, null, 'no RDBMS driver specified');
+            return $err;
+        }
+        $class_name = 'MDB2_Driver_'.$dsninfo['phptype'];
+
+        $debug = (!empty($options['debug']));
+        $err = MDB2::loadClass($class_name, $debug);
+        if (PEAR::isError($err)) {
+            return $err;
+        }
+
+        $db =new $class_name();
+        $db->setDSN($dsninfo);
+        $err = MDB2::setOptions($db, $options);
+        if (PEAR::isError($err)) {
+            return $err;
+        }
+
+        return $db;
+    }
+
+    // }}}
+    // {{{ function &connect($dsn, $options = false)
+
+    /**
+     * Create a new MDB2_Driver_* connection object and connect to the specified
+     * database
+     *
+     * IMPORTANT: In order for MDB2 to work properly it is necessary that
+     * you make sure that you work with a reference of the original
+     * object instead of a copy (this is a PHP4 quirk).
+     *
+     * For example:
+     *     $db =& MDB2::connect($dsn);
+     *          ^^
+     * And not:
+     *     $db = MDB2::connect($dsn);
+     *          ^^
+     *
+     * @param mixed $dsn     'data source name', see the MDB2::parseDSN
+     *                       method for a description of the dsn format.
+     *                       Can also be specified as an array of the
+     *                       format returned by MDB2::parseDSN.
+     * @param array $options An associative array of option names and
+     *                       their values.
+     *
+     * @return mixed a newly created MDB2 connection object, or a MDB2
+     *               error object on error
+     *
+     * @access  public
+     * @see     MDB2::parseDSN
+     */
+    function &connect($dsn, $options = false)
+    {
+        $db =MDB2::factory($dsn, $options);
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $err = $db->connect();
+        if (PEAR::isError($err)) {
+            $dsn = $db->getDSN('string', 'xxx');
+            $db->disconnect();
+            $err->addUserInfo($dsn);
+            return $err;
+        }
+
+        return $db;
+    }
+
+    // }}}
+    // {{{ function &singleton($dsn = null, $options = false)
+
+    /**
+     * Returns a MDB2 connection with the requested DSN.
+     * A new MDB2 connection object is only created if no object with the
+     * requested DSN exists yet.
+     *
+     * IMPORTANT: In order for MDB2 to work properly it is necessary that
+     * you make sure that you work with a reference of the original
+     * object instead of a copy (this is a PHP4 quirk).
+     *
+     * For example:
+     *     $db =& MDB2::singleton($dsn);
+     *          ^^
+     * And not:
+     *     $db = MDB2::singleton($dsn);
+     *          ^^
+     *
+     * @param   mixed   'data source name', see the MDB2::parseDSN
+     *                            method for a description of the dsn format.
+     *                            Can also be specified as an array of the
+     *                            format returned by MDB2::parseDSN.
+     * @param   array   An associative array of option names and
+     *                            their values.
+     *
+     * @return  mixed   a newly created MDB2 connection object, or a MDB2
+     *                  error object on error
+     *
+     * @access  public
+     * @see     MDB2::parseDSN
+     */
+    function &singleton($dsn = null, $options = false)
+    {
+        if ($dsn) {
+            $dsninfo = MDB2::parseDSN($dsn);
+            $dsninfo = array_merge($GLOBALS['_MDB2_dsninfo_default'], $dsninfo);
+            $keys = array_keys($GLOBALS['_MDB2_databases']);
+            for ($i=0, $j=count($keys); $i<$j; ++$i) {
+                if (isset($GLOBALS['_MDB2_databases'][$keys[$i]])) {
+                    $tmp_dsn = $GLOBALS['_MDB2_databases'][$keys[$i]]->getDSN('array');
+                    if (count(array_diff_assoc($tmp_dsn, $dsninfo)) == 0) {
+                        MDB2::setOptions($GLOBALS['_MDB2_databases'][$keys[$i]], $options);
+                        return $GLOBALS['_MDB2_databases'][$keys[$i]];
+                    }
+                }
+            }
+        } elseif (is_array($GLOBALS['_MDB2_databases']) && reset($GLOBALS['_MDB2_databases'])) {
+            $db =$GLOBALS['_MDB2_databases'][key($GLOBALS['_MDB2_databases'])];
+            return $db;
+        }
+        $db =MDB2::factory($dsn, $options);
+        return $db;
+    }
+
+    // }}}
+    // {{{ function areEquals()
+
+    /**
+     * It looks like there's a memory leak in array_diff() in PHP 5.1.x,
+     * so use this method instead.
+     * @see http://pear.php.net/bugs/bug.php?id=11790
+     *
+     * @param array $arr1
+     * @param array $arr2
+     * @return boolean
+     */
+    static function areEquals($arr1, $arr2)
+    {
+        if (count($arr1) != count($arr2)) {
+            return false;
+        }
+        foreach (array_keys($arr1) as $k) {
+            if (!array_key_exists($k, $arr2) || $arr1[$k] != $arr2[$k]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ function loadFile($file)
+
+    /**
+     * load a file (like 'Date')
+     *
+     * @param   string  name of the file in the MDB2 directory (without '.php')
+     *
+     * @return  string  name of the file that was included
+     *
+     * @access  public
+     */
+    function loadFile($file)
+    {
+        $file_name = 'MDB2'.DIRECTORY_SEPARATOR.$file.'.php';
+        if (!MDB2::fileExists($file_name)) {
+            return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                'unable to find: '.$file_name);
+        }
+        if (!include_once($file_name)) {
+            return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                'unable to load driver class: '.$file_name);
+        }
+        return $file_name;
+    }
+
+    // }}}
+    // {{{ function apiVersion()
+
+    /**
+     * Return the MDB2 API version
+     *
+     * @return  string  the MDB2 API version number
+     *
+     * @access  public
+     */
+    function apiVersion()
+    {
+        return '2.5.0b2';
+    }
+
+    // }}}
+    // {{{ function &raiseError($code = null, $mode = null, $options = null, $userinfo = null)
+
+    /**
+     * This method is used to communicate an error and invoke error
+     * callbacks etc.  Basically a wrapper for PEAR::raiseError
+     * without the message string.
+     *
+     * @param   mixed  int error code
+     *
+     * @param   int    error mode, see PEAR_Error docs
+     *
+     * @param   mixed  If error mode is PEAR_ERROR_TRIGGER, this is the
+     *                 error level (E_USER_NOTICE etc).  If error mode is
+     *                 PEAR_ERROR_CALLBACK, this is the callback function,
+     *                 either as a function name, or as an array of an
+     *                 object and method name.  For other error modes this
+     *                 parameter is ignored.
+     *
+     * @param   string Extra debug information.  Defaults to the last
+     *                 query and native error code.
+     *
+     * @return PEAR_Error instance of a PEAR Error object
+     *
+     * @access  private
+     * @see     PEAR_Error
+     */
+    function raiseError($code = null,
+                         $mode = null,
+                         $options = null,
+                         $userinfo = null,
+                         $dummy1 = null,
+                         $dummy2 = null,
+                         $dummy3 = false)
+    {
+        $err =PEAR::raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true);
+        return $err;
+    }
+    static function raiseErrorStatic($code = null,
+                         $mode = null,
+                         $options = null,
+                         $userinfo = null,
+                         $dummy1 = null,
+                         $dummy2 = null,
+                         $dummy3 = false)
+    {
+	    $pear=new PEAR();
+        $err =$pear->raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true);
+        return $err;
+    }
+
+    // }}}
+    // {{{ function isError($data, $code = null)
+
+    /**
+     * Tell whether a value is a MDB2 error.
+     *
+     * @param   mixed   the value to test
+     * @param   int     if is an error object, return true
+     *                        only if $code is a string and
+     *                        $db->getMessage() == $code or
+     *                        $code is an integer and $db->getCode() == $code
+     *
+     * @return  bool    true if parameter is an error
+     *
+     * @access  public
+     */
+    static function isError($data, $code = null)
+    {
+        if ($data instanceof MDB2_Error) {
+            if (is_null($code)) {
+                return true;
+            } elseif (is_string($code)) {
+                return $data->getMessage() === $code;
+            } else {
+                $code = (array)$code;
+                return in_array($data->getCode(), $code);
+            }
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ function isConnection($value)
+
+    /**
+     * Tell whether a value is a MDB2 connection
+     *
+     * @param   mixed   value to test
+     *
+     * @return  bool    whether $value is a MDB2 connection
+     *
+     * @access  public
+     */
+    static function isConnection($value)
+    {
+        return ($value instanceof MDB2_Driver_Common);
+    }
+
+    // }}}
+    // {{{ function isResult($value)
+
+    /**
+     * Tell whether a value is a MDB2 result
+     *
+     * @param   mixed   value to test
+     *
+     * @return  bool    whether $value is a MDB2 result
+     *
+     * @access  public
+     */
+    static function isResult($value)
+    {
+        return $value instanceof MDB2_Result;
+    }
+
+    // }}}
+    // {{{ function isResultCommon($value)
+
+    /**
+     * Tell whether a value is a MDB2 result implementing the common interface
+     *
+     * @param   mixed   value to test
+     *
+     * @return  bool    whether $value is a MDB2 result implementing the common interface
+     *
+     * @access  public
+     */
+    static function isResultCommon($value)
+    {
+        return ($value instanceof MDB2_Result_Common);
+    }
+
+    // }}}
+    // {{{ function isStatement($value)
+
+    /**
+     * Tell whether a value is a MDB2 statement interface
+     *
+     * @param   mixed   value to test
+     *
+     * @return  bool    whether $value is a MDB2 statement interface
+     *
+     * @access  public
+     */
+    static function isStatement($value)
+    {
+        return $value instanceof MDB2_Statement_Common;
+    }
+
+    // }}}
+    // {{{ function errorMessage($value = null)
+
+    /**
+     * Return a textual error message for a MDB2 error code
+     *
+     * @param   int|array   integer error code,
+                                null to get the current error code-message map,
+                                or an array with a new error code-message map
+     *
+     * @return  string  error message, or false if the error code was
+     *                  not recognized
+     *
+     * @access  public
+     */
+    static function errorMessage($value = null)
+    {
+        static $errorMessages;
+
+        if (is_array($value)) {
+            $errorMessages = $value;
+            return MDB2_OK;
+        }
+
+        if (!isset($errorMessages)) {
+            $errorMessages = array(
+                MDB2_OK                       => 'no error',
+                MDB2_ERROR                    => 'unknown error',
+                MDB2_ERROR_ALREADY_EXISTS     => 'already exists',
+                MDB2_ERROR_CANNOT_CREATE      => 'can not create',
+                MDB2_ERROR_CANNOT_ALTER       => 'can not alter',
+                MDB2_ERROR_CANNOT_REPLACE     => 'can not replace',
+                MDB2_ERROR_CANNOT_DELETE      => 'can not delete',
+                MDB2_ERROR_CANNOT_DROP        => 'can not drop',
+                MDB2_ERROR_CONSTRAINT         => 'constraint violation',
+                MDB2_ERROR_CONSTRAINT_NOT_NULL=> 'null value violates not-null constraint',
+                MDB2_ERROR_DIVZERO            => 'division by zero',
+                MDB2_ERROR_INVALID            => 'invalid',
+                MDB2_ERROR_INVALID_DATE       => 'invalid date or time',
+                MDB2_ERROR_INVALID_NUMBER     => 'invalid number',
+                MDB2_ERROR_MISMATCH           => 'mismatch',
+                MDB2_ERROR_NODBSELECTED       => 'no database selected',
+                MDB2_ERROR_NOSUCHFIELD        => 'no such field',
+                MDB2_ERROR_NOSUCHTABLE        => 'no such table',
+                MDB2_ERROR_NOT_CAPABLE        => 'MDB2 backend not capable',
+                MDB2_ERROR_NOT_FOUND          => 'not found',
+                MDB2_ERROR_NOT_LOCKED         => 'not locked',
+                MDB2_ERROR_SYNTAX             => 'syntax error',
+                MDB2_ERROR_UNSUPPORTED        => 'not supported',
+                MDB2_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
+                MDB2_ERROR_INVALID_DSN        => 'invalid DSN',
+                MDB2_ERROR_CONNECT_FAILED     => 'connect failed',
+                MDB2_ERROR_NEED_MORE_DATA     => 'insufficient data supplied',
+                MDB2_ERROR_EXTENSION_NOT_FOUND=> 'extension not found',
+                MDB2_ERROR_NOSUCHDB           => 'no such database',
+                MDB2_ERROR_ACCESS_VIOLATION   => 'insufficient permissions',
+                MDB2_ERROR_LOADMODULE         => 'error while including on demand module',
+                MDB2_ERROR_TRUNCATED          => 'truncated',
+                MDB2_ERROR_DEADLOCK           => 'deadlock detected',
+                MDB2_ERROR_NO_PERMISSION      => 'no permission',
+                MDB2_ERROR_DISCONNECT_FAILED  => 'disconnect failed',
+            );
+        }
+
+        if (is_null($value)) {
+            return $errorMessages;
+        }
+
+        if (PEAR::isError($value)) {
+            $value = $value->getCode();
+        }
+
+        return isset($errorMessages[$value]) ?
+           $errorMessages[$value] : $errorMessages[MDB2_ERROR];
+    }
+
+    // }}}
+    // {{{ function parseDSN($dsn)
+
+    /**
+     * Parse a data source name.
+     *
+     * Additional keys can be added by appending a URI query string to the
+     * end of the DSN.
+     *
+     * The format of the supplied DSN is in its fullest form:
+     * <code>
+     *  phptype(dbsyntax)://username:password@protocol+hostspec/database?option=8&another=true
+     * </code>
+     *
+     * Most variations are allowed:
+     * <code>
+     *  phptype://username:password@protocol+hostspec:110//usr/db_file.db?mode=0644
+     *  phptype://username:password@hostspec/database_name
+     *  phptype://username:password@hostspec
+     *  phptype://username@hostspec
+     *  phptype://hostspec/database
+     *  phptype://hostspec
+     *  phptype(dbsyntax)
+     *  phptype
+     * </code>
+     *
+     * @param   string  Data Source Name to be parsed
+     *
+     * @return  array   an associative array with the following keys:
+     *  + phptype:  Database backend used in PHP (mysql, odbc etc.)
+     *  + dbsyntax: Database used with regards to SQL syntax etc.
+     *  + protocol: Communication protocol to use (tcp, unix etc.)
+     *  + hostspec: Host specification (hostname[:port])
+     *  + database: Database to use on the DBMS server
+     *  + username: User name for login
+     *  + password: Password for login
+     *
+     * @access  public
+     * @author  Tomas V.V.Cox <cox@idecnet.com>
+     */
+    static function parseDSN($dsn)
+    {
+        $parsed = $GLOBALS['_MDB2_dsninfo_default'];
+
+        if (is_array($dsn)) {
+            $dsn = array_merge($parsed, $dsn);
+            if (!$dsn['dbsyntax']) {
+                $dsn['dbsyntax'] = $dsn['phptype'];
+            }
+            return $dsn;
+        }
+
+        // Find phptype and dbsyntax
+        if (($pos = strpos($dsn, '://')) !== false) {
+            $str = substr($dsn, 0, $pos);
+            $dsn = substr($dsn, $pos + 3);
+        } else {
+            $str = $dsn;
+            $dsn = null;
+        }
+
+        // Get phptype and dbsyntax
+        // $str => phptype(dbsyntax)
+        if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
+            $parsed['phptype']  = $arr[1];
+            $parsed['dbsyntax'] = !$arr[2] ? $arr[1] : $arr[2];
+        } else {
+            $parsed['phptype']  = $str;
+            $parsed['dbsyntax'] = $str;
+        }
+
+        if (!count($dsn)) {
+            return $parsed;
+        }
+
+        // Get (if found): username and password
+        // $dsn => username:password@protocol+hostspec/database
+        if (($at = strrpos($dsn,'@')) !== false) {
+            $str = substr($dsn, 0, $at);
+            $dsn = substr($dsn, $at + 1);
+            if (($pos = strpos($str, ':')) !== false) {
+                $parsed['username'] = rawurldecode(substr($str, 0, $pos));
+                $parsed['password'] = rawurldecode(substr($str, $pos + 1));
+            } else {
+                $parsed['username'] = rawurldecode($str);
+            }
+        }
+
+        // Find protocol and hostspec
+
+        // $dsn => proto(proto_opts)/database
+        if (preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) {
+            $proto       = $match[1];
+            $proto_opts  = $match[2] ? $match[2] : false;
+            $dsn         = $match[3];
+
+        // $dsn => protocol+hostspec/database (old format)
+        } else {
+            if (strpos($dsn, '+') !== false) {
+                list($proto, $dsn) = explode('+', $dsn, 2);
+            }
+            if (   strpos($dsn, '//') === 0
+                && strpos($dsn, '/', 2) !== false
+                && $parsed['phptype'] == 'oci8'
+            ) {
+                //oracle's "Easy Connect" syntax:
+                //"username/password@[//]host[:port][/service_name]"
+                //e.g. "scott/tiger@//mymachine:1521/oracle"
+                $proto_opts = $dsn;
+                $dsn = substr($proto_opts, strrpos($proto_opts, '/') + 1);
+            } elseif (strpos($dsn, '/') !== false) {
+                list($proto_opts, $dsn) = explode('/', $dsn, 2);
+            } else {
+                $proto_opts = $dsn;
+                $dsn = null;
+            }
+        }
+
+        // process the different protocol options
+        $parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
+        $proto_opts = rawurldecode($proto_opts);
+        if (strpos($proto_opts, ':') !== false) {
+            list($proto_opts, $parsed['port']) = explode(':', $proto_opts);
+        }
+        if ($parsed['protocol'] == 'tcp') {
+            $parsed['hostspec'] = $proto_opts;
+        } elseif ($parsed['protocol'] == 'unix') {
+            $parsed['socket'] = $proto_opts;
+        }
+
+        // Get dabase if any
+        // $dsn => database
+        if ($dsn) {
+            // /database
+            if (($pos = strpos($dsn, '?')) === false) {
+                $parsed['database'] = $dsn;
+            // /database?param1=value1&param2=value2
+            } else {
+                $parsed['database'] = substr($dsn, 0, $pos);
+                $dsn = substr($dsn, $pos + 1);
+                if (strpos($dsn, '&') !== false) {
+                    $opts = explode('&', $dsn);
+                } else { // database?param1=value1
+                    $opts = array($dsn);
+                }
+                foreach ($opts as $opt) {
+                    list($key, $value) = explode('=', $opt);
+                    if (!isset($parsed[$key])) {
+                        // don't allow params overwrite
+                        $parsed[$key] = rawurldecode($value);
+                    }
+                }
+            }
+        }
+
+        return $parsed;
+    }
+
+    // }}}
+    // {{{ function fileExists($file)
+
+    /**
+     * Checks if a file exists in the include path
+     *
+     * @param   string  filename
+     *
+     * @return  bool    true success and false on error
+     *
+     * @access  public
+     */
+    static function fileExists($file)
+    {
+        // safe_mode does notwork with is_readable()
+        if (!@ini_get('safe_mode')) {
+             $dirs = explode(PATH_SEPARATOR, ini_get('include_path'));
+             array_unshift($dirs,OC::$SERVERROOT);
+             array_unshift($dirs,OC::$SERVERROOT. DIRECTORY_SEPARATOR .'inc');
+//              print_r($dirs);die();
+             foreach ($dirs as $dir) {
+                 if (is_readable($dir . DIRECTORY_SEPARATOR . $file)) {
+                     return true;
+                 }
+            }
+        } else {
+            $fp = @fopen($file, 'r', true);
+            if (is_resource($fp)) {
+                @fclose($fp);
+                return true;
+            }
+        }
+        return false;
+    }
+    // }}}
+}
+
+// }}}
+// {{{ class MDB2_Error extends PEAR_Error
+
+/**
+ * MDB2_Error implements a class for reporting portable database error
+ * messages.
+ *
+ * @package     MDB2
+ * @category    Database
+ * @author Stig Bakken <ssb@fast.no>
+ */
+class MDB2_Error extends PEAR_Error
+{
+    // {{{ constructor: function MDB2_Error($code = MDB2_ERROR, $mode = PEAR_ERROR_RETURN, $level = E_USER_NOTICE, $debuginfo = null)
+
+    /**
+     * MDB2_Error constructor.
+     *
+     * @param   mixed   MDB2 error code, or string with error message.
+     * @param   int     what 'error mode' to operate in
+     * @param   int     what error level to use for $mode raPEAR_ERROR_TRIGGER
+     * @param   mixed   additional debug info, such as the last query
+     */
+    function MDB2_Error($code = MDB2_ERROR, $mode = PEAR_ERROR_RETURN,
+              $level = E_USER_NOTICE, $debuginfo = null, $dummy = null)
+    {
+        if (is_null($code)) {
+            $code = MDB2_ERROR;
+        }
+        $this->PEAR_Error('MDB2 Error: '.MDB2::errorMessage($code), $code,
+            $mode, $level, $debuginfo);
+    }
+
+    // }}}
+}
+
+// }}}
+// {{{ class MDB2_Driver_Common extends PEAR
+
+/**
+ * MDB2_Driver_Common: Base class that is extended by each MDB2 driver
+ *
+ * @package     MDB2
+ * @category    Database
+ * @author      Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Common extends PEAR
+{
+    // {{{ Variables (Properties)
+
+    /**
+     * index of the MDB2 object within the $GLOBALS['_MDB2_databases'] array
+     * @var     int
+     * @access  public
+     */
+    var $db_index = 0;
+
+    /**
+     * DSN used for the next query
+     * @var     array
+     * @access  protected
+     */
+    var $dsn = array();
+
+    /**
+     * DSN that was used to create the current connection
+     * @var     array
+     * @access  protected
+     */
+    var $connected_dsn = array();
+
+    /**
+     * connection resource
+     * @var     mixed
+     * @access  protected
+     */
+    var $connection = 0;
+
+    /**
+     * if the current opened connection is a persistent connection
+     * @var     bool
+     * @access  protected
+     */
+    var $opened_persistent;
+
+    /**
+     * the name of the database for the next query
+     * @var     string
+     * @access  protected
+     */
+    var $database_name = '';
+
+    /**
+     * the name of the database currently selected
+     * @var     string
+     * @access  protected
+     */
+    var $connected_database_name = '';
+
+    /**
+     * server version information
+     * @var     string
+     * @access  protected
+     */
+    var $connected_server_info = '';
+
+    /**
+     * list of all supported features of the given driver
+     * @var     array
+     * @access  public
+     */
+    var $supported = array(
+        'sequences' => false,
+        'indexes' => false,
+        'affected_rows' => false,
+        'summary_functions' => false,
+        'order_by_text' => false,
+        'transactions' => false,
+        'savepoints' => false,
+        'current_id' => false,
+        'limit_queries' => false,
+        'LOBs' => false,
+        'replace' => false,
+        'sub_selects' => false,
+        'triggers' => false,
+        'auto_increment' => false,
+        'primary_key' => false,
+        'result_introspection' => false,
+        'prepared_statements' => false,
+        'identifier_quoting' => false,
+        'pattern_escaping' => false,
+        'new_link' => false,
+    );
+
+    /**
+     * Array of supported options that can be passed to the MDB2 instance.
+     * 
+     * The options can be set during object creation, using
+     * MDB2::connect(), MDB2::factory() or MDB2::singleton(). The options can 
+     * also be set after the object is created, using MDB2::setOptions() or 
+     * MDB2_Driver_Common::setOption().
+     * The list of available option includes:
+     * <ul>
+     *  <li>$options['ssl'] -> boolean: determines if ssl should be used for connections</li>
+     *  <li>$options['field_case'] -> CASE_LOWER|CASE_UPPER: determines what case to force on field/table names</li>
+     *  <li>$options['disable_query'] -> boolean: determines if queries should be executed</li>
+     *  <li>$options['result_class'] -> string: class used for result sets</li>
+     *  <li>$options['buffered_result_class'] -> string: class used for buffered result sets</li>
+     *  <li>$options['result_wrap_class'] -> string: class used to wrap result sets into</li>
+     *  <li>$options['result_buffering'] -> boolean should results be buffered or not?</li>
+     *  <li>$options['fetch_class'] -> string: class to use when fetch mode object is used</li>
+     *  <li>$options['persistent'] -> boolean: persistent connection?</li>
+     *  <li>$options['debug'] -> integer: numeric debug level</li>
+     *  <li>$options['debug_handler'] -> string: function/method that captures debug messages</li>
+     *  <li>$options['debug_expanded_output'] -> bool: BC option to determine if more context information should be send to the debug handler</li>
+     *  <li>$options['default_text_field_length'] -> integer: default text field length to use</li>
+     *  <li>$options['lob_buffer_length'] -> integer: LOB buffer length</li>
+     *  <li>$options['log_line_break'] -> string: line-break format</li>
+     *  <li>$options['idxname_format'] -> string: pattern for index name</li>
+     *  <li>$options['seqname_format'] -> string: pattern for sequence name</li>
+     *  <li>$options['savepoint_format'] -> string: pattern for auto generated savepoint names</li>
+     *  <li>$options['statement_format'] -> string: pattern for prepared statement names</li>
+     *  <li>$options['seqcol_name'] -> string: sequence column name</li>
+     *  <li>$options['quote_identifier'] -> boolean: if identifier quoting should be done when check_option is used</li>
+     *  <li>$options['use_transactions'] -> boolean: if transaction use should be enabled</li>
+     *  <li>$options['decimal_places'] -> integer: number of decimal places to handle</li>
+     *  <li>$options['portability'] -> integer: portability constant</li>
+     *  <li>$options['modules'] -> array: short to long module name mapping for __call()</li>
+     *  <li>$options['emulate_prepared'] -> boolean: force prepared statements to be emulated</li>
+     *  <li>$options['datatype_map'] -> array: map user defined datatypes to other primitive datatypes</li>
+     *  <li>$options['datatype_map_callback'] -> array: callback function/method that should be called</li>
+     *  <li>$options['bindname_format'] -> string: regular expression pattern for named parameters</li>
+     *  <li>$options['multi_query'] -> boolean: determines if queries returning multiple result sets should be executed</li>
+     *  <li>$options['max_identifiers_length'] -> integer: max identifier length</li>
+     *  <li>$options['default_fk_action_onupdate'] -> string: default FOREIGN KEY ON UPDATE action ['RESTRICT'|'NO ACTION'|'SET DEFAULT'|'SET NULL'|'CASCADE']</li>
+     *  <li>$options['default_fk_action_ondelete'] -> string: default FOREIGN KEY ON DELETE action ['RESTRICT'|'NO ACTION'|'SET DEFAULT'|'SET NULL'|'CASCADE']</li>
+     * </ul>
+     *
+     * @var     array
+     * @access  public
+     * @see     MDB2::connect()
+     * @see     MDB2::factory()
+     * @see     MDB2::singleton()
+     * @see     MDB2_Driver_Common::setOption()
+     */
+    var $options = array(
+        'ssl' => false,
+        'field_case' => CASE_LOWER,
+        'disable_query' => false,
+        'result_class' => 'MDB2_Result_%s',
+        'buffered_result_class' => 'MDB2_BufferedResult_%s',
+        'result_wrap_class' => false,
+        'result_buffering' => true,
+        'fetch_class' => 'stdClass',
+        'persistent' => false,
+        'debug' => 0,
+        'debug_handler' => 'MDB2_defaultDebugOutput',
+        'debug_expanded_output' => false,
+        'default_text_field_length' => 4096,
+        'lob_buffer_length' => 8192,
+        'log_line_break' => "\n",
+        'idxname_format' => '%s_idx',
+        'seqname_format' => '%s_seq',
+        'savepoint_format' => 'MDB2_SAVEPOINT_%s',
+        'statement_format' => 'MDB2_STATEMENT_%1$s_%2$s',
+        'seqcol_name' => 'sequence',
+        'quote_identifier' => false,
+        'use_transactions' => true,
+        'decimal_places' => 2,
+        'portability' => MDB2_PORTABILITY_ALL,
+        'modules' => array(
+            'ex' => 'Extended',
+            'dt' => 'Datatype',
+            'mg' => 'Manager',
+            'rv' => 'Reverse',
+            'na' => 'Native',
+            'fc' => 'Function',
+        ),
+        'emulate_prepared' => false,
+        'datatype_map' => array(),
+        'datatype_map_callback' => array(),
+        'nativetype_map_callback' => array(),
+        'lob_allow_url_include' => false,
+        'bindname_format' => '(?:\d+)|(?:[a-zA-Z][a-zA-Z0-9_]*)',
+        'max_identifiers_length' => 30,
+        'default_fk_action_onupdate' => 'RESTRICT',
+        'default_fk_action_ondelete' => 'RESTRICT',
+    );
+
+    /**
+     * string array
+     * @var     string
+     * @access  protected
+     */
+    var $string_quoting = array('start' => "'", 'end' => "'", 'escape' => false, 'escape_pattern' => false);
+
+    /**
+     * identifier quoting
+     * @var     array
+     * @access  protected
+     */
+    var $identifier_quoting = array('start' => '"', 'end' => '"', 'escape' => '"');
+
+    /**
+     * sql comments
+     * @var     array
+     * @access  protected
+     */
+    var $sql_comments = array(
+        array('start' => '--', 'end' => "\n", 'escape' => false),
+        array('start' => '/*', 'end' => '*/', 'escape' => false),
+    );
+
+    /**
+     * comparision wildcards
+     * @var     array
+     * @access  protected
+     */
+    var $wildcards = array('%', '_');
+
+    /**
+     * column alias keyword
+     * @var     string
+     * @access  protected
+     */
+    var $as_keyword = ' AS ';
+
+    /**
+     * warnings
+     * @var     array
+     * @access  protected
+     */
+    var $warnings = array();
+
+    /**
+     * string with the debugging information
+     * @var     string
+     * @access  public
+     */
+    var $debug_output = '';
+
+    /**
+     * determine if there is an open transaction
+     * @var     bool
+     * @access  protected
+     */
+    var $in_transaction = false;
+
+    /**
+     * the smart transaction nesting depth
+     * @var     int
+     * @access  protected
+     */
+    var $nested_transaction_counter = null;
+
+    /**
+     * the first error that occured inside a nested transaction
+     * @var     MDB2_Error|bool
+     * @access  protected
+     */
+    var $has_transaction_error = false;
+
+    /**
+     * result offset used in the next query
+     * @var     int
+     * @access  protected
+     */
+    var $offset = 0;
+
+    /**
+     * result limit used in the next query
+     * @var     int
+     * @access  protected
+     */
+    var $limit = 0;
+
+    /**
+     * Database backend used in PHP (mysql, odbc etc.)
+     * @var     string
+     * @access  public
+     */
+    var $phptype;
+
+    /**
+     * Database used with regards to SQL syntax etc.
+     * @var     string
+     * @access  public
+     */
+    var $dbsyntax;
+
+    /**
+     * the last query sent to the driver
+     * @var     string
+     * @access  public
+     */
+    var $last_query;
+
+    /**
+     * the default fetchmode used
+     * @var     int
+     * @access  protected
+     */
+    var $fetchmode = MDB2_FETCHMODE_ORDERED;
+
+    /**
+     * array of module instances
+     * @var     array
+     * @access  protected
+     */
+    var $modules = array();
+
+    /**
+     * determines of the PHP4 destructor emulation has been enabled yet
+     * @var     array
+     * @access  protected
+     */
+    var $destructor_registered = true;
+
+    // }}}
+    // {{{ constructor: function __construct()
+
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        end($GLOBALS['_MDB2_databases']);
+        $db_index = key($GLOBALS['_MDB2_databases']) + 1;
+        $GLOBALS['_MDB2_databases'][$db_index] = &$this;
+        $this->db_index = $db_index;
+    }
+
+
+    // }}}
+    // {{{ destructor: function __destruct()
+
+    /**
+     *  Destructor
+     */
+    function __destruct()
+    {
+        $this->disconnect(false);
+    }
+
+    // }}}
+    // {{{ function free()
+
+    /**
+     * Free the internal references so that the instance can be destroyed
+     *
+     * @return  bool    true on success, false if result is invalid
+     *
+     * @access  public
+     */
+    function free()
+    {
+        unset($GLOBALS['_MDB2_databases'][$this->db_index]);
+        unset($this->db_index);
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function __toString()
+
+    /**
+     * String conversation
+     *
+     * @return  string representation of the object
+     *
+     * @access  public
+     */
+    function __toString()
+    {
+        $info = get_class($this);
+        $info.= ': (phptype = '.$this->phptype.', dbsyntax = '.$this->dbsyntax.')';
+        if ($this->connection) {
+            $info.= ' [connected]';
+        }
+        return $info;
+    }
+
+    // }}}
+    // {{{ function errorInfo($error = null)
+
+    /**
+     * This method is used to collect information about an error
+     *
+     * @param   mixed   error code or resource
+     *
+     * @return  array   with MDB2 errorcode, native error code, native message
+     *
+     * @access  public
+     */
+    function errorInfo($error = null)
+    {
+        return array($error, null, null);
+    }
+
+    // }}}
+    // {{{ function &raiseError($code = null, $mode = null, $options = null, $userinfo = null)
+
+    /**
+     * This method is used to communicate an error and invoke error
+     * callbacks etc.  Basically a wrapper for PEAR::raiseError
+     * without the message string.
+     *
+     * @param mixed  $code     integer error code, or a PEAR error object (all 
+     *                         other parameters are ignored if this parameter is
+     *                         an object
+     * @param int    $mode     error mode, see PEAR_Error docs
+     * @param mixed  $options  If error mode is PEAR_ERROR_TRIGGER, this is the
+     *                         error level (E_USER_NOTICE etc). If error mode is
+     *                         PEAR_ERROR_CALLBACK, this is the callback function,
+     *                         either as a function name, or as an array of an
+     *                         object and method name. For other error modes this
+     *                         parameter is ignored.
+     * @param string $userinfo Extra debug information. Defaults to the last
+     *                         query and native error code.
+     * @param string $method   name of the method that triggered the error
+     * @param string $dummy1   not used
+     * @param bool   $dummy2   not used
+     *
+     * @return PEAR_Error instance of a PEAR Error object
+     * @access public
+     * @see    PEAR_Error
+     */
+    function raiseError($code = null,
+                         $mode = null,
+                         $options = null,
+                         $userinfo = null,
+                         $method = null,
+                         $dummy1 = null,
+                         $dummy2 = false
+    ) {
+        $userinfo = "[Error message: $userinfo]\n";
+        // The error is yet a MDB2 error object
+        if (PEAR::isError($code)) {
+            // because we use the static PEAR::raiseError, our global
+            // handler should be used if it is set
+            if (is_null($mode) && !empty($this->_default_error_mode)) {
+                $mode    = $this->_default_error_mode;
+                $options = $this->_default_error_options;
+            }
+            if (is_null($userinfo)) {
+                $userinfo = $code->getUserinfo();
+            }
+            $code = $code->getCode();
+        } elseif ($code == MDB2_ERROR_NOT_FOUND) {
+            // extension not loaded: don't call $this->errorInfo() or the script
+            // will die
+        } elseif (isset($this->connection)) {
+            if (!empty($this->last_query)) {
+                $userinfo.= "[Last executed query: {$this->last_query}]\n";
+            }
+            $native_errno = $native_msg = null;
+            list($code, $native_errno, $native_msg) = $this->errorInfo($code);
+            if (!is_null($native_errno) && $native_errno !== '') {
+                $userinfo.= "[Native code: $native_errno]\n";
+            }
+            if (!is_null($native_msg) && $native_msg !== '') {
+                $userinfo.= "[Native message: ". strip_tags($native_msg) ."]\n";
+            }
+            echo $userinfo;
+            if (!is_null($method)) {
+                $userinfo = $method.': '.$userinfo;
+            }
+        }
+
+        $err = PEAR::raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true);
+        if ($err->getMode() !== PEAR_ERROR_RETURN
+            && isset($this->nested_transaction_counter) && !$this->has_transaction_error) {
+            $this->has_transaction_error =$err;
+        }
+        return $err;
+    }
+
+    // }}}
+    // {{{ function resetWarnings()
+
+    /**
+     * reset the warning array
+     *
+     * @return void
+     *
+     * @access  public
+     */
+    function resetWarnings()
+    {
+        $this->warnings = array();
+    }
+
+    // }}}
+    // {{{ function getWarnings()
+
+    /**
+     * Get all warnings in reverse order.
+     * This means that the last warning is the first element in the array
+     *
+     * @return  array   with warnings
+     *
+     * @access  public
+     * @see     resetWarnings()
+     */
+    function getWarnings()
+    {
+        return array_reverse($this->warnings);
+    }
+
+    // }}}
+    // {{{ function setFetchMode($fetchmode, $object_class = 'stdClass')
+
+    /**
+     * Sets which fetch mode should be used by default on queries
+     * on this connection
+     *
+     * @param   int     MDB2_FETCHMODE_ORDERED, MDB2_FETCHMODE_ASSOC
+     *                               or MDB2_FETCHMODE_OBJECT
+     * @param   string  the class name of the object to be returned
+     *                               by the fetch methods when the
+     *                               MDB2_FETCHMODE_OBJECT mode is selected.
+     *                               If no class is specified by default a cast
+     *                               to object from the assoc array row will be
+     *                               done.  There is also the possibility to use
+     *                               and extend the 'MDB2_row' class.
+     *
+     * @return  mixed   MDB2_OK or MDB2 Error Object
+     *
+     * @access  public
+     * @see     MDB2_FETCHMODE_ORDERED, MDB2_FETCHMODE_ASSOC, MDB2_FETCHMODE_OBJECT
+     */
+    function setFetchMode($fetchmode, $object_class = 'stdClass')
+    {
+        switch ($fetchmode) {
+        case MDB2_FETCHMODE_OBJECT:
+            $this->options['fetch_class'] = $object_class;
+        case MDB2_FETCHMODE_ORDERED:
+        case MDB2_FETCHMODE_ASSOC:
+            $this->fetchmode = $fetchmode;
+            break;
+        default:
+            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'invalid fetchmode mode', __FUNCTION__);
+        }
+
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function setOption($option, $value)
+
+    /**
+     * set the option for the db class
+     *
+     * @param   string  option name
+     * @param   mixed   value for the option
+     *
+     * @return  mixed   MDB2_OK or MDB2 Error Object
+     *
+     * @access  public
+     */
+    function setOption($option, $value)
+    {
+        if (array_key_exists($option, $this->options)) {
+            $this->options[$option] = $value;
+            return MDB2_OK;
+        }
+        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            "unknown option $option", __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ function getOption($option)
+
+    /**
+     * Returns the value of an option
+     *
+     * @param   string  option name
+     *
+     * @return  mixed   the option value or error object
+     *
+     * @access  public
+     */
+    function getOption($option)
+    {
+        if (array_key_exists($option, $this->options)) {
+            return $this->options[$option];
+        }
+        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            "unknown option $option", __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ function debug($message, $scope = '', $is_manip = null)
+
+    /**
+     * set a debug message
+     *
+     * @param   string  message that should be appended to the debug variable
+     * @param   string  usually the method name that triggered the debug call:
+     *                  for example 'query', 'prepare', 'execute', 'parameters',
+     *                  'beginTransaction', 'commit', 'rollback'
+     * @param   array   contains context information about the debug() call
+     *                  common keys are: is_manip, time, result etc.
+     *
+     * @return void
+     *
+     * @access  public
+     */
+    function debug($message, $scope = '', $context = array())
+    {
+        if ($this->options['debug'] && $this->options['debug_handler']) {
+            if (!$this->options['debug_expanded_output']) {
+                if (!empty($context['when']) && $context['when'] !== 'pre') {
+                    return null;
+                }
+                $context = empty($context['is_manip']) ? false : $context['is_manip'];
+            }
+            return call_user_func_array($this->options['debug_handler'], array(&$this, $scope, $message, $context));
+        }
+        return null;
+    }
+
+    // }}}
+    // {{{ function getDebugOutput()
+
+    /**
+     * output debug info
+     *
+     * @return  string  content of the debug_output class variable
+     *
+     * @access  public
+     */
+    function getDebugOutput()
+    {
+        return $this->debug_output;
+    }
+
+    // }}}
+    // {{{ function escape($text)
+
+    /**
+     * Quotes a string so it can be safely used in a query. It will quote
+     * the text so it can safely be used within a query.
+     *
+     * @param   string  the input string to quote
+     * @param   bool    escape wildcards
+     *
+     * @return  string  quoted string
+     *
+     * @access  public
+     */
+    function escape($text, $escape_wildcards = false)
+    {
+        if ($escape_wildcards) {
+            $text = $this->escapePattern($text);
+        }
+
+        $text = str_replace($this->string_quoting['end'], $this->string_quoting['escape'] . $this->string_quoting['end'], $text);
+        return $text;
+    }
+
+    // }}}
+    // {{{ function escapePattern($text)
+
+    /**
+     * Quotes pattern (% and _) characters in a string)
+     *
+     * @param   string  the input string to quote
+     *
+     * @return  string  quoted string
+     *
+     * @access  public
+     */
+    function escapePattern($text)
+    {
+        if ($this->string_quoting['escape_pattern']) {
+            $text = str_replace($this->string_quoting['escape_pattern'], $this->string_quoting['escape_pattern'] . $this->string_quoting['escape_pattern'], $text);
+            foreach ($this->wildcards as $wildcard) {
+                $text = str_replace($wildcard, $this->string_quoting['escape_pattern'] . $wildcard, $text);
+            }
+        }
+        return $text;
+    }
+
+    // }}}
+    // {{{ function quoteIdentifier($str, $check_option = false)
+
+    /**
+     * Quote a string so it can be safely used as a table or column name
+     *
+     * Delimiting style depends on which database driver is being used.
+     *
+     * NOTE: just because you CAN use delimited identifiers doesn't mean
+     * you SHOULD use them.  In general, they end up causing way more
+     * problems than they solve.
+     *
+     * NOTE: if you have table names containing periods, don't use this method
+     * (@see bug #11906)
+     *
+     * Portability is broken by using the following characters inside
+     * delimited identifiers:
+     *   + backtick (<kbd>`</kbd>) -- due to MySQL
+     *   + double quote (<kbd>"</kbd>) -- due to Oracle
+     *   + brackets (<kbd>[</kbd> or <kbd>]</kbd>) -- due to Access
+     *
+     * Delimited identifiers are known to generally work correctly under
+     * the following drivers:
+     *   + mssql
+     *   + mysql
+     *   + mysqli
+     *   + oci8
+     *   + pgsql
+     *   + sqlite
+     *
+     * InterBase doesn't seem to be able to use delimited identifiers
+     * via PHP 4.  They work fine under PHP 5.
+     *
+     * @param   string  identifier name to be quoted
+     * @param   bool    check the 'quote_identifier' option
+     *
+     * @return  string  quoted identifier string
+     *
+     * @access  public
+     */
+    function quoteIdentifier($str, $check_option = false)
+    {
+        if ($check_option && !$this->options['quote_identifier']) {
+            return $str;
+        }
+        $str = str_replace($this->identifier_quoting['end'], $this->identifier_quoting['escape'] . $this->identifier_quoting['end'], $str);
+        $parts = explode('.', $str);
+        foreach (array_keys($parts) as $k) {
+            $parts[$k] = $this->identifier_quoting['start'] . $parts[$k] . $this->identifier_quoting['end'];
+        }
+        return implode('.', $parts);
+    }
+
+    // }}}
+    // {{{ function getAsKeyword()
+
+    /**
+     * Gets the string to alias column
+     *
+     * @return string to use when aliasing a column
+     */
+    function getAsKeyword()
+    {
+        return $this->as_keyword;
+    }
+
+    // }}}
+    // {{{ function getConnection()
+
+    /**
+     * Returns a native connection
+     *
+     * @return  mixed   a valid MDB2 connection object,
+     *                  or a MDB2 error object on error
+     *
+     * @access  public
+     */
+    function getConnection()
+    {
+        $result = $this->connect();
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        return $this->connection;
+    }
+
+     // }}}
+    // {{{ function _fixResultArrayValues(&$row, $mode)
+
+    /**
+     * Do all necessary conversions on result arrays to fix DBMS quirks
+     *
+     * @param   array   the array to be fixed (passed by reference)
+     * @param   array   bit-wise addition of the required portability modes
+     *
+     * @return  void
+     *
+     * @access  protected
+     */
+    function _fixResultArrayValues(&$row, $mode)
+    {
+        switch ($mode) {
+        case MDB2_PORTABILITY_EMPTY_TO_NULL:
+            foreach ($row as $key => $value) {
+                if ($value === '') {
+                    $row[$key] = null;
+                }
+            }
+            break;
+        case MDB2_PORTABILITY_RTRIM:
+            foreach ($row as $key => $value) {
+                if (is_string($value)) {
+                    $row[$key] = rtrim($value);
+                }
+            }
+            break;
+        case MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES:
+            $tmp_row = array();
+            foreach ($row as $key => $value) {
+                $tmp_row[preg_replace('/^(?:.*\.)?([^.]+)$/', '\\1', $key)] = $value;
+            }
+            $row = $tmp_row;
+            break;
+        case (MDB2_PORTABILITY_RTRIM + MDB2_PORTABILITY_EMPTY_TO_NULL):
+            foreach ($row as $key => $value) {
+                if ($value === '') {
+                    $row[$key] = null;
+                } elseif (is_string($value)) {
+                    $row[$key] = rtrim($value);
+                }
+            }
+            break;
+        case (MDB2_PORTABILITY_RTRIM + MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES):
+            $tmp_row = array();
+            foreach ($row as $key => $value) {
+                if (is_string($value)) {
+                    $value = rtrim($value);
+                }
+                $tmp_row[preg_replace('/^(?:.*\.)?([^.]+)$/', '\\1', $key)] = $value;
+            }
+            $row = $tmp_row;
+            break;
+        case (MDB2_PORTABILITY_EMPTY_TO_NULL + MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES):
+            $tmp_row = array();
+            foreach ($row as $key => $value) {
+                if ($value === '') {
+                    $value = null;
+                }
+                $tmp_row[preg_replace('/^(?:.*\.)?([^.]+)$/', '\\1', $key)] = $value;
+            }
+            $row = $tmp_row;
+            break;
+        case (MDB2_PORTABILITY_RTRIM + MDB2_PORTABILITY_EMPTY_TO_NULL + MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES):
+            $tmp_row = array();
+            foreach ($row as $key => $value) {
+                if ($value === '') {
+                    $value = null;
+                } elseif (is_string($value)) {
+                    $value = rtrim($value);
+                }
+                $tmp_row[preg_replace('/^(?:.*\.)?([^.]+)$/', '\\1', $key)] = $value;
+            }
+            $row = $tmp_row;
+            break;
+        }
+    }
+
+    // }}}
+    // {{{ function &loadModule($module, $property = null, $phptype_specific = null)
+
+    /**
+     * loads a module
+     *
+     * @param   string  name of the module that should be loaded
+     *                  (only used for error messages)
+     * @param   string  name of the property into which the class will be loaded
+     * @param   bool    if the class to load for the module is specific to the
+     *                  phptype
+     *
+     * @return  object  on success a reference to the given module is returned
+     *                  and on failure a PEAR error
+     *
+     * @access  public
+     */
+    function &loadModule($module, $property = null, $phptype_specific = null)
+    {
+        if (!$property) {
+            $property = strtolower($module);
+        }
+
+        if (!isset($this->{$property})) {
+            $version = $phptype_specific;
+            if ($phptype_specific !== false) {
+                $version = true;
+                $class_name = 'MDB2_Driver_'.$module.'_'.$this->phptype;
+                $file_name = str_replace('_', DIRECTORY_SEPARATOR, $class_name).'.php';
+            }
+            if ($phptype_specific === false
+                || (!MDB2::classExists($class_name) && !MDB2::fileExists($file_name))
+            ) {
+                $version = false;
+                $class_name = 'MDB2_'.$module;
+                $file_name = str_replace('_', DIRECTORY_SEPARATOR, $class_name).'.php';
+            }
+
+            $err = MDB2::loadClass($class_name, $this->getOption('debug'));
+            if (PEAR::isError($err)) {
+                return $err;
+            }
+            // load module in a specific version
+            if ($version) {
+                if (method_exists($class_name, 'getClassName')) {
+                    $class_name_new = call_user_func(array($class_name, 'getClassName'), $this->db_index);
+                    if ($class_name != $class_name_new) {
+                        $class_name = $class_name_new;
+                        $err = MDB2::loadClass($class_name, $this->getOption('debug'));
+                        if (PEAR::isError($err)) {
+                            return $err;
+                        }
+                    }
+                }
+            }
+
+            if (!MDB2::classExists($class_name)) {
+                $err =$this->raiseError(MDB2_ERROR_LOADMODULE, null, null,
+                    "unable to load module '$module' into property '$property'", __FUNCTION__);
+                return $err;
+            }
+            $this->{$property} = new $class_name($this->db_index);
+            $this->modules[$module] =$this->{$property};
+            if ($version) {
+                // this will be used in the connect method to determine if the module
+                // needs to be loaded with a different version if the server
+                // version changed in between connects
+                $this->loaded_version_modules[] = $property;
+            }
+        }
+
+        return $this->{$property};
+    }
+
+    // }}}
+    // {{{ function __call($method, $params)
+
+    /**
+     * Calls a module method using the __call magic method
+     *
+     * @param   string  Method name.
+     * @param   array   Arguments.
+     *
+     * @return  mixed   Returned value.
+     */
+    function __call($method, $params)
+    {
+        $module = null;
+        if (preg_match('/^([a-z]+)([A-Z])(.*)$/', $method, $match)
+            && isset($this->options['modules'][$match[1]])
+        ) {
+            $module = $this->options['modules'][$match[1]];
+            $method = strtolower($match[2]).$match[3];
+            if (!isset($this->modules[$module]) || !is_object($this->modules[$module])) {
+                $result =& $this->loadModule($module);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+        } else {
+            foreach ($this->modules as $key => $foo) {
+                if (is_object($this->modules[$key])
+                    && method_exists($this->modules[$key], $method)
+                ) {
+                    $module = $key;
+                    break;
+                }
+            }
+        }
+        if (!is_null($module)) {
+            return call_user_func_array(array(&$this->modules[$module], $method), $params);
+        }
+        trigger_error(sprintf('Call to undefined function: %s::%s().', get_class($this), $method), E_USER_ERROR);
+    }
+
+    // }}}
+    // {{{ function beginTransaction($savepoint = null)
+
+    /**
+     * Start a transaction or set a savepoint.
+     *
+     * @param   string  name of a savepoint to set
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function beginTransaction($savepoint = null)
+    {
+        $this->debug('Starting transaction', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'transactions are not supported', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ function commit($savepoint = null)
+
+    /**
+     * Commit the database changes done during a transaction that is in
+     * progress or release a savepoint. This function may only be called when
+     * auto-committing is disabled, otherwise it will fail. Therefore, a new
+     * transaction is implicitly started after committing the pending changes.
+     *
+     * @param   string  name of a savepoint to release
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function commit($savepoint = null)
+    {
+        $this->debug('Committing transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'commiting transactions is not supported', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ function rollback($savepoint = null)
+
+    /**
+     * Cancel any database changes done during a transaction or since a specific
+     * savepoint that is in progress. This function may only be called when
+     * auto-committing is disabled, otherwise it will fail. Therefore, a new
+     * transaction is implicitly started after canceling the pending changes.
+     *
+     * @param   string  name of a savepoint to rollback to
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function rollback($savepoint = null)
+    {
+        $this->debug('Rolling back transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'rolling back transactions is not supported', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ function inTransaction($ignore_nested = false)
+
+    /**
+     * If a transaction is currently open.
+     *
+     * @param   bool    if the nested transaction count should be ignored
+     * @return  int|bool    - an integer with the nesting depth is returned if a
+     *                      nested transaction is open
+     *                      - true is returned for a normal open transaction
+     *                      - false is returned if no transaction is open
+     *
+     * @access  public
+     */
+    function inTransaction($ignore_nested = false)
+    {
+        if (!$ignore_nested && isset($this->nested_transaction_counter)) {
+            return $this->nested_transaction_counter;
+        }
+        return $this->in_transaction;
+    }
+
+    // }}}
+    // {{{ function setTransactionIsolation($isolation)
+
+    /**
+     * Set the transacton isolation level.
+     *
+     * @param   string  standard isolation level
+     *                  READ UNCOMMITTED (allows dirty reads)
+     *                  READ COMMITTED (prevents dirty reads)
+     *                  REPEATABLE READ (prevents nonrepeatable reads)
+     *                  SERIALIZABLE (prevents phantom reads)
+     * @param   array some transaction options:
+     *                  'wait' => 'WAIT' | 'NO WAIT'
+     *                  'rw'   => 'READ WRITE' | 'READ ONLY'
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     * @since   2.1.1
+     */
+    static function setTransactionIsolation($isolation, $options = array())
+    {
+        $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true));
+        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'isolation level setting is not supported', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ function beginNestedTransaction($savepoint = false)
+
+    /**
+     * Start a nested transaction.
+     *
+     * @return  mixed   MDB2_OK on success/savepoint name, a MDB2 error on failure
+     *
+     * @access  public
+     * @since   2.1.1
+     */
+    function beginNestedTransaction()
+    {
+        if ($this->in_transaction) {
+            ++$this->nested_transaction_counter;
+            $savepoint = sprintf($this->options['savepoint_format'], $this->nested_transaction_counter);
+            if ($this->supports('savepoints') && $savepoint) {
+                return $this->beginTransaction($savepoint);
+            }
+            return MDB2_OK;
+        }
+        $this->has_transaction_error = false;
+        $result = $this->beginTransaction();
+        $this->nested_transaction_counter = 1;
+        return $result;
+    }
+
+    // }}}
+    // {{{ function completeNestedTransaction($force_rollback = false, $release = false)
+
+    /**
+     * Finish a nested transaction by rolling back if an error occured or
+     * committing otherwise.
+     *
+     * @param   bool    if the transaction should be rolled back regardless
+     *                  even if no error was set within the nested transaction
+     * @return  mixed   MDB_OK on commit/counter decrementing, false on rollback
+     *                  and a MDB2 error on failure
+     *
+     * @access  public
+     * @since   2.1.1
+     */
+    function completeNestedTransaction($force_rollback = false)
+    {
+        if ($this->nested_transaction_counter > 1) {
+            $savepoint = sprintf($this->options['savepoint_format'], $this->nested_transaction_counter);
+            if ($this->supports('savepoints') && $savepoint) {
+                if ($force_rollback || $this->has_transaction_error) {
+                    $result = $this->rollback($savepoint);
+                    if (!PEAR::isError($result)) {
+                        $result = false;
+                        $this->has_transaction_error = false;
+                    }
+                } else {
+                    $result = $this->commit($savepoint);
+                }
+            } else {
+                $result = MDB2_OK;
+            }
+            --$this->nested_transaction_counter;
+            return $result;
+        }
+
+        $this->nested_transaction_counter = null;
+        $result = MDB2_OK;
+
+        // transaction has not yet been rolled back
+        if ($this->in_transaction) {
+            if ($force_rollback || $this->has_transaction_error) {
+                $result = $this->rollback();
+                if (!PEAR::isError($result)) {
+                    $result = false;
+                }
+            } else {
+                $result = $this->commit();
+            }
+        }
+        $this->has_transaction_error = false;
+        return $result;
+    }
+
+    // }}}
+    // {{{ function failNestedTransaction($error = null, $immediately = false)
+
+    /**
+     * Force setting nested transaction to failed.
+     *
+     * @param   mixed   value to return in getNestededTransactionError()
+     * @param   bool    if the transaction should be rolled back immediately
+     * @return  bool    MDB2_OK
+     *
+     * @access  public
+     * @since   2.1.1
+     */
+    function failNestedTransaction($error = null, $immediately = false)
+    {
+        if (is_null($error)) {
+            $error = $this->has_transaction_error ? $this->has_transaction_error : true;
+        } elseif (!$error) {
+            $error = true;
+        }
+        $this->has_transaction_error = $error;
+        if (!$immediately) {
+            return MDB2_OK;
+        }
+        return $this->rollback();
+    }
+
+    // }}}
+    // {{{ function getNestedTransactionError()
+
+    /**
+     * The first error that occured since the transaction start.
+     *
+     * @return  MDB2_Error|bool     MDB2 error object if an error occured or false.
+     *
+     * @access  public
+     * @since   2.1.1
+     */
+    function getNestedTransactionError()
+    {
+        return $this->has_transaction_error;
+    }
+
+    // }}}
+    // {{{ connect()
+
+    /**
+     * Connect to the database
+     *
+     * @return true on success, MDB2 Error Object on failure
+     */
+    function connect()
+    {
+        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ databaseExists()
+
+    /**
+     * check if given database name is exists?
+     *
+     * @param string $name    name of the database that should be checked
+     *
+     * @return mixed true/false on success, a MDB2 error on failure
+     * @access public
+     */
+    function databaseExists($name)
+    {
+        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ setCharset($charset, $connection = null)
+
+    /**
+     * Set the charset on the current connection
+     *
+     * @param string    charset
+     * @param resource  connection handle
+     *
+     * @return true on success, MDB2 Error Object on failure
+     */
+    function setCharset($charset, $connection = null)
+    {
+        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ function disconnect($force = true)
+
+    /**
+     * Log out and disconnect from the database.
+     *
+     * @param boolean $force whether the disconnect should be forced even if the
+     *                       connection is opened persistently
+     *
+     * @return mixed true on success, false if not connected and error object on error
+     *
+     * @access  public
+     */
+    function disconnect($force = true)
+    {
+        $this->connection = 0;
+        $this->connected_dsn = array();
+        $this->connected_database_name = '';
+        $this->opened_persistent = null;
+        $this->connected_server_info = '';
+        $this->in_transaction = null;
+        $this->nested_transaction_counter = null;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function setDatabase($name)
+
+    /**
+     * Select a different database
+     *
+     * @param   string  name of the database that should be selected
+     *
+     * @return  string  name of the database previously connected to
+     *
+     * @access  public
+     */
+    function setDatabase($name)
+    {
+        $previous_database_name = (isset($this->database_name)) ? $this->database_name : '';
+        $this->database_name = $name;
+        if (!empty($this->connected_database_name) && ($this->connected_database_name != $this->database_name)) {
+            $this->disconnect(false);
+        }
+        return $previous_database_name;
+    }
+
+    // }}}
+    // {{{ function getDatabase()
+
+    /**
+     * Get the current database
+     *
+     * @return  string  name of the database
+     *
+     * @access  public
+     */
+    function getDatabase()
+    {
+        return $this->database_name;
+    }
+
+    // }}}
+    // {{{ function setDSN($dsn)
+
+    /**
+     * set the DSN
+     *
+     * @param   mixed   DSN string or array
+     *
+     * @return  MDB2_OK
+     *
+     * @access  public
+     */
+    function setDSN($dsn)
+    {
+        $dsn_default = $GLOBALS['_MDB2_dsninfo_default'];
+        $dsn = MDB2::parseDSN($dsn);
+        if (array_key_exists('database', $dsn)) {
+            $this->database_name = $dsn['database'];
+            unset($dsn['database']);
+        }
+        $this->dsn = array_merge($dsn_default, $dsn);
+        return $this->disconnect(false);
+    }
+
+    // }}}
+    // {{{ function getDSN($type = 'string', $hidepw = false)
+
+    /**
+     * return the DSN as a string
+     *
+     * @param   string  format to return ("array", "string")
+     * @param   string  string to hide the password with
+     *
+     * @return  mixed   DSN in the chosen type
+     *
+     * @access  public
+     */
+    function getDSN($type = 'string', $hidepw = false)
+    {
+        $dsn = array_merge($GLOBALS['_MDB2_dsninfo_default'], $this->dsn);
+        $dsn['phptype'] = $this->phptype;
+        $dsn['database'] = $this->database_name;
+        if ($hidepw) {
+            $dsn['password'] = $hidepw;
+        }
+        switch ($type) {
+        // expand to include all possible options
+        case 'string':
+           $dsn = $dsn['phptype'].
+               ($dsn['dbsyntax'] ? ('('.$dsn['dbsyntax'].')') : '').
+               '://'.$dsn['username'].':'.
+                $dsn['password'].'@'.$dsn['hostspec'].
+                ($dsn['port'] ? (':'.$dsn['port']) : '').
+                '/'.$dsn['database'];
+            break;
+        case 'array':
+        default:
+            break;
+        }
+        return $dsn;
+    }
+
+    // }}}
+    // {{{ _isNewLinkSet()
+
+    /**
+     * Check if the 'new_link' option is set
+     *
+     * @return boolean
+     *
+     * @access protected
+     */
+    function _isNewLinkSet()
+    {
+        return (isset($this->dsn['new_link'])
+            && ($this->dsn['new_link'] === true
+             || (is_string($this->dsn['new_link']) && preg_match('/^true$/i', $this->dsn['new_link']))
+             || (is_numeric($this->dsn['new_link']) && 0 != (int)$this->dsn['new_link'])
+            )
+        );
+    }
+
+    // }}}
+    // {{{ function &standaloneQuery($query, $types = null, $is_manip = false)
+
+   /**
+     * execute a query as database administrator
+     *
+     * @param   string  the SQL query
+     * @param   mixed   array that contains the types of the columns in
+     *                        the result set
+     * @param   bool    if the query is a manipulation query
+     *
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function &standaloneQuery($query, $types = null, $is_manip = false)
+    {
+        $offset = $this->offset;
+        $limit = $this->limit;
+        $this->offset = $this->limit = 0;
+        $query = $this->_modifyQuery($query, $is_manip, $limit, $offset);
+
+        $connection = $this->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        $result =$this->_doQuery($query, $is_manip, $connection, false);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        if ($is_manip) {
+            $affected_rows =  $this->_affectedRows($connection, $result);
+            return $affected_rows;
+        }
+        $result =$this->_wrapResult($result, $types, true, false, $limit, $offset);
+        return $result;
+    }
+
+    // }}}
+    // {{{ function _modifyQuery($query, $is_manip, $limit, $offset)
+
+    /**
+     * Changes a query string for various DBMS specific reasons
+     *
+     * @param   string  query to modify
+     * @param   bool    if it is a DML query
+     * @param   int  limit the number of rows
+     * @param   int  start reading from given offset
+     *
+     * @return  string  modified query
+     *
+     * @access  protected
+     */
+    function _modifyQuery($query, $is_manip, $limit, $offset)
+    {
+        return $query;
+    }
+
+    // }}}
+    // {{{ function &_doQuery($query, $is_manip = false, $connection = null, $database_name = null)
+
+    /**
+     * Execute a query
+     * @param   string  query
+     * @param   bool    if the query is a manipulation query
+     * @param   resource connection handle
+     * @param   string  database name
+     *
+     * @return  result or error object
+     *
+     * @access  protected
+     */
+    function &_doQuery($query, $is_manip = false, $connection = null, $database_name = null)
+    {
+        $this->last_query = $query;
+        $result = $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'pre'));
+        if ($result) {
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+            $query = $result;
+        }
+        $err =$this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+        return $err;
+    }
+
+    // }}}
+    // {{{ function _affectedRows($connection, $result = null)
+
+    /**
+     * Returns the number of rows affected
+     *
+     * @param   resource result handle
+     * @param   resource connection handle
+     *
+     * @return  mixed   MDB2 Error Object or the number of rows affected
+     *
+     * @access  private
+     */
+    function _affectedRows($connection, $result = null)
+    {
+        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ function &exec($query)
+
+    /**
+     * Execute a manipulation query to the database and return the number of affected rows
+     *
+     * @param   string  the SQL query
+     *
+     * @return  mixed   number of affected rows on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function &exec($query)
+    {
+        $offset = $this->offset;
+        $limit = $this->limit;
+        $this->offset = $this->limit = 0;
+        $query = $this->_modifyQuery($query, true, $limit, $offset);
+
+        $connection = $this->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        $result =$this->_doQuery($query, true, $connection, $this->database_name);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        $affectedRows = $this->_affectedRows($connection, $result);
+        return $affectedRows;
+    }
+
+    // }}}
+    // {{{ function &query($query, $types = null, $result_class = true, $result_wrap_class = false)
+
+    /**
+     * Send a query to the database and return any results
+     *
+     * @param   string  the SQL query
+     * @param   mixed   array that contains the types of the columns in
+     *                        the result set
+     * @param   mixed   string which specifies which result class to use
+     * @param   mixed   string which specifies which class to wrap results in
+     *
+     * @return mixed   an MDB2_Result handle on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function &query($query, $types = null, $result_class = true, $result_wrap_class = false)
+    {
+        $offset = $this->offset;
+        $limit = $this->limit;
+        $this->offset = $this->limit = 0;
+        $query = $this->_modifyQuery($query, false, $limit, $offset);
+
+        $connection = $this->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        $result =$this->_doQuery($query, false, $connection, $this->database_name);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        $result =$this->_wrapResult($result, $types, $result_class, $result_wrap_class, $limit, $offset);
+        return $result;
+    }
+
+    // }}}
+    // {{{ function &_wrapResult($result, $types = array(), $result_class = true, $result_wrap_class = false, $limit = null, $offset = null)
+
+    /**
+     * wrap a result set into the correct class
+     *
+     * @param   resource result handle
+     * @param   mixed   array that contains the types of the columns in
+     *                        the result set
+     * @param   mixed   string which specifies which result class to use
+     * @param   mixed   string which specifies which class to wrap results in
+     * @param   string  number of rows to select
+     * @param   string  first row to select
+     *
+     * @return mixed   an MDB2_Result, a MDB2 error on failure
+     *
+     * @access  protected
+     */
+    function &_wrapResult($result, $types = array(), $result_class = true,
+        $result_wrap_class = false, $limit = null, $offset = null)
+    {
+        if ($types === true) {
+            if ($this->supports('result_introspection')) {
+                $this->loadModule('Reverse', null, true);
+                $tableInfo = $this->reverse->tableInfo($result);
+                if (PEAR::isError($tableInfo)) {
+                    return $tableInfo;
+                }
+                $types = array();
+                foreach ($tableInfo as $field) {
+                    $types[] = $field['mdb2type'];
+                }
+            } else {
+                $types = null;
+            }
+        }
+
+        if ($result_class === true) {
+            $result_class = $this->options['result_buffering']
+                ? $this->options['buffered_result_class'] : $this->options['result_class'];
+        }
+
+        if ($result_class) {
+            $class_name = sprintf($result_class, $this->phptype);
+            if (!MDB2::classExists($class_name)) {
+                $err =$this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                    'result class does not exist '.$class_name, __FUNCTION__);
+                return $err;
+            }
+            $result =new $class_name($this, $result, $limit, $offset);
+            if (!MDB2::isResultCommon($result)) {
+                $err =$this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                    'result class is not extended from MDB2_Result_Common', __FUNCTION__);
+                return $err;
+            }
+            if (!empty($types)) {
+                $err = $result->setResultTypes($types);
+                if (PEAR::isError($err)) {
+                    $result->free();
+                    return $err;
+                }
+            }
+        }
+        if ($result_wrap_class === true) {
+            $result_wrap_class = $this->options['result_wrap_class'];
+        }
+        if ($result_wrap_class) {
+            if (!MDB2::classExists($result_wrap_class)) {
+                $err =$this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                    'result wrap class does not exist '.$result_wrap_class, __FUNCTION__);
+                return $err;
+            }
+            $result = new $result_wrap_class($result, $this->fetchmode);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ function getServerVersion($native = false)
+
+    /**
+     * return version information about the server
+     *
+     * @param   bool    determines if the raw version string should be returned
+     *
+     * @return  mixed   array with version information or row string
+     *
+     * @access  public
+     */
+    function getServerVersion($native = false)
+    {
+        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ function setLimit($limit, $offset = null)
+
+    /**
+     * set the range of the next query
+     *
+     * @param   string  number of rows to select
+     * @param   string  first row to select
+     *
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function setLimit($limit, $offset = null)
+    {
+        if (!$this->supports('limit_queries')) {
+            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'limit is not supported by this driver', __FUNCTION__);
+        }
+        $limit = (int)$limit;
+        if ($limit < 0) {
+            return $this->raiseError(MDB2_ERROR_SYNTAX, null, null,
+                'it was not specified a valid selected range row limit', __FUNCTION__);
+        }
+        $this->limit = $limit;
+        if (!is_null($offset)) {
+            $offset = (int)$offset;
+            if ($offset < 0) {
+                return $this->raiseError(MDB2_ERROR_SYNTAX, null, null,
+                    'it was not specified a valid first selected range row', __FUNCTION__);
+            }
+            $this->offset = $offset;
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function subSelect($query, $type = false)
+
+    /**
+     * simple subselect emulation: leaves the query untouched for all RDBMS
+     * that support subselects
+     *
+     * @param   string  the SQL query for the subselect that may only
+     *                      return a column
+     * @param   string  determines type of the field
+     *
+     * @return  string  the query
+     *
+     * @access  public
+     */
+    function subSelect($query, $type = false)
+    {
+        if ($this->supports('sub_selects') === true) {
+            return $query;
+        }
+
+        if (!$this->supports('sub_selects')) {
+            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'method not implemented', __FUNCTION__);
+        }
+
+        $col = $this->queryCol($query, $type);
+        if (PEAR::isError($col)) {
+            return $col;
+        }
+        if (!is_array($col) || count($col) == 0) {
+            return 'NULL';
+        }
+        if ($type) {
+            $this->loadModule('Datatype', null, true);
+            return $this->datatype->implodeArray($col, $type);
+        }
+        return implode(', ', $col);
+    }
+
+    // }}}
+    // {{{ function replace($table, $fields)
+
+    /**
+     * Execute a SQL REPLACE query. A REPLACE query is identical to a INSERT
+     * query, except that if there is already a row in the table with the same
+     * key field values, the old row is deleted before the new row is inserted.
+     *
+     * The REPLACE type of query does not make part of the SQL standards. Since
+     * practically only MySQL and SQLite implement it natively, this type of
+     * query isemulated through this method for other DBMS using standard types
+     * of queries inside a transaction to assure the atomicity of the operation.
+     *
+     * @param   string  name of the table on which the REPLACE query will
+     *       be executed.
+     * @param   array   associative array   that describes the fields and the
+     *       values that will be inserted or updated in the specified table. The
+     *       indexes of the array are the names of all the fields of the table.
+     *       The values of the array are also associative arrays that describe
+     *       the values and other properties of the table fields.
+     *
+     *       Here follows a list of field properties that need to be specified:
+     *
+     *       value
+     *           Value to be assigned to the specified field. This value may be
+     *           of specified in database independent type format as this
+     *           function can perform the necessary datatype conversions.
+     *
+     *           Default: this property is required unless the Null property is
+     *           set to 1.
+     *
+     *       type
+     *           Name of the type of the field. Currently, all types MDB2
+     *           are supported except for clob and blob.
+     *
+     *           Default: no type conversion
+     *
+     *       null
+     *           bool    property that indicates that the value for this field
+     *           should be set to null.
+     *
+     *           The default value for fields missing in INSERT queries may be
+     *           specified the definition of a table. Often, the default value
+     *           is already null, but since the REPLACE may be emulated using
+     *           an UPDATE query, make sure that all fields of the table are
+     *           listed in this function argument array.
+     *
+     *           Default: 0
+     *
+     *       key
+     *           bool    property that indicates that this field should be
+     *           handled as a primary key or at least as part of the compound
+     *           unique index of the table that will determine the row that will
+     *           updated if it exists or inserted a new row otherwise.
+     *
+     *           This function will fail if no key field is specified or if the
+     *           value of a key field is set to null because fields that are
+     *           part of unique index they may not be null.
+     *
+     *           Default: 0
+     *
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function replace($table, $fields)
+    {
+        if (!$this->supports('replace')) {
+            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'replace query is not supported', __FUNCTION__);
+        }
+        $count = count($fields);
+        $condition = $values = array();
+        for ($colnum = 0, reset($fields); $colnum < $count; next($fields), $colnum++) {
+            $name = key($fields);
+            if (isset($fields[$name]['null']) && $fields[$name]['null']) {
+                $value = 'NULL';
+            } else {
+                $type = isset($fields[$name]['type']) ? $fields[$name]['type'] : null;
+                $value = $this->quote($fields[$name]['value'], $type);
+            }
+            $values[$name] = $value;
+            if (isset($fields[$name]['key']) && $fields[$name]['key']) {
+                if ($value === 'NULL') {
+                    return $this->raiseError(MDB2_ERROR_CANNOT_REPLACE, null, null,
+                        'key value '.$name.' may not be NULL', __FUNCTION__);
+                }
+                $condition[] = $this->quoteIdentifier($name, true) . '=' . $value;
+            }
+        }
+        if (empty($condition)) {
+            return $this->raiseError(MDB2_ERROR_CANNOT_REPLACE, null, null,
+                'not specified which fields are keys', __FUNCTION__);
+        }
+
+        $result = null;
+        $in_transaction = $this->in_transaction;
+        if (!$in_transaction && PEAR::isError($result = $this->beginTransaction())) {
+            return $result;
+        }
+
+        $connection = $this->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        $condition = ' WHERE '.implode(' AND ', $condition);
+        $query = 'DELETE FROM ' . $this->quoteIdentifier($table, true) . $condition;
+        $result =$this->_doQuery($query, true, $connection);
+        if (!PEAR::isError($result)) {
+            $affected_rows = $this->_affectedRows($connection, $result);
+            $insert = '';
+            foreach ($values as $key => $value) {
+                $insert .= ($insert?', ':'') . $this->quoteIdentifier($key, true);
+            }
+            $values = implode(', ', $values);
+            $query = 'INSERT INTO '. $this->quoteIdentifier($table, true) . "($insert) VALUES ($values)";
+            $result =$this->_doQuery($query, true, $connection);
+            if (!PEAR::isError($result)) {
+                $affected_rows += $this->_affectedRows($connection, $result);;
+            }
+        }
+
+        if (!$in_transaction) {
+            if (PEAR::isError($result)) {
+                $this->rollback();
+            } else {
+                $result = $this->commit();
+            }
+        }
+
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        return $affected_rows;
+    }
+
+    // }}}
+    // {{{ function &prepare($query, $types = null, $result_types = null, $lobs = array())
+
+    /**
+     * Prepares a query for multiple execution with execute().
+     * With some database backends, this is emulated.
+     * prepare() requires a generic query as string like
+     * 'INSERT INTO numbers VALUES(?,?)' or
+     * 'INSERT INTO numbers VALUES(:foo,:bar)'.
+     * The ? and :name and are placeholders which can be set using
+     * bindParam() and the query can be sent off using the execute() method.
+     * The allowed format for :name can be set with the 'bindname_format' option.
+     *
+     * @param   string  the query to prepare
+     * @param   mixed   array that contains the types of the placeholders
+     * @param   mixed   array that contains the types of the columns in
+     *                        the result set or MDB2_PREPARE_RESULT, if set to
+     *                        MDB2_PREPARE_MANIP the query is handled as a manipulation query
+     * @param   mixed   key (field) value (parameter) pair for all lob placeholders
+     *
+     * @return  mixed   resource handle for the prepared query on success, 
+     *                  a MDB2 error on failure
+     *
+     * @access  public
+     * @see     bindParam, execute
+     */
+    function &prepare($query, $types = null, $result_types = null, $lobs = array())
+    {
+        $is_manip = ($result_types === MDB2_PREPARE_MANIP);
+        $offset = $this->offset;
+        $limit = $this->limit;
+        $this->offset = $this->limit = 0;
+        $result = $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'pre'));
+        if ($result) {
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+            $query = $result;
+        }
+        $placeholder_type_guess = $placeholder_type = null;
+        $question  = '?';
+        $colon     = ':';
+        $positions = array();
+        $position  = 0;
+        while ($position < strlen($query)) {
+            $q_position = strpos($query, $question, $position);
+            $c_position = strpos($query, $colon, $position);
+            if ($q_position && $c_position) {
+                $p_position = min($q_position, $c_position);
+            } elseif ($q_position) {
+                $p_position = $q_position;
+            } elseif ($c_position) {
+                $p_position = $c_position;
+            } else {
+                break;
+            }
+            if (is_null($placeholder_type)) {
+                $placeholder_type_guess = $query[$p_position];
+            }
+
+            $new_pos = $this->_skipDelimitedStrings($query, $position, $p_position);
+            if (PEAR::isError($new_pos)) {
+                return $new_pos;
+            }
+            if ($new_pos != $position) {
+                $position = $new_pos;
+                continue; //evaluate again starting from the new position
+            }
+
+            if ($query[$position] == $placeholder_type_guess) {
+                if (is_null($placeholder_type)) {
+                    $placeholder_type = $query[$p_position];
+                    $question = $colon = $placeholder_type;
+                    if (!empty($types) && is_array($types)) {
+                        if ($placeholder_type == ':') {
+                            if (is_int(key($types))) {
+                                $types_tmp = $types;
+                                $types = array();
+                                $count = -1;
+                            }
+                        } else {
+                            $types = array_values($types);
+                        }
+                    }
+                }
+                if ($placeholder_type == ':') {
+                    $regexp = '/^.{'.($position+1).'}('.$this->options['bindname_format'].').*$/s';
+                    $parameter = preg_replace($regexp, '\\1', $query);
+                    if ($parameter === '') {
+                        $err =$this->raiseError(MDB2_ERROR_SYNTAX, null, null,
+                            'named parameter name must match "bindname_format" option', __FUNCTION__);
+                        return $err;
+                    }
+                    $positions[$p_position] = $parameter;
+                    $query = substr_replace($query, '?', $position, strlen($parameter)+1);
+                    // use parameter name in type array
+                    if (isset($count) && isset($types_tmp[++$count])) {
+                        $types[$parameter] = $types_tmp[$count];
+                    }
+                } else {
+                    $positions[$p_position] = count($positions);
+                }
+                $position = $p_position + 1;
+            } else {
+                $position = $p_position;
+            }
+        }
+        $class_name = 'MDB2_Statement_'.$this->phptype;
+        $statement = null;
+        $obj = new $class_name($this, $statement, $positions, $query, $types, $result_types, $is_manip, $limit, $offset);
+        $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'post', 'result' => $obj));
+        return $obj;
+    }
+
+    // }}}
+    // {{{ function _skipDelimitedStrings($query, $position, $p_position)
+    
+    /**
+     * Utility method, used by prepare() to avoid replacing placeholders within delimited strings.
+     * Check if the placeholder is contained within a delimited string.
+     * If so, skip it and advance the position, otherwise return the current position,
+     * which is valid
+     *
+     * @param string $query
+     * @param integer $position current string cursor position
+     * @param integer $p_position placeholder position
+     *
+     * @return mixed integer $new_position on success
+     *               MDB2_Error on failure
+     *
+     * @access  protected
+     */
+    function _skipDelimitedStrings($query, $position, $p_position)
+    {
+        $ignores = $this->string_quoting;
+        $ignores[] = $this->identifier_quoting;
+        $ignores = array_merge($ignores, $this->sql_comments);
+        
+        foreach ($ignores as $ignore) {
+            if (!empty($ignore['start'])) {
+                if (is_int($start_quote = strpos($query, $ignore['start'], $position)) && $start_quote < $p_position) {
+                    $end_quote = $start_quote;
+                    do {
+                        if (!is_int($end_quote = strpos($query, $ignore['end'], $end_quote + 1))) {
+                            if ($ignore['end'] === "\n") {
+                                $end_quote = strlen($query) - 1;
+                            } else {
+                                $err =$this->raiseError(MDB2_ERROR_SYNTAX, null, null,
+                                    'query with an unterminated text string specified', __FUNCTION__);
+                                return $err;
+                            }
+                        }
+                    } while ($ignore['escape']
+                        && $end_quote-1 != $start_quote
+                        && $query[($end_quote - 1)] == $ignore['escape']
+                        && (   $ignore['escape_pattern'] !== $ignore['escape']
+                            || $query[($end_quote - 2)] != $ignore['escape'])
+                    );
+
+                    $position = $end_quote + 1;
+                    return $position;
+                }
+            }
+        }
+        return $position;
+    }
+    
+    // }}}
+    // {{{ function quote($value, $type = null, $quote = true)
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param   string  text string value that is intended to be converted.
+     * @param   string  type to which the value should be converted to
+     * @param   bool    quote
+     * @param   bool    escape wildcards
+     *
+     * @return  string  text string that represents the given argument value in
+     *       a DBMS specific format.
+     *
+     * @access  public
+     */
+    function quote($value, $type = null, $quote = true, $escape_wildcards = false)
+    {
+        $result = $this->loadModule('Datatype', null, true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        return $this->datatype->quote($value, $type, $quote, $escape_wildcards);
+    }
+
+    // }}}
+    // {{{ function getDeclaration($type, $name, $field)
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare
+     * of the given type
+     *
+     * @param   string  type to which the value should be converted to
+     * @param   string  name the field to be declared.
+     * @param   string  definition of the field
+     *
+     * @return  string  DBMS specific SQL code portion that should be used to
+     *                 declare the specified field.
+     *
+     * @access  public
+     */
+    function getDeclaration($type, $name, $field)
+    {
+        $result = $this->loadModule('Datatype', null, true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        return $this->datatype->getDeclaration($type, $name, $field);
+    }
+
+    // }}}
+    // {{{ function compareDefinition($current, $previous)
+
+    /**
+     * Obtain an array of changes that may need to applied
+     *
+     * @param   array   new definition
+     * @param   array   old definition
+     *
+     * @return  array   containing all changes that will need to be applied
+     *
+     * @access  public
+     */
+    function compareDefinition($current, $previous)
+    {
+        $result = $this->loadModule('Datatype', null, true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        return $this->datatype->compareDefinition($current, $previous);
+    }
+
+    // }}}
+    // {{{ function supports($feature)
+
+    /**
+     * Tell whether a DB implementation or its backend extension
+     * supports a given feature.
+     *
+     * @param   string  name of the feature (see the MDB2 class doc)
+     *
+     * @return  bool|string if this DB implementation supports a given feature
+     *                      false means no, true means native,
+     *                      'emulated' means emulated
+     *
+     * @access  public
+     */
+    function supports($feature)
+    {
+        if (array_key_exists($feature, $this->supported)) {
+            return $this->supported[$feature];
+        }
+        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            "unknown support feature $feature", __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ function getSequenceName($sqn)
+
+    /**
+     * adds sequence name formatting to a sequence name
+     *
+     * @param   string  name of the sequence
+     *
+     * @return  string  formatted sequence name
+     *
+     * @access  public
+     */
+    function getSequenceName($sqn)
+    {
+        return sprintf($this->options['seqname_format'],
+            preg_replace('/[^a-z0-9_\-\$.]/i', '_', $sqn));
+    }
+
+    // }}}
+    // {{{ function getIndexName($idx)
+
+    /**
+     * adds index name formatting to a index name
+     *
+     * @param   string  name of the index
+     *
+     * @return  string  formatted index name
+     *
+     * @access  public
+     */
+    function getIndexName($idx)
+    {
+        return sprintf($this->options['idxname_format'],
+            preg_replace('/[^a-z0-9_\-\$.]/i', '_', $idx));
+    }
+
+    // }}}
+    // {{{ function nextID($seq_name, $ondemand = true)
+
+    /**
+     * Returns the next free id of a sequence
+     *
+     * @param   string  name of the sequence
+     * @param   bool    when true missing sequences are automatic created
+     *
+     * @return  mixed   MDB2 Error Object or id
+     *
+     * @access  public
+     */
+    function nextID($seq_name, $ondemand = true)
+    {
+        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ function lastInsertID($table = null, $field = null)
+
+    /**
+     * Returns the autoincrement ID if supported or $id or fetches the current
+     * ID in a sequence called: $table.(empty($field) ? '' : '_'.$field)
+     *
+     * @param   string  name of the table into which a new row was inserted
+     * @param   string  name of the field into which a new row was inserted
+     *
+     * @return  mixed   MDB2 Error Object or id
+     *
+     * @access  public
+     */
+    function lastInsertID($table = null, $field = null)
+    {
+        return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ function currID($seq_name)
+
+    /**
+     * Returns the current id of a sequence
+     *
+     * @param   string  name of the sequence
+     *
+     * @return  mixed   MDB2 Error Object or id
+     *
+     * @access  public
+     */
+    function currID($seq_name)
+    {
+        $this->warnings[] = 'database does not support getting current
+            sequence value, the sequence value was incremented';
+        return $this->nextID($seq_name);
+    }
+
+    // }}}
+    // {{{ function queryOne($query, $type = null, $colnum = 0)
+
+    /**
+     * Execute the specified query, fetch the value from the first column of
+     * the first row of the result set and then frees
+     * the result set.
+     *
+     * @param string $query  the SELECT query statement to be executed.
+     * @param string $type   optional argument that specifies the expected
+     *                       datatype of the result set field, so that an eventual
+     *                       conversion may be performed. The default datatype is
+     *                       text, meaning that no conversion is performed
+     * @param mixed  $colnum the column number (or name) to fetch
+     *
+     * @return  mixed   MDB2_OK or field value on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function queryOne($query, $type = null, $colnum = 0)
+    {
+        $result = $this->query($query, $type);
+        if (!MDB2::isResultCommon($result)) {
+            return $result;
+        }
+
+        $one = $result->fetchOne($colnum);
+        $result->free();
+        return $one;
+    }
+
+    // }}}
+    // {{{ function queryRow($query, $types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT)
+
+    /**
+     * Execute the specified query, fetch the values from the first
+     * row of the result set into an array and then frees
+     * the result set.
+     *
+     * @param   string  the SELECT query statement to be executed.
+     * @param   array   optional array argument that specifies a list of
+     *       expected datatypes of the result set columns, so that the eventual
+     *       conversions may be performed. The default list of datatypes is
+     *       empty, meaning that no conversion is performed.
+     * @param   int     how the array data should be indexed
+     *
+     * @return  mixed   MDB2_OK or data array on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function queryRow($query, $types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT)
+    {
+        $result = $this->query($query, $types);
+        if (!MDB2::isResultCommon($result)) {
+            return $result;
+        }
+
+        $row = $result->fetchRow($fetchmode);
+        $result->free();
+        return $row;
+    }
+
+    // }}}
+    // {{{ function queryCol($query, $type = null, $colnum = 0)
+
+    /**
+     * Execute the specified query, fetch the value from the first column of
+     * each row of the result set into an array and then frees the result set.
+     *
+     * @param string $query  the SELECT query statement to be executed.
+     * @param string $type   optional argument that specifies the expected
+     *                       datatype of the result set field, so that an eventual
+     *                       conversion may be performed. The default datatype is text,
+     *                       meaning that no conversion is performed
+     * @param mixed  $colnum the column number (or name) to fetch
+     *
+     * @return  mixed   MDB2_OK or data array on success, a MDB2 error on failure
+     * @access  public
+     */
+    function queryCol($query, $type = null, $colnum = 0)
+    {
+        $result = $this->query($query, $type);
+        if (!MDB2::isResultCommon($result)) {
+            return $result;
+        }
+
+        $col = $result->fetchCol($colnum);
+        $result->free();
+        return $col;
+    }
+
+    // }}}
+    // {{{ function queryAll($query, $types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT, $rekey = false, $force_array = false, $group = false)
+
+    /**
+     * Execute the specified query, fetch all the rows of the result set into
+     * a two dimensional array and then frees the result set.
+     *
+     * @param   string  the SELECT query statement to be executed.
+     * @param   array   optional array argument that specifies a list of
+     *       expected datatypes of the result set columns, so that the eventual
+     *       conversions may be performed. The default list of datatypes is
+     *       empty, meaning that no conversion is performed.
+     * @param   int     how the array data should be indexed
+     * @param   bool    if set to true, the $all will have the first
+     *       column as its first dimension
+     * @param   bool    used only when the query returns exactly
+     *       two columns. If true, the values of the returned array will be
+     *       one-element arrays instead of scalars.
+     * @param   bool    if true, the values of the returned array is
+     *       wrapped in another array.  If the same key value (in the first
+     *       column) repeats itself, the values will be appended to this array
+     *       instead of overwriting the existing values.
+     *
+     * @return  mixed   MDB2_OK or data array on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function queryAll($query, $types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT,
+        $rekey = false, $force_array = false, $group = false)
+    {
+        $result = $this->query($query, $types);
+        if (!MDB2::isResultCommon($result)) {
+            return $result;
+        }
+
+        $all = $result->fetchAll($fetchmode, $rekey, $force_array, $group);
+        $result->free();
+        return $all;
+    }
+
+    // }}}
+}
+
+// }}}
+// {{{ class MDB2_Result
+
+/**
+ * The dummy class that all user space result classes should extend from
+ *
+ * @package     MDB2
+ * @category    Database
+ * @author      Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Result
+{
+}
+
+// }}}
+// {{{ class MDB2_Result_Common extends MDB2_Result
+
+/**
+ * The common result class for MDB2 result objects
+ *
+ * @package     MDB2
+ * @category    Database
+ * @author      Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Result_Common extends MDB2_Result
+{
+    // {{{ Variables (Properties)
+
+    var $db;
+    var $result;
+    var $rownum = -1;
+    var $types = array();
+    var $values = array();
+    var $offset;
+    var $offset_count = 0;
+    var $limit;
+    var $column_names;
+
+    // }}}
+    // {{{ constructor: function __construct(&$db, &$result, $limit = 0, $offset = 0)
+
+    /**
+     * Constructor
+     */
+    function __construct(&$db, &$result, $limit = 0, $offset = 0)
+    {
+        $this->db =$db;
+        $this->result =$result;
+        $this->offset = $offset;
+        $this->limit = max(0, $limit - 1);
+    }
+
+
+    // }}}
+    // {{{ function setResultTypes($types)
+
+    /**
+     * Define the list of types to be associated with the columns of a given
+     * result set.
+     *
+     * This function may be called before invoking fetchRow(), fetchOne(),
+     * fetchCol() and fetchAll() so that the necessary data type
+     * conversions are performed on the data to be retrieved by them. If this
+     * function is not called, the type of all result set columns is assumed
+     * to be text, thus leading to not perform any conversions.
+     *
+     * @param   array   variable that lists the
+     *       data types to be expected in the result set columns. If this array
+     *       contains less types than the number of columns that are returned
+     *       in the result set, the remaining columns are assumed to be of the
+     *       type text. Currently, the types clob and blob are not fully
+     *       supported.
+     *
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function setResultTypes($types)
+    {
+        $load = $this->db->loadModule('Datatype', null, true);
+        if (PEAR::isError($load)) {
+            return $load;
+        }
+        $types = $this->db->datatype->checkResultTypes($types);
+        if (PEAR::isError($types)) {
+            return $types;
+        }
+        $this->types = $types;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function seek($rownum = 0)
+
+    /**
+     * Seek to a specific row in a result set
+     *
+     * @param   int     number of the row where the data can be found
+     *
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function seek($rownum = 0)
+    {
+        $target_rownum = $rownum - 1;
+        if ($this->rownum > $target_rownum) {
+            return $this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'seeking to previous rows not implemented', __FUNCTION__);
+        }
+        while ($this->rownum < $target_rownum) {
+            $this->fetchRow();
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function &fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
+
+    /**
+     * Fetch and return a row of data
+     *
+     * @param   int     how the array data should be indexed
+     * @param   int     number of the row where the data can be found
+     *
+     * @return  int     data array on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function &fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
+    {
+        $err =$this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+        return $err;
+    }
+
+    // }}}
+    // {{{ function fetchOne($colnum = 0)
+
+    /**
+     * fetch single column from the next row from a result set
+     *
+     * @param int|string the column number (or name) to fetch
+     * @param int        number of the row where the data can be found
+     *
+     * @return string data on success, a MDB2 error on failure
+     * @access  public
+     */
+    function fetchOne($colnum = 0, $rownum = null)
+    {
+        $fetchmode = is_numeric($colnum) ? MDB2_FETCHMODE_ORDERED : MDB2_FETCHMODE_ASSOC;
+        $row = $this->fetchRow($fetchmode, $rownum);
+        if (!is_array($row) || PEAR::isError($row)) {
+            return $row;
+        }
+        if (!array_key_exists($colnum, $row)) {
+            return $this->db->raiseError(MDB2_ERROR_TRUNCATED, null, null,
+                'column is not defined in the result set: '.$colnum, __FUNCTION__);
+        }
+        return $row[$colnum];
+    }
+
+    // }}}
+    // {{{ function fetchCol($colnum = 0)
+
+    /**
+     * Fetch and return a column from the current row pointer position
+     *
+     * @param int|string the column number (or name) to fetch
+     *
+     * @return  mixed data array on success, a MDB2 error on failure
+     * @access  public
+     */
+    function fetchCol($colnum = 0)
+    {
+        $column = array();
+        $fetchmode = is_numeric($colnum) ? MDB2_FETCHMODE_ORDERED : MDB2_FETCHMODE_ASSOC;
+        $row = $this->fetchRow($fetchmode);
+        if (is_array($row)) {
+            if (!array_key_exists($colnum, $row)) {
+                return $this->db->raiseError(MDB2_ERROR_TRUNCATED, null, null,
+                    'column is not defined in the result set: '.$colnum, __FUNCTION__);
+            }
+            do {
+                $column[] = $row[$colnum];
+            } while (is_array($row = $this->fetchRow($fetchmode)));
+        }
+        if (PEAR::isError($row)) {
+            return $row;
+        }
+        return $column;
+    }
+
+    // }}}
+    // {{{ function fetchAll($fetchmode = MDB2_FETCHMODE_DEFAULT, $rekey = false, $force_array = false, $group = false)
+
+    /**
+     * Fetch and return all rows from the current row pointer position
+     *
+     * @param   int     $fetchmode  the fetch mode to use:
+     *                            + MDB2_FETCHMODE_ORDERED
+     *                            + MDB2_FETCHMODE_ASSOC
+     *                            + MDB2_FETCHMODE_ORDERED | MDB2_FETCHMODE_FLIPPED
+     *                            + MDB2_FETCHMODE_ASSOC | MDB2_FETCHMODE_FLIPPED
+     * @param   bool    if set to true, the $all will have the first
+     *       column as its first dimension
+     * @param   bool    used only when the query returns exactly
+     *       two columns. If true, the values of the returned array will be
+     *       one-element arrays instead of scalars.
+     * @param   bool    if true, the values of the returned array is
+     *       wrapped in another array.  If the same key value (in the first
+     *       column) repeats itself, the values will be appended to this array
+     *       instead of overwriting the existing values.
+     *
+     * @return  mixed   data array on success, a MDB2 error on failure
+     *
+     * @access  public
+     * @see     getAssoc()
+     */
+    function fetchAll($fetchmode = MDB2_FETCHMODE_DEFAULT, $rekey = false,
+        $force_array = false, $group = false)
+    {
+        $all = array();
+        $row = $this->fetchRow($fetchmode);
+        if (PEAR::isError($row)) {
+            return $row;
+        } elseif (!$row) {
+            return $all;
+        }
+
+        $shift_array = $rekey ? false : null;
+        if (!is_null($shift_array)) {
+            if (is_object($row)) {
+                $colnum = count(get_object_vars($row));
+            } else {
+                $colnum = count($row);
+            }
+            if ($colnum < 2) {
+                return $this->db->raiseError(MDB2_ERROR_TRUNCATED, null, null,
+                    'rekey feature requires atleast 2 column', __FUNCTION__);
+            }
+            $shift_array = (!$force_array && $colnum == 2);
+        }
+
+        if ($rekey) {
+            do {
+                if (is_object($row)) {
+                    $arr = get_object_vars($row);
+                    $key = reset($arr);
+                    unset($row->{$key});
+                } else {
+                    if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
+                        $key = reset($row);
+                        unset($row[key($row)]);
+                    } else {
+                        $key = array_shift($row);
+                    }
+                    if ($shift_array) {
+                        $row = array_shift($row);
+                    }
+                }
+                if ($group) {
+                    $all[$key][] = $row;
+                } else {
+                    $all[$key] = $row;
+                }
+            } while (($row = $this->fetchRow($fetchmode)));
+        } elseif ($fetchmode & MDB2_FETCHMODE_FLIPPED) {
+            do {
+                foreach ($row as $key => $val) {
+                    $all[$key][] = $val;
+                }
+            } while (($row = $this->fetchRow($fetchmode)));
+        } else {
+            do {
+                $all[] = $row;
+            } while (($row = $this->fetchRow($fetchmode)));
+        }
+
+        return $all;
+    }
+
+    // }}}
+    // {{{ function rowCount()
+    /**
+     * Returns the actual row number that was last fetched (count from 0)
+     * @return  int
+     *
+     * @access  public
+     */
+    function rowCount()
+    {
+        return $this->rownum + 1;
+    }
+
+    // }}}
+    // {{{ function numRows()
+
+    /**
+     * Returns the number of rows in a result object
+     *
+     * @return  mixed   MDB2 Error Object or the number of rows
+     *
+     * @access  public
+     */
+    function numRows()
+    {
+        return $this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ function nextResult()
+
+    /**
+     * Move the internal result pointer to the next available result
+     *
+     * @return  true on success, false if there is no more result set or an error object on failure
+     *
+     * @access  public
+     */
+    function nextResult()
+    {
+        return $this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ function getColumnNames()
+
+    /**
+     * Retrieve the names of columns returned by the DBMS in a query result or
+     * from the cache.
+     *
+     * @param   bool    If set to true the values are the column names,
+     *                  otherwise the names of the columns are the keys.
+     * @return  mixed   Array variable that holds the names of columns or an
+     *                  MDB2 error on failure.
+     *                  Some DBMS may not return any columns when the result set
+     *                  does not contain any rows.
+     *
+     * @access  public
+     */
+    function getColumnNames($flip = false)
+    {
+        if (!isset($this->column_names)) {
+            $result = $this->_getColumnNames();
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+            $this->column_names = $result;
+        }
+        if ($flip) {
+            return array_flip($this->column_names);
+        }
+        return $this->column_names;
+    }
+
+    // }}}
+    // {{{ function _getColumnNames()
+
+    /**
+     * Retrieve the names of columns returned by the DBMS in a query result.
+     *
+     * @return  mixed   Array variable that holds the names of columns as keys
+     *                  or an MDB2 error on failure.
+     *                  Some DBMS may not return any columns when the result set
+     *                  does not contain any rows.
+     *
+     * @access  private
+     */
+    function _getColumnNames()
+    {
+        return $this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ function numCols()
+
+    /**
+     * Count the number of columns returned by the DBMS in a query result.
+     *
+     * @return  mixed   integer value with the number of columns, a MDB2 error
+     *       on failure
+     *
+     * @access  public
+     */
+    function numCols()
+    {
+        return $this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ function getResource()
+
+    /**
+     * return the resource associated with the result object
+     *
+     * @return  resource
+     *
+     * @access  public
+     */
+    function getResource()
+    {
+        return $this->result;
+    }
+
+    // }}}
+    // {{{ function bindColumn($column, &$value, $type = null)
+
+    /**
+     * Set bind variable to a column.
+     *
+     * @param   int     column number or name
+     * @param   mixed   variable reference
+     * @param   string  specifies the type of the field
+     *
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function bindColumn($column, &$value, $type = null)
+    {
+        if (!is_numeric($column)) {
+            $column_names = $this->getColumnNames();
+            if ($this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+                if ($this->db->options['field_case'] == CASE_LOWER) {
+                    $column = strtolower($column);
+                } else {
+                    $column = strtoupper($column);
+                }
+            }
+            $column = $column_names[$column];
+        }
+        $this->values[$column] =$value;
+        if (!is_null($type)) {
+            $this->types[$column] = $type;
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function _assignBindColumns($row)
+
+    /**
+     * Bind a variable to a value in the result row.
+     *
+     * @param   array   row data
+     *
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  private
+     */
+    function _assignBindColumns($row)
+    {
+        $row = array_values($row);
+        foreach ($row as $column => $value) {
+            if (array_key_exists($column, $this->values)) {
+                $this->values[$column] = $value;
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function free()
+
+    /**
+     * Free the internal resources associated with result.
+     *
+     * @return  bool    true on success, false if result is invalid
+     *
+     * @access  public
+     */
+    function free()
+    {
+        $this->result = false;
+        return MDB2_OK;
+    }
+
+    // }}}
+}
+
+// }}}
+// {{{ class MDB2_Row
+
+/**
+ * The simple class that accepts row data as an array
+ *
+ * @package     MDB2
+ * @category    Database
+ * @author      Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Row
+{
+    // {{{ constructor: function __construct(&$row)
+
+    /**
+     * constructor
+     *
+     * @param   resource    row data as array
+     */
+    function __construct(&$row)
+    {
+        foreach ($row as $key => $value) {
+            $this->$key = &$row[$key];
+        }
+    }
+}
+
+// }}}
+// {{{ class MDB2_Statement_Common
+
+/**
+ * The common statement class for MDB2 statement objects
+ *
+ * @package     MDB2
+ * @category    Database
+ * @author      Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Statement_Common
+{
+    // {{{ Variables (Properties)
+
+    var $db;
+    var $statement;
+    var $query;
+    var $result_types;
+    var $types;
+    var $values = array();
+    var $limit;
+    var $offset;
+    var $is_manip;
+
+    // }}}
+    // {{{ constructor: function __construct(&$db, &$statement, $positions, $query, $types, $result_types, $is_manip = false, $limit = null, $offset = null)
+
+    /**
+     * Constructor
+     */
+    function __construct(&$db, &$statement, $positions, $query, $types, $result_types, $is_manip = false, $limit = null, $offset = null)
+    {
+        $this->db =$db;
+        $this->statement =$statement;
+        $this->positions = $positions;
+        $this->query = $query;
+        $this->types = (array)$types;
+        $this->result_types = (array)$result_types;
+        $this->limit = $limit;
+        $this->is_manip = $is_manip;
+        $this->offset = $offset;
+    }
+
+
+    // }}}
+    // {{{ function bindValue($parameter, &$value, $type = null)
+
+    /**
+     * Set the value of a parameter of a prepared query.
+     *
+     * @param   int     the order number of the parameter in the query
+     *       statement. The order number of the first parameter is 1.
+     * @param   mixed   value that is meant to be assigned to specified
+     *       parameter. The type of the value depends on the $type argument.
+     * @param   string  specifies the type of the field
+     *
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function bindValue($parameter, $value, $type = null)
+    {
+        if (!is_numeric($parameter)) {
+            $parameter = preg_replace('/^:(.*)$/', '\\1', $parameter);
+        }
+        if (!in_array($parameter, $this->positions)) {
+            return $this->db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                'Unable to bind to missing placeholder: '.$parameter, __FUNCTION__);
+        }
+        $this->values[$parameter] = $value;
+        if (!is_null($type)) {
+            $this->types[$parameter] = $type;
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function bindValueArray($values, $types = null)
+
+    /**
+     * Set the values of multiple a parameter of a prepared query in bulk.
+     *
+     * @param   array   specifies all necessary information
+     *       for bindValue() the array elements must use keys corresponding to
+     *       the number of the position of the parameter.
+     * @param   array   specifies the types of the fields
+     *
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     * @see     bindParam()
+     */
+    function bindValueArray($values, $types = null)
+    {
+        $types = is_array($types) ? array_values($types) : array_fill(0, count($values), null);
+        $parameters = array_keys($values);
+        foreach ($parameters as $key => $parameter) {
+            $this->db->pushErrorHandling(PEAR_ERROR_RETURN);
+            $this->db->expectError(MDB2_ERROR_NOT_FOUND);
+            $err = $this->bindValue($parameter, $values[$parameter], $types[$key]);
+            $this->db->popExpect();
+            $this->db->popErrorHandling();
+            if (PEAR::isError($err)) {
+                if ($err->getCode() == MDB2_ERROR_NOT_FOUND) {
+                    //ignore (extra value for missing placeholder)
+                    continue;
+                }
+                return $err;
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function bindParam($parameter, &$value, $type = null)
+
+    /**
+     * Bind a variable to a parameter of a prepared query.
+     *
+     * @param   int     the order number of the parameter in the query
+     *       statement. The order number of the first parameter is 1.
+     * @param   mixed   variable that is meant to be bound to specified
+     *       parameter. The type of the value depends on the $type argument.
+     * @param   string  specifies the type of the field
+     *
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function bindParam($parameter, &$value, $type = null)
+    {
+        if (!is_numeric($parameter)) {
+            $parameter = preg_replace('/^:(.*)$/', '\\1', $parameter);
+        }
+        if (!in_array($parameter, $this->positions)) {
+            return $this->db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                'Unable to bind to missing placeholder: '.$parameter, __FUNCTION__);
+        }
+        $this->values[$parameter] =$value;
+        if (!is_null($type)) {
+            $this->types[$parameter] = $type;
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function bindParamArray(&$values, $types = null)
+
+    /**
+     * Bind the variables of multiple a parameter of a prepared query in bulk.
+     *
+     * @param   array   specifies all necessary information
+     *       for bindParam() the array elements must use keys corresponding to
+     *       the number of the position of the parameter.
+     * @param   array   specifies the types of the fields
+     *
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     * @see     bindParam()
+     */
+    function bindParamArray(&$values, $types = null)
+    {
+        $types = is_array($types) ? array_values($types) : array_fill(0, count($values), null);
+        $parameters = array_keys($values);
+        foreach ($parameters as $key => $parameter) {
+            $err = $this->bindParam($parameter, $values[$parameter], $types[$key]);
+            if (PEAR::isError($err)) {
+                return $err;
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function &execute($values = null, $result_class = true, $result_wrap_class = false)
+
+    /**
+     * Execute a prepared query statement.
+     *
+     * @param array specifies all necessary information
+     *              for bindParam() the array elements must use keys corresponding
+     *              to the number of the position of the parameter.
+     * @param mixed specifies which result class to use
+     * @param mixed specifies which class to wrap results in
+     *
+     * @return mixed MDB2_Result or integer (affected rows) on success,
+     *               a MDB2 error on failure
+     * @access public
+     */
+    function &execute($values = null, $result_class = true, $result_wrap_class = false)
+    {
+        if (is_null($this->positions)) {
+            return $this->db->raiseError(MDB2_ERROR, null, null,
+                'Prepared statement has already been freed', __FUNCTION__);
+        }
+
+        $values = (array)$values;
+        if (!empty($values)) {
+            $err = $this->bindValueArray($values);
+            if (PEAR::isError($err)) {
+                return $this->db->raiseError(MDB2_ERROR, null, null,
+                                            'Binding Values failed with message: ' . $err->getMessage(), __FUNCTION__);
+            }
+        }
+        $result =$this->_execute($result_class, $result_wrap_class);
+        return $result;
+    }
+
+    // }}}
+    // {{{ function &_execute($result_class = true, $result_wrap_class = false)
+
+    /**
+     * Execute a prepared query statement helper method.
+     *
+     * @param   mixed   specifies which result class to use
+     * @param   mixed   specifies which class to wrap results in
+     *
+     * @return mixed MDB2_Result or integer (affected rows) on success,
+     *               a MDB2 error on failure
+     * @access  private
+     */
+    function &_execute($result_class = true, $result_wrap_class = false)
+    {
+        $this->last_query = $this->query;
+        $query = '';
+        $last_position = 0;
+        foreach ($this->positions as $current_position => $parameter) {
+            if (!array_key_exists($parameter, $this->values)) {
+                return $this->db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                    'Unable to bind to missing placeholder: '.$parameter, __FUNCTION__);
+            }
+            $value = $this->values[$parameter];
+            $query.= substr($this->query, $last_position, $current_position - $last_position);
+            if (!isset($value)) {
+                $value_quoted = 'NULL';
+            } else {
+                $type = !empty($this->types[$parameter]) ? $this->types[$parameter] : null;
+                $value_quoted = $this->db->quote($value, $type);
+                if (PEAR::isError($value_quoted)) {
+                    return $value_quoted;
+                }
+            }
+            $query.= $value_quoted;
+            $last_position = $current_position + 1;
+        }
+        $query.= substr($this->query, $last_position);
+
+        $this->db->offset = $this->offset;
+        $this->db->limit = $this->limit;
+        if ($this->is_manip) {
+            $result = $this->db->exec($query);
+        } else {
+            $result =$this->db->query($query, $this->result_types, $result_class, $result_wrap_class);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ function free()
+
+    /**
+     * Release resources allocated for the specified prepared query.
+     *
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function free()
+    {
+        if (is_null($this->positions)) {
+            return $this->db->raiseError(MDB2_ERROR, null, null,
+                'Prepared statement has already been freed', __FUNCTION__);
+        }
+
+        $this->statement = null;
+        $this->positions = null;
+        $this->query = null;
+        $this->types = null;
+        $this->result_types = null;
+        $this->limit = null;
+        $this->is_manip = null;
+        $this->offset = null;
+        $this->values = null;
+
+        return MDB2_OK;
+    }
+
+    // }}}
+}
+
+// }}}
+// {{{ class MDB2_Module_Common
+
+/**
+ * The common modules class for MDB2 module objects
+ *
+ * @package     MDB2
+ * @category    Database
+ * @author      Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Module_Common
+{
+    // {{{ Variables (Properties)
+
+    /**
+     * contains the key to the global MDB2 instance array of the associated
+     * MDB2 instance
+     *
+     * @var     int
+     * @access  protected
+     */
+    var $db_index;
+
+    // }}}
+    // {{{ constructor: function __construct($db_index)
+
+    /**
+     * Constructor
+     */
+    function __construct($db_index)
+    {
+        $this->db_index = $db_index;
+    }
+
+    // }}}
+    // {{{ function &getDBInstance()
+
+    /**
+     * Get the instance of MDB2 associated with the module instance
+     *
+     * @return  object  MDB2 instance or a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function getDBInstance()
+    {
+        if (isset($GLOBALS['_MDB2_databases'][$this->db_index])) {
+            $result =$GLOBALS['_MDB2_databases'][$this->db_index];
+        } else {
+            $result =$this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                'could not find MDB2 instance');
+        }
+        return $result;
+    }
+
+    // }}}
+}
+
+// }}}
+// {{{ function MDB2_closeOpenTransactions()
+
+/**
+ * Close any open transactions form persistent connections
+ *
+ * @return  void
+ *
+ * @access  public
+ */
+
+function MDB2_closeOpenTransactions()
+{
+    reset($GLOBALS['_MDB2_databases']);
+    while (next($GLOBALS['_MDB2_databases'])) {
+        $key = key($GLOBALS['_MDB2_databases']);
+        if ($GLOBALS['_MDB2_databases'][$key]->opened_persistent
+            && $GLOBALS['_MDB2_databases'][$key]->in_transaction
+        ) {
+            $GLOBALS['_MDB2_databases'][$key]->rollback();
+        }
+    }
+}
+
+// }}}
+// {{{ function MDB2_defaultDebugOutput(&$db, $scope, $message, $is_manip = null)
+
+/**
+ * default debug output handler
+ *
+ * @param   object  reference to an MDB2 database object
+ * @param   string  usually the method name that triggered the debug call:
+ *                  for example 'query', 'prepare', 'execute', 'parameters',
+ *                  'beginTransaction', 'commit', 'rollback'
+ * @param   string  message that should be appended to the debug variable
+ * @param   array   contains context information about the debug() call
+ *                  common keys are: is_manip, time, result etc.
+ *
+ * @return  void|string optionally return a modified message, this allows
+ *                      rewriting a query before being issued or prepared
+ *
+ * @access  public
+ */
+function MDB2_defaultDebugOutput(&$db, $scope, $message, $context = array())
+{
+    $db->debug_output.= $scope.'('.$db->db_index.'): ';
+    $db->debug_output.= $message.$db->getOption('log_line_break');
+    return $message;
+}
+
+// }}}
+?>
diff --git a/3rdparty/MDB2/Date.php b/3rdparty/MDB2/Date.php
new file mode 100644
index 00000000000..ce846543a50
--- /dev/null
+++ b/3rdparty/MDB2/Date.php
@@ -0,0 +1,183 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: Date.php,v 1.10 2006/03/01 12:15:32 lsmith Exp $
+//
+
+/**
+ * @package  MDB2
+ * @category Database
+ * @author   Lukas Smith <smith@pooteeweet.org>
+ */
+
+/**
+ * Several methods to convert the MDB2 native timestamp format (ISO based)
+ * to and from data structures that are convenient to worth with in side of php.
+ * For more complex date arithmetic please take a look at the Date package in PEAR
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Date
+{
+    // {{{ mdbNow()
+
+    /**
+     * return the current datetime
+     *
+     * @return string current datetime in the MDB2 format
+     * @access public
+     */
+    function mdbNow()
+    {
+        return date('Y-m-d H:i:s');
+    }
+    // }}}
+
+    // {{{ mdbToday()
+
+    /**
+     * return the current date
+     *
+     * @return string current date in the MDB2 format
+     * @access public
+     */
+    function mdbToday()
+    {
+        return date('Y-m-d');
+    }
+    // }}}
+
+    // {{{ mdbTime()
+
+    /**
+     * return the current time
+     *
+     * @return string current time in the MDB2 format
+     * @access public
+     */
+    function mdbTime()
+    {
+        return date('H:i:s');
+    }
+    // }}}
+
+    // {{{ date2Mdbstamp()
+
+    /**
+     * convert a date into a MDB2 timestamp
+     *
+     * @param int hour of the date
+     * @param int minute of the date
+     * @param int second of the date
+     * @param int month of the date
+     * @param int day of the date
+     * @param int year of the date
+     *
+     * @return string a valid MDB2 timestamp
+     * @access public
+     */
+    function date2Mdbstamp($hour = null, $minute = null, $second = null,
+        $month = null, $day = null, $year = null)
+    {
+        return MDB2_Date::unix2Mdbstamp(mktime($hour, $minute, $second, $month, $day, $year, -1));
+    }
+    // }}}
+
+    // {{{ unix2Mdbstamp()
+
+    /**
+     * convert a unix timestamp into a MDB2 timestamp
+     *
+     * @param int a valid unix timestamp
+     *
+     * @return string a valid MDB2 timestamp
+     * @access public
+     */
+    function unix2Mdbstamp($unix_timestamp)
+    {
+        return date('Y-m-d H:i:s', $unix_timestamp);
+    }
+    // }}}
+
+    // {{{ mdbstamp2Unix()
+
+    /**
+     * convert a MDB2 timestamp into a unix timestamp
+     *
+     * @param int a valid MDB2 timestamp
+     * @return string unix timestamp with the time stored in the MDB2 format
+     *
+     * @access public
+     */
+    function mdbstamp2Unix($mdb_timestamp)
+    {
+        $arr = MDB2_Date::mdbstamp2Date($mdb_timestamp);
+
+        return mktime($arr['hour'], $arr['minute'], $arr['second'], $arr['month'], $arr['day'], $arr['year'], -1);
+    }
+    // }}}
+
+    // {{{ mdbstamp2Date()
+
+    /**
+     * convert a MDB2 timestamp into an array containing all
+     * values necessary to pass to php's date() function
+     *
+     * @param int a valid MDB2 timestamp
+     *
+     * @return array with the time split
+     * @access public
+     */
+    function mdbstamp2Date($mdb_timestamp)
+    {
+        list($arr['year'], $arr['month'], $arr['day'], $arr['hour'], $arr['minute'], $arr['second']) =
+            sscanf($mdb_timestamp, "%04u-%02u-%02u %02u:%02u:%02u");
+        return $arr;
+    }
+    // }}}
+}
+
+?>
diff --git a/3rdparty/MDB2/Driver/Datatype/Common.php b/3rdparty/MDB2/Driver/Datatype/Common.php
new file mode 100644
index 00000000000..85a74f64fca
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Datatype/Common.php
@@ -0,0 +1,1824 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: Common.php,v 1.139 2008/12/04 11:50:42 afz Exp $
+
+require_once('MDB2/LOB.php');
+
+/**
+ * @package  MDB2
+ * @category Database
+ * @author   Lukas Smith <smith@pooteeweet.org>
+ */
+
+/**
+ * MDB2_Driver_Common: Base class that is extended by each MDB2 driver
+ *
+ * To load this module in the MDB2 object:
+ * $mdb->loadModule('Datatype');
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Datatype_Common extends MDB2_Module_Common
+{
+    var $valid_default_values = array(
+        'text'      => '',
+        'boolean'   => true,
+        'integer'   => 0,
+        'decimal'   => 0.0,
+        'float'     => 0.0,
+        'timestamp' => '1970-01-01 00:00:00',
+        'time'      => '00:00:00',
+        'date'      => '1970-01-01',
+        'clob'      => '',
+        'blob'      => '',
+    );
+
+    /**
+     * contains all LOB objects created with this MDB2 instance
+     * @var array
+     * @access protected
+     */
+    var $lobs = array();
+
+    // }}}
+    // {{{ getValidTypes()
+
+    /**
+     * Get the list of valid types
+     *
+     * This function returns an array of valid types as keys with the values
+     * being possible default values for all native datatypes and mapped types
+     * for custom datatypes.
+     *
+     * @return mixed array on success, a MDB2 error on failure
+     * @access public
+     */
+    function getValidTypes()
+    {
+        $types = $this->valid_default_values;
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        if (!empty($db->options['datatype_map'])) {
+            foreach ($db->options['datatype_map'] as $type => $mapped_type) {
+                if (array_key_exists($mapped_type, $types)) {
+                    $types[$type] = $types[$mapped_type];
+                } elseif (!empty($db->options['datatype_map_callback'][$type])) {
+                    $parameter = array('type' => $type, 'mapped_type' => $mapped_type);
+                    $default =  call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
+                    $types[$type] = $default;
+                }
+            }
+        }
+        return $types;
+    }
+
+    // }}}
+    // {{{ checkResultTypes()
+
+    /**
+     * Define the list of types to be associated with the columns of a given
+     * result set.
+     *
+     * This function may be called before invoking fetchRow(), fetchOne()
+     * fetchCole() and fetchAll() so that the necessary data type
+     * conversions are performed on the data to be retrieved by them. If this
+     * function is not called, the type of all result set columns is assumed
+     * to be text, thus leading to not perform any conversions.
+     *
+     * @param array $types array variable that lists the
+     *       data types to be expected in the result set columns. If this array
+     *       contains less types than the number of columns that are returned
+     *       in the result set, the remaining columns are assumed to be of the
+     *       type text. Currently, the types clob and blob are not fully
+     *       supported.
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function checkResultTypes($types)
+    {
+        $types = is_array($types) ? $types : array($types);
+        foreach ($types as $key => $type) {
+            if (!isset($this->valid_default_values[$type])) {
+                $db =$this->getDBInstance();
+                if (PEAR::isError($db)) {
+                    return $db;
+                }
+                if (empty($db->options['datatype_map'][$type])) {
+                    return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                        $type.' for '.$key.' is not a supported column type', __FUNCTION__);
+                }
+            }
+        }
+        return $types;
+    }
+
+    // }}}
+    // {{{ _baseConvertResult()
+
+    /**
+     * General type conversion method
+     *
+     * @param mixed   $value reference to a value to be converted
+     * @param string  $type  specifies which type to convert to
+     * @param boolean $rtrim [optional] when TRUE [default], apply rtrim() to text
+     * @return object an MDB2 error on failure
+     * @access protected
+     */
+    function _baseConvertResult($value, $type, $rtrim = true)
+    {
+        switch ($type) {
+        case 'text':
+            if ($rtrim) {
+                $value = rtrim($value);
+            }
+            return $value;
+        case 'integer':
+            return intval($value);
+        case 'boolean':
+            return !empty($value);
+        case 'decimal':
+            return $value;
+        case 'float':
+            return doubleval($value);
+        case 'date':
+            return $value;
+        case 'time':
+            return $value;
+        case 'timestamp':
+            return $value;
+        case 'clob':
+        case 'blob':
+            $this->lobs[] = array(
+                'buffer' => null,
+                'position' => 0,
+                'lob_index' => null,
+                'endOfLOB' => false,
+                'resource' => $value,
+                'value' => null,
+                'loaded' => false,
+            );
+            end($this->lobs);
+            $lob_index = key($this->lobs);
+            $this->lobs[$lob_index]['lob_index'] = $lob_index;
+            return fopen('MDB2LOB://'.$lob_index.'@'.$this->db_index, 'r+');
+        }
+
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_INVALID, null, null,
+            'attempt to convert result value to an unknown type :' . $type, __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ convertResult()
+
+    /**
+     * Convert a value to a RDBMS indipendent MDB2 type
+     *
+     * @param mixed   $value value to be converted
+     * @param string  $type  specifies which type to convert to
+     * @param boolean $rtrim [optional] when TRUE [default], apply rtrim() to text
+     * @return mixed converted value
+     * @access public
+     */
+    function convertResult($value, $type, $rtrim = true)
+    {
+        if (is_null($value)) {
+            return null;
+        }
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        if (!empty($db->options['datatype_map'][$type])) {
+            $type = $db->options['datatype_map'][$type];
+            if (!empty($db->options['datatype_map_callback'][$type])) {
+                $parameter = array('type' => $type, 'value' => $value, 'rtrim' => $rtrim);
+                return call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
+            }
+        }
+        return $this->_baseConvertResult($value, $type, $rtrim);
+    }
+
+    // }}}
+    // {{{ convertResultRow()
+
+    /**
+     * Convert a result row
+     *
+     * @param array   $types
+     * @param array   $row   specifies the types to convert to
+     * @param boolean $rtrim [optional] when TRUE [default], apply rtrim() to text
+     * @return mixed MDB2_OK on success, an MDB2 error on failure
+     * @access public
+     */
+    function convertResultRow($types, $row, $rtrim = true)
+    {
+        $types = $this->_sortResultFieldTypes(array_keys($row), $types);
+        foreach ($row as $key => $value) {
+            if (empty($types[$key])) {
+                continue;
+            }
+            $value = $this->convertResult($row[$key], $types[$key], $rtrim);
+            if (PEAR::isError($value)) {
+                return $value;
+            }
+            $row[$key] = $value;
+        }
+        return $row;
+    }
+
+    // }}}
+    // {{{ _sortResultFieldTypes()
+
+    /**
+     * convert a result row
+     *
+     * @param array $types
+     * @param array $row specifies the types to convert to
+     * @param bool   $rtrim   if to rtrim text values or not
+     * @return mixed MDB2_OK on success,  a MDB2 error on failure
+     * @access public
+     */
+    function _sortResultFieldTypes($columns, $types)
+    {
+        $n_cols = count($columns);
+        $n_types = count($types);
+        if ($n_cols > $n_types) {
+            for ($i= $n_cols - $n_types; $i >= 0; $i--) {
+                $types[] = null;
+            }
+        }
+        $sorted_types = array();
+        foreach ($columns as $col) {
+            $sorted_types[$col] = null;
+        }
+        foreach ($types as $name => $type) {
+            if (array_key_exists($name, $sorted_types)) {
+                $sorted_types[$name] = $type;
+                unset($types[$name]);
+            }
+        }
+        // if there are left types in the array, fill the null values of the
+        // sorted array with them, in order.
+        if (count($types)) {
+            reset($types);
+            foreach (array_keys($sorted_types) as $k) {
+                if (is_null($sorted_types[$k])) {
+                    $sorted_types[$k] = current($types);
+                    next($types);
+                }
+            }
+        }
+        return $sorted_types;
+    }
+
+    // }}}
+    // {{{ getDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare
+     * of the given type
+     *
+     * @param string $type type to which the value should be converted to
+     * @param string  $name   name the field to be declared.
+     * @param string  $field  definition of the field
+     * @return string  DBMS specific SQL code portion that should be used to
+     *                 declare the specified field.
+     * @access public
+     */
+    function getDeclaration($type, $name, $field)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (!empty($db->options['datatype_map'][$type])) {
+            $type = $db->options['datatype_map'][$type];
+            if (!empty($db->options['datatype_map_callback'][$type])) {
+                $parameter = array('type' => $type, 'name' => $name, 'field' => $field);
+                return call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
+            }
+            $field['type'] = $type;
+        }
+
+        if (!method_exists($this, "_get{$type}Declaration")) {
+            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                'type not defined: '.$type, __FUNCTION__);
+        }
+        return $this->{"_get{$type}Declaration"}($name, $field);
+    }
+
+    // }}}
+    // {{{ getTypeDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare an text type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param array $field  associative array with the name of the properties
+     *      of the field being declared as array indexes. Currently, the types
+     *      of supported field properties are as follows:
+     *
+     *      length
+     *          Integer value that determines the maximum length of the text
+     *          field. If this argument is missing the field should be
+     *          declared to have the longest length allowed by the DBMS.
+     *
+     *      default
+     *          Text value to be used as default for this field.
+     *
+     *      notnull
+     *          Boolean flag that indicates whether this field is constrained
+     *          to not be set to null.
+     * @return string  DBMS specific SQL code portion that should be used to
+     *      declare the specified field.
+     * @access public
+     */
+    function getTypeDeclaration($field)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        switch ($field['type']) {
+        case 'text':
+            $length = !empty($field['length']) ? $field['length'] : $db->options['default_text_field_length'];
+            $fixed = !empty($field['fixed']) ? $field['fixed'] : false;
+            return $fixed ? ($length ? 'CHAR('.$length.')' : 'CHAR('.$db->options['default_text_field_length'].')')
+                : ($length ? 'VARCHAR('.$length.')' : 'TEXT');
+        case 'clob':
+            return 'TEXT';
+        case 'blob':
+            return 'TEXT';
+        case 'integer':
+            return 'INT';
+        case 'boolean':
+            return 'INT';
+        case 'date':
+            return 'CHAR ('.strlen('YYYY-MM-DD').')';
+        case 'time':
+            return 'CHAR ('.strlen('HH:MM:SS').')';
+        case 'timestamp':
+            return 'CHAR ('.strlen('YYYY-MM-DD HH:MM:SS').')';
+        case 'float':
+            return 'TEXT';
+        case 'decimal':
+            return 'TEXT';
+        }
+        return '';
+    }
+
+    // }}}
+    // {{{ _getDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare a generic type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param string $name   name the field to be declared.
+     * @param array  $field  associative array with the name of the properties
+     *      of the field being declared as array indexes. Currently, the types
+     *      of supported field properties are as follows:
+     *
+     *      length
+     *          Integer value that determines the maximum length of the text
+     *          field. If this argument is missing the field should be
+     *          declared to have the longest length allowed by the DBMS.
+     *
+     *      default
+     *          Text value to be used as default for this field.
+     *
+     *      notnull
+     *          Boolean flag that indicates whether this field is constrained
+     *          to not be set to null.
+     *      charset
+     *          Text value with the default CHARACTER SET for this field.
+     *      collation
+     *          Text value with the default COLLATION for this field.
+     * @return string  DBMS specific SQL code portion that should be used to
+     *      declare the specified field, or a MDB2_Error on failure
+     * @access protected
+     */
+    function _getDeclaration($name, $field)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $name = $db->quoteIdentifier($name, true);
+        $declaration_options = $db->datatype->_getDeclarationOptions($field);
+        if (PEAR::isError($declaration_options)) {
+            return $declaration_options;
+        }
+        return $name.' '.$this->getTypeDeclaration($field).$declaration_options;
+    }
+
+    // }}}
+    // {{{ _getDeclarationOptions()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare a generic type
+     * field to be used in statement like CREATE TABLE, without the field name
+     * and type values (ie. just the character set, default value, if the
+     * field is permitted to be NULL or not, and the collation options).
+     *
+     * @param array  $field  associative array with the name of the properties
+     *      of the field being declared as array indexes. Currently, the types
+     *      of supported field properties are as follows:
+     *
+     *      default
+     *          Text value to be used as default for this field.
+     *      notnull
+     *          Boolean flag that indicates whether this field is constrained
+     *          to not be set to null.
+     *      charset
+     *          Text value with the default CHARACTER SET for this field.
+     *      collation
+     *          Text value with the default COLLATION for this field.
+     * @return string  DBMS specific SQL code portion that should be used to
+     *      declare the specified field's options.
+     * @access protected
+     */
+    function _getDeclarationOptions($field)
+    {
+        $charset = empty($field['charset']) ? '' :
+            ' '.$this->_getCharsetFieldDeclaration($field['charset']);
+
+        $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
+        $default = '';
+        if (array_key_exists('default', $field)) {
+            if ($field['default'] === '') {
+                $db =$this->getDBInstance();
+                if (PEAR::isError($db)) {
+                    return $db;
+                }
+                $valid_default_values = $this->getValidTypes();
+                $field['default'] = $valid_default_values[$field['type']];
+                if ($field['default'] === ''&& ($db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL)) {
+                    $field['default'] = ' ';
+                }
+            }
+            if (!is_null($field['default'])) {
+                $default = ' DEFAULT ' . $this->quote($field['default'], $field['type']);
+            }
+        }
+
+        $collation = empty($field['collation']) ? '' :
+            ' '.$this->_getCollationFieldDeclaration($field['collation']);
+
+        return $charset.$default.$notnull.$collation;
+    }
+
+    // }}}
+    // {{{ _getCharsetFieldDeclaration()
+    
+    /**
+     * Obtain DBMS specific SQL code portion needed to set the CHARACTER SET
+     * of a field declaration to be used in statements like CREATE TABLE.
+     *
+     * @param string $charset   name of the charset
+     * @return string  DBMS specific SQL code portion needed to set the CHARACTER SET
+     *                 of a field declaration.
+     */
+    function _getCharsetFieldDeclaration($charset)
+    {
+        return '';
+    }
+
+    // }}}
+    // {{{ _getCollationFieldDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to set the COLLATION
+     * of a field declaration to be used in statements like CREATE TABLE.
+     *
+     * @param string $collation   name of the collation
+     * @return string  DBMS specific SQL code portion needed to set the COLLATION
+     *                 of a field declaration.
+     */
+    function _getCollationFieldDeclaration($collation)
+    {
+        return '';
+    }
+
+    // }}}
+    // {{{ _getIntegerDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare an integer type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param string $name name the field to be declared.
+     * @param array $field associative array with the name of the properties
+     *       of the field being declared as array indexes. Currently, the types
+     *       of supported field properties are as follows:
+     *
+     *       unsigned
+     *           Boolean flag that indicates whether the field should be
+     *           declared as unsigned integer if possible.
+     *
+     *       default
+     *           Integer value to be used as default for this field.
+     *
+     *       notnull
+     *           Boolean flag that indicates whether this field is constrained
+     *           to not be set to null.
+     * @return string DBMS specific SQL code portion that should be used to
+     *       declare the specified field.
+     * @access protected
+     */
+    function _getIntegerDeclaration($name, $field)
+    {
+        if (!empty($field['unsigned'])) {
+            $db =$this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+
+            $db->warnings[] = "unsigned integer field \"$name\" is being declared as signed integer";
+        }
+        return $this->_getDeclaration($name, $field);
+    }
+
+    // }}}
+    // {{{ _getTextDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare an text type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param string $name name the field to be declared.
+     * @param array $field associative array with the name of the properties
+     *       of the field being declared as array indexes. Currently, the types
+     *       of supported field properties are as follows:
+     *
+     *       length
+     *           Integer value that determines the maximum length of the text
+     *           field. If this argument is missing the field should be
+     *           declared to have the longest length allowed by the DBMS.
+     *
+     *       default
+     *           Text value to be used as default for this field.
+     *
+     *       notnull
+     *           Boolean flag that indicates whether this field is constrained
+     *           to not be set to null.
+     * @return string DBMS specific SQL code portion that should be used to
+     *       declare the specified field.
+     * @access protected
+     */
+    function _getTextDeclaration($name, $field)
+    {
+        return $this->_getDeclaration($name, $field);
+    }
+
+    // }}}
+    // {{{ _getCLOBDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare an character
+     * large object type field to be used in statements like CREATE TABLE.
+     *
+     * @param string $name name the field to be declared.
+     * @param array $field associative array with the name of the properties
+     *        of the field being declared as array indexes. Currently, the types
+     *        of supported field properties are as follows:
+     *
+     *        length
+     *            Integer value that determines the maximum length of the large
+     *            object field. If this argument is missing the field should be
+     *            declared to have the longest length allowed by the DBMS.
+     *
+     *        notnull
+     *            Boolean flag that indicates whether this field is constrained
+     *            to not be set to null.
+     * @return string DBMS specific SQL code portion that should be used to
+     *        declare the specified field.
+     * @access public
+     */
+    function _getCLOBDeclaration($name, $field)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
+        $name = $db->quoteIdentifier($name, true);
+        return $name.' '.$this->getTypeDeclaration($field).$notnull;
+    }
+
+    // }}}
+    // {{{ _getBLOBDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare an binary large
+     * object type field to be used in statements like CREATE TABLE.
+     *
+     * @param string $name name the field to be declared.
+     * @param array $field associative array with the name of the properties
+     *        of the field being declared as array indexes. Currently, the types
+     *        of supported field properties are as follows:
+     *
+     *        length
+     *            Integer value that determines the maximum length of the large
+     *            object field. If this argument is missing the field should be
+     *            declared to have the longest length allowed by the DBMS.
+     *
+     *        notnull
+     *            Boolean flag that indicates whether this field is constrained
+     *            to not be set to null.
+     * @return string DBMS specific SQL code portion that should be used to
+     *        declare the specified field.
+     * @access protected
+     */
+    function _getBLOBDeclaration($name, $field)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
+        $name = $db->quoteIdentifier($name, true);
+        return $name.' '.$this->getTypeDeclaration($field).$notnull;
+    }
+
+    // }}}
+    // {{{ _getBooleanDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare a boolean type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param string $name name the field to be declared.
+     * @param array $field associative array with the name of the properties
+     *       of the field being declared as array indexes. Currently, the types
+     *       of supported field properties are as follows:
+     *
+     *       default
+     *           Boolean value to be used as default for this field.
+     *
+     *       notnullL
+     *           Boolean flag that indicates whether this field is constrained
+     *           to not be set to null.
+     * @return string DBMS specific SQL code portion that should be used to
+     *       declare the specified field.
+     * @access protected
+     */
+    function _getBooleanDeclaration($name, $field)
+    {
+        return $this->_getDeclaration($name, $field);
+    }
+
+    // }}}
+    // {{{ _getDateDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare a date type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param string $name name the field to be declared.
+     * @param array $field associative array with the name of the properties
+     *       of the field being declared as array indexes. Currently, the types
+     *       of supported field properties are as follows:
+     *
+     *       default
+     *           Date value to be used as default for this field.
+     *
+     *       notnull
+     *           Boolean flag that indicates whether this field is constrained
+     *           to not be set to null.
+     * @return string DBMS specific SQL code portion that should be used to
+     *       declare the specified field.
+     * @access protected
+     */
+    function _getDateDeclaration($name, $field)
+    {
+        return $this->_getDeclaration($name, $field);
+    }
+
+    // }}}
+    // {{{ _getTimestampDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare a timestamp
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param string $name name the field to be declared.
+     * @param array $field associative array with the name of the properties
+     *       of the field being declared as array indexes. Currently, the types
+     *       of supported field properties are as follows:
+     *
+     *       default
+     *           Timestamp value to be used as default for this field.
+     *
+     *       notnull
+     *           Boolean flag that indicates whether this field is constrained
+     *           to not be set to null.
+     * @return string DBMS specific SQL code portion that should be used to
+     *       declare the specified field.
+     * @access protected
+     */
+    function _getTimestampDeclaration($name, $field)
+    {
+        return $this->_getDeclaration($name, $field);
+    }
+
+    // }}}
+    // {{{ _getTimeDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare a time
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param string $name name the field to be declared.
+     * @param array $field associative array with the name of the properties
+     *       of the field being declared as array indexes. Currently, the types
+     *       of supported field properties are as follows:
+     *
+     *       default
+     *           Time value to be used as default for this field.
+     *
+     *       notnull
+     *           Boolean flag that indicates whether this field is constrained
+     *           to not be set to null.
+     * @return string DBMS specific SQL code portion that should be used to
+     *       declare the specified field.
+     * @access protected
+     */
+    function _getTimeDeclaration($name, $field)
+    {
+        return $this->_getDeclaration($name, $field);
+    }
+
+    // }}}
+    // {{{ _getFloatDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare a float type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param string $name name the field to be declared.
+     * @param array $field associative array with the name of the properties
+     *       of the field being declared as array indexes. Currently, the types
+     *       of supported field properties are as follows:
+     *
+     *       default
+     *           Float value to be used as default for this field.
+     *
+     *       notnull
+     *           Boolean flag that indicates whether this field is constrained
+     *           to not be set to null.
+     * @return string DBMS specific SQL code portion that should be used to
+     *       declare the specified field.
+     * @access protected
+     */
+    function _getFloatDeclaration($name, $field)
+    {
+        return $this->_getDeclaration($name, $field);
+    }
+
+    // }}}
+    // {{{ _getDecimalDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare a decimal type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param string $name name the field to be declared.
+     * @param array $field associative array with the name of the properties
+     *       of the field being declared as array indexes. Currently, the types
+     *       of supported field properties are as follows:
+     *
+     *       default
+     *           Decimal value to be used as default for this field.
+     *
+     *       notnull
+     *           Boolean flag that indicates whether this field is constrained
+     *           to not be set to null.
+     * @return string DBMS specific SQL code portion that should be used to
+     *       declare the specified field.
+     * @access protected
+     */
+    function _getDecimalDeclaration($name, $field)
+    {
+        return $this->_getDeclaration($name, $field);
+    }
+
+    // }}}
+    // {{{ compareDefinition()
+
+    /**
+     * Obtain an array of changes that may need to applied
+     *
+     * @param array $current new definition
+     * @param array  $previous old definition
+     * @return array  containing all changes that will need to be applied
+     * @access public
+     */
+    function compareDefinition($current, $previous)
+    {
+        $type = !empty($current['type']) ? $current['type'] : null;
+
+        if (!method_exists($this, "_compare{$type}Definition")) {
+            $db =$this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+            if (!empty($db->options['datatype_map_callback'][$type])) {
+                $parameter = array('current' => $current, 'previous' => $previous);
+                $change =  call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
+                return $change;
+            }
+            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'type "'.$current['type'].'" is not yet supported', __FUNCTION__);
+        }
+
+        if (empty($previous['type']) || $previous['type'] != $type) {
+            return $current;
+        }
+
+        $change = $this->{"_compare{$type}Definition"}($current, $previous);
+
+        if ($previous['type'] != $type) {
+            $change['type'] = true;
+        }
+
+        $previous_notnull = !empty($previous['notnull']) ? $previous['notnull'] : false;
+        $notnull = !empty($current['notnull']) ? $current['notnull'] : false;
+        if ($previous_notnull != $notnull) {
+            $change['notnull'] = true;
+        }
+
+        $previous_default = array_key_exists('default', $previous) ? $previous['default'] :
+            ($previous_notnull ? '' : null);
+        $default = array_key_exists('default', $current) ? $current['default'] :
+            ($notnull ? '' : null);
+        if ($previous_default !== $default) {
+            $change['default'] = true;
+        }
+
+        return $change;
+    }
+
+    // }}}
+    // {{{ _compareIntegerDefinition()
+
+    /**
+     * Obtain an array of changes that may need to applied to an integer field
+     *
+     * @param array $current new definition
+     * @param array  $previous old definition
+     * @return array  containing all changes that will need to be applied
+     * @access protected
+     */
+    function _compareIntegerDefinition($current, $previous)
+    {
+        $change = array();
+        $previous_unsigned = !empty($previous['unsigned']) ? $previous['unsigned'] : false;
+        $unsigned = !empty($current['unsigned']) ? $current['unsigned'] : false;
+        if ($previous_unsigned != $unsigned) {
+            $change['unsigned'] = true;
+        }
+        $previous_autoincrement = !empty($previous['autoincrement']) ? $previous['autoincrement'] : false;
+        $autoincrement = !empty($current['autoincrement']) ? $current['autoincrement'] : false;
+        if ($previous_autoincrement != $autoincrement) {
+            $change['autoincrement'] = true;
+        }
+        return $change;
+    }
+
+    // }}}
+    // {{{ _compareTextDefinition()
+
+    /**
+     * Obtain an array of changes that may need to applied to an text field
+     *
+     * @param array $current new definition
+     * @param array  $previous old definition
+     * @return array  containing all changes that will need to be applied
+     * @access protected
+     */
+    function _compareTextDefinition($current, $previous)
+    {
+        $change = array();
+        $previous_length = !empty($previous['length']) ? $previous['length'] : 0;
+        $length = !empty($current['length']) ? $current['length'] : 0;
+        if ($previous_length != $length) {
+            $change['length'] = true;
+        }
+        $previous_fixed = !empty($previous['fixed']) ? $previous['fixed'] : 0;
+        $fixed = !empty($current['fixed']) ? $current['fixed'] : 0;
+        if ($previous_fixed != $fixed) {
+            $change['fixed'] = true;
+        }
+        return $change;
+    }
+
+    // }}}
+    // {{{ _compareCLOBDefinition()
+
+    /**
+     * Obtain an array of changes that may need to applied to an CLOB field
+     *
+     * @param array $current new definition
+     * @param array  $previous old definition
+     * @return array  containing all changes that will need to be applied
+     * @access protected
+     */
+    function _compareCLOBDefinition($current, $previous)
+    {
+        return $this->_compareTextDefinition($current, $previous);
+    }
+
+    // }}}
+    // {{{ _compareBLOBDefinition()
+
+    /**
+     * Obtain an array of changes that may need to applied to an BLOB field
+     *
+     * @param array $current new definition
+     * @param array  $previous old definition
+     * @return array  containing all changes that will need to be applied
+     * @access protected
+     */
+    function _compareBLOBDefinition($current, $previous)
+    {
+        return $this->_compareTextDefinition($current, $previous);
+    }
+
+    // }}}
+    // {{{ _compareDateDefinition()
+
+    /**
+     * Obtain an array of changes that may need to applied to an date field
+     *
+     * @param array $current new definition
+     * @param array  $previous old definition
+     * @return array  containing all changes that will need to be applied
+     * @access protected
+     */
+    function _compareDateDefinition($current, $previous)
+    {
+        return array();
+    }
+
+    // }}}
+    // {{{ _compareTimeDefinition()
+
+    /**
+     * Obtain an array of changes that may need to applied to an time field
+     *
+     * @param array $current new definition
+     * @param array  $previous old definition
+     * @return array  containing all changes that will need to be applied
+     * @access protected
+     */
+    function _compareTimeDefinition($current, $previous)
+    {
+        return array();
+    }
+
+    // }}}
+    // {{{ _compareTimestampDefinition()
+
+    /**
+     * Obtain an array of changes that may need to applied to an timestamp field
+     *
+     * @param array $current new definition
+     * @param array  $previous old definition
+     * @return array  containing all changes that will need to be applied
+     * @access protected
+     */
+    function _compareTimestampDefinition($current, $previous)
+    {
+        return array();
+    }
+
+    // }}}
+    // {{{ _compareBooleanDefinition()
+
+    /**
+     * Obtain an array of changes that may need to applied to an boolean field
+     *
+     * @param array $current new definition
+     * @param array  $previous old definition
+     * @return array  containing all changes that will need to be applied
+     * @access protected
+     */
+    function _compareBooleanDefinition($current, $previous)
+    {
+        return array();
+    }
+
+    // }}}
+    // {{{ _compareFloatDefinition()
+
+    /**
+     * Obtain an array of changes that may need to applied to an float field
+     *
+     * @param array $current new definition
+     * @param array  $previous old definition
+     * @return array  containing all changes that will need to be applied
+     * @access protected
+     */
+    function _compareFloatDefinition($current, $previous)
+    {
+        return array();
+    }
+
+    // }}}
+    // {{{ _compareDecimalDefinition()
+
+    /**
+     * Obtain an array of changes that may need to applied to an decimal field
+     *
+     * @param array $current new definition
+     * @param array  $previous old definition
+     * @return array  containing all changes that will need to be applied
+     * @access protected
+     */
+    function _compareDecimalDefinition($current, $previous)
+    {
+        return array();
+    }
+
+    // }}}
+    // {{{ quote()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param string $type type to which the value should be converted to
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *       a DBMS specific format.
+     * @access public
+     */
+    function quote($value, $type = null, $quote = true, $escape_wildcards = false)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (is_null($value)
+            || ($value === '' && $db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL)
+        ) {
+            if (!$quote) {
+                return null;
+            }
+            return 'NULL';
+        }
+
+        if (is_null($type)) {
+            switch (gettype($value)) {
+            case 'integer':
+                $type = 'integer';
+                break;
+            case 'double':
+                // todo: default to decimal as float is quite unusual
+                // $type = 'float';
+                $type = 'decimal';
+                break;
+            case 'boolean':
+                $type = 'boolean';
+                break;
+            case 'array':
+                 $value = serialize($value);
+            case 'object':
+                 $type = 'text';
+                break;
+            default:
+                if (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}$/', $value)) {
+                    $type = 'timestamp';
+                } elseif (preg_match('/^\d{2}:\d{2}$/', $value)) {
+                    $type = 'time';
+                } elseif (preg_match('/^\d{4}-\d{2}-\d{2}$/', $value)) {
+                    $type = 'date';
+                } else {
+                    $type = 'text';
+                }
+                break;
+            }
+        } elseif (!empty($db->options['datatype_map'][$type])) {
+            $type = $db->options['datatype_map'][$type];
+            if (!empty($db->options['datatype_map_callback'][$type])) {
+                $parameter = array('type' => $type, 'value' => $value, 'quote' => $quote, 'escape_wildcards' => $escape_wildcards);
+                return call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
+            }
+        }
+
+        if (!method_exists($this, "_quote{$type}")) {
+            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'type not defined: '.$type, __FUNCTION__);
+        }
+        $value = $this->{"_quote{$type}"}($value, $quote, $escape_wildcards);
+        if ($quote && $escape_wildcards && $db->string_quoting['escape_pattern']
+            && $db->string_quoting['escape'] !== $db->string_quoting['escape_pattern']
+        ) {
+            $value.= $this->patternEscapeString();
+        }
+        return $value;
+    }
+
+    // }}}
+    // {{{ _quoteInteger()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *       a DBMS specific format.
+     * @access protected
+     */
+    function _quoteInteger($value, $quote, $escape_wildcards)
+    {
+        return (int)$value;
+    }
+
+    // }}}
+    // {{{ _quoteText()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that already contains any DBMS specific
+     *       escaped character sequences.
+     * @access protected
+     */
+    function _quoteText($value, $quote, $escape_wildcards)
+    {
+        if (!$quote) {
+            return $value;
+        }
+
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $value = $db->escape($value, $escape_wildcards);
+        if (PEAR::isError($value)) {
+            return $value;
+        }
+        return "'".$value."'";
+    }
+
+    // }}}
+    // {{{ _readFile()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @return string text string that represents the given argument value in
+     *       a DBMS specific format.
+     * @access protected
+     */
+    function _readFile($value)
+    {
+        $close = false;
+        if (preg_match('/^(\w+:\/\/)(.*)$/', $value, $match)) {
+            $close = true;
+            if ($match[1] == 'file://') {
+                $value = $match[2];
+            }
+            $value = @fopen($value, 'r');
+        }
+
+        if (is_resource($value)) {
+            $db =$this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+
+            $fp = $value;
+            $value = '';
+            while (!@feof($fp)) {
+                $value.= @fread($fp, $db->options['lob_buffer_length']);
+            }
+            if ($close) {
+                @fclose($fp);
+            }
+        }
+
+        return $value;
+    }
+
+    // }}}
+    // {{{ _quoteLOB()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *       a DBMS specific format.
+     * @access protected
+     */
+    function _quoteLOB($value, $quote, $escape_wildcards)
+    {
+        $value = $this->_readFile($value);
+        if (PEAR::isError($value)) {
+            return $value;
+        }
+        return $this->_quoteText($value, $quote, $escape_wildcards);
+    }
+
+    // }}}
+    // {{{ _quoteCLOB()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *       a DBMS specific format.
+     * @access protected
+     */
+    function _quoteCLOB($value, $quote, $escape_wildcards)
+    {
+        return $this->_quoteLOB($value, $quote, $escape_wildcards);
+    }
+
+    // }}}
+    // {{{ _quoteBLOB()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *       a DBMS specific format.
+     * @access protected
+     */
+    function _quoteBLOB($value, $quote, $escape_wildcards)
+    {
+        return $this->_quoteLOB($value, $quote, $escape_wildcards);
+    }
+
+    // }}}
+    // {{{ _quoteBoolean()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *       a DBMS specific format.
+     * @access protected
+     */
+    function _quoteBoolean($value, $quote, $escape_wildcards)
+    {
+        return ($value ? 1 : 0);
+    }
+
+    // }}}
+    // {{{ _quoteDate()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *       a DBMS specific format.
+     * @access protected
+     */
+    function _quoteDate($value, $quote, $escape_wildcards)
+    {
+        if ($value === 'CURRENT_DATE') {
+            $db =$this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+            if (isset($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
+                return $db->function->now('date');
+            }
+            return 'CURRENT_DATE';
+        }
+        return $this->_quoteText($value, $quote, $escape_wildcards);
+    }
+
+    // }}}
+    // {{{ _quoteTimestamp()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *       a DBMS specific format.
+     * @access protected
+     */
+    function _quoteTimestamp($value, $quote, $escape_wildcards)
+    {
+        if ($value === 'CURRENT_TIMESTAMP') {
+            $db =$this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+            if (isset($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
+                return $db->function->now('timestamp');
+            }
+            return 'CURRENT_TIMESTAMP';
+        }
+        return $this->_quoteText($value, $quote, $escape_wildcards);
+    }
+
+    // }}}
+    // {{{ _quoteTime()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     *       compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *       a DBMS specific format.
+     * @access protected
+     */
+    function _quoteTime($value, $quote, $escape_wildcards)
+    {
+        if ($value === 'CURRENT_TIME') {
+            $db =$this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+            if (isset($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
+                return $db->function->now('time');
+            }
+            return 'CURRENT_TIME';
+        }
+        return $this->_quoteText($value, $quote, $escape_wildcards);
+    }
+
+    // }}}
+    // {{{ _quoteFloat()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *       a DBMS specific format.
+     * @access protected
+     */
+    function _quoteFloat($value, $quote, $escape_wildcards)
+    {
+        if (preg_match('/^(.*)e([-+])(\d+)$/i', $value, $matches)) {
+            $decimal = $this->_quoteDecimal($matches[1], $quote, $escape_wildcards);
+            $sign = $matches[2];
+            $exponent = str_pad($matches[3], 2, '0', STR_PAD_LEFT);
+            $value = $decimal.'E'.$sign.$exponent;
+        } else {
+            $value = $this->_quoteDecimal($value, $quote, $escape_wildcards);
+        }
+        return $value;
+    }
+
+    // }}}
+    // {{{ _quoteDecimal()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *       a DBMS specific format.
+     * @access protected
+     */
+    function _quoteDecimal($value, $quote, $escape_wildcards)
+    {
+        $value = (string)$value;
+        $value = preg_replace('/[^\d\.,\-+eE]/', '', $value);
+        if (preg_match('/[^\.\d]/', $value)) {
+            if (strpos($value, ',')) {
+                // 1000,00
+                if (!strpos($value, '.')) {
+                    // convert the last "," to a "."
+                    $value = strrev(str_replace(',', '.', strrev($value)));
+                // 1.000,00
+                } elseif (strpos($value, '.') && strpos($value, '.') < strpos($value, ',')) {
+                    $value = str_replace('.', '', $value);
+                    // convert the last "," to a "."
+                    $value = strrev(str_replace(',', '.', strrev($value)));
+                // 1,000.00
+                } else {
+                    $value = str_replace(',', '', $value);
+                }
+            }
+        }
+        return $value;
+    }
+
+    // }}}
+    // {{{ writeLOBToFile()
+
+    /**
+     * retrieve LOB from the database
+     *
+     * @param resource $lob stream handle
+     * @param string $file name of the file into which the LOb should be fetched
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access protected
+     */
+    function writeLOBToFile($lob, $file)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (preg_match('/^(\w+:\/\/)(.*)$/', $file, $match)) {
+            if ($match[1] == 'file://') {
+                $file = $match[2];
+            }
+        }
+
+        $fp = @fopen($file, 'wb');
+        while (!@feof($lob)) {
+            $result = @fread($lob, $db->options['lob_buffer_length']);
+            $read = strlen($result);
+            if (@fwrite($fp, $result, $read) != $read) {
+                @fclose($fp);
+                return $db->raiseError(MDB2_ERROR, null, null,
+                    'could not write to the output file', __FUNCTION__);
+            }
+        }
+        @fclose($fp);
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ _retrieveLOB()
+
+    /**
+     * retrieve LOB from the database
+     *
+     * @param array $lob array
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access protected
+     */
+    function _retrieveLOB(&$lob)
+    {
+        if (is_null($lob['value'])) {
+            $lob['value'] = $lob['resource'];
+        }
+        $lob['loaded'] = true;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ readLOB()
+
+    /**
+     * Read data from large object input stream.
+     *
+     * @param resource $lob stream handle
+     * @param string $data reference to a variable that will hold data
+     *                          to be read from the large object input stream
+     * @param integer $length    value that indicates the largest ammount ofdata
+     *                          to be read from the large object input stream.
+     * @return mixed the effective number of bytes read from the large object
+     *                      input stream on sucess or an MDB2 error object.
+     * @access public
+     * @see endOfLOB()
+     */
+    function _readLOB($lob, $length)
+    {
+        return substr($lob['value'], $lob['position'], $length);
+    }
+
+    // }}}
+    // {{{ _endOfLOB()
+
+    /**
+     * Determine whether it was reached the end of the large object and
+     * therefore there is no more data to be read for the its input stream.
+     *
+     * @param array $lob array
+     * @return mixed true or false on success, a MDB2 error on failure
+     * @access protected
+     */
+    function _endOfLOB($lob)
+    {
+        return $lob['endOfLOB'];
+    }
+
+    // }}}
+    // {{{ destroyLOB()
+
+    /**
+     * Free any resources allocated during the lifetime of the large object
+     * handler object.
+     *
+     * @param resource $lob stream handle
+     * @access public
+     */
+    function destroyLOB($lob)
+    {
+        $lob_data = stream_get_meta_data($lob);
+        $lob_index = $lob_data['wrapper_data']->lob_index;
+        fclose($lob);
+        if (isset($this->lobs[$lob_index])) {
+            $this->_destroyLOB($this->lobs[$lob_index]);
+            unset($this->lobs[$lob_index]);
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ _destroyLOB()
+
+    /**
+     * Free any resources allocated during the lifetime of the large object
+     * handler object.
+     *
+     * @param array $lob array
+     * @access private
+     */
+    function _destroyLOB(&$lob)
+    {
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ implodeArray()
+
+    /**
+     * apply a type to all values of an array and return as a comma seperated string
+     * useful for generating IN statements
+     *
+     * @access public
+     *
+     * @param array $array data array
+     * @param string $type determines type of the field
+     *
+     * @return string comma seperated values
+     */
+    function implodeArray($array, $type = false)
+    {
+        if (!is_array($array) || empty($array)) {
+            return 'NULL';
+        }
+        if ($type) {
+            foreach ($array as $value) {
+                $return[] = $this->quote($value, $type);
+            }
+        } else {
+            $return = $array;
+        }
+        return implode(', ', $return);
+    }
+
+    // }}}
+    // {{{ matchPattern()
+
+    /**
+     * build a pattern matching string
+     *
+     * @access public
+     *
+     * @param array $pattern even keys are strings, odd are patterns (% and _)
+     * @param string $operator optional pattern operator (LIKE, ILIKE and maybe others in the future)
+     * @param string $field optional field name that is being matched against
+     *                  (might be required when emulating ILIKE)
+     *
+     * @return string SQL pattern
+     */
+    function matchPattern($pattern, $operator = null, $field = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $match = '';
+        if (!is_null($operator)) {
+            $operator = strtoupper($operator);
+            switch ($operator) {
+            // case insensitive
+            case 'ILIKE':
+                if (is_null($field)) {
+                    return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                        'case insensitive LIKE matching requires passing the field name', __FUNCTION__);
+                }
+                $db->loadModule('Function', null, true);
+                $match = $db->function->lower($field).' LIKE ';
+                break;
+            // case sensitive
+            case 'LIKE':
+                $match = is_null($field) ? 'LIKE ' : $field.' LIKE ';
+                break;
+            default:
+                return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                    'not a supported operator type:'. $operator, __FUNCTION__);
+            }
+        }
+        $match.= "'";
+        foreach ($pattern as $key => $value) {
+            if ($key % 2) {
+                $match.= $value;
+            } else {
+                if ($operator === 'ILIKE') {
+                    $value = strtolower($value);
+                }
+                $escaped = $db->escape($value);
+                if (PEAR::isError($escaped)) {
+                    return $escaped;
+                }
+                $match.= $db->escapePattern($escaped);
+            }
+        }
+        $match.= "'";
+        $match.= $this->patternEscapeString();
+        return $match;
+    }
+
+    // }}}
+    // {{{ patternEscapeString()
+
+    /**
+     * build string to define pattern escape character
+     *
+     * @access public
+     *
+     * @return string define pattern escape character
+     */
+    function patternEscapeString()
+    {
+        return '';
+    }
+
+    // }}}
+    // {{{ mapNativeDatatype()
+
+    /**
+     * Maps a native array description of a field to a MDB2 datatype and length
+     *
+     * @param array  $field native field description
+     * @return array containing the various possible types, length, sign, fixed
+     * @access public
+     */
+    function mapNativeDatatype($field)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        // If the user has specified an option to map the native field
+        // type to a custom MDB2 datatype...
+        $db_type = strtok($field['type'], '(), ');
+        if (!empty($db->options['nativetype_map_callback'][$db_type])) {
+            return call_user_func_array($db->options['nativetype_map_callback'][$db_type], array($db, $field));
+        }
+
+        // Otherwise perform the built-in (i.e. normal) MDB2 native type to
+        // MDB2 datatype conversion
+        return $this->_mapNativeDatatype($field);
+    }
+
+    // }}}
+    // {{{ _mapNativeDatatype()
+
+    /**
+     * Maps a native array description of a field to a MDB2 datatype and length
+     *
+     * @param array  $field native field description
+     * @return array containing the various possible types, length, sign, fixed
+     * @access public
+     */
+    function _mapNativeDatatype($field)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ mapPrepareDatatype()
+
+    /**
+     * Maps an mdb2 datatype to mysqli prepare type
+     *
+     * @param string $type
+     * @return string
+     * @access public
+     */
+    function mapPrepareDatatype($type)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (!empty($db->options['datatype_map'][$type])) {
+            $type = $db->options['datatype_map'][$type];
+            if (!empty($db->options['datatype_map_callback'][$type])) {
+                $parameter = array('type' => $type);
+                return call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
+            }
+        }
+
+        return $type;
+    }
+}
+?>
diff --git a/3rdparty/MDB2/Driver/Datatype/mysql.php b/3rdparty/MDB2/Driver/Datatype/mysql.php
new file mode 100644
index 00000000000..93dd40524e6
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Datatype/mysql.php
@@ -0,0 +1,553 @@
+<?php
+// vim: set et ts=4 sw=4 fdm=marker:
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: mysql.php,v 1.65 2008/02/22 19:23:49 quipo Exp $
+//
+
+require_once('MDB2/Driver/Datatype/Common.php');
+
+/**
+ * MDB2 MySQL driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Datatype_mysql extends MDB2_Driver_Datatype_Common
+{
+    // {{{ _getCharsetFieldDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to set the CHARACTER SET
+     * of a field declaration to be used in statements like CREATE TABLE.
+     *
+     * @param string $charset   name of the charset
+     * @return string  DBMS specific SQL code portion needed to set the CHARACTER SET
+     *                 of a field declaration.
+     */
+    function _getCharsetFieldDeclaration($charset)
+    {
+        return 'CHARACTER SET '.$charset;
+    }
+
+    // }}}
+    // {{{ _getCollationFieldDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to set the COLLATION
+     * of a field declaration to be used in statements like CREATE TABLE.
+     *
+     * @param string $collation   name of the collation
+     * @return string  DBMS specific SQL code portion needed to set the COLLATION
+     *                 of a field declaration.
+     */
+    function _getCollationFieldDeclaration($collation)
+    {
+        return 'COLLATE '.$collation;
+    }
+
+    // }}}
+    // {{{ getTypeDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare an text type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param array $field  associative array with the name of the properties
+     *      of the field being declared as array indexes. Currently, the types
+     *      of supported field properties are as follows:
+     *
+     *      length
+     *          Integer value that determines the maximum length of the text
+     *          field. If this argument is missing the field should be
+     *          declared to have the longest length allowed by the DBMS.
+     *
+     *      default
+     *          Text value to be used as default for this field.
+     *
+     *      notnull
+     *          Boolean flag that indicates whether this field is constrained
+     *          to not be set to null.
+     * @return string  DBMS specific SQL code portion that should be used to
+     *      declare the specified field.
+     * @access public
+     */
+    function getTypeDeclaration($field)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        switch ($field['type']) {
+        case 'text':
+            if (empty($field['length']) && array_key_exists('default', $field)) {
+                $field['length'] = $db->varchar_max_length;
+            }
+            $length = !empty($field['length']) ? $field['length'] : false;
+            $fixed = !empty($field['fixed']) ? $field['fixed'] : false;
+            return $fixed ? ($length ? 'CHAR('.$length.')' : 'CHAR(255)')
+                : ($length ? 'VARCHAR('.$length.')' : 'TEXT');
+        case 'clob':
+            if (!empty($field['length'])) {
+                $length = $field['length'];
+                if ($length <= 255) {
+                    return 'TINYTEXT';
+                } elseif ($length <= 65532) {
+                    return 'TEXT';
+                } elseif ($length <= 16777215) {
+                    return 'MEDIUMTEXT';
+                }
+            }
+            return 'LONGTEXT';
+        case 'blob':
+            if (!empty($field['length'])) {
+                $length = $field['length'];
+                if ($length <= 255) {
+                    return 'TINYBLOB';
+                } elseif ($length <= 65532) {
+                    return 'BLOB';
+                } elseif ($length <= 16777215) {
+                    return 'MEDIUMBLOB';
+                }
+            }
+            return 'LONGBLOB';
+        case 'integer':
+            if (!empty($field['length'])) {
+                $length = $field['length'];
+                if ($length <= 1) {
+                    return 'TINYINT';
+                } elseif ($length == 2) {
+                    return 'SMALLINT';
+                } elseif ($length == 3) {
+                    return 'MEDIUMINT';
+                } elseif ($length == 4) {
+                    return 'INT';
+                } elseif ($length > 4) {
+                    return 'BIGINT';
+                }
+            }
+            return 'INT';
+        case 'boolean':
+            return 'TINYINT(1)';
+        case 'date':
+            return 'DATE';
+        case 'time':
+            return 'TIME';
+        case 'timestamp':
+            return 'DATETIME';
+        case 'float':
+            return 'DOUBLE';
+        case 'decimal':
+            $length = !empty($field['length']) ? $field['length'] : 18;
+            $scale = !empty($field['scale']) ? $field['scale'] : $db->options['decimal_places'];
+            return 'DECIMAL('.$length.','.$scale.')';
+        }
+        return '';
+    }
+
+    // }}}
+    // {{{ _getIntegerDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare an integer type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param string  $name   name the field to be declared.
+     * @param string  $field  associative array with the name of the properties
+     *                        of the field being declared as array indexes.
+     *                        Currently, the types of supported field
+     *                        properties are as follows:
+     *
+     *                       unsigned
+     *                        Boolean flag that indicates whether the field
+     *                        should be declared as unsigned integer if
+     *                        possible.
+     *
+     *                       default
+     *                        Integer value to be used as default for this
+     *                        field.
+     *
+     *                       notnull
+     *                        Boolean flag that indicates whether this field is
+     *                        constrained to not be set to null.
+     * @return string  DBMS specific SQL code portion that should be used to
+     *                 declare the specified field.
+     * @access protected
+     */
+    function _getIntegerDeclaration($name, $field)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $default = $autoinc = '';
+        if (!empty($field['autoincrement'])) {
+            $autoinc = ' AUTO_INCREMENT PRIMARY KEY';
+        } elseif (array_key_exists('default', $field)) {
+            if ($field['default'] === '') {
+                $field['default'] = empty($field['notnull']) ? null : 0;
+            }
+            $default = ' DEFAULT '.$this->quote($field['default'], 'integer');
+        }
+
+        $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
+        $unsigned = empty($field['unsigned']) ? '' : ' UNSIGNED';
+        $name = $db->quoteIdentifier($name, true);
+        return $name.' '.$this->getTypeDeclaration($field).$unsigned.$default.$notnull.$autoinc;
+    }
+
+    // }}}
+    // {{{ _getFloatDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare an float type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param string  $name   name the field to be declared.
+     * @param string  $field  associative array with the name of the properties
+     *                        of the field being declared as array indexes.
+     *                        Currently, the types of supported field
+     *                        properties are as follows:
+     *
+     *                       unsigned
+     *                        Boolean flag that indicates whether the field
+     *                        should be declared as unsigned float if
+     *                        possible.
+     *
+     *                       default
+     *                        float value to be used as default for this
+     *                        field.
+     *
+     *                       notnull
+     *                        Boolean flag that indicates whether this field is
+     *                        constrained to not be set to null.
+     * @return string  DBMS specific SQL code portion that should be used to
+     *                 declare the specified field.
+     * @access protected
+     */
+    function _getFloatDeclaration($name, $field)
+    {
+        // Since AUTO_INCREMENT can be used for integer or floating-point types,
+        // reuse the INTEGER declaration
+        // @see http://bugs.mysql.com/bug.php?id=31032
+        return $this->_getIntegerDeclaration($name, $field);
+    }
+
+    // }}}
+    // {{{ _getDecimalDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare an decimal type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param string  $name   name the field to be declared.
+     * @param string  $field  associative array with the name of the properties
+     *                        of the field being declared as array indexes.
+     *                        Currently, the types of supported field
+     *                        properties are as follows:
+     *
+     *                       unsigned
+     *                        Boolean flag that indicates whether the field
+     *                        should be declared as unsigned integer if
+     *                        possible.
+     *
+     *                       default
+     *                        Decimal value to be used as default for this
+     *                        field.
+     *
+     *                       notnull
+     *                        Boolean flag that indicates whether this field is
+     *                        constrained to not be set to null.
+     * @return string  DBMS specific SQL code portion that should be used to
+     *                 declare the specified field.
+     * @access protected
+     */
+    function _getDecimalDeclaration($name, $field)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $default = '';
+        if (array_key_exists('default', $field)) {
+            if ($field['default'] === '') {
+                $field['default'] = empty($field['notnull']) ? null : 0;
+            }
+            $default = ' DEFAULT '.$this->quote($field['default'], 'integer');
+        } elseif (empty($field['notnull'])) {
+            $default = ' DEFAULT NULL';
+        }
+
+        $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
+        $unsigned = empty($field['unsigned']) ? '' : ' UNSIGNED';
+        $name = $db->quoteIdentifier($name, true);
+        return $name.' '.$this->getTypeDeclaration($field).$unsigned.$default.$notnull;
+    }
+
+    // }}}
+    // {{{ matchPattern()
+
+    /**
+     * build a pattern matching string
+     *
+     * @access public
+     *
+     * @param array $pattern even keys are strings, odd are patterns (% and _)
+     * @param string $operator optional pattern operator (LIKE, ILIKE and maybe others in the future)
+     * @param string $field optional field name that is being matched against
+     *                  (might be required when emulating ILIKE)
+     *
+     * @return string SQL pattern
+     */
+    function matchPattern($pattern, $operator = null, $field = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $match = '';
+        if (!is_null($operator)) {
+            $field = is_null($field) ? '' : $field.' ';
+            $operator = strtoupper($operator);
+            switch ($operator) {
+            // case insensitive
+            case 'ILIKE':
+                $match = $field.'LIKE ';
+                break;
+            // case sensitive
+            case 'LIKE':
+                $match = $field.'LIKE BINARY ';
+                break;
+            default:
+                return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                    'not a supported operator type:'. $operator, __FUNCTION__);
+            }
+        }
+        $match.= "'";
+        foreach ($pattern as $key => $value) {
+            if ($key % 2) {
+                $match.= $value;
+            } else {
+                $match.= $db->escapePattern($db->escape($value));
+            }
+        }
+        $match.= "'";
+        $match.= $this->patternEscapeString();
+        return $match;
+    }
+
+    // }}}
+    // {{{ _mapNativeDatatype()
+
+    /**
+     * Maps a native array description of a field to a MDB2 datatype and length
+     *
+     * @param array  $field native field description
+     * @return array containing the various possible types, length, sign, fixed
+     * @access public
+     */
+    function _mapNativeDatatype($field)
+    {
+        $db_type = strtolower($field['type']);
+        $db_type = strtok($db_type, '(), ');
+        if ($db_type == 'national') {
+            $db_type = strtok('(), ');
+        }
+        if (!empty($field['length'])) {
+            $length = strtok($field['length'], ', ');
+            $decimal = strtok(', ');
+        } else {
+            $length = strtok('(), ');
+            $decimal = strtok('(), ');
+        }
+        $type = array();
+        $unsigned = $fixed = null;
+        switch ($db_type) {
+        case 'tinyint':
+            $type[] = 'integer';
+            $type[] = 'boolean';
+            if (preg_match('/^(is|has)/', $field['name'])) {
+                $type = array_reverse($type);
+            }
+            $unsigned = preg_match('/ unsigned/i', $field['type']);
+            $length = 1;
+            break;
+        case 'smallint':
+            $type[] = 'integer';
+            $unsigned = preg_match('/ unsigned/i', $field['type']);
+            $length = 2;
+            break;
+        case 'mediumint':
+            $type[] = 'integer';
+            $unsigned = preg_match('/ unsigned/i', $field['type']);
+            $length = 3;
+            break;
+        case 'int':
+        case 'integer':
+            $type[] = 'integer';
+            $unsigned = preg_match('/ unsigned/i', $field['type']);
+            $length = 4;
+            break;
+        case 'bigint':
+            $type[] = 'integer';
+            $unsigned = preg_match('/ unsigned/i', $field['type']);
+            $length = 8;
+            break;
+        case 'tinytext':
+        case 'mediumtext':
+        case 'longtext':
+        case 'text':
+        case 'varchar':
+            $fixed = false;
+        case 'string':
+        case 'char':
+            $type[] = 'text';
+            if ($length == '1') {
+                $type[] = 'boolean';
+                if (preg_match('/^(is|has)/', $field['name'])) {
+                    $type = array_reverse($type);
+                }
+            } elseif (strstr($db_type, 'text')) {
+                $type[] = 'clob';
+                if ($decimal == 'binary') {
+                    $type[] = 'blob';
+                }
+                $type = array_reverse($type);
+            }
+            if ($fixed !== false) {
+                $fixed = true;
+            }
+            break;
+        case 'enum':
+            $type[] = 'text';
+            preg_match_all('/\'.+\'/U', $field['type'], $matches);
+            $length = 0;
+            $fixed = false;
+            if (is_array($matches)) {
+                foreach ($matches[0] as $value) {
+                    $length = max($length, strlen($value)-2);
+                }
+                if ($length == '1' && count($matches[0]) == 2) {
+                    $type[] = 'boolean';
+                    if (preg_match('/^(is|has)/', $field['name'])) {
+                        $type = array_reverse($type);
+                    }
+                }
+            }
+            $type[] = 'integer';
+        case 'set':
+            $fixed = false;
+            $type[] = 'text';
+            $type[] = 'integer';
+            break;
+        case 'date':
+            $type[] = 'date';
+            $length = null;
+            break;
+        case 'datetime':
+        case 'timestamp':
+            $type[] = 'timestamp';
+            $length = null;
+            break;
+        case 'time':
+            $type[] = 'time';
+            $length = null;
+            break;
+        case 'float':
+        case 'double':
+        case 'real':
+            $type[] = 'float';
+            $unsigned = preg_match('/ unsigned/i', $field['type']);
+            break;
+        case 'unknown':
+        case 'decimal':
+        case 'numeric':
+            $type[] = 'decimal';
+            $unsigned = preg_match('/ unsigned/i', $field['type']);
+            if ($decimal !== false) {
+                $length = $length.','.$decimal;
+            }
+            break;
+        case 'tinyblob':
+        case 'mediumblob':
+        case 'longblob':
+        case 'blob':
+            $type[] = 'blob';
+            $length = null;
+            break;
+        case 'binary':
+        case 'varbinary':
+            $type[] = 'blob';
+            break;
+        case 'year':
+            $type[] = 'integer';
+            $type[] = 'date';
+            $length = null;
+            break;
+        default:
+            $db =$this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+
+            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'unknown database attribute type: '.$db_type, __FUNCTION__);
+        }
+
+        if ((int)$length <= 0) {
+            $length = null;
+        }
+
+        return array($type, $length, $unsigned, $fixed);
+    }
+
+    // }}}
+}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Datatype/pgsql.php b/3rdparty/MDB2/Driver/Datatype/pgsql.php
new file mode 100644
index 00000000000..e72aa743b73
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Datatype/pgsql.php
@@ -0,0 +1,554 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Paul Cooper <pgc@ucecom.com>                                 |
+// +----------------------------------------------------------------------+
+//
+// $Id: pgsql.php,v 1.93 2008/08/28 20:32:57 afz Exp $
+
+require_once('MDB2/Driver/Datatype/Common.php');
+
+/**
+ * MDB2 PostGreSQL driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Paul Cooper <pgc@ucecom.com>
+ */
+class MDB2_Driver_Datatype_pgsql extends MDB2_Driver_Datatype_Common
+{
+    // {{{ _baseConvertResult()
+
+    /**
+     * General type conversion method
+     *
+     * @param mixed   $value refernce to a value to be converted
+     * @param string  $type  specifies which type to convert to
+     * @param boolean $rtrim [optional] when TRUE [default], apply rtrim() to text
+     * @return object a MDB2 error on failure
+     * @access protected
+     */
+    function _baseConvertResult($value, $type, $rtrim = true)
+    {
+        if (is_null($value)) {
+            return null;
+        }
+        switch ($type) {
+        case 'boolean':
+            return $value == 't';
+        case 'float':
+            return doubleval($value);
+        case 'date':
+            return $value;
+        case 'time':
+            return substr($value, 0, strlen('HH:MM:SS'));
+        case 'timestamp':
+            return substr($value, 0, strlen('YYYY-MM-DD HH:MM:SS'));
+        case 'blob':
+            $value = pg_unescape_bytea($value);
+            return parent::_baseConvertResult($value, $type, $rtrim);
+        }
+        return parent::_baseConvertResult($value, $type, $rtrim);
+    }
+
+    // }}}
+    // {{{ getTypeDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare an text type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param array $field  associative array with the name of the properties
+     *      of the field being declared as array indexes. Currently, the types
+     *      of supported field properties are as follows:
+     *
+     *      length
+     *          Integer value that determines the maximum length of the text
+     *          field. If this argument is missing the field should be
+     *          declared to have the longest length allowed by the DBMS.
+     *
+     *      default
+     *          Text value to be used as default for this field.
+     *
+     *      notnull
+     *          Boolean flag that indicates whether this field is constrained
+     *          to not be set to null.
+     * @return string  DBMS specific SQL code portion that should be used to
+     *      declare the specified field.
+     * @access public
+     */
+    function getTypeDeclaration($field)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        switch ($field['type']) {
+        case 'text':
+            $length = !empty($field['length']) ? $field['length'] : false;
+            $fixed = !empty($field['fixed']) ? $field['fixed'] : false;
+            return $fixed ? ($length ? 'CHAR('.$length.')' : 'CHAR('.$db->options['default_text_field_length'].')')
+                : ($length ? 'VARCHAR('.$length.')' : 'TEXT');
+        case 'clob':
+            return 'TEXT';
+        case 'blob':
+            return 'BYTEA';
+        case 'integer':
+            if (!empty($field['autoincrement'])) {
+                if (!empty($field['length'])) {
+                    $length = $field['length'];
+                    if ($length > 4) {
+                        return 'BIGSERIAL PRIMARY KEY';
+                    }
+                }
+                return 'SERIAL PRIMARY KEY';
+            }
+            if (!empty($field['length'])) {
+                $length = $field['length'];
+                if ($length <= 2) {
+                    return 'SMALLINT';
+                } elseif ($length == 3 || $length == 4) {
+                    return 'INT';
+                } elseif ($length > 4) {
+                    return 'BIGINT';
+                }
+            }
+            return 'INT';
+        case 'boolean':
+            return 'BOOLEAN';
+        case 'date':
+            return 'DATE';
+        case 'time':
+            return 'TIME without time zone';
+        case 'timestamp':
+            return 'TIMESTAMP without time zone';
+        case 'float':
+            return 'FLOAT8';
+        case 'decimal':
+            $length = !empty($field['length']) ? $field['length'] : 18;
+            $scale = !empty($field['scale']) ? $field['scale'] : $db->options['decimal_places'];
+            return 'NUMERIC('.$length.','.$scale.')';
+        }
+    }
+
+    // }}}
+    // {{{ _getIntegerDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare an integer type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param string $name name the field to be declared.
+     * @param array $field associative array with the name of the properties
+     *       of the field being declared as array indexes. Currently, the types
+     *       of supported field properties are as follows:
+     *
+     *       unsigned
+     *           Boolean flag that indicates whether the field should be
+     *           declared as unsigned integer if possible.
+     *
+     *       default
+     *           Integer value to be used as default for this field.
+     *
+     *       notnull
+     *           Boolean flag that indicates whether this field is constrained
+     *           to not be set to null.
+     * @return string DBMS specific SQL code portion that should be used to
+     *       declare the specified field.
+     * @access protected
+     */
+    function _getIntegerDeclaration($name, $field)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (!empty($field['unsigned'])) {
+            $db->warnings[] = "unsigned integer field \"$name\" is being declared as signed integer";
+        }
+        if (!empty($field['autoincrement'])) {
+            $name = $db->quoteIdentifier($name, true);
+            return $name.' '.$this->getTypeDeclaration($field);
+        }
+        $default = '';
+        if (array_key_exists('default', $field)) {
+            if ($field['default'] === '') {
+                $field['default'] = empty($field['notnull']) ? null : 0;
+            }
+            $default = ' DEFAULT '.$this->quote($field['default'], 'integer');
+        }
+
+        $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
+        $name = $db->quoteIdentifier($name, true);
+        return $name.' '.$this->getTypeDeclaration($field).$default.$notnull;
+    }
+
+    // }}}
+    // {{{ _quoteCLOB()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *      a DBMS specific format.
+     * @access protected
+     */
+    function _quoteCLOB($value, $quote, $escape_wildcards)
+    {
+        return $this->_quoteText($value, $quote, $escape_wildcards);
+    }
+
+    // }}}
+    // {{{ _quoteBLOB()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *      a DBMS specific format.
+     * @access protected
+     */
+    function _quoteBLOB($value, $quote, $escape_wildcards)
+    {
+        if (!$quote) {
+            return $value;
+        }
+        if (version_compare(PHP_VERSION, '5.2.0RC6', '>=')) {
+            $db =$this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+            $connection = $db->getConnection();
+            if (PEAR::isError($connection)) {
+                return $connection;
+            }
+            $value = @pg_escape_bytea($connection, $value);
+        } else {
+            $value = @pg_escape_bytea($value);
+        }
+        return "'".$value."'";
+    }
+
+    // }}}
+    // {{{ _quoteBoolean()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *       a DBMS specific format.
+     * @access protected
+     */
+    function _quoteBoolean($value, $quote, $escape_wildcards)
+    {
+        $value = $value ? 't' : 'f';
+        if (!$quote) {
+            return $value;
+        }
+        return "'".$value."'";
+    }
+
+    // }}}
+    // {{{ matchPattern()
+
+    /**
+     * build a pattern matching string
+     *
+     * @access public
+     *
+     * @param array $pattern even keys are strings, odd are patterns (% and _)
+     * @param string $operator optional pattern operator (LIKE, ILIKE and maybe others in the future)
+     * @param string $field optional field name that is being matched against
+     *                  (might be required when emulating ILIKE)
+     *
+     * @return string SQL pattern
+     */
+    function matchPattern($pattern, $operator = null, $field = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $match = '';
+        if (!is_null($operator)) {
+            $field = is_null($field) ? '' : $field.' ';
+            $operator = strtoupper($operator);
+            switch ($operator) {
+            // case insensitive
+            case 'ILIKE':
+                $match = $field.'ILIKE ';
+                break;
+            // case sensitive
+            case 'LIKE':
+                $match = $field.'LIKE ';
+                break;
+            default:
+                return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                    'not a supported operator type:'. $operator, __FUNCTION__);
+            }
+        }
+        $match.= "'";
+        foreach ($pattern as $key => $value) {
+            if ($key % 2) {
+                $match.= $value;
+            } else {
+                $match.= $db->escapePattern($db->escape($value));
+            }
+        }
+        $match.= "'";
+        $match.= $this->patternEscapeString();
+        return $match;
+    }
+
+    // }}}
+    // {{{ patternEscapeString()
+
+    /**
+     * build string to define escape pattern string
+     *
+     * @access public
+     *
+     *
+     * @return string define escape pattern
+     */
+    function patternEscapeString()
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        return ' ESCAPE '.$this->quote($db->string_quoting['escape_pattern']);
+    }
+
+    // }}}
+    // {{{ _mapNativeDatatype()
+
+    /**
+     * Maps a native array description of a field to a MDB2 datatype and length
+     *
+     * @param array  $field native field description
+     * @return array containing the various possible types, length, sign, fixed
+     * @access public
+     */
+    function _mapNativeDatatype($field)
+    {
+        $db_type = strtolower($field['type']);
+        $length = $field['length'];
+        $type = array();
+        $unsigned = $fixed = null;
+        switch ($db_type) {
+        case 'smallint':
+        case 'int2':
+            $type[] = 'integer';
+            $unsigned = false;
+            $length = 2;
+            if ($length == '2') {
+                $type[] = 'boolean';
+                if (preg_match('/^(is|has)/', $field['name'])) {
+                    $type = array_reverse($type);
+                }
+            }
+            break;
+        case 'int':
+        case 'int4':
+        case 'integer':
+        case 'serial':
+        case 'serial4':
+            $type[] = 'integer';
+            $unsigned = false;
+            $length = 4;
+            break;
+        case 'bigint':
+        case 'int8':
+        case 'bigserial':
+        case 'serial8':
+            $type[] = 'integer';
+            $unsigned = false;
+            $length = 8;
+            break;
+        case 'bool':
+        case 'boolean':
+            $type[] = 'boolean';
+            $length = null;
+            break;
+        case 'text':
+        case 'varchar':
+            $fixed = false;
+        case 'unknown':
+        case 'char':
+        case 'bpchar':
+            $type[] = 'text';
+            if ($length == '1') {
+                $type[] = 'boolean';
+                if (preg_match('/^(is|has)/', $field['name'])) {
+                    $type = array_reverse($type);
+                }
+            } elseif (strstr($db_type, 'text')) {
+                $type[] = 'clob';
+                $type = array_reverse($type);
+            }
+            if ($fixed !== false) {
+                $fixed = true;
+            }
+            break;
+        case 'date':
+            $type[] = 'date';
+            $length = null;
+            break;
+        case 'datetime':
+        case 'timestamp':
+        case 'timestamptz':
+            $type[] = 'timestamp';
+            $length = null;
+            break;
+        case 'time':
+            $type[] = 'time';
+            $length = null;
+            break;
+        case 'float':
+        case 'float4':
+        case 'float8':
+        case 'double':
+        case 'real':
+            $type[] = 'float';
+            break;
+        case 'decimal':
+        case 'money':
+        case 'numeric':
+            $type[] = 'decimal';
+            if (isset($field['scale'])) {
+                $length = $length.','.$field['scale'];
+            }
+            break;
+        case 'tinyblob':
+        case 'mediumblob':
+        case 'longblob':
+        case 'blob':
+        case 'bytea':
+            $type[] = 'blob';
+            $length = null;
+            break;
+        case 'oid':
+            $type[] = 'blob';
+            $type[] = 'clob';
+            $length = null;
+            break;
+        case 'year':
+            $type[] = 'integer';
+            $type[] = 'date';
+            $length = null;
+            break;
+        default:
+            $db =$this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'unknown database attribute type: '.$db_type, __FUNCTION__);
+        }
+
+        if ((int)$length <= 0) {
+            $length = null;
+        }
+
+        return array($type, $length, $unsigned, $fixed);
+    }
+
+    // }}}
+    // {{{ mapPrepareDatatype()
+
+    /**
+     * Maps an mdb2 datatype to native prepare type
+     *
+     * @param string $type
+     * @return string
+     * @access public
+     */
+    function mapPrepareDatatype($type)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (!empty($db->options['datatype_map'][$type])) {
+            $type = $db->options['datatype_map'][$type];
+            if (!empty($db->options['datatype_map_callback'][$type])) {
+                $parameter = array('type' => $type);
+                return call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
+            }
+        }
+
+        switch ($type) {
+            case 'integer':
+                return 'int';
+            case 'boolean':
+                return 'bool';
+            case 'decimal':
+            case 'float':
+                return 'numeric';
+            case 'clob':
+                return 'text';
+            case 'blob':
+                return 'bytea';
+            default:
+                break;
+        }
+        return $type;
+    }
+    // }}}
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Datatype/sqlite.php b/3rdparty/MDB2/Driver/Datatype/sqlite.php
new file mode 100644
index 00000000000..9e57e7e5678
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Datatype/sqlite.php
@@ -0,0 +1,409 @@
+<?php
+// vim: set et ts=4 sw=4 fdm=marker:
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: sqlite.php,v 1.67 2008/02/22 19:58:06 quipo Exp $
+//
+
+require_once('MDB2/Driver/Datatype/Common.php');
+
+/**
+ * MDB2 SQLite driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Datatype_sqlite extends MDB2_Driver_Datatype_Common
+{
+    // {{{ _getCollationFieldDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to set the COLLATION
+     * of a field declaration to be used in statements like CREATE TABLE.
+     *
+     * @param string $collation name of the collation
+     *
+     * @return string DBMS specific SQL code portion needed to set the COLLATION
+     *                of a field declaration.
+     */
+    function _getCollationFieldDeclaration($collation)
+    {
+        return 'COLLATE '.$collation;
+    }
+
+    // }}}
+    // {{{ getTypeDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare an text type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param array $field  associative array with the name of the properties
+     *      of the field being declared as array indexes. Currently, the types
+     *      of supported field properties are as follows:
+     *
+     *      length
+     *          Integer value that determines the maximum length of the text
+     *          field. If this argument is missing the field should be
+     *          declared to have the longest length allowed by the DBMS.
+     *
+     *      default
+     *          Text value to be used as default for this field.
+     *
+     *      notnull
+     *          Boolean flag that indicates whether this field is constrained
+     *          to not be set to null.
+     * @return string  DBMS specific SQL code portion that should be used to
+     *      declare the specified field.
+     * @access public
+     */
+    function getTypeDeclaration($field)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        switch ($field['type']) {
+        case 'text':
+            $length = !empty($field['length'])
+                ? $field['length'] : false;
+            $fixed = !empty($field['fixed']) ? $field['fixed'] : false;
+            return $fixed ? ($length ? 'CHAR('.$length.')' : 'CHAR('.$db->options['default_text_field_length'].')')
+                : ($length ? 'VARCHAR('.$length.')' : 'TEXT');
+        case 'clob':
+            if (!empty($field['length'])) {
+                $length = $field['length'];
+                if ($length <= 255) {
+                    return 'TINYTEXT';
+                } elseif ($length <= 65532) {
+                    return 'TEXT';
+                } elseif ($length <= 16777215) {
+                    return 'MEDIUMTEXT';
+                }
+            }
+            return 'LONGTEXT';
+        case 'blob':
+            if (!empty($field['length'])) {
+                $length = $field['length'];
+                if ($length <= 255) {
+                    return 'TINYBLOB';
+                } elseif ($length <= 65532) {
+                    return 'BLOB';
+                } elseif ($length <= 16777215) {
+                    return 'MEDIUMBLOB';
+                }
+            }
+            return 'LONGBLOB';
+        case 'integer':
+            if (!empty($field['length'])) {
+                $length = $field['length'];
+                if ($length <= 2) {
+                    return 'SMALLINT';
+                } elseif ($length == 3 || $length == 4) {
+                    return 'INTEGER';
+                } elseif ($length > 4) {
+                    return 'BIGINT';
+                }
+            }
+            return 'INTEGER';
+        case 'boolean':
+            return 'BOOLEAN';
+        case 'date':
+            return 'DATE';
+        case 'time':
+            return 'TIME';
+        case 'timestamp':
+            return 'DATETIME';
+        case 'float':
+            return 'DOUBLE'.($db->options['fixed_float'] ? '('.
+                ($db->options['fixed_float']+2).','.$db->options['fixed_float'].')' : '');
+        case 'decimal':
+            $length = !empty($field['length']) ? $field['length'] : 18;
+            $scale = !empty($field['scale']) ? $field['scale'] : $db->options['decimal_places'];
+            return 'DECIMAL('.$length.','.$scale.')';
+        }
+        return '';
+    }
+
+    // }}}
+    // {{{ _getIntegerDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare an integer type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param string  $name   name the field to be declared.
+     * @param string  $field  associative array with the name of the properties
+     *                        of the field being declared as array indexes.
+     *                        Currently, the types of supported field
+     *                        properties are as follows:
+     *
+     *                       unsigned
+     *                        Boolean flag that indicates whether the field
+     *                        should be declared as unsigned integer if
+     *                        possible.
+     *
+     *                       default
+     *                        Integer value to be used as default for this
+     *                        field.
+     *
+     *                       notnull
+     *                        Boolean flag that indicates whether this field is
+     *                        constrained to not be set to null.
+     * @return string  DBMS specific SQL code portion that should be used to
+     *                 declare the specified field.
+     * @access protected
+     */
+    function _getIntegerDeclaration($name, $field)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $default = $autoinc = '';
+        if (!empty($field['autoincrement'])) {
+            $autoinc = ' PRIMARY KEY';
+        } elseif (array_key_exists('default', $field)) {
+            if ($field['default'] === '') {
+                $field['default'] = empty($field['notnull']) ? null : 0;
+            }
+            $default = ' DEFAULT '.$this->quote($field['default'], 'integer');
+        }
+
+        $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
+        $unsigned = empty($field['unsigned']) ? '' : ' UNSIGNED';
+        $name = $db->quoteIdentifier($name, true);
+        return $name.' '.$this->getTypeDeclaration($field).$unsigned.$default.$notnull.$autoinc;
+    }
+
+    // }}}
+    // {{{ matchPattern()
+
+    /**
+     * build a pattern matching string
+     *
+     * @access public
+     *
+     * @param array $pattern even keys are strings, odd are patterns (% and _)
+     * @param string $operator optional pattern operator (LIKE, ILIKE and maybe others in the future)
+     * @param string $field optional field name that is being matched against
+     *                  (might be required when emulating ILIKE)
+     *
+     * @return string SQL pattern
+     */
+    function matchPattern($pattern, $operator = null, $field = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $match = '';
+        if (!is_null($operator)) {
+            $field = is_null($field) ? '' : $field.' ';
+            $operator = strtoupper($operator);
+            switch ($operator) {
+            // case insensitive
+            case 'ILIKE':
+                $match = $field.'LIKE ';
+                break;
+            // case sensitive
+            case 'LIKE':
+                $match = $field.'LIKE ';
+                break;
+            default:
+                return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                    'not a supported operator type:'. $operator, __FUNCTION__);
+            }
+        }
+        $match.= "'";
+        foreach ($pattern as $key => $value) {
+            if ($key % 2) {
+                $match.= $value;
+            } else {
+                $match.= $db->escapePattern($db->escape($value));
+            }
+        }
+        $match.= "'";
+        $match.= $this->patternEscapeString();
+        return $match;
+    }
+
+    // }}}
+    // {{{ _mapNativeDatatype()
+
+    /**
+     * Maps a native array description of a field to a MDB2 datatype and length
+     *
+     * @param array  $field native field description
+     * @return array containing the various possible types, length, sign, fixed
+     * @access public
+     */
+    function _mapNativeDatatype($field)
+    {
+        $db_type = strtolower($field['type']);
+        $length = !empty($field['length']) ? $field['length'] : null;
+        $unsigned = !empty($field['unsigned']) ? $field['unsigned'] : null;
+        $fixed = null;
+        $type = array();
+        switch ($db_type) {
+        case 'boolean':
+            $type[] = 'boolean';
+            break;
+        case 'tinyint':
+            $type[] = 'integer';
+            $type[] = 'boolean';
+            if (preg_match('/^(is|has)/', $field['name'])) {
+                $type = array_reverse($type);
+            }
+            $unsigned = preg_match('/ unsigned/i', $field['type']);
+            $length = 1;
+            break;
+        case 'smallint':
+            $type[] = 'integer';
+            $unsigned = preg_match('/ unsigned/i', $field['type']);
+            $length = 2;
+            break;
+        case 'mediumint':
+            $type[] = 'integer';
+            $unsigned = preg_match('/ unsigned/i', $field['type']);
+            $length = 3;
+            break;
+        case 'int':
+        case 'integer':
+        case 'serial':
+            $type[] = 'integer';
+            $unsigned = preg_match('/ unsigned/i', $field['type']);
+            $length = 4;
+            break;
+        case 'bigint':
+        case 'bigserial':
+            $type[] = 'integer';
+            $unsigned = preg_match('/ unsigned/i', $field['type']);
+            $length = 8;
+            break;
+        case 'clob':
+            $type[] = 'clob';
+            $fixed  = false;
+            break;
+        case 'tinytext':
+        case 'mediumtext':
+        case 'longtext':
+        case 'text':
+        case 'varchar':
+        case 'varchar2':
+            $fixed = false;
+        case 'char':
+            $type[] = 'text';
+            if ($length == '1') {
+                $type[] = 'boolean';
+                if (preg_match('/^(is|has)/', $field['name'])) {
+                    $type = array_reverse($type);
+                }
+            } elseif (strstr($db_type, 'text')) {
+                $type[] = 'clob';
+                $type = array_reverse($type);
+            }
+            if ($fixed !== false) {
+                $fixed = true;
+            }
+            break;
+        case 'date':
+            $type[] = 'date';
+            $length = null;
+            break;
+        case 'datetime':
+        case 'timestamp':
+            $type[] = 'timestamp';
+            $length = null;
+            break;
+        case 'time':
+            $type[] = 'time';
+            $length = null;
+            break;
+        case 'float':
+        case 'double':
+        case 'real':
+            $type[] = 'float';
+            break;
+        case 'decimal':
+        case 'numeric':
+            $type[] = 'decimal';
+            $length = $length.','.$field['decimal'];
+            break;
+        case 'tinyblob':
+        case 'mediumblob':
+        case 'longblob':
+        case 'blob':
+            $type[] = 'blob';
+            $length = null;
+            break;
+        case 'year':
+            $type[] = 'integer';
+            $type[] = 'date';
+            $length = null;
+            break;
+        default:
+            $db =$this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'unknown database attribute type: '.$db_type, __FUNCTION__);
+        }
+
+        if ((int)$length <= 0) {
+            $length = null;
+        }
+
+        return array($type, $length, $unsigned, $fixed);
+    }
+
+    // }}}
+}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Function/Common.php b/3rdparty/MDB2/Driver/Function/Common.php
new file mode 100644
index 00000000000..731f06882ce
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Function/Common.php
@@ -0,0 +1,293 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: Common.php,v 1.21 2008/02/17 18:51:39 quipo Exp $
+//
+
+/**
+ * @package  MDB2
+ * @category Database
+ * @author   Lukas Smith <smith@pooteeweet.org>
+ */
+
+/**
+ * Base class for the function modules that is extended by each MDB2 driver
+ *
+ * To load this module in the MDB2 object:
+ * $mdb->loadModule('Function');
+ *
+ * @package  MDB2
+ * @category Database
+ * @author   Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Function_Common extends MDB2_Module_Common
+{
+    // {{{ executeStoredProc()
+
+    /**
+     * Execute a stored procedure and return any results
+     *
+     * @param string $name string that identifies the function to execute
+     * @param mixed  $params  array that contains the paramaters to pass the stored proc
+     * @param mixed   $types  array that contains the types of the columns in
+     *                        the result set
+     * @param mixed $result_class string which specifies which result class to use
+     * @param mixed $result_wrap_class string which specifies which class to wrap results in
+     *
+     * @return mixed a result handle or MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function &executeStoredProc($name, $params = null, $types = null, $result_class = true, $result_wrap_class = false)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $error =& $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+        return $error;
+    }
+
+    // }}}
+    // {{{ functionTable()
+
+    /**
+     * return string for internal table used when calling only a function
+     *
+     * @return string for internal table used when calling only a function
+     * @access public
+     */
+    function functionTable()
+    {
+        return '';
+    }
+
+    // }}}
+    // {{{ now()
+
+    /**
+     * Return string to call a variable with the current timestamp inside an SQL statement
+     * There are three special variables for current date and time:
+     * - CURRENT_TIMESTAMP (date and time, TIMESTAMP type)
+     * - CURRENT_DATE (date, DATE type)
+     * - CURRENT_TIME (time, TIME type)
+     *
+     * @param string $type 'timestamp' | 'time' | 'date'
+     *
+     * @return string to call a variable with the current timestamp
+     * @access public
+     */
+    function now($type = 'timestamp')
+    {
+        switch ($type) {
+        case 'time':
+            return 'CURRENT_TIME';
+        case 'date':
+            return 'CURRENT_DATE';
+        case 'timestamp':
+        default:
+            return 'CURRENT_TIMESTAMP';
+        }
+    }
+
+    // }}}
+    // {{{ unixtimestamp()
+
+    /**
+     * return string to call a function to get the unix timestamp from a iso timestamp
+     *
+     * @param string $expression
+     *
+     * @return string to call a variable with the timestamp
+     * @access public
+     */
+    function unixtimestamp($expression)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $error =& $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+        return $error;
+    }
+
+    // }}}
+    // {{{ substring()
+
+    /**
+     * return string to call a function to get a substring inside an SQL statement
+     *
+     * @return string to call a function to get a substring
+     * @access public
+     */
+    function substring($value, $position = 1, $length = null)
+    {
+        if (!is_null($length)) {
+            return "SUBSTRING($value FROM $position FOR $length)";
+        }
+        return "SUBSTRING($value FROM $position)";
+    }
+
+    // }}}
+    // {{{ replace()
+
+    /**
+     * return string to call a function to get replace inside an SQL statement.
+     *
+     * @return string to call a function to get a replace
+     * @access public
+     */
+    function replace($str, $from_str, $to_str)
+    {
+        return "REPLACE($str, $from_str , $to_str)";
+    }
+
+    // }}}
+    // {{{ concat()
+
+    /**
+     * Returns string to concatenate two or more string parameters
+     *
+     * @param string $value1
+     * @param string $value2
+     * @param string $values...
+     *
+     * @return string to concatenate two strings
+     * @access public
+     */
+    function concat($value1, $value2)
+    {
+        $args = func_get_args();
+        return "(".implode(' || ', $args).")";
+    }
+
+    // }}}
+    // {{{ random()
+
+    /**
+     * return string to call a function to get random value inside an SQL statement
+     *
+     * @return return string to generate float between 0 and 1
+     * @access public
+     */
+    function random()
+    {
+        return 'RAND()';
+    }
+
+    // }}}
+    // {{{ lower()
+
+    /**
+     * return string to call a function to lower the case of an expression
+     *
+     * @param string $expression
+     *
+     * @return return string to lower case of an expression
+     * @access public
+     */
+    function lower($expression)
+    {
+        return "LOWER($expression)";
+    }
+
+    // }}}
+    // {{{ upper()
+
+    /**
+     * return string to call a function to upper the case of an expression
+     *
+     * @param string $expression
+     *
+     * @return return string to upper case of an expression
+     * @access public
+     */
+    function upper($expression)
+    {
+        return "UPPER($expression)";
+    }
+
+    // }}}
+    // {{{ length()
+
+    /**
+     * return string to call a function to get the length of a string expression
+     *
+     * @param string $expression
+     *
+     * @return return string to get the string expression length
+     * @access public
+     */
+    function length($expression)
+    {
+        return "LENGTH($expression)";
+    }
+
+    // }}}
+    // {{{ guid()
+
+    /**
+     * Returns global unique identifier
+     *
+     * @return string to get global unique identifier
+     * @access public
+     */
+    function guid()
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $error =& $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+        return $error;
+    }
+
+    // }}}
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Function/mysql.php b/3rdparty/MDB2/Driver/Function/mysql.php
new file mode 100644
index 00000000000..44183c3aa06
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Function/mysql.php
@@ -0,0 +1,136 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: mysql.php,v 1.12 2008/02/17 18:54:08 quipo Exp $
+//
+
+require_once('MDB2/Driver/Function/Common.php');
+
+/**
+ * MDB2 MySQL driver for the function modules
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Function_mysql extends MDB2_Driver_Function_Common
+{
+     // }}}
+    // {{{ executeStoredProc()
+
+    /**
+     * Execute a stored procedure and return any results
+     *
+     * @param string $name string that identifies the function to execute
+     * @param mixed  $params  array that contains the paramaters to pass the stored proc
+     * @param mixed   $types  array that contains the types of the columns in
+     *                        the result set
+     * @param mixed $result_class string which specifies which result class to use
+     * @param mixed $result_wrap_class string which specifies which class to wrap results in
+     * @return mixed a result handle or MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function &executeStoredProc($name, $params = null, $types = null, $result_class = true, $result_wrap_class = false)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = 'CALL '.$name;
+        $query .= $params ? '('.implode(', ', $params).')' : '()';
+        return $db->query($query, $types, $result_class, $result_wrap_class);
+    }
+
+    // }}}
+    // {{{ unixtimestamp()
+
+    /**
+     * return string to call a function to get the unix timestamp from a iso timestamp
+     *
+     * @param string $expression
+     *
+     * @return string to call a variable with the timestamp
+     * @access public
+     */
+    function unixtimestamp($expression)
+    {
+        return 'UNIX_TIMESTAMP('. $expression.')';
+    }
+
+    // }}}
+    // {{{ concat()
+
+    /**
+     * Returns string to concatenate two or more string parameters
+     *
+     * @param string $value1
+     * @param string $value2
+     * @param string $values...
+     * @return string to concatenate two strings
+     * @access public
+     **/
+    function concat($value1, $value2)
+    {
+        $args = func_get_args();
+        return "CONCAT(".implode(', ', $args).")";
+    }
+
+    // }}}
+    // {{{ guid()
+
+    /**
+     * Returns global unique identifier
+     *
+     * @return string to get global unique identifier
+     * @access public
+     */
+    function guid()
+    {
+        return 'UUID()';
+    }
+
+    // }}}
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Function/pgsql.php b/3rdparty/MDB2/Driver/Function/pgsql.php
new file mode 100644
index 00000000000..173bfc91494
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Function/pgsql.php
@@ -0,0 +1,115 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Paul Cooper <pgc@ucecom.com>                                 |
+// +----------------------------------------------------------------------+
+//
+// $Id: pgsql.php,v 1.11 2008/11/09 19:46:50 quipo Exp $
+
+require_once('MDB2/Driver/Function/Common.php');
+
+/**
+ * MDB2 MySQL driver for the function modules
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Function_pgsql extends MDB2_Driver_Function_Common
+{
+    // {{{ executeStoredProc()
+
+    /**
+     * Execute a stored procedure and return any results
+     *
+     * @param string $name string that identifies the function to execute
+     * @param mixed  $params  array that contains the paramaters to pass the stored proc
+     * @param mixed   $types  array that contains the types of the columns in
+     *                        the result set
+     * @param mixed $result_class string which specifies which result class to use
+     * @param mixed $result_wrap_class string which specifies which class to wrap results in
+     * @return mixed a result handle or MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function &executeStoredProc($name, $params = null, $types = null, $result_class = true, $result_wrap_class = false)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = 'SELECT * FROM '.$name;
+        $query .= $params ? '('.implode(', ', $params).')' : '()';
+        return $db->query($query, $types, $result_class, $result_wrap_class);
+    }
+    // }}}
+    // {{{ unixtimestamp()
+
+    /**
+     * return string to call a function to get the unix timestamp from a iso timestamp
+     *
+     * @param string $expression
+     *
+     * @return string to call a variable with the timestamp
+     * @access public
+     */
+    function unixtimestamp($expression)
+    {
+        return 'EXTRACT(EPOCH FROM DATE_TRUNC(\'seconds\', CAST ((' . $expression . ') AS TIMESTAMP)))';
+    }
+
+    // }}}
+    // {{{ random()
+
+    /**
+     * return string to call a function to get random value inside an SQL statement
+     *
+     * @return return string to generate float between 0 and 1
+     * @access public
+     */
+    function random()
+    {
+        return 'RANDOM()';
+    }
+
+    // }}}
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Function/sqlite.php b/3rdparty/MDB2/Driver/Function/sqlite.php
new file mode 100644
index 00000000000..8a5b7ec8fad
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Function/sqlite.php
@@ -0,0 +1,162 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: sqlite.php,v 1.10 2008/02/17 18:54:08 quipo Exp $
+//
+
+require_once('MDB2/Driver/Function/Common.php');
+
+/**
+ * MDB2 SQLite driver for the function modules
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Function_sqlite extends MDB2_Driver_Function_Common
+{
+    // {{{ constructor
+
+    /**
+     * Constructor
+     */
+    function __construct($db_index)
+    {
+        parent::__construct($db_index);
+        // create all sorts of UDFs
+    }
+
+    // {{{ now()
+
+    /**
+     * Return string to call a variable with the current timestamp inside an SQL statement
+     * There are three special variables for current date and time.
+     *
+     * @return string to call a variable with the current timestamp
+     * @access public
+     */
+    function now($type = 'timestamp')
+    {
+        switch ($type) {
+        case 'time':
+            return 'time(\'now\')';
+        case 'date':
+            return 'date(\'now\')';
+        case 'timestamp':
+        default:
+            return 'datetime(\'now\')';
+        }
+    }
+
+    // }}}
+    // {{{ unixtimestamp()
+
+    /**
+     * return string to call a function to get the unix timestamp from a iso timestamp
+     *
+     * @param string $expression
+     *
+     * @return string to call a variable with the timestamp
+     * @access public
+     */
+    function unixtimestamp($expression)
+    {
+        return 'strftime("%s",'. $expression.', "utc")';
+    }
+
+    // }}}
+    // {{{ substring()
+
+    /**
+     * return string to call a function to get a substring inside an SQL statement
+     *
+     * @return string to call a function to get a substring
+     * @access public
+     */
+    function substring($value, $position = 1, $length = null)
+    {
+        if (!is_null($length)) {
+            return "substr($value,$position,$length)";
+        }
+        return "substr($value,$position,length($value))";
+    }
+
+    // }}}
+    // {{{ random()
+
+    /**
+     * return string to call a function to get random value inside an SQL statement
+     *
+     * @return return string to generate float between 0 and 1
+     * @access public
+     */
+    function random()
+    {
+        return '((RANDOM()+2147483648)/4294967296)';
+    }
+
+    // }}}
+    // {{{ replace()
+
+    /**
+     * return string to call a function to get a replacement inside an SQL statement.
+     *
+     * @return string to call a function to get a replace
+     * @access public
+     */
+    function replace($str, $from_str, $to_str)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $error =& $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+        return $error;
+    }
+
+    // }}}
+}
+?>
diff --git a/3rdparty/MDB2/Driver/Manager/Common.php b/3rdparty/MDB2/Driver/Manager/Common.php
new file mode 100644
index 00000000000..9e16749bffc
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Manager/Common.php
@@ -0,0 +1,1014 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Authors: Lukas Smith <smith@pooteeweet.org>                          |
+// |          Lorenzo Alberton <l.alberton@quipo.it>                      |
+// +----------------------------------------------------------------------+
+//
+// $Id: Common.php,v 1.72 2009/01/14 15:00:40 quipo Exp $
+//
+
+/**
+ * @package  MDB2
+ * @category Database
+ * @author   Lukas Smith <smith@pooteeweet.org>
+ * @author   Lorenzo Alberton <l.alberton@quipo.it>
+ */
+
+/**
+ * Base class for the management modules that is extended by each MDB2 driver
+ *
+ * To load this module in the MDB2 object:
+ * $mdb->loadModule('Manager');
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Manager_Common extends MDB2_Module_Common
+{
+    // {{{ splitTableSchema()
+
+    /**
+     * Split the "[owner|schema].table" notation into an array
+     *
+     * @param string $table [schema and] table name
+     *
+     * @return array array(schema, table)
+     * @access private
+     */
+    function splitTableSchema($table)
+    {
+        $ret = array();
+        if (strpos($table, '.') !== false) {
+            return explode('.', $table);
+        }
+        return array(null, $table);
+    }
+
+    // }}}
+    // {{{ getFieldDeclarationList()
+
+    /**
+     * Get declaration of a number of field in bulk
+     *
+     * @param array $fields  a multidimensional associative array.
+     *      The first dimension determines the field name, while the second
+     *      dimension is keyed with the name of the properties
+     *      of the field being declared as array indexes. Currently, the types
+     *      of supported field properties are as follows:
+     *
+     *      default
+     *          Boolean value to be used as default for this field.
+     *
+     *      notnull
+     *          Boolean flag that indicates whether this field is constrained
+     *          to not be set to null.
+     *
+     * @return mixed string on success, a MDB2 error on failure
+     * @access public
+     */
+    function getFieldDeclarationList($fields)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (!is_array($fields) || empty($fields)) {
+            return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                'missing any fields', __FUNCTION__);
+        }
+        foreach ($fields as $field_name => $field) {
+            $query = $db->getDeclaration($field['type'], $field_name, $field);
+            if (PEAR::isError($query)) {
+                return $query;
+            }
+            $query_fields[] = $query;
+        }
+        return implode(', ', $query_fields);
+    }
+
+    // }}}
+    // {{{ _fixSequenceName()
+
+    /**
+     * Removes any formatting in an sequence name using the 'seqname_format' option
+     *
+     * @param string $sqn string that containts name of a potential sequence
+     * @param bool $check if only formatted sequences should be returned
+     * @return string name of the sequence with possible formatting removed
+     * @access protected
+     */
+    function _fixSequenceName($sqn, $check = false)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $seq_pattern = '/^'.preg_replace('/%s/', '([a-z0-9_]+)', $db->options['seqname_format']).'$/i';
+        $seq_name = preg_replace($seq_pattern, '\\1', $sqn);
+        if ($seq_name && !strcasecmp($sqn, $db->getSequenceName($seq_name))) {
+            return $seq_name;
+        }
+        if ($check) {
+            return false;
+        }
+        return $sqn;
+    }
+
+    // }}}
+    // {{{ _fixIndexName()
+
+    /**
+     * Removes any formatting in an index name using the 'idxname_format' option
+     *
+     * @param string $idx string that containts name of anl index
+     * @return string name of the index with eventual formatting removed
+     * @access protected
+     */
+    function _fixIndexName($idx)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $idx_pattern = '/^'.preg_replace('/%s/', '([a-z0-9_]+)', $db->options['idxname_format']).'$/i';
+        $idx_name = preg_replace($idx_pattern, '\\1', $idx);
+        if ($idx_name && !strcasecmp($idx, $db->getIndexName($idx_name))) {
+            return $idx_name;
+        }
+        return $idx;
+    }
+
+    // }}}
+    // {{{ createDatabase()
+
+    /**
+     * create a new database
+     *
+     * @param string $name    name of the database that should be created
+     * @param array  $options array with charset, collation info
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createDatabase($database, $options = array())
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ alterDatabase()
+
+    /**
+     * alter an existing database
+     *
+     * @param string $name    name of the database that should be created
+     * @param array  $options array with charset, collation info
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function alterDatabase($database, $options = array())
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ dropDatabase()
+
+    /**
+     * drop an existing database
+     *
+     * @param string $name name of the database that should be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropDatabase($database)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ _getCreateTableQuery()
+
+    /**
+     * Create a basic SQL query for a new table creation
+     *
+     * @param string $name    Name of the database that should be created
+     * @param array  $fields  Associative array that contains the definition of each field of the new table
+     * @param array  $options An associative array of table options
+     *
+     * @return mixed string (the SQL query) on success, a MDB2 error on failure
+     * @see createTable()
+     */
+    function _getCreateTableQuery($name, $fields, $options = array())
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (!$name) {
+            return $db->raiseError(MDB2_ERROR_CANNOT_CREATE, null, null,
+                'no valid table name specified', __FUNCTION__);
+        }
+        if (empty($fields)) {
+            return $db->raiseError(MDB2_ERROR_CANNOT_CREATE, null, null,
+                'no fields specified for table "'.$name.'"', __FUNCTION__);
+        }
+        $query_fields = $this->getFieldDeclarationList($fields);
+        if (PEAR::isError($query_fields)) {
+            return $query_fields;
+        }
+        if (!empty($options['primary'])) {
+            $query_fields.= ', PRIMARY KEY ('.implode(', ', array_keys($options['primary'])).')';
+        }
+
+        $name = $db->quoteIdentifier($name, true);
+        $result = 'CREATE ';
+        if (!empty($options['temporary'])) {
+            $result .= $this->_getTemporaryTableQuery();
+        }
+        $result .= " TABLE $name ($query_fields)";
+        return $result;
+    }
+
+    // }}}
+    // {{{ _getTemporaryTableQuery()
+
+    /**
+     * A method to return the required SQL string that fits between CREATE ... TABLE
+     * to create the table as a temporary table.
+     *
+     * Should be overridden in driver classes to return the correct string for the
+     * specific database type.
+     *
+     * The default is to return the string "TEMPORARY" - this will result in a
+     * SQL error for any database that does not support temporary tables, or that
+     * requires a different SQL command from "CREATE TEMPORARY TABLE".
+     *
+     * @return string The string required to be placed between "CREATE" and "TABLE"
+     *                to generate a temporary table, if possible.
+     */
+    function _getTemporaryTableQuery()
+    {
+        return 'TEMPORARY';
+    }
+
+    // }}}
+    // {{{ createTable()
+
+    /**
+     * create a new table
+     *
+     * @param string $name   Name of the database that should be created
+     * @param array $fields  Associative array that contains the definition of each field of the new table
+     *                       The indexes of the array entries are the names of the fields of the table an
+     *                       the array entry values are associative arrays like those that are meant to be
+     *                       passed with the field definitions to get[Type]Declaration() functions.
+     *                          array(
+     *                              'id' => array(
+     *                                  'type' => 'integer',
+     *                                  'unsigned' => 1
+     *                                  'notnull' => 1
+     *                                  'default' => 0
+     *                              ),
+     *                              'name' => array(
+     *                                  'type' => 'text',
+     *                                  'length' => 12
+     *                              ),
+     *                              'password' => array(
+     *                                  'type' => 'text',
+     *                                  'length' => 12
+     *                              )
+     *                          );
+     * @param array $options  An associative array of table options:
+     *                          array(
+     *                              'comment' => 'Foo',
+     *                              'temporary' => true|false,
+     *                          );
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createTable($name, $fields, $options = array())
+    {
+        $query = $this->_getCreateTableQuery($name, $fields, $options);
+        if (PEAR::isError($query)) {
+            return $query;
+        }
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        $result = $db->exec($query);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ dropTable()
+
+    /**
+     * drop an existing table
+     *
+     * @param string $name name of the table that should be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropTable($name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $name = $db->quoteIdentifier($name, true);
+        return $db->exec("DROP TABLE $name");
+    }
+
+    // }}}
+    // {{{ truncateTable()
+
+    /**
+     * Truncate an existing table (if the TRUNCATE TABLE syntax is not supported,
+     * it falls back to a DELETE FROM TABLE query)
+     *
+     * @param string $name name of the table that should be truncated
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function truncateTable($name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $name = $db->quoteIdentifier($name, true);
+        return $db->exec("DELETE FROM $name");
+    }
+
+    // }}}
+    // {{{ vacuum()
+
+    /**
+     * Optimize (vacuum) all the tables in the db (or only the specified table)
+     * and optionally run ANALYZE.
+     *
+     * @param string $table table name (all the tables if empty)
+     * @param array  $options an array with driver-specific options:
+     *               - timeout [int] (in seconds) [mssql-only]
+     *               - analyze [boolean] [pgsql and mysql]
+     *               - full [boolean] [pgsql-only]
+     *               - freeze [boolean] [pgsql-only]
+     *
+     * @return mixed MDB2_OK success, a MDB2 error on failure
+     * @access public
+     */
+    function vacuum($table = null, $options = array())
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ alterTable()
+
+    /**
+     * alter an existing table
+     *
+     * @param string $name         name of the table that is intended to be changed.
+     * @param array $changes     associative array that contains the details of each type
+     *                             of change that is intended to be performed. The types of
+     *                             changes that are currently supported are defined as follows:
+     *
+     *                             name
+     *
+     *                                New name for the table.
+     *
+     *                            add
+     *
+     *                                Associative array with the names of fields to be added as
+     *                                 indexes of the array. The value of each entry of the array
+     *                                 should be set to another associative array with the properties
+     *                                 of the fields to be added. The properties of the fields should
+     *                                 be the same as defined by the MDB2 parser.
+     *
+     *
+     *                            remove
+     *
+     *                                Associative array with the names of fields to be removed as indexes
+     *                                 of the array. Currently the values assigned to each entry are ignored.
+     *                                 An empty array should be used for future compatibility.
+     *
+     *                            rename
+     *
+     *                                Associative array with the names of fields to be renamed as indexes
+     *                                 of the array. The value of each entry of the array should be set to
+     *                                 another associative array with the entry named name with the new
+     *                                 field name and the entry named Declaration that is expected to contain
+     *                                 the portion of the field declaration already in DBMS specific SQL code
+     *                                 as it is used in the CREATE TABLE statement.
+     *
+     *                            change
+     *
+     *                                Associative array with the names of the fields to be changed as indexes
+     *                                 of the array. Keep in mind that if it is intended to change either the
+     *                                 name of a field and any other properties, the change array entries
+     *                                 should have the new names of the fields as array indexes.
+     *
+     *                                The value of each entry of the array should be set to another associative
+     *                                 array with the properties of the fields to that are meant to be changed as
+     *                                 array entries. These entries should be assigned to the new values of the
+     *                                 respective properties. The properties of the fields should be the same
+     *                                 as defined by the MDB2 parser.
+     *
+     *                            Example
+     *                                array(
+     *                                    'name' => 'userlist',
+     *                                    'add' => array(
+     *                                        'quota' => array(
+     *                                            'type' => 'integer',
+     *                                            'unsigned' => 1
+     *                                        )
+     *                                    ),
+     *                                    'remove' => array(
+     *                                        'file_limit' => array(),
+     *                                        'time_limit' => array()
+     *                                    ),
+     *                                    'change' => array(
+     *                                        'name' => array(
+     *                                            'length' => '20',
+     *                                            'definition' => array(
+     *                                                'type' => 'text',
+     *                                                'length' => 20,
+     *                                            ),
+     *                                        )
+     *                                    ),
+     *                                    'rename' => array(
+     *                                        'sex' => array(
+     *                                            'name' => 'gender',
+     *                                            'definition' => array(
+     *                                                'type' => 'text',
+     *                                                'length' => 1,
+     *                                                'default' => 'M',
+     *                                            ),
+     *                                        )
+     *                                    )
+     *                                )
+     *
+     * @param boolean $check     indicates whether the function should just check if the DBMS driver
+     *                             can perform the requested table alterations if the value is true or
+     *                             actually perform them otherwise.
+     * @access public
+     *
+      * @return mixed MDB2_OK on success, a MDB2 error on failure
+     */
+    function alterTable($name, $changes, $check)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ listDatabases()
+
+    /**
+     * list all databases
+     *
+     * @return mixed array of database names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listDatabases()
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implementedd', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ listUsers()
+
+    /**
+     * list all users
+     *
+     * @return mixed array of user names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listUsers()
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ listViews()
+
+    /**
+     * list all views in the current database
+     *
+     * @param string database, the current is default
+     *               NB: not all the drivers can get the view names from
+     *               a database other than the current one
+     * @return mixed array of view names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listViews($database = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ listTableViews()
+
+    /**
+     * list the views in the database that reference a given table
+     *
+     * @param string table for which all referenced views should be found
+     * @return mixed array of view names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableViews($table)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ listTableTriggers()
+
+    /**
+     * list all triggers in the database that reference a given table
+     *
+     * @param string table for which all referenced triggers should be found
+     * @return mixed array of trigger names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableTriggers($table = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ listFunctions()
+
+    /**
+     * list all functions in the current database
+     *
+     * @return mixed array of function names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listFunctions()
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ listTables()
+
+    /**
+     * list all tables in the current database
+     *
+     * @param string database, the current is default.
+     *               NB: not all the drivers can get the table names from
+     *               a database other than the current one
+     * @return mixed array of table names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTables($database = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ listTableFields()
+
+    /**
+     * list all fields in a table in the current database
+     *
+     * @param string $table name of table that should be used in method
+     * @return mixed array of field names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableFields($table)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ createIndex()
+
+    /**
+     * Get the stucture of a field into an array
+     *
+     * @param string    $table         name of the table on which the index is to be created
+     * @param string    $name         name of the index to be created
+     * @param array     $definition        associative array that defines properties of the index to be created.
+     *                                 Currently, only one property named FIELDS is supported. This property
+     *                                 is also an associative with the names of the index fields as array
+     *                                 indexes. Each entry of this array is set to another type of associative
+     *                                 array that specifies properties of the index that are specific to
+     *                                 each field.
+     *
+     *                                Currently, only the sorting property is supported. It should be used
+     *                                 to define the sorting direction of the index. It may be set to either
+     *                                 ascending or descending.
+     *
+     *                                Not all DBMS support index sorting direction configuration. The DBMS
+     *                                 drivers of those that do not support it ignore this property. Use the
+     *                                 function supports() to determine whether the DBMS driver can manage indexes.
+     *
+     *                                 Example
+     *                                    array(
+     *                                        'fields' => array(
+     *                                            'user_name' => array(
+     *                                                'sorting' => 'ascending'
+     *                                            ),
+     *                                            'last_login' => array()
+     *                                        )
+     *                                    )
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createIndex($table, $name, $definition)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $table = $db->quoteIdentifier($table, true);
+        $name = $db->quoteIdentifier($db->getIndexName($name), true);
+        $query = "CREATE INDEX $name ON $table";
+        $fields = array();
+        foreach (array_keys($definition['fields']) as $field) {
+            $fields[] = $db->quoteIdentifier($field, true);
+        }
+        $query .= ' ('. implode(', ', $fields) . ')';
+        return $db->exec($query);
+    }
+
+    // }}}
+    // {{{ dropIndex()
+
+    /**
+     * drop existing index
+     *
+     * @param string    $table         name of table that should be used in method
+     * @param string    $name         name of the index to be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropIndex($table, $name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $name = $db->quoteIdentifier($db->getIndexName($name), true);
+        return $db->exec("DROP INDEX $name");
+    }
+
+    // }}}
+    // {{{ listTableIndexes()
+
+    /**
+     * list all indexes in a table
+     *
+     * @param string $table name of table that should be used in method
+     * @return mixed array of index names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableIndexes($table)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ _getAdvancedFKOptions()
+
+    /**
+     * Return the FOREIGN KEY query section dealing with non-standard options
+     * as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
+     *
+     * @param array $definition
+     * @return string
+     * @access protected
+     */
+    function _getAdvancedFKOptions($definition)
+    {
+        return '';
+    }
+
+    // }}}
+    // {{{ createConstraint()
+
+    /**
+     * create a constraint on a table
+     *
+     * @param string    $table       name of the table on which the constraint is to be created
+     * @param string    $name        name of the constraint to be created
+     * @param array     $definition  associative array that defines properties of the constraint to be created.
+     *                               The full structure of the array looks like this:
+     *          <pre>
+     *          array (
+     *              [primary] => 0
+     *              [unique]  => 0
+     *              [foreign] => 1
+     *              [check]   => 0
+     *              [fields] => array (
+     *                  [field1name] => array() // one entry per each field covered
+     *                  [field2name] => array() // by the index
+     *                  [field3name] => array(
+     *                      [sorting]  => ascending
+     *                      [position] => 3
+     *                  )
+     *              )
+     *              [references] => array(
+     *                  [table] => name
+     *                  [fields] => array(
+     *                      [field1name] => array(  //one entry per each referenced field
+     *                           [position] => 1
+     *                      )
+     *                  )
+     *              )
+     *              [deferrable] => 0
+     *              [initiallydeferred] => 0
+     *              [onupdate] => CASCADE|RESTRICT|SET NULL|SET DEFAULT|NO ACTION
+     *              [ondelete] => CASCADE|RESTRICT|SET NULL|SET DEFAULT|NO ACTION
+     *              [match] => SIMPLE|PARTIAL|FULL
+     *          );
+     *          </pre>
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createConstraint($table, $name, $definition)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        $table = $db->quoteIdentifier($table, true);
+        $name = $db->quoteIdentifier($db->getIndexName($name), true);
+        $query = "ALTER TABLE $table ADD CONSTRAINT $name";
+        if (!empty($definition['primary'])) {
+            $query.= ' PRIMARY KEY';
+        } elseif (!empty($definition['unique'])) {
+            $query.= ' UNIQUE';
+        } elseif (!empty($definition['foreign'])) {
+            $query.= ' FOREIGN KEY';
+        }
+        $fields = array();
+        foreach (array_keys($definition['fields']) as $field) {
+            $fields[] = $db->quoteIdentifier($field, true);
+        }
+        $query .= ' ('. implode(', ', $fields) . ')';
+        if (!empty($definition['foreign'])) {
+            $query.= ' REFERENCES ' . $db->quoteIdentifier($definition['references']['table'], true);
+            $referenced_fields = array();
+            foreach (array_keys($definition['references']['fields']) as $field) {
+                $referenced_fields[] = $db->quoteIdentifier($field, true);
+            }
+            $query .= ' ('. implode(', ', $referenced_fields) . ')';
+            $query .= $this->_getAdvancedFKOptions($definition);
+        }
+        return $db->exec($query);
+    }
+
+    // }}}
+    // {{{ dropConstraint()
+
+    /**
+     * drop existing constraint
+     *
+     * @param string    $table        name of table that should be used in method
+     * @param string    $name         name of the constraint to be dropped
+     * @param string    $primary      hint if the constraint is primary
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropConstraint($table, $name, $primary = false)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $table = $db->quoteIdentifier($table, true);
+        $name = $db->quoteIdentifier($db->getIndexName($name), true);
+        return $db->exec("ALTER TABLE $table DROP CONSTRAINT $name");
+    }
+
+    // }}}
+    // {{{ listTableConstraints()
+
+    /**
+     * list all constraints in a table
+     *
+     * @param string $table name of table that should be used in method
+     * @return mixed array of constraint names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableConstraints($table)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ createSequence()
+
+    /**
+     * create sequence
+     *
+     * @param string    $seq_name     name of the sequence to be created
+     * @param string    $start         start value of the sequence; default is 1
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createSequence($seq_name, $start = 1)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ dropSequence()
+
+    /**
+     * drop existing sequence
+     *
+     * @param string    $seq_name     name of the sequence to be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropSequence($name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ listSequences()
+
+    /**
+     * list all sequences in the current database
+     *
+     * @param string database, the current is default
+     *               NB: not all the drivers can get the sequence names from
+     *               a database other than the current one
+     * @return mixed array of sequence names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listSequences($database = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Manager/mysql.php b/3rdparty/MDB2/Driver/Manager/mysql.php
new file mode 100644
index 00000000000..099ed48a84f
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Manager/mysql.php
@@ -0,0 +1,1432 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: mysql.php,v 1.113 2008/11/23 20:30:29 quipo Exp $
+//
+
+require_once('MDB2/Driver/Manager/Common.php');
+
+/**
+ * MDB2 MySQL driver for the management modules
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Manager_mysql extends MDB2_Driver_Manager_Common
+{
+
+    // }}}
+    // {{{ createDatabase()
+
+    /**
+     * create a new database
+     *
+     * @param string $name    name of the database that should be created
+     * @param array  $options array with charset, collation info
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createDatabase($name, $options = array())
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $name  = $db->quoteIdentifier($name, true);
+        $query = 'CREATE DATABASE ' . $name;
+        if (!empty($options['charset'])) {
+            $query .= ' DEFAULT CHARACTER SET ' . $db->quote($options['charset'], 'text');
+        }
+        if (!empty($options['collation'])) {
+            $query .= ' COLLATE ' . $db->quote($options['collation'], 'text');
+        }
+        return $db->standaloneQuery($query, null, true);
+    }
+
+    // }}}
+    // {{{ alterDatabase()
+
+    /**
+     * alter an existing database
+     *
+     * @param string $name    name of the database that is intended to be changed
+     * @param array  $options array with charset, collation info
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function alterDatabase($name, $options = array())
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = 'ALTER DATABASE '. $db->quoteIdentifier($name, true);
+        if (!empty($options['charset'])) {
+            $query .= ' DEFAULT CHARACTER SET ' . $db->quote($options['charset'], 'text');
+        }
+        if (!empty($options['collation'])) {
+            $query .= ' COLLATE ' . $db->quote($options['collation'], 'text');
+        }
+        return $db->standaloneQuery($query, null, true);
+    }
+
+    // }}}
+    // {{{ dropDatabase()
+
+    /**
+     * drop an existing database
+     *
+     * @param string $name name of the database that should be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropDatabase($name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $name = $db->quoteIdentifier($name, true);
+        $query = "DROP DATABASE $name";
+        return $db->standaloneQuery($query, null, true);
+    }
+
+    // }}}
+    // {{{ _getAdvancedFKOptions()
+
+    /**
+     * Return the FOREIGN KEY query section dealing with non-standard options
+     * as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
+     *
+     * @param array $definition
+     * @return string
+     * @access protected
+     */
+    function _getAdvancedFKOptions($definition)
+    {
+        $query = '';
+        if (!empty($definition['match'])) {
+            $query .= ' MATCH '.$definition['match'];
+        }
+        if (!empty($definition['onupdate'])) {
+            $query .= ' ON UPDATE '.$definition['onupdate'];
+        }
+        if (!empty($definition['ondelete'])) {
+            $query .= ' ON DELETE '.$definition['ondelete'];
+        }
+        return $query;
+    }
+
+    // }}}
+    // {{{ createTable()
+
+    /**
+     * create a new table
+     *
+     * @param string $name   Name of the database that should be created
+     * @param array $fields  Associative array that contains the definition of each field of the new table
+     *                       The indexes of the array entries are the names of the fields of the table an
+     *                       the array entry values are associative arrays like those that are meant to be
+     *                       passed with the field definitions to get[Type]Declaration() functions.
+     *                          array(
+     *                              'id' => array(
+     *                                  'type' => 'integer',
+     *                                  'unsigned' => 1
+     *                                  'notnull' => 1
+     *                                  'default' => 0
+     *                              ),
+     *                              'name' => array(
+     *                                  'type' => 'text',
+     *                                  'length' => 12
+     *                              ),
+     *                              'password' => array(
+     *                                  'type' => 'text',
+     *                                  'length' => 12
+     *                              )
+     *                          );
+     * @param array $options  An associative array of table options:
+     *                          array(
+     *                              'comment' => 'Foo',
+     *                              'charset' => 'utf8',
+     *                              'collate' => 'utf8_unicode_ci',
+     *                              'type'    => 'innodb',
+     *                          );
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createTable($name, $fields, $options = array())
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        // if we have an AUTO_INCREMENT column and a PK on more than one field,
+        // we have to handle it differently...
+        $autoincrement = null;
+        if (empty($options['primary'])) {
+            $pk_fields = array();
+            foreach ($fields as $fieldname => $def) {
+                if (!empty($def['primary'])) {
+                    $pk_fields[$fieldname] = true;
+                }
+                if (!empty($def['autoincrement'])) {
+                    $autoincrement = $fieldname;
+                }
+            }
+            if (!is_null($autoincrement) && count($pk_fields) > 1) {
+                $options['primary'] = $pk_fields;
+            } else {
+                // the PK constraint is on max one field => OK
+                $autoincrement = null;
+            }
+        }
+
+        $query = $this->_getCreateTableQuery($name, $fields, $options);
+        if (PEAR::isError($query)) {
+            return $query;
+        }
+
+        if (!is_null($autoincrement)) {
+            // we have to remove the PK clause added by _getIntegerDeclaration()
+            $query = str_replace('AUTO_INCREMENT PRIMARY KEY', 'AUTO_INCREMENT', $query);
+        }
+
+        $options_strings = array();
+
+        if (!empty($options['comment'])) {
+            $options_strings['comment'] = 'COMMENT = '.$db->quote($options['comment'], 'text');
+        }
+
+        if (!empty($options['charset'])) {
+            $options_strings['charset'] = 'DEFAULT CHARACTER SET '.$options['charset'];
+            if (!empty($options['collate'])) {
+                $options_strings['charset'].= ' COLLATE '.$options['collate'];
+            }
+        }
+
+        $type = false;
+        if (!empty($options['type'])) {
+            $type = $options['type'];
+        } elseif ($db->options['default_table_type']) {
+            $type = $db->options['default_table_type'];
+        }
+        if ($type) {
+            $options_strings[] = "ENGINE = $type";
+        }
+
+        if (!empty($options_strings)) {
+            $query .= ' '.implode(' ', $options_strings);
+        }
+        $result = $db->exec($query);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ dropTable()
+
+    /**
+     * drop an existing table
+     *
+     * @param string $name name of the table that should be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropTable($name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        //delete the triggers associated to existing FK constraints
+        $constraints = $this->listTableConstraints($name);
+        if (!PEAR::isError($constraints) && !empty($constraints)) {
+            $db->loadModule('Reverse', null, true);
+            foreach ($constraints as $constraint) {
+                $definition = $db->reverse->getTableConstraintDefinition($name, $constraint);
+                if (!PEAR::isError($definition) && !empty($definition['foreign'])) {
+                    $result = $this->_dropFKTriggers($name, $constraint, $definition['references']['table']);
+                    if (PEAR::isError($result)) {
+                        return $result;
+                    }
+                }
+            }
+        }
+
+        return parent::dropTable($name);
+    }
+
+    // }}}
+    // {{{ truncateTable()
+
+    /**
+     * Truncate an existing table (if the TRUNCATE TABLE syntax is not supported,
+     * it falls back to a DELETE FROM TABLE query)
+     *
+     * @param string $name name of the table that should be truncated
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function truncateTable($name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $name = $db->quoteIdentifier($name, true);
+        return $db->exec("TRUNCATE TABLE $name");
+    }
+
+    // }}}
+    // {{{ vacuum()
+
+    /**
+     * Optimize (vacuum) all the tables in the db (or only the specified table)
+     * and optionally run ANALYZE.
+     *
+     * @param string $table table name (all the tables if empty)
+     * @param array  $options an array with driver-specific options:
+     *               - timeout [int] (in seconds) [mssql-only]
+     *               - analyze [boolean] [pgsql and mysql]
+     *               - full [boolean] [pgsql-only]
+     *               - freeze [boolean] [pgsql-only]
+     *
+     * @return mixed MDB2_OK success, a MDB2 error on failure
+     * @access public
+     */
+    function vacuum($table = null, $options = array())
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (empty($table)) {
+            $table = $this->listTables();
+            if (PEAR::isError($table)) {
+                return $table;
+            }
+        }
+        if (is_array($table)) {
+            foreach (array_keys($table) as $k) {
+            	$table[$k] = $db->quoteIdentifier($table[$k], true);
+            }
+            $table = implode(', ', $table);
+        } else {
+            $table = $db->quoteIdentifier($table, true);
+        }
+        
+        $result = $db->exec('OPTIMIZE TABLE '.$table);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if (!empty($options['analyze'])) {
+            return $db->exec('ANALYZE TABLE '.$table);
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ alterTable()
+
+    /**
+     * alter an existing table
+     *
+     * @param string $name         name of the table that is intended to be changed.
+     * @param array $changes     associative array that contains the details of each type
+     *                             of change that is intended to be performed. The types of
+     *                             changes that are currently supported are defined as follows:
+     *
+     *                             name
+     *
+     *                                New name for the table.
+     *
+     *                            add
+     *
+     *                                Associative array with the names of fields to be added as
+     *                                 indexes of the array. The value of each entry of the array
+     *                                 should be set to another associative array with the properties
+     *                                 of the fields to be added. The properties of the fields should
+     *                                 be the same as defined by the MDB2 parser.
+     *
+     *
+     *                            remove
+     *
+     *                                Associative array with the names of fields to be removed as indexes
+     *                                 of the array. Currently the values assigned to each entry are ignored.
+     *                                 An empty array should be used for future compatibility.
+     *
+     *                            rename
+     *
+     *                                Associative array with the names of fields to be renamed as indexes
+     *                                 of the array. The value of each entry of the array should be set to
+     *                                 another associative array with the entry named name with the new
+     *                                 field name and the entry named Declaration that is expected to contain
+     *                                 the portion of the field declaration already in DBMS specific SQL code
+     *                                 as it is used in the CREATE TABLE statement.
+     *
+     *                            change
+     *
+     *                                Associative array with the names of the fields to be changed as indexes
+     *                                 of the array. Keep in mind that if it is intended to change either the
+     *                                 name of a field and any other properties, the change array entries
+     *                                 should have the new names of the fields as array indexes.
+     *
+     *                                The value of each entry of the array should be set to another associative
+     *                                 array with the properties of the fields to that are meant to be changed as
+     *                                 array entries. These entries should be assigned to the new values of the
+     *                                 respective properties. The properties of the fields should be the same
+     *                                 as defined by the MDB2 parser.
+     *
+     *                            Example
+     *                                array(
+     *                                    'name' => 'userlist',
+     *                                    'add' => array(
+     *                                        'quota' => array(
+     *                                            'type' => 'integer',
+     *                                            'unsigned' => 1
+     *                                        )
+     *                                    ),
+     *                                    'remove' => array(
+     *                                        'file_limit' => array(),
+     *                                        'time_limit' => array()
+     *                                    ),
+     *                                    'change' => array(
+     *                                        'name' => array(
+     *                                            'length' => '20',
+     *                                            'definition' => array(
+     *                                                'type' => 'text',
+     *                                                'length' => 20,
+     *                                            ),
+     *                                        )
+     *                                    ),
+     *                                    'rename' => array(
+     *                                        'sex' => array(
+     *                                            'name' => 'gender',
+     *                                            'definition' => array(
+     *                                                'type' => 'text',
+     *                                                'length' => 1,
+     *                                                'default' => 'M',
+     *                                            ),
+     *                                        )
+     *                                    )
+     *                                )
+     *
+     * @param boolean $check     indicates whether the function should just check if the DBMS driver
+     *                             can perform the requested table alterations if the value is true or
+     *                             actually perform them otherwise.
+     * @access public
+     *
+      * @return mixed MDB2_OK on success, a MDB2 error on failure
+     */
+    function alterTable($name, $changes, $check)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        foreach ($changes as $change_name => $change) {
+            switch ($change_name) {
+            case 'add':
+            case 'remove':
+            case 'change':
+            case 'rename':
+            case 'name':
+                break;
+            default:
+                return $db->raiseError(MDB2_ERROR_CANNOT_ALTER, null, null,
+                    'change type "'.$change_name.'" not yet supported', __FUNCTION__);
+            }
+        }
+
+        if ($check) {
+            return MDB2_OK;
+        }
+
+        $query = '';
+        if (!empty($changes['name'])) {
+            $change_name = $db->quoteIdentifier($changes['name'], true);
+            $query .= 'RENAME TO ' . $change_name;
+        }
+
+        if (!empty($changes['add']) && is_array($changes['add'])) {
+            foreach ($changes['add'] as $field_name => $field) {
+                if ($query) {
+                    $query.= ', ';
+                }
+                $query.= 'ADD ' . $db->getDeclaration($field['type'], $field_name, $field);
+            }
+        }
+
+        if (!empty($changes['remove']) && is_array($changes['remove'])) {
+            foreach ($changes['remove'] as $field_name => $field) {
+                if ($query) {
+                    $query.= ', ';
+                }
+                $field_name = $db->quoteIdentifier($field_name, true);
+                $query.= 'DROP ' . $field_name;
+            }
+        }
+
+        $rename = array();
+        if (!empty($changes['rename']) && is_array($changes['rename'])) {
+            foreach ($changes['rename'] as $field_name => $field) {
+                $rename[$field['name']] = $field_name;
+            }
+        }
+
+        if (!empty($changes['change']) && is_array($changes['change'])) {
+            foreach ($changes['change'] as $field_name => $field) {
+                if ($query) {
+                    $query.= ', ';
+                }
+                if (isset($rename[$field_name])) {
+                    $old_field_name = $rename[$field_name];
+                    unset($rename[$field_name]);
+                } else {
+                    $old_field_name = $field_name;
+                }
+                $old_field_name = $db->quoteIdentifier($old_field_name, true);
+                $query.= "CHANGE $old_field_name " . $db->getDeclaration($field['definition']['type'], $field_name, $field['definition']);
+            }
+        }
+
+        if (!empty($rename) && is_array($rename)) {
+            foreach ($rename as $rename_name => $renamed_field) {
+                if ($query) {
+                    $query.= ', ';
+                }
+                $field = $changes['rename'][$renamed_field];
+                $renamed_field = $db->quoteIdentifier($renamed_field, true);
+                $query.= 'CHANGE ' . $renamed_field . ' ' . $db->getDeclaration($field['definition']['type'], $field['name'], $field['definition']);
+            }
+        }
+
+        if (!$query) {
+            return MDB2_OK;
+        }
+
+        $name = $db->quoteIdentifier($name, true);
+        return $db->exec("ALTER TABLE $name $query");
+    }
+
+    // }}}
+    // {{{ listDatabases()
+
+    /**
+     * list all databases
+     *
+     * @return mixed array of database names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listDatabases()
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $result = $db->queryCol('SHOW DATABASES');
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ listUsers()
+
+    /**
+     * list all users
+     *
+     * @return mixed array of user names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listUsers()
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->queryCol('SELECT DISTINCT USER FROM mysql.USER');
+    }
+
+    // }}}
+    // {{{ listFunctions()
+
+    /**
+     * list all functions in the current database
+     *
+     * @return mixed array of function names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listFunctions()
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = "SELECT name FROM mysql.proc";
+        /*
+        SELECT ROUTINE_NAME
+          FROM INFORMATION_SCHEMA.ROUTINES
+         WHERE ROUTINE_TYPE = 'FUNCTION'
+        */
+        $result = $db->queryCol($query);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ listTableTriggers()
+
+    /**
+     * list all triggers in the database that reference a given table
+     *
+     * @param string table for which all referenced triggers should be found
+     * @return mixed array of trigger names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableTriggers($table = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = 'SHOW TRIGGERS';
+        if (!is_null($table)) {
+            $table = $db->quote($table, 'text');
+            $query .= " LIKE $table";
+        }
+        $result = $db->queryCol($query);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ listTables()
+
+    /**
+     * list all tables in the current database
+     *
+     * @param string database, the current is default
+     * @return mixed array of table names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTables($database = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = "SHOW /*!50002 FULL*/ TABLES";
+        if (!is_null($database)) {
+            $query .= " FROM $database";
+        }
+        $query.= "/*!50002  WHERE Table_type = 'BASE TABLE'*/";
+
+        $table_names = $db->queryAll($query, null, MDB2_FETCHMODE_ORDERED);
+        if (PEAR::isError($table_names)) {
+            return $table_names;
+        }
+
+        $result = array();
+        foreach ($table_names as $table) {
+            if (!$this->_fixSequenceName($table[0], true)) {
+                $result[] = $table[0];
+            }
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ listViews()
+
+    /**
+     * list all views in the current database
+     *
+     * @param string database, the current is default
+     * @return mixed array of view names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listViews($database = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = 'SHOW FULL TABLES';
+        if (!is_null($database)) {
+            $query.= " FROM $database";
+        }
+        $query.= " WHERE Table_type = 'VIEW'";
+
+        $result = $db->queryCol($query);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ listTableFields()
+
+    /**
+     * list all fields in a table in the current database
+     *
+     * @param string $table name of table that should be used in method
+     * @return mixed array of field names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableFields($table)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $table = $db->quoteIdentifier($table, true);
+        $result = $db->queryCol("SHOW COLUMNS FROM $table");
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ createIndex()
+
+    /**
+     * Get the stucture of a field into an array
+     *
+     * @author Leoncx
+     * @param string $table      name of the table on which the index is to be created
+     * @param string $name       name of the index to be created
+     * @param array  $definition associative array that defines properties of the index to be created.
+     *                           Currently, only one property named FIELDS is supported. This property
+     *                           is also an associative with the names of the index fields as array
+     *                           indexes. Each entry of this array is set to another type of associative
+     *                           array that specifies properties of the index that are specific to
+     *                           each field.
+     *
+     *                           Currently, only the sorting property is supported. It should be used
+     *                           to define the sorting direction of the index. It may be set to either
+     *                           ascending or descending.
+     *
+     *                           Not all DBMS support index sorting direction configuration. The DBMS
+     *                           drivers of those that do not support it ignore this property. Use the
+     *                           function supports() to determine whether the DBMS driver can manage indexes.
+     *
+     *                           Example
+     *                               array(
+     *                                   'fields' => array(
+     *                                       'user_name' => array(
+     *                                           'sorting' => 'ascending'
+     *                                           'length' => 10
+     *                                       ),
+     *                                       'last_login' => array()
+     *                                    )
+     *                                )
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createIndex($table, $name, $definition)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $table = $db->quoteIdentifier($table, true);
+        $name = $db->quoteIdentifier($db->getIndexName($name), true);
+        $query = "CREATE INDEX $name ON $table";
+        $fields = array();
+        foreach ($definition['fields'] as $field => $fieldinfo) {
+            if (!empty($fieldinfo['length'])) {
+                $fields[] = $db->quoteIdentifier($field, true) . '(' . $fieldinfo['length'] . ')';
+            } else {
+                $fields[] = $db->quoteIdentifier($field, true);
+            }
+        }
+        $query .= ' ('. implode(', ', $fields) . ')';
+        return $db->exec($query);
+    }
+
+    // }}}
+    // {{{ dropIndex()
+
+    /**
+     * drop existing index
+     *
+     * @param string    $table         name of table that should be used in method
+     * @param string    $name         name of the index to be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropIndex($table, $name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $table = $db->quoteIdentifier($table, true);
+        $name = $db->quoteIdentifier($db->getIndexName($name), true);
+        return $db->exec("DROP INDEX $name ON $table");
+    }
+
+    // }}}
+    // {{{ listTableIndexes()
+
+    /**
+     * list all indexes in a table
+     *
+     * @param string $table name of table that should be used in method
+     * @return mixed array of index names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableIndexes($table)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $key_name = 'Key_name';
+        $non_unique = 'Non_unique';
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            if ($db->options['field_case'] == CASE_LOWER) {
+                $key_name = strtolower($key_name);
+                $non_unique = strtolower($non_unique);
+            } else {
+                $key_name = strtoupper($key_name);
+                $non_unique = strtoupper($non_unique);
+            }
+        }
+
+        $table = $db->quoteIdentifier($table, true);
+        $query = "SHOW INDEX FROM $table";
+        $indexes = $db->queryAll($query, null, MDB2_FETCHMODE_ASSOC);
+        if (PEAR::isError($indexes)) {
+            return $indexes;
+        }
+
+        $result = array();
+        foreach ($indexes as $index_data) {
+            if ($index_data[$non_unique] && ($index = $this->_fixIndexName($index_data[$key_name]))) {
+                $result[$index] = true;
+            }
+        }
+
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_change_key_case($result, $db->options['field_case']);
+        }
+        return array_keys($result);
+    }
+
+    // }}}
+    // {{{ createConstraint()
+
+    /**
+     * create a constraint on a table
+     *
+     * @param string    $table        name of the table on which the constraint is to be created
+     * @param string    $name         name of the constraint to be created
+     * @param array     $definition   associative array that defines properties of the constraint to be created.
+     *                                Currently, only one property named FIELDS is supported. This property
+     *                                is also an associative with the names of the constraint fields as array
+     *                                constraints. Each entry of this array is set to another type of associative
+     *                                array that specifies properties of the constraint that are specific to
+     *                                each field.
+     *
+     *                                Example
+     *                                   array(
+     *                                       'fields' => array(
+     *                                           'user_name' => array(),
+     *                                           'last_login' => array()
+     *                                       )
+     *                                   )
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createConstraint($table, $name, $definition)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $type = '';
+        $idx_name = $db->quoteIdentifier($db->getIndexName($name), true);
+        if (!empty($definition['primary'])) {
+            $type = 'PRIMARY';
+            $idx_name = 'KEY';
+        } elseif (!empty($definition['unique'])) {
+            $type = 'UNIQUE';
+        } elseif (!empty($definition['foreign'])) {
+            $type = 'CONSTRAINT';
+        }
+        if (empty($type)) {
+            return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                'invalid definition, could not create constraint', __FUNCTION__);
+        }
+
+        $table_quoted = $db->quoteIdentifier($table, true);
+        $query = "ALTER TABLE $table_quoted ADD $type $idx_name";
+        if (!empty($definition['foreign'])) {
+            $query .= ' FOREIGN KEY';
+        }
+        $fields = array();
+        foreach ($definition['fields'] as $field => $fieldinfo) {
+            $quoted = $db->quoteIdentifier($field, true);
+            if (!empty($fieldinfo['length'])) {
+                $quoted .= '(' . $fieldinfo['length'] . ')';
+            }
+            $fields[] = $quoted;
+        }
+        $query .= ' ('. implode(', ', $fields) . ')';
+        if (!empty($definition['foreign'])) {
+            $query.= ' REFERENCES ' . $db->quoteIdentifier($definition['references']['table'], true);
+            $referenced_fields = array();
+            foreach (array_keys($definition['references']['fields']) as $field) {
+                $referenced_fields[] = $db->quoteIdentifier($field, true);
+            }
+            $query .= ' ('. implode(', ', $referenced_fields) . ')';
+            $query .= $this->_getAdvancedFKOptions($definition);
+
+            // add index on FK column(s) or we can't add a FK constraint
+            // @see http://forums.mysql.com/read.php?22,19755,226009
+            $result = $this->createIndex($table, $name.'_fkidx', $definition);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+        $res = $db->exec($query);
+        if (PEAR::isError($res)) {
+            return $res;
+        }
+        if (!empty($definition['foreign'])) {
+            return $this->_createFKTriggers($table, array($name => $definition));
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ dropConstraint()
+
+    /**
+     * drop existing constraint
+     *
+     * @param string    $table        name of table that should be used in method
+     * @param string    $name         name of the constraint to be dropped
+     * @param string    $primary      hint if the constraint is primary
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropConstraint($table, $name, $primary = false)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if ($primary || strtolower($name) == 'primary') {
+            $query = 'ALTER TABLE '. $db->quoteIdentifier($table, true) .' DROP PRIMARY KEY';
+            return $db->exec($query);
+        }
+
+        //is it a FK constraint? If so, also delete the associated triggers
+        $db->loadModule('Reverse', null, true);
+        $definition = $db->reverse->getTableConstraintDefinition($table, $name);
+        if (!PEAR::isError($definition) && !empty($definition['foreign'])) {
+            //first drop the FK enforcing triggers
+            $result = $this->_dropFKTriggers($table, $name, $definition['references']['table']);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+            //then drop the constraint itself
+            $table = $db->quoteIdentifier($table, true);
+            $name = $db->quoteIdentifier($db->getIndexName($name), true);
+            $query = "ALTER TABLE $table DROP FOREIGN KEY $name";
+            return $db->exec($query);
+        }
+
+        $table = $db->quoteIdentifier($table, true);
+        $name = $db->quoteIdentifier($db->getIndexName($name), true);
+        $query = "ALTER TABLE $table DROP INDEX $name";
+        return $db->exec($query);
+    }
+
+    // }}}
+    // {{{ _createFKTriggers()
+
+    /**
+     * Create triggers to enforce the FOREIGN KEY constraint on the table
+     *
+     * NB: since there's no RAISE_APPLICATION_ERROR facility in mysql,
+     * we call a non-existent procedure to raise the FK violation message.
+     * @see http://forums.mysql.com/read.php?99,55108,71877#msg-71877
+     *
+     * @param string $table        table name
+     * @param array  $foreign_keys FOREIGN KEY definitions
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access private
+     */
+    function _createFKTriggers($table, $foreign_keys)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        // create triggers to enforce FOREIGN KEY constraints
+        if ($db->supports('triggers') && !empty($foreign_keys)) {
+            $table_quoted = $db->quoteIdentifier($table, true);
+            foreach ($foreign_keys as $fkname => $fkdef) {
+                if (empty($fkdef)) {
+                    continue;
+                }
+                //set actions to default if not set
+                $fkdef['onupdate'] = empty($fkdef['onupdate']) ? $db->options['default_fk_action_onupdate'] : strtoupper($fkdef['onupdate']);
+                $fkdef['ondelete'] = empty($fkdef['ondelete']) ? $db->options['default_fk_action_ondelete'] : strtoupper($fkdef['ondelete']);
+
+                $trigger_names = array(
+                    'insert'    => $fkname.'_insert_trg',
+                    'update'    => $fkname.'_update_trg',
+                    'pk_update' => $fkname.'_pk_update_trg',
+                    'pk_delete' => $fkname.'_pk_delete_trg',
+                );
+                $table_fields = array_keys($fkdef['fields']);
+                $referenced_fields = array_keys($fkdef['references']['fields']);
+
+                //create the ON [UPDATE|DELETE] triggers on the primary table
+                $restrict_action = ' IF (SELECT ';
+                $aliased_fields = array();
+                foreach ($table_fields as $field) {
+                    $aliased_fields[] = $table_quoted .'.'.$field .' AS '.$field;
+                }
+                $restrict_action .= implode(',', $aliased_fields)
+                       .' FROM '.$table_quoted
+                       .' WHERE ';
+                $conditions  = array();
+                $new_values  = array();
+                $null_values = array();
+                for ($i=0; $i<count($table_fields); $i++) {
+                    $conditions[]  = $table_fields[$i] .' = OLD.'.$referenced_fields[$i];
+                    $new_values[]  = $table_fields[$i] .' = NEW.'.$referenced_fields[$i];
+                    $null_values[] = $table_fields[$i] .' = NULL';
+                }
+                $conditions2 = array();
+                for ($i=0; $i<count($referenced_fields); $i++) {
+                    $conditions2[]  = 'NEW.'.$referenced_fields[$i] .' <> OLD.'.$referenced_fields[$i];
+                }
+                $restrict_action .= implode(' AND ', $conditions).') IS NOT NULL'
+                                .' AND (' .implode(' OR ', $conditions2) .')'
+                                .' THEN CALL %s_ON_TABLE_'.$table.'_VIOLATES_FOREIGN_KEY_CONSTRAINT();'
+                                .' END IF;';
+
+                $cascade_action_update = 'UPDATE '.$table_quoted.' SET '.implode(', ', $new_values) .' WHERE '.implode(' AND ', $conditions). ';';
+                $cascade_action_delete = 'DELETE FROM '.$table_quoted.' WHERE '.implode(' AND ', $conditions). ';';
+                $setnull_action        = 'UPDATE '.$table_quoted.' SET '.implode(', ', $null_values).' WHERE '.implode(' AND ', $conditions). ';';
+
+                if ('SET DEFAULT' == $fkdef['onupdate'] || 'SET DEFAULT' == $fkdef['ondelete']) {
+                    $db->loadModule('Reverse', null, true);
+                    $default_values = array();
+                    foreach ($table_fields as $table_field) {
+                        $field_definition = $db->reverse->getTableFieldDefinition($table, $field);
+                        if (PEAR::isError($field_definition)) {
+                            return $field_definition;
+                        }
+                        $default_values[] = $table_field .' = '. $field_definition[0]['default'];
+                    }
+                    $setdefault_action = 'UPDATE '.$table_quoted.' SET '.implode(', ', $default_values).' WHERE '.implode(' AND ', $conditions). ';';
+                }
+
+                $query = 'CREATE TRIGGER %s'
+                        .' %s ON '.$fkdef['references']['table']
+                        .' FOR EACH ROW BEGIN '
+                        .' SET FOREIGN_KEY_CHECKS = 0; ';  //only really needed for ON UPDATE CASCADE
+
+                if ('CASCADE' == $fkdef['onupdate']) {
+                    $sql_update = sprintf($query, $trigger_names['pk_update'], 'BEFORE UPDATE',  'update') . $cascade_action_update;
+                } elseif ('SET NULL' == $fkdef['onupdate']) {
+                    $sql_update = sprintf($query, $trigger_names['pk_update'], 'BEFORE UPDATE', 'update') . $setnull_action;
+                } elseif ('SET DEFAULT' == $fkdef['onupdate']) {
+                    $sql_update = sprintf($query, $trigger_names['pk_update'], 'BEFORE UPDATE', 'update') . $setdefault_action;
+                } elseif ('NO ACTION' == $fkdef['onupdate']) {
+                    $sql_update = sprintf($query.$restrict_action, $trigger_names['pk_update'], 'AFTER UPDATE', 'update');
+                } elseif ('RESTRICT' == $fkdef['onupdate']) {
+                    $sql_update = sprintf($query.$restrict_action, $trigger_names['pk_update'], 'BEFORE UPDATE', 'update');
+                }
+                if ('CASCADE' == $fkdef['ondelete']) {
+                    $sql_delete = sprintf($query, $trigger_names['pk_delete'], 'BEFORE DELETE',  'delete') . $cascade_action_delete;
+                } elseif ('SET NULL' == $fkdef['ondelete']) {
+                    $sql_delete = sprintf($query, $trigger_names['pk_delete'], 'BEFORE DELETE', 'delete') . $setnull_action;
+                } elseif ('SET DEFAULT' == $fkdef['ondelete']) {
+                    $sql_delete = sprintf($query, $trigger_names['pk_delete'], 'BEFORE DELETE', 'delete') . $setdefault_action;
+                } elseif ('NO ACTION' == $fkdef['ondelete']) {
+                    $sql_delete = sprintf($query.$restrict_action, $trigger_names['pk_delete'], 'AFTER DELETE', 'delete');
+                } elseif ('RESTRICT' == $fkdef['ondelete']) {
+                    $sql_delete = sprintf($query.$restrict_action, $trigger_names['pk_delete'], 'BEFORE DELETE', 'delete');
+                }
+                $sql_update .= ' SET FOREIGN_KEY_CHECKS = 1; END;';
+                $sql_delete .= ' SET FOREIGN_KEY_CHECKS = 1; END;';
+
+                $db->pushErrorHandling(PEAR_ERROR_RETURN);
+                $db->expectError(MDB2_ERROR_CANNOT_CREATE);
+                $result = $db->exec($sql_delete);
+                $expected_errmsg = 'This MySQL version doesn\'t support multiple triggers with the same action time and event for one table';
+                $db->popExpect();
+                $db->popErrorHandling();
+                if (PEAR::isError($result)) {
+                    if ($result->getCode() != MDB2_ERROR_CANNOT_CREATE) {
+                        return $result;
+                    }
+                    $db->warnings[] = $expected_errmsg;
+                }
+                $db->pushErrorHandling(PEAR_ERROR_RETURN);
+                $db->expectError(MDB2_ERROR_CANNOT_CREATE);
+                $result = $db->exec($sql_update);
+                $db->popExpect();
+                $db->popErrorHandling();
+                if (PEAR::isError($result) && $result->getCode() != MDB2_ERROR_CANNOT_CREATE) {
+                    if ($result->getCode() != MDB2_ERROR_CANNOT_CREATE) {
+                        return $result;
+                    }
+                    $db->warnings[] = $expected_errmsg;
+                }
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ _dropFKTriggers()
+
+    /**
+     * Drop the triggers created to enforce the FOREIGN KEY constraint on the table
+     *
+     * @param string $table            table name
+     * @param string $fkname           FOREIGN KEY constraint name
+     * @param string $referenced_table referenced table name
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access private
+     */
+    function _dropFKTriggers($table, $fkname, $referenced_table)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $triggers  = $this->listTableTriggers($table);
+        $triggers2 = $this->listTableTriggers($referenced_table);
+        if (!PEAR::isError($triggers2) && !PEAR::isError($triggers)) {
+            $triggers = array_merge($triggers, $triggers2);
+            $pattern = '/^'.$fkname.'(_pk)?_(insert|update|delete)_trg$/i';
+            foreach ($triggers as $trigger) {
+                if (preg_match($pattern, $trigger)) {
+                    $result = $db->exec('DROP TRIGGER '.$trigger);
+                    if (PEAR::isError($result)) {
+                        return $result;
+                    }
+                }
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ listTableConstraints()
+
+    /**
+     * list all constraints in a table
+     *
+     * @param string $table name of table that should be used in method
+     * @return mixed array of constraint names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableConstraints($table)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $key_name = 'Key_name';
+        $non_unique = 'Non_unique';
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            if ($db->options['field_case'] == CASE_LOWER) {
+                $key_name = strtolower($key_name);
+                $non_unique = strtolower($non_unique);
+            } else {
+                $key_name = strtoupper($key_name);
+                $non_unique = strtoupper($non_unique);
+            }
+        }
+
+        $query = 'SHOW INDEX FROM ' . $db->quoteIdentifier($table, true);
+        $indexes = $db->queryAll($query, null, MDB2_FETCHMODE_ASSOC);
+        if (PEAR::isError($indexes)) {
+            return $indexes;
+        }
+
+        $result = array();
+        foreach ($indexes as $index_data) {
+            if (!$index_data[$non_unique]) {
+                if ($index_data[$key_name] !== 'PRIMARY') {
+                    $index = $this->_fixIndexName($index_data[$key_name]);
+                } else {
+                    $index = 'PRIMARY';
+                }
+                if (!empty($index)) {
+                    $result[$index] = true;
+                }
+            }
+        }
+        
+        //list FOREIGN KEY constraints...
+        $query = 'SHOW CREATE TABLE '. $db->escape($table);
+        $definition = $db->queryOne($query, 'text', 1);
+        if (!PEAR::isError($definition) && !empty($definition)) {
+            $pattern = '/\bCONSTRAINT\b\s+([^\s]+)\s+\bFOREIGN KEY\b/Uims';
+            if (preg_match_all($pattern, str_replace('`', '', $definition), $matches) > 0) {
+                foreach ($matches[1] as $constraint) {
+                    $result[$constraint] = true;
+                }
+            }
+        }
+
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_change_key_case($result, $db->options['field_case']);
+        }
+        return array_keys($result);
+    }
+
+    // }}}
+    // {{{ createSequence()
+
+    /**
+     * create sequence
+     *
+     * @param string    $seq_name name of the sequence to be created
+     * @param string    $start    start value of the sequence; default is 1
+     * @param array     $options  An associative array of table options:
+     *                          array(
+     *                              'comment' => 'Foo',
+     *                              'charset' => 'utf8',
+     *                              'collate' => 'utf8_unicode_ci',
+     *                              'type'    => 'innodb',
+     *                          );
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createSequence($seq_name, $start = 1, $options = array())
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
+        $seqcol_name = $db->quoteIdentifier($db->options['seqcol_name'], true);
+        
+        $options_strings = array();
+
+        if (!empty($options['comment'])) {
+            $options_strings['comment'] = 'COMMENT = '.$db->quote($options['comment'], 'text');
+        }
+
+        if (!empty($options['charset'])) {
+            $options_strings['charset'] = 'DEFAULT CHARACTER SET '.$options['charset'];
+            if (!empty($options['collate'])) {
+                $options_strings['charset'].= ' COLLATE '.$options['collate'];
+            }
+        }
+
+        $type = false;
+        if (!empty($options['type'])) {
+            $type = $options['type'];
+        } elseif ($db->options['default_table_type']) {
+            $type = $db->options['default_table_type'];
+        }
+        if ($type) {
+            $options_strings[] = "ENGINE = $type";
+        }
+
+        $query = "CREATE TABLE $sequence_name ($seqcol_name INT NOT NULL AUTO_INCREMENT, PRIMARY KEY ($seqcol_name))";
+        if (!empty($options_strings)) {
+            $query .= ' '.implode(' ', $options_strings);
+        }
+        $res = $db->exec($query);
+        if (PEAR::isError($res)) {
+            return $res;
+        }
+
+        if ($start == 1) {
+            return MDB2_OK;
+        }
+
+        $query = "INSERT INTO $sequence_name ($seqcol_name) VALUES (".($start-1).')';
+        $res = $db->exec($query);
+        if (!PEAR::isError($res)) {
+            return MDB2_OK;
+        }
+
+        // Handle error
+        $result = $db->exec("DROP TABLE $sequence_name");
+        if (PEAR::isError($result)) {
+            return $db->raiseError($result, null, null,
+                'could not drop inconsistent sequence table', __FUNCTION__);
+        }
+
+        return $db->raiseError($res, null, null,
+            'could not create sequence table', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ dropSequence()
+
+    /**
+     * drop existing sequence
+     *
+     * @param string    $seq_name     name of the sequence to be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropSequence($seq_name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
+        return $db->exec("DROP TABLE $sequence_name");
+    }
+
+    // }}}
+    // {{{ listSequences()
+
+    /**
+     * list all sequences in the current database
+     *
+     * @param string database, the current is default
+     * @return mixed array of sequence names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listSequences($database = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = "SHOW TABLES";
+        if (!is_null($database)) {
+            $query .= " FROM $database";
+        }
+        $table_names = $db->queryCol($query);
+        if (PEAR::isError($table_names)) {
+            return $table_names;
+        }
+
+        $result = array();
+        foreach ($table_names as $table_name) {
+            if ($sqn = $this->_fixSequenceName($table_name, true)) {
+                $result[] = $sqn;
+            }
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Manager/pgsql.php b/3rdparty/MDB2/Driver/Manager/pgsql.php
new file mode 100644
index 00000000000..44a611d399d
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Manager/pgsql.php
@@ -0,0 +1,951 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Paul Cooper <pgc@ucecom.com>                                 |
+// +----------------------------------------------------------------------+
+//
+// $Id: pgsql.php,v 1.87 2008/11/29 14:09:59 afz Exp $
+
+require_once('MDB2/Driver/Manager/Common.php');
+
+/**
+ * MDB2 MySQL driver for the management modules
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Paul Cooper <pgc@ucecom.com>
+ */
+class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
+{
+    // {{{ createDatabase()
+
+    /**
+     * create a new database
+     *
+     * @param string $name    name of the database that should be created
+     * @param array  $options array with charset info
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createDatabase($name, $options = array())
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $name  = $db->quoteIdentifier($name, true);
+        $query = 'CREATE DATABASE ' . $name;
+        if (!empty($options['charset'])) {
+            $query .= ' WITH ENCODING ' . $db->quote($options['charset'], 'text');
+        }
+        return $db->standaloneQuery($query, null, true);
+    }
+
+    // }}}
+    // {{{ alterDatabase()
+
+    /**
+     * alter an existing database
+     *
+     * @param string $name    name of the database that is intended to be changed
+     * @param array  $options array with name, owner info
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function alterDatabase($name, $options = array())
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = 'ALTER DATABASE '. $db->quoteIdentifier($name, true);
+        if (!empty($options['name'])) {
+            $query .= ' RENAME TO ' . $options['name'];
+        }
+        if (!empty($options['owner'])) {
+            $query .= ' OWNER TO ' . $options['owner'];
+        }
+        return $db->standaloneQuery($query, null, true);
+    }
+
+    // }}}
+    // {{{ dropDatabase()
+
+    /**
+     * drop an existing database
+     *
+     * @param string $name name of the database that should be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropDatabase($name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $name = $db->quoteIdentifier($name, true);
+        $query = "DROP DATABASE $name";
+        return $db->standaloneQuery($query, null, true);
+    }
+
+    // }}}
+    // {{{ _getAdvancedFKOptions()
+
+    /**
+     * Return the FOREIGN KEY query section dealing with non-standard options
+     * as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
+     *
+     * @param array $definition
+     * @return string
+     * @access protected
+     */
+    function _getAdvancedFKOptions($definition)
+    {
+        $query = '';
+        if (!empty($definition['match'])) {
+            $query .= ' MATCH '.$definition['match'];
+        }
+        if (!empty($definition['onupdate'])) {
+            $query .= ' ON UPDATE '.$definition['onupdate'];
+        }
+        if (!empty($definition['ondelete'])) {
+            $query .= ' ON DELETE '.$definition['ondelete'];
+        }
+        if (!empty($definition['deferrable'])) {
+            $query .= ' DEFERRABLE';
+        } else {
+            $query .= ' NOT DEFERRABLE';
+        }
+        if (!empty($definition['initiallydeferred'])) {
+            $query .= ' INITIALLY DEFERRED';
+        } else {
+            $query .= ' INITIALLY IMMEDIATE';
+        }
+        return $query;
+    }
+
+    // }}}
+    // {{{ truncateTable()
+
+    /**
+     * Truncate an existing table (if the TRUNCATE TABLE syntax is not supported,
+     * it falls back to a DELETE FROM TABLE query)
+     *
+     * @param string $name name of the table that should be truncated
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function truncateTable($name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $name = $db->quoteIdentifier($name, true);
+        return $db->exec("TRUNCATE TABLE $name");
+    }
+
+    // }}}
+    // {{{ vacuum()
+
+    /**
+     * Optimize (vacuum) all the tables in the db (or only the specified table)
+     * and optionally run ANALYZE.
+     *
+     * @param string $table table name (all the tables if empty)
+     * @param array  $options an array with driver-specific options:
+     *               - timeout [int] (in seconds) [mssql-only]
+     *               - analyze [boolean] [pgsql and mysql]
+     *               - full [boolean] [pgsql-only]
+     *               - freeze [boolean] [pgsql-only]
+     *
+     * @return mixed MDB2_OK success, a MDB2 error on failure
+     * @access public
+     */
+    function vacuum($table = null, $options = array())
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        $query = 'VACUUM';
+
+        if (!empty($options['full'])) {
+            $query .= ' FULL';
+        }
+        if (!empty($options['freeze'])) {
+            $query .= ' FREEZE';
+        }
+        if (!empty($options['analyze'])) {
+            $query .= ' ANALYZE';
+        }
+
+        if (!empty($table)) {
+            $query .= ' '.$db->quoteIdentifier($table, true);
+        }
+        return $db->exec($query);
+    }
+
+    // }}}
+    // {{{ alterTable()
+
+    /**
+     * alter an existing table
+     *
+     * @param string $name         name of the table that is intended to be changed.
+     * @param array $changes     associative array that contains the details of each type
+     *                             of change that is intended to be performed. The types of
+     *                             changes that are currently supported are defined as follows:
+     *
+     *                             name
+     *
+     *                                New name for the table.
+     *
+     *                            add
+     *
+     *                                Associative array with the names of fields to be added as
+     *                                 indexes of the array. The value of each entry of the array
+     *                                 should be set to another associative array with the properties
+     *                                 of the fields to be added. The properties of the fields should
+     *                                 be the same as defined by the MDB2 parser.
+     *
+     *
+     *                            remove
+     *
+     *                                Associative array with the names of fields to be removed as indexes
+     *                                 of the array. Currently the values assigned to each entry are ignored.
+     *                                 An empty array should be used for future compatibility.
+     *
+     *                            rename
+     *
+     *                                Associative array with the names of fields to be renamed as indexes
+     *                                 of the array. The value of each entry of the array should be set to
+     *                                 another associative array with the entry named name with the new
+     *                                 field name and the entry named Declaration that is expected to contain
+     *                                 the portion of the field declaration already in DBMS specific SQL code
+     *                                 as it is used in the CREATE TABLE statement.
+     *
+     *                            change
+     *
+     *                                Associative array with the names of the fields to be changed as indexes
+     *                                 of the array. Keep in mind that if it is intended to change either the
+     *                                 name of a field and any other properties, the change array entries
+     *                                 should have the new names of the fields as array indexes.
+     *
+     *                                The value of each entry of the array should be set to another associative
+     *                                 array with the properties of the fields to that are meant to be changed as
+     *                                 array entries. These entries should be assigned to the new values of the
+     *                                 respective properties. The properties of the fields should be the same
+     *                                 as defined by the MDB2 parser.
+     *
+     *                            Example
+     *                                array(
+     *                                    'name' => 'userlist',
+     *                                    'add' => array(
+     *                                        'quota' => array(
+     *                                            'type' => 'integer',
+     *                                            'unsigned' => 1
+     *                                        )
+     *                                    ),
+     *                                    'remove' => array(
+     *                                        'file_limit' => array(),
+     *                                        'time_limit' => array()
+     *                                    ),
+     *                                    'change' => array(
+     *                                        'name' => array(
+     *                                            'length' => '20',
+     *                                            'definition' => array(
+     *                                                'type' => 'text',
+     *                                                'length' => 20,
+     *                                            ),
+     *                                        )
+     *                                    ),
+     *                                    'rename' => array(
+     *                                        'sex' => array(
+     *                                            'name' => 'gender',
+     *                                            'definition' => array(
+     *                                                'type' => 'text',
+     *                                                'length' => 1,
+     *                                                'default' => 'M',
+     *                                            ),
+     *                                        )
+     *                                    )
+     *                                )
+     *
+     * @param boolean $check     indicates whether the function should just check if the DBMS driver
+     *                             can perform the requested table alterations if the value is true or
+     *                             actually perform them otherwise.
+     * @access public
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     */
+    function alterTable($name, $changes, $check)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        foreach ($changes as $change_name => $change) {
+            switch ($change_name) {
+            case 'add':
+            case 'remove':
+            case 'change':
+            case 'name':
+            case 'rename':
+                break;
+            default:
+                return $db->raiseError(MDB2_ERROR_CANNOT_ALTER, null, null,
+                    'change type "'.$change_name.'\" not yet supported', __FUNCTION__);
+            }
+        }
+
+        if ($check) {
+            return MDB2_OK;
+        }
+
+        $name = $db->quoteIdentifier($name, true);
+
+        if (!empty($changes['remove']) && is_array($changes['remove'])) {
+            foreach ($changes['remove'] as $field_name => $field) {
+                $field_name = $db->quoteIdentifier($field_name, true);
+                $query = 'DROP ' . $field_name;
+                $result = $db->exec("ALTER TABLE $name $query");
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+        }
+
+        if (!empty($changes['rename']) && is_array($changes['rename'])) {
+            foreach ($changes['rename'] as $field_name => $field) {
+                $field_name = $db->quoteIdentifier($field_name, true);
+                $result = $db->exec("ALTER TABLE $name RENAME COLUMN $field_name TO ".$db->quoteIdentifier($field['name'], true));
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+        }
+
+        if (!empty($changes['add']) && is_array($changes['add'])) {
+            foreach ($changes['add'] as $field_name => $field) {
+                $query = 'ADD ' . $db->getDeclaration($field['type'], $field_name, $field);
+                $result = $db->exec("ALTER TABLE $name $query");
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+        }
+
+        if (!empty($changes['change']) && is_array($changes['change'])) {
+            foreach ($changes['change'] as $field_name => $field) {
+                $field_name = $db->quoteIdentifier($field_name, true);
+                if (!empty($field['definition']['type'])) {
+                    $server_info = $db->getServerVersion();
+                    if (PEAR::isError($server_info)) {
+                        return $server_info;
+                    }
+                    if (is_array($server_info) && $server_info['major'] < 8) {
+                        return $db->raiseError(MDB2_ERROR_CANNOT_ALTER, null, null,
+                            'changing column type for "'.$change_name.'\" requires PostgreSQL 8.0 or above', __FUNCTION__);
+                    }
+                    $db->loadModule('Datatype', null, true);
+                    $type = $db->datatype->getTypeDeclaration($field['definition']);
+                    if($type=='SERIAL PRIMARY KEY'){//not correct when altering a table, since serials arent a real type
+						$type='INTEGER';//use integer instead
+                    }
+                    $query = "ALTER $field_name TYPE $type USING CAST($field_name AS $type)";
+                    $result = $db->exec("ALTER TABLE $name $query");
+                    if (PEAR::isError($result)) {
+                        return $result;
+                    }
+                }
+                if (array_key_exists('default', $field['definition'])) {
+                    $query = "ALTER $field_name SET DEFAULT ".$db->quote($field['definition']['default'], $field['definition']['type']);
+                    $result = $db->exec("ALTER TABLE $name $query");
+                    if (PEAR::isError($result)) {
+                        return $result;
+                    }
+                }
+                if (!empty($field['definition']['notnull'])) {
+                    $query = "ALTER $field_name ".($field['definition']['notnull'] ? 'SET' : 'DROP').' NOT NULL';
+                    $result = $db->exec("ALTER TABLE $name $query");
+                    if (PEAR::isError($result)) {
+                        return $result;
+                    }
+                }
+            }
+        }
+
+        if (!empty($changes['name'])) {
+            $change_name = $db->quoteIdentifier($changes['name'], true);
+            $result = $db->exec("ALTER TABLE $name RENAME TO ".$change_name);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ listDatabases()
+
+    /**
+     * list all databases
+     *
+     * @return mixed array of database names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listDatabases()
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = 'SELECT datname FROM pg_database';
+        $result2 = $db->standaloneQuery($query, array('text'), false);
+        if (!MDB2::isResultCommon($result2)) {
+            return $result2;
+        }
+
+        $result = $result2->fetchCol();
+        $result2->free();
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ listUsers()
+
+    /**
+     * list all users
+     *
+     * @return mixed array of user names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listUsers()
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = 'SELECT usename FROM pg_user';
+        $result2 = $db->standaloneQuery($query, array('text'), false);
+        if (!MDB2::isResultCommon($result2)) {
+            return $result2;
+        }
+
+        $result = $result2->fetchCol();
+        $result2->free();
+        return $result;
+    }
+
+    // }}}
+    // {{{ listViews()
+
+    /**
+     * list all views in the current database
+     *
+     * @return mixed array of view names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listViews($database = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = "SELECT viewname
+                    FROM pg_views
+                   WHERE schemaname NOT IN ('pg_catalog', 'information_schema')
+                     AND viewname !~ '^pg_'";
+        $result = $db->queryCol($query);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ listTableViews()
+
+    /**
+     * list the views in the database that reference a given table
+     *
+     * @param string table for which all referenced views should be found
+     * @return mixed array of view names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableViews($table)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = 'SELECT viewname FROM pg_views NATURAL JOIN pg_tables';
+        $query.= ' WHERE tablename ='.$db->quote($table, 'text');
+        $result = $db->queryCol($query);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ listFunctions()
+
+    /**
+     * list all functions in the current database
+     *
+     * @return mixed array of function names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listFunctions()
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = "
+            SELECT
+                proname
+            FROM
+                pg_proc pr,
+                pg_type tp
+            WHERE
+                tp.oid = pr.prorettype
+                AND pr.proisagg = FALSE
+                AND tp.typname <> 'trigger'
+                AND pr.pronamespace IN
+                    (SELECT oid FROM pg_namespace WHERE nspname NOT LIKE 'pg_%' AND nspname != 'information_schema')";
+        $result = $db->queryCol($query);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ listTableTriggers()
+
+    /**
+     * list all triggers in the database that reference a given table
+     *
+     * @param string table for which all referenced triggers should be found
+     * @return mixed array of trigger names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableTriggers($table = null)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = 'SELECT trg.tgname AS trigger_name
+                    FROM pg_trigger trg,
+                         pg_class tbl
+                   WHERE trg.tgrelid = tbl.oid';
+        if (!is_null($table)) {
+            $table = $db->quote(strtoupper($table), 'text');
+            $query .= " AND tbl.relname = $table";
+        }
+        $result = $db->queryCol($query);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ listTables()
+
+    /**
+     * list all tables in the current database
+     *
+     * @return mixed array of table names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTables($database = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        // gratuitously stolen from PEAR DB _getSpecialQuery in pgsql.php
+        $query = 'SELECT c.relname AS "Name"'
+            . ' FROM pg_class c, pg_user u'
+            . ' WHERE c.relowner = u.usesysid'
+            . " AND c.relkind = 'r'"
+            . ' AND NOT EXISTS'
+            . ' (SELECT 1 FROM pg_views'
+            . '  WHERE viewname = c.relname)'
+            . " AND c.relname !~ '^(pg_|sql_)'"
+            . ' UNION'
+            . ' SELECT c.relname AS "Name"'
+            . ' FROM pg_class c'
+            . " WHERE c.relkind = 'r'"
+            . ' AND NOT EXISTS'
+            . ' (SELECT 1 FROM pg_views'
+            . '  WHERE viewname = c.relname)'
+            . ' AND NOT EXISTS'
+            . ' (SELECT 1 FROM pg_user'
+            . '  WHERE usesysid = c.relowner)'
+            . " AND c.relname !~ '^pg_'";
+        $result = $db->queryCol($query);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ listTableFields()
+
+    /**
+     * list all fields in a table in the current database
+     *
+     * @param string $table name of table that should be used in method
+     * @return mixed array of field names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableFields($table)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        list($schema, $table) = $this->splitTableSchema($table);
+
+        $table = $db->quoteIdentifier($table, true);
+        if (!empty($schema)) {
+            $table = $db->quoteIdentifier($schema, true) . '.' .$table;
+        }
+        $db->setLimit(1);
+        $result2 = $db->query("SELECT * FROM $table LIMIT 1");
+        if (PEAR::isError($result2)) {
+            return $result2;
+        }
+        $result = $result2->getColumnNames();
+        $result2->free();
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        return array_flip($result);
+    }
+
+    // }}}
+    // {{{ listTableIndexes()
+
+    /**
+     * list all indexes in a table
+     *
+     * @param string $table name of table that should be used in method
+     * @return mixed array of index names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableIndexes($table)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        list($schema, $table) = $this->splitTableSchema($table);
+
+        $table = $db->quote($table, 'text');
+        $subquery = "SELECT indexrelid
+                       FROM pg_index
+                  LEFT JOIN pg_class ON pg_class.oid = pg_index.indrelid
+                  LEFT JOIN pg_namespace ON pg_class.relnamespace = pg_namespace.oid
+                      WHERE pg_class.relname = $table
+                        AND indisunique != 't'
+                        AND indisprimary != 't'";
+        if (!empty($schema)) {
+            $subquery .= ' AND pg_namespace.nspname = '.$db->quote($schema, 'text');
+        }
+        $query = "SELECT relname FROM pg_class WHERE oid IN ($subquery)";
+        $indexes = $db->queryCol($query, 'text');
+        if (PEAR::isError($indexes)) {
+            return $indexes;
+        }
+
+        $result = array();
+        foreach ($indexes as $index) {
+            $index = $this->_fixIndexName($index);
+            if (!empty($index)) {
+                $result[$index] = true;
+            }
+        }
+
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_change_key_case($result, $db->options['field_case']);
+        }
+        return array_keys($result);
+    }
+
+    // }}}
+    // {{{ dropConstraint()
+
+    /**
+     * drop existing constraint
+     *
+     * @param string $table   name of table that should be used in method
+     * @param string $name    name of the constraint to be dropped
+     * @param string $primary hint if the constraint is primary
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropConstraint($table, $name, $primary = false)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        // is it an UNIQUE index?
+        $query = 'SELECT relname
+                    FROM pg_class
+                   WHERE oid IN (
+                         SELECT indexrelid
+                           FROM pg_index, pg_class
+                          WHERE pg_class.relname = '.$db->quote($table, 'text').'
+                            AND pg_class.oid = pg_index.indrelid
+                            AND indisunique = \'t\')
+                  EXCEPT
+                  SELECT conname
+                   FROM pg_constraint, pg_class
+                  WHERE pg_constraint.conrelid = pg_class.oid
+                    AND relname = '. $db->quote($table, 'text');
+        $unique = $db->queryCol($query, 'text');
+        if (PEAR::isError($unique) || empty($unique)) {
+            // not an UNIQUE index, maybe a CONSTRAINT
+            return parent::dropConstraint($table, $name, $primary);
+        }
+
+        if (in_array($name, $unique)) {
+            return $db->exec('DROP INDEX '.$db->quoteIdentifier($name, true));
+        }
+        $idxname = $db->getIndexName($name);
+        if (in_array($idxname, $unique)) {
+            return $db->exec('DROP INDEX '.$db->quoteIdentifier($idxname, true));
+        }
+        return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+            $name . ' is not an existing constraint for table ' . $table, __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ listTableConstraints()
+
+    /**
+     * list all constraints in a table
+     *
+     * @param string $table name of table that should be used in method
+     * @return mixed array of constraint names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableConstraints($table)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        list($schema, $table) = $this->splitTableSchema($table);
+
+        $table = $db->quote($table, 'text');
+        $query = 'SELECT conname
+                    FROM pg_constraint
+               LEFT JOIN pg_class ON pg_constraint.conrelid = pg_class.oid
+               LEFT JOIN pg_namespace ON pg_class.relnamespace = pg_namespace.oid
+                   WHERE relname = ' .$table;
+        if (!empty($schema)) {
+            $query .= ' AND pg_namespace.nspname = ' . $db->quote($schema, 'text');
+        }
+        $query .= '
+                   UNION DISTINCT
+                  SELECT relname
+                    FROM pg_class
+                   WHERE oid IN (
+                         SELECT indexrelid
+                           FROM pg_index
+                      LEFT JOIN pg_class ON pg_class.oid = pg_index.indrelid
+                      LEFT JOIN pg_namespace ON pg_class.relnamespace = pg_namespace.oid
+                          WHERE pg_class.relname = '.$table.'
+                            AND indisunique = \'t\'';
+        if (!empty($schema)) {
+            $query .= ' AND pg_namespace.nspname = ' . $db->quote($schema, 'text');
+        }
+        $query .= ')';
+        $constraints = $db->queryCol($query);
+        if (PEAR::isError($constraints)) {
+            return $constraints;
+        }
+
+        $result = array();
+        foreach ($constraints as $constraint) {
+            $constraint = $this->_fixIndexName($constraint);
+            if (!empty($constraint)) {
+                $result[$constraint] = true;
+            }
+        }
+
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
+            && $db->options['field_case'] == CASE_LOWER
+        ) {
+            $result = array_change_key_case($result, $db->options['field_case']);
+        }
+        return array_keys($result);
+    }
+
+    // }}}
+    // {{{ createSequence()
+
+    /**
+     * create sequence
+     *
+     * @param string $seq_name name of the sequence to be created
+     * @param string $start start value of the sequence; default is 1
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createSequence($seq_name, $start = 1)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
+        return $db->exec("CREATE SEQUENCE $sequence_name INCREMENT 1".
+            ($start < 1 ? " MINVALUE $start" : '')." START $start");
+    }
+
+    // }}}
+    // {{{ dropSequence()
+
+    /**
+     * drop existing sequence
+     *
+     * @param string $seq_name name of the sequence to be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropSequence($seq_name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
+        return $db->exec("DROP SEQUENCE $sequence_name");
+    }
+
+    // }}}
+    // {{{ listSequences()
+
+    /**
+     * list all sequences in the current database
+     *
+     * @return mixed array of sequence names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listSequences($database = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = "SELECT relname FROM pg_class WHERE relkind = 'S' AND relnamespace IN";
+        $query.= "(SELECT oid FROM pg_namespace WHERE nspname NOT LIKE 'pg_%' AND nspname != 'information_schema')";
+        $table_names = $db->queryCol($query);
+        if (PEAR::isError($table_names)) {
+            return $table_names;
+        }
+        $result = array();
+        foreach ($table_names as $table_name) {
+            $result[] = $this->_fixSequenceName($table_name);
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Manager/sqlite.php b/3rdparty/MDB2/Driver/Manager/sqlite.php
new file mode 100644
index 00000000000..1b7239876f1
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Manager/sqlite.php
@@ -0,0 +1,1366 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith, Lorenzo Alberton                       |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Authors: Lukas Smith <smith@pooteeweet.org>                          |
+// |          Lorenzo Alberton <l.alberton@quipo.it>                      |
+// +----------------------------------------------------------------------+
+//
+// $Id: sqlite.php,v 1.76 2008/05/31 11:48:48 quipo Exp $
+//
+
+require_once('MDB2/Driver/Manager/Common.php');
+
+/**
+ * MDB2 SQLite driver for the management modules
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ * @author  Lorenzo Alberton <l.alberton@quipo.it>
+ */
+class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
+{
+    // {{{ createDatabase()
+
+    /**
+     * create a new database
+     *
+     * @param string $name    name of the database that should be created
+     * @param array  $options array with charset info
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createDatabase($name, $options = array())
+    {
+		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $database_file = $db->_getDatabaseFile($name);
+        if (file_exists($database_file)) {
+            return $db->raiseError(MDB2_ERROR_ALREADY_EXISTS, null, null,
+                'database already exists', __FUNCTION__);
+        }
+        $php_errormsg = '';
+        $database_file="$datadir/$database_file.db";
+        $handle = sqlite_open($database_file, $db->dsn['mode'], $php_errormsg);
+        if (!$handle) {
+            return $db->raiseError(MDB2_ERROR_CANNOT_CREATE, null, null,
+                (isset($php_errormsg) ? $php_errormsg : 'could not create the database file'), __FUNCTION__);
+        }
+        if (!empty($options['charset'])) {
+            $query = 'PRAGMA encoding = ' . $db->quote($options['charset'], 'text');
+            @sqlite_query($query, $handle);
+        }
+        @sqlite_close($handle);
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ dropDatabase()
+
+    /**
+     * drop an existing database
+     *
+     * @param string $name name of the database that should be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropDatabase($name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $database_file = $db->_getDatabaseFile($name);
+        if (!@file_exists($database_file)) {
+            return $db->raiseError(MDB2_ERROR_CANNOT_DROP, null, null,
+                'database does not exist', __FUNCTION__);
+        }
+        $result = @unlink($database_file);
+        if (!$result) {
+            return $db->raiseError(MDB2_ERROR_CANNOT_DROP, null, null,
+                (isset($php_errormsg) ? $php_errormsg : 'could not remove the database file'), __FUNCTION__);
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ _getAdvancedFKOptions()
+
+    /**
+     * Return the FOREIGN KEY query section dealing with non-standard options
+     * as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
+     *
+     * @param array $definition
+     * @return string
+     * @access protected
+     */
+    function _getAdvancedFKOptions($definition)
+    {
+        $query = '';
+        if (!empty($definition['match'])) {
+            $query .= ' MATCH '.$definition['match'];
+        }
+        if (!empty($definition['onupdate']) && (strtoupper($definition['onupdate']) != 'NO ACTION')) {
+            $query .= ' ON UPDATE '.$definition['onupdate'];
+        }
+        if (!empty($definition['ondelete']) && (strtoupper($definition['ondelete']) != 'NO ACTION')) {
+            $query .= ' ON DELETE '.$definition['ondelete'];
+        }
+        if (!empty($definition['deferrable'])) {
+            $query .= ' DEFERRABLE';
+        } else {
+            $query .= ' NOT DEFERRABLE';
+        }
+        if (!empty($definition['initiallydeferred'])) {
+            $query .= ' INITIALLY DEFERRED';
+        } else {
+            $query .= ' INITIALLY IMMEDIATE';
+        }
+        return $query;
+    }
+
+    // }}}
+    // {{{ _getCreateTableQuery()
+
+    /**
+     * Create a basic SQL query for a new table creation
+     * @param string $name   Name of the database that should be created
+     * @param array $fields  Associative array that contains the definition of each field of the new table
+     * @param array $options  An associative array of table options
+     * @return mixed string (the SQL query) on success, a MDB2 error on failure
+     * @see createTable()
+     */
+    function _getCreateTableQuery($name, $fields, $options = array())
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (!$name) {
+            return $db->raiseError(MDB2_ERROR_CANNOT_CREATE, null, null,
+                'no valid table name specified', __FUNCTION__);
+        }
+        if (empty($fields)) {
+            return $db->raiseError(MDB2_ERROR_CANNOT_CREATE, null, null,
+                'no fields specified for table "'.$name.'"', __FUNCTION__);
+        }
+        $query_fields = $this->getFieldDeclarationList($fields);
+        if (PEAR::isError($query_fields)) {
+            return $query_fields;
+        }
+        if (!empty($options['primary'])) {
+            $query_fields.= ', PRIMARY KEY ('.implode(', ', array_keys($options['primary'])).')';
+        }
+        if (!empty($options['foreign_keys'])) {
+            foreach ($options['foreign_keys'] as $fkname => $fkdef) {
+                if (empty($fkdef)) {
+                    continue;
+                }
+                $query_fields.= ', CONSTRAINT '.$fkname.' FOREIGN KEY ('.implode(', ', array_keys($fkdef['fields'])).')';
+                $query_fields.= ' REFERENCES '.$fkdef['references']['table'].' ('.implode(', ', array_keys($fkdef['references']['fields'])).')';
+                $query_fields.= $this->_getAdvancedFKOptions($fkdef);
+            }
+        }
+
+        $name = $db->quoteIdentifier($name, true);
+        $result = 'CREATE ';
+        if (!empty($options['temporary'])) {
+            $result .= $this->_getTemporaryTableQuery();
+        }
+        $result .= " TABLE $name ($query_fields)";
+        return $result;
+    }
+
+    // }}}
+    // {{{ createTable()
+
+    /**
+     * create a new table
+     *
+     * @param string $name    Name of the database that should be created
+     * @param array  $fields  Associative array that contains the definition
+     *                        of each field of the new table
+     * @param array  $options An associative array of table options
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createTable($name, $fields, $options = array())
+    {
+        $result = parent::createTable($name, $fields, $options);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        // create triggers to enforce FOREIGN KEY constraints
+        if (!empty($options['foreign_keys'])) {
+            $db =$this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+            foreach ($options['foreign_keys'] as $fkname => $fkdef) {
+                if (empty($fkdef)) {
+                    continue;
+                }
+                //set actions to default if not set
+                $fkdef['onupdate'] = empty($fkdef['onupdate']) ? $db->options['default_fk_action_onupdate'] : strtoupper($fkdef['onupdate']);
+                $fkdef['ondelete'] = empty($fkdef['ondelete']) ? $db->options['default_fk_action_ondelete'] : strtoupper($fkdef['ondelete']);
+
+                $trigger_names = array(
+                    'insert'    => $fkname.'_insert_trg',
+                    'update'    => $fkname.'_update_trg',
+                    'pk_update' => $fkname.'_pk_update_trg',
+                    'pk_delete' => $fkname.'_pk_delete_trg',
+                );
+                
+                //create the [insert|update] triggers on the FK table
+                $table_fields = array_keys($fkdef['fields']);
+                $referenced_fields = array_keys($fkdef['references']['fields']);
+                $query = 'CREATE TRIGGER %s BEFORE %s ON '.$name
+                        .' FOR EACH ROW BEGIN'
+                        .' SELECT RAISE(ROLLBACK, \'%s on table "'.$name.'" violates FOREIGN KEY constraint "'.$fkname.'"\')'
+                        .' WHERE  (SELECT ';
+                $aliased_fields = array();
+                foreach ($referenced_fields as $field) {
+                    $aliased_fields[] = $fkdef['references']['table'] .'.'.$field .' AS '.$field;
+                }
+                $query .= implode(',', $aliased_fields)
+                       .' FROM '.$fkdef['references']['table']
+                       .' WHERE ';
+                $conditions = array();
+                for ($i=0; $i<count($table_fields); $i++) {
+                    $conditions[] = $referenced_fields[$i] .' = NEW.'.$table_fields[$i];
+                }
+                $query .= implode(' AND ', $conditions).') IS NULL; END;';
+                $result = $db->exec(sprintf($query, $trigger_names['insert'], 'INSERT', 'insert'));
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+
+                $result = $db->exec(sprintf($query, $trigger_names['update'], 'UPDATE', 'update'));
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+                
+                //create the ON [UPDATE|DELETE] triggers on the primary table
+                $restrict_action = 'SELECT RAISE(ROLLBACK, \'%s on table "'.$name.'" violates FOREIGN KEY constraint "'.$fkname.'"\')'
+                                  .' WHERE  (SELECT ';
+                $aliased_fields = array();
+                foreach ($table_fields as $field) {
+                    $aliased_fields[] = $name .'.'.$field .' AS '.$field;
+                }
+                $restrict_action .= implode(',', $aliased_fields)
+                       .' FROM '.$name
+                       .' WHERE ';
+                $conditions  = array();
+                $new_values  = array();
+                $null_values = array();
+                for ($i=0; $i<count($table_fields); $i++) {
+                    $conditions[]  = $table_fields[$i] .' = OLD.'.$referenced_fields[$i];
+                    $new_values[]  = $table_fields[$i] .' = NEW.'.$referenced_fields[$i];
+                    $null_values[] = $table_fields[$i] .' = NULL';
+                }
+                $conditions2 = array();
+                for ($i=0; $i<count($referenced_fields); $i++) {
+                    $conditions2[]  = 'NEW.'.$referenced_fields[$i] .' <> OLD.'.$referenced_fields[$i];
+                }
+                $restrict_action .= implode(' AND ', $conditions).') IS NOT NULL'
+                                 .' AND (' .implode(' OR ', $conditions2) .')';
+
+                $cascade_action_update = 'UPDATE '.$name.' SET '.implode(', ', $new_values) .' WHERE '.implode(' AND ', $conditions);
+                $cascade_action_delete = 'DELETE FROM '.$name.' WHERE '.implode(' AND ', $conditions);
+                $setnull_action        = 'UPDATE '.$name.' SET '.implode(', ', $null_values).' WHERE '.implode(' AND ', $conditions);
+
+                if ('SET DEFAULT' == $fkdef['onupdate'] || 'SET DEFAULT' == $fkdef['ondelete']) {
+                    $db->loadModule('Reverse', null, true);
+                    $default_values = array();
+                    foreach ($table_fields as $table_field) {
+                        $field_definition = $db->reverse->getTableFieldDefinition($name, $field);
+                        if (PEAR::isError($field_definition)) {
+                            return $field_definition;
+                        }
+                        $default_values[] = $table_field .' = '. $field_definition[0]['default'];
+                    }
+                    $setdefault_action = 'UPDATE '.$name.' SET '.implode(', ', $default_values).' WHERE '.implode(' AND ', $conditions);
+                }
+
+                $query = 'CREATE TRIGGER %s'
+                        .' %s ON '.$fkdef['references']['table']
+                        .' FOR EACH ROW BEGIN ';
+
+                if ('CASCADE' == $fkdef['onupdate']) {
+                    $sql_update = sprintf($query, $trigger_names['pk_update'], 'AFTER UPDATE',  'update') . $cascade_action_update. '; END;';
+                } elseif ('SET NULL' == $fkdef['onupdate']) {
+                    $sql_update = sprintf($query, $trigger_names['pk_update'], 'BEFORE UPDATE', 'update') . $setnull_action. '; END;';
+                } elseif ('SET DEFAULT' == $fkdef['onupdate']) {
+                    $sql_update = sprintf($query, $trigger_names['pk_update'], 'BEFORE UPDATE', 'update') . $setdefault_action. '; END;';
+                } elseif ('NO ACTION' == $fkdef['onupdate']) {
+                    $sql_update = sprintf($query.$restrict_action, $trigger_names['pk_update'], 'AFTER UPDATE', 'update') . '; END;';
+                } elseif ('RESTRICT' == $fkdef['onupdate']) {
+                    $sql_update = sprintf($query.$restrict_action, $trigger_names['pk_update'], 'BEFORE UPDATE', 'update') . '; END;';
+                }
+                if ('CASCADE' == $fkdef['ondelete']) {
+                    $sql_delete = sprintf($query, $trigger_names['pk_delete'], 'AFTER DELETE',  'delete') . $cascade_action_delete. '; END;';
+                } elseif ('SET NULL' == $fkdef['ondelete']) {
+                    $sql_delete = sprintf($query, $trigger_names['pk_delete'], 'BEFORE DELETE', 'delete') . $setnull_action. '; END;';
+                } elseif ('SET DEFAULT' == $fkdef['ondelete']) {
+                    $sql_delete = sprintf($query, $trigger_names['pk_delete'], 'BEFORE DELETE', 'delete') . $setdefault_action. '; END;';
+                } elseif ('NO ACTION' == $fkdef['ondelete']) {
+                    $sql_delete = sprintf($query.$restrict_action, $trigger_names['pk_delete'], 'AFTER DELETE', 'delete')  . '; END;';
+                } elseif ('RESTRICT' == $fkdef['ondelete']) {
+                    $sql_delete = sprintf($query.$restrict_action, $trigger_names['pk_delete'], 'BEFORE DELETE', 'delete') . '; END;';
+                }
+
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+                $result = $db->exec($sql_delete);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+                $result = $db->exec($sql_update);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+        }
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ dropTable()
+
+    /**
+     * drop an existing table
+     *
+     * @param string $name name of the table that should be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropTable($name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        
+        //delete the triggers associated to existing FK constraints
+        $constraints = $this->listTableConstraints($name);
+        if (!PEAR::isError($constraints) && !empty($constraints)) {
+            $db->loadModule('Reverse', null, true);
+            foreach ($constraints as $constraint) {
+                $definition = $db->reverse->getTableConstraintDefinition($name, $constraint);
+                if (!PEAR::isError($definition) && !empty($definition['foreign'])) {
+                    $result = $this->_dropFKTriggers($name, $constraint, $definition['references']['table']);
+                    if (PEAR::isError($result)) {
+                        return $result;
+                    }
+                }
+            }
+        }
+
+        $name = $db->quoteIdentifier($name, true);
+        return $db->exec("DROP TABLE $name");
+    }
+
+    // }}}
+    // {{{ vacuum()
+
+    /**
+     * Optimize (vacuum) all the tables in the db (or only the specified table)
+     * and optionally run ANALYZE.
+     *
+     * @param string $table table name (all the tables if empty)
+     * @param array  $options an array with driver-specific options:
+     *               - timeout [int] (in seconds) [mssql-only]
+     *               - analyze [boolean] [pgsql and mysql]
+     *               - full [boolean] [pgsql-only]
+     *               - freeze [boolean] [pgsql-only]
+     *
+     * @return mixed MDB2_OK success, a MDB2 error on failure
+     * @access public
+     */
+    function vacuum($table = null, $options = array())
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = 'VACUUM';
+        if (!empty($table)) {
+            $query .= ' '.$db->quoteIdentifier($table, true);
+        }
+        return $db->exec($query);
+    }
+
+    // }}}
+    // {{{ alterTable()
+
+    /**
+     * alter an existing table
+     *
+     * @param string $name         name of the table that is intended to be changed.
+     * @param array $changes     associative array that contains the details of each type
+     *                             of change that is intended to be performed. The types of
+     *                             changes that are currently supported are defined as follows:
+     *
+     *                             name
+     *
+     *                                New name for the table.
+     *
+     *                            add
+     *
+     *                                Associative array with the names of fields to be added as
+     *                                 indexes of the array. The value of each entry of the array
+     *                                 should be set to another associative array with the properties
+     *                                 of the fields to be added. The properties of the fields should
+     *                                 be the same as defined by the MDB2 parser.
+     *
+     *
+     *                            remove
+     *
+     *                                Associative array with the names of fields to be removed as indexes
+     *                                 of the array. Currently the values assigned to each entry are ignored.
+     *                                 An empty array should be used for future compatibility.
+     *
+     *                            rename
+     *
+     *                                Associative array with the names of fields to be renamed as indexes
+     *                                 of the array. The value of each entry of the array should be set to
+     *                                 another associative array with the entry named name with the new
+     *                                 field name and the entry named Declaration that is expected to contain
+     *                                 the portion of the field declaration already in DBMS specific SQL code
+     *                                 as it is used in the CREATE TABLE statement.
+     *
+     *                            change
+     *
+     *                                Associative array with the names of the fields to be changed as indexes
+     *                                 of the array. Keep in mind that if it is intended to change either the
+     *                                 name of a field and any other properties, the change array entries
+     *                                 should have the new names of the fields as array indexes.
+     *
+     *                                The value of each entry of the array should be set to another associative
+     *                                 array with the properties of the fields to that are meant to be changed as
+     *                                 array entries. These entries should be assigned to the new values of the
+     *                                 respective properties. The properties of the fields should be the same
+     *                                 as defined by the MDB2 parser.
+     *
+     *                            Example
+     *                                array(
+     *                                    'name' => 'userlist',
+     *                                    'add' => array(
+     *                                        'quota' => array(
+     *                                            'type' => 'integer',
+     *                                            'unsigned' => 1
+     *                                        )
+     *                                    ),
+     *                                    'remove' => array(
+     *                                        'file_limit' => array(),
+     *                                        'time_limit' => array()
+     *                                    ),
+     *                                    'change' => array(
+     *                                        'name' => array(
+     *                                            'length' => '20',
+     *                                            'definition' => array(
+     *                                                'type' => 'text',
+     *                                                'length' => 20,
+     *                                            ),
+     *                                        )
+     *                                    ),
+     *                                    'rename' => array(
+     *                                        'sex' => array(
+     *                                            'name' => 'gender',
+     *                                            'definition' => array(
+     *                                                'type' => 'text',
+     *                                                'length' => 1,
+     *                                                'default' => 'M',
+     *                                            ),
+     *                                        )
+     *                                    )
+     *                                )
+     *
+     * @param boolean $check     indicates whether the function should just check if the DBMS driver
+     *                             can perform the requested table alterations if the value is true or
+     *                             actually perform them otherwise.
+     * @access public
+     *
+      * @return mixed MDB2_OK on success, a MDB2 error on failure
+     */
+    function alterTable($name, $changes, $check, $options = array())
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        foreach ($changes as $change_name => $change) {
+            switch ($change_name) {
+            case 'add':
+            case 'remove':
+            case 'change':
+            case 'name':
+            case 'rename':
+                break;
+            default:
+                return $db->raiseError(MDB2_ERROR_CANNOT_ALTER, null, null,
+                    'change type "'.$change_name.'" not yet supported', __FUNCTION__);
+            }
+        }
+
+        if ($check) {
+            return MDB2_OK;
+        }
+
+        $db->loadModule('Reverse', null, true);
+
+        // actually sqlite 2.x supports no ALTER TABLE at all .. so we emulate it
+        $fields = $db->manager->listTableFields($name);
+        if (PEAR::isError($fields)) {
+            return $fields;
+        }
+
+        $fields = array_flip($fields);
+        foreach ($fields as $field => $value) {
+            $definition = $db->reverse->getTableFieldDefinition($name, $field);
+            if (PEAR::isError($definition)) {
+                return $definition;
+            }
+            $fields[$field] = $definition[0];
+        }
+
+        $indexes = $db->manager->listTableIndexes($name);
+        if (PEAR::isError($indexes)) {
+            return $indexes;
+        }
+
+        $indexes = array_flip($indexes);
+        foreach ($indexes as $index => $value) {
+            $definition = $db->reverse->getTableIndexDefinition($name, $index);
+            if (PEAR::isError($definition)) {
+                return $definition;
+            }
+            $indexes[$index] = $definition;
+        }
+
+        $constraints = $db->manager->listTableConstraints($name);
+        if (PEAR::isError($constraints)) {
+            return $constraints;
+        }
+
+        if (!array_key_exists('foreign_keys', $options)) {
+            $options['foreign_keys'] = array();
+        }
+        $constraints = array_flip($constraints);
+        foreach ($constraints as $constraint => $value) {
+			if (!empty($definition['primary'])) {
+                if (!array_key_exists('primary', $options)) {
+                    $options['primary'] = $definition['fields'];
+                    //remove from the $constraint array, it's already handled by createTable()
+                    unset($constraints[$constraint]);
+                }
+            } else {
+                $c_definition = $db->reverse->getTableConstraintDefinition($name, $constraint);
+                if (PEAR::isError($c_definition)) {
+                    return $c_definition;
+                }
+                if (!empty($c_definition['foreign'])) {
+                    if (!array_key_exists($constraint, $options['foreign_keys'])) {
+                        $options['foreign_keys'][$constraint] = $c_definition;
+                    }
+                    //remove from the $constraint array, it's already handled by createTable()
+                    unset($constraints[$constraint]);
+                } else {
+                    $constraints[$constraint] = $c_definition;
+                }
+            }
+        }
+
+        $name_new = $name;
+        $create_order = $select_fields = array_keys($fields);
+        foreach ($changes as $change_name => $change) {
+            switch ($change_name) {
+            case 'add':
+                foreach ($change as $field_name => $field) {
+                    $fields[$field_name] = $field;
+                    $create_order[] = $field_name;
+                }
+                break;
+            case 'remove':
+                foreach ($change as $field_name => $field) {
+                    unset($fields[$field_name]);
+                    $select_fields = array_diff($select_fields, array($field_name));
+                    $create_order = array_diff($create_order, array($field_name));
+                }
+                break;
+            case 'change':
+                foreach ($change as $field_name => $field) {
+                    $fields[$field_name] = $field['definition'];
+                }
+                break;
+            case 'name':
+                $name_new = $change;
+                break;
+            case 'rename':
+                foreach ($change as $field_name => $field) {
+                    unset($fields[$field_name]);
+                    $fields[$field['name']] = $field['definition'];
+                    $create_order[array_search($field_name, $create_order)] = $field['name'];
+                }
+                break;
+            default:
+                return $db->raiseError(MDB2_ERROR_CANNOT_ALTER, null, null,
+                    'change type "'.$change_name.'" not yet supported', __FUNCTION__);
+            }
+        }
+
+        $data = null;
+        if (!empty($select_fields)) {
+            $query = 'SELECT '.implode(', ', $select_fields).' FROM '.$db->quoteIdentifier($name, true);
+            $data = $db->queryAll($query, null, MDB2_FETCHMODE_ORDERED);
+        }
+
+        $result = $this->dropTable($name);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        $result = $this->createTable($name_new, $fields, $options);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        foreach ($indexes as $index => $definition) {
+            $this->createIndex($name_new, $index, $definition);
+        }
+
+        foreach ($constraints as $constraint => $definition) {
+			if(empty($definition['primary']) and empty($definition['foreign'])){
+				$this->createConstraint($name_new, $constraint, $definition);
+			}
+        }
+
+        if (!empty($select_fields) && !empty($data)) {
+            $query = 'INSERT INTO '.$db->quoteIdentifier($name_new, true);
+            $query.= '('.implode(', ', array_slice(array_keys($fields), 0, count($select_fields))).')';
+            $query.=' VALUES (?'.str_repeat(', ?', (count($select_fields) - 1)).')';
+            $stmt =$db->prepare($query, null, MDB2_PREPARE_MANIP);
+            if (PEAR::isError($stmt)) {
+                return $stmt;
+            }
+            foreach ($data as $row) {
+                $result = $stmt->execute($row);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ listDatabases()
+
+    /**
+     * list all databases
+     *
+     * @return mixed array of database names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listDatabases()
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'list databases is not supported', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ listUsers()
+
+    /**
+     * list all users
+     *
+     * @return mixed array of user names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listUsers()
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'list databases is not supported', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ listViews()
+
+    /**
+     * list all views in the current database
+     *
+     * @return mixed array of view names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listViews($dummy=null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = "SELECT name FROM sqlite_master WHERE type='view' AND sql NOT NULL";
+        $result = $db->queryCol($query);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ listTableViews()
+
+    /**
+     * list the views in the database that reference a given table
+     *
+     * @param string table for which all referenced views should be found
+     * @return mixed array of view names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableViews($table)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = "SELECT name, sql FROM sqlite_master WHERE type='view' AND sql NOT NULL";
+        $views = $db->queryAll($query, array('text', 'text'), MDB2_FETCHMODE_ASSOC);
+        if (PEAR::isError($views)) {
+            return $views;
+        }
+        $result = array();
+        foreach ($views as $row) {
+            if (preg_match("/^create view .* \bfrom\b\s+\b{$table}\b /i", $row['sql'])) {
+                if (!empty($row['name'])) {
+                    $result[$row['name']] = true;
+                }
+            }
+        }
+
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_change_key_case($result, $db->options['field_case']);
+        }
+        return array_keys($result);
+    }
+
+    // }}}
+    // {{{ listTables()
+
+    /**
+     * list all tables in the current database
+     *
+     * @return mixed array of table names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTables($dummy=null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = "SELECT name FROM sqlite_master WHERE type='table' AND sql NOT NULL ORDER BY name";
+        $table_names = $db->queryCol($query);
+        if (PEAR::isError($table_names)) {
+            return $table_names;
+        }
+        $result = array();
+        foreach ($table_names as $table_name) {
+            if (!$this->_fixSequenceName($table_name, true)) {
+                $result[] = $table_name;
+            }
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ listTableFields()
+
+    /**
+     * list all fields in a table in the current database
+     *
+     * @param string $table name of table that should be used in method
+     * @return mixed array of field names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableFields($table)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $result = $db->loadModule('Reverse', null, true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        $query = "SELECT sql FROM sqlite_master WHERE type='table' AND ";
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $query.= 'LOWER(name)='.$db->quote(strtolower($table), 'text');
+        } else {
+            $query.= 'name='.$db->quote($table, 'text');
+        }
+        $sql = $db->queryOne($query);
+        if (PEAR::isError($sql)) {
+            return $sql;
+        }
+        $columns = $db->reverse->_getTableColumns($sql);
+        $fields = array();
+        foreach ($columns as $column) {
+            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+                if ($db->options['field_case'] == CASE_LOWER) {
+                    $column['name'] = strtolower($column['name']);
+                } else {
+                    $column['name'] = strtoupper($column['name']);
+                }
+            } else {
+                $column = array_change_key_case($column, $db->options['field_case']);
+            }
+            $fields[] = $column['name'];
+        }
+        return $fields;
+    }
+
+    // }}}
+    // {{{ listTableTriggers()
+
+    /**
+     * list all triggers in the database that reference a given table
+     *
+     * @param string table for which all referenced triggers should be found
+     * @return mixed array of trigger names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableTriggers($table = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = "SELECT name FROM sqlite_master WHERE type='trigger' AND sql NOT NULL";
+        if (!is_null($table)) {
+            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+                $query.= ' AND LOWER(tbl_name)='.$db->quote(strtolower($table), 'text');
+            } else {
+                $query.= ' AND tbl_name='.$db->quote($table, 'text');
+            }
+        }
+        $result = $db->queryCol($query);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ createIndex()
+
+    /**
+     * Get the stucture of a field into an array
+     *
+     * @param string    $table         name of the table on which the index is to be created
+     * @param string    $name         name of the index to be created
+     * @param array     $definition        associative array that defines properties of the index to be created.
+     *                                 Currently, only one property named FIELDS is supported. This property
+     *                                 is also an associative with the names of the index fields as array
+     *                                 indexes. Each entry of this array is set to another type of associative
+     *                                 array that specifies properties of the index that are specific to
+     *                                 each field.
+     *
+     *                                Currently, only the sorting property is supported. It should be used
+     *                                 to define the sorting direction of the index. It may be set to either
+     *                                 ascending or descending.
+     *
+     *                                Not all DBMS support index sorting direction configuration. The DBMS
+     *                                 drivers of those that do not support it ignore this property. Use the
+     *                                 function support() to determine whether the DBMS driver can manage indexes.
+
+     *                                 Example
+     *                                    array(
+     *                                        'fields' => array(
+     *                                            'user_name' => array(
+     *                                                'sorting' => 'ascending'
+     *                                            ),
+     *                                            'last_login' => array()
+     *                                        )
+     *                                    )
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createIndex($table, $name, $definition)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $table = $db->quoteIdentifier($table, true);
+        $name  = $db->getIndexName($name);
+        $query = "CREATE INDEX $name ON $table";
+        $fields = array();
+        foreach ($definition['fields'] as $field_name => $field) {
+            $field_string = $field_name;
+            if (!empty($field['sorting'])) {
+                switch ($field['sorting']) {
+                case 'ascending':
+                    $field_string.= ' ASC';
+                    break;
+                case 'descending':
+                    $field_string.= ' DESC';
+                    break;
+                }
+            }
+            $fields[] = $field_string;
+        }
+        $query .= ' ('.implode(', ', $fields) . ')';
+        return $db->exec($query);
+    }
+
+    // }}}
+    // {{{ dropIndex()
+
+    /**
+     * drop existing index
+     *
+     * @param string    $table         name of table that should be used in method
+     * @param string    $name         name of the index to be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropIndex($table, $name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $name = $db->getIndexName($name);
+        return $db->exec("DROP INDEX $name");
+    }
+
+    // }}}
+    // {{{ listTableIndexes()
+
+    /**
+     * list all indexes in a table
+     *
+     * @param string $table name of table that should be used in method
+     * @return mixed array of index names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableIndexes($table)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $table = $db->quote($table, 'text');
+        $query = "SELECT sql FROM sqlite_master WHERE type='index' AND ";
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $query.= 'LOWER(tbl_name)='.strtolower($table);
+        } else {
+            $query.= "tbl_name=$table";
+        }
+        $query.= " AND sql NOT NULL ORDER BY name";
+        $indexes = $db->queryCol($query, 'text');
+        if (PEAR::isError($indexes)) {
+            return $indexes;
+        }
+
+        $result = array();
+        foreach ($indexes as $sql) {
+            if (preg_match("/^create index ([^ ]+) on /i", $sql, $tmp)) {
+                $index = $this->_fixIndexName($tmp[1]);
+                if (!empty($index)) {
+                    $result[$index] = true;
+                }
+            }
+        }
+
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_change_key_case($result, $db->options['field_case']);
+        }
+        return array_keys($result);
+    }
+
+    // }}}
+    // {{{ createConstraint()
+
+    /**
+     * create a constraint on a table
+     *
+     * @param string $table      name of the table on which the constraint is to be created
+     * @param string $name       name of the constraint to be created
+     * @param array  $definition associative array that defines properties of the constraint to be created.
+     *                           Currently, only one property named FIELDS is supported. This property
+     *                           is also an associative with the names of the constraint fields as array
+     *                           constraints. Each entry of this array is set to another type of associative
+     *                           array that specifies properties of the constraint that are specific to
+     *                           each field.
+     *
+     *                           Example
+     *                              array(
+     *                                  'fields' => array(
+     *                                      'user_name' => array(),
+     *                                      'last_login' => array()
+     *                                  )
+     *                              )
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createConstraint($table, $name, $definition)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (!empty($definition['primary'])) {
+            return $db->manager->alterTable($table, array(), false, array('primary' => $definition['fields']));
+        }
+        
+        if (!empty($definition['foreign'])) {
+            return $db->manager->alterTable($table, array(), false, array('foreign_keys' => array($name => $definition)));
+        }
+
+        $table = $db->quoteIdentifier($table, true);
+        $name  = $db->getIndexName($name);
+        $query = "CREATE UNIQUE INDEX $name ON $table";
+        $fields = array();
+        foreach ($definition['fields'] as $field_name => $field) {
+            $field_string = $field_name;
+            if (!empty($field['sorting'])) {
+                switch ($field['sorting']) {
+                case 'ascending':
+                    $field_string.= ' ASC';
+                    break;
+                case 'descending':
+                    $field_string.= ' DESC';
+                    break;
+                }
+            }
+            $fields[] = $field_string;
+        }
+        $query .= ' ('.implode(', ', $fields) . ')';
+        return $db->exec($query);
+    }
+
+    // }}}
+    // {{{ dropConstraint()
+
+    /**
+     * drop existing constraint
+     *
+     * @param string    $table        name of table that should be used in method
+     * @param string    $name         name of the constraint to be dropped
+     * @param string    $primary      hint if the constraint is primary
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropConstraint($table, $name, $primary = false)
+    {
+        if ($primary || $name == 'PRIMARY') {
+            return $this->alterTable($table, array(), false, array('primary' => null));
+        }
+
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        //is it a FK constraint? If so, also delete the associated triggers
+        $db->loadModule('Reverse', null, true);
+        $definition = $db->reverse->getTableConstraintDefinition($table, $name);
+        if (!PEAR::isError($definition) && !empty($definition['foreign'])) {
+            //first drop the FK enforcing triggers
+            $result = $this->_dropFKTriggers($table, $name, $definition['references']['table']);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+            //then drop the constraint itself
+            return $this->alterTable($table, array(), false, array('foreign_keys' => array($name => null)));
+        }
+
+        $name = $db->getIndexName($name);
+        return $db->exec("DROP INDEX $name");
+    }
+
+    // }}}
+    // {{{ _dropFKTriggers()
+    
+    /**
+     * Drop the triggers created to enforce the FOREIGN KEY constraint on the table
+     *
+     * @param string $table  table name
+     * @param string $fkname FOREIGN KEY constraint name
+     * @param string $referenced_table  referenced table name
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access private
+     */
+    function _dropFKTriggers($table, $fkname, $referenced_table)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $triggers  = $this->listTableTriggers($table);
+        $triggers2 = $this->listTableTriggers($referenced_table);
+        if (!PEAR::isError($triggers2) && !PEAR::isError($triggers)) {
+            $triggers = array_merge($triggers, $triggers2);
+            $pattern = '/^'.$fkname.'(_pk)?_(insert|update|delete)_trg$/i';
+            foreach ($triggers as $trigger) {
+                if (preg_match($pattern, $trigger)) {
+                    $result = $db->exec('DROP TRIGGER '.$trigger);
+                    if (PEAR::isError($result)) {
+                        return $result;
+                    }
+                }
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ listTableConstraints()
+
+    /**
+     * list all constraints in a table
+     *
+     * @param string $table name of table that should be used in method
+     * @return mixed array of constraint names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableConstraints($table)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $table = $db->quote($table, 'text');
+        $query = "SELECT sql FROM sqlite_master WHERE type='index' AND ";
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $query.= 'LOWER(tbl_name)='.strtolower($table);
+        } else {
+            $query.= "tbl_name=$table";
+        }
+        $query.= " AND sql NOT NULL ORDER BY name";
+        $indexes = $db->queryCol($query, 'text');
+        if (PEAR::isError($indexes)) {
+            return $indexes;
+        }
+
+        $result = array();
+        foreach ($indexes as $sql) {
+            if (preg_match("/^create unique index ([^ ]+) on /i", $sql, $tmp)) {
+                $index = $this->_fixIndexName($tmp[1]);
+                if (!empty($index)) {
+                    $result[$index] = true;
+                }
+            }
+        }
+        
+        // also search in table definition for PRIMARY KEYs...
+        $query = "SELECT sql FROM sqlite_master WHERE type='table' AND ";
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $query.= 'LOWER(name)='.strtolower($table);
+        } else {
+            $query.= "name=$table";
+        }
+        $query.= " AND sql NOT NULL ORDER BY name";
+        $table_def = $db->queryOne($query, 'text');
+        if (PEAR::isError($table_def)) {
+            return $table_def;
+        }
+        if (preg_match("/\bPRIMARY\s+KEY\b/i", $table_def, $tmp)) {
+            $result['primary'] = true;
+        }
+
+        // ...and for FOREIGN KEYs
+        if (preg_match_all("/\bCONSTRAINT\b\s+([^\s]+)\s+\bFOREIGN\s+KEY/imsx", $table_def, $tmp)) {
+            foreach ($tmp[1] as $fk) {
+                $result[$fk] = true;
+            }
+        }
+
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_change_key_case($result, $db->options['field_case']);
+        }
+        return array_keys($result);
+    }
+
+    // }}}
+    // {{{ createSequence()
+
+    /**
+     * create sequence
+     *
+     * @param string    $seq_name     name of the sequence to be created
+     * @param string    $start         start value of the sequence; default is 1
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createSequence($seq_name, $start = 1)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
+        $seqcol_name = $db->quoteIdentifier($db->options['seqcol_name'], true);
+        $query = "CREATE TABLE $sequence_name ($seqcol_name INTEGER PRIMARY KEY DEFAULT 0 NOT NULL)";
+        $res = $db->exec($query);
+        if (PEAR::isError($res)) {
+            return $res;
+        }
+        if ($start == 1) {
+            return MDB2_OK;
+        }
+        $res = $db->exec("INSERT INTO $sequence_name ($seqcol_name) VALUES (".($start-1).')');
+        if (!PEAR::isError($res)) {
+            return MDB2_OK;
+        }
+        // Handle error
+        $result = $db->exec("DROP TABLE $sequence_name");
+        if (PEAR::isError($result)) {
+            return $db->raiseError($result, null, null,
+                'could not drop inconsistent sequence table', __FUNCTION__);
+        }
+        return $db->raiseError($res, null, null,
+            'could not create sequence table', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ dropSequence()
+
+    /**
+     * drop existing sequence
+     *
+     * @param string    $seq_name     name of the sequence to be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropSequence($seq_name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
+        return $db->exec("DROP TABLE $sequence_name");
+    }
+
+    // }}}
+    // {{{ listSequences()
+
+    /**
+     * list all sequences in the current database
+     *
+     * @return mixed array of sequence names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listSequences($dummy=null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = "SELECT name FROM sqlite_master WHERE type='table' AND sql NOT NULL ORDER BY name";
+        $table_names = $db->queryCol($query);
+        if (PEAR::isError($table_names)) {
+            return $table_names;
+        }
+        $result = array();
+        foreach ($table_names as $table_name) {
+            if ($sqn = $this->_fixSequenceName($table_name, true)) {
+                $result[] = $sqn;
+            }
+        }
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    // }}}
+}
+?>
diff --git a/3rdparty/MDB2/Driver/Native/Common.php b/3rdparty/MDB2/Driver/Native/Common.php
new file mode 100644
index 00000000000..c01caa35b71
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Native/Common.php
@@ -0,0 +1,61 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: Common.php,v 1.2 2007/09/09 13:47:36 quipo Exp $
+//
+
+/**
+ * Base class for the natuve modules that is extended by each MDB2 driver
+ *
+ * To load this module in the MDB2 object:
+ * $mdb->loadModule('Native');
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Native_Common extends MDB2_Module_Common
+{
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Native/mysql.php b/3rdparty/MDB2/Driver/Native/mysql.php
new file mode 100644
index 00000000000..90ff068e6ff
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Native/mysql.php
@@ -0,0 +1,60 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: mysql.php,v 1.9 2006/06/18 21:59:05 lsmith Exp $
+//
+
+require_once 'MDB2/Driver/Native/Common.php';
+
+/**
+ * MDB2 MySQL driver for the native module
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Native_mysql extends MDB2_Driver_Native_Common
+{
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Native/pgsql.php b/3rdparty/MDB2/Driver/Native/pgsql.php
new file mode 100644
index 00000000000..acab8389c89
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Native/pgsql.php
@@ -0,0 +1,88 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Paul Cooper <pgc@ucecom.com>                                 |
+// +----------------------------------------------------------------------+
+//
+// $Id: pgsql.php,v 1.12 2006/07/15 13:07:15 lsmith Exp $
+
+require_once 'MDB2/Driver/Native/Common.php';
+
+/**
+ * MDB2 PostGreSQL driver for the native module
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Paul Cooper <pgc@ucecom.com>
+ */
+class MDB2_Driver_Native_pgsql extends MDB2_Driver_Native_Common
+{
+    // }}}
+    // {{{ deleteOID()
+
+    /**
+     * delete an OID
+     *
+     * @param integer    $OID
+     * @return mixed MDB2_OK on success or MDB2 Error Object on failure
+     * @access public
+     */
+    function deleteOID($OID)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $connection = $db->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        if (!@pg_lo_unlink($connection, $OID)) {
+            return $db->raiseError(null, null, null,
+                'Unable to unlink OID: '.$OID, __FUNCTION__);
+        }
+        return MDB2_OK;
+    }
+
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Native/sqlite.php b/3rdparty/MDB2/Driver/Native/sqlite.php
new file mode 100644
index 00000000000..0213293a50a
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Native/sqlite.php
@@ -0,0 +1,60 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: sqlite.php,v 1.9 2006/06/18 21:59:05 lsmith Exp $
+//
+
+require_once 'MDB2/Driver/Native/Common.php';
+
+/**
+ * MDB2 SQLite driver for the native module
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Native_sqlite extends MDB2_Driver_Native_Common
+{
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Reverse/Common.php b/3rdparty/MDB2/Driver/Reverse/Common.php
new file mode 100644
index 00000000000..c78d84f760a
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Reverse/Common.php
@@ -0,0 +1,517 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: Common.php,v 1.43 2009/01/14 15:01:21 quipo Exp $
+//
+
+/**
+ * @package MDB2
+ * @category Database
+ */
+
+/**
+ * These are constants for the tableInfo-function
+ * they are bitwised or'ed. so if there are more constants to be defined
+ * in the future, adjust MDB2_TABLEINFO_FULL accordingly
+ */
+
+define('MDB2_TABLEINFO_ORDER',      1);
+define('MDB2_TABLEINFO_ORDERTABLE', 2);
+define('MDB2_TABLEINFO_FULL',       3);
+
+/**
+ * Base class for the schema reverse engineering module that is extended by each MDB2 driver
+ *
+ * To load this module in the MDB2 object:
+ * $mdb->loadModule('Reverse');
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Reverse_Common extends MDB2_Module_Common
+{
+    // {{{ splitTableSchema()
+
+    /**
+     * Split the "[owner|schema].table" notation into an array
+     *
+     * @param string $table [schema and] table name
+     *
+     * @return array array(schema, table)
+     * @access private
+     */
+    function splitTableSchema($table)
+    {
+        $ret = array();
+        if (strpos($table, '.') !== false) {
+            return explode('.', $table);
+        }
+        return array(null, $table);
+    }
+
+    // }}}
+    // {{{ getTableFieldDefinition()
+
+    /**
+     * Get the structure of a field into an array
+     *
+     * @param string    $table     name of table that should be used in method
+     * @param string    $field     name of field that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure.
+     *          The returned array contains an array for each field definition,
+     *          with all or some of these indices, depending on the field data type:
+     *          [notnull] [nativetype] [length] [fixed] [default] [type] [mdb2type]
+     * @access public
+     */
+    function getTableFieldDefinition($table, $field)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ getTableIndexDefinition()
+
+    /**
+     * Get the structure of an index into an array
+     *
+     * @param string    $table      name of table that should be used in method
+     * @param string    $index      name of index that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     *          The returned array has this structure:
+     *          </pre>
+     *          array (
+     *              [fields] => array (
+     *                  [field1name] => array() // one entry per each field covered
+     *                  [field2name] => array() // by the index
+     *                  [field3name] => array(
+     *                      [sorting] => ascending
+     *                  )
+     *              )
+     *          );
+     *          </pre>
+     * @access public
+     */
+    function getTableIndexDefinition($table, $index)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ getTableConstraintDefinition()
+
+    /**
+     * Get the structure of an constraints into an array
+     *
+     * @param string    $table      name of table that should be used in method
+     * @param string    $index      name of index that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     *          The returned array has this structure:
+     *          <pre>
+     *          array (
+     *              [primary] => 0
+     *              [unique]  => 0
+     *              [foreign] => 1
+     *              [check]   => 0
+     *              [fields] => array (
+     *                  [field1name] => array() // one entry per each field covered
+     *                  [field2name] => array() // by the index
+     *                  [field3name] => array(
+     *                      [sorting]  => ascending
+     *                      [position] => 3
+     *                  )
+     *              )
+     *              [references] => array(
+     *                  [table] => name
+     *                  [fields] => array(
+     *                      [field1name] => array(  //one entry per each referenced field
+     *                           [position] => 1
+     *                      )
+     *                  )
+     *              )
+     *              [deferrable] => 0
+     *              [initiallydeferred] => 0
+     *              [onupdate] => CASCADE|RESTRICT|SET NULL|SET DEFAULT|NO ACTION
+     *              [ondelete] => CASCADE|RESTRICT|SET NULL|SET DEFAULT|NO ACTION
+     *              [match] => SIMPLE|PARTIAL|FULL
+     *          );
+     *          </pre>
+     * @access public
+     */
+    function getTableConstraintDefinition($table, $index)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ getSequenceDefinition()
+
+    /**
+     * Get the structure of a sequence into an array
+     *
+     * @param string    $sequence   name of sequence that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     *          The returned array has this structure:
+     *          <pre>
+     *          array (
+     *              [start] => n
+     *          );
+     *          </pre>
+     * @access public
+     */
+    function getSequenceDefinition($sequence)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $start = $db->currId($sequence);
+        if (PEAR::isError($start)) {
+            return $start;
+        }
+        if ($db->supports('current_id')) {
+            $start++;
+        } else {
+            $db->warnings[] = 'database does not support getting current
+                sequence value, the sequence value was incremented';
+        }
+        $definition = array();
+        if ($start != 1) {
+            $definition = array('start' => $start);
+        }
+        return $definition;
+    }
+
+    // }}}
+    // {{{ getTriggerDefinition()
+
+    /**
+     * Get the structure of a trigger into an array
+     *
+     * EXPERIMENTAL
+     *
+     * WARNING: this function is experimental and may change the returned value 
+     * at any time until labelled as non-experimental
+     *
+     * @param string    $trigger    name of trigger that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     *          The returned array has this structure:
+     *          <pre>
+     *          array (
+     *              [trigger_name]    => 'trigger name',
+     *              [table_name]      => 'table name',
+     *              [trigger_body]    => 'trigger body definition',
+     *              [trigger_type]    => 'BEFORE' | 'AFTER',
+     *              [trigger_event]   => 'INSERT' | 'UPDATE' | 'DELETE'
+     *                  //or comma separated list of multiple events, when supported
+     *              [trigger_enabled] => true|false
+     *              [trigger_comment] => 'trigger comment',
+     *          );
+     *          </pre>
+     *          The oci8 driver also returns a [when_clause] index.
+     * @access public
+     */
+    function getTriggerDefinition($trigger)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'method not implemented', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ tableInfo()
+
+    /**
+     * Returns information about a table or a result set
+     *
+     * The format of the resulting array depends on which <var>$mode</var>
+     * you select.  The sample output below is based on this query:
+     * <pre>
+     *    SELECT tblFoo.fldID, tblFoo.fldPhone, tblBar.fldId
+     *    FROM tblFoo
+     *    JOIN tblBar ON tblFoo.fldId = tblBar.fldId
+     * </pre>
+     *
+     * <ul>
+     * <li>
+     *
+     * <kbd>null</kbd> (default)
+     *   <pre>
+     *   [0] => Array (
+     *       [table] => tblFoo
+     *       [name] => fldId
+     *       [type] => int
+     *       [len] => 11
+     *       [flags] => primary_key not_null
+     *   )
+     *   [1] => Array (
+     *       [table] => tblFoo
+     *       [name] => fldPhone
+     *       [type] => string
+     *       [len] => 20
+     *       [flags] =>
+     *   )
+     *   [2] => Array (
+     *       [table] => tblBar
+     *       [name] => fldId
+     *       [type] => int
+     *       [len] => 11
+     *       [flags] => primary_key not_null
+     *   )
+     *   </pre>
+     *
+     * </li><li>
+     *
+     * <kbd>MDB2_TABLEINFO_ORDER</kbd>
+     *
+     *   <p>In addition to the information found in the default output,
+     *   a notation of the number of columns is provided by the
+     *   <samp>num_fields</samp> element while the <samp>order</samp>
+     *   element provides an array with the column names as the keys and
+     *   their location index number (corresponding to the keys in the
+     *   the default output) as the values.</p>
+     *
+     *   <p>If a result set has identical field names, the last one is
+     *   used.</p>
+     *
+     *   <pre>
+     *   [num_fields] => 3
+     *   [order] => Array (
+     *       [fldId] => 2
+     *       [fldTrans] => 1
+     *   )
+     *   </pre>
+     *
+     * </li><li>
+     *
+     * <kbd>MDB2_TABLEINFO_ORDERTABLE</kbd>
+     *
+     *   <p>Similar to <kbd>MDB2_TABLEINFO_ORDER</kbd> but adds more
+     *   dimensions to the array in which the table names are keys and
+     *   the field names are sub-keys.  This is helpful for queries that
+     *   join tables which have identical field names.</p>
+     *
+     *   <pre>
+     *   [num_fields] => 3
+     *   [ordertable] => Array (
+     *       [tblFoo] => Array (
+     *           [fldId] => 0
+     *           [fldPhone] => 1
+     *       )
+     *       [tblBar] => Array (
+     *           [fldId] => 2
+     *       )
+     *   )
+     *   </pre>
+     *
+     * </li>
+     * </ul>
+     *
+     * The <samp>flags</samp> element contains a space separated list
+     * of extra information about the field.  This data is inconsistent
+     * between DBMS's due to the way each DBMS works.
+     *   + <samp>primary_key</samp>
+     *   + <samp>unique_key</samp>
+     *   + <samp>multiple_key</samp>
+     *   + <samp>not_null</samp>
+     *
+     * Most DBMS's only provide the <samp>table</samp> and <samp>flags</samp>
+     * elements if <var>$result</var> is a table name.  The following DBMS's
+     * provide full information from queries:
+     *   + fbsql
+     *   + mysql
+     *
+     * If the 'portability' option has <samp>MDB2_PORTABILITY_FIX_CASE</samp>
+     * turned on, the names of tables and fields will be lower or upper cased.
+     *
+     * @param object|string  $result  MDB2_result object from a query or a
+     *                                string containing the name of a table.
+     *                                While this also accepts a query result
+     *                                resource identifier, this behavior is
+     *                                deprecated.
+     * @param int  $mode   either unused or one of the tableInfo modes:
+     *                     <kbd>MDB2_TABLEINFO_ORDERTABLE</kbd>,
+     *                     <kbd>MDB2_TABLEINFO_ORDER</kbd> or
+     *                     <kbd>MDB2_TABLEINFO_FULL</kbd> (which does both).
+     *                     These are bitwise, so the first two can be
+     *                     combined using <kbd>|</kbd>.
+     *
+     * @return array  an associative array with the information requested.
+     *                 A MDB2_Error object on failure.
+     *
+     * @see MDB2_Driver_Common::setOption()
+     */
+    function tableInfo($result, $mode = null)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (!is_string($result)) {
+            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'method not implemented', __FUNCTION__);
+        }
+
+        $db->loadModule('Manager', null, true);
+        $fields = $db->manager->listTableFields($result);
+        if (PEAR::isError($fields)) {
+            return $fields;
+        }
+
+        $flags = array();
+
+        $idxname_format = $db->getOption('idxname_format');
+        $db->setOption('idxname_format', '%s');
+
+        $indexes = $db->manager->listTableIndexes($result);
+        if (PEAR::isError($indexes)) {
+            $db->setOption('idxname_format', $idxname_format);
+            return $indexes;
+        }
+
+        foreach ($indexes as $index) {
+            $definition = $this->getTableIndexDefinition($result, $index);
+            if (PEAR::isError($definition)) {
+                $db->setOption('idxname_format', $idxname_format);
+                return $definition;
+            }
+            if (count($definition['fields']) > 1) {
+                foreach ($definition['fields'] as $field => $sort) {
+                    $flags[$field] = 'multiple_key';
+                }
+            }
+        }
+
+        $constraints = $db->manager->listTableConstraints($result);
+        if (PEAR::isError($constraints)) {
+            return $constraints;
+        }
+
+        foreach ($constraints as $constraint) {
+            $definition = $this->getTableConstraintDefinition($result, $constraint);
+            if (PEAR::isError($definition)) {
+                $db->setOption('idxname_format', $idxname_format);
+                return $definition;
+            }
+            $flag = !empty($definition['primary'])
+                ? 'primary_key' : (!empty($definition['unique'])
+                    ? 'unique_key' : false);
+            if ($flag) {
+                foreach ($definition['fields'] as $field => $sort) {
+                    if (empty($flags[$field]) || $flags[$field] != 'primary_key') {
+                        $flags[$field] = $flag;
+                    }
+                }
+            }
+        }
+
+        $res = array();
+
+        if ($mode) {
+            $res['num_fields'] = count($fields);
+        }
+
+        foreach ($fields as $i => $field) {
+            $definition = $this->getTableFieldDefinition($result, $field);
+            if (PEAR::isError($definition)) {
+                $db->setOption('idxname_format', $idxname_format);
+                return $definition;
+            }
+            $res[$i] = $definition[0];
+            $res[$i]['name'] = $field;
+            $res[$i]['table'] = $result;
+            $res[$i]['type'] = preg_replace('/^([a-z]+).*$/i', '\\1', trim($definition[0]['nativetype']));
+            // 'primary_key', 'unique_key', 'multiple_key'
+            $res[$i]['flags'] = empty($flags[$field]) ? '' : $flags[$field];
+            // not_null', 'unsigned', 'auto_increment', 'default_[rawencodedvalue]'
+            if (!empty($res[$i]['notnull'])) {
+                $res[$i]['flags'].= ' not_null';
+            }
+            if (!empty($res[$i]['unsigned'])) {
+                $res[$i]['flags'].= ' unsigned';
+            }
+            if (!empty($res[$i]['auto_increment'])) {
+                $res[$i]['flags'].= ' autoincrement';
+            }
+            if (!empty($res[$i]['default'])) {
+                $res[$i]['flags'].= ' default_'.rawurlencode($res[$i]['default']);
+            }
+
+            if ($mode & MDB2_TABLEINFO_ORDER) {
+                $res['order'][$res[$i]['name']] = $i;
+            }
+            if ($mode & MDB2_TABLEINFO_ORDERTABLE) {
+                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
+            }
+        }
+
+        $db->setOption('idxname_format', $idxname_format);
+        return $res;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Reverse/mysql.php b/3rdparty/MDB2/Driver/Reverse/mysql.php
new file mode 100644
index 00000000000..6e366c22a5e
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Reverse/mysql.php
@@ -0,0 +1,536 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: mysql.php,v 1.80 2008/03/26 21:15:37 quipo Exp $
+//
+
+require_once('MDB2/Driver/Reverse/Common.php');
+
+/**
+ * MDB2 MySQL driver for the schema reverse engineering module
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ * @author  Lorenzo Alberton <l.alberton@quipo.it>
+ */
+class MDB2_Driver_Reverse_mysql extends MDB2_Driver_Reverse_Common
+{
+    // {{{ getTableFieldDefinition()
+
+    /**
+     * Get the structure of a field into an array
+     *
+     * @param string $table_name name of table that should be used in method
+     * @param string $field_name name of field that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function getTableFieldDefinition($table_name, $field_name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $result = $db->loadModule('Datatype', null, true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        list($schema, $table) = $this->splitTableSchema($table_name);
+
+        $table = $db->quoteIdentifier($table, true);
+        $query = "SHOW FULL COLUMNS FROM $table LIKE ".$db->quote($field_name);
+        $columns = $db->queryAll($query, null, MDB2_FETCHMODE_ASSOC);
+        if (PEAR::isError($columns)) {
+            return $columns;
+        }
+        foreach ($columns as $column) {
+            $column = array_change_key_case($column, CASE_LOWER);
+            $column['name'] = $column['field'];
+            unset($column['field']);
+            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+                if ($db->options['field_case'] == CASE_LOWER) {
+                    $column['name'] = strtolower($column['name']);
+                } else {
+                    $column['name'] = strtoupper($column['name']);
+                }
+            } else {
+                $column = array_change_key_case($column, $db->options['field_case']);
+            }
+            if ($field_name == $column['name']) {
+                $mapped_datatype = $db->datatype->mapNativeDatatype($column);
+                if (PEAR::isError($mapped_datatype)) {
+                    return $mapped_datatype;
+                }
+                list($types, $length, $unsigned, $fixed) = $mapped_datatype;
+                $notnull = false;
+                if (empty($column['null']) || $column['null'] !== 'YES') {
+                    $notnull = true;
+                }
+                $default = false;
+                if (array_key_exists('default', $column)) {
+                    $default = $column['default'];
+                    if (is_null($default) && $notnull) {
+                        $default = '';
+                    }
+                }
+                $autoincrement = false;
+                if (!empty($column['extra']) && $column['extra'] == 'auto_increment') {
+                    $autoincrement = true;
+                }
+                $collate = null;
+                if (!empty($column['collation'])) {
+                    $collate = $column['collation'];
+                    $charset = preg_replace('/(.+?)(_.+)?/', '$1', $collate);
+                }
+
+                $definition[0] = array(
+                    'notnull' => $notnull,
+                    'nativetype' => preg_replace('/^([a-z]+)[^a-z].*/i', '\\1', $column['type'])
+                );
+                if (!is_null($length)) {
+                    $definition[0]['length'] = $length;
+                }
+                if (!is_null($unsigned)) {
+                    $definition[0]['unsigned'] = $unsigned;
+                }
+                if (!is_null($fixed)) {
+                    $definition[0]['fixed'] = $fixed;
+                }
+                if ($default !== false) {
+                    $definition[0]['default'] = $default;
+                }
+                if ($autoincrement !== false) {
+                    $definition[0]['autoincrement'] = $autoincrement;
+                }
+                if (!is_null($collate)) {
+                    $definition[0]['collate'] = $collate;
+                    $definition[0]['charset'] = $charset;
+                }
+                foreach ($types as $key => $type) {
+                    $definition[$key] = $definition[0];
+                    if ($type == 'clob' || $type == 'blob') {
+                        unset($definition[$key]['default']);
+                    } elseif ($type == 'timestamp' && $notnull && empty($definition[$key]['default'])) {
+                        $definition[$key]['default'] = '0000-00-00 00:00:00';
+                    }
+                    $definition[$key]['type'] = $type;
+                    $definition[$key]['mdb2type'] = $type;
+                }
+                return $definition;
+            }
+        }
+
+        return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+            'it was not specified an existing table column', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ getTableIndexDefinition()
+
+    /**
+     * Get the structure of an index into an array
+     *
+     * @param string $table_name name of table that should be used in method
+     * @param string $index_name name of index that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function getTableIndexDefinition($table_name, $index_name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        list($schema, $table) = $this->splitTableSchema($table_name);
+
+        $table = $db->quoteIdentifier($table, true);
+        $query = "SHOW INDEX FROM $table /*!50002 WHERE Key_name = %s */";
+        $index_name_mdb2 = $db->getIndexName($index_name);
+        $result = $db->queryRow(sprintf($query, $db->quote($index_name_mdb2)));
+        if (!PEAR::isError($result) && !is_null($result)) {
+            // apply 'idxname_format' only if the query succeeded, otherwise
+            // fallback to the given $index_name, without transformation
+            $index_name = $index_name_mdb2;
+        }
+        $result = $db->query(sprintf($query, $db->quote($index_name)));
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        $colpos = 1;
+        $definition = array();
+        while (is_array($row = $result->fetchRow(MDB2_FETCHMODE_ASSOC))) {
+            $row = array_change_key_case($row, CASE_LOWER);
+            $key_name = $row['key_name'];
+            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+                if ($db->options['field_case'] == CASE_LOWER) {
+                    $key_name = strtolower($key_name);
+                } else {
+                    $key_name = strtoupper($key_name);
+                }
+            }
+            if ($index_name == $key_name) {
+                if (!$row['non_unique']) {
+                    return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                        $index_name . ' is not an existing table index', __FUNCTION__);
+                }
+                $column_name = $row['column_name'];
+                if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+                    if ($db->options['field_case'] == CASE_LOWER) {
+                        $column_name = strtolower($column_name);
+                    } else {
+                        $column_name = strtoupper($column_name);
+                    }
+                }
+                $definition['fields'][$column_name] = array(
+                    'position' => $colpos++
+                );
+                if (!empty($row['collation'])) {
+                    $definition['fields'][$column_name]['sorting'] = ($row['collation'] == 'A'
+                        ? 'ascending' : 'descending');
+                }
+            }
+        }
+        $result->free();
+        if (empty($definition['fields'])) {
+            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                $index_name . ' is not an existing table index', __FUNCTION__);
+        }
+        return $definition;
+    }
+
+    // }}}
+    // {{{ getTableConstraintDefinition()
+
+    /**
+     * Get the structure of a constraint into an array
+     *
+     * @param string $table_name      name of table that should be used in method
+     * @param string $constraint_name name of constraint that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function getTableConstraintDefinition($table_name, $constraint_name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        list($schema, $table) = $this->splitTableSchema($table_name);
+        $constraint_name_original = $constraint_name;
+
+        $table = $db->quoteIdentifier($table, true);
+        $query = "SHOW INDEX FROM $table /*!50002 WHERE Key_name = %s */";
+        if (strtolower($constraint_name) != 'primary') {
+            $constraint_name_mdb2 = $db->getIndexName($constraint_name);
+            $result = $db->queryRow(sprintf($query, $db->quote($constraint_name_mdb2)));
+            if (!PEAR::isError($result) && !is_null($result)) {
+                // apply 'idxname_format' only if the query succeeded, otherwise
+                // fallback to the given $index_name, without transformation
+                $constraint_name = $constraint_name_mdb2;
+            }
+        }
+        $result = $db->query(sprintf($query, $db->quote($constraint_name)));
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        $colpos = 1;
+        //default values, eventually overridden
+        $definition = array(
+            'primary' => false,
+            'unique'  => false,
+            'foreign' => false,
+            'check'   => false,
+            'fields'  => array(),
+            'references' => array(
+                'table'  => '',
+                'fields' => array(),
+            ),
+            'onupdate'  => '',
+            'ondelete'  => '',
+            'match'     => '',
+            'deferrable'        => false,
+            'initiallydeferred' => false,
+        );
+        while (is_array($row = $result->fetchRow(MDB2_FETCHMODE_ASSOC))) {
+            $row = array_change_key_case($row, CASE_LOWER);
+            $key_name = $row['key_name'];
+            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+                if ($db->options['field_case'] == CASE_LOWER) {
+                    $key_name = strtolower($key_name);
+                } else {
+                    $key_name = strtoupper($key_name);
+                }
+            }
+            if ($constraint_name == $key_name) {
+                if ($row['non_unique']) {
+                    //FOREIGN KEY?
+                    return $this->_getTableFKConstraintDefinition($table, $constraint_name_original, $definition);
+                }
+                if ($row['key_name'] == 'PRIMARY') {
+                    $definition['primary'] = true;
+                } elseif (!$row['non_unique']) {
+                    $definition['unique'] = true;
+                }
+                $column_name = $row['column_name'];
+                if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+                    if ($db->options['field_case'] == CASE_LOWER) {
+                        $column_name = strtolower($column_name);
+                    } else {
+                        $column_name = strtoupper($column_name);
+                    }
+                }
+                $definition['fields'][$column_name] = array(
+                    'position' => $colpos++
+                );
+                if (!empty($row['collation'])) {
+                    $definition['fields'][$column_name]['sorting'] = ($row['collation'] == 'A'
+                        ? 'ascending' : 'descending');
+                }
+            }
+        }
+        $result->free();
+        if (empty($definition['fields'])) {
+            return $this->_getTableFKConstraintDefinition($table, $constraint_name_original, $definition);
+        }
+        return $definition;
+    }
+
+    // }}}
+    // {{{ _getTableFKConstraintDefinition()
+    
+    /**
+     * Get the FK definition from the CREATE TABLE statement
+     *
+     * @param string $table           table name
+     * @param string $constraint_name constraint name
+     * @param array  $definition      default values for constraint definition
+     *
+     * @return array|PEAR_Error
+     * @access private
+     */
+    function _getTableFKConstraintDefinition($table, $constraint_name, $definition)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        $query = 'SHOW CREATE TABLE '. $db->escape($table);
+        $constraint = $db->queryOne($query, 'text', 1);
+        if (!PEAR::isError($constraint) && !empty($constraint)) {
+            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+                if ($db->options['field_case'] == CASE_LOWER) {
+                    $constraint = strtolower($constraint);
+                } else {
+                    $constraint = strtoupper($constraint);
+                }
+            }
+            $constraint_name_original = $constraint_name;
+            $constraint_name = $db->getIndexName($constraint_name);
+            $pattern = '/\bCONSTRAINT\s+'.$constraint_name.'\s+FOREIGN KEY\s+\(([^\)]+)\) \bREFERENCES\b ([^ ]+) \(([^\)]+)\)/i';
+            if (!preg_match($pattern, str_replace('`', '', $constraint), $matches)) {
+                //fallback to original constraint name
+                $pattern = '/\bCONSTRAINT\s+'.$constraint_name_original.'\s+FOREIGN KEY\s+\(([^\)]+)\) \bREFERENCES\b ([^ ]+) \(([^\)]+)\)/i';
+            }
+            if (preg_match($pattern, str_replace('`', '', $constraint), $matches)) {
+                $definition['foreign'] = true;
+                $column_names = explode(',', $matches[1]);
+                $referenced_cols = explode(',', $matches[3]);
+                $definition['references'] = array(
+                    'table'  => $matches[2],
+                    'fields' => array(),
+                );
+                $colpos = 1;
+                foreach ($column_names as $column_name) {
+                    $definition['fields'][trim($column_name)] = array(
+                        'position' => $colpos++
+                    );
+                }
+                $colpos = 1;
+                foreach ($referenced_cols as $column_name) {
+                    $definition['references']['fields'][trim($column_name)] = array(
+                        'position' => $colpos++
+                    );
+                }
+                $definition['onupdate'] = 'NO ACTION';
+                $definition['ondelete'] = 'NO ACTION';
+                $definition['match']    = 'SIMPLE';
+                return $definition;
+            }
+        }
+        return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                $constraint_name . ' is not an existing table constraint', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ getTriggerDefinition()
+
+    /**
+     * Get the structure of a trigger into an array
+     *
+     * EXPERIMENTAL
+     *
+     * WARNING: this function is experimental and may change the returned value
+     * at any time until labelled as non-experimental
+     *
+     * @param string    $trigger    name of trigger that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function getTriggerDefinition($trigger)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = 'SELECT trigger_name,
+                         event_object_table AS table_name,
+                         action_statement AS trigger_body,
+                         action_timing AS trigger_type,
+                         event_manipulation AS trigger_event
+                    FROM information_schema.triggers
+                   WHERE trigger_name = '. $db->quote($trigger, 'text');
+        $types = array(
+            'trigger_name'    => 'text',
+            'table_name'      => 'text',
+            'trigger_body'    => 'text',
+            'trigger_type'    => 'text',
+            'trigger_event'   => 'text',
+        );
+        $def = $db->queryRow($query, $types, MDB2_FETCHMODE_ASSOC);
+        if (PEAR::isError($def)) {
+            return $def;
+        }
+        $def['trigger_comment'] = '';
+        $def['trigger_enabled'] = true;
+        return $def;
+    }
+
+    // }}}
+    // {{{ tableInfo()
+
+    /**
+     * Returns information about a table or a result set
+     *
+     * @param object|string  $result  MDB2_result object from a query or a
+     *                                 string containing the name of a table.
+     *                                 While this also accepts a query result
+     *                                 resource identifier, this behavior is
+     *                                 deprecated.
+     * @param int            $mode    a valid tableInfo mode
+     *
+     * @return array  an associative array with the information requested.
+     *                 A MDB2_Error object on failure.
+     *
+     * @see MDB2_Driver_Common::setOption()
+     */
+    function tableInfo($result, $mode = null)
+    {
+        if (is_string($result)) {
+           return parent::tableInfo($result, $mode);
+        }
+
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $resource = MDB2::isResultCommon($result) ? $result->getResource() : $result;
+        if (!is_resource($resource)) {
+            return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                'Could not generate result resource', __FUNCTION__);
+        }
+
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            if ($db->options['field_case'] == CASE_LOWER) {
+                $case_func = 'strtolower';
+            } else {
+                $case_func = 'strtoupper';
+            }
+        } else {
+            $case_func = 'strval';
+        }
+
+        $count = @mysql_num_fields($resource);
+        $res   = array();
+        if ($mode) {
+            $res['num_fields'] = $count;
+        }
+
+        $db->loadModule('Datatype', null, true);
+        for ($i = 0; $i < $count; $i++) {
+            $res[$i] = array(
+                'table' => $case_func(@mysql_field_table($resource, $i)),
+                'name'  => $case_func(@mysql_field_name($resource, $i)),
+                'type'  => @mysql_field_type($resource, $i),
+                'length'   => @mysql_field_len($resource, $i),
+                'flags' => @mysql_field_flags($resource, $i),
+            );
+            if ($res[$i]['type'] == 'string') {
+                $res[$i]['type'] = 'char';
+            } elseif ($res[$i]['type'] == 'unknown') {
+                $res[$i]['type'] = 'decimal';
+            }
+            $mdb2type_info = $db->datatype->mapNativeDatatype($res[$i]);
+            if (PEAR::isError($mdb2type_info)) {
+               return $mdb2type_info;
+            }
+            $res[$i]['mdb2type'] = $mdb2type_info[0][0];
+            if ($mode & MDB2_TABLEINFO_ORDER) {
+                $res['order'][$res[$i]['name']] = $i;
+            }
+            if ($mode & MDB2_TABLEINFO_ORDERTABLE) {
+                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
+            }
+        }
+
+        return $res;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Reverse/pgsql.php b/3rdparty/MDB2/Driver/Reverse/pgsql.php
new file mode 100644
index 00000000000..8669c2b919b
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Reverse/pgsql.php
@@ -0,0 +1,573 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Authors: Paul Cooper <pgc@ucecom.com>                                |
+// |          Lorenzo Alberton <l.alberton@quipo.it>                      |
+// +----------------------------------------------------------------------+
+//
+// $Id: pgsql.php,v 1.75 2008/08/22 16:36:20 quipo Exp $
+
+require_once('MDB2/Driver/Reverse/Common.php');
+
+/**
+ * MDB2 PostGreSQL driver for the schema reverse engineering module
+ *
+ * @package  MDB2
+ * @category Database
+ * @author   Paul Cooper <pgc@ucecom.com>
+ * @author   Lorenzo Alberton <l.alberton@quipo.it>
+ */
+class MDB2_Driver_Reverse_pgsql extends MDB2_Driver_Reverse_Common
+{
+    // {{{ getTableFieldDefinition()
+
+    /**
+     * Get the structure of a field into an array
+     *
+     * @param string $table_name name of table that should be used in method
+     * @param string $field_name name of field that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function getTableFieldDefinition($table_name, $field_name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $result = $db->loadModule('Datatype', null, true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        list($schema, $table) = $this->splitTableSchema($table_name);
+
+        $query = "SELECT a.attname AS name,
+                         t.typname AS type,
+                         CASE a.attlen
+                           WHEN -1 THEN
+	                         CASE t.typname
+	                           WHEN 'numeric' THEN (a.atttypmod / 65536)
+	                           WHEN 'decimal' THEN (a.atttypmod / 65536)
+	                           WHEN 'money'   THEN (a.atttypmod / 65536)
+	                           ELSE CASE a.atttypmod
+                                 WHEN -1 THEN NULL
+	                             ELSE a.atttypmod - 4
+	                           END
+                             END
+	                       ELSE a.attlen
+                         END AS length,
+	                     CASE t.typname
+	                       WHEN 'numeric' THEN (a.atttypmod % 65536) - 4
+	                       WHEN 'decimal' THEN (a.atttypmod % 65536) - 4
+	                       WHEN 'money'   THEN (a.atttypmod % 65536) - 4
+	                       ELSE 0
+                         END AS scale,
+                         a.attnotnull,
+                         a.atttypmod,
+                         a.atthasdef,
+                         (SELECT substring(pg_get_expr(d.adbin, d.adrelid) for 128)
+                            FROM pg_attrdef d
+                           WHERE d.adrelid = a.attrelid
+                             AND d.adnum = a.attnum
+                             AND a.atthasdef
+                         ) as default
+                    FROM pg_attribute a,
+                         pg_class c,
+                         pg_type t
+                   WHERE c.relname = ".$db->quote($table, 'text')."
+                     AND a.atttypid = t.oid
+                     AND c.oid = a.attrelid
+                     AND NOT a.attisdropped
+                     AND a.attnum > 0
+                     AND a.attname = ".$db->quote($field_name, 'text')."
+                ORDER BY a.attnum";
+        $column = $db->queryRow($query, null, MDB2_FETCHMODE_ASSOC);
+        if (PEAR::isError($column)) {
+            return $column;
+        }
+
+        if (empty($column)) {
+            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                'it was not specified an existing table column', __FUNCTION__);
+        }
+
+        $column = array_change_key_case($column, CASE_LOWER);
+        $mapped_datatype = $db->datatype->mapNativeDatatype($column);
+        if (PEAR::isError($mapped_datatype)) {
+            return $mapped_datatype;
+        }
+        list($types, $length, $unsigned, $fixed) = $mapped_datatype;
+        $notnull = false;
+        if (!empty($column['attnotnull']) && $column['attnotnull'] == 't') {
+            $notnull = true;
+        }
+        $default = null;
+        if ($column['atthasdef'] === 't'
+            && !preg_match("/nextval\('([^']+)'/", $column['default'])
+        ) {
+            $pattern = '/^\'(.*)\'::[\w ]+$/i';
+            $default = $column['default'];#substr($column['adsrc'], 1, -1);
+            if (is_null($default) && $notnull) {
+                $default = '';
+            } elseif (!empty($default) && preg_match($pattern, $default)) {
+                //remove data type cast
+                $default = preg_replace ($pattern, '\\1', $default);
+            }
+        }
+        $autoincrement = false;
+        if (preg_match("/nextval\('([^']+)'/", $column['default'], $nextvals)) {
+            $autoincrement = true;
+        }
+        $definition[0] = array('notnull' => $notnull, 'nativetype' => $column['type']);
+        if (!is_null($length)) {
+            $definition[0]['length'] = $length;
+        }
+        if (!is_null($unsigned)) {
+            $definition[0]['unsigned'] = $unsigned;
+        }
+        if (!is_null($fixed)) {
+            $definition[0]['fixed'] = $fixed;
+        }
+        if ($default !== false) {
+            $definition[0]['default'] = $default;
+        }
+        if ($autoincrement !== false) {
+            $definition[0]['autoincrement'] = $autoincrement;
+        }
+        foreach ($types as $key => $type) {
+            $definition[$key] = $definition[0];
+            if ($type == 'clob' || $type == 'blob') {
+                unset($definition[$key]['default']);
+            }
+            $definition[$key]['type'] = $type;
+            $definition[$key]['mdb2type'] = $type;
+        }
+        return $definition;
+    }
+
+    // }}}
+    // {{{ getTableIndexDefinition()
+
+    /**
+     * Get the structure of an index into an array
+     *
+     * @param string $table_name name of table that should be used in method
+     * @param string $index_name name of index that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function getTableIndexDefinition($table_name, $index_name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        
+        list($schema, $table) = $this->splitTableSchema($table_name);
+
+        $query = 'SELECT relname, indkey FROM pg_index, pg_class';
+        $query.= ' WHERE pg_class.oid = pg_index.indexrelid';
+        $query.= " AND indisunique != 't' AND indisprimary != 't'";
+        $query.= ' AND pg_class.relname = %s';
+        $index_name_mdb2 = $db->getIndexName($index_name);
+        $row = $db->queryRow(sprintf($query, $db->quote($index_name_mdb2, 'text')), null, MDB2_FETCHMODE_ASSOC);
+        if (PEAR::isError($row) || empty($row)) {
+            // fallback to the given $index_name, without transformation
+            $row = $db->queryRow(sprintf($query, $db->quote($index_name, 'text')), null, MDB2_FETCHMODE_ASSOC);
+        }
+        if (PEAR::isError($row)) {
+            return $row;
+        }
+
+        if (empty($row)) {
+            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                'it was not specified an existing table index', __FUNCTION__);
+        }
+
+        $row = array_change_key_case($row, CASE_LOWER);
+
+        $db->loadModule('Manager', null, true);
+        $columns = $db->manager->listTableFields($table_name);
+
+        $definition = array();
+
+        $index_column_numbers = explode(' ', $row['indkey']);
+
+        $colpos = 1;
+        foreach ($index_column_numbers as $number) {
+            $definition['fields'][$columns[($number - 1)]] = array(
+                'position' => $colpos++,
+                'sorting' => 'ascending',
+            );
+        }
+        return $definition;
+    }
+
+    // }}}
+    // {{{ getTableConstraintDefinition()
+
+    /**
+     * Get the structure of a constraint into an array
+     *
+     * @param string $table_name      name of table that should be used in method
+     * @param string $constraint_name name of constraint that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function getTableConstraintDefinition($table_name, $constraint_name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        
+        list($schema, $table) = $this->splitTableSchema($table_name);
+
+        $query = "SELECT c.oid,
+                         c.conname AS constraint_name,
+                         CASE WHEN c.contype = 'c' THEN 1 ELSE 0 END AS \"check\",
+                         CASE WHEN c.contype = 'f' THEN 1 ELSE 0 END AS \"foreign\",
+                         CASE WHEN c.contype = 'p' THEN 1 ELSE 0 END AS \"primary\",
+                         CASE WHEN c.contype = 'u' THEN 1 ELSE 0 END AS \"unique\",
+                         CASE WHEN c.condeferrable = 'f' THEN 0 ELSE 1 END AS deferrable,
+                         CASE WHEN c.condeferred = 'f' THEN 0 ELSE 1 END AS initiallydeferred,
+                         --array_to_string(c.conkey, ' ') AS constraint_key,
+                         t.relname AS table_name,
+                         t2.relname AS references_table,
+                         CASE confupdtype
+                           WHEN 'a' THEN 'NO ACTION'
+                           WHEN 'r' THEN 'RESTRICT'
+                           WHEN 'c' THEN 'CASCADE'
+                           WHEN 'n' THEN 'SET NULL'
+                           WHEN 'd' THEN 'SET DEFAULT'
+                         END AS onupdate,
+                         CASE confdeltype
+                           WHEN 'a' THEN 'NO ACTION'
+                           WHEN 'r' THEN 'RESTRICT'
+                           WHEN 'c' THEN 'CASCADE'
+                           WHEN 'n' THEN 'SET NULL'
+                           WHEN 'd' THEN 'SET DEFAULT'
+                         END AS ondelete,
+                         CASE confmatchtype
+                           WHEN 'u' THEN 'UNSPECIFIED'
+                           WHEN 'f' THEN 'FULL'
+                           WHEN 'p' THEN 'PARTIAL'
+                         END AS match,
+                         --array_to_string(c.confkey, ' ') AS fk_constraint_key,
+                         consrc
+                    FROM pg_constraint c
+               LEFT JOIN pg_class t  ON c.conrelid  = t.oid
+               LEFT JOIN pg_class t2 ON c.confrelid = t2.oid
+                   WHERE c.conname = %s
+                     AND t.relname = " . $db->quote($table, 'text');
+        $constraint_name_mdb2 = $db->getIndexName($constraint_name);
+        $row = $db->queryRow(sprintf($query, $db->quote($constraint_name_mdb2, 'text')), null, MDB2_FETCHMODE_ASSOC);
+        if (PEAR::isError($row) || empty($row)) {
+            // fallback to the given $index_name, without transformation
+            $constraint_name_mdb2 = $constraint_name;
+            $row = $db->queryRow(sprintf($query, $db->quote($constraint_name_mdb2, 'text')), null, MDB2_FETCHMODE_ASSOC);
+        }
+        if (PEAR::isError($row)) {
+            return $row;
+        }
+        $uniqueIndex = false;
+        if (empty($row)) {
+            // We might be looking for a UNIQUE index that was not created
+            // as a constraint but should be treated as such.
+            $query = 'SELECT relname AS constraint_name,
+                             indkey,
+                             0 AS "check",
+                             0 AS "foreign",
+                             0 AS "primary",
+                             1 AS "unique",
+                             0 AS deferrable,
+                             0 AS initiallydeferred,
+                             NULL AS references_table,
+                             NULL AS onupdate,
+                             NULL AS ondelete,
+                             NULL AS match
+                        FROM pg_index, pg_class
+                       WHERE pg_class.oid = pg_index.indexrelid
+                         AND indisunique = \'t\'
+                         AND pg_class.relname = %s';
+            $constraint_name_mdb2 = $db->getIndexName($constraint_name);
+            $row = $db->queryRow(sprintf($query, $db->quote($constraint_name_mdb2, 'text')), null, MDB2_FETCHMODE_ASSOC);
+            if (PEAR::isError($row) || empty($row)) {
+                // fallback to the given $index_name, without transformation
+                $constraint_name_mdb2 = $constraint_name;
+                $row = $db->queryRow(sprintf($query, $db->quote($constraint_name_mdb2, 'text')), null, MDB2_FETCHMODE_ASSOC);
+            }
+            if (PEAR::isError($row)) {
+                return $row;
+            }
+            if (empty($row)) {
+                return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                    $constraint_name . ' is not an existing table constraint', __FUNCTION__);
+            }
+            $uniqueIndex = true;
+        }
+
+        $row = array_change_key_case($row, CASE_LOWER);
+
+        $definition = array(
+            'primary' => (boolean)$row['primary'],
+            'unique'  => (boolean)$row['unique'],
+            'foreign' => (boolean)$row['foreign'],
+            'check'   => (boolean)$row['check'],
+            'fields'  => array(),
+            'references' => array(
+                'table'  => $row['references_table'],
+                'fields' => array(),
+            ),
+            'deferrable' => (boolean)$row['deferrable'],
+            'initiallydeferred' => (boolean)$row['initiallydeferred'],
+            'onupdate' => $row['onupdate'],
+            'ondelete' => $row['ondelete'],
+            'match'    => $row['match'],
+        );
+
+        if ($uniqueIndex) {
+            $db->loadModule('Manager', null, true);
+            $columns = $db->manager->listTableFields($table_name);
+            $index_column_numbers = explode(' ', $row['indkey']);
+            $colpos = 1;
+            foreach ($index_column_numbers as $number) {
+                $definition['fields'][$columns[($number - 1)]] = array(
+                    'position' => $colpos++,
+                    'sorting'  => 'ascending',
+                );
+            }
+            return $definition;
+        }
+
+        $query = 'SELECT a.attname
+                    FROM pg_constraint c
+               LEFT JOIN pg_class t  ON c.conrelid  = t.oid
+               LEFT JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = ANY(c.conkey)
+                   WHERE c.conname = %s
+                     AND t.relname = ' . $db->quote($table, 'text');
+        $fields = $db->queryCol(sprintf($query, $db->quote($constraint_name_mdb2, 'text')), null);
+        if (PEAR::isError($fields)) {
+            return $fields;
+        }
+        $colpos = 1;
+        foreach ($fields as $field) {
+            $definition['fields'][$field] = array(
+                'position' => $colpos++,
+                'sorting' => 'ascending',
+            );
+        }
+        
+        if ($definition['foreign']) {
+            $query = 'SELECT a.attname
+                        FROM pg_constraint c
+                   LEFT JOIN pg_class t  ON c.confrelid  = t.oid
+                   LEFT JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = ANY(c.confkey)
+                       WHERE c.conname = %s
+                         AND t.relname = ' . $db->quote($definition['references']['table'], 'text');
+            $foreign_fields = $db->queryCol(sprintf($query, $db->quote($constraint_name_mdb2, 'text')), null);
+            if (PEAR::isError($foreign_fields)) {
+                return $foreign_fields;
+            }
+            $colpos = 1;
+            foreach ($foreign_fields as $foreign_field) {
+                $definition['references']['fields'][$foreign_field] = array(
+                    'position' => $colpos++,
+                );
+            }
+        }
+        
+        if ($definition['check']) {
+            $check_def = $db->queryOne("SELECT pg_get_constraintdef(" . $row['oid'] . ", 't')");
+            // ...
+        }
+        return $definition;
+    }
+
+    // }}}
+    // {{{ getTriggerDefinition()
+
+    /**
+     * Get the structure of a trigger into an array
+     *
+     * EXPERIMENTAL
+     *
+     * WARNING: this function is experimental and may change the returned value
+     * at any time until labelled as non-experimental
+     *
+     * @param string $trigger name of trigger that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     * @access public
+     *
+     * @TODO: add support for plsql functions and functions with args
+     */
+    function getTriggerDefinition($trigger)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = "SELECT trg.tgname AS trigger_name,
+                         tbl.relname AS table_name,
+                         CASE
+                            WHEN p.proname IS NOT NULL THEN 'EXECUTE PROCEDURE ' || p.proname || '();'
+                            ELSE ''
+                         END AS trigger_body,
+                         CASE trg.tgtype & cast(2 as int2)
+                            WHEN 0 THEN 'AFTER'
+                            ELSE 'BEFORE'
+                         END AS trigger_type,
+                         CASE trg.tgtype & cast(28 as int2)
+                            WHEN 16 THEN 'UPDATE'
+                            WHEN 8 THEN 'DELETE'
+                            WHEN 4 THEN 'INSERT'
+                            WHEN 20 THEN 'INSERT, UPDATE'
+                            WHEN 28 THEN 'INSERT, UPDATE, DELETE'
+                            WHEN 24 THEN 'UPDATE, DELETE'
+                            WHEN 12 THEN 'INSERT, DELETE'
+                         END AS trigger_event,
+                         CASE trg.tgenabled
+                            WHEN 'O' THEN 't'
+                            ELSE trg.tgenabled
+                         END AS trigger_enabled,
+                         obj_description(trg.oid, 'pg_trigger') AS trigger_comment
+                    FROM pg_trigger trg,
+                         pg_class tbl,
+                         pg_proc p
+                   WHERE trg.tgrelid = tbl.oid
+                     AND trg.tgfoid = p.oid
+                     AND trg.tgname = ". $db->quote($trigger, 'text');
+        $types = array(
+            'trigger_name'    => 'text',
+            'table_name'      => 'text',
+            'trigger_body'    => 'text',
+            'trigger_type'    => 'text',
+            'trigger_event'   => 'text',
+            'trigger_comment' => 'text',
+            'trigger_enabled' => 'boolean',
+        );
+        return $db->queryRow($query, $types, MDB2_FETCHMODE_ASSOC);
+    }
+    
+    // }}}
+    // {{{ tableInfo()
+
+    /**
+     * Returns information about a table or a result set
+     *
+     * NOTE: only supports 'table' and 'flags' if <var>$result</var>
+     * is a table name.
+     *
+     * @param object|string  $result  MDB2_result object from a query or a
+     *                                 string containing the name of a table.
+     *                                 While this also accepts a query result
+     *                                 resource identifier, this behavior is
+     *                                 deprecated.
+     * @param int            $mode    a valid tableInfo mode
+     *
+     * @return array  an associative array with the information requested.
+     *                 A MDB2_Error object on failure.
+     *
+     * @see MDB2_Driver_Common::tableInfo()
+     */
+    function tableInfo($result, $mode = null)
+    {
+        if (is_string($result)) {
+           return parent::tableInfo($result, $mode);
+        }
+
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $resource = MDB2::isResultCommon($result) ? $result->getResource() : $result;
+        if (!is_resource($resource)) {
+            return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                'Could not generate result resource', __FUNCTION__);
+        }
+
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            if ($db->options['field_case'] == CASE_LOWER) {
+                $case_func = 'strtolower';
+            } else {
+                $case_func = 'strtoupper';
+            }
+        } else {
+            $case_func = 'strval';
+        }
+
+        $count = @pg_num_fields($resource);
+        $res   = array();
+
+        if ($mode) {
+            $res['num_fields'] = $count;
+        }
+
+        $db->loadModule('Datatype', null, true);
+        for ($i = 0; $i < $count; $i++) {
+            $res[$i] = array(
+                'table' => function_exists('pg_field_table') ? @pg_field_table($resource, $i) : '',
+                'name'  => $case_func(@pg_field_name($resource, $i)),
+                'type'  => @pg_field_type($resource, $i),
+                'length' => @pg_field_size($resource, $i),
+                'flags' => '',
+            );
+            $mdb2type_info = $db->datatype->mapNativeDatatype($res[$i]);
+            if (PEAR::isError($mdb2type_info)) {
+               return $mdb2type_info;
+            }
+            $res[$i]['mdb2type'] = $mdb2type_info[0][0];
+            if ($mode & MDB2_TABLEINFO_ORDER) {
+                $res['order'][$res[$i]['name']] = $i;
+            }
+            if ($mode & MDB2_TABLEINFO_ORDERTABLE) {
+                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
+            }
+        }
+
+        return $res;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Reverse/sqlite.php b/3rdparty/MDB2/Driver/Reverse/sqlite.php
new file mode 100644
index 00000000000..60c686c418a
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Reverse/sqlite.php
@@ -0,0 +1,609 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith, Lorenzo Alberton                       |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Authors: Lukas Smith <smith@pooteeweet.org>                          |
+// |          Lorenzo Alberton <l.alberton@quipo.it>                      |
+// +----------------------------------------------------------------------+
+//
+// $Id: sqlite.php,v 1.80 2008/05/03 10:30:14 quipo Exp $
+//
+
+require_once('MDB2/Driver/Reverse/Common.php');
+
+/**
+ * MDB2 SQlite driver for the schema reverse engineering module
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Reverse_sqlite extends MDB2_Driver_Reverse_Common
+{
+    /**
+     * Remove SQL comments from the field definition
+     *
+     * @access private
+     */
+    function _removeComments($sql) {
+        $lines = explode("\n", $sql);
+        foreach ($lines as $k => $line) {
+            $pieces = explode('--', $line);
+            if (count($pieces) > 1 && (substr_count($pieces[0], '\'') % 2) == 0) {
+                $lines[$k] = substr($line, 0, strpos($line, '--'));
+            }
+        }
+        return implode("\n", $lines);
+    }
+
+    /**
+     *
+     */
+    function _getTableColumns($sql)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        $start_pos  = strpos($sql, '(');
+        $end_pos    = strrpos($sql, ')');
+        $column_def = substr($sql, $start_pos+1, $end_pos-$start_pos-1);
+        // replace the decimal length-places-separator with a colon
+        $column_def = preg_replace('/(\d),(\d)/', '\1:\2', $column_def);
+        $column_def = $this->_removeComments($column_def);
+        $column_sql = explode(',', $column_def);
+        $columns    = array();
+        $count      = count($column_sql);
+        if ($count == 0) {
+            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'unexpected empty table column definition list', __FUNCTION__);
+        }
+        $regexp = '/^\s*([^\s]+) +(CHAR|VARCHAR|VARCHAR2|TEXT|BOOLEAN|SMALLINT|INT|INTEGER|DECIMAL|BIGINT|DOUBLE|FLOAT|DATETIME|DATE|TIME|LONGTEXT|LONGBLOB)( ?\(([1-9][0-9]*)(:([1-9][0-9]*))?\))?( NULL| NOT NULL)?( UNSIGNED)?( NULL| NOT NULL)?( PRIMARY KEY)?( DEFAULT (\'[^\']*\'|[^ ]+))?( NULL| NOT NULL)?( PRIMARY KEY)?(\s*\-\-.*)?$/i';
+        $regexp2 = '/^\s*([^ ]+) +(PRIMARY|UNIQUE|CHECK)$/i';
+        for ($i=0, $j=0; $i<$count; ++$i) {
+            if (!preg_match($regexp, trim($column_sql[$i]), $matches)) {
+                if (!preg_match($regexp2, trim($column_sql[$i]))) {
+                    continue;
+                }
+                return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                    'unexpected table column SQL definition: "'.$column_sql[$i].'"', __FUNCTION__);
+            }
+            $columns[$j]['name'] = trim($matches[1], implode('', $db->identifier_quoting));
+            $columns[$j]['type'] = strtolower($matches[2]);
+            if (isset($matches[4]) && strlen($matches[4])) {
+                $columns[$j]['length'] = $matches[4];
+            }
+            if (isset($matches[6]) && strlen($matches[6])) {
+                $columns[$j]['decimal'] = $matches[6];
+            }
+            if (isset($matches[8]) && strlen($matches[8])) {
+                $columns[$j]['unsigned'] = true;
+            }
+            if (isset($matches[9]) && strlen($matches[9])) {
+                $columns[$j]['autoincrement'] = true;
+            }
+            if (isset($matches[12]) && strlen($matches[12])) {
+                $default = $matches[12];
+                if (strlen($default) && $default[0]=="'") {
+                    $default = str_replace("''", "'", substr($default, 1, strlen($default)-2));
+                }
+                if ($default === 'NULL') {
+                    $default = null;
+                }
+                $columns[$j]['default'] = $default;
+            }
+            if (isset($matches[7]) && strlen($matches[7])) {
+                $columns[$j]['notnull'] = ($matches[7] === ' NOT NULL');
+            } else if (isset($matches[9]) && strlen($matches[9])) {
+                $columns[$j]['notnull'] = ($matches[9] === ' NOT NULL');
+            } else if (isset($matches[13]) && strlen($matches[13])) {
+                $columns[$j]['notnull'] = ($matches[13] === ' NOT NULL');
+            }
+            ++$j;
+        }
+        return $columns;
+    }
+
+    // {{{ getTableFieldDefinition()
+
+    /**
+     * Get the stucture of a field into an array
+     *
+     * @param string $table_name name of table that should be used in method
+     * @param string $field_name name of field that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure.
+     *          The returned array contains an array for each field definition,
+     *          with (some of) these indices:
+     *          [notnull] [nativetype] [length] [fixed] [default] [type] [mdb2type]
+     * @access public
+     */
+    function getTableFieldDefinition($table_name, $field_name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        
+        list($schema, $table) = $this->splitTableSchema($table_name);
+
+        $result = $db->loadModule('Datatype', null, true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        $query = "SELECT sql FROM sqlite_master WHERE type='table' AND ";
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $query.= 'LOWER(name)='.$db->quote(strtolower($table), 'text');
+        } else {
+            $query.= 'name='.$db->quote($table, 'text');
+        }
+        $sql = $db->queryOne($query);
+        if (PEAR::isError($sql)) {
+            return $sql;
+        }
+        $columns = $this->_getTableColumns($sql);
+        foreach ($columns as $column) {
+            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+                if ($db->options['field_case'] == CASE_LOWER) {
+                    $column['name'] = strtolower($column['name']);
+                } else {
+                    $column['name'] = strtoupper($column['name']);
+                }
+            } else {
+                $column = array_change_key_case($column, $db->options['field_case']);
+            }
+            if ($field_name == $column['name']) {
+                $mapped_datatype = $db->datatype->mapNativeDatatype($column);
+                if (PEAR::isError($mapped_datatype)) {
+                    return $mapped_datatype;
+                }
+                list($types, $length, $unsigned, $fixed) = $mapped_datatype;
+                $notnull = false;
+                if (!empty($column['notnull'])) {
+                    $notnull = $column['notnull'];
+                }
+                $default = false;
+                if (array_key_exists('default', $column)) {
+                    $default = $column['default'];
+                    if (is_null($default) && $notnull) {
+                        $default = '';
+                    }
+                }
+                $autoincrement = false;
+                if (!empty($column['autoincrement'])) {
+                    $autoincrement = true;
+                }
+
+                $definition[0] = array(
+                    'notnull' => $notnull,
+                    'nativetype' => preg_replace('/^([a-z]+)[^a-z].*/i', '\\1', $column['type'])
+                );
+                if (!is_null($length)) {
+                    $definition[0]['length'] = $length;
+                }
+                if (!is_null($unsigned)) {
+                    $definition[0]['unsigned'] = $unsigned;
+                }
+                if (!is_null($fixed)) {
+                    $definition[0]['fixed'] = $fixed;
+                }
+                if ($default !== false) {
+                    $definition[0]['default'] = $default;
+                }
+                if ($autoincrement !== false) {
+                    $definition[0]['autoincrement'] = $autoincrement;
+                }
+                foreach ($types as $key => $type) {
+                    $definition[$key] = $definition[0];
+                    if ($type == 'clob' || $type == 'blob') {
+                        unset($definition[$key]['default']);
+                    }
+                    $definition[$key]['type'] = $type;
+                    $definition[$key]['mdb2type'] = $type;
+                }
+                return $definition;
+            }
+        }
+
+        return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+            'it was not specified an existing table column', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ getTableIndexDefinition()
+
+    /**
+     * Get the stucture of an index into an array
+     *
+     * @param string $table_name name of table that should be used in method
+     * @param string $index_name name of index that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function getTableIndexDefinition($table_name, $index_name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        
+        list($schema, $table) = $this->splitTableSchema($table_name);
+
+        $query = "SELECT sql FROM sqlite_master WHERE type='index' AND ";
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $query.= 'LOWER(name)=%s AND LOWER(tbl_name)=' . $db->quote(strtolower($table), 'text');
+        } else {
+            $query.= 'name=%s AND tbl_name=' . $db->quote($table, 'text');
+        }
+        $query.= ' AND sql NOT NULL ORDER BY name';
+        $index_name_mdb2 = $db->getIndexName($index_name);
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $qry = sprintf($query, $db->quote(strtolower($index_name_mdb2), 'text'));
+        } else {
+            $qry = sprintf($query, $db->quote($index_name_mdb2, 'text'));
+        }
+        $sql = $db->queryOne($qry, 'text');
+        if (PEAR::isError($sql) || empty($sql)) {
+            // fallback to the given $index_name, without transformation
+            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+                $qry = sprintf($query, $db->quote(strtolower($index_name), 'text'));
+            } else {
+                $qry = sprintf($query, $db->quote($index_name, 'text'));
+            }
+            $sql = $db->queryOne($qry, 'text');
+        }
+        if (PEAR::isError($sql)) {
+            return $sql;
+        }
+        if (!$sql) {
+            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                'it was not specified an existing table index', __FUNCTION__);
+        }
+
+        $sql = strtolower($sql);
+        $start_pos = strpos($sql, '(');
+        $end_pos = strrpos($sql, ')');
+        $column_names = substr($sql, $start_pos+1, $end_pos-$start_pos-1);
+        $column_names = explode(',', $column_names);
+
+        if (preg_match("/^create unique/", $sql)) {
+            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                'it was not specified an existing table index', __FUNCTION__);
+        }
+
+        $definition = array();
+        $count = count($column_names);
+        for ($i=0; $i<$count; ++$i) {
+            $column_name = strtok($column_names[$i], ' ');
+            $collation = strtok(' ');
+            $definition['fields'][$column_name] = array(
+                'position' => $i+1
+            );
+            if (!empty($collation)) {
+                $definition['fields'][$column_name]['sorting'] =
+                    ($collation=='ASC' ? 'ascending' : 'descending');
+            }
+        }
+
+        if (empty($definition['fields'])) {
+            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                'it was not specified an existing table index', __FUNCTION__);
+        }
+        return $definition;
+    }
+
+    // }}}
+    // {{{ getTableConstraintDefinition()
+
+    /**
+     * Get the stucture of a constraint into an array
+     *
+     * @param string $table_name      name of table that should be used in method
+     * @param string $constraint_name name of constraint that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function getTableConstraintDefinition($table_name, $constraint_name)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        
+        list($schema, $table) = $this->splitTableSchema($table_name);
+
+        $query = "SELECT sql FROM sqlite_master WHERE type='index' AND ";
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $query.= 'LOWER(name)=%s AND LOWER(tbl_name)=' . $db->quote(strtolower($table), 'text');
+        } else {
+            $query.= 'name=%s AND tbl_name=' . $db->quote($table, 'text');
+        }
+        $query.= ' AND sql NOT NULL ORDER BY name';
+        $constraint_name_mdb2 = $db->getIndexName($constraint_name);
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $qry = sprintf($query, $db->quote(strtolower($constraint_name_mdb2), 'text'));
+        } else {
+            $qry = sprintf($query, $db->quote($constraint_name_mdb2, 'text'));
+        }
+        $sql = $db->queryOne($qry, 'text');
+        if (PEAR::isError($sql) || empty($sql)) {
+            // fallback to the given $index_name, without transformation
+            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+                $qry = sprintf($query, $db->quote(strtolower($constraint_name), 'text'));
+            } else {
+                $qry = sprintf($query, $db->quote($constraint_name, 'text'));
+            }
+            $sql = $db->queryOne($qry, 'text');
+        }
+        if (PEAR::isError($sql)) {
+            return $sql;
+        }
+        //default values, eventually overridden
+        $definition = array(
+            'primary' => false,
+            'unique'  => false,
+            'foreign' => false,
+            'check'   => false,
+            'fields'  => array(),
+            'references' => array(
+                'table'  => '',
+                'fields' => array(),
+            ),
+            'onupdate'  => '',
+            'ondelete'  => '',
+            'match'     => '',
+            'deferrable'        => false,
+            'initiallydeferred' => false,
+        );
+        if (!$sql) {
+            $query = "SELECT sql FROM sqlite_master WHERE type='table' AND ";
+            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+                $query.= 'LOWER(name)='.$db->quote(strtolower($table), 'text');
+            } else {
+                $query.= 'name='.$db->quote($table, 'text');
+            }
+            $query.= " AND sql NOT NULL ORDER BY name";
+            $sql = $db->queryOne($query, 'text');
+            if (PEAR::isError($sql)) {
+                return $sql;
+            }
+            if ($constraint_name == 'primary') {
+                // search in table definition for PRIMARY KEYs
+                if (preg_match("/\bPRIMARY\s+KEY\b\s*\(([^)]+)/i", $sql, $tmp)) {
+                    $definition['primary'] = true;
+                    $definition['fields'] = array();
+                    $column_names = explode(',', $tmp[1]);
+                    $colpos = 1;
+                    foreach ($column_names as $column_name) {
+                        $definition['fields'][trim($column_name)] = array(
+                            'position' => $colpos++
+                        );
+                    }
+                    return $definition;
+                }
+                if (preg_match("/\"([^\"]+)\"[^\,\"]+\bPRIMARY\s+KEY\b[^\,\)]*/i", $sql, $tmp)) {
+                    $definition['primary'] = true;
+                    $definition['fields'] = array();
+                    $column_names = explode(',', $tmp[1]);
+                    $colpos = 1;
+                    foreach ($column_names as $column_name) {
+                        $definition['fields'][trim($column_name)] = array(
+                            'position' => $colpos++
+                        );
+                    }
+                    return $definition;
+                }
+            } else {
+                // search in table definition for FOREIGN KEYs
+                $pattern = "/\bCONSTRAINT\b\s+%s\s+
+                    \bFOREIGN\s+KEY\b\s*\(([^\)]+)\)\s*
+                    \bREFERENCES\b\s+([^\s]+)\s*\(([^\)]+)\)\s*
+                    (?:\bMATCH\s*([^\s]+))?\s*
+                    (?:\bON\s+UPDATE\s+([^\s,\)]+))?\s*
+                    (?:\bON\s+DELETE\s+([^\s,\)]+))?\s*
+                    /imsx";
+                $found_fk = false;
+                if (preg_match(sprintf($pattern, $constraint_name_mdb2), $sql, $tmp)) {
+                    $found_fk = true;
+                } elseif (preg_match(sprintf($pattern, $constraint_name), $sql, $tmp)) {
+                    $found_fk = true;
+                }
+                if ($found_fk) {
+                    $definition['foreign'] = true;
+                    $definition['match'] = 'SIMPLE';
+                    $definition['onupdate'] = 'NO ACTION';
+                    $definition['ondelete'] = 'NO ACTION';
+                    $definition['references']['table'] = $tmp[2];
+                    $column_names = explode(',', $tmp[1]);
+                    $colpos = 1;
+                    foreach ($column_names as $column_name) {
+                        $definition['fields'][trim($column_name)] = array(
+                            'position' => $colpos++
+                        );
+                    }
+                    $referenced_cols = explode(',', $tmp[3]);
+                    $colpos = 1;
+                    foreach ($referenced_cols as $column_name) {
+                        $definition['references']['fields'][trim($column_name)] = array(
+                            'position' => $colpos++
+                        );
+                    }
+                    if (isset($tmp[4])) {
+                        $definition['match']    = $tmp[4];
+                    }
+                    if (isset($tmp[5])) {
+                        $definition['onupdate'] = $tmp[5];
+                    }
+                    if (isset($tmp[6])) {
+                        $definition['ondelete'] = $tmp[6];
+                    }
+                    return $definition;
+                }
+            }
+            $sql = false;
+        }
+        if (!$sql) {
+            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                $constraint_name . ' is not an existing table constraint', __FUNCTION__);
+        }
+
+        $sql = strtolower($sql);
+        $start_pos = strpos($sql, '(');
+        $end_pos   = strrpos($sql, ')');
+        $column_names = substr($sql, $start_pos+1, $end_pos-$start_pos-1);
+        $column_names = explode(',', $column_names);
+
+        if (!preg_match("/^create unique/", $sql)) {
+            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                $constraint_name . ' is not an existing table constraint', __FUNCTION__);
+        }
+
+        $definition['unique'] = true;
+        $count = count($column_names);
+        for ($i=0; $i<$count; ++$i) {
+            $column_name = strtok($column_names[$i]," ");
+            $collation = strtok(" ");
+            $definition['fields'][$column_name] = array(
+                'position' => $i+1
+            );
+            if (!empty($collation)) {
+                $definition['fields'][$column_name]['sorting'] =
+                    ($collation=='ASC' ? 'ascending' : 'descending');
+            }
+        }
+
+        if (empty($definition['fields'])) {
+            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                $constraint_name . ' is not an existing table constraint', __FUNCTION__);
+        }
+        return $definition;
+    }
+
+    // }}}
+    // {{{ getTriggerDefinition()
+
+    /**
+     * Get the structure of a trigger into an array
+     *
+     * EXPERIMENTAL
+     *
+     * WARNING: this function is experimental and may change the returned value
+     * at any time until labelled as non-experimental
+     *
+     * @param string    $trigger    name of trigger that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function getTriggerDefinition($trigger)
+    {
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = "SELECT name as trigger_name,
+                         tbl_name AS table_name,
+                         sql AS trigger_body,
+                         NULL AS trigger_type,
+                         NULL AS trigger_event,
+                         NULL AS trigger_comment,
+                         1 AS trigger_enabled
+                    FROM sqlite_master
+                   WHERE type='trigger'";
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $query.= ' AND LOWER(name)='.$db->quote(strtolower($trigger), 'text');
+        } else {
+            $query.= ' AND name='.$db->quote($trigger, 'text');
+        }
+        $types = array(
+            'trigger_name'    => 'text',
+            'table_name'      => 'text',
+            'trigger_body'    => 'text',
+            'trigger_type'    => 'text',
+            'trigger_event'   => 'text',
+            'trigger_comment' => 'text',
+            'trigger_enabled' => 'boolean',
+        );
+        $def = $db->queryRow($query, $types, MDB2_FETCHMODE_ASSOC);
+        if (PEAR::isError($def)) {
+            return $def;
+        }
+        if (empty($def)) {
+            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                'it was not specified an existing trigger', __FUNCTION__);
+        }
+        if (preg_match("/^create\s+(?:temp|temporary)?trigger\s+(?:if\s+not\s+exists\s+)?.*(before|after)?\s+(insert|update|delete)/Uims", $def['trigger_body'], $tmp)) {
+            $def['trigger_type'] = strtoupper($tmp[1]);
+            $def['trigger_event'] = strtoupper($tmp[2]);
+        }
+        return $def;
+    }
+
+    // }}}
+    // {{{ tableInfo()
+
+    /**
+     * Returns information about a table
+     *
+     * @param string         $result  a string containing the name of a table
+     * @param int            $mode    a valid tableInfo mode
+     *
+     * @return array  an associative array with the information requested.
+     *                 A MDB2_Error object on failure.
+     *
+     * @see MDB2_Driver_Common::tableInfo()
+     * @since Method available since Release 1.7.0
+     */
+    function tableInfo($result, $mode = null)
+    {
+        if (is_string($result)) {
+           return parent::tableInfo($result, $mode);
+        }
+
+        $db =$this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        return $db->raiseError(MDB2_ERROR_NOT_CAPABLE, null, null,
+           'This DBMS can not obtain tableInfo from result sets', __FUNCTION__);
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/mysql.php b/3rdparty/MDB2/Driver/mysql.php
new file mode 100644
index 00000000000..b9b46c0d762
--- /dev/null
+++ b/3rdparty/MDB2/Driver/mysql.php
@@ -0,0 +1,1700 @@
+<?php
+// vim: set et ts=4 sw=4 fdm=marker:
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: mysql.php,v 1.214 2008/11/16 21:45:08 quipo Exp $
+//
+
+/**
+ * MDB2 MySQL driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_mysql extends MDB2_Driver_Common
+{
+    // {{{ properties
+
+    var $string_quoting = array('start' => "'", 'end' => "'", 'escape' => '\\', 'escape_pattern' => '\\');
+
+    var $identifier_quoting = array('start' => '`', 'end' => '`', 'escape' => '`');
+
+    var $sql_comments = array(
+        array('start' => '-- ', 'end' => "\n", 'escape' => false),
+        array('start' => '#', 'end' => "\n", 'escape' => false),
+        array('start' => '/*', 'end' => '*/', 'escape' => false),
+    );
+
+    var $server_capabilities_checked = false;
+
+    var $start_transaction = false;
+
+    var $varchar_max_length = 255;
+
+    // }}}
+    // {{{ constructor
+
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        parent::__construct();
+
+        $this->phptype = 'mysql';
+        $this->dbsyntax = 'mysql';
+
+        $this->supported['sequences'] = 'emulated';
+        $this->supported['indexes'] = true;
+        $this->supported['affected_rows'] = true;
+        $this->supported['transactions'] = false;
+        $this->supported['savepoints'] = false;
+        $this->supported['summary_functions'] = true;
+        $this->supported['order_by_text'] = true;
+        $this->supported['current_id'] = 'emulated';
+        $this->supported['limit_queries'] = true;
+        $this->supported['LOBs'] = true;
+        $this->supported['replace'] = true;
+        $this->supported['sub_selects'] = 'emulated';
+        $this->supported['triggers'] = false;
+        $this->supported['auto_increment'] = true;
+        $this->supported['primary_key'] = true;
+        $this->supported['result_introspection'] = true;
+        $this->supported['prepared_statements'] = 'emulated';
+        $this->supported['identifier_quoting'] = true;
+        $this->supported['pattern_escaping'] = true;
+        $this->supported['new_link'] = true;
+
+        $this->options['DBA_username'] = false;
+        $this->options['DBA_password'] = false;
+        $this->options['default_table_type'] = '';
+        $this->options['max_identifiers_length'] = 64;
+
+        $this->_reCheckSupportedOptions();
+    }
+
+    // }}}
+    // {{{ _reCheckSupportedOptions()
+    
+    /**
+     * If the user changes certain options, other capabilities may depend
+     * on the new settings, so we need to check them (again).
+     *
+     * @access private
+     */
+    function _reCheckSupportedOptions()
+    {
+        $this->supported['transactions'] = $this->options['use_transactions'];
+        $this->supported['savepoints']   = $this->options['use_transactions'];
+        if ($this->options['default_table_type']) {
+            switch (strtoupper($this->options['default_table_type'])) {
+            case 'BLACKHOLE':
+            case 'MEMORY':
+            case 'ARCHIVE':
+            case 'CSV':
+            case 'HEAP':
+            case 'ISAM':
+            case 'MERGE':
+            case 'MRG_ISAM':
+            case 'ISAM':
+            case 'MRG_MYISAM':
+            case 'MYISAM':
+                $this->supported['savepoints']   = false;
+                $this->supported['transactions'] = false;
+                $this->warnings[] = $this->options['default_table_type'] .
+                    ' is not a supported default table type';
+                break;
+            }
+        }
+    }
+
+    // }}}
+    // {{{ function setOption($option, $value)
+
+    /**
+     * set the option for the db class
+     *
+     * @param   string  option name
+     * @param   mixed   value for the option
+     *
+     * @return  mixed   MDB2_OK or MDB2 Error Object
+     *
+     * @access  public
+     */
+    function setOption($option, $value)
+    {
+        $res = parent::setOption($option, $value);
+        $this->_reCheckSupportedOptions();
+    }
+
+    // }}}
+    // {{{ errorInfo()
+
+    /**
+     * This method is used to collect information about an error
+     *
+     * @param integer $error
+     * @return array
+     * @access public
+     */
+    function errorInfo($error = null)
+    {
+        if ($this->connection) {
+            $native_code = @mysql_errno($this->connection);
+            $native_msg  = @mysql_error($this->connection);
+        } else {
+            $native_code = @mysql_errno();
+            $native_msg  = @mysql_error();
+        }
+        if (is_null($error)) {
+            static $ecode_map;
+            if (empty($ecode_map)) {
+                $ecode_map = array(
+                    1000 => MDB2_ERROR_INVALID, //hashchk
+                    1001 => MDB2_ERROR_INVALID, //isamchk
+                    1004 => MDB2_ERROR_CANNOT_CREATE,
+                    1005 => MDB2_ERROR_CANNOT_CREATE,
+                    1006 => MDB2_ERROR_CANNOT_CREATE,
+                    1007 => MDB2_ERROR_ALREADY_EXISTS,
+                    1008 => MDB2_ERROR_CANNOT_DROP,
+                    1009 => MDB2_ERROR_CANNOT_DROP,
+                    1010 => MDB2_ERROR_CANNOT_DROP,
+                    1011 => MDB2_ERROR_CANNOT_DELETE,
+                    1022 => MDB2_ERROR_ALREADY_EXISTS,
+                    1029 => MDB2_ERROR_NOT_FOUND,
+                    1032 => MDB2_ERROR_NOT_FOUND,
+                    1044 => MDB2_ERROR_ACCESS_VIOLATION,
+                    1045 => MDB2_ERROR_ACCESS_VIOLATION,
+                    1046 => MDB2_ERROR_NODBSELECTED,
+                    1048 => MDB2_ERROR_CONSTRAINT,
+                    1049 => MDB2_ERROR_NOSUCHDB,
+                    1050 => MDB2_ERROR_ALREADY_EXISTS,
+                    1051 => MDB2_ERROR_NOSUCHTABLE,
+                    1054 => MDB2_ERROR_NOSUCHFIELD,
+                    1060 => MDB2_ERROR_ALREADY_EXISTS,
+                    1061 => MDB2_ERROR_ALREADY_EXISTS,
+                    1062 => MDB2_ERROR_ALREADY_EXISTS,
+                    1064 => MDB2_ERROR_SYNTAX,
+                    1067 => MDB2_ERROR_INVALID,
+                    1072 => MDB2_ERROR_NOT_FOUND,
+                    1086 => MDB2_ERROR_ALREADY_EXISTS,
+                    1091 => MDB2_ERROR_NOT_FOUND,
+                    1100 => MDB2_ERROR_NOT_LOCKED,
+                    1109 => MDB2_ERROR_NOT_FOUND,
+                    1125 => MDB2_ERROR_ALREADY_EXISTS,
+                    1136 => MDB2_ERROR_VALUE_COUNT_ON_ROW,
+                    1138 => MDB2_ERROR_INVALID,
+                    1142 => MDB2_ERROR_ACCESS_VIOLATION,
+                    1143 => MDB2_ERROR_ACCESS_VIOLATION,
+                    1146 => MDB2_ERROR_NOSUCHTABLE,
+                    1149 => MDB2_ERROR_SYNTAX,
+                    1169 => MDB2_ERROR_CONSTRAINT,
+                    1176 => MDB2_ERROR_NOT_FOUND,
+                    1177 => MDB2_ERROR_NOSUCHTABLE,
+                    1213 => MDB2_ERROR_DEADLOCK,
+                    1216 => MDB2_ERROR_CONSTRAINT,
+                    1217 => MDB2_ERROR_CONSTRAINT,
+                    1227 => MDB2_ERROR_ACCESS_VIOLATION,
+                    1235 => MDB2_ERROR_CANNOT_CREATE,
+                    1299 => MDB2_ERROR_INVALID_DATE,
+                    1300 => MDB2_ERROR_INVALID,
+                    1304 => MDB2_ERROR_ALREADY_EXISTS,
+                    1305 => MDB2_ERROR_NOT_FOUND,
+                    1306 => MDB2_ERROR_CANNOT_DROP,
+                    1307 => MDB2_ERROR_CANNOT_CREATE,
+                    1334 => MDB2_ERROR_CANNOT_ALTER,
+                    1339 => MDB2_ERROR_NOT_FOUND,
+                    1356 => MDB2_ERROR_INVALID,
+                    1359 => MDB2_ERROR_ALREADY_EXISTS,
+                    1360 => MDB2_ERROR_NOT_FOUND,
+                    1363 => MDB2_ERROR_NOT_FOUND,
+                    1365 => MDB2_ERROR_DIVZERO,
+                    1451 => MDB2_ERROR_CONSTRAINT,
+                    1452 => MDB2_ERROR_CONSTRAINT,
+                    1542 => MDB2_ERROR_CANNOT_DROP,
+                    1546 => MDB2_ERROR_CONSTRAINT,
+                    1582 => MDB2_ERROR_CONSTRAINT,
+                    2003 => MDB2_ERROR_CONNECT_FAILED,
+                    2019 => MDB2_ERROR_INVALID,
+                );
+            }
+            if ($this->options['portability'] & MDB2_PORTABILITY_ERRORS) {
+                $ecode_map[1022] = MDB2_ERROR_CONSTRAINT;
+                $ecode_map[1048] = MDB2_ERROR_CONSTRAINT_NOT_NULL;
+                $ecode_map[1062] = MDB2_ERROR_CONSTRAINT;
+            } else {
+                // Doing this in case mode changes during runtime.
+                $ecode_map[1022] = MDB2_ERROR_ALREADY_EXISTS;
+                $ecode_map[1048] = MDB2_ERROR_CONSTRAINT;
+                $ecode_map[1062] = MDB2_ERROR_ALREADY_EXISTS;
+            }
+            if (isset($ecode_map[$native_code])) {
+                $error = $ecode_map[$native_code];
+            }
+        }
+        return array($error, $native_code, $native_msg);
+    }
+
+    // }}}
+    // {{{ escape()
+
+    /**
+     * Quotes a string so it can be safely used in a query. It will quote
+     * the text so it can safely be used within a query.
+     *
+     * @param   string  the input string to quote
+     * @param   bool    escape wildcards
+     *
+     * @return  string  quoted string
+     *
+     * @access  public
+     */
+    function escape($text, $escape_wildcards = false)
+    {
+        if ($escape_wildcards) {
+            $text = $this->escapePattern($text);
+        }
+        $connection = $this->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+        $text = @mysql_real_escape_string($text, $connection);
+        return $text;
+    }
+
+    // }}}
+    // {{{ beginTransaction()
+
+    /**
+     * Start a transaction or set a savepoint.
+     *
+     * @param   string  name of a savepoint to set
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function beginTransaction($savepoint = null)
+    {
+        $this->debug('Starting transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+        $this->_getServerCapabilities();
+        if (!is_null($savepoint)) {
+            if (!$this->supports('savepoints')) {
+                return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                    'savepoints are not supported', __FUNCTION__);
+            }
+            if (!$this->in_transaction) {
+                return $this->raiseError(MDB2_ERROR_INVALID, null, null,
+                    'savepoint cannot be released when changes are auto committed', __FUNCTION__);
+            }
+            $query = 'SAVEPOINT '.$savepoint;
+            return $this->_doQuery($query, true);
+        } elseif ($this->in_transaction) {
+            return MDB2_OK;  //nothing to do
+        }
+        if (!$this->destructor_registered && $this->opened_persistent) {
+            $this->destructor_registered = true;
+            register_shutdown_function('MDB2_closeOpenTransactions');
+        }
+        $query = $this->start_transaction ? 'START TRANSACTION' : 'SET AUTOCOMMIT = 0';
+        $result =& $this->_doQuery($query, true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        $this->in_transaction = true;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ commit()
+
+    /**
+     * Commit the database changes done during a transaction that is in
+     * progress or release a savepoint. This function may only be called when
+     * auto-committing is disabled, otherwise it will fail. Therefore, a new
+     * transaction is implicitly started after committing the pending changes.
+     *
+     * @param   string  name of a savepoint to release
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function commit($savepoint = null)
+    {
+        $this->debug('Committing transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+        if (!$this->in_transaction) {
+            return $this->raiseError(MDB2_ERROR_INVALID, null, null,
+                'commit/release savepoint cannot be done changes are auto committed', __FUNCTION__);
+        }
+        if (!is_null($savepoint)) {
+            if (!$this->supports('savepoints')) {
+                return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                    'savepoints are not supported', __FUNCTION__);
+            }
+            $server_info = $this->getServerVersion();
+            if (version_compare($server_info['major'].'.'.$server_info['minor'].'.'.$server_info['patch'], '5.0.3', '<')) {
+                return MDB2_OK;
+            }
+            $query = 'RELEASE SAVEPOINT '.$savepoint;
+            return $this->_doQuery($query, true);
+        }
+
+        if (!$this->supports('transactions')) {
+            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'transactions are not supported', __FUNCTION__);
+        }
+
+        $result =& $this->_doQuery('COMMIT', true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if (!$this->start_transaction) {
+            $query = 'SET AUTOCOMMIT = 1';
+            $result =& $this->_doQuery($query, true);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+        $this->in_transaction = false;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ rollback()
+
+    /**
+     * Cancel any database changes done during a transaction or since a specific
+     * savepoint that is in progress. This function may only be called when
+     * auto-committing is disabled, otherwise it will fail. Therefore, a new
+     * transaction is implicitly started after canceling the pending changes.
+     *
+     * @param   string  name of a savepoint to rollback to
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function rollback($savepoint = null)
+    {
+        $this->debug('Rolling back transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+        if (!$this->in_transaction) {
+            return $this->raiseError(MDB2_ERROR_INVALID, null, null,
+                'rollback cannot be done changes are auto committed', __FUNCTION__);
+        }
+        if (!is_null($savepoint)) {
+            if (!$this->supports('savepoints')) {
+                return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                    'savepoints are not supported', __FUNCTION__);
+            }
+            $query = 'ROLLBACK TO SAVEPOINT '.$savepoint;
+            return $this->_doQuery($query, true);
+        }
+
+        $query = 'ROLLBACK';
+        $result =& $this->_doQuery($query, true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if (!$this->start_transaction) {
+            $query = 'SET AUTOCOMMIT = 1';
+            $result =& $this->_doQuery($query, true);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+        $this->in_transaction = false;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function setTransactionIsolation()
+
+    /**
+     * Set the transacton isolation level.
+     *
+     * @param   string  standard isolation level
+     *                  READ UNCOMMITTED (allows dirty reads)
+     *                  READ COMMITTED (prevents dirty reads)
+     *                  REPEATABLE READ (prevents nonrepeatable reads)
+     *                  SERIALIZABLE (prevents phantom reads)
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     * @since   2.1.1
+     */
+    static function setTransactionIsolation($isolation, $options = array())
+    {
+        $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true));
+        if (!$this->supports('transactions')) {
+            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'transactions are not supported', __FUNCTION__);
+        }
+        switch ($isolation) {
+        case 'READ UNCOMMITTED':
+        case 'READ COMMITTED':
+        case 'REPEATABLE READ':
+        case 'SERIALIZABLE':
+            break;
+        default:
+            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'isolation level is not supported: '.$isolation, __FUNCTION__);
+        }
+
+        $query = "SET SESSION TRANSACTION ISOLATION LEVEL $isolation";
+        return $this->_doQuery($query, true);
+    }
+
+    // }}}
+    // {{{ _doConnect()
+
+    /**
+     * do the grunt work of the connect
+     *
+     * @return connection on success or MDB2 Error Object on failure
+     * @access protected
+     */
+    function _doConnect($username, $password, $persistent = false)
+    {
+        if (!PEAR::loadExtension($this->phptype)) {
+            return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                'extension '.$this->phptype.' is not compiled into PHP', __FUNCTION__);
+        }
+
+        $params = array();
+        if ($this->dsn['protocol'] && $this->dsn['protocol'] == 'unix') {
+            $params[0] = ':' . $this->dsn['socket'];
+        } else {
+            $params[0] = $this->dsn['hostspec'] ? $this->dsn['hostspec']
+                         : 'localhost';
+            if ($this->dsn['port']) {
+                $params[0].= ':' . $this->dsn['port'];
+            }
+        }
+        $params[] = $username ? $username : null;
+        $params[] = $password ? $password : null;
+        if (!$persistent) {
+            if ($this->_isNewLinkSet()) {
+                $params[] = true;
+            } else {
+                $params[] = false;
+            }
+        }
+        if (version_compare(phpversion(), '4.3.0', '>=')) {
+            $params[] = isset($this->dsn['client_flags'])
+                ? $this->dsn['client_flags'] : null;
+        }
+        $connect_function = $persistent ? 'mysql_pconnect' : 'mysql_connect';
+
+        $connection = @call_user_func_array($connect_function, $params);
+        if (!$connection) {
+            if (($err = @mysql_error()) != '') {
+                return $this->raiseError(MDB2_ERROR_CONNECT_FAILED, null, null,
+                    $err, __FUNCTION__);
+            } else {
+                return $this->raiseError(MDB2_ERROR_CONNECT_FAILED, null, null,
+                    'unable to establish a connection', __FUNCTION__);
+            }
+        }
+
+        if (!empty($this->dsn['charset'])) {
+            $result = $this->setCharset($this->dsn['charset'], $connection);
+            if (PEAR::isError($result)) {
+                $this->disconnect(false);
+                return $result;
+            }
+        }
+
+        return $connection;
+    }
+
+    // }}}
+    // {{{ connect()
+
+    /**
+     * Connect to the database
+     *
+     * @return MDB2_OK on success, MDB2 Error Object on failure
+     * @access public
+     */
+    function connect()
+    {
+        if (is_resource($this->connection)) {
+            //if (count(array_diff($this->connected_dsn, $this->dsn)) == 0
+            if (MDB2::areEquals($this->connected_dsn, $this->dsn)
+                && $this->opened_persistent == $this->options['persistent']
+            ) {
+                return MDB2_OK;
+            }
+            $this->disconnect(false);
+        }
+
+        $connection = $this->_doConnect(
+            $this->dsn['username'],
+            $this->dsn['password'],
+            $this->options['persistent']
+        );
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        $this->connection = $connection;
+        $this->connected_dsn = $this->dsn;
+        $this->connected_database_name = '';
+        $this->opened_persistent = $this->options['persistent'];
+        $this->dbsyntax = $this->dsn['dbsyntax'] ? $this->dsn['dbsyntax'] : $this->phptype;
+
+        if ($this->database_name) {
+            if ($this->database_name != $this->connected_database_name) {
+                if (!@mysql_select_db($this->database_name, $connection)) {
+                    $err = $this->raiseError(null, null, null,
+                        'Could not select the database: '.$this->database_name, __FUNCTION__);
+                    return $err;
+                }
+                $this->connected_database_name = $this->database_name;
+            }
+        }
+
+        $this->_getServerCapabilities();
+
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ setCharset()
+
+    /**
+     * Set the charset on the current connection
+     *
+     * @param string    charset (or array(charset, collation))
+     * @param resource  connection handle
+     *
+     * @return true on success, MDB2 Error Object on failure
+     */
+    function setCharset($charset, $connection = null)
+    {
+        if (is_null($connection)) {
+            $connection = $this->getConnection();
+            if (PEAR::isError($connection)) {
+                return $connection;
+            }
+        }
+        $collation = null;
+        if (is_array($charset) && 2 == count($charset)) {
+            $collation = array_pop($charset);
+            $charset   = array_pop($charset);
+        }
+        $client_info = mysql_get_client_info();
+        if (function_exists('mysql_set_charset') && version_compare($client_info, '5.0.6')) {
+            if (!$result = mysql_set_charset($charset, $connection)) {
+                $err =& $this->raiseError(null, null, null,
+                    'Could not set client character set', __FUNCTION__);
+                return $err;
+            }
+            return $result;
+        }
+        $query = "SET NAMES '".mysql_real_escape_string($charset, $connection)."'";
+        if (!is_null($collation)) {
+            $query .= " COLLATE '".mysqli_real_escape_string($connection, $collation)."'";
+        }
+        return $this->_doQuery($query, true, $connection);
+    }
+
+    // }}}
+    // {{{ databaseExists()
+
+    /**
+     * check if given database name is exists?
+     *
+     * @param string $name    name of the database that should be checked
+     *
+     * @return mixed true/false on success, a MDB2 error on failure
+     * @access public
+     */
+    function databaseExists($name)
+    {
+        $connection = $this->_doConnect($this->dsn['username'],
+                                        $this->dsn['password'],
+                                        $this->options['persistent']);
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        $result = @mysql_select_db($name, $connection);
+        @mysql_close($connection);
+
+        return $result;
+    }
+
+    // }}}
+    // {{{ disconnect()
+
+    /**
+     * Log out and disconnect from the database.
+     *
+     * @param  boolean $force if the disconnect should be forced even if the
+     *                        connection is opened persistently
+     * @return mixed true on success, false if not connected and error
+     *                object on error
+     * @access public
+     */
+    function disconnect($force = true)
+    {
+        if (is_resource($this->connection)) {
+            if ($this->in_transaction) {
+                $dsn = $this->dsn;
+                $database_name = $this->database_name;
+                $persistent = $this->options['persistent'];
+                $this->dsn = $this->connected_dsn;
+                $this->database_name = $this->connected_database_name;
+                $this->options['persistent'] = $this->opened_persistent;
+                $this->rollback();
+                $this->dsn = $dsn;
+                $this->database_name = $database_name;
+                $this->options['persistent'] = $persistent;
+            }
+
+            if (!$this->opened_persistent || $force) {
+                $ok = @mysql_close($this->connection);
+                if (!$ok) {
+                    return $this->raiseError(MDB2_ERROR_DISCONNECT_FAILED,
+                           null, null, null, __FUNCTION__);
+                }
+            }
+        } else {
+            return false;
+        }
+        return parent::disconnect($force);
+    }
+
+    // }}}
+    // {{{ standaloneQuery()
+
+   /**
+     * execute a query as DBA
+     *
+     * @param string $query the SQL query
+     * @param mixed   $types  array that contains the types of the columns in
+     *                        the result set
+     * @param boolean $is_manip  if the query is a manipulation query
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function &standaloneQuery($query, $types = null, $is_manip = false)
+    {
+        $user = $this->options['DBA_username']? $this->options['DBA_username'] : $this->dsn['username'];
+        $pass = $this->options['DBA_password']? $this->options['DBA_password'] : $this->dsn['password'];
+        $connection = $this->_doConnect($user, $pass, $this->options['persistent']);
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        $offset = $this->offset;
+        $limit = $this->limit;
+        $this->offset = $this->limit = 0;
+        $query = $this->_modifyQuery($query, $is_manip, $limit, $offset);
+        
+        $result =& $this->_doQuery($query, $is_manip, $connection, $this->database_name);
+        if (!PEAR::isError($result)) {
+            $result = $this->_affectedRows($connection, $result);
+        }
+
+        @mysql_close($connection);
+        return $result;
+    }
+
+    // }}}
+    // {{{ _doQuery()
+
+    /**
+     * Execute a query
+     * @param string $query  query
+     * @param boolean $is_manip  if the query is a manipulation query
+     * @param resource $connection
+     * @param string $database_name
+     * @return result or error object
+     * @access protected
+     */
+    function &_doQuery($query, $is_manip = false, $connection = null, $database_name = null)
+    {
+        $this->last_query = $query;
+        $result = $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'pre'));
+        if ($result) {
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+            $query = $result;
+        }
+        if ($this->options['disable_query']) {
+            $result = $is_manip ? 0 : null;
+            return $result;
+        }
+
+        if (is_null($connection)) {
+            $connection = $this->getConnection();
+            if (PEAR::isError($connection)) {
+                return $connection;
+            }
+        }
+        if (is_null($database_name)) {
+            $database_name = $this->database_name;
+        }
+
+        if ($database_name) {
+            if ($database_name != $this->connected_database_name) {
+                if (!@mysql_select_db($database_name, $connection)) {
+                    $err = $this->raiseError(null, null, null,
+                        'Could not select the database: '.$database_name, __FUNCTION__);
+                    return $err;
+                }
+                $this->connected_database_name = $database_name;
+            }
+        }
+
+        $function = $this->options['result_buffering']
+            ? 'mysql_query' : 'mysql_unbuffered_query';
+        $result = @$function($query, $connection);
+        if (!$result) {
+            $err =& $this->raiseError(null, null, null,
+                'Could not execute statement', __FUNCTION__);
+            return $err;
+        }
+
+        $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'post', 'result' => $result));
+        return $result;
+    }
+
+    // }}}
+    // {{{ _affectedRows()
+
+    /**
+     * Returns the number of rows affected
+     *
+     * @param resource $result
+     * @param resource $connection
+     * @return mixed MDB2 Error Object or the number of rows affected
+     * @access private
+     */
+    function _affectedRows($connection, $result = null)
+    {
+        if (is_null($connection)) {
+            $connection = $this->getConnection();
+            if (PEAR::isError($connection)) {
+                return $connection;
+            }
+        }
+        return @mysql_affected_rows($connection);
+    }
+
+    // }}}
+    // {{{ _modifyQuery()
+
+    /**
+     * Changes a query string for various DBMS specific reasons
+     *
+     * @param string $query  query to modify
+     * @param boolean $is_manip  if it is a DML query
+     * @param integer $limit  limit the number of rows
+     * @param integer $offset  start reading from given offset
+     * @return string modified query
+     * @access protected
+     */
+    function _modifyQuery($query, $is_manip, $limit, $offset)
+    {
+        if ($this->options['portability'] & MDB2_PORTABILITY_DELETE_COUNT) {
+            // "DELETE FROM table" gives 0 affected rows in MySQL.
+            // This little hack lets you know how many rows were deleted.
+            if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $query)) {
+                $query = preg_replace('/^\s*DELETE\s+FROM\s+(\S+)\s*$/',
+                                      'DELETE FROM \1 WHERE 1=1', $query);
+            }
+        }
+        if ($limit > 0
+            && !preg_match('/LIMIT\s*\d(?:\s*(?:,|OFFSET)\s*\d+)?(?:[^\)]*)?$/i', $query)
+        ) {
+            $query = rtrim($query);
+            if (substr($query, -1) == ';') {
+                $query = substr($query, 0, -1);
+            }
+
+            // LIMIT doesn't always come last in the query
+            // @see http://dev.mysql.com/doc/refman/5.0/en/select.html
+            $after = '';
+            if (preg_match('/(\s+INTO\s+(?:OUT|DUMP)FILE\s.*)$/ims', $query, $matches)) {
+                $after = $matches[0];
+                $query = preg_replace('/(\s+INTO\s+(?:OUT|DUMP)FILE\s.*)$/ims', '', $query);
+            } elseif (preg_match('/(\s+FOR\s+UPDATE\s*)$/i', $query, $matches)) {
+               $after = $matches[0];
+               $query = preg_replace('/(\s+FOR\s+UPDATE\s*)$/im', '', $query);
+            } elseif (preg_match('/(\s+LOCK\s+IN\s+SHARE\s+MODE\s*)$/im', $query, $matches)) {
+               $after = $matches[0];
+               $query = preg_replace('/(\s+LOCK\s+IN\s+SHARE\s+MODE\s*)$/im', '', $query);
+            }
+
+            if ($is_manip) {
+                return $query . " LIMIT $limit" . $after;
+            } else {
+                return $query . " LIMIT $offset, $limit" . $after;
+            }
+        }
+        return $query;
+    }
+
+    // }}}
+    // {{{ getServerVersion()
+
+    /**
+     * return version information about the server
+     *
+     * @param bool   $native  determines if the raw version string should be returned
+     * @return mixed array/string with version information or MDB2 error object
+     * @access public
+     */
+    function getServerVersion($native = false)
+    {
+        $connection = $this->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+        if ($this->connected_server_info) {
+            $server_info = $this->connected_server_info;
+        } else {
+            $server_info = @mysql_get_server_info($connection);
+        }
+        if (!$server_info) {
+            return $this->raiseError(null, null, null,
+                'Could not get server information', __FUNCTION__);
+        }
+        // cache server_info
+        $this->connected_server_info = $server_info;
+        if (!$native) {
+            $tmp = explode('.', $server_info, 3);
+            if (isset($tmp[2]) && strpos($tmp[2], '-')) {
+                $tmp2 = explode('-', @$tmp[2], 2);
+            } else {
+                $tmp2[0] = isset($tmp[2]) ? $tmp[2] : null;
+                $tmp2[1] = null;
+            }
+            $server_info = array(
+                'major' => isset($tmp[0]) ? $tmp[0] : null,
+                'minor' => isset($tmp[1]) ? $tmp[1] : null,
+                'patch' => $tmp2[0],
+                'extra' => $tmp2[1],
+                'native' => $server_info,
+            );
+        }
+        return $server_info;
+    }
+
+    // }}}
+    // {{{ _getServerCapabilities()
+
+    /**
+     * Fetch some information about the server capabilities
+     * (transactions, subselects, prepared statements, etc).
+     *
+     * @access private
+     */
+    function _getServerCapabilities()
+    {
+        if (!$this->server_capabilities_checked) {
+            $this->server_capabilities_checked = true;
+
+            //set defaults
+            $this->supported['sub_selects'] = 'emulated';
+            $this->supported['prepared_statements'] = 'emulated';
+            $this->supported['triggers'] = false;
+            $this->start_transaction = false;
+            $this->varchar_max_length = 255;
+            
+            $server_info = $this->getServerVersion();
+            if (is_array($server_info)) {
+                $server_version = $server_info['major'].'.'.$server_info['minor'].'.'.$server_info['patch'];
+
+                if (!version_compare($server_version, '4.1.0', '<')) {
+                    $this->supported['sub_selects'] = true;
+                    $this->supported['prepared_statements'] = true;
+                }
+
+                // SAVEPOINTs were introduced in MySQL 4.0.14 and 4.1.1 (InnoDB)
+                if (version_compare($server_version, '4.1.0', '>=')) {
+                    if (version_compare($server_version, '4.1.1', '<')) {
+                        $this->supported['savepoints'] = false;
+                    }
+                } elseif (version_compare($server_version, '4.0.14', '<')) {
+                    $this->supported['savepoints'] = false;
+                }
+
+                if (!version_compare($server_version, '4.0.11', '<')) {
+                    $this->start_transaction = true;
+                }
+
+                if (!version_compare($server_version, '5.0.3', '<')) {
+                    $this->varchar_max_length = 65532;
+                }
+
+                if (!version_compare($server_version, '5.0.2', '<')) {
+                    $this->supported['triggers'] = true;
+                }
+            }
+        }
+    }
+
+    // }}}
+    // {{{ function _skipUserDefinedVariable($query, $position)
+
+    /**
+     * Utility method, used by prepare() to avoid misinterpreting MySQL user 
+     * defined variables (SELECT @x:=5) for placeholders.
+     * Check if the placeholder is a false positive, i.e. if it is an user defined
+     * variable instead. If so, skip it and advance the position, otherwise
+     * return the current position, which is valid
+     *
+     * @param string $query
+     * @param integer $position current string cursor position
+     * @return integer $new_position
+     * @access protected
+     */
+    function _skipUserDefinedVariable($query, $position)
+    {
+        $found = strpos(strrev(substr($query, 0, $position)), '@');
+        if ($found === false) {
+            return $position;
+        }
+        $pos = strlen($query) - strlen(substr($query, $position)) - $found - 1;
+        $substring = substr($query, $pos, $position - $pos + 2);
+        if (preg_match('/^@\w+\s*:=$/', $substring)) {
+            return $position + 1; //found an user defined variable: skip it
+        }
+        return $position;
+    }
+
+    // }}}
+    // {{{ prepare()
+
+    /**
+     * Prepares a query for multiple execution with execute().
+     * With some database backends, this is emulated.
+     * prepare() requires a generic query as string like
+     * 'INSERT INTO numbers VALUES(?,?)' or
+     * 'INSERT INTO numbers VALUES(:foo,:bar)'.
+     * The ? and :name and are placeholders which can be set using
+     * bindParam() and the query can be sent off using the execute() method.
+     * The allowed format for :name can be set with the 'bindname_format' option.
+     *
+     * @param string $query the query to prepare
+     * @param mixed   $types  array that contains the types of the placeholders
+     * @param mixed   $result_types  array that contains the types of the columns in
+     *                        the result set or MDB2_PREPARE_RESULT, if set to
+     *                        MDB2_PREPARE_MANIP the query is handled as a manipulation query
+     * @param mixed   $lobs   key (field) value (parameter) pair for all lob placeholders
+     * @return mixed resource handle for the prepared query on success, a MDB2
+     *        error on failure
+     * @access public
+     * @see bindParam, execute
+     */
+    function &prepare($query, $types = null, $result_types = null, $lobs = array())
+    {
+        if ($this->options['emulate_prepared']
+            || $this->supported['prepared_statements'] !== true
+        ) {
+            $obj =& parent::prepare($query, $types, $result_types, $lobs);
+            return $obj;
+        }
+        $is_manip = ($result_types === MDB2_PREPARE_MANIP);
+        $offset = $this->offset;
+        $limit = $this->limit;
+        $this->offset = $this->limit = 0;
+        $query = $this->_modifyQuery($query, $is_manip, $limit, $offset);
+        $result = $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'pre'));
+        if ($result) {
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+            $query = $result;
+        }
+        $placeholder_type_guess = $placeholder_type = null;
+        $question = '?';
+        $colon = ':';
+        $positions = array();
+        $position = 0;
+        while ($position < strlen($query)) {
+            $q_position = strpos($query, $question, $position);
+            $c_position = strpos($query, $colon, $position);
+            if ($q_position && $c_position) {
+                $p_position = min($q_position, $c_position);
+            } elseif ($q_position) {
+                $p_position = $q_position;
+            } elseif ($c_position) {
+                $p_position = $c_position;
+            } else {
+                break;
+            }
+            if (is_null($placeholder_type)) {
+                $placeholder_type_guess = $query[$p_position];
+            }
+            
+            $new_pos = $this->_skipDelimitedStrings($query, $position, $p_position);
+            if (PEAR::isError($new_pos)) {
+                return $new_pos;
+            }
+            if ($new_pos != $position) {
+                $position = $new_pos;
+                continue; //evaluate again starting from the new position
+            }
+            
+            //make sure this is not part of an user defined variable
+            $new_pos = $this->_skipUserDefinedVariable($query, $position);
+            if ($new_pos != $position) {
+                $position = $new_pos;
+                continue; //evaluate again starting from the new position
+            }
+
+            if ($query[$position] == $placeholder_type_guess) {
+                if (is_null($placeholder_type)) {
+                    $placeholder_type = $query[$p_position];
+                    $question = $colon = $placeholder_type;
+                }
+                if ($placeholder_type == ':') {
+                    $regexp = '/^.{'.($position+1).'}('.$this->options['bindname_format'].').*$/s';
+                    $parameter = preg_replace($regexp, '\\1', $query);
+                    if ($parameter === '') {
+                        $err =& $this->raiseError(MDB2_ERROR_SYNTAX, null, null,
+                            'named parameter name must match "bindname_format" option', __FUNCTION__);
+                        return $err;
+                    }
+                    $positions[$p_position] = $parameter;
+                    $query = substr_replace($query, '?', $position, strlen($parameter)+1);
+                } else {
+                    $positions[$p_position] = count($positions);
+                }
+                $position = $p_position + 1;
+            } else {
+                $position = $p_position;
+            }
+        }
+        $connection = $this->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+        static $prep_statement_counter = 1;
+        $statement_name = sprintf($this->options['statement_format'], $this->phptype, $prep_statement_counter++ . sha1(microtime() + mt_rand()));
+        $statement_name = substr(strtolower($statement_name), 0, $this->options['max_identifiers_length']);
+        $query = "PREPARE $statement_name FROM ".$this->quote($query, 'text');
+        $statement =& $this->_doQuery($query, true, $connection);
+        if (PEAR::isError($statement)) {
+            return $statement;
+        }
+
+        $class_name = 'MDB2_Statement_'.$this->phptype;
+        $obj = new $class_name($this, $statement_name, $positions, $query, $types, $result_types, $is_manip, $limit, $offset);
+        $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'post', 'result' => $obj));
+        return $obj;
+    }
+
+    // }}}
+    // {{{ replace()
+
+    /**
+     * Execute a SQL REPLACE query. A REPLACE query is identical to a INSERT
+     * query, except that if there is already a row in the table with the same
+     * key field values, the old row is deleted before the new row is inserted.
+     *
+     * The REPLACE type of query does not make part of the SQL standards. Since
+     * practically only MySQL implements it natively, this type of query is
+     * emulated through this method for other DBMS using standard types of
+     * queries inside a transaction to assure the atomicity of the operation.
+     *
+     * @access public
+     *
+     * @param string $table name of the table on which the REPLACE query will
+     *  be executed.
+     * @param array $fields associative array that describes the fields and the
+     *  values that will be inserted or updated in the specified table. The
+     *  indexes of the array are the names of all the fields of the table. The
+     *  values of the array are also associative arrays that describe the
+     *  values and other properties of the table fields.
+     *
+     *  Here follows a list of field properties that need to be specified:
+     *
+     *    value:
+     *          Value to be assigned to the specified field. This value may be
+     *          of specified in database independent type format as this
+     *          function can perform the necessary datatype conversions.
+     *
+     *    Default:
+     *          this property is required unless the Null property
+     *          is set to 1.
+     *
+     *    type
+     *          Name of the type of the field. Currently, all types Metabase
+     *          are supported except for clob and blob.
+     *
+     *    Default: no type conversion
+     *
+     *    null
+     *          Boolean property that indicates that the value for this field
+     *          should be set to null.
+     *
+     *          The default value for fields missing in INSERT queries may be
+     *          specified the definition of a table. Often, the default value
+     *          is already null, but since the REPLACE may be emulated using
+     *          an UPDATE query, make sure that all fields of the table are
+     *          listed in this function argument array.
+     *
+     *    Default: 0
+     *
+     *    key
+     *          Boolean property that indicates that this field should be
+     *          handled as a primary key or at least as part of the compound
+     *          unique index of the table that will determine the row that will
+     *          updated if it exists or inserted a new row otherwise.
+     *
+     *          This function will fail if no key field is specified or if the
+     *          value of a key field is set to null because fields that are
+     *          part of unique index they may not be null.
+     *
+     *    Default: 0
+     *
+     * @see http://dev.mysql.com/doc/refman/5.0/en/replace.html
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     */
+    function replace($table, $fields)
+    {
+        $count = count($fields);
+        $query = $values = '';
+        $keys = $colnum = 0;
+        for (reset($fields); $colnum < $count; next($fields), $colnum++) {
+            $name = key($fields);
+            if ($colnum > 0) {
+                $query .= ',';
+                $values.= ',';
+            }
+            $query.= $this->quoteIdentifier($name, true);
+            if (isset($fields[$name]['null']) && $fields[$name]['null']) {
+                $value = 'NULL';
+            } else {
+                $type = isset($fields[$name]['type']) ? $fields[$name]['type'] : null;
+                $value = $this->quote($fields[$name]['value'], $type);
+                if (PEAR::isError($value)) {
+                    return $value;
+                }
+            }
+            $values.= $value;
+            if (isset($fields[$name]['key']) && $fields[$name]['key']) {
+                if ($value === 'NULL') {
+                    return $this->raiseError(MDB2_ERROR_CANNOT_REPLACE, null, null,
+                        'key value '.$name.' may not be NULL', __FUNCTION__);
+                }
+                $keys++;
+            }
+        }
+        if ($keys == 0) {
+            return $this->raiseError(MDB2_ERROR_CANNOT_REPLACE, null, null,
+                'not specified which fields are keys', __FUNCTION__);
+        }
+
+        $connection = $this->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        $table = $this->quoteIdentifier($table, true);
+        $query = "REPLACE INTO $table ($query) VALUES ($values)";
+        $result =& $this->_doQuery($query, true, $connection);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        return $this->_affectedRows($connection, $result);
+    }
+
+    // }}}
+    // {{{ nextID()
+
+    /**
+     * Returns the next free id of a sequence
+     *
+     * @param string $seq_name name of the sequence
+     * @param boolean $ondemand when true the sequence is
+     *                          automatic created, if it
+     *                          not exists
+     *
+     * @return mixed MDB2 Error Object or id
+     * @access public
+     */
+    function nextID($seq_name, $ondemand = true)
+    {
+        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq_name), true);
+        $seqcol_name = $this->quoteIdentifier($this->options['seqcol_name'], true);
+        $query = "INSERT INTO $sequence_name ($seqcol_name) VALUES (NULL)";
+        $this->pushErrorHandling(PEAR_ERROR_RETURN);
+        $this->expectError(MDB2_ERROR_NOSUCHTABLE);
+        $result =& $this->_doQuery($query, true);
+        $this->popExpect();
+        $this->popErrorHandling();
+        if (PEAR::isError($result)) {
+            if ($ondemand && $result->getCode() == MDB2_ERROR_NOSUCHTABLE) {
+                $this->loadModule('Manager', null, true);
+                $result = $this->manager->createSequence($seq_name);
+                if (PEAR::isError($result)) {
+                    return $this->raiseError($result, null, null,
+                        'on demand sequence '.$seq_name.' could not be created', __FUNCTION__);
+                } else {
+                    return $this->nextID($seq_name, false);
+                }
+            }
+            return $result;
+        }
+        $value = $this->lastInsertID();
+        if (is_numeric($value)) {
+            $query = "DELETE FROM $sequence_name WHERE $seqcol_name < $value";
+            $result =& $this->_doQuery($query, true);
+            if (PEAR::isError($result)) {
+                $this->warnings[] = 'nextID: could not delete previous sequence table values from '.$seq_name;
+            }
+        }
+        return $value;
+    }
+
+    // }}}
+    // {{{ lastInsertID()
+
+    /**
+     * Returns the autoincrement ID if supported or $id or fetches the current
+     * ID in a sequence called: $table.(empty($field) ? '' : '_'.$field)
+     *
+     * @param string $table name of the table into which a new row was inserted
+     * @param string $field name of the field into which a new row was inserted
+     * @return mixed MDB2 Error Object or id
+     * @access public
+     */
+    function lastInsertID($table = null, $field = null)
+    {
+        // not using mysql_insert_id() due to http://pear.php.net/bugs/bug.php?id=8051
+        return $this->queryOne('SELECT LAST_INSERT_ID()', 'integer');
+    }
+
+    // }}}
+    // {{{ currID()
+
+    /**
+     * Returns the current id of a sequence
+     *
+     * @param string $seq_name name of the sequence
+     * @return mixed MDB2 Error Object or id
+     * @access public
+     */
+    function currID($seq_name)
+    {
+        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq_name), true);
+        $seqcol_name = $this->quoteIdentifier($this->options['seqcol_name'], true);
+        $query = "SELECT MAX($seqcol_name) FROM $sequence_name";
+        return $this->queryOne($query, 'integer');
+    }
+}
+
+/**
+ * MDB2 MySQL result driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Result_mysql extends MDB2_Result_Common
+{
+    // }}}
+    // {{{ fetchRow()
+
+    /**
+     * Fetch a row and insert the data into an existing array.
+     *
+     * @param int       $fetchmode  how the array data should be indexed
+     * @param int    $rownum    number of the row where the data can be found
+     * @return int data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function &fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
+    {
+        if (!is_null($rownum)) {
+            $seek = $this->seek($rownum);
+            if (PEAR::isError($seek)) {
+                return $seek;
+            }
+        }
+        if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
+            $fetchmode = $this->db->fetchmode;
+        }
+        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
+            $row = @mysql_fetch_assoc($this->result);
+            if (is_array($row)
+                && $this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
+            ) {
+                $row = array_change_key_case($row, $this->db->options['field_case']);
+            }
+        } else {
+           $row = @mysql_fetch_row($this->result);
+        }
+
+        if (!$row) {
+            if ($this->result === false) {
+                $err =& $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                    'resultset has already been freed', __FUNCTION__);
+                return $err;
+            }
+            $null = null;
+            return $null;
+        }
+        $mode = $this->db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL;
+        $rtrim = false;
+        if ($this->db->options['portability'] & MDB2_PORTABILITY_RTRIM) {
+            if (empty($this->types)) {
+                $mode += MDB2_PORTABILITY_RTRIM;
+            } else {
+                $rtrim = true;
+            }
+        }
+        if ($mode) {
+            $this->db->_fixResultArrayValues($row, $mode);
+        }
+        if (!empty($this->types)) {
+            $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
+        }
+        if (!empty($this->values)) {
+            $this->_assignBindColumns($row);
+        }
+        if ($fetchmode === MDB2_FETCHMODE_OBJECT) {
+            $object_class = $this->db->options['fetch_class'];
+            if ($object_class == 'stdClass') {
+                $row = (object) $row;
+            } else {
+                $row = new $object_class($row);
+            }
+        }
+        ++$this->rownum;
+        return $row;
+    }
+
+    // }}}
+    // {{{ _getColumnNames()
+
+    /**
+     * Retrieve the names of columns returned by the DBMS in a query result.
+     *
+     * @return  mixed   Array variable that holds the names of columns as keys
+     *                  or an MDB2 error on failure.
+     *                  Some DBMS may not return any columns when the result set
+     *                  does not contain any rows.
+     * @access private
+     */
+    function _getColumnNames()
+    {
+        $columns = array();
+        $numcols = $this->numCols();
+        if (PEAR::isError($numcols)) {
+            return $numcols;
+        }
+        for ($column = 0; $column < $numcols; $column++) {
+            $column_name = @mysql_field_name($this->result, $column);
+            $columns[$column_name] = $column;
+        }
+        if ($this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $columns = array_change_key_case($columns, $this->db->options['field_case']);
+        }
+        return $columns;
+    }
+
+    // }}}
+    // {{{ numCols()
+
+    /**
+     * Count the number of columns returned by the DBMS in a query result.
+     *
+     * @return mixed integer value with the number of columns, a MDB2 error
+     *                       on failure
+     * @access public
+     */
+    function numCols()
+    {
+        $cols = @mysql_num_fields($this->result);
+        if (is_null($cols)) {
+            if ($this->result === false) {
+                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                    'resultset has already been freed', __FUNCTION__);
+            } elseif (is_null($this->result)) {
+                return count($this->types);
+            }
+            return $this->db->raiseError(null, null, null,
+                'Could not get column count', __FUNCTION__);
+        }
+        return $cols;
+    }
+
+    // }}}
+    // {{{ free()
+
+    /**
+     * Free the internal resources associated with result.
+     *
+     * @return boolean true on success, false if result is invalid
+     * @access public
+     */
+    function free()
+    {
+        if (is_resource($this->result) && $this->db->connection) {
+            $free = @mysql_free_result($this->result);
+            if ($free === false) {
+                return $this->db->raiseError(null, null, null,
+                    'Could not free result', __FUNCTION__);
+            }
+        }
+        $this->result = false;
+        return MDB2_OK;
+    }
+}
+
+/**
+ * MDB2 MySQL buffered result driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_BufferedResult_mysql extends MDB2_Result_mysql
+{
+    // }}}
+    // {{{ seek()
+
+    /**
+     * Seek to a specific row in a result set
+     *
+     * @param int    $rownum    number of the row where the data can be found
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function seek($rownum = 0)
+    {
+        if ($this->rownum != ($rownum - 1) && !@mysql_data_seek($this->result, $rownum)) {
+            if ($this->result === false) {
+                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                    'resultset has already been freed', __FUNCTION__);
+            } elseif (is_null($this->result)) {
+                return MDB2_OK;
+            }
+            return $this->db->raiseError(MDB2_ERROR_INVALID, null, null,
+                'tried to seek to an invalid row number ('.$rownum.')', __FUNCTION__);
+        }
+        $this->rownum = $rownum - 1;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ valid()
+
+    /**
+     * Check if the end of the result set has been reached
+     *
+     * @return mixed true or false on sucess, a MDB2 error on failure
+     * @access public
+     */
+    function valid()
+    {
+        $numrows = $this->numRows();
+        if (PEAR::isError($numrows)) {
+            return $numrows;
+        }
+        return $this->rownum < ($numrows - 1);
+    }
+
+    // }}}
+    // {{{ numRows()
+
+    /**
+     * Returns the number of rows in a result object
+     *
+     * @return mixed MDB2 Error Object or the number of rows
+     * @access public
+     */
+    function numRows()
+    {
+        $rows = @mysql_num_rows($this->result);
+        if (false === $rows) {
+            if (false === $this->result) {
+                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                    'resultset has already been freed', __FUNCTION__);
+            } elseif (is_null($this->result)) {
+                return 0;
+            }
+            return $this->db->raiseError(null, null, null,
+                'Could not get row count', __FUNCTION__);
+        }
+        return $rows;
+    }
+}
+
+/**
+ * MDB2 MySQL statement driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Statement_mysql extends MDB2_Statement_Common
+{
+    // {{{ _execute()
+
+    /**
+     * Execute a prepared query statement helper method.
+     *
+     * @param mixed $result_class string which specifies which result class to use
+     * @param mixed $result_wrap_class string which specifies which class to wrap results in
+     *
+     * @return mixed MDB2_Result or integer (affected rows) on success,
+     *               a MDB2 error on failure
+     * @access private
+     */
+    function &_execute($result_class = true, $result_wrap_class = false)
+    {
+        if (is_null($this->statement)) {
+            $result =& parent::_execute($result_class, $result_wrap_class);
+            return $result;
+        }
+        $this->db->last_query = $this->query;
+        $this->db->debug($this->query, 'execute', array('is_manip' => $this->is_manip, 'when' => 'pre', 'parameters' => $this->values));
+        if ($this->db->getOption('disable_query')) {
+            $result = $this->is_manip ? 0 : null;
+            return $result;
+        }
+
+        $connection = $this->db->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        $query = 'EXECUTE '.$this->statement;
+        if (!empty($this->positions)) {
+            $parameters = array();
+            foreach ($this->positions as $parameter) {
+                if (!array_key_exists($parameter, $this->values)) {
+                    return $this->db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                        'Unable to bind to missing placeholder: '.$parameter, __FUNCTION__);
+                }
+                $value = $this->values[$parameter];
+                $type = array_key_exists($parameter, $this->types) ? $this->types[$parameter] : null;
+                if (is_resource($value) || $type == 'clob' || $type == 'blob' && $this->db->options['lob_allow_url_include']) {
+                    if (!is_resource($value) && preg_match('/^(\w+:\/\/)(.*)$/', $value, $match)) {
+                        if ($match[1] == 'file://') {
+                            $value = $match[2];
+                        }
+                        $value = @fopen($value, 'r');
+                        $close = true;
+                    }
+                    if (is_resource($value)) {
+                        $data = '';
+                        while (!@feof($value)) {
+                            $data.= @fread($value, $this->db->options['lob_buffer_length']);
+                        }
+                        if ($close) {
+                            @fclose($value);
+                        }
+                        $value = $data;
+                    }
+                }
+                $quoted = $this->db->quote($value, $type);
+                if (PEAR::isError($quoted)) {
+                    return $quoted;
+                }
+                $param_query = 'SET @'.$parameter.' = '.$quoted;
+                $result = $this->db->_doQuery($param_query, true, $connection);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+            $query.= ' USING @'.implode(', @', array_values($this->positions));
+        }
+
+        $result = $this->db->_doQuery($query, $this->is_manip, $connection);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        if ($this->is_manip) {
+            $affected_rows = $this->db->_affectedRows($connection, $result);
+            return $affected_rows;
+        }
+
+        $result =& $this->db->_wrapResult($result, $this->result_types,
+            $result_class, $result_wrap_class, $this->limit, $this->offset);
+        $this->db->debug($this->query, 'execute', array('is_manip' => $this->is_manip, 'when' => 'post', 'result' => $result));
+        return $result;
+    }
+
+    // }}}
+    // {{{ free()
+
+    /**
+     * Release resources allocated for the specified prepared query.
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function free()
+    {
+        if (is_null($this->positions)) {
+            return $this->db->raiseError(MDB2_ERROR, null, null,
+                'Prepared statement has already been freed', __FUNCTION__);
+        }
+        $result = MDB2_OK;
+
+        if (!is_null($this->statement)) {
+            $connection = $this->db->getConnection();
+            if (PEAR::isError($connection)) {
+                return $connection;
+            }
+            $query = 'DEALLOCATE PREPARE '.$this->statement;
+            $result = $this->db->_doQuery($query, true, $connection);
+        }
+
+        parent::free();
+        return $result;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/pgsql.php b/3rdparty/MDB2/Driver/pgsql.php
new file mode 100644
index 00000000000..13fea690680
--- /dev/null
+++ b/3rdparty/MDB2/Driver/pgsql.php
@@ -0,0 +1,1519 @@
+<?php
+// vim: set et ts=4 sw=4 fdm=marker:
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Paul Cooper <pgc@ucecom.com>                                 |
+// +----------------------------------------------------------------------+
+//
+// $Id: pgsql.php,v 1.203 2008/11/29 14:04:46 afz Exp $
+
+/**
+ * MDB2 PostGreSQL driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Paul Cooper <pgc@ucecom.com>
+ */
+class MDB2_Driver_pgsql extends MDB2_Driver_Common
+{
+    // {{{ properties
+    var $string_quoting = array('start' => "'", 'end' => "'", 'escape' => "'", 'escape_pattern' => '\\');
+
+    var $identifier_quoting = array('start' => '"', 'end' => '"', 'escape' => '"');
+    // }}}
+    // {{{ constructor
+
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        parent::__construct();
+
+        $this->phptype = 'pgsql';
+        $this->dbsyntax = 'pgsql';
+
+        $this->supported['sequences'] = true;
+        $this->supported['indexes'] = true;
+        $this->supported['affected_rows'] = true;
+        $this->supported['summary_functions'] = true;
+        $this->supported['order_by_text'] = true;
+        $this->supported['transactions'] = true;
+        $this->supported['savepoints'] = true;
+        $this->supported['current_id'] = true;
+        $this->supported['limit_queries'] = true;
+        $this->supported['LOBs'] = true;
+        $this->supported['replace'] = 'emulated';
+        $this->supported['sub_selects'] = true;
+        $this->supported['triggers'] = true;
+        $this->supported['auto_increment'] = 'emulated';
+        $this->supported['primary_key'] = true;
+        $this->supported['result_introspection'] = true;
+        $this->supported['prepared_statements'] = true;
+        $this->supported['identifier_quoting'] = true;
+        $this->supported['pattern_escaping'] = true;
+        $this->supported['new_link'] = true;
+
+        $this->options['DBA_username'] = false;
+        $this->options['DBA_password'] = false;
+        $this->options['multi_query'] = false;
+        $this->options['disable_smart_seqname'] = true;
+        $this->options['max_identifiers_length'] = 63;
+    }
+
+    // }}}
+    // {{{ errorInfo()
+
+    /**
+     * This method is used to collect information about an error
+     *
+     * @param integer $error
+     * @return array
+     * @access public
+     */
+    function errorInfo($error = null)
+    {
+        // Fall back to MDB2_ERROR if there was no mapping.
+        $error_code = MDB2_ERROR;
+
+        $native_msg = '';
+        if (is_resource($error)) {
+            $native_msg = @pg_result_error($error);
+        } elseif ($this->connection) {
+            $native_msg = @pg_last_error($this->connection);
+            if (!$native_msg && @pg_connection_status($this->connection) === PGSQL_CONNECTION_BAD) {
+                $native_msg = 'Database connection has been lost.';
+                $error_code = MDB2_ERROR_CONNECT_FAILED;
+            }
+        } else {
+            $native_msg = @pg_last_error();
+        }
+
+        static $error_regexps;
+        if (empty($error_regexps)) {
+            $error_regexps = array(
+                '/column .* (of relation .*)?does not exist/i'
+                    => MDB2_ERROR_NOSUCHFIELD,
+                '/(relation|sequence|table).*does not exist|class .* not found/i'
+                    => MDB2_ERROR_NOSUCHTABLE,
+                '/database .* does not exist/'
+                    => MDB2_ERROR_NOT_FOUND,
+                '/constraint .* does not exist/'
+                    => MDB2_ERROR_NOT_FOUND,
+                '/index .* does not exist/'
+                    => MDB2_ERROR_NOT_FOUND,
+                '/database .* already exists/i'
+                    => MDB2_ERROR_ALREADY_EXISTS,
+                '/relation .* already exists/i'
+                    => MDB2_ERROR_ALREADY_EXISTS,
+                '/(divide|division) by zero$/i'
+                    => MDB2_ERROR_DIVZERO,
+                '/pg_atoi: error in .*: can\'t parse /i'
+                    => MDB2_ERROR_INVALID_NUMBER,
+                '/invalid input syntax for( type)? (integer|numeric)/i'
+                    => MDB2_ERROR_INVALID_NUMBER,
+                '/value .* is out of range for type \w*int/i'
+                    => MDB2_ERROR_INVALID_NUMBER,
+                '/integer out of range/i'
+                    => MDB2_ERROR_INVALID_NUMBER,
+                '/value too long for type character/i'
+                    => MDB2_ERROR_INVALID,
+                '/attribute .* not found|relation .* does not have attribute/i'
+                    => MDB2_ERROR_NOSUCHFIELD,
+                '/column .* specified in USING clause does not exist in (left|right) table/i'
+                    => MDB2_ERROR_NOSUCHFIELD,
+                '/parser: parse error at or near/i'
+                    => MDB2_ERROR_SYNTAX,
+                '/syntax error at/'
+                    => MDB2_ERROR_SYNTAX,
+                '/column reference .* is ambiguous/i'
+                    => MDB2_ERROR_SYNTAX,
+                '/permission denied/'
+                    => MDB2_ERROR_ACCESS_VIOLATION,
+                '/violates not-null constraint/'
+                    => MDB2_ERROR_CONSTRAINT_NOT_NULL,
+                '/violates [\w ]+ constraint/'
+                    => MDB2_ERROR_CONSTRAINT,
+                '/referential integrity violation/'
+                    => MDB2_ERROR_CONSTRAINT,
+                '/more expressions than target columns/i'
+                    => MDB2_ERROR_VALUE_COUNT_ON_ROW,
+            );
+        }
+        if (is_numeric($error) && $error < 0) {
+            $error_code = $error;
+        } else {
+            foreach ($error_regexps as $regexp => $code) {
+                if (preg_match($regexp, $native_msg)) {
+                    $error_code = $code;
+                    break;
+                }
+            }
+        }
+        return array($error_code, null, $native_msg);
+    }
+
+    // }}}
+    // {{{ escape()
+
+    /**
+     * Quotes a string so it can be safely used in a query. It will quote
+     * the text so it can safely be used within a query.
+     *
+     * @param   string  the input string to quote
+     * @param   bool    escape wildcards
+     *
+     * @return  string  quoted string
+     *
+     * @access  public
+     */
+    function escape($text, $escape_wildcards = false)
+    {
+        if ($escape_wildcards) {
+            $text = $this->escapePattern($text);
+        }
+        $connection = $this->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+        if (is_resource($connection) && version_compare(PHP_VERSION, '5.2.0RC5', '>=')) {
+            $text = @pg_escape_string($connection, $text);
+        } else {
+            $text = @pg_escape_string($text);
+        }
+        return $text;
+    }
+
+    // }}}
+    // {{{ beginTransaction()
+
+    /**
+     * Start a transaction or set a savepoint.
+     *
+     * @param   string  name of a savepoint to set
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function beginTransaction($savepoint = null)
+    {
+        $this->debug('Starting transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+        if (!is_null($savepoint)) {
+            if (!$this->in_transaction) {
+                return $this->raiseError(MDB2_ERROR_INVALID, null, null,
+                    'savepoint cannot be released when changes are auto committed', __FUNCTION__);
+            }
+            $query = 'SAVEPOINT '.$savepoint;
+            return $this->_doQuery($query, true);
+        } elseif ($this->in_transaction) {
+            return MDB2_OK;  //nothing to do
+        }
+        if (!$this->destructor_registered && $this->opened_persistent) {
+            $this->destructor_registered = true;
+            register_shutdown_function('MDB2_closeOpenTransactions');
+        }
+        $result =& $this->_doQuery('BEGIN', true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        $this->in_transaction = true;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ commit()
+
+    /**
+     * Commit the database changes done during a transaction that is in
+     * progress or release a savepoint. This function may only be called when
+     * auto-committing is disabled, otherwise it will fail. Therefore, a new
+     * transaction is implicitly started after committing the pending changes.
+     *
+     * @param   string  name of a savepoint to release
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function commit($savepoint = null)
+    {
+        $this->debug('Committing transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+        if (!$this->in_transaction) {
+            return $this->raiseError(MDB2_ERROR_INVALID, null, null,
+                'commit/release savepoint cannot be done changes are auto committed', __FUNCTION__);
+        }
+        if (!is_null($savepoint)) {
+            $query = 'RELEASE SAVEPOINT '.$savepoint;
+            return $this->_doQuery($query, true);
+        }
+
+        $result =& $this->_doQuery('COMMIT', true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        $this->in_transaction = false;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ rollback()
+
+    /**
+     * Cancel any database changes done during a transaction or since a specific
+     * savepoint that is in progress. This function may only be called when
+     * auto-committing is disabled, otherwise it will fail. Therefore, a new
+     * transaction is implicitly started after canceling the pending changes.
+     *
+     * @param   string  name of a savepoint to rollback to
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function rollback($savepoint = null)
+    {
+        $this->debug('Rolling back transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+        if (!$this->in_transaction) {
+            return $this->raiseError(MDB2_ERROR_INVALID, null, null,
+                'rollback cannot be done changes are auto committed', __FUNCTION__);
+        }
+        if (!is_null($savepoint)) {
+            $query = 'ROLLBACK TO SAVEPOINT '.$savepoint;
+            return $this->_doQuery($query, true);
+        }
+
+        $query = 'ROLLBACK';
+        $result =& $this->_doQuery($query, true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        $this->in_transaction = false;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function setTransactionIsolation()
+
+    /**
+     * Set the transacton isolation level.
+     *
+     * @param   string  standard isolation level
+     *                  READ UNCOMMITTED (allows dirty reads)
+     *                  READ COMMITTED (prevents dirty reads)
+     *                  REPEATABLE READ (prevents nonrepeatable reads)
+     *                  SERIALIZABLE (prevents phantom reads)
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     * @since   2.1.1
+     */
+    static function setTransactionIsolation($isolation, $options = array())
+    {
+        $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true));
+        switch ($isolation) {
+        case 'READ UNCOMMITTED':
+        case 'READ COMMITTED':
+        case 'REPEATABLE READ':
+        case 'SERIALIZABLE':
+            break;
+        default:
+            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'isolation level is not supported: '.$isolation, __FUNCTION__);
+        }
+
+        $query = "SET SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL $isolation";
+        return $this->_doQuery($query, true);
+    }
+
+    // }}}
+    // {{{ _doConnect()
+
+    /**
+     * Do the grunt work of connecting to the database
+     *
+     * @return mixed connection resource on success, MDB2 Error Object on failure
+     * @access protected
+     */
+    function _doConnect($username, $password, $database_name, $persistent = false)
+    {
+        if (!PEAR::loadExtension($this->phptype)) {
+            return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                'extension '.$this->phptype.' is not compiled into PHP', __FUNCTION__);
+        }
+        
+        if ($database_name == '') {
+            $database_name = 'template1';
+        }
+
+        $protocol = $this->dsn['protocol'] ? $this->dsn['protocol'] : 'tcp';
+
+        $params = array('');
+        if ($protocol == 'tcp') {
+            if ($this->dsn['hostspec']) {
+                $params[0].= 'host=' . $this->dsn['hostspec'];
+            }
+            if ($this->dsn['port']) {
+                $params[0].= ' port=' . $this->dsn['port'];
+            }
+        } elseif ($protocol == 'unix') {
+            // Allow for pg socket in non-standard locations.
+            if ($this->dsn['socket']) {
+                $params[0].= 'host=' . $this->dsn['socket'];
+            }
+            if ($this->dsn['port']) {
+                $params[0].= ' port=' . $this->dsn['port'];
+            }
+        }
+        if ($database_name) {
+            $params[0].= ' dbname=\'' . addslashes($database_name) . '\'';
+        }
+        if ($username) {
+            $params[0].= ' user=\'' . addslashes($username) . '\'';
+        }
+        if ($password) {
+            $params[0].= ' password=\'' . addslashes($password) . '\'';
+        }
+        if (!empty($this->dsn['options'])) {
+            $params[0].= ' options=' . $this->dsn['options'];
+        }
+        if (!empty($this->dsn['tty'])) {
+            $params[0].= ' tty=' . $this->dsn['tty'];
+        }
+        if (!empty($this->dsn['connect_timeout'])) {
+            $params[0].= ' connect_timeout=' . $this->dsn['connect_timeout'];
+        }
+        if (!empty($this->dsn['sslmode'])) {
+            $params[0].= ' sslmode=' . $this->dsn['sslmode'];
+        }
+        if (!empty($this->dsn['service'])) {
+            $params[0].= ' service=' . $this->dsn['service'];
+        }
+
+        if ($this->_isNewLinkSet()) {
+            if (version_compare(phpversion(), '4.3.0', '>=')) {
+                $params[] = PGSQL_CONNECT_FORCE_NEW;
+            }
+        }
+
+        $connect_function = $persistent ? 'pg_pconnect' : 'pg_connect';
+        $connection = @call_user_func_array($connect_function, $params);
+        if (!$connection) {
+            return $this->raiseError(MDB2_ERROR_CONNECT_FAILED, null, null,
+                'unable to establish a connection', __FUNCTION__);
+        }
+
+       if (empty($this->dsn['disable_iso_date'])) {
+            if (!@pg_query($connection, "SET SESSION DATESTYLE = 'ISO'")) {
+                return $this->raiseError(null, null, null,
+                    'Unable to set date style to iso', __FUNCTION__);
+            }
+       }
+
+        if (!empty($this->dsn['charset'])) {
+            $result = $this->setCharset($this->dsn['charset'], $connection);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+
+        return $connection;
+    }
+
+    // }}}
+    // {{{ connect()
+
+    /**
+     * Connect to the database
+     *
+     * @return true on success, MDB2 Error Object on failure
+     * @access public
+     */
+    function connect()
+    {
+        if (is_resource($this->connection)) {
+            //if (count(array_diff($this->connected_dsn, $this->dsn)) == 0
+            if (MDB2::areEquals($this->connected_dsn, $this->dsn)
+                && $this->connected_database_name == $this->database_name
+                && ($this->opened_persistent == $this->options['persistent'])
+            ) {
+                return MDB2_OK;
+            }
+            $this->disconnect(false);
+        }
+
+        if ($this->database_name) {
+            $connection = $this->_doConnect($this->dsn['username'],
+                                            $this->dsn['password'],
+                                            $this->database_name,
+                                            $this->options['persistent']);
+            if (PEAR::isError($connection)) {
+                return $connection;
+            }
+
+            $this->connection = $connection;
+            $this->connected_dsn = $this->dsn;
+            $this->connected_database_name = $this->database_name;
+            $this->opened_persistent = $this->options['persistent'];
+            $this->dbsyntax = $this->dsn['dbsyntax'] ? $this->dsn['dbsyntax'] : $this->phptype;
+        }
+
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ setCharset()
+
+    /**
+     * Set the charset on the current connection
+     *
+     * @param string    charset
+     * @param resource  connection handle
+     *
+     * @return true on success, MDB2 Error Object on failure
+     */
+    function setCharset($charset, $connection = null)
+    {
+        if (is_null($connection)) {
+            $connection = $this->getConnection();
+            if (PEAR::isError($connection)) {
+                return $connection;
+            }
+        }
+        if (is_array($charset)) {
+            $charset   = array_shift($charset);
+            $this->warnings[] = 'postgresql does not support setting client collation';
+        }
+        $result = @pg_set_client_encoding($connection, $charset);
+        if ($result == -1) {
+            return $this->raiseError(null, null, null,
+                'Unable to set client charset: '.$charset, __FUNCTION__);
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ databaseExists()
+
+    /**
+     * check if given database name is exists?
+     *
+     * @param string $name    name of the database that should be checked
+     *
+     * @return mixed true/false on success, a MDB2 error on failure
+     * @access public
+     */
+    function databaseExists($name)
+    {
+        $res = $this->_doConnect($this->dsn['username'],
+                                 $this->dsn['password'],
+                                 $this->escape($name),
+                                 $this->options['persistent']);
+        if (!PEAR::isError($res)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    // }}}
+    // {{{ disconnect()
+
+    /**
+     * Log out and disconnect from the database.
+     *
+     * @param  boolean $force if the disconnect should be forced even if the
+     *                        connection is opened persistently
+     * @return mixed true on success, false if not connected and error
+     *                object on error
+     * @access public
+     */
+    function disconnect($force = true)
+    {
+        if (is_resource($this->connection)) {
+            if ($this->in_transaction) {
+                $dsn = $this->dsn;
+                $database_name = $this->database_name;
+                $persistent = $this->options['persistent'];
+                $this->dsn = $this->connected_dsn;
+                $this->database_name = $this->connected_database_name;
+                $this->options['persistent'] = $this->opened_persistent;
+                $this->rollback();
+                $this->dsn = $dsn;
+                $this->database_name = $database_name;
+                $this->options['persistent'] = $persistent;
+            }
+
+            if (!$this->opened_persistent || $force) {
+                $ok = @pg_close($this->connection);
+                if (!$ok) {
+                    return $this->raiseError(MDB2_ERROR_DISCONNECT_FAILED,
+                           null, null, null, __FUNCTION__);
+                }
+            }
+        } else {
+            return false;
+        }
+        return parent::disconnect($force);
+    }
+
+    // }}}
+    // {{{ standaloneQuery()
+
+   /**
+     * execute a query as DBA
+     *
+     * @param string $query the SQL query
+     * @param mixed   $types  array that contains the types of the columns in
+     *                        the result set
+     * @param boolean $is_manip  if the query is a manipulation query
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function &standaloneQuery($query, $types = null, $is_manip = false)
+    {
+        $user = $this->options['DBA_username']? $this->options['DBA_username'] : $this->dsn['username'];
+        $pass = $this->options['DBA_password']? $this->options['DBA_password'] : $this->dsn['password'];
+        $connection = $this->_doConnect($user, $pass, $this->database_name, $this->options['persistent']);
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        $offset = $this->offset;
+        $limit = $this->limit;
+        $this->offset = $this->limit = 0;
+        $query = $this->_modifyQuery($query, $is_manip, $limit, $offset);
+
+        $result =& $this->_doQuery($query, $is_manip, $connection, $this->database_name);
+        if (!PEAR::isError($result)) {
+            if ($is_manip) {
+                $result =  $this->_affectedRows($connection, $result);
+            } else {
+                $result =& $this->_wrapResult($result, $types, true, false, $limit, $offset);
+            }
+        }
+
+        @pg_close($connection);
+        return $result;
+    }
+
+    // }}}
+    // {{{ _doQuery()
+
+    /**
+     * Execute a query
+     * @param string $query  query
+     * @param boolean $is_manip  if the query is a manipulation query
+     * @param resource $connection
+     * @param string $database_name
+     * @return result or error object
+     * @access protected
+     */
+    function &_doQuery($query, $is_manip = false, $connection = null, $database_name = null)
+    {
+        $this->last_query = $query;
+        $result = $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'pre'));
+        if ($result) {
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+            $query = $result;
+        }
+        if ($this->options['disable_query']) {
+            $result = $is_manip ? 0 : null;
+            return $result;
+        }
+
+        if (is_null($connection)) {
+            $connection = $this->getConnection();
+            if (PEAR::isError($connection)) {
+                return $connection;
+            }
+        }
+
+        $function = $this->options['multi_query'] ? 'pg_send_query' : 'pg_query';
+        $result = @$function($connection, $query);
+        if (!$result) {
+            $err =& $this->raiseError(null, null, null,
+                'Could not execute statement', __FUNCTION__);
+            return $err;
+        } elseif ($this->options['multi_query']) {
+            if (!($result = @pg_get_result($connection))) {
+                $err =& $this->raiseError(null, null, null,
+                        'Could not get the first result from a multi query', __FUNCTION__);
+                return $err;
+            }
+        }
+
+        $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'post', 'result' => $result));
+        return $result;
+    }
+
+    // }}}
+    // {{{ _affectedRows()
+
+    /**
+     * Returns the number of rows affected
+     *
+     * @param resource $result
+     * @param resource $connection
+     * @return mixed MDB2 Error Object or the number of rows affected
+     * @access private
+     */
+    function _affectedRows($connection, $result = null)
+    {
+        if (is_null($connection)) {
+            $connection = $this->getConnection();
+            if (PEAR::isError($connection)) {
+                return $connection;
+            }
+        }
+        return @pg_affected_rows($result);
+    }
+
+    // }}}
+    // {{{ _modifyQuery()
+
+    /**
+     * Changes a query string for various DBMS specific reasons
+     *
+     * @param string $query  query to modify
+     * @param boolean $is_manip  if it is a DML query
+     * @param integer $limit  limit the number of rows
+     * @param integer $offset  start reading from given offset
+     * @return string modified query
+     * @access protected
+     */
+    function _modifyQuery($query, $is_manip, $limit, $offset)
+    {
+        if ($limit > 0
+            && !preg_match('/LIMIT\s*\d(?:\s*(?:,|OFFSET)\s*\d+)?(?:[^\)]*)?$/i', $query)
+        ) {
+            $query = rtrim($query);
+            if (substr($query, -1) == ';') {
+                $query = substr($query, 0, -1);
+            }
+            if ($is_manip) {
+                $query = $this->_modifyManipQuery($query, $limit);
+            } else {
+                $query.= " LIMIT $limit OFFSET $offset";
+            }
+        }
+        return $query;
+    }
+    
+    // }}}
+    // {{{ _modifyManipQuery()
+    
+    /**
+     * Changes a manip query string for various DBMS specific reasons
+     *
+     * @param string $query  query to modify
+     * @param integer $limit  limit the number of rows
+     * @return string modified query
+     * @access protected
+     */
+    function _modifyManipQuery($query, $limit)
+    {
+        $pos = strpos(strtolower($query), 'where');
+        $where = $pos ? substr($query, $pos) : '';
+
+        $manip_clause = '(\bDELETE\b\s+(?:\*\s+)?\bFROM\b|\bUPDATE\b)';
+        $from_clause  = '([\w\.]+)';
+        $where_clause = '(?:(.*)\bWHERE\b\s+(.*))|(.*)';
+        $pattern = '/^'. $manip_clause . '\s+' . $from_clause .'(?:\s)*(?:'. $where_clause .')?$/i';
+        $matches = preg_match($pattern, $query, $match);
+        if ($matches) {
+            $manip = $match[1];
+            $from  = $match[2];
+            $what  = (count($matches) == 6) ? $match[5] : $match[3];
+            return $manip.' '.$from.' '.$what.' WHERE ctid=(SELECT ctid FROM '.$from.' '.$where.' LIMIT '.$limit.')';
+        }
+        //return error?
+        return $query;
+    }
+
+    // }}}
+    // {{{ getServerVersion()
+
+    /**
+     * return version information about the server
+     *
+     * @param bool   $native  determines if the raw version string should be returned
+     * @return mixed array/string with version information or MDB2 error object
+     * @access public
+     */
+    function getServerVersion($native = false)
+    {
+        $query = 'SHOW SERVER_VERSION';
+        if ($this->connected_server_info) {
+            $server_info = $this->connected_server_info;
+        } else {
+            $server_info = $this->queryOne($query, 'text');
+            if (PEAR::isError($server_info)) {
+                return $server_info;
+            }
+        }
+        // cache server_info
+        $this->connected_server_info = $server_info;
+        if (!$native && !PEAR::isError($server_info)) {
+            $tmp = explode('.', $server_info, 3);
+            if (empty($tmp[2])
+                && isset($tmp[1])
+                && preg_match('/(\d+)(.*)/', $tmp[1], $tmp2)
+            ) {
+                $server_info = array(
+                    'major' => $tmp[0],
+                    'minor' => $tmp2[1],
+                    'patch' => null,
+                    'extra' => $tmp2[2],
+                    'native' => $server_info,
+                );
+            } else {
+                $server_info = array(
+                    'major' => isset($tmp[0]) ? $tmp[0] : null,
+                    'minor' => isset($tmp[1]) ? $tmp[1] : null,
+                    'patch' => isset($tmp[2]) ? $tmp[2] : null,
+                    'extra' => null,
+                    'native' => $server_info,
+                );
+            }
+        }
+        return $server_info;
+    }
+
+    // }}}
+    // {{{ prepare()
+
+    /**
+     * Prepares a query for multiple execution with execute().
+     * With some database backends, this is emulated.
+     * prepare() requires a generic query as string like
+     * 'INSERT INTO numbers VALUES(?,?)' or
+     * 'INSERT INTO numbers VALUES(:foo,:bar)'.
+     * The ? and :name and are placeholders which can be set using
+     * bindParam() and the query can be sent off using the execute() method.
+     * The allowed format for :name can be set with the 'bindname_format' option.
+     *
+     * @param string $query the query to prepare
+     * @param mixed   $types  array that contains the types of the placeholders
+     * @param mixed   $result_types  array that contains the types of the columns in
+     *                        the result set or MDB2_PREPARE_RESULT, if set to
+     *                        MDB2_PREPARE_MANIP the query is handled as a manipulation query
+     * @param mixed   $lobs   key (field) value (parameter) pair for all lob placeholders
+     * @return mixed resource handle for the prepared query on success, a MDB2
+     *        error on failure
+     * @access public
+     * @see bindParam, execute
+     */
+    function &prepare($query, $types = null, $result_types = null, $lobs = array())
+    {
+        if ($this->options['emulate_prepared']) {
+            $obj =& parent::prepare($query, $types, $result_types, $lobs);
+            return $obj;
+        }
+        $is_manip = ($result_types === MDB2_PREPARE_MANIP);
+        $offset = $this->offset;
+        $limit = $this->limit;
+        $this->offset = $this->limit = 0;
+        $result = $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'pre'));
+        if ($result) {
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+            $query = $result;
+        }
+        $pgtypes = function_exists('pg_prepare') ? false : array();
+        if ($pgtypes !== false && !empty($types)) {
+            $this->loadModule('Datatype', null, true);
+        }
+        $query = $this->_modifyQuery($query, $is_manip, $limit, $offset);
+        $placeholder_type_guess = $placeholder_type = null;
+        $question = '?';
+        $colon = ':';
+        $positions = array();
+        $position = $parameter = 0;
+        while ($position < strlen($query)) {
+            $q_position = strpos($query, $question, $position);
+            $c_position = strpos($query, $colon, $position);
+            //skip "::type" cast ("select id::varchar(20) from sometable where name=?")
+            $doublecolon_position = strpos($query, '::', $position);
+            if ($doublecolon_position !== false && $doublecolon_position == $c_position) {
+                $c_position = strpos($query, $colon, $position+2);
+            }
+            if ($q_position && $c_position) {
+                $p_position = min($q_position, $c_position);
+            } elseif ($q_position) {
+                $p_position = $q_position;
+            } elseif ($c_position) {
+                $p_position = $c_position;
+            } else {
+                break;
+            }
+            if (is_null($placeholder_type)) {
+                $placeholder_type_guess = $query[$p_position];
+            }
+            
+            $new_pos = $this->_skipDelimitedStrings($query, $position, $p_position);
+            if (PEAR::isError($new_pos)) {
+                return $new_pos;
+            }
+            if ($new_pos != $position) {
+                $position = $new_pos;
+                continue; //evaluate again starting from the new position
+            }
+
+            if ($query[$position] == $placeholder_type_guess) {
+                if (is_null($placeholder_type)) {
+                    $placeholder_type = $query[$p_position];
+                    $question = $colon = $placeholder_type;
+                    if (!empty($types) && is_array($types)) {
+                        if ($placeholder_type == ':') {
+                        } else {
+                            $types = array_values($types);
+                        }
+                    }
+                }
+                if ($placeholder_type_guess == '?') {
+                    $length = 1;
+                    $name = $parameter;
+                } else {
+                    $regexp = '/^.{'.($position+1).'}('.$this->options['bindname_format'].').*$/s';
+                    $param = preg_replace($regexp, '\\1', $query);
+                    if ($param === '') {
+                        $err =& $this->raiseError(MDB2_ERROR_SYNTAX, null, null,
+                            'named parameter name must match "bindname_format" option', __FUNCTION__);
+                        return $err;
+                    }
+                    $length = strlen($param) + 1;
+                    $name = $param;
+                }
+                if ($pgtypes !== false) {
+                    if (is_array($types) && array_key_exists($name, $types)) {
+                        $pgtypes[] = $this->datatype->mapPrepareDatatype($types[$name]);
+                    } elseif (is_array($types) && array_key_exists($parameter, $types)) {
+                        $pgtypes[] = $this->datatype->mapPrepareDatatype($types[$parameter]);
+                    } else {
+                        $pgtypes[] = 'text';
+                    }
+                }
+                if (($key_parameter = array_search($name, $positions))) {
+                    $next_parameter = 1;
+                    foreach ($positions as $key => $value) {
+                        if ($key_parameter == $key) {
+                            break;
+                        }
+                        ++$next_parameter;
+                    }
+                } else {
+                    ++$parameter;
+                    $next_parameter = $parameter;
+                    $positions[] = $name;
+                }
+                $query = substr_replace($query, '$'.$parameter, $position, $length);
+                $position = $p_position + strlen($parameter);
+            } else {
+                $position = $p_position;
+            }
+        }
+        $connection = $this->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+        static $prep_statement_counter = 1;
+        $statement_name = sprintf($this->options['statement_format'], $this->phptype, $prep_statement_counter++ . sha1(microtime() + mt_rand()));
+        $statement_name = substr(strtolower($statement_name), 0, $this->options['max_identifiers_length']);
+        if ($pgtypes === false) {
+            $result = @pg_prepare($connection, $statement_name, $query);
+            if (!$result) {
+                $err =& $this->raiseError(null, null, null,
+                    'Unable to create prepared statement handle', __FUNCTION__);
+                return $err;
+            }
+        } else {
+            $types_string = '';
+            if ($pgtypes) {
+                $types_string = ' ('.implode(', ', $pgtypes).') ';
+            }
+            $query = 'PREPARE '.$statement_name.$types_string.' AS '.$query;
+            $statement =& $this->_doQuery($query, true, $connection);
+            if (PEAR::isError($statement)) {
+                return $statement;
+            }
+        }
+
+        $class_name = 'MDB2_Statement_'.$this->phptype;
+        $obj = new $class_name($this, $statement_name, $positions, $query, $types, $result_types, $is_manip, $limit, $offset);
+        $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'post', 'result' => $obj));
+        return $obj;
+    }
+
+    // }}}
+    // {{{ function getSequenceName($sqn)
+
+    /**
+     * adds sequence name formatting to a sequence name
+     *
+     * @param   string  name of the sequence
+     *
+     * @return  string  formatted sequence name
+     *
+     * @access  public
+     */
+    function getSequenceName($sqn)
+    {
+        if (false === $this->options['disable_smart_seqname']) {
+            if (strpos($sqn, '_') !== false) {
+                list($table, $field) = explode('_', $sqn, 2);
+            }
+            $schema_list = $this->queryOne("SELECT array_to_string(current_schemas(false), ',')");
+            if (PEAR::isError($schema_list) || empty($schema_list) || count($schema_list) < 2) {
+                $order_by = ' a.attnum';
+                $schema_clause = ' AND n.nspname=current_schema()';
+            } else {
+                $schemas = explode(',', $schema_list);
+                $schema_clause = ' AND n.nspname IN ('.$schema_list.')';
+                $counter = 1;
+                $order_by = ' CASE ';
+                foreach ($schemas as $schema) {
+                    $order_by .= ' WHEN n.nspname='.$schema.' THEN '.$counter++;
+                }
+                $order_by .= ' ELSE '.$counter.' END, a.attnum';
+            }
+
+            $query = "SELECT substring((SELECT substring(pg_get_expr(d.adbin, d.adrelid) for 128)
+                    	    FROM pg_attrdef d
+                    	   WHERE d.adrelid = a.attrelid
+                    	     AND d.adnum = a.attnum
+                    	     AND a.atthasdef
+                    	 ) FROM 'nextval[^'']*''([^'']*)')
+                        FROM pg_attribute a
+                    LEFT JOIN pg_class c ON c.oid = a.attrelid
+                    LEFT JOIN pg_attrdef d ON d.adrelid = a.attrelid AND d.adnum = a.attnum AND a.atthasdef
+                    LEFT JOIN pg_namespace n ON c.relnamespace = n.oid
+                       WHERE (c.relname = ".$this->quote($sqn, 'text');
+            if (!empty($field)) {
+                $query .= " OR (c.relname = ".$this->quote($table, 'text')." AND a.attname = ".$this->quote($field, 'text').")";
+            }
+            $query .= "      )"
+                         .$schema_clause."
+                         AND NOT a.attisdropped
+                         AND a.attnum > 0
+                         AND pg_get_expr(d.adbin, d.adrelid) LIKE 'nextval%'
+                    ORDER BY ".$order_by;
+            $seqname = $this->queryOne($query);
+            if (!PEAR::isError($seqname) && !empty($seqname) && is_string($seqname)) {
+                return $seqname;
+            }
+        }
+
+        return parent::getSequenceName($sqn);
+    }
+
+    // }}}
+    // {{{ nextID()
+
+    /**
+     * Returns the next free id of a sequence
+     *
+     * @param string $seq_name name of the sequence
+     * @param boolean $ondemand when true the sequence is
+     *                          automatic created, if it
+     *                          not exists
+     * @return mixed MDB2 Error Object or id
+     * @access public
+     */
+    function nextID($seq_name, $ondemand = true)
+    {
+        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq_name), true);
+        $query = "SELECT NEXTVAL('$sequence_name')";
+        $this->pushErrorHandling(PEAR_ERROR_RETURN);
+        $this->expectError(MDB2_ERROR_NOSUCHTABLE);
+        $result = $this->queryOne($query, 'integer');
+        $this->popExpect();
+        $this->popErrorHandling();
+        if (PEAR::isError($result)) {
+            if ($ondemand && $result->getCode() == MDB2_ERROR_NOSUCHTABLE) {
+                $this->loadModule('Manager', null, true);
+                $result = $this->manager->createSequence($seq_name);
+                if (PEAR::isError($result)) {
+                    return $this->raiseError($result, null, null,
+                        'on demand sequence could not be created', __FUNCTION__);
+                }
+                return $this->nextId($seq_name, false);
+            }
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ lastInsertID()
+
+    /**
+     * Returns the autoincrement ID if supported or $id or fetches the current
+     * ID in a sequence called: $table.(empty($field) ? '' : '_'.$field)
+     *
+     * @param string $table name of the table into which a new row was inserted
+     * @param string $field name of the field into which a new row was inserted
+     * @return mixed MDB2 Error Object or id
+     * @access public
+     */
+    function lastInsertID($table = null, $field = null)
+    {
+        if (empty($table) && empty($field)) {
+            return $this->queryOne('SELECT lastval()', 'integer');
+        }
+        $seq = $table.(empty($field) ? '' : '_'.$field);
+        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq), true);
+        return $this->queryOne("SELECT currval('$sequence_name')", 'integer');
+    }
+
+    // }}}
+    // {{{ currID()
+
+    /**
+     * Returns the current id of a sequence
+     *
+     * @param string $seq_name name of the sequence
+     * @return mixed MDB2 Error Object or id
+     * @access public
+     */
+    function currID($seq_name)
+    {
+        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq_name), true);
+        return $this->queryOne("SELECT last_value FROM $sequence_name", 'integer');
+    }
+}
+
+/**
+ * MDB2 PostGreSQL result driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Paul Cooper <pgc@ucecom.com>
+ */
+class MDB2_Result_pgsql extends MDB2_Result_Common
+{
+    // }}}
+    // {{{ fetchRow()
+
+    /**
+     * Fetch a row and insert the data into an existing array.
+     *
+     * @param int       $fetchmode  how the array data should be indexed
+     * @param int    $rownum    number of the row where the data can be found
+     * @return int data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function &fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
+    {
+        if (!is_null($rownum)) {
+            $seek = $this->seek($rownum);
+            if (PEAR::isError($seek)) {
+                return $seek;
+            }
+        }
+        if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
+            $fetchmode = $this->db->fetchmode;
+        }
+        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
+            $row = @pg_fetch_array($this->result, null, PGSQL_ASSOC);
+            if (is_array($row)
+                && $this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
+            ) {
+                $row = array_change_key_case($row, $this->db->options['field_case']);
+            }
+        } else {
+            $row = @pg_fetch_row($this->result);
+        }
+        if (!$row) {
+            if ($this->result === false) {
+                $err =& $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                    'resultset has already been freed', __FUNCTION__);
+                return $err;
+            }
+            $null = null;
+            return $null;
+        }
+        $mode = $this->db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL;
+        $rtrim = false;
+        if ($this->db->options['portability'] & MDB2_PORTABILITY_RTRIM) {
+            if (empty($this->types)) {
+                $mode += MDB2_PORTABILITY_RTRIM;
+            } else {
+                $rtrim = true;
+            }
+        }
+        if ($mode) {
+            $this->db->_fixResultArrayValues($row, $mode);
+        }
+        if (!empty($this->types)) {
+            $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
+        }
+        if (!empty($this->values)) {
+            $this->_assignBindColumns($row);
+        }
+        if ($fetchmode === MDB2_FETCHMODE_OBJECT) {
+            $object_class = $this->db->options['fetch_class'];
+            if ($object_class == 'stdClass') {
+                $row = (object) $row;
+            } else {
+                $row = new $object_class($row);
+            }
+        }
+        ++$this->rownum;
+        return $row;
+    }
+
+    // }}}
+    // {{{ _getColumnNames()
+
+    /**
+     * Retrieve the names of columns returned by the DBMS in a query result.
+     *
+     * @return  mixed   Array variable that holds the names of columns as keys
+     *                  or an MDB2 error on failure.
+     *                  Some DBMS may not return any columns when the result set
+     *                  does not contain any rows.
+     * @access private
+     */
+    function _getColumnNames()
+    {
+        $columns = array();
+        $numcols = $this->numCols();
+        if (PEAR::isError($numcols)) {
+            return $numcols;
+        }
+        for ($column = 0; $column < $numcols; $column++) {
+            $column_name = @pg_field_name($this->result, $column);
+            $columns[$column_name] = $column;
+        }
+        if ($this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $columns = array_change_key_case($columns, $this->db->options['field_case']);
+        }
+        return $columns;
+    }
+
+    // }}}
+    // {{{ numCols()
+
+    /**
+     * Count the number of columns returned by the DBMS in a query result.
+     *
+     * @access public
+     * @return mixed integer value with the number of columns, a MDB2 error
+     *                       on failure
+     */
+    function numCols()
+    {
+        $cols = @pg_num_fields($this->result);
+        if (is_null($cols)) {
+            if ($this->result === false) {
+                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                    'resultset has already been freed', __FUNCTION__);
+            } elseif (is_null($this->result)) {
+                return count($this->types);
+            }
+            return $this->db->raiseError(null, null, null,
+                'Could not get column count', __FUNCTION__);
+        }
+        return $cols;
+    }
+
+    // }}}
+    // {{{ nextResult()
+
+    /**
+     * Move the internal result pointer to the next available result
+     *
+     * @return true on success, false if there is no more result set or an error object on failure
+     * @access public
+     */
+    function nextResult()
+    {
+        $connection = $this->db->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        if (!($this->result = @pg_get_result($connection))) {
+            return false;
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ free()
+
+    /**
+     * Free the internal resources associated with result.
+     *
+     * @return boolean true on success, false if result is invalid
+     * @access public
+     */
+    function free()
+    {
+        if (is_resource($this->result) && $this->db->connection) {
+            $free = @pg_free_result($this->result);
+            if ($free === false) {
+                return $this->db->raiseError(null, null, null,
+                    'Could not free result', __FUNCTION__);
+            }
+        }
+        $this->result = false;
+        return MDB2_OK;
+    }
+}
+
+/**
+ * MDB2 PostGreSQL buffered result driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Paul Cooper <pgc@ucecom.com>
+ */
+class MDB2_BufferedResult_pgsql extends MDB2_Result_pgsql
+{
+    // {{{ seek()
+
+    /**
+     * Seek to a specific row in a result set
+     *
+     * @param int    $rownum    number of the row where the data can be found
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function seek($rownum = 0)
+    {
+        if ($this->rownum != ($rownum - 1) && !@pg_result_seek($this->result, $rownum)) {
+            if ($this->result === false) {
+                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                    'resultset has already been freed', __FUNCTION__);
+            } elseif (is_null($this->result)) {
+                return MDB2_OK;
+            }
+            return $this->db->raiseError(MDB2_ERROR_INVALID, null, null,
+                'tried to seek to an invalid row number ('.$rownum.')', __FUNCTION__);
+        }
+        $this->rownum = $rownum - 1;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ valid()
+
+    /**
+     * Check if the end of the result set has been reached
+     *
+     * @return mixed true or false on sucess, a MDB2 error on failure
+     * @access public
+     */
+    function valid()
+    {
+        $numrows = $this->numRows();
+        if (PEAR::isError($numrows)) {
+            return $numrows;
+        }
+        return $this->rownum < ($numrows - 1);
+    }
+
+    // }}}
+    // {{{ numRows()
+
+    /**
+     * Returns the number of rows in a result object
+     *
+     * @return mixed MDB2 Error Object or the number of rows
+     * @access public
+     */
+    function numRows()
+    {
+        $rows = @pg_num_rows($this->result);
+        if (is_null($rows)) {
+            if ($this->result === false) {
+                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                    'resultset has already been freed', __FUNCTION__);
+            } elseif (is_null($this->result)) {
+                return 0;
+            }
+            return $this->db->raiseError(null, null, null,
+                'Could not get row count', __FUNCTION__);
+        }
+        return $rows;
+    }
+}
+
+/**
+ * MDB2 PostGreSQL statement driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Paul Cooper <pgc@ucecom.com>
+ */
+class MDB2_Statement_pgsql extends MDB2_Statement_Common
+{
+    // {{{ _execute()
+
+    /**
+     * Execute a prepared query statement helper method.
+     *
+     * @param mixed $result_class string which specifies which result class to use
+     * @param mixed $result_wrap_class string which specifies which class to wrap results in
+     *
+     * @return mixed MDB2_Result or integer (affected rows) on success,
+     *               a MDB2 error on failure
+     * @access private
+     */
+    function &_execute($result_class = true, $result_wrap_class = false)
+    {
+        if (is_null($this->statement)) {
+            $result =& parent::_execute($result_class, $result_wrap_class);
+            return $result;
+        }
+        $this->db->last_query = $this->query;
+        $this->db->debug($this->query, 'execute', array('is_manip' => $this->is_manip, 'when' => 'pre', 'parameters' => $this->values));
+        if ($this->db->getOption('disable_query')) {
+            $result = $this->is_manip ? 0 : null;
+            return $result;
+        }
+
+        $connection = $this->db->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        $query = false;
+        $parameters = array();
+        // todo: disabled until pg_execute() bytea issues are cleared up
+        if (true || !function_exists('pg_execute')) {
+            $query = 'EXECUTE '.$this->statement;
+        }
+        if (!empty($this->positions)) {
+            foreach ($this->positions as $parameter) {
+                if (!array_key_exists($parameter, $this->values)) {
+                    return $this->db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                        'Unable to bind to missing placeholder: '.$parameter, __FUNCTION__);
+                }
+                $value = $this->values[$parameter];
+                $type = array_key_exists($parameter, $this->types) ? $this->types[$parameter] : null;
+                if (is_resource($value) || $type == 'clob' || $type == 'blob' || $this->db->options['lob_allow_url_include']) {
+                    if (!is_resource($value) && preg_match('/^(\w+:\/\/)(.*)$/', $value, $match)) {
+                        if ($match[1] == 'file://') {
+                            $value = $match[2];
+                        }
+                        $value = @fopen($value, 'r');
+                        $close = true;
+                    }
+                    if (is_resource($value)) {
+                        $data = '';
+                        while (!@feof($value)) {
+                            $data.= @fread($value, $this->db->options['lob_buffer_length']);
+                        }
+                        if ($close) {
+                            @fclose($value);
+                        }
+                        $value = $data;
+                    }
+                }
+                $quoted = $this->db->quote($value, $type, $query);
+                if (PEAR::isError($quoted)) {
+                    return $quoted;
+                }
+                $parameters[] = $quoted;
+            }
+            if ($query) {
+                $query.= ' ('.implode(', ', $parameters).')';
+            }
+        }
+
+        if (!$query) {
+            $result = @pg_execute($connection, $this->statement, $parameters);
+            if (!$result) {
+                $err =& $this->db->raiseError(null, null, null,
+                    'Unable to execute statement', __FUNCTION__);
+                return $err;
+            }
+        } else {
+            $result = $this->db->_doQuery($query, $this->is_manip, $connection);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+
+        if ($this->is_manip) {
+            $affected_rows = $this->db->_affectedRows($connection, $result);
+            return $affected_rows;
+        }
+
+        $result =& $this->db->_wrapResult($result, $this->result_types,
+            $result_class, $result_wrap_class, $this->limit, $this->offset);
+        $this->db->debug($this->query, 'execute', array('is_manip' => $this->is_manip, 'when' => 'post', 'result' => $result));
+        return $result;
+    }
+
+    // }}}
+    // {{{ free()
+
+    /**
+     * Release resources allocated for the specified prepared query.
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function free()
+    {
+        if (is_null($this->positions)) {
+            return $this->db->raiseError(MDB2_ERROR, null, null,
+                'Prepared statement has already been freed', __FUNCTION__);
+        }
+        $result = MDB2_OK;
+
+        if (!is_null($this->statement)) {
+            $connection = $this->db->getConnection();
+            if (PEAR::isError($connection)) {
+                return $connection;
+            }
+            $query = 'DEALLOCATE PREPARE '.$this->statement;
+            $result = $this->db->_doQuery($query, true, $connection);
+        }
+
+        parent::free();
+        return $result;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/sqlite.php b/3rdparty/MDB2/Driver/sqlite.php
new file mode 100644
index 00000000000..5d2ad27d016
--- /dev/null
+++ b/3rdparty/MDB2/Driver/sqlite.php
@@ -0,0 +1,1088 @@
+<?php
+// vim: set et ts=4 sw=4 fdm=marker:
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: sqlite.php,v 1.165 2008/11/30 14:28:01 afz Exp $
+//
+
+/**
+ * MDB2 SQLite driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_sqlite extends MDB2_Driver_Common
+{
+    // {{{ properties
+    var $string_quoting = array('start' => "'", 'end' => "'", 'escape' => "'", 'escape_pattern' => false);
+
+    var $identifier_quoting = array('start' => '"', 'end' => '"', 'escape' => '"');
+
+    var $_lasterror = '';
+
+    var $fix_assoc_fields_names = false;
+
+    // }}}
+    // {{{ constructor
+
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        parent::__construct();
+
+        $this->phptype = 'sqlite';
+        $this->dbsyntax = 'sqlite';
+
+        $this->supported['sequences'] = 'emulated';
+        $this->supported['indexes'] = true;
+        $this->supported['affected_rows'] = true;
+        $this->supported['summary_functions'] = true;
+        $this->supported['order_by_text'] = true;
+        $this->supported['current_id'] = 'emulated';
+        $this->supported['limit_queries'] = true;
+        $this->supported['LOBs'] = true;
+        $this->supported['replace'] = true;
+        $this->supported['transactions'] = true;
+        $this->supported['savepoints'] = false;
+        $this->supported['sub_selects'] = true;
+        $this->supported['triggers'] = true;
+        $this->supported['auto_increment'] = true;
+        $this->supported['primary_key'] = false; // requires alter table implementation
+        $this->supported['result_introspection'] = false; // not implemented
+        $this->supported['prepared_statements'] = 'emulated';
+        $this->supported['identifier_quoting'] = true;
+        $this->supported['pattern_escaping'] = false;
+        $this->supported['new_link'] = false;
+
+        $this->options['DBA_username'] = false;
+        $this->options['DBA_password'] = false;
+        $this->options['base_transaction_name'] = '___php_MDB2_sqlite_auto_commit_off';
+        $this->options['fixed_float'] = 0;
+        $this->options['database_path'] = '';
+        $this->options['database_extension'] = '';
+        $this->options['server_version'] = '';
+        $this->options['max_identifiers_length'] = 128; //no real limit
+    }
+
+    // }}}
+    // {{{ errorInfo()
+
+    /**
+     * This method is used to collect information about an error
+     *
+     * @param integer $error
+     * @return array
+     * @access public
+     */
+    function errorInfo($error = null)
+    {
+        $native_code = null;
+        if ($this->connection) {
+            $native_code = @sqlite_last_error($this->connection);
+        }
+        $native_msg = $this->_lasterror
+            ? html_entity_decode($this->_lasterror) : @sqlite_error_string($native_code);
+            
+        // PHP 5.2+ prepends the function name to $php_errormsg, so we need
+        // this hack to work around it, per bug #9599.
+        $native_msg = preg_replace('/^sqlite[a-z_]+\(\)[^:]*: /', '', $native_msg);
+
+        if (is_null($error)) {
+            static $error_regexps;
+            if (empty($error_regexps)) {
+                $error_regexps = array(
+                    '/^no such table:/' => MDB2_ERROR_NOSUCHTABLE,
+                    '/^no such index:/' => MDB2_ERROR_NOT_FOUND,
+                    '/^(table|index) .* already exists$/' => MDB2_ERROR_ALREADY_EXISTS,
+                    '/PRIMARY KEY must be unique/i' => MDB2_ERROR_CONSTRAINT,
+                    '/is not unique/' => MDB2_ERROR_CONSTRAINT,
+                    '/columns .* are not unique/i' => MDB2_ERROR_CONSTRAINT,
+                    '/uniqueness constraint failed/' => MDB2_ERROR_CONSTRAINT,
+                    '/may not be NULL/' => MDB2_ERROR_CONSTRAINT_NOT_NULL,
+                    '/^no such column:/' => MDB2_ERROR_NOSUCHFIELD,
+                    '/no column named/' => MDB2_ERROR_NOSUCHFIELD,
+                    '/column not present in both tables/i' => MDB2_ERROR_NOSUCHFIELD,
+                    '/^near ".*": syntax error$/' => MDB2_ERROR_SYNTAX,
+                    '/[0-9]+ values for [0-9]+ columns/i' => MDB2_ERROR_VALUE_COUNT_ON_ROW,
+                 );
+            }
+            foreach ($error_regexps as $regexp => $code) {
+                if (preg_match($regexp, $native_msg)) {
+                    $error = $code;
+                    break;
+                }
+            }
+        }
+        return array($error, $native_code, $native_msg);
+    }
+
+    // }}}
+    // {{{ escape()
+
+    /**
+     * Quotes a string so it can be safely used in a query. It will quote
+     * the text so it can safely be used within a query.
+     *
+     * @param   string  the input string to quote
+     * @param   bool    escape wildcards
+     *
+     * @return  string  quoted string
+     *
+     * @access  public
+     */
+    function escape($text, $escape_wildcards = false)
+    {
+        $text = @sqlite_escape_string($text);
+        return $text;
+    }
+
+    // }}}
+    // {{{ beginTransaction()
+
+    /**
+     * Start a transaction or set a savepoint.
+     *
+     * @param   string  name of a savepoint to set
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function beginTransaction($savepoint = null)
+    {
+        $this->debug('Starting transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+        if (!is_null($savepoint)) {
+            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'savepoints are not supported', __FUNCTION__);
+        } elseif ($this->in_transaction) {
+            return MDB2_OK;  //nothing to do
+        }
+        if (!$this->destructor_registered && $this->opened_persistent) {
+            $this->destructor_registered = true;
+            register_shutdown_function('MDB2_closeOpenTransactions');
+        }
+        $query = 'BEGIN TRANSACTION '.$this->options['base_transaction_name'];
+        $result =$this->_doQuery($query, true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        $this->in_transaction = true;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ commit()
+
+    /**
+     * Commit the database changes done during a transaction that is in
+     * progress or release a savepoint. This function may only be called when
+     * auto-committing is disabled, otherwise it will fail. Therefore, a new
+     * transaction is implicitly started after committing the pending changes.
+     *
+     * @param   string  name of a savepoint to release
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function commit($savepoint = null)
+    {
+        $this->debug('Committing transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+        if (!$this->in_transaction) {
+            return $this->raiseError(MDB2_ERROR_INVALID, null, null,
+                'commit/release savepoint cannot be done changes are auto committed', __FUNCTION__);
+        }
+        if (!is_null($savepoint)) {
+            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'savepoints are not supported', __FUNCTION__);
+        }
+
+        $query = 'COMMIT TRANSACTION '.$this->options['base_transaction_name'];
+        $result =$this->_doQuery($query, true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        $this->in_transaction = false;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{
+
+    /**
+     * Cancel any database changes done during a transaction or since a specific
+     * savepoint that is in progress. This function may only be called when
+     * auto-committing is disabled, otherwise it will fail. Therefore, a new
+     * transaction is implicitly started after canceling the pending changes.
+     *
+     * @param   string  name of a savepoint to rollback to
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function rollback($savepoint = null)
+    {
+        $this->debug('Rolling back transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+        if (!$this->in_transaction) {
+            return $this->raiseError(MDB2_ERROR_INVALID, null, null,
+                'rollback cannot be done changes are auto committed', __FUNCTION__);
+        }
+        if (!is_null($savepoint)) {
+            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'savepoints are not supported', __FUNCTION__);
+        }
+
+        $query = 'ROLLBACK TRANSACTION '.$this->options['base_transaction_name'];
+        $result =$this->_doQuery($query, true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        $this->in_transaction = false;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function setTransactionIsolation()
+
+    /**
+     * Set the transacton isolation level.
+     *
+     * @param   string  standard isolation level
+     *                  READ UNCOMMITTED (allows dirty reads)
+     *                  READ COMMITTED (prevents dirty reads)
+     *                  REPEATABLE READ (prevents nonrepeatable reads)
+     *                  SERIALIZABLE (prevents phantom reads)
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     * @since   2.1.1
+     */
+    static function setTransactionIsolation($isolation,$options=array())
+    {
+        $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true));
+        switch ($isolation) {
+        case 'READ UNCOMMITTED':
+            $isolation = 0;
+            break;
+        case 'READ COMMITTED':
+        case 'REPEATABLE READ':
+        case 'SERIALIZABLE':
+            $isolation = 1;
+            break;
+        default:
+            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'isolation level is not supported: '.$isolation, __FUNCTION__);
+        }
+
+        $query = "PRAGMA read_uncommitted=$isolation";
+        return $this->_doQuery($query, true);
+    }
+
+    // }}}
+    // {{{ getDatabaseFile()
+
+    /**
+     * Builds the string with path+dbname+extension
+     *
+     * @return string full database path+file
+     * @access protected
+     */
+    function _getDatabaseFile($database_name)
+    {
+        if ($database_name === '' || $database_name === ':memory:') {
+            return $database_name;
+        }
+        return $this->options['database_path'].$database_name.$this->options['database_extension'];
+    }
+
+    // }}}
+    // {{{ connect()
+
+    /**
+     * Connect to the database
+     *
+     * @return true on success, MDB2 Error Object on failure
+     **/
+    function connect()
+    {
+		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
+        $database_file = $this->_getDatabaseFile($this->database_name);
+        if (is_resource($this->connection)) {
+            //if (count(array_diff($this->connected_dsn, $this->dsn)) == 0
+            if (MDB2::areEquals($this->connected_dsn, $this->dsn)
+                && $this->connected_database_name == $database_file
+                && $this->opened_persistent == $this->options['persistent']
+            ) {
+                return MDB2_OK;
+            }
+            $this->disconnect(false);
+        }
+
+        if (!PEAR::loadExtension($this->phptype)) {
+            return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                'extension '.$this->phptype.' is not compiled into PHP', __FUNCTION__);
+        }
+
+        if (empty($this->database_name)) {
+            return $this->raiseError(MDB2_ERROR_CONNECT_FAILED, null, null,
+            'unable to establish a connection', __FUNCTION__);
+        }
+
+        if ($database_file !== ':memory:') {
+			if(!strpos($database_file,'.db')){
+				$database_file="$datadir/$database_file.db";
+			}
+            if (!file_exists($database_file)) {
+                if (!touch($database_file)) {
+                    return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                        'Could not create database file', __FUNCTION__);
+                }
+                if (!isset($this->dsn['mode'])
+                    || !is_numeric($this->dsn['mode'])
+                ) {
+                    $mode = 0644;
+                } else {
+                    $mode = octdec($this->dsn['mode']);
+                }
+                if (!chmod($database_file, $mode)) {
+                    return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                        'Could not be chmodded database file', __FUNCTION__);
+                }
+                if (!file_exists($database_file)) {
+                    return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                        'Could not be found database file', __FUNCTION__);
+                }
+            }
+            if (!is_file($database_file)) {
+                return $this->raiseError(MDB2_ERROR_INVALID, null, null,
+                        'Database is a directory name', __FUNCTION__);
+            }
+            if (!is_readable($database_file)) {
+                return $this->raiseError(MDB2_ERROR_ACCESS_VIOLATION, null, null,
+                        'Could not read database file', __FUNCTION__);
+            }
+        }
+
+        $connect_function = ($this->options['persistent'] ? 'sqlite_popen' : 'sqlite_open');
+        $php_errormsg = '';
+        if (version_compare('5.1.0', PHP_VERSION, '>')) {
+            @ini_set('track_errors', true);
+            echo 1;
+            $connection = @$connect_function($database_file);
+            echo 2;
+            @ini_restore('track_errors');
+        } else {
+            $connection = @$connect_function($database_file, 0666, $php_errormsg);
+        }
+        $this->_lasterror = $php_errormsg;
+        if (!$connection) {
+            return $this->raiseError(MDB2_ERROR_CONNECT_FAILED, null, null,
+            'unable to establish a connection', __FUNCTION__);
+        }
+
+        if ($this->fix_assoc_fields_names ||
+            $this->options['portability'] & MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES)
+        {
+            @sqlite_query("PRAGMA short_column_names = 1", $connection);
+            $this->fix_assoc_fields_names = true;
+        }
+
+        $this->connection = $connection;
+        $this->connected_dsn = $this->dsn;
+        $this->connected_database_name = $database_file;
+        $this->opened_persistent = $this->getoption('persistent');
+        $this->dbsyntax = $this->dsn['dbsyntax'] ? $this->dsn['dbsyntax'] : $this->phptype;
+
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ databaseExists()
+
+    /**
+     * check if given database name is exists?
+     *
+     * @param string $name    name of the database that should be checked
+     *
+     * @return mixed true/false on success, a MDB2 error on failure
+     * @access public
+     */
+    function databaseExists($name)
+    {
+        $database_file = $this->_getDatabaseFile($name);
+        $result = file_exists($database_file);
+        return $result;
+    }
+
+    // }}}
+    // {{{ disconnect()
+
+    /**
+     * Log out and disconnect from the database.
+     *
+     * @param  boolean $force if the disconnect should be forced even if the
+     *                        connection is opened persistently
+     * @return mixed true on success, false if not connected and error
+     *                object on error
+     * @access public
+     */
+    function disconnect($force = true)
+    {
+        if (is_resource($this->connection)) {
+            if ($this->in_transaction) {
+                $dsn = $this->dsn;
+                $database_name = $this->database_name;
+                $persistent = $this->options['persistent'];
+                $this->dsn = $this->connected_dsn;
+                $this->database_name = $this->connected_database_name;
+                $this->options['persistent'] = $this->opened_persistent;
+                $this->rollback();
+                $this->dsn = $dsn;
+                $this->database_name = $database_name;
+                $this->options['persistent'] = $persistent;
+            }
+
+            if (!$this->opened_persistent || $force) {
+                @sqlite_close($this->connection);
+            }
+        } else {
+            return false;
+        }
+        return parent::disconnect($force);
+    }
+
+    // }}}
+    // {{{ _doQuery()
+
+    /**
+     * Execute a query
+     * @param string $query  query
+     * @param boolean $is_manip  if the query is a manipulation query
+     * @param resource $connection
+     * @param string $database_name
+     * @return result or error object
+     * @access protected
+     */
+    function &_doQuery($query, $is_manip = false, $connection = null, $database_name = null)
+    {
+        $this->last_query = $query;
+        $result = $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'pre'));
+        if ($result) {
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+            $query = $result;
+        }
+        if ($this->options['disable_query']) {
+            $result = $is_manip ? 0 : null;
+            return $result;
+        }
+
+        if (is_null($connection)) {
+            $connection = $this->getConnection();
+            if (PEAR::isError($connection)) {
+                return $connection;
+            }
+        }
+
+        $function = $this->options['result_buffering']
+            ? 'sqlite_query' : 'sqlite_unbuffered_query';
+        $php_errormsg = '';
+        if (version_compare('5.1.0', PHP_VERSION, '>')) {
+            @ini_set('track_errors', true);
+            do {
+                $result = @$function($query.';', $connection);
+            } while (sqlite_last_error($connection) == SQLITE_SCHEMA);
+            @ini_restore('track_errors');
+        } else {
+            do {
+                $result = @$function($query.';', $connection, SQLITE_BOTH, $php_errormsg);
+            } while (sqlite_last_error($connection) == SQLITE_SCHEMA);
+        }
+        $this->_lasterror = $php_errormsg;
+
+        if (!$result) {
+            $err =$this->raiseError(null, null, null,
+                'Could not execute statement', __FUNCTION__);
+            return $err;
+        }
+
+        $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'post', 'result' => $result));
+        return $result;
+    }
+
+    // }}}
+    // {{{ _affectedRows()
+
+    /**
+     * Returns the number of rows affected
+     *
+     * @param resource $result
+     * @param resource $connection
+     * @return mixed MDB2 Error Object or the number of rows affected
+     * @access private
+     */
+    function _affectedRows($connection, $result = null)
+    {
+        if (is_null($connection)) {
+            $connection = $this->getConnection();
+            if (PEAR::isError($connection)) {
+                return $connection;
+            }
+        }
+        return @sqlite_changes($connection);
+    }
+
+    // }}}
+    // {{{ _modifyQuery()
+
+    /**
+     * Changes a query string for various DBMS specific reasons
+     *
+     * @param string $query  query to modify
+     * @param boolean $is_manip  if it is a DML query
+     * @param integer $limit  limit the number of rows
+     * @param integer $offset  start reading from given offset
+     * @return string modified query
+     * @access protected
+     */
+    function _modifyQuery($query, $is_manip, $limit, $offset)
+    {
+        if ($this->options['portability'] & MDB2_PORTABILITY_DELETE_COUNT) {
+            if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $query)) {
+                $query = preg_replace('/^\s*DELETE\s+FROM\s+(\S+)\s*$/',
+                                      'DELETE FROM \1 WHERE 1=1', $query);
+            }
+        }
+        if ($limit > 0
+            && !preg_match('/LIMIT\s*\d(?:\s*(?:,|OFFSET)\s*\d+)?(?:[^\)]*)?$/i', $query)
+        ) {
+            $query = rtrim($query);
+            if (substr($query, -1) == ';') {
+                $query = substr($query, 0, -1);
+            }
+            if ($is_manip) {
+                $query.= " LIMIT $limit";
+            } else {
+                $query.= " LIMIT $offset,$limit";
+            }
+        }
+        return $query;
+    }
+
+    // }}}
+    // {{{ getServerVersion()
+
+    /**
+     * return version information about the server
+     *
+     * @param bool   $native  determines if the raw version string should be returned
+     * @return mixed array/string with version information or MDB2 error object
+     * @access public
+     */
+    function getServerVersion($native = false)
+    {
+        $server_info = false;
+        if ($this->connected_server_info) {
+            $server_info = $this->connected_server_info;
+        } elseif ($this->options['server_version']) {
+            $server_info = $this->options['server_version'];
+        } elseif (function_exists('sqlite_libversion')) {
+            $server_info = @sqlite_libversion();
+        }
+        if (!$server_info) {
+            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'Requires either the "server_version" option or the sqlite_libversion() function', __FUNCTION__);
+        }
+        // cache server_info
+        $this->connected_server_info = $server_info;
+        if (!$native) {
+            $tmp = explode('.', $server_info, 3);
+            $server_info = array(
+                'major' => isset($tmp[0]) ? $tmp[0] : null,
+                'minor' => isset($tmp[1]) ? $tmp[1] : null,
+                'patch' => isset($tmp[2]) ? $tmp[2] : null,
+                'extra' => null,
+                'native' => $server_info,
+            );
+        }
+        return $server_info;
+    }
+
+    // }}}
+    // {{{ replace()
+
+    /**
+     * Execute a SQL REPLACE query. A REPLACE query is identical to a INSERT
+     * query, except that if there is already a row in the table with the same
+     * key field values, the old row is deleted before the new row is inserted.
+     *
+     * The REPLACE type of query does not make part of the SQL standards. Since
+     * practically only SQLite implements it natively, this type of query is
+     * emulated through this method for other DBMS using standard types of
+     * queries inside a transaction to assure the atomicity of the operation.
+     *
+     * @access public
+     *
+     * @param string $table name of the table on which the REPLACE query will
+     *  be executed.
+     * @param array $fields associative array that describes the fields and the
+     *  values that will be inserted or updated in the specified table. The
+     *  indexes of the array are the names of all the fields of the table. The
+     *  values of the array are also associative arrays that describe the
+     *  values and other properties of the table fields.
+     *
+     *  Here follows a list of field properties that need to be specified:
+     *
+     *    value:
+     *          Value to be assigned to the specified field. This value may be
+     *          of specified in database independent type format as this
+     *          function can perform the necessary datatype conversions.
+     *
+     *    Default:
+     *          this property is required unless the Null property
+     *          is set to 1.
+     *
+     *    type
+     *          Name of the type of the field. Currently, all types Metabase
+     *          are supported except for clob and blob.
+     *
+     *    Default: no type conversion
+     *
+     *    null
+     *          Boolean property that indicates that the value for this field
+     *          should be set to null.
+     *
+     *          The default value for fields missing in INSERT queries may be
+     *          specified the definition of a table. Often, the default value
+     *          is already null, but since the REPLACE may be emulated using
+     *          an UPDATE query, make sure that all fields of the table are
+     *          listed in this function argument array.
+     *
+     *    Default: 0
+     *
+     *    key
+     *          Boolean property that indicates that this field should be
+     *          handled as a primary key or at least as part of the compound
+     *          unique index of the table that will determine the row that will
+     *          updated if it exists or inserted a new row otherwise.
+     *
+     *          This function will fail if no key field is specified or if the
+     *          value of a key field is set to null because fields that are
+     *          part of unique index they may not be null.
+     *
+     *    Default: 0
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     */
+    function replace($table, $fields)
+    {
+        $count = count($fields);
+        $query = $values = '';
+        $keys = $colnum = 0;
+        for (reset($fields); $colnum < $count; next($fields), $colnum++) {
+            $name = key($fields);
+            if ($colnum > 0) {
+                $query .= ',';
+                $values.= ',';
+            }
+            $query.= $this->quoteIdentifier($name, true);
+            if (isset($fields[$name]['null']) && $fields[$name]['null']) {
+                $value = 'NULL';
+            } else {
+                $type = isset($fields[$name]['type']) ? $fields[$name]['type'] : null;
+                $value = $this->quote($fields[$name]['value'], $type);
+                if (PEAR::isError($value)) {
+                    return $value;
+                }
+            }
+            $values.= $value;
+            if (isset($fields[$name]['key']) && $fields[$name]['key']) {
+                if ($value === 'NULL') {
+                    return $this->raiseError(MDB2_ERROR_CANNOT_REPLACE, null, null,
+                        'key value '.$name.' may not be NULL', __FUNCTION__);
+                }
+                $keys++;
+            }
+        }
+        if ($keys == 0) {
+            return $this->raiseError(MDB2_ERROR_CANNOT_REPLACE, null, null,
+                'not specified which fields are keys', __FUNCTION__);
+        }
+
+        $connection = $this->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        $table = $this->quoteIdentifier($table, true);
+        $query = "REPLACE INTO $table ($query) VALUES ($values)";
+        $result =$this->_doQuery($query, true, $connection);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        return $this->_affectedRows($connection, $result);
+    }
+
+    // }}}
+    // {{{ nextID()
+
+    /**
+     * Returns the next free id of a sequence
+     *
+     * @param string $seq_name name of the sequence
+     * @param boolean $ondemand when true the sequence is
+     *                          automatic created, if it
+     *                          not exists
+     *
+     * @return mixed MDB2 Error Object or id
+     * @access public
+     */
+    function nextID($seq_name, $ondemand = true)
+    {
+        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq_name), true);
+        $seqcol_name = $this->options['seqcol_name'];
+        $query = "INSERT INTO $sequence_name ($seqcol_name) VALUES (NULL)";
+        $this->pushErrorHandling(PEAR_ERROR_RETURN);
+        $this->expectError(MDB2_ERROR_NOSUCHTABLE);
+        $result =$this->_doQuery($query, true);
+        $this->popExpect();
+        $this->popErrorHandling();
+        if (PEAR::isError($result)) {
+            if ($ondemand && $result->getCode() == MDB2_ERROR_NOSUCHTABLE) {
+                $this->loadModule('Manager', null, true);
+                $result = $this->manager->createSequence($seq_name);
+                if (PEAR::isError($result)) {
+                    return $this->raiseError($result, null, null,
+                        'on demand sequence '.$seq_name.' could not be created', __FUNCTION__);
+                } else {
+                    return $this->nextID($seq_name, false);
+                }
+            }
+            return $result;
+        }
+        $value = $this->lastInsertID();
+        if (is_numeric($value)) {
+            $query = "DELETE FROM $sequence_name WHERE $seqcol_name < $value";
+            $result =$this->_doQuery($query, true);
+            if (PEAR::isError($result)) {
+                $this->warnings[] = 'nextID: could not delete previous sequence table values from '.$seq_name;
+            }
+        }
+        return $value;
+    }
+
+    // }}}
+    // {{{ lastInsertID()
+
+    /**
+     * Returns the autoincrement ID if supported or $id or fetches the current
+     * ID in a sequence called: $table.(empty($field) ? '' : '_'.$field)
+     *
+     * @param string $table name of the table into which a new row was inserted
+     * @param string $field name of the field into which a new row was inserted
+     * @return mixed MDB2 Error Object or id
+     * @access public
+     */
+    function lastInsertID($table = null, $field = null)
+    {
+        $connection = $this->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+        $value = @sqlite_last_insert_rowid($connection);
+        if (!$value) {
+            return $this->raiseError(null, null, null,
+                'Could not get last insert ID', __FUNCTION__);
+        }
+        return $value;
+    }
+
+    // }}}
+    // {{{ currID()
+
+    /**
+     * Returns the current id of a sequence
+     *
+     * @param string $seq_name name of the sequence
+     * @return mixed MDB2 Error Object or id
+     * @access public
+     */
+    function currID($seq_name)
+    {
+        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq_name), true);
+        $seqcol_name = $this->quoteIdentifier($this->options['seqcol_name'], true);
+        $query = "SELECT MAX($seqcol_name) FROM $sequence_name";
+        return $this->queryOne($query, 'integer');
+    }
+}
+
+/**
+ * MDB2 SQLite result driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Result_sqlite extends MDB2_Result_Common
+{
+    // }}}
+    // {{{ fetchRow()
+
+    /**
+     * Fetch a row and insert the data into an existing array.
+     *
+     * @param int       $fetchmode  how the array data should be indexed
+     * @param int    $rownum    number of the row where the data can be found
+     * @return int data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function &fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
+    {
+        if (!is_null($rownum)) {
+            $seek = $this->seek($rownum);
+            if (PEAR::isError($seek)) {
+                return $seek;
+            }
+        }
+        if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
+            $fetchmode = $this->db->fetchmode;
+        }
+        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
+            $row = @sqlite_fetch_array($this->result, SQLITE_ASSOC);
+            if (is_array($row)
+                && $this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
+            ) {
+                $row = array_change_key_case($row, $this->db->options['field_case']);
+            }
+        } else {
+           $row = @sqlite_fetch_array($this->result, SQLITE_NUM);
+        }
+        if (!$row) {
+            if ($this->result === false) {
+                $err =$this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                    'resultset has already been freed', __FUNCTION__);
+                return $err;
+            }
+            $null = null;
+            return $null;
+        }
+        $mode = $this->db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL;
+        $rtrim = false;
+        if ($this->db->options['portability'] & MDB2_PORTABILITY_RTRIM) {
+            if (empty($this->types)) {
+                $mode += MDB2_PORTABILITY_RTRIM;
+            } else {
+                $rtrim = true;
+            }
+        }
+        if ($mode) {
+            $this->db->_fixResultArrayValues($row, $mode);
+        }
+        if (!empty($this->types)) {
+            $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
+        }
+        if (!empty($this->values)) {
+            $this->_assignBindColumns($row);
+        }
+        if ($fetchmode === MDB2_FETCHMODE_OBJECT) {
+            $object_class = $this->db->options['fetch_class'];
+            if ($object_class == 'stdClass') {
+                $row = (object) $row;
+            } else {
+                $row = new $object_class($row);
+            }
+        }
+        ++$this->rownum;
+        return $row;
+    }
+
+    // }}}
+    // {{{ _getColumnNames()
+
+    /**
+     * Retrieve the names of columns returned by the DBMS in a query result.
+     *
+     * @return  mixed   Array variable that holds the names of columns as keys
+     *                  or an MDB2 error on failure.
+     *                  Some DBMS may not return any columns when the result set
+     *                  does not contain any rows.
+     * @access private
+     */
+    function _getColumnNames()
+    {
+        $columns = array();
+        $numcols = $this->numCols();
+        if (PEAR::isError($numcols)) {
+            return $numcols;
+        }
+        for ($column = 0; $column < $numcols; $column++) {
+            $column_name = @sqlite_field_name($this->result, $column);
+            $columns[$column_name] = $column;
+        }
+        if ($this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $columns = array_change_key_case($columns, $this->db->options['field_case']);
+        }
+        return $columns;
+    }
+
+    // }}}
+    // {{{ numCols()
+
+    /**
+     * Count the number of columns returned by the DBMS in a query result.
+     *
+     * @access public
+     * @return mixed integer value with the number of columns, a MDB2 error
+     *                       on failure
+     */
+    function numCols()
+    {
+        $cols = @sqlite_num_fields($this->result);
+        if (is_null($cols)) {
+            if ($this->result === false) {
+                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                    'resultset has already been freed', __FUNCTION__);
+            } elseif (is_null($this->result)) {
+                return count($this->types);
+            }
+            return $this->db->raiseError(null, null, null,
+                'Could not get column count', __FUNCTION__);
+        }
+        return $cols;
+    }
+}
+
+/**
+ * MDB2 SQLite buffered result driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_BufferedResult_sqlite extends MDB2_Result_sqlite
+{
+    // {{{ seek()
+
+    /**
+     * Seek to a specific row in a result set
+     *
+     * @param int    $rownum    number of the row where the data can be found
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function seek($rownum = 0)
+    {
+        if (!@sqlite_seek($this->result, $rownum)) {
+            if ($this->result === false) {
+                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                    'resultset has already been freed', __FUNCTION__);
+            } elseif (is_null($this->result)) {
+                return MDB2_OK;
+            }
+            return $this->db->raiseError(MDB2_ERROR_INVALID, null, null,
+                'tried to seek to an invalid row number ('.$rownum.')', __FUNCTION__);
+        }
+        $this->rownum = $rownum - 1;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ valid()
+
+    /**
+     * Check if the end of the result set has been reached
+     *
+     * @return mixed true or false on sucess, a MDB2 error on failure
+     * @access public
+     */
+    function valid()
+    {
+        $numrows = $this->numRows();
+        if (PEAR::isError($numrows)) {
+            return $numrows;
+        }
+        return $this->rownum < ($numrows - 1);
+    }
+
+    // }}}
+    // {{{ numRows()
+
+    /**
+     * Returns the number of rows in a result object
+     *
+     * @return mixed MDB2 Error Object or the number of rows
+     * @access public
+     */
+    function numRows()
+    {
+        $rows = @sqlite_num_rows($this->result);
+        if (is_null($rows)) {
+            if ($this->result === false) {
+                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                    'resultset has already been freed', __FUNCTION__);
+            } elseif (is_null($this->result)) {
+                return 0;
+            }
+            return $this->db->raiseError(null, null, null,
+                'Could not get row count', __FUNCTION__);
+        }
+        return $rows;
+    }
+}
+
+/**
+ * MDB2 SQLite statement driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Statement_sqlite extends MDB2_Statement_Common
+{
+
+}
+
+?>
diff --git a/3rdparty/MDB2/Extended.php b/3rdparty/MDB2/Extended.php
new file mode 100644
index 00000000000..864ab923543
--- /dev/null
+++ b/3rdparty/MDB2/Extended.php
@@ -0,0 +1,721 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: Extended.php,v 1.60 2007/11/28 19:49:34 quipo Exp $
+
+/**
+ * @package  MDB2
+ * @category Database
+ * @author   Lukas Smith <smith@pooteeweet.org>
+ */
+
+/**
+ * Used by autoPrepare()
+ */
+define('MDB2_AUTOQUERY_INSERT', 1);
+define('MDB2_AUTOQUERY_UPDATE', 2);
+define('MDB2_AUTOQUERY_DELETE', 3);
+define('MDB2_AUTOQUERY_SELECT', 4);
+
+/**
+ * MDB2_Extended: class which adds several high level methods to MDB2
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Extended extends MDB2_Module_Common
+{
+    // {{{ autoPrepare()
+
+    /**
+     * Generate an insert, update or delete query and call prepare() on it
+     *
+     * @param string table
+     * @param array the fields names
+     * @param int type of query to build
+     *                          MDB2_AUTOQUERY_INSERT
+     *                          MDB2_AUTOQUERY_UPDATE
+     *                          MDB2_AUTOQUERY_DELETE
+     *                          MDB2_AUTOQUERY_SELECT
+     * @param string (in case of update and delete queries, this string will be put after the sql WHERE statement)
+     * @param array that contains the types of the placeholders
+     * @param mixed array that contains the types of the columns in
+     *                        the result set or MDB2_PREPARE_RESULT, if set to
+     *                        MDB2_PREPARE_MANIP the query is handled as a manipulation query
+     *
+     * @return resource handle for the query
+     * @see buildManipSQL
+     * @access public
+     */
+    function autoPrepare($table, $table_fields, $mode = MDB2_AUTOQUERY_INSERT,
+        $where = false, $types = null, $result_types = MDB2_PREPARE_MANIP)
+    {
+        $query = $this->buildManipSQL($table, $table_fields, $mode, $where);
+        if (PEAR::isError($query)) {
+            return $query;
+        }
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        $lobs = array();
+        foreach ((array)$types as $param => $type) {
+            if (($type == 'clob') || ($type == 'blob')) {
+                $lobs[$param] = $table_fields[$param];
+            }
+        }
+        return $db->prepare($query, $types, $result_types, $lobs);
+    }
+
+    // }}}
+    // {{{ autoExecute()
+
+    /**
+     * Generate an insert, update or delete query and call prepare() and execute() on it
+     *
+     * @param string name of the table
+     * @param array assoc ($key=>$value) where $key is a field name and $value its value
+     * @param int type of query to build
+     *                          MDB2_AUTOQUERY_INSERT
+     *                          MDB2_AUTOQUERY_UPDATE
+     *                          MDB2_AUTOQUERY_DELETE
+     *                          MDB2_AUTOQUERY_SELECT
+     * @param string (in case of update and delete queries, this string will be put after the sql WHERE statement)
+     * @param array that contains the types of the placeholders
+     * @param string which specifies which result class to use
+     * @param mixed  array that contains the types of the columns in
+     *                        the result set or MDB2_PREPARE_RESULT, if set to
+     *                        MDB2_PREPARE_MANIP the query is handled as a manipulation query
+     *
+     * @return bool|MDB2_Error true on success, a MDB2 error on failure
+     * @see buildManipSQL
+     * @see autoPrepare
+     * @access public
+    */
+    function &autoExecute($table, $fields_values, $mode = MDB2_AUTOQUERY_INSERT,
+        $where = false, $types = null, $result_class = true, $result_types = MDB2_PREPARE_MANIP)
+    {
+        $fields_values = (array)$fields_values;
+        if ($mode == MDB2_AUTOQUERY_SELECT) {
+            if (is_array($result_types)) {
+                $keys = array_keys($result_types);
+            } elseif (!empty($fields_values)) {
+                $keys = $fields_values;
+            } else {
+                $keys = array();
+            }
+        } else {
+            $keys = array_keys($fields_values);
+        }
+        $params = array_values($fields_values);
+        if (empty($params)) {
+            $query = $this->buildManipSQL($table, $keys, $mode, $where);
+
+            $db =& $this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+            if ($mode == MDB2_AUTOQUERY_SELECT) {
+                $result =& $db->query($query, $result_types, $result_class);
+            } else {
+                $result = $db->exec($query);
+            }
+        } else {
+            $stmt = $this->autoPrepare($table, $keys, $mode, $where, $types, $result_types);
+            if (PEAR::isError($stmt)) {
+                return $stmt;
+            }
+            $result =& $stmt->execute($params, $result_class);
+            $stmt->free();
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ buildManipSQL()
+
+    /**
+     * Make automaticaly an sql query for prepare()
+     *
+     * Example : buildManipSQL('table_sql', array('field1', 'field2', 'field3'), MDB2_AUTOQUERY_INSERT)
+     *           will return the string : INSERT INTO table_sql (field1,field2,field3) VALUES (?,?,?)
+     * NB : - This belongs more to a SQL Builder class, but this is a simple facility
+     *      - Be carefull ! If you don't give a $where param with an UPDATE/DELETE query, all
+     *        the records of the table will be updated/deleted !
+     *
+     * @param string name of the table
+     * @param ordered array containing the fields names
+     * @param int type of query to build
+     *                          MDB2_AUTOQUERY_INSERT
+     *                          MDB2_AUTOQUERY_UPDATE
+     *                          MDB2_AUTOQUERY_DELETE
+     *                          MDB2_AUTOQUERY_SELECT
+     * @param string (in case of update and delete queries, this string will be put after the sql WHERE statement)
+     *
+     * @return string sql query for prepare()
+     * @access public
+     */
+    function buildManipSQL($table, $table_fields, $mode, $where = false)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if ($db->options['quote_identifier']) {
+            $table = $db->quoteIdentifier($table);
+        }
+
+        if (!empty($table_fields) && $db->options['quote_identifier']) {
+            foreach ($table_fields as $key => $field) {
+                $table_fields[$key] = $db->quoteIdentifier($field);
+            }
+        }
+
+        if ($where !== false && !is_null($where)) {
+            if (is_array($where)) {
+                $where = implode(' AND ', $where);
+            }
+            $where = ' WHERE '.$where;
+        }
+
+        switch ($mode) {
+        case MDB2_AUTOQUERY_INSERT:
+            if (empty($table_fields)) {
+                return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                'Insert requires table fields', __FUNCTION__);
+            }
+            $cols = implode(', ', $table_fields);
+            $values = '?'.str_repeat(', ?', (count($table_fields) - 1));
+            return 'INSERT INTO '.$table.' ('.$cols.') VALUES ('.$values.')';
+            break;
+        case MDB2_AUTOQUERY_UPDATE:
+            if (empty($table_fields)) {
+                return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                'Update requires table fields', __FUNCTION__);
+            }
+            $set = implode(' = ?, ', $table_fields).' = ?';
+            $sql = 'UPDATE '.$table.' SET '.$set.$where;
+            return $sql;
+            break;
+        case MDB2_AUTOQUERY_DELETE:
+            $sql = 'DELETE FROM '.$table.$where;
+            return $sql;
+            break;
+        case MDB2_AUTOQUERY_SELECT:
+            $cols = !empty($table_fields) ? implode(', ', $table_fields) : '*';
+            $sql = 'SELECT '.$cols.' FROM '.$table.$where;
+            return $sql;
+            break;
+        }
+        return $db->raiseError(MDB2_ERROR_SYNTAX, null, null,
+                'Non existant mode', __FUNCTION__);
+    }
+
+    // }}}
+    // {{{ limitQuery()
+
+    /**
+     * Generates a limited query
+     *
+     * @param string query
+     * @param array that contains the types of the columns in the result set
+     * @param integer the numbers of rows to fetch
+     * @param integer the row to start to fetching
+     * @param string which specifies which result class to use
+     * @param mixed   string which specifies which class to wrap results in
+     *
+     * @return MDB2_Result|MDB2_Error result set on success, a MDB2 error on failure
+     * @access public
+     */
+    function &limitQuery($query, $types, $limit, $offset = 0, $result_class = true,
+        $result_wrap_class = false)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $result = $db->setLimit($limit, $offset);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        $result =& $db->query($query, $types, $result_class, $result_wrap_class);
+        return $result;
+    }
+
+    // }}}
+    // {{{ execParam()
+
+    /**
+     * Execute a parameterized DML statement.
+     *
+     * @param string the SQL query
+     * @param array if supplied, prepare/execute will be used
+     *       with this array as execute parameters
+     * @param array that contains the types of the values defined in $params
+     *
+     * @return int|MDB2_Error affected rows on success, a MDB2 error on failure
+     * @access public
+     */
+    function execParam($query, $params = array(), $param_types = null)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        settype($params, 'array');
+        if (empty($params)) {
+            return $db->exec($query);
+        }
+
+        $stmt = $db->prepare($query, $param_types, MDB2_PREPARE_MANIP);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+
+        $result = $stmt->execute($params);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        $stmt->free();
+        return $result;
+    }
+
+    // }}}
+    // {{{ getOne()
+
+    /**
+     * Fetch the first column of the first row of data returned from a query.
+     * Takes care of doing the query and freeing the results when finished.
+     *
+     * @param string the SQL query
+     * @param string that contains the type of the column in the result set
+     * @param array if supplied, prepare/execute will be used
+     *       with this array as execute parameters
+     * @param array that contains the types of the values defined in $params
+     * @param int|string which column to return
+     *
+     * @return scalar|MDB2_Error data on success, a MDB2 error on failure
+     * @access public
+     */
+    function getOne($query, $type = null, $params = array(),
+        $param_types = null, $colnum = 0)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        settype($params, 'array');
+        settype($type, 'array');
+        if (empty($params)) {
+            return $db->queryOne($query, $type, $colnum);
+        }
+
+        $stmt = $db->prepare($query, $param_types, $type);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+
+        $result = $stmt->execute($params);
+        if (!MDB2::isResultCommon($result)) {
+            return $result;
+        }
+
+        $one = $result->fetchOne($colnum);
+        $stmt->free();
+        $result->free();
+        return $one;
+    }
+
+    // }}}
+    // {{{ getRow()
+
+    /**
+     * Fetch the first row of data returned from a query.  Takes care
+     * of doing the query and freeing the results when finished.
+     *
+     * @param string the SQL query
+     * @param array that contains the types of the columns in the result set
+     * @param array if supplied, prepare/execute will be used
+     *       with this array as execute parameters
+     * @param array that contains the types of the values defined in $params
+     * @param int the fetch mode to use
+     *
+     * @return array|MDB2_Error data on success, a MDB2 error on failure
+     * @access public
+     */
+    function getRow($query, $types = null, $params = array(),
+        $param_types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        settype($params, 'array');
+        if (empty($params)) {
+            return $db->queryRow($query, $types, $fetchmode);
+        }
+
+        $stmt = $db->prepare($query, $param_types, $types);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+
+        $result = $stmt->execute($params);
+        if (!MDB2::isResultCommon($result)) {
+            return $result;
+        }
+
+        $row = $result->fetchRow($fetchmode);
+        $stmt->free();
+        $result->free();
+        return $row;
+    }
+
+    // }}}
+    // {{{ getCol()
+
+    /**
+     * Fetch a single column from a result set and return it as an
+     * indexed array.
+     *
+     * @param string the SQL query
+     * @param string that contains the type of the column in the result set
+     * @param array if supplied, prepare/execute will be used
+     *       with this array as execute parameters
+     * @param array that contains the types of the values defined in $params
+     * @param int|string which column to return
+     *
+     * @return array|MDB2_Error data on success, a MDB2 error on failure
+     * @access public
+     */
+    function getCol($query, $type = null, $params = array(),
+        $param_types = null, $colnum = 0)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        settype($params, 'array');
+        settype($type, 'array');
+        if (empty($params)) {
+            return $db->queryCol($query, $type, $colnum);
+        }
+
+        $stmt = $db->prepare($query, $param_types, $type);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+
+        $result = $stmt->execute($params);
+        if (!MDB2::isResultCommon($result)) {
+            return $result;
+        }
+
+        $col = $result->fetchCol($colnum);
+        $stmt->free();
+        $result->free();
+        return $col;
+    }
+
+    // }}}
+    // {{{ getAll()
+
+    /**
+     * Fetch all the rows returned from a query.
+     *
+     * @param string the SQL query
+     * @param array that contains the types of the columns in the result set
+     * @param array if supplied, prepare/execute will be used
+     *       with this array as execute parameters
+     * @param array that contains the types of the values defined in $params
+     * @param int the fetch mode to use
+     * @param bool if set to true, the $all will have the first
+     *       column as its first dimension
+     * @param bool $force_array used only when the query returns exactly
+     *       two columns. If true, the values of the returned array will be
+     *       one-element arrays instead of scalars.
+     * @param bool $group if true, the values of the returned array is
+     *       wrapped in another array.  If the same key value (in the first
+     *       column) repeats itself, the values will be appended to this array
+     *       instead of overwriting the existing values.
+     *
+     * @return array|MDB2_Error data on success, a MDB2 error on failure
+     * @access public
+     */
+    function getAll($query, $types = null, $params = array(),
+        $param_types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT,
+        $rekey = false, $force_array = false, $group = false)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        settype($params, 'array');
+        if (empty($params)) {
+            return $db->queryAll($query, $types, $fetchmode, $rekey, $force_array, $group);
+        }
+
+        $stmt = $db->prepare($query, $param_types, $types);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+
+        $result = $stmt->execute($params);
+        if (!MDB2::isResultCommon($result)) {
+            return $result;
+        }
+
+        $all = $result->fetchAll($fetchmode, $rekey, $force_array, $group);
+        $stmt->free();
+        $result->free();
+        return $all;
+    }
+
+    // }}}
+    // {{{ getAssoc()
+
+    /**
+     * Fetch the entire result set of a query and return it as an
+     * associative array using the first column as the key.
+     *
+     * If the result set contains more than two columns, the value
+     * will be an array of the values from column 2-n.  If the result
+     * set contains only two columns, the returned value will be a
+     * scalar with the value of the second column (unless forced to an
+     * array with the $force_array parameter).  A MDB2 error code is
+     * returned on errors.  If the result set contains fewer than two
+     * columns, a MDB2_ERROR_TRUNCATED error is returned.
+     *
+     * For example, if the table 'mytable' contains:
+     * <pre>
+     *   ID      TEXT       DATE
+     * --------------------------------
+     *   1       'one'      944679408
+     *   2       'two'      944679408
+     *   3       'three'    944679408
+     * </pre>
+     * Then the call getAssoc('SELECT id,text FROM mytable') returns:
+     * <pre>
+     *    array(
+     *      '1' => 'one',
+     *      '2' => 'two',
+     *      '3' => 'three',
+     *    )
+     * </pre>
+     * ...while the call getAssoc('SELECT id,text,date FROM mytable') returns:
+     * <pre>
+     *    array(
+     *      '1' => array('one', '944679408'),
+     *      '2' => array('two', '944679408'),
+     *      '3' => array('three', '944679408')
+     *    )
+     * </pre>
+     *
+     * If the more than one row occurs with the same value in the
+     * first column, the last row overwrites all previous ones by
+     * default.  Use the $group parameter if you don't want to
+     * overwrite like this.  Example:
+     * <pre>
+     * getAssoc('SELECT category,id,name FROM mytable', null, null
+     *           MDB2_FETCHMODE_ASSOC, false, true) returns:
+     *    array(
+     *      '1' => array(array('id' => '4', 'name' => 'number four'),
+     *                   array('id' => '6', 'name' => 'number six')
+     *             ),
+     *      '9' => array(array('id' => '4', 'name' => 'number four'),
+     *                   array('id' => '6', 'name' => 'number six')
+     *             )
+     *    )
+     * </pre>
+     *
+     * Keep in mind that database functions in PHP usually return string
+     * values for results regardless of the database's internal type.
+     *
+     * @param string the SQL query
+     * @param array that contains the types of the columns in the result set
+     * @param array if supplied, prepare/execute will be used
+     *       with this array as execute parameters
+     * @param array that contains the types of the values defined in $params
+     * @param bool $force_array used only when the query returns
+     * exactly two columns.  If TRUE, the values of the returned array
+     * will be one-element arrays instead of scalars.
+     * @param bool $group if TRUE, the values of the returned array
+     *       is wrapped in another array.  If the same key value (in the first
+     *       column) repeats itself, the values will be appended to this array
+     *       instead of overwriting the existing values.
+     *
+     * @return array|MDB2_Error data on success, a MDB2 error on failure
+     * @access public
+     */
+    function getAssoc($query, $types = null, $params = array(), $param_types = null,
+        $fetchmode = MDB2_FETCHMODE_DEFAULT, $force_array = false, $group = false)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        settype($params, 'array');
+        if (empty($params)) {
+            return $db->queryAll($query, $types, $fetchmode, true, $force_array, $group);
+        }
+
+        $stmt = $db->prepare($query, $param_types, $types);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+
+        $result = $stmt->execute($params);
+        if (!MDB2::isResultCommon($result)) {
+            return $result;
+        }
+
+        $all = $result->fetchAll($fetchmode, true, $force_array, $group);
+        $stmt->free();
+        $result->free();
+        return $all;
+    }
+
+    // }}}
+    // {{{ executeMultiple()
+
+    /**
+     * This function does several execute() calls on the same statement handle.
+     * $params must be an array indexed numerically from 0, one execute call is
+     * done for every 'row' in the array.
+     *
+     * If an error occurs during execute(), executeMultiple() does not execute
+     * the unfinished rows, but rather returns that error.
+     *
+     * @param resource query handle from prepare()
+     * @param array numeric array containing the data to insert into the query
+     *
+     * @return bool|MDB2_Error true on success, a MDB2 error on failure
+     * @access public
+     * @see prepare(), execute()
+     */
+    function executeMultiple(&$stmt, $params = null)
+    {
+        for ($i = 0, $j = count($params); $i < $j; $i++) {
+            $result = $stmt->execute($params[$i]);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ getBeforeID()
+
+    /**
+     * Returns the next free id of a sequence if the RDBMS
+     * does not support auto increment
+     *
+     * @param string name of the table into which a new row was inserted
+     * @param string name of the field into which a new row was inserted
+     * @param bool when true the sequence is automatic created, if it not exists
+     * @param bool if the returned value should be quoted
+     *
+     * @return int|MDB2_Error id on success, a MDB2 error on failure
+     * @access public
+     */
+    function getBeforeID($table, $field = null, $ondemand = true, $quote = true)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if ($db->supports('auto_increment') !== true) {
+            $seq = $table.(empty($field) ? '' : '_'.$field);
+            $id = $db->nextID($seq, $ondemand);
+            if (!$quote || PEAR::isError($id)) {
+                return $id;
+            }
+            return $db->quote($id, 'integer');
+        } elseif (!$quote) {
+            return null;
+        }
+        return 'NULL';
+    }
+
+    // }}}
+    // {{{ getAfterID()
+
+    /**
+     * Returns the autoincrement ID if supported or $id
+     *
+     * @param mixed value as returned by getBeforeId()
+     * @param string name of the table into which a new row was inserted
+     * @param string name of the field into which a new row was inserted
+     *
+     * @return int|MDB2_Error id on success, a MDB2 error on failure
+     * @access public
+     */
+    function getAfterID($id, $table, $field = null)
+    {
+        $db =& $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if ($db->supports('auto_increment') !== true) {
+            return $id;
+        }
+        return $db->lastInsertID($table, $field);
+    }
+
+    // }}}
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Iterator.php b/3rdparty/MDB2/Iterator.php
new file mode 100644
index 00000000000..ca5e7b69c27
--- /dev/null
+++ b/3rdparty/MDB2/Iterator.php
@@ -0,0 +1,259 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: Iterator.php,v 1.22 2006/05/06 14:03:41 lsmith Exp $
+
+/**
+ * PHP5 Iterator
+ *
+ * @package  MDB2
+ * @category Database
+ * @author   Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Iterator implements Iterator
+{
+    protected $fetchmode;
+    protected $result;
+    protected $row;
+
+    // {{{ constructor
+
+    /**
+     * Constructor
+     */
+    public function __construct($result, $fetchmode = MDB2_FETCHMODE_DEFAULT)
+    {
+        $this->result = $result;
+        $this->fetchmode = $fetchmode;
+    }
+    // }}}
+
+    // {{{ seek()
+
+    /**
+     * Seek forward to a specific row in a result set
+     *
+     * @param int number of the row where the data can be found
+     *
+     * @return void
+     * @access public
+     */
+    public function seek($rownum)
+    {
+        $this->row = null;
+        if ($this->result) {
+            $this->result->seek($rownum);
+        }
+    }
+    // }}}
+
+    // {{{ next()
+
+    /**
+     * Fetch next row of data
+     *
+     * @return void
+     * @access public
+     */
+    public function next()
+    {
+        $this->row = null;
+    }
+    // }}}
+
+    // {{{ current()
+
+    /**
+     * return a row of data
+     *
+     * @return void
+     * @access public
+     */
+    public function current()
+    {
+        if (is_null($this->row)) {
+            $row = $this->result->fetchRow($this->fetchmode);
+            if (PEAR::isError($row)) {
+                $row = false;
+            }
+            $this->row = $row;
+        }
+        return $this->row;
+    }
+    // }}}
+
+    // {{{ valid()
+
+    /**
+     * Check if the end of the result set has been reached
+     *
+     * @return bool true/false, false is also returned on failure
+     * @access public
+     */
+    public function valid()
+    {
+        return (bool)$this->current();
+    }
+    // }}}
+
+    // {{{ free()
+
+    /**
+     * Free the internal resources associated with result.
+     *
+     * @return bool|MDB2_Error true on success, false|MDB2_Error if result is invalid
+     * @access public
+     */
+    public function free()
+    {
+        if ($this->result) {
+            return $this->result->free();
+        }
+        $this->result = false;
+        $this->row = null;
+        return false;
+    }
+    // }}}
+
+    // {{{ key()
+
+    /**
+     * Returns the row number
+     *
+     * @return int|bool|MDB2_Error true on success, false|MDB2_Error if result is invalid
+     * @access public
+     */
+    public function key()
+    {
+        if ($this->result) {
+            return $this->result->rowCount();
+        }
+        return false;
+    }
+    // }}}
+
+    // {{{ rewind()
+
+    /**
+     * Seek to the first row in a result set
+     *
+     * @return void
+     * @access public
+     */
+    public function rewind()
+    {
+    }
+    // }}}
+
+    // {{{ destructor
+
+    /**
+     * Destructor
+     */
+    public function __destruct()
+    {
+        $this->free();
+    }
+    // }}}
+}
+
+/**
+ * PHP5 buffered Iterator
+ *
+ * @package  MDB2
+ * @category Database
+ * @author   Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_BufferedIterator extends MDB2_Iterator implements SeekableIterator
+{
+    // {{{ valid()
+
+    /**
+     * Check if the end of the result set has been reached
+     *
+     * @return bool|MDB2_Error true on success, false|MDB2_Error if result is invalid
+     * @access public
+     */
+    public function valid()
+    {
+        if ($this->result) {
+            return $this->result->valid();
+        }
+        return false;
+    }
+    // }}}
+
+    // {{{count()
+
+    /**
+     * Returns the number of rows in a result object
+     *
+     * @return int|MDB2_Error number of rows, false|MDB2_Error if result is invalid
+     * @access public
+     */
+    public function count()
+    {
+        if ($this->result) {
+            return $this->result->numRows();
+        }
+        return false;
+    }
+    // }}}
+
+    // {{{ rewind()
+
+    /**
+     * Seek to the first row in a result set
+     *
+     * @return void
+     * @access public
+     */
+    public function rewind()
+    {
+        $this->seek(0);
+    }
+    // }}}
+}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/LOB.php b/3rdparty/MDB2/LOB.php
new file mode 100644
index 00000000000..ae67224020e
--- /dev/null
+++ b/3rdparty/MDB2/LOB.php
@@ -0,0 +1,264 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: LOB.php,v 1.34 2006/10/25 11:52:21 lsmith Exp $
+
+/**
+ * @package  MDB2
+ * @category Database
+ * @author   Lukas Smith <smith@pooteeweet.org>
+ */
+
+require_once('MDB2.php');
+
+/**
+ * MDB2_LOB: user land stream wrapper implementation for LOB support
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_LOB
+{
+    /**
+     * contains the key to the global MDB2 instance array of the associated
+     * MDB2 instance
+     *
+     * @var integer
+     * @access protected
+     */
+    var $db_index;
+
+    /**
+     * contains the key to the global MDB2_LOB instance array of the associated
+     * MDB2_LOB instance
+     *
+     * @var integer
+     * @access protected
+     */
+    var $lob_index;
+
+    // {{{ stream_open()
+
+    /**
+     * open stream
+     *
+     * @param string specifies the URL that was passed to fopen()
+     * @param string the mode used to open the file
+     * @param int holds additional flags set by the streams API
+     * @param string not used
+     *
+     * @return bool
+     * @access public
+     */
+    function stream_open($path, $mode, $options, &$opened_path)
+    {
+        if (!preg_match('/^rb?\+?$/', $mode)) {
+            return false;
+        }
+        $url = parse_url($path);
+        if (empty($url['host'])) {
+            return false;
+        }
+        $this->db_index = (int)$url['host'];
+        if (!isset($GLOBALS['_MDB2_databases'][$this->db_index])) {
+            return false;
+        }
+        $db =& $GLOBALS['_MDB2_databases'][$this->db_index];
+        $this->lob_index = (int)$url['user'];
+        if (!isset($db->datatype->lobs[$this->lob_index])) {
+            return false;
+        }
+        return true;
+    }
+    // }}}
+
+    // {{{ stream_read()
+
+    /**
+     * read stream
+     *
+     * @param int number of bytes to read
+     *
+     * @return string
+     * @access public
+     */
+    function stream_read($count)
+    {
+        if (isset($GLOBALS['_MDB2_databases'][$this->db_index])) {
+            $db =& $GLOBALS['_MDB2_databases'][$this->db_index];
+            $db->datatype->_retrieveLOB($db->datatype->lobs[$this->lob_index]);
+
+            $data = $db->datatype->_readLOB($db->datatype->lobs[$this->lob_index], $count);
+            $length = strlen($data);
+            if ($length == 0) {
+                $db->datatype->lobs[$this->lob_index]['endOfLOB'] = true;
+            }
+            $db->datatype->lobs[$this->lob_index]['position'] += $length;
+            return $data;
+        }
+    }
+    // }}}
+
+    // {{{ stream_write()
+
+    /**
+     * write stream, note implemented
+     *
+     * @param string data
+     *
+     * @return int
+     * @access public
+     */
+    function stream_write($data)
+    {
+        return 0;
+    }
+    // }}}
+
+    // {{{ stream_tell()
+
+    /**
+     * return the current position
+     *
+     * @return int current position
+     * @access public
+     */
+    function stream_tell()
+    {
+        if (isset($GLOBALS['_MDB2_databases'][$this->db_index])) {
+            $db =& $GLOBALS['_MDB2_databases'][$this->db_index];
+            return $db->datatype->lobs[$this->lob_index]['position'];
+        }
+    }
+    // }}}
+
+    // {{{ stream_eof()
+
+    /**
+     * Check if stream reaches EOF
+     *
+     * @return bool
+     * @access public
+     */
+    function stream_eof()
+    {
+        if (!isset($GLOBALS['_MDB2_databases'][$this->db_index])) {
+            return true;
+        }
+
+        $db =& $GLOBALS['_MDB2_databases'][$this->db_index];
+        $result = $db->datatype->_endOfLOB($db->datatype->lobs[$this->lob_index]);
+        if (version_compare(phpversion(), "5.0", ">=")
+            && version_compare(phpversion(), "5.1", "<")
+        ) {
+            return !$result;
+        }
+        return $result;
+    }
+    // }}}
+
+    // {{{ stream_seek()
+
+    /**
+     * Seek stream, not implemented
+     *
+     * @param int offset
+     * @param int whence
+     *
+     * @return bool
+     * @access public
+     */
+    function stream_seek($offset, $whence)
+    {
+        return false;
+    }
+    // }}}
+
+    // {{{ stream_stat()
+
+    /**
+     * return information about stream
+     *
+     * @access public
+     */
+    function stream_stat()
+    {
+        if (isset($GLOBALS['_MDB2_databases'][$this->db_index])) {
+            $db =& $GLOBALS['_MDB2_databases'][$this->db_index];
+            return array(
+              'db_index' => $this->db_index,
+              'lob_index' => $this->lob_index,
+            );
+        }
+    }
+    // }}}
+
+    // {{{ stream_close()
+
+    /**
+     * close stream
+     *
+     * @access public
+     */
+    function stream_close()
+    {
+        if (isset($GLOBALS['_MDB2_databases'][$this->db_index])) {
+            $db =& $GLOBALS['_MDB2_databases'][$this->db_index];
+            if (isset($db->datatype->lobs[$this->lob_index])) {
+                $db->datatype->_destroyLOB($db->datatype->lobs[$this->lob_index]);
+                unset($db->datatype->lobs[$this->lob_index]);
+            }
+        }
+    }
+    // }}}
+}
+
+// register streams wrapper
+if (!stream_wrapper_register("MDB2LOB", "MDB2_LOB")) {
+    MDB2::raiseError();
+    return false;
+}
+
+?>
diff --git a/3rdparty/MDB2/Schema.php b/3rdparty/MDB2/Schema.php
new file mode 100644
index 00000000000..25818460a62
--- /dev/null
+++ b/3rdparty/MDB2/Schema.php
@@ -0,0 +1,2763 @@
+<?php
+/**
+ * PHP version 4, 5
+ *
+ * Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,
+ * Stig. S. Bakken, Lukas Smith, Igor Feghali
+ * All rights reserved.
+ *
+ * MDB2_Schema enables users to maintain RDBMS independant schema files
+ * in XML that can be used to manipulate both data and database schemas
+ * This LICENSE is in the BSD license style.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,
+ * Lukas Smith, Igor Feghali nor the names of his contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Author: Lukas Smith <smith@pooteeweet.org>
+ * Author: Igor Feghali <ifeghali@php.net>
+ *
+ * @category Database
+ * @package  MDB2_Schema
+ * @author   Lukas Smith <smith@pooteeweet.org>
+ * @author   Igor Feghali <ifeghali@php.net>
+ * @license  BSD http://www.opensource.org/licenses/bsd-license.php
+ * @version  CVS: $Id: Schema.php,v 1.132 2009/02/22 21:43:22 ifeghali Exp $
+ * @link     http://pear.php.net/packages/MDB2_Schema
+ */
+
+// require_once('MDB2.php');
+
+define('MDB2_SCHEMA_DUMP_ALL',       0);
+define('MDB2_SCHEMA_DUMP_STRUCTURE', 1);
+define('MDB2_SCHEMA_DUMP_CONTENT',   2);
+
+/**
+ * If you add an error code here, make sure you also add a textual
+ * version of it in MDB2_Schema::errorMessage().
+ */
+
+define('MDB2_SCHEMA_ERROR',             -1);
+define('MDB2_SCHEMA_ERROR_PARSE',       -2);
+define('MDB2_SCHEMA_ERROR_VALIDATE',    -3);
+define('MDB2_SCHEMA_ERROR_UNSUPPORTED', -4);    // Driver does not support this function
+define('MDB2_SCHEMA_ERROR_INVALID',     -5);    // Invalid attribute value
+define('MDB2_SCHEMA_ERROR_WRITER',      -6);
+
+/**
+ * The database manager is a class that provides a set of database
+ * management services like installing, altering and dumping the data
+ * structures of databases.
+ *
+ * @category Database
+ * @package  MDB2_Schema
+ * @author   Lukas Smith <smith@pooteeweet.org>
+ * @license  BSD http://www.opensource.org/licenses/bsd-license.php
+ * @link     http://pear.php.net/packages/MDB2_Schema
+ */
+class MDB2_Schema extends PEAR
+{
+    // {{{ properties
+
+    var $db;
+
+    var $warnings = array();
+
+    var $options = array(
+        'fail_on_invalid_names' => true,
+        'dtd_file'              => false,
+        'valid_types'           => array(),
+        'force_defaults'        => true,
+        'parser'                => 'MDB2_Schema_Parser',
+        'writer'                => 'MDB2_Schema_Writer',
+        'validate'              => 'MDB2_Schema_Validate',
+        'drop_missing_tables'   => false
+    );
+
+    // }}}
+    // {{{ apiVersion()
+
+    /**
+     * Return the MDB2 API version
+     *
+     * @return string  the MDB2 API version number
+     * @access public
+     */
+    function apiVersion()
+    {
+        return '0.4.3';
+    }
+
+    // }}}
+    // {{{ arrayMergeClobber()
+
+    /**
+     * Clobbers two arrays together
+     *
+     * @param array $a1 array that should be clobbered
+     * @param array $a2 array that should be clobbered
+     *
+     * @return array|false  array on success and false on error
+     *
+     * @access public
+     * @author kc@hireability.com
+     */
+    function arrayMergeClobber($a1, $a2)
+    {
+        if (!is_array($a1) || !is_array($a2)) {
+            return false;
+        }
+        foreach ($a2 as $key => $val) {
+            if (is_array($val) && array_key_exists($key, $a1) && is_array($a1[$key])) {
+                $a1[$key] = MDB2_Schema::arrayMergeClobber($a1[$key], $val);
+            } else {
+                $a1[$key] = $val;
+            }
+        }
+        return $a1;
+    }
+
+    // }}}
+    // {{{ resetWarnings()
+
+    /**
+     * reset the warning array
+     *
+     * @access public
+     * @return void
+     */
+    function resetWarnings()
+    {
+        $this->warnings = array();
+    }
+
+    // }}}
+    // {{{ getWarnings()
+
+    /**
+     * Get all warnings in reverse order
+     *
+     * This means that the last warning is the first element in the array
+     *
+     * @return array with warnings
+     * @access public
+     * @see resetWarnings()
+     */
+    function getWarnings()
+    {
+        return array_reverse($this->warnings);
+    }
+
+    // }}}
+    // {{{ setOption()
+
+    /**
+     * Sets the option for the db class
+     *
+     * @param string $option option name
+     * @param mixed  $value  value for the option
+     *
+     * @return bool|MDB2_Error MDB2_OK or error object
+     * @access public
+     */
+    function setOption($option, $value)
+    {
+        if (isset($this->options[$option])) {
+            if (is_null($value)) {
+                return $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
+                    'may not set an option to value null');
+            }
+            $this->options[$option] = $value;
+            return MDB2_OK;
+        }
+        return $this->raiseError(MDB2_SCHEMA_ERROR_UNSUPPORTED, null, null,
+            "unknown option $option");
+    }
+
+    // }}}
+    // {{{ getOption()
+
+    /**
+     * returns the value of an option
+     *
+     * @param string $option option name
+     *
+     * @return mixed the option value or error object
+     * @access public
+     */
+    function getOption($option)
+    {
+        if (isset($this->options[$option])) {
+            return $this->options[$option];
+        }
+        return $this->raiseError(MDB2_SCHEMA_ERROR_UNSUPPORTED,
+            null, null, "unknown option $option");
+    }
+
+    // }}}
+    // {{{ factory()
+
+    /**
+     * Create a new MDB2 object for the specified database type
+     * type
+     *
+     * @param string|array|MDB2_Driver_Common &$db     'data source name', see the
+     *                                                 MDB2::parseDSN method for a description of the dsn format.
+     *                                                 Can also be specified as an array of the
+     *                                                 format returned by @see MDB2::parseDSN.
+     *                                                 Finally you can also pass an existing db object to be used.
+     * @param array                           $options An associative array of option names and their values.
+     *
+     * @return bool|MDB2_Error MDB2_OK or error object
+     * @access public
+     * @see     MDB2::parseDSN
+     */
+    static function factory(&$db, $options = array())
+    {
+        $obj =new MDB2_Schema();
+        $result = $obj->connect($db, $options);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        return $obj;
+    }
+
+    // }}}
+    // {{{ connect()
+
+    /**
+     * Create a new MDB2 connection object and connect to the specified
+     * database
+     *
+     * @param string|array|MDB2_Driver_Common &$db     'data source name', see the
+     *              MDB2::parseDSN method for a description of the dsn format.
+     *              Can also be specified as an array of the
+     *              format returned by MDB2::parseDSN.
+     *              Finally you can also pass an existing db object to be used.
+     * @param array                           $options An associative array of option names and their values.
+     *
+     * @return bool|MDB2_Error MDB2_OK or error object
+     * @access public
+     * @see    MDB2::parseDSN
+     */
+    function connect(&$db, $options = array())
+    {
+        $db_options = array();
+        if (is_array($options)) {
+            foreach ($options as $option => $value) {
+                if (array_key_exists($option, $this->options)) {
+                    $result = $this->setOption($option, $value);
+                    if (PEAR::isError($result)) {
+                        return $result;
+                    }
+                } else {
+                    $db_options[$option] = $value;
+                }
+            }
+        }
+        $this->disconnect();
+        if (!MDB2::isConnection($db)) {
+            $db =MDB2::factory($db, $db_options);
+        }
+
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        $this->db =& $db;
+        $this->db->loadModule('Datatype');
+        $this->db->loadModule('Manager');
+        $this->db->loadModule('Reverse');
+        $this->db->loadModule('Function');
+        if (empty($this->options['valid_types'])) {
+            $this->options['valid_types'] = $this->db->datatype->getValidTypes();
+        }
+
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ disconnect()
+
+    /**
+     * Log out and disconnect from the database.
+     *
+     * @access public
+     * @return void
+     */
+    function disconnect()
+    {
+        if (MDB2::isConnection($this->db)) {
+            $this->db->disconnect();
+            unset($this->db);
+        }
+    }
+
+    // }}}
+    // {{{ parseDatabaseDefinition()
+
+    /**
+     * Parse a database definition from a file or an array
+     *
+     * @param string|array $schema                the database schema array or file name
+     * @param bool         $skip_unreadable       if non readable files should be skipped
+     * @param array        $variables             associative array that the defines the text string values
+     *                                            that are meant to be used to replace the variables that are
+     *                                            used in the schema description.
+     * @param bool         $fail_on_invalid_names make function fail on invalid names
+     * @param array        $structure             database structure definition
+     *
+     * @access public
+     * @return array
+     */
+    function parseDatabaseDefinition($schema, $skip_unreadable = false, $variables = array(),
+        $fail_on_invalid_names = true, $structure = false)
+    {
+        $database_definition = false;
+        if (is_string($schema)) {
+            // if $schema is not readable then we just skip it
+            // and simply copy the $current_schema file to that file name
+            if (is_readable($schema)) {
+                $database_definition = $this->parseDatabaseDefinitionFile($schema, $variables, $fail_on_invalid_names, $structure);
+            }
+        } elseif (is_array($schema)) {
+            $database_definition = $schema;
+        }
+        if (!$database_definition && !$skip_unreadable) {
+            $database_definition = $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
+                'invalid data type of schema or unreadable data source');
+        }
+        return $database_definition;
+    }
+
+    // }}}
+    // {{{ parseDatabaseDefinitionFile()
+
+    /**
+     * Parse a database definition file by creating a schema format
+     * parser object and passing the file contents as parser input data stream.
+     *
+     * @param string $input_file            the database schema file.
+     * @param array  $variables             associative array that the defines the text string values
+     *                                      that are meant to be used to replace the variables that are
+     *                                      used in the schema description.
+     * @param bool   $fail_on_invalid_names make function fail on invalid names
+     * @param array  $structure             database structure definition
+     *
+     * @access public
+     * @return array
+     */
+    function parseDatabaseDefinitionFile($input_file, $variables = array(),
+        $fail_on_invalid_names = true, $structure = false)
+    {
+        $dtd_file = $this->options['dtd_file'];
+        if ($dtd_file) {
+            include_once 'XML/DTD/XmlValidator.php';
+            $dtd =new XML_DTD_XmlValidator;
+            if (!$dtd->isValid($dtd_file, $input_file)) {
+                return $this->raiseError(MDB2_SCHEMA_ERROR_PARSE, null, null, $dtd->getMessage());
+            }
+        }
+
+        $class_name = $this->options['parser'];
+
+        $result = MDB2::loadClass($class_name, $this->db->getOption('debug'));
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        $parser =new $class_name($variables, $fail_on_invalid_names, $structure, $this->options['valid_types'], $this->options['force_defaults']);
+        $result = $parser->setInputFile($input_file);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        $result = $parser->parse();
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if (PEAR::isError($parser->error)) {
+            return $parser->error;
+        }
+
+        return $parser->database_definition;
+    }
+
+    // }}}
+    // {{{ getDefinitionFromDatabase()
+
+    /**
+     * Attempt to reverse engineer a schema structure from an existing MDB2
+     * This method can be used if no xml schema file exists yet.
+     * The resulting xml schema file may need some manual adjustments.
+     *
+     * @return array|MDB2_Error array with definition or error object
+     * @access public
+     */
+    function getDefinitionFromDatabase()
+    {
+        $database = $this->db->database_name;
+        if (empty($database)) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
+                'it was not specified a valid database name');
+        }
+        $class_name = $this->options['validate'];
+
+        $result = MDB2::loadClass($class_name, $this->db->getOption('debug'));
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        $val =new $class_name($this->options['fail_on_invalid_names'], $this->options['valid_types'], $this->options['force_defaults']);
+
+        $database_definition = array(
+            'name' => $database,
+            'create' => true,
+            'overwrite' => false,
+            'charset' => 'utf8',
+            'description' => '',
+            'comments' => '',
+            'tables' => array(),
+            'sequences' => array(),
+        );
+
+        $tables = $this->db->manager->listTables();
+        if (PEAR::isError($tables)) {
+            return $tables;
+        }
+
+        foreach ($tables as $table_name) {
+            $fields = $this->db->manager->listTableFields($table_name);
+            if (PEAR::isError($fields)) {
+                return $fields;
+            }
+
+            $database_definition['tables'][$table_name] = array(
+                'was' => '',
+                'description' => '',
+                'comments' => '',
+                'fields' => array(),
+                'indexes' => array(),
+                'constraints' => array(),
+                'initialization' => array()
+            );
+
+            $table_definition =& $database_definition['tables'][$table_name];
+            foreach ($fields as $field_name) {
+                $definition = $this->db->reverse->getTableFieldDefinition($table_name, $field_name);
+                if (PEAR::isError($definition)) {
+                    return $definition;
+                }
+
+                if (!empty($definition[0]['autoincrement'])) {
+                    $definition[0]['default'] = '0';
+                }
+
+                $table_definition['fields'][$field_name] = $definition[0];
+
+                $field_choices = count($definition);
+                if ($field_choices > 1) {
+                    $warning = "There are $field_choices type choices in the table $table_name field $field_name (#1 is the default): ";
+
+                    $field_choice_cnt = 1;
+
+                    $table_definition['fields'][$field_name]['choices'] = array();
+                    foreach ($definition as $field_choice) {
+                        $table_definition['fields'][$field_name]['choices'][] = $field_choice;
+
+                        $warning .= 'choice #'.($field_choice_cnt).': '.serialize($field_choice);
+                        $field_choice_cnt++;
+                    }
+                    $this->warnings[] = $warning;
+                }
+
+                /**
+                 * The first parameter is used to verify if there are duplicated
+                 * fields which we can guarantee that won't happen when reverse engineering
+                 */
+                $result = $val->validateField(array(), $table_definition['fields'][$field_name], $field_name);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+
+            $keys = array();
+
+            $indexes = $this->db->manager->listTableIndexes($table_name);
+            if (PEAR::isError($indexes)) {
+                return $indexes;
+            }
+
+            if (is_array($indexes)) {
+                foreach ($indexes as $index_name) {
+                    $this->db->expectError(MDB2_ERROR_NOT_FOUND);
+                    $definition = $this->db->reverse->getTableIndexDefinition($table_name, $index_name);
+                    $this->db->popExpect();
+                    if (PEAR::isError($definition)) {
+                        if (PEAR::isError($definition, MDB2_ERROR_NOT_FOUND)) {
+                            continue;
+                        }
+                        return $definition;
+                    }
+
+                    $keys[$index_name] = $definition;
+                }
+            }
+
+            $constraints = $this->db->manager->listTableConstraints($table_name);
+            if (PEAR::isError($constraints)) {
+                return $constraints;
+            }
+
+            if (is_array($constraints)) {
+                foreach ($constraints as $constraint_name) {
+                    $this->db->expectError(MDB2_ERROR_NOT_FOUND);
+                    $definition = $this->db->reverse->getTableConstraintDefinition($table_name, $constraint_name);
+                    $this->db->popExpect();
+                    if (PEAR::isError($definition)) {
+                        if (PEAR::isError($definition, MDB2_ERROR_NOT_FOUND)) {
+                            continue;
+                        }
+                        return $definition;
+                    }
+
+                    $keys[$constraint_name] = $definition;
+                }
+            }
+
+            foreach ($keys as $key_name => $definition) {
+                if (array_key_exists('foreign', $definition)
+                    && $definition['foreign']
+                ) {
+                    /**
+                     * The first parameter is used to verify if there are duplicated
+                     * foreign keys which we can guarantee that won't happen when reverse engineering
+                     */
+                    $result = $val->validateConstraint(array(), $definition, $key_name);
+                    if (PEAR::isError($result)) {
+                        return $result;
+                    }
+
+                    foreach ($definition['fields'] as $field_name => $field) {
+                        /**
+                         * The first parameter is used to verify if there are duplicated
+                         * referencing fields which we can guarantee that won't happen when reverse engineering
+                         */
+                        $result = $val->validateConstraintField(array(), $field_name);
+                        if (PEAR::isError($result)) {
+                            return $result;
+                        }
+
+                        $definition['fields'][$field_name] = '';
+                    }
+
+                    foreach ($definition['references']['fields'] as $field_name => $field) {
+                        /**
+                         * The first parameter is used to verify if there are duplicated
+                         * referenced fields which we can guarantee that won't happen when reverse engineering
+                         */
+                        $result = $val->validateConstraintReferencedField(array(), $field_name);
+                        if (PEAR::isError($result)) {
+                            return $result;
+                        }
+
+                        $definition['references']['fields'][$field_name] = '';
+                    }
+
+                    $table_definition['constraints'][$key_name] = $definition;
+                } else {
+                    /**
+                     * The first parameter is used to verify if there are duplicated
+                     * indices which we can guarantee that won't happen when reverse engineering
+                     */
+                    $result = $val->validateIndex(array(), $definition, $key_name);
+                    if (PEAR::isError($result)) {
+                        return $result;
+                    }
+
+                    foreach ($definition['fields'] as $field_name => $field) {
+                        /**
+                         * The first parameter is used to verify if there are duplicated
+                         * index fields which we can guarantee that won't happen when reverse engineering
+                         */
+                        $result = $val->validateIndexField(array(), $field, $field_name);
+                        if (PEAR::isError($result)) {
+                            return $result;
+                        }
+
+                        $definition['fields'][$field_name] = $field;
+                    }
+
+                    $table_definition['indexes'][$key_name] = $definition;
+                }
+            }
+
+            /**
+             * The first parameter is used to verify if there are duplicated
+             * tables which we can guarantee that won't happen when reverse engineering
+             */
+            $result = $val->validateTable(array(), $table_definition, $table_name);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+
+        }
+
+        $sequences = $this->db->manager->listSequences();
+        if (PEAR::isError($sequences)) {
+            return $sequences;
+        }
+
+        if (is_array($sequences)) {
+            foreach ($sequences as $sequence_name) {
+                $definition = $this->db->reverse->getSequenceDefinition($sequence_name);
+                if (PEAR::isError($definition)) {
+                    return $definition;
+                }
+                if (isset($database_definition['tables'][$sequence_name])
+                    && isset($database_definition['tables'][$sequence_name]['indexes'])
+                ) {
+                    foreach ($database_definition['tables'][$sequence_name]['indexes'] as $index) {
+                        if (isset($index['primary']) && $index['primary']
+                            && count($index['fields'] == 1)
+                        ) {
+                            $definition['on'] = array(
+                                'table' => $sequence_name,
+                                'field' => key($index['fields']),
+                            );
+                            break;
+                        }
+                    }
+                }
+
+                /**
+                 * The first parameter is used to verify if there are duplicated
+                 * sequences which we can guarantee that won't happen when reverse engineering
+                 */
+                $result = $val->validateSequence(array(), $definition, $sequence_name);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+
+                $database_definition['sequences'][$sequence_name] = $definition;
+            }
+        }
+
+        $result = $val->validateDatabase($database_definition);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        return $database_definition;
+    }
+
+    // }}}
+    // {{{ createTableIndexes()
+
+    /**
+     * A method to create indexes for an existing table
+     *
+     * @param string  $table_name Name of the table
+     * @param array   $indexes    An array of indexes to be created
+     * @param boolean $overwrite  If the table/index should be overwritten if it already exists
+     *
+     * @return mixed  MDB2_Error if there is an error creating an index, MDB2_OK otherwise
+     * @access public
+     */
+    function createTableIndexes($table_name, $indexes, $overwrite = false)
+    {
+        if (!$this->db->supports('indexes')) {
+            $this->db->debug('Indexes are not supported', __FUNCTION__);
+            return MDB2_OK;
+        }
+
+        $errorcodes = array(MDB2_ERROR_UNSUPPORTED, MDB2_ERROR_NOT_CAPABLE);
+        foreach ($indexes as $index_name => $index) {
+
+            // Does the index already exist, and if so, should it be overwritten?
+            $create_index = true;
+            $this->db->expectError($errorcodes);
+            if (!empty($index['primary']) || !empty($index['unique'])) {
+                $current_indexes = $this->db->manager->listTableConstraints($table_name);
+            } else {
+                $current_indexes = $this->db->manager->listTableIndexes($table_name);
+            }
+
+            $this->db->popExpect();
+            if (PEAR::isError($current_indexes)) {
+                if (!MDB2::isError($current_indexes, $errorcodes)) {
+                    return $current_indexes;
+                }
+            } elseif (is_array($current_indexes) && in_array($index_name, $current_indexes)) {
+                if (!$overwrite) {
+                    $this->db->debug('Index already exists: '.$index_name, __FUNCTION__);
+                    $create_index = false;
+                } else {
+                    $this->db->debug('Preparing to overwrite index: '.$index_name, __FUNCTION__);
+
+                    $this->db->expectError(MDB2_ERROR_NOT_FOUND);
+                    if (!empty($index['primary']) || !empty($index['unique'])) {
+                        $result = $this->db->manager->dropConstraint($table_name, $index_name);
+                    } else {
+                        $result = $this->db->manager->dropIndex($table_name, $index_name);
+                    }
+                    $this->db->popExpect();
+                    if (PEAR::isError($result) && !MDB2::isError($result, MDB2_ERROR_NOT_FOUND)) {
+                        return $result;
+                    }
+                }
+            }
+
+            // Check if primary is being used and if it's supported
+            if (!empty($index['primary']) && !$this->db->supports('primary_key')) {
+
+                // Primary not supported so we fallback to UNIQUE and making the field NOT NULL
+                $index['unique'] = true;
+
+                $changes = array();
+
+                foreach ($index['fields'] as $field => $empty) {
+                    $field_info = $this->db->reverse->getTableFieldDefinition($table_name, $field);
+                    if (PEAR::isError($field_info)) {
+                        return $field_info;
+                    }
+                    if (!$field_info[0]['notnull']) {
+                        $changes['change'][$field] = $field_info[0];
+
+                        $changes['change'][$field]['notnull'] = true;
+                    }
+                }
+                if (!empty($changes)) {
+                    $this->db->manager->alterTable($table_name, $changes, false);
+                }
+            }
+
+            // Should the index be created?
+            if ($create_index) {
+                if (!empty($index['primary']) || !empty($index['unique'])) {
+                    $result = $this->db->manager->createConstraint($table_name, $index_name, $index);
+                } else {
+                    $result = $this->db->manager->createIndex($table_name, $index_name, $index);
+                }
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ createTableConstraints()
+
+    /**
+     * A method to create foreign keys for an existing table
+     *
+     * @param string  $table_name  Name of the table
+     * @param array   $constraints An array of foreign keys to be created
+     * @param boolean $overwrite   If the foreign key should be overwritten if it already exists
+     *
+     * @return mixed  MDB2_Error if there is an error creating a foreign key, MDB2_OK otherwise
+     * @access public
+     */
+    function createTableConstraints($table_name, $constraints, $overwrite = false)
+    {
+        if (!$this->db->supports('indexes')) {
+            $this->db->debug('Indexes are not supported', __FUNCTION__);
+            return MDB2_OK;
+        }
+
+        $errorcodes = array(MDB2_ERROR_UNSUPPORTED, MDB2_ERROR_NOT_CAPABLE);
+        foreach ($constraints as $constraint_name => $constraint) {
+
+            // Does the foreign key already exist, and if so, should it be overwritten?
+            $create_constraint = true;
+            $this->db->expectError($errorcodes);
+            $current_constraints = $this->db->manager->listTableConstraints($table_name);
+            $this->db->popExpect();
+            if (PEAR::isError($current_constraints)) {
+                if (!MDB2::isError($current_constraints, $errorcodes)) {
+                    return $current_constraints;
+                }
+            } elseif (is_array($current_constraints) && in_array($constraint_name, $current_constraints)) {
+                if (!$overwrite) {
+                    $this->db->debug('Foreign key already exists: '.$constraint_name, __FUNCTION__);
+                    $create_constraint = false;
+                } else {
+                    $this->db->debug('Preparing to overwrite foreign key: '.$constraint_name, __FUNCTION__);
+                    $result = $this->db->manager->dropConstraint($table_name, $constraint_name);
+                    if (PEAR::isError($result)) {
+                        return $result;
+                    }
+                }
+            }
+
+            // Should the foreign key be created?
+            if ($create_constraint) {
+                $result = $this->db->manager->createConstraint($table_name, $constraint_name, $constraint);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ createTable()
+
+    /**
+     * Create a table and inititialize the table if data is available
+     *
+     * @param string $table_name name of the table to be created
+     * @param array  $table      multi dimensional array that contains the
+     *                           structure and optional data of the table
+     * @param bool   $overwrite  if the table/index should be overwritten if it already exists
+     * @param array  $options    an array of options to be passed to the database specific driver
+     *                           version of MDB2_Driver_Manager_Common::createTable().
+     *
+     * @return bool|MDB2_Error MDB2_OK or error object
+     * @access public
+     */
+    function createTable($table_name, $table, $overwrite = false, $options = array())
+    {
+        $create = true;
+
+        $errorcodes = array(MDB2_ERROR_UNSUPPORTED, MDB2_ERROR_NOT_CAPABLE);
+
+        $this->db->expectError($errorcodes);
+
+        $tables = $this->db->manager->listTables();
+
+        $this->db->popExpect();
+        if (PEAR::isError($tables)) {
+            if (!MDB2::isError($tables, $errorcodes)) {
+                return $tables;
+            }
+        } elseif (is_array($tables) && in_array($table_name, $tables)) {
+            if (!$overwrite) {
+                $create = false;
+                $this->db->debug('Table already exists: '.$table_name, __FUNCTION__);
+            } else {
+                $result = $this->db->manager->dropTable($table_name);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+                $this->db->debug('Overwritting table: '.$table_name, __FUNCTION__);
+            }
+        }
+
+        if ($create) {
+            $result = $this->db->manager->createTable($table_name, $table['fields'], $options);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+
+        if (!empty($table['initialization']) && is_array($table['initialization'])) {
+            $result = $this->initializeTable($table_name, $table);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+
+        if (!empty($table['indexes']) && is_array($table['indexes'])) {
+            $result = $this->createTableIndexes($table_name, $table['indexes'], $overwrite);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+
+        if (!empty($table['constraints']) && is_array($table['constraints'])) {
+            $result = $this->createTableConstraints($table_name, $table['constraints'], $overwrite);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ initializeTable()
+
+    /**
+     * Inititialize the table with data
+     *
+     * @param string $table_name name of the table
+     * @param array  $table      multi dimensional array that contains the
+     *                           structure and optional data of the table
+     *
+     * @return bool|MDB2_Error MDB2_OK or error object
+     * @access public
+     */
+    function initializeTable($table_name, $table)
+    {
+        $query_insertselect = 'INSERT INTO %s (%s) (SELECT %s FROM %s %s)';
+
+        $query_insert = 'INSERT INTO %s (%s) VALUES (%s)';
+        $query_update = 'UPDATE %s SET %s %s';
+        $query_delete = 'DELETE FROM %s %s';
+
+        $table_name = $this->db->quoteIdentifier($table_name, true);
+
+        $result = MDB2_OK;
+
+        $support_transactions = $this->db->supports('transactions');
+
+        foreach ($table['initialization'] as $instruction) {
+            $query = '';
+            switch ($instruction['type']) {
+            case 'insert':
+                if (!isset($instruction['data']['select'])) {
+                    $data = $this->getInstructionFields($instruction['data'], $table['fields']);
+                    if (!empty($data)) {
+                        $fields = implode(', ', array_keys($data));
+                        $values = implode(', ', array_values($data));
+
+                        $query = sprintf($query_insert, $table_name, $fields, $values);
+                    }
+                } else {
+                    $data  = $this->getInstructionFields($instruction['data']['select'], $table['fields']);
+                    $where = $this->getInstructionWhere($instruction['data']['select'], $table['fields']);
+
+                    $select_table_name = $this->db->quoteIdentifier($instruction['data']['select']['table'], true);
+                    if (!empty($data)) {
+                        $fields = implode(', ', array_keys($data));
+                        $values = implode(', ', array_values($data));
+
+                        $query = sprintf($query_insertselect, $table_name, $fields, $values, $select_table_name, $where);
+                    }
+                }
+                break;
+            case 'update':
+                $data  = $this->getInstructionFields($instruction['data'], $table['fields']);
+                $where = $this->getInstructionWhere($instruction['data'], $table['fields']);
+                if (!empty($data)) {
+                    array_walk($data, array($this, 'buildFieldValue'));
+                    $fields_values = implode(', ', $data);
+
+                    $query = sprintf($query_update, $table_name, $fields_values, $where);
+                }
+                break;
+            case 'delete':
+                $where = $this->getInstructionWhere($instruction['data'], $table['fields']);
+                $query = sprintf($query_delete, $table_name, $where);
+                break;
+            }
+            if ($query) {
+                if ($support_transactions && PEAR::isError($res = $this->db->beginNestedTransaction())) {
+                    return $res;
+                }
+
+                $result = $this->db->exec($query);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+
+                if ($support_transactions && PEAR::isError($res = $this->db->completeNestedTransaction())) {
+                    return $res;
+                }
+            }
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ buildFieldValue()
+
+    /**
+     * Appends the contents of second argument + '=' to the beginning of first
+     * argument.
+     *
+     * Used with array_walk() in initializeTable() for UPDATEs.
+     *
+     * @param string &$element value of array's element
+     * @param string $key      key of array's element
+     *
+     * @return void
+     *
+     * @access public
+     * @see MDB2_Schema::initializeTable()
+     */
+    function buildFieldValue(&$element, $key)
+    {
+        $element = $key."=$element";
+    }
+
+    // }}}
+    // {{{ getExpression()
+
+    /**
+     * Generates a string that represents a value that would be associated
+     * with a column in a DML instruction.
+     *
+     * @param array  $element           multi dimensional array that contains the
+     *                                  structure of the current DML instruction.
+     * @param array  $fields_definition multi dimensional array that contains the
+     *                                  definition for current table's fields
+     * @param string $type              type of given field
+     *
+     * @return string
+     *
+     * @access public
+     * @see MDB2_Schema::getInstructionFields(), MDB2_Schema::getInstructionWhere()
+     */
+    function getExpression($element, $fields_definition = array(), $type = null)
+    {
+        $str = '';
+        switch ($element['type']) {
+        case 'null':
+            $str .= 'NULL';
+            break;
+        case 'value':
+            $str .= $this->db->quote($element['data'], $type);
+            break;
+        case 'column':
+            $str .= $this->db->quoteIdentifier($element['data'], true);
+            break;
+        case 'function':
+            $arguments = array();
+            if (!empty($element['data']['arguments'])
+                && is_array($element['data']['arguments'])
+            ) {
+                foreach ($element['data']['arguments'] as $v) {
+                    $arguments[] = $this->getExpression($v, $fields_definition);
+                }
+            }
+            if (method_exists($this->db->function, $element['data']['name'])) {
+                $user_func = array(&$this->db->function, $element['data']['name']);
+
+                $str .= call_user_func_array($user_func, $arguments);
+            } else {
+                $str .= $element['data']['name'].'(';
+                $str .= implode(', ', $arguments);
+                $str .= ')';
+            }
+            break;
+        case 'expression':
+            $type0 = $type1 = null;
+            if ($element['data']['operants'][0]['type'] == 'column'
+                && array_key_exists($element['data']['operants'][0]['data'], $fields_definition)
+            ) {
+                $type0 = $fields_definition[$element['data']['operants'][0]['data']]['type'];
+            }
+
+            if ($element['data']['operants'][1]['type'] == 'column'
+                && array_key_exists($element['data']['operants'][1]['data'], $fields_definition)
+            ) {
+                $type1 = $fields_definition[$element['data']['operants'][1]['data']]['type'];
+            }
+
+            $str .= '(';
+            $str .= $this->getExpression($element['data']['operants'][0], $fields_definition, $type1);
+            $str .= $this->getOperator($element['data']['operator']);
+            $str .= $this->getExpression($element['data']['operants'][1], $fields_definition, $type0);
+            $str .= ')';
+            break;
+        }
+
+        return $str;
+    }
+
+    // }}}
+    // {{{ getOperator()
+
+    /**
+     * Returns the matching SQL operator
+     *
+     * @param string $op parsed descriptive operator
+     *
+     * @return string matching SQL operator
+     *
+     * @access public
+     * @static
+     * @see MDB2_Schema::getExpression()
+     */
+    function getOperator($op)
+    {
+        switch ($op) {
+        case 'PLUS':
+            return ' + ';
+        case 'MINUS':
+            return ' - ';
+        case 'TIMES':
+            return ' * ';
+        case 'DIVIDED':
+            return ' / ';
+        case 'EQUAL':
+            return ' = ';
+        case 'NOT EQUAL':
+            return ' != ';
+        case 'LESS THAN':
+            return ' < ';
+        case 'GREATER THAN':
+            return ' > ';
+        case 'LESS THAN OR EQUAL':
+            return ' <= ';
+        case 'GREATER THAN OR EQUAL':
+            return ' >= ';
+        default:
+            return ' '.$op.' ';
+        }
+    }
+
+    // }}}
+    // {{{ getInstructionFields()
+
+    /**
+     * Walks the parsed DML instruction array, field by field,
+     * storing them and their processed values inside a new array.
+     *
+     * @param array $instruction       multi dimensional array that contains the
+     *                                 structure of the current DML instruction.
+     * @param array $fields_definition multi dimensional array that contains the
+     *                                 definition for current table's fields
+     *
+     * @return array  array of strings in the form 'field_name' => 'value'
+     *
+     * @access public
+     * @static
+     * @see MDB2_Schema::initializeTable()
+     */
+    function getInstructionFields($instruction, $fields_definition = array())
+    {
+        $fields = array();
+        if (!empty($instruction['field']) && is_array($instruction['field'])) {
+            foreach ($instruction['field'] as $field) {
+                $field_name = $this->db->quoteIdentifier($field['name'], true);
+
+                $fields[$field_name] = $this->getExpression($field['group'], $fields_definition);
+            }
+        }
+        return $fields;
+    }
+
+    // }}}
+    // {{{ getInstructionWhere()
+
+    /**
+     * Translates the parsed WHERE expression of a DML instruction
+     * (array structure) to a SQL WHERE clause (string).
+     *
+     * @param array $instruction       multi dimensional array that contains the
+     *                                 structure of the current DML instruction.
+     * @param array $fields_definition multi dimensional array that contains the
+     *                                 definition for current table's fields.
+     *
+     * @return string SQL WHERE clause
+     *
+     * @access public
+     * @static
+     * @see MDB2_Schema::initializeTable()
+     */
+    function getInstructionWhere($instruction, $fields_definition = array())
+    {
+        $where = '';
+        if (!empty($instruction['where'])) {
+            $where = 'WHERE '.$this->getExpression($instruction['where'], $fields_definition);
+        }
+        return $where;
+    }
+
+    // }}}
+    // {{{ createSequence()
+
+    /**
+     * Create a sequence
+     *
+     * @param string $sequence_name name of the sequence to be created
+     * @param array  $sequence      multi dimensional array that contains the
+     *                              structure and optional data of the table
+     * @param bool   $overwrite     if the sequence should be overwritten if it already exists
+     *
+     * @return bool|MDB2_Error MDB2_OK or error object
+     * @access public
+     */
+    function createSequence($sequence_name, $sequence, $overwrite = false)
+    {
+        if (!$this->db->supports('sequences')) {
+            $this->db->debug('Sequences are not supported', __FUNCTION__);
+            return MDB2_OK;
+        }
+
+        $errorcodes = array(MDB2_ERROR_UNSUPPORTED, MDB2_ERROR_NOT_CAPABLE);
+        $this->db->expectError($errorcodes);
+        $sequences = $this->db->manager->listSequences();
+        $this->db->popExpect();
+        if (PEAR::isError($sequences)) {
+            if (!MDB2::isError($sequences, $errorcodes)) {
+                return $sequences;
+            }
+        } elseif (is_array($sequence) && in_array($sequence_name, $sequences)) {
+            if (!$overwrite) {
+                $this->db->debug('Sequence already exists: '.$sequence_name, __FUNCTION__);
+                return MDB2_OK;
+            }
+
+            $result = $this->db->manager->dropSequence($sequence_name);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+            $this->db->debug('Overwritting sequence: '.$sequence_name, __FUNCTION__);
+        }
+
+        $start = 1;
+        $field = '';
+        if (!empty($sequence['on'])) {
+            $table = $sequence['on']['table'];
+            $field = $sequence['on']['field'];
+
+            $errorcodes = array(MDB2_ERROR_UNSUPPORTED, MDB2_ERROR_NOT_CAPABLE);
+            $this->db->expectError($errorcodes);
+            $tables = $this->db->manager->listTables();
+            $this->db->popExpect();
+            if (PEAR::isError($tables) && !MDB2::isError($tables, $errorcodes)) {
+                 return $tables;
+            }
+
+            if (!PEAR::isError($tables) && is_array($tables) && in_array($table, $tables)) {
+                if ($this->db->supports('summary_functions')) {
+                    $query = "SELECT MAX($field) FROM ".$this->db->quoteIdentifier($table, true);
+                } else {
+                    $query = "SELECT $field FROM ".$this->db->quoteIdentifier($table, true)." ORDER BY $field DESC";
+                }
+                $start = $this->db->queryOne($query, 'integer');
+                if (PEAR::isError($start)) {
+                    return $start;
+                }
+                ++$start;
+            } else {
+                $this->warnings[] = 'Could not sync sequence: '.$sequence_name;
+            }
+        } elseif (!empty($sequence['start']) && is_numeric($sequence['start'])) {
+            $start = $sequence['start'];
+            $table = '';
+        }
+
+        $result = $this->db->manager->createSequence($sequence_name, $start);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ createDatabase()
+
+    /**
+     * Create a database space within which may be created database objects
+     * like tables, indexes and sequences. The implementation of this function
+     * is highly DBMS specific and may require special permissions to run
+     * successfully. Consult the documentation or the DBMS drivers that you
+     * use to be aware of eventual configuration requirements.
+     *
+     * @param array $database_definition multi dimensional array that contains the current definition
+     * @param array $options             an array of options to be passed to the 
+     *                                   database specific driver version of
+     *                                   MDB2_Driver_Manager_Common::createTable().
+     *
+     * @return bool|MDB2_Error MDB2_OK or error object
+     * @access public
+     */
+    function createDatabase($database_definition, $options = array())
+    {
+        if (!isset($database_definition['name']) || !$database_definition['name']) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
+                'no valid database name specified');
+        }
+
+        $create    = (isset($database_definition['create']) && $database_definition['create']);
+        $overwrite = (isset($database_definition['overwrite']) && $database_definition['overwrite']);
+
+        /**
+         *
+         * We need to clean up database name before any query to prevent
+         * database driver from using a inexistent database
+         *
+         */
+        $previous_database_name = $this->db->setDatabase('');
+
+        // Lower / Upper case the db name if the portability deems so.
+        if ($this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $func = $this->db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper';
+
+            $db_name = $func($database_definition['name']);
+        } else {
+            $db_name = $database_definition['name'];
+        }
+
+        if ($create) {
+
+            $dbExists = $this->db->databaseExists($db_name);
+            if (PEAR::isError($dbExists)) {
+                return $dbExists;
+            }
+
+            if ($dbExists && $overwrite) {
+                $this->db->expectError(MDB2_ERROR_CANNOT_DROP);
+                $result = $this->db->manager->dropDatabase($db_name);
+                $this->db->popExpect();
+                if (PEAR::isError($result) && !MDB2::isError($result, MDB2_ERROR_CANNOT_DROP)) {
+                    return $result;
+                }
+                $dbExists = false;
+                $this->db->debug('Overwritting database: ' . $db_name, __FUNCTION__);
+            }
+
+            $dbOptions = array();
+            if (array_key_exists('charset', $database_definition)
+                && !empty($database_definition['charset'])) {
+                $dbOptions['charset'] = $database_definition['charset'];
+            }
+
+            if ($dbExists) {
+                $this->db->debug('Database already exists: ' . $db_name, __FUNCTION__);
+//                 if (!empty($dbOptions)) {
+//                     $errorcodes = array(MDB2_ERROR_UNSUPPORTED, MDB2_ERROR_NO_PERMISSION);
+//                     $this->db->expectError($errorcodes);
+//                     $result = $this->db->manager->alterDatabase($db_name, $dbOptions);
+//                     $this->db->popExpect();
+//                     if (PEAR::isError($result) && !MDB2::isError($result, $errorcodes)) {
+//                         return $result;
+//                     }
+//                 }
+                $create = false;
+            } else {
+                $this->db->expectError(MDB2_ERROR_UNSUPPORTED);
+                $result = $this->db->manager->createDatabase($db_name, $dbOptions);
+                $this->db->popExpect();
+                if (PEAR::isError($result) && !MDB2::isError($result, MDB2_ERROR_UNSUPPORTED)) {
+                    return $result;
+                }
+                $this->db->debug('Creating database: ' . $db_name, __FUNCTION__);
+            }
+        }
+
+        $this->db->setDatabase($db_name);
+        if (($support_transactions = $this->db->supports('transactions'))
+            && PEAR::isError($result = $this->db->beginNestedTransaction())
+        ) {
+            return $result;
+        }
+
+        $created_objects = 0;
+        if (isset($database_definition['tables'])
+            && is_array($database_definition['tables'])
+        ) {
+            foreach ($database_definition['tables'] as $table_name => $table) {
+                $result = $this->createTable($table_name, $table, $overwrite, $options);
+                if (PEAR::isError($result)) {
+                    break;
+                }
+                $created_objects++;
+            }
+        }
+        if (!PEAR::isError($result)
+            && isset($database_definition['sequences'])
+            && is_array($database_definition['sequences'])
+        ) {
+            foreach ($database_definition['sequences'] as $sequence_name => $sequence) {
+                $result = $this->createSequence($sequence_name, $sequence, false, $overwrite);
+
+                if (PEAR::isError($result)) {
+                    break;
+                }
+                $created_objects++;
+            }
+        }
+
+        if ($support_transactions) {
+            $res = $this->db->completeNestedTransaction();
+            if (PEAR::isError($res)) {
+                $result = $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
+                    'Could not end transaction ('.
+                    $res->getMessage().' ('.$res->getUserinfo().'))');
+            }
+        } elseif (PEAR::isError($result) && $created_objects) {
+            $result = $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
+                'the database was only partially created ('.
+                $result->getMessage().' ('.$result->getUserinfo().'))');
+        }
+
+        $this->db->setDatabase($previous_database_name);
+
+        if (PEAR::isError($result) && $create
+            && PEAR::isError($result2 = $this->db->manager->dropDatabase($db_name))
+        ) {
+            if (!MDB2::isError($result2, MDB2_ERROR_UNSUPPORTED)) {
+                return $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
+                       'Could not drop the created database after unsuccessful creation attempt ('.
+                       $result2->getMessage().' ('.$result2->getUserinfo().'))');
+            }
+        }
+
+        return $result;
+    }
+
+    // }}}
+    // {{{ compareDefinitions()
+
+    /**
+     * Compare a previous definition with the currently parsed definition
+     *
+     * @param array $current_definition  multi dimensional array that contains the current definition
+     * @param array $previous_definition multi dimensional array that contains the previous definition
+     *
+     * @return array|MDB2_Error array of changes on success, or a error object
+     * @access public
+     */
+    function compareDefinitions($current_definition, $previous_definition)
+    {
+        $changes = array();
+
+        if (!empty($current_definition['tables']) && is_array($current_definition['tables'])) {
+            $changes['tables'] = $defined_tables = array();
+            foreach ($current_definition['tables'] as $table_name => $table) {
+                $previous_tables = array();
+                if (!empty($previous_definition) && is_array($previous_definition)) {
+                    $previous_tables = $previous_definition['tables'];
+                }
+                $change = $this->compareTableDefinitions($table_name, $table, $previous_tables, $defined_tables);
+                if (PEAR::isError($change)) {
+                    return $change;
+                }
+                if (!empty($change)) {
+                    $changes['tables'] = MDB2_Schema::arrayMergeClobber($changes['tables'], $change);
+                }
+            }
+
+            if (!empty($previous_definition['tables'])
+                && is_array($previous_definition['tables'])) {
+                foreach ($previous_definition['tables'] as $table_name => $table) {
+                    if (empty($defined_tables[$table_name])) {
+                        $changes['tables']['remove'][$table_name] = true;
+                    }
+                }
+            }
+        }
+        if (!empty($current_definition['sequences']) && is_array($current_definition['sequences'])) {
+            $changes['sequences'] = $defined_sequences = array();
+            foreach ($current_definition['sequences'] as $sequence_name => $sequence) {
+                $previous_sequences = array();
+                if (!empty($previous_definition) && is_array($previous_definition)) {
+                    $previous_sequences = $previous_definition['sequences'];
+                }
+
+                $change = $this->compareSequenceDefinitions($sequence_name,
+                                                            $sequence,
+                                                            $previous_sequences,
+                                                            $defined_sequences);
+                if (PEAR::isError($change)) {
+                    return $change;
+                }
+                if (!empty($change)) {
+                    $changes['sequences'] = MDB2_Schema::arrayMergeClobber($changes['sequences'], $change);
+                }
+            }
+            if (!empty($previous_definition['sequences']) && is_array($previous_definition['sequences'])) {
+                foreach ($previous_definition['sequences'] as $sequence_name => $sequence) {
+                    if (empty($defined_sequences[$sequence_name])) {
+                        $changes['sequences']['remove'][$sequence_name] = true;
+                    }
+                }
+            }
+        }
+        return $changes;
+    }
+
+    // }}}
+    // {{{ compareTableFieldsDefinitions()
+
+    /**
+     * Compare a previous definition with the currently parsed definition
+     *
+     * @param string $table_name          name of the table
+     * @param array  $current_definition  multi dimensional array that contains the current definition
+     * @param array  $previous_definition multi dimensional array that contains the previous definition
+     *
+     * @return array|MDB2_Error array of changes on success, or a error object
+     * @access public
+     */
+    function compareTableFieldsDefinitions($table_name, $current_definition,
+        $previous_definition)
+    {
+        $changes = $defined_fields = array();
+
+        if (is_array($current_definition)) {
+            foreach ($current_definition as $field_name => $field) {
+                $was_field_name = $field['was'];
+                if (!empty($previous_definition[$field_name])
+                    && (
+                        (isset($previous_definition[$field_name]['was'])
+                         && $previous_definition[$field_name]['was'] == $was_field_name)
+                        || !isset($previous_definition[$was_field_name])
+                       )) {
+                    $was_field_name = $field_name;
+                }
+
+                if (!empty($previous_definition[$was_field_name])) {
+                    if ($was_field_name != $field_name) {
+                        $changes['rename'][$was_field_name] = array('name' => $field_name, 'definition' => $field);
+                    }
+
+                    if (!empty($defined_fields[$was_field_name])) {
+                        return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
+                            'the field "'.$was_field_name.
+                            '" was specified for more than one field of table');
+                    }
+
+                    $defined_fields[$was_field_name] = true;
+
+                    $change = $this->db->compareDefinition($field, $previous_definition[$was_field_name]);
+                    if (PEAR::isError($change)) {
+                        return $change;
+                    }
+
+                    if (!empty($change)) {
+                        if (array_key_exists('default', $change)
+                            && $change['default']
+                            && !array_key_exists('default', $field)) {
+                                $field['default'] = null;
+                        }
+
+                        $change['definition'] = $field;
+
+                        $changes['change'][$field_name] = $change;
+                    }
+                } else {
+                    if ($field_name != $was_field_name) {
+                        return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
+                            'it was specified a previous field name ("'.
+                            $was_field_name.'") for field "'.$field_name.'" of table "'.
+                            $table_name.'" that does not exist');
+                    }
+
+                    $changes['add'][$field_name] = $field;
+                }
+            }
+        }
+
+        if (isset($previous_definition) && is_array($previous_definition)) {
+            foreach ($previous_definition as $field_previous_name => $field_previous) {
+                if (empty($defined_fields[$field_previous_name])) {
+                    $changes['remove'][$field_previous_name] = true;
+                }
+            }
+        }
+
+        return $changes;
+    }
+
+    // }}}
+    // {{{ compareTableIndexesDefinitions()
+
+    /**
+     * Compare a previous definition with the currently parsed definition
+     *
+     * @param string $table_name          name of the table
+     * @param array  $current_definition  multi dimensional array that contains the current definition
+     * @param array  $previous_definition multi dimensional array that contains the previous definition
+     *
+     * @return array|MDB2_Error array of changes on success, or a error object
+     * @access public
+     */
+    function compareTableIndexesDefinitions($table_name, $current_definition,
+        $previous_definition)
+    {
+        $changes = $defined_indexes = array();
+
+        if (is_array($current_definition)) {
+            foreach ($current_definition as $index_name => $index) {
+                $was_index_name = $index['was'];
+                if (!empty($previous_definition[$index_name])
+                    && isset($previous_definition[$index_name]['was'])
+                    && $previous_definition[$index_name]['was'] == $was_index_name
+                ) {
+                    $was_index_name = $index_name;
+                }
+                if (!empty($previous_definition[$was_index_name])) {
+                    $change = array();
+                    if ($was_index_name != $index_name) {
+                        $change['name'] = $was_index_name;
+                    }
+
+                    if (!empty($defined_indexes[$was_index_name])) {
+                        return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
+                            'the index "'.$was_index_name.'" was specified for'.
+                            ' more than one index of table "'.$table_name.'"');
+                    }
+                    $defined_indexes[$was_index_name] = true;
+
+                    $previous_unique = array_key_exists('unique', $previous_definition[$was_index_name])
+                        ? $previous_definition[$was_index_name]['unique'] : false;
+
+                    $unique = array_key_exists('unique', $index) ? $index['unique'] : false;
+                    if ($previous_unique != $unique) {
+                        $change['unique'] = $unique;
+                    }
+
+                    $previous_primary = array_key_exists('primary', $previous_definition[$was_index_name])
+                        ? $previous_definition[$was_index_name]['primary'] : false;
+
+                    $primary = array_key_exists('primary', $index) ? $index['primary'] : false;
+                    if ($previous_primary != $primary) {
+                        $change['primary'] = $primary;
+                    }
+
+                    $defined_fields  = array();
+                    $previous_fields = $previous_definition[$was_index_name]['fields'];
+                    if (!empty($index['fields']) && is_array($index['fields'])) {
+                        foreach ($index['fields'] as $field_name => $field) {
+                            if (!empty($previous_fields[$field_name])) {
+                                $defined_fields[$field_name] = true;
+
+                                $previous_sorting = array_key_exists('sorting', $previous_fields[$field_name])
+                                    ? $previous_fields[$field_name]['sorting'] : '';
+
+                                $sorting = array_key_exists('sorting', $field) ? $field['sorting'] : '';
+                                if ($previous_sorting != $sorting) {
+                                    $change['change'] = true;
+                                }
+                            } else {
+                                $change['change'] = true;
+                            }
+                        }
+                    }
+                    if (isset($previous_fields) && is_array($previous_fields)) {
+                        foreach ($previous_fields as $field_name => $field) {
+                            if (empty($defined_fields[$field_name])) {
+                                $change['change'] = true;
+                            }
+                        }
+                    }
+                    if (!empty($change)) {
+                        $changes['change'][$index_name] = $current_definition[$index_name];
+                    }
+                } else {
+                    if ($index_name != $was_index_name) {
+                        return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
+                            'it was specified a previous index name ("'.$was_index_name.
+                            ') for index "'.$index_name.'" of table "'.$table_name.'" that does not exist');
+                    }
+                    $changes['add'][$index_name] = $current_definition[$index_name];
+                }
+            }
+        }
+        foreach ($previous_definition as $index_previous_name => $index_previous) {
+            if (empty($defined_indexes[$index_previous_name])) {
+                $changes['remove'][$index_previous_name] = $index_previous;
+            }
+        }
+        return $changes;
+    }
+
+    // }}}
+    // {{{ compareTableDefinitions()
+
+    /**
+     * Compare a previous definition with the currently parsed definition
+     *
+     * @param string $table_name          name of the table
+     * @param array  $current_definition  multi dimensional array that contains the current definition
+     * @param array  $previous_definition multi dimensional array that contains the previous definition
+     * @param array  &$defined_tables     table names in the schema
+     *
+     * @return array|MDB2_Error array of changes on success, or a error object
+     * @access public
+     */
+    function compareTableDefinitions($table_name, $current_definition,
+        $previous_definition, &$defined_tables)
+    {
+        $changes = array();
+
+        if (is_array($current_definition)) {
+            $was_table_name = $table_name;
+            if (!empty($current_definition['was'])) {
+                $was_table_name = $current_definition['was'];
+            }
+            if (!empty($previous_definition[$was_table_name])) {
+                $changes['change'][$was_table_name] = array();
+                if ($was_table_name != $table_name) {
+                    $changes['change'][$was_table_name] = array('name' => $table_name);
+                }
+                if (!empty($defined_tables[$was_table_name])) {
+                    return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
+                        'the table "'.$was_table_name.
+                        '" was specified for more than one table of the database');
+                }
+                $defined_tables[$was_table_name] = true;
+                if (!empty($current_definition['fields']) && is_array($current_definition['fields'])) {
+                    $previous_fields = array();
+                    if (isset($previous_definition[$was_table_name]['fields'])
+                        && is_array($previous_definition[$was_table_name]['fields'])) {
+                        $previous_fields = $previous_definition[$was_table_name]['fields'];
+                    }
+
+                    $change = $this->compareTableFieldsDefinitions($table_name,
+                                                                   $current_definition['fields'],
+                                                                   $previous_fields);
+
+                    if (PEAR::isError($change)) {
+                        return $change;
+                    }
+                    if (!empty($change)) {
+                        $changes['change'][$was_table_name] =
+                            MDB2_Schema::arrayMergeClobber($changes['change'][$was_table_name], $change);
+                    }
+                }
+                if (!empty($current_definition['indexes']) && is_array($current_definition['indexes'])) {
+                    $previous_indexes = array();
+                    if (isset($previous_definition[$was_table_name]['indexes'])
+                        && is_array($previous_definition[$was_table_name]['indexes'])) {
+                        $previous_indexes = $previous_definition[$was_table_name]['indexes'];
+                    }
+                    $change = $this->compareTableIndexesDefinitions($table_name,
+                                                                    $current_definition['indexes'],
+                                                                    $previous_indexes);
+
+                    if (PEAR::isError($change)) {
+                        return $change;
+                    }
+                    if (!empty($change)) {
+                        $changes['change'][$was_table_name]['indexes'] = $change;
+                    }
+                }
+                if (empty($changes['change'][$was_table_name])) {
+                    unset($changes['change'][$was_table_name]);
+                }
+                if (empty($changes['change'])) {
+                    unset($changes['change']);
+                }
+            } else {
+                if ($table_name != $was_table_name) {
+                    return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
+                        'it was specified a previous table name ("'.$was_table_name.
+                        '") for table "'.$table_name.'" that does not exist');
+                }
+                $changes['add'][$table_name] = true;
+            }
+        }
+
+        return $changes;
+    }
+
+    // }}}
+    // {{{ compareSequenceDefinitions()
+
+    /**
+     * Compare a previous definition with the currently parsed definition
+     *
+     * @param string $sequence_name       name of the sequence
+     * @param array  $current_definition  multi dimensional array that contains the current definition
+     * @param array  $previous_definition multi dimensional array that contains the previous definition
+     * @param array  &$defined_sequences  names in the schema
+     *
+     * @return array|MDB2_Error array of changes on success, or a error object
+     * @access public
+     */
+    function compareSequenceDefinitions($sequence_name, $current_definition,
+        $previous_definition, &$defined_sequences)
+    {
+        $changes = array();
+
+        if (is_array($current_definition)) {
+            $was_sequence_name = $sequence_name;
+            if (!empty($previous_definition[$sequence_name])
+                && isset($previous_definition[$sequence_name]['was'])
+                && $previous_definition[$sequence_name]['was'] == $was_sequence_name
+            ) {
+                $was_sequence_name = $sequence_name;
+            } elseif (!empty($current_definition['was'])) {
+                $was_sequence_name = $current_definition['was'];
+            }
+            if (!empty($previous_definition[$was_sequence_name])) {
+                if ($was_sequence_name != $sequence_name) {
+                    $changes['change'][$was_sequence_name]['name'] = $sequence_name;
+                }
+
+                if (!empty($defined_sequences[$was_sequence_name])) {
+                    return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
+                        'the sequence "'.$was_sequence_name.'" was specified as base'.
+                        ' of more than of sequence of the database');
+                }
+
+                $defined_sequences[$was_sequence_name] = true;
+
+                $change = array();
+                if (!empty($current_definition['start'])
+                    && isset($previous_definition[$was_sequence_name]['start'])
+                    && $current_definition['start'] != $previous_definition[$was_sequence_name]['start']
+                ) {
+                    $change['start'] = $previous_definition[$sequence_name]['start'];
+                }
+                if (isset($current_definition['on']['table'])
+                    && isset($previous_definition[$was_sequence_name]['on']['table'])
+                    && $current_definition['on']['table'] != $previous_definition[$was_sequence_name]['on']['table']
+                    && isset($current_definition['on']['field'])
+                    && isset($previous_definition[$was_sequence_name]['on']['field'])
+                    && $current_definition['on']['field'] != $previous_definition[$was_sequence_name]['on']['field']
+                ) {
+                    $change['on'] = $current_definition['on'];
+                }
+                if (!empty($change)) {
+                    $changes['change'][$was_sequence_name][$sequence_name] = $change;
+                }
+            } else {
+                if ($sequence_name != $was_sequence_name) {
+                    return $this->raiseError(MDB2_SCHEMA_ERROR_INVALID, null, null,
+                        'it was specified a previous sequence name ("'.$was_sequence_name.
+                        '") for sequence "'.$sequence_name.'" that does not exist');
+                }
+                $changes['add'][$sequence_name] = true;
+            }
+        }
+        return $changes;
+    }
+    // }}}
+    // {{{ verifyAlterDatabase()
+
+    /**
+     * Verify that the changes requested are supported
+     *
+     * @param array $changes associative array that contains the definition of the changes
+     *              that are meant to be applied to the database structure.
+     *
+     * @return bool|MDB2_Error MDB2_OK or error object
+     * @access public
+     */
+    function verifyAlterDatabase($changes)
+    {
+        if (!empty($changes['tables']['change']) && is_array($changes['tables']['change'])) {
+            foreach ($changes['tables']['change'] as $table_name => $table) {
+                if (!empty($table['indexes']) && is_array($table['indexes'])) {
+                    if (!$this->db->supports('indexes')) {
+                        return $this->raiseError(MDB2_SCHEMA_ERROR_UNSUPPORTED, null, null,
+                            'indexes are not supported');
+                    }
+                    $table_changes = count($table['indexes']);
+                    if (!empty($table['indexes']['add'])) {
+                        $table_changes--;
+                    }
+                    if (!empty($table['indexes']['remove'])) {
+                        $table_changes--;
+                    }
+                    if (!empty($table['indexes']['change'])) {
+                        $table_changes--;
+                    }
+                    if ($table_changes) {
+                        return $this->raiseError(MDB2_SCHEMA_ERROR_UNSUPPORTED, null, null,
+                            'index alteration not yet supported: '.implode(', ', array_keys($table['indexes'])));
+                    }
+                }
+                unset($table['indexes']);
+                $result = $this->db->manager->alterTable($table_name, $table, true);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+        }
+        if (!empty($changes['sequences']) && is_array($changes['sequences'])) {
+            if (!$this->db->supports('sequences')) {
+                return $this->raiseError(MDB2_SCHEMA_ERROR_UNSUPPORTED, null, null,
+                    'sequences are not supported');
+            }
+            $sequence_changes = count($changes['sequences']);
+            if (!empty($changes['sequences']['add'])) {
+                $sequence_changes--;
+            }
+            if (!empty($changes['sequences']['remove'])) {
+                $sequence_changes--;
+            }
+            if (!empty($changes['sequences']['change'])) {
+                $sequence_changes--;
+            }
+            if ($sequence_changes) {
+                return $this->raiseError(MDB2_SCHEMA_ERROR_UNSUPPORTED, null, null,
+                    'sequence alteration not yet supported: '.implode(', ', array_keys($changes['sequences'])));
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ alterDatabaseIndexes()
+
+    /**
+     * Execute the necessary actions to implement the requested changes
+     * in the indexes inside a database structure.
+     *
+     * @param string $table_name name of the table
+     * @param array  $changes    associative array that contains the definition of the changes
+     *                       that are meant to be applied to the database structure.
+     *
+     * @return bool|MDB2_Error MDB2_OK or error object
+     * @access public
+     */
+    function alterDatabaseIndexes($table_name, $changes)
+    {
+        $alterations = 0;
+        if (empty($changes)) {
+            return $alterations;
+        }
+
+        if (!empty($changes['remove']) && is_array($changes['remove'])) {
+            foreach ($changes['remove'] as $index_name => $index) {
+                $this->db->expectError(MDB2_ERROR_NOT_FOUND);
+                if (!empty($index['primary']) || !empty($index['unique'])) {
+                    $result = $this->db->manager->dropConstraint($table_name, $index_name, !empty($index['primary']));
+                } else {
+                    $result = $this->db->manager->dropIndex($table_name, $index_name);
+                }
+                $this->db->popExpect();
+                if (PEAR::isError($result) && !MDB2::isError($result, MDB2_ERROR_NOT_FOUND)) {
+                    return $result;
+                }
+                $alterations++;
+            }
+        }
+        if (!empty($changes['change']) && is_array($changes['change'])) {
+            foreach ($changes['change'] as $index_name => $index) {
+                /**
+                 * Drop existing index/constraint first.
+                 * Since $changes doesn't tell us whether it's an index or a constraint before the change,
+                 * we have to find out and call the appropriate method.
+                 */
+                if (in_array($index_name, $this->db->manager->listTableIndexes($table_name))) {
+                    $result = $this->db->manager->dropIndex($table_name, $index_name);
+                } elseif (in_array($index_name, $this->db->manager->listTableConstraints($table_name))) {
+                    $result = $this->db->manager->dropConstraint($table_name, $index_name);
+                }
+                if (!empty($result) && PEAR::isError($result)) {
+                    return $result;
+                }
+
+                if (!empty($index['primary']) || !empty($index['unique'])) {
+                    $result = $this->db->manager->createConstraint($table_name, $index_name, $index);
+                } else {
+                    $result = $this->db->manager->createIndex($table_name, $index_name, $index);
+                }
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+                $alterations++;
+            }
+        }
+        if (!empty($changes['add']) && is_array($changes['add'])) {
+            foreach ($changes['add'] as $index_name => $index) {
+                if (!empty($index['primary']) || !empty($index['unique'])) {
+                    $result = $this->db->manager->createConstraint($table_name, $index_name, $index);
+                } else {
+                    $result = $this->db->manager->createIndex($table_name, $index_name, $index);
+                }
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+                $alterations++;
+            }
+        }
+
+        return $alterations;
+    }
+
+    // }}}
+    // {{{ alterDatabaseTables()
+
+    /**
+     * Execute the necessary actions to implement the requested changes
+     * in the tables inside a database structure.
+     *
+     * @param array $current_definition  multi dimensional array that contains the current definition
+     * @param array $previous_definition multi dimensional array that contains the previous definition
+     * @param array $changes             associative array that contains the definition of the changes
+     *                                   that are meant to be applied to the database structure.
+     *
+     * @return bool|MDB2_Error MDB2_OK or error object
+     * @access public
+     */
+    function alterDatabaseTables($current_definition, $previous_definition, $changes)
+    {
+        /* FIXME: tables marked to be added are initialized by createTable(), others don't */
+        $alterations = 0;
+        if (empty($changes)) {
+            return $alterations;
+        }
+
+        if (!empty($changes['add']) && is_array($changes['add'])) {
+            foreach ($changes['add'] as $table_name => $table) {
+                $result = $this->createTable($table_name, $current_definition[$table_name]);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+                $alterations++;
+            }
+        }
+ 
+        if ($this->options['drop_missing_tables']
+            && !empty($changes['remove'])
+            && is_array($changes['remove'])) {
+            foreach ($changes['remove'] as $table_name => $table) {
+                $result = $this->db->manager->dropTable($table_name);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+                $alterations++;
+            }
+        }
+
+        if (!empty($changes['change']) && is_array($changes['change'])) {
+            foreach ($changes['change'] as $table_name => $table) {
+                $indexes = array();
+                if (!empty($table['indexes'])) {
+                    $indexes = $table['indexes'];
+                    unset($table['indexes']);
+                }
+                if (!empty($indexes['remove'])) {
+                    $result = $this->alterDatabaseIndexes($table_name, array('remove' => $indexes['remove']));
+                    if (PEAR::isError($result)) {
+                        return $result;
+                    }
+                    unset($indexes['remove']);
+                    $alterations += $result;
+                }
+                $result = $this->db->manager->alterTable($table_name, $table, false);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+                $alterations++;
+
+                // table may be renamed at this point
+                if (!empty($table['name'])) {
+                    $table_name = $table['name'];
+                }
+
+                if (!empty($indexes)) {
+                    $result = $this->alterDatabaseIndexes($table_name, $indexes);
+                    if (PEAR::isError($result)) {
+                        return $result;
+                    }
+                    $alterations += $result;
+                }
+            }
+        }
+
+        return $alterations;
+    }
+
+    // }}}
+    // {{{ alterDatabaseSequences()
+
+    /**
+     * Execute the necessary actions to implement the requested changes
+     * in the sequences inside a database structure.
+     *
+     * @param array $current_definition  multi dimensional array that contains the current definition
+     * @param array $previous_definition multi dimensional array that contains the previous definition
+     * @param array $changes             associative array that contains the definition of the changes
+     *                                   that are meant to be applied to the database structure.
+     *
+     * @return bool|MDB2_Error MDB2_OK or error object
+     * @access public
+     */
+    function alterDatabaseSequences($current_definition, $previous_definition, $changes)
+    {
+        $alterations = 0;
+        if (empty($changes)) {
+            return $alterations;
+        }
+
+        if (!empty($changes['add']) && is_array($changes['add'])) {
+            foreach ($changes['add'] as $sequence_name => $sequence) {
+                $result = $this->createSequence($sequence_name, $current_definition[$sequence_name]);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+                $alterations++;
+            }
+        }
+
+        if (!empty($changes['remove']) && is_array($changes['remove'])) {
+            foreach ($changes['remove'] as $sequence_name => $sequence) {
+                $result = $this->db->manager->dropSequence($sequence_name);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+                $alterations++;
+            }
+        }
+
+        if (!empty($changes['change']) && is_array($changes['change'])) {
+            foreach ($changes['change'] as $sequence_name => $sequence) {
+                $result = $this->db->manager->dropSequence($previous_definition[$sequence_name]['was']);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+                $result = $this->createSequence($sequence_name, $sequence);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+                $alterations++;
+            }
+        }
+
+        return $alterations;
+    }
+
+    // }}}
+    // {{{ alterDatabase()
+
+    /**
+     * Execute the necessary actions to implement the requested changes
+     * in a database structure.
+     *
+     * @param array $current_definition  multi dimensional array that contains the current definition
+     * @param array $previous_definition multi dimensional array that contains the previous definition
+     * @param array $changes             associative array that contains the definition of the changes
+     *                                   that are meant to be applied to the database structure.
+     *
+     * @return bool|MDB2_Error MDB2_OK or error object
+     * @access public
+     */
+    function alterDatabase($current_definition, $previous_definition, $changes)
+    {
+        $alterations = 0;
+        if (empty($changes)) {
+            return $alterations;
+        }
+
+        $result = $this->verifyAlterDatabase($changes);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        if (!empty($current_definition['name'])) {
+            $previous_database_name = $this->db->setDatabase($current_definition['name']);
+        }
+
+        if (($support_transactions = $this->db->supports('transactions'))
+            && PEAR::isError($result = $this->db->beginNestedTransaction())
+        ) {
+            return $result;
+        }
+
+        if (!empty($changes['tables']) && !empty($current_definition['tables'])) {
+            $current_tables  = isset($current_definition['tables']) ? $current_definition['tables'] : array();
+            $previous_tables = isset($previous_definition['tables']) ? $previous_definition['tables'] : array();
+
+            $result = $this->alterDatabaseTables($current_tables, $previous_tables, $changes['tables']);
+            if (is_numeric($result)) {
+                $alterations += $result;
+            }
+        }
+
+        if (!PEAR::isError($result) && !empty($changes['sequences'])) {
+            $current_sequences  = isset($current_definition['sequences']) ? $current_definition['sequences'] : array();
+            $previous_sequences = isset($previous_definition['sequences']) ? $previous_definition['sequences'] : array();
+
+            $result = $this->alterDatabaseSequences($current_sequences, $previous_sequences, $changes['sequences']);
+            if (is_numeric($result)) {
+                $alterations += $result;
+            }
+        }
+
+        if ($support_transactions) {
+            $res = $this->db->completeNestedTransaction();
+            if (PEAR::isError($res)) {
+                $result = $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
+                    'Could not end transaction ('.
+                    $res->getMessage().' ('.$res->getUserinfo().'))');
+            }
+        } elseif (PEAR::isError($result) && $alterations) {
+            $result = $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
+                'the requested database alterations were only partially implemented ('.
+                $result->getMessage().' ('.$result->getUserinfo().'))');
+        }
+
+        if (isset($previous_database_name)) {
+            $this->db->setDatabase($previous_database_name);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ dumpDatabaseChanges()
+
+    /**
+     * Dump the changes between two database definitions.
+     *
+     * @param array $changes associative array that specifies the list of database
+     *              definitions changes as returned by the _compareDefinitions
+     *              manager class function.
+     *
+     * @return bool|MDB2_Error MDB2_OK or error object
+     * @access public
+     */
+    function dumpDatabaseChanges($changes)
+    {
+        if (!empty($changes['tables'])) {
+            if (!empty($changes['tables']['add']) && is_array($changes['tables']['add'])) {
+                foreach ($changes['tables']['add'] as $table_name => $table) {
+                    $this->db->debug("$table_name:", __FUNCTION__);
+                    $this->db->debug("\tAdded table '$table_name'", __FUNCTION__);
+                }
+            }
+
+            if (!empty($changes['tables']['remove']) && is_array($changes['tables']['remove'])) {
+                if ($this->options['drop_missing_tables']) {
+                    foreach ($changes['tables']['remove'] as $table_name => $table) {
+                        $this->db->debug("$table_name:", __FUNCTION__);
+                        $this->db->debug("\tRemoved table '$table_name'", __FUNCTION__);
+                    }
+                } else {
+                    foreach ($changes['tables']['remove'] as $table_name => $table) {
+                        $this->db->debug("\tObsolete table '$table_name' left as is", __FUNCTION__);
+                    }
+                }
+            }
+
+            if (!empty($changes['tables']['change']) && is_array($changes['tables']['change'])) {
+                foreach ($changes['tables']['change'] as $table_name => $table) {
+                    if (array_key_exists('name', $table)) {
+                        $this->db->debug("\tRenamed table '$table_name' to '".$table['name']."'", __FUNCTION__);
+                    }
+                    if (!empty($table['add']) && is_array($table['add'])) {
+                        foreach ($table['add'] as $field_name => $field) {
+                            $this->db->debug("\tAdded field '".$field_name."'", __FUNCTION__);
+                        }
+                    }
+                    if (!empty($table['remove']) && is_array($table['remove'])) {
+                        foreach ($table['remove'] as $field_name => $field) {
+                            $this->db->debug("\tRemoved field '".$field_name."'", __FUNCTION__);
+                        }
+                    }
+                    if (!empty($table['rename']) && is_array($table['rename'])) {
+                        foreach ($table['rename'] as $field_name => $field) {
+                            $this->db->debug("\tRenamed field '".$field_name."' to '".$field['name']."'", __FUNCTION__);
+                        }
+                    }
+                    if (!empty($table['change']) && is_array($table['change'])) {
+                        foreach ($table['change'] as $field_name => $field) {
+                            $field = $field['definition'];
+                            if (array_key_exists('type', $field)) {
+                                $this->db->debug("\tChanged field '$field_name' type to '".$field['type']."'", __FUNCTION__);
+                            }
+
+                            if (array_key_exists('unsigned', $field)) {
+                                $this->db->debug("\tChanged field '$field_name' type to '".
+                                                 (!empty($field['unsigned']) && $field['unsigned'] ? '' : 'not ')."unsigned'",
+                                                 __FUNCTION__);
+                            }
+
+                            if (array_key_exists('length', $field)) {
+                                $this->db->debug("\tChanged field '$field_name' length to '".
+                                                (!empty($field['length']) ? $field['length']: 'no length')."'", __FUNCTION__);
+                            }
+                            if (array_key_exists('default', $field)) {
+                                $this->db->debug("\tChanged field '$field_name' default to ".
+                                                 (isset($field['default']) ? "'".$field['default']."'" : 'NULL'), __FUNCTION__);
+                            }
+
+                            if (array_key_exists('notnull', $field)) {
+                                $this->db->debug("\tChanged field '$field_name' notnull to ".
+                                                 (!empty($field['notnull']) && $field['notnull'] ? 'true' : 'false'),
+                                                 __FUNCTION__);
+                            }
+                        }
+                    }
+                    if (!empty($table['indexes']) && is_array($table['indexes'])) {
+                        if (!empty($table['indexes']['add']) && is_array($table['indexes']['add'])) {
+                            foreach ($table['indexes']['add'] as $index_name => $index) {
+                                $this->db->debug("\tAdded index '".$index_name.
+                                    "' of table '$table_name'", __FUNCTION__);
+                            }
+                        }
+                        if (!empty($table['indexes']['remove']) && is_array($table['indexes']['remove'])) {
+                            foreach ($table['indexes']['remove'] as $index_name => $index) {
+                                $this->db->debug("\tRemoved index '".$index_name.
+                                    "' of table '$table_name'", __FUNCTION__);
+                            }
+                        }
+                        if (!empty($table['indexes']['change']) && is_array($table['indexes']['change'])) {
+                            foreach ($table['indexes']['change'] as $index_name => $index) {
+                                if (array_key_exists('name', $index)) {
+                                    $this->db->debug("\tRenamed index '".$index_name."' to '".$index['name'].
+                                                     "' on table '$table_name'", __FUNCTION__);
+                                }
+                                if (array_key_exists('unique', $index)) {
+                                    $this->db->debug("\tChanged index '".$index_name."' unique to '".
+                                                     !empty($index['unique'])."' on table '$table_name'", __FUNCTION__);
+                                }
+                                if (array_key_exists('primary', $index)) {
+                                    $this->db->debug("\tChanged index '".$index_name."' primary to '".
+                                                     !empty($index['primary'])."' on table '$table_name'", __FUNCTION__);
+                                }
+                                if (array_key_exists('change', $index)) {
+                                    $this->db->debug("\tChanged index '".$index_name.
+                                        "' on table '$table_name'", __FUNCTION__);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if (!empty($changes['sequences'])) {
+            if (!empty($changes['sequences']['add']) && is_array($changes['sequences']['add'])) {
+                foreach ($changes['sequences']['add'] as $sequence_name => $sequence) {
+                    $this->db->debug("$sequence_name:", __FUNCTION__);
+                    $this->db->debug("\tAdded sequence '$sequence_name'", __FUNCTION__);
+                }
+            }
+            if (!empty($changes['sequences']['remove']) && is_array($changes['sequences']['remove'])) {
+                foreach ($changes['sequences']['remove'] as $sequence_name => $sequence) {
+                    $this->db->debug("$sequence_name:", __FUNCTION__);
+                    $this->db->debug("\tAdded sequence '$sequence_name'", __FUNCTION__);
+                }
+            }
+            if (!empty($changes['sequences']['change']) && is_array($changes['sequences']['change'])) {
+                foreach ($changes['sequences']['change'] as $sequence_name => $sequence) {
+                    if (array_key_exists('name', $sequence)) {
+                        $this->db->debug("\tRenamed sequence '$sequence_name' to '".
+                                         $sequence['name']."'", __FUNCTION__);
+                    }
+                    if (!empty($sequence['change']) && is_array($sequence['change'])) {
+                        foreach ($sequence['change'] as $sequence_name => $sequence) {
+                            if (array_key_exists('start', $sequence)) {
+                                $this->db->debug("\tChanged sequence '$sequence_name' start to '".
+                                                 $sequence['start']."'", __FUNCTION__);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ dumpDatabase()
+
+    /**
+     * Dump a previously parsed database structure in the Metabase schema
+     * XML based format suitable for the Metabase parser. This function
+     * may optionally dump the database definition with initialization
+     * commands that specify the data that is currently present in the tables.
+     *
+     * @param array $database_definition multi dimensional array that contains the current definition
+     * @param array $arguments           associative array that takes pairs of tag
+     * names and values that define dump options.
+     *                 <pre>array (
+     *                     'output_mode'    =>    String
+     *                         'file' :   dump into a file
+     *                         default:   dump using a function
+     *                     'output'        =>    String
+     *                         depending on the 'Output_Mode'
+     *                                  name of the file
+     *                                  name of the function
+     *                     'end_of_line'        =>    String
+     *                         end of line delimiter that should be used
+     *                         default: "\n"
+     *                 );</pre>
+     * @param int   $dump                Int that determines what data to dump
+     *              + MDB2_SCHEMA_DUMP_ALL       : the entire db
+     *              + MDB2_SCHEMA_DUMP_STRUCTURE : only the structure of the db
+     *              + MDB2_SCHEMA_DUMP_CONTENT   : only the content of the db
+     *
+     * @return bool|MDB2_Error MDB2_OK or error object
+     * @access public
+     */
+    function dumpDatabase($database_definition, $arguments, $dump = MDB2_SCHEMA_DUMP_ALL)
+    {
+        $class_name = $this->options['writer'];
+
+        $result = MDB2::loadClass($class_name, $this->db->getOption('debug'));
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        // get initialization data
+        if (isset($database_definition['tables']) && is_array($database_definition['tables'])
+            && $dump == MDB2_SCHEMA_DUMP_ALL || $dump == MDB2_SCHEMA_DUMP_CONTENT
+        ) {
+            foreach ($database_definition['tables'] as $table_name => $table) {
+                $fields  = array();
+                $fieldsq = array();
+                foreach ($table['fields'] as $field_name => $field) {
+                    $fields[$field_name] = $field['type'];
+
+                    $fieldsq[] = $this->db->quoteIdentifier($field_name, true);
+                }
+
+                $query  = 'SELECT '.implode(', ', $fieldsq).' FROM ';
+                $query .= $this->db->quoteIdentifier($table_name, true);
+
+                $data = $this->db->queryAll($query, $fields, MDB2_FETCHMODE_ASSOC);
+
+                if (PEAR::isError($data)) {
+                    return $data;
+                }
+
+                if (!empty($data)) {
+                    $initialization    = array();
+                    $lob_buffer_length = $this->db->getOption('lob_buffer_length');
+                    foreach ($data as $row) {
+                        $rows = array();
+                        foreach ($row as $key => $lob) {
+                            if (is_resource($lob)) {
+                                $value = '';
+                                while (!feof($lob)) {
+                                    $value .= fread($lob, $lob_buffer_length);
+                                }
+                                $row[$key] = $value;
+                            }
+                            $rows[] = array('name' => $key, 'group' => array('type' => 'value', 'data' => $row[$key]));
+                        }
+                        $initialization[] = array('type' => 'insert', 'data' => array('field' => $rows));
+                    }
+                    $database_definition['tables'][$table_name]['initialization'] = $initialization;
+                }
+            }
+        }
+
+        $writer = new $class_name($this->options['valid_types']);
+        return $writer->dumpDatabase($database_definition, $arguments, $dump);
+    }
+
+    // }}}
+    // {{{ writeInitialization()
+
+    /**
+     * Write initialization and sequences
+     *
+     * @param string|array $data      data file or data array
+     * @param string|array $structure structure file or array
+     * @param array        $variables associative array that is passed to the argument
+     * of the same name to the parseDatabaseDefinitionFile function. (there third
+     * param)
+     *
+     * @return bool|MDB2_Error MDB2_OK or error object
+     * @access public
+     */
+    function writeInitialization($data, $structure = false, $variables = array())
+    {
+        if ($structure) {
+            $structure = $this->parseDatabaseDefinition($structure, false, $variables);
+            if (PEAR::isError($structure)) {
+                return $structure;
+            }
+        }
+
+        $data = $this->parseDatabaseDefinition($data, false, $variables, false, $structure);
+        if (PEAR::isError($data)) {
+            return $data;
+        }
+
+        $previous_database_name = null;
+        if (!empty($data['name'])) {
+            $previous_database_name = $this->db->setDatabase($data['name']);
+        } elseif (!empty($structure['name'])) {
+            $previous_database_name = $this->db->setDatabase($structure['name']);
+        }
+
+        if (!empty($data['tables']) && is_array($data['tables'])) {
+            foreach ($data['tables'] as $table_name => $table) {
+                if (empty($table['initialization'])) {
+                    continue;
+                }
+                $result = $this->initializeTable($table_name, $table);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+        }
+
+        if (!empty($structure['sequences']) && is_array($structure['sequences'])) {
+            foreach ($structure['sequences'] as $sequence_name => $sequence) {
+                if (isset($data['sequences'][$sequence_name])
+                    || !isset($sequence['on']['table'])
+                    || !isset($data['tables'][$sequence['on']['table']])
+                ) {
+                    continue;
+                }
+                $result = $this->createSequence($sequence_name, $sequence, true);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+        }
+        if (!empty($data['sequences']) && is_array($data['sequences'])) {
+            foreach ($data['sequences'] as $sequence_name => $sequence) {
+                $result = $this->createSequence($sequence_name, $sequence, true);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+        }
+
+        if (isset($previous_database_name)) {
+            $this->db->setDatabase($previous_database_name);
+        }
+
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ updateDatabase()
+
+    /**
+     * Compare the correspondent files of two versions of a database schema
+     * definition: the previously installed and the one that defines the schema
+     * that is meant to update the database.
+     * If the specified previous definition file does not exist, this function
+     * will create the database from the definition specified in the current
+     * schema file.
+     * If both files exist, the function assumes that the database was previously
+     * installed based on the previous schema file and will update it by just
+     * applying the changes.
+     * If this function succeeds, the contents of the current schema file are
+     * copied to replace the previous schema file contents. Any subsequent schema
+     * changes should only be done on the file specified by the $current_schema_file
+     * to let this function make a consistent evaluation of the exact changes that
+     * need to be applied.
+     *
+     * @param string|array $current_schema            filename or array of the updated database schema definition.
+     * @param string|array $previous_schema           filename or array of the previously installed database schema definition.
+     * @param array        $variables                 associative array that is passed to the argument of the same
+     *                                                name to the parseDatabaseDefinitionFile function. (there third param)
+     * @param bool         $disable_query             determines if the disable_query option should be set to true
+     *                                                for the alterDatabase() or createDatabase() call
+     * @param bool         $overwrite_old_schema_file Overwrite?
+     *
+     * @return bool|MDB2_Error MDB2_OK or error object
+     * @access public
+     */
+    function updateDatabase($current_schema, $previous_schema = false,
+                            $variables = array(), $disable_query = false,
+                            $overwrite_old_schema_file = false)
+    {
+        $current_definition = $this->parseDatabaseDefinition($current_schema, false, $variables,
+                                                             $this->options['fail_on_invalid_names']);
+
+        if (PEAR::isError($current_definition)) {
+            return $current_definition;
+        }
+
+        $previous_definition = false;
+        if ($previous_schema) {
+            $previous_definition = $this->parseDatabaseDefinition($previous_schema, true, $variables,
+                                                                  $this->options['fail_on_invalid_names']);
+            if (PEAR::isError($previous_definition)) {
+                return $previous_definition;
+            }
+        }
+
+        if ($previous_definition) {
+            $dbExists = $this->db->databaseExists($current_definition['name']);
+            if (PEAR::isError($dbExists)) {
+                return $dbExists;
+            }
+
+            if (!$dbExists) {
+                 return $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
+                    'database to update does not exist: '.$current_definition['name']);
+            }
+
+            $changes = $this->compareDefinitions($current_definition, $previous_definition);
+            if (PEAR::isError($changes)) {
+                return $changes;
+            }
+
+            if (is_array($changes)) {
+                $this->db->setOption('disable_query', $disable_query);
+                $result = $this->alterDatabase($current_definition, $previous_definition, $changes);
+                $this->db->setOption('disable_query', false);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+                $copy = true;
+                if ($this->db->options['debug']) {
+                    $result = $this->dumpDatabaseChanges($changes);
+                    if (PEAR::isError($result)) {
+                        return $result;
+                    }
+                }
+            }
+        } else {
+            $this->db->setOption('disable_query', $disable_query);
+            $result = $this->createDatabase($current_definition);
+            $this->db->setOption('disable_query', false);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+
+        if ($overwrite_old_schema_file
+            && !$disable_query
+            && is_string($previous_schema) && is_string($current_schema)
+            && !copy($current_schema, $previous_schema)) {
+
+            return $this->raiseError(MDB2_SCHEMA_ERROR, null, null,
+                'Could not copy the new database definition file to the current file');
+        }
+
+        return MDB2_OK;
+    }
+    // }}}
+    // {{{ errorMessage()
+
+    /**
+     * Return a textual error message for a MDB2 error code
+     *
+     * @param int|array $value integer error code, <code>null</code> to get the
+     *                          current error code-message map,
+     *                          or an array with a new error code-message map
+     *
+     * @return  string  error message, or false if the error code was not recognized
+     * @access public
+     */
+    function errorMessage($value = null)
+    {
+        static $errorMessages;
+        if (is_array($value)) {
+            $errorMessages = $value;
+            return MDB2_OK;
+        } elseif (!isset($errorMessages)) {
+            $errorMessages = array(
+                MDB2_SCHEMA_ERROR              => 'unknown error',
+                MDB2_SCHEMA_ERROR_PARSE        => 'schema parse error',
+                MDB2_SCHEMA_ERROR_VALIDATE     => 'schema validation error',
+                MDB2_SCHEMA_ERROR_INVALID      => 'invalid',
+                MDB2_SCHEMA_ERROR_UNSUPPORTED  => 'not supported',
+                MDB2_SCHEMA_ERROR_WRITER       => 'schema writer error',
+            );
+        }
+
+        if (is_null($value)) {
+            return $errorMessages;
+        }
+
+        if (PEAR::isError($value)) {
+            $value = $value->getCode();
+        }
+
+        return !empty($errorMessages[$value]) ?
+           $errorMessages[$value] : $errorMessages[MDB2_SCHEMA_ERROR];
+    }
+
+    // }}}
+    // {{{ raiseError()
+
+    /**
+     * This method is used to communicate an error and invoke error
+     * callbacks etc.  Basically a wrapper for PEAR::raiseError
+     * without the message string.
+     *
+     * @param int|PEAR_Error $code     integer error code or and PEAR_Error instance
+     * @param int            $mode     error mode, see PEAR_Error docs
+     *                                 error level (E_USER_NOTICE etc).  If error mode is
+     *                                 PEAR_ERROR_CALLBACK, this is the callback function,
+     *                                 either as a function name, or as an array of an
+     *                                 object and method name.  For other error modes this
+     *                                 parameter is ignored.
+     * @param array          $options  Options, depending on the mode, @see PEAR::setErrorHandling
+     * @param string         $userinfo Extra debug information.  Defaults to the last
+     *                                 query and native error code.
+     *
+     * @return object  a PEAR error object
+     * @access  public
+     * @see PEAR_Error
+     */
+    function raiseError($code = null, $mode = null, $options = null, $userinfo = null,$a=null,$b=null,$c=null)
+    {
+        $err =PEAR::raiseError(null, $code, $mode, $options,
+                                $userinfo, 'MDB2_Schema_Error', true);
+        return $err;
+    }
+
+    // }}}
+    // {{{ isError()
+
+    /**
+     * Tell whether a value is an MDB2_Schema error.
+     *
+     * @param mixed $data the value to test
+     * @param int   $code if $data is an error object, return true only if $code is
+     *                    a string and $db->getMessage() == $code or
+     *                    $code is an integer and $db->getCode() == $code
+     *
+     * @return  bool  true if parameter is an error
+     * @access  public
+     */
+    static function isError($data, $code = null)
+    {
+        if (is_a($data, 'MDB2_Schema_Error')) {
+            if (is_null($code)) {
+                return true;
+            } elseif (is_string($code)) {
+                return $data->getMessage() === $code;
+            } else {
+                $code = (array)$code;
+                return in_array($data->getCode(), $code);
+            }
+        }
+        return false;
+    }
+
+    // }}}
+}
+
+/**
+ * MDB2_Schema_Error implements a class for reporting portable database error
+ * messages.
+ *
+ * @category Database
+ * @package  MDB2_Schema
+ * @author   Stig Bakken <ssb@fast.no>
+ * @license  BSD http://www.opensource.org/licenses/bsd-license.php
+ * @link     http://pear.php.net/packages/MDB2_Schema
+ */
+class MDB2_Schema_Error extends PEAR_Error
+{
+    /**
+     * MDB2_Schema_Error constructor.
+     *
+     * @param mixed $code      error code, or string with error message.
+     * @param int   $mode      what 'error mode' to operate in
+     * @param int   $level     what error level to use for $mode & PEAR_ERROR_TRIGGER
+     * @param mixed $debuginfo additional debug info, such as the last query
+     *
+     * @access  public
+     */
+    function MDB2_Schema_Error($code = MDB2_SCHEMA_ERROR, $mode = PEAR_ERROR_RETURN,
+              $level = E_USER_NOTICE, $debuginfo = null)
+    {
+        $this->PEAR_Error('MDB2_Schema Error: ' . MDB2_Schema::errorMessage($code), $code,
+            $mode, $level, $debuginfo);
+    }
+}
+?>
diff --git a/3rdparty/MDB2/Schema/Parser.php b/3rdparty/MDB2/Schema/Parser.php
new file mode 100644
index 00000000000..b740ef55fa8
--- /dev/null
+++ b/3rdparty/MDB2/Schema/Parser.php
@@ -0,0 +1,812 @@
+<?php
+/**
+ * PHP versions 4 and 5
+ *
+ * Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,
+ * Stig. S. Bakken, Lukas Smith, Igor Feghali
+ * All rights reserved.
+ *
+ * MDB2_Schema enables users to maintain RDBMS independant schema files
+ * in XML that can be used to manipulate both data and database schemas
+ * This LICENSE is in the BSD license style.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,
+ * Lukas Smith, Igor Feghali nor the names of his contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Author: Christian Dickmann <dickmann@php.net>
+ * Author: Igor Feghali <ifeghali@php.net>
+ *
+ * $Id: Parser.php,v 1.68 2008/11/30 03:34:00 clockwerx Exp $
+ *
+ * @category Database
+ * @package  MDB2_Schema
+ * @author   Christian Dickmann <dickmann@php.net>
+ * @author   Igor Feghali <ifeghali@php.net>
+ * @license  BSD http://www.opensource.org/licenses/bsd-license.php
+ * @version  CVS: $Id: Parser.php,v 1.68 2008/11/30 03:34:00 clockwerx Exp $
+ * @link     http://pear.php.net/packages/MDB2_Schema
+ */
+
+
+require_once('XML/Parser.php');
+require_once('MDB2/Schema/Validate.php');
+
+/**
+ * Parses an XML schema file
+ *
+ * @category Database
+ * @package  MDB2_Schema
+ * @author   Christian Dickmann <dickmann@php.net>
+ * @license  BSD http://www.opensource.org/licenses/bsd-license.php
+ * @link     http://pear.php.net/packages/MDB2_Schema
+ */
+class MDB2_Schema_Parser extends XML_Parser
+{
+    var $database_definition = array();
+
+    var $elements = array();
+
+    var $element = '';
+
+    var $count = 0;
+
+    var $table = array();
+
+    var $table_name = '';
+
+    var $field = array();
+
+    var $field_name = '';
+
+    var $init = array();
+
+    var $init_function = array();
+
+    var $init_expression = array();
+
+    var $init_field = array();
+
+    var $index = array();
+
+    var $index_name = '';
+
+    var $constraint = array();
+
+    var $constraint_name = '';
+
+    var $var_mode = false;
+
+    var $variables = array();
+
+    var $sequence = array();
+
+    var $sequence_name = '';
+
+    var $error;
+
+    var $structure = false;
+
+    var $val;
+
+    function __construct($variables, $fail_on_invalid_names = true,
+                         $structure = false, $valid_types = array(),
+                         $force_defaults = true)
+    {
+        // force ISO-8859-1 due to different defaults for PHP4 and PHP5
+        // todo: this probably needs to be investigated some more andcleaned up
+        parent::__construct('ISO-8859-1');
+
+        $this->variables = $variables;
+        $this->structure = $structure;
+        $this->val       =new MDB2_Schema_Validate($fail_on_invalid_names, $valid_types, $force_defaults);
+    }
+
+    function startHandler($xp, $element, $attribs)
+    {
+        if (strtolower($element) == 'variable') {
+            $this->var_mode = true;
+            return;
+        }
+
+        $this->elements[$this->count++] = strtolower($element);
+
+        $this->element = implode('-', $this->elements);
+
+        switch ($this->element) {
+        /* Initialization */
+        case 'database-table-initialization':
+            $this->table['initialization'] = array();
+            break;
+
+        /* Insert */
+        /* insert: field+ */
+        case 'database-table-initialization-insert':
+            $this->init = array('type' => 'insert', 'data' => array('field' => array()));
+            break;
+        /* insert-select: field+, table, where? */
+        case 'database-table-initialization-insert-select':
+            $this->init['data']['table'] = '';
+            break;
+
+        /* Update */
+        /* update: field+, where? */
+        case 'database-table-initialization-update':
+            $this->init = array('type' => 'update', 'data' => array('field' => array()));
+            break;
+
+        /* Delete */
+        /* delete: where */
+        case 'database-table-initialization-delete':
+            $this->init = array('type' => 'delete', 'data' => array('where' => array()));
+            break;
+
+        /* Insert and Update */
+        case 'database-table-initialization-insert-field':
+        case 'database-table-initialization-insert-select-field':
+        case 'database-table-initialization-update-field':
+            $this->init_field = array('name' => '', 'group' => array());
+            break;
+        case 'database-table-initialization-insert-field-value':
+        case 'database-table-initialization-insert-select-field-value':
+        case 'database-table-initialization-update-field-value':
+            /* if value tag is empty cdataHandler is not called so we must force value element creation here */
+            $this->init_field['group'] = array('type' => 'value', 'data' => '');
+            break;
+        case 'database-table-initialization-insert-field-null':
+        case 'database-table-initialization-insert-select-field-null':
+        case 'database-table-initialization-update-field-null':
+            $this->init_field['group'] = array('type' => 'null');
+            break;
+        case 'database-table-initialization-insert-field-function':
+        case 'database-table-initialization-insert-select-field-function':
+        case 'database-table-initialization-update-field-function':
+            $this->init_function = array('name' => '');
+            break;
+        case 'database-table-initialization-insert-field-expression':
+        case 'database-table-initialization-insert-select-field-expression':
+        case 'database-table-initialization-update-field-expression':
+            $this->init_expression = array();
+            break;
+
+        /* All */
+        case 'database-table-initialization-insert-select-where':
+        case 'database-table-initialization-update-where':
+        case 'database-table-initialization-delete-where':
+            $this->init['data']['where'] = array('type' => '', 'data' => array());
+            break;
+        case 'database-table-initialization-insert-select-where-expression':
+        case 'database-table-initialization-update-where-expression':
+        case 'database-table-initialization-delete-where-expression':
+            $this->init_expression = array();
+            break;
+
+        /* One level simulation of expression-function recursion */
+        case 'database-table-initialization-insert-field-expression-function':
+        case 'database-table-initialization-insert-select-field-expression-function':
+        case 'database-table-initialization-insert-select-where-expression-function':
+        case 'database-table-initialization-update-field-expression-function':
+        case 'database-table-initialization-update-where-expression-function':
+        case 'database-table-initialization-delete-where-expression-function':
+            $this->init_function = array('name' => '');
+            break;
+
+        /* One level simulation of function-expression recursion */
+        case 'database-table-initialization-insert-field-function-expression':
+        case 'database-table-initialization-insert-select-field-function-expression':
+        case 'database-table-initialization-insert-select-where-function-expression':
+        case 'database-table-initialization-update-field-function-expression':
+        case 'database-table-initialization-update-where-function-expression':
+        case 'database-table-initialization-delete-where-function-expression':
+            $this->init_expression = array();
+            break;
+
+        /* Definition */
+        case 'database':
+            $this->database_definition = array(
+                'name' => '',
+                'create' => '',
+                'overwrite' => '',
+                'charset' => '',
+                'description' => '',
+                'comments' => '',
+                'tables' => array(),
+                'sequences' => array()
+            );
+            break;
+        case 'database-table':
+            $this->table_name = '';
+
+            $this->table = array(
+                'was' => '',
+                'description' => '',
+                'comments' => '',
+                'fields' => array(),
+                'indexes' => array(),
+                'constraints' => array(),
+                'initialization' => array()
+            );
+            break;
+        case 'database-table-declaration-field':
+        case 'database-table-declaration-foreign-field':
+        case 'database-table-declaration-foreign-references-field':
+            $this->field_name = '';
+
+            $this->field = array();
+            break;
+        case 'database-table-declaration-index-field':
+            $this->field_name = '';
+
+            $this->field = array('sorting' => '', 'length' => '');
+            break;
+        /* force field attributes to be initialized when the tag is empty in the XML */
+        case 'database-table-declaration-field-was':
+            $this->field['was'] = '';
+            break;
+        case 'database-table-declaration-field-type':
+            $this->field['type'] = '';
+            break;
+        case 'database-table-declaration-field-fixed':
+            $this->field['fixed'] = '';
+            break;
+        case 'database-table-declaration-field-default':
+            $this->field['default'] = '';
+            break;
+        case 'database-table-declaration-field-notnull':
+            $this->field['notnull'] = '';
+            break;
+        case 'database-table-declaration-field-autoincrement':
+            $this->field['autoincrement'] = '';
+            break;
+        case 'database-table-declaration-field-unsigned':
+            $this->field['unsigned'] = '';
+            break;
+        case 'database-table-declaration-field-length':
+            $this->field['length'] = '';
+            break;
+        case 'database-table-declaration-field-description':
+            $this->field['description'] = '';
+            break;
+        case 'database-table-declaration-field-comments':
+            $this->field['comments'] = '';
+            break;
+        case 'database-table-declaration-index':
+            $this->index_name = '';
+
+            $this->index = array(
+                'was' => '',
+                'unique' =>'',
+                'primary' => '',
+                'fields' => array()
+            );
+            break;
+        case 'database-table-declaration-foreign':
+            $this->constraint_name = '';
+
+            $this->constraint = array(
+                'was' => '',
+                'match' => '',
+                'ondelete' => '',
+                'onupdate' => '',
+                'deferrable' => '',
+                'initiallydeferred' => '',
+                'foreign' => true,
+                'fields' => array(),
+                'references' => array('table' => '', 'fields' => array())
+            );
+            break;
+        case 'database-sequence':
+            $this->sequence_name = '';
+
+            $this->sequence = array(
+                'was' => '',
+                'start' => '',
+                'description' => '',
+                'comments' => '',
+                'on' => array('table' => '', 'field' => '')
+            );
+            break;
+        }
+    }
+
+    function endHandler($xp, $element)
+    {
+        if (strtolower($element) == 'variable') {
+            $this->var_mode = false;
+            return;
+        }
+
+        switch ($this->element) {
+        /* Initialization */
+
+        /* Insert */
+        case 'database-table-initialization-insert-select':
+            $this->init['data'] = array('select' => $this->init['data']);
+            break;
+
+        /* Insert and Delete */
+        case 'database-table-initialization-insert-field':
+        case 'database-table-initialization-insert-select-field':
+        case 'database-table-initialization-update-field':
+            $result = $this->val->validateDataField($this->table['fields'], $this->init['data']['field'], $this->init_field);
+            if (PEAR::isError($result)) {
+                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
+            } else {
+                $this->init['data']['field'][] = $this->init_field;
+            }
+            break;
+        case 'database-table-initialization-insert-field-function':
+        case 'database-table-initialization-insert-select-field-function':
+        case 'database-table-initialization-update-field-function':
+            $this->init_field['group'] = array('type' => 'function', 'data' => $this->init_function);
+            break;
+        case 'database-table-initialization-insert-field-expression':
+        case 'database-table-initialization-insert-select-field-expression':
+        case 'database-table-initialization-update-field-expression':
+            $this->init_field['group'] = array('type' => 'expression', 'data' => $this->init_expression);
+            break;
+
+        /* All */
+        case 'database-table-initialization-insert-select-where-expression':
+        case 'database-table-initialization-update-where-expression':
+        case 'database-table-initialization-delete-where-expression':
+            $this->init['data']['where']['type'] = 'expression';
+            $this->init['data']['where']['data'] = $this->init_expression;
+            break;
+        case 'database-table-initialization-insert':
+        case 'database-table-initialization-delete':
+        case 'database-table-initialization-update':
+            $this->table['initialization'][] = $this->init;
+            break;
+
+        /* One level simulation of expression-function recursion */
+        case 'database-table-initialization-insert-field-expression-function':
+        case 'database-table-initialization-insert-select-field-expression-function':
+        case 'database-table-initialization-insert-select-where-expression-function':
+        case 'database-table-initialization-update-field-expression-function':
+        case 'database-table-initialization-update-where-expression-function':
+        case 'database-table-initialization-delete-where-expression-function':
+            $this->init_expression['operants'][] = array('type' => 'function', 'data' => $this->init_function);
+            break;
+
+        /* One level simulation of function-expression recursion */
+        case 'database-table-initialization-insert-field-function-expression':
+        case 'database-table-initialization-insert-select-field-function-expression':
+        case 'database-table-initialization-insert-select-where-function-expression':
+        case 'database-table-initialization-update-field-function-expression':
+        case 'database-table-initialization-update-where-function-expression':
+        case 'database-table-initialization-delete-where-function-expression':
+            $this->init_function['arguments'][] = array('type' => 'expression', 'data' => $this->init_expression);
+            break;
+
+        /* Table definition */
+        case 'database-table':
+            $result = $this->val->validateTable($this->database_definition['tables'], $this->table, $this->table_name);
+            if (PEAR::isError($result)) {
+                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
+            } else {
+                $this->database_definition['tables'][$this->table_name] = $this->table;
+            }
+            break;
+        case 'database-table-name':
+            if (isset($this->structure['tables'][$this->table_name])) {
+                $this->table = $this->structure['tables'][$this->table_name];
+            }
+            break;
+
+        /* Field declaration */
+        case 'database-table-declaration-field':
+            $result = $this->val->validateField($this->table['fields'], $this->field, $this->field_name);
+            if (PEAR::isError($result)) {
+                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
+            } else {
+                $this->table['fields'][$this->field_name] = $this->field;
+            }
+            break;
+
+        /* Index declaration */
+        case 'database-table-declaration-index':
+            $result = $this->val->validateIndex($this->table['indexes'], $this->index, $this->index_name);
+            if (PEAR::isError($result)) {
+                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
+            } else {
+                $this->table['indexes'][$this->index_name] = $this->index;
+            }
+            break;
+        case 'database-table-declaration-index-field':
+            $result = $this->val->validateIndexField($this->index['fields'], $this->field, $this->field_name);
+            if (PEAR::isError($result)) {
+                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
+            } else {
+                $this->index['fields'][$this->field_name] = $this->field;
+            }
+            break;
+
+        /* Foreign Key declaration */
+        case 'database-table-declaration-foreign':
+            $result = $this->val->validateConstraint($this->table['constraints'], $this->constraint, $this->constraint_name);
+            if (PEAR::isError($result)) {
+                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
+            } else {
+                $this->table['constraints'][$this->constraint_name] = $this->constraint;
+            }
+            break;
+        case 'database-table-declaration-foreign-field':
+            $result = $this->val->validateConstraintField($this->constraint['fields'], $this->field_name);
+            if (PEAR::isError($result)) {
+                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
+            } else {
+                $this->constraint['fields'][$this->field_name] = '';
+            }
+            break;
+        case 'database-table-declaration-foreign-references-field':
+            $result = $this->val->validateConstraintReferencedField($this->constraint['references']['fields'], $this->field_name);
+            if (PEAR::isError($result)) {
+                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
+            } else {
+                $this->constraint['references']['fields'][$this->field_name] = '';
+            }
+            break;
+
+        /* Sequence declaration */
+        case 'database-sequence':
+            $result = $this->val->validateSequence($this->database_definition['sequences'], $this->sequence, $this->sequence_name);
+            if (PEAR::isError($result)) {
+                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
+            } else {
+                $this->database_definition['sequences'][$this->sequence_name] = $this->sequence;
+            }
+            break;
+
+        /* End of File */
+        case 'database':
+            $result = $this->val->validateDatabase($this->database_definition);
+            if (PEAR::isError($result)) {
+                $this->raiseError($result->getUserinfo(), 0, $xp, $result->getCode());
+            }
+            break;
+        }
+
+        unset($this->elements[--$this->count]);
+        $this->element = implode('-', $this->elements);
+    }
+
+    function raiseError($msg = null, $xmlecode = 0, $xp = null, $ecode = MDB2_SCHEMA_ERROR_PARSE,$a=null,$b=null,$c=null)
+    {
+        if (is_null($this->error)) {
+            $error = '';
+            if (is_resource($msg)) {
+                $error .= 'Parser error: '.xml_error_string(xml_get_error_code($msg));
+                $xp     = $msg;
+            } else {
+                $error .= 'Parser error: '.$msg;
+                if (!is_resource($xp)) {
+                    $xp = $this->parser;
+                }
+            }
+
+            if ($error_string = xml_error_string($xmlecode)) {
+                $error .= ' - '.$error_string;
+            }
+
+            if (is_resource($xp)) {
+                $byte   = @xml_get_current_byte_index($xp);
+                $line   = @xml_get_current_line_number($xp);
+                $column = @xml_get_current_column_number($xp);
+                $error .= " - Byte: $byte; Line: $line; Col: $column";
+            }
+
+            $error .= "\n";
+
+            $this->error =& MDB2_Schema::raiseError($ecode, null, null, $error);
+        }
+        return $this->error;
+    }
+
+    function cdataHandler($xp, $data)
+    {
+        if ($this->var_mode == true) {
+            if (!isset($this->variables[$data])) {
+                $this->raiseError('variable "'.$data.'" not found', null, $xp);
+                return;
+            }
+            $data = $this->variables[$data];
+        }
+
+        switch ($this->element) {
+        /* Initialization */
+
+        /* Insert */
+        case 'database-table-initialization-insert-select-table':
+            $this->init['data']['table'] = $data;
+            break;
+
+        /* Insert and Update */
+        case 'database-table-initialization-insert-field-name':
+        case 'database-table-initialization-insert-select-field-name':
+        case 'database-table-initialization-update-field-name':
+            $this->init_field['name'] .= $data;
+            break;
+        case 'database-table-initialization-insert-field-value':
+        case 'database-table-initialization-insert-select-field-value':
+        case 'database-table-initialization-update-field-value':
+            $this->init_field['group']['data'] .= $data;
+            break;
+        case 'database-table-initialization-insert-field-function-name':
+        case 'database-table-initialization-insert-select-field-function-name':
+        case 'database-table-initialization-update-field-function-name':
+            $this->init_function['name'] .= $data;
+            break;
+        case 'database-table-initialization-insert-field-function-value':
+        case 'database-table-initialization-insert-select-field-function-value':
+        case 'database-table-initialization-update-field-function-value':
+            $this->init_function['arguments'][] = array('type' => 'value', 'data' => $data);
+            break;
+        case 'database-table-initialization-insert-field-function-column':
+        case 'database-table-initialization-insert-select-field-function-column':
+        case 'database-table-initialization-update-field-function-column':
+            $this->init_function['arguments'][] = array('type' => 'column', 'data' => $data);
+            break;
+        case 'database-table-initialization-insert-field-column':
+        case 'database-table-initialization-insert-select-field-column':
+        case 'database-table-initialization-update-field-column':
+            $this->init_field['group'] = array('type' => 'column', 'data' => $data);
+            break;
+
+        /* All */
+        case 'database-table-initialization-insert-field-expression-operator':
+        case 'database-table-initialization-insert-select-field-expression-operator':
+        case 'database-table-initialization-insert-select-where-expression-operator':
+        case 'database-table-initialization-update-field-expression-operator':
+        case 'database-table-initialization-update-where-expression-operator':
+        case 'database-table-initialization-delete-where-expression-operator':
+            $this->init_expression['operator'] = $data;
+            break;
+        case 'database-table-initialization-insert-field-expression-value':
+        case 'database-table-initialization-insert-select-field-expression-value':
+        case 'database-table-initialization-insert-select-where-expression-value':
+        case 'database-table-initialization-update-field-expression-value':
+        case 'database-table-initialization-update-where-expression-value':
+        case 'database-table-initialization-delete-where-expression-value':
+            $this->init_expression['operants'][] = array('type' => 'value', 'data' => $data);
+            break;
+        case 'database-table-initialization-insert-field-expression-column':
+        case 'database-table-initialization-insert-select-field-expression-column':
+        case 'database-table-initialization-insert-select-where-expression-column':
+        case 'database-table-initialization-update-field-expression-column':
+        case 'database-table-initialization-update-where-expression-column':
+        case 'database-table-initialization-delete-where-expression-column':
+            $this->init_expression['operants'][] = array('type' => 'column', 'data' => $data);
+            break;
+
+        case 'database-table-initialization-insert-field-function-function':
+        case 'database-table-initialization-insert-field-function-expression':
+        case 'database-table-initialization-insert-field-expression-expression':
+        case 'database-table-initialization-update-field-function-function':
+        case 'database-table-initialization-update-field-function-expression':
+        case 'database-table-initialization-update-field-expression-expression':
+        case 'database-table-initialization-update-where-expression-expression':
+        case 'database-table-initialization-delete-where-expression-expression':
+            /* Recursion to be implemented yet */
+            break;
+
+        /* One level simulation of expression-function recursion */
+        case 'database-table-initialization-insert-field-expression-function-name':
+        case 'database-table-initialization-insert-select-field-expression-function-name':
+        case 'database-table-initialization-insert-select-where-expression-function-name':
+        case 'database-table-initialization-update-field-expression-function-name':
+        case 'database-table-initialization-update-where-expression-function-name':
+        case 'database-table-initialization-delete-where-expression-function-name':
+            $this->init_function['name'] .= $data;
+            break;
+        case 'database-table-initialization-insert-field-expression-function-value':
+        case 'database-table-initialization-insert-select-field-expression-function-value':
+        case 'database-table-initialization-insert-select-where-expression-function-value':
+        case 'database-table-initialization-update-field-expression-function-value':
+        case 'database-table-initialization-update-where-expression-function-value':
+        case 'database-table-initialization-delete-where-expression-function-value':
+            $this->init_function['arguments'][] = array('type' => 'value', 'data' => $data);
+            break;
+        case 'database-table-initialization-insert-field-expression-function-column':
+        case 'database-table-initialization-insert-select-field-expression-function-column':
+        case 'database-table-initialization-insert-select-where-expression-function-column':
+        case 'database-table-initialization-update-field-expression-function-column':
+        case 'database-table-initialization-update-where-expression-function-column':
+        case 'database-table-initialization-delete-where-expression-function-column':
+            $this->init_function['arguments'][] = array('type' => 'column', 'data' => $data);
+            break;
+
+        /* One level simulation of function-expression recursion */
+        case 'database-table-initialization-insert-field-function-expression-operator':
+        case 'database-table-initialization-insert-select-field-function-expression-operator':
+        case 'database-table-initialization-update-field-function-expression-operator':
+            $this->init_expression['operator'] = $data;
+            break;
+        case 'database-table-initialization-insert-field-function-expression-value':
+        case 'database-table-initialization-insert-select-field-function-expression-value':
+        case 'database-table-initialization-update-field-function-expression-value':
+            $this->init_expression['operants'][] = array('type' => 'value', 'data' => $data);
+            break;
+        case 'database-table-initialization-insert-field-function-expression-column':
+        case 'database-table-initialization-insert-select-field-function-expression-column':
+        case 'database-table-initialization-update-field-function-expression-column':
+            $this->init_expression['operants'][] = array('type' => 'column', 'data' => $data);
+            break;
+
+        /* Database */
+        case 'database-name':
+            $this->database_definition['name'] .= $data;
+            break;
+        case 'database-create':
+            $this->database_definition['create'] .= $data;
+            break;
+        case 'database-overwrite':
+            $this->database_definition['overwrite'] .= $data;
+            break;
+        case 'database-charset':
+            $this->database_definition['charset'] .= $data;
+            break;
+        case 'database-description':
+            $this->database_definition['description'] .= $data;
+            break;
+        case 'database-comments':
+            $this->database_definition['comments'] .= $data;
+            break;
+
+        /* Table declaration */
+        case 'database-table-name':
+            $this->table_name .= $data;
+            break;
+        case 'database-table-was':
+            $this->table['was'] .= $data;
+            break;
+        case 'database-table-description':
+            $this->table['description'] .= $data;
+            break;
+        case 'database-table-comments':
+            $this->table['comments'] .= $data;
+            break;
+
+        /* Field declaration */
+        case 'database-table-declaration-field-name':
+            $this->field_name .= $data;
+            break;
+        case 'database-table-declaration-field-was':
+            $this->field['was'] .= $data;
+            break;
+        case 'database-table-declaration-field-type':
+            $this->field['type'] .= $data;
+            break;
+        case 'database-table-declaration-field-fixed':
+            $this->field['fixed'] .= $data;
+            break;
+        case 'database-table-declaration-field-default':
+            $this->field['default'] .= $data;
+            break;
+        case 'database-table-declaration-field-notnull':
+            $this->field['notnull'] .= $data;
+            break;
+        case 'database-table-declaration-field-autoincrement':
+            $this->field['autoincrement'] .= $data;
+            break;
+        case 'database-table-declaration-field-unsigned':
+            $this->field['unsigned'] .= $data;
+            break;
+        case 'database-table-declaration-field-length':
+            $this->field['length'] .= $data;
+            break;
+        case 'database-table-declaration-field-description':
+            $this->field['description'] .= $data;
+            break;
+        case 'database-table-declaration-field-comments':
+            $this->field['comments'] .= $data;
+            break;
+
+        /* Index declaration */
+        case 'database-table-declaration-index-name':
+            $this->index_name .= $data;
+            break;
+        case 'database-table-declaration-index-was':
+            $this->index['was'] .= $data;
+            break;
+        case 'database-table-declaration-index-unique':
+            $this->index['unique'] .= $data;
+            break;
+        case 'database-table-declaration-index-primary':
+            $this->index['primary'] .= $data;
+            break;
+        case 'database-table-declaration-index-field-name':
+            $this->field_name .= $data;
+            break;
+        case 'database-table-declaration-index-field-sorting':
+            $this->field['sorting'] .= $data;
+            break;
+        /* Add by Leoncx */
+        case 'database-table-declaration-index-field-length':
+            $this->field['length'] .= $data;
+            break;
+
+        /* Foreign Key declaration */
+        case 'database-table-declaration-foreign-name':
+            $this->constraint_name .= $data;
+            break;
+        case 'database-table-declaration-foreign-was':
+            $this->constraint['was'] .= $data;
+            break;
+        case 'database-table-declaration-foreign-match':
+            $this->constraint['match'] .= $data;
+            break;
+        case 'database-table-declaration-foreign-ondelete':
+            $this->constraint['ondelete'] .= $data;
+            break;
+        case 'database-table-declaration-foreign-onupdate':
+            $this->constraint['onupdate'] .= $data;
+            break;
+        case 'database-table-declaration-foreign-deferrable':
+            $this->constraint['deferrable'] .= $data;
+            break;
+        case 'database-table-declaration-foreign-initiallydeferred':
+            $this->constraint['initiallydeferred'] .= $data;
+            break;
+        case 'database-table-declaration-foreign-field':
+            $this->field_name .= $data;
+            break;
+        case 'database-table-declaration-foreign-references-table':
+            $this->constraint['references']['table'] .= $data;
+            break;
+        case 'database-table-declaration-foreign-references-field':
+            $this->field_name .= $data;
+            break;
+
+        /* Sequence declaration */
+        case 'database-sequence-name':
+            $this->sequence_name .= $data;
+            break;
+        case 'database-sequence-was':
+            $this->sequence['was'] .= $data;
+            break;
+        case 'database-sequence-start':
+            $this->sequence['start'] .= $data;
+            break;
+        case 'database-sequence-description':
+            $this->sequence['description'] .= $data;
+            break;
+        case 'database-sequence-comments':
+            $this->sequence['comments'] .= $data;
+            break;
+        case 'database-sequence-on-table':
+            $this->sequence['on']['table'] .= $data;
+            break;
+        case 'database-sequence-on-field':
+            $this->sequence['on']['field'] .= $data;
+            break;
+        }
+    }
+}
+
+?>
diff --git a/3rdparty/MDB2/Schema/Parser2.php b/3rdparty/MDB2/Schema/Parser2.php
new file mode 100644
index 00000000000..01318473fdd
--- /dev/null
+++ b/3rdparty/MDB2/Schema/Parser2.php
@@ -0,0 +1,624 @@
+<?php
+/**
+ * PHP versions 4 and 5
+ *
+ * Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,
+ * Stig. S. Bakken, Lukas Smith, Igor Feghali
+ * All rights reserved.
+ *
+ * MDB2_Schema enables users to maintain RDBMS independant schema files
+ * in XML that can be used to manipulate both data and database schemas
+ * This LICENSE is in the BSD license style.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,
+ * Lukas Smith, Igor Feghali nor the names of his contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Author: Igor Feghali <ifeghali@php.net>
+ *
+ * @category Database
+ * @package  MDB2_Schema
+ * @author   Igor Feghali <ifeghali@php.net>
+ * @license  BSD http://www.opensource.org/licenses/bsd-license.php
+ * @version  CVS: $Id: Parser2.php,v 1.12 2008/11/30 03:34:00 clockwerx Exp $
+ * @link     http://pear.php.net/packages/MDB2_Schema
+ */
+
+require_once 'XML/Unserializer.php';
+require_once 'MDB2/Schema/Validate.php';
+
+/**
+ * Parses an XML schema file
+ *
+ * @category Database
+ * @package  MDB2_Schema
+ * @author   Lukas Smith <smith@pooteeweet.org>
+ * @author   Igor Feghali <ifeghali@php.net>
+ * @license  BSD http://www.opensource.org/licenses/bsd-license.php
+ * @link     http://pear.php.net/packages/MDB2_Schema
+ */
+class MDB2_Schema_Parser2 extends XML_Unserializer
+{
+    var $database_definition = array();
+
+    var $database_loaded = array();
+
+    var $variables = array();
+
+    var $error;
+
+    var $structure = false;
+
+    var $val;
+
+    var $options = array();
+
+    var $table = array();
+
+    var $table_name = '';
+
+    var $field = array();
+
+    var $field_name = '';
+
+    var $index = array();
+
+    var $index_name = '';
+
+    var $constraint = array();
+
+    var $constraint_name = '';
+
+    var $sequence = array();
+
+    var $sequence_name = '';
+
+    var $init = array();
+
+    function __construct($variables, $fail_on_invalid_names = true, $structure = false, $valid_types = array(), $force_defaults = true)
+    {
+        // force ISO-8859-1 due to different defaults for PHP4 and PHP5
+        // todo: this probably needs to be investigated some more and cleaned up
+        $this->options['encoding'] = 'ISO-8859-1';
+
+        $this->options['XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE']    = true;
+        $this->options['XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY'] = false;
+
+        $this->options['forceEnum'] = array('table', 'field', 'index', 'foreign', 'insert', 'update', 'delete', 'sequence');
+
+        /*
+         * todo: find a way to force the following items not to be parsed as arrays
+         * as it cause problems in functions with multiple arguments
+         */
+        //$this->options['forceNEnum'] = array('value', 'column');
+        $this->variables = $variables;
+        $this->structure = $structure;
+
+        $this->val =& new MDB2_Schema_Validate($fail_on_invalid_names, $valid_types, $force_defaults);
+        parent::XML_Unserializer($this->options);
+    }
+
+    function MDB2_Schema_Parser2($variables, $fail_on_invalid_names = true, $structure = false, $valid_types = array(), $force_defaults = true)
+    {
+        $this->__construct($variables, $fail_on_invalid_names, $structure, $valid_types, $force_defaults);
+    }
+
+    function parse()
+    {
+        $result = $this->unserialize($this->filename, true);
+
+        if (PEAR::isError($result)) {
+            return $result;
+        } else {
+            $this->database_loaded = $this->getUnserializedData();
+            return $this->fixDatabaseKeys($this->database_loaded);
+        }
+    }
+
+    function setInputFile($filename)
+    {
+        $this->filename = $filename;
+        return MDB2_OK;
+    }
+
+    function renameKey(&$arr, $oKey, $nKey)
+    {
+        $arr[$nKey] = &$arr[$oKey];
+        unset($arr[$oKey]);
+    }
+
+    function fixDatabaseKeys($database)
+    {
+        $this->database_definition = array(
+            'name' => '',
+            'create' => '',
+            'overwrite' => '',
+            'charset' => '',
+            'description' => '',
+            'comments' => '',
+            'tables' => array(),
+            'sequences' => array()
+        );
+
+        if (!empty($database['name'])) {
+            $this->database_definition['name'] = $database['name'];
+        }
+        if (!empty($database['create'])) {
+            $this->database_definition['create'] = $database['create'];
+        }
+        if (!empty($database['overwrite'])) {
+            $this->database_definition['overwrite'] = $database['overwrite'];
+        }
+        if (!empty($database['charset'])) {
+            $this->database_definition['charset'] = $database['charset'];
+        }
+        if (!empty($database['description'])) {
+            $this->database_definition['description'] = $database['description'];
+        }
+        if (!empty($database['comments'])) {
+            $this->database_definition['comments'] = $database['comments'];
+        }
+
+        if (!empty($database['table']) && is_array($database['table'])) {
+            foreach ($database['table'] as $table) {
+                $this->fixTableKeys($table);
+            }
+        }
+
+        if (!empty($database['sequence']) && is_array($database['sequence'])) {
+            foreach ($database['sequence'] as $sequence) {
+                $this->fixSequenceKeys($sequence);
+            }
+        }
+
+        $result = $this->val->validateDatabase($this->database_definition);
+        if (PEAR::isError($result)) {
+            return $this->raiseError($result->getUserinfo());
+        }
+
+        return MDB2_OK;
+    }
+
+    function fixTableKeys($table)
+    {
+        $this->table = array(
+            'was' => '',
+            'description' => '',
+            'comments' => '',
+            'fields' => array(),
+            'indexes' => array(),
+            'constraints' => array(),
+            'initialization' => array()
+        );
+
+        if (!empty($table['name'])) {
+            $this->table_name = $table['name'];
+        } else {
+            $this->table_name = '';
+        }
+        if (!empty($table['was'])) {
+            $this->table['was'] = $table['was'];
+        }
+        if (!empty($table['description'])) {
+            $this->table['description'] = $table['description'];
+        }
+        if (!empty($table['comments'])) {
+            $this->table['comments'] = $table['comments'];
+        }
+
+        if (!empty($table['declaration']) && is_array($table['declaration'])) {
+            if (!empty($table['declaration']['field']) && is_array($table['declaration']['field'])) {
+                foreach ($table['declaration']['field'] as $field) {
+                    $this->fixTableFieldKeys($field);
+                }
+            }
+
+            if (!empty($table['declaration']['index']) && is_array($table['declaration']['index'])) {
+                foreach ($table['declaration']['index'] as $index) {
+                    $this->fixTableIndexKeys($index);
+                }
+            }
+
+            if (!empty($table['declaration']['foreign']) && is_array($table['declaration']['foreign'])) {
+                foreach ($table['declaration']['foreign'] as $constraint) {
+                    $this->fixTableConstraintKeys($constraint);
+                }
+            }
+        }
+
+        if (!empty($table['initialization']) && is_array($table['initialization'])) {
+            if (!empty($table['initialization']['insert']) && is_array($table['initialization']['insert'])) {
+                foreach ($table['initialization']['insert'] as $init) {
+                    $this->fixTableInitializationKeys($init, 'insert');
+                }
+            }
+            if (!empty($table['initialization']['update']) && is_array($table['initialization']['update'])) {
+                foreach ($table['initialization']['update'] as $init) {
+                    $this->fixTableInitializationKeys($init, 'update');
+                }
+            }
+            if (!empty($table['initialization']['delete']) && is_array($table['initialization']['delete'])) {
+                foreach ($table['initialization']['delete'] as $init) {
+                    $this->fixTableInitializationKeys($init, 'delete');
+                }
+            }
+        }
+
+        $result = $this->val->validateTable($this->database_definition['tables'], $this->table, $this->table_name);
+        if (PEAR::isError($result)) {
+            return $this->raiseError($result->getUserinfo());
+        } else {
+            $this->database_definition['tables'][$this->table_name] = $this->table;
+        }
+
+        return MDB2_OK;
+    }
+
+    function fixTableFieldKeys($field)
+    {
+        $this->field = array();
+        if (!empty($field['name'])) {
+            $this->field_name = $field['name'];
+        } else {
+            $this->field_name = '';
+        }
+        if (!empty($field['was'])) {
+            $this->field['was'] = $field['was'];
+        }
+        if (!empty($field['type'])) {
+            $this->field['type'] = $field['type'];
+        }
+        if (!empty($field['fixed'])) {
+            $this->field['fixed'] = $field['fixed'];
+        }
+        if (isset($field['default'])) {
+            $this->field['default'] = $field['default'];
+        }
+        if (!empty($field['notnull'])) {
+            $this->field['notnull'] = $field['notnull'];
+        }
+        if (!empty($field['autoincrement'])) {
+            $this->field['autoincrement'] = $field['autoincrement'];
+        }
+        if (!empty($field['unsigned'])) {
+            $this->field['unsigned'] = $field['unsigned'];
+        }
+        if (!empty($field['length'])) {
+            $this->field['length'] = $field['length'];
+        }
+        if (!empty($field['description'])) {
+            $this->field['description'] = $field['description'];
+        }
+        if (!empty($field['comments'])) {
+            $this->field['comments'] = $field['comments'];
+        }
+
+        $result = $this->val->validateField($this->table['fields'], $this->field, $this->field_name);
+        if (PEAR::isError($result)) {
+            return $this->raiseError($result->getUserinfo());
+        } else {
+            $this->table['fields'][$this->field_name] = $this->field;
+        }
+
+        return MDB2_OK;
+    }
+
+    function fixTableIndexKeys($index)
+    {
+        $this->index = array(
+            'was' => '',
+            'unique' =>'',
+            'primary' => '',
+            'fields' => array()
+        );
+
+        if (!empty($index['name'])) {
+            $this->index_name = $index['name'];
+        } else {
+            $this->index_name = '';
+        }
+        if (!empty($index['was'])) {
+            $this->index['was'] = $index['was'];
+        }
+        if (!empty($index['unique'])) {
+            $this->index['unique'] = $index['unique'];
+        }
+        if (!empty($index['primary'])) {
+            $this->index['primary'] = $index['primary'];
+        }
+        if (!empty($index['field'])) {
+            foreach ($index['field'] as $field) {
+                if (!empty($field['name'])) {
+                    $this->field_name = $field['name'];
+                } else {
+                    $this->field_name = '';
+                }
+                $this->field = array(
+                    'sorting' => '',
+                    'length' => ''
+                );
+
+                if (!empty($field['sorting'])) {
+                    $this->field['sorting'] = $field['sorting'];
+                }
+                if (!empty($field['length'])) {
+                    $this->field['length'] = $field['length'];
+                }
+
+                $result = $this->val->validateIndexField($this->index['fields'], $this->field, $this->field_name);
+                if (PEAR::isError($result)) {
+                    return $this->raiseError($result->getUserinfo());
+                }
+
+                $this->index['fields'][$this->field_name] = $this->field;
+            }
+        }
+
+        $result = $this->val->validateIndex($this->table['indexes'], $this->index, $this->index_name);
+        if (PEAR::isError($result)) {
+            return $this->raiseError($result->getUserinfo());
+        } else {
+            $this->table['indexes'][$this->index_name] = $this->index;
+        }
+
+        return MDB2_OK;
+    }
+
+    function fixTableConstraintKeys($constraint) 
+    {
+        $this->constraint = array(
+            'was' => '',
+            'match' => '',
+            'ondelete' => '',
+            'onupdate' => '',
+            'deferrable' => '',
+            'initiallydeferred' => '',
+            'foreign' => true,
+            'fields' => array(),
+            'references' => array('table' => '', 'fields' => array())
+        );
+
+        if (!empty($constraint['name'])) {
+            $this->constraint_name = $constraint['name'];
+        } else {
+            $this->constraint_name = '';
+        }
+        if (!empty($constraint['was'])) {
+            $this->constraint['was'] = $constraint['was'];
+        }
+        if (!empty($constraint['match'])) {
+            $this->constraint['match'] = $constraint['match'];
+        }
+        if (!empty($constraint['ondelete'])) {
+            $this->constraint['ondelete'] = $constraint['ondelete'];
+        }
+        if (!empty($constraint['onupdate'])) {
+            $this->constraint['onupdate'] = $constraint['onupdate'];
+        }
+        if (!empty($constraint['deferrable'])) {
+            $this->constraint['deferrable'] = $constraint['deferrable'];
+        }
+        if (!empty($constraint['initiallydeferred'])) {
+            $this->constraint['initiallydeferred'] = $constraint['initiallydeferred'];
+        }
+        if (!empty($constraint['field']) && is_array($constraint['field'])) {
+            foreach ($constraint['field'] as $field) {
+                $result = $this->val->validateConstraintField($this->constraint['fields'], $field);
+                if (PEAR::isError($result)) {
+                    return $this->raiseError($result->getUserinfo());
+                }
+
+                $this->constraint['fields'][$field] = '';
+            }
+        }
+
+        if (!empty($constraint['references']) && is_array($constraint['references'])) {
+            /**
+             * As we forced 'table' to be enumerated
+             * we have to fix it on the foreign-references-table context
+             */
+            if (!empty($constraint['references']['table']) && is_array($constraint['references']['table'])) {
+                $this->constraint['references']['table'] = $constraint['references']['table'][0];
+            }
+
+            if (!empty($constraint['references']['field']) && is_array($constraint['references']['field'])) {
+                foreach ($constraint['references']['field'] as $field) {
+                    $result = $this->val->validateConstraintReferencedField($this->constraint['references']['fields'], $field);
+                    if (PEAR::isError($result)) {
+                        return $this->raiseError($result->getUserinfo());
+                    }
+
+                    $this->constraint['references']['fields'][$field] = '';
+                }
+            }
+        }
+
+        $result = $this->val->validateConstraint($this->table['constraints'], $this->constraint, $this->constraint_name);
+        if (PEAR::isError($result)) {
+            return $this->raiseError($result->getUserinfo());
+        } else {
+            $this->table['constraints'][$this->constraint_name] = $this->constraint;
+        }
+
+        return MDB2_OK;
+    }
+
+    function fixTableInitializationKeys($element, $type = '')
+    {
+        if (!empty($element['select']) && is_array($element['select'])) {
+            $this->fixTableInitializationDataKeys($element['select']);
+            $this->init = array( 'select' => $this->init );
+        } else {
+            $this->fixTableInitializationDataKeys($element);
+        }
+
+        $this->table['initialization'][] = array( 'type' => $type, 'data' => $this->init );
+    }
+
+    function fixTableInitializationDataKeys($element)
+    {
+        $this->init = array();
+        if (!empty($element['field']) && is_array($element['field'])) {
+            foreach ($element['field'] as $field) {
+                $name = $field['name'];
+                unset($field['name']);
+
+                $this->setExpression($field);
+                $this->init['field'][] = array( 'name' => $name, 'group' => $field );
+            }
+        }
+        /**
+         * As we forced 'table' to be enumerated
+         * we have to fix it on the insert-select context
+         */
+        if (!empty($element['table']) && is_array($element['table'])) {
+            $this->init['table'] = $element['table'][0];
+        }
+        if (!empty($element['where']) && is_array($element['where'])) {
+            $this->init['where'] = $element['where'];
+            $this->setExpression($this->init['where']);
+        }
+    }
+
+    function setExpression(&$arr)
+    {
+        $element = each($arr);
+
+        $arr = array( 'type' => $element['key'] );
+
+        $element = $element['value'];
+
+        switch ($arr['type']) {
+        case 'null':
+            break;
+        case 'value':
+        case 'column':
+            $arr['data'] = $element;
+            break;
+        case 'function':
+            if (!empty($element)
+                && is_array($element)
+            ) {
+                $arr['data'] = array( 'name' => $element['name'] );
+                unset($element['name']);
+
+                foreach ($element as $type => $value) {
+                    if (!empty($value)) {
+                        if (is_array($value)) {
+                            foreach ($value as $argument) {
+                                $argument = array( $type => $argument );
+                                $this->setExpression($argument);
+                                $arr['data']['arguments'][] = $argument;
+                            }
+                        } else {
+                            $arr['data']['arguments'][] = array( 'type' => $type, 'data' => $value );
+                        }
+                    }
+                }
+            }
+            break;
+        case 'expression':
+            $arr['data'] = array( 'operants' => array(), 'operator' => $element['operator'] );
+            unset($element['operator']);
+
+            foreach ($element as $k => $v) {
+                $argument = array( $k => $v );
+                $this->setExpression($argument);
+                $arr['data']['operants'][] = $argument;
+            }
+            break;
+        }
+    }
+
+    function fixSequenceKeys($sequence)
+    {
+        $this->sequence = array(
+            'was' => '',
+            'start' => '',
+            'description' => '',
+            'comments' => '',
+            'on' => array('table' => '', 'field' => '')
+        );
+
+        if (!empty($sequence['name'])) {
+            $this->sequence_name = $sequence['name'];
+        } else {
+            $this->sequence_name = '';
+        }
+        if (!empty($sequence['was'])) {
+            $this->sequence['was'] = $sequence['was'];
+        }
+        if (!empty($sequence['start'])) {
+            $this->sequence['start'] = $sequence['start'];
+        }
+        if (!empty($sequence['description'])) {
+            $this->sequence['description'] = $sequence['description'];
+        }
+        if (!empty($sequence['comments'])) {
+            $this->sequence['comments'] = $sequence['comments'];
+        }
+        if (!empty($sequence['on']) && is_array($sequence['on'])) {
+            /**
+             * As we forced 'table' to be enumerated
+             * we have to fix it on the sequence-on-table context
+             */
+            if (!empty($sequence['on']['table']) && is_array($sequence['on']['table'])) {
+                $this->sequence['on']['table'] = $sequence['on']['table'][0];
+            }
+
+            /**
+             * As we forced 'field' to be enumerated
+             * we have to fix it on the sequence-on-field context
+             */
+            if (!empty($sequence['on']['field']) && is_array($sequence['on']['field'])) {
+                $this->sequence['on']['field'] = $sequence['on']['field'][0];
+            }
+        }
+
+        $result = $this->val->validateSequence($this->database_definition['sequences'], $this->sequence, $this->sequence_name);
+        if (PEAR::isError($result)) {
+            return $this->raiseError($result->getUserinfo());
+        } else {
+            $this->database_definition['sequences'][$this->sequence_name] = $this->sequence;
+        }
+
+        return MDB2_OK;
+    }
+
+    function &raiseError($msg = null, $ecode = MDB2_SCHEMA_ERROR_PARSE)
+    {
+        if (is_null($this->error)) {
+            $error = 'Parser error: '.$msg."\n";
+
+            $this->error =& MDB2_Schema::raiseError($ecode, null, null, $error);
+        }
+        return $this->error;
+    }
+}
+
+?>
diff --git a/3rdparty/MDB2/Schema/Reserved/ibase.php b/3rdparty/MDB2/Schema/Reserved/ibase.php
new file mode 100644
index 00000000000..b208abc83a3
--- /dev/null
+++ b/3rdparty/MDB2/Schema/Reserved/ibase.php
@@ -0,0 +1,436 @@
+<?php
+// {{{ Disclaimer, Licence, copyrights
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lorenzo Alberton <l.alberton@quipo.it>                       |
+// +----------------------------------------------------------------------+
+//
+// }}}
+// {{{ $GLOBALS['_MDB2_Schema_Reserved']['ibase']
+/**
+ * Has a list of reserved words of Interbase/Firebird
+ *
+ * @package MDB2_Schema
+ * @category Database
+ * @access protected
+ * @author Lorenzo Alberton <l.alberton@quipo.it>
+ */
+$GLOBALS['_MDB2_Schema_Reserved']['ibase'] = array(
+    'ABS',
+    'ABSOLUTE',
+    'ACTION',
+    'ACTIVE',
+    'ADD',
+    'ADMIN',
+    'AFTER',
+    'ALL',
+    'ALLOCATE',
+    'ALTER',
+    'AND',
+    'ANY',
+    'ARE',
+    'AS',
+    'ASC',
+    'ASCENDING',
+    'ASSERTION',
+    'AT',
+    'AUTHORIZATION',
+    'AUTO',
+    'AUTODDL',
+    'AVG',
+    'BACKUP',
+    'BASE_NAME',
+    'BASED',
+    'BASENAME',
+    'BEFORE',
+    'BEGIN',
+    'BETWEEN',
+    'BIGINT',
+    'BIT',
+    'BIT_LENGTH',
+    'BLOB',
+    'BLOCK',
+    'BLOBEDIT',
+    'BOOLEAN',
+    'BOTH',
+    'BOTH',
+    'BREAK',
+    'BUFFER',
+    'BY',
+    'CACHE',
+    'CASCADE',
+    'CASCADED',
+    'CASE',
+    'CASE',
+    'CAST',
+    'CATALOG',
+    'CHAR',
+    'CHAR_LENGTH',
+    'CHARACTER',
+    'CHARACTER_LENGTH',
+    'CHECK',
+    'CHECK_POINT_LEN',
+    'CHECK_POINT_LENGTH',
+    'CLOSE',
+    'COALESCE',
+    'COLLATE',
+    'COLLATION',
+    'COLUMN',
+    'COMMENT',
+    'COMMIT',
+    'COMMITTED',
+    'COMPILETIME',
+    'COMPUTED',
+    'CONDITIONAL',
+    'CONNECT',
+    'CONNECTION',
+    'CONSTRAINT',
+    'CONSTRAINTS',
+    'CONTAINING',
+    'CONTINUE',
+    'CONVERT',
+    'CORRESPONDING',
+    'COUNT',
+    'CREATE',
+    'CROSS',
+    'CSTRING',
+    'CURRENT',
+    'CURRENT_CONNECTION',
+    'CURRENT_DATE',
+    'CURRENT_ROLE',
+    'CURRENT_TIME',
+    'CURRENT_TIMESTAMP',
+    'CURRENT_TRANSACTION',
+    'CURRENT_USER',
+    'DATABASE',
+    'DATE',
+    'DAY',
+    'DB_KEY',
+    'DEALLOCATE',
+    'DEBUG',
+    'DEC',
+    'DECIMAL',
+    'DECLARE',
+    'DEFAULT',
+    'DEFERRABLE',
+    'DEFERRED',
+    'DELETE',
+    'DELETING',
+    'DESC',
+    'DESCENDING',
+    'DESCRIBE',
+    'DESCRIPTOR',
+    'DIAGNOSTICS',
+    'DIFFERENCE',
+    'DISCONNECT',
+    'DISPLAY',
+    'DISTINCT',
+    'DO',
+    'DOMAIN',
+    'DOUBLE',
+    'DROP',
+    'ECHO',
+    'EDIT',
+    'ELSE',
+    'END',
+    'END-EXEC',
+    'ENTRY_POINT',
+    'ESCAPE',
+    'EVENT',
+    'EXCEPT',
+    'EXCEPTION',
+    'EXEC',
+    'EXECUTE',
+    'EXISTS',
+    'EXIT',
+    'EXTERN',
+    'EXTERNAL',
+    'EXTRACT',
+    'FALSE',
+    'FETCH',
+    'FILE',
+    'FILTER',
+    'FIRST',
+    'FLOAT',
+    'FOR',
+    'FOREIGN',
+    'FOUND',
+    'FREE_IT',
+    'FROM',
+    'FULL',
+    'FUNCTION',
+    'GDSCODE',
+    'GEN_ID',
+    'GENERATOR',
+    'GET',
+    'GLOBAL',
+    'GO',
+    'GOTO',
+    'GRANT',
+    'GROUP',
+    'GROUP_COMMIT_WAIT',
+    'GROUP_COMMIT_WAIT_TIME',
+    'HAVING',
+    'HELP',
+    'HOUR',
+    'IDENTITY',
+    'IF',
+    'IIF',
+    'IMMEDIATE',
+    'IN',
+    'INACTIVE',
+    'INDEX',
+    'INDICATOR',
+    'INIT',
+    'INITIALLY',
+    'INNER',
+    'INPUT',
+    'INPUT_TYPE',
+    'INSENSITIVE',
+    'INSERT',
+    'INSERTING',
+    'INT',
+    'INTEGER',
+    'INTERSECT',
+    'INTERVAL',
+    'INTO',
+    'IS',
+    'ISOLATION',
+    'ISQL',
+    'JOIN',
+    'KEY',
+    'LANGUAGE',
+    'LAST',
+    'LC_MESSAGES',
+    'LC_TYPE',
+    'LEADING',
+    'LEADING',
+    'LEADING',
+    'LEAVE',
+    'LEFT',
+    'LENGTH',
+    'LEV',
+    'LEVEL',
+    'LIKE',
+    'LOCAL',
+    'LOCK',
+    'LOG_BUF_SIZE',
+    'LOG_BUFFER_SIZE',
+    'LOGFILE',
+    'LONG',
+    'LOWER',
+    'MANUAL',
+    'MATCH',
+    'MAX',
+    'MAX_SEGMENT',
+    'MAXIMUM',
+    'MAXIMUM_SEGMENT',
+    'MERGE',
+    'MESSAGE',
+    'MIN',
+    'MINIMUM',
+    'MINUTE',
+    'MODULE',
+    'MODULE_NAME',
+    'MONTH',
+    'NAMES',
+    'NATIONAL',
+    'NATURAL',
+    'NCHAR',
+    'NEXT',
+    'NO',
+    'NOAUTO',
+    'NOT',
+    'NULL',
+    'NULLIF',
+    'NULLS',
+    'NUM_LOG_BUFFERS',
+    'NUM_LOG_BUFS',
+    'NUMERIC',
+    'OCTET_LENGTH',
+    'OF',
+    'ON',
+    'ONLY',
+    'OPEN',
+    'OPTION',
+    'OR',
+    'ORDER',
+    'OUTER',
+    'OUTPUT',
+    'OUTPUT_TYPE',
+    'OVERFLOW',
+    'OVERLAPS',
+    'PAD',
+    'PAGE',
+    'PAGE_SIZE',
+    'PAGELENGTH',
+    'PAGES',
+    'PARAMETER',
+    'PARTIAL',
+    'PASSWORD',
+    'PERCENT',
+    'PLAN',
+    'POSITION',
+    'POST_EVENT',
+    'PRECISION',
+    'PREPARE',
+    'PRESERVE',
+    'PRIMARY',
+    'PRIOR',
+    'PRIVILEGES',
+    'PROCEDURE',
+    'PUBLIC',
+    'QUIT',
+    'RAW_PARTITIONS',
+    'RDB$DB_KEY',
+    'READ',
+    'REAL',
+    'RECORD_VERSION',
+    'RECREATE',
+    'RECREATE ROW_COUNT',
+    'REFERENCES',
+    'RELATIVE',
+    'RELEASE',
+    'RESERV',
+    'RESERVING',
+    'RESTART',
+    'RESTRICT',
+    'RETAIN',
+    'RETURN',
+    'RETURNING',
+    'RETURNING_VALUES',
+    'RETURNS',
+    'REVOKE',
+    'RIGHT',
+    'ROLE',
+    'ROLLBACK',
+    'ROW_COUNT',
+    'ROWS',
+    'RUNTIME',
+    'SAVEPOINT',
+    'SCALAR_ARRAY',
+    'SCHEMA',
+    'SCROLL',
+    'SECOND',
+    'SECTION',
+    'SELECT',
+    'SEQUENCE',
+    'SESSION',
+    'SESSION_USER',
+    'SET',
+    'SHADOW',
+    'SHARED',
+    'SHELL',
+    'SHOW',
+    'SINGULAR',
+    'SIZE',
+    'SKIP',
+    'SMALLINT',
+    'SNAPSHOT',
+    'SOME',
+    'SORT',
+    'SPACE',
+    'SQL',
+    'SQLCODE',
+    'SQLERROR',
+    'SQLSTATE',
+    'SQLWARNING',
+    'STABILITY',
+    'STARTING',
+    'STARTS',
+    'STATEMENT',
+    'STATIC',
+    'STATISTICS',
+    'SUB_TYPE',
+    'SUBSTRING',
+    'SUM',
+    'SUSPEND',
+    'SYSTEM_USER',
+    'TABLE',
+    'TEMPORARY',
+    'TERMINATOR',
+    'THEN',
+    'TIES',
+    'TIME',
+    'TIMESTAMP',
+    'TIMEZONE_HOUR',
+    'TIMEZONE_MINUTE',
+    'TO',
+    'TRAILING',
+    'TRANSACTION',
+    'TRANSLATE',
+    'TRANSLATION',
+    'TRIGGER',
+    'TRIM',
+    'TRUE',
+    'TYPE',
+    'UNCOMMITTED',
+    'UNION',
+    'UNIQUE',
+    'UNKNOWN',
+    'UPDATE',
+    'UPDATING',
+    'UPPER',
+    'USAGE',
+    'USER',
+    'USING',
+    'VALUE',
+    'VALUES',
+    'VARCHAR',
+    'VARIABLE',
+    'VARYING',
+    'VERSION',
+    'VIEW',
+    'WAIT',
+    'WEEKDAY',
+    'WHEN',
+    'WHENEVER',
+    'WHERE',
+    'WHILE',
+    'WITH',
+    'WORK',
+    'WRITE',
+    'YEAR',
+    'YEARDAY',
+    'ZONE',
+);
+// }}}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Schema/Reserved/mssql.php b/3rdparty/MDB2/Schema/Reserved/mssql.php
new file mode 100644
index 00000000000..74ac6885780
--- /dev/null
+++ b/3rdparty/MDB2/Schema/Reserved/mssql.php
@@ -0,0 +1,258 @@
+<?php
+// {{{ Disclaimer, Licence, copyrights
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: David Coallier <davidc@php.net>                              |
+// +----------------------------------------------------------------------+
+// }}}
+// {{{ $GLOBALS['_MDB2_Schema_Reserved']['mssql']
+/**
+ * Has a list of all the reserved words for mssql.
+ *
+ * @package  MDB2_Schema
+ * @category Database
+ * @access   protected
+ * @author   David Coallier <davidc@php.net>
+ */
+$GLOBALS['_MDB2_Schema_Reserved']['mssql'] = array(
+    'ADD',
+    'CURRENT_TIMESTAMP',
+    'GROUP',
+    'OPENQUERY',
+    'SERIALIZABLE',
+    'ALL',
+    'CURRENT_USER',
+    'HAVING',
+    'OPENROWSET',
+    'SESSION_USER',
+    'ALTER',
+    'CURSOR',
+    'HOLDLOCK',
+    'OPTION',
+    'SET',
+    'AND',
+    'DATABASE',
+    'IDENTITY',
+    'OR',
+    'SETUSER',
+    'ANY',
+    'DBCC',
+    'IDENTITYCOL',
+    'ORDER',
+    'SHUTDOWN',
+    'AS',
+    'DEALLOCATE',
+    'IDENTITY_INSERT',
+    'OUTER',
+    'SOME',
+    'ASC',
+    'DECLARE',
+    'IF',
+    'OVER',
+    'STATISTICS',
+    'AUTHORIZATION',
+    'DEFAULT',
+    'IN',
+    'PERCENT',
+    'SUM',
+    'AVG',
+    'DELETE',
+    'INDEX',
+    'PERM',
+    'SYSTEM_USER',
+    'BACKUP',
+    'DENY',
+    'INNER',
+    'PERMANENT',
+    'TABLE',
+    'BEGIN',
+    'DESC',
+    'INSERT',
+    'PIPE',
+    'TAPE',
+    'BETWEEN',
+    'DISK',
+    'INTERSECT',
+    'PLAN',
+    'TEMP',
+    'BREAK',
+    'DISTINCT',
+    'INTO',
+    'PRECISION',
+    'TEMPORARY',
+    'BROWSE',
+    'DISTRIBUTED',
+    'IS',
+    'PREPARE',
+    'TEXTSIZE',
+    'BULK',
+    'DOUBLE',
+    'ISOLATION',
+    'PRIMARY',
+    'THEN',
+    'BY',
+    'DROP',
+    'JOIN',
+    'PRINT',
+    'TO',
+    'CASCADE',
+    'DUMMY',
+    'KEY',
+    'PRIVILEGES',
+    'TOP',
+    'CASE',
+    'DUMP',
+    'KILL',
+    'PROC',
+    'TRAN',
+    'CHECK',
+    'ELSE',
+    'LEFT',
+    'PROCEDURE',
+    'TRANSACTION',
+    'CHECKPOINT',
+    'END',
+    'LEVEL',
+    'PROCESSEXIT',
+    'TRIGGER',
+    'CLOSE',
+    'ERRLVL',
+    'LIKE',
+    'PUBLIC',
+    'TRUNCATE',
+    'CLUSTERED',
+    'ERROREXIT',
+    'LINENO',
+    'RAISERROR',
+    'TSEQUAL',
+    'COALESCE',
+    'ESCAPE',
+    'LOAD',
+    'READ',
+    'UNCOMMITTED',
+    'COLUMN',
+    'EXCEPT',
+    'MAX',
+    'READTEXT',
+    'UNION',
+    'COMMIT',
+    'EXEC',
+    'MIN',
+    'RECONFIGURE',
+    'UNIQUE',
+    'COMMITTED',
+    'EXECUTE',
+    'MIRROREXIT',
+    'REFERENCES',
+    'UPDATE',
+    'COMPUTE',
+    'EXISTS',
+    'NATIONAL',
+    'REPEATABLE',
+    'UPDATETEXT',
+    'CONFIRM',
+    'EXIT',
+    'NOCHECK',
+    'REPLICATION',
+    'USE',
+    'CONSTRAINT',
+    'FETCH',
+    'NONCLUSTERED',
+    'RESTORE',
+    'USER',
+    'CONTAINS',
+    'FILE',
+    'NOT',
+    'RESTRICT',
+    'VALUES',
+    'CONTAINSTABLE',
+    'FILLFACTOR',
+    'NULL',
+    'RETURN',
+    'VARYING',
+    'CONTINUE',
+    'FLOPPY',
+    'NULLIF',
+    'REVOKE',
+    'VIEW',
+    'CONTROLROW',
+    'FOR',
+    'OF',
+    'RIGHT',
+    'WAITFOR',
+    'CONVERT',
+    'FOREIGN',
+    'OFF',
+    'ROLLBACK',
+    'WHEN',
+    'COUNT',
+    'FREETEXT',
+    'OFFSETS',
+    'ROWCOUNT',
+    'WHERE',
+    'CREATE',
+    'FREETEXTTABLE',
+    'ON',
+    'ROWGUIDCOL',
+    'WHILE',
+    'CROSS',
+    'FROM',
+    'ONCE',
+    'RULE',
+    'WITH',
+    'CURRENT',
+    'FULL',
+    'ONLY',
+    'SAVE',
+    'WORK',
+    'CURRENT_DATE',
+    'GOTO',
+    'OPEN',
+    'SCHEMA',
+    'WRITETEXT',
+    'CURRENT_TIME',
+    'GRANT',
+    'OPENDATASOURCE',
+    'SELECT',
+);
+//}}}
+
+?>
diff --git a/3rdparty/MDB2/Schema/Reserved/mysql.php b/3rdparty/MDB2/Schema/Reserved/mysql.php
new file mode 100644
index 00000000000..4f0575e0bb1
--- /dev/null
+++ b/3rdparty/MDB2/Schema/Reserved/mysql.php
@@ -0,0 +1,284 @@
+<?php
+// {{{ Disclaimer, Licence, copyrights
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: David Coallier <davidc@php.net>                              |
+// +----------------------------------------------------------------------+
+//
+// $Id: mysql.php,v 1.3 2006/03/01 12:16:40 lsmith Exp $
+// }}}
+// {{{ $GLOBALS['_MDB2_Schema_Reserved']['mysql']
+/**
+ * Has a list of reserved words of mysql
+ *
+ * @package MDB2_Schema
+ * @category Database
+ * @access protected
+ * @author David Coalier <davidc@php.net>
+ */
+$GLOBALS['_MDB2_Schema_Reserved']['mysql'] = array(
+    'ADD',
+    'ALL',
+    'ALTER',
+    'ANALYZE',
+    'AND',
+    'AS',
+    'ASC',
+    'ASENSITIVE',
+    'BEFORE',
+    'BETWEEN',
+    'BIGINT',
+    'BINARY',
+    'BLOB',
+    'BOTH',
+    'BY',
+    'CALL',
+    'CASCADE',
+    'CASE',
+    'CHANGE',
+    'CHAR',
+    'CHARACTER',
+    'CHECK',
+    'COLLATE',
+    'COLUMN',
+    'CONDITION',
+    'CONNECTION',
+    'CONSTRAINT',
+    'CONTINUE',
+    'CONVERT',
+    'CREATE',
+    'CROSS',
+    'CURRENT_DATE',
+    'CURRENT_TIME',
+    'CURRENT_TIMESTAMP',
+    'CURRENT_USER',
+    'CURSOR',
+    'DATABASE',
+    'DATABASES',
+    'DAY_HOUR',
+    'DAY_MICROSECOND',
+    'DAY_MINUTE',
+    'DAY_SECOND',
+    'DEC',
+    'DECIMAL',
+    'DECLARE',
+    'DEFAULT',
+    'DELAYED',
+    'DELETE',
+    'DESC',
+    'DESCRIBE',
+    'DETERMINISTIC',
+    'DISTINCT',
+    'DISTINCTROW',
+    'DIV',
+    'DOUBLE',
+    'DROP',
+    'DUAL',
+    'EACH',
+    'ELSE',
+    'ELSEIF',
+    'ENCLOSED',
+    'ESCAPED',
+    'EXISTS',
+    'EXIT',
+    'EXPLAIN',
+    'FALSE',
+    'FETCH',
+    'FLOAT',
+    'FLOAT4',
+    'FLOAT8',
+    'FOR',
+    'FORCE',
+    'FOREIGN',
+    'FROM',
+    'FULLTEXT',
+    'GOTO',
+    'GRANT',
+    'GROUP',
+    'HAVING',
+    'HIGH_PRIORITY',
+    'HOUR_MICROSECOND',
+    'HOUR_MINUTE',
+    'HOUR_SECOND',
+    'IF',
+    'IGNORE',
+    'IN',
+    'INDEX',
+    'INFILE',
+    'INNER',
+    'INOUT',
+    'INSENSITIVE',
+    'INSERT',
+    'INT',
+    'INT1',
+    'INT2',
+    'INT3',
+    'INT4',
+    'INT8',
+    'INTEGER',
+    'INTERVAL',
+    'INTO',
+    'IS',
+    'ITERATE',
+    'JOIN',
+    'KEY',
+    'KEYS',
+    'KILL',
+    'LABEL',
+    'LEADING',
+    'LEAVE',
+    'LEFT',
+    'LIKE',
+    'LIMIT',
+    'LINES',
+    'LOAD',
+    'LOCALTIME',
+    'LOCALTIMESTAMP',
+    'LOCK',
+    'LONG',
+    'LONGBLOB',
+    'LONGTEXT',
+    'LOOP',
+    'LOW_PRIORITY',
+    'MATCH',
+    'MEDIUMBLOB',
+    'MEDIUMINT',
+    'MEDIUMTEXT',
+    'MIDDLEINT',
+    'MINUTE_MICROSECOND',
+    'MINUTE_SECOND',
+    'MOD',
+    'MODIFIES',
+    'NATURAL',
+    'NOT',
+    'NO_WRITE_TO_BINLOG',
+    'NULL',
+    'NUMERIC',
+    'ON',
+    'OPTIMIZE',
+    'OPTION',
+    'OPTIONALLY',
+    'OR',
+    'ORDER',
+    'OUT',
+    'OUTER',
+    'OUTFILE',
+    'PRECISION',
+    'PRIMARY',
+    'PROCEDURE',
+    'PURGE',
+    'RAID0',
+    'READ',
+    'READS',
+    'REAL',
+    'REFERENCES',
+    'REGEXP',
+    'RELEASE',
+    'RENAME',
+    'REPEAT',
+    'REPLACE',
+    'REQUIRE',
+    'RESTRICT',
+    'RETURN',
+    'REVOKE',
+    'RIGHT',
+    'RLIKE',
+    'SCHEMA',
+    'SCHEMAS',
+    'SECOND_MICROSECOND',
+    'SELECT',
+    'SENSITIVE',
+    'SEPARATOR',
+    'SET',
+    'SHOW',
+    'SMALLINT',
+    'SONAME',
+    'SPATIAL',
+    'SPECIFIC',
+    'SQL',
+    'SQLEXCEPTION',
+    'SQLSTATE',
+    'SQLWARNING',
+    'SQL_BIG_RESULT',
+    'SQL_CALC_FOUND_ROWS',
+    'SQL_SMALL_RESULT',
+    'SSL',
+    'STARTING',
+    'STRAIGHT_JOIN',
+    'TABLE',
+    'TERMINATED',
+    'THEN',
+    'TINYBLOB',
+    'TINYINT',
+    'TINYTEXT',
+    'TO',
+    'TRAILING',
+    'TRIGGER',
+    'TRUE',
+    'UNDO',
+    'UNION',
+    'UNIQUE',
+    'UNLOCK',
+    'UNSIGNED',
+    'UPDATE',
+    'USAGE',
+    'USE',
+    'USING',
+    'UTC_DATE',
+    'UTC_TIME',
+    'UTC_TIMESTAMP',
+    'VALUES',
+    'VARBINARY',
+    'VARCHAR',
+    'VARCHARACTER',
+    'VARYING',
+    'WHEN',
+    'WHERE',
+    'WHILE',
+    'WITH',
+    'WRITE',
+    'X509',
+    'XOR',
+    'YEAR_MONTH',
+    'ZEROFILL',
+    );
+    // }}}
+?>
diff --git a/3rdparty/MDB2/Schema/Reserved/oci8.php b/3rdparty/MDB2/Schema/Reserved/oci8.php
new file mode 100644
index 00000000000..57fe12ddcab
--- /dev/null
+++ b/3rdparty/MDB2/Schema/Reserved/oci8.php
@@ -0,0 +1,171 @@
+<?php
+// {{{ Disclaimer, Licence, copyrights
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: David Coallier <davidc@php.net>                              |
+// +----------------------------------------------------------------------+
+// }}}
+// {{{ $GLOBALS['_MDB2_Schema_Reserved']['oci8']
+/**
+ * Has a list of all the reserved words for oracle.
+ *
+ * @package  MDB2_Schema
+ * @category Database
+ * @access   protected
+ * @author   David Coallier <davidc@php.net>
+ */
+$GLOBALS['_MDB2_Schema_Reserved']['oci8'] = array(
+    'ACCESS',
+    'ELSE',
+    'MODIFY',
+    'START',
+    'ADD',
+    'EXCLUSIVE',
+    'NOAUDIT',
+    'SELECT',
+    'ALL',
+    'EXISTS',
+    'NOCOMPRESS',
+    'SESSION',
+    'ALTER',
+    'FILE',
+    'NOT',
+    'SET',
+    'AND',
+    'FLOAT',
+    'NOTFOUND ',
+    'SHARE',
+    'ANY',
+    'FOR',
+    'NOWAIT',
+    'SIZE',
+    'ARRAYLEN',
+    'FROM',
+    'NULL',
+    'SMALLINT',
+    'AS',
+    'GRANT',
+    'NUMBER',
+    'SQLBUF',
+    'ASC',
+    'GROUP',
+    'OF',
+    'SUCCESSFUL',
+    'AUDIT',
+    'HAVING',
+    'OFFLINE ',
+    'SYNONYM',
+    'BETWEEN',
+    'IDENTIFIED',
+    'ON',
+    'SYSDATE',
+    'BY',
+    'IMMEDIATE',
+    'ONLINE',
+    'TABLE',
+    'CHAR',
+    'IN',
+    'OPTION',
+    'THEN',
+    'CHECK',
+    'INCREMENT',
+    'OR',
+    'TO',
+    'CLUSTER',
+    'INDEX',
+    'ORDER',
+    'TRIGGER',
+    'COLUMN',
+    'INITIAL',
+    'PCTFREE',
+    'UID',
+    'COMMENT',
+    'INSERT',
+    'PRIOR',
+    'UNION',
+    'COMPRESS',
+    'INTEGER',
+    'PRIVILEGES',
+    'UNIQUE',
+    'CONNECT',
+    'INTERSECT',
+    'PUBLIC',
+    'UPDATE',
+    'CREATE',
+    'INTO',
+    'RAW',
+    'USER',
+    'CURRENT',
+    'IS',
+    'RENAME',
+    'VALIDATE',
+    'DATE',
+    'LEVEL',
+    'RESOURCE',
+    'VALUES',
+    'DECIMAL',
+    'LIKE',
+    'REVOKE',
+    'VARCHAR',
+    'DEFAULT',
+    'LOCK',
+    'ROW',
+    'VARCHAR2',
+    'DELETE',
+    'LONG',
+    'ROWID',
+    'VIEW',
+    'DESC',
+    'MAXEXTENTS',
+    'ROWLABEL',
+    'WHENEVER',
+    'DISTINCT',
+    'MINUS',
+    'ROWNUM',
+    'WHERE',
+    'DROP',
+    'MODE',
+    'ROWS',
+    'WITH',
+);
+// }}}
+
+?>
diff --git a/3rdparty/MDB2/Schema/Reserved/pgsql.php b/3rdparty/MDB2/Schema/Reserved/pgsql.php
new file mode 100644
index 00000000000..d358e9c12f0
--- /dev/null
+++ b/3rdparty/MDB2/Schema/Reserved/pgsql.php
@@ -0,0 +1,147 @@
+<?php
+// {{{ Disclaimer, Licence, copyrights
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | Redistribution and use in source and binary forms, with or without   |
+// | modification, are permitted provided that the following conditions   |
+// | are met:                                                             |
+// |                                                                      |
+// | Redistributions of source code must retain the above copyright       |
+// | notice, this list of conditions and the following disclaimer.        |
+// |                                                                      |
+// | Redistributions in binary form must reproduce the above copyright    |
+// | notice, this list of conditions and the following disclaimer in the  |
+// | documentation and/or other materials provided with the distribution. |
+// |                                                                      |
+// | Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his contributors may be used to endorse |
+// | or promote products derived from this software without specific prior|
+// | written permission.                                                  |
+// |                                                                      |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT    |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS    |
+// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE      |
+// | REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,          |
+// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
+// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS|
+// |  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  |
+// | AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT          |
+// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY|
+// | WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE          |
+// | POSSIBILITY OF SUCH DAMAGE.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Marcelo Santos Araujo <msaraujo@php.net>                     |
+// +----------------------------------------------------------------------+
+//
+// }}}
+// {{{ $GLOBALS['_MDB2_Schema_Reserved']['pgsql']
+/**
+ * Has a list of reserved words of pgsql
+ *
+ * @package MDB2_Schema
+ * @category Database
+ * @access protected
+ * @author Marcelo Santos Araujo <msaraujo@php.net>
+ */
+$GLOBALS['_MDB2_Schema_Reserved']['pgsql'] = array(
+    'ALL',
+    'ANALYSE',
+    'ANALYZE',
+    'AND',
+    'ANY',
+    'AS',
+    'ASC',
+    'AUTHORIZATION',
+    'BETWEEN',
+    'BINARY',
+    'BOTH',
+    'CASE',
+    'CAST',
+    'CHECK',
+    'COLLATE',
+    'COLUMN',
+    'CONSTRAINT',
+    'CREATE',
+    'CURRENT_DATE',
+    'CURRENT_TIME',
+    'CURRENT_TIMESTAMP',
+    'CURRENT_USER',
+    'DEFAULT',
+    'DEFERRABLE',
+    'DESC',
+    'DISTINCT',
+    'DO',
+    'ELSE',
+    'END',
+    'EXCEPT',
+    'FALSE',
+    'FOR',
+    'FOREIGN',
+    'FREEZE',
+    'FROM',
+    'FULL',
+    'GRANT',
+    'GROUP',
+    'HAVING',
+    'ILIKE',
+    'IN',
+    'INITIALLY',
+    'INNER',
+    'INTERSECT',
+    'INTO',
+    'IS',
+    'ISNULL',
+    'JOIN',
+    'LEADING',
+    'LEFT',
+    'LIKE',
+    'LIMIT',
+    'LOCALTIME',
+    'LOCALTIMESTAMP',
+    'NATURAL',
+    'NEW',
+    'NOT',
+    'NOTNULL',
+    'NULL',
+    'OFF',
+    'OFFSET',
+    'OLD',
+    'ON',
+    'ONLY',
+    'OR',
+    'ORDER',
+    'OUTER',
+    'OVERLAPS',
+    'PLACING',
+    'PRIMARY',
+    'REFERENCES',
+    'SELECT',
+    'SESSION_USER',
+    'SIMILAR',
+    'SOME',
+    'TABLE',
+    'THEN',
+    'TO',
+    'TRAILING',
+    'TRUE',
+    'UNION',
+    'UNIQUE',
+    'USER',
+    'USING',
+    'VERBOSE',
+    'WHEN',
+    'WHERE'
+);
+// }}}
+?>
+
diff --git a/3rdparty/MDB2/Schema/Tool.php b/3rdparty/MDB2/Schema/Tool.php
new file mode 100644
index 00000000000..9689a0f6d73
--- /dev/null
+++ b/3rdparty/MDB2/Schema/Tool.php
@@ -0,0 +1,560 @@
+<?php
+/**
+ * PHP versions 4 and 5
+ *
+ * Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,
+ * Stig. S. Bakken, Lukas Smith, Igor Feghali
+ * All rights reserved.
+ *
+ * MDB2_Schema enables users to maintain RDBMS independant schema files
+ * in XML that can be used to manipulate both data and database schemas
+ * This LICENSE is in the BSD license style.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,
+ * Lukas Smith, Igor Feghali nor the names of his contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Author: Christian Weiske <cweiske@php.net>
+ * $Id: Tool.php,v 1.6 2008/12/13 00:26:07 clockwerx Exp $
+ *
+ * @category Database
+ * @package  MDB2_Schema
+ * @author   Christian Weiske <cweiske@php.net>
+ * @license  BSD http://www.opensource.org/licenses/bsd-license.php
+ * @version  CVS: $Id: Tool.php,v 1.6 2008/12/13 00:26:07 clockwerx Exp $
+ * @link     http://pear.php.net/packages/MDB2_Schema
+ */
+
+require_once 'MDB2/Schema.php';
+require_once 'MDB2/Schema/Tool/ParameterException.php';
+
+/**
+* Command line tool to work with database schemas
+*
+* Functionality:
+* - dump a database schema to stdout
+* - import schema into database
+* - create a diff between two schemas
+* - apply diff to database
+*
+ * @category Database
+ * @package  MDB2_Schema
+ * @author   Christian Weiske <cweiske@php.net>
+ * @license  BSD http://www.opensource.org/licenses/bsd-license.php
+ * @link     http://pear.php.net/packages/MDB2_Schema
+ */
+class MDB2_Schema_Tool
+{
+    /**
+    * Run the schema tool
+    *
+    * @param array $args Array of command line arguments
+    */
+    public function __construct($args)
+    {
+        $strAction = $this->getAction($args);
+        try {
+            $this->{'do' . ucfirst($strAction)}($args);
+        } catch (MDB2_Schema_Tool_ParameterException $e) {
+            $this->{'doHelp' . ucfirst($strAction)}($e->getMessage());
+        }
+    }//public function __construct($args)
+
+
+
+    /**
+    * Runs the tool with command line arguments
+    *
+    * @return void
+    */
+    public static function run()
+    {
+        $args = $GLOBALS['argv'];
+        array_shift($args);
+
+        try {
+            $tool = new MDB2_Schema_Tool($args);
+        } catch (Exception $e) {
+            self::toStdErr($e->getMessage() . "\n");
+        }
+    }//public static function run()
+
+
+
+    /**
+    * Reads the first parameter from the argument array and
+    * returns the action.
+    *
+    * @param array &$args Command line parameters
+    *
+    * @return string Action to execute
+    */
+    protected function getAction(&$args)
+    {
+        if (count($args) == 0) {
+            return 'help';
+        }
+        $arg = array_shift($args);
+        switch ($arg) {
+        case 'h':
+        case 'help':
+        case '-h':
+        case '--help':
+            return 'help';
+        case 'd':
+        case 'dump':
+        case '-d':
+        case '--dump':
+            return 'dump';
+        case 'l':
+        case 'load':
+        case '-l':
+        case '--load':
+            return 'load';
+        case 'i':
+        case 'diff':
+        case '-i':
+        case '--diff':
+            return 'diff';
+        case 'a':
+        case 'apply':
+        case '-a':
+        case '--apply':
+            return 'apply';
+        case 'n':
+        case 'init':
+        case '-i':
+        case '--init':
+            return 'init';
+        default:
+            throw new MDB2_Schema_Tool_ParameterException("Unknown mode \"$arg\"");
+        }
+    }//protected function getAction(&$args)
+
+
+
+    /**
+    * Writes the message to stderr
+    *
+    * @param string $msg Message to print
+    *
+    * @return void
+    */
+    protected static function toStdErr($msg)
+    {
+        file_put_contents('php://stderr', $msg);
+    }//protected static function toStdErr($msg)
+
+
+
+    /**
+    * Displays generic help to stdout
+    *
+    * @return void
+    */
+    protected function doHelp()
+    {
+        self::toStdErr(<<<EOH
+Usage: mdb2_schematool mode parameters
+
+Works with database schemas
+
+mode: (- and -- are optional)
+ h,  help     Show this help screen
+ d,  dump     Dump a schema to stdout
+ l,  load     Load a schema into database
+ i,  diff     Create a diff between two schemas and dump it to stdout
+ a,  apply    Apply a diff to a database
+ n,  init     Initialize a database with data
+
+EOH
+        );
+    }//protected function doHelp()
+
+
+
+    /**
+    * Displays the help screen for "dump" command
+    *
+    * @return void
+    */
+    protected function doHelpDump()
+    {
+        self::toStdErr( <<<EOH
+Usage: mdb2_schematool dump [all|data|schema] [-p] DSN
+
+Dumps a database schema to stdout
+
+If dump type is not specified, defaults to "schema".
+
+DSN: Data source name in the form of
+ driver://user:password@host/database
+
+User and password may be omitted.
+Using -p reads password from stdin which is more secure than passing it in the parameter.
+
+EOH
+        );
+    }//protected function doHelpDump()
+
+
+
+    /**
+    * Displays the help screen for "init" command
+    *
+    * @return void
+    */
+    protected function doHelpInit()
+    {
+        self::toStdErr( <<<EOH
+Usage: mdb2_schematool init source [-p] destination
+
+Initializes a database with data
+ (Inserts data on a previous created database at destination)
+
+source should be a schema file containing data,
+destination should be a DSN
+
+DSN: Data source name in the form of
+ driver://user:password@host/database
+
+User and password may be omitted.
+Using -p reads password from stdin which is more secure than passing it in the parameter.
+
+EOH
+        );
+    }//protected function doHelpInit()
+
+
+
+    /**
+    * Displays the help screen for "load" command
+    *
+    * @return void
+    */
+    protected function doHelpLoad()
+    {
+        self::toStdErr( <<<EOH
+Usage: mdb2_schematool load [-p] source [-p] destination
+
+Loads a database schema from source to destination
+ (Creates the database schema at destination)
+
+source can be a DSN or a schema file,
+destination should be a DSN
+
+DSN: Data source name in the form of
+ driver://user:password@host/database
+
+User and password may be omitted.
+Using -p reads password from stdin which is more secure than passing it in the parameter.
+
+EOH
+        );
+    }//protected function doHelpLoad()
+
+
+
+    /**
+    * Returns an array of options for MDB2_Schema constructor
+    *
+    * @return array Options for MDB2_Schema constructor
+    */
+    protected function getSchemaOptions()
+    {
+        $options = array(
+            'log_line_break' => '<br>',
+            'idxname_format' => '%s',
+            'debug' => true,
+            'quote_identifier' => true,
+            'force_defaults' => false,
+            'portability' => true,
+            'use_transactions' => false,
+        );
+        return $options;
+    }//protected function getSchemaOptions()
+
+
+
+    /**
+    * Checks if the passed parameter is a PEAR_Error object
+    * and throws an exception in that case.
+    *
+    * @param mixed  $object   Some variable to check
+    * @param string $location Where the error occured
+    *
+    * @return void
+    */
+    protected function throwExceptionOnError($object, $location = '')
+    {
+        if (PEAR::isError($object)) {
+            //FIXME: exception class
+            //debug_print_backtrace();
+            throw new Exception('Error ' . $location
+                . "\n" . $object->getMessage()
+                . "\n" . $object->getUserInfo()
+            );
+        }
+    }//protected function throwExceptionOnError($object, $location = '')
+
+
+
+    /**
+    * Loads a file or a dsn from the arguments
+    *
+    * @param array &$args Array of arguments to the program
+    *
+    * @return array Array of ('file'|'dsn', $value)
+    */
+    protected function getFileOrDsn(&$args)
+    {
+        if (count($args) == 0) {
+            throw new MDB2_Schema_Tool_ParameterException('File or DSN expected');
+        }
+
+        $arg = array_shift($args);
+        if ($arg == '-p') {
+            $bAskPassword = true;
+            $arg          = array_shift($args);
+        } else {
+            $bAskPassword = false;
+        }
+
+        if (strpos($arg, '://') === false) {
+            if (file_exists($arg)) {
+                //File
+                return array('file', $arg);
+            } else {
+                throw new Exception('Schema file does not exist');
+            }
+        }
+
+        //read password if necessary
+        if ($bAskPassword) {
+            $password = $this->readPasswordFromStdin($arg);
+            $arg      = self::setPasswordIntoDsn($arg, $password);
+            self::toStdErr($arg);
+        }
+        return array('dsn', $arg);
+    }//protected function getFileOrDsn(&$args)
+
+
+
+    /**
+    * Takes a DSN data source name and integrates the given
+    * password into it.
+    *
+    * @param string $dsn      Data source name
+    * @param string $password Password
+    *
+    * @return string DSN with password
+    */
+    protected function setPasswordIntoDsn($dsn, $password)
+    {
+        //simple try to integrate password
+        if (strpos($dsn, '@') === false) {
+            //no @ -> no user and no password
+            return str_replace('://', '://:' . $password . '@', $dsn);
+        } else if (preg_match('|://[^:]+@|', $dsn)) {
+            //user only, no password
+            return str_replace('@', ':' . $password . '@', $dsn);
+        } else if (strpos($dsn, ':@') !== false) {
+            //abstract version
+            return str_replace(':@', ':' . $password . '@', $dsn);
+        }
+
+        return $dsn;
+    }//protected function setPasswordIntoDsn($dsn, $password)
+
+
+
+    /**
+    * Reads a password from stdin
+    *
+    * @param string $dsn DSN name to put into the message
+    *
+    * @return string Password
+    */
+    protected function readPasswordFromStdin($dsn)
+    {
+        $stdin = fopen('php://stdin', 'r');
+        self::toStdErr('Please insert password for ' . $dsn . "\n");
+        $password = '';
+        $breakme  = false;
+        while (false !== ($char = fgetc($stdin))) {
+            if (ord($char) == 10 || $char == "\n" || $char == "\r") {
+                break;
+            }
+            $password .= $char;
+        }
+        fclose($stdin);
+
+        return trim($password);
+    }//protected function readPasswordFromStdin()
+
+
+
+    /**
+    * Creates a database schema dump and sends it to stdout
+    *
+    * @param array $args Command line arguments
+    *
+    * @return void
+    */
+    protected function doDump($args)
+    {
+        $dump_what = MDB2_SCHEMA_DUMP_STRUCTURE;
+        $arg = '';
+        if (count($args)) {
+            $arg = $args[0];
+        }
+
+        switch (strtolower($arg)) {
+        case 'all':
+            $dump_what = MDB2_SCHEMA_DUMP_ALL;
+            array_shift($args);
+            break;
+        case 'data':
+            $dump_what = MDB2_SCHEMA_DUMP_CONTENT;
+            array_shift($args);
+            break;
+        case 'schema':
+            array_shift($args);
+        }
+
+        list($type, $dsn) = $this->getFileOrDsn($args);
+        if ($type == 'file') {
+            throw new MDB2_Schema_Tool_ParameterException(
+                'Dumping a schema file as a schema file does not make much sense'
+            );
+        }
+
+        $schema = MDB2_Schema::factory($dsn, $this->getSchemaOptions());
+        $this->throwExceptionOnError($schema);
+
+        $definition = $schema->getDefinitionFromDatabase();
+        $this->throwExceptionOnError($definition);
+
+
+        $dump_options = array(
+            'output_mode' => 'file',
+            'output' => 'php://stdout',
+            'end_of_line' => "\r\n"
+        );
+        $op = $schema->dumpDatabase(
+            $definition, $dump_options, $dump_what
+        );
+        $this->throwExceptionOnError($op);
+
+        $schema->disconnect();
+    }//protected function doDump($args)
+
+
+
+    /**
+    * Loads a database schema
+    *
+    * @param array $args Command line arguments
+    *
+    * @return void
+    */
+    protected function doLoad($args)
+    {
+        list($typeSource, $dsnSource) = $this->getFileOrDsn($args);
+        list($typeDest,   $dsnDest)   = $this->getFileOrDsn($args);
+
+        if ($typeDest == 'file') {
+            throw new MDB2_Schema_Tool_ParameterException(
+                'A schema can only be loaded into a database, not a file'
+            );
+        }
+
+
+        $schemaDest = MDB2_Schema::factory($dsnDest, $this->getSchemaOptions());
+        $this->throwExceptionOnError($schemaDest);
+
+        //load definition
+        if ($typeSource == 'file') {
+            $definition = $schemaDest->parseDatabaseDefinitionFile($dsnSource);
+            $where      = 'loading schema file';
+        } else {
+            $schemaSource = MDB2_Schema::factory($dsnSource, $this->getSchemaOptions());
+            $this->throwExceptionOnError($schemaSource, 'connecting to source database');
+
+            $definition = $schemaSource->getDefinitionFromDatabase();
+            $where      = 'loading definition from database';
+        }
+        $this->throwExceptionOnError($definition, $where);
+
+
+        //create destination database from definition
+        $simulate = false;
+        $op       = $schemaDest->createDatabase($definition, array(), $simulate);
+        $this->throwExceptionOnError($op, 'creating the database');
+    }//protected function doLoad($args)
+
+
+
+    /**
+    * Initializes a database with data
+    *
+    * @param array $args Command line arguments
+    *
+    * @return void
+    */
+    protected function doInit($args)
+    {
+        list($typeSource, $dsnSource) = $this->getFileOrDsn($args);
+        list($typeDest,   $dsnDest)   = $this->getFileOrDsn($args);
+
+        if ($typeSource != 'file') {
+            throw new MDB2_Schema_Tool_ParameterException(
+                'Data must come from a source file'
+            );
+        }
+
+        if ($typeDest != 'dsn') {
+            throw new MDB2_Schema_Tool_ParameterException(
+                'A schema can only be loaded into a database, not a file'
+            );
+        }
+
+        $schemaDest = MDB2_Schema::factory($dsnDest, $this->getSchemaOptions());
+        $this->throwExceptionOnError($schemaDest, 'connecting to destination database');
+
+        $definition = $schemaDest->getDefinitionFromDatabase();
+        $this->throwExceptionOnError($definition, 'loading definition from database');
+
+        $op = $schemaDest->writeInitialization($dsnSource, $definition);
+        $this->throwExceptionOnError($op, 'initializing database');
+    }//protected function doInit($args)
+
+
+}//class MDB2_Schema_Tool
+
+?>
diff --git a/3rdparty/MDB2/Schema/Tool/ParameterException.php b/3rdparty/MDB2/Schema/Tool/ParameterException.php
new file mode 100644
index 00000000000..fab1e03e250
--- /dev/null
+++ b/3rdparty/MDB2/Schema/Tool/ParameterException.php
@@ -0,0 +1,6 @@
+<?php
+
+class MDB2_Schema_Tool_ParameterException extends Exception
+{}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Schema/Validate.php b/3rdparty/MDB2/Schema/Validate.php
new file mode 100644
index 00000000000..217cf51b959
--- /dev/null
+++ b/3rdparty/MDB2/Schema/Validate.php
@@ -0,0 +1,917 @@
+<?php
+/**
+ * PHP versions 4 and 5
+ *
+ * Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,
+ * Stig. S. Bakken, Lukas Smith, Igor Feghali
+ * All rights reserved.
+ *
+ * MDB2_Schema enables users to maintain RDBMS independant schema files
+ * in XML that can be used to manipulate both data and database schemas
+ * This LICENSE is in the BSD license style.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,
+ * Lukas Smith, Igor Feghali nor the names of his contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Author: Christian Dickmann <dickmann@php.net>
+ * Author: Igor Feghali <ifeghali@php.net>
+ *
+ * @category Database
+ * @package  MDB2_Schema
+ * @author   Christian Dickmann <dickmann@php.net>
+ * @author   Igor Feghali <ifeghali@php.net>
+ * @license  BSD http://www.opensource.org/licenses/bsd-license.php
+ * @version  CVS: $Id: Validate.php,v 1.42 2008/11/30 03:34:00 clockwerx Exp $
+ * @link     http://pear.php.net/packages/MDB2_Schema
+ */
+
+/**
+ * Validates an XML schema file
+ *
+ * @category Database
+ * @package  MDB2_Schema
+ * @author   Igor Feghali <ifeghali@php.net>
+ * @license  BSD http://www.opensource.org/licenses/bsd-license.php
+ * @link     http://pear.php.net/packages/MDB2_Schema
+ */
+class MDB2_Schema_Validate
+{
+    // {{{ properties
+
+    var $fail_on_invalid_names = true;
+
+    var $valid_types = array();
+
+    var $force_defaults = true;
+
+    // }}}
+    // {{{ constructor
+
+    function __construct($fail_on_invalid_names = true, $valid_types = array(), $force_defaults = true)
+    {
+        if (empty($GLOBALS['_MDB2_Schema_Reserved'])) {
+            $GLOBALS['_MDB2_Schema_Reserved'] = array();
+        }
+
+        if (is_array($fail_on_invalid_names)) {
+            $this->fail_on_invalid_names = array_intersect($fail_on_invalid_names,
+                                                           array_keys($GLOBALS['_MDB2_Schema_Reserved']));
+        } elseif ($fail_on_invalid_names === true) {
+            $this->fail_on_invalid_names = array_keys($GLOBALS['_MDB2_Schema_Reserved']);
+        } else {
+            $this->fail_on_invalid_names = array();
+        }
+        $this->valid_types    = $valid_types;
+        $this->force_defaults = $force_defaults;
+    }
+
+    // }}}
+    // {{{ raiseError()
+
+    function &raiseError($ecode, $msg = null)
+    {
+        $error =& MDB2_Schema::raiseError($ecode, null, null, $msg);
+        return $error;
+    }
+
+    // }}}
+    // {{{ isBoolean()
+
+    /**
+     * Verifies if a given value can be considered boolean. If yes, set value
+     * to true or false according to its actual contents and return true. If
+     * not, keep its contents untouched and return false.
+     *
+     * @param mixed &$value value to be checked
+     *
+     * @return bool
+     *
+     * @access public
+     * @static
+     */
+    function isBoolean(&$value)
+    {
+        if (is_bool($value)) {
+            return true;
+        }
+
+        if ($value === 0 || $value === 1 || $value === '') {
+            $value = (bool)$value;
+            return true;
+        }
+
+        if (!is_string($value)) {
+            return false;
+        }
+
+        switch ($value) {
+        case '0':
+        case 'N':
+        case 'n':
+        case 'no':
+        case 'false':
+            $value = false;
+            break;
+        case '1':
+        case 'Y':
+        case 'y':
+        case 'yes':
+        case 'true':
+            $value = true;
+            break;
+        default:
+            return false;
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ validateTable()
+
+    /* Definition */
+    /**
+     * Checks whether the definition of a parsed table is valid. Modify table
+     * definition when necessary.
+     *
+     * @param array  $tables     multi dimensional array that contains the
+     *                           tables of current database.
+     * @param array  &$table     multi dimensional array that contains the
+     *                           structure and optional data of the table.
+     * @param string $table_name name of the parsed table
+     *
+     * @return bool|error object
+     *
+     * @access public
+     */
+    function validateTable($tables, &$table, $table_name)
+    {
+        /* Have we got a name? */
+        if (!$table_name) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'a table has to have a name');
+        }
+
+        /* Table name duplicated? */
+        if (is_array($tables) && isset($tables[$table_name])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'table "'.$table_name.'" already exists');
+        }
+
+        /* Table name reserved? */
+        if (is_array($this->fail_on_invalid_names)) {
+            $name = strtoupper($table_name);
+            foreach ($this->fail_on_invalid_names as $rdbms) {
+                if (in_array($name, $GLOBALS['_MDB2_Schema_Reserved'][$rdbms])) {
+                    return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                        'table name "'.$table_name.'" is a reserved word in: '.$rdbms);
+                }
+            }
+        }
+
+        /* Was */
+        if (empty($table['was'])) {
+            $table['was'] = $table_name;
+        }
+
+        /* Have we got fields? */
+        if (empty($table['fields']) || !is_array($table['fields'])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'tables need one or more fields');
+        }
+
+        /* Autoincrement */
+        $autoinc = $primary = false;
+        foreach ($table['fields'] as $field_name => $field) {
+            if (!empty($field['autoincrement'])) {
+                if ($autoinc) {
+                    return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                        'there was already an autoincrement field in "'.$table_name.'" before "'.$field_name.'"');
+                }
+                $autoinc = $field_name;
+            }
+        }
+
+        /*
+         * Checking Indexes
+         * this have to be done here otherwise we can't
+         * guarantee that all table fields were already
+         * defined in the moment we are parsing indexes
+         */
+        if (!empty($table['indexes']) && is_array($table['indexes'])) {
+            foreach ($table['indexes'] as $name => $index) {
+                $skip_index = false;
+                if (!empty($index['primary'])) {
+                    /*
+                     * Lets see if we should skip this index since there is
+                     * already an auto increment on this field this implying
+                     * a primary key index.
+                     */
+                    if (count($index['fields']) == '1'
+                        && $autoinc
+                        && array_key_exists($autoinc, $index['fields'])) {
+                        $skip_index = true;
+                    } elseif ($autoinc || $primary) {
+                        return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                            'there was already an primary index or autoincrement field in "'.$table_name.'" before "'.$name.'"');
+                    } else {
+                        $primary = true;
+                    }
+                }
+
+                if (!$skip_index && is_array($index['fields'])) {
+                    foreach ($index['fields'] as $field_name => $field) {
+                        if (!isset($table['fields'][$field_name])) {
+                            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                                'index field "'.$field_name.'" does not exist');
+                        }
+                        if (!empty($index['primary'])
+                            && !$table['fields'][$field_name]['notnull']
+                        ) {
+                            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                                'all primary key fields must be defined notnull in "'.$table_name.'"');
+                        }
+                    }
+                } else {
+                    unset($table['indexes'][$name]);
+                }
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ validateField()
+
+    /**
+     * Checks whether the definition of a parsed field is valid. Modify field
+     * definition when necessary.
+     *
+     * @param array  $fields     multi dimensional array that contains the
+     *                           fields of current table.
+     * @param array  &$field     multi dimensional array that contains the
+     *                           structure of the parsed field.
+     * @param string $field_name name of the parsed field
+     *
+     * @return bool|error object
+     *
+     * @access public
+     */
+    function validateField($fields, &$field, $field_name)
+    {
+        /* Have we got a name? */
+        if (!$field_name) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'field name missing');
+        }
+
+        /* Field name duplicated? */
+        if (is_array($fields) && isset($fields[$field_name])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'field "'.$field_name.'" already exists');
+        }
+
+        /* Field name reserverd? */
+        if (is_array($this->fail_on_invalid_names)) {
+            $name = strtoupper($field_name);
+            foreach ($this->fail_on_invalid_names as $rdbms) {
+                if (in_array($name, $GLOBALS['_MDB2_Schema_Reserved'][$rdbms])) {
+                    return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                        'field name "'.$field_name.'" is a reserved word in: '.$rdbms);
+                }
+            }
+        }
+
+        /* Type check */
+        if (empty($field['type'])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'no field type specified');
+        }
+        if (!empty($this->valid_types) && !array_key_exists($field['type'], $this->valid_types)) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'no valid field type ("'.$field['type'].'") specified');
+        }
+
+        /* Unsigned */
+        if (array_key_exists('unsigned', $field) && !$this->isBoolean($field['unsigned'])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'unsigned has to be a boolean value');
+        }
+
+        /* Fixed */
+        if (array_key_exists('fixed', $field) && !$this->isBoolean($field['fixed'])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'fixed has to be a boolean value');
+        }
+
+        /* Length */
+        if (array_key_exists('length', $field) && $field['length'] <= 0) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'length has to be an integer greater 0');
+        }
+
+        // if it's a DECIMAL datatype, check if a 'scale' value is provided:
+        // <length>8,4</length> should be translated to DECIMAL(8,4)
+        if (is_float($this->valid_types[$field['type']])
+            && !empty($field['length'])
+            && strpos($field['length'], ',') !== false
+        ) {
+            list($field['length'], $field['scale']) = explode(',', $field['length']);
+        }
+
+        /* Was */
+        if (empty($field['was'])) {
+            $field['was'] = $field_name;
+        }
+
+        /* Notnull */
+        if (empty($field['notnull'])) {
+            $field['notnull'] = false;
+        }
+        if (!$this->isBoolean($field['notnull'])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'field "notnull" has to be a boolean value');
+        }
+
+        /* Default */
+        if ($this->force_defaults
+            && !array_key_exists('default', $field)
+            && $field['type'] != 'clob' && $field['type'] != 'blob'
+        ) {
+            $field['default'] = $this->valid_types[$field['type']];
+        }
+        if (array_key_exists('default', $field)) {
+            if ($field['type'] == 'clob' || $field['type'] == 'blob') {
+                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                    '"'.$field['type'].'"-fields are not allowed to have a default value');
+            }
+            if ($field['default'] === '' && !$field['notnull']) {
+                $field['default'] = null;
+            }
+        }
+        if (isset($field['default'])
+            && PEAR::isError($result = $this->validateDataFieldValue($field, $field['default'], $field_name))
+        ) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'default value of "'.$field_name.'" is incorrect: '.$result->getUserinfo());
+        }
+
+        /* Autoincrement */
+        if (!empty($field['autoincrement'])) {
+            if (!$field['notnull']) {
+                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                    'all autoincrement fields must be defined notnull');
+            }
+
+            if (empty($field['default'])) {
+                $field['default'] = '0';
+            } elseif ($field['default'] !== '0' && $field['default'] !== 0) {
+                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                    'all autoincrement fields must be defined default "0"');
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ validateIndex()
+
+    /**
+     * Checks whether a parsed index is valid. Modify index definition when
+     * necessary.
+     *
+     * @param array  $table_indexes multi dimensional array that contains the
+     *                              indexes of current table.
+     * @param array  &$index        multi dimensional array that contains the
+     *                              structure of the parsed index.
+     * @param string $index_name    name of the parsed index
+     *
+     * @return bool|error object
+     *
+     * @access public
+     */
+    function validateIndex($table_indexes, &$index, $index_name)
+    {
+        if (!$index_name) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'an index has to have a name');
+        }
+        if (is_array($table_indexes) && isset($table_indexes[$index_name])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'index "'.$index_name.'" already exists');
+        }
+        if (array_key_exists('unique', $index) && !$this->isBoolean($index['unique'])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'field "unique" has to be a boolean value');
+        }
+        if (array_key_exists('primary', $index) && !$this->isBoolean($index['primary'])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'field "primary" has to be a boolean value');
+        }
+
+        /* Have we got fields? */
+        if (empty($index['fields']) || !is_array($index['fields'])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'indexes need one or more fields');
+        }
+
+        if (empty($index['was'])) {
+            $index['was'] = $index_name;
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ validateIndexField()
+
+    /**
+     * Checks whether a parsed index-field is valid. Modify its definition when
+     * necessary.
+     *
+     * @param array  $index_fields multi dimensional array that contains the
+     *                             fields of current index.
+     * @param array  &$field       multi dimensional array that contains the
+     *                             structure of the parsed index-field.
+     * @param string $field_name   name of the parsed index-field
+     *
+     * @return bool|error object
+     *
+     * @access public
+     */
+    function validateIndexField($index_fields, &$field, $field_name)
+    {
+        if (is_array($index_fields) && isset($index_fields[$field_name])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'index field "'.$field_name.'" already exists');
+        }
+        if (!$field_name) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'the index-field-name is required');
+        }
+        if (empty($field['sorting'])) {
+            $field['sorting'] = 'ascending';
+        } elseif ($field['sorting'] !== 'ascending' && $field['sorting'] !== 'descending') {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'sorting type unknown');
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ validateConstraint()
+
+    /**
+     * Checks whether a parsed foreign key is valid. Modify its definition when
+     * necessary.
+     *
+     * @param array  $table_constraints multi dimensional array that contains the
+     *                                  constraints of current table.
+     * @param array  &$constraint       multi dimensional array that contains the
+     *                                  structure of the parsed foreign key.
+     * @param string $constraint_name   name of the parsed foreign key
+     *
+     * @return bool|error object
+     *
+     * @access public
+     */
+    function validateConstraint($table_constraints, &$constraint, $constraint_name)
+    {
+        if (!$constraint_name) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'a foreign key has to have a name');
+        }
+        if (is_array($table_constraints) && isset($table_constraints[$constraint_name])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'foreign key "'.$constraint_name.'" already exists');
+        }
+
+        /* Have we got fields? */
+        if (empty($constraint['fields']) || !is_array($constraint['fields'])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'foreign key "'.$constraint_name.'" need one or more fields');
+        }
+
+        /* Have we got referenced fields? */
+        if (empty($constraint['references']) || !is_array($constraint['references'])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'foreign key "'.$constraint_name.'" need to reference one or more fields');
+        }
+
+        /* Have we got referenced table? */
+        if (empty($constraint['references']['table'])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'foreign key "'.$constraint_name.'" need to reference a table');
+        }
+
+        if (empty($constraint['was'])) {
+            $constraint['was'] = $constraint_name;
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ validateConstraintField()
+
+    /**
+     * Checks whether a foreign-field is valid.
+     *
+     * @param array  $constraint_fields multi dimensional array that contains the
+     *                                  fields of current foreign key.
+     * @param string $field_name        name of the parsed foreign-field
+     *
+     * @return bool|error object
+     *
+     * @access public
+     */
+    function validateConstraintField($constraint_fields, $field_name)
+    {
+        if (!$field_name) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'empty value for foreign-field');
+        }
+        if (is_array($constraint_fields) && isset($constraint_fields[$field_name])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'foreign field "'.$field_name.'" already exists');
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ validateConstraintReferencedField()
+
+    /**
+     * Checks whether a foreign-referenced field is valid.
+     *
+     * @param array  $referenced_fields multi dimensional array that contains the
+     *                                  fields of current foreign key.
+     * @param string $field_name        name of the parsed foreign-field
+     *
+     * @return bool|error object
+     *
+     * @access public
+     */
+    function validateConstraintReferencedField($referenced_fields, $field_name)
+    {
+        if (!$field_name) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'empty value for referenced foreign-field');
+        }
+        if (is_array($referenced_fields) && isset($referenced_fields[$field_name])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'foreign field "'.$field_name.'" already referenced');
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ validateSequence()
+
+    /**
+     * Checks whether the definition of a parsed sequence is valid. Modify
+     * sequence definition when necessary.
+     *
+     * @param array  $sequences     multi dimensional array that contains the
+     *                              sequences of current database.
+     * @param array  &$sequence     multi dimensional array that contains the
+     *                              structure of the parsed sequence.
+     * @param string $sequence_name name of the parsed sequence
+     *
+     * @return bool|error object
+     *
+     * @access public
+     */
+    function validateSequence($sequences, &$sequence, $sequence_name)
+    {
+        if (!$sequence_name) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'a sequence has to have a name');
+        }
+
+        if (is_array($sequences) && isset($sequences[$sequence_name])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'sequence "'.$sequence_name.'" already exists');
+        }
+
+        if (is_array($this->fail_on_invalid_names)) {
+            $name = strtoupper($sequence_name);
+            foreach ($this->fail_on_invalid_names as $rdbms) {
+                if (in_array($name, $GLOBALS['_MDB2_Schema_Reserved'][$rdbms])) {
+                    return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                        'sequence name "'.$sequence_name.'" is a reserved word in: '.$rdbms);
+                }
+            }
+        }
+
+        if (empty($sequence['was'])) {
+            $sequence['was'] = $sequence_name;
+        }
+
+        if (!empty($sequence['on'])
+            && (empty($sequence['on']['table']) || empty($sequence['on']['field']))
+        ) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'sequence "'.$sequence_name.'" on a table was not properly defined');
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ validateDatabase()
+
+    /**
+     * Checks whether a parsed database is valid. Modify its structure and
+     * data when necessary.
+     *
+     * @param array &$database multi dimensional array that contains the
+     *                         structure and optional data of the database.
+     *
+     * @return bool|error object
+     *
+     * @access public
+     */
+    function validateDatabase(&$database)
+    {
+        /* Have we got a name? */
+        if (!is_array($database) || !isset($database['name']) || !$database['name']) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'a database has to have a name');
+        }
+
+        /* Database name reserved? */
+        if (is_array($this->fail_on_invalid_names)) {
+            $name = strtoupper($database['name']);
+            foreach ($this->fail_on_invalid_names as $rdbms) {
+                if (in_array($name, $GLOBALS['_MDB2_Schema_Reserved'][$rdbms])) {
+                    return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                        'database name "'.$database['name'].'" is a reserved word in: '.$rdbms);
+                }
+            }
+        }
+
+        /* Create */
+        if (isset($database['create'])
+            && !$this->isBoolean($database['create'])
+        ) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'field "create" has to be a boolean value');
+        }
+
+        /* Overwrite */
+        if (isset($database['overwrite'])
+            && $database['overwrite'] !== ''
+            && !$this->isBoolean($database['overwrite'])
+        ) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'field "overwrite" has to be a boolean value');
+        }
+
+        /*
+         * This have to be done here otherwise we can't guarantee that all
+         * tables were already defined in the moment we are parsing constraints
+         */
+        if (isset($database['tables'])) {
+            foreach ($database['tables'] as $table_name => $table) {
+                if (!empty($table['constraints'])) {
+                    foreach ($table['constraints'] as $constraint_name => $constraint) {
+                        $referenced_table_name = $constraint['references']['table'];
+
+                        if (!isset($database['tables'][$referenced_table_name])) {
+                            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                                'referenced table "'.$referenced_table_name.'" of foreign key "'.$constraint_name.'" of table "'.$table_name.'" does not exist');
+                        }
+
+                        if (empty($constraint['references']['fields'])) {
+                            $referenced_table = $database['tables'][$referenced_table_name];
+
+                            $primary = false;
+
+                            if (!empty($referenced_table['indexes'])) {
+                                foreach ($referenced_table['indexes'] as $index_name => $index) {
+                                    if (array_key_exists('primary', $index)
+                                        && $index['primary']
+                                    ) {
+                                        $primary = array();
+                                        foreach ($index['fields'] as $field_name => $field) {
+                                            $primary[$field_name] = '';
+                                        }
+                                        break;
+                                    }
+                                }
+                            }
+
+                            if (!$primary) {
+                                foreach ($referenced_table['fields'] as $field_name => $field) {
+                                    if (array_key_exists('autoincrement', $field)
+                                        && $field['autoincrement']
+                                    ) {
+                                        $primary = array( $field_name => '' );
+                                        break;
+                                    }
+                                }
+                            }
+
+                            if (!$primary) {
+                                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                                    'referenced table "'.$referenced_table_name.'" has no primary key and no referenced field was specified for foreign key "'.$constraint_name.'" of table "'.$table_name.'"');
+                            }
+
+                            $constraint['references']['fields'] = $primary;
+                        }
+
+                        /* the same number of referencing and referenced fields ? */
+                        if (count($constraint['fields']) != count($constraint['references']['fields'])) {
+                            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                                'The number of fields in the referenced key must match those of the foreign key "'.$constraint_name.'"');
+                        }
+
+                        $database['tables'][$table_name]['constraints'][$constraint_name]['references']['fields'] = $constraint['references']['fields'];
+                    }
+                }
+            }
+        }
+
+        /*
+         * This have to be done here otherwise we can't guarantee that all
+         * tables were already defined in the moment we are parsing sequences
+         */
+        if (isset($database['sequences'])) {
+            foreach ($database['sequences'] as $seq_name => $seq) {
+                if (!empty($seq['on'])
+                    && empty($database['tables'][$seq['on']['table']]['fields'][$seq['on']['field']])
+                ) {
+                    return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                        'sequence "'.$seq_name.'" was assigned on unexisting field/table');
+                }
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ validateDataField()
+
+    /* Data Manipulation */
+    /**
+     * Checks whether a parsed DML-field is valid. Modify its structure when
+     * necessary. This is called when validating INSERT and
+     * UPDATE.
+     *
+     * @param array  $table_fields       multi dimensional array that contains the
+     *                                   definition for current table's fields.
+     * @param array  $instruction_fields multi dimensional array that contains the
+     *                                   parsed fields of the current DML instruction.
+     * @param string &$field             array that contains the parsed instruction field
+     *
+     * @return bool|error object
+     *
+     * @access public
+     */
+    function validateDataField($table_fields, $instruction_fields, &$field)
+    {
+        if (!$field['name']) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'field-name has to be specified');
+        }
+
+        if (is_array($instruction_fields) && isset($instruction_fields[$field['name']])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'field "'.$field['name'].'" already initialized');
+        }
+
+        if (is_array($table_fields) && !isset($table_fields[$field['name']])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                '"'.$field['name'].'" is not defined');
+        }
+
+        if (!isset($field['group']['type'])) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                '"'.$field['name'].'" has no initial value');
+        }
+
+        if (isset($field['group']['data'])
+            && $field['group']['type'] == 'value'
+            && $field['group']['data'] !== ''
+            && PEAR::isError($result = $this->validateDataFieldValue($table_fields[$field['name']], $field['group']['data'], $field['name']))
+        ) {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                'value of "'.$field['name'].'" is incorrect: '.$result->getUserinfo());
+        }
+
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ validateDataFieldValue()
+
+    /**
+     * Checks whether a given value is compatible with a table field. This is
+     * done when parsing a field for a INSERT or UPDATE instruction.
+     *
+     * @param array  $field_def    multi dimensional array that contains the
+     *                             definition for current table's fields.
+     * @param string &$field_value value to fill the parsed field
+     * @param string $field_name   name of the parsed field
+     *
+     * @return bool|error object
+     *
+     * @access public
+     * @see MDB2_Schema_Validate::validateInsertField()
+     */
+    function validateDataFieldValue($field_def, &$field_value, $field_name)
+    {
+        switch ($field_def['type']) {
+        case 'text':
+        case 'clob':
+            if (!empty($field_def['length']) && strlen($field_value) > $field_def['length']) {
+                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                    '"'.$field_value.'" is larger than "'.$field_def['length'].'"');
+            }
+            break;
+        case 'blob':
+            $field_value = pack('H*', $field_value);
+            if (!empty($field_def['length']) && strlen($field_value) > $field_def['length']) {
+                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                    '"'.$field_value.'" is larger than "'.$field_def['type'].'"');
+            }
+            break;
+        case 'integer':
+            if ($field_value != ((int)$field_value)) {
+                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                    '"'.$field_value.'" is not of type "'.$field_def['type'].'"');
+            }
+            //$field_value = (int)$field_value;
+            if (!empty($field_def['unsigned']) && $field_def['unsigned'] && $field_value < 0) {
+                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                    '"'.$field_value.'" signed instead of unsigned');
+            }
+            break;
+        case 'boolean':
+            if (!$this->isBoolean($field_value)) {
+                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                    '"'.$field_value.'" is not of type "'.$field_def['type'].'"');
+            }
+            break;
+        case 'date':
+            if (!preg_match('/([0-9]{4})-([0-9]{1,2})-([0-9]{1,2})/', $field_value)
+                && $field_value !== 'CURRENT_DATE'
+            ) {
+                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                    '"'.$field_value.'" is not of type "'.$field_def['type'].'"');
+            }
+            break;
+        case 'timestamp':
+            if (!preg_match('/([0-9]{4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})/', $field_value)
+                && strcasecmp($field_value, 'now()') != 0
+                && $field_value !== 'CURRENT_TIMESTAMP'
+            ) {
+                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                    '"'.$field_value.'" is not of type "'.$field_def['type'].'"');
+            }
+            break;
+        case 'time':
+            if (!preg_match("/([0-9]{2}):([0-9]{2}):([0-9]{2})/", $field_value)
+                && $field_value !== 'CURRENT_TIME'
+            ) {
+                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                    '"'.$field_value.'" is not of type "'.$field_def['type'].'"');
+            }
+            break;
+        case 'float':
+        case 'double':
+            if ($field_value != (double)$field_value) {
+                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE,
+                    '"'.$field_value.'" is not of type "'.$field_def['type'].'"');
+            }
+            //$field_value = (double)$field_value;
+            break;
+        }
+        return MDB2_OK;
+    }
+}
+
+?>
diff --git a/3rdparty/MDB2/Schema/Writer.php b/3rdparty/MDB2/Schema/Writer.php
new file mode 100644
index 00000000000..5ae4918dc1d
--- /dev/null
+++ b/3rdparty/MDB2/Schema/Writer.php
@@ -0,0 +1,581 @@
+<?php
+/**
+ * PHP versions 4 and 5
+ *
+ * Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,
+ * Stig. S. Bakken, Lukas Smith, Igor Feghali
+ * All rights reserved.
+ *
+ * MDB2_Schema enables users to maintain RDBMS independant schema files
+ * in XML that can be used to manipulate both data and database schemas
+ * This LICENSE is in the BSD license style.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,
+ * Lukas Smith, Igor Feghali nor the names of his contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Author: Lukas Smith <smith@pooteeweet.org>
+ * Author: Igor Feghali <ifeghali@php.net>
+ *
+ * @category Database
+ * @package  MDB2_Schema
+ * @author   Lukas Smith <smith@pooteeweet.org>
+ * @author   Igor Feghali <ifeghali@php.net>
+ * @license  BSD http://www.opensource.org/licenses/bsd-license.php
+ * @version  CVS: $Id: Writer.php,v 1.40 2008/11/30 03:34:00 clockwerx Exp $
+ * @link     http://pear.php.net/packages/MDB2_Schema
+ */
+
+/**
+ * Writes an XML schema file
+ *
+ * @category Database
+ * @package  MDB2_Schema
+ * @author   Lukas Smith <smith@pooteeweet.org>
+ * @license  BSD http://www.opensource.org/licenses/bsd-license.php
+ * @link     http://pear.php.net/packages/MDB2_Schema
+ */
+class MDB2_Schema_Writer
+{
+    // {{{ properties
+
+    var $valid_types = array();
+
+    // }}}
+    // {{{ constructor
+
+    function __construct($valid_types = array())
+    {
+        $this->valid_types = $valid_types;
+    }
+
+    function MDB2_Schema_Writer($valid_types = array())
+    {
+        $this->__construct($valid_types);
+    }
+
+    // }}}
+    // {{{ raiseError()
+
+    /**
+     * This method is used to communicate an error and invoke error
+     * callbacks etc.  Basically a wrapper for PEAR::raiseError
+     * without the message string.
+     *
+     * @param int|PEAR_Error $code    integer error code or and PEAR_Error instance
+     * @param int            $mode    error mode, see PEAR_Error docs
+     *                                error level (E_USER_NOTICE etc).  If error mode is
+     *                                PEAR_ERROR_CALLBACK, this is the callback function,
+     *                                either as a function name, or as an array of an
+     *                                object and method name.  For other error modes this
+     *                                parameter is ignored.
+     * @param string         $options Extra debug information.  Defaults to the last
+     *                                query and native error code.
+     *
+     * @return object  a PEAR error object
+     * @access  public
+     * @see PEAR_Error
+     */
+    function &raiseError($code = null, $mode = null, $options = null, $userinfo = null)
+    {
+        $error =& MDB2_Schema::raiseError($code, $mode, $options, $userinfo);
+        return $error;
+    }
+
+    // }}}
+    // {{{ _escapeSpecialChars()
+
+    /**
+     * add escapecharacters to all special characters in a string
+     *
+     * @param string $string string that should be escaped
+     *
+     * @return string escaped string
+     * @access protected
+     */
+    function _escapeSpecialChars($string)
+    {
+        if (!is_string($string)) {
+            $string = strval($string);
+        }
+
+        $escaped = '';
+        for ($char = 0, $count = strlen($string); $char < $count; $char++) {
+            switch ($string[$char]) {
+            case '&':
+                $escaped .= '&amp;';
+                break;
+            case '>':
+                $escaped .= '&gt;';
+                break;
+            case '<':
+                $escaped .= '&lt;';
+                break;
+            case '"':
+                $escaped .= '&quot;';
+                break;
+            case '\'':
+                $escaped .= '&apos;';
+                break;
+            default:
+                $code = ord($string[$char]);
+                if ($code < 32 || $code > 127) {
+                    $escaped .= "&#$code;";
+                } else {
+                    $escaped .= $string[$char];
+                }
+                break;
+            }
+        }
+        return $escaped;
+    }
+
+    // }}}
+    // {{{ _dumpBoolean()
+
+    /**
+     * dump the structure of a sequence
+     *
+     * @param string $boolean boolean value or variable definition
+     *
+     * @return string with xml boolea definition
+     * @access private
+     */
+    function _dumpBoolean($boolean)
+    {
+        if (is_string($boolean)) {
+            if ($boolean !== 'true' || $boolean !== 'false'
+                || preg_match('/<variable>.*</variable>/', $boolean)
+            ) {
+                return $boolean;
+            }
+        }
+        return $boolean ? 'true' : 'false';
+    }
+
+    // }}}
+    // {{{ dumpSequence()
+
+    /**
+     * dump the structure of a sequence
+     *
+     * @param string  $sequence_definition sequence definition
+     * @param string  $sequence_name       sequence name
+     * @param string  $eol                 end of line characters
+     * @param integer $dump                determines what data to dump
+     *                      MDB2_SCHEMA_DUMP_ALL       : the entire db
+     *                      MDB2_SCHEMA_DUMP_STRUCTURE : only the structure of the db
+     *                      MDB2_SCHEMA_DUMP_CONTENT   : only the content of the db
+     *
+     * @return mixed string xml sequence definition on success, or a error object
+     * @access public
+     */
+    function dumpSequence($sequence_definition, $sequence_name, $eol, $dump = MDB2_SCHEMA_DUMP_ALL)
+    {
+        $buffer = "$eol <sequence>$eol  <name>$sequence_name</name>$eol";
+        if ($dump == MDB2_SCHEMA_DUMP_ALL || $dump == MDB2_SCHEMA_DUMP_CONTENT) {
+            if (!empty($sequence_definition['start'])) {
+                $start   = $sequence_definition['start'];
+                $buffer .= "  <start>$start</start>$eol";
+            }
+        }
+
+        if (!empty($sequence_definition['on'])) {
+            $buffer .= "  <on>$eol";
+            $buffer .= "   <table>".$sequence_definition['on']['table'];
+            $buffer .= "</table>$eol   <field>".$sequence_definition['on']['field'];
+            $buffer .= "</field>$eol  </on>$eol";
+        }
+        $buffer .= " </sequence>$eol";
+
+        return $buffer;
+    }
+
+    // }}}
+    // {{{ dumpDatabase()
+
+    /**
+     * Dump a previously parsed database structure in the Metabase schema
+     * XML based format suitable for the Metabase parser. This function
+     * may optionally dump the database definition with initialization
+     * commands that specify the data that is currently present in the tables.
+     *
+     * @param array   $database_definition unknown
+     * @param array   $arguments           associative array that takes pairs of tag
+     *              names and values that define dump options.
+     *                 array (
+     *                     'output_mode'    =>    String
+     *                         'file' :   dump into a file
+     *                         default:   dump using a function
+     *                     'output'        =>    String
+     *                         depending on the 'Output_Mode'
+     *                                  name of the file
+     *                                  name of the function
+     *                     'end_of_line'        =>    String
+     *                         end of line delimiter that should be used
+     *                         default: "\n"
+     *                 );
+     * @param integer $dump                determines what data to dump
+     *                      MDB2_SCHEMA_DUMP_ALL       : the entire db
+     *                      MDB2_SCHEMA_DUMP_STRUCTURE : only the structure of the db
+     *                      MDB2_SCHEMA_DUMP_CONTENT   : only the content of the db
+     *
+     * @return mixed MDB2_OK on success, or a error object
+     * @access public
+     */
+    function dumpDatabase($database_definition, $arguments, $dump = MDB2_SCHEMA_DUMP_ALL)
+    {
+        if (!empty($arguments['output'])) {
+            if (!empty($arguments['output_mode']) && $arguments['output_mode'] == 'file') {
+                $fp = fopen($arguments['output'], 'w');
+                if ($fp === false) {
+                    return $this->raiseError(MDB2_SCHEMA_ERROR_WRITER, null, null,
+                        'it was not possible to open output file');
+                }
+
+                $output = false;
+            } elseif (is_callable($arguments['output'])) {
+                $output = $arguments['output'];
+            } else {
+                return $this->raiseError(MDB2_SCHEMA_ERROR_WRITER, null, null,
+                    'no valid output function specified');
+            }
+        } else {
+            return $this->raiseError(MDB2_SCHEMA_ERROR_WRITER, null, null,
+                'no output method specified');
+        }
+
+        $eol = isset($arguments['end_of_line']) ? $arguments['end_of_line'] : "\n";
+
+        $sequences = array();
+        if (!empty($database_definition['sequences'])
+            && is_array($database_definition['sequences'])
+        ) {
+            foreach ($database_definition['sequences'] as $sequence_name => $sequence) {
+                $table = !empty($sequence['on']) ? $sequence['on']['table'] :'';
+
+                $sequences[$table][] = $sequence_name;
+            }
+        }
+
+        $buffer  = '<?xml version="1.0" encoding="ISO-8859-1" ?>'.$eol;
+        $buffer .= "<database>$eol$eol <name>".$database_definition['name']."</name>";
+        $buffer .= "$eol <create>".$this->_dumpBoolean($database_definition['create'])."</create>";
+        $buffer .= "$eol <overwrite>".$this->_dumpBoolean($database_definition['overwrite'])."</overwrite>$eol";
+        $buffer .= "$eol <charset>".$database_definition['charset']."</charset>$eol";
+
+        if ($output) {
+            call_user_func($output, $buffer);
+        } else {
+            fwrite($fp, $buffer);
+        }
+
+        if (!empty($database_definition['tables']) && is_array($database_definition['tables'])) {
+            foreach ($database_definition['tables'] as $table_name => $table) {
+                $buffer = "$eol <table>$eol$eol  <name>$table_name</name>$eol";
+                if ($dump == MDB2_SCHEMA_DUMP_ALL || $dump == MDB2_SCHEMA_DUMP_STRUCTURE) {
+                    $buffer .= "$eol  <declaration>$eol";
+                    if (!empty($table['fields']) && is_array($table['fields'])) {
+                        foreach ($table['fields'] as $field_name => $field) {
+                            if (empty($field['type'])) {
+                                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE, null, null,
+                                    'it was not specified the type of the field "'.
+                                    $field_name.'" of the table "'.$table_name.'"');
+                            }
+                            if (!empty($this->valid_types) && !array_key_exists($field['type'], $this->valid_types)) {
+                                return $this->raiseError(MDB2_SCHEMA_ERROR_UNSUPPORTED, null, null,
+                                    'type "'.$field['type'].'" is not yet supported');
+                            }
+                            $buffer .= "$eol   <field>$eol    <name>$field_name</name>$eol    <type>";
+                            $buffer .= $field['type']."</type>$eol";
+                            if (!empty($field['fixed']) && $field['type'] === 'text') {
+                                $buffer .= "    <fixed>".$this->_dumpBoolean($field['fixed'])."</fixed>$eol";
+                            }
+                            if (array_key_exists('default', $field)
+                                && $field['type'] !== 'clob' && $field['type'] !== 'blob'
+                            ) {
+                                $buffer .= '    <default>'.$this->_escapeSpecialChars($field['default'])."</default>$eol";
+                            }
+                            if (!empty($field['notnull'])) {
+                                $buffer .= "    <notnull>".$this->_dumpBoolean($field['notnull'])."</notnull>$eol";
+                            } else {
+                                $buffer .= "    <notnull>false</notnull>$eol";
+                            }
+                            if (!empty($field['autoincrement'])) {
+                                $buffer .= "    <autoincrement>" . $field['autoincrement'] ."</autoincrement>$eol";
+                            }
+                            if (!empty($field['unsigned'])) {
+                                $buffer .= "    <unsigned>".$this->_dumpBoolean($field['unsigned'])."</unsigned>$eol";
+                            }
+                            if (!empty($field['length'])) {
+                                $buffer .= '    <length>'.$field['length']."</length>$eol";
+                            }
+                            $buffer .= "   </field>$eol";
+                        }
+                    }
+
+                    if (!empty($table['indexes']) && is_array($table['indexes'])) {
+                        foreach ($table['indexes'] as $index_name => $index) {
+                            if (strtolower($index_name) === 'primary') {
+                                $index_name = $table_name . '_pKey';
+                            }
+                            $buffer .= "$eol   <index>$eol    <name>$index_name</name>$eol";
+                            if (!empty($index['unique'])) {
+                                $buffer .= "    <unique>".$this->_dumpBoolean($index['unique'])."</unique>$eol";
+                            }
+
+                            if (!empty($index['primary'])) {
+                                $buffer .= "    <primary>".$this->_dumpBoolean($index['primary'])."</primary>$eol";
+                            }
+
+                            foreach ($index['fields'] as $field_name => $field) {
+                                $buffer .= "    <field>$eol     <name>$field_name</name>$eol";
+                                if (!empty($field) && is_array($field)) {
+                                    $buffer .= '     <sorting>'.$field['sorting']."</sorting>$eol";
+                                }
+                                $buffer .= "    </field>$eol";
+                            }
+                            $buffer .= "   </index>$eol";
+                        }
+                    }
+
+                    if (!empty($table['constraints']) && is_array($table['constraints'])) {
+                        foreach ($table['constraints'] as $constraint_name => $constraint) {
+                            $buffer .= "$eol   <foreign>$eol    <name>$constraint_name</name>$eol";
+                            if (empty($constraint['fields']) || !is_array($constraint['fields'])) {
+                                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE, null, null,
+                                    'it was not specified a field for the foreign key "'.
+                                    $constraint_name.'" of the table "'.$table_name.'"');
+                            }
+                            if (!is_array($constraint['references']) || empty($constraint['references']['table'])) {
+                                return $this->raiseError(MDB2_SCHEMA_ERROR_VALIDATE, null, null,
+                                    'it was not specified the referenced table of the foreign key "'.
+                                    $constraint_name.'" of the table "'.$table_name.'"');
+                            }
+                            if (!empty($constraint['match'])) {
+                                $buffer .= "    <match>".$constraint['match']."</match>$eol";
+                            }
+                            if (!empty($constraint['ondelete'])) {
+                                $buffer .= "    <ondelete>".$constraint['ondelete']."</ondelete>$eol";
+                            }
+                            if (!empty($constraint['onupdate'])) {
+                                $buffer .= "    <onupdate>".$constraint['onupdate']."</onupdate>$eol";
+                            }
+                            if (!empty($constraint['deferrable'])) {
+                                $buffer .= "    <deferrable>".$constraint['deferrable']."</deferrable>$eol";
+                            }
+                            if (!empty($constraint['initiallydeferred'])) {
+                                $buffer .= "    <initiallydeferred>".$constraint['initiallydeferred']."</initiallydeferred>$eol";
+                            }
+                            foreach ($constraint['fields'] as $field_name => $field) {
+                                $buffer .= "    <field>$field_name</field>$eol";
+                            }
+                            $buffer .= "    <references>$eol     <table>".$constraint['references']['table']."</table>$eol";
+                            foreach ($constraint['references']['fields'] as $field_name => $field) {
+                                $buffer .= "     <field>$field_name</field>$eol";
+                            }
+                            $buffer .= "    </references>$eol";
+
+                            $buffer .= "   </foreign>$eol";
+                        }
+                    }
+
+                    $buffer .= "$eol  </declaration>$eol";
+                }
+
+                if ($output) {
+                    call_user_func($output, $buffer);
+                } else {
+                    fwrite($fp, $buffer);
+                }
+
+                $buffer = '';
+                if ($dump == MDB2_SCHEMA_DUMP_ALL || $dump == MDB2_SCHEMA_DUMP_CONTENT) {
+                    if (!empty($table['initialization']) && is_array($table['initialization'])) {
+                        $buffer = "$eol  <initialization>$eol";
+                        foreach ($table['initialization'] as $instruction) {
+                            switch ($instruction['type']) {
+                            case 'insert':
+                                $buffer .= "$eol   <insert>$eol";
+                                foreach ($instruction['data']['field'] as $field) {
+                                    $field_name = $field['name'];
+
+                                    $buffer .= "$eol    <field>$eol     <name>$field_name</name>$eol";
+                                    $buffer .= $this->writeExpression($field['group'], 5, $arguments);
+                                    $buffer .= "    </field>$eol";
+                                }
+                                $buffer .= "$eol   </insert>$eol";
+                                break;
+                            case 'update':
+                                $buffer .= "$eol   <update>$eol";
+                                foreach ($instruction['data']['field'] as $field) {
+                                    $field_name = $field['name'];
+
+                                    $buffer .= "$eol    <field>$eol     <name>$field_name</name>$eol";
+                                    $buffer .= $this->writeExpression($field['group'], 5, $arguments);
+                                    $buffer .= "    </field>$eol";
+                                }
+
+                                if (!empty($instruction['data']['where'])
+                                    && is_array($instruction['data']['where'])
+                                ) {
+                                    $buffer .= "    <where>$eol";
+                                    $buffer .= $this->writeExpression($instruction['data']['where'], 5, $arguments);
+                                    $buffer .= "    </where>$eol";
+                                }
+
+                                $buffer .= "$eol   </update>$eol";
+                                break;
+                            case 'delete':
+                                $buffer .= "$eol   <delete>$eol$eol";
+                                if (!empty($instruction['data']['where'])
+                                    && is_array($instruction['data']['where'])
+                                ) {
+                                    $buffer .= "    <where>$eol";
+                                    $buffer .= $this->writeExpression($instruction['data']['where'], 5, $arguments);
+                                    $buffer .= "    </where>$eol";
+                                }
+                                $buffer .= "$eol   </delete>$eol";
+                                break;
+                            }
+                        }
+                        $buffer .= "$eol  </initialization>$eol";
+                    }
+                }
+                $buffer .= "$eol </table>$eol";
+                if ($output) {
+                    call_user_func($output, $buffer);
+                } else {
+                    fwrite($fp, $buffer);
+                }
+
+                if (isset($sequences[$table_name])) {
+                    foreach ($sequences[$table_name] as $sequence) {
+                        $result = $this->dumpSequence($database_definition['sequences'][$sequence],
+                                                      $sequence, $eol, $dump);
+                        if (PEAR::isError($result)) {
+                            return $result;
+                        }
+
+                        if ($output) {
+                            call_user_func($output, $result);
+                        } else {
+                            fwrite($fp, $result);
+                        }
+                    }
+                }
+            }
+        }
+
+        if (isset($sequences[''])) {
+            foreach ($sequences[''] as $sequence) {
+                $result = $this->dumpSequence($database_definition['sequences'][$sequence],
+                                              $sequence, $eol, $dump);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+
+                if ($output) {
+                    call_user_func($output, $result);
+                } else {
+                    fwrite($fp, $result);
+                }
+            }
+        }
+
+        $buffer = "$eol</database>$eol";
+        if ($output) {
+            call_user_func($output, $buffer);
+        } else {
+            fwrite($fp, $buffer);
+            fclose($fp);
+        }
+
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ writeExpression()
+
+    /**
+     * Dumps the structure of an element. Elements can be value, column,
+     * function or expression.
+     *
+     * @param array   $element   multi dimensional array that represents the parsed element
+     *                           of a DML instruction.
+     * @param integer $offset    base indentation width
+     * @param array   $arguments associative array that takes pairs of tag
+     *                           names and values that define dump options.
+     *
+     * @return string
+     *
+     * @access public
+     * @see MDB2_Schema_Writer::dumpDatabase()
+     */
+    function writeExpression($element, $offset = 0, $arguments = null)
+    {
+        $eol = isset($arguments['end_of_line']) ? $arguments['end_of_line'] : "\n";
+        $str = '';
+
+        $indent  = str_repeat(' ', $offset);
+        $noffset = $offset + 1;
+
+        switch ($element['type']) {
+        case 'value':
+            $str .= "$indent<value>".$this->_escapeSpecialChars($element['data'])."</value>$eol";
+            break;
+        case 'column':
+            $str .= "$indent<column>".$this->_escapeSpecialChars($element['data'])."</column>$eol";
+            break;
+        case 'function':
+            $str .= "$indent<function>$eol$indent <name>".$this->_escapeSpecialChars($element['data']['name'])."</name>$eol";
+
+            if (!empty($element['data']['arguments'])
+                && is_array($element['data']['arguments'])
+            ) {
+                foreach ($element['data']['arguments'] as $v) {
+                    $str .= $this->writeExpression($v, $noffset, $arguments);
+                }
+            }
+
+            $str .= "$indent</function>$eol";
+            break;
+        case 'expression':
+            $str .= "$indent<expression>$eol";
+            $str .= $this->writeExpression($element['data']['operants'][0], $noffset, $arguments);
+            $str .= "$indent <operator>".$element['data']['operator']."</operator>$eol";
+            $str .= $this->writeExpression($element['data']['operants'][1], $noffset, $arguments);
+            $str .= "$indent</expression>$eol";
+            break;
+        }
+        return $str;
+    }
+
+    // }}}
+}
+?>
diff --git a/3rdparty/PEAR.php b/3rdparty/PEAR.php
new file mode 100644
index 00000000000..f832c0d4916
--- /dev/null
+++ b/3rdparty/PEAR.php
@@ -0,0 +1,1055 @@
+<?php
+//
+// +--------------------------------------------------------------------+
+// | PEAR, the PHP Extension and Application Repository                 |
+// +--------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                              |
+// +--------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,     |
+// | that is bundled with this package in the file LICENSE, and is      |
+// | available through the world-wide-web at the following url:         |
+// | http://www.php.net/license/3_0.txt.                                |
+// | If you did not receive a copy of the PHP license and are unable to |
+// | obtain it through the world-wide-web, please send a note to        |
+// | license@php.net so we can mail you a copy immediately.             |
+// +--------------------------------------------------------------------+
+// | Authors: Sterling Hughes <sterling@php.net>                        |
+// |          Stig Bakken <ssb@php.net>                                 |
+// |          Tomas V.V.Cox <cox@idecnet.com>                           |
+// +--------------------------------------------------------------------+
+//
+// $Id: PEAR.php,v 1.82.2.6 2005/01/01 05:24:51 cellog Exp $
+//
+
+define('PEAR_ERROR_RETURN',     1);
+define('PEAR_ERROR_PRINT',      2);
+define('PEAR_ERROR_TRIGGER',    4);
+define('PEAR_ERROR_DIE',        8);
+define('PEAR_ERROR_CALLBACK',  16);
+/**
+ * WARNING: obsolete
+ * @deprecated
+ */
+define('PEAR_ERROR_EXCEPTION', 32);
+define('PEAR_ZE2', (function_exists('version_compare') &&
+                    version_compare(zend_version(), "2-dev", "ge")));
+
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    define('OS_WINDOWS', true);
+    define('OS_UNIX',    false);
+    define('PEAR_OS',    'Windows');
+} else {
+    define('OS_WINDOWS', false);
+    define('OS_UNIX',    true);
+    define('PEAR_OS',    'Unix'); // blatant assumption
+}
+
+// instant backwards compatibility
+if (!defined('PATH_SEPARATOR')) {
+    if (OS_WINDOWS) {
+        define('PATH_SEPARATOR', ';');
+    } else {
+        define('PATH_SEPARATOR', ':');
+    }
+}
+
+$GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
+$GLOBALS['_PEAR_default_error_options']  = E_USER_NOTICE;
+$GLOBALS['_PEAR_destructor_object_list'] = array();
+$GLOBALS['_PEAR_shutdown_funcs']         = array();
+$GLOBALS['_PEAR_error_handler_stack']    = array();
+
+@ini_set('track_errors', true);
+
+/**
+ * Base class for other PEAR classes.  Provides rudimentary
+ * emulation of destructors.
+ *
+ * If you want a destructor in your class, inherit PEAR and make a
+ * destructor method called _yourclassname (same name as the
+ * constructor, but with a "_" prefix).  Also, in your constructor you
+ * have to call the PEAR constructor: $this->PEAR();.
+ * The destructor method will be called without parameters.  Note that
+ * at in some SAPI implementations (such as Apache), any output during
+ * the request shutdown (in which destructors are called) seems to be
+ * discarded.  If you need to get any debug information from your
+ * destructor, use error_log(), syslog() or something similar.
+ *
+ * IMPORTANT! To use the emulated destructors you need to create the
+ * objects by reference: $obj =& new PEAR_child;
+ *
+ * @since PHP 4.0.2
+ * @author Stig Bakken <ssb@php.net>
+ * @see http://pear.php.net/manual/
+ */
+class PEAR
+{
+    // {{{ properties
+
+    /**
+     * Whether to enable internal debug messages.
+     *
+     * @var     bool
+     * @access  private
+     */
+    var $_debug = false;
+
+    /**
+     * Default error mode for this object.
+     *
+     * @var     int
+     * @access  private
+     */
+    var $_default_error_mode = null;
+
+    /**
+     * Default error options used for this object when error mode
+     * is PEAR_ERROR_TRIGGER.
+     *
+     * @var     int
+     * @access  private
+     */
+    var $_default_error_options = null;
+
+    /**
+     * Default error handler (callback) for this object, if error mode is
+     * PEAR_ERROR_CALLBACK.
+     *
+     * @var     string
+     * @access  private
+     */
+    var $_default_error_handler = '';
+
+    /**
+     * Which class to use for error objects.
+     *
+     * @var     string
+     * @access  private
+     */
+    var $_error_class = 'PEAR_Error';
+
+    /**
+     * An array of expected errors.
+     *
+     * @var     array
+     * @access  private
+     */
+    var $_expected_errors = array();
+
+    // }}}
+
+    // {{{ constructor
+
+    /**
+     * Constructor.  Registers this object in
+     * $_PEAR_destructor_object_list for destructor emulation if a
+     * destructor object exists.
+     *
+     * @param string $error_class  (optional) which class to use for
+     *        error objects, defaults to PEAR_Error.
+     * @access public
+     * @return void
+     */
+    function PEAR($error_class = null)
+    {
+        $classname = strtolower(get_class($this));
+        if ($this->_debug) {
+            print "PEAR constructor called, class=$classname\n";
+        }
+        if ($error_class !== null) {
+            $this->_error_class = $error_class;
+        }
+        while ($classname && strcasecmp($classname, "pear")) {
+            $destructor = "_$classname";
+            if (method_exists($this, $destructor)) {
+                global $_PEAR_destructor_object_list;
+                $_PEAR_destructor_object_list[] = &$this;
+                if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
+                    register_shutdown_function("_PEAR_call_destructors");
+                    $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
+                }
+                break;
+            } else {
+                $classname = get_parent_class($classname);
+            }
+        }
+    }
+
+    // }}}
+    // {{{ destructor
+
+    /**
+     * Destructor (the emulated type of...).  Does nothing right now,
+     * but is included for forward compatibility, so subclass
+     * destructors should always call it.
+     *
+     * See the note in the class desciption about output from
+     * destructors.
+     *
+     * @access public
+     * @return void
+     */
+    function _PEAR() {
+        if ($this->_debug) {
+            printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
+        }
+    }
+
+    // }}}
+    // {{{ getStaticProperty()
+
+    /**
+    * If you have a class that's mostly/entirely static, and you need static
+    * properties, you can use this method to simulate them. Eg. in your method(s)
+    * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
+    * You MUST use a reference, or they will not persist!
+    *
+    * @access public
+    * @param  string $class  The calling classname, to prevent clashes
+    * @param  string $var    The variable to retrieve.
+    * @return mixed   A reference to the variable. If not set it will be
+    *                 auto initialised to NULL.
+    */
+    function &getStaticProperty($class, $var)
+    {
+        static $properties;
+        return $properties[$class][$var];
+    }
+
+    // }}}
+    // {{{ registerShutdownFunc()
+
+    /**
+    * Use this function to register a shutdown method for static
+    * classes.
+    *
+    * @access public
+    * @param  mixed $func  The function name (or array of class/method) to call
+    * @param  mixed $args  The arguments to pass to the function
+    * @return void
+    */
+    function registerShutdownFunc($func, $args = array())
+    {
+        $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
+    }
+
+    // }}}
+    // {{{ isError()
+
+    /**
+     * Tell whether a value is a PEAR error.
+     *
+     * @param   mixed $data   the value to test
+     * @param   int   $code   if $data is an error object, return true
+     *                        only if $code is a string and
+     *                        $obj->getMessage() == $code or
+     *                        $code is an integer and $obj->getCode() == $code
+     * @access  public
+     * @return  bool    true if parameter is an error
+     */
+    static function isError($data, $code = null)
+    {
+        if ($data instanceof PEAR_Error) {
+            if (is_null($code)) {
+                return true;
+            } elseif (is_string($code)) {
+                return $data->getMessage() == $code;
+            } else {
+                return $data->getCode() == $code;
+            }
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ setErrorHandling()
+
+    /**
+     * Sets how errors generated by this object should be handled.
+     * Can be invoked both in objects and statically.  If called
+     * statically, setErrorHandling sets the default behaviour for all
+     * PEAR objects.  If called in an object, setErrorHandling sets
+     * the default behaviour for that object.
+     *
+     * @param int $mode
+     *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
+     *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
+     *        PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
+     *
+     * @param mixed $options
+     *        When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
+     *        of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
+     *
+     *        When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
+     *        to be the callback function or method.  A callback
+     *        function is a string with the name of the function, a
+     *        callback method is an array of two elements: the element
+     *        at index 0 is the object, and the element at index 1 is
+     *        the name of the method to call in the object.
+     *
+     *        When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
+     *        a printf format string used when printing the error
+     *        message.
+     *
+     * @access public
+     * @return void
+     * @see PEAR_ERROR_RETURN
+     * @see PEAR_ERROR_PRINT
+     * @see PEAR_ERROR_TRIGGER
+     * @see PEAR_ERROR_DIE
+     * @see PEAR_ERROR_CALLBACK
+     * @see PEAR_ERROR_EXCEPTION
+     *
+     * @since PHP 4.0.5
+     */
+
+    function setErrorHandling($mode = null, $options = null)
+    {
+        if (isset($this) && $this instanceof PEAR) {
+            $setmode     = &$this->_default_error_mode;
+            $setoptions  = &$this->_default_error_options;
+        } else {
+            $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
+            $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
+        }
+
+        switch ($mode) {
+            case PEAR_ERROR_EXCEPTION:
+            case PEAR_ERROR_RETURN:
+            case PEAR_ERROR_PRINT:
+            case PEAR_ERROR_TRIGGER:
+            case PEAR_ERROR_DIE:
+            case null:
+                $setmode = $mode;
+                $setoptions = $options;
+                break;
+
+            case PEAR_ERROR_CALLBACK:
+                $setmode = $mode;
+                // class/object method callback
+                if (is_callable($options)) {
+                    $setoptions = $options;
+                } else {
+                    trigger_error("invalid error callback", E_USER_WARNING);
+                }
+                break;
+
+            default:
+                trigger_error("invalid error mode", E_USER_WARNING);
+                break;
+        }
+    }
+
+    // }}}
+    // {{{ expectError()
+
+    /**
+     * This method is used to tell which errors you expect to get.
+     * Expected errors are always returned with error mode
+     * PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
+     * and this method pushes a new element onto it.  The list of
+     * expected errors are in effect until they are popped off the
+     * stack with the popExpect() method.
+     *
+     * Note that this method can not be called statically
+     *
+     * @param mixed $code a single error code or an array of error codes to expect
+     *
+     * @return int     the new depth of the "expected errors" stack
+     * @access public
+     */
+    function expectError($code = '*')
+    {
+        if (is_array($code)) {
+            array_push($this->_expected_errors, $code);
+        } else {
+            array_push($this->_expected_errors, array($code));
+        }
+        return sizeof($this->_expected_errors);
+    }
+
+    // }}}
+    // {{{ popExpect()
+
+    /**
+     * This method pops one element off the expected error codes
+     * stack.
+     *
+     * @return array   the list of error codes that were popped
+     */
+    function popExpect()
+    {
+        return array_pop($this->_expected_errors);
+    }
+
+    // }}}
+    // {{{ _checkDelExpect()
+
+    /**
+     * This method checks unsets an error code if available
+     *
+     * @param mixed error code
+     * @return bool true if the error code was unset, false otherwise
+     * @access private
+     * @since PHP 4.3.0
+     */
+    function _checkDelExpect($error_code)
+    {
+        $deleted = false;
+
+        foreach ($this->_expected_errors AS $key => $error_array) {
+            if (in_array($error_code, $error_array)) {
+                unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
+                $deleted = true;
+            }
+
+            // clean up empty arrays
+            if (0 == count($this->_expected_errors[$key])) {
+                unset($this->_expected_errors[$key]);
+            }
+        }
+        return $deleted;
+    }
+
+    // }}}
+    // {{{ delExpect()
+
+    /**
+     * This method deletes all occurences of the specified element from
+     * the expected error codes stack.
+     *
+     * @param  mixed $error_code error code that should be deleted
+     * @return mixed list of error codes that were deleted or error
+     * @access public
+     * @since PHP 4.3.0
+     */
+    function delExpect($error_code)
+    {
+        $deleted = false;
+
+        if ((is_array($error_code) && (0 != count($error_code)))) {
+            // $error_code is a non-empty array here;
+            // we walk through it trying to unset all
+            // values
+            foreach($error_code as $key => $error) {
+                if ($this->_checkDelExpect($error)) {
+                    $deleted =  true;
+                } else {
+                    $deleted = false;
+                }
+            }
+            return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
+        } elseif (!empty($error_code)) {
+            // $error_code comes alone, trying to unset it
+            if ($this->_checkDelExpect($error_code)) {
+                return true;
+            } else {
+                return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
+            }
+        } else {
+            // $error_code is empty
+            return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
+        }
+    }
+
+    // }}}
+    // {{{ raiseError()
+
+    /**
+     * This method is a wrapper that returns an instance of the
+     * configured error class with this object's default error
+     * handling applied.  If the $mode and $options parameters are not
+     * specified, the object's defaults are used.
+     *
+     * @param mixed $message a text error message or a PEAR error object
+     *
+     * @param int $code      a numeric error code (it is up to your class
+     *                  to define these if you want to use codes)
+     *
+     * @param int $mode      One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
+     *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
+     *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
+     *
+     * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
+     *                  specifies the PHP-internal error level (one of
+     *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
+     *                  If $mode is PEAR_ERROR_CALLBACK, this
+     *                  parameter specifies the callback function or
+     *                  method.  In other error modes this parameter
+     *                  is ignored.
+     *
+     * @param string $userinfo If you need to pass along for example debug
+     *                  information, this parameter is meant for that.
+     *
+     * @param string $error_class The returned error object will be
+     *                  instantiated from this class, if specified.
+     *
+     * @param bool $skipmsg If true, raiseError will only pass error codes,
+     *                  the error message parameter will be dropped.
+     *
+     * @access public
+     * @return object   a PEAR error object
+     * @see PEAR::setErrorHandling
+     * @since PHP 4.0.5
+     */
+    function raiseError($message = null,
+                         $code = null,
+                         $mode = null,
+                         $options = null,
+                         $userinfo = null,
+                         $error_class = null,
+                         $skipmsg = false)
+    {
+        // The error is yet a PEAR error object
+        if (is_object($message)) {
+            $code        = $message->getCode();
+            $userinfo    = $message->getUserInfo();
+            $error_class = $message->getType();
+            $message->error_message_prefix = '';
+            $message     = $message->getMessage();
+        }
+
+        if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) {
+            if ($exp[0] == "*" ||
+                (is_int(reset($exp)) && in_array($code, $exp)) ||
+                (is_string(reset($exp)) && in_array($message, $exp))) {
+                $mode = PEAR_ERROR_RETURN;
+            }
+        }
+        // No mode given, try global ones
+        if ($mode === null) {
+            // Class error handler
+            if (isset($this) && isset($this->_default_error_mode)) {
+                $mode    = $this->_default_error_mode;
+                $options = $this->_default_error_options;
+            // Global error handler
+            } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
+                $mode    = $GLOBALS['_PEAR_default_error_mode'];
+                $options = $GLOBALS['_PEAR_default_error_options'];
+            }
+        }
+
+        if ($error_class !== null) {
+            $ec = $error_class;
+        } elseif (isset($this) && isset($this->_error_class)) {
+            $ec = $this->_error_class;
+        } else {
+            $ec = 'PEAR_Error';
+        }
+        if ($skipmsg) {
+            return new $ec($code, $mode, $options, $userinfo);
+        } else {
+            return new $ec($message, $code, $mode, $options, $userinfo);
+        }
+    }
+
+    // }}}
+    // {{{ throwError()
+
+    /**
+     * Simpler form of raiseError with fewer options.  In most cases
+     * message, code and userinfo are enough.
+     *
+     * @param string $message
+     *
+     */
+    function throwError($message = null,
+                         $code = null,
+                         $userinfo = null)
+    {
+        if (isset($this) && $this instanceof PEAR) {
+            return $this->raiseError($message, $code, null, null, $userinfo);
+        } else {
+            return PEAR::raiseError($message, $code, null, null, $userinfo);
+        }
+    }
+
+    // }}}
+    function staticPushErrorHandling($mode, $options = null)
+    {
+        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+        $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
+        $def_options = &$GLOBALS['_PEAR_default_error_options'];
+        $stack[] = array($def_mode, $def_options);
+        switch ($mode) {
+            case PEAR_ERROR_EXCEPTION:
+            case PEAR_ERROR_RETURN:
+            case PEAR_ERROR_PRINT:
+            case PEAR_ERROR_TRIGGER:
+            case PEAR_ERROR_DIE:
+            case null:
+                $def_mode = $mode;
+                $def_options = $options;
+                break;
+
+            case PEAR_ERROR_CALLBACK:
+                $def_mode = $mode;
+                // class/object method callback
+                if (is_callable($options)) {
+                    $def_options = $options;
+                } else {
+                    trigger_error("invalid error callback", E_USER_WARNING);
+                }
+                break;
+
+            default:
+                trigger_error("invalid error mode", E_USER_WARNING);
+                break;
+        }
+        $stack[] = array($mode, $options);
+        return true;
+    }
+
+    function staticPopErrorHandling()
+    {
+        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+        $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
+        $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
+        array_pop($stack);
+        list($mode, $options) = $stack[sizeof($stack) - 1];
+        array_pop($stack);
+        switch ($mode) {
+            case PEAR_ERROR_EXCEPTION:
+            case PEAR_ERROR_RETURN:
+            case PEAR_ERROR_PRINT:
+            case PEAR_ERROR_TRIGGER:
+            case PEAR_ERROR_DIE:
+            case null:
+                $setmode = $mode;
+                $setoptions = $options;
+                break;
+
+            case PEAR_ERROR_CALLBACK:
+                $setmode = $mode;
+                // class/object method callback
+                if (is_callable($options)) {
+                    $setoptions = $options;
+                } else {
+                    trigger_error("invalid error callback", E_USER_WARNING);
+                }
+                break;
+
+            default:
+                trigger_error("invalid error mode", E_USER_WARNING);
+                break;
+        }
+        return true;
+    }
+
+    // {{{ pushErrorHandling()
+
+    /**
+     * Push a new error handler on top of the error handler options stack. With this
+     * you can easily override the actual error handler for some code and restore
+     * it later with popErrorHandling.
+     *
+     * @param mixed $mode (same as setErrorHandling)
+     * @param mixed $options (same as setErrorHandling)
+     *
+     * @return bool Always true
+     *
+     * @see PEAR::setErrorHandling
+     */
+    function pushErrorHandling($mode, $options = null)
+    {
+        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+        if (isset($this) && $this instanceof PEAR) {
+            $def_mode    = &$this->_default_error_mode;
+            $def_options = &$this->_default_error_options;
+        } else {
+            $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
+            $def_options = &$GLOBALS['_PEAR_default_error_options'];
+        }
+        $stack[] = array($def_mode, $def_options);
+
+        if (isset($this) && $this instanceof PEAR) {
+            $this->setErrorHandling($mode, $options);
+        } else {
+            PEAR::setErrorHandling($mode, $options);
+        }
+        $stack[] = array($mode, $options);
+        return true;
+    }
+
+    // }}}
+    // {{{ popErrorHandling()
+
+    /**
+    * Pop the last error handler used
+    *
+    * @return bool Always true
+    *
+    * @see PEAR::pushErrorHandling
+    */
+    function popErrorHandling()
+    {
+        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+        array_pop($stack);
+        list($mode, $options) = $stack[sizeof($stack) - 1];
+        array_pop($stack);
+        if (isset($this) && $this instanceof PEAR) {
+            $this->setErrorHandling($mode, $options);
+        } else {
+            PEAR::setErrorHandling($mode, $options);
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ loadExtension()
+
+    /**
+    * OS independant PHP extension load. Remember to take care
+    * on the correct extension name for case sensitive OSes.
+    *
+    * @param string $ext The extension name
+    * @return bool Success or not on the dl() call
+    */
+    function loadExtension($ext)
+    {
+        if (!extension_loaded($ext)) {
+            // if either returns true dl() will produce a FATAL error, stop that
+            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
+                return false;
+            }
+            if (OS_WINDOWS) {
+                $suffix = '.dll';
+            } elseif (PHP_OS == 'HP-UX') {
+                $suffix = '.sl';
+            } elseif (PHP_OS == 'AIX') {
+                $suffix = '.a';
+            } elseif (PHP_OS == 'OSX') {
+                $suffix = '.bundle';
+            } else {
+                $suffix = '.so';
+            }
+            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
+        }
+        return true;
+    }
+
+    // }}}
+}
+
+// {{{ _PEAR_call_destructors()
+
+function _PEAR_call_destructors()
+{
+    global $_PEAR_destructor_object_list;
+    if (is_array($_PEAR_destructor_object_list) &&
+        sizeof($_PEAR_destructor_object_list))
+    {
+        reset($_PEAR_destructor_object_list);
+        if (@PEAR::getStaticProperty('PEAR', 'destructlifo')) {
+            $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
+        }
+        while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
+            $classname = get_class($objref);
+            while ($classname) {
+                $destructor = "_$classname";
+                if (method_exists($objref, $destructor)) {
+                    $objref->$destructor();
+                    break;
+                } else {
+                    $classname = get_parent_class($classname);
+                }
+            }
+        }
+        // Empty the object list to ensure that destructors are
+        // not called more than once.
+        $_PEAR_destructor_object_list = array();
+    }
+
+    // Now call the shutdown functions
+    if (is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
+        foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
+            call_user_func_array($value[0], $value[1]);
+        }
+    }
+}
+
+// }}}
+
+class PEAR_Error
+{
+    // {{{ properties
+
+    var $error_message_prefix = '';
+    var $mode                 = PEAR_ERROR_RETURN;
+    var $level                = E_USER_NOTICE;
+    var $code                 = -1;
+    var $message              = '';
+    var $userinfo             = '';
+    var $backtrace            = null;
+
+    // }}}
+    // {{{ constructor
+
+    /**
+     * PEAR_Error constructor
+     *
+     * @param string $message  message
+     *
+     * @param int $code     (optional) error code
+     *
+     * @param int $mode     (optional) error mode, one of: PEAR_ERROR_RETURN,
+     * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
+     * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
+     *
+     * @param mixed $options   (optional) error level, _OR_ in the case of
+     * PEAR_ERROR_CALLBACK, the callback function or object/method
+     * tuple.
+     *
+     * @param string $userinfo (optional) additional user/debug info
+     *
+     * @access public
+     *
+     */
+    function PEAR_Error($message = 'unknown error', $code = null,
+                        $mode = null, $options = null, $userinfo = null)
+    {
+        if ($mode === null) {
+            $mode = PEAR_ERROR_RETURN;
+        }
+        $this->message   = $message;
+        $this->code      = $code;
+        $this->mode      = $mode;
+        $this->userinfo  = $userinfo;
+        if (function_exists("debug_backtrace")) {
+            if (@!PEAR::getStaticProperty('PEAR_Error', 'skiptrace')) {
+                $this->backtrace = debug_backtrace();
+            }
+        }
+        if ($mode & PEAR_ERROR_CALLBACK) {
+            $this->level = E_USER_NOTICE;
+            $this->callback = $options;
+        } else {
+            if ($options === null) {
+                $options = E_USER_NOTICE;
+            }
+            $this->level = $options;
+            $this->callback = null;
+        }
+        if ($this->mode & PEAR_ERROR_PRINT) {
+            if (is_null($options) || is_int($options)) {
+                $format = "%s";
+            } else {
+                $format = $options;
+            }
+            printf($format, $this->getMessage());
+        }
+        if ($this->mode & PEAR_ERROR_TRIGGER) {
+            trigger_error($this->getMessage(), $this->level);
+        }
+        if ($this->mode & PEAR_ERROR_DIE) {
+            $msg = $this->getMessage();
+            if (is_null($options) || is_int($options)) {
+                $format = "%s";
+                if (substr($msg, -1) != "\n") {
+                    $msg .= "\n";
+                }
+            } else {
+                $format = $options;
+            }
+            die(sprintf($format, $msg));
+        }
+        if ($this->mode & PEAR_ERROR_CALLBACK) {
+            if (is_callable($this->callback)) {
+                call_user_func($this->callback, $this);
+            }
+        }
+        if ($this->mode & PEAR_ERROR_EXCEPTION) {
+            trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_ErrorStack for exceptions", E_USER_WARNING);
+            eval('$e = new Exception($this->message, $this->code);$e->PEAR_Error = $this;throw($e);');
+        }
+    }
+
+    // }}}
+    // {{{ getMode()
+
+    /**
+     * Get the error mode from an error object.
+     *
+     * @return int error mode
+     * @access public
+     */
+    function getMode() {
+        return $this->mode;
+    }
+
+    // }}}
+    // {{{ getCallback()
+
+    /**
+     * Get the callback function/method from an error object.
+     *
+     * @return mixed callback function or object/method array
+     * @access public
+     */
+    function getCallback() {
+        return $this->callback;
+    }
+
+    // }}}
+    // {{{ getMessage()
+
+
+    /**
+     * Get the error message from an error object.
+     *
+     * @return  string  full error message
+     * @access public
+     */
+    function getMessage()
+    {
+        return ($this->error_message_prefix . $this->message);
+    }
+
+
+    // }}}
+    // {{{ getCode()
+
+    /**
+     * Get error code from an error object
+     *
+     * @return int error code
+     * @access public
+     */
+     function getCode()
+     {
+        return $this->code;
+     }
+
+    // }}}
+    // {{{ getType()
+
+    /**
+     * Get the name of this error/exception.
+     *
+     * @return string error/exception name (type)
+     * @access public
+     */
+    function getType()
+    {
+        return get_class($this);
+    }
+
+    // }}}
+    // {{{ getUserInfo()
+
+    /**
+     * Get additional user-supplied information.
+     *
+     * @return string user-supplied information
+     * @access public
+     */
+    function getUserInfo()
+    {
+        return $this->userinfo;
+    }
+
+    // }}}
+    // {{{ getDebugInfo()
+
+    /**
+     * Get additional debug information supplied by the application.
+     *
+     * @return string debug information
+     * @access public
+     */
+    function getDebugInfo()
+    {
+        return $this->getUserInfo();
+    }
+
+    // }}}
+    // {{{ getBacktrace()
+
+    /**
+     * Get the call backtrace from where the error was generated.
+     * Supported with PHP 4.3.0 or newer.
+     *
+     * @param int $frame (optional) what frame to fetch
+     * @return array Backtrace, or NULL if not available.
+     * @access public
+     */
+    function getBacktrace($frame = null)
+    {
+        if ($frame === null) {
+            return $this->backtrace;
+        }
+        return $this->backtrace[$frame];
+    }
+
+    // }}}
+    // {{{ addUserInfo()
+
+    function addUserInfo($info)
+    {
+        if (empty($this->userinfo)) {
+            $this->userinfo = $info;
+        } else {
+            $this->userinfo .= " ** $info";
+        }
+    }
+
+    // }}}
+    // {{{ toString()
+
+    /**
+     * Make a string representation of this object.
+     *
+     * @return string a string with an object summary
+     * @access public
+     */
+    function toString() {
+        $modes = array();
+        $levels = array(E_USER_NOTICE  => 'notice',
+                        E_USER_WARNING => 'warning',
+                        E_USER_ERROR   => 'error');
+        if ($this->mode & PEAR_ERROR_CALLBACK) {
+            if (is_array($this->callback)) {
+                $callback = (is_object($this->callback[0]) ?
+                    strtolower(get_class($this->callback[0])) :
+                    $this->callback[0]) . '::' .
+                    $this->callback[1];
+            } else {
+                $callback = $this->callback;
+            }
+            return sprintf('[%s: message="%s" code=%d mode=callback '.
+                           'callback=%s prefix="%s" info="%s"]',
+                           strtolower(get_class($this)), $this->message, $this->code,
+                           $callback, $this->error_message_prefix,
+                           $this->userinfo);
+        }
+        if ($this->mode & PEAR_ERROR_PRINT) {
+            $modes[] = 'print';
+        }
+        if ($this->mode & PEAR_ERROR_TRIGGER) {
+            $modes[] = 'trigger';
+        }
+        if ($this->mode & PEAR_ERROR_DIE) {
+            $modes[] = 'die';
+        }
+        if ($this->mode & PEAR_ERROR_RETURN) {
+            $modes[] = 'return';
+        }
+        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
+                       'prefix="%s" info="%s"]',
+                       strtolower(get_class($this)), $this->message, $this->code,
+                       implode("|", $modes), $levels[$this->level],
+                       $this->error_message_prefix,
+                       $this->userinfo);
+    }
+
+    // }}}
+}
+
+/*
+ * Local Variables:
+ * mode: php
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
+?>
diff --git a/3rdparty/PEAR/Autoloader.php b/3rdparty/PEAR/Autoloader.php
new file mode 100644
index 00000000000..de0278d6191
--- /dev/null
+++ b/3rdparty/PEAR/Autoloader.php
@@ -0,0 +1,208 @@
+<?php
+// /* vim: set expandtab tabstop=4 shiftwidth=4: */
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Stig Bakken <ssb@php.net>                                    |
+// |                                                                      |
+// +----------------------------------------------------------------------+
+//
+// $Id: Autoloader.php,v 1.11 2004/02/27 02:21:29 cellog Exp $
+
+if (!extension_loaded("overload")) {
+    // die hard without ext/overload
+    die("Rebuild PHP with the `overload' extension to use PEAR_Autoloader");
+}
+
+require_once "PEAR.php";
+
+/**
+ * This class is for objects where you want to separate the code for
+ * some methods into separate classes.  This is useful if you have a
+ * class with not-frequently-used methods that contain lots of code
+ * that you would like to avoid always parsing.
+ *
+ * The PEAR_Autoloader class provides autoloading and aggregation.
+ * The autoloading lets you set up in which classes the separated
+ * methods are found.  Aggregation is the technique used to import new
+ * methods, an instance of each class providing separated methods is
+ * stored and called every time the aggregated method is called.
+ *
+ * @author Stig Sæther Bakken <ssb@php.net>
+ */
+class PEAR_Autoloader extends PEAR
+{
+    // {{{ properties
+
+    /**
+     * Map of methods and classes where they are defined
+     *
+     * @var array
+     *
+     * @access private
+     */
+    var $_autoload_map = array();
+
+    /**
+     * Map of methods and aggregate objects
+     *
+     * @var array
+     *
+     * @access private
+     */
+    var $_method_map = array();
+
+    // }}}
+    // {{{ addAutoload()
+
+    /**
+     * Add one or more autoload entries.
+     *
+     * @param string $method     which method to autoload
+     *
+     * @param string $classname  (optional) which class to find the method in.
+     *                           If the $method parameter is an array, this
+     *                           parameter may be omitted (and will be ignored
+     *                           if not), and the $method parameter will be
+     *                           treated as an associative array with method
+     *                           names as keys and class names as values.
+     *
+     * @return void
+     *
+     * @access public
+     */
+    function addAutoload($method, $classname = null)
+    {
+        if (is_array($method)) {
+            array_walk($method, create_function('$a,&$b', '$b = strtolower($b);'));
+            $this->_autoload_map = array_merge($this->_autoload_map, $method);
+        } else {
+            $this->_autoload_map[strtolower($method)] = $classname;
+        }
+    }
+
+    // }}}
+    // {{{ removeAutoload()
+
+    /**
+     * Remove an autoload entry.
+     *
+     * @param string $method  which method to remove the autoload entry for
+     *
+     * @return bool TRUE if an entry was removed, FALSE if not
+     *
+     * @access public
+     */
+    function removeAutoload($method)
+    {
+        $method = strtolower($method);
+        $ok = isset($this->_autoload_map[$method]);
+        unset($this->_autoload_map[$method]);
+        return $ok;
+    }
+
+    // }}}
+    // {{{ addAggregateObject()
+
+    /**
+     * Add an aggregate object to this object.  If the specified class
+     * is not defined, loading it will be attempted following PEAR's
+     * file naming scheme.  All the methods in the class will be
+     * aggregated, except private ones (name starting with an
+     * underscore) and constructors.
+     *
+     * @param string $classname  what class to instantiate for the object.
+     *
+     * @return void
+     *
+     * @access public
+     */
+    function addAggregateObject($classname)
+    {
+        $classname = strtolower($classname);
+        if (!class_exists($classname)) {
+            $include_file = preg_replace('/[^a-z0-9]/i', '_', $classname);
+            include_once $include_file;
+        }
+        $obj =& new $classname;
+        $methods = get_class_methods($classname);
+        foreach ($methods as $method) {
+            // don't import priviate methods and constructors
+            if ($method{0} != '_' && $method != $classname) {
+                $this->_method_map[$method] = $obj;
+            }
+        }
+    }
+
+    // }}}
+    // {{{ removeAggregateObject()
+
+    /**
+     * Remove an aggregate object.
+     *
+     * @param string $classname  the class of the object to remove
+     *
+     * @return bool  TRUE if an object was removed, FALSE if not
+     *
+     * @access public
+     */
+    function removeAggregateObject($classname)
+    {
+        $ok = false;
+        $classname = strtolower($classname);
+        reset($this->_method_map);
+        while (list($method, $obj) = each($this->_method_map)) {
+            if (is_a($obj, $classname)) {
+                unset($this->_method_map[$method]);
+                $ok = true;
+            }
+        }
+        return $ok;
+    }
+
+    // }}}
+    // {{{ __call()
+
+    /**
+     * Overloaded object call handler, called each time an
+     * undefined/aggregated method is invoked.  This method repeats
+     * the call in the right aggregate object and passes on the return
+     * value.
+     *
+     * @param string $method  which method that was called
+     *
+     * @param string $args    An array of the parameters passed in the
+     *                        original call
+     *
+     * @return mixed  The return value from the aggregated method, or a PEAR
+     *                error if the called method was unknown.
+     */
+    function __call($method, $args, &$retval)
+    {
+        $method = strtolower($method);
+        if (empty($this->_method_map[$method]) && isset($this->_autoload_map[$method])) {
+            $this->addAggregateObject($this->_autoload_map[$method]);
+        }
+        if (isset($this->_method_map[$method])) {
+            $retval = call_user_func_array(array($this->_method_map[$method], $method), $args);
+            return true;
+        }
+        return false;
+    }
+
+    // }}}
+}
+
+overload("PEAR_Autoloader");
+
+?>
diff --git a/3rdparty/PEAR/Builder.php b/3rdparty/PEAR/Builder.php
new file mode 100644
index 00000000000..4f6cc135d1e
--- /dev/null
+++ b/3rdparty/PEAR/Builder.php
@@ -0,0 +1,426 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Stig Sæther Bakken <ssb@php.net>                            |
+// +----------------------------------------------------------------------+
+//
+// $Id: Builder.php,v 1.16.2.3 2005/02/17 17:55:01 cellog Exp $
+
+require_once 'PEAR/Common.php';
+
+/**
+ * Class to handle building (compiling) extensions.
+ *
+ * @author Stig Sæther Bakken <ssb@php.net>
+ */
+class PEAR_Builder extends PEAR_Common
+{
+    // {{{ properties
+
+    var $php_api_version = 0;
+    var $zend_module_api_no = 0;
+    var $zend_extension_api_no = 0;
+
+    var $extensions_built = array();
+
+    var $current_callback = null;
+
+    // used for msdev builds
+    var $_lastline = null;
+    var $_firstline = null;
+    // }}}
+    // {{{ constructor
+
+    /**
+     * PEAR_Builder constructor.
+     *
+     * @param object $ui user interface object (instance of PEAR_Frontend_*)
+     *
+     * @access public
+     */
+    function PEAR_Builder(&$ui)
+    {
+        parent::PEAR_Common();
+        $this->setFrontendObject($ui);
+    }
+
+    // }}}
+
+    // {{{ _build_win32()
+
+    /**
+     * Build an extension from source on windows.
+     * requires msdev
+     */
+    function _build_win32($descfile, $callback = null)
+    {
+        if (PEAR::isError($info = $this->infoFromDescriptionFile($descfile))) {
+            return $info;
+        }
+        $dir = dirname($descfile);
+        $old_cwd = getcwd();
+
+        if (!@chdir($dir)) {
+            return $this->raiseError("could not chdir to $dir");
+        }
+        $this->log(2, "building in $dir");
+
+        $dsp = $info['package'].'.dsp';
+        if (!@is_file("$dir/$dsp")) {
+            return $this->raiseError("The DSP $dsp does not exist.");
+        }
+        // XXX TODO: make release build type configurable
+        $command = 'msdev '.$dsp.' /MAKE "'.$info['package']. ' - Release"';
+
+        $this->current_callback = $callback;
+        $err = $this->_runCommand($command, array(&$this, 'msdevCallback'));
+        if (PEAR::isError($err)) {
+            return $err;
+        }
+
+        // figure out the build platform and type
+        $platform = 'Win32';
+        $buildtype = 'Release';
+        if (preg_match('/.*?'.$info['package'].'\s-\s(\w+)\s(.*?)-+/i',$this->_firstline,$matches)) {
+            $platform = $matches[1];
+            $buildtype = $matches[2];
+        }
+
+        if (preg_match('/(.*)?\s-\s(\d+).*?(\d+)/',$this->_lastline,$matches)) {
+            if ($matches[2]) {
+                // there were errors in the build
+                return $this->raiseError("There were errors during compilation.");
+            }
+            $out = $matches[1];
+        } else {
+            return $this->raiseError("Did not understand the completion status returned from msdev.exe.");
+        }
+
+        // msdev doesn't tell us the output directory :/
+        // open the dsp, find /out and use that directory
+        $dsptext = join(file($dsp),'');
+
+        // this regex depends on the build platform and type having been
+        // correctly identified above.
+        $regex ='/.*?!IF\s+"\$\(CFG\)"\s+==\s+("'.
+                    $info['package'].'\s-\s'.
+                    $platform.'\s'.
+                    $buildtype.'").*?'.
+                    '\/out:"(.*?)"/is';
+
+        if ($dsptext && preg_match($regex,$dsptext,$matches)) {
+            // what we get back is a relative path to the output file itself.
+            $outfile = realpath($matches[2]);
+        } else {
+            return $this->raiseError("Could not retrieve output information from $dsp.");
+        }
+        if (@copy($outfile, "$dir/$out")) {
+            $outfile = "$dir/$out";
+        }
+
+        $built_files[] = array(
+            'file' => "$outfile",
+            'php_api' => $this->php_api_version,
+            'zend_mod_api' => $this->zend_module_api_no,
+            'zend_ext_api' => $this->zend_extension_api_no,
+            );
+
+        return $built_files;
+    }
+    // }}}
+
+    // {{{ msdevCallback()
+    function msdevCallback($what, $data)
+    {
+        if (!$this->_firstline)
+            $this->_firstline = $data;
+        $this->_lastline = $data;
+    }
+    // }}}
+
+    // {{{ _harventInstDir
+    /**
+     * @param string
+     * @param string
+     * @param array
+     * @access private
+     */
+    function _harvestInstDir($dest_prefix, $dirname, &$built_files)
+    {
+        $d = opendir($dirname);
+        if (!$d)
+            return false;
+
+        $ret = true;
+        while (($ent = readdir($d)) !== false) {
+            if ($ent{0} == '.')
+                continue;
+
+            $full = $dirname . DIRECTORY_SEPARATOR . $ent;
+            if (is_dir($full)) {
+                if (!$this->_harvestInstDir(
+                        $dest_prefix . DIRECTORY_SEPARATOR . $ent,
+                        $full, $built_files)) {
+                    $ret = false;
+                    break;
+                }
+            } else {
+                $dest = $dest_prefix . DIRECTORY_SEPARATOR . $ent;
+                $built_files[] = array(
+                        'file' => $full,
+                        'dest' => $dest,
+                        'php_api' => $this->php_api_version,
+                        'zend_mod_api' => $this->zend_module_api_no,
+                        'zend_ext_api' => $this->zend_extension_api_no,
+                        );
+            }
+        }
+        closedir($d);
+        return $ret;
+    }
+
+    // }}}
+
+    // {{{ build()
+
+    /**
+     * Build an extension from source.  Runs "phpize" in the source
+     * directory, but compiles in a temporary directory
+     * (/var/tmp/pear-build-USER/PACKAGE-VERSION).
+     *
+     * @param string $descfile path to XML package description file
+     *
+     * @param mixed $callback callback function used to report output,
+     * see PEAR_Builder::_runCommand for details
+     *
+     * @return array an array of associative arrays with built files,
+     * format:
+     * array( array( 'file' => '/path/to/ext.so',
+     *               'php_api' => YYYYMMDD,
+     *               'zend_mod_api' => YYYYMMDD,
+     *               'zend_ext_api' => YYYYMMDD ),
+     *        ... )
+     *
+     * @access public
+     *
+     * @see PEAR_Builder::_runCommand
+     * @see PEAR_Common::infoFromDescriptionFile
+     */
+    function build($descfile, $callback = null)
+    {
+        if (PEAR_OS == "Windows") {
+            return $this->_build_win32($descfile,$callback);
+        }
+        if (PEAR_OS != 'Unix') {
+            return $this->raiseError("building extensions not supported on this platform");
+        }
+        if (PEAR::isError($info = $this->infoFromDescriptionFile($descfile))) {
+            return $info;
+        }
+        $dir = dirname($descfile);
+        $old_cwd = getcwd();
+        if (!@chdir($dir)) {
+            return $this->raiseError("could not chdir to $dir");
+        }
+        $vdir = "$info[package]-$info[version]";
+        if (is_dir($vdir)) {
+            chdir($vdir);
+        }
+        $dir = getcwd();
+        $this->log(2, "building in $dir");
+        $this->current_callback = $callback;
+        putenv('PATH=' . $this->config->get('bin_dir') . ':' . getenv('PATH'));
+        $err = $this->_runCommand("phpize", array(&$this, 'phpizeCallback'));
+        if (PEAR::isError($err)) {
+            return $err;
+        }
+        if (!$err) {
+            return $this->raiseError("`phpize' failed");
+        }
+
+        // {{{ start of interactive part
+        $configure_command = "$dir/configure";
+        if (isset($info['configure_options'])) {
+            foreach ($info['configure_options'] as $o) {
+                list($r) = $this->ui->userDialog('build',
+                                                 array($o['prompt']),
+                                                 array('text'),
+                                                 array(@$o['default']));
+                if (substr($o['name'], 0, 5) == 'with-' &&
+                    ($r == 'yes' || $r == 'autodetect')) {
+                    $configure_command .= " --$o[name]";
+                } else {
+                    $configure_command .= " --$o[name]=".trim($r);
+                }
+            }
+        }
+        // }}} end of interactive part
+
+        // FIXME make configurable
+        if(!$user=getenv('USER')){
+            $user='defaultuser';
+        }
+        $build_basedir = "/var/tmp/pear-build-$user";
+        $build_dir = "$build_basedir/$info[package]-$info[version]";
+        $inst_dir = "$build_basedir/install-$info[package]-$info[version]";
+        $this->log(1, "building in $build_dir");
+        if (is_dir($build_dir)) {
+            System::rm('-rf', $build_dir);
+        }
+        if (!System::mkDir(array('-p', $build_dir))) {
+            return $this->raiseError("could not create build dir: $build_dir");
+        }
+        $this->addTempFile($build_dir);
+        if (!System::mkDir(array('-p', $inst_dir))) {
+            return $this->raiseError("could not create temporary install dir: $inst_dir");
+        }
+        $this->addTempFile($inst_dir);
+
+        if (getenv('MAKE')) {
+            $make_command = getenv('MAKE');
+        } else {
+            $make_command = 'make';
+        }
+        $to_run = array(
+            $configure_command,
+            $make_command,
+            "$make_command INSTALL_ROOT=\"$inst_dir\" install",
+            "find \"$inst_dir\" -ls"
+            );
+        if (!@chdir($build_dir)) {
+            return $this->raiseError("could not chdir to $build_dir");
+        }
+        putenv('PHP_PEAR_VERSION=@PEAR-VER@');
+        foreach ($to_run as $cmd) {
+            $err = $this->_runCommand($cmd, $callback);
+            if (PEAR::isError($err)) {
+                chdir($old_cwd);
+                return $err;
+            }
+            if (!$err) {
+                chdir($old_cwd);
+                return $this->raiseError("`$cmd' failed");
+            }
+        }
+        if (!($dp = opendir("modules"))) {
+            chdir($old_cwd);
+            return $this->raiseError("no `modules' directory found");
+        }
+        $built_files = array();
+        $prefix = exec("php-config --prefix");
+        $this->_harvestInstDir($prefix, $inst_dir . DIRECTORY_SEPARATOR . $prefix, $built_files);
+        chdir($old_cwd);
+        return $built_files;
+    }
+
+    // }}}
+    // {{{ phpizeCallback()
+
+    /**
+     * Message callback function used when running the "phpize"
+     * program.  Extracts the API numbers used.  Ignores other message
+     * types than "cmdoutput".
+     *
+     * @param string $what the type of message
+     * @param mixed $data the message
+     *
+     * @return void
+     *
+     * @access public
+     */
+    function phpizeCallback($what, $data)
+    {
+        if ($what != 'cmdoutput') {
+            return;
+        }
+        $this->log(1, rtrim($data));
+        if (preg_match('/You should update your .aclocal.m4/', $data)) {
+            return;
+        }
+        $matches = array();
+        if (preg_match('/^\s+(\S[^:]+):\s+(\d{8})/', $data, $matches)) {
+            $member = preg_replace('/[^a-z]/', '_', strtolower($matches[1]));
+            $apino = (int)$matches[2];
+            if (isset($this->$member)) {
+                $this->$member = $apino;
+                //$msg = sprintf("%-22s : %d", $matches[1], $apino);
+                //$this->log(1, $msg);
+            }
+        }
+    }
+
+    // }}}
+    // {{{ _runCommand()
+
+    /**
+     * Run an external command, using a message callback to report
+     * output.  The command will be run through popen and output is
+     * reported for every line with a "cmdoutput" message with the
+     * line string, including newlines, as payload.
+     *
+     * @param string $command the command to run
+     *
+     * @param mixed $callback (optional) function to use as message
+     * callback
+     *
+     * @return bool whether the command was successful (exit code 0
+     * means success, any other means failure)
+     *
+     * @access private
+     */
+    function _runCommand($command, $callback = null)
+    {
+        $this->log(1, "running: $command");
+        $pp = @popen("$command 2>&1", "r");
+        if (!$pp) {
+            return $this->raiseError("failed to run `$command'");
+        }
+        if ($callback && $callback[0]->debug == 1) {
+            $olddbg = $callback[0]->debug;
+            $callback[0]->debug = 2;
+        }
+
+        while ($line = fgets($pp, 1024)) {
+            if ($callback) {
+                call_user_func($callback, 'cmdoutput', $line);
+            } else {
+                $this->log(2, rtrim($line));
+            }
+        }
+        if ($callback && isset($olddbg)) {
+            $callback[0]->debug = $olddbg;
+        }
+        $exitcode = @pclose($pp);
+        return ($exitcode == 0);
+    }
+
+    // }}}
+    // {{{ log()
+
+    function log($level, $msg)
+    {
+        if ($this->current_callback) {
+            if ($this->debug >= $level) {
+                call_user_func($this->current_callback, 'output', $msg);
+            }
+            return;
+        }
+        return PEAR_Common::log($level, $msg);
+    }
+
+    // }}}
+}
+
+?>
diff --git a/3rdparty/PEAR/Command.php b/3rdparty/PEAR/Command.php
new file mode 100644
index 00000000000..2ea68743d20
--- /dev/null
+++ b/3rdparty/PEAR/Command.php
@@ -0,0 +1,398 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Stig Bakken <ssb@php.net>                                    |
+// +----------------------------------------------------------------------+
+//
+// $Id: Command.php,v 1.24 2004/05/16 15:43:30 pajoye Exp $
+
+
+require_once "PEAR.php";
+
+/**
+ * List of commands and what classes they are implemented in.
+ * @var array command => implementing class
+ */
+$GLOBALS['_PEAR_Command_commandlist'] = array();
+
+/**
+ * List of shortcuts to common commands.
+ * @var array shortcut => command
+ */
+$GLOBALS['_PEAR_Command_shortcuts'] = array();
+
+/**
+ * Array of command objects
+ * @var array class => object
+ */
+$GLOBALS['_PEAR_Command_objects'] = array();
+
+/**
+ * Which user interface class is being used.
+ * @var string class name
+ */
+$GLOBALS['_PEAR_Command_uiclass'] = 'PEAR_Frontend_CLI';
+
+/**
+ * Instance of $_PEAR_Command_uiclass.
+ * @var object
+ */
+$GLOBALS['_PEAR_Command_uiobject'] = null;
+
+/**
+ * PEAR command class, a simple factory class for administrative
+ * commands.
+ *
+ * How to implement command classes:
+ *
+ * - The class must be called PEAR_Command_Nnn, installed in the
+ *   "PEAR/Common" subdir, with a method called getCommands() that
+ *   returns an array of the commands implemented by the class (see
+ *   PEAR/Command/Install.php for an example).
+ *
+ * - The class must implement a run() function that is called with three
+ *   params:
+ *
+ *    (string) command name
+ *    (array)  assoc array with options, freely defined by each
+ *             command, for example:
+ *             array('force' => true)
+ *    (array)  list of the other parameters
+ *
+ *   The run() function returns a PEAR_CommandResponse object.  Use
+ *   these methods to get information:
+ *
+ *    int getStatus()   Returns PEAR_COMMAND_(SUCCESS|FAILURE|PARTIAL)
+ *                      *_PARTIAL means that you need to issue at least
+ *                      one more command to complete the operation
+ *                      (used for example for validation steps).
+ *
+ *    string getMessage()  Returns a message for the user.  Remember,
+ *                         no HTML or other interface-specific markup.
+ *
+ *   If something unexpected happens, run() returns a PEAR error.
+ *
+ * - DON'T OUTPUT ANYTHING! Return text for output instead.
+ *
+ * - DON'T USE HTML! The text you return will be used from both Gtk,
+ *   web and command-line interfaces, so for now, keep everything to
+ *   plain text.
+ *
+ * - DON'T USE EXIT OR DIE! Always use pear errors.  From static
+ *   classes do PEAR::raiseError(), from other classes do
+ *   $this->raiseError().
+ */
+class PEAR_Command
+{
+    // {{{ factory()
+
+    /**
+     * Get the right object for executing a command.
+     *
+     * @param string $command The name of the command
+     * @param object $config  Instance of PEAR_Config object
+     *
+     * @return object the command object or a PEAR error
+     *
+     * @access public
+     * @static
+     */
+    function factory($command, &$config)
+    {
+        if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
+            PEAR_Command::registerCommands();
+        }
+        if (isset($GLOBALS['_PEAR_Command_shortcuts'][$command])) {
+            $command = $GLOBALS['_PEAR_Command_shortcuts'][$command];
+        }
+        if (!isset($GLOBALS['_PEAR_Command_commandlist'][$command])) {
+            return PEAR::raiseError("unknown command `$command'");
+        }
+        $class = $GLOBALS['_PEAR_Command_commandlist'][$command];
+        if (!class_exists($class)) {
+            return PEAR::raiseError("unknown command `$command'");
+        }
+        $ui =& PEAR_Command::getFrontendObject();
+        $obj = &new $class($ui, $config);
+        return $obj;
+    }
+
+    // }}}
+    // {{{ & getFrontendObject()
+
+    /**
+     * Get instance of frontend object.
+     *
+     * @return object
+     * @static
+     */
+    function &getFrontendObject()
+    {
+        if (empty($GLOBALS['_PEAR_Command_uiobject'])) {
+            $GLOBALS['_PEAR_Command_uiobject'] = &new $GLOBALS['_PEAR_Command_uiclass'];
+        }
+        return $GLOBALS['_PEAR_Command_uiobject'];
+    }
+
+    // }}}
+    // {{{ & setFrontendClass()
+
+    /**
+     * Load current frontend class.
+     *
+     * @param string $uiclass Name of class implementing the frontend
+     *
+     * @return object the frontend object, or a PEAR error
+     * @static
+     */
+    function &setFrontendClass($uiclass)
+    {
+        if (is_object($GLOBALS['_PEAR_Command_uiobject']) &&
+              is_a($GLOBALS['_PEAR_Command_uiobject'], $uiclass)) {
+            return $GLOBALS['_PEAR_Command_uiobject'];
+        }
+        if (!class_exists($uiclass)) {
+            $file = str_replace('_', '/', $uiclass) . '.php';
+            if (PEAR_Command::isIncludeable($file)) {
+                include_once $file;
+            }
+        }
+        if (class_exists($uiclass)) {
+            $obj = &new $uiclass;
+            // quick test to see if this class implements a few of the most
+            // important frontend methods
+            if (method_exists($obj, 'userConfirm')) {
+                $GLOBALS['_PEAR_Command_uiobject'] = &$obj;
+                $GLOBALS['_PEAR_Command_uiclass'] = $uiclass;
+                return $obj;
+            } else {
+                $err = PEAR::raiseError("not a frontend class: $uiclass");
+                return $err;
+            }
+        }
+        $err = PEAR::raiseError("no such class: $uiclass");
+        return $err;
+    }
+
+    // }}}
+    // {{{ setFrontendType()
+
+    // }}}
+    // {{{ isIncludeable()
+
+    /**
+     * @param string $path relative or absolute include path
+     * @return boolean
+     * @static
+     */
+    function isIncludeable($path)
+    {
+        if (file_exists($path) && is_readable($path)) {
+            return true;
+        }
+        $ipath = explode(PATH_SEPARATOR, ini_get('include_path'));
+        foreach ($ipath as $include) {
+            $test = realpath($include . DIRECTORY_SEPARATOR . $path);
+            if (file_exists($test) && is_readable($test)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Set current frontend.
+     *
+     * @param string $uitype Name of the frontend type (for example "CLI")
+     *
+     * @return object the frontend object, or a PEAR error
+     * @static
+     */
+    function setFrontendType($uitype)
+    {
+        $uiclass = 'PEAR_Frontend_' . $uitype;
+        return PEAR_Command::setFrontendClass($uiclass);
+    }
+
+    // }}}
+    // {{{ registerCommands()
+
+    /**
+     * Scan through the Command directory looking for classes
+     * and see what commands they implement.
+     *
+     * @param bool   (optional) if FALSE (default), the new list of
+     *               commands should replace the current one.  If TRUE,
+     *               new entries will be merged with old.
+     *
+     * @param string (optional) where (what directory) to look for
+     *               classes, defaults to the Command subdirectory of
+     *               the directory from where this file (__FILE__) is
+     *               included.
+     *
+     * @return bool TRUE on success, a PEAR error on failure
+     *
+     * @access public
+     * @static
+     */
+    function registerCommands($merge = false, $dir = null)
+    {
+        if ($dir === null) {
+            $dir = dirname(__FILE__) . '/Command';
+        }
+        $dp = @opendir($dir);
+        if (empty($dp)) {
+            return PEAR::raiseError("registerCommands: opendir($dir) failed");
+        }
+        if (!$merge) {
+            $GLOBALS['_PEAR_Command_commandlist'] = array();
+        }
+        while ($entry = readdir($dp)) {
+            if ($entry{0} == '.' || substr($entry, -4) != '.php' || $entry == 'Common.php') {
+                continue;
+            }
+            $class = "PEAR_Command_".substr($entry, 0, -4);
+            $file = "$dir/$entry";
+            include_once $file;
+            // List of commands
+            if (empty($GLOBALS['_PEAR_Command_objects'][$class])) {
+                $GLOBALS['_PEAR_Command_objects'][$class] = &new $class($ui, $config);
+            }
+            $implements = $GLOBALS['_PEAR_Command_objects'][$class]->getCommands();
+            foreach ($implements as $command => $desc) {
+                $GLOBALS['_PEAR_Command_commandlist'][$command] = $class;
+                $GLOBALS['_PEAR_Command_commanddesc'][$command] = $desc;
+            }
+            $shortcuts = $GLOBALS['_PEAR_Command_objects'][$class]->getShortcuts();
+            foreach ($shortcuts as $shortcut => $command) {
+                $GLOBALS['_PEAR_Command_shortcuts'][$shortcut] = $command;
+            }
+        }
+        @closedir($dp);
+        return true;
+    }
+
+    // }}}
+    // {{{ getCommands()
+
+    /**
+     * Get the list of currently supported commands, and what
+     * classes implement them.
+     *
+     * @return array command => implementing class
+     *
+     * @access public
+     * @static
+     */
+    function getCommands()
+    {
+        if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
+            PEAR_Command::registerCommands();
+        }
+        return $GLOBALS['_PEAR_Command_commandlist'];
+    }
+
+    // }}}
+    // {{{ getShortcuts()
+
+    /**
+     * Get the list of command shortcuts.
+     *
+     * @return array shortcut => command
+     *
+     * @access public
+     * @static
+     */
+    function getShortcuts()
+    {
+        if (empty($GLOBALS['_PEAR_Command_shortcuts'])) {
+            PEAR_Command::registerCommands();
+        }
+        return $GLOBALS['_PEAR_Command_shortcuts'];
+    }
+
+    // }}}
+    // {{{ getGetoptArgs()
+
+    /**
+     * Compiles arguments for getopt.
+     *
+     * @param string $command     command to get optstring for
+     * @param string $short_args  (reference) short getopt format
+     * @param array  $long_args   (reference) long getopt format
+     *
+     * @return void
+     *
+     * @access public
+     * @static
+     */
+    function getGetoptArgs($command, &$short_args, &$long_args)
+    {
+        if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
+            PEAR_Command::registerCommands();
+        }
+        if (!isset($GLOBALS['_PEAR_Command_commandlist'][$command])) {
+            return null;
+        }
+        $class = $GLOBALS['_PEAR_Command_commandlist'][$command];
+        $obj = &$GLOBALS['_PEAR_Command_objects'][$class];
+        return $obj->getGetoptArgs($command, $short_args, $long_args);
+    }
+
+    // }}}
+    // {{{ getDescription()
+
+    /**
+     * Get description for a command.
+     *
+     * @param  string $command Name of the command
+     *
+     * @return string command description
+     *
+     * @access public
+     * @static
+     */
+    function getDescription($command)
+    {
+        if (!isset($GLOBALS['_PEAR_Command_commanddesc'][$command])) {
+            return null;
+        }
+        return $GLOBALS['_PEAR_Command_commanddesc'][$command];
+    }
+
+    // }}}
+    // {{{ getHelp()
+
+    /**
+     * Get help for command.
+     *
+     * @param string $command Name of the command to return help for
+     *
+     * @access public
+     * @static
+     */
+    function getHelp($command)
+    {
+        $cmds = PEAR_Command::getCommands();
+        if (isset($cmds[$command])) {
+            $class = $cmds[$command];
+            return $GLOBALS['_PEAR_Command_objects'][$class]->getHelp($command);
+        }
+        return false;
+    }
+    // }}}
+}
+
+?>
diff --git a/3rdparty/PEAR/Command/Auth.php b/3rdparty/PEAR/Command/Auth.php
new file mode 100644
index 00000000000..0b9d3d3965d
--- /dev/null
+++ b/3rdparty/PEAR/Command/Auth.php
@@ -0,0 +1,155 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Stig Bakken <ssb@php.net>                                    |
+// +----------------------------------------------------------------------+
+//
+// $Id: Auth.php,v 1.15 2004/01/08 17:33:13 sniper Exp $
+
+require_once "PEAR/Command/Common.php";
+require_once "PEAR/Remote.php";
+require_once "PEAR/Config.php";
+
+/**
+ * PEAR commands for managing configuration data.
+ *
+ */
+class PEAR_Command_Auth extends PEAR_Command_Common
+{
+    // {{{ properties
+
+    var $commands = array(
+        'login' => array(
+            'summary' => 'Connects and authenticates to remote server',
+            'shortcut' => 'li',
+            'function' => 'doLogin',
+            'options' => array(),
+            'doc' => '
+Log in to the remote server.  To use remote functions in the installer
+that require any kind of privileges, you need to log in first.  The
+username and password you enter here will be stored in your per-user
+PEAR configuration (~/.pearrc on Unix-like systems).  After logging
+in, your username and password will be sent along in subsequent
+operations on the remote server.',
+            ),
+        'logout' => array(
+            'summary' => 'Logs out from the remote server',
+            'shortcut' => 'lo',
+            'function' => 'doLogout',
+            'options' => array(),
+            'doc' => '
+Logs out from the remote server.  This command does not actually
+connect to the remote server, it only deletes the stored username and
+password from your user configuration.',
+            )
+
+        );
+
+    // }}}
+
+    // {{{ constructor
+
+    /**
+     * PEAR_Command_Auth constructor.
+     *
+     * @access public
+     */
+    function PEAR_Command_Auth(&$ui, &$config)
+    {
+        parent::PEAR_Command_Common($ui, $config);
+    }
+
+    // }}}
+
+    // {{{ doLogin()
+
+    /**
+     * Execute the 'login' command.
+     *
+     * @param string $command command name
+     *
+     * @param array $options option_name => value
+     *
+     * @param array $params list of additional parameters
+     *
+     * @return bool TRUE on success, FALSE for unknown commands, or
+     * a PEAR error on failure
+     *
+     * @access public
+     */
+    function doLogin($command, $options, $params)
+    {
+        $server = $this->config->get('master_server');
+        $remote = new PEAR_Remote($this->config);
+        $username = $this->config->get('username');
+        if (empty($username)) {
+            $username = @$_ENV['USER'];
+        }
+        $this->ui->outputData("Logging in to $server.", $command);
+        
+        list($username, $password) = $this->ui->userDialog(
+            $command,
+            array('Username', 'Password'),
+            array('text',     'password'),
+            array($username,  '')
+            );
+        $username = trim($username);
+        $password = trim($password);
+        
+        $this->config->set('username', $username);
+        $this->config->set('password', $password);
+        
+        $remote->expectError(401);
+        $ok = $remote->call('logintest');
+        $remote->popExpect();
+        if ($ok === true) {
+            $this->ui->outputData("Logged in.", $command);
+            $this->config->store();
+        } else {
+            return $this->raiseError("Login failed!");
+        }
+
+    }
+
+    // }}}
+    // {{{ doLogout()
+
+    /**
+     * Execute the 'logout' command.
+     *
+     * @param string $command command name
+     *
+     * @param array $options option_name => value
+     *
+     * @param array $params list of additional parameters
+     *
+     * @return bool TRUE on success, FALSE for unknown commands, or
+     * a PEAR error on failure
+     *
+     * @access public
+     */
+    function doLogout($command, $options, $params)
+    {
+        $server = $this->config->get('master_server');
+        $this->ui->outputData("Logging out from $server.", $command);
+        $this->config->remove('username');
+        $this->config->remove('password');
+        $this->config->store();
+    }
+
+    // }}}
+}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/PEAR/Command/Build.php b/3rdparty/PEAR/Command/Build.php
new file mode 100644
index 00000000000..2ecbbc92f5f
--- /dev/null
+++ b/3rdparty/PEAR/Command/Build.php
@@ -0,0 +1,89 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Stig Bakken <ssb@php.net>                                    |
+// |         Tomas V.V.Cox <cox@idecnet.com>                              |
+// |                                                                      |
+// +----------------------------------------------------------------------+
+//
+// $Id: Build.php,v 1.9 2004/01/08 17:33:13 sniper Exp $
+
+require_once "PEAR/Command/Common.php";
+require_once "PEAR/Builder.php";
+
+/**
+ * PEAR commands for building extensions.
+ *
+ */
+class PEAR_Command_Build extends PEAR_Command_Common
+{
+    // {{{ properties
+
+    var $commands = array(
+        'build' => array(
+            'summary' => 'Build an Extension From C Source',
+            'function' => 'doBuild',
+            'shortcut' => 'b',
+            'options' => array(),
+            'doc' => '[package.xml]
+Builds one or more extensions contained in a package.'
+            ),
+        );
+
+    // }}}
+
+    // {{{ constructor
+
+    /**
+     * PEAR_Command_Build constructor.
+     *
+     * @access public
+     */
+    function PEAR_Command_Build(&$ui, &$config)
+    {
+        parent::PEAR_Command_Common($ui, $config);
+    }
+
+    // }}}
+
+    // {{{ doBuild()
+
+    function doBuild($command, $options, $params)
+    {
+        if (sizeof($params) < 1) {
+            $params[0] = 'package.xml';
+        }
+        $builder = &new PEAR_Builder($this->ui);
+        $this->debug = $this->config->get('verbose');
+        $err = $builder->build($params[0], array(&$this, 'buildCallback'));
+        if (PEAR::isError($err)) {
+            return $err;
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ buildCallback()
+
+    function buildCallback($what, $data)
+    {
+        if (($what == 'cmdoutput' && $this->debug > 1) ||
+            ($what == 'output' && $this->debug > 0)) {
+            $this->ui->outputData(rtrim($data), 'build');
+        }
+    }
+
+    // }}}
+}
diff --git a/3rdparty/PEAR/Command/Common.php b/3rdparty/PEAR/Command/Common.php
new file mode 100644
index 00000000000..c6ace694caf
--- /dev/null
+++ b/3rdparty/PEAR/Command/Common.php
@@ -0,0 +1,249 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Stig Sæther Bakken <ssb@php.net>                             |
+// +----------------------------------------------------------------------+
+//
+// $Id: Common.php,v 1.24 2004/01/08 17:33:13 sniper Exp $
+
+require_once "PEAR.php";
+
+class PEAR_Command_Common extends PEAR
+{
+    // {{{ properties
+
+    /**
+     * PEAR_Config object used to pass user system and configuration
+     * on when executing commands
+     *
+     * @var object
+     */
+    var $config;
+
+    /**
+     * User Interface object, for all interaction with the user.
+     * @var object
+     */
+    var $ui;
+
+    var $_deps_rel_trans = array(
+                                 'lt' => '<',
+                                 'le' => '<=',
+                                 'eq' => '=',
+                                 'ne' => '!=',
+                                 'gt' => '>',
+                                 'ge' => '>=',
+                                 'has' => '=='
+                                 );
+
+    var $_deps_type_trans = array(
+                                  'pkg' => 'package',
+                                  'extension' => 'extension',
+                                  'php' => 'PHP',
+                                  'prog' => 'external program',
+                                  'ldlib' => 'external library for linking',
+                                  'rtlib' => 'external runtime library',
+                                  'os' => 'operating system',
+                                  'websrv' => 'web server',
+                                  'sapi' => 'SAPI backend'
+                                  );
+
+    // }}}
+    // {{{ constructor
+
+    /**
+     * PEAR_Command_Common constructor.
+     *
+     * @access public
+     */
+    function PEAR_Command_Common(&$ui, &$config)
+    {
+        parent::PEAR();
+        $this->config = &$config;
+        $this->ui = &$ui;
+    }
+
+    // }}}
+
+    // {{{ getCommands()
+
+    /**
+     * Return a list of all the commands defined by this class.
+     * @return array list of commands
+     * @access public
+     */
+    function getCommands()
+    {
+        $ret = array();
+        foreach (array_keys($this->commands) as $command) {
+            $ret[$command] = $this->commands[$command]['summary'];
+        }
+        return $ret;
+    }
+
+    // }}}
+    // {{{ getShortcuts()
+
+    /**
+     * Return a list of all the command shortcuts defined by this class.
+     * @return array shortcut => command
+     * @access public
+     */
+    function getShortcuts()
+    {
+        $ret = array();
+        foreach (array_keys($this->commands) as $command) {
+            if (isset($this->commands[$command]['shortcut'])) {
+                $ret[$this->commands[$command]['shortcut']] = $command;
+            }
+        }
+        return $ret;
+    }
+
+    // }}}
+    // {{{ getOptions()
+
+    function getOptions($command)
+    {
+        return @$this->commands[$command]['options'];
+    }
+
+    // }}}
+    // {{{ getGetoptArgs()
+
+    function getGetoptArgs($command, &$short_args, &$long_args)
+    {
+        $short_args = "";
+        $long_args = array();
+        if (empty($this->commands[$command])) {
+            return;
+        }
+        reset($this->commands[$command]);
+        while (list($option, $info) = each($this->commands[$command]['options'])) {
+            $larg = $sarg = '';
+            if (isset($info['arg'])) {
+                if ($info['arg']{0} == '(') {
+                    $larg = '==';
+                    $sarg = '::';
+                    $arg = substr($info['arg'], 1, -1);
+                } else {
+                    $larg = '=';
+                    $sarg = ':';
+                    $arg = $info['arg'];
+                }
+            }
+            if (isset($info['shortopt'])) {
+                $short_args .= $info['shortopt'] . $sarg;
+            }
+            $long_args[] = $option . $larg;
+        }
+    }
+
+    // }}}
+    // {{{ getHelp()
+    /**
+    * Returns the help message for the given command
+    *
+    * @param string $command The command
+    * @return mixed A fail string if the command does not have help or
+    *               a two elements array containing [0]=>help string,
+    *               [1]=> help string for the accepted cmd args
+    */
+    function getHelp($command)
+    {
+        $config = &PEAR_Config::singleton();
+        $help = @$this->commands[$command]['doc'];
+        if (empty($help)) {
+            // XXX (cox) Fallback to summary if there is no doc (show both?)
+            if (!$help = @$this->commands[$command]['summary']) {
+                return "No help for command \"$command\"";
+            }
+        }
+        if (preg_match_all('/{config\s+([^\}]+)}/e', $help, $matches)) {
+            foreach($matches[0] as $k => $v) {
+                $help = preg_replace("/$v/", $config->get($matches[1][$k]), $help);
+            }
+        }
+        return array($help, $this->getHelpArgs($command));
+    }
+
+    // }}}
+    // {{{ getHelpArgs()
+    /**
+    * Returns the help for the accepted arguments of a command
+    *
+    * @param  string $command
+    * @return string The help string
+    */
+    function getHelpArgs($command)
+    {
+        if (isset($this->commands[$command]['options']) &&
+            count($this->commands[$command]['options']))
+        {
+            $help = "Options:\n";
+            foreach ($this->commands[$command]['options'] as $k => $v) {
+                if (isset($v['arg'])) {
+                    if ($v['arg']{0} == '(') {
+                        $arg = substr($v['arg'], 1, -1);
+                        $sapp = " [$arg]";
+                        $lapp = "[=$arg]";
+                    } else {
+                        $sapp = " $v[arg]";
+                        $lapp = "=$v[arg]";
+                    }
+                } else {
+                    $sapp = $lapp = "";
+                }
+                if (isset($v['shortopt'])) {
+                    $s = $v['shortopt'];
+                    @$help .= "  -$s$sapp, --$k$lapp\n";
+                } else {
+                    @$help .= "  --$k$lapp\n";
+                }
+                $p = "        ";
+                $doc = rtrim(str_replace("\n", "\n$p", $v['doc']));
+                $help .= "        $doc\n";
+            }
+            return $help;
+        }
+        return null;
+    }
+
+    // }}}
+    // {{{ run()
+
+    function run($command, $options, $params)
+    {
+        $func = @$this->commands[$command]['function'];
+        if (empty($func)) {
+            // look for shortcuts
+            foreach (array_keys($this->commands) as $cmd) {
+                if (@$this->commands[$cmd]['shortcut'] == $command) {
+                    $command = $cmd;
+                    $func = @$this->commands[$command]['function'];
+                    if (empty($func)) {
+                        return $this->raiseError("unknown command `$command'");
+                    }
+                    break;
+                }
+            }
+        }
+        return $this->$func($command, $options, $params);
+    }
+
+    // }}}
+}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/PEAR/Command/Config.php b/3rdparty/PEAR/Command/Config.php
new file mode 100644
index 00000000000..474a2345170
--- /dev/null
+++ b/3rdparty/PEAR/Command/Config.php
@@ -0,0 +1,225 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Stig Bakken <ssb@php.net>                                    |
+// |         Tomas V.V.Cox <cox@idecnet.com>                              |
+// |                                                                      |
+// +----------------------------------------------------------------------+
+//
+// $Id: Config.php,v 1.27 2004/06/15 16:48:49 pajoye Exp $
+
+require_once "PEAR/Command/Common.php";
+require_once "PEAR/Config.php";
+
+/**
+ * PEAR commands for managing configuration data.
+ *
+ */
+class PEAR_Command_Config extends PEAR_Command_Common
+{
+    // {{{ properties
+
+    var $commands = array(
+        'config-show' => array(
+            'summary' => 'Show All Settings',
+            'function' => 'doConfigShow',
+            'shortcut' => 'csh',
+            'options' => array(),
+            'doc' => '
+Displays all configuration values.  An optional argument
+may be used to tell which configuration layer to display.  Valid
+configuration layers are "user", "system" and "default".
+',
+            ),
+        'config-get' => array(
+            'summary' => 'Show One Setting',
+            'function' => 'doConfigGet',
+            'shortcut' => 'cg',
+            'options' => array(),
+            'doc' => '<parameter> [layer]
+Displays the value of one configuration parameter.  The
+first argument is the name of the parameter, an optional second argument
+may be used to tell which configuration layer to look in.  Valid configuration
+layers are "user", "system" and "default".  If no layer is specified, a value
+will be picked from the first layer that defines the parameter, in the order
+just specified.
+',
+            ),
+        'config-set' => array(
+            'summary' => 'Change Setting',
+            'function' => 'doConfigSet',
+            'shortcut' => 'cs',
+            'options' => array(),
+            'doc' => '<parameter> <value> [layer]
+Sets the value of one configuration parameter.  The first argument is
+the name of the parameter, the second argument is the new value.  Some
+parameters are subject to validation, and the command will fail with
+an error message if the new value does not make sense.  An optional
+third argument may be used to specify in which layer to set the
+configuration parameter.  The default layer is "user".
+',
+            ),
+        'config-help' => array(
+            'summary' => 'Show Information About Setting',
+            'function' => 'doConfigHelp',
+            'shortcut' => 'ch',
+            'options' => array(),
+            'doc' => '[parameter]
+Displays help for a configuration parameter.  Without arguments it
+displays help for all configuration parameters.
+',
+           ),
+        );
+
+    // }}}
+    // {{{ constructor
+
+    /**
+     * PEAR_Command_Config constructor.
+     *
+     * @access public
+     */
+    function PEAR_Command_Config(&$ui, &$config)
+    {
+        parent::PEAR_Command_Common($ui, $config);
+    }
+
+    // }}}
+
+    // {{{ doConfigShow()
+
+    function doConfigShow($command, $options, $params)
+    {
+        // $params[0] -> the layer
+        if ($error = $this->_checkLayer(@$params[0])) {
+            return $this->raiseError($error);
+        }
+        $keys = $this->config->getKeys();
+        sort($keys);
+        $data = array('caption' => 'Configuration:');
+        foreach ($keys as $key) {
+            $type = $this->config->getType($key);
+            $value = $this->config->get($key, @$params[0]);
+            if ($type == 'password' && $value) {
+                $value = '********';
+            }
+            if ($value === false) {
+                $value = 'false';
+            } elseif ($value === true) {
+                $value = 'true';
+            }
+            $data['data'][$this->config->getGroup($key)][] = array($this->config->getPrompt($key) , $key, $value);
+        }
+        $this->ui->outputData($data, $command);
+        return true;
+    }
+
+    // }}}
+    // {{{ doConfigGet()
+
+    function doConfigGet($command, $options, $params)
+    {
+        // $params[0] -> the parameter
+        // $params[1] -> the layer
+        if ($error = $this->_checkLayer(@$params[1])) {
+            return $this->raiseError($error);
+        }
+        if (sizeof($params) < 1 || sizeof($params) > 2) {
+            return $this->raiseError("config-get expects 1 or 2 parameters");
+        } elseif (sizeof($params) == 1) {
+            $this->ui->outputData($this->config->get($params[0]), $command);
+        } else {
+            $data = $this->config->get($params[0], $params[1]);
+            $this->ui->outputData($data, $command);
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ doConfigSet()
+
+    function doConfigSet($command, $options, $params)
+    {
+        // $param[0] -> a parameter to set
+        // $param[1] -> the value for the parameter
+        // $param[2] -> the layer
+        $failmsg = '';
+        if (sizeof($params) < 2 || sizeof($params) > 3) {
+            $failmsg .= "config-set expects 2 or 3 parameters";
+            return PEAR::raiseError($failmsg);
+        }
+        if ($error = $this->_checkLayer(@$params[2])) {
+            $failmsg .= $error;
+            return PEAR::raiseError($failmsg);
+        }
+        if (!call_user_func_array(array(&$this->config, 'set'), $params))
+        {
+            $failmsg = "config-set (" . implode(", ", $params) . ") failed";
+        } else {
+            $this->config->store();
+        }
+        if ($failmsg) {
+            return $this->raiseError($failmsg);
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ doConfigHelp()
+
+    function doConfigHelp($command, $options, $params)
+    {
+        if (empty($params)) {
+            $params = $this->config->getKeys();
+        }
+        $data['caption']  = "Config help" . ((count($params) == 1) ? " for $params[0]" : '');
+        $data['headline'] = array('Name', 'Type', 'Description');
+        $data['border']   = true;
+        foreach ($params as $name) {
+            $type = $this->config->getType($name);
+            $docs = $this->config->getDocs($name);
+            if ($type == 'set') {
+                $docs = rtrim($docs) . "\nValid set: " .
+                    implode(' ', $this->config->getSetValues($name));
+            }
+            $data['data'][] = array($name, $type, $docs);
+        }
+        $this->ui->outputData($data, $command);
+    }
+
+    // }}}
+    // {{{ _checkLayer()
+
+    /**
+     * Checks if a layer is defined or not
+     *
+     * @param string $layer The layer to search for
+     * @return mixed False on no error or the error message
+     */
+    function _checkLayer($layer = null)
+    {
+        if (!empty($layer) && $layer != 'default') {
+            $layers = $this->config->getLayers();
+            if (!in_array($layer, $layers)) {
+                return " only the layers: \"" . implode('" or "', $layers) . "\" are supported";
+            }
+        }
+        return false;
+    }
+
+    // }}}
+}
+
+?>
diff --git a/3rdparty/PEAR/Command/Install.php b/3rdparty/PEAR/Command/Install.php
new file mode 100644
index 00000000000..dce52f017e2
--- /dev/null
+++ b/3rdparty/PEAR/Command/Install.php
@@ -0,0 +1,470 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Stig Sæther Bakken <ssb@php.net>                             |
+// +----------------------------------------------------------------------+
+//
+// $Id: Install.php,v 1.53.2.1 2004/10/19 04:08:42 cellog Exp $
+
+require_once "PEAR/Command/Common.php";
+require_once "PEAR/Installer.php";
+
+/**
+ * PEAR commands for installation or deinstallation/upgrading of
+ * packages.
+ *
+ */
+class PEAR_Command_Install extends PEAR_Command_Common
+{
+    // {{{ properties
+
+    var $commands = array(
+        'install' => array(
+            'summary' => 'Install Package',
+            'function' => 'doInstall',
+            'shortcut' => 'i',
+            'options' => array(
+                'force' => array(
+                    'shortopt' => 'f',
+                    'doc' => 'will overwrite newer installed packages',
+                    ),
+                'nodeps' => array(
+                    'shortopt' => 'n',
+                    'doc' => 'ignore dependencies, install anyway',
+                    ),
+                'register-only' => array(
+                    'shortopt' => 'r',
+                    'doc' => 'do not install files, only register the package as installed',
+                    ),
+                'soft' => array(
+                    'shortopt' => 's',
+                    'doc' => 'soft install, fail silently, or upgrade if already installed',
+                    ),
+                'nobuild' => array(
+                    'shortopt' => 'B',
+                    'doc' => 'don\'t build C extensions',
+                    ),
+                'nocompress' => array(
+                    'shortopt' => 'Z',
+                    'doc' => 'request uncompressed files when downloading',
+                    ),
+                'installroot' => array(
+                    'shortopt' => 'R',
+                    'arg' => 'DIR',
+                    'doc' => 'root directory used when installing files (ala PHP\'s INSTALL_ROOT)',
+                    ),
+                'ignore-errors' => array(
+                    'doc' => 'force install even if there were errors',
+                    ),
+                'alldeps' => array(
+                    'shortopt' => 'a',
+                    'doc' => 'install all required and optional dependencies',
+                    ),
+                'onlyreqdeps' => array(
+                    'shortopt' => 'o',
+                    'doc' => 'install all required dependencies',
+                    ),
+                ),
+            'doc' => '<package> ...
+Installs one or more PEAR packages.  You can specify a package to
+install in four ways:
+
+"Package-1.0.tgz" : installs from a local file
+
+"http://example.com/Package-1.0.tgz" : installs from
+anywhere on the net.
+
+"package.xml" : installs the package described in
+package.xml.  Useful for testing, or for wrapping a PEAR package in
+another package manager such as RPM.
+
+"Package" : queries your configured server
+({config master_server}) and downloads the newest package with
+the preferred quality/state ({config preferred_state}).
+
+More than one package may be specified at once.  It is ok to mix these
+four ways of specifying packages.
+'),
+        'upgrade' => array(
+            'summary' => 'Upgrade Package',
+            'function' => 'doInstall',
+            'shortcut' => 'up',
+            'options' => array(
+                'force' => array(
+                    'shortopt' => 'f',
+                    'doc' => 'overwrite newer installed packages',
+                    ),
+                'nodeps' => array(
+                    'shortopt' => 'n',
+                    'doc' => 'ignore dependencies, upgrade anyway',
+                    ),
+                'register-only' => array(
+                    'shortopt' => 'r',
+                    'doc' => 'do not install files, only register the package as upgraded',
+                    ),
+                'nobuild' => array(
+                    'shortopt' => 'B',
+                    'doc' => 'don\'t build C extensions',
+                    ),
+                'nocompress' => array(
+                    'shortopt' => 'Z',
+                    'doc' => 'request uncompressed files when downloading',
+                    ),
+                'installroot' => array(
+                    'shortopt' => 'R',
+                    'arg' => 'DIR',
+                    'doc' => 'root directory used when installing files (ala PHP\'s INSTALL_ROOT)',
+                    ),
+                'ignore-errors' => array(
+                    'doc' => 'force install even if there were errors',
+                    ),
+                'alldeps' => array(
+                    'shortopt' => 'a',
+                    'doc' => 'install all required and optional dependencies',
+                    ),
+                'onlyreqdeps' => array(
+                    'shortopt' => 'o',
+                    'doc' => 'install all required dependencies',
+                    ),
+                ),
+            'doc' => '<package> ...
+Upgrades one or more PEAR packages.  See documentation for the
+"install" command for ways to specify a package.
+
+When upgrading, your package will be updated if the provided new
+package has a higher version number (use the -f option if you need to
+upgrade anyway).
+
+More than one package may be specified at once.
+'),
+        'upgrade-all' => array(
+            'summary' => 'Upgrade All Packages',
+            'function' => 'doInstall',
+            'shortcut' => 'ua',
+            'options' => array(
+                'nodeps' => array(
+                    'shortopt' => 'n',
+                    'doc' => 'ignore dependencies, upgrade anyway',
+                    ),
+                'register-only' => array(
+                    'shortopt' => 'r',
+                    'doc' => 'do not install files, only register the package as upgraded',
+                    ),
+                'nobuild' => array(
+                    'shortopt' => 'B',
+                    'doc' => 'don\'t build C extensions',
+                    ),
+                'nocompress' => array(
+                    'shortopt' => 'Z',
+                    'doc' => 'request uncompressed files when downloading',
+                    ),
+                'installroot' => array(
+                    'shortopt' => 'R',
+                    'arg' => 'DIR',
+                    'doc' => 'root directory used when installing files (ala PHP\'s INSTALL_ROOT)',
+                    ),
+                'ignore-errors' => array(
+                    'doc' => 'force install even if there were errors',
+                    ),
+                ),
+            'doc' => '
+Upgrades all packages that have a newer release available.  Upgrades are
+done only if there is a release available of the state specified in
+"preferred_state" (currently {config preferred_state}), or a state considered
+more stable.
+'),
+        'uninstall' => array(
+            'summary' => 'Un-install Package',
+            'function' => 'doUninstall',
+            'shortcut' => 'un',
+            'options' => array(
+                'nodeps' => array(
+                    'shortopt' => 'n',
+                    'doc' => 'ignore dependencies, uninstall anyway',
+                    ),
+                'register-only' => array(
+                    'shortopt' => 'r',
+                    'doc' => 'do not remove files, only register the packages as not installed',
+                    ),
+                'installroot' => array(
+                    'shortopt' => 'R',
+                    'arg' => 'DIR',
+                    'doc' => 'root directory used when installing files (ala PHP\'s INSTALL_ROOT)',
+                    ),
+                'ignore-errors' => array(
+                    'doc' => 'force install even if there were errors',
+                    ),
+                ),
+            'doc' => '<package> ...
+Uninstalls one or more PEAR packages.  More than one package may be
+specified at once.
+'),
+        'bundle' => array(
+            'summary' => 'Unpacks a Pecl Package',
+            'function' => 'doBundle',
+            'shortcut' => 'bun',
+            'options' => array(
+                'destination' => array(
+                   'shortopt' => 'd',
+                    'arg' => 'DIR',
+                    'doc' => 'Optional destination directory for unpacking (defaults to current path or "ext" if exists)',
+                    ),
+                'force' => array(
+                    'shortopt' => 'f',
+                    'doc' => 'Force the unpacking even if there were errors in the package',
+                ),
+            ),
+            'doc' => '<package>
+Unpacks a Pecl Package into the selected location. It will download the
+package if needed.
+'),
+    );
+
+    // }}}
+    // {{{ constructor
+
+    /**
+     * PEAR_Command_Install constructor.
+     *
+     * @access public
+     */
+    function PEAR_Command_Install(&$ui, &$config)
+    {
+        parent::PEAR_Command_Common($ui, $config);
+    }
+
+    // }}}
+
+    // {{{ doInstall()
+
+    function doInstall($command, $options, $params)
+    {
+        require_once 'PEAR/Downloader.php';
+        if (empty($this->installer)) {
+            $this->installer = &new PEAR_Installer($this->ui);
+        }
+        if ($command == 'upgrade') {
+            $options['upgrade'] = true;
+        }
+        if ($command == 'upgrade-all') {
+            include_once "PEAR/Remote.php";
+            $options['upgrade'] = true;
+            $remote = &new PEAR_Remote($this->config);
+            $state = $this->config->get('preferred_state');
+            if (empty($state) || $state == 'any') {
+                $latest = $remote->call("package.listLatestReleases");
+            } else {
+                $latest = $remote->call("package.listLatestReleases", $state);
+            }
+            if (PEAR::isError($latest)) {
+                return $latest;
+            }
+            $reg = new PEAR_Registry($this->config->get('php_dir'));
+            $installed = array_flip($reg->listPackages());
+            $params = array();
+            foreach ($latest as $package => $info) {
+                $package = strtolower($package);
+                if (!isset($installed[$package])) {
+                    // skip packages we don't have installed
+                    continue;
+                }
+                $inst_version = $reg->packageInfo($package, 'version');
+                if (version_compare("$info[version]", "$inst_version", "le")) {
+                    // installed version is up-to-date
+                    continue;
+                }
+                $params[] = $package;
+                $this->ui->outputData(array('data' => "Will upgrade $package"), $command);
+            }
+        }
+        $this->downloader = &new PEAR_Downloader($this->ui, $options, $this->config);
+        $errors = array();
+        $downloaded = array();
+        $this->downloader->download($params);
+        $errors = $this->downloader->getErrorMsgs();
+        if (count($errors)) {
+            $err['data'] = array($errors);
+            $err['headline'] = 'Install Errors';
+            $this->ui->outputData($err);
+            return $this->raiseError("$command failed");
+        }
+        $downloaded = $this->downloader->getDownloadedPackages();
+        $this->installer->sortPkgDeps($downloaded);
+        foreach ($downloaded as $pkg) {
+            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
+            $info = $this->installer->install($pkg['file'], $options, $this->config);
+            PEAR::popErrorHandling();
+            if (PEAR::isError($info)) {
+                $this->ui->outputData('ERROR: ' .$info->getMessage());
+                continue;
+            }
+            if (is_array($info)) {
+                if ($this->config->get('verbose') > 0) {
+                    $label = "$info[package] $info[version]";
+                    $out = array('data' => "$command ok: $label");
+                    if (isset($info['release_warnings'])) {
+                        $out['release_warnings'] = $info['release_warnings'];
+                    }
+                    $this->ui->outputData($out, $command);
+                }
+            } else {
+                return $this->raiseError("$command failed");
+            }
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ doUninstall()
+
+    function doUninstall($command, $options, $params)
+    {
+        if (empty($this->installer)) {
+            $this->installer = &new PEAR_Installer($this->ui);
+        }
+        if (sizeof($params) < 1) {
+            return $this->raiseError("Please supply the package(s) you want to uninstall");
+        }
+        include_once 'PEAR/Registry.php';
+        $reg = new PEAR_Registry($this->config->get('php_dir'));
+        $newparams = array();
+        $badparams = array();
+        foreach ($params as $pkg) {
+            $info = $reg->packageInfo($pkg);
+            if ($info === null) {
+                $badparams[] = $pkg;
+            } else {
+                $newparams[] = $info;
+            }
+        }
+        $this->installer->sortPkgDeps($newparams, true);
+        $params = array();
+        foreach($newparams as $info) {
+            $params[] = $info['info']['package'];
+        }
+        $params = array_merge($params, $badparams);
+        foreach ($params as $pkg) {
+            if ($this->installer->uninstall($pkg, $options)) {
+                if ($this->config->get('verbose') > 0) {
+                    $this->ui->outputData("uninstall ok: $pkg", $command);
+                }
+            } else {
+                return $this->raiseError("uninstall failed: $pkg");
+            }
+        }
+        return true;
+    }
+
+    // }}}
+
+
+    // }}}
+    // {{{ doBundle()
+    /*
+    (cox) It just downloads and untars the package, does not do
+            any check that the PEAR_Installer::_installFile() does.
+    */
+
+    function doBundle($command, $options, $params)
+    {
+        if (empty($this->installer)) {
+            $this->installer = &new PEAR_Downloader($this->ui);
+        }
+        $installer = &$this->installer;
+        if (sizeof($params) < 1) {
+            return $this->raiseError("Please supply the package you want to bundle");
+        }
+        $pkgfile = $params[0];
+        $need_download = false;
+        if (preg_match('#^(http|ftp)://#', $pkgfile)) {
+            $need_download = true;
+        } elseif (!@is_file($pkgfile)) {
+            if ($installer->validPackageName($pkgfile)) {
+                $pkgfile = $installer->getPackageDownloadUrl($pkgfile);
+                $need_download = true;
+            } else {
+                if (strlen($pkgfile)) {
+                    return $this->raiseError("Could not open the package file: $pkgfile");
+                } else {
+                    return $this->raiseError("No package file given");
+                }
+            }
+        }
+
+        // Download package -----------------------------------------------
+        if ($need_download) {
+            $downloaddir = $installer->config->get('download_dir');
+            if (empty($downloaddir)) {
+                if (PEAR::isError($downloaddir = System::mktemp('-d'))) {
+                    return $downloaddir;
+                }
+                $installer->log(2, '+ tmp dir created at ' . $downloaddir);
+            }
+            $callback = $this->ui ? array(&$installer, '_downloadCallback') : null;
+            $file = $installer->downloadHttp($pkgfile, $this->ui, $downloaddir, $callback);
+            if (PEAR::isError($file)) {
+                return $this->raiseError($file);
+            }
+            $pkgfile = $file;
+        }
+
+       // Parse xml file -----------------------------------------------
+        $pkginfo = $installer->infoFromTgzFile($pkgfile);
+        if (PEAR::isError($pkginfo)) {
+            return $this->raiseError($pkginfo);
+        }
+        $installer->validatePackageInfo($pkginfo, $errors, $warnings);
+        // XXX We allow warnings, do we have to do it?
+        if (count($errors)) {
+             if (empty($options['force'])) {
+                return $this->raiseError("The following errors where found:\n".
+                                                 implode("\n", $errors));
+            } else {
+                $this->log(0, "warning : the following errors were found:\n".
+                           implode("\n", $errors));
+            }
+        }
+        $pkgname = $pkginfo['package'];
+
+        // Unpacking -------------------------------------------------
+
+        if (isset($options['destination'])) {
+            if (!is_dir($options['destination'])) {
+                System::mkdir('-p ' . $options['destination']);
+            }
+            $dest = realpath($options['destination']);
+        } else {
+            $pwd = getcwd();
+            if (is_dir($pwd . DIRECTORY_SEPARATOR . 'ext')) {
+                $dest = $pwd . DIRECTORY_SEPARATOR . 'ext';
+            } else {
+                $dest = $pwd;
+            }
+        }
+        $dest .= DIRECTORY_SEPARATOR . $pkgname;
+        $orig = $pkgname . '-' . $pkginfo['version'];
+
+        $tar = new Archive_Tar($pkgfile);
+        if (!@$tar->extractModify($dest, $orig)) {
+            return $this->raiseError("unable to unpack $pkgfile");
+        }
+        $this->ui->outputData("Package ready at '$dest'");
+    // }}}
+    }
+
+    // }}}
+
+}
+?>
diff --git a/3rdparty/PEAR/Command/Mirror.php b/3rdparty/PEAR/Command/Mirror.php
new file mode 100644
index 00000000000..bf56c3db640
--- /dev/null
+++ b/3rdparty/PEAR/Command/Mirror.php
@@ -0,0 +1,101 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Alexander Merz <alexmerz@php.net>                            |
+// |                                                                      |
+// +----------------------------------------------------------------------+
+//
+// $Id: Mirror.php,v 1.5 2004/03/18 12:23:57 mj Exp $
+
+require_once "PEAR/Command/Common.php";
+require_once "PEAR/Command.php";
+require_once "PEAR/Remote.php";
+require_once "PEAR.php";
+
+/**
+ * PEAR commands for providing file mirrors
+ *
+ */
+class PEAR_Command_Mirror extends PEAR_Command_Common
+{
+    // {{{ properties
+
+    var $commands = array(
+        'download-all' => array(
+            'summary' => 'Downloads each available package from master_server',
+            'function' => 'doDownloadAll',
+            'shortcut' => 'da',
+            'options' => array(),
+            'doc' => '
+	    Requests a list of available packages from the package server
+	    (master_server) and downloads them to current working directory'
+            ),
+        );
+
+    // }}}
+
+    // {{{ constructor
+
+    /**
+     * PEAR_Command_Mirror constructor.
+     *
+     * @access public
+     * @param object PEAR_Frontend a reference to an frontend
+     * @param object PEAR_Config a reference to the configuration data
+     */
+    function PEAR_Command_Mirror(&$ui, &$config)
+    {
+        parent::PEAR_Command_Common($ui, $config);
+    }
+
+    // }}}
+
+    // {{{ doDownloadAll()
+    /**
+    * retrieves a list of avaible Packages from master server
+    * and downloads them
+    *
+    * @access public
+    * @param string $command the command
+    * @param array $options the command options before the command
+    * @param array $params the stuff after the command name
+    * @return bool true if succesful
+    * @throw PEAR_Error 
+    */
+    function doDownloadAll($command, $options, $params)
+    {
+        $this->config->set("php_dir", "."); 
+        $remote = &new PEAR_Remote($this->config);
+        $remoteInfo = $remote->call("package.listAll");
+        if (PEAR::isError($remoteInfo)) {
+            return $remoteInfo;
+        }
+        $cmd = &PEAR_Command::factory("download", $this->config);
+        if (PEAR::isError($cmd)) {
+            return $cmd;
+        }
+        foreach ($remoteInfo as $pkgn => $pkg) {
+            /**
+             * Error handling not neccesary, because already done by 
+             * the download command
+             */
+            $cmd->run("download", array(), array($pkgn));
+        }
+
+        return true;
+    }
+
+    // }}}
+}
diff --git a/3rdparty/PEAR/Command/Package.php b/3rdparty/PEAR/Command/Package.php
new file mode 100644
index 00000000000..aca87111118
--- /dev/null
+++ b/3rdparty/PEAR/Command/Package.php
@@ -0,0 +1,819 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Stig Bakken <ssb@php.net>                                   |
+// |          Martin Jansen <mj@php.net>                                  |
+// |          Greg Beaver <cellog@php.net>                                |
+// +----------------------------------------------------------------------+
+//
+// $Id: Package.php,v 1.61.2.7 2005/02/17 17:47:55 cellog Exp $
+
+require_once 'PEAR/Common.php';
+require_once 'PEAR/Command/Common.php';
+
+class PEAR_Command_Package extends PEAR_Command_Common
+{
+    // {{{ properties
+
+    var $commands = array(
+        'package' => array(
+            'summary' => 'Build Package',
+            'function' => 'doPackage',
+            'shortcut' => 'p',
+            'options' => array(
+                'nocompress' => array(
+                    'shortopt' => 'Z',
+                    'doc' => 'Do not gzip the package file'
+                    ),
+                'showname' => array(
+                    'shortopt' => 'n',
+                    'doc' => 'Print the name of the packaged file.',
+                    ),
+                ),
+            'doc' => '[descfile]
+Creates a PEAR package from its description file (usually called
+package.xml).
+'
+            ),
+        'package-validate' => array(
+            'summary' => 'Validate Package Consistency',
+            'function' => 'doPackageValidate',
+            'shortcut' => 'pv',
+            'options' => array(),
+            'doc' => '
+',
+            ),
+        'cvsdiff' => array(
+            'summary' => 'Run a "cvs diff" for all files in a package',
+            'function' => 'doCvsDiff',
+            'shortcut' => 'cd',
+            'options' => array(
+                'quiet' => array(
+                    'shortopt' => 'q',
+                    'doc' => 'Be quiet',
+                    ),
+                'reallyquiet' => array(
+                    'shortopt' => 'Q',
+                    'doc' => 'Be really quiet',
+                    ),
+                'date' => array(
+                    'shortopt' => 'D',
+                    'doc' => 'Diff against revision of DATE',
+                    'arg' => 'DATE',
+                    ),
+                'release' => array(
+                    'shortopt' => 'R',
+                    'doc' => 'Diff against tag for package release REL',
+                    'arg' => 'REL',
+                    ),
+                'revision' => array(
+                    'shortopt' => 'r',
+                    'doc' => 'Diff against revision REV',
+                    'arg' => 'REV',
+                    ),
+                'context' => array(
+                    'shortopt' => 'c',
+                    'doc' => 'Generate context diff',
+                    ),
+                'unified' => array(
+                    'shortopt' => 'u',
+                    'doc' => 'Generate unified diff',
+                    ),
+                'ignore-case' => array(
+                    'shortopt' => 'i',
+                    'doc' => 'Ignore case, consider upper- and lower-case letters equivalent',
+                    ),
+                'ignore-whitespace' => array(
+                    'shortopt' => 'b',
+                    'doc' => 'Ignore changes in amount of white space',
+                    ),
+                'ignore-blank-lines' => array(
+                    'shortopt' => 'B',
+                    'doc' => 'Ignore changes that insert or delete blank lines',
+                    ),
+                'brief' => array(
+                    'doc' => 'Report only whether the files differ, no details',
+                    ),
+                'dry-run' => array(
+                    'shortopt' => 'n',
+                    'doc' => 'Don\'t do anything, just pretend',
+                    ),
+                ),
+            'doc' => '<package.xml>
+Compares all the files in a package.  Without any options, this
+command will compare the current code with the last checked-in code.
+Using the -r or -R option you may compare the current code with that
+of a specific release.
+',
+            ),
+        'cvstag' => array(
+            'summary' => 'Set CVS Release Tag',
+            'function' => 'doCvsTag',
+            'shortcut' => 'ct',
+            'options' => array(
+                'quiet' => array(
+                    'shortopt' => 'q',
+                    'doc' => 'Be quiet',
+                    ),
+                'reallyquiet' => array(
+                    'shortopt' => 'Q',
+                    'doc' => 'Be really quiet',
+                    ),
+                'slide' => array(
+                    'shortopt' => 'F',
+                    'doc' => 'Move (slide) tag if it exists',
+                    ),
+                'delete' => array(
+                    'shortopt' => 'd',
+                    'doc' => 'Remove tag',
+                    ),
+                'dry-run' => array(
+                    'shortopt' => 'n',
+                    'doc' => 'Don\'t do anything, just pretend',
+                    ),
+                ),
+            'doc' => '<package.xml>
+Sets a CVS tag on all files in a package.  Use this command after you have
+packaged a distribution tarball with the "package" command to tag what
+revisions of what files were in that release.  If need to fix something
+after running cvstag once, but before the tarball is released to the public,
+use the "slide" option to move the release tag.
+',
+            ),
+        'run-tests' => array(
+            'summary' => 'Run Regression Tests',
+            'function' => 'doRunTests',
+            'shortcut' => 'rt',
+            'options' => array(
+                'recur' => array(
+                    'shortopt' => 'r',
+                    'doc' => 'Run tests in child directories, recursively.  4 dirs deep maximum',
+                ),
+                'ini' => array(
+                    'shortopt' => 'i',
+                    'doc' => 'actual string of settings to pass to php in format " -d setting=blah"',
+                    'arg' => 'SETTINGS'
+                ),
+                'realtimelog' => array(
+                    'shortopt' => 'l',
+                    'doc' => 'Log test runs/results as they are run',
+                ),
+            ),
+            'doc' => '[testfile|dir ...]
+Run regression tests with PHP\'s regression testing script (run-tests.php).',
+            ),
+        'package-dependencies' => array(
+            'summary' => 'Show package dependencies',
+            'function' => 'doPackageDependencies',
+            'shortcut' => 'pd',
+            'options' => array(),
+            'doc' => '
+List all depencies the package has.'
+            ),
+        'sign' => array(
+            'summary' => 'Sign a package distribution file',
+            'function' => 'doSign',
+            'shortcut' => 'si',
+            'options' => array(),
+            'doc' => '<package-file>
+Signs a package distribution (.tar or .tgz) file with GnuPG.',
+            ),
+        'makerpm' => array(
+            'summary' => 'Builds an RPM spec file from a PEAR package',
+            'function' => 'doMakeRPM',
+            'shortcut' => 'rpm',
+            'options' => array(
+                'spec-template' => array(
+                    'shortopt' => 't',
+                    'arg' => 'FILE',
+                    'doc' => 'Use FILE as RPM spec file template'
+                    ),
+                'rpm-pkgname' => array(
+                    'shortopt' => 'p',
+                    'arg' => 'FORMAT',
+                    'doc' => 'Use FORMAT as format string for RPM package name, %s is replaced
+by the PEAR package name, defaults to "PEAR::%s".',
+                    ),
+                ),
+            'doc' => '<package-file>
+
+Creates an RPM .spec file for wrapping a PEAR package inside an RPM
+package.  Intended to be used from the SPECS directory, with the PEAR
+package tarball in the SOURCES directory:
+
+$ pear makerpm ../SOURCES/Net_Socket-1.0.tgz
+Wrote RPM spec file PEAR::Net_Geo-1.0.spec
+$ rpm -bb PEAR::Net_Socket-1.0.spec
+...
+Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
+',
+            ),
+        );
+
+    var $output;
+
+    // }}}
+    // {{{ constructor
+
+    /**
+     * PEAR_Command_Package constructor.
+     *
+     * @access public
+     */
+    function PEAR_Command_Package(&$ui, &$config)
+    {
+        parent::PEAR_Command_Common($ui, $config);
+    }
+
+    // }}}
+
+    // {{{ _displayValidationResults()
+
+    function _displayValidationResults($err, $warn, $strict = false)
+    {
+        foreach ($err as $e) {
+            $this->output .= "Error: $e\n";
+        }
+        foreach ($warn as $w) {
+            $this->output .= "Warning: $w\n";
+        }
+        $this->output .= sprintf('Validation: %d error(s), %d warning(s)'."\n",
+                                       sizeof($err), sizeof($warn));
+        if ($strict && sizeof($err) > 0) {
+            $this->output .= "Fix these errors and try again.";
+            return false;
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ doPackage()
+
+    function doPackage($command, $options, $params)
+    {
+        $this->output = '';
+        include_once 'PEAR/Packager.php';
+        if (sizeof($params) < 1) {
+            $params[0] = "package.xml";
+        }
+        $pkginfofile = isset($params[0]) ? $params[0] : 'package.xml';
+        $packager =& new PEAR_Packager();
+        $err = $warn = array();
+        $dir = dirname($pkginfofile);
+        $compress = empty($options['nocompress']) ? true : false;
+        $result = $packager->package($pkginfofile, $compress);
+        if (PEAR::isError($result)) {
+            $this->ui->outputData($this->output, $command);
+            return $this->raiseError($result);
+        }
+        // Don't want output, only the package file name just created
+        if (isset($options['showname'])) {
+            $this->output = $result;
+        }
+        if (PEAR::isError($result)) {
+            $this->output .= "Package failed: ".$result->getMessage();
+        }
+        $this->ui->outputData($this->output, $command);
+        return true;
+    }
+
+    // }}}
+    // {{{ doPackageValidate()
+
+    function doPackageValidate($command, $options, $params)
+    {
+        $this->output = '';
+        if (sizeof($params) < 1) {
+            $params[0] = "package.xml";
+        }
+        $obj = new PEAR_Common;
+        $info = null;
+        if ($fp = @fopen($params[0], "r")) {
+            $test = fread($fp, 5);
+            fclose($fp);
+            if ($test == "<?xml") {
+                $info = $obj->infoFromDescriptionFile($params[0]);
+            }
+        }
+        if (empty($info)) {
+            $info = $obj->infoFromTgzFile($params[0]);
+        }
+        if (PEAR::isError($info)) {
+            return $this->raiseError($info);
+        }
+        $obj->validatePackageInfo($info, $err, $warn);
+        $this->_displayValidationResults($err, $warn);
+        $this->ui->outputData($this->output, $command);
+        return true;
+    }
+
+    // }}}
+    // {{{ doCvsTag()
+
+    function doCvsTag($command, $options, $params)
+    {
+        $this->output = '';
+        $_cmd = $command;
+        if (sizeof($params) < 1) {
+            $help = $this->getHelp($command);
+            return $this->raiseError("$command: missing parameter: $help[0]");
+        }
+        $obj = new PEAR_Common;
+        $info = $obj->infoFromDescriptionFile($params[0]);
+        if (PEAR::isError($info)) {
+            return $this->raiseError($info);
+        }
+        $err = $warn = array();
+        $obj->validatePackageInfo($info, $err, $warn);
+        if (!$this->_displayValidationResults($err, $warn, true)) {
+            $this->ui->outputData($this->output, $command);
+            break;
+        }
+        $version = $info['version'];
+        $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $version);
+        $cvstag = "RELEASE_$cvsversion";
+        $files = array_keys($info['filelist']);
+        $command = "cvs";
+        if (isset($options['quiet'])) {
+            $command .= ' -q';
+        }
+        if (isset($options['reallyquiet'])) {
+            $command .= ' -Q';
+        }
+        $command .= ' tag';
+        if (isset($options['slide'])) {
+            $command .= ' -F';
+        }
+        if (isset($options['delete'])) {
+            $command .= ' -d';
+        }
+        $command .= ' ' . $cvstag . ' ' . escapeshellarg($params[0]);
+        foreach ($files as $file) {
+            $command .= ' ' . escapeshellarg($file);
+        }
+        if ($this->config->get('verbose') > 1) {
+            $this->output .= "+ $command\n";
+        }
+        $this->output .= "+ $command\n";
+        if (empty($options['dry-run'])) {
+            $fp = popen($command, "r");
+            while ($line = fgets($fp, 1024)) {
+                $this->output .= rtrim($line)."\n";
+            }
+            pclose($fp);
+        }
+        $this->ui->outputData($this->output, $_cmd);
+        return true;
+    }
+
+    // }}}
+    // {{{ doCvsDiff()
+
+    function doCvsDiff($command, $options, $params)
+    {
+        $this->output = '';
+        if (sizeof($params) < 1) {
+            $help = $this->getHelp($command);
+            return $this->raiseError("$command: missing parameter: $help[0]");
+        }
+        $obj = new PEAR_Common;
+        $info = $obj->infoFromDescriptionFile($params[0]);
+        if (PEAR::isError($info)) {
+            return $this->raiseError($info);
+        }
+        $files = array_keys($info['filelist']);
+        $cmd = "cvs";
+        if (isset($options['quiet'])) {
+            $cmd .= ' -q';
+            unset($options['quiet']);
+        }
+        if (isset($options['reallyquiet'])) {
+            $cmd .= ' -Q';
+            unset($options['reallyquiet']);
+        }
+        if (isset($options['release'])) {
+            $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $options['release']);
+            $cvstag = "RELEASE_$cvsversion";
+            $options['revision'] = $cvstag;
+            unset($options['release']);
+        }
+        $execute = true;
+        if (isset($options['dry-run'])) {
+            $execute = false;
+            unset($options['dry-run']);
+        }
+        $cmd .= ' diff';
+        // the rest of the options are passed right on to "cvs diff"
+        foreach ($options as $option => $optarg) {
+            $arg = @$this->commands[$command]['options'][$option]['arg'];
+            $short = @$this->commands[$command]['options'][$option]['shortopt'];
+            $cmd .= $short ? " -$short" : " --$option";
+            if ($arg && $optarg) {
+                $cmd .= ($short ? '' : '=') . escapeshellarg($optarg);
+            }
+        }
+        foreach ($files as $file) {
+            $cmd .= ' ' . escapeshellarg($file);
+        }
+        if ($this->config->get('verbose') > 1) {
+            $this->output .= "+ $cmd\n";
+        }
+        if ($execute) {
+            $fp = popen($cmd, "r");
+            while ($line = fgets($fp, 1024)) {
+                $this->output .= rtrim($line)."\n";
+            }
+            pclose($fp);
+        }
+        $this->ui->outputData($this->output, $command);
+        return true;
+    }
+
+    // }}}
+    // {{{ doRunTests()
+
+    function doRunTests($command, $options, $params)
+    {
+        include_once 'PEAR/RunTest.php';
+        $log = new PEAR_Common;
+        $log->ui = &$this->ui; // slightly hacky, but it will work
+        $run = new PEAR_RunTest($log);
+        $tests = array();
+        if (isset($options['recur'])) {
+            $depth = 4;
+        } else {
+            $depth = 1;
+        }
+        if (!count($params)) {
+            $params[] = '.';
+        }
+        foreach ($params as $p) {
+            if (is_dir($p)) {
+                $dir = System::find(array($p, '-type', 'f',
+                                            '-maxdepth', $depth,
+                                            '-name', '*.phpt'));
+                $tests = array_merge($tests, $dir);
+            } else {
+                if (!@file_exists($p)) {
+                    if (!preg_match('/\.phpt$/', $p)) {
+                        $p .= '.phpt';
+                    }
+                    $dir = System::find(array(dirname($p), '-type', 'f',
+                                                '-maxdepth', $depth,
+                                                '-name', $p));
+                    $tests = array_merge($tests, $dir);
+                } else {
+                    $tests[] = $p;
+                }
+            }
+        }
+        $ini_settings = '';
+        if (isset($options['ini'])) {
+            $ini_settings .= $options['ini'];
+        }
+        if (isset($_ENV['TEST_PHP_INCLUDE_PATH'])) {
+            $ini_settings .= " -d include_path={$_ENV['TEST_PHP_INCLUDE_PATH']}";
+        }
+        if ($ini_settings) {
+            $this->ui->outputData('Using INI settings: "' . $ini_settings . '"');
+        }
+        $skipped = $passed = $failed = array();
+        $this->ui->outputData('Running ' . count($tests) . ' tests', $command);
+        $start = time();
+        if (isset($options['realtimelog'])) {
+            @unlink('run-tests.log');
+        }
+        foreach ($tests as $t) {
+            if (isset($options['realtimelog'])) {
+                $fp = @fopen('run-tests.log', 'a');
+                if ($fp) {
+                    fwrite($fp, "Running test $t...");
+                    fclose($fp);
+                }
+            }
+            $result = $run->run($t, $ini_settings);
+            if (OS_WINDOWS) {
+                for($i=0;$i<2000;$i++) {
+                    $i = $i; // delay - race conditions on windows
+                }
+            }
+            if (isset($options['realtimelog'])) {
+                $fp = @fopen('run-tests.log', 'a');
+                if ($fp) {
+                    fwrite($fp, "$result\n");
+                    fclose($fp);
+                }
+            }
+            if ($result == 'FAILED') {
+            	$failed[] = $t;
+            }
+            if ($result == 'PASSED') {
+            	$passed[] = $t;
+            }
+            if ($result == 'SKIPPED') {
+            	$skipped[] = $t;
+            }
+        }
+        $total = date('i:s', time() - $start);
+        if (count($failed)) {
+            $output = "TOTAL TIME: $total\n";
+            $output .= count($passed) . " PASSED TESTS\n";
+            $output .= count($skipped) . " SKIPPED TESTS\n";
+    		$output .= count($failed) . " FAILED TESTS:\n";
+        	foreach ($failed as $failure) {
+        		$output .= $failure . "\n";
+        	}
+            if (isset($options['realtimelog'])) {
+                $fp = @fopen('run-tests.log', 'a');
+            } else {
+                $fp = @fopen('run-tests.log', 'w');
+            }
+            if ($fp) {
+                fwrite($fp, $output, strlen($output));
+                fclose($fp);
+                $this->ui->outputData('wrote log to "' . realpath('run-tests.log') . '"', $command);
+            }
+        } elseif (@file_exists('run-tests.log') && !@is_dir('run-tests.log')) {
+            @unlink('run-tests.log');
+        }
+        $this->ui->outputData('TOTAL TIME: ' . $total);
+        $this->ui->outputData(count($passed) . ' PASSED TESTS', $command);
+        $this->ui->outputData(count($skipped) . ' SKIPPED TESTS', $command);
+        if (count($failed)) {
+    		$this->ui->outputData(count($failed) . ' FAILED TESTS:', $command);
+        	foreach ($failed as $failure) {
+        		$this->ui->outputData($failure, $command);
+        	}
+        }
+
+        return true;
+    }
+
+    // }}}
+    // {{{ doPackageDependencies()
+
+    function doPackageDependencies($command, $options, $params)
+    {
+        // $params[0] -> the PEAR package to list its information
+        if (sizeof($params) != 1) {
+            return $this->raiseError("bad parameter(s), try \"help $command\"");
+        }
+
+        $obj = new PEAR_Common();
+        if (PEAR::isError($info = $obj->infoFromAny($params[0]))) {
+            return $this->raiseError($info);
+        }
+
+        if (is_array($info['release_deps'])) {
+            $data = array(
+                'caption' => 'Dependencies for ' . $info['package'],
+                'border' => true,
+                'headline' => array("Type", "Name", "Relation", "Version"),
+                );
+
+            foreach ($info['release_deps'] as $d) {
+
+                if (isset($this->_deps_rel_trans[$d['rel']])) {
+                    $rel = $this->_deps_rel_trans[$d['rel']];
+                } else {
+                    $rel = $d['rel'];
+                }
+
+                if (isset($this->_deps_type_trans[$d['type']])) {
+                    $type = ucfirst($this->_deps_type_trans[$d['type']]);
+                } else {
+                    $type = $d['type'];
+                }
+
+                if (isset($d['name'])) {
+                    $name = $d['name'];
+                } else {
+                    $name = '';
+                }
+
+                if (isset($d['version'])) {
+                    $version = $d['version'];
+                } else {
+                    $version = '';
+                }
+
+                $data['data'][] = array($type, $name, $rel, $version);
+            }
+
+            $this->ui->outputData($data, $command);
+            return true;
+        }
+
+        // Fallback
+        $this->ui->outputData("This package does not have any dependencies.", $command);
+    }
+
+    // }}}
+    // {{{ doSign()
+
+    function doSign($command, $options, $params)
+    {
+        // should move most of this code into PEAR_Packager
+        // so it'll be easy to implement "pear package --sign"
+        if (sizeof($params) != 1) {
+            return $this->raiseError("bad parameter(s), try \"help $command\"");
+        }
+        if (!file_exists($params[0])) {
+            return $this->raiseError("file does not exist: $params[0]");
+        }
+        $obj = new PEAR_Common;
+        $info = $obj->infoFromTgzFile($params[0]);
+        if (PEAR::isError($info)) {
+            return $this->raiseError($info);
+        }
+        include_once "Archive/Tar.php";
+        include_once "System.php";
+        $tar = new Archive_Tar($params[0]);
+        $tmpdir = System::mktemp('-d pearsign');
+        if (!$tar->extractList('package.xml package.sig', $tmpdir)) {
+            return $this->raiseError("failed to extract tar file");
+        }
+        if (file_exists("$tmpdir/package.sig")) {
+            return $this->raiseError("package already signed");
+        }
+        @unlink("$tmpdir/package.sig");
+        $input = $this->ui->userDialog($command,
+                                       array('GnuPG Passphrase'),
+                                       array('password'));
+        $gpg = popen("gpg --batch --passphrase-fd 0 --armor --detach-sign --output $tmpdir/package.sig $tmpdir/package.xml 2>/dev/null", "w");
+        if (!$gpg) {
+            return $this->raiseError("gpg command failed");
+        }
+        fwrite($gpg, "$input[0]\r");
+        if (pclose($gpg) || !file_exists("$tmpdir/package.sig")) {
+            return $this->raiseError("gpg sign failed");
+        }
+        $tar->addModify("$tmpdir/package.sig", '', $tmpdir);
+        return true;
+    }
+
+    // }}}
+    // {{{ doMakeRPM()
+
+    /*
+
+    (cox)
+
+    TODO:
+
+        - Fill the rpm dependencies in the template file.
+
+    IDEAS:
+
+        - Instead of mapping the role to rpm vars, perhaps it's better
+
+          to use directly the pear cmd to install the files by itself
+
+          in %postrun so:
+
+          pear -d php_dir=%{_libdir}/php/pear -d test_dir=.. <package>
+
+    */
+
+    function doMakeRPM($command, $options, $params)
+    {
+        if (sizeof($params) != 1) {
+            return $this->raiseError("bad parameter(s), try \"help $command\"");
+        }
+        if (!file_exists($params[0])) {
+            return $this->raiseError("file does not exist: $params[0]");
+        }
+        include_once "Archive/Tar.php";
+        include_once "PEAR/Installer.php";
+        include_once "System.php";
+        $tar = new Archive_Tar($params[0]);
+        $tmpdir = System::mktemp('-d pear2rpm');
+        $instroot = System::mktemp('-d pear2rpm');
+        $tmp = $this->config->get('verbose');
+        $this->config->set('verbose', 0);
+        $installer = new PEAR_Installer($this->ui);
+        $info = $installer->install($params[0],
+                                    array('installroot' => $instroot,
+                                          'nodeps' => true));
+        $pkgdir = "$info[package]-$info[version]";
+        $info['rpm_xml_dir'] = '/var/lib/pear';
+        $this->config->set('verbose', $tmp);
+        if (!$tar->extractList("package.xml", $tmpdir, $pkgdir)) {
+            return $this->raiseError("failed to extract $params[0]");
+        }
+        if (!file_exists("$tmpdir/package.xml")) {
+            return $this->raiseError("no package.xml found in $params[0]");
+        }
+        if (isset($options['spec-template'])) {
+            $spec_template = $options['spec-template'];
+        } else {
+            $spec_template = $this->config->get('data_dir') .
+                '/PEAR/template.spec';
+        }
+        if (isset($options['rpm-pkgname'])) {
+            $rpm_pkgname_format = $options['rpm-pkgname'];
+        } else {
+            $rpm_pkgname_format = "PEAR::%s";
+        }
+
+        $info['extra_headers'] = '';
+        $info['doc_files'] = '';
+        $info['files'] = '';
+        $info['rpm_package'] = sprintf($rpm_pkgname_format, $info['package']);
+        $srcfiles = 0;
+        foreach ($info['filelist'] as $name => $attr) {
+
+            if (!isset($attr['role'])) {
+                continue;
+            }
+            $name = preg_replace('![/:\\\\]!', '/', $name);
+            if ($attr['role'] == 'doc') {
+                $info['doc_files'] .= " $name";
+
+            // Map role to the rpm vars
+            } else {
+
+                $c_prefix = '%{_libdir}/php/pear';
+
+                switch ($attr['role']) {
+
+                    case 'php':
+
+                        $prefix = $c_prefix; break;
+
+                    case 'ext':
+
+                        $prefix = '%{_libdir}/php'; break; // XXX good place?
+
+                    case 'src':
+
+                        $srcfiles++;
+
+                        $prefix = '%{_includedir}/php'; break; // XXX good place?
+
+                    case 'test':
+
+                        $prefix = "$c_prefix/tests/" . $info['package']; break;
+
+                    case 'data':
+
+                        $prefix = "$c_prefix/data/" . $info['package']; break;
+
+                    case 'script':
+
+                        $prefix = '%{_bindir}'; break;
+
+                }
+
+                $name = str_replace('\\', '/', $name);
+                $info['files'] .= "$prefix/$name\n";
+
+            }
+        }
+        if ($srcfiles > 0) {
+            include_once "OS/Guess.php";
+            $os = new OS_Guess;
+            $arch = $os->getCpu();
+        } else {
+            $arch = 'noarch';
+        }
+        $cfg = array('master_server', 'php_dir', 'ext_dir', 'doc_dir',
+                     'bin_dir', 'data_dir', 'test_dir');
+        foreach ($cfg as $k) {
+            $info[$k] = $this->config->get($k);
+        }
+        $info['arch'] = $arch;
+        $fp = @fopen($spec_template, "r");
+        if (!$fp) {
+            return $this->raiseError("could not open RPM spec file template $spec_template: $php_errormsg");
+        }
+        $spec_contents = preg_replace('/@([a-z0-9_-]+)@/e', '$info["\1"]', fread($fp, filesize($spec_template)));
+        fclose($fp);
+        $spec_file = "$info[rpm_package]-$info[version].spec";
+        $wp = fopen($spec_file, "wb");
+        if (!$wp) {
+            return $this->raiseError("could not write RPM spec file $spec_file: $php_errormsg");
+        }
+        fwrite($wp, $spec_contents);
+        fclose($wp);
+        $this->ui->outputData("Wrote RPM spec file $spec_file", $command);
+
+        return true;
+    }
+
+    // }}}
+}
+
+?>
diff --git a/3rdparty/PEAR/Command/Registry.php b/3rdparty/PEAR/Command/Registry.php
new file mode 100644
index 00000000000..62cb4b00e28
--- /dev/null
+++ b/3rdparty/PEAR/Command/Registry.php
@@ -0,0 +1,351 @@
+<?php
+// /* vim: set expandtab tabstop=4 shiftwidth=4: */
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Stig Bakken <ssb@php.net>                                    |
+// |                                                                      |
+// +----------------------------------------------------------------------+
+//
+// $Id: Registry.php,v 1.36 2004/01/08 17:33:13 sniper Exp $
+
+require_once 'PEAR/Command/Common.php';
+require_once 'PEAR/Registry.php';
+require_once 'PEAR/Config.php';
+
+class PEAR_Command_Registry extends PEAR_Command_Common
+{
+    // {{{ properties
+
+    var $commands = array(
+        'list' => array(
+            'summary' => 'List Installed Packages',
+            'function' => 'doList',
+            'shortcut' => 'l',
+            'options' => array(),
+            'doc' => '[package]
+If invoked without parameters, this command lists the PEAR packages
+installed in your php_dir ({config php_dir)).  With a parameter, it
+lists the files in that package.
+',
+            ),
+        'shell-test' => array(
+            'summary' => 'Shell Script Test',
+            'function' => 'doShellTest',
+            'shortcut' => 'st',
+            'options' => array(),
+            'doc' => '<package> [[relation] version]
+Tests if a package is installed in the system. Will exit(1) if it is not.
+   <relation>   The version comparison operator. One of:
+                <, lt, <=, le, >, gt, >=, ge, ==, =, eq, !=, <>, ne
+   <version>    The version to compare with
+'),
+        'info' => array(
+            'summary'  => 'Display information about a package',
+            'function' => 'doInfo',
+            'shortcut' => 'in',
+            'options'  => array(),
+            'doc'      => '<package>
+Displays information about a package. The package argument may be a
+local package file, an URL to a package file, or the name of an
+installed package.'
+            )
+        );
+
+    // }}}
+    // {{{ constructor
+
+    /**
+     * PEAR_Command_Registry constructor.
+     *
+     * @access public
+     */
+    function PEAR_Command_Registry(&$ui, &$config)
+    {
+        parent::PEAR_Command_Common($ui, $config);
+    }
+
+    // }}}
+
+    // {{{ doList()
+
+    function _sortinfo($a, $b)
+    {
+        return strcmp($a['package'], $b['package']);
+    }
+
+    function doList($command, $options, $params)
+    {
+        $reg = new PEAR_Registry($this->config->get('php_dir'));
+        if (sizeof($params) == 0) {
+            $installed = $reg->packageInfo();
+            usort($installed, array(&$this, '_sortinfo'));
+            $i = $j = 0;
+            $data = array(
+                'caption' => 'Installed packages:',
+                'border' => true,
+                'headline' => array('Package', 'Version', 'State')
+                );
+            foreach ($installed as $package) {
+                $data['data'][] = array($package['package'],
+                                          $package['version'],
+                                          @$package['release_state']);
+            }
+            if (count($installed)==0) {
+                $data = '(no packages installed)';
+            }
+            $this->ui->outputData($data, $command);
+        } else {
+            if (file_exists($params[0]) && !is_dir($params[0])) {
+                include_once "PEAR/Common.php";
+                $obj = &new PEAR_Common;
+                $info = $obj->infoFromAny($params[0]);
+                $headings = array('Package File', 'Install Path');
+                $installed = false;
+            } else {
+                $info = $reg->packageInfo($params[0]);
+                $headings = array('Type', 'Install Path');
+                $installed = true;
+            }
+            if (PEAR::isError($info)) {
+                return $this->raiseError($info);
+            }
+            if ($info === null) {
+                return $this->raiseError("`$params[0]' not installed");
+            }
+            $list = $info['filelist'];
+            if ($installed) {
+                $caption = 'Installed Files For ' . $params[0];
+            } else {
+                $caption = 'Contents of ' . basename($params[0]);
+            }
+            $data = array(
+                'caption' => $caption,
+                'border' => true,
+                'headline' => $headings);
+            foreach ($list as $file => $att) {
+                if ($installed) {
+                    if (empty($att['installed_as'])) {
+                        continue;
+                    }
+                    $data['data'][] = array($att['role'], $att['installed_as']);
+                } else {
+                    if (isset($att['baseinstalldir'])) {
+                        $dest = $att['baseinstalldir'] . DIRECTORY_SEPARATOR .
+                            $file;
+                    } else {
+                        $dest = $file;
+                    }
+                    switch ($att['role']) {
+                        case 'test':
+                        case 'data':
+                            if ($installed) {
+                                break 2;
+                            }
+                            $dest = '-- will not be installed --';
+                            break;
+                        case 'doc':
+                            $dest = $this->config->get('doc_dir') . DIRECTORY_SEPARATOR .
+                                $dest;
+                            break;
+                        case 'php':
+                        default:
+                            $dest = $this->config->get('php_dir') . DIRECTORY_SEPARATOR .
+                                $dest;
+                    }
+                    $dest = preg_replace('!/+!', '/', $dest);
+                    $file = preg_replace('!/+!', '/', $file);
+                    $data['data'][] = array($file, $dest);
+                }
+            }
+            $this->ui->outputData($data, $command);
+
+
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ doShellTest()
+
+    function doShellTest($command, $options, $params)
+    {
+        $this->pushErrorHandling(PEAR_ERROR_RETURN);
+        $reg = &new PEAR_Registry($this->config->get('php_dir'));
+        // "pear shell-test Foo"
+        if (sizeof($params) == 1) {
+            if (!$reg->packageExists($params[0])) {
+                exit(1);
+            }
+            // "pear shell-test Foo 1.0"
+        } elseif (sizeof($params) == 2) {
+            $v = $reg->packageInfo($params[0], 'version');
+            if (!$v || !version_compare("$v", "{$params[1]}", "ge")) {
+                exit(1);
+            }
+            // "pear shell-test Foo ge 1.0"
+        } elseif (sizeof($params) == 3) {
+            $v = $reg->packageInfo($params[0], 'version');
+            if (!$v || !version_compare("$v", "{$params[2]}", $params[1])) {
+                exit(1);
+            }
+        } else {
+            $this->popErrorHandling();
+            $this->raiseError("$command: expects 1 to 3 parameters");
+            exit(1);
+        }
+    }
+
+    // }}}
+    // {{{ doInfo
+
+    function doInfo($command, $options, $params)
+    {
+        // $params[0] The package for showing info
+        if (sizeof($params) != 1) {
+            return $this->raiseError("This command only accepts one param: ".
+                                     "the package you want information");
+        }
+        if (@is_file($params[0])) {
+            $obj  = &new PEAR_Common();
+            $info = $obj->infoFromAny($params[0]);
+        } else {
+            $reg = &new PEAR_Registry($this->config->get('php_dir'));
+            $info = $reg->packageInfo($params[0]);
+        }
+        if (PEAR::isError($info)) {
+            return $info;
+        }
+        if (empty($info)) {
+            $this->raiseError("Nothing found for `$params[0]'");
+            return;
+        }
+        unset($info['filelist']);
+        unset($info['changelog']);
+        $keys = array_keys($info);
+        $longtext = array('description', 'summary');
+        foreach ($keys as $key) {
+            if (is_array($info[$key])) {
+                switch ($key) {
+                    case 'maintainers': {
+                        $i = 0;
+                        $mstr = '';
+                        foreach ($info[$key] as $m) {
+                            if ($i++ > 0) {
+                                $mstr .= "\n";
+                            }
+                            $mstr .= $m['name'] . " <";
+                            if (isset($m['email'])) {
+                                $mstr .= $m['email'];
+                            } else {
+                                $mstr .= $m['handle'] . '@php.net';
+                            }
+                            $mstr .= "> ($m[role])";
+                        }
+                        $info[$key] = $mstr;
+                        break;
+                    }
+                    case 'release_deps': {
+                        $i = 0;
+                        $dstr = '';
+                        foreach ($info[$key] as $d) {
+                            if (isset($this->_deps_rel_trans[$d['rel']])) {
+                                $rel = $this->_deps_rel_trans[$d['rel']];
+                            } else {
+                                $rel = $d['rel'];
+                            }
+                            if (isset($this->_deps_type_trans[$d['type']])) {
+                                $type = ucfirst($this->_deps_type_trans[$d['type']]);
+                            } else {
+                                $type = $d['type'];
+                            }
+                            if (isset($d['name'])) {
+                                $name = $d['name'] . ' ';
+                            } else {
+                                $name = '';
+                            }
+                            if (isset($d['version'])) {
+                                $version = $d['version'] . ' ';
+                            } else {
+                                $version = '';
+                            }
+                            $dstr .= "$type $name$rel $version\n";
+                        }
+                        $info[$key] = $dstr;
+                        break;
+                    }
+                    case 'provides' : {
+                        $debug = $this->config->get('verbose');
+                        if ($debug < 2) {
+                            $pstr = 'Classes: ';
+                        } else {
+                            $pstr = '';
+                        }
+                        $i = 0;
+                        foreach ($info[$key] as $p) {
+                            if ($debug < 2 && $p['type'] != "class") {
+                                continue;
+                            }
+                            // Only print classes when verbosity mode is < 2
+                            if ($debug < 2) {
+                                if ($i++ > 0) {
+                                    $pstr .= ", ";
+                                }
+                                $pstr .= $p['name'];
+                            } else {
+                                if ($i++ > 0) {
+                                    $pstr .= "\n";
+                                }
+                                $pstr .= ucfirst($p['type']) . " " . $p['name'];
+                                if (isset($p['explicit']) && $p['explicit'] == 1) {
+                                    $pstr .= " (explicit)";
+                                }
+                            }
+                        }
+                        $info[$key] = $pstr;
+                        break;
+                    }
+                    default: {
+                        $info[$key] = implode(", ", $info[$key]);
+                        break;
+                    }
+                }
+            }
+            if ($key == '_lastmodified') {
+                $hdate = date('Y-m-d', $info[$key]);
+                unset($info[$key]);
+                $info['Last Modified'] = $hdate;
+            } else {
+                $info[$key] = trim($info[$key]);
+                if (in_array($key, $longtext)) {
+                    $info[$key] = preg_replace('/  +/', ' ', $info[$key]);
+                }
+            }
+        }
+        $caption = 'About ' . $info['package'] . '-' . $info['version'];
+        $data = array(
+            'caption' => $caption,
+            'border' => true);
+        foreach ($info as $key => $value) {
+            $key = ucwords(trim(str_replace('_', ' ', $key)));
+            $data['data'][] = array($key, $value);
+        }
+        $data['raw'] = $info;
+
+        $this->ui->outputData($data, 'package-info');
+    }
+
+    // }}}
+}
+
+?>
diff --git a/3rdparty/PEAR/Command/Remote.php b/3rdparty/PEAR/Command/Remote.php
new file mode 100644
index 00000000000..bbd16093f5d
--- /dev/null
+++ b/3rdparty/PEAR/Command/Remote.php
@@ -0,0 +1,435 @@
+<?php
+// /* vim: set expandtab tabstop=4 shiftwidth=4: */
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Stig Bakken <ssb@php.net>                                    |
+// |                                                                      |
+// +----------------------------------------------------------------------+
+//
+// $Id: Remote.php,v 1.39 2004/04/03 15:56:00 cellog Exp $
+
+require_once 'PEAR/Command/Common.php';
+require_once 'PEAR/Common.php';
+require_once 'PEAR/Remote.php';
+require_once 'PEAR/Registry.php';
+
+class PEAR_Command_Remote extends PEAR_Command_Common
+{
+    // {{{ command definitions
+
+    var $commands = array(
+        'remote-info' => array(
+            'summary' => 'Information About Remote Packages',
+            'function' => 'doRemoteInfo',
+            'shortcut' => 'ri',
+            'options' => array(),
+            'doc' => '<package>
+Get details on a package from the server.',
+            ),
+        'list-upgrades' => array(
+            'summary' => 'List Available Upgrades',
+            'function' => 'doListUpgrades',
+            'shortcut' => 'lu',
+            'options' => array(),
+            'doc' => '
+List releases on the server of packages you have installed where
+a newer version is available with the same release state (stable etc.).'
+            ),
+        'remote-list' => array(
+            'summary' => 'List Remote Packages',
+            'function' => 'doRemoteList',
+            'shortcut' => 'rl',
+            'options' => array(),
+            'doc' => '
+Lists the packages available on the configured server along with the
+latest stable release of each package.',
+            ),
+        'search' => array(
+            'summary' => 'Search remote package database',
+            'function' => 'doSearch',
+            'shortcut' => 'sp',
+            'options' => array(),
+            'doc' => '
+Lists all packages which match the search parameters (first param
+is package name, second package info)',
+            ),
+        'list-all' => array(
+            'summary' => 'List All Packages',
+            'function' => 'doListAll',
+            'shortcut' => 'la',
+            'options' => array(),
+            'doc' => '
+Lists the packages available on the configured server along with the
+latest stable release of each package.',
+            ),
+        'download' => array(
+            'summary' => 'Download Package',
+            'function' => 'doDownload',
+            'shortcut' => 'd',
+            'options' => array(
+                'nocompress' => array(
+                    'shortopt' => 'Z',
+                    'doc' => 'download an uncompressed (.tar) file',
+                    ),
+                ),
+            'doc' => '{package|package-version}
+Download a package tarball.  The file will be named as suggested by the
+server, for example if you download the DB package and the latest stable
+version of DB is 1.2, the downloaded file will be DB-1.2.tgz.',
+            ),
+        'clear-cache' => array(
+            'summary' => 'Clear XML-RPC Cache',
+            'function' => 'doClearCache',
+            'shortcut' => 'cc',
+            'options' => array(),
+            'doc' => '
+Clear the XML-RPC cache.  See also the cache_ttl configuration
+parameter.
+',
+            ),
+        );
+
+    // }}}
+    // {{{ constructor
+
+    /**
+     * PEAR_Command_Remote constructor.
+     *
+     * @access public
+     */
+    function PEAR_Command_Remote(&$ui, &$config)
+    {
+        parent::PEAR_Command_Common($ui, $config);
+    }
+
+    // }}}
+
+    // {{{ doRemoteInfo()
+
+    function doRemoteInfo($command, $options, $params)
+    {
+        if (sizeof($params) != 1) {
+            return $this->raiseError("$command expects one param: the remote package name");
+        }
+        $r = new PEAR_Remote($this->config);
+        $info = $r->call('package.info', $params[0]);
+        if (PEAR::isError($info)) {
+            return $this->raiseError($info);
+        }
+
+        $reg = new PEAR_Registry($this->config->get('php_dir'));
+        $installed = $reg->packageInfo($info['name']);
+        $info['installed'] = $installed['version'] ? $installed['version'] : '- no -';
+
+        $this->ui->outputData($info, $command);
+
+        return true;
+    }
+
+    // }}}
+    // {{{ doRemoteList()
+
+    function doRemoteList($command, $options, $params)
+    {
+        $r = new PEAR_Remote($this->config);
+        $list_options = false;
+        if ($this->config->get('preferred_state') == 'stable')
+            $list_options = true;
+        $available = $r->call('package.listAll', $list_options);
+        if (PEAR::isError($available)) {
+            return $this->raiseError($available);
+        }
+        $i = $j = 0;
+        $data = array(
+            'caption' => 'Available packages:',
+            'border' => true,
+            'headline' => array('Package', 'Version'),
+            );
+        foreach ($available as $name => $info) {
+            $data['data'][] = array($name, isset($info['stable']) ? $info['stable'] : '-n/a-');
+        }
+        if (count($available)==0) {
+            $data = '(no packages installed yet)';
+        }
+        $this->ui->outputData($data, $command);
+        return true;
+    }
+
+    // }}}
+    // {{{ doListAll()
+
+    function doListAll($command, $options, $params)
+    {
+        $r = new PEAR_Remote($this->config);
+        $reg = new PEAR_Registry($this->config->get('php_dir'));
+        $list_options = false;
+        if ($this->config->get('preferred_state') == 'stable')
+            $list_options = true;
+        $available = $r->call('package.listAll', $list_options);
+        if (PEAR::isError($available)) {
+            return $this->raiseError($available);
+        }
+        if (!is_array($available)) {
+            return $this->raiseError('The package list could not be fetched from the remote server. Please try again. (Debug info: "'.$available.'")');
+        }
+        $data = array(
+            'caption' => 'All packages:',
+            'border' => true,
+            'headline' => array('Package', 'Latest', 'Local'),
+            );
+        $local_pkgs = $reg->listPackages();
+        
+        foreach ($available as $name => $info) {
+            $installed = $reg->packageInfo($name);
+            $desc = $info['summary'];
+            if (isset($params[$name]))
+                $desc .= "\n\n".$info['description'];
+
+            if (isset($options['mode']))
+            {
+                if ($options['mode'] == 'installed' && !isset($installed['version']))
+                    continue;
+                if ($options['mode'] == 'notinstalled' && isset($installed['version']))
+                    continue;
+                if ($options['mode'] == 'upgrades'
+                    && (!isset($installed['version']) || $installed['version'] == $info['stable']))
+                {
+                    continue;
+                }
+            }
+            $pos = array_search(strtolower($name), $local_pkgs);
+            if ($pos !== false) {
+                unset($local_pkgs[$pos]);
+            }
+
+            $data['data'][$info['category']][] = array(
+                $name,
+                @$info['stable'],
+                @$installed['version'],
+                @$desc,
+                @$info['deps'],
+                );
+        }
+        
+        foreach ($local_pkgs as $name) {
+            $info = $reg->packageInfo($name);
+            $data['data']['Local'][] = array(
+                $info['package'], 
+                '',
+                $info['version'],
+                $info['summary'],
+                @$info['release_deps']
+                );
+        }
+
+        $this->ui->outputData($data, $command);
+        return true;
+    }
+
+    // }}}
+    // {{{ doSearch()
+
+    function doSearch($command, $options, $params)
+    {
+        if ((!isset($params[0]) || empty($params[0]))
+            && (!isset($params[1]) || empty($params[1])))
+        {
+            return $this->raiseError('no valid search string supplied');
+        };
+
+        $r = new PEAR_Remote($this->config);
+        $reg = new PEAR_Registry($this->config->get('php_dir'));
+        $available = $r->call('package.listAll', true, false);
+        if (PEAR::isError($available)) {
+            return $this->raiseError($available);
+        }
+        $data = array(
+            'caption' => 'Matched packages:',
+            'border' => true,
+            'headline' => array('Package', 'Stable/(Latest)', 'Local'),
+            );
+
+        foreach ($available as $name => $info) {
+            $found = (!empty($params[0]) && stristr($name, $params[0]) !== false);
+            if (!$found && !(isset($params[1]) && !empty($params[1])
+                && (stristr($info['summary'], $params[1]) !== false
+                    || stristr($info['description'], $params[1]) !== false)))
+            {
+                continue;
+            };
+
+            $installed = $reg->packageInfo($name);
+            $desc = $info['summary'];
+            if (isset($params[$name]))
+                $desc .= "\n\n".$info['description'];
+
+            $unstable = '';
+            if ($info['unstable']) {
+                $unstable = '/(' . $info['unstable'] . $info['state'] . ')';
+            }
+            if (!isset($info['stable']) || !$info['stable']) {
+                $info['stable'] = 'none';
+            }
+            $data['data'][$info['category']][] = array(
+                $name,
+                $info['stable'] . $unstable,
+                $installed['version'],
+                $desc,
+                );
+        }
+        if (!isset($data['data'])) {
+            return $this->raiseError('no packages found');
+        }
+        $this->ui->outputData($data, $command);
+        return true;
+    }
+
+    // }}}
+    // {{{ doDownload()
+
+    function doDownload($command, $options, $params)
+    {
+        //$params[0] -> The package to download
+        if (count($params) != 1) {
+            return PEAR::raiseError("download expects one argument: the package to download");
+        }
+        $server = $this->config->get('master_server');
+        if (!ereg('^http://', $params[0])) {
+            $getoption = isset($options['nocompress'])&&$options['nocompress']==1?'?uncompress=on':'';
+            $pkgfile = "http://$server/get/$params[0]".$getoption;
+        } else {
+            $pkgfile = $params[0];
+        }
+        $this->bytes_downloaded = 0;
+        $saved = PEAR_Common::downloadHttp($pkgfile, $this->ui, '.',
+                                           array(&$this, 'downloadCallback'));
+        if (PEAR::isError($saved)) {
+            return $this->raiseError($saved);
+        }
+        $fname = basename($saved);
+        $this->ui->outputData("File $fname downloaded ($this->bytes_downloaded bytes)", $command);
+        return true;
+    }
+
+    function downloadCallback($msg, $params = null)
+    {
+        if ($msg == 'done') {
+            $this->bytes_downloaded = $params;
+        }
+    }
+
+    // }}}
+    // {{{ doListUpgrades()
+
+    function doListUpgrades($command, $options, $params)
+    {
+        include_once "PEAR/Registry.php";
+        $remote = new PEAR_Remote($this->config);
+        if (empty($params[0])) {
+            $state = $this->config->get('preferred_state');
+        } else {
+            $state = $params[0];
+        }
+        $caption = 'Available Upgrades';
+        if (empty($state) || $state == 'any') {
+            $latest = $remote->call("package.listLatestReleases");
+        } else {
+            $latest = $remote->call("package.listLatestReleases", $state);
+            $caption .= ' (' . implode(', ', PEAR_Common::betterStates($state, true)) . ')';
+        }
+        $caption .= ':';
+        if (PEAR::isError($latest)) {
+            return $latest;
+        }
+        $reg = new PEAR_Registry($this->config->get('php_dir'));
+        $inst = array_flip($reg->listPackages());
+        $data = array(
+            'caption' => $caption,
+            'border' => 1,
+            'headline' => array('Package', 'Local', 'Remote', 'Size'),
+            );
+        foreach ((array)$latest as $pkg => $info) {
+            $package = strtolower($pkg);
+            if (!isset($inst[$package])) {
+                // skip packages we don't have installed
+                continue;
+            }
+            extract($info);
+            $pkginfo = $reg->packageInfo($package);
+            $inst_version = $pkginfo['version'];
+            $inst_state   = $pkginfo['release_state'];
+            if (version_compare("$version", "$inst_version", "le")) {
+                // installed version is up-to-date
+                continue;
+            }
+            if ($filesize >= 20480) {
+                $filesize += 1024 - ($filesize % 1024);
+                $fs = sprintf("%dkB", $filesize / 1024);
+            } elseif ($filesize > 0) {
+                $filesize += 103 - ($filesize % 103);
+                $fs = sprintf("%.1fkB", $filesize / 1024.0);
+            } else {
+                $fs = "  -"; // XXX center instead
+            }
+            $data['data'][] = array($pkg, "$inst_version ($inst_state)", "$version ($state)", $fs);
+        }
+        if (empty($data['data'])) {
+            $this->ui->outputData('No upgrades available');
+        } else {
+            $this->ui->outputData($data, $command);
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ doClearCache()
+
+    function doClearCache($command, $options, $params)
+    {
+        $cache_dir = $this->config->get('cache_dir');
+        $verbose = $this->config->get('verbose');
+        $output = '';
+        if (!($dp = @opendir($cache_dir))) {
+            return $this->raiseError("opendir($cache_dir) failed: $php_errormsg");
+        }
+        if ($verbose >= 1) {
+            $output .= "reading directory $cache_dir\n";
+        }
+        $num = 0;
+        while ($ent = readdir($dp)) {
+            if (preg_match('/^xmlrpc_cache_[a-z0-9]{32}$/', $ent)) {
+                $path = $cache_dir . DIRECTORY_SEPARATOR . $ent;
+                $ok = @unlink($path);
+                if ($ok) {
+                    if ($verbose >= 2) {
+                        $output .= "deleted $path\n";
+                    }
+                    $num++;
+                } elseif ($verbose >= 1) {
+                    $output .= "failed to delete $path\n";
+                }
+            }
+        }
+        closedir($dp);
+        if ($verbose >= 1) {
+            $output .= "$num cache entries cleared\n";
+        }
+        $this->ui->outputData(rtrim($output), $command);
+        return $num;
+    }
+
+    // }}}
+}
+
+?>
diff --git a/3rdparty/PEAR/Common.php b/3rdparty/PEAR/Common.php
new file mode 100644
index 00000000000..fba53a37799
--- /dev/null
+++ b/3rdparty/PEAR/Common.php
@@ -0,0 +1,2094 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Stig Bakken <ssb@php.net>                                   |
+// |          Tomas V.V.Cox <cox@idecnet.com>                             |
+// +----------------------------------------------------------------------+
+//
+// $Id: Common.php,v 1.126.2.2 2004/12/27 07:04:19 cellog Exp $
+
+require_once 'PEAR.php';
+require_once 'Archive/Tar.php';
+require_once 'System.php';
+require_once 'PEAR/Config.php';
+
+// {{{ constants and globals
+
+/**
+ * PEAR_Common error when an invalid PHP file is passed to PEAR_Common::analyzeSourceCode()
+ */
+define('PEAR_COMMON_ERROR_INVALIDPHP', 1);
+define('_PEAR_COMMON_PACKAGE_NAME_PREG', '[A-Za-z][a-zA-Z0-9_]+');
+define('PEAR_COMMON_PACKAGE_NAME_PREG', '/^' . _PEAR_COMMON_PACKAGE_NAME_PREG . '$/');
+
+// this should allow: 1, 1.0, 1.0RC1, 1.0dev, 1.0dev123234234234, 1.0a1, 1.0b1, 1.0pl1
+define('_PEAR_COMMON_PACKAGE_VERSION_PREG', '\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?');
+define('PEAR_COMMON_PACKAGE_VERSION_PREG', '/^' . _PEAR_COMMON_PACKAGE_VERSION_PREG . '$/i');
+
+// XXX far from perfect :-)
+define('PEAR_COMMON_PACKAGE_DOWNLOAD_PREG', '/^(' . _PEAR_COMMON_PACKAGE_NAME_PREG . ')(-([.0-9a-zA-Z]+))?$/');
+
+/**
+ * List of temporary files and directories registered by
+ * PEAR_Common::addTempFile().
+ * @var array
+ */
+$GLOBALS['_PEAR_Common_tempfiles'] = array();
+
+/**
+ * Valid maintainer roles
+ * @var array
+ */
+$GLOBALS['_PEAR_Common_maintainer_roles'] = array('lead','developer','contributor','helper');
+
+/**
+ * Valid release states
+ * @var array
+ */
+$GLOBALS['_PEAR_Common_release_states'] = array('alpha','beta','stable','snapshot','devel');
+
+/**
+ * Valid dependency types
+ * @var array
+ */
+$GLOBALS['_PEAR_Common_dependency_types'] = array('pkg','ext','php','prog','ldlib','rtlib','os','websrv','sapi');
+
+/**
+ * Valid dependency relations
+ * @var array
+ */
+$GLOBALS['_PEAR_Common_dependency_relations'] = array('has','eq','lt','le','gt','ge','not', 'ne');
+
+/**
+ * Valid file roles
+ * @var array
+ */
+$GLOBALS['_PEAR_Common_file_roles'] = array('php','ext','test','doc','data','src','script');
+
+/**
+ * Valid replacement types
+ * @var array
+ */
+$GLOBALS['_PEAR_Common_replacement_types'] = array('php-const', 'pear-config', 'package-info');
+
+/**
+ * Valid "provide" types
+ * @var array
+ */
+$GLOBALS['_PEAR_Common_provide_types'] = array('ext', 'prog', 'class', 'function', 'feature', 'api');
+
+/**
+ * Valid "provide" types
+ * @var array
+ */
+$GLOBALS['_PEAR_Common_script_phases'] = array('pre-install', 'post-install', 'pre-uninstall', 'post-uninstall', 'pre-build', 'post-build', 'pre-configure', 'post-configure', 'pre-setup', 'post-setup');
+
+// }}}
+
+/**
+ * Class providing common functionality for PEAR administration classes.
+ * @deprecated This class will disappear, and its components will be spread
+ *             into smaller classes, like the AT&T breakup
+ */
+class PEAR_Common extends PEAR
+{
+    // {{{ properties
+
+    /** stack of elements, gives some sort of XML context */
+    var $element_stack = array();
+
+    /** name of currently parsed XML element */
+    var $current_element;
+
+    /** array of attributes of the currently parsed XML element */
+    var $current_attributes = array();
+
+    /** assoc with information about a package */
+    var $pkginfo = array();
+
+    /**
+     * User Interface object (PEAR_Frontend_* class).  If null,
+     * the log() method uses print.
+     * @var object
+     */
+    var $ui = null;
+
+    /**
+     * Configuration object (PEAR_Config).
+     * @var object
+     */
+    var $config = null;
+
+    var $current_path = null;
+
+    /**
+     * PEAR_SourceAnalyzer instance
+     * @var object
+     */
+    var $source_analyzer = null;
+    /**
+     * Flag variable used to mark a valid package file
+     * @var boolean
+     * @access private
+     */
+    var $_validPackageFile;
+
+    // }}}
+
+    // {{{ constructor
+
+    /**
+     * PEAR_Common constructor
+     *
+     * @access public
+     */
+    function PEAR_Common()
+    {
+        parent::PEAR();
+        $this->config = &PEAR_Config::singleton();
+        $this->debug = $this->config->get('verbose');
+    }
+
+    // }}}
+    // {{{ destructor
+
+    /**
+     * PEAR_Common destructor
+     *
+     * @access private
+     */
+    function _PEAR_Common()
+    {
+        // doesn't work due to bug #14744
+        //$tempfiles = $this->_tempfiles;
+        $tempfiles =& $GLOBALS['_PEAR_Common_tempfiles'];
+        while ($file = array_shift($tempfiles)) {
+            if (@is_dir($file)) {
+                System::rm(array('-rf', $file));
+            } elseif (file_exists($file)) {
+                unlink($file);
+            }
+        }
+    }
+
+    // }}}
+    // {{{ addTempFile()
+
+    /**
+     * Register a temporary file or directory.  When the destructor is
+     * executed, all registered temporary files and directories are
+     * removed.
+     *
+     * @param string  $file  name of file or directory
+     *
+     * @return void
+     *
+     * @access public
+     */
+    function addTempFile($file)
+    {
+        $GLOBALS['_PEAR_Common_tempfiles'][] = $file;
+    }
+
+    // }}}
+    // {{{ mkDirHier()
+
+    /**
+     * Wrapper to System::mkDir(), creates a directory as well as
+     * any necessary parent directories.
+     *
+     * @param string  $dir  directory name
+     *
+     * @return bool TRUE on success, or a PEAR error
+     *
+     * @access public
+     */
+    function mkDirHier($dir)
+    {
+        $this->log(2, "+ create dir $dir");
+        return System::mkDir(array('-p', $dir));
+    }
+
+    // }}}
+    // {{{ log()
+
+    /**
+     * Logging method.
+     *
+     * @param int    $level  log level (0 is quiet, higher is noisier)
+     * @param string $msg    message to write to the log
+     *
+     * @return void
+     *
+     * @access public
+     */
+    function log($level, $msg, $append_crlf = true)
+    {
+        if ($this->debug >= $level) {
+            if (is_object($this->ui)) {
+                $this->ui->log($msg, $append_crlf);
+            } else {
+                print "$msg\n";
+            }
+        }
+    }
+
+    // }}}
+    // {{{ mkTempDir()
+
+    /**
+     * Create and register a temporary directory.
+     *
+     * @param string $tmpdir (optional) Directory to use as tmpdir.
+     *                       Will use system defaults (for example
+     *                       /tmp or c:\windows\temp) if not specified
+     *
+     * @return string name of created directory
+     *
+     * @access public
+     */
+    function mkTempDir($tmpdir = '')
+    {
+        if ($tmpdir) {
+            $topt = array('-t', $tmpdir);
+        } else {
+            $topt = array();
+        }
+        $topt = array_merge($topt, array('-d', 'pear'));
+        if (!$tmpdir = System::mktemp($topt)) {
+            return false;
+        }
+        $this->addTempFile($tmpdir);
+        return $tmpdir;
+    }
+
+    // }}}
+    // {{{ setFrontendObject()
+
+    /**
+     * Set object that represents the frontend to be used.
+     *
+     * @param  object Reference of the frontend object
+     * @return void
+     * @access public
+     */
+    function setFrontendObject(&$ui)
+    {
+        $this->ui = &$ui;
+    }
+
+    // }}}
+
+    // {{{ _unIndent()
+
+    /**
+     * Unindent given string (?)
+     *
+     * @param string $str The string that has to be unindented.
+     * @return string
+     * @access private
+     */
+    function _unIndent($str)
+    {
+        // remove leading newlines
+        $str = preg_replace('/^[\r\n]+/', '', $str);
+        // find whitespace at the beginning of the first line
+        $indent_len = strspn($str, " \t");
+        $indent = substr($str, 0, $indent_len);
+        $data = '';
+        // remove the same amount of whitespace from following lines
+        foreach (explode("\n", $str) as $line) {
+            if (substr($line, 0, $indent_len) == $indent) {
+                $data .= substr($line, $indent_len) . "\n";
+            }
+        }
+        return $data;
+    }
+
+    // }}}
+    // {{{ _element_start()
+
+    /**
+     * XML parser callback for starting elements.  Used while package
+     * format version is not yet known.
+     *
+     * @param resource  $xp       XML parser resource
+     * @param string    $name     name of starting element
+     * @param array     $attribs  element attributes, name => value
+     *
+     * @return void
+     *
+     * @access private
+     */
+    function _element_start($xp, $name, $attribs)
+    {
+        array_push($this->element_stack, $name);
+        $this->current_element = $name;
+        $spos = sizeof($this->element_stack) - 2;
+        $this->prev_element = ($spos >= 0) ? $this->element_stack[$spos] : '';
+        $this->current_attributes = $attribs;
+        switch ($name) {
+            case 'package': {
+                $this->_validPackageFile = true;
+                if (isset($attribs['version'])) {
+                    $vs = preg_replace('/[^0-9a-z]/', '_', $attribs['version']);
+                } else {
+                    $vs = '1_0';
+                }
+                $elem_start = '_element_start_'. $vs;
+                $elem_end = '_element_end_'. $vs;
+                $cdata = '_pkginfo_cdata_'. $vs;
+                if (!method_exists($this, $elem_start) ||
+                      !method_exists($this, $elem_end) ||
+                      !method_exists($this, $cdata)) {
+                    $this->raiseError("No handlers for package.xml version $attribs[version]");
+                    return;
+                }
+                xml_set_element_handler($xp, $elem_start, $elem_end);
+                xml_set_character_data_handler($xp, $cdata);
+                break;
+            }
+        }
+    }
+
+    // }}}
+    // {{{ _element_end()
+
+    /**
+     * XML parser callback for ending elements.  Used while package
+     * format version is not yet known.
+     *
+     * @param resource  $xp    XML parser resource
+     * @param string    $name  name of ending element
+     *
+     * @return void
+     *
+     * @access private
+     */
+    function _element_end($xp, $name)
+    {
+    }
+
+    // }}}
+
+    // Support for package DTD v1.0:
+    // {{{ _element_start_1_0()
+
+    /**
+     * XML parser callback for ending elements.  Used for version 1.0
+     * packages.
+     *
+     * @param resource  $xp    XML parser resource
+     * @param string    $name  name of ending element
+     *
+     * @return void
+     *
+     * @access private
+     */
+    function _element_start_1_0($xp, $name, $attribs)
+    {
+        array_push($this->element_stack, $name);
+        $this->current_element = $name;
+        $spos = sizeof($this->element_stack) - 2;
+        $this->prev_element = ($spos >= 0) ? $this->element_stack[$spos] : '';
+        $this->current_attributes = $attribs;
+        $this->cdata = '';
+        switch ($name) {
+            case 'dir':
+                if ($this->in_changelog) {
+                    break;
+                }
+                if ($attribs['name'] != '/') {
+                    $this->dir_names[] = $attribs['name'];
+                }
+                if (isset($attribs['baseinstalldir'])) {
+                    $this->dir_install = $attribs['baseinstalldir'];
+                }
+                if (isset($attribs['role'])) {
+                    $this->dir_role = $attribs['role'];
+                }
+                break;
+            case 'file':
+                if ($this->in_changelog) {
+                    break;
+                }
+                if (isset($attribs['name'])) {
+                    $path = '';
+                    if (count($this->dir_names)) {
+                        foreach ($this->dir_names as $dir) {
+                            $path .= $dir . DIRECTORY_SEPARATOR;
+                        }
+                    }
+                    $path .= $attribs['name'];
+                    unset($attribs['name']);
+                    $this->current_path = $path;
+                    $this->filelist[$path] = $attribs;
+                    // Set the baseinstalldir only if the file don't have this attrib
+                    if (!isset($this->filelist[$path]['baseinstalldir']) &&
+                        isset($this->dir_install))
+                    {
+                        $this->filelist[$path]['baseinstalldir'] = $this->dir_install;
+                    }
+                    // Set the Role
+                    if (!isset($this->filelist[$path]['role']) && isset($this->dir_role)) {
+                        $this->filelist[$path]['role'] = $this->dir_role;
+                    }
+                }
+                break;
+            case 'replace':
+                if (!$this->in_changelog) {
+                    $this->filelist[$this->current_path]['replacements'][] = $attribs;
+                }
+                break;
+            case 'maintainers':
+                $this->pkginfo['maintainers'] = array();
+                $this->m_i = 0; // maintainers array index
+                break;
+            case 'maintainer':
+                // compatibility check
+                if (!isset($this->pkginfo['maintainers'])) {
+                    $this->pkginfo['maintainers'] = array();
+                    $this->m_i = 0;
+                }
+                $this->pkginfo['maintainers'][$this->m_i] = array();
+                $this->current_maintainer =& $this->pkginfo['maintainers'][$this->m_i];
+                break;
+            case 'changelog':
+                $this->pkginfo['changelog'] = array();
+                $this->c_i = 0; // changelog array index
+                $this->in_changelog = true;
+                break;
+            case 'release':
+                if ($this->in_changelog) {
+                    $this->pkginfo['changelog'][$this->c_i] = array();
+                    $this->current_release = &$this->pkginfo['changelog'][$this->c_i];
+                } else {
+                    $this->current_release = &$this->pkginfo;
+                }
+                break;
+            case 'deps':
+                if (!$this->in_changelog) {
+                    $this->pkginfo['release_deps'] = array();
+                }
+                break;
+            case 'dep':
+                // dependencies array index
+                if (!$this->in_changelog) {
+                    $this->d_i++;
+                    $this->pkginfo['release_deps'][$this->d_i] = $attribs;
+                }
+                break;
+            case 'configureoptions':
+                if (!$this->in_changelog) {
+                    $this->pkginfo['configure_options'] = array();
+                }
+                break;
+            case 'configureoption':
+                if (!$this->in_changelog) {
+                    $this->pkginfo['configure_options'][] = $attribs;
+                }
+                break;
+            case 'provides':
+                if (empty($attribs['type']) || empty($attribs['name'])) {
+                    break;
+                }
+                $attribs['explicit'] = true;
+                $this->pkginfo['provides']["$attribs[type];$attribs[name]"] = $attribs;
+                break;
+        }
+    }
+
+    // }}}
+    // {{{ _element_end_1_0()
+
+    /**
+     * XML parser callback for ending elements.  Used for version 1.0
+     * packages.
+     *
+     * @param resource  $xp    XML parser resource
+     * @param string    $name  name of ending element
+     *
+     * @return void
+     *
+     * @access private
+     */
+    function _element_end_1_0($xp, $name)
+    {
+        $data = trim($this->cdata);
+        switch ($name) {
+            case 'name':
+                switch ($this->prev_element) {
+                    case 'package':
+                        // XXX should we check the package name here?
+                        $this->pkginfo['package'] = ereg_replace('[^a-zA-Z0-9._]', '_', $data);
+                        break;
+                    case 'maintainer':
+                        $this->current_maintainer['name'] = $data;
+                        break;
+                }
+                break;
+            case 'summary':
+                $this->pkginfo['summary'] = $data;
+                break;
+            case 'description':
+                $data = $this->_unIndent($this->cdata);
+                $this->pkginfo['description'] = $data;
+                break;
+            case 'user':
+                $this->current_maintainer['handle'] = $data;
+                break;
+            case 'email':
+                $this->current_maintainer['email'] = $data;
+                break;
+            case 'role':
+                $this->current_maintainer['role'] = $data;
+                break;
+            case 'version':
+                $data = ereg_replace ('[^a-zA-Z0-9._\-]', '_', $data);
+                if ($this->in_changelog) {
+                    $this->current_release['version'] = $data;
+                } else {
+                    $this->pkginfo['version'] = $data;
+                }
+                break;
+            case 'date':
+                if ($this->in_changelog) {
+                    $this->current_release['release_date'] = $data;
+                } else {
+                    $this->pkginfo['release_date'] = $data;
+                }
+                break;
+            case 'notes':
+                // try to "de-indent" release notes in case someone
+                // has been over-indenting their xml ;-)
+                $data = $this->_unIndent($this->cdata);
+                if ($this->in_changelog) {
+                    $this->current_release['release_notes'] = $data;
+                } else {
+                    $this->pkginfo['release_notes'] = $data;
+                }
+                break;
+            case 'warnings':
+                if ($this->in_changelog) {
+                    $this->current_release['release_warnings'] = $data;
+                } else {
+                    $this->pkginfo['release_warnings'] = $data;
+                }
+                break;
+            case 'state':
+                if ($this->in_changelog) {
+                    $this->current_release['release_state'] = $data;
+                } else {
+                    $this->pkginfo['release_state'] = $data;
+                }
+                break;
+            case 'license':
+                if ($this->in_changelog) {
+                    $this->current_release['release_license'] = $data;
+                } else {
+                    $this->pkginfo['release_license'] = $data;
+                }
+                break;
+            case 'dep':
+                if ($data && !$this->in_changelog) {
+                    $this->pkginfo['release_deps'][$this->d_i]['name'] = $data;
+                }
+                break;
+            case 'dir':
+                if ($this->in_changelog) {
+                    break;
+                }
+                array_pop($this->dir_names);
+                break;
+            case 'file':
+                if ($this->in_changelog) {
+                    break;
+                }
+                if ($data) {
+                    $path = '';
+                    if (count($this->dir_names)) {
+                        foreach ($this->dir_names as $dir) {
+                            $path .= $dir . DIRECTORY_SEPARATOR;
+                        }
+                    }
+                    $path .= $data;
+                    $this->filelist[$path] = $this->current_attributes;
+                    // Set the baseinstalldir only if the file don't have this attrib
+                    if (!isset($this->filelist[$path]['baseinstalldir']) &&
+                        isset($this->dir_install))
+                    {
+                        $this->filelist[$path]['baseinstalldir'] = $this->dir_install;
+                    }
+                    // Set the Role
+                    if (!isset($this->filelist[$path]['role']) && isset($this->dir_role)) {
+                        $this->filelist[$path]['role'] = $this->dir_role;
+                    }
+                }
+                break;
+            case 'maintainer':
+                if (empty($this->pkginfo['maintainers'][$this->m_i]['role'])) {
+                    $this->pkginfo['maintainers'][$this->m_i]['role'] = 'lead';
+                }
+                $this->m_i++;
+                break;
+            case 'release':
+                if ($this->in_changelog) {
+                    $this->c_i++;
+                }
+                break;
+            case 'changelog':
+                $this->in_changelog = false;
+                break;
+        }
+        array_pop($this->element_stack);
+        $spos = sizeof($this->element_stack) - 1;
+        $this->current_element = ($spos > 0) ? $this->element_stack[$spos] : '';
+        $this->cdata = '';
+    }
+
+    // }}}
+    // {{{ _pkginfo_cdata_1_0()
+
+    /**
+     * XML parser callback for character data.  Used for version 1.0
+     * packages.
+     *
+     * @param resource  $xp    XML parser resource
+     * @param string    $name  character data
+     *
+     * @return void
+     *
+     * @access private
+     */
+    function _pkginfo_cdata_1_0($xp, $data)
+    {
+        if (isset($this->cdata)) {
+            $this->cdata .= $data;
+        }
+    }
+
+    // }}}
+
+    // {{{ infoFromTgzFile()
+
+    /**
+     * Returns information about a package file.  Expects the name of
+     * a gzipped tar file as input.
+     *
+     * @param string  $file  name of .tgz file
+     *
+     * @return array  array with package information
+     *
+     * @access public
+     *
+     */
+    function infoFromTgzFile($file)
+    {
+        if (!@is_file($file)) {
+            return $this->raiseError("could not open file \"$file\"");
+        }
+        $tar = new Archive_Tar($file);
+        if ($this->debug <= 1) {
+            $tar->pushErrorHandling(PEAR_ERROR_RETURN);
+        }
+        $content = $tar->listContent();
+        if ($this->debug <= 1) {
+            $tar->popErrorHandling();
+        }
+        if (!is_array($content)) {
+            $file = realpath($file);
+            return $this->raiseError("Could not get contents of package \"$file\"".
+                                     '. Invalid tgz file.');
+        }
+        $xml = null;
+        foreach ($content as $file) {
+            $name = $file['filename'];
+            if ($name == 'package.xml') {
+                $xml = $name;
+                break;
+            } elseif (ereg('package.xml$', $name, $match)) {
+                $xml = $match[0];
+                break;
+            }
+        }
+        $tmpdir = System::mkTemp(array('-d', 'pear'));
+        $this->addTempFile($tmpdir);
+        if (!$xml || !$tar->extractList(array($xml), $tmpdir)) {
+            return $this->raiseError('could not extract the package.xml file');
+        }
+        return $this->infoFromDescriptionFile("$tmpdir/$xml");
+    }
+
+    // }}}
+    // {{{ infoFromDescriptionFile()
+
+    /**
+     * Returns information about a package file.  Expects the name of
+     * a package xml file as input.
+     *
+     * @param string  $descfile  name of package xml file
+     *
+     * @return array  array with package information
+     *
+     * @access public
+     *
+     */
+    function infoFromDescriptionFile($descfile)
+    {
+        if (!@is_file($descfile) || !is_readable($descfile) ||
+             (!$fp = @fopen($descfile, 'r'))) {
+            return $this->raiseError("Unable to open $descfile");
+        }
+
+        // read the whole thing so we only get one cdata callback
+        // for each block of cdata
+        $data = fread($fp, filesize($descfile));
+        return $this->infoFromString($data);
+    }
+
+    // }}}
+    // {{{ infoFromString()
+
+    /**
+     * Returns information about a package file.  Expects the contents
+     * of a package xml file as input.
+     *
+     * @param string  $data  name of package xml file
+     *
+     * @return array   array with package information
+     *
+     * @access public
+     *
+     */
+    function infoFromString($data)
+    {
+        require_once('PEAR/Dependency.php');
+        if (PEAR_Dependency::checkExtension($error, 'xml')) {
+            return $this->raiseError($error);
+        }
+        $xp = @xml_parser_create();
+        if (!$xp) {
+            return $this->raiseError('Unable to create XML parser');
+        }
+        xml_set_object($xp, $this);
+        xml_set_element_handler($xp, '_element_start', '_element_end');
+        xml_set_character_data_handler($xp, '_pkginfo_cdata');
+        xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, false);
+
+        $this->element_stack = array();
+        $this->pkginfo = array('provides' => array());
+        $this->current_element = false;
+        unset($this->dir_install);
+        $this->pkginfo['filelist'] = array();
+        $this->filelist =& $this->pkginfo['filelist'];
+        $this->dir_names = array();
+        $this->in_changelog = false;
+        $this->d_i = 0;
+        $this->cdata = '';
+        $this->_validPackageFile = false;
+
+        if (!xml_parse($xp, $data, 1)) {
+            $code = xml_get_error_code($xp);
+            $msg = sprintf("XML error: %s at line %d",
+                           xml_error_string($code),
+                           xml_get_current_line_number($xp));
+            xml_parser_free($xp);
+            return $this->raiseError($msg, $code);
+        }
+
+        xml_parser_free($xp);
+
+        if (!$this->_validPackageFile) {
+            return $this->raiseError('Invalid Package File, no <package> tag');
+        }
+        foreach ($this->pkginfo as $k => $v) {
+            if (!is_array($v)) {
+                $this->pkginfo[$k] = trim($v);
+            }
+        }
+        return $this->pkginfo;
+    }
+    // }}}
+    // {{{ infoFromAny()
+
+    /**
+     * Returns package information from different sources
+     *
+     * This method is able to extract information about a package
+     * from a .tgz archive or from a XML package definition file.
+     *
+     * @access public
+     * @param  string Filename of the source ('package.xml', '<package>.tgz')
+     * @return string
+     */
+    function infoFromAny($info)
+    {
+        if (is_string($info) && file_exists($info)) {
+            $tmp = substr($info, -4);
+            if ($tmp == '.xml') {
+                $info = $this->infoFromDescriptionFile($info);
+            } elseif ($tmp == '.tar' || $tmp == '.tgz') {
+                $info = $this->infoFromTgzFile($info);
+            } else {
+                $fp = fopen($info, "r");
+                $test = fread($fp, 5);
+                fclose($fp);
+                if ($test == "<?xml") {
+                    $info = $this->infoFromDescriptionFile($info);
+                } else {
+                    $info = $this->infoFromTgzFile($info);
+                }
+            }
+            if (PEAR::isError($info)) {
+                return $this->raiseError($info);
+            }
+        }
+        return $info;
+    }
+
+    // }}}
+    // {{{ xmlFromInfo()
+
+    /**
+     * Return an XML document based on the package info (as returned
+     * by the PEAR_Common::infoFrom* methods).
+     *
+     * @param array  $pkginfo  package info
+     *
+     * @return string XML data
+     *
+     * @access public
+     */
+    function xmlFromInfo($pkginfo)
+    {
+        static $maint_map = array(
+            "handle" => "user",
+            "name" => "name",
+            "email" => "email",
+            "role" => "role",
+            );
+        $ret = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>\n";
+        $ret .= "<!DOCTYPE package SYSTEM \"http://pear.php.net/dtd/package-1.0\">\n";
+        $ret .= "<package version=\"1.0\">
+  <name>$pkginfo[package]</name>
+  <summary>".htmlspecialchars($pkginfo['summary'])."</summary>
+  <description>".htmlspecialchars($pkginfo['description'])."</description>
+  <maintainers>
+";
+        foreach ($pkginfo['maintainers'] as $maint) {
+            $ret .= "    <maintainer>\n";
+            foreach ($maint_map as $idx => $elm) {
+                $ret .= "      <$elm>";
+                $ret .= htmlspecialchars($maint[$idx]);
+                $ret .= "</$elm>\n";
+            }
+            $ret .= "    </maintainer>\n";
+        }
+        $ret .= "  </maintainers>\n";
+        $ret .= $this->_makeReleaseXml($pkginfo);
+        if (@sizeof($pkginfo['changelog']) > 0) {
+            $ret .= "  <changelog>\n";
+            foreach ($pkginfo['changelog'] as $oldrelease) {
+                $ret .= $this->_makeReleaseXml($oldrelease, true);
+            }
+            $ret .= "  </changelog>\n";
+        }
+        $ret .= "</package>\n";
+        return $ret;
+    }
+
+    // }}}
+    // {{{ _makeReleaseXml()
+
+    /**
+     * Generate part of an XML description with release information.
+     *
+     * @param array  $pkginfo    array with release information
+     * @param bool   $changelog  whether the result will be in a changelog element
+     *
+     * @return string XML data
+     *
+     * @access private
+     */
+    function _makeReleaseXml($pkginfo, $changelog = false)
+    {
+        // XXX QUOTE ENTITIES IN PCDATA, OR EMBED IN CDATA BLOCKS!!
+        $indent = $changelog ? "  " : "";
+        $ret = "$indent  <release>\n";
+        if (!empty($pkginfo['version'])) {
+            $ret .= "$indent    <version>$pkginfo[version]</version>\n";
+        }
+        if (!empty($pkginfo['release_date'])) {
+            $ret .= "$indent    <date>$pkginfo[release_date]</date>\n";
+        }
+        if (!empty($pkginfo['release_license'])) {
+            $ret .= "$indent    <license>$pkginfo[release_license]</license>\n";
+        }
+        if (!empty($pkginfo['release_state'])) {
+            $ret .= "$indent    <state>$pkginfo[release_state]</state>\n";
+        }
+        if (!empty($pkginfo['release_notes'])) {
+            $ret .= "$indent    <notes>".htmlspecialchars($pkginfo['release_notes'])."</notes>\n";
+        }
+        if (!empty($pkginfo['release_warnings'])) {
+            $ret .= "$indent    <warnings>".htmlspecialchars($pkginfo['release_warnings'])."</warnings>\n";
+        }
+        if (isset($pkginfo['release_deps']) && sizeof($pkginfo['release_deps']) > 0) {
+            $ret .= "$indent    <deps>\n";
+            foreach ($pkginfo['release_deps'] as $dep) {
+                $ret .= "$indent      <dep type=\"$dep[type]\" rel=\"$dep[rel]\"";
+                if (isset($dep['version'])) {
+                    $ret .= " version=\"$dep[version]\"";
+                }
+                if (isset($dep['optional'])) {
+                    $ret .= " optional=\"$dep[optional]\"";
+                }
+                if (isset($dep['name'])) {
+                    $ret .= ">$dep[name]</dep>\n";
+                } else {
+                    $ret .= "/>\n";
+                }
+            }
+            $ret .= "$indent    </deps>\n";
+        }
+        if (isset($pkginfo['configure_options'])) {
+            $ret .= "$indent    <configureoptions>\n";
+            foreach ($pkginfo['configure_options'] as $c) {
+                $ret .= "$indent      <configureoption name=\"".
+                    htmlspecialchars($c['name']) . "\"";
+                if (isset($c['default'])) {
+                    $ret .= " default=\"" . htmlspecialchars($c['default']) . "\"";
+                }
+                $ret .= " prompt=\"" . htmlspecialchars($c['prompt']) . "\"";
+                $ret .= "/>\n";
+            }
+            $ret .= "$indent    </configureoptions>\n";
+        }
+        if (isset($pkginfo['provides'])) {
+            foreach ($pkginfo['provides'] as $key => $what) {
+                $ret .= "$indent    <provides type=\"$what[type]\" ";
+                $ret .= "name=\"$what[name]\" ";
+                if (isset($what['extends'])) {
+                    $ret .= "extends=\"$what[extends]\" ";
+                }
+                $ret .= "/>\n";
+            }
+        }
+        if (isset($pkginfo['filelist'])) {
+            $ret .= "$indent    <filelist>\n";
+            foreach ($pkginfo['filelist'] as $file => $fa) {
+                @$ret .= "$indent      <file role=\"$fa[role]\"";
+                if (isset($fa['baseinstalldir'])) {
+                    $ret .= ' baseinstalldir="' .
+                        htmlspecialchars($fa['baseinstalldir']) . '"';
+                }
+                if (isset($fa['md5sum'])) {
+                    $ret .= " md5sum=\"$fa[md5sum]\"";
+                }
+                if (isset($fa['platform'])) {
+                    $ret .= " platform=\"$fa[platform]\"";
+                }
+                if (!empty($fa['install-as'])) {
+                    $ret .= ' install-as="' .
+                        htmlspecialchars($fa['install-as']) . '"';
+                }
+                $ret .= ' name="' . htmlspecialchars($file) . '"';
+                if (empty($fa['replacements'])) {
+                    $ret .= "/>\n";
+                } else {
+                    $ret .= ">\n";
+                    foreach ($fa['replacements'] as $r) {
+                        $ret .= "$indent        <replace";
+                        foreach ($r as $k => $v) {
+                            $ret .= " $k=\"" . htmlspecialchars($v) .'"';
+                        }
+                        $ret .= "/>\n";
+                    }
+                    @$ret .= "$indent      </file>\n";
+                }
+            }
+            $ret .= "$indent    </filelist>\n";
+        }
+        $ret .= "$indent  </release>\n";
+        return $ret;
+    }
+
+    // }}}
+    // {{{ validatePackageInfo()
+
+    /**
+     * Validate XML package definition file.
+     *
+     * @param  string $info Filename of the package archive or of the
+     *                package definition file
+     * @param  array $errors Array that will contain the errors
+     * @param  array $warnings Array that will contain the warnings
+     * @param  string $dir_prefix (optional) directory where source files
+     *                may be found, or empty if they are not available
+     * @access public
+     * @return boolean
+     */
+    function validatePackageInfo($info, &$errors, &$warnings, $dir_prefix = '')
+    {
+        if (PEAR::isError($info = $this->infoFromAny($info))) {
+            return $this->raiseError($info);
+        }
+        if (!is_array($info)) {
+            return false;
+        }
+
+        $errors = array();
+        $warnings = array();
+        if (!isset($info['package'])) {
+            $errors[] = 'missing package name';
+        } elseif (!$this->validPackageName($info['package'])) {
+            $errors[] = 'invalid package name';
+        }
+        $this->_packageName = $pn = $info['package'];
+
+        if (empty($info['summary'])) {
+            $errors[] = 'missing summary';
+        } elseif (strpos(trim($info['summary']), "\n") !== false) {
+            $warnings[] = 'summary should be on a single line';
+        }
+        if (empty($info['description'])) {
+            $errors[] = 'missing description';
+        }
+        if (empty($info['release_license'])) {
+            $errors[] = 'missing license';
+        }
+        if (!isset($info['version'])) {
+            $errors[] = 'missing version';
+        } elseif (!$this->validPackageVersion($info['version'])) {
+            $errors[] = 'invalid package release version';
+        }
+        if (empty($info['release_state'])) {
+            $errors[] = 'missing release state';
+        } elseif (!in_array($info['release_state'], PEAR_Common::getReleaseStates())) {
+            $errors[] = "invalid release state `$info[release_state]', should be one of: "
+                . implode(' ', PEAR_Common::getReleaseStates());
+        }
+        if (empty($info['release_date'])) {
+            $errors[] = 'missing release date';
+        } elseif (!preg_match('/^\d{4}-\d\d-\d\d$/', $info['release_date'])) {
+            $errors[] = "invalid release date `$info[release_date]', format is YYYY-MM-DD";
+        }
+        if (empty($info['release_notes'])) {
+            $errors[] = "missing release notes";
+        }
+        if (empty($info['maintainers'])) {
+            $errors[] = 'no maintainer(s)';
+        } else {
+            $i = 1;
+            foreach ($info['maintainers'] as $m) {
+                if (empty($m['handle'])) {
+                    $errors[] = "maintainer $i: missing handle";
+                }
+                if (empty($m['role'])) {
+                    $errors[] = "maintainer $i: missing role";
+                } elseif (!in_array($m['role'], PEAR_Common::getUserRoles())) {
+                    $errors[] = "maintainer $i: invalid role `$m[role]', should be one of: "
+                        . implode(' ', PEAR_Common::getUserRoles());
+                }
+                if (empty($m['name'])) {
+                    $errors[] = "maintainer $i: missing name";
+                }
+                if (empty($m['email'])) {
+                    $errors[] = "maintainer $i: missing email";
+                }
+                $i++;
+            }
+        }
+        if (!empty($info['release_deps'])) {
+            $i = 1;
+            foreach ($info['release_deps'] as $d) {
+                if (empty($d['type'])) {
+                    $errors[] = "dependency $i: missing type";
+                } elseif (!in_array($d['type'], PEAR_Common::getDependencyTypes())) {
+                    $errors[] = "dependency $i: invalid type '$d[type]', should be one of: " .
+                        implode(' ', PEAR_Common::getDependencyTypes());
+                }
+                if (empty($d['rel'])) {
+                    $errors[] = "dependency $i: missing relation";
+                } elseif (!in_array($d['rel'], PEAR_Common::getDependencyRelations())) {
+                    $errors[] = "dependency $i: invalid relation '$d[rel]', should be one of: "
+                        . implode(' ', PEAR_Common::getDependencyRelations());
+                }
+                if (!empty($d['optional'])) {
+                    if (!in_array($d['optional'], array('yes', 'no'))) {
+                        $errors[] = "dependency $i: invalid relation optional attribute '$d[optional]', should be one of: yes no";
+                    } else {
+                        if (($d['rel'] == 'not' || $d['rel'] == 'ne') && $d['optional'] == 'yes') {
+                            $errors[] = "dependency $i: 'not' and 'ne' dependencies cannot be " .
+                                "optional";
+                        }
+                    }
+                }
+                if ($d['rel'] != 'not' && $d['rel'] != 'has' && empty($d['version'])) {
+                    $warnings[] = "dependency $i: missing version";
+                } elseif (($d['rel'] == 'not' || $d['rel'] == 'has') && !empty($d['version'])) {
+                    $warnings[] = "dependency $i: version ignored for `$d[rel]' dependencies";
+                }
+                if ($d['rel'] == 'not' && !empty($d['version'])) {
+                    $warnings[] = "dependency $i: 'not' defines a total conflict, to exclude " .
+                        "specific versions, use 'ne'";
+                }
+                if ($d['type'] == 'php' && !empty($d['name'])) {
+                    $warnings[] = "dependency $i: name ignored for php type dependencies";
+                } elseif ($d['type'] != 'php' && empty($d['name'])) {
+                    $errors[] = "dependency $i: missing name";
+                }
+                if ($d['type'] == 'php' && $d['rel'] == 'not') {
+                    $errors[] = "dependency $i: PHP dependencies cannot use 'not' " .
+                        "rel, use 'ne' to exclude versions";
+                }
+                $i++;
+            }
+        }
+        if (!empty($info['configure_options'])) {
+            $i = 1;
+            foreach ($info['configure_options'] as $c) {
+                if (empty($c['name'])) {
+                    $errors[] = "configure option $i: missing name";
+                }
+                if (empty($c['prompt'])) {
+                    $errors[] = "configure option $i: missing prompt";
+                }
+                $i++;
+            }
+        }
+        if (empty($info['filelist'])) {
+            $errors[] = 'no files';
+        } else {
+            foreach ($info['filelist'] as $file => $fa) {
+                if (empty($fa['role'])) {
+                    $errors[] = "file $file: missing role";
+                    continue;
+                } elseif (!in_array($fa['role'], PEAR_Common::getFileRoles())) {
+                    $errors[] = "file $file: invalid role, should be one of: "
+                        . implode(' ', PEAR_Common::getFileRoles());
+                }
+                if ($fa['role'] == 'php' && $dir_prefix) {
+                    $this->log(1, "Analyzing $file");
+                    $srcinfo = $this->analyzeSourceCode($dir_prefix . DIRECTORY_SEPARATOR . $file);
+                    if ($srcinfo) {
+                        $this->buildProvidesArray($srcinfo);
+                    }
+                }
+
+                // (ssb) Any checks we can do for baseinstalldir?
+                // (cox) Perhaps checks that either the target dir and
+                //       baseInstall doesn't cointain "../../"
+            }
+        }
+        $this->_packageName = $pn = $info['package'];
+        $pnl = strlen($pn);
+        foreach ((array)$this->pkginfo['provides'] as $key => $what) {
+            if (isset($what['explicit'])) {
+                // skip conformance checks if the provides entry is
+                // specified in the package.xml file
+                continue;
+            }
+            extract($what);
+            if ($type == 'class') {
+                if (!strncasecmp($name, $pn, $pnl)) {
+                    continue;
+                }
+                $warnings[] = "in $file: class \"$name\" not prefixed with package name \"$pn\"";
+            } elseif ($type == 'function') {
+                if (strstr($name, '::') || !strncasecmp($name, $pn, $pnl)) {
+                    continue;
+                }
+                $warnings[] = "in $file: function \"$name\" not prefixed with package name \"$pn\"";
+            }
+        }
+
+
+        return true;
+    }
+
+    // }}}
+    // {{{ buildProvidesArray()
+
+    /**
+     * Build a "provides" array from data returned by
+     * analyzeSourceCode().  The format of the built array is like
+     * this:
+     *
+     *  array(
+     *    'class;MyClass' => 'array('type' => 'class', 'name' => 'MyClass'),
+     *    ...
+     *  )
+     *
+     *
+     * @param array $srcinfo array with information about a source file
+     * as returned by the analyzeSourceCode() method.
+     *
+     * @return void
+     *
+     * @access public
+     *
+     */
+    function buildProvidesArray($srcinfo)
+    {
+        $file = basename($srcinfo['source_file']);
+        $pn = '';
+        if (isset($this->_packageName)) {
+            $pn = $this->_packageName;
+        }
+        $pnl = strlen($pn);
+        foreach ($srcinfo['declared_classes'] as $class) {
+            $key = "class;$class";
+            if (isset($this->pkginfo['provides'][$key])) {
+                continue;
+            }
+            $this->pkginfo['provides'][$key] =
+                array('file'=> $file, 'type' => 'class', 'name' => $class);
+            if (isset($srcinfo['inheritance'][$class])) {
+                $this->pkginfo['provides'][$key]['extends'] =
+                    $srcinfo['inheritance'][$class];
+            }
+        }
+        foreach ($srcinfo['declared_methods'] as $class => $methods) {
+            foreach ($methods as $method) {
+                $function = "$class::$method";
+                $key = "function;$function";
+                if ($method{0} == '_' || !strcasecmp($method, $class) ||
+                    isset($this->pkginfo['provides'][$key])) {
+                    continue;
+                }
+                $this->pkginfo['provides'][$key] =
+                    array('file'=> $file, 'type' => 'function', 'name' => $function);
+            }
+        }
+
+        foreach ($srcinfo['declared_functions'] as $function) {
+            $key = "function;$function";
+            if ($function{0} == '_' || isset($this->pkginfo['provides'][$key])) {
+                continue;
+            }
+            if (!strstr($function, '::') && strncasecmp($function, $pn, $pnl)) {
+                $warnings[] = "in1 " . $file . ": function \"$function\" not prefixed with package name \"$pn\"";
+            }
+            $this->pkginfo['provides'][$key] =
+                array('file'=> $file, 'type' => 'function', 'name' => $function);
+        }
+    }
+
+    // }}}
+    // {{{ analyzeSourceCode()
+
+    /**
+     * Analyze the source code of the given PHP file
+     *
+     * @param  string Filename of the PHP file
+     * @return mixed
+     * @access public
+     */
+    function analyzeSourceCode($file)
+    {
+        if (!function_exists("token_get_all")) {
+            return false;
+        }
+        if (!defined('T_DOC_COMMENT')) {
+            define('T_DOC_COMMENT', T_COMMENT);
+        }
+        if (!defined('T_INTERFACE')) {
+            define('T_INTERFACE', -1);
+        }
+        if (!defined('T_IMPLEMENTS')) {
+            define('T_IMPLEMENTS', -1);
+        }
+        if (!$fp = @fopen($file, "r")) {
+            return false;
+        }
+        $contents = fread($fp, filesize($file));
+        $tokens = token_get_all($contents);
+/*
+        for ($i = 0; $i < sizeof($tokens); $i++) {
+            @list($token, $data) = $tokens[$i];
+            if (is_string($token)) {
+                var_dump($token);
+            } else {
+                print token_name($token) . ' ';
+                var_dump(rtrim($data));
+            }
+        }
+*/
+        $look_for = 0;
+        $paren_level = 0;
+        $bracket_level = 0;
+        $brace_level = 0;
+        $lastphpdoc = '';
+        $current_class = '';
+        $current_interface = '';
+        $current_class_level = -1;
+        $current_function = '';
+        $current_function_level = -1;
+        $declared_classes = array();
+        $declared_interfaces = array();
+        $declared_functions = array();
+        $declared_methods = array();
+        $used_classes = array();
+        $used_functions = array();
+        $extends = array();
+        $implements = array();
+        $nodeps = array();
+        $inquote = false;
+        $interface = false;
+        for ($i = 0; $i < sizeof($tokens); $i++) {
+            if (is_array($tokens[$i])) {
+                list($token, $data) = $tokens[$i];
+            } else {
+                $token = $tokens[$i];
+                $data = '';
+            }
+            if ($inquote) {
+                if ($token != '"') {
+                    continue;
+                } else {
+                    $inquote = false;
+                }
+            }
+            switch ($token) {
+                case T_WHITESPACE:
+                    continue;
+                case ';':
+                    if ($interface) {
+                        $current_function = '';
+                        $current_function_level = -1;
+                    }
+                    break;
+                case '"':
+                    $inquote = true;
+                    break;
+                case T_CURLY_OPEN:
+                case T_DOLLAR_OPEN_CURLY_BRACES:
+                case '{': $brace_level++; continue 2;
+                case '}':
+                    $brace_level--;
+                    if ($current_class_level == $brace_level) {
+                        $current_class = '';
+                        $current_class_level = -1;
+                    }
+                    if ($current_function_level == $brace_level) {
+                        $current_function = '';
+                        $current_function_level = -1;
+                    }
+                    continue 2;
+                case '[': $bracket_level++; continue 2;
+                case ']': $bracket_level--; continue 2;
+                case '(': $paren_level++;   continue 2;
+                case ')': $paren_level--;   continue 2;
+                case T_INTERFACE:
+                    $interface = true;
+                case T_CLASS:
+                    if (($current_class_level != -1) || ($current_function_level != -1)) {
+                        PEAR::raiseError("Parser error: Invalid PHP file $file",
+                            PEAR_COMMON_ERROR_INVALIDPHP);
+                        return false;
+                    }
+                case T_FUNCTION:
+                case T_NEW:
+                case T_EXTENDS:
+                case T_IMPLEMENTS:
+                    $look_for = $token;
+                    continue 2;
+                case T_STRING:
+                    if (version_compare(zend_version(), '2.0', '<')) {
+                        if (in_array(strtolower($data),
+                            array('public', 'private', 'protected', 'abstract',
+                                  'interface', 'implements', 'clone', 'throw') 
+                                 )) {
+                            PEAR::raiseError('Error: PHP5 packages must be packaged by php 5 PEAR');
+                            return false;
+                        }
+                    }
+                    if ($look_for == T_CLASS) {
+                        $current_class = $data;
+                        $current_class_level = $brace_level;
+                        $declared_classes[] = $current_class;
+                    } elseif ($look_for == T_INTERFACE) {
+                        $current_interface = $data;
+                        $current_class_level = $brace_level;
+                        $declared_interfaces[] = $current_interface;
+                    } elseif ($look_for == T_IMPLEMENTS) {
+                        $implements[$current_class] = $data;
+                    } elseif ($look_for == T_EXTENDS) {
+                        $extends[$current_class] = $data;
+                    } elseif ($look_for == T_FUNCTION) {
+                        if ($current_class) {
+                            $current_function = "$current_class::$data";
+                            $declared_methods[$current_class][] = $data;
+                        } elseif ($current_interface) {
+                            $current_function = "$current_interface::$data";
+                            $declared_methods[$current_interface][] = $data;
+                        } else {
+                            $current_function = $data;
+                            $declared_functions[] = $current_function;
+                        }
+                        $current_function_level = $brace_level;
+                        $m = array();
+                    } elseif ($look_for == T_NEW) {
+                        $used_classes[$data] = true;
+                    }
+                    $look_for = 0;
+                    continue 2;
+                case T_VARIABLE:
+                    $look_for = 0;
+                    continue 2;
+                case T_DOC_COMMENT:
+                case T_COMMENT:
+                    if (preg_match('!^/\*\*\s!', $data)) {
+                        $lastphpdoc = $data;
+                        if (preg_match_all('/@nodep\s+(\S+)/', $lastphpdoc, $m)) {
+                            $nodeps = array_merge($nodeps, $m[1]);
+                        }
+                    }
+                    continue 2;
+                case T_DOUBLE_COLON:
+                    if (!($tokens[$i - 1][0] == T_WHITESPACE || $tokens[$i - 1][0] == T_STRING)) {
+                        PEAR::raiseError("Parser error: Invalid PHP file $file",
+                            PEAR_COMMON_ERROR_INVALIDPHP);
+                        return false;
+                    }
+                    $class = $tokens[$i - 1][1];
+                    if (strtolower($class) != 'parent') {
+                        $used_classes[$class] = true;
+                    }
+                    continue 2;
+            }
+        }
+        return array(
+            "source_file" => $file,
+            "declared_classes" => $declared_classes,
+            "declared_interfaces" => $declared_interfaces,
+            "declared_methods" => $declared_methods,
+            "declared_functions" => $declared_functions,
+            "used_classes" => array_diff(array_keys($used_classes), $nodeps),
+            "inheritance" => $extends,
+            "implements" => $implements,
+            );
+    }
+
+    // }}}
+    // {{{  betterStates()
+
+    /**
+     * Return an array containing all of the states that are more stable than
+     * or equal to the passed in state
+     *
+     * @param string Release state
+     * @param boolean Determines whether to include $state in the list
+     * @return false|array False if $state is not a valid release state
+     */
+    function betterStates($state, $include = false)
+    {
+        static $states = array('snapshot', 'devel', 'alpha', 'beta', 'stable');
+        $i = array_search($state, $states);
+        if ($i === false) {
+            return false;
+        }
+        if ($include) {
+            $i--;
+        }
+        return array_slice($states, $i + 1);
+    }
+
+    // }}}
+    // {{{ detectDependencies()
+
+    function detectDependencies($any, $status_callback = null)
+    {
+        if (!function_exists("token_get_all")) {
+            return false;
+        }
+        if (PEAR::isError($info = $this->infoFromAny($any))) {
+            return $this->raiseError($info);
+        }
+        if (!is_array($info)) {
+            return false;
+        }
+        $deps = array();
+        $used_c = $decl_c = $decl_f = $decl_m = array();
+        foreach ($info['filelist'] as $file => $fa) {
+            $tmp = $this->analyzeSourceCode($file);
+            $used_c = @array_merge($used_c, $tmp['used_classes']);
+            $decl_c = @array_merge($decl_c, $tmp['declared_classes']);
+            $decl_f = @array_merge($decl_f, $tmp['declared_functions']);
+            $decl_m = @array_merge($decl_m, $tmp['declared_methods']);
+            $inheri = @array_merge($inheri, $tmp['inheritance']);
+        }
+        $used_c = array_unique($used_c);
+        $decl_c = array_unique($decl_c);
+        $undecl_c = array_diff($used_c, $decl_c);
+        return array('used_classes' => $used_c,
+                     'declared_classes' => $decl_c,
+                     'declared_methods' => $decl_m,
+                     'declared_functions' => $decl_f,
+                     'undeclared_classes' => $undecl_c,
+                     'inheritance' => $inheri,
+                     );
+    }
+
+    // }}}
+    // {{{ getUserRoles()
+
+    /**
+     * Get the valid roles for a PEAR package maintainer
+     *
+     * @return array
+     * @static
+     */
+    function getUserRoles()
+    {
+        return $GLOBALS['_PEAR_Common_maintainer_roles'];
+    }
+
+    // }}}
+    // {{{ getReleaseStates()
+
+    /**
+     * Get the valid package release states of packages
+     *
+     * @return array
+     * @static
+     */
+    function getReleaseStates()
+    {
+        return $GLOBALS['_PEAR_Common_release_states'];
+    }
+
+    // }}}
+    // {{{ getDependencyTypes()
+
+    /**
+     * Get the implemented dependency types (php, ext, pkg etc.)
+     *
+     * @return array
+     * @static
+     */
+    function getDependencyTypes()
+    {
+        return $GLOBALS['_PEAR_Common_dependency_types'];
+    }
+
+    // }}}
+    // {{{ getDependencyRelations()
+
+    /**
+     * Get the implemented dependency relations (has, lt, ge etc.)
+     *
+     * @return array
+     * @static
+     */
+    function getDependencyRelations()
+    {
+        return $GLOBALS['_PEAR_Common_dependency_relations'];
+    }
+
+    // }}}
+    // {{{ getFileRoles()
+
+    /**
+     * Get the implemented file roles
+     *
+     * @return array
+     * @static
+     */
+    function getFileRoles()
+    {
+        return $GLOBALS['_PEAR_Common_file_roles'];
+    }
+
+    // }}}
+    // {{{ getReplacementTypes()
+
+    /**
+     * Get the implemented file replacement types in
+     *
+     * @return array
+     * @static
+     */
+    function getReplacementTypes()
+    {
+        return $GLOBALS['_PEAR_Common_replacement_types'];
+    }
+
+    // }}}
+    // {{{ getProvideTypes()
+
+    /**
+     * Get the implemented file replacement types in
+     *
+     * @return array
+     * @static
+     */
+    function getProvideTypes()
+    {
+        return $GLOBALS['_PEAR_Common_provide_types'];
+    }
+
+    // }}}
+    // {{{ getScriptPhases()
+
+    /**
+     * Get the implemented file replacement types in
+     *
+     * @return array
+     * @static
+     */
+    function getScriptPhases()
+    {
+        return $GLOBALS['_PEAR_Common_script_phases'];
+    }
+
+    // }}}
+    // {{{ validPackageName()
+
+    /**
+     * Test whether a string contains a valid package name.
+     *
+     * @param string $name the package name to test
+     *
+     * @return bool
+     *
+     * @access public
+     */
+    function validPackageName($name)
+    {
+        return (bool)preg_match(PEAR_COMMON_PACKAGE_NAME_PREG, $name);
+    }
+
+
+    // }}}
+    // {{{ validPackageVersion()
+
+    /**
+     * Test whether a string contains a valid package version.
+     *
+     * @param string $ver the package version to test
+     *
+     * @return bool
+     *
+     * @access public
+     */
+    function validPackageVersion($ver)
+    {
+        return (bool)preg_match(PEAR_COMMON_PACKAGE_VERSION_PREG, $ver);
+    }
+
+
+    // }}}
+
+    // {{{ downloadHttp()
+
+    /**
+     * Download a file through HTTP.  Considers suggested file name in
+     * Content-disposition: header and can run a callback function for
+     * different events.  The callback will be called with two
+     * parameters: the callback type, and parameters.  The implemented
+     * callback types are:
+     *
+     *  'setup'       called at the very beginning, parameter is a UI object
+     *                that should be used for all output
+     *  'message'     the parameter is a string with an informational message
+     *  'saveas'      may be used to save with a different file name, the
+     *                parameter is the filename that is about to be used.
+     *                If a 'saveas' callback returns a non-empty string,
+     *                that file name will be used as the filename instead.
+     *                Note that $save_dir will not be affected by this, only
+     *                the basename of the file.
+     *  'start'       download is starting, parameter is number of bytes
+     *                that are expected, or -1 if unknown
+     *  'bytesread'   parameter is the number of bytes read so far
+     *  'done'        download is complete, parameter is the total number
+     *                of bytes read
+     *  'connfailed'  if the TCP connection fails, this callback is called
+     *                with array(host,port,errno,errmsg)
+     *  'writefailed' if writing to disk fails, this callback is called
+     *                with array(destfile,errmsg)
+     *
+     * If an HTTP proxy has been configured (http_proxy PEAR_Config
+     * setting), the proxy will be used.
+     *
+     * @param string  $url       the URL to download
+     * @param object  $ui        PEAR_Frontend_* instance
+     * @param object  $config    PEAR_Config instance
+     * @param string  $save_dir  (optional) directory to save file in
+     * @param mixed   $callback  (optional) function/method to call for status
+     *                           updates
+     *
+     * @return string  Returns the full path of the downloaded file or a PEAR
+     *                 error on failure.  If the error is caused by
+     *                 socket-related errors, the error object will
+     *                 have the fsockopen error code available through
+     *                 getCode().
+     *
+     * @access public
+     */
+    function downloadHttp($url, &$ui, $save_dir = '.', $callback = null)
+    {
+        if ($callback) {
+            call_user_func($callback, 'setup', array(&$ui));
+        }
+        if (preg_match('!^http://([^/:?#]*)(:(\d+))?(/.*)!', $url, $matches)) {
+            list(,$host,,$port,$path) = $matches;
+        }
+        if (isset($this)) {
+            $config = &$this->config;
+        } else {
+            $config = &PEAR_Config::singleton();
+        }
+        $proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
+        if ($proxy = parse_url($config->get('http_proxy'))) {
+            $proxy_host = @$proxy['host'];
+            $proxy_port = @$proxy['port'];
+            $proxy_user = @$proxy['user'];
+            $proxy_pass = @$proxy['pass'];
+
+            if ($proxy_port == '') {
+                $proxy_port = 8080;
+            }
+            if ($callback) {
+                call_user_func($callback, 'message', "Using HTTP proxy $host:$port");
+            }
+        }
+        if (empty($port)) {
+            $port = 80;
+        }
+        if ($proxy_host != '') {
+            $fp = @fsockopen($proxy_host, $proxy_port, $errno, $errstr);
+            if (!$fp) {
+                if ($callback) {
+                    call_user_func($callback, 'connfailed', array($proxy_host, $proxy_port,
+                                                                  $errno, $errstr));
+                }
+                return PEAR::raiseError("Connection to `$proxy_host:$proxy_port' failed: $errstr", $errno);
+            }
+            $request = "GET $url HTTP/1.0\r\n";
+        } else {
+            $fp = @fsockopen($host, $port, $errno, $errstr);
+            if (!$fp) {
+                if ($callback) {
+                    call_user_func($callback, 'connfailed', array($host, $port,
+                                                                  $errno, $errstr));
+                }
+                return PEAR::raiseError("Connection to `$host:$port' failed: $errstr", $errno);
+            }
+            $request = "GET $path HTTP/1.0\r\n";
+        }
+        $request .= "Host: $host:$port\r\n".
+            "User-Agent: PHP/".PHP_VERSION."\r\n";
+        if ($proxy_host != '' && $proxy_user != '') {
+            $request .= 'Proxy-Authorization: Basic ' .
+                base64_encode($proxy_user . ':' . $proxy_pass) . "\r\n";
+        }
+        $request .= "\r\n";
+        fwrite($fp, $request);
+        $headers = array();
+        while (trim($line = fgets($fp, 1024))) {
+            if (preg_match('/^([^:]+):\s+(.*)\s*$/', $line, $matches)) {
+                $headers[strtolower($matches[1])] = trim($matches[2]);
+            } elseif (preg_match('|^HTTP/1.[01] ([0-9]{3}) |', $line, $matches)) {
+                if ($matches[1] != 200) {
+                    return PEAR::raiseError("File http://$host:$port$path not valid (received: $line)");
+                }
+            }
+        }
+        if (isset($headers['content-disposition']) &&
+            preg_match('/\sfilename=\"([^;]*\S)\"\s*(;|$)/', $headers['content-disposition'], $matches)) {
+            $save_as = basename($matches[1]);
+        } else {
+            $save_as = basename($url);
+        }
+        if ($callback) {
+            $tmp = call_user_func($callback, 'saveas', $save_as);
+            if ($tmp) {
+                $save_as = $tmp;
+            }
+        }
+        $dest_file = $save_dir . DIRECTORY_SEPARATOR . $save_as;
+        if (!$wp = @fopen($dest_file, 'wb')) {
+            fclose($fp);
+            if ($callback) {
+                call_user_func($callback, 'writefailed', array($dest_file, $php_errormsg));
+            }
+            return PEAR::raiseError("could not open $dest_file for writing");
+        }
+        if (isset($headers['content-length'])) {
+            $length = $headers['content-length'];
+        } else {
+            $length = -1;
+        }
+        $bytes = 0;
+        if ($callback) {
+            call_user_func($callback, 'start', array(basename($dest_file), $length));
+        }
+        while ($data = @fread($fp, 1024)) {
+            $bytes += strlen($data);
+            if ($callback) {
+                call_user_func($callback, 'bytesread', $bytes);
+            }
+            if (!@fwrite($wp, $data)) {
+                fclose($fp);
+                if ($callback) {
+                    call_user_func($callback, 'writefailed', array($dest_file, $php_errormsg));
+                }
+                return PEAR::raiseError("$dest_file: write failed ($php_errormsg)");
+            }
+        }
+        fclose($fp);
+        fclose($wp);
+        if ($callback) {
+            call_user_func($callback, 'done', $bytes);
+        }
+        return $dest_file;
+    }
+
+    // }}}
+    // {{{ sortPkgDeps()
+
+    /**
+     * Sort a list of arrays of array(downloaded packagefilename) by dependency.
+     *
+     * It also removes duplicate dependencies
+     * @param array
+     * @param boolean Sort packages in reverse order if true
+     * @return array array of array(packagefilename, package.xml contents)
+     */
+    function sortPkgDeps(&$packages, $uninstall = false)
+    {
+        $ret = array();
+        if ($uninstall) {
+            foreach($packages as $packageinfo) {
+                $ret[] = array('info' => $packageinfo);
+            }
+        } else {
+            foreach($packages as $packagefile) {
+                if (!is_array($packagefile)) {
+                    $ret[] = array('file' => $packagefile,
+                                   'info' => $a = $this->infoFromAny($packagefile),
+                                   'pkg' => $a['package']);
+                } else {
+                    $ret[] = $packagefile;
+                }
+            }
+        }
+        $checkdupes = array();
+        $newret = array();
+        foreach($ret as $i => $p) {
+            if (!isset($checkdupes[$p['info']['package']])) {
+                $checkdupes[$p['info']['package']][] = $i;
+                $newret[] = $p;
+            }
+        }
+        $this->_packageSortTree = $this->_getPkgDepTree($newret);
+
+        $func = $uninstall ? '_sortPkgDepsRev' : '_sortPkgDeps';
+        usort($newret, array(&$this, $func));
+        $this->_packageSortTree = null;
+        $packages = $newret;
+    }
+
+    // }}}
+    // {{{ _sortPkgDeps()
+
+    /**
+     * Compare two package's package.xml, and sort
+     * so that dependencies are installed first
+     *
+     * This is a crude compare, real dependency checking is done on install.
+     * The only purpose this serves is to make the command-line
+     * order-independent (you can list a dependent package first, and
+     * installation occurs in the order required)
+     * @access private
+     */
+    function _sortPkgDeps($p1, $p2)
+    {
+        $p1name = $p1['info']['package'];
+        $p2name = $p2['info']['package'];
+        $p1deps = $this->_getPkgDeps($p1);
+        $p2deps = $this->_getPkgDeps($p2);
+        if (!count($p1deps) && !count($p2deps)) {
+            return 0; // order makes no difference
+        }
+        if (!count($p1deps)) {
+            return -1; // package 2 has dependencies, package 1 doesn't
+        }
+        if (!count($p2deps)) {
+            return 1; // package 1 has dependencies, package 2 doesn't
+        }
+        // both have dependencies
+        if (in_array($p1name, $p2deps)) {
+            return -1; // put package 1 first: package 2 depends on package 1
+        }
+        if (in_array($p2name, $p1deps)) {
+            return 1; // put package 2 first: package 1 depends on package 2
+        }
+        if ($this->_removedDependency($p1name, $p2name)) {
+            return -1; // put package 1 first: package 2 depends on packages that depend on package 1
+        }
+        if ($this->_removedDependency($p2name, $p1name)) {
+            return 1; // put package 2 first: package 1 depends on packages that depend on package 2
+        }
+        // doesn't really matter if neither depends on the other
+        return 0;
+    }
+
+    // }}}
+    // {{{ _sortPkgDepsRev()
+
+    /**
+     * Compare two package's package.xml, and sort
+     * so that dependencies are uninstalled last
+     *
+     * This is a crude compare, real dependency checking is done on uninstall.
+     * The only purpose this serves is to make the command-line
+     * order-independent (you can list a dependency first, and
+     * uninstallation occurs in the order required)
+     * @access private
+     */
+    function _sortPkgDepsRev($p1, $p2)
+    {
+        $p1name = $p1['info']['package'];
+        $p2name = $p2['info']['package'];
+        $p1deps = $this->_getRevPkgDeps($p1);
+        $p2deps = $this->_getRevPkgDeps($p2);
+        if (!count($p1deps) && !count($p2deps)) {
+            return 0; // order makes no difference
+        }
+        if (!count($p1deps)) {
+            return 1; // package 2 has dependencies, package 1 doesn't
+        }
+        if (!count($p2deps)) {
+            return -1; // package 2 has dependencies, package 1 doesn't
+        }
+        // both have dependencies
+        if (in_array($p1name, $p2deps)) {
+            return 1; // put package 1 last
+        }
+        if (in_array($p2name, $p1deps)) {
+            return -1; // put package 2 last
+        }
+        if ($this->_removedDependency($p1name, $p2name)) {
+            return 1; // put package 1 last: package 2 depends on packages that depend on package 1
+        }
+        if ($this->_removedDependency($p2name, $p1name)) {
+            return -1; // put package 2 last: package 1 depends on packages that depend on package 2
+        }
+        // doesn't really matter if neither depends on the other
+        return 0;
+    }
+
+    // }}}
+    // {{{ _getPkgDeps()
+
+    /**
+     * get an array of package dependency names
+     * @param array
+     * @return array
+     * @access private
+     */
+    function _getPkgDeps($p)
+    {
+        if (!isset($p['info']['releases'])) {
+            return $this->_getRevPkgDeps($p);
+        }
+        $rel = array_shift($p['info']['releases']);
+        if (!isset($rel['deps'])) {
+            return array();
+        }
+        $ret = array();
+        foreach($rel['deps'] as $dep) {
+            if ($dep['type'] == 'pkg') {
+                $ret[] = $dep['name'];
+            }
+        }
+        return $ret;
+    }
+
+    // }}}
+    // {{{ _getPkgDeps()
+
+    /**
+     * get an array representation of the package dependency tree
+     * @return array
+     * @access private
+     */
+    function _getPkgDepTree($packages)
+    {
+        $tree = array();
+        foreach ($packages as $p) {
+            $package = $p['info']['package'];
+            $deps = $this->_getPkgDeps($p);
+            $tree[$package] = $deps;
+        }
+        return $tree;
+    }
+
+    // }}}
+    // {{{ _removedDependency($p1, $p2)
+
+    /**
+     * get an array of package dependency names for uninstall
+     * @param string package 1 name
+     * @param string package 2 name
+     * @return bool
+     * @access private
+     */
+    function _removedDependency($p1, $p2)
+    {
+        if (empty($this->_packageSortTree[$p2])) {
+            return false;
+        }
+        if (!in_array($p1, $this->_packageSortTree[$p2])) {
+            foreach ($this->_packageSortTree[$p2] as $potential) {
+                if ($this->_removedDependency($p1, $potential)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ _getRevPkgDeps()
+
+    /**
+     * get an array of package dependency names for uninstall
+     * @param array
+     * @return array
+     * @access private
+     */
+    function _getRevPkgDeps($p)
+    {
+        if (!isset($p['info']['release_deps'])) {
+            return array();
+        }
+        $ret = array();
+        foreach($p['info']['release_deps'] as $dep) {
+            if ($dep['type'] == 'pkg') {
+                $ret[] = $dep['name'];
+            }
+        }
+        return $ret;
+    }
+
+    // }}}
+}
+
+?>
diff --git a/3rdparty/PEAR/Config.php b/3rdparty/PEAR/Config.php
new file mode 100644
index 00000000000..ba641735250
--- /dev/null
+++ b/3rdparty/PEAR/Config.php
@@ -0,0 +1,1169 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Stig Bakken <ssb@php.net>                                    |
+// +----------------------------------------------------------------------+
+//
+// $Id: Config.php,v 1.52 2004/01/08 17:33:12 sniper Exp $
+
+require_once 'PEAR.php';
+require_once 'System.php';
+
+/**
+ * Last created PEAR_Config instance.
+ * @var object
+ */
+$GLOBALS['_PEAR_Config_instance'] = null;
+if (!defined('PEAR_INSTALL_DIR') || !PEAR_INSTALL_DIR) {
+    $PEAR_INSTALL_DIR = PHP_LIBDIR . DIRECTORY_SEPARATOR . 'pear';
+} else {
+    $PEAR_INSTALL_DIR = PEAR_INSTALL_DIR;
+}
+
+// Below we define constants with default values for all configuration
+// parameters except username/password.  All of them can have their
+// defaults set through environment variables.  The reason we use the
+// PHP_ prefix is for some security, PHP protects environment
+// variables starting with PHP_*.
+
+if (getenv('PHP_PEAR_SYSCONF_DIR')) {
+    define('PEAR_CONFIG_SYSCONFDIR', getenv('PHP_PEAR_SYSCONF_DIR'));
+} elseif (getenv('SystemRoot')) {
+    define('PEAR_CONFIG_SYSCONFDIR', getenv('SystemRoot'));
+} else {
+    define('PEAR_CONFIG_SYSCONFDIR', PHP_SYSCONFDIR);
+}
+
+// Default for master_server
+if (getenv('PHP_PEAR_MASTER_SERVER')) {
+    define('PEAR_CONFIG_DEFAULT_MASTER_SERVER', getenv('PHP_PEAR_MASTER_SERVER'));
+} else {
+    define('PEAR_CONFIG_DEFAULT_MASTER_SERVER', 'pear.php.net');
+}
+
+// Default for http_proxy
+if (getenv('PHP_PEAR_HTTP_PROXY')) {
+    define('PEAR_CONFIG_DEFAULT_HTTP_PROXY', getenv('PHP_PEAR_HTTP_PROXY'));
+} elseif (getenv('http_proxy')) {
+    define('PEAR_CONFIG_DEFAULT_HTTP_PROXY', getenv('http_proxy'));
+} else {
+    define('PEAR_CONFIG_DEFAULT_HTTP_PROXY', '');
+}
+
+// Default for php_dir
+if (getenv('PHP_PEAR_INSTALL_DIR')) {
+    define('PEAR_CONFIG_DEFAULT_PHP_DIR', getenv('PHP_PEAR_INSTALL_DIR'));
+} else {
+    if (@is_dir($PEAR_INSTALL_DIR)) {
+        define('PEAR_CONFIG_DEFAULT_PHP_DIR',
+               $PEAR_INSTALL_DIR);
+    } else {
+        define('PEAR_CONFIG_DEFAULT_PHP_DIR', $PEAR_INSTALL_DIR);
+    }
+}
+
+// Default for ext_dir
+if (getenv('PHP_PEAR_EXTENSION_DIR')) {
+    define('PEAR_CONFIG_DEFAULT_EXT_DIR', getenv('PHP_PEAR_EXTENSION_DIR'));
+} else {
+    if (ini_get('extension_dir')) {
+        define('PEAR_CONFIG_DEFAULT_EXT_DIR', ini_get('extension_dir'));
+    } elseif (defined('PEAR_EXTENSION_DIR') && @is_dir(PEAR_EXTENSION_DIR)) {
+        define('PEAR_CONFIG_DEFAULT_EXT_DIR', PEAR_EXTENSION_DIR);
+    } elseif (defined('PHP_EXTENSION_DIR')) {
+        define('PEAR_CONFIG_DEFAULT_EXT_DIR', PHP_EXTENSION_DIR);
+    } else {
+        define('PEAR_CONFIG_DEFAULT_EXT_DIR', '.');
+    }
+}
+
+// Default for doc_dir
+if (getenv('PHP_PEAR_DOC_DIR')) {
+    define('PEAR_CONFIG_DEFAULT_DOC_DIR', getenv('PHP_PEAR_DOC_DIR'));
+} else {
+    define('PEAR_CONFIG_DEFAULT_DOC_DIR',
+           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'docs');
+}
+
+// Default for bin_dir
+if (getenv('PHP_PEAR_BIN_DIR')) {
+    define('PEAR_CONFIG_DEFAULT_BIN_DIR', getenv('PHP_PEAR_BIN_DIR'));
+} else {
+    define('PEAR_CONFIG_DEFAULT_BIN_DIR', PHP_BINDIR);
+}
+
+// Default for data_dir
+if (getenv('PHP_PEAR_DATA_DIR')) {
+    define('PEAR_CONFIG_DEFAULT_DATA_DIR', getenv('PHP_PEAR_DATA_DIR'));
+} else {
+    define('PEAR_CONFIG_DEFAULT_DATA_DIR',
+           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'data');
+}
+
+// Default for test_dir
+if (getenv('PHP_PEAR_TEST_DIR')) {
+    define('PEAR_CONFIG_DEFAULT_TEST_DIR', getenv('PHP_PEAR_TEST_DIR'));
+} else {
+    define('PEAR_CONFIG_DEFAULT_TEST_DIR',
+           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'tests');
+}
+
+// Default for cache_dir
+if (getenv('PHP_PEAR_CACHE_DIR')) {
+    define('PEAR_CONFIG_DEFAULT_CACHE_DIR', getenv('PHP_PEAR_CACHE_DIR'));
+} else {
+    define('PEAR_CONFIG_DEFAULT_CACHE_DIR',
+           System::tmpdir() . DIRECTORY_SEPARATOR . 'pear' .
+           DIRECTORY_SEPARATOR . 'cache');
+}
+
+// Default for php_bin
+if (getenv('PHP_PEAR_PHP_BIN')) {
+    define('PEAR_CONFIG_DEFAULT_PHP_BIN', getenv('PHP_PEAR_PHP_BIN'));
+} else {
+    define('PEAR_CONFIG_DEFAULT_PHP_BIN', PEAR_CONFIG_DEFAULT_BIN_DIR.
+           DIRECTORY_SEPARATOR.'php'.(OS_WINDOWS ? '.exe' : ''));
+}
+
+// Default for verbose
+if (getenv('PHP_PEAR_VERBOSE')) {
+    define('PEAR_CONFIG_DEFAULT_VERBOSE', getenv('PHP_PEAR_VERBOSE'));
+} else {
+    define('PEAR_CONFIG_DEFAULT_VERBOSE', 1);
+}
+
+// Default for preferred_state
+if (getenv('PHP_PEAR_PREFERRED_STATE')) {
+    define('PEAR_CONFIG_DEFAULT_PREFERRED_STATE', getenv('PHP_PEAR_PREFERRED_STATE'));
+} else {
+    define('PEAR_CONFIG_DEFAULT_PREFERRED_STATE', 'stable');
+}
+
+// Default for umask
+if (getenv('PHP_PEAR_UMASK')) {
+    define('PEAR_CONFIG_DEFAULT_UMASK', getenv('PHP_PEAR_UMASK'));
+} else {
+    define('PEAR_CONFIG_DEFAULT_UMASK', decoct(umask()));
+}
+
+// Default for cache_ttl
+if (getenv('PHP_PEAR_CACHE_TTL')) {
+    define('PEAR_CONFIG_DEFAULT_CACHE_TTL', getenv('PHP_PEAR_CACHE_TTL'));
+} else {
+    define('PEAR_CONFIG_DEFAULT_CACHE_TTL', 3600);
+}
+
+// Default for sig_type
+if (getenv('PHP_PEAR_SIG_TYPE')) {
+    define('PEAR_CONFIG_DEFAULT_SIG_TYPE', getenv('PHP_PEAR_SIG_TYPE'));
+} else {
+    define('PEAR_CONFIG_DEFAULT_SIG_TYPE', 'gpg');
+}
+
+// Default for sig_bin
+if (getenv('PHP_PEAR_SIG_BIN')) {
+    define('PEAR_CONFIG_DEFAULT_SIG_BIN', getenv('PHP_PEAR_SIG_BIN'));
+} else {
+    define('PEAR_CONFIG_DEFAULT_SIG_BIN',
+           System::which(
+               'gpg', OS_WINDOWS ? 'c:\gnupg\gpg.exe' : '/usr/local/bin/gpg'));
+}
+
+// Default for sig_keydir
+if (getenv('PHP_PEAR_SIG_KEYDIR')) {
+    define('PEAR_CONFIG_DEFAULT_SIG_KEYDIR', getenv('PHP_PEAR_SIG_KEYDIR'));
+} else {
+    define('PEAR_CONFIG_DEFAULT_SIG_KEYDIR',
+           PEAR_CONFIG_SYSCONFDIR . DIRECTORY_SEPARATOR . 'pearkeys');
+}
+
+/**
+ * This is a class for storing configuration data, keeping track of
+ * which are system-defined, user-defined or defaulted.
+ */
+class PEAR_Config extends PEAR
+{
+    // {{{ properties
+
+    /**
+     * Array of config files used.
+     *
+     * @var array layer => config file
+     */
+    var $files = array(
+        'system' => '',
+        'user' => '',
+        );
+
+    var $layers = array();
+
+    /**
+     * Configuration data, two-dimensional array where the first
+     * dimension is the config layer ('user', 'system' and 'default'),
+     * and the second dimension is keyname => value.
+     *
+     * The order in the first dimension is important!  Earlier
+     * layers will shadow later ones when a config value is
+     * requested (if a 'user' value exists, it will be returned first,
+     * then 'system' and finally 'default').
+     *
+     * @var array layer => array(keyname => value, ...)
+     */
+    var $configuration = array(
+        'user' => array(),
+        'system' => array(),
+        'default' => array(),
+        );
+
+    /**
+     * Information about the configuration data.  Stores the type,
+     * default value and a documentation string for each configuration
+     * value.
+     *
+     * @var array layer => array(infotype => value, ...)
+     */
+    var $configuration_info = array(
+        // Internet Access
+        'master_server' => array(
+            'type' => 'string',
+            'default' => 'pear.php.net',
+            'doc' => 'name of the main PEAR server',
+            'prompt' => 'PEAR server',
+            'group' => 'Internet Access',
+            ),
+        'http_proxy' => array(
+            'type' => 'string',
+            'default' => PEAR_CONFIG_DEFAULT_HTTP_PROXY,
+            'doc' => 'HTTP proxy (host:port) to use when downloading packages',
+            'prompt' => 'HTTP Proxy Server Address',
+            'group' => 'Internet Access',
+            ),
+        // File Locations
+        'php_dir' => array(
+            'type' => 'directory',
+            'default' => PEAR_CONFIG_DEFAULT_PHP_DIR,
+            'doc' => 'directory where .php files are installed',
+            'prompt' => 'PEAR directory',
+            'group' => 'File Locations',
+            ),
+        'ext_dir' => array(
+            'type' => 'directory',
+            'default' => PEAR_CONFIG_DEFAULT_EXT_DIR,
+            'doc' => 'directory where loadable extensions are installed',
+            'prompt' => 'PHP extension directory',
+            'group' => 'File Locations',
+            ),
+        'doc_dir' => array(
+            'type' => 'directory',
+            'default' => PEAR_CONFIG_DEFAULT_DOC_DIR,
+            'doc' => 'directory where documentation is installed',
+            'prompt' => 'PEAR documentation directory',
+            'group' => 'File Locations',
+            ),
+        'bin_dir' => array(
+            'type' => 'directory',
+            'default' => PEAR_CONFIG_DEFAULT_BIN_DIR,
+            'doc' => 'directory where executables are installed',
+            'prompt' => 'PEAR executables directory',
+            'group' => 'File Locations',
+            ),
+        'data_dir' => array(
+            'type' => 'directory',
+            'default' => PEAR_CONFIG_DEFAULT_DATA_DIR,
+            'doc' => 'directory where data files are installed',
+            'prompt' => 'PEAR data directory',
+            'group' => 'File Locations (Advanced)',
+            ),
+        'test_dir' => array(
+            'type' => 'directory',
+            'default' => PEAR_CONFIG_DEFAULT_TEST_DIR,
+            'doc' => 'directory where regression tests are installed',
+            'prompt' => 'PEAR test directory',
+            'group' => 'File Locations (Advanced)',
+            ),
+        'cache_dir' => array(
+            'type' => 'directory',
+            'default' => PEAR_CONFIG_DEFAULT_CACHE_DIR,
+            'doc' => 'directory which is used for XMLRPC cache',
+            'prompt' => 'PEAR Installer cache directory',
+            'group' => 'File Locations (Advanced)',
+            ),
+        'php_bin' => array(
+            'type' => 'file',
+            'default' => PEAR_CONFIG_DEFAULT_PHP_BIN,
+            'doc' => 'PHP CLI/CGI binary for executing scripts',
+            'prompt' => 'PHP CLI/CGI binary',
+            'group' => 'File Locations (Advanced)',
+            ),
+        // Maintainers
+        'username' => array(
+            'type' => 'string',
+            'default' => '',
+            'doc' => '(maintainers) your PEAR account name',
+            'prompt' => 'PEAR username (for maintainers)',
+            'group' => 'Maintainers',
+            ),
+        'password' => array(
+            'type' => 'password',
+            'default' => '',
+            'doc' => '(maintainers) your PEAR account password',
+            'prompt' => 'PEAR password (for maintainers)',
+            'group' => 'Maintainers',
+            ),
+        // Advanced
+        'verbose' => array(
+            'type' => 'integer',
+            'default' => PEAR_CONFIG_DEFAULT_VERBOSE,
+            'doc' => 'verbosity level
+0: really quiet
+1: somewhat quiet
+2: verbose
+3: debug',
+            'prompt' => 'Debug Log Level',
+            'group' => 'Advanced',
+            ),
+        'preferred_state' => array(
+            'type' => 'set',
+            'default' => PEAR_CONFIG_DEFAULT_PREFERRED_STATE,
+            'doc' => 'the installer will prefer releases with this state when installing packages without a version or state specified',
+            'valid_set' => array(
+                'stable', 'beta', 'alpha', 'devel', 'snapshot'),
+            'prompt' => 'Preferred Package State',
+            'group' => 'Advanced',
+            ),
+        'umask' => array(
+            'type' => 'mask',
+            'default' => PEAR_CONFIG_DEFAULT_UMASK,
+            'doc' => 'umask used when creating files (Unix-like systems only)',
+            'prompt' => 'Unix file mask',
+            'group' => 'Advanced',
+            ),
+        'cache_ttl' => array(
+            'type' => 'integer',
+            'default' => PEAR_CONFIG_DEFAULT_CACHE_TTL,
+            'doc' => 'amount of secs where the local cache is used and not updated',
+            'prompt' => 'Cache TimeToLive',
+            'group' => 'Advanced',
+            ),
+        'sig_type' => array(
+            'type' => 'set',
+            'default' => PEAR_CONFIG_DEFAULT_SIG_TYPE,
+            'doc' => 'which package signature mechanism to use',
+            'valid_set' => array('gpg'),
+            'prompt' => 'Package Signature Type',
+            'group' => 'Maintainers',
+            ),
+        'sig_bin' => array(
+            'type' => 'string',
+            'default' => PEAR_CONFIG_DEFAULT_SIG_BIN,
+            'doc' => 'which package signature mechanism to use',
+            'prompt' => 'Signature Handling Program',
+            'group' => 'Maintainers',
+            ),
+        'sig_keyid' => array(
+            'type' => 'string',
+            'default' => '',
+            'doc' => 'which key to use for signing with',
+            'prompt' => 'Signature Key Id',
+            'group' => 'Maintainers',
+            ),
+        'sig_keydir' => array(
+            'type' => 'string',
+            'default' => PEAR_CONFIG_DEFAULT_SIG_KEYDIR,
+            'doc' => 'which package signature mechanism to use',
+            'prompt' => 'Signature Key Directory',
+            'group' => 'Maintainers',
+            ),
+        );
+
+    // }}}
+
+    // {{{ PEAR_Config([file], [defaults_file])
+
+    /**
+     * Constructor.
+     *
+     * @param string (optional) file to read user-defined options from
+     * @param string (optional) file to read system-wide defaults from
+     *
+     * @access public
+     *
+     * @see PEAR_Config::singleton
+     */
+    function PEAR_Config($user_file = '', $system_file = '')
+    {
+        $this->PEAR();
+        $sl = DIRECTORY_SEPARATOR;
+        if (empty($user_file)) {
+            if (OS_WINDOWS) {
+                $user_file = PEAR_CONFIG_SYSCONFDIR . $sl . 'pear.ini';
+            } else {
+                $user_file = getenv('HOME') . $sl . '.pearrc';
+            }
+        }
+        if (empty($system_file)) {
+            if (OS_WINDOWS) {
+                $system_file = PEAR_CONFIG_SYSCONFDIR . $sl . 'pearsys.ini';
+            } else {
+                $system_file = PEAR_CONFIG_SYSCONFDIR . $sl . 'pear.conf';
+            }
+        }
+        $this->layers = array_keys($this->configuration);
+        $this->files['user'] = $user_file;
+        $this->files['system'] = $system_file;
+        if ($user_file && file_exists($user_file)) {
+            $this->readConfigFile($user_file);
+        }
+        if ($system_file && file_exists($system_file)) {
+            $this->mergeConfigFile($system_file, false, 'system');
+        }
+        foreach ($this->configuration_info as $key => $info) {
+            $this->configuration['default'][$key] = $info['default'];
+        }
+        //$GLOBALS['_PEAR_Config_instance'] = &$this;
+    }
+
+    // }}}
+    // {{{ singleton([file], [defaults_file])
+
+    /**
+     * Static singleton method.  If you want to keep only one instance
+     * of this class in use, this method will give you a reference to
+     * the last created PEAR_Config object if one exists, or create a
+     * new object.
+     *
+     * @param string (optional) file to read user-defined options from
+     * @param string (optional) file to read system-wide defaults from
+     *
+     * @return object an existing or new PEAR_Config instance
+     *
+     * @access public
+     *
+     * @see PEAR_Config::PEAR_Config
+     */
+    function &singleton($user_file = '', $system_file = '')
+    {
+        if (is_object($GLOBALS['_PEAR_Config_instance'])) {
+            return $GLOBALS['_PEAR_Config_instance'];
+        }
+        $GLOBALS['_PEAR_Config_instance'] =
+             &new PEAR_Config($user_file, $system_file);
+        return $GLOBALS['_PEAR_Config_instance'];
+    }
+
+    // }}}
+    // {{{ readConfigFile([file], [layer])
+
+    /**
+     * Reads configuration data from a file.  All existing values in
+     * the config layer are discarded and replaced with data from the
+     * file.
+     *
+     * @param string (optional) file to read from, if NULL or not
+     * specified, the last-used file for the same layer (second param)
+     * is used
+     *
+     * @param string (optional) config layer to insert data into
+     * ('user' or 'system')
+     *
+     * @return bool TRUE on success or a PEAR error on failure
+     *
+     * @access public
+     */
+    function readConfigFile($file = null, $layer = 'user')
+    {
+        if (empty($this->files[$layer])) {
+            return $this->raiseError("unknown config file type `$layer'");
+        }
+        if ($file === null) {
+            $file = $this->files[$layer];
+        }
+        $data = $this->_readConfigDataFrom($file);
+        if (PEAR::isError($data)) {
+            return $data;
+        }
+        $this->_decodeInput($data);
+        $this->configuration[$layer] = $data;
+        return true;
+    }
+
+    // }}}
+    // {{{ mergeConfigFile(file, [override], [layer])
+
+    /**
+     * Merges data into a config layer from a file.  Does the same
+     * thing as readConfigFile, except it does not replace all
+     * existing values in the config layer.
+     *
+     * @param string file to read from
+     *
+     * @param bool (optional) whether to overwrite existing data
+     * (default TRUE)
+     *
+     * @param string config layer to insert data into ('user' or
+     * 'system')
+     *
+     * @return bool TRUE on success or a PEAR error on failure
+     *
+     * @access public.
+     */
+    function mergeConfigFile($file, $override = true, $layer = 'user')
+    {
+        if (empty($this->files[$layer])) {
+            return $this->raiseError("unknown config file type `$layer'");
+        }
+        if ($file === null) {
+            $file = $this->files[$layer];
+        }
+        $data = $this->_readConfigDataFrom($file);
+        if (PEAR::isError($data)) {
+            return $data;
+        }
+        $this->_decodeInput($data);
+        if ($override) {
+            $this->configuration[$layer] = array_merge($this->configuration[$layer], $data);
+        } else {
+            $this->configuration[$layer] = array_merge($data, $this->configuration[$layer]);
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ writeConfigFile([file], [layer])
+
+    /**
+     * Writes data into a config layer from a file.
+     *
+     * @param string file to read from
+     *
+     * @param bool (optional) whether to overwrite existing data
+     * (default TRUE)
+     *
+     * @param string config layer to insert data into ('user' or
+     * 'system')
+     *
+     * @return bool TRUE on success or a PEAR error on failure
+     *
+     * @access public.
+     */
+    function writeConfigFile($file = null, $layer = 'user', $data = null)
+    {
+        if ($layer == 'both' || $layer == 'all') {
+            foreach ($this->files as $type => $file) {
+                $err = $this->writeConfigFile($file, $type, $data);
+                if (PEAR::isError($err)) {
+                    return $err;
+                }
+            }
+            return true;
+        }
+        if (empty($this->files[$layer])) {
+            return $this->raiseError("unknown config file type `$layer'");
+        }
+        if ($file === null) {
+            $file = $this->files[$layer];
+        }
+        $data = ($data === null) ? $this->configuration[$layer] : $data;
+        $this->_encodeOutput($data);
+        $opt = array('-p', dirname($file));
+        if (!@System::mkDir($opt)) {
+            return $this->raiseError("could not create directory: " . dirname($file));
+        }
+        if (@is_file($file) && !@is_writeable($file)) {
+            return $this->raiseError("no write access to $file!");
+        }
+        $fp = @fopen($file, "w");
+        if (!$fp) {
+            return $this->raiseError("PEAR_Config::writeConfigFile fopen('$file','w') failed");
+        }
+        $contents = "#PEAR_Config 0.9\n" . serialize($data);
+        if (!@fwrite($fp, $contents)) {
+            return $this->raiseError("PEAR_Config::writeConfigFile: fwrite failed");
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ _readConfigDataFrom(file)
+
+    /**
+     * Reads configuration data from a file and returns the parsed data
+     * in an array.
+     *
+     * @param string file to read from
+     *
+     * @return array configuration data or a PEAR error on failure
+     *
+     * @access private
+     */
+    function _readConfigDataFrom($file)
+    {
+        $fp = @fopen($file, "r");
+        if (!$fp) {
+            return $this->raiseError("PEAR_Config::readConfigFile fopen('$file','r') failed");
+        }
+        $size = filesize($file);
+        $rt = get_magic_quotes_runtime();
+        set_magic_quotes_runtime(0);
+        $contents = fread($fp, $size);
+        set_magic_quotes_runtime($rt);
+        fclose($fp);
+        $version = '0.1';
+        if (preg_match('/^#PEAR_Config\s+(\S+)\s+/si', $contents, $matches)) {
+            $version = $matches[1];
+            $contents = substr($contents, strlen($matches[0]));
+        }
+        if (version_compare("$version", '1', '<')) {
+            $data = unserialize($contents);
+            if (!is_array($data)) {
+                if (strlen(trim($contents)) > 0) {
+                    $error = "PEAR_Config: bad data in $file";
+//                if (isset($this)) {
+                    return $this->raiseError($error);
+//                } else {
+//                    return PEAR::raiseError($error);
+                } else {
+                    $data = array();
+                }
+            }
+        // add parsing of newer formats here...
+        } else {
+            return $this->raiseError("$file: unknown version `$version'");
+        }
+        return $data;
+    }
+
+    // }}}
+    // {{{ getConfFile(layer)
+    /**
+    * Gets the file used for storing the config for a layer
+    *
+    * @param string $layer 'user' or 'system'
+    */
+
+    function getConfFile($layer)
+    {
+        return $this->files[$layer];
+    }
+
+    // }}}
+    // {{{ _encodeOutput(&data)
+
+    /**
+     * Encodes/scrambles configuration data before writing to files.
+     * Currently, 'password' values will be base64-encoded as to avoid
+     * that people spot cleartext passwords by accident.
+     *
+     * @param array (reference) array to encode values in
+     *
+     * @return bool TRUE on success
+     *
+     * @access private
+     */
+    function _encodeOutput(&$data)
+    {
+        foreach ($data as $key => $value) {
+            if (!isset($this->configuration_info[$key])) {
+                continue;
+            }
+            $type = $this->configuration_info[$key]['type'];
+            switch ($type) {
+                // we base64-encode passwords so they are at least
+                // not shown in plain by accident
+                case 'password': {
+                    $data[$key] = base64_encode($data[$key]);
+                    break;
+                }
+                case 'mask': {
+                    $data[$key] = octdec($data[$key]);
+                    break;
+                }
+            }
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ _decodeInput(&data)
+
+    /**
+     * Decodes/unscrambles configuration data after reading from files.
+     *
+     * @param array (reference) array to encode values in
+     *
+     * @return bool TRUE on success
+     *
+     * @access private
+     *
+     * @see PEAR_Config::_encodeOutput
+     */
+    function _decodeInput(&$data)
+    {
+        if (!is_array($data)) {
+            return true;
+        }
+        foreach ($data as $key => $value) {
+            if (!isset($this->configuration_info[$key])) {
+                continue;
+            }
+            $type = $this->configuration_info[$key]['type'];
+            switch ($type) {
+                case 'password': {
+                    $data[$key] = base64_decode($data[$key]);
+                    break;
+                }
+                case 'mask': {
+                    $data[$key] = decoct($data[$key]);
+                    break;
+                }
+            }
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ get(key, [layer])
+
+    /**
+     * Returns a configuration value, prioritizing layers as per the
+     * layers property.
+     *
+     * @param string config key
+     *
+     * @return mixed the config value, or NULL if not found
+     *
+     * @access public
+     */
+    function get($key, $layer = null)
+    {
+        if ($layer === null) {
+            foreach ($this->layers as $layer) {
+                if (isset($this->configuration[$layer][$key])) {
+                    return $this->configuration[$layer][$key];
+                }
+            }
+        } elseif (isset($this->configuration[$layer][$key])) {
+            return $this->configuration[$layer][$key];
+        }
+        return null;
+    }
+
+    // }}}
+    // {{{ set(key, value, [layer])
+
+    /**
+     * Set a config value in a specific layer (defaults to 'user').
+     * Enforces the types defined in the configuration_info array.  An
+     * integer config variable will be cast to int, and a set config
+     * variable will be validated against its legal values.
+     *
+     * @param string config key
+     *
+     * @param string config value
+     *
+     * @param string (optional) config layer
+     *
+     * @return bool TRUE on success, FALSE on failure
+     *
+     * @access public
+     */
+    function set($key, $value, $layer = 'user')
+    {
+        if (empty($this->configuration_info[$key])) {
+            return false;
+        }
+        extract($this->configuration_info[$key]);
+        switch ($type) {
+            case 'integer':
+                $value = (int)$value;
+                break;
+            case 'set': {
+                // If a valid_set is specified, require the value to
+                // be in the set.  If there is no valid_set, accept
+                // any value.
+                if ($valid_set) {
+                    reset($valid_set);
+                    if ((key($valid_set) === 0 && !in_array($value, $valid_set)) ||
+                        (key($valid_set) !== 0 && empty($valid_set[$value])))
+                    {
+                        return false;
+                    }
+                }
+                break;
+            }
+        }
+        $this->configuration[$layer][$key] = $value;
+        return true;
+    }
+
+    // }}}
+    // {{{ getType(key)
+
+    /**
+     * Get the type of a config value.
+     *
+     * @param string  config key
+     *
+     * @return string type, one of "string", "integer", "file",
+     * "directory", "set" or "password".
+     *
+     * @access public
+     *
+     */
+    function getType($key)
+    {
+        if (isset($this->configuration_info[$key])) {
+            return $this->configuration_info[$key]['type'];
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ getDocs(key)
+
+    /**
+     * Get the documentation for a config value.
+     *
+     * @param string  config key
+     *
+     * @return string documentation string
+     *
+     * @access public
+     *
+     */
+    function getDocs($key)
+    {
+        if (isset($this->configuration_info[$key])) {
+            return $this->configuration_info[$key]['doc'];
+        }
+        return false;
+    }
+       // }}}
+    // {{{ getPrompt(key)
+
+    /**
+     * Get the short documentation for a config value.
+     *
+     * @param string  config key
+     *
+     * @return string short documentation string
+     *
+     * @access public
+     *
+     */
+    function getPrompt($key)
+    {
+        if (isset($this->configuration_info[$key])) {
+            return $this->configuration_info[$key]['prompt'];
+        }
+        return false;
+    }
+    // }}}
+    // {{{ getGroup(key)
+
+    /**
+     * Get the parameter group for a config key.
+     *
+     * @param string  config key
+     *
+     * @return string parameter group
+     *
+     * @access public
+     *
+     */
+    function getGroup($key)
+    {
+        if (isset($this->configuration_info[$key])) {
+            return $this->configuration_info[$key]['group'];
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ getGroups()
+
+    /**
+     * Get the list of parameter groups.
+     *
+     * @return array list of parameter groups
+     *
+     * @access public
+     *
+     */
+    function getGroups()
+    {
+        $tmp = array();
+        foreach ($this->configuration_info as $key => $info) {
+            $tmp[$info['group']] = 1;
+        }
+        return array_keys($tmp);
+    }
+
+    // }}}
+    // {{{ getGroupKeys()
+
+    /**
+     * Get the list of the parameters in a group.
+     *
+     * @param string $group parameter group
+     *
+     * @return array list of parameters in $group
+     *
+     * @access public
+     *
+     */
+    function getGroupKeys($group)
+    {
+        $keys = array();
+        foreach ($this->configuration_info as $key => $info) {
+            if ($info['group'] == $group) {
+                $keys[] = $key;
+            }
+        }
+        return $keys;
+    }
+
+    // }}}
+    // {{{ getSetValues(key)
+
+    /**
+     * Get the list of allowed set values for a config value.  Returns
+     * NULL for config values that are not sets.
+     *
+     * @param string  config key
+     *
+     * @return array enumerated array of set values, or NULL if the
+     *               config key is unknown or not a set
+     *
+     * @access public
+     *
+     */
+    function getSetValues($key)
+    {
+        if (isset($this->configuration_info[$key]) &&
+            isset($this->configuration_info[$key]['type']) &&
+            $this->configuration_info[$key]['type'] == 'set')
+        {
+            $valid_set = $this->configuration_info[$key]['valid_set'];
+            reset($valid_set);
+            if (key($valid_set) === 0) {
+                return $valid_set;
+            }
+            return array_keys($valid_set);
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ getKeys()
+
+    /**
+     * Get all the current config keys.
+     *
+     * @return array simple array of config keys
+     *
+     * @access public
+     */
+    function getKeys()
+    {
+        $keys = array();
+        foreach ($this->layers as $layer) {
+            $keys = array_merge($keys, $this->configuration[$layer]);
+        }
+        return array_keys($keys);
+    }
+
+    // }}}
+    // {{{ remove(key, [layer])
+
+    /**
+     * Remove the a config key from a specific config layer.
+     *
+     * @param string config key
+     *
+     * @param string (optional) config layer
+     *
+     * @return bool TRUE on success, FALSE on failure
+     *
+     * @access public
+     */
+    function remove($key, $layer = 'user')
+    {
+        if (isset($this->configuration[$layer][$key])) {
+            unset($this->configuration[$layer][$key]);
+            return true;
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ removeLayer(layer)
+
+    /**
+     * Temporarily remove an entire config layer.  USE WITH CARE!
+     *
+     * @param string config key
+     *
+     * @param string (optional) config layer
+     *
+     * @return bool TRUE on success, FALSE on failure
+     *
+     * @access public
+     */
+    function removeLayer($layer)
+    {
+        if (isset($this->configuration[$layer])) {
+            $this->configuration[$layer] = array();
+            return true;
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ store([layer])
+
+    /**
+     * Stores configuration data in a layer.
+     *
+     * @param string config layer to store
+     *
+     * @return bool TRUE on success, or PEAR error on failure
+     *
+     * @access public
+     */
+    function store($layer = 'user', $data = null)
+    {
+        return $this->writeConfigFile(null, $layer, $data);
+    }
+
+    // }}}
+    // {{{ toDefault(key)
+
+    /**
+     * Unset the user-defined value of a config key, reverting the
+     * value to the system-defined one.
+     *
+     * @param string config key
+     *
+     * @return bool TRUE on success, FALSE on failure
+     *
+     * @access public
+     */
+    function toDefault($key)
+    {
+        trigger_error("PEAR_Config::toDefault() deprecated, use PEAR_Config::remove() instead", E_USER_NOTICE);
+        return $this->remove($key, 'user');
+    }
+
+    // }}}
+    // {{{ definedBy(key)
+
+    /**
+     * Tells what config layer that gets to define a key.
+     *
+     * @param string config key
+     *
+     * @return string the config layer, or an empty string if not found
+     *
+     * @access public
+     */
+    function definedBy($key)
+    {
+        foreach ($this->layers as $layer) {
+            if (isset($this->configuration[$layer][$key])) {
+                return $layer;
+            }
+        }
+        return '';
+    }
+
+    // }}}
+    // {{{ isDefaulted(key)
+
+    /**
+     * Tells whether a config value has a system-defined value.
+     *
+     * @param string   config key
+     *
+     * @return bool
+     *
+     * @access public
+     *
+     * @deprecated
+     */
+    function isDefaulted($key)
+    {
+        trigger_error("PEAR_Config::isDefaulted() deprecated, use PEAR_Config::definedBy() instead", E_USER_NOTICE);
+        return $this->definedBy($key) == 'system';
+    }
+
+    // }}}
+    // {{{ isDefined(key)
+
+    /**
+     * Tells whether a given key exists as a config value.
+     *
+     * @param string config key
+     *
+     * @return bool whether <config key> exists in this object
+     *
+     * @access public
+     */
+    function isDefined($key)
+    {
+        foreach ($this->layers as $layer) {
+            if (isset($this->configuration[$layer][$key])) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ isDefinedLayer(key)
+
+    /**
+     * Tells whether a given config layer exists.
+     *
+     * @param string config layer
+     *
+     * @return bool whether <config layer> exists in this object
+     *
+     * @access public
+     */
+    function isDefinedLayer($layer)
+    {
+        return isset($this->configuration[$layer]);
+    }
+
+    // }}}
+    // {{{ getLayers()
+
+    /**
+     * Returns the layers defined (except the 'default' one)
+     *
+     * @return array of the defined layers
+     */
+    function getLayers()
+    {
+        $cf = $this->configuration;
+        unset($cf['default']);
+        return array_keys($cf);
+    }
+
+    // }}}
+}
+
+?>
diff --git a/3rdparty/PEAR/Dependency.php b/3rdparty/PEAR/Dependency.php
new file mode 100644
index 00000000000..705167aa70f
--- /dev/null
+++ b/3rdparty/PEAR/Dependency.php
@@ -0,0 +1,487 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Tomas V.V.Cox <cox@idecnet.com>                             |
+// |          Stig Bakken <ssb@php.net>                                   |
+// +----------------------------------------------------------------------+
+//
+// $Id: Dependency.php,v 1.36.4.1 2004/12/27 07:04:19 cellog Exp $
+
+require_once "PEAR.php";
+
+define('PEAR_DEPENDENCY_MISSING',        -1);
+define('PEAR_DEPENDENCY_CONFLICT',       -2);
+define('PEAR_DEPENDENCY_UPGRADE_MINOR',  -3);
+define('PEAR_DEPENDENCY_UPGRADE_MAJOR',  -4);
+define('PEAR_DEPENDENCY_BAD_DEPENDENCY', -5);
+define('PEAR_DEPENDENCY_MISSING_OPTIONAL', -6);
+define('PEAR_DEPENDENCY_CONFLICT_OPTIONAL',       -7);
+define('PEAR_DEPENDENCY_UPGRADE_MINOR_OPTIONAL',  -8);
+define('PEAR_DEPENDENCY_UPGRADE_MAJOR_OPTIONAL',  -9);
+
+/**
+ * Dependency check for PEAR packages
+ *
+ * The class is based on the dependency RFC that can be found at
+ * http://cvs.php.net/cvs.php/pearweb/rfc. It requires PHP >= 4.1
+ *
+ * @author Tomas V.V.Vox <cox@idecnet.com>
+ * @author Stig Bakken <ssb@php.net>
+ */
+class PEAR_Dependency
+{
+    // {{{ constructor
+    /**
+     * Constructor
+     *
+     * @access public
+     * @param  object Registry object
+     * @return void
+     */
+    function PEAR_Dependency(&$registry)
+    {
+        $this->registry = &$registry;
+    }
+
+    // }}}
+    // {{{ callCheckMethod()
+
+    /**
+    * This method maps the XML dependency definition to the
+    * corresponding one from PEAR_Dependency
+    *
+    * <pre>
+    * $opts => Array
+    *    (
+    *        [type] => pkg
+    *        [rel] => ge
+    *        [version] => 3.4
+    *        [name] => HTML_Common
+    *        [optional] => false
+    *    )
+    * </pre>
+    *
+    * @param  string Error message
+    * @param  array  Options
+    * @return boolean
+    */
+    function callCheckMethod(&$errmsg, $opts)
+    {
+        $rel = isset($opts['rel']) ? $opts['rel'] : 'has';
+        $req = isset($opts['version']) ? $opts['version'] : null;
+        $name = isset($opts['name']) ? $opts['name'] : null;
+        $opt = (isset($opts['optional']) && $opts['optional'] == 'yes') ?
+            $opts['optional'] : null;
+        $errmsg = '';
+        switch ($opts['type']) {
+            case 'pkg':
+                return $this->checkPackage($errmsg, $name, $req, $rel, $opt);
+                break;
+            case 'ext':
+                return $this->checkExtension($errmsg, $name, $req, $rel, $opt);
+                break;
+            case 'php':
+                return $this->checkPHP($errmsg, $req, $rel);
+                break;
+            case 'prog':
+                return $this->checkProgram($errmsg, $name);
+                break;
+            case 'os':
+                return $this->checkOS($errmsg, $name);
+                break;
+            case 'sapi':
+                return $this->checkSAPI($errmsg, $name);
+                break;
+            case 'zend':
+                return $this->checkZend($errmsg, $name);
+                break;
+            default:
+                return "'{$opts['type']}' dependency type not supported";
+        }
+    }
+
+    // }}}
+    // {{{ checkPackage()
+
+    /**
+     * Package dependencies check method
+     *
+     * @param string $errmsg    Empty string, it will be populated with an error message, if any
+     * @param string $name      Name of the package to test
+     * @param string $req       The package version required
+     * @param string $relation  How to compare versions with each other
+     * @param bool   $opt       Whether the relationship is optional
+     *
+     * @return mixed bool false if no error or the error string
+     */
+    function checkPackage(&$errmsg, $name, $req = null, $relation = 'has',
+                          $opt = false)
+    {
+        if (is_string($req) && substr($req, 0, 2) == 'v.') {
+            $req = substr($req, 2);
+        }
+        switch ($relation) {
+            case 'has':
+                if (!$this->registry->packageExists($name)) {
+                    if ($opt) {
+                        $errmsg = "package `$name' is recommended to utilize some features.";
+                        return PEAR_DEPENDENCY_MISSING_OPTIONAL;
+                    }
+                    $errmsg = "requires package `$name'";
+                    return PEAR_DEPENDENCY_MISSING;
+                }
+                return false;
+            case 'not':
+                if ($this->registry->packageExists($name)) {
+                    $errmsg = "conflicts with package `$name'";
+                    return PEAR_DEPENDENCY_CONFLICT;
+                }
+                return false;
+            case 'lt':
+            case 'le':
+            case 'eq':
+            case 'ne':
+            case 'ge':
+            case 'gt':
+                $version = $this->registry->packageInfo($name, 'version');
+                if (!$this->registry->packageExists($name)
+                    || !version_compare("$version", "$req", $relation))
+                {
+                    $code = $this->codeFromRelation($relation, $version, $req, $opt);
+                    if ($opt) {
+                        $errmsg = "package `$name' version " . $this->signOperator($relation) .
+                            " $req is recommended to utilize some features.";
+                        if ($version) {
+                            $errmsg .= "  Installed version is $version";
+                        }
+                        return $code;
+                    }
+                    $errmsg = "requires package `$name' " .
+                        $this->signOperator($relation) . " $req";
+                    return $code;
+                }
+                return false;
+        }
+        $errmsg = "relation '$relation' with requirement '$req' is not supported (name=$name)";
+        return PEAR_DEPENDENCY_BAD_DEPENDENCY;
+    }
+
+    // }}}
+    // {{{ checkPackageUninstall()
+
+    /**
+     * Check package dependencies on uninstall
+     *
+     * @param string $error     The resultant error string
+     * @param string $warning   The resultant warning string
+     * @param string $name      Name of the package to test
+     *
+     * @return bool true if there were errors
+     */
+    function checkPackageUninstall(&$error, &$warning, $package)
+    {
+        $error = null;
+        $packages = $this->registry->listPackages();
+        foreach ($packages as $pkg) {
+            if ($pkg == $package) {
+                continue;
+            }
+            $deps = $this->registry->packageInfo($pkg, 'release_deps');
+            if (empty($deps)) {
+                continue;
+            }
+            foreach ($deps as $dep) {
+                if ($dep['type'] == 'pkg' && strcasecmp($dep['name'], $package) == 0) {
+                    if ($dep['rel'] == 'ne' || $dep['rel'] == 'not') {
+                        continue;
+                    }
+                    if (isset($dep['optional']) && $dep['optional'] == 'yes') {
+                        $warning .= "\nWarning: Package '$pkg' optionally depends on '$package'";
+                    } else {
+                        $error .= "Package '$pkg' depends on '$package'\n";
+                    }
+                }
+            }
+        }
+        return ($error) ? true : false;
+    }
+
+    // }}}
+    // {{{ checkExtension()
+
+    /**
+     * Extension dependencies check method
+     *
+     * @param string $name        Name of the extension to test
+     * @param string $req_ext_ver Required extension version to compare with
+     * @param string $relation    How to compare versions with eachother
+     * @param bool   $opt         Whether the relationship is optional
+     *
+     * @return mixed bool false if no error or the error string
+     */
+    function checkExtension(&$errmsg, $name, $req = null, $relation = 'has',
+        $opt = false)
+    {
+        if ($relation == 'not') {
+            if (extension_loaded($name)) {
+                $errmsg = "conflicts with  PHP extension '$name'";
+                return PEAR_DEPENDENCY_CONFLICT;
+            } else {
+                return false;
+            }
+        }
+
+        if (!extension_loaded($name)) {
+            if ($relation == 'not') {
+                return false;
+            }
+            if ($opt) {
+                $errmsg = "'$name' PHP extension is recommended to utilize some features";
+                return PEAR_DEPENDENCY_MISSING_OPTIONAL;
+            }
+            $errmsg = "'$name' PHP extension is not installed";
+            return PEAR_DEPENDENCY_MISSING;
+        }
+        if ($relation == 'has') {
+            return false;
+        }
+        $code = false;
+        if (is_string($req) && substr($req, 0, 2) == 'v.') {
+            $req = substr($req, 2);
+        }
+        $ext_ver = phpversion($name);
+        $operator = $relation;
+        // Force params to be strings, otherwise the comparation will fail (ex. 0.9==0.90)
+        if (!version_compare("$ext_ver", "$req", $operator)) {
+            $errmsg = "'$name' PHP extension version " .
+                $this->signOperator($operator) . " $req is required";
+            $code = $this->codeFromRelation($relation, $ext_ver, $req, $opt);
+            if ($opt) {
+                $errmsg = "'$name' PHP extension version " . $this->signOperator($operator) .
+                    " $req is recommended to utilize some features";
+                return $code;
+            }
+        }
+        return $code;
+    }
+
+    // }}}
+    // {{{ checkOS()
+
+    /**
+     * Operating system  dependencies check method
+     *
+     * @param string $os  Name of the operating system
+     *
+     * @return mixed bool false if no error or the error string
+     */
+    function checkOS(&$errmsg, $os)
+    {
+        // XXX Fixme: Implement a more flexible way, like
+        // comma separated values or something similar to PEAR_OS
+        static $myos;
+        if (empty($myos)) {
+            include_once "OS/Guess.php";
+            $myos = new OS_Guess();
+        }
+        // only 'has' relation is currently supported
+        if ($myos->matchSignature($os)) {
+            return false;
+        }
+        $errmsg = "'$os' operating system not supported";
+        return PEAR_DEPENDENCY_CONFLICT;
+    }
+
+    // }}}
+    // {{{ checkPHP()
+
+    /**
+     * PHP version check method
+     *
+     * @param string $req   which version to compare
+     * @param string $relation  how to compare the version
+     *
+     * @return mixed bool false if no error or the error string
+     */
+    function checkPHP(&$errmsg, $req, $relation = 'ge')
+    {
+        // this would be a bit stupid, but oh well :)
+        if ($relation == 'has') {
+            return false;
+        }
+        if ($relation == 'not') {
+            $errmsg = 'Invalid dependency - "not" is not allowed for php dependencies, ' .
+                'php cannot conflict with itself';
+            return PEAR_DEPENDENCY_BAD_DEPENDENCY;
+        }
+        if (substr($req, 0, 2) == 'v.') {
+            $req = substr($req,2, strlen($req) - 2);
+        }
+        $php_ver = phpversion();
+        $operator = $relation;
+        if (!version_compare("$php_ver", "$req", $operator)) {
+            $errmsg = "PHP version " . $this->signOperator($operator) .
+                " $req is required";
+            return PEAR_DEPENDENCY_CONFLICT;
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ checkProgram()
+
+    /**
+     * External program check method.  Looks for executable files in
+     * directories listed in the PATH environment variable.
+     *
+     * @param string $program   which program to look for
+     *
+     * @return mixed bool false if no error or the error string
+     */
+    function checkProgram(&$errmsg, $program)
+    {
+        // XXX FIXME honor safe mode
+        $exe_suffix = OS_WINDOWS ? '.exe' : '';
+        $path_elements = explode(PATH_SEPARATOR, getenv('PATH'));
+        foreach ($path_elements as $dir) {
+            $file = $dir . DIRECTORY_SEPARATOR . $program . $exe_suffix;
+            if (@file_exists($file) && @is_executable($file)) {
+                return false;
+            }
+        }
+        $errmsg = "'$program' program is not present in the PATH";
+        return PEAR_DEPENDENCY_MISSING;
+    }
+
+    // }}}
+    // {{{ checkSAPI()
+
+    /**
+     * SAPI backend check method.  Version comparison is not yet
+     * available here.
+     *
+     * @param string $name      name of SAPI backend
+     * @param string $req   which version to compare
+     * @param string $relation  how to compare versions (currently
+     *                          hardcoded to 'has')
+     * @return mixed bool false if no error or the error string
+     */
+    function checkSAPI(&$errmsg, $name, $req = null, $relation = 'has')
+    {
+        // XXX Fixme: There is no way to know if the user has or
+        // not other SAPI backends installed than the installer one
+
+        $sapi_backend = php_sapi_name();
+        // Version comparisons not supported, sapi backends don't have
+        // version information yet.
+        if ($sapi_backend == $name) {
+            return false;
+        }
+        $errmsg = "'$sapi_backend' SAPI backend not supported";
+        return PEAR_DEPENDENCY_CONFLICT;
+    }
+
+    // }}}
+    // {{{ checkZend()
+
+    /**
+     * Zend version check method
+     *
+     * @param string $req   which version to compare
+     * @param string $relation  how to compare the version
+     *
+     * @return mixed bool false if no error or the error string
+     */
+    function checkZend(&$errmsg, $req, $relation = 'ge')
+    {
+        if (substr($req, 0, 2) == 'v.') {
+            $req = substr($req,2, strlen($req) - 2);
+        }
+        $zend_ver = zend_version();
+        $operator = substr($relation,0,2);
+        if (!version_compare("$zend_ver", "$req", $operator)) {
+            $errmsg = "Zend version " . $this->signOperator($operator) .
+                " $req is required";
+            return PEAR_DEPENDENCY_CONFLICT;
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ signOperator()
+
+    /**
+     * Converts text comparing operators to them sign equivalents
+     *
+     * Example: 'ge' to '>='
+     *
+     * @access public
+     * @param  string Operator
+     * @return string Sign equivalent
+     */
+    function signOperator($operator)
+    {
+        switch($operator) {
+            case 'lt': return '<';
+            case 'le': return '<=';
+            case 'gt': return '>';
+            case 'ge': return '>=';
+            case 'eq': return '==';
+            case 'ne': return '!=';
+            default:
+                return $operator;
+        }
+    }
+
+    // }}}
+    // {{{ codeFromRelation()
+
+    /**
+     * Convert relation into corresponding code
+     *
+     * @access public
+     * @param  string Relation
+     * @param  string Version
+     * @param  string Requirement
+     * @param  bool   Optional dependency indicator
+     * @return integer
+     */
+    function codeFromRelation($relation, $version, $req, $opt = false)
+    {
+        $code = PEAR_DEPENDENCY_BAD_DEPENDENCY;
+        switch ($relation) {
+            case 'gt': case 'ge': case 'eq':
+                // upgrade
+                $have_major = preg_replace('/\D.*/', '', $version);
+                $need_major = preg_replace('/\D.*/', '', $req);
+                if ($need_major > $have_major) {
+                    $code = $opt ? PEAR_DEPENDENCY_UPGRADE_MAJOR_OPTIONAL :
+                                   PEAR_DEPENDENCY_UPGRADE_MAJOR;
+                } else {
+                    $code = $opt ? PEAR_DEPENDENCY_UPGRADE_MINOR_OPTIONAL :
+                                   PEAR_DEPENDENCY_UPGRADE_MINOR;
+                }
+                break;
+            case 'lt': case 'le': case 'ne':
+                $code = $opt ? PEAR_DEPENDENCY_CONFLICT_OPTIONAL :
+                               PEAR_DEPENDENCY_CONFLICT;
+                break;
+        }
+        return $code;
+    }
+
+    // }}}
+}
+?>
diff --git a/3rdparty/PEAR/Downloader.php b/3rdparty/PEAR/Downloader.php
new file mode 100644
index 00000000000..5e16dc5ffb1
--- /dev/null
+++ b/3rdparty/PEAR/Downloader.php
@@ -0,0 +1,680 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Stig Bakken <ssb@php.net>                                   |
+// |          Tomas V.V.Cox <cox@idecnet.com>                             |
+// |          Martin Jansen <mj@php.net>                                  |
+// +----------------------------------------------------------------------+
+//
+// $Id: Downloader.php,v 1.17.2.1 2004/10/22 22:54:03 cellog Exp $
+
+require_once 'PEAR/Common.php';
+require_once 'PEAR/Registry.php';
+require_once 'PEAR/Dependency.php';
+require_once 'PEAR/Remote.php';
+require_once 'System.php';
+
+
+define('PEAR_INSTALLER_OK',       1);
+define('PEAR_INSTALLER_FAILED',   0);
+define('PEAR_INSTALLER_SKIPPED', -1);
+define('PEAR_INSTALLER_ERROR_NO_PREF_STATE', 2);
+
+/**
+ * Administration class used to download PEAR packages and maintain the
+ * installed package database.
+ *
+ * @since PEAR 1.4
+ * @author Greg Beaver <cellog@php.net>
+ */
+class PEAR_Downloader extends PEAR_Common
+{
+    /**
+     * @var PEAR_Config
+     * @access private
+     */
+    var $_config;
+
+    /**
+     * @var PEAR_Registry
+     * @access private
+     */
+    var $_registry;
+
+    /**
+     * @var PEAR_Remote
+     * @access private
+     */
+    var $_remote;
+
+    /**
+     * Preferred Installation State (snapshot, devel, alpha, beta, stable)
+     * @var string|null
+     * @access private
+     */
+    var $_preferredState;
+
+    /**
+     * Options from command-line passed to Install.
+     *
+     * Recognized options:<br />
+     *  - onlyreqdeps   : install all required dependencies as well
+     *  - alldeps       : install all dependencies, including optional
+     *  - installroot   : base relative path to install files in
+     *  - force         : force a download even if warnings would prevent it
+     * @see PEAR_Command_Install
+     * @access private
+     * @var array
+     */
+    var $_options;
+
+    /**
+     * Downloaded Packages after a call to download().
+     *
+     * Format of each entry:
+     *
+     * <code>
+     * array('pkg' => 'package_name', 'file' => '/path/to/local/file',
+     *    'info' => array() // parsed package.xml
+     * );
+     * </code>
+     * @access private
+     * @var array
+     */
+    var $_downloadedPackages = array();
+
+    /**
+     * Packages slated for download.
+     *
+     * This is used to prevent downloading a package more than once should it be a dependency
+     * for two packages to be installed.
+     * Format of each entry:
+     *
+     * <pre>
+     * array('package_name1' => parsed package.xml, 'package_name2' => parsed package.xml,
+     * );
+     * </pre>
+     * @access private
+     * @var array
+     */
+    var $_toDownload = array();
+
+    /**
+     * Array of every package installed, with names lower-cased.
+     *
+     * Format:
+     * <code>
+     * array('package1' => 0, 'package2' => 1, );
+     * </code>
+     * @var array
+     */
+    var $_installed = array();
+
+    /**
+     * @var array
+     * @access private
+     */
+    var $_errorStack = array();
+
+    // {{{ PEAR_Downloader()
+
+    function PEAR_Downloader(&$ui, $options, &$config)
+    {
+        $this->_options = $options;
+        $this->_config = &$config;
+        $this->_preferredState = $this->_config->get('preferred_state');
+        $this->ui = &$ui;
+        if (!$this->_preferredState) {
+            // don't inadvertantly use a non-set preferred_state
+            $this->_preferredState = null;
+        }
+
+        $php_dir = $this->_config->get('php_dir');
+        if (isset($this->_options['installroot'])) {
+            if (substr($this->_options['installroot'], -1) == DIRECTORY_SEPARATOR) {
+                $this->_options['installroot'] = substr($this->_options['installroot'], 0, -1);
+            }
+            $php_dir = $this->_prependPath($php_dir, $this->_options['installroot']);
+        }
+        $this->_registry = &new PEAR_Registry($php_dir);
+        $this->_remote = &new PEAR_Remote($config);
+
+        if (isset($this->_options['alldeps']) || isset($this->_options['onlyreqdeps'])) {
+            $this->_installed = $this->_registry->listPackages();
+            array_walk($this->_installed, create_function('&$v,$k','$v = strtolower($v);'));
+            $this->_installed = array_flip($this->_installed);
+        }
+        parent::PEAR_Common();
+    }
+
+    // }}}
+    // {{{ configSet()
+    function configSet($key, $value, $layer = 'user')
+    {
+        $this->_config->set($key, $value, $layer);
+        $this->_preferredState = $this->_config->get('preferred_state');
+        if (!$this->_preferredState) {
+            // don't inadvertantly use a non-set preferred_state
+            $this->_preferredState = null;
+        }
+    }
+
+    // }}}
+    // {{{ setOptions()
+    function setOptions($options)
+    {
+        $this->_options = $options;
+    }
+
+    // }}}
+    // {{{ _downloadFile()
+    /**
+     * @param string filename to download
+     * @param string version/state
+     * @param string original value passed to command-line
+     * @param string|null preferred state (snapshot/devel/alpha/beta/stable)
+     *                    Defaults to configuration preferred state
+     * @return null|PEAR_Error|string
+     * @access private
+     */
+    function _downloadFile($pkgfile, $version, $origpkgfile, $state = null)
+    {
+        if (is_null($state)) {
+            $state = $this->_preferredState;
+        }
+        // {{{ check the package filename, and whether it's already installed
+        $need_download = false;
+        if (preg_match('#^(http|ftp)://#', $pkgfile)) {
+            $need_download = true;
+        } elseif (!@is_file($pkgfile)) {
+            if ($this->validPackageName($pkgfile)) {
+                if ($this->_registry->packageExists($pkgfile)) {
+                    if (empty($this->_options['upgrade']) && empty($this->_options['force'])) {
+                        $errors[] = "$pkgfile already installed";
+                        return;
+                    }
+                }
+                $pkgfile = $this->getPackageDownloadUrl($pkgfile, $version);
+                $need_download = true;
+            } else {
+                if (strlen($pkgfile)) {
+                    $errors[] = "Could not open the package file: $pkgfile";
+                } else {
+                    $errors[] = "No package file given";
+                }
+                return;
+            }
+        }
+        // }}}
+
+        // {{{ Download package -----------------------------------------------
+        if ($need_download) {
+            $downloaddir = $this->_config->get('download_dir');
+            if (empty($downloaddir)) {
+                if (PEAR::isError($downloaddir = System::mktemp('-d'))) {
+                    return $downloaddir;
+                }
+                $this->log(3, '+ tmp dir created at ' . $downloaddir);
+            }
+            $callback = $this->ui ? array(&$this, '_downloadCallback') : null;
+            $this->pushErrorHandling(PEAR_ERROR_RETURN);
+            $file = $this->downloadHttp($pkgfile, $this->ui, $downloaddir, $callback);
+            $this->popErrorHandling();
+            if (PEAR::isError($file)) {
+                if ($this->validPackageName($origpkgfile)) {
+                    if (!PEAR::isError($info = $this->_remote->call('package.info',
+                          $origpkgfile))) {
+                        if (!count($info['releases'])) {
+                            return $this->raiseError('Package ' . $origpkgfile .
+                            ' has no releases');
+                        } else {
+                            return $this->raiseError('No releases of preferred state "'
+                            . $state . '" exist for package ' . $origpkgfile .
+                            '.  Use ' . $origpkgfile . '-state to install another' .
+                            ' state (like ' . $origpkgfile .'-beta)',
+                            PEAR_INSTALLER_ERROR_NO_PREF_STATE);
+                        }
+                    } else {
+                        return $pkgfile;
+                    }
+                } else {
+                    return $this->raiseError($file);
+                }
+            }
+            $pkgfile = $file;
+        }
+        // }}}
+        return $pkgfile;
+    }
+    // }}}
+    // {{{ getPackageDownloadUrl()
+
+    function getPackageDownloadUrl($package, $version = null)
+    {
+        if ($version) {
+            $package .= "-$version";
+        }
+        if ($this === null || $this->_config === null) {
+            $package = "http://pear.php.net/get/$package";
+        } else {
+            $package = "http://" . $this->_config->get('master_server') .
+                "/get/$package";
+        }
+        if (!extension_loaded("zlib")) {
+            $package .= '?uncompress=yes';
+        }
+        return $package;
+    }
+
+    // }}}
+    // {{{ extractDownloadFileName($pkgfile, &$version)
+
+    function extractDownloadFileName($pkgfile, &$version)
+    {
+        if (@is_file($pkgfile)) {
+            return $pkgfile;
+        }
+        // regex defined in Common.php
+        if (preg_match(PEAR_COMMON_PACKAGE_DOWNLOAD_PREG, $pkgfile, $m)) {
+            $version = (isset($m[3])) ? $m[3] : null;
+            return $m[1];
+        }
+        $version = null;
+        return $pkgfile;
+    }
+
+    // }}}
+
+    // }}}
+    // {{{ getDownloadedPackages()
+
+    /**
+     * Retrieve a list of downloaded packages after a call to {@link download()}.
+     *
+     * Also resets the list of downloaded packages.
+     * @return array
+     */
+    function getDownloadedPackages()
+    {
+        $ret = $this->_downloadedPackages;
+        $this->_downloadedPackages = array();
+        $this->_toDownload = array();
+        return $ret;
+    }
+
+    // }}}
+    // {{{ download()
+
+    /**
+     * Download any files and their dependencies, if necessary
+     *
+     * BC-compatible method name
+     * @param array a mixed list of package names, local files, or package.xml
+     */
+    function download($packages)
+    {
+        return $this->doDownload($packages);
+    }
+
+    // }}}
+    // {{{ doDownload()
+
+    /**
+     * Download any files and their dependencies, if necessary
+     *
+     * @param array a mixed list of package names, local files, or package.xml
+     */
+    function doDownload($packages)
+    {
+        $mywillinstall = array();
+        $state = $this->_preferredState;
+
+        // {{{ download files in this list if necessary
+        foreach($packages as $pkgfile) {
+            $need_download = false;
+            if (!is_file($pkgfile)) {
+                if (preg_match('#^(http|ftp)://#', $pkgfile)) {
+                    $need_download = true;
+                }
+                $pkgfile = $this->_downloadNonFile($pkgfile);
+                if (PEAR::isError($pkgfile)) {
+                    return $pkgfile;
+                }
+                if ($pkgfile === false) {
+                    continue;
+                }
+            } // end is_file()
+
+            $tempinfo = $this->infoFromAny($pkgfile);
+            if ($need_download) {
+                $this->_toDownload[] = $tempinfo['package'];
+            }
+            if (isset($this->_options['alldeps']) || isset($this->_options['onlyreqdeps'])) {
+                // ignore dependencies if there are any errors
+                if (!PEAR::isError($tempinfo)) {
+                    $mywillinstall[strtolower($tempinfo['package'])] = @$tempinfo['release_deps'];
+                }
+            }
+            $this->_downloadedPackages[] = array('pkg' => $tempinfo['package'],
+                                       'file' => $pkgfile, 'info' => $tempinfo);
+        } // end foreach($packages)
+        // }}}
+
+        // {{{ extract dependencies from downloaded files and then download
+        // them if necessary
+        if (isset($this->_options['alldeps']) || isset($this->_options['onlyreqdeps'])) {
+            $deppackages = array();
+            foreach ($mywillinstall as $package => $alldeps) {
+                if (!is_array($alldeps)) {
+                    // there are no dependencies
+                    continue;
+                }
+                $fail = false;
+                foreach ($alldeps as $info) {
+                    if ($info['type'] != 'pkg') {
+                        continue;
+                    }
+                    $ret = $this->_processDependency($package, $info, $mywillinstall);
+                    if ($ret === false) {
+                        continue;
+                    }
+                    if ($ret === 0) {
+                        $fail = true;
+                        continue;
+                    }
+                    if (PEAR::isError($ret)) {
+                        return $ret;
+                    }
+                    $deppackages[] = $ret;
+                } // foreach($alldeps
+                if ($fail) {
+                    $deppackages = array();
+                }
+            }
+
+            if (count($deppackages)) {
+                $this->doDownload($deppackages);
+            }
+        } // }}} if --alldeps or --onlyreqdeps
+    }
+
+    // }}}
+    // {{{ _downloadNonFile($pkgfile)
+
+    /**
+     * @return false|PEAR_Error|string false if loop should be broken out of,
+     *                                 string if the file was downloaded,
+     *                                 PEAR_Error on exception
+     * @access private
+     */
+    function _downloadNonFile($pkgfile)
+    {
+        $origpkgfile = $pkgfile;
+        $state = null;
+        $pkgfile = $this->extractDownloadFileName($pkgfile, $version);
+        if (preg_match('#^(http|ftp)://#', $pkgfile)) {
+            return $this->_downloadFile($pkgfile, $version, $origpkgfile);
+        }
+        if (!$this->validPackageName($pkgfile)) {
+            return $this->raiseError("Package name '$pkgfile' not valid");
+        }
+        // ignore packages that are installed unless we are upgrading
+        $curinfo = $this->_registry->packageInfo($pkgfile);
+        if ($this->_registry->packageExists($pkgfile)
+              && empty($this->_options['upgrade']) && empty($this->_options['force'])) {
+            $this->log(0, "Package '{$curinfo['package']}' already installed, skipping");
+            return false;
+        }
+        if (in_array($pkgfile, $this->_toDownload)) {
+            return false;
+        }
+        $releases = $this->_remote->call('package.info', $pkgfile, 'releases', true);
+        if (!count($releases)) {
+            return $this->raiseError("No releases found for package '$pkgfile'");
+        }
+        // Want a specific version/state
+        if ($version !== null) {
+            // Passed Foo-1.2
+            if ($this->validPackageVersion($version)) {
+                if (!isset($releases[$version])) {
+                    return $this->raiseError("No release with version '$version' found for '$pkgfile'");
+                }
+            // Passed Foo-alpha
+            } elseif (in_array($version, $this->getReleaseStates())) {
+                $state = $version;
+                $version = 0;
+                foreach ($releases as $ver => $inf) {
+                    if ($inf['state'] == $state && version_compare("$version", "$ver") < 0) {
+                        $version = $ver;
+                        break;
+                    }
+                }
+                if ($version == 0) {
+                    return $this->raiseError("No release with state '$state' found for '$pkgfile'");
+                }
+            // invalid suffix passed
+            } else {
+                return $this->raiseError("Invalid suffix '-$version', be sure to pass a valid PEAR ".
+                                         "version number or release state");
+            }
+        // Guess what to download
+        } else {
+            $states = $this->betterStates($this->_preferredState, true);
+            $possible = false;
+            $version = 0;
+            $higher_version = 0;
+            $prev_hi_ver = 0;
+            foreach ($releases as $ver => $inf) {
+                if (in_array($inf['state'], $states) && version_compare("$version", "$ver") < 0) {
+                    $version = $ver;
+                    break;
+                } else {
+                    $ver = (string)$ver;
+                    if (version_compare($prev_hi_ver, $ver) < 0) {
+                        $prev_hi_ver = $higher_version = $ver;
+                    }
+				}
+            }
+            if ($version === 0 && !isset($this->_options['force'])) {
+                return $this->raiseError('No release with state equal to: \'' . implode(', ', $states) .
+                                         "' found for '$pkgfile'");
+            } elseif ($version === 0) {
+                $this->log(0, "Warning: $pkgfile is state '" . $releases[$higher_version]['state'] . "' which is less stable " .
+                              "than state '$this->_preferredState'");
+            }
+        }
+        // Check if we haven't already the version
+        if (empty($this->_options['force']) && !is_null($curinfo)) {
+            if ($curinfo['version'] == $version) {
+                $this->log(0, "Package '{$curinfo['package']}-{$curinfo['version']}' already installed, skipping");
+                return false;
+            } elseif (version_compare("$version", "{$curinfo['version']}") < 0) {
+                $this->log(0, "Package '{$curinfo['package']}' version '{$curinfo['version']}' " .
+                              " is installed and {$curinfo['version']} is > requested '$version', skipping");
+                return false;
+            }
+        }
+        $this->_toDownload[] = $pkgfile;
+        return $this->_downloadFile($pkgfile, $version, $origpkgfile, $state);
+    }
+
+    // }}}
+    // {{{ _processDependency($package, $info, $mywillinstall)
+
+    /**
+     * Process a dependency, download if necessary
+     * @param array dependency information from PEAR_Remote call
+     * @param array packages that will be installed in this iteration
+     * @return false|string|PEAR_Error
+     * @access private
+     * @todo Add test for relation 'lt'/'le' -> make sure that the dependency requested is
+     *       in fact lower than the required value.  This will be very important for BC dependencies
+     */
+    function _processDependency($package, $info, $mywillinstall)
+    {
+        $state = $this->_preferredState;
+        if (!isset($this->_options['alldeps']) && isset($info['optional']) &&
+              $info['optional'] == 'yes') {
+            // skip optional deps
+            $this->log(0, "skipping Package '$package' optional dependency '$info[name]'");
+            return false;
+        }
+        // {{{ get releases
+        $releases = $this->_remote->call('package.info', $info['name'], 'releases', true);
+        if (PEAR::isError($releases)) {
+            return $releases;
+        }
+        if (!count($releases)) {
+            if (!isset($this->_installed[strtolower($info['name'])])) {
+                $this->pushError("Package '$package' dependency '$info[name]' ".
+                            "has no releases");
+            }
+            return false;
+        }
+        $found = false;
+        $save = $releases;
+        while(count($releases) && !$found) {
+            if (!empty($state) && $state != 'any') {
+                list($release_version, $release) = each($releases);
+                if ($state != $release['state'] &&
+                    !in_array($release['state'], $this->betterStates($state)))
+                {
+                    // drop this release - it ain't stable enough
+                    array_shift($releases);
+                } else {
+                    $found = true;
+                }
+            } else {
+                $found = true;
+            }
+        }
+        if (!count($releases) && !$found) {
+            $get = array();
+            foreach($save as $release) {
+                $get = array_merge($get,
+                    $this->betterStates($release['state'], true));
+            }
+            $savestate = array_shift($get);
+            $this->pushError( "Release for '$package' dependency '$info[name]' " .
+                "has state '$savestate', requires '$state'");
+            return 0;
+        }
+        if (in_array(strtolower($info['name']), $this->_toDownload) ||
+              isset($mywillinstall[strtolower($info['name'])])) {
+            // skip upgrade check for packages we will install
+            return false;
+        }
+        if (!isset($this->_installed[strtolower($info['name'])])) {
+            // check to see if we can install the specific version required
+            if ($info['rel'] == 'eq') {
+                return $info['name'] . '-' . $info['version'];
+            }
+            // skip upgrade check for packages we don't have installed
+            return $info['name'];
+        }
+        // }}}
+
+        // {{{ see if a dependency must be upgraded
+        $inst_version = $this->_registry->packageInfo($info['name'], 'version');
+        if (!isset($info['version'])) {
+            // this is a rel='has' dependency, check against latest
+            if (version_compare($release_version, $inst_version, 'le')) {
+                return false;
+            } else {
+                return $info['name'];
+            }
+        }
+        if (version_compare($info['version'], $inst_version, 'le')) {
+            // installed version is up-to-date
+            return false;
+        }
+        return $info['name'];
+    }
+
+    // }}}
+    // {{{ _downloadCallback()
+
+    function _downloadCallback($msg, $params = null)
+    {
+        switch ($msg) {
+            case 'saveas':
+                $this->log(1, "downloading $params ...");
+                break;
+            case 'done':
+                $this->log(1, '...done: ' . number_format($params, 0, '', ',') . ' bytes');
+                break;
+            case 'bytesread':
+                static $bytes;
+                if (empty($bytes)) {
+                    $bytes = 0;
+                }
+                if (!($bytes % 10240)) {
+                    $this->log(1, '.', false);
+                }
+                $bytes += $params;
+                break;
+            case 'start':
+                $this->log(1, "Starting to download {$params[0]} (".number_format($params[1], 0, '', ',')." bytes)");
+                break;
+        }
+        if (method_exists($this->ui, '_downloadCallback'))
+            $this->ui->_downloadCallback($msg, $params);
+    }
+
+    // }}}
+    // {{{ _prependPath($path, $prepend)
+
+    function _prependPath($path, $prepend)
+    {
+        if (strlen($prepend) > 0) {
+            if (OS_WINDOWS && preg_match('/^[a-z]:/i', $path)) {
+                $path = $prepend . substr($path, 2);
+            } else {
+                $path = $prepend . $path;
+            }
+        }
+        return $path;
+    }
+    // }}}
+    // {{{ pushError($errmsg, $code)
+
+    /**
+     * @param string
+     * @param integer
+     */
+    function pushError($errmsg, $code = -1)
+    {
+        array_push($this->_errorStack, array($errmsg, $code));
+    }
+
+    // }}}
+    // {{{ getErrorMsgs()
+
+    function getErrorMsgs()
+    {
+        $msgs = array();
+        $errs = $this->_errorStack;
+        foreach ($errs as $err) {
+            $msgs[] = $err[0];
+        }
+        $this->_errorStack = array();
+        return $msgs;
+    }
+
+    // }}}
+}
+// }}}
+
+?>
diff --git a/3rdparty/PEAR/ErrorStack.php b/3rdparty/PEAR/ErrorStack.php
new file mode 100644
index 00000000000..da52f08d345
--- /dev/null
+++ b/3rdparty/PEAR/ErrorStack.php
@@ -0,0 +1,981 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Gregory Beaver <cellog@php.net>                              |
+// |                                                                      |
+// +----------------------------------------------------------------------+
+//
+// $Id: ErrorStack.php,v 1.7.2.5 2005/01/01 21:26:51 cellog Exp $
+
+/**
+ * Error Stack Implementation
+ * 
+ * This is an incredibly simple implementation of a very complex error handling
+ * facility.  It contains the ability
+ * to track multiple errors from multiple packages simultaneously.  In addition,
+ * it can track errors of many levels, save data along with the error, context
+ * information such as the exact file, line number, class and function that
+ * generated the error, and if necessary, it can raise a traditional PEAR_Error.
+ * It has built-in support for PEAR::Log, to log errors as they occur
+ * 
+ * Since version 0.2alpha, it is also possible to selectively ignore errors,
+ * through the use of an error callback, see {@link pushCallback()}
+ * 
+ * Since version 0.3alpha, it is possible to specify the exception class
+ * returned from {@link push()}
+ *
+ * Since version PEAR1.3.2, ErrorStack no longer instantiates an exception class.  This can
+ * still be done quite handily in an error callback or by manipulating the returned array
+ * @author Greg Beaver <cellog@php.net>
+ * @version PEAR1.3.2 (beta)
+ * @package PEAR_ErrorStack
+ * @category Debugging
+ * @license http://www.php.net/license/3_0.txt PHP License v3.0
+ */
+
+/**
+ * Singleton storage
+ * 
+ * Format:
+ * <pre>
+ * array(
+ *  'package1' => PEAR_ErrorStack object,
+ *  'package2' => PEAR_ErrorStack object,
+ *  ...
+ * )
+ * </pre>
+ * @access private
+ * @global array $GLOBALS['_PEAR_ERRORSTACK_SINGLETON']
+ */
+$GLOBALS['_PEAR_ERRORSTACK_SINGLETON'] = array();
+
+/**
+ * Global error callback (default)
+ * 
+ * This is only used if set to non-false.  * is the default callback for
+ * all packages, whereas specific packages may set a default callback
+ * for all instances, regardless of whether they are a singleton or not.
+ *
+ * To exclude non-singletons, only set the local callback for the singleton
+ * @see PEAR_ErrorStack::setDefaultCallback()
+ * @access private
+ * @global array $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK']
+ */
+$GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK'] = array(
+    '*' => false,
+);
+
+/**
+ * Global Log object (default)
+ * 
+ * This is only used if set to non-false.  Use to set a default log object for
+ * all stacks, regardless of instantiation order or location
+ * @see PEAR_ErrorStack::setDefaultLogger()
+ * @access private
+ * @global array $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER']
+ */
+$GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'] = false;
+
+/**
+ * Global Overriding Callback
+ * 
+ * This callback will override any error callbacks that specific loggers have set.
+ * Use with EXTREME caution
+ * @see PEAR_ErrorStack::staticPushCallback()
+ * @access private
+ * @global array $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER']
+ */
+$GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'] = array();
+
+/**#@+
+ * One of four possible return values from the error Callback
+ * @see PEAR_ErrorStack::_errorCallback()
+ */
+/**
+ * If this is returned, then the error will be both pushed onto the stack
+ * and logged.
+ */
+define('PEAR_ERRORSTACK_PUSHANDLOG', 1);
+/**
+ * If this is returned, then the error will only be pushed onto the stack,
+ * and not logged.
+ */
+define('PEAR_ERRORSTACK_PUSH', 2);
+/**
+ * If this is returned, then the error will only be logged, but not pushed
+ * onto the error stack.
+ */
+define('PEAR_ERRORSTACK_LOG', 3);
+/**
+ * If this is returned, then the error is completely ignored.
+ */
+define('PEAR_ERRORSTACK_IGNORE', 4);
+/**
+ * If this is returned, then the error is logged and die() is called.
+ */
+define('PEAR_ERRORSTACK_DIE', 5);
+/**#@-*/
+
+/**
+ * Error code for an attempt to instantiate a non-class as a PEAR_ErrorStack in
+ * the singleton method.
+ */
+define('PEAR_ERRORSTACK_ERR_NONCLASS', 1);
+
+/**
+ * Error code for an attempt to pass an object into {@link PEAR_ErrorStack::getMessage()}
+ * that has no __toString() method
+ */
+define('PEAR_ERRORSTACK_ERR_OBJTOSTRING', 2);
+/**
+ * Error Stack Implementation
+ *
+ * Usage:
+ * <code>
+ * // global error stack
+ * $global_stack = &PEAR_ErrorStack::singleton('MyPackage');
+ * // local error stack
+ * $local_stack = new PEAR_ErrorStack('MyPackage');
+ * </code>
+ * @copyright 2004 Gregory Beaver
+ * @package PEAR_ErrorStack
+ * @license http://www.php.net/license/3_0.txt PHP License
+ */
+class PEAR_ErrorStack {
+    /**
+     * Errors are stored in the order that they are pushed on the stack.
+     * @since 0.4alpha Errors are no longer organized by error level.
+     * This renders pop() nearly unusable, and levels could be more easily
+     * handled in a callback anyway
+     * @var array
+     * @access private
+     */
+    var $_errors = array();
+
+    /**
+     * Storage of errors by level.
+     *
+     * Allows easy retrieval and deletion of only errors from a particular level
+     * @since PEAR 1.4.0dev
+     * @var array
+     * @access private
+     */
+    var $_errorsByLevel = array();
+
+    /**
+     * Package name this error stack represents
+     * @var string
+     * @access protected
+     */
+    var $_package;
+    
+    /**
+     * Determines whether a PEAR_Error is thrown upon every error addition
+     * @var boolean
+     * @access private
+     */
+    var $_compat = false;
+    
+    /**
+     * If set to a valid callback, this will be used to generate the error
+     * message from the error code, otherwise the message passed in will be
+     * used
+     * @var false|string|array
+     * @access private
+     */
+    var $_msgCallback = false;
+    
+    /**
+     * If set to a valid callback, this will be used to generate the error
+     * context for an error.  For PHP-related errors, this will be a file
+     * and line number as retrieved from debug_backtrace(), but can be
+     * customized for other purposes.  The error might actually be in a separate
+     * configuration file, or in a database query.
+     * @var false|string|array
+     * @access protected
+     */
+    var $_contextCallback = false;
+    
+    /**
+     * If set to a valid callback, this will be called every time an error
+     * is pushed onto the stack.  The return value will be used to determine
+     * whether to allow an error to be pushed or logged.
+     * 
+     * The return value must be one an PEAR_ERRORSTACK_* constant
+     * @see PEAR_ERRORSTACK_PUSHANDLOG, PEAR_ERRORSTACK_PUSH, PEAR_ERRORSTACK_LOG
+     * @var false|string|array
+     * @access protected
+     */
+    var $_errorCallback = array();
+    
+    /**
+     * PEAR::Log object for logging errors
+     * @var false|Log
+     * @access protected
+     */
+    var $_logger = false;
+    
+    /**
+     * Error messages - designed to be overridden
+     * @var array
+     * @abstract
+     */
+    var $_errorMsgs = array();
+    
+    /**
+     * Set up a new error stack
+     * 
+     * @param string   $package name of the package this error stack represents
+     * @param callback $msgCallback callback used for error message generation
+     * @param callback $contextCallback callback used for context generation,
+     *                 defaults to {@link getFileLine()}
+     * @param boolean  $throwPEAR_Error
+     */
+    function PEAR_ErrorStack($package, $msgCallback = false, $contextCallback = false,
+                         $throwPEAR_Error = false)
+    {
+        $this->_package = $package;
+        $this->setMessageCallback($msgCallback);
+        $this->setContextCallback($contextCallback);
+        $this->_compat = $throwPEAR_Error;
+    }
+    
+    /**
+     * Return a single error stack for this package.
+     * 
+     * Note that all parameters are ignored if the stack for package $package
+     * has already been instantiated
+     * @param string   $package name of the package this error stack represents
+     * @param callback $msgCallback callback used for error message generation
+     * @param callback $contextCallback callback used for context generation,
+     *                 defaults to {@link getFileLine()}
+     * @param boolean  $throwPEAR_Error
+     * @param string   $stackClass class to instantiate
+     * @static
+     * @return PEAR_ErrorStack
+     */
+    function &singleton($package, $msgCallback = false, $contextCallback = false,
+                         $throwPEAR_Error = false, $stackClass = 'PEAR_ErrorStack')
+    {
+        if (isset($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package])) {
+            return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package];
+        }
+        if (!class_exists($stackClass)) {
+            if (function_exists('debug_backtrace')) {
+                $trace = debug_backtrace();
+            }
+            PEAR_ErrorStack::staticPush('PEAR_ErrorStack', PEAR_ERRORSTACK_ERR_NONCLASS,
+                'exception', array('stackclass' => $stackClass),
+                'stack class "%stackclass%" is not a valid class name (should be like PEAR_ErrorStack)',
+                false, $trace);
+        }
+        return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package] =
+            &new $stackClass($package, $msgCallback, $contextCallback, $throwPEAR_Error);
+    }
+
+    /**
+     * Internal error handler for PEAR_ErrorStack class
+     * 
+     * Dies if the error is an exception (and would have died anyway)
+     * @access private
+     */
+    function _handleError($err)
+    {
+        if ($err['level'] == 'exception') {
+            $message = $err['message'];
+            if (isset($_SERVER['REQUEST_URI'])) {
+                echo '<br />';
+            } else {
+                echo "\n";
+            }
+            var_dump($err['context']);
+            die($message);
+        }
+    }
+    
+    /**
+     * Set up a PEAR::Log object for all error stacks that don't have one
+     * @param Log $log 
+     * @static
+     */
+    function setDefaultLogger(&$log)
+    {
+        if (is_object($log) && method_exists($log, 'log') ) {
+            $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'] = &$log;
+        } elseif (is_callable($log)) {
+            $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'] = &$log;
+	}
+    }
+    
+    /**
+     * Set up a PEAR::Log object for this error stack
+     * @param Log $log 
+     */
+    function setLogger(&$log)
+    {
+        if (is_object($log) && method_exists($log, 'log') ) {
+            $this->_logger = &$log;
+        } elseif (is_callable($log)) {
+            $this->_logger = &$log;
+        }
+    }
+    
+    /**
+     * Set an error code => error message mapping callback
+     * 
+     * This method sets the callback that can be used to generate error
+     * messages for any instance
+     * @param array|string Callback function/method
+     */
+    function setMessageCallback($msgCallback)
+    {
+        if (!$msgCallback) {
+            $this->_msgCallback = array(&$this, 'getErrorMessage');
+        } else {
+            if (is_callable($msgCallback)) {
+                $this->_msgCallback = $msgCallback;
+            }
+        }
+    }
+    
+    /**
+     * Get an error code => error message mapping callback
+     * 
+     * This method returns the current callback that can be used to generate error
+     * messages
+     * @return array|string|false Callback function/method or false if none
+     */
+    function getMessageCallback()
+    {
+        return $this->_msgCallback;
+    }
+    
+    /**
+     * Sets a default callback to be used by all error stacks
+     * 
+     * This method sets the callback that can be used to generate error
+     * messages for a singleton
+     * @param array|string Callback function/method
+     * @param string Package name, or false for all packages
+     * @static
+     */
+    function setDefaultCallback($callback = false, $package = false)
+    {
+        if (!is_callable($callback)) {
+            $callback = false;
+        }
+        $package = $package ? $package : '*';
+        $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK'][$package] = $callback;
+    }
+    
+    /**
+     * Set a callback that generates context information (location of error) for an error stack
+     * 
+     * This method sets the callback that can be used to generate context
+     * information for an error.  Passing in NULL will disable context generation
+     * and remove the expensive call to debug_backtrace()
+     * @param array|string|null Callback function/method
+     */
+    function setContextCallback($contextCallback)
+    {
+        if ($contextCallback === null) {
+            return $this->_contextCallback = false;
+        }
+        if (!$contextCallback) {
+            $this->_contextCallback = array(&$this, 'getFileLine');
+        } else {
+            if (is_callable($contextCallback)) {
+                $this->_contextCallback = $contextCallback;
+            }
+        }
+    }
+    
+    /**
+     * Set an error Callback
+     * If set to a valid callback, this will be called every time an error
+     * is pushed onto the stack.  The return value will be used to determine
+     * whether to allow an error to be pushed or logged.
+     * 
+     * The return value must be one of the ERRORSTACK_* constants.
+     * 
+     * This functionality can be used to emulate PEAR's pushErrorHandling, and
+     * the PEAR_ERROR_CALLBACK mode, without affecting the integrity of
+     * the error stack or logging
+     * @see PEAR_ERRORSTACK_PUSHANDLOG, PEAR_ERRORSTACK_PUSH, PEAR_ERRORSTACK_LOG
+     * @see popCallback()
+     * @param string|array $cb
+     */
+    function pushCallback($cb)
+    {
+        array_push($this->_errorCallback, $cb);
+    }
+    
+    /**
+     * Remove a callback from the error callback stack
+     * @see pushCallback()
+     * @return array|string|false
+     */
+    function popCallback()
+    {
+        if (!count($this->_errorCallback)) {
+            return false;
+        }
+        return array_pop($this->_errorCallback);
+    }
+    
+    /**
+     * Set a temporary overriding error callback for every package error stack
+     *
+     * Use this to temporarily disable all existing callbacks (can be used
+     * to emulate the @ operator, for instance)
+     * @see PEAR_ERRORSTACK_PUSHANDLOG, PEAR_ERRORSTACK_PUSH, PEAR_ERRORSTACK_LOG
+     * @see staticPopCallback(), pushCallback()
+     * @param string|array $cb
+     * @static
+     */
+    function staticPushCallback($cb)
+    {
+        array_push($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'], $cb);
+    }
+    
+    /**
+     * Remove a temporary overriding error callback
+     * @see staticPushCallback()
+     * @return array|string|false
+     * @static
+     */
+    function staticPopCallback()
+    {
+        $ret = array_pop($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK']);
+        if (!is_array($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'])) {
+            $GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'] = array();
+        }
+        return $ret;
+    }
+    
+    /**
+     * Add an error to the stack
+     * 
+     * If the message generator exists, it is called with 2 parameters.
+     *  - the current Error Stack object
+     *  - an array that is in the same format as an error.  Available indices
+     *    are 'code', 'package', 'time', 'params', 'level', and 'context'
+     * 
+     * Next, if the error should contain context information, this is
+     * handled by the context grabbing method.
+     * Finally, the error is pushed onto the proper error stack
+     * @param int    $code      Package-specific error code
+     * @param string $level     Error level.  This is NOT spell-checked
+     * @param array  $params    associative array of error parameters
+     * @param string $msg       Error message, or a portion of it if the message
+     *                          is to be generated
+     * @param array  $repackage If this error re-packages an error pushed by
+     *                          another package, place the array returned from
+     *                          {@link pop()} in this parameter
+     * @param array  $backtrace Protected parameter: use this to pass in the
+     *                          {@link debug_backtrace()} that should be used
+     *                          to find error context
+     * @return PEAR_Error|array|Exception
+     *                          if compatibility mode is on, a PEAR_Error is also
+     *                          thrown.  If the class Exception exists, then one
+     *                          is returned to allow code like:
+     * <code>
+     * throw ($stack->push(MY_ERROR_CODE, 'error', array('username' => 'grob')));
+     * </code>
+     * 
+     * The errorData property of the exception class will be set to the array
+     * that would normally be returned.  If a PEAR_Error is returned, the userinfo
+     * property is set to the array
+     * 
+     * Otherwise, an array is returned in this format:
+     * <code>
+     * array(
+     *    'code' => $code,
+     *    'params' => $params,
+     *    'package' => $this->_package,
+     *    'level' => $level,
+     *    'time' => time(),
+     *    'context' => $context,
+     *    'message' => $msg,
+     * //['repackage' => $err] repackaged error array/Exception class
+     * );
+     * </code>
+     */
+    function push($code, $level = 'error', $params = array(), $msg = false,
+                  $repackage = false, $backtrace = false)
+    {
+        $context = false;
+        // grab error context
+        if ($this->_contextCallback) {
+            if (!$backtrace) {
+                $backtrace = debug_backtrace();
+            }
+            $context = call_user_func($this->_contextCallback, $code, $params, $backtrace);
+        }
+        
+        // save error
+        $time = explode(' ', microtime());
+        $time = $time[1] + $time[0];
+        $err = array(
+                'code' => $code,
+                'params' => $params,
+                'package' => $this->_package,
+                'level' => $level,
+                'time' => $time,
+                'context' => $context,
+                'message' => $msg,
+               );
+
+        // set up the error message, if necessary
+        if ($this->_msgCallback) {
+            $msg = call_user_func_array($this->_msgCallback,
+                                        array(&$this, $err));
+            $err['message'] = $msg;
+        }        
+        
+        if ($repackage) {
+            $err['repackage'] = $repackage;
+        }
+        $push = $log = true;
+        $die = false;
+        // try the overriding callback first
+        $callback = $this->staticPopCallback();
+        if ($callback) {
+            $this->staticPushCallback($callback);
+        }
+        if (!is_callable($callback)) {
+            // try the local callback next
+            $callback = $this->popCallback();
+            if (is_callable($callback)) {
+                $this->pushCallback($callback);
+            } else {
+                // try the default callback
+                $callback = isset($GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK'][$this->_package]) ?
+                    $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK'][$this->_package] :
+                    $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK']['*'];
+            }
+        }
+        if (is_callable($callback)) {
+            switch(call_user_func($callback, $err)){
+            	case PEAR_ERRORSTACK_IGNORE: 
+            		return $err;
+        		break;
+            	case PEAR_ERRORSTACK_PUSH: 
+            		$log = false;
+        		break;
+            	case PEAR_ERRORSTACK_LOG: 
+            		$push = false;
+        		break;
+            	case PEAR_ERRORSTACK_DIE: 
+            		$die = true;
+        		break;
+                // anything else returned has the same effect as pushandlog
+            }
+        }
+        if ($push) {
+            array_unshift($this->_errors, $err);
+            $this->_errorsByLevel[$err['level']][] = &$this->_errors[0];
+        }
+        if ($log) {
+            if ($this->_logger || $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER']) {
+                $this->_log($err);
+            }
+        }
+        if ($die) {
+            die();
+        }
+        if ($this->_compat && $push) {
+            return $this->raiseError($msg, $code, null, null, $err);
+        }
+        return $err;
+    }
+    
+    /**
+     * Static version of {@link push()}
+     * 
+     * @param string $package   Package name this error belongs to
+     * @param int    $code      Package-specific error code
+     * @param string $level     Error level.  This is NOT spell-checked
+     * @param array  $params    associative array of error parameters
+     * @param string $msg       Error message, or a portion of it if the message
+     *                          is to be generated
+     * @param array  $repackage If this error re-packages an error pushed by
+     *                          another package, place the array returned from
+     *                          {@link pop()} in this parameter
+     * @param array  $backtrace Protected parameter: use this to pass in the
+     *                          {@link debug_backtrace()} that should be used
+     *                          to find error context
+     * @return PEAR_Error|null|Exception
+     *                          if compatibility mode is on, a PEAR_Error is also
+     *                          thrown.  If the class Exception exists, then one
+     *                          is returned to allow code like:
+     * <code>
+     * throw ($stack->push(MY_ERROR_CODE, 'error', array('username' => 'grob')));
+     * </code>
+     * @static
+     */
+    function staticPush($package, $code, $level = 'error', $params = array(),
+                        $msg = false, $repackage = false, $backtrace = false)
+    {
+        $s = &PEAR_ErrorStack::singleton($package);
+        if ($s->_contextCallback) {
+            if (!$backtrace) {
+                if (function_exists('debug_backtrace')) {
+                    $backtrace = debug_backtrace();
+                }
+            }
+        }
+        return $s->push($code, $level, $params, $msg, $repackage, $backtrace);
+    }
+    
+    /**
+     * Log an error using PEAR::Log
+     * @param array $err Error array
+     * @param array $levels Error level => Log constant map
+     * @access protected
+     */
+    function _log($err)
+    {
+        if ($this->_logger) {
+            $logger = &$this->_logger;
+        } else {
+            $logger = &$GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'];
+        }
+        if (is_a($logger, 'Log')) {
+            $levels = array(
+                'exception' => PEAR_LOG_CRIT,
+                'alert' => PEAR_LOG_ALERT,
+                'critical' => PEAR_LOG_CRIT,
+                'error' => PEAR_LOG_ERR,
+                'warning' => PEAR_LOG_WARNING,
+                'notice' => PEAR_LOG_NOTICE,
+                'info' => PEAR_LOG_INFO,
+                'debug' => PEAR_LOG_DEBUG);
+            if (isset($levels[$err['level']])) {
+                $level = $levels[$err['level']];
+            } else {
+                $level = PEAR_LOG_INFO;
+            }
+            $logger->log($err['message'], $level, $err);
+        } else { // support non-standard logs
+            call_user_func($logger, $err);
+        }
+    }
+
+    
+    /**
+     * Pop an error off of the error stack
+     * 
+     * @return false|array
+     * @since 0.4alpha it is no longer possible to specify a specific error
+     * level to return - the last error pushed will be returned, instead
+     */
+    function pop()
+    {
+        return @array_shift($this->_errors);
+    }
+    
+    /**
+     * Determine whether there are any errors on the stack
+     * @param string|array Level name.  Use to determine if any errors
+     * of level (string), or levels (array) have been pushed
+     * @return boolean
+     */
+    function hasErrors($level = false)
+    {
+        if ($level) {
+            return isset($this->_errorsByLevel[$level]);
+        }
+        return count($this->_errors);
+    }
+    
+    /**
+     * Retrieve all errors since last purge
+     * 
+     * @param boolean set in order to empty the error stack
+     * @param string level name, to return only errors of a particular severity
+     * @return array
+     */
+    function getErrors($purge = false, $level = false)
+    {
+        if (!$purge) {
+            if ($level) {
+                if (!isset($this->_errorsByLevel[$level])) {
+                    return array();
+                } else {
+                    return $this->_errorsByLevel[$level];
+                }
+            } else {
+                return $this->_errors;
+            }
+        }
+        if ($level) {
+            $ret = $this->_errorsByLevel[$level];
+            foreach ($this->_errorsByLevel[$level] as $i => $unused) {
+                // entries are references to the $_errors array
+                $this->_errorsByLevel[$level][$i] = false;
+            }
+            // array_filter removes all entries === false
+            $this->_errors = array_filter($this->_errors);
+            unset($this->_errorsByLevel[$level]);
+            return $ret;
+        }
+        $ret = $this->_errors;
+        $this->_errors = array();
+        $this->_errorsByLevel = array();
+        return $ret;
+    }
+    
+    /**
+     * Determine whether there are any errors on a single error stack, or on any error stack
+     *
+     * The optional parameter can be used to test the existence of any errors without the need of
+     * singleton instantiation
+     * @param string|false Package name to check for errors
+     * @param string Level name to check for a particular severity
+     * @return boolean
+     * @static
+     */
+    function staticHasErrors($package = false, $level = false)
+    {
+        if ($package) {
+            if (!isset($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package])) {
+                return false;
+            }
+            return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package]->hasErrors($level);
+        }
+        foreach ($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'] as $package => $obj) {
+            if ($obj->hasErrors($level)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    /**
+     * Get a list of all errors since last purge, organized by package
+     * @since PEAR 1.4.0dev BC break! $level is now in the place $merge used to be
+     * @param boolean $purge Set to purge the error stack of existing errors
+     * @param string  $level Set to a level name in order to retrieve only errors of a particular level
+     * @param boolean $merge Set to return a flat array, not organized by package
+     * @param array   $sortfunc Function used to sort a merged array - default
+     *        sorts by time, and should be good for most cases
+     * @static
+     * @return array 
+     */
+    function staticGetErrors($purge = false, $level = false, $merge = false,
+                             $sortfunc = array('PEAR_ErrorStack', '_sortErrors'))
+    {
+        $ret = array();
+        if (!is_callable($sortfunc)) {
+            $sortfunc = array('PEAR_ErrorStack', '_sortErrors');
+        }
+        foreach ($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'] as $package => $obj) {
+            $test = $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package]->getErrors($purge, $level);
+            if ($test) {
+                if ($merge) {
+                    $ret = array_merge($ret, $test);
+                } else {
+                    $ret[$package] = $test;
+                }
+            }
+        }
+        if ($merge) {
+            usort($ret, $sortfunc);
+        }
+        return $ret;
+    }
+    
+    /**
+     * Error sorting function, sorts by time
+     * @access private
+     */
+    function _sortErrors($a, $b)
+    {
+        if ($a['time'] == $b['time']) {
+            return 0;
+        }
+        if ($a['time'] < $b['time']) {
+            return 1;
+        }
+        return -1;
+    }
+
+    /**
+     * Standard file/line number/function/class context callback
+     *
+     * This function uses a backtrace generated from {@link debug_backtrace()}
+     * and so will not work at all in PHP < 4.3.0.  The frame should
+     * reference the frame that contains the source of the error.
+     * @return array|false either array('file' => file, 'line' => line,
+     *         'function' => function name, 'class' => class name) or
+     *         if this doesn't work, then false
+     * @param unused
+     * @param integer backtrace frame.
+     * @param array Results of debug_backtrace()
+     * @static
+     */
+    function getFileLine($code, $params, $backtrace = null)
+    {
+        if ($backtrace === null) {
+            return false;
+        }
+        $frame = 0;
+        $functionframe = 1;
+        if (!isset($backtrace[1])) {
+            $functionframe = 0;
+        } else {
+            while (isset($backtrace[$functionframe]['function']) &&
+                  $backtrace[$functionframe]['function'] == 'eval' &&
+                  isset($backtrace[$functionframe + 1])) {
+                $functionframe++;
+            }
+        }
+        if (isset($backtrace[$frame])) {
+            if (!isset($backtrace[$frame]['file'])) {
+                $frame++;
+            }
+            $funcbacktrace = $backtrace[$functionframe];
+            $filebacktrace = $backtrace[$frame];
+            $ret = array('file' => $filebacktrace['file'],
+                         'line' => $filebacktrace['line']);
+            // rearrange for eval'd code or create function errors
+            if (strpos($filebacktrace['file'], '(') && 
+            	  preg_match(';^(.*?)\((\d+)\) : (.*?)$;', $filebacktrace['file'],
+                  $matches)) {
+                $ret['file'] = $matches[1];
+                $ret['line'] = $matches[2] + 0;
+            }
+            if (isset($funcbacktrace['function']) && isset($backtrace[1])) {
+                if ($funcbacktrace['function'] != 'eval') {
+                    if ($funcbacktrace['function'] == '__lambda_func') {
+                        $ret['function'] = 'create_function() code';
+                    } else {
+                        $ret['function'] = $funcbacktrace['function'];
+                    }
+                }
+            }
+            if (isset($funcbacktrace['class']) && isset($backtrace[1])) {
+                $ret['class'] = $funcbacktrace['class'];
+            }
+            return $ret;
+        }
+        return false;
+    }
+    
+    /**
+     * Standard error message generation callback
+     * 
+     * This method may also be called by a custom error message generator
+     * to fill in template values from the params array, simply
+     * set the third parameter to the error message template string to use
+     * 
+     * The special variable %__msg% is reserved: use it only to specify
+     * where a message passed in by the user should be placed in the template,
+     * like so:
+     * 
+     * Error message: %msg% - internal error
+     * 
+     * If the message passed like so:
+     * 
+     * <code>
+     * $stack->push(ERROR_CODE, 'error', array(), 'server error 500');
+     * </code>
+     * 
+     * The returned error message will be "Error message: server error 500 -
+     * internal error"
+     * @param PEAR_ErrorStack
+     * @param array
+     * @param string|false Pre-generated error message template
+     * @static
+     * @return string
+     */
+    function getErrorMessage(&$stack, $err, $template = false)
+    {
+        if ($template) {
+            $mainmsg = $template;
+        } else {
+            $mainmsg = $stack->getErrorMessageTemplate($err['code']);
+        }
+        $mainmsg = str_replace('%__msg%', $err['message'], $mainmsg);
+        if (count($err['params'])) {
+            foreach ($err['params'] as $name => $val) {
+                if (is_array($val)) {
+                    // @ is needed in case $val is a multi-dimensional array
+                    $val = @implode(', ', $val);
+                }
+                if (is_object($val)) {
+                    if (method_exists($val, '__toString')) {
+                        $val = $val->__toString();
+                    } else {
+                        PEAR_ErrorStack::staticPush('PEAR_ErrorStack', PEAR_ERRORSTACK_ERR_OBJTOSTRING,
+                            'warning', array('obj' => get_class($val)),
+                            'object %obj% passed into getErrorMessage, but has no __toString() method');
+                        $val = 'Object';
+                    }
+                }
+                $mainmsg = str_replace('%' . $name . '%', $val, $mainmsg);
+            }
+        }
+        return $mainmsg;
+    }
+    
+    /**
+     * Standard Error Message Template generator from code
+     * @return string
+     */
+    function getErrorMessageTemplate($code)
+    {
+        if (!isset($this->_errorMsgs[$code])) {
+            return '%__msg%';
+        }
+        return $this->_errorMsgs[$code];
+    }
+    
+    /**
+     * Set the Error Message Template array
+     * 
+     * The array format must be:
+     * <pre>
+     * array(error code => 'message template',...)
+     * </pre>
+     * 
+     * Error message parameters passed into {@link push()} will be used as input
+     * for the error message.  If the template is 'message %foo% was %bar%', and the
+     * parameters are array('foo' => 'one', 'bar' => 'six'), the error message returned will
+     * be 'message one was six'
+     * @return string
+     */
+    function setErrorMessageTemplate($template)
+    {
+        $this->_errorMsgs = $template;
+    }
+    
+    
+    /**
+     * emulate PEAR::raiseError()
+     * 
+     * @return PEAR_Error
+     */
+    function raiseError()
+    {
+        require_once 'PEAR.php';
+        $args = func_get_args();
+        return call_user_func_array(array('PEAR', 'raiseError'), $args);
+    }
+}
+$stack = &PEAR_ErrorStack::singleton('PEAR_ErrorStack');
+$stack->pushCallback(array('PEAR_ErrorStack', '_handleError'));
+?>
\ No newline at end of file
diff --git a/3rdparty/PEAR/Exception.php b/3rdparty/PEAR/Exception.php
new file mode 100644
index 00000000000..c735c16b398
--- /dev/null
+++ b/3rdparty/PEAR/Exception.php
@@ -0,0 +1,359 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 foldmethod=marker: */
+// +----------------------------------------------------------------------+
+// | PEAR_Exception                                                       |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 2004 The PEAR Group                                    |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Tomas V.V.Cox <cox@idecnet.com>                             |
+// |          Hans Lellelid <hans@velum.net>                              |
+// |          Bertrand Mansion <bmansion@mamasam.com>                     |
+// |          Greg Beaver <cellog@php.net>                                |
+// +----------------------------------------------------------------------+
+//
+// $Id: Exception.php,v 1.4.2.2 2004/12/31 19:01:52 cellog Exp $
+
+
+/**
+ * Base PEAR_Exception Class
+ *
+ * WARNING: This code should be considered stable, but the API is
+ * subject to immediate and drastic change, so API stability is
+ * at best alpha
+ *
+ * 1) Features:
+ *
+ * - Nestable exceptions (throw new PEAR_Exception($msg, $prev_exception))
+ * - Definable triggers, shot when exceptions occur
+ * - Pretty and informative error messages
+ * - Added more context info available (like class, method or cause)
+ * - cause can be a PEAR_Exception or an array of mixed
+ *   PEAR_Exceptions/PEAR_ErrorStack warnings
+ * - callbacks for specific exception classes and their children
+ *
+ * 2) Ideas:
+ *
+ * - Maybe a way to define a 'template' for the output
+ *
+ * 3) Inherited properties from PHP Exception Class:
+ *
+ * protected $message
+ * protected $code
+ * protected $line
+ * protected $file
+ * private   $trace
+ *
+ * 4) Inherited methods from PHP Exception Class:
+ *
+ * __clone
+ * __construct
+ * getMessage
+ * getCode
+ * getFile
+ * getLine
+ * getTraceSafe
+ * getTraceSafeAsString
+ * __toString
+ *
+ * 5) Usage example
+ *
+ * <code>
+ *  require_once 'PEAR/Exception.php';
+ *
+ *  class Test {
+ *     function foo() {
+ *         throw new PEAR_Exception('Error Message', ERROR_CODE);
+ *     }
+ *  }
+ *
+ *  function myLogger($pear_exception) {
+ *     echo $pear_exception->getMessage();
+ *  }
+ *  // each time a exception is thrown the 'myLogger' will be called
+ *  // (its use is completely optional)
+ *  PEAR_Exception::addObserver('myLogger');
+ *  $test = new Test;
+ *  try {
+ *     $test->foo();
+ *  } catch (PEAR_Exception $e) {
+ *     print $e;
+ *  }
+ * </code>
+ *
+ * @since PHP 5
+ * @package PEAR
+ * @version $Revision: 1.4.2.2 $
+ * @author Tomas V.V.Cox <cox@idecnet.com>
+ * @author Hans Lellelid <hans@velum.net>
+ * @author Bertrand Mansion <bmansion@mamasam.com>
+ *
+ */
+class PEAR_Exception extends Exception
+{
+    const OBSERVER_PRINT = -2;
+    const OBSERVER_TRIGGER = -4;
+    const OBSERVER_DIE = -8;
+    protected $cause;
+    private static $_observers = array();
+    private static $_uniqueid = 0;
+    private $_trace;
+
+    /**
+     * Supported signatures:
+     * PEAR_Exception(string $message);
+     * PEAR_Exception(string $message, int $code);
+     * PEAR_Exception(string $message, Exception $cause);
+     * PEAR_Exception(string $message, Exception $cause, int $code);
+     * PEAR_Exception(string $message, array $causes);
+     * PEAR_Exception(string $message, array $causes, int $code);
+     */
+    public function __construct($message, $p2 = null, $p3 = null)
+    {
+        if (is_int($p2)) {
+            $code = $p2;
+            $this->cause = null;
+        } elseif ($p2 instanceof Exception || is_array($p2)) {
+            $code = $p3;
+            if (is_array($p2) && isset($p2['message'])) {
+                // fix potential problem of passing in a single warning
+                $p2 = array($p2);
+            }
+            $this->cause = $p2;
+        } else {
+        $code = null;
+            $this->cause = null;
+        }
+        parent::__construct($message, $code);
+        $this->signal();
+    }
+
+    /**
+     * @param mixed $callback  - A valid php callback, see php func is_callable()
+     *                         - A PEAR_Exception::OBSERVER_* constant
+     *                         - An array(const PEAR_Exception::OBSERVER_*,
+     *                           mixed $options)
+     * @param string $label    The name of the observer. Use this if you want
+     *                         to remove it later with removeObserver()
+     */
+    public static function addObserver($callback, $label = 'default')
+    {
+        self::$_observers[$label] = $callback;
+    }
+
+    public static function removeObserver($label = 'default')
+    {
+        unset(self::$_observers[$label]);
+    }
+
+    /**
+     * @return int unique identifier for an observer
+     */
+    public static function getUniqueId()
+    {
+        return self::$_uniqueid++;
+    }
+
+    private function signal()
+    {
+        foreach (self::$_observers as $func) {
+            if (is_callable($func)) {
+                call_user_func($func, $this);
+                continue;
+            }
+            settype($func, 'array');
+            switch ($func[0]) {
+                case self::OBSERVER_PRINT :
+                    $f = (isset($func[1])) ? $func[1] : '%s';
+                    printf($f, $this->getMessage());
+                    break;
+                case self::OBSERVER_TRIGGER :
+                    $f = (isset($func[1])) ? $func[1] : E_USER_NOTICE;
+                    trigger_error($this->getMessage(), $f);
+                    break;
+                case self::OBSERVER_DIE :
+                    $f = (isset($func[1])) ? $func[1] : '%s';
+                    die(printf($f, $this->getMessage()));
+                    break;
+                default:
+                    trigger_error('invalid observer type', E_USER_WARNING);
+            }
+        }
+    }
+
+    /**
+     * Return specific error information that can be used for more detailed
+     * error messages or translation.
+     *
+     * This method may be overridden in child exception classes in order
+     * to add functionality not present in PEAR_Exception and is a placeholder
+     * to define API
+     *
+     * The returned array must be an associative array of parameter => value like so:
+     * <pre>
+     * array('name' => $name, 'context' => array(...))
+     * </pre>
+     * @return array
+     */
+    public function getErrorData()
+    {
+        return array();
+    }
+
+    /**
+     * Returns the exception that caused this exception to be thrown
+     * @access public
+     * @return Exception|array The context of the exception
+     */
+    public function getCause()
+    {
+        return $this->cause;
+    }
+
+    /**
+     * Function must be public to call on caused exceptions
+     * @param array
+     */
+    public function getCauseMessage(&$causes)
+    {
+        $trace = $this->getTraceSafe();
+        $cause = array('class'   => get_class($this),
+                       'message' => $this->message,
+                       'file' => 'unknown',
+                       'line' => 'unknown');
+        if (isset($trace[0])) {
+            if (isset($trace[0]['file'])) {
+                $cause['file'] = $trace[0]['file'];
+                $cause['line'] = $trace[0]['line'];
+            }
+        }
+        if ($this->cause instanceof PEAR_Exception) {
+            $this->cause->getCauseMessage($causes);
+        }
+        if (is_array($this->cause)) {
+            foreach ($this->cause as $cause) {
+                if ($cause instanceof PEAR_Exception) {
+                    $cause->getCauseMessage($causes);
+                } elseif (is_array($cause) && isset($cause['message'])) {
+                    // PEAR_ErrorStack warning
+                    $causes[] = array(
+                        'class' => $cause['package'],
+                        'message' => $cause['message'],
+                        'file' => isset($cause['context']['file']) ?
+                                            $cause['context']['file'] :
+                                            'unknown',
+                        'line' => isset($cause['context']['line']) ?
+                                            $cause['context']['line'] :
+                                            'unknown',
+                    );
+                }
+            }
+        }
+    }
+
+    public function getTraceSafe()
+    {   
+        if (!isset($this->_trace)) {
+            $this->_trace = $this->getTrace();
+            if (empty($this->_trace)) {
+                $backtrace = debug_backtrace();
+                $this->_trace = array($backtrace[count($backtrace)-1]);
+            }
+        }
+        return $this->_trace;
+    }
+
+    public function getErrorClass()
+    {
+        $trace = $this->getTraceSafe();
+        return $trace[0]['class'];
+    }
+
+    public function getErrorMethod()
+    {
+        $trace = $this->getTraceSafe();
+        return $trace[0]['function'];
+    }
+
+    public function __toString()
+    {
+        if (isset($_SERVER['REQUEST_URI'])) {
+            return $this->toHtml();
+        }
+        return $this->toText();
+        }
+
+    public function toHtml()
+    {
+        $trace = $this->getTraceSafe();
+        $causes = array();
+        $this->getCauseMessage($causes);
+        $html =  '<table border="1" cellspacing="0">' . "\n";
+        foreach ($causes as $i => $cause) {
+            $html .= '<tr><td colspan="3" bgcolor="#ff9999">'
+               . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
+               . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
+               . 'on line <b>' . $cause['line'] . '</b>'
+               . "</td></tr>\n";
+        }
+        $html .= '<tr><td colspan="3" bgcolor="#aaaaaa" align="center"><b>Exception trace</b></td></tr>' . "\n"
+               . '<tr><td align="center" bgcolor="#cccccc" width="20"><b>#</b></td>'
+               . '<td align="center" bgcolor="#cccccc"><b>Function</b></td>'
+               . '<td align="center" bgcolor="#cccccc"><b>Location</b></td></tr>' . "\n";
+
+        foreach ($trace as $k => $v) {
+            $html .= '<tr><td align="center">' . $k . '</td>'
+                   . '<td>';
+            if (!empty($v['class'])) {
+                $html .= $v['class'] . $v['type'];
+            }
+            $html .= $v['function'];
+            $args = array();
+            if (!empty($v['args'])) {
+                foreach ($v['args'] as $arg) {
+                    if (is_null($arg)) $args[] = 'null';
+                    elseif (is_array($arg)) $args[] = 'Array';
+                    elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
+                    elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
+                    elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
+                    else {
+                        $arg = (string)$arg;
+                        $str = htmlspecialchars(substr($arg, 0, 16));
+                        if (strlen($arg) > 16) $str .= '&hellip;';
+                        $args[] = "'" . $str . "'";
+                    }
+                }
+            }
+            $html .= '(' . implode(', ',$args) . ')'
+                   . '</td>'
+                   . '<td>' . $v['file'] . ':' . $v['line'] . '</td></tr>' . "\n";
+        }
+        $html .= '<tr><td align="center">' . ($k+1) . '</td>'
+               . '<td>{main}</td>'
+               . '<td>&nbsp;</td></tr>' . "\n"
+               . '</table>';
+        return $html;
+    }
+
+    public function toText()
+    {
+        $causes = array();
+        $this->getCauseMessage($causes);
+        $causeMsg = '';
+        foreach ($causes as $i => $cause) {
+            $causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
+                   . $cause['message'] . ' in ' . $cause['file']
+                   . ' on line ' . $cause['line'] . "\n";
+        }
+        return $causeMsg . $this->getTraceAsString();
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/PEAR/Frontend/CLI.php b/3rdparty/PEAR/Frontend/CLI.php
new file mode 100644
index 00000000000..832ddf09b3f
--- /dev/null
+++ b/3rdparty/PEAR/Frontend/CLI.php
@@ -0,0 +1,509 @@
+<?php
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 5                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2004 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | This source file is subject to version 3.0 of the PHP license,       |
+  | that is bundled with this package in the file LICENSE, and is        |
+  | available through the world-wide-web at the following url:           |
+  | http://www.php.net/license/3_0.txt.                                  |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to          |
+  | license@php.net so we can mail you a copy immediately.               |
+  +----------------------------------------------------------------------+
+  | Author: Stig Sæther Bakken <ssb@php.net>                             |
+  +----------------------------------------------------------------------+
+
+  $Id: CLI.php,v 1.41 2004/02/17 05:49:16 ssb Exp $
+*/
+
+require_once "PEAR.php";
+
+class PEAR_Frontend_CLI extends PEAR
+{
+    // {{{ properties
+
+    /**
+     * What type of user interface this frontend is for.
+     * @var string
+     * @access public
+     */
+    var $type = 'CLI';
+    var $lp = ''; // line prefix
+
+    var $params = array();
+    var $term = array(
+        'bold' => '',
+        'normal' => '',
+        );
+
+    // }}}
+
+    // {{{ constructor
+
+    function PEAR_Frontend_CLI()
+    {
+        parent::PEAR();
+        $term = getenv('TERM'); //(cox) $_ENV is empty for me in 4.1.1
+        if (function_exists('posix_isatty') && !posix_isatty(1)) {
+            // output is being redirected to a file or through a pipe
+        } elseif ($term) {
+            // XXX can use ncurses extension here, if available
+            if (preg_match('/^(xterm|vt220|linux)/', $term)) {
+                $this->term['bold'] = sprintf("%c%c%c%c", 27, 91, 49, 109);
+                $this->term['normal']=sprintf("%c%c%c", 27, 91, 109);
+            } elseif (preg_match('/^vt100/', $term)) {
+                $this->term['bold'] = sprintf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0);
+                $this->term['normal']=sprintf("%c%c%c%c%c", 27, 91, 109, 0, 0);
+            }
+        } elseif (OS_WINDOWS) {
+            // XXX add ANSI codes here
+        }
+    }
+
+    // }}}
+
+    // {{{ displayLine(text)
+
+    function displayLine($text)
+    {
+        trigger_error("PEAR_Frontend_CLI::displayLine deprecated", E_USER_ERROR);
+    }
+
+    function _displayLine($text)
+    {
+        print "$this->lp$text\n";
+    }
+
+    // }}}
+    // {{{ display(text)
+
+    function display($text)
+    {
+        trigger_error("PEAR_Frontend_CLI::display deprecated", E_USER_ERROR);
+    }
+
+    function _display($text)
+    {
+        print $text;
+    }
+
+    // }}}
+    // {{{ displayError(eobj)
+
+    /**
+     * @param object PEAR_Error object
+     */
+    function displayError($eobj)
+    {
+        return $this->_displayLine($eobj->getMessage());
+    }
+
+    // }}}
+    // {{{ displayFatalError(eobj)
+
+    /**
+     * @param object PEAR_Error object
+     */
+    function displayFatalError($eobj)
+    {
+        $this->displayError($eobj);
+        exit(1);
+    }
+
+    // }}}
+    // {{{ displayHeading(title)
+
+    function displayHeading($title)
+    {
+        trigger_error("PEAR_Frontend_CLI::displayHeading deprecated", E_USER_ERROR);
+    }
+
+    function _displayHeading($title)
+    {
+        print $this->lp.$this->bold($title)."\n";
+        print $this->lp.str_repeat("=", strlen($title))."\n";
+    }
+
+    // }}}
+    // {{{ userDialog(prompt, [type], [default])
+
+    function userDialog($command, $prompts, $types = array(), $defaults = array())
+    {
+        $result = array();
+        if (is_array($prompts)) {
+            $fp = fopen("php://stdin", "r");
+            foreach ($prompts as $key => $prompt) {
+                $type = $types[$key];
+                $default = @$defaults[$key];
+                if ($type == 'password') {
+                    system('stty -echo');
+                }
+                print "$this->lp$prompt ";
+                if ($default) {
+                    print "[$default] ";
+                }
+                print ": ";
+                $line = fgets($fp, 2048);
+                if ($type == 'password') {
+                    system('stty echo');
+                    print "\n";
+                }
+                if ($default && trim($line) == "") {
+                    $result[$key] = $default;
+                } else {
+                    $result[$key] = $line;
+                }
+            }
+            fclose($fp);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ userConfirm(prompt, [default])
+
+    function userConfirm($prompt, $default = 'yes')
+    {
+        trigger_error("PEAR_Frontend_CLI::userConfirm not yet converted", E_USER_ERROR);
+        static $positives = array('y', 'yes', 'on', '1');
+        static $negatives = array('n', 'no', 'off', '0');
+        print "$this->lp$prompt [$default] : ";
+        $fp = fopen("php://stdin", "r");
+        $line = fgets($fp, 2048);
+        fclose($fp);
+        $answer = strtolower(trim($line));
+        if (empty($answer)) {
+            $answer = $default;
+        }
+        if (in_array($answer, $positives)) {
+            return true;
+        }
+        if (in_array($answer, $negatives)) {
+            return false;
+        }
+        if (in_array($default, $positives)) {
+            return true;
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ startTable([params])
+
+    function startTable($params = array())
+    {
+        trigger_error("PEAR_Frontend_CLI::startTable deprecated", E_USER_ERROR);
+    }
+
+    function _startTable($params = array())
+    {
+        $params['table_data'] = array();
+        $params['widest'] = array();  // indexed by column
+        $params['highest'] = array(); // indexed by row
+        $params['ncols'] = 0;
+        $this->params = $params;
+    }
+
+    // }}}
+    // {{{ tableRow(columns, [rowparams], [colparams])
+
+    function tableRow($columns, $rowparams = array(), $colparams = array())
+    {
+        trigger_error("PEAR_Frontend_CLI::tableRow deprecated", E_USER_ERROR);
+    }
+
+    function _tableRow($columns, $rowparams = array(), $colparams = array())
+    {
+        $highest = 1;
+        for ($i = 0; $i < sizeof($columns); $i++) {
+            $col = &$columns[$i];
+            if (isset($colparams[$i]) && !empty($colparams[$i]['wrap'])) {
+                $col = wordwrap($col, $colparams[$i]['wrap'], "\n", 0);
+            }
+            if (strpos($col, "\n") !== false) {
+                $multiline = explode("\n", $col);
+                $w = 0;
+                foreach ($multiline as $n => $line) {
+                    if (strlen($line) > $w) {
+                        $w = strlen($line);
+                    }
+                }
+                $lines = sizeof($multiline);
+            } else {
+                $w = strlen($col);
+            }
+            if ($w > @$this->params['widest'][$i]) {
+                $this->params['widest'][$i] = $w;
+            }
+            $tmp = count_chars($columns[$i], 1);
+            // handle unix, mac and windows formats
+            $lines = (isset($tmp[10]) ? $tmp[10] : @$tmp[13]) + 1;
+            if ($lines > $highest) {
+                $highest = $lines;
+            }
+        }
+        if (sizeof($columns) > $this->params['ncols']) {
+            $this->params['ncols'] = sizeof($columns);
+        }
+        $new_row = array(
+            'data' => $columns,
+            'height' => $highest,
+            'rowparams' => $rowparams,
+            'colparams' => $colparams,
+            );
+        $this->params['table_data'][] = $new_row;
+    }
+
+    // }}}
+    // {{{ endTable()
+
+    function endTable()
+    {
+        trigger_error("PEAR_Frontend_CLI::endTable deprecated", E_USER_ERROR);
+    }
+
+    function _endTable()
+    {
+        extract($this->params);
+        if (!empty($caption)) {
+            $this->_displayHeading($caption);
+        }
+        if (count($table_data) == 0) {
+            return;
+        }
+        if (!isset($width)) {
+            $width = $widest;
+        } else {
+            for ($i = 0; $i < $ncols; $i++) {
+                if (!isset($width[$i])) {
+                    $width[$i] = $widest[$i];
+                }
+            }
+        }
+        $border = false;
+        if (empty($border)) {
+            $cellstart = '';
+            $cellend = ' ';
+            $rowend = '';
+            $padrowend = false;
+            $borderline = '';
+        } else {
+            $cellstart = '| ';
+            $cellend = ' ';
+            $rowend = '|';
+            $padrowend = true;
+            $borderline = '+';
+            foreach ($width as $w) {
+                $borderline .= str_repeat('-', $w + strlen($cellstart) + strlen($cellend) - 1);
+                $borderline .= '+';
+            }
+        }
+        if ($borderline) {
+            $this->_displayLine($borderline);
+        }
+        for ($i = 0; $i < sizeof($table_data); $i++) {
+            extract($table_data[$i]);
+            if (!is_array($rowparams)) {
+                $rowparams = array();
+            }
+            if (!is_array($colparams)) {
+                $colparams = array();
+            }
+            $rowlines = array();
+            if ($height > 1) {
+                for ($c = 0; $c < sizeof($data); $c++) {
+                    $rowlines[$c] = preg_split('/(\r?\n|\r)/', $data[$c]);
+                    if (sizeof($rowlines[$c]) < $height) {
+                        $rowlines[$c] = array_pad($rowlines[$c], $height, '');
+                    }
+                }
+            } else {
+                for ($c = 0; $c < sizeof($data); $c++) {
+                    $rowlines[$c] = array($data[$c]);
+                }
+            }
+            for ($r = 0; $r < $height; $r++) {
+                $rowtext = '';
+                for ($c = 0; $c < sizeof($data); $c++) {
+                    if (isset($colparams[$c])) {
+                        $attribs = array_merge($rowparams, $colparams);
+                    } else {
+                        $attribs = $rowparams;
+                    }
+                    $w = isset($width[$c]) ? $width[$c] : 0;
+                    //$cell = $data[$c];
+                    $cell = $rowlines[$c][$r];
+                    $l = strlen($cell);
+                    if ($l > $w) {
+                        $cell = substr($cell, 0, $w);
+                    }
+                    if (isset($attribs['bold'])) {
+                        $cell = $this->bold($cell);
+                    }
+                    if ($l < $w) {
+                        // not using str_pad here because we may
+                        // add bold escape characters to $cell
+                        $cell .= str_repeat(' ', $w - $l);
+                    }
+
+                    $rowtext .= $cellstart . $cell . $cellend;
+                }
+                if (!$border) {
+                    $rowtext = rtrim($rowtext);
+                }
+                $rowtext .= $rowend;
+                $this->_displayLine($rowtext);
+            }
+        }
+        if ($borderline) {
+            $this->_displayLine($borderline);
+        }
+    }
+
+    // }}}
+    // {{{ outputData()
+
+    function outputData($data, $command = '_default')
+    {
+        switch ($command) {
+            case 'install':
+            case 'upgrade':
+            case 'upgrade-all':
+                if (isset($data['release_warnings'])) {
+                    $this->_displayLine('');
+                    $this->_startTable(array(
+                        'border' => false,
+                        'caption' => 'Release Warnings'
+                        ));
+                    $this->_tableRow(array($data['release_warnings']), null, array(1 => array('wrap' => 55)));
+                    $this->_endTable();
+                    $this->_displayLine('');
+                }
+                $this->_displayLine($data['data']);
+                break;
+            case 'search':
+                $this->_startTable($data);
+                if (isset($data['headline']) && is_array($data['headline'])) {
+                    $this->_tableRow($data['headline'], array('bold' => true), array(1 => array('wrap' => 55)));
+                }
+
+                foreach($data['data'] as $category) {
+                    foreach($category as $pkg) {
+                        $this->_tableRow($pkg, null, array(1 => array('wrap' => 55)));
+                    }
+                };
+                $this->_endTable();
+                break;
+            case 'list-all':
+                $this->_startTable($data);
+                if (isset($data['headline']) && is_array($data['headline'])) {
+                    $this->_tableRow($data['headline'], array('bold' => true), array(1 => array('wrap' => 55)));
+                }
+
+                foreach($data['data'] as $category) {
+                    foreach($category as $pkg) {
+                        unset($pkg[3]);
+                        unset($pkg[4]);
+                        $this->_tableRow($pkg, null, array(1 => array('wrap' => 55)));
+                    }
+                };
+                $this->_endTable();
+                break;
+            case 'config-show':
+                $data['border'] = false;
+                $opts = array(0 => array('wrap' => 30),
+                              1 => array('wrap' => 20),
+                              2 => array('wrap' => 35));
+                $this->_startTable($data);
+                if (isset($data['headline']) && is_array($data['headline'])) {
+                    $this->_tableRow($data['headline'],
+                                     array('bold' => true),
+                                     $opts);
+                }
+                foreach($data['data'] as $group) {
+                    foreach($group as $value) {
+                        if ($value[2] == '') {
+                            $value[2] = "<not set>";
+                        }
+                        $this->_tableRow($value, null, $opts);
+                    }
+                }
+                $this->_endTable();
+                break;
+            case 'remote-info':
+                $data = array(
+                    'caption' => 'Package details:',
+                    'border' => false,
+                    'data' => array(
+                        array("Latest",    $data['stable']),
+                        array("Installed", $data['installed']),
+                        array("Package",   $data['name']),
+                        array("License",   $data['license']),
+                        array("Category",  $data['category']),
+                        array("Summary",   $data['summary']),
+                        array("Description", $data['description']),
+                        ),
+                    );
+            default: {
+                if (is_array($data)) {
+                    $this->_startTable($data);
+                    $count = count($data['data'][0]);
+                    if ($count == 2) {
+                        $opts = array(0 => array('wrap' => 25),
+                                      1 => array('wrap' => 48)
+                        );
+                    } elseif ($count == 3) {
+                        $opts = array(0 => array('wrap' => 30),
+                                      1 => array('wrap' => 20),
+                                      2 => array('wrap' => 35)
+                        );
+                    } else {
+                        $opts = null;
+                    }
+                    if (isset($data['headline']) && is_array($data['headline'])) {
+                        $this->_tableRow($data['headline'],
+                                         array('bold' => true),
+                                         $opts);
+                    }
+                    foreach($data['data'] as $row) {
+                        $this->_tableRow($row, null, $opts);
+                    }
+                    $this->_endTable();
+                } else {
+                    $this->_displayLine($data);
+                }
+            }
+        }
+    }
+
+    // }}}
+    // {{{ log(text)
+
+
+    function log($text, $append_crlf = true)
+    {
+        if ($append_crlf) {
+            return $this->_displayLine($text);
+        }
+        return $this->_display($text);
+    }
+
+
+    // }}}
+    // {{{ bold($text)
+
+    function bold($text)
+    {
+        if (empty($this->term['bold'])) {
+            return strtoupper($text);
+        }
+        return $this->term['bold'] . $text . $this->term['normal'];
+    }
+
+    // }}}
+}
+
+?>
diff --git a/3rdparty/PEAR/Installer.php b/3rdparty/PEAR/Installer.php
new file mode 100644
index 00000000000..31e2cff81ee
--- /dev/null
+++ b/3rdparty/PEAR/Installer.php
@@ -0,0 +1,1068 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Stig Bakken <ssb@php.net>                                   |
+// |          Tomas V.V.Cox <cox@idecnet.com>                             |
+// |          Martin Jansen <mj@php.net>                                  |
+// +----------------------------------------------------------------------+
+//
+// $Id: Installer.php,v 1.150.2.2 2005/02/17 17:47:55 cellog Exp $
+
+require_once 'PEAR/Downloader.php';
+
+/**
+ * Administration class used to install PEAR packages and maintain the
+ * installed package database.
+ *
+ * TODO:
+ *   - Check dependencies break on package uninstall (when no force given)
+ *   - add a guessInstallDest() method with the code from _installFile() and
+ *     use that method in Registry::_rebuildFileMap() & Command_Registry::doList(),
+ *     others..
+ *
+ * @since PHP 4.0.2
+ * @author Stig Bakken <ssb@php.net>
+ * @author Martin Jansen <mj@php.net>
+ * @author Greg Beaver <cellog@php.net>
+ */
+class PEAR_Installer extends PEAR_Downloader
+{
+    // {{{ properties
+
+    /** name of the package directory, for example Foo-1.0
+     * @var string
+     */
+    var $pkgdir;
+
+    /** directory where PHP code files go
+     * @var string
+     */
+    var $phpdir;
+
+    /** directory where PHP extension files go
+     * @var string
+     */
+    var $extdir;
+
+    /** directory where documentation goes
+     * @var string
+     */
+    var $docdir;
+
+    /** installation root directory (ala PHP's INSTALL_ROOT or
+     * automake's DESTDIR
+     * @var string
+     */
+    var $installroot = '';
+
+    /** debug level
+     * @var int
+     */
+    var $debug = 1;
+
+    /** temporary directory
+     * @var string
+     */
+    var $tmpdir;
+
+    /** PEAR_Registry object used by the installer
+     * @var object
+     */
+    var $registry;
+
+    /** List of file transactions queued for an install/upgrade/uninstall.
+     *
+     *  Format:
+     *    array(
+     *      0 => array("rename => array("from-file", "to-file")),
+     *      1 => array("delete" => array("file-to-delete")),
+     *      ...
+     *    )
+     *
+     * @var array
+     */
+    var $file_operations = array();
+
+    // }}}
+
+    // {{{ constructor
+
+    /**
+     * PEAR_Installer constructor.
+     *
+     * @param object $ui user interface object (instance of PEAR_Frontend_*)
+     *
+     * @access public
+     */
+    function PEAR_Installer(&$ui)
+    {
+        parent::PEAR_Common();
+        $this->setFrontendObject($ui);
+        $this->debug = $this->config->get('verbose');
+        //$this->registry = &new PEAR_Registry($this->config->get('php_dir'));
+    }
+
+    // }}}
+
+    // {{{ _deletePackageFiles()
+
+    /**
+     * Delete a package's installed files, does not remove empty directories.
+     *
+     * @param string $package package name
+     *
+     * @return bool TRUE on success, or a PEAR error on failure
+     *
+     * @access private
+     */
+    function _deletePackageFiles($package)
+    {
+        if (!strlen($package)) {
+            return $this->raiseError("No package to uninstall given");
+        }
+        $filelist = $this->registry->packageInfo($package, 'filelist');
+        if ($filelist == null) {
+            return $this->raiseError("$package not installed");
+        }
+        foreach ($filelist as $file => $props) {
+            if (empty($props['installed_as'])) {
+                continue;
+            }
+            $path = $this->_prependPath($props['installed_as'], $this->installroot);
+            $this->addFileOperation('delete', array($path));
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ _installFile()
+
+    /**
+     * @param string filename
+     * @param array attributes from <file> tag in package.xml
+     * @param string path to install the file in
+     * @param array options from command-line
+     * @access private
+     */
+    function _installFile($file, $atts, $tmp_path, $options)
+    {
+        // {{{ return if this file is meant for another platform
+        static $os;
+        if (isset($atts['platform'])) {
+            if (empty($os)) {
+                include_once "OS/Guess.php";
+                $os = new OS_Guess();
+            }
+            if (strlen($atts['platform']) && $atts['platform']{0} == '!') {
+                $negate = true;
+                $platform = substr($atts['platform'], 1);
+            } else {
+                $negate = false;
+                $platform = $atts['platform'];
+            }
+            if ((bool) $os->matchSignature($platform) === $negate) {
+                $this->log(3, "skipped $file (meant for $atts[platform], we are ".$os->getSignature().")");
+                return PEAR_INSTALLER_SKIPPED;
+            }
+        }
+        // }}}
+
+        // {{{ assemble the destination paths
+        switch ($atts['role']) {
+            case 'doc':
+            case 'data':
+            case 'test':
+                $dest_dir = $this->config->get($atts['role'] . '_dir') .
+                            DIRECTORY_SEPARATOR . $this->pkginfo['package'];
+                unset($atts['baseinstalldir']);
+                break;
+            case 'ext':
+            case 'php':
+                $dest_dir = $this->config->get($atts['role'] . '_dir');
+                break;
+            case 'script':
+                $dest_dir = $this->config->get('bin_dir');
+                break;
+            case 'src':
+            case 'extsrc':
+                $this->source_files++;
+                return;
+            default:
+                return $this->raiseError("Invalid role `$atts[role]' for file $file");
+        }
+        $save_destdir = $dest_dir;
+        if (!empty($atts['baseinstalldir'])) {
+            $dest_dir .= DIRECTORY_SEPARATOR . $atts['baseinstalldir'];
+        }
+        if (dirname($file) != '.' && empty($atts['install-as'])) {
+            $dest_dir .= DIRECTORY_SEPARATOR . dirname($file);
+        }
+        if (empty($atts['install-as'])) {
+            $dest_file = $dest_dir . DIRECTORY_SEPARATOR . basename($file);
+        } else {
+            $dest_file = $dest_dir . DIRECTORY_SEPARATOR . $atts['install-as'];
+        }
+        $orig_file = $tmp_path . DIRECTORY_SEPARATOR . $file;
+
+        // Clean up the DIRECTORY_SEPARATOR mess
+        $ds2 = DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR;
+        list($dest_file, $orig_file) = preg_replace(array('!\\\\+!', '!/!', "!$ds2+!"),
+                                                    DIRECTORY_SEPARATOR,
+                                                    array($dest_file, $orig_file));
+        $installed_as = $dest_file;
+        $final_dest_file = $this->_prependPath($dest_file, $this->installroot);
+        $dest_dir = dirname($final_dest_file);
+        $dest_file = $dest_dir . DIRECTORY_SEPARATOR . '.tmp' . basename($final_dest_file);
+        // }}}
+
+        if (!@is_dir($dest_dir)) {
+            if (!$this->mkDirHier($dest_dir)) {
+                return $this->raiseError("failed to mkdir $dest_dir",
+                                         PEAR_INSTALLER_FAILED);
+            }
+            $this->log(3, "+ mkdir $dest_dir");
+        }
+        if (empty($atts['replacements'])) {
+            if (!file_exists($orig_file)) {
+                return $this->raiseError("file does not exist",
+                                         PEAR_INSTALLER_FAILED);
+            }
+            if (!@copy($orig_file, $dest_file)) {
+                return $this->raiseError("failed to write $dest_file",
+                                         PEAR_INSTALLER_FAILED);
+            }
+            $this->log(3, "+ cp $orig_file $dest_file");
+            if (isset($atts['md5sum'])) {
+                $md5sum = md5_file($dest_file);
+            }
+        } else {
+            // {{{ file with replacements
+            if (!file_exists($orig_file)) {
+                return $this->raiseError("file does not exist",
+                                         PEAR_INSTALLER_FAILED);
+            }
+            $fp = fopen($orig_file, "r");
+            $contents = fread($fp, filesize($orig_file));
+            fclose($fp);
+            if (isset($atts['md5sum'])) {
+                $md5sum = md5($contents);
+            }
+            $subst_from = $subst_to = array();
+            foreach ($atts['replacements'] as $a) {
+                $to = '';
+                if ($a['type'] == 'php-const') {
+                    if (preg_match('/^[a-z0-9_]+$/i', $a['to'])) {
+                        eval("\$to = $a[to];");
+                    } else {
+                        $this->log(0, "invalid php-const replacement: $a[to]");
+                        continue;
+                    }
+                } elseif ($a['type'] == 'pear-config') {
+                    $to = $this->config->get($a['to']);
+                    if (is_null($to)) {
+                        $this->log(0, "invalid pear-config replacement: $a[to]");
+                        continue;
+                    }
+                } elseif ($a['type'] == 'package-info') {
+                    if (isset($this->pkginfo[$a['to']]) && is_string($this->pkginfo[$a['to']])) {
+                        $to = $this->pkginfo[$a['to']];
+                    } else {
+                        $this->log(0, "invalid package-info replacement: $a[to]");
+                        continue;
+                    }
+                }
+                if (!is_null($to)) {
+                    $subst_from[] = $a['from'];
+                    $subst_to[] = $to;
+                }
+            }
+            $this->log(3, "doing ".sizeof($subst_from)." substitution(s) for $final_dest_file");
+            if (sizeof($subst_from)) {
+                $contents = str_replace($subst_from, $subst_to, $contents);
+            }
+            $wp = @fopen($dest_file, "wb");
+            if (!is_resource($wp)) {
+                return $this->raiseError("failed to create $dest_file: $php_errormsg",
+                                         PEAR_INSTALLER_FAILED);
+            }
+            if (!fwrite($wp, $contents)) {
+                return $this->raiseError("failed writing to $dest_file: $php_errormsg",
+                                         PEAR_INSTALLER_FAILED);
+            }
+            fclose($wp);
+            // }}}
+        }
+        // {{{ check the md5
+        if (isset($md5sum)) {
+            if (strtolower($md5sum) == strtolower($atts['md5sum'])) {
+                $this->log(2, "md5sum ok: $final_dest_file");
+            } else {
+                if (empty($options['force'])) {
+                    // delete the file
+                    @unlink($dest_file);
+                    return $this->raiseError("bad md5sum for file $final_dest_file",
+                                             PEAR_INSTALLER_FAILED);
+                } else {
+                    $this->log(0, "warning : bad md5sum for file $final_dest_file");
+                }
+            }
+        }
+        // }}}
+        // {{{ set file permissions
+        if (!OS_WINDOWS) {
+            if ($atts['role'] == 'script') {
+                $mode = 0777 & ~(int)octdec($this->config->get('umask'));
+                $this->log(3, "+ chmod +x $dest_file");
+            } else {
+                $mode = 0666 & ~(int)octdec($this->config->get('umask'));
+            }
+            $this->addFileOperation("chmod", array($mode, $dest_file));
+            if (!@chmod($dest_file, $mode)) {
+                $this->log(0, "failed to change mode of $dest_file");
+            }
+        }
+        // }}}
+        $this->addFileOperation("rename", array($dest_file, $final_dest_file));
+        // Store the full path where the file was installed for easy unistall
+        $this->addFileOperation("installed_as", array($file, $installed_as,
+                                $save_destdir, dirname(substr($dest_file, strlen($save_destdir)))));
+
+        //$this->log(2, "installed: $dest_file");
+        return PEAR_INSTALLER_OK;
+    }
+
+    // }}}
+    // {{{ addFileOperation()
+
+    /**
+     * Add a file operation to the current file transaction.
+     *
+     * @see startFileTransaction()
+     * @var string $type This can be one of:
+     *    - rename:  rename a file ($data has 2 values)
+     *    - chmod:   change permissions on a file ($data has 2 values)
+     *    - delete:  delete a file ($data has 1 value)
+     *    - rmdir:   delete a directory if empty ($data has 1 value)
+     *    - installed_as: mark a file as installed ($data has 4 values).
+     * @var array $data For all file operations, this array must contain the
+     *    full path to the file or directory that is being operated on.  For
+     *    the rename command, the first parameter must be the file to rename,
+     *    the second its new name.
+     *
+     *    The installed_as operation contains 4 elements in this order:
+     *    1. Filename as listed in the filelist element from package.xml
+     *    2. Full path to the installed file
+     *    3. Full path from the php_dir configuration variable used in this
+     *       installation
+     *    4. Relative path from the php_dir that this file is installed in
+     */
+    function addFileOperation($type, $data)
+    {
+        if (!is_array($data)) {
+            return $this->raiseError('Internal Error: $data in addFileOperation'
+                . ' must be an array, was ' . gettype($data));
+        }
+        if ($type == 'chmod') {
+            $octmode = decoct($data[0]);
+            $this->log(3, "adding to transaction: $type $octmode $data[1]");
+        } else {
+            $this->log(3, "adding to transaction: $type " . implode(" ", $data));
+        }
+        $this->file_operations[] = array($type, $data);
+    }
+
+    // }}}
+    // {{{ startFileTransaction()
+
+    function startFileTransaction($rollback_in_case = false)
+    {
+        if (count($this->file_operations) && $rollback_in_case) {
+            $this->rollbackFileTransaction();
+        }
+        $this->file_operations = array();
+    }
+
+    // }}}
+    // {{{ commitFileTransaction()
+
+    function commitFileTransaction()
+    {
+        $n = count($this->file_operations);
+        $this->log(2, "about to commit $n file operations");
+        // {{{ first, check permissions and such manually
+        $errors = array();
+        foreach ($this->file_operations as $tr) {
+            list($type, $data) = $tr;
+            switch ($type) {
+                case 'rename':
+                    if (!file_exists($data[0])) {
+                        $errors[] = "cannot rename file $data[0], doesn't exist";
+                    }
+                    // check that dest dir. is writable
+                    if (!is_writable(dirname($data[1]))) {
+                        $errors[] = "permission denied ($type): $data[1]";
+                    }
+                    break;
+                case 'chmod':
+                    // check that file is writable
+                    if (!is_writable($data[1])) {
+                        $errors[] = "permission denied ($type): $data[1] " . decoct($data[0]);
+                    }
+                    break;
+                case 'delete':
+                    if (!file_exists($data[0])) {
+                        $this->log(2, "warning: file $data[0] doesn't exist, can't be deleted");
+                    }
+                    // check that directory is writable
+                    if (file_exists($data[0]) && !is_writable(dirname($data[0]))) {
+                        $errors[] = "permission denied ($type): $data[0]";
+                    }
+                    break;
+            }
+
+        }
+        // }}}
+        $m = sizeof($errors);
+        if ($m > 0) {
+            foreach ($errors as $error) {
+                $this->log(1, $error);
+            }
+            return false;
+        }
+        // {{{ really commit the transaction
+        foreach ($this->file_operations as $tr) {
+            list($type, $data) = $tr;
+            switch ($type) {
+                case 'rename':
+                    @unlink($data[1]);
+                    @rename($data[0], $data[1]);
+                    $this->log(3, "+ mv $data[0] $data[1]");
+                    break;
+                case 'chmod':
+                    @chmod($data[1], $data[0]);
+                    $octmode = decoct($data[0]);
+                    $this->log(3, "+ chmod $octmode $data[1]");
+                    break;
+                case 'delete':
+                    @unlink($data[0]);
+                    $this->log(3, "+ rm $data[0]");
+                    break;
+                case 'rmdir':
+                    @rmdir($data[0]);
+                    $this->log(3, "+ rmdir $data[0]");
+                    break;
+                case 'installed_as':
+                    $this->pkginfo['filelist'][$data[0]]['installed_as'] = $data[1];
+                    if (!isset($this->pkginfo['filelist']['dirtree'][dirname($data[1])])) {
+                        $this->pkginfo['filelist']['dirtree'][dirname($data[1])] = true;
+                        while(!empty($data[3]) && $data[3] != '/' && $data[3] != '\\'
+                              && $data[3] != '.') {
+                            $this->pkginfo['filelist']['dirtree']
+                                [$this->_prependPath($data[3], $data[2])] = true;
+                            $data[3] = dirname($data[3]);
+                        }
+                    }
+                    break;
+            }
+        }
+        // }}}
+        $this->log(2, "successfully committed $n file operations");
+        $this->file_operations = array();
+        return true;
+    }
+
+    // }}}
+    // {{{ rollbackFileTransaction()
+
+    function rollbackFileTransaction()
+    {
+        $n = count($this->file_operations);
+        $this->log(2, "rolling back $n file operations");
+        foreach ($this->file_operations as $tr) {
+            list($type, $data) = $tr;
+            switch ($type) {
+                case 'rename':
+                    @unlink($data[0]);
+                    $this->log(3, "+ rm $data[0]");
+                    break;
+                case 'mkdir':
+                    @rmdir($data[0]);
+                    $this->log(3, "+ rmdir $data[0]");
+                    break;
+                case 'chmod':
+                    break;
+                case 'delete':
+                    break;
+                case 'installed_as':
+                    if (isset($this->pkginfo['filelist'])) {
+                        unset($this->pkginfo['filelist'][$data[0]]['installed_as']);
+                    }
+                    if (isset($this->pkginfo['filelist']['dirtree'][dirname($data[1])])) {
+                        unset($this->pkginfo['filelist']['dirtree'][dirname($data[1])]);
+                        while(!empty($data[3]) && $data[3] != '/' && $data[3] != '\\'
+                              && $data[3] != '.') {
+                            unset($this->pkginfo['filelist']['dirtree']
+                                [$this->_prependPath($data[3], $data[2])]);
+                            $data[3] = dirname($data[3]);
+                        }
+                    }
+                    if (isset($this->pkginfo['filelist']['dirtree'])
+                          && !count($this->pkginfo['filelist']['dirtree'])) {
+                        unset($this->pkginfo['filelist']['dirtree']);
+                    }
+                    break;
+            }
+        }
+        $this->file_operations = array();
+    }
+
+    // }}}
+    // {{{ mkDirHier($dir)
+
+    function mkDirHier($dir)
+    {
+        $this->addFileOperation('mkdir', array($dir));
+        return parent::mkDirHier($dir);
+    }
+
+    // }}}
+    // {{{ download()
+
+    /**
+     * Download any files and their dependencies, if necessary
+     *
+     * @param array a mixed list of package names, local files, or package.xml
+     * @param PEAR_Config
+     * @param array options from the command line
+     * @param array this is the array that will be populated with packages to
+     *              install.  Format of each entry:
+     *
+     * <code>
+     * array('pkg' => 'package_name', 'file' => '/path/to/local/file',
+     *    'info' => array() // parsed package.xml
+     * );
+     * </code>
+     * @param array this will be populated with any error messages
+     * @param false private recursion variable
+     * @param false private recursion variable
+     * @param false private recursion variable
+     * @deprecated in favor of PEAR_Downloader
+     */
+    function download($packages, $options, &$config, &$installpackages,
+                      &$errors, $installed = false, $willinstall = false, $state = false)
+    {
+        // trickiness: initialize here
+        parent::PEAR_Downloader($this->ui, $options, $config);
+        $ret = parent::download($packages);
+        $errors = $this->getErrorMsgs();
+        $installpackages = $this->getDownloadedPackages();
+        trigger_error("PEAR Warning: PEAR_Installer::download() is deprecated " .
+                      "in favor of PEAR_Downloader class", E_USER_WARNING);
+        return $ret;
+    }
+
+    // }}}
+    // {{{ install()
+
+    /**
+     * Installs the files within the package file specified.
+     *
+     * @param string $pkgfile path to the package file
+     * @param array $options
+     * recognized options:
+     * - installroot   : optional prefix directory for installation
+     * - force         : force installation
+     * - register-only : update registry but don't install files
+     * - upgrade       : upgrade existing install
+     * - soft          : fail silently
+     * - nodeps        : ignore dependency conflicts/missing dependencies
+     * - alldeps       : install all dependencies
+     * - onlyreqdeps   : install only required dependencies
+     *
+     * @return array|PEAR_Error package info if successful
+     */
+
+    function install($pkgfile, $options = array())
+    {
+        $php_dir = $this->config->get('php_dir');
+        if (isset($options['installroot'])) {
+            if (substr($options['installroot'], -1) == DIRECTORY_SEPARATOR) {
+                $options['installroot'] = substr($options['installroot'], 0, -1);
+            }
+            $php_dir = $this->_prependPath($php_dir, $options['installroot']);
+            $this->installroot = $options['installroot'];
+        } else {
+            $this->installroot = '';
+        }
+        $this->registry = &new PEAR_Registry($php_dir);
+        //  ==> XXX should be removed later on
+        $flag_old_format = false;
+
+        if (substr($pkgfile, -4) == '.xml') {
+            $descfile = $pkgfile;
+        } else {
+            // {{{ Decompress pack in tmp dir -------------------------------------
+
+            // To allow relative package file names
+            $pkgfile = realpath($pkgfile);
+
+            if (PEAR::isError($tmpdir = System::mktemp('-d'))) {
+                return $tmpdir;
+            }
+            $this->log(3, '+ tmp dir created at ' . $tmpdir);
+
+            $tar = new Archive_Tar($pkgfile);
+            if (!@$tar->extract($tmpdir)) {
+                return $this->raiseError("unable to unpack $pkgfile");
+            }
+
+            // {{{ Look for existing package file
+            $descfile = $tmpdir . DIRECTORY_SEPARATOR . 'package.xml';
+
+            if (!is_file($descfile)) {
+                // ----- Look for old package archive format
+                // In this format the package.xml file was inside the
+                // Package-n.n directory
+                $dp = opendir($tmpdir);
+                do {
+                    $pkgdir = readdir($dp);
+                } while ($pkgdir{0} == '.');
+
+                $descfile = $tmpdir . DIRECTORY_SEPARATOR . $pkgdir . DIRECTORY_SEPARATOR . 'package.xml';
+                $flag_old_format = true;
+                $this->log(0, "warning : you are using an archive with an old format");
+            }
+            // }}}
+            // <== XXX This part should be removed later on
+            // }}}
+        }
+
+        if (!is_file($descfile)) {
+            return $this->raiseError("no package.xml file after extracting the archive");
+        }
+
+        // Parse xml file -----------------------------------------------
+        $pkginfo = $this->infoFromDescriptionFile($descfile);
+        if (PEAR::isError($pkginfo)) {
+            return $pkginfo;
+        }
+        $this->validatePackageInfo($pkginfo, $errors, $warnings);
+        // XXX We allow warnings, do we have to do it?
+        if (count($errors)) {
+            if (empty($options['force'])) {
+                return $this->raiseError("The following errors where found (use force option to install anyway):\n".
+                                         implode("\n", $errors));
+            } else {
+                $this->log(0, "warning : the following errors were found:\n".
+                           implode("\n", $errors));
+            }
+        }
+
+        $pkgname = $pkginfo['package'];
+
+        // {{{ Check dependencies -------------------------------------------
+        if (isset($pkginfo['release_deps']) && empty($options['nodeps'])) {
+            $dep_errors = '';
+            $error = $this->checkDeps($pkginfo, $dep_errors);
+            if ($error == true) {
+                if (empty($options['soft'])) {
+                    $this->log(0, substr($dep_errors, 1));
+                }
+                return $this->raiseError("$pkgname: Dependencies failed");
+            } else if (!empty($dep_errors)) {
+                // Print optional dependencies
+                if (empty($options['soft'])) {
+                    $this->log(0, $dep_errors);
+                }
+            }
+        }
+        // }}}
+
+        // {{{ checks to do when not in "force" mode
+        if (empty($options['force'])) {
+            $test = $this->registry->checkFileMap($pkginfo);
+            if (sizeof($test)) {
+                $tmp = $test;
+                foreach ($tmp as $file => $pkg) {
+                    if ($pkg == $pkgname) {
+                        unset($test[$file]);
+                    }
+                }
+                if (sizeof($test)) {
+                    $msg = "$pkgname: conflicting files found:\n";
+                    $longest = max(array_map("strlen", array_keys($test)));
+                    $fmt = "%${longest}s (%s)\n";
+                    foreach ($test as $file => $pkg) {
+                        $msg .= sprintf($fmt, $file, $pkg);
+                    }
+                    return $this->raiseError($msg);
+                }
+            }
+        }
+        // }}}
+
+        $this->startFileTransaction();
+
+        if (empty($options['upgrade'])) {
+            // checks to do only when installing new packages
+            if (empty($options['force']) && $this->registry->packageExists($pkgname)) {
+                return $this->raiseError("$pkgname already installed");
+            }
+        } else {
+            if ($this->registry->packageExists($pkgname)) {
+                $v1 = $this->registry->packageInfo($pkgname, 'version');
+                $v2 = $pkginfo['version'];
+                $cmp = version_compare("$v1", "$v2", 'gt');
+                if (empty($options['force']) && !version_compare("$v2", "$v1", 'gt')) {
+                    return $this->raiseError("upgrade to a newer version ($v2 is not newer than $v1)");
+                }
+                if (empty($options['register-only'])) {
+                    // when upgrading, remove old release's files first:
+                    if (PEAR::isError($err = $this->_deletePackageFiles($pkgname))) {
+                        return $this->raiseError($err);
+                    }
+                }
+            }
+        }
+
+        // {{{ Copy files to dest dir ---------------------------------------
+
+        // info from the package it self we want to access from _installFile
+        $this->pkginfo = &$pkginfo;
+        // used to determine whether we should build any C code
+        $this->source_files = 0;
+
+        if (empty($options['register-only'])) {
+            if (!is_dir($php_dir)) {
+                return $this->raiseError("no script destination directory\n",
+                                         null, PEAR_ERROR_DIE);
+            }
+
+            $tmp_path = dirname($descfile);
+            if (substr($pkgfile, -4) != '.xml') {
+                $tmp_path .= DIRECTORY_SEPARATOR . $pkgname . '-' . $pkginfo['version'];
+            }
+
+            //  ==> XXX This part should be removed later on
+            if ($flag_old_format) {
+                $tmp_path = dirname($descfile);
+            }
+            // <== XXX This part should be removed later on
+
+            // {{{ install files
+            foreach ($pkginfo['filelist'] as $file => $atts) {
+                $this->expectError(PEAR_INSTALLER_FAILED);
+                $res = $this->_installFile($file, $atts, $tmp_path, $options);
+                $this->popExpect();
+                if (PEAR::isError($res)) {
+                    if (empty($options['ignore-errors'])) {
+                        $this->rollbackFileTransaction();
+                        if ($res->getMessage() == "file does not exist") {
+                            $this->raiseError("file $file in package.xml does not exist");
+                        }
+                        return $this->raiseError($res);
+                    } else {
+                        $this->log(0, "Warning: " . $res->getMessage());
+                    }
+                }
+                if ($res != PEAR_INSTALLER_OK) {
+                    // Do not register files that were not installed
+                    unset($pkginfo['filelist'][$file]);
+                }
+            }
+            // }}}
+
+            // {{{ compile and install source files
+            if ($this->source_files > 0 && empty($options['nobuild'])) {
+                $this->log(1, "$this->source_files source files, building");
+                $bob = &new PEAR_Builder($this->ui);
+                $bob->debug = $this->debug;
+                $built = $bob->build($descfile, array(&$this, '_buildCallback'));
+                if (PEAR::isError($built)) {
+                    $this->rollbackFileTransaction();
+                    return $built;
+                }
+                $this->log(1, "\nBuild process completed successfully");
+                foreach ($built as $ext) {
+                    $bn = basename($ext['file']);
+                    list($_ext_name, $_ext_suff) = explode('.', $bn);
+                    if ($_ext_suff == '.so' || $_ext_suff == '.dll') {
+                        if (extension_loaded($_ext_name)) {
+                            $this->raiseError("Extension '$_ext_name' already loaded. " .
+                                              'Please unload it in your php.ini file ' .
+                                              'prior to install or upgrade');
+                        }
+                        $role = 'ext';
+                    } else {
+                        $role = 'src';
+                    }
+                    $dest = $ext['dest'];
+                    $this->log(1, "Installing '$ext[file]'");
+                    $copyto = $this->_prependPath($dest, $this->installroot);
+                    $copydir = dirname($copyto);
+                    if (!@is_dir($copydir)) {
+                        if (!$this->mkDirHier($copydir)) {
+                            return $this->raiseError("failed to mkdir $copydir",
+                                PEAR_INSTALLER_FAILED);
+                        }
+                        $this->log(3, "+ mkdir $copydir");
+                    }
+                    if (!@copy($ext['file'], $copyto)) {
+                        return $this->raiseError("failed to write $copyto", PEAR_INSTALLER_FAILED);
+                    }
+                    $this->log(3, "+ cp $ext[file] $copyto");
+                    if (!OS_WINDOWS) {
+                        $mode = 0666 & ~(int)octdec($this->config->get('umask'));
+                        $this->addFileOperation('chmod', array($mode, $copyto));
+                        if (!@chmod($copyto, $mode)) {
+                            $this->log(0, "failed to change mode of $copyto");
+                        }
+                    }
+                    $this->addFileOperation('rename', array($ext['file'], $copyto));
+
+                    $pkginfo['filelist'][$bn] = array(
+                        'role' => $role,
+                        'installed_as' => $dest,
+                        'php_api' => $ext['php_api'],
+                        'zend_mod_api' => $ext['zend_mod_api'],
+                        'zend_ext_api' => $ext['zend_ext_api'],
+                        );
+                }
+            }
+            // }}}
+        }
+
+        if (!$this->commitFileTransaction()) {
+            $this->rollbackFileTransaction();
+            return $this->raiseError("commit failed", PEAR_INSTALLER_FAILED);
+        }
+        // }}}
+
+        $ret = false;
+        // {{{ Register that the package is installed -----------------------
+        if (empty($options['upgrade'])) {
+            // if 'force' is used, replace the info in registry
+            if (!empty($options['force']) && $this->registry->packageExists($pkgname)) {
+                $this->registry->deletePackage($pkgname);
+            }
+            $ret = $this->registry->addPackage($pkgname, $pkginfo);
+        } else {
+            // new: upgrade installs a package if it isn't installed
+            if (!$this->registry->packageExists($pkgname)) {
+                $ret = $this->registry->addPackage($pkgname, $pkginfo);
+            } else {
+                $ret = $this->registry->updatePackage($pkgname, $pkginfo, false);
+            }
+        }
+        if (!$ret) {
+            return $this->raiseError("Adding package $pkgname to registry failed");
+        }
+        // }}}
+        return $pkginfo;
+    }
+
+    // }}}
+    // {{{ uninstall()
+
+    /**
+     * Uninstall a package
+     *
+     * This method removes all files installed by the application, and then
+     * removes any empty directories.
+     * @param string package name
+     * @param array Command-line options.  Possibilities include:
+     *
+     *              - installroot: base installation dir, if not the default
+     *              - nodeps: do not process dependencies of other packages to ensure
+     *                        uninstallation does not break things
+     */
+    function uninstall($package, $options = array())
+    {
+        $php_dir = $this->config->get('php_dir');
+        if (isset($options['installroot'])) {
+            if (substr($options['installroot'], -1) == DIRECTORY_SEPARATOR) {
+                $options['installroot'] = substr($options['installroot'], 0, -1);
+            }
+            $this->installroot = $options['installroot'];
+            $php_dir = $this->_prependPath($php_dir, $this->installroot);
+        } else {
+            $this->installroot = '';
+        }
+        $this->registry = &new PEAR_Registry($php_dir);
+        $filelist = $this->registry->packageInfo($package, 'filelist');
+        if ($filelist == null) {
+            return $this->raiseError("$package not installed");
+        }
+        if (empty($options['nodeps'])) {
+            $depchecker = &new PEAR_Dependency($this->registry);
+            $error = $depchecker->checkPackageUninstall($errors, $warning, $package);
+            if ($error) {
+                return $this->raiseError($errors . 'uninstall failed');
+            }
+            if ($warning) {
+                $this->log(0, $warning);
+            }
+        }
+        // {{{ Delete the files
+        $this->startFileTransaction();
+        if (PEAR::isError($err = $this->_deletePackageFiles($package))) {
+            $this->rollbackFileTransaction();
+            return $this->raiseError($err);
+        }
+        if (!$this->commitFileTransaction()) {
+            $this->rollbackFileTransaction();
+            return $this->raiseError("uninstall failed");
+        } else {
+            $this->startFileTransaction();
+            if (!isset($filelist['dirtree']) || !count($filelist['dirtree'])) {
+                return $this->registry->deletePackage($package);
+            }
+            // attempt to delete empty directories
+            uksort($filelist['dirtree'], array($this, '_sortDirs'));
+            foreach($filelist['dirtree'] as $dir => $notused) {
+                $this->addFileOperation('rmdir', array($dir));
+            }
+            if (!$this->commitFileTransaction()) {
+                $this->rollbackFileTransaction();
+            }
+        }
+        // }}}
+
+        // Register that the package is no longer installed
+        return $this->registry->deletePackage($package);
+    }
+
+    // }}}
+    // {{{ _sortDirs()
+    function _sortDirs($a, $b)
+    {
+        if (strnatcmp($a, $b) == -1) return 1;
+        if (strnatcmp($a, $b) == 1) return -1;
+        return 0;
+    }
+
+    // }}}
+    // {{{ checkDeps()
+
+    /**
+     * Check if the package meets all dependencies
+     *
+     * @param  array   Package information (passed by reference)
+     * @param  string  Error message (passed by reference)
+     * @return boolean False when no error occured, otherwise true
+     */
+    function checkDeps(&$pkginfo, &$errors)
+    {
+        if (empty($this->registry)) {
+            $this->registry = &new PEAR_Registry($this->config->get('php_dir'));
+        }
+        $depchecker = &new PEAR_Dependency($this->registry);
+        $error = $errors = '';
+        $failed_deps = $optional_deps = array();
+        if (is_array($pkginfo['release_deps'])) {
+            foreach($pkginfo['release_deps'] as $dep) {
+                $code = $depchecker->callCheckMethod($error, $dep);
+                if ($code) {
+                    if (isset($dep['optional']) && $dep['optional'] == 'yes') {
+                        $optional_deps[] = array($dep, $code, $error);
+                    } else {
+                        $failed_deps[] = array($dep, $code, $error);
+                    }
+                }
+            }
+            // {{{ failed dependencies
+            $n = count($failed_deps);
+            if ($n > 0) {
+                for ($i = 0; $i < $n; $i++) {
+                    if (isset($failed_deps[$i]['type'])) {
+                        $type = $failed_deps[$i]['type'];
+                    } else {
+                        $type = 'pkg';
+                    }
+                    switch ($failed_deps[$i][1]) {
+                        case PEAR_DEPENDENCY_MISSING:
+                            if ($type == 'pkg') {
+                                // install
+                            }
+                            $errors .= "\n" . $failed_deps[$i][2];
+                            break;
+                        case PEAR_DEPENDENCY_UPGRADE_MINOR:
+                            if ($type == 'pkg') {
+                                // upgrade
+                            }
+                            $errors .= "\n" . $failed_deps[$i][2];
+                            break;
+                        default:
+                            $errors .= "\n" . $failed_deps[$i][2];
+                            break;
+                    }
+                }
+                return true;
+            }
+            // }}}
+
+            // {{{ optional dependencies
+            $count_optional = count($optional_deps);
+            if ($count_optional > 0) {
+                $errors = "Optional dependencies:";
+
+                for ($i = 0; $i < $count_optional; $i++) {
+                    if (isset($optional_deps[$i]['type'])) {
+                        $type = $optional_deps[$i]['type'];
+                    } else {
+                        $type = 'pkg';
+                    }
+                    switch ($optional_deps[$i][1]) {
+                        case PEAR_DEPENDENCY_MISSING:
+                        case PEAR_DEPENDENCY_UPGRADE_MINOR:
+                        default:
+                            $errors .= "\n" . $optional_deps[$i][2];
+                            break;
+                    }
+                }
+                return false;
+            }
+            // }}}
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ _buildCallback()
+
+    function _buildCallback($what, $data)
+    {
+        if (($what == 'cmdoutput' && $this->debug > 1) ||
+            ($what == 'output' && $this->debug > 0)) {
+            $this->ui->outputData(rtrim($data), 'build');
+        }
+    }
+
+    // }}}
+}
+
+// {{{ md5_file() utility function
+if (!function_exists("md5_file")) {
+    function md5_file($filename) {
+        $fp = fopen($filename, "r");
+        if (!$fp) return null;
+        $contents = fread($fp, filesize($filename));
+        fclose($fp);
+        return md5($contents);
+    }
+}
+// }}}
+
+?>
diff --git a/3rdparty/PEAR/Packager.php b/3rdparty/PEAR/Packager.php
new file mode 100644
index 00000000000..3ed209be8b2
--- /dev/null
+++ b/3rdparty/PEAR/Packager.php
@@ -0,0 +1,165 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Stig Bakken <ssb@php.net>                                   |
+// |          Tomas V.V.Cox <cox@idecnet.com>                             |
+// +----------------------------------------------------------------------+
+//
+// $Id: Packager.php,v 1.53 2004/06/13 14:06:01 pajoye Exp $
+
+require_once 'PEAR/Common.php';
+require_once 'System.php';
+
+/**
+ * Administration class used to make a PEAR release tarball.
+ *
+ * TODO:
+ *  - add an extra param the dir where to place the created package
+ *
+ * @since PHP 4.0.2
+ * @author Stig Bakken <ssb@php.net>
+ */
+class PEAR_Packager extends PEAR_Common
+{
+    // {{{ constructor
+
+    function PEAR_Packager()
+    {
+        parent::PEAR_Common();
+    }
+
+    // }}}
+    // {{{ destructor
+
+    function _PEAR_Packager()
+    {
+        parent::_PEAR_Common();
+    }
+
+    // }}}
+
+    // {{{ package()
+
+    function package($pkgfile = null, $compress = true)
+    {
+        // {{{ validate supplied package.xml file
+        if (empty($pkgfile)) {
+            $pkgfile = 'package.xml';
+        }
+        // $this->pkginfo gets populated inside
+        $pkginfo = $this->infoFromDescriptionFile($pkgfile);
+        if (PEAR::isError($pkginfo)) {
+            return $this->raiseError($pkginfo);
+        }
+
+        $pkgdir = dirname(realpath($pkgfile));
+        $pkgfile = basename($pkgfile);
+
+        $errors = $warnings = array();
+        $this->validatePackageInfo($pkginfo, $errors, $warnings, $pkgdir);
+        foreach ($warnings as $w) {
+            $this->log(1, "Warning: $w");
+        }
+        foreach ($errors as $e) {
+            $this->log(0, "Error: $e");
+        }
+        if (sizeof($errors) > 0) {
+            return $this->raiseError('Errors in package');
+        }
+        // }}}
+
+        $pkgver = $pkginfo['package'] . '-' . $pkginfo['version'];
+
+        // {{{ Create the package file list
+        $filelist = array();
+        $i = 0;
+
+        foreach ($pkginfo['filelist'] as $fname => $atts) {
+            $file = $pkgdir . DIRECTORY_SEPARATOR . $fname;
+            if (!file_exists($file)) {
+                return $this->raiseError("File does not exist: $fname");
+            } else {
+                $filelist[$i++] = $file;
+                if (empty($pkginfo['filelist'][$fname]['md5sum'])) {
+                    $md5sum = md5_file($file);
+                    $pkginfo['filelist'][$fname]['md5sum'] = $md5sum;
+                }
+                $this->log(2, "Adding file $fname");
+            }
+        }
+        // }}}
+
+        // {{{ regenerate package.xml
+        $new_xml = $this->xmlFromInfo($pkginfo);
+        if (PEAR::isError($new_xml)) {
+            return $this->raiseError($new_xml);
+        }
+        if (!($tmpdir = System::mktemp(array('-d')))) {
+            return $this->raiseError("PEAR_Packager: mktemp failed");
+        }
+        $newpkgfile = $tmpdir . DIRECTORY_SEPARATOR . 'package.xml';
+        $np = @fopen($newpkgfile, 'wb');
+        if (!$np) {
+            return $this->raiseError("PEAR_Packager: unable to rewrite $pkgfile as $newpkgfile");
+        }
+        fwrite($np, $new_xml);
+        fclose($np);
+        // }}}
+
+        // {{{ TAR the Package -------------------------------------------
+        $ext = $compress ? '.tgz' : '.tar';
+        $dest_package = getcwd() . DIRECTORY_SEPARATOR . $pkgver . $ext;
+        $tar =& new Archive_Tar($dest_package, $compress);
+        $tar->setErrorHandling(PEAR_ERROR_RETURN); // XXX Don't print errors
+        // ----- Creates with the package.xml file
+        $ok = $tar->createModify(array($newpkgfile), '', $tmpdir);
+        if (PEAR::isError($ok)) {
+            return $this->raiseError($ok);
+        } elseif (!$ok) {
+            return $this->raiseError('PEAR_Packager: tarball creation failed');
+        }
+        // ----- Add the content of the package
+        if (!$tar->addModify($filelist, $pkgver, $pkgdir)) {
+            return $this->raiseError('PEAR_Packager: tarball creation failed');
+        }
+        $this->log(1, "Package $dest_package done");
+        if (file_exists("$pkgdir/CVS/Root")) {
+            $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $pkginfo['version']);
+            $cvstag = "RELEASE_$cvsversion";
+            $this->log(1, "Tag the released code with `pear cvstag $pkgfile'");
+            $this->log(1, "(or set the CVS tag $cvstag by hand)");
+        }
+        // }}}
+
+        return $dest_package;
+    }
+
+    // }}}
+}
+
+// {{{ md5_file() utility function
+if (!function_exists('md5_file')) {
+    function md5_file($file) {
+        if (!$fd = @fopen($file, 'r')) {
+            return false;
+        }
+        $md5 = md5(fread($fd, filesize($file)));
+        fclose($fd);
+        return $md5;
+    }
+}
+// }}}
+
+?>
diff --git a/3rdparty/PEAR/Registry.php b/3rdparty/PEAR/Registry.php
new file mode 100644
index 00000000000..f2510a38f15
--- /dev/null
+++ b/3rdparty/PEAR/Registry.php
@@ -0,0 +1,538 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Stig Bakken <ssb@php.net>                                    |
+// |         Tomas V.V.Cox <cox@idecnet.com>                              |
+// |                                                                      |
+// +----------------------------------------------------------------------+
+//
+// $Id: Registry.php,v 1.50.4.3 2004/10/26 19:19:56 cellog Exp $
+
+/*
+TODO:
+    - Transform into singleton()
+    - Add application level lock (avoid change the registry from the cmdline
+      while using the GTK interface, for ex.)
+*/
+require_once "System.php";
+require_once "PEAR.php";
+
+define('PEAR_REGISTRY_ERROR_LOCK',   -2);
+define('PEAR_REGISTRY_ERROR_FORMAT', -3);
+define('PEAR_REGISTRY_ERROR_FILE',   -4);
+
+/**
+ * Administration class used to maintain the installed package database.
+ */
+class PEAR_Registry extends PEAR
+{
+    // {{{ properties
+
+    /** Directory where registry files are stored.
+     * @var string
+     */
+    var $statedir = '';
+
+    /** File where the file map is stored
+     * @var string
+     */
+    var $filemap = '';
+
+    /** Name of file used for locking the registry
+     * @var string
+     */
+    var $lockfile = '';
+
+    /** File descriptor used during locking
+     * @var resource
+     */
+    var $lock_fp = null;
+
+    /** Mode used during locking
+     * @var int
+     */
+    var $lock_mode = 0; // XXX UNUSED
+
+    /** Cache of package information.  Structure:
+     * array(
+     *   'package' => array('id' => ... ),
+     *   ... )
+     * @var array
+     */
+    var $pkginfo_cache = array();
+
+    /** Cache of file map.  Structure:
+     * array( '/path/to/file' => 'package', ... )
+     * @var array
+     */
+    var $filemap_cache = array();
+
+    // }}}
+
+    // {{{ constructor
+
+    /**
+     * PEAR_Registry constructor.
+     *
+     * @param string (optional) PEAR install directory (for .php files)
+     *
+     * @access public
+     */
+    function PEAR_Registry($pear_install_dir = PEAR_INSTALL_DIR)
+    {
+        parent::PEAR();
+        $ds = DIRECTORY_SEPARATOR;
+        $this->install_dir = $pear_install_dir;
+        $this->statedir = $pear_install_dir.$ds.'.registry';
+        $this->filemap  = $pear_install_dir.$ds.'.filemap';
+        $this->lockfile = $pear_install_dir.$ds.'.lock';
+
+        // XXX Compatibility code should be removed in the future
+        // rename all registry files if any to lowercase
+        if (!OS_WINDOWS && $handle = @opendir($this->statedir)) {
+            $dest = $this->statedir . DIRECTORY_SEPARATOR;
+            while (false !== ($file = readdir($handle))) {
+                if (preg_match('/^.*[A-Z].*\.reg$/', $file)) {
+                    rename($dest . $file, $dest . strtolower($file));
+                }
+            }
+            closedir($handle);
+        }
+        if (!file_exists($this->filemap)) {
+            $this->rebuildFileMap();
+        }
+    }
+
+    // }}}
+    // {{{ destructor
+
+    /**
+     * PEAR_Registry destructor.  Makes sure no locks are forgotten.
+     *
+     * @access private
+     */
+    function _PEAR_Registry()
+    {
+        parent::_PEAR();
+        if (is_resource($this->lock_fp)) {
+            $this->_unlock();
+        }
+    }
+
+    // }}}
+
+    // {{{ _assertStateDir()
+
+    /**
+     * Make sure the directory where we keep registry files exists.
+     *
+     * @return bool TRUE if directory exists, FALSE if it could not be
+     * created
+     *
+     * @access private
+     */
+    function _assertStateDir()
+    {
+        if (!@is_dir($this->statedir)) {
+            if (!System::mkdir(array('-p', $this->statedir))) {
+                return $this->raiseError("could not create directory '{$this->statedir}'");
+            }
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ _packageFileName()
+
+    /**
+     * Get the name of the file where data for a given package is stored.
+     *
+     * @param string package name
+     *
+     * @return string registry file name
+     *
+     * @access public
+     */
+    function _packageFileName($package)
+    {
+        return $this->statedir . DIRECTORY_SEPARATOR . strtolower($package) . '.reg';
+    }
+
+    // }}}
+    // {{{ _openPackageFile()
+
+    function _openPackageFile($package, $mode)
+    {
+        $this->_assertStateDir();
+        $file = $this->_packageFileName($package);
+        $fp = @fopen($file, $mode);
+        if (!$fp) {
+            return null;
+        }
+        return $fp;
+    }
+
+    // }}}
+    // {{{ _closePackageFile()
+
+    function _closePackageFile($fp)
+    {
+        fclose($fp);
+    }
+
+    // }}}
+    // {{{ rebuildFileMap()
+
+    function rebuildFileMap()
+    {
+        $packages = $this->listPackages();
+        $files = array();
+        foreach ($packages as $package) {
+            $version = $this->packageInfo($package, 'version');
+            $filelist = $this->packageInfo($package, 'filelist');
+            if (!is_array($filelist)) {
+                continue;
+            }
+            foreach ($filelist as $name => $attrs) {
+                if (isset($attrs['role']) && $attrs['role'] != 'php') {
+                    continue;
+                }
+                if (isset($attrs['baseinstalldir'])) {
+                    $file = $attrs['baseinstalldir'].DIRECTORY_SEPARATOR.$name;
+                } else {
+                    $file = $name;
+                }
+                $file = preg_replace(',^/+,', '', $file);
+                $files[$file] = $package;
+            }
+        }
+        $this->_assertStateDir();
+        $fp = @fopen($this->filemap, 'wb');
+        if (!$fp) {
+            return false;
+        }
+        $this->filemap_cache = $files;
+        fwrite($fp, serialize($files));
+        fclose($fp);
+        return true;
+    }
+
+    // }}}
+    // {{{ readFileMap()
+
+    function readFileMap()
+    {
+        $fp = @fopen($this->filemap, 'r');
+        if (!$fp) {
+            return $this->raiseError('PEAR_Registry: could not open filemap', PEAR_REGISTRY_ERROR_FILE, null, null, $php_errormsg);
+        }
+        $fsize = filesize($this->filemap);
+        $rt = get_magic_quotes_runtime();
+        set_magic_quotes_runtime(0);
+        $data = fread($fp, $fsize);
+        set_magic_quotes_runtime($rt);
+        fclose($fp);
+        $tmp = unserialize($data);
+        if (!$tmp && $fsize > 7) {
+            return $this->raiseError('PEAR_Registry: invalid filemap data', PEAR_REGISTRY_ERROR_FORMAT, null, null, $data);
+        }
+        $this->filemap_cache = $tmp;
+        return true;
+    }
+
+    // }}}
+    // {{{ _lock()
+
+    /**
+     * Lock the registry.
+     *
+     * @param integer lock mode, one of LOCK_EX, LOCK_SH or LOCK_UN.
+     *                See flock manual for more information.
+     *
+     * @return bool TRUE on success, FALSE if locking failed, or a
+     *              PEAR error if some other error occurs (such as the
+     *              lock file not being writable).
+     *
+     * @access private
+     */
+    function _lock($mode = LOCK_EX)
+    {
+        if (!eregi('Windows 9', php_uname())) {
+            if ($mode != LOCK_UN && is_resource($this->lock_fp)) {
+                // XXX does not check type of lock (LOCK_SH/LOCK_EX)
+                return true;
+            }
+            if (PEAR::isError($err = $this->_assertStateDir())) {
+                return $err;
+            }
+            $open_mode = 'w';
+            // XXX People reported problems with LOCK_SH and 'w'
+            if ($mode === LOCK_SH || $mode === LOCK_UN) {
+                if (@!is_file($this->lockfile)) {
+                    touch($this->lockfile);
+                }
+                $open_mode = 'r';
+            }
+
+            if (!is_resource($this->lock_fp)) {
+                $this->lock_fp = @fopen($this->lockfile, $open_mode);
+            }
+
+            if (!is_resource($this->lock_fp)) {
+                return $this->raiseError("could not create lock file" .
+                                         (isset($php_errormsg) ? ": " . $php_errormsg : ""));
+            }
+            if (!(int)flock($this->lock_fp, $mode)) {
+                switch ($mode) {
+                    case LOCK_SH: $str = 'shared';    break;
+                    case LOCK_EX: $str = 'exclusive'; break;
+                    case LOCK_UN: $str = 'unlock';    break;
+                    default:      $str = 'unknown';   break;
+                }
+                return $this->raiseError("could not acquire $str lock ($this->lockfile)",
+                                         PEAR_REGISTRY_ERROR_LOCK);
+            }
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ _unlock()
+
+    function _unlock()
+    {
+        $ret = $this->_lock(LOCK_UN);
+        if (is_resource($this->lock_fp)) {
+            fclose($this->lock_fp);
+        }
+        $this->lock_fp = null;
+        return $ret;
+    }
+
+    // }}}
+    // {{{ _packageExists()
+
+    function _packageExists($package)
+    {
+        return file_exists($this->_packageFileName($package));
+    }
+
+    // }}}
+    // {{{ _packageInfo()
+
+    function _packageInfo($package = null, $key = null)
+    {
+        if ($package === null) {
+            return array_map(array($this, '_packageInfo'),
+                             $this->_listPackages());
+        }
+        $fp = $this->_openPackageFile($package, 'r');
+        if ($fp === null) {
+            return null;
+        }
+        $rt = get_magic_quotes_runtime();
+        set_magic_quotes_runtime(0);
+        $data = fread($fp, filesize($this->_packageFileName($package)));
+        set_magic_quotes_runtime($rt);
+        $this->_closePackageFile($fp);
+        $data = unserialize($data);
+        if ($key === null) {
+            return $data;
+        }
+        if (isset($data[$key])) {
+            return $data[$key];
+        }
+        return null;
+    }
+
+    // }}}
+    // {{{ _listPackages()
+
+    function _listPackages()
+    {
+        $pkglist = array();
+        $dp = @opendir($this->statedir);
+        if (!$dp) {
+            return $pkglist;
+        }
+        while ($ent = readdir($dp)) {
+            if ($ent{0} == '.' || substr($ent, -4) != '.reg') {
+                continue;
+            }
+            $pkglist[] = substr($ent, 0, -4);
+        }
+        return $pkglist;
+    }
+
+    // }}}
+
+    // {{{ packageExists()
+
+    function packageExists($package)
+    {
+        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
+            return $e;
+        }
+        $ret = $this->_packageExists($package);
+        $this->_unlock();
+        return $ret;
+    }
+
+    // }}}
+    // {{{ packageInfo()
+
+    function packageInfo($package = null, $key = null)
+    {
+        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
+            return $e;
+        }
+        $ret = $this->_packageInfo($package, $key);
+        $this->_unlock();
+        return $ret;
+    }
+
+    // }}}
+    // {{{ listPackages()
+
+    function listPackages()
+    {
+        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
+            return $e;
+        }
+        $ret = $this->_listPackages();
+        $this->_unlock();
+        return $ret;
+    }
+
+    // }}}
+    // {{{ addPackage()
+
+    function addPackage($package, $info)
+    {
+        if ($this->packageExists($package)) {
+            return false;
+        }
+        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
+            return $e;
+        }
+        $fp = $this->_openPackageFile($package, 'wb');
+        if ($fp === null) {
+            $this->_unlock();
+            return false;
+        }
+        $info['_lastmodified'] = time();
+        fwrite($fp, serialize($info));
+        $this->_closePackageFile($fp);
+        $this->_unlock();
+        return true;
+    }
+
+    // }}}
+    // {{{ deletePackage()
+
+    function deletePackage($package)
+    {
+        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
+            return $e;
+        }
+        $file = $this->_packageFileName($package);
+        $ret = @unlink($file);
+        $this->rebuildFileMap();
+        $this->_unlock();
+        return $ret;
+    }
+
+    // }}}
+    // {{{ updatePackage()
+
+    function updatePackage($package, $info, $merge = true)
+    {
+        $oldinfo = $this->packageInfo($package);
+        if (empty($oldinfo)) {
+            return false;
+        }
+        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
+            return $e;
+        }
+        $fp = $this->_openPackageFile($package, 'w');
+        if ($fp === null) {
+            $this->_unlock();
+            return false;
+        }
+        $info['_lastmodified'] = time();
+        if ($merge) {
+            fwrite($fp, serialize(array_merge($oldinfo, $info)));
+        } else {
+            fwrite($fp, serialize($info));
+        }
+        $this->_closePackageFile($fp);
+        if (isset($info['filelist'])) {
+            $this->rebuildFileMap();
+        }
+        $this->_unlock();
+        return true;
+    }
+
+    // }}}
+    // {{{ checkFileMap()
+
+    /**
+     * Test whether a file belongs to a package.
+     *
+     * @param string $path file path, absolute or relative to the pear
+     * install dir
+     *
+     * @return string which package the file belongs to, or an empty
+     * string if the file does not belong to an installed package
+     *
+     * @access public
+     */
+    function checkFileMap($path)
+    {
+        if (is_array($path)) {
+            static $notempty;
+            if (empty($notempty)) {
+                $notempty = create_function('$a','return !empty($a);');
+            }
+            $pkgs = array();
+            foreach ($path as $name => $attrs) {
+                if (is_array($attrs) && isset($attrs['baseinstalldir'])) {
+                    $name = $attrs['baseinstalldir'].DIRECTORY_SEPARATOR.$name;
+                }
+                $pkgs[$name] = $this->checkFileMap($name);
+            }
+            return array_filter($pkgs, $notempty);
+        }
+        if (empty($this->filemap_cache) && PEAR::isError($this->readFileMap())) {
+            return $err;
+        }
+        if (isset($this->filemap_cache[$path])) {
+            return $this->filemap_cache[$path];
+        }
+        $l = strlen($this->install_dir);
+        if (substr($path, 0, $l) == $this->install_dir) {
+            $path = preg_replace('!^'.DIRECTORY_SEPARATOR.'+!', '', substr($path, $l));
+        }
+        if (isset($this->filemap_cache[$path])) {
+            return $this->filemap_cache[$path];
+        }
+        return '';
+    }
+
+    // }}}
+
+}
+
+?>
diff --git a/3rdparty/PEAR/Remote.php b/3rdparty/PEAR/Remote.php
new file mode 100644
index 00000000000..7b1e314f903
--- /dev/null
+++ b/3rdparty/PEAR/Remote.php
@@ -0,0 +1,394 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Stig Bakken <ssb@php.net>                                    |
+// +----------------------------------------------------------------------+
+//
+// $Id: Remote.php,v 1.50 2004/06/08 18:03:46 cellog Exp $
+
+require_once 'PEAR.php';
+require_once 'PEAR/Config.php';
+
+/**
+ * This is a class for doing remote operations against the central
+ * PEAR database.
+ *
+ * @nodep XML_RPC_Value
+ * @nodep XML_RPC_Message
+ * @nodep XML_RPC_Client
+ */
+class PEAR_Remote extends PEAR
+{
+    // {{{ properties
+
+    var $config = null;
+    var $cache  = null;
+
+    // }}}
+
+    // {{{ PEAR_Remote(config_object)
+
+    function PEAR_Remote(&$config)
+    {
+        $this->PEAR();
+        $this->config = &$config;
+    }
+
+    // }}}
+
+    // {{{ getCache()
+
+
+    function getCache($args)
+    {
+        $id       = md5(serialize($args));
+        $cachedir = $this->config->get('cache_dir');
+        $filename = $cachedir . DIRECTORY_SEPARATOR . 'xmlrpc_cache_' . $id;
+        if (!file_exists($filename)) {
+            return null;
+        };
+
+        $fp = fopen($filename, 'rb');
+        if (!$fp) {
+            return null;
+        }
+        $content  = fread($fp, filesize($filename));
+        fclose($fp);
+        $result   = array(
+            'age'        => time() - filemtime($filename),
+            'lastChange' => filemtime($filename),
+            'content'    => unserialize($content),
+            );
+        return $result;
+    }
+
+    // }}}
+
+    // {{{ saveCache()
+
+    function saveCache($args, $data)
+    {
+        $id       = md5(serialize($args));
+        $cachedir = $this->config->get('cache_dir');
+        if (!file_exists($cachedir)) {
+            System::mkdir(array('-p', $cachedir));
+        }
+        $filename = $cachedir.'/xmlrpc_cache_'.$id;
+
+        $fp = @fopen($filename, "wb");
+        if ($fp) {
+            fwrite($fp, serialize($data));
+            fclose($fp);
+        };
+    }
+
+    // }}}
+
+    // {{{ call(method, [args...])
+
+    function call($method)
+    {
+        $_args = $args = func_get_args();
+
+        $this->cache = $this->getCache($args);
+        $cachettl = $this->config->get('cache_ttl');
+        // If cache is newer than $cachettl seconds, we use the cache!
+        if ($this->cache !== null && $this->cache['age'] < $cachettl) {
+            return $this->cache['content'];
+        };
+
+        if (extension_loaded("xmlrpc")) {
+            $result = call_user_func_array(array(&$this, 'call_epi'), $args);
+            if (!PEAR::isError($result)) {
+                $this->saveCache($_args, $result);
+            };
+            return $result;
+        }
+        if (!@include_once("XML/RPC.php")) {
+            return $this->raiseError("For this remote PEAR operation you need to install the XML_RPC package");
+        }
+        array_shift($args);
+        $server_host = $this->config->get('master_server');
+        $username = $this->config->get('username');
+        $password = $this->config->get('password');
+        $eargs = array();
+        foreach($args as $arg) $eargs[] = $this->_encode($arg);
+        $f = new XML_RPC_Message($method, $eargs);
+        if ($this->cache !== null) {
+            $maxAge = '?maxAge='.$this->cache['lastChange'];
+        } else {
+            $maxAge = '';
+        };
+        $proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
+        if ($proxy = parse_url($this->config->get('http_proxy'))) {
+            $proxy_host = @$proxy['host'];
+            $proxy_port = @$proxy['port'];
+            $proxy_user = @urldecode(@$proxy['user']);
+            $proxy_pass = @urldecode(@$proxy['pass']);
+        }
+        $c = new XML_RPC_Client('/xmlrpc.php'.$maxAge, $server_host, 80, $proxy_host, $proxy_port, $proxy_user, $proxy_pass);
+        if ($username && $password) {
+            $c->setCredentials($username, $password);
+        }
+        if ($this->config->get('verbose') >= 3) {
+            $c->setDebug(1);
+        }
+        $r = $c->send($f);
+        if (!$r) {
+            return $this->raiseError("XML_RPC send failed");
+        }
+        $v = $r->value();
+        if ($e = $r->faultCode()) {
+            if ($e == $GLOBALS['XML_RPC_err']['http_error'] && strstr($r->faultString(), '304 Not Modified') !== false) {
+                return $this->cache['content'];
+            }
+            return $this->raiseError($r->faultString(), $e);
+        }
+
+        $result = XML_RPC_decode($v);
+        $this->saveCache($_args, $result);
+        return $result;
+    }
+
+    // }}}
+
+    // {{{ call_epi(method, [args...])
+
+    function call_epi($method)
+    {
+        do {
+            if (extension_loaded("xmlrpc")) {
+                break;
+            }
+            if (OS_WINDOWS) {
+                $ext = 'dll';
+            } elseif (PHP_OS == 'HP-UX') {
+                $ext = 'sl';
+            } elseif (PHP_OS == 'AIX') {
+                $ext = 'a';
+            } else {
+                $ext = 'so';
+            }
+            $ext = OS_WINDOWS ? 'dll' : 'so';
+            @dl("xmlrpc-epi.$ext");
+            if (extension_loaded("xmlrpc")) {
+                break;
+            }
+            @dl("xmlrpc.$ext");
+            if (extension_loaded("xmlrpc")) {
+                break;
+            }
+            return $this->raiseError("unable to load xmlrpc extension");
+        } while (false);
+        $params = func_get_args();
+        array_shift($params);
+        $method = str_replace("_", ".", $method);
+        $request = xmlrpc_encode_request($method, $params);
+        $server_host = $this->config->get("master_server");
+        if (empty($server_host)) {
+            return $this->raiseError("PEAR_Remote::call: no master_server configured");
+        }
+        $server_port = 80;
+        if ($http_proxy = $this->config->get('http_proxy')) {
+            $proxy = parse_url($http_proxy);
+            $proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
+            $proxy_host = @$proxy['host'];
+            $proxy_port = @$proxy['port'];
+            $proxy_user = @urldecode(@$proxy['user']);
+            $proxy_pass = @urldecode(@$proxy['pass']);
+            $fp = @fsockopen($proxy_host, $proxy_port);
+            $use_proxy = true;
+        } else {
+            $use_proxy = false;
+            $fp = @fsockopen($server_host, $server_port);
+        }
+        if (!$fp && $http_proxy) {
+            return $this->raiseError("PEAR_Remote::call: fsockopen(`$proxy_host', $proxy_port) failed");
+        } elseif (!$fp) {
+            return $this->raiseError("PEAR_Remote::call: fsockopen(`$server_host', $server_port) failed");
+        }
+        $len = strlen($request);
+        $req_headers = "Host: $server_host:$server_port\r\n" .
+             "Content-type: text/xml\r\n" .
+             "Content-length: $len\r\n";
+        $username = $this->config->get('username');
+        $password = $this->config->get('password');
+        if ($username && $password) {
+            $req_headers .= "Cookie: PEAR_USER=$username; PEAR_PW=$password\r\n";
+            $tmp = base64_encode("$username:$password");
+            $req_headers .= "Authorization: Basic $tmp\r\n";
+        }
+        if ($this->cache !== null) {
+            $maxAge = '?maxAge='.$this->cache['lastChange'];
+        } else {
+            $maxAge = '';
+        };
+
+        if ($use_proxy && $proxy_host != '' && $proxy_user != '') {
+            $req_headers .= 'Proxy-Authorization: Basic '
+                .base64_encode($proxy_user.':'.$proxy_pass)
+                ."\r\n";
+        }
+
+        if ($this->config->get('verbose') > 3) {
+            print "XMLRPC REQUEST HEADERS:\n";
+            var_dump($req_headers);
+            print "XMLRPC REQUEST BODY:\n";
+            var_dump($request);
+        }
+
+        if ($use_proxy && $proxy_host != '') {
+            $post_string = "POST http://".$server_host;
+            if ($proxy_port > '') {
+                $post_string .= ':'.$server_port;
+            }
+        } else {
+            $post_string = "POST ";
+        }
+
+        fwrite($fp, ($post_string."/xmlrpc.php$maxAge HTTP/1.0\r\n$req_headers\r\n$request"));
+        $response = '';
+        $line1 = fgets($fp, 2048);
+        if (!preg_match('!^HTTP/[0-9\.]+ (\d+) (.*)!', $line1, $matches)) {
+            return $this->raiseError("PEAR_Remote: invalid HTTP response from XML-RPC server");
+        }
+        switch ($matches[1]) {
+            case "200": // OK
+                break;
+            case "304": // Not Modified
+                return $this->cache['content'];
+            case "401": // Unauthorized
+                if ($username && $password) {
+                    return $this->raiseError("PEAR_Remote: authorization failed", 401);
+                } else {
+                    return $this->raiseError("PEAR_Remote: authorization required, please log in first", 401);
+                }
+            default:
+                return $this->raiseError("PEAR_Remote: unexpected HTTP response", (int)$matches[1], null, null, "$matches[1] $matches[2]");
+        }
+        while (trim(fgets($fp, 2048)) != ''); // skip rest of headers
+        while ($chunk = fread($fp, 10240)) {
+            $response .= $chunk;
+        }
+        fclose($fp);
+        if ($this->config->get('verbose') > 3) {
+            print "XMLRPC RESPONSE:\n";
+            var_dump($response);
+        }
+        $ret = xmlrpc_decode($response);
+        if (is_array($ret) && isset($ret['__PEAR_TYPE__'])) {
+            if ($ret['__PEAR_TYPE__'] == 'error') {
+                if (isset($ret['__PEAR_CLASS__'])) {
+                    $class = $ret['__PEAR_CLASS__'];
+                } else {
+                    $class = "PEAR_Error";
+                }
+                if ($ret['code']     === '') $ret['code']     = null;
+                if ($ret['message']  === '') $ret['message']  = null;
+                if ($ret['userinfo'] === '') $ret['userinfo'] = null;
+                if (strtolower($class) == 'db_error') {
+                    $ret = $this->raiseError(PEAR::errorMessage($ret['code']),
+                                             $ret['code'], null, null,
+                                             $ret['userinfo']);
+                } else {
+                    $ret = $this->raiseError($ret['message'], $ret['code'],
+                                             null, null, $ret['userinfo']);
+                }
+            }
+        } elseif (is_array($ret) && sizeof($ret) == 1 && isset($ret[0])
+                  && is_array($ret[0]) &&
+                  !empty($ret[0]['faultString']) &&
+                  !empty($ret[0]['faultCode'])) {
+            extract($ret[0]);
+            $faultString = "XML-RPC Server Fault: " .
+                 str_replace("\n", " ", $faultString);
+            return $this->raiseError($faultString, $faultCode);
+        }
+        return $ret;
+    }
+
+    // }}}
+
+    // {{{ _encode
+
+    // a slightly extended version of XML_RPC_encode
+    function _encode($php_val)
+    {
+        global $XML_RPC_Boolean, $XML_RPC_Int, $XML_RPC_Double;
+        global $XML_RPC_String, $XML_RPC_Array, $XML_RPC_Struct;
+
+        $type = gettype($php_val);
+        $xmlrpcval = new XML_RPC_Value;
+
+        switch($type) {
+            case "array":
+                reset($php_val);
+                $firstkey = key($php_val);
+                end($php_val);
+                $lastkey = key($php_val);
+                if ($firstkey === 0 && is_int($lastkey) &&
+                    ($lastkey + 1) == count($php_val)) {
+                    $is_continuous = true;
+                    reset($php_val);
+                    $size = count($php_val);
+                    for ($expect = 0; $expect < $size; $expect++, next($php_val)) {
+                        if (key($php_val) !== $expect) {
+                            $is_continuous = false;
+                            break;
+                        }
+                    }
+                    if ($is_continuous) {
+                        reset($php_val);
+                        $arr = array();
+                        while (list($k, $v) = each($php_val)) {
+                            $arr[$k] = $this->_encode($v);
+                        }
+                        $xmlrpcval->addArray($arr);
+                        break;
+                    }
+                }
+                // fall though if not numerical and continuous
+            case "object":
+                $arr = array();
+                while (list($k, $v) = each($php_val)) {
+                    $arr[$k] = $this->_encode($v);
+                }
+                $xmlrpcval->addStruct($arr);
+                break;
+            case "integer":
+                $xmlrpcval->addScalar($php_val, $XML_RPC_Int);
+                break;
+            case "double":
+                $xmlrpcval->addScalar($php_val, $XML_RPC_Double);
+                break;
+            case "string":
+            case "NULL":
+                $xmlrpcval->addScalar($php_val, $XML_RPC_String);
+                break;
+            case "boolean":
+                $xmlrpcval->addScalar($php_val, $XML_RPC_Boolean);
+                break;
+            case "unknown type":
+            default:
+                return null;
+        }
+        return $xmlrpcval;
+    }
+
+    // }}}
+
+}
+
+?>
diff --git a/3rdparty/PEAR/RunTest.php b/3rdparty/PEAR/RunTest.php
new file mode 100644
index 00000000000..1aa02aab9df
--- /dev/null
+++ b/3rdparty/PEAR/RunTest.php
@@ -0,0 +1,363 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Tomas V.V.Cox <cox@idecnet.com>                             |
+// |          Greg Beaver <cellog@php.net>                                |
+// |                                                                      |
+// +----------------------------------------------------------------------+
+//
+// $Id: RunTest.php,v 1.3.2.4 2005/02/17 17:47:55 cellog Exp $
+//
+
+/**
+ * Simplified version of PHP's test suite
+ * -- EXPERIMENTAL --
+
+ Try it with:
+
+ $ php -r 'include "../PEAR/RunTest.php"; $t=new PEAR_RunTest; $o=$t->run("./pear_system.phpt");print_r($o);'
+
+
+TODO:
+
+Actually finish the development and testing
+
+ */
+
+require_once 'PEAR.php';
+require_once 'PEAR/Config.php';
+
+define('DETAILED', 1);
+putenv("PHP_PEAR_RUNTESTS=1");
+
+class PEAR_RunTest
+{
+    var $_logger;
+
+    /**
+     * An object that supports the PEAR_Common->log() signature, or null
+     * @param PEAR_Common|null
+     */
+    function PEAR_RunTest($logger = null)
+    {
+        $this->_logger = $logger;
+    }
+
+    //
+    //  Run an individual test case.
+    //
+
+    function run($file, $ini_settings = '')
+    {
+        $cwd = getcwd();
+        $conf = &PEAR_Config::singleton();
+        $php = $conf->get('php_bin');
+        //var_dump($php);exit;
+        global $log_format, $info_params, $ini_overwrites;
+
+        $info_params = '';
+        $log_format = 'LEOD';
+
+        // Load the sections of the test file.
+        $section_text = array(
+            'TEST'    => '(unnamed test)',
+            'SKIPIF'  => '',
+            'GET'     => '',
+            'ARGS'    => '',
+        );
+
+        if (!is_file($file) || !$fp = fopen($file, "r")) {
+            return PEAR::raiseError("Cannot open test file: $file");
+        }
+
+        $section = '';
+        while (!feof($fp)) {
+            $line = fgets($fp);
+
+            // Match the beginning of a section.
+            if (ereg('^--([A-Z]+)--',$line,$r)) {
+                $section = $r[1];
+                $section_text[$section] = '';
+                continue;
+            }
+
+            // Add to the section text.
+            $section_text[$section] .= $line;
+        }
+        fclose($fp);
+
+        $shortname = str_replace($cwd.'/', '', $file);
+        $tested = trim($section_text['TEST'])." [$shortname]";
+
+        $tmp = realpath(dirname($file));
+        $tmp_skipif = $tmp . uniqid('/phpt.');
+        $tmp_file   = ereg_replace('\.phpt$','.php',$file);
+        $tmp_post   = $tmp . uniqid('/phpt.');
+
+        @unlink($tmp_skipif);
+        @unlink($tmp_file);
+        @unlink($tmp_post);
+
+        // unlink old test results
+        @unlink(ereg_replace('\.phpt$','.diff',$file));
+        @unlink(ereg_replace('\.phpt$','.log',$file));
+        @unlink(ereg_replace('\.phpt$','.exp',$file));
+        @unlink(ereg_replace('\.phpt$','.out',$file));
+
+        // Check if test should be skipped.
+        $info = '';
+        $warn = false;
+        if (array_key_exists('SKIPIF', $section_text)) {
+            if (trim($section_text['SKIPIF'])) {
+                $this->save_text($tmp_skipif, $section_text['SKIPIF']);
+                //$extra = substr(PHP_OS, 0, 3) !== "WIN" ?
+                //    "unset REQUEST_METHOD;": "";
+
+                //$output = `$extra $php $info_params -f $tmp_skipif`;
+                $output = `$php $info_params -f $tmp_skipif`;
+                unlink($tmp_skipif);
+                if (eregi("^skip", trim($output))) {
+                    $skipreason = "SKIP $tested";
+                    $reason = (eregi("^skip[[:space:]]*(.+)\$", trim($output))) ? eregi_replace("^skip[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
+                    if ($reason) {
+                        $skipreason .= " (reason: $reason)";
+                    }
+                    $this->_logger->log(0, $skipreason);
+                    if (isset($old_php)) {
+                        $php = $old_php;
+                    }
+                    return 'SKIPPED';
+                }
+                if (eregi("^info", trim($output))) {
+                    $reason = (ereg("^info[[:space:]]*(.+)\$", trim($output))) ? ereg_replace("^info[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
+                    if ($reason) {
+                        $info = " (info: $reason)";
+                    }
+                }
+                if (eregi("^warn", trim($output))) {
+                    $reason = (ereg("^warn[[:space:]]*(.+)\$", trim($output))) ? ereg_replace("^warn[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
+                    if ($reason) {
+                        $warn = true; /* only if there is a reason */
+                        $info = " (warn: $reason)";
+                    }
+                }
+            }
+        }
+
+        // We've satisfied the preconditions - run the test!
+        $this->save_text($tmp_file,$section_text['FILE']);
+
+        $args = $section_text['ARGS'] ? ' -- '.$section_text['ARGS'] : '';
+
+        $cmd = "$php$ini_settings -f $tmp_file$args 2>&1";
+        if (isset($this->_logger)) {
+            $this->_logger->log(2, 'Running command "' . $cmd . '"');
+        }
+
+        $savedir = getcwd(); // in case the test moves us around
+        if (isset($section_text['RETURNS'])) {
+            ob_start();
+            system($cmd, $return_value);
+            $out = ob_get_contents();
+            ob_end_clean();
+            @unlink($tmp_post);
+            $section_text['RETURNS'] = (int) trim($section_text['RETURNS']);
+            $returnfail = ($return_value != $section_text['RETURNS']);
+        } else {
+            $out = `$cmd`;
+            $returnfail = false;
+        }
+        chdir($savedir);
+        // Does the output match what is expected?
+        $output = trim($out);
+        $output = preg_replace('/\r\n/', "\n", $output);
+
+        if (isset($section_text['EXPECTF']) || isset($section_text['EXPECTREGEX'])) {
+            if (isset($section_text['EXPECTF'])) {
+                $wanted = trim($section_text['EXPECTF']);
+            } else {
+                $wanted = trim($section_text['EXPECTREGEX']);
+            }
+            $wanted_re = preg_replace('/\r\n/',"\n",$wanted);
+            if (isset($section_text['EXPECTF'])) {
+                $wanted_re = preg_quote($wanted_re, '/');
+                // Stick to basics
+                $wanted_re = str_replace("%s", ".+?", $wanted_re); //not greedy
+                $wanted_re = str_replace("%i", "[+\-]?[0-9]+", $wanted_re);
+                $wanted_re = str_replace("%d", "[0-9]+", $wanted_re);
+                $wanted_re = str_replace("%x", "[0-9a-fA-F]+", $wanted_re);
+                $wanted_re = str_replace("%f", "[+\-]?\.?[0-9]+\.?[0-9]*(E-?[0-9]+)?", $wanted_re);
+                $wanted_re = str_replace("%c", ".", $wanted_re);
+                // %f allows two points "-.0.0" but that is the best *simple* expression
+            }
+    /* DEBUG YOUR REGEX HERE
+            var_dump($wanted_re);
+            print(str_repeat('=', 80) . "\n");
+            var_dump($output);
+    */
+            if (!$returnfail && preg_match("/^$wanted_re\$/s", $output)) {
+                @unlink($tmp_file);
+                $this->_logger->log(0, "PASS $tested$info");
+                if (isset($old_php)) {
+                    $php = $old_php;
+                }
+                return 'PASSED';
+            }
+
+        } else {
+            $wanted = trim($section_text['EXPECT']);
+            $wanted = preg_replace('/\r\n/',"\n",$wanted);
+        // compare and leave on success
+            $ok = (0 == strcmp($output,$wanted));
+            if (!$returnfail && $ok) {
+                @unlink($tmp_file);
+                $this->_logger->log(0, "PASS $tested$info");
+                if (isset($old_php)) {
+                    $php = $old_php;
+                }
+                return 'PASSED';
+            }
+        }
+
+        // Test failed so we need to report details.
+        if ($warn) {
+            $this->_logger->log(0, "WARN $tested$info");
+        } else {
+            $this->_logger->log(0, "FAIL $tested$info");
+        }
+
+        if (isset($section_text['RETURNS'])) {
+            $GLOBALS['__PHP_FAILED_TESTS__'][] = array(
+                            'name' => $file,
+                            'test_name' => $tested,
+                            'output' => ereg_replace('\.phpt$','.log', $file),
+                            'diff'   => ereg_replace('\.phpt$','.diff', $file),
+                            'info'   => $info,
+                            'return' => $return_value
+                            );
+        } else {
+            $GLOBALS['__PHP_FAILED_TESTS__'][] = array(
+                            'name' => $file,
+                            'test_name' => $tested,
+                            'output' => ereg_replace('\.phpt$','.log', $file),
+                            'diff'   => ereg_replace('\.phpt$','.diff', $file),
+                            'info'   => $info,
+                            );
+        }
+
+        // write .exp
+        if (strpos($log_format,'E') !== FALSE) {
+            $logname = ereg_replace('\.phpt$','.exp',$file);
+            if (!$log = fopen($logname,'w')) {
+                return PEAR::raiseError("Cannot create test log - $logname");
+            }
+            fwrite($log,$wanted);
+            fclose($log);
+        }
+
+        // write .out
+        if (strpos($log_format,'O') !== FALSE) {
+            $logname = ereg_replace('\.phpt$','.out',$file);
+            if (!$log = fopen($logname,'w')) {
+                return PEAR::raiseError("Cannot create test log - $logname");
+            }
+            fwrite($log,$output);
+            fclose($log);
+        }
+
+        // write .diff
+        if (strpos($log_format,'D') !== FALSE) {
+            $logname = ereg_replace('\.phpt$','.diff',$file);
+            if (!$log = fopen($logname,'w')) {
+                return PEAR::raiseError("Cannot create test log - $logname");
+            }
+            fwrite($log, $this->generate_diff($wanted, $output,
+                isset($section_text['RETURNS']) ? array(trim($section_text['RETURNS']),
+                    $return_value) : null));
+            fclose($log);
+        }
+
+        // write .log
+        if (strpos($log_format,'L') !== FALSE) {
+            $logname = ereg_replace('\.phpt$','.log',$file);
+            if (!$log = fopen($logname,'w')) {
+                return PEAR::raiseError("Cannot create test log - $logname");
+            }
+            fwrite($log,"
+---- EXPECTED OUTPUT
+$wanted
+---- ACTUAL OUTPUT
+$output
+---- FAILED
+");
+            if ($returnfail) {
+                fwrite($log,"
+---- EXPECTED RETURN
+$section_text[RETURNS]
+---- ACTUAL RETURN
+$return_value
+");
+            }
+            fclose($log);
+            //error_report($file,$logname,$tested);
+        }
+
+        if (isset($old_php)) {
+            $php = $old_php;
+        }
+
+        return $warn ? 'WARNED' : 'FAILED';
+    }
+
+    function generate_diff($wanted, $output, $return_value)
+    {
+        $w = explode("\n", $wanted);
+        $o = explode("\n", $output);
+        $w1 = array_diff_assoc($w,$o);
+        $o1 = array_diff_assoc($o,$w);
+        $w2 = array();
+        $o2 = array();
+        foreach($w1 as $idx => $val) $w2[sprintf("%03d<",$idx)] = sprintf("%03d- ", $idx+1).$val;
+        foreach($o1 as $idx => $val) $o2[sprintf("%03d>",$idx)] = sprintf("%03d+ ", $idx+1).$val;
+        $diff = array_merge($w2, $o2);
+        ksort($diff);
+        if ($return_value) {
+            $extra = "##EXPECTED: $return_value[0]\r\n##RETURNED: $return_value[1]";
+        } else {
+            $extra = '';
+        }
+        return implode("\r\n", $diff) . $extra;
+    }
+
+    //
+    //  Write the given text to a temporary file, and return the filename.
+    //
+
+    function save_text($filename, $text)
+    {
+        if (!$fp = fopen($filename, 'w')) {
+            return PEAR::raiseError("Cannot open file '" . $filename . "' (save_text)");
+        }
+        fwrite($fp,$text);
+        fclose($fp);
+    if (1 < DETAILED) echo "
+FILE $filename {{{
+$text
+}}}
+";
+    }
+
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/README b/3rdparty/README
deleted file mode 100644
index e577d414ada..00000000000
--- a/3rdparty/README
+++ /dev/null
@@ -1,2 +0,0 @@
-the 3rdparty libraries are now located in a seperate repository. just copy https://gitorious.org/owncloud/3rdparty  into this directory and everything will work
-
diff --git a/3rdparty/Sabre.includes.php b/3rdparty/Sabre.includes.php
new file mode 100644
index 00000000000..d41b287b77d
--- /dev/null
+++ b/3rdparty/Sabre.includes.php
@@ -0,0 +1,127 @@
+<?php
+
+/**
+ * Library include file
+ *
+ * This file contains all includes to the rest of the SabreDAV library
+ * Make sure the lib/ directory is in PHP's include_path
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+/* Utilities */
+include 'Sabre/HTTP/Util.php';
+include 'Sabre/HTTP/Response.php';
+include 'Sabre/HTTP/Request.php';
+include 'Sabre/HTTP/AbstractAuth.php';
+include 'Sabre/HTTP/BasicAuth.php';
+include 'Sabre/HTTP/DigestAuth.php';
+include 'Sabre/HTTP/AWSAuth.php';
+
+/* Version */
+include 'Sabre/DAV/Version.php';
+include 'Sabre/HTTP/Version.php';
+
+/* Exceptions */
+include 'Sabre/DAV/Exception.php';
+include 'Sabre/DAV/Exception/BadRequest.php';
+include 'Sabre/DAV/Exception/Conflict.php';
+include 'Sabre/DAV/Exception/FileNotFound.php';
+include 'Sabre/DAV/Exception/InsufficientStorage.php';
+include 'Sabre/DAV/Exception/Locked.php';
+include 'Sabre/DAV/Exception/LockTokenMatchesRequestUri.php';
+include 'Sabre/DAV/Exception/MethodNotAllowed.php';
+include 'Sabre/DAV/Exception/NotImplemented.php';
+include 'Sabre/DAV/Exception/Forbidden.php';
+include 'Sabre/DAV/Exception/PreconditionFailed.php';
+include 'Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php';
+include 'Sabre/DAV/Exception/UnsupportedMediaType.php';
+include 'Sabre/DAV/Exception/NotAuthenticated.php';
+
+include 'Sabre/DAV/Exception/ConflictingLock.php';
+include 'Sabre/DAV/Exception/ReportNotImplemented.php';
+include 'Sabre/DAV/Exception/InvalidResourceType.php';
+
+/* Properties */
+include 'Sabre/DAV/Property.php';
+include 'Sabre/DAV/Property/GetLastModified.php';
+include 'Sabre/DAV/Property/ResourceType.php';
+include 'Sabre/DAV/Property/SupportedLock.php';
+include 'Sabre/DAV/Property/LockDiscovery.php';
+include 'Sabre/DAV/Property/IHref.php';
+include 'Sabre/DAV/Property/Href.php';
+include 'Sabre/DAV/Property/HrefList.php';
+include 'Sabre/DAV/Property/SupportedReportSet.php';
+include 'Sabre/DAV/Property/Response.php';
+include 'Sabre/DAV/Property/ResponseList.php';
+
+/* Node interfaces */
+include 'Sabre/DAV/INode.php';
+include 'Sabre/DAV/IFile.php';
+include 'Sabre/DAV/ICollection.php';
+include 'Sabre/DAV/IProperties.php';
+include 'Sabre/DAV/ILockable.php';
+include 'Sabre/DAV/IQuota.php';
+include 'Sabre/DAV/IExtendedCollection.php';
+
+/* Node abstract implementations */
+include 'Sabre/DAV/Node.php';
+include 'Sabre/DAV/File.php';
+include 'Sabre/DAV/Collection.php';
+include 'Sabre/DAV/Directory.php';
+
+/* Utilities */
+include 'Sabre/DAV/SimpleCollection.php';
+include 'Sabre/DAV/SimpleDirectory.php';
+include 'Sabre/DAV/XMLUtil.php';
+include 'Sabre/DAV/URLUtil.php';
+
+/* Filesystem implementation */
+include 'Sabre/DAV/FS/Node.php';
+include 'Sabre/DAV/FS/File.php';
+include 'Sabre/DAV/FS/Directory.php';
+
+/* Advanced filesystem implementation */
+include 'Sabre/DAV/FSExt/Node.php';
+include 'Sabre/DAV/FSExt/File.php';
+include 'Sabre/DAV/FSExt/Directory.php';
+
+/* Trees */
+include 'Sabre/DAV/Tree.php';
+include 'Sabre/DAV/ObjectTree.php';
+include 'Sabre/DAV/Tree/Filesystem.php';
+
+/* Server */
+include 'Sabre/DAV/Server.php';
+include 'Sabre/DAV/ServerPlugin.php';
+
+/* Browser */
+include 'Sabre/DAV/Browser/Plugin.php';
+include 'Sabre/DAV/Browser/MapGetToPropFind.php';
+include 'Sabre/DAV/Browser/GuessContentType.php';
+
+/* Locks */
+include 'Sabre/DAV/Locks/LockInfo.php';
+include 'Sabre/DAV/Locks/Plugin.php';
+include 'Sabre/DAV/Locks/Backend/Abstract.php';
+include 'Sabre/DAV/Locks/Backend/FS.php';
+include 'Sabre/DAV/Locks/Backend/PDO.php';
+
+/* Temporary File Filter plugin */
+include 'Sabre/DAV/TemporaryFileFilterPlugin.php';
+
+/* Authentication plugin */
+include 'Sabre/DAV/Auth/Plugin.php';
+include 'Sabre/DAV/Auth/IBackend.php';
+include 'Sabre/DAV/Auth/Backend/AbstractDigest.php';
+include 'Sabre/DAV/Auth/Backend/AbstractBasic.php';
+include 'Sabre/DAV/Auth/Backend/File.php';
+include 'Sabre/DAV/Auth/Backend/PDO.php';
+
+/* DavMount plugin */
+include 'Sabre/DAV/Mount/Plugin.php';
+
diff --git a/3rdparty/Sabre/CalDAV/Backend/Abstract.php b/3rdparty/Sabre/CalDAV/Backend/Abstract.php
new file mode 100644
index 00000000000..b694eef49e4
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Backend/Abstract.php
@@ -0,0 +1,163 @@
+<?php
+
+/**
+ * Abstract Calendaring backend. Extend this class to create your own backends.
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_CalDAV_Backend_Abstract {
+
+    /**
+     * Returns a list of calendars for a principal.
+     *
+     * Every project is an array with the following keys:
+     *  * id, a unique id that will be used by other functions to modify the
+     *    calendar. This can be the same as the uri or a database key.
+     *  * uri, which the basename of the uri with which the calendar is 
+     *    accessed.
+     *  * principalUri. The owner of the calendar. Almost always the same as
+     *    principalUri passed to this method.
+     *
+     * Furthermore it can contain webdav properties in clark notation. A very
+     * common one is '{DAV:}displayname'. 
+     *
+     * @param string $principalUri 
+     * @return array 
+     */
+    abstract function getCalendarsForUser($principalUri);
+
+    /**
+     * Creates a new calendar for a principal.
+     *
+     * If the creation was a success, an id must be returned that can be used to reference
+     * this calendar in other methods, such as updateCalendar.
+     *
+     * @param string $principalUri
+     * @param string $calendarUri
+     * @param array $properties
+     * @return void 
+     */
+    abstract function createCalendar($principalUri,$calendarUri,array $properties); 
+
+    /**
+     * Updates properties for a calendar.
+     *
+     * The mutations array uses the propertyName in clark-notation as key,
+     * and the array value for the property value. In the case a property
+     * should be deleted, the property value will be null.
+     *
+     * This method must be atomic. If one property cannot be changed, the
+     * entire operation must fail.
+     *
+     * If the operation was successful, true can be returned.
+     * If the operation failed, false can be returned.
+     *
+     * Deletion of a non-existant property is always succesful.
+     *
+     * Lastly, it is optional to return detailed information about any
+     * failures. In this case an array should be returned with the following
+     * structure:
+     *
+     * array(
+     *   403 => array(
+     *      '{DAV:}displayname' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}owner' => null,
+     *   )
+     * )
+     *
+     * In this example it was forbidden to update {DAV:}displayname. 
+     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
+     * (424 Failed Dependency) because the request needs to be atomic.
+     *
+     * @param string $calendarId
+     * @param array $mutations
+     * @return bool|array 
+     */
+    public function updateCalendar($calendarId, array $mutations) {
+        
+        return false; 
+
+    }
+
+    /**
+     * Delete a calendar and all it's objects 
+     * 
+     * @param string $calendarId 
+     * @return void
+     */
+    abstract function deleteCalendar($calendarId);
+
+    /**
+     * Returns all calendar objects within a calendar.
+     *
+     * Every item contains an array with the following keys:
+     *   * id - unique identifier which will be used for subsequent updates
+     *   * calendardata - The iCalendar-compatible calnedar data
+     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
+     *   * lastmodified - a timestamp of the last modification time
+     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.: 
+     *   '  "abcdef"')
+     *   * calendarid - The calendarid as it was passed to this function.
+     *
+     * Note that the etag is optional, but it's highly encouraged to return for 
+     * speed reasons.
+     *
+     * The calendardata is also optional. If it's not returned 
+     * 'getCalendarObject' will be called later, which *is* expected to return 
+     * calendardata.
+     * 
+     * @param string $calendarId 
+     * @return array 
+     */
+    abstract function getCalendarObjects($calendarId);
+
+    /**
+     * Returns information from a single calendar object, based on it's object
+     * uri.
+     *
+     * The returned array must have the same keys as getCalendarObjects. The 
+     * 'calendardata' object is required here though, while it's not required 
+     * for getCalendarObjects.
+     * 
+     * @param string $calendarId 
+     * @param string $objectUri 
+     * @return array 
+     */
+    abstract function getCalendarObject($calendarId,$objectUri);
+
+    /**
+     * Creates a new calendar object. 
+     * 
+     * @param string $calendarId 
+     * @param string $objectUri 
+     * @param string $calendarData 
+     * @return void
+     */
+    abstract function createCalendarObject($calendarId,$objectUri,$calendarData);
+
+    /**
+     * Updates an existing calendarobject, based on it's uri. 
+     * 
+     * @param string $calendarId 
+     * @param string $objectUri 
+     * @param string $calendarData 
+     * @return void
+     */
+    abstract function updateCalendarObject($calendarId,$objectUri,$calendarData);
+
+    /**
+     * Deletes an existing calendar object. 
+     * 
+     * @param string $calendarId 
+     * @param string $objectUri 
+     * @return void
+     */
+    abstract function deleteCalendarObject($calendarId,$objectUri);
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Backend/PDO.php b/3rdparty/Sabre/CalDAV/Backend/PDO.php
new file mode 100644
index 00000000000..7b1b33b912e
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Backend/PDO.php
@@ -0,0 +1,386 @@
+<?php
+
+/**
+ * PDO CalDAV backend
+ *
+ * This backend is used to store calendar-data in a PDO database, such as 
+ * sqlite or MySQL
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
+
+    /**
+     * pdo 
+     * 
+     * @var PDO
+     */
+    protected $pdo;
+
+    /**
+     * The table name that will be used for calendars 
+     * 
+     * @var string 
+     */
+    protected $calendarTableName;
+
+    /**
+     * The table name that will be used for calendar objects  
+     * 
+     * @var string 
+     */
+    protected $calendarObjectTableName;
+
+    /**
+     * List of CalDAV properties, and how they map to database fieldnames
+     *
+     * Add your own properties by simply adding on to this array
+     * 
+     * @var array
+     */
+    public $propertyMap = array(
+        '{DAV:}displayname'                          => 'displayname',
+        '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description',
+        '{urn:ietf:params:xml:ns:caldav}calendar-timezone'    => 'timezone',
+        '{http://apple.com/ns/ical/}calendar-order'  => 'calendarorder',
+        '{http://apple.com/ns/ical/}calendar-color'  => 'calendarcolor',
+    );
+
+    /**
+     * Creates the backend 
+     * 
+     * @param PDO $pdo 
+     */
+    public function __construct(PDO $pdo, $calendarTableName = 'calendars', $calendarObjectTableName = 'calendarobjects') {
+
+        $this->pdo = $pdo;
+        $this->calendarTableName = $calendarTableName;
+        $this->calendarObjectTableName = $calendarObjectTableName;
+
+    }
+
+    /**
+     * Returns a list of calendars for a principal.
+     *
+     * Every project is an array with the following keys:
+     *  * id, a unique id that will be used by other functions to modify the
+     *    calendar. This can be the same as the uri or a database key.
+     *  * uri, which the basename of the uri with which the calendar is 
+     *    accessed.
+     *  * principalUri. The owner of the calendar. Almost always the same as
+     *    principalUri passed to this method.
+     *
+     * Furthermore it can contain webdav properties in clark notation. A very
+     * common one is '{DAV:}displayname'. 
+     *
+     * @param string $principalUri 
+     * @return array 
+     */
+    public function getCalendarsForUser($principalUri) {
+
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'ctag';
+        $fields[] = 'components';
+        $fields[] = 'principaluri';
+
+        // Making fields a comma-delimited list 
+        $fields = implode(', ', $fields);
+        $stmt = $this->pdo->prepare("SELECT " . $fields . " FROM `".$this->calendarTableName."` WHERE principaluri = ?"); 
+        $stmt->execute(array($principalUri));
+
+        $calendars = array();
+        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+
+            $components = explode(',',$row['components']);
+
+            $calendar = array(
+                'id' => $row['id'],
+                'uri' => $row['uri'],
+                'principaluri' => $row['principaluri'],
+                '{' . Sabre_CalDAV_Plugin::NS_CALENDARSERVER . '}getctag' => $row['ctag']?$row['ctag']:'0',
+                '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set' => new Sabre_CalDAV_Property_SupportedCalendarComponentSet($components),
+            );
+        
+
+            foreach($this->propertyMap as $xmlName=>$dbName) {
+                $calendar[$xmlName] = $row[$dbName];
+            }
+
+            $calendars[] = $calendar;
+
+        }
+
+        return $calendars;
+
+    }
+
+    /**
+     * Creates a new calendar for a principal.
+     *
+     * If the creation was a success, an id must be returned that can be used to reference
+     * this calendar in other methods, such as updateCalendar
+     *
+     * @param string $principalUri
+     * @param string $calendarUri
+     * @param array $properties
+     */
+    public function createCalendar($principalUri,$calendarUri, array $properties) {
+
+        $fieldNames = array(
+            'principaluri',
+            'uri',
+            'ctag',
+        );
+        $values = array(
+            ':principaluri' => $principalUri,
+            ':uri'          => $calendarUri,
+            ':ctag'         => 1,
+        );
+
+        // Default value
+        $sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
+        $fieldNames[] = 'components';
+        if (!isset($properties[$sccs])) {
+            $values[':components'] = 'VEVENT,VTODO';
+        } else {
+            if (!($properties[$sccs] instanceof Sabre_CalDAV_Property_SupportedCalendarComponentSet)) {
+                throw new Sabre_DAV_Exception('The ' . $sccs . ' property must be of type: Sabre_CalDAV_Property_SupportedCalendarComponentSet');
+            }
+            $values[':components'] = implode(',',$properties[$sccs]->getValue());
+        }
+
+        foreach($this->propertyMap as $xmlName=>$dbName) {
+            if (isset($properties[$xmlName])) {
+
+                $myValue = $properties[$xmlName];
+                $values[':' . $dbName] = $properties[$xmlName];
+                $fieldNames[] = $dbName;
+            }
+        }
+
+        $stmt = $this->pdo->prepare("INSERT INTO `".$this->calendarTableName."` (".implode(', ', $fieldNames).") VALUES (".implode(', ',array_keys($values)).")");
+        $stmt->execute($values);
+
+        return $this->pdo->lastInsertId();
+
+    }
+
+    /**
+     * Updates properties for a calendar.
+     *
+     * The mutations array uses the propertyName in clark-notation as key,
+     * and the array value for the property value. In the case a property
+     * should be deleted, the property value will be null.
+     *
+     * This method must be atomic. If one property cannot be changed, the
+     * entire operation must fail.
+     *
+     * If the operation was successful, true can be returned.
+     * If the operation failed, false can be returned.
+     *
+     * Deletion of a non-existant property is always succesful.
+     *
+     * Lastly, it is optional to return detailed information about any
+     * failures. In this case an array should be returned with the following
+     * structure:
+     *
+     * array(
+     *   403 => array(
+     *      '{DAV:}displayname' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}owner' => null,
+     *   )
+     * )
+     *
+     * In this example it was forbidden to update {DAV:}displayname. 
+     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
+     * (424 Failed Dependency) because the request needs to be atomic.
+     *
+     * @param string $calendarId
+     * @param array $mutations 
+     * @return bool|array 
+     */
+    public function updateCalendar($calendarId, array $mutations) {
+
+        $newValues = array();
+        $result = array(
+            200 => array(), // Ok
+            403 => array(), // Forbidden
+            424 => array(), // Failed Dependency
+        );
+
+        $hasError = false;
+
+        foreach($mutations as $propertyName=>$propertyValue) {
+
+            // We don't know about this property. 
+            if (!isset($this->propertyMap[$propertyName])) {
+                $hasError = true;
+                $result[403][$propertyName] = null;
+                unset($mutations[$propertyName]);
+                continue;
+            }
+
+            $fieldName = $this->propertyMap[$propertyName];
+            $newValues[$fieldName] = $propertyValue;
+                
+        }
+
+        // If there were any errors we need to fail the request
+        if ($hasError) {
+            // Properties has the remaining properties
+            foreach($mutations as $propertyName=>$propertyValue) {
+                $result[424][$propertyName] = null;
+            }
+
+            // Removing unused statuscodes for cleanliness
+            foreach($result as $status=>$properties) {
+                if (is_array($properties) && count($properties)===0) unset($result[$status]);
+            }
+
+            return $result;
+
+        }
+
+        // Success
+
+        // Now we're generating the sql query.
+        $valuesSql = array();
+        foreach($newValues as $fieldName=>$value) {
+            $valuesSql[] = $fieldName . ' = ?';
+        }
+        $valuesSql[] = 'ctag = ctag + 1';
+
+        $stmt = $this->pdo->prepare("UPDATE `" . $this->calendarTableName . "` SET " . implode(', ',$valuesSql) . " WHERE id = ?");
+        $newValues['id'] = $calendarId; 
+        $stmt->execute(array_values($newValues));
+
+        return true; 
+
+    }
+
+    /**
+     * Delete a calendar and all it's objects 
+     * 
+     * @param string $calendarId 
+     * @return void
+     */
+    public function deleteCalendar($calendarId) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM `'.$this->calendarObjectTableName.'` WHERE calendarid = ?');
+        $stmt->execute(array($calendarId));
+
+        $stmt = $this->pdo->prepare('DELETE FROM `'.$this->calendarTableName.'` WHERE id = ?');
+        $stmt->execute(array($calendarId));
+
+    }
+
+    /**
+     * Returns all calendar objects within a calendar. 
+     *
+     * Every item contains an array with the following keys:
+     *   * id - unique identifier which will be used for subsequent updates
+     *   * calendardata - The iCalendar-compatible calnedar data
+     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
+     *   * lastmodified - a timestamp of the last modification time
+     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.: 
+     *   '  "abcdef"')
+     *   * calendarid - The calendarid as it was passed to this function.
+     *
+     * Note that the etag is optional, but it's highly encouraged to return for 
+     * speed reasons.
+     *
+     * The calendardata is also optional. If it's not returned 
+     * 'getCalendarObject' will be called later, which *is* expected to return 
+     * calendardata.
+     * 
+     * @param string $calendarId 
+     * @return array 
+     */
+    public function getCalendarObjects($calendarId) {
+
+        $stmt = $this->pdo->prepare('SELECT * FROM `'.$this->calendarObjectTableName.'` WHERE calendarid = ?');
+        $stmt->execute(array($calendarId));
+        return $stmt->fetchAll();
+
+    }
+
+    /**
+     * Returns information from a single calendar object, based on it's object
+     * uri.
+     *
+     * The returned array must have the same keys as getCalendarObjects. The 
+     * 'calendardata' object is required here though, while it's not required 
+     * for getCalendarObjects.
+     * 
+     * @param string $calendarId 
+     * @param string $objectUri 
+     * @return array 
+     */
+    public function getCalendarObject($calendarId,$objectUri) {
+
+        $stmt = $this->pdo->prepare('SELECT * FROM `'.$this->calendarObjectTableName.'` WHERE calendarid = ? AND uri = ?');
+        $stmt->execute(array($calendarId, $objectUri));
+        return $stmt->fetch();
+
+    }
+
+    /**
+     * Creates a new calendar object. 
+     * 
+     * @param string $calendarId 
+     * @param string $objectUri 
+     * @param string $calendarData 
+     * @return void
+     */
+    public function createCalendarObject($calendarId,$objectUri,$calendarData) {
+
+        $stmt = $this->pdo->prepare('INSERT INTO `'.$this->calendarObjectTableName.'` (calendarid, uri, calendardata, lastmodified) VALUES (?,?,?,?)');
+        $stmt->execute(array($calendarId,$objectUri,$calendarData,time()));
+        $stmt = $this->pdo->prepare('UPDATE `'.$this->calendarTableName.'` SET ctag = ctag + 1 WHERE id = ?');
+        $stmt->execute(array($calendarId));
+
+    }
+
+    /**
+     * Updates an existing calendarobject, based on it's uri. 
+     * 
+     * @param string $calendarId 
+     * @param string $objectUri 
+     * @param string $calendarData 
+     * @return void
+     */
+    public function updateCalendarObject($calendarId,$objectUri,$calendarData) {
+
+        $stmt = $this->pdo->prepare('UPDATE `'.$this->calendarObjectTableName.'` SET calendardata = ?, lastmodified = ? WHERE calendarid = ? AND uri = ?');
+        $stmt->execute(array($calendarData,time(),$calendarId,$objectUri));
+        $stmt = $this->pdo->prepare('UPDATE `'.$this->calendarTableName.'` SET ctag = ctag + 1 WHERE id = ?');
+        $stmt->execute(array($calendarId));
+
+    }
+
+    /**
+     * Deletes an existing calendar object. 
+     * 
+     * @param string $calendarId 
+     * @param string $objectUri 
+     * @return void
+     */
+    public function deleteCalendarObject($calendarId,$objectUri) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM `'.$this->calendarObjectTableName.'` WHERE calendarid = ? AND uri = ?');
+        $stmt->execute(array($calendarId,$objectUri));
+        $stmt = $this->pdo->prepare('UPDATE `'. $this->calendarTableName .'` SET ctag = ctag + 1 WHERE id = ?');
+        $stmt->execute(array($calendarId));
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Calendar.php b/3rdparty/Sabre/CalDAV/Calendar.php
new file mode 100644
index 00000000000..0d2b3875771
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Calendar.php
@@ -0,0 +1,318 @@
+<?php
+
+/**
+ * This object represents a CalDAV calendar.
+ *
+ * A calendar can contain multiple TODO and or Events. These are represented
+ * as Sabre_CalDAV_CalendarObject objects.
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
+
+    /**
+     * This is an array with calendar information 
+     * 
+     * @var array 
+     */
+    protected $calendarInfo;
+
+    /**
+     * CalDAV backend 
+     * 
+     * @var Sabre_CalDAV_Backend_Abstract 
+     */
+    protected $caldavBackend;
+
+    /**
+     * Principal backend
+     * 
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * Constructor 
+     * 
+     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend 
+     * @param array $calendarInfo 
+     * @return void
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, Sabre_CalDAV_Backend_Abstract $caldavBackend, $calendarInfo) {
+
+        $this->caldavBackend = $caldavBackend;
+        $this->principalBackend = $principalBackend;
+        $this->calendarInfo = $calendarInfo;
+
+
+    }
+
+    /**
+     * Returns the name of the calendar 
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        return $this->calendarInfo['uri'];
+
+    }
+
+    /**
+     * Updates properties such as the display name and description 
+     * 
+     * @param array $mutations 
+     * @return array 
+     */
+    public function updateProperties($mutations) {
+
+        return $this->caldavBackend->updateCalendar($this->calendarInfo['id'],$mutations);
+
+    }
+
+    /**
+     * Returns the list of properties 
+     * 
+     * @param array $properties 
+     * @return array 
+     */
+    public function getProperties($requestedProperties) {
+
+        $response = array();
+
+        foreach($requestedProperties as $prop) switch($prop) {
+
+            case '{urn:ietf:params:xml:ns:caldav}supported-calendar-data' : 
+                $response[$prop] = new Sabre_CalDAV_Property_SupportedCalendarData(); 
+                break;
+            case '{urn:ietf:params:xml:ns:caldav}supported-collation-set' : 
+                $response[$prop] =  new Sabre_CalDAV_Property_SupportedCollationSet(); 
+                break;
+            case '{DAV:}owner' :
+                $response[$prop] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::HREF,$this->calendarInfo['principaluri']);
+                break;
+            default : 
+                if (isset($this->calendarInfo[$prop])) $response[$prop] = $this->calendarInfo[$prop];
+                break;
+
+        }
+        return $response;
+
+    }
+
+    /**
+     * Returns a calendar object
+     *
+     * The contained calendar objects are for example Events or Todo's.
+     * 
+     * @param string $name 
+     * @return Sabre_DAV_ICalendarObject 
+     */
+    public function getChild($name) {
+
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
+        if (!$obj) throw new Sabre_DAV_Exception_FileNotFound('Calendar object not found');
+        return new Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
+
+    }
+
+    /**
+     * Returns the full list of calendar objects  
+     * 
+     * @return array 
+     */
+    public function getChildren() {
+
+        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
+        $children = array();
+        foreach($objs as $obj) {
+            $children[] = new Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
+        }
+        return $children;
+
+    }
+
+    /**
+     * Checks if a child-node exists. 
+     * 
+     * @param string $name 
+     * @return bool 
+     */
+    public function childExists($name) {
+
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
+        if (!$obj) 
+            return false;
+        else 
+            return true;
+
+    }
+
+    /**
+     * Creates a new directory
+     *
+     * We actually block this, as subdirectories are not allowed in calendars.
+     * 
+     * @param string $name 
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating collections in calendar objects is not allowed');
+
+    }
+
+    /**
+     * Creates a new file
+     *
+     * The contents of the new file must be a valid ICalendar string.
+     * 
+     * @param string $name 
+     * @param resource $calendarData 
+     * @return void
+     */
+    public function createFile($name,$calendarData = null) {
+
+        $calendarData = stream_get_contents($calendarData);
+        // Converting to UTF-8, if needed
+        $calendarData = Sabre_DAV_StringUtil::ensureUTF8($calendarData);
+
+        $supportedComponents = $this->calendarInfo['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set'];
+        if ($supportedComponents) {
+            $supportedComponents = $supportedComponents->getValue();
+        } else {
+            $supportedComponents = null;
+        }
+        Sabre_CalDAV_ICalendarUtil::validateICalendarObject($calendarData, $supportedComponents);
+
+        $this->caldavBackend->createCalendarObject($this->calendarInfo['id'],$name,$calendarData);
+
+    }
+
+    /**
+     * Deletes the calendar. 
+     * 
+     * @return void
+     */
+    public function delete() {
+
+        $this->caldavBackend->deleteCalendar($this->calendarInfo['id']);
+
+    }
+
+    /**
+     * Renames the calendar. Note that most calendars use the 
+     * {DAV:}displayname to display a name to display a name. 
+     * 
+     * @param string $newName 
+     * @return void
+     */
+    public function setName($newName) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Renaming calendars is not yet supported');
+
+    }
+
+    /**
+     * Returns the last modification date as a unix timestamp.
+     * 
+     * @return void
+     */
+    public function getLastModified() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner 
+     * 
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->calendarInfo['principaluri'];
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     * 
+     * @return string|null 
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to 
+     *      be updated. 
+     * 
+     * @return array 
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->calendarInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
+                'protected' => true,
+            ),
+
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's. 
+     * 
+     * @param array $acl 
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+
+
+}
diff --git a/3rdparty/Sabre/CalDAV/CalendarObject.php b/3rdparty/Sabre/CalDAV/CalendarObject.php
new file mode 100644
index 00000000000..0c99f18deb7
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/CalendarObject.php
@@ -0,0 +1,260 @@
+<?php
+
+/**
+ * The CalendarObject represents a single VEVENT or VTODO within a Calendar. 
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_CalendarObject extends Sabre_DAV_File implements Sabre_CalDAV_ICalendarObject, Sabre_DAVACL_IACL {
+
+    /**
+     * Sabre_CalDAV_Backend_Abstract 
+     * 
+     * @var array 
+     */
+    protected $caldavBackend;
+
+    /**
+     * Array with information about this CalendarObject 
+     * 
+     * @var array 
+     */
+    protected $objectData;
+
+    /**
+     * Array with information about the containing calendar
+     * 
+     * @var array 
+     */
+    protected $calendarInfo;
+
+    /**
+     * Constructor 
+     * 
+     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
+     * @param array $calendarInfo
+     * @param array $objectData 
+     */
+    public function __construct(Sabre_CalDAV_Backend_Abstract $caldavBackend,array $calendarInfo,array $objectData) {
+
+        $this->caldavBackend = $caldavBackend;
+
+        if (!isset($objectData['calendarid'])) {
+            throw new InvalidArgumentException('The objectData argument must contain a \'calendarid\' property');
+        }
+        if (!isset($objectData['uri'])) {
+            throw new InvalidArgumentException('The objectData argument must contain an \'uri\' property');
+        }
+
+        $this->calendarInfo = $calendarInfo;
+        $this->objectData = $objectData;
+
+    }
+
+    /**
+     * Returns the uri for this object 
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        return $this->objectData['uri'];
+
+    }
+
+    /**
+     * Returns the ICalendar-formatted object 
+     * 
+     * @return string 
+     */
+    public function get() {
+
+        // Pre-populating the 'calendardata' is optional, if we don't have it
+        // already we fetch it from the backend.
+        if (!isset($this->objectData['calendardata'])) {
+            $this->objectData = $this->caldavBackend->getCalendarObject($this->objectData['calendarid'], $this->objectData['uri']);
+        }
+        return $this->objectData['calendardata'];
+
+    }
+
+    /**
+     * Updates the ICalendar-formatted object 
+     * 
+     * @param string $calendarData 
+     * @return void 
+     */
+    public function put($calendarData) {
+
+        if (is_resource($calendarData))
+            $calendarData = stream_get_contents($calendarData);
+
+        // Converting to UTF-8, if needed
+        $calendarData = Sabre_DAV_StringUtil::ensureUTF8($calendarData);
+
+        $supportedComponents = $this->calendarInfo['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set'];
+        if ($supportedComponents) {
+            $supportedComponents = $supportedComponents->getValue();
+        } else {
+            $supportedComponents = null;
+        }
+        Sabre_CalDAV_ICalendarUtil::validateICalendarObject($calendarData, $supportedComponents);
+
+        $this->caldavBackend->updateCalendarObject($this->calendarInfo['id'],$this->objectData['uri'],$calendarData);
+        $this->objectData['calendardata'] = $calendarData;
+
+    }
+
+    /**
+     * Deletes the calendar object 
+     * 
+     * @return void
+     */
+    public function delete() {
+
+        $this->caldavBackend->deleteCalendarObject($this->calendarInfo['id'],$this->objectData['uri']);
+
+    }
+
+    /**
+     * Returns the mime content-type 
+     * 
+     * @return string 
+     */
+    public function getContentType() {
+
+        return 'text/calendar';
+
+    }
+
+    /**
+     * Returns an ETag for this object.
+     *
+     * The ETag is an arbritrary string, but MUST be surrounded by double-quotes.
+     * 
+     * @return string 
+     */
+    public function getETag() {
+
+        if (isset($this->objectData['etag'])) {
+            return $this->objectData['etag'];
+        } else {
+            return '"' . md5($this->get()). '"';
+        }
+
+    }
+
+    /**
+     * Returns the last modification date as a unix timestamp
+     * 
+     * @return time 
+     */
+    public function getLastModified() {
+
+        return $this->objectData['lastmodified'];
+
+    }
+
+    /**
+     * Returns the size of this object in bytes 
+     * 
+     * @return int
+     */
+    public function getSize() {
+
+        return strlen($this->objectData['calendardata']);
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner 
+     * 
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->calendarInfo['principaluri'];
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     * 
+     * @return string|null 
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to 
+     *      be updated. 
+     * 
+     * @return array 
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->calendarInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
+                'protected' => true,
+            ),
+
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's. 
+     * 
+     * @param array $acl 
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+
+}
+
diff --git a/3rdparty/Sabre/CalDAV/CalendarRootNode.php b/3rdparty/Sabre/CalDAV/CalendarRootNode.php
new file mode 100644
index 00000000000..69669a9d7fd
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/CalendarRootNode.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * Users collection 
+ *
+ * This object is responsible for generating a collection of users.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_CalendarRootNode extends Sabre_DAVACL_AbstractPrincipalCollection {
+
+    /**
+     * CalDAV backend 
+     * 
+     * @var Sabre_CalDAV_Backend_Abstract 
+     */
+    protected $caldavBackend;
+
+    /**
+     * Constructor 
+     *
+     * This constructor needs both an authentication and a caldav backend.
+     *
+     * By default this class will show a list of calendar collections for 
+     * principals in the 'principals' collection. If your main principals are 
+     * actually located in a different path, use the $principalPrefix argument 
+     * to override this.
+     *
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend 
+     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend 
+     * @param string $principalPrefix
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend,Sabre_CalDAV_Backend_Abstract $caldavBackend, $principalPrefix = 'principals') {
+
+        parent::__construct($principalBackend, $principalPrefix);
+        $this->caldavBackend = $caldavBackend;
+
+    }
+
+    /**
+     * Returns the nodename
+     *
+     * We're overriding this, because the default will be the 'principalPrefix',
+     * and we want it to be Sabre_CalDAV_Plugin::CALENDAR_ROOT 
+     * 
+     * @return void
+     */
+    public function getName() {
+
+        return Sabre_CalDAV_Plugin::CALENDAR_ROOT;
+
+    }
+
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     * 
+     * @param array $principal 
+     * @return Sabre_DAV_INode 
+     */
+    public function getChildForPrincipal(array $principal) {
+
+        return new Sabre_CalDAV_UserCalendars($this->principalBackend, $this->caldavBackend, $principal['uri']);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Exception/InvalidICalendarObject.php b/3rdparty/Sabre/CalDAV/Exception/InvalidICalendarObject.php
new file mode 100644
index 00000000000..656b7286a66
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Exception/InvalidICalendarObject.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * InvalidICalendarObject
+ *
+ * This exception is thrown when an attempt is made to create or update
+ * an invalid ICalendar object
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Exception_InvalidICalendarObject extends Sabre_DAV_Exception_PreconditionFailed {
+
+
+}
diff --git a/3rdparty/Sabre/CalDAV/ICSExportPlugin.php b/3rdparty/Sabre/CalDAV/ICSExportPlugin.php
new file mode 100644
index 00000000000..4e2c6eb93d2
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/ICSExportPlugin.php
@@ -0,0 +1,124 @@
+<?php
+
+/**
+ * ICS Exporter
+ *
+ * This plugin adds the ability to export entire calendars as .ics files.
+ * This is useful for clients that don't support CalDAV yet. They often do 
+ * support ics files.
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_ICSExportPlugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Reference to Server class 
+     * 
+     * @var Sabre_DAV_Server 
+     */
+    private $server;
+
+    /**
+     * Initializes the plugin and registers event handlers 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
+
+    }
+
+    /**
+     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
+     * with ?export
+     * 
+     * @param string $method
+     * @param string $uri
+     * @return void
+     */
+    public function beforeMethod($method, $uri) {
+
+        if ($method!='GET') return;
+        if ($this->server->httpRequest->getQueryString()!='export') return;
+
+        // splitting uri
+        list($uri) = explode('?',$uri,2);
+
+        $node = $this->server->tree->getNodeForPath($uri);
+
+        if (!($node instanceof Sabre_CalDAV_Calendar)) return;
+
+        $this->server->httpResponse->setHeader('Content-Type','text/calendar');
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->sendBody($this->generateICS($this->server->tree->getChildren($uri)));
+
+        // Returning false to break the event chain
+        return false;
+
+    }
+
+    /**
+     * Merges all calendar objects, and builds one big ics export 
+     * 
+     * @param array $nodes 
+     * @return void
+     */
+    public function generateICS(array $nodes) {
+
+        $calendar = new Sabre_VObject_Component('vcalendar');
+        $calendar->version = '2.0';
+        $calendar->prodid = '-//SabreDAV//SabreDAV ' . Sabre_DAV_Version::VERSION . '//EN';
+        $calendar->calscale = 'GREGORIAN';
+
+        $collectedTimezones = array();
+
+        $timezones = array();
+        $objects = array();
+
+        foreach($nodes as $node) {
+
+            $nodeData = $node->get();
+            $nodeComp = Sabre_VObject_Reader::read($nodeData);
+
+            foreach($nodeComp->children() as $child) {
+
+                switch($child->name) {
+                    case 'VEVENT' :
+                    case 'VTODO' :
+                    case 'VJOURNAL' :
+                        $objects[] = $child;
+                        break;
+
+                    // VTIMEZONE is special, because we need to filter out the duplicates
+                    case 'VTIMEZONE' :
+                        // Naively just checking tzid.
+                        if (in_array((string)$child->TZID, $collectedTimezones)) continue;
+
+                        $timezones[] = $child;
+                        $collectedTimezones[] = $child->TZID;
+                        break;
+
+
+                }
+
+
+            }
+
+
+        }
+
+        foreach($timezones as $tz) $calendar->add($tz);
+        foreach($objects as $obj) $calendar->add($obj);
+
+        return $calendar->serialize();
+
+    } 
+
+}
diff --git a/3rdparty/Sabre/CalDAV/ICalendar.php b/3rdparty/Sabre/CalDAV/ICalendar.php
new file mode 100644
index 00000000000..8193dff3a83
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/ICalendar.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Calendar interface
+ *
+ * Implement this interface to allow a node to be recognized as an calendar.
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CalDAV_ICalendar extends Sabre_DAV_ICollection {
+
+ 
+
+}
diff --git a/3rdparty/Sabre/CalDAV/ICalendarObject.php b/3rdparty/Sabre/CalDAV/ICalendarObject.php
new file mode 100644
index 00000000000..708300ad7bd
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/ICalendarObject.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * CalendarObject interface 
+/**
+ * Extend the ICalendarObject interface to allow your custom nodes to be picked up as 
+ * CalendarObjects.
+ *
+ * Calendar objects are resources such as Events, Todo's or Journals.
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CalDAV_ICalendarObject extends Sabre_DAV_IFile { 
+
+}
+
diff --git a/3rdparty/Sabre/CalDAV/ICalendarUtil.php b/3rdparty/Sabre/CalDAV/ICalendarUtil.php
new file mode 100644
index 00000000000..699abfdd6f5
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/ICalendarUtil.php
@@ -0,0 +1,157 @@
+<?php
+
+/**
+ * This class contains several utilities related to the ICalendar (rfc2445) format
+ *
+ * This class is now deprecated, and won't be further maintained. Please use 
+ * the Sabre_VObject package for your ics parsing needs.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ * @deprecated Use Sabre_VObject instead.
+ */
+class Sabre_CalDAV_ICalendarUtil {
+
+    /**
+     * Validates an ICalendar object
+     *
+     * This method makes sure this ICalendar object is properly formatted.
+     * If we can't parse it, we'll throw exceptions.
+     *
+     * @param string $icalData 
+     * @param array $allowedComponents 
+     * @return bool 
+     */
+    static function validateICalendarObject($icalData, array $allowedComponents = null) {
+
+        $xcal = simplexml_load_string(self::toXCal($icalData));
+        if (!$xcal) throw new Sabre_CalDAV_Exception_InvalidICalendarObject('Invalid calendarobject format');
+
+        $xcal->registerXPathNameSpace('cal','urn:ietf:params:xml:ns:xcal');
+        
+        // Check if there's only 1 component
+        $components = array('vevent','vtodo','vjournal','vfreebusy');
+        $componentsFound = array();
+
+        foreach($components as $component) {
+            $test = $xcal->xpath('/cal:iCalendar/cal:vcalendar/cal:' . $component);
+            if (is_array($test)) $componentsFound = array_merge($componentsFound, $test);
+        }
+        if (count($componentsFound)<1) {
+            throw new Sabre_CalDAV_Exception_InvalidICalendarObject('One VEVENT, VTODO, VJOURNAL or VFREEBUSY must be specified. 0 found.');
+        }
+        $component = $componentsFound[0];
+
+        if (is_null($allowedComponents)) return true;
+
+        // Check if the component is allowed
+        $name = $component->getName();
+        if (!in_array(strtoupper($name),$allowedComponents)) {
+            throw new Sabre_CalDAV_Exception_InvalidICalendarObject(strtoupper($name) . ' is not allowed in this calendar.');
+        }
+
+        if (count($xcal->xpath('/cal:iCalendar/cal:vcalendar/cal:method'))>0) {
+            throw new Sabre_CalDAV_Exception_InvalidICalendarObject('The METHOD property is not allowed in calendar objects');
+        }
+
+        return true;
+
+    }
+
+    /**
+     * Converts ICalendar data to XML.
+     *
+     * Properties are converted to lowercase xml elements. Parameters are;
+     * converted to attributes. BEGIN:VEVENT is converted to <vevent> and
+     * END:VEVENT </vevent> as well as other components.
+     *
+     * It's a very loose parser. If any line does not conform to the spec, it
+     * will simply be ignored. It will try to detect if \r\n or \n line endings
+     * are used.
+     *
+     * @todo Currently quoted attributes are not parsed correctly.
+     * @see http://tools.ietf.org/html/draft-royer-calsch-xcal-03
+     * @param string $icalData 
+     * @return string. 
+     */
+    static function toXCAL($icalData) {
+
+        // Detecting line endings
+        $lb="\r\n";
+        if (strpos($icalData,"\r\n")!==false) $lb = "\r\n";
+        elseif (strpos($icalData,"\n")!==false) $lb = "\n";
+
+        // Splitting up items per line
+        $lines = explode($lb,$icalData);
+
+        // Properties can be folded over 2 lines. In this case the second
+        // line will be preceeded by a space or tab.
+        $lines2 = array();
+        foreach($lines as $line) {
+
+            if (!$line) continue;
+            if ($line[0]===" " || $line[0]==="\t") {
+                $lines2[count($lines2)-1].=substr($line,1);
+                continue;
+            }
+
+            $lines2[]=$line;
+
+        }
+
+        $xml = '<?xml version="1.0"?>' . "\n";
+        $xml.= "<iCalendar xmlns=\"urn:ietf:params:xml:ns:xcal\">\n";
+
+        $spaces = 2;
+        foreach($lines2 as $line) {
+
+            $matches = array();
+            // This matches PROPERTYNAME;ATTRIBUTES:VALUE
+            if (!preg_match('/^([^:^;]*)(?:;([^:]*))?:(.*)$/',$line,$matches))
+                continue;
+
+            $propertyName = strtolower($matches[1]);
+            $attributes = $matches[2];
+            $value = $matches[3];
+
+            // If the line was in the format BEGIN:COMPONENT or END:COMPONENT, we need to special case it.
+            if ($propertyName === 'begin') {
+                $xml.=str_repeat(" ",$spaces);
+                $xml.='<' . strtolower($value) . ">\n";
+                $spaces+=2;
+                continue;
+            } elseif ($propertyName === 'end') {
+                $spaces-=2;
+                $xml.=str_repeat(" ",$spaces);
+                $xml.='</' . strtolower($value) . ">\n";
+                continue;
+            }
+
+            $xml.=str_repeat(" ",$spaces);
+            $xml.='<' . $propertyName;
+            if ($attributes) {
+                // There can be multiple attributes
+                $attributes = explode(';',$attributes);
+                foreach($attributes as $att) {
+  
+                    list($attName,$attValue) = explode('=',$att,2);
+                    $attName = strtolower($attName);
+                    if ($attName === 'language') $attName='xml:lang';
+                    $xml.=' ' . $attName . '="' . htmlspecialchars($attValue) . '"';
+
+                }
+            }
+
+            $xml.='>'. htmlspecialchars(trim($value)) . '</' . $propertyName . ">\n";
+          
+        }
+        $xml.="</iCalendar>";
+        return $xml;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/CalDAV/Plugin.php b/3rdparty/Sabre/CalDAV/Plugin.php
new file mode 100644
index 00000000000..02747c8395e
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Plugin.php
@@ -0,0 +1,788 @@
+<?php
+
+/**
+ * CalDAV plugin
+ *
+ * This plugin provides functionality added by CalDAV (RFC 4791)
+ * It implements new reports, and the MKCALENDAR method.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * This is the official CalDAV namespace
+     */
+    const NS_CALDAV = 'urn:ietf:params:xml:ns:caldav';
+    
+    /**
+     * This is the namespace for the proprietary calendarserver extensions
+     */
+    const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
+
+    /**
+     * The following constants are used to differentiate
+     * the various filters for the calendar-query report
+     */
+    const FILTER_COMPFILTER   = 1;
+    const FILTER_TIMERANGE    = 3;
+    const FILTER_PROPFILTER   = 4;
+    const FILTER_PARAMFILTER  = 5;
+    const FILTER_TEXTMATCH    = 6;
+
+    /**
+     * The hardcoded root for calendar objects. It is unfortunate
+     * that we're stuck with it, but it will have to do for now
+     */
+    const CALENDAR_ROOT = 'calendars';
+
+    /**
+     * Reference to server object 
+     * 
+     * @var Sabre_DAV_Server 
+     */
+    private $server;
+
+    /**
+     * Use this method to tell the server this plugin defines additional
+     * HTTP methods.
+     *
+     * This method is passed a uri. It should only return HTTP methods that are 
+     * available for the specified uri.
+     *
+     * @param string $uri
+     * @return array 
+     */
+    public function getHTTPMethods($uri) {
+
+        // The MKCALENDAR is only available on unmapped uri's, whose
+        // parents extend IExtendedCollection
+        list($parent, $name) = Sabre_DAV_URLUtil::splitPath($uri);
+
+        $node = $this->server->tree->getNodeForPath($parent);
+
+        if ($node instanceof Sabre_DAV_IExtendedCollection) {
+            try {
+                $node->getChild($name);
+            } catch (Sabre_DAV_Exception_FileNotFound $e) {
+                return array('MKCALENDAR');
+            }
+        }
+        return array();
+
+    }
+
+    /**
+     * Returns a list of features for the DAV: HTTP header. 
+     * 
+     * @return array 
+     */
+    public function getFeatures() {
+
+        return array('calendar-access', 'calendar-proxy');
+
+    }
+
+    /**
+     * Returns a plugin name.
+     * 
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre_DAV_Server::getPlugin 
+     * 
+     * @return string 
+     */
+    public function getPluginName() {
+
+        return 'caldav';
+
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     * Note that you still need to subscribe to the 'report' event to actually 
+     * implement them 
+     * 
+     * @param string $uri
+     * @return array 
+     */
+    public function getSupportedReportSet($uri) {
+
+        $node = $this->server->tree->getNodeForPath($uri);
+        if ($node instanceof Sabre_CalDAV_ICalendar || $node instanceof Sabre_CalDAV_ICalendarObject) {
+            return array(
+                 '{' . self::NS_CALDAV . '}calendar-multiget',
+                 '{' . self::NS_CALDAV . '}calendar-query',
+            );
+        }
+        return array();
+
+    }
+
+    /**
+     * Initializes the plugin 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
+        //$server->subscribeEvent('unknownMethod',array($this,'unknownMethod2'),1000);
+        $server->subscribeEvent('report',array($this,'report'));
+        $server->subscribeEvent('beforeGetProperties',array($this,'beforeGetProperties'));
+
+        $server->xmlNamespaces[self::NS_CALDAV] = 'cal';
+        $server->xmlNamespaces[self::NS_CALENDARSERVER] = 'cs';
+
+        $server->propertyMap['{' . self::NS_CALDAV . '}supported-calendar-component-set'] = 'Sabre_CalDAV_Property_SupportedCalendarComponentSet';
+
+        $server->resourceTypeMapping['Sabre_CalDAV_ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
+        $server->resourceTypeMapping['Sabre_CalDAV_Principal_ProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
+        $server->resourceTypeMapping['Sabre_CalDAV_Principal_ProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
+
+        array_push($server->protectedProperties,
+
+            '{' . self::NS_CALDAV . '}supported-calendar-component-set',
+            '{' . self::NS_CALDAV . '}supported-calendar-data',
+            '{' . self::NS_CALDAV . '}max-resource-size',
+            '{' . self::NS_CALDAV . '}min-date-time',
+            '{' . self::NS_CALDAV . '}max-date-time',
+            '{' . self::NS_CALDAV . '}max-instances',
+            '{' . self::NS_CALDAV . '}max-attendees-per-instance',
+            '{' . self::NS_CALDAV . '}calendar-home-set',
+            '{' . self::NS_CALDAV . '}supported-collation-set',
+            '{' . self::NS_CALDAV . '}calendar-data',
+
+            // scheduling extension
+            '{' . self::NS_CALDAV . '}calendar-user-address-set',
+
+            // CalendarServer extensions
+            '{' . self::NS_CALENDARSERVER . '}getctag',
+            '{' . self::NS_CALENDARSERVER . '}calendar-proxy-read-for',
+            '{' . self::NS_CALENDARSERVER . '}calendar-proxy-write-for'
+
+        );
+    }
+
+    /**
+     * This function handles support for the MKCALENDAR method
+     * 
+     * @param string $method 
+     * @return bool 
+     */
+    public function unknownMethod($method, $uri) {
+
+        if ($method!=='MKCALENDAR') return;
+
+        $this->httpMkCalendar($uri);
+        // false is returned to stop the unknownMethod event
+        return false;
+
+    }
+
+    /**
+     * This functions handles REPORT requests specific to CalDAV 
+     * 
+     * @param string $reportName 
+     * @param DOMNode $dom 
+     * @return bool 
+     */
+    public function report($reportName,$dom) {
+
+        switch($reportName) { 
+            case '{'.self::NS_CALDAV.'}calendar-multiget' :
+                $this->calendarMultiGetReport($dom);
+                return false;
+            case '{'.self::NS_CALDAV.'}calendar-query' :
+                $this->calendarQueryReport($dom);
+                return false;
+
+        }
+
+
+    }
+
+    /**
+     * This function handles the MKCALENDAR HTTP method, which creates
+     * a new calendar.
+     * 
+     * @param string $uri
+     * @return void 
+     */
+    public function httpMkCalendar($uri) {
+
+        // Due to unforgivable bugs in iCal, we're completely disabling MKCALENDAR support
+        // for clients matching iCal in the user agent
+        //$ua = $this->server->httpRequest->getHeader('User-Agent');
+        //if (strpos($ua,'iCal/')!==false) {
+        //    throw new Sabre_DAV_Exception_Forbidden('iCal has major bugs in it\'s RFC3744 support. Therefore we are left with no other choice but disabling this feature.');
+        //}
+
+        $body = $this->server->httpRequest->getBody(true);
+        $properties = array();
+
+        if ($body) {
+
+            $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+
+            foreach($dom->firstChild->childNodes as $child) {
+
+                if (Sabre_DAV_XMLUtil::toClarkNotation($child)!=='{DAV:}set') continue;
+                foreach(Sabre_DAV_XMLUtil::parseProperties($child,$this->server->propertyMap) as $k=>$prop) {
+                    $properties[$k] = $prop;
+                }
+            
+            }
+        }
+
+        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:caldav}calendar');
+
+        $this->server->createCollection($uri,$resourceType,$properties);
+
+        $this->server->httpResponse->sendStatus(201);
+        $this->server->httpResponse->setHeader('Content-Length',0);
+    }
+
+    /**
+     * beforeGetProperties
+     *
+     * This method handler is invoked before any after properties for a
+     * resource are fetched. This allows us to add in any CalDAV specific 
+     * properties. 
+     * 
+     * @param string $path
+     * @param Sabre_DAV_INode $node
+     * @param array $requestedProperties
+     * @param array $returnedProperties
+     * @return void
+     */
+    public function beforeGetProperties($path, Sabre_DAV_INode $node, &$requestedProperties, &$returnedProperties) {
+
+        if ($node instanceof Sabre_DAVACL_IPrincipal) {
+
+            // calendar-home-set property
+            $calHome = '{' . self::NS_CALDAV . '}calendar-home-set';
+            if (in_array($calHome,$requestedProperties)) {
+                $principalId = $node->getName(); 
+                $calendarHomePath = self::CALENDAR_ROOT . '/' . $principalId . '/';
+                unset($requestedProperties[$calHome]);
+                $returnedProperties[200][$calHome] = new Sabre_DAV_Property_Href($calendarHomePath);
+            }
+
+            // calendar-user-address-set property
+            $calProp = '{' . self::NS_CALDAV . '}calendar-user-address-set';
+            if (in_array($calProp,$requestedProperties)) {
+
+                $addresses = $node->getAlternateUriSet();
+                $addresses[] = $this->server->getBaseUri() . $node->getPrincipalUrl();
+                unset($requestedProperties[$calProp]);
+                $returnedProperties[200][$calProp] = new Sabre_DAV_Property_HrefList($addresses, false);
+
+            }
+
+            // These two properties are shortcuts for ical to easily find 
+            // other principals this principal has access to.
+            $propRead = '{' . self::NS_CALENDARSERVER . '}calendar-proxy-read-for';
+            $propWrite = '{' . self::NS_CALENDARSERVER . '}calendar-proxy-write-for';
+            if (in_array($propRead,$requestedProperties) || in_array($propWrite,$requestedProperties)) {
+
+                $membership = $node->getGroupMembership();
+                $readList = array();
+                $writeList = array();
+
+                foreach($membership as $group) {
+
+                    $groupNode = $this->server->tree->getNodeForPath($group);
+
+                    // If the node is either ap proxy-read or proxy-write 
+                    // group, we grab the parent principal and add it to the 
+                    // list.
+                    if ($groupNode instanceof Sabre_CalDAV_Principal_ProxyRead) {
+                        list($readList[]) = Sabre_DAV_URLUtil::splitPath($group);
+                    }
+                    if ($groupNode instanceof Sabre_CalDAV_Principal_ProxyWrite) {
+                        list($writeList[]) = Sabre_DAV_URLUtil::splitPath($group);
+                    }
+
+                }
+                if (in_array($propRead,$requestedProperties)) {
+                    unset($requestedProperties[$propRead]);
+                    $returnedProperties[200][$propRead] = new Sabre_DAV_Property_HrefList($readList);
+                }
+                if (in_array($propWrite,$requestedProperties)) {
+                    unset($requestedProperties[$propWrite]);
+                    $returnedProperties[200][$propWrite] = new Sabre_DAV_Property_HrefList($writeList);
+                }
+
+            }
+
+        } // instanceof IPrincipal
+
+
+        if ($node instanceof Sabre_CalDAV_ICalendarObject) {
+            // The calendar-data property is not supposed to be a 'real' 
+            // property, but in large chunks of the spec it does act as such. 
+            // Therefore we simply expose it as a property.
+            $calDataProp = '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data';
+            if (in_array($calDataProp, $requestedProperties)) {
+                unset($requestedProperties[$calDataProp]);
+                $val = $node->get();
+                if (is_resource($val))
+                    $val = stream_get_contents($val);
+
+                // Taking out \r to not screw up the xml output
+                $returnedProperties[200][$calDataProp] = str_replace("\r","", $val);
+
+            }
+        }
+
+    }
+
+    /**
+     * This function handles the calendar-multiget REPORT.
+     *
+     * This report is used by the client to fetch the content of a series
+     * of urls. Effectively avoiding a lot of redundant requests.
+     * 
+     * @param DOMNode $dom 
+     * @return void
+     */
+    public function calendarMultiGetReport($dom) {
+
+        $properties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
+
+        $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
+        foreach($hrefElems as $elem) {
+            $uri = $this->server->calculateUri($elem->nodeValue);
+            list($objProps) = $this->server->getPropertiesForPath($uri,$properties);
+            $propertyList[]=$objProps;
+
+        }
+
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($propertyList));
+
+    }
+
+    /**
+     * This function handles the calendar-query REPORT
+     *
+     * This report is used by clients to request calendar objects based on
+     * complex conditions.
+     * 
+     * @param DOMNode $dom 
+     * @return void
+     */
+    public function calendarQueryReport($dom) {
+
+        $requestedProperties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
+
+        $filterNode = $dom->getElementsByTagNameNS('urn:ietf:params:xml:ns:caldav','filter');
+        if ($filterNode->length!==1) {
+            throw new Sabre_DAV_Exception_BadRequest('The calendar-query report must have a filter element');
+        }
+        $filters = Sabre_CalDAV_XMLUtil::parseCalendarQueryFilters($filterNode->item(0));
+
+        $requestedCalendarData = true;
+
+        if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar-data', $requestedProperties)) {
+            // We always retrieve calendar-data, as we need it for filtering.
+            $requestedProperties[] = '{urn:ietf:params:xml:ns:caldav}calendar-data';
+
+            // If calendar-data wasn't explicitly requested, we need to remove 
+            // it after processing.
+            $requestedCalendarData = false;
+        }
+
+        // These are the list of nodes that potentially match the requirement
+        $candidateNodes = $this->server->getPropertiesForPath($this->server->getRequestUri(),$requestedProperties,$this->server->getHTTPDepth(0));
+
+        $verifiedNodes = array();
+
+        foreach($candidateNodes as $node) {
+
+            // If the node didn't have a calendar-data property, it must not be a calendar object
+            if (!isset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data'])) continue;
+
+            if ($this->validateFilters($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data'],$filters)) {
+                
+                if (!$requestedCalendarData) {
+                    unset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
+                }
+                $verifiedNodes[] = $node;
+            } 
+
+        }
+
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($verifiedNodes));
+
+    }
+
+
+    /**
+     * Verify if a list of filters applies to the calendar data object 
+     *
+     * The calendarData object must be a valid iCalendar blob. The list of 
+     * filters must be formatted as parsed by Sabre_CalDAV_Plugin::parseCalendarQueryFilters
+     *
+     * @param string $calendarData 
+     * @param array $filters 
+     * @return bool 
+     */
+    public function validateFilters($calendarData,$filters) {
+
+        // We are converting the calendar object to an XML structure
+        // This makes it far easier to parse
+        $xCalendarData = Sabre_CalDAV_ICalendarUtil::toXCal($calendarData);
+        $xml = simplexml_load_string($xCalendarData);
+        $xml->registerXPathNamespace('c','urn:ietf:params:xml:ns:xcal');
+
+        foreach($filters as $xpath=>$filter) {
+
+            // if-not-defined comes first
+            if (isset($filter['is-not-defined'])) {
+                if (!$xml->xpath($xpath))
+                    continue;
+                else
+                    return false;
+                
+            }
+
+            $elem = $xml->xpath($xpath);
+            
+            if (!$elem) return false;
+            $elem = $elem[0];
+
+            if (isset($filter['time-range'])) {
+
+                switch($elem->getName()) {
+                    case 'vevent' :
+                        $result = $this->validateTimeRangeFilterForEvent($xml,$xpath,$filter);
+                        if ($result===false) return false;
+                        break;
+                    case 'vtodo' :
+                        $result = $this->validateTimeRangeFilterForTodo($xml,$xpath,$filter);
+                        if ($result===false) return false;
+                        break;
+                    case 'vjournal' :
+                    case 'vfreebusy' :
+                    case 'valarm' :
+                        // TODO: not implemented
+                        break;
+
+                    /*
+
+                    case 'vjournal' :
+                        $result = $this->validateTimeRangeFilterForJournal($xml,$xpath,$filter);
+                        if ($result===false) return false;
+                        break;
+                    case 'vfreebusy' :
+                        $result = $this->validateTimeRangeFilterForFreeBusy($xml,$xpath,$filter);
+                        if ($result===false) return false;
+                        break;
+                    case 'valarm' :
+                        $result = $this->validateTimeRangeFilterForAlarm($xml,$xpath,$filter);
+                        if ($result===false) return false;
+                        break;
+
+                        */
+
+                }
+
+            } 
+
+            if (isset($filter['text-match'])) {
+                $currentString = (string)$elem;
+
+                $isMatching = Sabre_DAV_StringUtil::textMatch($currentString, $filter['text-match']['value'], $filter['text-match']['collation']);
+                if ($filter['text-match']['negate-condition'] && $isMatching) return false;
+                if (!$filter['text-match']['negate-condition'] && !$isMatching) return false;
+                
+            }
+
+        }
+        return true;
+        
+    }
+
+    /**
+     * Checks whether a time-range filter matches an event.
+     * 
+     * @param SimpleXMLElement $xml Event as xml object 
+     * @param string $currentXPath XPath to check 
+     * @param array $currentFilter Filter information 
+     * @return void
+     */
+    private function validateTimeRangeFilterForEvent(SimpleXMLElement $xml,$currentXPath,array $currentFilter) {
+
+        // Grabbing the DTSTART property
+        $xdtstart = $xml->xpath($currentXPath.'/c:dtstart');
+        if (!count($xdtstart)) {
+            throw new Sabre_DAV_Exception_BadRequest('DTSTART property missing from calendar object');
+        }
+
+        // The dtstart can be both a date, or datetime property
+        if ((string)$xdtstart[0]['value']==='DATE' || strlen((string)$xdtstart[0])===8) {
+            $isDateTime = false;
+        } else {
+            $isDateTime = true;
+        }
+
+        // Determining the timezone
+        if ($tzid = (string)$xdtstart[0]['tzid']) {
+            $tz = new DateTimeZone($tzid);
+        } else {
+            $tz = null;
+        }
+        if ($isDateTime) {
+            $dtstart = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdtstart[0],$tz);
+        } else {
+            $dtstart = Sabre_CalDAV_XMLUtil::parseICalendarDate((string)$xdtstart[0]);
+        }
+
+
+        // Grabbing the DTEND property
+        $xdtend = $xml->xpath($currentXPath.'/c:dtend');
+        $dtend = null;
+
+        if (count($xdtend)) {
+            // Determining the timezone
+            if ($tzid = (string)$xdtend[0]['tzid']) {
+                $tz = new DateTimeZone($tzid);
+            } else {
+                $tz = null;
+            }
+
+            // Since the VALUE prameter of both DTSTART and DTEND must be the same
+            // we can assume we don't need to check the VALUE paramter of DTEND.
+            if ($isDateTime) {
+                $dtend = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdtend[0],$tz);
+            } else {
+                $dtend = Sabre_CalDAV_XMLUtil::parseICalendarDate((string)$xdtend[0],$tz);
+            }
+
+        } 
+        
+        if (is_null($dtend)) {
+            // The DTEND property was not found. We will first see if the event has a duration
+            // property
+
+            $xduration = $xml->xpath($currentXPath.'/c:duration');
+            if (count($xduration)) {
+                $duration = Sabre_CalDAV_XMLUtil::parseICalendarDuration((string)$xduration[0]);
+
+                // Making sure that the duration is bigger than 0 seconds.
+                $tempDT = clone $dtstart;
+                $tempDT->modify($duration);
+                if ($tempDT > $dtstart) {
+
+                    // use DTEND = DTSTART + DURATION 
+                    $dtend = $tempDT;
+                } else {
+                    // use DTEND = DTSTART
+                    $dtend = $dtstart;
+                }
+
+            }
+        }
+
+        if (is_null($dtend)) {
+            if ($isDateTime) {
+                // DTEND = DTSTART
+                $dtend = $dtstart;
+            } else {
+                // DTEND = DTSTART + 1 DAY
+                $dtend = clone $dtstart;
+                $dtend->modify('+1 day');
+            }
+        }
+        // TODO: we need to properly parse RRULE's, but it's very difficult.
+        // For now, we're always returning events if they have an RRULE at all.
+        $rrule = $xml->xpath($currentXPath.'/c:rrule');
+        $hasRrule = (count($rrule))>0; 
+       
+        if (!is_null($currentFilter['time-range']['start']) && $currentFilter['time-range']['start'] >= $dtend)  return false;
+        if (!is_null($currentFilter['time-range']['end'])   && $currentFilter['time-range']['end']   <= $dtstart && !$hasRrule) return false;
+        return true;
+    
+    }
+
+    private function validateTimeRangeFilterForTodo(SimpleXMLElement $xml,$currentXPath,array $filter) {
+
+        // Gathering all relevant elements
+
+        $dtStart = null;
+        $duration = null;
+        $due = null;
+        $completed = null;
+        $created = null;
+
+        $xdt = $xml->xpath($currentXPath.'/c:dtstart');
+        if (count($xdt)) {
+            // The dtstart can be both a date, or datetime property
+            if ((string)$xdt[0]['value']==='DATE') {
+                $isDateTime = false;
+            } else {
+                $isDateTime = true;
+            }
+
+            // Determining the timezone
+            if ($tzid = (string)$xdt[0]['tzid']) {
+                $tz = new DateTimeZone($tzid);
+            } else {
+                $tz = null;
+            }
+            if ($isDateTime) {
+                $dtStart = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdt[0],$tz);
+            } else {
+                $dtStart = Sabre_CalDAV_XMLUtil::parseICalendarDate((string)$xdt[0]);
+            }
+        }
+
+        // Only need to grab duration if dtStart is set
+        if (!is_null($dtStart)) {
+
+            $xduration = $xml->xpath($currentXPath.'/c:duration');
+            if (count($xduration)) {
+                $duration = Sabre_CalDAV_XMLUtil::parseICalendarDuration((string)$xduration[0]);
+            }
+
+        }
+
+        if (!is_null($dtStart) && !is_null($duration)) {
+
+            // Comparision from RFC 4791:
+            // (start <= DTSTART+DURATION) AND ((end > DTSTART) OR (end >= DTSTART+DURATION))
+
+            $end = clone $dtStart;
+            $end->modify($duration);
+
+            if( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] <= $end) &&
+                (is_null($filter['time-range']['end']) || $filter['time-range']['end'] > $dtStart || $filter['time-range']['end'] >= $end) ) {
+                return true;
+            } else {
+                return false;
+            }
+
+        }
+
+        // Need to grab the DUE property
+        $xdt = $xml->xpath($currentXPath.'/c:due');
+        if (count($xdt)) {
+            // The due property can be both a date, or datetime property
+            if ((string)$xdt[0]['value']==='DATE') {
+                $isDateTime = false;
+            } else {
+                $isDateTime = true;
+            }
+            // Determining the timezone
+            if ($tzid = (string)$xdt[0]['tzid']) {
+                $tz = new DateTimeZone($tzid);
+            } else {
+                $tz = null;
+            }
+            if ($isDateTime) {
+                $due = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdt[0],$tz);
+            } else {
+                $due = Sabre_CalDAV_XMLUtil::parseICalendarDate((string)$xdt[0]);
+            }
+        }
+
+        if (!is_null($dtStart) && !is_null($due)) {
+
+            // Comparision from RFC 4791:
+            // ((start < DUE) OR (start <= DTSTART)) AND ((end > DTSTART) OR (end >= DUE))
+            
+            if( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] < $due || $filter['time-range']['start'] < $dtstart) &&
+                (is_null($filter['time-range']['end'])   || $filter['time-range']['end'] >= $due) ) {
+                return true;
+            } else {
+                return false;
+            }
+
+        }
+
+        if (!is_null($dtStart)) {
+            
+            // Comparision from RFC 4791
+            // (start <= DTSTART)  AND (end > DTSTART)
+            if ( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] <= $dtStart) &&
+                 (is_null($filter['time-range']['end'])   || $filter['time-range']['end'] > $dtStart) ) {
+                 return true;
+            } else {
+                return false;
+            }
+
+        }
+
+        if (!is_null($due)) {
+            
+            // Comparison from RFC 4791
+            // (start < DUE) AND (end >= DUE)
+            if ( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] < $due) &&
+                 (is_null($filter['time-range']['end'])   || $filter['time-range']['end'] >= $due) ) {
+                 return true;
+            } else {
+                return false;
+            }
+
+        }
+        // Need to grab the COMPLETED property
+        $xdt = $xml->xpath($currentXPath.'/c:completed');
+        if (count($xdt)) {
+            $completed = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdt[0]);
+        }
+        // Need to grab the CREATED property
+        $xdt = $xml->xpath($currentXPath.'/c:created');
+        if (count($xdt)) {
+            $created = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdt[0]);
+        }
+
+        if (!is_null($completed) && !is_null($created)) {
+            // Comparison from RFC 4791
+            // ((start <= CREATED) OR (start <= COMPLETED)) AND ((end >= CREATED) OR (end >= COMPLETED))
+            if( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] <= $created || $filter['time-range']['start'] <= $completed) &&
+                (is_null($filter['time-range']['end'])   || $filter['time-range']['end'] >= $created   || $filter['time-range']['end'] >= $completed)) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        if (!is_null($completed)) {
+            // Comparison from RFC 4791
+            // (start <= COMPLETED) AND (end  >= COMPLETED)
+            if( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] <= $completed) &&
+                (is_null($filter['time-range']['end'])   || $filter['time-range']['end'] >= $completed)) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        if (!is_null($created)) {
+            // Comparison from RFC 4791
+            // (end > CREATED)
+            if( (is_null($filter['time-range']['end']) || $filter['time-range']['end'] > $created) ) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        // Everything else is TRUE
+        return true;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Principal/Collection.php b/3rdparty/Sabre/CalDAV/Principal/Collection.php
new file mode 100644
index 00000000000..13435b2448e
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Principal/Collection.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Principal collection
+ *
+ * This is an alternative collection to the standard ACL principal collection.
+ * This collection adds support for the calendar-proxy-read and 
+ * calendar-proxy-write sub-principals, as defined by the caldav-proxy 
+ * specification.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Principal_Collection extends Sabre_DAVACL_AbstractPrincipalCollection {
+
+    /**
+     * Returns a child object based on principal information 
+     * 
+     * @param array $principalInfo 
+     * @return Sabre_CalDAV_Principal_User 
+     */
+    public function getChildForPrincipal(array $principalInfo) {
+
+        return new Sabre_CalDAV_Principal_User($this->principalBackend, $principalInfo);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php b/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
new file mode 100644
index 00000000000..f531d85d1ff
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
@@ -0,0 +1,178 @@
+<?php
+
+/**
+ * ProxyRead principal
+ *
+ * This class represents a principal group, hosted under the main principal.
+ * This is needed to implement 'Calendar delegation' support. This class is 
+ * instantiated by Sabre_CalDAV_Principal_User.
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Principal_ProxyRead implements Sabre_DAVACL_IPrincipal {
+
+    /**
+     * Principal information from the parent principal. 
+     * 
+     * @var array 
+     */
+    protected $principalInfo;
+
+    /**
+     * Principal backend 
+     * 
+     * @var Sabre_DAVACL_IPrincipalBackend 
+     */
+    protected $principalBackend;
+
+    /**
+     * Creates the object.
+     *
+     * Note that you MUST supply the parent principal information. 
+     * 
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend 
+     * @param array $principalInfo 
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalInfo) {
+
+        $this->principalInfo = $principalInfo;
+        $this->principalBackend = $principalBackend;
+
+    }
+
+    /**
+     * Returns this principals name.
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        return 'calendar-proxy-read';
+
+    }
+
+    /**
+     * Returns the last modification time 
+     *
+     * @return null 
+     */
+    public function getLastModified() {
+
+        return null; 
+
+    }
+
+    /**
+     * Deletes the current node
+     *
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void 
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
+
+    }
+
+    /**
+     * Renames the node
+     * 
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
+
+    }
+
+
+    /**
+     * Returns a list of altenative urls for a principal
+     * 
+     * This can for example be an email address, or ldap url.
+     * 
+     * @return array 
+     */
+    public function getAlternateUriSet() {
+
+        return array();
+
+    }
+
+    /**
+     * Returns the full principal url 
+     * 
+     * @return string 
+     */
+    public function getPrincipalUrl() {
+
+        return $this->principalInfo['uri'] . '/' . $this->getName(); 
+
+    }
+
+    /**
+     * Returns the list of group members
+     * 
+     * If this principal is a group, this function should return
+     * all member principal uri's for the group. 
+     * 
+     * @return array
+     */
+    public function getGroupMemberSet() {
+
+        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl()); 
+
+    }
+
+    /**
+     * Returns the list of groups this principal is member of
+     * 
+     * If this principal is a member of a (list of) groups, this function
+     * should return a list of principal uri's for it's members. 
+     * 
+     * @return array 
+     */
+    public function getGroupMembership() {
+
+        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl()); 
+
+    }
+
+    /**
+     * Sets a list of group members
+     *
+     * If this principal is a group, this method sets all the group members.
+     * The list of members is always overwritten, never appended to.
+     * 
+     * This method should throw an exception if the members could not be set. 
+     * 
+     * @param array $principals 
+     * @return void 
+     */
+    public function setGroupMemberSet(array $principals) {
+
+        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
+
+    }
+
+    /**
+     * Returns the displayname
+     *
+     * This should be a human readable name for the principal.
+     * If none is available, return the nodename. 
+     * 
+     * @return string 
+     */
+    public function getDisplayName() {
+
+        return $this->getName();
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php b/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
new file mode 100644
index 00000000000..4d8face2060
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
@@ -0,0 +1,178 @@
+<?php
+
+/**
+ * ProxyWrite principal
+ *
+ * This class represents a principal group, hosted under the main principal.
+ * This is needed to implement 'Calendar delegation' support. This class is 
+ * instantiated by Sabre_CalDAV_Principal_User.
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Principal_ProxyWrite implements Sabre_DAVACL_IPrincipal {
+
+    /**
+     * Parent principal information 
+     * 
+     * @var array 
+     */
+    protected $principalInfo;
+
+    /**
+     * Principal Backend 
+     * 
+     * @var Sabre_DAVACL_IPrincipalBackend 
+     */
+    protected $principalBackend;
+
+    /**
+     * Creates the object
+     *
+     * Note that you MUST supply the parent principal information. 
+     * 
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend 
+     * @param array $principalInfo 
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalInfo) {
+
+        $this->principalInfo = $principalInfo;
+        $this->principalBackend = $principalBackend;
+
+    }
+
+    /**
+     * Returns this principals name.
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        return 'calendar-proxy-write';
+
+    }
+
+    /**
+     * Returns the last modification time 
+     *
+     * @return null 
+     */
+    public function getLastModified() {
+
+        return null; 
+
+    }
+
+    /**
+     * Deletes the current node
+     *
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void 
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
+
+    }
+
+    /**
+     * Renames the node
+     * 
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
+
+    }
+
+
+    /**
+     * Returns a list of altenative urls for a principal
+     * 
+     * This can for example be an email address, or ldap url.
+     * 
+     * @return array 
+     */
+    public function getAlternateUriSet() {
+
+        return array();
+
+    }
+
+    /**
+     * Returns the full principal url 
+     * 
+     * @return string 
+     */
+    public function getPrincipalUrl() {
+
+        return $this->principalInfo['uri'] . '/' . $this->getName(); 
+
+    }
+
+    /**
+     * Returns the list of group members
+     * 
+     * If this principal is a group, this function should return
+     * all member principal uri's for the group. 
+     * 
+     * @return array
+     */
+    public function getGroupMemberSet() {
+
+        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl()); 
+
+    }
+
+    /**
+     * Returns the list of groups this principal is member of
+     * 
+     * If this principal is a member of a (list of) groups, this function
+     * should return a list of principal uri's for it's members. 
+     * 
+     * @return array 
+     */
+    public function getGroupMembership() {
+
+        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl()); 
+
+    }
+
+    /**
+     * Sets a list of group members
+     *
+     * If this principal is a group, this method sets all the group members.
+     * The list of members is always overwritten, never appended to.
+     * 
+     * This method should throw an exception if the members could not be set. 
+     * 
+     * @param array $principals 
+     * @return void 
+     */
+    public function setGroupMemberSet(array $principals) {
+
+        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
+
+    }
+
+    /**
+     * Returns the displayname
+     *
+     * This should be a human readable name for the principal.
+     * If none is available, return the nodename. 
+     * 
+     * @return string 
+     */
+    public function getDisplayName() {
+
+        return $this->getName();
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Principal/User.php b/3rdparty/Sabre/CalDAV/Principal/User.php
new file mode 100644
index 00000000000..034629b89b3
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Principal/User.php
@@ -0,0 +1,122 @@
+<?php
+
+/**
+ * CalDAV principal 
+ *
+ * This is a standard user-principal for CalDAV. This principal is also a 
+ * collection and returns the caldav-proxy-read and caldav-proxy-write child 
+ * principals.
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Principal_User extends Sabre_DAVACL_Principal implements Sabre_DAV_ICollection {
+
+    /**
+     * Creates a new file in the directory 
+     * 
+     * @param string $name Name of the file 
+     * @param resource $data Initial payload, passed as a readable stream resource. 
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function createFile($name, $data = null) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create file (filename ' . $name . ')');
+
+    }
+
+    /**
+     * Creates a new subdirectory 
+     * 
+     * @param string $name 
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create directory');
+
+    }
+
+    /**
+     * Returns a specific child node, referenced by its name 
+     * 
+     * @param string $name 
+     * @return Sabre_DAV_INode 
+     */
+    public function getChild($name) {
+
+        if ($name === 'calendar-proxy-read')
+            return new Sabre_CalDAV_Principal_ProxyRead($this->principalBackend, $this->principalProperties);
+
+        if ($name === 'calendar-proxy-write')
+            return new Sabre_CalDAV_Principal_ProxyWrite($this->principalBackend, $this->principalProperties);
+
+        throw new Sabre_DAV_Exception_FileNotFound('Node with name ' . $name . ' was not found');
+
+    }
+
+    /**
+     * Returns an array with all the child nodes 
+     * 
+     * @return Sabre_DAV_INode[] 
+     */
+    public function getChildren() {
+
+        return array(
+            new Sabre_CalDAV_Principal_ProxyRead($this->principalBackend, $this->principalProperties),
+            new Sabre_CalDAV_Principal_ProxyWrite($this->principalBackend, $this->principalProperties),
+        );
+
+    }
+
+    /**
+     * Checks if a child-node with the specified name exists 
+     * 
+     * @return bool 
+     */
+    public function childExists($name) {
+
+        return $name === 'calendar-proxy-read' ||  $name === 'calendar-proxy-write';
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to 
+     *      be updated. 
+     * 
+     * @return array 
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principalProperties['uri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principalProperties['uri'] . '/calendar-proxy-read',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principalProperties['uri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+        );
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
new file mode 100644
index 00000000000..1bbaca6b8a7
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * Supported component set property
+ *
+ * This property is a representation of the supported-calendar_component-set 
+ * property in the CalDAV namespace. It simply requires an array of components,
+ * such as VEVENT, VTODO
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Property_SupportedCalendarComponentSet extends Sabre_DAV_Property {
+
+    /**
+     * List of supported components, such as "VEVENT, VTODO" 
+     * 
+     * @var array 
+     */
+    private $components;
+
+    /**
+     * Creates the property 
+     * 
+     * @param array $components 
+     */
+    public function __construct(array $components) {
+
+       $this->components = $components; 
+
+    }
+
+    /**
+     * Returns the list of supported components 
+     * 
+     * @return array 
+     */
+    public function getValue() {
+
+        return $this->components;
+
+    }
+
+    /**
+     * Serializes the property in a DOMDocument 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $node 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+       $doc = $node->ownerDocument;
+       foreach($this->components as $component) {
+
+            $xcomp = $doc->createElement('cal:comp');
+            $xcomp->setAttribute('name',$component);
+            $node->appendChild($xcomp); 
+
+       }
+
+    }
+
+    /**
+     * Unserializes the DOMElement back into a Property class.
+     * 
+     * @param DOMElement $node 
+     * @return void
+     */
+    static function unserialize(DOMElement $node) {
+
+        $components = array();
+        foreach($node->childNodes as $childNode) {
+            if (Sabre_DAV_XMLUtil::toClarkNotation($childNode)==='{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}comp') {
+                $components[] = $childNode->getAttribute('name');
+            }
+        }
+        return new self($components);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
new file mode 100644
index 00000000000..5010ee6d525
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Supported-calendar-data property
+ *
+ * This property is a representation of the supported-calendar-data property
+ * in the CalDAV namespace. SabreDAV only has support for text/calendar;2.0
+ * so the value is currently hardcoded.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Property_SupportedCalendarData extends Sabre_DAV_Property {
+
+    /**
+     * Serializes the property in a DOMDocument 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $node 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+
+        $prefix = isset($server->xmlNamespaces[Sabre_CalDAV_Plugin::NS_CALDAV])?$server->xmlNamespaces[Sabre_CalDAV_Plugin::NS_CALDAV]:'cal';
+
+        $caldata = $doc->createElement($prefix . ':calendar-data');
+        $caldata->setAttribute('content-type','text/calendar');
+        $caldata->setAttribute('version','2.0');
+
+        $node->appendChild($caldata); 
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php b/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
new file mode 100644
index 00000000000..e585e9db3d8
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * supported-collation-set property
+ *
+ * This property is a representation of the supported-collation-set property
+ * in the CalDAV namespace. 
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Property_SupportedCollationSet extends Sabre_DAV_Property {
+
+    /**
+     * Serializes the property in a DOM document 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $node 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+        
+        $prefix = $node->lookupPrefix('urn:ietf:params:xml:ns:caldav');
+        if (!$prefix) $prefix = 'cal';
+
+        $node->appendChild(
+            $doc->createElement($prefix . ':supported-collation','i;ascii-casemap')
+        );
+        $node->appendChild(
+            $doc->createElement($prefix . ':supported-collation','i;octet')
+        );
+        $node->appendChild(
+            $doc->createElement($prefix . ':supported-collation','i;unicode-casemap')
+        );
+
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Server.php b/3rdparty/Sabre/CalDAV/Server.php
new file mode 100644
index 00000000000..969d69c6279
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Server.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * CalDAV server
+ *
+ * This script is a convenience script. It quickly sets up a WebDAV server
+ * with caldav and ACL support, and it creates the root 'principals' and
+ * 'calendars' collections.
+ *
+ * Note that if you plan to do anything moderately complex, you are advised to 
+ * not subclass this server, but use Sabre_DAV_Server directly instead. This 
+ * class is nothing more than an 'easy setup'.
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Server extends Sabre_DAV_Server {
+
+    /**
+     * The authentication realm
+     *
+     * Note that if this changes, the hashes in the auth backend must also 
+     * be recalculated. 
+     * 
+     * @var string
+     */
+    public $authRealm = 'SabreDAV';
+
+    /**
+     * Sets up the object. A PDO object must be passed to setup all the backends.
+     * 
+     * @param PDO $pdo 
+     */
+    public function __construct(PDO $pdo) {
+
+        /* Backends */
+        $authBackend = new Sabre_DAV_Auth_Backend_PDO($pdo);
+        $calendarBackend = new Sabre_CalDAV_Backend_PDO($pdo);
+        $principalBackend = new Sabre_DAVACL_PrincipalBackend_PDO($pdo);
+
+        /* Directory structure */
+        $tree = array(
+            new Sabre_CalDAV_Principal_Collection($principalBackend),
+            new Sabre_CalDAV_CalendarRootNode($principalBackend, $calendarBackend),
+        );
+
+        /* Initializing server */
+        parent::__construct($tree);
+
+        /* Server Plugins */
+        $authPlugin = new Sabre_DAV_Auth_Plugin($authBackend,$this->authRealm);
+        $this->addPlugin($authPlugin);
+
+        $aclPlugin = new Sabre_DAVACL_Plugin();
+        $this->addPlugin($aclPlugin);
+
+        $caldavPlugin = new Sabre_CalDAV_Plugin();
+        $this->addPlugin($caldavPlugin);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/UserCalendars.php b/3rdparty/Sabre/CalDAV/UserCalendars.php
new file mode 100644
index 00000000000..f52d65e9a73
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/UserCalendars.php
@@ -0,0 +1,280 @@
+<?php
+
+/**
+ * The UserCalenders class contains all calendars associated to one user 
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre_DAVACL_IACL {
+
+    /**
+     * Principal backend 
+     * 
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * CalDAV backend
+     * 
+     * @var Sabre_CalDAV_Backend_Abstract
+     */
+    protected $caldavBackend;
+
+    /**
+     * Principal information 
+     * 
+     * @var array 
+     */
+    protected $principalInfo;
+    
+    /**
+     * Constructor 
+     * 
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend 
+     * @param mixed $userUri 
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, Sabre_CalDAV_Backend_Abstract $caldavBackend, $userUri) {
+
+        $this->principalBackend = $principalBackend;
+        $this->caldavBackend = $caldavBackend;
+        $this->principalInfo = $principalBackend->getPrincipalByPath($userUri);
+       
+    }
+
+    /**
+     * Returns the name of this object 
+     * 
+     * @return string
+     */
+    public function getName() {
+      
+        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalInfo['uri']);
+        return $name; 
+
+    }
+
+    /**
+     * Updates the name of this object 
+     * 
+     * @param string $name 
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden();
+
+    }
+
+    /**
+     * Deletes this object 
+     * 
+     * @return void
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_Forbidden();
+
+    }
+
+    /**
+     * Returns the last modification date 
+     * 
+     * @return int 
+     */
+    public function getLastModified() {
+
+        return null; 
+
+    }
+
+    /**
+     * Creates a new file under this object.
+     *
+     * This is currently not allowed
+     * 
+     * @param string $filename 
+     * @param resource $data 
+     * @return void
+     */
+    public function createFile($filename, $data=null) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new files in this collection is not supported');
+
+    }
+
+    /**
+     * Creates a new directory under this object.
+     *
+     * This is currently not allowed.
+     * 
+     * @param string $filename 
+     * @return void
+     */
+    public function createDirectory($filename) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new collections in this collection is not supported');
+
+    }
+
+    /**
+     * Returns a single calendar, by name 
+     * 
+     * @param string $name
+     * @todo needs optimizing
+     * @return Sabre_CalDAV_Calendar 
+     */
+    public function getChild($name) {
+
+        foreach($this->getChildren() as $child) {
+            if ($name==$child->getName())
+                return $child;
+
+        }
+        throw new Sabre_DAV_Exception_FileNotFound('Calendar with name \'' . $name . '\' could not be found');
+
+    }
+
+    /**
+     * Checks if a calendar exists.
+     * 
+     * @param string $name
+     * @todo needs optimizing
+     * @return bool 
+     */
+    public function childExists($name) {
+
+        foreach($this->getChildren() as $child) {
+            if ($name==$child->getName())
+                return true; 
+
+        }
+        return false;
+
+    }
+
+    /**
+     * Returns a list of calendars
+     * 
+     * @return array 
+     */
+    public function getChildren() {
+
+        $calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
+        $objs = array();
+        foreach($calendars as $calendar) {
+            $objs[] = new Sabre_CalDAV_Calendar($this->principalBackend, $this->caldavBackend, $calendar);
+        }
+        return $objs;
+
+    }
+
+    /**
+     * Creates a new calendar
+     * 
+     * @param string $name 
+     * @param string $properties 
+     * @return void
+     */
+    public function createExtendedCollection($name, array $resourceType, array $properties) {
+
+        if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar',$resourceType) || count($resourceType)!==2) {
+            throw new Sabre_DAV_Exception_InvalidResourceType('Unknown resourceType for this collection');
+        }
+        $this->caldavBackend->createCalendar($this->principalInfo['uri'], $name, $properties);
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner 
+     * 
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->principalInfo['uri'];
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     * 
+     * @return string|null 
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to 
+     *      be updated. 
+     * 
+     * @return array 
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principalInfo['uri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->principalInfo['uri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-write',
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-read',
+                'protected' => true,
+            ),
+
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's. 
+     * 
+     * @param array $acl 
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Version.php b/3rdparty/Sabre/CalDAV/Version.php
new file mode 100644
index 00000000000..df8fe1f6bd6
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the Sabre_CalDAV version constants.
+ * 
+ * @package Sabre
+ * @subpackage CalDAV 
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.5.3';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/CalDAV/XMLUtil.php b/3rdparty/Sabre/CalDAV/XMLUtil.php
new file mode 100644
index 00000000000..bf349a36aae
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/XMLUtil.php
@@ -0,0 +1,208 @@
+<?php
+
+/**
+ * XML utilities for CalDAV 
+ *
+ * This class contains a few static methods used for parsing certain CalDAV 
+ * requests.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_XMLUtil {
+
+    /**
+     * This function parses the calendar-query report request body
+     *
+     * The body is quite complicated, so we're turning it into a PHP
+     * array.
+     *
+     * The resulting associative array has xpath expressions as keys.
+     * By default the xpath expressions should simply be checked for existance
+     * The xpath expressions can point to elements or attributes.
+     * 
+     * The array values can contain a number of items, which alters the query
+     * filter. 
+     *
+     * * time-range. Must also check if the todo or event falls within the
+     *               specified timerange. How this is interpreted depends on
+     *               the type of object (VTODO, VEVENT, VJOURNAL, etc)
+     * * is-not-defined
+     *               Instead of checking if the attribute or element exist,
+     *               we must check if it doesn't.
+     * * text-match
+     *               Checks if the value of the attribute or element matches
+     *               the specified value. This is actually another array with
+     *               the 'collation', 'value' and 'negate-condition' items.
+     *
+     * Refer to the CalDAV spec for more information.
+     * 
+     * @param DOMNode $domNode 
+     * @param string $basePath used for recursive calls.
+     * @param array $filters used for recursive calls.
+     * @return array 
+     */
+    static public function parseCalendarQueryFilters($domNode,$basePath = '/c:iCalendar', &$filters = array()) {
+
+        foreach($domNode->childNodes as $child) {
+
+            switch(Sabre_DAV_XMLUtil::toClarkNotation($child)) {
+
+                case '{urn:ietf:params:xml:ns:caldav}comp-filter' :
+                case '{urn:ietf:params:xml:ns:caldav}prop-filter' :
+                   
+                    $filterName = $basePath . '/' . 'c:' . strtolower($child->getAttribute('name'));
+                    $filters[$filterName] = array(); 
+
+                    self::parseCalendarQueryFilters($child, $filterName,$filters);
+                    break;
+
+                case '{urn:ietf:params:xml:ns:caldav}time-range' :
+               
+                    if ($start = $child->getAttribute('start')) {
+                        $start = self::parseICalendarDateTime($start);
+                    } else {
+                        $start = null;
+                    }
+                    if ($end = $child->getAttribute('end')) {
+                        $end = self::parseICalendarDateTime($end);
+                    } else {
+                        $end = null;
+                    }
+
+                    if (!is_null($start) && !is_null($end) && $end <= $start) {
+                        throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the time-range filter');
+                    }
+
+                    $filters[$basePath]['time-range'] = array(
+                        'start' => $start,
+                        'end'   => $end
+                    );
+                    break;
+
+                case '{urn:ietf:params:xml:ns:caldav}is-not-defined' :
+                    $filters[$basePath]['is-not-defined'] = true;
+                    break;
+
+                case '{urn:ietf:params:xml:ns:caldav}param-filter' :
+               
+                    $filterName = $basePath . '/@' . strtolower($child->getAttribute('name'));
+                    $filters[$filterName] = array();
+                    self::parseCalendarQueryFilters($child, $filterName, $filters);
+                    break;
+
+                case '{urn:ietf:params:xml:ns:caldav}text-match' :
+               
+                    $collation = $child->getAttribute('collation');
+                    if (!$collation) $collation = 'i;ascii-casemap';
+
+                    $filters[$basePath]['text-match'] = array(
+                        'collation' => ($collation == 'default'?'i;ascii-casemap':$collation),
+                        'negate-condition' => $child->getAttribute('negate-condition')==='yes',
+                        'value' => $child->nodeValue,
+                    );
+                    break;
+
+            }
+
+        }
+
+        return $filters;
+
+    }
+
+    /**
+     * Parses an iCalendar (rfc5545) formatted datetime and returns a DateTime object
+     *
+     * Specifying a reference timezone is optional. It will only be used
+     * if the non-UTC format is used. The argument is used as a reference, the 
+     * returned DateTime object will still be in the UTC timezone.
+     *
+     * @param string $dt 
+     * @param DateTimeZone $tz 
+     * @return DateTime 
+     */
+    static public function parseICalendarDateTime($dt,DateTimeZone $tz = null) {
+
+        // Format is YYYYMMDD + "T" + hhmmss 
+        $result = preg_match('/^([1-3][0-9]{3})([0-1][0-9])([0-3][0-9])T([0-2][0-9])([0-5][0-9])([0-5][0-9])([Z]?)$/',$dt,$matches);
+
+        if (!$result) {
+            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar datetime value is incorrect: ' . $dt);
+        }
+
+        if ($matches[7]==='Z' || is_null($tz)) {
+            $tz = new DateTimeZone('UTC');
+        } 
+        $date = new DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3] . ' ' . $matches[4] . ':' . $matches[5] .':' . $matches[6], $tz);
+
+        // Still resetting the timezone, to normalize everything to UTC
+        $date->setTimeZone(new DateTimeZone('UTC'));
+        return $date;
+
+    }
+
+    /**
+     * Parses an iCalendar (rfc5545) formatted datetime and returns a DateTime object
+     *
+     * @param string $date 
+     * @param DateTimeZone $tz 
+     * @return DateTime 
+     */
+    static public function parseICalendarDate($date) {
+
+        // Format is YYYYMMDD
+        $result = preg_match('/^([1-3][0-9]{3})([0-1][0-9])([0-3][0-9])$/',$date,$matches);
+
+        if (!$result) {
+            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar date value is incorrect: ' . $date);
+        }
+
+        $date = new DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3], new DateTimeZone('UTC'));
+        return $date;
+
+    }
+   
+    /**
+     * Parses an iCalendar (RFC5545) formatted duration and returns a string suitable
+     * for strtotime or DateTime::modify.
+     *
+     * NOTE: When we require PHP 5.3 this can be replaced by the DateTimeInterval object, which
+     * supports ISO 8601 Intervals, which is a superset of ICalendar durations.
+     *
+     * For now though, we're just gonna live with this messy system
+     *
+     * @param string $duration
+     * @return string
+     */
+    static public function parseICalendarDuration($duration) {
+
+        $result = preg_match('/^(?P<plusminus>\+|-)?P((?P<week>\d+)W)?((?P<day>\d+)D)?(T((?P<hour>\d+)H)?((?P<minute>\d+)M)?((?P<second>\d+)S)?)?$/', $duration, $matches);
+        if (!$result) {
+            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar duration value is incorrect: ' . $duration);
+        }
+       
+        $parts = array(
+            'week',
+            'day',
+            'hour',
+            'minute',
+            'second',
+        );
+
+        $newDur = '';
+        foreach($parts as $part) {
+            if (isset($matches[$part]) && $matches[$part]) {
+                $newDur.=' '.$matches[$part] . ' ' . $part . 's';
+            }
+        }
+
+        $newDur = ($matches['plusminus']==='-'?'-':'+') . trim($newDur);
+        return $newDur;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CardDAV/AddressBook.php b/3rdparty/Sabre/CardDAV/AddressBook.php
new file mode 100644
index 00000000000..471ca7b338a
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/AddressBook.php
@@ -0,0 +1,293 @@
+<?php
+
+/**
+ * The AddressBook class represents a CardDAV addressbook, owned by a specific user
+ *
+ * The AddressBook can contain multiple vcards
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_CardDAV_IAddressBook, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
+
+    /**
+     * This is an array with addressbook information 
+     * 
+     * @var array 
+     */
+    private $addressBookInfo;
+
+    /**
+     * CardDAV backend 
+     * 
+     * @var Sabre_CardDAV_Backend_Abstract 
+     */
+    private $carddavBackend;
+
+    /**
+     * Constructor 
+     * 
+     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend 
+     * @param array $addressBookInfo 
+     * @return void
+     */
+    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend,array $addressBookInfo) {
+
+        $this->carddavBackend = $carddavBackend;
+        $this->addressBookInfo = $addressBookInfo;
+
+    }
+
+    /**
+     * Returns the name of the addressbook 
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        return $this->addressBookInfo['uri'];
+
+    }
+
+    /**
+     * Returns a card
+     *
+     * @param string $name 
+     * @return Sabre_DAV_Card
+     */
+    public function getChild($name) {
+
+        $obj = $this->carddavBackend->getCard($this->addressBookInfo['id'],$name);
+        if (!$obj) throw new Sabre_DAV_Exception_FileNotFound('Card not found');
+        return new Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
+
+    }
+
+    /**
+     * Returns the full list of cards
+     * 
+     * @return array 
+     */
+    public function getChildren() {
+
+        $objs = $this->carddavBackend->getCards($this->addressBookInfo['id']);
+        $children = array();
+        foreach($objs as $obj) {
+            $children[] = new Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
+        }
+        return $children;
+
+    }
+
+    /**
+     * Creates a new directory
+     *
+     * We actually block this, as subdirectories are not allowed in addressbooks. 
+     * 
+     * @param string $name 
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating collections in addressbooks is not allowed');
+
+    }
+
+    /**
+     * Creates a new file
+     *
+     * The contents of the new file must be a valid VCARD
+     * 
+     * @param string $name 
+     * @param resource $vcardData 
+     * @return void
+     */
+    public function createFile($name,$vcardData = null) {
+
+        $vcardData = stream_get_contents($vcardData);
+        // Converting to UTF-8, if needed
+        $vcardData = Sabre_DAV_StringUtil::ensureUTF8($vcardData);
+
+        $this->carddavBackend->createCard($this->addressBookInfo['id'],$name,$vcardData);
+
+    }
+
+    /**
+     * Deletes the entire addressbook. 
+     * 
+     * @return void
+     */
+    public function delete() {
+
+        $this->carddavBackend->deleteAddressBook($this->addressBookInfo['id']);
+
+    }
+
+    /**
+     * Renames the addressbook
+     * 
+     * @param string $newName 
+     * @return void
+     */
+    public function setName($newName) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Renaming addressbooks is not yet supported');
+
+    }
+
+    /**
+     * Returns the last modification date as a unix timestamp.
+     * 
+     * @return void
+     */
+    public function getLastModified() {
+
+        return null;
+
+    }
+
+    /**
+     * Updates properties on this node,
+     *
+     * The properties array uses the propertyName in clark-notation as key,
+     * and the array value for the property value. In the case a property
+     * should be deleted, the property value will be null.
+     *
+     * This method must be atomic. If one property cannot be changed, the
+     * entire operation must fail.
+     *
+     * If the operation was successful, true can be returned.
+     * If the operation failed, false can be returned.
+     *
+     * Deletion of a non-existant property is always succesful.
+     *
+     * Lastly, it is optional to return detailed information about any
+     * failures. In this case an array should be returned with the following
+     * structure:
+     *
+     * array(
+     *   403 => array(
+     *      '{DAV:}displayname' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}owner' => null,
+     *   )
+     * )
+     *
+     * In this example it was forbidden to update {DAV:}displayname. 
+     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
+     * (424 Failed Dependency) because the request needs to be atomic.
+     *
+     * @param array $mutations 
+     * @return bool|array 
+     */
+    public function updateProperties($mutations) {
+
+        return $this->carddavBackend->updateAddressBook($this->addressBookInfo['id'], $mutations); 
+
+    }
+
+    /**
+     * Returns a list of properties for this nodes.
+     *
+     * The properties list is a list of propertynames the client requested,
+     * encoded in clark-notation {xmlnamespace}tagname
+     *
+     * If the array is empty, it means 'all properties' were requested.
+     *
+     * @param array $properties 
+     * @return void
+     */
+    public function getProperties($properties) {
+
+        $response = array();
+        foreach($properties as $propertyName) {
+
+            if (isset($this->addressBookInfo[$propertyName])) {
+
+                $response[$propertyName] = $this->addressBookInfo[$propertyName];
+
+            }
+
+        }
+
+        return $response;
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner 
+     * 
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->addressBookInfo['principaluri'];
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     * 
+     * @return string|null 
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to 
+     *      be updated. 
+     * 
+     * @return array 
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->addressBookInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->addressBookInfo['principaluri'],
+                'protected' => true,
+            ),
+
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's. 
+     * 
+     * @param array $acl 
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+
+
+}
diff --git a/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php b/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
new file mode 100644
index 00000000000..08adc3b8157
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
@@ -0,0 +1,211 @@
+<?php
+
+/**
+ * Parses the addressbook-query report request body.
+ *
+ * Whoever designed this format, and the CalDAV equavalent even more so, 
+ * has no feel for design.
+ * 
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_AddressBookQueryParser {
+
+    const TEST_ANYOF = 'anyof';
+    const TEST_ALLOF = 'allof';
+
+    /**
+     * List of requested properties the client wanted
+     * 
+     * @var array 
+     */
+    public $requestedProperties;
+
+    /**
+     * The number of results the client wants
+     *
+     * null means it wasn't specified, which in most cases means 'all results'.
+     * 
+     * @var int|null 
+     */
+    public $limit;
+
+    /**
+     * List of property filters.
+     *
+     * @var array 
+     */
+    public $filters;
+
+    /**
+     * Either TEST_ANYOF or TEST_ALLOF
+     * 
+     * @var string 
+     */
+    public $test;
+
+    /**
+     * DOM Document
+     * 
+     * @var DOMDocument 
+     */
+    protected $dom;
+
+    /**
+     * DOM XPath object 
+     * 
+     * @var DOMXPath 
+     */
+    protected $xpath;
+
+    /**
+     * Creates the parser
+     * 
+     * @param DOMNode $dom 
+     * @return void
+     */
+    public function __construct(DOMDocument $dom) {
+
+        $this->dom = $dom;
+
+        $this->xpath = new DOMXPath($dom);
+        $this->xpath->registerNameSpace('card',Sabre_CardDAV_Plugin::NS_CARDDAV);
+
+    }
+
+    /**
+     * Parses the request. 
+     * 
+     * @param DOMNode $dom 
+     * @return void
+     */
+    public function parse() {
+
+        $filterNode = null;
+        
+        $limit = $this->xpath->evaluate('number(/card:addressbook-query/card:limit/card:nresults)');
+        if (is_nan($limit)) $limit = null;
+
+        $filter = $this->xpath->query('/card:addressbook-query/card:filter');
+        if ($filter->length !== 1) {
+            throw new Sabre_DAV_Exception_BadRequest('Only one filter element is allowed');
+        }
+
+        $filter = $filter->item(0);
+        $test = $this->xpath->evaluate('string(@test)', $filter);
+        if (!$test) $test = self::TEST_ANYOF;
+        if ($test !== self::TEST_ANYOF && $test !== self::TEST_ALLOF) {
+            throw new Sabre_DAV_Exception_BadRequest('The test attribute must either hold "anyof" or "allof"');
+        }
+
+        $propFilters = array();
+
+        $propFilterNodes = $this->xpath->query('card:prop-filter', $filter);
+        for($ii=0; $ii < $propFilterNodes->length; $ii++) {
+
+            $propFilters[] = $this->parsePropFilterNode($propFilterNodes->item($ii));
+
+
+        }
+
+        $this->filters = $propFilters;
+        $this->limit = $limit;
+        $this->requestedProperties = array_keys(Sabre_DAV_XMLUtil::parseProperties($this->dom->firstChild));
+        $this->test = $test;
+
+    }
+
+    /**
+     * Parses the prop-filter xml element
+     * 
+     * @param DOMElement $propFilterNode 
+     * @return array 
+     */
+    protected function parsePropFilterNode(DOMElement $propFilterNode) {
+
+        $propFilter = array();
+        $propFilter['name'] = $propFilterNode->getAttribute('name');
+        $propFilter['test'] = $propFilterNode->getAttribute('test');
+        if (!$propFilter['test']) $propFilter['test'] = 'anyof';
+
+        $propFilter['is-not-defined'] = $this->xpath->query('card:is-not-defined', $propFilterNode)->length>0;
+
+        $paramFilterNodes = $this->xpath->query('card:param-filter', $propFilterNode);
+
+        $propFilter['param-filters'] = array();
+
+
+        for($ii=0;$ii<$paramFilterNodes->length;$ii++) {
+
+            $propFilter['param-filters'][] = $this->parseParamFilterNode($paramFilterNodes->item($ii));
+
+        }
+        $propFilter['text-matches'] = array();
+        $textMatchNodes = $this->xpath->query('card:text-match', $propFilterNode);
+
+        for($ii=0;$ii<$textMatchNodes->length;$ii++) {
+
+            $propFilter['text-matches'][] = $this->parseTextMatchNode($textMatchNodes->item($ii));
+
+        }
+
+        return $propFilter;
+
+    }
+
+    /**
+     * Parses the param-filter element 
+     * 
+     * @param DOMElement $paramFilterNode 
+     * @return array 
+     */
+    public function parseParamFilterNode(DOMElement $paramFilterNode) {
+        
+        $paramFilter = array();
+        $paramFilter['name'] = $paramFilterNode->getAttribute('name');
+        $paramFilter['is-not-defined'] = $this->xpath->query('card:is-not-defined', $paramFilterNode)->length>0;
+        $paramFilter['text-match'] = null;
+
+        $textMatch = $this->xpath->query('card:text-match', $paramFilterNode);
+        if ($textMatch->length>0) {
+            $paramFilter['text-match'] = $this->parseTextMatchNode($textMatch->item(0));
+        }
+
+        return $paramFilter; 
+
+    }
+
+    /**
+     * Text match
+     * 
+     * @param DOMElement $textMatchNode 
+     * @return void
+     */
+    public function parseTextMatchNode(DOMElement $textMatchNode) {
+
+        $matchType = $textMatchNode->getAttribute('match-type');
+        if (!$matchType) $matchType = 'contains';
+
+        if (!in_array($matchType, array('contains', 'equals', 'starts-with', 'ends-with'))) {
+            throw new Sabre_DAV_Exception_BadRequest('Unknown match-type: ' . $matchType);
+        }
+
+        $negateCondition = $textMatchNode->getAttribute('negate-condition');
+        $negateCondition = $negateCondition==='yes';
+        $collation = $textMatchNode->getAttribute('collation');
+        if (!$collation) $collation = 'i;unicode-casemap';
+
+        return array(
+            'negate-condition' => $negateCondition,
+            'collation' => $collation,
+            'match-type' => $matchType,
+            'value' => $textMatchNode->nodeValue
+        );
+          
+
+    } 
+
+}
diff --git a/3rdparty/Sabre/CardDAV/AddressBookRoot.php b/3rdparty/Sabre/CardDAV/AddressBookRoot.php
new file mode 100644
index 00000000000..1a80efba35e
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/AddressBookRoot.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * AddressBook rootnode 
+ *
+ * This object lists a collection of users, which can contain addressbooks.
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_AddressBookRoot extends Sabre_DAVACL_AbstractPrincipalCollection {
+
+    /**
+     * Principal Backend 
+     * 
+     * @var Sabre_DAVACL_IPrincipalBackend
+     */
+    protected $principalBackend;
+
+    /**
+     * CardDAV backend 
+     * 
+     * @var Sabre_CardDAV_Backend_Abstract 
+     */
+    protected $carddavBackend;
+
+    /**
+     * Constructor 
+     *
+     * This constructor needs both a principal and a carddav backend.
+     *
+     * By default this class will show a list of addressbook collections for 
+     * principals in the 'principals' collection. If your main principals are 
+     * actually located in a different path, use the $principalPrefix argument 
+     * to override this.
+     *
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend 
+     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
+     * @param string $principalPrefix 
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend,Sabre_CardDAV_Backend_Abstract $carddavBackend, $principalPrefix = 'principals') {
+
+        $this->carddavBackend = $carddavBackend;
+        parent::__construct($principalBackend, $principalPrefix);
+
+    }
+
+    /**
+     * Returns the name of the node 
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        return Sabre_CardDAV_Plugin::ADDRESSBOOK_ROOT;
+
+    }
+
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     * 
+     * @param array $principal 
+     * @return Sabre_DAV_INode 
+     */
+    public function getChildForPrincipal(array $principal) {
+
+        return new Sabre_CardDAV_UserAddressBooks($this->carddavBackend, $principal['uri']);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CardDAV/Backend/Abstract.php b/3rdparty/Sabre/CardDAV/Backend/Abstract.php
new file mode 100644
index 00000000000..1f0253ddab8
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Backend/Abstract.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * Abstract Backend class
+ *
+ * This class serves as a base-class for addressbook backends
+ *
+ * Note that there are references to 'addressBookId' scattered throughout the 
+ * class. The value of the addressBookId is completely up to you, it can be any 
+ * arbitrary value you can use as an unique identifier.
+ * 
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_CardDAV_Backend_Abstract {
+
+    /**
+     * Returns the list of addressbooks for a specific user.
+     *
+     * Every addressbook should have the following properties:
+     *   id - an arbitrary unique id
+     *   uri - the 'basename' part of the url
+     *   principaluri - Same as the passed parameter
+     *
+     * Any additional clark-notation property may be passed besides this. Some 
+     * common ones are :
+     *   {DAV:}displayname
+     *   {urn:ietf:params:xml:ns:carddav}addressbook-description
+     *   {http://calendarserver.org/ns/}getctag
+     * 
+     * @param string $principalUri 
+     * @return array 
+     */
+    public abstract function getAddressBooksForUser($principalUri); 
+
+    /**
+     * Updates an addressbook's properties
+     *
+     * See Sabre_DAV_IProperties for a description of the mutations array, as 
+     * well as the return value. 
+     *
+     * @param mixed $addressBookId
+     * @param array $mutations
+     * @see Sabre_DAV_IProperties::updateProperties
+     * @return bool|array
+     */
+    public abstract function updateAddressBook($addressBookId, array $mutations); 
+
+    /**
+     * Creates a new address book 
+     *
+     * @param string $principalUri 
+     * @param string $url Just the 'basename' of the url. 
+     * @param array $properties 
+     * @return void
+     */
+    abstract public function createAddressBook($principalUri, $url, array $properties); 
+
+    /**
+     * Deletes an entire addressbook and all its contents
+     *
+     * @param mixed $addressBookId 
+     * @return void
+     */
+    abstract public function deleteAddressBook($addressBookId); 
+
+    /**
+     * Returns all cards for a specific addressbook id. 
+     *
+     * This method should return the following properties for each card:
+     *   * carddata - raw vcard data
+     *   * uri - Some unique url
+     *   * lastmodified - A unix timestamp
+
+     * @param mixed $addressbookId 
+     * @return array 
+     */
+    public abstract function getCards($addressbookId); 
+
+    /**
+     * Returns a specfic card
+     * 
+     * @param mixed $addressBookId 
+     * @param string $cardUri 
+     * @return void
+     */
+    public abstract function getCard($addressBookId, $cardUri); 
+
+    /**
+     * Creates a new card
+     * 
+     * @param mixed $addressBookId 
+     * @param string $cardUri 
+     * @param string $cardData 
+     * @return bool 
+     */
+    abstract public function createCard($addressBookId, $cardUri, $cardData); 
+
+    /**
+     * Updates a card
+     * 
+     * @param mixed $addressBookId 
+     * @param string $cardUri 
+     * @param string $cardData 
+     * @return bool 
+     */
+    abstract public function updateCard($addressBookId, $cardUri, $cardData); 
+
+    /**
+     * Deletes a card
+     * 
+     * @param mixed $addressBookId 
+     * @param string $cardUri 
+     * @return bool 
+     */
+    abstract public function deleteCard($addressBookId, $cardUri); 
+
+}
diff --git a/3rdparty/Sabre/CardDAV/Backend/PDO.php b/3rdparty/Sabre/CardDAV/Backend/PDO.php
new file mode 100644
index 00000000000..f4e44610ccf
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Backend/PDO.php
@@ -0,0 +1,277 @@
+<?php
+
+/**
+ * PDO CardDAV backend
+ *
+ * This CardDAV backend uses PDO to store addressbooks
+ * 
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_Backend_PDO extends Sabre_CardDAV_Backend_Abstract {
+
+    /**
+     * PDO connection 
+     * 
+     * @var PDO 
+     */
+    protected $pdo;
+
+    /**
+     * The PDO table name used to store addressbooks
+     */
+    protected $addressBooksTableName;
+
+    /**
+     * The PDO table name used to store cards
+     */
+    protected $cardsTableName;
+
+    /**
+     * Sets up the object 
+     * 
+     * @param PDO $pdo 
+     */
+    public function __construct(PDO $pdo, $addressBooksTableName = 'addressbooks', $cardsTableName = 'cards') {
+
+        $this->pdo = $pdo;
+        $this->addressBooksTableName = $addressBooksTableName;
+        $this->cardsTableName = $cardsTableName; 
+
+    }
+
+    /**
+     * Returns the list of addressbooks for a specific user. 
+     * 
+     * @param string $principalUri 
+     * @return array 
+     */
+    public function getAddressBooksForUser($principalUri) {
+
+        $stmt = $this->pdo->prepare('SELECT id, uri, displayname, principaluri, description, ctag FROM `'.$this->addressBooksTableName.'` WHERE principaluri = ?');
+        $result = $stmt->execute(array($principalUri));
+
+        $addressBooks = array();
+
+        foreach($stmt->fetchAll() as $row) {
+
+            $addressBooks[] = array(
+                'id'  => $row['id'],
+                'uri' => $row['uri'],
+                'principaluri' => $row['principaluri'],
+                '{DAV:}displayname' => $row['displayname'],
+                '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+                '{http://calendarserver.org/ns/}getctag' => $row['ctag'],
+                '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}supported-address-data' => 
+                    new Sabre_CardDAV_Property_SupportedAddressData(),
+            );
+
+        }
+
+        return $addressBooks;
+
+    }
+
+
+    /**
+     * Updates an addressbook's properties
+     *
+     * See Sabre_DAV_IProperties for a description of the mutations array, as 
+     * well as the return value. 
+     *
+     * @param mixed $addressBookId
+     * @param array $mutations
+     * @see Sabre_DAV_IProperties::updateProperties
+     * @return bool|array
+     */
+    public function updateAddressBook($addressBookId, array $mutations) {
+        
+        $updates = array();
+
+        foreach($mutations as $property=>$newValue) {
+
+            switch($property) {
+                case '{DAV:}displayname' :
+                    $updates['displayname'] = $newValue;
+                    break;
+                case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' :
+                    $updates['description'] = $newValue;
+                    break;
+                default :
+                    // If any unsupported values were being updated, we must 
+                    // let the entire request fail.
+                    return false;
+            }
+
+        }
+
+        // No values are being updated?
+        if (!$updates) {
+            return false;
+        }
+
+        $query = 'UPDATE `' . $this->addressBooksTableName . '` SET ctag = ctag + 1 ';
+        foreach($updates as $key=>$value) {
+            $query.=', `' . $key . '` = :' . $key . ' ';
+        }
+        $query.=' WHERE id = :addressbookid';
+
+        $stmt = $this->pdo->prepare($query);
+        $updates['addressbookid'] = $addressBookId;
+
+        $stmt->execute($updates);
+
+        return true;
+
+    }
+
+    /**
+     * Creates a new address book 
+     *
+     * @param string $principalUri 
+     * @param string $url Just the 'basename' of the url. 
+     * @param array $properties 
+     * @return void
+     */
+    public function createAddressBook($principalUri, $url, array $properties) {
+
+        $values = array(
+            'displayname' => null,
+            'description' => null,
+            'principaluri' => $principalUri,
+            'uri' => $url,
+        );
+
+        foreach($properties as $property=>$newValue) {
+
+            switch($property) {
+                case '{DAV:}displayname' :
+                    $values['displayname'] = $newValue;
+                    break;
+                case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' :
+                    $values['description'] = $newValue;
+                    break;
+                default :
+                    throw new Sabre_DAV_Exception_BadRequest('Unknown property: ' . $property);
+            }
+
+        }
+
+        $query = 'INSERT INTO `' . $this->addressBooksTableName . '` (uri, displayname, description, principaluri, ctag) VALUES (:uri, :displayname, :description, :principaluri, 1)';
+        $stmt = $this->pdo->prepare($query);
+        $stmt->execute($values);
+
+    }
+
+    /**
+     * Deletes an entire addressbook and all its contents
+     *
+     * @param int $addressBookId 
+     * @return void
+     */
+    public function deleteAddressBook($addressBookId) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM `' . $this->cardsTableName . '` WHERE addressbookid = ?');
+        $stmt->execute(array($addressBookId));
+
+        $stmt = $this->pdo->prepare('DELETE FROM `' . $this->addressBooksTableName . '` WHERE id = ?');
+        $stmt->execute(array($addressBookId));
+
+    }
+
+    /**
+     * Returns all cards for a specific addressbook id. 
+     * 
+     * @param mixed $addressbookId 
+     * @return array 
+     */
+    public function getCards($addressbookId) {
+
+        $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM `' . $this->cardsTableName . '` WHERE addressbookid = ?');
+        $stmt->execute(array($addressbookId));
+
+        return $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+    
+    }
+    /**
+     * Returns a specfic card
+     * 
+     * @param mixed $addressBookId 
+     * @param string $cardUri 
+     * @return array 
+     */
+    public function getCard($addressBookId, $cardUri) {
+
+        $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM `' . $this->cardsTableName . '` WHERE addressbookid = ? AND uri = ? LIMIT 1');
+        $stmt->execute(array($addressBookId, $cardUri));
+
+        $result = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+        return (count($result)>0?$result[0]:false);
+
+    }
+
+    /**
+     * Creates a new card
+     * 
+     * @param mixed $addressBookId 
+     * @param string $cardUri 
+     * @param string $cardData 
+     * @return bool 
+     */
+    public function createCard($addressBookId, $cardUri, $cardData) {
+
+        $stmt = $this->pdo->prepare('INSERT INTO `' . $this->cardsTableName . '` (carddata, uri, lastmodified, addressbookid) VALUES (?, ?, ?, ?)');
+
+        $result = $stmt->execute(array($cardData, $cardUri, time(), $addressBookId));
+
+        $stmt2 = $this->pdo->prepare('UPDATE `' . $this->addressBooksTableName . '` SET ctag = ctag + 1 WHERE id = ?');
+        $stmt2->execute(array($addressBookId));
+
+        return $result;
+
+    }
+
+    /**
+     * Updates a card
+     * 
+     * @param mixed $addressBookId 
+     * @param string $cardUri 
+     * @param string $cardData 
+     * @return bool 
+     */
+    public function updateCard($addressBookId, $cardUri, $cardData) {
+
+        $stmt = $this->pdo->prepare('UPDATE `' . $this->cardsTableName . '` SET carddata = ?, lastmodified = ? WHERE uri = ? AND addressbookid =?');
+        $result = $stmt->execute(array($cardData, time(), $cardUri, $addressBookId));
+
+        $stmt2 = $this->pdo->prepare('UPDATE `' . $this->addressBooksTableName . '` SET ctag = ctag + 1 WHERE id = ?');
+        $stmt2->execute(array($addressBookId));
+
+        return $stmt->rowCount()===1;
+
+    }
+
+    /**
+     * Deletes a card
+     * 
+     * @param mixed $addressBookId 
+     * @param string $cardUri 
+     * @return bool 
+     */
+    public function deleteCard($addressBookId, $cardUri) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM `' . $this->cardsTableName . '` WHERE addressbookid = ? AND uri = ?');
+        $stmt->execute(array($addressBookId, $cardUri));
+
+        $stmt2 = $this->pdo->prepare('UPDATE `' . $this->addressBooksTableName . '` SET ctag = ctag + 1 WHERE id = ?');
+        $stmt2->execute(array($addressBookId));
+
+        return $stmt->rowCount()===1;
+
+    }
+}
diff --git a/3rdparty/Sabre/CardDAV/Card.php b/3rdparty/Sabre/CardDAV/Card.php
new file mode 100644
index 00000000000..2844eaf7ed6
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Card.php
@@ -0,0 +1,220 @@
+<?php
+
+/**
+ * The Card object represents a single Card from an addressbook
+ * 
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard, Sabre_DAVACL_IACL {
+
+    /**
+     * CardDAV backend
+     * 
+     * @var Sabre_CardDAV_Backend_Abstract 
+     */
+    private $carddavBackend;
+
+    /**
+     * Array with information about this Card
+     * 
+     * @var array 
+     */
+    private $cardData;
+
+    /**
+     * Array with information about the containing addressbook 
+     * 
+     * @var array 
+     */
+    private $addressBookInfo;
+
+    /**
+     * Constructor 
+     * 
+     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend 
+     * @param array $addressBookInfo
+     * @param array $cardData
+     */
+    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend,array $addressBookInfo,array $cardData) {
+
+        $this->carddavBackend = $carddavBackend;
+        $this->addressBookInfo = $addressBookInfo;
+        $this->cardData = $cardData;
+
+    }
+
+    /**
+     * Returns the uri for this object 
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        return $this->cardData['uri'];
+
+    }
+
+    /**
+     * Returns the VCard-formatted object 
+     * 
+     * @return string 
+     */
+    public function get() {
+
+        $cardData = $this->cardData['carddata'];
+        $s = fopen('php://temp','r+');
+        fwrite($s, $cardData);
+        rewind($s);
+        return $s;
+
+    }
+
+    /**
+     * Updates the VCard-formatted object 
+     * 
+     * @param string $cardData 
+     * @return void 
+     */
+    public function put($cardData) {
+
+        if (is_resource($cardData))
+            $cardData = stream_get_contents($cardData);
+
+        // Converting to UTF-8, if needed
+        $cardData = Sabre_DAV_StringUtil::ensureUTF8($cardData);
+
+        $this->carddavBackend->updateCard($this->addressBookInfo['id'],$this->cardData['uri'],$cardData);
+        $this->cardData['carddata'] = $cardData;
+
+    }
+
+    /**
+     * Deletes the card
+     * 
+     * @return void
+     */
+    public function delete() {
+
+        $this->carddavBackend->deleteCard($this->addressBookInfo['id'],$this->cardData['uri']);
+
+    }
+
+    /**
+     * Returns the mime content-type 
+     * 
+     * @return string 
+     */
+    public function getContentType() {
+
+        return 'text/x-vcard';
+
+    }
+
+    /**
+     * Returns an ETag for this object 
+     * 
+     * @return string 
+     */
+    public function getETag() {
+
+        return '"' . md5($this->cardData['carddata']) . '"';
+
+    }
+
+    /**
+     * Returns the last modification date as a unix timestamp
+     * 
+     * @return time 
+     */
+    public function getLastModified() {
+
+        return isset($this->cardData['lastmodified'])?$this->cardData['lastmodified']:null;
+
+    }
+
+    /**
+     * Returns the size of this object in bytes 
+     * 
+     * @return int
+     */
+    public function getSize() {
+
+        return strlen($this->cardData['carddata']);
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner 
+     * 
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->addressBookInfo['principaluri'];
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     * 
+     * @return string|null 
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to 
+     *      be updated. 
+     * 
+     * @return array 
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->addressBookInfo['principaluri'],
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->addressBookInfo['principaluri'],
+                'protected' => true,
+            ),
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's. 
+     * 
+     * @param array $acl 
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/CardDAV/IAddressBook.php b/3rdparty/Sabre/CardDAV/IAddressBook.php
new file mode 100644
index 00000000000..a0dffb30aea
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/IAddressBook.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * AddressBook interface
+ *
+ * Implement this interface to allow a node to be recognized as an addressbook.
+ * 
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CardDAV_IAddressBook extends Sabre_DAV_ICollection {
+
+ 
+
+}
diff --git a/3rdparty/Sabre/CardDAV/ICard.php b/3rdparty/Sabre/CardDAV/ICard.php
new file mode 100644
index 00000000000..25bcc551b73
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/ICard.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Card interface 
+ *
+ * Extend the ICard interface to allow your custom nodes to be picked up as 
+ * 'Cards'. 
+ * 
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CardDAV_ICard extends Sabre_DAV_IFile { 
+
+}
+
diff --git a/3rdparty/Sabre/CardDAV/IDirectory.php b/3rdparty/Sabre/CardDAV/IDirectory.php
new file mode 100644
index 00000000000..e0d0797d285
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/IDirectory.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * IDirectory interface
+ *
+ * Implement this interface to have an addressbook marked as a 'directory'. A 
+ * directory is an (often) global addressbook.
+ *
+ * A full description can be found in the IETF draft:
+ *   - draft-daboo-carddav-directory-gateway
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_CardDAV_IDirectory extends Sabre_CardDAV_IAddressBook {
+
+
+}
diff --git a/3rdparty/Sabre/CardDAV/Plugin.php b/3rdparty/Sabre/CardDAV/Plugin.php
new file mode 100644
index 00000000000..14c9c72b0d5
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Plugin.php
@@ -0,0 +1,463 @@
+<?php
+
+/**
+ * CardDAV plugin
+ *
+ * The CardDAV plugin adds CardDAV functionality to the WebDAV server
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Url to the addressbooks
+     */
+    const ADDRESSBOOK_ROOT = 'addressbooks';
+
+    /**
+     * xml namespace for CardDAV elements
+     */
+    const NS_CARDDAV = 'urn:ietf:params:xml:ns:carddav';
+
+    /**
+     * Add urls to this property to have them automatically exposed as 
+     * 'directories' to the user.
+     * 
+     * @var array
+     */
+    public $directories = array();
+
+    /**
+     * Server class 
+     *
+     * @var Sabre_DAV_Server 
+     */
+    protected $server;
+
+    /**
+     * Initializes the plugin 
+     *
+     * @param Sabre_DAV_Server $server 
+     * @return void 
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        /* Events */
+        $server->subscribeEvent('beforeGetProperties', array($this, 'beforeGetProperties'));
+        $server->subscribeEvent('report', array($this,'report'));
+
+        /* Namespaces */
+        $server->xmlNamespaces[self::NS_CARDDAV] = 'card';
+
+        /* Mapping Interfaces to {DAV:}resourcetype values */
+        $server->resourceTypeMapping['Sabre_CardDAV_IAddressBook'] = '{' . self::NS_CARDDAV . '}addressbook';
+        $server->resourceTypeMapping['Sabre_CardDAV_IDirectory'] = '{' . self::NS_CARDDAV . '}directory';
+        
+        /* Adding properties that may never be changed */
+        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-address-data';
+        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}max-resource-size';
+
+
+        $this->server = $server;
+
+    }
+
+    /**
+     * Returns a list of supported features.
+     *
+     * This is used in the DAV: header in the OPTIONS and PROPFIND requests. 
+     *
+     * @return array
+     */
+    public function getFeatures() {
+
+        return array('addressbook');
+
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     * Note that you still need to subscribe to the 'report' event to actually 
+     * implement them 
+     *
+     * @param string $uri
+     * @return array 
+     */
+    public function getSupportedReportSet($uri) {
+
+        $node = $this->server->tree->getNodeForPath($uri);
+        if ($node instanceof Sabre_CardDAV_IAddressBook || $node instanceof Sabre_CardDAV_ICard) {
+            return array(
+                 '{' . self::NS_CARDDAV . '}addressbook-multiget',
+                 '{' . self::NS_CARDDAV . '}addressbook-query',
+            );
+        }
+        return array();
+
+    }
+
+
+    /**
+     * Adds all CardDAV-specific properties 
+     *
+     * @param string $path
+     * @param Sabre_DAV_INode $node 
+     * @param array $requestedProperties
+     * @param array $returnedProperties 
+     * @return void
+     */
+    public function beforeGetProperties($path, Sabre_DAV_INode $node, array &$requestedProperties, array &$returnedProperties) { 
+
+        if ($node instanceof Sabre_DAVACL_IPrincipal) {
+
+            // calendar-home-set property
+            $addHome = '{' . self::NS_CARDDAV . '}addressbook-home-set';
+            if (in_array($addHome,$requestedProperties)) {
+                $principalId = $node->getName(); 
+                $addressbookHomePath = self::ADDRESSBOOK_ROOT . '/' . $principalId . '/';
+                unset($requestedProperties[array_search($addHome, $requestedProperties)]);
+                $returnedProperties[200][$addHome] = new Sabre_DAV_Property_Href($addressbookHomePath);
+            }
+
+            $directories = '{' . self::NS_CARDDAV . '}directory-gateway';
+            if ($this->directories && in_array($directories, $requestedProperties)) {
+                unset($requestedProperties[array_search($directories, $requestedProperties)]);
+                $returnedProperties[200][$directories] = new Sabre_DAV_Property_HrefList($this->directories);
+            }
+
+        }
+
+        if ($node instanceof Sabre_CardDAV_ICard) {
+
+            // The address-data property is not supposed to be a 'real' 
+            // property, but in large chunks of the spec it does act as such. 
+            // Therefore we simply expose it as a property.
+            $addressDataProp = '{' . self::NS_CARDDAV . '}address-data';
+            if (in_array($addressDataProp, $requestedProperties)) {
+                unset($requestedProperties[$addressDataProp]);
+                $val = $node->get();
+                if (is_resource($val))
+                    $val = stream_get_contents($val);
+
+                // Taking out \r to not screw up the xml output
+                $returnedProperties[200][$addressDataProp] = str_replace("\r","", $val);
+
+            }
+        }
+
+    }
+
+    /**
+     * This functions handles REPORT requests specific to CardDAV 
+     *
+     * @param string $reportName 
+     * @param DOMNode $dom
+     * @return bool 
+     */
+    public function report($reportName,$dom) {
+
+        switch($reportName) { 
+            case '{'.self::NS_CARDDAV.'}addressbook-multiget' :
+                $this->addressbookMultiGetReport($dom);
+                return false;
+            case '{'.self::NS_CARDDAV.'}addressbook-query' :
+                $this->addressBookQueryReport($dom);
+                return false; 
+            default :
+                return;
+
+        }
+
+
+    }
+
+    /**
+     * This function handles the addressbook-multiget REPORT.
+     *
+     * This report is used by the client to fetch the content of a series
+     * of urls. Effectively avoiding a lot of redundant requests.
+     *
+     * @param DOMNode $dom
+     * @return void
+     */
+    public function addressbookMultiGetReport($dom) {
+
+        $properties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
+
+        $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
+        $propertyList = array();
+
+        foreach($hrefElems as $elem) {
+
+            $uri = $this->server->calculateUri($elem->nodeValue);
+            list($propertyList[]) = $this->server->getPropertiesForPath($uri,$properties);
+
+        }
+
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($propertyList));
+
+    }
+
+    /**
+     * This function handles the addressbook-query REPORT
+     *
+     * This report is used by the client to filter an addressbook based on a
+     * complex query.
+     *
+     * @param DOMNode $dom
+     * @return void
+     */
+    protected function addressbookQueryReport($dom) {
+
+        $query = new Sabre_CardDAV_AddressBookQueryParser($dom);
+        $query->parse();
+
+        $depth = $this->server->getHTTPDepth(0);
+
+        if ($depth==0) {
+            $candidateNodes = array(
+                $this->server->tree->getNodeForPath($this->server->getRequestUri())
+            );
+        } else {
+            $candidateNodes = $this->server->tree->getChildren($this->server->getRequestUri());
+        }
+
+        $validNodes = array();
+        foreach($candidateNodes as $node) {
+
+            if (!$node instanceof Sabre_CardDAV_ICard)
+                continue;
+
+            $blob = $node->get();
+            if (is_resource($blob)) {
+                $blob = stream_get_contents($blob);
+            }
+
+            if (!$this->validateFilters($blob, $query->filters, $query->test)) {
+                continue;
+            }
+
+            $validNodes[] = $node;
+
+            if ($query->limit && $query->limit <= count($validNodes)) {
+                // We hit the maximum number of items, we can stop now.
+                break;
+            }
+
+        }
+
+        $result = array();
+        foreach($validNodes as $validNode) {
+            if ($depth==0) { 
+                $href = $this->server->getRequestUri();
+            } else {
+                $href = $this->server->getRequestUri() . '/' . $validNode->getName();
+            }
+
+            list($result[]) = $this->server->getPropertiesForPath($href, $query->requestedProperties, 0);
+
+        }
+ 
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($result));
+
+    }
+
+    /**
+     * Validates if a vcard makes it throught a list of filters.
+     * 
+     * @param string $vcardData 
+     * @param array $filters 
+     * @param string $test anyof or allof (which means OR or AND) 
+     * @return bool 
+     */
+    public function validateFilters($vcardData, array $filters, $test) {
+
+        $vcard = Sabre_VObject_Reader::read($vcardData);
+        
+        $success = true;
+
+        foreach($filters as $filter) {
+
+            $isDefined = isset($vcard->{$filter['name']});
+            if ($filter['is-not-defined']) {
+                if ($isDefined) {
+                    $success = false;
+                } else {
+                    $success = true;
+                }
+            } elseif ((!$filter['param-filters'] && !$filter['text-matches']) || !$isDefined) {
+
+                // We only need to check for existence
+                $success = $isDefined;
+                
+            } else {
+
+                $vProperties = $vcard->select($filter['name']); 
+
+                $results = array();
+                if ($filter['param-filters']) {
+                    $results[] = $this->validateParamFilters($vProperties, $filter['param-filters'], $filter['test']);
+                }
+                if ($filter['text-matches']) {
+                    $texts = array();
+                    foreach($vProperties as $vProperty)
+                        $texts[] = $vProperty->value;
+
+                    $results[] = $this->validateTextMatches($texts, $filter['text-matches'], $filter['test']);
+                }
+
+                if (count($results)===1) {
+                    $success = $results[0];
+                } else {
+                    if ($filter['test'] === 'anyof') {
+                        $success = $results[0] || $results[1];
+                    } else {
+                        $success = $results[0] && $results[1];
+                    }
+                }
+
+            } // else
+
+            // There are two conditions where we can already determine wether 
+            // or not this filter succeeds.
+            if ($test==='anyof' && $success) {
+                return true;
+            }
+            if ($test==='allof' && !$success) {
+                return false;
+            }
+
+        } // foreach
+
+        // If we got all the way here, it means we haven't been able to 
+        // determine early if the test failed or not.
+        //
+        // This implies for 'anyof' that the test failed, and for 'allof' that 
+        // we succeeded. Sounds weird, but makes sense.
+        return $test==='allof';
+
+    }
+
+    /**
+     * Validates if a param-filter can be applied to a specific property. 
+     * 
+     * @todo currently we're only validating the first parameter of the passed 
+     *       property. Any subsequence parameters with the same name are
+     *       ignored.
+     * @param Sabre_VObject_Property $vProperty 
+     * @param array $filters 
+     * @param string $test 
+     * @return bool 
+     */
+    protected function validateParamFilters(array $vProperties, array $filters, $test) {
+
+        $success = false;
+        foreach($filters as $filter) {
+
+            $isDefined = false;
+            foreach($vProperties as $vProperty) {
+                $isDefined = isset($vProperty[$filter['name']]);
+                if ($isDefined) break;
+            }
+
+            if ($filter['is-not-defined']) {
+                if ($isDefined) {
+                    $success = false;
+                } else {
+                    $success = true;
+                }
+
+            // If there's no text-match, we can just check for existence 
+            } elseif (!$filter['text-match'] || !$isDefined) {
+
+                $success = $isDefined;
+                
+            } else {
+
+                $texts = array();
+                $success = false;
+                foreach($vProperties as $vProperty) {
+                    // If we got all the way here, we'll need to validate the 
+                    // text-match filter.
+                    $success = Sabre_DAV_StringUtil::textMatch($vProperty[$filter['name']]->value, $filter['text-match']['value'], $filter['text-match']['collation'], $filter['text-match']['match-type']);
+                    if ($success) break;
+                }
+                if ($filter['text-match']['negate-condition']) {
+                    $success = !$success;
+                }
+
+            } // else
+
+            // There are two conditions where we can already determine wether 
+            // or not this filter succeeds.
+            if ($test==='anyof' && $success) {
+                return true;
+            }
+            if ($test==='allof' && !$success) {
+                return false;
+            }
+
+        } 
+
+        // If we got all the way here, it means we haven't been able to 
+        // determine early if the test failed or not.
+        //
+        // This implies for 'anyof' that the test failed, and for 'allof' that 
+        // we succeeded. Sounds weird, but makes sense.
+        return $test==='allof';
+
+    }
+
+    /**
+     * Validates if a text-filter can be applied to a specific property. 
+     * 
+     * @param array $texts
+     * @param array $filters 
+     * @param string $test 
+     * @return bool 
+     */
+    protected function validateTextMatches(array $texts, array $filters, $test) {
+
+        foreach($filters as $filter) {
+
+            $success = false;
+            foreach($texts as $haystack) {
+                $success = Sabre_DAV_StringUtil::textMatch($haystack, $filter['value'], $filter['collation'], $filter['match-type']);
+
+                // Breaking on the first match
+                if ($success) break;
+            }
+            if ($filter['negate-condition']) {
+                $success = !$success;
+            }
+            
+            if ($success && $test==='anyof')
+                return true;
+
+            if (!$success && $test=='allof')
+                return false;
+
+
+        }
+
+        // If we got all the way here, it means we haven't been able to 
+        // determine early if the test failed or not.
+        //
+        // This implies for 'anyof' that the test failed, and for 'allof' that 
+        // we succeeded. Sounds weird, but makes sense.
+        return $test==='allof';
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php b/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
new file mode 100644
index 00000000000..d57d3a6e7bd
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * Supported-address-data property
+ *
+ * This property is a representation of the supported-address-data property
+ * in the CardDAV namespace. 
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_Property_SupportedAddressData extends Sabre_DAV_Property {
+
+    /**
+     * supported versions
+     * 
+     * @var array 
+     */
+    protected $supportedData = array();
+    
+    /**
+     * Creates the property 
+     * 
+     * @param array $components 
+     */
+    public function __construct(array $supportedData = null) {
+
+        if (is_null($supportedData)) {
+            $supportedData = array(
+                array('contentType' => 'text/vcard', 'version' => '3.0'),
+                array('contentType' => 'text/vcard', 'version' => '4.0'),
+            );
+        }
+
+       $this->supportedData = $supportedData; 
+
+    }
+    
+    /**
+     * Serializes the property in a DOMDocument 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $node 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+
+        $prefix = 
+            isset($server->xmlNamespaces[Sabre_CardDAV_Plugin::NS_CARDDAV]) ?
+            $server->xmlNamespaces[Sabre_CardDAV_Plugin::NS_CARDDAV] :
+            'card';
+
+        foreach($this->supportedData as $supported) {
+
+            $caldata = $doc->createElementNS(Sabre_CardDAV_Plugin::NS_CARDDAV, $prefix . ':address-data-type');
+            $caldata->setAttribute('content-type',$supported['contentType']);
+            $caldata->setAttribute('version',$supported['version']);
+            $node->appendChild($caldata);
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/CardDAV/UserAddressBooks.php b/3rdparty/Sabre/CardDAV/UserAddressBooks.php
new file mode 100644
index 00000000000..e9f2de7f741
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/UserAddressBooks.php
@@ -0,0 +1,240 @@
+<?php
+
+/**
+ * UserAddressBooks class
+ *
+ * The UserAddressBooks collection contains a list of addressbooks associated with a user
+ *
+ * @package Sabre
+ * @subpackage CardDAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sabre_DAV_IExtendedCollection, Sabre_DAVACL_IACL {
+
+    /**
+     * Principal uri
+     * 
+     * @var array 
+     */
+    protected $principalUri;
+
+    /**
+     * carddavBackend 
+     * 
+     * @var Sabre_CardDAV_Backend_Abstract 
+     */
+    protected $carddavBackend;
+
+    /**
+     * Constructor 
+     * 
+     * @param Sabre_CardDAV_Backend_Abstract $carddavBackend 
+     * @param string $principalUri 
+     */
+    public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend, $principalUri) {
+
+        $this->carddavBackend = $carddavBackend;
+        $this->principalUri = $principalUri;
+       
+    }
+
+    /**
+     * Returns the name of this object 
+     * 
+     * @return string
+     */
+    public function getName() {
+      
+        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalUri);
+        return $name; 
+
+    }
+
+    /**
+     * Updates the name of this object 
+     * 
+     * @param string $name 
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed();
+
+    }
+
+    /**
+     * Deletes this object 
+     * 
+     * @return void
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed();
+
+    }
+
+    /**
+     * Returns the last modification date 
+     * 
+     * @return int 
+     */
+    public function getLastModified() {
+
+        return null; 
+
+    }
+
+    /**
+     * Creates a new file under this object.
+     *
+     * This is currently not allowed
+     * 
+     * @param string $filename 
+     * @param resource $data 
+     * @return void
+     */
+    public function createFile($filename, $data=null) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new files in this collection is not supported');
+
+    }
+
+    /**
+     * Creates a new directory under this object.
+     *
+     * This is currently not allowed.
+     * 
+     * @param string $filename 
+     * @return void
+     */
+    public function createDirectory($filename) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new collections in this collection is not supported');
+
+    }
+
+    /**
+     * Returns a single calendar, by name 
+     * 
+     * @param string $name
+     * @todo needs optimizing
+     * @return Sabre_CardDAV_AddressBook
+     */
+    public function getChild($name) {
+
+        foreach($this->getChildren() as $child) {
+            if ($name==$child->getName())
+                return $child;
+
+        }
+        throw new Sabre_DAV_Exception_FileNotFound('Addressbook with name \'' . $name . '\' could not be found');
+
+    }
+
+    /**
+     * Returns a list of addressbooks 
+     * 
+     * @return array 
+     */
+    public function getChildren() {
+
+        $addressbooks = $this->carddavBackend->getAddressbooksForUser($this->principalUri);
+        $objs = array();
+        foreach($addressbooks as $addressbook) {
+            $objs[] = new Sabre_CardDAV_AddressBook($this->carddavBackend, $addressbook);
+        }
+        return $objs;
+
+    }
+
+    /**
+     * Creates a new addressbook 
+     * 
+     * @param string $name
+     * @param array $resourceType 
+     * @param array $properties 
+     * @return void
+     */
+    public function createExtendedCollection($name, array $resourceType, array $properties) {
+
+        if (!in_array('{'.Sabre_CardDAV_Plugin::NS_CARDDAV.'}addressbook',$resourceType) || count($resourceType)!==2) {
+            throw new Sabre_DAV_Exception_InvalidResourceType('Unknown resourceType for this collection');
+        }
+        $this->carddavBackend->createAddressBook($this->principalUri, $name, $properties);
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner 
+     * 
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->principalUri;
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     * 
+     * @return string|null 
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to 
+     *      be updated. 
+     * 
+     * @return array 
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principalUri,
+                'protected' => true,
+            ),
+            array(
+                'privilege' => '{DAV:}write',
+                'principal' => $this->principalUri,
+                'protected' => true,
+            ),
+
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's. 
+     * 
+     * @param array $acl 
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Changing ACL is not yet supported');
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/CardDAV/Version.php b/3rdparty/Sabre/CardDAV/Version.php
new file mode 100644
index 00000000000..900fbf5e75c
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/Version.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Version Class
+ *
+ * This class contains the Sabre_CardDAV version information
+ * 
+ * @package Sabre
+ * @subpackage CardDAV 
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CardDAV_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.5.3';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php b/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
new file mode 100644
index 00000000000..11bab8c7af7
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * HTTP Basic authentication backend class
+ *
+ * This class can be used by authentication objects wishing to use HTTP Basic
+ * Most of the digest logic is handled, implementors just need to worry about
+ * the validateUserPass method.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author James David Low (http://jameslow.com/)
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Auth_Backend_AbstractBasic implements Sabre_DAV_Auth_IBackend {
+
+    /**
+     * This variable holds the currently logged in username.
+     *
+     * @var string|null
+     */
+    protected $currentUser;
+
+    /**
+     * Validates a username and password
+     *
+     * This method should return true or false depending on if login
+     * succeeded.
+     *
+     * @return bool
+     */
+    abstract protected function validateUserPass($username, $password);
+
+    /**
+     * Returns information about the currently logged in username.
+     *
+     * If nobody is currently logged in, this method should return null.
+     *
+     * @return string|null
+     */
+    public function getCurrentUser() {
+        return $this->currentUser;
+    }
+
+
+    /**
+     * Authenticates the user based on the current request.
+     *
+     * If authentication is succesful, true must be returned.
+     * If authentication fails, an exception must be thrown.
+     *
+     * @throws Sabre_DAV_Exception_NotAuthenticated
+     * @return bool
+     */
+    public function authenticate(Sabre_DAV_Server $server,$realm) {
+
+        $auth = new Sabre_HTTP_BasicAuth();
+        $auth->setHTTPRequest($server->httpRequest);
+        $auth->setHTTPResponse($server->httpResponse);
+        $auth->setRealm($realm);
+        $userpass = $auth->getUserPass();
+        if (!$userpass) {
+            $auth->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('No basic authentication headers were found');
+        }
+
+        // Authenticates the user
+        if (!$this->validateUserPass($userpass[0],$userpass[1])) {
+            $auth->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('Username or password does not match');
+        }
+        $this->currentUser = $userpass[0];
+        return true;
+    }
+
+
+} 
+
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php b/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
new file mode 100644
index 00000000000..5bdc72753ec
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * HTTP Digest authentication backend class
+ *
+ * This class can be used by authentication objects wishing to use HTTP Digest
+ * Most of the digest logic is handled, implementors just need to worry about 
+ * the getDigestHash method 
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Auth_Backend_AbstractDigest implements Sabre_DAV_Auth_IBackend {
+
+    /**
+     * This variable holds the currently logged in username.
+     * 
+     * @var array|null
+     */
+    protected $currentUser;
+
+    /**
+     * Returns a users digest hash based on the username and realm.
+     *
+     * If the user was not known, null must be returned. 
+     * 
+     * @param string $realm
+     * @param string $username 
+     * @return string|null 
+     */
+    abstract public function getDigestHash($realm,$username);
+
+    /**
+     * Authenticates the user based on the current request.
+     *
+     * If authentication is succesful, true must be returned.
+     * If authentication fails, an exception must be thrown.
+     *
+     * @throws Sabre_DAV_Exception_NotAuthenticated
+     * @return bool 
+     */
+    public function authenticate(Sabre_DAV_Server $server,$realm) {
+
+        $digest = new Sabre_HTTP_DigestAuth();
+
+        // Hooking up request and response objects
+        $digest->setHTTPRequest($server->httpRequest);
+        $digest->setHTTPResponse($server->httpResponse);
+
+        $digest->setRealm($realm);
+        $digest->init();
+
+        $username = $digest->getUsername();
+
+        // No username was given
+        if (!$username) {
+            $digest->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('No digest authentication headers were found');
+        }
+
+        $hash = $this->getDigestHash($realm, $username);
+        // If this was false, the user account didn't exist
+        if ($hash===false || is_null($hash)) {
+            $digest->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('The supplied username was not on file');
+        }
+        if (!is_string($hash)) {
+            throw new Sabre_DAV_Exception('The returned value from getDigestHash must be a string or null');
+        }
+
+        // If this was false, the password or part of the hash was incorrect.
+        if (!$digest->validateA1($hash)) {
+            $digest->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('Incorrect username');
+        }
+
+        $this->currentUser = $username;
+        return true;
+
+    }
+
+    /**
+     * Returns the currently logged in username. 
+     * 
+     * @return string|null 
+     */
+    public function getCurrentUser() {
+
+        return $this->currentUser;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/Apache.php b/3rdparty/Sabre/DAV/Auth/Backend/Apache.php
new file mode 100644
index 00000000000..6bcd76bdcb0
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Backend/Apache.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * Apache authenticator
+ *
+ * This authentication backend assumes that authentication has been
+ * conifgured in apache, rather than within SabreDAV.
+ *
+ * Make sure apache is properly configured for this to work.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Backend_Apache implements Sabre_DAV_Auth_IBackend {
+
+    /**
+     * Current apache user 
+     * 
+     * @var string 
+     */
+    protected $remoteUser;
+    
+    /**
+     * Authenticates the user based on the current request.
+     *
+     * If authentication is succesful, true must be returned.
+     * If authentication fails, an exception must be thrown.
+     *
+     * @return bool 
+     */
+    public function authenticate(Sabre_DAV_Server $server,$realm) {
+
+        $remoteUser = $server->httpRequest->getRawServerValue('REMOTE_USER');
+        if (is_null($remoteUser)) {
+            throw new Sabre_DAV_Exception('We did not receive the $_SERVER[REMOTE_USER] property. This means that apache might have been misconfigured');
+        }
+
+        $this->remoteUser = $remoteUser;
+        return true;
+
+    }
+
+    /**
+     * Returns information about the currently logged in user.
+     *
+     * If nobody is currently logged in, this method should return null.
+     * 
+     * @return array|null
+     */
+    public function getCurrentUser() {
+
+        return $this->remoteUser;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/File.php b/3rdparty/Sabre/DAV/Auth/Backend/File.php
new file mode 100644
index 00000000000..db1f04c4772
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Backend/File.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * This is an authentication backend that uses a file to manage passwords.
+ *
+ * The backend file must conform to Apache's htdigest format
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Backend_File extends Sabre_DAV_Auth_Backend_AbstractDigest {
+
+    /**
+     * List of users 
+     * 
+     * @var array
+     */
+    protected $users = array();
+
+    /**
+     * Creates the backend object. 
+     *
+     * If the filename argument is passed in, it will parse out the specified file fist.
+     * 
+     * @param string $filename 
+     * @return void
+     */
+    public function __construct($filename=null) {
+
+        if (!is_null($filename))
+            $this->loadFile($filename);
+
+    }
+
+    /**
+     * Loads an htdigest-formatted file. This method can be called multiple times if
+     * more than 1 file is used.
+     * 
+     * @param string $filename 
+     * @return void
+     */
+    public function loadFile($filename) {
+
+        foreach(file($filename,FILE_IGNORE_NEW_LINES) as $line) {
+
+            if (substr_count($line, ":") !== 2) 
+                throw new Sabre_DAV_Exception('Malformed htdigest file. Every line should contain 2 colons');
+            
+            list($username,$realm,$A1) = explode(':',$line);
+
+            if (!preg_match('/^[a-zA-Z0-9]{32}$/', $A1))
+                throw new Sabre_DAV_Exception('Malformed htdigest file. Invalid md5 hash');
+                
+            $this->users[$realm . ':' . $username] = $A1;
+
+        }
+
+    }
+
+    /**
+     * Returns a users' information
+     * 
+     * @param string $realm 
+     * @param string $username 
+     * @return string 
+     */
+    public function getDigestHash($realm, $username) {
+
+        return isset($this->users[$realm . ':' . $username])?$this->users[$realm . ':' . $username]:false;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/PDO.php b/3rdparty/Sabre/DAV/Auth/Backend/PDO.php
new file mode 100644
index 00000000000..0301503601e
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Backend/PDO.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * This is an authentication backend that uses a file to manage passwords.
+ *
+ * The backend file must conform to Apache's htdigest format
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Backend_PDO extends Sabre_DAV_Auth_Backend_AbstractDigest {
+
+    /**
+     * Reference to PDO connection 
+     * 
+     * @var PDO 
+     */
+    protected $pdo;
+
+    /**
+     * PDO table name we'll be using  
+     * 
+     * @var string
+     */
+    protected $tableName;
+
+
+    /**
+     * Creates the backend object. 
+     *
+     * If the filename argument is passed in, it will parse out the specified file fist.
+     * 
+     * @param string $filename
+     * @param string $tableName The PDO table name to use 
+     * @return void
+     */
+    public function __construct(PDO $pdo, $tableName = 'users') {
+
+        $this->pdo = $pdo;
+        $this->tableName = $tableName;
+
+    }
+
+    /**
+     * Returns the digest hash for a user. 
+     * 
+     * @param string $realm 
+     * @param string $username 
+     * @return string|null 
+     */
+    public function getDigestHash($realm,$username) {
+
+        $stmt = $this->pdo->prepare('SELECT username, digesta1 FROM `'.$this->tableName.'` WHERE username = ?');
+        $stmt->execute(array($username));
+        $result = $stmt->fetchAll();
+
+        if (!count($result)) return;
+
+        return $result[0]['digesta1'];
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Auth/IBackend.php b/3rdparty/Sabre/DAV/Auth/IBackend.php
new file mode 100644
index 00000000000..1f67af4c2d9
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/IBackend.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * This is the base class for any authentication object.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_Auth_IBackend {
+
+    /**
+     * Authenticates the user based on the current request.
+     *
+     * If authentication is succesful, true must be returned.
+     * If authentication fails, an exception must be thrown.
+     *
+     * @return bool 
+     */
+    function authenticate(Sabre_DAV_Server $server,$realm); 
+
+    /**
+     * Returns information about the currently logged in username.
+     *
+     * If nobody is currently logged in, this method should return null.
+     * 
+     * @return string|null
+     */
+    function getCurrentUser();
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Auth/Plugin.php b/3rdparty/Sabre/DAV/Auth/Plugin.php
new file mode 100644
index 00000000000..f3718fcf469
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Auth/Plugin.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * This plugin provides Authentication for a WebDAV server.
+ * 
+ * It relies on a Backend object, which provides user information.
+ *
+ * Additionally, it provides support for:
+ *  * {DAV:}current-user-principal property from RFC5397
+ *  * {DAV:}principal-collection-set property from RFC3744
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Reference to main server object 
+     * 
+     * @var Sabre_DAV_Server 
+     */
+    private $server;
+
+    /**
+     * Authentication backend
+     * 
+     * @var Sabre_DAV_Auth_Backend_Abstract 
+     */
+    private $authBackend;
+
+    /**
+     * The authentication realm. 
+     * 
+     * @var string 
+     */
+    private $realm;
+
+    /**
+     * __construct 
+     * 
+     * @param Sabre_DAV_Auth_Backend_Abstract $authBackend 
+     * @param string $realm 
+     * @return void
+     */
+    public function __construct(Sabre_DAV_Auth_IBackend $authBackend, $realm) {
+
+        $this->authBackend = $authBackend;
+        $this->realm = $realm;
+
+    }
+
+    /**
+     * Initializes the plugin. This function is automatically called by the server  
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),10);
+
+    }
+
+    /**
+     * Returns a plugin name.
+     * 
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre_DAV_Server::getPlugin 
+     * 
+     * @return string 
+     */
+    public function getPluginName() {
+
+        return 'auth';
+
+    }
+
+    /**
+     * Returns the current users' principal uri.
+     * 
+     * If nobody is logged in, this will return null. 
+     * 
+     * @return string|null 
+     */
+    public function getCurrentUser() {
+
+        $userInfo = $this->authBackend->getCurrentUser();
+        if (!$userInfo) return null;
+
+        return $userInfo;
+
+    }
+
+    /**
+     * This method is called before any HTTP method and forces users to be authenticated
+     * 
+     * @param string $method
+     * @throws Sabre_DAV_Exception_NotAuthenticated
+     * @return bool 
+     */
+    public function beforeMethod($method, $uri) {
+
+        $this->authBackend->authenticate($this->server,$this->realm);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Browser/GuessContentType.php b/3rdparty/Sabre/DAV/Browser/GuessContentType.php
new file mode 100644
index 00000000000..ee8c698d782
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Browser/GuessContentType.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * GuessContentType plugin
+ *
+ * A lot of the built-in File objects just return application/octet-stream
+ * as a content-type by default. This is a problem for some clients, because
+ * they expect a correct contenttype.
+ *
+ * There's really no accurate, fast and portable way to determine the contenttype
+ * so this extension does what the rest of the world does, and guesses it based
+ * on the file extension.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Browser_GuessContentType extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * List of recognized file extensions
+     *
+     * Feel free to add more
+     *
+     * @var array
+     */
+    public $extensionMap = array(
+
+        // images
+        'jpg' => 'image/jpeg',
+        'gif' => 'image/gif',
+        'png' => 'image/png',
+
+        // groupware
+        'ics' => 'text/calendar',
+        'vcf' => 'text/x-vcard',
+
+        // text
+        'txt' => 'text/plain',
+
+    );
+
+    /**
+     * Initializes the plugin 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        // Using a relatively low priority (200) to allow other extensions
+        // to set the content-type first.
+        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'),200);
+
+    }
+
+    /**
+     * Handler for teh afterGetProperties event 
+     * 
+     * @param string $path 
+     * @param array $properties 
+     * @return void
+     */
+    public function afterGetProperties($path, &$properties) {
+
+        if (array_key_exists('{DAV:}getcontenttype', $properties[404])) {
+           
+            list(, $fileName) = Sabre_DAV_URLUtil::splitPath($path);
+            $contentType = $this->getContentType($fileName);
+
+            if ($contentType) {
+                $properties[200]['{DAV:}getcontenttype'] = $contentType;
+                unset($properties[404]['{DAV:}getcontenttype']);
+            }
+
+        }
+
+    }
+
+    /**
+     * Simple method to return the contenttype
+     * 
+     * @param string $fileName 
+     * @return string 
+     */
+    protected function getContentType($fileName) {
+
+        // Just grabbing the extension
+        $extension = strtolower(substr($fileName,strrpos($fileName,'.')+1));
+        if (isset($this->extensionMap[$extension]))
+            return $this->extensionMap[$extension];
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php b/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
new file mode 100644
index 00000000000..a66b57a3a90
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * This is a simple plugin that will map any GET request for non-files to 
+ * PROPFIND allprops-requests.
+ *
+ * This should allow easy debugging of PROPFIND
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Browser_MapGetToPropFind extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * reference to server class 
+     * 
+     * @var Sabre_DAV_Server 
+     */
+    protected $server;
+
+    /**
+     * Initializes the plugin and subscribes to events 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
+    }
+
+    /**
+     * This method intercepts GET requests to non-files, and changes it into an HTTP PROPFIND request 
+     * 
+     * @param string $method 
+     * @return bool 
+     */
+    public function httpGetInterceptor($method, $uri) {
+
+        if ($method!='GET') return true;
+       
+        $node = $this->server->tree->getNodeForPath($uri);
+        if ($node instanceof Sabre_DAV_IFile) return;
+
+        $this->server->invokeMethod('PROPFIND',$uri);
+        return false;
+        
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Browser/Plugin.php b/3rdparty/Sabre/DAV/Browser/Plugin.php
new file mode 100644
index 00000000000..cd5617babb1
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Browser/Plugin.php
@@ -0,0 +1,285 @@
+<?php
+
+/**
+ * Browser Plugin
+ *
+ * This plugin provides a html representation, so that a WebDAV server may be accessed
+ * using a browser.
+ *
+ * The class intercepts GET requests to collection resources and generates a simple 
+ * html index. 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Browser_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * reference to server class 
+     * 
+     * @var Sabre_DAV_Server 
+     */
+    protected $server;
+
+    /**
+     * enableEditing
+     * 
+     * @var bool 
+     */
+    protected $enablePost = true;
+
+    /**
+     * Creates the object.
+     *
+     * By default it will allow file creation and uploads.
+     * Specify the first argument as false to disable this
+     * 
+     * @param bool $enablePost 
+     * @return void
+     */
+    public function __construct($enablePost=true) {
+
+        $this->enablePost = $enablePost; 
+
+    }
+
+    /**
+     * Initializes the plugin and subscribes to events 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
+        if ($this->enablePost) $this->server->subscribeEvent('unknownMethod',array($this,'httpPOSTHandler'));
+    }
+
+    /**
+     * This method intercepts GET requests to collections and returns the html 
+     * 
+     * @param string $method 
+     * @return bool 
+     */
+    public function httpGetInterceptor($method, $uri) {
+
+        if ($method!='GET') return true;
+
+        try { 
+            $node = $this->server->tree->getNodeForPath($uri);
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+            // We're simply stopping when the file isn't found to not interfere 
+            // with other plugins.
+            return;
+        }
+        if ($node instanceof Sabre_DAV_IFile) 
+            return;
+
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->setHeader('Content-Type','text/html; charset=utf-8');
+
+        $this->server->httpResponse->sendBody(
+            $this->generateDirectoryIndex($uri)
+        );
+
+        return false;
+        
+    }
+
+    /**
+     * Handles POST requests for tree operations
+     * 
+     * This method is not yet used.
+     * 
+     * @param string $method 
+     * @return bool
+     */
+    public function httpPOSTHandler($method, $uri) {
+
+        if ($method!='POST') return true;
+        if (isset($_POST['sabreAction'])) switch($_POST['sabreAction']) {
+
+            case 'mkcol' :
+                if (isset($_POST['name']) && trim($_POST['name'])) {
+                    // Using basename() because we won't allow slashes
+                    list(, $folderName) = Sabre_DAV_URLUtil::splitPath(trim($_POST['name']));
+                    $this->server->createDirectory($uri . '/' . $folderName);
+                }
+                break;
+            case 'put' :
+                if ($_FILES) $file = current($_FILES);
+                else break;
+                $newName = trim($file['name']);
+                list(, $newName) = Sabre_DAV_URLUtil::splitPath(trim($file['name']));
+                if (isset($_POST['name']) && trim($_POST['name']))
+                    $newName = trim($_POST['name']);
+
+                // Making sure we only have a 'basename' component
+                list(, $newName) = Sabre_DAV_URLUtil::splitPath($newName);
+                    
+               
+                if (is_uploaded_file($file['tmp_name'])) {
+                    $parent = $this->server->tree->getNodeForPath(trim($uri,'/'));
+                    $parent->createFile($newName,fopen($file['tmp_name'],'r'));
+                }
+
+        }
+        $this->server->httpResponse->setHeader('Location',$this->server->httpRequest->getUri());
+        return false;
+
+    }
+
+    /**
+     * Escapes a string for html. 
+     * 
+     * @param string $value 
+     * @return void
+     */
+    public function escapeHTML($value) {
+
+        return htmlspecialchars($value,ENT_QUOTES,'UTF-8');
+
+    }
+
+    /**
+     * Generates the html directory index for a given url 
+     *
+     * @param string $path 
+     * @return string 
+     */
+    public function generateDirectoryIndex($path) {
+
+        $html = "<html>
+<head>
+  <title>Index for " . $this->escapeHTML($path) . "/ - SabreDAV " . Sabre_DAV_Version::VERSION . "</title>
+  <style type=\"text/css\"> body { Font-family: arial}</style>
+</head>
+<body>
+  <h1>Index for " . $this->escapeHTML($path) . "/</h1>
+  <table>
+    <tr><th>Name</th><th>Type</th><th>Size</th><th>Last modified</th></tr>
+    <tr><td colspan=\"4\"><hr /></td></tr>";
+    
+    $files = $this->server->getPropertiesForPath($path,array(
+        '{DAV:}displayname',
+        '{DAV:}resourcetype',
+        '{DAV:}getcontenttype',
+        '{DAV:}getcontentlength',
+        '{DAV:}getlastmodified',
+    ),1);
+
+    $parent = $this->server->tree->getNodeForPath($path);
+
+
+    if ($path) {
+
+        list($parentUri) = Sabre_DAV_URLUtil::splitPath($path);
+        $fullPath = Sabre_DAV_URLUtil::encodePath($this->server->getBaseUri() . $parentUri);
+
+        $html.= "<tr>
+<td><a href=\"{$fullPath}\">..</a></td>
+<td>[parent]</td>
+<td></td>
+<td></td>
+</tr>";
+
+    }
+
+    foreach($files as $k=>$file) {
+
+        // This is the current directory, we can skip it
+        if (rtrim($file['href'],'/')==$path) continue;
+
+        list(, $name) = Sabre_DAV_URLUtil::splitPath($file['href']);
+
+        $type = null;
+
+
+        if (isset($file[200]['{DAV:}resourcetype'])) {
+            $type = $file[200]['{DAV:}resourcetype']->getValue();
+
+            // resourcetype can have multiple values
+            if (!is_array($type)) $type = array($type);
+
+            foreach($type as $k=>$v) { 
+
+                // Some name mapping is preferred 
+                switch($v) {
+                    case '{DAV:}collection' :
+                        $type[$k] = 'Collection';
+                        break;
+                    case '{DAV:}principal' :
+                        $type[$k] = 'Principal';
+                        break;
+                    case '{urn:ietf:params:xml:ns:carddav}addressbook' :
+                        $type[$k] = 'Addressbook';
+                        break;
+                    case '{urn:ietf:params:xml:ns:caldav}calendar' :
+                        $type[$k] = 'Calendar';
+                        break;
+                }
+
+            }
+            $type = implode(', ', $type);
+        }
+
+        // If no resourcetype was found, we attempt to use
+        // the contenttype property
+        if (!$type && isset($file[200]['{DAV:}getcontenttype'])) {
+            $type = $file[200]['{DAV:}getcontenttype'];
+        }
+        if (!$type) $type = 'Unknown';
+
+        $size = isset($file[200]['{DAV:}getcontentlength'])?(int)$file[200]['{DAV:}getcontentlength']:'';
+        $lastmodified = isset($file[200]['{DAV:}getlastmodified'])?$file[200]['{DAV:}getlastmodified']->getTime()->format(DateTime::ATOM):'';
+
+        $fullPath = Sabre_DAV_URLUtil::encodePath('/' . trim($this->server->getBaseUri() . ($path?$path . '/':'') . $name,'/'));
+
+        $displayName = isset($file[200]['{DAV:}displayname'])?$file[200]['{DAV:}displayname']:$name;
+
+        $name = $this->escapeHTML($name);
+        $displayName = $this->escapeHTML($displayName);
+        $type = $this->escapeHTML($type);
+
+        $html.= "<tr>
+<td><a href=\"{$fullPath}\">{$displayName}</a></td>
+<td>{$type}</td>
+<td>{$size}</td>
+<td>{$lastmodified}</td>
+</tr>";
+
+    }
+
+  $html.= "<tr><td colspan=\"4\"><hr /></td></tr>";
+
+  if ($this->enablePost && $parent instanceof Sabre_DAV_ICollection) {
+      $html.= '<tr><td><form method="post" action="">
+            <h3>Create new folder</h3>
+            <input type="hidden" name="sabreAction" value="mkcol" />
+            Name: <input type="text" name="name" /><br />
+            <input type="submit" value="create" />
+            </form>
+            <form method="post" action="" enctype="multipart/form-data">
+            <h3>Upload file</h3>
+            <input type="hidden" name="sabreAction" value="put" />
+            Name (optional): <input type="text" name="name" /><br />
+            File: <input type="file" name="file" /><br />
+            <input type="submit" value="upload" />
+            </form>
+       </td></tr>';
+  }
+
+  $html.= "</table>
+  <address>Generated by SabreDAV " . Sabre_DAV_Version::VERSION ."-". Sabre_DAV_Version::STABILITY . " (c)2007-2011 <a href=\"http://code.google.com/p/sabredav/\">http://code.google.com/p/sabredav/</a></address>
+</body>
+</html>";
+
+        return $html; 
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Client.php b/3rdparty/Sabre/DAV/Client.php
new file mode 100644
index 00000000000..fc6a6fff083
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Client.php
@@ -0,0 +1,431 @@
+<?php
+
+/**
+ * SabreDAV DAV client
+ *
+ * This client wraps around Curl to provide a convenient API to a WebDAV 
+ * server.
+ *
+ * NOTE: This class is experimental, it's api will likely change in the future.
+ * 
+ * @package Sabre
+ * @subpackage DAVClient
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Client {
+
+    public $propertyMap = array();
+
+    protected $baseUri;
+    protected $userName;
+    protected $password;
+    protected $proxy;
+
+    /**
+     * Constructor
+     *
+     * Settings are provided through the 'settings' argument. The following 
+     * settings are supported:
+     *
+     *   * baseUri
+     *   * userName (optional)
+     *   * password (optional)
+     *   * proxy (optional)
+     * 
+     * @param array $settings 
+     */
+    public function __construct(array $settings) {
+
+        if (!isset($settings['baseUri'])) {
+            throw new InvalidArgumentException('A baseUri must be provided');
+        }
+        
+        $validSettings = array(
+            'baseUri',
+            'userName',
+            'password',
+            'proxy'
+        );
+
+        foreach($validSettings as $validSetting) {
+            if (isset($settings[$validSetting])) {
+                $this->$validSetting = $settings[$validSetting];
+            }
+        }
+
+        $this->propertyMap['{DAV:}resourcetype'] = 'Sabre_DAV_Property_ResourceType';
+
+    }
+
+    /**
+     * Does a PROPFIND request
+     *
+     * The list of requested properties must be specified as an array, in clark 
+     * notation. 
+     *
+     * The returned array will contain a list of filenames as keys, and 
+     * properties as values.
+     *
+     * The properties array will contain the list of properties. Only properties 
+     * that are actually returned from the server (without error) will be 
+     * returned, anything else is discarded.
+     *
+     * Depth should be either 0 or 1. A depth of 1 will cause a request to be 
+     * made to the server to also return all child resources.
+     *
+     * @param string $url 
+     * @param array $properties 
+     * @param int $depth 
+     * @return array 
+     */
+    public function propFind($url, array $properties, $depth = 0) {
+
+        $body = '<?xml version="1.0"?>' . "\n";
+        $body.= '<d:propfind xmlns:d="DAV:">' . "\n";
+        $body.= '  <d:prop>' . "\n";
+
+        foreach($properties as $property) {
+
+            list(
+                $namespace,
+                $elementName
+            ) = Sabre_DAV_XMLUtil::parseClarkNotation($property);
+
+            if ($namespace === 'DAV:') {
+                $body.='    <d:' . $elementName . ' />' . "\n";
+            } else {
+                $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\"/>\n";
+            }
+
+        }
+
+        $body.= '  </d:prop>' . "\n";
+        $body.= '</d:propfind>';
+
+        $response = $this->request('PROPFIND', $url, $body, array(
+            'Depth' => $depth,
+            'Content-Type' => 'application/xml'
+        ));
+
+        $result = $this->parseMultiStatus($response['body']);
+
+        // If depth was 0, we only return the top item
+        if ($depth===0) {
+            reset($result);
+            $result = current($result);
+            return $result[200];
+        }
+
+        $newResult = array();
+        foreach($result as $href => $statusList) {
+
+            $newResult[$href] = $statusList[200];
+
+        }
+
+        return $newResult;
+
+    }
+
+    /**
+     * Updates a list of properties on the server
+     *
+     * The list of properties must have clark-notation properties for the keys, 
+     * and the actual (string) value for the value. If the value is null, an 
+     * attempt is made to delete the property. 
+     *
+     * @todo Must be building the request using the DOM, and does not yet 
+     *       support complex properties. 
+     * @param string $url 
+     * @param array $properties 
+     * @return void
+     */
+    public function propPatch($url, array $properties) {
+
+        $body = '<?xml version="1.0"?>' . "\n";
+        $body.= '<d:propertyupdate xmlns:d="DAV:">' . "\n";
+
+        foreach($properties as $propName => $propValue) {
+
+            list(
+                $namespace,
+                $elementName
+            ) = Sabre_DAV_XMLUtil::parseClarkNotation($propName);
+
+            if ($propValue === null) {
+
+                $body.="<d:remove><d:prop>\n";
+
+                if ($namespace === 'DAV:') {
+                    $body.='    <d:' . $elementName . ' />' . "\n";
+                } else {
+                    $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\"/>\n";
+                }
+
+                $body.="</d:prop></d:remove>\n";
+
+            } else {
+
+                $body.="<d:set><d:prop>\n";
+                if ($namespace === 'DAV:') {
+                    $body.='    <d:' . $elementName . '>';
+                } else {
+                    $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\">";
+                }
+                // Shitty.. i know
+                $body.=htmlspecialchars($propValue, ENT_NOQUOTES, 'UTF-8'); 
+                if ($namespace === 'DAV:') {
+                    $body.='</d:' . $elementName . '>' . "\n";
+                } else {
+                    $body.="</x:" . $elementName . ">\n";
+                }
+                $body.="</d:prop></d:set>\n";
+
+            }
+
+        }
+
+        $body.= '</d:propertyupdate>';
+
+        $response = $this->request('PROPPATCH', $url, $body, array(
+            'Content-Type' => 'application/xml'
+        ));
+
+    }
+
+    /**
+     * Performs an HTTP options request
+     *
+     * This method returns all the features from the 'DAV:' header as an array. 
+     * If there was no DAV header, or no contents this method will return an 
+     * empty array. 
+     * 
+     * @return array 
+     */
+    public function options() {
+
+        $result = $this->request('OPTIONS');
+        if (!isset($result['headers']['dav'])) {
+            return array();
+        }
+
+        $features = explode(',', $result['headers']['dav']);
+        foreach($features as &$v) {
+            $v = trim($v);
+        }
+        return $features;
+
+    }
+
+    /**
+     * Performs an actual HTTP request, and returns the result.
+     *
+     * If the specified url is relative, it will be expanded based on the base 
+     * url.
+     *
+     * The returned array contains 3 keys:
+     *   * body - the response body
+     *   * httpCode - a HTTP code (200, 404, etc)
+     *   * headers - a list of response http headers. The header names have 
+     *     been lowercased.
+     *
+     * @param string $method 
+     * @param string $url 
+     * @param string $body 
+     * @param array $headers 
+     * @return array 
+     */
+    public function request($method, $url = '', $body = null, $headers = array()) {
+
+        $url = $this->getAbsoluteUrl($url);
+
+        $curlSettings = array(
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_CUSTOMREQUEST => $method,
+            CURLOPT_POSTFIELDS => $body,
+            // Return headers as part of the response
+            CURLOPT_HEADER => true
+        );
+
+        // Adding HTTP headers
+        $nHeaders = array(); 
+        foreach($headers as $key=>$value) {
+
+            $nHeaders[] = $key . ': ' . $value;
+
+        }
+        $curlSettings[CURLOPT_HTTPHEADER] = $nHeaders;
+
+        if ($this->proxy) {
+            $curlSettings[CURLOPT_PROXY] = $this->proxy;
+        }
+
+        if ($this->userName) {
+            $curlSettings[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC | CURLAUTH_DIGEST;
+            $curlSettings[CURLOPT_USERPWD] = $this->userName . ':' . $this->password;
+        }
+
+        list(
+            $response,
+            $curlInfo,
+            $curlErrNo,
+            $curlError
+        ) = $this->curlRequest($url, $curlSettings);
+
+        $headerBlob = substr($response, 0, $curlInfo['header_size']);
+        $response = substr($response, $curlInfo['header_size']);
+
+        // In the case of 100 Continue, or redirects we'll have multiple lists 
+        // of headers for each separate HTTP response. We can easily split this 
+        // because they are separated by \r\n\r\n
+        $headerBlob = explode("\r\n\r\n", trim($headerBlob, "\r\n"));
+        
+        // We only care about the last set of headers
+        $headerBlob = $headerBlob[count($headerBlob)-1];
+
+        // Splitting headers
+        $headerBlob = explode("\r\n", $headerBlob);
+        
+        $headers = array();
+        foreach($headerBlob as $header) {
+            $parts = explode(':', $header, 2);
+            if (count($parts)==2) {
+                $headers[strtolower(trim($parts[0]))] = trim($parts[1]);
+            }
+        }
+
+        $response = array(
+            'body' => $response,
+            'statusCode' => $curlInfo['http_code'],
+            'headers' => $headers
+        );
+
+        if ($curlErrNo) {
+            throw new Sabre_DAV_Exception('[CURL] Error while making request: ' . $curlError . ' (error code: ' . $curlErrNo . ')');
+        } 
+
+        if ($response['statusCode']>=400) {
+            throw new Sabre_DAV_Exception('HTTP error response. (errorcode ' . $response['statusCode'] . ')');
+        }
+
+        return $response;
+
+    }
+
+    /**
+     * Wrapper for all curl functions.
+     *
+     * The only reason this was split out in a separate method, is so it 
+     * becomes easier to unittest. 
+     *
+     * @param string $url
+     * @param array $settings 
+     * @return  
+     */
+    protected function curlRequest($url, $settings) {
+
+        $curl = curl_init($url);
+        curl_setopt_array($curl, $settings);
+
+        return array(
+            curl_exec($curl),
+            curl_getinfo($curl),
+            curl_errno($curl),
+            curl_error($curl)
+        );
+
+    }
+
+    /**
+     * Returns the full url based on the given url (which may be relative). All 
+     * urls are expanded based on the base url as given by the server. 
+     * 
+     * @param string $url 
+     * @return string 
+     */
+    protected function getAbsoluteUrl($url) {
+
+        // If the url starts with http:// or https://, the url is already absolute. 
+        if (preg_match('/^http(s?):\/\//', $url)) {
+            return $url;
+        }
+
+        // If the url starts with a slash, we must calculate the url based off 
+        // the root of the base url.
+        if (strpos($url,'/') === 0) {
+            $parts = parse_url($this->baseUri);
+            return $parts['scheme'] . '://' . $parts['host'] . (isset($parts['port'])?':' . $parts['port']:'') . $url;
+        }
+
+        // Otherwise...
+        return $this->baseUri . $url;
+
+    }
+
+    /**
+     * Parses a WebDAV multistatus response body
+     * 
+     * This method returns an array with the following structure
+     *
+     * array(
+     *   'url/to/resource' => array(
+     *     '200' => array(
+     *        '{DAV:}property1' => 'value1',
+     *        '{DAV:}property2' => 'value2',
+     *     ),
+     *     '404' => array(
+     *        '{DAV:}property1' => null,
+     *        '{DAV:}property2' => null,
+     *     ),
+     *   )
+     *   'url/to/resource2' => array(
+     *      .. etc ..
+     *   )
+     * )
+     *
+     *
+     * @param string $body xml body
+     * @return array 
+     */
+    public function parseMultiStatus($body) {
+
+        $body = Sabre_DAV_XMLUtil::convertDAVNamespace($body);
+
+        $responseXML = simplexml_load_string($body, null, LIBXML_NOBLANKS | LIBXML_NOCDATA);
+        if ($responseXML===false) {
+            throw new InvalidArgumentException('The passed data is not valid XML');
+        }
+         
+        $responseXML->registerXPathNamespace('d','DAV:');
+
+        $propResult = array();
+
+        foreach($responseXML->xpath('d:response') as $response) {
+
+            $response->registerXPathNamespace('d','DAV:');
+            $href = $response->xpath('d:href');
+            $href = (string)$href[0];
+
+            $properties = array();
+
+            foreach($response->xpath('d:propstat') as $propStat) {
+
+                $propStat->registerXPathNamespace('d','DAV:');
+                $status = $propStat->xpath('d:status');
+                list($httpVersion, $statusCode, $message) = explode(' ', (string)$status[0],3);
+
+                $properties[$statusCode] = Sabre_DAV_XMLUtil::parseProperties(dom_import_simplexml($propStat), $this->propertyMap); 
+
+            }
+
+            $propResult[$href] = $properties;
+
+        }
+
+        return $propResult;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Collection.php b/3rdparty/Sabre/DAV/Collection.php
new file mode 100644
index 00000000000..9da04c12792
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Collection.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * Collection class
+ *
+ * This is a helper class, that should aid in getting collections classes setup.
+ * Most of its methods are implemented, and throw permission denied exceptions 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Collection extends Sabre_DAV_Node implements Sabre_DAV_ICollection {
+
+    /**
+     * Returns a child object, by its name.
+     *
+     * This method makes use of the getChildren method to grab all the child nodes, and compares the name. 
+     * Generally its wise to override this, as this can usually be optimized
+     * 
+     * @param string $name
+     * @throws Sabre_DAV_Exception_FileNotFound
+     * @return Sabre_DAV_INode 
+     */
+    public function getChild($name) {
+
+        foreach($this->getChildren() as $child) {
+
+            if ($child->getName()==$name) return $child;
+
+        }
+        throw new Sabre_DAV_Exception_FileNotFound('File not found: ' . $name);
+
+    }
+
+    /**
+     * Checks is a child-node exists.
+     *
+     * It is generally a good idea to try and override this. Usually it can be optimized.
+     * 
+     * @param string $name 
+     * @return bool 
+     */
+    public function childExists($name) {
+
+        try {
+
+            $this->getChild($name);
+            return true;
+
+        } catch(Sabre_DAV_Exception_FileNotFound $e) {
+
+            return false;
+
+        }
+
+    }
+
+    /**
+     * Creates a new file in the directory 
+     * 
+     * @param string $name Name of the file 
+     * @param resource $data Initial payload, passed as a readable stream resource. 
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function createFile($name, $data = null) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create file (filename ' . $name . ')');
+
+    }
+
+    /**
+     * Creates a new subdirectory 
+     * 
+     * @param string $name 
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create directory');
+
+    }
+
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Directory.php b/3rdparty/Sabre/DAV/Directory.php
new file mode 100644
index 00000000000..86af4827b3e
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Directory.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Directory class
+ *
+ * This class is now deprecated in favor of the Sabre_DAV_Collection class.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @deprecated Use Sabre_DAV_Collection instead
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Directory extends Sabre_DAV_Collection {
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception.php b/3rdparty/Sabre/DAV/Exception.php
new file mode 100644
index 00000000000..61f8b87c0a6
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * SabreDAV base exception
+ *
+ * This is SabreDAV's base exception file, use this to implement your own exception.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+/**
+ * Main Exception class. 
+ *
+ * This class defines a getHTTPCode method, which should return the appropriate HTTP code for the Exception occured.
+ * The default for this is 500.
+ *
+ * This class also allows you to generate custom xml data for your exceptions. This will be displayed
+ * in the 'error' element in the failing response.
+ */
+class Sabre_DAV_Exception extends Exception { 
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() { 
+
+        return 500;
+
+    }
+
+    /**
+     * This method allows the exception to include additonal information into the WebDAV error response 
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+    
+
+    }
+
+    /**
+     * This method allows the exception to return any extra HTTP response headers.
+     *
+     * The headers must be returned as an array.
+     * 
+     * @return array 
+     */
+    public function getHTTPHeaders(Sabre_DAV_Server $server) {
+
+        return array();
+
+    } 
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception/BadRequest.php b/3rdparty/Sabre/DAV/Exception/BadRequest.php
new file mode 100644
index 00000000000..7025bb10317
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/BadRequest.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * BadRequest
+ *
+ * The BadRequest is thrown when the user submitted an invalid HTTP request
+ * BadRequest 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_BadRequest extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 400; 
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/Conflict.php b/3rdparty/Sabre/DAV/Exception/Conflict.php
new file mode 100644
index 00000000000..7eaa08178ae
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/Conflict.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Conflict
+ *
+ * A 409 Conflict is thrown when a user tried to make a directory over an existing
+ * file or in a parent directory that doesn't exist.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_Conflict extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 409;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/ConflictingLock.php b/3rdparty/Sabre/DAV/Exception/ConflictingLock.php
new file mode 100644
index 00000000000..279f63dfde7
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/ConflictingLock.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * ConflictingLock 
+ *
+ * Similar to Exception_Locked, this exception thrown when a LOCK request 
+ * was made, on a resource which was already locked
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_ConflictingLock extends Sabre_DAV_Exception_Locked {
+
+    /**
+     * This method allows the exception to include additonal information into the WebDAV error response 
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+        
+        if ($this->lock) {
+            $error = $errorNode->ownerDocument->createElementNS('DAV:','d:no-conflicting-lock');
+            $errorNode->appendChild($error);
+            if (!is_object($this->lock)) var_dump($this->lock);
+            $error->appendChild($errorNode->ownerDocument->createElementNS('DAV:','d:href',$this->lock->uri));
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/FileNotFound.php b/3rdparty/Sabre/DAV/Exception/FileNotFound.php
new file mode 100644
index 00000000000..b20e4a2fb3f
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/FileNotFound.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * FileNotFound
+ *
+ * This Exception is thrown when a Node couldn't be found. It returns HTTP error code 404
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_FileNotFound extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 404;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception/Forbidden.php b/3rdparty/Sabre/DAV/Exception/Forbidden.php
new file mode 100644
index 00000000000..167f3c2760a
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/Forbidden.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Forbidden
+ *
+ * This exception is thrown whenever a user tries to do an operation he's not allowed to
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_Forbidden extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 403;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php b/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
new file mode 100644
index 00000000000..15007cdd352
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/InsufficientStorage.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * InsufficientStorage 
+ *
+ * This Exception can be thrown, when for example a harddisk is full or a quota is exceeded
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_InsufficientStorage extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 507;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php b/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
new file mode 100644
index 00000000000..f06810a25ef
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/InvalidResourceType.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * InvalidResourceType 
+ *
+ * This exception is thrown when the user tried to create a new collection, with
+ * a special resourcetype value that was not recognized by the server.
+ *
+ * See RFC5689 section 3.3
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_InvalidResourceType extends Sabre_DAV_Exception_Forbidden { 
+
+    /**
+     * This method allows the exception to include additonal information into the WebDAV error response 
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:valid-resourcetype');
+        $errorNode->appendChild($error);
+
+    }
+    
+}
diff --git a/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php b/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
new file mode 100644
index 00000000000..47032cffc75
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * LockTokenMatchesRequestUri 
+ *
+ * This exception is thrown by UNLOCK if a supplied lock-token is invalid 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_LockTokenMatchesRequestUri extends Sabre_DAV_Exception_Conflict {
+
+    /**
+     * Creates the exception
+     */
+    public function __construct() {
+
+        $this->message = 'The locktoken supplied does not match any locks on this entity';
+
+    }
+
+    /**
+     * This method allows the exception to include additonal information into the WebDAV error response 
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:lock-token-matches-request-uri');
+        $errorNode->appendChild($error);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/Locked.php b/3rdparty/Sabre/DAV/Exception/Locked.php
new file mode 100644
index 00000000000..b4bb2e0378c
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/Locked.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Locked 
+ *
+ * The 423 is thrown when a client tried to access a resource that was locked, without supplying a valid lock token
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_Locked extends Sabre_DAV_Exception {
+
+    /**
+     * Lock information 
+     * 
+     * @var Sabre_DAV_Locks_LockInfo 
+     */
+    protected $lock;
+
+    /**
+     * Creates the exception
+     * 
+     * A LockInfo object should be passed if the user should be informed
+     * which lock actually has the file locked.
+     * 
+     * @param Sabre_DAV_Locks_LockInfo $lock 
+     */
+    public function __construct(Sabre_DAV_Locks_LockInfo $lock = null) {
+
+        $this->lock = $lock;
+
+    }
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 423;
+
+    }
+
+    /**
+     * This method allows the exception to include additonal information into the WebDAV error response 
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+        
+        if ($this->lock) {
+            $error = $errorNode->ownerDocument->createElementNS('DAV:','d:lock-token-submitted');
+            $errorNode->appendChild($error);
+            if (!is_object($this->lock)) var_dump($this->lock);
+            $error->appendChild($errorNode->ownerDocument->createElementNS('DAV:','d:href',$this->lock->uri));
+        }
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php b/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
new file mode 100644
index 00000000000..02c145ffeb6
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/MethodNotAllowed.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * MethodNotAllowed
+ *
+ * The 405 is thrown when a client tried to create a directory on an already existing directory
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_MethodNotAllowed extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 405;
+
+    }
+
+    /**
+     * This method allows the exception to return any extra HTTP response headers.
+     *
+     * The headers must be returned as an array.
+     * 
+     * @return array 
+     */
+    public function getHTTPHeaders(Sabre_DAV_Server $server) {
+
+        $methods = $server->getAllowedMethods($server->getRequestUri());
+
+        return array(
+            'Allow' => strtoupper(implode(', ',$methods)),
+        );
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php b/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
new file mode 100644
index 00000000000..1faffddfa00
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/NotAuthenticated.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * NotAuthenticated
+ *
+ * This exception is thrown when the client did not provide valid
+ * authentication credentials.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_NotAuthenticated extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+        
+        return 401;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/NotImplemented.php b/3rdparty/Sabre/DAV/Exception/NotImplemented.php
new file mode 100644
index 00000000000..cd7f609b09d
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/NotImplemented.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * NotImplemented
+ *
+ * This exception is thrown when the client tried to call an unsupported HTTP method or other feature
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_NotImplemented extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+        
+        return 501;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php b/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
new file mode 100644
index 00000000000..ebcb9f5b9ac
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/PreconditionFailed.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * PreconditionFailed 
+ *
+ * This exception is normally thrown when a client submitted a conditional request, 
+ * like for example an If, If-None-Match or If-Match header, which caused the HTTP 
+ * request to not execute (the condition of the header failed)
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_PreconditionFailed extends Sabre_DAV_Exception {
+
+    /**
+     * When this exception is thrown, the header-name might be set.
+     * 
+     * This allows the exception-catching code to determine which HTTP header
+     * caused the exception.
+     * 
+     * @var string 
+     */
+    public $header = null;
+
+    /**
+     * Create the exception 
+     * 
+     * @param string $message 
+     * @param string $header 
+     */
+    public function __construct($message, $header=null) {
+
+        parent::__construct($message);
+        $this->header = $header;
+
+    } 
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 412; 
+
+    }
+
+    /**
+     * This method allows the exception to include additonal information into the WebDAV error response 
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+        
+        if ($this->header) {
+            $prop = $errorNode->ownerDocument->createElement('s:header');
+            $prop->nodeValue = $this->header;
+            $errorNode->appendChild($prop);
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php b/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
new file mode 100644
index 00000000000..e4ed601b16c
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/ReportNotImplemented.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * ReportNotImplemented
+ *
+ * This exception is thrown when the client requested an unknown report through the REPORT method
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_ReportNotImplemented extends Sabre_DAV_Exception_NotImplemented {
+
+    /**
+     * This method allows the exception to include additonal information into the WebDAV error response 
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:supported-report');
+        $errorNode->appendChild($error);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php b/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
new file mode 100644
index 00000000000..37abbd729d1
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * RequestedRangeNotSatisfiable 
+ *
+ * This exception is normally thrown when the user 
+ * request a range that is out of the entity bounds.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_RequestedRangeNotSatisfiable extends Sabre_DAV_Exception {
+
+    /**
+     * returns the http statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 416;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php b/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
new file mode 100644
index 00000000000..4c37d8997cf
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Exception/UnsupportedMediaType.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * UnSupportedMediaType
+ *
+ * The 415 Unsupported Media Type status code is generally sent back when the client 
+ * tried to call an HTTP method, with a body the server didn't understand
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_UnsupportedMediaType extends Sabre_DAV_Exception { 
+
+    /**
+     * returns the http statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 415;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/FS/Directory.php b/3rdparty/Sabre/DAV/FS/Directory.php
new file mode 100644
index 00000000000..ebd6a6c505e
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FS/Directory.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * Directory class 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_FS_Directory extends Sabre_DAV_FS_Node implements Sabre_DAV_ICollection, Sabre_DAV_IQuota {
+
+    /**
+     * Creates a new file in the directory 
+     * 
+     * data is a readable stream resource
+     *
+     * @param string $name Name of the file 
+     * @param resource $data Initial payload 
+     * @return void
+     */
+    public function createFile($name, $data = null) {
+
+        $newPath = $this->path . '/' . $name;
+        file_put_contents($newPath,$data);
+
+    }
+
+    /**
+     * Creates a new subdirectory 
+     * 
+     * @param string $name 
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        $newPath = $this->path . '/' . $name;
+        mkdir($newPath);
+
+    }
+
+    /**
+     * Returns a specific child node, referenced by its name 
+     * 
+     * @param string $name 
+     * @throws Sabre_DAV_Exception_FileNotFound
+     * @return Sabre_DAV_INode 
+     */
+    public function getChild($name) {
+
+        $path = $this->path . '/' . $name;
+
+        if (!file_exists($path)) throw new Sabre_DAV_Exception_FileNotFound('File with name ' . $path . ' could not be located');
+
+        if (is_dir($path)) {
+
+            return new Sabre_DAV_FS_Directory($path);
+
+        } else {
+
+            return new Sabre_DAV_FS_File($path);
+
+        }
+
+    }
+
+    /**
+     * Returns an array with all the child nodes 
+     * 
+     * @return Sabre_DAV_INode[] 
+     */
+    public function getChildren() {
+
+        $nodes = array();
+        foreach(scandir($this->path) as $node) if($node!='.' && $node!='..') $nodes[] = $this->getChild($node);
+        return $nodes;
+
+    }
+
+    /**
+     * Checks if a child exists. 
+     * 
+     * @param string $name 
+     * @return bool 
+     */
+    public function childExists($name) {
+
+        $path = $this->path . '/' . $name;
+        return file_exists($path);
+
+    }
+
+    /**
+     * Deletes all files in this directory, and then itself 
+     * 
+     * @return void
+     */
+    public function delete() {
+
+        foreach($this->getChildren() as $child) $child->delete();
+        rmdir($this->path);
+
+    }
+
+    /**
+     * Returns available diskspace information 
+     * 
+     * @return array 
+     */
+    public function getQuotaInfo() {
+
+        return array(
+            disk_total_space($this->path)-disk_free_space($this->path),
+            disk_free_space($this->path)
+            ); 
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/FS/File.php b/3rdparty/Sabre/DAV/FS/File.php
new file mode 100644
index 00000000000..262187d7e8a
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FS/File.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * File class 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_FS_File extends Sabre_DAV_FS_Node implements Sabre_DAV_IFile {
+
+    /**
+     * Updates the data 
+     * 
+     * @param resource $data 
+     * @return void 
+     */
+    public function put($data) {
+
+        file_put_contents($this->path,$data);
+
+    }
+
+    /**
+     * Returns the data 
+     * 
+     * @return string 
+     */
+    public function get() {
+
+        return fopen($this->path,'r');
+
+    }
+
+    /**
+     * Delete the current file
+     *
+     * @return void 
+     */
+    public function delete() {
+
+        unlink($this->path);
+
+    }
+
+    /**
+     * Returns the size of the node, in bytes 
+     * 
+     * @return int 
+     */
+    public function getSize() {
+        
+        return filesize($this->path);
+
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     * The ETag is an arbritrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     * 
+     * @return mixed
+     */
+    public function getETag() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return mixed 
+     */ 
+    public function getContentType() {
+
+        return null;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/FS/Node.php b/3rdparty/Sabre/DAV/FS/Node.php
new file mode 100644
index 00000000000..b8d7bcfe846
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FS/Node.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * Base node-class 
+ *
+ * The node class implements the method used by both the File and the Directory classes 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_FS_Node implements Sabre_DAV_INode {
+
+    /**
+     * The path to the current node
+     * 
+     * @var string 
+     */
+    protected $path; 
+
+    /**
+     * Sets up the node, expects a full path name 
+     * 
+     * @param string $path 
+     * @return void
+     */
+    public function __construct($path) {
+
+        $this->path = $path;
+
+    }
+
+
+
+    /**
+     * Returns the name of the node 
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        list(, $name)  = Sabre_DAV_URLUtil::splitPath($this->path);
+        return $name;
+
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path);
+        list(, $newName) = Sabre_DAV_URLUtil::splitPath($name);
+
+        $newPath = $parentPath . '/' . $newName;
+        rename($this->path,$newPath);
+        
+        $this->path = $newPath;
+
+    }
+
+
+
+    /**
+     * Returns the last modification time, as a unix timestamp 
+     * 
+     * @return int 
+     */
+    public function getLastModified() {
+
+        return filemtime($this->path);
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/FSExt/Directory.php b/3rdparty/Sabre/DAV/FSExt/Directory.php
new file mode 100644
index 00000000000..c43d4385ac7
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FSExt/Directory.php
@@ -0,0 +1,135 @@
+<?php
+
+/**
+ * Directory class 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_FSExt_Directory extends Sabre_DAV_FSExt_Node implements Sabre_DAV_ICollection, Sabre_DAV_IQuota {
+
+    /**
+     * Creates a new file in the directory 
+     * 
+     * @param string $name Name of the file 
+     * @param resource $data Initial payload 
+     * @return void
+     */
+    public function createFile($name, $data = null) {
+
+        // We're not allowing dots
+        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
+        $newPath = $this->path . '/' . $name;
+        file_put_contents($newPath,$data);
+
+    }
+
+    /**
+     * Creates a new subdirectory 
+     * 
+     * @param string $name 
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        // We're not allowing dots
+        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
+        $newPath = $this->path . '/' . $name;
+        mkdir($newPath);
+
+    }
+
+    /**
+     * Returns a specific child node, referenced by its name 
+     * 
+     * @param string $name 
+     * @throws Sabre_DAV_Exception_FileNotFound
+     * @return Sabre_DAV_INode 
+     */
+    public function getChild($name) {
+
+        $path = $this->path . '/' . $name;
+
+        if (!file_exists($path)) throw new Sabre_DAV_Exception_FileNotFound('File could not be located');
+        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..'); 
+
+        if (is_dir($path)) {
+
+            return new Sabre_DAV_FSExt_Directory($path);
+
+        } else {
+
+            return new Sabre_DAV_FSExt_File($path);
+
+        }
+
+    }
+
+    /**
+     * Checks if a child exists. 
+     * 
+     * @param string $name 
+     * @return bool 
+     */
+    public function childExists($name) {
+
+        if ($name=='.' || $name=='..')
+            throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
+
+        $path = $this->path . '/' . $name;
+        return file_exists($path);
+
+    }
+
+    /**
+     * Returns an array with all the child nodes 
+     * 
+     * @return Sabre_DAV_INode[] 
+     */
+    public function getChildren() {
+
+        $nodes = array();
+        foreach(scandir($this->path) as $node) if($node!='.' && $node!='..' && $node!='.sabredav') $nodes[] = $this->getChild($node);
+        return $nodes;
+
+    }
+
+    /**
+     * Deletes all files in this directory, and then itself 
+     * 
+     * @return void
+     */
+    public function delete() {
+
+        // Deleting all children
+        foreach($this->getChildren() as $child) $child->delete();
+
+        // Removing resource info, if its still around
+        if (file_exists($this->path . '/.sabredav')) unlink($this->path . '/.sabredav');
+
+        // Removing the directory itself
+        rmdir($this->path);
+
+        return parent::delete();
+
+    }
+
+    /**
+     * Returns available diskspace information 
+     * 
+     * @return array 
+     */
+    public function getQuotaInfo() {
+
+        return array(
+            disk_total_space($this->path)-disk_free_space($this->path),
+            disk_free_space($this->path)
+            ); 
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/FSExt/File.php b/3rdparty/Sabre/DAV/FSExt/File.php
new file mode 100644
index 00000000000..7a8e7a11f21
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FSExt/File.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * File class 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_FSExt_File extends Sabre_DAV_FSExt_Node implements Sabre_DAV_IFile {
+
+    /**
+     * Updates the data 
+     *
+     * data is a readable stream resource.
+     *
+     * @param resource $data 
+     * @return void 
+     */
+    public function put($data) {
+
+        file_put_contents($this->path,$data);
+
+    }
+
+    /**
+     * Returns the data
+     *
+     * @return string 
+     */
+    public function get() {
+
+        return fopen($this->path,'r');
+
+    }
+
+    /**
+     * Delete the current file
+     *
+     * @return void 
+     */
+    public function delete() {
+
+        unlink($this->path);
+        return parent::delete();
+
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     * The ETag is an arbritrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     */
+    public function getETag() {
+
+        return '"' . md5_file($this->path). '"';
+
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     */ 
+    public function getContentType() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns the size of the file, in bytes 
+     * 
+     * @return int 
+     */
+    public function getSize() {
+
+        return filesize($this->path);
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/FSExt/Node.php b/3rdparty/Sabre/DAV/FSExt/Node.php
new file mode 100644
index 00000000000..9e36222bfd3
--- /dev/null
+++ b/3rdparty/Sabre/DAV/FSExt/Node.php
@@ -0,0 +1,276 @@
+<?php
+
+/**
+ * Base node-class 
+ *
+ * The node class implements the method used by both the File and the Directory classes 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_FSExt_Node extends Sabre_DAV_FS_Node implements Sabre_DAV_ILockable, Sabre_DAV_IProperties {
+
+    /**
+     * Returns all the locks on this node
+     * 
+     * @return array 
+     */
+    function getLocks() {
+
+        $resourceData = $this->getResourceData();
+        $locks = $resourceData['locks'];
+        foreach($locks as $k=>$lock) {
+            if (time() > $lock->timeout + $lock->created) unset($locks[$k]); 
+        }
+        return $locks;
+
+    }
+
+    /**
+     * Locks this node 
+     * 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return void
+     */
+    function lock(Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        // We're making the lock timeout 30 minutes
+        $lockInfo->timeout = 1800;
+        $lockInfo->created = time();
+
+        $resourceData = $this->getResourceData();
+        if (!isset($resourceData['locks'])) $resourceData['locks'] = array();
+        $current = null;
+        foreach($resourceData['locks'] as $k=>$lock) {
+            if ($lock->token === $lockInfo->token) $current = $k;
+        }
+        if (!is_null($current)) $resourceData['locks'][$current] = $lockInfo;
+        else $resourceData['locks'][] = $lockInfo;
+
+        $this->putResourceData($resourceData);
+
+    }
+
+    /**
+     * Removes a lock from this node
+     * 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return bool 
+     */
+    function unlock(Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        //throw new Sabre_DAV_Exception('bla');
+        $resourceData = $this->getResourceData();
+        foreach($resourceData['locks'] as $k=>$lock) {
+
+            if ($lock->token === $lockInfo->token) {
+
+                unset($resourceData['locks'][$k]);
+                $this->putResourceData($resourceData);
+                return true;
+
+            }
+        }
+        return false;
+
+    }
+
+    /**
+     * Updates properties on this node,
+     *
+     * @param array $mutations
+     * @see Sabre_DAV_IProperties::updateProperties
+     * @return bool|array 
+     */
+    public function updateProperties($properties) {
+
+        $resourceData = $this->getResourceData();
+        
+        $result = array();
+
+        foreach($properties as $propertyName=>$propertyValue) {
+
+            // If it was null, we need to delete the property
+            if (is_null($propertyValue)) {
+                if (isset($resourceData['properties'][$propertyName])) {
+                    unset($resourceData['properties'][$propertyName]);
+                }
+            } else {
+                $resourceData['properties'][$propertyName] = $propertyValue;
+            }
+               
+        }
+
+        $this->putResourceData($resourceData);
+        return true; 
+    }
+
+    /**
+     * Returns a list of properties for this nodes.;
+     *
+     * The properties list is a list of propertynames the client requested, encoded as xmlnamespace#tagName, for example: http://www.example.org/namespace#author
+     * If the array is empty, all properties should be returned
+     *
+     * @param array $properties 
+     * @return void
+     */
+    function getProperties($properties) {
+
+        $resourceData = $this->getResourceData();
+
+        // if the array was empty, we need to return everything
+        if (!$properties) return $resourceData['properties'];
+
+        $props = array();
+        foreach($properties as $property) {
+            if (isset($resourceData['properties'][$property])) $props[$property] = $resourceData['properties'][$property];
+        }
+
+        return $props;
+
+    }
+
+    /**
+     * Returns the path to the resource file 
+     * 
+     * @return string 
+     */
+    protected function getResourceInfoPath() {
+
+        list($parentDir) = Sabre_DAV_URLUtil::splitPath($this->path);
+        return $parentDir . '/.sabredav';
+
+    }
+
+    /**
+     * Returns all the stored resource information 
+     * 
+     * @return array 
+     */
+    protected function getResourceData() {
+
+        $path = $this->getResourceInfoPath();
+        if (!file_exists($path)) return array('locks'=>array(), 'properties' => array());
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'r');
+        flock($handle,LOCK_SH);
+        $data = '';
+
+        // Reading data until the eof
+        while(!feof($handle)) {
+            $data.=fread($handle,8192);
+        }
+
+        // We're all good
+        fclose($handle);
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        if (!isset($data[$this->getName()])) {
+            return array('locks'=>array(), 'properties' => array());
+        }
+
+        $data = $data[$this->getName()];
+        if (!isset($data['locks'])) $data['locks'] = array();
+        if (!isset($data['properties'])) $data['properties'] = array();
+        return $data;
+
+    }
+
+    /**
+     * Updates the resource information 
+     * 
+     * @param array $newData 
+     * @return void
+     */
+    protected function putResourceData(array $newData) {
+
+        $path = $this->getResourceInfoPath();
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'a+');
+        flock($handle,LOCK_EX);
+        $data = '';
+
+        rewind($handle);
+
+        // Reading data until the eof
+        while(!feof($handle)) {
+            $data.=fread($handle,8192);
+        }
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        $data[$this->getName()] = $newData;
+        ftruncate($handle,0);
+        rewind($handle);
+
+        fwrite($handle,serialize($data));
+        fclose($handle);
+
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path);
+        list(, $newName) = Sabre_DAV_URLUtil::splitPath($name);
+        $newPath = $parentPath . '/' . $newName;
+
+        // We're deleting the existing resourcedata, and recreating it
+        // for the new path.
+        $resourceData = $this->getResourceData();
+        $this->deleteResourceData();
+
+        rename($this->path,$newPath);
+        $this->path = $newPath;
+        $this->putResourceData($resourceData);
+
+
+    }
+
+    public function deleteResourceData() {
+
+        // When we're deleting this node, we also need to delete any resource information
+        $path = $this->getResourceInfoPath();
+        if (!file_exists($path)) return true;
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'a+');
+        flock($handle,LOCK_EX);
+        $data = '';
+
+        rewind($handle);
+
+        // Reading data until the eof
+        while(!feof($handle)) {
+            $data.=fread($handle,8192);
+        }
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        if (isset($data[$this->getName()])) unset($data[$this->getName()]);
+        ftruncate($handle,0);
+        rewind($handle);
+        fwrite($handle,serialize($data));
+        fclose($handle);
+
+    }
+
+    public function delete() {
+
+        return $this->deleteResourceData();
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/File.php b/3rdparty/Sabre/DAV/File.php
new file mode 100644
index 00000000000..b74bd9525b3
--- /dev/null
+++ b/3rdparty/Sabre/DAV/File.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * File class
+ *
+ * This is a helper class, that should aid in getting file classes setup.
+ * Most of its methods are implemented, and throw permission denied exceptions 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_File extends Sabre_DAV_Node implements Sabre_DAV_IFile {
+
+    /**
+     * Updates the data
+     *
+     * data is a readable stream resource.
+     * 
+     * @param resource $data 
+     * @return void 
+     */
+    public function put($data) { 
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to change data');
+
+    }
+
+    /**
+     * Returns the data 
+     *
+     * This method may either return a string or a readable stream resource
+     *
+     * @return mixed 
+     */
+    public function get() { 
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to read this file');
+
+    }
+    
+    /**
+     * Returns the size of the file, in bytes. 
+     * 
+     * @return int 
+     */
+    public function getSize() {
+
+        return 0;
+
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     * The ETag is an arbritrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     */
+    public function getETag() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     */ 
+    public function getContentType() {
+
+        return null;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/ICollection.php b/3rdparty/Sabre/DAV/ICollection.php
new file mode 100644
index 00000000000..0667d88899d
--- /dev/null
+++ b/3rdparty/Sabre/DAV/ICollection.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * The ICollection Interface
+ *
+ * This interface should be implemented by each class that represents a collection 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_ICollection extends Sabre_DAV_INode {
+
+    /**
+     * Creates a new file in the directory 
+     * 
+     * data is a readable stream resource
+     *
+     * @param string $name Name of the file 
+     * @param resource $data Initial payload 
+     * @return void
+     */
+    function createFile($name, $data = null);
+
+    /**
+     * Creates a new subdirectory 
+     * 
+     * @param string $name 
+     * @return void
+     */
+    function createDirectory($name);
+
+    /**
+     * Returns a specific child node, referenced by its name 
+     * 
+     * @param string $name 
+     * @return Sabre_DAV_INode 
+     */
+    function getChild($name);
+
+    /**
+     * Returns an array with all the child nodes 
+     * 
+     * @return Sabre_DAV_INode[] 
+     */
+    function getChildren();
+
+    /**
+     * Checks if a child-node with the specified name exists 
+     * 
+     * @return bool 
+     */
+    function childExists($name);
+
+}
+
diff --git a/3rdparty/Sabre/DAV/IExtendedCollection.php b/3rdparty/Sabre/DAV/IExtendedCollection.php
new file mode 100644
index 00000000000..b8db1ab2f26
--- /dev/null
+++ b/3rdparty/Sabre/DAV/IExtendedCollection.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * The IExtendedCollection interface.
+ *
+ * This interface can be used to create special-type of collection-resources
+ * as defined by RFC 5689.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_IExtendedCollection extends Sabre_DAV_ICollection {
+
+    /**
+     * Creates a new collection
+     *
+     * @param string $name 
+     * @param array $resourceType
+     * @param array $properties
+     * @return void
+     */
+    function createExtendedCollection($name, array $resourceType, array $properties);
+
+}
+
diff --git a/3rdparty/Sabre/DAV/IFile.php b/3rdparty/Sabre/DAV/IFile.php
new file mode 100644
index 00000000000..446ec86187b
--- /dev/null
+++ b/3rdparty/Sabre/DAV/IFile.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * This interface represents a file or leaf in the tree.
+ *
+ * The nature of a file is, as you might be aware of, that it doesn't contain sub-nodes and has contents
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_IFile extends Sabre_DAV_INode {
+
+    /**
+     * Updates the data 
+     * 
+     * The data argument is a readable stream resource.
+     *
+     * @param resource $data 
+     * @return void 
+     */
+    function put($data);
+
+    /**
+     * Returns the data 
+     * 
+     * This method may either return a string or a readable stream resource
+     *
+     * @return mixed 
+     */
+    function get();
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     * 
+     * @return void
+     */
+    function getContentType();
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     *
+     * Return null if the ETag can not effectively be determined
+     * 
+     * @return void
+     */
+    function getETag();
+
+    /**
+     * Returns the size of the node, in bytes 
+     * 
+     * @return int 
+     */
+    function getSize();
+
+}
+
diff --git a/3rdparty/Sabre/DAV/ILockable.php b/3rdparty/Sabre/DAV/ILockable.php
new file mode 100644
index 00000000000..f9fb3a70251
--- /dev/null
+++ b/3rdparty/Sabre/DAV/ILockable.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Implement this class to support locking 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_ILockable extends Sabre_DAV_INode {
+
+    /**
+     * Returns an array with locks currently on the node 
+     * 
+     * @return Sabre_DAV_Locks_LockInfo[] 
+     */
+    function getLocks();
+
+    /**
+     * Creates a new lock on the file.  
+     * 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo The lock information 
+     * @return void
+     */
+    function lock(Sabre_DAV_Locks_LockInfo $lockInfo);
+
+    /**
+     * Unlocks a file 
+     * 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo The lock information 
+     * @return void 
+     */
+    function unlock(Sabre_DAV_Locks_LockInfo $lockInfo);
+
+}
+
diff --git a/3rdparty/Sabre/DAV/INode.php b/3rdparty/Sabre/DAV/INode.php
new file mode 100644
index 00000000000..c0b96bf5377
--- /dev/null
+++ b/3rdparty/Sabre/DAV/INode.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * The INode interface is the base interface, and the parent class of both ICollection and IFile
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_INode {
+
+    /**
+     * Deleted the current node
+     *
+     * @return void 
+     */
+    function delete();
+
+    /**
+     * Returns the name of the node 
+     * 
+     * @return string 
+     */
+    function getName();
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @return void
+     */
+    function setName($name);
+
+    /**
+     * Returns the last modification time, as a unix timestamp 
+     * 
+     * @return int 
+     */
+    function getLastModified();
+
+}
+
diff --git a/3rdparty/Sabre/DAV/IProperties.php b/3rdparty/Sabre/DAV/IProperties.php
new file mode 100644
index 00000000000..af17cad24af
--- /dev/null
+++ b/3rdparty/Sabre/DAV/IProperties.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * IProperties interface
+ *
+ * Implement this interface to support custom WebDAV properties requested and sent from clients.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_IProperties extends Sabre_DAV_INode {
+
+    /**
+     * Updates properties on this node,
+     *
+     * The properties array uses the propertyName in clark-notation as key,
+     * and the array value for the property value. In the case a property
+     * should be deleted, the property value will be null.
+     *
+     * This method must be atomic. If one property cannot be changed, the
+     * entire operation must fail.
+     *
+     * If the operation was successful, true can be returned.
+     * If the operation failed, false can be returned.
+     *
+     * Deletion of a non-existant property is always succesful.
+     *
+     * Lastly, it is optional to return detailed information about any
+     * failures. In this case an array should be returned with the following
+     * structure:
+     *
+     * array(
+     *   403 => array(
+     *      '{DAV:}displayname' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}owner' => null,
+     *   )
+     * )
+     *
+     * In this example it was forbidden to update {DAV:}displayname. 
+     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
+     * (424 Failed Dependency) because the request needs to be atomic.
+     *
+     * @param array $mutations 
+     * @return bool|array 
+     */
+    function updateProperties($mutations);
+
+    /**
+     * Returns a list of properties for this nodes.
+     *
+     * The properties list is a list of propertynames the client requested,
+     * encoded in clark-notation {xmlnamespace}tagname
+     *
+     * If the array is empty, it means 'all properties' were requested.
+     *
+     * @param array $properties 
+     * @return void
+     */
+    function getProperties($properties);
+
+}
+
diff --git a/3rdparty/Sabre/DAV/IQuota.php b/3rdparty/Sabre/DAV/IQuota.php
new file mode 100644
index 00000000000..8ff1a4597f8
--- /dev/null
+++ b/3rdparty/Sabre/DAV/IQuota.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * IQuota interface
+ *
+ * Implement this interface to add the ability to return quota information. The ObjectTree
+ * will check for quota information on any given node. If the information is not available it will 
+ * attempt to fetch the information from the root node.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_IQuota extends Sabre_DAV_ICollection {
+
+    /**
+     * Returns the quota information
+     *
+     * This method MUST return an array with 2 values, the first being the total used space,
+     * the second the available space (in bytes)
+     */
+    function getQuotaInfo(); 
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php b/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
new file mode 100644
index 00000000000..b09f93ddac7
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/Backend/Abstract.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * The Lock manager allows you to handle all file-locks centrally.
+ *
+ * This is an alternative approach to doing this on a per-node basis
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Locks_Backend_Abstract {
+
+    /**
+     * Returns a list of Sabre_DAV_Locks_LockInfo objects  
+     * 
+     * This method should return all the locks for a particular uri, including
+     * locks that might be set on a parent uri.
+     *
+     * If returnChildLocks is set to true, this method should also look for
+     * any locks in the subtree of the uri for locks.
+     *
+     * @param string $uri 
+     * @param bool $returnChildLocks
+     * @return array 
+     */
+    abstract function getLocks($uri, $returnChildLocks);
+
+    /**
+     * Locks a uri 
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return bool 
+     */
+    abstract function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo);
+
+    /**
+     * Removes a lock from a uri 
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return bool 
+     */
+    abstract function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo);
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/FS.php b/3rdparty/Sabre/DAV/Locks/Backend/FS.php
new file mode 100644
index 00000000000..8653f55b1c6
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/Backend/FS.php
@@ -0,0 +1,189 @@
+<?php
+
+/**
+ * The Lock manager allows you to handle all file-locks centrally.
+ *
+ * This Lock Manager is now deprecated. It has a bug that allows parent 
+ * collections to be deletes when children deeper in the tree are locked. 
+ *
+ * You are recommended to use either the PDO or the File backend instead.
+ *
+ * This Lock Manager stores all its data in the filesystem.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @deprecated
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_Backend_FS extends Sabre_DAV_Locks_Backend_Abstract {
+
+    /**
+     * The default data directory 
+     * 
+     * @var string 
+     */
+    private $dataDir;
+
+    public function __construct($dataDir) {
+
+        $this->dataDir = $dataDir;
+
+    }
+
+    protected function getFileNameForUri($uri) {
+
+        return $this->dataDir . '/sabredav_' . md5($uri) . '.locks';
+
+    }
+
+
+    /**
+     * Returns a list of Sabre_DAV_Locks_LockInfo objects  
+     * 
+     * This method should return all the locks for a particular uri, including
+     * locks that might be set on a parent uri.
+     *
+     * If returnChildLocks is set to true, this method should also look for
+     * any locks in the subtree of the uri for locks.
+     *
+     * @param string $uri 
+     * @param bool $returnChildLocks
+     * @return array 
+     */
+    public function getLocks($uri, $returnChildLocks) {
+
+        $lockList = array();
+        $currentPath = '';
+
+        foreach(explode('/',$uri) as $uriPart) {
+
+            // weird algorithm that can probably be improved, but we're traversing the path top down 
+            if ($currentPath) $currentPath.='/'; 
+            $currentPath.=$uriPart;
+
+            $uriLocks = $this->getData($currentPath);
+
+            foreach($uriLocks as $uriLock) {
+
+                // Unless we're on the leaf of the uri-tree we should ingore locks with depth 0
+                if($uri==$currentPath || $uriLock->depth!=0) {
+                    $uriLock->uri = $currentPath;
+                    $lockList[] = $uriLock;
+                }
+
+            }
+
+        }
+
+        // Checking if we can remove any of these locks
+        foreach($lockList as $k=>$lock) {
+            if (time() > $lock->timeout + $lock->created) unset($lockList[$k]); 
+        }
+        return $lockList;
+
+    }
+
+    /**
+     * Locks a uri 
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return bool 
+     */
+    public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        // We're making the lock timeout 30 minutes
+        $lockInfo->timeout = 1800;
+        $lockInfo->created = time();
+
+        $locks = $this->getLocks($uri,false);
+        foreach($locks as $k=>$lock) {
+            if ($lock->token == $lockInfo->token) unset($locks[$k]);
+        }
+        $locks[] = $lockInfo;
+        $this->putData($uri,$locks);
+        return true;
+
+    }
+
+    /**
+     * Removes a lock from a uri 
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return bool 
+     */
+    public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        $locks = $this->getLocks($uri,false);
+        foreach($locks as $k=>$lock) {
+
+            if ($lock->token == $lockInfo->token) {
+
+                unset($locks[$k]);
+                $this->putData($uri,$locks);
+                return true;
+
+            }
+        }
+        return false;
+
+    }
+
+    /**
+     * Returns the stored data for a uri
+     *
+     * @param string $uri
+     * @return array 
+     */
+    protected function getData($uri) {
+
+        $path = $this->getFilenameForUri($uri);
+        if (!file_exists($path)) return array();
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'r');
+        flock($handle,LOCK_SH);
+        $data = '';
+
+        // Reading data until the eof
+        while(!feof($handle)) {
+            $data.=fread($handle,8192);
+        }
+
+        // We're all good
+        fclose($handle);
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        if (!$data) return array();
+        return $data;
+
+    }
+
+    /**
+     * Updates the lock information
+     *
+     * @param string $uri
+     * @param array $newData 
+     * @return void
+     */
+    protected function putData($uri,array $newData) {
+
+        $path = $this->getFileNameForUri($uri);
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'a+');
+        flock($handle,LOCK_EX);
+        ftruncate($handle,0);
+        rewind($handle);
+
+        fwrite($handle,serialize($newData));
+        fclose($handle);
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/File.php b/3rdparty/Sabre/DAV/Locks/Backend/File.php
new file mode 100644
index 00000000000..f65b20c4306
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/Backend/File.php
@@ -0,0 +1,175 @@
+<?php
+
+/**
+ * The Lock manager allows you to handle all file-locks centrally.
+ *
+ * This Lock Manager stores all its data in a single file. 
+ *
+ * Note that this is not nearly as robust as a database, you are encouraged
+ * to use the PDO backend instead.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_Backend_File extends Sabre_DAV_Locks_Backend_Abstract {
+
+    /**
+     * The storage file
+     * 
+     * @var string 
+     */
+    private $locksFile;
+
+    /**
+     * Constructor
+     *
+     * @param string $locksFile path to file 
+     */
+    public function __construct($locksFile) {
+
+        $this->locksFile = $locksFile;
+
+    }
+
+    /**
+     * Returns a list of Sabre_DAV_Locks_LockInfo objects  
+     * 
+     * This method should return all the locks for a particular uri, including
+     * locks that might be set on a parent uri.
+     *
+     * If returnChildLocks is set to true, this method should also look for
+     * any locks in the subtree of the uri for locks.
+     *
+     * @param string $uri 
+     * @param bool $returnChildLocks
+     * @return array 
+     */
+    public function getLocks($uri, $returnChildLocks) {
+
+        $newLocks = array();
+        $currentPath = '';
+
+        $locks = $this->getData();
+        foreach($locks as $lock) {
+
+            if ($lock->uri === $uri ||
+                //deep locks on parents
+                ($lock->depth!=0 && strpos($uri, $lock->uri . '/')===0) ||
+
+                // locks on children
+                ($returnChildLocks && (strpos($lock->uri, $uri . '/')===0)) ) {
+
+                $newLocks[] = $lock;
+
+            }
+
+        }
+
+        // Checking if we can remove any of these locks
+        foreach($newLocks as $k=>$lock) {
+            if (time() > $lock->timeout + $lock->created) unset($newLocks[$k]); 
+        }
+        return $newLocks;
+
+    }
+
+    /**
+     * Locks a uri 
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return bool 
+     */
+    public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        // We're making the lock timeout 30 minutes
+        $lockInfo->timeout = 1800;
+        $lockInfo->created = time();
+        $lockInfo->uri = $uri;
+
+        $locks = $this->getLocks($uri,false);
+        foreach($locks as $k=>$lock) {
+            if ($lock->token == $lockInfo->token) unset($locks[$k]);
+        }
+        $locks[] = $lockInfo;
+        $this->putData($locks);
+        return true;
+
+    }
+
+    /**
+     * Removes a lock from a uri 
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return bool 
+     */
+    public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        $locks = $this->getLocks($uri,false);
+        foreach($locks as $k=>$lock) {
+
+            if ($lock->token == $lockInfo->token) {
+
+                unset($locks[$k]);
+                $this->putData($locks);
+                return true;
+
+            }
+        }
+        return false;
+
+    }
+
+    /**
+     * Loads the lockdata from the filesystem.
+     *
+     * @return array 
+     */
+    protected function getData() {
+
+        if (!file_exists($this->locksFile)) return array();
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($this->locksFile,'r');
+        flock($handle,LOCK_SH);
+
+        // Reading data until the eof
+        $data = stream_get_contents($handle);
+
+        // We're all good
+        fclose($handle);
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        if (!$data) return array();
+        return $data;
+
+    }
+
+    /**
+     * Saves the lockdata
+     *
+     * @param array $newData 
+     * @return void
+     */
+    protected function putData(array $newData) {
+
+        // opening up the file, and creating an exclusive lock
+        $handle = fopen($this->locksFile,'a+');
+        flock($handle,LOCK_EX);
+
+        // We can only truncate and rewind once the lock is acquired.
+        ftruncate($handle,0);
+        rewind($handle);
+
+        fwrite($handle,serialize($newData));
+        fclose($handle);
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/Backend/PDO.php b/3rdparty/Sabre/DAV/Locks/Backend/PDO.php
new file mode 100644
index 00000000000..c3923af19d3
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/Backend/PDO.php
@@ -0,0 +1,165 @@
+<?php
+
+/**
+ * The Lock manager allows you to handle all file-locks centrally.
+ *
+ * This Lock Manager stores all its data in a database. You must pass a PDO
+ * connection object in the constructor.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_Backend_PDO extends Sabre_DAV_Locks_Backend_Abstract {
+
+    /**
+     * The PDO connection object 
+     * 
+     * @var pdo 
+     */
+    private $pdo;
+
+    /**
+     * The PDO tablename this backend uses. 
+     * 
+     * @var string
+     */
+    protected $tableName;
+
+    /**
+     * Constructor 
+     * 
+     * @param PDO $pdo
+     * @param string $tableName 
+     */
+    public function __construct(PDO $pdo, $tableName = 'locks') {
+
+        $this->pdo = $pdo;
+        $this->tableName = $tableName;
+
+    }
+
+    /**
+     * Returns a list of Sabre_DAV_Locks_LockInfo objects  
+     * 
+     * This method should return all the locks for a particular uri, including
+     * locks that might be set on a parent uri.
+     *
+     * If returnChildLocks is set to true, this method should also look for
+     * any locks in the subtree of the uri for locks.
+     *
+     * @param string $uri 
+     * @param bool $returnChildLocks
+     * @return array 
+     */
+    public function getLocks($uri, $returnChildLocks) {
+
+        // NOTE: the following 10 lines or so could be easily replaced by 
+        // pure sql. MySQL's non-standard string concatination prevents us
+        // from doing this though.
+        $query = 'SELECT owner, token, timeout, created, scope, depth, uri FROM `'.$this->tableName.'` WHERE ((created + timeout) > CAST(? AS UNSIGNED INTEGER)) AND ((uri = ?)';
+        $params = array(time(),$uri);
+
+        // We need to check locks for every part in the uri.
+        $uriParts = explode('/',$uri);
+
+        // We already covered the last part of the uri
+        array_pop($uriParts);
+
+        $currentPath='';
+
+        foreach($uriParts as $part) {
+
+            if ($currentPath) $currentPath.='/';
+            $currentPath.=$part;
+
+            $query.=' OR (depth!=0 AND uri = ?)';
+            $params[] = $currentPath;
+
+        }
+
+        if ($returnChildLocks) {
+
+            $query.=' OR (uri LIKE ?)';
+            $params[] = $uri . '/%';
+
+        }
+        $query.=')';
+
+        $stmt = $this->pdo->prepare($query);
+        $stmt->execute($params);
+        $result = $stmt->fetchAll();
+
+        $lockList = array();
+        foreach($result as $row) {
+
+            $lockInfo = new Sabre_DAV_Locks_LockInfo();
+            $lockInfo->owner = $row['owner'];
+            $lockInfo->token = $row['token'];
+            $lockInfo->timeout = $row['timeout'];
+            $lockInfo->created = $row['created'];
+            $lockInfo->scope = $row['scope'];
+            $lockInfo->depth = $row['depth'];
+            $lockInfo->uri   = $row['uri'];
+            $lockList[] = $lockInfo;
+
+        }
+
+        return $lockList;
+
+    }
+
+    /**
+     * Locks a uri 
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return bool 
+     */
+    public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        // We're making the lock timeout 30 minutes
+        $lockInfo->timeout = 30*60;
+        $lockInfo->created = time();
+        $lockInfo->uri = $uri;
+
+        $locks = $this->getLocks($uri,false);
+        $exists = false;
+        foreach($locks as $k=>$lock) {
+            if ($lock->token == $lockInfo->token) $exists = true;
+        }
+        
+        if ($exists) {
+            $stmt = $this->pdo->prepare('UPDATE `'.$this->tableName.'` SET owner = ?, timeout = ?, scope = ?, depth = ?, uri = ?, created = ? WHERE token = ?');
+            $stmt->execute(array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
+        } else {
+            $stmt = $this->pdo->prepare('INSERT INTO `'.$this->tableName.'` (owner,timeout,scope,depth,uri,created,token) VALUES (?,?,?,?,?,?,?)');
+            $stmt->execute(array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
+        }
+
+        return true;
+
+    }
+
+
+
+    /**
+     * Removes a lock from a uri 
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return bool 
+     */
+    public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM `'.$this->tableName.'` WHERE uri = ? AND token = ?');
+        $stmt->execute(array($uri,$lockInfo->token));
+
+        return $stmt->rowCount()===1;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/LockInfo.php b/3rdparty/Sabre/DAV/Locks/LockInfo.php
new file mode 100644
index 00000000000..6a064466f40
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/LockInfo.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * LockInfo class
+ *
+ * An object of the LockInfo class holds all the information relevant to a
+ * single lock.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_LockInfo {
+
+    /**
+     * A shared lock
+     */
+    const SHARED = 1;
+
+    /**
+     * An exclusive lock
+     */
+    const EXCLUSIVE = 2;
+
+    /**
+     * A never expiring timeout
+     */
+    const TIMEOUT_INFINITE = -1;
+
+    /**
+     * The owner of the lock 
+     * 
+     * @var string 
+     */
+    public $owner;
+
+    /**
+     * The locktoken 
+     * 
+     * @var string 
+     */
+    public $token;
+
+    /**
+     * How long till the lock is expiring 
+     * 
+     * @var int 
+     */
+    public $timeout;
+
+    /**
+     * UNIX Timestamp of when this lock was created 
+     * 
+     * @var int 
+     */
+    public $created;
+
+    /**
+     * Exclusive or shared lock 
+     * 
+     * @var int 
+     */
+    public $scope = self::EXCLUSIVE;
+
+    /**
+     * Depth of lock, can be 0 or Sabre_DAV_Server::DEPTH_INFINITY
+     */
+    public $depth = 0;
+
+    /**
+     * The uri this lock locks
+     *
+     * TODO: This value is not always set 
+     * @var mixed
+     */
+    public $uri;
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Locks/Plugin.php b/3rdparty/Sabre/DAV/Locks/Plugin.php
new file mode 100644
index 00000000000..461e2847e0a
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Locks/Plugin.php
@@ -0,0 +1,680 @@
+<?php
+
+/**
+ * Locking plugin
+ *
+ * This plugin provides locking support to a WebDAV server.
+ * The easiest way to get started, is by hooking it up as such:
+ *
+ * $lockBackend = new Sabre_DAV_Locks_Backend_File('./mylockdb');
+ * $lockPlugin = new Sabre_DAV_Locks_Plugin($lockBackend);
+ * $server->addPlugin($lockPlugin);
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * locksBackend 
+     * 
+     * @var Sabre_DAV_Locks_Backend_Abstract 
+     */
+    private $locksBackend;
+
+    /**
+     * server
+     * 
+     * @var Sabre_DAV_Server 
+     */
+    private $server;
+
+    /**
+     * __construct 
+     * 
+     * @param Sabre_DAV_Locks_Backend_Abstract $locksBackend 
+     * @return void
+     */
+    public function __construct(Sabre_DAV_Locks_Backend_Abstract $locksBackend = null) {
+
+        $this->locksBackend = $locksBackend;        
+
+    }
+
+    /**
+     * Initializes the plugin
+     *
+     * This method is automatically called by the Server class after addPlugin.
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
+        $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),50);
+        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'));
+
+    }
+
+    /**
+     * Returns a plugin name.
+     * 
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre_DAV_Server::getPlugin 
+     * 
+     * @return string 
+     */
+    public function getPluginName() {
+
+        return 'locks';
+
+    }
+
+    /**
+     * This method is called by the Server if the user used an HTTP method 
+     * the server didn't recognize.
+     *
+     * This plugin intercepts the LOCK and UNLOCK methods.
+     * 
+     * @param string $method 
+     * @return bool 
+     */
+    public function unknownMethod($method, $uri) {
+
+        switch($method) { 
+
+            case 'LOCK'   : $this->httpLock($uri); return false; 
+            case 'UNLOCK' : $this->httpUnlock($uri); return false; 
+
+        }
+
+    }
+
+    /**
+     * This method is called after most properties have been found
+     * it allows us to add in any Lock-related properties
+     * 
+     * @param string $path 
+     * @param array $properties 
+     * @return bool 
+     */
+    public function afterGetProperties($path,&$newProperties) {
+
+        foreach($newProperties[404] as $propName=>$discard) {
+
+            $node = null;
+
+            switch($propName) {
+
+                case '{DAV:}supportedlock' :
+                    $val = false;
+                    if ($this->locksBackend) $val = true;
+                    else {
+                        if (!$node) $node = $this->server->tree->getNodeForPath($path);
+                        if ($node instanceof Sabre_DAV_ILockable) $val = true;
+                    }
+                    $newProperties[200][$propName] = new Sabre_DAV_Property_SupportedLock($val);
+                    unset($newProperties[404][$propName]);
+                    break;
+
+                case '{DAV:}lockdiscovery' :
+                    $newProperties[200][$propName] = new Sabre_DAV_Property_LockDiscovery($this->getLocks($path));
+                    unset($newProperties[404][$propName]);
+                    break;
+
+            }
+
+
+        }
+        return true;
+
+    }
+
+
+    /**
+     * This method is called before the logic for any HTTP method is
+     * handled.
+     *
+     * This plugin uses that feature to intercept access to locked resources.
+     * 
+     * @param string $method
+     * @param string $uri
+     * @return bool 
+     */
+    public function beforeMethod($method, $uri) {
+
+        switch($method) {
+
+            case 'DELETE' :
+                $lastLock = null;
+                if (!$this->validateLock($uri,$lastLock, true))
+                    throw new Sabre_DAV_Exception_Locked($lastLock);
+                break;
+            case 'MKCOL' :
+            case 'PROPPATCH' :
+            case 'PUT' :
+                $lastLock = null;
+                if (!$this->validateLock($uri,$lastLock))
+                    throw new Sabre_DAV_Exception_Locked($lastLock);
+                break;
+            case 'MOVE' :
+                $lastLock = null;
+                if (!$this->validateLock(array(
+                      $uri,
+                      $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
+                    ),$lastLock, true))
+                        throw new Sabre_DAV_Exception_Locked($lastLock);
+                break;
+            case 'COPY' :
+                $lastLock = null;
+                if (!$this->validateLock(
+                      $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
+                      $lastLock, true))
+                        throw new Sabre_DAV_Exception_Locked($lastLock);
+                break;
+        }
+
+        return true;
+
+    }
+
+    /**
+     * Use this method to tell the server this plugin defines additional
+     * HTTP methods.
+     *
+     * This method is passed a uri. It should only return HTTP methods that are 
+     * available for the specified uri.
+     *
+     * @param string $uri
+     * @return array 
+     */
+    public function getHTTPMethods($uri) {
+
+        if ($this->locksBackend ||
+            $this->server->tree->getNodeForPath($uri) instanceof Sabre_DAV_ILocks) {
+            return array('LOCK','UNLOCK');
+        }
+        return array();
+
+    }
+
+    /**
+     * Returns a list of features for the HTTP OPTIONS Dav: header.
+     *
+     * In this case this is only the number 2. The 2 in the Dav: header
+     * indicates the server supports locks.
+     * 
+     * @return array 
+     */
+    public function getFeatures() {
+
+        return array(2);
+
+    }
+
+    /**
+     * Returns all lock information on a particular uri 
+     * 
+     * This function should return an array with Sabre_DAV_Locks_LockInfo objects. If there are no locks on a file, return an empty array.
+     *
+     * Additionally there is also the possibility of locks on parent nodes, so we'll need to traverse every part of the tree 
+     * If the $returnChildLocks argument is set to true, we'll also traverse all the children of the object
+     * for any possible locks and return those as well.
+     *
+     * @param string $uri 
+     * @param bool $returnChildLocks
+     * @return array 
+     */
+    public function getLocks($uri, $returnChildLocks = false) {
+
+        $lockList = array();
+        $currentPath = '';
+        foreach(explode('/',$uri) as $uriPart) {
+
+            $uriLocks = array();
+            if ($currentPath) $currentPath.='/'; 
+            $currentPath.=$uriPart;
+
+            try {
+
+                $node = $this->server->tree->getNodeForPath($currentPath);
+                if ($node instanceof Sabre_DAV_ILockable) $uriLocks = $node->getLocks();
+
+            } catch (Sabre_DAV_Exception_FileNotFound $e){
+                // In case the node didn't exist, this could be a lock-null request
+            }
+
+            foreach($uriLocks as $uriLock) {
+
+                // Unless we're on the leaf of the uri-tree we should ignore locks with depth 0
+                if($uri==$currentPath || $uriLock->depth!=0) {
+                    $uriLock->uri = $currentPath;
+                    $lockList[] = $uriLock;
+                }
+
+            }
+
+        }
+        if ($this->locksBackend) 
+            $lockList = array_merge($lockList,$this->locksBackend->getLocks($uri, $returnChildLocks));
+
+        return $lockList;
+
+    }
+
+    /**
+     * Locks an uri
+     *
+     * The WebDAV lock request can be operated to either create a new lock on a file, or to refresh an existing lock
+     * If a new lock is created, a full XML body should be supplied, containing information about the lock such as the type 
+     * of lock (shared or exclusive) and the owner of the lock
+     *
+     * If a lock is to be refreshed, no body should be supplied and there should be a valid If header containing the lock
+     *
+     * Additionally, a lock can be requested for a non-existant file. In these case we're obligated to create an empty file as per RFC4918:S7.3
+     * 
+     * @param string $uri
+     * @return void
+     */
+    protected function httpLock($uri) {
+
+        $lastLock = null;
+        if (!$this->validateLock($uri,$lastLock)) {
+
+            // If the existing lock was an exclusive lock, we need to fail
+            if (!$lastLock || $lastLock->scope == Sabre_DAV_Locks_LockInfo::EXCLUSIVE) {
+                //var_dump($lastLock);
+                throw new Sabre_DAV_Exception_ConflictingLock($lastLock);
+            }
+
+        }
+
+        if ($body = $this->server->httpRequest->getBody(true)) {
+            // This is a new lock request
+            $lockInfo = $this->parseLockRequest($body);
+            $lockInfo->depth = $this->server->getHTTPDepth(); 
+            $lockInfo->uri = $uri;
+            if($lastLock && $lockInfo->scope != Sabre_DAV_Locks_LockInfo::SHARED) throw new Sabre_DAV_Exception_ConflictingLock($lastLock);
+
+        } elseif ($lastLock) {
+
+            // This must have been a lock refresh
+            $lockInfo = $lastLock;
+
+            // The resource could have been locked through another uri. 
+            if ($uri!=$lockInfo->uri) $uri = $lockInfo->uri;
+
+        } else {
+            
+            // There was neither a lock refresh nor a new lock request
+            throw new Sabre_DAV_Exception_BadRequest('An xml body is required for lock requests');
+
+        }
+
+        if ($timeout = $this->getTimeoutHeader()) $lockInfo->timeout = $timeout;
+
+        $newFile = false;
+
+        // If we got this far.. we should go check if this node actually exists. If this is not the case, we need to create it first
+        try {
+            $node = $this->server->tree->getNodeForPath($uri);
+            
+            // We need to call the beforeWriteContent event for RFC3744
+            $this->server->broadcastEvent('beforeWriteContent',array($uri));
+
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+            
+            // It didn't, lets create it
+            $this->server->createFile($uri,fopen('php://memory','r')); 
+            $newFile = true; 
+
+        }
+
+        $this->lockNode($uri,$lockInfo);
+
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->setHeader('Lock-Token','<opaquelocktoken:' . $lockInfo->token . '>');
+        $this->server->httpResponse->sendStatus($newFile?201:200);
+        $this->server->httpResponse->sendBody($this->generateLockResponse($lockInfo));
+
+    }
+
+    /**
+     * Unlocks a uri
+     *
+     * This WebDAV method allows you to remove a lock from a node. The client should provide a valid locktoken through the Lock-token http header
+     * The server should return 204 (No content) on success
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpUnlock($uri) {
+
+        $lockToken = $this->server->httpRequest->getHeader('Lock-Token');
+
+        // If the locktoken header is not supplied, we need to throw a bad request exception
+        if (!$lockToken) throw new Sabre_DAV_Exception_BadRequest('No lock token was supplied');
+
+        $locks = $this->getLocks($uri);
+
+        // Windows sometimes forgets to include < and > in the Lock-Token 
+        // header
+        if ($lockToken[0]!=='<') $lockToken = '<' . $lockToken . '>';
+
+        foreach($locks as $lock) {
+
+            if ('<opaquelocktoken:' . $lock->token . '>' == $lockToken) {
+
+                $this->server->broadcastEvent('beforeUnlock',array($uri, $lock));
+                $this->unlockNode($uri,$lock);
+                $this->server->httpResponse->setHeader('Content-Length','0');
+                $this->server->httpResponse->sendStatus(204);
+                return;
+
+            }
+
+        }
+
+        // If we got here, it means the locktoken was invalid
+        throw new Sabre_DAV_Exception_LockTokenMatchesRequestUri();
+
+    }
+
+    /**
+     * Locks a uri
+     *
+     * All the locking information is supplied in the lockInfo object. The object has a suggested timeout, but this can be safely ignored
+     * It is important that if the existing timeout is ignored, the property is overwritten, as this needs to be sent back to the client
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return void
+     */
+    public function lockNode($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        if (!$this->server->broadcastEvent('beforeLock',array($uri,$lockInfo))) return;
+
+        try {
+            $node = $this->server->tree->getNodeForPath($uri);
+            if ($node instanceof Sabre_DAV_ILockable) return $node->lock($lockInfo);
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+            // In case the node didn't exist, this could be a lock-null request
+        }
+        if ($this->locksBackend) return $this->locksBackend->lock($uri,$lockInfo);
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Locking support is not enabled for this resource. No Locking backend was found so if you didn\'t expect this error, please check your configuration.');
+
+    }
+
+    /**
+     * Unlocks a uri
+     *
+     * This method removes a lock from a uri. It is assumed all the supplied information is correct and verified
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return void
+     */
+    public function unlockNode($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        if (!$this->server->broadcastEvent('beforeUnlock',array($uri,$lockInfo))) return;
+        try {
+            $node = $this->server->tree->getNodeForPath($uri);
+            if ($node instanceof Sabre_DAV_ILockable) return $node->unlock($lockInfo);
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+            // In case the node didn't exist, this could be a lock-null request
+        }
+
+        if ($this->locksBackend) return $this->locksBackend->unlock($uri,$lockInfo);
+
+    }
+
+
+    /**
+     * Returns the contents of the HTTP Timeout header. 
+     * 
+     * The method formats the header into an integer.
+     *
+     * @return int
+     */
+    public function getTimeoutHeader() {
+
+        $header = $this->server->httpRequest->getHeader('Timeout');
+        
+        if ($header) {
+
+            if (stripos($header,'second-')===0) $header = (int)(substr($header,7));
+            else if (strtolower($header)=='infinite') $header=Sabre_DAV_Locks_LockInfo::TIMEOUT_INFINITE;
+            else throw new Sabre_DAV_Exception_BadRequest('Invalid HTTP timeout header');
+
+        } else {
+
+            $header = 0;
+
+        }
+
+        return $header;
+
+    }
+
+    /**
+     * Generates the response for successfull LOCK requests 
+     * 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return string 
+     */
+    protected function generateLockResponse(Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        $dom = new DOMDocument('1.0','utf-8');
+        $dom->formatOutput = true;
+        
+        $prop = $dom->createElementNS('DAV:','d:prop');
+        $dom->appendChild($prop);
+
+        $lockDiscovery = $dom->createElementNS('DAV:','d:lockdiscovery');
+        $prop->appendChild($lockDiscovery);
+
+        $lockObj = new Sabre_DAV_Property_LockDiscovery(array($lockInfo),true);
+        $lockObj->serialize($this->server,$lockDiscovery);
+
+        return $dom->saveXML();
+
+    }
+    
+    /**
+     * validateLock should be called when a write operation is about to happen
+     * It will check if the requested url is locked, and see if the correct lock tokens are passed 
+     *
+     * @param mixed $urls List of relevant urls. Can be an array, a string or nothing at all for the current request uri
+     * @param mixed $lastLock This variable will be populated with the last checked lock object (Sabre_DAV_Locks_LockInfo)
+     * @param bool $checkChildLocks If set to true, this function will also look for any locks set on child resources of the supplied urls. This is needed for for example deletion of entire trees.
+     * @return bool
+     */
+    protected function validateLock($urls = null,&$lastLock = null, $checkChildLocks = false) {
+
+        if (is_null($urls)) {
+            $urls = array($this->server->getRequestUri());
+        } elseif (is_string($urls)) {
+            $urls = array($urls);
+        } elseif (!is_array($urls)) {
+            throw new Sabre_DAV_Exception('The urls parameter should either be null, a string or an array');
+        }
+
+        $conditions = $this->getIfConditions();
+
+        // We're going to loop through the urls and make sure all lock conditions are satisfied
+        foreach($urls as $url) {
+
+            $locks = $this->getLocks($url, $checkChildLocks);
+
+            // If there were no conditions, but there were locks, we fail 
+            if (!$conditions && $locks) {
+                reset($locks);
+                $lastLock = current($locks);
+                return false;
+            }
+          
+            // If there were no locks or conditions, we go to the next url
+            if (!$locks && !$conditions) continue;
+
+            foreach($conditions as $condition) {
+
+                if (!$condition['uri']) {
+                    $conditionUri = $this->server->getRequestUri();
+                } else {
+                    $conditionUri = $this->server->calculateUri($condition['uri']);
+                }
+
+                // If the condition has a url, and it isn't part of the affected url at all, check the next condition
+                if ($conditionUri && strpos($url,$conditionUri)!==0) continue;
+
+                // The tokens array contians arrays with 2 elements. 0=true/false for normal/not condition, 1=locktoken
+                // At least 1 condition has to be satisfied
+                foreach($condition['tokens'] as $conditionToken) {
+
+                    $etagValid = true;
+                    $lockValid  = true;
+
+                    // key 2 can contain an etag
+                    if ($conditionToken[2]) {
+
+                        $uri = $conditionUri?$conditionUri:$this->server->getRequestUri(); 
+                        $node = $this->server->tree->getNodeForPath($uri);
+                        $etagValid = $node->getETag()==$conditionToken[2];
+
+                    }
+
+                    // key 1 can contain a lock token
+                    if ($conditionToken[1]) {
+
+                        $lockValid = false;
+                        // Match all the locks
+                        foreach($locks as $lockIndex=>$lock) {
+
+                            $lockToken = 'opaquelocktoken:' . $lock->token;
+
+                            // Checking NOT
+                            if (!$conditionToken[0] && $lockToken != $conditionToken[1]) {
+
+                                // Condition valid, onto the next
+                                $lockValid = true;
+                                break;
+                            }
+                            if ($conditionToken[0] && $lockToken == $conditionToken[1]) {
+
+                                $lastLock = $lock;
+                                // Condition valid and lock matched
+                                unset($locks[$lockIndex]);
+                                $lockValid = true;
+                                break;
+
+                            }
+
+                        }
+
+                    }
+
+                    // If, after checking both etags and locks they are stil valid,
+                    // we can continue with the next condition.
+                    if ($etagValid && $lockValid) continue 2;
+               }
+               // No conditions matched, so we fail
+               throw new Sabre_DAV_Exception_PreconditionFailed('The tokens provided in the if header did not match','If');
+            }
+
+            // Conditions were met, we'll also need to check if all the locks are gone
+            if (count($locks)) {
+
+                reset($locks);
+
+                // There's still locks, we fail
+                $lastLock = current($locks);
+                return false;
+
+            }
+
+
+        }
+
+        // We got here, this means every condition was satisfied
+        return true;
+
+    }
+
+    /**
+     * This method is created to extract information from the WebDAV HTTP 'If:' header
+     *
+     * The If header can be quite complex, and has a bunch of features. We're using a regex to extract all relevant information
+     * The function will return an array, containg structs with the following keys
+     *
+     *   * uri   - the uri the condition applies to. If this is returned as an 
+     *     empty string, this implies it's referring to the request url.
+     *   * tokens - The lock token. another 2 dimensional array containg 2 elements (0 = true/false.. If this is a negative condition its set to false, 1 = the actual token)
+     *   * etag - an etag, if supplied
+     * 
+     * @return void
+     */
+    public function getIfConditions() {
+
+        $header = $this->server->httpRequest->getHeader('If'); 
+        if (!$header) return array();
+
+        $matches = array();
+
+        $regex = '/(?:\<(?P<uri>.*?)\>\s)?\((?P<not>Not\s)?(?:\<(?P<token>[^\>]*)\>)?(?:\s?)(?:\[(?P<etag>[^\]]*)\])?\)/im'; 
+        preg_match_all($regex,$header,$matches,PREG_SET_ORDER);
+
+        $conditions = array();
+
+        foreach($matches as $match) {
+
+            $condition = array(
+                'uri'   => $match['uri'],
+                'tokens' => array(
+                    array($match['not']?0:1,$match['token'],isset($match['etag'])?$match['etag']:'')
+                ),    
+            );
+
+            if (!$condition['uri'] && count($conditions)) $conditions[count($conditions)-1]['tokens'][] = array(
+                $match['not']?0:1,
+                $match['token'],
+                isset($match['etag'])?$match['etag']:''
+            );
+            else {
+                $conditions[] = $condition;
+            }
+
+        }
+
+        return $conditions;
+
+    }
+
+    /**
+     * Parses a webdav lock xml body, and returns a new Sabre_DAV_Locks_LockInfo object 
+     * 
+     * @param string $body 
+     * @return Sabre_DAV_Locks_LockInfo
+     */
+    protected function parseLockRequest($body) {
+
+        $xml = simplexml_load_string($body,null,LIBXML_NOWARNING);
+        $xml->registerXPathNamespace('d','DAV:');
+        $lockInfo = new Sabre_DAV_Locks_LockInfo();
+
+        $children = $xml->children("DAV:");
+        $lockInfo->owner = (string)$children->owner;
+
+        $lockInfo->token = Sabre_DAV_UUIDUtil::getUUID();
+        $lockInfo->scope = count($xml->xpath('d:lockscope/d:exclusive'))>0?Sabre_DAV_Locks_LockInfo::EXCLUSIVE:Sabre_DAV_Locks_LockInfo::SHARED;
+
+        return $lockInfo;
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/DAV/Mount/Plugin.php b/3rdparty/Sabre/DAV/Mount/Plugin.php
new file mode 100644
index 00000000000..f93a1aa25a1
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Mount/Plugin.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * This plugin provides support for RFC4709: Mounting WebDAV servers
+ *
+ * Simply append ?mount to any collection to generate the davmount response.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ */
+class Sabre_DAV_Mount_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Reference to Server class 
+     * 
+     * @var Sabre_DAV_Server 
+     */
+    private $server;
+
+    /**
+     * Initializes the plugin and registers event handles 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
+
+    }
+
+    /**
+     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
+     * with ?mount
+     * 
+     * @param string $method 
+     * @return void
+     */
+    public function beforeMethod($method, $uri) {
+
+        if ($method!='GET') return;
+        if ($this->server->httpRequest->getQueryString()!='mount') return;
+
+        $currentUri = $this->server->httpRequest->getAbsoluteUri();
+
+        // Stripping off everything after the ?
+        list($currentUri) = explode('?',$currentUri);
+
+        $this->davMount($currentUri);
+
+        // Returning false to break the event chain
+        return false;
+
+    }
+
+    /**
+     * Generates the davmount response 
+     * 
+     * @param string $uri absolute uri 
+     * @return void
+     */
+    public function davMount($uri) {
+       
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->setHeader('Content-Type','application/davmount+xml');
+        ob_start();
+        echo '<?xml version="1.0"?>', "\n";
+        echo "<dm:mount xmlns:dm=\"http://purl.org/NET/webdav/mount\">\n";
+        echo "  <dm:url>", htmlspecialchars($uri, ENT_NOQUOTES, 'UTF-8'), "</dm:url>\n";
+        echo "</dm:mount>";
+        $this->server->httpResponse->sendBody(ob_get_clean());
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/DAV/Node.php b/3rdparty/Sabre/DAV/Node.php
new file mode 100644
index 00000000000..0510df5fdf2
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Node.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Node class
+ *
+ * This is a helper class, that should aid in getting nodes setup. 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Node implements Sabre_DAV_INode {
+
+    /**
+     * Returns the last modification time 
+     *
+     * In this case, it will simply return the current time
+     *
+     * @return int 
+     */
+    public function getLastModified() {
+
+        return time();
+
+    }
+
+    /**
+     * Deleted the current node
+     *
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void 
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
+
+    }
+
+    /**
+     * Renames the node
+     * 
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/ObjectTree.php b/3rdparty/Sabre/DAV/ObjectTree.php
new file mode 100644
index 00000000000..f12a3683705
--- /dev/null
+++ b/3rdparty/Sabre/DAV/ObjectTree.php
@@ -0,0 +1,154 @@
+<?php
+
+/**
+ * ObjectTree class
+ *
+ * This implementation of the Tree class makes use of the INode, IFile and ICollection API's 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_ObjectTree extends Sabre_DAV_Tree {
+
+    /**
+     * The root node 
+     * 
+     * @var Sabre_DAV_ICollection
+     */
+    protected $rootNode;
+
+    /**
+     * This is the node cache. Accessed nodes are stored here 
+     * 
+     * @var array 
+     */
+    protected $cache = array();
+
+    /**
+     * Creates the object
+     *
+     * This method expects the rootObject to be passed as a parameter
+     * 
+     * @param Sabre_DAV_ICollection $rootNode 
+     * @return void
+     */
+    public function __construct(Sabre_DAV_ICollection $rootNode) {
+
+        $this->rootNode = $rootNode;
+
+    }
+
+    /**
+     * Returns the INode object for the requested path  
+     * 
+     * @param string $path 
+     * @return Sabre_DAV_INode 
+     */
+    public function getNodeForPath($path) {
+
+        $path = trim($path,'/');
+        if (isset($this->cache[$path])) return $this->cache[$path];
+
+        //if (!$path || $path=='.') return $this->rootNode;
+        $currentNode = $this->rootNode;
+        $i=0;
+        // We're splitting up the path variable into folder/subfolder components and traverse to the correct node.. 
+        foreach(explode('/',$path) as $pathPart) {
+
+            // If this part of the path is just a dot, it actually means we can skip it
+            if ($pathPart=='.' || $pathPart=='') continue;
+
+            if (!($currentNode instanceof Sabre_DAV_ICollection))
+                throw new Sabre_DAV_Exception_FileNotFound('Could not find node at path: ' . $path);
+
+            $currentNode = $currentNode->getChild($pathPart); 
+
+        }
+
+        $this->cache[$path] = $currentNode;
+        return $currentNode;
+
+    }
+
+    /**
+     * This function allows you to check if a node exists.
+     *
+     * @param string $path 
+     * @return bool 
+     */
+    public function nodeExists($path) {
+
+        try {
+
+            // The root always exists
+            if ($path==='') return true;
+
+            list($parent, $base) = Sabre_DAV_URLUtil::splitPath($path);
+
+            $parentNode = $this->getNodeForPath($parent);
+            if (!$parentNode instanceof Sabre_DAV_ICollection) return false;
+            return $parentNode->childExists($base);
+
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+
+            return false;
+
+        }
+
+    }
+
+    /**
+     * Returns a list of childnodes for a given path. 
+     * 
+     * @param string $path 
+     * @return array 
+     */
+    public function getChildren($path) {
+
+        $node = $this->getNodeForPath($path);
+        $children = $node->getChildren();
+        foreach($children as $child) {
+
+            $this->cache[trim($path,'/') . '/' . $child->getName()] = $child;
+
+        }
+        return $children;
+
+    }
+
+    /**
+     * This method is called with every tree update
+     *
+     * Examples of tree updates are:
+     *   * node deletions
+     *   * node creations
+     *   * copy
+     *   * move
+     *   * renaming nodes 
+     * 
+     * If Tree classes implement a form of caching, this will allow
+     * them to make sure caches will be expired.
+     * 
+     * If a path is passed, it is assumed that the entire subtree is dirty
+     *
+     * @param string $path 
+     * @return void
+     */
+    public function markDirty($path) {
+
+        // We don't care enough about sub-paths
+        // flushing the entire cache
+        $path = trim($path,'/');
+        foreach($this->cache as $nodePath=>$node) {
+            if ($nodePath == $path || strpos($nodePath,$path.'/')===0)
+                unset($this->cache[$nodePath]);
+            
+        }
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Property.php b/3rdparty/Sabre/DAV/Property.php
new file mode 100644
index 00000000000..577535b0127
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Abstract property class
+ *
+ * Extend this class to create custom complex properties
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Property {
+
+    abstract function serialize(Sabre_DAV_Server $server, DOMElement $prop); 
+
+    static function unserialize(DOMElement $prop) {
+
+        throw new Sabre_DAV_Exception('Unserialize has not been implemented for this class');
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Property/GetLastModified.php b/3rdparty/Sabre/DAV/Property/GetLastModified.php
new file mode 100644
index 00000000000..4a812629971
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/GetLastModified.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * This property represents the {DAV:}getlastmodified property.
+ * 
+ * Although this is normally a simple property, windows requires us to add
+ * some new attributes.
+ *
+ * This class uses unix timestamps internally, and converts them to RFC 1123 times for 
+ * serialization
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_GetLastModified extends Sabre_DAV_Property {
+
+    /**
+     * time 
+     * 
+     * @var int 
+     */
+    public $time;
+
+    /**
+     * __construct 
+     * 
+     * @param int|DateTime $time 
+     * @return void
+     */
+    public function __construct($time) {
+
+        if ($time instanceof DateTime) {
+            $this->time = $time;
+        } elseif (is_int($time) || ctype_digit($time)) {
+            $this->time = new DateTime('@' . $time);
+        } else {
+            $this->time = new DateTime($time);
+        }
+
+        // Setting timezone to UTC
+        $this->time->setTimezone(new DateTimeZone('UTC'));
+
+    }
+
+    /**
+     * serialize 
+     * 
+     * @param DOMElement $prop 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
+
+        $doc = $prop->ownerDocument;
+        $prop->setAttribute('xmlns:b','urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/');
+        $prop->setAttribute('b:dt','dateTime.rfc1123');
+        $prop->nodeValue = $this->time->format(DateTime::RFC1123);
+
+    }
+
+    /**
+     * getTime 
+     * 
+     * @return DateTime 
+     */
+    public function getTime() {
+
+        return $this->time;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Property/Href.php b/3rdparty/Sabre/DAV/Property/Href.php
new file mode 100644
index 00000000000..3294ff2ac68
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/Href.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * Href property
+ *
+ * The href property represpents a url within a {DAV:}href element.
+ * This is used by many WebDAV extensions, but not really within the WebDAV core spec
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_Href extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
+
+    /**
+     * href 
+     * 
+     * @var string 
+     */
+    private $href;
+
+    /**
+     * Automatically prefix the url with the server base directory 
+     * 
+     * @var bool 
+     */
+    private $autoPrefix = true;
+
+    /**
+     * __construct 
+     * 
+     * @param string $href 
+     * @return void
+     */
+    public function __construct($href, $autoPrefix = true) {
+
+        $this->href = $href;
+        $this->autoPrefix = $autoPrefix;
+
+    }
+
+    /**
+     * Returns the uri 
+     * 
+     * @return string 
+     */
+    public function getHref() {
+
+        return $this->href;
+
+    }
+
+    /**
+     * Serializes this property.
+     *
+     * It will additionally prepend the href property with the server's base uri.
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $dom 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
+
+        $prefix = $server->xmlNamespaces['DAV:'];
+
+        $elem = $dom->ownerDocument->createElement($prefix . ':href');
+        $elem->nodeValue = ($this->autoPrefix?$server->getBaseUri():'') . $this->href;
+        $dom->appendChild($elem);
+
+    }
+
+    /**
+     * Unserializes this property from a DOM Element 
+     *
+     * This method returns an instance of this class.
+     * It will only decode {DAV:}href values. For non-compatible elements null will be returned.
+     *
+     * @param DOMElement $dom 
+     * @return Sabre_DAV_Property_Href 
+     */
+    static function unserialize(DOMElement $dom) {
+
+        if (Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild)==='{DAV:}href') {
+            return new self($dom->firstChild->textContent,false);
+        }
+
+    } 
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/HrefList.php b/3rdparty/Sabre/DAV/Property/HrefList.php
new file mode 100644
index 00000000000..76a5512901c
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/HrefList.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * HrefList property
+ *
+ * This property contains multiple {DAV:}href elements, each containing a url. 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_HrefList extends Sabre_DAV_Property {
+
+    /**
+     * hrefs 
+     * 
+     * @var array 
+     */
+    private $hrefs;
+
+    /**
+     * Automatically prefix the url with the server base directory 
+     * 
+     * @var bool 
+     */
+    private $autoPrefix = true;
+
+    /**
+     * __construct 
+     * 
+     * @param array $hrefs
+     * @param bool $autoPrefix 
+     */
+    public function __construct(array $hrefs, $autoPrefix = true) {
+
+        $this->hrefs = $hrefs;
+        $this->autoPrefix = $autoPrefix;
+
+    }
+
+    /**
+     * Returns the uris 
+     * 
+     * @return array 
+     */
+    public function getHrefs() {
+
+        return $this->hrefs;
+
+    }
+
+    /**
+     * Serializes this property.
+     *
+     * It will additionally prepend the href property with the server's base uri.
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $dom 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
+
+        $prefix = $server->xmlNamespaces['DAV:'];
+
+        foreach($this->hrefs as $href) {
+            $elem = $dom->ownerDocument->createElement($prefix . ':href');
+            $elem->nodeValue = ($this->autoPrefix?$server->getBaseUri():'') . $href;
+            $dom->appendChild($elem);
+        }
+
+    }
+
+    /**
+     * Unserializes this property from a DOM Element 
+     *
+     * This method returns an instance of this class.
+     * It will only decode {DAV:}href values.
+     *
+     * @param DOMElement $dom 
+     * @return Sabre_DAV_Property_Href 
+     */
+    static function unserialize(DOMElement $dom) {
+
+        $hrefs = array();
+        foreach($dom->childNodes as $child) {
+            if (Sabre_DAV_XMLUtil::toClarkNotation($child)==='{DAV:}href') {
+                $hrefs[] = $child->textContent;
+            }
+        }
+        return new self($hrefs, false);
+
+    } 
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/IHref.php b/3rdparty/Sabre/DAV/Property/IHref.php
new file mode 100644
index 00000000000..29d76a44fcd
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/IHref.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * IHref interface
+ *
+ * Any property implementing this interface can expose a related url.
+ * This is used by certain subsystems to aquire more information about for example
+ * the owner of a file
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_Property_IHref {
+
+    /**
+     * getHref 
+     * 
+     * @return string 
+     */
+    function getHref();
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/LockDiscovery.php b/3rdparty/Sabre/DAV/Property/LockDiscovery.php
new file mode 100644
index 00000000000..05c7470b4ed
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/LockDiscovery.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * Represents {DAV:}lockdiscovery property
+ *
+ * This property contains all the open locks on a given resource
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_LockDiscovery extends Sabre_DAV_Property {
+
+    /**
+     * locks 
+     * 
+     * @var array 
+     */
+    public $locks;
+ 
+    /**
+     * Should we show the locktoken as well? 
+     * 
+     * @var bool 
+     */
+    public $revealLockToken;
+
+    /**
+     * Hides the {DAV:}lockroot element from the response.
+     *
+     * It was reported that showing the lockroot in the response can break
+     * Office 2000 compatibility.
+     */
+    static public $hideLockRoot = false;
+
+    /**
+     * __construct 
+     * 
+     * @param array $locks 
+     * @param bool $revealLockToken 
+     * @return void
+     */
+    public function __construct($locks,$revealLockToken = false) {
+
+        $this->locks = $locks;
+        $this->revealLockToken = $revealLockToken;
+
+    }
+
+    /**
+     * serialize 
+     * 
+     * @param DOMElement $prop 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $prop) {
+
+        $doc = $prop->ownerDocument;
+
+        foreach($this->locks as $lock) {
+
+            $activeLock = $doc->createElementNS('DAV:','d:activelock');
+            $prop->appendChild($activeLock);
+
+            $lockScope = $doc->createElementNS('DAV:','d:lockscope');
+            $activeLock->appendChild($lockScope);
+
+            $lockScope->appendChild($doc->createElementNS('DAV:','d:' . ($lock->scope==Sabre_DAV_Locks_LockInfo::EXCLUSIVE?'exclusive':'shared')));
+
+            $lockType = $doc->createElementNS('DAV:','d:locktype');
+            $activeLock->appendChild($lockType);
+
+            $lockType->appendChild($doc->createElementNS('DAV:','d:write'));
+
+            /* {DAV:}lockroot */ 
+            if (!self::$hideLockRoot) {
+                $lockRoot = $doc->createElementNS('DAV:','d:lockroot');
+                $activeLock->appendChild($lockRoot);
+                $href = $doc->createElementNS('DAV:','d:href');
+                $href->appendChild($doc->createTextNode($server->getBaseUri() . $lock->uri));
+                $lockRoot->appendChild($href);
+            }
+
+            $activeLock->appendChild($doc->createElementNS('DAV:','d:depth',($lock->depth == Sabre_DAV_Server::DEPTH_INFINITY?'infinity':$lock->depth)));
+            $activeLock->appendChild($doc->createElementNS('DAV:','d:timeout','Second-' . $lock->timeout));
+
+            if ($this->revealLockToken) {
+                $lockToken = $doc->createElementNS('DAV:','d:locktoken');
+                $activeLock->appendChild($lockToken);
+                $lockToken->appendChild($doc->createElementNS('DAV:','d:href','opaquelocktoken:' . $lock->token));
+            }
+           
+            $activeLock->appendChild($doc->createElementNS('DAV:','d:owner',$lock->owner));
+
+        }
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Property/ResourceType.php b/3rdparty/Sabre/DAV/Property/ResourceType.php
new file mode 100644
index 00000000000..2c606c22d60
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/ResourceType.php
@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * This class represents the {DAV:}resourcetype property
+ *
+ * Normally for files this is empty, and for collection {DAV:}collection.
+ * However, other specs define different values for this. 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_ResourceType extends Sabre_DAV_Property {
+
+    /**
+     * resourceType 
+     * 
+     * @var array
+     */
+    public $resourceType = array();
+
+    /**
+     * __construct 
+     * 
+     * @param mixed $resourceType 
+     * @return void
+     */
+    public function __construct($resourceType = array()) {
+
+        if ($resourceType === Sabre_DAV_Server::NODE_FILE)
+            $this->resourceType = array();
+        elseif ($resourceType === Sabre_DAV_Server::NODE_DIRECTORY)
+            $this->resourceType = array('{DAV:}collection');
+        elseif (is_array($resourceType)) 
+            $this->resourceType = $resourceType;
+        else
+            $this->resourceType = array($resourceType);
+
+    }
+
+    /**
+     * serialize 
+     * 
+     * @param DOMElement $prop 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $prop) {
+
+        $propName = null;
+        $rt = $this->resourceType;
+        
+        foreach($rt as $resourceType) {
+            if (preg_match('/^{([^}]*)}(.*)$/',$resourceType,$propName)) { 
+       
+                if (isset($server->xmlNamespaces[$propName[1]])) {
+                    $prop->appendChild($prop->ownerDocument->createElement($server->xmlNamespaces[$propName[1]] . ':' . $propName[2]));
+                } else {
+                    $prop->appendChild($prop->ownerDocument->createElementNS($propName[1],'custom:' . $propName[2]));
+                }
+            
+            }
+        }
+
+    }
+
+    /**
+     * Returns the values in clark-notation
+     *
+     * For example array('{DAV:}collection')
+     * 
+     * @return array 
+     */
+    public function getValue() {
+
+        return $this->resourceType;
+
+    }
+
+    /**
+     * Checks if the principal contains a certain value 
+     * 
+     * @param string $type 
+     * @return bool 
+     */
+    public function is($type) {
+
+        return in_array($type, $this->resourceType);
+
+    }
+
+    /**
+     * Adds a resourcetype value to this property
+     *
+     * @param string $type
+     * @return void
+     */
+    public function add($type) {
+
+        $this->resourceType[] = $type;
+        $this->resourceType = array_unique($this->resourceType);
+
+    }
+
+    /**
+     * Unserializes a DOM element into a ResourceType property. 
+     * 
+     * @param DOMElement $dom 
+     * @return void
+     */
+    static public function unserialize(DOMElement $dom) {
+
+        $value = array();
+        foreach($dom->childNodes as $child) {
+
+            $value[] = Sabre_DAV_XMLUtil::toClarkNotation($child);
+
+        }
+
+        return new self($value);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/Response.php b/3rdparty/Sabre/DAV/Property/Response.php
new file mode 100644
index 00000000000..7d3a2db0387
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/Response.php
@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * Response property 
+ * 
+ * This class represents the {DAV:}response XML element.
+ * This is used by the Server class to encode individual items within a multistatus 
+ * response.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_Response extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
+
+    /**
+     * Url for the response 
+     * 
+     * @var string 
+     */
+    private $href;
+
+    /**
+     * Propertylist, ordered by HTTP status code 
+     * 
+     * @var array 
+     */
+    private $responseProperties;
+
+    /**
+     * The responseProperties argument is a list of properties
+     * within an array with keys representing HTTP status codes
+     * 
+     * @param string $href 
+     * @param array $responseProperties 
+     * @return void
+     */
+    public function __construct($href,array $responseProperties) {
+
+        $this->href = $href;
+        $this->responseProperties = $responseProperties; 
+
+    }
+
+    /**
+     * Returns the url 
+     * 
+     * @return string 
+     */
+    public function getHref() {
+
+        return $this->href;
+
+    }
+
+    /**
+     * Returns the property list 
+     * 
+     * @return array 
+     */
+    public function getResponseProperties() {
+
+        return $this->responseProperties;
+
+    }
+
+    /**
+     * serialize 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $dom 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
+
+        $document = $dom->ownerDocument;
+        $properties = $this->responseProperties;
+        
+        $xresponse = $document->createElement('d:response');
+        $dom->appendChild($xresponse); 
+
+        $uri = Sabre_DAV_URLUtil::encodePath($this->href);
+
+        // Adding the baseurl to the beginning of the url
+        $uri = $server->getBaseUri() . $uri;
+
+        $xresponse->appendChild($document->createElement('d:href',$uri));
+       
+        // The properties variable is an array containing properties, grouped by
+        // HTTP status
+        foreach($properties as $httpStatus=>$propertyGroup) {
+
+            // The 'href' is also in this array, and it's special cased.
+            // We will ignore it
+            if ($httpStatus=='href') continue;
+
+            // If there are no properties in this group, we can also just carry on
+            if (!count($propertyGroup)) continue;
+
+            $xpropstat = $document->createElement('d:propstat');
+            $xresponse->appendChild($xpropstat);
+
+            $xprop = $document->createElement('d:prop');
+            $xpropstat->appendChild($xprop);
+
+            $nsList = $server->xmlNamespaces;
+
+            foreach($propertyGroup as $propertyName=>$propertyValue) {
+
+                $propName = null;
+                preg_match('/^{([^}]*)}(.*)$/',$propertyName,$propName);
+            
+                // special case for empty namespaces
+                if ($propName[1]=='') {
+
+                    $currentProperty = $document->createElement($propName[2]);
+                    $xprop->appendChild($currentProperty);
+                    $currentProperty->setAttribute('xmlns','');
+
+                } else {
+
+                    if (!isset($nsList[$propName[1]])) {
+                        $nsList[$propName[1]] = 'x' . count($nsList);
+                    }
+
+                    // If the namespace was defined in the top-level xml namespaces, it means 
+                    // there was already a namespace declaration, and we don't have to worry about it.
+                    if (isset($server->xmlNamespaces[$propName[1]])) {
+                        $currentProperty = $document->createElement($nsList[$propName[1]] . ':' . $propName[2]);
+                    } else {
+                        $currentProperty = $document->createElementNS($propName[1],$nsList[$propName[1]].':' . $propName[2]);
+                    }
+                    $xprop->appendChild($currentProperty);
+
+                }
+
+                if (is_scalar($propertyValue)) {
+                    $text = $document->createTextNode($propertyValue);
+                    $currentProperty->appendChild($text);
+                } elseif ($propertyValue instanceof Sabre_DAV_Property) {
+                    $propertyValue->serialize($server,$currentProperty);
+                } elseif (!is_null($propertyValue)) {
+                    throw new Sabre_DAV_Exception('Unknown property value type: ' . gettype($propertyValue) . ' for property: ' . $propertyName);
+                }
+
+            }
+
+            $xpropstat->appendChild($document->createElement('d:status',$server->httpResponse->getStatusMessage($httpStatus)));
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/ResponseList.php b/3rdparty/Sabre/DAV/Property/ResponseList.php
new file mode 100644
index 00000000000..cd70b12861d
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/ResponseList.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * ResponseList property 
+ * 
+ * This class represents multiple {DAV:}response XML elements.
+ * This is used by the Server class to encode items within a multistatus 
+ * response.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_ResponseList extends Sabre_DAV_Property {
+
+    /**
+     * Response objects. 
+     * 
+     * @var array 
+     */
+    private $responses;
+
+    /**
+     * The only valid argument is a list of Sabre_DAV_Property_Response 
+     * objects.
+     * 
+     * @param array $responses; 
+     * @return void
+     */
+    public function __construct($responses) {
+
+        foreach($responses as $response) {
+            if (!($response instanceof Sabre_DAV_Property_Response)) {
+                throw new InvalidArgumentException('You must pass an array of Sabre_DAV_Property_Response objects');
+            }
+        }
+        $this->responses = $responses;
+
+    }
+
+    /**
+     * serialize 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $dom 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
+
+        foreach($this->responses as $response) {
+            $response->serialize($server, $dom);
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Property/SupportedLock.php b/3rdparty/Sabre/DAV/Property/SupportedLock.php
new file mode 100644
index 00000000000..01e63f58d9d
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/SupportedLock.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * This class represents the {DAV:}supportedlock property
+ *
+ * This property contains information about what kind of locks
+ * this server supports.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_SupportedLock extends Sabre_DAV_Property {
+
+    /**
+     * supportsLocks 
+     * 
+     * @var mixed
+     */
+    public $supportsLocks = false;
+
+    /**
+     * __construct 
+     * 
+     * @param mixed $supportsLocks 
+     * @return void
+     */
+    public function __construct($supportsLocks) {
+
+        $this->supportsLocks = $supportsLocks;
+
+    }
+
+    /**
+     * serialize 
+     * 
+     * @param DOMElement $prop 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $prop) {
+
+        $doc = $prop->ownerDocument;
+
+        if (!$this->supportsLocks) return null;
+
+        $lockEntry1 = $doc->createElementNS('DAV:','d:lockentry');
+        $lockEntry2 = $doc->createElementNS('DAV:','d:lockentry');
+
+        $prop->appendChild($lockEntry1);
+        $prop->appendChild($lockEntry2);
+
+        $lockScope1 = $doc->createElementNS('DAV:','d:lockscope');
+        $lockScope2 = $doc->createElementNS('DAV:','d:lockscope');
+        $lockType1 = $doc->createElementNS('DAV:','d:locktype');
+        $lockType2 = $doc->createElementNS('DAV:','d:locktype');
+
+        $lockEntry1->appendChild($lockScope1);
+        $lockEntry1->appendChild($lockType1);
+        $lockEntry2->appendChild($lockScope2);
+        $lockEntry2->appendChild($lockType2);
+
+        $lockScope1->appendChild($doc->createElementNS('DAV:','d:exclusive'));
+        $lockScope2->appendChild($doc->createElementNS('DAV:','d:shared'));
+
+        $lockType1->appendChild($doc->createElementNS('DAV:','d:write'));
+        $lockType2->appendChild($doc->createElementNS('DAV:','d:write'));
+
+        //$frag->appendXML('<d:lockentry><d:lockscope><d:exclusive /></d:lockscope><d:locktype><d:write /></d:locktype></d:lockentry>');
+        //$frag->appendXML('<d:lockentry><d:lockscope><d:shared /></d:lockscope><d:locktype><d:write /></d:locktype></d:lockentry>');
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Property/SupportedReportSet.php b/3rdparty/Sabre/DAV/Property/SupportedReportSet.php
new file mode 100644
index 00000000000..acd9219c0f7
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Property/SupportedReportSet.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * supported-report-set property.
+ *
+ * This property is defined in RFC3253, but since it's
+ * so common in other webdav-related specs, it is part of the core server.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_SupportedReportSet extends Sabre_DAV_Property {
+
+    /**
+     * List of reports 
+     * 
+     * @var array
+     */
+    protected $reports = array();
+
+    /**
+     * Creates the property
+     *
+     * Any reports passed in the constructor
+     * should be valid report-types in clark-notation.
+     *
+     * Either a string or an array of strings must be passed.
+     * 
+     * @param mixed $reports 
+     * @return void
+     */
+    public function __construct($reports = null) {
+
+        if (!is_null($reports)) 
+            $this->addReport($reports);
+
+    }
+
+    /**
+     * Adds a report to this property
+     *
+     * The report must be a string in clark-notation.
+     * Multiple reports can be specified as an array.
+     * 
+     * @param mixed $report 
+     * @return void
+     */
+    public function addReport($report) {
+
+        if (!is_array($report)) $report = array($report);
+
+        foreach($report as $r) {
+
+            if (!preg_match('/^{([^}]*)}(.*)$/',$r)) 
+                throw new Sabre_DAV_Exception('Reportname must be in clark-notation');
+
+            $this->reports[] = $r;
+
+        }
+
+    }
+
+    /**
+     * Returns the list of supported reports
+     * 
+     * @return array 
+     */
+    public function getValue() {
+
+        return $this->reports;
+
+    }
+
+    /**
+     * Serializes the node 
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $prop 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $prop) {
+
+        foreach($this->reports as $reportName) {
+     
+            $supportedReport = $prop->ownerDocument->createElement('d:supported-report');
+            $prop->appendChild($supportedReport);
+
+            $report = $prop->ownerDocument->createElement('d:report');
+            $supportedReport->appendChild($report);
+
+            preg_match('/^{([^}]*)}(.*)$/',$reportName,$matches);
+            
+            list(, $namespace, $element) = $matches;
+       
+            $prefix = isset($server->xmlNamespaces[$namespace])?$server->xmlNamespaces[$namespace]:null;
+
+            if ($prefix) {
+                $report->appendChild($prop->ownerDocument->createElement($prefix . ':' . $element));
+            } else {
+                $report->appendChild($prop->ownerDocument->createElementNS($namespace, 'x:' . $element));
+            }
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Server.php b/3rdparty/Sabre/DAV/Server.php
new file mode 100644
index 00000000000..3d76d4f1918
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Server.php
@@ -0,0 +1,1941 @@
+<?php
+
+/**
+ * Main DAV server class
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Server {
+
+    /**
+     * Inifinity is used for some request supporting the HTTP Depth header and indicates that the operation should traverse the entire tree
+     */
+    const DEPTH_INFINITY = -1;
+
+    /**
+     * Nodes that are files, should have this as the type property
+     */
+    const NODE_FILE = 1;
+
+    /**
+     * Nodes that are directories, should use this value as the type property
+     */
+    const NODE_DIRECTORY = 2;
+
+    const PROP_SET = 1;
+    const PROP_REMOVE = 2;
+
+    /**
+     * XML namespace for all SabreDAV related elements
+     */
+    const NS_SABREDAV = 'http://sabredav.org/ns';
+
+    /**
+     * The tree object
+     * 
+     * @var Sabre_DAV_Tree 
+     */
+    public $tree;
+
+    /**
+     * The base uri 
+     * 
+     * @var string 
+     */
+    protected $baseUri = null; 
+
+    /**
+     * httpResponse 
+     * 
+     * @var Sabre_HTTP_Response 
+     */
+    public $httpResponse;
+
+    /**
+     * httpRequest
+     * 
+     * @var Sabre_HTTP_Request 
+     */
+    public $httpRequest;
+
+    /**
+     * The list of plugins 
+     * 
+     * @var array 
+     */
+    protected $plugins = array();
+
+    /**
+     * This array contains a list of callbacks we should call when certain events are triggered 
+     * 
+     * @var array
+     */
+    protected $eventSubscriptions = array();
+
+    /**
+     * This is a default list of namespaces.
+     *
+     * If you are defining your own custom namespace, add it here to reduce
+     * bandwidth and improve legibility of xml bodies.
+     * 
+     * @var array
+     */
+    public $xmlNamespaces = array(
+        'DAV:' => 'd',
+        'http://sabredav.org/ns' => 's',
+    );
+
+    /**
+     * The propertymap can be used to map properties from 
+     * requests to property classes.
+     * 
+     * @var array
+     */
+    public $propertyMap = array(
+        '{DAV:}resourcetype' => 'Sabre_DAV_Property_ResourceType',
+    );
+
+    public $protectedProperties = array(
+        // RFC4918
+        '{DAV:}getcontentlength',
+        '{DAV:}getetag',
+        '{DAV:}getlastmodified',
+        '{DAV:}lockdiscovery',
+        '{DAV:}resourcetype',
+        '{DAV:}supportedlock',
+
+        // RFC4331
+        '{DAV:}quota-available-bytes',
+        '{DAV:}quota-used-bytes',
+
+        // RFC3744
+        '{DAV:}supported-privilege-set',
+        '{DAV:}current-user-privilege-set',
+        '{DAV:}acl',
+        '{DAV:}acl-restrictions',
+        '{DAV:}inherited-acl-set',
+
+    );
+
+    /**
+     * This is a flag that allow or not showing file, line and code
+     * of the exception in the returned XML
+     *
+     * @var bool 
+     */
+    public $debugExceptions = false;
+
+    /**
+     * This property allows you to automatically add the 'resourcetype' value 
+     * based on a node's classname or interface.
+     *
+     * The preset ensures that {DAV:}collection is automaticlly added for nodes 
+     * implementing Sabre_DAV_ICollection.
+     * 
+     * @var array
+     */
+    public $resourceTypeMapping = array(
+        'Sabre_DAV_ICollection' => '{DAV:}collection',
+    );
+
+
+    /**
+     * Sets up the server
+     *
+     * If a Sabre_DAV_Tree object is passed as an argument, it will
+     * use it as the directory tree. If a Sabre_DAV_INode is passed, it
+     * will create a Sabre_DAV_ObjectTree and use the node as the root.
+     *
+     * If nothing is passed, a Sabre_DAV_SimpleCollection is created in 
+     * a Sabre_DAV_ObjectTree.
+     *
+     * If an array is passed, we automatically create a root node, and use
+     * the nodes in the array as top-level children. 
+     * 
+     * @param Sabre_DAV_Tree $tree The tree object 
+     * @return void
+     */
+    public function __construct($treeOrNode = null) {
+
+        if ($treeOrNode instanceof Sabre_DAV_Tree) {
+            $this->tree = $treeOrNode;
+        } elseif ($treeOrNode instanceof Sabre_DAV_INode) {
+            $this->tree = new Sabre_DAV_ObjectTree($treeOrNode);
+        } elseif (is_array($treeOrNode)) {
+
+            // If it's an array, a list of nodes was passed, and we need to
+            // create the root node.
+            foreach($treeOrNode as $node) {
+                if (!($node instanceof Sabre_DAV_INode)) {
+                    throw new Sabre_DAV_Exception('Invalid argument passed to constructor. If you\'re passing an array, all the values must implement Sabre_DAV_INode');
+                }
+            }
+
+            $root = new Sabre_DAV_SimpleCollection('root', $treeOrNode);
+            $this->tree = new Sabre_DAV_ObjectTree($root);
+
+        } elseif (is_null($treeOrNode)) {
+            $root = new Sabre_DAV_SimpleCollection('root');
+            $this->tree = new Sabre_DAV_ObjectTree($root);
+        } else {
+            throw new Sabre_DAV_Exception('Invalid argument passed to constructor. Argument must either be an instance of Sabre_DAV_Tree, Sabre_DAV_INode, an array or null');
+        }
+        $this->httpResponse = new Sabre_HTTP_Response();
+        $this->httpRequest = new Sabre_HTTP_Request();
+
+    }
+
+    /**
+     * Starts the DAV Server 
+     *
+     * @return void
+     */
+    public function exec() {
+
+        try {
+
+            $this->invokeMethod($this->httpRequest->getMethod(), $this->getRequestUri());
+
+        } catch (Exception $e) {
+
+            $DOM = new DOMDocument('1.0','utf-8');
+            $DOM->formatOutput = true;
+
+            $error = $DOM->createElementNS('DAV:','d:error');
+            $error->setAttribute('xmlns:s',self::NS_SABREDAV);
+            $DOM->appendChild($error);
+
+            $error->appendChild($DOM->createElement('s:exception',get_class($e)));
+            $error->appendChild($DOM->createElement('s:message',$e->getMessage()));
+            if ($this->debugExceptions) {
+                $error->appendChild($DOM->createElement('s:file',$e->getFile()));
+                $error->appendChild($DOM->createElement('s:line',$e->getLine()));
+                $error->appendChild($DOM->createElement('s:code',$e->getCode()));
+                $error->appendChild($DOM->createElement('s:stacktrace',$e->getTraceAsString()));
+
+            }
+            $error->appendChild($DOM->createElement('s:sabredav-version',Sabre_DAV_Version::VERSION));
+
+            if($e instanceof Sabre_DAV_Exception) {
+
+                $httpCode = $e->getHTTPCode();
+                $e->serialize($this,$error);
+                $headers = $e->getHTTPHeaders($this);
+
+            } else {
+
+                $httpCode = 500;
+                $headers = array();
+
+            }
+            $headers['Content-Type'] = 'application/xml; charset=utf-8';
+            
+            $this->httpResponse->sendStatus($httpCode);
+            $this->httpResponse->setHeaders($headers);
+            $this->httpResponse->sendBody($DOM->saveXML());
+
+        }
+
+    }
+
+    /**
+     * Sets the base server uri
+     * 
+     * @param string $uri
+     * @return void
+     */
+    public function setBaseUri($uri) {
+
+        // If the baseUri does not end with a slash, we must add it
+        if ($uri[strlen($uri)-1]!=='/') 
+            $uri.='/';
+
+        $this->baseUri = $uri;    
+
+    }
+
+    /**
+     * Returns the base responding uri
+     * 
+     * @return string 
+     */
+    public function getBaseUri() {
+
+        if (is_null($this->baseUri)) $this->baseUri = $this->guessBaseUri();
+        return $this->baseUri;
+
+    }
+
+    /**
+     * This method attempts to detect the base uri.
+     * Only the PATH_INFO variable is considered. 
+     * 
+     * If this variable is not set, the root (/) is assumed. 
+     *
+     * @return void
+     */
+    public function guessBaseUri() {
+
+        $pathInfo = $this->httpRequest->getRawServerValue('PATH_INFO');
+        $uri = $this->httpRequest->getRawServerValue('REQUEST_URI');
+
+        // If PATH_INFO is found, we can assume it's accurate.
+        if (!empty($pathInfo)) {
+
+            // We need to make sure we ignore the QUERY_STRING part
+            if ($pos = strpos($uri,'?'))
+                $uri = substr($uri,0,$pos);
+
+            // PATH_INFO is only set for urls, such as: /example.php/path
+            // in that case PATH_INFO contains '/path'.
+            // Note that REQUEST_URI is percent encoded, while PATH_INFO is
+            // not, Therefore they are only comparable if we first decode
+            // REQUEST_INFO as well.
+            $decodedUri = Sabre_DAV_URLUtil::decodePath($uri);
+
+            // A simple sanity check:
+            if(substr($decodedUri,strlen($decodedUri)-strlen($pathInfo))===$pathInfo) {
+                $baseUri = substr($decodedUri,0,strlen($decodedUri)-strlen($pathInfo));
+                return rtrim($baseUri,'/') . '/';
+            }
+
+            throw new Sabre_DAV_Exception('The REQUEST_URI ('. $uri . ') did not end with the contents of PATH_INFO (' . $pathInfo . '). This server might be misconfigured.'); 
+
+        } 
+
+        // The last fallback is that we're just going to assume the server root. 
+        return '/';
+
+    }
+
+    /**
+     * Adds a plugin to the server
+     * 
+     * For more information, console the documentation of Sabre_DAV_ServerPlugin
+     *
+     * @param Sabre_DAV_ServerPlugin $plugin 
+     * @return void
+     */
+    public function addPlugin(Sabre_DAV_ServerPlugin $plugin) {
+
+        $this->plugins[$plugin->getPluginName()] = $plugin;
+        $plugin->initialize($this);
+
+    }
+
+    /**
+     * Returns an initialized plugin by it's name.
+     *
+     * This function returns null if the plugin was not found.
+     *
+     * @param string $name
+     * @return Sabre_DAV_ServerPlugin 
+     */
+    public function getPlugin($name) {
+
+        if (isset($this->plugins[$name])) 
+            return $this->plugins[$name];
+
+        // This is a fallback and deprecated.
+        foreach($this->plugins as $plugin) {
+            if (get_class($plugin)===$name) return $plugin;
+        }
+
+        return null;
+
+    }
+
+    /**
+     * Returns all plugins 
+     * 
+     * @return array 
+     */
+    public function getPlugins() {
+
+        return $this->plugins;
+
+    }
+
+
+
+    /**
+     * Subscribe to an event.
+     *
+     * When the event is triggered, we'll call all the specified callbacks.
+     * It is possible to control the order of the callbacks through the
+     * priority argument.
+     *
+     * This is for example used to make sure that the authentication plugin
+     * is triggered before anything else. If it's not needed to change this
+     * number, it is recommended to ommit.  
+     * 
+     * @param string $event 
+     * @param callback $callback
+     * @param int $priority
+     * @return void
+     */
+    public function subscribeEvent($event, $callback, $priority = 100) {
+
+        if (!isset($this->eventSubscriptions[$event])) {
+            $this->eventSubscriptions[$event] = array();
+        }
+        while(isset($this->eventSubscriptions[$event][$priority])) $priority++;
+        $this->eventSubscriptions[$event][$priority] = $callback;
+        ksort($this->eventSubscriptions[$event]);
+
+    }
+
+    /**
+     * Broadcasts an event
+     *
+     * This method will call all subscribers. If one of the subscribers returns false, the process stops.
+     *
+     * The arguments parameter will be sent to all subscribers
+     *
+     * @param string $eventName
+     * @param array $arguments
+     * @return bool 
+     */
+    public function broadcastEvent($eventName,$arguments = array()) {
+
+        if (isset($this->eventSubscriptions[$eventName])) {
+
+            foreach($this->eventSubscriptions[$eventName] as $subscriber) {
+
+                $result = call_user_func_array($subscriber,$arguments);
+                if ($result===false) return false;
+
+            }
+
+        }
+
+        return true;
+
+    }
+
+    /**
+     * Handles a http request, and execute a method based on its name 
+     *
+     * @param string $method
+     * @param string $uri
+     * @return void
+     */
+    public function invokeMethod($method, $uri) {
+
+        $method = strtoupper($method); 
+
+        if (!$this->broadcastEvent('beforeMethod',array($method, $uri))) return;
+
+        // Make sure this is a HTTP method we support
+        $internalMethods = array(
+            'OPTIONS',
+            'GET',
+            'HEAD',
+            'DELETE',
+            'PROPFIND',
+            'MKCOL',
+            'PUT',
+            'PROPPATCH',
+            'COPY',
+            'MOVE',
+            'REPORT'
+        );
+
+        if (in_array($method,$internalMethods)) {
+
+            call_user_func(array($this,'http' . $method), $uri);
+
+        } else {
+
+            if ($this->broadcastEvent('unknownMethod',array($method, $uri))) {
+                // Unsupported method
+                throw new Sabre_DAV_Exception_NotImplemented();
+            }
+
+        }
+
+    }
+
+    // {{{ HTTP Method implementations
+    
+    /**
+     * HTTP OPTIONS 
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpOptions($uri) {
+
+        $methods = $this->getAllowedMethods($uri);
+
+        $this->httpResponse->setHeader('Allow',strtoupper(implode(', ',$methods)));
+        $features = array('1','3', 'extended-mkcol');
+
+        foreach($this->plugins as $plugin) $features = array_merge($features,$plugin->getFeatures());
+        
+        $this->httpResponse->setHeader('DAV',implode(', ',$features));
+        $this->httpResponse->setHeader('MS-Author-Via','DAV');
+        $this->httpResponse->setHeader('Accept-Ranges','bytes');
+        $this->httpResponse->setHeader('X-Sabre-Version',Sabre_DAV_Version::VERSION);
+        $this->httpResponse->setHeader('Content-Length',0);
+        $this->httpResponse->sendStatus(200);
+
+    }
+
+    /**
+     * HTTP GET
+     *
+     * This method simply fetches the contents of a uri, like normal
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpGet($uri) {
+
+        $node = $this->tree->getNodeForPath($uri,0);
+
+        if (!$this->checkPreconditions(true)) return false; 
+
+        if (!($node instanceof Sabre_DAV_IFile)) throw new Sabre_DAV_Exception_NotImplemented('GET is only implemented on File objects');
+        $body = $node->get();
+
+        // Converting string into stream, if needed.
+        if (is_string($body)) {
+            $stream = fopen('php://temp','r+');
+            fwrite($stream,$body);
+            rewind($stream);
+            $body = $stream;
+        }
+
+        /*
+         * TODO: getetag, getlastmodified, getsize should also be used using
+         * this method
+         */
+        $httpHeaders = $this->getHTTPHeaders($uri);
+
+        /* ContentType needs to get a default, because many webservers will otherwise
+         * default to text/html, and we don't want this for security reasons.
+         */
+        if (!isset($httpHeaders['Content-Type'])) {
+            $httpHeaders['Content-Type'] = 'application/octet-stream';
+        }
+
+
+        if (isset($httpHeaders['Content-Length'])) {
+
+            $nodeSize = $httpHeaders['Content-Length'];
+
+            // Need to unset Content-Length, because we'll handle that during figuring out the range
+            unset($httpHeaders['Content-Length']);
+
+        } else {
+            $nodeSize = null;
+        }
+        
+        $this->httpResponse->setHeaders($httpHeaders);
+
+        $range = $this->getHTTPRange();
+        $ifRange = $this->httpRequest->getHeader('If-Range');
+        $ignoreRangeHeader = false;
+
+        // If ifRange is set, and range is specified, we first need to check
+        // the precondition.
+        if ($nodeSize && $range && $ifRange) {
+             
+            // if IfRange is parsable as a date we'll treat it as a DateTime
+            // otherwise, we must treat it as an etag.
+            try {
+                $ifRangeDate = new DateTime($ifRange);
+               
+                // It's a date. We must check if the entity is modified since
+                // the specified date.
+                if (!isset($httpHeaders['Last-Modified'])) $ignoreRangeHeader = true;
+                else {
+                    $modified = new DateTime($httpHeaders['Last-Modified']);
+                    if($modified > $ifRangeDate) $ignoreRangeHeader = true;
+                }
+
+            } catch (Exception $e) {
+               
+                // It's an entity. We can do a simple comparison. 
+                if (!isset($httpHeaders['ETag'])) $ignoreRangeHeader = true;
+                elseif ($httpHeaders['ETag']!==$ifRange) $ignoreRangeHeader = true;
+            }
+        }
+
+        // We're only going to support HTTP ranges if the backend provided a filesize
+        if (!$ignoreRangeHeader && $nodeSize && $range) {
+
+            // Determining the exact byte offsets
+            if (!is_null($range[0])) {
+
+                $start = $range[0];
+                $end = $range[1]?$range[1]:$nodeSize-1;
+                if($start >= $nodeSize) 
+                    throw new Sabre_DAV_Exception_RequestedRangeNotSatisfiable('The start offset (' . $range[0] . ') exceeded the size of the entity (' . $nodeSize . ')');
+
+                if($end < $start) throw new Sabre_DAV_Exception_RequestedRangeNotSatisfiable('The end offset (' . $range[1] . ') is lower than the start offset (' . $range[0] . ')');
+                if($end >= $nodeSize) $end = $nodeSize-1;
+
+            } else {
+
+                $start = $nodeSize-$range[1];
+                $end  = $nodeSize-1;
+
+                if ($start<0) $start = 0;
+
+            }
+
+            // New read/write stream
+            $newStream = fopen('php://temp','r+');
+
+            stream_copy_to_stream($body, $newStream, $end-$start+1, $start);
+            rewind($newStream);
+
+            $this->httpResponse->setHeader('Content-Length', $end-$start+1);
+            $this->httpResponse->setHeader('Content-Range','bytes ' . $start . '-' . $end . '/' . $nodeSize);
+            $this->httpResponse->sendStatus(206);
+            $this->httpResponse->sendBody($newStream);
+
+
+        } else {
+
+            if ($nodeSize) $this->httpResponse->setHeader('Content-Length',$nodeSize);
+            $this->httpResponse->sendStatus(200);
+            $this->httpResponse->sendBody($body);
+
+        }
+
+    }
+
+    /**
+     * HTTP HEAD
+     *
+     * This method is normally used to take a peak at a url, and only get the HTTP response headers, without the body
+     * This is used by clients to determine if a remote file was changed, so they can use a local cached version, instead of downloading it again
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpHead($uri) {
+
+        $node = $this->tree->getNodeForPath($uri);
+        /* This information is only collection for File objects.
+         * Ideally we want to throw 405 Method Not Allowed for every 
+         * non-file, but MS Office does not like this
+         */
+        if ($node instanceof Sabre_DAV_IFile) {
+            $headers = $this->getHTTPHeaders($this->getRequestUri());
+            if (!isset($headers['Content-Type'])) {
+                $headers['Content-Type'] = 'application/octet-stream';
+            }
+            $this->httpResponse->setHeaders($headers);
+        }
+        $this->httpResponse->sendStatus(200);
+
+    }
+
+    /**
+     * HTTP Delete 
+     *
+     * The HTTP delete method, deletes a given uri
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpDelete($uri) {
+
+        if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
+        $this->tree->delete($uri);
+
+        $this->httpResponse->sendStatus(204);
+        $this->httpResponse->setHeader('Content-Length','0');
+
+    }
+
+
+    /**
+     * WebDAV PROPFIND 
+     *
+     * This WebDAV method requests information about an uri resource, or a list of resources
+     * If a client wants to receive the properties for a single resource it will add an HTTP Depth: header with a 0 value
+     * If the value is 1, it means that it also expects a list of sub-resources (e.g.: files in a directory)
+     *
+     * The request body contains an XML data structure that has a list of properties the client understands 
+     * The response body is also an xml document, containing information about every uri resource and the requested properties
+     *
+     * It has to return a HTTP 207 Multi-status status code
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpPropfind($uri) {
+
+        // $xml = new Sabre_DAV_XMLReader(file_get_contents('php://input'));
+        $requestedProperties = $this->parsePropfindRequest($this->httpRequest->getBody(true));
+
+        $depth = $this->getHTTPDepth(1);
+        // The only two options for the depth of a propfind is 0 or 1 
+        if ($depth!=0) $depth = 1;
+
+        $newProperties = $this->getPropertiesForPath($uri,$requestedProperties,$depth);
+
+        // This is a multi-status response
+        $this->httpResponse->sendStatus(207);
+        $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+
+        // Normally this header is only needed for OPTIONS responses, however.. 
+        // iCal seems to also depend on these being set for PROPFIND. Since 
+        // this is not harmful, we'll add it.
+        $features = array('1','3', 'extended-mkcol');
+        foreach($this->plugins as $plugin) $features = array_merge($features,$plugin->getFeatures());
+        $this->httpResponse->setHeader('DAV',implode(', ',$features));
+
+        $data = $this->generateMultiStatus($newProperties);
+        $this->httpResponse->sendBody($data);
+
+    }
+
+    /**
+     * WebDAV PROPPATCH
+     *
+     * This method is called to update properties on a Node. The request is an XML body with all the mutations.
+     * In this XML body it is specified which properties should be set/updated and/or deleted
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpPropPatch($uri) {
+
+        $newProperties = $this->parsePropPatchRequest($this->httpRequest->getBody(true));
+        
+        $result = $this->updateProperties($uri, $newProperties);
+
+        $this->httpResponse->sendStatus(207);
+        $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+
+        $this->httpResponse->sendBody(
+            $this->generateMultiStatus(array($result))
+        );
+
+    }
+
+    /**
+     * HTTP PUT method 
+     * 
+     * This HTTP method updates a file, or creates a new one.
+     *
+     * If a new resource was created, a 201 Created status code should be returned. If an existing resource is updated, it's a 200 Ok
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpPut($uri) {
+
+        $body = $this->httpRequest->getBody();
+
+        // Intercepting Content-Range
+        if ($this->httpRequest->getHeader('Content-Range')) {
+            /**
+            Content-Range is dangerous for PUT requests:  PUT per definition
+            stores a full resource.  draft-ietf-httpbis-p2-semantics-15 says
+            in section 7.6:
+              An origin server SHOULD reject any PUT request that contains a
+              Content-Range header field, since it might be misinterpreted as
+              partial content (or might be partial content that is being mistakenly
+              PUT as a full representation).  Partial content updates are possible
+              by targeting a separately identified resource with state that
+              overlaps a portion of the larger resource, or by using a different
+              method that has been specifically defined for partial updates (for
+              example, the PATCH method defined in [RFC5789]).
+            This clarifies RFC2616 section 9.6:
+              The recipient of the entity MUST NOT ignore any Content-*
+              (e.g. Content-Range) headers that it does not understand or implement
+              and MUST return a 501 (Not Implemented) response in such cases.
+            OTOH is a PUT request with a Content-Range currently the only way to
+            continue an aborted upload request and is supported by curl, mod_dav,
+            Tomcat and others.  Since some clients do use this feature which results
+            in unexpected behaviour (cf PEAR::HTTP_WebDAV_Client 1.0.1), we reject
+            all PUT requests with a Content-Range for now.
+            */
+
+            throw new Sabre_DAV_Exception_NotImplemented('PUT with Content-Range is not allowed.');
+        }
+
+        // Intercepting the Finder problem
+        if (($expected = $this->httpRequest->getHeader('X-Expected-Entity-Length')) && $expected > 0) {
+           
+            /**
+            Many webservers will not cooperate well with Finder PUT requests, 
+            because it uses 'Chunked' transfer encoding for the request body.
+
+            The symptom of this problem is that Finder sends files to the 
+            server, but they arrive as 0-lenght files in PHP.
+
+            If we don't do anything, the user might think they are uploading
+            files successfully, but they end up empty on the server. Instead,
+            we throw back an error if we detect this.
+
+            The reason Finder uses Chunked, is because it thinks the files
+            might change as it's being uploaded, and therefore the
+            Content-Length can vary.
+
+            Instead it sends the X-Expected-Entity-Length header with the size
+            of the file at the very start of the request. If this header is set,
+            but we don't get a request body we will fail the request to
+            protect the end-user.
+            */
+
+            // Only reading first byte
+            $firstByte = fread($body,1);
+            if (strlen($firstByte)!==1) {
+                throw new Sabre_DAV_Exception_Forbidden('This server is not compatible with OS/X finder. Consider using a different WebDAV client or webserver.');
+            }
+
+            // The body needs to stay intact, so we copy everything to a
+            // temporary stream.
+
+            $newBody = fopen('php://temp','r+');
+            fwrite($newBody,$firstByte);
+            stream_copy_to_stream($body, $newBody);
+            rewind($newBody);
+
+            $body = $newBody;
+
+        }
+
+        if ($this->tree->nodeExists($uri)) { 
+
+            $node = $this->tree->getNodeForPath($uri);
+          
+            // Checking If-None-Match and related headers.
+            if (!$this->checkPreconditions()) return;
+            
+            // If the node is a collection, we'll deny it
+            if (!($node instanceof Sabre_DAV_IFile)) throw new Sabre_DAV_Exception_Conflict('PUT is not allowed on non-files.');
+            if (!$this->broadcastEvent('beforeWriteContent',array($this->getRequestUri()))) return false;
+
+            $node->put($body);
+            $this->httpResponse->setHeader('Content-Length','0');
+            $this->httpResponse->sendStatus(204);
+
+        } else {
+
+            // If we got here, the resource didn't exist yet.
+            if (!$this->createFile($this->getRequestUri(),$body)) {
+                // For one reason or another the file was not created.
+                return;
+            }
+            $this->httpResponse->setHeader('Content-Length','0');
+            $this->httpResponse->sendStatus(201);
+
+        }
+
+    }
+
+
+    /**
+     * WebDAV MKCOL
+     *
+     * The MKCOL method is used to create a new collection (directory) on the server
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpMkcol($uri) {
+
+        $requestBody = $this->httpRequest->getBody(true);
+
+        if ($requestBody) {
+
+            $contentType = $this->httpRequest->getHeader('Content-Type');
+            if (strpos($contentType,'application/xml')!==0 && strpos($contentType,'text/xml')!==0) {
+
+                // We must throw 415 for unsupport mkcol bodies
+                throw new Sabre_DAV_Exception_UnsupportedMediaType('The request body for the MKCOL request must have an xml Content-Type');
+
+            }
+
+            $dom = Sabre_DAV_XMLUtil::loadDOMDocument($requestBody);
+            if (Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild)!=='{DAV:}mkcol') {
+
+                // We must throw 415 for unsupport mkcol bodies
+                throw new Sabre_DAV_Exception_UnsupportedMediaType('The request body for the MKCOL request must be a {DAV:}mkcol request construct.');
+
+            }
+
+            $properties = array();
+            foreach($dom->firstChild->childNodes as $childNode) {
+
+                if (Sabre_DAV_XMLUtil::toClarkNotation($childNode)!=='{DAV:}set') continue;
+                $properties = array_merge($properties, Sabre_DAV_XMLUtil::parseProperties($childNode, $this->propertyMap));
+
+            }
+            if (!isset($properties['{DAV:}resourcetype'])) 
+                throw new Sabre_DAV_Exception_BadRequest('The mkcol request must include a {DAV:}resourcetype property');
+
+            $resourceType = $properties['{DAV:}resourcetype']->getValue();
+            unset($properties['{DAV:}resourcetype']);
+
+        } else {
+
+            $properties = array();
+            $resourceType = array('{DAV:}collection');
+
+        }
+
+        $result = $this->createCollection($uri, $resourceType, $properties);
+
+        if (is_array($result)) {
+            $this->httpResponse->sendStatus(207);
+            $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+
+            $this->httpResponse->sendBody(
+                $this->generateMultiStatus(array($result))
+            );
+
+        } else {
+            $this->httpResponse->setHeader('Content-Length','0');
+            $this->httpResponse->sendStatus(201);
+        }
+
+    }
+
+    /**
+     * WebDAV HTTP MOVE method
+     *
+     * This method moves one uri to a different uri. A lot of the actual request processing is done in getCopyMoveInfo
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpMove($uri) {
+
+        $moveInfo = $this->getCopyAndMoveInfo();
+
+        // If the destination is part of the source tree, we must fail
+        if ($moveInfo['destination']==$uri) 
+            throw new Sabre_DAV_Exception_Forbidden('Source and destination uri are identical.');
+
+        if ($moveInfo['destinationExists']) {
+
+            if (!$this->broadcastEvent('beforeUnbind',array($moveInfo['destination']))) return false;
+            $this->tree->delete($moveInfo['destination']);
+
+        }
+
+        if (!$this->broadcastEvent('beforeUnbind',array($uri))) return false;
+        if (!$this->broadcastEvent('beforeBind',array($moveInfo['destination']))) return false;
+        $this->tree->move($uri,$moveInfo['destination']);
+        $this->broadcastEvent('afterBind',array($moveInfo['destination']));
+
+        // If a resource was overwritten we should send a 204, otherwise a 201
+        $this->httpResponse->setHeader('Content-Length','0');
+        $this->httpResponse->sendStatus($moveInfo['destinationExists']?204:201);
+
+    }
+
+    /**
+     * WebDAV HTTP COPY method
+     *
+     * This method copies one uri to a different uri, and works much like the MOVE request
+     * A lot of the actual request processing is done in getCopyMoveInfo
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpCopy($uri) {
+
+        $copyInfo = $this->getCopyAndMoveInfo();
+        // If the destination is part of the source tree, we must fail
+        if ($copyInfo['destination']==$uri) 
+            throw new Sabre_DAV_Exception_Forbidden('Source and destination uri are identical.');
+
+        if ($copyInfo['destinationExists']) {
+            if (!$this->broadcastEvent('beforeUnbind',array($copyInfo['destination']))) return false;
+            $this->tree->delete($copyInfo['destination']);
+
+        }
+        if (!$this->broadcastEvent('beforeBind',array($copyInfo['destination']))) return false;
+        $this->tree->copy($uri,$copyInfo['destination']);
+        $this->broadcastEvent('afterBind',array($copyInfo['destination']));
+
+        // If a resource was overwritten we should send a 204, otherwise a 201
+        $this->httpResponse->setHeader('Content-Length','0');
+        $this->httpResponse->sendStatus($copyInfo['destinationExists']?204:201);
+
+    }
+
+
+
+    /**
+     * HTTP REPORT method implementation
+     *
+     * Although the REPORT method is not part of the standard WebDAV spec (it's from rfc3253)
+     * It's used in a lot of extensions, so it made sense to implement it into the core.
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpReport($uri) {
+
+        $body = $this->httpRequest->getBody(true);
+        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+
+        $reportName = Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild);
+
+        if ($this->broadcastEvent('report',array($reportName,$dom, $uri))) {
+
+            // If broadcastEvent returned true, it means the report was not supported
+            throw new Sabre_DAV_Exception_ReportNotImplemented();
+
+        }
+
+    }
+
+    // }}}
+    // {{{ HTTP/WebDAV protocol helpers 
+
+    /**
+     * Returns an array with all the supported HTTP methods for a specific uri. 
+     *
+     * @param string $uri 
+     * @return array 
+     */
+    public function getAllowedMethods($uri) {
+
+        $methods = array(
+            'OPTIONS',
+            'GET',
+            'HEAD',
+            'DELETE',
+            'PROPFIND',
+            'PUT',
+            'PROPPATCH',
+            'COPY',
+            'MOVE',
+            'REPORT'
+        );
+
+        // The MKCOL is only allowed on an unmapped uri
+        try {
+            $node = $this->tree->getNodeForPath($uri);
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+            $methods[] = 'MKCOL';
+        }
+
+        // We're also checking if any of the plugins register any new methods
+        foreach($this->plugins as $plugin) $methods = array_merge($methods,$plugin->getHTTPMethods($uri));
+        array_unique($methods);
+
+        return $methods;
+
+    }
+
+    /**
+     * Gets the uri for the request, keeping the base uri into consideration 
+     * 
+     * @return string
+     */
+    public function getRequestUri() {
+
+        return $this->calculateUri($this->httpRequest->getUri());
+
+    }
+
+    /**
+     * Calculates the uri for a request, making sure that the base uri is stripped out 
+     * 
+     * @param string $uri 
+     * @throws Sabre_DAV_Exception_Forbidden A permission denied exception is thrown whenever there was an attempt to supply a uri outside of the base uri
+     * @return string
+     */
+    public function calculateUri($uri) {
+
+        if ($uri[0]!='/' && strpos($uri,'://')) {
+
+            $uri = parse_url($uri,PHP_URL_PATH);
+
+        }
+
+        $uri = str_replace('//','/',$uri);
+
+        if (strpos($uri,$this->getBaseUri())===0) {
+
+            return trim(Sabre_DAV_URLUtil::decodePath(substr($uri,strlen($this->getBaseUri()))),'/');
+
+        // A special case, if the baseUri was accessed without a trailing 
+        // slash, we'll accept it as well. 
+        } elseif ($uri.'/' === $this->getBaseUri()) { 
+
+            return '';
+
+        } else {
+
+            throw new Sabre_DAV_Exception_Forbidden('Requested uri (' . $uri . ') is out of base uri (' . $this->getBaseUri() . ')');
+
+        }
+
+    }
+
+    /**
+     * Returns the HTTP depth header
+     *
+     * This method returns the contents of the HTTP depth request header. If the depth header was 'infinity' it will return the Sabre_DAV_Server::DEPTH_INFINITY object
+     * It is possible to supply a default depth value, which is used when the depth header has invalid content, or is completely non-existant
+     * 
+     * @param mixed $default 
+     * @return int 
+     */
+    public function getHTTPDepth($default = self::DEPTH_INFINITY) {
+
+        // If its not set, we'll grab the default
+        $depth = $this->httpRequest->getHeader('Depth');
+
+        if (is_null($depth)) return $default;
+
+        if ($depth == 'infinity') return self::DEPTH_INFINITY;
+
+           
+        // If its an unknown value. we'll grab the default
+        if (!ctype_digit($depth)) return $default;
+
+        return (int)$depth;
+
+    }
+
+    /**
+     * Returns the HTTP range header
+     *
+     * This method returns null if there is no well-formed HTTP range request
+     * header or array($start, $end).
+     *
+     * The first number is the offset of the first byte in the range.
+     * The second number is the offset of the last byte in the range.
+     *
+     * If the second offset is null, it should be treated as the offset of the last byte of the entity
+     * If the first offset is null, the second offset should be used to retrieve the last x bytes of the entity 
+     *
+     * return $mixed
+     */
+    public function getHTTPRange() {
+
+        $range = $this->httpRequest->getHeader('range');
+        if (is_null($range)) return null; 
+
+        // Matching "Range: bytes=1234-5678: both numbers are optional
+
+        if (!preg_match('/^bytes=([0-9]*)-([0-9]*)$/i',$range,$matches)) return null;
+
+        if ($matches[1]==='' && $matches[2]==='') return null;
+
+        return array(
+            $matches[1]!==''?$matches[1]:null,
+            $matches[2]!==''?$matches[2]:null,
+        );
+
+    }
+
+
+    /**
+     * Returns information about Copy and Move requests
+     * 
+     * This function is created to help getting information about the source and the destination for the 
+     * WebDAV MOVE and COPY HTTP request. It also validates a lot of information and throws proper exceptions 
+     * 
+     * The returned value is an array with the following keys:
+     *   * destination - Destination path
+     *   * destinationExists - Wether or not the destination is an existing url (and should therefore be overwritten)
+     *
+     * @return array 
+     */
+    public function getCopyAndMoveInfo() {
+
+        // Collecting the relevant HTTP headers
+        if (!$this->httpRequest->getHeader('Destination')) throw new Sabre_DAV_Exception_BadRequest('The destination header was not supplied');
+        $destination = $this->calculateUri($this->httpRequest->getHeader('Destination'));
+        $overwrite = $this->httpRequest->getHeader('Overwrite');
+        if (!$overwrite) $overwrite = 'T';
+        if (strtoupper($overwrite)=='T') $overwrite = true;
+        elseif (strtoupper($overwrite)=='F') $overwrite = false;
+        // We need to throw a bad request exception, if the header was invalid
+        else throw new Sabre_DAV_Exception_BadRequest('The HTTP Overwrite header should be either T or F');
+
+        list($destinationDir) = Sabre_DAV_URLUtil::splitPath($destination);
+
+        try {
+            $destinationParent = $this->tree->getNodeForPath($destinationDir);
+            if (!($destinationParent instanceof Sabre_DAV_ICollection)) throw new Sabre_DAV_Exception_UnsupportedMediaType('The destination node is not a collection');
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+
+            // If the destination parent node is not found, we throw a 409
+            throw new Sabre_DAV_Exception_Conflict('The destination node is not found');
+        }
+
+        try {
+
+            $destinationNode = $this->tree->getNodeForPath($destination);
+            
+            // If this succeeded, it means the destination already exists
+            // we'll need to throw precondition failed in case overwrite is false
+            if (!$overwrite) throw new Sabre_DAV_Exception_PreconditionFailed('The destination node already exists, and the overwrite header is set to false','Overwrite');
+
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+
+            // Destination didn't exist, we're all good
+            $destinationNode = false;
+
+
+
+        }
+
+        // These are the three relevant properties we need to return
+        return array(
+            'destination'       => $destination,
+            'destinationExists' => $destinationNode==true,
+            'destinationNode'   => $destinationNode,
+        );
+
+    }
+
+    /**
+     * Returns a list of properties for a path
+     *
+     * This is a simplified version getPropertiesForPath.
+     * if you aren't interested in status codes, but you just
+     * want to have a flat list of properties. Use this method.
+     *
+     * @param string $path
+     * @param array $propertyNames
+     */
+    public function getProperties($path, $propertyNames) {
+
+        $result = $this->getPropertiesForPath($path,$propertyNames,0);
+        return $result[0][200];
+
+    }
+
+    /**
+     * Returns a list of HTTP headers for a particular resource
+     *
+     * The generated http headers are based on properties provided by the 
+     * resource. The method basically provides a simple mapping between
+     * DAV property and HTTP header.
+     *
+     * The headers are intended to be used for HEAD and GET requests.
+     * 
+     * @param string $path
+     */
+    public function getHTTPHeaders($path) {
+
+        $propertyMap = array(
+            '{DAV:}getcontenttype'   => 'Content-Type',
+            '{DAV:}getcontentlength' => 'Content-Length',
+            '{DAV:}getlastmodified'  => 'Last-Modified', 
+            '{DAV:}getetag'          => 'ETag',
+        );
+
+        $properties = $this->getProperties($path,array_keys($propertyMap));
+
+        $headers = array();
+        foreach($propertyMap as $property=>$header) {
+            if (!isset($properties[$property])) continue;
+
+            if (is_scalar($properties[$property])) { 
+                $headers[$header] = $properties[$property];
+
+            // GetLastModified gets special cased 
+            } elseif ($properties[$property] instanceof Sabre_DAV_Property_GetLastModified) {
+                $headers[$header] = $properties[$property]->getTime()->format(DateTime::RFC1123);
+            }
+
+        }
+
+        return $headers;
+        
+    }
+
+    /**
+     * Returns a list of properties for a given path
+     * 
+     * The path that should be supplied should have the baseUrl stripped out
+     * The list of properties should be supplied in Clark notation. If the list is empty
+     * 'allprops' is assumed.
+     *
+     * If a depth of 1 is requested child elements will also be returned.
+     *
+     * @param string $path 
+     * @param array $propertyNames
+     * @param int $depth 
+     * @return array
+     */
+    public function getPropertiesForPath($path,$propertyNames = array(),$depth = 0) {
+
+        if ($depth!=0) $depth = 1;
+
+        $returnPropertyList = array();
+        
+        $parentNode = $this->tree->getNodeForPath($path);
+        $nodes = array(
+            $path => $parentNode
+        );
+        if ($depth==1 && $parentNode instanceof Sabre_DAV_ICollection) {
+            foreach($this->tree->getChildren($path) as $childNode)
+                $nodes[$path . '/' . $childNode->getName()] = $childNode;
+        }            
+       
+        // If the propertyNames array is empty, it means all properties are requested.
+        // We shouldn't actually return everything we know though, and only return a
+        // sensible list. 
+        $allProperties = count($propertyNames)==0;
+
+        foreach($nodes as $myPath=>$node) {
+
+            $currentPropertyNames = $propertyNames;
+
+            $newProperties = array(
+                '200' => array(),
+                '404' => array(),
+            );
+
+            if ($allProperties) {
+                // Default list of propertyNames, when all properties were requested.
+                $currentPropertyNames = array(
+                    '{DAV:}getlastmodified',
+                    '{DAV:}getcontentlength',
+                    '{DAV:}resourcetype',
+                    '{DAV:}quota-used-bytes',
+                    '{DAV:}quota-available-bytes',
+                    '{DAV:}getetag',
+                    '{DAV:}getcontenttype',
+                );
+            }
+
+            // If the resourceType was not part of the list, we manually add it 
+            // and mark it for removal. We need to know the resourcetype in order 
+            // to make certain decisions about the entry.
+            // WebDAV dictates we should add a / and the end of href's for collections
+            $removeRT = false;
+            if (!in_array('{DAV:}resourcetype',$currentPropertyNames)) {
+                $currentPropertyNames[] = '{DAV:}resourcetype';
+                $removeRT = true;
+            }
+
+            $result = $this->broadcastEvent('beforeGetProperties',array($myPath, $node, &$currentPropertyNames, &$newProperties));
+            // If this method explicitly returned false, we must ignore this 
+            // node as it is inacessible.
+            if ($result===false) continue;
+
+            if (count($currentPropertyNames) > 0) {
+
+                if ($node instanceof Sabre_DAV_IProperties) 
+                    $newProperties['200'] = $newProperties[200] + $node->getProperties($currentPropertyNames);
+
+            }
+
+
+            foreach($currentPropertyNames as $prop) {
+                
+                if (isset($newProperties[200][$prop])) continue;
+
+                switch($prop) {
+                    case '{DAV:}getlastmodified'       : if ($node->getLastModified()) $newProperties[200][$prop] = new Sabre_DAV_Property_GetLastModified($node->getLastModified()); break;
+                    case '{DAV:}getcontentlength'      : if ($node instanceof Sabre_DAV_IFile) $newProperties[200][$prop] = (int)$node->getSize(); break;
+                    case '{DAV:}quota-used-bytes'      : 
+                        if ($node instanceof Sabre_DAV_IQuota) {
+                            $quotaInfo = $node->getQuotaInfo();
+                            $newProperties[200][$prop] = $quotaInfo[0];
+                        }
+                        break;
+                    case '{DAV:}quota-available-bytes' : 
+                        if ($node instanceof Sabre_DAV_IQuota) {
+                            $quotaInfo = $node->getQuotaInfo();
+                            $newProperties[200][$prop] = $quotaInfo[1];
+                        }
+                        break;
+                    case '{DAV:}getetag'               : if ($node instanceof Sabre_DAV_IFile && $etag = $node->getETag())  $newProperties[200][$prop] = $etag; break;
+                    case '{DAV:}getcontenttype'        : if ($node instanceof Sabre_DAV_IFile && $ct = $node->getContentType())  $newProperties[200][$prop] = $ct; break;
+                    case '{DAV:}supported-report-set'  :
+                        $reports = array();
+                        foreach($this->plugins as $plugin) {
+                            $reports = array_merge($reports, $plugin->getSupportedReportSet($myPath));
+                        }
+                        $newProperties[200][$prop] = new Sabre_DAV_Property_SupportedReportSet($reports); 
+                        break;
+                    case '{DAV:}resourcetype' :
+                        $newProperties[200]['{DAV:}resourcetype'] = new Sabre_DAV_Property_ResourceType();
+                        foreach($this->resourceTypeMapping as $className => $resourceType) {
+                            if ($node instanceof $className) $newProperties[200]['{DAV:}resourcetype']->add($resourceType);
+                        }
+                        break;
+
+                }
+
+                // If we were unable to find the property, we will list it as 404.
+                if (!$allProperties && !isset($newProperties[200][$prop])) $newProperties[404][$prop] = null;
+
+            }
+         
+            $this->broadcastEvent('afterGetProperties',array(trim($myPath,'/'),&$newProperties));
+
+            $newProperties['href'] = trim($myPath,'/'); 
+
+            // Its is a WebDAV recommendation to add a trailing slash to collectionnames.
+            // Apple's iCal also requires a trailing slash for principals (rfc 3744).
+            // Therefore we add a trailing / for any non-file. This might need adjustments 
+            // if we find there are other edge cases.
+            if ($myPath!='' && isset($newProperties[200]['{DAV:}resourcetype']) && count($newProperties[200]['{DAV:}resourcetype']->getValue())>0) $newProperties['href'] .='/';
+
+            // If the resourcetype property was manually added to the requested property list,
+            // we will remove it again.
+            if ($removeRT) unset($newProperties[200]['{DAV:}resourcetype']);
+
+            $returnPropertyList[] = $newProperties;
+
+        }
+        
+        return $returnPropertyList;
+
+    }
+
+    /**
+     * This method is invoked by sub-systems creating a new file.
+     *
+     * Currently this is done by HTTP PUT and HTTP LOCK (in the Locks_Plugin).
+     * It was important to get this done through a centralized function, 
+     * allowing plugins to intercept this using the beforeCreateFile event.
+     *
+     * This method will return true if the file was actually created
+     * 
+     * @param string $uri 
+     * @param resource $data 
+     * @return bool 
+     */
+    public function createFile($uri,$data) {
+
+        list($dir,$name) = Sabre_DAV_URLUtil::splitPath($uri);
+
+        if (!$this->broadcastEvent('beforeBind',array($uri))) return false;
+        if (!$this->broadcastEvent('beforeCreateFile',array($uri,$data))) return false;
+
+        $parent = $this->tree->getNodeForPath($dir);
+        $parent->createFile($name,$data);
+        $this->tree->markDirty($dir);
+
+        $this->broadcastEvent('afterBind',array($uri));
+
+        return true;
+    }
+
+    /**
+     * This method is invoked by sub-systems creating a new directory.
+     *
+     * @param string $uri 
+     * @return void
+     */
+    public function createDirectory($uri) {
+
+        $this->createCollection($uri,array('{DAV:}collection'),array());
+
+    }
+
+    /**
+     * Use this method to create a new collection
+     *
+     * The {DAV:}resourcetype is specified using the resourceType array.
+     * At the very least it must contain {DAV:}collection. 
+     *
+     * The properties array can contain a list of additional properties.
+     * 
+     * @param string $uri The new uri 
+     * @param array $resourceType The resourceType(s) 
+     * @param array $properties A list of properties
+     * @return void
+     */
+    public function createCollection($uri, array $resourceType, array $properties) {
+
+        list($parentUri,$newName) = Sabre_DAV_URLUtil::splitPath($uri);
+
+        // Making sure {DAV:}collection was specified as resourceType
+        if (!in_array('{DAV:}collection', $resourceType)) {
+            throw new Sabre_DAV_Exception_InvalidResourceType('The resourceType for this collection must at least include {DAV:}collection');
+        }
+
+
+        // Making sure the parent exists
+        try {
+
+            $parent = $this->tree->getNodeForPath($parentUri);
+
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+
+            throw new Sabre_DAV_Exception_Conflict('Parent node does not exist');
+
+        }
+
+        // Making sure the parent is a collection
+        if (!$parent instanceof Sabre_DAV_ICollection) {
+            throw new Sabre_DAV_Exception_Conflict('Parent node is not a collection');
+        }
+
+
+
+        // Making sure the child does not already exist
+        try {
+            $parent->getChild($newName);
+
+            // If we got here.. it means there's already a node on that url, and we need to throw a 405
+            throw new Sabre_DAV_Exception_MethodNotAllowed('The resource you tried to create already exists');
+
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+            // This is correct
+        }
+
+        
+        if (!$this->broadcastEvent('beforeBind',array($uri))) return;
+
+        // There are 2 modes of operation. The standard collection 
+        // creates the directory, and then updates properties
+        // the extended collection can create it directly.
+        if ($parent instanceof Sabre_DAV_IExtendedCollection) {
+
+            $parent->createExtendedCollection($newName, $resourceType, $properties);
+
+        } else {
+
+            // No special resourcetypes are supported
+            if (count($resourceType)>1) {
+                throw new Sabre_DAV_Exception_InvalidResourceType('The {DAV:}resourcetype you specified is not supported here.');
+            }
+
+            $parent->createDirectory($newName);
+            $rollBack = false; 
+            $exception = null;
+            $errorResult = null;
+
+            if (count($properties)>0) {
+
+                try {
+
+                    $errorResult = $this->updateProperties($uri, $properties);
+                    if (!isset($errorResult[200])) {
+                        $rollBack = true;
+                    }
+
+                } catch (Sabre_DAV_Exception $e) {
+
+                    $rollBack = true;
+                    $exception = $e;
+
+                }
+
+            }
+
+            if ($rollBack) {
+                if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
+                $this->tree->delete($uri);
+
+                // Re-throwing exception
+                if ($exception) throw $exception;
+
+                return $errorResult;
+            }
+                
+        }
+        $this->tree->markDirty($parentUri);
+        $this->broadcastEvent('afterBind',array($uri));
+
+    }
+
+    /**
+     * This method updates a resource's properties
+     *
+     * The properties array must be a list of properties. Array-keys are
+     * property names in clarknotation, array-values are it's values.
+     * If a property must be deleted, the value should be null.
+     * 
+     * Note that this request should either completely succeed, or 
+     * completely fail.
+     *
+     * The response is an array with statuscodes for keys, which in turn
+     * contain arrays with propertynames. This response can be used
+     * to generate a multistatus body.
+     * 
+     * @param string $uri 
+     * @param array $properties 
+     * @return array 
+     */
+    public function updateProperties($uri, array $properties) {
+
+        // we'll start by grabbing the node, this will throw the appropriate
+        // exceptions if it doesn't. 
+        $node = $this->tree->getNodeForPath($uri);
+       
+        $result = array(
+            200 => array(),
+            403 => array(),
+            424 => array(),
+        ); 
+        $remainingProperties = $properties;
+        $hasError = false;
+
+        // Running through all properties to make sure none of them are protected
+        if (!$hasError) foreach($properties as $propertyName => $value) {
+            if(in_array($propertyName, $this->protectedProperties)) {
+                $result[403][$propertyName] = null;
+                unset($remainingProperties[$propertyName]);
+                $hasError = true;
+            }
+        }
+
+        if (!$hasError) {
+            // Allowing plugins to take care of property updating
+            $hasError = !$this->broadcastEvent('updateProperties',array(
+                &$remainingProperties,
+                &$result,
+                $node
+            ));
+        }
+
+        // If the node is not an instance of Sabre_DAV_IProperties, every
+        // property is 403 Forbidden
+        if (!$hasError && count($remainingProperties) && !($node instanceof Sabre_DAV_IProperties)) {
+            $hasError = true;
+            foreach($properties as $propertyName=> $value) {
+                $result[403][$propertyName] = null;
+            }
+            $remainingProperties = array();
+        }
+
+        // Only if there were no errors we may attempt to update the resource
+        if (!$hasError) {
+
+            if (count($remainingProperties)>0) {
+
+                $updateResult = $node->updateProperties($remainingProperties);
+
+                if ($updateResult===true) {
+                    // success
+                    foreach($remainingProperties as $propertyName=>$value) {
+                        $result[200][$propertyName] = null;
+                    }
+
+                } elseif ($updateResult===false) {
+                    // The node failed to update the properties for an
+                    // unknown reason
+                    foreach($remainingProperties as $propertyName=>$value) {
+                        $result[403][$propertyName] = null;
+                    }
+
+                } elseif (is_array($updateResult)) {
+
+                    // The node has detailed update information
+                    // We need to merge the results with the earlier results.
+                    foreach($updateResult as $status => $props) {
+                        if (is_array($props)) {
+                            if (!isset($result[$status]))
+                                $result[$status] = array();
+
+                            $result[$status] = array_merge($result[$status], $updateResult[$status]);
+                        }
+                    }
+
+                } else {
+                    throw new Sabre_DAV_Exception('Invalid result from updateProperties');
+                }
+                $remainingProperties = array();
+            }
+
+        }
+
+        foreach($remainingProperties as $propertyName=>$value) {
+            // if there are remaining properties, it must mean
+            // there's a dependency failure
+            $result[424][$propertyName] = null;
+        }
+
+        // Removing empty array values
+        foreach($result as $status=>$props) {
+
+            if (count($props)===0) unset($result[$status]);
+
+        }
+        $result['href'] = $uri;
+        return $result;
+
+    }
+
+    /**
+     * This method checks the main HTTP preconditions.
+     *
+     * Currently these are:
+     *   * If-Match
+     *   * If-None-Match
+     *   * If-Modified-Since
+     *   * If-Unmodified-Since
+     *
+     * The method will return true if all preconditions are met
+     * The method will return false, or throw an exception if preconditions
+     * failed. If false is returned the operation should be aborted, and
+     * the appropriate HTTP response headers are already set.
+     *
+     * Normally this method will throw 412 Precondition Failed for failures
+     * related to If-None-Match, If-Match and If-Unmodified Since. It will 
+     * set the status to 304 Not Modified for If-Modified_since.
+     *
+     * If the $handleAsGET argument is set to true, it will also return 304 
+     * Not Modified for failure of the If-None-Match precondition. This is the
+     * desired behaviour for HTTP GET and HTTP HEAD requests.
+     *
+     * @return bool 
+     */
+    public function checkPreconditions($handleAsGET = false) {
+
+        $uri = $this->getRequestUri();
+        $node = null;
+        $lastMod = null;
+        $etag = null;
+
+        if ($ifMatch = $this->httpRequest->getHeader('If-Match')) {
+
+            // If-Match contains an entity tag. Only if the entity-tag
+            // matches we are allowed to make the request succeed.
+            // If the entity-tag is '*' we are only allowed to make the
+            // request succeed if a resource exists at that url.
+            try {
+                $node = $this->tree->getNodeForPath($uri);
+            } catch (Sabre_DAV_Exception_FileNotFound $e) {
+                throw new Sabre_DAV_Exception_PreconditionFailed('An If-Match header was specified and the resource did not exist','If-Match');
+            }
+
+            // Only need to check entity tags if they are not *
+            if ($ifMatch!=='*') {
+
+                // There can be multiple etags
+                $ifMatch = explode(',',$ifMatch);
+                $haveMatch = false;
+                foreach($ifMatch as $ifMatchItem) {
+
+                    // Stripping any extra spaces
+                    $ifMatchItem = trim($ifMatchItem,' ');
+                    
+                    $etag = $node->getETag();
+                    if ($etag===$ifMatchItem) {
+                        $haveMatch = true;
+                    }
+                }
+                if (!$haveMatch) {
+                     throw new Sabre_DAV_Exception_PreconditionFailed('An If-Match header was specified, but none of the specified the ETags matched.','If-Match');
+                }
+            }
+        }
+
+        if ($ifNoneMatch = $this->httpRequest->getHeader('If-None-Match')) {
+
+            // The If-None-Match header contains an etag.
+            // Only if the ETag does not match the current ETag, the request will succeed
+            // The header can also contain *, in which case the request
+            // will only succeed if the entity does not exist at all.
+            $nodeExists = true;
+            if (!$node) {
+                try {
+                    $node = $this->tree->getNodeForPath($uri);
+                } catch (Sabre_DAV_Exception_FileNotFound $e) {
+                    $nodeExists = false;
+                }
+            }
+            if ($nodeExists) {
+                $haveMatch = false;
+                if ($ifNoneMatch==='*') $haveMatch = true;
+                else {
+
+                    // There might be multiple etags
+                    $ifNoneMatch = explode(',', $ifNoneMatch);
+                    $etag = $node->getETag();
+
+                    foreach($ifNoneMatch as $ifNoneMatchItem) {
+                        
+                        // Stripping any extra spaces
+                        $ifNoneMatchItem = trim($ifNoneMatchItem,' ');
+                        
+                        if ($etag===$ifNoneMatchItem) $haveMatch = true;
+
+                    }
+
+                }
+
+                if ($haveMatch) {
+                    if ($handleAsGET) {
+                        $this->httpResponse->sendStatus(304);
+                        return false;
+                    } else {
+                        throw new Sabre_DAV_Exception_PreconditionFailed('An If-None-Match header was specified, but the ETag matched (or * was specified).','If-None-Match');
+                    }
+                }
+            }
+
+        }
+
+        if (!$ifNoneMatch && ($ifModifiedSince = $this->httpRequest->getHeader('If-Modified-Since'))) {
+            
+            // The If-Modified-Since header contains a date. We
+            // will only return the entity if it has been changed since
+            // that date. If it hasn't been changed, we return a 304
+            // header
+            // Note that this header only has to be checked if there was no If-None-Match header
+            // as per the HTTP spec.
+            $date = Sabre_HTTP_Util::parseHTTPDate($ifModifiedSince);
+
+            if ($date) {
+                if (is_null($node)) {
+                    $node = $this->tree->getNodeForPath($uri);
+                }
+                $lastMod = $node->getLastModified();
+                if ($lastMod) {
+                    $lastMod = new DateTime('@' . $lastMod);
+                    if ($lastMod <= $date) {
+                        $this->httpResponse->sendStatus(304);
+                        return false;
+                    } 
+                }
+            }
+        }
+
+        if ($ifUnmodifiedSince = $this->httpRequest->getHeader('If-Unmodified-Since')) {
+            
+            // The If-Unmodified-Since will allow allow the request if the
+            // entity has not changed since the specified date.
+            $date = Sabre_HTTP_Util::parseHTTPDate($ifUnmodifiedSince);
+           
+            // We must only check the date if it's valid
+            if ($date) {
+                if (is_null($node)) {
+                    $node = $this->tree->getNodeForPath($uri);
+                }   
+                $lastMod = $node->getLastModified();
+                if ($lastMod) {
+                    $lastMod = new DateTime('@' . $lastMod);
+                    if ($lastMod > $date) {
+                        throw new Sabre_DAV_Exception_PreconditionFailed('An If-Unmodified-Since header was specified, but the entity has been changed since the specified date.','If-Unmodified-Since');
+                    }
+                }
+            }
+
+        }
+        return true;
+
+    }
+
+    // }}} 
+    // {{{ XML Readers & Writers  
+    
+    
+    /**
+     * Generates a WebDAV propfind response body based on a list of nodes 
+     * 
+     * @param array $fileProperties The list with nodes
+     * @param array $requestedProperties The properties that should be returned
+     * @return string 
+     */
+    public function generateMultiStatus(array $fileProperties) {
+
+        $dom = new DOMDocument('1.0','utf-8');
+        //$dom->formatOutput = true;
+        $multiStatus = $dom->createElement('d:multistatus');
+        $dom->appendChild($multiStatus);
+
+        // Adding in default namespaces
+        foreach($this->xmlNamespaces as $namespace=>$prefix) {
+
+            $multiStatus->setAttribute('xmlns:' . $prefix,$namespace);
+
+        }
+
+        foreach($fileProperties as $entry) {
+
+            $href = $entry['href'];
+            unset($entry['href']);
+            
+            $response = new Sabre_DAV_Property_Response($href,$entry);
+            $response->serialize($this,$multiStatus);
+
+        }
+
+        return $dom->saveXML();
+
+    }
+
+    /**
+     * This method parses a PropPatch request
+     *
+     * PropPatch changes the properties for a resource. This method
+     * returns a list of properties.
+     *
+     * The keys in the returned array contain the property name (e.g.: {DAV:}displayname,
+     * and the value contains the property value. If a property is to be removed the value
+     * will be null.
+     * 
+     * @param string $body xml body
+     * @return array list of properties in need of updating or deletion
+     */
+    public function parsePropPatchRequest($body) {
+
+        //We'll need to change the DAV namespace declaration to something else in order to make it parsable
+        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+        
+        $newProperties = array();
+
+        foreach($dom->firstChild->childNodes as $child) {
+
+            if ($child->nodeType !== XML_ELEMENT_NODE) continue; 
+
+            $operation = Sabre_DAV_XMLUtil::toClarkNotation($child);
+
+            if ($operation!=='{DAV:}set' && $operation!=='{DAV:}remove') continue;
+            
+            $innerProperties = Sabre_DAV_XMLUtil::parseProperties($child, $this->propertyMap);
+
+            foreach($innerProperties as $propertyName=>$propertyValue) {
+
+                if ($operation==='{DAV:}remove') {
+                    $propertyValue = null;
+                }
+
+                $newProperties[$propertyName] = $propertyValue;
+
+            }
+
+        }
+
+        return $newProperties;
+
+    }
+
+    /**
+     * This method parses the PROPFIND request and returns its information
+     *
+     * This will either be a list of properties, or an empty array; in which case
+     * an {DAV:}allprop was requested.
+     * 
+     * @param string $body 
+     * @return array 
+     */
+    public function parsePropFindRequest($body) {
+
+        // If the propfind body was empty, it means IE is requesting 'all' properties
+        if (!$body) return array();
+
+        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+        $elem = $dom->getElementsByTagNameNS('urn:DAV','propfind')->item(0);
+        return array_keys(Sabre_DAV_XMLUtil::parseProperties($elem)); 
+
+    }
+
+    // }}}
+
+}
+
diff --git a/3rdparty/Sabre/DAV/ServerPlugin.php b/3rdparty/Sabre/DAV/ServerPlugin.php
new file mode 100644
index 00000000000..6909f600c21
--- /dev/null
+++ b/3rdparty/Sabre/DAV/ServerPlugin.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * The baseclass for all server plugins.
+ *
+ * Plugins can modify or extend the servers behaviour. 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_ServerPlugin {
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre_DAV_Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the requires event subscriptions.
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    abstract public function initialize(Sabre_DAV_Server $server);
+    
+    /**
+     * This method should return a list of server-features. 
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     * 
+     * @return array
+     */
+    public function getFeatures() {
+
+        return array();
+
+    }
+
+    /**
+     * Use this method to tell the server this plugin defines additional
+     * HTTP methods.
+     *
+     * This method is passed a uri. It should only return HTTP methods that are 
+     * available for the specified uri.
+     *
+     * @param string $uri
+     * @return array 
+     */
+    public function getHTTPMethods($uri) {
+
+        return array();
+
+    }
+
+    /**
+     * Returns a plugin name.
+     * 
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre_DAV_Server::getPlugin 
+     * 
+     * @return string 
+     */
+    public function getPluginName() {
+
+        return get_class($this);
+
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     * Note that you still need to subscribe to the 'report' event to actually 
+     * implement them 
+     * 
+     * @param string $uri
+     * @return array 
+     */
+    public function getSupportedReportSet($uri) {
+
+        return array();
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/SimpleCollection.php b/3rdparty/Sabre/DAV/SimpleCollection.php
new file mode 100644
index 00000000000..223d05fed55
--- /dev/null
+++ b/3rdparty/Sabre/DAV/SimpleCollection.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * SimpleCollection
+ *
+ * The SimpleCollection is used to quickly setup static directory structures.
+ * Just create the object with a proper name, and add children to use it.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_SimpleCollection extends Sabre_DAV_Collection {
+
+    /**
+     * List of childnodes 
+     *
+     * @var array
+     */
+    protected $children = array();
+
+    /**
+     * Name of this resource 
+     * 
+     * @var string 
+     */
+    protected $name;
+
+    /**
+     * Creates this node
+     *
+     * The name of the node must be passed, child nodes can also be bassed.
+     * This nodes must be instances of Sabre_DAV_INode
+     * 
+     * @param string $name 
+     * @param array $children 
+     * @return void
+     */
+    public function __construct($name,array $children = array()) {
+
+        $this->name = $name;
+        foreach($children as $child) {
+
+            if (!($child instanceof Sabre_DAV_INode)) throw new Sabre_DAV_Exception('Only instances of Sabre_DAV_INode are allowed to be passed in the children argument');
+            $this->addChild($child);
+
+        }
+
+    }
+
+    /**
+     * Adds a new childnode to this collection 
+     * 
+     * @param Sabre_DAV_INode $child 
+     * @return void
+     */
+    public function addChild(Sabre_DAV_INode $child) {
+
+        $this->children[$child->getName()] = $child;
+
+    }
+
+    /**
+     * Returns the name of the collection 
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        return $this->name;
+
+    }
+
+    /**
+     * Returns a child object, by its name.
+     *
+     * This method makes use of the getChildren method to grab all the child nodes, and compares the name. 
+     * Generally its wise to override this, as this can usually be optimized
+     * 
+     * @param string $name
+     * @throws Sabre_DAV_Exception_FileNotFound
+     * @return Sabre_DAV_INode 
+     */
+    public function getChild($name) {
+
+        if (isset($this->children[$name])) return $this->children[$name];
+        throw new Sabre_DAV_Exception_FileNotFound('File not found: ' . $name . ' in \'' . $this->getName() . '\'');
+
+    }
+
+    /**
+     * Returns a list of children for this collection 
+     * 
+     * @return array 
+     */
+    public function getChildren() {
+
+        return array_values($this->children);
+
+    }
+
+
+}
+
diff --git a/3rdparty/Sabre/DAV/SimpleDirectory.php b/3rdparty/Sabre/DAV/SimpleDirectory.php
new file mode 100644
index 00000000000..516a3aa907c
--- /dev/null
+++ b/3rdparty/Sabre/DAV/SimpleDirectory.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * SimpleDirectory
+ *
+ * The SimpleDirectory is used to quickly setup static directory structures.
+ * Just create the object with a proper name, and add children to use it.
+ *
+ * This class is now deprecated, use Sabre_DAV_SimpleCollection instead.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @deprecated Use Sabre_DAV_SimpleCollection instead.
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_SimpleDirectory extends Sabre_DAV_SimpleCollection {
+
+}
+
diff --git a/3rdparty/Sabre/DAV/SimpleFile.php b/3rdparty/Sabre/DAV/SimpleFile.php
new file mode 100644
index 00000000000..304dff1c5ec
--- /dev/null
+++ b/3rdparty/Sabre/DAV/SimpleFile.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * SimpleFile
+ *
+ * The 'SimpleFile' class is used to easily add read-only immutable files to 
+ * the directory structure. One usecase would be to add a 'readme.txt' to a 
+ * root of a webserver with some standard content.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_SimpleFile extends Sabre_DAV_File {
+
+    /**
+     * File contents 
+     *
+     * @var string 
+     */
+    protected $contents = array();
+
+    /**
+     * Name of this resource 
+     * 
+     * @var string 
+     */
+    protected $name;
+
+    /**
+     * A mimetype, such as 'text/plain' or 'text/html'
+     * 
+     * @var string 
+     */
+    protected $mimeType;
+
+    /**
+     * Creates this node
+     *
+     * The name of the node must be passed, as well as the contents of the 
+     * file.
+     * 
+     * @param string $name 
+     * @param string $contents 
+     */
+    public function __construct($name, $contents, $mimeType = null) {
+
+        $this->name = $name;
+        $this->contents = $contents;
+        $this->mimeType = $mimeType;
+
+    }
+
+    /**
+     * Returns the node name for this file.
+     *
+     * This name is used to construct the url.
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        return $this->name;
+
+    }
+
+    /**
+     * Returns the data 
+     *
+     * This method may either return a string or a readable stream resource
+     *
+     * @return mixed
+     */
+    public function get() {
+
+        return $this->contents; 
+
+    }
+
+    /**
+     * Returns the size of the file, in bytes. 
+     * 
+     * @return int 
+     */
+    public function getSize() {
+
+        return strlen($this->contents);
+
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     * The ETag is an arbritrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     */
+    public function getETag() {
+
+        return '"' . md5($this->contents) . '"'; 
+
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     */ 
+    public function getContentType() {
+
+        return $this->mimeType; 
+
+    }
+
+}
+
+?>
diff --git a/3rdparty/Sabre/DAV/StringUtil.php b/3rdparty/Sabre/DAV/StringUtil.php
new file mode 100644
index 00000000000..440cf6866ca
--- /dev/null
+++ b/3rdparty/Sabre/DAV/StringUtil.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * String utility
+ *
+ * This class is mainly used to implement the 'text-match' filter, used by both 
+ * the CalDAV calendar-query REPORT, and CardDAV addressbook-query REPORT. 
+ * Because they both need it, it was decided to put it in Sabre_DAV instead.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_StringUtil {
+
+    /**
+     * Checks if a needle occurs in a haystack ;)
+     *
+     * @param string $haystack 
+     * @param string $needle 
+     * @param string $collation 
+     * @param string $matchType 
+     * @return bool 
+     */
+    static public function textMatch($haystack, $needle, $collation, $matchType = 'contains') {
+
+        switch($collation) {
+
+            case 'i;ascii-casemap' :
+                // default strtolower takes locale into consideration
+                // we don't want this.
+                $haystack = str_replace(range('a','z'), range('A','Z'), $haystack);
+                $needle = str_replace(range('a','z'), range('A','Z'), $needle);
+                break;
+
+            case 'i;octet' :
+                // Do nothing
+                break; 
+
+            case 'i;unicode-casemap' :
+                $haystack = mb_strtoupper($haystack, 'UTF-8');
+                $needle = mb_strtoupper($needle, 'UTF-8');
+                break;
+
+            default :
+                throw new Sabre_DAV_Exception_BadRequest('Collation type: ' . $collation . ' is not supported');
+
+        }
+
+        switch($matchType) {
+
+            case 'contains' :
+                return strpos($haystack, $needle)!==false;
+            case 'equals' :
+                return $haystack === $needle;
+            case 'starts-with' :
+                return strpos($haystack, $needle)===0;
+            case 'ends-with' :
+                return strrpos($haystack, $needle)===strlen($haystack)-strlen($needle);
+            default :
+                throw new Sabre_DAV_Exception_BadRequest('Match-type: ' . $matchType . ' is not supported');
+
+        }
+        
+    }
+
+    /**
+     * This method takes an input string, checks if it's not valid UTF-8 and 
+     * attempts to convert it to UTF-8 if it's not.
+     *
+     * Note that currently this can only convert ISO-8559-1 to UTF-8 (latin-1), 
+     * anything else will likely fail.
+     *
+     * @param string $input 
+     * @return string 
+     */
+    static public function ensureUTF8($input) {
+
+        $encoding = mb_detect_encoding($input , array('UTF-8','ISO-8859-1'), true);
+
+        if ($encoding === 'ISO-8859-1') {
+            return utf8_encode($input);
+        } else {
+            return $input;
+        } 
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php b/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
new file mode 100644
index 00000000000..e8276af5613
--- /dev/null
+++ b/3rdparty/Sabre/DAV/TemporaryFileFilterPlugin.php
@@ -0,0 +1,279 @@
+<?php
+
+/**
+ * Temporary File Filter Plugin
+ *
+ * The purpose of this filter is to intercept some of the garbage files
+ * operation systems and applications tend to generate when mounting
+ * a WebDAV share as a disk.
+ *
+ * It will intercept these files and place them in a separate directory.
+ * these files are not deleted automatically, so it is adviceable to
+ * delete these after they are not accessed for 24 hours.
+ *
+ * Currently it supports:
+ *   * OS/X style resource forks and .DS_Store
+ *   * desktop.ini and Thumbs.db (windows)
+ *   * .*.swp (vim temporary files)
+ *   * .dat.* (smultron temporary files)
+ *
+ * Additional patterns can be added, by adding on to the
+ * temporaryFilePatterns property.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_TemporaryFileFilterPlugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * This is the list of patterns we intercept.
+     * If new patterns are added, they must be valid patterns for preg_match.
+     * 
+     * @var array
+     */
+    public $temporaryFilePatterns = array(
+        '/^\._(.*)$/',     // OS/X resource forks
+        '/^.DS_Store$/',   // OS/X custom folder settings
+        '/^desktop.ini$/', // Windows custom folder settings
+        '/^Thumbs.db$/',   // Windows thumbnail cache
+        '/^.(.*).swp$/',   // ViM temporary files
+        '/^\.dat(.*)$/',   // Smultron seems to create these
+        '/^~lock.(.*)#$/', // Windows 7 lockfiles
+    );
+    
+    /**
+     * This is the directory where this plugin
+     * will store it's files.
+     * 
+     * @var string 
+     */
+    private $dataDir;
+
+    /**
+     * A reference to the main Server class
+     * 
+     * @var Sabre_DAV_Server 
+     */
+    private $server;
+
+    /**
+     * Creates the plugin.
+     *
+     * Make sure you specify a directory for your files. If you don't, we
+     * will use PHP's directory for session-storage instead, and you might
+     * not want that.
+     * 
+     * @param string $dataDir 
+     * @return void
+     */
+    public function __construct($dataDir = null) {
+
+        if (!$dataDir) $dataDir = ini_get('session.save_path').'/sabredav/';
+        if (!is_dir($dataDir)) mkdir($dataDir);
+        $this->dataDir = $dataDir;
+
+    } 
+
+    /**
+     * Initialize the plugin
+     *
+     * This is called automatically be the Server class after this plugin is
+     * added with Sabre_DAV_Server::addPlugin()
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'));
+        $server->subscribeEvent('beforeCreateFile',array($this,'beforeCreateFile'));
+
+    }
+
+    /**
+     * This method is called before any HTTP method handler
+     *
+     * This method intercepts any GET, DELETE, PUT and PROPFIND calls to 
+     * filenames that are known to match the 'temporary file' regex.
+     * 
+     * @param string $method 
+     * @return bool 
+     */
+    public function beforeMethod($method, $uri) {
+
+        if (!$tempLocation = $this->isTempFile($uri))
+            return true;
+
+        switch($method) {
+            case 'GET' :
+                return $this->httpGet($tempLocation);
+            case 'PUT' :
+                return $this->httpPut($tempLocation);
+            case 'PROPFIND' :
+                return $this->httpPropfind($tempLocation, $uri);
+            case 'DELETE' :
+                return $this->httpDelete($tempLocation);
+         }
+         return true;
+
+    }
+
+    /**
+     * This method is invoked if some subsystem creates a new file.
+     *
+     * This is used to deal with HTTP LOCK requests which create a new 
+     * file.
+     * 
+     * @param string $uri 
+     * @param resource $data 
+     * @return bool 
+     */
+    public function beforeCreateFile($uri,$data) {
+
+        if ($tempPath = $this->isTempFile($uri)) {
+            
+            $hR = $this->server->httpResponse;
+            $hR->setHeader('X-Sabre-Temp','true');
+            file_put_contents($tempPath,$data);
+            return false;
+        }
+        return true; 
+
+    }
+
+    /**
+     * This method will check if the url matches the temporary file pattern
+     * if it does, it will return an path based on $this->dataDir for the 
+     * temporary file storage.
+     * 
+     * @param string $path 
+     * @return boolean|string 
+     */
+    protected function isTempFile($path) {
+
+        // We're only interested in the basename.
+        list(, $tempPath) = Sabre_DAV_URLUtil::splitPath($path);
+
+        foreach($this->temporaryFilePatterns as $tempFile) {
+
+            if (preg_match($tempFile,$tempPath)) {
+                return $this->dataDir . '/sabredav_' . md5($path) . '.tempfile';
+            }
+
+        }
+
+        return false;
+
+    }
+
+
+    /**
+     * This method handles the GET method for temporary files.
+     * If the file doesn't exist, it will return false which will kick in
+     * the regular system for the GET method.
+     * 
+     * @param string $tempLocation 
+     * @return bool 
+     */
+    public function httpGet($tempLocation) {
+
+        if (!file_exists($tempLocation)) return true;
+
+        $hR = $this->server->httpResponse;
+        $hR->setHeader('Content-Type','application/octet-stream');
+        $hR->setHeader('Content-Length',filesize($tempLocation));
+        $hR->setHeader('X-Sabre-Temp','true');
+        $hR->sendStatus(200);
+        $hR->sendBody(fopen($tempLocation,'r'));
+        return false;
+
+    }
+
+    /**
+     * This method handles the PUT method.
+     * 
+     * @param string $tempLocation 
+     * @return bool 
+     */
+    public function httpPut($tempLocation) {
+
+        $hR = $this->server->httpResponse;
+        $hR->setHeader('X-Sabre-Temp','true');
+
+        $newFile = !file_exists($tempLocation);
+       
+        if (!$newFile && ($this->server->httpRequest->getHeader('If-None-Match'))) {
+             throw new Sabre_DAV_Exception_PreconditionFailed('The resource already exists, and an If-None-Match header was supplied');
+        }
+
+        file_put_contents($tempLocation,$this->server->httpRequest->getBody());
+        $hR->sendStatus($newFile?201:200);
+        return false;
+
+    }
+
+    /**
+     * This method handles the DELETE method.
+     *
+     * If the file didn't exist, it will return false, which will make the 
+     * standard HTTP DELETE handler kick in.
+     * 
+     * @param string $tempLocation 
+     * @return bool 
+     */
+    public function httpDelete($tempLocation) {
+
+        if (!file_exists($tempLocation)) return true;
+
+        unlink($tempLocation);
+        $hR = $this->server->httpResponse;
+        $hR->setHeader('X-Sabre-Temp','true');
+        $hR->sendStatus(204);
+        return false;
+
+    }
+
+    /**
+     * This method handles the PROPFIND method. 
+     *
+     * It's a very lazy method, it won't bother checking the request body
+     * for which properties were requested, and just sends back a default
+     * set of properties.
+     *
+     * @param string $tempLocation 
+     * @return void
+     */
+    public function httpPropfind($tempLocation, $uri) {
+
+        if (!file_exists($tempLocation)) return true;
+       
+        $hR = $this->server->httpResponse;
+        $hR->setHeader('X-Sabre-Temp','true');
+        $hR->sendStatus(207);
+        $hR->setHeader('Content-Type','application/xml; charset=utf-8');
+
+        $requestedProps = $this->server->parsePropFindRequest($this->server->httpRequest->getBody(true)); 
+
+        $properties = array(
+            'href' => $uri,
+            200 => array(
+                '{DAV:}getlastmodified' => new Sabre_DAV_Property_GetLastModified(filemtime($tempLocation)),
+                '{DAV:}getcontentlength' => filesize($tempLocation),
+                '{DAV:}resourcetype' => new Sabre_DAV_Property_ResourceType(null),
+                '{'.Sabre_DAV_Server::NS_SABREDAV.'}tempFile' => true, 
+
+            ),
+         );
+
+        $data = $this->server->generateMultiStatus(array($properties));
+        $hR->sendBody($data);
+        return false;
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/DAV/Tree.php b/3rdparty/Sabre/DAV/Tree.php
new file mode 100644
index 00000000000..98e6f62c9e5
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Tree.php
@@ -0,0 +1,192 @@
+<?php
+
+/**
+ * Abstract tree object 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Tree {
+    
+    /**
+     * This function must return an INode object for a path
+     * If a Path doesn't exist, thrown an Exception_FileNotFound
+     * 
+     * @param string $path 
+     * @throws Exception_FileNotFound
+     * @return Sabre_DAV_INode 
+     */
+    abstract function getNodeForPath($path);
+
+    /**
+     * This function allows you to check if a node exists.
+     *
+     * Implementors of this class should override this method to make 
+     * it cheaper.
+     * 
+     * @param string $path 
+     * @return bool 
+     */
+    public function nodeExists($path) {
+
+        try {
+
+            $this->getNodeForPath($path);
+            return true;
+
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+
+            return false;
+
+        }
+
+    }
+
+    /**
+     * Copies a file from path to another
+     *
+     * @param string $sourcePath The source location
+     * @param string $destinationPath The full destination path
+     * @return void 
+     */
+    public function copy($sourcePath, $destinationPath) {
+
+        $sourceNode = $this->getNodeForPath($sourcePath);
+       
+        // grab the dirname and basename components
+        list($destinationDir, $destinationName) = Sabre_DAV_URLUtil::splitPath($destinationPath);
+
+        $destinationParent = $this->getNodeForPath($destinationDir);
+        $this->copyNode($sourceNode,$destinationParent,$destinationName);
+
+        $this->markDirty($destinationDir);
+
+    }
+
+    /**
+     * Moves a file from one location to another 
+     * 
+     * @param string $sourcePath The path to the file which should be moved 
+     * @param string $destinationPath The full destination path, so not just the destination parent node
+     * @return int
+     */
+    public function move($sourcePath, $destinationPath) {
+
+        list($sourceDir, $sourceName) = Sabre_DAV_URLUtil::splitPath($sourcePath);
+        list($destinationDir, $destinationName) = Sabre_DAV_URLUtil::splitPath($destinationPath);
+
+        if ($sourceDir===$destinationDir) {
+            $renameable = $this->getNodeForPath($sourcePath);
+            $renameable->setName($destinationName);
+        } else {
+            $this->copy($sourcePath,$destinationPath);
+            $this->getNodeForPath($sourcePath)->delete();
+        }
+        $this->markDirty($sourceDir);
+        $this->markDirty($destinationDir);
+
+    }
+
+    /**
+     * Deletes a node from the tree 
+     * 
+     * @param string $path 
+     * @return void
+     */
+    public function delete($path) {
+
+        $node = $this->getNodeForPath($path);
+        $node->delete();
+        
+        list($parent) = Sabre_DAV_URLUtil::splitPath($path);
+        $this->markDirty($parent);
+
+    }
+
+    /**
+     * Returns a list of childnodes for a given path. 
+     * 
+     * @param string $path 
+     * @return array 
+     */
+    public function getChildren($path) {
+
+        $node = $this->getNodeForPath($path);
+        return $node->getChildren();
+
+    }
+
+    /**
+     * This method is called with every tree update
+     *
+     * Examples of tree updates are:
+     *   * node deletions
+     *   * node creations
+     *   * copy
+     *   * move
+     *   * renaming nodes 
+     * 
+     * If Tree classes implement a form of caching, this will allow
+     * them to make sure caches will be expired.
+     * 
+     * If a path is passed, it is assumed that the entire subtree is dirty
+     *
+     * @param string $path 
+     * @return void
+     */
+    public function markDirty($path) {
+
+
+    }
+
+    /**
+     * copyNode 
+     * 
+     * @param Sabre_DAV_INode $source 
+     * @param Sabre_DAV_ICollection $destination 
+     * @return void
+     */
+    protected function copyNode(Sabre_DAV_INode $source,Sabre_DAV_ICollection $destinationParent,$destinationName = null) {
+
+        if (!$destinationName) $destinationName = $source->getName();
+
+        if ($source instanceof Sabre_DAV_IFile) {
+
+            $data = $source->get();
+
+            // If the body was a string, we need to convert it to a stream
+            if (is_string($data)) {
+                $stream = fopen('php://temp','r+');
+                fwrite($stream,$data);
+                rewind($stream);
+                $data = $stream;
+            } 
+            $destinationParent->createFile($destinationName,$data);
+            $destination = $destinationParent->getChild($destinationName);
+
+        } elseif ($source instanceof Sabre_DAV_ICollection) {
+
+            $destinationParent->createDirectory($destinationName);
+            
+            $destination = $destinationParent->getChild($destinationName);
+            foreach($source->getChildren() as $child) {
+
+                $this->copyNode($child,$destination);
+
+            }
+
+        }
+        if ($source instanceof Sabre_DAV_IProperties && $destination instanceof Sabre_DAV_IProperties) {
+
+            $props = $source->getProperties(array());
+            $destination->updateProperties($props);
+
+        }
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/Tree/Filesystem.php b/3rdparty/Sabre/DAV/Tree/Filesystem.php
new file mode 100644
index 00000000000..5c611047e07
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Tree/Filesystem.php
@@ -0,0 +1,124 @@
+<?php
+
+/**
+ * Sabre_DAV_Tree_Filesystem 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Tree_Filesystem extends Sabre_DAV_Tree {
+
+    /**
+     * Base url on the filesystem.
+     *
+     * @var string 
+     */
+    protected $basePath;
+
+    /**
+     * Creates this tree
+     *
+     * Supply the path you'd like to share.
+     * 
+     * @param string $basePath 
+     * @return void
+     */
+    public function __construct($basePath) {
+
+        $this->basePath = $basePath;
+
+    }
+
+    /**
+     * Returns a new node for the given path 
+     * 
+     * @param string $path 
+     * @return void
+     */
+    public function getNodeForPath($path) {
+
+        $realPath = $this->getRealPath($path);
+        if (!file_exists($realPath)) throw new Sabre_DAV_Exception_FileNotFound('File at location ' . $realPath . ' not found');
+        if (is_dir($realPath)) { 
+            return new Sabre_DAV_FS_Directory($path);
+        } else {
+            return new Sabre_DAV_FS_File($path);
+        }
+
+    }
+
+    /**
+     * Returns the real filesystem path for a webdav url. 
+     * 
+     * @param string $publicPath 
+     * @return string 
+     */
+    protected function getRealPath($publicPath) {
+
+        return rtrim($this->basePath,'/') . '/' . trim($publicPath,'/');
+
+    }
+
+    /**
+     * Copies a file or directory.
+     *
+     * This method must work recursively and delete the destination
+     * if it exists
+     * 
+     * @param string $source 
+     * @param string $destination 
+     * @return void
+     */
+    public function copy($source,$destination) {
+
+        $source = $this->getRealPath($source);
+        $destination = $this->getRealPath($destination);
+        $this->realCopy($source,$destination); 
+
+    }
+
+    /**
+     * Used by self::copy 
+     * 
+     * @param string $source 
+     * @param string $destination 
+     * @return void
+     */
+    protected function realCopy($source,$destination) {
+
+        if (is_file($source)) {
+            copy($source,$destination);
+        } else {
+            mkdir($destination);
+            foreach(scandir($source) as $subnode) {
+
+                if ($subnode=='.' || $subnode=='..') continue;
+                $this->realCopy($source.'/'.$subnode,$destination.'/'.$subnode);
+
+            }
+        }
+
+    }
+
+    /**
+     * Moves a file or directory recursively.
+     *
+     * If the destination exists, delete it first.
+     * 
+     * @param string $source 
+     * @param string $destination 
+     * @return void
+     */
+    public function move($source,$destination) {
+
+        $source = $this->getRealPath($source);
+        $destination = $this->getRealPath($destination);
+        rename($source,$destination);
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAV/URLUtil.php b/3rdparty/Sabre/DAV/URLUtil.php
new file mode 100644
index 00000000000..8f38749264b
--- /dev/null
+++ b/3rdparty/Sabre/DAV/URLUtil.php
@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * URL utility class
+ *
+ * This class provides methods to deal with encoding and decoding url (percent encoded) strings.
+ *
+ * It was not possible to use PHP's built-in methods for this, because some clients don't like
+ * encoding of certain characters.
+ *
+ * Specifically, it was found that GVFS (gnome's webdav client) does not like encoding of ( and
+ * ). Since these are reserved, but don't have a reserved meaning in url, these characters are
+ * kept as-is.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_URLUtil {
+
+    /**
+     * Encodes the path of a url.
+     *
+     * slashes (/) are treated as path-separators.
+     * 
+     * @param string $path 
+     * @return string 
+     */
+    static function encodePath($path) {
+
+    	$valid_chars = '/ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-.~()';
+        $newStr = '';
+        for( $i=0; isset($path[$i]); ++$i ) {
+            if( strpos($valid_chars,($c=$path[$i]))===false ) $newStr .= '%'.sprintf('%02x',ord($c));
+            else $newStr .= $c;
+        }
+        return $newStr;
+    	
+    }
+
+    /**
+     * Encodes a 1 segment of a path
+     *
+     * Slashes are considered part of the name, and are encoded as %2f
+     * 
+     * @param string $pathSegment 
+     * @return string 
+     */
+    static function encodePathSegment($pathSegment) {
+
+    	$valid_chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-.~()';
+        $newStr = '';
+        for( $i=0; isset($pathSegment[$i]); ++$i ) {
+            if( strpos($valid_chars,($c=$pathSegment[$i]))===false ) $newStr .= '%'.sprintf('%02x',ord($c));
+            else $newStr .= $c;
+        }
+        return $newStr;
+    }
+
+    /**
+     * Decodes a url-encoded path
+     *
+     * @param string $path 
+     * @return string 
+     */
+    static function decodePath($path) {
+
+        return self::decodePathSegment($path);
+
+    }
+
+    /**
+     * Decodes a url-encoded path segment
+     *
+     * @param string $path 
+     * @return string 
+     */
+    static function decodePathSegment($path) {
+
+        $path = urldecode($path);
+        $encoding = mb_detect_encoding($path, array('UTF-8','ISO-8859-1'));
+
+        switch($encoding) {
+
+            case 'ISO-8859-1' : 
+                $path = utf8_encode($path);
+
+        }
+
+        return $path;
+
+    }
+
+    /**
+     * Returns the 'dirname' and 'basename' for a path. 
+     *
+     * The reason there is a custom function for this purpose, is because
+     * basename() is locale aware (behaviour changes if C locale or a UTF-8 locale is used)
+     * and we need a method that just operates on UTF-8 characters.
+     *
+     * In addition basename and dirname are platform aware, and will treat backslash (\) as a
+     * directory separator on windows.
+     *
+     * This method returns the 2 components as an array.
+     *
+     * If there is no dirname, it will return an empty string. Any / appearing at the end of the
+     * string is stripped off.
+     *
+     * @param string $path 
+     * @return array 
+     */
+    static function splitPath($path) {
+
+        $matches = array();
+        if(preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u',$path,$matches)) {
+            return array($matches[1],$matches[2]);
+        } else {
+            return array(null,null);
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/UUIDUtil.php b/3rdparty/Sabre/DAV/UUIDUtil.php
new file mode 100644
index 00000000000..e42a536ad8a
--- /dev/null
+++ b/3rdparty/Sabre/DAV/UUIDUtil.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * UUID Utility
+ *
+ * This class has static methods to generate and validate UUID's.
+ * UUIDs are used a decent amount within various *DAV standards, so it made 
+ * sense to include it.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_UUIDUtil {
+
+    /**
+     * Returns a pseudo-random v4 UUID
+     *
+     * This function is based on a comment by Andrew Moore on php.net 
+     * 
+     * @see http://www.php.net/manual/en/function.uniqid.php#94959
+     * @return void
+     */
+    static function getUUID() {
+
+        return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+            // 32 bits for "time_low"
+            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
+
+            // 16 bits for "time_mid"
+            mt_rand( 0, 0xffff ),
+
+            // 16 bits for "time_hi_and_version",
+            // four most significant bits holds version number 4
+            mt_rand( 0, 0x0fff ) | 0x4000,
+
+            // 16 bits, 8 bits for "clk_seq_hi_res",
+            // 8 bits for "clk_seq_low",
+            // two most significant bits holds zero and one for variant DCE1.1
+            mt_rand( 0, 0x3fff ) | 0x8000,
+
+            // 48 bits for "node"
+            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
+        );
+    }
+
+    /**
+     * Checks if a string is a valid UUID.
+     * 
+     * @param string $uuid 
+     * @return bool 
+     */
+    static function validateUUID($uuid) {
+
+        return preg_match(
+            '/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i',
+            $uuid
+        ) == true;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAV/Version.php b/3rdparty/Sabre/DAV/Version.php
new file mode 100644
index 00000000000..6bece1985e4
--- /dev/null
+++ b/3rdparty/Sabre/DAV/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the SabreDAV version constants.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.5.4';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/DAV/XMLUtil.php b/3rdparty/Sabre/DAV/XMLUtil.php
new file mode 100644
index 00000000000..bd05be4b229
--- /dev/null
+++ b/3rdparty/Sabre/DAV/XMLUtil.php
@@ -0,0 +1,183 @@
+<?php
+
+/**
+ * XML utilities for WebDAV
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_XMLUtil {
+
+    /**
+     * Returns the 'clark notation' for an element.
+     * 
+     * For example, and element encoded as:
+     * <b:myelem xmlns:b="http://www.example.org/" />
+     * will be returned as:
+     * {http://www.example.org}myelem
+     *
+     * This format is used throughout the SabreDAV sourcecode.
+     * Elements encoded with the urn:DAV namespace will 
+     * be returned as if they were in the DAV: namespace. This is to avoid
+     * compatibility problems.
+     *
+     * This function will return null if a nodetype other than an Element is passed.
+     *
+     * @param DOMElement $dom 
+     * @return string 
+     */
+    static function toClarkNotation(DOMNode $dom) {
+
+        if ($dom->nodeType !== XML_ELEMENT_NODE) return null;
+
+        // Mapping back to the real namespace, in case it was dav
+        if ($dom->namespaceURI=='urn:DAV') $ns = 'DAV:'; else $ns = $dom->namespaceURI;
+        
+        // Mapping to clark notation
+        return '{' . $ns . '}' . $dom->localName;
+
+    }
+
+    /**
+     * Parses a clark-notation string, and returns the namespace and element 
+     * name components.
+     *
+     * If the string was invalid, it will throw an InvalidArgumentException.
+     * 
+     * @param string $str
+     * @throws InvalidArgumentException 
+     * @return array 
+     */
+    static function parseClarkNotation($str) {
+
+        if (!preg_match('/^{([^}]*)}(.*)$/',$str,$matches)) {
+            throw new InvalidArgumentException('\'' . $str . '\' is not a valid clark-notation formatted string');
+        }
+
+        return array(
+            $matches[1],
+            $matches[2]
+        );
+
+    }
+
+    /**
+     * This method takes an XML document (as string) and converts all instances of the
+     * DAV: namespace to urn:DAV
+     *
+     * This is unfortunately needed, because the DAV: namespace violates the xml namespaces
+     * spec, and causes the DOM to throw errors
+     */
+    static function convertDAVNamespace($xmlDocument) {
+
+        // This is used to map the DAV: namespace to urn:DAV. This is needed, because the DAV:
+        // namespace is actually a violation of the XML namespaces specification, and will cause errors
+        return preg_replace("/xmlns(:[A-Za-z0-9_]*)?=(\"|\')DAV:(\\2)/","xmlns\\1=\\2urn:DAV\\2",$xmlDocument);
+
+    }
+
+    /**
+     * This method provides a generic way to load a DOMDocument for WebDAV use.
+     *
+     * This method throws a Sabre_DAV_Exception_BadRequest exception for any xml errors.
+     * It does not preserve whitespace, and it converts the DAV: namespace to urn:DAV. 
+     * 
+     * @param string $xml
+     * @throws Sabre_DAV_Exception_BadRequest 
+     * @return DOMDocument 
+     */
+    static function loadDOMDocument($xml) {
+
+        if (empty($xml))
+            throw new Sabre_DAV_Exception_BadRequest('Empty XML document sent');
+       
+        // The BitKinex client sends xml documents as UTF-16. PHP 5.3.1 (and presumably lower)
+        // does not support this, so we must intercept this and convert to UTF-8.
+        if (substr($xml,0,12) === "\x3c\x00\x3f\x00\x78\x00\x6d\x00\x6c\x00\x20\x00") {
+
+            // Note: the preceeding byte sequence is "<?xml" encoded as UTF_16, without the BOM.
+            $xml = iconv('UTF-16LE','UTF-8',$xml);
+
+            // Because the xml header might specify the encoding, we must also change this.
+            // This regex looks for the string encoding="UTF-16" and replaces it with
+            // encoding="UTF-8".
+            $xml = preg_replace('|<\?xml([^>]*)encoding="UTF-16"([^>]*)>|u','<?xml\1encoding="UTF-8"\2>',$xml);
+
+        }
+
+        // Retaining old error setting
+        $oldErrorSetting =  libxml_use_internal_errors(true);
+
+        // Clearing any previous errors 
+        libxml_clear_errors();
+
+        $dom = new DOMDocument();
+        $dom->loadXML(self::convertDAVNamespace($xml),LIBXML_NOWARNING | LIBXML_NOERROR);
+
+        // We don't generally care about any whitespace
+        $dom->preserveWhiteSpace = false;
+
+        if ($error = libxml_get_last_error()) {
+            libxml_clear_errors();
+            throw new Sabre_DAV_Exception_BadRequest('The request body had an invalid XML body. (message: ' . $error->message . ', errorcode: ' . $error->code . ', line: ' . $error->line . ')');
+        }
+
+        // Restoring old mechanism for error handling
+        if ($oldErrorSetting===false) libxml_use_internal_errors(false);
+
+        return $dom;
+
+    }
+
+    /**
+     * Parses all WebDAV properties out of a DOM Element
+     *
+     * Generally WebDAV properties are encloded in {DAV:}prop elements. This
+     * method helps by going through all these and pulling out the actual
+     * propertynames, making them array keys and making the property values,
+     * well.. the array values.
+     *
+     * If no value was given (self-closing element) null will be used as the
+     * value. This is used in for example PROPFIND requests.
+     *
+     * Complex values are supported through the propertyMap argument. The
+     * propertyMap should have the clark-notation properties as it's keys, and
+     * classnames as values. 
+     *
+     * When any of these properties are found, the unserialize() method will be
+     * (statically) called. The result of this method is used as the value.
+     *
+     * @param DOMElement $parentNode
+     * @param array $propertyMap
+     * @return array
+     */
+    static function parseProperties(DOMElement $parentNode, array $propertyMap = array()) {
+
+        $propList = array();
+        foreach($parentNode->childNodes as $propNode) {
+
+            if (Sabre_DAV_XMLUtil::toClarkNotation($propNode)!=='{DAV:}prop') continue;
+
+            foreach($propNode->childNodes as $propNodeData) {
+
+                /* If there are no elements in here, we actually get 1 text node, this special case is dedicated to netdrive */
+                if ($propNodeData->nodeType != XML_ELEMENT_NODE) continue;
+
+                $propertyName = Sabre_DAV_XMLUtil::toClarkNotation($propNodeData);
+                if (isset($propertyMap[$propertyName])) {
+                    $propList[$propertyName] = call_user_func(array($propertyMap[$propertyName],'unserialize'),$propNodeData); 
+                } else {
+                    $propList[$propertyName] = $propNodeData->textContent;
+                }
+            }
+
+
+        }
+        return $propList;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php b/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
new file mode 100644
index 00000000000..a361e054610
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/AbstractPrincipalCollection.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * Principals Collection
+ *
+ * This is a helper class that easily allows you to create a collection that 
+ * has a childnode for every principal.
+ * 
+ * To use this class, simply implement the getChildForPrincipal method. 
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAVACL_AbstractPrincipalCollection extends Sabre_DAV_Collection  {
+
+    /**
+     * Node or 'directory' name. 
+     * 
+     * @var string 
+     */
+    protected $path;
+
+    /**
+     * Principal backend 
+     * 
+     * @var Sabre_DAVACL_IPrincipalBackend 
+     */
+    protected $principalBackend;
+
+    /**
+     * If this value is set to true, it effectively disables listing of users
+     * it still allows user to find other users if they have an exact url. 
+     * 
+     * @var bool 
+     */
+    public $disableListing = false;
+
+    /**
+     * Creates the object
+     *
+     * This object must be passed the principal backend. This object will 
+     * filter all principals from a specfied prefix ($principalPrefix). The 
+     * default is 'principals', if your principals are stored in a different 
+     * collection, override $principalPrefix
+     * 
+     * 
+     * @param Sabre_DAVACL_IPrincipalBackend $principalBackend 
+     * @param string $principalPrefix
+     * @param string $nodeName
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, $principalPrefix = 'principals') {
+
+        $this->principalPrefix = $principalPrefix;
+        $this->principalBackend = $principalBackend;
+
+    }
+
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     * 
+     * @param array $principalInfo 
+     * @return Sabre_DAVACL_IPrincipal
+     */
+    abstract function getChildForPrincipal(array $principalInfo);
+
+    /**
+     * Returns the name of this collection. 
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalPrefix);
+        return $name; 
+
+    }
+
+    /**
+     * Return the list of users 
+     * 
+     * @return void
+     */
+    public function getChildren() {
+
+        if ($this->disableListing)
+            throw new Sabre_DAV_Exception_MethodNotAllowed('Listing members of this collection is disabled');
+
+        $children = array();
+        foreach($this->principalBackend->getPrincipalsByPrefix($this->principalPrefix) as $principalInfo) {
+
+            $children[] = $this->getChildForPrincipal($principalInfo);
+
+
+        }
+        return $children; 
+
+    }
+
+    /**
+     * Returns a child object, by its name.
+     * 
+     * @param string $name
+     * @throws Sabre_DAV_Exception_FileNotFound
+     * @return Sabre_DAV_IPrincipal
+     */
+    public function getChild($name) {
+
+        $principalInfo = $this->principalBackend->getPrincipalByPath($this->principalPrefix . '/' . $name);
+        if (!$principalInfo) throw new Sabre_DAV_Exception_FileNotFound('Principal with name ' . $name . ' not found');
+        return $this->getChildForPrincipal($principalInfo);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Exception/AceConflict.php b/3rdparty/Sabre/DAVACL/Exception/AceConflict.php
new file mode 100644
index 00000000000..d10aeb4345c
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Exception/AceConflict.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Sabre_DAVACL_Exception_AceConflict 
+ * 
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Exception_AceConflict extends Sabre_DAV_Exception_Conflict {
+
+    /**
+     * Adds in extra information in the xml response.
+     *
+     * This method adds the {DAV:}no-ace-conflict element as defined in rfc3744
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+        
+        $doc = $errorNode->ownerDocument;
+        
+        $np = $doc->createElementNS('DAV:','d:no-ace-conflict');
+        $errorNode->appendChild($np);
+
+    }
+
+}
+
+?>
diff --git a/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php b/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
new file mode 100644
index 00000000000..024ab6641f3
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Exception/NeedPrivileges.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * NeedPrivileges 
+ *
+ * The 403-need privileges is thrown when a user didn't have the appropriate
+ * permissions to perform an operation
+ * 
+ * @package Sabre
+ * @subpackage DAVACL
+ * @version $Id$
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Exception_NeedPrivileges extends Sabre_DAV_Exception_Forbidden {
+
+    /**
+     * The relevant uri 
+     * 
+     * @var string 
+     */
+    protected $uri;
+
+    /**
+     * The privileges the user didn't have. 
+     * 
+     * @var array 
+     */
+    protected $privileges;
+
+    /**
+     * Constructor 
+     * 
+     * @param string $uri 
+     * @param array $privileges 
+     */
+    public function __construct($uri,array $privileges) {
+
+        $this->uri = $uri;
+        $this->privileges = $privileges;
+
+    }
+
+    /**
+     * Adds in extra information in the xml response.
+     *
+     * This method adds the {DAV:}need-privileges element as defined in rfc3744
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+        
+        $doc = $errorNode->ownerDocument;
+        
+        $np = $doc->createElementNS('DAV:','d:need-privileges');
+        $errorNode->appendChild($np);
+
+        foreach($this->privileges as $privilege) {
+
+            $resource = $doc->createElementNS('DAV:','d:resource');
+            $np->appendChild($resource);
+
+            $resource->appendChild($doc->createElementNS('DAV:','d:href',$server->getBaseUri() . $this->uri));
+
+            $priv = $doc->createElementNS('DAV:','d:privilege');
+            $resource->appendChild($priv);
+
+            preg_match('/^{([^}]*)}(.*)$/',$privilege,$privilegeParts);
+            $priv->appendChild($doc->createElementNS($privilegeParts[1],'d:' . $privilegeParts[2]));
+
+
+        }
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php b/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
new file mode 100644
index 00000000000..60f49ebff4a
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Exception/NoAbstract.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Sabre_DAVACL_Exception_NoAbstract
+ * 
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Exception_NoAbstract extends Sabre_DAV_Exception_PreconditionFailed {
+
+    /**
+     * Adds in extra information in the xml response.
+     *
+     * This method adds the {DAV:}no-abstract element as defined in rfc3744
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+        
+        $doc = $errorNode->ownerDocument;
+        
+        $np = $doc->createElementNS('DAV:','d:no-abstract');
+        $errorNode->appendChild($np);
+
+    }
+
+}
+
+?>
diff --git a/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php b/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
new file mode 100644
index 00000000000..e056dc9e4f7
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Sabre_DAVACL_Exception_NotRecognizedPrincipal
+ * 
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Exception_NotRecognizedPrincipal extends Sabre_DAV_Exception_PreconditionFailed {
+
+    /**
+     * Adds in extra information in the xml response.
+     *
+     * This method adds the {DAV:}recognized-principal element as defined in rfc3744
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+        
+        $doc = $errorNode->ownerDocument;
+        
+        $np = $doc->createElementNS('DAV:','d:recognized-principal');
+        $errorNode->appendChild($np);
+
+    }
+
+}
+
+?>
diff --git a/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php b/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
new file mode 100644
index 00000000000..27db7cdd7dd
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Sabre_DAVACL_Exception_NotSupportedPrivilege
+ * 
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Exception_NotSupportedPrivilege extends Sabre_DAV_Exception_PreconditionFailed {
+
+    /**
+     * Adds in extra information in the xml response.
+     *
+     * This method adds the {DAV:}not-supported-privilege element as defined in rfc3744
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+        
+        $doc = $errorNode->ownerDocument;
+        
+        $np = $doc->createElementNS('DAV:','d:not-supported-privilege');
+        $errorNode->appendChild($np);
+
+    }
+
+}
+
+?>
diff --git a/3rdparty/Sabre/DAVACL/IACL.php b/3rdparty/Sabre/DAVACL/IACL.php
new file mode 100644
index 00000000000..506be4248d7
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/IACL.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * ACL-enabled node
+ *
+ * If you want to add WebDAV ACL to a node, you must implement this class
+ * 
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAVACL_IACL extends Sabre_DAV_INode {
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner 
+     * 
+     * @return string|null
+     */
+    function getOwner();
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     * 
+     * @return string|null 
+     */
+    function getGroup();
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to 
+     *      be updated. 
+     * 
+     * @return array 
+     */
+    function getACL();
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's. 
+     * 
+     * @param array $acl 
+     * @return void
+     */
+    function setACL(array $acl);
+
+}
diff --git a/3rdparty/Sabre/DAVACL/IPrincipal.php b/3rdparty/Sabre/DAVACL/IPrincipal.php
new file mode 100644
index 00000000000..7868811db76
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/IPrincipal.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * IPrincipal interface
+ * 
+ * Implement this interface to define your own principals
+ * 
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAVACL_IPrincipal extends Sabre_DAV_INode {
+
+    /**
+     * Returns a list of altenative urls for a principal
+     * 
+     * This can for example be an email address, or ldap url.
+     * 
+     * @return array 
+     */
+    function getAlternateUriSet();
+
+    /**
+     * Returns the full principal url 
+     * 
+     * @return string 
+     */
+    function getPrincipalUrl();
+
+    /**
+     * Returns the list of group members
+     * 
+     * If this principal is a group, this function should return
+     * all member principal uri's for the group. 
+     * 
+     * @return array
+     */
+    function getGroupMemberSet();
+
+    /**
+     * Returns the list of groups this principal is member of
+     * 
+     * If this principal is a member of a (list of) groups, this function
+     * should return a list of principal uri's for it's members. 
+     * 
+     * @return array 
+     */
+    function getGroupMembership();
+
+    /**
+     * Sets a list of group members
+     *
+     * If this principal is a group, this method sets all the group members.
+     * The list of members is always overwritten, never appended to.
+     * 
+     * This method should throw an exception if the members could not be set. 
+     * 
+     * @param array $principals 
+     * @return void 
+     */
+    function setGroupMemberSet(array $principals);
+
+    /**
+     * Returns the displayname
+     *
+     * This should be a human readable name for the principal.
+     * If none is available, return the nodename. 
+     * 
+     * @return string 
+     */
+    function getDisplayName();
+
+}
diff --git a/3rdparty/Sabre/DAVACL/IPrincipalBackend.php b/3rdparty/Sabre/DAVACL/IPrincipalBackend.php
new file mode 100644
index 00000000000..8899f6f80df
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/IPrincipalBackend.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * Implement this interface to create your own principal backends.
+ *
+ * Creating backends for principals is entirely optional. You can also 
+ * implement Sabre_DAVACL_IPrincipal directly. This interface is used solely by 
+ * Sabre_DAVACL_AbstractPrincipalCollection.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAVACL_IPrincipalBackend {
+
+    /**
+     * Returns a list of principals based on a prefix.
+     *
+     * This prefix will often contain something like 'principals'. You are only 
+     * expected to return principals that are in this base path.
+     *
+     * You are expected to return at least a 'uri' for every user, you can 
+     * return any additional properties if you wish so. Common properties are:
+     *   {DAV:}displayname 
+     *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV 
+     *     field that's actualy injected in a number of other properties. If
+     *     you have an email address, use this property.
+     * 
+     * @param string $prefixPath 
+     * @return array 
+     */
+    function getPrincipalsByPrefix($prefixPath);
+
+    /**
+     * Returns a specific principal, specified by it's path.
+     * The returned structure should be the exact same as from 
+     * getPrincipalsByPrefix. 
+     * 
+     * @param string $path 
+     * @return array 
+     */
+    function getPrincipalByPath($path);
+
+    /**
+     * Returns the list of members for a group-principal 
+     * 
+     * @param string $principal 
+     * @return array 
+     */
+    function getGroupMemberSet($principal);
+
+    /**
+     * Returns the list of groups a principal is a member of 
+     * 
+     * @param string $principal 
+     * @return array 
+     */
+    function getGroupMembership($principal);
+
+    /**
+     * Updates the list of group members for a group principal.
+     *
+     * The principals should be passed as a list of uri's. 
+     * 
+     * @param string $principal 
+     * @param array $members 
+     * @return void
+     */
+    function setGroupMemberSet($principal, array $members); 
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Plugin.php b/3rdparty/Sabre/DAVACL/Plugin.php
new file mode 100644
index 00000000000..b964bdb5dec
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Plugin.php
@@ -0,0 +1,1238 @@
+<?php
+
+/**
+ * SabreDAV ACL Plugin
+ *
+ * This plugin provides funcitonality to enforce ACL permissions.
+ * ACL is defined in RFC3744.
+ *
+ * In addition it also provides support for the {DAV:}current-user-principal 
+ * property, defined in RFC5397 and the {DAV:}expand-property report, as 
+ * defined in RFC3253. 
+ * 
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Recursion constants
+     *
+     * This only checks the base node
+     */
+    const R_PARENT = 1;
+
+    /**
+     * Recursion constants
+     *
+     * This checks every node in the tree
+     */
+    const R_RECURSIVE = 2;
+
+    /**
+     * Recursion constants
+     *
+     * This checks every parentnode in the tree, but not leaf-nodes.
+     */
+    const R_RECURSIVEPARENTS = 3;
+
+    /**
+     * Reference to server object. 
+     * 
+     * @var Sabre_DAV_Server 
+     */
+    protected $server;
+
+    /**
+     * List of urls containing principal collections.
+     * Modify this if your principals are located elsewhere. 
+     * 
+     * @var array
+     */
+    public $principalCollectionSet = array(
+        'principals',
+    );
+
+    /**
+     * By default ACL is only enforced for nodes that have ACL support (the 
+     * ones that implement Sabre_DAVACL_IACL). For any other node, access is 
+     * always granted.
+     *
+     * To override this behaviour you can turn this setting off. This is useful 
+     * if you plan to fully support ACL in the entire tree.
+     *
+     * @var bool 
+     */
+    public $allowAccessToNodesWithoutACL = true;
+
+    /**
+     * By default nodes that are inaccessible by the user, can still be seen
+     * in directory listings (PROPFIND on parent with Depth: 1)
+     *
+     * In certain cases it's desirable to hide inaccessible nodes. Setting this 
+     * to true will cause these nodes to be hidden from directory listings.
+     * 
+     * @var bool 
+     */
+    public $hideNodesFromListings = false;
+
+    /**
+     * This string is prepended to the username of the currently logged in 
+     * user. This allows the plugin to determine the principal path based on 
+     * the username.
+     * 
+     * @var string
+     */
+    public $defaultUsernamePath = 'principals';
+
+    /**
+     * Returns a list of features added by this plugin.
+     *
+     * This list is used in the response of a HTTP OPTIONS request.
+     * 
+     * @return array 
+     */
+    public function getFeatures() {
+
+        return array('access-control');
+
+    }
+
+    /**
+     * Returns a list of available methods for a given url 
+     * 
+     * @param string $uri 
+     * @return array 
+     */
+    public function getMethods($uri) {
+
+        return array('ACL');
+
+    }
+
+    /**
+     * Returns a plugin name.
+     * 
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre_DAV_Server::getPlugin 
+     * 
+     * @return string 
+     */
+    public function getPluginName() {
+
+        return 'acl';
+
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     * Note that you still need to subscribe to the 'report' event to actually 
+     * implement them 
+     * 
+     * @param string $uri
+     * @return array 
+     */
+    public function getSupportedReportSet($uri) {
+
+        return array(
+            '{DAV:}expand-property',
+            '{DAV:}principal-property-search',
+            '{DAV:}principal-search-property-set', 
+        );
+
+    }
+
+
+    /**
+     * Checks if the current user has the specified privilege(s). 
+     * 
+     * You can specify a single privilege, or a list of privileges.
+     * This method will throw an exception if the privilege is not available
+     * and return true otherwise.
+     *
+     * @param string $uri
+     * @param array|string $privileges
+     * @param bool $throwExceptions if set to false, this method won't through exceptions. 
+     * @throws Sabre_DAVACL_Exception_NeedPrivileges
+     * @return bool 
+     */
+    public function checkPrivileges($uri,$privileges,$recursion = self::R_PARENT, $throwExceptions = true) {
+
+        if (!is_array($privileges)) $privileges = array($privileges);
+
+        $acl = $this->getCurrentUserPrivilegeSet($uri);
+
+        if (is_null($acl)) {
+            if ($this->allowAccessToNodesWithoutACL) {
+                return true;
+            } else {
+                if ($throwExceptions) 
+                    throw new Sabre_DAVACL_Exception_NeedPrivileges($uri,$privileges);
+                else
+                    return false;
+
+            }
+        }
+
+        $failed = array();
+        foreach($privileges as $priv) {
+
+            if (!in_array($priv, $acl)) {
+                $failed[] = $priv;
+            }
+
+        }
+
+        if ($failed) {
+            if ($throwExceptions) 
+                throw new Sabre_DAVACL_Exception_NeedPrivileges($uri,$failed);
+            else
+                return false;
+        }
+        return true;
+
+    }
+
+    /**
+     * Returns the standard users' principal.
+     *
+     * This is one authorative principal url for the current user.
+     * This method will return null if the user wasn't logged in. 
+     * 
+     * @return string|null 
+     */
+    public function getCurrentUserPrincipal() {
+
+        $authPlugin = $this->server->getPlugin('auth');
+        if (is_null($authPlugin)) return null;
+
+        $userName = $authPlugin->getCurrentUser();
+        if (!$userName) return null;
+
+        return $this->defaultUsernamePath . '/' . $userName;
+
+    }
+
+    /**
+     * Returns a list of principals that's associated to the current
+     * user, either directly or through group membership. 
+     * 
+     * @return array 
+     */
+    public function getCurrentUserPrincipals() {
+
+        $currentUser = $this->getCurrentUserPrincipal();
+
+        if (is_null($currentUser)) return array();
+
+        $check = array($currentUser);
+        $principals = array($currentUser);
+
+        while(count($check)) {
+
+            $principal = array_shift($check);
+ 
+            $node = $this->server->tree->getNodeForPath($principal);
+            if ($node instanceof Sabre_DAVACL_IPrincipal) {
+                foreach($node->getGroupMembership() as $groupMember) {
+
+                    if (!in_array($groupMember, $principals)) {
+
+                        $check[] = $groupMember;
+                        $principals[] = $groupMember;
+
+                    }
+
+                }
+
+            }
+
+        }
+
+        return $principals;
+
+    }
+
+    /**
+     * Returns the supported privilege structure for this ACL plugin.
+     *
+     * See RFC3744 for more details. Currently we default on a simple,
+     * standard structure. 
+     * 
+     * @return array 
+     */
+    public function getSupportedPrivilegeSet() {
+
+        return array(
+            'privilege'  => '{DAV:}all',
+            'abstract'   => true,
+            'aggregates' => array(
+                array(
+                    'privilege'  => '{DAV:}read',
+                    'aggregates' => array(
+                        array(
+                            'privilege' => '{DAV:}read-acl',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}read-current-user-privilege-set',
+                            'abstract'  => true,
+                        ),
+                    ),
+                ), // {DAV:}read
+                array(
+                    'privilege'  => '{DAV:}write',
+                    'aggregates' => array(
+                        array(
+                            'privilege' => '{DAV:}write-acl',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}write-properties',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}write-content',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}bind',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}unbind',
+                            'abstract'  => true,
+                        ),
+                        array(
+                            'privilege' => '{DAV:}unlock',
+                            'abstract'  => true,
+                        ),
+                    ),
+                ), // {DAV:}write
+            ), 
+        ); // {DAV:}all
+
+    }
+
+    /**
+     * Returns the supported privilege set as a flat list
+     *
+     * This is much easier to parse.
+     *
+     * The returned list will be index by privilege name.
+     * The value is a struct containing the following properties:
+     *   - aggregates
+     *   - abstract
+     *   - concrete
+     * 
+     * @return array 
+     */
+    final public function getFlatPrivilegeSet() {
+
+        $privs = $this->getSupportedPrivilegeSet();
+
+        $flat = array();
+        $this->getFPSTraverse($privs, null, $flat);
+
+        return $flat;
+
+    }
+
+    /**
+     * Traverses the privilege set tree for reordering
+     *
+     * This function is solely used by getFlatPrivilegeSet, and would have been 
+     * a closure if it wasn't for the fact I need to support PHP 5.2.
+     * 
+     * @return void
+     */
+    final private function getFPSTraverse($priv, $concrete, &$flat) {
+
+        $myPriv = array(
+            'privilege' => $priv['privilege'],
+            'abstract' => isset($priv['abstract']) && $priv['abstract'],
+            'aggregates' => array(),
+            'concrete' => isset($priv['abstract']) && $priv['abstract']?$concrete:$priv['privilege'],
+        );
+
+        if (isset($priv['aggregates']))
+            foreach($priv['aggregates'] as $subPriv) $myPriv['aggregates'][] = $subPriv['privilege'];
+
+        $flat[$priv['privilege']] = $myPriv;
+
+        if (isset($priv['aggregates'])) {
+
+            foreach($priv['aggregates'] as $subPriv) {
+            
+                $this->getFPSTraverse($subPriv, $myPriv['concrete'], $flat);
+
+            }
+
+        }
+
+    }
+
+    /**
+     * Returns the full ACL list.
+     *
+     * Either a uri or a Sabre_DAV_INode may be passed.
+     *
+     * null will be returned if the node doesn't support ACLs. 
+     * 
+     * @param string|Sabre_DAV_INode $node
+     * @return array
+     */
+    public function getACL($node) {
+
+        if (is_string($node)) {
+            $node = $this->server->tree->getNodeForPath($node);
+        }
+        if ($node instanceof Sabre_DAVACL_IACL) {
+            return $node->getACL();
+        }
+        return null; 
+
+    }
+
+    /**
+     * Returns a list of privileges the current user has
+     * on a particular node.
+     *
+     * Either a uri or a Sabre_DAV_INode may be passed.
+     *
+     * null will be returned if the node doesn't support ACLs. 
+     * 
+     * @param string|Sabre_DAV_INode $node 
+     * @return array 
+     */
+    public function getCurrentUserPrivilegeSet($node) {
+
+        if (is_string($node)) {
+            $node = $this->server->tree->getNodeForPath($node);
+        }
+
+        $acl = $this->getACL($node);
+        if (is_null($acl)) return null;
+
+        $principals = $this->getCurrentUserPrincipals();
+
+        $collected = array();
+
+        foreach($acl as $ace) {
+
+            if (in_array($ace['principal'], $principals)) {
+                $collected[] = $ace;
+            }
+
+        }
+
+        // Now we deduct all aggregated privileges.
+        $flat = $this->getFlatPrivilegeSet();
+
+        $collected2 = array();
+        foreach($collected as $privilege) {
+
+            $collected2[] = $privilege['privilege'];
+            foreach($flat[$privilege['privilege']]['aggregates'] as $subPriv) {
+                if (!in_array($subPriv, $collected2)) 
+                    $collected2[] = $subPriv;
+            }
+
+        }
+
+        return $collected2;
+
+    }
+
+    /**
+     * Sets up the plugin
+     *
+     * This method is automatically called by the server class.
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $server->subscribeEvent('beforeGetProperties',array($this,'beforeGetProperties'));
+
+        $server->subscribeEvent('beforeMethod', array($this,'beforeMethod'),20);
+        $server->subscribeEvent('beforeBind', array($this,'beforeBind'),20);
+        $server->subscribeEvent('beforeUnbind', array($this,'beforeUnbind'),20);
+        $server->subscribeEvent('updateProperties',array($this,'updateProperties'));
+        $server->subscribeEvent('beforeUnlock', array($this,'beforeUnlock'),20);
+        $server->subscribeEvent('report',array($this,'report'));
+        $server->subscribeEvent('unknownMethod', array($this, 'unknownMethod'));
+
+        array_push($server->protectedProperties,
+            '{DAV:}alternate-URI-set',
+            '{DAV:}principal-URL',
+            '{DAV:}group-membership',
+            '{DAV:}principal-collection-set',
+            '{DAV:}current-user-principal',
+            '{DAV:}supported-privilege-set',
+            '{DAV:}current-user-privilege-set',
+            '{DAV:}acl',
+            '{DAV:}acl-restrictions',
+            '{DAV:}inherited-acl-set',
+            '{DAV:}owner',
+            '{DAV:}group'
+        );
+
+        // Automatically mapping nodes implementing IPrincipal to the 
+        // {DAV:}principal resourcetype.
+        $server->resourceTypeMapping['Sabre_DAVACL_IPrincipal'] = '{DAV:}principal';
+
+        // Mapping the group-member-set property to the HrefList property 
+        // class.
+        $server->propertyMap['{DAV:}group-member-set'] = 'Sabre_DAV_Property_HrefList';
+
+    }
+
+
+    /* {{{ Event handlers */
+
+    /**
+     * Triggered before any method is handled 
+     * 
+     * @param string $method 
+     * @param string $uri 
+     * @return void
+     */
+    public function beforeMethod($method, $uri) {
+
+        $exists = $this->server->tree->nodeExists($uri);
+
+        // If the node doesn't exists, none of these checks apply
+        if (!$exists) return;
+
+        switch($method) {
+
+            case 'GET' :
+            case 'HEAD' :
+            case 'OPTIONS' :
+                // For these 3 we only need to know if the node is readable.
+                $this->checkPrivileges($uri,'{DAV:}read');
+                break;
+
+            case 'PUT' :
+            case 'LOCK' :
+            case 'UNLOCK' : 
+                // This method requires the write-content priv if the node 
+                // already exists, and bind on the parent if the node is being 
+                // created. 
+                // The bind privilege is handled in the beforeBind event. 
+                $this->checkPrivileges($uri,'{DAV:}write-content');
+                break;
+            
+
+            case 'PROPPATCH' :
+                $this->checkPrivileges($uri,'{DAV:}write-properties');
+                break;
+
+            case 'ACL' :
+                $this->checkPrivileges($uri,'{DAV:}write-acl');
+                break;
+
+            case 'COPY' :
+            case 'MOVE' :
+                // Copy requires read privileges on the entire source tree.
+                // If the target exists write-content normally needs to be 
+                // checked, however, we're deleting the node beforehand and 
+                // creating a new one after, so this is handled by the 
+                // beforeUnbind event.
+                // 
+                // The creation of the new node is handled by the beforeBind 
+                // event.
+                //
+                // If MOVE is used beforeUnbind will also be used to check if 
+                // the sourcenode can be deleted. 
+                $this->checkPrivileges($uri,'{DAV:}read',self::R_RECURSIVE);
+
+                break;
+
+        }
+
+    }
+
+    /**
+     * Triggered before a new node is created.
+     * 
+     * This allows us to check permissions for any operation that creates a
+     * new node, such as PUT, MKCOL, MKCALENDAR, LOCK, COPY and MOVE.
+     * 
+     * @param string $uri 
+     * @return void
+     */
+    public function beforeBind($uri) {
+
+        list($parentUri,$nodeName) = Sabre_DAV_URLUtil::splitPath($uri);
+        $this->checkPrivileges($parentUri,'{DAV:}bind');
+
+    }
+
+    /**
+     * Triggered before a node is deleted 
+     * 
+     * This allows us to check permissions for any operation that will delete 
+     * an existing node. 
+     * 
+     * @param string $uri 
+     * @return void
+     */
+    public function beforeUnbind($uri) {
+
+        list($parentUri,$nodeName) = Sabre_DAV_URLUtil::splitPath($uri);
+        $this->checkPrivileges($parentUri,'{DAV:}unbind',self::R_RECURSIVEPARENTS);
+
+    }
+
+    /**
+     * Triggered before a node is unlocked. 
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lock
+     * @TODO: not yet implemented 
+     * @return void
+     */
+    public function beforeUnlock($uri, Sabre_DAV_Locks_LockInfo $lock) {
+           
+
+    }
+
+    /**
+     * Triggered before properties are looked up in specific nodes. 
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_INode $node 
+     * @param array $requestedProperties 
+     * @param array $returnedProperties
+     * @TODO really should be broken into multiple methods, or even a class. 
+     * @return void
+     */
+    public function beforeGetProperties($uri, Sabre_DAV_INode $node, &$requestedProperties, &$returnedProperties) {
+
+        // Checking the read permission
+        if (!$this->checkPrivileges($uri,'{DAV:}read',self::R_PARENT,false)) {
+
+            // User is not allowed to read properties
+            if ($this->hideNodesFromListings) {
+                return false;
+            }
+
+            // Marking all requested properties as '403'.
+            foreach($requestedProperties as $key=>$requestedProperty) {
+                unset($requestedProperties[$key]);
+                $returnedProperties[403][$requestedProperty] = null;
+            }
+            return;
+
+        } 
+
+        /* Adding principal properties */
+        if ($node instanceof Sabre_DAVACL_IPrincipal) {
+
+            if (false !== ($index = array_search('{DAV:}alternate-URI-set', $requestedProperties))) {
+
+                unset($requestedProperties[$index]);
+                $returnedProperties[200]['{DAV:}alternate-URI-set'] = new Sabre_DAV_Property_HrefList($node->getAlternateUriSet());
+
+            }
+            if (false !== ($index = array_search('{DAV:}principal-URL', $requestedProperties))) {
+
+                unset($requestedProperties[$index]);
+                $returnedProperties[200]['{DAV:}principal-URL'] = new Sabre_DAV_Property_Href($node->getPrincipalUrl() . '/');
+
+            }
+            if (false !== ($index = array_search('{DAV:}group-member-set', $requestedProperties))) {
+
+                unset($requestedProperties[$index]);
+                $returnedProperties[200]['{DAV:}group-member-set'] = new Sabre_DAV_Property_HrefList($node->getGroupMemberSet());
+
+            }
+            if (false !== ($index = array_search('{DAV:}group-membership', $requestedProperties))) {
+
+                unset($requestedProperties[$index]);
+                $returnedProperties[200]['{DAV:}group-membership'] = new Sabre_DAV_Property_HrefList($node->getGroupMembership());
+
+            }
+
+            if (false !== ($index = array_search('{DAV:}displayname', $requestedProperties))) {
+
+                $returnedProperties[200]['{DAV:}displayname'] = $node->getDisplayName();
+
+            }
+
+        }
+        if (false !== ($index = array_search('{DAV:}principal-collection-set', $requestedProperties))) {
+
+            unset($requestedProperties[$index]);
+            $val = $this->principalCollectionSet;
+            // Ensuring all collections end with a slash
+            foreach($val as $k=>$v) $val[$k] = $v . '/';
+            $returnedProperties[200]['{DAV:}principal-collection-set'] = new Sabre_DAV_Property_HrefList($val);
+
+        }
+        if (false !== ($index = array_search('{DAV:}current-user-principal', $requestedProperties))) {
+
+            unset($requestedProperties[$index]);
+            if ($url = $this->getCurrentUserPrincipal()) {
+                $returnedProperties[200]['{DAV:}current-user-principal'] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::HREF, $url . '/');
+            } else {
+                $returnedProperties[200]['{DAV:}current-user-principal'] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::UNAUTHENTICATED);
+            }
+
+        }
+        if (false !== ($index = array_search('{DAV:}supported-privilege-set', $requestedProperties))) {
+
+            unset($requestedProperties[$index]);
+            $returnedProperties[200]['{DAV:}supported-privilege-set'] = new Sabre_DAVACL_Property_SupportedPrivilegeSet($this->getSupportedPrivilegeSet());
+
+        }
+        if (false !== ($index = array_search('{DAV:}current-user-privilege-set', $requestedProperties))) {
+
+            if (!$this->checkPrivileges($uri, '{DAV:}read-current-user-privilege-set', self::R_PARENT, false)) {
+                $returnedProperties[403]['{DAV:}current-user-privilege-set'] = null;
+                unset($requestedProperties[$index]);
+            } else {
+                $val = $this->getCurrentUserPrivilegeSet($node);
+                if (!is_null($val)) {
+                    unset($requestedProperties[$index]);
+                    $returnedProperties[200]['{DAV:}current-user-privilege-set'] = new Sabre_DAVACL_Property_CurrentUserPrivilegeSet($val);
+                }
+            }
+
+        }
+
+        /* The ACL property contains all the permissions */
+        if (false !== ($index = array_search('{DAV:}acl', $requestedProperties))) {
+
+            if (!$this->checkPrivileges($uri, '{DAV:}read-acl', self::R_PARENT, false)) {
+
+                unset($requestedProperties[$index]);
+                $returnedProperties[403]['{DAV:}acl'] = null;
+
+            } else {
+
+                $acl = $this->getACL($node);
+                if (!is_null($acl)) {
+                    unset($requestedProperties[$index]);
+                    $returnedProperties[200]['{DAV:}acl'] = new Sabre_DAVACL_Property_Acl($this->getACL($node));
+                }
+
+            }
+
+        }
+
+    }
+
+    /**
+     * This method intercepts PROPPATCH methods and make sure the 
+     * group-member-set is updated correctly. 
+     * 
+     * @param array $propertyDelta 
+     * @param array $result 
+     * @param Sabre_DAV_INode $node 
+     * @return void
+     */
+    public function updateProperties(&$propertyDelta, &$result, Sabre_DAV_INode $node) {
+
+        if (!array_key_exists('{DAV:}group-member-set', $propertyDelta))
+            return;
+
+        if (is_null($propertyDelta['{DAV:}group-member-set'])) {
+            $memberSet = array();
+        } elseif ($propertyDelta['{DAV:}group-member-set'] instanceof Sabre_DAV_Property_HrefList) {
+            $memberSet = $propertyDelta['{DAV:}group-member-set']->getHrefs();
+        } else {
+            throw new Sabre_DAV_Exception('The group-member-set property MUST be an instance of Sabre_DAV_Property_HrefList or null');
+        }
+
+        if (!($node instanceof Sabre_DAVACL_IPrincipal)) {
+            $result[403]['{DAV:}group-member-set'] = null;
+            unset($propertyDelta['{DAV:}group-member-set']);
+
+            // Returning false will stop the updateProperties process
+            return false;
+        }
+
+        $node->setGroupMemberSet($memberSet);
+        
+        $result[200]['{DAV:}group-member-set'] = null;
+        unset($propertyDelta['{DAV:}group-member-set']);
+
+    }
+
+    /**
+     * This method handels HTTP REPORT requests 
+     * 
+     * @param string $reportName 
+     * @param DOMNode $dom 
+     * @return void
+     */
+    public function report($reportName, $dom) {
+
+        switch($reportName) {
+
+            case '{DAV:}principal-property-search' :
+                $this->principalPropertySearchReport($dom);
+                return false;
+            case '{DAV:}principal-search-property-set' :
+                $this->principalSearchPropertySetReport($dom);
+                return false; 
+            case '{DAV:}expand-property' :
+                $this->expandPropertyReport($dom);
+                return false;
+
+        }
+
+    }
+
+    /**
+     * This event is triggered for any HTTP method that is not known by the 
+     * webserver. 
+     *
+     * @param string $method 
+     * @param string $uri 
+     * @return void
+     */
+    public function unknownMethod($method, $uri) {
+
+        if ($method!=='ACL') return;
+
+        $this->httpACL($uri);
+        return false;
+
+    }
+
+    /**
+     * This method is responsible for handling the 'ACL' event.
+     *
+     * @param string $uri
+     * @return void
+     */
+    public function httpACL($uri) { 
+
+        $body = $this->server->httpRequest->getBody(true);
+        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+
+        $newAcl = 
+            Sabre_DAVACL_Property_Acl::unserialize($dom->firstChild)
+            ->getPrivileges();
+
+        // Normalizing urls
+        foreach($newAcl as $k=>$newAce) {
+            $newAcl[$k]['principal'] = $this->server->calculateUri($newAce['principal']);
+        }
+
+        $node = $this->server->tree->getNodeForPath($uri);
+
+        if (!($node instanceof Sabre_DAVACL_IACL)) {
+            throw new Sabre_DAV_Exception_MethodNotAllowed('This node does not support the ACL method');
+        }
+
+        $oldAcl = $this->getACL($node);
+
+        $supportedPrivileges = $this->getFlatPrivilegeSet(); 
+
+        /* Checking if protected principals from the existing principal set are 
+           not overwritten. */
+        foreach($oldAcl as $k=>$oldAce) {
+
+            if (!isset($oldAce['protected']) || !$oldAce['protected']) continue; 
+
+            $found = false;
+            foreach($newAcl as $newAce) {
+                if (
+                    $newAce['privilege'] === $oldAce['privilege'] &&
+                    $newAce['principal'] === $oldAce['principal'] &&
+                    $newAce['protected']
+                ) 
+                $found = true;
+            }
+
+            if (!$found) 
+                throw new Sabre_DAVACL_Exception_AceConflict('This resource contained a protected {DAV:}ace, but this privilege did not occur in the ACL request');
+
+        }
+
+        foreach($newAcl as $k=>$newAce) {
+
+            // Do we recognize the privilege
+            if (!isset($supportedPrivileges[$newAce['privilege']])) {
+                throw new Sabre_DAVACL_Exception_NotSupportedPrivilege('The privilege you specified (' . $newAce['privilege'] . ') is not recognized by this server');
+            }
+
+            if ($supportedPrivileges[$newAce['privilege']]['abstract']) {
+                throw new Sabre_DAVACL_Exception_NoAbstract('The privilege you specified (' . $newAce['privilege'] . ') is an abstract privilege');
+            }
+
+            // Looking up the principal
+            try {
+                $principal = $this->server->tree->getNodeForPath($newAce['principal']);
+            } catch (Sabre_DAV_Exception_FileNotFound $e) {
+                throw new Sabre_DAVACL_Exception_NotRecognizedPrincipal('The specified principal (' . $newAce['principal'] . ') does not exist');
+            }
+            if (!($principal instanceof Sabre_DAVACL_IPrincipal)) {
+                throw new Sabre_DAVACL_Exception_NotRecognizedPrincipal('The specified uri (' . $newAce['principal'] . ') is not a principal');
+            } 
+
+        }
+        $node->setACL($newAcl);
+
+    }
+
+    /* }}} */
+
+    /* Reports {{{ */
+
+    /**
+     * The expand-property report is defined in RFC3253 section 3-8. 
+     *
+     * This report is very similar to a standard PROPFIND. The difference is
+     * that it has the additional ability to look at properties containing a
+     * {DAV:}href element, follow that property and grab additional elements
+     * there.
+     *
+     * Other rfc's, such as ACL rely on this report, so it made sense to put
+     * it in this plugin.
+     *
+     * @param DOMElement $dom 
+     * @return void
+     */
+    protected function expandPropertyReport($dom) {
+
+        $requestedProperties = $this->parseExpandPropertyReportRequest($dom->firstChild->firstChild);
+        $depth = $this->server->getHTTPDepth(0);
+        $requestUri = $this->server->getRequestUri();
+
+        $result = $this->expandProperties($requestUri,$requestedProperties,$depth);
+
+        $dom = new DOMDocument('1.0','utf-8');
+        $dom->formatOutput = true;
+        $multiStatus = $dom->createElement('d:multistatus');
+        $dom->appendChild($multiStatus);
+
+        // Adding in default namespaces
+        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
+
+            $multiStatus->setAttribute('xmlns:' . $prefix,$namespace);
+
+        }
+
+        foreach($result as $response) {
+            $response->serialize($this->server, $multiStatus);
+        }
+
+        $xml = $dom->saveXML();
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->sendBody($xml);
+
+    }
+
+    /**
+     * This method is used by expandPropertyReport to parse
+     * out the entire HTTP request.
+     * 
+     * @param DOMElement $node 
+     * @return array 
+     */
+    protected function parseExpandPropertyReportRequest($node) {
+
+        $requestedProperties = array();
+        do {
+
+            if (Sabre_DAV_XMLUtil::toClarkNotation($node)!=='{DAV:}property') continue;
+                
+            if ($node->firstChild) {
+                
+                $children = $this->parseExpandPropertyReportRequest($node->firstChild);
+
+            } else {
+
+                $children = array();
+
+            }
+
+            $namespace = $node->getAttribute('namespace');
+            if (!$namespace) $namespace = 'DAV:';
+
+            $propName = '{'.$namespace.'}' . $node->getAttribute('name');
+            $requestedProperties[$propName] = $children; 
+
+        } while ($node = $node->nextSibling);
+
+        return $requestedProperties;
+
+    }
+
+    /**
+     * This method expands all the properties and returns
+     * a list with property values
+     *
+     * @param array $path
+     * @param array $requestedProperties the list of required properties
+     * @param array $depth
+     */
+    protected function expandProperties($path,array $requestedProperties,$depth) { 
+
+        $foundProperties = $this->server->getPropertiesForPath($path,array_keys($requestedProperties),$depth);
+
+        $result = array();
+
+        foreach($foundProperties as $node) {
+
+            foreach($requestedProperties as $propertyName=>$childRequestedProperties) {
+
+                // We're only traversing if sub-properties were requested
+                if(count($childRequestedProperties)===0) continue;
+                
+                // We only have to do the expansion if the property was found
+                // and it contains an href element.
+                if (!array_key_exists($propertyName,$node[200])) continue;
+
+                if ($node[200][$propertyName] instanceof Sabre_DAV_Property_IHref) {
+                    $hrefs = array($node[200][$propertyName]->getHref());
+                } elseif ($node[200][$propertyName] instanceof Sabre_DAV_Property_HrefList) {
+                    $hrefs = $node[200][$propertyName]->getHrefs();
+                }
+
+                $childProps = array();
+                foreach($hrefs as $href) {
+                    $childProps = array_merge($childProps, $this->expandProperties($href,$childRequestedProperties,0));
+                }
+                $node[200][$propertyName] = new Sabre_DAV_Property_ResponseList($childProps);
+
+            }
+            $result[] = new Sabre_DAV_Property_Response($path, $node);
+
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * principalSearchPropertySetReport
+     *
+     * This method responsible for handing the 
+     * {DAV:}principal-search-property-set report. This report returns a list
+     * of properties the client may search on, using the
+     * {DAV:}principal-property-search report.
+     * 
+     * @param DOMDocument $dom 
+     * @return void
+     */
+    protected function principalSearchPropertySetReport(DOMDocument $dom) {
+
+        $searchProperties = array(
+            '{DAV:}displayname' => 'display name'
+        );
+
+        $httpDepth = $this->server->getHTTPDepth(0);
+        if ($httpDepth!==0) {
+            throw new Sabre_DAV_Exception_BadRequest('This report is only defined when Depth: 0');
+        }
+        
+        if ($dom->firstChild->hasChildNodes()) 
+            throw new Sabre_DAV_Exception_BadRequest('The principal-search-property-set report element is not allowed to have child elements'); 
+
+        $dom = new DOMDocument('1.0','utf-8');
+        $dom->formatOutput = true;
+        $root = $dom->createElement('d:principal-search-property-set');
+        $dom->appendChild($root);
+        // Adding in default namespaces
+        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
+
+            $root->setAttribute('xmlns:' . $prefix,$namespace);
+
+        }
+
+        $nsList = $this->server->xmlNamespaces; 
+
+        foreach($searchProperties as $propertyName=>$description) {
+
+            $psp = $dom->createElement('d:principal-search-property');
+            $root->appendChild($psp);
+
+            $prop = $dom->createElement('d:prop');
+            $psp->appendChild($prop);
+  
+            $propName = null;
+            preg_match('/^{([^}]*)}(.*)$/',$propertyName,$propName);
+
+            $currentProperty = $dom->createElement($nsList[$propName[1]] . ':' . $propName[2]);
+            $prop->appendChild($currentProperty);
+
+            $descriptionElem = $dom->createElement('d:description');
+            $descriptionElem->setAttribute('xml:lang','en');
+            $descriptionElem->appendChild($dom->createTextNode($description));
+            $psp->appendChild($descriptionElem);
+
+
+        }
+
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->sendBody($dom->saveXML());
+
+    }
+
+    /**
+     * principalPropertySearchReport
+     *
+     * This method is reponsible for handing the 
+     * {DAV:}principal-property-search report. This report can be used for 
+     * clients to search for groups of principals, based on the value of one
+     * or more properties.
+     * 
+     * @param DOMDocument $dom 
+     * @return void
+     */
+    protected function principalPropertySearchReport(DOMDocument $dom) {
+
+        $searchableProperties = array(
+            '{DAV:}displayname' => 'display name'
+
+        );
+
+        list($searchProperties, $requestedProperties, $applyToPrincipalCollectionSet) = $this->parsePrincipalPropertySearchReportRequest($dom);
+
+        $result = array();
+
+        if ($applyToPrincipalCollectionSet) {
+            $uris = array();
+        } else {
+            $uris = array($this->server->getRequestUri());
+        }
+
+        $lookupResults = array();
+        foreach($uris as $uri) {
+
+            $p = array_keys($searchProperties);
+            $p[] = '{DAV:}resourcetype';
+            $r = $this->server->getPropertiesForPath($uri, $p, 1);
+
+            // The first item in the results is the parent, so we get rid of it.
+            array_shift($r);
+            $lookupResults = array_merge($lookupResults, $r);
+        } 
+
+        $matches = array();
+
+        foreach($lookupResults as $lookupResult) {
+
+            // We're only looking for principals 
+            if (!isset($lookupResult[200]['{DAV:}resourcetype']) || 
+                (!($lookupResult[200]['{DAV:}resourcetype'] instanceof Sabre_DAV_Property_ResourceType)) ||
+                !$lookupResult[200]['{DAV:}resourcetype']->is('{DAV:}principal')) continue;
+
+            foreach($searchProperties as $searchProperty=>$searchValue) {
+                if (!isset($searchableProperties[$searchProperty])) {
+                    // If a property is not 'searchable', the spec dictates 
+                    // this is not a match. 
+                    continue;
+                }
+
+                if (isset($lookupResult[200][$searchProperty]) &&
+                    mb_stripos($lookupResult[200][$searchProperty], $searchValue, 0, 'UTF-8')!==false) {
+                        $matches[] = $lookupResult['href'];
+                }
+
+            }
+
+        }
+
+        $matchProperties = array();
+
+        foreach($matches as $match) {
+            
+           list($result) = $this->server->getPropertiesForPath($match, $requestedProperties, 0);
+           $matchProperties[] = $result;
+
+        }
+
+        $xml = $this->server->generateMultiStatus($matchProperties);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->sendBody($xml);
+
+    }
+
+    /**
+     * parsePrincipalPropertySearchReportRequest
+     *
+     * This method parses the request body from a
+     * {DAV:}principal-property-search report.
+     *
+     * This method returns an array with two elements:
+     *  1. an array with properties to search on, and their values
+     *  2. a list of propertyvalues that should be returned for the request.
+     * 
+     * @param DOMDocument $dom 
+     * @return array 
+     */
+    protected function parsePrincipalPropertySearchReportRequest($dom) {
+
+        $httpDepth = $this->server->getHTTPDepth(0);
+        if ($httpDepth!==0) {
+            throw new Sabre_DAV_Exception_BadRequest('This report is only defined when Depth: 0');
+        }
+
+        $searchProperties = array();
+
+        $applyToPrincipalCollectionSet = false;
+
+        // Parsing the search request
+        foreach($dom->firstChild->childNodes as $searchNode) {
+
+            if (Sabre_DAV_XMLUtil::toClarkNotation($searchNode) == '{DAV:}apply-to-principal-collection-set')
+                $applyToPrincipalCollectionSet = true;
+
+            if (Sabre_DAV_XMLUtil::toClarkNotation($searchNode)!=='{DAV:}property-search')
+                continue;
+
+            $propertyName = null;
+            $propertyValue = null;
+
+            foreach($searchNode->childNodes as $childNode) {
+
+                switch(Sabre_DAV_XMLUtil::toClarkNotation($childNode)) {
+
+                    case '{DAV:}prop' :
+                        $property = Sabre_DAV_XMLUtil::parseProperties($searchNode);
+                        reset($property); 
+                        $propertyName = key($property);
+                        break;
+
+                    case '{DAV:}match' :
+                        $propertyValue = $childNode->textContent;
+                        break;
+
+                }
+
+
+            }
+
+            if (is_null($propertyName) || is_null($propertyValue))
+                throw new Sabre_DAV_Exception_BadRequest('Invalid search request. propertyname: ' . $propertyName . '. propertvvalue: ' . $propertyValue);
+
+            $searchProperties[$propertyName] = $propertyValue;
+
+        }
+
+        return array($searchProperties, array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild)), $applyToPrincipalCollectionSet);
+
+    }
+
+
+    /* }}} */
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Principal.php b/3rdparty/Sabre/DAVACL/Principal.php
new file mode 100644
index 00000000000..790603c900f
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Principal.php
@@ -0,0 +1,263 @@
+<?php
+
+/**
+ * Principal class
+ *
+ * This class is a representation of a simple principal
+ * 
+ * Many WebDAV specs require a user to show up in the directory 
+ * structure. 
+ *
+ * This principal also has basic ACL settings, only allowing the principal
+ * access it's own principal. 
+ * 
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Principal extends Sabre_DAV_Node implements Sabre_DAVACL_IPrincipal, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
+
+    /**
+     * Struct with principal information.
+     *
+     * @var array 
+     */
+    protected $principalProperties;
+
+    /**
+     * Principal backend 
+     * 
+     * @var Sabre_DAVACL_IPrincipalBackend 
+     */
+    protected $principalBackend;
+
+    /**
+     * Creates the principal object 
+     *
+     * @param array $principalProperties
+     */
+    public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalProperties = array()) {
+
+        if (!isset($principalProperties['uri'])) {
+            throw new Sabre_DAV_Exception('The principal properties must at least contain the \'uri\' key');
+        }
+        $this->principalBackend = $principalBackend;
+        $this->principalProperties = $principalProperties;
+
+    }
+
+    /**
+     * Returns the full principal url 
+     * 
+     * @return string 
+     */
+    public function getPrincipalUrl() {
+
+        return $this->principalProperties['uri'];
+
+    } 
+
+    /**
+     * Returns a list of altenative urls for a principal
+     * 
+     * This can for example be an email address, or ldap url.
+     * 
+     * @return array 
+     */
+    public function getAlternateUriSet() {
+
+        $uris = array();
+        if (isset($this->principalProperties['{DAV:}alternate-URI-set'])) {
+
+            $uris = $this->principalProperties['{DAV:}alternate-URI-set'];
+
+        }
+
+        if (isset($this->principalProperties['{http://sabredav.org/ns}email-address'])) {
+            $uris[] = 'mailto:' . $this->principalProperties['{http://sabredav.org/ns}email-address'];
+        }
+
+        return array_unique($uris); 
+
+    }
+
+    /**
+     * Returns the list of group members
+     * 
+     * If this principal is a group, this function should return
+     * all member principal uri's for the group. 
+     * 
+     * @return array
+     */
+    public function getGroupMemberSet() {
+
+        return $this->principalBackend->getGroupMemberSet($this->principalProperties['uri']);
+
+    }
+
+    /**
+     * Returns the list of groups this principal is member of
+     * 
+     * If this principal is a member of a (list of) groups, this function
+     * should return a list of principal uri's for it's members. 
+     * 
+     * @return array 
+     */
+    public function getGroupMembership() {
+
+        return $this->principalBackend->getGroupMemberShip($this->principalProperties['uri']);
+
+    }
+
+
+    /**
+     * Sets a list of group members
+     *
+     * If this principal is a group, this method sets all the group members.
+     * The list of members is always overwritten, never appended to.
+     * 
+     * This method should throw an exception if the members could not be set. 
+     * 
+     * @param array $principals 
+     * @return void 
+     */
+    public function setGroupMemberSet(array $groupMembers) {
+
+        $this->principalBackend->setGroupMemberSet($this->principalProperties['uri'], $groupMembers);
+
+    }
+
+
+    /**
+     * Returns this principals name.
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        $uri = $this->principalProperties['uri'];
+        list(, $name) = Sabre_DAV_URLUtil::splitPath($uri);
+
+        return $name;
+
+    }
+
+    /**
+     * Returns the name of the user 
+     * 
+     * @return void
+     */
+    public function getDisplayName() {
+
+        if (isset($this->principalProperties['{DAV:}displayname'])) {
+            return $this->principalProperties['{DAV:}displayname'];
+        } else {
+            return $this->getName();
+        }
+
+    }
+
+    /**
+     * Returns a list of properties 
+     * 
+     * @param array $requestedProperties 
+     * @return void
+     */
+    public function getProperties($requestedProperties) {
+
+        $newProperties = array();
+        foreach($requestedProperties as $propName) {
+            
+            if (isset($this->principalProperties[$propName])) {
+                $newProperties[$propName] = $this->principalProperties[$propName];
+            }
+
+        }
+
+        return $newProperties;
+        
+    }
+
+    /**
+     * Updates this principals properties.
+     *
+     * Currently this is not supported
+     * 
+     * @param array $properties
+     * @see Sabre_DAV_IProperties::updateProperties
+     * @return bool|array 
+     */
+    public function updateProperties($properties) {
+
+        return false;
+
+    }
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner 
+     * 
+     * @return string|null
+     */
+    public function getOwner() {
+
+        return $this->principalProperties['uri'];
+
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     * 
+     * @return string|null 
+     */
+    public function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are 
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to 
+     *      be updated. 
+     * 
+     * @return array 
+     */
+    public function getACL() {
+
+        return array(
+            array(
+                'privilege' => '{DAV:}read',
+                'principal' => $this->principalProperties['uri'],
+                'protected' => true,
+            ),
+        );
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's. 
+     * 
+     * @param array $acl 
+     * @return void
+     */
+    public function setACL(array $acl) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Updating ACLs is not allowed here');
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php b/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
new file mode 100644
index 00000000000..55bd1903c9b
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/PrincipalBackend/PDO.php
@@ -0,0 +1,206 @@
+<?php
+
+/**
+ * PDO principal backend
+ *
+ * This is a simple principal backend that maps exactly to the users table, as 
+ * used by Sabre_DAV_Auth_Backend_PDO.
+ *
+ * It assumes all principals are in a single collection. The default collection 
+ * is 'principals/', but this can be overriden.
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_PrincipalBackend_PDO implements Sabre_DAVACL_IPrincipalBackend {
+
+    /**
+     * pdo 
+     * 
+     * @var PDO 
+     */
+    protected $pdo;
+
+    /**
+     * PDO table name for 'principals' 
+     * 
+     * @var string 
+     */
+    protected $tableName;
+
+    /**
+     * PDO table name for 'group members' 
+     * 
+     * @var string 
+     */
+    protected $groupMembersTableName;
+
+    /**
+     * Sets up the backend.
+     * 
+     * @param PDO $pdo
+     * @param string $tableName 
+     */
+    public function __construct(PDO $pdo, $tableName = 'principals', $groupMembersTableName = 'groupmembers') {
+
+        $this->pdo = $pdo;
+        $this->tableName = $tableName;
+        $this->groupMembersTableName = $groupMembersTableName;
+
+    } 
+
+
+    /**
+     * Returns a list of principals based on a prefix.
+     *
+     * This prefix will often contain something like 'principals'. You are only 
+     * expected to return principals that are in this base path.
+     *
+     * You are expected to return at least a 'uri' for every user, you can 
+     * return any additional properties if you wish so. Common properties are:
+     *   {DAV:}displayname 
+     *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV 
+     *     field that's actualy injected in a number of other properties. If
+     *     you have an email address, use this property.
+     * 
+     * @param string $prefixPath 
+     * @return array 
+     */
+    public function getPrincipalsByPrefix($prefixPath) {
+        $result = $this->pdo->query('SELECT uri, email, displayname FROM `'. $this->tableName . '`');
+
+        $principals = array();
+
+        while($row = $result->fetch(PDO::FETCH_ASSOC)) {
+
+            // Checking if the principal is in the prefix
+            list($rowPrefix) = Sabre_DAV_URLUtil::splitPath($row['uri']);
+            if ($rowPrefix !== $prefixPath) continue;
+
+            $principals[] = array(
+                'uri' => $row['uri'],
+                '{DAV:}displayname' => $row['displayname']?$row['displayname']:basename($row['uri']),
+                '{http://sabredav.org/ns}email-address' => $row['email'],
+            );
+
+        }
+
+        return $principals;
+
+    }
+
+    /**
+     * Returns a specific principal, specified by it's path.
+     * The returned structure should be the exact same as from 
+     * getPrincipalsByPrefix. 
+     * 
+     * @param string $path 
+     * @return array 
+     */
+    public function getPrincipalByPath($path) {
+
+        $stmt = $this->pdo->prepare('SELECT id, uri, email, displayname FROM `'.$this->tableName.'` WHERE uri = ?');
+        $stmt->execute(array($path));
+
+        $users = array();
+
+        $row = $stmt->fetch(PDO::FETCH_ASSOC);
+        if (!$row) return;
+
+        return array(
+            'id'  => $row['id'],
+            'uri' => $row['uri'],
+            '{DAV:}displayname' => $row['displayname']?$row['displayname']:basename($row['uri']),
+            '{http://sabredav.org/ns}email-address' => $row['email'],
+        );
+
+    }
+
+    /**
+     * Returns the list of members for a group-principal 
+     * 
+     * @param string $principal 
+     * @return array 
+     */
+    public function getGroupMemberSet($principal) {
+
+        $principal = $this->getPrincipalByPath($principal);
+        if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
+
+        $stmt = $this->pdo->prepare('SELECT principals.uri as uri FROM `'.$this->groupMembersTableName.'` AS groupmembers LEFT JOIN `'.$this->tableName.'` AS principals ON groupmembers.member_id = principals.id WHERE groupmembers.principal_id = ?');
+        $stmt->execute(array($principal['id']));
+
+        $result = array();
+        while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $result[] = $row['uri'];
+        }
+        return $result;
+    
+    }
+
+    /**
+     * Returns the list of groups a principal is a member of 
+     * 
+     * @param string $principal 
+     * @return array 
+     */
+    public function getGroupMembership($principal) {
+
+        $principal = $this->getPrincipalByPath($principal);
+        if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
+
+        $stmt = $this->pdo->prepare('SELECT principals.uri as uri FROM `'.$this->groupMembersTableName.'` AS groupmembers LEFT JOIN `'.$this->tableName.'` AS principals ON groupmembers.principal_id = principals.id WHERE groupmembers.member_id = ?');
+        $stmt->execute(array($principal['id']));
+
+        $result = array();
+        while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $result[] = $row['uri'];
+        }
+        return $result;
+
+    }
+
+    /**
+     * Updates the list of group members for a group principal.
+     *
+     * The principals should be passed as a list of uri's. 
+     * 
+     * @param string $principal 
+     * @param array $members 
+     * @return void
+     */
+    public function setGroupMemberSet($principal, array $members) {
+
+        // Grabbing the list of principal id's.
+        $stmt = $this->pdo->prepare('SELECT id, uri FROM `'.$this->tableName.'` WHERE uri IN (? ' . str_repeat(', ? ', count($members)) . ');');
+        $stmt->execute(array_merge(array($principal), $members));
+
+        $memberIds = array();
+        $principalId = null;
+
+        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            if ($row['uri'] == $principal) {
+                $principalId = $row['id'];
+            } else {
+                $memberIds[] = $row['id'];
+            }
+        }
+        if (!$principalId) throw new Sabre_DAV_Exception('Principal not found');
+
+        // Wiping out old members
+        $stmt = $this->pdo->prepare('DELETE FROM `'.$this->groupMembersTableName.'` WHERE principal_id = ?;');
+        $stmt->execute(array($principalId));
+
+        foreach($memberIds as $memberId) {
+
+            $stmt = $this->pdo->prepare('INSERT INTO `'.$this->groupMembersTableName.'` (principal_id, member_id) VALUES (?, ?);');
+            $stmt->execute(array($principalId, $memberId));
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/PrincipalCollection.php b/3rdparty/Sabre/DAVACL/PrincipalCollection.php
new file mode 100644
index 00000000000..4d22bf8aa75
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/PrincipalCollection.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Principals Collection
+ *
+ * This collection represents a list of users. It uses
+ * Sabre_DAV_Auth_Backend to determine which users are available on the list.
+ *
+ * The users are instances of Sabre_DAV_Auth_Principal
+ * 
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_PrincipalCollection extends Sabre_DAVACL_AbstractPrincipalCollection {
+
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     * 
+     * @param array $principal 
+     * @return Sabre_DAV_INode 
+     */
+    public function getChildForPrincipal(array $principal) {
+
+        return new Sabre_DAVACL_Principal($this->principalBackend, $principal);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Property/Acl.php b/3rdparty/Sabre/DAVACL/Property/Acl.php
new file mode 100644
index 00000000000..e41e7411310
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Property/Acl.php
@@ -0,0 +1,186 @@
+<?php
+
+/**
+ * This class represents the {DAV:}acl property 
+ * 
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Property_Acl extends Sabre_DAV_Property {
+
+    /**
+     * List of privileges 
+     * 
+     * @var array 
+     */
+    private $privileges;
+
+    /**
+     * Wether or not the server base url is required to be prefixed when 
+     * serializing the property. 
+     * 
+     * @var boolean 
+     */
+    private $prefixBaseUrl;
+
+    /**
+     * Constructor
+     *
+     * This object requires a structure similar to the return value from 
+     * Sabre_DAVACL_Plugin::getACL().
+     *
+     * Each privilege is a an array with at least a 'privilege' property, and a 
+     * 'principal' property. A privilege may have a 'protected' property as 
+     * well. 
+     *
+     * The prefixBaseUrl should be set to false, if the supplied principal urls 
+     * are already full urls. If this is kept to true, the servers base url 
+     * will automatically be prefixed. 
+     *
+     * @param bool $prefixBaseUrl 
+     * @param array $privileges 
+     */
+    public function __construct(array $privileges, $prefixBaseUrl = true) {
+
+        $this->privileges = $privileges;
+        $this->prefixBaseUrl = $prefixBaseUrl;
+
+    }
+
+    /**
+     * Returns the list of privileges for this property 
+     * 
+     * @return array 
+     */
+    public function getPrivileges() {
+
+        return $this->privileges;
+
+    }
+
+    /**
+     * Serializes the property into a DOMElement 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $node 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+        foreach($this->privileges as $ace) {
+
+            $this->serializeAce($doc, $node, $ace, $server);
+
+        }
+
+    }
+
+    /**
+     * Unserializes the {DAV:}acl xml element. 
+     * 
+     * @param DOMElement $dom 
+     * @return Sabre_DAVACL_Property_Acl 
+     */
+    static public function unserialize(DOMElement $dom) {
+
+        $privileges = array();
+        $xaces = $dom->getElementsByTagNameNS('urn:DAV','ace');
+        for($ii=0; $ii < $xaces->length; $ii++) {
+
+            $xace = $xaces->item($ii);
+            $principal = $xace->getElementsByTagNameNS('urn:DAV','principal');
+            if ($principal->length !== 1) {
+                throw new Sabre_DAV_Exception_BadRequest('Each {DAV:}ace element must have one {DAV:}principal element');
+            }
+            $principal = Sabre_DAVACL_Property_Principal::unserialize($principal->item(0));
+
+            if ($principal->getType()!==Sabre_DAVACL_Property_Principal::HREF) {
+                throw new Sabre_DAV_Exception_NotImplemented('Currently only uri based principals are support, {DAV:}all, {DAV:}unauthenticated and {DAV:}authenticated are not implemented yet');
+            }
+
+            $principal = $principal->getHref();
+            $protected = false;
+
+            if ($xace->getElementsByTagNameNS('urn:DAV','protected')->length > 0) {
+                $protected = true;
+            }
+
+            $grants = $xace->getElementsByTagNameNS('urn:DAV','grant');
+            if ($grants->length < 1) {
+                throw new Sabre_DAV_Exception_NotImplemented('Every {DAV:}ace element must have a {DAV:}grant element. {DAV:}deny is not yet supported');
+            }
+            $grant = $grants->item(0);
+
+            $xprivs = $grant->getElementsByTagNameNS('urn:DAV','privilege');
+            for($jj=0; $jj<$xprivs->length; $jj++) {
+
+                $xpriv = $xprivs->item($jj);
+
+                $privilegeName = null;
+
+                for ($kk=0;$kk<$xpriv->childNodes->length;$kk++) {
+
+                    $childNode = $xpriv->childNodes->item($kk);
+                    if ($t = Sabre_DAV_XMLUtil::toClarkNotation($childNode)) {
+                        $privilegeName = $t;
+                        break;
+                    }
+                }
+                if (is_null($privilegeName)) {
+                    throw new Sabre_DAV_Exception_BadRequest('{DAV:}privilege elements must have a privilege element contained within them.');
+                }
+
+                $privileges[] = array(
+                    'principal' => $principal,
+                    'protected' => $protected,
+                    'privilege' => $privilegeName,
+                );
+
+            } 
+
+        }
+
+        return new self($privileges);
+
+    }
+
+    /**
+     * Serializes a single access control entry. 
+     * 
+     * @param DOMDocument $doc 
+     * @param DOMElement $node 
+     * @param array $ace
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    private function serializeAce($doc,$node,$ace, $server) {
+
+        $xace  = $doc->createElementNS('DAV:','d:ace');
+        $node->appendChild($xace);
+
+        $principal = $doc->createElementNS('DAV:','d:principal');
+        $xace->appendChild($principal);
+        $principal->appendChild($doc->createElementNS('DAV:','d:href',($this->prefixBaseUrl?$server->getBaseUri():'') . $ace['principal'] . '/'));
+
+        $grant = $doc->createElementNS('DAV:','d:grant');
+        $xace->appendChild($grant);
+
+        $privParts = null;
+
+        preg_match('/^{([^}]*)}(.*)$/',$ace['privilege'],$privParts);
+
+        $xprivilege = $doc->createElementNS('DAV:','d:privilege');
+        $grant->appendChild($xprivilege);
+
+        $xprivilege->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
+
+        if (isset($ace['protected']) && $ace['protected'])
+            $xace->appendChild($doc->createElement('d:protected'));
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php b/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
new file mode 100644
index 00000000000..72274597b31
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * CurrentUserPrivilegeSet
+ * 
+ * This class represents the current-user-privilege-set property. When 
+ * requested, it contain all the privileges a user has on a specific node. 
+ * 
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Property_CurrentUserPrivilegeSet extends Sabre_DAV_Property {
+
+    /**
+     * List of privileges 
+     * 
+     * @var array 
+     */
+    private $privileges;
+
+    /**
+     * Creates the object
+     *
+     * Pass the privileges in clark-notation 
+     * 
+     * @param array $privileges 
+     */
+    public function __construct(array $privileges) {
+
+        $this->privileges = $privileges;
+
+    }
+
+    /**
+     * Serializes the property in the DOM 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $node 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+        foreach($this->privileges as $privName) {
+
+            $this->serializePriv($doc,$node,$privName);
+
+        }
+
+    }
+
+    /**
+     * Serializes one privilege 
+     * 
+     * @param DOMDocument $doc 
+     * @param DOMElement $node 
+     * @param string $privName 
+     * @return void
+     */
+    protected function serializePriv($doc,$node,$privName) {
+
+        $xp  = $doc->createElementNS('DAV:','d:privilege');
+        $node->appendChild($xp);
+
+        $privParts = null;
+        preg_match('/^{([^}]*)}(.*)$/',$privName,$privParts);
+
+        $xp->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Property/Principal.php b/3rdparty/Sabre/DAVACL/Property/Principal.php
new file mode 100644
index 00000000000..dad9a3550fb
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Property/Principal.php
@@ -0,0 +1,154 @@
+<?php
+
+/**
+ * Principal property
+ *
+ * The principal property represents a principal from RFC3744 (ACL).
+ * The property can be used to specify a principal or pseudo principals. 
+ *
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Property_Principal extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
+
+    /**
+     * To specify a not-logged-in user, use the UNAUTHENTICTED principal
+     */
+    const UNAUTHENTICATED = 1;
+
+    /**
+     * To specify any principal that is logged in, use AUTHENTICATED
+     */
+    const AUTHENTICATED = 2;
+
+    /**
+     * Specific princpals can be specified with the HREF
+     */
+    const HREF = 3;
+
+    /**
+     * Principal-type
+     *
+     * Must be one of the UNAUTHENTICATED, AUTHENTICATED or HREF constants.
+     * 
+     * @var int 
+     */
+    private $type;
+
+    /**
+     * Url to principal
+     *
+     * This value is only used for the HREF principal type.
+     * 
+     * @var string 
+     */
+    private $href;
+
+    /**
+     * Creates the property.
+     *
+     * The 'type' argument must be one of the type constants defined in this class.
+     *
+     * 'href' is only required for the HREF type.
+     * 
+     * @param int $type 
+     * @param string $href 
+     * @return void
+     */
+    public function __construct($type, $href = null) {
+
+        $this->type = $type;
+
+        if ($type===self::HREF && is_null($href)) {
+            throw new Sabre_DAV_Exception('The href argument must be specified for the HREF principal type.');
+        }
+        $this->href = $href;
+
+    }
+
+    /**
+     * Returns the principal type 
+     * 
+     * @return int 
+     */
+    public function getType() {
+
+        return $this->type;
+
+    }
+
+    /**
+     * Returns the principal uri. 
+     * 
+     * @return string
+     */
+    public function getHref() {
+
+        return $this->href;
+
+    }
+
+    /**
+     * Serializes the property into a DOMElement. 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $node 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $node) {
+
+        $prefix = $server->xmlNamespaces['DAV:'];
+        switch($this->type) {
+
+            case self::UNAUTHENTICATED :
+                $node->appendChild(
+                    $node->ownerDocument->createElement($prefix . ':unauthenticated')
+                );
+                break;
+            case self::AUTHENTICATED :
+                $node->appendChild(
+                    $node->ownerDocument->createElement($prefix . ':authenticated')
+                );
+                break;
+            case self::HREF :
+                $href = $node->ownerDocument->createElement($prefix . ':href');
+                $href->nodeValue = $server->getBaseUri() . $this->href;
+                $node->appendChild($href);
+                break;
+
+        }
+
+    }
+
+    /**
+     * Deserializes a DOM element into a property object. 
+     * 
+     * @param DOMElement $dom 
+     * @return Sabre_DAV_Property_Principal 
+     */
+    static public function unserialize(DOMElement $dom) {
+
+        $parent = $dom->firstChild;
+        while(!Sabre_DAV_XMLUtil::toClarkNotation($parent)) {
+            $parent = $parent->nextSibling;
+        }
+
+        switch(Sabre_DAV_XMLUtil::toClarkNotation($parent)) {
+
+            case '{DAV:}unauthenticated' :
+                return new self(self::UNAUTHENTICATED);
+            case '{DAV:}authenticated' :
+                return new self(self::AUTHENTICATED);
+            case '{DAV:}href':
+                return new self(self::HREF, $parent->textContent);
+            default :
+                throw new Sabre_DAV_Exception_BadRequest('Unexpected element (' . Sabre_DAV_XMLUtil::toClarkNotation($parent) . '). Could not deserialize');
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php b/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
new file mode 100644
index 00000000000..93c3895035d
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * SupportedPrivilegeSet property
+ *
+ * This property encodes the {DAV:}supported-privilege-set property, as defined 
+ * in rfc3744. Please consult the rfc for details about it's structure.
+ *
+ * This class expects a structure like the one given from 
+ * Sabre_DAVACL_Plugin::getSupportedPrivilegeSet as the argument in its 
+ * constructor.
+ *   
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Property_SupportedPrivilegeSet extends Sabre_DAV_Property {
+
+    /**
+     * privileges 
+     * 
+     * @var array 
+     */
+    private $privileges;
+
+    /**
+     * Constructor 
+     * 
+     * @param array $privileges 
+     */
+    public function __construct(array $privileges) {
+
+        $this->privileges = $privileges;
+
+    }
+
+    /**
+     * Serializes the property into a domdocument. 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $node 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+        $this->serializePriv($doc, $node, $this->privileges);
+
+    }
+
+    /**
+     * Serializes a property
+     *
+     * This is a recursive function. 
+     * 
+     * @param DOMDocument $doc 
+     * @param DOMElement $node 
+     * @param array $privilege 
+     * @return void
+     */
+    private function serializePriv($doc,$node,$privilege) {
+
+        $xsp = $doc->createElementNS('DAV:','d:supported-privilege');
+        $node->appendChild($xsp);
+
+        $xp  = $doc->createElementNS('DAV:','d:privilege');
+        $xsp->appendChild($xp);
+
+        $privParts = null;
+        preg_match('/^{([^}]*)}(.*)$/',$privilege['privilege'],$privParts);
+
+        $xp->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
+
+        if (isset($privilege['abstract']) && $privilege['abstract']) {
+            $xsp->appendChild($doc->createElementNS('DAV:','d:abstract'));
+        }
+
+        if (isset($privilege['description'])) {
+            $xsp->appendChild($doc->createElementNS('DAV:','d:description',$privilege['description']));
+        }
+
+        if (isset($privilege['aggregates'])) { 
+            foreach($privilege['aggregates'] as $subPrivilege) {
+                $this->serializePriv($doc,$xsp,$subPrivilege);
+            }
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/DAVACL/Version.php b/3rdparty/Sabre/DAVACL/Version.php
new file mode 100644
index 00000000000..124463e311e
--- /dev/null
+++ b/3rdparty/Sabre/DAVACL/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the SabreDAV version constants.
+ * 
+ * @package Sabre
+ * @subpackage DAVACL
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAVACL_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.5.2';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/HTTP/AWSAuth.php b/3rdparty/Sabre/HTTP/AWSAuth.php
new file mode 100644
index 00000000000..5e4668cd94d
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/AWSAuth.php
@@ -0,0 +1,226 @@
+<?php
+
+/**
+ * HTTP AWS Authentication handler
+ *
+ * Use this class to leverage amazon's AWS authentication header
+ * 
+ * @package Sabre
+ * @subpackage HTTP 
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_AWSAuth extends Sabre_HTTP_AbstractAuth {
+
+    /**
+     * The signature supplied by the HTTP client 
+     * 
+     * @var string 
+     */
+    private $signature = null;
+
+    /**
+     * The accesskey supplied by the HTTP client 
+     * 
+     * @var string 
+     */
+    private $accessKey = null;
+
+    /**
+     * An error code, if any
+     *
+     * This value will be filled with one of the ERR_* contants
+     * 
+     * @var int
+     */
+    public $errorCode = 0;
+
+    const ERR_NOAWSHEADER = 1;
+    const ERR_MD5CHECKSUMWRONG = 2;
+    const ERR_INVALIDDATEFORMAT = 3;
+    const ERR_REQUESTTIMESKEWED = 4;
+    const ERR_INVALIDSIGNATURE = 5;
+
+    /**
+     * Gathers all information from the headers
+     *
+     * This method needs to be called prior to anything else.
+     * 
+     * @return bool 
+     */
+    public function init() {
+
+        $authHeader = $this->httpRequest->getHeader('Authorization');
+        $authHeader = explode(' ',$authHeader);
+
+        if ($authHeader[0]!='AWS' || !isset($authHeader[1])) {
+            $this->errorCode = self::ERR_NOAWSHEADER;
+             return false;
+        }
+
+        list($this->accessKey,$this->signature) = explode(':',$authHeader[1]);
+
+        return true;
+
+    }
+
+    /**
+     * Returns the username for the request 
+     * 
+     * @return string 
+     */
+    public function getAccessKey() {
+
+        return $this->accessKey;
+
+    }
+
+    /**
+     * Validates the signature based on the secretKey
+     * 
+     * @return bool 
+     */
+    public function validate($secretKey) {
+
+        $contentMD5 = $this->httpRequest->getHeader('Content-MD5');
+
+        if ($contentMD5) {
+            // We need to validate the integrity of the request
+            $body = $this->httpRequest->getBody(true);
+            $this->httpRequest->setBody($body,true);
+           
+            if ($contentMD5!=base64_encode(md5($body,true))) {
+                // content-md5 header did not match md5 signature of body
+                $this->errorCode = self::ERR_MD5CHECKSUMWRONG;
+                return false;
+            }
+
+        }
+
+        if (!$requestDate = $this->httpRequest->getHeader('x-amz-date')) 
+            $requestDate = $this->httpRequest->getHeader('Date');
+
+        if (!$this->validateRFC2616Date($requestDate)) 
+            return false;
+
+        $amzHeaders = $this->getAmzHeaders();
+
+        $signature = base64_encode(
+            $this->hmacsha1($secretKey,
+                $this->httpRequest->getMethod() . "\n" .
+                $contentMD5 . "\n" . 
+                $this->httpRequest->getHeader('Content-type') . "\n" .
+                $requestDate . "\n" .
+                $amzHeaders . 
+                $this->httpRequest->getURI()
+            )
+        );
+
+        if ($this->signature != $signature) {
+
+            $this->errorCode = self::ERR_INVALIDSIGNATURE;
+            return false;
+
+        }
+
+        return true;
+
+    }
+
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    public function requireLogin() {
+
+        $this->httpResponse->setHeader('WWW-Authenticate','AWS');
+        $this->httpResponse->sendStatus(401);
+
+    }
+
+    /**
+     * Makes sure the supplied value is a valid RFC2616 date.
+     *
+     * If we would just use strtotime to get a valid timestamp, we have no way of checking if a 
+     * user just supplied the word 'now' for the date header.
+     *
+     * This function also makes sure the Date header is within 15 minutes of the operating 
+     * system date, to prevent replay attacks.
+     * 
+     * @param string $dateHeader 
+     * @return bool 
+     */
+    protected function validateRFC2616Date($dateHeader) {
+
+        $date = Sabre_HTTP_Util::parseHTTPDate($dateHeader);
+
+        // Unknown format
+        if (!$date) {
+            $this->errorCode = self::ERR_INVALIDDATEFORMAT;
+            return false;
+        }
+
+        $min = new DateTime('-15 minutes');
+        $max = new DateTime('+15 minutes');
+
+        // We allow 15 minutes around the current date/time
+        if ($date > $max || $date < $min) {
+            $this->errorCode = self::ERR_REQUESTTIMESKEWED;
+            return false;
+        }
+
+        return $date;
+
+    }
+    
+    /**
+     * Returns a list of AMZ headers 
+     * 
+     * @return void
+     */
+    protected function getAmzHeaders() {
+
+        $amzHeaders = array();
+        $headers = $this->httpRequest->getHeaders();
+        foreach($headers as $headerName => $headerValue) {
+            if (strpos(strtolower($headerName),'x-amz-')===0) {
+                $amzHeaders[strtolower($headerName)] = str_replace(array("\r\n"),array(' '),$headerValue) . "\n";
+            }
+        }
+        ksort($amzHeaders);
+       
+        $headerStr = '';
+        foreach($amzHeaders as $h=>$v) {
+            $headerStr.=$h.':'.$v;
+        }
+
+        return $headerStr;
+
+    }
+
+    /**
+     * Generates an HMAC-SHA1 signature 
+     * 
+     * @param string $key 
+     * @param string $message 
+     * @return string 
+     */
+    private function hmacsha1($key, $message) {
+
+        $blocksize=64;
+        if (strlen($key)>$blocksize)
+            $key=pack('H*', sha1($key));
+        $key=str_pad($key,$blocksize,chr(0x00));
+        $ipad=str_repeat(chr(0x36),$blocksize);
+        $opad=str_repeat(chr(0x5c),$blocksize);
+        $hmac = pack('H*',sha1(($key^$opad).pack('H*',sha1(($key^$ipad).$message))));
+        return $hmac;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/HTTP/AbstractAuth.php b/3rdparty/Sabre/HTTP/AbstractAuth.php
new file mode 100644
index 00000000000..eb528f6fdee
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/AbstractAuth.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * HTTP Authentication baseclass
+ *
+ * This class has the common functionality for BasicAuth and DigestAuth
+ * 
+ * @package Sabre
+ * @subpackage HTTP 
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_HTTP_AbstractAuth {
+
+    /**
+     * The realm will be displayed in the dialog boxes
+     *
+     * This identifier can be changed through setRealm()
+     * 
+     * @var string
+     */
+    protected $realm = 'SabreDAV';
+
+    /**
+     * HTTP response helper 
+     * 
+     * @var Sabre_HTTP_Response 
+     */
+    protected $httpResponse;
+
+
+    /**
+     * HTTP request helper 
+     * 
+     * @var Sabre_HTTP_Request 
+     */
+    protected $httpRequest;
+
+    /**
+     * __construct 
+     * 
+     */
+    public function __construct() {
+
+        $this->httpResponse = new Sabre_HTTP_Response();
+        $this->httpRequest = new Sabre_HTTP_Request();
+
+    }
+
+    /**
+     * Sets an alternative HTTP response object 
+     * 
+     * @param Sabre_HTTP_Response $response 
+     * @return void
+     */
+    public function setHTTPResponse(Sabre_HTTP_Response $response) {
+
+        $this->httpResponse = $response;
+
+    }
+
+    /**
+     * Sets an alternative HTTP request object 
+     * 
+     * @param Sabre_HTTP_Request $request 
+     * @return void
+     */
+    public function setHTTPRequest(Sabre_HTTP_Request $request) {
+
+        $this->httpRequest = $request;
+
+    }
+
+
+    /**
+     * Sets the realm
+     *
+     * The realm is often displayed in authentication dialog boxes
+     * Commonly an application name displayed here
+     * 
+     * @param string $realm 
+     * @return void
+     */
+    public function setRealm($realm) {
+
+        $this->realm = $realm;
+
+    }
+
+    /**
+     * Returns the realm
+     *
+     * @return string 
+     */
+    public function getRealm() {
+
+        return $this->realm;
+
+    }
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    abstract public function requireLogin(); 
+
+}
diff --git a/3rdparty/Sabre/HTTP/BasicAuth.php b/3rdparty/Sabre/HTTP/BasicAuth.php
new file mode 100644
index 00000000000..35c22d22dc3
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/BasicAuth.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * HTTP Basic Authentication handler
+ *
+ * Use this class for easy http authentication setup
+ * 
+ * @package Sabre
+ * @subpackage HTTP 
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_BasicAuth extends Sabre_HTTP_AbstractAuth {
+
+    /**
+     * Returns the supplied username and password.
+     *
+     * The returned array has two values:
+     *   * 0 - username
+     *   * 1 - password
+     *
+     * If nothing was supplied, 'false' will be returned
+     *
+     * @return mixed 
+     */
+    public function getUserPass() {
+
+        // Apache and mod_php
+        if (($user = $this->httpRequest->getRawServerValue('PHP_AUTH_USER')) && ($pass = $this->httpRequest->getRawServerValue('PHP_AUTH_PW'))) {
+
+            return array($user,$pass);
+
+        }
+
+        // Most other webservers 
+        $auth = $this->httpRequest->getHeader('Authorization');
+
+        if (!$auth) return false;
+
+        if (strpos(strtolower($auth),'basic')!==0) return false; 
+
+        return explode(':', base64_decode(substr($auth, 6)));
+
+    }
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    public function requireLogin() {
+
+        $this->httpResponse->setHeader('WWW-Authenticate','Basic realm="' . $this->realm . '"');
+        $this->httpResponse->sendStatus(401);
+
+    }
+
+}
diff --git a/3rdparty/Sabre/HTTP/DigestAuth.php b/3rdparty/Sabre/HTTP/DigestAuth.php
new file mode 100644
index 00000000000..5e755929571
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/DigestAuth.php
@@ -0,0 +1,234 @@
+<?php
+
+/**
+ * HTTP Digest Authentication handler
+ *
+ * Use this class for easy http digest authentication.
+ * Instructions:
+ *
+ *  1. Create the object
+ *  2. Call the setRealm() method with the realm you plan to use
+ *  3. Call the init method function.
+ *  4. Call the getUserName() function. This function may return false if no
+ *     authentication information was supplied. Based on the username you 
+ *     should check your internal database for either the associated password,
+ *     or the so-called A1 hash of the digest.
+ *  5. Call either validatePassword() or validateA1(). This will return true
+ *     or false. 
+ *  6. To make sure an authentication prompt is displayed, call the
+ *     requireLogin() method.
+ * 
+ * 
+ * @package Sabre
+ * @subpackage HTTP 
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_DigestAuth extends Sabre_HTTP_AbstractAuth {
+
+    /**
+     * These constants are used in setQOP();
+     */
+    const QOP_AUTH = 1;
+    const QOP_AUTHINT = 2;
+
+    protected $nonce;
+    protected $opaque;
+    protected $digestParts;
+    protected $A1;
+    protected $qop = self::QOP_AUTH;
+
+    /**
+     * Initializes the object 
+     */
+    public function __construct() {
+
+        $this->nonce = uniqid();
+        $this->opaque = md5($this->realm);
+        parent::__construct();
+
+    }
+
+    /**
+     * Gathers all information from the headers
+     *
+     * This method needs to be called prior to anything else.
+     * 
+     * @return void
+     */
+    public function init() {
+
+        $digest = $this->getDigest();
+        $this->digestParts = $this->parseDigest($digest);
+
+    }
+
+    /**
+     * Sets the quality of protection value.
+     *
+     * Possible values are:
+     *   Sabre_HTTP_DigestAuth::QOP_AUTH
+     *   Sabre_HTTP_DigestAuth::QOP_AUTHINT
+     *
+     * Multiple values can be specified using logical OR.
+     *
+     * QOP_AUTHINT ensures integrity of the request body, but this is not 
+     * supported by most HTTP clients. QOP_AUTHINT also requires the entire 
+     * request body to be md5'ed, which can put strains on CPU and memory.
+     *
+     * @param int $qop 
+     * @return void
+     */
+    public function setQOP($qop) {
+
+        $this->qop = $qop;
+
+    }
+
+    /**
+     * Validates the user.
+     *
+     * The A1 parameter should be md5($username . ':' . $realm . ':' . $password);
+     *
+     * @param string $A1 
+     * @return bool 
+     */
+    public function validateA1($A1) {
+
+        $this->A1 = $A1;
+        return $this->validate();
+
+    }
+
+    /**
+     * Validates authentication through a password. The actual password must be provided here.
+     * It is strongly recommended not store the password in plain-text and use validateA1 instead.
+     * 
+     * @param string $password 
+     * @return bool 
+     */
+    public function validatePassword($password) {
+
+        $this->A1 = md5($this->digestParts['username'] . ':' . $this->realm . ':' . $password);
+        return $this->validate();
+
+    }
+
+    /**
+     * Returns the username for the request 
+     * 
+     * @return string 
+     */
+    public function getUsername() {
+
+        return $this->digestParts['username'];
+
+    }
+
+    /**
+     * Validates the digest challenge 
+     * 
+     * @return bool 
+     */
+    protected function validate() {
+
+        $A2 = $this->httpRequest->getMethod() . ':' . $this->digestParts['uri'];
+    
+        if ($this->digestParts['qop']=='auth-int') {
+            // Making sure we support this qop value
+            if (!($this->qop & self::QOP_AUTHINT)) return false;
+            // We need to add an md5 of the entire request body to the A2 part of the hash
+            $body = $this->httpRequest->getBody(true);
+            $this->httpRequest->setBody($body,true);
+            $A2 .= ':' . md5($body);
+        } else {
+
+            // We need to make sure we support this qop value 
+            if (!($this->qop & self::QOP_AUTH)) return false; 
+        }
+
+        $A2 = md5($A2);
+
+        $validResponse = md5("{$this->A1}:{$this->digestParts['nonce']}:{$this->digestParts['nc']}:{$this->digestParts['cnonce']}:{$this->digestParts['qop']}:{$A2}"); 
+
+        return $this->digestParts['response']==$validResponse;
+        
+
+    }
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    public function requireLogin() {
+
+        $qop = '';
+        switch($this->qop) {
+            case self::QOP_AUTH    : $qop = 'auth'; break;
+            case self::QOP_AUTHINT : $qop = 'auth-int'; break;
+            case self::QOP_AUTH | self::QOP_AUTHINT : $qop = 'auth,auth-int'; break;
+        }
+
+        $this->httpResponse->setHeader('WWW-Authenticate','Digest realm="' . $this->realm . '",qop="'.$qop.'",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
+        $this->httpResponse->sendStatus(401);
+
+    }
+
+
+    /**
+     * This method returns the full digest string.
+     *
+     * It should be compatibile with mod_php format and other webservers.
+     *
+     * If the header could not be found, null will be returned
+     *
+     * @return mixed 
+     */
+    public function getDigest() {
+
+        // mod_php
+        $digest = $this->httpRequest->getRawServerValue('PHP_AUTH_DIGEST');
+        if ($digest) return $digest;
+
+        // most other servers
+        $digest = $this->httpRequest->getHeader('Authorization');
+
+        if ($digest && strpos(strtolower($digest),'digest')===0) {
+            return substr($digest,7);
+        } else {
+            return null;
+        }
+
+    }
+
+
+    /**
+     * Parses the different pieces of the digest string into an array.
+     * 
+     * This method returns false if an incomplete digest was supplied
+     *
+     * @param string $digest 
+     * @return mixed 
+     */
+    protected function parseDigest($digest) {
+
+        // protect against missing data
+        $needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
+        $data = array();
+
+        preg_match_all('@(\w+)=(?:(?:")([^"]+)"|([^\s,$]+))@', $digest, $matches, PREG_SET_ORDER);
+
+        foreach ($matches as $m) {
+            $data[$m[1]] = $m[2] ? $m[2] : $m[3];
+            unset($needed_parts[$m[1]]);
+        }
+
+        return $needed_parts ? false : $data; 
+
+    }
+
+}
diff --git a/3rdparty/Sabre/HTTP/Request.php b/3rdparty/Sabre/HTTP/Request.php
new file mode 100644
index 00000000000..95a64171aab
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/Request.php
@@ -0,0 +1,243 @@
+<?php
+
+/**
+ * HTTP Request information
+ *
+ * This object can be used to easily access information about an HTTP request.
+ * It can additionally be used to create 'mock' requests.
+ *
+ * This class mostly operates indepentend, but because of the nature of a single 
+ * request per run it can operate as a singleton. For more information check out 
+ * the behaviour around 'defaultInputStream'.
+ *
+ * @package Sabre
+ * @subpackage HTTP 
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_Request {
+
+    /**
+     * PHP's $_SERVER data
+     * 
+     * @var string 
+     */
+    protected $_SERVER;
+
+    /**
+     * The request body, if any.
+     *
+     * This is stored in the form of a stream resource.
+     *
+     * @var resource 
+     */
+    protected $body = null;
+
+    /**
+     * This will be set as the 'default' inputStream for a specific HTTP request
+     * We sometimes need to retain, or rebuild this if we need multiple runs 
+     * of parsing the original HTTP request.
+     * 
+     * @var resource 
+     */
+    static $defaultInputStream=null;
+
+    /**
+     * Sets up the object
+     *
+     * The serverData array can be used to override usage of PHP's 
+     * global _SERVER variable. 
+     * 
+     * @param array $serverData 
+     */
+    public function __construct($serverData = null) {
+
+       if ($serverData) $this->_SERVER = $serverData;
+       else $this->_SERVER =& $_SERVER;
+
+    }
+
+    /**
+     * Returns the value for a specific http header.
+     *
+     * This method returns null if the header did not exist.
+     * 
+     * @param string $name 
+     * @return string 
+     */
+    public function getHeader($name) {
+
+        $name = strtoupper(str_replace(array('-'),array('_'),$name));
+        if (isset($this->_SERVER['HTTP_' . $name])) {
+            return $this->_SERVER['HTTP_' . $name];
+        } 
+
+        // There's a few headers that seem to end up in the top-level 
+        // server array.
+        switch($name) {
+            case 'CONTENT_TYPE' :
+            case 'CONTENT_LENGTH' :
+                if (isset($this->_SERVER[$name])) {
+                    return $this->_SERVER[$name];
+                }
+                break;
+
+        }
+        return;
+
+    }
+
+    /**
+     * Returns all (known) HTTP headers.
+     *
+     * All headers are converted to lower-case, and additionally all underscores
+     * are automatically converted to dashes 
+     * 
+     * @return array 
+     */
+    public function getHeaders() {
+
+        $hdrs = array();
+        foreach($this->_SERVER as $key=>$value) {
+
+            switch($key) {
+                case 'CONTENT_LENGTH' :
+                case 'CONTENT_TYPE' :
+                    $hdrs[strtolower(str_replace('_','-',$key))] = $value;
+                    break;
+                default :
+                    if (strpos($key,'HTTP_')===0) {
+                        $hdrs[substr(strtolower(str_replace('_','-',$key)),5)] = $value;
+                    }
+                    break;
+            }
+
+        }
+
+        return $hdrs;
+
+    }
+
+    /**
+     * Returns the HTTP request method
+     *
+     * This is for example POST or GET 
+     *
+     * @return string 
+     */
+    public function getMethod() {
+
+        return $this->_SERVER['REQUEST_METHOD'];
+
+    }
+
+    /**
+     * Returns the requested uri
+     *
+     * @return string 
+     */
+    public function getUri() {
+       
+        return $this->_SERVER['REQUEST_URI'];
+
+    }
+
+    /**
+     * Will return protocol + the hostname + the uri 
+     * 
+     * @return void
+     */
+    public function getAbsoluteUri() {
+
+        // Checking if the request was made through HTTPS. The last in line is for IIS
+        $protocol = isset($this->_SERVER['HTTPS']) && ($this->_SERVER['HTTPS']) && ($this->_SERVER['HTTPS']!='off');
+        return ($protocol?'https':'http') . '://'  . $this->getHeader('Host') . $this->getUri();
+
+    }
+
+    /**
+     * Returns everything after the ? from the current url 
+     * 
+     * @return string 
+     */
+    public function getQueryString() {
+
+        return isset($this->_SERVER['QUERY_STRING'])?$this->_SERVER['QUERY_STRING']:'';
+
+    }
+
+    /**
+     * Returns the HTTP request body body 
+     *
+     * This method returns a readable stream resource.
+     * If the asString parameter is set to true, a string is sent instead. 
+     *
+     * @param bool asString
+     * @return resource 
+     */
+    public function getBody($asString = false) {
+
+        if (is_null($this->body)) {
+            if (!is_null(self::$defaultInputStream)) {
+                $this->body = self::$defaultInputStream;
+            } else {
+                $this->body = fopen('php://input','r');
+                self::$defaultInputStream = $this->body;
+            }
+        }
+        if ($asString) {
+            $body = stream_get_contents($this->body);
+            return $body;
+        } else {
+            return $this->body;
+        }
+
+    }
+
+    /**
+     * Sets the contents of the HTTP request body 
+     * 
+     * This method can either accept a string, or a readable stream resource.
+     *
+     * If the setAsDefaultInputStream is set to true, it means for this run of the 
+     * script the supplied body will be used instead of php://input.
+     *
+     * @param mixed $body 
+     * @param bool $setAsDefaultInputStream
+     * @return void
+     */
+    public function setBody($body,$setAsDefaultInputStream = false) {
+
+        if(is_resource($body)) {
+            $this->body = $body;
+        } else {
+
+            $stream = fopen('php://temp','r+');
+            fputs($stream,$body);
+            rewind($stream);
+            // String is assumed
+            $this->body = $stream;
+        }
+        if ($setAsDefaultInputStream) {
+            self::$defaultInputStream = $this->body;
+        }
+
+    }
+
+    /**
+     * Returns a specific item from the _SERVER array. 
+     *
+     * Do not rely on this feature, it is for internal use only.
+     *
+     * @param string $field 
+     * @return string 
+     */
+    public function getRawServerValue($field) {
+
+        return isset($this->_SERVER[$field])?$this->_SERVER[$field]:null;
+
+    }
+
+}
+
diff --git a/3rdparty/Sabre/HTTP/Response.php b/3rdparty/Sabre/HTTP/Response.php
new file mode 100644
index 00000000000..dce6feac553
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/Response.php
@@ -0,0 +1,152 @@
+<?php
+
+/**
+ * Sabre_HTTP_Response 
+ * 
+ * @package Sabre
+ * @subpackage HTTP 
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_Response {
+
+    /**
+     * Returns a full HTTP status message for an HTTP status code 
+     * 
+     * @param int $code 
+     * @return string
+     */
+    public function getStatusMessage($code) {
+
+        $msg = array(
+            100 => 'Continue',
+            101 => 'Switching Protocols',
+            102 => 'Processing',
+            200 => 'OK',
+            201 => 'Created',
+            202 => 'Accepted',
+            203 => 'Non-Authorative Information',
+            204 => 'No Content',
+            205 => 'Reset Content',
+            206 => 'Partial Content',
+            207 => 'Multi-Status', // RFC 4918
+            208 => 'Already Reported', // RFC 5842
+            226 => 'IM Used', // RFC 3229
+            300 => 'Multiple Choices',
+            301 => 'Moved Permanently',
+            302 => 'Found',
+            303 => 'See Other',
+            304 => 'Not Modified',
+            305 => 'Use Proxy',
+            306 => 'Reserved',
+            307 => 'Temporary Redirect',
+            400 => 'Bad request',
+            401 => 'Unauthorized',
+            402 => 'Payment Required',
+            403 => 'Forbidden',
+            404 => 'Not Found',
+            405 => 'Method Not Allowed',
+            406 => 'Not Acceptable',
+            407 => 'Proxy Authentication Required',
+            408 => 'Request Timeout',
+            409 => 'Conflict',
+            410 => 'Gone',
+            411 => 'Length Required',
+            412 => 'Precondition failed',
+            413 => 'Request Entity Too Large',
+            414 => 'Request-URI Too Long',
+            415 => 'Unsupported Media Type',
+            416 => 'Requested Range Not Satisfiable',
+            417 => 'Expectation Failed',
+            418 => 'I\'m a teapot', // RFC 2324
+            422 => 'Unprocessable Entity', // RFC 4918
+            423 => 'Locked', // RFC 4918
+            424 => 'Failed Dependency', // RFC 4918
+            426 => 'Upgrade required',
+            500 => 'Internal Server Error',
+            501 => 'Not Implemented',
+            502 => 'Bad Gateway',
+            503 => 'Service Unavailable',
+            504 => 'Gateway Timeout',
+            505 => 'HTTP Version not supported',
+            506 => 'Variant Also Negotiates',
+            507 => 'Unsufficient Storage', // RFC 4918
+            508 => 'Loop Detected', // RFC 5842
+            509 => 'Bandwidth Limit Exceeded', // non-standard
+            510 => 'Not extended',
+       ); 
+
+       return 'HTTP/1.1 ' . $code . ' ' . $msg[$code];
+
+    }
+
+    /**
+     * Sends an HTTP status header to the client 
+     * 
+     * @param int $code HTTP status code 
+     * @return void
+     */
+    public function sendStatus($code) {
+
+        if (!headers_sent()) 
+            return header($this->getStatusMessage($code));
+        else return false;
+
+    }
+
+    /**
+     * Sets an HTTP header for the response
+     * 
+     * @param string $name 
+     * @param string $value 
+     * @return void
+     */
+    public function setHeader($name, $value, $replace = true) {
+
+        $value = str_replace(array("\r","\n"),array('\r','\n'),$value);
+        if (!headers_sent()) 
+            return header($name . ': ' . $value, $replace);
+        else return false;
+
+    }
+
+    /**
+     * Sets a bunch of HTTP Headers
+     *
+     * headersnames are specified as keys, value in the array value
+     * 
+     * @param array $headers 
+     * @return void
+     */
+    public function setHeaders(array $headers) {
+
+        foreach($headers as $key=>$value)
+            $this->setHeader($key, $value);
+
+    }
+
+    /**
+     * Sends the entire response body
+     *
+     * This method can accept either an open filestream, or a string.
+     * 
+     * @param mixed $body 
+     * @return void
+     */
+    public function sendBody($body) {
+
+        if (is_resource($body)) {
+        
+            fpassthru($body);
+
+        } else {
+
+            // We assume a string
+            echo $body;
+
+        }
+
+    }
+
+}
diff --git a/3rdparty/Sabre/HTTP/Util.php b/3rdparty/Sabre/HTTP/Util.php
new file mode 100644
index 00000000000..8a6bd7df487
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/Util.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * HTTP utility methods 
+ * 
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @author Paul Voegler
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_Util {
+
+    /**
+     * Parses a RFC2616-compatible date string
+     *
+     * This method returns false if the date is invalid
+     * 
+     * @param string $dateHeader 
+     * @return bool|DateTime 
+     */
+    static function parseHTTPDate($dateHeader) {
+
+        //RFC 2616 section 3.3.1 Full Date
+        //Only the format is checked, valid ranges are checked by strtotime below
+        $month = '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)';
+        $weekday = '(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)';
+        $wkday = '(Mon|Tue|Wed|Thu|Fri|Sat|Sun)';
+        $time = '[0-2]\d(\:[0-5]\d){2}';
+        $date3 = $month . ' ([1-3]\d| \d)';
+        $date2 = '[0-3]\d\-' . $month . '\-\d\d';
+        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
+        $date1 = '[0-3]\d ' . $month . ' [1-9]\d{3}';
+
+        //ANSI C's asctime() format
+        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
+        $asctime_date = $wkday . ' ' . $date3 . ' ' . $time . ' [1-9]\d{3}';
+        //RFC 850, obsoleted by RFC 1036
+        $rfc850_date = $weekday . ', ' . $date2 . ' ' . $time . ' GMT';
+        //RFC 822, updated by RFC 1123
+        $rfc1123_date = $wkday . ', ' . $date1 . ' ' . $time . ' GMT';
+        //allowed date formats by RFC 2616
+        $HTTP_date = "($rfc1123_date|$rfc850_date|$asctime_date)";
+        
+        //allow for space around the string and strip it
+        $dateHeader = trim($dateHeader, ' ');
+        if (!preg_match('/^' . $HTTP_date . '$/', $dateHeader))
+            return false;
+
+        //append implicit GMT timezone to ANSI C time format
+        if (strpos($dateHeader, ' GMT') === false)
+            $dateHeader .= ' GMT';
+
+
+        $realDate = strtotime($dateHeader);
+        //strtotime can return -1 or false in case of error
+        if ($realDate !== false && $realDate >= 0)
+            return new DateTime('@' . $realDate, new DateTimeZone('UTC'));
+
+        return false;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/HTTP/Version.php b/3rdparty/Sabre/HTTP/Version.php
new file mode 100644
index 00000000000..67be232fc26
--- /dev/null
+++ b/3rdparty/Sabre/HTTP/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the Sabre_HTTP version constants.
+ * 
+ * @package Sabre
+ * @subpackage HTTP 
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.5.3';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/LICENCE b/3rdparty/Sabre/LICENCE
new file mode 100644
index 00000000000..3d07eaace83
--- /dev/null
+++ b/3rdparty/Sabre/LICENCE
@@ -0,0 +1,27 @@
+Copyright (C) 2007-2011 Rooftop Solutions.
+Copyright (C) 2007-2009 FileMobile inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of the SabreDAV nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE. 
diff --git a/3rdparty/Sabre/VObject/Component.php b/3rdparty/Sabre/VObject/Component.php
new file mode 100644
index 00000000000..47cf9f3d812
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Component.php
@@ -0,0 +1,254 @@
+<?php
+
+/**
+ * VObject Component
+ *
+ * This class represents a VCALENDAR/VCARD component. A component is for example
+ * VEVENT, VTODO and also VCALENDAR. It starts with BEGIN:COMPONENTNAME and 
+ * ends with END:COMPONENTNAME
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Component extends Sabre_VObject_Element {
+
+    /**
+     * Name, for example VEVENT 
+     * 
+     * @var string 
+     */
+    public $name;
+
+    /**
+     * Children properties and components 
+     * 
+     * @var array
+     */
+    public $children = array();
+
+
+    /**
+     * Creates a new component.
+     *
+     * By default this object will iterate over its own children, but this can 
+     * be overridden with the iterator argument
+     * 
+     * @param string $name 
+     * @param Sabre_VObject_ElementList $iterator
+     */
+    public function __construct($name, Sabre_VObject_ElementList $iterator = null) {
+
+        $this->name = strtoupper($name);
+        if (!is_null($iterator)) $this->iterator = $iterator;
+
+    }
+
+    /**
+     * Turns the object back into a serialized blob. 
+     * 
+     * @return string 
+     */
+    public function serialize() {
+
+        $str = "BEGIN:" . $this->name . "\r\n";
+        foreach($this->children as $child) $str.=$child->serialize();
+        $str.= "END:" . $this->name . "\r\n";
+        
+        return $str;
+
+    }
+
+
+    /**
+     * Adds a new componenten or element
+     *
+     * You can call this method with the following syntaxes:
+     *
+     * add(Sabre_VObject_Element $element)
+     * add(string $name, $value)
+     *
+     * The first version adds an Element
+     * The second adds a property as a string. 
+     * 
+     * @param mixed $item 
+     * @param mixed $itemValue 
+     * @return void
+     */
+    public function add($item, $itemValue = null) {
+
+        if ($item instanceof Sabre_VObject_Element) {
+            if (!is_null($itemValue)) {
+                throw new InvalidArgumentException('The second argument must not be specified, when passing a VObject');
+            }
+            $item->parent = $this;
+            $this->children[] = $item;
+        } elseif(is_string($item)) {
+
+            if (!is_scalar($itemValue)) {
+                throw new InvalidArgumentException('The second argument must be scalar');
+            }
+            $item = new Sabre_VObject_Property($item,$itemValue);
+            $item->parent = $this;
+            $this->children[] = $item;
+
+        } else {
+            
+            throw new InvalidArgumentException('The first argument must either be a Sabre_VObject_Element or a string');
+
+        }
+
+    }
+
+    /**
+     * Returns an iterable list of children 
+     * 
+     * @return Sabre_VObject_ElementList 
+     */
+    public function children() {
+
+        return new Sabre_VObject_ElementList($this->children);
+
+    }
+
+    /**
+     * Returns an array with elements that match the specified name.
+     *
+     * This function is also aware of MIME-Directory groups (as they appear in 
+     * vcards). This means that if a property is grouped as "HOME.EMAIL", it 
+     * will also be returned when searching for just "EMAIL". If you want to 
+     * search for a property in a specific group, you can select on the entire 
+     * string ("HOME.EMAIL"). If you want to search on a specific property that 
+     * has not been assigned a group, specify ".EMAIL".
+     *
+     * Keys are retained from the 'children' array, which may be confusing in 
+     * certain cases. 
+     *
+     * @param string $name 
+     * @return array 
+     */
+    public function select($name) {
+
+        $group = null;
+        $name = strtoupper($name);
+        if (strpos($name,'.')!==false) {
+            list($group,$name) = explode('.', $name, 2);
+        }
+
+        $result = array();
+        foreach($this->children as $key=>$child) {
+
+            if (
+                strtoupper($child->name) === $name &&
+                (is_null($group) || ( $child instanceof Sabre_VObject_Property && strtoupper($child->group) === $group))
+            ) {
+                
+                $result[$key] = $child;
+
+            }
+        }
+
+        reset($result);
+        return $result;
+
+    }
+
+    /* Magic property accessors {{{ */
+
+    /**
+     * Using 'get' you will either get a propery or component, 
+     *
+     * If there were no child-elements found with the specified name,
+     * null is returned.
+     * 
+     * @param string $name 
+     * @return void
+     */
+    public function __get($name) {
+
+        $matches = $this->select($name);
+        if (count($matches)===0) {
+            return null;
+        } else {
+            $firstMatch = current($matches);
+            $firstMatch->setIterator(new Sabre_VObject_ElementList(array_values($matches)));
+            return $firstMatch;
+        }
+
+    }
+
+    /**
+     * This method checks if a sub-element with the specified name exists. 
+     * 
+     * @param string $name 
+     * @return bool 
+     */
+    public function __isset($name) {
+
+        $matches = $this->select($name);
+        return count($matches)>0;
+
+    }
+
+    /**
+     * Using the setter method you can add properties or subcomponents
+     *
+     * You can either pass a Sabre_VObject_Component, Sabre_VObject_Property
+     * object, or a string to automatically create a Property.
+     *
+     * If the item already exists, it will be removed. If you want to add
+     * a new item with the same name, always use the add() method.
+     * 
+     * @param string $name
+     * @param mixed $value
+     * @return void
+     */
+    public function __set($name, $value) {
+
+        $matches = $this->select($name);
+        $overWrite = count($matches)?key($matches):null;
+
+        if ($value instanceof Sabre_VObject_Component || $value instanceof Sabre_VObject_Property) {
+            $value->parent = $this;
+            if (!is_null($overWrite)) {
+                $this->children[$overWrite] = $value;
+            } else {
+                $this->children[] = $value;
+            }
+        } elseif (is_scalar($value)) {
+            $property = new Sabre_VObject_Property($name,$value);
+            $property->parent = $this;
+            if (!is_null($overWrite)) {
+                $this->children[$overWrite] = $property;
+            } else {
+                $this->children[] = $property;
+            }
+        } else {
+            throw new InvalidArgumentException('You must pass a Sabre_VObject_Component, Sabre_VObject_Property or scalar type');
+        }
+
+    }
+
+    /**
+     * Removes all properties and components within this component. 
+     * 
+     * @param string $name 
+     * @return void
+     */
+    public function __unset($name) {
+
+        $matches = $this->select($name);
+        foreach($matches as $k=>$child) {
+
+            unset($this->children[$k]);
+            $child->parent = null;
+
+        }
+
+    }
+
+    /* }}} */
+
+}
diff --git a/3rdparty/Sabre/VObject/Element.php b/3rdparty/Sabre/VObject/Element.php
new file mode 100644
index 00000000000..8d2b0aaacd1
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Element.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * Base class for all elements
+ * 
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_VObject_Element extends Sabre_VObject_Node {
+
+
+}
diff --git a/3rdparty/Sabre/VObject/Element/DateTime.php b/3rdparty/Sabre/VObject/Element/DateTime.php
new file mode 100644
index 00000000000..3350ec02c88
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Element/DateTime.php
@@ -0,0 +1,245 @@
+<?php
+
+/**
+ * DateTime property 
+ *
+ * This element is used for iCalendar properties such as the DTSTART property. 
+ * It basically provides a few helper functions that make it easier to deal 
+ * with these. It supports both DATE-TIME and DATE values.
+ *
+ * In order to use this correctly, you must call setDateTime and getDateTime to 
+ * retrieve and modify dates respectively.
+ *
+ * If you use the 'value' or properties directly, this object does not keep 
+ * reference and results might appear incorrectly.
+ * 
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Element_DateTime extends Sabre_VObject_Property {
+
+    /**
+     * Local 'floating' time
+     */
+    const LOCAL = 1;
+
+    /**
+     * UTC-based time
+     */
+    const UTC = 2;
+
+    /**
+     * Local time plus timezone
+     */
+    const LOCALTZ = 3;
+
+    /**
+     * Only a date, time is ignored
+     */
+    const DATE = 4;
+
+    /**
+     * DateTime representation
+     *
+     * @var DateTime
+     */
+    protected $dateTime;
+
+    /**
+     * dateType 
+     * 
+     * @var int 
+     */
+    protected $dateType;
+
+    /**
+     * Updates the Date and Time. 
+     * 
+     * @param DateTime $dt 
+     * @param int $dateType 
+     * @return void
+     */
+    public function setDateTime(DateTime $dt, $dateType = self::LOCALTZ) {
+
+        switch($dateType) {
+
+            case self::LOCAL :
+                $this->setValue($dt->format('Ymd\\THis'));
+                $this->offsetUnset('VALUE');
+                $this->offsetUnset('TZID');
+                $this->offsetSet('VALUE','DATE-TIME'); 
+                break;
+            case self::UTC :
+                $dt->setTimeZone(new DateTimeZone('UTC'));
+                $this->setValue($dt->format('Ymd\\THis\\Z'));
+                $this->offsetUnset('VALUE');
+                $this->offsetUnset('TZID');
+                $this->offsetSet('VALUE','DATE-TIME');
+                break;
+            case self::LOCALTZ :
+                $this->setValue($dt->format('Ymd\\THis'));
+                $this->offsetUnset('VALUE');
+                $this->offsetUnset('TZID');
+                $this->offsetSet('VALUE','DATE-TIME');
+                $this->offsetSet('TZID', $dt->getTimeZone()->getName());
+                break; 
+            case self::DATE :
+                $this->setValue($dt->format('Ymd'));
+                $this->offsetUnset('VALUE');
+                $this->offsetUnset('TZID');
+                $this->offsetSet('VALUE','DATE');
+                break;
+            default :
+                throw new InvalidArgumentException('You must pass a valid dateType constant');
+
+        }
+        $this->dateTime = $dt;
+        $this->dateType = $dateType;
+
+    }
+
+    /**
+     * Returns the current DateTime value.
+     *
+     * If no value was set, this method returns null.
+     *
+     * @return DateTime|null 
+     */
+    public function getDateTime() {
+
+        if ($this->dateTime)
+            return $this->dateTime;
+
+        list(
+            $this->dateType,
+            $this->dateTime
+        ) = self::parseData($this->value, $this);
+        return $this->dateTime;
+
+    }
+
+    /**
+     * Returns the type of Date format.
+     *
+     * This method returns one of the format constants. If no date was set, 
+     * this method will return null.
+     *
+     * @return int|null
+     */
+    public function getDateType() {
+
+        if ($this->dateType)
+            return $this->dateType;
+
+        list(
+            $this->dateType,
+            $this->dateTime,
+        ) = self::parseData($this->value, $this);
+        return $this->dateType;
+
+    }
+
+    /**
+     * Parses the internal data structure to figure out what the current date 
+     * and time is.
+     *
+     * The returned array contains two elements:
+     *   1. A 'DateType' constant (as defined on this class), or null. 
+     *   2. A DateTime object (or null)
+     *
+     * @param string|null $propertyValue The string to parse (yymmdd or 
+     *                                   ymmddThhmmss, etc..)
+     * @param Sabre_VObject_Property|null $property The instance of the 
+     *                                              property we're parsing. 
+     * @return array 
+     */
+    static public function parseData($propertyValue, Sabre_VObject_Property $property = null) {
+
+        if (is_null($propertyValue)) {
+            return array(null, null);
+        }
+
+        $date = '(?P<year>[1-2][0-9]{3})(?P<month>[0-1][0-9])(?P<date>[0-3][0-9])';
+        $time = '(?P<hour>[0-2][0-9])(?P<minute>[0-5][0-9])(?P<second>[0-5][0-9])';
+        $regex = "/^$date(T$time(?P<isutc>Z)?)?$/";
+
+        if (!preg_match($regex, $propertyValue, $matches)) {
+            throw new InvalidArgumentException($propertyValue . ' is not a valid DateTime or Date string');
+        }
+
+        if (!isset($matches['hour'])) {
+            // Date-only
+            return array(
+                self::DATE,
+                new DateTime($matches['year'] . '-' . $matches['month'] . '-' . $matches['date'] . ' 00:00:00'),
+            );
+        }
+
+        $dateStr = 
+            $matches['year'] .'-' . 
+            $matches['month'] . '-' . 
+            $matches['date'] . ' ' .
+            $matches['hour'] . ':' .
+            $matches['minute'] . ':' .
+            $matches['second']; 
+
+        if (isset($matches['isutc'])) {
+            $dt = new DateTime($dateStr,new DateTimeZone('UTC'));
+            $dt->setTimeZone(new DateTimeZone('UTC'));
+            return array(
+                self::UTC,
+                $dt
+            );
+        }
+
+        // Finding the timezone.
+        $tzid = $property['TZID'];
+        if (!$tzid) {
+            return array(
+                self::LOCAL,
+                new DateTime($dateStr)
+            );
+        }
+
+        try {
+            $tz = new DateTimeZone($tzid->value);
+        } catch (Exception $e) {
+
+            // The id was invalid, we're going to try to find the information 
+            // through the VTIMEZONE object.
+
+            // First we find the root object
+            $root = $property;
+            while($root->parent) {
+                $root = $root->parent;
+            }
+
+            if (isset($root->VTIMEZONE)) {
+                foreach($root->VTIMEZONE as $vtimezone) {
+                    if (((string)$vtimezone->TZID) == $tzid) {
+                        if (isset($vtimezone->{'X-LIC-LOCATION'})) {
+                            $tzid = (string)$vtimezone->{'X-LIC-LOCATION'};
+                        }
+                    }
+                }
+            }
+
+            $tz = new DateTimeZone($tzid);
+            
+        }
+        $dt = new DateTime($dateStr, $tz);
+        $dt->setTimeZone($tz);
+
+        return array(
+            self::LOCALTZ,
+            $dt
+        );
+
+    }
+
+}
+
+?>
diff --git a/3rdparty/Sabre/VObject/Element/MultiDateTime.php b/3rdparty/Sabre/VObject/Element/MultiDateTime.php
new file mode 100644
index 00000000000..dc6ca5abb80
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Element/MultiDateTime.php
@@ -0,0 +1,168 @@
+<?php
+
+/**
+ * Multi-DateTime property 
+ *
+ * This element is used for iCalendar properties such as the EXDATE property. 
+ * It basically provides a few helper functions that make it easier to deal 
+ * with these. It supports both DATE-TIME and DATE values.
+ *
+ * In order to use this correctly, you must call setDateTimes and getDateTimes 
+ * to retrieve and modify dates respectively.
+ *
+ * If you use the 'value' or properties directly, this object does not keep 
+ * reference and results might appear incorrectly.
+ * 
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Element_MultiDateTime extends Sabre_VObject_Property {
+
+    /**
+     * DateTime representation
+     *
+     * @var DateTime[]
+     */
+    protected $dateTimes;
+
+    /**
+     * dateType
+     *
+     * This is one of the Sabre_VObject_Element_DateTime constants.
+     *
+     * @var int 
+     */
+    protected $dateType;
+
+    /**
+     * Updates the value 
+     * 
+     * @param array $dt Must be an array of DateTime objects. 
+     * @param int $dateType 
+     * @return void
+     */
+    public function setDateTimes(array $dt, $dateType = Sabre_VObject_Element_DateTime::LOCALTZ) {
+
+        foreach($dt as $i) 
+            if (!$i instanceof DateTime) 
+                throw new InvalidArgumentException('You must pass an array of DateTime objects');
+
+        $this->offsetUnset('VALUE');
+        $this->offsetUnset('TZID');
+        switch($dateType) {
+
+            case Sabre_VObject_Element_DateTime::LOCAL :
+                $val = array();
+                foreach($dt as $i) {
+                    $val[] = $i->format('Ymd\\THis');
+                }
+                $this->setValue(implode(',',$val));
+                $this->offsetSet('VALUE','DATE-TIME'); 
+                break;
+            case Sabre_VObject_Element_DateTime::UTC :
+                $val = array();
+                foreach($dt as $i) {
+                    $i->setTimeZone(new DateTimeZone('UTC'));
+                    $val[] = $i->format('Ymd\\THis\\Z');
+                }
+                $this->setValue(implode(',',$val));
+                $this->offsetSet('VALUE','DATE-TIME');
+                break;
+            case Sabre_VObject_Element_DateTime::LOCALTZ :
+                $val = array();
+                foreach($dt as $i) {
+                    $val[] = $i->format('Ymd\\THis');
+                }
+                $this->setValue(implode(',',$val));
+                $this->offsetSet('VALUE','DATE-TIME');
+                $this->offsetSet('TZID', $dt[0]->getTimeZone()->getName());
+                break; 
+            case Sabre_VObject_Element_DateTime::DATE :
+                $val = array();
+                foreach($dt as $i) {
+                    $val[] = $i->format('Ymd');
+                }
+                $this->setValue(implode(',',$val));
+                $this->offsetSet('VALUE','DATE');
+                break;
+            default :
+                throw new InvalidArgumentException('You must pass a valid dateType constant');
+
+        }
+        $this->dateTimes = $dt;
+        $this->dateType = $dateType;
+
+    }
+
+    /**
+     * Returns the current DateTime value.
+     *
+     * If no value was set, this method returns null.
+     *
+     * @return array|null 
+     */
+    public function getDateTimes() {
+
+        if ($this->dateTimes)
+            return $this->dateTimes;
+
+        $dts = array();
+    
+        if (!$this->value) {
+            $this->dateTimes = null;
+            $this->dateType = null;
+            return null;
+        }
+
+        foreach(explode(',',$this->value) as $val) {
+            list(
+                $type,
+                $dt
+            ) = Sabre_VObject_Element_DateTime::parseData($val, $this);
+            $dts[] = $dt;
+            $this->dateType = $type;
+        }
+        $this->dateTimes = $dts;
+        return $this->dateTimes;
+
+    }
+
+    /**
+     * Returns the type of Date format.
+     *
+     * This method returns one of the format constants. If no date was set, 
+     * this method will return null.
+     *
+     * @return int|null
+     */
+    public function getDateType() {
+
+        if ($this->dateType)
+            return $this->dateType;
+    
+        if (!$this->value) {
+            $this->dateTimes = null;
+            $this->dateType = null;
+            return null;
+        }
+
+        $dts = array();
+        foreach(explode(',',$this->value) as $val) {
+            list(
+                $type,
+                $dt
+            ) = Sabre_VObject_Element_DateTime::parseData($val, $this);
+            $dts[] = $dt;
+            $this->dateType = $type; 
+        }
+        $this->dateTimes = $dts;
+        return $this->dateType;
+
+    }
+
+}
+
+?>
diff --git a/3rdparty/Sabre/VObject/ElementList.php b/3rdparty/Sabre/VObject/ElementList.php
new file mode 100644
index 00000000000..9922cd587bc
--- /dev/null
+++ b/3rdparty/Sabre/VObject/ElementList.php
@@ -0,0 +1,172 @@
+<?php
+
+/**
+ * VObject ElementList
+ *
+ * This class represents a list of elements. Lists are the result of queries,
+ * such as doing $vcalendar->vevent where there's multiple VEVENT objects.
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_ElementList implements Iterator, Countable, ArrayAccess {
+
+    /**
+     * Inner elements 
+     * 
+     * @var array
+     */
+    protected $elements = array();
+
+    /**
+     * Creates the element list.
+     *
+     * @param array $elements 
+     */
+    public function __construct(array $elements) {
+
+        $this->elements = $elements;
+
+    } 
+
+    /* {{{ Iterator interface */
+
+    /**
+     * Current position  
+     * 
+     * @var int 
+     */
+    private $key = 0;
+
+    /**
+     * Returns current item in iteration 
+     * 
+     * @return Sabre_VObject_Element 
+     */
+    public function current() {
+
+        return $this->elements[$this->key];
+
+    }
+   
+    /**
+     * To the next item in the iterator 
+     * 
+     * @return void
+     */
+    public function next() {
+
+        $this->key++;
+
+    }
+
+    /**
+     * Returns the current iterator key 
+     * 
+     * @return int
+     */
+    public function key() {
+
+        return $this->key;
+
+    }
+
+    /**
+     * Returns true if the current position in the iterator is a valid one 
+     * 
+     * @return bool 
+     */
+    public function valid() {
+
+        return isset($this->elements[$this->key]);
+
+    }
+
+    /**
+     * Rewinds the iterator 
+     * 
+     * @return void 
+     */
+    public function rewind() {
+
+        $this->key = 0;
+
+    }
+
+    /* }}} */
+
+    /* {{{ Countable interface */
+
+    /**
+     * Returns the number of elements 
+     * 
+     * @return int 
+     */
+    public function count() {
+
+        return count($this->elements);
+
+    }
+
+    /* }}} */
+
+    /* {{{ ArrayAccess Interface */
+
+    
+    /**
+     * Checks if an item exists through ArrayAccess.
+     *
+     * @param int $offset 
+     * @return bool 
+     */
+    public function offsetExists($offset) {
+
+        return isset($this->elements[$offset]);
+
+    }
+
+    /**
+     * Gets an item through ArrayAccess.
+     *
+     * @param int $offset 
+     * @return mixed 
+     */
+    public function offsetGet($offset) {
+
+        return $this->elements[$offset];
+
+    }
+
+    /**
+     * Sets an item through ArrayAccess.
+     *
+     * @param int $offset 
+     * @param mixed $value 
+     * @return void
+     */
+    public function offsetSet($offset,$value) {
+
+        throw new LogicException('You can not add new objects to an ElementList');
+
+    }
+
+    /**
+     * Sets an item through ArrayAccess.
+     *
+     * This method just forwards the request to the inner iterator
+     *
+     * @param int $offset 
+     * @return void
+     */
+    public function offsetUnset($offset) {
+
+        throw new LogicException('You can not remove objects from an ElementList');
+
+    }
+
+    /* }}} */
+
+}
diff --git a/3rdparty/Sabre/VObject/Node.php b/3rdparty/Sabre/VObject/Node.php
new file mode 100644
index 00000000000..7100b62f1cb
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Node.php
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * Base class for all nodes 
+ * 
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_VObject_Node implements IteratorAggregate, ArrayAccess, Countable {
+
+    /**
+     * Turns the object back into a serialized blob. 
+     * 
+     * @return string 
+     */
+    abstract function serialize();
+
+    /**
+     * Iterator override 
+     * 
+     * @var Sabre_VObject_ElementList 
+     */
+    protected $iterator = null;
+
+    /**
+     * A link to the parent node
+     * 
+     * @var Sabre_VObject_Node 
+     */
+    protected $parent = null;
+
+    /* {{{ IteratorAggregator interface */
+
+    /**
+     * Returns the iterator for this object 
+     * 
+     * @return Sabre_VObject_ElementList 
+     */
+    public function getIterator() {
+
+        if (!is_null($this->iterator)) 
+            return $this->iterator;
+
+        return new Sabre_VObject_ElementList(array($this));
+
+    }
+
+    /**
+     * Sets the overridden iterator
+     *
+     * Note that this is not actually part of the iterator interface
+     * 
+     * @param Sabre_VObject_ElementList $iterator 
+     * @return void
+     */
+    public function setIterator(Sabre_VObject_ElementList $iterator) {
+
+        $this->iterator = $iterator;
+
+    }
+
+    /* }}} */
+
+    /* {{{ Countable interface */
+
+    /**
+     * Returns the number of elements 
+     * 
+     * @return int 
+     */
+    public function count() {
+
+        $it = $this->getIterator();
+        return $it->count();
+
+    }
+
+    /* }}} */
+
+    /* {{{ ArrayAccess Interface */
+
+    
+    /**
+     * Checks if an item exists through ArrayAccess.
+     *
+     * This method just forwards the request to the inner iterator
+     * 
+     * @param int $offset 
+     * @return bool 
+     */
+    public function offsetExists($offset) {
+
+        $iterator = $this->getIterator();
+        return $iterator->offsetExists($offset);
+
+    }
+
+    /**
+     * Gets an item through ArrayAccess.
+     *
+     * This method just forwards the request to the inner iterator
+     *
+     * @param int $offset 
+     * @return mixed 
+     */
+    public function offsetGet($offset) {
+
+        $iterator = $this->getIterator();
+        return $iterator->offsetGet($offset);
+
+    }
+
+    /**
+     * Sets an item through ArrayAccess.
+     *
+     * This method just forwards the request to the inner iterator
+     *
+     * @param int $offset 
+     * @param mixed $value 
+     * @return void
+     */
+    public function offsetSet($offset,$value) {
+
+        $iterator = $this->getIterator();
+        return $iterator->offsetSet($offset,$value);
+
+    }
+
+    /**
+     * Sets an item through ArrayAccess.
+     *
+     * This method just forwards the request to the inner iterator
+     *
+     * @param int $offset 
+     * @return void
+     */
+    public function offsetUnset($offset) {
+
+        $iterator = $this->getIterator();
+        return $iterator->offsetUnset($offset);
+
+    }
+
+    /* }}} */
+
+}
diff --git a/3rdparty/Sabre/VObject/Parameter.php b/3rdparty/Sabre/VObject/Parameter.php
new file mode 100644
index 00000000000..9ebab6ec69b
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Parameter.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * VObject Parameter
+ *
+ * This class represents a parameter. A parameter is always tied to a property.
+ * In the case of:
+ *   DTSTART;VALUE=DATE:20101108 
+ * VALUE=DATE would be the parameter name and value.
+ * 
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Parameter extends Sabre_VObject_Node {
+
+    /**
+     * Parameter name 
+     * 
+     * @var string 
+     */
+    public $name;
+
+    /**
+     * Parameter value 
+     * 
+     * @var string 
+     */
+    public $value;
+
+    /**
+     * Sets up the object 
+     * 
+     * @param string $name 
+     * @param string $value 
+     */
+    public function __construct($name, $value = null) {
+
+        $this->name = strtoupper($name);
+        $this->value = $value;
+
+    } 
+
+    /**
+     * Turns the object back into a serialized blob. 
+     * 
+     * @return string 
+     */
+    public function serialize() {
+
+        $src = array(
+            '\\',
+            "\n",
+            ';',
+            ',',
+        );
+        $out = array(
+            '\\\\',
+            '\n',
+            '\;',
+            '\,',
+        );
+
+        return $this->name . '=' . str_replace($src, $out, $this->value);
+
+    }
+
+    /**
+     * Called when this object is being cast to a string 
+     * 
+     * @return string 
+     */
+    public function __toString() {
+
+        return $this->value;
+
+    }
+
+}
diff --git a/3rdparty/Sabre/VObject/ParseException.php b/3rdparty/Sabre/VObject/ParseException.php
new file mode 100644
index 00000000000..ed4ef2e8592
--- /dev/null
+++ b/3rdparty/Sabre/VObject/ParseException.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * Exception thrown by Sabre_VObject_Reader if an invalid object was attempted to be parsed.
+ * 
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_ParseException extends Exception { }
diff --git a/3rdparty/Sabre/VObject/Property.php b/3rdparty/Sabre/VObject/Property.php
new file mode 100644
index 00000000000..06058229043
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Property.php
@@ -0,0 +1,289 @@
+<?php
+
+/**
+ * VObject Property
+ *
+ * A property in VObject is usually in the form PARAMNAME:paramValue.
+ * An example is : SUMMARY:Weekly meeting 
+ *
+ * Properties can also have parameters:
+ * SUMMARY;LANG=en:Weekly meeting.
+ *
+ * Parameters can be accessed using the ArrayAccess interface. 
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Property extends Sabre_VObject_Element {
+
+    /**
+     * Propertyname 
+     * 
+     * @var string 
+     */
+    public $name;
+
+    /**
+     * Group name
+     * 
+     * This may be something like 'HOME' for vcards.
+     *
+     * @var string 
+     */
+    public $group;
+
+    /**
+     * Property parameters 
+     * 
+     * @var array 
+     */
+    public $parameters = array();
+
+    /**
+     * Property value 
+     * 
+     * @var string 
+     */
+    public $value;
+
+    /**
+     * Creates a new property object
+     * 
+     * By default this object will iterate over its own children, but this can 
+     * be overridden with the iterator argument
+     * 
+     * @param string $name 
+     * @param string $value
+     * @param Sabre_VObject_ElementList $iterator
+     */
+    public function __construct($name, $value = null, $iterator = null) {
+
+        $name = strtoupper($name);
+        $group = null;
+        if (strpos($name,'.')!==false) {
+            list($group, $name) = explode('.', $name);
+        }
+        $this->name = $name;
+        $this->group = $group;
+        if (!is_null($iterator)) $this->iterator = $iterator;
+        $this->setValue($value);
+
+    }
+
+    /**
+     * Updates the internal value 
+     * 
+     * @param string $value 
+     * @return void
+     */
+    public function setValue($value) {
+
+        $this->value = $value;
+
+    }
+
+    /**
+     * Turns the object back into a serialized blob. 
+     * 
+     * @return string 
+     */
+    public function serialize() {
+
+        $str = $this->name;
+        if ($this->group) $str = $this->group . '.' . $this->name;
+
+        if (count($this->parameters)) {
+            foreach($this->parameters as $param) {
+                
+                $str.=';' . $param->serialize();
+
+            }
+        }
+        $src = array(
+            '\\',
+            "\n",
+        );
+        $out = array(
+            '\\\\',
+            '\n',
+        );
+        $str.=':' . str_replace($src, $out, $this->value);
+
+        $out = '';
+        while(strlen($str)>0) {
+            if (strlen($str)>75) {
+                $out.= substr($str,0,75) . "\r\n";
+                $str = ' ' . substr($str,75);
+            } else {
+                $out.=$str . "\r\n";
+                $str='';
+                break;
+            }
+        }
+
+        return $out;
+
+    }
+
+    /**
+     * Adds a new componenten or element
+     *
+     * You can call this method with the following syntaxes:
+     *
+     * add(Sabre_VObject_Parameter $element)
+     * add(string $name, $value)
+     *
+     * The first version adds an Parameter 
+     * The second adds a property as a string. 
+     * 
+     * @param mixed $item 
+     * @param mixed $itemValue 
+     * @return void
+     */
+    public function add($item, $itemValue = null) {
+
+        if ($item instanceof Sabre_VObject_Parameter) {
+            if (!is_null($itemValue)) {
+                throw new InvalidArgumentException('The second argument must not be specified, when passing a VObject');
+            }
+            $item->parent = $this;
+            $this->parameters[] = $item;
+        } elseif(is_string($item)) {
+
+            if (!is_scalar($itemValue)) {
+                throw new InvalidArgumentException('The second argument must be scalar');
+            }
+            $parameter = new Sabre_VObject_Parameter($item,$itemValue);
+            $parameter->parent = $this;
+            $this->parameters[] = $parameter;
+
+        } else {
+            
+            throw new InvalidArgumentException('The first argument must either be a Sabre_VObject_Element or a string');
+
+        }
+
+    }
+
+
+    /* ArrayAccess interface {{{ */
+
+    /**
+     * Checks if an array element exists
+     * 
+     * @param mixed $name 
+     * @return bool 
+     */
+    public function offsetExists($name) {
+
+        if (is_int($name)) return parent::offsetExists($name);
+
+        $name = strtoupper($name);
+
+        foreach($this->parameters as $parameter) {
+            if ($parameter->name == $name) return true;
+        }
+        return false;
+
+    }
+
+    /**
+     * Returns a parameter, or parameter list. 
+     * 
+     * @param string $name 
+     * @return Sabre_VObject_Element 
+     */
+    public function offsetGet($name) {
+
+        if (is_int($name)) return parent::offsetGet($name);
+        $name = strtoupper($name);
+        
+        $result = array();
+        foreach($this->parameters as $parameter) {
+            if ($parameter->name == $name)
+                $result[] = $parameter;
+        }
+
+        if (count($result)===0) {
+            return null;
+        } elseif (count($result)===1) {
+            return $result[0];
+        } else {
+            $result[0]->setIterator(new Sabre_VObject_ElementList($result));
+            return $result[0];
+        }
+
+    }
+
+    /**
+     * Creates a new parameter 
+     * 
+     * @param string $name
+     * @param mixed $value
+     * @return void
+     */
+    public function offsetSet($name, $value) {
+
+        if (is_int($name)) return parent::offsetSet($name, $value);
+
+        if (is_scalar($value)) {
+            if (!is_string($name)) 
+                throw new InvalidArgumentException('A parameter name must be specified. This means you cannot use the $array[]="string" to add parameters.');
+
+            $this->offsetUnset($name);
+            $parameter = new Sabre_VObject_Parameter($name, $value);
+            $parameter->parent = $this;
+            $this->parameters[] = $parameter;
+
+        } elseif ($value instanceof Sabre_VObject_Parameter) {
+            if (!is_null($name))
+                throw new InvalidArgumentException('Don\'t specify a parameter name if you\'re passing a Sabre_VObject_Parameter. Add using $array[]=$parameterObject.');
+
+            $value->parent = $this; 
+            $this->parameters[] = $value;
+        } else {
+            throw new InvalidArgumentException('You can only add parameters to the property object');
+        }
+
+    }
+
+    /**
+     * Removes one or more parameters with the specified name 
+     * 
+     * @param string $name 
+     * @return void 
+     */
+    public function offsetUnset($name) {
+
+        if (is_int($name)) return parent::offsetUnset($name, $value);
+        $name = strtoupper($name);
+        
+        $result = array();
+        foreach($this->parameters as $key=>$parameter) {
+            if ($parameter->name == $name) {
+                $parameter->parent = null;
+                unset($this->parameters[$key]);
+            }
+
+        }
+
+    }
+
+    /* }}} */
+
+    /**
+     * Called when this object is being cast to a string 
+     * 
+     * @return string 
+     */
+    public function __toString() {
+
+        return $this->value;
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/VObject/Reader.php b/3rdparty/Sabre/VObject/Reader.php
new file mode 100644
index 00000000000..7d1c282838e
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Reader.php
@@ -0,0 +1,191 @@
+<?php
+
+/**
+ * VCALENDAR/VCARD reader
+ *
+ * This class reads the vobject file, and returns a full element tree.
+ *
+ *
+ * TODO: this class currently completely works 'statically'. This is pointless, 
+ * and defeats OOP principals. Needs refaxtoring in a future version.
+ * 
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Reader {
+
+    /**
+     * This array contains a list of Property names that are automatically 
+     * mapped to specific class names.
+     *
+     * Adding to this list allows you to specify custom property classes, 
+     * adding extra functionality. 
+     * 
+     * @var array
+     */
+    static public $elementMap = array(
+        'DTSTART'   => 'Sabre_VObject_Element_DateTime',
+        'DTEND'     => 'Sabre_VObject_Element_DateTime',
+        'COMPLETED' => 'Sabre_VObject_Element_DateTime',
+        'DUE'       => 'Sabre_VObject_Element_DateTime',
+        'EXDATE'    => 'Sabre_VObject_Element_MultiDateTime',
+    );
+
+    /**
+     * Parses the file and returns the top component 
+     * 
+     * @param string $data 
+     * @return Sabre_VObject_Element 
+     */
+    static function read($data) {
+
+        // Normalizing newlines
+        $data = str_replace(array("\r","\n\n"), array("\n","\n"), $data);
+
+        $lines = explode("\n", $data);
+
+        // Unfolding lines
+        $lines2 = array();
+        foreach($lines as $line) {
+
+            // Skipping empty lines
+            if (!$line) continue;
+
+            if ($line[0]===" " || $line[0]==="\t") {
+                $lines2[count($lines2)-1].=substr($line,1);
+            } else {
+                $lines2[] = $line;
+            }
+
+        }
+
+        unset($lines);
+        
+        reset($lines2);
+
+        return self::readLine($lines2);
+       
+    }
+
+    /**
+     * Reads and parses a single line.
+     *
+     * This method receives the full array of lines. The array pointer is used
+     * to traverse.
+     * 
+     * @param array $lines 
+     * @return Sabre_VObject_Element 
+     */
+    static private function readLine(&$lines) {
+
+        $line = current($lines);
+        $lineNr = key($lines);
+        next($lines);
+
+        // Components
+        if (stripos($line,"BEGIN:")===0) {
+
+            // This is a component
+            $obj = new Sabre_VObject_Component(strtoupper(substr($line,6)));
+
+            $nextLine = current($lines);
+
+            while(stripos($nextLine,"END:")!==0) {
+
+                $obj->add(self::readLine($lines));
+                $nextLine = current($lines);
+
+                if ($nextLine===false) 
+                    throw new Sabre_VObject_ParseException('Invalid VObject. Document ended prematurely.');
+
+            }
+
+            // Checking component name of the 'END:' line. 
+            if (substr($nextLine,4)!==$obj->name) {
+                throw new Sabre_VObject_ParseException('Invalid VObject, expected: "END:' . $obj->name . '" got: "' . $nextLine . '"');
+            }
+            next($lines);
+
+            return $obj;
+
+        }
+
+        // Properties
+        //$result = preg_match('/(?P<name>[A-Z0-9-]+)(?:;(?P<parameters>^(?<!:):))(.*)$/',$line,$matches);
+
+
+        $token = '[A-Z0-9-\/\.]+';
+        $parameters = "(?:;(?P<parameters>([^:^\"]|\"([^\"]*)\")*))?";
+        $regex = "/^(?P<name>$token)$parameters:(?P<value>.*)$/i";
+
+        $result = preg_match($regex,$line,$matches);
+
+        if (!$result) {
+            throw new Sabre_VObject_ParseException('Invalid VObject, line ' . ($lineNr+1) . ' did not follow the icalendar/vcard format');
+        }
+
+        $propertyName = strtoupper($matches['name']);
+        $propertyValue = stripcslashes($matches['value']);
+
+        if (isset(self::$elementMap[$propertyName])) {
+            $className = self::$elementMap[$propertyName];
+        } else {
+            $className = 'Sabre_VObject_Property';
+        }
+
+        $obj = new $className($propertyName, $propertyValue);
+
+        if ($matches['parameters']) {
+
+            foreach(self::readParameters($matches['parameters']) as $param) {
+                $obj->add($param);
+            }
+        } 
+
+        return $obj;
+
+
+    }
+
+    /**
+     * Reads a parameter list from a property 
+     *
+     * This method returns an array of Sabre_VObject_Parameter
+     *
+     * @param string $parameters 
+     * @return array 
+     */
+    static private function readParameters($parameters) {
+
+        $token = '[A-Z0-9-]+';
+
+        $paramValue = '(?P<paramValue>[^\"^;]*|"[^"]*")';
+
+        $regex = "/(?<=^|;)(?P<paramName>$token)(=$paramValue(?=$|;))?/i";
+        preg_match_all($regex, $parameters, $matches,  PREG_SET_ORDER);
+
+        $params = array();
+        foreach($matches as $match) {
+
+            $value = isset($match['paramValue'])?$match['paramValue']:null;
+
+            if (isset($value[0])) {
+                // Stripping quotes, if needed
+                if ($value[0] === '"') $value = substr($value,1,strlen($value)-2);
+            } else {
+                $value = '';
+            }
+
+            $params[] = new Sabre_VObject_Parameter($match['paramName'], stripcslashes($value));
+
+        }
+
+        return $params;
+
+    }
+
+
+}
diff --git a/3rdparty/Sabre/VObject/Version.php b/3rdparty/Sabre/VObject/Version.php
new file mode 100644
index 00000000000..937c367e222
--- /dev/null
+++ b/3rdparty/Sabre/VObject/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the version number for the VObject package
+ * 
+ * @package Sabre
+ * @subpackage VObject 
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_VObject_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.2.4';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/3rdparty/Sabre/VObject/includes.php b/3rdparty/Sabre/VObject/includes.php
new file mode 100644
index 00000000000..f21010fb275
--- /dev/null
+++ b/3rdparty/Sabre/VObject/includes.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * VObject includes 
+ *
+ * This file automatically includes all VObject classes 
+ *
+ * @package Sabre
+ * @subpackage VObject
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+
+include dirname(__FILE__) . '/ParseException.php';
+
+include dirname(__FILE__) . '/Node.php';
+include dirname(__FILE__) . '/Element.php';
+include dirname(__FILE__) . '/ElementList.php';
+include dirname(__FILE__) . '/Parameter.php';
+include dirname(__FILE__) . '/Property.php';
+include dirname(__FILE__) . '/Component.php';
+
+include dirname(__FILE__) . '/Element/DateTime.php';
+include dirname(__FILE__) . '/Element/MultiDateTime.php';
+
+include dirname(__FILE__) . '/Reader.php';
+include dirname(__FILE__) . '/Version.php';
diff --git a/3rdparty/Sabre/autoload.php b/3rdparty/Sabre/autoload.php
new file mode 100644
index 00000000000..0649df655b0
--- /dev/null
+++ b/3rdparty/Sabre/autoload.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * SabreDAV's PHP autoloader
+ *
+ * If you love the autoloader, and don't care as much about performance, this
+ * file register a new autoload function using spl_autoload_register.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+function Sabre_autoload($className) {
+
+    if(strpos($className,'Sabre_')===0) {
+
+        include dirname(__FILE__) . '/' . str_replace('_','/',substr($className,6)) . '.php';
+
+    }
+
+}
+
+spl_autoload_register('Sabre_autoload');
+
diff --git a/3rdparty/System.php b/3rdparty/System.php
new file mode 100644
index 00000000000..97de96b14ca
--- /dev/null
+++ b/3rdparty/System.php
@@ -0,0 +1,540 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Tomas V.V.Cox <cox@idecnet.com>                             |
+// +----------------------------------------------------------------------+
+//
+// $Id: System.php,v 1.36 2004/06/15 16:33:46 pajoye Exp $
+//
+
+require_once( 'PEAR.php');
+require_once( 'Console/Getopt.php');
+
+$GLOBALS['_System_temp_files'] = array();
+
+/**
+* System offers cross plattform compatible system functions
+*
+* Static functions for different operations. Should work under
+* Unix and Windows. The names and usage has been taken from its respectively
+* GNU commands. The functions will return (bool) false on error and will
+* trigger the error with the PHP trigger_error() function (you can silence
+* the error by prefixing a '@' sign after the function call).
+*
+* Documentation on this class you can find in:
+* http://pear.php.net/manual/
+*
+* Example usage:
+* if (!@System::rm('-r file1 dir1')) {
+*    print "could not delete file1 or dir1";
+* }
+*
+* In case you need to to pass file names with spaces,
+* pass the params as an array:
+*
+* System::rm(array('-r', $file1, $dir1));
+*
+* @package  System
+* @author   Tomas V.V.Cox <cox@idecnet.com>
+* @version  $Revision: 1.36 $
+* @access   public
+* @see      http://pear.php.net/manual/
+*/
+class System
+{
+    /**
+    * returns the commandline arguments of a function
+    *
+    * @param    string  $argv           the commandline
+    * @param    string  $short_options  the allowed option short-tags
+    * @param    string  $long_options   the allowed option long-tags
+    * @return   array   the given options and there values
+    * @access private
+    */
+    function _parseArgs($argv, $short_options, $long_options = null)
+    {
+        if (!is_array($argv) && $argv !== null) {
+            $argv = preg_split('/\s+/', $argv);
+        }
+        return Console_Getopt::getopt2($argv, $short_options);
+    }
+
+    /**
+    * Output errors with PHP trigger_error(). You can silence the errors
+    * with prefixing a "@" sign to the function call: @System::mkdir(..);
+    *
+    * @param mixed $error a PEAR error or a string with the error message
+    * @return bool false
+    * @access private
+    */
+    function raiseError($error)
+    {
+        if (PEAR::isError($error)) {
+            $error = $error->getMessage();
+        }
+        trigger_error($error, E_USER_WARNING);
+        return false;
+    }
+
+    /**
+    * Creates a nested array representing the structure of a directory
+    *
+    * System::_dirToStruct('dir1', 0) =>
+    *   Array
+    *    (
+    *    [dirs] => Array
+    *        (
+    *            [0] => dir1
+    *        )
+    *
+    *    [files] => Array
+    *        (
+    *            [0] => dir1/file2
+    *            [1] => dir1/file3
+    *        )
+    *    )
+    * @param    string  $sPath      Name of the directory
+    * @param    integer $maxinst    max. deep of the lookup
+    * @param    integer $aktinst    starting deep of the lookup
+    * @return   array   the structure of the dir
+    * @access   private
+    */
+
+    function _dirToStruct($sPath, $maxinst, $aktinst = 0)
+    {
+        $struct = array('dirs' => array(), 'files' => array());
+        if (($dir = @opendir($sPath)) === false) {
+            System::raiseError("Could not open dir $sPath");
+            return $struct; // XXX could not open error
+        }
+        $struct['dirs'][] = $sPath; // XXX don't add if '.' or '..' ?
+        $list = array();
+        while ($file = readdir($dir)) {
+            if ($file != '.' && $file != '..') {
+                $list[] = $file;
+            }
+        }
+        closedir($dir);
+        sort($list);
+        if ($aktinst < $maxinst || $maxinst == 0) {
+            foreach($list as $val) {
+                $path = $sPath . DIRECTORY_SEPARATOR . $val;
+                if (is_dir($path)) {
+                    $tmp = System::_dirToStruct($path, $maxinst, $aktinst+1);
+                    $struct = array_merge_recursive($tmp, $struct);
+                } else {
+                    $struct['files'][] = $path;
+                }
+            }
+        }
+        return $struct;
+    }
+
+    /**
+    * Creates a nested array representing the structure of a directory and files
+    *
+    * @param    array $files Array listing files and dirs
+    * @return   array
+    * @see System::_dirToStruct()
+    */
+    function _multipleToStruct($files)
+    {
+        $struct = array('dirs' => array(), 'files' => array());
+        settype($files, 'array');
+        foreach ($files as $file) {
+            if (is_dir($file)) {
+                $tmp = System::_dirToStruct($file, 0);
+                $struct = array_merge_recursive($tmp, $struct);
+            } else {
+                $struct['files'][] = $file;
+            }
+        }
+        return $struct;
+    }
+
+    /**
+    * The rm command for removing files.
+    * Supports multiple files and dirs and also recursive deletes
+    *
+    * @param    string  $args   the arguments for rm
+    * @return   mixed   PEAR_Error or true for success
+    * @access   public
+    */
+    function rm($args)
+    {
+        $opts = System::_parseArgs($args, 'rf'); // "f" do nothing but like it :-)
+        if (PEAR::isError($opts)) {
+            return System::raiseError($opts);
+        }
+        foreach($opts[0] as $opt) {
+            if ($opt[0] == 'r') {
+                $do_recursive = true;
+            }
+        }
+        $ret = true;
+        if (isset($do_recursive)) {
+            $struct = System::_multipleToStruct($opts[1]);
+            foreach($struct['files'] as $file) {
+                if (!@unlink($file)) {
+                    $ret = false;
+                }
+            }
+            foreach($struct['dirs'] as $dir) {
+                if (!@rmdir($dir)) {
+                    $ret = false;
+                }
+            }
+        } else {
+            foreach ($opts[1] as $file) {
+                $delete = (is_dir($file)) ? 'rmdir' : 'unlink';
+                if (!@$delete($file)) {
+                    $ret = false;
+                }
+            }
+        }
+        return $ret;
+    }
+
+    /**
+    * Make directories. Note that we use call_user_func('mkdir') to avoid
+    * a problem with ZE2 calling System::mkDir instead of the native PHP func.
+    *
+    * @param    string  $args    the name of the director(y|ies) to create
+    * @return   bool    True for success
+    * @access   public
+    */
+    function mkDir($args)
+    {
+        $opts = System::_parseArgs($args, 'pm:');
+        if (PEAR::isError($opts)) {
+            return System::raiseError($opts);
+        }
+        $mode = 0777; // default mode
+        foreach($opts[0] as $opt) {
+            if ($opt[0] == 'p') {
+                $create_parents = true;
+            } elseif($opt[0] == 'm') {
+                // if the mode is clearly an octal number (starts with 0)
+                // convert it to decimal
+                if (strlen($opt[1]) && $opt[1]{0} == '0') {
+                    $opt[1] = octdec($opt[1]);
+                } else {
+                    // convert to int
+                    $opt[1] += 0;
+                }
+                $mode = $opt[1];
+            }
+        }
+        $ret = true;
+        if (isset($create_parents)) {
+            foreach($opts[1] as $dir) {
+                $dirstack = array();
+                while (!@is_dir($dir) && $dir != DIRECTORY_SEPARATOR) {
+                    array_unshift($dirstack, $dir);
+                    $dir = dirname($dir);
+                }
+                while ($newdir = array_shift($dirstack)) {
+                    if (!call_user_func('mkdir', $newdir, $mode)) {
+                        $ret = false;
+                    }
+                }
+            }
+        } else {
+            foreach($opts[1] as $dir) {
+                if (!@is_dir($dir) && !call_user_func('mkdir', $dir, $mode)) {
+                    $ret = false;
+                }
+            }
+        }
+        return $ret;
+    }
+
+    /**
+    * Concatenate files
+    *
+    * Usage:
+    * 1) $var = System::cat('sample.txt test.txt');
+    * 2) System::cat('sample.txt test.txt > final.txt');
+    * 3) System::cat('sample.txt test.txt >> final.txt');
+    *
+    * Note: as the class use fopen, urls should work also (test that)
+    *
+    * @param    string  $args   the arguments
+    * @return   boolean true on success
+    * @access   public
+    */
+    function &cat($args)
+    {
+        $ret = null;
+        $files = array();
+        if (!is_array($args)) {
+            $args = preg_split('/\s+/', $args);
+        }
+        for($i=0; $i < count($args); $i++) {
+            if ($args[$i] == '>') {
+                $mode = 'wb';
+                $outputfile = $args[$i+1];
+                break;
+            } elseif ($args[$i] == '>>') {
+                $mode = 'ab+';
+                $outputfile = $args[$i+1];
+                break;
+            } else {
+                $files[] = $args[$i];
+            }
+        }
+        if (isset($mode)) {
+            if (!$outputfd = fopen($outputfile, $mode)) {
+                $err = System::raiseError("Could not open $outputfile");
+                return $err;
+            }
+            $ret = true;
+        }
+        foreach ($files as $file) {
+            if (!$fd = fopen($file, 'r')) {
+                System::raiseError("Could not open $file");
+                continue;
+            }
+            while ($cont = fread($fd, 2048)) {
+                if (isset($outputfd)) {
+                    fwrite($outputfd, $cont);
+                } else {
+                    $ret .= $cont;
+                }
+            }
+            fclose($fd);
+        }
+        if (@is_resource($outputfd)) {
+            fclose($outputfd);
+        }
+        return $ret;
+    }
+
+    /**
+    * Creates temporary files or directories. This function will remove
+    * the created files when the scripts finish its execution.
+    *
+    * Usage:
+    *   1) $tempfile = System::mktemp("prefix");
+    *   2) $tempdir  = System::mktemp("-d prefix");
+    *   3) $tempfile = System::mktemp();
+    *   4) $tempfile = System::mktemp("-t /var/tmp prefix");
+    *
+    * prefix -> The string that will be prepended to the temp name
+    *           (defaults to "tmp").
+    * -d     -> A temporary dir will be created instead of a file.
+    * -t     -> The target dir where the temporary (file|dir) will be created. If
+    *           this param is missing by default the env vars TMP on Windows or
+    *           TMPDIR in Unix will be used. If these vars are also missing
+    *           c:\windows\temp or /tmp will be used.
+    *
+    * @param   string  $args  The arguments
+    * @return  mixed   the full path of the created (file|dir) or false
+    * @see System::tmpdir()
+    * @access  public
+    */
+    function mktemp($args = null)
+    {
+        static $first_time = true;
+        $opts = System::_parseArgs($args, 't:d');
+        if (PEAR::isError($opts)) {
+            return System::raiseError($opts);
+        }
+        foreach($opts[0] as $opt) {
+            if($opt[0] == 'd') {
+                $tmp_is_dir = true;
+            } elseif($opt[0] == 't') {
+                $tmpdir = $opt[1];
+            }
+        }
+        $prefix = (isset($opts[1][0])) ? $opts[1][0] : 'tmp';
+        if (!isset($tmpdir)) {
+            $tmpdir = System::tmpdir();
+        }
+        if (!System::mkDir("-p $tmpdir")) {
+            return false;
+        }
+        $tmp = tempnam($tmpdir, $prefix);
+        if (isset($tmp_is_dir)) {
+            unlink($tmp); // be careful possible race condition here
+            if (!call_user_func('mkdir', $tmp, 0700)) {
+                return System::raiseError("Unable to create temporary directory $tmpdir");
+            }
+        }
+        $GLOBALS['_System_temp_files'][] = $tmp;
+        if ($first_time) {
+            PEAR::registerShutdownFunc(array('System', '_removeTmpFiles'));
+            $first_time = false;
+        }
+        return $tmp;
+    }
+
+    /**
+    * Remove temporary files created my mkTemp. This function is executed
+    * at script shutdown time
+    *
+    * @access private
+    */
+    function _removeTmpFiles()
+    {
+        if (count($GLOBALS['_System_temp_files'])) {
+            $delete = $GLOBALS['_System_temp_files'];
+            array_unshift($delete, '-r');
+            System::rm($delete);
+        }
+    }
+
+    /**
+    * Get the path of the temporal directory set in the system
+    * by looking in its environments variables.
+    * Note: php.ini-recommended removes the "E" from the variables_order setting,
+    * making unavaible the $_ENV array, that s why we do tests with _ENV
+    *
+    * @return string The temporal directory on the system
+    */
+    function tmpdir()
+    {
+        if (OS_WINDOWS) {
+            if ($var = isset($_ENV['TEMP']) ? $_ENV['TEMP'] : getenv('TEMP')) {
+                return $var;
+            }
+            if ($var = isset($_ENV['TMP']) ? $_ENV['TMP'] : getenv('TMP')) {
+                return $var;
+            }
+            if ($var = isset($_ENV['windir']) ? $_ENV['windir'] : getenv('windir')) {
+                return $var;
+            }
+            return getenv('SystemRoot') . '\temp';
+        }
+        if ($var = isset($_ENV['TMPDIR']) ? $_ENV['TMPDIR'] : getenv('TMPDIR')) {
+            return $var;
+        }
+        return '/tmp';
+    }
+
+    /**
+    * The "which" command (show the full path of a command)
+    *
+    * @param string $program The command to search for
+    * @return mixed A string with the full path or false if not found
+    * @author Stig Bakken <ssb@php.net>
+    */
+    function which($program, $fallback = false)
+    {
+        // is_executable() is not available on windows
+        if (OS_WINDOWS) {
+            $pear_is_executable = 'is_file';
+        } else {
+            $pear_is_executable = 'is_executable';
+        }
+
+        // full path given
+        if (basename($program) != $program) {
+            return (@$pear_is_executable($program)) ? $program : $fallback;
+        }
+
+        // XXX FIXME honor safe mode
+        $path_delim = OS_WINDOWS ? ';' : ':';
+        $exe_suffixes = OS_WINDOWS ? array('.exe','.bat','.cmd','.com') : array('');
+        $path_elements = explode($path_delim, getenv('PATH'));
+        foreach ($exe_suffixes as $suff) {
+            foreach ($path_elements as $dir) {
+                $file = $dir . DIRECTORY_SEPARATOR . $program . $suff;
+                if (@is_file($file) && @$pear_is_executable($file)) {
+                    return $file;
+                }
+            }
+        }
+        return $fallback;
+    }
+
+    /**
+    * The "find" command
+    *
+    * Usage:
+    *
+    * System::find($dir);
+    * System::find("$dir -type d");
+    * System::find("$dir -type f");
+    * System::find("$dir -name *.php");
+    * System::find("$dir -name *.php -name *.htm*");
+    * System::find("$dir -maxdepth 1");
+    *
+    * Params implmented:
+    * $dir            -> Start the search at this directory
+    * -type d         -> return only directories
+    * -type f         -> return only files
+    * -maxdepth <n>   -> max depth of recursion
+    * -name <pattern> -> search pattern (bash style). Multiple -name param allowed
+    *
+    * @param  mixed Either array or string with the command line
+    * @return array Array of found files
+    *
+    */
+    function find($args)
+    {
+        if (!is_array($args)) {
+            $args = preg_split('/\s+/', $args, -1, PREG_SPLIT_NO_EMPTY);
+        }
+        $dir = array_shift($args);
+        $patterns = array();
+        $depth = 0;
+        $do_files = $do_dirs = true;
+        for ($i = 0; $i < count($args); $i++) {
+            switch ($args[$i]) {
+                case '-type':
+                    if (in_array($args[$i+1], array('d', 'f'))) {
+                        if ($args[$i+1] == 'd') {
+                             $do_files = false;
+                        } else {
+                            $do_dirs = false;
+                        }
+                    }
+                    $i++;
+                    break;
+                case '-name':
+                    $patterns[] = "(" . preg_replace(array('/\./', '/\*/'),
+                                                     array('\.', '.*'),
+                                                     $args[$i+1])
+                                      . ")";
+                    $i++;
+                    break;
+                case '-maxdepth':
+                    $depth = $args[$i+1];
+                    break;
+            }
+        }
+        $path = System::_dirToStruct($dir, $depth);
+        if ($do_files && $do_dirs) {
+            $files = array_merge($path['files'], $path['dirs']);
+        } elseif ($do_dirs) {
+            $files = $path['dirs'];
+        } else {
+            $files = $path['files'];
+        }
+        if (count($patterns)) {
+            $patterns = implode('|', $patterns);
+            $ret = array();
+            for ($i = 0; $i < count($files); $i++) {
+                if (preg_match("#^$patterns\$#", $files[$i])) {
+                    $ret[] = $files[$i];
+                }
+            }
+            return $ret;
+        }
+        return $files;
+    }
+}
+?>
diff --git a/3rdparty/XML/Parser.php b/3rdparty/XML/Parser.php
new file mode 100644
index 00000000000..38b4f8fe8a6
--- /dev/null
+++ b/3rdparty/XML/Parser.php
@@ -0,0 +1,667 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Stig Bakken <ssb@fast.no>                                    |
+// |         Tomas V.V.Cox <cox@idecnet.com>                              |
+// |         Stephan Schmidt <schst@php-tools.net>                        |
+// +----------------------------------------------------------------------+
+//
+// $Id: Parser.php,v 1.25 2005/03/25 17:13:10 schst Exp $
+
+/**
+ * XML Parser class.
+ *
+ * This is an XML parser based on PHP's "xml" extension,
+ * based on the bundled expat library.
+ *
+ * @category XML
+ * @package XML_Parser
+ * @author  Stig Bakken <ssb@fast.no>
+ * @author  Tomas V.V.Cox <cox@idecnet.com>
+ * @author  Stephan Schmidt <schst@php-tools.net>
+ */
+
+/**
+ * uses PEAR's error handling
+ */
+require_once('PEAR.php');
+
+/**
+ * resource could not be created
+ */
+define('XML_PARSER_ERROR_NO_RESOURCE', 200);
+
+/**
+ * unsupported mode
+ */
+define('XML_PARSER_ERROR_UNSUPPORTED_MODE', 201);
+
+/**
+ * invalid encoding was given
+ */
+define('XML_PARSER_ERROR_INVALID_ENCODING', 202);
+
+/**
+ * specified file could not be read
+ */
+define('XML_PARSER_ERROR_FILE_NOT_READABLE', 203);
+
+/**
+ * invalid input
+ */
+define('XML_PARSER_ERROR_INVALID_INPUT', 204);
+
+/**
+ * remote file cannot be retrieved in safe mode
+ */
+define('XML_PARSER_ERROR_REMOTE', 205);
+
+/**
+ * XML Parser class.
+ *
+ * This is an XML parser based on PHP's "xml" extension,
+ * based on the bundled expat library.
+ *
+ * Notes:
+ * - It requires PHP 4.0.4pl1 or greater
+ * - From revision 1.17, the function names used by the 'func' mode
+ *   are in the format "xmltag_$elem", for example: use "xmltag_name"
+ *   to handle the <name></name> tags of your xml file.
+ *
+ * @category XML
+ * @package XML_Parser
+ * @author  Stig Bakken <ssb@fast.no>
+ * @author  Tomas V.V.Cox <cox@idecnet.com>
+ * @author  Stephan Schmidt <schst@php-tools.net>
+ * @todo    create XML_Parser_Namespace to parse documents with namespaces
+ * @todo    create XML_Parser_Pull
+ * @todo    Tests that need to be made:
+ *          - mixing character encodings
+ *          - a test using all expat handlers
+ *          - options (folding, output charset)
+ *          - different parsing modes
+ */
+class XML_Parser extends PEAR
+{
+    // {{{ properties
+
+   /**
+     * XML parser handle
+     *
+     * @var  resource
+     * @see  xml_parser_create()
+     */
+    var $parser;
+
+    /**
+     * File handle if parsing from a file
+     *
+     * @var  resource
+     */
+    var $fp;
+
+    /**
+     * Whether to do case folding
+     *
+     * If set to true, all tag and attribute names will
+     * be converted to UPPER CASE.
+     *
+     * @var  boolean
+     */
+    var $folding = true;
+
+    /**
+     * Mode of operation, one of "event" or "func"
+     *
+     * @var  string
+     */
+    var $mode;
+
+    /**
+     * Mapping from expat handler function to class method.
+     *
+     * @var  array
+     */
+    var $handler = array(
+        'character_data_handler'            => 'cdataHandler',
+        'default_handler'                   => 'defaultHandler',
+        'processing_instruction_handler'    => 'piHandler',
+        'unparsed_entity_decl_handler'      => 'unparsedHandler',
+        'notation_decl_handler'             => 'notationHandler',
+        'external_entity_ref_handler'       => 'entityrefHandler'
+    );
+
+    /**
+     * source encoding
+     *
+     * @var string
+     */
+    var $srcenc;
+
+    /**
+     * target encoding
+     *
+     * @var string
+     */
+    var $tgtenc;
+
+    /**
+     * handler object
+     *
+     * @var object
+     */
+    var $_handlerObj;
+
+    // }}}
+
+    /**
+     * PHP5 constructor
+     *
+     * @param string $srcenc source charset encoding, use NULL (default) to use
+     *                       whatever the document specifies
+     * @param string $mode   how this parser object should work, "event" for
+     *                       startelement/endelement-type events, "func"
+     *                       to have it call functions named after elements
+     * @param string $tgenc  a valid target encoding
+     */
+    function __construct($srcenc = null, $mode = 'event', $tgtenc = null)
+    {
+        $this->PEAR('XML_Parser_Error');
+
+        $this->mode   = $mode;
+        $this->srcenc = $srcenc;
+        $this->tgtenc = $tgtenc;
+    }
+    // }}}
+
+    /**
+     * Sets the mode of the parser.
+     *
+     * Possible modes are:
+     * - func
+     * - event
+     *
+     * You can set the mode using the second parameter
+     * in the constructor.
+     *
+     * This method is only needed, when switching to a new
+     * mode at a later point.
+     *
+     * @access  public
+     * @param   string          mode, either 'func' or 'event'
+     * @return  boolean|object  true on success, PEAR_Error otherwise   
+     */
+    function setMode($mode)
+    {
+        if ($mode != 'func' && $mode != 'event') {
+            $this->raiseError('Unsupported mode given', XML_PARSER_ERROR_UNSUPPORTED_MODE);
+        }
+
+        $this->mode = $mode;
+        return true;
+    }
+
+    /**
+     * Sets the object, that will handle the XML events
+     *
+     * This allows you to create a handler object independent of the
+     * parser object that you are using and easily switch the underlying
+     * parser.
+     *
+     * If no object will be set, XML_Parser assumes that you
+     * extend this class and handle the events in $this.
+     *
+     * @access  public
+     * @param   object      object to handle the events
+     * @return  boolean     will always return true
+     * @since   v1.2.0beta3
+     */
+    function setHandlerObj(&$obj)
+    {
+        $this->_handlerObj = &$obj;
+        return true;
+    }
+
+    /**
+     * Init the element handlers
+     *
+     * @access  private
+     */
+    function _initHandlers()
+    {
+        if (!is_resource($this->parser)) {
+            return false;
+        }
+
+        if (!is_object($this->_handlerObj)) {
+            $this->_handlerObj = &$this;
+        }
+        switch ($this->mode) {
+
+            case 'func':
+                xml_set_object($this->parser, $this->_handlerObj);
+                xml_set_element_handler($this->parser, array(&$this, 'funcStartHandler'), array(&$this, 'funcEndHandler'));
+                break;
+
+            case 'event':
+                xml_set_object($this->parser, $this->_handlerObj);
+                xml_set_element_handler($this->parser, 'startHandler', 'endHandler');
+                break;
+            default:
+                return $this->raiseError('Unsupported mode given', XML_PARSER_ERROR_UNSUPPORTED_MODE);
+                break;
+        }
+
+
+        /**
+         * set additional handlers for character data, entities, etc.
+         */
+        foreach ($this->handler as $xml_func => $method) {
+            if (method_exists($this->_handlerObj, $method)) {
+                $xml_func = 'xml_set_' . $xml_func;
+                $xml_func($this->parser, $method);
+            }
+		}
+    }
+
+    // {{{ _create()
+
+    /**
+     * create the XML parser resource
+     *
+     * Has been moved from the constructor to avoid
+     * problems with object references.
+     *
+     * Furthermore it allows us returning an error
+     * if something fails.
+     *
+     * @access   private
+     * @return   boolean|object     true on success, PEAR_Error otherwise
+     *
+     * @see xml_parser_create
+     */
+    function _create()
+    {
+        if ($this->srcenc === null) {
+            $xp = @xml_parser_create();
+        } else {
+            $xp = @xml_parser_create($this->srcenc);
+        }
+        if (is_resource($xp)) {
+            if ($this->tgtenc !== null) {
+                if (!@xml_parser_set_option($xp, XML_OPTION_TARGET_ENCODING,
+                                            $this->tgtenc)) {
+                    return $this->raiseError('invalid target encoding', XML_PARSER_ERROR_INVALID_ENCODING);
+                }
+            }
+            $this->parser = $xp;
+            $result = $this->_initHandlers($this->mode);
+            if ($this->isError($result)) {
+                return $result;
+            }
+            xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, $this->folding);
+
+            return true;
+        }
+        return $this->raiseError('Unable to create XML parser resource.', XML_PARSER_ERROR_NO_RESOURCE);
+    }
+
+    // }}}
+    // {{{ reset()
+
+    /**
+     * Reset the parser.
+     *
+     * This allows you to use one parser instance
+     * to parse multiple XML documents.
+     *
+     * @access   public
+     * @return   boolean|object     true on success, PEAR_Error otherwise
+     */
+    function reset()
+    {
+        $result = $this->_create();
+        if ($this->isError( $result )) {
+            return $result;
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ setInputFile()
+
+    /**
+     * Sets the input xml file to be parsed
+     *
+     * @param    string      Filename (full path)
+     * @return   resource    fopen handle of the given file
+     * @throws   XML_Parser_Error
+     * @see      setInput(), setInputString(), parse()
+     * @access   public
+     */
+    function setInputFile($file)
+    {
+        /**
+         * check, if file is a remote file
+         */
+        if (preg_match('[^(http|ftp)://]', substr($file, 0, 10))) {
+            if (!ini_get('allow_url_fopen')) {
+            	return $this->raiseError('Remote files cannot be parsed, as safe mode is enabled.', XML_PARSER_ERROR_REMOTE);
+            }
+        }
+        $fp = fopen($file, 'rb');
+        if (is_resource($fp)) {
+            $this->fp = $fp;
+            return $fp;
+        }
+        return $this->raiseError('File could not be opened.', XML_PARSER_ERROR_FILE_NOT_READABLE);
+    }
+
+    // }}}
+    // {{{ setInputString()
+    
+    /**
+     * XML_Parser::setInputString()
+     * 
+     * Sets the xml input from a string
+     * 
+     * @param string $data a string containing the XML document
+     * @return null
+     **/
+    function setInputString($data)
+    {
+        $this->fp = $data;
+        return null;
+    }
+    
+    // }}}
+    // {{{ setInput()
+
+    /**
+     * Sets the file handle to use with parse().
+     *
+     * You should use setInputFile() or setInputString() if you
+     * pass a string 
+     *
+     * @param    mixed  $fp  Can be either a resource returned from fopen(),
+     *                       a URL, a local filename or a string.
+     * @access   public
+     * @see      parse()
+     * @uses     setInputString(), setInputFile()
+     */
+    function setInput($fp)
+    {
+        if (is_resource($fp)) {
+            $this->fp = $fp;
+            return true;
+        }
+        // see if it's an absolute URL (has a scheme at the beginning)
+        elseif (eregi('^[a-z]+://', substr($fp, 0, 10))) {
+            return $this->setInputFile($fp);
+        }
+        // see if it's a local file
+        elseif (file_exists($fp)) {
+            return $this->setInputFile($fp);
+        }
+        // it must be a string
+        else {
+            $this->fp = $fp;
+            return true;
+        }
+
+        return $this->raiseError('Illegal input format', XML_PARSER_ERROR_INVALID_INPUT);
+    }
+
+    // }}}
+    // {{{ parse()
+
+    /**
+     * Central parsing function.
+     *
+     * @return   true|object PEAR error     returns true on success, or a PEAR_Error otherwise
+     * @access   public
+     */
+    function parse()
+    {
+        /**
+         * reset the parser
+         */
+        $result = $this->reset();
+        if ($this->isError($result)) {
+            return $result;
+        }
+        // if $this->fp was fopened previously
+        if (is_resource($this->fp)) {
+        
+            while ($data = fread($this->fp, 4096)) {
+                if (!$this->_parseString($data, feof($this->fp))) {
+                    $error = &$this->raiseError();
+                    $this->free();
+                    return $error;
+                }
+            }
+        // otherwise, $this->fp must be a string
+        } else {
+            if (!$this->_parseString($this->fp, true)) {
+                $error = &$this->raiseError();
+                $this->free();
+                return $error;
+            }
+        }
+        $this->free();
+
+        return true;
+    }
+
+    /**
+     * XML_Parser::_parseString()
+     * 
+     * @param string $data
+     * @param boolean $eof
+     * @return bool
+     * @access private
+     * @see parseString()
+     **/
+    function _parseString($data, $eof = false)
+    {
+        return xml_parse($this->parser, $data, $eof);
+    }
+    
+    // }}}
+    // {{{ parseString()
+
+    /**
+     * XML_Parser::parseString()
+     * 
+     * Parses a string.
+     *
+     * @param    string  $data XML data
+     * @param    boolean $eof  If set and TRUE, data is the last piece of data sent in this parser
+     * @throws   XML_Parser_Error
+     * @return   Pear Error|true   true on success or a PEAR Error
+     * @see      _parseString()
+     */
+    function parseString($data, $eof = false)
+    {
+        if (!isset($this->parser) || !is_resource($this->parser)) {
+            $this->reset();
+        }
+        
+        if (!$this->_parseString($data, $eof)) {
+           $error = &$this->raiseError();
+           $this->free();
+           return $error;
+        }
+
+        if ($eof === true) {
+            $this->free();
+        }
+        return true;
+    }
+    
+    /**
+     * XML_Parser::free()
+     * 
+     * Free the internal resources associated with the parser
+     * 
+     * @return null
+     **/
+    function free()
+    {
+        if (isset($this->parser) && is_resource($this->parser)) {
+            xml_parser_free($this->parser);
+            unset( $this->parser );
+        }
+        if (isset($this->fp) && is_resource($this->fp)) {
+            fclose($this->fp);
+        }
+        unset($this->fp);
+        return null;
+    }
+    
+    /**
+     * XML_Parser::raiseError()
+     * 
+     * Throws a XML_Parser_Error
+     * 
+     * @param string  $msg   the error message
+     * @param integer $ecode the error message code
+     * @return XML_Parser_Error 
+     **/
+    function raiseError($msg = null, $ecode = 0,$mode = null,
+                         $options = null,
+                         $userinfo = null,
+                         $error_class = null,
+                         $skipmsg = false)
+    {
+        $msg = !is_null($msg) ? $msg : $this->parser;
+        $err = new XML_Parser_Error($msg, $ecode);
+        return parent::raiseError($err);
+    }
+    
+    // }}}
+    // {{{ funcStartHandler()
+
+    function funcStartHandler($xp, $elem, $attribs)
+    {
+        $func = 'xmltag_' . $elem;
+        if (strchr($func, '.')) {
+            $func = str_replace('.', '_', $func);
+        }
+        if (method_exists($this->_handlerObj, $func)) {
+            call_user_func(array(&$this->_handlerObj, $func), $xp, $elem, $attribs);
+        } elseif (method_exists($this->_handlerObj, 'xmltag')) {
+            call_user_func(array(&$this->_handlerObj, 'xmltag'), $xp, $elem, $attribs);
+        }
+    }
+
+    // }}}
+    // {{{ funcEndHandler()
+
+    function funcEndHandler($xp, $elem)
+    {
+        $func = 'xmltag_' . $elem . '_';
+        if (strchr($func, '.')) {
+            $func = str_replace('.', '_', $func);
+        }
+        if (method_exists($this->_handlerObj, $func)) {
+            call_user_func(array(&$this->_handlerObj, $func), $xp, $elem);
+        } elseif (method_exists($this->_handlerObj, 'xmltag_')) {
+            call_user_func(array(&$this->_handlerObj, 'xmltag_'), $xp, $elem);
+        }
+    }
+
+    // }}}
+    // {{{ startHandler()
+
+    /**
+     *
+     * @abstract
+     */
+    function startHandler($xp, $elem, $attribs)
+    {
+        return NULL;
+    }
+
+    // }}}
+    // {{{ endHandler()
+
+    /**
+     *
+     * @abstract
+     */
+    function endHandler($xp, $elem)
+    {
+        return NULL;
+    }
+
+
+    // }}}me
+}
+
+/**
+ * error class, replaces PEAR_Error
+ *
+ * An instance of this class will be returned
+ * if an error occurs inside XML_Parser.
+ *
+ * There are three advantages over using the standard PEAR_Error:
+ * - All messages will be prefixed
+ * - check for XML_Parser error, using is_a( $error, 'XML_Parser_Error' )
+ * - messages can be generated from the xml_parser resource
+ *
+ * @package XML_Parser
+ * @access  public
+ * @see     PEAR_Error
+ */
+class XML_Parser_Error extends PEAR_Error
+{
+    // {{{ properties
+
+   /**
+    * prefix for all messages
+    *
+    * @var      string
+    */    
+    var $error_message_prefix = 'XML_Parser: ';
+
+    // }}}
+    // {{{ constructor()
+   /**
+    * construct a new error instance
+    *
+    * You may either pass a message or an xml_parser resource as first
+    * parameter. If a resource has been passed, the last error that
+    * happened will be retrieved and returned.
+    *
+    * @access   public
+    * @param    string|resource     message or parser resource
+    * @param    integer             error code
+    * @param    integer             error handling
+    * @param    integer             error level
+    */    
+    function XML_Parser_Error($msgorparser = 'unknown error', $code = 0, $mode = PEAR_ERROR_RETURN, $level = E_USER_NOTICE)
+    {
+        if (is_resource($msgorparser)) {
+            $code = xml_get_error_code($msgorparser);
+            $msgorparser = sprintf('%s at XML input line %d',
+                                   xml_error_string($code),
+                                   xml_get_current_line_number($msgorparser));
+        }
+        $this->PEAR_Error($msgorparser, $code, $mode, $level);
+    }
+    // }}}
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/XML/RPC.php b/3rdparty/XML/RPC.php
new file mode 100644
index 00000000000..096b22a0ab5
--- /dev/null
+++ b/3rdparty/XML/RPC.php
@@ -0,0 +1,1951 @@
+<?php
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * PHP implementation of the XML-RPC protocol
+ *
+ * This is a PEAR-ified version of Useful inc's XML-RPC for PHP.
+ * It has support for HTTP transport, proxies and authentication.
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: License is granted to use or modify this software
+ * ("XML-RPC for PHP") for commercial or non-commercial use provided the
+ * copyright of the author is preserved in any distributed or derivative work.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESSED OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   Web Services
+ * @package    XML_RPC
+ * @author     Edd Dumbill <edd@usefulinc.com>
+ * @author     Stig Bakken <stig@php.net>
+ * @author     Martin Jansen <mj@php.net>
+ * @author     Daniel Convissor <danielc@php.net>
+ * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
+ * @version    CVS: $Id: RPC.php,v 1.83 2005/08/14 20:25:35 danielc Exp $
+ * @link       http://pear.php.net/package/XML_RPC
+ */
+
+
+if (!function_exists('xml_parser_create')) {
+    PEAR::loadExtension('xml');
+}
+
+/**#@+
+ * Error constants
+ */
+/**
+ * Parameter values don't match parameter types
+ */
+define('XML_RPC_ERROR_INVALID_TYPE', 101);
+/**
+ * Parameter declared to be numeric but the values are not
+ */
+define('XML_RPC_ERROR_NON_NUMERIC_FOUND', 102);
+/**
+ * Communication error
+ */
+define('XML_RPC_ERROR_CONNECTION_FAILED', 103);
+/**
+ * The array or struct has already been started
+ */
+define('XML_RPC_ERROR_ALREADY_INITIALIZED', 104);
+/**
+ * Incorrect parameters submitted
+ */
+define('XML_RPC_ERROR_INCORRECT_PARAMS', 105);
+/**
+ * Programming error by developer
+ */
+define('XML_RPC_ERROR_PROGRAMMING', 106);
+/**#@-*/
+
+
+/**
+ * Data types
+ * @global string $GLOBALS['XML_RPC_I4']
+ */
+$GLOBALS['XML_RPC_I4'] = 'i4';
+
+/**
+ * Data types
+ * @global string $GLOBALS['XML_RPC_Int']
+ */
+$GLOBALS['XML_RPC_Int'] = 'int';
+
+/**
+ * Data types
+ * @global string $GLOBALS['XML_RPC_Boolean']
+ */
+$GLOBALS['XML_RPC_Boolean'] = 'boolean';
+
+/**
+ * Data types
+ * @global string $GLOBALS['XML_RPC_Double']
+ */
+$GLOBALS['XML_RPC_Double'] = 'double';
+
+/**
+ * Data types
+ * @global string $GLOBALS['XML_RPC_String']
+ */
+$GLOBALS['XML_RPC_String'] = 'string';
+
+/**
+ * Data types
+ * @global string $GLOBALS['XML_RPC_DateTime']
+ */
+$GLOBALS['XML_RPC_DateTime'] = 'dateTime.iso8601';
+
+/**
+ * Data types
+ * @global string $GLOBALS['XML_RPC_Base64']
+ */
+$GLOBALS['XML_RPC_Base64'] = 'base64';
+
+/**
+ * Data types
+ * @global string $GLOBALS['XML_RPC_Array']
+ */
+$GLOBALS['XML_RPC_Array'] = 'array';
+
+/**
+ * Data types
+ * @global string $GLOBALS['XML_RPC_Struct']
+ */
+$GLOBALS['XML_RPC_Struct'] = 'struct';
+
+
+/**
+ * Data type meta-types
+ * @global array $GLOBALS['XML_RPC_Types']
+ */
+$GLOBALS['XML_RPC_Types'] = array(
+    $GLOBALS['XML_RPC_I4']       => 1,
+    $GLOBALS['XML_RPC_Int']      => 1,
+    $GLOBALS['XML_RPC_Boolean']  => 1,
+    $GLOBALS['XML_RPC_String']   => 1,
+    $GLOBALS['XML_RPC_Double']   => 1,
+    $GLOBALS['XML_RPC_DateTime'] => 1,
+    $GLOBALS['XML_RPC_Base64']   => 1,
+    $GLOBALS['XML_RPC_Array']    => 2,
+    $GLOBALS['XML_RPC_Struct']   => 3,
+);
+
+
+/**
+ * Error message numbers
+ * @global array $GLOBALS['XML_RPC_err']
+ */
+$GLOBALS['XML_RPC_err'] = array(
+    'unknown_method'      => 1,
+    'invalid_return'      => 2,
+    'incorrect_params'    => 3,
+    'introspect_unknown'  => 4,
+    'http_error'          => 5,
+    'not_response_object' => 6,
+    'invalid_request'     => 7,
+);
+
+/**
+ * Error message strings
+ * @global array $GLOBALS['XML_RPC_str']
+ */
+$GLOBALS['XML_RPC_str'] = array(
+    'unknown_method'      => 'Unknown method',
+    'invalid_return'      => 'Invalid return payload: enable debugging to examine incoming payload',
+    'incorrect_params'    => 'Incorrect parameters passed to method',
+    'introspect_unknown'  => 'Can\'t introspect: method unknown',
+    'http_error'          => 'Didn\'t receive 200 OK from remote server.',
+    'not_response_object' => 'The requested method didn\'t return an XML_RPC_Response object.',
+    'invalid_request'     => 'Invalid request payload',
+);
+
+
+/**
+ * Default XML encoding (ISO-8859-1, UTF-8 or US-ASCII)
+ * @global string $GLOBALS['XML_RPC_defencoding']
+ */
+$GLOBALS['XML_RPC_defencoding'] = 'UTF-8';
+
+/**
+ * User error codes start at 800
+ * @global int $GLOBALS['XML_RPC_erruser']
+ */
+$GLOBALS['XML_RPC_erruser'] = 800;
+
+/**
+ * XML parse error codes start at 100
+ * @global int $GLOBALS['XML_RPC_errxml']
+ */
+$GLOBALS['XML_RPC_errxml'] = 100;
+
+
+/**
+ * Compose backslashes for escaping regexp
+ * @global string $GLOBALS['XML_RPC_backslash']
+ */
+$GLOBALS['XML_RPC_backslash'] = chr(92) . chr(92);
+
+
+/**
+ * Valid parents of XML elements
+ * @global array $GLOBALS['XML_RPC_valid_parents']
+ */
+$GLOBALS['XML_RPC_valid_parents'] = array(
+    'BOOLEAN' => array('VALUE'),
+    'I4' => array('VALUE'),
+    'INT' => array('VALUE'),
+    'STRING' => array('VALUE'),
+    'DOUBLE' => array('VALUE'),
+    'DATETIME.ISO8601' => array('VALUE'),
+    'BASE64' => array('VALUE'),
+    'ARRAY' => array('VALUE'),
+    'STRUCT' => array('VALUE'),
+    'PARAM' => array('PARAMS'),
+    'METHODNAME' => array('METHODCALL'),
+    'PARAMS' => array('METHODCALL', 'METHODRESPONSE'),
+    'MEMBER' => array('STRUCT'),
+    'NAME' => array('MEMBER'),
+    'DATA' => array('ARRAY'),
+    'FAULT' => array('METHODRESPONSE'),
+    'VALUE' => array('MEMBER', 'DATA', 'PARAM', 'FAULT'),
+);
+
+
+/**
+ * Stores state during parsing
+ *
+ * quick explanation of components:
+ *   + ac     = accumulates values
+ *   + qt     = decides if quotes are needed for evaluation
+ *   + cm     = denotes struct or array (comma needed)
+ *   + isf    = indicates a fault
+ *   + lv     = indicates "looking for a value": implements the logic
+ *               to allow values with no types to be strings
+ *   + params = stores parameters in method calls
+ *   + method = stores method name
+ *
+ * @global array $GLOBALS['XML_RPC_xh']
+ */
+$GLOBALS['XML_RPC_xh'] = array();
+
+
+/**
+ * Start element handler for the XML parser
+ *
+ * @return void
+ */
+function XML_RPC_se($parser_resource, $name, $attrs)
+{
+    global $XML_RPC_xh, $XML_RPC_DateTime, $XML_RPC_String, $XML_RPC_valid_parents;
+    $parser = (int) $parser_resource;
+
+    // if invalid xmlrpc already detected, skip all processing
+    if ($XML_RPC_xh[$parser]['isf'] >= 2) {
+        return;
+    }
+
+    // check for correct element nesting
+    // top level element can only be of 2 types
+    if (count($XML_RPC_xh[$parser]['stack']) == 0) {
+        if ($name != 'METHODRESPONSE' && $name != 'METHODCALL') {
+            $XML_RPC_xh[$parser]['isf'] = 2;
+            $XML_RPC_xh[$parser]['isf_reason'] = 'missing top level xmlrpc element';
+            return;
+        }
+    } else {
+        // not top level element: see if parent is OK
+        if (!in_array($XML_RPC_xh[$parser]['stack'][0], $XML_RPC_valid_parents[$name])) {
+            $name = preg_replace('[^a-zA-Z0-9._-]', '', $name);
+            $XML_RPC_xh[$parser]['isf'] = 2;
+            $XML_RPC_xh[$parser]['isf_reason'] = "xmlrpc element $name cannot be child of {$XML_RPC_xh[$parser]['stack'][0]}";
+            return;
+        }
+    }
+
+    switch ($name) {
+    case 'STRUCT':
+        $XML_RPC_xh[$parser]['cm']++;
+
+        // turn quoting off
+        $XML_RPC_xh[$parser]['qt'] = 0;
+
+        $cur_val = array();
+        $cur_val['value'] = array();
+        $cur_val['members'] = 1;
+        array_unshift($XML_RPC_xh[$parser]['valuestack'], $cur_val);
+        break;
+
+    case 'ARRAY':
+        $XML_RPC_xh[$parser]['cm']++;
+
+        // turn quoting off
+        $XML_RPC_xh[$parser]['qt'] = 0;
+
+        $cur_val = array();
+        $cur_val['value'] = array();
+        $cur_val['members'] = 0;
+        array_unshift($XML_RPC_xh[$parser]['valuestack'], $cur_val);
+        break;
+
+    case 'NAME':
+        $XML_RPC_xh[$parser]['ac'] = '';
+        break;
+
+    case 'FAULT':
+        $XML_RPC_xh[$parser]['isf'] = 1;
+        break;
+
+    case 'PARAM':
+        $XML_RPC_xh[$parser]['valuestack'] = array();
+        break;
+
+    case 'VALUE':
+        $XML_RPC_xh[$parser]['lv'] = 1;
+        $XML_RPC_xh[$parser]['vt'] = $XML_RPC_String;
+        $XML_RPC_xh[$parser]['ac'] = '';
+        $XML_RPC_xh[$parser]['qt'] = 0;
+        // look for a value: if this is still 1 by the
+        // time we reach the first data segment then the type is string
+        // by implication and we need to add in a quote
+        break;
+
+    case 'I4':
+    case 'INT':
+    case 'STRING':
+    case 'BOOLEAN':
+    case 'DOUBLE':
+    case 'DATETIME.ISO8601':
+    case 'BASE64':
+        $XML_RPC_xh[$parser]['ac'] = ''; // reset the accumulator
+
+        if ($name == 'DATETIME.ISO8601' || $name == 'STRING') {
+            $XML_RPC_xh[$parser]['qt'] = 1;
+
+            if ($name == 'DATETIME.ISO8601') {
+                $XML_RPC_xh[$parser]['vt'] = $XML_RPC_DateTime;
+            }
+
+        } elseif ($name == 'BASE64') {
+            $XML_RPC_xh[$parser]['qt'] = 2;
+        } else {
+            // No quoting is required here -- but
+            // at the end of the element we must check
+            // for data format errors.
+            $XML_RPC_xh[$parser]['qt'] = 0;
+        }
+        break;
+
+    case 'MEMBER':
+        $XML_RPC_xh[$parser]['ac'] = '';
+        break;
+
+    case 'DATA':
+    case 'METHODCALL':
+    case 'METHODNAME':
+    case 'METHODRESPONSE':
+    case 'PARAMS':
+        // valid elements that add little to processing
+        break;
+    }
+
+
+    // Save current element to stack
+    array_unshift($XML_RPC_xh[$parser]['stack'], $name);
+
+    if ($name != 'VALUE') {
+        $XML_RPC_xh[$parser]['lv'] = 0;
+    }
+}
+
+/**
+ * End element handler for the XML parser
+ *
+ * @return void
+ */
+function XML_RPC_ee($parser_resource, $name)
+{
+    global $XML_RPC_xh, $XML_RPC_Types, $XML_RPC_String;
+    $parser = (int) $parser_resource;
+
+    if ($XML_RPC_xh[$parser]['isf'] >= 2) {
+        return;
+    }
+
+    // push this element from stack
+    // NB: if XML validates, correct opening/closing is guaranteed and
+    // we do not have to check for $name == $curr_elem.
+    // we also checked for proper nesting at start of elements...
+    $curr_elem = array_shift($XML_RPC_xh[$parser]['stack']);
+
+    switch ($name) {
+    case 'STRUCT':
+    case 'ARRAY':
+    $cur_val = array_shift($XML_RPC_xh[$parser]['valuestack']);
+    $XML_RPC_xh[$parser]['value'] = $cur_val['value'];
+        $XML_RPC_xh[$parser]['vt'] = strtolower($name);
+        $XML_RPC_xh[$parser]['cm']--;
+        break;
+
+    case 'NAME':
+    $XML_RPC_xh[$parser]['valuestack'][0]['name'] = $XML_RPC_xh[$parser]['ac'];
+        break;
+
+    case 'BOOLEAN':
+        // special case here: we translate boolean 1 or 0 into PHP
+        // constants true or false
+        if ($XML_RPC_xh[$parser]['ac'] == '1') {
+            $XML_RPC_xh[$parser]['ac'] = 'true';
+        } else {
+            $XML_RPC_xh[$parser]['ac'] = 'false';
+        }
+
+        $XML_RPC_xh[$parser]['vt'] = strtolower($name);
+        // Drop through intentionally.
+
+    case 'I4':
+    case 'INT':
+    case 'STRING':
+    case 'DOUBLE':
+    case 'DATETIME.ISO8601':
+    case 'BASE64':
+        if ($XML_RPC_xh[$parser]['qt'] == 1) {
+            // we use double quotes rather than single so backslashification works OK
+            $XML_RPC_xh[$parser]['value'] = $XML_RPC_xh[$parser]['ac'];
+        } elseif ($XML_RPC_xh[$parser]['qt'] == 2) {
+            $XML_RPC_xh[$parser]['value'] = base64_decode($XML_RPC_xh[$parser]['ac']);
+        } elseif ($name == 'BOOLEAN') {
+            $XML_RPC_xh[$parser]['value'] = $XML_RPC_xh[$parser]['ac'];
+        } else {
+            // we have an I4, INT or a DOUBLE
+            // we must check that only 0123456789-.<space> are characters here
+            if (!ereg("^[+-]?[0123456789 \t\.]+$", $XML_RPC_xh[$parser]['ac'])) {
+                XML_RPC_Base::raiseError('Non-numeric value received in INT or DOUBLE',
+                                         XML_RPC_ERROR_NON_NUMERIC_FOUND);
+                $XML_RPC_xh[$parser]['value'] = XML_RPC_ERROR_NON_NUMERIC_FOUND;
+            } else {
+                // it's ok, add it on
+                $XML_RPC_xh[$parser]['value'] = $XML_RPC_xh[$parser]['ac'];
+            }
+        }
+
+        $XML_RPC_xh[$parser]['ac'] = '';
+        $XML_RPC_xh[$parser]['qt'] = 0;
+        $XML_RPC_xh[$parser]['lv'] = 3; // indicate we've found a value
+        break;
+
+    case 'VALUE':
+        // deal with a string value
+        if (strlen($XML_RPC_xh[$parser]['ac']) > 0 &&
+            $XML_RPC_xh[$parser]['vt'] == $XML_RPC_String) {
+            $XML_RPC_xh[$parser]['value'] = $XML_RPC_xh[$parser]['ac'];
+        }
+
+        $temp = new XML_RPC_Value($XML_RPC_xh[$parser]['value'], $XML_RPC_xh[$parser]['vt']);
+
+        $cur_val = array_shift($XML_RPC_xh[$parser]['valuestack']);
+        if (is_array($cur_val)) {
+            if ($cur_val['members']==0) {
+                $cur_val['value'][] = $temp;
+            } else {
+                $XML_RPC_xh[$parser]['value'] = $temp;
+            }
+            array_unshift($XML_RPC_xh[$parser]['valuestack'], $cur_val);
+        } else {
+            $XML_RPC_xh[$parser]['value'] = $temp;
+        }
+        break;
+
+    case 'MEMBER':
+        $XML_RPC_xh[$parser]['ac'] = '';
+        $XML_RPC_xh[$parser]['qt'] = 0;
+
+        $cur_val = array_shift($XML_RPC_xh[$parser]['valuestack']);
+        if (is_array($cur_val)) {
+            if ($cur_val['members']==1) {
+                $cur_val['value'][$cur_val['name']] = $XML_RPC_xh[$parser]['value'];
+            }
+            array_unshift($XML_RPC_xh[$parser]['valuestack'], $cur_val);
+        }
+        break;
+
+    case 'DATA':
+        $XML_RPC_xh[$parser]['ac'] = '';
+        $XML_RPC_xh[$parser]['qt'] = 0;
+        break;
+
+    case 'PARAM':
+        $XML_RPC_xh[$parser]['params'][] = $XML_RPC_xh[$parser]['value'];
+        break;
+
+    case 'METHODNAME':
+    case 'RPCMETHODNAME':
+        $XML_RPC_xh[$parser]['method'] = ereg_replace("^[\n\r\t ]+", '',
+                                                      $XML_RPC_xh[$parser]['ac']);
+        break;
+    }
+
+    // if it's a valid type name, set the type
+    if (isset($XML_RPC_Types[strtolower($name)])) {
+        $XML_RPC_xh[$parser]['vt'] = strtolower($name);
+    }
+}
+
+/**
+ * Character data handler for the XML parser
+ *
+ * @return void
+ */
+function XML_RPC_cd($parser_resource, $data)
+{
+    global $XML_RPC_xh, $XML_RPC_backslash;
+    $parser = (int) $parser_resource;
+
+    if ($XML_RPC_xh[$parser]['lv'] != 3) {
+        // "lookforvalue==3" means that we've found an entire value
+        // and should discard any further character data
+
+        if ($XML_RPC_xh[$parser]['lv'] == 1) {
+            // if we've found text and we're just in a <value> then
+            // turn quoting on, as this will be a string
+            $XML_RPC_xh[$parser]['qt'] = 1;
+            // and say we've found a value
+            $XML_RPC_xh[$parser]['lv'] = 2;
+        }
+
+        // replace characters that eval would
+        // do special things with
+        if (!isset($XML_RPC_xh[$parser]['ac'])) {
+            $XML_RPC_xh[$parser]['ac'] = '';
+        }
+        $XML_RPC_xh[$parser]['ac'] .= $data;
+    }
+}
+
+/**
+ * The common methods and properties for all of the XML_RPC classes
+ *
+ * @category   Web Services
+ * @package    XML_RPC
+ * @author     Edd Dumbill <edd@usefulinc.com>
+ * @author     Stig Bakken <stig@php.net>
+ * @author     Martin Jansen <mj@php.net>
+ * @author     Daniel Convissor <danielc@php.net>
+ * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
+ * @version    Release: 1.4.0
+ * @link       http://pear.php.net/package/XML_RPC
+ */
+class XML_RPC_Base {
+
+    /**
+     * PEAR Error handling
+     *
+     * @return object  PEAR_Error object
+     */
+    function raiseError($msg, $code)
+    {
+        include_once 'PEAR.php';
+        if (is_object(@$this)) {
+            return PEAR::raiseError(get_class($this) . ': ' . $msg, $code);
+        } else {
+            return PEAR::raiseError('XML_RPC: ' . $msg, $code);
+        }
+    }
+
+    /**
+     * Tell whether something is a PEAR_Error object
+     *
+     * @param mixed $value  the item to check
+     *
+     * @return bool  whether $value is a PEAR_Error object or not
+     *
+     * @access public
+     */
+    function isError($value)
+    {
+        return is_a($value, 'PEAR_Error');
+    }
+}
+
+/**
+ * The methods and properties for submitting XML RPC requests
+ *
+ * @category   Web Services
+ * @package    XML_RPC
+ * @author     Edd Dumbill <edd@usefulinc.com>
+ * @author     Stig Bakken <stig@php.net>
+ * @author     Martin Jansen <mj@php.net>
+ * @author     Daniel Convissor <danielc@php.net>
+ * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
+ * @version    Release: 1.4.0
+ * @link       http://pear.php.net/package/XML_RPC
+ */
+class XML_RPC_Client extends XML_RPC_Base {
+
+    /**
+     * The path and name of the RPC server script you want the request to go to
+     * @var string
+     */
+    var $path = '';
+
+    /**
+     * The name of the remote server to connect to
+     * @var string
+     */
+    var $server = '';
+
+    /**
+     * The protocol to use in contacting the remote server
+     * @var string
+     */
+    var $protocol = 'http://';
+
+    /**
+     * The port for connecting to the remote server
+     *
+     * The default is 80 for http:// connections
+     * and 443 for https:// and ssl:// connections.
+     *
+     * @var integer
+     */
+    var $port = 80;
+
+    /**
+     * A user name for accessing the RPC server
+     * @var string
+     * @see XML_RPC_Client::setCredentials()
+     */
+    var $username = '';
+
+    /**
+     * A password for accessing the RPC server
+     * @var string
+     * @see XML_RPC_Client::setCredentials()
+     */
+    var $password = '';
+
+    /**
+     * The name of the proxy server to use, if any
+     * @var string
+     */
+    var $proxy = '';
+
+    /**
+     * The protocol to use in contacting the proxy server, if any
+     * @var string
+     */
+    var $proxy_protocol = 'http://';
+
+    /**
+     * The port for connecting to the proxy server
+     *
+     * The default is 8080 for http:// connections
+     * and 443 for https:// and ssl:// connections.
+     *
+     * @var integer
+     */
+    var $proxy_port = 8080;
+
+    /**
+     * A user name for accessing the proxy server
+     * @var string
+     */
+    var $proxy_user = '';
+
+    /**
+     * A password for accessing the proxy server
+     * @var string
+     */
+    var $proxy_pass = '';
+
+    /**
+     * The error number, if any
+     * @var integer
+     */
+    var $errno = 0;
+
+    /**
+     * The error message, if any
+     * @var string
+     */
+    var $errstr = '';
+
+    /**
+     * The current debug mode (1 = on, 0 = off)
+     * @var integer
+     */
+    var $debug = 0;
+
+    /**
+     * The HTTP headers for the current request.
+     * @var string
+     */
+    var $headers = '';
+
+
+    /**
+     * Sets the object's properties
+     *
+     * @param string  $path        the path and name of the RPC server script
+     *                              you want the request to go to
+     * @param string  $server      the URL of the remote server to connect to.
+     *                              If this parameter doesn't specify a
+     *                              protocol and $port is 443, ssl:// is
+     *                              assumed.
+     * @param integer $port        a port for connecting to the remote server.
+     *                              Defaults to 80 for http:// connections and
+     *                              443 for https:// and ssl:// connections.
+     * @param string  $proxy       the URL of the proxy server to use, if any.
+     *                              If this parameter doesn't specify a
+     *                              protocol and $port is 443, ssl:// is
+     *                              assumed.
+     * @param integer $proxy_port  a port for connecting to the remote server.
+     *                              Defaults to 8080 for http:// connections and
+     *                              443 for https:// and ssl:// connections.
+     * @param string  $proxy_user  a user name for accessing the proxy server
+     * @param string  $proxy_pass  a password for accessing the proxy server
+     *
+     * @return void
+     */
+    function XML_RPC_Client($path, $server, $port = 0,
+                            $proxy = '', $proxy_port = 0,
+                            $proxy_user = '', $proxy_pass = '')
+    {
+        $this->path       = $path;
+        $this->proxy_user = $proxy_user;
+        $this->proxy_pass = $proxy_pass;
+
+        preg_match('@^(http://|https://|ssl://)?(.*)$@', $server, $match);
+        if ($match[1] == '') {
+            if ($port == 443) {
+                $this->server   = $match[2];
+                $this->protocol = 'ssl://';
+                $this->port     = 443;
+            } else {
+                $this->server = $match[2];
+                if ($port) {
+                    $this->port = $port;
+                }
+            }
+        } elseif ($match[1] == 'http://') {
+            $this->server = $match[2];
+            if ($port) {
+                $this->port = $port;
+            }
+        } else {
+            $this->server   = $match[2];
+            $this->protocol = 'ssl://';
+            if ($port) {
+                $this->port = $port;
+            } else {
+                $this->port = 443;
+            }
+        }
+
+        if ($proxy) {
+            preg_match('@^(http://|https://|ssl://)?(.*)$@', $proxy, $match);
+            if ($match[1] == '') {
+                if ($proxy_port == 443) {
+                    $this->proxy          = $match[2];
+                    $this->proxy_protocol = 'ssl://';
+                    $this->proxy_port     = 443;
+                } else {
+                    $this->proxy = $match[2];
+                    if ($proxy_port) {
+                        $this->proxy_port = $proxy_port;
+                    }
+                }
+            } elseif ($match[1] == 'http://') {
+                $this->proxy = $match[2];
+                if ($proxy_port) {
+                    $this->proxy_port = $proxy_port;
+                }
+            } else {
+                $this->proxy          = $match[2];
+                $this->proxy_protocol = 'ssl://';
+                if ($proxy_port) {
+                    $this->proxy_port = $proxy_port;
+                } else {
+                    $this->proxy_port = 443;
+                }
+            }
+        }
+    }
+
+    /**
+     * Change the current debug mode
+     *
+     * @param int $in  where 1 = on, 0 = off
+     *
+     * @return void
+     */
+    function setDebug($in)
+    {
+        if ($in) {
+            $this->debug = 1;
+        } else {
+            $this->debug = 0;
+        }
+    }
+
+    /**
+     * Set username and password properties for connecting to the RPC server
+     *
+     * @param string $u  the user name
+     * @param string $p  the password
+     *
+     * @return void
+     *
+     * @see XML_RPC_Client::$username, XML_RPC_Client::$password
+     */
+    function setCredentials($u, $p)
+    {
+        $this->username = $u;
+        $this->password = $p;
+    }
+
+    /**
+     * Transmit the RPC request via HTTP 1.0 protocol
+     *
+     * @param object $msg       the XML_RPC_Message object
+     * @param int    $timeout   how many seconds to wait for the request
+     *
+     * @return object  an XML_RPC_Response object.  0 is returned if any
+     *                  problems happen.
+     *
+     * @see XML_RPC_Message, XML_RPC_Client::XML_RPC_Client(),
+     *      XML_RPC_Client::setCredentials()
+     */
+    function send($msg, $timeout = 0)
+    {
+        if (strtolower(get_class($msg)) != 'xml_rpc_message') {
+            $this->errstr = 'send()\'s $msg parameter must be an'
+                          . ' XML_RPC_Message object.';
+            $this->raiseError($this->errstr, XML_RPC_ERROR_PROGRAMMING);
+            return 0;
+        }
+        $msg->debug = $this->debug;
+        return $this->sendPayloadHTTP10($msg, $this->server, $this->port,
+                                        $timeout, $this->username,
+                                        $this->password);
+    }
+
+    /**
+     * Transmit the RPC request via HTTP 1.0 protocol
+     *
+     * Requests should be sent using XML_RPC_Client send() rather than
+     * calling this method directly.
+     *
+     * @param object $msg       the XML_RPC_Message object
+     * @param string $server    the server to send the request to
+     * @param int    $port      the server port send the request to
+     * @param int    $timeout   how many seconds to wait for the request
+     *                           before giving up
+     * @param string $username  a user name for accessing the RPC server
+     * @param string $password  a password for accessing the RPC server
+     *
+     * @return object  an XML_RPC_Response object.  0 is returned if any
+     *                  problems happen.
+     *
+     * @access protected
+     * @see XML_RPC_Client::send()
+     */
+    function sendPayloadHTTP10($msg, $server, $port, $timeout = 0,
+                               $username = '', $password = '')
+    {
+        /*
+         * If we're using a proxy open a socket to the proxy server
+         * instead to the xml-rpc server
+         */
+        if ($this->proxy) {
+            if ($this->proxy_protocol == 'http://') {
+                $protocol = '';
+            } else {
+                $protocol = $this->proxy_protocol;
+            }
+            if ($timeout > 0) {
+                $fp = @fsockopen($protocol . $this->proxy, $this->proxy_port,
+                                 $this->errno, $this->errstr, $timeout);
+            } else {
+                $fp = @fsockopen($protocol . $this->proxy, $this->proxy_port,
+                                 $this->errno, $this->errstr);
+            }
+        } else {
+            if ($this->protocol == 'http://') {
+                $protocol = '';
+            } else {
+                $protocol = $this->protocol;
+            }
+            if ($timeout > 0) {
+                $fp = @fsockopen($protocol . $server, $port,
+                                 $this->errno, $this->errstr, $timeout);
+            } else {
+                $fp = @fsockopen($protocol . $server, $port,
+                                 $this->errno, $this->errstr);
+            }
+        }
+
+        /*
+         * Just raising the error without returning it is strange,
+         * but keep it here for backwards compatibility.
+         */
+        if (!$fp && $this->proxy) {
+            $this->raiseError('Connection to proxy server '
+                              . $this->proxy . ':' . $this->proxy_port
+                              . ' failed. ' . $this->errstr,
+                              XML_RPC_ERROR_CONNECTION_FAILED);
+            return 0;
+        } elseif (!$fp) {
+            $this->raiseError('Connection to RPC server '
+                              . $server . ':' . $port
+                              . ' failed. ' . $this->errstr,
+                              XML_RPC_ERROR_CONNECTION_FAILED);
+            return 0;
+        }
+
+        if ($timeout) {
+            /*
+             * Using socket_set_timeout() because stream_set_timeout()
+             * was introduced in 4.3.0, but we need to support 4.2.0.
+             */
+            socket_set_timeout($fp, $timeout);
+        }
+
+        // Pre-emptive BC hacks for fools calling sendPayloadHTTP10() directly
+        if ($username != $this->username) {
+            $this->setCredentials($username, $password);
+        }
+
+        // Only create the payload if it was not created previously
+        if (empty($msg->payload)) {
+            $msg->createPayload();
+        }
+        $this->createHeaders($msg);
+
+        $op  = $this->headers . "\r\n\r\n";
+        $op .= $msg->payload;
+
+        if (!fputs($fp, $op, strlen($op))) {
+            $this->errstr = 'Write error';
+            return 0;
+        }
+        $resp = $msg->parseResponseFile($fp);
+
+        $meta = socket_get_status($fp);
+        if ($meta['timed_out']) {
+            fclose($fp);
+            $this->errstr = 'RPC server did not send response before timeout.';
+            $this->raiseError($this->errstr, XML_RPC_ERROR_CONNECTION_FAILED);
+            return 0;
+        }
+
+        fclose($fp);
+        return $resp;
+    }
+
+    /**
+     * Determines the HTTP headers and puts it in the $headers property
+     *
+     * @param object $msg       the XML_RPC_Message object
+     *
+     * @return boolean  TRUE if okay, FALSE if the message payload isn't set.
+     *
+     * @access protected
+     */
+    function createHeaders($msg)
+    {
+        if (empty($msg->payload)) {
+            return false;
+        }
+        if ($this->proxy) {
+            $this->headers = 'POST ' . $this->protocol . $this->server;
+            if ($this->proxy_port) {
+                $this->headers .= ':' . $this->port;
+            }
+        } else {
+           $this->headers = 'POST ';
+        }
+        $this->headers .= $this->path. " HTTP/1.0\r\n";
+
+        $this->headers .= "User-Agent: PEAR XML_RPC\r\n";
+        $this->headers .= 'Host: ' . $this->server . "\r\n";
+
+        if ($this->proxy && $this->proxy_user) {
+            $this->headers .= 'Proxy-Authorization: Basic '
+                     . base64_encode("$this->proxy_user:$this->proxy_pass")
+                     . "\r\n";
+        }
+
+        // thanks to Grant Rauscher <grant7@firstworld.net> for this
+        if ($this->username) {
+            $this->headers .= 'Authorization: Basic '
+                     . base64_encode("$this->username:$this->password")
+                     . "\r\n";
+        }
+
+        $this->headers .= "Content-Type: text/xml\r\n";
+        $this->headers .= 'Content-Length: ' . strlen($msg->payload);
+        return true;
+    }
+}
+
+/**
+ * The methods and properties for interpreting responses to XML RPC requests
+ *
+ * @category   Web Services
+ * @package    XML_RPC
+ * @author     Edd Dumbill <edd@usefulinc.com>
+ * @author     Stig Bakken <stig@php.net>
+ * @author     Martin Jansen <mj@php.net>
+ * @author     Daniel Convissor <danielc@php.net>
+ * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
+ * @version    Release: 1.4.0
+ * @link       http://pear.php.net/package/XML_RPC
+ */
+class XML_RPC_Response extends XML_RPC_Base
+{
+    var $xv;
+    var $fn;
+    var $fs;
+    var $hdrs;
+
+    /**
+     * @return void
+     */
+    function XML_RPC_Response($val, $fcode = 0, $fstr = '')
+    {
+        if ($fcode != 0) {
+            $this->fn = $fcode;
+            $this->fs = htmlspecialchars($fstr);
+        } else {
+            $this->xv = $val;
+        }
+    }
+
+    /**
+     * @return int  the error code
+     */
+    function faultCode()
+    {
+        if (isset($this->fn)) {
+            return $this->fn;
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * @return string  the error string
+     */
+    function faultString()
+    {
+        return $this->fs;
+    }
+
+    /**
+     * @return mixed  the value
+     */
+    function value()
+    {
+        return $this->xv;
+    }
+
+    /**
+     * @return string  the error message in XML format
+     */
+    function serialize()
+    {
+        $rs = "<methodResponse>\n";
+        if ($this->fn) {
+            $rs .= "<fault>
+  <value>
+    <struct>
+      <member>
+        <name>faultCode</name>
+        <value><int>" . $this->fn . "</int></value>
+      </member>
+      <member>
+        <name>faultString</name>
+        <value><string>" . $this->fs . "</string></value>
+      </member>
+    </struct>
+  </value>
+</fault>";
+        } else {
+            $rs .= "<params>\n<param>\n" . $this->xv->serialize() .
+        "</param>\n</params>";
+        }
+        $rs .= "\n</methodResponse>";
+        return $rs;
+    }
+}
+
+/**
+ * The methods and properties for composing XML RPC messages
+ *
+ * @category   Web Services
+ * @package    XML_RPC
+ * @author     Edd Dumbill <edd@usefulinc.com>
+ * @author     Stig Bakken <stig@php.net>
+ * @author     Martin Jansen <mj@php.net>
+ * @author     Daniel Convissor <danielc@php.net>
+ * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
+ * @version    Release: 1.4.0
+ * @link       http://pear.php.net/package/XML_RPC
+ */
+class XML_RPC_Message extends XML_RPC_Base
+{
+    /**
+     * The current debug mode (1 = on, 0 = off)
+     * @var integer
+     */
+    var $debug = 0;
+
+    /**
+     * The encoding to be used for outgoing messages
+     *
+     * Defaults to the value of <var>$GLOBALS['XML_RPC_defencoding']</var>
+     *
+     * @var string
+     * @see XML_RPC_Message::setSendEncoding(),
+     *      $GLOBALS['XML_RPC_defencoding'], XML_RPC_Message::xml_header()
+     */
+    var $send_encoding = '';
+
+    /**
+     * The method presently being evaluated
+     * @var string
+     */
+    var $methodname = '';
+
+    /**
+     * @var array
+     */
+    var $params = array();
+
+    /**
+     * The XML message being generated
+     * @var string
+     */
+    var $payload = '';
+
+    /**
+     * @return void
+     */
+    function XML_RPC_Message($meth, $pars = 0)
+    {
+        $this->methodname = $meth;
+        if (is_array($pars) && sizeof($pars) > 0) {
+            for ($i = 0; $i < sizeof($pars); $i++) {
+                $this->addParam($pars[$i]);
+            }
+        }
+    }
+
+    /**
+     * Produces the XML declaration including the encoding attribute
+     *
+     * The encoding is determined by this class' <var>$send_encoding</var>
+     * property.  If the <var>$send_encoding</var> property is not set, use
+     * <var>$GLOBALS['XML_RPC_defencoding']</var>.
+     *
+     * @return string  the XML declaration and <methodCall> element
+     *
+     * @see XML_RPC_Message::setSendEncoding(),
+     *      XML_RPC_Message::$send_encoding, $GLOBALS['XML_RPC_defencoding']
+     */
+    function xml_header()
+    {
+        global $XML_RPC_defencoding;
+        if (!$this->send_encoding) {
+            $this->send_encoding = $XML_RPC_defencoding;
+        }
+        return '<?xml version="1.0" encoding="' . $this->send_encoding . '"?>'
+               . "\n<methodCall>\n";
+    }
+
+    /**
+     * @return string  the closing </methodCall> tag
+     */
+    function xml_footer()
+    {
+        return "</methodCall>\n";
+    }
+
+    /**
+     * @return void
+     *
+     * @uses XML_RPC_Message::xml_header(), XML_RPC_Message::xml_footer()
+     */
+    function createPayload()
+    {
+        $this->payload = $this->xml_header();
+        $this->payload .= '<methodName>' . $this->methodname . "</methodName>\n";
+        $this->payload .= "<params>\n";
+        for ($i = 0; $i < sizeof($this->params); $i++) {
+            $p = $this->params[$i];
+            $this->payload .= "<param>\n" . $p->serialize() . "</param>\n";
+        }
+        $this->payload .= "</params>\n";
+        $this->payload .= $this->xml_footer();
+        $this->payload = ereg_replace("[\r\n]+", "\r\n", $this->payload);
+    }
+
+    /**
+     * @return string  the name of the method
+     */
+    function method($meth = '')
+    {
+        if ($meth != '') {
+            $this->methodname = $meth;
+        }
+        return $this->methodname;
+    }
+
+    /**
+     * @return string  the payload
+     */
+    function serialize()
+    {
+        $this->createPayload();
+        return $this->payload;
+    }
+
+    /**
+     * @return void
+     */
+    function addParam($par)
+    {
+        $this->params[] = $par;
+    }
+
+    /**
+     * Obtains an XML_RPC_Value object for the given parameter
+     *
+     * @param int $i  the index number of the parameter to obtain
+     *
+     * @return object  the XML_RPC_Value object.
+     *                  If the parameter doesn't exist, an XML_RPC_Response object.
+     *
+     * @since Returns XML_RPC_Response object on error since Release 1.3.0
+     */
+    function getParam($i)
+    {
+        global $XML_RPC_err, $XML_RPC_str;
+
+        if (isset($this->params[$i])) {
+            return $this->params[$i];
+        } else {
+            $this->raiseError('The submitted request did not contain this parameter',
+                              XML_RPC_ERROR_INCORRECT_PARAMS);
+            return new XML_RPC_Response(0, $XML_RPC_err['incorrect_params'],
+                                        $XML_RPC_str['incorrect_params']);
+        }
+    }
+
+    /**
+     * @return int  the number of parameters
+     */
+    function getNumParams()
+    {
+        return sizeof($this->params);
+    }
+
+    /**
+     * Sets the XML declaration's encoding attribute
+     *
+     * @param string $type  the encoding type (ISO-8859-1, UTF-8 or US-ASCII)
+     *
+     * @return void
+     *
+     * @see XML_RPC_Message::$send_encoding, XML_RPC_Message::xml_header()
+     * @since Method available since Release 1.2.0
+     */
+    function setSendEncoding($type)
+    {
+        $this->send_encoding = $type;
+    }
+
+    /**
+     * Determine the XML's encoding via the encoding attribute
+     * in the XML declaration
+     *
+     * If the encoding parameter is not set or is not ISO-8859-1, UTF-8
+     * or US-ASCII, $XML_RPC_defencoding will be returned.
+     *
+     * @param string $data  the XML that will be parsed
+     *
+     * @return string  the encoding to be used
+     *
+     * @link   http://php.net/xml_parser_create
+     * @since  Method available since Release 1.2.0
+     */
+    function getEncoding($data)
+    {
+        global $XML_RPC_defencoding;
+
+        if (preg_match('/<\?xml[^>]*\s*encoding\s*=\s*[\'"]([^"\']*)[\'"]/i',
+                       $data, $match))
+        {
+            $match[1] = trim(strtoupper($match[1]));
+            switch ($match[1]) {
+                case 'ISO-8859-1':
+                case 'UTF-8':
+                case 'US-ASCII':
+                    return $match[1];
+                    break;
+
+                default:
+                    return $XML_RPC_defencoding;
+            }
+        } else {
+            return $XML_RPC_defencoding;
+        }
+    }
+
+    /**
+     * @return object  a new XML_RPC_Response object
+     */
+    function parseResponseFile($fp)
+    {
+        $ipd = '';
+        while ($data = @fread($fp, 8192)) {
+            $ipd .= $data;
+        }
+        return $this->parseResponse($ipd);
+    }
+
+    /**
+     * @return object  a new XML_RPC_Response object
+     */
+    function parseResponse($data = '')
+    {
+        global $XML_RPC_xh, $XML_RPC_err, $XML_RPC_str, $XML_RPC_defencoding;
+
+        $encoding = $this->getEncoding($data);
+        $parser_resource = xml_parser_create($encoding);
+        $parser = (int) $parser_resource;
+
+        $XML_RPC_xh = array();
+        $XML_RPC_xh[$parser] = array();
+
+        $XML_RPC_xh[$parser]['cm'] = 0;
+        $XML_RPC_xh[$parser]['isf'] = 0;
+        $XML_RPC_xh[$parser]['ac'] = '';
+        $XML_RPC_xh[$parser]['qt'] = '';
+        $XML_RPC_xh[$parser]['stack'] = array();
+        $XML_RPC_xh[$parser]['valuestack'] = array();
+
+        xml_parser_set_option($parser_resource, XML_OPTION_CASE_FOLDING, true);
+        xml_set_element_handler($parser_resource, 'XML_RPC_se', 'XML_RPC_ee');
+        xml_set_character_data_handler($parser_resource, 'XML_RPC_cd');
+
+        $hdrfnd = 0;
+        if ($this->debug) {
+            print "\n<pre>---GOT---\n";
+            print isset($_SERVER['SERVER_PROTOCOL']) ? htmlspecialchars($data) : $data;
+            print "\n---END---</pre>\n";
+        }
+
+        // See if response is a 200 or a 100 then a 200, else raise error.
+        // But only do this if we're using the HTTP protocol.
+        if (ereg('^HTTP', $data) &&
+            !ereg('^HTTP/[0-9\.]+ 200 ', $data) &&
+            !preg_match('@^HTTP/[0-9\.]+ 10[0-9]([A-Za-z ]+)?[\r\n]+HTTP/[0-9\.]+ 200@', $data))
+        {
+                $errstr = substr($data, 0, strpos($data, "\n") - 1);
+                if(defined("DEBUG") && DEBUG) {error_log('HTTP error, got response: ' . $errstr);}
+                $r = new XML_RPC_Response(0, $XML_RPC_err['http_error'],
+                                          $XML_RPC_str['http_error'] . ' (' .
+                                          $errstr . ')');
+                xml_parser_free($parser_resource);
+                return $r;
+        }
+
+        // gotta get rid of headers here
+        if (!$hdrfnd && ($brpos = strpos($data,"\r\n\r\n"))) {
+            $XML_RPC_xh[$parser]['ha'] = substr($data, 0, $brpos);
+            $data = substr($data, $brpos + 4);
+            $hdrfnd = 1;
+        }
+
+        /*
+         * be tolerant of junk after methodResponse
+         * (e.g. javascript automatically inserted by free hosts)
+         * thanks to Luca Mariano <luca.mariano@email.it>
+         */
+        $data = substr($data, 0, strpos($data, "</methodResponse>") + 17);
+
+        if (!xml_parse($parser_resource, $data, sizeof($data))) {
+            // thanks to Peter Kocks <peter.kocks@baygate.com>
+            if (xml_get_current_line_number($parser_resource) == 1) {
+                $errstr = 'XML error at line 1, check URL';
+            } else {
+                $errstr = sprintf('XML error: %s at line %d',
+                                  xml_error_string(xml_get_error_code($parser_resource)),
+                                  xml_get_current_line_number($parser_resource));
+            }
+            if(defined("DEBUG") && DEBUG) {error_log($errstr);}
+            $r = new XML_RPC_Response(0, $XML_RPC_err['invalid_return'],
+                                      $XML_RPC_str['invalid_return']);
+            xml_parser_free($parser_resource);
+            return $r;
+        }
+
+        xml_parser_free($parser_resource);
+
+        if ($this->debug) {
+            print "\n<pre>---PARSED---\n";
+            var_dump($XML_RPC_xh[$parser]['value']);
+            print "---END---</pre>\n";
+        }
+
+        if ($XML_RPC_xh[$parser]['isf'] > 1) {
+            $r = new XML_RPC_Response(0, $XML_RPC_err['invalid_return'],
+                                      $XML_RPC_str['invalid_return'].' '.$XML_RPC_xh[$parser]['isf_reason']);
+        } elseif (!is_object($XML_RPC_xh[$parser]['value'])) {
+            // then something odd has happened
+            // and it's time to generate a client side error
+            // indicating something odd went on
+            $r = new XML_RPC_Response(0, $XML_RPC_err['invalid_return'],
+                                      $XML_RPC_str['invalid_return']);
+        } else {
+            $v = $XML_RPC_xh[$parser]['value'];
+            $allOK=1;
+            if ($XML_RPC_xh[$parser]['isf']) {
+                $f = $v->structmem('faultCode');
+                $fs = $v->structmem('faultString');
+                $r = new XML_RPC_Response($v, $f->scalarval(),
+                                          $fs->scalarval());
+            } else {
+                $r = new XML_RPC_Response($v);
+            }
+        }
+        $r->hdrs = split("\r?\n", $XML_RPC_xh[$parser]['ha'][1]);
+        return $r;
+    }
+}
+
+/**
+ * The methods and properties that represent data in XML RPC format
+ *
+ * @category   Web Services
+ * @package    XML_RPC
+ * @author     Edd Dumbill <edd@usefulinc.com>
+ * @author     Stig Bakken <stig@php.net>
+ * @author     Martin Jansen <mj@php.net>
+ * @author     Daniel Convissor <danielc@php.net>
+ * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
+ * @version    Release: 1.4.0
+ * @link       http://pear.php.net/package/XML_RPC
+ */
+class XML_RPC_Value extends XML_RPC_Base
+{
+    var $me = array();
+    var $mytype = 0;
+
+    /**
+     * @return void
+     */
+    function XML_RPC_Value($val = -1, $type = '')
+    {
+        global $XML_RPC_Types;
+        $this->me = array();
+        $this->mytype = 0;
+        if ($val != -1 || $type != '') {
+            if ($type == '') {
+                $type = 'string';
+            }
+            if (!array_key_exists($type, $XML_RPC_Types)) {
+                // XXX
+                // need some way to report this error
+            } elseif ($XML_RPC_Types[$type] == 1) {
+                $this->addScalar($val, $type);
+            } elseif ($XML_RPC_Types[$type] == 2) {
+                $this->addArray($val);
+            } elseif ($XML_RPC_Types[$type] == 3) {
+                $this->addStruct($val);
+            }
+        }
+    }
+
+    /**
+     * @return int  returns 1 if successful or 0 if there are problems
+     */
+    function addScalar($val, $type = 'string')
+    {
+        global $XML_RPC_Types, $XML_RPC_Boolean;
+
+        if ($this->mytype == 1) {
+            $this->raiseError('Scalar can have only one value',
+                              XML_RPC_ERROR_INVALID_TYPE);
+            return 0;
+        }
+        $typeof = $XML_RPC_Types[$type];
+        if ($typeof != 1) {
+            $this->raiseError("Not a scalar type (${typeof})",
+                              XML_RPC_ERROR_INVALID_TYPE);
+            return 0;
+        }
+
+        if ($type == $XML_RPC_Boolean) {
+            if (strcasecmp($val, 'true') == 0
+                || $val == 1
+                || ($val == true && strcasecmp($val, 'false')))
+            {
+                $val = 1;
+            } else {
+                $val = 0;
+            }
+        }
+
+        if ($this->mytype == 2) {
+            // we're adding to an array here
+            $ar = $this->me['array'];
+            $ar[] = new XML_RPC_Value($val, $type);
+            $this->me['array'] = $ar;
+        } else {
+            // a scalar, so set the value and remember we're scalar
+            $this->me[$type] = $val;
+            $this->mytype = $typeof;
+        }
+        return 1;
+    }
+
+    /**
+     * @return int  returns 1 if successful or 0 if there are problems
+     */
+    function addArray($vals)
+    {
+        global $XML_RPC_Types;
+        if ($this->mytype != 0) {
+            $this->raiseError(
+                    'Already initialized as a [' . $this->kindOf() . ']',
+                    XML_RPC_ERROR_ALREADY_INITIALIZED);
+            return 0;
+        }
+        $this->mytype = $XML_RPC_Types['array'];
+        $this->me['array'] = $vals;
+        return 1;
+    }
+
+    /**
+     * @return int  returns 1 if successful or 0 if there are problems
+     */
+    function addStruct($vals)
+    {
+        global $XML_RPC_Types;
+        if ($this->mytype != 0) {
+            $this->raiseError(
+                    'Already initialized as a [' . $this->kindOf() . ']',
+                    XML_RPC_ERROR_ALREADY_INITIALIZED);
+            return 0;
+        }
+        $this->mytype = $XML_RPC_Types['struct'];
+        $this->me['struct'] = $vals;
+        return 1;
+    }
+
+    /**
+     * @return void
+     */
+    function dump($ar)
+    {
+        reset($ar);
+        foreach ($ar as $key => $val) {
+            echo "$key => $val<br />";
+            if ($key == 'array') {
+                foreach ($val as $key2 => $val2) {
+                    echo "-- $key2 => $val2<br />";
+                }
+            }
+        }
+    }
+
+    /**
+     * @return string  the data type of the current value
+     */
+    function kindOf()
+    {
+        switch ($this->mytype) {
+        case 3:
+            return 'struct';
+
+        case 2:
+            return 'array';
+
+        case 1:
+            return 'scalar';
+
+        default:
+            return 'undef';
+        }
+    }
+
+    /**
+     * @return string  the data in XML format
+     */
+    function serializedata($typ, $val)
+    {
+        $rs = '';
+        global $XML_RPC_Types, $XML_RPC_Base64, $XML_RPC_String, $XML_RPC_Boolean;
+        if (!array_key_exists($typ, $XML_RPC_Types)) {
+            // XXX
+            // need some way to report this error
+            return;
+        }
+        switch ($XML_RPC_Types[$typ]) {
+        case 3:
+            // struct
+            $rs .= "<struct>\n";
+            reset($val);
+            foreach ($val as $key2 => $val2) {
+                $rs .= "<member><name>${key2}</name>\n";
+                $rs .= $this->serializeval($val2);
+                $rs .= "</member>\n";
+            }
+            $rs .= '</struct>';
+            break;
+
+        case 2:
+            // array
+            $rs .= "<array>\n<data>\n";
+            for ($i = 0; $i < sizeof($val); $i++) {
+                $rs .= $this->serializeval($val[$i]);
+            }
+            $rs .= "</data>\n</array>";
+            break;
+
+        case 1:
+            switch ($typ) {
+            case $XML_RPC_Base64:
+                $rs .= "<${typ}>" . base64_encode($val) . "</${typ}>";
+                break;
+            case $XML_RPC_Boolean:
+                $rs .= "<${typ}>" . ($val ? '1' : '0') . "</${typ}>";
+                break;
+            case $XML_RPC_String:
+                $rs .= "<${typ}>" . htmlspecialchars($val). "</${typ}>";
+                break;
+            default:
+                $rs .= "<${typ}>${val}</${typ}>";
+            }
+        }
+        return $rs;
+    }
+
+    /**
+     * @return string  the data in XML format
+     */
+    function serialize()
+    {
+        return $this->serializeval($this);
+    }
+
+    /**
+     * @return string  the data in XML format
+     */
+    function serializeval($o)
+    {
+        if (!is_object($o) || empty($o->me) || !is_array($o->me)) {
+            return '';
+        }
+        $ar = $o->me;
+        reset($ar);
+        list($typ, $val) = each($ar);
+        return '<value>' .  $this->serializedata($typ, $val) .  "</value>\n";
+    }
+
+    /**
+     * @return mixed  the contents of the element requested
+     */
+    function structmem($m)
+    {
+        return $this->me['struct'][$m];
+    }
+
+    /**
+     * @return void
+     */
+    function structreset()
+    {
+        reset($this->me['struct']);
+    }
+
+    /**
+     * @return  the key/value pair of the struct's current element
+     */
+    function structeach()
+    {
+        return each($this->me['struct']);
+    }
+
+    /**
+     * @return mixed  the current value
+     */
+    function getval()
+    {
+        // UNSTABLE
+        global $XML_RPC_BOOLEAN, $XML_RPC_Base64;
+
+        reset($this->me);
+        $b = current($this->me);
+
+        // contributed by I Sofer, 2001-03-24
+        // add support for nested arrays to scalarval
+        // i've created a new method here, so as to
+        // preserve back compatibility
+
+        if (is_array($b)) {
+            foreach ($b as $id => $cont) {
+                $b[$id] = $cont->scalarval();
+            }
+        }
+
+        // add support for structures directly encoding php objects
+        if (is_object($b)) {
+            $t = get_object_vars($b);
+            foreach ($t as $id => $cont) {
+                $t[$id] = $cont->scalarval();
+            }
+            foreach ($t as $id => $cont) {
+                $b->$id = $cont;
+            }
+        }
+
+        // end contrib
+        return $b;
+    }
+
+    /**
+     * @return mixed
+     */
+    function scalarval()
+    {
+        global $XML_RPC_Boolean, $XML_RPC_Base64;
+        reset($this->me);
+        return current($this->me);
+    }
+
+    /**
+     * @return string
+     */
+    function scalartyp()
+    {
+        global $XML_RPC_I4, $XML_RPC_Int;
+        reset($this->me);
+        $a = key($this->me);
+        if ($a == $XML_RPC_I4) {
+            $a = $XML_RPC_Int;
+        }
+        return $a;
+    }
+
+    /**
+     * @return mixed  the struct's current element
+     */
+    function arraymem($m)
+    {
+        return $this->me['array'][$m];
+    }
+
+    /**
+     * @return int  the number of elements in the array
+     */
+    function arraysize()
+    {
+        reset($this->me);
+        list($a, $b) = each($this->me);
+        return sizeof($b);
+    }
+
+    /**
+     * Determines if the item submitted is an XML_RPC_Value object
+     *
+     * @param mixed $val  the variable to be evaluated
+     *
+     * @return bool  TRUE if the item is an XML_RPC_Value object
+     *
+     * @static
+     * @since Method available since Release 1.3.0
+     */
+    function isValue($val)
+    {
+        return (strtolower(get_class($val)) == 'xml_rpc_value');
+    }
+}
+
+/**
+ * Return an ISO8601 encoded string
+ *
+ * While timezones ought to be supported, the XML-RPC spec says:
+ *
+ * "Don't assume a timezone. It should be specified by the server in its
+ * documentation what assumptions it makes about timezones."
+ *
+ * This routine always assumes localtime unless $utc is set to 1, in which
+ * case UTC is assumed and an adjustment for locale is made when encoding.
+ *
+ * @return string  the formatted date
+ */
+function XML_RPC_iso8601_encode($timet, $utc = 0)
+{
+    if (!$utc) {
+        $t = strftime('%Y%m%dT%H:%M:%S', $timet);
+    } else {
+        if (function_exists('gmstrftime')) {
+            // gmstrftime doesn't exist in some versions
+            // of PHP
+            $t = gmstrftime('%Y%m%dT%H:%M:%S', $timet);
+        } else {
+            $t = strftime('%Y%m%dT%H:%M:%S', $timet - date('Z'));
+        }
+    }
+    return $t;
+}
+
+/**
+ * Convert a datetime string into a Unix timestamp
+ *
+ * While timezones ought to be supported, the XML-RPC spec says:
+ *
+ * "Don't assume a timezone. It should be specified by the server in its
+ * documentation what assumptions it makes about timezones."
+ *
+ * This routine always assumes localtime unless $utc is set to 1, in which
+ * case UTC is assumed and an adjustment for locale is made when encoding.
+ *
+ * @return int  the unix timestamp of the date submitted
+ */
+function XML_RPC_iso8601_decode($idate, $utc = 0)
+{
+    $t = 0;
+    if (ereg('([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})', $idate, $regs)) {
+        if ($utc) {
+            $t = gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
+        } else {
+            $t = mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
+        }
+    }
+    return $t;
+}
+
+/**
+ * Converts an XML_RPC_Value object into native PHP types
+ *
+ * @param object $XML_RPC_val  the XML_RPC_Value object to decode
+ *
+ * @return mixed  the PHP values
+ */
+function XML_RPC_decode($XML_RPC_val)
+{
+    $kind = $XML_RPC_val->kindOf();
+
+    if ($kind == 'scalar') {
+        return $XML_RPC_val->scalarval();
+
+    } elseif ($kind == 'array') {
+        $size = $XML_RPC_val->arraysize();
+        $arr = array();
+        for ($i = 0; $i < $size; $i++) {
+            $arr[] = XML_RPC_decode($XML_RPC_val->arraymem($i));
+        }
+        return $arr;
+
+    } elseif ($kind == 'struct') {
+        $XML_RPC_val->structreset();
+        $arr = array();
+        while (list($key, $value) = $XML_RPC_val->structeach()) {
+            $arr[$key] = XML_RPC_decode($value);
+        }
+        return $arr;
+    }
+}
+
+/**
+ * Converts native PHP types into an XML_RPC_Value object
+ *
+ * @param mixed $php_val  the PHP value or variable you want encoded
+ *
+ * @return object  the XML_RPC_Value object
+ */
+function XML_RPC_encode($php_val)
+{
+    global $XML_RPC_Boolean, $XML_RPC_Int, $XML_RPC_Double, $XML_RPC_String,
+           $XML_RPC_Array, $XML_RPC_Struct;
+
+    $type = gettype($php_val);
+    $XML_RPC_val = new XML_RPC_Value;
+
+    switch ($type) {
+    case 'array':
+        if (empty($php_val)) {
+            $XML_RPC_val->addArray($php_val);
+            break;
+        }
+        $tmp = array_diff(array_keys($php_val), range(0, count($php_val)-1));
+        if (empty($tmp)) {
+           $arr = array();
+           foreach ($php_val as $k => $v) {
+               $arr[$k] = XML_RPC_encode($v);
+           }
+           $XML_RPC_val->addArray($arr);
+           break;
+        }
+        // fall though if it's not an enumerated array
+
+    case 'object':
+        $arr = array();
+        foreach ($php_val as $k => $v) {
+            $arr[$k] = XML_RPC_encode($v);
+        }
+        $XML_RPC_val->addStruct($arr);
+        break;
+
+    case 'integer':
+        $XML_RPC_val->addScalar($php_val, $XML_RPC_Int);
+        break;
+
+    case 'double':
+        $XML_RPC_val->addScalar($php_val, $XML_RPC_Double);
+        break;
+
+    case 'string':
+    case 'NULL':
+        $XML_RPC_val->addScalar($php_val, $XML_RPC_String);
+        break;
+
+    case 'boolean':
+        // Add support for encoding/decoding of booleans, since they
+        // are supported in PHP
+        // by <G_Giunta_2001-02-29>
+        $XML_RPC_val->addScalar($php_val, $XML_RPC_Boolean);
+        break;
+
+    case 'unknown type':
+    default:
+        $XML_RPC_val = false;
+    }
+    return $XML_RPC_val;
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
+?>
diff --git a/3rdparty/XML/RPC/Server.php b/3rdparty/XML/RPC/Server.php
new file mode 100644
index 00000000000..5c5c04b1f7a
--- /dev/null
+++ b/3rdparty/XML/RPC/Server.php
@@ -0,0 +1,624 @@
+<?php
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Server commands for our PHP implementation of the XML-RPC protocol
+ *
+ * This is a PEAR-ified version of Useful inc's XML-RPC for PHP.
+ * It has support for HTTP transport, proxies and authentication.
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: License is granted to use or modify this software
+ * ("XML-RPC for PHP") for commercial or non-commercial use provided the
+ * copyright of the author is preserved in any distributed or derivative work.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESSED OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   Web Services
+ * @package    XML_RPC
+ * @author     Edd Dumbill <edd@usefulinc.com>
+ * @author     Stig Bakken <stig@php.net>
+ * @author     Martin Jansen <mj@php.net>
+ * @author     Daniel Convissor <danielc@php.net>
+ * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
+ * @version    CVS: $Id: Server.php,v 1.29 2005/08/14 20:25:35 danielc Exp $
+ * @link       http://pear.php.net/package/XML_RPC
+ */
+
+
+/**
+ * Pull in the XML_RPC class
+ */
+require_once 'XML/RPC.php';
+
+
+/**
+ * signature for system.listMethods: return = array,
+ * parameters = a string or nothing
+ * @global array $GLOBALS['XML_RPC_Server_listMethods_sig']
+ */
+$GLOBALS['XML_RPC_Server_listMethods_sig'] = array(
+    array($GLOBALS['XML_RPC_Array'],
+          $GLOBALS['XML_RPC_String']
+    ),
+    array($GLOBALS['XML_RPC_Array'])
+);
+
+/**
+ * docstring for system.listMethods
+ * @global string $GLOBALS['XML_RPC_Server_listMethods_doc']
+ */
+$GLOBALS['XML_RPC_Server_listMethods_doc'] = 'This method lists all the'
+        . ' methods that the XML-RPC server knows how to dispatch';
+
+/**
+ * signature for system.methodSignature: return = array,
+ * parameters = string
+ * @global array $GLOBALS['XML_RPC_Server_methodSignature_sig']
+ */
+$GLOBALS['XML_RPC_Server_methodSignature_sig'] = array(
+    array($GLOBALS['XML_RPC_Array'],
+          $GLOBALS['XML_RPC_String']
+    )
+);
+
+/**
+ * docstring for system.methodSignature
+ * @global string $GLOBALS['XML_RPC_Server_methodSignature_doc']
+ */
+$GLOBALS['XML_RPC_Server_methodSignature_doc'] = 'Returns an array of known'
+        . ' signatures (an array of arrays) for the method name passed. If'
+        . ' no signatures are known, returns a none-array (test for type !='
+        . ' array to detect missing signature)';
+
+/**
+ * signature for system.methodHelp: return = string,
+ * parameters = string
+ * @global array $GLOBALS['XML_RPC_Server_methodHelp_sig']
+ */
+$GLOBALS['XML_RPC_Server_methodHelp_sig'] = array(
+    array($GLOBALS['XML_RPC_String'],
+          $GLOBALS['XML_RPC_String']
+    )
+);
+
+/**
+ * docstring for methodHelp
+ * @global string $GLOBALS['XML_RPC_Server_methodHelp_doc']
+ */
+$GLOBALS['XML_RPC_Server_methodHelp_doc'] = 'Returns help text if defined'
+        . ' for the method passed, otherwise returns an empty string';
+
+/**
+ * dispatch map for the automatically declared XML-RPC methods.
+ * @global array $GLOBALS['XML_RPC_Server_dmap']
+ */
+$GLOBALS['XML_RPC_Server_dmap'] = array(
+    'system.listMethods' => array(
+        'function'  => 'XML_RPC_Server_listMethods',
+        'signature' => $GLOBALS['XML_RPC_Server_listMethods_sig'],
+        'docstring' => $GLOBALS['XML_RPC_Server_listMethods_doc']
+    ),
+    'system.methodHelp' => array(
+        'function'  => 'XML_RPC_Server_methodHelp',
+        'signature' => $GLOBALS['XML_RPC_Server_methodHelp_sig'],
+        'docstring' => $GLOBALS['XML_RPC_Server_methodHelp_doc']
+    ),
+    'system.methodSignature' => array(
+        'function'  => 'XML_RPC_Server_methodSignature',
+        'signature' => $GLOBALS['XML_RPC_Server_methodSignature_sig'],
+        'docstring' => $GLOBALS['XML_RPC_Server_methodSignature_doc']
+    )
+);
+
+/**
+ * @global string $GLOBALS['XML_RPC_Server_debuginfo']
+ */
+$GLOBALS['XML_RPC_Server_debuginfo'] = '';
+
+
+/**
+ * Lists all the methods that the XML-RPC server knows how to dispatch
+ *
+ * @return object  a new XML_RPC_Response object
+ */
+function XML_RPC_Server_listMethods($server, $m)
+{
+    global $XML_RPC_err, $XML_RPC_str, $XML_RPC_Server_dmap;
+
+    $v = new XML_RPC_Value();
+    $outAr = array();
+    foreach ($server->dmap as $key => $val) {
+        $outAr[] = new XML_RPC_Value($key, 'string');
+    }
+    foreach ($XML_RPC_Server_dmap as $key => $val) {
+        $outAr[] = new XML_RPC_Value($key, 'string');
+    }
+    $v->addArray($outAr);
+    return new XML_RPC_Response($v);
+}
+
+/**
+ * Returns an array of known signatures (an array of arrays)
+ * for the given method
+ *
+ * If no signatures are known, returns a none-array
+ * (test for type != array to detect missing signature)
+ *
+ * @return object  a new XML_RPC_Response object
+ */
+function XML_RPC_Server_methodSignature($server, $m)
+{
+    global $XML_RPC_err, $XML_RPC_str, $XML_RPC_Server_dmap;
+
+    $methName = $m->getParam(0);
+    $methName = $methName->scalarval();
+    if (strpos($methName, 'system.') === 0) {
+        $dmap = $XML_RPC_Server_dmap;
+        $sysCall = 1;
+    } else {
+        $dmap = $server->dmap;
+        $sysCall = 0;
+    }
+    //  print "<!-- ${methName} -->\n";
+    if (isset($dmap[$methName])) {
+        if ($dmap[$methName]['signature']) {
+            $sigs = array();
+            $thesigs = $dmap[$methName]['signature'];
+            for ($i = 0; $i < sizeof($thesigs); $i++) {
+                $cursig = array();
+                $inSig = $thesigs[$i];
+                for ($j = 0; $j < sizeof($inSig); $j++) {
+                    $cursig[] = new XML_RPC_Value($inSig[$j], 'string');
+                }
+                $sigs[] = new XML_RPC_Value($cursig, 'array');
+            }
+            $r = new XML_RPC_Response(new XML_RPC_Value($sigs, 'array'));
+        } else {
+            $r = new XML_RPC_Response(new XML_RPC_Value('undef', 'string'));
+        }
+    } else {
+        $r = new XML_RPC_Response(0, $XML_RPC_err['introspect_unknown'],
+                                  $XML_RPC_str['introspect_unknown']);
+    }
+    return $r;
+}
+
+/**
+ * Returns help text if defined for the method passed, otherwise returns
+ * an empty string
+ *
+ * @return object  a new XML_RPC_Response object
+ */
+function XML_RPC_Server_methodHelp($server, $m)
+{
+    global $XML_RPC_err, $XML_RPC_str, $XML_RPC_Server_dmap;
+
+    $methName = $m->getParam(0);
+    $methName = $methName->scalarval();
+    if (strpos($methName, 'system.') === 0) {
+        $dmap = $XML_RPC_Server_dmap;
+        $sysCall = 1;
+    } else {
+        $dmap = $server->dmap;
+        $sysCall = 0;
+    }
+
+    if (isset($dmap[$methName])) {
+        if ($dmap[$methName]['docstring']) {
+            $r = new XML_RPC_Response(new XML_RPC_Value($dmap[$methName]['docstring']),
+                                                        'string');
+        } else {
+            $r = new XML_RPC_Response(new XML_RPC_Value('', 'string'));
+        }
+    } else {
+        $r = new XML_RPC_Response(0, $XML_RPC_err['introspect_unknown'],
+                                     $XML_RPC_str['introspect_unknown']);
+    }
+    return $r;
+}
+
+/**
+ * @return void
+ */
+function XML_RPC_Server_debugmsg($m)
+{
+    global $XML_RPC_Server_debuginfo;
+    $XML_RPC_Server_debuginfo = $XML_RPC_Server_debuginfo . $m . "\n";
+}
+
+
+/**
+ * A server for receiving and replying to XML RPC requests
+ *
+ * <code>
+ * $server = new XML_RPC_Server(
+ *     array(
+ *         'isan8' =>
+ *             array(
+ *                 'function' => 'is_8',
+ *                 'signature' =>
+ *                      array(
+ *                          array('boolean', 'int'),
+ *                          array('boolean', 'int', 'boolean'),
+ *                          array('boolean', 'string'),
+ *                          array('boolean', 'string', 'boolean'),
+ *                      ),
+ *                 'docstring' => 'Is the value an 8?'
+ *             ),
+ *     ),
+ *     1,
+ *     0
+ * ); 
+ * </code>
+ *
+ * @category   Web Services
+ * @package    XML_RPC
+ * @author     Edd Dumbill <edd@usefulinc.com>
+ * @author     Stig Bakken <stig@php.net>
+ * @author     Martin Jansen <mj@php.net>
+ * @author     Daniel Convissor <danielc@php.net>
+ * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
+ * @version    Release: 1.4.0
+ * @link       http://pear.php.net/package/XML_RPC
+ */
+class XML_RPC_Server
+{
+    /**
+     * The dispatch map, listing the methods this server provides.
+     * @var array
+     */
+    var $dmap = array();
+
+    /**
+     * The present response's encoding
+     * @var string
+     * @see XML_RPC_Message::getEncoding()
+     */
+    var $encoding = '';
+
+    /**
+     * Debug mode (0 = off, 1 = on)
+     * @var integer
+     */
+    var $debug = 0;
+
+    /**
+     * The response's HTTP headers
+     * @var string
+     */
+    var $server_headers = '';
+
+    /**
+     * The response's XML payload
+     * @var string
+     */
+    var $server_payload = '';
+
+
+    /**
+     * Constructor for the XML_RPC_Server class
+     *
+     * @param array $dispMap   the dispatch map. An associative array
+     *                          explaining each function. The keys of the main
+     *                          array are the procedure names used by the
+     *                          clients. The value is another associative array
+     *                          that contains up to three elements:
+     *                            + The 'function' element's value is the name
+     *                              of the function or method that gets called.
+     *                              To define a class' method: 'class::method'.
+     *                            + The 'signature' element (optional) is an
+     *                              array describing the return values and
+     *                              parameters
+     *                            + The 'docstring' element (optional) is a
+     *                              string describing what the method does
+     * @param int $serviceNow  should the HTTP response be sent now?
+     *                          (1 = yes, 0 = no)
+     * @param int $debug       should debug output be displayed?
+     *                          (1 = yes, 0 = no)
+     *
+     * @return void
+     */
+    function XML_RPC_Server($dispMap, $serviceNow = 1, $debug = 0)
+    {
+        global $HTTP_RAW_POST_DATA;
+
+        if ($debug) {
+            $this->debug = 1;
+        } else {
+            $this->debug = 0;
+        }
+
+        $this->dmap = $dispMap;
+
+        if ($serviceNow) {
+            $this->service();
+        } else {
+            $this->createServerPayload();
+            $this->createServerHeaders();
+        }
+    }
+
+    /**
+     * @return string  the debug information if debug debug mode is on
+     */
+    function serializeDebug()
+    {
+        global $XML_RPC_Server_debuginfo, $HTTP_RAW_POST_DATA;
+
+        if ($this->debug) {
+            XML_RPC_Server_debugmsg('vvv POST DATA RECEIVED BY SERVER vvv' . "\n"
+                                    . $HTTP_RAW_POST_DATA
+                                    . "\n" . '^^^ END POST DATA ^^^');
+        }
+
+        if ($XML_RPC_Server_debuginfo != '') {
+            return "<!-- PEAR XML_RPC SERVER DEBUG INFO:\n\n"
+                   . preg_replace('/-(?=-)/', '- ', $XML_RPC_Server_debuginfo)
+                   . "-->\n";
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Sends the response
+     *
+     * The encoding and content-type are determined by
+     * XML_RPC_Message::getEncoding()
+     *
+     * @return void
+     *
+     * @uses XML_RPC_Server::createServerPayload(),
+     *       XML_RPC_Server::createServerHeaders()
+     */
+    function service()
+    {
+        if (!$this->server_payload) {
+            $this->createServerPayload();
+        }
+        if (!$this->server_headers) {
+            $this->createServerHeaders();
+        }
+        header($this->server_headers);
+        print $this->server_payload;
+    }
+
+    /**
+     * Generates the payload and puts it in the $server_payload property
+     *
+     * @return void
+     *
+     * @uses XML_RPC_Server::parseRequest(), XML_RPC_Server::$encoding,
+     *       XML_RPC_Response::serialize(), XML_RPC_Server::serializeDebug()
+     */
+    function createServerPayload()
+    {
+        $r = $this->parseRequest();
+        $this->server_payload = '<?xml version="1.0" encoding="'
+                              . $this->encoding . '"?>' . "\n"
+                              . $this->serializeDebug()
+                              . $r->serialize();
+    }
+
+    /**
+     * Determines the HTTP headers and puts them in the $server_headers
+     * property
+     *
+     * @return boolean  TRUE if okay, FALSE if $server_payload isn't set.
+     *
+     * @uses XML_RPC_Server::createServerPayload(),
+     *       XML_RPC_Server::$server_headers
+     */
+    function createServerHeaders()
+    {
+        if (!$this->server_payload) {
+            return false;
+        }
+        $this->server_headers = 'Content-Length: '
+                              . strlen($this->server_payload) . "\r\n"
+                              . 'Content-Type: text/xml;'
+                              . ' charset=' . $this->encoding;
+        return true;
+    }
+
+    /**
+     * @return array
+     */
+    function verifySignature($in, $sig)
+    {
+        for ($i = 0; $i < sizeof($sig); $i++) {
+            // check each possible signature in turn
+            $cursig = $sig[$i];
+            if (sizeof($cursig) == $in->getNumParams() + 1) {
+                $itsOK = 1;
+                for ($n = 0; $n < $in->getNumParams(); $n++) {
+                    $p = $in->getParam($n);
+                    // print "<!-- $p -->\n";
+                    if ($p->kindOf() == 'scalar') {
+                        $pt = $p->scalartyp();
+                    } else {
+                        $pt = $p->kindOf();
+                    }
+                    // $n+1 as first type of sig is return type
+                    if ($pt != $cursig[$n+1]) {
+                        $itsOK = 0;
+                        $pno = $n+1;
+                        $wanted = $cursig[$n+1];
+                        $got = $pt;
+                        break;
+                    }
+                }
+                if ($itsOK) {
+                    return array(1);
+                }
+            }
+        }
+        if (isset($wanted)) {
+            return array(0, "Wanted ${wanted}, got ${got} at param ${pno}");
+        } else {
+            $allowed = array();
+            foreach ($sig as $val) {
+                end($val);
+                $allowed[] = key($val);
+            }
+            $allowed = array_unique($allowed);
+            $last = count($allowed) - 1;
+            if ($last > 0) {
+                $allowed[$last] = 'or ' . $allowed[$last];
+            }
+            return array(0,
+                         'Signature permits ' . implode(', ', $allowed)
+                                . ' parameters but the request had '
+                                . $in->getNumParams());
+        }
+    }
+
+    /**
+     * @return object  a new XML_RPC_Response object
+     *
+     * @uses XML_RPC_Message::getEncoding(), XML_RPC_Server::$encoding
+     */
+    function parseRequest($data = '')
+    {
+        global $XML_RPC_xh, $HTTP_RAW_POST_DATA,
+                $XML_RPC_err, $XML_RPC_str, $XML_RPC_errxml,
+                $XML_RPC_defencoding, $XML_RPC_Server_dmap;
+
+        if ($data == '') {
+            $data = $HTTP_RAW_POST_DATA;
+        }
+
+        $this->encoding = XML_RPC_Message::getEncoding($data);
+        $parser_resource = xml_parser_create($this->encoding);
+        $parser = (int) $parser_resource;
+
+        $XML_RPC_xh[$parser] = array();
+        $XML_RPC_xh[$parser]['cm']     = 0;
+        $XML_RPC_xh[$parser]['isf']    = 0;
+        $XML_RPC_xh[$parser]['params'] = array();
+        $XML_RPC_xh[$parser]['method'] = '';
+        $XML_RPC_xh[$parser]['stack'] = array();	
+        $XML_RPC_xh[$parser]['valuestack'] = array();	
+
+        $plist = '';
+
+        // decompose incoming XML into request structure
+
+        xml_parser_set_option($parser_resource, XML_OPTION_CASE_FOLDING, true);
+        xml_set_element_handler($parser_resource, 'XML_RPC_se', 'XML_RPC_ee');
+        xml_set_character_data_handler($parser_resource, 'XML_RPC_cd');
+        if (!xml_parse($parser_resource, $data, 1)) {
+            // return XML error as a faultCode
+            $r = new XML_RPC_Response(0,
+                                      $XML_RPC_errxml+xml_get_error_code($parser_resource),
+                                      sprintf('XML error: %s at line %d',
+                                              xml_error_string(xml_get_error_code($parser_resource)),
+                                              xml_get_current_line_number($parser_resource)));
+            xml_parser_free($parser_resource);
+        } elseif ($XML_RPC_xh[$parser]['isf']>1) {
+            $r = new XML_RPC_Response(0,
+                                      $XML_RPC_err['invalid_request'],
+                                      $XML_RPC_str['invalid_request']
+                                      . ': '
+                                      . $XML_RPC_xh[$parser]['isf_reason']);
+            xml_parser_free($parser_resource);
+        } else {
+            xml_parser_free($parser_resource);
+            $m = new XML_RPC_Message($XML_RPC_xh[$parser]['method']);
+            // now add parameters in
+            for ($i = 0; $i < sizeof($XML_RPC_xh[$parser]['params']); $i++) {
+                // print '<!-- ' . $XML_RPC_xh[$parser]['params'][$i]. "-->\n";
+                $plist .= "$i - " . var_export($XML_RPC_xh[$parser]['params'][$i], true) . " \n";
+                $m->addParam($XML_RPC_xh[$parser]['params'][$i]);
+            }
+            XML_RPC_Server_debugmsg($plist);
+
+            // now to deal with the method
+            $methName = $XML_RPC_xh[$parser]['method'];
+            if (strpos($methName, 'system.') === 0) {
+                $dmap = $XML_RPC_Server_dmap;
+                $sysCall = 1;
+            } else {
+                $dmap = $this->dmap;
+                $sysCall = 0;
+            }
+
+            if (isset($dmap[$methName]['function'])
+                && is_string($dmap[$methName]['function'])
+                && strpos($dmap[$methName]['function'], '::') !== false)
+            {
+                $dmap[$methName]['function'] =
+                        explode('::', $dmap[$methName]['function']);
+            }
+
+            if (isset($dmap[$methName]['function'])
+                && is_callable($dmap[$methName]['function']))
+            {
+                // dispatch if exists
+                if (isset($dmap[$methName]['signature'])) {
+                    $sr = $this->verifySignature($m,
+                                                 $dmap[$methName]['signature'] );
+                }
+                if (!isset($dmap[$methName]['signature']) || $sr[0]) {
+                    // if no signature or correct signature
+                    if ($sysCall) {
+                        $r = call_user_func($dmap[$methName]['function'], $this, $m);
+                    } else {
+                        $r = call_user_func($dmap[$methName]['function'], $m);
+                    }
+                    if (!is_a($r, 'XML_RPC_Response')) {
+                        $r = new XML_RPC_Response(0, $XML_RPC_err['not_response_object'],
+                                                  $XML_RPC_str['not_response_object']);
+                    }
+                } else {
+                    $r = new XML_RPC_Response(0, $XML_RPC_err['incorrect_params'],
+                                              $XML_RPC_str['incorrect_params']
+                                              . ': ' . $sr[1]);
+                }
+            } else {
+                // else prepare error response
+                $r = new XML_RPC_Response(0, $XML_RPC_err['unknown_method'],
+                                          $XML_RPC_str['unknown_method']);
+            }
+        }
+        return $r;
+    }
+
+    /**
+     * Echos back the input packet as a string value
+     *
+     * @return void
+     *
+     * Useful for debugging.
+     */
+    function echoInput()
+    {
+        global $HTTP_RAW_POST_DATA;
+
+        $r = new XML_RPC_Response(0);
+        $r->xv = new XML_RPC_Value("'Aha said I: '" . $HTTP_RAW_POST_DATA, 'string');
+        print $r->serialize();
+    }
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
+?>
diff --git a/3rdparty/css/chosen-sprite.png b/3rdparty/css/chosen-sprite.png
new file mode 100644
index 0000000000000000000000000000000000000000..f20db4439ea5c1038126bf326c8fd048b03a8226
GIT binary patch
literal 742
zcmeAS@N?(olHy`uVBq!ia0vp^HbAV#!3-qV=X2}@QlA5SLR>pKI{yFvKXc~Hw6wJT
z{{AOVo_zoQeZqtZ&!0cvw{PF?-@ki%d;k6WS6EoMdiClhOP1WeeS7cTz4PYH`}FD4
zt5>h?-n~0()~rX59=&++V%xTD`T6-@zI<7}eEIzO^LOst`S<VN6)RS3+_>@T)vFse
zZ0PFhnmc#y*RNl9?AVc)msea|{PX9}Ns}gR+O%o+?%jtD9eVii;l+y=r%jvo;K760
zvu76+6kNZ4ed^SyPoF-WIC0|Z*ROy4_>r5N`~Lm=&!0c{_4O@WxbWAnUpYBBmoHy_
z_Uzfgg9n!`T{?O4<drK|-nw<`@#DuQPoDht?c1F@ciz5z+tbriR8$1?tnK5A`9SXn
zmIV0)1G!WM3>j}$9Asc%4D@ty45_&F_R{g9Lk0qD52mW_e8hCD#Hn3?L-tbj`>OxT
zJ7v;md~}?7W?s>W`VVqX@=db;D+pYCKd;4N)z`osoP6iyoB9teW8`B#?2;Ii#BfGM
zL+6u_bqvF)z6Qwy7F^e#>{}{m61e02bdHnN$L$~3eq~pF@_OO1hcV%@q4${;^UfV+
znXY)w;%ghbu4vj9l}FCEd^hZyc+KPP6}AS4MsdBpQGw+X69gF?tV83O8O(MiJx^-A
zboXW1bFqq*pAC;_YOi~??#RV$D!*(*_VfK;FjaJ|%YuJ~uPm<26>Fce&`YSSyXC`g
zaTdR+Ec5IClowvmjG1!3;Krqz><Q8Pl0Ga>yXh1n|0<p1&CfC$pSO~Y++jw=)*OF&
z-#pc2;;&l%amTf5964fH?1$!kEt<}uvuKxE@bxk&4xLrT*_*a)zE#H@d%ow&OqRzb
gV%<yUl|1^$Is0l?nEJ6OP)cU-boFyt=akR{0B7jC4*&oF

literal 0
HcmV?d00001

diff --git a/3rdparty/css/chosen.css b/3rdparty/css/chosen.css
new file mode 100644
index 00000000000..96bae0fe95a
--- /dev/null
+++ b/3rdparty/css/chosen.css
@@ -0,0 +1,341 @@
+/* @group Base */
+select.chzn-select {
+  visibility: hidden;
+  height: 28px !important;
+  min-height: 28px !important;
+}
+.chzn-container {
+  font-size: 13px;
+  position: relative;
+  display: inline-block;
+  zoom: 1;
+  *display: inline;
+  vertical-align: bottom;
+}
+.chzn-container .chzn-drop {
+  background: #fff;
+  border: 1px solid #aaa;
+  border-top: 0;
+  position: absolute;
+  top: 29px;
+  left: 0;
+  -webkit-box-shadow: 0 4px 5px rgba(0,0,0,.15);
+  -moz-box-shadow   : 0 4px 5px rgba(0,0,0,.15);
+  -o-box-shadow     : 0 4px 5px rgba(0,0,0,.15);
+  box-shadow        : 0 4px 5px rgba(0,0,0,.15);
+  z-index: 999;
+}
+/* @end */
+
+/* @group Single Chosen */
+.chzn-container-single .chzn-single {
+  background-color: #fff;
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.5, white));
+  background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 50%);
+  background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 50%);
+  background-image: -o-linear-gradient(top, #eeeeee 0%,#ffffff 50%);
+  background-image: -ms-linear-gradient(top, #eeeeee 0%,#ffffff 50%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#ffffff',GradientType=0 );
+  background-image: linear-gradient(top, #eeeeee 0%,#ffffff 50%);
+  -webkit-border-radius: 4px;
+  -moz-border-radius   : 4px;
+  border-radius        : 4px;
+  -moz-background-clip   : padding;
+  -webkit-background-clip: padding-box;
+  background-clip        : padding-box;
+  border: 1px solid #aaa;
+  display: block;
+  overflow: hidden;
+  white-space: nowrap;
+  position: relative;
+  height: 26px;
+  line-height: 26px;
+  padding: 0 0 0 8px;
+  color: #444;
+  text-decoration: none;
+}
+.chzn-container-single .chzn-single span {
+  margin-right: 26px;
+  display: block;
+  overflow: hidden;
+  white-space: nowrap;
+  -o-text-overflow: ellipsis;
+  -ms-text-overflow: ellipsis;
+  -moz-binding: url('/xml/ellipsis.xml#ellipsis');
+  text-overflow: ellipsis;
+}
+.chzn-container-single .chzn-single div {
+  -webkit-border-radius: 0 4px 4px 0;
+  -moz-border-radius   : 0 4px 4px 0;
+  border-radius        : 0 4px 4px 0;
+  -moz-background-clip   : padding;
+  -webkit-background-clip: padding-box;
+  background-clip        : padding-box;
+  background: #ccc;
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee));
+  background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%);
+  background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%);
+  background-image: -o-linear-gradient(bottom, #ccc 0%, #eee 60%);
+  background-image: -ms-linear-gradient(top, #cccccc 0%,#eeeeee 60%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cccccc', endColorstr='#eeeeee',GradientType=0 );
+  background-image: linear-gradient(top, #cccccc 0%,#eeeeee 60%);
+  border-left: 1px solid #aaa;
+  position: absolute;
+  right: 0;
+  top: 0;
+  display: block;
+  height: 100%;
+  width: 18px;
+}
+.chzn-container-single .chzn-single div b {
+  background: url('chosen-sprite.png') no-repeat 0 1px;
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+.chzn-container-single .chzn-search {
+  padding: 3px 4px;
+  margin: 0;
+  white-space: nowrap;
+}
+.chzn-container-single .chzn-search input {
+  background: #fff url('chosen-sprite.png') no-repeat 100% -20px;
+  background: url('chosen-sprite.png') no-repeat 100% -20px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+  background: url('chosen-sprite.png') no-repeat 100% -20px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -20px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -20px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -20px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  margin: 1px 0;
+  padding: 4px 20px 4px 5px;
+  outline: 0;
+  border: 1px solid #aaa;
+  font-family: sans-serif;
+  font-size: 1em;
+}
+.chzn-container-single .chzn-drop {
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius   : 0 0 4px 4px;
+  border-radius        : 0 0 4px 4px;
+  -moz-background-clip   : padding;
+  -webkit-background-clip: padding-box;
+  background-clip        : padding-box;
+}
+/* @end */
+
+/* @group Multi Chosen */
+.chzn-container-multi .chzn-choices {
+  background-color: #fff;
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+  background-image: -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background-image: -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background-image: -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+  background-image: -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
+  background-image: linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  border: 1px solid #aaa;
+  margin: 0;
+  padding: 0;
+  cursor: text;
+  overflow: hidden;
+  height: auto !important;
+  height: 1%;
+  position: relative;
+}
+.chzn-container-multi .chzn-choices li {
+  float: left;
+  list-style: none;
+}
+.chzn-container-multi .chzn-choices .search-field {
+  white-space: nowrap;
+  margin: 0;
+  padding: 0;
+}
+.chzn-container-multi .chzn-choices .search-field input {
+  color: #666;
+  background: transparent !important;
+  border: 0 !important;
+  padding: 5px;
+  margin: 1px 0;
+  outline: 0;
+  -webkit-box-shadow: none;
+  -moz-box-shadow   : none;
+  -o-box-shadow     : none;
+  box-shadow        : none;
+}
+.chzn-container-multi .chzn-choices .search-field .default {
+  color: #999;
+}
+.chzn-container-multi .chzn-choices .search-choice {
+  -webkit-border-radius: 3px;
+  -moz-border-radius   : 3px;
+  border-radius        : 3px;
+  -moz-background-clip   : padding;
+  -webkit-background-clip: padding-box;
+  background-clip        : padding-box;
+  background-color: #e4e4e4;
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #e4e4e4), color-stop(0.7, #eeeeee));
+  background-image: -webkit-linear-gradient(center bottom, #e4e4e4 0%, #eeeeee 70%);
+  background-image: -moz-linear-gradient(center bottom, #e4e4e4 0%, #eeeeee 70%);
+  background-image: -o-linear-gradient(bottom, #e4e4e4 0%, #eeeeee 70%);
+  background-image: -ms-linear-gradient(top, #e4e4e4 0%,#eeeeee 70%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e4e4e4', endColorstr='#eeeeee',GradientType=0 );
+  background-image: linear-gradient(top, #e4e4e4 0%,#eeeeee 70%);
+  color: #333;
+  border: 1px solid #b4b4b4;
+  line-height: 13px;
+  padding: 3px 19px 3px 6px;
+  margin: 3px 0 3px 5px;
+  position: relative;
+}
+.chzn-container-multi .chzn-choices .search-choice span {
+  cursor: default;
+}
+.chzn-container-multi .chzn-choices .search-choice-focus {
+  background: #d4d4d4;
+}
+.chzn-container-multi .chzn-choices .search-choice .search-choice-close {
+  display: block;
+  position: absolute;
+  right: 5px;
+  top: 6px;
+  width: 8px;
+  height: 9px;
+  font-size: 1px;
+  background: url(chosen-sprite.png) right top no-repeat;
+}
+.chzn-container-multi .chzn-choices .search-choice .search-choice-close:hover {
+  background-position: right -9px;
+}
+.chzn-container-multi .chzn-choices .search-choice-focus .search-choice-close {
+  background-position: right -9px;
+}
+/* @end */
+
+/* @group Results */
+.chzn-container .chzn-results {
+  margin: 0 4px 4px 0;
+  max-height: 190px;
+  padding: 0 0 0 4px;
+  position: relative;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+.chzn-container-multi .chzn-results {
+  margin: -1px 0 0;
+  padding: 0;
+}
+.chzn-container .chzn-results li {
+  line-height: 80%;
+  padding: 7px 7px 8px;
+  margin: 0;
+  list-style: none;
+}
+.chzn-container .chzn-results .active-result {
+  cursor: pointer;
+}
+.chzn-container .chzn-results .highlighted {
+  background: #3875d7;
+  color: #fff;
+}
+.chzn-container .chzn-results li em {
+  background: #feffde;
+  font-style: normal;
+}
+.chzn-container .chzn-results .highlighted em {
+  background: transparent;
+}
+.chzn-container .chzn-results .no-results {
+  background: #f4f4f4;
+}
+.chzn-container .chzn-results .group-result {
+  cursor: default;
+  color: #999;
+  font-weight: bold;
+}
+.chzn-container .chzn-results .group-option {
+  padding-left: 20px;
+}
+.chzn-container-multi .chzn-drop .result-selected {
+  display: none;
+}
+/* @end */
+
+/* @group Active  */
+.chzn-container-active .chzn-single {
+  -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
+  -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
+  -o-box-shadow     : 0 0 5px rgba(0,0,0,.3);
+  box-shadow        : 0 0 5px rgba(0,0,0,.3);
+  border: 1px solid #5897fb;
+}
+.chzn-container-active .chzn-single-with-drop {
+  border: 1px solid #aaa;
+  -webkit-box-shadow: 0 1px 0 #fff inset;
+  -moz-box-shadow   : 0 1px 0 #fff inset;
+  -o-box-shadow     : 0 1px 0 #fff inset;
+  box-shadow        : 0 1px 0 #fff inset;
+  background-color: #eee;
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, white), color-stop(0.5, #eeeeee));
+  background-image: -webkit-linear-gradient(center bottom, white 0%, #eeeeee 50%);
+  background-image: -moz-linear-gradient(center bottom, white 0%, #eeeeee 50%);
+  background-image: -o-linear-gradient(bottom, white 0%, #eeeeee 50%);
+  background-image: -ms-linear-gradient(top, #ffffff 0%,#eeeeee 50%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
+  background-image: linear-gradient(top, #ffffff 0%,#eeeeee 50%);
+  -webkit-border-bottom-left-radius : 0;
+  -webkit-border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft : 0;
+  -moz-border-radius-bottomright: 0;
+  border-bottom-left-radius : 0;
+  border-bottom-right-radius: 0;
+}
+.chzn-container-active .chzn-single-with-drop div {
+  background: transparent;
+  border-left: none;
+}
+.chzn-container-active .chzn-single-with-drop div b {
+  background-position: -18px 1px;
+}
+.chzn-container-active .chzn-choices {
+  -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
+  -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
+  -o-box-shadow     : 0 0 5px rgba(0,0,0,.3);
+  box-shadow        : 0 0 5px rgba(0,0,0,.3);
+  border: 1px solid #5897fb;
+}
+.chzn-container-active .chzn-choices .search-field input {
+  color: #111 !important;
+}
+/* @end */
+
+/* @group Right to Left */
+.chzn-rtl { direction:rtl;text-align: right; }
+.chzn-rtl .chzn-single { padding-left: 0; padding-right: 8px; }
+.chzn-rtl .chzn-single span { margin-left: 26px; margin-right: 0; }
+.chzn-rtl .chzn-single div { 
+  left: 0; right: auto; 
+  border-left: none; border-right: 1px solid #aaaaaa;
+  -webkit-border-radius: 4px 0 0 4px;
+  -moz-border-radius   : 4px 0 0 4px;
+  border-radius        : 4px 0 0 4px; 
+}
+.chzn-rtl .chzn-choices li { float: right; }
+.chzn-rtl .chzn-choices .search-choice { padding: 3px 6px 3px 19px; margin: 3px 5px 3px 0; }
+.chzn-rtl .chzn-choices .search-choice .search-choice-close { left: 5px; right: auto; background-position: right top;}
+.chzn-rtl.chzn-container-single .chzn-results { margin-left: 4px; margin-right: 0; padding-left: 0; padding-right: 4px; }
+.chzn-rtl .chzn-results .group-option { padding-left: 0; padding-right: 20px; }
+.chzn-rtl.chzn-container-active .chzn-single-with-drop div { border-right: none; }
+.chzn-rtl .chzn-search input {
+  background: url('chosen-sprite.png') no-repeat -38px -20px, #ffffff;
+  background: url('chosen-sprite.png') no-repeat -38px -20px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+  background: url('chosen-sprite.png') no-repeat -38px -20px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);  
+  background: url('chosen-sprite.png') no-repeat -38px -20px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -20px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -20px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  padding: 4px 5px 4px 20px;
+}
+/* @end */
\ No newline at end of file
diff --git a/3rdparty/css/chosen/chosen-sprite.png b/3rdparty/css/chosen/chosen-sprite.png
new file mode 100644
index 0000000000000000000000000000000000000000..9edce05a6a899eaf98481d12dddbc433331a01ee
GIT binary patch
literal 3998
zcmb`J^;Z<%|9}Tkx<o=ne1jk&(kUHFr@$gD&C(^hgy7OCh;%Fx(hagmN;gY)Nec)l
z;Uf9Hpa0=I=iIqxewzDwo@dUPh!>hl<Rte=AP6E?QI^*My98M5MEKyIXk$MFHexqr
z!`Bc*dgp%&4@%3p3qd4W_AuCs7j~|muCMJ}-I!EhFeWz-S6h208wm26L+c{oy4!S;
zxTRw`wQy8|nyU^i5tEKw6pAK}jf0t(N;RB0dzMza?Y4r#O@`jAaQv7UR5YzNCs`!P
z4B<L+PE1g4cx3<iif^vtR1<D<=&E*FYOC}JT{BGBN<@~VETAofA}f-6c>70CPiOba
zI=4&!39B1KMO0(W{Q8mw4?6Xika+f}m9PcE^BN~5f?74wTX`RZT~qGJrJCTOg7I2C
z<DRP#p=cl(pBTA(NJbG4g-&79g|co!<^xuiYtRcW$o$Fs&2b2YK27z-gNzfHY4Nh+
zAf`Ju;qs83I8-|PGExCD;Du;x)jCC?87_!dMc-B#s;q-ru~ekh5D^)~s~sNl6uRjP
znfJ1=ctOFb5RKxYzQmtr<y2c7fK+O=L_MphLVz(5mph@pKKDa*tP1@z8exkY7HKlv
z?cS;P_yYtfe;f@$P*xl*nD*$>3rkUs#R|t@D9pHaz7t$Ovb0>g+88czlYyWWPyf*?
zPM(_kC~*Rm^Ht8{{hM~LNVDGHqHL=vWon_U?K%A;xBszG$o^PAJG-&IKBL+xXKc~0
z?{|f0H*3|ubo%Enae+Je(Xz@Kz;7C$bo2B_`{1#9-h<&!#KD#eo3Tn4b)?r9jN^|w
zRV?cbIB3?isoi7b)1r^~^BzUWeR|sUc<kDGb(!-VUuszhs&tUT^Nr&wG_}J2tM-J-
zz_WD~2SJC8u5A+_GL&7=$}sZ!K>AWC>oJ6~Rr%x&L9gUlx#9ga(mg~FB%c+)Q7OxC
z+;*3<mEb|!t%Wwy3v=OMIo8g0IVw34Yt#b|^QWbOa_pf)m5dzbJQFgEg00$iq491M
z-0gbbC?wq|&n$>C+t`}|h;PdF65X+2o(spbj5J`0A)-$WIc08BzDXU$%G4K5qy0!N
zPDq(gClb!2r_6XL>2X6e%tWyvPP`Z554;F%QsPSpsMeO8AghJd7mC~uR?HzCvG(Lk
zi>1p-AMyBlUou)aduyb`j&d$m3f9Bh`tvTKK&KNgcXx+e)pJhbc&mY`N2O#X-S;bB
zmf|-?oLCK4A#YL#D6|p_-$cqWSv-_gHc&UvoKY@hdcZ1pdyZIy7(ZCM{mG;FLbb1K
z4Y&Vw-nHcC3o}sWWSOFly~9K08xHFfVWp0M@jt2mctfS?3w(@vOmWObhh>|yC|ywb
zK1+PxoV8;$p=bgp)3e@?b@Y12y1+WaI`g413EEP|{mZHDD!Wd<gX+Bvstv&n0-F?m
zS-speoyEdz_-&zBBe}9{j827iSm7PPH)*0nL3Ao=d1X0?<M-|8?Qr%LKRp|6FD5?J
zOdio68`xI*nfw#~7)eGRN*mM@j$pr+ewXkr;vVvDMT&a<z454fJ#bzTzTK3qRLWFW
zJp&F5$2;1%ev(AhM7Bf*4jy<>aenbqF{$2>-T*wd=#{QtxuTwc?phJ?L{f=fG5W=>
zE`u(jNW3tt7*Xg7m;T~!co{)p*rDE`1^c3%Rb{r;)XhX{b+5*Yli88HB=k*yP$yf}
z(CoXn9E~ZLjEzx}#YNeoFacEo{TiL41Y2pswG{W$3{OqsE%t)sBmc-HnuDjSPZ{zB
z)$93eOdN}ol9LQdluNWrly;ki%l8V<`OONAhUWnkvOTI#Or9tqVzIZ-Te`Eliv=VF
zbQ+RkC*|D5j(H5(jq=FvE(QB3nJuqSnd+_uOWw^}XAk^%F5#EXX9XupWCjE^WUK`9
zWZ1hBT|(}z5{x`O^MABqrX4b{Jc~q&<dxvK`caA8NyQI}l+pIxCTpx~&fU)4xoiY%
z%xr2JI~x0GIvVx)PxHmq#npR;28VKnrc#B{CHbcLx6-%Lr_-0~%#FN^I5CBoZ#F8`
z>qhy8`<Nz|5F=5;JOe!=(;CGxblKyn#<IqO+XeNS@tP%>Q;3erKbSsDQQf`DjTwUZ
za*Q*^&jMjdkErV^@7RxTj`wTu`*0~qNFFvzQNn1%=>Phw2aVWEv86O@#=f*)*KyJ|
z55i!WYIsIq4RdGUX{S9}H+@_QL64|^9dr~P6`>Y5z@03`ozBp`*xS6W>UrXBy5ci-
zf=;hVZ{I7Nuh<vfx8Dz2_&g~1`Dv!1!0VBYUf2)qjZtaR&xyQ_%ccHWFs%SY?G_7<
z6;GUg*>q)H9<mr`aX>HiSIXn_n$((v$P)jOq1m8FYh7>MfL4cVrdh}`>^;l1^|jCS
zC{%!YjEBIF2#^ghzHxr)^N#s@jI`Li&EM+TJ=y52dRbc8*ub*DjkYpoyWU?P%b0On
zDcCryJw?b1|DRJMgch3?Q62tdPeQ^%^h2d%+`<j+kMbo8Ax9Trub1V|<dfu=(h+=G
zq7_`KLL5@X+zt|RA`OBK(%sy)hJ%v^Xaf}|wFjcy9Oc3;PA$t9dq-ib=vC4+U-}fD
zUQ;*kY;5~+NC90DH#MhNl8kz|=JSN#vQ!*}bkUCw?;sz?ka)K<wj&<#j0%s2&%jJL
z9%>#cb7=T{`W4qC<jvY8kjJ@EAN-`~W0N|$`eM3RCSBTFCTD(0v1Y!YPjMgJ<%*d#
z;xULF#HQ`rfl`~0>Z>l7s5+j9iG+QQH6KfF8FG<e<nn*Qjo7C-2&)k``nKPPBKk#>
zN;01f?G4uS&wmujIQV?MN8L`n@(Gg{s;1AyXt3E_>L6Mz;qE<8vPOIBS?EiGQi*So
z7!K!2t&%<c<Z}OJHXjYgfLCq(fo-*Tj=Q9KBpV@qy9?8MrdkF(hRd}UXQ5~YDcXq0
za+-PiWZL&L><eBS3}LSQ-%}S7z7~~q)>{wTj@fQ+E^%cVQzR89ZzfZ?kk8J2C0~B|
zb?@Y_!aPs%5c_;%5C&GC`(5H&lTAS%c1T<r{sn#vKZ6VJk1f_(OrN@p?lbr{{T2K*
zId9yAyOio{nb*V9)0niKv^iHfufa)|M-*?LCY?K*mT5Y>@Acr1;a?K6P++F(Cng!k
zB;h)-Q_pslD0=>Dxk4WxxyXgd^*&^Dud=wwd#`Wfh?j8>$;Ia0M*Eho5RU)%mJz|o
z;~<xIn5LMnn|5w&Y22VSC^b5@v*dH3H2)uEhM<I@x9SnR&wg$@a6BGyI2?^mMEm)3
z|64Gh&%yX^Sz(tQC|wU4s61E36t1JT#GAyiCWqfV53A=l?&yEhPpc3!bKddXk+_N<
z*Xn7^XiO`wH*u`r_i3*6wZ&~SWQt%HkDI;!&|ObWW{OHKHXr%8;<|7r%XEwW9#1Z@
z1C6uDC;MehT1{rhGJCSKu*I-RY2&MfnS+J*4z0+nqtOK=96?CX@KxMNEG6t#Y-;R4
zD0%2^=5r}g(N$@W%k7H-*s%35TPFQg&ecFUJspq#>E!M-b~I%)JNYm<{=4(Lyvv=|
z-Fp@D-R<2ETl%~N_+A~qJl|_WE+82Xa+fK!*55I`XTP@lS9PL0Qg9xBFFyYICVtA%
zg_Qu;Jow*avQpO3fFPg85QGYXpnun3--e(!yb!cw4nblm5Jd0#$*fBeg7Bdi>Tred
z@bK&F>(ta#TU*=M*x2>;bsP@&@#Dv>t*w@pmh<!T4<9~UU0u1myO)%deEITaety2W
zxj8d4^YHL+XJ=<|aWO3|ZFP0^=g*%Q493;f_4xR>prGLM=g;-^^_Q2Ig@uJxRaKLd
zla-Z~k&%&TH2UP^<lDDzE-o&wU%&qM@873SpQ@{?8yg$j+uK)GRz^ohlai8t{P>Zc
zp6=%6Ha$I^n3%Y+u@M&+x4XN0dV1>Y?0j%=aCCGO6BCo2oqcw8=H%owK0dy=x!Km%
zmY0_oA0J;-R5Uj?x3;#{*Vp&=@85-mg}uGK=;&w<4-YV`wzjs8j*hObE*uWm)6;wT
z@}<7MzJY;(p`oFXk&&^nv5AR^sj2C!SFg;>%*@TrEi5c7EiJ9AtgNlAZES1+C<Fpw
zXJ=<`Z|~sX;OOWG4ggLCCIaJwGXqxOMPNElPtP}R-n@PL7Kuc9d3kwzd;9qK`1<<3
zd-u-I&(GiA|NZ;-C=@CnARsU>FeoS}I5;>YBqTI6G%PF(c!`LJ0K}rAqQJ?41u!oV
z1k?Z&02&xGAt3?40l1QrlT%VsfJEQ|aLdTZ0Gxp%U?D3j3sB0*$;r*l1^NJ={QP_%
z2zUXMii?YZ*3#0_va+)B^74v`3ZM!20!C_TYQBE`T3cHSwAR(t0cAjFLqh{F)zs7k
z8UT5G|NgzTwH06o?m9X;Iy*bNy1Kf%yL)<idV6~T{Qmy_fq{X+!NH-SAuJX<JUl!y
zG6EEjjg0|i6B834jH#(9V0mU{W_ETKSOb9pU!bd{rKRQNWl#dB0t5zZf;d45Ks1OG
z^tQdd4GIKR{QC6^_}$;%2VwmF{rk_KKOjy}2uKmc1_A&{gK|J@pcaty#l;0E6I2ai
zxN}3K5PUb<o;sSk;PL<Ug6w`3wm}e{xr)3j+-q)PV%niYhU(TxiRqhqHIIX4q<Aw<
z>iSy9yArl)&L9wgI;jjyqzDv8-a6|DdEb4ucxO}_gKbxMo`wwPB~2%IKpWcEuBvkj
zuDfz;vj~;@=f;uP3-ZFbmkUdkpF=Fz#Mxas_La@9vmR=4MAD00wLgVqkQ-<!RfZe7
z2^-a|XAe+Shk5*{UKjExh`nN>7vh~pmLQ0;6EC?TrrH?mB^G&+t$mRxrTy|;osEc!
zTI&;~xjpoj1Vw*I5m}7)iTam3CyJDli9j7;zgLpAl&P8hUx(Xc$SA0}imEG(HP|EH
zUbmC}(wD@oAJo5pt`lMQWyx!X+M?ukdXvZR+)AgMLD+tD0L&siyq9K}>_HtJ&LA@&
zxi@ox-!1p8s=OzcEtyky4WTuqW0e}V@FIgsZe6~m^{I-j-3j6?{FvmI4?#{2y*W~x
kidOrojp+E9y!>Z;D448bs%_%b1&D-H6g1__<;(;B4?`9=;Q#;t

literal 0
HcmV?d00001

diff --git a/3rdparty/css/chosen/chosen.css b/3rdparty/css/chosen/chosen.css
new file mode 100644
index 00000000000..b9c6d88028f
--- /dev/null
+++ b/3rdparty/css/chosen/chosen.css
@@ -0,0 +1,368 @@
+/* @group Base */
+.chzn-container {
+  font-size: 13px;
+  position: relative;
+  display: inline-block;
+  zoom: 1;
+  *display: inline;
+}
+.chzn-container .chzn-drop {
+  background: #fff;
+  border: 1px solid #aaa;
+  border-top: 0;
+  position: absolute;
+  top: 29px;
+  left: 0;
+  -webkit-box-shadow: 0 4px 5px rgba(0,0,0,.15);
+  -moz-box-shadow   : 0 4px 5px rgba(0,0,0,.15);
+  -o-box-shadow     : 0 4px 5px rgba(0,0,0,.15);
+  box-shadow        : 0 4px 5px rgba(0,0,0,.15);
+  z-index: 999;
+}
+/* @end */
+
+/* @group Single Chosen */
+.chzn-container-single .chzn-single {
+  background-color: #fff;
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.5, white));
+  background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 50%);
+  background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 50%);
+  background-image: -o-linear-gradient(top, #eeeeee 0%,#ffffff 50%);
+  background-image: -ms-linear-gradient(top, #eeeeee 0%,#ffffff 50%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#ffffff',GradientType=0 );
+  background-image: linear-gradient(top, #eeeeee 0%,#ffffff 50%);
+  -webkit-border-radius: 4px;
+  -moz-border-radius   : 4px;
+  border-radius        : 4px;
+  -moz-background-clip   : padding;
+  -webkit-background-clip: padding-box;
+  background-clip        : padding-box;
+  border: 1px solid #aaa;
+  display: block;
+  overflow: hidden;
+  white-space: nowrap;
+  position: relative;
+  height: 26px;
+  line-height: 26px;
+  padding: 0 0 0 8px;
+  color: #444;
+  text-decoration: none;
+}
+.chzn-container-single .chzn-single span {
+  margin-right: 26px;
+  display: block;
+  overflow: hidden;
+  white-space: nowrap;
+  -o-text-overflow: ellipsis;
+  -ms-text-overflow: ellipsis;
+  text-overflow: ellipsis;
+}
+.chzn-container-single .chzn-single abbr {
+  display: block;
+  position: absolute;
+  right: 26px;
+  top: 8px;
+  width: 12px;
+  height: 13px;
+  font-size: 1px;
+  background: url(chosen-sprite.png) right top no-repeat;
+}
+.chzn-container-single .chzn-single abbr:hover {
+  background-position: right -11px;
+}
+.chzn-container-single .chzn-single div {
+  -webkit-border-radius: 0 4px 4px 0;
+  -moz-border-radius   : 0 4px 4px 0;
+  border-radius        : 0 4px 4px 0;
+  -moz-background-clip   : padding;
+  -webkit-background-clip: padding-box;
+  background-clip        : padding-box;
+  background: #ccc;
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee));
+  background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%);
+  background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%);
+  background-image: -o-linear-gradient(bottom, #ccc 0%, #eee 60%);
+  background-image: -ms-linear-gradient(top, #cccccc 0%,#eeeeee 60%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cccccc', endColorstr='#eeeeee',GradientType=0 );
+  background-image: linear-gradient(top, #cccccc 0%,#eeeeee 60%);
+  border-left: 1px solid #aaa;
+  position: absolute;
+  right: 0;
+  top: 0;
+  display: block;
+  height: 100%;
+  width: 18px;
+}
+.chzn-container-single .chzn-single div b {
+  background: url('chosen-sprite.png') no-repeat 0 1px;
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+.chzn-container-single .chzn-search {
+  padding: 3px 4px;
+  position: relative;
+  margin: 0;
+  white-space: nowrap;
+}
+.chzn-container-single .chzn-search input {
+  background: #fff url('chosen-sprite.png') no-repeat 100% -22px;
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  margin: 1px 0;
+  padding: 4px 20px 4px 5px;
+  outline: 0;
+  border: 1px solid #aaa;
+  font-family: sans-serif;
+  font-size: 1em;
+}
+.chzn-container-single .chzn-drop {
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius   : 0 0 4px 4px;
+  border-radius        : 0 0 4px 4px;
+  -moz-background-clip   : padding;
+  -webkit-background-clip: padding-box;
+  background-clip        : padding-box;
+}
+/* @end */
+
+.chzn-container-single-nosearch .chzn-search input {
+  position: absolute;
+  left: -9000px;
+}
+
+/* @group Multi Chosen */
+.chzn-container-multi .chzn-choices {
+  background-color: #fff;
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+  background-image: -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background-image: -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background-image: -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+  background-image: -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
+  background-image: linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  border: 1px solid #aaa;
+  margin: 0;
+  padding: 0;
+  cursor: text;
+  overflow: hidden;
+  height: auto !important;
+  height: 1%;
+  position: relative;
+}
+.chzn-container-multi .chzn-choices li {
+  float: left;
+  list-style: none;
+}
+.chzn-container-multi .chzn-choices .search-field {
+  white-space: nowrap;
+  margin: 0;
+  padding: 0;
+}
+.chzn-container-multi .chzn-choices .search-field input {
+  color: #666;
+  background: transparent !important;
+  border: 0 !important;
+  padding: 5px;
+  margin: 1px 0;
+  outline: 0;
+  -webkit-box-shadow: none;
+  -moz-box-shadow   : none;
+  -o-box-shadow     : none;
+  box-shadow        : none;
+}
+.chzn-container-multi .chzn-choices .search-field .default {
+  color: #999;
+}
+.chzn-container-multi .chzn-choices .search-choice {
+  -webkit-border-radius: 3px;
+  -moz-border-radius   : 3px;
+  border-radius        : 3px;
+  -moz-background-clip   : padding;
+  -webkit-background-clip: padding-box;
+  background-clip        : padding-box;
+  background-color: #e4e4e4;
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #e4e4e4), color-stop(0.7, #eeeeee));
+  background-image: -webkit-linear-gradient(center bottom, #e4e4e4 0%, #eeeeee 70%);
+  background-image: -moz-linear-gradient(center bottom, #e4e4e4 0%, #eeeeee 70%);
+  background-image: -o-linear-gradient(bottom, #e4e4e4 0%, #eeeeee 70%);
+  background-image: -ms-linear-gradient(top, #e4e4e4 0%,#eeeeee 70%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e4e4e4', endColorstr='#eeeeee',GradientType=0 );
+  background-image: linear-gradient(top, #e4e4e4 0%,#eeeeee 70%);
+  color: #333;
+  border: 1px solid #b4b4b4;
+  line-height: 13px;
+  padding: 3px 19px 3px 6px;
+  margin: 3px 0 3px 5px;
+  position: relative;
+}
+.chzn-container-multi .chzn-choices .search-choice span {
+  cursor: default;
+}
+.chzn-container-multi .chzn-choices .search-choice-focus {
+  background: #d4d4d4;
+}
+.chzn-container-multi .chzn-choices .search-choice .search-choice-close {
+  display: block;
+  position: absolute;
+  right: 3px;
+  top: 4px;
+  width: 12px;
+  height: 13px;
+  font-size: 1px;
+  background: url(chosen-sprite.png) right top no-repeat;
+}
+.chzn-container-multi .chzn-choices .search-choice .search-choice-close:hover {
+  background-position: right -11px;
+}
+.chzn-container-multi .chzn-choices .search-choice-focus .search-choice-close {
+  background-position: right -11px;
+}
+/* @end */
+
+/* @group Results */
+.chzn-container .chzn-results {
+  margin: 0 4px 4px 0;
+  max-height: 190px;
+  padding: 0 0 0 4px;
+  position: relative;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+.chzn-container-multi .chzn-results {
+  margin: -1px 0 0;
+  padding: 0;
+}
+.chzn-container .chzn-results li {
+  display: none;
+  line-height: 80%;
+  padding: 7px 7px 8px;
+  margin: 0;
+  list-style: none;
+}
+.chzn-container .chzn-results .active-result {
+  cursor: pointer;
+  display: list-item;
+}
+.chzn-container .chzn-results .highlighted {
+  background: #3875d7;
+  color: #fff;
+}
+.chzn-container .chzn-results li em {
+  background: #feffde;
+  font-style: normal;
+}
+.chzn-container .chzn-results .highlighted em {
+  background: transparent;
+}
+.chzn-container .chzn-results .no-results {
+  background: #f4f4f4;
+  display: list-item;
+}
+.chzn-container .chzn-results .group-result {
+  cursor: default;
+  color: #999;
+  font-weight: bold;
+}
+.chzn-container .chzn-results .group-option {
+  padding-left: 20px;
+}
+.chzn-container-multi .chzn-drop .result-selected {
+  display: none;
+}
+/* @end */
+
+/* @group Active  */
+.chzn-container-active .chzn-single {
+  -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
+  -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
+  -o-box-shadow     : 0 0 5px rgba(0,0,0,.3);
+  box-shadow        : 0 0 5px rgba(0,0,0,.3);
+  border: 1px solid #5897fb;
+}
+.chzn-container-active .chzn-single-with-drop {
+  border: 1px solid #aaa;
+  -webkit-box-shadow: 0 1px 0 #fff inset;
+  -moz-box-shadow   : 0 1px 0 #fff inset;
+  -o-box-shadow     : 0 1px 0 #fff inset;
+  box-shadow        : 0 1px 0 #fff inset;
+  background-color: #eee;
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, white), color-stop(0.5, #eeeeee));
+  background-image: -webkit-linear-gradient(center bottom, white 0%, #eeeeee 50%);
+  background-image: -moz-linear-gradient(center bottom, white 0%, #eeeeee 50%);
+  background-image: -o-linear-gradient(bottom, white 0%, #eeeeee 50%);
+  background-image: -ms-linear-gradient(top, #ffffff 0%,#eeeeee 50%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
+  background-image: linear-gradient(top, #ffffff 0%,#eeeeee 50%);
+  -webkit-border-bottom-left-radius : 0;
+  -webkit-border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft : 0;
+  -moz-border-radius-bottomright: 0;
+  border-bottom-left-radius : 0;
+  border-bottom-right-radius: 0;
+}
+.chzn-container-active .chzn-single-with-drop div {
+  background: transparent;
+  border-left: none;
+}
+.chzn-container-active .chzn-single-with-drop div b {
+  background-position: -18px 1px;
+}
+.chzn-container-active .chzn-choices {
+  -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
+  -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
+  -o-box-shadow     : 0 0 5px rgba(0,0,0,.3);
+  box-shadow        : 0 0 5px rgba(0,0,0,.3);
+  border: 1px solid #5897fb;
+}
+.chzn-container-active .chzn-choices .search-field input {
+  color: #111 !important;
+}
+/* @end */
+
+/* @group Disabled Support */
+.chzn-disabled {
+  cursor: default;
+  opacity:0.5 !important;
+}
+.chzn-disabled .chzn-single {
+  cursor: default;
+}
+.chzn-disabled .chzn-choices .search-choice .search-choice-close {
+  cursor: default;
+}
+
+/* @group Right to Left */
+.chzn-rtl { direction:rtl;text-align: right; }
+.chzn-rtl .chzn-single { padding-left: 0; padding-right: 8px; }
+.chzn-rtl .chzn-single span { margin-left: 26px; margin-right: 0; }
+.chzn-rtl .chzn-single div { 
+  left: 0; right: auto; 
+  border-left: none; border-right: 1px solid #aaaaaa;
+  -webkit-border-radius: 4px 0 0 4px;
+  -moz-border-radius   : 4px 0 0 4px;
+  border-radius        : 4px 0 0 4px; 
+}
+.chzn-rtl .chzn-choices li { float: right; }
+.chzn-rtl .chzn-choices .search-choice { padding: 3px 6px 3px 19px; margin: 3px 5px 3px 0; }
+.chzn-rtl .chzn-choices .search-choice .search-choice-close { left: 5px; right: auto; background-position: right top;}
+.chzn-rtl.chzn-container-single .chzn-results { margin-left: 4px; margin-right: 0; padding-left: 0; padding-right: 4px; }
+.chzn-rtl .chzn-results .group-option { padding-left: 0; padding-right: 20px; }
+.chzn-rtl.chzn-container-active .chzn-single-with-drop div { border-right: none; }
+.chzn-rtl .chzn-search input {
+  background: url('chosen-sprite.png') no-repeat -38px -22px, #ffffff;
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  padding: 4px 5px 4px 20px;
+}
+/* @end */
\ No newline at end of file
diff --git a/3rdparty/fullcalendar/GPL-LICENSE.txt b/3rdparty/fullcalendar/GPL-LICENSE.txt
new file mode 100644
index 00000000000..11dddd00ef0
--- /dev/null
+++ b/3rdparty/fullcalendar/GPL-LICENSE.txt
@@ -0,0 +1,278 @@
+        GNU GENERAL PUBLIC LICENSE
+           Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+          Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+        GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+          NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
diff --git a/3rdparty/fullcalendar/MIT-LICENSE.txt b/3rdparty/fullcalendar/MIT-LICENSE.txt
new file mode 100644
index 00000000000..46d47544964
--- /dev/null
+++ b/3rdparty/fullcalendar/MIT-LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2009 Adam Shaw
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/3rdparty/fullcalendar/changelog.txt b/3rdparty/fullcalendar/changelog.txt
new file mode 100644
index 00000000000..50d0880fd7a
--- /dev/null
+++ b/3rdparty/fullcalendar/changelog.txt
@@ -0,0 +1,313 @@
+
+version 1.5.2 (8/21/11)
+	- correctly process UTC "Z" ISO8601 date strings (issue 750)
+
+version 1.5.1 (4/9/11)
+	- more flexible ISO8601 date parsing (issue 814)
+	- more flexible parsing of UNIX timestamps (issue 826)
+	- FullCalendar now buildable from source on a Mac (issue 795)
+	- FullCalendar QA'd in FF4 (issue 883)
+	- upgraded to jQuery 1.5.2 (which supports IE9) and jQuery UI 1.8.11
+
+version 1.5 (3/19/11)
+	- slicker default styling for buttons
+	- reworked a lot of the calendar's HTML and accompanying CSS
+	  (solves issues 327 and 395)
+	- more printer-friendly (fullcalendar-print.css)
+	- fullcalendar now inherits styles from jquery-ui themes differently.
+	  styles for buttons are distinct from styles for calendar cells.
+	  (solves issue 299)
+	- can now color events through FullCalendar options and Event-Object properties (issue 117)
+	  THIS IS NOW THE PREFERRED METHOD OF COLORING EVENTS (as opposed to using className and CSS)
+		- FullCalendar options:
+			- eventColor (changes both background and border)
+			- eventBackgroundColor
+			- eventBorderColor
+			- eventTextColor
+		- Event-Object options:
+			- color (changes both background and border)
+			- backgroundColor
+			- borderColor
+			- textColor
+	- can now specify an event source as an *object* with a `url` property (json feed) or
+	  an `events` property (function or array) with additional properties that will
+	  be applied to the entire event source:
+		- color (changes both background and border)
+		- backgroudColor
+		- borderColor
+		- textColor
+		- className
+		- editable
+		- allDayDefault
+		- ignoreTimezone
+		- startParam (for a feed)
+		- endParam   (for a feed)
+		- ANY OF THE JQUERY $.ajax OPTIONS
+		  allows for easily changing from GET to POST and sending additional parameters (issue 386)
+		  allows for easily attaching ajax handlers such as `error` (issue 754)
+		  allows for turning caching on (issue 355)
+	- Google Calendar feeds are now specified differently:
+		- specify a simple string of your feed's URL
+		- specify an *object* with a `url` property of your feed's URL.
+		  you can include any of the new Event-Source options in this object.
+		- the old `$.fullCalendar.gcalFeed` method still works
+	- no more IE7 SSL popup (issue 504)
+	- remove `cacheParam` - use json event source `cache` option instead
+	- latest jquery/jquery-ui
+
+version 1.4.11 (2/22/11)
+	- fixed rerenderEvents bug (issue 790)
+	- fixed bug with faulty dragging of events from all-day slot in agenda views
+	- bundled with jquery 1.5 and jquery-ui 1.8.9
+
+version 1.4.10 (1/2/11)
+	- fixed bug with resizing event to different week in 5-day month view (issue 740)
+	- fixed bug with events not sticking after a removeEvents call (issue 757)
+	- fixed bug with underlying parseTime method, and other uses of parseInt (issue 688)
+
+version 1.4.9 (11/16/10)
+	- new algorithm for vertically stacking events (issue 111)
+	- resizing an event to a different week (issue 306)
+	- bug: some events not rendered with consecutive calls to addEventSource (issue 679)
+
+version 1.4.8 (10/16/10)
+	- ignoreTimezone option (set to `false` to process UTC offsets in ISO8601 dates)
+	- bugfixes
+		- event refetching not being called under certain conditions (issues 417, 554)
+		- event refetching being called multiple times under certain conditions (issues 586, 616)
+		- selection cannot be triggered by right mouse button (issue 558)
+		- agenda view left axis sized incorrectly (issue 465)
+		- IE js error when calendar is too narrow (issue 517)
+		- agenda view looks strange when no scrollbars (issue 235)
+		- improved parsing of ISO8601 dates with UTC offsets
+	- $.fullCalendar.version
+	- an internal refactor of the code, for easier future development and modularity
+
+version 1.4.7 (7/5/10)
+	- "dropping" external objects onto the calendar
+		- droppable (boolean, to turn on/off)
+		- dropAccept (to filter which events the calendar will accept)
+		- drop (trigger)
+	- selectable options can now be specified with a View Option Hash
+	- bugfixes
+		- dragged & reverted events having wrong time text (issue 406)
+		- bug rendering events that have an endtime with seconds, but no hours/minutes (issue 477)
+		- gotoDate date overflow bug (issue 429)
+		- wrong date reported when clicking on edge of last column in agenda views (412)
+	- support newlines in event titles
+	- select/unselect callbacks now passes native js event
+
+version 1.4.6 (5/31/10)
+	- "selecting" days or timeslots
+		- options: selectable, selectHelper, unselectAuto, unselectCancel
+		- callbacks: select, unselect
+		- methods: select, unselect
+	- when dragging an event, the highlighting reflects the duration of the event
+	- code compressing by Google Closure Compiler
+	- bundled with jQuery 1.4.2 and jQuery UI 1.8.1
+
+version 1.4.5 (2/21/10)
+	- lazyFetching option, which can force the calendar to fetch events on every view/date change
+	- scroll state of agenda views are preserved when switching back to view
+	- bugfixes
+		- calling methods on an uninitialized fullcalendar throws error
+		- IE6/7 bug where an entire view becomes invisible (issue 320)
+		- error when rendering a hidden calendar (in jquery ui tabs for example) in IE (issue 340)
+		- interconnected bugs related to calendar resizing and scrollbars
+			- when switching views or clicking prev/next, calendar would "blink" (issue 333)
+			- liquid-width calendar's events shifted (depending on initial height of browser) (issue 341)
+			- more robust underlying algorithm for calendar resizing
+
+version 1.4.4 (2/3/10)
+	- optimized event rendering in all views (events render in 1/10 the time)
+	- gotoDate() does not force the calendar to unnecessarily rerender
+	- render() method now correctly readjusts height
+
+version 1.4.3 (12/22/09)
+	- added destroy method
+	- Google Calendar event pages respect currentTimezone
+	- caching now handled by jQuery's ajax
+	- protection from setting aspectRatio to zero
+	- bugfixes
+		- parseISO8601 and DST caused certain events to display day before
+		- button positioning problem in IE6
+		- ajax event source removed after recently being added, events still displayed
+		- event not displayed when end is an empty string
+		- dynamically setting calendar height when no events have been fetched, throws error
+
+version 1.4.2 (12/02/09)
+	- eventAfterRender trigger
+	- getDate & getView methods
+	- height & contentHeight options (explicitly sets the pixel height)
+	- minTime & maxTime options (restricts shown hours in agenda view)
+	- getters [for all options] and setters [for height, contentHeight, and aspectRatio ONLY! stay tuned..]
+	- render method now readjusts calendar's size
+	- bugfixes
+		- lightbox scripts that use iframes (like fancybox)
+		- day-of-week classNames were off when firstDay=1
+		- guaranteed space on right side of agenda events (even when stacked)
+		- accepts ISO8601 dates with a space (instead of 'T')
+
+version 1.4.1 (10/31/09)
+	- can exclude weekends with new 'weekends' option
+	- gcal feed 'currentTimezone' option
+	- bugfixes
+		- year/month/date option sometimes wouldn't set correctly (depending on current date)
+		- daylight savings issue caused agenda views to start at 1am (for BST users)
+	- cleanup of gcal.js code
+
+version 1.4 (10/19/09)
+	- agendaWeek and agendaDay views
+	- added some options for agenda views:
+		- allDaySlot
+		- allDayText
+		- firstHour
+		- slotMinutes
+		- defaultEventMinutes
+		- axisFormat
+	- modified some existing options/triggers to work with agenda views:
+		- dragOpacity and timeFormat can now accept a "View Hash" (a new concept)
+		- dayClick now has an allDay parameter
+		- eventDrop now has an an allDay parameter
+		  (this will affect those who use revertFunc, adjust parameter list)
+	- added 'prevYear' and 'nextYear' for buttons in header
+	- minor change for theme users, ui-state-hover not applied to active/inactive buttons
+	- added event-color-changing example in docs
+	- better defaults for right-to-left themed button icons
+
+version 1.3.2 (10/13/09)
+	- Bugfixes (please upgrade from 1.3.1!)
+		- squashed potential infinite loop when addMonths and addDays
+		  is called with an invalid date
+		- $.fullCalendar.parseDate() now correctly parses IETF format
+		- when switching views, the 'today' button sticks inactive, fixed
+	- gotoDate now can accept a single Date argument
+	- documentation for changes in 1.3.1 and 1.3.2 now on website
+
+version 1.3.1 (9/30/09)
+	- Important Bugfixes (please upgrade from 1.3!)
+		- When current date was late in the month, for long months, and prev/next buttons
+		  were clicked in month-view, some months would be skipped/repeated
+		- In certain time zones, daylight savings time would cause certain days
+		  to be misnumbered in month-view
+	- Subtle change in way week interval is chosen when switching from month to basicWeek/basicDay view
+	- Added 'allDayDefault' option
+	- Added 'changeView' and 'render' methods
+
+version 1.3 (9/21/09)
+	- different 'views': month/basicWeek/basicDay
+	- more flexible 'header' system for buttons
+	- themable by jQuery UI themes
+	- resizable events (require jQuery UI resizable plugin)
+	- rescoped & rewritten CSS, enhanced default look
+	- cleaner css & rendering techniques for right-to-left
+	- reworked options & API to support multiple views / be consistent with jQuery UI
+	- refactoring of entire codebase
+		- broken into different JS & CSS files, assembled w/ build scripts
+		- new test suite for new features, uses firebug-lite
+	- refactored docs
+	- Options
+		+ date
+		+ defaultView
+		+ aspectRatio
+		+ disableResizing
+		+ monthNames      (use instead of $.fullCalendar.monthNames)
+		+ monthNamesShort (use instead of $.fullCalendar.monthAbbrevs)
+		+ dayNames        (use instead of $.fullCalendar.dayNames)
+		+ dayNamesShort   (use instead of $.fullCalendar.dayAbbrevs)
+		+ theme
+		+ buttonText
+		+ buttonIcons
+		x draggable           -> editable/disableDragging
+		x fixedWeeks          -> weekMode
+		x abbrevDayHeadings   -> columnFormat
+		x buttons/title       -> header
+		x eventDragOpacity    -> dragOpacity
+		x eventRevertDuration -> dragRevertDuration
+		x weekStart           -> firstDay
+		x rightToLeft         -> isRTL
+		x showTime (use 'allDay' CalEvent property instead)
+	- Triggered Actions
+		+ eventResizeStart
+		+ eventResizeStop
+		+ eventResize
+		x monthDisplay -> viewDisplay
+		x resize       -> windowResize
+		'eventDrop' params changed, can revert if ajax cuts out
+	- CalEvent Properties
+		x showTime  -> allDay
+		x draggable -> editable
+		'end' is now INCLUSIVE when allDay=true
+		'url' now produces a real <a> tag, more native clicking/tab behavior
+	- Methods:
+		+ renderEvent
+		x prevMonth         -> prev
+		x nextMonth         -> next
+		x prevYear/nextYear -> moveDate
+		x refresh           -> rerenderEvents/refetchEvents
+		x removeEvent       -> removeEvents
+		x getEventsByID     -> clientEvents
+	- Utilities:
+		'formatDate' format string completely changed (inspired by jQuery UI datepicker + datejs)
+		'formatDates' added to support date-ranges
+	- Google Calendar Options:
+		x draggable -> editable
+	- Bugfixes
+		- gcal extension fetched 25 results max, now fetches all
+
+version 1.2.1 (6/29/09)
+	- bugfixes
+		- allows and corrects invalid end dates for events
+		- doesn't throw an error in IE while rendering when display:none
+		- fixed 'loading' callback when used w/ multiple addEventSource calls
+		- gcal className can now be an array
+
+version 1.2 (5/31/09)
+	- expanded API
+		- 'className' CalEvent attribute
+		- 'source' CalEvent attribute
+		- dynamically get/add/remove/update events of current month
+		- locale improvements: change month/day name text
+		- better date formatting ($.fullCalendar.formatDate)
+		- multiple 'event sources' allowed
+			- dynamically add/remove event sources
+	- options for prevYear and nextYear buttons
+	- docs have been reworked (include addition of Google Calendar docs)
+	- changed behavior of parseDate for number strings
+	  (now interpets as unix timestamp, not MS times)
+	- bugfixes
+		- rightToLeft month start bug
+		- off-by-one errors with month formatting commands
+		- events from previous months sticking when clicking prev/next quickly
+	- Google Calendar API changed to work w/ multiple event sources
+		- can also provide 'className' and 'draggable' options
+	- date utilties moved from $ to $.fullCalendar
+	- more documentation in source code
+	- minified version of fullcalendar.js
+	- test suit (available from svn)
+	- top buttons now use <button> w/ an inner <span> for better css cusomization
+		- thus CSS has changed. IF UPGRADING FROM PREVIOUS VERSIONS,
+		  UPGRADE YOUR FULLCALENDAR.CSS FILE!!!
+
+version 1.1 (5/10/09)
+	- Added the following options:
+		- weekStart
+		- rightToLeft
+		- titleFormat
+		- timeFormat
+		- cacheParam
+		- resize
+	- Fixed rendering bugs
+		- Opera 9.25 (events placement & window resizing)
+		- IE6 (window resizing)
+	- Optimized window resizing for ALL browsers
+	- Events on same day now sorted by start time (but first by timespan)
+	- Correct z-index when dragging
+	- Dragging contained in overflow DIV for IE6
+	- Modified fullcalendar.css
+		- for right-to-left support
+		- for variable start-of-week
+		- for IE6 resizing bug
+		- for THEAD and TBODY (in 1.0, just used TBODY, restructured in 1.1)
+		- IF UPGRADING FROM FULLCALENDAR 1.0, YOU MUST UPGRADE FULLCALENDAR.CSS
+		  !!!!!!!!!!!
diff --git a/3rdparty/fullcalendar/css/fullcalendar.css b/3rdparty/fullcalendar/css/fullcalendar.css
new file mode 100644
index 00000000000..4e9e95e894f
--- /dev/null
+++ b/3rdparty/fullcalendar/css/fullcalendar.css
@@ -0,0 +1,616 @@
+/*
+ * FullCalendar v1.5.2 Stylesheet
+ *
+ * Copyright (c) 2011 Adam Shaw
+ * Dual licensed under the MIT and GPL licenses, located in
+ * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
+ *
+ * Date: Sun Aug 21 22:06:09 2011 -0700
+ *
+ */
+
+
+.fc {
+	direction: ltr;
+	text-align: left;
+	}
+
+.fc table {
+	border-collapse: collapse;
+	border-spacing: 0;
+	}
+
+html .fc,
+.fc table {
+	font-size: 1em;
+	}
+
+.fc td,
+.fc th {
+	padding: 0;
+	vertical-align: top;
+	}
+
+
+
+/* Header
+------------------------------------------------------------------------*/
+
+.fc-header td {
+	white-space: nowrap;
+	}
+
+.fc-header-left {
+	width: 25%;
+	text-align: left;
+	}
+
+.fc-header-center {
+	text-align: center;
+	}
+
+.fc-header-right {
+	width: 25%;
+	text-align: right;
+	}
+
+.fc-header-title {
+	display: inline-block;
+	vertical-align: top;
+	}
+
+.fc-header-title h2 {
+	margin-top: 0;
+	white-space: nowrap;
+	}
+
+.fc .fc-header-space {
+	padding-left: 10px;
+	}
+
+.fc-header .fc-button {
+	margin-bottom: 1em;
+	vertical-align: top;
+	}
+
+/* buttons edges butting together */
+
+.fc-header .fc-button {
+	margin-right: -1px;
+	}
+
+.fc-header .fc-corner-right {
+	margin-right: 1px; /* back to normal */
+	}
+
+.fc-header .ui-corner-right {
+	margin-right: 0; /* back to normal */
+	}
+
+/* button layering (for border precedence) */
+
+.fc-header .fc-state-hover,
+.fc-header .ui-state-hover {
+	z-index: 2;
+	}
+
+.fc-header .fc-state-down {
+	z-index: 3;
+	}
+
+.fc-header .fc-state-active,
+.fc-header .ui-state-active {
+	z-index: 4;
+	}
+
+
+
+/* Content
+------------------------------------------------------------------------*/
+
+.fc-content {
+	clear: both;
+	}
+
+.fc-view {
+	width: 100%; /* needed for view switching (when view is absolute) */
+	overflow: hidden;
+	}
+
+
+
+/* Cell Styles
+------------------------------------------------------------------------*/
+
+.fc-widget-header,    /* <th>, usually */
+.fc-widget-content {  /* <td>, usually */
+	border: 1px solid #ccc;
+	}
+
+.fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */
+	background: #ffc;
+	}
+
+.fc-cell-overlay { /* semi-transparent rectangle while dragging */
+	background: #9cf;
+	opacity: .2;
+	filter: alpha(opacity=20); /* for IE */
+	}
+
+
+
+/* Buttons
+------------------------------------------------------------------------*/
+
+.fc-button {
+	position: relative;
+	display: inline-block;
+	cursor: pointer;
+	}
+
+.fc-state-default { /* non-theme */
+	border-style: solid;
+	border-width: 1px 0;
+	}
+
+.fc-button-inner {
+	position: relative;
+	float: left;
+	overflow: hidden;
+	}
+
+.fc-state-default .fc-button-inner { /* non-theme */
+	border-style: solid;
+	border-width: 0 1px;
+	}
+
+.fc-button-content {
+	position: relative;
+	float: left;
+	height: 1.9em;
+	line-height: 1.9em;
+	padding: 0 .6em;
+	white-space: nowrap;
+	}
+
+/* icon (for jquery ui) */
+
+.fc-button-content .fc-icon-wrap {
+	position: relative;
+	float: left;
+	top: 50%;
+	}
+
+.fc-button-content .ui-icon {
+	position: relative;
+	float: left;
+	margin-top: -50%;
+	*margin-top: 0;
+	*top: -50%;
+	}
+
+/* gloss effect */
+
+.fc-state-default .fc-button-effect {
+	position: absolute;
+	top: 50%;
+	left: 0;
+	}
+
+.fc-state-default .fc-button-effect span {
+	position: absolute;
+	top: -100px;
+	left: 0;
+	width: 500px;
+	height: 100px;
+	border-width: 100px 0 0 1px;
+	border-style: solid;
+	border-color: #fff;
+	background: #444;
+	opacity: .09;
+	filter: alpha(opacity=9);
+	}
+
+/* button states (determines colors)  */
+
+.fc-state-default,
+.fc-state-default .fc-button-inner {
+	border-style: solid;
+	border-color: #ccc #bbb #aaa;
+	background: #F3F3F3;
+	color: #000;
+	}
+
+.fc-state-hover,
+.fc-state-hover .fc-button-inner {
+	border-color: #999;
+	}
+
+.fc-state-down,
+.fc-state-down .fc-button-inner {
+	border-color: #555;
+	background: #777;
+	}
+
+.fc-state-active,
+.fc-state-active .fc-button-inner {
+	border-color: #555;
+	background: #777;
+	color: #fff;
+	}
+
+.fc-state-disabled,
+.fc-state-disabled .fc-button-inner {
+	color: #999;
+	border-color: #ddd;
+	}
+
+.fc-state-disabled {
+	cursor: default;
+	}
+
+.fc-state-disabled .fc-button-effect {
+	display: none;
+	}
+
+
+
+/* Global Event Styles
+------------------------------------------------------------------------*/
+
+.fc-event {
+	border-style: solid;
+	border-width: 0;
+	font-size: .85em;
+	cursor: default;
+	}
+
+a.fc-event,
+.fc-event-draggable {
+	cursor: pointer;
+	}
+
+a.fc-event {
+	text-decoration: none;
+	}
+
+.fc-rtl .fc-event {
+	text-align: right;
+	}
+
+.fc-event-skin {
+	border-color: #36c;     /* default BORDER color */
+	background-color: #36c; /* default BACKGROUND color */
+	color: #fff;            /* default TEXT color */
+	}
+
+.fc-event-inner {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	border-style: solid;
+	border-width: 0;
+	overflow: hidden;
+	}
+
+.fc-event-time,
+.fc-event-title {
+	padding: 0 1px;
+	}
+
+.fc .ui-resizable-handle { /*** TODO: don't use ui-resizable anymore, change class ***/
+	display: block;
+	position: absolute;
+	z-index: 99999;
+	overflow: hidden; /* hacky spaces (IE6/7) */
+	font-size: 300%;  /* */
+	line-height: 50%; /* */
+	}
+
+
+
+/* Horizontal Events
+------------------------------------------------------------------------*/
+
+.fc-event-hori {
+	border-width: 1px 0;
+	margin-bottom: 1px;
+	}
+
+/* resizable */
+
+.fc-event-hori .ui-resizable-e {
+	top: 0           !important; /* importants override pre jquery ui 1.7 styles */
+	right: -3px      !important;
+	width: 7px       !important;
+	height: 100%     !important;
+	cursor: e-resize;
+	}
+
+.fc-event-hori .ui-resizable-w {
+	top: 0           !important;
+	left: -3px       !important;
+	width: 7px       !important;
+	height: 100%     !important;
+	cursor: w-resize;
+	}
+
+.fc-event-hori .ui-resizable-handle {
+	_padding-bottom: 14px; /* IE6 had 0 height */
+	}
+
+
+
+/* Fake Rounded Corners (for buttons and events)
+------------------------------------------------------------*/
+
+.fc-corner-left {
+	margin-left: 1px;
+	}
+
+.fc-corner-left .fc-button-inner,
+.fc-corner-left .fc-event-inner {
+	margin-left: -1px;
+	}
+
+.fc-corner-right {
+	margin-right: 1px;
+	}
+
+.fc-corner-right .fc-button-inner,
+.fc-corner-right .fc-event-inner {
+	margin-right: -1px;
+	}
+
+.fc-corner-top {
+	margin-top: 1px;
+	}
+
+.fc-corner-top .fc-event-inner {
+	margin-top: -1px;
+	}
+
+.fc-corner-bottom {
+	margin-bottom: 1px;
+	}
+
+.fc-corner-bottom .fc-event-inner {
+	margin-bottom: -1px;
+	}
+
+
+
+/* Fake Rounded Corners SPECIFICALLY FOR EVENTS
+-----------------------------------------------------------------*/
+
+.fc-corner-left .fc-event-inner {
+	border-left-width: 1px;
+	}
+
+.fc-corner-right .fc-event-inner {
+	border-right-width: 1px;
+	}
+
+.fc-corner-top .fc-event-inner {
+	border-top-width: 1px;
+	}
+
+.fc-corner-bottom .fc-event-inner {
+	border-bottom-width: 1px;
+	}
+
+
+
+/* Reusable Separate-border Table
+------------------------------------------------------------*/
+
+table.fc-border-separate {
+	border-collapse: separate;
+	}
+
+.fc-border-separate th,
+.fc-border-separate td {
+	border-width: 1px 0 0 1px;
+	}
+
+.fc-border-separate th.fc-last,
+.fc-border-separate td.fc-last {
+	border-right-width: 1px;
+	}
+
+.fc-border-separate tr.fc-last th,
+.fc-border-separate tr.fc-last td {
+	border-bottom-width: 1px;
+	}
+
+.fc-border-separate tbody tr.fc-first td,
+.fc-border-separate tbody tr.fc-first th {
+	border-top-width: 0;
+	}
+
+
+
+/* Month View, Basic Week View, Basic Day View
+------------------------------------------------------------------------*/
+
+.fc-grid th {
+	text-align: center;
+	}
+
+.fc-grid .fc-day-number {
+	float: right;
+	padding: 0 2px;
+	}
+
+.fc-grid .fc-other-month .fc-day-number {
+	opacity: 0.3;
+	filter: alpha(opacity=30); /* for IE */
+	/* opacity with small font can sometimes look too faded
+	   might want to set the 'color' property instead
+	   making day-numbers bold also fixes the problem */
+	}
+
+.fc-grid .fc-day-content {
+	clear: both;
+	padding: 2px 2px 1px; /* distance between events and day edges */
+	}
+
+/* event styles */
+
+.fc-grid .fc-event-time {
+	font-weight: bold;
+	}
+
+/* right-to-left */
+
+.fc-rtl .fc-grid .fc-day-number {
+	float: left;
+	}
+
+.fc-rtl .fc-grid .fc-event-time {
+	float: right;
+	}
+
+
+
+/* Agenda Week View, Agenda Day View
+------------------------------------------------------------------------*/
+
+.fc-agenda table {
+	border-collapse: separate;
+	}
+
+.fc-agenda-days th {
+	text-align: center;
+	}
+
+.fc-agenda .fc-agenda-axis {
+	width: 50px;
+	padding: 0 4px;
+	vertical-align: middle;
+	text-align: right;
+	white-space: nowrap;
+	font-weight: normal;
+	}
+
+.fc-agenda .fc-day-content {
+	padding: 2px 2px 1px;
+	}
+
+/* make axis border take precedence */
+
+.fc-agenda-days .fc-agenda-axis {
+	border-right-width: 1px;
+	}
+
+.fc-agenda-days .fc-col0 {
+	border-left-width: 0;
+	}
+
+/* all-day area */
+
+.fc-agenda-allday th {
+	border-width: 0 1px;
+	}
+
+.fc-agenda-allday .fc-day-content {
+	min-height: 34px; /* TODO: doesnt work well in quirksmode */
+	_height: 34px;
+	}
+
+/* divider (between all-day and slots) */
+
+.fc-agenda-divider-inner {
+	height: 2px;
+	overflow: hidden;
+	}
+
+.fc-widget-header .fc-agenda-divider-inner {
+	background: #eee;
+	}
+
+/* slot rows */
+
+.fc-agenda-slots th {
+	border-width: 1px 1px 0;
+	}
+
+.fc-agenda-slots td {
+	border-width: 1px 0 0;
+	background: none;
+	}
+
+.fc-agenda-slots td div {
+	height: 20px;
+	}
+
+.fc-agenda-slots tr.fc-slot0 th,
+.fc-agenda-slots tr.fc-slot0 td {
+	border-top-width: 0;
+	}
+
+.fc-agenda-slots tr.fc-minor th,
+.fc-agenda-slots tr.fc-minor td {
+	border-top-style: dotted;
+	}
+
+.fc-agenda-slots tr.fc-minor th.ui-widget-header {
+	*border-top-style: solid; /* doesn't work with background in IE6/7 */
+	}
+
+
+
+/* Vertical Events
+------------------------------------------------------------------------*/
+
+.fc-event-vert {
+	border-width: 0 1px;
+	}
+
+.fc-event-vert .fc-event-head,
+.fc-event-vert .fc-event-content {
+	position: relative;
+	z-index: 2;
+	width: 100%;
+	overflow: hidden;
+	}
+
+.fc-event-vert .fc-event-time {
+	white-space: nowrap;
+	font-size: 10px;
+	}
+
+.fc-event-vert .fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay  */
+	position: absolute;
+	z-index: 1;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: #fff;
+	opacity: .3;
+	filter: alpha(opacity=30);
+	}
+
+.fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */
+.fc-select-helper .fc-event-bg {
+	display: none\9; /* for IE6/7/8. nested opacity filters while dragging don't work */
+	}
+
+/* resizable */
+
+.fc-event-vert .ui-resizable-s {
+	bottom: 0        !important; /* importants override pre jquery ui 1.7 styles */
+	width: 100%      !important;
+	height: 8px      !important;
+	overflow: hidden !important;
+	line-height: 8px !important;
+	font-size: 11px  !important;
+	font-family: monospace;
+	text-align: center;
+	cursor: s-resize;
+	}
+
+.fc-agenda .ui-resizable-resizing { /* TODO: better selector */
+	_overflow: hidden;
+	}
diff --git a/3rdparty/fullcalendar/css/fullcalendar.print.css b/3rdparty/fullcalendar/css/fullcalendar.print.css
new file mode 100644
index 00000000000..18c7c9b10af
--- /dev/null
+++ b/3rdparty/fullcalendar/css/fullcalendar.print.css
@@ -0,0 +1,59 @@
+/*
+ * FullCalendar v1.5.2 Print Stylesheet
+ *
+ * Include this stylesheet on your page to get a more printer-friendly calendar.
+ * When including this stylesheet, use the media='print' attribute of the <link> tag.
+ * Make sure to include this stylesheet IN ADDITION to the regular fullcalendar.css.
+ *
+ * Copyright (c) 2011 Adam Shaw
+ * Dual licensed under the MIT and GPL licenses, located in
+ * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
+ *
+ * Date: Sun Aug 21 22:06:09 2011 -0700
+ *
+ */
+
+
+ /* Events
+-----------------------------------------------------*/
+
+.fc-event-skin {
+	background: none !important;
+	color: #000 !important;
+	}
+
+/* horizontal events */
+
+.fc-event-hori {
+	border-width: 0 0 1px 0 !important;
+	border-bottom-style: dotted !important;
+	border-bottom-color: #000 !important;
+	padding: 1px 0 0 0 !important;
+	}
+
+.fc-event-hori .fc-event-inner {
+	border-width: 0 !important;
+	padding: 0 1px !important;
+	}
+
+/* vertical events */
+
+.fc-event-vert {
+	border-width: 0 0 0 1px !important;
+	border-left-style: dotted !important;
+	border-left-color: #000 !important;
+	padding: 0 1px 0 0 !important;
+	}
+
+.fc-event-vert .fc-event-inner {
+	border-width: 0 !important;
+	padding: 1px 0 !important;
+	}
+
+.fc-event-bg {
+	display: none !important;
+	}
+
+.fc-event .ui-resizable-handle {
+	display: none !important;
+	}
diff --git a/3rdparty/fullcalendar/js/fullcalendar.js b/3rdparty/fullcalendar/js/fullcalendar.js
new file mode 100644
index 00000000000..fcdafbfca49
--- /dev/null
+++ b/3rdparty/fullcalendar/js/fullcalendar.js
@@ -0,0 +1,5210 @@
+/**
+ * @preserve
+ * FullCalendar v1.5.2
+ * http://arshaw.com/fullcalendar/
+ *
+ * Use fullcalendar.css for basic styling.
+ * For event drag & drop, requires jQuery UI draggable.
+ * For event resizing, requires jQuery UI resizable.
+ *
+ * Copyright (c) 2011 Adam Shaw
+ * Dual licensed under the MIT and GPL licenses, located in
+ * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
+ *
+ * Date: Sun Aug 21 22:06:09 2011 -0700
+ *
+ */
+
+(function($, undefined) {
+
+
+var defaults = {
+
+	// display
+	defaultView: 'month',
+	aspectRatio: 1.35,
+	header: {
+		left: 'title',
+		center: '',
+		right: 'today prev,next'
+	},
+	weekends: true,
+
+	// editing
+	//editable: false,
+	//disableDragging: false,
+	//disableResizing: false,
+
+	allDayDefault: true,
+	ignoreTimezone: true,
+
+	// event ajax
+	lazyFetching: true,
+	startParam: 'start',
+	endParam: 'end',
+
+	// time formats
+	titleFormat: {
+		month: 'MMMM yyyy',
+		week: "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+		day: 'dddd, MMM d, yyyy'
+	},
+	columnFormat: {
+		month: 'ddd',
+		week: 'ddd M/d',
+		day: 'dddd M/d'
+	},
+	timeFormat: { // for event elements
+		'': 'h(:mm)t' // default
+	},
+
+	// locale
+	isRTL: false,
+	firstDay: 0,
+	monthNames: ['January','February','March','April','May','June','July','August','September','October','November','December'],
+	monthNamesShort: ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'],
+	dayNames: ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'],
+	dayNamesShort: ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'],
+	buttonText: {
+		prev: '&nbsp;&#9668;&nbsp;',
+		next: '&nbsp;&#9658;&nbsp;',
+		prevYear: '&nbsp;&lt;&lt;&nbsp;',
+		nextYear: '&nbsp;&gt;&gt;&nbsp;',
+		today: 'today',
+		month: 'month',
+		week: 'week',
+		day: 'day'
+	},
+
+	// jquery-ui theming
+	theme: false,
+	buttonIcons: {
+		prev: 'circle-triangle-w',
+		next: 'circle-triangle-e'
+	},
+
+	//selectable: false,
+	unselectAuto: true,
+
+	dropAccept: '*'
+
+};
+
+// right-to-left defaults
+var rtlDefaults = {
+	header: {
+		left: 'next,prev today',
+		center: '',
+		right: 'title'
+	},
+	buttonText: {
+		prev: '&nbsp;&#9658;&nbsp;',
+		next: '&nbsp;&#9668;&nbsp;',
+		prevYear: '&nbsp;&gt;&gt;&nbsp;',
+		nextYear: '&nbsp;&lt;&lt;&nbsp;'
+	},
+	buttonIcons: {
+		prev: 'circle-triangle-e',
+		next: 'circle-triangle-w'
+	}
+};
+
+
+
+var fc = $.fullCalendar = { version: "1.5.2" };
+var fcViews = fc.views = {};
+
+
+$.fn.fullCalendar = function(options) {
+
+
+	// method calling
+	if (typeof options == 'string') {
+		var args = Array.prototype.slice.call(arguments, 1);
+		var res;
+		this.each(function() {
+			var calendar = $.data(this, 'fullCalendar');
+			if (calendar && $.isFunction(calendar[options])) {
+				var r = calendar[options].apply(calendar, args);
+				if (res === undefined) {
+					res = r;
+				}
+				if (options == 'destroy') {
+					$.removeData(this, 'fullCalendar');
+				}
+			}
+		});
+		if (res !== undefined) {
+			return res;
+		}
+		return this;
+	}
+
+
+	// would like to have this logic in EventManager, but needs to happen before options are recursively extended
+	var eventSources = options.eventSources || [];
+	delete options.eventSources;
+	if (options.events) {
+		eventSources.push(options.events);
+		delete options.events;
+	}
+
+
+	options = $.extend(true, {},
+		defaults,
+		(options.isRTL || options.isRTL===undefined && defaults.isRTL) ? rtlDefaults : {},
+		options
+	);
+
+
+	this.each(function(i, _element) {
+		var element = $(_element);
+		var calendar = new Calendar(element, options, eventSources);
+		element.data('fullCalendar', calendar); // TODO: look into memory leak implications
+		calendar.render();
+	});
+
+
+	return this;
+
+};
+
+
+// function for adding/overriding defaults
+function setDefaults(d) {
+	$.extend(true, defaults, d);
+}
+
+
+
+
+function Calendar(element, options, eventSources) {
+	var t = this;
+
+
+	// exports
+	t.options = options;
+	t.render = render;
+	t.destroy = destroy;
+	t.refetchEvents = refetchEvents;
+	t.reportEvents = reportEvents;
+	t.reportEventChange = reportEventChange;
+	t.rerenderEvents = rerenderEvents;
+	t.changeView = changeView;
+	t.select = select;
+	t.unselect = unselect;
+	t.prev = prev;
+	t.next = next;
+	t.prevYear = prevYear;
+	t.nextYear = nextYear;
+	t.today = today;
+	t.gotoDate = gotoDate;
+	t.incrementDate = incrementDate;
+	t.formatDate = function(format, date) { return formatDate(format, date, options) };
+	t.formatDates = function(format, date1, date2) { return formatDates(format, date1, date2, options) };
+	t.getDate = getDate;
+	t.getView = getView;
+	t.option = option;
+	t.trigger = trigger;
+
+
+	// imports
+	EventManager.call(t, options, eventSources);
+	var isFetchNeeded = t.isFetchNeeded;
+	var fetchEvents = t.fetchEvents;
+
+
+	// locals
+	var _element = element[0];
+	var header;
+	var headerElement;
+	var content;
+	var tm; // for making theme classes
+	var currentView;
+	var viewInstances = {};
+	var elementOuterWidth;
+	var suggestedViewHeight;
+	var absoluteViewElement;
+	var resizeUID = 0;
+	var ignoreWindowResize = 0;
+	var date = new Date();
+	var events = [];
+	var _dragElement;
+
+
+
+	/* Main Rendering
+	-----------------------------------------------------------------------------*/
+
+
+	setYMD(date, options.year, options.month, options.date);
+
+
+	function render(inc) {
+		if (!content) {
+			initialRender();
+		}else{
+			calcSize();
+			markSizesDirty();
+			markEventsDirty();
+			renderView(inc);
+		}
+	}
+
+
+	function initialRender() {
+		tm = options.theme ? 'ui' : 'fc';
+		element.addClass('fc');
+		if (options.isRTL) {
+			element.addClass('fc-rtl');
+		}
+		if (options.theme) {
+			element.addClass('ui-widget');
+		}
+		content = $("<div class='fc-content' style='position:relative'/>")
+			.prependTo(element);
+		header = new Header(t, options);
+		headerElement = header.render();
+		if (headerElement) {
+			element.prepend(headerElement);
+		}
+		changeView(options.defaultView);
+		$(window).resize(windowResize);
+		// needed for IE in a 0x0 iframe, b/c when it is resized, never triggers a windowResize
+		if (!bodyVisible()) {
+			lateRender();
+		}
+	}
+
+
+	// called when we know the calendar couldn't be rendered when it was initialized,
+	// but we think it's ready now
+	function lateRender() {
+		setTimeout(function() { // IE7 needs this so dimensions are calculated correctly
+			if (!currentView.start && bodyVisible()) { // !currentView.start makes sure this never happens more than once
+				renderView();
+			}
+		},0);
+	}
+
+
+	function destroy() {
+		$(window).unbind('resize', windowResize);
+		header.destroy();
+		content.remove();
+		element.removeClass('fc fc-rtl ui-widget');
+	}
+
+
+
+	function elementVisible() {
+		return _element.offsetWidth !== 0;
+	}
+
+
+	function bodyVisible() {
+		return $('body')[0].offsetWidth !== 0;
+	}
+
+
+
+	/* View Rendering
+	-----------------------------------------------------------------------------*/
+
+	// TODO: improve view switching (still weird transition in IE, and FF has whiteout problem)
+
+	function changeView(newViewName) {
+		if (!currentView || newViewName != currentView.name) {
+			ignoreWindowResize++; // because setMinHeight might change the height before render (and subsequently setSize) is reached
+
+			unselect();
+
+			var oldView = currentView;
+			var newViewElement;
+
+			if (oldView) {
+				(oldView.beforeHide || noop)(); // called before changing min-height. if called after, scroll state is reset (in Opera)
+				setMinHeight(content, content.height());
+				oldView.element.hide();
+			}else{
+				setMinHeight(content, 1); // needs to be 1 (not 0) for IE7, or else view dimensions miscalculated
+			}
+			content.css('overflow', 'hidden');
+
+			currentView = viewInstances[newViewName];
+			if (currentView) {
+				currentView.element.show();
+			}else{
+				currentView = viewInstances[newViewName] = new fcViews[newViewName](
+					newViewElement = absoluteViewElement =
+						$("<div class='fc-view fc-view-" + newViewName + "' style='position:absolute'/>")
+							.appendTo(content),
+					t // the calendar object
+				);
+			}
+
+			if (oldView) {
+				header.deactivateButton(oldView.name);
+			}
+			header.activateButton(newViewName);
+
+			renderView(); // after height has been set, will make absoluteViewElement's position=relative, then set to null
+
+			content.css('overflow', '');
+			if (oldView) {
+				setMinHeight(content, 1);
+			}
+
+			if (!newViewElement) {
+				(currentView.afterShow || noop)(); // called after setting min-height/overflow, so in final scroll state (for Opera)
+			}
+
+			ignoreWindowResize--;
+		}
+	}
+
+
+
+	function renderView(inc) {
+		if (elementVisible()) {
+			ignoreWindowResize++; // because renderEvents might temporarily change the height before setSize is reached
+
+			unselect();
+
+			if (suggestedViewHeight === undefined) {
+				calcSize();
+			}
+
+			var forceEventRender = false;
+			if (!currentView.start || inc || date < currentView.start || date >= currentView.end) {
+				// view must render an entire new date range (and refetch/render events)
+				currentView.render(date, inc || 0); // responsible for clearing events
+				setSize(true);
+				forceEventRender = true;
+			}
+			else if (currentView.sizeDirty) {
+				// view must resize (and rerender events)
+				currentView.clearEvents();
+				setSize();
+				forceEventRender = true;
+			}
+			else if (currentView.eventsDirty) {
+				currentView.clearEvents();
+				forceEventRender = true;
+			}
+			currentView.sizeDirty = false;
+			currentView.eventsDirty = false;
+			updateEvents(forceEventRender);
+
+			elementOuterWidth = element.outerWidth();
+
+			header.updateTitle(currentView.title);
+			var today = new Date();
+			if (today >= currentView.start && today < currentView.end) {
+				header.disableButton('today');
+			}else{
+				header.enableButton('today');
+			}
+
+			ignoreWindowResize--;
+			currentView.trigger('viewDisplay', _element);
+		}
+	}
+
+
+
+	/* Resizing
+	-----------------------------------------------------------------------------*/
+
+
+	function updateSize() {
+		markSizesDirty();
+		if (elementVisible()) {
+			calcSize();
+			setSize();
+			unselect();
+			currentView.clearEvents();
+			currentView.renderEvents(events);
+			currentView.sizeDirty = false;
+		}
+	}
+
+
+	function markSizesDirty() {
+		$.each(viewInstances, function(i, inst) {
+			inst.sizeDirty = true;
+		});
+	}
+
+
+	function calcSize() {
+		if (options.contentHeight) {
+			suggestedViewHeight = options.contentHeight;
+		}
+		else if (options.height) {
+			suggestedViewHeight = options.height - (headerElement ? headerElement.height() : 0) - vsides(content);
+		}
+		else {
+			suggestedViewHeight = Math.round(content.width() / Math.max(options.aspectRatio, .5));
+		}
+	}
+
+
+	function setSize(dateChanged) { // todo: dateChanged?
+		ignoreWindowResize++;
+		currentView.setHeight(suggestedViewHeight, dateChanged);
+		if (absoluteViewElement) {
+			absoluteViewElement.css('position', 'relative');
+			absoluteViewElement = null;
+		}
+		currentView.setWidth(content.width(), dateChanged);
+		ignoreWindowResize--;
+	}
+
+
+	function windowResize() {
+		if (!ignoreWindowResize) {
+			if (currentView.start) { // view has already been rendered
+				var uid = ++resizeUID;
+				setTimeout(function() { // add a delay
+					if (uid == resizeUID && !ignoreWindowResize && elementVisible()) {
+						if (elementOuterWidth != (elementOuterWidth = element.outerWidth())) {
+							ignoreWindowResize++; // in case the windowResize callback changes the height
+							updateSize();
+							currentView.trigger('windowResize', _element);
+							ignoreWindowResize--;
+						}
+					}
+				}, 200);
+			}else{
+				// calendar must have been initialized in a 0x0 iframe that has just been resized
+				lateRender();
+			}
+		}
+	}
+
+
+
+	/* Event Fetching/Rendering
+	-----------------------------------------------------------------------------*/
+
+
+	// fetches events if necessary, rerenders events if necessary (or if forced)
+	function updateEvents(forceRender) {
+		if (!options.lazyFetching || isFetchNeeded(currentView.visStart, currentView.visEnd)) {
+			refetchEvents();
+		}
+		else if (forceRender) {
+			rerenderEvents();
+		}
+	}
+
+
+	function refetchEvents() {
+		fetchEvents(currentView.visStart, currentView.visEnd); // will call reportEvents
+	}
+
+
+	// called when event data arrives
+	function reportEvents(_events) {
+		events = _events;
+		rerenderEvents();
+	}
+
+
+	// called when a single event's data has been changed
+	function reportEventChange(eventID) {
+		rerenderEvents(eventID);
+	}
+
+
+	// attempts to rerenderEvents
+	function rerenderEvents(modifiedEventID) {
+		markEventsDirty();
+		if (elementVisible()) {
+			currentView.clearEvents();
+			currentView.renderEvents(events, modifiedEventID);
+			currentView.eventsDirty = false;
+		}
+	}
+
+
+	function markEventsDirty() {
+		$.each(viewInstances, function(i, inst) {
+			inst.eventsDirty = true;
+		});
+	}
+
+
+
+	/* Selection
+	-----------------------------------------------------------------------------*/
+
+
+	function select(start, end, allDay) {
+		currentView.select(start, end, allDay===undefined ? true : allDay);
+	}
+
+
+	function unselect() { // safe to be called before renderView
+		if (currentView) {
+			currentView.unselect();
+		}
+	}
+
+
+
+	/* Date
+	-----------------------------------------------------------------------------*/
+
+
+	function prev() {
+		renderView(-1);
+	}
+
+
+	function next() {
+		renderView(1);
+	}
+
+
+	function prevYear() {
+		addYears(date, -1);
+		renderView();
+	}
+
+
+	function nextYear() {
+		addYears(date, 1);
+		renderView();
+	}
+
+
+	function today() {
+		date = new Date();
+		renderView();
+	}
+
+
+	function gotoDate(year, month, dateOfMonth) {
+		if (year instanceof Date) {
+			date = cloneDate(year); // provided 1 argument, a Date
+		}else{
+			setYMD(date, year, month, dateOfMonth);
+		}
+		renderView();
+	}
+
+
+	function incrementDate(years, months, days) {
+		if (years !== undefined) {
+			addYears(date, years);
+		}
+		if (months !== undefined) {
+			addMonths(date, months);
+		}
+		if (days !== undefined) {
+			addDays(date, days);
+		}
+		renderView();
+	}
+
+
+	function getDate() {
+		return cloneDate(date);
+	}
+
+
+
+	/* Misc
+	-----------------------------------------------------------------------------*/
+
+
+	function getView() {
+		return currentView;
+	}
+
+
+	function option(name, value) {
+		if (value === undefined) {
+			return options[name];
+		}
+		if (name == 'height' || name == 'contentHeight' || name == 'aspectRatio') {
+			options[name] = value;
+			updateSize();
+		}
+	}
+
+
+	function trigger(name, thisObj) {
+		if (options[name]) {
+			return options[name].apply(
+				thisObj || _element,
+				Array.prototype.slice.call(arguments, 2)
+			);
+		}
+	}
+
+
+
+	/* External Dragging
+	------------------------------------------------------------------------*/
+
+	if (options.droppable) {
+		$(document)
+			.bind('dragstart', function(ev, ui) {
+				var _e = ev.target;
+				var e = $(_e);
+				if (!e.parents('.fc').length) { // not already inside a calendar
+					var accept = options.dropAccept;
+					if ($.isFunction(accept) ? accept.call(_e, e) : e.is(accept)) {
+						_dragElement = _e;
+						currentView.dragStart(_dragElement, ev, ui);
+					}
+				}
+			})
+			.bind('dragstop', function(ev, ui) {
+				if (_dragElement) {
+					currentView.dragStop(_dragElement, ev, ui);
+					_dragElement = null;
+				}
+			});
+	}
+
+
+}
+
+function Header(calendar, options) {
+	var t = this;
+
+
+	// exports
+	t.render = render;
+	t.destroy = destroy;
+	t.updateTitle = updateTitle;
+	t.activateButton = activateButton;
+	t.deactivateButton = deactivateButton;
+	t.disableButton = disableButton;
+	t.enableButton = enableButton;
+
+
+	// locals
+	var element = $([]);
+	var tm;
+
+
+
+	function render() {
+		tm = options.theme ? 'ui' : 'fc';
+		var sections = options.header;
+		if (sections) {
+			element = $("<table class='fc-header' style='width:100%'/>")
+				.append(
+					$("<tr/>")
+						.append(renderSection('left'))
+						.append(renderSection('center'))
+						.append(renderSection('right'))
+				);
+			return element;
+		}
+	}
+
+
+	function destroy() {
+		element.remove();
+	}
+
+
+	function renderSection(position) {
+		var e = $("<td class='fc-header-" + position + "'/>");
+		var buttonStr = options.header[position];
+		if (buttonStr) {
+			$.each(buttonStr.split(' '), function(i) {
+				if (i > 0) {
+					e.append("<span class='fc-header-space'/>");
+				}
+				var prevButton;
+				$.each(this.split(','), function(j, buttonName) {
+					if (buttonName == 'title') {
+						e.append("<span class='fc-header-title'><h2>&nbsp;</h2></span>");
+						if (prevButton) {
+							prevButton.addClass(tm + '-corner-right');
+						}
+						prevButton = null;
+					}else{
+						var buttonClick;
+						if (calendar[buttonName]) {
+							buttonClick = calendar[buttonName]; // calendar method
+						}
+						else if (fcViews[buttonName]) {
+							buttonClick = function() {
+								button.removeClass(tm + '-state-hover'); // forget why
+								calendar.changeView(buttonName);
+							};
+						}
+						if (buttonClick) {
+							var icon = options.theme ? smartProperty(options.buttonIcons, buttonName) : null; // why are we using smartProperty here?
+							var text = smartProperty(options.buttonText, buttonName); // why are we using smartProperty here?
+							var button = $(
+								"<span class='fc-button fc-button-" + buttonName + " " + tm + "-state-default'>" +
+									"<span class='fc-button-inner'>" +
+										"<span class='fc-button-content'>" +
+											(icon ?
+												"<span class='fc-icon-wrap'>" +
+													"<span class='ui-icon ui-icon-" + icon + "'/>" +
+												"</span>" :
+												text
+												) +
+										"</span>" +
+										"<span class='fc-button-effect'><span></span></span>" +
+									"</span>" +
+								"</span>"
+							);
+							if (button) {
+								button
+									.click(function() {
+										if (!button.hasClass(tm + '-state-disabled')) {
+											buttonClick();
+										}
+									})
+									.mousedown(function() {
+										button
+											.not('.' + tm + '-state-active')
+											.not('.' + tm + '-state-disabled')
+											.addClass(tm + '-state-down');
+									})
+									.mouseup(function() {
+										button.removeClass(tm + '-state-down');
+									})
+									.hover(
+										function() {
+											button
+												.not('.' + tm + '-state-active')
+												.not('.' + tm + '-state-disabled')
+												.addClass(tm + '-state-hover');
+										},
+										function() {
+											button
+												.removeClass(tm + '-state-hover')
+												.removeClass(tm + '-state-down');
+										}
+									)
+									.appendTo(e);
+								if (!prevButton) {
+									button.addClass(tm + '-corner-left');
+								}
+								prevButton = button;
+							}
+						}
+					}
+				});
+				if (prevButton) {
+					prevButton.addClass(tm + '-corner-right');
+				}
+			});
+		}
+		return e;
+	}
+
+
+	function updateTitle(html) {
+		element.find('h2')
+			.html(html);
+	}
+
+
+	function activateButton(buttonName) {
+		element.find('span.fc-button-' + buttonName)
+			.addClass(tm + '-state-active');
+	}
+
+
+	function deactivateButton(buttonName) {
+		element.find('span.fc-button-' + buttonName)
+			.removeClass(tm + '-state-active');
+	}
+
+
+	function disableButton(buttonName) {
+		element.find('span.fc-button-' + buttonName)
+			.addClass(tm + '-state-disabled');
+	}
+
+
+	function enableButton(buttonName) {
+		element.find('span.fc-button-' + buttonName)
+			.removeClass(tm + '-state-disabled');
+	}
+
+
+}
+
+fc.sourceNormalizers = [];
+fc.sourceFetchers = [];
+
+var ajaxDefaults = {
+	dataType: 'json',
+	cache: false
+};
+
+var eventGUID = 1;
+
+
+function EventManager(options, _sources) {
+	var t = this;
+
+
+	// exports
+	t.isFetchNeeded = isFetchNeeded;
+	t.fetchEvents = fetchEvents;
+	t.addEventSource = addEventSource;
+	t.removeEventSource = removeEventSource;
+	t.updateEvent = updateEvent;
+	t.renderEvent = renderEvent;
+	t.removeEvents = removeEvents;
+	t.clientEvents = clientEvents;
+	t.normalizeEvent = normalizeEvent;
+
+
+	// imports
+	var trigger = t.trigger;
+	var getView = t.getView;
+	var reportEvents = t.reportEvents;
+
+
+	// locals
+	var stickySource = { events: [] };
+	var sources = [ stickySource ];
+	var rangeStart, rangeEnd;
+	var currentFetchID = 0;
+	var pendingSourceCnt = 0;
+	var loadingLevel = 0;
+	var cache = [];
+
+
+	for (var i=0; i<_sources.length; i++) {
+		_addEventSource(_sources[i]);
+	}
+
+
+
+	/* Fetching
+	-----------------------------------------------------------------------------*/
+
+
+	function isFetchNeeded(start, end) {
+		return !rangeStart || start < rangeStart || end > rangeEnd;
+	}
+
+
+	function fetchEvents(start, end) {
+		rangeStart = start;
+		rangeEnd = end;
+		cache = [];
+		var fetchID = ++currentFetchID;
+		var len = sources.length;
+		pendingSourceCnt = len;
+		for (var i=0; i<len; i++) {
+			fetchEventSource(sources[i], fetchID);
+		}
+	}
+
+
+	function fetchEventSource(source, fetchID) {
+		_fetchEventSource(source, function(events) {
+			if (fetchID == currentFetchID) {
+				if (events) {
+					for (var i=0; i<events.length; i++) {
+						events[i].source = source;
+						normalizeEvent(events[i]);
+					}
+					cache = cache.concat(events);
+				}
+				pendingSourceCnt--;
+				if (!pendingSourceCnt) {
+					reportEvents(cache);
+				}
+			}
+		});
+	}
+
+
+	function _fetchEventSource(source, callback) {
+		var i;
+		var fetchers = fc.sourceFetchers;
+		var res;
+		for (i=0; i<fetchers.length; i++) {
+			res = fetchers[i](source, rangeStart, rangeEnd, callback);
+			if (res === true) {
+				// the fetcher is in charge. made its own async request
+				return;
+			}
+			else if (typeof res == 'object') {
+				// the fetcher returned a new source. process it
+				_fetchEventSource(res, callback);
+				return;
+			}
+		}
+		var events = source.events;
+		if (events) {
+			if ($.isFunction(events)) {
+				pushLoading();
+				events(cloneDate(rangeStart), cloneDate(rangeEnd), function(events) {
+					callback(events);
+					popLoading();
+				});
+			}
+			else if ($.isArray(events)) {
+				callback(events);
+			}
+			else {
+				callback();
+			}
+		}else{
+			var url = source.url;
+			if (url) {
+				var success = source.success;
+				var error = source.error;
+				var complete = source.complete;
+				var data = $.extend({}, source.data || {});
+				var startParam = firstDefined(source.startParam, options.startParam);
+				var endParam = firstDefined(source.endParam, options.endParam);
+				if (startParam) {
+					data[startParam] = Math.round(+rangeStart / 1000);
+				}
+				if (endParam) {
+					data[endParam] = Math.round(+rangeEnd / 1000);
+				}
+				pushLoading();
+				$.ajax($.extend({}, ajaxDefaults, source, {
+					data: data,
+					success: function(events) {
+						events = events || [];
+						var res = applyAll(success, this, arguments);
+						if ($.isArray(res)) {
+							events = res;
+						}
+						callback(events);
+					},
+					error: function() {
+						applyAll(error, this, arguments);
+						callback();
+					},
+					complete: function() {
+						applyAll(complete, this, arguments);
+						popLoading();
+					}
+				}));
+			}else{
+				callback();
+			}
+		}
+	}
+
+
+
+	/* Sources
+	-----------------------------------------------------------------------------*/
+
+
+	function addEventSource(source) {
+		source = _addEventSource(source);
+		if (source) {
+			pendingSourceCnt++;
+			fetchEventSource(source, currentFetchID); // will eventually call reportEvents
+		}
+	}
+
+
+	function _addEventSource(source) {
+		if ($.isFunction(source) || $.isArray(source)) {
+			source = { events: source };
+		}
+		else if (typeof source == 'string') {
+			source = { url: source };
+		}
+		if (typeof source == 'object') {
+			normalizeSource(source);
+			sources.push(source);
+			return source;
+		}
+	}
+
+
+	function removeEventSource(source) {
+		sources = $.grep(sources, function(src) {
+			return !isSourcesEqual(src, source);
+		});
+		// remove all client events from that source
+		cache = $.grep(cache, function(e) {
+			return !isSourcesEqual(e.source, source);
+		});
+		reportEvents(cache);
+	}
+
+
+
+	/* Manipulation
+	-----------------------------------------------------------------------------*/
+
+
+	function updateEvent(event) { // update an existing event
+		var i, len = cache.length, e,
+			defaultEventEnd = getView().defaultEventEnd, // getView???
+			startDelta = event.start - event._start,
+			endDelta = event.end ?
+				(event.end - (event._end || defaultEventEnd(event))) // event._end would be null if event.end
+				: 0;                                                      // was null and event was just resized
+		for (i=0; i<len; i++) {
+			e = cache[i];
+			if (e._id == event._id && e != event) {
+				e.start = new Date(+e.start + startDelta);
+				if (event.end) {
+					if (e.end) {
+						e.end = new Date(+e.end + endDelta);
+					}else{
+						e.end = new Date(+defaultEventEnd(e) + endDelta);
+					}
+				}else{
+					e.end = null;
+				}
+				e.title = event.title;
+				e.url = event.url;
+				e.allDay = event.allDay;
+				e.className = event.className;
+				e.editable = event.editable;
+				e.color = event.color;
+				e.backgroudColor = event.backgroudColor;
+				e.borderColor = event.borderColor;
+				e.textColor = event.textColor;
+				normalizeEvent(e);
+			}
+		}
+		normalizeEvent(event);
+		reportEvents(cache);
+	}
+
+
+	function renderEvent(event, stick) {
+		normalizeEvent(event);
+		if (!event.source) {
+			if (stick) {
+				stickySource.events.push(event);
+				event.source = stickySource;
+			}
+			cache.push(event);
+		}
+		reportEvents(cache);
+	}
+
+
+	function removeEvents(filter) {
+		if (!filter) { // remove all
+			cache = [];
+			// clear all array sources
+			for (var i=0; i<sources.length; i++) {
+				if ($.isArray(sources[i].events)) {
+					sources[i].events = [];
+				}
+			}
+		}else{
+			if (!$.isFunction(filter)) { // an event ID
+				var id = filter + '';
+				filter = function(e) {
+					return e._id == id;
+				};
+			}
+			cache = $.grep(cache, filter, true);
+			// remove events from array sources
+			for (var i=0; i<sources.length; i++) {
+				if ($.isArray(sources[i].events)) {
+					sources[i].events = $.grep(sources[i].events, filter, true);
+				}
+			}
+		}
+		reportEvents(cache);
+	}
+
+
+	function clientEvents(filter) {
+		if ($.isFunction(filter)) {
+			return $.grep(cache, filter);
+		}
+		else if (filter) { // an event ID
+			filter += '';
+			return $.grep(cache, function(e) {
+				return e._id == filter;
+			});
+		}
+		return cache; // else, return all
+	}
+
+
+
+	/* Loading State
+	-----------------------------------------------------------------------------*/
+
+
+	function pushLoading() {
+		if (!loadingLevel++) {
+			trigger('loading', null, true);
+		}
+	}
+
+
+	function popLoading() {
+		if (!--loadingLevel) {
+			trigger('loading', null, false);
+		}
+	}
+
+
+
+	/* Event Normalization
+	-----------------------------------------------------------------------------*/
+
+
+	function normalizeEvent(event) {
+		var source = event.source || {};
+		var ignoreTimezone = firstDefined(source.ignoreTimezone, options.ignoreTimezone);
+		event._id = event._id || (event.id === undefined ? '_fc' + eventGUID++ : event.id + '');
+		if (event.date) {
+			if (!event.start) {
+				event.start = event.date;
+			}
+			delete event.date;
+		}
+		event._start = cloneDate(event.start = parseDate(event.start, ignoreTimezone));
+		event.end = parseDate(event.end, ignoreTimezone);
+		if (event.end && event.end <= event.start) {
+			event.end = null;
+		}
+		event._end = event.end ? cloneDate(event.end) : null;
+		if (event.allDay === undefined) {
+			event.allDay = firstDefined(source.allDayDefault, options.allDayDefault);
+		}
+		if (event.className) {
+			if (typeof event.className == 'string') {
+				event.className = event.className.split(/\s+/);
+			}
+		}else{
+			event.className = [];
+		}
+		// TODO: if there is no start date, return false to indicate an invalid event
+	}
+
+
+
+	/* Utils
+	------------------------------------------------------------------------------*/
+
+
+	function normalizeSource(source) {
+		if (source.className) {
+			// TODO: repeat code, same code for event classNames
+			if (typeof source.className == 'string') {
+				source.className = source.className.split(/\s+/);
+			}
+		}else{
+			source.className = [];
+		}
+		var normalizers = fc.sourceNormalizers;
+		for (var i=0; i<normalizers.length; i++) {
+			normalizers[i](source);
+		}
+	}
+
+
+	function isSourcesEqual(source1, source2) {
+		return source1 && source2 && getSourcePrimitive(source1) == getSourcePrimitive(source2);
+	}
+
+
+	function getSourcePrimitive(source) {
+		return ((typeof source == 'object') ? (source.events || source.url) : '') || source;
+	}
+
+
+}
+
+
+fc.addDays = addDays;
+fc.cloneDate = cloneDate;
+fc.parseDate = parseDate;
+fc.parseISO8601 = parseISO8601;
+fc.parseTime = parseTime;
+fc.formatDate = formatDate;
+fc.formatDates = formatDates;
+
+
+
+/* Date Math
+-----------------------------------------------------------------------------*/
+
+var dayIDs = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'],
+	DAY_MS = 86400000,
+	HOUR_MS = 3600000,
+	MINUTE_MS = 60000;
+
+
+function addYears(d, n, keepTime) {
+	d.setFullYear(d.getFullYear() + n);
+	if (!keepTime) {
+		clearTime(d);
+	}
+	return d;
+}
+
+
+function addMonths(d, n, keepTime) { // prevents day overflow/underflow
+	if (+d) { // prevent infinite looping on invalid dates
+		var m = d.getMonth() + n,
+			check = cloneDate(d);
+		check.setDate(1);
+		check.setMonth(m);
+		d.setMonth(m);
+		if (!keepTime) {
+			clearTime(d);
+		}
+		while (d.getMonth() != check.getMonth()) {
+			d.setDate(d.getDate() + (d < check ? 1 : -1));
+		}
+	}
+	return d;
+}
+
+
+function addDays(d, n, keepTime) { // deals with daylight savings
+	if (+d) {
+		var dd = d.getDate() + n,
+			check = cloneDate(d);
+		check.setHours(9); // set to middle of day
+		check.setDate(dd);
+		d.setDate(dd);
+		if (!keepTime) {
+			clearTime(d);
+		}
+		fixDate(d, check);
+	}
+	return d;
+}
+
+
+function fixDate(d, check) { // force d to be on check's YMD, for daylight savings purposes
+	if (+d) { // prevent infinite looping on invalid dates
+		while (d.getDate() != check.getDate()) {
+			d.setTime(+d + (d < check ? 1 : -1) * HOUR_MS);
+		}
+	}
+}
+
+
+function addMinutes(d, n) {
+	d.setMinutes(d.getMinutes() + n);
+	return d;
+}
+
+
+function clearTime(d) {
+	d.setHours(0);
+	d.setMinutes(0);
+	d.setSeconds(0);
+	d.setMilliseconds(0);
+	return d;
+}
+
+
+function cloneDate(d, dontKeepTime) {
+	if (dontKeepTime) {
+		return clearTime(new Date(+d));
+	}
+	return new Date(+d);
+}
+
+
+function zeroDate() { // returns a Date with time 00:00:00 and dateOfMonth=1
+	var i=0, d;
+	do {
+		d = new Date(1970, i++, 1);
+	} while (d.getHours()); // != 0
+	return d;
+}
+
+
+function skipWeekend(date, inc, excl) {
+	inc = inc || 1;
+	while (!date.getDay() || (excl && date.getDay()==1 || !excl && date.getDay()==6)) {
+		addDays(date, inc);
+	}
+	return date;
+}
+
+
+function dayDiff(d1, d2) { // d1 - d2
+	return Math.round((cloneDate(d1, true) - cloneDate(d2, true)) / DAY_MS);
+}
+
+
+function setYMD(date, y, m, d) {
+	if (y !== undefined && y != date.getFullYear()) {
+		date.setDate(1);
+		date.setMonth(0);
+		date.setFullYear(y);
+	}
+	if (m !== undefined && m != date.getMonth()) {
+		date.setDate(1);
+		date.setMonth(m);
+	}
+	if (d !== undefined) {
+		date.setDate(d);
+	}
+}
+
+
+
+/* Date Parsing
+-----------------------------------------------------------------------------*/
+
+
+function parseDate(s, ignoreTimezone) { // ignoreTimezone defaults to true
+	if (typeof s == 'object') { // already a Date object
+		return s;
+	}
+	if (typeof s == 'number') { // a UNIX timestamp
+		return new Date(s * 1000);
+	}
+	if (typeof s == 'string') {
+		if (s.match(/^\d+(\.\d+)?$/)) { // a UNIX timestamp
+			return new Date(parseFloat(s) * 1000);
+		}
+		if (ignoreTimezone === undefined) {
+			ignoreTimezone = true;
+		}
+		return parseISO8601(s, ignoreTimezone) || (s ? new Date(s) : null);
+	}
+	// TODO: never return invalid dates (like from new Date(<string>)), return null instead
+	return null;
+}
+
+
+function parseISO8601(s, ignoreTimezone) { // ignoreTimezone defaults to false
+	// derived from http://delete.me.uk/2005/03/iso8601.html
+	// TODO: for a know glitch/feature, read tests/issue_206_parseDate_dst.html
+	var m = s.match(/^([0-9]{4})(-([0-9]{2})(-([0-9]{2})([T ]([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?(Z|(([-+])([0-9]{2})(:?([0-9]{2}))?))?)?)?)?$/);
+	if (!m) {
+		return null;
+	}
+	var date = new Date(m[1], 0, 1);
+	if (ignoreTimezone || !m[13]) {
+		var check = new Date(m[1], 0, 1, 9, 0);
+		if (m[3]) {
+			date.setMonth(m[3] - 1);
+			check.setMonth(m[3] - 1);
+		}
+		if (m[5]) {
+			date.setDate(m[5]);
+			check.setDate(m[5]);
+		}
+		fixDate(date, check);
+		if (m[7]) {
+			date.setHours(m[7]);
+		}
+		if (m[8]) {
+			date.setMinutes(m[8]);
+		}
+		if (m[10]) {
+			date.setSeconds(m[10]);
+		}
+		if (m[12]) {
+			date.setMilliseconds(Number("0." + m[12]) * 1000);
+		}
+		fixDate(date, check);
+	}else{
+		date.setUTCFullYear(
+			m[1],
+			m[3] ? m[3] - 1 : 0,
+			m[5] || 1
+		);
+		date.setUTCHours(
+			m[7] || 0,
+			m[8] || 0,
+			m[10] || 0,
+			m[12] ? Number("0." + m[12]) * 1000 : 0
+		);
+		if (m[14]) {
+			var offset = Number(m[16]) * 60 + (m[18] ? Number(m[18]) : 0);
+			offset *= m[15] == '-' ? 1 : -1;
+			date = new Date(+date + (offset * 60 * 1000));
+		}
+	}
+	return date;
+}
+
+
+function parseTime(s) { // returns minutes since start of day
+	if (typeof s == 'number') { // an hour
+		return s * 60;
+	}
+	if (typeof s == 'object') { // a Date object
+		return s.getHours() * 60 + s.getMinutes();
+	}
+	var m = s.match(/(\d+)(?::(\d+))?\s*(\w+)?/);
+	if (m) {
+		var h = parseInt(m[1], 10);
+		if (m[3]) {
+			h %= 12;
+			if (m[3].toLowerCase().charAt(0) == 'p') {
+				h += 12;
+			}
+		}
+		return h * 60 + (m[2] ? parseInt(m[2], 10) : 0);
+	}
+}
+
+
+
+/* Date Formatting
+-----------------------------------------------------------------------------*/
+// TODO: use same function formatDate(date, [date2], format, [options])
+
+
+function formatDate(date, format, options) {
+	return formatDates(date, null, format, options);
+}
+
+
+function formatDates(date1, date2, format, options) {
+	options = options || defaults;
+	var date = date1,
+		otherDate = date2,
+		i, len = format.length, c,
+		i2, formatter,
+		res = '';
+	for (i=0; i<len; i++) {
+		c = format.charAt(i);
+		if (c == "'") {
+			for (i2=i+1; i2<len; i2++) {
+				if (format.charAt(i2) == "'") {
+					if (date) {
+						if (i2 == i+1) {
+							res += "'";
+						}else{
+							res += format.substring(i+1, i2);
+						}
+						i = i2;
+					}
+					break;
+				}
+			}
+		}
+		else if (c == '(') {
+			for (i2=i+1; i2<len; i2++) {
+				if (format.charAt(i2) == ')') {
+					var subres = formatDate(date, format.substring(i+1, i2), options);
+					if (parseInt(subres.replace(/\D/, ''), 10)) {
+						res += subres;
+					}
+					i = i2;
+					break;
+				}
+			}
+		}
+		else if (c == '[') {
+			for (i2=i+1; i2<len; i2++) {
+				if (format.charAt(i2) == ']') {
+					var subformat = format.substring(i+1, i2);
+					var subres = formatDate(date, subformat, options);
+					if (subres != formatDate(otherDate, subformat, options)) {
+						res += subres;
+					}
+					i = i2;
+					break;
+				}
+			}
+		}
+		else if (c == '{') {
+			date = date2;
+			otherDate = date1;
+		}
+		else if (c == '}') {
+			date = date1;
+			otherDate = date2;
+		}
+		else {
+			for (i2=len; i2>i; i2--) {
+				if (formatter = dateFormatters[format.substring(i, i2)]) {
+					if (date) {
+						res += formatter(date, options);
+					}
+					i = i2 - 1;
+					break;
+				}
+			}
+			if (i2 == i) {
+				if (date) {
+					res += c;
+				}
+			}
+		}
+	}
+	return res;
+};
+
+
+var dateFormatters = {
+	s	: function(d)	{ return d.getSeconds() },
+	ss	: function(d)	{ return zeroPad(d.getSeconds()) },
+	m	: function(d)	{ return d.getMinutes() },
+	mm	: function(d)	{ return zeroPad(d.getMinutes()) },
+	h	: function(d)	{ return d.getHours() % 12 || 12 },
+	hh	: function(d)	{ return zeroPad(d.getHours() % 12 || 12) },
+	H	: function(d)	{ return d.getHours() },
+	HH	: function(d)	{ return zeroPad(d.getHours()) },
+	d	: function(d)	{ return d.getDate() },
+	dd	: function(d)	{ return zeroPad(d.getDate()) },
+	ddd	: function(d,o)	{ return o.dayNamesShort[d.getDay()] },
+	dddd: function(d,o)	{ return o.dayNames[d.getDay()] },
+	M	: function(d)	{ return d.getMonth() + 1 },
+	MM	: function(d)	{ return zeroPad(d.getMonth() + 1) },
+	MMM	: function(d,o)	{ return o.monthNamesShort[d.getMonth()] },
+	MMMM: function(d,o)	{ return o.monthNames[d.getMonth()] },
+	yy	: function(d)	{ return (d.getFullYear()+'').substring(2) },
+	yyyy: function(d)	{ return d.getFullYear() },
+	t	: function(d)	{ return d.getHours() < 12 ? 'a' : 'p' },
+	tt	: function(d)	{ return d.getHours() < 12 ? 'am' : 'pm' },
+	T	: function(d)	{ return d.getHours() < 12 ? 'A' : 'P' },
+	TT	: function(d)	{ return d.getHours() < 12 ? 'AM' : 'PM' },
+	u	: function(d)	{ return formatDate(d, "yyyy-MM-dd'T'HH:mm:ss'Z'") },
+	S	: function(d)	{
+		var date = d.getDate();
+		if (date > 10 && date < 20) {
+			return 'th';
+		}
+		return ['st', 'nd', 'rd'][date%10-1] || 'th';
+	}
+};
+
+
+
+fc.applyAll = applyAll;
+
+
+/* Event Date Math
+-----------------------------------------------------------------------------*/
+
+
+function exclEndDay(event) {
+	if (event.end) {
+		return _exclEndDay(event.end, event.allDay);
+	}else{
+		return addDays(cloneDate(event.start), 1);
+	}
+}
+
+
+function _exclEndDay(end, allDay) {
+	end = cloneDate(end);
+	return allDay || end.getHours() || end.getMinutes() ? addDays(end, 1) : clearTime(end);
+}
+
+
+function segCmp(a, b) {
+	return (b.msLength - a.msLength) * 100 + (a.event.start - b.event.start);
+}
+
+
+function segsCollide(seg1, seg2) {
+	return seg1.end > seg2.start && seg1.start < seg2.end;
+}
+
+
+
+/* Event Sorting
+-----------------------------------------------------------------------------*/
+
+
+// event rendering utilities
+function sliceSegs(events, visEventEnds, start, end) {
+	var segs = [],
+		i, len=events.length, event,
+		eventStart, eventEnd,
+		segStart, segEnd,
+		isStart, isEnd;
+	for (i=0; i<len; i++) {
+		event = events[i];
+		eventStart = event.start;
+		eventEnd = visEventEnds[i];
+		if (eventEnd > start && eventStart < end) {
+			if (eventStart < start) {
+				segStart = cloneDate(start);
+				isStart = false;
+			}else{
+				segStart = eventStart;
+				isStart = true;
+			}
+			if (eventEnd > end) {
+				segEnd = cloneDate(end);
+				isEnd = false;
+			}else{
+				segEnd = eventEnd;
+				isEnd = true;
+			}
+			segs.push({
+				event: event,
+				start: segStart,
+				end: segEnd,
+				isStart: isStart,
+				isEnd: isEnd,
+				msLength: segEnd - segStart
+			});
+		}
+	}
+	return segs.sort(segCmp);
+}
+
+
+// event rendering calculation utilities
+function stackSegs(segs) {
+	var levels = [],
+		i, len = segs.length, seg,
+		j, collide, k;
+	for (i=0; i<len; i++) {
+		seg = segs[i];
+		j = 0; // the level index where seg should belong
+		while (true) {
+			collide = false;
+			if (levels[j]) {
+				for (k=0; k<levels[j].length; k++) {
+					if (segsCollide(levels[j][k], seg)) {
+						collide = true;
+						break;
+					}
+				}
+			}
+			if (collide) {
+				j++;
+			}else{
+				break;
+			}
+		}
+		if (levels[j]) {
+			levels[j].push(seg);
+		}else{
+			levels[j] = [seg];
+		}
+	}
+	return levels;
+}
+
+
+
+/* Event Element Binding
+-----------------------------------------------------------------------------*/
+
+
+function lazySegBind(container, segs, bindHandlers) {
+	container.unbind('mouseover').mouseover(function(ev) {
+		var parent=ev.target, e,
+			i, seg;
+		while (parent != this) {
+			e = parent;
+			parent = parent.parentNode;
+		}
+		if ((i = e._fci) !== undefined) {
+			e._fci = undefined;
+			seg = segs[i];
+			bindHandlers(seg.event, seg.element, seg);
+			$(ev.target).trigger(ev);
+		}
+		ev.stopPropagation();
+	});
+}
+
+
+
+/* Element Dimensions
+-----------------------------------------------------------------------------*/
+
+
+function setOuterWidth(element, width, includeMargins) {
+	for (var i=0, e; i<element.length; i++) {
+		e = $(element[i]);
+		e.width(Math.max(0, width - hsides(e, includeMargins)));
+	}
+}
+
+
+function setOuterHeight(element, height, includeMargins) {
+	for (var i=0, e; i<element.length; i++) {
+		e = $(element[i]);
+		e.height(Math.max(0, height - vsides(e, includeMargins)));
+	}
+}
+
+
+// TODO: curCSS has been deprecated (jQuery 1.4.3 - 10/16/2010)
+
+
+function hsides(element, includeMargins) {
+	return hpadding(element) + hborders(element) + (includeMargins ? hmargins(element) : 0);
+}
+
+
+function hpadding(element) {
+	return (parseFloat($.curCSS(element[0], 'paddingLeft', true)) || 0) +
+	       (parseFloat($.curCSS(element[0], 'paddingRight', true)) || 0);
+}
+
+
+function hmargins(element) {
+	return (parseFloat($.curCSS(element[0], 'marginLeft', true)) || 0) +
+	       (parseFloat($.curCSS(element[0], 'marginRight', true)) || 0);
+}
+
+
+function hborders(element) {
+	return (parseFloat($.curCSS(element[0], 'borderLeftWidth', true)) || 0) +
+	       (parseFloat($.curCSS(element[0], 'borderRightWidth', true)) || 0);
+}
+
+
+function vsides(element, includeMargins) {
+	return vpadding(element) +  vborders(element) + (includeMargins ? vmargins(element) : 0);
+}
+
+
+function vpadding(element) {
+	return (parseFloat($.curCSS(element[0], 'paddingTop', true)) || 0) +
+	       (parseFloat($.curCSS(element[0], 'paddingBottom', true)) || 0);
+}
+
+
+function vmargins(element) {
+	return (parseFloat($.curCSS(element[0], 'marginTop', true)) || 0) +
+	       (parseFloat($.curCSS(element[0], 'marginBottom', true)) || 0);
+}
+
+
+function vborders(element) {
+	return (parseFloat($.curCSS(element[0], 'borderTopWidth', true)) || 0) +
+	       (parseFloat($.curCSS(element[0], 'borderBottomWidth', true)) || 0);
+}
+
+
+function setMinHeight(element, height) {
+	height = (typeof height == 'number' ? height + 'px' : height);
+	element.each(function(i, _element) {
+		_element.style.cssText += ';min-height:' + height + ';_height:' + height;
+		// why can't we just use .css() ? i forget
+	});
+}
+
+
+
+/* Misc Utils
+-----------------------------------------------------------------------------*/
+
+
+//TODO: arraySlice
+//TODO: isFunction, grep ?
+
+
+function noop() { }
+
+
+function cmp(a, b) {
+	return a - b;
+}
+
+
+function arrayMax(a) {
+	return Math.max.apply(Math, a);
+}
+
+
+function zeroPad(n) {
+	return (n < 10 ? '0' : '') + n;
+}
+
+
+function smartProperty(obj, name) { // get a camel-cased/namespaced property of an object
+	if (obj[name] !== undefined) {
+		return obj[name];
+	}
+	var parts = name.split(/(?=[A-Z])/),
+		i=parts.length-1, res;
+	for (; i>=0; i--) {
+		res = obj[parts[i].toLowerCase()];
+		if (res !== undefined) {
+			return res;
+		}
+	}
+	return obj[''];
+}
+
+
+function htmlEscape(s) {
+	return s.replace(/&/g, '&amp;')
+		.replace(/</g, '&lt;')
+		.replace(/>/g, '&gt;')
+		.replace(/'/g, '&#039;')
+		.replace(/"/g, '&quot;')
+		.replace(/\n/g, '<br />');
+}
+
+
+function cssKey(_element) {
+	return _element.id + '/' + _element.className + '/' + _element.style.cssText.replace(/(^|;)\s*(top|left|width|height)\s*:[^;]*/ig, '');
+}
+
+
+function disableTextSelection(element) {
+	element
+		.attr('unselectable', 'on')
+		.css('MozUserSelect', 'none')
+		.bind('selectstart.ui', function() { return false; });
+}
+
+
+/*
+function enableTextSelection(element) {
+	element
+		.attr('unselectable', 'off')
+		.css('MozUserSelect', '')
+		.unbind('selectstart.ui');
+}
+*/
+
+
+function markFirstLast(e) {
+	e.children()
+		.removeClass('fc-first fc-last')
+		.filter(':first-child')
+			.addClass('fc-first')
+		.end()
+		.filter(':last-child')
+			.addClass('fc-last');
+}
+
+
+function setDayID(cell, date) {
+	cell.each(function(i, _cell) {
+		_cell.className = _cell.className.replace(/^fc-\w*/, 'fc-' + dayIDs[date.getDay()]);
+		// TODO: make a way that doesn't rely on order of classes
+	});
+}
+
+
+function getSkinCss(event, opt) {
+	var source = event.source || {};
+	var eventColor = event.color;
+	var sourceColor = source.color;
+	var optionColor = opt('eventColor');
+	var backgroundColor =
+		event.backgroundColor ||
+		eventColor ||
+		source.backgroundColor ||
+		sourceColor ||
+		opt('eventBackgroundColor') ||
+		optionColor;
+	var borderColor =
+		event.borderColor ||
+		eventColor ||
+		source.borderColor ||
+		sourceColor ||
+		opt('eventBorderColor') ||
+		optionColor;
+	var textColor =
+		event.textColor ||
+		source.textColor ||
+		opt('eventTextColor');
+	var statements = [];
+	if (backgroundColor) {
+		statements.push('background-color:' + backgroundColor);
+	}
+	if (borderColor) {
+		statements.push('border-color:' + borderColor);
+	}
+	if (textColor) {
+		statements.push('color:' + textColor);
+	}
+	return statements.join(';');
+}
+
+
+function applyAll(functions, thisObj, args) {
+	if ($.isFunction(functions)) {
+		functions = [ functions ];
+	}
+	if (functions) {
+		var i;
+		var ret;
+		for (i=0; i<functions.length; i++) {
+			ret = functions[i].apply(thisObj, args) || ret;
+		}
+		return ret;
+	}
+}
+
+
+function firstDefined() {
+	for (var i=0; i<arguments.length; i++) {
+		if (arguments[i] !== undefined) {
+			return arguments[i];
+		}
+	}
+}
+
+
+
+fcViews.month = MonthView;
+
+function MonthView(element, calendar) {
+	var t = this;
+
+
+	// exports
+	t.render = render;
+
+
+	// imports
+	BasicView.call(t, element, calendar, 'month');
+	var opt = t.opt;
+	var renderBasic = t.renderBasic;
+	var formatDate = calendar.formatDate;
+
+
+
+	function render(date, delta) {
+		if (delta) {
+			addMonths(date, delta);
+			date.setDate(1);
+		}
+		var start = cloneDate(date, true);
+		start.setDate(1);
+		var end = addMonths(cloneDate(start), 1);
+		var visStart = cloneDate(start);
+		var visEnd = cloneDate(end);
+		var firstDay = opt('firstDay');
+		var nwe = opt('weekends') ? 0 : 1;
+		if (nwe) {
+			skipWeekend(visStart);
+			skipWeekend(visEnd, -1, true);
+		}
+		addDays(visStart, -((visStart.getDay() - Math.max(firstDay, nwe) + 7) % 7));
+		addDays(visEnd, (7 - visEnd.getDay() + Math.max(firstDay, nwe)) % 7);
+		var rowCnt = Math.round((visEnd - visStart) / (DAY_MS * 7));
+		if (opt('weekMode') == 'fixed') {
+			addDays(visEnd, (6 - rowCnt) * 7);
+			rowCnt = 6;
+		}
+		t.title = formatDate(start, opt('titleFormat'));
+		t.start = start;
+		t.end = end;
+		t.visStart = visStart;
+		t.visEnd = visEnd;
+		renderBasic(6, rowCnt, nwe ? 5 : 7, true);
+	}
+
+
+}
+
+fcViews.basicWeek = BasicWeekView;
+
+function BasicWeekView(element, calendar) {
+	var t = this;
+
+
+	// exports
+	t.render = render;
+
+
+	// imports
+	BasicView.call(t, element, calendar, 'basicWeek');
+	var opt = t.opt;
+	var renderBasic = t.renderBasic;
+	var formatDates = calendar.formatDates;
+
+
+
+	function render(date, delta) {
+		if (delta) {
+			addDays(date, delta * 7);
+		}
+		var start = addDays(cloneDate(date), -((date.getDay() - opt('firstDay') + 7) % 7));
+		var end = addDays(cloneDate(start), 7);
+		var visStart = cloneDate(start);
+		var visEnd = cloneDate(end);
+		var weekends = opt('weekends');
+		if (!weekends) {
+			skipWeekend(visStart);
+			skipWeekend(visEnd, -1, true);
+		}
+		t.title = formatDates(
+			visStart,
+			addDays(cloneDate(visEnd), -1),
+			opt('titleFormat')
+		);
+		t.start = start;
+		t.end = end;
+		t.visStart = visStart;
+		t.visEnd = visEnd;
+		renderBasic(1, 1, weekends ? 7 : 5, false);
+	}
+
+
+}
+
+fcViews.basicDay = BasicDayView;
+
+//TODO: when calendar's date starts out on a weekend, shouldn't happen
+
+
+function BasicDayView(element, calendar) {
+	var t = this;
+
+
+	// exports
+	t.render = render;
+
+
+	// imports
+	BasicView.call(t, element, calendar, 'basicDay');
+	var opt = t.opt;
+	var renderBasic = t.renderBasic;
+	var formatDate = calendar.formatDate;
+
+
+
+	function render(date, delta) {
+		if (delta) {
+			addDays(date, delta);
+			if (!opt('weekends')) {
+				skipWeekend(date, delta < 0 ? -1 : 1);
+			}
+		}
+		t.title = formatDate(date, opt('titleFormat'));
+		t.start = t.visStart = cloneDate(date, true);
+		t.end = t.visEnd = addDays(cloneDate(t.start), 1);
+		renderBasic(1, 1, 1, false);
+	}
+
+
+}
+
+setDefaults({
+	weekMode: 'fixed'
+});
+
+
+function BasicView(element, calendar, viewName) {
+	var t = this;
+
+
+	// exports
+	t.renderBasic = renderBasic;
+	t.setHeight = setHeight;
+	t.setWidth = setWidth;
+	t.renderDayOverlay = renderDayOverlay;
+	t.defaultSelectionEnd = defaultSelectionEnd;
+	t.renderSelection = renderSelection;
+	t.clearSelection = clearSelection;
+	t.reportDayClick = reportDayClick; // for selection (kinda hacky)
+	t.dragStart = dragStart;
+	t.dragStop = dragStop;
+	t.defaultEventEnd = defaultEventEnd;
+	t.getHoverListener = function() { return hoverListener };
+	t.colContentLeft = colContentLeft;
+	t.colContentRight = colContentRight;
+	t.dayOfWeekCol = dayOfWeekCol;
+	t.dateCell = dateCell;
+	t.cellDate = cellDate;
+	t.cellIsAllDay = function() { return true };
+	t.allDayRow = allDayRow;
+	t.allDayBounds = allDayBounds;
+	t.getRowCnt = function() { return rowCnt };
+	t.getColCnt = function() { return colCnt };
+	t.getColWidth = function() { return colWidth };
+	t.getDaySegmentContainer = function() { return daySegmentContainer };
+
+
+	// imports
+	View.call(t, element, calendar, viewName);
+	OverlayManager.call(t);
+	SelectionManager.call(t);
+	BasicEventRenderer.call(t);
+	var opt = t.opt;
+	var trigger = t.trigger;
+	var clearEvents = t.clearEvents;
+	var renderOverlay = t.renderOverlay;
+	var clearOverlays = t.clearOverlays;
+	var daySelectionMousedown = t.daySelectionMousedown;
+	var formatDate = calendar.formatDate;
+
+
+	// locals
+
+	var head;
+	var headCells;
+	var body;
+	var bodyRows;
+	var bodyCells;
+	var bodyFirstCells;
+	var bodyCellTopInners;
+	var daySegmentContainer;
+
+	var viewWidth;
+	var viewHeight;
+	var colWidth;
+
+	var rowCnt, colCnt;
+	var coordinateGrid;
+	var hoverListener;
+	var colContentPositions;
+
+	var rtl, dis, dit;
+	var firstDay;
+	var nwe;
+	var tm;
+	var colFormat;
+
+
+
+	/* Rendering
+	------------------------------------------------------------*/
+
+
+	disableTextSelection(element.addClass('fc-grid'));
+
+
+	function renderBasic(maxr, r, c, showNumbers) {
+		rowCnt = r;
+		colCnt = c;
+		updateOptions();
+		var firstTime = !body;
+		if (firstTime) {
+			buildSkeleton(maxr, showNumbers);
+		}else{
+			clearEvents();
+		}
+		updateCells(firstTime);
+	}
+
+
+
+	function updateOptions() {
+		rtl = opt('isRTL');
+		if (rtl) {
+			dis = -1;
+			dit = colCnt - 1;
+		}else{
+			dis = 1;
+			dit = 0;
+		}
+		firstDay = opt('firstDay');
+		nwe = opt('weekends') ? 0 : 1;
+		tm = opt('theme') ? 'ui' : 'fc';
+		colFormat = opt('columnFormat');
+	}
+
+
+
+	function buildSkeleton(maxRowCnt, showNumbers) {
+		var s;
+		var headerClass = tm + "-widget-header";
+		var contentClass = tm + "-widget-content";
+		var i, j;
+		var table;
+
+		s =
+			"<table class='fc-border-separate' style='width:100%' cellspacing='0'>" +
+			"<thead>" +
+			"<tr>";
+		for (i=0; i<colCnt; i++) {
+			s +=
+				"<th class='fc- " + headerClass + "'/>"; // need fc- for setDayID
+		}
+		s +=
+			"</tr>" +
+			"</thead>" +
+			"<tbody>";
+		for (i=0; i<maxRowCnt; i++) {
+			s +=
+				"<tr class='fc-week" + i + "'>";
+			for (j=0; j<colCnt; j++) {
+				s +=
+					"<td class='fc- " + contentClass + " fc-day" + (i*colCnt+j) + "'>" + // need fc- for setDayID
+					"<div>" +
+					(showNumbers ?
+						"<div class='fc-day-number'/>" :
+						''
+						) +
+					"<div class='fc-day-content'>" +
+					"<div style='position:relative'>&nbsp;</div>" +
+					"</div>" +
+					"</div>" +
+					"</td>";
+			}
+			s +=
+				"</tr>";
+		}
+		s +=
+			"</tbody>" +
+			"</table>";
+		table = $(s).appendTo(element);
+
+		head = table.find('thead');
+		headCells = head.find('th');
+		body = table.find('tbody');
+		bodyRows = body.find('tr');
+		bodyCells = body.find('td');
+		bodyFirstCells = bodyCells.filter(':first-child');
+		bodyCellTopInners = bodyRows.eq(0).find('div.fc-day-content div');
+
+		markFirstLast(head.add(head.find('tr'))); // marks first+last tr/th's
+		markFirstLast(bodyRows); // marks first+last td's
+		bodyRows.eq(0).addClass('fc-first'); // fc-last is done in updateCells
+
+		dayBind(bodyCells);
+
+		daySegmentContainer =
+			$("<div style='position:absolute;z-index:8;top:0;left:0'/>")
+				.appendTo(element);
+	}
+
+
+
+	function updateCells(firstTime) {
+		var dowDirty = firstTime || rowCnt == 1; // could the cells' day-of-weeks need updating?
+		var month = t.start.getMonth();
+		var today = clearTime(new Date());
+		var cell;
+		var date;
+		var row;
+
+		if (dowDirty) {
+			headCells.each(function(i, _cell) {
+				cell = $(_cell);
+				date = indexDate(i);
+				cell.html(formatDate(date, colFormat));
+				setDayID(cell, date);
+			});
+		}
+
+		bodyCells.each(function(i, _cell) {
+			cell = $(_cell);
+			date = indexDate(i);
+			if (date.getMonth() == month) {
+				cell.removeClass('fc-other-month');
+			}else{
+				cell.addClass('fc-other-month');
+			}
+			if (+date == +today) {
+				cell.addClass(tm + '-state-highlight fc-today');
+			}else{
+				cell.removeClass(tm + '-state-highlight fc-today');
+			}
+			cell.find('div.fc-day-number').text(date.getDate());
+			if (dowDirty) {
+				setDayID(cell, date);
+			}
+		});
+
+		bodyRows.each(function(i, _row) {
+			row = $(_row);
+			if (i < rowCnt) {
+				row.show();
+				if (i == rowCnt-1) {
+					row.addClass('fc-last');
+				}else{
+					row.removeClass('fc-last');
+				}
+			}else{
+				row.hide();
+			}
+		});
+	}
+
+
+
+	function setHeight(height) {
+		viewHeight = height;
+
+		var bodyHeight = viewHeight - head.height();
+		var rowHeight;
+		var rowHeightLast;
+		var cell;
+
+		if (opt('weekMode') == 'variable') {
+			rowHeight = rowHeightLast = Math.floor(bodyHeight / (rowCnt==1 ? 2 : 6));
+		}else{
+			rowHeight = Math.floor(bodyHeight / rowCnt);
+			rowHeightLast = bodyHeight - rowHeight * (rowCnt-1);
+		}
+
+		bodyFirstCells.each(function(i, _cell) {
+			if (i < rowCnt) {
+				cell = $(_cell);
+				setMinHeight(
+					cell.find('> div'),
+					(i==rowCnt-1 ? rowHeightLast : rowHeight) - vsides(cell)
+				);
+			}
+		});
+
+	}
+
+
+	function setWidth(width) {
+		viewWidth = width;
+		colContentPositions.clear();
+		colWidth = Math.floor(viewWidth / colCnt);
+		setOuterWidth(headCells.slice(0, -1), colWidth);
+	}
+
+
+
+	/* Day clicking and binding
+	-----------------------------------------------------------*/
+
+
+	function dayBind(days) {
+		days.click(dayClick)
+			.mousedown(daySelectionMousedown);
+	}
+
+
+	function dayClick(ev) {
+		if (!opt('selectable')) { // if selectable, SelectionManager will worry about dayClick
+			var index = parseInt(this.className.match(/fc\-day(\d+)/)[1]); // TODO: maybe use .data
+			var date = indexDate(index);
+			trigger('dayClick', this, date, true, ev);
+		}
+	}
+
+
+
+	/* Semi-transparent Overlay Helpers
+	------------------------------------------------------*/
+
+
+	function renderDayOverlay(overlayStart, overlayEnd, refreshCoordinateGrid) { // overlayEnd is exclusive
+		if (refreshCoordinateGrid) {
+			coordinateGrid.build();
+		}
+		var rowStart = cloneDate(t.visStart);
+		var rowEnd = addDays(cloneDate(rowStart), colCnt);
+		for (var i=0; i<rowCnt; i++) {
+			var stretchStart = new Date(Math.max(rowStart, overlayStart));
+			var stretchEnd = new Date(Math.min(rowEnd, overlayEnd));
+			if (stretchStart < stretchEnd) {
+				var colStart, colEnd;
+				if (rtl) {
+					colStart = dayDiff(stretchEnd, rowStart)*dis+dit+1;
+					colEnd = dayDiff(stretchStart, rowStart)*dis+dit+1;
+				}else{
+					colStart = dayDiff(stretchStart, rowStart);
+					colEnd = dayDiff(stretchEnd, rowStart);
+				}
+				dayBind(
+					renderCellOverlay(i, colStart, i, colEnd-1)
+				);
+			}
+			addDays(rowStart, 7);
+			addDays(rowEnd, 7);
+		}
+	}
+
+
+	function renderCellOverlay(row0, col0, row1, col1) { // row1,col1 is inclusive
+		var rect = coordinateGrid.rect(row0, col0, row1, col1, element);
+		return renderOverlay(rect, element);
+	}
+
+
+
+	/* Selection
+	-----------------------------------------------------------------------*/
+
+
+	function defaultSelectionEnd(startDate, allDay) {
+		return cloneDate(startDate);
+	}
+
+
+	function renderSelection(startDate, endDate, allDay) {
+		renderDayOverlay(startDate, addDays(cloneDate(endDate), 1), true); // rebuild every time???
+	}
+
+
+	function clearSelection() {
+		clearOverlays();
+	}
+
+
+	function reportDayClick(date, allDay, ev) {
+		var cell = dateCell(date);
+		var _element = bodyCells[cell.row*colCnt + cell.col];
+		trigger('dayClick', _element, date, allDay, ev);
+	}
+
+
+
+	/* External Dragging
+	-----------------------------------------------------------------------*/
+
+
+	function dragStart(_dragElement, ev, ui) {
+		hoverListener.start(function(cell) {
+			clearOverlays();
+			if (cell) {
+				renderCellOverlay(cell.row, cell.col, cell.row, cell.col);
+			}
+		}, ev);
+	}
+
+
+	function dragStop(_dragElement, ev, ui) {
+		var cell = hoverListener.stop();
+		clearOverlays();
+		if (cell) {
+			var d = cellDate(cell);
+			trigger('drop', _dragElement, d, true, ev, ui);
+		}
+	}
+
+
+
+	/* Utilities
+	--------------------------------------------------------*/
+
+
+	function defaultEventEnd(event) {
+		return cloneDate(event.start);
+	}
+
+
+	coordinateGrid = new CoordinateGrid(function(rows, cols) {
+		var e, n, p;
+		headCells.each(function(i, _e) {
+			e = $(_e);
+			n = e.offset().left;
+			if (i) {
+				p[1] = n;
+			}
+			p = [n];
+			cols[i] = p;
+		});
+		p[1] = n + e.outerWidth();
+		bodyRows.each(function(i, _e) {
+			if (i < rowCnt) {
+				e = $(_e);
+				n = e.offset().top;
+				if (i) {
+					p[1] = n;
+				}
+				p = [n];
+				rows[i] = p;
+			}
+		});
+		p[1] = n + e.outerHeight();
+	});
+
+
+	hoverListener = new HoverListener(coordinateGrid);
+
+
+	colContentPositions = new HorizontalPositionCache(function(col) {
+		return bodyCellTopInners.eq(col);
+	});
+
+
+	function colContentLeft(col) {
+		return colContentPositions.left(col);
+	}
+
+
+	function colContentRight(col) {
+		return colContentPositions.right(col);
+	}
+
+
+
+
+	function dateCell(date) {
+		return {
+			row: Math.floor(dayDiff(date, t.visStart) / 7),
+			col: dayOfWeekCol(date.getDay())
+		};
+	}
+
+
+	function cellDate(cell) {
+		return _cellDate(cell.row, cell.col);
+	}
+
+
+	function _cellDate(row, col) {
+		return addDays(cloneDate(t.visStart), row*7 + col*dis+dit);
+		// what about weekends in middle of week?
+	}
+
+
+	function indexDate(index) {
+		return _cellDate(Math.floor(index/colCnt), index%colCnt);
+	}
+
+
+	function dayOfWeekCol(dayOfWeek) {
+		return ((dayOfWeek - Math.max(firstDay, nwe) + colCnt) % colCnt) * dis + dit;
+	}
+
+
+
+
+	function allDayRow(i) {
+		return bodyRows.eq(i);
+	}
+
+
+	function allDayBounds(i) {
+		return {
+			left: 0,
+			right: viewWidth
+		};
+	}
+
+
+}
+
+function BasicEventRenderer() {
+	var t = this;
+
+
+	// exports
+	t.renderEvents = renderEvents;
+	t.compileDaySegs = compileSegs; // for DayEventRenderer
+	t.clearEvents = clearEvents;
+	t.bindDaySeg = bindDaySeg;
+
+
+	// imports
+	DayEventRenderer.call(t);
+	var opt = t.opt;
+	var trigger = t.trigger;
+	//var setOverflowHidden = t.setOverflowHidden;
+	var isEventDraggable = t.isEventDraggable;
+	var isEventResizable = t.isEventResizable;
+	var reportEvents = t.reportEvents;
+	var reportEventClear = t.reportEventClear;
+	var eventElementHandlers = t.eventElementHandlers;
+	var showEvents = t.showEvents;
+	var hideEvents = t.hideEvents;
+	var eventDrop = t.eventDrop;
+	var getDaySegmentContainer = t.getDaySegmentContainer;
+	var getHoverListener = t.getHoverListener;
+	var renderDayOverlay = t.renderDayOverlay;
+	var clearOverlays = t.clearOverlays;
+	var getRowCnt = t.getRowCnt;
+	var getColCnt = t.getColCnt;
+	var renderDaySegs = t.renderDaySegs;
+	var resizableDayEvent = t.resizableDayEvent;
+
+
+
+	/* Rendering
+	--------------------------------------------------------------------*/
+
+
+	function renderEvents(events, modifiedEventId) {
+		reportEvents(events);
+		renderDaySegs(compileSegs(events), modifiedEventId);
+	}
+
+
+	function clearEvents() {
+		reportEventClear();
+		getDaySegmentContainer().empty();
+	}
+
+
+	function compileSegs(events) {
+		var rowCnt = getRowCnt(),
+			colCnt = getColCnt(),
+			d1 = cloneDate(t.visStart),
+			d2 = addDays(cloneDate(d1), colCnt),
+			visEventsEnds = $.map(events, exclEndDay),
+			i, row,
+			j, level,
+			k, seg,
+			segs=[];
+		for (i=0; i<rowCnt; i++) {
+			row = stackSegs(sliceSegs(events, visEventsEnds, d1, d2));
+			for (j=0; j<row.length; j++) {
+				level = row[j];
+				for (k=0; k<level.length; k++) {
+					seg = level[k];
+					seg.row = i;
+					seg.level = j; // not needed anymore
+					segs.push(seg);
+				}
+			}
+			addDays(d1, 7);
+			addDays(d2, 7);
+		}
+		return segs;
+	}
+
+
+	function bindDaySeg(event, eventElement, seg) {
+		if (isEventDraggable(event)) {
+			draggableDayEvent(event, eventElement);
+		}
+		if (seg.isEnd && isEventResizable(event)) {
+			resizableDayEvent(event, eventElement, seg);
+		}
+		eventElementHandlers(event, eventElement);
+			// needs to be after, because resizableDayEvent might stopImmediatePropagation on click
+	}
+
+
+
+	/* Dragging
+	----------------------------------------------------------------------------*/
+
+
+	function draggableDayEvent(event, eventElement) {
+		var hoverListener = getHoverListener();
+		var dayDelta;
+		eventElement.draggable({
+			zIndex: 9,
+			delay: 50,
+			opacity: opt('dragOpacity'),
+			revertDuration: opt('dragRevertDuration'),
+			start: function(ev, ui) {
+				trigger('eventDragStart', eventElement, event, ev, ui);
+				hideEvents(event, eventElement);
+				hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
+					eventElement.draggable('option', 'revert', !cell || !rowDelta && !colDelta);
+					clearOverlays();
+					if (cell) {
+						//setOverflowHidden(true);
+						dayDelta = rowDelta*7 + colDelta * (opt('isRTL') ? -1 : 1);
+						renderDayOverlay(
+							addDays(cloneDate(event.start), dayDelta),
+							addDays(exclEndDay(event), dayDelta)
+						);
+					}else{
+						//setOverflowHidden(false);
+						dayDelta = 0;
+					}
+				}, ev, 'drag');
+			},
+			stop: function(ev, ui) {
+				hoverListener.stop();
+				clearOverlays();
+				trigger('eventDragStop', eventElement, event, ev, ui);
+				if (dayDelta) {
+					eventDrop(this, event, dayDelta, 0, event.allDay, ev, ui);
+				}else{
+					eventElement.css('filter', ''); // clear IE opacity side-effects
+					showEvents(event, eventElement);
+				}
+				//setOverflowHidden(false);
+			}
+		});
+	}
+
+
+}
+
+fcViews.agendaWeek = AgendaWeekView;
+
+function AgendaWeekView(element, calendar) {
+	var t = this;
+
+
+	// exports
+	t.render = render;
+
+
+	// imports
+	AgendaView.call(t, element, calendar, 'agendaWeek');
+	var opt = t.opt;
+	var renderAgenda = t.renderAgenda;
+	var formatDates = calendar.formatDates;
+
+
+
+	function render(date, delta) {
+		if (delta) {
+			addDays(date, delta * 7);
+		}
+		var start = addDays(cloneDate(date), -((date.getDay() - opt('firstDay') + 7) % 7));
+		var end = addDays(cloneDate(start), 7);
+		var visStart = cloneDate(start);
+		var visEnd = cloneDate(end);
+		var weekends = opt('weekends');
+		if (!weekends) {
+			skipWeekend(visStart);
+			skipWeekend(visEnd, -1, true);
+		}
+		t.title = formatDates(
+			visStart,
+			addDays(cloneDate(visEnd), -1),
+			opt('titleFormat')
+		);
+		t.start = start;
+		t.end = end;
+		t.visStart = visStart;
+		t.visEnd = visEnd;
+		renderAgenda(weekends ? 7 : 5);
+	}
+
+
+}
+
+fcViews.agendaDay = AgendaDayView;
+
+function AgendaDayView(element, calendar) {
+	var t = this;
+
+
+	// exports
+	t.render = render;
+
+
+	// imports
+	AgendaView.call(t, element, calendar, 'agendaDay');
+	var opt = t.opt;
+	var renderAgenda = t.renderAgenda;
+	var formatDate = calendar.formatDate;
+
+
+
+	function render(date, delta) {
+		if (delta) {
+			addDays(date, delta);
+			if (!opt('weekends')) {
+				skipWeekend(date, delta < 0 ? -1 : 1);
+			}
+		}
+		var start = cloneDate(date, true);
+		var end = addDays(cloneDate(start), 1);
+		t.title = formatDate(date, opt('titleFormat'));
+		t.start = t.visStart = start;
+		t.end = t.visEnd = end;
+		renderAgenda(1);
+	}
+
+
+}
+
+setDefaults({
+	allDaySlot: true,
+	allDayText: 'all-day',
+	firstHour: 6,
+	slotMinutes: 30,
+	defaultEventMinutes: 120,
+	axisFormat: 'h(:mm)tt',
+	timeFormat: {
+		agenda: 'h:mm{ - h:mm}'
+	},
+	dragOpacity: {
+		agenda: .5
+	},
+	minTime: 0,
+	maxTime: 24
+});
+
+
+// TODO: make it work in quirks mode (event corners, all-day height)
+// TODO: test liquid width, especially in IE6
+
+
+function AgendaView(element, calendar, viewName) {
+	var t = this;
+
+
+	// exports
+	t.renderAgenda = renderAgenda;
+	t.setWidth = setWidth;
+	t.setHeight = setHeight;
+	t.beforeHide = beforeHide;
+	t.afterShow = afterShow;
+	t.defaultEventEnd = defaultEventEnd;
+	t.timePosition = timePosition;
+	t.dayOfWeekCol = dayOfWeekCol;
+	t.dateCell = dateCell;
+	t.cellDate = cellDate;
+	t.cellIsAllDay = cellIsAllDay;
+	t.allDayRow = getAllDayRow;
+	t.allDayBounds = allDayBounds;
+	t.getHoverListener = function() { return hoverListener };
+	t.colContentLeft = colContentLeft;
+	t.colContentRight = colContentRight;
+	t.getDaySegmentContainer = function() { return daySegmentContainer };
+	t.getSlotSegmentContainer = function() { return slotSegmentContainer };
+	t.getMinMinute = function() { return minMinute };
+	t.getMaxMinute = function() { return maxMinute };
+	t.getBodyContent = function() { return slotContent }; // !!??
+	t.getRowCnt = function() { return 1 };
+	t.getColCnt = function() { return colCnt };
+	t.getColWidth = function() { return colWidth };
+	t.getSlotHeight = function() { return slotHeight };
+	t.defaultSelectionEnd = defaultSelectionEnd;
+	t.renderDayOverlay = renderDayOverlay;
+	t.renderSelection = renderSelection;
+	t.clearSelection = clearSelection;
+	t.reportDayClick = reportDayClick; // selection mousedown hack
+	t.dragStart = dragStart;
+	t.dragStop = dragStop;
+
+
+	// imports
+	View.call(t, element, calendar, viewName);
+	OverlayManager.call(t);
+	SelectionManager.call(t);
+	AgendaEventRenderer.call(t);
+	var opt = t.opt;
+	var trigger = t.trigger;
+	var clearEvents = t.clearEvents;
+	var renderOverlay = t.renderOverlay;
+	var clearOverlays = t.clearOverlays;
+	var reportSelection = t.reportSelection;
+	var unselect = t.unselect;
+	var daySelectionMousedown = t.daySelectionMousedown;
+	var slotSegHtml = t.slotSegHtml;
+	var formatDate = calendar.formatDate;
+
+
+	// locals
+
+	var dayTable;
+	var dayHead;
+	var dayHeadCells;
+	var dayBody;
+	var dayBodyCells;
+	var dayBodyCellInners;
+	var dayBodyFirstCell;
+	var dayBodyFirstCellStretcher;
+	var slotLayer;
+	var daySegmentContainer;
+	var allDayTable;
+	var allDayRow;
+	var slotScroller;
+	var slotContent;
+	var slotSegmentContainer;
+	var slotTable;
+	var slotTableFirstInner;
+	var axisFirstCells;
+	var gutterCells;
+	var selectionHelper;
+
+	var viewWidth;
+	var viewHeight;
+	var axisWidth;
+	var colWidth;
+	var gutterWidth;
+	var slotHeight; // TODO: what if slotHeight changes? (see issue 650)
+	var savedScrollTop;
+
+	var colCnt;
+	var slotCnt;
+	var coordinateGrid;
+	var hoverListener;
+	var colContentPositions;
+	var slotTopCache = {};
+
+	var tm;
+	var firstDay;
+	var nwe;            // no weekends (int)
+	var rtl, dis, dit;  // day index sign / translate
+	var minMinute, maxMinute;
+	var colFormat;
+
+
+
+	/* Rendering
+	-----------------------------------------------------------------------------*/
+
+
+	disableTextSelection(element.addClass('fc-agenda'));
+
+
+	function renderAgenda(c) {
+		colCnt = c;
+		updateOptions();
+		if (!dayTable) {
+			buildSkeleton();
+		}else{
+			clearEvents();
+		}
+		updateCells();
+	}
+
+
+
+	function updateOptions() {
+		tm = opt('theme') ? 'ui' : 'fc';
+		nwe = opt('weekends') ? 0 : 1;
+		firstDay = opt('firstDay');
+		if (rtl = opt('isRTL')) {
+			dis = -1;
+			dit = colCnt - 1;
+		}else{
+			dis = 1;
+			dit = 0;
+		}
+		minMinute = parseTime(opt('minTime'));
+		maxMinute = parseTime(opt('maxTime'));
+		colFormat = opt('columnFormat');
+	}
+
+
+
+	function buildSkeleton() {
+		var headerClass = tm + "-widget-header";
+		var contentClass = tm + "-widget-content";
+		var s;
+		var i;
+		var d;
+		var maxd;
+		var minutes;
+		var slotNormal = opt('slotMinutes') % 15 == 0;
+
+		s =
+			"<table style='width:100%' class='fc-agenda-days fc-border-separate' cellspacing='0'>" +
+			"<thead>" +
+			"<tr>" +
+			"<th class='fc-agenda-axis " + headerClass + "'>&nbsp;</th>";
+		for (i=0; i<colCnt; i++) {
+			s +=
+				"<th class='fc- fc-col" + i + ' ' + headerClass + "'/>"; // fc- needed for setDayID
+		}
+		s +=
+			"<th class='fc-agenda-gutter " + headerClass + "'>&nbsp;</th>" +
+			"</tr>" +
+			"</thead>" +
+			"<tbody>" +
+			"<tr>" +
+			"<th class='fc-agenda-axis " + headerClass + "'>&nbsp;</th>";
+		for (i=0; i<colCnt; i++) {
+			s +=
+				"<td class='fc- fc-col" + i + ' ' + contentClass + "'>" + // fc- needed for setDayID
+				"<div>" +
+				"<div class='fc-day-content'>" +
+				"<div style='position:relative'>&nbsp;</div>" +
+				"</div>" +
+				"</div>" +
+				"</td>";
+		}
+		s +=
+			"<td class='fc-agenda-gutter " + contentClass + "'>&nbsp;</td>" +
+			"</tr>" +
+			"</tbody>" +
+			"</table>";
+		dayTable = $(s).appendTo(element);
+		dayHead = dayTable.find('thead');
+		dayHeadCells = dayHead.find('th').slice(1, -1);
+		dayBody = dayTable.find('tbody');
+		dayBodyCells = dayBody.find('td').slice(0, -1);
+		dayBodyCellInners = dayBodyCells.find('div.fc-day-content div');
+		dayBodyFirstCell = dayBodyCells.eq(0);
+		dayBodyFirstCellStretcher = dayBodyFirstCell.find('> div');
+
+		markFirstLast(dayHead.add(dayHead.find('tr')));
+		markFirstLast(dayBody.add(dayBody.find('tr')));
+
+		axisFirstCells = dayHead.find('th:first');
+		gutterCells = dayTable.find('.fc-agenda-gutter');
+
+		slotLayer =
+			$("<div style='position:absolute;z-index:2;left:0;width:100%'/>")
+				.appendTo(element);
+
+		if (opt('allDaySlot')) {
+
+			daySegmentContainer =
+				$("<div style='position:absolute;z-index:8;top:0;left:0'/>")
+					.appendTo(slotLayer);
+
+			s =
+				"<table style='width:100%' class='fc-agenda-allday' cellspacing='0'>" +
+				"<tr>" +
+				"<th class='" + headerClass + " fc-agenda-axis'>" + opt('allDayText') + "</th>" +
+				"<td>" +
+				"<div class='fc-day-content'><div style='position:relative'/></div>" +
+				"</td>" +
+				"<th class='" + headerClass + " fc-agenda-gutter'>&nbsp;</th>" +
+				"</tr>" +
+				"</table>";
+			allDayTable = $(s).appendTo(slotLayer);
+			allDayRow = allDayTable.find('tr');
+
+			dayBind(allDayRow.find('td'));
+
+			axisFirstCells = axisFirstCells.add(allDayTable.find('th:first'));
+			gutterCells = gutterCells.add(allDayTable.find('th.fc-agenda-gutter'));
+
+			slotLayer.append(
+				"<div class='fc-agenda-divider " + headerClass + "'>" +
+				"<div class='fc-agenda-divider-inner'/>" +
+				"</div>"
+			);
+
+		}else{
+
+			daySegmentContainer = $([]); // in jQuery 1.4, we can just do $()
+
+		}
+
+		slotScroller =
+			$("<div style='position:absolute;width:100%;overflow-x:hidden;overflow-y:auto'/>")
+				.appendTo(slotLayer);
+
+		slotContent =
+			$("<div style='position:relative;width:100%;overflow:hidden'/>")
+				.appendTo(slotScroller);
+
+		slotSegmentContainer =
+			$("<div style='position:absolute;z-index:8;top:0;left:0'/>")
+				.appendTo(slotContent);
+
+		s =
+			"<table class='fc-agenda-slots' style='width:100%' cellspacing='0'>" +
+			"<tbody>";
+		d = zeroDate();
+		maxd = addMinutes(cloneDate(d), maxMinute);
+		addMinutes(d, minMinute);
+		slotCnt = 0;
+		for (i=0; d < maxd; i++) {
+			minutes = d.getMinutes();
+			s +=
+				"<tr class='fc-slot" + i + ' ' + (!minutes ? '' : 'fc-minor') + "'>" +
+				"<th class='fc-agenda-axis " + headerClass + "'>" +
+				((!slotNormal || !minutes) ? formatDate(d, opt('axisFormat')) : '&nbsp;') +
+				"</th>" +
+				"<td class='" + contentClass + "'>" +
+				"<div style='position:relative'>&nbsp;</div>" +
+				"</td>" +
+				"</tr>";
+			addMinutes(d, opt('slotMinutes'));
+			slotCnt++;
+		}
+		s +=
+			"</tbody>" +
+			"</table>";
+		slotTable = $(s).appendTo(slotContent);
+		slotTableFirstInner = slotTable.find('div:first');
+
+		slotBind(slotTable.find('td'));
+
+		axisFirstCells = axisFirstCells.add(slotTable.find('th:first'));
+	}
+
+
+
+	function updateCells() {
+		var i;
+		var headCell;
+		var bodyCell;
+		var date;
+		var today = clearTime(new Date());
+		for (i=0; i<colCnt; i++) {
+			date = colDate(i);
+			headCell = dayHeadCells.eq(i);
+			headCell.html(formatDate(date, colFormat));
+			bodyCell = dayBodyCells.eq(i);
+			if (+date == +today) {
+				bodyCell.addClass(tm + '-state-highlight fc-today');
+			}else{
+				bodyCell.removeClass(tm + '-state-highlight fc-today');
+			}
+			setDayID(headCell.add(bodyCell), date);
+		}
+	}
+
+
+
+	function setHeight(height, dateChanged) {
+		if (height === undefined) {
+			height = viewHeight;
+		}
+		viewHeight = height;
+		slotTopCache = {};
+
+		var headHeight = dayBody.position().top;
+		var allDayHeight = slotScroller.position().top; // including divider
+		var bodyHeight = Math.min( // total body height, including borders
+			height - headHeight,   // when scrollbars
+			slotTable.height() + allDayHeight + 1 // when no scrollbars. +1 for bottom border
+		);
+
+		dayBodyFirstCellStretcher
+			.height(bodyHeight - vsides(dayBodyFirstCell));
+
+		slotLayer.css('top', headHeight);
+
+		slotScroller.height(bodyHeight - allDayHeight - 1);
+
+		slotHeight = slotTableFirstInner.height() + 1; // +1 for border
+
+		if (dateChanged) {
+			resetScroll();
+		}
+	}
+
+
+
+	function setWidth(width) {
+		viewWidth = width;
+		colContentPositions.clear();
+
+		axisWidth = 0;
+		setOuterWidth(
+			axisFirstCells
+				.width('')
+				.each(function(i, _cell) {
+					axisWidth = Math.max(axisWidth, $(_cell).outerWidth());
+				}),
+			axisWidth
+		);
+
+		var slotTableWidth = slotScroller[0].clientWidth; // needs to be done after axisWidth (for IE7)
+		//slotTable.width(slotTableWidth);
+
+		gutterWidth = slotScroller.width() - slotTableWidth;
+		if (gutterWidth) {
+			setOuterWidth(gutterCells, gutterWidth);
+			gutterCells
+				.show()
+				.prev()
+				.removeClass('fc-last');
+		}else{
+			gutterCells
+				.hide()
+				.prev()
+				.addClass('fc-last');
+		}
+
+		colWidth = Math.floor((slotTableWidth - axisWidth) / colCnt);
+		setOuterWidth(dayHeadCells.slice(0, -1), colWidth);
+	}
+
+
+
+	function resetScroll() {
+		var d0 = zeroDate();
+		var scrollDate = cloneDate(d0);
+		scrollDate.setHours(opt('firstHour'));
+		var top = timePosition(d0, scrollDate) + 1; // +1 for the border
+		function scroll() {
+			slotScroller.scrollTop(top);
+		}
+		scroll();
+		setTimeout(scroll, 0); // overrides any previous scroll state made by the browser
+	}
+
+
+	function beforeHide() {
+		savedScrollTop = slotScroller.scrollTop();
+	}
+
+
+	function afterShow() {
+		slotScroller.scrollTop(savedScrollTop);
+	}
+
+
+
+	/* Slot/Day clicking and binding
+	-----------------------------------------------------------------------*/
+
+
+	function dayBind(cells) {
+		cells.click(slotClick)
+			.mousedown(daySelectionMousedown);
+	}
+
+
+	function slotBind(cells) {
+		cells.click(slotClick)
+			.mousedown(slotSelectionMousedown);
+	}
+
+
+	function slotClick(ev) {
+		if (!opt('selectable')) { // if selectable, SelectionManager will worry about dayClick
+			var col = Math.min(colCnt-1, Math.floor((ev.pageX - dayTable.offset().left - axisWidth) / colWidth));
+			var date = colDate(col);
+			var rowMatch = this.parentNode.className.match(/fc-slot(\d+)/); // TODO: maybe use data
+			if (rowMatch) {
+				var mins = parseInt(rowMatch[1]) * opt('slotMinutes');
+				var hours = Math.floor(mins/60);
+				date.setHours(hours);
+				date.setMinutes(mins%60 + minMinute);
+				trigger('dayClick', dayBodyCells[col], date, false, ev);
+			}else{
+				trigger('dayClick', dayBodyCells[col], date, true, ev);
+			}
+		}
+	}
+
+
+
+	/* Semi-transparent Overlay Helpers
+	-----------------------------------------------------*/
+
+
+	function renderDayOverlay(startDate, endDate, refreshCoordinateGrid) { // endDate is exclusive
+		if (refreshCoordinateGrid) {
+			coordinateGrid.build();
+		}
+		var visStart = cloneDate(t.visStart);
+		var startCol, endCol;
+		if (rtl) {
+			startCol = dayDiff(endDate, visStart)*dis+dit+1;
+			endCol = dayDiff(startDate, visStart)*dis+dit+1;
+		}else{
+			startCol = dayDiff(startDate, visStart);
+			endCol = dayDiff(endDate, visStart);
+		}
+		startCol = Math.max(0, startCol);
+		endCol = Math.min(colCnt, endCol);
+		if (startCol < endCol) {
+			dayBind(
+				renderCellOverlay(0, startCol, 0, endCol-1)
+			);
+		}
+	}
+
+
+	function renderCellOverlay(row0, col0, row1, col1) { // only for all-day?
+		var rect = coordinateGrid.rect(row0, col0, row1, col1, slotLayer);
+		return renderOverlay(rect, slotLayer);
+	}
+
+
+	function renderSlotOverlay(overlayStart, overlayEnd) {
+		var dayStart = cloneDate(t.visStart);
+		var dayEnd = addDays(cloneDate(dayStart), 1);
+		for (var i=0; i<colCnt; i++) {
+			var stretchStart = new Date(Math.max(dayStart, overlayStart));
+			var stretchEnd = new Date(Math.min(dayEnd, overlayEnd));
+			if (stretchStart < stretchEnd) {
+				var col = i*dis+dit;
+				var rect = coordinateGrid.rect(0, col, 0, col, slotContent); // only use it for horizontal coords
+				var top = timePosition(dayStart, stretchStart);
+				var bottom = timePosition(dayStart, stretchEnd);
+				rect.top = top;
+				rect.height = bottom - top;
+				slotBind(
+					renderOverlay(rect, slotContent)
+				);
+			}
+			addDays(dayStart, 1);
+			addDays(dayEnd, 1);
+		}
+	}
+
+
+
+	/* Coordinate Utilities
+	-----------------------------------------------------------------------------*/
+
+
+	coordinateGrid = new CoordinateGrid(function(rows, cols) {
+		var e, n, p;
+		dayHeadCells.each(function(i, _e) {
+			e = $(_e);
+			n = e.offset().left;
+			if (i) {
+				p[1] = n;
+			}
+			p = [n];
+			cols[i] = p;
+		});
+		p[1] = n + e.outerWidth();
+		if (opt('allDaySlot')) {
+			e = allDayRow;
+			n = e.offset().top;
+			rows[0] = [n, n+e.outerHeight()];
+		}
+		var slotTableTop = slotContent.offset().top;
+		var slotScrollerTop = slotScroller.offset().top;
+		var slotScrollerBottom = slotScrollerTop + slotScroller.outerHeight();
+		function constrain(n) {
+			return Math.max(slotScrollerTop, Math.min(slotScrollerBottom, n));
+		}
+		for (var i=0; i<slotCnt; i++) {
+			rows.push([
+				constrain(slotTableTop + slotHeight*i),
+				constrain(slotTableTop + slotHeight*(i+1))
+			]);
+		}
+	});
+
+
+	hoverListener = new HoverListener(coordinateGrid);
+
+
+	colContentPositions = new HorizontalPositionCache(function(col) {
+		return dayBodyCellInners.eq(col);
+	});
+
+
+	function colContentLeft(col) {
+		return colContentPositions.left(col);
+	}
+
+
+	function colContentRight(col) {
+		return colContentPositions.right(col);
+	}
+
+
+
+
+	function dateCell(date) { // "cell" terminology is now confusing
+		return {
+			row: Math.floor(dayDiff(date, t.visStart) / 7),
+			col: dayOfWeekCol(date.getDay())
+		};
+	}
+
+
+	function cellDate(cell) {
+		var d = colDate(cell.col);
+		var slotIndex = cell.row;
+		if (opt('allDaySlot')) {
+			slotIndex--;
+		}
+		if (slotIndex >= 0) {
+			addMinutes(d, minMinute + slotIndex * opt('slotMinutes'));
+		}
+		return d;
+	}
+
+
+	function colDate(col) { // returns dates with 00:00:00
+		return addDays(cloneDate(t.visStart), col*dis+dit);
+	}
+
+
+	function cellIsAllDay(cell) {
+		return opt('allDaySlot') && !cell.row;
+	}
+
+
+	function dayOfWeekCol(dayOfWeek) {
+		return ((dayOfWeek - Math.max(firstDay, nwe) + colCnt) % colCnt)*dis+dit;
+	}
+
+
+
+
+	// get the Y coordinate of the given time on the given day (both Date objects)
+	function timePosition(day, time) { // both date objects. day holds 00:00 of current day
+		day = cloneDate(day, true);
+		if (time < addMinutes(cloneDate(day), minMinute)) {
+			return 0;
+		}
+		if (time >= addMinutes(cloneDate(day), maxMinute)) {
+			return slotTable.height();
+		}
+		var slotMinutes = opt('slotMinutes'),
+			minutes = time.getHours()*60 + time.getMinutes() - minMinute,
+			slotI = Math.floor(minutes / slotMinutes),
+			slotTop = slotTopCache[slotI];
+		if (slotTop === undefined) {
+			slotTop = slotTopCache[slotI] = slotTable.find('tr:eq(' + slotI + ') td div')[0].offsetTop; //.position().top; // need this optimization???
+		}
+		return Math.max(0, Math.round(
+			slotTop - 1 + slotHeight * ((minutes % slotMinutes) / slotMinutes)
+		));
+	}
+
+
+	function allDayBounds() {
+		return {
+			left: axisWidth,
+			right: viewWidth - gutterWidth
+		}
+	}
+
+
+	function getAllDayRow(index) {
+		return allDayRow;
+	}
+
+
+	function defaultEventEnd(event) {
+		var start = cloneDate(event.start);
+		if (event.allDay) {
+			return start;
+		}
+		return addMinutes(start, opt('defaultEventMinutes'));
+	}
+
+
+
+	/* Selection
+	---------------------------------------------------------------------------------*/
+
+
+	function defaultSelectionEnd(startDate, allDay) {
+		if (allDay) {
+			return cloneDate(startDate);
+		}
+		return addMinutes(cloneDate(startDate), opt('slotMinutes'));
+	}
+
+
+	function renderSelection(startDate, endDate, allDay) { // only for all-day
+		if (allDay) {
+			if (opt('allDaySlot')) {
+				renderDayOverlay(startDate, addDays(cloneDate(endDate), 1), true);
+			}
+		}else{
+			renderSlotSelection(startDate, endDate);
+		}
+	}
+
+
+	function renderSlotSelection(startDate, endDate) {
+		var helperOption = opt('selectHelper');
+		coordinateGrid.build();
+		if (helperOption) {
+			var col = dayDiff(startDate, t.visStart) * dis + dit;
+			if (col >= 0 && col < colCnt) { // only works when times are on same day
+				var rect = coordinateGrid.rect(0, col, 0, col, slotContent); // only for horizontal coords
+				var top = timePosition(startDate, startDate);
+				var bottom = timePosition(startDate, endDate);
+				if (bottom > top) { // protect against selections that are entirely before or after visible range
+					rect.top = top;
+					rect.height = bottom - top;
+					rect.left += 2;
+					rect.width -= 5;
+					if ($.isFunction(helperOption)) {
+						var helperRes = helperOption(startDate, endDate);
+						if (helperRes) {
+							rect.position = 'absolute';
+							rect.zIndex = 8;
+							selectionHelper = $(helperRes)
+								.css(rect)
+								.appendTo(slotContent);
+						}
+					}else{
+						rect.isStart = true; // conside rect a "seg" now
+						rect.isEnd = true;   //
+						selectionHelper = $(slotSegHtml(
+							{
+								title: '',
+								start: startDate,
+								end: endDate,
+								className: ['fc-select-helper'],
+								editable: false
+							},
+							rect
+						));
+						selectionHelper.css('opacity', opt('dragOpacity'));
+					}
+					if (selectionHelper) {
+						slotBind(selectionHelper);
+						slotContent.append(selectionHelper);
+						setOuterWidth(selectionHelper, rect.width, true); // needs to be after appended
+						setOuterHeight(selectionHelper, rect.height, true);
+					}
+				}
+			}
+		}else{
+			renderSlotOverlay(startDate, endDate);
+		}
+	}
+
+
+	function clearSelection() {
+		clearOverlays();
+		if (selectionHelper) {
+			selectionHelper.remove();
+			selectionHelper = null;
+		}
+	}
+
+
+	function slotSelectionMousedown(ev) {
+		if (ev.which == 1 && opt('selectable')) { // ev.which==1 means left mouse button
+			unselect(ev);
+			var dates;
+			hoverListener.start(function(cell, origCell) {
+				clearSelection();
+				if (cell && cell.col == origCell.col && !cellIsAllDay(cell)) {
+					var d1 = cellDate(origCell);
+					var d2 = cellDate(cell);
+					dates = [
+						d1,
+						addMinutes(cloneDate(d1), opt('slotMinutes')),
+						d2,
+						addMinutes(cloneDate(d2), opt('slotMinutes'))
+					].sort(cmp);
+					renderSlotSelection(dates[0], dates[3]);
+				}else{
+					dates = null;
+				}
+			}, ev);
+			$(document).one('mouseup', function(ev) {
+				hoverListener.stop();
+				if (dates) {
+					if (+dates[0] == +dates[1]) {
+						reportDayClick(dates[0], false, ev);
+					}
+					reportSelection(dates[0], dates[3], false, ev);
+				}
+			});
+		}
+	}
+
+
+	function reportDayClick(date, allDay, ev) {
+		trigger('dayClick', dayBodyCells[dayOfWeekCol(date.getDay())], date, allDay, ev);
+	}
+
+
+
+	/* External Dragging
+	--------------------------------------------------------------------------------*/
+
+
+	function dragStart(_dragElement, ev, ui) {
+		hoverListener.start(function(cell) {
+			clearOverlays();
+			if (cell) {
+				if (cellIsAllDay(cell)) {
+					renderCellOverlay(cell.row, cell.col, cell.row, cell.col);
+				}else{
+					var d1 = cellDate(cell);
+					var d2 = addMinutes(cloneDate(d1), opt('defaultEventMinutes'));
+					renderSlotOverlay(d1, d2);
+				}
+			}
+		}, ev);
+	}
+
+
+	function dragStop(_dragElement, ev, ui) {
+		var cell = hoverListener.stop();
+		clearOverlays();
+		if (cell) {
+			trigger('drop', _dragElement, cellDate(cell), cellIsAllDay(cell), ev, ui);
+		}
+	}
+
+
+}
+
+function AgendaEventRenderer() {
+	var t = this;
+
+
+	// exports
+	t.renderEvents = renderEvents;
+	t.compileDaySegs = compileDaySegs; // for DayEventRenderer
+	t.clearEvents = clearEvents;
+	t.slotSegHtml = slotSegHtml;
+	t.bindDaySeg = bindDaySeg;
+
+
+	// imports
+	DayEventRenderer.call(t);
+	var opt = t.opt;
+	var trigger = t.trigger;
+	//var setOverflowHidden = t.setOverflowHidden;
+	var isEventDraggable = t.isEventDraggable;
+	var isEventResizable = t.isEventResizable;
+	var eventEnd = t.eventEnd;
+	var reportEvents = t.reportEvents;
+	var reportEventClear = t.reportEventClear;
+	var eventElementHandlers = t.eventElementHandlers;
+	var setHeight = t.setHeight;
+	var getDaySegmentContainer = t.getDaySegmentContainer;
+	var getSlotSegmentContainer = t.getSlotSegmentContainer;
+	var getHoverListener = t.getHoverListener;
+	var getMaxMinute = t.getMaxMinute;
+	var getMinMinute = t.getMinMinute;
+	var timePosition = t.timePosition;
+	var colContentLeft = t.colContentLeft;
+	var colContentRight = t.colContentRight;
+	var renderDaySegs = t.renderDaySegs;
+	var resizableDayEvent = t.resizableDayEvent; // TODO: streamline binding architecture
+	var getColCnt = t.getColCnt;
+	var getColWidth = t.getColWidth;
+	var getSlotHeight = t.getSlotHeight;
+	var getBodyContent = t.getBodyContent;
+	var reportEventElement = t.reportEventElement;
+	var showEvents = t.showEvents;
+	var hideEvents = t.hideEvents;
+	var eventDrop = t.eventDrop;
+	var eventResize = t.eventResize;
+	var renderDayOverlay = t.renderDayOverlay;
+	var clearOverlays = t.clearOverlays;
+	var calendar = t.calendar;
+	var formatDate = calendar.formatDate;
+	var formatDates = calendar.formatDates;
+
+
+
+	/* Rendering
+	----------------------------------------------------------------------------*/
+
+
+	function renderEvents(events, modifiedEventId) {
+		reportEvents(events);
+		var i, len=events.length,
+			dayEvents=[],
+			slotEvents=[];
+		for (i=0; i<len; i++) {
+			if (events[i].allDay) {
+				dayEvents.push(events[i]);
+			}else{
+				slotEvents.push(events[i]);
+			}
+		}
+		if (opt('allDaySlot')) {
+			renderDaySegs(compileDaySegs(dayEvents), modifiedEventId);
+			setHeight(); // no params means set to viewHeight
+		}
+		renderSlotSegs(compileSlotSegs(slotEvents), modifiedEventId);
+	}
+
+
+	function clearEvents() {
+		reportEventClear();
+		getDaySegmentContainer().empty();
+		getSlotSegmentContainer().empty();
+	}
+
+
+	function compileDaySegs(events) {
+		var levels = stackSegs(sliceSegs(events, $.map(events, exclEndDay), t.visStart, t.visEnd)),
+			i, levelCnt=levels.length, level,
+			j, seg,
+			segs=[];
+		for (i=0; i<levelCnt; i++) {
+			level = levels[i];
+			for (j=0; j<level.length; j++) {
+				seg = level[j];
+				seg.row = 0;
+				seg.level = i; // not needed anymore
+				segs.push(seg);
+			}
+		}
+		return segs;
+	}
+
+
+	function compileSlotSegs(events) {
+		var colCnt = getColCnt(),
+			minMinute = getMinMinute(),
+			maxMinute = getMaxMinute(),
+			d = addMinutes(cloneDate(t.visStart), minMinute),
+			visEventEnds = $.map(events, slotEventEnd),
+			i, col,
+			j, level,
+			k, seg,
+			segs=[];
+		for (i=0; i<colCnt; i++) {
+			col = stackSegs(sliceSegs(events, visEventEnds, d, addMinutes(cloneDate(d), maxMinute-minMinute)));
+			countForwardSegs(col);
+			for (j=0; j<col.length; j++) {
+				level = col[j];
+				for (k=0; k<level.length; k++) {
+					seg = level[k];
+					seg.col = i;
+					seg.level = j;
+					segs.push(seg);
+				}
+			}
+			addDays(d, 1, true);
+		}
+		return segs;
+	}
+
+
+	function slotEventEnd(event) {
+		if (event.end) {
+			return cloneDate(event.end);
+		}else{
+			return addMinutes(cloneDate(event.start), opt('defaultEventMinutes'));
+		}
+	}
+
+
+	// renders events in the 'time slots' at the bottom
+
+	function renderSlotSegs(segs, modifiedEventId) {
+
+		var i, segCnt=segs.length, seg,
+			event,
+			classes,
+			top, bottom,
+			colI, levelI, forward,
+			leftmost,
+			availWidth,
+			outerWidth,
+			left,
+			html='',
+			eventElements,
+			eventElement,
+			triggerRes,
+			vsideCache={},
+			hsideCache={},
+			key, val,
+			contentElement,
+			height,
+			slotSegmentContainer = getSlotSegmentContainer(),
+			rtl, dis, dit,
+			colCnt = getColCnt();
+
+		if (rtl = opt('isRTL')) {
+			dis = -1;
+			dit = colCnt - 1;
+		}else{
+			dis = 1;
+			dit = 0;
+		}
+
+		// calculate position/dimensions, create html
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			event = seg.event;
+			top = timePosition(seg.start, seg.start);
+			bottom = timePosition(seg.start, seg.end);
+			colI = seg.col;
+			levelI = seg.level;
+			forward = seg.forward || 0;
+			leftmost = colContentLeft(colI*dis + dit);
+			availWidth = colContentRight(colI*dis + dit) - leftmost;
+			availWidth = Math.min(availWidth-6, availWidth*.95); // TODO: move this to CSS
+			if (levelI) {
+				// indented and thin
+				outerWidth = availWidth / (levelI + forward + 1);
+			}else{
+				if (forward) {
+					// moderately wide, aligned left still
+					outerWidth = ((availWidth / (forward + 1)) - (12/2)) * 2; // 12 is the predicted width of resizer =
+				}else{
+					// can be entire width, aligned left
+					outerWidth = availWidth;
+				}
+			}
+			left = leftmost +                                  // leftmost possible
+				(availWidth / (levelI + forward + 1) * levelI) // indentation
+				* dis + (rtl ? availWidth - outerWidth : 0);   // rtl
+			seg.top = top;
+			seg.left = left;
+			seg.outerWidth = outerWidth;
+			seg.outerHeight = bottom - top;
+			html += slotSegHtml(event, seg);
+		}
+		slotSegmentContainer[0].innerHTML = html; // faster than html()
+		eventElements = slotSegmentContainer.children();
+
+		// retrieve elements, run through eventRender callback, bind event handlers
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			event = seg.event;
+			eventElement = $(eventElements[i]); // faster than eq()
+			triggerRes = trigger('eventRender', event, event, eventElement);
+			if (triggerRes === false) {
+				eventElement.remove();
+			}else{
+				if (triggerRes && triggerRes !== true) {
+					eventElement.remove();
+					eventElement = $(triggerRes)
+						.css({
+							position: 'absolute',
+							top: seg.top,
+							left: seg.left
+						})
+						.appendTo(slotSegmentContainer);
+				}
+				seg.element = eventElement;
+				if (event._id === modifiedEventId) {
+					bindSlotSeg(event, eventElement, seg);
+				}else{
+					eventElement[0]._fci = i; // for lazySegBind
+				}
+				reportEventElement(event, eventElement);
+			}
+		}
+
+		lazySegBind(slotSegmentContainer, segs, bindSlotSeg);
+
+		// record event sides and title positions
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			if (eventElement = seg.element) {
+				val = vsideCache[key = seg.key = cssKey(eventElement[0])];
+				seg.vsides = val === undefined ? (vsideCache[key] = vsides(eventElement, true)) : val;
+				val = hsideCache[key];
+				seg.hsides = val === undefined ? (hsideCache[key] = hsides(eventElement, true)) : val;
+				contentElement = eventElement.find('div.fc-event-content');
+				if (contentElement.length) {
+					seg.contentTop = contentElement[0].offsetTop;
+				}
+			}
+		}
+
+		// set all positions/dimensions at once
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			if (eventElement = seg.element) {
+				eventElement[0].style.width = Math.max(0, seg.outerWidth - seg.hsides) + 'px';
+				height = Math.max(0, seg.outerHeight - seg.vsides);
+				eventElement[0].style.height = height + 'px';
+				event = seg.event;
+				if (seg.contentTop !== undefined && height - seg.contentTop < 10) {
+					// not enough room for title, put it in the time header
+					eventElement.find('div.fc-event-time')
+						.text(formatDate(event.start, opt('timeFormat')) + ' - ' + event.title);
+					eventElement.find('div.fc-event-title')
+						.remove();
+				}
+				trigger('eventAfterRender', event, event, eventElement);
+			}
+		}
+
+	}
+
+
+	function slotSegHtml(event, seg) {
+		var html = "<";
+		var url = event.url;
+		var skinCss = getSkinCss(event, opt);
+		var skinCssAttr = (skinCss ? " style='" + skinCss + "'" : '');
+		var classes = ['fc-event', 'fc-event-skin', 'fc-event-vert'];
+		if (isEventDraggable(event)) {
+			classes.push('fc-event-draggable');
+		}
+		if (seg.isStart) {
+			classes.push('fc-corner-top');
+		}
+		if (seg.isEnd) {
+			classes.push('fc-corner-bottom');
+		}
+		classes = classes.concat(event.className);
+		if (event.source) {
+			classes = classes.concat(event.source.className || []);
+		}
+		if (url) {
+			html += "a href='" + htmlEscape(event.url) + "'";
+		}else{
+			html += "div";
+		}
+		html +=
+			" class='" + classes.join(' ') + "'" +
+			" style='position:absolute;z-index:8;top:" + seg.top + "px;left:" + seg.left + "px;" + skinCss + "'" +
+			">" +
+			"<div class='fc-event-inner fc-event-skin'" + skinCssAttr + ">" +
+			"<div class='fc-event-head fc-event-skin'" + skinCssAttr + ">" +
+			"<div class='fc-event-time'>" +
+			htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) +
+			"</div>" +
+			"</div>" +
+			"<div class='fc-event-content'>" +
+			"<div class='fc-event-title'>" +
+			htmlEscape(event.title) +
+			"</div>" +
+			"</div>" +
+			"<div class='fc-event-bg'></div>" +
+			"</div>"; // close inner
+		if (seg.isEnd && isEventResizable(event)) {
+			html +=
+				"<div class='ui-resizable-handle ui-resizable-s'>=</div>";
+		}
+		html +=
+			"</" + (url ? "a" : "div") + ">";
+		return html;
+	}
+
+
+	function bindDaySeg(event, eventElement, seg) {
+		if (isEventDraggable(event)) {
+			draggableDayEvent(event, eventElement, seg.isStart);
+		}
+		if (seg.isEnd && isEventResizable(event)) {
+			resizableDayEvent(event, eventElement, seg);
+		}
+		eventElementHandlers(event, eventElement);
+			// needs to be after, because resizableDayEvent might stopImmediatePropagation on click
+	}
+
+
+	function bindSlotSeg(event, eventElement, seg) {
+		var timeElement = eventElement.find('div.fc-event-time');
+		if (isEventDraggable(event)) {
+			draggableSlotEvent(event, eventElement, timeElement);
+		}
+		if (seg.isEnd && isEventResizable(event)) {
+			resizableSlotEvent(event, eventElement, timeElement);
+		}
+		eventElementHandlers(event, eventElement);
+	}
+
+
+
+	/* Dragging
+	-----------------------------------------------------------------------------------*/
+
+
+	// when event starts out FULL-DAY
+
+	function draggableDayEvent(event, eventElement, isStart) {
+		var origWidth;
+		var revert;
+		var allDay=true;
+		var dayDelta;
+		var dis = opt('isRTL') ? -1 : 1;
+		var hoverListener = getHoverListener();
+		var colWidth = getColWidth();
+		var slotHeight = getSlotHeight();
+		var minMinute = getMinMinute();
+		eventElement.draggable({
+			zIndex: 9,
+			opacity: opt('dragOpacity', 'month'), // use whatever the month view was using
+			revertDuration: opt('dragRevertDuration'),
+			start: function(ev, ui) {
+				trigger('eventDragStart', eventElement, event, ev, ui);
+				hideEvents(event, eventElement);
+				origWidth = eventElement.width();
+				hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
+					clearOverlays();
+					if (cell) {
+						//setOverflowHidden(true);
+						revert = false;
+						dayDelta = colDelta * dis;
+						if (!cell.row) {
+							// on full-days
+							renderDayOverlay(
+								addDays(cloneDate(event.start), dayDelta),
+								addDays(exclEndDay(event), dayDelta)
+							);
+							resetElement();
+						}else{
+							// mouse is over bottom slots
+							if (isStart) {
+								if (allDay) {
+									// convert event to temporary slot-event
+									eventElement.width(colWidth - 10); // don't use entire width
+									setOuterHeight(
+										eventElement,
+										slotHeight * Math.round(
+											(event.end ? ((event.end - event.start) / MINUTE_MS) : opt('defaultEventMinutes'))
+											/ opt('slotMinutes')
+										)
+									);
+									eventElement.draggable('option', 'grid', [colWidth, 1]);
+									allDay = false;
+								}
+							}else{
+								revert = true;
+							}
+						}
+						revert = revert || (allDay && !dayDelta);
+					}else{
+						resetElement();
+						//setOverflowHidden(false);
+						revert = true;
+					}
+					eventElement.draggable('option', 'revert', revert);
+				}, ev, 'drag');
+			},
+			stop: function(ev, ui) {
+				hoverListener.stop();
+				clearOverlays();
+				trigger('eventDragStop', eventElement, event, ev, ui);
+				if (revert) {
+					// hasn't moved or is out of bounds (draggable has already reverted)
+					resetElement();
+					eventElement.css('filter', ''); // clear IE opacity side-effects
+					showEvents(event, eventElement);
+				}else{
+					// changed!
+					var minuteDelta = 0;
+					if (!allDay) {
+						minuteDelta = Math.round((eventElement.offset().top - getBodyContent().offset().top) / slotHeight)
+							* opt('slotMinutes')
+							+ minMinute
+							- (event.start.getHours() * 60 + event.start.getMinutes());
+					}
+					eventDrop(this, event, dayDelta, minuteDelta, allDay, ev, ui);
+				}
+				//setOverflowHidden(false);
+			}
+		});
+		function resetElement() {
+			if (!allDay) {
+				eventElement
+					.width(origWidth)
+					.height('')
+					.draggable('option', 'grid', null);
+				allDay = true;
+			}
+		}
+	}
+
+
+	// when event starts out IN TIMESLOTS
+
+	function draggableSlotEvent(event, eventElement, timeElement) {
+		var origPosition;
+		var allDay=false;
+		var dayDelta;
+		var minuteDelta;
+		var prevMinuteDelta;
+		var dis = opt('isRTL') ? -1 : 1;
+		var hoverListener = getHoverListener();
+		var colCnt = getColCnt();
+		var colWidth = getColWidth();
+		var slotHeight = getSlotHeight();
+		eventElement.draggable({
+			zIndex: 9,
+			scroll: false,
+			grid: [colWidth, slotHeight],
+			axis: colCnt==1 ? 'y' : false,
+			opacity: opt('dragOpacity'),
+			revertDuration: opt('dragRevertDuration'),
+			start: function(ev, ui) {
+				trigger('eventDragStart', eventElement, event, ev, ui);
+				hideEvents(event, eventElement);
+				origPosition = eventElement.position();
+				minuteDelta = prevMinuteDelta = 0;
+				hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
+					eventElement.draggable('option', 'revert', !cell);
+					clearOverlays();
+					if (cell) {
+						dayDelta = colDelta * dis;
+						if (opt('allDaySlot') && !cell.row) {
+							// over full days
+							if (!allDay) {
+								// convert to temporary all-day event
+								allDay = true;
+								timeElement.hide();
+								eventElement.draggable('option', 'grid', null);
+							}
+							renderDayOverlay(
+								addDays(cloneDate(event.start), dayDelta),
+								addDays(exclEndDay(event), dayDelta)
+							);
+						}else{
+							// on slots
+							resetElement();
+						}
+					}
+				}, ev, 'drag');
+			},
+			drag: function(ev, ui) {
+				minuteDelta = Math.round((ui.position.top - origPosition.top) / slotHeight) * opt('slotMinutes');
+				if (minuteDelta != prevMinuteDelta) {
+					if (!allDay) {
+						updateTimeText(minuteDelta);
+					}
+					prevMinuteDelta = minuteDelta;
+				}
+			},
+			stop: function(ev, ui) {
+				var cell = hoverListener.stop();
+				clearOverlays();
+				trigger('eventDragStop', eventElement, event, ev, ui);
+				if (cell && (dayDelta || minuteDelta || allDay)) {
+					// changed!
+					eventDrop(this, event, dayDelta, allDay ? 0 : minuteDelta, allDay, ev, ui);
+				}else{
+					// either no change or out-of-bounds (draggable has already reverted)
+					resetElement();
+					eventElement.css('filter', ''); // clear IE opacity side-effects
+					eventElement.css(origPosition); // sometimes fast drags make event revert to wrong position
+					updateTimeText(0);
+					showEvents(event, eventElement);
+				}
+			}
+		});
+		function updateTimeText(minuteDelta) {
+			var newStart = addMinutes(cloneDate(event.start), minuteDelta);
+			var newEnd;
+			if (event.end) {
+				newEnd = addMinutes(cloneDate(event.end), minuteDelta);
+			}
+			timeElement.text(formatDates(newStart, newEnd, opt('timeFormat')));
+		}
+		function resetElement() {
+			// convert back to original slot-event
+			if (allDay) {
+				timeElement.css('display', ''); // show() was causing display=inline
+				eventElement.draggable('option', 'grid', [colWidth, slotHeight]);
+				allDay = false;
+			}
+		}
+	}
+
+
+
+	/* Resizing
+	--------------------------------------------------------------------------------------*/
+
+
+	function resizableSlotEvent(event, eventElement, timeElement) {
+		var slotDelta, prevSlotDelta;
+		var slotHeight = getSlotHeight();
+		eventElement.resizable({
+			handles: {
+				s: 'div.ui-resizable-s'
+			},
+			grid: slotHeight,
+			start: function(ev, ui) {
+				slotDelta = prevSlotDelta = 0;
+				hideEvents(event, eventElement);
+				eventElement.css('z-index', 9);
+				trigger('eventResizeStart', this, event, ev, ui);
+			},
+			resize: function(ev, ui) {
+				// don't rely on ui.size.height, doesn't take grid into account
+				slotDelta = Math.round((Math.max(slotHeight, eventElement.height()) - ui.originalSize.height) / slotHeight);
+				if (slotDelta != prevSlotDelta) {
+					timeElement.text(
+						formatDates(
+							event.start,
+							(!slotDelta && !event.end) ? null : // no change, so don't display time range
+								addMinutes(eventEnd(event), opt('slotMinutes')*slotDelta),
+							opt('timeFormat')
+						)
+					);
+					prevSlotDelta = slotDelta;
+				}
+			},
+			stop: function(ev, ui) {
+				trigger('eventResizeStop', this, event, ev, ui);
+				if (slotDelta) {
+					eventResize(this, event, 0, opt('slotMinutes')*slotDelta, ev, ui);
+				}else{
+					eventElement.css('z-index', 8);
+					showEvents(event, eventElement);
+					// BUG: if event was really short, need to put title back in span
+				}
+			}
+		});
+	}
+
+
+}
+
+
+function countForwardSegs(levels) {
+	var i, j, k, level, segForward, segBack;
+	for (i=levels.length-1; i>0; i--) {
+		level = levels[i];
+		for (j=0; j<level.length; j++) {
+			segForward = level[j];
+			for (k=0; k<levels[i-1].length; k++) {
+				segBack = levels[i-1][k];
+				if (segsCollide(segForward, segBack)) {
+					segBack.forward = Math.max(segBack.forward||0, (segForward.forward||0)+1);
+				}
+			}
+		}
+	}
+}
+
+
+
+
+function View(element, calendar, viewName) {
+	var t = this;
+
+
+	// exports
+	t.element = element;
+	t.calendar = calendar;
+	t.name = viewName;
+	t.opt = opt;
+	t.trigger = trigger;
+	//t.setOverflowHidden = setOverflowHidden;
+	t.isEventDraggable = isEventDraggable;
+	t.isEventResizable = isEventResizable;
+	t.reportEvents = reportEvents;
+	t.eventEnd = eventEnd;
+	t.reportEventElement = reportEventElement;
+	t.reportEventClear = reportEventClear;
+	t.eventElementHandlers = eventElementHandlers;
+	t.showEvents = showEvents;
+	t.hideEvents = hideEvents;
+	t.eventDrop = eventDrop;
+	t.eventResize = eventResize;
+	// t.title
+	// t.start, t.end
+	// t.visStart, t.visEnd
+
+
+	// imports
+	var defaultEventEnd = t.defaultEventEnd;
+	var normalizeEvent = calendar.normalizeEvent; // in EventManager
+	var reportEventChange = calendar.reportEventChange;
+
+
+	// locals
+	var eventsByID = {};
+	var eventElements = [];
+	var eventElementsByID = {};
+	var options = calendar.options;
+
+
+
+	function opt(name, viewNameOverride) {
+		var v = options[name];
+		if (typeof v == 'object') {
+			return smartProperty(v, viewNameOverride || viewName);
+		}
+		return v;
+	}
+
+
+	function trigger(name, thisObj) {
+		return calendar.trigger.apply(
+			calendar,
+			[name, thisObj || t].concat(Array.prototype.slice.call(arguments, 2), [t])
+		);
+	}
+
+
+	/*
+	function setOverflowHidden(bool) {
+		element.css('overflow', bool ? 'hidden' : '');
+	}
+	*/
+
+
+	function isEventDraggable(event) {
+		return isEventEditable(event) && !opt('disableDragging');
+	}
+
+
+	function isEventResizable(event) { // but also need to make sure the seg.isEnd == true
+		return isEventEditable(event) && !opt('disableResizing');
+	}
+
+
+	function isEventEditable(event) {
+		return firstDefined(event.editable, (event.source || {}).editable, opt('editable'));
+	}
+
+
+
+	/* Event Data
+	------------------------------------------------------------------------------*/
+
+
+	// report when view receives new events
+	function reportEvents(events) { // events are already normalized at this point
+		eventsByID = {};
+		var i, len=events.length, event;
+		for (i=0; i<len; i++) {
+			event = events[i];
+			if (eventsByID[event._id]) {
+				eventsByID[event._id].push(event);
+			}else{
+				eventsByID[event._id] = [event];
+			}
+		}
+	}
+
+
+	// returns a Date object for an event's end
+	function eventEnd(event) {
+		return event.end ? cloneDate(event.end) : defaultEventEnd(event);
+	}
+
+
+
+	/* Event Elements
+	------------------------------------------------------------------------------*/
+
+
+	// report when view creates an element for an event
+	function reportEventElement(event, element) {
+		eventElements.push(element);
+		if (eventElementsByID[event._id]) {
+			eventElementsByID[event._id].push(element);
+		}else{
+			eventElementsByID[event._id] = [element];
+		}
+	}
+
+
+	function reportEventClear() {
+		eventElements = [];
+		eventElementsByID = {};
+	}
+
+
+	// attaches eventClick, eventMouseover, eventMouseout
+	function eventElementHandlers(event, eventElement) {
+		eventElement
+			.click(function(ev) {
+				if (!eventElement.hasClass('ui-draggable-dragging') &&
+					!eventElement.hasClass('ui-resizable-resizing')) {
+						return trigger('eventClick', this, event, ev);
+					}
+			})
+			.hover(
+				function(ev) {
+					trigger('eventMouseover', this, event, ev);
+				},
+				function(ev) {
+					trigger('eventMouseout', this, event, ev);
+				}
+			);
+		// TODO: don't fire eventMouseover/eventMouseout *while* dragging is occuring (on subject element)
+		// TODO: same for resizing
+	}
+
+
+	function showEvents(event, exceptElement) {
+		eachEventElement(event, exceptElement, 'show');
+	}
+
+
+	function hideEvents(event, exceptElement) {
+		eachEventElement(event, exceptElement, 'hide');
+	}
+
+
+	function eachEventElement(event, exceptElement, funcName) {
+		var elements = eventElementsByID[event._id],
+			i, len = elements.length;
+		for (i=0; i<len; i++) {
+			if (!exceptElement || elements[i][0] != exceptElement[0]) {
+				elements[i][funcName]();
+			}
+		}
+	}
+
+
+
+	/* Event Modification Reporting
+	---------------------------------------------------------------------------------*/
+
+
+	function eventDrop(e, event, dayDelta, minuteDelta, allDay, ev, ui) {
+		var oldAllDay = event.allDay;
+		var eventId = event._id;
+		moveEvents(eventsByID[eventId], dayDelta, minuteDelta, allDay);
+		trigger(
+			'eventDrop',
+			e,
+			event,
+			dayDelta,
+			minuteDelta,
+			allDay,
+			function() {
+				// TODO: investigate cases where this inverse technique might not work
+				moveEvents(eventsByID[eventId], -dayDelta, -minuteDelta, oldAllDay);
+				reportEventChange(eventId);
+			},
+			ev,
+			ui
+		);
+		reportEventChange(eventId);
+	}
+
+
+	function eventResize(e, event, dayDelta, minuteDelta, ev, ui) {
+		var eventId = event._id;
+		elongateEvents(eventsByID[eventId], dayDelta, minuteDelta);
+		trigger(
+			'eventResize',
+			e,
+			event,
+			dayDelta,
+			minuteDelta,
+			function() {
+				// TODO: investigate cases where this inverse technique might not work
+				elongateEvents(eventsByID[eventId], -dayDelta, -minuteDelta);
+				reportEventChange(eventId);
+			},
+			ev,
+			ui
+		);
+		reportEventChange(eventId);
+	}
+
+
+
+	/* Event Modification Math
+	---------------------------------------------------------------------------------*/
+
+
+	function moveEvents(events, dayDelta, minuteDelta, allDay) {
+		minuteDelta = minuteDelta || 0;
+		for (var e, len=events.length, i=0; i<len; i++) {
+			e = events[i];
+			if (allDay !== undefined) {
+				e.allDay = allDay;
+			}
+			addMinutes(addDays(e.start, dayDelta, true), minuteDelta);
+			if (e.end) {
+				e.end = addMinutes(addDays(e.end, dayDelta, true), minuteDelta);
+			}
+			normalizeEvent(e, options);
+		}
+	}
+
+
+	function elongateEvents(events, dayDelta, minuteDelta) {
+		minuteDelta = minuteDelta || 0;
+		for (var e, len=events.length, i=0; i<len; i++) {
+			e = events[i];
+			e.end = addMinutes(addDays(eventEnd(e), dayDelta, true), minuteDelta);
+			normalizeEvent(e, options);
+		}
+	}
+
+
+}
+
+function DayEventRenderer() {
+	var t = this;
+
+
+	// exports
+	t.renderDaySegs = renderDaySegs;
+	t.resizableDayEvent = resizableDayEvent;
+
+
+	// imports
+	var opt = t.opt;
+	var trigger = t.trigger;
+	var isEventDraggable = t.isEventDraggable;
+	var isEventResizable = t.isEventResizable;
+	var eventEnd = t.eventEnd;
+	var reportEventElement = t.reportEventElement;
+	var showEvents = t.showEvents;
+	var hideEvents = t.hideEvents;
+	var eventResize = t.eventResize;
+	var getRowCnt = t.getRowCnt;
+	var getColCnt = t.getColCnt;
+	var getColWidth = t.getColWidth;
+	var allDayRow = t.allDayRow;
+	var allDayBounds = t.allDayBounds;
+	var colContentLeft = t.colContentLeft;
+	var colContentRight = t.colContentRight;
+	var dayOfWeekCol = t.dayOfWeekCol;
+	var dateCell = t.dateCell;
+	var compileDaySegs = t.compileDaySegs;
+	var getDaySegmentContainer = t.getDaySegmentContainer;
+	var bindDaySeg = t.bindDaySeg; //TODO: streamline this
+	var formatDates = t.calendar.formatDates;
+	var renderDayOverlay = t.renderDayOverlay;
+	var clearOverlays = t.clearOverlays;
+	var clearSelection = t.clearSelection;
+
+
+
+	/* Rendering
+	-----------------------------------------------------------------------------*/
+
+
+	function renderDaySegs(segs, modifiedEventId) {
+		var segmentContainer = getDaySegmentContainer();
+		var rowDivs;
+		var rowCnt = getRowCnt();
+		var colCnt = getColCnt();
+		var i = 0;
+		var rowI;
+		var levelI;
+		var colHeights;
+		var j;
+		var segCnt = segs.length;
+		var seg;
+		var top;
+		var k;
+		segmentContainer[0].innerHTML = daySegHTML(segs); // faster than .html()
+		daySegElementResolve(segs, segmentContainer.children());
+		daySegElementReport(segs);
+		daySegHandlers(segs, segmentContainer, modifiedEventId);
+		daySegCalcHSides(segs);
+		daySegSetWidths(segs);
+		daySegCalcHeights(segs);
+		rowDivs = getRowDivs();
+		// set row heights, calculate event tops (in relation to row top)
+		for (rowI=0; rowI<rowCnt; rowI++) {
+			levelI = 0;
+			colHeights = [];
+			for (j=0; j<colCnt; j++) {
+				colHeights[j] = 0;
+			}
+			while (i<segCnt && (seg = segs[i]).row == rowI) {
+				// loop through segs in a row
+				top = arrayMax(colHeights.slice(seg.startCol, seg.endCol));
+				seg.top = top;
+				top += seg.outerHeight;
+				for (k=seg.startCol; k<seg.endCol; k++) {
+					colHeights[k] = top;
+				}
+				i++;
+			}
+			rowDivs[rowI].height(arrayMax(colHeights));
+		}
+		daySegSetTops(segs, getRowTops(rowDivs));
+	}
+
+
+	function renderTempDaySegs(segs, adjustRow, adjustTop) {
+		var tempContainer = $("<div/>");
+		var elements;
+		var segmentContainer = getDaySegmentContainer();
+		var i;
+		var segCnt = segs.length;
+		var element;
+		tempContainer[0].innerHTML = daySegHTML(segs); // faster than .html()
+		elements = tempContainer.children();
+		segmentContainer.append(elements);
+		daySegElementResolve(segs, elements);
+		daySegCalcHSides(segs);
+		daySegSetWidths(segs);
+		daySegCalcHeights(segs);
+		daySegSetTops(segs, getRowTops(getRowDivs()));
+		elements = [];
+		for (i=0; i<segCnt; i++) {
+			element = segs[i].element;
+			if (element) {
+				if (segs[i].row === adjustRow) {
+					element.css('top', adjustTop);
+				}
+				elements.push(element[0]);
+			}
+		}
+		return $(elements);
+	}
+
+
+	function daySegHTML(segs) { // also sets seg.left and seg.outerWidth
+		var rtl = opt('isRTL');
+		var i;
+		var segCnt=segs.length;
+		var seg;
+		var event;
+		var url;
+		var classes;
+		var bounds = allDayBounds();
+		var minLeft = bounds.left;
+		var maxLeft = bounds.right;
+		var leftCol;
+		var rightCol;
+		var left;
+		var right;
+		var skinCss;
+		var html = '';
+		// calculate desired position/dimensions, create html
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			event = seg.event;
+			classes = ['fc-event', 'fc-event-skin', 'fc-event-hori'];
+			if (isEventDraggable(event)) {
+				classes.push('fc-event-draggable');
+			}
+			if (rtl) {
+				if (seg.isStart) {
+					classes.push('fc-corner-right');
+				}
+				if (seg.isEnd) {
+					classes.push('fc-corner-left');
+				}
+				leftCol = dayOfWeekCol(seg.end.getDay()-1);
+				rightCol = dayOfWeekCol(seg.start.getDay());
+				left = seg.isEnd ? colContentLeft(leftCol) : minLeft;
+				right = seg.isStart ? colContentRight(rightCol) : maxLeft;
+			}else{
+				if (seg.isStart) {
+					classes.push('fc-corner-left');
+				}
+				if (seg.isEnd) {
+					classes.push('fc-corner-right');
+				}
+				leftCol = dayOfWeekCol(seg.start.getDay());
+				rightCol = dayOfWeekCol(seg.end.getDay()-1);
+				left = seg.isStart ? colContentLeft(leftCol) : minLeft;
+				right = seg.isEnd ? colContentRight(rightCol) : maxLeft;
+			}
+			classes = classes.concat(event.className);
+			if (event.source) {
+				classes = classes.concat(event.source.className || []);
+			}
+			url = event.url;
+			skinCss = getSkinCss(event, opt);
+			if (url) {
+				html += "<a href='" + htmlEscape(url) + "'";
+			}else{
+				html += "<div";
+			}
+			html +=
+				" class='" + classes.join(' ') + "'" +
+				" style='position:absolute;z-index:8;left:"+left+"px;" + skinCss + "'" +
+				">" +
+				"<div" +
+				" class='fc-event-inner fc-event-skin'" +
+				(skinCss ? " style='" + skinCss + "'" : '') +
+				">";
+			if (!event.allDay && seg.isStart) {
+				html +=
+					"<span class='fc-event-time'>" +
+					htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) +
+					"</span>";
+			}
+			html +=
+				"<span class='fc-event-title'>" + htmlEscape(event.title) + "</span>" +
+				"</div>";
+			if (seg.isEnd && isEventResizable(event)) {
+				html +=
+					"<div class='ui-resizable-handle ui-resizable-" + (rtl ? 'w' : 'e') + "'>" +
+					"&nbsp;&nbsp;&nbsp;" + // makes hit area a lot better for IE6/7
+					"</div>";
+			}
+			html +=
+				"</" + (url ? "a" : "div" ) + ">";
+			seg.left = left;
+			seg.outerWidth = right - left;
+			seg.startCol = leftCol;
+			seg.endCol = rightCol + 1; // needs to be exclusive
+		}
+		return html;
+	}
+
+
+	function daySegElementResolve(segs, elements) { // sets seg.element
+		var i;
+		var segCnt = segs.length;
+		var seg;
+		var event;
+		var element;
+		var triggerRes;
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			event = seg.event;
+			element = $(elements[i]); // faster than .eq()
+			triggerRes = trigger('eventRender', event, event, element);
+			if (triggerRes === false) {
+				element.remove();
+			}else{
+				if (triggerRes && triggerRes !== true) {
+					triggerRes = $(triggerRes)
+						.css({
+							position: 'absolute',
+							left: seg.left
+						});
+					element.replaceWith(triggerRes);
+					element = triggerRes;
+				}
+				seg.element = element;
+			}
+		}
+	}
+
+
+	function daySegElementReport(segs) {
+		var i;
+		var segCnt = segs.length;
+		var seg;
+		var element;
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			element = seg.element;
+			if (element) {
+				reportEventElement(seg.event, element);
+			}
+		}
+	}
+
+
+	function daySegHandlers(segs, segmentContainer, modifiedEventId) {
+		var i;
+		var segCnt = segs.length;
+		var seg;
+		var element;
+		var event;
+		// retrieve elements, run through eventRender callback, bind handlers
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			element = seg.element;
+			if (element) {
+				event = seg.event;
+				if (event._id === modifiedEventId) {
+					bindDaySeg(event, element, seg);
+				}else{
+					element[0]._fci = i; // for lazySegBind
+				}
+			}
+		}
+		lazySegBind(segmentContainer, segs, bindDaySeg);
+	}
+
+
+	function daySegCalcHSides(segs) { // also sets seg.key
+		var i;
+		var segCnt = segs.length;
+		var seg;
+		var element;
+		var key, val;
+		var hsideCache = {};
+		// record event horizontal sides
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			element = seg.element;
+			if (element) {
+				key = seg.key = cssKey(element[0]);
+				val = hsideCache[key];
+				if (val === undefined) {
+					val = hsideCache[key] = hsides(element, true);
+				}
+				seg.hsides = val;
+			}
+		}
+	}
+
+
+	function daySegSetWidths(segs) {
+		var i;
+		var segCnt = segs.length;
+		var seg;
+		var element;
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			element = seg.element;
+			if (element) {
+				element[0].style.width = Math.max(0, seg.outerWidth - seg.hsides) + 'px';
+			}
+		}
+	}
+
+
+	function daySegCalcHeights(segs) {
+		var i;
+		var segCnt = segs.length;
+		var seg;
+		var element;
+		var key, val;
+		var vmarginCache = {};
+		// record event heights
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			element = seg.element;
+			if (element) {
+				key = seg.key; // created in daySegCalcHSides
+				val = vmarginCache[key];
+				if (val === undefined) {
+					val = vmarginCache[key] = vmargins(element);
+				}
+				seg.outerHeight = element[0].offsetHeight + val;
+			}
+		}
+	}
+
+
+	function getRowDivs() {
+		var i;
+		var rowCnt = getRowCnt();
+		var rowDivs = [];
+		for (i=0; i<rowCnt; i++) {
+			rowDivs[i] = allDayRow(i)
+				.find('td:first div.fc-day-content > div'); // optimal selector?
+		}
+		return rowDivs;
+	}
+
+
+	function getRowTops(rowDivs) {
+		var i;
+		var rowCnt = rowDivs.length;
+		var tops = [];
+		for (i=0; i<rowCnt; i++) {
+			tops[i] = rowDivs[i][0].offsetTop; // !!?? but this means the element needs position:relative if in a table cell!!!!
+		}
+		return tops;
+	}
+
+
+	function daySegSetTops(segs, rowTops) { // also triggers eventAfterRender
+		var i;
+		var segCnt = segs.length;
+		var seg;
+		var element;
+		var event;
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			element = seg.element;
+			if (element) {
+				element[0].style.top = rowTops[seg.row] + (seg.top||0) + 'px';
+				event = seg.event;
+				trigger('eventAfterRender', event, event, element);
+			}
+		}
+	}
+
+
+
+	/* Resizing
+	-----------------------------------------------------------------------------------*/
+
+
+	function resizableDayEvent(event, element, seg) {
+		var rtl = opt('isRTL');
+		var direction = rtl ? 'w' : 'e';
+		var handle = element.find('div.ui-resizable-' + direction);
+		var isResizing = false;
+
+		// TODO: look into using jquery-ui mouse widget for this stuff
+		disableTextSelection(element); // prevent native <a> selection for IE
+		element
+			.mousedown(function(ev) { // prevent native <a> selection for others
+				ev.preventDefault();
+			})
+			.click(function(ev) {
+				if (isResizing) {
+					ev.preventDefault(); // prevent link from being visited (only method that worked in IE6)
+					ev.stopImmediatePropagation(); // prevent fullcalendar eventClick handler from being called
+					                               // (eventElementHandlers needs to be bound after resizableDayEvent)
+				}
+			});
+
+		handle.mousedown(function(ev) {
+			if (ev.which != 1) {
+				return; // needs to be left mouse button
+			}
+			isResizing = true;
+			var hoverListener = t.getHoverListener();
+			var rowCnt = getRowCnt();
+			var colCnt = getColCnt();
+			var dis = rtl ? -1 : 1;
+			var dit = rtl ? colCnt-1 : 0;
+			var elementTop = element.css('top');
+			var dayDelta;
+			var helpers;
+			var eventCopy = $.extend({}, event);
+			var minCell = dateCell(event.start);
+			clearSelection();
+			$('body')
+				.css('cursor', direction + '-resize')
+				.one('mouseup', mouseup);
+			trigger('eventResizeStart', this, event, ev);
+			hoverListener.start(function(cell, origCell) {
+				if (cell) {
+					var r = Math.max(minCell.row, cell.row);
+					var c = cell.col;
+					if (rowCnt == 1) {
+						r = 0; // hack for all-day area in agenda views
+					}
+					if (r == minCell.row) {
+						if (rtl) {
+							c = Math.min(minCell.col, c);
+						}else{
+							c = Math.max(minCell.col, c);
+						}
+					}
+					dayDelta = (r*7 + c*dis+dit) - (origCell.row*7 + origCell.col*dis+dit);
+					var newEnd = addDays(eventEnd(event), dayDelta, true);
+					if (dayDelta) {
+						eventCopy.end = newEnd;
+						var oldHelpers = helpers;
+						helpers = renderTempDaySegs(compileDaySegs([eventCopy]), seg.row, elementTop);
+						helpers.find('*').css('cursor', direction + '-resize');
+						if (oldHelpers) {
+							oldHelpers.remove();
+						}
+						hideEvents(event);
+					}else{
+						if (helpers) {
+							showEvents(event);
+							helpers.remove();
+							helpers = null;
+						}
+					}
+					clearOverlays();
+					renderDayOverlay(event.start, addDays(cloneDate(newEnd), 1)); // coordinate grid already rebuild at hoverListener.start
+				}
+			}, ev);
+
+			function mouseup(ev) {
+				trigger('eventResizeStop', this, event, ev);
+				$('body').css('cursor', '');
+				hoverListener.stop();
+				clearOverlays();
+				if (dayDelta) {
+					eventResize(this, event, dayDelta, 0, ev);
+					// event redraw will clear helpers
+				}
+				// otherwise, the drag handler already restored the old events
+
+				setTimeout(function() { // make this happen after the element's click event
+					isResizing = false;
+				},0);
+			}
+
+		});
+	}
+
+
+}
+
+//BUG: unselect needs to be triggered when events are dragged+dropped
+
+function SelectionManager() {
+	var t = this;
+
+
+	// exports
+	t.select = select;
+	t.unselect = unselect;
+	t.reportSelection = reportSelection;
+	t.daySelectionMousedown = daySelectionMousedown;
+
+
+	// imports
+	var opt = t.opt;
+	var trigger = t.trigger;
+	var defaultSelectionEnd = t.defaultSelectionEnd;
+	var renderSelection = t.renderSelection;
+	var clearSelection = t.clearSelection;
+
+
+	// locals
+	var selected = false;
+
+
+
+	// unselectAuto
+	if (opt('selectable') && opt('unselectAuto')) {
+		$(document).mousedown(function(ev) {
+			var ignore = opt('unselectCancel');
+			if (ignore) {
+				if ($(ev.target).parents(ignore).length) { // could be optimized to stop after first match
+					return;
+				}
+			}
+			unselect(ev);
+		});
+	}
+
+
+	function select(startDate, endDate, allDay) {
+		unselect();
+		if (!endDate) {
+			endDate = defaultSelectionEnd(startDate, allDay);
+		}
+		renderSelection(startDate, endDate, allDay);
+		reportSelection(startDate, endDate, allDay);
+	}
+
+
+	function unselect(ev) {
+		if (selected) {
+			selected = false;
+			clearSelection();
+			trigger('unselect', null, ev);
+		}
+	}
+
+
+	function reportSelection(startDate, endDate, allDay, ev) {
+		selected = true;
+		trigger('select', null, startDate, endDate, allDay, ev);
+	}
+
+
+	function daySelectionMousedown(ev) { // not really a generic manager method, oh well
+		var cellDate = t.cellDate;
+		var cellIsAllDay = t.cellIsAllDay;
+		var hoverListener = t.getHoverListener();
+		var reportDayClick = t.reportDayClick; // this is hacky and sort of weird
+		if (ev.which == 1 && opt('selectable')) { // which==1 means left mouse button
+			unselect(ev);
+			var _mousedownElement = this;
+			var dates;
+			hoverListener.start(function(cell, origCell) { // TODO: maybe put cellDate/cellIsAllDay info in cell
+				clearSelection();
+				if (cell && cellIsAllDay(cell)) {
+					dates = [ cellDate(origCell), cellDate(cell) ].sort(cmp);
+					renderSelection(dates[0], dates[1], true);
+				}else{
+					dates = null;
+				}
+			}, ev);
+			$(document).one('mouseup', function(ev) {
+				hoverListener.stop();
+				if (dates) {
+					if (+dates[0] == +dates[1]) {
+						reportDayClick(dates[0], true, ev);
+					}
+					reportSelection(dates[0], dates[1], true, ev);
+				}
+			});
+		}
+	}
+
+
+}
+
+function OverlayManager() {
+	var t = this;
+
+
+	// exports
+	t.renderOverlay = renderOverlay;
+	t.clearOverlays = clearOverlays;
+
+
+	// locals
+	var usedOverlays = [];
+	var unusedOverlays = [];
+
+
+	function renderOverlay(rect, parent) {
+		var e = unusedOverlays.shift();
+		if (!e) {
+			e = $("<div class='fc-cell-overlay' style='position:absolute;z-index:3'/>");
+		}
+		if (e[0].parentNode != parent[0]) {
+			e.appendTo(parent);
+		}
+		usedOverlays.push(e.css(rect).show());
+		return e;
+	}
+
+
+	function clearOverlays() {
+		var e;
+		while (e = usedOverlays.shift()) {
+			unusedOverlays.push(e.hide().unbind());
+		}
+	}
+
+
+}
+
+function CoordinateGrid(buildFunc) {
+
+	var t = this;
+	var rows;
+	var cols;
+
+
+	t.build = function() {
+		rows = [];
+		cols = [];
+		buildFunc(rows, cols);
+	};
+
+
+	t.cell = function(x, y) {
+		var rowCnt = rows.length;
+		var colCnt = cols.length;
+		var i, r=-1, c=-1;
+		for (i=0; i<rowCnt; i++) {
+			if (y >= rows[i][0] && y < rows[i][1]) {
+				r = i;
+				break;
+			}
+		}
+		for (i=0; i<colCnt; i++) {
+			if (x >= cols[i][0] && x < cols[i][1]) {
+				c = i;
+				break;
+			}
+		}
+		return (r>=0 && c>=0) ? { row:r, col:c } : null;
+	};
+
+
+	t.rect = function(row0, col0, row1, col1, originElement) { // row1,col1 is inclusive
+		var origin = originElement.offset();
+		return {
+			top: rows[row0][0] - origin.top,
+			left: cols[col0][0] - origin.left,
+			width: cols[col1][1] - cols[col0][0],
+			height: rows[row1][1] - rows[row0][0]
+		};
+	};
+
+}
+
+function HoverListener(coordinateGrid) {
+
+
+	var t = this;
+	var bindType;
+	var change;
+	var firstCell;
+	var cell;
+
+
+	t.start = function(_change, ev, _bindType) {
+		change = _change;
+		firstCell = cell = null;
+		coordinateGrid.build();
+		mouse(ev);
+		bindType = _bindType || 'mousemove';
+		$(document).bind(bindType, mouse);
+	};
+
+
+	function mouse(ev) {
+		var newCell = coordinateGrid.cell(ev.pageX, ev.pageY);
+		if (!newCell != !cell || newCell && (newCell.row != cell.row || newCell.col != cell.col)) {
+			if (newCell) {
+				if (!firstCell) {
+					firstCell = newCell;
+				}
+				change(newCell, firstCell, newCell.row-firstCell.row, newCell.col-firstCell.col);
+			}else{
+				change(newCell, firstCell);
+			}
+			cell = newCell;
+		}
+	}
+
+
+	t.stop = function() {
+		$(document).unbind(bindType, mouse);
+		return cell;
+	};
+
+
+}
+
+function HorizontalPositionCache(getElement) {
+
+	var t = this,
+		elements = {},
+		lefts = {},
+		rights = {};
+
+	function e(i) {
+		return elements[i] = elements[i] || getElement(i);
+	}
+
+	t.left = function(i) {
+		return lefts[i] = lefts[i] === undefined ? e(i).position().left : lefts[i];
+	};
+
+	t.right = function(i) {
+		return rights[i] = rights[i] === undefined ? t.left(i) + e(i).width() : rights[i];
+	};
+
+	t.clear = function() {
+		elements = {};
+		lefts = {};
+		rights = {};
+	};
+
+}
+
+})(jQuery);
diff --git a/3rdparty/fullcalendar/js/fullcalendar.min.js b/3rdparty/fullcalendar/js/fullcalendar.min.js
new file mode 100644
index 00000000000..fc06a89a610
--- /dev/null
+++ b/3rdparty/fullcalendar/js/fullcalendar.min.js
@@ -0,0 +1,113 @@
+/*
+
+ FullCalendar v1.5.2
+ http://arshaw.com/fullcalendar/
+
+ Use fullcalendar.css for basic styling.
+ For event drag & drop, requires jQuery UI draggable.
+ For event resizing, requires jQuery UI resizable.
+
+ Copyright (c) 2011 Adam Shaw
+ Dual licensed under the MIT and GPL licenses, located in
+ MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
+
+ Date: Sun Aug 21 22:06:09 2011 -0700
+
+*/
+(function(m,oa){function wb(a){m.extend(true,Ya,a)}function Yb(a,b,e){function d(k){if(E){u();q();ma();S(k)}else f()}function f(){B=b.theme?"ui":"fc";a.addClass("fc");b.isRTL&&a.addClass("fc-rtl");b.theme&&a.addClass("ui-widget");E=m("<div class='fc-content' style='position:relative'/>").prependTo(a);C=new Zb(X,b);(P=C.render())&&a.prepend(P);y(b.defaultView);m(window).resize(na);t()||g()}function g(){setTimeout(function(){!n.start&&t()&&S()},0)}function l(){m(window).unbind("resize",na);C.destroy();
+E.remove();a.removeClass("fc fc-rtl ui-widget")}function j(){return i.offsetWidth!==0}function t(){return m("body")[0].offsetWidth!==0}function y(k){if(!n||k!=n.name){F++;pa();var D=n,Z;if(D){(D.beforeHide||xb)();Za(E,E.height());D.element.hide()}else Za(E,1);E.css("overflow","hidden");if(n=Y[k])n.element.show();else n=Y[k]=new Ja[k](Z=s=m("<div class='fc-view fc-view-"+k+"' style='position:absolute'/>").appendTo(E),X);D&&C.deactivateButton(D.name);C.activateButton(k);S();E.css("overflow","");D&&
+Za(E,1);Z||(n.afterShow||xb)();F--}}function S(k){if(j()){F++;pa();o===oa&&u();var D=false;if(!n.start||k||r<n.start||r>=n.end){n.render(r,k||0);fa(true);D=true}else if(n.sizeDirty){n.clearEvents();fa();D=true}else if(n.eventsDirty){n.clearEvents();D=true}n.sizeDirty=false;n.eventsDirty=false;ga(D);W=a.outerWidth();C.updateTitle(n.title);k=new Date;k>=n.start&&k<n.end?C.disableButton("today"):C.enableButton("today");F--;n.trigger("viewDisplay",i)}}function Q(){q();if(j()){u();fa();pa();n.clearEvents();
+n.renderEvents(J);n.sizeDirty=false}}function q(){m.each(Y,function(k,D){D.sizeDirty=true})}function u(){o=b.contentHeight?b.contentHeight:b.height?b.height-(P?P.height():0)-Sa(E):Math.round(E.width()/Math.max(b.aspectRatio,0.5))}function fa(k){F++;n.setHeight(o,k);if(s){s.css("position","relative");s=null}n.setWidth(E.width(),k);F--}function na(){if(!F)if(n.start){var k=++v;setTimeout(function(){if(k==v&&!F&&j())if(W!=(W=a.outerWidth())){F++;Q();n.trigger("windowResize",i);F--}},200)}else g()}function ga(k){if(!b.lazyFetching||
+ya(n.visStart,n.visEnd))ra();else k&&da()}function ra(){K(n.visStart,n.visEnd)}function sa(k){J=k;da()}function ha(k){da(k)}function da(k){ma();if(j()){n.clearEvents();n.renderEvents(J,k);n.eventsDirty=false}}function ma(){m.each(Y,function(k,D){D.eventsDirty=true})}function ua(k,D,Z){n.select(k,D,Z===oa?true:Z)}function pa(){n&&n.unselect()}function U(){S(-1)}function ca(){S(1)}function ka(){gb(r,-1);S()}function qa(){gb(r,1);S()}function G(){r=new Date;S()}function p(k,D,Z){if(k instanceof Date)r=
+N(k);else yb(r,k,D,Z);S()}function L(k,D,Z){k!==oa&&gb(r,k);D!==oa&&hb(r,D);Z!==oa&&ba(r,Z);S()}function c(){return N(r)}function z(){return n}function H(k,D){if(D===oa)return b[k];if(k=="height"||k=="contentHeight"||k=="aspectRatio"){b[k]=D;Q()}}function T(k,D){if(b[k])return b[k].apply(D||i,Array.prototype.slice.call(arguments,2))}var X=this;X.options=b;X.render=d;X.destroy=l;X.refetchEvents=ra;X.reportEvents=sa;X.reportEventChange=ha;X.rerenderEvents=da;X.changeView=y;X.select=ua;X.unselect=pa;
+X.prev=U;X.next=ca;X.prevYear=ka;X.nextYear=qa;X.today=G;X.gotoDate=p;X.incrementDate=L;X.formatDate=function(k,D){return Oa(k,D,b)};X.formatDates=function(k,D,Z){return ib(k,D,Z,b)};X.getDate=c;X.getView=z;X.option=H;X.trigger=T;$b.call(X,b,e);var ya=X.isFetchNeeded,K=X.fetchEvents,i=a[0],C,P,E,B,n,Y={},W,o,s,v=0,F=0,r=new Date,J=[],M;yb(r,b.year,b.month,b.date);b.droppable&&m(document).bind("dragstart",function(k,D){var Z=k.target,ja=m(Z);if(!ja.parents(".fc").length){var ia=b.dropAccept;if(m.isFunction(ia)?
+ia.call(Z,ja):ja.is(ia)){M=Z;n.dragStart(M,k,D)}}}).bind("dragstop",function(k,D){if(M){n.dragStop(M,k,D);M=null}})}function Zb(a,b){function e(){q=b.theme?"ui":"fc";if(b.header)return Q=m("<table class='fc-header' style='width:100%'/>").append(m("<tr/>").append(f("left")).append(f("center")).append(f("right")))}function d(){Q.remove()}function f(u){var fa=m("<td class='fc-header-"+u+"'/>");(u=b.header[u])&&m.each(u.split(" "),function(na){na>0&&fa.append("<span class='fc-header-space'/>");var ga;
+m.each(this.split(","),function(ra,sa){if(sa=="title"){fa.append("<span class='fc-header-title'><h2>&nbsp;</h2></span>");ga&&ga.addClass(q+"-corner-right");ga=null}else{var ha;if(a[sa])ha=a[sa];else if(Ja[sa])ha=function(){ma.removeClass(q+"-state-hover");a.changeView(sa)};if(ha){ra=b.theme?jb(b.buttonIcons,sa):null;var da=jb(b.buttonText,sa),ma=m("<span class='fc-button fc-button-"+sa+" "+q+"-state-default'><span class='fc-button-inner'><span class='fc-button-content'>"+(ra?"<span class='fc-icon-wrap'><span class='ui-icon ui-icon-"+
+ra+"'/></span>":da)+"</span><span class='fc-button-effect'><span></span></span></span></span>");if(ma){ma.click(function(){ma.hasClass(q+"-state-disabled")||ha()}).mousedown(function(){ma.not("."+q+"-state-active").not("."+q+"-state-disabled").addClass(q+"-state-down")}).mouseup(function(){ma.removeClass(q+"-state-down")}).hover(function(){ma.not("."+q+"-state-active").not("."+q+"-state-disabled").addClass(q+"-state-hover")},function(){ma.removeClass(q+"-state-hover").removeClass(q+"-state-down")}).appendTo(fa);
+ga||ma.addClass(q+"-corner-left");ga=ma}}}});ga&&ga.addClass(q+"-corner-right")});return fa}function g(u){Q.find("h2").html(u)}function l(u){Q.find("span.fc-button-"+u).addClass(q+"-state-active")}function j(u){Q.find("span.fc-button-"+u).removeClass(q+"-state-active")}function t(u){Q.find("span.fc-button-"+u).addClass(q+"-state-disabled")}function y(u){Q.find("span.fc-button-"+u).removeClass(q+"-state-disabled")}var S=this;S.render=e;S.destroy=d;S.updateTitle=g;S.activateButton=l;S.deactivateButton=
+j;S.disableButton=t;S.enableButton=y;var Q=m([]),q}function $b(a,b){function e(c,z){return!ca||c<ca||z>ka}function d(c,z){ca=c;ka=z;L=[];c=++qa;G=z=U.length;for(var H=0;H<z;H++)f(U[H],c)}function f(c,z){g(c,function(H){if(z==qa){if(H){for(var T=0;T<H.length;T++){H[T].source=c;na(H[T])}L=L.concat(H)}G--;G||ua(L)}})}function g(c,z){var H,T=Aa.sourceFetchers,X;for(H=0;H<T.length;H++){X=T[H](c,ca,ka,z);if(X===true)return;else if(typeof X=="object"){g(X,z);return}}if(H=c.events)if(m.isFunction(H)){u();
+H(N(ca),N(ka),function(C){z(C);fa()})}else m.isArray(H)?z(H):z();else if(c.url){var ya=c.success,K=c.error,i=c.complete;H=m.extend({},c.data||{});T=Ta(c.startParam,a.startParam);X=Ta(c.endParam,a.endParam);if(T)H[T]=Math.round(+ca/1E3);if(X)H[X]=Math.round(+ka/1E3);u();m.ajax(m.extend({},ac,c,{data:H,success:function(C){C=C||[];var P=$a(ya,this,arguments);if(m.isArray(P))C=P;z(C)},error:function(){$a(K,this,arguments);z()},complete:function(){$a(i,this,arguments);fa()}}))}else z()}function l(c){if(c=
+j(c)){G++;f(c,qa)}}function j(c){if(m.isFunction(c)||m.isArray(c))c={events:c};else if(typeof c=="string")c={url:c};if(typeof c=="object"){ga(c);U.push(c);return c}}function t(c){U=m.grep(U,function(z){return!ra(z,c)});L=m.grep(L,function(z){return!ra(z.source,c)});ua(L)}function y(c){var z,H=L.length,T,X=ma().defaultEventEnd,ya=c.start-c._start,K=c.end?c.end-(c._end||X(c)):0;for(z=0;z<H;z++){T=L[z];if(T._id==c._id&&T!=c){T.start=new Date(+T.start+ya);T.end=c.end?T.end?new Date(+T.end+K):new Date(+X(T)+
+K):null;T.title=c.title;T.url=c.url;T.allDay=c.allDay;T.className=c.className;T.editable=c.editable;T.color=c.color;T.backgroudColor=c.backgroudColor;T.borderColor=c.borderColor;T.textColor=c.textColor;na(T)}}na(c);ua(L)}function S(c,z){na(c);if(!c.source){if(z){pa.events.push(c);c.source=pa}L.push(c)}ua(L)}function Q(c){if(c){if(!m.isFunction(c)){var z=c+"";c=function(T){return T._id==z}}L=m.grep(L,c,true);for(H=0;H<U.length;H++)if(m.isArray(U[H].events))U[H].events=m.grep(U[H].events,c,true)}else{L=
+[];for(var H=0;H<U.length;H++)if(m.isArray(U[H].events))U[H].events=[]}ua(L)}function q(c){if(m.isFunction(c))return m.grep(L,c);else if(c){c+="";return m.grep(L,function(z){return z._id==c})}return L}function u(){p++||da("loading",null,true)}function fa(){--p||da("loading",null,false)}function na(c){var z=c.source||{},H=Ta(z.ignoreTimezone,a.ignoreTimezone);c._id=c._id||(c.id===oa?"_fc"+bc++:c.id+"");if(c.date){if(!c.start)c.start=c.date;delete c.date}c._start=N(c.start=kb(c.start,H));c.end=kb(c.end,
+H);if(c.end&&c.end<=c.start)c.end=null;c._end=c.end?N(c.end):null;if(c.allDay===oa)c.allDay=Ta(z.allDayDefault,a.allDayDefault);if(c.className){if(typeof c.className=="string")c.className=c.className.split(/\s+/)}else c.className=[]}function ga(c){if(c.className){if(typeof c.className=="string")c.className=c.className.split(/\s+/)}else c.className=[];for(var z=Aa.sourceNormalizers,H=0;H<z.length;H++)z[H](c)}function ra(c,z){return c&&z&&sa(c)==sa(z)}function sa(c){return(typeof c=="object"?c.events||
+c.url:"")||c}var ha=this;ha.isFetchNeeded=e;ha.fetchEvents=d;ha.addEventSource=l;ha.removeEventSource=t;ha.updateEvent=y;ha.renderEvent=S;ha.removeEvents=Q;ha.clientEvents=q;ha.normalizeEvent=na;var da=ha.trigger,ma=ha.getView,ua=ha.reportEvents,pa={events:[]},U=[pa],ca,ka,qa=0,G=0,p=0,L=[];for(ha=0;ha<b.length;ha++)j(b[ha])}function gb(a,b,e){a.setFullYear(a.getFullYear()+b);e||Ka(a);return a}function hb(a,b,e){if(+a){b=a.getMonth()+b;var d=N(a);d.setDate(1);d.setMonth(b);a.setMonth(b);for(e||Ka(a);a.getMonth()!=
+d.getMonth();)a.setDate(a.getDate()+(a<d?1:-1))}return a}function ba(a,b,e){if(+a){b=a.getDate()+b;var d=N(a);d.setHours(9);d.setDate(b);a.setDate(b);e||Ka(a);lb(a,d)}return a}function lb(a,b){if(+a)for(;a.getDate()!=b.getDate();)a.setTime(+a+(a<b?1:-1)*cc)}function xa(a,b){a.setMinutes(a.getMinutes()+b);return a}function Ka(a){a.setHours(0);a.setMinutes(0);a.setSeconds(0);a.setMilliseconds(0);return a}function N(a,b){if(b)return Ka(new Date(+a));return new Date(+a)}function zb(){var a=0,b;do b=new Date(1970,
+a++,1);while(b.getHours());return b}function Fa(a,b,e){for(b=b||1;!a.getDay()||e&&a.getDay()==1||!e&&a.getDay()==6;)ba(a,b);return a}function Ca(a,b){return Math.round((N(a,true)-N(b,true))/Ab)}function yb(a,b,e,d){if(b!==oa&&b!=a.getFullYear()){a.setDate(1);a.setMonth(0);a.setFullYear(b)}if(e!==oa&&e!=a.getMonth()){a.setDate(1);a.setMonth(e)}d!==oa&&a.setDate(d)}function kb(a,b){if(typeof a=="object")return a;if(typeof a=="number")return new Date(a*1E3);if(typeof a=="string"){if(a.match(/^\d+(\.\d+)?$/))return new Date(parseFloat(a)*
+1E3);if(b===oa)b=true;return Bb(a,b)||(a?new Date(a):null)}return null}function Bb(a,b){a=a.match(/^([0-9]{4})(-([0-9]{2})(-([0-9]{2})([T ]([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?(Z|(([-+])([0-9]{2})(:?([0-9]{2}))?))?)?)?)?$/);if(!a)return null;var e=new Date(a[1],0,1);if(b||!a[13]){b=new Date(a[1],0,1,9,0);if(a[3]){e.setMonth(a[3]-1);b.setMonth(a[3]-1)}if(a[5]){e.setDate(a[5]);b.setDate(a[5])}lb(e,b);a[7]&&e.setHours(a[7]);a[8]&&e.setMinutes(a[8]);a[10]&&e.setSeconds(a[10]);a[12]&&e.setMilliseconds(Number("0."+
+a[12])*1E3);lb(e,b)}else{e.setUTCFullYear(a[1],a[3]?a[3]-1:0,a[5]||1);e.setUTCHours(a[7]||0,a[8]||0,a[10]||0,a[12]?Number("0."+a[12])*1E3:0);if(a[14]){b=Number(a[16])*60+(a[18]?Number(a[18]):0);b*=a[15]=="-"?1:-1;e=new Date(+e+b*60*1E3)}}return e}function mb(a){if(typeof a=="number")return a*60;if(typeof a=="object")return a.getHours()*60+a.getMinutes();if(a=a.match(/(\d+)(?::(\d+))?\s*(\w+)?/)){var b=parseInt(a[1],10);if(a[3]){b%=12;if(a[3].toLowerCase().charAt(0)=="p")b+=12}return b*60+(a[2]?parseInt(a[2],
+10):0)}}function Oa(a,b,e){return ib(a,null,b,e)}function ib(a,b,e,d){d=d||Ya;var f=a,g=b,l,j=e.length,t,y,S,Q="";for(l=0;l<j;l++){t=e.charAt(l);if(t=="'")for(y=l+1;y<j;y++){if(e.charAt(y)=="'"){if(f){Q+=y==l+1?"'":e.substring(l+1,y);l=y}break}}else if(t=="(")for(y=l+1;y<j;y++){if(e.charAt(y)==")"){l=Oa(f,e.substring(l+1,y),d);if(parseInt(l.replace(/\D/,""),10))Q+=l;l=y;break}}else if(t=="[")for(y=l+1;y<j;y++){if(e.charAt(y)=="]"){t=e.substring(l+1,y);l=Oa(f,t,d);if(l!=Oa(g,t,d))Q+=l;l=y;break}}else if(t==
+"{"){f=b;g=a}else if(t=="}"){f=a;g=b}else{for(y=j;y>l;y--)if(S=dc[e.substring(l,y)]){if(f)Q+=S(f,d);l=y-1;break}if(y==l)if(f)Q+=t}}return Q}function Ua(a){return a.end?ec(a.end,a.allDay):ba(N(a.start),1)}function ec(a,b){a=N(a);return b||a.getHours()||a.getMinutes()?ba(a,1):Ka(a)}function fc(a,b){return(b.msLength-a.msLength)*100+(a.event.start-b.event.start)}function Cb(a,b){return a.end>b.start&&a.start<b.end}function nb(a,b,e,d){var f=[],g,l=a.length,j,t,y,S,Q;for(g=0;g<l;g++){j=a[g];t=j.start;
+y=b[g];if(y>e&&t<d){if(t<e){t=N(e);S=false}else{t=t;S=true}if(y>d){y=N(d);Q=false}else{y=y;Q=true}f.push({event:j,start:t,end:y,isStart:S,isEnd:Q,msLength:y-t})}}return f.sort(fc)}function ob(a){var b=[],e,d=a.length,f,g,l,j;for(e=0;e<d;e++){f=a[e];for(g=0;;){l=false;if(b[g])for(j=0;j<b[g].length;j++)if(Cb(b[g][j],f)){l=true;break}if(l)g++;else break}if(b[g])b[g].push(f);else b[g]=[f]}return b}function Db(a,b,e){a.unbind("mouseover").mouseover(function(d){for(var f=d.target,g;f!=this;){g=f;f=f.parentNode}if((f=
+g._fci)!==oa){g._fci=oa;g=b[f];e(g.event,g.element,g);m(d.target).trigger(d)}d.stopPropagation()})}function Va(a,b,e){for(var d=0,f;d<a.length;d++){f=m(a[d]);f.width(Math.max(0,b-pb(f,e)))}}function Eb(a,b,e){for(var d=0,f;d<a.length;d++){f=m(a[d]);f.height(Math.max(0,b-Sa(f,e)))}}function pb(a,b){return gc(a)+hc(a)+(b?ic(a):0)}function gc(a){return(parseFloat(m.curCSS(a[0],"paddingLeft",true))||0)+(parseFloat(m.curCSS(a[0],"paddingRight",true))||0)}function ic(a){return(parseFloat(m.curCSS(a[0],
+"marginLeft",true))||0)+(parseFloat(m.curCSS(a[0],"marginRight",true))||0)}function hc(a){return(parseFloat(m.curCSS(a[0],"borderLeftWidth",true))||0)+(parseFloat(m.curCSS(a[0],"borderRightWidth",true))||0)}function Sa(a,b){return jc(a)+kc(a)+(b?Fb(a):0)}function jc(a){return(parseFloat(m.curCSS(a[0],"paddingTop",true))||0)+(parseFloat(m.curCSS(a[0],"paddingBottom",true))||0)}function Fb(a){return(parseFloat(m.curCSS(a[0],"marginTop",true))||0)+(parseFloat(m.curCSS(a[0],"marginBottom",true))||0)}
+function kc(a){return(parseFloat(m.curCSS(a[0],"borderTopWidth",true))||0)+(parseFloat(m.curCSS(a[0],"borderBottomWidth",true))||0)}function Za(a,b){b=typeof b=="number"?b+"px":b;a.each(function(e,d){d.style.cssText+=";min-height:"+b+";_height:"+b})}function xb(){}function Gb(a,b){return a-b}function Hb(a){return Math.max.apply(Math,a)}function Pa(a){return(a<10?"0":"")+a}function jb(a,b){if(a[b]!==oa)return a[b];b=b.split(/(?=[A-Z])/);for(var e=b.length-1,d;e>=0;e--){d=a[b[e].toLowerCase()];if(d!==
+oa)return d}return a[""]}function Qa(a){return a.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#039;").replace(/"/g,"&quot;").replace(/\n/g,"<br />")}function Ib(a){return a.id+"/"+a.className+"/"+a.style.cssText.replace(/(^|;)\s*(top|left|width|height)\s*:[^;]*/ig,"")}function qb(a){a.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})}function ab(a){a.children().removeClass("fc-first fc-last").filter(":first-child").addClass("fc-first").end().filter(":last-child").addClass("fc-last")}
+function rb(a,b){a.each(function(e,d){d.className=d.className.replace(/^fc-\w*/,"fc-"+lc[b.getDay()])})}function Jb(a,b){var e=a.source||{},d=a.color,f=e.color,g=b("eventColor"),l=a.backgroundColor||d||e.backgroundColor||f||b("eventBackgroundColor")||g;d=a.borderColor||d||e.borderColor||f||b("eventBorderColor")||g;a=a.textColor||e.textColor||b("eventTextColor");b=[];l&&b.push("background-color:"+l);d&&b.push("border-color:"+d);a&&b.push("color:"+a);return b.join(";")}function $a(a,b,e){if(m.isFunction(a))a=
+[a];if(a){var d,f;for(d=0;d<a.length;d++)f=a[d].apply(b,e)||f;return f}}function Ta(){for(var a=0;a<arguments.length;a++)if(arguments[a]!==oa)return arguments[a]}function mc(a,b){function e(j,t){if(t){hb(j,t);j.setDate(1)}j=N(j,true);j.setDate(1);t=hb(N(j),1);var y=N(j),S=N(t),Q=f("firstDay"),q=f("weekends")?0:1;if(q){Fa(y);Fa(S,-1,true)}ba(y,-((y.getDay()-Math.max(Q,q)+7)%7));ba(S,(7-S.getDay()+Math.max(Q,q))%7);Q=Math.round((S-y)/(Ab*7));if(f("weekMode")=="fixed"){ba(S,(6-Q)*7);Q=6}d.title=l(j,
+f("titleFormat"));d.start=j;d.end=t;d.visStart=y;d.visEnd=S;g(6,Q,q?5:7,true)}var d=this;d.render=e;sb.call(d,a,b,"month");var f=d.opt,g=d.renderBasic,l=b.formatDate}function nc(a,b){function e(j,t){t&&ba(j,t*7);j=ba(N(j),-((j.getDay()-f("firstDay")+7)%7));t=ba(N(j),7);var y=N(j),S=N(t),Q=f("weekends");if(!Q){Fa(y);Fa(S,-1,true)}d.title=l(y,ba(N(S),-1),f("titleFormat"));d.start=j;d.end=t;d.visStart=y;d.visEnd=S;g(1,1,Q?7:5,false)}var d=this;d.render=e;sb.call(d,a,b,"basicWeek");var f=d.opt,g=d.renderBasic,
+l=b.formatDates}function oc(a,b){function e(j,t){if(t){ba(j,t);f("weekends")||Fa(j,t<0?-1:1)}d.title=l(j,f("titleFormat"));d.start=d.visStart=N(j,true);d.end=d.visEnd=ba(N(d.start),1);g(1,1,1,false)}var d=this;d.render=e;sb.call(d,a,b,"basicDay");var f=d.opt,g=d.renderBasic,l=b.formatDate}function sb(a,b,e){function d(w,I,R,V){v=I;F=R;f();(I=!C)?g(w,V):z();l(I)}function f(){if(k=L("isRTL")){D=-1;Z=F-1}else{D=1;Z=0}ja=L("firstDay");ia=L("weekends")?0:1;la=L("theme")?"ui":"fc";$=L("columnFormat")}function g(w,
+I){var R,V=la+"-widget-header",ea=la+"-widget-content",aa;R="<table class='fc-border-separate' style='width:100%' cellspacing='0'><thead><tr>";for(aa=0;aa<F;aa++)R+="<th class='fc- "+V+"'/>";R+="</tr></thead><tbody>";for(aa=0;aa<w;aa++){R+="<tr class='fc-week"+aa+"'>";for(V=0;V<F;V++)R+="<td class='fc- "+ea+" fc-day"+(aa*F+V)+"'><div>"+(I?"<div class='fc-day-number'/>":"")+"<div class='fc-day-content'><div style='position:relative'>&nbsp;</div></div></div></td>";R+="</tr>"}R+="</tbody></table>";w=
+m(R).appendTo(a);K=w.find("thead");i=K.find("th");C=w.find("tbody");P=C.find("tr");E=C.find("td");B=E.filter(":first-child");n=P.eq(0).find("div.fc-day-content div");ab(K.add(K.find("tr")));ab(P);P.eq(0).addClass("fc-first");y(E);Y=m("<div style='position:absolute;z-index:8;top:0;left:0'/>").appendTo(a)}function l(w){var I=w||v==1,R=p.start.getMonth(),V=Ka(new Date),ea,aa,va;I&&i.each(function(wa,Ga){ea=m(Ga);aa=ca(wa);ea.html(ya(aa,$));rb(ea,aa)});E.each(function(wa,Ga){ea=m(Ga);aa=ca(wa);aa.getMonth()==
+R?ea.removeClass("fc-other-month"):ea.addClass("fc-other-month");+aa==+V?ea.addClass(la+"-state-highlight fc-today"):ea.removeClass(la+"-state-highlight fc-today");ea.find("div.fc-day-number").text(aa.getDate());I&&rb(ea,aa)});P.each(function(wa,Ga){va=m(Ga);if(wa<v){va.show();wa==v-1?va.addClass("fc-last"):va.removeClass("fc-last")}else va.hide()})}function j(w){o=w;w=o-K.height();var I,R,V;if(L("weekMode")=="variable")I=R=Math.floor(w/(v==1?2:6));else{I=Math.floor(w/v);R=w-I*(v-1)}B.each(function(ea,
+aa){if(ea<v){V=m(aa);Za(V.find("> div"),(ea==v-1?R:I)-Sa(V))}})}function t(w){W=w;M.clear();s=Math.floor(W/F);Va(i.slice(0,-1),s)}function y(w){w.click(S).mousedown(X)}function S(w){if(!L("selectable")){var I=parseInt(this.className.match(/fc\-day(\d+)/)[1]);I=ca(I);c("dayClick",this,I,true,w)}}function Q(w,I,R){R&&r.build();R=N(p.visStart);for(var V=ba(N(R),F),ea=0;ea<v;ea++){var aa=new Date(Math.max(R,w)),va=new Date(Math.min(V,I));if(aa<va){var wa;if(k){wa=Ca(va,R)*D+Z+1;aa=Ca(aa,R)*D+Z+1}else{wa=
+Ca(aa,R);aa=Ca(va,R)}y(q(ea,wa,ea,aa-1))}ba(R,7);ba(V,7)}}function q(w,I,R,V){w=r.rect(w,I,R,V,a);return H(w,a)}function u(w){return N(w)}function fa(w,I){Q(w,ba(N(I),1),true)}function na(){T()}function ga(w,I,R){var V=ua(w);c("dayClick",E[V.row*F+V.col],w,I,R)}function ra(w,I){J.start(function(R){T();R&&q(R.row,R.col,R.row,R.col)},I)}function sa(w,I,R){var V=J.stop();T();if(V){V=pa(V);c("drop",w,V,true,I,R)}}function ha(w){return N(w.start)}function da(w){return M.left(w)}function ma(w){return M.right(w)}
+function ua(w){return{row:Math.floor(Ca(w,p.visStart)/7),col:ka(w.getDay())}}function pa(w){return U(w.row,w.col)}function U(w,I){return ba(N(p.visStart),w*7+I*D+Z)}function ca(w){return U(Math.floor(w/F),w%F)}function ka(w){return(w-Math.max(ja,ia)+F)%F*D+Z}function qa(w){return P.eq(w)}function G(){return{left:0,right:W}}var p=this;p.renderBasic=d;p.setHeight=j;p.setWidth=t;p.renderDayOverlay=Q;p.defaultSelectionEnd=u;p.renderSelection=fa;p.clearSelection=na;p.reportDayClick=ga;p.dragStart=ra;p.dragStop=
+sa;p.defaultEventEnd=ha;p.getHoverListener=function(){return J};p.colContentLeft=da;p.colContentRight=ma;p.dayOfWeekCol=ka;p.dateCell=ua;p.cellDate=pa;p.cellIsAllDay=function(){return true};p.allDayRow=qa;p.allDayBounds=G;p.getRowCnt=function(){return v};p.getColCnt=function(){return F};p.getColWidth=function(){return s};p.getDaySegmentContainer=function(){return Y};Kb.call(p,a,b,e);Lb.call(p);Mb.call(p);pc.call(p);var L=p.opt,c=p.trigger,z=p.clearEvents,H=p.renderOverlay,T=p.clearOverlays,X=p.daySelectionMousedown,
+ya=b.formatDate,K,i,C,P,E,B,n,Y,W,o,s,v,F,r,J,M,k,D,Z,ja,ia,la,$;qb(a.addClass("fc-grid"));r=new Nb(function(w,I){var R,V,ea;i.each(function(aa,va){R=m(va);V=R.offset().left;if(aa)ea[1]=V;ea=[V];I[aa]=ea});ea[1]=V+R.outerWidth();P.each(function(aa,va){if(aa<v){R=m(va);V=R.offset().top;if(aa)ea[1]=V;ea=[V];w[aa]=ea}});ea[1]=V+R.outerHeight()});J=new Ob(r);M=new Pb(function(w){return n.eq(w)})}function pc(){function a(U,ca){S(U);ua(e(U),ca)}function b(){Q();ga().empty()}function e(U){var ca=da(),ka=
+ma(),qa=N(g.visStart);ka=ba(N(qa),ka);var G=m.map(U,Ua),p,L,c,z,H,T,X=[];for(p=0;p<ca;p++){L=ob(nb(U,G,qa,ka));for(c=0;c<L.length;c++){z=L[c];for(H=0;H<z.length;H++){T=z[H];T.row=p;T.level=c;X.push(T)}}ba(qa,7);ba(ka,7)}return X}function d(U,ca,ka){t(U)&&f(U,ca);ka.isEnd&&y(U)&&pa(U,ca,ka);q(U,ca)}function f(U,ca){var ka=ra(),qa;ca.draggable({zIndex:9,delay:50,opacity:l("dragOpacity"),revertDuration:l("dragRevertDuration"),start:function(G,p){j("eventDragStart",ca,U,G,p);fa(U,ca);ka.start(function(L,
+c,z,H){ca.draggable("option","revert",!L||!z&&!H);ha();if(L){qa=z*7+H*(l("isRTL")?-1:1);sa(ba(N(U.start),qa),ba(Ua(U),qa))}else qa=0},G,"drag")},stop:function(G,p){ka.stop();ha();j("eventDragStop",ca,U,G,p);if(qa)na(this,U,qa,0,U.allDay,G,p);else{ca.css("filter","");u(U,ca)}}})}var g=this;g.renderEvents=a;g.compileDaySegs=e;g.clearEvents=b;g.bindDaySeg=d;Qb.call(g);var l=g.opt,j=g.trigger,t=g.isEventDraggable,y=g.isEventResizable,S=g.reportEvents,Q=g.reportEventClear,q=g.eventElementHandlers,u=g.showEvents,
+fa=g.hideEvents,na=g.eventDrop,ga=g.getDaySegmentContainer,ra=g.getHoverListener,sa=g.renderDayOverlay,ha=g.clearOverlays,da=g.getRowCnt,ma=g.getColCnt,ua=g.renderDaySegs,pa=g.resizableDayEvent}function qc(a,b){function e(j,t){t&&ba(j,t*7);j=ba(N(j),-((j.getDay()-f("firstDay")+7)%7));t=ba(N(j),7);var y=N(j),S=N(t),Q=f("weekends");if(!Q){Fa(y);Fa(S,-1,true)}d.title=l(y,ba(N(S),-1),f("titleFormat"));d.start=j;d.end=t;d.visStart=y;d.visEnd=S;g(Q?7:5)}var d=this;d.render=e;Rb.call(d,a,b,"agendaWeek");
+var f=d.opt,g=d.renderAgenda,l=b.formatDates}function rc(a,b){function e(j,t){if(t){ba(j,t);f("weekends")||Fa(j,t<0?-1:1)}t=N(j,true);var y=ba(N(t),1);d.title=l(j,f("titleFormat"));d.start=d.visStart=t;d.end=d.visEnd=y;g(1)}var d=this;d.render=e;Rb.call(d,a,b,"agendaDay");var f=d.opt,g=d.renderAgenda,l=b.formatDate}function Rb(a,b,e){function d(h){Ba=h;f();v?P():g();l()}function f(){Wa=i("theme")?"ui":"fc";Sb=i("weekends")?0:1;Tb=i("firstDay");if(Ub=i("isRTL")){Ha=-1;Ia=Ba-1}else{Ha=1;Ia=0}La=mb(i("minTime"));
+bb=mb(i("maxTime"));Vb=i("columnFormat")}function g(){var h=Wa+"-widget-header",O=Wa+"-widget-content",x,A,ta,za,Da,Ea=i("slotMinutes")%15==0;x="<table style='width:100%' class='fc-agenda-days fc-border-separate' cellspacing='0'><thead><tr><th class='fc-agenda-axis "+h+"'>&nbsp;</th>";for(A=0;A<Ba;A++)x+="<th class='fc- fc-col"+A+" "+h+"'/>";x+="<th class='fc-agenda-gutter "+h+"'>&nbsp;</th></tr></thead><tbody><tr><th class='fc-agenda-axis "+h+"'>&nbsp;</th>";for(A=0;A<Ba;A++)x+="<td class='fc- fc-col"+
+A+" "+O+"'><div><div class='fc-day-content'><div style='position:relative'>&nbsp;</div></div></div></td>";x+="<td class='fc-agenda-gutter "+O+"'>&nbsp;</td></tr></tbody></table>";v=m(x).appendTo(a);F=v.find("thead");r=F.find("th").slice(1,-1);J=v.find("tbody");M=J.find("td").slice(0,-1);k=M.find("div.fc-day-content div");D=M.eq(0);Z=D.find("> div");ab(F.add(F.find("tr")));ab(J.add(J.find("tr")));aa=F.find("th:first");va=v.find(".fc-agenda-gutter");ja=m("<div style='position:absolute;z-index:2;left:0;width:100%'/>").appendTo(a);
+if(i("allDaySlot")){ia=m("<div style='position:absolute;z-index:8;top:0;left:0'/>").appendTo(ja);x="<table style='width:100%' class='fc-agenda-allday' cellspacing='0'><tr><th class='"+h+" fc-agenda-axis'>"+i("allDayText")+"</th><td><div class='fc-day-content'><div style='position:relative'/></div></td><th class='"+h+" fc-agenda-gutter'>&nbsp;</th></tr></table>";la=m(x).appendTo(ja);$=la.find("tr");q($.find("td"));aa=aa.add(la.find("th:first"));va=va.add(la.find("th.fc-agenda-gutter"));ja.append("<div class='fc-agenda-divider "+
+h+"'><div class='fc-agenda-divider-inner'/></div>")}else ia=m([]);w=m("<div style='position:absolute;width:100%;overflow-x:hidden;overflow-y:auto'/>").appendTo(ja);I=m("<div style='position:relative;width:100%;overflow:hidden'/>").appendTo(w);R=m("<div style='position:absolute;z-index:8;top:0;left:0'/>").appendTo(I);x="<table class='fc-agenda-slots' style='width:100%' cellspacing='0'><tbody>";ta=zb();za=xa(N(ta),bb);xa(ta,La);for(A=tb=0;ta<za;A++){Da=ta.getMinutes();x+="<tr class='fc-slot"+A+" "+
+(!Da?"":"fc-minor")+"'><th class='fc-agenda-axis "+h+"'>"+(!Ea||!Da?s(ta,i("axisFormat")):"&nbsp;")+"</th><td class='"+O+"'><div style='position:relative'>&nbsp;</div></td></tr>";xa(ta,i("slotMinutes"));tb++}x+="</tbody></table>";V=m(x).appendTo(I);ea=V.find("div:first");u(V.find("td"));aa=aa.add(V.find("th:first"))}function l(){var h,O,x,A,ta=Ka(new Date);for(h=0;h<Ba;h++){A=ua(h);O=r.eq(h);O.html(s(A,Vb));x=M.eq(h);+A==+ta?x.addClass(Wa+"-state-highlight fc-today"):x.removeClass(Wa+"-state-highlight fc-today");
+rb(O.add(x),A)}}function j(h,O){if(h===oa)h=Wb;Wb=h;ub={};var x=J.position().top,A=w.position().top;h=Math.min(h-x,V.height()+A+1);Z.height(h-Sa(D));ja.css("top",x);w.height(h-A-1);Xa=ea.height()+1;O&&y()}function t(h){Ga=h;cb.clear();Ma=0;Va(aa.width("").each(function(O,x){Ma=Math.max(Ma,m(x).outerWidth())}),Ma);h=w[0].clientWidth;if(vb=w.width()-h){Va(va,vb);va.show().prev().removeClass("fc-last")}else va.hide().prev().addClass("fc-last");db=Math.floor((h-Ma)/Ba);Va(r.slice(0,-1),db)}function y(){function h(){w.scrollTop(A)}
+var O=zb(),x=N(O);x.setHours(i("firstHour"));var A=ca(O,x)+1;h();setTimeout(h,0)}function S(){Xb=w.scrollTop()}function Q(){w.scrollTop(Xb)}function q(h){h.click(fa).mousedown(W)}function u(h){h.click(fa).mousedown(H)}function fa(h){if(!i("selectable")){var O=Math.min(Ba-1,Math.floor((h.pageX-v.offset().left-Ma)/db)),x=ua(O),A=this.parentNode.className.match(/fc-slot(\d+)/);if(A){A=parseInt(A[1])*i("slotMinutes");var ta=Math.floor(A/60);x.setHours(ta);x.setMinutes(A%60+La);C("dayClick",M[O],x,false,
+h)}else C("dayClick",M[O],x,true,h)}}function na(h,O,x){x&&Na.build();var A=N(K.visStart);if(Ub){x=Ca(O,A)*Ha+Ia+1;h=Ca(h,A)*Ha+Ia+1}else{x=Ca(h,A);h=Ca(O,A)}x=Math.max(0,x);h=Math.min(Ba,h);x<h&&q(ga(0,x,0,h-1))}function ga(h,O,x,A){h=Na.rect(h,O,x,A,ja);return E(h,ja)}function ra(h,O){for(var x=N(K.visStart),A=ba(N(x),1),ta=0;ta<Ba;ta++){var za=new Date(Math.max(x,h)),Da=new Date(Math.min(A,O));if(za<Da){var Ea=ta*Ha+Ia;Ea=Na.rect(0,Ea,0,Ea,I);za=ca(x,za);Da=ca(x,Da);Ea.top=za;Ea.height=Da-za;u(E(Ea,
+I))}ba(x,1);ba(A,1)}}function sa(h){return cb.left(h)}function ha(h){return cb.right(h)}function da(h){return{row:Math.floor(Ca(h,K.visStart)/7),col:U(h.getDay())}}function ma(h){var O=ua(h.col);h=h.row;i("allDaySlot")&&h--;h>=0&&xa(O,La+h*i("slotMinutes"));return O}function ua(h){return ba(N(K.visStart),h*Ha+Ia)}function pa(h){return i("allDaySlot")&&!h.row}function U(h){return(h-Math.max(Tb,Sb)+Ba)%Ba*Ha+Ia}function ca(h,O){h=N(h,true);if(O<xa(N(h),La))return 0;if(O>=xa(N(h),bb))return V.height();
+h=i("slotMinutes");O=O.getHours()*60+O.getMinutes()-La;var x=Math.floor(O/h),A=ub[x];if(A===oa)A=ub[x]=V.find("tr:eq("+x+") td div")[0].offsetTop;return Math.max(0,Math.round(A-1+Xa*(O%h/h)))}function ka(){return{left:Ma,right:Ga-vb}}function qa(){return $}function G(h){var O=N(h.start);if(h.allDay)return O;return xa(O,i("defaultEventMinutes"))}function p(h,O){if(O)return N(h);return xa(N(h),i("slotMinutes"))}function L(h,O,x){if(x)i("allDaySlot")&&na(h,ba(N(O),1),true);else c(h,O)}function c(h,O){var x=
+i("selectHelper");Na.build();if(x){var A=Ca(h,K.visStart)*Ha+Ia;if(A>=0&&A<Ba){A=Na.rect(0,A,0,A,I);var ta=ca(h,h),za=ca(h,O);if(za>ta){A.top=ta;A.height=za-ta;A.left+=2;A.width-=5;if(m.isFunction(x)){if(h=x(h,O)){A.position="absolute";A.zIndex=8;wa=m(h).css(A).appendTo(I)}}else{A.isStart=true;A.isEnd=true;wa=m(o({title:"",start:h,end:O,className:["fc-select-helper"],editable:false},A));wa.css("opacity",i("dragOpacity"))}if(wa){u(wa);I.append(wa);Va(wa,A.width,true);Eb(wa,A.height,true)}}}}else ra(h,
+O)}function z(){B();if(wa){wa.remove();wa=null}}function H(h){if(h.which==1&&i("selectable")){Y(h);var O;Ra.start(function(x,A){z();if(x&&x.col==A.col&&!pa(x)){A=ma(A);x=ma(x);O=[A,xa(N(A),i("slotMinutes")),x,xa(N(x),i("slotMinutes"))].sort(Gb);c(O[0],O[3])}else O=null},h);m(document).one("mouseup",function(x){Ra.stop();if(O){+O[0]==+O[1]&&T(O[0],false,x);n(O[0],O[3],false,x)}})}}function T(h,O,x){C("dayClick",M[U(h.getDay())],h,O,x)}function X(h,O){Ra.start(function(x){B();if(x)if(pa(x))ga(x.row,
+x.col,x.row,x.col);else{x=ma(x);var A=xa(N(x),i("defaultEventMinutes"));ra(x,A)}},O)}function ya(h,O,x){var A=Ra.stop();B();A&&C("drop",h,ma(A),pa(A),O,x)}var K=this;K.renderAgenda=d;K.setWidth=t;K.setHeight=j;K.beforeHide=S;K.afterShow=Q;K.defaultEventEnd=G;K.timePosition=ca;K.dayOfWeekCol=U;K.dateCell=da;K.cellDate=ma;K.cellIsAllDay=pa;K.allDayRow=qa;K.allDayBounds=ka;K.getHoverListener=function(){return Ra};K.colContentLeft=sa;K.colContentRight=ha;K.getDaySegmentContainer=function(){return ia};
+K.getSlotSegmentContainer=function(){return R};K.getMinMinute=function(){return La};K.getMaxMinute=function(){return bb};K.getBodyContent=function(){return I};K.getRowCnt=function(){return 1};K.getColCnt=function(){return Ba};K.getColWidth=function(){return db};K.getSlotHeight=function(){return Xa};K.defaultSelectionEnd=p;K.renderDayOverlay=na;K.renderSelection=L;K.clearSelection=z;K.reportDayClick=T;K.dragStart=X;K.dragStop=ya;Kb.call(K,a,b,e);Lb.call(K);Mb.call(K);sc.call(K);var i=K.opt,C=K.trigger,
+P=K.clearEvents,E=K.renderOverlay,B=K.clearOverlays,n=K.reportSelection,Y=K.unselect,W=K.daySelectionMousedown,o=K.slotSegHtml,s=b.formatDate,v,F,r,J,M,k,D,Z,ja,ia,la,$,w,I,R,V,ea,aa,va,wa,Ga,Wb,Ma,db,vb,Xa,Xb,Ba,tb,Na,Ra,cb,ub={},Wa,Tb,Sb,Ub,Ha,Ia,La,bb,Vb;qb(a.addClass("fc-agenda"));Na=new Nb(function(h,O){function x(eb){return Math.max(Ea,Math.min(tc,eb))}var A,ta,za;r.each(function(eb,uc){A=m(uc);ta=A.offset().left;if(eb)za[1]=ta;za=[ta];O[eb]=za});za[1]=ta+A.outerWidth();if(i("allDaySlot")){A=
+$;ta=A.offset().top;h[0]=[ta,ta+A.outerHeight()]}for(var Da=I.offset().top,Ea=w.offset().top,tc=Ea+w.outerHeight(),fb=0;fb<tb;fb++)h.push([x(Da+Xa*fb),x(Da+Xa*(fb+1))])});Ra=new Ob(Na);cb=new Pb(function(h){return k.eq(h)})}function sc(){function a(o,s){sa(o);var v,F=o.length,r=[],J=[];for(v=0;v<F;v++)o[v].allDay?r.push(o[v]):J.push(o[v]);if(u("allDaySlot")){L(e(r),s);ma()}g(d(J),s)}function b(){ha();ua().empty();pa().empty()}function e(o){o=ob(nb(o,m.map(o,Ua),q.visStart,q.visEnd));var s,v=o.length,
+F,r,J,M=[];for(s=0;s<v;s++){F=o[s];for(r=0;r<F.length;r++){J=F[r];J.row=0;J.level=s;M.push(J)}}return M}function d(o){var s=z(),v=ka(),F=ca(),r=xa(N(q.visStart),v),J=m.map(o,f),M,k,D,Z,ja,ia,la=[];for(M=0;M<s;M++){k=ob(nb(o,J,r,xa(N(r),F-v)));vc(k);for(D=0;D<k.length;D++){Z=k[D];for(ja=0;ja<Z.length;ja++){ia=Z[ja];ia.col=M;ia.level=D;la.push(ia)}}ba(r,1,true)}return la}function f(o){return o.end?N(o.end):xa(N(o.start),u("defaultEventMinutes"))}function g(o,s){var v,F=o.length,r,J,M,k,D,Z,ja,ia,la,
+$="",w,I,R={},V={},ea=pa(),aa;v=z();if(w=u("isRTL")){I=-1;aa=v-1}else{I=1;aa=0}for(v=0;v<F;v++){r=o[v];J=r.event;M=qa(r.start,r.start);k=qa(r.start,r.end);D=r.col;Z=r.level;ja=r.forward||0;ia=G(D*I+aa);la=p(D*I+aa)-ia;la=Math.min(la-6,la*0.95);D=Z?la/(Z+ja+1):ja?(la/(ja+1)-6)*2:la;Z=ia+la/(Z+ja+1)*Z*I+(w?la-D:0);r.top=M;r.left=Z;r.outerWidth=D;r.outerHeight=k-M;$+=l(J,r)}ea[0].innerHTML=$;w=ea.children();for(v=0;v<F;v++){r=o[v];J=r.event;$=m(w[v]);I=fa("eventRender",J,J,$);if(I===false)$.remove();
+else{if(I&&I!==true){$.remove();$=m(I).css({position:"absolute",top:r.top,left:r.left}).appendTo(ea)}r.element=$;if(J._id===s)t(J,$,r);else $[0]._fci=v;ya(J,$)}}Db(ea,o,t);for(v=0;v<F;v++){r=o[v];if($=r.element){J=R[s=r.key=Ib($[0])];r.vsides=J===oa?(R[s]=Sa($,true)):J;J=V[s];r.hsides=J===oa?(V[s]=pb($,true)):J;s=$.find("div.fc-event-content");if(s.length)r.contentTop=s[0].offsetTop}}for(v=0;v<F;v++){r=o[v];if($=r.element){$[0].style.width=Math.max(0,r.outerWidth-r.hsides)+"px";R=Math.max(0,r.outerHeight-
+r.vsides);$[0].style.height=R+"px";J=r.event;if(r.contentTop!==oa&&R-r.contentTop<10){$.find("div.fc-event-time").text(Y(J.start,u("timeFormat"))+" - "+J.title);$.find("div.fc-event-title").remove()}fa("eventAfterRender",J,J,$)}}}function l(o,s){var v="<",F=o.url,r=Jb(o,u),J=r?" style='"+r+"'":"",M=["fc-event","fc-event-skin","fc-event-vert"];na(o)&&M.push("fc-event-draggable");s.isStart&&M.push("fc-corner-top");s.isEnd&&M.push("fc-corner-bottom");M=M.concat(o.className);if(o.source)M=M.concat(o.source.className||
+[]);v+=F?"a href='"+Qa(o.url)+"'":"div";v+=" class='"+M.join(" ")+"' style='position:absolute;z-index:8;top:"+s.top+"px;left:"+s.left+"px;"+r+"'><div class='fc-event-inner fc-event-skin'"+J+"><div class='fc-event-head fc-event-skin'"+J+"><div class='fc-event-time'>"+Qa(W(o.start,o.end,u("timeFormat")))+"</div></div><div class='fc-event-content'><div class='fc-event-title'>"+Qa(o.title)+"</div></div><div class='fc-event-bg'></div></div>";if(s.isEnd&&ga(o))v+="<div class='ui-resizable-handle ui-resizable-s'>=</div>";
+v+="</"+(F?"a":"div")+">";return v}function j(o,s,v){na(o)&&y(o,s,v.isStart);v.isEnd&&ga(o)&&c(o,s,v);da(o,s)}function t(o,s,v){var F=s.find("div.fc-event-time");na(o)&&S(o,s,F);v.isEnd&&ga(o)&&Q(o,s,F);da(o,s)}function y(o,s,v){function F(){if(!M){s.width(r).height("").draggable("option","grid",null);M=true}}var r,J,M=true,k,D=u("isRTL")?-1:1,Z=U(),ja=H(),ia=T(),la=ka();s.draggable({zIndex:9,opacity:u("dragOpacity","month"),revertDuration:u("dragRevertDuration"),start:function($,w){fa("eventDragStart",
+s,o,$,w);i(o,s);r=s.width();Z.start(function(I,R,V,ea){B();if(I){J=false;k=ea*D;if(I.row)if(v){if(M){s.width(ja-10);Eb(s,ia*Math.round((o.end?(o.end-o.start)/wc:u("defaultEventMinutes"))/u("slotMinutes")));s.draggable("option","grid",[ja,1]);M=false}}else J=true;else{E(ba(N(o.start),k),ba(Ua(o),k));F()}J=J||M&&!k}else{F();J=true}s.draggable("option","revert",J)},$,"drag")},stop:function($,w){Z.stop();B();fa("eventDragStop",s,o,$,w);if(J){F();s.css("filter","");K(o,s)}else{var I=0;M||(I=Math.round((s.offset().top-
+X().offset().top)/ia)*u("slotMinutes")+la-(o.start.getHours()*60+o.start.getMinutes()));C(this,o,k,I,M,$,w)}}})}function S(o,s,v){function F(I){var R=xa(N(o.start),I),V;if(o.end)V=xa(N(o.end),I);v.text(W(R,V,u("timeFormat")))}function r(){if(M){v.css("display","");s.draggable("option","grid",[$,w]);M=false}}var J,M=false,k,D,Z,ja=u("isRTL")?-1:1,ia=U(),la=z(),$=H(),w=T();s.draggable({zIndex:9,scroll:false,grid:[$,w],axis:la==1?"y":false,opacity:u("dragOpacity"),revertDuration:u("dragRevertDuration"),
+start:function(I,R){fa("eventDragStart",s,o,I,R);i(o,s);J=s.position();D=Z=0;ia.start(function(V,ea,aa,va){s.draggable("option","revert",!V);B();if(V){k=va*ja;if(u("allDaySlot")&&!V.row){if(!M){M=true;v.hide();s.draggable("option","grid",null)}E(ba(N(o.start),k),ba(Ua(o),k))}else r()}},I,"drag")},drag:function(I,R){D=Math.round((R.position.top-J.top)/w)*u("slotMinutes");if(D!=Z){M||F(D);Z=D}},stop:function(I,R){var V=ia.stop();B();fa("eventDragStop",s,o,I,R);if(V&&(k||D||M))C(this,o,k,M?0:D,M,I,R);
+else{r();s.css("filter","");s.css(J);F(0);K(o,s)}}})}function Q(o,s,v){var F,r,J=T();s.resizable({handles:{s:"div.ui-resizable-s"},grid:J,start:function(M,k){F=r=0;i(o,s);s.css("z-index",9);fa("eventResizeStart",this,o,M,k)},resize:function(M,k){F=Math.round((Math.max(J,s.height())-k.originalSize.height)/J);if(F!=r){v.text(W(o.start,!F&&!o.end?null:xa(ra(o),u("slotMinutes")*F),u("timeFormat")));r=F}},stop:function(M,k){fa("eventResizeStop",this,o,M,k);if(F)P(this,o,0,u("slotMinutes")*F,M,k);else{s.css("z-index",
+8);K(o,s)}}})}var q=this;q.renderEvents=a;q.compileDaySegs=e;q.clearEvents=b;q.slotSegHtml=l;q.bindDaySeg=j;Qb.call(q);var u=q.opt,fa=q.trigger,na=q.isEventDraggable,ga=q.isEventResizable,ra=q.eventEnd,sa=q.reportEvents,ha=q.reportEventClear,da=q.eventElementHandlers,ma=q.setHeight,ua=q.getDaySegmentContainer,pa=q.getSlotSegmentContainer,U=q.getHoverListener,ca=q.getMaxMinute,ka=q.getMinMinute,qa=q.timePosition,G=q.colContentLeft,p=q.colContentRight,L=q.renderDaySegs,c=q.resizableDayEvent,z=q.getColCnt,
+H=q.getColWidth,T=q.getSlotHeight,X=q.getBodyContent,ya=q.reportEventElement,K=q.showEvents,i=q.hideEvents,C=q.eventDrop,P=q.eventResize,E=q.renderDayOverlay,B=q.clearOverlays,n=q.calendar,Y=n.formatDate,W=n.formatDates}function vc(a){var b,e,d,f,g,l;for(b=a.length-1;b>0;b--){f=a[b];for(e=0;e<f.length;e++){g=f[e];for(d=0;d<a[b-1].length;d++){l=a[b-1][d];if(Cb(g,l))l.forward=Math.max(l.forward||0,(g.forward||0)+1)}}}}function Kb(a,b,e){function d(G,p){G=qa[G];if(typeof G=="object")return jb(G,p||e);
+return G}function f(G,p){return b.trigger.apply(b,[G,p||da].concat(Array.prototype.slice.call(arguments,2),[da]))}function g(G){return j(G)&&!d("disableDragging")}function l(G){return j(G)&&!d("disableResizing")}function j(G){return Ta(G.editable,(G.source||{}).editable,d("editable"))}function t(G){U={};var p,L=G.length,c;for(p=0;p<L;p++){c=G[p];if(U[c._id])U[c._id].push(c);else U[c._id]=[c]}}function y(G){return G.end?N(G.end):ma(G)}function S(G,p){ca.push(p);if(ka[G._id])ka[G._id].push(p);else ka[G._id]=
+[p]}function Q(){ca=[];ka={}}function q(G,p){p.click(function(L){if(!p.hasClass("ui-draggable-dragging")&&!p.hasClass("ui-resizable-resizing"))return f("eventClick",this,G,L)}).hover(function(L){f("eventMouseover",this,G,L)},function(L){f("eventMouseout",this,G,L)})}function u(G,p){na(G,p,"show")}function fa(G,p){na(G,p,"hide")}function na(G,p,L){G=ka[G._id];var c,z=G.length;for(c=0;c<z;c++)if(!p||G[c][0]!=p[0])G[c][L]()}function ga(G,p,L,c,z,H,T){var X=p.allDay,ya=p._id;sa(U[ya],L,c,z);f("eventDrop",
+G,p,L,c,z,function(){sa(U[ya],-L,-c,X);pa(ya)},H,T);pa(ya)}function ra(G,p,L,c,z,H){var T=p._id;ha(U[T],L,c);f("eventResize",G,p,L,c,function(){ha(U[T],-L,-c);pa(T)},z,H);pa(T)}function sa(G,p,L,c){L=L||0;for(var z,H=G.length,T=0;T<H;T++){z=G[T];if(c!==oa)z.allDay=c;xa(ba(z.start,p,true),L);if(z.end)z.end=xa(ba(z.end,p,true),L);ua(z,qa)}}function ha(G,p,L){L=L||0;for(var c,z=G.length,H=0;H<z;H++){c=G[H];c.end=xa(ba(y(c),p,true),L);ua(c,qa)}}var da=this;da.element=a;da.calendar=b;da.name=e;da.opt=
+d;da.trigger=f;da.isEventDraggable=g;da.isEventResizable=l;da.reportEvents=t;da.eventEnd=y;da.reportEventElement=S;da.reportEventClear=Q;da.eventElementHandlers=q;da.showEvents=u;da.hideEvents=fa;da.eventDrop=ga;da.eventResize=ra;var ma=da.defaultEventEnd,ua=b.normalizeEvent,pa=b.reportEventChange,U={},ca=[],ka={},qa=b.options}function Qb(){function a(i,C){var P=z(),E=pa(),B=U(),n=0,Y,W,o=i.length,s,v;P[0].innerHTML=e(i);d(i,P.children());f(i);g(i,P,C);l(i);j(i);t(i);C=y();for(P=0;P<E;P++){Y=[];for(W=
+0;W<B;W++)Y[W]=0;for(;n<o&&(s=i[n]).row==P;){W=Hb(Y.slice(s.startCol,s.endCol));s.top=W;W+=s.outerHeight;for(v=s.startCol;v<s.endCol;v++)Y[v]=W;n++}C[P].height(Hb(Y))}Q(i,S(C))}function b(i,C,P){var E=m("<div/>"),B=z(),n=i.length,Y;E[0].innerHTML=e(i);E=E.children();B.append(E);d(i,E);l(i);j(i);t(i);Q(i,S(y()));E=[];for(B=0;B<n;B++)if(Y=i[B].element){i[B].row===C&&Y.css("top",P);E.push(Y[0])}return m(E)}function e(i){var C=fa("isRTL"),P,E=i.length,B,n,Y,W;P=ka();var o=P.left,s=P.right,v,F,r,J,M,k=
+"";for(P=0;P<E;P++){B=i[P];n=B.event;W=["fc-event","fc-event-skin","fc-event-hori"];ga(n)&&W.push("fc-event-draggable");if(C){B.isStart&&W.push("fc-corner-right");B.isEnd&&W.push("fc-corner-left");v=p(B.end.getDay()-1);F=p(B.start.getDay());r=B.isEnd?qa(v):o;J=B.isStart?G(F):s}else{B.isStart&&W.push("fc-corner-left");B.isEnd&&W.push("fc-corner-right");v=p(B.start.getDay());F=p(B.end.getDay()-1);r=B.isStart?qa(v):o;J=B.isEnd?G(F):s}W=W.concat(n.className);if(n.source)W=W.concat(n.source.className||
+[]);Y=n.url;M=Jb(n,fa);k+=Y?"<a href='"+Qa(Y)+"'":"<div";k+=" class='"+W.join(" ")+"' style='position:absolute;z-index:8;left:"+r+"px;"+M+"'><div class='fc-event-inner fc-event-skin'"+(M?" style='"+M+"'":"")+">";if(!n.allDay&&B.isStart)k+="<span class='fc-event-time'>"+Qa(T(n.start,n.end,fa("timeFormat")))+"</span>";k+="<span class='fc-event-title'>"+Qa(n.title)+"</span></div>";if(B.isEnd&&ra(n))k+="<div class='ui-resizable-handle ui-resizable-"+(C?"w":"e")+"'>&nbsp;&nbsp;&nbsp;</div>";k+="</"+(Y?
+"a":"div")+">";B.left=r;B.outerWidth=J-r;B.startCol=v;B.endCol=F+1}return k}function d(i,C){var P,E=i.length,B,n,Y;for(P=0;P<E;P++){B=i[P];n=B.event;Y=m(C[P]);n=na("eventRender",n,n,Y);if(n===false)Y.remove();else{if(n&&n!==true){n=m(n).css({position:"absolute",left:B.left});Y.replaceWith(n);Y=n}B.element=Y}}}function f(i){var C,P=i.length,E,B;for(C=0;C<P;C++){E=i[C];(B=E.element)&&ha(E.event,B)}}function g(i,C,P){var E,B=i.length,n,Y,W;for(E=0;E<B;E++){n=i[E];if(Y=n.element){W=n.event;if(W._id===
+P)H(W,Y,n);else Y[0]._fci=E}}Db(C,i,H)}function l(i){var C,P=i.length,E,B,n,Y,W={};for(C=0;C<P;C++){E=i[C];if(B=E.element){n=E.key=Ib(B[0]);Y=W[n];if(Y===oa)Y=W[n]=pb(B,true);E.hsides=Y}}}function j(i){var C,P=i.length,E,B;for(C=0;C<P;C++){E=i[C];if(B=E.element)B[0].style.width=Math.max(0,E.outerWidth-E.hsides)+"px"}}function t(i){var C,P=i.length,E,B,n,Y,W={};for(C=0;C<P;C++){E=i[C];if(B=E.element){n=E.key;Y=W[n];if(Y===oa)Y=W[n]=Fb(B);E.outerHeight=B[0].offsetHeight+Y}}}function y(){var i,C=pa(),
+P=[];for(i=0;i<C;i++)P[i]=ca(i).find("td:first div.fc-day-content > div");return P}function S(i){var C,P=i.length,E=[];for(C=0;C<P;C++)E[C]=i[C][0].offsetTop;return E}function Q(i,C){var P,E=i.length,B,n;for(P=0;P<E;P++){B=i[P];if(n=B.element){n[0].style.top=C[B.row]+(B.top||0)+"px";B=B.event;na("eventAfterRender",B,B,n)}}}function q(i,C,P){var E=fa("isRTL"),B=E?"w":"e",n=C.find("div.ui-resizable-"+B),Y=false;qb(C);C.mousedown(function(W){W.preventDefault()}).click(function(W){if(Y){W.preventDefault();
+W.stopImmediatePropagation()}});n.mousedown(function(W){function o(ia){na("eventResizeStop",this,i,ia);m("body").css("cursor","");s.stop();ya();k&&ua(this,i,k,0,ia);setTimeout(function(){Y=false},0)}if(W.which==1){Y=true;var s=u.getHoverListener(),v=pa(),F=U(),r=E?-1:1,J=E?F-1:0,M=C.css("top"),k,D,Z=m.extend({},i),ja=L(i.start);K();m("body").css("cursor",B+"-resize").one("mouseup",o);na("eventResizeStart",this,i,W);s.start(function(ia,la){if(ia){var $=Math.max(ja.row,ia.row);ia=ia.col;if(v==1)$=0;
+if($==ja.row)ia=E?Math.min(ja.col,ia):Math.max(ja.col,ia);k=$*7+ia*r+J-(la.row*7+la.col*r+J);la=ba(sa(i),k,true);if(k){Z.end=la;$=D;D=b(c([Z]),P.row,M);D.find("*").css("cursor",B+"-resize");$&&$.remove();ma(i)}else if(D){da(i);D.remove();D=null}ya();X(i.start,ba(N(la),1))}},W)}})}var u=this;u.renderDaySegs=a;u.resizableDayEvent=q;var fa=u.opt,na=u.trigger,ga=u.isEventDraggable,ra=u.isEventResizable,sa=u.eventEnd,ha=u.reportEventElement,da=u.showEvents,ma=u.hideEvents,ua=u.eventResize,pa=u.getRowCnt,
+U=u.getColCnt,ca=u.allDayRow,ka=u.allDayBounds,qa=u.colContentLeft,G=u.colContentRight,p=u.dayOfWeekCol,L=u.dateCell,c=u.compileDaySegs,z=u.getDaySegmentContainer,H=u.bindDaySeg,T=u.calendar.formatDates,X=u.renderDayOverlay,ya=u.clearOverlays,K=u.clearSelection}function Mb(){function a(Q,q,u){b();q||(q=j(Q,u));t(Q,q,u);e(Q,q,u)}function b(Q){if(S){S=false;y();l("unselect",null,Q)}}function e(Q,q,u,fa){S=true;l("select",null,Q,q,u,fa)}function d(Q){var q=f.cellDate,u=f.cellIsAllDay,fa=f.getHoverListener(),
+na=f.reportDayClick;if(Q.which==1&&g("selectable")){b(Q);var ga;fa.start(function(ra,sa){y();if(ra&&u(ra)){ga=[q(sa),q(ra)].sort(Gb);t(ga[0],ga[1],true)}else ga=null},Q);m(document).one("mouseup",function(ra){fa.stop();if(ga){+ga[0]==+ga[1]&&na(ga[0],true,ra);e(ga[0],ga[1],true,ra)}})}}var f=this;f.select=a;f.unselect=b;f.reportSelection=e;f.daySelectionMousedown=d;var g=f.opt,l=f.trigger,j=f.defaultSelectionEnd,t=f.renderSelection,y=f.clearSelection,S=false;g("selectable")&&g("unselectAuto")&&m(document).mousedown(function(Q){var q=
+g("unselectCancel");if(q)if(m(Q.target).parents(q).length)return;b(Q)})}function Lb(){function a(g,l){var j=f.shift();j||(j=m("<div class='fc-cell-overlay' style='position:absolute;z-index:3'/>"));j[0].parentNode!=l[0]&&j.appendTo(l);d.push(j.css(g).show());return j}function b(){for(var g;g=d.shift();)f.push(g.hide().unbind())}var e=this;e.renderOverlay=a;e.clearOverlays=b;var d=[],f=[]}function Nb(a){var b=this,e,d;b.build=function(){e=[];d=[];a(e,d)};b.cell=function(f,g){var l=e.length,j=d.length,
+t,y=-1,S=-1;for(t=0;t<l;t++)if(g>=e[t][0]&&g<e[t][1]){y=t;break}for(t=0;t<j;t++)if(f>=d[t][0]&&f<d[t][1]){S=t;break}return y>=0&&S>=0?{row:y,col:S}:null};b.rect=function(f,g,l,j,t){t=t.offset();return{top:e[f][0]-t.top,left:d[g][0]-t.left,width:d[j][1]-d[g][0],height:e[l][1]-e[f][0]}}}function Ob(a){function b(j){j=a.cell(j.pageX,j.pageY);if(!j!=!l||j&&(j.row!=l.row||j.col!=l.col)){if(j){g||(g=j);f(j,g,j.row-g.row,j.col-g.col)}else f(j,g);l=j}}var e=this,d,f,g,l;e.start=function(j,t,y){f=j;g=l=null;
+a.build();b(t);d=y||"mousemove";m(document).bind(d,b)};e.stop=function(){m(document).unbind(d,b);return l}}function Pb(a){function b(l){return d[l]=d[l]||a(l)}var e=this,d={},f={},g={};e.left=function(l){return f[l]=f[l]===oa?b(l).position().left:f[l]};e.right=function(l){return g[l]=g[l]===oa?e.left(l)+b(l).width():g[l]};e.clear=function(){d={};f={};g={}}}var Ya={defaultView:"month",aspectRatio:1.35,header:{left:"title",center:"",right:"today prev,next"},weekends:true,allDayDefault:true,ignoreTimezone:true,
+lazyFetching:true,startParam:"start",endParam:"end",titleFormat:{month:"MMMM yyyy",week:"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",day:"dddd, MMM d, yyyy"},columnFormat:{month:"ddd",week:"ddd M/d",day:"dddd M/d"},timeFormat:{"":"h(:mm)t"},isRTL:false,firstDay:0,monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday",
+"Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],buttonText:{prev:"&nbsp;&#9668;&nbsp;",next:"&nbsp;&#9658;&nbsp;",prevYear:"&nbsp;&lt;&lt;&nbsp;",nextYear:"&nbsp;&gt;&gt;&nbsp;",today:"today",month:"month",week:"week",day:"day"},theme:false,buttonIcons:{prev:"circle-triangle-w",next:"circle-triangle-e"},unselectAuto:true,dropAccept:"*"},xc={header:{left:"next,prev today",center:"",right:"title"},buttonText:{prev:"&nbsp;&#9658;&nbsp;",next:"&nbsp;&#9668;&nbsp;",
+prevYear:"&nbsp;&gt;&gt;&nbsp;",nextYear:"&nbsp;&lt;&lt;&nbsp;"},buttonIcons:{prev:"circle-triangle-e",next:"circle-triangle-w"}},Aa=m.fullCalendar={version:"1.5.2"},Ja=Aa.views={};m.fn.fullCalendar=function(a){if(typeof a=="string"){var b=Array.prototype.slice.call(arguments,1),e;this.each(function(){var f=m.data(this,"fullCalendar");if(f&&m.isFunction(f[a])){f=f[a].apply(f,b);if(e===oa)e=f;a=="destroy"&&m.removeData(this,"fullCalendar")}});if(e!==oa)return e;return this}var d=a.eventSources||[];
+delete a.eventSources;if(a.events){d.push(a.events);delete a.events}a=m.extend(true,{},Ya,a.isRTL||a.isRTL===oa&&Ya.isRTL?xc:{},a);this.each(function(f,g){f=m(g);g=new Yb(f,a,d);f.data("fullCalendar",g);g.render()});return this};Aa.sourceNormalizers=[];Aa.sourceFetchers=[];var ac={dataType:"json",cache:false},bc=1;Aa.addDays=ba;Aa.cloneDate=N;Aa.parseDate=kb;Aa.parseISO8601=Bb;Aa.parseTime=mb;Aa.formatDate=Oa;Aa.formatDates=ib;var lc=["sun","mon","tue","wed","thu","fri","sat"],Ab=864E5,cc=36E5,wc=
+6E4,dc={s:function(a){return a.getSeconds()},ss:function(a){return Pa(a.getSeconds())},m:function(a){return a.getMinutes()},mm:function(a){return Pa(a.getMinutes())},h:function(a){return a.getHours()%12||12},hh:function(a){return Pa(a.getHours()%12||12)},H:function(a){return a.getHours()},HH:function(a){return Pa(a.getHours())},d:function(a){return a.getDate()},dd:function(a){return Pa(a.getDate())},ddd:function(a,b){return b.dayNamesShort[a.getDay()]},dddd:function(a,b){return b.dayNames[a.getDay()]},
+M:function(a){return a.getMonth()+1},MM:function(a){return Pa(a.getMonth()+1)},MMM:function(a,b){return b.monthNamesShort[a.getMonth()]},MMMM:function(a,b){return b.monthNames[a.getMonth()]},yy:function(a){return(a.getFullYear()+"").substring(2)},yyyy:function(a){return a.getFullYear()},t:function(a){return a.getHours()<12?"a":"p"},tt:function(a){return a.getHours()<12?"am":"pm"},T:function(a){return a.getHours()<12?"A":"P"},TT:function(a){return a.getHours()<12?"AM":"PM"},u:function(a){return Oa(a,
+"yyyy-MM-dd'T'HH:mm:ss'Z'")},S:function(a){a=a.getDate();if(a>10&&a<20)return"th";return["st","nd","rd"][a%10-1]||"th"}};Aa.applyAll=$a;Ja.month=mc;Ja.basicWeek=nc;Ja.basicDay=oc;wb({weekMode:"fixed"});Ja.agendaWeek=qc;Ja.agendaDay=rc;wb({allDaySlot:true,allDayText:"all-day",firstHour:6,slotMinutes:30,defaultEventMinutes:120,axisFormat:"h(:mm)tt",timeFormat:{agenda:"h:mm{ - h:mm}"},dragOpacity:{agenda:0.5},minTime:0,maxTime:24})})(jQuery);
diff --git a/3rdparty/fullcalendar/js/gcal.js b/3rdparty/fullcalendar/js/gcal.js
new file mode 100644
index 00000000000..709e25cb262
--- /dev/null
+++ b/3rdparty/fullcalendar/js/gcal.js
@@ -0,0 +1,112 @@
+/*
+ * FullCalendar v1.5.2 Google Calendar Plugin
+ *
+ * Copyright (c) 2011 Adam Shaw
+ * Dual licensed under the MIT and GPL licenses, located in
+ * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
+ *
+ * Date: Sun Aug 21 22:06:09 2011 -0700
+ *
+ */
+
+(function($) {
+
+
+var fc = $.fullCalendar;
+var formatDate = fc.formatDate;
+var parseISO8601 = fc.parseISO8601;
+var addDays = fc.addDays;
+var applyAll = fc.applyAll;
+
+
+fc.sourceNormalizers.push(function(sourceOptions) {
+	if (sourceOptions.dataType == 'gcal' ||
+		sourceOptions.dataType === undefined &&
+		(sourceOptions.url || '').match(/^(http|https):\/\/www.google.com\/calendar\/feeds\//)) {
+			sourceOptions.dataType = 'gcal';
+			if (sourceOptions.editable === undefined) {
+				sourceOptions.editable = false;
+			}
+		}
+});
+
+
+fc.sourceFetchers.push(function(sourceOptions, start, end) {
+	if (sourceOptions.dataType == 'gcal') {
+		return transformOptions(sourceOptions, start, end);
+	}
+});
+
+
+function transformOptions(sourceOptions, start, end) {
+
+	var success = sourceOptions.success;
+	var data = $.extend({}, sourceOptions.data || {}, {
+		'start-min': formatDate(start, 'u'),
+		'start-max': formatDate(end, 'u'),
+		'singleevents': true,
+		'max-results': 9999
+	});
+
+	var ctz = sourceOptions.currentTimezone;
+	if (ctz) {
+		data.ctz = ctz = ctz.replace(' ', '_');
+	}
+
+	return $.extend({}, sourceOptions, {
+		url: sourceOptions.url.replace(/\/basic$/, '/full') + '?alt=json-in-script&callback=?',
+		dataType: 'jsonp',
+		data: data,
+		startParam: false,
+		endParam: false,
+		success: function(data) {
+			var events = [];
+			if (data.feed.entry) {
+				$.each(data.feed.entry, function(i, entry) {
+					var startStr = entry['gd$when'][0]['startTime'];
+					var start = parseISO8601(startStr, true);
+					var end = parseISO8601(entry['gd$when'][0]['endTime'], true);
+					var allDay = startStr.indexOf('T') == -1;
+					var url;
+					$.each(entry.link, function(i, link) {
+						if (link.type == 'text/html') {
+							url = link.href;
+							if (ctz) {
+								url += (url.indexOf('?') == -1 ? '?' : '&') + 'ctz=' + ctz;
+							}
+						}
+					});
+					if (allDay) {
+						addDays(end, -1); // make inclusive
+					}
+					events.push({
+						id: entry['gCal$uid']['value'],
+						title: entry['title']['$t'],
+						url: url,
+						start: start,
+						end: end,
+						allDay: allDay,
+						location: entry['gd$where'][0]['valueString'],
+						description: entry['content']['$t']
+					});
+				});
+			}
+			var args = [events].concat(Array.prototype.slice.call(arguments, 1));
+			var res = applyAll(success, this, args);
+			if ($.isArray(res)) {
+				return res;
+			}
+			return events;
+		}
+	});
+
+}
+
+
+// legacy
+fc.gcalFeed = function(url, sourceOptions) {
+	return $.extend({}, sourceOptions, { url: url, dataType: 'gcal' });
+};
+
+
+})(jQuery);
diff --git a/3rdparty/js/chosen/LICENSE.md b/3rdparty/js/chosen/LICENSE.md
new file mode 100644
index 00000000000..80109bba802
--- /dev/null
+++ b/3rdparty/js/chosen/LICENSE.md
@@ -0,0 +1,24 @@
+# Chosen, a Select Box Enhancer for jQuery and Protoype
+## by Patrick Filler for [Harvest](http://getharvest.com)
+
+Available for use under the [MIT License](http://en.wikipedia.org/wiki/MIT_License)
+
+Copyright (c) 2011 by Harvest
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/3rdparty/js/chosen/README.md b/3rdparty/js/chosen/README.md
new file mode 100644
index 00000000000..cee8ed1cc08
--- /dev/null
+++ b/3rdparty/js/chosen/README.md
@@ -0,0 +1,46 @@
+# Chosen
+
+Chosen is a library for making long, unwieldy select boxes more user friendly.
+
+- jQuery support: 1.4+
+- Prototype support: 1.7+
+
+For documentation, usage, and examples, see:  
+http://harvesthq.github.com/chosen
+
+### Contributing to Chosen
+
+Contributions and pull requests are very welcome. Please follow these guidelines when submitting new code.
+
+1. Make all changes in Coffeescript files, **not** JavaScript files.
+2. For feature changes, update both jQuery *and* Prototype versions
+3. Use 'cake build' to generate Chosen's JavaScript file and minified version.
+4. Don't touch the VERSION file
+5. Submit a Pull Request using GitHub.
+
+### Using CoffeeScript & Cake
+
+First, make sure you have the proper CoffeeScript / Cake set-up in place.
+
+1. Install Coffeescript: the [CoffeeScript documentation](http://jashkenas.github.com/coffee-script/) provides easy-to-follow instructions.
+2. Install UglifyJS: <code>npm -g install uglify-js</code>
+3. Verify that your $NODE_PATH is properly configured using <code>echo $NODE_PATH</code>
+
+Once you're configured, building the JavasScript from the command line is easy:
+
+    cake build                # build Chosen from source
+    cake watch                # watch coffee/ for changes and build Chosen
+    
+If you're interested, you can find the recipes in Cakefile.
+
+
+### Chosen Credits
+
+- Built by [Harvest](http://www.getharvest.com/)
+- Concept and development by [Patrick Filler](http://www.patrickfiller.com/)
+- Design and CSS by [Matthew Lettini](http://matthewlettini.com/)
+
+### Notable Forks
+
+- [Chosen for MooTools](https://github.com/julesjanssen/chosen), by Jules Janssen
+- [Chosen Drupal 7 Module](https://github.com/Polzme/chosen), by Pol Dell'Aiera
\ No newline at end of file
diff --git a/3rdparty/js/chosen/VERSION b/3rdparty/js/chosen/VERSION
new file mode 100644
index 00000000000..b0bb878545d
--- /dev/null
+++ b/3rdparty/js/chosen/VERSION
@@ -0,0 +1 @@
+0.9.5
diff --git a/3rdparty/js/chosen/chosen.jquery.js b/3rdparty/js/chosen/chosen.jquery.js
new file mode 100644
index 00000000000..e7e661c0962
--- /dev/null
+++ b/3rdparty/js/chosen/chosen.jquery.js
@@ -0,0 +1,857 @@
+// Chosen, a Select Box Enhancer for jQuery and Protoype
+// by Patrick Filler for Harvest, http://getharvest.com
+// 
+// Version 0.9.5
+// Full source at https://github.com/harvesthq/chosen
+// Copyright (c) 2011 Harvest http://getharvest.com
+
+// MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
+// This file is generated by `cake build`, do not edit it by hand.
+(function() {
+  /*
+  Chosen source: generate output using 'cake build'
+  Copyright (c) 2011 by Harvest
+  */  var $, Chosen, get_side_border_padding, root;
+  var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+  root = this;
+  $ = jQuery;
+  $.fn.extend({
+    chosen: function(options) {
+      if ($.browser === "msie" && ($.browser.version === "6.0" || $.browser.version === "7.0")) {
+        return this;
+      }
+      return $(this).each(function(input_field) {
+        if (!($(this)).hasClass("chzn-done")) {
+          return new Chosen(this, options);
+        }
+      });
+    }
+  });
+  Chosen = (function() {
+    function Chosen(form_field, options) {
+      this.form_field = form_field;
+      this.options = options != null ? options : {};
+      this.set_default_values();
+      this.form_field_jq = $(this.form_field);
+      this.is_multiple = this.form_field.multiple;
+      this.is_rtl = this.form_field_jq.hasClass("chzn-rtl");
+      this.default_text_default = this.form_field.multiple ? "Select Some Options" : "Select an Option";
+      this.set_up_html();
+      this.register_observers();
+      this.form_field_jq.addClass("chzn-done");
+    }
+    Chosen.prototype.set_default_values = function() {
+      this.click_test_action = __bind(function(evt) {
+        return this.test_active_click(evt);
+      }, this);
+      this.activate_action = __bind(function(evt) {
+        return this.activate_field(evt);
+      }, this);
+      this.active_field = false;
+      this.mouse_on_container = false;
+      this.results_showing = false;
+      this.result_highlighted = null;
+      this.result_single_selected = null;
+      this.allow_single_deselect = (this.options.allow_single_deselect != null) && this.form_field.options[0].text === "" ? this.options.allow_single_deselect : false;
+      this.disable_search_threshold = this.options.disable_search_threshold || 0;
+      this.choices = 0;
+      return this.results_none_found = this.options.no_results_text || "No results match";
+    };
+    Chosen.prototype.set_up_html = function() {
+      var container_div, dd_top, dd_width, sf_width;
+      this.container_id = this.form_field.id.length ? this.form_field.id.replace(/(:|\.)/g, '_') : this.generate_field_id();
+      this.container_id += "_chzn";
+      this.f_width = this.form_field_jq.outerWidth();
+      this.default_text = this.form_field_jq.data('placeholder') ? this.form_field_jq.data('placeholder') : this.default_text_default;
+      container_div = $("<div />", {
+        id: this.container_id,
+        "class": "chzn-container" + (this.is_rtl ? ' chzn-rtl' : ''),
+        style: 'width: ' + this.f_width + 'px;'
+      });
+      if (this.is_multiple) {
+        container_div.html('<ul class="chzn-choices"><li class="search-field"><input type="text" value="' + this.default_text + '" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chzn-drop" style="left:-9000px;"><ul class="chzn-results"></ul></div>');
+      } else {
+        container_div.html('<a href="javascript:void(0)" class="chzn-single"><span>' + this.default_text + '</span><div><b></b></div></a><div class="chzn-drop" style="left:-9000px;"><div class="chzn-search"><input type="text" autocomplete="off" /></div><ul class="chzn-results"></ul></div>');
+      }
+      this.form_field_jq.hide().after(container_div);
+      this.container = $('#' + this.container_id);
+      this.container.addClass("chzn-container-" + (this.is_multiple ? "multi" : "single"));
+      if (!this.is_multiple && this.form_field.options.length <= this.disable_search_threshold) {
+        this.container.addClass("chzn-container-single-nosearch");
+      }
+      this.dropdown = this.container.find('div.chzn-drop').first();
+      dd_top = this.container.height();
+      dd_width = this.f_width - get_side_border_padding(this.dropdown);
+      this.dropdown.css({
+        "width": dd_width + "px",
+        "top": dd_top + "px"
+      });
+      this.search_field = this.container.find('input').first();
+      this.search_results = this.container.find('ul.chzn-results').first();
+      this.search_field_scale();
+      this.search_no_results = this.container.find('li.no-results').first();
+      if (this.is_multiple) {
+        this.search_choices = this.container.find('ul.chzn-choices').first();
+        this.search_container = this.container.find('li.search-field').first();
+      } else {
+        this.search_container = this.container.find('div.chzn-search').first();
+        this.selected_item = this.container.find('.chzn-single').first();
+        sf_width = dd_width - get_side_border_padding(this.search_container) - get_side_border_padding(this.search_field);
+        this.search_field.css({
+          "width": sf_width + "px"
+        });
+      }
+      this.results_build();
+      return this.set_tab_index();
+    };
+    Chosen.prototype.register_observers = function() {
+      this.container.mousedown(__bind(function(evt) {
+        return this.container_mousedown(evt);
+      }, this));
+      this.container.mouseup(__bind(function(evt) {
+        return this.container_mouseup(evt);
+      }, this));
+      this.container.mouseenter(__bind(function(evt) {
+        return this.mouse_enter(evt);
+      }, this));
+      this.container.mouseleave(__bind(function(evt) {
+        return this.mouse_leave(evt);
+      }, this));
+      this.search_results.mouseup(__bind(function(evt) {
+        return this.search_results_mouseup(evt);
+      }, this));
+      this.search_results.mouseover(__bind(function(evt) {
+        return this.search_results_mouseover(evt);
+      }, this));
+      this.search_results.mouseout(__bind(function(evt) {
+        return this.search_results_mouseout(evt);
+      }, this));
+      this.form_field_jq.bind("liszt:updated", __bind(function(evt) {
+        return this.results_update_field(evt);
+      }, this));
+      this.search_field.blur(__bind(function(evt) {
+        return this.input_blur(evt);
+      }, this));
+      this.search_field.keyup(__bind(function(evt) {
+        return this.keyup_checker(evt);
+      }, this));
+      this.search_field.keydown(__bind(function(evt) {
+        return this.keydown_checker(evt);
+      }, this));
+      if (this.is_multiple) {
+        this.search_choices.click(__bind(function(evt) {
+          return this.choices_click(evt);
+        }, this));
+        return this.search_field.focus(__bind(function(evt) {
+          return this.input_focus(evt);
+        }, this));
+      }
+    };
+    Chosen.prototype.search_field_disabled = function() {
+      this.is_disabled = this.form_field_jq.attr('disabled');
+      if (this.is_disabled) {
+        this.container.addClass('chzn-disabled');
+        this.search_field.attr('disabled', true);
+        if (!this.is_multiple) {
+          this.selected_item.unbind("focus", this.activate_action);
+        }
+        return this.close_field();
+      } else {
+        this.container.removeClass('chzn-disabled');
+        this.search_field.attr('disabled', false);
+        if (!this.is_multiple) {
+          return this.selected_item.bind("focus", this.activate_action);
+        }
+      }
+    };
+    Chosen.prototype.container_mousedown = function(evt) {
+      var target_closelink;
+      if (!this.is_disabled) {
+        target_closelink = evt != null ? ($(evt.target)).hasClass("search-choice-close") : false;
+        if (evt && evt.type === "mousedown") {
+          evt.stopPropagation();
+        }
+        if (!this.pending_destroy_click && !target_closelink) {
+          if (!this.active_field) {
+            if (this.is_multiple) {
+              this.search_field.val("");
+            }
+            $(document).click(this.click_test_action);
+            this.results_show();
+          } else if (!this.is_multiple && evt && ($(evt.target) === this.selected_item || $(evt.target).parents("a.chzn-single").length)) {
+            evt.preventDefault();
+            this.results_toggle();
+          }
+          return this.activate_field();
+        } else {
+          return this.pending_destroy_click = false;
+        }
+      }
+    };
+    Chosen.prototype.container_mouseup = function(evt) {
+      if (evt.target.nodeName === "ABBR") {
+        return this.results_reset(evt);
+      }
+    };
+    Chosen.prototype.mouse_enter = function() {
+      return this.mouse_on_container = true;
+    };
+    Chosen.prototype.mouse_leave = function() {
+      return this.mouse_on_container = false;
+    };
+    Chosen.prototype.input_focus = function(evt) {
+      if (!this.active_field) {
+        return setTimeout((__bind(function() {
+          return this.container_mousedown();
+        }, this)), 50);
+      }
+    };
+    Chosen.prototype.input_blur = function(evt) {
+      if (!this.mouse_on_container) {
+        this.active_field = false;
+        return setTimeout((__bind(function() {
+          return this.blur_test();
+        }, this)), 100);
+      }
+    };
+    Chosen.prototype.blur_test = function(evt) {
+      if (!this.active_field && this.container.hasClass("chzn-container-active")) {
+        return this.close_field();
+      }
+    };
+    Chosen.prototype.close_field = function() {
+      $(document).unbind("click", this.click_test_action);
+      if (!this.is_multiple) {
+        this.selected_item.attr("tabindex", this.search_field.attr("tabindex"));
+        this.search_field.attr("tabindex", -1);
+      }
+      this.active_field = false;
+      this.results_hide();
+      this.container.removeClass("chzn-container-active");
+      this.winnow_results_clear();
+      this.clear_backstroke();
+      this.show_search_field_default();
+      return this.search_field_scale();
+    };
+    Chosen.prototype.activate_field = function() {
+      if (!this.is_multiple && !this.active_field) {
+        this.search_field.attr("tabindex", this.selected_item.attr("tabindex"));
+        this.selected_item.attr("tabindex", -1);
+      }
+      this.container.addClass("chzn-container-active");
+      this.active_field = true;
+      this.search_field.val(this.search_field.val());
+      return this.search_field.focus();
+    };
+    Chosen.prototype.test_active_click = function(evt) {
+      if ($(evt.target).parents('#' + this.container_id).length) {
+        return this.active_field = true;
+      } else {
+        return this.close_field();
+      }
+    };
+    Chosen.prototype.results_build = function() {
+      var content, data, startTime, _i, _len, _ref;
+      startTime = new Date();
+      this.parsing = true;
+      this.results_data = root.SelectParser.select_to_array(this.form_field);
+      if (this.is_multiple && this.choices > 0) {
+        this.search_choices.find("li.search-choice").remove();
+        this.choices = 0;
+      } else if (!this.is_multiple) {
+        this.selected_item.find("span").text(this.default_text);
+      }
+      content = '';
+      _ref = this.results_data;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        data = _ref[_i];
+        if (data.group) {
+          content += this.result_add_group(data);
+        } else if (!data.empty) {
+          content += this.result_add_option(data);
+          if (data.selected && this.is_multiple) {
+            this.choice_build(data);
+          } else if (data.selected && !this.is_multiple) {
+            this.selected_item.find("span").text(data.text);
+            if (this.allow_single_deselect) {
+              this.selected_item.find("span").first().after("<abbr class=\"search-choice-close\"></abbr>");
+            }
+          }
+        }
+      }
+      this.search_field_disabled();
+      this.show_search_field_default();
+      this.search_field_scale();
+      this.search_results.html(content);
+      return this.parsing = false;
+    };
+    Chosen.prototype.result_add_group = function(group) {
+      if (!group.disabled) {
+        group.dom_id = this.container_id + "_g_" + group.array_index;
+        return '<li id="' + group.dom_id + '" class="group-result">' + $("<div />").text(group.label).html() + '</li>';
+      } else {
+        return "";
+      }
+    };
+    Chosen.prototype.result_add_option = function(option) {
+      var classes, style;
+      if (!option.disabled) {
+        option.dom_id = this.container_id + "_o_" + option.array_index;
+        classes = option.selected && this.is_multiple ? [] : ["active-result"];
+        if (option.selected) {
+          classes.push("result-selected");
+        }
+        if (option.group_array_index != null) {
+          classes.push("group-option");
+        }
+        if (option.classes !== "") {
+          classes.push(option.classes);
+        }
+        style = option.style.cssText !== "" ? " style=\"" + option.style + "\"" : "";
+        return '<li id="' + option.dom_id + '" class="' + classes.join(' ') + '"' + style + '>' + option.html + '</li>';
+      } else {
+        return "";
+      }
+    };
+    Chosen.prototype.results_update_field = function() {
+      this.result_clear_highlight();
+      this.result_single_selected = null;
+      return this.results_build();
+    };
+    Chosen.prototype.result_do_highlight = function(el) {
+      var high_bottom, high_top, maxHeight, visible_bottom, visible_top;
+      if (el.length) {
+        this.result_clear_highlight();
+        this.result_highlight = el;
+        this.result_highlight.addClass("highlighted");
+        maxHeight = parseInt(this.search_results.css("maxHeight"), 10);
+        visible_top = this.search_results.scrollTop();
+        visible_bottom = maxHeight + visible_top;
+        high_top = this.result_highlight.position().top + this.search_results.scrollTop();
+        high_bottom = high_top + this.result_highlight.outerHeight();
+        if (high_bottom >= visible_bottom) {
+          return this.search_results.scrollTop((high_bottom - maxHeight) > 0 ? high_bottom - maxHeight : 0);
+        } else if (high_top < visible_top) {
+          return this.search_results.scrollTop(high_top);
+        }
+      }
+    };
+    Chosen.prototype.result_clear_highlight = function() {
+      if (this.result_highlight) {
+        this.result_highlight.removeClass("highlighted");
+      }
+      return this.result_highlight = null;
+    };
+    Chosen.prototype.results_toggle = function() {
+      if (this.results_showing) {
+        return this.results_hide();
+      } else {
+        return this.results_show();
+      }
+    };
+    Chosen.prototype.results_show = function() {
+      var dd_top;
+      if (!this.is_multiple) {
+        this.selected_item.addClass("chzn-single-with-drop");
+        if (this.result_single_selected) {
+          this.result_do_highlight(this.result_single_selected);
+        }
+      }
+      dd_top = this.is_multiple ? this.container.height() : this.container.height() - 1;
+      this.dropdown.css({
+        "top": dd_top + "px",
+        "left": 0
+      });
+      this.results_showing = true;
+      this.search_field.focus();
+      this.search_field.val(this.search_field.val());
+      return this.winnow_results();
+    };
+    Chosen.prototype.results_hide = function() {
+      if (!this.is_multiple) {
+        this.selected_item.removeClass("chzn-single-with-drop");
+      }
+      this.result_clear_highlight();
+      this.dropdown.css({
+        "left": "-9000px"
+      });
+      return this.results_showing = false;
+    };
+    Chosen.prototype.set_tab_index = function(el) {
+      var ti;
+      if (this.form_field_jq.attr("tabindex")) {
+        ti = this.form_field_jq.attr("tabindex");
+        this.form_field_jq.attr("tabindex", -1);
+        if (this.is_multiple) {
+          return this.search_field.attr("tabindex", ti);
+        } else {
+          this.selected_item.attr("tabindex", ti);
+          return this.search_field.attr("tabindex", -1);
+        }
+      }
+    };
+    Chosen.prototype.show_search_field_default = function() {
+      if (this.is_multiple && this.choices < 1 && !this.active_field) {
+        this.search_field.val(this.default_text);
+        return this.search_field.addClass("default");
+      } else {
+        this.search_field.val("");
+        return this.search_field.removeClass("default");
+      }
+    };
+    Chosen.prototype.search_results_mouseup = function(evt) {
+      var target;
+      target = $(evt.target).hasClass("active-result") ? $(evt.target) : $(evt.target).parents(".active-result").first();
+      if (target.length) {
+        this.result_highlight = target;
+        return this.result_select(evt);
+      }
+    };
+    Chosen.prototype.search_results_mouseover = function(evt) {
+      var target;
+      target = $(evt.target).hasClass("active-result") ? $(evt.target) : $(evt.target).parents(".active-result").first();
+      if (target) {
+        return this.result_do_highlight(target);
+      }
+    };
+    Chosen.prototype.search_results_mouseout = function(evt) {
+      if ($(evt.target).hasClass("active-result" || $(evt.target).parents('.active-result').first())) {
+        return this.result_clear_highlight();
+      }
+    };
+    Chosen.prototype.choices_click = function(evt) {
+      evt.preventDefault();
+      if (this.active_field && !($(evt.target).hasClass("search-choice" || $(evt.target).parents('.search-choice').first)) && !this.results_showing) {
+        return this.results_show();
+      }
+    };
+    Chosen.prototype.choice_build = function(item) {
+      var choice_id, link;
+      choice_id = this.container_id + "_c_" + item.array_index;
+      this.choices += 1;
+      this.search_container.before('<li class="search-choice" id="' + choice_id + '"><span>' + item.html + '</span><a href="javascript:void(0)" class="search-choice-close" rel="' + item.array_index + '"></a></li>');
+      link = $('#' + choice_id).find("a").first();
+      return link.click(__bind(function(evt) {
+        return this.choice_destroy_link_click(evt);
+      }, this));
+    };
+    Chosen.prototype.choice_destroy_link_click = function(evt) {
+      evt.preventDefault();
+      if (!this.is_disabled) {
+        this.pending_destroy_click = true;
+        return this.choice_destroy($(evt.target));
+      } else {
+        return evt.stopPropagation;
+      }
+    };
+    Chosen.prototype.choice_destroy = function(link) {
+      this.choices -= 1;
+      this.show_search_field_default();
+      if (this.is_multiple && this.choices > 0 && this.search_field.val().length < 1) {
+        this.results_hide();
+      }
+      this.result_deselect(link.attr("rel"));
+      return link.parents('li').first().remove();
+    };
+    Chosen.prototype.results_reset = function(evt) {
+      this.form_field.options[0].selected = true;
+      this.selected_item.find("span").text(this.default_text);
+      this.show_search_field_default();
+      $(evt.target).remove();
+      this.form_field_jq.trigger("change");
+      if (this.active_field) {
+        return this.results_hide();
+      }
+    };
+    Chosen.prototype.result_select = function(evt) {
+      var high, high_id, item, position;
+      if (this.result_highlight) {
+        high = this.result_highlight;
+        high_id = high.attr("id");
+        this.result_clear_highlight();
+        if (this.is_multiple) {
+          this.result_deactivate(high);
+        } else {
+          this.search_results.find(".result-selected").removeClass("result-selected");
+          this.result_single_selected = high;
+        }
+        high.addClass("result-selected");
+        position = high_id.substr(high_id.lastIndexOf("_") + 1);
+        item = this.results_data[position];
+        item.selected = true;
+        this.form_field.options[item.options_index].selected = true;
+        if (this.is_multiple) {
+          this.choice_build(item);
+        } else {
+          this.selected_item.find("span").first().text(item.text);
+          if (this.allow_single_deselect) {
+            this.selected_item.find("span").first().after("<abbr class=\"search-choice-close\"></abbr>");
+          }
+        }
+        if (!(evt.metaKey && this.is_multiple)) {
+          this.results_hide();
+        }
+        this.search_field.val("");
+        this.form_field_jq.trigger("change");
+        return this.search_field_scale();
+      }
+    };
+    Chosen.prototype.result_activate = function(el) {
+      return el.addClass("active-result");
+    };
+    Chosen.prototype.result_deactivate = function(el) {
+      return el.removeClass("active-result");
+    };
+    Chosen.prototype.result_deselect = function(pos) {
+      var result, result_data;
+      result_data = this.results_data[pos];
+      result_data.selected = false;
+      this.form_field.options[result_data.options_index].selected = false;
+      result = $("#" + this.container_id + "_o_" + pos);
+      result.removeClass("result-selected").addClass("active-result").show();
+      this.result_clear_highlight();
+      this.winnow_results();
+      this.form_field_jq.trigger("change");
+      return this.search_field_scale();
+    };
+    Chosen.prototype.results_search = function(evt) {
+      if (this.results_showing) {
+        return this.winnow_results();
+      } else {
+        return this.results_show();
+      }
+    };
+    Chosen.prototype.winnow_results = function() {
+      var found, option, part, parts, regex, result_id, results, searchText, startTime, startpos, text, zregex, _i, _j, _len, _len2, _ref;
+      startTime = new Date();
+      this.no_results_clear();
+      results = 0;
+      searchText = this.search_field.val() === this.default_text ? "" : $('<div/>').text($.trim(this.search_field.val())).html();
+      regex = new RegExp('^' + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i');
+      zregex = new RegExp(searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i');
+      _ref = this.results_data;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        option = _ref[_i];
+        if (!option.disabled && !option.empty) {
+          if (option.group) {
+            $('#' + option.dom_id).hide();
+          } else if (!(this.is_multiple && option.selected)) {
+            found = false;
+            result_id = option.dom_id;
+            if (regex.test(option.html)) {
+              found = true;
+              results += 1;
+            } else if (option.html.indexOf(" ") >= 0 || option.html.indexOf("[") === 0) {
+              parts = option.html.replace(/\[|\]/g, "").split(" ");
+              if (parts.length) {
+                for (_j = 0, _len2 = parts.length; _j < _len2; _j++) {
+                  part = parts[_j];
+                  if (regex.test(part)) {
+                    found = true;
+                    results += 1;
+                  }
+                }
+              }
+            }
+            if (found) {
+              if (searchText.length) {
+                startpos = option.html.search(zregex);
+                text = option.html.substr(0, startpos + searchText.length) + '</em>' + option.html.substr(startpos + searchText.length);
+                text = text.substr(0, startpos) + '<em>' + text.substr(startpos);
+              } else {
+                text = option.html;
+              }
+              if ($("#" + result_id).html !== text) {
+                $("#" + result_id).html(text);
+              }
+              this.result_activate($("#" + result_id));
+              if (option.group_array_index != null) {
+                $("#" + this.results_data[option.group_array_index].dom_id).show();
+              }
+            } else {
+              if (this.result_highlight && result_id === this.result_highlight.attr('id')) {
+                this.result_clear_highlight();
+              }
+              this.result_deactivate($("#" + result_id));
+            }
+          }
+        }
+      }
+      if (results < 1 && searchText.length) {
+        return this.no_results(searchText);
+      } else {
+        return this.winnow_results_set_highlight();
+      }
+    };
+    Chosen.prototype.winnow_results_clear = function() {
+      var li, lis, _i, _len, _results;
+      this.search_field.val("");
+      lis = this.search_results.find("li");
+      _results = [];
+      for (_i = 0, _len = lis.length; _i < _len; _i++) {
+        li = lis[_i];
+        li = $(li);
+        _results.push(li.hasClass("group-result") ? li.show() : !this.is_multiple || !li.hasClass("result-selected") ? this.result_activate(li) : void 0);
+      }
+      return _results;
+    };
+    Chosen.prototype.winnow_results_set_highlight = function() {
+      var do_high, selected_results;
+      if (!this.result_highlight) {
+        selected_results = !this.is_multiple ? this.search_results.find(".result-selected.active-result") : [];
+        do_high = selected_results.length ? selected_results.first() : this.search_results.find(".active-result").first();
+        if (do_high != null) {
+          return this.result_do_highlight(do_high);
+        }
+      }
+    };
+    Chosen.prototype.no_results = function(terms) {
+      var no_results_html;
+      no_results_html = $('<li class="no-results">' + this.results_none_found + ' "<span></span>"</li>');
+      no_results_html.find("span").first().html(terms);
+      return this.search_results.append(no_results_html);
+    };
+    Chosen.prototype.no_results_clear = function() {
+      return this.search_results.find(".no-results").remove();
+    };
+    Chosen.prototype.keydown_arrow = function() {
+      var first_active, next_sib;
+      if (!this.result_highlight) {
+        first_active = this.search_results.find("li.active-result").first();
+        if (first_active) {
+          this.result_do_highlight($(first_active));
+        }
+      } else if (this.results_showing) {
+        next_sib = this.result_highlight.nextAll("li.active-result").first();
+        if (next_sib) {
+          this.result_do_highlight(next_sib);
+        }
+      }
+      if (!this.results_showing) {
+        return this.results_show();
+      }
+    };
+    Chosen.prototype.keyup_arrow = function() {
+      var prev_sibs;
+      if (!this.results_showing && !this.is_multiple) {
+        return this.results_show();
+      } else if (this.result_highlight) {
+        prev_sibs = this.result_highlight.prevAll("li.active-result");
+        if (prev_sibs.length) {
+          return this.result_do_highlight(prev_sibs.first());
+        } else {
+          if (this.choices > 0) {
+            this.results_hide();
+          }
+          return this.result_clear_highlight();
+        }
+      }
+    };
+    Chosen.prototype.keydown_backstroke = function() {
+      if (this.pending_backstroke) {
+        this.choice_destroy(this.pending_backstroke.find("a").first());
+        return this.clear_backstroke();
+      } else {
+        this.pending_backstroke = this.search_container.siblings("li.search-choice").last();
+        return this.pending_backstroke.addClass("search-choice-focus");
+      }
+    };
+    Chosen.prototype.clear_backstroke = function() {
+      if (this.pending_backstroke) {
+        this.pending_backstroke.removeClass("search-choice-focus");
+      }
+      return this.pending_backstroke = null;
+    };
+    Chosen.prototype.keyup_checker = function(evt) {
+      var stroke, _ref;
+      stroke = (_ref = evt.which) != null ? _ref : evt.keyCode;
+      this.search_field_scale();
+      switch (stroke) {
+        case 8:
+          if (this.is_multiple && this.backstroke_length < 1 && this.choices > 0) {
+            return this.keydown_backstroke();
+          } else if (!this.pending_backstroke) {
+            this.result_clear_highlight();
+            return this.results_search();
+          }
+          break;
+        case 13:
+          evt.preventDefault();
+          if (this.results_showing) {
+            return this.result_select(evt);
+          }
+          break;
+        case 27:
+          if (this.results_showing) {
+            return this.results_hide();
+          }
+          break;
+        case 9:
+        case 38:
+        case 40:
+        case 16:
+        case 91:
+        case 17:
+          break;
+        default:
+          return this.results_search();
+      }
+    };
+    Chosen.prototype.keydown_checker = function(evt) {
+      var stroke, _ref;
+      stroke = (_ref = evt.which) != null ? _ref : evt.keyCode;
+      this.search_field_scale();
+      if (stroke !== 8 && this.pending_backstroke) {
+        this.clear_backstroke();
+      }
+      switch (stroke) {
+        case 8:
+          this.backstroke_length = this.search_field.val().length;
+          break;
+        case 9:
+          this.mouse_on_container = false;
+          break;
+        case 13:
+          evt.preventDefault();
+          break;
+        case 38:
+          evt.preventDefault();
+          this.keyup_arrow();
+          break;
+        case 40:
+          this.keydown_arrow();
+          break;
+      }
+    };
+    Chosen.prototype.search_field_scale = function() {
+      var dd_top, div, h, style, style_block, styles, w, _i, _len;
+      if (this.is_multiple) {
+        h = 0;
+        w = 0;
+        style_block = "position:absolute; left: -1000px; top: -1000px; display:none;";
+        styles = ['font-size', 'font-style', 'font-weight', 'font-family', 'line-height', 'text-transform', 'letter-spacing'];
+        for (_i = 0, _len = styles.length; _i < _len; _i++) {
+          style = styles[_i];
+          style_block += style + ":" + this.search_field.css(style) + ";";
+        }
+        div = $('<div />', {
+          'style': style_block
+        });
+        div.text(this.search_field.val());
+        $('body').append(div);
+        w = div.width() + 25;
+        div.remove();
+        if (w > this.f_width - 10) {
+          w = this.f_width - 10;
+        }
+        this.search_field.css({
+          'width': w + 'px'
+        });
+        dd_top = this.container.height();
+        return this.dropdown.css({
+          "top": dd_top + "px"
+        });
+      }
+    };
+    Chosen.prototype.generate_field_id = function() {
+      var new_id;
+      new_id = this.generate_random_id();
+      this.form_field.id = new_id;
+      return new_id;
+    };
+    Chosen.prototype.generate_random_id = function() {
+      var string;
+      string = "sel" + this.generate_random_char() + this.generate_random_char() + this.generate_random_char();
+      while ($("#" + string).length > 0) {
+        string += this.generate_random_char();
+      }
+      return string;
+    };
+    Chosen.prototype.generate_random_char = function() {
+      var chars, newchar, rand;
+      chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZ";
+      rand = Math.floor(Math.random() * chars.length);
+      return newchar = chars.substring(rand, rand + 1);
+    };
+    return Chosen;
+  })();
+  get_side_border_padding = function(elmt) {
+    var side_border_padding;
+    return side_border_padding = elmt.outerWidth() - elmt.width();
+  };
+  root.get_side_border_padding = get_side_border_padding;
+}).call(this);
+(function() {
+  var SelectParser;
+  SelectParser = (function() {
+    function SelectParser() {
+      this.options_index = 0;
+      this.parsed = [];
+    }
+    SelectParser.prototype.add_node = function(child) {
+      if (child.nodeName === "OPTGROUP") {
+        return this.add_group(child);
+      } else {
+        return this.add_option(child);
+      }
+    };
+    SelectParser.prototype.add_group = function(group) {
+      var group_position, option, _i, _len, _ref, _results;
+      group_position = this.parsed.length;
+      this.parsed.push({
+        array_index: group_position,
+        group: true,
+        label: group.label,
+        children: 0,
+        disabled: group.disabled
+      });
+      _ref = group.childNodes;
+      _results = [];
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        option = _ref[_i];
+        _results.push(this.add_option(option, group_position, group.disabled));
+      }
+      return _results;
+    };
+    SelectParser.prototype.add_option = function(option, group_position, group_disabled) {
+      if (option.nodeName === "OPTION") {
+        if (option.text !== "") {
+          if (group_position != null) {
+            this.parsed[group_position].children += 1;
+          }
+          this.parsed.push({
+            array_index: this.parsed.length,
+            options_index: this.options_index,
+            value: option.value,
+            text: option.text,
+            html: option.innerHTML,
+            selected: option.selected,
+            disabled: group_disabled === true ? group_disabled : option.disabled,
+            group_array_index: group_position,
+            classes: option.className,
+            style: option.style.cssText
+          });
+        } else {
+          this.parsed.push({
+            array_index: this.parsed.length,
+            options_index: this.options_index,
+            empty: true
+          });
+        }
+        return this.options_index += 1;
+      }
+    };
+    return SelectParser;
+  })();
+  SelectParser.select_to_array = function(select) {
+    var child, parser, _i, _len, _ref;
+    parser = new SelectParser();
+    _ref = select.childNodes;
+    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+      child = _ref[_i];
+      parser.add_node(child);
+    }
+    return parser.parsed;
+  };
+  this.SelectParser = SelectParser;
+}).call(this);
diff --git a/3rdparty/js/chosen/chosen.jquery.min.js b/3rdparty/js/chosen/chosen.jquery.min.js
new file mode 100644
index 00000000000..371ee53e7a3
--- /dev/null
+++ b/3rdparty/js/chosen/chosen.jquery.min.js
@@ -0,0 +1,10 @@
+// Chosen, a Select Box Enhancer for jQuery and Protoype
+// by Patrick Filler for Harvest, http://getharvest.com
+// 
+// Version 0.9.5
+// Full source at https://github.com/harvesthq/chosen
+// Copyright (c) 2011 Harvest http://getharvest.com
+
+// MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
+// This file is generated by `cake build`, do not edit it by hand.
+(function(){var a,b,c,d,e=function(a,b){return function(){return a.apply(b,arguments)}};d=this,a=jQuery,a.fn.extend({chosen:function(c){return a.browser!=="msie"||a.browser.version!=="6.0"&&a.browser.version!=="7.0"?a(this).each(function(d){if(!a(this).hasClass("chzn-done"))return new b(this,c)}):this}}),b=function(){function b(b,c){this.form_field=b,this.options=c!=null?c:{},this.set_default_values(),this.form_field_jq=a(this.form_field),this.is_multiple=this.form_field.multiple,this.is_rtl=this.form_field_jq.hasClass("chzn-rtl"),this.default_text_default=this.form_field.multiple?"Select Some Options":"Select an Option",this.set_up_html(),this.register_observers(),this.form_field_jq.addClass("chzn-done")}b.prototype.set_default_values=function(){this.click_test_action=e(function(a){return this.test_active_click(a)},this),this.activate_action=e(function(a){return this.activate_field(a)},this),this.active_field=!1,this.mouse_on_container=!1,this.results_showing=!1,this.result_highlighted=null,this.result_single_selected=null,this.allow_single_deselect=this.options.allow_single_deselect!=null&&this.form_field.options[0].text===""?this.options.allow_single_deselect:!1,this.disable_search_threshold=this.options.disable_search_threshold||0,this.choices=0;return this.results_none_found=this.options.no_results_text||"No results match"},b.prototype.set_up_html=function(){var b,d,e,f;this.container_id=this.form_field.id.length?this.form_field.id.replace(/(:|\.)/g,"_"):this.generate_field_id(),this.container_id+="_chzn",this.f_width=this.form_field_jq.outerWidth(),this.default_text=this.form_field_jq.data("placeholder")?this.form_field_jq.data("placeholder"):this.default_text_default,b=a("<div />",{id:this.container_id,"class":"chzn-container"+(this.is_rtl?" chzn-rtl":""),style:"width: "+this.f_width+"px;"}),this.is_multiple?b.html('<ul class="chzn-choices"><li class="search-field"><input type="text" value="'+this.default_text+'" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chzn-drop" style="left:-9000px;"><ul class="chzn-results"></ul></div>'):b.html('<a href="javascript:void(0)" class="chzn-single"><span>'+this.default_text+'</span><div><b></b></div></a><div class="chzn-drop" style="left:-9000px;"><div class="chzn-search"><input type="text" autocomplete="off" /></div><ul class="chzn-results"></ul></div>'),this.form_field_jq.hide().after(b),this.container=a("#"+this.container_id),this.container.addClass("chzn-container-"+(this.is_multiple?"multi":"single")),!this.is_multiple&&this.form_field.options.length<=this.disable_search_threshold&&this.container.addClass("chzn-container-single-nosearch"),this.dropdown=this.container.find("div.chzn-drop").first(),d=this.container.height(),e=this.f_width-c(this.dropdown),this.dropdown.css({width:e+"px",top:d+"px"}),this.search_field=this.container.find("input").first(),this.search_results=this.container.find("ul.chzn-results").first(),this.search_field_scale(),this.search_no_results=this.container.find("li.no-results").first(),this.is_multiple?(this.search_choices=this.container.find("ul.chzn-choices").first(),this.search_container=this.container.find("li.search-field").first()):(this.search_container=this.container.find("div.chzn-search").first(),this.selected_item=this.container.find(".chzn-single").first(),f=e-c(this.search_container)-c(this.search_field),this.search_field.css({width:f+"px"})),this.results_build();return this.set_tab_index()},b.prototype.register_observers=function(){this.container.mousedown(e(function(a){return this.container_mousedown(a)},this)),this.container.mouseup(e(function(a){return this.container_mouseup(a)},this)),this.container.mouseenter(e(function(a){return this.mouse_enter(a)},this)),this.container.mouseleave(e(function(a){return this.mouse_leave(a)},this)),this.search_results.mouseup(e(function(a){return this.search_results_mouseup(a)},this)),this.search_results.mouseover(e(function(a){return this.search_results_mouseover(a)},this)),this.search_results.mouseout(e(function(a){return this.search_results_mouseout(a)},this)),this.form_field_jq.bind("liszt:updated",e(function(a){return this.results_update_field(a)},this)),this.search_field.blur(e(function(a){return this.input_blur(a)},this)),this.search_field.keyup(e(function(a){return this.keyup_checker(a)},this)),this.search_field.keydown(e(function(a){return this.keydown_checker(a)},this));if(this.is_multiple){this.search_choices.click(e(function(a){return this.choices_click(a)},this));return this.search_field.focus(e(function(a){return this.input_focus(a)},this))}},b.prototype.search_field_disabled=function(){this.is_disabled=this.form_field_jq.attr("disabled");if(this.is_disabled){this.container.addClass("chzn-disabled"),this.search_field.attr("disabled",!0),this.is_multiple||this.selected_item.unbind("focus",this.activate_action);return this.close_field()}this.container.removeClass("chzn-disabled"),this.search_field.attr("disabled",!1);if(!this.is_multiple)return this.selected_item.bind("focus",this.activate_action)},b.prototype.container_mousedown=function(b){var c;if(!this.is_disabled){c=b!=null?a(b.target).hasClass("search-choice-close"):!1,b&&b.type==="mousedown"&&b.stopPropagation();if(!this.pending_destroy_click&&!c){this.active_field?!this.is_multiple&&b&&(a(b.target)===this.selected_item||a(b.target).parents("a.chzn-single").length)&&(b.preventDefault(),this.results_toggle()):(this.is_multiple&&this.search_field.val(""),a(document).click(this.click_test_action),this.results_show());return this.activate_field()}return this.pending_destroy_click=!1}},b.prototype.container_mouseup=function(a){if(a.target.nodeName==="ABBR")return this.results_reset(a)},b.prototype.mouse_enter=function(){return this.mouse_on_container=!0},b.prototype.mouse_leave=function(){return this.mouse_on_container=!1},b.prototype.input_focus=function(a){if(!this.active_field)return setTimeout(e(function(){return this.container_mousedown()},this),50)},b.prototype.input_blur=function(a){if(!this.mouse_on_container){this.active_field=!1;return setTimeout(e(function(){return this.blur_test()},this),100)}},b.prototype.blur_test=function(a){if(!this.active_field&&this.container.hasClass("chzn-container-active"))return this.close_field()},b.prototype.close_field=function(){a(document).unbind("click",this.click_test_action),this.is_multiple||(this.selected_item.attr("tabindex",this.search_field.attr("tabindex")),this.search_field.attr("tabindex",-1)),this.active_field=!1,this.results_hide(),this.container.removeClass("chzn-container-active"),this.winnow_results_clear(),this.clear_backstroke(),this.show_search_field_default();return this.search_field_scale()},b.prototype.activate_field=function(){!this.is_multiple&&!this.active_field&&(this.search_field.attr("tabindex",this.selected_item.attr("tabindex")),this.selected_item.attr("tabindex",-1)),this.container.addClass("chzn-container-active"),this.active_field=!0,this.search_field.val(this.search_field.val());return this.search_field.focus()},b.prototype.test_active_click=function(b){return a(b.target).parents("#"+this.container_id).length?this.active_field=!0:this.close_field()},b.prototype.results_build=function(){var a,b,c,e,f,g;c=new Date,this.parsing=!0,this.results_data=d.SelectParser.select_to_array(this.form_field),this.is_multiple&&this.choices>0?(this.search_choices.find("li.search-choice").remove(),this.choices=0):this.is_multiple||this.selected_item.find("span").text(this.default_text),a="",g=this.results_data;for(e=0,f=g.length;e<f;e++)b=g[e],b.group?a+=this.result_add_group(b):b.empty||(a+=this.result_add_option(b),b.selected&&this.is_multiple?this.choice_build(b):b.selected&&!this.is_multiple&&(this.selected_item.find("span").text(b.text),this.allow_single_deselect&&this.selected_item.find("span").first().after('<abbr class="search-choice-close"></abbr>')));this.search_field_disabled(),this.show_search_field_default(),this.search_field_scale(),this.search_results.html(a);return this.parsing=!1},b.prototype.result_add_group=function(b){if(!b.disabled){b.dom_id=this.container_id+"_g_"+b.array_index;return'<li id="'+b.dom_id+'" class="group-result">'+a("<div />").text(b.label).html()+"</li>"}return""},b.prototype.result_add_option=function(a){var b,c;if(!a.disabled){a.dom_id=this.container_id+"_o_"+a.array_index,b=a.selected&&this.is_multiple?[]:["active-result"],a.selected&&b.push("result-selected"),a.group_array_index!=null&&b.push("group-option"),a.classes!==""&&b.push(a.classes),c=a.style.cssText!==""?' style="'+a.style+'"':"";return'<li id="'+a.dom_id+'" class="'+b.join(" ")+'"'+c+">"+a.html+"</li>"}return""},b.prototype.results_update_field=function(){this.result_clear_highlight(),this.result_single_selected=null;return this.results_build()},b.prototype.result_do_highlight=function(a){var b,c,d,e,f;if(a.length){this.result_clear_highlight(),this.result_highlight=a,this.result_highlight.addClass("highlighted"),d=parseInt(this.search_results.css("maxHeight"),10),f=this.search_results.scrollTop(),e=d+f,c=this.result_highlight.position().top+this.search_results.scrollTop(),b=c+this.result_highlight.outerHeight();if(b>=e)return this.search_results.scrollTop(b-d>0?b-d:0);if(c<f)return this.search_results.scrollTop(c)}},b.prototype.result_clear_highlight=function(){this.result_highlight&&this.result_highlight.removeClass("highlighted");return this.result_highlight=null},b.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},b.prototype.results_show=function(){var a;this.is_multiple||(this.selected_item.addClass("chzn-single-with-drop"),this.result_single_selected&&this.result_do_highlight(this.result_single_selected)),a=this.is_multiple?this.container.height():this.container.height()-1,this.dropdown.css({top:a+"px",left:0}),this.results_showing=!0,this.search_field.focus(),this.search_field.val(this.search_field.val());return this.winnow_results()},b.prototype.results_hide=function(){this.is_multiple||this.selected_item.removeClass("chzn-single-with-drop"),this.result_clear_highlight(),this.dropdown.css({left:"-9000px"});return this.results_showing=!1},b.prototype.set_tab_index=function(a){var b;if(this.form_field_jq.attr("tabindex")){b=this.form_field_jq.attr("tabindex"),this.form_field_jq.attr("tabindex",-1);if(this.is_multiple)return this.search_field.attr("tabindex",b);this.selected_item.attr("tabindex",b);return this.search_field.attr("tabindex",-1)}},b.prototype.show_search_field_default=function(){if(this.is_multiple&&this.choices<1&&!this.active_field){this.search_field.val(this.default_text);return this.search_field.addClass("default")}this.search_field.val("");return this.search_field.removeClass("default")},b.prototype.search_results_mouseup=function(b){var c;c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first();if(c.length){this.result_highlight=c;return this.result_select(b)}},b.prototype.search_results_mouseover=function(b){var c;c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first();if(c)return this.result_do_highlight(c)},b.prototype.search_results_mouseout=function(b){if(a(b.target).hasClass("active-result"))return this.result_clear_highlight()},b.prototype.choices_click=function(b){b.preventDefault();if(this.active_field&&!a(b.target).hasClass("search-choice")&&!this.results_showing)return this.results_show()},b.prototype.choice_build=function(b){var c,d;c=this.container_id+"_c_"+b.array_index,this.choices+=1,this.search_container.before('<li class="search-choice" id="'+c+'"><span>'+b.html+'</span><a href="javascript:void(0)" class="search-choice-close" rel="'+b.array_index+'"></a></li>'),d=a("#"+c).find("a").first();return d.click(e(function(a){return this.choice_destroy_link_click(a)},this))},b.prototype.choice_destroy_link_click=function(b){b.preventDefault();if(!this.is_disabled){this.pending_destroy_click=!0;return this.choice_destroy(a(b.target))}return b.stopPropagation},b.prototype.choice_destroy=function(a){this.choices-=1,this.show_search_field_default(),this.is_multiple&&this.choices>0&&this.search_field.val().length<1&&this.results_hide(),this.result_deselect(a.attr("rel"));return a.parents("li").first().remove()},b.prototype.results_reset=function(b){this.form_field.options[0].selected=!0,this.selected_item.find("span").text(this.default_text),this.show_search_field_default(),a(b.target).remove(),this.form_field_jq.trigger("change");if(this.active_field)return this.results_hide()},b.prototype.result_select=function(a){var b,c,d,e;if(this.result_highlight){b=this.result_highlight,c=b.attr("id"),this.result_clear_highlight(),this.is_multiple?this.result_deactivate(b):(this.search_results.find(".result-selected").removeClass("result-selected"),this.result_single_selected=b),b.addClass("result-selected"),e=c.substr(c.lastIndexOf("_")+1),d=this.results_data[e],d.selected=!0,this.form_field.options[d.options_index].selected=!0,this.is_multiple?this.choice_build(d):(this.selected_item.find("span").first().text(d.text),this.allow_single_deselect&&this.selected_item.find("span").first().after('<abbr class="search-choice-close"></abbr>')),(!a.metaKey||!this.is_multiple)&&this.results_hide(),this.search_field.val(""),this.form_field_jq.trigger("change");return this.search_field_scale()}},b.prototype.result_activate=function(a){return a.addClass("active-result")},b.prototype.result_deactivate=function(a){return a.removeClass("active-result")},b.prototype.result_deselect=function(b){var c,d;d=this.results_data[b],d.selected=!1,this.form_field.options[d.options_index].selected=!1,c=a("#"+this.container_id+"_o_"+b),c.removeClass("result-selected").addClass("active-result").show(),this.result_clear_highlight(),this.winnow_results(),this.form_field_jq.trigger("change");return this.search_field_scale()},b.prototype.results_search=function(a){return this.results_showing?this.winnow_results():this.results_show()},b.prototype.winnow_results=function(){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r;j=new Date,this.no_results_clear(),h=0,i=this.search_field.val()===this.default_text?"":a("<div/>").text(a.trim(this.search_field.val())).html(),f=new RegExp("^"+i.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),m=new RegExp(i.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),r=this.results_data;for(n=0,p=r.length;n<p;n++){c=r[n];if(!c.disabled&&!c.empty)if(c.group)a("#"+c.dom_id).hide();else if(!this.is_multiple||!c.selected){b=!1,g=c.dom_id;if(f.test(c.html))b=!0,h+=1;else if(c.html.indexOf(" ")>=0||c.html.indexOf("[")===0){e=c.html.replace(/\[|\]/g,"").split(" ");if(e.length)for(o=0,q=e.length;o<q;o++)d=e[o],f.test(d)&&(b=!0,h+=1)}b?(i.length?(k=c.html.search(m),l=c.html.substr(0,k+i.length)+"</em>"+c.html.substr(k+i.length),l=l.substr(0,k)+"<em>"+l.substr(k)):l=c.html,a("#"+g).html!==l&&a("#"+g).html(l),this.result_activate(a("#"+g)),c.group_array_index!=null&&a("#"+this.results_data[c.group_array_index].dom_id).show()):(this.result_highlight&&g===this.result_highlight.attr("id")&&this.result_clear_highlight(),this.result_deactivate(a("#"+g)))}}return h<1&&i.length?this.no_results(i):this.winnow_results_set_highlight()},b.prototype.winnow_results_clear=function(){var b,c,d,e,f;this.search_field.val(""),c=this.search_results.find("li"),f=[];for(d=0,e=c.length;d<e;d++)b=c[d],b=a(b),f.push(b.hasClass("group-result")?b.show():!this.is_multiple||!b.hasClass("result-selected")?this.result_activate(b):void 0);return f},b.prototype.winnow_results_set_highlight=function(){var a,b;if(!this.result_highlight){b=this.is_multiple?[]:this.search_results.find(".result-selected.active-result"),a=b.length?b.first():this.search_results.find(".active-result").first();if(a!=null)return this.result_do_highlight(a)}},b.prototype.no_results=function(b){var c;c=a('<li class="no-results">'+this.results_none_found+' "<span></span>"</li>'),c.find("span").first().html(b);return this.search_results.append(c)},b.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()},b.prototype.keydown_arrow=function(){var b,c;this.result_highlight?this.results_showing&&(c=this.result_highlight.nextAll("li.active-result").first(),c&&this.result_do_highlight(c)):(b=this.search_results.find("li.active-result").first(),b&&this.result_do_highlight(a(b)));if(!this.results_showing)return this.results_show()},b.prototype.keyup_arrow=function(){var a;if(!this.results_showing&&!this.is_multiple)return this.results_show();if(this.result_highlight){a=this.result_highlight.prevAll("li.active-result");if(a.length)return this.result_do_highlight(a.first());this.choices>0&&this.results_hide();return this.result_clear_highlight()}},b.prototype.keydown_backstroke=function(){if(this.pending_backstroke){this.choice_destroy(this.pending_backstroke.find("a").first());return this.clear_backstroke()}this.pending_backstroke=this.search_container.siblings("li.search-choice").last();return this.pending_backstroke.addClass("search-choice-focus")},b.prototype.clear_backstroke=function(){this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus");return this.pending_backstroke=null},b.prototype.keyup_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale();switch(b){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices>0)return this.keydown_backstroke();if(!this.pending_backstroke){this.result_clear_highlight();return this.results_search()}break;case 13:a.preventDefault();if(this.results_showing)return this.result_select(a);break;case 27:if(this.results_showing)return this.results_hide();break;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}},b.prototype.keydown_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale(),b!==8&&this.pending_backstroke&&this.clear_backstroke();switch(b){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.mouse_on_container=!1;break;case 13:a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:this.keydown_arrow()}},b.prototype.search_field_scale=function(){var b,c,d,e,f,g,h,i,j;if(this.is_multiple){d=0,h=0,f="position:absolute; left: -1000px; top: -1000px; display:none;",g=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"];for(i=0,j=g.length;i<j;i++)e=g[i],f+=e+":"+this.search_field.css(e)+";";c=a("<div />",{style:f}),c.text(this.search_field.val()),a("body").append(c),h=c.width()+25,c.remove(),h>this.f_width-10&&(h=this.f_width-10),this.search_field.css({width:h+"px"}),b=this.container.height();return this.dropdown.css({top:b+"px"})}},b.prototype.generate_field_id=function(){var a;a=this.generate_random_id(),this.form_field.id=a;return a},b.prototype.generate_random_id=function(){var b;b="sel"+this.generate_random_char()+this.generate_random_char()+this.generate_random_char();while(a("#"+b).length>0)b+=this.generate_random_char();return b},b.prototype.generate_random_char=function(){var a,b,c;a="0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZ",c=Math.floor(Math.random()*a.length);return b=a.substring(c,c+1)};return b}(),c=function(a){var b;return b=a.outerWidth()-a.width()},d.get_side_border_padding=c}).call(this),function(){var a;a=function(){function a(){this.options_index=0,this.parsed=[]}a.prototype.add_node=function(a){return a.nodeName==="OPTGROUP"?this.add_group(a):this.add_option(a)},a.prototype.add_group=function(a){var b,c,d,e,f,g;b=this.parsed.length,this.parsed.push({array_index:b,group:!0,label:a.label,children:0,disabled:a.disabled}),f=a.childNodes,g=[];for(d=0,e=f.length;d<e;d++)c=f[d],g.push(this.add_option(c,b,a.disabled));return g},a.prototype.add_option=function(a,b,c){if(a.nodeName==="OPTION"){a.text!==""?(b!=null&&(this.parsed[b].children+=1),this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:a.value,text:a.text,html:a.innerHTML,selected:a.selected,disabled:c===!0?c:a.disabled,group_array_index:b,classes:a.className,style:a.style.cssText})):this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:!0});return this.options_index+=1}};return a}(),a.select_to_array=function(b){var c,d,e,f,g;d=new a,g=b.childNodes;for(e=0,f=g.length;e<f;e++)c=g[e],d.add_node(c);return d.parsed},this.SelectParser=a}.call(this)
\ No newline at end of file
diff --git a/3rdparty/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE b/3rdparty/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
new file mode 100755
index 00000000000..a65e83e8762
--- /dev/null
+++ b/3rdparty/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
@@ -0,0 +1,399 @@
+Simple Test interface changes
+=============================
+Because the SimpleTest tool set is still evolving it is likely that tests
+written with earlier versions will fail with the newest ones. The most
+dramatic changes are in the alpha releases. Here is a list of possible
+problems and their fixes...
+
+assertText() no longer finds a string inside a <script> tag
+-----------------------------------------------------------
+The assertText() method is intended to match only visible,
+human-readable text on the web page. Therefore, the contents of script
+tags should not be matched by this assertion. However there was a bug
+in the text normalisation code of simpletest which meant that <script>
+tags spanning multiple lines would not have their content stripped
+out. If you want to check the content of a <script> tag, use
+assertPattern(), or write a custom expectation.
+
+Overloaded method not working
+-----------------------------
+All protected and private methods had underscores
+removed. This means that any private/protected methods that
+you overloaded with those names need to be updated.
+
+Fatal error: Call to undefined method Classname::classname()
+------------------------------------------------------------
+SimpleTest renamed all of its constructors from 
+Classname to __construct; derived classes invoking
+their parent constructors should replace parent::Classname()
+with parent::__construct().
+
+Custom CSS in HtmlReporter not being applied
+--------------------------------------------
+Batch rename of protected and private methods 
+means that _getCss() was renamed to getCss().
+Please rename your method and it should work again.
+
+setReturnReference() throws errors in E_STRICT
+----------------------------------------------
+Happens when an object is passed by reference.
+This also happens with setReturnReferenceAt().
+If you want to return objects then replace these
+with calls to returns() and returnsAt() with the
+same arguments. This change was forced in the 1.1
+version for E_STRICT compatibility.
+
+assertReference() throws errors in E_STRICT
+-------------------------------------------
+Due to language restrictions you cannot compare
+both variables and objects in E_STRICT mode. Use
+assertSame() in this mode with objects. This change
+was forced the 1.1 version.
+
+Cannot create GroupTest
+-----------------------
+The GroupTest has been renamed TestSuite (see below).
+It was removed completely in 1.1 in favour of this
+name.
+
+No method getRelativeUrls() or getAbsoluteUrls()
+------------------------------------------------
+These methods were always a bit weird anyway, and
+the new parsing of the base tag makes them more so.
+They have been replaced with getUrls() instead. If
+you want the old functionality then simply chop
+off the current domain from getUrls().
+
+Method setWildcard() removed in mocks
+-------------------------------------
+Even setWildcard() has been removed in 1.0.1beta now.
+If you want to test explicitely for a '*' string, then
+simply pass in new IdenticalExpectation('*') instead.
+
+No method _getTest() on mocks
+-----------------------------
+This has finally been removed. It was a pretty esoteric
+flex point anyway. It was there to allow the mocks to
+work with other test tools, but no one does this.
+
+No method assertError(), assertNoErrors(), swallowErrors()
+----------------------------------------------------------
+These have been deprecated in 1.0.1beta in favour of
+expectError() and expectException(). assertNoErrors() is
+redundant if you use expectError() as failures are now reported
+immediately.
+
+No method TestCase::signal()
+----------------------------
+This has been deprecated in favour of triggering an error or
+throwing an exception. Deprecated as of 1.0.1beta.
+
+No method TestCase::sendMessage()
+---------------------------------
+This has been deprecated as of 1.0.1beta.
+
+Failure to connect now emits failures
+-------------------------------------
+It used to be that you would have to use the
+getTransferError() call on the web tester to see if
+there was a socket level error in a fetch. This check
+is now always carried out by the WebTestCase unless
+the fetch is prefaced with WebTestCase::ignoreErrors().
+The ignore directive only lasts for the next fetching
+action such as get() and click().
+
+No method SimpleTestOptions::ignore()
+-------------------------------------
+This is deprecated in version 1.0.1beta and has been moved
+to SimpleTest::ignore() as that is more readable. In
+addition, parent classes are also ignored automatically.
+If you are using PHP5 you can skip this directive simply
+by marking your test case as abstract.
+
+No method assertCopy()
+----------------------
+This is deprecated in 1.0.1 in favour of assertClone().
+The assertClone() method is slightly different in that
+the objects must be identical, but without being a
+reference. It is thus not a strict inversion of
+assertReference().
+
+Constructor wildcard override has no effect in mocks
+----------------------------------------------------
+As of 1.0.1beta this is now set with setWildcard() instead
+of in the constructor.
+
+No methods setStubBaseClass()/getStubBaseClass()
+------------------------------------------------
+As mocks are now used instead of stubs, these methods
+stopped working and are now removed as of the 1.0.1beta
+release. The mock objects may be freely used instead.
+
+No method addPartialMockCode()
+------------------------------
+The ability to insert arbitrary partial mock code
+has been removed. This was a low value feature
+causing needless complications. It was removed
+in the 1.0.1beta release.
+
+No method setMockBaseClass()
+----------------------------
+The ability to change the mock base class has been
+scheduled for removal and is deprecated since the
+1.0.1beta version. This was a rarely used feature
+except as a workaround for PHP5 limitations. As
+these limitations are being resolved it's hoped
+that the bundled mocks can be used directly.
+
+No class Stub
+-------------
+Server stubs are deprecated from 1.0.1 as the mocks now
+have exactly the same interface. Just use mock objects
+instead.
+
+No class SimpleTestOptions
+--------------------------
+This was replced by the shorter SimpleTest in 1.0.1beta1
+and is since deprecated.
+
+No file simple_test.php
+-----------------------
+This was renamed test_case.php in 1.0.1beta to more accurately
+reflect it's purpose. This file should never be directly
+included in test suites though, as it's part of the
+underlying mechanics and has a tendency to be refactored.
+
+No class WantedPatternExpectation
+---------------------------------
+This was deprecated in 1.0.1alpha in favour of the simpler
+name PatternExpectation.
+
+No class NoUnwantedPatternExpectation
+-------------------------------------
+This was deprecated in 1.0.1alpha in favour of the simpler
+name NoPatternExpectation.
+
+No method assertNoUnwantedPattern()
+-----------------------------------
+This has been renamed to assertNoPattern() in 1.0.1alpha and
+the old form is deprecated.
+
+No method assertWantedPattern()
+-------------------------------
+This has been renamed to assertPattern() in 1.0.1alpha and
+the old form is deprecated.
+
+No method assertExpectation()
+-----------------------------
+This was renamed as assert() in 1.0.1alpha and the old form
+has been deprecated.
+
+No class WildcardExpectation
+----------------------------
+This was a mostly internal class for the mock objects. It was
+renamed AnythingExpectation to bring it closer to JMock and
+NMock in version 1.0.1alpha.
+
+Missing UnitTestCase::assertErrorPattern()
+------------------------------------------
+This method is deprecated for version 1.0.1 onwards.
+This method has been subsumed by assertError() that can now
+take an expectation. Simply pass a PatternExpectation
+into assertError() to simulate the old behaviour.
+
+No HTML when matching page elements
+-----------------------------------
+This behaviour has been switched to using plain text as if it
+were seen by the user of the browser. This means that HTML tags
+are suppressed, entities are converted and whitespace is
+normalised. This should make it easier to match items in forms.
+Also images are replaced with their "alt" text so that they
+can be matched as well.
+
+No method SimpleRunner::_getTestCase()
+--------------------------------------
+This was made public as getTestCase() in 1.0RC2.
+
+No method restartSession()
+--------------------------
+This was renamed to restart() in the WebTestCase, SimpleBrowser
+and the underlying SimpleUserAgent in 1.0RC2. Because it was
+undocumented anyway, no attempt was made at backward
+compatibility.
+
+My custom test case ignored by tally()
+--------------------------------------
+The _assertTrue method has had it's signature changed due to a bug
+in the PHP 5.0.1 release. You must now use getTest() from within
+that method to get the test case. Mock compatibility with other
+unit testers is now deprecated as of 1.0.1alpha as PEAR::PHPUnit2
+should soon have mock support of it's own.
+
+Broken code extending SimpleRunner
+----------------------------------
+This was replaced with SimpleScorer so that I could use the runner
+name in another class. This happened in RC1 development and there
+is no easy backward compatibility fix. The solution is simply to
+extend SimpleScorer instead.
+
+Missing method getBaseCookieValue()
+-----------------------------------
+This was renamed getCurrentCookieValue() in RC1.
+
+Missing files from the SimpleTest suite
+---------------------------------------
+Versions of SimpleTest prior to Beta6 required a SIMPLE_TEST constant
+to point at the SimpleTest folder location before any of the toolset
+was loaded. This is no longer documented as it is now unnecessary
+for later versions. If you are using an earlier version you may
+need this constant. Consult the documentation that was bundled with
+the release that you are using or upgrade to Beta6 or later.
+
+No method SimpleBrowser::getCurrentUrl()
+--------------------------------------
+This is replaced with the more versatile showRequest() for
+debugging. It only existed in this context for version Beta5.
+Later versions will have SimpleBrowser::getHistory() for tracking
+paths through pages. It is renamed as getUrl() since 1.0RC1.
+
+No method Stub::setStubBaseClass()
+----------------------------------
+This method has finally been removed in 1.0RC1. Use
+SimpleTestOptions::setStubBaseClass() instead.
+
+No class CommandLineReporter
+----------------------------
+This was renamed to TextReporter in Beta3 and the deprecated version
+was removed in 1.0RC1.
+
+No method requireReturn()
+-------------------------
+This was deprecated in Beta3 and is now removed.
+
+No method expectCookie()
+------------------------
+This method was abruptly removed in Beta4 so as to simplify the internals
+until another mechanism can replace it. As a workaround it is necessary
+to assert that the cookie has changed by setting it before the page
+fetch and then assert the desired value.
+
+No method clickSubmitByFormId()
+-------------------------------
+This method had an incorrect name as no button was involved. It was
+renamed to submitByFormId() in Beta4 and the old version deprecated.
+Now removed.
+
+No method paintStart() or paintEnd()
+------------------------------------
+You should only get this error if you have subclassed the lower level
+reporting and test runner machinery. These methods have been broken
+down into events for test methods, events for test cases and events
+for group tests. The new methods are...
+
+paintStart() --> paintMethodStart(), paintCaseStart(), paintGroupStart()
+paintEnd() --> paintMethodEnd(), paintCaseEnd(), paintGroupEnd()
+
+This change was made in Beta3, ironically to make it easier to subclass
+the inner machinery. Simply duplicating the code you had in the previous
+methods should provide a temporary fix.
+
+No class TestDisplay
+--------------------
+This has been folded into SimpleReporter in Beta3 and is now deprecated.
+It was removed in RC1.
+
+No method WebTestCase::fetch()
+------------------------------
+This was renamed get() in Alpha8. It is removed in Beta3.
+
+No method submit()
+------------------
+This has been renamed clickSubmit() in Beta1. The old method was
+removed in Beta2.
+
+No method clearHistory()
+------------------------
+This method is deprecated in Beta2 and removed in RC1.
+
+No method getCallCount()
+------------------------
+This method has been deprecated since Beta1 and has now been
+removed. There are now more ways to set expectations on counts
+and so this method should be unecessery. Removed in RC1.
+
+Cannot find file *
+------------------
+The following public name changes have occoured...
+
+simple_html_test.php --> reporter.php
+simple_mock.php --> mock_objects.php
+simple_unit.php --> unit_tester.php
+simple_web.php --> web_tester.php
+
+The old names were deprecated in Alpha8 and removed in Beta1.
+
+No method attachObserver()
+--------------------------
+Prior to the Alpha8 release the old internal observer pattern was
+gutted and replaced with a visitor. This is to trade flexibility of
+test case expansion against the ease of writing user interfaces.
+
+Code such as...
+
+$test = &new MyTestCase();
+$test->attachObserver(new TestHtmlDisplay());
+$test->run();
+
+...should be rewritten as...
+
+$test = &new MyTestCase();
+$test->run(new HtmlReporter());
+
+If you previously attached multiple observers then the workaround
+is to run the tests twice, once with each, until they can be combined.
+For one observer the old method is simulated in Alpha 8, but is
+removed in Beta1.
+
+No class TestHtmlDisplay
+------------------------
+This class has been renamed to HtmlReporter in Alpha8. It is supported,
+but deprecated in Beta1 and removed in Beta2. If you have subclassed
+the display for your own design, then you will have to extend this
+class (HtmlReporter) instead.
+
+If you have accessed the event queue by overriding the notify() method
+then I am afraid you are in big trouble :(. The reporter is now
+carried around the test suite by the runner classes and the methods
+called directly. In the unlikely event that this is a problem and
+you don't want to upgrade the test tool then simplest is to write your
+own runner class and invoke the tests with...
+
+$test->accept(new MyRunner(new MyReporter()));
+
+...rather than the run method. This should be easier to extend
+anyway and gives much more control. Even this method is overhauled
+in Beta3 where the runner class can be set within the test case. Really
+the best thing to do is to upgrade to this version as whatever you were
+trying to achieve before should now be very much easier.
+
+Missing set options method
+--------------------------
+All test suite options are now in one class called SimpleTestOptions.
+This means that options are set differently...
+
+GroupTest::ignore() --> SimpleTestOptions::ignore()
+Mock::setMockBaseClass() --> SimpleTestOptions::setMockBaseClass()
+
+These changed in Alpha8 and the old versions are now removed in RC1.
+
+No method setExpected*()
+------------------------
+The mock expectations changed their names in Alpha4 and the old names
+ceased to be supported in Alpha8. The changes are...
+
+setExpectedArguments() --> expectArguments()
+setExpectedArgumentsSequence() --> expectArgumentsAt()
+setExpectedCallCount() --> expectCallCount()
+setMaximumCallCount() --> expectMaximumCallCount()
+
+The parameters remained the same.
diff --git a/3rdparty/simpletest/LICENSE b/3rdparty/simpletest/LICENSE
new file mode 100755
index 00000000000..09f465ab703
--- /dev/null
+++ b/3rdparty/simpletest/LICENSE
@@ -0,0 +1,502 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/3rdparty/simpletest/README b/3rdparty/simpletest/README
new file mode 100755
index 00000000000..40f41666d40
--- /dev/null
+++ b/3rdparty/simpletest/README
@@ -0,0 +1,102 @@
+SimpleTest
+==========
+
+You probably got this package from:
+
+    http://simpletest.org/en/download.html
+
+If there is no licence agreement with this package please download
+a version from the location above. You must read and accept that
+licence to use this software. The file is titled simply LICENSE.
+
+What is it? It's a framework for unit testing, web site testing and
+mock objects for PHP 5.0.5+.
+
+If you have used JUnit, you will find this PHP unit testing version very
+similar. Also included is a mock objects and server stubs generator.
+The stubs can have return values set for different arguments, can have
+sequences set also by arguments and can return items by reference.
+The mocks inherit all of this functionality and can also have
+expectations set, again in sequences and for different arguments.
+
+A web tester similar in concept to JWebUnit is also included. There is no
+JavaScript or tables support, but forms, authentication, cookies and
+frames are handled.
+
+You can see a release schedule at http://simpletest.org/en/overview.html
+which is also copied to the documentation folder with this release.
+A full PHPDocumenter API documentation exists at
+http://simpletest.org/api/.
+
+The user interface is minimal in the extreme, but a lot of information 
+flows from the test suite. After version 1.0 we will release a better 
+web UI, but we are leaving XUL and GTK versions to volunteers as 
+everybody has their own opinion on a good GUI, and we don't want to 
+discourage development by shipping one with the toolkit. You can 
+download an Eclipse plug-in separately. 
+
+The unit tests for SimpleTest itself can be run here:
+
+    test/unit_tests.php
+
+And tests involving live network connections as well are here:
+
+    test/all_tests.php
+
+The full tests will typically overrun the 8Mb limit often allowed
+to a PHP process. A workaround is to run the tests on the command
+with a custom php.ini file or with the switch -dmemory_limit=-1
+if you do not have access to your server version.
+
+The full tests read some test data from simpletest.org. If the site
+is down or has been modified for a later version then you will get
+spurious errors. A unit_tests.php failure on the other hand would be
+very serious. Please notify us if you find one.
+
+Even if all of the tests run please verify that your existing test suites
+also function as expected. The file:
+
+    HELP_MY_TESTS_DONT_WORK_ANYMORE
+
+...contains information on interface changes. It also points out
+deprecated interfaces, so you should read this even if all of
+your current tests appear to run.
+
+There is a documentation folder which contains the core reference information
+in English and French, although this information is fairly basic.
+You can find a tutorial on...
+
+    http://simpletest.org/en/first_test_tutorial.html
+
+...to get you started and this material will eventually become included
+with the project documentation. A French translation exists at:
+
+    http://simpletest.org/fr/first_test_tutorial.html
+
+If you download and use, and possibly even extend this tool, please let us
+know. Any feedback, even bad, is always welcome and we will work to get
+your suggestions into the next release. Ideally please send your
+comments to:
+
+    simpletest-support@lists.sourceforge.net
+
+...so that others can read them too. We usually try to respond within 48
+hours.
+
+There is no change log except at Sourceforge. You can visit the
+release notes to see the completed TODO list after each cycle and also the
+status of any bugs, but if the bug is recent then it will be fixed in SVN only.
+The SVN check-ins always have all the tests passing and so SVN snapshots should
+be pretty usable, although the code may not look so good internally.
+
+Oh, and one last thing: SimpleTest is called "Simple" because it should 
+be simple to use. We intend to add a complete set of tools for a test 
+first and "test as you code" type of development. "Simple" does not mean 
+"Lite" in this context. 
+
+Thanks to everyone who has sent comments and offered suggestions. They
+really are invaluable, but sadly you are too many to mention in full.
+Thanks to all on the advanced PHP forum on SitePoint, especially Harry
+Fuecks. Early adopters are always an inspiration.
+
+ -- Marcus Baker, Jason Sweat, Travis Swicegood, Perrick Penet and Edward Z. Yang.
diff --git a/3rdparty/simpletest/VERSION b/3rdparty/simpletest/VERSION
new file mode 100755
index 00000000000..9084fa2f716
--- /dev/null
+++ b/3rdparty/simpletest/VERSION
@@ -0,0 +1 @@
+1.1.0
diff --git a/3rdparty/simpletest/arguments.php b/3rdparty/simpletest/arguments.php
new file mode 100755
index 00000000000..89e7f9de6ef
--- /dev/null
+++ b/3rdparty/simpletest/arguments.php
@@ -0,0 +1,224 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: dumper.php 1909 2009-07-29 15:58:11Z dgheath $
+ */
+
+/**
+ *    Parses the command line arguments.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleArguments {
+    private $all = array();
+
+    /**
+     * Parses the command line arguments. The usual formats
+     * are supported:
+     * -f value
+     * -f=value
+     * --flag=value
+     * --flag value
+     * -f           (true)
+     * --flag       (true)
+     * @param array $arguments      Normally the PHP $argv.
+     */
+    function __construct($arguments) {
+        array_shift($arguments);
+        while (count($arguments) > 0) {
+            list($key, $value) = $this->parseArgument($arguments);
+            $this->assign($key, $value);
+        }
+    }
+
+    /**
+     * Sets the value in the argments object. If multiple
+     * values are added under the same key, the key will
+     * give an array value in the order they were added.
+     * @param string $key    The variable to assign to.
+     * @param string value   The value that would norally
+     *                       be colected on the command line.
+     */
+    function assign($key, $value) {
+        if ($this->$key === false) {
+            $this->all[$key] = $value;
+        } elseif (! is_array($this->$key)) {
+            $this->all[$key] = array($this->$key, $value);
+        } else {
+            $this->all[$key][] = $value;
+        }
+    }
+
+    /**
+     * Extracts the next key and value from the argument list.
+     * @param array $arguments      The remaining arguments to be parsed.
+     *                              The argument list will be reduced.
+     * @return array                Two item array of key and value.
+     *                              If no value can be found it will
+     *                              have the value true assigned instead.
+     */
+    private function parseArgument(&$arguments) {
+        $argument = array_shift($arguments);
+        if (preg_match('/^-(\w)=(.+)$/', $argument, $matches)) {
+            return array($matches[1], $matches[2]);
+        } elseif (preg_match('/^-(\w)$/', $argument, $matches)) {
+            return array($matches[1], $this->nextNonFlagElseTrue($arguments));
+        } elseif (preg_match('/^--(\w+)=(.+)$/', $argument, $matches)) {
+            return array($matches[1], $matches[2]);
+        } elseif (preg_match('/^--(\w+)$/', $argument, $matches)) {
+            return array($matches[1], $this->nextNonFlagElseTrue($arguments));
+        }
+    }
+
+    /**
+     * Attempts to use the next argument as a value. It
+     * won't use what it thinks is a flag.
+     * @param array $arguments    Remaining arguments to be parsed.
+     *                            This variable is modified if there
+     *                            is a value to be extracted.
+     * @return string/boolean     The next value unless it's a flag.
+     */
+    private function nextNonFlagElseTrue(&$arguments) {
+        return $this->valueIsNext($arguments) ? array_shift($arguments) : true;
+    }
+
+    /**
+     * Test to see if the next available argument is a valid value.
+     * If it starts with "-" or "--" it's a flag and doesn't count.
+     * @param array $arguments    Remaining arguments to be parsed.
+     *                            Not affected by this call.
+     * boolean                    True if valid value.
+     */
+    function valueIsNext($arguments) {
+        return isset($arguments[0]) && ! $this->isFlag($arguments[0]);
+    }
+
+    /**
+     * It's a flag if it starts with "-" or "--".
+     * @param string $argument       Value to be tested.
+     * @return boolean               True if it's a flag.
+     */
+    function isFlag($argument) {
+        return strncmp($argument, '-', 1) == 0;
+    }
+
+    /**
+     * The arguments are available as individual member
+     * variables on the object.
+     * @param string $key              Argument name.
+     * @return string/array/boolean    Either false for no value,
+     *                                 the value as a string or
+     *                                 a list of multiple values if
+     *                                 the flag had been specified more
+     *                                 than once.
+     */
+    function __get($key) {
+        if (isset($this->all[$key])) {
+            return $this->all[$key];
+        }
+        return false;
+    }
+
+    /**
+     * The entire argument set as a hash.
+     * @return hash         Each argument and it's value(s).
+     */
+    function all() {
+        return $this->all;
+    }
+}
+
+/**
+ *    Renders the help for the command line arguments.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleHelp {
+    private $overview;
+    private $flag_sets = array();
+    private $explanations = array();
+
+    /**
+     * Sets up the top level explanation for the program.
+     * @param string $overview        Summary of program.
+     */
+    function __construct($overview = '') {
+        $this->overview = $overview;
+    }
+
+    /**
+     * Adds the explanation for a group of flags that all
+     * have the same function.
+     * @param string/array $flags       Flag and alternates. Don't
+     *                                  worry about leading dashes
+     *                                  as these are inserted automatically.
+     * @param string $explanation       What that flag group does.
+     */
+    function explainFlag($flags, $explanation) {
+        $flags = is_array($flags) ? $flags : array($flags);
+        $this->flag_sets[] = $flags;
+        $this->explanations[] = $explanation;
+    }
+
+    /**
+     * Generates the help text.
+     * @returns string      The complete formatted text.
+     */
+    function render() {
+        $tab_stop = $this->longestFlag($this->flag_sets) + 4;
+        $text = $this->overview . "\n";
+        for ($i = 0; $i < count($this->flag_sets); $i++) {
+            $text .= $this->renderFlagSet($this->flag_sets[$i], $this->explanations[$i], $tab_stop);
+        }
+        return $this->noDuplicateNewLines($text);
+    }
+
+    /**
+     * Works out the longest flag for formatting purposes.
+     * @param array $flag_sets      The internal flag set list.
+     */
+    private function longestFlag($flag_sets) {
+        $longest = 0;
+        foreach ($flag_sets as $flags) {
+            foreach ($flags as $flag) {
+                $longest = max($longest, strlen($this->renderFlag($flag)));
+            }
+        }
+        return $longest;
+    }
+
+    /**
+     * Generates the text for a single flag and it's alternate flags.
+     * @returns string           Help text for that flag group.
+     */
+    private function renderFlagSet($flags, $explanation, $tab_stop) {
+        $flag = array_shift($flags);
+        $text = str_pad($this->renderFlag($flag), $tab_stop, ' ') . $explanation . "\n";
+        foreach ($flags as $flag) {
+            $text .= '  ' . $this->renderFlag($flag) . "\n";
+        }
+        return $text;
+    }
+
+    /**
+     * Generates the flag name including leading dashes.
+     * @param string $flag          Just the name.
+     * @returns                     Fag with apropriate dashes.
+     */
+    private function renderFlag($flag) {
+        return (strlen($flag) == 1 ? '-' : '--') . $flag;
+    }
+
+    /**
+     * Converts multiple new lines into a single new line.
+     * Just there to trap accidental duplicate new lines.
+     * @param string $text      Text to clean up.
+     * @returns string          Text with no blank lines.
+     */
+    private function noDuplicateNewLines($text) {
+        return preg_replace('/(\n+)/', "\n", $text);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/authentication.php b/3rdparty/simpletest/authentication.php
new file mode 100644
index 00000000000..fcd4efd3f0a
--- /dev/null
+++ b/3rdparty/simpletest/authentication.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: authentication.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+/**
+ *  include http class
+ */
+require_once(dirname(__FILE__) . '/http.php');
+
+/**
+ *    Represents a single security realm's identity.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleRealm {
+    private $type;
+    private $root;
+    private $username;
+    private $password;
+
+    /**
+     *    Starts with the initial entry directory.
+     *    @param string $type      Authentication type for this
+     *                             realm. Only Basic authentication
+     *                             is currently supported.
+     *    @param SimpleUrl $url    Somewhere in realm.
+     *    @access public
+     */
+    function SimpleRealm($type, $url) {
+        $this->type = $type;
+        $this->root = $url->getBasePath();
+        $this->username = false;
+        $this->password = false;
+    }
+
+    /**
+     *    Adds another location to the realm.
+     *    @param SimpleUrl $url    Somewhere in realm.
+     *    @access public
+     */
+    function stretch($url) {
+        $this->root = $this->getCommonPath($this->root, $url->getPath());
+    }
+
+    /**
+     *    Finds the common starting path.
+     *    @param string $first        Path to compare.
+     *    @param string $second       Path to compare.
+     *    @return string              Common directories.
+     *    @access private
+     */
+    protected function getCommonPath($first, $second) {
+        $first = explode('/', $first);
+        $second = explode('/', $second);
+        for ($i = 0; $i < min(count($first), count($second)); $i++) {
+            if ($first[$i] != $second[$i]) {
+                return implode('/', array_slice($first, 0, $i)) . '/';
+            }
+        }
+        return implode('/', $first) . '/';
+    }
+
+    /**
+     *    Sets the identity to try within this realm.
+     *    @param string $username    Username in authentication dialog.
+     *    @param string $username    Password in authentication dialog.
+     *    @access public
+     */
+    function setIdentity($username, $password) {
+        $this->username = $username;
+        $this->password = $password;
+    }
+
+    /**
+     *    Accessor for current identity.
+     *    @return string        Last succesful username.
+     *    @access public
+     */
+    function getUsername() {
+        return $this->username;
+    }
+
+    /**
+     *    Accessor for current identity.
+     *    @return string        Last succesful password.
+     *    @access public
+     */
+    function getPassword() {
+        return $this->password;
+    }
+
+    /**
+     *    Test to see if the URL is within the directory
+     *    tree of the realm.
+     *    @param SimpleUrl $url    URL to test.
+     *    @return boolean          True if subpath.
+     *    @access public
+     */
+    function isWithin($url) {
+        if ($this->isIn($this->root, $url->getBasePath())) {
+            return true;
+        }
+        if ($this->isIn($this->root, $url->getBasePath() . $url->getPage() . '/')) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     *    Tests to see if one string is a substring of
+     *    another.
+     *    @param string $part        Small bit.
+     *    @param string $whole       Big bit.
+     *    @return boolean            True if the small bit is
+     *                               in the big bit.
+     *    @access private
+     */
+    protected function isIn($part, $whole) {
+        return strpos($whole, $part) === 0;
+    }
+}
+
+/**
+ *    Manages security realms.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleAuthenticator {
+    private $realms;
+
+    /**
+     *    Clears the realms.
+     *    @access public
+     */
+    function SimpleAuthenticator() {
+        $this->restartSession();
+    }
+
+    /**
+     *    Starts with no realms set up.
+     *    @access public
+     */
+    function restartSession() {
+        $this->realms = array();
+    }
+
+    /**
+     *    Adds a new realm centered the current URL.
+     *    Browsers privatey wildly on their behaviour in this
+     *    regard. Mozilla ignores the realm and presents
+     *    only when challenged, wasting bandwidth. IE
+     *    just carries on presenting until a new challenge
+     *    occours. SimpleTest tries to follow the spirit of
+     *    the original standards committee and treats the
+     *    base URL as the root of a file tree shaped realm.
+     *    @param SimpleUrl $url    Base of realm.
+     *    @param string $type      Authentication type for this
+     *                             realm. Only Basic authentication
+     *                             is currently supported.
+     *    @param string $realm     Name of realm.
+     *    @access public
+     */
+    function addRealm($url, $type, $realm) {
+        $this->realms[$url->getHost()][$realm] = new SimpleRealm($type, $url);
+    }
+
+    /**
+     *    Sets the current identity to be presented
+     *    against that realm.
+     *    @param string $host        Server hosting realm.
+     *    @param string $realm       Name of realm.
+     *    @param string $username    Username for realm.
+     *    @param string $password    Password for realm.
+     *    @access public
+     */
+    function setIdentityForRealm($host, $realm, $username, $password) {
+        if (isset($this->realms[$host][$realm])) {
+            $this->realms[$host][$realm]->setIdentity($username, $password);
+        }
+    }
+
+    /**
+     *    Finds the name of the realm by comparing URLs.
+     *    @param SimpleUrl $url        URL to test.
+     *    @return SimpleRealm          Name of realm.
+     *    @access private
+     */
+    protected function findRealmFromUrl($url) {
+        if (! isset($this->realms[$url->getHost()])) {
+            return false;
+        }
+        foreach ($this->realms[$url->getHost()] as $name => $realm) {
+            if ($realm->isWithin($url)) {
+                return $realm;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Presents the appropriate headers for this location.
+     *    @param SimpleHttpRequest $request  Request to modify.
+     *    @param SimpleUrl $url              Base of realm.
+     *    @access public
+     */
+    function addHeaders(&$request, $url) {
+        if ($url->getUsername() && $url->getPassword()) {
+            $username = $url->getUsername();
+            $password = $url->getPassword();
+        } elseif ($realm = $this->findRealmFromUrl($url)) {
+            $username = $realm->getUsername();
+            $password = $realm->getPassword();
+        } else {
+            return;
+        }
+        $this->addBasicHeaders($request, $username, $password);
+    }
+
+    /**
+     *    Presents the appropriate headers for this
+     *    location for basic authentication.
+     *    @param SimpleHttpRequest $request  Request to modify.
+     *    @param string $username            Username for realm.
+     *    @param string $password            Password for realm.
+     *    @access public
+     */
+    static function addBasicHeaders(&$request, $username, $password) {
+        if ($username && $password) {
+            $request->addHeaderLine(
+                'Authorization: Basic ' . base64_encode("$username:$password"));
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/autorun.php b/3rdparty/simpletest/autorun.php
new file mode 100644
index 00000000000..8faf84d3ceb
--- /dev/null
+++ b/3rdparty/simpletest/autorun.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ *  Autorunner which runs all tests cases found in a file
+ *  that includes this module.
+ *  @package    SimpleTest
+ *  @version    $Id: autorun.php 2037 2011-11-30 17:58:21Z pp11 $
+ */
+
+/**#@+
+ * include simpletest files
+ */
+require_once dirname(__FILE__) . '/unit_tester.php';
+require_once dirname(__FILE__) . '/mock_objects.php';
+require_once dirname(__FILE__) . '/collector.php';
+require_once dirname(__FILE__) . '/default_reporter.php';
+/**#@-*/
+
+$GLOBALS['SIMPLETEST_AUTORUNNER_INITIAL_CLASSES'] = get_declared_classes();
+$GLOBALS['SIMPLETEST_AUTORUNNER_INITIAL_PATH'] = getcwd();
+register_shutdown_function('simpletest_autorun');
+
+/**
+ *    Exit handler to run all recent test cases and exit system if in CLI
+ */
+function simpletest_autorun() {
+	chdir($GLOBALS['SIMPLETEST_AUTORUNNER_INITIAL_PATH']);
+    if (tests_have_run()) {
+        return;
+    }
+    $result = run_local_tests();
+    if (SimpleReporter::inCli()) {
+        exit($result ? 0 : 1);
+    }
+}
+
+/**
+ *    run all recent test cases if no test has
+ *    so far been run. Uses the DefaultReporter which can have
+ *    it's output controlled with SimpleTest::prefer().
+ *    @return boolean/null false if there were test failures, true if
+ *                         there were no failures, null if tests are
+ *                         already running
+ */
+function run_local_tests() {
+    try {
+        if (tests_have_run()) {
+            return;
+        }
+        $candidates = capture_new_classes();
+        $loader = new SimpleFileLoader();
+        $suite = $loader->createSuiteFromClasses(
+                basename(initial_file()),
+                $loader->selectRunnableTests($candidates));
+        return $suite->run(new DefaultReporter());
+    } catch (Exception $stack_frame_fix) {
+        print $stack_frame_fix->getMessage();
+        return false;
+    }
+}
+
+/**
+ *    Checks the current test context to see if a test has
+ *    ever been run.
+ *    @return boolean        True if tests have run.
+ */
+function tests_have_run() {
+    if ($context = SimpleTest::getContext()) {
+        return (boolean)$context->getTest();
+    }
+    return false;
+}
+
+/**
+ *    The first autorun file.
+ *    @return string        Filename of first autorun script.
+ */
+function initial_file() {
+    static $file = false;
+    if (! $file) {
+        if (isset($_SERVER, $_SERVER['SCRIPT_FILENAME'])) {
+            $file = $_SERVER['SCRIPT_FILENAME'];
+        } else {
+            $included_files = get_included_files();
+            $file = reset($included_files);
+        }
+    }
+    return $file;
+}
+
+/**
+ *    Every class since the first autorun include. This
+ *    is safe enough if require_once() is always used.
+ *    @return array        Class names.
+ */
+function capture_new_classes() {
+    global $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES;
+    return array_map('strtolower', array_diff(get_declared_classes(),
+                            $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES ?
+                            $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES : array()));
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/browser.php b/3rdparty/simpletest/browser.php
new file mode 100644
index 00000000000..615e738d350
--- /dev/null
+++ b/3rdparty/simpletest/browser.php
@@ -0,0 +1,1144 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: browser.php 2013 2011-04-29 09:29:45Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/simpletest.php');
+require_once(dirname(__FILE__) . '/http.php');
+require_once(dirname(__FILE__) . '/encoding.php');
+require_once(dirname(__FILE__) . '/page.php');
+require_once(dirname(__FILE__) . '/php_parser.php');
+require_once(dirname(__FILE__) . '/tidy_parser.php');
+require_once(dirname(__FILE__) . '/selector.php');
+require_once(dirname(__FILE__) . '/frames.php');
+require_once(dirname(__FILE__) . '/user_agent.php');
+if (! SimpleTest::getParsers()) {
+    SimpleTest::setParsers(array(new SimpleTidyPageBuilder(), new SimplePHPPageBuilder()));
+    //SimpleTest::setParsers(array(new SimplePHPPageBuilder()));
+}
+/**#@-*/
+
+if (! defined('DEFAULT_MAX_NESTED_FRAMES')) {
+    define('DEFAULT_MAX_NESTED_FRAMES', 3);
+}
+
+/**
+ *    Browser history list.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleBrowserHistory {
+    private $sequence = array();
+    private $position = -1;
+
+    /**
+     *    Test for no entries yet.
+     *    @return boolean        True if empty.
+     *    @access private
+     */
+    protected function isEmpty() {
+        return ($this->position == -1);
+    }
+
+    /**
+     *    Test for being at the beginning.
+     *    @return boolean        True if first.
+     *    @access private
+     */
+    protected function atBeginning() {
+        return ($this->position == 0) && ! $this->isEmpty();
+    }
+
+    /**
+     *    Test for being at the last entry.
+     *    @return boolean        True if last.
+     *    @access private
+     */
+    protected function atEnd() {
+        return ($this->position + 1 >= count($this->sequence)) && ! $this->isEmpty();
+    }
+
+    /**
+     *    Adds a successfully fetched page to the history.
+     *    @param SimpleUrl $url                 URL of fetch.
+     *    @param SimpleEncoding $parameters     Any post data with the fetch.
+     *    @access public
+     */
+    function recordEntry($url, $parameters) {
+        $this->dropFuture();
+        array_push(
+                $this->sequence,
+                array('url' => $url, 'parameters' => $parameters));
+        $this->position++;
+    }
+
+    /**
+     *    Last fully qualified URL for current history
+     *    position.
+     *    @return SimpleUrl        URL for this position.
+     *    @access public
+     */
+    function getUrl() {
+        if ($this->isEmpty()) {
+            return false;
+        }
+        return $this->sequence[$this->position]['url'];
+    }
+
+    /**
+     *    Parameters of last fetch from current history
+     *    position.
+     *    @return SimpleFormEncoding    Post parameters.
+     *    @access public
+     */
+    function getParameters() {
+        if ($this->isEmpty()) {
+            return false;
+        }
+        return $this->sequence[$this->position]['parameters'];
+    }
+
+    /**
+     *    Step back one place in the history. Stops at
+     *    the first page.
+     *    @return boolean     True if any previous entries.
+     *    @access public
+     */
+    function back() {
+        if ($this->isEmpty() || $this->atBeginning()) {
+            return false;
+        }
+        $this->position--;
+        return true;
+    }
+
+    /**
+     *    Step forward one place. If already at the
+     *    latest entry then nothing will happen.
+     *    @return boolean     True if any future entries.
+     *    @access public
+     */
+    function forward() {
+        if ($this->isEmpty() || $this->atEnd()) {
+            return false;
+        }
+        $this->position++;
+        return true;
+    }
+
+    /**
+     *    Ditches all future entries beyond the current
+     *    point.
+     *    @access private
+     */
+    protected function dropFuture() {
+        if ($this->isEmpty()) {
+            return;
+        }
+        while (! $this->atEnd()) {
+            array_pop($this->sequence);
+        }
+    }
+}
+
+/**
+ *    Simulated web browser. This is an aggregate of
+ *    the user agent, the HTML parsing, request history
+ *    and the last header set.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleBrowser {
+    private $user_agent;
+    private $page;
+    private $history;
+    private $ignore_frames;
+    private $maximum_nested_frames;
+    private $parser;
+
+    /**
+     *    Starts with a fresh browser with no
+     *    cookie or any other state information. The
+     *    exception is that a default proxy will be
+     *    set up if specified in the options.
+     *    @access public
+     */
+    function __construct() {
+        $this->user_agent = $this->createUserAgent();
+        $this->user_agent->useProxy(
+                SimpleTest::getDefaultProxy(),
+                SimpleTest::getDefaultProxyUsername(),
+                SimpleTest::getDefaultProxyPassword());
+        $this->page = new SimplePage();
+        $this->history = $this->createHistory();
+        $this->ignore_frames = false;
+        $this->maximum_nested_frames = DEFAULT_MAX_NESTED_FRAMES;
+    }
+
+    /**
+     *    Creates the underlying user agent.
+     *    @return SimpleFetcher    Content fetcher.
+     *    @access protected
+     */
+    protected function createUserAgent() {
+        return new SimpleUserAgent();
+    }
+
+    /**
+     *    Creates a new empty history list.
+     *    @return SimpleBrowserHistory    New list.
+     *    @access protected
+     */
+    protected function createHistory() {
+        return new SimpleBrowserHistory();
+    }
+
+    /**
+     *    Get the HTML parser to use. Can be overridden by
+     *    setParser. Otherwise scans through the available parsers and
+     *    uses the first one which is available.
+     *    @return object SimplePHPPageBuilder or SimpleTidyPageBuilder
+     */
+    protected function getParser() {
+        if ($this->parser) {
+            return $this->parser;
+        }
+        foreach (SimpleTest::getParsers() as $parser) {
+            if ($parser->can()) {
+                return $parser;
+            }
+        }
+    }
+
+    /**
+     *    Override the default HTML parser, allowing parsers to be plugged in.
+     *    @param object           A parser object instance.
+     */
+    public function setParser($parser) {
+        $this->parser = $parser;
+    }
+
+    /**
+     *    Disables frames support. Frames will not be fetched
+     *    and the frameset page will be used instead.
+     *    @access public
+     */
+    function ignoreFrames() {
+        $this->ignore_frames = true;
+    }
+
+    /**
+     *    Enables frames support. Frames will be fetched from
+     *    now on.
+     *    @access public
+     */
+    function useFrames() {
+        $this->ignore_frames = false;
+    }
+
+    /**
+     *    Switches off cookie sending and recieving.
+     *    @access public
+     */
+    function ignoreCookies() {
+        $this->user_agent->ignoreCookies();
+    }
+
+    /**
+     *    Switches back on the cookie sending and recieving.
+     *    @access public
+     */
+    function useCookies() {
+        $this->user_agent->useCookies();
+    }
+
+    /**
+     *    Parses the raw content into a page. Will load further
+     *    frame pages unless frames are disabled.
+     *    @param SimpleHttpResponse $response    Response from fetch.
+     *    @param integer $depth                  Nested frameset depth.
+     *    @return SimplePage                     Parsed HTML.
+     *    @access private
+     */
+    protected function parse($response, $depth = 0) {
+        $page = $this->buildPage($response);
+        if ($this->ignore_frames || ! $page->hasFrames() || ($depth > $this->maximum_nested_frames)) {
+            return $page;
+        }
+        $frameset = new SimpleFrameset($page);
+        foreach ($page->getFrameset() as $key => $url) {
+            $frame = $this->fetch($url, new SimpleGetEncoding(), $depth + 1);
+            $frameset->addFrame($frame, $key);
+        }
+        return $frameset;
+    }
+
+    /**
+     *    Assembles the parsing machinery and actually parses
+     *    a single page. Frees all of the builder memory and so
+     *    unjams the PHP memory management.
+     *    @param SimpleHttpResponse $response    Response from fetch.
+     *    @return SimplePage                     Parsed top level page.
+     */
+    protected function buildPage($response) {
+        return $this->getParser()->parse($response);
+    }
+
+    /**
+     *    Fetches a page. Jointly recursive with the parse()
+     *    method as it descends a frameset.
+     *    @param string/SimpleUrl $url          Target to fetch.
+     *    @param SimpleEncoding $encoding       GET/POST parameters.
+     *    @param integer $depth                 Nested frameset depth protection.
+     *    @return SimplePage                    Parsed page.
+     *    @access private
+     */
+    protected function fetch($url, $encoding, $depth = 0) {
+        $response = $this->user_agent->fetchResponse($url, $encoding);
+        if ($response->isError()) {
+            return new SimplePage($response);
+        }
+        return $this->parse($response, $depth);
+    }
+
+    /**
+     *    Fetches a page or a single frame if that is the current
+     *    focus.
+     *    @param SimpleUrl $url                   Target to fetch.
+     *    @param SimpleEncoding $parameters       GET/POST parameters.
+     *    @return string                          Raw content of page.
+     *    @access private
+     */
+    protected function load($url, $parameters) {
+        $frame = $url->getTarget();
+        if (! $frame || ! $this->page->hasFrames() || (strtolower($frame) == '_top')) {
+            return $this->loadPage($url, $parameters);
+        }
+        return $this->loadFrame(array($frame), $url, $parameters);
+    }
+
+    /**
+     *    Fetches a page and makes it the current page/frame.
+     *    @param string/SimpleUrl $url            Target to fetch as string.
+     *    @param SimplePostEncoding $parameters   POST parameters.
+     *    @return string                          Raw content of page.
+     *    @access private
+     */
+    protected function loadPage($url, $parameters) {
+        $this->page = $this->fetch($url, $parameters);
+        $this->history->recordEntry(
+                $this->page->getUrl(),
+                $this->page->getRequestData());
+        return $this->page->getRaw();
+    }
+
+    /**
+     *    Fetches a frame into the existing frameset replacing the
+     *    original.
+     *    @param array $frames                    List of names to drill down.
+     *    @param string/SimpleUrl $url            Target to fetch as string.
+     *    @param SimpleFormEncoding $parameters   POST parameters.
+     *    @return string                          Raw content of page.
+     *    @access private
+     */
+    protected function loadFrame($frames, $url, $parameters) {
+        $page = $this->fetch($url, $parameters);
+        $this->page->setFrame($frames, $page);
+        return $page->getRaw();
+    }
+
+    /**
+     *    Removes expired and temporary cookies as if
+     *    the browser was closed and re-opened.
+     *    @param string/integer $date   Time when session restarted.
+     *                                  If omitted then all persistent
+     *                                  cookies are kept.
+     *    @access public
+     */
+    function restart($date = false) {
+        $this->user_agent->restart($date);
+    }
+
+    /**
+     *    Adds a header to every fetch.
+     *    @param string $header       Header line to add to every
+     *                                request until cleared.
+     *    @access public
+     */
+    function addHeader($header) {
+        $this->user_agent->addHeader($header);
+    }
+
+    /**
+     *    Ages the cookies by the specified time.
+     *    @param integer $interval    Amount in seconds.
+     *    @access public
+     */
+    function ageCookies($interval) {
+        $this->user_agent->ageCookies($interval);
+    }
+
+    /**
+     *    Sets an additional cookie. If a cookie has
+     *    the same name and path it is replaced.
+     *    @param string $name       Cookie key.
+     *    @param string $value      Value of cookie.
+     *    @param string $host       Host upon which the cookie is valid.
+     *    @param string $path       Cookie path if not host wide.
+     *    @param string $expiry     Expiry date.
+     *    @access public
+     */
+    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
+        $this->user_agent->setCookie($name, $value, $host, $path, $expiry);
+    }
+
+    /**
+     *    Reads the most specific cookie value from the
+     *    browser cookies.
+     *    @param string $host        Host to search.
+     *    @param string $path        Applicable path.
+     *    @param string $name        Name of cookie to read.
+     *    @return string             False if not present, else the
+     *                               value as a string.
+     *    @access public
+     */
+    function getCookieValue($host, $path, $name) {
+        return $this->user_agent->getCookieValue($host, $path, $name);
+    }
+
+    /**
+     *    Reads the current cookies for the current URL.
+     *    @param string $name   Key of cookie to find.
+     *    @return string        Null if there is no current URL, false
+     *                          if the cookie is not set.
+     *    @access public
+     */
+    function getCurrentCookieValue($name) {
+        return $this->user_agent->getBaseCookieValue($name, $this->page->getUrl());
+    }
+
+    /**
+     *    Sets the maximum number of redirects before
+     *    a page will be loaded anyway.
+     *    @param integer $max        Most hops allowed.
+     *    @access public
+     */
+    function setMaximumRedirects($max) {
+        $this->user_agent->setMaximumRedirects($max);
+    }
+
+    /**
+     *    Sets the maximum number of nesting of framed pages
+     *    within a framed page to prevent loops.
+     *    @param integer $max        Highest depth allowed.
+     *    @access public
+     */
+    function setMaximumNestedFrames($max) {
+        $this->maximum_nested_frames = $max;
+    }
+
+    /**
+     *    Sets the socket timeout for opening a connection.
+     *    @param integer $timeout      Maximum time in seconds.
+     *    @access public
+     */
+    function setConnectionTimeout($timeout) {
+        $this->user_agent->setConnectionTimeout($timeout);
+    }
+
+    /**
+     *    Sets proxy to use on all requests for when
+     *    testing from behind a firewall. Set URL
+     *    to false to disable.
+     *    @param string $proxy        Proxy URL.
+     *    @param string $username     Proxy username for authentication.
+     *    @param string $password     Proxy password for authentication.
+     *    @access public
+     */
+    function useProxy($proxy, $username = false, $password = false) {
+        $this->user_agent->useProxy($proxy, $username, $password);
+    }
+
+    /**
+     *    Fetches the page content with a HEAD request.
+     *    Will affect cookies, but will not change the base URL.
+     *    @param string/SimpleUrl $url                Target to fetch as string.
+     *    @param hash/SimpleHeadEncoding $parameters  Additional parameters for
+     *                                                HEAD request.
+     *    @return boolean                             True if successful.
+     *    @access public
+     */
+    function head($url, $parameters = false) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        if ($this->getUrl()) {
+            $url = $url->makeAbsolute($this->getUrl());
+        }
+        $response = $this->user_agent->fetchResponse($url, new SimpleHeadEncoding($parameters));
+        $this->page = new SimplePage($response);
+        return ! $response->isError();
+    }
+
+    /**
+     *    Fetches the page content with a simple GET request.
+     *    @param string/SimpleUrl $url                Target to fetch.
+     *    @param hash/SimpleFormEncoding $parameters  Additional parameters for
+     *                                                GET request.
+     *    @return string                              Content of page or false.
+     *    @access public
+     */
+    function get($url, $parameters = false) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        if ($this->getUrl()) {
+            $url = $url->makeAbsolute($this->getUrl());
+        }
+        return $this->load($url, new SimpleGetEncoding($parameters));
+    }
+
+    /**
+     *    Fetches the page content with a POST request.
+     *    @param string/SimpleUrl $url                Target to fetch as string.
+     *    @param hash/SimpleFormEncoding $parameters  POST parameters or request body.
+     *    @param string $content_type                 MIME Content-Type of the request body
+     *    @return string                              Content of page.
+     *    @access public
+     */
+    function post($url, $parameters = false, $content_type = false) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        if ($this->getUrl()) {
+            $url = $url->makeAbsolute($this->getUrl());
+        }
+        return $this->load($url, new SimplePostEncoding($parameters, $content_type));
+    }
+
+    /**
+     *    Fetches the page content with a PUT request.
+     *    @param string/SimpleUrl $url                Target to fetch as string.
+     *    @param hash/SimpleFormEncoding $parameters  PUT request body.
+     *    @param string $content_type                 MIME Content-Type of the request body
+     *    @return string                              Content of page.
+     *    @access public
+     */
+    function put($url, $parameters = false, $content_type = false) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        return $this->load($url, new SimplePutEncoding($parameters, $content_type));
+    }
+
+    /**
+     *    Sends a DELETE request and fetches the response.
+     *    @param string/SimpleUrl $url                Target to fetch.
+     *    @param hash/SimpleFormEncoding $parameters  Additional parameters for
+     *                                                DELETE request.
+     *    @return string                              Content of page or false.
+     *    @access public
+     */
+    function delete($url, $parameters = false) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        return $this->load($url, new SimpleDeleteEncoding($parameters));
+    }
+
+    /**
+     *    Equivalent to hitting the retry button on the
+     *    browser. Will attempt to repeat the page fetch. If
+     *    there is no history to repeat it will give false.
+     *    @return string/boolean   Content if fetch succeeded
+     *                             else false.
+     *    @access public
+     */
+    function retry() {
+        $frames = $this->page->getFrameFocus();
+        if (count($frames) > 0) {
+            $this->loadFrame(
+                    $frames,
+                    $this->page->getUrl(),
+                    $this->page->getRequestData());
+            return $this->page->getRaw();
+        }
+        if ($url = $this->history->getUrl()) {
+            $this->page = $this->fetch($url, $this->history->getParameters());
+            return $this->page->getRaw();
+        }
+        return false;
+    }
+
+    /**
+     *    Equivalent to hitting the back button on the
+     *    browser. The browser history is unchanged on
+     *    failure. The page content is refetched as there
+     *    is no concept of content caching in SimpleTest.
+     *    @return boolean     True if history entry and
+     *                        fetch succeeded
+     *    @access public
+     */
+    function back() {
+        if (! $this->history->back()) {
+            return false;
+        }
+        $content = $this->retry();
+        if (! $content) {
+            $this->history->forward();
+        }
+        return $content;
+    }
+
+    /**
+     *    Equivalent to hitting the forward button on the
+     *    browser. The browser history is unchanged on
+     *    failure. The page content is refetched as there
+     *    is no concept of content caching in SimpleTest.
+     *    @return boolean     True if history entry and
+     *                        fetch succeeded
+     *    @access public
+     */
+    function forward() {
+        if (! $this->history->forward()) {
+            return false;
+        }
+        $content = $this->retry();
+        if (! $content) {
+            $this->history->back();
+        }
+        return $content;
+    }
+
+    /**
+     *    Retries a request after setting the authentication
+     *    for the current realm.
+     *    @param string $username    Username for realm.
+     *    @param string $password    Password for realm.
+     *    @return boolean            True if successful fetch. Note
+     *                               that authentication may still have
+     *                               failed.
+     *    @access public
+     */
+    function authenticate($username, $password) {
+        if (! $this->page->getRealm()) {
+            return false;
+        }
+        $url = $this->page->getUrl();
+        if (! $url) {
+            return false;
+        }
+        $this->user_agent->setIdentity(
+                $url->getHost(),
+                $this->page->getRealm(),
+                $username,
+                $password);
+        return $this->retry();
+    }
+
+    /**
+     *    Accessor for a breakdown of the frameset.
+     *    @return array   Hash tree of frames by name
+     *                    or index if no name.
+     *    @access public
+     */
+    function getFrames() {
+        return $this->page->getFrames();
+    }
+
+    /**
+     *    Accessor for current frame focus. Will be
+     *    false if no frame has focus.
+     *    @return integer/string/boolean    Label if any, otherwise
+     *                                      the position in the frameset
+     *                                      or false if none.
+     *    @access public
+     */
+    function getFrameFocus() {
+        return $this->page->getFrameFocus();
+    }
+
+    /**
+     *    Sets the focus by index. The integer index starts from 1.
+     *    @param integer $choice    Chosen frame.
+     *    @return boolean           True if frame exists.
+     *    @access public
+     */
+    function setFrameFocusByIndex($choice) {
+        return $this->page->setFrameFocusByIndex($choice);
+    }
+
+    /**
+     *    Sets the focus by name.
+     *    @param string $name    Chosen frame.
+     *    @return boolean        True if frame exists.
+     *    @access public
+     */
+    function setFrameFocus($name) {
+        return $this->page->setFrameFocus($name);
+    }
+
+    /**
+     *    Clears the frame focus. All frames will be searched
+     *    for content.
+     *    @access public
+     */
+    function clearFrameFocus() {
+        return $this->page->clearFrameFocus();
+    }
+
+    /**
+     *    Accessor for last error.
+     *    @return string        Error from last response.
+     *    @access public
+     */
+    function getTransportError() {
+        return $this->page->getTransportError();
+    }
+
+    /**
+     *    Accessor for current MIME type.
+     *    @return string    MIME type as string; e.g. 'text/html'
+     *    @access public
+     */
+    function getMimeType() {
+        return $this->page->getMimeType();
+    }
+
+    /**
+     *    Accessor for last response code.
+     *    @return integer    Last HTTP response code received.
+     *    @access public
+     */
+    function getResponseCode() {
+        return $this->page->getResponseCode();
+    }
+
+    /**
+     *    Accessor for last Authentication type. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Description of challenge type.
+     *    @access public
+     */
+    function getAuthentication() {
+        return $this->page->getAuthentication();
+    }
+
+    /**
+     *    Accessor for last Authentication realm. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Name of security realm.
+     *    @access public
+     */
+    function getRealm() {
+        return $this->page->getRealm();
+    }
+
+    /**
+     *    Accessor for current URL of page or frame if
+     *    focused.
+     *    @return string    Location of current page or frame as
+     *                      a string.
+     */
+    function getUrl() {
+        $url = $this->page->getUrl();
+        return $url ? $url->asString() : false;
+    }
+
+    /**
+     *    Accessor for base URL of page if set via BASE tag
+     *    @return string    base URL
+     */
+    function getBaseUrl() {
+        $url = $this->page->getBaseUrl();
+        return $url ? $url->asString() : false;
+    }
+
+    /**
+     *    Accessor for raw bytes sent down the wire.
+     *    @return string      Original text sent.
+     *    @access public
+     */
+    function getRequest() {
+        return $this->page->getRequest();
+    }
+
+    /**
+     *    Accessor for raw header information.
+     *    @return string      Header block.
+     *    @access public
+     */
+    function getHeaders() {
+        return $this->page->getHeaders();
+    }
+
+    /**
+     *    Accessor for raw page information.
+     *    @return string      Original text content of web page.
+     *    @access public
+     */
+    function getContent() {
+        return $this->page->getRaw();
+    }
+
+    /**
+     *    Accessor for plain text version of the page.
+     *    @return string      Normalised text representation.
+     *    @access public
+     */
+    function getContentAsText() {
+        return $this->page->getText();
+    }
+
+    /**
+     *    Accessor for parsed title.
+     *    @return string     Title or false if no title is present.
+     *    @access public
+     */
+    function getTitle() {
+        return $this->page->getTitle();
+    }
+
+    /**
+     *    Accessor for a list of all links in current page.
+     *    @return array   List of urls with scheme of
+     *                    http or https and hostname.
+     *    @access public
+     */
+    function getUrls() {
+        return $this->page->getUrls();
+    }
+
+    /**
+     *    Sets all form fields with that name.
+     *    @param string $label   Name or label of field in forms.
+     *    @param string $value   New value of field.
+     *    @return boolean        True if field exists, otherwise false.
+     *    @access public
+     */
+    function setField($label, $value, $position=false) {
+        return $this->page->setField(new SimpleByLabelOrName($label), $value, $position);
+    }
+
+    /**
+     *    Sets all form fields with that name. Will use label if
+     *    one is available (not yet implemented).
+     *    @param string $name    Name of field in forms.
+     *    @param string $value   New value of field.
+     *    @return boolean        True if field exists, otherwise false.
+     *    @access public
+     */
+    function setFieldByName($name, $value, $position=false) {
+        return $this->page->setField(new SimpleByName($name), $value, $position);
+    }
+
+    /**
+     *    Sets all form fields with that id attribute.
+     *    @param string/integer $id   Id of field in forms.
+     *    @param string $value        New value of field.
+     *    @return boolean             True if field exists, otherwise false.
+     *    @access public
+     */
+    function setFieldById($id, $value) {
+        return $this->page->setField(new SimpleById($id), $value);
+    }
+
+    /**
+     *    Accessor for a form element value within the page.
+     *    Finds the first match.
+     *    @param string $label       Field label.
+     *    @return string/boolean     A value if the field is
+     *                               present, false if unchecked
+     *                               and null if missing.
+     *    @access public
+     */
+    function getField($label) {
+        return $this->page->getField(new SimpleByLabelOrName($label));
+    }
+
+    /**
+     *    Accessor for a form element value within the page.
+     *    Finds the first match.
+     *    @param string $name        Field name.
+     *    @return string/boolean     A string if the field is
+     *                               present, false if unchecked
+     *                               and null if missing.
+     *    @access public
+     */
+    function getFieldByName($name) {
+        return $this->page->getField(new SimpleByName($name));
+    }
+
+    /**
+     *    Accessor for a form element value within the page.
+     *    @param string/integer $id  Id of field in forms.
+     *    @return string/boolean     A string if the field is
+     *                               present, false if unchecked
+     *                               and null if missing.
+     *    @access public
+     */
+    function getFieldById($id) {
+        return $this->page->getField(new SimpleById($id));
+    }
+
+    /**
+     *    Clicks the submit button by label. The owning
+     *    form will be submitted by this.
+     *    @param string $label    Button label. An unlabeled
+     *                            button can be triggered by 'Submit'.
+     *    @param hash $additional Additional form data.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function clickSubmit($label = 'Submit', $additional = false) {
+        if (! ($form = $this->page->getFormBySubmit(new SimpleByLabel($label)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitButton(new SimpleByLabel($label), $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Clicks the submit button by name attribute. The owning
+     *    form will be submitted by this.
+     *    @param string $name     Button name.
+     *    @param hash $additional Additional form data.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function clickSubmitByName($name, $additional = false) {
+        if (! ($form = $this->page->getFormBySubmit(new SimpleByName($name)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitButton(new SimpleByName($name), $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Clicks the submit button by ID attribute of the button
+     *    itself. The owning form will be submitted by this.
+     *    @param string $id       Button ID.
+     *    @param hash $additional Additional form data.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function clickSubmitById($id, $additional = false) {
+        if (! ($form = $this->page->getFormBySubmit(new SimpleById($id)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitButton(new SimpleById($id), $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Tests to see if a submit button exists with this
+     *    label.
+     *    @param string $label    Button label.
+     *    @return boolean         True if present.
+     *    @access public
+     */
+    function isSubmit($label) {
+        return (boolean)$this->page->getFormBySubmit(new SimpleByLabel($label));
+    }
+
+    /**
+     *    Clicks the submit image by some kind of label. Usually
+     *    the alt tag or the nearest equivalent. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param string $label    ID attribute of button.
+     *    @param integer $x       X-coordinate of imaginary click.
+     *    @param integer $y       Y-coordinate of imaginary click.
+     *    @param hash $additional Additional form data.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function clickImage($label, $x = 1, $y = 1, $additional = false) {
+        if (! ($form = $this->page->getFormByImage(new SimpleByLabel($label)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitImage(new SimpleByLabel($label), $x, $y, $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Clicks the submit image by the name. Usually
+     *    the alt tag or the nearest equivalent. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param string $name     Name attribute of button.
+     *    @param integer $x       X-coordinate of imaginary click.
+     *    @param integer $y       Y-coordinate of imaginary click.
+     *    @param hash $additional Additional form data.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
+        if (! ($form = $this->page->getFormByImage(new SimpleByName($name)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitImage(new SimpleByName($name), $x, $y, $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Clicks the submit image by ID attribute. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param integer/string $id    ID attribute of button.
+     *    @param integer $x            X-coordinate of imaginary click.
+     *    @param integer $y            Y-coordinate of imaginary click.
+     *    @param hash $additional      Additional form data.
+     *    @return string/boolean       Page on success.
+     *    @access public
+     */
+    function clickImageById($id, $x = 1, $y = 1, $additional = false) {
+        if (! ($form = $this->page->getFormByImage(new SimpleById($id)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitImage(new SimpleById($id), $x, $y, $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Tests to see if an image exists with this
+     *    title or alt text.
+     *    @param string $label    Image text.
+     *    @return boolean         True if present.
+     *    @access public
+     */
+    function isImage($label) {
+        return (boolean)$this->page->getFormByImage(new SimpleByLabel($label));
+    }
+
+    /**
+     *    Submits a form by the ID.
+     *    @param string $id       The form ID. No submit button value
+     *                            will be sent.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function submitFormById($id, $additional = false) {
+        if (! ($form = $this->page->getFormById($id))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submit($additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Finds a URL by label. Will find the first link
+     *    found with this link text by default, or a later
+     *    one if an index is given. The match ignores case and
+     *    white space issues.
+     *    @param string $label     Text between the anchor tags.
+     *    @param integer $index    Link position counting from zero.
+     *    @return string/boolean   URL on success.
+     *    @access public
+     */
+    function getLink($label, $index = 0) {
+        $urls = $this->page->getUrlsByLabel($label);
+        if (count($urls) == 0) {
+            return false;
+        }
+        if (count($urls) < $index + 1) {
+            return false;
+        }
+        return $urls[$index];
+    }
+
+    /**
+     *    Follows a link by label. Will click the first link
+     *    found with this link text by default, or a later
+     *    one if an index is given. The match ignores case and
+     *    white space issues.
+     *    @param string $label     Text between the anchor tags.
+     *    @param integer $index    Link position counting from zero.
+     *    @return string/boolean   Page on success.
+     *    @access public
+     */
+    function clickLink($label, $index = 0) {
+        $url = $this->getLink($label, $index);
+        if ($url === false) {
+            return false;
+        }
+        $this->load($url, new SimpleGetEncoding());
+        return $this->getContent();
+    }
+
+    /**
+     *    Finds a link by id attribute.
+     *    @param string $id        ID attribute value.
+     *    @return string/boolean   URL on success.
+     *    @access public
+     */
+    function getLinkById($id) {
+        return $this->page->getUrlById($id);
+    }
+
+    /**
+     *    Follows a link by id attribute.
+     *    @param string $id        ID attribute value.
+     *    @return string/boolean   Page on success.
+     *    @access public
+     */
+    function clickLinkById($id) {
+        if (! ($url = $this->getLinkById($id))) {
+            return false;
+        }
+        $this->load($url, new SimpleGetEncoding());
+        return $this->getContent();
+    }
+
+    /**
+     *    Clicks a visible text item. Will first try buttons,
+     *    then links and then images.
+     *    @param string $label        Visible text or alt text.
+     *    @return string/boolean      Raw page or false.
+     *    @access public
+     */
+    function click($label) {
+        $raw = $this->clickSubmit($label);
+        if (! $raw) {
+            $raw = $this->clickLink($label);
+        }
+        if (! $raw) {
+            $raw = $this->clickImage($label);
+        }
+        return $raw;
+    }
+
+    /**
+     *    Tests to see if a click target exists.
+     *    @param string $label    Visible text or alt text.
+     *    @return boolean         True if target present.
+     *    @access public
+     */
+    function isClickable($label) {
+        return $this->isSubmit($label) || ($this->getLink($label) !== false) || $this->isImage($label);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/collector.php b/3rdparty/simpletest/collector.php
new file mode 100644
index 00000000000..ac49937aada
--- /dev/null
+++ b/3rdparty/simpletest/collector.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * This file contains the following classes: {@link SimpleCollector},
+ * {@link SimplePatternCollector}.
+ *
+ * @author Travis Swicegood <development@domain51.com>
+ * @package SimpleTest
+ * @subpackage UnitTester
+ * @version $Id: collector.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**
+ * The basic collector for {@link GroupTest}
+ *
+ * @see collect(), GroupTest::collect()
+ * @package SimpleTest
+ * @subpackage UnitTester
+ */
+class SimpleCollector {
+
+    /**
+     * Strips off any kind of slash at the end so as to normalise the path.
+     * @param string $path    Path to normalise.
+     * @return string         Path without trailing slash.
+     */
+    protected function removeTrailingSlash($path) {
+        if (substr($path, -1) == DIRECTORY_SEPARATOR) {
+            return substr($path, 0, -1);
+        } elseif (substr($path, -1) == '/') {
+            return substr($path, 0, -1);
+        } else {
+            return $path;
+        }
+    }
+
+    /**
+     * Scans the directory and adds what it can.
+     * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
+     * @param string $path    Directory to scan.
+     * @see _attemptToAdd()
+     */
+    function collect(&$test, $path) {
+        $path = $this->removeTrailingSlash($path);
+        if ($handle = opendir($path)) {
+            while (($entry = readdir($handle)) !== false) {
+                if ($this->isHidden($entry)) {
+                    continue;
+                }
+                $this->handle($test, $path . DIRECTORY_SEPARATOR . $entry);
+            }
+            closedir($handle);
+        }
+    }
+
+    /**
+     * This method determines what should be done with a given file and adds
+     * it via {@link GroupTest::addTestFile()} if necessary.
+     *
+     * This method should be overriden to provide custom matching criteria,
+     * such as pattern matching, recursive matching, etc.  For an example, see
+     * {@link SimplePatternCollector::_handle()}.
+     *
+     * @param object $test      Group test with {@link GroupTest::addTestFile()} method.
+     * @param string $filename  A filename as generated by {@link collect()}
+     * @see collect()
+     * @access protected
+     */
+    protected function handle(&$test, $file) {
+        if (is_dir($file)) {
+            return;
+        }
+        $test->addFile($file);
+    }
+
+    /**
+     *  Tests for hidden files so as to skip them. Currently
+     *  only tests for Unix hidden files.
+     *  @param string $filename        Plain filename.
+     *  @return boolean                True if hidden file.
+     *  @access private
+     */
+    protected function isHidden($filename) {
+        return strncmp($filename, '.', 1) == 0;
+    }
+}
+
+/**
+ * An extension to {@link SimpleCollector} that only adds files matching a
+ * given pattern.
+ *
+ * @package SimpleTest
+ * @subpackage UnitTester
+ * @see SimpleCollector
+ */
+class SimplePatternCollector extends SimpleCollector {
+    private $pattern;
+
+    /**
+     *
+     * @param string $pattern   Perl compatible regex to test name against
+     *  See {@link http://us4.php.net/manual/en/reference.pcre.pattern.syntax.php PHP's PCRE}
+     *  for full documentation of valid pattern.s
+     */
+    function __construct($pattern = '/php$/i') {
+        $this->pattern = $pattern;
+    }
+
+    /**
+     * Attempts to add files that match a given pattern.
+     *
+     * @see SimpleCollector::_handle()
+     * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
+     * @param string $path    Directory to scan.
+     * @access protected
+     */
+    protected function handle(&$test, $filename) {
+        if (preg_match($this->pattern, $filename)) {
+            parent::handle($test, $filename);
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/compatibility.php b/3rdparty/simpletest/compatibility.php
new file mode 100755
index 00000000000..e313db0cb51
--- /dev/null
+++ b/3rdparty/simpletest/compatibility.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @version    $Id: compatibility.php 1900 2009-07-29 11:44:37Z lastcraft $
+ */
+
+/**
+ *  Static methods for compatibility between different
+ *  PHP versions.
+ *  @package    SimpleTest
+ */
+class SimpleTestCompatibility {
+
+    /**
+     *    Creates a copy whether in PHP5 or PHP4.
+     *    @param object $object     Thing to copy.
+     *    @return object            A copy.
+     *    @access public
+     */
+    static function copy($object) {
+        if (version_compare(phpversion(), '5') >= 0) {
+            eval('$copy = clone $object;');
+            return $copy;
+        }
+        return $object;
+    }
+
+    /**
+     *    Identity test. Drops back to equality + types for PHP5
+     *    objects as the === operator counts as the
+     *    stronger reference constraint.
+     *    @param mixed $first    Test subject.
+     *    @param mixed $second   Comparison object.
+     *    @return boolean        True if identical.
+     *    @access public
+     */
+    static function isIdentical($first, $second) {
+        if (version_compare(phpversion(), '5') >= 0) {
+            return SimpleTestCompatibility::isIdenticalType($first, $second);
+        }
+        if ($first != $second) {
+            return false;
+        }
+        return ($first === $second);
+    }
+
+    /**
+     *    Recursive type test.
+     *    @param mixed $first    Test subject.
+     *    @param mixed $second   Comparison object.
+     *    @return boolean        True if same type.
+     *    @access private
+     */
+    protected static function isIdenticalType($first, $second) {
+        if (gettype($first) != gettype($second)) {
+            return false;
+        }
+        if (is_object($first) && is_object($second)) {
+            if (get_class($first) != get_class($second)) {
+                return false;
+            }
+            return SimpleTestCompatibility::isArrayOfIdenticalTypes(
+                    (array) $first,
+                    (array) $second);
+        }
+        if (is_array($first) && is_array($second)) {
+            return SimpleTestCompatibility::isArrayOfIdenticalTypes($first, $second);
+        }
+        if ($first !== $second) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Recursive type test for each element of an array.
+     *    @param mixed $first    Test subject.
+     *    @param mixed $second   Comparison object.
+     *    @return boolean        True if identical.
+     *    @access private
+     */
+    protected static function isArrayOfIdenticalTypes($first, $second) {
+        if (array_keys($first) != array_keys($second)) {
+            return false;
+        }
+        foreach (array_keys($first) as $key) {
+            $is_identical = SimpleTestCompatibility::isIdenticalType(
+                    $first[$key],
+                    $second[$key]);
+            if (! $is_identical) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Test for two variables being aliases.
+     *    @param mixed $first    Test subject.
+     *    @param mixed $second   Comparison object.
+     *    @return boolean        True if same.
+     *    @access public
+     */
+    static function isReference(&$first, &$second) {
+        if (version_compare(phpversion(), '5', '>=') && is_object($first)) {
+            return ($first === $second);
+        }
+        if (is_object($first) && is_object($second)) {
+            $id = uniqid("test");
+            $first->$id = true;
+            $is_ref = isset($second->$id);
+            unset($first->$id);
+            return $is_ref;
+        }
+        $temp = $first;
+        $first = uniqid("test");
+        $is_ref = ($first === $second);
+        $first = $temp;
+        return $is_ref;
+    }
+
+    /**
+     *    Test to see if an object is a member of a
+     *    class hiearchy.
+     *    @param object $object    Object to test.
+     *    @param string $class     Root name of hiearchy.
+     *    @return boolean         True if class in hiearchy.
+     *    @access public
+     */
+    static function isA($object, $class) {
+        if (version_compare(phpversion(), '5') >= 0) {
+            if (! class_exists($class, false)) {
+                if (function_exists('interface_exists')) {
+                    if (! interface_exists($class, false))  {
+                        return false;
+                    }
+                }
+            }
+            eval("\$is_a = \$object instanceof $class;");
+            return $is_a;
+        }
+        if (function_exists('is_a')) {
+            return is_a($object, $class);
+        }
+        return ((strtolower($class) == get_class($object))
+                or (is_subclass_of($object, $class)));
+    }
+
+    /**
+     *    Sets a socket timeout for each chunk.
+     *    @param resource $handle    Socket handle.
+     *    @param integer $timeout    Limit in seconds.
+     *    @access public
+     */
+    static function setTimeout($handle, $timeout) {
+        if (function_exists('stream_set_timeout')) {
+            stream_set_timeout($handle, $timeout, 0);
+        } elseif (function_exists('socket_set_timeout')) {
+            socket_set_timeout($handle, $timeout, 0);
+        } elseif (function_exists('set_socket_timeout')) {
+            set_socket_timeout($handle, $timeout, 0);
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/cookies.php b/3rdparty/simpletest/cookies.php
new file mode 100644
index 00000000000..7a28f4a5bcc
--- /dev/null
+++ b/3rdparty/simpletest/cookies.php
@@ -0,0 +1,380 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: cookies.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/url.php');
+/**#@-*/
+
+/**
+ *    Cookie data holder. Cookie rules are full of pretty
+ *    arbitary stuff. I have used...
+ *    http://wp.netscape.com/newsref/std/cookie_spec.html
+ *    http://www.cookiecentral.com/faq/
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleCookie {
+    private $host;
+    private $name;
+    private $value;
+    private $path;
+    private $expiry;
+    private $is_secure;
+
+    /**
+     *    Constructor. Sets the stored values.
+     *    @param string $name            Cookie key.
+     *    @param string $value           Value of cookie.
+     *    @param string $path            Cookie path if not host wide.
+     *    @param string $expiry          Expiry date as string.
+     *    @param boolean $is_secure      Currently ignored.
+     */
+    function __construct($name, $value = false, $path = false, $expiry = false, $is_secure = false) {
+        $this->host = false;
+        $this->name = $name;
+        $this->value = $value;
+        $this->path = ($path ? $this->fixPath($path) : "/");
+        $this->expiry = false;
+        if (is_string($expiry)) {
+            $this->expiry = strtotime($expiry);
+        } elseif (is_integer($expiry)) {
+            $this->expiry = $expiry;
+        }
+        $this->is_secure = $is_secure;
+    }
+
+    /**
+     *    Sets the host. The cookie rules determine
+     *    that the first two parts are taken for
+     *    certain TLDs and three for others. If the
+     *    new host does not match these rules then the
+     *    call will fail.
+     *    @param string $host       New hostname.
+     *    @return boolean           True if hostname is valid.
+     *    @access public
+     */
+    function setHost($host) {
+        if ($host = $this->truncateHost($host)) {
+            $this->host = $host;
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for the truncated host to which this
+     *    cookie applies.
+     *    @return string       Truncated hostname.
+     *    @access public
+     */
+    function getHost() {
+        return $this->host;
+    }
+
+    /**
+     *    Test for a cookie being valid for a host name.
+     *    @param string $host    Host to test against.
+     *    @return boolean        True if the cookie would be valid
+     *                           here.
+     */
+    function isValidHost($host) {
+        return ($this->truncateHost($host) === $this->getHost());
+    }
+
+    /**
+     *    Extracts just the domain part that determines a
+     *    cookie's host validity.
+     *    @param string $host    Host name to truncate.
+     *    @return string        Domain or false on a bad host.
+     *    @access private
+     */
+    protected function truncateHost($host) {
+        $tlds = SimpleUrl::getAllTopLevelDomains();
+        if (preg_match('/[a-z\-]+\.(' . $tlds . ')$/i', $host, $matches)) {
+            return $matches[0];
+        } elseif (preg_match('/[a-z\-]+\.[a-z\-]+\.[a-z\-]+$/i', $host, $matches)) {
+            return $matches[0];
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for name.
+     *    @return string       Cookie key.
+     *    @access public
+     */
+    function getName() {
+        return $this->name;
+    }
+
+    /**
+     *    Accessor for value. A deleted cookie will
+     *    have an empty string for this.
+     *    @return string       Cookie value.
+     *    @access public
+     */
+    function getValue() {
+        return $this->value;
+    }
+
+    /**
+     *    Accessor for path.
+     *    @return string       Valid cookie path.
+     *    @access public
+     */
+    function getPath() {
+        return $this->path;
+    }
+
+    /**
+     *    Tests a path to see if the cookie applies
+     *    there. The test path must be longer or
+     *    equal to the cookie path.
+     *    @param string $path       Path to test against.
+     *    @return boolean           True if cookie valid here.
+     *    @access public
+     */
+    function isValidPath($path) {
+        return (strncmp(
+                $this->fixPath($path),
+                $this->getPath(),
+                strlen($this->getPath())) == 0);
+    }
+
+    /**
+     *    Accessor for expiry.
+     *    @return string       Expiry string.
+     *    @access public
+     */
+    function getExpiry() {
+        if (! $this->expiry) {
+            return false;
+        }
+        return gmdate("D, d M Y H:i:s", $this->expiry) . " GMT";
+    }
+
+    /**
+     *    Test to see if cookie is expired against
+     *    the cookie format time or timestamp.
+     *    Will give true for a session cookie.
+     *    @param integer/string $now  Time to test against. Result
+     *                                will be false if this time
+     *                                is later than the cookie expiry.
+     *                                Can be either a timestamp integer
+     *                                or a cookie format date.
+     *    @access public
+     */
+    function isExpired($now) {
+        if (! $this->expiry) {
+            return true;
+        }
+        if (is_string($now)) {
+            $now = strtotime($now);
+        }
+        return ($this->expiry < $now);
+    }
+
+    /**
+     *    Ages the cookie by the specified number of
+     *    seconds.
+     *    @param integer $interval   In seconds.
+     *    @public
+     */
+    function agePrematurely($interval) {
+        if ($this->expiry) {
+            $this->expiry -= $interval;
+        }
+    }
+
+    /**
+     *    Accessor for the secure flag.
+     *    @return boolean       True if cookie needs SSL.
+     *    @access public
+     */
+    function isSecure() {
+        return $this->is_secure;
+    }
+
+    /**
+     *    Adds a trailing and leading slash to the path
+     *    if missing.
+     *    @param string $path            Path to fix.
+     *    @access private
+     */
+    protected function fixPath($path) {
+        if (substr($path, 0, 1) != '/') {
+            $path = '/' . $path;
+        }
+        if (substr($path, -1, 1) != '/') {
+            $path .= '/';
+        }
+        return $path;
+    }
+}
+
+/**
+ *    Repository for cookies. This stuff is a
+ *    tiny bit browser dependent.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleCookieJar {
+    private $cookies;
+
+    /**
+     *    Constructor. Jar starts empty.
+     *    @access public
+     */
+    function __construct() {
+        $this->cookies = array();
+    }
+
+    /**
+     *    Removes expired and temporary cookies as if
+     *    the browser was closed and re-opened.
+     *    @param string/integer $now   Time to test expiry against.
+     *    @access public
+     */
+    function restartSession($date = false) {
+        $surviving_cookies = array();
+        for ($i = 0; $i < count($this->cookies); $i++) {
+            if (! $this->cookies[$i]->getValue()) {
+                continue;
+            }
+            if (! $this->cookies[$i]->getExpiry()) {
+                continue;
+            }
+            if ($date && $this->cookies[$i]->isExpired($date)) {
+                continue;
+            }
+            $surviving_cookies[] = $this->cookies[$i];
+        }
+        $this->cookies = $surviving_cookies;
+    }
+
+    /**
+     *    Ages all cookies in the cookie jar.
+     *    @param integer $interval     The old session is moved
+     *                                 into the past by this number
+     *                                 of seconds. Cookies now over
+     *                                 age will be removed.
+     *    @access public
+     */
+    function agePrematurely($interval) {
+        for ($i = 0; $i < count($this->cookies); $i++) {
+            $this->cookies[$i]->agePrematurely($interval);
+        }
+    }
+
+    /**
+     *    Sets an additional cookie. If a cookie has
+     *    the same name and path it is replaced.
+     *    @param string $name       Cookie key.
+     *    @param string $value      Value of cookie.
+     *    @param string $host       Host upon which the cookie is valid.
+     *    @param string $path       Cookie path if not host wide.
+     *    @param string $expiry     Expiry date.
+     *    @access public
+     */
+    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
+        $cookie = new SimpleCookie($name, $value, $path, $expiry);
+        if ($host) {
+            $cookie->setHost($host);
+        }
+        $this->cookies[$this->findFirstMatch($cookie)] = $cookie;
+    }
+
+    /**
+     *    Finds a matching cookie to write over or the
+     *    first empty slot if none.
+     *    @param SimpleCookie $cookie    Cookie to write into jar.
+     *    @return integer                Available slot.
+     *    @access private
+     */
+    protected function findFirstMatch($cookie) {
+        for ($i = 0; $i < count($this->cookies); $i++) {
+            $is_match = $this->isMatch(
+                    $cookie,
+                    $this->cookies[$i]->getHost(),
+                    $this->cookies[$i]->getPath(),
+                    $this->cookies[$i]->getName());
+            if ($is_match) {
+                return $i;
+            }
+        }
+        return count($this->cookies);
+    }
+
+    /**
+     *    Reads the most specific cookie value from the
+     *    browser cookies. Looks for the longest path that
+     *    matches.
+     *    @param string $host        Host to search.
+     *    @param string $path        Applicable path.
+     *    @param string $name        Name of cookie to read.
+     *    @return string             False if not present, else the
+     *                               value as a string.
+     *    @access public
+     */
+    function getCookieValue($host, $path, $name) {
+        $longest_path = '';
+        foreach ($this->cookies as $cookie) {
+            if ($this->isMatch($cookie, $host, $path, $name)) {
+                if (strlen($cookie->getPath()) > strlen($longest_path)) {
+                    $value = $cookie->getValue();
+                    $longest_path = $cookie->getPath();
+                }
+            }
+        }
+        return (isset($value) ? $value : false);
+    }
+
+    /**
+     *    Tests cookie for matching against search
+     *    criteria.
+     *    @param SimpleTest $cookie    Cookie to test.
+     *    @param string $host          Host must match.
+     *    @param string $path          Cookie path must be shorter than
+     *                                 this path.
+     *    @param string $name          Name must match.
+     *    @return boolean              True if matched.
+     *    @access private
+     */
+    protected function isMatch($cookie, $host, $path, $name) {
+        if ($cookie->getName() != $name) {
+            return false;
+        }
+        if ($host && $cookie->getHost() && ! $cookie->isValidHost($host)) {
+            return false;
+        }
+        if (! $cookie->isValidPath($path)) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Uses a URL to sift relevant cookies by host and
+     *    path. Results are list of strings of form "name=value".
+     *    @param SimpleUrl $url       Url to select by.
+     *    @return array               Valid name and value pairs.
+     *    @access public
+     */
+    function selectAsPairs($url) {
+        $pairs = array();
+        foreach ($this->cookies as $cookie) {
+            if ($this->isMatch($cookie, $url->getHost(), $url->getPath(), $cookie->getName())) {
+                $pairs[] = $cookie->getName() . '=' . $cookie->getValue();
+            }
+        }
+        return $pairs;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/default_reporter.php b/3rdparty/simpletest/default_reporter.php
new file mode 100644
index 00000000000..6feb67a3088
--- /dev/null
+++ b/3rdparty/simpletest/default_reporter.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ *  Optional include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: default_reporter.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/simpletest.php');
+require_once(dirname(__FILE__) . '/scorer.php');
+require_once(dirname(__FILE__) . '/reporter.php');
+require_once(dirname(__FILE__) . '/xml.php');
+/**#@-*/
+
+/**
+ *    Parser for command line arguments. Extracts
+ *    the a specific test to run and engages XML
+ *    reporting when necessary.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleCommandLineParser {
+    private $to_property = array(
+            'case' => 'case', 'c' => 'case',
+            'test' => 'test', 't' => 'test',
+    );
+    private $case = '';
+    private $test = '';
+    private $xml = false;
+    private $help = false;
+    private $no_skips = false;
+
+    /**
+     *    Parses raw command line arguments into object properties.
+     *    @param string $arguments        Raw commend line arguments.
+     */
+    function __construct($arguments) {
+        if (! is_array($arguments)) {
+            return;
+        }
+        foreach ($arguments as $i => $argument) {
+            if (preg_match('/^--?(test|case|t|c)=(.+)$/', $argument, $matches)) {
+                $property = $this->to_property[$matches[1]];
+                $this->$property = $matches[2];
+            } elseif (preg_match('/^--?(test|case|t|c)$/', $argument, $matches)) {
+                $property = $this->to_property[$matches[1]];
+                if (isset($arguments[$i + 1])) {
+                    $this->$property = $arguments[$i + 1];
+                }
+            } elseif (preg_match('/^--?(xml|x)$/', $argument)) {
+                $this->xml = true;
+            } elseif (preg_match('/^--?(no-skip|no-skips|s)$/', $argument)) {
+                $this->no_skips = true;
+            } elseif (preg_match('/^--?(help|h)$/', $argument)) {
+                $this->help = true;
+            }
+        }
+    }
+
+    /**
+     *    Run only this test.
+     *    @return string        Test name to run.
+     */
+    function getTest() {
+        return $this->test;
+    }
+
+    /**
+     *    Run only this test suite.
+     *    @return string        Test class name to run.
+     */
+    function getTestCase() {
+        return $this->case;
+    }
+
+    /**
+     *    Output should be XML or not.
+     *    @return boolean        True if XML desired.
+     */
+    function isXml() {
+        return $this->xml;
+    }
+
+    /**
+     *    Output should suppress skip messages.
+     *    @return boolean        True for no skips.
+     */
+    function noSkips() {
+        return $this->no_skips;
+    }
+
+    /**
+     *    Output should be a help message. Disabled during XML mode.
+     *    @return boolean        True if help message desired.
+     */
+    function help() {
+        return $this->help && ! $this->xml;
+    }
+
+    /**
+     *    Returns plain-text help message for command line runner.
+     *    @return string         String help message
+     */
+    function getHelpText() {
+        return <<<HELP
+SimpleTest command line default reporter (autorun)
+Usage: php <test_file> [args...]
+
+    -c <class>      Run only the test-case <class>
+    -t <method>     Run only the test method <method>
+    -s              Suppress skip messages
+    -x              Return test results in XML
+    -h              Display this help message
+
+HELP;
+    }
+
+}
+
+/**
+ *    The default reporter used by SimpleTest's autorun
+ *    feature. The actual reporters used are dependency
+ *    injected and can be overridden.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class DefaultReporter extends SimpleReporterDecorator {
+
+    /**
+     *  Assembles the appropriate reporter for the environment.
+     */
+    function __construct() {
+        if (SimpleReporter::inCli()) {
+            $parser = new SimpleCommandLineParser($_SERVER['argv']);
+            $interfaces = $parser->isXml() ? array('XmlReporter') : array('TextReporter');
+            if ($parser->help()) {
+                // I'm not sure if we should do the echo'ing here -- ezyang
+                echo $parser->getHelpText();
+                exit(1);
+            }
+            $reporter = new SelectiveReporter(
+                    SimpleTest::preferred($interfaces),
+                    $parser->getTestCase(),
+                    $parser->getTest());
+            if ($parser->noSkips()) {
+                $reporter = new NoSkipsReporter($reporter);
+            }
+        } else {
+            $reporter = new SelectiveReporter(
+                    SimpleTest::preferred('HtmlReporter'),
+                    @$_GET['c'],
+                    @$_GET['t']);
+            if (@$_GET['skips'] == 'no' || @$_GET['show-skips'] == 'no') {
+                $reporter = new NoSkipsReporter($reporter);
+            }
+        }
+        parent::__construct($reporter);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/detached.php b/3rdparty/simpletest/detached.php
new file mode 100755
index 00000000000..a325e140d02
--- /dev/null
+++ b/3rdparty/simpletest/detached.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: detached.php 1784 2008-04-26 13:07:14Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/xml.php');
+require_once(dirname(__FILE__) . '/shell_tester.php');
+/**#@-*/
+
+/**
+ *    Runs an XML formated test in a separate process.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class DetachedTestCase {
+    private $command;
+    private $dry_command;
+    private $size;
+
+    /**
+     *    Sets the location of the remote test.
+     *    @param string $command       Test script.
+     *    @param string $dry_command   Script for dry run.
+     *    @access public
+     */
+    function __construct($command, $dry_command = false) {
+        $this->command = $command;
+        $this->dry_command = $dry_command ? $dry_command : $command;
+        $this->size = false;
+    }
+
+    /**
+     *    Accessor for the test name for subclasses.
+     *    @return string       Name of the test.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->command;
+    }
+
+    /**
+     *    Runs the top level test for this class. Currently
+     *    reads the data as a single chunk. I'll fix this
+     *    once I have added iteration to the browser.
+     *    @param SimpleReporter $reporter    Target of test results.
+     *    @returns boolean                   True if no failures.
+     *    @access public
+     */
+    function run(&$reporter) {
+        $shell = &new SimpleShell();
+        $shell->execute($this->command);
+        $parser = &$this->createParser($reporter);
+        if (! $parser->parse($shell->getOutput())) {
+            trigger_error('Cannot parse incoming XML from [' . $this->command . ']');
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Accessor for the number of subtests.
+     *    @return integer       Number of test cases.
+     *    @access public
+     */
+    function getSize() {
+        if ($this->size === false) {
+            $shell = &new SimpleShell();
+            $shell->execute($this->dry_command);
+            $reporter = &new SimpleReporter();
+            $parser = &$this->createParser($reporter);
+            if (! $parser->parse($shell->getOutput())) {
+                trigger_error('Cannot parse incoming XML from [' . $this->dry_command . ']');
+                return false;
+            }
+            $this->size = $reporter->getTestCaseCount();
+        }
+        return $this->size;
+    }
+
+    /**
+     *    Creates the XML parser.
+     *    @param SimpleReporter $reporter    Target of test results.
+     *    @return SimpleTestXmlListener      XML reader.
+     *    @access protected
+     */
+    protected function &createParser(&$reporter) {
+        return new SimpleTestXmlParser($reporter);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/docs/en/authentication_documentation.html b/3rdparty/simpletest/docs/en/authentication_documentation.html
new file mode 100644
index 00000000000..e058e19a111
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/authentication_documentation.html
@@ -0,0 +1,378 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest documentation for testing log-in and authentication</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <span class="chosen">Authentication</span>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Authentication documentation</h1>
+        This page...
+        <ul>
+<li>
+            Getting through <a href="#basic">Basic HTTP authentication</a>
+        </li>
+<li>
+            Testing <a href="#cookies">cookie based authentication</a>
+        </li>
+<li>
+            Managing <a href="#session">browser sessions</a> and timeouts
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                One of the trickiest, and yet most important, areas
+                of testing web sites is the security.
+                Testing these schemes is one of the core goals of
+                the SimpleTest web tester.
+            </p>
+        
+        <h2>
+<a class="target" name="basic"></a>Basic HTTP authentication</h2>
+            <p>
+                If you fetch a page protected by basic authentication then
+                rather than receiving content, you will instead get a 401
+                header.
+                We can illustrate this with this test...
+<pre>
+class AuthenticationTest extends WebTestCase {<strong>
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');
+        $this-&gt;showHeaders();
+    }</strong>
+}
+</pre>
+                This allows us to see the challenge header...
+                <div class="demo">
+                    <h1>File test</h1>
+<pre>
+HTTP/1.1 401 Authorization Required
+Date: Sat, 18 Sep 2004 19:25:18 GMT
+Server: Apache/1.3.29 (Unix) PHP/4.3.4
+WWW-Authenticate: Basic realm="SimpleTest basic authentication"
+Connection: close
+Content-Type: text/html; charset=iso-8859-1
+</pre>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>0</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                We are trying to get away from visual inspection though, and so SimpleTest
+                allows to make automated assertions against the challenge.
+                Here is a thorough test of our header...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');<strong>
+        $this-&gt;assertAuthentication('Basic');
+        $this-&gt;assertResponse(401);
+        $this-&gt;assertRealm('SimpleTest basic authentication');</strong>
+    }
+}
+</pre>
+                Any one of these tests would normally do on it's own depending
+                on the amount of detail you want to see.
+            </p>
+            <p>
+                One theme that runs through SimpleTest is the ability to use
+                <span class="new_code">SimpleExpectation</span> objects wherever a simple
+                match is not enough.
+                If you want only an approximate match to the realm for
+                example, you can do this...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');
+        $this-&gt;assertRealm(<strong>new PatternExpectation('/simpletest/i')</strong>);
+    }
+}
+</pre>
+                This type of test, testing HTTP responses, is not typical.
+            </p>
+            <p>
+                Most of the time we are not interested in testing the
+                authentication itself, but want to get past it to test
+                the pages underneath.
+                As soon as the challenge has been issued we can reply with
+                an authentication response...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function testCanAuthenticate() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');<strong>
+        $this-&gt;authenticate('Me', 'Secret');</strong>
+        $this-&gt;assertTitle(...);
+    }
+}
+</pre>
+                The username and password will now be sent with every
+                subsequent request to that directory and subdirectories.
+                You will have to authenticate again if you step outside
+                the authenticated directory, but SimpleTest is smart enough
+                to merge subdirectories into a common realm.
+            </p>
+            <p>
+                If you want, you can shortcut this step further by encoding
+                the log in details straight into the URL...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function testCanReadAuthenticatedPages() {
+        $this-&gt;get('http://<strong>Me:Secret@</strong>www.lastcraft.com/protected/');
+        $this-&gt;assertTitle(...);
+    }
+}
+</pre>
+                If your username or password has special characters, then you
+                will have to URL encode them or the request will not be parsed
+                correctly.
+                I'm afraid we leave this up to you.
+            </p>
+            <p>
+                A problem with encoding the login details directly in the URL is
+                the authentication header will not be sent on subsequent requests.
+                If you navigate with relative URLs though, the authentication
+                information will be preserved along with the domain name.
+            </p>
+            <p>
+                Normally though, you use the <span class="new_code">authenticate()</span> call.
+                SimpleTest will then remember your login information on each request.
+            </p>
+            <p>
+                Only testing with basic authentication is currently supported, and
+                this is only really secure in tandem with HTTPS connections.
+                This is usually good enough to protect test server from prying eyes,
+                however.
+                Digest authentication and NTLM authentication may be added
+                in the future if enough people request this feature.
+            </p>
+        
+        <h2>
+<a class="target" name="cookies"></a>Cookies</h2>
+            <p>
+                Basic authentication doesn't give enough control over the
+                user interface for web developers.
+                More likely this functionality will be coded directly into
+                the web architecture using cookies with complicated timeouts.
+                We need to be able to test this too.
+            </p>
+            <p>
+                Starting with a simple log-in form...
+<pre>
+&lt;form&gt;
+    Username:
+    &lt;input type="text" name="u" value="" /&gt;&lt;br /&gt;
+    Password:
+    &lt;input type="password" name="p" value="" /&gt;&lt;br /&gt;
+    &lt;input type="submit" value="Log in" /&gt;
+&lt;/form&gt;
+</pre>
+                Which looks like...
+            </p>
+            <p>
+                <form class="demo">
+                    Username:
+                    <input type="text" name="u" value=""><br>
+                    Password:
+                    <input type="password" name="p" value=""><br>
+                    <input type="submit" value="Log in">
+                </form>
+            </p>
+            <p>
+                Let's suppose that in fetching this page a cookie has been
+                set with a session ID.
+                We are not going to fill the form in yet, just test that
+                we are tracking the user.
+                Here is the test...
+<pre>
+class LogInTest extends WebTestCase {
+    function testSessionCookieSetBeforeForm() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $this-&gt;assertCookie('SID');</strong>
+    }
+}
+</pre>
+                All we are doing is confirming that the cookie is set.
+                As the value is likely to be rather cryptic it's not
+                really worth testing this with...
+<pre>
+class LogInTest extends WebTestCase {
+    function testSessionCookieIsCorrectPattern() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;assertCookie('SID', <strong>new PatternExpectation('/[a-f0-9]{32}/i')</strong>);
+    }
+}
+</pre>
+                If you are using PHP to handle sessions for you then
+                this test is even more useless, as we are just testing PHP itself.
+            </p>
+            <p>
+                The simplest test of logging in is to visually inspect the
+                next page to see if you are really logged in.
+                Just test the next page with <span class="new_code">WebTestCase::assertText()</span>.
+            </p>
+            <p>
+                The test is similar to any other form test,
+                but we might want to confirm that we still have the same
+                cookie after log-in as before we entered.
+                We wouldn't want to lose track of this after all.
+                Here is a possible test for this...
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testSessionCookieSameAfterLogIn() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $session = $this-&gt;getCookie('SID');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;click('Log in');
+        $this-&gt;assertText('Welcome Me');
+        $this-&gt;assertCookie('SID', $session);</strong>
+    }
+}
+</pre>
+                This confirms that the session identifier is maintained
+                afer log-in and we haven't accidently reset it.
+            </p>
+            <p>
+                We could even attempt to hack our own system by setting
+                arbitrary cookies to gain access...
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testSessionCookieSameAfterLogIn() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $this-&gt;setCookie('SID', 'Some other session');
+        $this-&gt;get('http://www.my-site.com/restricted.php');</strong>
+        $this-&gt;assertText('Access denied');
+    }
+}
+</pre>
+                Is your site protected from this attack?
+            </p>
+        
+        <h2>
+<a class="target" name="session"></a>Browser sessions</h2>
+            <p>
+                If you are testing an authentication system a critical piece
+                of behaviour is what happens when a user logs back in.
+                We would like to simulate closing and reopening a browser...
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testLoseAuthenticationAfterBrowserClose() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;click('Log in');
+        $this-&gt;assertText('Welcome Me');<strong>
+        
+        $this-&gt;restart();
+        $this-&gt;get('http://www.my-site.com/restricted.php');
+        $this-&gt;assertText('Access denied');</strong>
+    }
+}
+</pre>
+                The <span class="new_code">WebTestCase::restart()</span> method will
+                preserve cookies that have unexpired timeouts, but throw away
+                those that are temporary or expired.
+                You can optionally specify the time and date that the restart
+                happened.
+            </p>
+            <p>
+                Expiring cookies can be a problem.
+                After all, if you have a cookie that expires after an hour,
+                you don't want to stall the test for an hour while waiting
+                for the cookie to pass it's timeout.
+            </p>
+            <p>
+                To push the cookies over the hour limit you can age them
+                before you restart the session...
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testLoseAuthenticationAfterOneHour() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;click('Log in');
+        $this-&gt;assertText('Welcome Me');
+        <strong>
+        $this-&gt;ageCookies(3600);</strong>
+        $this-&gt;restart();
+        $this-&gt;get('http://www.my-site.com/restricted.php');
+        $this-&gt;assertText('Access denied');
+    }
+}
+</pre>
+                After the restart it will appear that cookies are an
+                hour older, and any that pass their expiry will have
+                disappeared.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <span class="chosen">Authentication</span>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/browser_documentation.html b/3rdparty/simpletest/docs/en/browser_documentation.html
new file mode 100644
index 00000000000..809c1431137
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/browser_documentation.html
@@ -0,0 +1,501 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest documentation for the scriptable web browser component</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <span class="chosen">Scriptable browser</span>
+</div></div>
+<h1>PHP Scriptable Web Browser</h1>
+        This page...
+        <ul>
+<li>
+            Using the bundled <a href="#scripting">web browser in scripts</a>
+        </li>
+<li>
+            <a href="#debug">Debugging</a> failed pages
+        </li>
+<li>
+            Complex <a href="#unit">tests with multiple web browsers</a>
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                SimpleTest's web browser component can be used not just
+                outside of the <span class="new_code">WebTestCase</span> class, but also
+                independently of the SimpleTest framework itself.
+            </p>
+        
+        <h2>
+<a class="target" name="scripting"></a>The Scriptable Browser</h2>
+            <p>
+                You can use the web browser in PHP scripts to confirm
+                services are up and running, or to extract information
+                from them at a regular basis.
+                For example, here is a small script to extract the current number of
+                open PHP 5 bugs from the <a href="http://www.php.net/">PHP web site</a>...
+<pre>
+<strong>&lt;?php
+require_once('simpletest/browser.php');
+    
+$browser = &amp;new SimpleBrowser();
+$browser-&gt;get('http://php.net/');
+$browser-&gt;click('reporting bugs');
+$browser-&gt;click('statistics');
+$page = $browser-&gt;click('PHP 5 bugs only');
+preg_match('/status=Open.*?by=Any.*?(\d+)&lt;\/a&gt;/', $page, $matches);
+print $matches[1];
+?&gt;</strong>
+</pre>
+                There are simpler methods to do this particular example in PHP
+                of course.
+                For example you can just use the PHP <span class="new_code">file()</span>
+                command against what here is a pretty fixed page.
+                However, using the web browser for scripts allows authentication,
+                correct handling of cookies, automatic loading of frames, redirects,
+                form submission and the ability to examine the page headers.
+            <p>
+            </p>
+                Methods such as periodic scraping are fragile against a site that is constantly
+                evolving and you would want a more direct way of accessing
+                data in a permanent set up, but for simple tasks this can provide
+                a very rapid solution.
+            </p>
+            <p>
+                All of the navigation methods used in the
+                <a href="web_tester_documentation.html">WebTestCase</a>
+                are present in the <span class="new_code">SimpleBrowser</span> class, but
+                the assertions are replaced with simpler accessors.
+                Here is a full list of the page navigation methods...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">addHeader($header)</span></td>
+<td>Adds a header to every fetch</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useProxy($proxy, $username, $password)</span></td>
+<td>Use this proxy from now on</td>
+</tr>
+                    <tr>
+<td><span class="new_code">head($url, $parameters)</span></td>
+<td>Perform a HEAD request</td>
+</tr>
+                    <tr>
+<td><span class="new_code">get($url, $parameters)</span></td>
+<td>Fetch a page with GET</td>
+</tr>
+                    <tr>
+<td><span class="new_code">post($url, $parameters)</span></td>
+<td>Fetch a page with POST</td>
+</tr>
+                    <tr>
+<td><span class="new_code">click($label)</span></td>
+<td>Clicks visible link or button text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLink($label)</span></td>
+<td>Follows a link by label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLinkById($id)</span></td>
+<td>Follows a link by attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>Current URL of page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getTitle()</span></td>
+<td>Page title</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getContent()</span></td>
+<td>Raw page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getContentAsText()</span></td>
+<td>HTML removed except for alt text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">retry()</span></td>
+<td>Repeat the last request</td>
+</tr>
+                    <tr>
+<td><span class="new_code">back()</span></td>
+<td>Use the browser back button</td>
+</tr>
+                    <tr>
+<td><span class="new_code">forward()</span></td>
+<td>Use the browser forward button</td>
+</tr>
+                    <tr>
+<td><span class="new_code">authenticate($username, $password)</span></td>
+<td>Retry page or frame after a 401 response</td>
+</tr>
+                    <tr>
+<td><span class="new_code">restart($date)</span></td>
+<td>Restarts the browser for a new session</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ageCookies($interval)</span></td>
+<td>Ages the cookies by the specified time</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setCookie($name, $value)</span></td>
+<td>Sets an additional cookie</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getCookieValue($host, $path, $name)</span></td>
+<td>Reads the most specific cookie</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getCurrentCookieValue($name)</span></td>
+<td>Reads cookie for the current context</td>
+</tr>
+                </tbody></table>
+                The methods <span class="new_code">SimpleBrowser::useProxy()</span> and
+                <span class="new_code">SimpleBrowser::addHeader()</span> are special.
+                Once called they continue to apply to all subsequent fetches.
+            </p>
+            <p>
+                Navigating forms is similar to the
+                <a href="form_testing_documentation.html">WebTestCase form navigation</a>...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setField($label, $value)</span></td>
+<td>Sets all form fields with that label or name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFieldByName($name, $value)</span></td>
+<td>Sets all form fields with that name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFieldById($id, $value)</span></td>
+<td>Sets all form fields with that id</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getField($label)</span></td>
+<td>Accessor for a form element value by label tag and then name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFieldByName($name)</span></td>
+<td>Accessor for a form element value using name attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFieldById($id)</span></td>
+<td>Accessor for a form element value</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmit($label)</span></td>
+<td>Submits form by button label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitByName($name)</span></td>
+<td>Submits form by button attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitById($id)</span></td>
+<td>Submits form by button attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImage($label, $x, $y)</span></td>
+<td>Clicks an input tag of type image by title or alt text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageByName($name, $x, $y)</span></td>
+<td>Clicks an input tag of type image by name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageById($id, $x, $y)</span></td>
+<td>Clicks an input tag of type image by ID attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">submitFormById($id)</span></td>
+<td>Submits by the form tag attribute</td>
+</tr>
+                </tbody></table>
+                At the moment there aren't many methods to list available links and fields.
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">isClickable($label)</span></td>
+<td>Test to see if a click target exists by label or name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isSubmit($label)</span></td>
+<td>Test for the existence of a button with that label or name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isImage($label)</span></td>
+<td>Test for the existence of an image button with that label or name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getLink($label)</span></td>
+<td>Finds a URL from its label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getLinkById($label)</span></td>
+<td>Finds a URL from its ID attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrls()</span></td>
+<td>Lists available links in the current page</td>
+</tr>
+                </tbody></table>
+                This will be expanded in later versions of SimpleTest.
+            </p>
+            <p>
+                Frames are a rather esoteric feature these days, but SimpleTest has
+                retained support for them.
+            </p>
+            <p>
+                Within a page, individual frames can be selected.
+                If no selection is made then all the frames are merged together
+                in one large conceptual page.
+                The content of the current page will be a concatenation of all of the
+                frames in the order that they were specified in the "frameset"
+                tags.
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">getFrames()</span></td>
+<td>A dump of the current frame structure</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFrameFocus()</span></td>
+<td>Current frame label or index</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocusByIndex($choice)</span></td>
+<td>Select a frame numbered from 1</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocus($name)</span></td>
+<td>Select frame by label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clearFrameFocus()</span></td>
+<td>Treat all the frames as a single page</td>
+</tr>
+                </tbody></table>
+                When focused on a single frame, the content will come from
+                that frame only.
+                This includes links to click and forms to submit.
+            </p>
+        
+        <h2>
+<a class="target" name="debug"></a>What went wrong?</h2>
+            <p>
+                All of this functionality is great when we actually manage to fetch pages,
+                but that doesn't always happen.
+                To help figure out what went wrong, the browser has some methods to
+                aid in debugging...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setConnectionTimeout($timeout)</span></td>
+<td>Close the socket on overrun</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>Url of most recent page fetched</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getRequest()</span></td>
+<td>Raw request header of page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getHeaders()</span></td>
+<td>Raw response header of page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getTransportError()</span></td>
+<td>Any socket level errors in the last fetch</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getResponseCode()</span></td>
+<td>HTTP response of page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getMimeType()</span></td>
+<td>Mime type of page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getAuthentication()</span></td>
+<td>Authentication type in 401 challenge header</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getRealm()</span></td>
+<td>Authentication realm in 401 challenge header</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getBaseUrl()</span></td>
+<td>Base url only of most recent page fetched</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumRedirects($max)</span></td>
+<td>Number of redirects before page is loaded anyway</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumNestedFrames($max)</span></td>
+<td>Protection against recursive framesets</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreFrames()</span></td>
+<td>Disables frames support</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useFrames()</span></td>
+<td>Enables frames support</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreCookies()</span></td>
+<td>Disables sending and receiving of cookies</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useCookies()</span></td>
+<td>Enables cookie support</td>
+</tr>
+                </tbody></table>
+                The methods <span class="new_code">SimpleBrowser::setConnectionTimeout()</span>
+                <span class="new_code">SimpleBrowser::setMaximumRedirects()</span>,
+                <span class="new_code">SimpleBrowser::setMaximumNestedFrames()</span>,
+                <span class="new_code">SimpleBrowser::ignoreFrames()</span>,
+                <span class="new_code">SimpleBrowser::useFrames()</span>,
+                <span class="new_code">SimpleBrowser::ignoreCookies()</span> and
+                <span class="new_code">SimpleBrowser::useCokies()</span> continue to apply
+                to every subsequent request.
+                The other methods are frames aware.
+                This means that if you have an individual frame that is not
+                loading, navigate to it using <span class="new_code">SimpleBrowser::setFrameFocus()</span>
+                and you can then use <span class="new_code">SimpleBrowser::getRequest()</span>, etc to
+                see what happened.
+            </p>
+        
+        <h2>
+<a class="target" name="unit"></a>Complex unit tests with multiple browsers</h2>
+            <p>
+                Anything that could be done in a
+                <a href="web_tester_documentation.html">WebTestCase</a> can
+                now be done in a <a href="unit_tester_documentation.html">UnitTestCase</a>.
+                This means that we could freely mix domain object testing with the
+                web interface...
+<pre>
+<strong>class TestOfRegistration extends UnitTestCase {
+    function testNewUserAddedToAuthenticator() {</strong>
+        $browser = new SimpleBrowser();
+        $browser-&gt;get('http://my-site.com/register.php');
+        $browser-&gt;setField('email', 'me@here');
+        $browser-&gt;setField('password', 'Secret');
+        $browser-&gt;click('Register');
+        <strong>
+        $authenticator = new Authenticator();
+        $member = $authenticator-&gt;findByEmail('me@here');
+        $this-&gt;assertEqual($member-&gt;getPassword(), 'Secret');
+    }
+}</strong>
+</pre>
+                While this may be a useful temporary expediency, I am not a fan
+                of this type of testing.
+                The testing has cut across application layers, make it twice as
+                likely it will need refactoring when the code changes.
+            </p>
+            <p>
+                A more useful case of where using the browser directly can be helpful
+                is where the <span class="new_code">WebTestCase</span> cannot cope.
+                An example is where two browsers are needed at the same time.
+            </p>
+            <p>
+                For example, say we want to disallow multiple simultaneous
+                usage of a site with the same username.
+                This test case will do the job...
+<pre>
+class TestOfSecurity extends UnitTestCase {
+    function testNoMultipleLoginsFromSameUser() {<strong>
+        $first_attempt = new SimpleBrowser();
+        $first_attempt-&gt;get('http://my-site.com/login.php');
+        $first_attempt-&gt;setField('name', 'Me');
+        $first_attempt-&gt;setField('password', 'Secret');
+        $first_attempt-&gt;click('Enter');
+        $this-&gt;assertEqual($first_attempt-&gt;getTitle(), 'Welcome');
+        
+        $second_attempt = new SimpleBrowser();
+        $second_attempt-&gt;get('http://my-site.com/login.php');
+        $second_attempt-&gt;setField('name', 'Me');
+        $second_attempt-&gt;setField('password', 'Secret');
+        $second_attempt-&gt;click('Enter');
+        $this-&gt;assertEqual($second_attempt-&gt;getTitle(), 'Access Denied');</strong>
+    }
+}
+</pre>
+                You can also use the <span class="new_code">SimpleBrowser</span> class
+                directly when you want to write test cases using a different
+                test tool than SimpleTest, such as PHPUnit.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <span class="chosen">Scriptable browser</span>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/docs.css b/3rdparty/simpletest/docs/en/docs.css
new file mode 100755
index 00000000000..18368a04f7a
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/docs.css
@@ -0,0 +1,121 @@
+body {
+    padding-left: 3%;
+    padding-right: 3%;
+}
+h1, h2, h3 {
+	font-family: sans-serif;
+}
+h1 {
+    text-align: center;
+}
+pre {
+    font-family: "courier new", courier, typewriter, monospace;
+    font-size: 90%;
+    border: 1px solid;
+	border-color: #999966;
+    background-color: #ffffcc;
+    padding: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+}
+.code, .new_code, pre.new_code {
+    font-family: "courier new", courier, typewriter, monospace;
+    font-weight: bold;
+}
+div.copyright {
+    font-size: 80%;
+    color: gray;
+}
+div.copyright a {
+    margin-top: 1em;
+    color: gray;
+}
+ul.api {
+    border: 2px outset;
+    border-color: gray;
+    background-color: white;
+    margin: 5px;
+    margin-left: 5%;
+    margin-right: 5%;
+}
+ul.api li {
+    margin-top: 0.2em;
+    margin-bottom: 0.2em;
+    list-style: none;
+    text-indent: -3em;
+    padding-left: 1em;
+}
+div.demo {
+    border: 4px ridge;
+    border-color: gray;
+    padding: 10px;
+    margin: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+    background-color: white;
+}
+div.demo span.fail {
+    color: red;
+}
+div.demo span.pass {
+    color: green;
+}
+div.demo h1 {
+    font-size: 12pt;
+    text-align: left;
+    font-weight: bold;
+}
+div.menu {
+    text-align: center;
+}
+table {
+    border: 2px outset;
+    border-color: gray;
+    background-color: white;
+    margin: 5px;
+    margin-left: 5%;
+    margin-right: 5%;
+}
+td {
+    font-size: 90%;
+}
+.shell {
+    color: white;
+}
+pre.shell {
+    border: 4px ridge;
+    border-color: gray;
+    padding: 10px;
+    margin: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+    background-color: #000100;
+	color: #99ff99;
+    font-size: 90%;
+}
+pre.file {
+    color: black;
+    border: 1px solid;
+    border-color: black;
+    padding: 10px;
+    margin: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+    background-color: white;
+    font-size: 90%;
+}
+form.demo {
+    background-color: lightgray;
+    border: 4px outset;
+    border-color: lightgray;
+    padding: 10px;
+    margin-right: 40%;
+}
+dl, dd {
+	margin:  10px;
+	margin-left:  30px;
+}
+em {
+    font-weight: bold;
+    font-family: "courier new", courier, typewriter, monospace;
+}
diff --git a/3rdparty/simpletest/docs/en/expectation_documentation.html b/3rdparty/simpletest/docs/en/expectation_documentation.html
new file mode 100644
index 00000000000..26704d5ae83
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/expectation_documentation.html
@@ -0,0 +1,476 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+        Extending the SimpleTest unit tester with additional expectation classes
+    </title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <span class="chosen">Expectations</span>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Expectation documentation</h1>
+        This page...
+        <ul>
+<li>
+            Using expectations for
+            <a href="#mock">more precise testing with mock objects</a>
+        </li>
+<li>
+            <a href="#behaviour">Changing mock object behaviour</a> with expectations
+        </li>
+<li>
+            <a href="#extending">Extending the expectations</a>
+        </li>
+<li>
+            Underneath SimpleTest <a href="#unit">uses expectation classes</a>
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="mock"></a>More control over mock objects</h2>
+            <p>
+                The default behaviour of the
+                <a href="mock_objects_documentation.html">mock objects</a>
+                in
+                <a href="http://sourceforge.net/projects/simpletest/">SimpleTest</a>
+                is either an identical match on the argument or to allow any argument at all.
+                For almost all tests this is sufficient.
+                Sometimes, though, you want to weaken a test case.
+            </p>
+            <p>
+                One place where a test can be too tightly coupled is with
+                text matching.
+                Suppose we have a component that outputs a helpful error
+                message when something goes wrong.
+                You want to test that the correct error was sent, but the actual
+                text may be rather long.
+                If you test for the text exactly, then every time the exact wording
+                of the message changes, you will have to go back and edit the test suite.
+            </p>
+            <p>
+                For example, suppose we have a news service that has failed
+                to connect to its remote source.
+<pre>
+<strong>class NewsService {
+    ...
+    function publish($writer) {
+        if (! $this-&gt;isConnected()) {
+            $writer-&gt;write('Cannot connect to news service "' .
+                    $this-&gt;_name . '" at this time. ' .
+                    'Please try again later.');
+        }
+        ...
+    }
+}</strong>
+</pre>
+                Here it is sending its content to a
+                <span class="new_code">Writer</span> class.
+                We could test this behaviour with a
+                <span class="new_code">MockWriter</span> like so...
+<pre>
+class TestOfNewsService extends UnitTestCase {
+    ...
+    function testConnectionFailure() {<strong>
+        $writer = new MockWriter();
+        $writer-&gt;expectOnce('write', array(
+                'Cannot connect to news service ' .
+                '"BBC News" at this time. ' .
+                'Please try again later.'));
+        
+        $service = new NewsService('BBC News');
+        $service-&gt;publish($writer);</strong>
+    }
+}
+</pre>
+                This is a good example of a brittle test.
+                If we decide to add additional instructions, such as
+                suggesting an alternative news source, we will break
+                our tests even though no underlying functionality
+                has been altered.
+            </p>
+            <p>
+                To get around this, we would like to do a regular expression
+                test rather than an exact match.
+                We can actually do this with...
+<pre>
+class TestOfNewsService extends UnitTestCase {
+    ...
+    function testConnectionFailure() {
+        $writer = new MockWriter();<strong>
+        $writer-&gt;expectOnce(
+                'write',
+                array(new PatternExpectation('/cannot connect/i')));</strong>
+        
+        $service = new NewsService('BBC News');
+        $service-&gt;publish($writer);
+    }
+}
+</pre>
+                Instead of passing in the expected parameter to the
+                <span class="new_code">MockWriter</span> we pass an
+                expectation class called
+                <span class="new_code">PatternExpectation</span>.
+                The mock object is smart enough to recognise this as special
+                and to treat it differently.
+                Rather than simply comparing the incoming argument to this
+                object, it uses the expectation object itself to
+                perform the test.
+            </p>
+            <p>
+                The <span class="new_code">PatternExpectation</span> takes
+                the regular expression to match in its constructor.
+                Whenever a comparison is made by the <span class="new_code">MockWriter</span>
+                against this expectation class, it will do a
+                <span class="new_code">preg_match()</span> with this pattern.
+                With our test case above, as long as "cannot connect"
+                appears in the text of the string, the mock will issue a pass
+                to the unit tester.
+                The rest of the text does not matter.
+            </p>
+            <p>
+                The possible expectation classes are...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">AnythingExpectation</span></td>
+<td>Will always match</td>
+</tr>
+                    <tr>
+<td><span class="new_code">EqualExpectation</span></td>
+<td>An equality, rather than the stronger identity comparison</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotEqualExpectation</span></td>
+<td>An inequality comparison</td>
+</tr>
+                    <tr>
+<td><span class="new_code">IndenticalExpectation</span></td>
+<td>The default mock object check which must match exactly</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotIndenticalExpectation</span></td>
+<td>Inverts the mock object logic</td>
+</tr>
+                    <tr>
+<td><span class="new_code">WithinMarginExpectation</span></td>
+<td>Compares a value to within a margin</td>
+</tr>
+                    <tr>
+<td><span class="new_code">OutsideMarginExpectation</span></td>
+<td>Checks that a value is out side the margin</td>
+</tr>
+                    <tr>
+<td><span class="new_code">PatternExpectation</span></td>
+<td>Uses a Perl Regex to match a string</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NoPatternExpectation</span></td>
+<td>Passes only if failing a Perl Regex</td>
+</tr>
+                    <tr>
+<td><span class="new_code">IsAExpectation</span></td>
+<td>Checks the type or class name only</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotAExpectation</span></td>
+<td>Opposite of the <span class="new_code">IsAExpectation</span>
+</td>
+</tr>
+                    <tr>
+<td><span class="new_code">MethodExistsExpectation</span></td>
+<td>Checks a method is available on an object</td>
+</tr>
+                    <tr>
+<td><span class="new_code">TrueExpectation</span></td>
+<td>Accepts any PHP variable that evaluates to true</td>
+</tr>
+                    <tr>
+<td><span class="new_code">FalseExpectation</span></td>
+<td>Accepts any PHP variable that evaluates to false</td>
+</tr>
+                </tbody></table>
+                Most take the expected value in the constructor.
+                The exceptions are the pattern matchers, which take a regular expression,
+                and the <span class="new_code">IsAExpectation</span> and <span class="new_code">NotAExpectation</span> which takes a type
+                or class name as a string.
+            </p>
+            <p>
+                Some examples...
+            </p>
+            <p>
+<pre>
+$mock-&gt;expectOnce('method', array(new IdenticalExpectation(14)));
+</pre>
+                This is the same as <span class="new_code">$mock-&gt;expectOnce('method', array(14))</span>.
+<pre>
+$mock-&gt;expectOnce('method', array(new EqualExpectation(14)));
+</pre>
+                This is different from the previous version in that the string
+                <span class="new_code">"14"</span> as a parameter will also pass.
+                Sometimes the additional type checks of SimpleTest are too restrictive.
+<pre>
+$mock-&gt;expectOnce('method', array(new AnythingExpectation(14)));
+</pre>
+                This is the same as <span class="new_code">$mock-&gt;expectOnce('method', array('*'))</span>.
+<pre>
+$mock-&gt;expectOnce('method', array(new IdenticalExpectation('*')));
+</pre>
+                This is handy if you want to assert a literal <span class="new_code">"*"</span>.
+<pre>
+new NotIdenticalExpectation(14)
+</pre>
+                This matches on anything other than integer 14.
+                Even the string <span class="new_code">"14"</span> would pass.
+<pre>
+new WithinMarginExpectation(14.0, 0.001)
+</pre>
+                This will accept any value from 13.999 to 14.001 inclusive.
+            </p>
+        
+        <h2>
+<a class="target" name="behaviour"></a>Using expectations to control stubs</h2>
+            <p>
+                The expectation classes can be used not just for sending assertions
+                from mock objects, but also for selecting behaviour for the
+                <a href="mock_objects_documentation.html">mock objects</a>.
+                Anywhere a list of arguments is given, a list of expectation objects
+                can be inserted instead.
+            </p>
+            <p>
+                Suppose we want a mock authorisation server to simulate a successful login,
+                but only if it receives a valid session object.
+                We can do this as follows...
+<pre>
+Mock::generate('Authorisation');
+<strong>
+$authorisation = new MockAuthorisation();
+$authorisation-&gt;returns(
+        'isAllowed',
+        true,
+        array(new IsAExpectation('Session', 'Must be a session')));
+$authorisation-&gt;returns('isAllowed', false);</strong>
+</pre>
+                We have set the default mock behaviour to return false when
+                <span class="new_code">isAllowed</span> is called.
+                When we call the method with a single parameter that
+                is a <span class="new_code">Session</span> object, it will return true.
+                We have also added a second parameter as a message.
+                This will be displayed as part of the mock object
+                failure message if this expectation is the cause of
+                a failure.
+            </p>
+            <p>
+                This kind of sophistication is rarely useful, but is included for
+                completeness.
+            </p>
+        
+        <h2>
+<a class="target" name="extending"></a>Creating your own expectations</h2>
+            <p>
+                The expectation classes have a very simple structure.
+                So simple that it is easy to create your own versions for
+                commonly used test logic.
+            </p>
+            <p>
+                As an example here is the creation of a class to test for
+                valid IP addresses.
+                In order to work correctly with the stubs and mocks the new
+                expectation class should extend
+                <span class="new_code">SimpleExpectation</span> or further extend a subclass...
+<pre>
+<strong>class ValidIp extends SimpleExpectation {
+    
+    function test($ip) {
+        return (ip2long($ip) != -1);
+    }
+    
+    function testMessage($ip) {
+        return "Address [$ip] should be a valid IP address";
+    }
+}</strong>
+</pre>
+                There are only two methods to implement.
+                The <span class="new_code">test()</span> method should
+                evaluate to true if the expectation is to pass, and
+                false otherwise.
+                The <span class="new_code">testMessage()</span> method
+                should simply return some helpful text explaining the test
+                that was carried out.
+            </p>
+            <p>
+                This class can now be used in place of the earlier expectation
+                classes.
+            </p>
+            <p>
+                Here is a more typical example, matching part of a hash...
+<pre>
+<strong>class JustField extends EqualExpectation {
+    private $key;
+    
+    function __construct($key, $expected) {
+        parent::__construct($expected);
+        $this-&gt;key = $key;
+    }
+    
+    function test($compare) {
+        if (! isset($compare[$this-&gt;key])) {
+            return false;
+        }
+        return parent::test($compare[$this-&gt;key]);
+    }
+    
+    function testMessage($compare) {
+        if (! isset($compare[$this-&gt;key])) {
+            return 'Key [' . $this-&gt;key . '] does not exist';
+        }
+        return 'Key [' . $this-&gt;key . '] -&gt; ' .
+                parent::testMessage($compare[$this-&gt;key]);
+    }
+}</strong>
+</pre>
+                We tend to seperate message clauses with
+                "&amp;nbsp;-&gt;&amp;nbsp;".
+                This allows derivative tools to reformat the output.
+            </p>
+            <p>
+                Suppose some authenticator is expecting to be given
+                a database row corresponding to the user, and we
+                only need to confirm the username is correct.
+                We can assert just their username with...
+<pre>
+$mock-&gt;expectOnce('authenticate',
+                  array(new JustKey('username', 'marcus')));
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="unit"></a>Under the bonnet of the unit tester</h2>
+            <p>
+                The <a href="http://sourceforge.net/projects/simpletest/">SimpleTest unit testing framework</a>
+                also uses the expectation classes internally for the
+                <a href="unit_test_documentation.html">UnitTestCase class</a>.
+                We can also take advantage of these mechanisms to reuse our
+                homebrew expectation classes within the test suites directly.
+            </p>
+            <p>
+                The most crude way of doing this is to use the generic
+                <span class="new_code">SimpleTest::assert()</span> method to
+                test against it directly...
+<pre>
+<strong>class TestOfNetworking extends UnitTestCase {
+    ...
+    function testGetValidIp() {
+        $server = &amp;new Server();
+        $this-&gt;assert(
+                new ValidIp(),
+                $server-&gt;getIp(),
+                'Server IP address-&gt;%s');
+    }
+}</strong>
+</pre>
+                <span class="new_code">assert()</span> will test any expectation class directly.
+            </p>
+            <p>
+                This is a little untidy compared with our usual
+                <span class="new_code">assert...()</span> syntax.
+            </p>
+            <p>
+                For such a simple case we would normally create a
+                separate assertion method on our test case rather
+                than bother using the expectation class.
+                If we pretend that our expectation is a little more
+                complicated for a moment, so that we want to reuse it,
+                we get...
+<pre>
+class TestOfNetworking extends UnitTestCase {
+    ...<strong>
+    function assertValidIp($ip, $message = '%s') {
+        $this-&gt;assert(new ValidIp(), $ip, $message);
+    }</strong>
+    
+    function testGetValidIp() {
+        $server = &amp;new Server();<strong>
+        $this-&gt;assertValidIp(
+                $server-&gt;getIp(),
+                'Server IP address-&gt;%s');</strong>
+    }
+}
+</pre>
+                It is rare to need the expectations for more than pattern
+                matching, but these facilities do allow testers to build
+                some sort of domain language for testing their application.
+                Also, complex expectation classes could make the tests
+                harder to read and debug.
+                In effect extending the test framework to create their own tool set.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The expectations mimic the constraints in <a href="http://www.jmock.org/">JMock</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">Full API for SimpleTest</a>
+            from the PHPDoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <span class="chosen">Expectations</span>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/form_testing_documentation.html b/3rdparty/simpletest/docs/en/form_testing_documentation.html
new file mode 100644
index 00000000000..328735c9dca
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/form_testing_documentation.html
@@ -0,0 +1,351 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest documentation for testing HTML forms</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <span class="chosen">Testing forms</span>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Form testing documentation</h1>
+        This page...
+        <ul>
+<li>
+            Changing form values and successfully
+            <a href="#submit">Submitting a simple form</a>
+        </li>
+<li>
+            Handling <a href="#multiple">widgets with multiple values</a>
+            by setting lists.
+        </li>
+<li>
+            Bypassing javascript to <a href="#hidden-field">set a hidden field</a>.
+        </li>
+<li>
+            <a href="#raw">Raw posting</a> when you don't have a button
+            to click.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="submit"></a>Submitting a simple form</h2>
+            <p>
+                When a page is fetched by the <span class="new_code">WebTestCase</span>
+                using <span class="new_code">get()</span> or
+                <span class="new_code">post()</span> the page content is
+                automatically parsed.
+                This results in any form controls that are inside &lt;form&gt; tags
+                being available from within the test case.
+                For example, if we have this snippet of HTML...
+<pre>
+&lt;form&gt;
+    &lt;input type="text" name="a" value="A default" /&gt;
+    &lt;input type="submit" value="Go" /&gt;
+&lt;/form&gt;
+</pre>
+                Which looks like this...
+            </p>
+            <p>
+                <form class="demo">
+                    <input type="text" name="a" value="A default">
+                    <input type="submit" value="Go">
+                </form>
+            </p>
+            <p>
+                We can navigate to this code, via the
+                <a href="http://www.lastcraft.com/form_testing_documentation.php">LastCraft</a>
+                site, with the following test...
+<pre>
+class SimpleFormTests extends WebTestCase {<strong>
+    function testDefaultValue() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('a', 'A default');
+    }</strong>
+}
+</pre>
+                Immediately after loading the page all of the HTML controls are set at
+                their default values just as they would appear in the web browser.
+                The assertion tests that a HTML widget exists in the page with the
+                name "a" and that it is currently set to the value
+                "A default".
+                As usual, we could use a pattern expectation instead of a fixed
+                string.
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testDefaultValue() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('a', <strong>new PatternExpectation('/default/')</strong>);
+    }
+}
+</pre>
+                We could submit the form straight away, but first we'll change
+                the value of the text field and only then submit it...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testDefaultValue() {
+        $this-&gt;get('http://www.my-site.com/');
+        $this-&gt;assertField('a', 'A default');<strong>
+        $this-&gt;setField('a', 'New value');
+        $this-&gt;click('Go');</strong>
+    }
+}
+</pre>
+                Because we didn't specify a method attribute on the form tag, and
+                didn't specify an action either, the test case will follow
+                the usual browser behaviour of submitting the form data as a <em>GET</em>
+                request back to the same location.
+                In general SimpleTest tries to emulate typical browser behaviour as much as possible,
+                rather than attempting to catch any form of HTML omission.
+                This is because the target of the testing framework is the PHP application
+                logic, not syntax or other errors in the HTML code.
+                For HTML errors, other tools such as
+                <a href="http://www.w3.org/People/Raggett/tidy/">HTMLTidy</a> should be used,
+                or any of the HTML and CSS validators already out there.
+            </p>
+            <p>
+                If a field is not present in any form, or if an option is unavailable,
+                then <span class="new_code">WebTestCase::setField()</span> will return
+                <span class="new_code">false</span>.
+                For example, suppose we wish to verify that a "Superuser"
+                option is not present in this form...
+<pre>
+&lt;strong&gt;Select type of user to add:&lt;/strong&gt;
+&lt;select name="type"&gt;
+    &lt;option&gt;Subscriber&lt;/option&gt;
+    &lt;option&gt;Author&lt;/option&gt;
+    &lt;option&gt;Administrator&lt;/option&gt;
+&lt;/select&gt;
+</pre>
+                Which looks like...
+            </p>
+            <p>
+                <form class="demo">
+                    <strong>Select type of user to add:</strong>
+                    <select name="type">
+                        <option>Subscriber</option>
+                        <option>Author</option>
+                        <option>Administrator</option>
+                    </select>
+                </form>
+            </p>
+            <p>
+                The following test will confirm it...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...
+    function testNoSuperuserChoiceAvailable() {<strong>
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertFalse($this-&gt;setField('type', 'Superuser'));</strong>
+    }
+}
+</pre>
+                The current selection will not be changed if the new value is not an option.
+            </p>
+            <p>
+                Here is the full list of widgets currently supported...
+                <ul>
+                    <li>Text fields, including hidden and password fields.</li>
+                    <li>Submit buttons including the button tag, although not yet reset buttons</li>
+                    <li>Text area. This includes text wrapping behaviour.</li>
+                    <li>Checkboxes, including multiple checkboxes in the same form.</li>
+                    <li>Drop down selections, including multiple selects.</li>
+                    <li>Radio buttons.</li>
+                    <li>Images.</li>
+                </ul>
+            </p>
+            <p>
+                The browser emulation offered by SimpleTest mimics
+                the actions which can be perform by a user on a
+                standard HTML page. Javascript is not supported, and
+                it's unlikely that support will be added any time
+                soon.
+            </p>
+            <p>
+                Of particular note is that the Javascript idiom of
+                passing form results by setting a hidden field cannot
+                be performed using the normal SimpleTest
+                commands. See below for a way to test such forms.
+            </p>
+        
+        <h2>
+<a class="target" name="multiple"></a>Fields with multiple values</h2>
+            <p>
+                SimpleTest can cope with two types of multivalue controls: Multiple
+                selection drop downs, and multiple checkboxes with the same name
+                within a form.
+                The multivalue nature of these means that setting and testing
+                are slightly different.
+                Using checkboxes as an example...
+<pre>
+&lt;form class="demo"&gt;
+    &lt;strong&gt;Create privileges allowed:&lt;/strong&gt;
+    &lt;input type="checkbox" name="crud" value="c" checked&gt;&lt;br&gt;
+    &lt;strong&gt;Retrieve privileges allowed:&lt;/strong&gt;
+    &lt;input type="checkbox" name="crud" value="r" checked&gt;&lt;br&gt;
+    &lt;strong&gt;Update privileges allowed:&lt;/strong&gt;
+    &lt;input type="checkbox" name="crud" value="u" checked&gt;&lt;br&gt;
+    &lt;strong&gt;Destroy privileges allowed:&lt;/strong&gt;
+    &lt;input type="checkbox" name="crud" value="d" checked&gt;&lt;br&gt;
+    &lt;input type="submit" value="Enable Privileges"&gt;
+&lt;/form&gt;
+</pre>
+                Which renders as...
+            </p>
+            <p>
+                <form class="demo">
+                    <strong>Create privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="c" checked><br>
+                    <strong>Retrieve privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="r" checked><br>
+                    <strong>Update privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="u" checked><br>
+                    <strong>Destroy privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="d" checked><br>
+                    <input type="submit" value="Enable Privileges">
+                </form>
+            </p>
+            <p>
+                If we wish to disable all but the retrieval privileges and
+                submit this information we can do it like this...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...<strong>
+    function testDisableNastyPrivileges() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('crud', array('c', 'r', 'u', 'd'));
+        $this-&gt;setField('crud', array('r'));
+        $this-&gt;click('Enable Privileges');
+    }</strong>
+}
+</pre>
+                Instead of setting the field to a single value, we give it a list
+                of values.
+                We do the same when testing expected values.
+                We can then write other test code to confirm the effect of this, perhaps
+                by logging in as that user and attempting an update.
+            </p>
+        
+        <h2>
+<a class="target" name="hidden-field"></a>Forms which use javascript to set a hidden field</h2>
+            <p>
+                If you want to test a form which relies on javascript to set a hidden
+                field, you can't just call setField().
+                The following code will <em>not</em> work:
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testEmulateMyJavascriptForm() {
+        <strong>// This does *not* work</strong>
+        $this-&gt;setField('a_hidden_field', '123');
+        $this-&gt;clickSubmit('OK');
+    }
+}
+</pre>
+                Instead, you need to pass the additional form parameters to the
+                clickSubmit() method:
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testMyJavascriptForm() {
+        <strong>$this-&gt;clickSubmit('OK', array('a_hidden_field'=&gt;'123'));</strong>
+    }
+
+}
+</pre>
+                Bear in mind that in doing this you're effectively stubbing out a
+                part of your software (the javascript code in the form), and
+                perhaps you might be better off using something like 
+                <a href="http://selenium.openqa.org/">Selenium</a> to ensure a complete
+                test.
+            </p>
+        
+        <h2>
+<a class="target" name="raw"></a>Raw posting</h2>
+            <p>
+                If you want to test a form handler, but have not yet written
+                or do not have access to the form itself, you can create a
+                form submission by hand.
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...<strong>    
+    function testAttemptedHack() {
+        $this-&gt;post(
+                'http://www.my-site.com/add_user.php',
+                array('type' =&gt; 'superuser'));
+        $this-&gt;assertNoText('user created');
+    }</strong>
+}
+</pre>
+                By adding data to the <span class="new_code">WebTestCase::post()</span>
+                method, we are emulating a form submission.
+                You would normally only do this as a temporary expedient, or where
+                you are expecting a 3rd party to submit to a form.
+                The exception is when you want tests to protect you from
+                attempts to spoof your pages.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <span class="chosen">Testing forms</span>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/group_test_documentation.html b/3rdparty/simpletest/docs/en/group_test_documentation.html
new file mode 100644
index 00000000000..10f22a2b1b9
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/group_test_documentation.html
@@ -0,0 +1,252 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP test suites</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <span class="chosen">Group tests</span>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Test suite documentation</h1>
+        This page...
+        <ul>
+<li>
+            Different ways to <a href="#group">group tests</a> together.
+        </li>
+<li>
+            Combining group tests into <a href="#higher">larger groups</a>.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="group"></a>Grouping tests into suites</h2>
+            <p>
+                There are many ways to group tests together into test suites.
+                One way is to simply place multiple test cases into a single file...
+<pre>
+<strong>&lt;?php
+require_once(dirname(__FILE__) . '/simpletest/autorun.php');
+require_once(dirname(__FILE__) . '/../classes/io.php');
+
+class FileTester extends UnitTestCase {
+    ...
+}
+
+class SocketTester extends UnitTestCase {
+    ...
+}
+?&gt;</strong>
+</pre>
+                As many cases as needed can appear in a single file.
+                They should include any code they need, such as the library
+                being tested, but need none of the SimpleTest libraries.
+            </p>
+            <p>
+                Occasionally special subclasses are created that methods useful
+                for testing part of the application.
+                These new base classes are then used in place of <span class="new_code">UnitTestCase</span>
+                or <span class="new_code">WebTestCase</span>.
+                You don't normally want to run these as test cases.
+                Simply mark any base test cases that should not be run as abstract...
+<pre>
+<strong>abstract</strong> class MyFileTestCase extends UnitTestCase {
+    ...
+}
+
+class FileTester extends MyFileTestCase { ... }
+
+class SocketTester extends UnitTestCase { ... }
+</pre>
+                Here the <span class="new_code">FileTester</span> class does
+                not contain any actual tests, but is the base class for other
+                test cases.
+            </p>
+            <p>
+                We will call this sample <em>file_test.php</em>.
+                Currently the test cases are grouped simply by being in the same file.
+                We can build larger constructs just by including other test files in.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('file_test.php');
+?&gt;
+</pre>
+                This will work, but create a purely flat hierarchy.
+                INstead we create a test suite file.
+                Our top level test suite can look like this...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class AllFileTests extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        <strong>$this-&gt;addFile('file_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                What happens here is that the <span class="new_code">TestSuite</span>
+                class will do the <span class="new_code">require_once()</span>
+                for us.
+                It then checks to see if any new test case classes
+                have been created by the new file and automatically composes
+                them to the test suite.
+                This method gives us the most control as we just manually add
+                more test files as our test suite grows.
+            </p>
+            <p>
+                If this is too much typing, and you are willing to group
+                test suites together in their own directories or otherwise
+                tag the file names, then there is a more automatic way...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class AllFileTests extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;collect(dirname(__FILE__) . '/unit',
+                       new SimplePatternCollector('/_test.php/'));
+    }
+}
+?&gt;
+</pre>
+                This will scan a directory called "unit" for any files
+                ending with "_test.php" and load them.
+                You don't have to use <span class="new_code">SimplePatternCollector</span> to
+                filter by a pattern in the filename, but this is the most common
+                usage.
+            </p>
+            <p>
+                That snippet above is very common in practice.
+                Now all you have to do is drop a file of test cases into the
+                directory and it will run just by running the test suite script.
+            </p>
+            <p>
+                The catch is that you cannot control the order in which the test
+                cases are run.
+                If you want to see lower level components fail first in the test suite,
+                and this will make diagnosis a lot easier, then you should manually
+                call <span class="new_code">addFile()</span> for these.
+                Tests cases are only loaded once, so it's fine to have these included
+                again by a directory scan.
+            </p>
+            <p>
+                Test cases loaded with the <span class="new_code">addFile</span> method have some
+                useful properties.
+                You can guarantee that the constructor is run
+                just before the first test method and the destructor
+                is run just after the last test method.
+                This allows you to place test case wide set up and tear down
+                code in the constructor and destructor, just like a normal
+                class.
+            </p>
+        
+        <h2>
+<a class="target" name="higher"></a>Composite suites</h2>
+            <p>
+                The above method places all of the test cases into one large suite.
+                For larger projects though this may not be flexible enough; you
+                may want to group the tests together in all sorts of ways.
+            </p>
+            <p>
+                Everything we have described so far with test scripts applies to
+                <span class="new_code">TestSuite</span>s as well...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+<strong>
+class BigTestSuite extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('file_tests.php');
+    }
+}</strong>
+?&gt;
+</pre>
+                This effectively adds our test cases and a single suite below
+                the first.
+                When a test fails, we see the breadcrumb trail of the nesting.
+                We can even mix groups and test cases freely as long as
+                we are careful about loops in our includes.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class BigTestSuite extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('file_tests.php');
+        <strong>$this-&gt;addFile('some_other_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                Note that in the event of a double include, ony the first instance
+                of the test case will be run.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <span class="chosen">Group tests</span>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/index.html b/3rdparty/simpletest/docs/en/index.html
new file mode 100644
index 00000000000..9f022d6b10b
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/index.html
@@ -0,0 +1,542 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+        Download the SimpleTest testing framework -
+        Unit tests and mock objects for PHP
+    </title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<span class="chosen">SimpleTest</span>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>SimpleTest for PHP</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#unit">Using unit tester</a>
+            with an example.
+        </li>
+<li>
+            <a href="#group">Grouping tests</a>
+            for testing with one click.
+        </li>
+<li>
+            <a href="#mock">Using mock objects</a>
+            to ease testing and gain tighter control.
+        </li>
+<li>
+            <a href="#web">Testing web pages</a>
+            at the browser level.
+        </li>
+</ul>
+<div class="content">
+        
+        
+            <p>
+                The following assumes that you are familiar with the concept
+                of unit testing as well as the PHP web development language.
+                It is a guide for the impatient new user of
+                <a href="https://sourceforge.net/project/showfiles.php?group_id=76550">SimpleTest</a>.
+                For fuller documentation, especially if you are new
+                to unit testing see the ongoing
+                <a href="unit_test_documentation.html">documentation</a>, and for
+                example test cases see the
+                <a href="http://www.lastcraft.com/first_test_tutorial.php">unit testing tutorial</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="unit"></a>Using the tester quickly</h2>
+            <p>
+                Amongst software testing tools, a unit tester is the one
+                closest to the developer.
+                In the context of agile development the test code sits right
+                next to the source code as both are written simultaneously.
+                In this context SimpleTest aims to be a complete PHP developer
+                test solution and is called "Simple" because it
+                should be easy to use and extend.
+                It wasn't a good choice of name really.
+                It includes all of the typical functions you would expect from
+                <a href="http://www.junit.org/">JUnit</a> and the
+                <a href="http://sourceforge.net/projects/phpunit/">PHPUnit</a>
+                ports, and includes
+                <a href="http://www.mockobjects.com">mock objects</a>.
+            </p>
+            <p>
+                What makes this tool immediately useful to the PHP developer is the internal
+                web browser.
+                This allows tests that navigate web sites, fill in forms and test pages.
+                Being able to write these test in PHP means that it is easy to write
+                integrated tests.
+                An example might be confirming that a user was written to a database
+                after a signing up through the web site.
+            </p>
+            <p>
+                The quickest way to demonstrate SimpleTest is with an example.
+            </p>
+            <p>
+                Let us suppose we are testing a simple file logging class called
+                <span class="new_code">Log</span> in <em>classes/log.php</em>.
+                We start by creating a test script which we will call
+                <em>tests/log_test.php</em> and populate it as follows...
+<pre>
+&lt;?php
+<strong>require_once('simpletest/autorun.php');</strong>
+require_once('../classes/log.php');
+
+class TestOfLogging extends <strong>UnitTestCase</strong> {
+}
+?&gt;
+</pre>
+                Here the <em>simpletest</em> folder is either local or in the path.
+                You would have to edit these locations depending on where you
+                unpacked the toolset.
+                The "autorun.php" file does more than just include the
+                SimpleTest files, it also runs our test for us.
+            </p>
+            <p>
+                The <span class="new_code">TestOfLogging</span> is our first test case and it's
+                currently empty.
+                Each test case is a class that extends one of the SimpleTet base classes
+                and we can have as many of these in the file as we want.
+            </p>
+            <p>
+                With three lines of scaffolding, and our <span class="new_code">Log</span> class
+                include, we have a test suite.
+                No tests though.
+            </p>
+            <p>
+                For our first test, we'll assume that the <span class="new_code">Log</span> class
+                takes the file name to write to in the constructor, and we have
+                a temporary folder in which to place this file...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+
+class TestOfLogging extends UnitTestCase {
+    function <strong>testLogCreatesNewFileOnFirstMessage()</strong> {
+        @unlink('/temp/test.log');
+        $log = new Log('/temp/test.log');
+        <strong>$this-&gt;assertFalse(file_exists('/temp/test.log'));</strong>
+        $log-&gt;message('Should write this to a file');
+        <strong>$this-&gt;assertTrue(file_exists('/temp/test.log'));</strong>
+    }
+}
+?&gt;
+</pre>
+                When a test case runs, it will search for any method that
+                starts with the string "test"
+                and execute that method.
+                If the method starts "test", it's a test.
+                Note the very long name <span class="new_code">testLogCreatesNewFileOnFirstMessage()</span>.
+                This is considered good style and makes the test output more readable.
+            </p>
+            <p>
+                We would normally have more than one test method in a test case,
+                but that's for later.
+            </p>
+            <p>
+                Assertions within the test methods trigger messages to the
+                test framework which displays the result immediately.
+                This immediate response is important, not just in the event
+                of the code causing a crash, but also so that
+                <span class="new_code">print</span> statements can display
+                their debugging content right next to the assertion concerned.
+            </p>
+            <p>
+                To see these results we have to actually run the tests.
+                No other code is necessary - we can just open the page
+                with our browser.
+            </p>
+            <p>
+                On failure the display looks like this...
+                <div class="demo">
+                    <h1>TestOfLogging</h1>
+                    <span class="fail">Fail</span>: testLogCreatesNewFileOnFirstMessage-&gt;True assertion failed.<br>
+                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
+                    <strong>1</strong> passes and <strong>1</strong> fails.</div>
+                </div>
+                ...and if it passes like this...
+                <div class="demo">
+                    <h1>TestOfLogging</h1>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>2</strong> passes and <strong>0</strong> fails.</div>
+                </div>
+                And if you get this...
+                <div class="demo">
+                    <b>Fatal error</b>:  Failed opening required '../classes/log.php' (include_path='') in <b>/home/marcus/projects/lastcraft/tutorial_tests/Log/tests/log_test.php</b> on line <b>7</b>
+                </div>
+                it means you're missing the <em>classes/Log.php</em> file that could look like...
+<pre>
+&lt;?php<strong>
+class Log {
+    function Log($file_path) {
+    }
+
+    function message() {
+    }
+}</strong>
+?&gt;
+</pre>
+                It's fun to write the code after the test.
+                More than fun even -
+                this system is called "Test Driven Development".
+            </p>
+            <p>
+                For more information about <span class="new_code">UnitTestCase</span>, see
+                the <a href="unit_test_documentation.html">unit test documentation</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="group"></a>Building test suites</h2>
+            <p>
+                It is unlikely in a real application that we will only ever run
+                one test case.
+                This means that we need a way of grouping cases into a test
+                script that can, if need be, run every test for the application.
+            </p>
+            <p>
+                Our first step is to create a new file called <em>tests/all_tests.php</em>
+                and insert the following code...
+<pre>
+&lt;?php
+<strong>require_once('simpletest/autorun.php');</strong>
+
+class AllTests extends <strong>TestSuite</strong> {
+    function AllTests() {
+        $this-&gt;TestSuite(<strong>'All tests'</strong>);
+        <strong>$this-&gt;addFile('log_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                The "autorun" include allows our upcoming test suite
+                to be run just by invoking this script.
+            </p>
+            <p>
+                The <span class="new_code">TestSuite</span> subclass must chain it's constructor.
+                This limitation will be removed in future versions.
+            </p>
+            <p>
+                The method <span class="new_code">TestSuite::addFile()</span>
+                will include the test case file and read any new classes
+                that are descended from <span class="new_code">SimpleTestCase</span>.
+                <span class="new_code">UnitTestCase</span> is just one example of a class derived from
+                <span class="new_code">SimpleTestCase</span>, and you can create your own.
+                <span class="new_code">TestSuite::addFile()</span> can include other test suites.
+            </p>
+            <p>
+                The class will not be instantiated yet.
+                When the test suite runs it will construct each instance once
+                it reaches that test, then destroy it straight after.
+                This means that the constructor is run just before each run
+                of that test case, and the destructor is run before the next test case starts.
+            </p>
+            <p>
+                It is common to group test case code into superclasses which are not
+                supposed to run, but become the base classes of other tests.
+                For "autorun" to work properly the test case file should not blindly run
+                any other test case extensions that do not actually run tests.
+                This could result in extra test cases being counted during the test
+                run.
+                Hardly a major problem, but to avoid this inconvenience simply mark your
+                base class as <span class="new_code">abstract</span>.
+                SimpleTest won't run abstract classes.
+                If you are still using PHP4, then
+                a <span class="new_code">SimpleTestOptions::ignore()</span> directive
+                somewhere in the test case file will have the same effect.
+            </p>
+            <p>
+                Also, the test case file should not have been included
+                elsewhere or no cases will be added to this group test.
+                This would be a more serious error as if the test case classes are
+                already loaded by PHP the <span class="new_code">TestSuite::addFile()</span>
+                method will not detect them.
+            </p>
+            <p>
+                To display the results it is necessary only to invoke
+                <em>tests/all_tests.php</em> from the web server or the command line.
+            </p>
+            <p>
+                For more information about building test suites,
+                see the <a href="group_test_documentation.html">test suite documentation</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="mock"></a>Using mock objects</h2>
+            <p>
+                Let's move further into the future and do something really complicated.
+            </p>
+            <p>
+                Assume that our logging class is tested and completed.
+                Assume also that we are testing another class that is
+                required to write log messages, say a
+                <span class="new_code">SessionPool</span>.
+                We want to test a method that will probably end up looking
+                like this...
+<pre><strong>
+class SessionPool {
+    ...
+    function logIn($username) {
+        ...
+        $this-&gt;_log-&gt;message("User $username logged in.");
+        ...
+    }
+    ...
+}
+</strong>
+</pre>
+                In the spirit of reuse, we are using our
+                <span class="new_code">Log</span> class.
+                A conventional test case might look like this...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+<strong>require_once('../classes/session_pool.php');</strong>
+
+class <strong>TestOfSessionLogging</strong> extends UnitTestCase {
+    
+    function setUp() {
+        <strong>@unlink('/temp/test.log');</strong>
+    }
+    
+    function tearDown() {
+        <strong>@unlink('/temp/test.log');</strong>
+    }
+    
+    function testLoggingInIsLogged() {
+        <strong>$log = new Log('/temp/test.log');
+        $session_pool = &amp;new SessionPool($log);
+        $session_pool-&gt;logIn('fred');</strong>
+        $messages = file('/temp/test.log');
+        $this-&gt;assertEqual($messages[0], "User fred logged in.<strong>\n</strong>");
+    }
+}
+?&gt;
+</pre>
+                We'll explain the <span class="new_code">setUp()</span> and <span class="new_code">tearDown()</span>
+                methods later.
+            </p>
+            <p>
+                This test case design is not all bad, but it could be improved.
+                We are spending time fiddling with log files which are
+                not part of our test.
+                We have created close ties with the <span class="new_code">Log</span> class and
+                this test.
+                What if we don't use files any more, but use ths
+                <em>syslog</em> library instead?
+                It means that our <span class="new_code">TestOfSessionLogging</span> test will
+                fail, even thouh it's not testing Logging.
+            </p>
+            <p>
+                It's fragile in smaller ways too.
+                Did you notice the extra carriage return in the message?
+                Was that added by the logger?
+                What if it also added a time stamp or other data?
+            </p>
+            <p>
+                The only part that we really want to test is that a particular
+                message was sent to the logger.
+                We can reduce coupling if we pass in a fake logging class
+                that simply records the message calls for testing, but
+                takes no action.
+                It would have to look exactly like our original though.
+            </p>
+            <p>
+                If the fake object doesn't write to a file then we save on deleting
+                the file before and after each test. We could save even more
+                test code if the fake object would kindly run the assertion for us.
+            <p>
+            </p>
+                Too good to be true?
+                We can create such an object easily...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+require_once('../classes/session_pool.php');
+
+<strong>Mock::generate('Log');</strong>
+
+class TestOfSessionLogging extends UnitTestCase {
+    
+    function testLoggingInIsLogged() {<strong>
+        $log = &amp;new MockLog();
+        $log-&gt;expectOnce('message', array('User fred logged in.'));</strong>
+        $session_pool = &amp;new SessionPool(<strong>$log</strong>);
+        $session_pool-&gt;logIn('fred');
+    }
+}
+?&gt;
+</pre>
+                The <span class="new_code">Mock::generate()</span> call code generated a new class
+                called <span class="new_code">MockLog</span>.
+                This looks like an identical clone, except that we can wire test code
+                to it.
+                That's what <span class="new_code">expectOnce()</span> does.
+                It says that if <span class="new_code">message()</span> is ever called on me, it had
+                better be with the parameter "User fred logged in.".
+            </p>
+            <p>
+                The test will be triggered when the call to
+                <span class="new_code">message()</span> is invoked on the
+                <span class="new_code">MockLog</span> object by <span class="new_code">SessionPool::logIn()</span> code.
+                The mock call will trigger a parameter comparison and then send the
+                resulting pass or fail event to the test display.
+                Wildcards can be included here too, so you don't have to test every parameter of
+                a call when you only want to test one.
+            </p>
+            <p>
+                If the mock reaches the end of the test case without the
+                method being called, the <span class="new_code">expectOnce()</span>
+                expectation will trigger a test failure.
+                In other words the mocks can detect the absence of
+                behaviour as well as the presence.
+            </p>
+            <p>
+                The mock objects in the SimpleTest suite can have arbitrary
+                return values set, sequences of returns, return values
+                selected according to the incoming arguments, sequences of
+                parameter expectations and limits on the number of times
+                a method is to be invoked.
+            </p>
+            <p>
+                For more information about mocking and stubbing, see the
+                <a href="mock_objects_documentation.html">mock objects documentation</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="web"></a>Web page testing</h2>
+            <p>
+                One of the requirements of web sites is that they produce web
+                pages.
+                If you are building a project top-down and you want to fully
+                integrate testing along the way then you will want a way of
+                automatically navigating a site and examining output for
+                correctness.
+                This is the job of a web tester.
+            </p>
+            <p>
+                The web testing in SimpleTest is fairly primitive, as there is
+                no JavaScript.
+                Most other browser operations are simulated.
+            </p>
+            <p>
+                To give an idea here is a trivial example where a home
+                page is fetched, from which we navigate to an "about"
+                page and then test some client determined content.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+<strong>require_once('simpletest/web_tester.php');</strong>
+
+class TestOfAbout extends <strong>WebTestCase</strong> {
+    function testOurAboutPageGivesFreeReignToOurEgo() {
+        <strong>$this-&gt;get('http://test-server/index.php');
+        $this-&gt;click('About');
+        $this-&gt;assertTitle('About why we are so great');
+        $this-&gt;assertText('We are really great');</strong>
+    }
+}
+?&gt;
+</pre>
+                With this code as an acceptance test, you can ensure that
+                the content always meets the specifications of both the
+                developers, and the other project stakeholders.
+            </p>
+            <p>
+                You can navigate forms too...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('simpletest/web_tester.php');
+
+class TestOfRankings extends WebTestCase {
+    function testWeAreTopOfGoogle() {
+        $this-&gt;get('http://google.com/');
+        $this-&gt;setField('q', 'simpletest');
+        $this-&gt;click("I'm Feeling Lucky");
+        $this-&gt;assertTitle('SimpleTest - Unit Testing for PHP');
+    }
+}
+?&gt;
+</pre>
+                ...although this could violate Google's(tm) terms and conditions.
+            </p>
+            <p>
+                For more information about web testing, see the
+                <a href="browser_documentation.html">scriptable
+                browser documentation</a> and the
+                <a href="web_tester_documentation.html">WebTestCase</a>.
+            </p>
+            <p>
+                <a href="http://sourceforge.net/projects/simpletest/"><img src="http://sourceforge.net/sflogo.php?group_id=76550&amp;type=5" width="210" height="62" border="0" alt="SourceForge.net Logo"></a>
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            <a href="https://sourceforge.net/project/showfiles.php?group_id=76550&amp;release_id=153280">Download PHP SimpleTest</a>
+            from <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<span class="chosen">SimpleTest</span>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/mock_objects_documentation.html b/3rdparty/simpletest/docs/en/mock_objects_documentation.html
new file mode 100644
index 00000000000..b4697f9ee3b
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/mock_objects_documentation.html
@@ -0,0 +1,870 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP mock objects documentation</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <span class="chosen">Mock objects</span>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Mock objects documentation</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#what">What are mock objects?</a>
+        </li>
+<li>
+            <a href="#creation">Creating mock objects</a>.
+        </li>
+<li>
+            <a href="#expectations">Mocks as critics</a> with expectations.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="what"></a>What are mock objects?</h2>
+            <p>
+                Mock objects have two roles during a test case: actor and critic.
+            </p>
+            <p>
+                The actor behaviour is to simulate objects that are difficult to
+                set up or time consuming to set up for a test.
+                The classic example is a database connection.
+                Setting up a test database at the start of each test would slow
+                testing to a crawl and would require the installation of the
+                database engine and test data on the test machine.
+                If we can simulate the connection and return data of our
+                choosing we not only win on the pragmatics of testing, but can
+                also feed our code spurious data to see how it responds.
+                We can simulate databases being down or other extremes
+                without having to create a broken database for real.
+                In other words, we get greater control of the test environment.
+            </p>
+            <p>
+                If mock objects only behaved as actors they would simply be
+                known as "server stubs".
+                This was originally a pattern named by Robert Binder (<a href="">Testing
+                object-oriented systems</a>: models, patterns, and tools,
+                Addison-Wesley) in 1999.
+            </p>
+            <p>
+                A server stub is a simulation of an object or component.
+                It should exactly replace a component in a system for test
+                or prototyping purposes, but remain lightweight.
+                This allows tests to run more quickly, or if the simulated
+                class has not been written, to run at all.
+            </p>
+            <p>
+                However, the mock objects not only play a part (by supplying chosen
+                return values on demand) they are also sensitive to the
+                messages sent to them (via expectations).
+                By setting expected parameters for a method call they act
+                as a guard that the calls upon them are made correctly.
+                If expectations are not met they save us the effort of
+                writing a failed test assertion by performing that duty on our
+                behalf.
+            </p>
+            <p>
+                In the case of an imaginary database connection they can
+                test that the query, say SQL, was correctly formed by
+                the object that is using the connection.
+                Set them up with fairly tight expectations and you will
+                hardly need manual assertions at all.
+            </p>
+        
+        <h2>
+<a class="target" name="creation"></a>Creating mock objects</h2>
+            <p>
+                All we need is an existing class or interface, say a database connection
+                that looks like this...
+<pre>
+<strong>class DatabaseConnection {
+    function DatabaseConnection() { }
+    function query($sql) { }
+    function selectQuery($sql) { }
+}</strong>
+</pre>
+                To create a mock version of the class we need to run a
+                code generator...
+<pre>
+require_once('simpletest/autorun.php');
+require_once('database_connection.php');
+
+<strong>Mock::generate('DatabaseConnection');</strong>
+</pre>
+                This code generates a clone class called
+                <span class="new_code">MockDatabaseConnection</span>.
+                This new class appears to be the same, but actually has no behaviour at all.
+            </p>
+            <p>
+                The new class is usually a subclass of <span class="new_code">DatabaseConnection</span>.
+                Unfortunately, there is no way to create a mock version of a
+                class with a <span class="new_code">final</span> method without having a living version of
+                that method.
+                We consider that unsafe.
+                If the target is an interface, or if <span class="new_code">final</span> methods are
+                present in a target class, then a whole new class
+                is created, but one implemeting the same interfaces.
+                If you try to pass this separate class through a type hint that specifies
+                the old concrete class name, it will fail.
+                Code like that insists on type hinting to a class with <span class="new_code">final</span>
+                methods probably cannot be safely tested with mocks.
+            </p>
+            <p>
+                If you want to see the generated code, then simply <span class="new_code">print</span>
+                the output of <span class="new_code">Mock::generate()</span>.
+                Here is the generated code for the <span class="new_code">DatabaseConnection</span>
+                class rather than the interface version...
+<pre>
+class MockDatabaseConnection extends DatabaseConnection {
+    public $mock;
+    protected $mocked_methods = array('databaseconnection', 'query', 'selectquery');
+
+    function MockDatabaseConnection() {
+        $this-&gt;mock = new SimpleMock();
+        $this-&gt;mock-&gt;disableExpectationNameChecks();
+    }
+    ...
+    function DatabaseConnection() {
+        $args = func_get_args();
+        $result = &amp;$this-&gt;mock-&gt;invoke("DatabaseConnection", $args);
+        return $result;
+    }
+    function query($sql) {
+        $args = func_get_args();
+        $result = &amp;$this-&gt;mock-&gt;invoke("query", $args);
+        return $result;
+    }
+    function selectQuery($sql) {
+        $args = func_get_args();
+        $result = &amp;$this-&gt;mock-&gt;invoke("selectQuery", $args);
+        return $result;
+    }
+}
+</pre>
+                Your output may vary depending on the exact version
+                of SimpleTest you are using.
+            </p>
+            <p>
+                Besides the original methods of the class, you will see some extra
+                methods that help testing.
+                More on these later.
+            </p>
+            <p>
+                We can now create instances of the new class within
+                our test case...
+<pre>
+require_once('simpletest/autorun.php');
+require_once('database_connection.php');
+
+Mock::generate('DatabaseConnection');
+
+class MyTestCase extends UnitTestCase {
+
+    function testSomething() {
+        <strong>$connection = new MockDatabaseConnection();</strong>
+    }
+}
+</pre>
+                The mock version now has all the methods of the original.
+                Also, any type hints will be faithfully preserved.
+                Say our query methods expect a <span class="new_code">Query</span> object...
+<pre>
+<strong>class DatabaseConnection {
+    function DatabaseConnection() { }
+    function query(Query $query) { }
+    function selectQuery(Query $query) { }
+}</strong>
+</pre>
+                If we now pass the wrong type of object, or worse a non-object...
+<pre>
+class MyTestCase extends UnitTestCase {
+
+    function testSomething() {
+        $connection = new MockDatabaseConnection();
+        $connection-&gt;query('insert into accounts () values ()');
+    }
+}
+</pre>
+                ...the code will throw a type violation at you just as the
+                original class would.
+            </p>
+            <p>
+                The mock version now has all the methods of the original.
+                Unfortunately, they all return <span class="new_code">null</span>.
+                As methods that always return <span class="new_code">null</span> are not that useful,
+                we need to be able to set them to something else...
+            </p>
+            <p>
+                <a class="target" name="stub"><h2>Mocks as actors</h2></a>
+            </p>
+            <p>
+                Changing the return value of a method from <span class="new_code">null</span>
+                to something else is pretty easy...
+<pre>
+<strong>$connection-&gt;returns('query', 37)</strong>
+</pre>
+                Now every time we call
+                <span class="new_code">$connection-&gt;query()</span> we get
+                the result of 37.
+                There is nothing special about 37.
+                The return value can be arbitrarily complicated.
+            </p>
+            <p>
+                Parameters are irrelevant here, we always get the same
+                values back each time once they have been set up this way.
+                That may not sound like a convincing replica of a
+                database connection, but for the half a dozen lines of
+                a test method it is usually all you need.
+            </p>
+            <p>
+                Things aren't always that simple though.
+                One common problem is iterators, where constantly returning
+                the same value could cause an endless loop in the object
+                being tested.
+                For these we need to set up sequences of values.
+                Let's say we have a simple iterator that looks like this...
+<pre>
+class Iterator {
+    function Iterator() { }
+    function next() { }
+}
+</pre>
+                This is about the simplest iterator you could have.
+                Assuming that this iterator only returns text until it
+                reaches the end, when it returns false, we can simulate it
+                with...
+<pre>
+Mock::generate('Iterator');
+
+class IteratorTest extends UnitTestCase() {
+
+    function testASequence() {<strong>
+        $iterator = new MockIterator();
+        $iterator-&gt;returns('next', false);
+        $iterator-&gt;returnsAt(0, 'next', 'First string');
+        $iterator-&gt;returnsAt(1, 'next', 'Second string');</strong>
+        ...
+    }
+}
+</pre>
+                When <span class="new_code">next()</span> is called on the
+                <span class="new_code">MockIterator</span> it will first return "First string",
+                on the second call "Second string" will be returned
+                and on any other call <span class="new_code">false</span> will
+                be returned.
+                The sequenced return values take precedence over the constant
+                return value.
+                The constant one is a kind of default if you like.
+            </p>
+            <p>
+                Another tricky situation is an overloaded
+                <span class="new_code">get()</span> operation.
+                An example of this is an information holder with name/value pairs.
+                Say we have a configuration class like...
+<pre>
+class Configuration {
+    function Configuration() { ... }
+    function get($key) { ... }
+}
+</pre>
+                This is a likely situation for using mock objects, as
+                actual configuration will vary from machine to machine and
+                even from test to test.
+                The problem though is that all the data comes through the
+                <span class="new_code">get()</span> method and yet
+                we want different results for different keys.
+                Luckily the mocks have a filter system...
+<pre>
+<strong>$config = &amp;new MockConfiguration();
+$config-&gt;returns('get', 'primary', array('db_host'));
+$config-&gt;returns('get', 'admin', array('db_user'));
+$config-&gt;returns('get', 'secret', array('db_password'));</strong>
+</pre>
+                The extra parameter is a list of arguments to attempt
+                to match.
+                In this case we are trying to match only one argument which
+                is the look up key.
+                Now when the mock object has the
+                <span class="new_code">get()</span> method invoked
+                like this...
+<pre>
+$config-&gt;get('db_user')
+</pre>
+                ...it will return "admin".
+                It finds this by attempting to match the calling arguments
+                to its list of returns one after another until
+                a complete match is found.
+            </p>
+            <p>
+                You can set a default argument argument like so...
+<pre><strong>
+$config-&gt;returns('get', false, array('*'));</strong>
+</pre>
+                This is not the same as setting the return value without
+                any argument requirements like this...
+<pre><strong>
+$config-&gt;returns('get', false);</strong>
+</pre>
+                In the first case it will accept any single argument,
+                but exactly one is required.
+                In the second case any number of arguments will do and
+                it acts as a catchall after all other matches.
+                Note that if we add further single parameter options after
+                the wildcard in the first case, they will be ignored as the wildcard
+                will match first.
+                With complex parameter lists the ordering could be important
+                or else desired matches could be masked by earlier wildcard
+                ones.
+                Declare the most specific matches first if you are not sure.
+            </p>
+            <p>
+                There are times when you want a specific reference to be
+                dished out by the mock rather than a copy or object handle.
+                This a rarity to say the least, but you might be simulating
+                a container that can hold primitives such as strings.
+                For example...
+<pre>
+class Pad {
+    function Pad() { }
+    function &amp;note($index) { }
+}
+</pre>
+                In this case you can set a reference into the mock's
+                return list...
+<pre>
+function testTaskReads() {
+    $note = 'Buy books';
+    $pad = new MockPad();
+    $vector-&gt;<strong>returnsByReference(</strong>'note', $note, array(3)<strong>)</strong>;
+    $task = new Task($pad);
+    ...
+}
+</pre>
+                With this arrangement you know that every time
+                <span class="new_code">$pad-&gt;note(3)</span> is
+                called it will return the same <span class="new_code">$note</span> each time,
+                even if it get's modified.
+            </p>
+            <p>
+                These three factors, timing, parameters and whether to copy,
+                can be combined orthogonally.
+                For example...
+<pre>
+$buy_books = 'Buy books';
+$write_code = 'Write code';
+$pad = new MockPad();
+$vector-&gt;<strong>returnsByReferenceAt(0, 'note', $buy_books, array('*', 3));</strong>
+$vector-&gt;<strong>returnsByReferenceAt(1, 'note', $write_code, array('*', 3));</strong>
+</pre>
+                This will return a reference to <span class="new_code">$buy_books</span> and
+                then to <span class="new_code">$write_code</span>, but only if two parameters
+                were set the second of which must be the integer 3.
+                That should cover most situations.
+            </p>
+            <p>
+                A final tricky case is one object creating another, known
+                as a factory pattern.
+                Suppose that on a successful query to our imaginary
+                database, a result set is returned as an iterator, with
+                each call to the the iterator's <span class="new_code">next()</span> giving
+                one row until false.
+                This sounds like a simulation nightmare, but in fact it can all
+                be mocked using the mechanics above...
+<pre>
+Mock::generate('DatabaseConnection');
+Mock::generate('ResultIterator');
+
+class DatabaseTest extends UnitTestCase {
+
+    function testUserFinderReadsResultsFromDatabase() {<strong>
+        $result = new MockResultIterator();
+        $result-&gt;returns('next', false);
+        $result-&gt;returnsAt(0, 'next', array(1, 'tom'));
+        $result-&gt;returnsAt(1, 'next', array(3, 'dick'));
+        $result-&gt;returnsAt(2, 'next', array(6, 'harry'));
+
+        $connection = new MockDatabaseConnection();
+        $connection-&gt;returns('selectQuery', $result);</strong>
+
+        $finder = new UserFinder(<strong>$connection</strong>);
+        $this-&gt;assertIdentical(
+                $finder-&gt;findNames(),
+                array('tom', 'dick', 'harry'));
+    }
+}
+</pre>
+                Now only if our
+                <span class="new_code">$connection</span> is called with the
+                <span class="new_code">query()</span> method will the
+                <span class="new_code">$result</span> be returned that is
+                itself exhausted after the third call to <span class="new_code">next()</span>.
+                This should be enough
+                information for our <span class="new_code">UserFinder</span> class,
+                the class actually
+                being tested here, to come up with goods.
+                A very precise test and not a real database in sight.
+            </p>
+            <p>
+                We could refine this test further by insisting that the correct
+                query is sent...
+<pre>
+$connection-&gt;returns('selectQuery', $result, array(<strong>'select name, id from people'</strong>));
+</pre>
+                This is actually a bad idea.
+            </p>
+            <p>
+                We have a <span class="new_code">UserFinder</span> in object land, talking to
+                database tables using a large interface - the whole of SQL.
+                Imagine that we have written a lot of tests that now depend
+                on the exact SQL string passed.
+                These queries could change en masse for all sorts of reasons
+                not related to the specific test.
+                For example the quoting rules could change, a table name could
+                change, a link table added or whatever.
+                This would require the rewriting of every single test any time
+                one of these refactoring is made, yet the intended behaviour has
+                stayed the same.
+                Tests are supposed to help refactoring, not hinder it.
+                I'd certainly like to have a test suite that passes while I change
+                table names.
+            </p>
+            <p>
+                As a rule it is best not to mock a fat interface.
+            </p>
+            <p>
+                By contrast, here is the round trip test...
+<pre>
+class DatabaseTest extends UnitTestCase {<strong>
+    function setUp() { ... }
+    function tearDown() { ... }</strong>
+
+    function testUserFinderReadsResultsFromDatabase() {
+        $finder = new UserFinder(<strong>new DatabaseConnection()</strong>);
+        $finder-&gt;add('tom');
+        $finder-&gt;add('dick');
+        $finder-&gt;add('harry');
+        $this-&gt;assertIdentical(
+                $finder-&gt;findNames(),
+                array('tom', 'dick', 'harry'));
+    }
+}
+</pre>
+                This test is immune to schema changes.
+                It will only fail if you actually break the functionality, which
+                is what you want a test to do.
+            </p>
+            <p>
+                The catch is those <span class="new_code">setUp()</span> and <span class="new_code">tearDown()</span>
+                methods that we've rather glossed over.
+                They have to clear out the database tables and ensure that the
+                schema is defined correctly.
+                That can be a chunk of extra work, but you usually have this code
+                lying around anyway for deployment purposes.
+            </p>
+            <p>
+                One place where you definitely need a mock is simulating failures.
+                Say the database goes down while <span class="new_code">UserFinder</span> is doing
+                it's work.
+                Does <span class="new_code">UserFinder</span> behave well...?
+<pre>
+class DatabaseTest extends UnitTestCase {
+
+    function testUserFinder() {
+        $connection = new MockDatabaseConnection();<strong>
+        $connection-&gt;throwOn('selectQuery', new TimedOut('Ouch!'));</strong>
+        $alert = new MockAlerts();<strong>
+        $alert-&gt;expectOnce('notify', 'Database is busy - please retry');</strong>
+        $finder = new UserFinder($connection, $alert);
+        $this-&gt;assertIdentical($finder-&gt;findNames(), array());
+    }
+}
+</pre>
+                We've passed the <span class="new_code">UserFinder</span> an <span class="new_code">$alert</span>
+                object.
+                This is going to do some kind of pretty notifications in the
+                user interface in the event of an error.
+                We'd rather not sprinkle our code with hard wired <span class="new_code">print</span>
+                statements if we can avoid it.
+                Wrapping the means of output means we can use this code anywhere.
+                It also makes testing easier.
+            </p>
+            <p>
+                To pass this test, the finder has to write a nice user friendly
+                message to <span class="new_code">$alert</span>, rather than propogating the exception.
+                So far, so good.
+            </p>
+            <p>
+                How do we get the mock <span class="new_code">DatabaseConnection</span> to throw an exception?
+                We generate the exception using the <span class="new_code">throwOn</span> method
+                on the mock.
+            </p>
+            <p>
+                Finally, what if the method you want to simulate does not exist yet?
+                If you set a return value on a method that is not there, SimpleTest
+                will throw an error.
+                What if you are using <span class="new_code">__call()</span> to simulate dynamic methods?
+            </p>
+            <p>
+                Objects with dynamic interfaces, using <span class="new_code">__call</span>, can
+                be problematic with the current mock objects implementation.
+                You can mock the <span class="new_code">__call()</span> method, but this is ugly.
+                Why should a test know anything about such low level implementation details?
+                It just wants to simulate the call.
+            </p>
+            <p>
+                The way round this is to add extra methods to the mock when
+                generating it.
+<pre>
+<strong>Mock::generate('DatabaseConnection', 'MockDatabaseConnection', array('setOptions'));</strong>
+</pre>
+                In a large test suite this could cause trouble, as you probably
+                already have a mock version of the class called
+                <span class="new_code">MockDatabaseConnection</span> without the extra methods.
+                The code generator will not generate a mock version of the class if
+                one of the same name already exists.
+                You will confusingly fail to see your method if another definition
+                was run first.
+            </p>
+            <p>
+                To cope with this, SimpleTest allows you to choose any name for the
+                new class at the same time as you add the extra methods.
+<pre>
+Mock::generate('DatabaseConnection', <strong>'MockDatabaseConnectionWithOptions'</strong>, array('setOptions'));
+</pre>
+                Here the mock will behave as if the <span class="new_code">setOptions()</span>
+                existed in the original class.
+            </p>
+            <p>
+                Mock objects can only be used within test cases, as upon expectations
+                they send messages straight to the currently running test case.
+                Creating them outside a test case will cause a run time error
+                when an expectation is triggered and there is no running test case
+                for the message to end up.
+                We cover expectations next.
+            </p>
+        
+        <h2>
+<a class="target" name="expectations"></a>Mocks as critics</h2>
+            <p>
+                Although the server stubs approach insulates your tests from
+                real world disruption, it is only half the benefit.
+                You can have the class under test receiving the required
+                messages, but is your new class sending correct ones?
+                Testing this can get messy without a mock objects library.
+            </p>
+			<p>
+                By way of example, let's take a simple <span class="new_code">PageController</span>
+                class to handle a credit card payment form...
+<pre>
+class PaymentForm extends PageController {
+    function __construct($alert, $payment_gateway) { ... }
+    function makePayment($request) { ... }
+}
+</pre>
+                This class takes a <span class="new_code">PaymentGateway</span> to actually talk
+                to the bank.
+                It also takes an <span class="new_code">Alert</span> object to handle errors.
+                This class talks to the page or template.
+                It's responsible for painting the error message and highlighting any
+                form fields that are incorrect.
+            </p>
+            <p>
+                It might look something like...
+<pre>
+class Alert {
+    function warn($warning, $id) {
+        print '&lt;div class="warning"&gt;' . $warning . '&lt;/div&gt;';
+        print '&lt;style type="text/css"&gt;#' . $id . ' { background-color: red }&lt;/style&gt;';
+    }
+}
+</pre>
+            </p>
+            <p>
+                Our interest is in the <span class="new_code">makePayment()</span> method.
+                If we fail to enter a "CVV2" number (the three digit number
+                on the back of the credit card), we want to show an error rather than
+                try to process the payment.
+                In test form...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('payment_form.php');
+Mock::generate('Alert');
+Mock::generate('PaymentGateway');
+
+class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
+
+    function testMissingCvv2CausesAlert() {
+        $alert = new MockAlert();
+        <strong>$alert-&gt;expectOnce(
+                    'warn',
+                    array('Missing three digit security code', 'cvv2'));</strong>
+        $controller = new PaymentForm(<strong>$alert</strong>, new MockPaymentGateway());
+        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+    }
+
+    function requestWithMissingCvv2() { ... }
+}
+?&gt;
+</pre>
+                The first question you may be asking is, where are the assertions?
+            </p>
+            <p>
+                The call to <span class="new_code">expectOnce('warn', array(...))</span> instructs the mock
+                to expect a call to <span class="new_code">warn()</span> before the test ends.
+                When it gets a call to <span class="new_code">warn()</span>, it checks the arguments.
+                If the arguments don't match, then a failure is generated.
+                It also fails if the method is never called at all.
+            </p>
+            <p>
+                The test above not only asserts that <span class="new_code">warn</span> was called,
+                but that it received the string "Missing three digit security code"
+                and also the tag "cvv2".
+                The equivalent of <span class="new_code">assertIdentical()</span> is applied to both
+                fields when the parameters are compared.
+            </p>
+            <p>
+                If you are not interested in the actual message, and we are not
+                for user interface code that changes often, we can skip that
+                parameter with the "*" operator...
+<pre>
+class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
+
+    function testMissingCvv2CausesAlert() {
+        $alert = new MockAlert();
+        $alert-&gt;expectOnce('warn', array(<strong>'*'</strong>, 'cvv2'));
+        $controller = new PaymentForm($alert, new MockPaymentGateway());
+        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+    }
+
+    function requestWithMissingCvv2() { ... }
+}
+</pre>
+                We can weaken the test further by missing
+                out the parameters array...
+<pre>
+function testMissingCvv2CausesAlert() {
+    $alert = new MockAlert();
+    <strong>$alert-&gt;expectOnce('warn');</strong>
+    $controller = new PaymentForm($alert, new MockPaymentGateway());
+    $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+}
+</pre>
+                This will only test that the method is called,
+                which is a bit drastic in this case.
+                Later on, we'll see how we can weaken the expectations more precisely.
+            </p>
+            <p>
+                Tests without assertions can be both compact and very expressive.
+                Because we intercept the call on the way into an object, here of
+                the <span class="new_code">Alert</span> class, we avoid having to assert its state
+                afterwards.
+                This not only avoids the assertions in the tests, but also having
+                to add extra test only accessors to the original code.
+                If you catch yourself adding such accessors, called "state based testing",
+                it's probably time to consider using mocks in the tests.
+                This is called "behaviour based testing", and is normally superior.
+            </p>
+            <p>
+                Let's add another test.
+                Let's make sure that we don't even attempt a payment without a CVV2...
+<pre>
+class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
+
+    function testMissingCvv2CausesAlert() { ... }
+
+    function testNoPaymentAttemptedWithMissingCvv2() {
+        $payment_gateway = new MockPaymentGateway();
+        <strong>$payment_gateway-&gt;expectNever('pay');</strong>
+        $controller = new PaymentForm(new MockAlert(), $payment_gateway);
+        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+    }
+
+    ...
+}
+</pre>
+                Asserting a negative can be very hard in tests, but
+                <span class="new_code">expectNever()</span> makes it easy.
+            </p>
+            <p>
+                <span class="new_code">expectOnce()</span> and <span class="new_code">expectNever()</span> are
+                sufficient for most tests, but
+                occasionally you want to test multiple events.
+                Normally for usability purposes we want all missing fields
+                in the form to light up, not just the first one.
+                This means that we should get multiple calls to
+                <span class="new_code">Alert::warn()</span>, not just one...
+<pre>
+function testAllRequiredFieldsHighlightedOnEmptyRequest() {
+    $alert = new MockAlert();<strong>
+    $alert-&gt;expectAt(0, 'warn', array('*', 'cc_number'));
+    $alert-&gt;expectAt(1, 'warn', array('*', 'expiry'));
+    $alert-&gt;expectAt(2, 'warn', array('*', 'cvv2'));
+    $alert-&gt;expectAt(3, 'warn', array('*', 'card_holder'));
+    $alert-&gt;expectAt(4, 'warn', array('*', 'address'));
+    $alert-&gt;expectAt(5, 'warn', array('*', 'postcode'));
+    $alert-&gt;expectAt(6, 'warn', array('*', 'country'));
+    $alert-&gt;expectCallCount('warn', 7);</strong>
+    $controller = new PaymentForm($alert, new MockPaymentGateway());
+    $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+}
+</pre>
+                The counter in <span class="new_code">expectAt()</span> is the number of times
+                the method has been called already.
+                Here we are asserting that every field will be highlighted.
+            </p>
+            <p>
+                Note that we are forced to assert the order too.
+                SimpleTest does not yet have a way to avoid this, but
+                this will be fixed in future versions.
+            </p>
+            <p>
+                Here is the full list of expectations you can set on a mock object
+                in <a href="http://simpletest.org/">SimpleTest</a>.
+                As with the assertions, these methods take an optional failure message.
+                <table>
+                    <thead><tr>
+<th>Expectation</th>
+<th>Description</th>
+</tr></thead>
+                    <tbody>
+                        <tr>
+                            <td><span class="new_code">expect($method, $args)</span></td>
+                            <td>Arguments must match if called</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectAt($timing, $method, $args)</span></td>
+                            <td>Arguments must match when called on the <span class="new_code">$timing</span>'th time</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectCallCount($method, $count)</span></td>
+                            <td>The method must be called exactly this many times</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectMaximumCallCount($method, $count)</span></td>
+                            <td>Call this method no more than <span class="new_code">$count</span> times</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectMinimumCallCount($method, $count)</span></td>
+                            <td>Must be called at least <span class="new_code">$count</span> times</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectNever($method)</span></td>
+                            <td>Must never be called</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectOnce($method, $args)</span></td>
+                            <td>Must be called once and with the expected arguments if supplied</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectAtLeastOnce($method, $args)</span></td>
+                            <td>Must be called at least once, and always with any expected arguments</td>
+                        </tr>
+                    </tbody>
+                </table>
+                Where the parameters are...
+                <dl>
+                    <dt class="new_code">$method</dt>
+                    <dd>The method name, as a string, to apply the condition to.</dd>
+                    <dt class="new_code">$args</dt>
+                    <dd>
+                        The arguments as a list. Wildcards can be included in the same
+                        manner as for <span class="new_code">setReturn()</span>.
+                        This argument is optional for <span class="new_code">expectOnce()</span>
+                        and <span class="new_code">expectAtLeastOnce()</span>.
+                    </dd>
+                    <dt class="new_code">$timing</dt>
+                    <dd>
+                        The only point in time to test the condition.
+                        The first call starts at zero and the count is for
+                        each method independently.
+                    </dd>
+                    <dt class="new_code">$count</dt>
+                    <dd>The number of calls expected.</dd>
+                </dl>
+            </p>
+            <p>
+                If you have just one call in your test, make sure you're using
+                <span class="new_code">expectOnce</span>.<br>
+                Using <span class="new_code">$mocked-&gt;expectAt(0, 'method', 'args);</span>
+                on its own will allow the method to never be called.
+                Checking the arguments and the overall call count
+                are currently independant.
+                Add an <span class="new_code">expectCallCount()</span> expectation when you
+                are using <span class="new_code">expectAt()</span> unless zero calls is allowed.
+            </p>
+            <p>
+                Like the assertions within test cases, all of the expectations
+                can take a message override as an extra parameter.
+                Also the original failure message can be embedded in the output
+                as "%s".
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            The original
+            <a href="http://www.mockobjects.com/">Mock objects</a> paper.
+        </li>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest home page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <span class="chosen">Mock objects</span>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/overview.html b/3rdparty/simpletest/docs/en/overview.html
new file mode 100644
index 00000000000..85ea9407749
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/overview.html
@@ -0,0 +1,487 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+        Overview and feature list for the SimpleTest PHP unit tester and web tester
+    </title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <span class="chosen">Overview</span>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Overview of SimpleTest</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#summary">Quick summary</a>
+            of the SimpleTest tool for PHP.
+        </li>
+<li>
+            <a href="#features">List of features</a>,
+            both current ones and those planned.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="summary"></a>What is SimpleTest?</h2>
+            <p>
+                The heart of SimpleTest is a testing framework built around
+                test case classes.
+                These are written as extensions of base test case classes,
+                each extended with methods that actually contain test code.
+                Each test method of a test case class is written to invoke
+                various assertions that the developer expects to be true such as
+                <span class="new_code">assertEqual()</span>.
+                If the expectation is correct, then a successful result is
+                dispatched to the observing test reporter, but any failure
+                or unexpected exception triggers an alert and a description
+                of the mismatch.
+                These test case declarations are transformed into executable
+                test scripts by including a SimpleTest aurorun.php file.
+            </p>
+            <p>
+                These documents apply to SimpleTest version 1.1, although we
+                try hard to maintain compatibility between versions.
+                If you get a test failure after an upgrade, check out the
+                file "HELP_MY_TESTS_DONT_WORK_ANYMORE" in the
+                simpletest directory to see if a feature you are using
+                has since been deprecated and later removed.
+            </p>
+            <p>
+                A <a href="unit_test_documentation.html">test case</a> looks like this...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class <strong>CanAddUp</strong> extends UnitTestCase {<strong>
+    function testOneAndOneMakesTwo() {
+        $this-&gt;assertEqual(1 + 1, 2);
+    }</strong>
+}
+?&gt;
+</pre>
+                Tests are grouped into test cases, which are just
+                PHP classes that extend <span class="new_code">UnitTestCase</span>
+                or <span class="new_code">WebTestCase</span>.
+                The tests themselves are just normal methods that start
+                their name with the letters "test".
+                You can have as many test cases as you want in a test
+                script and each test case can have as many test methods
+                as it wants too.
+            </p>
+            <p>
+                This test script is immediately runnable.
+                You just invoke it on the command line like so...
+<pre class="shell">
+php adding_test.php
+</pre>
+            </p>
+            <p>
+                When run on the command line you should see something like...
+<pre class="shell">
+adding_test.php
+OK
+Test cases run: 1/1, Passes: 1, Failures: 0, Exceptions: 0
+</pre>
+            </p>
+            <p>
+                If you place it on a web server and point your
+                web browser at it...
+                <div class="demo">
+                    <h1>adding_test.php</h1>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>6</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+            </p>
+            <p>
+                Of course this is a silly example.
+                A more realistic example might be...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('log.php');
+
+class <strong>TestOfLogging</strong> extends UnitTestCase {
+    function testWillCreateLogFileOnFirstMessage() {
+        $log = new Log('my.log');
+        $this-&gt;assertFalse(file_exists('my.log'));
+        $log-&gt;message('Hello');
+        $this-&gt;assertTrue(file_exists('my.log'));
+    }&lt;/strong&gt;
+}
+?&gt;
+</pre>
+            </p>
+            <p>
+                This tool is designed for the developer.
+                The target audience of this tool is anyone developing a small
+                to medium PHP application, including developers new to
+                unit and web regression testing.
+                The core principles are ease of use first, with extendibility and
+                essential features.
+            </p>
+            <p>
+                Tests are written in the PHP language itself more or less
+                as the application itself is built.
+                The advantage of using PHP as the testing language is that
+                there are no new languages to learn, testing can start straight away,
+                and the developer can test any part of the code.
+                Basically, all parts that can be accessed by the application code can also be
+                accessed by the test code when they are in the same programming language.
+            </p>
+            <p>
+                The simplest type of test case is the
+                <a href="unit_tester_documentation.html">UnitTestCase</a>.
+                This class of test case includes standard tests for equality,
+                references and pattern matching.
+                All these test the typical expectations of what you would
+                expect the result of a function or method to be.
+                This is by far the most common type of test in the daily
+                routine of development, making up about 95% of test cases.
+            </p>
+            <p>
+                The top level task of a web application though is not to
+                produce correct output from its methods and objects, but
+                to generate web pages.
+                The <a href="web_tester_documentation.html">WebTestCase</a> class tests web
+                pages.
+                It simulates a web browser requesting a page, complete with
+                cookies, proxies, secure connections, authentication, forms, frames and most
+                navigation elements.
+                With this type of test case, the developer can assert that
+                information is present in the page and that forms and
+                sessions are handled correctly.
+            </p>
+            <p>
+                A <a href="web_tester_documentation.html">WebTestCase</a> looks like this...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('simpletest/web_tester.php');
+
+class <strong>MySiteTest</strong> extends WebTestCase {
+    <strong>
+    function testHomePageHasContactDetailsLink() {
+        $this-&gt;get('http://www.my-site.com/index.php');
+        $this-&gt;assertTitle('My Home Page');
+        $this-&gt;clickLink('Contact');
+        $this-&gt;assertTitle('Contact me');
+        $this-&gt;assertText('/Email me at/');
+    }</strong>
+}
+?&gt;
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="features"></a>Feature list</h2>
+            <p>
+                The following is a very rough outline of past and future features
+                and their expected point of release.
+                I am afraid it is liable to change without warning, as meeting the
+                milestones rather depends on time available.
+            </p>
+            <p>
+                Green stuff has been coded, but not necessarily released yet.
+                If you have a pressing need for a green but unreleased feature
+                then you should check-out the code from Sourceforge SVN directly.
+                <table>
+<thead>
+                    <tr>
+<th>Feature</th>
+<th>Description</th>
+<th>Release</th>
+</tr>
+                    </thead>
+<tbody>
+<tr>
+                        <td>Unit test case</td>
+                        <td>Core test case class and assertions</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Html display</td>
+                        <td>Simplest possible display</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Autoloading of test cases</td>
+                        <td>
+                            Reading a file with test cases and loading them into a
+                            group test automatically
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Mock objects</td>
+                        <td>
+                            Objects capable of simulating other objects removing
+                            test dependencies
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Web test case</td>
+                        <td>Allows link following and title tag matching</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Partial mocks</td>
+                        <td>
+                            Mocking parts of a class for testing less than a class
+                            or for complex simulations
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Web cookie handling</td>
+                        <td>Correct handling of cookies when fetching pages</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Following redirects</td>
+                        <td>Page fetching automatically follows 300 redirects</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Form parsing</td>
+                        <td>Ability to submit simple forms and read default form values</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Command line interface</td>
+                        <td>Test display without the need of a web browser</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Exposure of expectation classes</td>
+                        <td>Can create precise tests with mocks as well as test cases</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>XML output and parsing</td>
+                        <td>
+                            Allows multi host testing and the integration of acceptance
+                            testing extensions
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Browser component</td>
+                        <td>
+                            Exposure of lower level web browser interface for more
+                            detailed test cases
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>HTTP authentication</td>
+                        <td>
+                            Fetching protected web pages with basic authentication
+                            only
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>SSL support</td>
+                        <td>Can connect to https: pages</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Proxy support</td>
+                        <td>Can connect via. common proxies</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Frames support</td>
+                        <td>Handling of frames in web test cases</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>File upload testing</td>
+                        <td>Can simulate the input type file tag</td>
+                        <td style="color: green;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>Mocking interfaces</td>
+                        <td>
+                            Can generate mock objects to interfaces as well as classes
+                            and class interfaces are carried for type hints
+                        </td>
+                        <td style="color: green;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>Testing exceptions</td>
+                        <td>Similar to testing PHP errors</td>
+                        <td style="color: green;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>HTML label support</td>
+                        <td>Can access all controls using the visual label</td>
+                        <td style="color: green;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>Base tag support</td>
+                        <td>Respects page base tag when clicking</td>
+                        <td style="color: green;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>PHP 5 E_STRICT compliant</td>
+                        <td>PHP 5 only version that works with the E_STRICT error level</td>
+                        <td style="color: green;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>Alternate HTML parsers</td>
+                        <td>Can detect compiled parsers for performance improvements</td>
+                        <td style="color: green;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>REST support</td>
+                        <td>Support for REST verbs as put(), delete(), etc.</td>
+                        <td style="color: green;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>BDD style fixtures</td>
+                        <td>Can import fixtures using a mixin like given() method</td>
+                        <td style="color: red;">1.5</td>
+                    </tr>
+                    <tr>
+                        <td>Plug-in architecture</td>
+                        <td>Automatic import of extensions including command line options</td>
+                        <td style="color: red;">1.5</td>
+                    </tr>
+                    <tr>
+                        <td>Reporting machinery enhancements</td>
+                        <td>Improved message passing for better cooperation with IDEs</td>
+                        <td style="color: red;">1.5</td>
+                    </tr>
+                    <tr>
+                        <td>Fluent mock interface</td>
+                        <td>More flexible and concise mock objects</td>
+                        <td style="color: red;">1.6</td>
+                    </tr>
+                    <tr>
+                        <td>Localisation</td>
+                        <td>Messages abstracted and code generated as well as UTF support</td>
+                        <td style="color: red;">1.6</td>
+                    </tr>
+                    <tr>
+                        <td>CSS selectors</td>
+                        <td>HTML content can be examined using CSS selectors</td>
+                        <td style="color: red;">1.7</td>
+                    </tr>
+                    <tr>
+                        <td>HTML table assertions</td>
+                        <td>Can match HTML or other table elements to expectations</td>
+                        <td style="color: red;">1.7</td>
+                    </tr>
+                    <tr>
+                        <td>Unified acceptance testing model</td>
+                        <td>Content searchable through selectors combined with expectations</td>
+                        <td style="color: red;">1.7</td>
+                    </tr>
+                    <tr>
+                        <td>DatabaseTestCase</td>
+                        <td>SQL selectors and DB drivers</td>
+                        <td style="color: red;">1.7</td>
+                    </tr>
+                    <tr>
+                        <td>IFrame support</td>
+                        <td>Reads IFrame content that can be refreshed</td>
+                        <td style="color: red;">1.8</td>
+                    </tr>
+                    <tr>
+                        <td>Integrated Selenium support</td>
+                        <td>Easy to use built in Selenium driver and tutorial or similar browser automation</td>
+                        <td style="color: red;">1.9</td>
+                    </tr>
+                    <tr>
+                        <td>Code coverage</td>
+                        <td>Reports using the bundled tool when using XDebug</td>
+                        <td style="color: red;">1.9</td>
+                    </tr>
+                    <tr>
+                        <td>Deprecation of old methods</td>
+                        <td>Simpler interface for SimpleTest2</td>
+                        <td style="color: red;">2.0</td>
+                    </tr>
+                    <tr>
+                        <td>Javascript suport</td>
+                        <td>Use of PECL module to add Javascript to the native browser</td>
+                        <td style="color: red;">3.0</td>
+                    </tr>
+                </tbody>
+</table>
+                PHP 5 migration is complete, which means that only PHP 5.0.3+
+                will be supported in SimpleTest version 1.1+.
+                Earlier versions of SimpleTest are compatible with PHP 4.2 up to
+                PHP 5 (non E_STRICT).
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            <a href="unit_test_documentation.html">Documentation for SimpleTest</a>.
+        </li>
+<li>
+            <a href="http://www.lastcraft.com/first_test_tutorial.php">How to write PHP test cases</a>
+            is a fairly advanced tutorial.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">SimpleTest API</a> from phpdoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <span class="chosen">Overview</span>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/partial_mocks_documentation.html b/3rdparty/simpletest/docs/en/partial_mocks_documentation.html
new file mode 100644
index 00000000000..cb70b1f86df
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/partial_mocks_documentation.html
@@ -0,0 +1,457 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP partial mocks documentation</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <span class="chosen">Partial mocks</span>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Partial mock objects documentation</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#inject">The mock injection problem</a>.
+        </li>
+<li>
+            Moving creation to a <a href="#creation">protected factory</a> method.
+        </li>
+<li>
+            <a href="#partial">Partial mocks</a> generate subclasses.
+        </li>
+<li>
+            Partial mocks <a href="#less">test less than a class</a>.
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                A partial mock is simply a pattern to alleviate a specific problem
+                in testing with mock objects,
+                that of getting mock objects into tight corners.
+                It's quite a limited tool and possibly not even a good idea.
+                It is included with SimpleTest because I have found it useful
+                on more than one occasion and has saved a lot of work at that point.
+            </p>
+        
+        <h2>
+<a class="target" name="inject"></a>The mock injection problem</h2>
+            <p>
+                When one object uses another it is very simple to just pass a mock
+                version in already set up with its expectations.
+                Things are rather tricker if one object creates another and the
+                creator is the one you want to test.
+                This means that the created object should be mocked, but we can
+                hardly tell our class under test to create a mock instead.
+                The tested class doesn't even know it is running inside a test
+                after all.
+            </p>
+            <p>
+                For example, suppose we are building a telnet client and it
+                needs to create a network socket to pass its messages.
+                The connection method might look something like...
+<pre>
+<strong>&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    function connect($ip, $port, $username, $password) {
+        $socket = new Socket($ip, $port);
+        $socket-&gt;read( ... );
+        ...
+    }
+}
+?&gt;</strong>
+</pre>
+                We would really like to have a mock object version of the socket
+                here, what can we do?
+            </p>
+            <p>
+                The first solution is to pass the socket in as a parameter,
+                forcing the creation up a level.
+                Having the client handle this is actually a very good approach
+                if you can manage it and should lead to factoring the creation from
+                the doing.
+                In fact, this is one way in which testing with mock objects actually
+                forces you to code more tightly focused solutions.
+                They improve your programming.
+            </p>
+            <p>
+                Here this would be...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    <strong>function connect($socket, $username, $password) {
+        $socket-&gt;read( ... );
+        ...
+    }</strong>
+}
+?&gt;
+</pre>
+                This means that the test code is typical for a test involving
+                mock objects.
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new Telnet();
+        $telnet-&gt;connect($socket, 'Me', 'Secret');
+        ...</strong>
+    }
+}
+</pre>
+                It is pretty obvious though that one level is all you can go.
+                You would hardly want your top level application creating
+                every low level file, socket and database connection ever
+                needed.
+                It wouldn't know the constructor parameters anyway.
+            </p>
+            <p>
+                The next simplest compromise is to have the created object passed
+                in as an optional parameter...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...<strong>
+    function connect($ip, $port, $username, $password, $socket = false) {
+        if (! $socket) {
+            $socket = new Socket($ip, $port);
+        }
+        $socket-&gt;read( ... );</strong>
+        ...
+        return $socket;
+    }
+}
+?&gt;
+</pre>
+                For a quick solution this is usually good enough.
+                The test now looks almost the same as if the parameter
+                was formally passed...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret', $socket);
+        ...</strong>
+    }
+}
+</pre>
+                The problem with this approach is its untidiness.
+                There is test code in the main class and parameters passed
+                in the test case that are never used.
+                This is a quick and dirty approach, but nevertheless effective
+                in most situations.
+            </p>
+            <p>
+                The next method is to pass in a factory object to do the creation...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {<strong>
+   function Telnet($network) {
+        $this-&gt;_network = $network;
+    }</strong>
+    ...
+    function connect($ip, $port, $username, $password) {<strong>
+        $socket = $this-&gt;_network-&gt;createSocket($ip, $port);
+        $socket-&gt;read( ... );</strong>
+        ...
+        return $socket;
+    }
+}
+?&gt;
+</pre>
+                This is probably the most highly factored answer as creation
+                is now moved into a small specialist class.
+                The networking factory can now be tested separately, but mocked
+                easily when we are testing the telnet class...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $network = new MockNetwork();
+        $network-&gt;returnsByReference('createSocket', $socket);
+        $telnet = new Telnet($network);
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
+    }
+}
+</pre>
+                The downside is that we are adding a lot more classes to the
+                library.
+                Also we are passing a lot of factories around which will
+                make the code a little less intuitive.
+                The most flexible solution, but the most complex.
+            </p>
+            <p>
+                Well techniques like "Dependency Injection" tackle the problem of
+                instantiating a lot of constructor parameters.
+                Unfortunately knowledge of this pattern is not widespread, and if you
+                are trying to get older code to work, rearchitecting the whole
+                application is not really an option.
+            </p>
+            <p>
+                Is there a middle ground?
+            </p>
+        
+        <h2>
+<a class="target" name="creation"></a>Protected factory method</h2>
+            <p>
+                There is a way we can circumvent the problem without creating
+                any new application classes, but it involves creating a subclass
+                when we do the actual testing.
+                Firstly we move the socket creation into its own method...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    function connect($ip, $port, $username, $password) {
+        <strong>$socket = $this-&gt;createSocket($ip, $port);</strong>
+        $socket-&gt;read( ... );
+        ...
+    }<strong>
+
+    protected function createSocket($ip, $port) {
+        return new Socket($ip, $port);
+    }</strong>
+}
+?&gt;
+</pre>
+                This is a pretty safe step even for very tangled legacy code.
+                This is the only change we make to the application.
+            </p>
+            <p>
+                For the test case we have to create a subclass so that
+                we can intercept the socket creation...
+<pre>
+<strong>class TelnetTestVersion extends Telnet {
+    var $mock;
+
+    function TelnetTestVersion($mock) {
+        $this-&gt;mock = $mock;
+        $this-&gt;Telnet();
+    }
+
+    protected function createSocket() {
+        return $this-&gt;mock;
+    }
+}</strong>
+</pre>
+                Here I have passed the mock in the constructor, but a
+                setter would have done just as well.
+                Note that the mock was set into the object variable
+                before the constructor was chained.
+                This is necessary in case the constructor calls
+                <span class="new_code">connect()</span>.
+                Otherwise it could get a null value from
+                <span class="new_code">createSocket()</span>.
+            </p>
+            <p>
+                After the completion of all of this extra work the
+                actual test case is fairly easy.
+                We just test our new class instead...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new TelnetTestVersion($socket);
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
+    }
+}
+</pre>
+                The new class is very simple of course.
+                It just sets up a return value, rather like a mock.
+                It would be nice if it also checked the incoming parameters
+                as well.
+                Just like a mock.
+                It seems we are likely to do this often, can
+                we automate the subclass creation?
+            </p>
+        
+        <h2>
+<a class="target" name="partial"></a>A partial mock</h2>
+            <p>
+                Of course the answer is "yes" or I would have stopped writing
+                this by now!
+                The previous test case was a lot of work, but we can
+                generate the subclass using a similar approach to the mock objects.
+            </p>
+            <p>
+                Here is the partial mock version of the test...
+<pre>
+<strong>Mock::generatePartial(
+        'Telnet',
+        'TelnetTestVersion',
+        array('createSocket'));</strong>
+
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new TelnetTestVersion();
+        $telnet-&gt;setReturnReference('createSocket', $socket);
+        $telnet-&gt;Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
+    }
+}
+</pre>
+                The partial mock is a subclass of the original with
+                selected methods "knocked out" with test
+                versions.
+                The <span class="new_code">generatePartial()</span> call
+                takes three parameters: the class to be subclassed,
+                the new test class name and a list of methods to mock.
+            </p>
+            <p>
+                Instantiating the resulting objects is slightly tricky.
+                The only constructor parameter of a partial mock is
+                the unit tester reference.
+                As with the normal mock objects this is needed for sending
+                test results in response to checked expectations.
+            </p>
+            <p>
+                The original constructor is not run yet.
+                This is necessary in case the constructor is going to
+                make use of the as yet unset mocked methods.
+                We set any return values at this point and then run the
+                constructor with its normal parameters.
+                This three step construction of "new", followed
+                by setting up the methods, followed by running the constructor
+                proper is what distinguishes the partial mock code.
+            </p>
+            <p>
+                Apart from construction, all of the mocked methods have
+                the same features as mock objects and all of the unmocked
+                methods behave as before.
+                We can set expectations very easily...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {
+        $socket = new MockSocket();
+        ...
+        $telnet = new TelnetTestVersion();
+        $telnet-&gt;setReturnReference('createSocket', $socket);
+        <strong>$telnet-&gt;expectOnce('createSocket', array('127.0.0.1', 21));</strong>
+        $telnet-&gt;Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');
+    }
+}
+</pre>
+                Partial mocks are not used often.
+                I consider them transitory.
+                Useful while refactoring, but once the application has
+                all of it's dependencies nicely separated then the
+                partial mocks can wither away.
+            </p>
+        
+        <h2>
+<a class="target" name="less"></a>Testing less than a class</h2>
+            <p>
+                The mocked out methods don't have to be factory methods,
+                they could be any sort of method.
+                In this way partial mocks allow us to take control of any part of
+                a class except the constructor.
+                We could even go as far as to mock every method
+                except one we actually want to test.
+            </p>
+            <p>
+                This last situation is all rather hypothetical, as I've hardly
+                tried it.
+                I am a little worried that
+                forcing object granularity may be better for the code quality.
+                I personally use partial mocks as a way of overriding creation
+                or for occasional testing of the TemplateMethod pattern.
+            </p>
+            <p>
+                It's all going to come down to the coding standards of your
+                project to decide if you allow test mechanisms like this.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">Full API for SimpleTest</a>
+            from the PHPDoc.
+        </li>
+<li>
+            The protected factory is described in
+            <a href="http://www-106.ibm.com/developerworks/java/library/j-mocktest.html">this paper from IBM</a>.
+            This is the only formal comment I have seen on this problem.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <span class="chosen">Partial mocks</span>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/reporter_documentation.html b/3rdparty/simpletest/docs/en/reporter_documentation.html
new file mode 100644
index 00000000000..8924b7bb67a
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/reporter_documentation.html
@@ -0,0 +1,616 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP test runner and display documentation</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <span class="chosen">Reporting</span>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Test reporter documentation</h1>
+        This page...
+        <ul>
+<li>
+            Displaying <a href="#html">results in HTML</a>
+        </li>
+<li>
+            Displaying and <a href="#other">reporting results</a>
+            in other formats
+        </li>
+<li>
+            Using <a href="#cli">SimpleTest from the command line</a>
+        </li>
+<li>
+            <a href="#xml">Using XML</a> for remote testing
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                SimpleTest pretty much follows the MVC-ish pattern
+                (Model-View-Controller).
+                The reporter classes are the view and the model is your
+                test cases and their hiearchy.
+                The controller is mostly hidden from the user of
+                SimpleTest unless you want to change how the test cases
+                are actually run, in which case it is possible to
+                override the runner objects from within the test case.
+                As usual with MVC, the controller is mostly undefined
+                and there are other places to control the test run.
+            </p>
+        
+        <h2>
+<a class="target" name="html"></a>Reporting results in HTML</h2>
+            <p>
+                The default HTML display is minimal in the extreme.
+                It reports success and failure with the conventional red and
+                green bars and shows a breadcrumb trail of test groups
+                for every failed assertion.
+                Here's a fail...
+                <div class="demo">
+                    <h1>File test</h1>
+                    <span class="fail">Fail</span>: createnewfile-&gt;True assertion failed.<br>
+                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
+                    <strong>0</strong> passes, <strong>1</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                And here all tests passed...
+                <div class="demo">
+                    <h1>File test</h1>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>1</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                The good news is that there are several points in the display
+                hiearchy for subclassing.
+            </p>
+            <p>
+                For web page based displays there is the
+                <span class="new_code">HtmlReporter</span> class with the following
+                signature...
+<pre>
+class HtmlReporter extends SimpleReporter {
+    public __construct($encoding) { ... }
+    public makeDry(boolean $is_dry) { ... }
+    public void paintHeader(string $test_name) { ... }
+    public void sendNoCacheHeaders() { ... }
+    public void paintFooter(string $test_name) { ... }
+    public void paintGroupStart(string $test_name, integer $size) { ... }
+    public void paintGroupEnd(string $test_name) { ... }
+    public void paintCaseStart(string $test_name) { ... }
+    public void paintCaseEnd(string $test_name) { ... }
+    public void paintMethodStart(string $test_name) { ... }
+    public void paintMethodEnd(string $test_name) { ... }
+    public void paintFail(string $message) { ... }
+    public void paintPass(string $message) { ... }
+    public void paintError(string $message) { ... }
+    public void paintException(string $message) { ... }
+    public void paintMessage(string $message) { ... }
+    public void paintFormattedMessage(string $message) { ... }
+    protected string getCss() { ... }
+    public array getTestList() { ... }
+    public integer getPassCount() { ... }
+    public integer getFailCount() { ... }
+    public integer getExceptionCount() { ... }
+    public integer getTestCaseCount() { ... }
+    public integer getTestCaseProgress() { ... }
+}
+</pre>
+                Here is what some of these methods mean. First the display methods
+                that you will probably want to override...
+                <ul class="api">
+                    <li>
+                        <span class="new_code">HtmlReporter(string $encoding)</span><br>
+                        is the constructor.
+                        Note that the unit test sets up the link to the display
+                        rather than the other way around.
+                        The display is a mostly passive receiver of test events.
+                        This allows easy adaption of the display for other test
+                        systems beside unit tests, such as monitoring servers.
+                        The encoding is the character encoding you wish to
+                        display the test output in.
+                        In order to correctly render debug output when
+                        using the web tester, this should match the encoding
+                        of the site you are trying to test.
+                        The available character set strings are described in
+                        the PHP <a href="http://www.php.net/manual/en/function.htmlentities.php">html_entities()</a>
+                        function.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintHeader(string $test_name)</span><br>
+                        is called once at the very start of the test when the first
+                        start event arrives.
+                        The first start event is usually delivered by the top level group
+                        test and so this is where <span class="new_code">$test_name</span>
+                        comes from.
+                        It paints the page title, CSS, body tag, etc.
+                        It returns nothing (<span class="new_code">void</span>).
+                    </li>
+                    <li>
+                        <span class="new_code">void paintFooter(string $test_name)</span><br>
+                        Called at the very end of the test to close any tags opened
+                        by the page header.
+                        By default it also displays the red/green bar and the final
+                        count of results.
+                        Actually the end of the test happens when a test end event
+                        comes in with the same name as the one that started it all
+                        at the same level.
+                        The tests nest you see.
+                        Closing the last test finishes the display.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintMethodStart(string $test_name)</span><br>
+                        is called at the start of each test method.
+                        The name normally comes from method name.
+                        The other test start events behave the same way except
+                        that the group test one tells the reporter how large
+                        it is in number of held test cases.
+                        This is so that the reporter can display a progress bar
+                        as the runner churns through the test cases.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintMethodEnd(string $test_name)</span><br>
+                        backs out of the test started with the same name.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintFail(string $message)</span><br>
+                        paints a failure.
+                        By default it just displays the word fail, a breadcrumbs trail
+                        showing the current test nesting and the message issued by
+                        the assertion.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintPass(string $message)</span><br>
+                        by default does nothing.
+                    </li>
+                    <li>
+                        <span class="new_code">string getCss()</span><br>
+                        Returns the CSS styles as a string for the page header
+                        method.
+                        Additional styles have to be appended here if you are
+                        not overriding the page header.
+                        You will want to use this method in an overriden page header
+                        if you want to include the original CSS.
+                    </li>
+                </ul>
+                There are also some accessors to get information on the current
+                state of the test suite.
+                Use these to enrich the display...
+                <ul class="api">
+                    <li>
+                        <span class="new_code">array getTestList()</span><br>
+                        is the first convenience method for subclasses.
+                        Lists the current nesting of the tests as a list
+                        of test names.
+                        The first, top level test case, is first in the
+                        list and the current test method will be last.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getPassCount()</span><br>
+                        returns the number of passes chalked up so far.
+                        Needed for the display at the end.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getFailCount()</span><br>
+                        is likewise the number of fails so far.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getExceptionCount()</span><br>
+                        is likewise the number of errors so far.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getTestCaseCount()</span><br>
+                        is the total number of test cases in the test run.
+                        This includes the grouping tests themselves.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getTestCaseProgress()</span><br>
+                        is the number of test cases completed so far.
+                    </li>
+                </ul>
+                One simple modification is to get the HtmlReporter to display
+                the passes as well as the failures and errors...
+<pre>
+<strong>class ReporterShowingPasses extends HtmlReporter {
+    
+    function paintPass($message) {
+        parent::paintPass($message);
+        print "&lt;span class=\"pass\"&gt;Pass&lt;/span&gt;: ";
+        $breadcrumb = $this-&gt;getTestList();
+        array_shift($breadcrumb);
+        print implode("-&amp;gt;", $breadcrumb);
+        print "-&amp;gt;$message&lt;br /&gt;\n";
+    }
+    
+    protected function getCss() {
+        return parent::getCss() . ' .pass { color: green; }';
+    }
+}</strong>
+</pre>
+            </p>
+            <p>
+                One method that was glossed over was the <span class="new_code">makeDry()</span>
+                method.
+                If you run this method, with no parameters, on the reporter
+                before the test suite is run no actual test methods
+                will be called.
+                You will still get the events of entering and leaving the
+                test methods and test cases, but no passes or failures etc,
+                because the test code will not actually be executed.
+            </p>
+            <p>
+                The reason for this is to allow for more sophistcated
+                GUI displays that allow the selection of individual test
+                cases.
+                In order to build a list of possible tests they need a
+                report on the test structure for drawing, say a tree view
+                of the test suite.
+                With a reporter set to dry run that just sends drawing events
+                this is easily accomplished.
+            </p>
+        
+        <h2>
+<a class="target" name="other"></a>Extending the reporter</h2>
+            <p>
+                Rather than simply modifying the existing display, you might want to
+                produce a whole new HTML look, or even generate text or XML.
+                Rather than override every method in
+                <span class="new_code">HtmlReporter</span> we can take one
+                step up the class hiearchy to <span class="new_code">SimpleReporter</span>
+                in the <em>simple_test.php</em> source file.
+            </p>
+            <p>
+                A do nothing display, a blank canvas for your own creation, would
+                be...
+<pre>
+<strong>require_once('simpletest/simpletest.php');</strong>
+
+class MyDisplay extends SimpleReporter {<strong>
+    </strong>
+    function paintHeader($test_name) { }
+    
+    function paintFooter($test_name) { }
+    
+    function paintStart($test_name, $size) {<strong>
+        parent::paintStart($test_name, $size);</strong>
+    }
+    
+    function paintEnd($test_name, $size) {<strong>
+        parent::paintEnd($test_name, $size);</strong>
+    }
+    
+    function paintPass($message) {<strong>
+        parent::paintPass($message);</strong>
+    }
+    
+    function paintFail($message) {<strong>
+        parent::paintFail($message);</strong>
+    }
+    
+    function paintError($message) {<strong>
+        parent::paintError($message);</strong>
+    }
+    
+    function paintException($exception) {<strong>
+        parent::paintException($exception);</strong>
+    }
+}
+</pre>
+                No output would come from this class until you add it.
+            </p>
+            <p>
+                The catch with using this low level class is that you must
+                explicitely invoke it in the test script.
+                The "autorun" facility will not be able to use
+                its runtime context (whether it's running in a web browser
+                or the command line) to select the reporter.
+            </p>
+            <p>
+                You explicitely invoke the test runner like so...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+$test-&gt;run(<strong>new MyReporter()</strong>);
+?&gt;
+</pre>
+                ...perhaps like this...
+<pre>
+&lt;?php
+require_once('simpletest/simpletest.php');
+require_once('my_reporter.php');
+
+class MyTest extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('tests/file_test.php');
+    }
+}
+
+$test = new MyTest();
+$test-&gt;run(<strong>new MyReporter()</strong>);
+?&gt;
+</pre>
+                We'll show how to fit in with "autorun" later.
+            </p>
+        
+        <h2>
+<a class="target" name="cli"></a>The command line reporter</h2>
+            <p>
+                SimpleTest also ships with a minimal command line reporter.
+                The interface mimics JUnit to some extent, but paints the
+                failure messages as they arrive.
+                To use the command line reporter explicitely, substitute it
+                for the HTML version...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+$test-&gt;run(<strong>new TextReporter()</strong>);
+?&gt;
+</pre>
+                Then invoke the test suite from the command line...
+<pre class="shell">
+php file_test.php
+</pre>
+                You will need the command line version of PHP installed
+                of course.
+                A passing test suite looks like this...
+<pre class="shell">
+File test
+OK
+Test cases run: 1/1, Passes: 1, Failures: 0, Exceptions: 0
+</pre>
+                A failure triggers a display like this...
+<pre class="shell">
+File test
+1) True assertion failed.
+    in createNewFile
+FAILURES!!!
+Test cases run: 1/1, Passes: 0, Failures: 1, Exceptions: 0
+</pre>
+            </p>
+            <p>
+                One of the main reasons for using a command line driven
+                test suite is of using the tester as part of some automated
+                process.
+                To function properly in shell scripts the test script should
+                return a non-zero exit code on failure.
+                If a test suite fails the value <span class="new_code">false</span>
+                is returned from the <span class="new_code">SimpleTest::run()</span>
+                method.
+                We can use that result to exit the script with the desired return
+                code...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+<strong>exit ($test-&gt;run(new TextReporter()) ? 0 : 1);</strong>
+?&gt;
+</pre>
+                Of course we wouldn't really want to create two test scripts,
+                a command line one and a web browser one, for each test suite.
+                The command line reporter includes a method to sniff out the
+                run time environment...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+<strong>if (TextReporter::inCli()) {</strong>
+    exit ($test-&gt;run(new TextReporter()) ? 0 : 1);
+<strong>}</strong>
+$test-&gt;run(new HtmlReporter());
+?&gt;
+</pre>
+                This is the form used within SimpleTest itself.
+                When you use the "autorun.php", and no
+                test has been run by the end, this is pretty much
+                the code that SimpleTest will run for you implicitely.
+            </p>
+            <p>
+                In other words, this is gives the same result...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class MyTest extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('tests/file_test.php');
+    }
+}
+?&gt;
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="xml"></a>Remote testing</h2>
+            <p>
+                SimpleTest ships with an <span class="new_code">XmlReporter</span> class
+                used for internal communication.
+                When run the output looks like...
+<pre class="shell">
+&lt;?xml version="1.0"?&gt;
+&lt;run&gt;
+  &lt;group size="4"&gt;
+    &lt;name&gt;Remote tests&lt;/name&gt;
+    &lt;group size="4"&gt;
+      &lt;name&gt;Visual test with 48 passes, 48 fails and 4 exceptions&lt;/name&gt;
+      &lt;case&gt;
+        &lt;name&gt;testofunittestcaseoutput&lt;/name&gt;
+        &lt;test&gt;
+          &lt;name&gt;testofresults&lt;/name&gt;
+          &lt;pass&gt;This assertion passed&lt;/pass&gt;
+          &lt;fail&gt;This assertion failed&lt;/fail&gt;
+        &lt;/test&gt;
+        &lt;test&gt;
+          ...
+        &lt;/test&gt;
+      &lt;/case&gt;
+    &lt;/group&gt;
+  &lt;/group&gt;
+&lt;/run&gt;
+</pre>
+                To get your normal test cases to produce this format, on the
+                command line add the <span class="new_code">--xml</span> flag.
+<pre class="shell">
+php my_test.php --xml
+</pre>
+                You can do teh same thing in the web browser by adding the
+                URL parameter <span class="new_code">xml=1</span>.
+                Any true value will do.
+            </p>
+            <p>
+                You can consume this format with the parser
+                supplied as part of SimpleTest itself.
+                This is called <span class="new_code">SimpleTestXmlParser</span> and
+                resides in <em>xml.php</em> within the SimpleTest package...
+<pre>
+&lt;?php
+require_once('simpletest/xml.php');
+    
+...
+$parser = new SimpleTestXmlParser(new HtmlReporter());
+$parser-&gt;parse($test_output);
+?&gt;
+</pre>
+                The <span class="new_code">$test_output</span> should be the XML format
+                from the XML reporter, and could come from say a command
+                line run of a test case.
+                The parser sends events to the reporter just like any
+                other test run.
+                There are some odd occasions where this is actually useful.
+            </p>
+            <p>
+                Most likely it's when you want to isolate a problematic crash
+                prone test.
+                You can collect the XML output using the backtick operator
+                from another test.
+                In that way it runs in its own process...
+<pre>
+&lt;?php
+require_once('simpletest/xml.php');
+
+if (TextReporter::inCli()) {
+    $parser = new SimpleTestXmlParser(new TextReporter());
+} else {
+    $parser = new SimpleTestXmlParser(new HtmlReporter());
+}
+$parser-&gt;parse(`php flakey_test.php --xml`);
+?&gt;
+</pre>
+            </p>
+            <p>
+                Another use is breaking up large test suites.
+            </p>
+            <p>
+                A problem with large test suites is thet they can exhaust
+                the default 16Mb memory limit on a PHP process.
+                By having the test groups output in XML and run in
+                separate processes, the output can be reparsed to
+                aggregate the results into a much smaller footprint top level
+                test.
+            </p>
+            <p>
+                Because the XML output can come from anywhere, this opens
+                up the possibility of aggregating test runs from remote
+                servers.
+                A test case already exists to do this within the SimpleTest
+                framework, but it is currently experimental...
+<pre>
+&lt;?php
+<strong>require_once('../remote.php');</strong>
+require_once('simpletest/autorun.php');
+    
+$test_url = ...;
+$dry_url = ...;
+
+class MyTestOnAnotherServer extends RemoteTestCase {
+    function __construct() {
+        $test_url = ...
+        parent::__construct($test_url, $test_url . ' --dry');
+    }
+}
+?&gt;
+</pre>
+                The <span class="new_code">RemoteTestCase</span> takes the actual location
+                of the test runner, basically a web page in XML format.
+                It also takes the URL of a reporter set to do a dry run.
+                This is so that progress can be reported upward correctly.
+                The <span class="new_code">RemoteTestCase</span> can be added to test suites
+                just like any other test suite.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <span class="chosen">Reporting</span>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/unit_test_documentation.html b/3rdparty/simpletest/docs/en/unit_test_documentation.html
new file mode 100644
index 00000000000..a399bf34cb1
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/unit_test_documentation.html
@@ -0,0 +1,442 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP regression test documentation</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <span class="chosen">Unit tester</span>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>PHP Unit Test documentation</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#unit">Unit test cases</a> and basic assertions.
+        </li>
+<li>
+            <a href="#extending_unit">Extending test cases</a> to
+            customise them for your own project.
+        </li>
+<li>
+            <a href="#running_unit">Running a single case</a> as
+            a single script.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="unit"></a>Unit test cases</h2>
+            <p>
+                The core system is a regression testing framework built around
+                test cases.
+                A sample test case looks like this...
+<pre>
+<strong>class FileTestCase extends UnitTestCase {
+}</strong>
+</pre>
+                Actual tests are added as methods in the test case whose names
+                by default start with the string "test" and
+                when the test case is invoked all such methods are run in
+                the order that PHP introspection finds them.
+                As many test methods can be added as needed.
+            </p>
+            <p>
+                For example...
+<pre>
+require_once('simpletest/autorun.php');
+require_once('../classes/writer.php');
+
+class FileTestCase extends UnitTestCase {
+    function FileTestCase() {
+        $this-&gt;UnitTestCase('File test');
+    }<strong>
+
+    function setUp() {
+        @unlink('../temp/test.txt');
+    }
+
+    function tearDown() {
+        @unlink('../temp/test.txt');
+    }
+
+    function testCreation() {
+        $writer = &amp;new FileWriter('../temp/test.txt');
+        $writer-&gt;write('Hello');
+        $this-&gt;assertTrue(file_exists('../temp/test.txt'), 'File created');
+    }</strong>
+}
+</pre>
+                The constructor is optional and usually omitted.
+                Without a name, the class name is taken as the name of the test case.
+            </p>
+            <p>
+                Our only test method at the moment is <span class="new_code">testCreation()</span>
+                where we check that a file has been created by our
+                <span class="new_code">Writer</span> object.
+                We could have put the <span class="new_code">unlink()</span>
+                code into this method as well, but by placing it in
+                <span class="new_code">setUp()</span> and
+                <span class="new_code">tearDown()</span> we can use it with
+                other test methods that we add.
+            </p>
+            <p>
+                The <span class="new_code">setUp()</span> method is run
+                just before each and every test method.
+                <span class="new_code">tearDown()</span> is run just after
+                each and every test method.
+            </p>
+            <p>
+                You can place some test case set up into the constructor to
+                be run once for all the methods in the test case, but
+                you risk test interference that way.
+                This way is slightly slower, but it is safer.
+                Note that if you come from a JUnit background this will not
+                be the behaviour you are used to.
+                JUnit surprisingly reinstantiates the test case for each test
+                method to prevent such interference.
+                SimpleTest requires the end user to use <span class="new_code">setUp()</span>, but
+                supplies additional hooks for library writers.
+            </p>
+            <p>
+                The means of reporting test results (see below) are by a
+                visiting display class
+                that is notified by various <span class="new_code">assert...()</span>
+                methods.
+                Here is the full list for the <span class="new_code">UnitTestCase</span>
+                class, the default for SimpleTest...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">assertTrue($x)</span></td>
+<td>Fail if $x is false</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertFalse($x)</span></td>
+<td>Fail if $x is true</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNull($x)</span></td>
+<td>Fail if $x is set</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNotNull($x)</span></td>
+<td>Fail if $x not set</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertIsA($x, $t)</span></td>
+<td>Fail if $x is not the class or type $t</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNotA($x, $t)</span></td>
+<td>Fail if $x is of the class or type $t</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertEqual($x, $y)</span></td>
+<td>Fail if $x == $y is false</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNotEqual($x, $y)</span></td>
+<td>Fail if $x == $y is true</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertWithinMargin($x, $y, $m)</span></td>
+<td>Fail if abs($x - $y) &lt; $m is false</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertOutsideMargin($x, $y, $m)</span></td>
+<td>Fail if abs($x - $y) &lt; $m is true</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertIdentical($x, $y)</span></td>
+<td>Fail if $x == $y is false or a type mismatch</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNotIdentical($x, $y)</span></td>
+<td>Fail if $x == $y is true and types match</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertReference($x, $y)</span></td>
+<td>Fail unless $x and $y are the same variable</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertClone($x, $y)</span></td>
+<td>Fail unless $x and $y are identical copies</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertPattern($p, $x)</span></td>
+<td>Fail unless the regex $p matches $x</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoPattern($p, $x)</span></td>
+<td>Fail if the regex $p matches $x</td>
+</tr>
+                    <tr>
+<td><span class="new_code">expectError($x)</span></td>
+<td>Fail if matching error does not occour</td>
+</tr>
+                    <tr>
+<td><span class="new_code">expectException($x)</span></td>
+<td>Fail if matching exception is not thrown</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreException($x)</span></td>
+<td>Swallows any upcoming matching exception</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assert($e)</span></td>
+<td>Fail on failed <a href="expectation_documentation.html">expectation</a> object $e</td>
+</tr>
+                </tbody></table>
+                All assertion methods can take an optional description as a
+                last parameter.
+                This is to label the displayed result with.
+                If omitted a default message is sent instead, which is usually
+                sufficient.
+                This default message can still be embedded in your own message
+                if you include "%s" within the string.
+                All the assertions return true on a pass or false on failure.
+            </p>
+            <p>
+                Some examples...
+<pre>
+$variable = null;
+<strong>$this-&gt;assertNull($variable, 'Should be cleared');</strong>
+</pre>
+                ...will pass and normally show no message.
+                If you have
+                <a href="http://www.lastcraft.com/display_subclass_tutorial.php">set up the tester to display passes</a>
+                as well then the message will be displayed as is.
+<pre>
+<strong>$this-&gt;assertIdentical(0, false, 'Zero is not false [%s]');</strong>
+</pre>
+                This will fail as it performs a type
+                check, as well as a comparison, between the two values.
+                The "%s" part is replaced by the default
+                error message that would have been shown if we had not
+                supplied our own.
+<pre>
+$a = 1;
+$b = $a;
+<strong>$this-&gt;assertReference($a, $b);</strong>
+</pre>
+                Will fail as the variable <span class="new_code">$a</span> is a copy of <span class="new_code">$b</span>.
+<pre>
+<strong>$this-&gt;assertPattern('/hello/i', 'Hello world');</strong>
+</pre>
+                This will pass as using a case insensitive match the string
+                <span class="new_code">hello</span> is contained in <span class="new_code">Hello world</span>.
+<pre>
+<strong>$this-&gt;expectError();</strong>
+trigger_error('Catastrophe');
+</pre>
+                Here the check catches the "Catastrophe"
+                message without checking the text and passes.
+                This removes the error from the queue.
+<pre>
+<strong>$this-&gt;expectError('Catastrophe');</strong>
+trigger_error('Catastrophe');
+</pre>
+                The next error check tests not only the existence of the error,
+                but also the text which, here matches so another pass.
+                If any unchecked errors are left at the end of a test method then
+                an exception will be reported in the test.
+            </p>
+            <p>
+                Note that SimpleTest cannot catch compile time PHP errors.
+            </p>
+            <p>
+                The test cases also have some convenience methods for debugging
+                code or extending the suite...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setUp()</span></td>
+<td>Runs this before each test method</td>
+</tr>
+                    <tr>
+<td><span class="new_code">tearDown()</span></td>
+<td>Runs this after each test method</td>
+</tr>
+                    <tr>
+<td><span class="new_code">pass()</span></td>
+<td>Sends a test pass</td>
+</tr>
+                    <tr>
+<td><span class="new_code">fail()</span></td>
+<td>Sends a test failure</td>
+</tr>
+                    <tr>
+<td><span class="new_code">error()</span></td>
+<td>Sends an exception event</td>
+</tr>
+                    <tr>
+<td><span class="new_code">signal($type, $payload)</span></td>
+<td>Sends a user defined message to the test reporter</td>
+</tr>
+                    <tr>
+<td><span class="new_code">dump($var)</span></td>
+<td>Does a formatted <span class="new_code">print_r()</span> for quick and dirty debugging</td>
+</tr>
+                </tbody></table>
+            </p>
+        
+        <h2>
+<a class="target" name="extending_unit"></a>Extending test cases</h2>
+            <p>
+                Of course additional test methods can be added to create
+                specific types of test case, so as to extend framework...
+<pre>
+require_once('simpletest/autorun.php');
+<strong>
+class FileTester extends UnitTestCase {
+    function FileTester($name = false) {
+        $this-&gt;UnitTestCase($name);
+    }
+
+    function assertFileExists($filename, $message = '%s') {
+        $this-&gt;assertTrue(
+                file_exists($filename),
+                sprintf($message, 'File [$filename] existence check'));
+    }</strong>
+}
+</pre>
+                Here the SimpleTest library is held in a folder called
+                <em>simpletest</em> that is local.
+                Substitute your own path for this.
+            </p>
+            <p>
+                To prevent this test case being run accidently, it is
+                advisable to mark it as <span class="new_code">abstract</span>.
+            </p>
+            <p>
+                Alternatively you could add a
+                <span class="new_code">SimpleTestOptions::ignore('FileTester');</span>
+                directive in your code.
+            </p>
+            <p>
+                This new case can be now be inherited just like
+                a normal test case...
+<pre>
+class FileTestCase extends <strong>FileTester</strong> {
+
+    function setUp() {
+        @unlink('../temp/test.txt');
+    }
+
+    function tearDown() {
+        @unlink('../temp/test.txt');
+    }
+
+    function testCreation() {
+        $writer = &amp;new FileWriter('../temp/test.txt');
+        $writer-&gt;write('Hello');<strong>
+        $this-&gt;assertFileExists('../temp/test.txt');</strong>
+    }
+}
+</pre>
+            </p>
+            <p>
+                If you want a test case that does not have all of the
+                <span class="new_code">UnitTestCase</span> assertions,
+                only your own and a few basics,
+                you need to extend the <span class="new_code">SimpleTestCase</span>
+                class instead.
+                It is found in <em>simple_test.php</em> rather than
+                <em>unit_tester.php</em>.
+                See <a href="group_test_documentation.html">later</a> if you
+                want to incorporate other unit tester's
+                test cases in your test suites.
+            </p>
+        
+        <h2>
+<a class="target" name="running_unit"></a>Running a single test case</h2>
+            <p>
+                You won't often run single test cases except when bashing
+                away at a module that is having difficulty, and you don't
+                want to upset the main test suite.
+                With <em>autorun</em> no particular scaffolding is needed,
+                just launch your particular test file and you're ready to go.
+            </p>
+            <p>
+                You can even decide which reporter (for example,
+                <span class="new_code">TextReporter</span> or <span class="new_code">HtmlReporter</span>)
+                you prefer for a specific file when launched on its own...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');<strong>
+SimpleTest :: prefer(new TextReporter());</strong>
+require_once('../classes/writer.php');
+
+class FileTestCase extends UnitTestCase {
+    ...
+}
+?&gt;
+</pre>
+                This script will run as is, but of course will output zero passes
+                and zero failures until test methods are added.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">Full API for SimpleTest</a>
+            from the PHPDoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <span class="chosen">Unit tester</span>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/en/web_tester_documentation.html b/3rdparty/simpletest/docs/en/web_tester_documentation.html
new file mode 100644
index 00000000000..aa9df50a679
--- /dev/null
+++ b/3rdparty/simpletest/docs/en/web_tester_documentation.html
@@ -0,0 +1,588 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP web script testing documentation</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <span class="chosen">Web tester</span>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Web tester documentation</h1>
+        This page...
+        <ul>
+<li>
+            Successfully <a href="#fetch">fetching a web page</a>
+        </li>
+<li>
+            Testing the <a href="#content">page content</a>
+        </li>
+<li>
+            <a href="#navigation">Navigating a web site</a>
+            while testing
+        </li>
+<li>
+            <a href="#request">Raw request modifications</a> and debugging methods
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="fetch"></a>Fetching a page</h2>
+            <p>
+                Testing classes is all very well, but PHP is predominately
+                a language for creating functionality within web pages.
+                How do we test the front end presentation role of our PHP
+                applications?
+                Well the web pages are just text, so we should be able to
+                examine them just like any other test data.
+            </p>
+            <p>
+                This leads to a tricky issue.
+                If we test at too low a level, testing for matching tags
+                in the page with pattern matching for example, our tests will
+                be brittle.
+                The slightest change in layout could break a large number of
+                tests.
+                If we test at too high a level, say using mock versions of a
+                template engine, then we lose the ability to automate some classes
+                of test.
+                For example, the interaction of forms and navigation will
+                have to be tested manually.
+                These types of test are extremely repetitive and error prone.
+            </p>
+            <p>
+                SimpleTest includes a special form of test case for the testing
+                of web page actions.
+                The <span class="new_code">WebTestCase</span> includes facilities
+                for navigation, content and cookie checks and form handling.
+                Usage of these test cases is similar to the
+                <a href="unit_tester_documentation.html">UnitTestCase</a>...
+<pre>
+<strong>class TestOfLastcraft extends WebTestCase {
+}</strong>
+</pre>
+                Here we are about to test the
+                <a href="http://www.lastcraft.com/">Last Craft</a> site itself.
+                If this test case is in a file called <em>lastcraft_test.php</em>
+                then it can be loaded in a runner script just like unit tests...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');<strong>
+require_once('simpletest/web_tester.php');</strong>
+SimpleTest::prefer(new TextReporter());
+
+class WebTests extends TestSuite {
+    function WebTests() {
+        $this-&gt;TestSuite('Web site tests');<strong>
+        $this-&gt;addFile('lastcraft_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                I am using the text reporter here to more clearly
+                distinguish the web content from the test output.
+            </p>
+            <p>
+                Nothing is being tested yet.
+                We can fetch the home page by using the
+                <span class="new_code">get()</span> method...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    <strong>
+    function testHomepage() {
+        $this-&gt;assertTrue($this-&gt;get('http://www.lastcraft.com/'));
+    }</strong>
+}
+</pre>
+                The <span class="new_code">get()</span> method will
+                return true only if page content was successfully
+                loaded.
+                It is a simple, but crude way to check that a web page
+                was actually delivered by the web server.
+                However that content may be a 404 response and yet
+                our <span class="new_code">get()</span> method will still return true.
+            </p>
+            <p>
+                Assuming that the web server for the Last Craft site is up
+                (sadly not always the case), we should see...
+<pre class="shell">
+Web site tests
+OK
+Test cases run: 1/1, Failures: 0, Exceptions: 0
+</pre>
+                All we have really checked is that any kind of page was
+                returned.
+                We don't yet know if it was the right one.
+            </p>
+        
+        <h2>
+<a class="target" name="content"></a>Testing page content</h2>
+            <p>
+                To confirm that the page we think we are on is actually the
+                page we are on, we need to verify the page content.
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {<strong>
+        $this-&gt;get('http://www.lastcraft.com/');
+        $this-&gt;assertText('Why the last craft');</strong>
+    }
+}
+</pre>
+                The page from the last fetch is held in a buffer in
+                the test case, so there is no need to refer to it directly.
+                The pattern match is always made against the buffer.
+            </p>
+            <p>
+                Here is the list of possible content assertions...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">assertTitle($title)</span></td>
+<td>Pass if title is an exact match</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertText($text)</span></td>
+<td>Pass if matches visible and "alt" text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoText($text)</span></td>
+<td>Pass if doesn't match visible and "alt" text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertPattern($pattern)</span></td>
+<td>A Perl pattern match against the page content</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoPattern($pattern)</span></td>
+<td>A Perl pattern match to not find content</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertLink($label)</span></td>
+<td>Pass if a link with this text is present</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoLink($label)</span></td>
+<td>Pass if no link with this text is present</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertLinkById($id)</span></td>
+<td>Pass if a link with this id attribute is present</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoLinkById($id)</span></td>
+<td>Pass if no link with this id attribute is present</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertField($name, $value)</span></td>
+<td>Pass if an input tag with this name has this value</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertFieldById($id, $value)</span></td>
+<td>Pass if an input tag with this id has this value</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertResponse($codes)</span></td>
+<td>Pass if HTTP response matches this list</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertMime($types)</span></td>
+<td>Pass if MIME type is in this list</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertAuthentication($protocol)</span></td>
+<td>Pass if the current challenge is this protocol</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoAuthentication()</span></td>
+<td>Pass if there is no current challenge</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertRealm($name)</span></td>
+<td>Pass if the current challenge realm matches</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertHeader($header, $content)</span></td>
+<td>Pass if a header was fetched matching this value</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoHeader($header)</span></td>
+<td>Pass if a header was not fetched</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertCookie($name, $value)</span></td>
+<td>Pass if there is currently a matching cookie</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoCookie($name)</span></td>
+<td>Pass if there is currently no cookie of this name</td>
+</tr>
+                </tbody></table>
+                As usual with the SimpleTest assertions, they all return
+                false on failure and true on pass.
+                They also allow an optional test message and you can embed
+                the original test message inside using "%s" inside
+                your custom message.
+            </p>
+            <p>
+                So now we could instead test against the title tag with...
+<pre>
+<strong>$this-&gt;assertTitle('The Last Craft? Web developer tutorials on PHP, Extreme programming and Object Oriented development');</strong>
+</pre>
+                ...or, if that is too long and fragile...
+<pre>
+<strong>$this-&gt;assertTitle(new PatternExpectation('/The Last Craft/'));</strong>
+</pre>
+                As well as the simple HTML content checks we can check
+                that the MIME type is in a list of allowed types with...
+<pre>
+<strong>$this-&gt;assertMime(array('text/plain', 'text/html'));</strong>
+</pre>
+                More interesting is checking the HTTP response code.
+                Like the MIME type, we can assert that the response code
+                is in a list of allowed values...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testRedirects() {
+        $this-&gt;get('http://www.lastcraft.com/test/redirect.php');
+        $this-&gt;assertResponse(200);&lt;/strong&gt;
+    }
+}
+</pre>
+                Here we are checking that the fetch is successful by
+                allowing only a 200 HTTP response.
+                This test will pass, but it is not actually correct to do so.
+                There is no page, instead the server issues a redirect.
+                The <span class="new_code">WebTestCase</span> will
+                automatically follow up to three such redirects.
+                The tests are more robust this way and we are usually
+                interested in the interaction with the pages rather
+                than their delivery.
+                If the redirects are of interest then this ability must
+                be disabled...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {<strong>
+        $this-&gt;setMaximumRedirects(0);</strong>
+        $this-&gt;get('http://www.lastcraft.com/test/redirect.php');
+        $this-&gt;assertResponse(200);
+    }
+}
+</pre>
+                The assertion now fails as expected...
+<pre class="shell">
+Web site tests
+1) Expecting response in [200] got [302]
+    in testhomepage
+    in testoflastcraft
+    in lastcraft_test.php
+FAILURES!!!
+Test cases run: 1/1, Failures: 1, Exceptions: 0
+</pre>
+                We can modify the test to correctly assert redirects with...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {
+        $this-&gt;setMaximumRedirects(0);
+        $this-&gt;get('http://www.lastcraft.com/test/redirect.php');
+        $this-&gt;assertResponse(<strong>array(301, 302, 303, 307)</strong>);
+    }
+}
+</pre>
+                This now passes.
+            </p>
+        
+        <h2>
+<a class="target" name="navigation"></a>Navigating a web site</h2>
+            <p>
+                Users don't often navigate sites by typing in URLs, but by
+                clicking links and buttons.
+                Here we confirm that the contact details can be reached
+                from the home page...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    ...
+    function testContact() {
+        $this-&gt;get('http://www.lastcraft.com/');<strong>
+        $this-&gt;clickLink('About');
+        $this-&gt;assertTitle(new PatternExpectation('/About Last Craft/'));</strong>
+    }
+}
+</pre>
+                The parameter is the text of the link.
+            </p>
+            <p>
+                If the target is a button rather than an anchor tag, then
+                <span class="new_code">clickSubmit()</span> can be used
+                with the button title...
+<pre>
+<strong>$this-&gt;clickSubmit('Go!');</strong>
+</pre>
+                If you are not sure or don't care, the usual case, then just
+                use the <span class="new_code">click()</span> method...
+<pre>
+<strong>$this-&gt;click('Go!');</strong>
+</pre>
+            </p>
+            <p>
+                The list of navigation methods is...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>The current location</td>
+</tr>
+                    <tr>
+<td><span class="new_code">get($url, $parameters)</span></td>
+<td>Send a GET request with these parameters</td>
+</tr>
+                    <tr>
+<td><span class="new_code">post($url, $parameters)</span></td>
+<td>Send a POST request with these parameters</td>
+</tr>
+                    <tr>
+<td><span class="new_code">head($url, $parameters)</span></td>
+<td>Send a HEAD request without replacing the page content</td>
+</tr>
+                    <tr>
+<td><span class="new_code">retry()</span></td>
+<td>Reload the last request</td>
+</tr>
+                    <tr>
+<td><span class="new_code">back()</span></td>
+<td>Like the browser back button</td>
+</tr>
+                    <tr>
+<td><span class="new_code">forward()</span></td>
+<td>Like the browser forward button</td>
+</tr>
+                    <tr>
+<td><span class="new_code">authenticate($name, $password)</span></td>
+<td>Retry after a challenge</td>
+</tr>
+                    <tr>
+<td><span class="new_code">restart()</span></td>
+<td>Restarts the browser as if a new session</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getCookie($name)</span></td>
+<td>Gets the cookie value for the current context</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ageCookies($interval)</span></td>
+<td>Ages current cookies prior to a restart</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clearFrameFocus()</span></td>
+<td>Go back to treating all frames as one page</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmit($label)</span></td>
+<td>Click the first button with this label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitByName($name)</span></td>
+<td>Click the button with this name attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitById($id)</span></td>
+<td>Click the button with this ID attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImage($label, $x, $y)</span></td>
+<td>Click an input tag of type image by title or alt text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageByName($name, $x, $y)</span></td>
+<td>Click an input tag of type image by name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageById($id, $x, $y)</span></td>
+<td>Click an input tag of type image by ID attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">submitFormById($id)</span></td>
+<td>Submit a form without the submit value</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLink($label, $index)</span></td>
+<td>Click an anchor by the visible label text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLinkById($id)</span></td>
+<td>Click an anchor by the ID attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFrameFocus()</span></td>
+<td>The name of the currently selected frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocusByIndex($choice)</span></td>
+<td>Focus on a frame counting from 1</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocus($name)</span></td>
+<td>Focus on a frame by name</td>
+</tr>
+                </tbody></table>
+            </p>
+            <p>
+                The parameters in the <span class="new_code">get()</span>, <span class="new_code">post()</span> or
+                <span class="new_code">head()</span> methods are optional.
+                The HTTP HEAD fetch does not change the browser context, only loads
+                cookies.
+                This can be useful for when an image or stylesheet sets a cookie
+                for crafty robot blocking.
+            </p>
+            <p>
+                The <span class="new_code">retry()</span>, <span class="new_code">back()</span> and
+                <span class="new_code">forward()</span> commands work as they would on
+                your web browser.
+                They use the history to retry pages.
+                This can be handy for checking the effect of hitting the
+                back button on your forms.
+            </p>
+            <p>
+                The frame methods need a little explanation.
+                By default a framed page is treated just like any other.
+                Content will be searced for throughout the entire frameset,
+                so clicking a link will work no matter which frame
+                the anchor tag is in.
+                You can override this behaviour by focusing on a single
+                frame.
+                If you do that, all searches and actions will apply to that
+                frame alone, such as authentication and retries.
+                If a link or button is not in a focused frame then it cannot
+                be clicked.
+            </p>
+            <p>
+                Testing navigation on fixed pages only tells you when you
+                have broken an entire script.
+                For highly dynamic pages, such as for bulletin boards, this can
+                be crucial for verifying the correctness of the application.
+                For most applications though, the really tricky logic is usually in
+                the handling of forms and sessions.
+                Fortunately SimpleTest includes
+                <a href="form_testing_documentation.html">tools for testing web forms</a>
+                as well.
+            </p>
+        
+        <h2>
+<a class="target" name="request"></a>Modifying the request</h2>
+            <p>
+                Although SimpleTest does not have the goal of testing networking
+                problems, it does include some methods to modify and debug
+                the requests it makes.
+                Here is another method list...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">getTransportError()</span></td>
+<td>The last socket error</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showRequest()</span></td>
+<td>Dump the outgoing request</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showHeaders()</span></td>
+<td>Dump the incoming headers</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showSource()</span></td>
+<td>Dump the raw HTML page content</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreFrames()</span></td>
+<td>Do not load framesets</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setCookie($name, $value)</span></td>
+<td>Set a cookie from now on</td>
+</tr>
+                    <tr>
+<td><span class="new_code">addHeader($header)</span></td>
+<td>Always add this header to the request</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumRedirects($max)</span></td>
+<td>Stop after this many redirects</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setConnectionTimeout($timeout)</span></td>
+<td>Kill the connection after this time between bytes</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useProxy($proxy, $name, $password)</span></td>
+<td>Make requests via this proxy URL</td>
+</tr>
+                </tbody></table>
+                These methods are principally for debugging.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <span class="chosen">Web tester</span>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/authentication_documentation.html b/3rdparty/simpletest/docs/fr/authentication_documentation.html
new file mode 100644
index 00000000000..fe70e035593
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/authentication_documentation.html
@@ -0,0 +1,372 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation Simple Test : tester l'authentification</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur l'authentification</h1>
+        This page...
+        <ul>
+<li>
+            Passer au travers d'une <a href="#basique">authentification HTTP basique</a>
+        </li>
+<li>
+            Tester l'<a href="#cookies">authentification basée sur des cookies</a>
+        </li>
+<li>
+            Gérer les <a href="#session">sessions du navigateur</a> et les timeouts
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                Un des secteurs à la fois délicat et important lors d'un test
+                de site web reste la sécurité. Tester ces schémas est au coeur
+                des objectifs du testeur web de SimpleTest.
+            </p>
+        
+        <h2>
+<a class="target" name="basique"></a>Authentification HTTP basique</h2>
+            <p>
+                Si vous allez chercher une page web protégée
+                par une authentification basique, vous hériterez d'une entête 401.
+                Nous pouvons représenter ceci par ce test...
+<pre>
+class AuthenticationTest extends WebTestCase {<strong>
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');
+        $this-&gt;showHeaders();
+    }</strong>
+}
+</pre>
+                Ce qui nous permet de voir les entêtes reçues...
+                <div class="demo">
+                    <h1>File test</h1>
+<pre style="background-color: lightgray; color: black">
+HTTP/1.1 401 Authorization Required
+Date: Sat, 18 Sep 2004 19:25:18 GMT
+Server: Apache/1.3.29 (Unix) PHP/4.3.4
+WWW-Authenticate: Basic realm="SimpleTest basic authentication"
+Connection: close
+Content-Type: text/html; charset=iso-8859-1
+</pre>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>0</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                Sauf que nous voulons éviter l'inspection visuelle,
+                on souhaite que SimpleTest puisse nous dire si oui ou non
+                la page est protégée. Voici un test en profondeur sur nos entêtes...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');<strong>
+        $this-&gt;assertAuthentication('Basic');
+        $this-&gt;assertResponse(401);
+        $this-&gt;assertRealm('SimpleTest basic authentication');</strong>
+    }
+}
+</pre>
+                N'importe laquelle de ces assertions suffirait,
+                tout dépend de la masse de détails que vous souhaitez voir.
+            </p>
+            <p>
+                Un des axes qui traverse SimpleTest est la possibilité d'utiliser
+				des objets <span class="new_code">SimpleExpectation</span> à chaque fois qu'une
+				vérification simple suffit.
+				Si vous souhaitez vérifiez simplement le contenu du realm - l'identification
+				du domaine - dans notre exemple, il suffit de faire...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');
+        $this-&gt;assertRealm(<strong>new PatternExpectation('/simpletest/i')</strong>);
+    }
+}
+</pre>
+                Ce type de test, vérifier les réponses HTTP, n'est cependant pas commun.
+            </p>
+			<p>
+                La plupart du temps, nous ne souhaitons pas tester
+                l'authentification en elle-même, mais plutôt
+                les pages protégées par cette authentification.
+                Dès que la tentative d'authentification est reçue,
+                nous pouvons y répondre à l'aide d'une réponse d'authentification :
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function testAuthentication() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');<strong>
+        $this-&gt;authenticate('Me', 'Secret');</strong>
+        $this-&gt;assertTitle(...);
+    }
+}
+</pre>
+                Le nom d'utilisateur et le mot de passe seront désormais
+                envoyés à chaque requête vers ce répertoire
+                et ses sous-répertoires.
+                En revanche vous devrez vous authentifier à nouveau
+                si vous sortez de ce répertoire mais SimpleTest est assez
+                intelligent pour fusionner les sous-répertoires dans un même domaine.
+            </p>
+            <p>
+                Vous pouvez gagner une ligne en définissant
+                l'authentification au niveau de l'URL...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function testCanReadAuthenticatedPages() {
+        $this-&gt;get('http://<strong>Me:Secret@</strong>www.lastcraft.com/protected/');
+        $this-&gt;assertTitle(...);
+    }
+}
+</pre>
+                Si votre nom d'utilisateur ou mot de passe comporte
+                des caractères spéciaux, alors n'oubliez pas de les encoder,
+                sinon la requête ne sera pas analysée correctement.
+                De plus cette entête ne sera pas envoyée aux
+                sous requêtes si vous la définissez avec une URL absolue.
+                Par contre si vous naviguez avec des URL relatives,
+                l'information d'authentification sera préservée.
+            </p>
+            <p>
+                Normalement, vous utilisez l'appel <span class="new_code">authenticate()</span>. SimpleTest
+				utilisera alors vos informations de connexion à chaque requête.
+            </p>
+            <p>
+                 Pour l'instant, seule l'authentification de base est implémentée
+                 et elle n'est réellement fiable qu'en tandem avec une connexion HTTPS.
+                 C'est généralement suffisant pour protéger
+                 le serveur testé des regards malveillants.
+                 Les authentifications Digest et NTLM pourraient être ajoutées prochainement.
+            </p>
+        
+        <h2>
+<a class="target" name="cookies"></a>Cookies</h2>
+            <p>
+                L'authentification de base ne donne pas assez de contrôle
+                au développeur Web sur l'interface utilisateur.
+                Il y a de forte chance pour que cette fonctionnalité
+                soit codée directement dans l'architecture web
+                à grand renfort de cookies et de timeouts compliqués.
+            </p>
+            <p>
+                Commençons par un simple formulaire de connexion...
+<pre>
+&lt;form&gt;
+    Username:
+    &lt;input type="text" name="u" value="" /&gt;&lt;br /&gt;
+    Password:
+    &lt;input type="password" name="p" value="" /&gt;&lt;br /&gt;
+    &lt;input type="submit" value="Log in" /&gt;
+&lt;/form&gt;
+</pre>
+                Lequel doit ressembler à...
+            </p>
+            <p>
+                <form class="demo">
+                    Username:
+                    <input type="text" name="u" value=""><br>
+                    Password:
+                    <input type="password" name="p" value=""><br>
+                    <input type="submit" value="Log in">
+                </form>
+            </p>
+            <p>
+                Supposons que, durant le chargement de la page,
+                un cookie ait été inscrit avec un numéro d'identifiant de session.
+                Nous n'allons pas encore remplir le formulaire,
+                juste tester que nous pistons bien l'utilisateur.
+                Voici le test...
+<pre>
+class LogInTest extends WebTestCase {
+    function testSessionCookieSetBeforeForm() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $this-&gt;assertCookie('SID');</strong>
+    }
+}
+</pre>
+                Nous nous contentons ici de vérifier que le cookie a bien été défini.
+                Etant donné que sa valeur est plutôt énigmatique,
+                elle ne vaudrait pas la peine d'être testée avec...
+<pre>
+class LogInTest extends WebTestCase {
+    function testSessionCookieIsCorrectPattern() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;assertCookie('SID', <strong>new PatternExpectation('/[a-f0-9]{32}/i')</strong>);
+    }
+}
+</pre>
+                Si vous utilisez PHP pour gérer vos sessions alors
+				ce test est encore plus inutile, étant donné qu'il ne fait
+				que tester PHP lui-même.
+            </p>
+            <p>
+                Le test le plus simple pour vérifier que la connexion a bien eu lieu
+				reste d'inspecter visuellement la page suivante :
+				un simple appel à <span class="new_code">WebTestCase::assertText()</span> et le tour est joué.
+            </p>
+            <p>
+                Le reste du test est le même que dans n'importe quel autre formulaire,
+                mais nous pourrions souhaiter nous assurer
+                que le cookie n'a pas été modifié depuis la phase de connexion.
+                Voici comment cela pourrait être testé :
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testSessionCookieSameAfterLogIn() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $session = $this-&gt;getCookie('SID');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;clickSubmit('Log in');
+        $this-&gt;assertWantedPattern('/Welcome Me/');
+        $this-&gt;assertCookie('SID', $session);</strong>
+    }
+}
+</pre>
+                Ceci confirme que l'identifiant de session
+                est identique avant et après la connexion.
+            </p>
+            <p>
+                Nous pouvons même essayer de duper notre propre système
+                en créant un cookie arbitraire pour se connecter...
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testSessionCookieSameAfterLogIn() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $this-&gt;setCookie('SID', 'Some other session');
+        $this-&gt;get('http://www.my-site.com/restricted.php');</strong>
+        $this-&gt;assertWantedPattern('/Access denied/');
+    }
+}
+</pre>
+                Votre site est-il protégé contre ce type d'attaque ?
+            </p>
+        
+        <h2>
+<a class="target" name="session"></a>Sessions de navigateur</h2>
+            <p>
+                Si vous testez un système d'authentification,
+                la reconnexion par un utilisateur est un point sensible.
+                Essayons de simuler ce qui se passe dans ce cas :
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testLoseAuthenticationAfterBrowserClose() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;clickSubmit('Log in');
+        $this-&gt;assertWantedPattern('/Welcome Me/');<strong>
+        
+        $this-&gt;restart();
+        $this-&gt;get('http://www.my-site.com/restricted.php');
+        $this-&gt;assertWantedPattern('/Access denied/');</strong>
+    }
+}
+</pre>
+                La méthode <span class="new_code">WebTestCase::restart()</span> préserve
+                les cookies dont le timeout n'a pas expiré,
+                mais jette les cookies temporaires ou expirés.
+                Vous pouvez spécifier l'heure et la date de leur réactivation.
+            </p>
+            <p>
+                L'expiration des cookies peut être un problème.
+                Si vous avez un cookie qui doit expirer au bout d'une heure,
+                nous n'allons pas mettre le test en veille en attendant
+                que le cookie expire...
+            </p>
+            <p>
+                Afin de provoquer leur expiration,
+                vous pouvez dater manuellement les cookies,
+                avant le début de la session.
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testLoseAuthenticationAfterOneHour() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;clickSubmit('Log in');
+        $this-&gt;assertWantedPattern('/Welcome Me/');
+        <strong>
+        $this-&gt;ageCookies(3600);</strong>
+        $this-&gt;restart();
+        $this-&gt;get('http://www.my-site.com/restricted.php');
+        $this-&gt;assertWantedPattern('/Access denied/');
+    }
+}
+</pre>
+                Après le redémarrage, les cookies seront plus vieux
+                d'une heure et que tous ceux dont la date d'expiration
+                sera passée auront disparus.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API du développeur pour SimpleTest</a> donne tous les détails sur les classes et les assertions disponibles.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/browser_documentation.html b/3rdparty/simpletest/docs/fr/browser_documentation.html
new file mode 100644
index 00000000000..6be1267773b
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/browser_documentation.html
@@ -0,0 +1,500 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : le composant de navigation web scriptable</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur le navigateur scriptable</h1>
+        This page...
+        <ul>
+<li>
+            Utiliser le <a href="#scripting">navigateur web dans des scripts</a>
+        </li>
+<li>
+            <a href="#deboguer">Déboguer</a> les erreurs sur les pages
+        </li>
+<li>
+            <a href="#unit">Tests complexes avec des navigateurs web multiples</a>
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                Le composant de navigation web de SimpleTest peut être utilisé
+                non seulement à l'extérieur de la classe <span class="new_code">WebTestCase</span>,
+                mais aussi indépendamment du framework SimpleTest lui-même.
+            </p>
+        
+        <h2>
+<a class="target" name="script"></a>Le navigateur scriptable</h2>
+            <p>
+                Vous pouvez utiliser le navigateur web dans des scripts PHP
+                pour confirmer que des services marchent bien comme il faut
+                ou pour extraire des informations à partir de ceux-ci de façon régulière.
+                Par exemple, voici un petit script pour extraire
+                le nombre de bogues ouverts dans PHP 5 à partir
+                du <a href="http://www.php.net/">site web PHP</a>...
+<pre>
+&lt;?php
+    require_once('simpletest/browser.php');
+    
+    $browser = &amp;new SimpleBrowser();
+    $browser-&gt;get('http://php.net/');
+    $browser-&gt;clickLink('reporting bugs');
+    $browser-&gt;clickLink('statistics');
+    $browser-&gt;clickLink('PHP 5 bugs only');
+    $page = $browser-&gt;getContent();
+    preg_match('/status=Open.*?by=Any.*?(\d+)&lt;\/a&gt;/', $page, $matches);
+    print $matches[1];
+?&gt;
+</pre>
+                Bien sûr Il y a des méthodes plus simple pour réaliser
+                cet exemple en PHP. Par exemple, vous pourriez juste
+                utiliser la commande PHP <span class="new_code">file()</span> sur ce qui est
+                ici une page fixe. Cependant, en utilisant des scripts
+                avec le navigateur web vous vous autorisez l'authentification,
+                la gestion des cookies, le chargement automatique des fenêtres,
+                les redirections, la transmission de formulaires et la capacité
+                d'examiner les entêtes.
+			</p>
+			<p>
+				Ces méthodes qui se basent sur le contenu textuel des pages
+				sont fragiles dans un site en constante évolution
+				et vous voudrez employer une méthode plus directe
+				pour accéder aux données de façon permanente,
+                mais pour des tâches simples cette technique peut s'avérer
+                une solution très rapide.
+            </p>
+            <p>
+                Toutes les méthode de navigation utilisées dans <a href="web_tester_documentation.html">WebTestCase</a> sont présente dans la classe <span class="new_code">SimpleBrowser</span>, mais les assertions sont remplacées par de simples accesseurs. Voici une liste complète des méthodes de navigation de page à page...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">addHeader($header)</span></td>
+<td>Ajouter une entête à chaque téléchargement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useProxy($proxy, $username, $password)</span></td>
+<td>Utilise ce proxy à partir de maintenant</td>
+</tr> 
+                    <tr>
+<td><span class="new_code">head($url, $parameters)</span></td>
+<td>Effectue une requête HEAD</td>
+</tr>
+                    <tr>
+<td><span class="new_code">get($url, $parameters)</span></td>
+<td>Télécharge une page avec un GET</td>
+</tr>
+                    <tr>
+<td><span class="new_code">post($url, $parameters)</span></td>
+<td>Télécharge une page avec un POST</td>
+</tr>
+                    <tr>
+<td><span class="new_code">click($label)</span></td>
+<td>Suit un lien visible ou un bouton texte par son étiquette</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLink($label)</span></td>
+<td>Suit un lien par son étiquette</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isLink($label)</span></td>
+<td>Vérifie l'existance d'un lien par son étiquette</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLinkById($id)</span></td>
+<td>Suit un lien par son attribut d'identification</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isLinkById($id)</span></td>
+<td>Vérifie l'existance d'un lien par son attribut d'identification</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>La page ou la fenêtre URL en cours</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getTitle()</span></td>
+<td>Le titre de la page</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getContent()</span></td>
+<td>Le page ou la fenêtre brute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getContentAsText()</span></td>
+<td>Sans code HTML à l'exception du text "alt"</td>
+</tr>
+                    <tr>
+<td><span class="new_code">retry()</span></td>
+<td>Répète la dernière requête</td>
+</tr>
+                    <tr>
+<td><span class="new_code">back()</span></td>
+<td>Utilise le bouton "précédent" du navigateur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">forward()</span></td>
+<td>Utilise le bouton "suivant" du navigateur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">authenticate($username, $password)</span></td>
+<td>Retente la page ou la fenêtre après une réponse 401</td>
+</tr>
+                    <tr>
+<td><span class="new_code">restart($date)</span></td>
+<td>Relance le navigateur pour une nouvelle session</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ageCookies($interval)</span></td>
+<td>Change la date des cookies</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setCookie($name, $value)</span></td>
+<td>Lance un nouveau cookie</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getCookieValue($host, $path, $name)</span></td>
+<td>Lit le cookie le plus spécifique</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getCurrentCookieValue($name)</span></td>
+<td>Lit le contenue du cookie en cours</td>
+</tr>
+                </tbody></table>
+                Les méthode <span class="new_code">SimpleBrowser::useProxy()</span> et
+                <span class="new_code">SimpleBrowser::addHeader()</span> sont spéciales.
+                Une fois appelées, elles continuent à s'appliquer sur les téléchargements suivants.
+            </p>
+            <p>
+                Naviguer dans les formulaires est similaire à la <a href="form_testing_documentation.html">navigation des formulaires via WebTestCase</a>...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setField($label, $value)</span></td>
+<td>Modifie tous les champs avec cette étiquette ou ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFieldByName($name, $value)</span></td>
+<td>Modifie tous les champs avec ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFieldById($id, $value)</span></td>
+<td>Modifie tous les champs avec cet identifiant</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getField($label)</span></td>
+<td>Accesseur de la valeur d'un élément de formulaire avec cette étiquette ou ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFieldByName($name)</span></td>
+<td>Accesseur de la valeur d'un élément de formulaire avec ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFieldById($id)</span></td>
+<td>Accesseur de la valeur de l'élément de formulaire avec cet identifiant</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmit($label)</span></td>
+<td>Transmet le formulaire avec l'étiquette de son bouton</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitByName($name)</span></td>
+<td>Transmet le formulaire avec l'attribut de son bouton</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitById($id)</span></td>
+<td>Transmet le formulaire avec l'identifiant de son bouton</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImage($label, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son titre (title="*") our son texte alternatif (alt="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageByName($name, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son attribut (name="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageById($id, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son identifiant (id="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">submitFormById($id)</span></td>
+<td>Transmet le formulaire par son identifiant propre</td>
+</tr>
+                </tbody></table>
+                Au jourd d'aujourd'hui il n'existe pas beaucoup de méthodes pour lister
+                les formulaires et les champs disponibles.
+				<table><tbody>
+                    <tr>
+<td><span class="new_code">isClickable($label)</span></td>
+<td>Vérifie si un lien existe avec cette étiquette ou ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isSubmit($label)</span></td>
+<td>Vérifie si un bouton existe avec cette étiquette ou ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isImage($label)</span></td>
+<td>Vérifie si un bouton image existe avec cette étiquette ou ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getLink($label)</span></td>
+<td>Trouve une URL à partir de son label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getLinkById($label)</span></td>
+<td>Trouve une URL à partir de son identifiant</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrls()</span></td>
+<td>Liste l'ensemble des liens de la page courante</td>
+</tr>
+                </tbody></table>
+				Ce sera probablement
+                ajouté dans des versions successives de SimpleTest.
+            </p>
+            <p>
+                A l'intérieur d'une page, les fenêtres individuelles peuvent être
+                sélectionnées. Si aucune sélection n'est réalisée alors
+                toutes les fenêtres sont fusionnées ensemble dans
+                une unique et grande page.
+                Le contenu de la page en cours sera une concaténation des
+                toutes les fenêtres dans l'ordre spécifié par les balises "frameset".
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">getFrames()</span></td>
+<td>Un déchargement de la structure de la fenêtre courante</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFrameFocus()</span></td>
+<td>L'index ou l'étiquette de la fenêtre en courante</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocusByIndex($choice)</span></td>
+<td>Sélectionne la fenêtre numérotée à partir de 1</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocus($name)</span></td>
+<td>Sélectionne une fenêtre par son étiquette</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clearFrameFocus()</span></td>
+<td>Traite toutes les fenêtres comme une seule page</td>
+</tr>
+                </tbody></table>
+                Lorsqu'on est focalisé sur une fenêtre unique,
+                le contenu viendra de celle-ci uniquement.
+                Cela comprend les liens à cliquer et les formulaires à transmettre.
+            </p>
+        
+        <h2>
+<a class="target" name="deboguer"></a>Où sont les erreurs ?</h2>
+            <p>
+                Toute cette masse de fonctionnalités est géniale
+                lorsqu'on arrive à bien télécharger les pages,
+                mais ce n'est pas toujours évident.
+                Pour aider à découvrir les erreurs, le navigateur a aussi
+                des méthodes pour aider au débogage.
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setConnectionTimeout($timeout)</span></td>
+<td>Ferme la socket avec un délai trop long</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>L'URL de la page chargée le plus récemment</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getRequest()</span></td>
+<td>L'entête de la requête brute de la page ou de la fenêtre</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getHeaders()</span></td>
+<td>L'entête de réponse de la page ou de la fenêtre</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getTransportError()</span></td>
+<td>N'importe quel erreur au niveau de la socket dans le dernier téléchargement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getResponseCode()</span></td>
+<td>La réponse HTTP de la page ou de la fenêtre</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getMimeType()</span></td>
+<td>Le type Mime de la page our de la fenêtre</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getAuthentication()</span></td>
+<td>Le type d'authentification dans l'entête d'une provocation 401</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getRealm()</span></td>
+<td>Le realm d'authentification dans l'entête d'une provocation 401</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getBaseUrl()</span></td>
+<td>Uniquement la base de l'URL de la page chargée le plus récemment</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumRedirects($max)</span></td>
+<td>Nombre de redirections avant que la page ne soit chargée automatiquement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumNestedFrames($max)</span></td>
+<td>Protection contre des framesets récursifs</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreFrames()</span></td>
+<td>Neutralise le support des fenêtres</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useFrames()</span></td>
+<td>Autorise le support des fenêtres</td>
+</tr>
+                </tbody></table>
+                Les méthodes <span class="new_code">SimpleBrowser::setConnectionTimeout()</span>,
+                <span class="new_code">SimpleBrowser::setMaximumRedirects()</span>,
+                <span class="new_code">SimpleBrowser::setMaximumNestedFrames()</span>,
+                <span class="new_code">SimpleBrowser::ignoreFrames()</span>
+                et <span class="new_code">SimpleBrowser::useFrames()</span> continuent à s'appliquer
+                sur toutes les requêtes suivantes.
+                Les autres méthodes tiennent compte des fenêtres.
+                Cela veut dire que si une fenêtre individuelle ne se charge pas,
+                il suffit de se diriger vers elle avec
+                <span class="new_code">SimpleBrowser::setFrameFocus()</span> : ensuite on utilisera
+                <span class="new_code">SimpleBrowser::getRequest()</span>, etc. pour voir ce qui se passe.
+            </p>
+        
+        <h2>
+<a class="target" name="unit"></a>Tests unitaires complexes avec des navigateurs multiples</h2>
+            <p>
+                Tout ce qui peut être fait dans
+                <a href="web_tester_documentation.html">WebTestCase</a> peut maintenant
+                être fait dans un <a href="unit_tester_documentation.html">UnitTestCase</a>.
+                Ce qui revient à dire que nous pouvons librement mélanger
+                des tests sur des objets de domaine avec l'interface web...
+<pre><strong>
+class TestOfRegistration extends UnitTestCase {
+    function testNewUserAddedToAuthenticator() {</strong>
+        $browser = new SimpleBrowser();
+        $browser-&gt;get('http://my-site.com/register.php');
+        $browser-&gt;setField('email', 'me@here');
+        $browser-&gt;setField('password', 'Secret');
+        $browser-&gt;clickSubmit('Register');
+        <strong>
+        $authenticator = new Authenticator();
+        $member = $authenticator-&gt;findByEmail('me@here');
+        $this-&gt;assertEqual($member-&gt;getPassword(), 'Secret');</strong>
+    }
+}
+</pre>
+                Bien que ça puisse être utile par convenance temporaire,
+                je ne suis pas fan de ce genre de test. Ce test s'applique
+                à plusieurs couches de l'application, ça implique qu'il est
+                plus que probable qu'il faudra le remanier lorsque le code changera.
+            </p>
+            <p>
+                Un cas plus utile d'utilisation directe du navigateur est
+                le moment où le <span class="new_code">WebTestCase</span> ne peut plus suivre.
+                Un exemple ? Quand deux navigateurs doivent être utilisés en même temps.
+            </p>
+            <p>
+                Par exemple, supposons que nous voulions interdire
+                des usages simultanés d'un site avec le même login d'identification.
+                Ce scénario de test le vérifie...
+<pre>
+class TestOfSecurity extends UnitTestCase {
+    function testNoMultipleLoginsFromSameUser() {
+        $first = &amp;new SimpleBrowser();
+        $first-&gt;get('http://my-site.com/login.php');
+        $first-&gt;setField('name', 'Me');
+        $first-&gt;setField('password', 'Secret');
+        $first-&gt;clickSubmit('Enter');
+        $this-&gt;assertEqual($first-&gt;getTitle(), 'Welcome');
+        
+        $second = &amp;new SimpleBrowser();
+        $second-&gt;get('http://my-site.com/login.php');
+        $second-&gt;setField('name', 'Me');
+        $second-&gt;setField('password', 'Secret');
+        $second-&gt;clickSubmit('Enter');
+        $this-&gt;assertEqual($second-&gt;getTitle(), 'Access Denied');
+    }
+}
+</pre>
+                Vous pouvez aussi utiliser la classe <span class="new_code">SimpleBrowser</span>
+                quand vous souhaitez écrire des scénarios de test en utilisant
+                un autre outil que SimpleTest, comme PHPUnit par exemple.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API de développeur pour SimpleTest</a>
+            donne tous les détails sur les classes et les assertions disponibles.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/docs.css b/3rdparty/simpletest/docs/fr/docs.css
new file mode 100755
index 00000000000..49170486ab3
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/docs.css
@@ -0,0 +1,84 @@
+body {
+    padding-left: 3%;
+    padding-right: 3%;
+}
+pre {
+    font-family: "courier new", courier;
+    font-size: 80%;
+    border: 1px solid;
+    background-color: #cccccc;
+    padding: 5px;
+    margin-left: 5%;
+    margin-right: 8%;
+}
+.code, .new_code, pre.new_code {
+    font-weight: bold;
+}
+div.copyright {
+    font-size: 80%;
+    color: gray;
+}
+div.copyright a {
+    color: gray;
+}
+ul.api {
+    padding-left: 0em;
+    padding-right: 25%;
+}
+ul.api li {
+    margin-top: 0.2em;
+    margin-bottom: 0.2em;
+    list-style: none;
+    text-indent: -3em;
+    padding-left: 3em;
+}
+div.demo {
+    border: 4px ridge;
+    border-color: gray;
+    padding: 10px;
+    margin: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+    background-color: white;
+}
+div.demo span.fail {
+    color: red;
+}
+div.demo span.pass {
+    color: green;
+}
+div.demo h1 {
+    font-size: 12pt;
+    text-align: left;
+    font-weight: bold;
+}
+table {
+    border: 2px outset;
+    border-color: gray;
+    background-color: white;
+    margin: 5px;
+    margin-left: 5%;
+    margin-right: 5%;
+}
+td {
+    font-size: 80%;
+}
+.shell {
+    color: white;
+}
+pre.shell {
+    border: 4px ridge;
+    border-color: gray;
+    padding: 10px;
+    margin: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+    background-color: black;
+}
+form.demo {
+    background-color: lightgray;
+    border: 4px outset;
+    border-color: lightgray;
+    padding: 10px;
+    margin-right: 40%;
+}
diff --git a/3rdparty/simpletest/docs/fr/expectation_documentation.html b/3rdparty/simpletest/docs/fr/expectation_documentation.html
new file mode 100644
index 00000000000..ee579110a6d
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/expectation_documentation.html
@@ -0,0 +1,451 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : étendre le testeur unitaire avec des classes d'attentes supplémentaires</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur les attentes</h1>
+        This page...
+        <ul>
+<li>
+            Utiliser les attentes <a href="#fantaisie">pour des tests
+            plus précis avec des objets fantaisie</a>
+        </li>
+<li>
+            <a href="#comportement">Changer le comportement d'un objet fantaisie</a>
+            avec des attentes
+        </li>
+<li>
+            <a href="#etendre">Créer des attentes</a>
+        </li>
+<li>
+            Par dessous SimpleTest <a href="#unitaire">utilise des classes d'attente</a>
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="fantaisie"></a>Plus de contrôle sur les objets fantaisie</h2>
+            <p>
+                Le comportement par défaut des
+                <a href="mock_objects_documentation.html">objets fantaisie</a> dans
+                <a href="http://sourceforge.net/projects/simpletest/">SimpleTest</a>
+                est soit une correspondance identique sur l'argument,
+                soit l'acceptation de n'importe quel argument.
+                Pour la plupart des tests, c'est suffisant.
+                Cependant il est parfois nécessaire de ramollir un scénario de test.
+            </p>
+            <p>
+                Un des endroits où un test peut être trop serré
+                est la reconnaissance textuelle. Prenons l'exemple
+                d'un composant qui produirait un message d'erreur
+                utile lorsque quelque chose plante. Il serait utile de tester
+                que l'erreur correcte est renvoyée,
+                mais le texte proprement dit risque d'être plutôt long.
+                Si vous testez le texte dans son ensemble alors
+                à chaque modification de ce même message
+                -- même un point ou une virgule -- vous aurez
+                à revenir sur la suite de test pour la modifier.
+            </p>
+            <p>
+                Voici un cas concret, nous avons un service d'actualités
+                qui a échoué dans sa tentative de connexion à sa source distante.
+<pre>
+<strong>class NewsService {
+    ...
+    function publish($writer) {
+        if (! $this-&gt;isConnected()) {
+            $writer-&gt;write('Cannot connect to news service "' .
+                    $this-&gt;_name . '" at this time. ' .
+                    'Please try again later.');
+        }
+        ...
+    }
+}</strong>
+</pre>
+                Là il envoie son contenu vers un classe <span class="new_code">Writer</span>.
+                Nous pourrions tester ce comportement avec un <span class="new_code">MockWriter</span>...
+<pre>
+class TestOfNewsService extends UnitTestCase {
+    ...
+    function testConnectionFailure() {<strong>
+        $writer = new MockWriter($this);
+        $writer-&gt;expectOnce('write', array(
+                'Cannot connect to news service ' .
+                '"BBC News" at this time. ' .
+                'Please try again later.'));
+        
+        $service = new NewsService('BBC News');
+        $service-&gt;publish($writer);
+        
+        $writer-&gt;tally();</strong>
+    }
+}
+</pre>
+                C'est un bon exemple d'un test fragile.
+                Si nous décidons d'ajouter des instructions complémentaires,
+                par exemple proposer une source d'actualités alternative,
+                nous casserons nos tests par la même occasion sans pourtant
+                avoir modifié une seule fonctionnalité.
+            </p>
+            <p>
+                Pour contourner ce problème, nous voudrions utiliser
+                un test avec une expression rationnelle plutôt
+                qu'une correspondance exacte. Nous pouvons y parvenir avec...
+<pre>
+class TestOfNewsService extends UnitTestCase {
+    ...
+    function testConnectionFailure() {
+        $writer = new MockWriter($this);<strong>
+        $writer-&gt;expectOnce(
+                'write',
+                array(new PatternExpectation('/cannot connect/i')));</strong>
+        
+        $service = new NewsService('BBC News');
+        $service-&gt;publish($writer);
+        
+        $writer-&gt;tally();
+    }
+}
+</pre>
+                Plutôt que de transmettre le paramètre attendu au <span class="new_code">MockWriter</span>,
+                nous envoyons une classe d'attente appelée <span class="new_code">PatternExpectation</span>.
+                L'objet fantaisie est suffisamment élégant pour reconnaître
+                qu'il s'agit d'un truc spécial et pour le traiter différemment.
+                Plutôt que de comparer l'argument entrant à cet objet,
+                il utilise l'objet attente lui-même pour exécuter le test.
+            </p>
+            <p>
+                <span class="new_code">PatternExpectation</span> utilise
+                l'expression rationnelle pour la comparaison avec son constructeur.
+                A chaque fois qu'une comparaison est fait à travers
+                <span class="new_code">MockWriter</span> par rapport à cette classe attente,
+                elle fera un <span class="new_code">preg_match()</span> avec ce motif.
+                Dans notre scénario de test ci-dessus, aussi longtemps
+                que la chaîne "cannot connect" apparaît dans le texte,
+                la fantaisie transmettra un succès au testeur unitaire.
+                Peu importe le reste du texte.
+            </p>
+            <p>
+                Les classes attente possibles sont...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">AnythingExpectation</span></td>
+<td>Sera toujours validé</td>
+</tr>
+                    <tr>
+<td><span class="new_code">EqualExpectation</span></td>
+<td>Une égalité, plutôt que la plus forte comparaison à l'identique</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotEqualExpectation</span></td>
+<td>Une comparaison sur la non-égalité</td>
+</tr>
+                    <tr>
+<td><span class="new_code">IndenticalExpectation</span></td>
+<td>La vérification par défaut de l'objet fantaisie qui doit correspondre exactement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotIndenticalExpectation</span></td>
+<td>Inverse la logique de l'objet fantaisie</td>
+</tr>
+                    <tr>
+<td><span class="new_code">PatternExpectation</span></td>
+<td>Utilise une expression rationnelle Perl pour comparer une chaîne</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NoPatternExpectation</span></td>
+<td>Passe seulement si l'expression rationnelle Perl échoue</td>
+</tr>
+                    <tr>
+<td><span class="new_code">IsAExpectation</span></td>
+<td>Vérifie le type ou le nom de la classe uniquement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotAExpectation</span></td>
+<td>L'opposé de <span class="new_code">IsAExpectation</span>
+</td>
+</tr>
+                    <tr>
+<td><span class="new_code">MethodExistsExpectation</span></td>
+<td>Vérifie si la méthode est disponible sur un objet</td>
+</tr>
+					<tr>
+<td><span class="new_code">TrueExpectation</span></td>
+<td>Accepte n'importe quelle variable PHP qui vaut vrai</td>
+</tr>
+                    <tr>
+<td><span class="new_code">FalseExpectation</span></td>
+<td>Accepte n'importe quelle variable PHP qui vaut faux</td>
+</tr>
+                </tbody></table>
+                La plupart utilisent la valeur attendue dans le constructeur.
+                Les exceptions sont les vérifications sur motif,
+                qui utilisent une expression rationnelle, ainsi que
+                <span class="new_code">IsAExpectation</span> et <span class="new_code">NotAExpectation</span>,
+                qui prennent un type ou un nom de classe comme chaîne.
+            </p>
+        
+        <h2>
+<a class="target" name="comportement"></a>Utiliser les attentes pour contrôler les bouchons serveur</h2>
+            <p>
+                Les classes attente peuvent servir à autre chose
+                que l'envoi d'assertions depuis les objets fantaisie,
+                afin de choisir le comportement d'un
+                <a href="mock_objects_documentation.html">objet fantaisie</a>
+                ou celui d'un <a href="server_stubs_documentation.html">bouchon serveur</a>.
+                A chaque fois qu'une liste d'arguments est donnée,
+                une liste d'objets d'attente peut être insérée à la place.
+            </p>
+            <p>
+                Mettons que nous voulons qu'un bouchon serveur
+                d'autorisation simule une connexion réussie seulement
+                si il reçoit un objet de session valide.
+                Nous pouvons y arriver avec ce qui suit...
+<pre>
+Stub::generate('Authorisation');
+<strong>
+$authorisation = new StubAuthorisation();
+$authorisation-&gt;returns(
+        'isAllowed',
+        true,
+        array(new IsAExpectation('Session', 'Must be a session')));
+$authorisation-&gt;returns('isAllowed', false);</strong>
+</pre>
+                Le comportement par défaut du bouchon serveur
+                est défini pour renvoyer <span class="new_code">false</span>
+                quand <span class="new_code">isAllowed</span> est appelé.
+                Lorsque nous appelons cette méthode avec un unique paramètre
+                qui est un objet <span class="new_code">Session</span>, il renverra <span class="new_code">true</span>.
+                Nous avons aussi ajouté un deuxième paramètre comme message.
+                Il sera affiché dans le message d'erreur de l'objet fantaisie
+                si l'attente est la cause de l'échec.
+            </p>
+            <p>
+                Ce niveau de sophistication est rarement utile :
+                il n'est inclut que pour être complet.
+            </p>
+        
+        <h2>
+<a class="target" name="etendre"></a>Créer vos propres attentes</h2>
+            <p>
+                Les classes d'attentes ont une structure très simple.
+                Tellement simple qu'il devient très simple de créer
+                vos propres version de logique pour des tests utilisés couramment.
+            </p>
+            <p>
+                Par exemple voici la création d'une classe pour tester
+                la validité d'adresses IP. Pour fonctionner correctement
+                avec les bouchons serveurs et les objets fantaisie,
+                cette nouvelle classe d'attente devrait étendre
+                <span class="new_code">SimpleExpectation</span> ou une autre de ses sous-classes...
+<pre>
+<strong>class ValidIp extends SimpleExpectation {
+    
+    function test($ip) {
+        return (ip2long($ip) != -1);
+    }
+    
+    function testMessage($ip) {
+        return "Address [$ip] should be a valid IP address";
+    }
+}</strong>
+</pre> 
+               Il n'y a véritablement que deux méthodes à mettre en place.
+               La méthode <span class="new_code">test()</span> devrait renvoyer un <span class="new_code">true</span>
+               si l'attente doit passer, et une erreur <span class="new_code">false</span>
+               dans le cas contraire. La méthode <span class="new_code">testMessage()</span>
+               ne devrait renvoyer que du texte utile à la compréhension du test en lui-même.
+            </p>
+            <p>
+                Cette classe peut désormais être employée à la place
+                des classes d'attente précédentes.
+            </p>
+			<p>
+				Voici un exemple plus typique, vérifier un hash...
+<pre>
+<strong>class JustField extends EqualExpectation {
+    private $key;
+    
+    function __construct($key, $expected) {
+        parent::__construct($expected);
+        $this-&gt;key = $key;
+    }
+    
+    function test($compare) {
+        if (! isset($compare[$this-&gt;key])) {
+            return false;
+        }
+        return parent::test($compare[$this-&gt;key]);
+    }
+    
+    function testMessage($compare) {
+        if (! isset($compare[$this-&gt;key])) {
+            return 'Key [' . $this-&gt;key . '] does not exist';
+        }
+        return 'Key [' . $this-&gt;key . '] -&gt; ' .
+                parent::testMessage($compare[$this-&gt;key]);
+    }
+}</strong>
+</pre>
+                L'habitude a été prise pour séparer les clauses du message avec
+                "&amp;nbsp;-&gt;&amp;nbsp;".
+				Cela permet aux outils dérivés de reformater la sortie.
+            </p>
+            <p>
+                Supposons qu'un authentificateur s'attend à recevoir
+				une ligne de base de données correspondant à l'utilisateur,
+				et que nous avons juste besoin de valider le nom d'utilisateur.
+				Nous pouvons le faire très simplement avec... 
+<pre>
+$mock-&gt;expectOnce('authenticate',
+                  array(new JustKey('username', 'marcus')));
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="unitaire"></a>Sous le capot du testeur unitaire</h2>
+            <p>
+                Le <a href="http://sourceforge.net/projects/simpletest/">framework
+                de test unitaire SimpleTest</a> utilise aussi dans son coeur
+                des classes d'attente pour
+                la <a href="unit_test_documentation.html">classe UnitTestCase</a>.
+                Nous pouvons aussi tirer parti de ces mécanismes pour réutiliser
+                nos propres classes attente à l'intérieur même des suites de test.
+            </p>
+            <p>
+                La méthode la plus directe est d'utiliser la méthode
+                <span class="new_code">SimpleTest::assert()</span> pour effectuer le test...
+<pre>
+<strong>class TestOfNetworking extends UnitTestCase {
+    ...
+    function testGetValidIp() {
+        $server = &amp;new Server();
+        $this-&gt;assert(
+                new ValidIp(),
+                $server-&gt;getIp(),
+                'Server IP address-&gt;%s');
+    }
+}</strong>
+</pre>
+                <span class="new_code">assert()</span> testera toute attente directement.
+            </p>
+			<p>
+				C'est plutôt sale par rapport à notre syntaxe habituelle
+                du type <span class="new_code">assert...()</span>.
+            </p>
+            <p>
+                Pour un cas aussi simple, nous créons d'ordinaire une méthode
+                d'assertion distincte en utilisant la classe d'attente.
+                Supposons un instant que notre attente soit un peu plus
+                compliquée et que par conséquent nous souhaitions la réutiliser,
+                nous obtenons...
+<pre>
+class TestOfNetworking extends UnitTestCase {
+    ...<strong>
+    function assertValidIp($ip, $message = '%s') {
+        $this-&gt;assertExpectation(new ValidIp(), $ip, $message);
+    }</strong>
+    
+    function testGetValidIp() {
+        $server = &amp;new Server();<strong>
+        $this-&gt;assertValidIp(
+                $server-&gt;getIp(),
+                'Server IP address-&gt;%s');</strong>
+    }
+}
+</pre>
+                It is rare to need the expectations for more than pattern
+                matching, but these facilities do allow testers to build
+                some sort of domain language for testing their application.
+                Also, complex expectation classes could make the tests
+                harder to read and debug.
+                In effect extending the test framework to create their own tool set.
+            
+			
+                Il est assez rare que le besoin d'une attente dépasse
+                le stade de la reconnaissance d'un motif, mais ils permettent
+				aux testeurs de construire leur propre langage dédié ou DSL
+				(Domain Specific Language) pour tester leurs applications.
+                Attention, les classes d'attente complexes peuvent rendre
+                les tests difficiles à lire et à déboguer.
+                Ces mécanismes sont véritablement là pour les auteurs
+                de système qui étendront le framework de test
+                pour leurs propres outils de test.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            Les attentes imitent les contraintes dans
+            <a href="http://www.jmock.org/">JMock</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API complète pour SimpleTest</a>
+            réalisé avec PHPDoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/form_testing_documentation.html b/3rdparty/simpletest/docs/fr/form_testing_documentation.html
new file mode 100644
index 00000000000..e3cb6a10a19
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/form_testing_documentation.html
@@ -0,0 +1,363 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : tester des formulaires HTML</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur les tests de formulaire</h1>
+        This page...
+        <ul>
+<li>
+            Modifier les valeurs d'un formulaire et
+            <a href="#submit">réussir à transmettre un simple formulaire</a>
+        </li>
+<li>
+            Gérer des <a href="#multiple">objets à valeurs multiples</a>
+            en initialisant des listes.
+        </li>
+<li>
+            Le cas des formulaires utilisant Javascript pour
+            modifier <a href="#hidden-field">un champ caché</a>
+        </li>
+<li>
+            <a href="#brut">Envoi brut</a> quand il n'existe pas de bouton à cliquer.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="submit"></a>Valider un formulaire simple</h2>
+            <p>
+                Lorsqu'une page est téléchargée par <span class="new_code">WebTestCase</span>
+                en utilisant <span class="new_code">get()</span> ou <span class="new_code">post()</span>
+                le contenu de la page est automatiquement analysé.
+                De cette analyse découle le fait que toutes les commandes
+                à l'intérieur de la balise &lt;form&gt; sont disponibles
+                depuis l'intérieur du scénario de test.
+                Prenons par exemple cet extrait de code HTML...
+<pre>
+&lt;form&gt;
+    &lt;input type="text" name="a" value="A default" /&gt;
+    &lt;input type="submit" value="Go" /&gt;
+&lt;/form&gt;
+</pre>
+                Il ressemble à...
+            </p>
+            <p>
+                <form class="demo">
+                    <input type="text" name="a" value="A default">
+                    <input type="submit" value="Go">
+                </form>
+            </p>
+            <p>
+                Nous pouvons naviguer vers ce code, via le site
+                <a href="http://www.lastcraft.com/form_testing_documentation.php">LastCraft</a>,
+                avec le test suivant...
+<pre>
+class SimpleFormTests extends WebTestCase {<strong>
+    function testDefaultValue() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('a', 'A default');
+    }</strong>
+}
+</pre>
+                Directement après le chargement de la page toutes les commandes HTML
+                sont initiées avec leur valeur par défaut, comme elles apparaîtraient
+                dans un navigateur web. L'assertion teste qu'un objet HTML
+                avec le nom "a" existe dans la page
+                et qu'il contient la valeur "A default".
+            </p>
+            <p>
+                Nous pourrions retourner le formulaire tout de suite...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testDefaultValue() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('a', <strong>new PatternExpectation('/default/')</strong>);
+    }
+}
+</pre>
+                Mais d'abord nous allons changer la valeur du champ texte.
+                Ce n'est qu'après que nous le transmettrons...
+<pre>
+class SimpleFormTests extends WebTestCase {
+
+    function testDefaultValue() {
+        $this-&gt;get('http://www.my-site.com/');
+        $this-&gt;assertField('a', 'A default');<strong>
+        $this-&gt;setField('a', 'New value');
+        $this-&gt;clickSubmit('Go');</strong>
+    }
+}
+</pre>
+                Parce que nous n'avons spécifié ni attribut "method"
+                sur la balise form, ni attribut "action",
+                le scénario de test suivra le comportement classique d'un navigateur :
+                transmission des données avec une requête <em>GET</em>
+                vers la même page. En règle générale SimpleTest essaie d'émuler
+                le comportement typique d'un navigateur autant que possible,
+                plutôt que d'essayer d'attraper des attributs manquants sur les balises.
+                La raison est simple : la cible d'un framework de test est
+                la logique d'une application PHP, pas les erreurs
+                -- de syntaxe ou autres -- du code HTML.
+                Pour les erreurs HTML, d'autres outils tel
+				<a href="http://www.w3.org/People/Raggett/tidy/">HTMLTidy</a>
+                devraient être employés, ou même n'importe lequel des validateurs HTML et CSS
+				déjà sur le marché.
+            </p>
+            <p>
+                Si un champ manque dans n'importe quel formulaire ou si
+                une option est indisponible alors <span class="new_code">WebTestCase::setField()</span>
+                renverra <span class="new_code">false</span>. Par exemple, supposons que
+                nous souhaitons vérifier qu'une option "Superuser"
+                n'est pas présente dans ce formulaire...
+<pre>
+<strong>Select type of user to add:</strong>
+&lt;select name="type"&gt;
+    &lt;option&gt;Subscriber&lt;/option&gt;
+    &lt;option&gt;Author&lt;/option&gt;
+    &lt;option&gt;Administrator&lt;/option&gt;
+&lt;/select&gt;
+</pre>
+                Qui ressemble à...
+            </p>
+            <p>
+                <form class="demo">
+                    <strong>Select type of user to add:</strong>
+                    <select name="type">
+                        <option>Subscriber</option>
+                        <option>Author</option>
+                        <option>Administrator</option>
+                    </select>
+                </form>
+            </p>
+            <p>
+                Le test suivant le confirmera...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...
+    function testNoSuperuserChoiceAvailable() {<strong>
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertFalse($this-&gt;setField('type', 'Superuser'));</strong>
+    }
+}
+</pre>
+                La sélection ne sera pas changée si la nouvelle valeur n'est pas une des options.
+            </p>
+            <p>
+                Voici la liste complète des objets supportés à aujourd'hui...
+                <ul>
+                    <li>Champs texte, y compris les champs masqués (hidden) ou cryptés (password).</li>
+                    <li>Boutons submit, en incluant aussi la balise button, mais pas encore les boutons reset</li>
+                    <li>Aires texte (textarea) avec leur gestion des retours à la ligne (wrap).</li> 
+                    <li>Cases à cocher, y compris les cases à cocher multiples dans un même formulaire.</li>
+                    <li>Listes à menu déroulant, y compris celles à sélections multiples.</li>
+                    <li>Boutons radio.</li>
+                    <li>Images.</li>
+                </ul>
+            </p>
+            <p>
+                Le navigateur proposé par SimpleTest émule les actions
+                qui peuvent être réalisées par un utilisateur sur
+                une page HTML standard. Javascript n'est pas supporté et
+                il y a peu de chance pour qu'il le soit prochainement.
+            </p>
+            <p>
+                Une attention particulière doit être porté aux techniques Javascript
+                qui changent la valeur d'un champ caché : elles ne peuvent pas être
+                réalisées avec les commandes classiques de SimpleTest.
+                Une méthode alternative est proposée plus loin.
+            </p>
+        
+        <h2>
+<a class="target" name="multiple"></a>Champs à valeurs multiples</h2>
+            <p>
+                SimpleTest peut gérer deux types de commandes à valeur multiple :
+                les menus déroulants à sélection multiple et les cases à cocher
+                avec le même nom à l'intérieur même d'un formulaire.
+                La nature de ceux-ci implique que leur initialisation
+                et leur test sont légèrement différents.
+                Voici un exemple avec des cases à cocher...
+<pre>
+&lt;form class="demo"&gt;
+    <strong>Create privileges allowed:</strong>
+    &lt;input type="checkbox" name="crud" value="c" checked&gt;&lt;br&gt;
+    <strong>Retrieve privileges allowed:</strong>
+    &lt;input type="checkbox" name="crud" value="r" checked&gt;&lt;br&gt;
+    <strong>Update privileges allowed:</strong>
+    &lt;input type="checkbox" name="crud" value="u" checked&gt;&lt;br&gt;
+    <strong>Destroy privileges allowed:</strong>
+    &lt;input type="checkbox" name="crud" value="d" checked&gt;&lt;br&gt;
+    &lt;input type="submit" value="Enable Privileges"&gt;
+&lt;/form&gt;
+</pre>
+                Qui se traduit par...
+            </p>
+            <p>
+                <form class="demo">
+                    <strong>Create privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="c" checked><br>
+                    <strong>Retrieve privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="r" checked><br>
+                    <strong>Update privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="u" checked><br>
+                    <strong>Destroy privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="d" checked><br>
+                    <input type="submit" value="Enable Privileges">
+                </form>
+            </p>
+            <p>
+                Si nous souhaitons désactiver tous les privilèges sauf
+                ceux de téléchargement (Retrieve) et transmettre cette information,
+                nous pouvons y arriver par...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...<strong>
+    function testDisableNastyPrivileges() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('crud', array('c', 'r', 'u', 'd'));
+        $this-&gt;setField('crud', array('r'));
+        $this-&gt;clickSubmit('Enable Privileges');
+    }</strong>
+}
+</pre>
+                Plutôt que d'initier le champ à une valeur unique,
+                nous lui donnons une liste de valeurs.
+                Nous faisons la même chose pour tester les valeurs attendues.
+                Nous pouvons écrire d'autres bouts de code de test
+                pour confirmer cet effet, peut-être en nous connectant
+                comme utilisateur et en essayant d'effectuer une mise à jour.
+            </p>
+        
+        <h2>
+<a class="target" name="hidden-field"></a>Formulaires utilisant Javascript pour changer un champ caché</h2>
+            <p>
+                Si vous souhaitez tester un formulaire dépendant de Javascript
+                pour la modification d'un champ caché, vous ne pouvez pas
+                simplement utiliser setField().
+                Le code suivant <em>ne fonctionnera pas</em> :
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testEmulateMyJavascriptForm() {
+        <strong>// This does *not* work</strong>
+        $this-&gt;setField('a_hidden_field', '123');
+        $this-&gt;clickSubmit('OK');
+    }
+}
+</pre>
+                A la place, vous aurez besoin d'ajouter le paramètre supplémentaire
+                du formulaire à la méthode clickSubmit() :
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testMyJavascriptForm() {
+        <strong>$this-&gt;clickSubmit('OK', array('a_hidden_field'=&gt;'123'));</strong>
+    }
+
+}
+</pre>
+            </p>
+            <p>
+                N'oubliez pas que de la sorte, vous êtes effectivement en train
+                de court-circuitez une partie de votre application (le code Javascript
+                dans le formulaire) et que peut-être serait-il plus prudent
+                d'utiliser un outil comme
+                <a href="http://selenium.openqa.org/">Selenium</a> pour mettre sur pied
+                un test complet.
+            </p>
+        
+        <h2>
+<a class="target" name="brut"></a>Envoi brut</h2>
+            <p>
+                Si vous souhaitez tester un gestionnaire de formulaire
+                mais que vous ne l'avez pas écrit ou que vous n'y avez
+                pas encore accès, vous pouvez créer un envoi de formulaire à la main.
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...<strong>    
+    function testAttemptedHack() {
+        $this-&gt;post(
+                'http://www.my-site.com/add_user.php',
+                array('type' =&gt; 'superuser'));
+        $this-&gt;assertNoUnwantedPattern('/user created/i');
+    }</strong>
+}
+</pre>
+                En ajoutant des données à la méthode <span class="new_code">WebTestCase::post()</span>,
+                nous émulons la transmission d'un formulaire.
+				D'ordinaire, vous ne ferez cela que pour parer au plus pressé,
+				ou alors si vous espérez un tiers (javascript ?) transmette le formulaire.
+				Il reste quand même exception : si vous souhaitez vous protégez
+				d'attaques de type "spoofing".  
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li> 
+           <a href="http://simpletest.org/api/">L'API du développeur pour SimpleTest</a>
+           donne tous les détails sur les classes et les assertions disponibles.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/group_test_documentation.html b/3rdparty/simpletest/docs/fr/group_test_documentation.html
new file mode 100644
index 00000000000..fb546af4603
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/group_test_documentation.html
@@ -0,0 +1,265 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : Grouper des tests</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur le groupement des tests</h1>
+        This page...
+        <ul>
+<li>
+            Plusieurs approches pour <a href="#group">grouper des tests</a> ensemble.
+        </li>
+<li>
+            Combiner des groupes des tests dans des
+            <a href="#plus-haut">groupes plus grands</a>.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="grouper"></a>Grouper des tests</h2>
+            <p>
+                Il existe beaucoup de moyens pour grouper des tests dans des suites de tests.
+                Le premier d'entre eux est tout simplement ajouter tous les scénarios de test
+				au fur et à mesure d'un unique fichier...
+<pre>
+<strong>&lt;?php
+require_once(dirname(__FILE__) . '/simpletest/autorun.php');
+require_once(dirname(__FILE__) . '/../classes/io.php');
+
+class FileTester extends UnitTestCase {
+    ...
+}
+
+class SocketTester extends UnitTestCase {
+    ...
+}
+?&gt;</strong>
+</pre>
+                Autant de scénarios que nécessaires peuvent être
+                mis dans cet unique fichier. Ils doivent contenir
+                tout le code nécessaire, entre autres la bibliothèque testée,
+                mais aucune des bibliothèques de SimpleTest.
+            </p>
+			<p>
+				Occasionnellement des sous-classes spéciales sont créés pour
+				ajouter des méthodes nécessaires à certains tests spécifiques
+				au sein de l'application.
+                Ces nouvelles classes de base sont ensuite utilisées
+				à la place de <span class="new_code">UnitTestCase</span>
+                ou de <span class="new_code">WebTestCase</span>.
+                Bien sûr vous ne souhaitez pas les lancer en tant que
+				scénario de tests : il suffit alors de les identifier
+				comme "abstraites"...
+<pre>
+<strong>abstract</strong> class MyFileTestCase extends UnitTestCase {
+    ...
+}
+
+class FileTester extends MyFileTestCase { ... }
+
+class SocketTester extends UnitTestCase { ... }
+</pre>
+                La classe <span class="new_code">FileTester</span> ne contient aucun test véritable,
+                il s'agit d'une classe de base pour d'autres scénarios de test.
+			</p>
+			<p>
+                Nous appelons ce fichier <em>file_test.php</em>.
+				Pour l'instant les scénarios de tests sont simplement groupés dans le même fichier.
+                Nous pouvons mettre en place des structures plus importantes
+				en incluant d'autres fichiers de tests.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('file_test.php');
+?&gt;
+</pre>
+				Ceci fontionnera, tout en créant une hiérarchie tout à fait plate.
+                A la place, nous créons un fichier de suite de tests.
+                Notre suite des tests de premier niveau devient...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class AllFileTests extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        <strong>$this-&gt;addFile('file_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+				Voici ce qui arrive : la class <span class="new_code">TestSuite</span>
+                effecturera le <span class="new_code">require_once()</span> pour nous.
+				Ensuite elle vérifie si de nouvelles classes de test
+				ont été créées par ce nouveau fichier et les inclut
+				automatiquement dans la suite de tests.
+				Cette méthode nous donne un maximum de contrôle
+				tout comme le ferait des ajouts manuels de fichiers de tests
+				au fur et à mesure où notre suite grandit.
+            </p>
+            <p>
+                Si c'est trop de boulot pour vos petits doigts et qu'en plus
+				vous avez envie de grouper vos suites de tests par répertoire
+				ou par un tag dans le nom des fichiers, alors il y a un moyen
+				encore plus automatique... 
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class AllFileTests extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;collect(dirname(__FILE__) . '/unit',
+                       new SimplePatternCollector('/_test.php/'));
+    }
+}
+?&gt;
+</pre>
+				Cette fonctionnalités va scanner un répertoire appelé "unit",
+				y détecter tous les fichiers finissant par "_test.php"
+				et les charger.
+                Vous n'avez pas besoin d'utiliser <span class="new_code">SimplePatternCollector</span> pour
+				filtrer en fonction d'un motif dans le nom de fichier,
+				mais c'est son usage le plus courant. 
+            </p>
+			<p>
+                Ce morceau de code est très courant.
+				Désormais la seule chose qu'il vous reste à faire, c'est de
+				déposer un fichier avec des scénarios de tests dans ce répertoire
+				et il sera lancé directement par le script de la suite de tests. 
+            </p>
+			<p>
+                Juste un bémol : vous ne pouvez pas contrôler l'ordre de lancement
+				des tests.
+				Si vous souhaitez voir des composants de bas niveau renvoyer leurs erreurs
+				dès le début de la suite de tests - en particulier pour se facilier le travail
+				de diagnostic - alors vous devriez plutôt passer par <span class="new_code">addFile()</span>
+				pour ces cas spécifiques.
+                Les scénarios de tests ne sont chargés qu'une fois, pas d'inquiétude donc
+				lors du scan de votre répertoire avec tous les tests.
+            </p>
+			<p>
+                Les tests chargés avec la méthode <span class="new_code">addFile</span> ont certaines propriétés
+				qui peuvent s'avérer intéressantes.
+				Elle vous assure que le constructeur est lancé avant la première méthode
+				de test et que le destructeur est lancé après la dernière méthode de test.
+				Cela vous permet de placer une initialisation (setUp et tearDown) globale
+				au sein de ce destructeur et desctructeur, comme dans n'importe
+				quelle classe. 
+            </p>
+        
+        <h2>
+<a class="target" name="plus-haut"></a>Groupements de plus haut niveau</h2>
+			<p>
+                La technique ci-dessus place tous les scénarios de test
+                dans un unique et grand groupe.
+                Sauf que pour des projets plus conséquents,
+                ce n'est probablement pas assez souple;
+                vous voudriez peut-être grouper les tests tout à fait différemment.
+            </p>
+<p>
+                Tout ce que nous avons décrit avec des scripts de tests 
+				s'applique pareillement avec des <span class="new_code">TestSuite</span>s...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+<strong>
+class BigTestSuite extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('file_tests.php');
+    }
+}</strong>
+?&gt;
+</pre>
+				Cette opération additionne nos scénarios de tests et une unique suite
+				sous la première.
+                Quand un test échoue, nous voyons le fil d'ariane avec l'enchainement.
+                Nous pouvons même mélanger groupes et tests librement en prenant
+				quand même soin d'éviter les inclusions en boucle.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class BigTestSuite extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('file_tests.php');
+        <strong>$this-&gt;addFile('some_other_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                Petite précision, en cas de double inclusion, seule la première instance
+				sera lancée. 
+            </p>
+		
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/index.html b/3rdparty/simpletest/docs/fr/index.html
new file mode 100644
index 00000000000..f7e022c36ec
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/index.html
@@ -0,0 +1,576 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+        Prise en main rapide de SimpleTest pour PHP -
+        Tests unitaire et objets fantaisie pour PHP
+    </title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Prise en main rapide de SimpleTest</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#unit">Utiliser le testeur rapidement</a>
+            avec un exemple.
+        </li>
+<li>
+            <a href="#group">Groupes de tests</a>
+            pour tester en un seul clic.
+        </li>
+<li>
+            <a href="#mock">Utiliser les objets fantaisie</a>
+            pour faciliter les tests et gagner en contrôle.
+        </li>
+<li>
+            <a href="#web">Tester des pages web</a>
+            au niveau de l'HTML.
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                Le présent article présuppose que vous soyez familier avec
+                le concept de tests unitaires ainsi que celui de développement
+                web avec le langage PHP. Il s'agit d'un guide pour le nouvel
+                et impatient utilisateur de
+                <a href="https://sourceforge.net/project/showfiles.php?group_id=76550">SimpleTest</a>.
+                Pour une documentation plus complète, particulièrement si
+                vous découvrez les tests unitaires, consultez la
+                <a href="http://www.lastcraft.com/unit_test_documentation.php">documentation
+                en cours</a>, et pour des exemples de scénarios de test,
+                consultez le
+                <a href="http://www.lastcraft.com/first_test_tutorial.php">tutorial
+                sur les tests unitaires</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="unit"></a>Utiliser le testeur rapidement</h2>
+            <p>
+                Parmi les outils de test pour logiciel, le testeur unitaire
+                est le plus proche du développeur. Dans un contexte de
+                développement agile, le code de test se place juste à côté
+                du code source étant donné que tous les deux sont écrits
+                simultanément. Dans ce contexte, SimpleTest aspire à être
+                une solution complète de test pour un développeur PHP et
+                s'appelle "Simple" parce qu'elle devrait être simple à
+                utiliser et à étendre. Ce nom n'était pas vraiment un bon
+                choix. Non seulement cette solution inclut toutes les
+                fonctions classiques qu'on est en droit d'attendre de la
+                part des portages de <a href="http://www.junit.org/">JUnit</a> et des <a href="http://sourceforge.net/projects/phpunit/">PHPUnit</a>,
+                mais elle inclut aussi les <a href="http://www.mockobjects.com/">objets fantaisie ou
+                "mock objects"</a>.
+            </p>
+            <p>
+                Ce qui rend cet outil immédiatement utile pour un développeur PHP,
+                c'est son navigateur web interne.
+                Il permet des tests qui parcourent des sites web, remplissent
+                des formulaires et testent le contenu des pages.
+                Etre capable d'écrire ces tests en PHP veut dire qu'il devient
+                facile d'écrire des tests de recette (ou d'intégration).
+                Un exemple serait de confirmer qu'un utilisateur a bien été ajouté
+                dans une base de données après s'être enregistré sur une site web.
+            </p>
+            <p>
+                La démonstration la plus rapide : l'exemple
+            </p>
+            <p>
+                Supposons que nous sommes en train de tester une simple
+                classe de log dans un fichier : elle s'appelle
+                <span class="new_code">Log</span> dans <em>classes/Log.php</em>. Commençons
+                par créer un script de test, appelé
+                <em>tests/log_test.php</em>. Son contenu est le suivant...
+<pre>
+&lt;?php
+<strong>require_once('simpletest/autorun.php');</strong>
+require_once('../classes/log.php');
+
+class TestOfLogging extends <strong>UnitTestCase</strong> {
+}
+?&gt;
+</pre>
+                Ici le répertoire <em>simpletest</em> est soit dans le
+                dossier courant, soit dans les dossiers pour fichiers
+                inclus. Vous auriez à éditer ces arborescences suivant
+                l'endroit où vous avez installé SimpleTest.
+                Le fichier "autorun.php" fait plus que juste inclure
+                les éléments de SimpleTest : il lance aussi les tests pour nous.  
+            </p>
+            <p>
+                <span class="new_code">TestOfLogging</span> est notre premier scénario de test
+                et il est pour l'instant vide.
+                Chaque scénario de test est une classe qui étend une des classes
+                de base de SimpleTest. Nous pouvons avoir autant de classes de ce type
+                que nous voulons.
+            </p>
+            <p>
+                Avec ces trois lignes d'échafaudage
+                l'inclusion de notre classe <span class="new_code">Log</span>, nous avons une suite
+                de tests. Mais pas encore de test !
+            </p>
+            <p>
+                Pour notre premier test, supposons que la classe <span class="new_code">Log</span>
+                prenne le nom du fichier à écrire au sein du constructeur,
+                et que nous avons un répertoire temporaire dans lequel placer
+                ce fichier.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+
+class TestOfLogging extends UnitTestCase {
+    function <strong>testLogCreatesNewFileOnFirstMessage()</strong> {
+        @unlink('/temp/test.log');
+        $log = new Log('/temp/test.log');
+        <strong>$this-&gt;assertFalse(file_exists('/temp/test.log'));</strong>
+        $log-&gt;message('Should write this to a file');
+        <strong>$this-&gt;assertTrue(file_exists('/temp/test.log'));</strong>
+    }
+}
+?&gt;
+</pre>
+                Au lancement du scénario de test, toutes les méthodes qui
+                commencent avec la chaîne <span class="new_code">test</span> sont
+                identifiées puis exécutées.
+                Si la méthode commence par <span class="new_code">test</span>, c'est un test.
+                Remarquez bien le nom très long de notre exemple :
+                <span class="new_code">testLogCreatesNewFileOnFirstMessage()</span>.
+                C'est bel et bien délibéré : ce style est considéré désirable
+                et il rend la sortie du test plus lisible.
+            </p>
+            <p>
+                D'ordinaire nous avons bien plusieurs méthodes de tests.
+                Mais ce sera pour plus tard.
+            </p>
+            <p>
+                Les assertions dans les
+                méthodes de test envoient des messages vers le framework de
+                test qui affiche immédiatement le résultat. Cette réponse
+                immédiate est importante, non seulement lors d'un crash
+                causé par le code, mais aussi de manière à rapprocher
+                l'affichage de l'erreur au plus près du scénario de test
+                concerné via un appel à <span class="new_code">print</span>code&gt;.
+            </p>
+            <p>
+                Pour voir ces résultats lançons effectivement les tests.
+                Aucun autre code n'est nécessaire, il suffit d'ouvrir
+                la page dans un navigateur.
+            </p>
+            <p>
+                En cas échec, l'affichage ressemble à...
+                <div class="demo">
+                    <h1>TestOfLogging</h1>
+                    <span class="fail">Fail</span>: testcreatingnewfile-&gt;True assertion failed.<br>
+                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
+                    <strong>1</strong> passes and <strong>1</strong> fails.</div>
+                </div>
+                ...et si ça passe, on obtient...
+                <div class="demo">
+                    <h1>TestOfLogging</h1>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>2</strong> passes and <strong>0</strong> fails.</div>
+                </div>
+                Et si vous obtenez ça...
+                <div class="demo">
+                    <b>Fatal error</b>:  Failed opening required '../classes/log.php' (include_path='') in <b>/home/marcus/projects/lastcraft/tutorial_tests/Log/tests/log_test.php</b> on line <b>7</b>
+                </div>
+                c'est qu'il vous manque le fichier <em>classes/Log.php</em>
+                qui pourrait ressembler à : 
+<pre>
+&lt;?php<strong>
+class Log {
+    function Log($file_path) {
+    }
+
+    function message() {
+    }
+}</strong>
+?&gt;
+</pre>
+                C'est largement plus sympathique d'écrire le code après le test.
+                Plus que sympatique même - cette technique s'appelle
+                "Développement Piloté par les Tests" ou 
+                "Test Driven Development" en anglais.
+            </p>
+            <p>
+                Pour plus de renseignements sur le testeur, voyez la
+                <a href="unit_test_documentation.html">documentation pour les tests de régression</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="group"></a>Construire des groupes de tests</h2>
+            <p>
+                Il est peu probable que dans une véritable application on
+                ait uniquement besoin de passer un seul scénario de test.
+                Cela veut dire que nous avons besoin de grouper les
+                scénarios dans un script de test qui peut, si nécessaire,
+                lancer tous les tests de l'application.
+            </p>
+            <p>
+                Notre première étape est de créer un nouveau fichier appelé
+                <em>tests/all_tests.php</em> et d'y inclure le code suivant...
+<pre>
+&lt;?php
+<strong>require_once('simpletest/autorun.php');</strong>
+
+class AllTests extends <strong>TestSuite</strong> {
+    function AllTests() {
+        $this-&gt;TestSuite(<strong>'All tests'</strong>);
+        <strong>$this-&gt;addFile('log_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                L'inclusion de "autorun" permettra à notre future suite
+                de tests d'être lancée juste en invoquant ce script.
+            </p>
+            <p>
+                La sous-classe <span class="new_code">TestSuite</span> doit chaîner
+                son constructeur. Cette limitation sera supprimée dans
+                les versions à venir.   
+            </p>
+            <p>
+                The method <span class="new_code">TestSuite::addFile()</span>
+                will include the test case file and read any new classes
+                that are descended from <span class="new_code">SimpleTestCase</span>.
+
+                Cette méthode <span class="new_code">TestSuite::addTestFile()</span> va
+                inclure le fichier de scénarios de test et lire parmi
+                toutes les nouvelles classes créées celles qui sont issues
+                de <span class="new_code">SimpleTestCase</span>.
+                <span class="new_code">UnitTestCase</span> est juste un exemple de classe dérivée
+                depuis <span class="new_code">SimpleTestCase</span> et vous pouvez créer les vôtres.
+                <span class="new_code">TestSuite::addFile()</span> peut aussi inclure d'autres suites.
+            </p>
+            <p>
+                La classe ne sera pas encore instanciée.
+                Quand la suite de tests est lancée, elle construira chaque instance
+                une fois le test atteint, et le détuira juste ensuite.
+                Cela veut dire que le constructeur n'est lancé qu'une fois avant
+                chaque initialisation de ce scénario de test et que le destructeur
+                est lui aussi lancé avant que le test suivant ne commence.
+            </p>
+            <p>
+                Il est commun de grouper des scénarios de test dans des super-classes
+                qui ne sont pas sensées être lancées, mais qui deviennent une classe de base
+                pour d'autres tests.
+                Pour que "autorun" fonctionne proprement les fichiers
+                des scénarios de test ne devraient pas lancer aveuglement
+                d'autres extensions de scénarios de test qui ne lanceraient pas
+                effectivement des tests.
+                Cela pourrait aboutir à un mauvais comptages des scénarios de test
+                pendant la procédure.
+                Pas vraiement un problème majeure, mais pour éviter cet inconvénient
+                il suffit de marquer vos classes de base comme <span class="new_code">abstract</span>.
+                SimpleTest ne lance pas les classes abstraites. Et si vous utilisez encore
+                PHP4 alors une directive <span class="new_code">SimpleTestOptions::ignore()</span>
+                dans votre fichier de scénario de test aura le même effet.
+            </p>
+            <p>
+                Par ailleurs, le fichier avec le scénario de test ne devrait pas
+                avoir été inclus ailleurs. Sinon aucun scénario de test
+                ne sera inclus à ce groupe.
+                Ceci pourrait se transformer en un problème plus grave :
+                si des fichiers ont déjà été inclus par PHP alors la méthode
+                <span class="new_code">TestSuite::addFile()</span> ne les détectera pas.
+            </p>
+            <p>
+                Pour afficher les résultats, il est seulement nécessaire
+                d'invoquer <em>tests/all_tests.php</em> à partir du serveur
+                web.
+            </p>
+            <p>
+                Pour plus de renseignements des groupes de tests, voyez le
+                <a href="group_test_documentation.html">documentation sur le groupement des tests</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="mock"></a>Utiliser les objets fantaisie</h2>
+            <p>
+                Avançons un peu plus dans le futur.
+            </p>
+            <p>
+                Supposons que notre class logging soit testée et terminée.
+                Supposons aussi que nous testons une autre classe qui ait
+                besoin d'écrire des messages de log, disons
+                <span class="new_code">SessionPool</span>. Nous voulons tester une méthode
+                qui ressemblera probablement à quelque chose comme...
+<pre><strong>
+class SessionPool {
+    ...
+    function logIn($username) {
+        ...
+        $this-&gt;_log-&gt;message('User $username logged in.');
+        ...
+    }
+    ...
+}
+</strong>
+</pre>
+                Avec le concept de "réutilisation de code" comme fil
+                conducteur, nous utilisons notre class <span class="new_code">Log</span>. Un
+                scénario de test classique ressemblera peut-être à...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+<strong>require_once('../classes/session_pool.php');</strong>
+
+class <strong>TestOfSessionLogging</strong> extends UnitTestCase {
+    
+    function setUp() {
+        <strong>@unlink('/temp/test.log');</strong>
+    }
+    
+    function tearDown() {
+        <strong>@unlink('/temp/test.log');</strong>
+    }
+    
+    function testLoggingInIsLogged() {
+        <strong>$log = new Log('/temp/test.log');
+        $session_pool = &amp;new SessionPool($log);
+        $session_pool-&gt;logIn('fred');</strong>
+        $messages = file('/temp/test.log');
+        $this-&gt;assertEqual($messages[0], "User fred logged in.<strong>\n</strong>");
+    }
+}
+?&gt;
+</pre>
+                Nous expliquerons les méthodes <span class="new_code">setUp()</span>
+                et <span class="new_code">tearDown()</span> plus tard.
+            </p>
+            <p>
+                Le design de ce scénario de test n'est pas complètement
+                mauvais, mais on peut l'améliorer. Nous passons du temps à
+                tripoter les fichiers de log qui ne font pas partie de
+                notre test.
+                Pire, nous avons créé des liens de proximité
+                entre la classe <span class="new_code">Log</span> et ce test. Que se
+                passerait-il si nous n'utilisions plus de fichiers, mais la
+                bibliothèque <em>syslog</em> à la place ?
+                
+                Cela veut dire que notre test <span class="new_code">TestOfSessionLogging</span>
+                enverra un échec alors même qu'il ne teste pas Logging.
+            </p>
+            <p>
+                Il est aussi fragile sur des petites retouches. Avez-vous
+                remarqué le retour chariot supplémentaire à la fin du
+                message ? A-t-il été ajouté par le loggueur ? Et si il
+                ajoutait aussi un timestamp ou d'autres données ?
+            </p>
+            <p>
+                L'unique partie à tester réellement est l'envoi d'un
+                message précis au loggueur.
+                Nous pouvons réduire le couplage en
+                créant une fausse classe de logging : elle ne fait
+                qu'enregistrer le message pour le test, mais ne produit
+                aucun résultat. Sauf qu'elle doit ressembler exactement à
+                l'original.
+            </p>
+            <p>
+                Si l'objet fantaisie n'écrit pas dans un fichier alors nous
+                nous épargnons la suppression du fichier avant et après le
+                test. Nous pourrions même nous épargner quelques lignes de
+                code supplémentaires si l'objet fantaisie pouvait exécuter
+                l'assertion.
+            <p>
+            </p>
+                Trop beau pour être vrai ? Pas vraiement on peut créer un tel
+                objet très facilement...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+require_once('../classes/session_pool.php');
+
+<strong>Mock::generate('Log');</strong>
+
+class TestOfSessionLogging extends UnitTestCase {
+    
+    function testLoggingInIsLogged() {<strong>
+        $log = &amp;new MockLog();
+        $log-&gt;expectOnce('message', array('User fred logged in.'));</strong>
+        $session_pool = &amp;new SessionPool(<strong>$log</strong>);
+        $session_pool-&gt;logIn('fred');
+    }
+}
+?&gt;
+</pre>
+                L'appel <span class="new_code">Mock::generate()</span> a généré
+                une nouvelle classe appelé <span class="new_code">MockLog</span>.
+                Cela ressemble à un clone identique, sauf que nous pouvons
+                y adjoindre du code de test.
+                C'est ce que fait <span class="new_code">expectOnce()</span>.
+                Cela dit que si <span class="new_code">message()</span> m'est appelé,
+                il a intérêt à l'être avec le paramètre
+                "User fred logged in.".
+            </p>
+            <p>
+                L'appel <span class="new_code">tally()</span> est nécessaire pour annoncer à
+                l'objet fantaisie qu'il n'y aura plus d'appels ultérieurs.
+                Sans ça l'objet fantaisie pourrait attendre pendant une
+                éternité l'appel de la méthode sans jamais prévenir le
+                scénario de test. Les autres tests sont déclenchés
+                automatiquement quand l'appel à <span class="new_code">message()</span> est
+                invoqué sur l'objet <span class="new_code">MockLog</span> par le code 
+                <span class="new_code">SessionPool::logIn()</span>.
+                L'appel <span class="new_code">mock</span> va déclencher une comparaison des
+                paramètres et ensuite envoyer le message "pass" ou "fail"
+                au test pour l'affichage. Des jokers peuvent être inclus
+                pour ne pas avoir à tester tous les paramètres d'un appel
+                alors que vous ne souhaitez qu'en tester un.
+            </p>
+            <p>
+                Les objets fantaisie dans la suite SimpleTest peuvent avoir
+                un ensemble de valeurs de sortie arbitraires, des séquences
+                de sorties, des valeurs de sortie sélectionnées à partir
+                des arguments d'entrée, des séquences de paramètres
+                attendus et des limites sur le nombre de fois qu'une
+                méthode peut être invoquée.
+            </p>
+            <p>
+                Pour que ce test fonctionne la librairie avec les objets
+                fantaisie doit être incluse dans la suite de tests, par
+                exemple dans <em>all_tests.php</em>.
+            </p>
+            <p>
+                Pour plus de renseignements sur les objets fantaisie, voyez le
+                <a href="mock_objects_documentation.html">documentation sur les objets fantaisie</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="web"></a>Tester une page web</h2>
+            <p>
+                Une des exigences des sites web, c'est qu'ils produisent
+                des pages web. Si vous construisez un projet de A à Z et
+                que vous voulez intégrer des tests au fur et à mesure alors
+                vous voulez un outil qui puisse effectuer une navigation
+                automatique et en examiner le résultat. C'est le boulot
+                d'un testeur web.
+            </p>
+            <p>
+                Effectuer un test web via SimpleTest reste assez primitif :
+                il n'y a pas de javascript par exemple.
+                La plupart des autres opérations d'un navigateur sont simulées.
+            </p>
+            <p>
+                Pour vous donner une idée, voici un exemple assez trivial :
+                aller chercher une page web,
+                à partir de là naviguer vers la page "about"
+                et finalement tester un contenu déterminé par le client.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+<strong>require_once('simpletest/web_tester.php');</strong>
+
+class TestOfAbout extends <strong>WebTestCase</strong> {
+    function testOurAboutPageGivesFreeReignToOurEgo() {
+        <strong>$this-&gt;get('http://test-server/index.php');
+        $this-&gt;click('About');
+        $this-&gt;assertTitle('About why we are so great');
+        $this-&gt;assertText('We are really great');</strong>
+    }
+}
+?&gt;
+</pre>
+                Avec ce code comme test de recette, vous pouvez vous
+                assurer que le contenu corresponde toujours aux
+                spécifications à la fois des développeurs et des autres
+                parties prenantes au projet.
+            </p>
+            <p>
+                Vous pouvez aussi naviguer à travers des formulaires...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('simpletest/web_tester.php');
+
+class TestOfRankings extends WebTestCase {
+    function testWeAreTopOfGoogle() {
+        $this-&gt;get('http://google.com/');
+        $this-&gt;setField('q', 'simpletest');
+        $this-&gt;click("I'm Feeling Lucky");
+        $this-&gt;assertTitle('SimpleTest - Unit Testing for PHP');
+    }
+}
+?&gt;
+</pre>
+                ...même si cela pourrait constituer une violation
+                des documents juridiques de Google(tm).
+            </p>
+            <p>
+                Pour plus de renseignements sur comment tester une page web, voyez la
+                <a href="web_tester_documentation.html">documentation sur tester des scripts web</a>.
+            </p>
+            <p>
+                <a href="http://sourceforge.net/projects/simpletest/"><img src="http://sourceforge.net/sflogo.php?group_id=76550&amp;type=5" width="210" height="62" border="0" alt="SourceForge.net Logo"></a>
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            <a href="https://sourceforge.net/project/showfiles.php?group_id=76550&amp;release_id=153280">Télécharger PHP SimpleTest</a>
+            depuis <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            L'<a href="http://simpletest.org/api/">API de SimpleTest pour développeur</a>
+            donne tous les détails sur les classes et assertions existantes.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/mock_objects_documentation.html b/3rdparty/simpletest/docs/fr/mock_objects_documentation.html
new file mode 100644
index 00000000000..97e2c86ee73
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/mock_objects_documentation.html
@@ -0,0 +1,933 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : les objets fantaise</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur les objets fantaisie</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#what">Que sont les objets fantaisie ?</a>
+        </li>
+<li>
+            <a href="#creation">Créer des objets fantaisie</a>.
+        </li>
+<li>
+            <a href="#expectations">Les objets fantaisie en tant que critiques</a> avec les attentes.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="what"></a>Que sont les objets fantaisie ?</h2>
+            <p>
+                Les objets fantaisie - ou "mock objects" en anglais -
+                ont deux rôles pendant un scénario de test : acteur et critique.
+            </p>
+            <p>
+                Le comportement d'acteur est celui de simuler
+                des objets difficiles à initialiser ou trop consommateurs
+                en temps pendant un test.
+                Le cas classique est celui de la connexion à une base de données.
+                Mettre sur pied une base de données de test au lancement
+                de chaque test ralentirait considérablement les tests
+                et en plus exigerait l'installation d'un moteur
+                de base de données ainsi que des données sur la machine de test.
+                Si nous pouvons simuler la connexion
+                et renvoyer des données à notre guise
+                alors non seulement nous gagnons en pragmatisme
+                sur les tests mais en sus nous pouvons nourrir
+                notre base avec des données falsifiées
+                et voir comment il répond. Nous pouvons
+                simuler une base de données en suspens ou
+                d'autres cas extrêmes sans avoir à créer
+                une véritable panne de base de données.
+                En d'autres termes nous pouvons gagner
+                en contrôle sur l'environnement de test.
+            </p>
+            <p>
+                Si les objets fantaisie ne se comportaient que comme
+                des acteurs alors on les connaîtrait sous le nom de
+                <a href="server_stubs_documentation.html">bouchons serveur</a>.
+                Il s'agissait originairement d'un patron de conception
+                identifié par Robert Binder (<a href="">Testing
+                object-oriented systems</a>: models, patterns, and tools,
+                Addison-Wesley) en 1999.
+            </p>
+            <p>
+                Un bouchon serveur est une simulation d'un objet ou d'un composant.
+                Il doit remplacer exactement un composant dans un système
+                en vue d'effectuer des tests ou un prototypage,
+                tout en restant ultra-léger.
+                Il permet aux tests de s'exécuter plus rapidement, ou 
+                si la classe simulée n'a pas encore été écrite,
+                de se lancer tout court.
+            </p>
+            <p>
+                Cependant non seulement les objets fantaisie jouent
+                un rôle (en fournissant à la demande les valeurs requises)
+                mais en plus ils sont aussi sensibles aux messages qui
+                leur sont envoyés (par le biais d'attentes).
+                En posant les paramètres attendus d'une méthode
+                ils agissent comme des gardiens :
+                un appel sur eux doit être réalisé correctement.
+                Si les attentes ne sont pas atteintes ils nous épargnent
+                l'effort de l'écriture d'une assertion de test avec
+                échec en réalisant cette tâche à notre place.
+            </p>
+            <p>
+                Dans le cas d'une connexion à une base de données
+                imaginaire ils peuvent tester si la requête, disons SQL,
+                a bien été formé par l'objet qui utilise cette connexion.
+                Mettez-les sur pied avec des attentes assez précises
+                et vous verrez que vous n'aurez presque plus d'assertion à écrire manuellement.
+            </p>
+        
+        <h2>
+<a class="target" name="creation"></a>Créer des objets fantaisie</h2>
+            <p>
+                Tout ce dont nous avons besoin est une classe existante ou une interface,
+                par exemple une connexion à la base de données qui ressemblerait à...
+<pre>
+<strong>class DatabaseConnection {
+    function DatabaseConnection() { }
+    function query($sql) { }
+    function selectQuery($sql) { }
+}</strong>
+</pre>
+                Pour en créer sa version fantaisie nous devons juste
+				lancer le générateur...
+<pre>
+require_once('simpletest/autorun.php');
+require_once('database_connection.php');
+
+<strong>Mock::generate('DatabaseConnection');</strong>
+</pre>
+                Ce code génère une classe clone appelée <span class="new_code">MockDatabaseConnection</span>.
+                Cette nouvelle classe lui ressemble en tout point,
+                sauf qu'elle ne fait rien du tout.
+            </p>
+            <p>
+            	Cette nouvelle classe est génératlement
+            	une sous-classe de <span class="new_code">DatabaseConnection</span>.
+            	Malheureusement, il n'y as aucun moyen de créer une version fantaisie
+            	d'une classe avec une méthode <span class="new_code">final</span> sans avoir
+            	une version fonctionnelle de cette méthode.
+            	Ce n'est pas pas très satisfaisant.
+            	Si la cible est une interface ou si les méthodes <span class="new_code">final</span>
+            	existent dans la classe cible, alors une toute nouvelle classe
+            	est créée, elle implémente juste les même interfaces.
+            	Si vous essayer de faire passer cette classe à travers un indice de type
+            	qui spécifie le véritable nom de l'ancienne classe, alors il échouera.
+            	Du code qui forcerait un indice de type tout en utilisant
+            	des méthodes <span class="new_code">final</span> ne pourrait probablement pas être
+            	testé efficacement avec des objets fantaisie.
+            </p>
+            <p>
+                Si vous voulez voir le code généré, il suffit de faire un <span class="new_code">print</span>
+                de la sortie de <span class="new_code">Mock::generate()</span>.
+                VOici le code généré pour la classe <span class="new_code">DatabaseConnection</span>
+                à la place de son interface...
+<pre>
+class MockDatabaseConnection extends DatabaseConnection {
+    public $mock;
+    protected $mocked_methods = array('databaseconnection', 'query', 'selectquery');
+
+    function MockDatabaseConnection() {
+        $this-&gt;mock = new SimpleMock();
+        $this-&gt;mock-&gt;disableExpectationNameChecks();
+    }
+    ...
+    function DatabaseConnection() {
+        $args = func_get_args();
+        $result = &amp;$this-&gt;mock-&gt;invoke("DatabaseConnection", $args);
+        return $result;
+    }
+    function query($sql) {
+        $args = func_get_args();
+        $result = &amp;$this-&gt;mock-&gt;invoke("query", $args);
+        return $result;
+    }
+    function selectQuery($sql) {
+        $args = func_get_args();
+        $result = &amp;$this-&gt;mock-&gt;invoke("selectQuery", $args);
+        return $result;
+    }
+}
+</pre>
+                Votre sortie dépendra quelque peu de votre version précise de SimpleTest.
+            </p>
+            <p>
+                En plus des méthodes d'origine de la classe, vous en verrez d'autres
+                pour faciliter les tests.
+                Nous y reviendrons.
+            </p>
+            <p>
+                Nous pouvons désormais créer des instances de
+                cette nouvelle classe à l'intérieur même de notre scénario de test...
+<pre>
+require_once('simpletest/autorun.php');
+require_once('database_connection.php');
+
+Mock::generate('DatabaseConnection');
+
+class MyTestCase extends UnitTestCase {
+
+    function testSomething() {
+        <strong>$connection = new MockDatabaseConnection();</strong>
+    }
+}
+</pre>
+                La version fantaisie contient toutles méthodes de l'originale.
+                En outre, tous les indices de type seront préservés.
+                Dison que nos méthodes de requête attend un objet <span class="new_code">Query</span>...
+<pre>
+<strong>class DatabaseConnection {
+    function DatabaseConnection() { }
+    function query(Query $query) { }
+    function selectQuery(Query $query) { }
+}</strong>
+</pre>
+                Si nous lui passons le mauvais type d'objet
+                ou même pire un non-objet...
+<pre>
+class MyTestCase extends UnitTestCase {
+
+    function testSomething() {
+        $connection = new MockDatabaseConnection();
+        $connection-&gt;query('insert into accounts () values ()');
+    }
+}
+</pre>
+                ...alors le code renverra une violation de typage,
+                exactement comme on aurait pû s'y attendre
+                avec la classe d'origine.
+            </p>
+            <p>
+                Si la version fantaisie implémente bien toutes les méthodes
+                de l'originale, elle renvoit aussi systématiquement <span class="new_code">null</span>.
+                Et comme toutes les méthodes qui renvoient toujours <span class="new_code">null</span>
+                ne sont pas très utiles, nous avons besoin de leur faire dire
+                autre chose...
+            </p>
+        
+        <h2>
+<a class="target" name="bouchon"></a>Objets fantaisie en action</h2>
+            <p>
+                Changer le <span class="new_code">null</span> renvoyé par la méthode fantaisie
+                en autre chose est assez facile...
+<pre>
+<strong>$connection-&gt;returns('query', 37)</strong>
+</pre>
+                Désormais à chaque appel de <span class="new_code">$connection-&gt;query()</span>
+                nous obtenons un résultat de 37.
+                Il n'y a rien de particulier à cette valeur de 37.
+                Cette valeur de retour peut être aussi compliqué que nécessaire.
+            </p>
+            <p>
+                Ici les paramètres ne sont pas significatifs,
+                nous aurons systématiquement la même valeur en retour
+                une fois initialisés de la sorte.
+                Cela pourrait ne pas ressembler à une copie convaincante
+                de notre connexion à la base de données, mais pour
+                la demi-douzaine de lignes de code de notre méthode de test
+                c'est généralement largement assez.
+            </p>
+            <p>
+                Sauf que les choses ne sont pas toujours si simples.
+                Les itérateurs sont un problème récurrent, si par exemple
+                renvoyer systématiquement la même valeur entraine
+                une boucle infinie dans l'objet testé.
+                Pour ces cas-là, nous avons besoin d'une séquence de valeurs.
+				Supposons que nous avons un itérateur simple qui ressemble à...
+<pre>
+class Iterator {
+    function Iterator() { }
+    function next() { }
+}
+</pre>
+                Il s'agit là de l'itérateur le plus basique que nous puissions imaginer.
+                Supponsons que cet itérateur ne renvoit que du texte
+                jusqu'à ce qu'il atteigne la fin et qu'il renvoie alors un false,
+                nous pouvons le simuler avec...
+<pre>
+Mock::generate('Iterator');
+
+class IteratorTest extends UnitTestCase() {
+
+    function testASequence() {<strong>
+        $iterator = new MockIterator();
+        $iterator-&gt;returns('next', false);
+        $iterator-&gt;returnsAt(0, 'next', 'First string');
+        $iterator-&gt;returnsAt(1, 'next', 'Second string');</strong>
+        ...
+    }
+}
+</pre>
+                Quand <span class="new_code">next()</span> est appelé par le <span class="new_code">MockIterator</span>
+                il commencera par renvoyer "First string",
+                au deuxième passage "Second string" sera renvoyé
+                et sur n'importe quel autre appel <span class="new_code">false</span> sera renvoyé
+                à son tour.
+                Les valeurs renvoyées les unes après les autres auront la priorité
+                sur la valeur constante.
+                Cette dernière est la valeur par défaut en quelque sorte.
+            </p>
+            <p>
+                Une autre situation délicate serait une opération
+                <span class="new_code">get()</span> surchargée.
+                Un exemple serait un conteneur d'information avec des pairs clef/valeur.
+                Nous partons cette fois d'une classe de configuration telle...
+<pre>
+class Configuration {
+    function Configuration() { ... }
+    function get($key) { ... }
+}
+</pre>
+                C'est une situation courante pour utiliser des objets fantaisie,
+                étant donné que la véritable configuration sera différente
+                d'une machine à l'autre et parfois même d'un test à l'autre.
+                Cependant un problème apparaît quand toutes les données passent
+                par la méthode <span class="new_code">get()</span> et que nous souhaitons
+                quand même des résultats différents pour des clefs différentes.
+                Par chance les objets fantaisie ont un système de filtre...
+<pre>
+<strong>$config = &amp;new MockConfiguration();
+$config-&gt;returns('get', 'primary', array('db_host'));
+$config-&gt;returns('get', 'admin', array('db_user'));
+$config-&gt;returns('get', 'secret', array('db_password'));</strong>
+</pre>
+                Le dernier paramètre est une liste d'arguements
+                pour vérifier une correspondance.
+                Dans ce cas, nous essayons de faire correspondre un argument
+                qui se trouve être la clef de recherche.
+                Désormais quand l'objet fantaisie voit
+                sa méthode <span class="new_code">get()</span> invoquée...
+<pre>
+$config-&gt;get('db_user')
+</pre>
+                ...il renverra "admin".
+                Il trouve cette valeur en essayant de faire correspondre
+                l'argument reçu à ceux de ses propres listes : dès qu'une
+                correspondance complète est trouvé, il s'arrête.
+            </p>
+            <p>
+                Vous pouvez préciser un argument par défaut via...
+<pre><strong>
+$config-&gt;returns('get', false, array('*'));</strong>
+</pre>
+                Ce n'est pas la même chose que de définir la valeur renvoyée
+                sans aucun arguement...
+<pre><strong>
+$config-&gt;returns('get', false);</strong>
+</pre>
+                Dans le premier cas, il acceptera n'importe quel argument,
+                mais il en faut au moins un.
+                Dans le deuxième cas, n'importe quel nombre d'arguments
+                fera l'affaire and il agit comme un attrape-tout après
+                toutes les autres vérifications.
+                Notez que si - dans le premier cas - nous ajoutons
+                d'autres options avec paramètre unique après le joker,
+                alors elle seront ignorés puisque le joker fera
+                la première correspondance.
+                Avec des listes complexes de paramètres, l'ordre devient
+                important au risque de voir la correspondance souhaitée
+                masqué par un joker apparu plus tôt.
+                Déclarez les plus spécifiques d'abord si vous n'êtes pas sûr.
+            </p>
+            <p>
+                Il y a des moments où vous souhaitez qu'une référence
+                bien spécifique soit servie par l'objet fantaisie plutôt
+                qu'une copie.
+                C'est plutôt rare pour dire le moins, mais vous pourriez 
+                être en train de simuler un conteneur qui détiendrait
+                des primitives, tels des chaînes de caractères.
+                Par exemple.
+<pre>
+class Pad {
+    function Pad() { }
+    function &amp;note($index) { }
+}
+</pre>
+                Dans ce cas, vous pouvez définir une référence dans la liste
+                des valeurs retournées par l'objet fantaisie...
+<pre>
+function testTaskReads() {
+    $note = 'Buy books';
+    $pad = new MockPad();
+    $vector-&gt;<strong>returnsByReference(</strong>'note', $note, array(3)<strong>)</strong>;
+    $task = new Task($pad);
+    ...
+}
+</pre>
+                Avec cet assemblage vous savez qu'à chaque fois
+                que <span class="new_code">$pad-&gt;note(3)</span> est appelé
+                il renverra toujours la même <span class="new_code">$note</span>,
+                même si celle-ci est modifiée.
+            </p>
+            <p>
+                Ces trois facteurs, timing, paramètres et références,
+                peuvent être combinés orthogonalement.
+                Par exemple...
+<pre>
+$buy_books = 'Buy books';
+$write_code = 'Write code';
+$pad = new MockPad();
+$vector-&gt;<strong>returnsByReferenceAt(0, 'note', $buy_books, array('*', 3));</strong>
+$vector-&gt;<strong>returnsByReferenceAt(1, 'note', $write_code, array('*', 3));</strong>
+</pre>
+                Cela renverra une référence à <span class="new_code">$buy_books</span> et
+                ensuite à <span class="new_code">$write_code</span>, mais seuleent si deux paramètres
+                sont utilisés, le deuxième devant être l'entier 3.
+                Cela devrait couvrir la plupart des situations.
+            </p>
+            <p>
+                Un dernier cas délicat reste : celui d'un objet créant
+                un autre objet, plus connu sous le patron de conception "fabrique"
+                (ou "factory").
+                Supponsons qu'à la réussite d'une requête à
+                notre base de données imaginaire, un jeu d'enregistrements
+                est renvoyé sous la forme d'un itérateur, où chaque appel
+                au <span class="new_code">next()</span> sur notre itérateur donne une ligne
+                avant de s'arrêtre avec un false.
+                Cela semble à un cauchemar à simuler, alors qu'en fait un objet
+                fantaisie peut être créé avec les mécansimes ci-dessus...
+<pre>
+Mock::generate('DatabaseConnection');
+Mock::generate('ResultIterator');
+
+class DatabaseTest extends UnitTestCase {
+
+    function testUserFinderReadsResultsFromDatabase() {<strong>
+        $result = new MockResultIterator();
+        $result-&gt;returns('next', false);
+        $result-&gt;returnsAt(0, 'next', array(1, 'tom'));
+        $result-&gt;returnsAt(1, 'next', array(3, 'dick'));
+        $result-&gt;returnsAt(2, 'next', array(6, 'harry'));
+
+        $connection = new MockDatabaseConnection();
+        $connection-&gt;returns('selectQuery', $result);</strong>
+
+        $finder = new UserFinder(<strong>$connection</strong>);
+        $this-&gt;assertIdentical(
+                $finder-&gt;findNames(),
+                array('tom', 'dick', 'harry'));
+    }
+}
+</pre>
+                Désormais ce n'est que si notre <span class="new_code">$connection</span>
+                est appelée par la méthode <span class="new_code">query()</span>
+                que sera retourné le <span class="new_code">$result</span>,
+                lui-même s'arrêtant au troisième appel
+                à <span class="new_code">next()</span>.
+                Ce devrait être suffisant comme information
+                pour que notre classe <span class="new_code">UserFinder</span>,
+                la classe effectivement testée ici,
+                fasse son boulot.
+                Un test très précis et toujours pas
+                de base de données en vue.
+            </p>
+            <p>
+                Nous pourrsion affiner ce test encore plus
+                en insistant pour que la bonne requête
+                soit envoyée...
+<pre>
+$connection-&gt;returns('selectQuery', $result, array(<strong>'select name, id from people'</strong>));
+</pre>
+                Là, c'est une mauvaise idée.
+            </p>
+            <p>
+                Niveau objet, nous avons un <span class="new_code">UserFinder</span>
+                qui parle à une base de données à travers une interface géante -
+                l'ensemble du SQL.
+                Imaginez si nous avions écrit un grand nombre de tests
+                qui dépendrait désormais de cette requête SQL précise.
+                Ces requêtes pourraient changer en masse pour tout un tas
+                de raisons non liés à ce test spécifique.
+                Par exemple, la règle pour les quotes pourrait changer,
+                un nom de table pourrait évoluer, une table de liaison pourrait
+                être ajouté, etc.
+                Cela entrainerait une ré-écriture de tous les tests à chaque fois
+                qu'un remaniement est fait, alors même que le comportement lui
+                n'a pas bougé.
+                Les tests sont censés aider au remaniement, pas le bloquer.
+                Pour ma part, je préfère avoir une suite de tests qui passent
+                quand je fais évoluer le nom des tables.
+            </p>
+            <p>
+                Et si vous voulez une règle, c'est toujours mieux de ne pas
+                créer un objet fantaisie sur une grosse interface.
+            </p>
+            <p>
+            	Par contrast, voici le test complet...
+<pre>
+class DatabaseTest extends UnitTestCase {<strong>
+    function setUp() { ... }
+    function tearDown() { ... }</strong>
+
+    function testUserFinderReadsResultsFromDatabase() {
+        $finder = new UserFinder(<strong>new DatabaseConnection()</strong>);
+        $finder-&gt;add('tom');
+        $finder-&gt;add('dick');
+        $finder-&gt;add('harry');
+        $this-&gt;assertIdentical(
+                $finder-&gt;findNames(),
+                array('tom', 'dick', 'harry'));
+    }
+}
+</pre>
+                Ce test est immunisé contre le changement de schéma.
+                Il échouera uniquement si vous changez la fonctionnalité,
+                ce qui correspond bien à ce qu'un test doit faire.
+            </p>
+            <p>
+            	Il faut juste faire attention à ces méthodes <span class="new_code">setUp()</span>
+            	et <span class="new_code">tearDown()</span> que nous avons survolé pour l'instant.
+            	Elles doivent vider les tables de la base de données
+            	et s'assurer que le schéma est bien défini.
+            	Cela peut se engendrer un peu de travail supplémentaire,
+            	mais d'ordinaire ce type de code existe déjà - à commencer pour
+            	le déploiement.
+            </p>
+            <p>
+                Il y a au moins un endroit où vous aurez besoin d'objets fantaisie :
+                c'est la simulation des erreurs.
+                Exemple, la base de données tombe pendant que <span class="new_code">UserFinder</span>
+                fait son travail. Le <span class="new_code">UserFinder</span> se comporte-t-il bien ?
+<pre>
+class DatabaseTest extends UnitTestCase {
+
+    function testUserFinder() {
+        $connection = new MockDatabaseConnection();<strong>
+        $connection-&gt;throwOn('selectQuery', new TimedOut('Ouch!'));</strong>
+        $alert = new MockAlerts();<strong>
+        $alert-&gt;expectOnce('notify', 'Database is busy - please retry');</strong>
+        $finder = new UserFinder($connection, $alert);
+        $this-&gt;assertIdentical($finder-&gt;findNames(), array());
+    }
+}
+</pre>
+                Nous avons transmis au <span class="new_code">UserFinder</span>
+                un objet <span class="new_code">$alert</span>.
+                Il va transmettre un certain nombre de belles notifications
+                à l'interface utilisatuer en cas d'erreur.
+                Nous préfèrerions éviter de saupoudrer notre code avec
+                des commandes <span class="new_code">print</span> codées en dur si nous pouvons
+                l'éviter.
+                Emballer les moyens de sortie veut dire que nous pouvons utiliser
+                ce code partout. Et cela rend notre code plus facile.
+            </p>
+            <p>
+                Pour faire passer ce test, le finder doit écrire un message sympathique
+                et compréhensible à l'<span class="new_code">$alert</span>, plutôt que de propager
+                l'exception. Jusque là, tout va bien.
+            </p>
+            <p>
+                Comment faire en sorte que la <span class="new_code">DatabaseConnection</span> fantaisie
+                soulève une exception ?
+                Nous la générons avec la méthode <span class="new_code">throwOn</span> sur l'objet fantaisie.
+            </p>
+            <p>
+                Enfin, que se passe-t-il si la méthode voulue pour la simulation
+                n'existe pas encore ?
+                Si vous définissez une valeur de retour sur une méthode absente,
+                alors SimpleTest vous répondra avec une erreur.
+                Et si vous utilisez <span class="new_code">__call()</span> pour simuler
+                des méthodes dynamiques ?
+            </p>
+            <p>
+                Les objets avec des interfaces dynamiques, avec <span class="new_code">__call</span>,
+                peuvent être problématiques dans l'implémentation courante
+                des objets fantaisie.
+                Vous pouvez en créer un autour de la méthode <span class="new_code">__call()</span>
+                mais c'est très laid.
+                Et pourquoi un test devrait connaître quelque chose avec un niveau
+                si bas dans l'implémentation. Il n'a besoin que de simuler l'appel.
+            </p>
+            <p>
+                Il y a bien moyen de contournement : ajouter des méthodes complémentaires
+                à l'objet fantaisie à la génération.
+<pre>
+<strong>Mock::generate('DatabaseConnection', 'MockDatabaseConnection', array('setOptions'));</strong>
+</pre>
+                Dans une longue suite de tests cela pourrait entraîner des problèmes,
+                puisque vous avez probablement déjà une version fantaisie
+                de la classe appellée <span class="new_code">MockDatabaseConnection</span>
+                sans les méthodes complémentaires.
+                Le générateur de code ne générera pas la version fantaisie de la classe
+                s'il en existe déjà une version avec le même nom.
+                Il vous deviendra impossible de déterminer où est passée votre méthode
+                si une autre définition a été lancé au préalable.
+            </p>
+            <p>
+                Pour pallier à ce problème, SimpleTest vous permet de choisir
+                n'importe autre nom pour la nouvelle classe au moment même où
+                vous ajouter les méthodes complémentaires.
+<pre>
+Mock::generate('DatabaseConnection', <strong>'MockDatabaseConnectionWithOptions'</strong>, array('setOptions'));
+</pre>
+                Ici l'objet fantaisie se comportera comme si
+                <span class="new_code">setOptions()</span> existait bel et bien
+                dans la classe originale.
+            </p>
+            <p>
+                Les objets fantaisie ne peuvent être utilisés qu'à l'intérieur
+                des scénarios de test, étant donné qu'à l'apparition d'une attente
+                ils envoient des messages directement au scénario de test courant.
+                Les créer en dehors d'un scénario de test entraînera une erreur
+                de run time quand une attente est déclenchée et qu'il n'y a pas
+                de scénario de test en cours pour recevoir le message.
+                Nous pouvons désormais couvrir ces attentes.
+            </p>
+        
+        <h2>
+<a class="target" name="expectations"></a>Objets fantaisie en tant que critiques</h2>
+            <p>
+                Même si les bouchons serveur isolent vos tests des perturbations
+				du monde réel, ils n'apportent que le moitié des bénéfices possibles.
+				Vous pouvez obtenir une classe de test qui reçoive les bons messages,
+				mais cette nouvelle classe envoie-t-elle les bons ?
+				Le tester peut devenir très bordélique sans
+				une librairie d'objets fantaise.
+            </p>
+			<p>
+                Voici un exemple, prenons une classe <span class="new_code">PageController</span>
+				toute simple qui traitera un formulaire de paiement
+				par carte bleue...
+<pre>
+class PaymentForm extends PageController {
+    function __construct($alert, $payment_gateway) { ... }
+    function makePayment($request) { ... }
+}
+</pre>
+                Cette classe a besoin d'un <span class="new_code">PaymentGateway</span>
+				pour parler concrètement à la banque.
+				Il utilise aussi un objet <span class="new_code">Alert</span>
+				pour gérer les erreurs.
+				Cette dernière classe parle à la page ou au template.
+				Elle est responsable de l'affichage du message d'erreur
+				et de la mise en valeur de tout champ du formulaire
+				qui serait incorrecte.
+            </p>
+            <p>
+                Elle pourrait ressembler à...
+<pre>
+class Alert {
+    function warn($warning, $id) {
+        print '&lt;div class="warning"&gt;' . $warning . '&lt;/div&gt;';
+        print '&lt;style type="text/css"&gt;#' . $id . ' { background-color: red }&lt;/style&gt;';
+    }
+}
+</pre>
+            </p>
+            <p>
+                Portons notre attention à la méthode <span class="new_code">makePayment()</span>.
+				Si nous n'inscrivons pas un numéro "CVV2" (celui à trois
+				chiffre au dos de la carte bleue), nous souhaitons afficher
+				une erreur plutôt que d'essayer de traiter le paiement. 
+				En mode test...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('payment_form.php');
+Mock::generate('Alert');
+Mock::generate('PaymentGateway');
+
+class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
+
+    function testMissingCvv2CausesAlert() {
+        $alert = new MockAlert();
+        <strong>$alert-&gt;expectOnce(
+                    'warn',
+                    array('Missing three digit security code', 'cvv2'));</strong>
+        $controller = new PaymentForm(<strong>$alert</strong>, new MockPaymentGateway());
+        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+    }
+
+    function requestWithMissingCvv2() { ... }
+}
+?&gt;
+</pre>
+                Première question : où sont passés les assertions ?
+            </p>
+            <p>
+                L'appel à <span class="new_code">expectOnce('warn', array(...))</span> annonce
+				à l'objet fantaisie qu'il faut s'attendre à un appel à <span class="new_code">warn()</span>
+				avant la fin du test.
+				Quand il débouche sur l'appel à <span class="new_code">warn()</span>, il vérifie
+				les arguments. Si ceux-ci ne correspondent pas, alors un échec
+				est généré. Il échouera aussi si la méthode n'est jamais appelée.
+            </p>
+            <p>
+                Non seulement le test ci-dessus s'assure que <span class="new_code">warn</span>
+				a bien été appelé, mais en plus qu'il a bien reçu la chaîne
+				de caractère "Missing three digit security code"
+				et même le tag "cvv2".
+				L'équivalent de <span class="new_code">assertIdentical()</span> est appliqué
+				aux deux champs quand les paramètres sont comparés.
+            </p>
+            <p>
+                Si le contenu du message vous importe peu, surtout dans le cas
+				d'une interface utilisateur qui change régulièrement,
+				nous pouvons passer ce paramètre avec l'opérateur "*"...
+<pre>
+class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
+
+    function testMissingCvv2CausesAlert() {
+        $alert = new MockAlert();
+        $alert-&gt;expectOnce('warn', array(<strong>'*'</strong>, 'cvv2'));
+        $controller = new PaymentForm($alert, new MockPaymentGateway());
+        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+    }
+
+    function requestWithMissingCvv2() { ... }
+}
+</pre>
+                Nous pouvons même rendre le test encore moins spécifique
+				en supprimant complètement la liste des paramètres...
+<pre>
+function testMissingCvv2CausesAlert() {
+    $alert = new MockAlert();
+    <strong>$alert-&gt;expectOnce('warn');</strong>
+    $controller = new PaymentForm($alert, new MockPaymentGateway());
+    $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+}
+</pre>
+                Ceci vérifiera uniquement si la méthode a été appelé,
+				ce qui est peut-être un peu drastique dans ce cas.
+				Plus tard, nous verrons comment alléger les attentes
+				plus précisement.
+            </p>
+            <p>
+                Des tests sans assertions peuvent être à la fois compacts
+				et très expressifs. Parce que nous interceptons l'appel
+				sur le chemin de l'objet, ici de classe <span class="new_code">Alert</span>,
+				nous évitons de tester l'état par la suite.
+				Cela évite les assertions dans les tests, mais aussi
+				l'obligation d'ajouter des accesseurs uniquement
+				pour les tests dans le code original.
+				Si vous en arrivez à ajouter des accesseurs de ce type,
+				on parle alors de "state based testing" dans le jargon
+				("test piloté par l'état"),
+				il est probablement plus que temps d'utiliser
+				des objets fantaisie dans vos tests.
+				On peut alors parler de "behaviour based testing"
+				(ou "test piloté par le comportement") :
+				c'est largement mieux !
+            </p>
+            <p>
+                Ajoutons un autre test.
+				Assurons nous que nous essayons même pas un paiement sans CVV2...
+<pre>
+class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
+
+    function testMissingCvv2CausesAlert() { ... }
+
+    function testNoPaymentAttemptedWithMissingCvv2() {
+        $payment_gateway = new MockPaymentGateway();
+        <strong>$payment_gateway-&gt;expectNever('pay');</strong>
+        $controller = new PaymentForm(new MockAlert(), $payment_gateway);
+        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+    }
+
+    ...
+}
+</pre>
+                Vérifier une négation peut être très difficile
+				dans les tests, mais <span class="new_code">expectNever()</span>
+				rend l'opération très facile heureusement.
+            </p>
+            <p>
+                <span class="new_code">expectOnce()</span> et <span class="new_code">expectNever()</span> sont
+				suffisants pour la plupart des tests, mais
+				occasionnellement vous voulez tester plusieurs évènements.
+				D'ordinaire pour des raisons d'usabilité, nous souhaitons
+				que tous les champs manquants du formulaire soient
+				mis en relief, et pas uniquement le premier.
+				Cela veut dire que nous devrions voir de multiples appels
+				à <span class="new_code">Alert::warn()</span>, pas juste un...
+<pre>
+function testAllRequiredFieldsHighlightedOnEmptyRequest() {
+    $alert = new MockAlert();<strong>
+    $alert-&gt;expectAt(0, 'warn', array('*', 'cc_number'));
+    $alert-&gt;expectAt(1, 'warn', array('*', 'expiry'));
+    $alert-&gt;expectAt(2, 'warn', array('*', 'cvv2'));
+    $alert-&gt;expectAt(3, 'warn', array('*', 'card_holder'));
+    $alert-&gt;expectAt(4, 'warn', array('*', 'address'));
+    $alert-&gt;expectAt(5, 'warn', array('*', 'postcode'));
+    $alert-&gt;expectAt(6, 'warn', array('*', 'country'));
+    $alert-&gt;expectCallCount('warn', 7);</strong>
+    $controller = new PaymentForm($alert, new MockPaymentGateway());
+    $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+}
+</pre>
+                Le compteur dans <span class="new_code">expectAt()</span> précise
+				le nombre de fois que la méthode a déjà été appelée.
+				Ici nous vérifions que chaque champ sera bien mis en relief.
+            </p>
+            <p>
+                Notez que nous sommes forcé de tester l'ordre en même temps.
+				SimpleTest n'a pas encore de moyen pour éviter cela,
+				mais dans une version future ce sera corrigé.
+            </p>
+            <p>
+                Voici la liste complètes des attentes
+				que vous pouvez préciser sur une objet fantaisie
+				dans <a href="http://simpletest.org/">SimpleTest</a>.
+				Comme pour les assertions, ces méthodes prennent en option
+				un message d'erreur.
+                <table>
+                    <thead><tr>
+<th>Attente</th>
+<th>Description</th>
+</tr></thead>
+                    <tbody>
+                        <tr>
+                            <td><span class="new_code">expect($method, $args)</span></td>
+                            <td>Les arguements doivent correspondre si appelés</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectAt($timing, $method, $args)</span></td>
+                            <td>Les arguements doiven correspondre si appelés lors du passage numéro <span class="new_code">$timing</span>
+</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectCallCount($method, $count)</span></td>
+                            <td>La méthode doit être appelée exactement <span class="new_code">$count</span> fois</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectMaximumCallCount($method, $count)</span></td>
+                            <td>La méthode ne doit pas être appelée plus de <span class="new_code">$count</span> fois</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectMinimumCallCount($method, $count)</span></td>
+                            <td>La méthode ne doit pas être appelée moins de <span class="new_code">$count</span> fois</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectNever($method)</span></td>
+                            <td>La méthode ne doit jamais être appelée</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectOnce($method, $args)</span></td>
+                            <td>La méthode ne doit être appelée qu'une seule fois et avec les arguments (en option)</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectAtLeastOnce($method, $args)</span></td>
+                            <td>La méthode doit être appelée au moins une seule fois et toujours avec au moins un des arguments attendus</td>
+                        </tr>
+                    </tbody>
+                </table>
+                Où les paramètres sont...
+                <dl>
+                    <dt class="new_code">$method</dt>
+                    <dd>
+                    	Le nom de la méthode, sous la forme d'une chaîne de caractères,
+						à laquelle il faut appliquer la condition.
+					</dd>
+                    <dt class="new_code">$args</dt>
+                    <dd>
+                        Les argumetns sous la forme d'une liste.
+						Les jokers peuvent être inclus de la même manière
+						que pour <span class="new_code">setReturn()</span>.
+						Cet argument est optionnel pour <span class="new_code">expectOnce()</span>
+                        et <span class="new_code">expectAtLeastOnce()</span>.
+                    </dd>
+                    <dt class="new_code">$timing</dt>
+                    <dd>
+                        La seule marque dans le temps pour tester la condition.
+						Le premier appel commence à zéro et le comptage se fait
+						séparement sur chaque méthode.
+                    </dd>
+                    <dt class="new_code">$count</dt>
+                    <dd>Le nombre d'appels attendu.</dd>
+                </dl>
+            </p>
+            <p>
+                Si vous n'avez qu'un seul appel dans votre test, assurez vous
+				d'utiliser <span class="new_code">expectOnce</span>.<br>
+                Utiliser <span class="new_code">$mocked-&gt;expectAt(0, 'method', 'args);</span>
+				tout seul ne permettra qu'à la méthode de ne jamais être appelée.
+				Vérifier les arguements et le comptage total sont pour le moment
+				indépendants.
+				Ajouter une attente <span class="new_code">expectCallCount()</span> quand
+				vous utilisez <span class="new_code">expectAt()</span> (dans le cas sans appel)
+				est permis.
+            </p>
+            <p>
+                Comme les assertions à l'intérieur des scénarios de test,
+				toutes ces attentes peuvent incorporer une surchage
+				sur le message sous la forme d'un paramètre supplémentaire.
+				Par ailleurs le message original peut être inclus dans la sortie
+				avec "%s".
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            Le papier original sur les Objets fantaisie ou
+            <a href="http://www.mockobjects.com/">Mock objects</a>.
+        </li>
+<li>
+            La page du projet SimpleTest sur <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page d'accueil de SimpleTest sur <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/overview.html b/3rdparty/simpletest/docs/fr/overview.html
new file mode 100644
index 00000000000..968bbc48e50
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/overview.html
@@ -0,0 +1,321 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+        Aperçu et liste des fonctionnalités des testeurs unitaires PHP et web de SimpleTest PHP
+    </title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Apercu de SimpleTest</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#resume">Résumé rapide</a> de l'outil SimpleTest pour PHP.
+        </li>
+<li>
+            <a href="#fonctionnalites">La liste des fonctionnalites</a>, à la fois présentes et à venir.
+        </li>
+<li>
+            Il y a beaucoup de <a href="#ressources">ressources sur les tests unitaires</a> sur le web.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="resume"></a>Qu'est-ce que SimpleTest ?</h2>
+            <p>
+                Le coeur de SimpleTest est un framework de test construit autour de classes de scénarios de test. Celles-ci sont écrites comme des extensions des classes premières de scénarios de test, chacune élargie avec des méthodes qui contiennent le code de test effectif. Les scripts de test de haut niveau invoque la méthode <span class="new_code">run()</span> à chaque scénario de test successivement. Chaque méthode de test est écrite pour appeler des assertions diverses que le développeur suppose être vraies, <span class="new_code">assertEqual()</span> par exemple. Si l'assertion est correcte, alors un succès est expédié au rapporteur observant le test, mais toute erreur déclenche une alerte et une description de la dissension.
+            </p>
+            <p>
+                Un <a href="unit_test_documentation.html">scénario de test</a> ressemble à...
+<pre>
+class <strong>MyTestCase</strong> extends UnitTestCase {
+    <strong>
+    function testLog() {
+        $log = &amp;new Log('my.log');
+        $log-&gt;message('Hello');
+        $this-&gt;assertTrue(file_exists('my.log'));
+    }</strong>
+}
+</pre>
+            </p>
+            <p>
+                Ces outils sont conçus pour le développeur. Les tests sont écrits en PHP directement, plus ou moins simultanément avec la construction de l'application elle-même. L'avantage d'utiliser PHP lui-même comme langage de test est qu'il n'y a pas de nouveau langage à apprendre, les tests peuvent commencer directement et le développeur peut tester n'importe quelle partie du code. Plus simplement, toutes les parties qui peuvent être accédées par le code de l'application peuvent aussi être accédées par le code de test si ils sont tous les deux dans le même langage.
+            </p>
+            <p>
+                Le type de scénario de test le plus simple est le <span class="new_code">UnitTestCase</span>. Cette classe de scénario de test inclut les tests standards pour l'égalité, les références et l'appariement de motifs (via les expressions rationnelles). Ceux-ci testent ce que vous seriez en droit d'attendre du résultat d'une fonction ou d'une méthode. Il s'agit du type de test le plus commun pendant le quotidien du développeur, peut-être 95% des scénarios de test.
+            </p>
+            <p>
+                La tâche ultime d'une application web n'est cependant pas de produire une sortie correcte à partir de méthodes ou d'objets, mais plutôt de produire des pages web. La classe <span class="new_code">WebTestCase</span> teste des pages web. Elle simule un navigateur web demandant une page, de façon exhaustive : cookies, proxies, connexions sécurisées, authentification, formulaires, cadres et la plupart des éléments de navigation. Avec ce type de scénario de test, le développeur peut garantir que telle ou telle information est présente dans la page et que les formulaires ainsi que les sessions sont gérés comme il faut.
+            </p>
+            <p>
+                Un <a href="web_tester_documentation.html">scénario de test web</a> ressemble à...
+<pre>
+class <strong>MySiteTest</strong> extends WebTestCase {
+    <strong>
+    function testHomePage() {
+        $this-&gt;get('http://www.my-site.com/index.php');
+        $this-&gt;assertTitle('My Home Page');
+        $this-&gt;clickLink('Contact');
+        $this-&gt;assertTitle('Contact me');
+        $this-&gt;assertWantedPattern('/Email me at/');
+    }</strong>
+}
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="fonctionnalites"></a>Liste des fonctionnalites</h2>
+            <p>
+                Ci-dessous vous trouverez un canevas assez brut des fonctionnalités à aujourd'hui et pour demain, sans oublier leur date approximative de publication. J'ai bien peur qu'il soit modifiable sans pré-avis étant donné que les jalons dépendent beaucoup sur le temps disponible. Les trucs en vert ont été codés, mais pas forcément déjà rendus public. Si vous avez une besoin pressant pour une fonctionnalité verte mais pas encore publique alors vous devriez retirer le code directement sur le  CVS chez SourceFourge. Une fonctionnalitée publiée est indiqué par "Fini".
+                <table>
+<thead>
+                    <tr>
+<th>Fonctionnalité</th>
+<th>Description</th>
+<th>Publication</th>
+</tr>
+                    </thead>
+<tbody>
+<tr>
+                        <td>Scénariot de test unitaire</td>
+                        <td>Les classes de test et assertions de base</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Affichage HTML</td>
+                        <td>L'affichage le plus simple possible</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Autochargement des scénarios de test</td>
+                        <td>Lire un fichier avec des scénarios de test et les charger dans un groupe de tests automatiquement</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Générateur de code d'objets fantaisie</td>
+                        <td>Des objets capable de simuler d'autres objets, supprimant les dépendances dans les tests</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Bouchons serveur</td>
+                        <td>Des objets fantaisie sans résultat attendu à utiliser à l'extérieur des scénarios de test, pour le prototypage par exemple.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Intégration d'autres testeurs unitaires</td>
+                        <td>
+                            La capacité de lire et simuler d'autres scénarios de test en provenance de PHPUnit et de PEAR::Phpunit.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Scénario de test web</td>
+                        <td>Appariement basique de motifs dans une page téléchargée.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Analyse de page HTML</td>
+                        <td>Permet de suivre les liens et de trouver la balise de titre</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Simulacre partiel</td>
+                        <td>Simuler des parties d'une classe pour tester moins qu'une classe ou dans des cas complexes.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Gestion des cookies Web</td>
+                        <td>Gestion correcte des cookies au téléchargement d'une page.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Suivi des redirections</td>
+                        <td>Le téléchargement d'une page suit automatiquement une redirection 300.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Analyse d'un formulaire</td>
+                        <td>La capacité de valider un formulaire simple et d'en lire les valeurs par défaut.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Interface en ligne de commande</td>
+                        <td>Affiche le résultat des tests sans navigateur web.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Mise à nu des attentes d'une classe</td>
+                        <td>Peut créer des tests précis avec des simulacres ainsi que des scénarios de test.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Sortie et analyse XML</td>
+                        <td>Permet de tester sur plusieurs hôtes et d'intégrer des extensions d'acceptation de test.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Scénario de test en ligne de commande</td>
+                        <td>Permet de tester des outils ou scripts en ligne de commande et de manier des fichiers.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Compatibilité avec PHP Documentor</td>
+                        <td>Génération automatique et complète de la documentation au niveau des classes.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Interface navigateur</td>
+                        <td>Mise à nu des niveaux bas de l'interface du navigateur web pour des scénarios de test plus précis.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Authentification HTTP</td>
+                        <td>Téléchargement des pages web protégées avec une authentification basique seulement.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Boutons de navigation d'un navigateur</td>
+                        <td>Arrière, avant et recommencer</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Support de SSL</td>
+                        <td>Peut se connecter à des pages de type https.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Support de proxy</td>
+                        <td>Peut se connecter via des proxys communs</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Support des cadres</td>
+                        <td>Gère les cadres dans les scénarios de test web.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Test de l'upload de fichier</td>
+                        <td>Peut simuler la balise input de type file</td>
+                        <td style="color: red;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>Amélioration sur la machinerie des rapports</td>
+                        <td>Retouche sur la transmission des messages pour une meilleur coopération avec les IDEs</td>
+                        <td style="color: red;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>Amélioration de l'affichage des tests</td>
+                        <td>Une meilleure interface graphique web, avec un arbre des scénarios de test.</td>
+                        <td style="color: red;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>Localisation</td>
+                        <td>Abstraction des messages et génration du code à partir de fichiers XML.</td>
+                        <td style="color: red;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>Simulation d'interface</td>
+                        <td>Peut générer des objets fantaisie tant vers des interfaces que vers des classes.</td>
+                        <td style="color: red;">2.0</td>
+                    </tr>
+                    <tr>
+                        <td>Test sur es exceptions</td>
+                        <td>Dans le même esprit que sur les tests des erreurs PHP.</td>
+                        <td style="color: red;">2.0</td>
+                    </tr>
+                    <tr>
+                        <td>Rercherche d'éléments avec XPath</td>
+                        <td>Peut utiliser Tidy HTML pour un appariement plus rapide et plus souple.</td>
+                        <td style="color: red;">2.0</td>
+                    </tr>
+                </tbody>
+</table>
+                La migration vers PHP5 commencera juste après la série des 1.0, à partir de là PHP4 ne sera plus supporté. SimpleTest est actuellement compatible avec PHP5 mais n'utilisera aucune des nouvelles fonctionnalités avant la version 2.
+            </p>
+        
+        <h2>
+<a class="target" name="ressources"></a>Ressources sur le web pour les tests</h2>
+            <p>
+                Le processus est au moins aussi important que les outils. Le type de procédure que fait un usage le plus intensif des outils de test pour développeur est bien sûr l'<a href="http://www.extremeprogramming.org/">Extreme Programming</a>. Il s'agit là d'une des <a href="http://www.agilealliance.com/articles/index">méthodes agiles</a> qui combinent plusieurs pratiques pour "lisser la courbe de coût" du développement logiciel. La plus extrème reste le <a href="http://www.testdriven.com/modules/news/">développement piloté par les tests</a>, où vous devez adhérer à la règle du <cite>pas de code avant d'avoir un test</cite>. Si vous êtes plutôt du genre planninficateur ou que vous estimez que l'expérience compte plus que l'évolution, vous préférerez peut-être l'approche <a href="http://www.therationaledge.com/content/dec_01/f_spiritOfTheRUP_pk.html">RUP</a>. Je ne l'ai pas testé mais je peux voir où vous aurez besoin d'outils de test (cf. illustration 9).
+            </p>
+            <p>
+                La plupart des testeurs unitaires sont dans une certaine mesure un clone de <a href="http://www.junit.org/">JUnit</a>, au moins dans l'interface. Il y a énormément d'information sur le site de JUnit, à commencer par la <a href="http://junit.sourceforge.net/doc/faq/faq.htm">FAQ</a> quie contient pas mal de conseils généraux sur les tests. Une fois mordu par le bogue vous apprécierez sûrement la phrase <a href="http://junit.sourceforge.net/doc/testinfected/testing.htm">infecté par les tests</a> trouvée par Eric Gamma. Si vous êtes encore en train de tergiverser sur un testeur unitaire, sachez que les choix principaux sont <a href="http://phpunit.sourceforge.net/">PHPUnit</a> et <a href="http://pear.php.net/manual/en/package.php.phpunit.php">Pear PHP::PHPUnit</a>. De nombreuses fonctionnalités de SimpleTest leurs font défaut, mais la version PEAR a d'ores et déjà été mise à jour pour PHP5. Elle est aussi recommandée si vous portez des scénarios de test existant depuis <a href="http://www.junit.org/">JUnit</a>.
+            </p>
+            <p>
+                Les développeurs de bibliothèque n'ont pas l'air de livrer très souvent des tests avec leur code : c'est bien dommage. Le code d'une bibliothèque qui inclut des tests peut être remanié avec plus de sécurité et le code de test sert de documentation additionnelle dans un format assez standard. Ceci peut épargner la pêche aux indices dans le code source lorsque qu'un problème survient, en particulier lors de la mise à jour d'une telle bibliothèque. Parmi les bibliothèques utilisant SimpleTest comme testeur unitaire on retrouve <a href="http://wact.sourceforge.net/">WACT</a> et <a href="http://sourceforge.net/projects/htmlsax">PEAR::XML_HTMLSax</a>.
+            </p>
+            <p>
+                Au jour d'aujourd'hui il manque tristement beaucoup de matière sur les objets fantaisie : dommage, surtout que tester unitairement sans eux représente pas mal de travail en plus. L'<a href="http://www.sidewize.com/company/mockobjects.pdf">article original sur les objets fantaisie</a> est très orienté Java, mais reste intéressant à lire. Etant donné qu'il s'agit d'une nouvelle technologie il y a beaucoup de discussions et de débats sur comment les utiliser, souvent sur des wikis comme <a href="http://xpdeveloper.com/cgi-bin/oldwiki.cgi?MockObjects">Extreme Tuesday</a> ou <a href="http://www.mockobjects.com/MocksObjectsPaper.html">www.mockobjects.com</a>ou <a href="http://c2.com/cgi/wiki?MockObject">the original C2 Wiki</a>. Injecter des objets fantaisie dans une classe est un des champs principaux du débat : cet <a href="http://www-106.ibm.com/developerworks/java/library/j-mocktest.html">article chez IBM</a> en est un bon point de départ.
+            </p>
+            <p>
+                Il y a énormement d'outils de test web mais la plupart sont écrits en Java. De plus les tutoriels et autres conseils sont plutôt rares. Votre seul espoir est de regarder directement la documentation pour <a href="http://httpunit.sourceforge.net/">HTTPUnit</a>, <a href="http://htmlunit.sourceforge.net/">HTMLUnit</a> ou <a href="http://jwebunit.sourceforge.net/">JWebUnit</a> et d'espérer y trouver pour des indices. Il y a aussi des frameworks basés sur XML, mais de nouveau la plupart ont besoin de Java pour tourner.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            <a href="unit_test_documentation.html">Documentation pour SimpleTest</a>.
+        </li>
+<li>
+            <a href="http://www.lastcraft.com/first_test_tutorial.php">Comment écrire des scénarios de test en PHP</a> est un tutoriel plutôt avancé.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API de SimpleTest</a> par phpdoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/partial_mocks_documentation.html b/3rdparty/simpletest/docs/fr/partial_mocks_documentation.html
new file mode 100644
index 00000000000..740ae7b4026
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/partial_mocks_documentation.html
@@ -0,0 +1,475 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : les objets fantaisie partiels</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur les objets fantaisie partiels</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#injection">Le problème de l'injection d'un objet fantaisie</a>.
+        </li>
+<li>
+            Déplacer la création vers une méthode <a href="#creation">fabrique protégée</a>.
+        </li>
+<li>
+            <a href="#partiel">L'objet fantaisie partiel</a> génère une sous-classe.
+        </li>
+<li>
+            Les objets fantaisie partiels <a href="#moins">testent moins qu'une classe</a>.
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                Un objet fantaisie partiel n'est ni plus ni moins
+                qu'un modèle de conception pour soulager un problème spécifique
+                du test avec des objets fantaisie, celui de placer
+                des objets fantaisie dans des coins serrés.
+                Il s'agit d'un outil assez limité et peut-être même
+                une idée pas si bonne que ça. Elle est incluse dans SimpleTest
+                pour la simple raison que je l'ai trouvée utile
+                à plus d'une occasion et qu'elle m'a épargnée
+                pas mal de travail dans ces moments-là.
+            </p>
+        
+        <h2>
+<a class="target" name="injection"></a>Le problème de l'injection dans un objet fantaisie</h2>
+            <p>
+                Quand un objet en utilise un autre il est très simple
+                d'y faire circuler une version fantaisie déjà prête
+                avec ses attentes. Les choses deviennent un peu plus délicates
+                si un objet en crée un autre et que le créateur est celui
+                que l'on souhaite tester. Cela revient à dire que l'objet
+                créé devrait être une fantaisie, mais nous pouvons
+                difficilement dire à notre classe sous test de créer
+                un objet fantaisie plutôt qu'un "vrai" objet.
+                La classe testée ne sait même pas qu'elle travaille dans un environnement de test.
+            </p>
+            <p>
+                Par exemple, supposons que nous sommes en train
+                de construire un client telnet et qu'il a besoin
+                de créer une socket réseau pour envoyer ses messages.
+                La méthode de connexion pourrait ressemble à quelque chose comme...
+<pre>
+<strong>&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    function connect($ip, $port, $username, $password) {
+        $socket = new Socket($ip, $port);
+        $socket-&gt;read( ... );
+        ...
+    }
+}
+?&gt;</strong>
+</pre>
+                Nous voudrions vraiment avoir une version fantaisie
+                de l'objet socket, que pouvons nous faire ?
+            </p>
+            <p>
+                La première solution est de passer la socket en
+                tant que paramètre, ce qui force la création
+                au niveau inférieur. Charger le client de cette tâche
+                est effectivement une bonne approche si c'est possible
+                et devrait conduire à un remaniement -- de la création
+                à partir de l'action. En fait, c'est là une des manières
+                avec lesquels tester en s'appuyant sur des objets fantaisie
+                vous force à coder des solutions plus resserrées sur leur objectif.
+                Ils améliorent votre programmation.
+            </p>
+            <p>
+                Voici ce que ça devrait être...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    <strong>function connect($socket, $username, $password) {
+        $socket-&gt;read( ... );
+        ...
+    }</strong>
+}
+?&gt;
+</pre>
+                Sous-entendu, votre code de test est typique d'un cas
+                de test avec un objet fantaisie.
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new Telnet();
+        $telnet-&gt;connect($socket, 'Me', 'Secret');
+        ...</strong>
+    }
+}
+</pre>
+                C'est assez évident que vous ne pouvez descendre que d'un niveau.
+                Vous ne voudriez pas que votre application de haut niveau
+                crée tous les fichiers de bas niveau, sockets et autres connexions
+                à la base de données dont elle aurait besoin.
+                Elle ne connaîtrait pas les paramètres du constructeur de toute façon.
+            </p>
+            <p>
+                La solution suivante est de passer l'objet créé sous la forme
+                d'un paramètre optionnel...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...<strong>
+    function connect($ip, $port, $username, $password, $socket = false) {
+        if (! $socket) {
+            $socket = new Socket($ip, $port);
+        }
+        $socket-&gt;read( ... );</strong>
+        ...
+        return $socket;
+    }
+}
+?&gt;
+</pre>
+                Pour une solution rapide, c'est généralement suffisant.
+                Ensuite le test est très similaire : comme si le paramètre
+                était transmis formellement...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret', $socket);
+        ...</strong>
+    }
+}
+</pre>
+                Le problème de cette approche tient dans son manque de netteté.
+                Il y a du code de test dans la classe principale et aussi
+                des paramètres transmis dans le scénario de test
+                qui ne sont jamais utilisés. Il s'agit là d'une approche
+                rapide et sale, mais qui ne reste pas moins efficace
+                dans la plupart des situations.
+            </p>
+            <p>
+                Une autre solution encore est de laisser un objet fabrique
+                s'occuper de la création...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {<strong>
+   function Telnet($network) {
+        $this-&gt;_network = $network;
+    }</strong>
+    ...
+    function connect($ip, $port, $username, $password) {<strong>
+        $socket = $this-&gt;_network-&gt;createSocket($ip, $port);
+        $socket-&gt;read( ... );</strong>
+        ...
+        return $socket;
+    }
+}
+?&gt;
+</pre>
+                Il s'agit là probablement de la réponse la plus travaillée
+                étant donné que la création est maintenant située
+                dans une petite classe spécialisée. La fabrique réseau
+                peut être testée séparément et utilisée en tant que fantaisie
+                quand nous testons la classe telnet...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $network = new MockNetwork();
+        $network-&gt;returnsByReference('createSocket', $socket);
+        $telnet = new Telnet($network);
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
+    }
+}
+</pre>
+                Le problème reste que nous ajoutons beaucoup de classes
+                à la bibliothèque. Et aussi que nous utilisons beaucoup
+                de fabriques ce qui rend notre code un peu moins intuitif.
+                La solution la plus flexible, mais aussi la plus complexe.
+            </p>
+			<p>
+                Des techniques comme "l'Injection de Dépendance"
+				(ou "Dependency Injection") s'attelle au problème
+				de l'instanciation d'une classe avec beaucoup de paramètres.
+				Malheureusement la connaissance de ce patron de conception
+				n'est pas très répandue et si vous êtes en train d'essayer
+				de faire fonctionner du vieux code, ré-achitecturer toute
+				l'application n'est pas vraiment une option.
+            </p>
+            <p>
+                Peut-on trouver un juste milieu ?
+            </p>
+        
+        <h2>
+<a class="target" name="creation"></a>Méthode fabrique protégée</h2>
+            <p>
+                Il existe une technique pour palier à ce problème
+                sans créer de nouvelle classe dans l'application;
+                par contre elle induit la création d'une sous-classe au moment du test.
+                Premièrement nous déplaçons la création de la socket dans sa propre méthode...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    function connect($ip, $port, $username, $password) {
+        <strong>$socket = $this-&gt;createSocket($ip, $port);</strong>
+        $socket-&gt;read( ... );
+        ...
+    }<strong>
+
+    protected function createSocket($ip, $port) {
+        return new Socket($ip, $port);
+    }</strong>
+}
+?&gt;
+</pre>
+				Une première étape plutôt précautionneuse même pour
+				du code legacy et intermélé.
+                Il s'agit là de la seule modification dans le code de l'application.
+            </p>
+            <p>
+                Pour le scénario de test, nous devons créer
+                une sous-classe de manière à intercepter la création de la socket...
+<pre>
+<strong>class TelnetTestVersion extends Telnet {
+    var $mock;
+
+    function TelnetTestVersion($mock) {
+        $this-&gt;mock = $mock;
+        $this-&gt;Telnet();
+    }
+
+    protected function createSocket() {
+        return $this-&gt;mock;
+    }
+}</strong>
+</pre>
+                Ici j'ai déplacé la fantaisie dans le constructeur,
+                mais un setter aurait fonctionné tout aussi bien.
+                Notez bien que la fantaisie est placée dans une variable
+                d'objet avant que le constructeur ne soit attaché.
+                C'est nécessaire dans le cas où le constructeur appelle 
+                <span class="new_code">connect()</span>.
+                Autrement il pourrait donner un valeur nulle à partir de
+                <span class="new_code">createSocket()</span>.
+            </p>
+            <p>
+                Après la réalisation de tout ce travail supplémentaire
+                le scénario de test est assez simple.
+                Nous avons juste besoin de tester notre nouvelle classe à la place...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new TelnetTestVersion($socket);
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
+    }
+}
+</pre>
+                Cette nouvelle classe est très simple bien sûr.
+                Elle ne fait qu'initier une valeur renvoyée, à la manière
+                d'une fantaisie. Ce serait pas mal non plus si elle pouvait
+                vérifier les paramètres entrants.
+                Exactement comme un objet fantaisie.
+                Il se pourrait bien que nous ayons à réaliser cette astuce régulièrement :
+                serait-il possible d'automatiser la création de cette sous-classe ?
+            </p>
+        
+        <h2>
+<a class="target" name="partiel"></a>Un objet fantaisie partiel</h2>
+            <p>
+                Bien sûr la réponse est "oui"
+                ou alors j'aurais arrêté d'écrire depuis quelques temps déjà !
+                Le test précédent a représenté beaucoup de travail,
+                mais nous pouvons générer la sous-classe en utilisant
+                une approche à celle des objets fantaisie.
+            </p>
+            <p>
+                Voici donc une version avec objet fantaisie partiel du test...
+<pre>
+<strong>Mock::generatePartial(
+        'Telnet',
+        'TelnetTestVersion',
+        array('createSocket'));</strong>
+
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new TelnetTestVersion();
+        $telnet-&gt;setReturnReference('createSocket', $socket);
+        $telnet-&gt;Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
+    }
+}
+</pre>
+                La fantaisie partielle est une sous-classe de l'original
+                dont on aurait "remplacé" les méthodes sélectionnées
+                avec des versions de test. L'appel à <span class="new_code">generatePartial()</span>
+                nécessite trois paramètres : la classe à sous classer,
+                le nom de la nouvelle classe et une liste des méthodes à simuler.
+            </p>
+            <p>
+                Instancier les objets qui en résultent est plutôt délicat.
+                L'unique paramètre du constructeur d'un objet fantaisie partiel
+                est la référence du testeur unitaire.
+                Comme avec les objets fantaisie classiques c'est nécessaire
+                pour l'envoi des résultats de test en réponse à la vérification des attentes.
+            </p>
+            <p>
+                Une nouvelle fois le constructeur original n'est pas lancé.
+                Indispensable dans le cas où le constructeur aurait besoin
+                des méthodes fantaisie : elles n'ont pas encore été initiées !
+                Nous initions les valeurs retournées à cet instant et
+                ensuite lançons le constructeur avec ses paramètres normaux.
+                Cette construction en trois étapes de "new",
+                suivie par la mise en place des méthodes et ensuite
+                par la lancement du constructeur proprement dit est
+                ce qui distingue le code d'un objet fantaisie partiel.
+            </p>
+            <p>
+                A part pour leur construction, toutes ces méthodes
+                fantaisie ont les mêmes fonctionnalités que dans
+                le cas des objets fantaisie et toutes les méthodes
+                non fantaisie se comportent comme avant.
+                Nous pouvons mettre en place des attentes très facilement...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {
+        $socket = new MockSocket();
+        ...
+        $telnet = new TelnetTestVersion();
+        $telnet-&gt;setReturnReference('createSocket', $socket);
+        <strong>$telnet-&gt;expectOnce('createSocket', array('127.0.0.1', 21));</strong>
+        $telnet-&gt;Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');
+    }
+}
+</pre>
+                Les objets fantaisie partiels ne sont pas très utilisés.
+				Je les considère comme transitoire.
+				Utile lors d'un remaniement, mais une fois que l'application
+				a eu toutes ses dépendances bien séparées alors
+				ils peuvent disparaître.
+            </p>
+        
+        <h2>
+<a class="target" name="moins"></a>Tester moins qu'une classe</h2>
+            <p>
+                Les méthodes issues d'un objet fantaisie n'ont pas
+                besoin d'être des méthodes fabrique, Il peut s'agir
+                de n'importe quelle sorte de méthode.
+                Ainsi les objets fantaisie partiels nous permettent
+                de prendre le contrôle de n'importe quelle partie d'une classe,
+                le constructeur excepté. Nous pourrions même aller jusqu'à
+                créer des fantaisies sur toutes les méthodes à part celle
+                que nous voulons effectivement tester.
+            </p>
+            <p>
+                Cette situation est assez hypothétique, étant donné
+                que je ne l'ai pas souvent essayée.
+				Je crains qu'en forçant la granularité d'un objet
+                on n'obtienne pas forcément un code de meilleur qualité.
+                Personnellement j'utilise les objets fantaisie partiels
+                comme moyen de passer outre la création ou alors
+                de temps en temps pour tester le modèle de conception TemplateMethod.
+            </p>
+            <p>
+                On en revient toujours aux standards de code de votre projet :
+				c'est à vous de trancher si vous autorisez ce mécanisme ou non.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API complète pour SimpleTest</a>
+            à partir de PHPDoc.
+        </li>
+<li>
+            La méthode fabrique protégée est décrite dans
+            <a href="http://www-106.ibm.com/developerworks/java/library/j-mocktest.html">
+            cet article d'IBM</a>. Il s'agit de l'unique papier
+            formel que j'ai vu sur ce problème.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/reporter_documentation.html b/3rdparty/simpletest/docs/fr/reporter_documentation.html
new file mode 100644
index 00000000000..485fc74c7a4
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/reporter_documentation.html
@@ -0,0 +1,630 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : le rapporteur de test</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur le rapporteur de test</h1>
+        This page...
+        <ul>
+<li>
+            Afficher <a href="#html">les résultats en HTML</a>
+        </li>
+<li>
+            Afficher et <a href="#autres">rapporter les résultats</a>
+            dans d'autres formats
+        </li>
+<li>
+            Utilisé <a href="#cli">SimpleTest depuis la ligne de commande</a>
+        </li>
+<li>
+            <a href="#xml">Utiliser XML</a> pour des tests distants
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                SimpleTest suit plutôt plus que moins le modèle MVC (Modèle-Vue-Contrôleur).
+                Les classes "reporter" sont les vues et les modèles
+                sont vos scénarios de test et leur hiérarchie.
+                Le contrôleur est le plus souvent masqué à l'utilisateur
+                de SimpleTest à moins de vouloir changer la façon
+                dont les tests sont effectivement exécutés,
+                auquel cas il est possible de surcharger les objets
+                "runner" (ceux de l'exécuteur) depuis l'intérieur
+                d'un scénario de test. Comme d'habitude avec MVC,
+                le contrôleur est plutôt indéfini et il existe d'autres endroits
+                pour contrôler l'exécution des tests.
+            </p>
+        
+        <h2>
+<a class="target" name="html"></a>Les résultats rapportés au format HTML</h2>
+            <p>
+                L'affichage par défaut est minimal à l'extrême.
+                Il renvoie le succès ou l'échec avec les barres conventionnelles
+                - rouge et verte - et affichent une trace d'arborescence
+                des groupes de test pour chaque assertion erronée. Voici un tel échec...
+                <div class="demo">
+                    <h1>File test</h1>
+                    <span class="fail">Fail</span>: createnewfile-&gt;True assertion failed.<br>
+                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
+                    <strong>0</strong> passes, <strong>1</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                Alors qu'ici tous les tests passent...
+                <div class="demo">
+                    <h1>File test</h1>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>1</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                La bonne nouvelle, c'est qu'il existe pas mal de points
+                dans la hiérarchie de l'affichage pour créer des sous-classes.
+            </p>
+            <p>
+                Pour l'affichage basé sur des pages web,
+                il y a la classe <span class="new_code">HtmlReporter</span> avec la signature suivante...
+<pre>
+class HtmlReporter extends SimpleReporter {
+    public __construct($encoding) { ... }
+    public makeDry(boolean $is_dry) { ... }
+    public void paintHeader(string $test_name) { ... }
+    public void sendNoCacheHeaders() { ... }
+    public void paintFooter(string $test_name) { ... }
+    public void paintGroupStart(string $test_name, integer $size) { ... }
+    public void paintGroupEnd(string $test_name) { ... }
+    public void paintCaseStart(string $test_name) { ... }
+    public void paintCaseEnd(string $test_name) { ... }
+    public void paintMethodStart(string $test_name) { ... }
+    public void paintMethodEnd(string $test_name) { ... }
+    public void paintFail(string $message) { ... }
+    public void paintPass(string $message) { ... }
+    public void paintError(string $message) { ... }
+    public void paintException(string $message) { ... }
+    public void paintMessage(string $message) { ... }
+    public void paintFormattedMessage(string $message) { ... }
+    protected string getCss() { ... }
+    public array getTestList() { ... }
+    public integer getPassCount() { ... }
+    public integer getFailCount() { ... }
+    public integer getExceptionCount() { ... }
+    public integer getTestCaseCount() { ... }
+    public integer getTestCaseProgress() { ... }
+}
+</pre>
+                Voici ce que certaines de ces méthodes veulent dire.
+                Premièrement les méthodes d'affichage que vous voudrez probablement surcharger...
+                <ul class="api">
+                    <li>
+                        <span class="new_code">HtmlReporter(string $encoding)</span><br>
+                        est le constructeur. Notez que le test unitaire initie
+                        le lien à l'affichage plutôt que l'opposé.
+                        L'affichage est principalement un receveur passif
+                        des évènements de tests. Cela permet d'adapter
+                        facilement l'affichage pour d'autres systèmes
+                        en dehors des tests unitaires, tel le suivi
+                        de la charge de serveurs.
+                        L'"encoding" est le type d'encodage
+                        que vous souhaitez utiliser pour l'affichage du test.
+                        Pour pouvoir effectuer un rendu correct de la sortie
+                        de débogage quand on utilise le testeur web,
+                        il doit correspondre à l'encodage du site testé.
+                        Les chaînes de caractères disponibles
+                        sont indiquées dans la fonction PHP
+                        <a href="http://www.php.net/manual/fr/function.htmlentities.php">html_entities()</a>.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintHeader(string $test_name)</span><br>
+                        est appelé une fois, au début du test quand l'évènement
+                        de démarrage survient. Le premier évènement de démarrage
+                        est souvent délivré par le groupe de tests du niveau
+                        le plus haut et donc c'est de là que le
+                        <span class="new_code">$test_name</span> arrive.
+                        Il peint le titre de la page, CSS, la balise "body", etc.
+                        Il ne renvoie rien du tout (<span class="new_code">void</span>).
+                    </li>
+                    <li>
+                        <span class="new_code">void paintFooter(string $test_name)</span><br>
+                        est appelé à la toute fin du test pour fermer
+                        les balises ouvertes par l'entête de la page.
+                        Par défaut il affiche aussi la barre rouge ou verte
+                        et le décompte final des résultats.
+                        En fait la fin des tests arrive quand l'évènement
+                        de fin de test arrive avec le même nom
+                        que celui qui l'a initié au même niveau.
+                        Le nid des tests en quelque sorte.
+                        Fermer le dernier test finit l'affichage.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintMethodStart(string $test_name)</span><br>
+                        est appelé au début de chaque méthode de test.
+                        Normalement le nom vient de celui de la méthode.
+                        Les autres évènements de départ de test
+                        se comportent de la même manière sauf que
+                        celui du groupe de tests indique au rapporteur
+                        le nombre de scénarios de test qu'il contient.
+                        De la sorte le rapporteur peut afficher une barre
+                        de progrès au fur et à mesure que l'exécuteur
+                        passe en revue les scénarios de test.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintMethodEnd(string $test_name)</span><br>
+                        clôt le test lancé avec le même nom.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintFail(string $message)</span><br>
+                        peint un échec. Par défaut il ne fait qu'afficher
+                        le mot "fail", une trace d'arborescence
+                        affichant la position du test en cours
+                        et le message transmis par l'assertion.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintPass(string $message)</span><br>
+                        ne fait rien, par défaut.
+                    </li>
+                    <li>
+                        <span class="new_code">string getCss()</span><br>
+                        renvoie les styles CSS sous la forme d'une chaîne
+                        à l'attention de la méthode d'entêtes d'une page.
+                        Des styles additionnels peuvent être ajoutés ici
+                        si vous ne surchargez pas les entêtes de la page.
+                        Vous ne voudrez pas utiliser cette méthode dans
+                        des entêtes d'une page surchargée si vous souhaitez
+                        inclure le feuille de style CSS d'origine.
+                    </li>
+                </ul>
+                Il y a aussi des accesseurs pour aller chercher l'information
+                sur l'état courant de la suite de test. Vous les utiliserez
+                pour enrichir l'affichage...
+                <ul class="api">
+                    <li>
+                        <span class="new_code">array getTestList()</span><br>
+                        est la première méthode très commode pour les sous-classes.
+                        Elle liste l'arborescence courante des tests
+                        sous la forme d'une liste de noms de tests.
+                        Le premier test -- celui de premier niveau --
+                        sera le premier dans la liste et la méthode de test
+                        en cours sera la dernière.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getPassCount()</span><br>
+                        renvoie le nombre de succès atteint. Il est nécessaire
+                        pour l'affichage à la fin.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getFailCount()</span><br>
+                        renvoie de la même manière le nombre d'échecs.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getExceptionCount()</span><br>
+                        renvoie quant à lui le nombre d'erreurs.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getTestCaseCount()</span><br>
+                        est le nombre total de scénarios lors de l'exécution des tests.
+                        Il comprend aussi les tests groupés.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getTestCaseProgress()</span><br>
+                        est le nombre de scénarios réalisés jusqu'à présent.
+                    </li>
+                </ul>
+                Une modification simple : demander à l'HtmlReporter d'afficher
+                aussi bien les succès que les échecs et les erreurs...
+<pre>
+<strong>class ReporterShowingPasses extends HtmlReporter {
+    
+    function paintPass($message) {
+        parent::paintPass($message);
+        print "&lt;span class=\"pass\"&gt;Pass&lt;/span&gt;: ";
+        $breadcrumb = $this-&gt;getTestList();
+        array_shift($breadcrumb);
+        print implode("-&amp;gt;", $breadcrumb);
+        print "-&amp;gt;$message&lt;br /&gt;\n";
+    }
+    
+    protected function getCss() {
+        return parent::getCss() . ' .pass { color: green; }';
+    }
+}</strong>
+</pre>
+            </p>
+            <p>
+                Une méthode qui a beaucoup fait jaser reste la méthode <span class="new_code">makeDry()</span>.
+                Si vous lancez cette méthode, sans paramètre,
+                sur le rapporteur avant que la suite de test
+                ne soit exécutée alors aucune méthode de test
+                ne sera appelée. Vous continuerez à avoir
+                les évènements entrants et sortants des méthodes
+                et scénarios de test, mais aucun succès ni échec ou erreur,
+                parce que le code de test ne sera pas exécuté.
+            </p>
+            <p>
+                La raison ? Pour permettre un affichage complexe
+                d'une IHM (ou GUI) qui permettrait la sélection
+                de scénarios de test individuels.
+                Afin de construire une liste de tests possibles,
+                ils ont besoin d'un rapport sur la structure du test
+                pour l'affichage, par exemple, d'une vue en arbre
+                de la suite de test. Avec un rapporteur lancé
+                sur une exécution sèche qui ne renverrait
+                que les évènements d'affichage, cela devient
+                facilement réalisable.
+            </p>
+        
+        <h2>
+<a class="target" name="autre"></a>Etendre le rapporteur</h2>
+            <p>
+                Plutôt que de modifier l'affichage existant,
+                vous voudrez peut-être produire une présentation HTML
+                complètement différente, ou même générer une version texte ou XML.
+                Plutôt que de surcharger chaque méthode dans 
+                <span class="new_code">HtmlReporter</span> nous pouvons nous rendre
+                une étape plus haut dans la hiérarchie de classe vers
+                <span class="new_code">SimpleReporter</span> dans le fichier source <em>simple_test.php</em>.
+            </p>
+            <p>
+                Un affichage sans rien, un canevas vierge
+                pour votre propre création, serait...
+<pre>
+<strong>require_once('simpletest/simpletest.php');</strong>
+
+class MyDisplay extends SimpleReporter {<strong>
+    </strong>
+    function paintHeader($test_name) { }
+    
+    function paintFooter($test_name) { }
+    
+    function paintStart($test_name, $size) {<strong>
+        parent::paintStart($test_name, $size);</strong>
+    }
+    
+    function paintEnd($test_name, $size) {<strong>
+        parent::paintEnd($test_name, $size);</strong>
+    }
+    
+    function paintPass($message) {<strong>
+        parent::paintPass($message);</strong>
+    }
+    
+    function paintFail($message) {<strong>
+        parent::paintFail($message);</strong>
+    }
+    
+    function paintError($message) {<strong>
+        parent::paintError($message);</strong>
+    }
+    
+    function paintException($exception) {<strong>
+        parent::paintException($exception);</strong>
+    }
+}
+</pre>
+                Aucune sortie ne viendrait de cette classe jusqu'à un ajout de votre part.
+            </p>
+			 <p>
+                Sauf qu'il y a un problème : en utilisant cette cette classe
+				de bas niveau, vous devez explicitement l'invoquer
+				dans les scripts de test.
+				La commande "autorun" ne sera pas capable
+				d'utiliser son contexte courant (qu'elle soit lancée
+				dans un navigateur web ou via une ligne de commande)
+				pour sélectionner le rapporteur.
+            </p>
+            <p>
+                Vous invoquez explicitement la lanceur de tests comme suit...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+$test-&gt;run(<strong>new MyReporter()</strong>);
+?&gt;
+</pre>
+                ...ou peut-être comme cela...
+<pre>
+&lt;?php
+require_once('simpletest/simpletest.php');
+require_once('my_reporter.php');
+
+class MyTest extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('tests/file_test.php');
+    }
+}
+
+$test = new MyTest();
+$test-&gt;run(<strong>new MyReporter()</strong>);
+?&gt;
+</pre>
+                Nous verrons plus comment l'intégrer avec l'"autorun".
+            </p>
+        
+        <h2>
+<a class="target" name="cli"></a>Le rapporteur en ligne de commande</h2>
+            <p>
+                SimpleTest est aussi livré avec un rapporteur
+                en ligne de commande, minime lui aussi.
+                Pour utiliser le rapporteur en ligne de commande explicitement,
+                il suffit de l'intervertir avec celui de la version HTML...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+$test-&gt;run(<strong>new TextReporter()</strong>);
+?&gt;
+</pre>
+                Et ensuite d'invoquer la suite de test à partir d'une ligne de commande...
+<pre class="shell">
+php file_test.php
+</pre>
+                Bien sûr vous aurez besoin d'installer PHP
+                en ligne de commande. Une suite de test qui
+                passerait toutes ses assertions ressemble à...
+<pre class="shell">
+File test
+OK
+Test cases run: 1/1, Passes: 1, Failures: 0, Exceptions: 0
+</pre>
+                Un échec déclenche un affichage comme...
+<pre class="shell">
+File test
+1) True assertion failed.
+    in createNewFile
+FAILURES!!!
+Test cases run: 1/1, Passes: 0, Failures: 1, Exceptions: 0
+</pre>
+            </p>
+            <p>
+                Une des principales raisons pour utiliser
+                une suite de test en ligne de commande tient
+                dans l'utilisation possible du testeur avec
+                un processus automatisé. Pour fonctionner comme
+                il faut dans des scripts shell le script de test
+                devrait renvoyer un code de sortie non-nul suite à un échec.
+                Si une suite de test échoue la valeur <span class="new_code">false</span>
+                est renvoyée par la méthode <span class="new_code">SimpleTest::run()</span>.
+                Nous pouvons utiliser ce résultat pour terminer le script
+                avec la bonne valeur renvoyée...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+<strong>exit ($test-&gt;run(new TextReporter()) ? 0 : 1);</strong>
+?&gt;
+</pre>
+                Bien sûr l'objectif ne serait pas de créer deux scripts de test,
+                l'un en ligne de commande et l'autre pour un navigateur web,
+                pour chaque suite de test.
+                Le rapporteur en ligne de commande inclut
+                une méthode pour déterminer l'environnement d'exécution...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+<strong>if (TextReporter::inCli()) {</strong>
+    exit ($test-&gt;run(new TextReporter()) ? 0 : 1);
+<strong>}</strong>
+$test-&gt;run(new HtmlReporter());
+?&gt;
+</pre>
+                Il s'agit là de la forme utilisée par SimpleTest lui-même.
+                Quand vous utilisez l'"autorun.php"
+				et qu'aucun test n'a été lancé avant la fin,
+				c'est quasiment le code que SimpleTest lancera
+				pour vous implicitement.
+            </p>
+            <p>
+                En d'autres termes, ceci donne le même résultat...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class MyTest extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('tests/file_test.php');
+    }
+}
+?&gt;
+</pre>            </p>
+        
+        <h2>
+<a class="target" name="xml"></a>Test distant</h2>
+            <p>
+                SimpleTest est livré avec une classe <span class="new_code">XmlReporter</span>
+                utilisée pour de la communication interne.
+                Lors de son exécution, le résultat ressemble à...
+<pre class="shell">
+&lt;?xml version="1.0"?&gt;
+&lt;run&gt;
+  &lt;group size="4"&gt;
+    &lt;name&gt;Remote tests&lt;/name&gt;
+    &lt;group size="4"&gt;
+      &lt;name&gt;Visual test with 48 passes, 48 fails and 4 exceptions&lt;/name&gt;
+      &lt;case&gt;
+        &lt;name&gt;testofunittestcaseoutput&lt;/name&gt;
+        &lt;test&gt;
+          &lt;name&gt;testofresults&lt;/name&gt;
+          &lt;pass&gt;This assertion passed&lt;/pass&gt;
+          &lt;fail&gt;This assertion failed&lt;/fail&gt;
+        &lt;/test&gt;
+        &lt;test&gt;
+          ...
+        &lt;/test&gt;
+      &lt;/case&gt;
+    &lt;/group&gt;
+  &lt;/group&gt;
+&lt;/run&gt;
+</pre>
+                Pour faire en sorte ue vos scénarios de test produisent ce format,
+				dans la ligne de commande, ajoutez le flag <span class="new_code">--xml</span>.
+<pre class="shell">
+php my_test.php --xml
+</pre>
+                Vous pouvez faire la même chose dans le navigation web
+				en ajoutant le paramètre <span class="new_code">xml=1</span> dans l'URL.
+				N'importe quelle valeur "true" fera l'affaire.
+            </p>
+            <p>
+				Vous pouvez utiliser ce format avec le parseur
+                fourni dans SimpleTest lui-même.
+                Il s'agit de <span class="new_code">SimpleTestXmlParser</span>
+                et se trouve <em>xml.php</em> à l'intérieur du paquet SimpleTest...
+<pre>
+&lt;?php
+require_once('simpletest/xml.php');
+    
+...
+$parser = new SimpleTestXmlParser(new HtmlReporter());
+$parser-&gt;parse($test_output);
+?&gt;
+</pre>
+                <span class="new_code">$test_output</span> devrait être au format XML,
+                à partir du rapporteur XML, et pourrait venir
+                d'une exécution en ligne de commande d'un scénario de test.
+                Le parseur envoie des évènements au rapporteur exactement
+                comme tout autre exécution de test.
+                Il y a des occasions bizarres dans lesquelles c'est en fait très utile.
+            </p>
+			<p>
+                Le plus courant, c'est quand vous voulez isoler
+				un test sensible au crash.
+				Vous pouvez collecter la sortie XML en utilisant
+				l'opérateur antiquote (Ndt : backtick) à partir
+				d'un autre test.
+				De la sorte, il tourne dans son propre processus...
+<pre>
+&lt;?php
+require_once('simpletest/xml.php');
+
+if (TextReporter::inCli()) {
+    $parser = new SimpleTestXmlParser(new TextReporter());
+} else {
+    $parser = new SimpleTestXmlParser(new HtmlReporter());
+}
+$parser-&gt;parse(`php flakey_test.php --xml`);
+?&gt;
+</pre>
+            </p>
+            <p>
+                Un autre cas est celui des très longues suites de tests.
+            </p>
+			<p>
+                Elles peuvent venir à bout de la limite de mémoire
+                par défaut d'un process PHP - 16Mb.
+                En plaçant la sortie des groupes de test dans du XML
+                et leur exécution dans des process différents,
+                le résultat peut être parsé à nouveau pour agréger
+                les résultats avec moins d'impact sur le test au premier niveau.
+            </p>
+            <p>
+                Parce que la sortie XML peut venir de n'importe où,
+                ça ouvre des possibilités d'agrégation d'exécutions de test
+                depuis des serveur distants.
+                Un scénario de test pour le réaliser existe déjà
+                à l'intérieur du framework SimpleTest, mais il est encore expérimental...
+<pre>
+&lt;?php
+<strong>require_once('../remote.php');</strong>
+require_once('simpletest/autorun.php');
+    
+$test_url = ...;
+$dry_url = ...;
+
+class MyTestOnAnotherServer extends RemoteTestCase {
+    function __construct() {
+        $test_url = ...
+        parent::__construct($test_url, $test_url . ' --dry');
+    }
+}
+?&gt;
+</pre>
+                <span class="new_code">RemoteTestCase</span> prend la localisation réelle
+                du lanceur de test, tout simplement un page web au format XML.
+                Il prend aussi l'URL d'un rapporteur initié
+                pour effectuer une exécution sèche.
+                Cette technique est employée pour que les progrès
+                soient correctement rapportés vers le haut.
+                <span class="new_code">RemoteTestCase</span> peut être ajouté à
+                une suite de test comme n'importe quelle autre suite de tests.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            L'<a href="http://simpletest.org/api/">API pour développeur de SimpleTest</a>
+            donne tous les détails sur les classes et les assertions disponibles.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/unit_test_documentation.html b/3rdparty/simpletest/docs/fr/unit_test_documentation.html
new file mode 100644
index 00000000000..a7c31f95dbb
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/unit_test_documentation.html
@@ -0,0 +1,447 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest pour les tests de régression en PHP</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur les tests unitaires en PHP</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#unitaire">Scénarios de test unitaire</a>
+            et opérations basiques.
+        </li>
+<li>
+            <a href="#extension_unitaire">Étendre des scénarios de test</a>
+            pour les personnaliser à votre propre projet.
+        </li>
+<li>
+            <a href="#lancement_unitaire">Lancer un scénario seul</a>
+            comme un script unique.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="unitaire"></a>Scénarios de tests unitaires</h2>
+            <p>
+                Le coeur du système est un framework de tests de régression
+                construit autour des scénarios de test.
+                Un exemple de scénario de test ressemble à...
+<pre>
+<strong>class FileTestCase extends UnitTestCase {
+}</strong>
+</pre>
+                Si aucun nom de test n'est fourni au moment
+                de la liaison avec le constructeur alors
+                le nom de la classe sera utilisé.
+                Il s'agit du nom qui sera affiché dans les résultats du test.
+            </p>
+            <p>
+                Les véritables tests sont ajoutés en tant que méthode
+                dans le scénario de test dont le nom par défaut
+                commence par la chaîne "test"
+                et quand le scénario de test est appelé toutes les méthodes
+                de ce type sont exécutées dans l'ordre utilisé
+                par l'introspection de PHP pour les trouver.
+                Peuvent être ajoutées autant de méthodes de test que nécessaires.
+                Par exemple...
+<pre>
+require_once('simpletest/autorun.php');
+require_once('../classes/writer.php');
+
+class FileTestCase extends UnitTestCase {
+    function FileTestCase() {
+        $this-&gt;UnitTestCase('File test');
+    }<strong>
+
+    function setUp() {
+        @unlink('../temp/test.txt');
+    }
+
+    function tearDown() {
+        @unlink('../temp/test.txt');
+    }
+
+    function testCreation() {
+        $writer = &amp;new FileWriter('../temp/test.txt');
+        $writer-&gt;write('Hello');
+        $this-&gt;assertTrue(file_exists('../temp/test.txt'), 'File created');
+    }</strong>
+}
+</pre>
+                Le constructeur est optionnel et souvent omis. Sans nom,
+                le nom de la classe est utilisé comme nom pour le scénario de test.
+            </p>
+            <p>
+                Notre unique méthode de test pour le moment est
+                <span class="new_code">testCreation()</span> où nous vérifions
+                qu'un fichier a bien été créé par notre objet
+                <span class="new_code">Writer</span>. Nous pourrions avoir mis
+                le code <span class="new_code">unlink()</span> dans cette méthode,
+                mais en la plaçant dans <span class="new_code">setUp()</span>
+                et <span class="new_code">tearDown()</span> nous pouvons l'utiliser
+                pour nos autres méthodes de test que nous ajouterons.
+            </p>
+            <p>
+                La méthode <span class="new_code">setUp()</span> est lancé
+                juste avant chaque méthode de test.
+                <span class="new_code">tearDown()</span> est lancé après chaque méthode de test.
+            </p>
+            <p>
+                Vous pouvez placer une initialisation de
+                scénario de test dans le constructeur afin qu'elle soit lancée
+                pour toutes les méthodes dans le scénario de test
+                mais dans un tel cas vous vous exposeriez à des interférences.
+                Cette façon de faire est légèrement moins rapide,
+                mais elle est plus sûre.
+                Notez que si vous arrivez avec des notions de JUnit,
+                il ne s'agit pas du comportement auquel vous êtes habitués.
+                Bizarrement JUnit re-instancie le scénario de test
+                pour chaque méthode de test pour se prévenir
+                d'une telle interférence.
+                SimpleTest demande à l'utilisateur final d'utiliser
+                <span class="new_code">setUp()</span>, mais fournit aux codeurs de bibliothèque d'autres crochets.
+            </p>
+            <p>
+                Pour rapporter les résultats de test,
+                le passage par une classe d'affichage - notifiée par
+                les différentes méthodes de type <span class="new_code">assert...()</span> -
+                est utilisée. En voici la liste complète pour
+                la classe <span class="new_code">UnitTestCase</span>,
+                celle par défaut dans SimpleTest...
+            <table><tbody>
+                <tr>
+<td><span class="new_code">assertTrue($x)</span></td>
+<td>Echoue si $x est faux</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertFalse($x)</span></td>
+<td>Echoue si $x est vrai</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertNull($x)</span></td>
+<td>Echoue si $x est initialisé</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertNotNull($x)</span></td>
+<td>Echoue si $x n'est pas initialisé</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertIsA($x, $t)</span></td>
+<td>Echoue si $x n'est pas de la classe ou du type $t</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertEqual($x, $y)</span></td>
+<td>Echoue si $x == $y est faux</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertNotEqual($x, $y)</span></td>
+<td>Echoue si $x == $y est vrai</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertIdentical($x, $y)</span></td>
+<td>Echoue si $x === $y est faux</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertNotIdentical($x, $y)</span></td>
+<td>Echoue si $x === $y est vrai</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertReference($x, $y)</span></td>
+<td>Echoue sauf si $x et $y sont la même variable</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertCopy($x, $y)</span></td>
+<td>Echoue si $x et $y sont la même variable</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertPattern($p, $x)</span></td>
+<td>Echoue sauf si l'expression rationnelle $p capture $x</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertNoPattern($p, $x)</span></td>
+<td>Echoue si l'expression rationnelle $p capture $x</td>
+</tr>
+                <tr>
+<td><span class="new_code">expectError($x)</span></td>
+<td>Echoue si l'erreur correspondante n'arrive pas</td>
+</tr>
+                <tr>
+<td><span class="new_code">expectException($x)</span></td>
+<td>Echoue si l'exception correspondante n'est pas levée</td>
+</tr>
+                <tr>
+<td><span class="new_code">ignoreException($x)</span></td>
+<td>Avale toutes les exceptions correspondantes qui surviendraient</td>
+</tr>
+                <tr>
+<td><span class="new_code">assert($e)</span></td>
+<td>Echoue sur un objet <a href="expectation_documentation.html">attente</a> $e qui échouerait</td>
+</tr>
+            </tbody></table>
+                Toutes les méthodes d'assertion peuvent recevoir
+                une description optionnelle :
+                cette description sert pour étiqueter le résultat.
+                Sans elle, une message par défaut est envoyée à la place :
+                il est généralement suffisant.
+                Ce message par défaut peut encore être encadré
+                dans votre propre message si vous incluez "%s"
+                dans la chaîne.
+                Toutes les assertions renvoient vrai / true en cas de succès
+                et faux / false en cas d'échec.
+            </p>
+            <p>
+                D'autres exemples...
+<pre>
+<strong>$variable = null;
+$this-&gt;assertNull($variable, 'Should be cleared');</strong>
+</pre>
+                ...passera et normalement n'affichera aucun message.
+                Si vous avez <a href="http://www.lastcraft.com/display_subclass_tutorial.php">
+                configuré le testeur pour afficher aussi les succès</a>
+                alors le message sera affiché comme tel.
+<pre>
+<strong>$this-&gt;assertIdentical(0, false, 'Zero is not false [%s]');</strong>
+</pre>
+                Ceci échouera étant donné qu'il effectue une vérification
+                sur le type en plus d'une comparaison sur les deux valeurs.
+                La partie "%s" est remplacée par le message d'erreur
+                par défaut qui aurait été affiché si nous n'avions pas fourni le nôtre.
+                Cela nous permet d'emboîter les messages de test.
+<pre>
+<strong>$a = 1;
+$b = $a;
+$this-&gt;assertReference($a, $b);</strong>
+</pre>
+                Échouera étant donné que la variable <span class="new_code">$b</span>
+                est une copie de <span class="new_code">$a</span>.
+<pre>
+<strong>$this-&gt;assertPattern('/hello/i', 'Hello world');</strong>
+</pre>
+                Là, ça passe puisque la recherche est insensible
+                à la casse et que donc <span class="new_code">hello</span>
+                est bien repérable dans <span class="new_code">Hello world</span>.
+<pre>
+<strong>$this-&gt;expectError();</strong>
+trigger_error('Catastrophe');
+</pre>
+                Ici la vérification attrape le message "Catastrophe"
+				sans vérifier le texte et passe.
+				Elle enlève l'erreur de la queue au passage.
+<pre>
+<strong>$this-&gt;expectError('Catastrophe');</strong>
+trigger_error('Catastrophe');
+</pre>
+                La vérification d'erreur suivante teste non seulement
+				l'existance de l'erreur mais aussi le texte qui,
+				dans le cas présent, correspond et donc un nouveau succès.
+				Si des erreurs non vérifiées sont laissées pour compte
+				à la fin d'une méthode de test alors un exception sera levé
+				dans le test.
+            </p>
+            <p>
+                Notez que SimpleTest ne peut pas attraper des erreurs PHP
+				au moment de la compilation.
+            </p>
+            <p>
+                Les scénarios de tests peuvent utiliser des méthodes
+                bien pratiques pour déboguer le code ou pour étendre la suite...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setUp()</span></td>
+<td>Est lancée avant chaque méthode de test</td>
+</tr>
+                    <tr>
+<td><span class="new_code">tearDown()</span></td>
+<td>Est lancée après chaque méthode de test</td>
+</tr>
+                    <tr>
+<td><span class="new_code">pass()</span></td>
+<td>Envoie un succès</td>
+</tr>
+                    <tr>
+<td><span class="new_code">fail()</span></td>
+<td>Envoie un échec</td>
+</tr>
+                    <tr>
+<td><span class="new_code">error()</span></td>
+<td>Envoi un évènement exception</td>
+</tr>
+                    <tr>
+<td><span class="new_code">signal($type, $payload)</span></td>
+<td>Envoie un message défini par l'utilisateur au rapporteur du test</td>
+</tr>
+                    <tr>
+<td><span class="new_code">dump($var)</span></td>
+<td>Effectue un <span class="new_code">print_r()</span> formaté pour du déboguage rapide et grossier</td>
+</tr>
+                </tbody></table>
+            </p>
+        
+        <h2>
+<a class="target" name="extension_unitaire"></a>Etendre les scénarios de test</h2>
+            <p>
+                Bien sûr des méthodes supplémentaires de test
+                peuvent être ajoutées pour créer d'autres types
+                de scénario de test afin d'étendre le framework...
+<pre>
+require_once('simpletest/autorun.php');
+<strong>
+class FileTester extends UnitTestCase {
+    function FileTester($name = false) {
+        $this-&gt;UnitTestCase($name);
+    }
+
+    function assertFileExists($filename, $message = '%s') {
+        $this-&gt;assertTrue(
+                file_exists($filename),
+                sprintf($message, 'File [$filename] existence check'));
+    }</strong>
+}
+</pre>
+                Ici la bibliothèque SimpleTest est localisée
+                dans un répertoire local appelé <em>simpletest</em>.
+                Pensez à le modifier pour votre propre environnement.
+            </p>
+            <p>
+                Alternativement vous pourriez utiliser dans votre code
+                un directive <span class="new_code">SimpleTestOptions::ignore('FileTester');</span>.
+            </p>
+            <p>
+                Ce nouveau scénario peut être hérité exactement
+                comme un scénario de test classique...
+<pre>
+class FileTestCase extends <strong>FileTester</strong> {
+
+    function setUp() {
+        @unlink('../temp/test.txt');
+    }
+
+    function tearDown() {
+        @unlink('../temp/test.txt');
+    }
+
+    function testCreation() {
+        $writer = &amp;new FileWriter('../temp/test.txt');
+        $writer-&gt;write('Hello');<strong>
+        $this-&gt;assertFileExists('../temp/test.txt');</strong>
+    }
+}
+</pre>
+            </p>
+            <p>
+                Si vous souhaitez un scénario de test sans
+                toutes les assertions de <span class="new_code">UnitTestCase</span>
+                mais uniquement avec les vôtres propres,
+                vous aurez besoin d'étendre la classe
+                <span class="new_code">SimpleTestCase</span> à la place.
+                Elle se trouve dans <em>simple_test.php</em>
+                en lieu et place de <em>unit_tester.php</em>.
+                A consulter <a href="group_test_documentation.html">plus tard</a>
+                si vous souhaitez incorporer les scénarios
+                d'autres testeurs unitaires dans votre suite de test.
+            </p>
+        
+        <h2>
+<a class="target" name="lancement_unitaire"></a>Lancer un unique scénario de test</h2>
+            <p>
+                Ce n'est pas souvent qu'il faille lancer des scénarios
+                avec un unique test. Sauf lorsqu'il s'agit de s'arracher
+                les cheveux sur un module à problème sans pour
+                autant désorganiser la suite de test principale.
+                Avec <em>autorun</em> aucun échafaudage particulier
+                n'est nécessaire, il suffit de lancer votre test et
+                vous y êtes.
+            </p>
+            <p>
+                Vous pouvez même décider quel rapporteur
+                (par exemple, <span class="new_code">TextReporter</span> ou <span class="new_code">HtmlReporter</span>)
+                vous préférez pour un fichier spécifique quand il est lancé
+                tout seul...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');<strong>
+SimpleTest :: prefer(new TextReporter());</strong>
+require_once('../classes/writer.php');
+
+class FileTestCase extends UnitTestCase {
+    ...
+}
+?&gt;
+</pre>
+                Ce script sera lancé tel que mais il n'y aura
+                aucun succès ou échec avant que des méthodes de test soient ajoutées.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page de SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API complète de SimpleTest</a>
+            à partir de PHPDoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/docs/fr/web_tester_documentation.html b/3rdparty/simpletest/docs/fr/web_tester_documentation.html
new file mode 100644
index 00000000000..308fbc9ccbb
--- /dev/null
+++ b/3rdparty/simpletest/docs/fr/web_tester_documentation.html
@@ -0,0 +1,570 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : tester des scripts web</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur le testeur web</h1>
+        This page...
+        <ul>
+<li>
+            Réussir à <a href="#telecharger">télécharger une page web</a>
+        </li>
+<li>
+            Tester le <a href="#contenu">contenu de la page</a>
+        </li>
+<li>
+            <a href="#navigation">Naviguer sur un site web</a> pendant le test
+        </li>
+<li>
+            Méthodes pour <a href="#requete">modifier une requête</a> et pour déboguer
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="telecharger"></a>Télécharger une page</h2>
+            <p>
+                Tester des classes c'est très bien.
+                Reste que PHP est avant tout un langage
+                pour créer des fonctionnalités à l'intérieur de pages web.
+                Comment pouvons tester la partie de devant
+                -- celle de l'interface -- dans nos applications en PHP ?
+                Etant donné qu'une page web n'est constituée que de texte,
+                nous devrions pouvoir les examiner exactement
+                comme n'importe quelle autre donnée de test.
+            </p>
+            <p>
+                Cela nous amène à une situation délicate.
+                Si nous testons dans un niveau trop bas,
+                vérifier des balises avec un motif ad hoc par exemple,
+                nos tests seront trop fragiles. Le moindre changement
+                dans la présentation pourrait casser un grand nombre de test.
+                Si nos tests sont situés trop haut, en utilisant
+                une version fantaisie du moteur de template pour
+                donner un cas précis, alors nous perdons complètement
+                la capacité à automatiser certaines classes de test.
+                Par exemple, l'interaction entre des formulaires
+                et la navigation devra être testé manuellement.
+                Ces types de test sont extrêmement fastidieux
+                et plutôt sensibles aux erreurs.
+            </p>
+            <p>
+                SimpleTest comprend une forme spéciale de scénario
+                de test pour tester les actions d'une page web.
+                <span class="new_code">WebTestCase</span> inclut des facilités pour la navigation,
+                des vérifications sur le contenu
+                et les cookies ainsi que la gestion des formulaires.
+                Utiliser ces scénarios de test ressemble
+                fortement à <span class="new_code">UnitTestCase</span>...
+<pre>
+<strong>class TestOfLastcraft extends WebTestCase {
+}</strong>
+</pre>
+                Ici nous sommes sur le point de tester
+                le site de <a href="http://www.lastcraft.com/">Last Craft</a>.
+                Si ce scénario de test est situé dans un fichier appelé
+                <em>lastcraft_test.php</em> alors il peut être chargé
+                dans un script de lancement tout comme des tests unitaires...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');<strong>
+require_once('simpletest/web_tester.php');</strong>
+SimpleTest::prefer(new TextReporter());
+
+class WebTests extends TestSuite {
+    function WebTests() {
+        $this-&gt;TestSuite('Web site tests');<strong>
+        $this-&gt;addFile('lastcraft_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                J'utilise ici le rapporteur en mode texte
+                pour mieux distinguer le contenu au format HTML
+                du résultat du test proprement dit.
+            </p>
+            <p>
+                Rien n'est encore testé. Nous pouvons télécharger
+                la page d'accueil en utilisant la méthode <span class="new_code">get()</span>...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    <strong>
+    function testHomepage() {
+        $this-&gt;assertTrue($this-&gt;get('http://www.lastcraft.com/'));
+    }</strong>
+}
+</pre>
+                La méthode <span class="new_code">get()</span> renverra "true"
+                uniquement si le contenu de la page a bien été téléchargé.
+                C'est un moyen simple, mais efficace pour vérifier
+                qu'une page web a bien été délivré par le serveur web.
+                Cependant le contenu peut révéler être une erreur 404
+                et dans ce cas notre méthode <span class="new_code">get()</span> renverrait encore un succès.
+            </p>
+            <p>
+                En supposant que le serveur web pour le site Last Craft
+                soit opérationnel (malheureusement ce n'est pas toujours le cas),
+                nous devrions voir...
+<pre class="shell">
+Web site tests
+OK
+Test cases run: 1/1, Failures: 0, Exceptions: 0
+</pre>
+                Nous avons vérifié qu'une page, de n'importe quel type,
+                a bien été renvoyée. Nous ne savons pas encore
+                s'il s'agit de celle que nous souhaitions.
+            </p>
+        
+        <h2>
+<a class="target" name="contenu"></a>Tester le contenu d'une page</h2>
+            <p>
+                Pour obtenir la confirmation que la page téléchargée
+                est bien celle que nous attendions,
+                nous devons vérifier son contenu.
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {<strong>
+        $this-&gt;get('http://www.lastcraft.com/');
+        $this-&gt;assertWantedPattern('/why the last craft/i');</strong>
+    }
+}
+</pre>
+                La page obtenue par le dernier téléchargement est
+                placée dans un buffer au sein même du scénario de test.
+                Il n'est donc pas nécessaire de s'y référer directement.
+                La correspondance du motif est toujours effectuée
+                par rapport à ce buffer.
+            </p>
+            <p>
+                Voici une liste possible d'assertions sur le contenu...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">assertWantedPattern($pattern)</span></td>
+<td>Vérifier une correspondance sur le contenu via une expression rationnelle Perl</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoUnwantedPattern($pattern)</span></td>
+<td>Une expression rationnelle Perl pour vérifier une absence</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertTitle($title)</span></td>
+<td>Passe si le titre de la page correspond exactement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertLink($label)</span></td>
+<td>Passe si un lien avec ce texte est présent</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoLink($label)</span></td>
+<td>Passe si aucun lien avec ce texte est présent</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertLinkById($id)</span></td>
+<td>Passe si un lien avec cet attribut d'identification est présent</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertField($name, $value)</span></td>
+<td>Passe si une balise input avec ce nom contient cette valeur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertFieldById($id, $value)</span></td>
+<td>Passe si une balise input avec cet identifiant contient cette valeur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertResponse($codes)</span></td>
+<td>Passe si la réponse HTTP trouve une correspondance dans la liste</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertMime($types)</span></td>
+<td>Passe si le type MIME se retrouve dans cette liste</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertAuthentication($protocol)</span></td>
+<td>Passe si l'authentification provoquée est de ce type de protocole</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoAuthentication()</span></td>
+<td>Passe s'il n'y pas d'authentification provoquée en cours</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertRealm($name)</span></td>
+<td>Passe si le domaine provoqué correspond</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertHeader($header, $content)</span></td>
+<td>Passe si une entête téléchargée correspond à cette valeur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoUnwantedHeader($header)</span></td>
+<td>Passe si une entête n'a pas été téléchargé</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertHeaderPattern($header, $pattern)</span></td>
+<td>Passe si une entête téléchargée correspond à cette expression rationnelle Perl</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertCookie($name, $value)</span></td>
+<td>Passe s'il existe un cookie correspondant</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoCookie($name)</span></td>
+<td>Passe s'il n'y a pas de cookie avec un tel nom</td>
+</tr>
+                </tbody></table>
+                Comme d'habitude avec les assertions de SimpleTest,
+                elles renvoient toutes "false" en cas d'échec
+                et "true" si c'est un succès.
+                Elles renvoient aussi un message de test optionnel :
+                vous pouvez l'ajouter dans votre propre message en utilisant "%s".
+            </p>
+            <p>
+                A présent nous pourrions effectué le test sur le titre uniquement...
+<pre>
+<strong>$this-&gt;assertTitle('The Last Craft?');</strong>
+</pre>
+                En plus d'une simple vérification sur le contenu HTML,
+                nous pouvons aussi vérifier que le type MIME est bien d'un type acceptable...
+<pre>
+<strong>$this-&gt;assertMime(array('text/plain', 'text/html'));</strong>
+</pre>
+                Plus intéressant encore est la vérification sur
+                le code de la réponse HTTP. Pareillement au type MIME,
+                nous pouvons nous assurer que le code renvoyé se trouve
+                bien dans un liste de valeurs possibles...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {
+        $this-&gt;get('http://simpletest.sourceforge.net/');<strong>
+        $this-&gt;assertResponse(200);</strong>
+    }
+}
+</pre>
+                Ici nous vérifions que le téléchargement s'est
+                bien terminé en ne permettant qu'une réponse HTTP 200.
+                Ce test passera, mais ce n'est pas la meilleure façon de procéder.
+                Il n'existe aucune page sur <em>http://simpletest.sourceforge.net/</em>,
+                à la place le serveur renverra une redirection vers
+                <em>http://www.lastcraft.com/simple_test.php</em>.
+                <span class="new_code">WebTestCase</span> suit automatiquement trois
+                de ces redirections. Les tests sont quelque peu plus
+                robustes de la sorte. Surtout qu'on est souvent plus intéressé
+                par l'interaction entre les pages que de leur simple livraison.
+                Si les redirections se révèlent être digne d'intérêt,
+                il reste possible de les supprimer...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {<strong>
+        $this-&gt;setMaximumRedirects(0);</strong>
+        $this-&gt;get('http://simpletest.sourceforge.net/');
+        $this-&gt;assertResponse(200);
+    }
+}
+</pre>
+                Alors l'assertion échoue comme prévue...
+<pre class="shell">
+Web site tests
+1) Expecting response in [200] got [302]
+    in testhomepage
+    in testoflastcraft
+    in lastcraft_test.php
+FAILURES!!!
+Test cases run: 1/1, Failures: 1, Exceptions: 0
+</pre>
+                Nous pouvons modifier le test pour accepter les redirections...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {
+        $this-&gt;setMaximumRedirects(0);
+        $this-&gt;get('http://simpletest.sourceforge.net/');
+        $this-&gt;assertResponse(<strong>array(301, 302, 303, 307)</strong>);
+    }
+}
+</pre>
+                Maitenant ça passe.
+            </p>
+        
+        <h2>
+<a class="target" name="navigation"></a>Navigeur dans un site web</h2>
+            <p>
+                Les utilisateurs ne naviguent pas souvent en tapant les URLs,
+                mais surtout en cliquant sur des liens et des boutons.
+                Ici nous confirmons que les informations sur le contact
+                peuvent être atteintes depuis la page d'accueil...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    ...
+    function testContact() {
+        $this-&gt;get('http://www.lastcraft.com/');<strong>
+        $this-&gt;clickLink('About');
+        $this-&gt;assertTitle('About Last Craft');</strong>
+    }
+}
+</pre>
+                Le paramètre est le texte du lien.
+            </p>
+            <p>
+                Il l'objectif est un bouton plutôt qu'une balise ancre,
+                alors <span class="new_code">clickSubmit()</span> doit être utilisé avec
+                le titre du bouton...
+<pre>
+<strong>$this-&gt;clickSubmit('Go!');</strong>
+</pre>
+            </p>
+            <p>
+                La liste des méthodes de navigation est...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">get($url, $parameters)</span></td>
+<td>Envoie une requête GET avec ces paramètres</td>
+</tr>
+                    <tr>
+<td><span class="new_code">post($url, $parameters)</span></td>
+<td>Envoie une requête POST avec ces paramètres</td>
+</tr>
+                    <tr>
+<td><span class="new_code">head($url, $parameters)</span></td>
+<td>Envoie une requête HEAD sans remplacer le contenu de la page</td>
+</tr>
+                    <tr>
+<td><span class="new_code">retry()</span></td>
+<td>Relance la dernière requête</td>
+</tr>
+                    <tr>
+<td><span class="new_code">back()</span></td>
+<td>Identique au bouton "Précédent" du navigateur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">forward()</span></td>
+<td>Identique au bouton "Suivant" du navigateur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">authenticate($name, $password)</span></td>
+<td>Re-essaye avec une tentative d'authentification</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFrameFocus()</span></td>
+<td>Le nom de la fenêtre en cours d'utilisation</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocusByIndex($choice)</span></td>
+<td>Change le focus d'une fenêtre en commençant par 1</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocus($name)</span></td>
+<td>Change le focus d'une fenêtre en utilisant son nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clearFrameFocus()</span></td>
+<td>Revient à un traitement de toutes les fenêtres comme une seule</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmit($label)</span></td>
+<td>Clique sur le premier bouton avec cette étiquette</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitByName($name)</span></td>
+<td>Clique sur le bouton avec cet attribut de nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitById($id)</span></td>
+<td>Clique sur le bouton avec cet attribut d'identification</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImage($label, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son titre (title="*") our son texte alternatif (alt="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageByName($name, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son attribut (name="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageById($id, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son identifiant (id="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">submitFormById($id)</span></td>
+<td>Soumet un formulaire sans valeur de soumission</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLink($label, $index)</span></td>
+<td>Clique sur une ancre avec ce texte d'étiquette visible</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLinkById($id)</span></td>
+<td>Clique sur une ancre avec cet attribut d'identification</td>
+</tr>
+                </tbody></table>
+            </p>
+            <p>
+                Les paramètres dans les méthodes <span class="new_code">get()</span>, 
+                <span class="new_code">post()</span> et <span class="new_code">head()</span> sont optionnels.
+                Le téléchargement via  HTTP HEAD ne modifie pas
+                le contexte du navigateur, il se limite au chargement des cookies.
+                Cela peut être utilise lorsqu'une image ou une feuille de style
+                initie un cookie pour bloquer un robot trop entreprenant.
+            </p>
+            <p>
+                Les commandes <span class="new_code">retry()</span>, <span class="new_code">back()</span>
+                et <span class="new_code">forward()</span> fonctionnent exactement comme
+                dans un navigateur. Elles utilisent l'historique pour
+                relancer les pages. Une technique bien pratique pour
+                vérifier les effets d'un bouton retour sur vos formulaires.
+            </p>
+            <p>
+                Les méthodes sur les fenêtres méritent une petite explication.
+                Par défaut, une page avec des fenêtres est traitée comme toutes
+                les autres. Le contenu sera vérifié à travers l'ensemble de
+                la "frameset", par conséquent un lien fonctionnera,
+                peu importe la fenêtre qui contient la balise ancre.
+                Vous pouvez outrepassé ce comportement en exigeant
+                le focus sur une unique fenêtre. Si vous réalisez cela,
+                toutes les recherches et toutes les actions se limiteront
+                à cette unique fenêtre, y compris les demandes d'authentification.
+                Si un lien ou un bouton n'est pas dans la fenêtre en focus alors
+                il ne peut pas être cliqué.
+            </p>
+            <p>
+                Tester la navigation sur des pages fixes ne vous alerte que
+                quand vous avez cassé un script entier.
+                Pour des pages fortement dynamiques,
+                un forum de discussion par exemple,
+                ça peut être crucial pour vérifier l'état de l'application.
+                Pour la plupart des applications cependant,
+                la logique vraiment délicate se situe dans la gestion
+                des formulaires et des sessions.
+                Heureusement SimpleTest aussi inclut
+                <a href="form_testing_documentation.html">
+                des outils pour tester des formulaires web</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="requete"></a>Modifier la requête</h2>
+            <p>
+                Bien que SimpleTest n'ait pas comme objectif
+                de contrôler des erreurs réseau, il contient quand même
+                des méthodes pour modifier et déboguer les requêtes qu'il lance.
+                Voici une autre liste de méthode...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">getTransportError()</span></td>
+<td>La dernière erreur de socket</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>La localisation courante</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showRequest()</span></td>
+<td>Déverse la requête sortante</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showHeaders()</span></td>
+<td>Déverse les entêtes d'entrée</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showSource()</span></td>
+<td>Déverse le contenu brut de la page HTML</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreFrames()</span></td>
+<td>Ne recharge pas les framesets</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setCookie($name, $value)</span></td>
+<td>Initie un cookie à partir de maintenant</td>
+</tr>
+                    <tr>
+<td><span class="new_code">addHeader($header)</span></td>
+<td>Ajoute toujours cette entête à la requête</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumRedirects($max)</span></td>
+<td>S'arrête après autant de redirections</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setConnectionTimeout($timeout)</span></td>
+<td>Termine la connexion après autant de temps entre les bytes</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useProxy($proxy, $name, $password)</span></td>
+<td>Effectue les requêtes à travers ce proxy d'URL</td>
+</tr>
+                </tbody></table>
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API du développeur pour SimpleTest</a>
+            donne tous les détails sur les classes et les assertions disponibles.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/3rdparty/simpletest/dumper.php b/3rdparty/simpletest/dumper.php
new file mode 100755
index 00000000000..339923c224f
--- /dev/null
+++ b/3rdparty/simpletest/dumper.php
@@ -0,0 +1,407 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: dumper.php 1909 2009-07-29 15:58:11Z dgheath $
+ */
+/**
+ * does type matter
+ */
+if (! defined('TYPE_MATTERS')) {
+    define('TYPE_MATTERS', true);
+}
+
+/**
+ *    Displays variables as text and does diffs.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleDumper {
+
+    /**
+     *    Renders a variable in a shorter form than print_r().
+     *    @param mixed $value      Variable to render as a string.
+     *    @return string           Human readable string form.
+     *    @access public
+     */
+    function describeValue($value) {
+        $type = $this->getType($value);
+        switch($type) {
+            case "Null":
+                return "NULL";
+            case "Boolean":
+                return "Boolean: " . ($value ? "true" : "false");
+            case "Array":
+                return "Array: " . count($value) . " items";
+            case "Object":
+                return "Object: of " . get_class($value);
+            case "String":
+                return "String: " . $this->clipString($value, 200);
+            default:
+                return "$type: $value";
+        }
+        return "Unknown";
+    }
+
+    /**
+     *    Gets the string representation of a type.
+     *    @param mixed $value    Variable to check against.
+     *    @return string         Type.
+     *    @access public
+     */
+    function getType($value) {
+        if (! isset($value)) {
+            return "Null";
+        } elseif (is_bool($value)) {
+            return "Boolean";
+        } elseif (is_string($value)) {
+            return "String";
+        } elseif (is_integer($value)) {
+            return "Integer";
+        } elseif (is_float($value)) {
+            return "Float";
+        } elseif (is_array($value)) {
+            return "Array";
+        } elseif (is_resource($value)) {
+            return "Resource";
+        } elseif (is_object($value)) {
+            return "Object";
+        }
+        return "Unknown";
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between two variables. Uses a
+     *    dynamic call.
+     *    @param mixed $first        First variable.
+     *    @param mixed $second       Value to compare with.
+     *    @param boolean $identical  If true then type anomolies count.
+     *    @return string             Description of difference.
+     *    @access public
+     */
+    function describeDifference($first, $second, $identical = false) {
+        if ($identical) {
+            if (! $this->isTypeMatch($first, $second)) {
+                return "with type mismatch as [" . $this->describeValue($first) .
+                    "] does not match [" . $this->describeValue($second) . "]";
+            }
+        }
+        $type = $this->getType($first);
+        if ($type == "Unknown") {
+            return "with unknown type";
+        }
+        $method = 'describe' . $type . 'Difference';
+        return $this->$method($first, $second, $identical);
+    }
+
+    /**
+     *    Tests to see if types match.
+     *    @param mixed $first        First variable.
+     *    @param mixed $second       Value to compare with.
+     *    @return boolean            True if matches.
+     *    @access private
+     */
+    protected function isTypeMatch($first, $second) {
+        return ($this->getType($first) == $this->getType($second));
+    }
+
+    /**
+     *    Clips a string to a maximum length.
+     *    @param string $value         String to truncate.
+     *    @param integer $size         Minimum string size to show.
+     *    @param integer $position     Centre of string section.
+     *    @return string               Shortened version.
+     *    @access public
+     */
+    function clipString($value, $size, $position = 0) {
+        $length = strlen($value);
+        if ($length <= $size) {
+            return $value;
+        }
+        $position = min($position, $length);
+        $start = ($size/2 > $position ? 0 : $position - $size/2);
+        if ($start + $size > $length) {
+            $start = $length - $size;
+        }
+        $value = substr($value, $start, $size);
+        return ($start > 0 ? "..." : "") . $value . ($start + $size < $length ? "..." : "");
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between two variables. The minimal
+     *    version.
+     *    @param null $first          First value.
+     *    @param mixed $second        Value to compare with.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeGenericDifference($first, $second) {
+        return "as [" . $this->describeValue($first) .
+                "] does not match [" .
+                $this->describeValue($second) . "]";
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between a null and another variable.
+     *    @param null $first          First null.
+     *    @param mixed $second        Null to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeNullDifference($first, $second, $identical) {
+        return $this->describeGenericDifference($first, $second);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between a boolean and another variable.
+     *    @param boolean $first       First boolean.
+     *    @param mixed $second        Boolean to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeBooleanDifference($first, $second, $identical) {
+        return $this->describeGenericDifference($first, $second);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between a string and another variable.
+     *    @param string $first        First string.
+     *    @param mixed $second        String to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeStringDifference($first, $second, $identical) {
+        if (is_object($second) || is_array($second)) {
+            return $this->describeGenericDifference($first, $second);
+        }
+        $position = $this->stringDiffersAt($first, $second);
+        $message = "at character $position";
+        $message .= " with [" .
+                $this->clipString($first, 200, $position) . "] and [" .
+                $this->clipString($second, 200, $position) . "]";
+        return $message;
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between an integer and another variable.
+     *    @param integer $first       First number.
+     *    @param mixed $second        Number to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeIntegerDifference($first, $second, $identical) {
+        if (is_object($second) || is_array($second)) {
+            return $this->describeGenericDifference($first, $second);
+        }
+        return "because [" . $this->describeValue($first) .
+                "] differs from [" .
+                $this->describeValue($second) . "] by " .
+                abs($first - $second);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between two floating point numbers.
+     *    @param float $first         First float.
+     *    @param mixed $second        Float to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeFloatDifference($first, $second, $identical) {
+        if (is_object($second) || is_array($second)) {
+            return $this->describeGenericDifference($first, $second);
+        }
+        return "because [" . $this->describeValue($first) .
+                "] differs from [" .
+                $this->describeValue($second) . "] by " .
+                abs($first - $second);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between two arrays.
+     *    @param array $first         First array.
+     *    @param mixed $second        Array to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeArrayDifference($first, $second, $identical) {
+        if (! is_array($second)) {
+            return $this->describeGenericDifference($first, $second);
+        }
+        if (! $this->isMatchingKeys($first, $second, $identical)) {
+            return "as key list [" .
+                    implode(", ", array_keys($first)) . "] does not match key list [" .
+                    implode(", ", array_keys($second)) . "]";
+        }
+        foreach (array_keys($first) as $key) {
+            if ($identical && ($first[$key] === $second[$key])) {
+                continue;
+            }
+            if (! $identical && ($first[$key] == $second[$key])) {
+                continue;
+            }
+            return "with member [$key] " . $this->describeDifference(
+                    $first[$key],
+                    $second[$key],
+                    $identical);
+        }
+        return "";
+    }
+
+    /**
+     *    Compares two arrays to see if their key lists match.
+     *    For an identical match, the ordering and types of the keys
+     *    is significant.
+     *    @param array $first         First array.
+     *    @param array $second        Array to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return boolean             True if matching.
+     *    @access private
+     */
+    protected function isMatchingKeys($first, $second, $identical) {
+        $first_keys = array_keys($first);
+        $second_keys = array_keys($second);
+        if ($identical) {
+            return ($first_keys === $second_keys);
+        }
+        sort($first_keys);
+        sort($second_keys);
+        return ($first_keys == $second_keys);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between a resource and another variable.
+     *    @param resource $first       First resource.
+     *    @param mixed $second         Resource to compare with.
+     *    @param boolean $identical    If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeResourceDifference($first, $second, $identical) {
+        return $this->describeGenericDifference($first, $second);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between two objects.
+     *    @param object $first        First object.
+     *    @param mixed $second        Object to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     */
+    protected function describeObjectDifference($first, $second, $identical) {
+        if (! is_object($second)) {
+            return $this->describeGenericDifference($first, $second);
+        }
+        return $this->describeArrayDifference(
+                $this->getMembers($first),
+                $this->getMembers($second),
+                $identical);
+    }
+
+    /**
+     *    Get all members of an object including private and protected ones.
+     *    A safer form of casting to an array.
+     *    @param object $object     Object to list members of,
+     *                              including private ones.
+     *    @return array             Names and values in the object.
+     */
+    protected function getMembers($object) {
+        $reflection = new ReflectionObject($object);
+        $members = array();
+        foreach ($reflection->getProperties() as $property) {
+            if (method_exists($property, 'setAccessible')) {
+                $property->setAccessible(true);
+            }
+            try {
+                $members[$property->getName()] = $property->getValue($object);
+            } catch (ReflectionException $e) {
+                $members[$property->getName()] =
+                    $this->getPrivatePropertyNoMatterWhat($property->getName(), $object);
+            }
+        }
+        return $members;
+    }
+
+    /**
+     *    Extracts a private member's value when reflection won't play ball.
+     *    @param string $name        Property name.
+     *    @param object $object      Object to read.
+     *    @return mixed              Value of property.
+     */
+    private function getPrivatePropertyNoMatterWhat($name, $object) {
+        foreach ((array)$object as $mangled_name => $value) {
+            if ($this->unmangle($mangled_name) == $name) {
+                return $value;
+            }
+        }
+    }
+
+    /**
+     *    Removes crud from property name after it's been converted
+     *    to an array.
+     *    @param string $mangled     Name from array cast.
+     *    @return string             Cleaned up name.
+     */
+    function unmangle($mangled) {
+        $parts = preg_split('/[^a-zA-Z0-9_\x7f-\xff]+/', $mangled);
+        return array_pop($parts);
+    }
+
+    /**
+     *    Find the first character position that differs
+     *    in two strings by binary chop.
+     *    @param string $first        First string.
+     *    @param string $second       String to compare with.
+     *    @return integer             Position of first differing
+     *                                character.
+     *    @access private
+     */
+    protected function stringDiffersAt($first, $second) {
+        if (! $first || ! $second) {
+            return 0;
+        }
+        if (strlen($first) < strlen($second)) {
+            list($first, $second) = array($second, $first);
+        }
+        $position = 0;
+        $step = strlen($first);
+        while ($step > 1) {
+            $step = (integer)(($step + 1) / 2);
+            if (strncmp($first, $second, $position + $step) == 0) {
+                $position += $step;
+            }
+        }
+        return $position;
+    }
+
+    /**
+     *    Sends a formatted dump of a variable to a string.
+     *    @param mixed $variable    Variable to display.
+     *    @return string            Output from print_r().
+     *    @access public
+     */
+    function dump($variable) {
+        ob_start();
+        print_r($variable);
+        $formatted = ob_get_contents();
+        ob_end_clean();
+        return $formatted;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/eclipse.php b/3rdparty/simpletest/eclipse.php
new file mode 100644
index 00000000000..20bd4530bb6
--- /dev/null
+++ b/3rdparty/simpletest/eclipse.php
@@ -0,0 +1,307 @@
+<?php
+/**
+ *  base include file for eclipse plugin
+ *  @package    SimpleTest
+ *  @subpackage Eclipse
+ *  @version    $Id: eclipse.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+/**#@+
+ * simpletest include files
+ */
+include_once 'unit_tester.php';
+include_once 'test_case.php';
+include_once 'invoker.php';
+include_once 'socket.php';
+include_once 'mock_objects.php';
+/**#@-*/
+
+/**
+ *  base reported class for eclipse plugin
+ *  @package    SimpleTest
+ *  @subpackage Eclipse
+ */
+class EclipseReporter extends SimpleScorer {
+
+    /**
+     *    Reporter to be run inside of Eclipse interface.
+     *    @param object $listener   Eclipse listener (?).
+     *    @param boolean $cc        Whether to include test coverage.
+     */
+    function __construct(&$listener, $cc=false){
+        $this->listener = &$listener;
+        $this->SimpleScorer();
+        $this->case = "";
+        $this->group = "";
+        $this->method = "";
+        $this->cc = $cc;
+        $this->error = false;
+        $this->fail = false;
+    }
+
+    /**
+     *    Means to display human readable object comparisons.
+     *    @return SimpleDumper        Visual comparer.
+     */
+    function getDumper() {
+        return new SimpleDumper();
+    }
+
+    /**
+     *    Localhost connection from Eclipse.
+     *    @param integer $port      Port to connect to Eclipse.
+     *    @param string $host       Normally localhost.
+     *    @return SimpleSocket      Connection to Eclipse.
+     */
+    function &createListener($port, $host="127.0.0.1"){
+        $tmplistener = &new SimpleSocket($host, $port, 5);
+        return $tmplistener;
+    }
+
+    /**
+     *    Wraps the test in an output buffer.
+     *    @param SimpleInvoker $invoker     Current test runner.
+     *    @return EclipseInvoker            Decorator with output buffering.
+     *    @access public
+     */
+    function &createInvoker(&$invoker){
+        $eclinvoker = &new EclipseInvoker($invoker, $this->listener);
+        return $eclinvoker;
+    }
+
+    /**
+     *    C style escaping.
+     *    @param string $raw    String with backslashes, quotes and whitespace.
+     *    @return string        Replaced with C backslashed tokens.
+     */
+    function escapeVal($raw){
+        $needle = array("\\","\"","/","\b","\f","\n","\r","\t");
+        $replace = array('\\\\','\"','\/','\b','\f','\n','\r','\t');
+        return str_replace($needle, $replace, $raw);
+    }
+
+    /**
+     *    Stash the first passing item. Clicking the test
+     *    item goes to first pass.
+     *    @param string $message    Test message, but we only wnat the first.
+     *    @access public
+     */
+    function paintPass($message){
+        if (! $this->pass){
+            $this->message = $this->escapeVal($message);
+        }
+        $this->pass = true;
+    }
+
+    /**
+     *    Stash the first failing item. Clicking the test
+     *    item goes to first fail.
+     *    @param string $message    Test message, but we only wnat the first.
+     *    @access public
+     */
+    function paintFail($message){
+        //only get the first failure or error
+        if (! $this->fail && ! $this->error){
+            $this->fail = true;
+            $this->message = $this->escapeVal($message);
+            $this->listener->write('{status:"fail",message:"'.$this->message.'",group:"'.$this->group.'",case:"'.$this->case.'",method:"'.$this->method.'"}');
+        }
+    }
+
+    /**
+     *    Stash the first error. Clicking the test
+     *    item goes to first error.
+     *    @param string $message    Test message, but we only wnat the first.
+     *    @access public
+     */
+    function paintError($message){
+        if (! $this->fail && ! $this->error){
+            $this->error = true;
+            $this->message = $this->escapeVal($message);
+            $this->listener->write('{status:"error",message:"'.$this->message.'",group:"'.$this->group.'",case:"'.$this->case.'",method:"'.$this->method.'"}');
+        }
+    }
+
+
+    /**
+     *    Stash the first exception. Clicking the test
+     *    item goes to first message.
+     *    @param string $message    Test message, but we only wnat the first.
+     *    @access public
+     */
+    function paintException($exception){
+        if (! $this->fail && ! $this->error){
+            $this->error = true;
+            $message = 'Unexpected exception of type[' . get_class($exception) .
+                    '] with message [' . $exception->getMessage() . '] in [' .
+                    $exception->getFile() .' line '. $exception->getLine() . ']';
+            $this->message = $this->escapeVal($message);
+            $this->listener->write(
+                    '{status:"error",message:"' . $this->message . '",group:"' .
+                    $this->group . '",case:"' . $this->case . '",method:"' . $this->method
+                    . '"}');
+        }
+    }
+
+
+    /**
+     *    We don't display any special header.
+     *    @param string $test_name     First test top level
+     *                                 to start.
+     *    @access public
+     */
+    function paintHeader($test_name) {
+    }
+
+    /**
+     *    We don't display any special footer.
+     *    @param string $test_name        The top level test.
+     *    @access public
+     */
+    function paintFooter($test_name) {
+    }
+
+    /**
+     *    Paints nothing at the start of a test method, but stash
+     *    the method name for later.
+     *    @param string $test_name   Name of test that is starting.
+     *    @access public
+     */
+    function paintMethodStart($method) {
+        $this->pass = false;
+        $this->fail = false;
+        $this->error = false;
+        $this->method = $this->escapeVal($method);
+    }
+
+    /**
+     *    Only send one message if the test passes, after that
+     *    suppress the message.
+     *    @param string $test_name   Name of test that is ending.
+     *    @access public
+     */
+    function paintMethodEnd($method){
+        if ($this->fail || $this->error || ! $this->pass){
+        } else {
+            $this->listener->write(
+                        '{status:"pass",message:"' . $this->message . '",group:"' .
+                        $this->group . '",case:"' . $this->case . '",method:"' .
+                        $this->method . '"}');
+        }
+    }
+
+    /**
+     *    Stashes the test case name for the later failure message.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseStart($case){
+        $this->case = $this->escapeVal($case);
+    }
+
+    /**
+     *    Drops the name.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseEnd($case){
+        $this->case = "";
+    }
+
+    /**
+     *    Stashes the name of the test suite. Starts test coverage
+     *    if enabled.
+     *    @param string $group     Name of test or other label.
+     *    @param integer $size     Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($group, $size){
+        $this->group = $this->escapeVal($group);
+        if ($this->cc){
+            if (extension_loaded('xdebug')){
+                xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
+            }
+        }
+    }
+
+    /**
+     *    Paints coverage report if enabled.
+     *    @param string $group     Name of test or other label.
+     *    @access public
+     */
+    function paintGroupEnd($group){
+        $this->group = "";
+        $cc = "";
+        if ($this->cc){
+            if (extension_loaded('xdebug')){
+                $arrfiles = xdebug_get_code_coverage();
+                xdebug_stop_code_coverage();
+                $thisdir = dirname(__FILE__);
+                $thisdirlen = strlen($thisdir);
+                foreach ($arrfiles as $index=>$file){
+                    if (substr($index, 0, $thisdirlen)===$thisdir){
+                        continue;
+                    }
+                    $lcnt = 0;
+                    $ccnt = 0;
+                    foreach ($file as $line){
+                        if ($line == -2){
+                            continue;
+                        }
+                        $lcnt++;
+                        if ($line==1){
+                            $ccnt++;
+                        }
+                    }
+                    if ($lcnt > 0){
+                        $cc .= round(($ccnt/$lcnt) * 100, 2) . '%';
+                    }else{
+                        $cc .= "0.00%";
+                    }
+                    $cc.= "\t". $index . "\n";
+                }
+            }
+        }
+        $this->listener->write('{status:"coverage",message:"' .
+                                EclipseReporter::escapeVal($cc) . '"}');
+    }
+}
+
+/**
+ *  Invoker decorator for Eclipse. Captures output until
+ *  the end of the test.
+ *  @package    SimpleTest
+ *  @subpackage Eclipse
+ */
+class EclipseInvoker extends SimpleInvokerDecorator{
+    function __construct(&$invoker, &$listener) {
+        $this->listener = &$listener;
+        $this->SimpleInvokerDecorator($invoker);
+    }
+
+    /**
+     *    Starts output buffering.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function before($method){
+        ob_start();
+        $this->invoker->before($method);
+    }
+
+    /**
+     *    Stops output buffering and send the captured output
+     *    to the listener.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function after($method) {
+        $this->invoker->after($method);
+        $output = ob_get_contents();
+        ob_end_clean();
+        if ($output !== ""){
+            $result = $this->listener->write('{status:"info",message:"' .
+                                              EclipseReporter::escapeVal($output) . '"}');
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/encoding.php b/3rdparty/simpletest/encoding.php
new file mode 100644
index 00000000000..cadc84e7a3b
--- /dev/null
+++ b/3rdparty/simpletest/encoding.php
@@ -0,0 +1,649 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: encoding.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/socket.php');
+/**#@-*/
+
+/**
+ *    Single post parameter.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleEncodedPair {
+    private $key;
+    private $value;
+
+    /**
+     *    Stashes the data for rendering later.
+     *    @param string $key       Form element name.
+     *    @param string $value     Data to send.
+     */
+    function __construct($key, $value) {
+        $this->key = $key;
+        $this->value = $value;
+    }
+
+    /**
+     *    The pair as a single string.
+     *    @return string        Encoded pair.
+     *    @access public
+     */
+    function asRequest() {
+        return urlencode($this->key) . '=' . urlencode($this->value);
+    }
+
+    /**
+     *    The MIME part as a string.
+     *    @return string        MIME part encoding.
+     *    @access public
+     */
+    function asMime() {
+        $part = 'Content-Disposition: form-data; ';
+        $part .= "name=\"" . $this->key . "\"\r\n";
+        $part .= "\r\n" . $this->value;
+        return $part;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @param string $key    Identifier.
+     *    @return boolean       True if matched.
+     *    @access public
+     */
+    function isKey($key) {
+        return $key == $this->key;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @return string       Identifier.
+     *    @access public
+     */
+    function getKey() {
+        return $this->key;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @return string       Content.
+     *    @access public
+     */
+    function getValue() {
+        return $this->value;
+    }
+}
+
+/**
+ *    Single post parameter.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleAttachment {
+    private $key;
+    private $content;
+    private $filename;
+
+    /**
+     *    Stashes the data for rendering later.
+     *    @param string $key          Key to add value to.
+     *    @param string $content      Raw data.
+     *    @param hash $filename       Original filename.
+     */
+    function __construct($key, $content, $filename) {
+        $this->key = $key;
+        $this->content = $content;
+        $this->filename = $filename;
+    }
+
+    /**
+     *    The pair as a single string.
+     *    @return string        Encoded pair.
+     *    @access public
+     */
+    function asRequest() {
+        return '';
+    }
+
+    /**
+     *    The MIME part as a string.
+     *    @return string        MIME part encoding.
+     *    @access public
+     */
+    function asMime() {
+        $part = 'Content-Disposition: form-data; ';
+        $part .= 'name="' . $this->key . '"; ';
+        $part .= 'filename="' . $this->filename . '"';
+        $part .= "\r\nContent-Type: " . $this->deduceMimeType();
+        $part .= "\r\n\r\n" . $this->content;
+        return $part;
+    }
+
+    /**
+     *    Attempts to figure out the MIME type from the
+     *    file extension and the content.
+     *    @return string        MIME type.
+     *    @access private
+     */
+    protected function deduceMimeType() {
+        if ($this->isOnlyAscii($this->content)) {
+            return 'text/plain';
+        }
+        return 'application/octet-stream';
+    }
+
+    /**
+     *    Tests each character is in the range 0-127.
+     *    @param string $ascii    String to test.
+     *    @access private
+     */
+    protected function isOnlyAscii($ascii) {
+        for ($i = 0, $length = strlen($ascii); $i < $length; $i++) {
+            if (ord($ascii[$i]) > 127) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @param string $key    Identifier.
+     *    @return boolean       True if matched.
+     *    @access public
+     */
+    function isKey($key) {
+        return $key == $this->key;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @return string       Identifier.
+     *    @access public
+     */
+    function getKey() {
+        return $this->key;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @return string       Content.
+     *    @access public
+     */
+    function getValue() {
+        return $this->filename;
+    }
+}
+
+/**
+ *    Bundle of GET/POST parameters. Can include
+ *    repeated parameters.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleEncoding {
+    private $request;
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false) {
+        if (! $query) {
+            $query = array();
+        }
+        $this->clear();
+        $this->merge($query);
+    }
+
+    /**
+     *    Empties the request of parameters.
+     *    @access public
+     */
+    function clear() {
+        $this->request = array();
+    }
+
+    /**
+     *    Adds a parameter to the query.
+     *    @param string $key            Key to add value to.
+     *    @param string/array $value    New data.
+     *    @access public
+     */
+    function add($key, $value) {
+        if ($value === false) {
+            return;
+        }
+        if (is_array($value)) {
+            foreach ($value as $item) {
+                $this->addPair($key, $item);
+            }
+        } else {
+            $this->addPair($key, $value);
+        }
+    }
+
+    /**
+     *    Adds a new value into the request.
+     *    @param string $key            Key to add value to.
+     *    @param string/array $value    New data.
+     *    @access private
+     */
+    protected function addPair($key, $value) {
+        $this->request[] = new SimpleEncodedPair($key, $value);
+    }
+
+    /**
+     *    Adds a MIME part to the query. Does nothing for a
+     *    form encoded packet.
+     *    @param string $key          Key to add value to.
+     *    @param string $content      Raw data.
+     *    @param hash $filename       Original filename.
+     *    @access public
+     */
+    function attach($key, $content, $filename) {
+        $this->request[] = new SimpleAttachment($key, $content, $filename);
+    }
+
+    /**
+     *    Adds a set of parameters to this query.
+     *    @param array/SimpleQueryString $query  Multiple values are
+     *                                           as lists on a single key.
+     *    @access public
+     */
+    function merge($query) {
+        if (is_object($query)) {
+            $this->request = array_merge($this->request, $query->getAll());
+        } elseif (is_array($query)) {
+            foreach ($query as $key => $value) {
+                $this->add($key, $value);
+            }
+        }
+    }
+
+    /**
+     *    Accessor for single value.
+     *    @return string/array    False if missing, string
+     *                            if present and array if
+     *                            multiple entries.
+     *    @access public
+     */
+    function getValue($key) {
+        $values = array();
+        foreach ($this->request as $pair) {
+            if ($pair->isKey($key)) {
+                $values[] = $pair->getValue();
+            }
+        }
+        if (count($values) == 0) {
+            return false;
+        } elseif (count($values) == 1) {
+            return $values[0];
+        } else {
+            return $values;
+        }
+    }
+
+    /**
+     *    Accessor for listing of pairs.
+     *    @return array        All pair objects.
+     *    @access public
+     */
+    function getAll() {
+        return $this->request;
+    }
+
+    /**
+     *    Renders the query string as a URL encoded
+     *    request part.
+     *    @return string        Part of URL.
+     *    @access protected
+     */
+    protected function encode() {
+        $statements = array();
+        foreach ($this->request as $pair) {
+            if ($statement = $pair->asRequest()) {
+                $statements[] = $statement;
+            }
+        }
+        return implode('&', $statements);
+    }
+}
+
+/**
+ *    Bundle of GET parameters. Can include
+ *    repeated parameters.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleGetEncoding extends SimpleEncoding {
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false) {
+        parent::__construct($query);
+    }
+
+    /**
+     *    HTTP request method.
+     *    @return string        Always GET.
+     *    @access public
+     */
+    function getMethod() {
+        return 'GET';
+    }
+
+    /**
+     *    Writes no extra headers.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeHeadersTo(&$socket) {
+    }
+
+    /**
+     *    No data is sent to the socket as the data is encoded into
+     *    the URL.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeTo(&$socket) {
+    }
+
+    /**
+     *    Renders the query string as a URL encoded
+     *    request part for attaching to a URL.
+     *    @return string        Part of URL.
+     *    @access public
+     */
+    function asUrlRequest() {
+        return $this->encode();
+    }
+}
+
+/**
+ *    Bundle of URL parameters for a HEAD request.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHeadEncoding extends SimpleGetEncoding {
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false) {
+        parent::__construct($query);
+    }
+
+    /**
+     *    HTTP request method.
+     *    @return string        Always HEAD.
+     *    @access public
+     */
+    function getMethod() {
+        return 'HEAD';
+    }
+}
+
+/**
+ *    Bundle of URL parameters for a DELETE request.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleDeleteEncoding extends SimpleGetEncoding {
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false) {
+        parent::__construct($query);
+    }
+
+    /**
+     *    HTTP request method.
+     *    @return string        Always DELETE.
+     *    @access public
+     */
+    function getMethod() {
+        return 'DELETE';
+    }
+}
+
+/**
+ *    Bundles an entity-body for transporting
+ *    a raw content payload with the request.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleEntityEncoding extends SimpleEncoding {
+    private $content_type;
+    private $body;
+
+    function __construct($query = false, $content_type = false) {
+        $this->content_type = $content_type;
+    	if (is_string($query)) {
+            $this->body = $query;
+            parent::__construct();
+        } else {
+            parent::__construct($query);
+        }
+    }
+
+    /**
+     *    Returns the media type of the entity body
+     *    @return string
+     *    @access public
+     */
+    function getContentType() {
+        if (!$this->content_type) {
+        	return ($this->body) ? 'text/plain' : 'application/x-www-form-urlencoded';
+        }
+    	return $this->content_type;
+    }
+
+    /**
+     *    Dispatches the form headers down the socket.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeHeadersTo(&$socket) {
+        $socket->write("Content-Length: " . (integer)strlen($this->encode()) . "\r\n");
+        $socket->write("Content-Type: " .  $this->getContentType() . "\r\n");
+    }
+
+    /**
+     *    Dispatches the form data down the socket.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeTo(&$socket) {
+        $socket->write($this->encode());
+    }
+
+    /**
+     *    Renders the request body
+     *    @return Encoded entity body
+     *    @access protected
+     */
+    protected function encode() {
+        return ($this->body) ? $this->body : parent::encode();
+    }
+}
+
+/**
+ *    Bundle of POST parameters. Can include
+ *    repeated parameters.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimplePostEncoding extends SimpleEntityEncoding {
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false, $content_type = false) {
+        if (is_array($query) and $this->hasMoreThanOneLevel($query)) {
+            $query = $this->rewriteArrayWithMultipleLevels($query);
+        }
+        parent::__construct($query, $content_type);
+    }
+
+    function hasMoreThanOneLevel($query) {
+        foreach ($query as $key => $value) {
+            if (is_array($value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function rewriteArrayWithMultipleLevels($query) {
+        $query_ = array();
+        foreach ($query as $key => $value) {
+            if (is_array($value)) {
+                foreach ($value as $sub_key => $sub_value) {
+                    $query_[$key."[".$sub_key."]"] = $sub_value;
+                }
+            } else {
+                $query_[$key] = $value;
+            }
+        }
+        if ($this->hasMoreThanOneLevel($query_)) {
+            $query_ = $this->rewriteArrayWithMultipleLevels($query_);
+        }
+
+        return $query_;
+    }
+
+    /**
+     *    HTTP request method.
+     *    @return string        Always POST.
+     *    @access public
+     */
+    function getMethod() {
+        return 'POST';
+    }
+
+    /**
+     *    Renders the query string as a URL encoded
+     *    request part for attaching to a URL.
+     *    @return string        Part of URL.
+     *    @access public
+     */
+    function asUrlRequest() {
+        return '';
+    }
+}
+
+/**
+ *    Encoded entity body for a PUT request.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimplePutEncoding extends SimpleEntityEncoding {
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false, $content_type = false) {
+        parent::__construct($query, $content_type);
+    }
+
+    /**
+     *    HTTP request method.
+     *    @return string        Always PUT.
+     *    @access public
+     */
+    function getMethod() {
+        return 'PUT';
+    }
+}
+
+/**
+ *    Bundle of POST parameters in the multipart
+ *    format. Can include file uploads.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleMultipartEncoding extends SimplePostEncoding {
+    private $boundary;
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false, $boundary = false) {
+        parent::__construct($query);
+        $this->boundary = ($boundary === false ? uniqid('st') : $boundary);
+    }
+
+    /**
+     *    Dispatches the form headers down the socket.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeHeadersTo(&$socket) {
+        $socket->write("Content-Length: " . (integer)strlen($this->encode()) . "\r\n");
+        $socket->write("Content-Type: multipart/form-data; boundary=" . $this->boundary . "\r\n");
+    }
+
+    /**
+     *    Dispatches the form data down the socket.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeTo(&$socket) {
+        $socket->write($this->encode());
+    }
+
+    /**
+     *    Renders the query string as a URL encoded
+     *    request part.
+     *    @return string        Part of URL.
+     *    @access public
+     */
+    function encode() {
+        $stream = '';
+        foreach ($this->getAll() as $pair) {
+            $stream .= "--" . $this->boundary . "\r\n";
+            $stream .= $pair->asMime() . "\r\n";
+        }
+        $stream .= "--" . $this->boundary . "--\r\n";
+        return $stream;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/errors.php b/3rdparty/simpletest/errors.php
new file mode 100644
index 00000000000..b3d0c2a0753
--- /dev/null
+++ b/3rdparty/simpletest/errors.php
@@ -0,0 +1,267 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: errors.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ * Includes SimpleTest files.
+ */
+require_once dirname(__FILE__) . '/invoker.php';
+require_once dirname(__FILE__) . '/test_case.php';
+require_once dirname(__FILE__) . '/expectation.php';
+/**#@-*/
+
+/**
+ *    Extension that traps errors into an error queue.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleErrorTrappingInvoker extends SimpleInvokerDecorator {
+
+    /**
+     *    Stores the invoker to wrap.
+     *    @param SimpleInvoker $invoker  Test method runner.
+     */
+    function __construct($invoker) {
+        parent::__construct($invoker);
+    }
+
+    /**
+     *    Invokes a test method and dispatches any
+     *    untrapped errors. Called back from
+     *    the visiting runner.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function invoke($method) {
+        $queue = $this->createErrorQueue();
+        set_error_handler('SimpleTestErrorHandler');
+        parent::invoke($method);
+        restore_error_handler();
+        $queue->tally();
+    }
+
+    /**
+     *    Wires up the error queue for a single test.
+     *    @return SimpleErrorQueue    Queue connected to the test.
+     *    @access private
+     */
+    protected function createErrorQueue() {
+        $context = SimpleTest::getContext();
+        $test = $this->getTestCase();
+        $queue = $context->get('SimpleErrorQueue');
+        $queue->setTestCase($test);
+        return $queue;
+    }
+}
+
+/**
+ *    Error queue used to record trapped
+ *    errors.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleErrorQueue {
+    private $queue;
+    private $expectation_queue;
+    private $test;
+    private $using_expect_style = false;
+
+    /**
+     *    Starts with an empty queue.
+     */
+    function __construct() {
+        $this->clear();
+    }
+
+    /**
+     *    Discards the contents of the error queue.
+     *    @access public
+     */
+    function clear() {
+        $this->queue = array();
+        $this->expectation_queue = array();
+    }
+
+    /**
+     *    Sets the currently running test case.
+     *    @param SimpleTestCase $test    Test case to send messages to.
+     *    @access public
+     */
+    function setTestCase($test) {
+        $this->test = $test;
+    }
+
+    /**
+     *    Sets up an expectation of an error. If this is
+     *    not fulfilled at the end of the test, a failure
+     *    will occour. If the error does happen, then this
+     *    will cancel it out and send a pass message.
+     *    @param SimpleExpectation $expected    Expected error match.
+     *    @param string $message                Message to display.
+     *    @access public
+     */
+    function expectError($expected, $message) {
+        array_push($this->expectation_queue, array($expected, $message));
+    }
+
+    /**
+     *    Adds an error to the front of the queue.
+     *    @param integer $severity       PHP error code.
+     *    @param string $content         Text of error.
+     *    @param string $filename        File error occoured in.
+     *    @param integer $line           Line number of error.
+     *    @access public
+     */
+    function add($severity, $content, $filename, $line) {
+        $content = str_replace('%', '%%', $content);
+        $this->testLatestError($severity, $content, $filename, $line);
+    }
+
+    /**
+     *    Any errors still in the queue are sent to the test
+     *    case. Any unfulfilled expectations trigger failures.
+     *    @access public
+     */
+    function tally() {
+        while (list($severity, $message, $file, $line) = $this->extract()) {
+            $severity = $this->getSeverityAsString($severity);
+            $this->test->error($severity, $message, $file, $line);
+        }
+        while (list($expected, $message) = $this->extractExpectation()) {
+            $this->test->assert($expected, false, "%s -> Expected error not caught");
+        }
+    }
+
+    /**
+     *    Tests the error against the most recent expected
+     *    error.
+     *    @param integer $severity       PHP error code.
+     *    @param string $content         Text of error.
+     *    @param string $filename        File error occoured in.
+     *    @param integer $line           Line number of error.
+     *    @access private
+     */
+    protected function testLatestError($severity, $content, $filename, $line) {
+        if ($expectation = $this->extractExpectation()) {
+            list($expected, $message) = $expectation;
+            $this->test->assert($expected, $content, sprintf(
+                    $message,
+                    "%s -> PHP error [$content] severity [" .
+                            $this->getSeverityAsString($severity) .
+                            "] in [$filename] line [$line]"));
+        } else {
+            $this->test->error($severity, $content, $filename, $line);
+        }
+    }
+
+    /**
+     *    Pulls the earliest error from the queue.
+     *    @return  mixed    False if none, or a list of error
+     *                      information. Elements are: severity
+     *                      as the PHP error code, the error message,
+     *                      the file with the error, the line number
+     *                      and a list of PHP super global arrays.
+     *    @access public
+     */
+    function extract() {
+        if (count($this->queue)) {
+            return array_shift($this->queue);
+        }
+        return false;
+    }
+
+    /**
+     *    Pulls the earliest expectation from the queue.
+     *    @return     SimpleExpectation    False if none.
+     *    @access private
+     */
+    protected function extractExpectation() {
+        if (count($this->expectation_queue)) {
+            return array_shift($this->expectation_queue);
+        }
+        return false;
+    }
+
+    /**
+     *    Converts an error code into it's string
+     *    representation.
+     *    @param $severity  PHP integer error code.
+     *    @return           String version of error code.
+     *    @access public
+     */
+    static function getSeverityAsString($severity) {
+        static $map = array(
+                E_STRICT => 'E_STRICT',
+                E_ERROR => 'E_ERROR',
+                E_WARNING => 'E_WARNING',
+                E_PARSE => 'E_PARSE',
+                E_NOTICE => 'E_NOTICE',
+                E_CORE_ERROR => 'E_CORE_ERROR',
+                E_CORE_WARNING => 'E_CORE_WARNING',
+                E_COMPILE_ERROR => 'E_COMPILE_ERROR',
+                E_COMPILE_WARNING => 'E_COMPILE_WARNING',
+                E_USER_ERROR => 'E_USER_ERROR',
+                E_USER_WARNING => 'E_USER_WARNING',
+                E_USER_NOTICE => 'E_USER_NOTICE');
+        if (defined('E_RECOVERABLE_ERROR')) {
+            $map[E_RECOVERABLE_ERROR] = 'E_RECOVERABLE_ERROR';
+        }
+        if (defined('E_DEPRECATED')) {
+            $map[E_DEPRECATED] = 'E_DEPRECATED';
+        }
+        return $map[$severity];
+    }
+}
+
+/**
+ *    Error handler that simply stashes any errors into the global
+ *    error queue. Simulates the existing behaviour with respect to
+ *    logging errors, but this feature may be removed in future.
+ *    @param $severity        PHP error code.
+ *    @param $message         Text of error.
+ *    @param $filename        File error occoured in.
+ *    @param $line            Line number of error.
+ *    @param $super_globals   Hash of PHP super global arrays.
+ *    @access public
+ */
+function SimpleTestErrorHandler($severity, $message, $filename = null, $line = null, $super_globals = null, $mask = null) {
+    $severity = $severity & error_reporting();
+    if ($severity) {
+        restore_error_handler();
+        if (IsNotCausedBySimpleTest($message) && IsNotTimeZoneNag($message)) {
+            if (ini_get('log_errors')) {
+                $label = SimpleErrorQueue::getSeverityAsString($severity);
+                error_log("$label: $message in $filename on line $line");
+            }
+            $queue = SimpleTest::getContext()->get('SimpleErrorQueue');
+            $queue->add($severity, $message, $filename, $line);
+        }
+        set_error_handler('SimpleTestErrorHandler');
+    }
+    return true;
+}
+
+/**
+ *  Certain messages can be caused by the unit tester itself.
+ *  These have to be filtered.
+ *  @param string $message      Message to filter.
+ *  @return boolean             True if genuine failure.
+ */
+function IsNotCausedBySimpleTest($message) {
+    return ! preg_match('/returned by reference/', $message);
+}
+
+/**
+ *  Certain messages caused by PHP are just noise.
+ *  These have to be filtered.
+ *  @param string $message      Message to filter.
+ *  @return boolean             True if genuine failure.
+ */
+function IsNotTimeZoneNag($message) {
+    return ! preg_match('/not safe to rely .* timezone settings/', $message);
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/exceptions.php b/3rdparty/simpletest/exceptions.php
new file mode 100755
index 00000000000..2f469e93a45
--- /dev/null
+++ b/3rdparty/simpletest/exceptions.php
@@ -0,0 +1,226 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: exceptions.php 1882 2009-07-01 14:30:05Z lastcraft $
+ */
+
+/**#@+
+ * Include required SimpleTest files
+ */
+require_once dirname(__FILE__) . '/invoker.php';
+require_once dirname(__FILE__) . '/expectation.php';
+/**#@-*/
+
+/**
+ *    Extension that traps exceptions and turns them into
+ *    an error message. PHP5 only.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleExceptionTrappingInvoker extends SimpleInvokerDecorator {
+
+    /**
+     *    Stores the invoker to be wrapped.
+     *    @param SimpleInvoker $invoker   Test method runner.
+     */
+    function __construct($invoker) {
+        parent::__construct($invoker);
+    }
+
+    /**
+     *    Invokes a test method whilst trapping expected
+     *    exceptions. Any left over unthrown exceptions
+     *    are then reported as failures.
+     *    @param string $method    Test method to call.
+     */
+    function invoke($method) {
+        $trap = SimpleTest::getContext()->get('SimpleExceptionTrap');
+        $trap->clear();
+        try {
+            $has_thrown = false;
+            parent::invoke($method);
+        } catch (Exception $exception) {
+            $has_thrown = true;
+            if (! $trap->isExpected($this->getTestCase(), $exception)) {
+                $this->getTestCase()->exception($exception);
+            }
+            $trap->clear();
+        }
+        if ($message = $trap->getOutstanding()) {
+            $this->getTestCase()->fail($message);
+        }
+        if ($has_thrown) {
+            try {
+                parent::getTestCase()->tearDown();
+            } catch (Exception $e) { }
+        }
+    }
+}
+
+/**
+ *    Tests exceptions either by type or the exact
+ *    exception. This could be improved to accept
+ *    a pattern expectation to test the error
+ *    message, but that will have to come later.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class ExceptionExpectation extends SimpleExpectation {
+    private $expected;
+
+    /**
+     *    Sets up the conditions to test against.
+     *    If the expected value is a string, then
+     *    it will act as a test of the class name.
+     *    An exception as the comparison will
+     *    trigger an identical match. Writing this
+     *    down now makes it look doubly dumb. I hope
+     *    come up with a better scheme later.
+     *    @param mixed $expected   A class name or an actual
+     *                             exception to compare with.
+     *    @param string $message   Message to display.
+     */
+    function __construct($expected, $message = '%s') {
+        $this->expected = $expected;
+        parent::__construct($message);
+    }
+
+    /**
+     *    Carry out the test.
+     *    @param Exception $compare    Value to check.
+     *    @return boolean              True if matched.
+     */
+    function test($compare) {
+        if (is_string($this->expected)) {
+            return ($compare instanceof $this->expected);
+        }
+        if (get_class($compare) != get_class($this->expected)) {
+            return false;
+        }
+        return $compare->getMessage() == $this->expected->getMessage();
+    }
+
+    /**
+     *    Create the message to display describing the test.
+     *    @param Exception $compare     Exception to match.
+     *    @return string                Final message.
+     */
+    function testMessage($compare) {
+        if (is_string($this->expected)) {
+            return "Exception [" . $this->describeException($compare) .
+                    "] should be type [" . $this->expected . "]";
+        }
+        return "Exception [" . $this->describeException($compare) .
+                "] should match [" .
+                $this->describeException($this->expected) . "]";
+    }
+
+    /**
+     *    Summary of an Exception object.
+     *    @param Exception $compare     Exception to describe.
+     *    @return string                Text description.
+     */
+    protected function describeException($exception) {
+        return get_class($exception) . ": " . $exception->getMessage();
+    }
+}
+
+/**
+ *    Stores expected exceptions for when they
+ *    get thrown. Saves the irritating try...catch
+ *    block.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleExceptionTrap {
+    private $expected;
+    private $ignored;
+    private $message;
+
+    /**
+     *    Clears down the queue ready for action.
+     */
+    function __construct() {
+        $this->clear();
+    }
+
+    /**
+     *    Sets up an expectation of an exception.
+     *    This has the effect of intercepting an
+     *    exception that matches.
+     *    @param SimpleExpectation $expected    Expected exception to match.
+     *    @param string $message                Message to display.
+     *    @access public
+     */
+    function expectException($expected = false, $message = '%s') {
+        $this->expected = $this->coerceToExpectation($expected);
+        $this->message = $message;
+    }
+
+    /**
+     *    Adds an exception to the ignore list. This is the list
+     *    of exceptions that when thrown do not affect the test.
+     *    @param SimpleExpectation $ignored    Exception to skip.
+     *    @access public
+     */
+    function ignoreException($ignored) {
+        $this->ignored[] = $this->coerceToExpectation($ignored);
+    }
+
+    /**
+     *    Compares the expected exception with any
+     *    in the queue. Issues a pass or fail and
+     *    returns the state of the test.
+     *    @param SimpleTestCase $test    Test case to send messages to.
+     *    @param Exception $exception    Exception to compare.
+     *    @return boolean                False on no match.
+     */
+    function isExpected($test, $exception) {
+        if ($this->expected) {
+            return $test->assert($this->expected, $exception, $this->message);
+        }
+        foreach ($this->ignored as $ignored) {
+            if ($ignored->test($exception)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Turns an expected exception into a SimpleExpectation object.
+     *    @param mixed $exception      Exception, expectation or
+     *                                 class name of exception.
+     *    @return SimpleExpectation    Expectation that will match the
+     *                                 exception.
+     */
+    private function coerceToExpectation($exception) {
+        if ($exception === false) {
+            return new AnythingExpectation();
+        }
+        if (! SimpleExpectation::isExpectation($exception)) {
+            return new ExceptionExpectation($exception);
+        }
+        return $exception;
+    }
+
+    /**
+     *    Tests for any left over exception.
+     *    @return string/false     The failure message or false if none.
+     */
+    function getOutstanding() {
+        return sprintf($this->message, 'Failed to trap exception');
+    }
+
+    /**
+     *    Discards the contents of the error queue.
+     */
+    function clear() {
+        $this->expected = false;
+        $this->message = false;
+        $this->ignored = array();
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/expectation.php b/3rdparty/simpletest/expectation.php
new file mode 100755
index 00000000000..a480a366c5c
--- /dev/null
+++ b/3rdparty/simpletest/expectation.php
@@ -0,0 +1,984 @@
+<?php
+/**
+ *    base include file for SimpleTest
+ *    @package    SimpleTest
+ *    @subpackage    UnitTester
+ *    @version    $Id: expectation.php 2009 2011-04-28 08:57:25Z pp11 $
+ */
+
+/**#@+
+ *    include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/dumper.php');
+require_once(dirname(__FILE__) . '/compatibility.php');
+/**#@-*/
+
+/**
+ *    Assertion that can display failure information.
+ *    Also includes various helper methods.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ *    @abstract
+ */
+class SimpleExpectation {
+    protected $dumper = false;
+    private $message;
+
+    /**
+     *    Creates a dumper for displaying values and sets
+     *    the test message.
+     *    @param string $message    Customised message on failure.
+     */
+    function __construct($message = '%s') {
+        $this->message = $message;
+    }
+
+    /**
+     *    Tests the expectation. True if correct.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     *    @abstract
+     */
+    function test($compare) {
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     *    @abstract
+     */
+    function testMessage($compare) {
+    }
+
+    /**
+     *    Overlays the generated message onto the stored user
+     *    message. An additional message can be interjected.
+     *    @param mixed $compare        Comparison value.
+     *    @param SimpleDumper $dumper  For formatting the results.
+     *    @return string               Description of success
+     *                                 or failure.
+     *    @access public
+     */
+    function overlayMessage($compare, $dumper) {
+        $this->dumper = $dumper;
+        return sprintf($this->message, $this->testMessage($compare));
+    }
+
+    /**
+     *    Accessor for the dumper.
+     *    @return SimpleDumper    Current value dumper.
+     *    @access protected
+     */
+    protected function getDumper() {
+        if (! $this->dumper) {
+            $dumper = new SimpleDumper();
+            return $dumper;
+        }
+        return $this->dumper;
+    }
+
+    /**
+     *    Test to see if a value is an expectation object.
+     *    A useful utility method.
+     *    @param mixed $expectation    Hopefully an Expectation
+     *                                 class.
+     *    @return boolean              True if descended from
+     *                                 this class.
+     *    @access public
+     */
+    static function isExpectation($expectation) {
+        return is_object($expectation) &&
+                SimpleTestCompatibility::isA($expectation, 'SimpleExpectation');
+    }
+}
+
+/**
+ *    A wildcard expectation always matches.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class AnythingExpectation extends SimpleExpectation {
+
+    /**
+     *    Tests the expectation. Always true.
+     *    @param mixed $compare  Ignored.
+     *    @return boolean        True.
+     *    @access public
+     */
+    function test($compare) {
+        return true;
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return 'Anything always matches [' . $dumper->describeValue($compare) . ']';
+    }
+}
+
+/**
+ *    An expectation that never matches.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class FailedExpectation extends SimpleExpectation {
+
+    /**
+     *    Tests the expectation. Always false.
+     *    @param mixed $compare  Ignored.
+     *    @return boolean        True.
+     *    @access public
+     */
+    function test($compare) {
+        return false;
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return 'Failed expectation never matches [' . $dumper->describeValue($compare) . ']';
+    }
+}
+
+/**
+ *    An expectation that passes on boolean true.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class TrueExpectation extends SimpleExpectation {
+
+    /**
+     *    Tests the expectation.
+     *    @param mixed $compare  Should be true.
+     *    @return boolean        True on match.
+     *    @access public
+     */
+    function test($compare) {
+        return (boolean)$compare;
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return 'Expected true, got [' . $dumper->describeValue($compare) . ']';
+    }
+}
+
+/**
+ *    An expectation that passes on boolean false.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class FalseExpectation extends SimpleExpectation {
+
+    /**
+     *    Tests the expectation.
+     *    @param mixed $compare  Should be false.
+     *    @return boolean        True on match.
+     *    @access public
+     */
+    function test($compare) {
+        return ! (boolean)$compare;
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return 'Expected false, got [' . $dumper->describeValue($compare) . ']';
+    }
+}
+
+/**
+ *    Test for equality.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class EqualExpectation extends SimpleExpectation {
+    private $value;
+
+    /**
+     *    Sets the value to compare against.
+     *    @param mixed $value        Test value to match.
+     *    @param string $message     Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $message = '%s') {
+        parent::__construct($message);
+        $this->value = $value;
+    }
+
+    /**
+     *    Tests the expectation. True if it matches the
+     *    held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return (($this->value == $compare) && ($compare == $this->value));
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            return "Equal expectation [" . $this->dumper->describeValue($this->value) . "]";
+        } else {
+            return "Equal expectation fails " .
+                    $this->dumper->describeDifference($this->value, $compare);
+        }
+    }
+
+    /**
+     *    Accessor for comparison value.
+     *    @return mixed       Held value to compare with.
+     *    @access protected
+     */
+    protected function getValue() {
+        return $this->value;
+    }
+}
+
+/**
+ *    Test for inequality.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NotEqualExpectation extends EqualExpectation {
+
+    /**
+     *    Sets the value to compare against.
+     *    @param mixed $value       Test value to match.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $message = '%s') {
+        parent::__construct($value, $message);
+    }
+
+    /**
+     *    Tests the expectation. True if it differs from the
+     *    held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        if ($this->test($compare)) {
+            return "Not equal expectation passes " .
+                    $dumper->describeDifference($this->getValue(), $compare);
+        } else {
+            return "Not equal expectation fails [" .
+                    $dumper->describeValue($this->getValue()) .
+                    "] matches";
+        }
+    }
+}
+
+/**
+ *    Test for being within a range.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class WithinMarginExpectation extends SimpleExpectation {
+    private $upper;
+    private $lower;
+
+    /**
+     *    Sets the value to compare against and the fuzziness of
+     *    the match. Used for comparing floating point values.
+     *    @param mixed $value        Test value to match.
+     *    @param mixed $margin       Fuzziness of match.
+     *    @param string $message     Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $margin, $message = '%s') {
+        parent::__construct($message);
+        $this->upper = $value + $margin;
+        $this->lower = $value - $margin;
+    }
+
+    /**
+     *    Tests the expectation. True if it matches the
+     *    held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return (($compare <= $this->upper) && ($compare >= $this->lower));
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            return $this->withinMessage($compare);
+        } else {
+            return $this->outsideMessage($compare);
+        }
+    }
+
+    /**
+     *    Creates a the message for being within the range.
+     *    @param mixed $compare        Value being tested.
+     *    @access private
+     */
+    protected function withinMessage($compare) {
+        return "Within expectation [" . $this->dumper->describeValue($this->lower) . "] and [" .
+                $this->dumper->describeValue($this->upper) . "]";
+    }
+
+    /**
+     *    Creates a the message for being within the range.
+     *    @param mixed $compare        Value being tested.
+     *    @access private
+     */
+    protected function outsideMessage($compare) {
+        if ($compare > $this->upper) {
+            return "Outside expectation " .
+                    $this->dumper->describeDifference($compare, $this->upper);
+        } else {
+            return "Outside expectation " .
+                    $this->dumper->describeDifference($compare, $this->lower);
+        }
+    }
+}
+
+/**
+ *    Test for being outside of a range.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class OutsideMarginExpectation extends WithinMarginExpectation {
+
+    /**
+     *    Sets the value to compare against and the fuzziness of
+     *    the match. Used for comparing floating point values.
+     *    @param mixed $value        Test value to not match.
+     *    @param mixed $margin       Fuzziness of match.
+     *    @param string $message     Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $margin, $message = '%s') {
+        parent::__construct($value, $margin, $message);
+    }
+
+    /**
+     *    Tests the expectation. True if it matches the
+     *    held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if (! $this->test($compare)) {
+            return $this->withinMessage($compare);
+        } else {
+            return $this->outsideMessage($compare);
+        }
+    }
+}
+
+/**
+ *    Test for reference.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class ReferenceExpectation {
+    private $value;
+
+    /**
+     *    Sets the reference value to compare against.
+     *    @param mixed $value       Test reference to match.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct(&$value, $message = '%s') {
+        $this->message = $message;
+        $this->value = &$value;
+    }
+
+    /**
+     *    Tests the expectation. True if it exactly
+     *    references the held value.
+     *    @param mixed $compare        Comparison reference.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test(&$compare) {
+        return SimpleTestCompatibility::isReference($this->value, $compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            return "Reference expectation [" . $this->dumper->describeValue($this->value) . "]";
+        } else {
+            return "Reference expectation fails " .
+                    $this->dumper->describeDifference($this->value, $compare);
+        }
+    }
+
+    /**
+     *    Overlays the generated message onto the stored user
+     *    message. An additional message can be interjected.
+     *    @param mixed $compare        Comparison value.
+     *    @param SimpleDumper $dumper  For formatting the results.
+     *    @return string               Description of success
+     *                                 or failure.
+     *    @access public
+     */
+    function overlayMessage($compare, $dumper) {
+        $this->dumper = $dumper;
+        return sprintf($this->message, $this->testMessage($compare));
+    }
+
+    /**
+     *    Accessor for the dumper.
+     *    @return SimpleDumper    Current value dumper.
+     *    @access protected
+     */
+    protected function getDumper() {
+        if (! $this->dumper) {
+            $dumper = new SimpleDumper();
+            return $dumper;
+        }
+        return $this->dumper;
+    }
+}
+
+/**
+ *    Test for identity.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class IdenticalExpectation extends EqualExpectation {
+
+    /**
+     *    Sets the value to compare against.
+     *    @param mixed $value       Test value to match.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $message = '%s') {
+        parent::__construct($value, $message);
+    }
+
+    /**
+     *    Tests the expectation. True if it exactly
+     *    matches the held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return SimpleTestCompatibility::isIdentical($this->getValue(), $compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        if ($this->test($compare)) {
+            return "Identical expectation [" . $dumper->describeValue($this->getValue()) . "]";
+        } else {
+            return "Identical expectation [" . $dumper->describeValue($this->getValue()) .
+                    "] fails with [" .
+                    $dumper->describeValue($compare) . "] " .
+                    $dumper->describeDifference($this->getValue(), $compare, TYPE_MATTERS);
+        }
+    }
+}
+
+/**
+ *    Test for non-identity.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NotIdenticalExpectation extends IdenticalExpectation {
+
+    /**
+     *    Sets the value to compare against.
+     *    @param mixed $value        Test value to match.
+     *    @param string $message     Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $message = '%s') {
+        parent::__construct($value, $message);
+    }
+
+    /**
+     *    Tests the expectation. True if it differs from the
+     *    held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        if ($this->test($compare)) {
+            return "Not identical expectation passes " .
+                    $dumper->describeDifference($this->getValue(), $compare, TYPE_MATTERS);
+        } else {
+            return "Not identical expectation [" . $dumper->describeValue($this->getValue()) . "] matches";
+        }
+    }
+}
+
+/**
+ *    Test for a pattern using Perl regex rules.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class PatternExpectation extends SimpleExpectation {
+    private $pattern;
+
+    /**
+     *    Sets the value to compare against.
+     *    @param string $pattern    Pattern to search for.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($pattern, $message = '%s') {
+        parent::__construct($message);
+        $this->pattern = $pattern;
+    }
+
+    /**
+     *    Accessor for the pattern.
+     *    @return string       Perl regex as string.
+     *    @access protected
+     */
+    protected function getPattern() {
+        return $this->pattern;
+    }
+
+    /**
+     *    Tests the expectation. True if the Perl regex
+     *    matches the comparison value.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return (boolean)preg_match($this->getPattern(), $compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            return $this->describePatternMatch($this->getPattern(), $compare);
+        } else {
+            $dumper = $this->getDumper();
+            return "Pattern [" . $this->getPattern() .
+                    "] not detected in [" .
+                    $dumper->describeValue($compare) . "]";
+        }
+    }
+
+    /**
+     *    Describes a pattern match including the string
+     *    found and it's position.
+     *    @param string $pattern        Regex to match against.
+     *    @param string $subject        Subject to search.
+     *    @access protected
+     */
+    protected function describePatternMatch($pattern, $subject) {
+        preg_match($pattern, $subject, $matches);
+        $position = strpos($subject, $matches[0]);
+        $dumper = $this->getDumper();
+        return "Pattern [$pattern] detected at character [$position] in [" .
+                $dumper->describeValue($subject) . "] as [" .
+                $matches[0] . "] in region [" .
+                $dumper->clipString($subject, 100, $position) . "]";
+    }
+}
+
+/**
+ *    Fail if a pattern is detected within the
+ *    comparison.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NoPatternExpectation extends PatternExpectation {
+
+    /**
+     *    Sets the reject pattern
+     *    @param string $pattern    Pattern to search for.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($pattern, $message = '%s') {
+        parent::__construct($pattern, $message);
+    }
+
+    /**
+     *    Tests the expectation. False if the Perl regex
+     *    matches the comparison value.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param string $compare      Comparison value.
+     *    @return string              Description of success
+     *                                or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            $dumper = $this->getDumper();
+            return "Pattern [" . $this->getPattern() .
+                    "] not detected in [" .
+                    $dumper->describeValue($compare) . "]";
+        } else {
+            return $this->describePatternMatch($this->getPattern(), $compare);
+        }
+    }
+}
+
+/**
+ *    Tests either type or class name if it's an object.
+ *      @package SimpleTest
+ *      @subpackage UnitTester
+ */
+class IsAExpectation extends SimpleExpectation {
+    private $type;
+
+    /**
+     *    Sets the type to compare with.
+     *    @param string $type       Type or class name.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($type, $message = '%s') {
+        parent::__construct($message);
+        $this->type = $type;
+    }
+
+    /**
+     *    Accessor for type to check against.
+     *    @return string    Type or class name.
+     *    @access protected
+     */
+    protected function getType() {
+        return $this->type;
+    }
+
+    /**
+     *    Tests the expectation. True if the type or
+     *    class matches the string value.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        if (is_object($compare)) {
+            return SimpleTestCompatibility::isA($compare, $this->type);
+        } else {
+            $function = 'is_'.$this->canonicalType($this->type);
+            if (is_callable($function)) {
+                return $function($compare);
+            }
+            return false;
+        }
+    }
+
+    /**
+     *    Coerces type name into a is_*() match.
+     *    @param string $type        User type.
+     *    @return string             Simpler type.
+     *    @access private
+     */
+    protected function canonicalType($type) {
+        $type = strtolower($type);
+        $map = array('boolean' => 'bool');
+        if (isset($map[$type])) {
+            $type = $map[$type];
+        }
+        return $type;
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return "Value [" . $dumper->describeValue($compare) .
+                "] should be type [" . $this->type . "]";
+    }
+}
+
+/**
+ *    Tests either type or class name if it's an object.
+ *    Will succeed if the type does not match.
+ *      @package SimpleTest
+ *      @subpackage UnitTester
+ */
+class NotAExpectation extends IsAExpectation {
+    private $type;
+
+    /**
+     *    Sets the type to compare with.
+     *    @param string $type       Type or class name.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($type, $message = '%s') {
+        parent::__construct($type, $message);
+    }
+
+    /**
+     *    Tests the expectation. False if the type or
+     *    class matches the string value.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if different.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return "Value [" . $dumper->describeValue($compare) .
+                "] should not be type [" . $this->getType() . "]";
+    }
+}
+
+/**
+ *    Tests for existance of a method in an object
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class MethodExistsExpectation extends SimpleExpectation {
+    private $method;
+
+    /**
+     *    Sets the value to compare against.
+     *    @param string $method     Method to check.
+     *    @param string $message    Customised message on failure.
+     *    @return void
+     */
+    function __construct($method, $message = '%s') {
+        parent::__construct($message);
+        $this->method = &$method;
+    }
+
+    /**
+     *    Tests the expectation. True if the method exists in the test object.
+     *    @param string $compare        Comparison method name.
+     *    @return boolean               True if correct.
+     */
+    function test($compare) {
+        return (boolean)(is_object($compare) && method_exists($compare, $this->method));
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        if (! is_object($compare)) {
+            return 'No method on non-object [' . $dumper->describeValue($compare) . ']';
+        }
+        $method = $this->method;
+        return "Object [" . $dumper->describeValue($compare) .
+                "] should contain method [$method]";
+    }
+}
+
+/**
+ *    Compares an object member's value even if private.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class MemberExpectation extends IdenticalExpectation {
+    private $name;
+
+    /**
+     *    Sets the value to compare against.
+     *    @param string $method     Method to check.
+     *    @param string $message    Customised message on failure.
+     *    @return void
+     */
+    function __construct($name, $expected) {
+        $this->name = $name;
+        parent::__construct($expected);
+    }
+
+    /**
+     *    Tests the expectation. True if the property value is identical.
+     *    @param object $actual         Comparison object.
+     *    @return boolean               True if identical.
+     */
+    function test($actual) {
+        if (! is_object($actual)) {
+            return false;
+        }
+        return parent::test($this->getProperty($this->name, $actual));
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     */
+    function testMessage($actual) {
+        return parent::testMessage($this->getProperty($this->name, $actual));
+    }
+
+    /**
+     *    Extracts the member value even if private using reflection.
+     *    @param string $name        Property name.
+     *    @param object $object      Object to read.
+     *    @return mixed              Value of property.
+     */
+    private function getProperty($name, $object) {
+        $reflection = new ReflectionObject($object);
+        $property = $reflection->getProperty($name);
+        if (method_exists($property, 'setAccessible')) {
+            $property->setAccessible(true);
+        }
+        try {
+            return $property->getValue($object);
+        } catch (ReflectionException $e) {
+            return $this->getPrivatePropertyNoMatterWhat($name, $object);
+        }
+    }
+
+    /**
+     *    Extracts a private member's value when reflection won't play ball.
+     *    @param string $name        Property name.
+     *    @param object $object      Object to read.
+     *    @return mixed              Value of property.
+     */
+    private function getPrivatePropertyNoMatterWhat($name, $object) {
+        foreach ((array)$object as $mangled_name => $value) {
+            if ($this->unmangle($mangled_name) == $name) {
+                return $value;
+            }
+        }
+    }
+
+    /**
+     *    Removes crud from property name after it's been converted
+     *    to an array.
+     *    @param string $mangled     Name from array cast.
+     *    @return string             Cleaned up name.
+     */
+    function unmangle($mangled) {
+        $parts = preg_split('/[^a-zA-Z0-9_\x7f-\xff]+/', $mangled);
+        return array_pop($parts);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/pear_test_case.php b/3rdparty/simpletest/extensions/pear_test_case.php
new file mode 100755
index 00000000000..71657ae4cea
--- /dev/null
+++ b/3rdparty/simpletest/extensions/pear_test_case.php
@@ -0,0 +1,196 @@
+<?php
+    /**
+     *	adapter for SimpleTest to use PEAR PHPUnit test cases
+     *	@package	SimpleTest
+     *	@subpackage Extensions
+     *	@version	$Id: pear_test_case.php 1836 2008-12-21 00:02:26Z edwardzyang $
+     */
+    
+    /**#@+
+     * include SimpleTest files
+     */
+    require_once(dirname(__FILE__) . '/../dumper.php');
+    require_once(dirname(__FILE__) . '/../compatibility.php');
+    require_once(dirname(__FILE__) . '/../test_case.php');
+    require_once(dirname(__FILE__) . '/../expectation.php');
+	/**#@-*/
+   
+    /**
+     *    Adapter for PEAR PHPUnit test case to allow
+     *    legacy PEAR test cases to be used with SimpleTest.
+     *    @package      SimpleTest
+     *    @subpackage   Extensions
+     */
+    class PHPUnit_TestCase extends SimpleTestCase {
+        private $_loosely_typed;
+        
+        /**
+         *    Constructor. Sets the test name.
+         *    @param $label        Test name to display.
+         *    @public
+         */
+        function __construct($label = false) {
+            parent::__construct($label);
+            $this->_loosely_typed = false;
+        }
+        
+        /**
+         *    Will test straight equality if set to loose
+         *    typing, or identity if not.
+         *    @param $first          First value.
+         *    @param $second         Comparison value.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertEquals($first, $second, $message = "%s", $delta = 0) {
+            if ($this->_loosely_typed) {
+                $expectation = new EqualExpectation($first);
+            } else {
+                $expectation = new IdenticalExpectation($first);
+            }
+            $this->assert($expectation, $second, $message);
+        }
+        
+        /**
+         *    Passes if the value tested is not null.
+         *    @param $value          Value to test against.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertNotNull($value, $message = "%s") {
+            parent::assert(new TrueExpectation(), isset($value), $message);
+        }
+        
+        /**
+         *    Passes if the value tested is null.
+         *    @param $value          Value to test against.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertNull($value, $message = "%s") {
+            parent::assert(new TrueExpectation(), !isset($value), $message);
+        }
+        
+        /**
+         *    Identity test tests for the same object.
+         *    @param $first          First object handle.
+         *    @param $second         Hopefully the same handle.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertSame($first, $second, $message = "%s") {
+            $dumper = new SimpleDumper();
+            $message = sprintf(
+                    $message,
+                    "[" . $dumper->describeValue($first) .
+                            "] and [" . $dumper->describeValue($second) .
+                            "] should reference the same object");
+            return $this->assert(
+					new TrueExpectation(),
+                    SimpleTestCompatibility::isReference($first, $second),
+                    $message);
+        }
+        
+        /**
+         *    Inverted identity test.
+         *    @param $first          First object handle.
+         *    @param $second         Hopefully a different handle.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertNotSame($first, $second, $message = "%s") {
+            $dumper = new SimpleDumper();
+            $message = sprintf(
+                    $message,
+                    "[" . $dumper->describeValue($first) .
+                            "] and [" . $dumper->describeValue($second) .
+                            "] should not be the same object");
+            return $this->assert(
+					new falseExpectation(),
+                    SimpleTestCompatibility::isReference($first, $second),
+                    $message);
+        }
+        
+        /**
+         *    Sends pass if the test condition resolves true,
+         *    a fail otherwise.
+         *    @param $condition      Condition to test true.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertTrue($condition, $message = "%s") {
+            parent::assert(new TrueExpectation(), $condition, $message);
+        }
+        
+        /**
+         *    Sends pass if the test condition resolves false,
+         *    a fail otherwise.
+         *    @param $condition      Condition to test false.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertFalse($condition, $message = "%s") {
+            parent::assert(new FalseExpectation(), $condition, $message);
+        }
+        
+        /**
+         *    Tests a regex match. Needs refactoring.
+         *    @param $pattern        Regex to match.
+         *    @param $subject        String to search in.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertRegExp($pattern, $subject, $message = "%s") {
+            $this->assert(new PatternExpectation($pattern), $subject, $message);
+        }
+        
+        /**
+         *    Tests the type of a value.
+         *    @param $value          Value to take type of.
+         *    @param $type           Hoped for type.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertType($value, $type, $message = "%s") {
+            parent::assert(new TrueExpectation(), gettype($value) == strtolower($type), $message);
+        }
+        
+        /**
+         *    Sets equality operation to act as a simple equal
+         *    comparison only, allowing a broader range of
+         *    matches.
+         *    @param $loosely_typed     True for broader comparison.
+         *    @public
+         */
+        function setLooselyTyped($loosely_typed) {
+            $this->_loosely_typed = $loosely_typed;
+        }
+
+        /**
+         *    For progress indication during
+         *    a test amongst other things.
+         *    @return            Usually one.
+         *    @public
+         */
+        function countTestCases() {
+            return $this->getSize();
+        }
+        
+        /**
+         *    Accessor for name, normally just the class
+         *    name.
+         *    @public
+         */
+        function getName() {
+            return $this->getLabel();
+        }
+        
+        /**
+         *    Does nothing. For compatibility only.
+         *    @param $name        Dummy
+         *    @public
+         */
+        function setName($name) {
+        }
+    }
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/testdox.php b/3rdparty/simpletest/extensions/testdox.php
new file mode 100755
index 00000000000..5cf32f35162
--- /dev/null
+++ b/3rdparty/simpletest/extensions/testdox.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ *	Extension for a TestDox reporter
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ *	@version	$Id: testdox.php 2004 2010-10-31 13:44:14Z jsweat $
+ */
+
+/**
+ * 	TestDox reporter 
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ */
+class TestDoxReporter extends SimpleReporter
+{
+    var $_test_case_pattern = '/^TestOf(.*)$/';
+
+    function __construct($test_case_pattern = '/^TestOf(.*)$/') {
+        parent::__construct();
+        $this->_test_case_pattern = empty($test_case_pattern) ? '/^(.*)$/' : $test_case_pattern;
+    }
+
+    function paintCaseStart($test_name) {
+        preg_match($this->_test_case_pattern, $test_name, $matches);
+        if (!empty($matches[1])) {
+            echo $matches[1] . "\n";
+        } else {
+            echo $test_name . "\n";
+        }
+    }
+
+    function paintCaseEnd($test_name) {
+        echo "\n";
+    }
+
+    function paintMethodStart($test_name) {
+        if (!preg_match('/^test(.*)$/i', $test_name, $matches)) {
+            return;
+        }
+        $test_name = $matches[1];
+        $test_name = preg_replace('/([A-Z])([A-Z])/', '$1 $2', $test_name);
+        echo '- ' . strtolower(preg_replace('/([a-zA-Z])([A-Z0-9])/', '$1 $2', $test_name));
+    }
+
+    function paintMethodEnd($test_name) {
+        echo "\n";
+    }
+
+    function paintFail($message) {
+        echo " [FAILED]";
+    }
+}
+?>
diff --git a/3rdparty/simpletest/extensions/testdox/test.php b/3rdparty/simpletest/extensions/testdox/test.php
new file mode 100755
index 00000000000..b03abe510ab
--- /dev/null
+++ b/3rdparty/simpletest/extensions/testdox/test.php
@@ -0,0 +1,107 @@
+<?php
+// $Id: test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once dirname(__FILE__) . '/../../autorun.php';
+require_once dirname(__FILE__) . '/../testdox.php';
+
+// uncomment to see test dox in action
+//SimpleTest::prefer(new TestDoxReporter());
+
+class TestOfTestDoxReporter extends UnitTestCase
+{
+    function testIsAnInstanceOfSimpleScorerAndReporter() {
+        $dox = new TestDoxReporter();
+        $this->assertIsA($dox, 'SimpleScorer');
+        $this->assertIsA($dox, 'SimpleReporter');
+    }
+
+    function testOutputsNameOfTestCase() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintCaseStart('TestOfTestDoxReporter');
+        $buffer = ob_get_clean();
+        $this->assertPattern('/^TestDoxReporter/', $buffer);
+    }
+
+    function testOutputOfTestCaseNameFilteredByConstructParameter() {
+        $dox = new TestDoxReporter('/^(.*)Test$/');
+        ob_start();
+        $dox->paintCaseStart('SomeGreatWidgetTest');
+        $buffer = ob_get_clean();
+        $this->assertPattern('/^SomeGreatWidget/', $buffer);
+    }
+
+    function testIfTest_case_patternIsEmptyAssumeEverythingMatches() {
+        $dox = new TestDoxReporter('');
+        ob_start();
+        $dox->paintCaseStart('TestOfTestDoxReporter');
+        $buffer = ob_get_clean();
+        $this->assertPattern('/^TestOfTestDoxReporter/', $buffer);
+    }
+
+    function testEmptyLineInsertedWhenCaseEnds() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintCaseEnd('TestOfTestDoxReporter');
+        $buffer = ob_get_clean();
+        $this->assertEqual("\n", $buffer);
+    }
+
+    function testPaintsTestMethodInTestDoxFormat() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintMethodStart('testSomeGreatTestCase');
+        $buffer = ob_get_clean();
+        $this->assertEqual("- some great test case", $buffer);
+        unset($buffer);
+
+        $random = rand(100, 200);
+        ob_start();
+        $dox->paintMethodStart("testRandomNumberIs{$random}");
+        $buffer = ob_get_clean();
+        $this->assertEqual("- random number is {$random}", $buffer);
+    }
+
+    function testDoesNotOutputAnythingOnNoneTestMethods() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintMethodStart('nonMatchingMethod');
+        $buffer = ob_get_clean();
+        $this->assertEqual('', $buffer);
+    }
+
+    function testPaintMethodAddLineBreak() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintMethodEnd('someMethod');
+        $buffer = ob_get_clean();
+        $this->assertEqual("\n", $buffer);
+    }
+
+    function testProperlySpacesSingleLettersInMethodName() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintMethodStart('testAVerySimpleAgainAVerySimpleMethod');
+        $buffer = ob_get_clean();
+        $this->assertEqual('- a very simple again a very simple method', $buffer);
+    }
+
+    function testOnFailureThisPrintsFailureNotice() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintFail('');
+        $buffer = ob_get_clean();
+        $this->assertEqual(' [FAILED]', $buffer);
+    }
+
+    function testWhenMatchingMethodNamesTestPrefixIsCaseInsensitive() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintMethodStart('TESTSupportsAllUppercaseTestPrefixEvenThoughIDoNotKnowWhyYouWouldDoThat');
+        $buffer = ob_get_clean();
+        $this->assertEqual(
+            '- supports all uppercase test prefix even though i do not know why you would do that',
+            $buffer
+        );
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/form.php b/3rdparty/simpletest/form.php
new file mode 100644
index 00000000000..5e423a9df82
--- /dev/null
+++ b/3rdparty/simpletest/form.php
@@ -0,0 +1,361 @@
+<?php
+/**
+ *  Base include file for SimpleTest.
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: form.php 2013 2011-04-29 09:29:45Z pp11 $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/tag.php');
+require_once(dirname(__FILE__) . '/encoding.php');
+require_once(dirname(__FILE__) . '/selector.php');
+/**#@-*/
+
+/**
+ *    Form tag class to hold widget values.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleForm {
+    private $method;
+    private $action;
+    private $encoding;
+    private $default_target;
+    private $id;
+    private $buttons;
+    private $images;
+    private $widgets;
+    private $radios;
+    private $checkboxes;
+
+    /**
+     *    Starts with no held controls/widgets.
+     *    @param SimpleTag $tag        Form tag to read.
+     *    @param SimplePage $page      Holding page.
+     */
+    function __construct($tag, $page) {
+        $this->method = $tag->getAttribute('method');
+        $this->action = $this->createAction($tag->getAttribute('action'), $page);
+        $this->encoding = $this->setEncodingClass($tag);
+        $this->default_target = false;
+        $this->id = $tag->getAttribute('id');
+        $this->buttons = array();
+        $this->images = array();
+        $this->widgets = array();
+        $this->radios = array();
+        $this->checkboxes = array();
+    }
+
+    /**
+     *    Creates the request packet to be sent by the form.
+     *    @param SimpleTag $tag        Form tag to read.
+     *    @return string               Packet class.
+     *    @access private
+     */
+    protected function setEncodingClass($tag) {
+        if (strtolower($tag->getAttribute('method')) == 'post') {
+            if (strtolower($tag->getAttribute('enctype')) == 'multipart/form-data') {
+                return 'SimpleMultipartEncoding';
+            }
+            return 'SimplePostEncoding';
+        }
+        return 'SimpleGetEncoding';
+    }
+
+    /**
+     *    Sets the frame target within a frameset.
+     *    @param string $frame        Name of frame.
+     *    @access public
+     */
+    function setDefaultTarget($frame) {
+        $this->default_target = $frame;
+    }
+
+    /**
+     *    Accessor for method of form submission.
+     *    @return string           Either get or post.
+     *    @access public
+     */
+    function getMethod() {
+        return ($this->method ? strtolower($this->method) : 'get');
+    }
+
+    /**
+     *    Combined action attribute with current location
+     *    to get an absolute form target.
+     *    @param string $action    Action attribute from form tag.
+     *    @param SimpleUrl $base   Page location.
+     *    @return SimpleUrl        Absolute form target.
+     */
+    protected function createAction($action, $page) {
+        if (($action === '') || ($action === false)) {
+            return $page->expandUrl($page->getUrl());
+        }
+        return $page->expandUrl(new SimpleUrl($action));;
+    }
+
+    /**
+     *    Absolute URL of the target.
+     *    @return SimpleUrl           URL target.
+     *    @access public
+     */
+    function getAction() {
+        $url = $this->action;
+        if ($this->default_target && ! $url->getTarget()) {
+            $url->setTarget($this->default_target);
+        }
+        if ($this->getMethod() == 'get') {
+            $url->clearRequest();
+        }
+        return $url;
+    }
+
+    /**
+     *    Creates the encoding for the current values in the
+     *    form.
+     *    @return SimpleFormEncoding    Request to submit.
+     *    @access private
+     */
+    protected function encode() {
+        $class = $this->encoding;
+        $encoding = new $class();
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            $this->widgets[$i]->write($encoding);
+        }
+        return $encoding;
+    }
+
+    /**
+     *    ID field of form for unique identification.
+     *    @return string           Unique tag ID.
+     *    @access public
+     */
+    function getId() {
+        return $this->id;
+    }
+
+    /**
+     *    Adds a tag contents to the form.
+     *    @param SimpleWidget $tag        Input tag to add.
+     */
+    function addWidget($tag) {
+        if (strtolower($tag->getAttribute('type')) == 'submit') {
+            $this->buttons[] = $tag;
+        } elseif (strtolower($tag->getAttribute('type')) == 'image') {
+            $this->images[] = $tag;
+        } elseif ($tag->getName()) {
+            $this->setWidget($tag);
+        }
+    }
+
+    /**
+     *    Sets the widget into the form, grouping radio
+     *    buttons if any.
+     *    @param SimpleWidget $tag   Incoming form control.
+     *    @access private
+     */
+    protected function setWidget($tag) {
+        if (strtolower($tag->getAttribute('type')) == 'radio') {
+            $this->addRadioButton($tag);
+        } elseif (strtolower($tag->getAttribute('type')) == 'checkbox') {
+            $this->addCheckbox($tag);
+        } else {
+            $this->widgets[] = &$tag;
+        }
+    }
+
+    /**
+     *    Adds a radio button, building a group if necessary.
+     *    @param SimpleRadioButtonTag $tag   Incoming form control.
+     *    @access private
+     */
+    protected function addRadioButton($tag) {
+        if (! isset($this->radios[$tag->getName()])) {
+            $this->widgets[] = new SimpleRadioGroup();
+            $this->radios[$tag->getName()] = count($this->widgets) - 1;
+        }
+        $this->widgets[$this->radios[$tag->getName()]]->addWidget($tag);
+    }
+
+    /**
+     *    Adds a checkbox, making it a group on a repeated name.
+     *    @param SimpleCheckboxTag $tag   Incoming form control.
+     *    @access private
+     */
+    protected function addCheckbox($tag) {
+        if (! isset($this->checkboxes[$tag->getName()])) {
+            $this->widgets[] = $tag;
+            $this->checkboxes[$tag->getName()] = count($this->widgets) - 1;
+        } else {
+            $index = $this->checkboxes[$tag->getName()];
+            if (! SimpleTestCompatibility::isA($this->widgets[$index], 'SimpleCheckboxGroup')) {
+                $previous = $this->widgets[$index];
+                $this->widgets[$index] = new SimpleCheckboxGroup();
+                $this->widgets[$index]->addWidget($previous);
+            }
+            $this->widgets[$index]->addWidget($tag);
+        }
+    }
+
+    /**
+     *    Extracts current value from form.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @return string/array              Value(s) as string or null
+     *                                      if not set.
+     *    @access public
+     */
+    function getValue($selector) {
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            if ($selector->isMatch($this->widgets[$i])) {
+                return $this->widgets[$i]->getValue();
+            }
+        }
+        foreach ($this->buttons as $button) {
+            if ($selector->isMatch($button)) {
+                return $button->getValue();
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Sets a widget value within the form.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @param string $value              Value to input into the widget.
+     *    @return boolean                   True if value is legal, false
+     *                                      otherwise. If the field is not
+     *                                      present, nothing will be set.
+     *    @access public
+     */
+    function setField($selector, $value, $position=false) {
+        $success = false;
+        $_position = 0;
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            if ($selector->isMatch($this->widgets[$i])) {
+                $_position++;
+                if ($position === false or $_position === (int)$position) {
+                    if ($this->widgets[$i]->setValue($value)) {
+                        $success = true;
+                    }
+                }
+            }
+        }
+        return $success;
+    }
+
+    /**
+     *    Used by the page object to set widgets labels to
+     *    external label tags.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @access public
+     */
+    function attachLabelBySelector($selector, $label) {
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            if ($selector->isMatch($this->widgets[$i])) {
+                if (method_exists($this->widgets[$i], 'setLabel')) {
+                    $this->widgets[$i]->setLabel($label);
+                    return;
+                }
+            }
+        }
+    }
+
+    /**
+     *    Test to see if a form has a submit button.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @return boolean                   True if present.
+     *    @access public
+     */
+    function hasSubmit($selector) {
+        foreach ($this->buttons as $button) {
+            if ($selector->isMatch($button)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Test to see if a form has an image control.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @return boolean                   True if present.
+     *    @access public
+     */
+    function hasImage($selector) {
+        foreach ($this->images as $image) {
+            if ($selector->isMatch($image)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Gets the submit values for a selected button.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @param hash $additional           Additional data for the form.
+     *    @return SimpleEncoding            Submitted values or false
+     *                                      if there is no such button
+     *                                      in the form.
+     *    @access public
+     */
+    function submitButton($selector, $additional = false) {
+        $additional = $additional ? $additional : array();
+        foreach ($this->buttons as $button) {
+            if ($selector->isMatch($button)) {
+                $encoding = $this->encode();
+                $button->write($encoding);
+                if ($additional) {
+                    $encoding->merge($additional);
+                }
+                return $encoding;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Gets the submit values for an image.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @param integer $x                 X-coordinate of click.
+     *    @param integer $y                 Y-coordinate of click.
+     *    @param hash $additional           Additional data for the form.
+     *    @return SimpleEncoding            Submitted values or false
+     *                                      if there is no such button in the
+     *                                      form.
+     *    @access public
+     */
+    function submitImage($selector, $x, $y, $additional = false) {
+        $additional = $additional ? $additional : array();
+        foreach ($this->images as $image) {
+            if ($selector->isMatch($image)) {
+                $encoding = $this->encode();
+                $image->write($encoding, $x, $y);
+                if ($additional) {
+                    $encoding->merge($additional);
+                }
+                return $encoding;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Simply submits the form without the submit button
+     *    value. Used when there is only one button or it
+     *    is unimportant.
+     *    @return hash           Submitted values.
+     *    @access public
+     */
+    function submit($additional = false) {
+        $encoding = $this->encode();
+        if ($additional) {
+            $encoding->merge($additional);
+        }
+        return $encoding;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/frames.php b/3rdparty/simpletest/frames.php
new file mode 100755
index 00000000000..d6d8e96fd0c
--- /dev/null
+++ b/3rdparty/simpletest/frames.php
@@ -0,0 +1,592 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: frames.php 1784 2008-04-26 13:07:14Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/page.php');
+require_once(dirname(__FILE__) . '/user_agent.php');
+/**#@-*/
+
+/**
+ *    A composite page. Wraps a frameset page and
+ *    adds subframes. The original page will be
+ *    mostly ignored. Implements the SimplePage
+ *    interface so as to be interchangeable.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleFrameset {
+    private $frameset;
+    private $frames;
+    private $focus;
+    private $names;
+
+    /**
+     *    Stashes the frameset page. Will make use of the
+     *    browser to fetch the sub frames recursively.
+     *    @param SimplePage $page        Frameset page.
+     */
+    function __construct($page) {
+        $this->frameset = $page;
+        $this->frames = array();
+        $this->focus = false;
+        $this->names = array();
+    }
+
+    /**
+     *    Adds a parsed page to the frameset.
+     *    @param SimplePage $page    Frame page.
+     *    @param string $name        Name of frame in frameset.
+     *    @access public
+     */
+    function addFrame($page, $name = false) {
+        $this->frames[] = $page;
+        if ($name) {
+            $this->names[$name] = count($this->frames) - 1;
+        }
+    }
+
+    /**
+     *    Replaces existing frame with another. If the
+     *    frame is nested, then the call is passed down
+     *    one level.
+     *    @param array $path        Path of frame in frameset.
+     *    @param SimplePage $page   Frame source.
+     *    @access public
+     */
+    function setFrame($path, $page) {
+        $name = array_shift($path);
+        if (isset($this->names[$name])) {
+            $index = $this->names[$name];
+        } else {
+            $index = $name - 1;
+        }
+        if (count($path) == 0) {
+            $this->frames[$index] = &$page;
+            return;
+        }
+        $this->frames[$index]->setFrame($path, $page);
+    }
+
+    /**
+     *    Accessor for current frame focus. Will be
+     *    false if no frame has focus. Will have the nested
+     *    frame focus if any.
+     *    @return array     Labels or indexes of nested frames.
+     *    @access public
+     */
+    function getFrameFocus() {
+        if ($this->focus === false) {
+            return array();
+        }
+        return array_merge(
+                array($this->getPublicNameFromIndex($this->focus)),
+                $this->frames[$this->focus]->getFrameFocus());
+    }
+
+    /**
+     *    Turns an internal array index into the frames list
+     *    into a public name, or if none, then a one offset
+     *    index.
+     *    @param integer $subject    Internal index.
+     *    @return integer/string     Public name.
+     *    @access private
+     */
+    protected function getPublicNameFromIndex($subject) {
+        foreach ($this->names as $name => $index) {
+            if ($subject == $index) {
+                return $name;
+            }
+        }
+        return $subject + 1;
+    }
+
+    /**
+     *    Sets the focus by index. The integer index starts from 1.
+     *    If already focused and the target frame also has frames,
+     *    then the nested frame will be focused.
+     *    @param integer $choice    Chosen frame.
+     *    @return boolean           True if frame exists.
+     *    @access public
+     */
+    function setFrameFocusByIndex($choice) {
+        if (is_integer($this->focus)) {
+            if ($this->frames[$this->focus]->hasFrames()) {
+                return $this->frames[$this->focus]->setFrameFocusByIndex($choice);
+            }
+        }
+        if (($choice < 1) || ($choice > count($this->frames))) {
+            return false;
+        }
+        $this->focus = $choice - 1;
+        return true;
+    }
+
+    /**
+     *    Sets the focus by name. If already focused and the
+     *    target frame also has frames, then the nested frame
+     *    will be focused.
+     *    @param string $name    Chosen frame.
+     *    @return boolean        True if frame exists.
+     *    @access public
+     */
+    function setFrameFocus($name) {
+        if (is_integer($this->focus)) {
+            if ($this->frames[$this->focus]->hasFrames()) {
+                return $this->frames[$this->focus]->setFrameFocus($name);
+            }
+        }
+        if (in_array($name, array_keys($this->names))) {
+            $this->focus = $this->names[$name];
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     *    Clears the frame focus.
+     *    @access public
+     */
+    function clearFrameFocus() {
+        $this->focus = false;
+        $this->clearNestedFramesFocus();
+    }
+
+    /**
+     *    Clears the frame focus for any nested frames.
+     *    @access private
+     */
+    protected function clearNestedFramesFocus() {
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $this->frames[$i]->clearFrameFocus();
+        }
+    }
+
+    /**
+     *    Test for the presence of a frameset.
+     *    @return boolean        Always true.
+     *    @access public
+     */
+    function hasFrames() {
+        return true;
+    }
+
+    /**
+     *    Accessor for frames information.
+     *    @return array/string      Recursive hash of frame URL strings.
+     *                              The key is either a numerical
+     *                              index or the name attribute.
+     *    @access public
+     */
+    function getFrames() {
+        $report = array();
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $report[$this->getPublicNameFromIndex($i)] =
+                    $this->frames[$i]->getFrames();
+        }
+        return $report;
+    }
+
+    /**
+     *    Accessor for raw text of either all the pages or
+     *    the frame in focus.
+     *    @return string        Raw unparsed content.
+     *    @access public
+     */
+    function getRaw() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getRaw();
+        }
+        $raw = '';
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $raw .= $this->frames[$i]->getRaw();
+        }
+        return $raw;
+    }
+
+    /**
+     *    Accessor for plain text of either all the pages or
+     *    the frame in focus.
+     *    @return string        Plain text content.
+     *    @access public
+     */
+    function getText() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getText();
+        }
+        $raw = '';
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $raw .= ' ' . $this->frames[$i]->getText();
+        }
+        return trim($raw);
+    }
+
+    /**
+     *    Accessor for last error.
+     *    @return string        Error from last response.
+     *    @access public
+     */
+    function getTransportError() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getTransportError();
+        }
+        return $this->frameset->getTransportError();
+    }
+
+    /**
+     *    Request method used to fetch this frame.
+     *    @return string      GET, POST or HEAD.
+     *    @access public
+     */
+    function getMethod() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getMethod();
+        }
+        return $this->frameset->getMethod();
+    }
+
+    /**
+     *    Original resource name.
+     *    @return SimpleUrl        Current url.
+     *    @access public
+     */
+    function getUrl() {
+        if (is_integer($this->focus)) {
+            $url = $this->frames[$this->focus]->getUrl();
+            $url->setTarget($this->getPublicNameFromIndex($this->focus));
+        } else {
+            $url = $this->frameset->getUrl();
+        }
+        return $url;
+    }
+
+    /**
+     *    Page base URL.
+     *    @return SimpleUrl        Current url.
+     *    @access public
+     */
+    function getBaseUrl() {
+        if (is_integer($this->focus)) {
+            $url = $this->frames[$this->focus]->getBaseUrl();
+        } else {
+            $url = $this->frameset->getBaseUrl();
+        }
+        return $url;
+    }
+
+    /**
+     *    Expands expandomatic URLs into fully qualified
+     *    URLs for the frameset page.
+     *    @param SimpleUrl $url        Relative URL.
+     *    @return SimpleUrl            Absolute URL.
+     *    @access public
+     */
+    function expandUrl($url) {
+        return $this->frameset->expandUrl($url);
+    }
+
+    /**
+     *    Original request data.
+     *    @return mixed              Sent content.
+     *    @access public
+     */
+    function getRequestData() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getRequestData();
+        }
+        return $this->frameset->getRequestData();
+    }
+
+    /**
+     *    Accessor for current MIME type.
+     *    @return string    MIME type as string; e.g. 'text/html'
+     *    @access public
+     */
+    function getMimeType() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getMimeType();
+        }
+        return $this->frameset->getMimeType();
+    }
+
+    /**
+     *    Accessor for last response code.
+     *    @return integer    Last HTTP response code received.
+     *    @access public
+     */
+    function getResponseCode() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getResponseCode();
+        }
+        return $this->frameset->getResponseCode();
+    }
+
+    /**
+     *    Accessor for last Authentication type. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Description of challenge type.
+     *    @access public
+     */
+    function getAuthentication() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getAuthentication();
+        }
+        return $this->frameset->getAuthentication();
+    }
+
+    /**
+     *    Accessor for last Authentication realm. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Name of security realm.
+     *    @access public
+     */
+    function getRealm() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getRealm();
+        }
+        return $this->frameset->getRealm();
+    }
+
+    /**
+     *    Accessor for outgoing header information.
+     *    @return string      Header block.
+     *    @access public
+     */
+    function getRequest() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getRequest();
+        }
+        return $this->frameset->getRequest();
+    }
+
+    /**
+     *    Accessor for raw header information.
+     *    @return string      Header block.
+     *    @access public
+     */
+    function getHeaders() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getHeaders();
+        }
+        return $this->frameset->getHeaders();
+    }
+
+    /**
+     *    Accessor for parsed title.
+     *    @return string     Title or false if no title is present.
+     *    @access public
+     */
+    function getTitle() {
+        return $this->frameset->getTitle();
+    }
+
+    /**
+     *    Accessor for a list of all fixed links.
+     *    @return array   List of urls as strings.
+     *    @access public
+     */
+    function getUrls() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getUrls();
+        }
+        $urls = array();
+        foreach ($this->frames as $frame) {
+            $urls = array_merge($urls, $frame->getUrls());
+        }
+        return array_values(array_unique($urls));
+    }
+
+    /**
+     *    Accessor for URLs by the link label. Label will match
+     *    regardess of whitespace issues and case.
+     *    @param string $label    Text of link.
+     *    @return array           List of links with that label.
+     *    @access public
+     */
+    function getUrlsByLabel($label) {
+        if (is_integer($this->focus)) {
+            return $this->tagUrlsWithFrame(
+                    $this->frames[$this->focus]->getUrlsByLabel($label),
+                    $this->focus);
+        }
+        $urls = array();
+        foreach ($this->frames as $index => $frame) {
+            $urls = array_merge(
+                    $urls,
+                    $this->tagUrlsWithFrame(
+                                $frame->getUrlsByLabel($label),
+                                $index));
+        }
+        return $urls;
+    }
+
+    /**
+     *    Accessor for a URL by the id attribute. If in a frameset
+     *    then the first link found with that ID attribute is
+     *    returned only. Focus on a frame if you want one from
+     *    a specific part of the frameset.
+     *    @param string $id       Id attribute of link.
+     *    @return string          URL with that id.
+     *    @access public
+     */
+    function getUrlById($id) {
+        foreach ($this->frames as $index => $frame) {
+            if ($url = $frame->getUrlById($id)) {
+                if (! $url->gettarget()) {
+                    $url->setTarget($this->getPublicNameFromIndex($index));
+                }
+                return $url;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Attaches the intended frame index to a list of URLs.
+     *    @param array $urls        List of SimpleUrls.
+     *    @param string $frame      Name of frame or index.
+     *    @return array             List of tagged URLs.
+     *    @access private
+     */
+    protected function tagUrlsWithFrame($urls, $frame) {
+        $tagged = array();
+        foreach ($urls as $url) {
+            if (! $url->getTarget()) {
+                $url->setTarget($this->getPublicNameFromIndex($frame));
+            }
+            $tagged[] = $url;
+        }
+        return $tagged;
+    }
+
+    /**
+     *    Finds a held form by button label. Will only
+     *    search correctly built forms.
+     *    @param SimpleSelector $selector       Button finder.
+     *    @return SimpleForm                    Form object containing
+     *                                          the button.
+     *    @access public
+     */
+    function getFormBySubmit($selector) {
+        return $this->findForm('getFormBySubmit', $selector);
+    }
+
+    /**
+     *    Finds a held form by image using a selector.
+     *    Will only search correctly built forms. The first
+     *    form found either within the focused frame, or
+     *    across frames, will be the one returned.
+     *    @param SimpleSelector $selector  Image finder.
+     *    @return SimpleForm               Form object containing
+     *                                     the image.
+     *    @access public
+     */
+    function getFormByImage($selector) {
+        return $this->findForm('getFormByImage', $selector);
+    }
+
+    /**
+     *    Finds a held form by the form ID. A way of
+     *    identifying a specific form when we have control
+     *    of the HTML code. The first form found
+     *    either within the focused frame, or across frames,
+     *    will be the one returned.
+     *    @param string $id     Form label.
+     *    @return SimpleForm    Form object containing the matching ID.
+     *    @access public
+     */
+    function getFormById($id) {
+        return $this->findForm('getFormById', $id);
+    }
+
+    /**
+        *    General form finder. Will search all the frames or
+        *    just the one in focus.
+        *    @param string $method    Method to use to find in a page.
+        *    @param string $attribute Label, name or ID.
+        *    @return SimpleForm    Form object containing the matching ID.
+        *    @access private
+        */
+    protected function findForm($method, $attribute) {
+        if (is_integer($this->focus)) {
+            return $this->findFormInFrame(
+                    $this->frames[$this->focus],
+                    $this->focus,
+                    $method,
+                    $attribute);
+        }
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $form = $this->findFormInFrame(
+                    $this->frames[$i],
+                    $i,
+                    $method,
+                    $attribute);
+            if ($form) {
+                return $form;
+            }
+        }
+        $null = null;
+        return $null;
+    }
+
+    /**
+     *    Finds a form in a page using a form finding method. Will
+     *    also tag the form with the frame name it belongs in.
+     *    @param SimplePage $page  Page content of frame.
+     *    @param integer $index    Internal frame representation.
+     *    @param string $method    Method to use to find in a page.
+     *    @param string $attribute Label, name or ID.
+     *    @return SimpleForm       Form object containing the matching ID.
+     *    @access private
+     */
+    protected function findFormInFrame($page, $index, $method, $attribute) {
+        $form = $this->frames[$index]->$method($attribute);
+        if (isset($form)) {
+            $form->setDefaultTarget($this->getPublicNameFromIndex($index));
+        }
+        return $form;
+    }
+
+    /**
+     *    Sets a field on each form in which the field is
+     *    available.
+     *    @param SimpleSelector $selector    Field finder.
+     *    @param string $value               Value to set field to.
+     *    @return boolean                    True if value is valid.
+     *    @access public
+     */
+    function setField($selector, $value) {
+        if (is_integer($this->focus)) {
+            $this->frames[$this->focus]->setField($selector, $value);
+        } else {
+            for ($i = 0; $i < count($this->frames); $i++) {
+                $this->frames[$i]->setField($selector, $value);
+            }
+        }
+    }
+
+    /**
+     *    Accessor for a form element value within a page.
+     *    @param SimpleSelector $selector    Field finder.
+     *    @return string/boolean             A string if the field is
+     *                                       present, false if unchecked
+     *                                       and null if missing.
+     *    @access public
+     */
+    function getField($selector) {
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $value = $this->frames[$i]->getField($selector);
+            if (isset($value)) {
+                return $value;
+            }
+        }
+        return null;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/http.php b/3rdparty/simpletest/http.php
new file mode 100644
index 00000000000..1bd74031a48
--- /dev/null
+++ b/3rdparty/simpletest/http.php
@@ -0,0 +1,628 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: http.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/socket.php');
+require_once(dirname(__FILE__) . '/cookies.php');
+require_once(dirname(__FILE__) . '/url.php');
+/**#@-*/
+
+/**
+ *    Creates HTTP headers for the end point of
+ *    a HTTP request.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleRoute {
+    private $url;
+
+    /**
+     *    Sets the target URL.
+     *    @param SimpleUrl $url   URL as object.
+     *    @access public
+     */
+    function __construct($url) {
+        $this->url = $url;
+    }
+
+    /**
+     *    Resource name.
+     *    @return SimpleUrl        Current url.
+     *    @access protected
+     */
+    function getUrl() {
+        return $this->url;
+    }
+
+    /**
+     *    Creates the first line which is the actual request.
+     *    @param string $method   HTTP request method, usually GET.
+     *    @return string          Request line content.
+     *    @access protected
+     */
+    protected function getRequestLine($method) {
+        return $method . ' ' . $this->url->getPath() .
+                $this->url->getEncodedRequest() . ' HTTP/1.0';
+    }
+
+    /**
+     *    Creates the host part of the request.
+     *    @return string          Host line content.
+     *    @access protected
+     */
+    protected function getHostLine() {
+        $line = 'Host: ' . $this->url->getHost();
+        if ($this->url->getPort()) {
+            $line .= ':' . $this->url->getPort();
+        }
+        return $line;
+    }
+
+    /**
+     *    Opens a socket to the route.
+     *    @param string $method      HTTP request method, usually GET.
+     *    @param integer $timeout    Connection timeout.
+     *    @return SimpleSocket       New socket.
+     *    @access public
+     */
+    function createConnection($method, $timeout) {
+        $default_port = ('https' == $this->url->getScheme()) ? 443 : 80;
+        $socket = $this->createSocket(
+                $this->url->getScheme() ? $this->url->getScheme() : 'http',
+                $this->url->getHost(),
+                $this->url->getPort() ? $this->url->getPort() : $default_port,
+                $timeout);
+        if (! $socket->isError()) {
+            $socket->write($this->getRequestLine($method) . "\r\n");
+            $socket->write($this->getHostLine() . "\r\n");
+            $socket->write("Connection: close\r\n");
+        }
+        return $socket;
+    }
+
+    /**
+     *    Factory for socket.
+     *    @param string $scheme                   Protocol to use.
+     *    @param string $host                     Hostname to connect to.
+     *    @param integer $port                    Remote port.
+     *    @param integer $timeout                 Connection timeout.
+     *    @return SimpleSocket/SimpleSecureSocket New socket.
+     *    @access protected
+     */
+    protected function createSocket($scheme, $host, $port, $timeout) {
+        if (in_array($scheme, array('file'))) {
+            return new SimpleFileSocket($this->url);
+        } elseif (in_array($scheme, array('https'))) {
+            return new SimpleSecureSocket($host, $port, $timeout);
+        } else {
+            return new SimpleSocket($host, $port, $timeout);
+        }
+    }
+}
+
+/**
+ *    Creates HTTP headers for the end point of
+ *    a HTTP request via a proxy server.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleProxyRoute extends SimpleRoute {
+    private $proxy;
+    private $username;
+    private $password;
+
+    /**
+     *    Stashes the proxy address.
+     *    @param SimpleUrl $url     URL as object.
+     *    @param string $proxy      Proxy URL.
+     *    @param string $username   Username for autentication.
+     *    @param string $password   Password for autentication.
+     *    @access public
+     */
+    function __construct($url, $proxy, $username = false, $password = false) {
+        parent::__construct($url);
+        $this->proxy = $proxy;
+        $this->username = $username;
+        $this->password = $password;
+    }
+
+    /**
+     *    Creates the first line which is the actual request.
+     *    @param string $method   HTTP request method, usually GET.
+     *    @param SimpleUrl $url   URL as object.
+     *    @return string          Request line content.
+     *    @access protected
+     */
+    function getRequestLine($method) {
+        $url = $this->getUrl();
+        $scheme = $url->getScheme() ? $url->getScheme() : 'http';
+        $port = $url->getPort() ? ':' . $url->getPort() : '';
+        return $method . ' ' . $scheme . '://' . $url->getHost() . $port .
+                $url->getPath() . $url->getEncodedRequest() . ' HTTP/1.0';
+    }
+
+    /**
+     *    Creates the host part of the request.
+     *    @param SimpleUrl $url   URL as object.
+     *    @return string          Host line content.
+     *    @access protected
+     */
+    function getHostLine() {
+        $host = 'Host: ' . $this->proxy->getHost();
+        $port = $this->proxy->getPort() ? $this->proxy->getPort() : 8080;
+        return "$host:$port";
+    }
+
+    /**
+     *    Opens a socket to the route.
+     *    @param string $method       HTTP request method, usually GET.
+     *    @param integer $timeout     Connection timeout.
+     *    @return SimpleSocket        New socket.
+     *    @access public
+     */
+    function createConnection($method, $timeout) {
+        $socket = $this->createSocket(
+                $this->proxy->getScheme() ? $this->proxy->getScheme() : 'http',
+                $this->proxy->getHost(),
+                $this->proxy->getPort() ? $this->proxy->getPort() : 8080,
+                $timeout);
+        if ($socket->isError()) {
+            return $socket;
+        }
+        $socket->write($this->getRequestLine($method) . "\r\n");
+        $socket->write($this->getHostLine() . "\r\n");
+        if ($this->username && $this->password) {
+            $socket->write('Proxy-Authorization: Basic ' .
+                    base64_encode($this->username . ':' . $this->password) .
+                    "\r\n");
+        }
+        $socket->write("Connection: close\r\n");
+        return $socket;
+    }
+}
+
+/**
+ *    HTTP request for a web page. Factory for
+ *    HttpResponse object.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHttpRequest {
+    private $route;
+    private $encoding;
+    private $headers;
+    private $cookies;
+
+    /**
+     *    Builds the socket request from the different pieces.
+     *    These include proxy information, URL, cookies, headers,
+     *    request method and choice of encoding.
+     *    @param SimpleRoute $route              Request route.
+     *    @param SimpleFormEncoding $encoding    Content to send with
+     *                                           request.
+     *    @access public
+     */
+    function __construct($route, $encoding) {
+        $this->route = $route;
+        $this->encoding = $encoding;
+        $this->headers = array();
+        $this->cookies = array();
+    }
+
+    /**
+     *    Dispatches the content to the route's socket.
+     *    @param integer $timeout      Connection timeout.
+     *    @return SimpleHttpResponse   A response which may only have
+     *                                 an error, but hopefully has a
+     *                                 complete web page.
+     *    @access public
+     */
+    function fetch($timeout) {
+        $socket = $this->route->createConnection($this->encoding->getMethod(), $timeout);
+        if (! $socket->isError()) {
+            $this->dispatchRequest($socket, $this->encoding);
+        }
+        return $this->createResponse($socket);
+    }
+
+    /**
+     *    Sends the headers.
+     *    @param SimpleSocket $socket           Open socket.
+     *    @param string $method                 HTTP request method,
+     *                                          usually GET.
+     *    @param SimpleFormEncoding $encoding   Content to send with request.
+     *    @access private
+     */
+    protected function dispatchRequest($socket, $encoding) {
+        foreach ($this->headers as $header_line) {
+            $socket->write($header_line . "\r\n");
+        }
+        if (count($this->cookies) > 0) {
+            $socket->write("Cookie: " . implode(";", $this->cookies) . "\r\n");
+        }
+        $encoding->writeHeadersTo($socket);
+        $socket->write("\r\n");
+        $encoding->writeTo($socket);
+    }
+
+    /**
+     *    Adds a header line to the request.
+     *    @param string $header_line    Text of full header line.
+     *    @access public
+     */
+    function addHeaderLine($header_line) {
+        $this->headers[] = $header_line;
+    }
+
+    /**
+     *    Reads all the relevant cookies from the
+     *    cookie jar.
+     *    @param SimpleCookieJar $jar     Jar to read
+     *    @param SimpleUrl $url           Url to use for scope.
+     *    @access public
+     */
+    function readCookiesFromJar($jar, $url) {
+        $this->cookies = $jar->selectAsPairs($url);
+    }
+
+    /**
+     *    Wraps the socket in a response parser.
+     *    @param SimpleSocket $socket   Responding socket.
+     *    @return SimpleHttpResponse    Parsed response object.
+     *    @access protected
+     */
+    protected function createResponse($socket) {
+        $response = new SimpleHttpResponse(
+                $socket,
+                $this->route->getUrl(),
+                $this->encoding);
+        $socket->close();
+        return $response;
+    }
+}
+
+/**
+ *    Collection of header lines in the response.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHttpHeaders {
+    private $raw_headers;
+    private $response_code;
+    private $http_version;
+    private $mime_type;
+    private $location;
+    private $cookies;
+    private $authentication;
+    private $realm;
+
+    /**
+     *    Parses the incoming header block.
+     *    @param string $headers     Header block.
+     *    @access public
+     */
+    function __construct($headers) {
+        $this->raw_headers = $headers;
+        $this->response_code = false;
+        $this->http_version = false;
+        $this->mime_type = '';
+        $this->location = false;
+        $this->cookies = array();
+        $this->authentication = false;
+        $this->realm = false;
+        foreach (explode("\r\n", $headers) as $header_line) {
+            $this->parseHeaderLine($header_line);
+        }
+    }
+
+    /**
+     *    Accessor for parsed HTTP protocol version.
+     *    @return integer           HTTP error code.
+     *    @access public
+     */
+    function getHttpVersion() {
+        return $this->http_version;
+    }
+
+    /**
+     *    Accessor for raw header block.
+     *    @return string        All headers as raw string.
+     *    @access public
+     */
+    function getRaw() {
+        return $this->raw_headers;
+    }
+
+    /**
+     *    Accessor for parsed HTTP error code.
+     *    @return integer           HTTP error code.
+     *    @access public
+     */
+    function getResponseCode() {
+        return (integer)$this->response_code;
+    }
+
+    /**
+     *    Returns the redirected URL or false if
+     *    no redirection.
+     *    @return string      URL or false for none.
+     *    @access public
+     */
+    function getLocation() {
+        return $this->location;
+    }
+
+    /**
+     *    Test to see if the response is a valid redirect.
+     *    @return boolean       True if valid redirect.
+     *    @access public
+     */
+    function isRedirect() {
+        return in_array($this->response_code, array(301, 302, 303, 307)) &&
+                (boolean)$this->getLocation();
+    }
+
+    /**
+     *    Test to see if the response is an authentication
+     *    challenge.
+     *    @return boolean       True if challenge.
+     *    @access public
+     */
+    function isChallenge() {
+        return ($this->response_code == 401) &&
+                (boolean)$this->authentication &&
+                (boolean)$this->realm;
+    }
+
+    /**
+     *    Accessor for MIME type header information.
+     *    @return string           MIME type.
+     *    @access public
+     */
+    function getMimeType() {
+        return $this->mime_type;
+    }
+
+    /**
+     *    Accessor for authentication type.
+     *    @return string        Type.
+     *    @access public
+     */
+    function getAuthentication() {
+        return $this->authentication;
+    }
+
+    /**
+     *    Accessor for security realm.
+     *    @return string        Realm.
+     *    @access public
+     */
+    function getRealm() {
+        return $this->realm;
+    }
+
+    /**
+     *    Writes new cookies to the cookie jar.
+     *    @param SimpleCookieJar $jar   Jar to write to.
+     *    @param SimpleUrl $url         Host and path to write under.
+     *    @access public
+     */
+    function writeCookiesToJar($jar, $url) {
+        foreach ($this->cookies as $cookie) {
+            $jar->setCookie(
+                    $cookie->getName(),
+                    $cookie->getValue(),
+                    $url->getHost(),
+                    $cookie->getPath(),
+                    $cookie->getExpiry());
+        }
+    }
+
+    /**
+     *    Called on each header line to accumulate the held
+     *    data within the class.
+     *    @param string $header_line        One line of header.
+     *    @access protected
+     */
+    protected function parseHeaderLine($header_line) {
+        if (preg_match('/HTTP\/(\d+\.\d+)\s+(\d+)/i', $header_line, $matches)) {
+            $this->http_version = $matches[1];
+            $this->response_code = $matches[2];
+        }
+        if (preg_match('/Content-type:\s*(.*)/i', $header_line, $matches)) {
+            $this->mime_type = trim($matches[1]);
+        }
+        if (preg_match('/Location:\s*(.*)/i', $header_line, $matches)) {
+            $this->location = trim($matches[1]);
+        }
+        if (preg_match('/Set-cookie:(.*)/i', $header_line, $matches)) {
+            $this->cookies[] = $this->parseCookie($matches[1]);
+        }
+        if (preg_match('/WWW-Authenticate:\s+(\S+)\s+realm=\"(.*?)\"/i', $header_line, $matches)) {
+            $this->authentication = $matches[1];
+            $this->realm = trim($matches[2]);
+        }
+    }
+
+    /**
+     *    Parse the Set-cookie content.
+     *    @param string $cookie_line    Text after "Set-cookie:"
+     *    @return SimpleCookie          New cookie object.
+     *    @access private
+     */
+    protected function parseCookie($cookie_line) {
+        $parts = explode(";", $cookie_line);
+        $cookie = array();
+        preg_match('/\s*(.*?)\s*=(.*)/', array_shift($parts), $cookie);
+        foreach ($parts as $part) {
+            if (preg_match('/\s*(.*?)\s*=(.*)/', $part, $matches)) {
+                $cookie[$matches[1]] = trim($matches[2]);
+            }
+        }
+        return new SimpleCookie(
+                $cookie[1],
+                trim($cookie[2]),
+                isset($cookie["path"]) ? $cookie["path"] : "",
+                isset($cookie["expires"]) ? $cookie["expires"] : false);
+    }
+}
+
+/**
+ *    Basic HTTP response.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHttpResponse extends SimpleStickyError {
+    private $url;
+    private $encoding;
+    private $sent;
+    private $content;
+    private $headers;
+
+    /**
+     *    Constructor. Reads and parses the incoming
+     *    content and headers.
+     *    @param SimpleSocket $socket   Network connection to fetch
+     *                                  response text from.
+     *    @param SimpleUrl $url         Resource name.
+     *    @param mixed $encoding        Record of content sent.
+     *    @access public
+     */
+    function __construct($socket, $url, $encoding) {
+        parent::__construct();
+        $this->url = $url;
+        $this->encoding = $encoding;
+        $this->sent = $socket->getSent();
+        $this->content = false;
+        $raw = $this->readAll($socket);
+        if ($socket->isError()) {
+            $this->setError('Error reading socket [' . $socket->getError() . ']');
+            return;
+        }
+        $this->parse($raw);
+    }
+
+    /**
+     *    Splits up the headers and the rest of the content.
+     *    @param string $raw    Content to parse.
+     *    @access private
+     */
+    protected function parse($raw) {
+        if (! $raw) {
+            $this->setError('Nothing fetched');
+            $this->headers = new SimpleHttpHeaders('');
+        } elseif ('file' == $this->url->getScheme()) {
+            $this->headers = new SimpleHttpHeaders('');
+            $this->content = $raw;
+        } elseif (! strstr($raw, "\r\n\r\n")) {
+            $this->setError('Could not split headers from content');
+            $this->headers = new SimpleHttpHeaders($raw);
+        } else {
+            list($headers, $this->content) = explode("\r\n\r\n", $raw, 2);
+            $this->headers = new SimpleHttpHeaders($headers);
+        }
+    }
+
+    /**
+     *    Original request method.
+     *    @return string        GET, POST or HEAD.
+     *    @access public
+     */
+    function getMethod() {
+        return $this->encoding->getMethod();
+    }
+
+    /**
+     *    Resource name.
+     *    @return SimpleUrl        Current url.
+     *    @access public
+     */
+    function getUrl() {
+        return $this->url;
+    }
+
+    /**
+     *    Original request data.
+     *    @return mixed              Sent content.
+     *    @access public
+     */
+    function getRequestData() {
+        return $this->encoding;
+    }
+
+    /**
+     *    Raw request that was sent down the wire.
+     *    @return string        Bytes actually sent.
+     *    @access public
+     */
+    function getSent() {
+        return $this->sent;
+    }
+
+    /**
+     *    Accessor for the content after the last
+     *    header line.
+     *    @return string           All content.
+     *    @access public
+     */
+    function getContent() {
+        return $this->content;
+    }
+
+    /**
+     *    Accessor for header block. The response is the
+     *    combination of this and the content.
+     *    @return SimpleHeaders        Wrapped header block.
+     *    @access public
+     */
+    function getHeaders() {
+        return $this->headers;
+    }
+
+    /**
+     *    Accessor for any new cookies.
+     *    @return array       List of new cookies.
+     *    @access public
+     */
+    function getNewCookies() {
+        return $this->headers->getNewCookies();
+    }
+
+    /**
+     *    Reads the whole of the socket output into a
+     *    single string.
+     *    @param SimpleSocket $socket  Unread socket.
+     *    @return string               Raw output if successful
+     *                                 else false.
+     *    @access private
+     */
+    protected function readAll($socket) {
+        $all = '';
+        while (! $this->isLastPacket($next = $socket->read())) {
+            $all .= $next;
+        }
+        return $all;
+    }
+
+    /**
+     *    Test to see if the packet from the socket is the
+     *    last one.
+     *    @param string $packet    Chunk to interpret.
+     *    @return boolean          True if empty or EOF.
+     *    @access private
+     */
+    protected function isLastPacket($packet) {
+        if (is_string($packet)) {
+            return $packet === '';
+        }
+        return ! $packet;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/invoker.php b/3rdparty/simpletest/invoker.php
new file mode 100755
index 00000000000..ee310343fc7
--- /dev/null
+++ b/3rdparty/simpletest/invoker.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: invoker.php 1785 2008-04-26 13:56:41Z pp11 $
+ */
+
+/**#@+
+ * Includes SimpleTest files and defined the root constant
+ * for dependent libraries.
+ */
+require_once(dirname(__FILE__) . '/errors.php');
+require_once(dirname(__FILE__) . '/compatibility.php');
+require_once(dirname(__FILE__) . '/scorer.php');
+require_once(dirname(__FILE__) . '/expectation.php');
+require_once(dirname(__FILE__) . '/dumper.php');
+if (! defined('SIMPLE_TEST')) {
+    define('SIMPLE_TEST', dirname(__FILE__) . '/');
+}
+/**#@-*/
+
+/**
+ *    This is called by the class runner to run a
+ *    single test method. Will also run the setUp()
+ *    and tearDown() methods.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleInvoker {
+    private $test_case;
+
+    /**
+     *    Stashes the test case for later.
+     *    @param SimpleTestCase $test_case  Test case to run.
+     */
+    function __construct($test_case) {
+        $this->test_case = $test_case;
+    }
+
+    /**
+     *    Accessor for test case being run.
+     *    @return SimpleTestCase    Test case.
+     *    @access public
+     */
+    function getTestCase() {
+        return $this->test_case;
+    }
+
+    /**
+     *    Runs test level set up. Used for changing
+     *    the mechanics of base test cases.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function before($method) {
+        $this->test_case->before($method);
+    }
+
+    /**
+     *    Invokes a test method and buffered with setUp()
+     *    and tearDown() calls.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function invoke($method) {
+        $this->test_case->setUp();
+        $this->test_case->$method();
+        $this->test_case->tearDown();
+    }
+
+    /**
+     *    Runs test level clean up. Used for changing
+     *    the mechanics of base test cases.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function after($method) {
+        $this->test_case->after($method);
+    }
+}
+
+/**
+ *    Do nothing decorator. Just passes the invocation
+ *    straight through.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleInvokerDecorator {
+    private $invoker;
+
+    /**
+     *    Stores the invoker to wrap.
+     *    @param SimpleInvoker $invoker  Test method runner.
+     */
+    function __construct($invoker) {
+        $this->invoker = $invoker;
+    }
+
+    /**
+     *    Accessor for test case being run.
+     *    @return SimpleTestCase    Test case.
+     *    @access public
+     */
+    function getTestCase() {
+        return $this->invoker->getTestCase();
+    }
+
+    /**
+     *    Runs test level set up. Used for changing
+     *    the mechanics of base test cases.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function before($method) {
+        $this->invoker->before($method);
+    }
+
+    /**
+     *    Invokes a test method and buffered with setUp()
+     *    and tearDown() calls.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function invoke($method) {
+        $this->invoker->invoke($method);
+    }
+
+    /**
+     *    Runs test level clean up. Used for changing
+     *    the mechanics of base test cases.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function after($method) {
+        $this->invoker->after($method);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/mock_objects.php b/3rdparty/simpletest/mock_objects.php
new file mode 100755
index 00000000000..93a827b6c02
--- /dev/null
+++ b/3rdparty/simpletest/mock_objects.php
@@ -0,0 +1,1641 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage MockObjects
+ *  @version    $Id: mock_objects.php 1973 2009-12-22 01:16:59Z lastcraft $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/expectation.php');
+require_once(dirname(__FILE__) . '/simpletest.php');
+require_once(dirname(__FILE__) . '/dumper.php');
+require_once(dirname(__FILE__) . '/reflection_php5.php');
+/**#@-*/
+
+/**
+ * Default character simpletest will substitute for any value
+ */
+if (! defined('MOCK_ANYTHING')) {
+    define('MOCK_ANYTHING', '*');
+}
+
+/**
+ *    Parameter comparison assertion.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class ParametersExpectation extends SimpleExpectation {
+    private $expected;
+
+    /**
+     *    Sets the expected parameter list.
+     *    @param array $parameters  Array of parameters including
+     *                              those that are wildcarded.
+     *                              If the value is not an array
+     *                              then it is considered to match any.
+     *    @param string $message    Customised message on failure.
+     */
+    function __construct($expected = false, $message = '%s') {
+        parent::__construct($message);
+        $this->expected = $expected;
+    }
+
+    /**
+     *    Tests the assertion. True if correct.
+     *    @param array $parameters     Comparison values.
+     *    @return boolean              True if correct.
+     */
+    function test($parameters) {
+        if (! is_array($this->expected)) {
+            return true;
+        }
+        if (count($this->expected) != count($parameters)) {
+            return false;
+        }
+        for ($i = 0; $i < count($this->expected); $i++) {
+            if (! $this->testParameter($parameters[$i], $this->expected[$i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Tests an individual parameter.
+     *    @param mixed $parameter    Value to test.
+     *    @param mixed $expected     Comparison value.
+     *    @return boolean            True if expectation
+     *                               fulfilled.
+     */
+    protected function testParameter($parameter, $expected) {
+        $comparison = $this->coerceToExpectation($expected);
+        return $comparison->test($parameter);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param array $comparison   Incoming parameter list.
+     *    @return string             Description of success
+     *                               or failure.
+     */
+    function testMessage($parameters) {
+        if ($this->test($parameters)) {
+            return "Expectation of " . count($this->expected) .
+                    " arguments of [" . $this->renderArguments($this->expected) .
+                    "] is correct";
+        } else {
+            return $this->describeDifference($this->expected, $parameters);
+        }
+    }
+
+    /**
+     *    Message to display if expectation differs from
+     *    the parameters actually received.
+     *    @param array $expected      Expected parameters as list.
+     *    @param array $parameters    Actual parameters received.
+     *    @return string              Description of difference.
+     */
+    protected function describeDifference($expected, $parameters) {
+        if (count($expected) != count($parameters)) {
+            return "Expected " . count($expected) .
+                    " arguments of [" . $this->renderArguments($expected) .
+                    "] but got " . count($parameters) .
+                    " arguments of [" . $this->renderArguments($parameters) . "]";
+        }
+        $messages = array();
+        for ($i = 0; $i < count($expected); $i++) {
+            $comparison = $this->coerceToExpectation($expected[$i]);
+            if (! $comparison->test($parameters[$i])) {
+                $messages[] = "parameter " . ($i + 1) . " with [" .
+                        $comparison->overlayMessage($parameters[$i], $this->getDumper()) . "]";
+            }
+        }
+        return "Parameter expectation differs at " . implode(" and ", $messages);
+    }
+
+    /**
+     *    Creates an identical expectation if the
+     *    object/value is not already some type
+     *    of expectation.
+     *    @param mixed $expected      Expected value.
+     *    @return SimpleExpectation   Expectation object.
+     */
+    protected function coerceToExpectation($expected) {
+        if (SimpleExpectation::isExpectation($expected)) {
+            return $expected;
+        }
+        return new IdenticalExpectation($expected);
+    }
+
+    /**
+     *    Renders the argument list as a string for
+     *    messages.
+     *    @param array $args    Incoming arguments.
+     *    @return string        Simple description of type and value.
+     */
+    protected function renderArguments($args) {
+        $descriptions = array();
+        if (is_array($args)) {
+            foreach ($args as $arg) {
+                $dumper = new SimpleDumper();
+                $descriptions[] = $dumper->describeValue($arg);
+            }
+        }
+        return implode(', ', $descriptions);
+    }
+}
+
+/**
+ *    Confirms that the number of calls on a method is as expected.
+ *  @package    SimpleTest
+ *  @subpackage MockObjects
+ */
+class CallCountExpectation extends SimpleExpectation {
+    private $method;
+    private $count;
+
+    /**
+     *    Stashes the method and expected count for later
+     *    reporting.
+     *    @param string $method    Name of method to confirm against.
+     *    @param integer $count    Expected number of calls.
+     *    @param string $message   Custom error message.
+     */
+    function __construct($method, $count, $message = '%s') {
+        $this->method = $method;
+        $this->count = $count;
+        parent::__construct($message);
+    }
+
+    /**
+     *    Tests the assertion. True if correct.
+     *    @param integer $compare     Measured call count.
+     *    @return boolean             True if expected.
+     */
+    function test($compare) {
+        return ($this->count == $compare);
+    }
+
+    /**
+     *    Reports the comparison.
+     *    @param integer $compare     Measured call count.
+     *    @return string              Message to show.
+     */
+    function testMessage($compare) {
+        return 'Expected call count for [' . $this->method .
+                '] was [' . $this->count .
+                '] got [' . $compare . ']';
+    }
+}
+
+/**
+ *    Confirms that the number of calls on a method is as expected.
+ *  @package    SimpleTest
+ *  @subpackage MockObjects
+ */
+class MinimumCallCountExpectation extends SimpleExpectation {
+    private $method;
+    private $count;
+
+    /**
+     *    Stashes the method and expected count for later
+     *    reporting.
+     *    @param string $method    Name of method to confirm against.
+     *    @param integer $count    Minimum number of calls.
+     *    @param string $message   Custom error message.
+     */
+    function __construct($method, $count, $message = '%s') {
+        $this->method = $method;
+        $this->count = $count;
+        parent::__construct($message);
+    }
+
+    /**
+     *    Tests the assertion. True if correct.
+     *    @param integer $compare     Measured call count.
+     *    @return boolean             True if enough.
+     */
+    function test($compare) {
+        return ($this->count <= $compare);
+    }
+
+    /**
+     *    Reports the comparison.
+     *    @param integer $compare     Measured call count.
+     *    @return string              Message to show.
+     */
+    function testMessage($compare) {
+        return 'Minimum call count for [' . $this->method .
+                '] was [' . $this->count .
+                '] got [' . $compare . ']';
+    }
+}
+
+/**
+ *    Confirms that the number of calls on a method is as expected.
+ *    @package      SimpleTest
+ *    @subpackage   MockObjects
+ */
+class MaximumCallCountExpectation extends SimpleExpectation {
+    private $method;
+    private $count;
+
+    /**
+     *    Stashes the method and expected count for later
+     *    reporting.
+     *    @param string $method    Name of method to confirm against.
+     *    @param integer $count    Minimum number of calls.
+     *    @param string $message   Custom error message.
+     */
+    function __construct($method, $count, $message = '%s') {
+        $this->method = $method;
+        $this->count = $count;
+        parent::__construct($message);
+    }
+
+    /**
+     *    Tests the assertion. True if correct.
+     *    @param integer $compare     Measured call count.
+     *    @return boolean             True if not over.
+     */
+    function test($compare) {
+        return ($this->count >= $compare);
+    }
+
+    /**
+     *    Reports the comparison.
+     *    @param integer $compare     Measured call count.
+     *    @return string              Message to show.
+     */
+    function testMessage($compare) {
+        return 'Maximum call count for [' . $this->method .
+                '] was [' . $this->count .
+                '] got [' . $compare . ']';
+    }
+}
+
+/**
+ *    Retrieves method actions by searching the
+ *    parameter lists until an expected match is found.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleSignatureMap {
+    private $map;
+
+    /**
+     *    Creates an empty call map.
+     */
+    function __construct() {
+        $this->map = array();
+    }
+
+    /**
+     *    Stashes a reference against a method call.
+     *    @param array $parameters    Array of arguments (including wildcards).
+     *    @param mixed $action        Reference placed in the map.
+     */
+    function add($parameters, $action) {
+        $place = count($this->map);
+        $this->map[$place] = array();
+        $this->map[$place]['params'] = new ParametersExpectation($parameters);
+        $this->map[$place]['content'] = $action;
+    }
+
+    /**
+     *    Searches the call list for a matching parameter
+     *    set. Returned by reference.
+     *    @param array $parameters    Parameters to search by
+     *                                without wildcards.
+     *    @return object              Object held in the first matching
+     *                                slot, otherwise null.
+     */
+    function &findFirstAction($parameters) {
+        $slot = $this->findFirstSlot($parameters);
+        if (isset($slot) && isset($slot['content'])) {
+            return $slot['content'];
+        }
+        $null = null;
+        return $null;
+    }
+
+    /**
+     *    Searches the call list for a matching parameter
+     *    set. True if successful.
+     *    @param array $parameters    Parameters to search by
+     *                                without wildcards.
+     *    @return boolean             True if a match is present.
+     */
+    function isMatch($parameters) {
+        return ($this->findFirstSlot($parameters) != null);
+    }
+
+    /**
+     *    Compares the incoming parameters with the
+     *    internal expectation. Uses the incoming $test
+     *    to dispatch the test message.
+     *    @param SimpleTestCase $test   Test to dispatch to.
+     *    @param array $parameters      The actual calling arguments.
+     *    @param string $message        The message to overlay.
+     */
+    function test($test, $parameters, $message) {
+    }
+
+    /**
+     *    Searches the map for a matching item.
+     *    @param array $parameters    Parameters to search by
+     *                                without wildcards.
+     *    @return array               Reference to slot or null.
+     */
+    function &findFirstSlot($parameters) {
+        $count = count($this->map);
+        for ($i = 0; $i < $count; $i++) {
+            if ($this->map[$i]["params"]->test($parameters)) {
+                return $this->map[$i];
+            }
+        }
+        $null = null;
+        return $null;
+    }
+}
+
+/**
+ *    Allows setting of actions against call signatures either
+ *    at a specific time, or always. Specific time settings
+ *    trump lasting ones, otherwise the most recently added
+ *    will mask an earlier match.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleCallSchedule {
+    private $wildcard = MOCK_ANYTHING;
+    private $always;
+    private $at;
+
+    /**
+     *    Sets up an empty response schedule.
+     *    Creates an empty call map.
+     */
+    function __construct() {
+        $this->always = array();
+        $this->at = array();
+    }
+
+    /**
+     *    Stores an action against a signature that
+     *    will always fire unless masked by a time
+     *    specific one.
+     *    @param string $method        Method name.
+     *    @param array $args           Calling parameters.
+     *    @param SimpleAction $action  Actually simpleByValue, etc.
+     */
+    function register($method, $args, $action) {
+        $args = $this->replaceWildcards($args);
+        $method = strtolower($method);
+        if (! isset($this->always[$method])) {
+            $this->always[$method] = new SimpleSignatureMap();
+        }
+        $this->always[$method]->add($args, $action);
+    }
+
+    /**
+     *    Stores an action against a signature that
+     *    will fire at a specific time in the future.
+     *    @param integer $step         delay of calls to this method,
+     *                                 0 is next.
+     *    @param string $method        Method name.
+     *    @param array $args           Calling parameters.
+     *    @param SimpleAction $action  Actually SimpleByValue, etc.
+     */
+    function registerAt($step, $method, $args, $action) {
+        $args = $this->replaceWildcards($args);
+        $method = strtolower($method);
+        if (! isset($this->at[$method])) {
+            $this->at[$method] = array();
+        }
+        if (! isset($this->at[$method][$step])) {
+            $this->at[$method][$step] = new SimpleSignatureMap();
+        }
+        $this->at[$method][$step]->add($args, $action);
+    }
+
+    /**
+     *  Sets up an expectation on the argument list.
+     *  @param string $method       Method to test.
+     *  @param array $args          Bare arguments or list of
+     *                              expectation objects.
+     *  @param string $message      Failure message.
+     */
+    function expectArguments($method, $args, $message) {
+        $args = $this->replaceWildcards($args);
+        $message .= Mock::getExpectationLine();
+        $this->expected_args[strtolower($method)] =
+                new ParametersExpectation($args, $message);
+
+    }
+
+    /**
+     *    Actually carry out the action stored previously,
+     *    if the parameters match.
+     *    @param integer $step      Time of call.
+     *    @param string $method     Method name.
+     *    @param array $args        The parameters making up the
+     *                              rest of the call.
+     *    @return mixed             The result of the action.
+     */
+    function &respond($step, $method, $args) {
+        $method = strtolower($method);
+        if (isset($this->at[$method][$step])) {
+            if ($this->at[$method][$step]->isMatch($args)) {
+                $action = $this->at[$method][$step]->findFirstAction($args);
+                if (isset($action)) {
+                    return $action->act();
+                }
+            }
+        }
+        if (isset($this->always[$method])) {
+            $action = $this->always[$method]->findFirstAction($args);
+            if (isset($action)) {
+                return $action->act();
+            }
+        }
+        $null = null;
+        return $null;
+    }
+
+    /**
+     *    Replaces wildcard matches with wildcard
+     *    expectations in the argument list.
+     *    @param array $args      Raw argument list.
+     *    @return array           Argument list with
+     *                            expectations.
+     */
+    protected function replaceWildcards($args) {
+        if ($args === false) {
+            return false;
+        }
+        for ($i = 0; $i < count($args); $i++) {
+            if ($args[$i] === $this->wildcard) {
+                $args[$i] = new AnythingExpectation();
+            }
+        }
+        return $args;
+    }
+}
+
+/**
+ *    A type of SimpleMethodAction.
+ *    Stashes a value for returning later. Follows usual
+ *    PHP5 semantics of objects being returned by reference.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleReturn {
+    private $value;
+
+    /**
+     *    Stashes it for later.
+     *    @param mixed $value     You need to clone objects
+     *                            if you want copy semantics
+     *                            for these.
+     */
+    function __construct($value) {
+        $this->value = $value;
+    }
+
+    /**
+     *    Returns the value stored earlier.
+     *    @return mixed    Whatever was stashed.
+     */
+    function act() {
+        return $this->value;
+    }
+}
+
+/**
+ *    A type of SimpleMethodAction.
+ *    Stashes a reference for returning later.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleByReference {
+    private $reference;
+
+    /**
+     *    Stashes it for later.
+     *    @param mixed $reference     Actual PHP4 style reference.
+     */
+    function __construct(&$reference) {
+        $this->reference = &$reference;
+    }
+
+    /**
+     *    Returns the reference stored earlier.
+     *    @return mixed    Whatever was stashed.
+     */
+    function &act() {
+        return $this->reference;
+    }
+}
+
+/**
+ *    A type of SimpleMethodAction.
+ *    Stashes a value for returning later.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleByValue {
+    private $value;
+
+    /**
+     *    Stashes it for later.
+     *    @param mixed $value     You need to clone objects
+     *                            if you want copy semantics
+     *                            for these.
+     */
+    function __construct($value) {
+        $this->value = $value;
+    }
+
+    /**
+     *    Returns the value stored earlier.
+     *    @return mixed    Whatever was stashed.
+     */
+    function &act() {
+        $dummy = $this->value;
+        return $dummy;
+    }
+}
+
+/**
+ *    A type of SimpleMethodAction.
+ *    Stashes an exception for throwing later.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleThrower {
+    private $exception;
+
+    /**
+     *    Stashes it for later.
+     *    @param Exception $exception    The exception object to throw.
+     */
+    function __construct($exception) {
+        $this->exception = $exception;
+    }
+
+    /**
+     *    Throws the exceptins stashed earlier.
+     */
+    function act() {
+        throw $this->exception;
+    }
+}
+
+/**
+ *    A type of SimpleMethodAction.
+ *    Stashes an error for emitting later.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleErrorThrower {
+    private $error;
+    private $severity;
+
+    /**
+     *    Stashes an error to throw later.
+     *    @param string $error      Error message.
+     *    @param integer $severity  PHP error constant, e.g E_USER_ERROR.
+     */
+    function __construct($error, $severity) {
+        $this->error = $error;
+        $this->severity = $severity;
+    }
+
+    /**
+     *    Triggers the stashed error.
+     */
+    function &act() {
+        trigger_error($this->error, $this->severity);
+        $null = null;
+        return $null;
+    }
+}
+
+/**
+ *    A base class or delegate that extends an
+ *    empty collection of methods that can have their
+ *    return values set and expectations made of the
+ *    calls upon them. The mock will assert the
+ *    expectations against it's attached test case in
+ *    addition to the server stub behaviour or returning
+ *    preprogrammed responses.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleMock {
+    private $actions;
+    private $expectations;
+    private $wildcard = MOCK_ANYTHING;
+    private $is_strict = true;
+    private $call_counts;
+    private $expected_counts;
+    private $max_counts;
+    private $expected_args;
+    private $expected_args_at;
+
+    /**
+     *    Creates an empty action list and expectation list.
+     *    All call counts are set to zero.
+     */
+    function SimpleMock() {
+        $this->actions = new SimpleCallSchedule();
+        $this->expectations = new SimpleCallSchedule();
+        $this->call_counts = array();
+        $this->expected_counts = array();
+        $this->max_counts = array();
+        $this->expected_args = array();
+        $this->expected_args_at = array();
+        $this->getCurrentTestCase()->tell($this);
+    }
+
+    /**
+     *    Disables a name check when setting expectations.
+     *    This hack is needed for the partial mocks.
+     */
+    function disableExpectationNameChecks() {
+        $this->is_strict = false;
+    }
+
+    /**
+     *    Finds currently running test.
+     *    @return SimpeTestCase    Current test case.
+     */
+    protected function getCurrentTestCase() {
+        return SimpleTest::getContext()->getTest();
+    }
+
+    /**
+     *    Die if bad arguments array is passed.
+     *    @param mixed $args     The arguments value to be checked.
+     *    @param string $task    Description of task attempt.
+     *    @return boolean        Valid arguments
+     */
+    protected function checkArgumentsIsArray($args, $task) {
+        if (! is_array($args)) {
+            trigger_error(
+                "Cannot $task as \$args parameter is not an array",
+                E_USER_ERROR);
+        }
+    }
+
+    /**
+     *    Triggers a PHP error if the method is not part
+     *    of this object.
+     *    @param string $method        Name of method.
+     *    @param string $task          Description of task attempt.
+     */
+    protected function dieOnNoMethod($method, $task) {
+        if ($this->is_strict && ! method_exists($this, $method)) {
+            trigger_error(
+                    "Cannot $task as no ${method}() in class " . get_class($this),
+                    E_USER_ERROR);
+        }
+    }
+
+    /**
+     *    Replaces wildcard matches with wildcard
+     *    expectations in the argument list.
+     *    @param array $args      Raw argument list.
+     *    @return array           Argument list with
+     *                            expectations.
+     */
+    function replaceWildcards($args) {
+        if ($args === false) {
+            return false;
+        }
+        for ($i = 0; $i < count($args); $i++) {
+            if ($args[$i] === $this->wildcard) {
+                $args[$i] = new AnythingExpectation();
+            }
+        }
+        return $args;
+    }
+
+    /**
+     *    Adds one to the call count of a method.
+     *    @param string $method        Method called.
+     *    @param array $args           Arguments as an array.
+     */
+    protected function addCall($method, $args) {
+        if (! isset($this->call_counts[$method])) {
+            $this->call_counts[$method] = 0;
+        }
+        $this->call_counts[$method]++;
+    }
+
+    /**
+     *    Fetches the call count of a method so far.
+     *    @param string $method        Method name called.
+     *    @return integer              Number of calls so far.
+     */
+    function getCallCount($method) {
+        $this->dieOnNoMethod($method, "get call count");
+        $method = strtolower($method);
+        if (! isset($this->call_counts[$method])) {
+            return 0;
+        }
+        return $this->call_counts[$method];
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed on by all calls to this method that match.
+     *    @param string $method       Method name.
+     *    @param mixed $value         Result of call by value/handle.
+     *    @param array $args          List of parameters to match
+     *                                including wildcards.
+     */
+    function returns($method, $value, $args = false) {
+        $this->dieOnNoMethod($method, "set return");
+        $this->actions->register($method, $args, new SimpleReturn($value));
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed only when the required call count
+     *    is reached.
+     *    @param integer $timing   Number of calls in the future
+     *                             to which the result applies. If
+     *                             not set then all calls will return
+     *                             the value.
+     *    @param string $method    Method name.
+     *    @param mixed $value      Result of call passed.
+     *    @param array $args       List of parameters to match
+     *                             including wildcards.
+     */
+    function returnsAt($timing, $method, $value, $args = false) {
+        $this->dieOnNoMethod($method, "set return value sequence");
+        $this->actions->registerAt($timing, $method, $args, new SimpleReturn($value));
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed by value for all calls to this method.
+     *    @param string $method       Method name.
+     *    @param mixed $value         Result of call passed by value.
+     *    @param array $args          List of parameters to match
+     *                                including wildcards.
+     */
+    function returnsByValue($method, $value, $args = false) {
+        $this->dieOnNoMethod($method, "set return value");
+        $this->actions->register($method, $args, new SimpleByValue($value));
+    }
+
+    /** @deprecated */
+    function setReturnValue($method, $value, $args = false) {
+        $this->returnsByValue($method, $value, $args);
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed by value only when the required call count
+     *    is reached.
+     *    @param integer $timing   Number of calls in the future
+     *                             to which the result applies. If
+     *                             not set then all calls will return
+     *                             the value.
+     *    @param string $method    Method name.
+     *    @param mixed $value      Result of call passed by value.
+     *    @param array $args       List of parameters to match
+     *                             including wildcards.
+     */
+    function returnsByValueAt($timing, $method, $value, $args = false) {
+        $this->dieOnNoMethod($method, "set return value sequence");
+        $this->actions->registerAt($timing, $method, $args, new SimpleByValue($value));
+    }
+
+    /** @deprecated */
+    function setReturnValueAt($timing, $method, $value, $args = false) {
+        $this->returnsByValueAt($timing, $method, $value, $args);
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed by reference for all calls.
+     *    @param string $method       Method name.
+     *    @param mixed $reference     Result of the call will be this object.
+     *    @param array $args          List of parameters to match
+     *                                including wildcards.
+     */
+    function returnsByReference($method, &$reference, $args = false) {
+        $this->dieOnNoMethod($method, "set return reference");
+        $this->actions->register($method, $args, new SimpleByReference($reference));
+    }
+
+    /** @deprecated */
+    function setReturnReference($method, &$reference, $args = false) {
+        $this->returnsByReference($method, $reference, $args);
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed by value only when the required call count
+     *    is reached.
+     *    @param integer $timing    Number of calls in the future
+     *                              to which the result applies. If
+     *                              not set then all calls will return
+     *                              the value.
+     *    @param string $method     Method name.
+     *    @param mixed $reference   Result of the call will be this object.
+     *    @param array $args        List of parameters to match
+     *                              including wildcards.
+     */
+    function returnsByReferenceAt($timing, $method, &$reference, $args = false) {
+        $this->dieOnNoMethod($method, "set return reference sequence");
+        $this->actions->registerAt($timing, $method, $args, new SimpleByReference($reference));
+    }
+
+    /** @deprecated */
+    function setReturnReferenceAt($timing, $method, &$reference, $args = false) {
+        $this->returnsByReferenceAt($timing, $method, $reference, $args);
+    }
+
+    /**
+     *    Sets up an expected call with a set of
+     *    expected parameters in that call. All
+     *    calls will be compared to these expectations
+     *    regardless of when the call is made.
+     *    @param string $method        Method call to test.
+     *    @param array $args           Expected parameters for the call
+     *                                 including wildcards.
+     *    @param string $message       Overridden message.
+     */
+    function expect($method, $args, $message = '%s') {
+        $this->dieOnNoMethod($method, 'set expected arguments');
+        $this->checkArgumentsIsArray($args, 'set expected arguments');
+        $this->expectations->expectArguments($method, $args, $message);
+        $args = $this->replaceWildcards($args);
+        $message .= Mock::getExpectationLine();
+        $this->expected_args[strtolower($method)] =
+                new ParametersExpectation($args, $message);
+    }
+
+    /**
+     *    Sets up an expected call with a set of
+     *    expected parameters in that call. The
+     *    expected call count will be adjusted if it
+     *    is set too low to reach this call.
+     *    @param integer $timing    Number of calls in the future at
+     *                              which to test. Next call is 0.
+     *    @param string $method     Method call to test.
+     *    @param array $args        Expected parameters for the call
+     *                              including wildcards.
+     *    @param string $message    Overridden message.
+     */
+    function expectAt($timing, $method, $args, $message = '%s') {
+        $this->dieOnNoMethod($method, 'set expected arguments at time');
+        $this->checkArgumentsIsArray($args, 'set expected arguments at time');
+        $args = $this->replaceWildcards($args);
+        if (! isset($this->expected_args_at[$timing])) {
+            $this->expected_args_at[$timing] = array();
+        }
+        $method = strtolower($method);
+        $message .= Mock::getExpectationLine();
+        $this->expected_args_at[$timing][$method] =
+                new ParametersExpectation($args, $message);
+    }
+
+    /**
+     *    Sets an expectation for the number of times
+     *    a method will be called. The tally method
+     *    is used to check this.
+     *    @param string $method        Method call to test.
+     *    @param integer $count        Number of times it should
+     *                                 have been called at tally.
+     *    @param string $message       Overridden message.
+     */
+    function expectCallCount($method, $count, $message = '%s') {
+        $this->dieOnNoMethod($method, 'set expected call count');
+        $message .= Mock::getExpectationLine();
+        $this->expected_counts[strtolower($method)] =
+                new CallCountExpectation($method, $count, $message);
+    }
+
+    /**
+     *    Sets the number of times a method may be called
+     *    before a test failure is triggered.
+     *    @param string $method        Method call to test.
+     *    @param integer $count        Most number of times it should
+     *                                 have been called.
+     *    @param string $message       Overridden message.
+     */
+    function expectMaximumCallCount($method, $count, $message = '%s') {
+        $this->dieOnNoMethod($method, 'set maximum call count');
+        $message .= Mock::getExpectationLine();
+        $this->max_counts[strtolower($method)] =
+                new MaximumCallCountExpectation($method, $count, $message);
+    }
+
+    /**
+     *    Sets the number of times to call a method to prevent
+     *    a failure on the tally.
+     *    @param string $method      Method call to test.
+     *    @param integer $count      Least number of times it should
+     *                               have been called.
+     *    @param string $message     Overridden message.
+     */
+    function expectMinimumCallCount($method, $count, $message = '%s') {
+        $this->dieOnNoMethod($method, 'set minimum call count');
+        $message .= Mock::getExpectationLine();
+        $this->expected_counts[strtolower($method)] =
+                new MinimumCallCountExpectation($method, $count, $message);
+    }
+
+    /**
+     *    Convenience method for barring a method
+     *    call.
+     *    @param string $method        Method call to ban.
+     *    @param string $message       Overridden message.
+     */
+    function expectNever($method, $message = '%s') {
+        $this->expectMaximumCallCount($method, 0, $message);
+    }
+
+    /**
+     *    Convenience method for a single method
+     *    call.
+     *    @param string $method     Method call to track.
+     *    @param array $args        Expected argument list or
+     *                              false for any arguments.
+     *    @param string $message    Overridden message.
+     */
+    function expectOnce($method, $args = false, $message = '%s') {
+        $this->expectCallCount($method, 1, $message);
+        if ($args !== false) {
+            $this->expect($method, $args, $message);
+        }
+    }
+
+    /**
+     *    Convenience method for requiring a method
+     *    call.
+     *    @param string $method       Method call to track.
+     *    @param array $args          Expected argument list or
+     *                                false for any arguments.
+     *    @param string $message      Overridden message.
+     */
+    function expectAtLeastOnce($method, $args = false, $message = '%s') {
+        $this->expectMinimumCallCount($method, 1, $message);
+        if ($args !== false) {
+            $this->expect($method, $args, $message);
+        }
+    }
+
+    /**
+     *    Sets up a trigger to throw an exception upon the
+     *    method call.
+     *    @param string $method     Method name to throw on.
+     *    @param object $exception  Exception object to throw.
+     *                              If not given then a simple
+     *                              Exception object is thrown.
+     *    @param array $args        Optional argument list filter.
+     *                              If given then the exception
+     *                              will only be thrown if the
+     *                              method call matches the arguments.
+     */
+    function throwOn($method, $exception = false, $args = false) {
+        $this->dieOnNoMethod($method, "throw on");
+        $this->actions->register($method, $args,
+                new SimpleThrower($exception ? $exception : new Exception()));
+    }
+
+    /**
+     *    Sets up a trigger to throw an exception upon the
+     *    method call.
+     *    @param integer $timing    When to throw the exception. A
+     *                              value of 0 throws immediately.
+     *                              A value of 1 actually allows one call
+     *                              to this method before throwing. 2
+     *                              will allow two calls before throwing
+     *                              and so on.
+     *    @param string $method     Method name to throw on.
+     *    @param object $exception  Exception object to throw.
+     *                              If not given then a simple
+     *                              Exception object is thrown.
+     *    @param array $args        Optional argument list filter.
+     *                              If given then the exception
+     *                              will only be thrown if the
+     *                              method call matches the arguments.
+     */
+    function throwAt($timing, $method, $exception = false, $args = false) {
+        $this->dieOnNoMethod($method, "throw at");
+        $this->actions->registerAt($timing, $method, $args,
+                new SimpleThrower($exception ? $exception : new Exception()));
+    }
+
+    /**
+     *    Sets up a trigger to throw an error upon the
+     *    method call.
+     *    @param string $method     Method name to throw on.
+     *    @param object $error      Error message to trigger.
+     *    @param array $args        Optional argument list filter.
+     *                              If given then the exception
+     *                              will only be thrown if the
+     *                              method call matches the arguments.
+     *    @param integer $severity  The PHP severity level. Defaults
+     *                              to E_USER_ERROR.
+     */
+    function errorOn($method, $error = 'A mock error', $args = false, $severity = E_USER_ERROR) {
+        $this->dieOnNoMethod($method, "error on");
+        $this->actions->register($method, $args, new SimpleErrorThrower($error, $severity));
+    }
+
+    /**
+     *    Sets up a trigger to throw an error upon a specific
+     *    method call.
+     *    @param integer $timing    When to throw the exception. A
+     *                              value of 0 throws immediately.
+     *                              A value of 1 actually allows one call
+     *                              to this method before throwing. 2
+     *                              will allow two calls before throwing
+     *                              and so on.
+     *    @param string $method     Method name to throw on.
+     *    @param object $error      Error message to trigger.
+     *    @param array $args        Optional argument list filter.
+     *                              If given then the exception
+     *                              will only be thrown if the
+     *                              method call matches the arguments.
+     *    @param integer $severity  The PHP severity level. Defaults
+     *                              to E_USER_ERROR.
+     */
+    function errorAt($timing, $method, $error = 'A mock error', $args = false, $severity = E_USER_ERROR) {
+        $this->dieOnNoMethod($method, "error at");
+        $this->actions->registerAt($timing, $method, $args, new SimpleErrorThrower($error, $severity));
+    }
+
+    /**
+     *    Receives event from unit test that the current
+     *    test method has finished. Totals up the call
+     *    counts and triggers a test assertion if a test
+     *    is present for expected call counts.
+     *    @param string $test_method      Current method name.
+     *    @param SimpleTestCase $test     Test to send message to.
+     */
+    function atTestEnd($test_method, &$test) {
+        foreach ($this->expected_counts as $method => $expectation) {
+            $test->assert($expectation, $this->getCallCount($method));
+        }
+        foreach ($this->max_counts as $method => $expectation) {
+            if ($expectation->test($this->getCallCount($method))) {
+                $test->assert($expectation, $this->getCallCount($method));
+            }
+        }
+    }
+
+    /**
+     *    Returns the expected value for the method name
+     *    and checks expectations. Will generate any
+     *    test assertions as a result of expectations
+     *    if there is a test present.
+     *    @param string $method       Name of method to simulate.
+     *    @param array $args          Arguments as an array.
+     *    @return mixed               Stored return.
+     */
+    function &invoke($method, $args) {
+        $method = strtolower($method);
+        $step = $this->getCallCount($method);
+        $this->addCall($method, $args);
+        $this->checkExpectations($method, $args, $step);
+        $was = $this->disableEStrict();
+        try {
+            $result = &$this->emulateCall($method, $args, $step);
+        } catch (Exception $e) {
+            $this->restoreEStrict($was);
+            throw $e;
+        }
+        $this->restoreEStrict($was);
+        return $result;
+    }
+
+    /**
+     *    Finds the return value matching the incoming
+     *    arguments. If there is no matching value found
+     *    then an error is triggered.
+     *    @param string $method      Method name.
+     *    @param array $args         Calling arguments.
+     *    @param integer $step       Current position in the
+     *                               call history.
+     *    @return mixed              Stored return or other action.
+     */
+    protected function &emulateCall($method, $args, $step) {
+        return $this->actions->respond($step, $method, $args);
+    }
+
+    /**
+     *    Tests the arguments against expectations.
+     *    @param string $method        Method to check.
+     *    @param array $args           Argument list to match.
+     *    @param integer $timing       The position of this call
+     *                                 in the call history.
+     */
+    protected function checkExpectations($method, $args, $timing) {
+        $test = $this->getCurrentTestCase();
+        if (isset($this->max_counts[$method])) {
+            if (! $this->max_counts[$method]->test($timing + 1)) {
+                $test->assert($this->max_counts[$method], $timing + 1);
+            }
+        }
+        if (isset($this->expected_args_at[$timing][$method])) {
+            $test->assert(
+                    $this->expected_args_at[$timing][$method],
+                    $args,
+                    "Mock method [$method] at [$timing] -> %s");
+        } elseif (isset($this->expected_args[$method])) {
+            $test->assert(
+                    $this->expected_args[$method],
+                    $args,
+                    "Mock method [$method] -> %s");
+        }
+    }
+
+    /**
+     *   Our mock has to be able to return anything, including
+     *   variable references. To allow for these mixed returns
+     *   we have to disable the E_STRICT warnings while the
+     *   method calls are emulated.
+     */
+    private function disableEStrict() {
+        $was = error_reporting();
+        error_reporting($was & ~E_STRICT);
+        return $was;
+    }
+
+    /**
+     *  Restores the E_STRICT level if it was previously set.
+     *  @param integer $was     Previous error reporting level.
+     */
+    private function restoreEStrict($was) {
+        error_reporting($was);
+    }
+}
+
+/**
+ *    Static methods only service class for code generation of
+ *    mock objects.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class Mock {
+
+    /**
+     *    Factory for mock object classes.
+     */
+    function __construct() {
+        trigger_error('Mock factory methods are static.');
+    }
+
+    /**
+     *    Clones a class' interface and creates a mock version
+     *    that can have return values and expectations set.
+     *    @param string $class         Class to clone.
+     *    @param string $mock_class    New class name. Default is
+     *                                 the old name with "Mock"
+     *                                 prepended.
+     *    @param array $methods        Additional methods to add beyond
+     *                                 those in the cloned class. Use this
+     *                                 to emulate the dynamic addition of
+     *                                 methods in the cloned class or when
+     *                                 the class hasn't been written yet.sta
+     */
+    static function generate($class, $mock_class = false, $methods = false) {
+        $generator = new MockGenerator($class, $mock_class);
+        return @$generator->generateSubclass($methods);
+    }
+
+    /**
+     *    Generates a version of a class with selected
+     *    methods mocked only. Inherits the old class
+     *    and chains the mock methods of an aggregated
+     *    mock object.
+     *    @param string $class            Class to clone.
+     *    @param string $mock_class       New class name.
+     *    @param array $methods           Methods to be overridden
+     *                                    with mock versions.
+     */
+    static function generatePartial($class, $mock_class, $methods) {
+        $generator = new MockGenerator($class, $mock_class);
+        return @$generator->generatePartial($methods);
+    }
+
+    /**
+     *    Uses a stack trace to find the line of an assertion.
+     */
+    static function getExpectationLine() {
+        $trace = new SimpleStackTrace(array('expect'));
+        return $trace->traceMethod();
+    }
+}
+
+/**
+ *    Service class for code generation of mock objects.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class MockGenerator {
+    private $class;
+    private $mock_class;
+    private $mock_base;
+    private $reflection;
+
+    /**
+     *    Builds initial reflection object.
+     *    @param string $class        Class to be mocked.
+     *    @param string $mock_class   New class with identical interface,
+     *                                but no behaviour.
+     */
+    function __construct($class, $mock_class) {
+        $this->class = $class;
+        $this->mock_class = $mock_class;
+        if (! $this->mock_class) {
+            $this->mock_class = 'Mock' . $this->class;
+        }
+        $this->mock_base = SimpleTest::getMockBaseClass();
+        $this->reflection = new SimpleReflection($this->class);
+    }
+
+    /**
+     *    Clones a class' interface and creates a mock version
+     *    that can have return values and expectations set.
+     *    @param array $methods        Additional methods to add beyond
+     *                                 those in th cloned class. Use this
+     *                                 to emulate the dynamic addition of
+     *                                 methods in the cloned class or when
+     *                                 the class hasn't been written yet.
+     */
+    function generate($methods) {
+        if (! $this->reflection->classOrInterfaceExists()) {
+            return false;
+        }
+        $mock_reflection = new SimpleReflection($this->mock_class);
+        if ($mock_reflection->classExistsSansAutoload()) {
+            return false;
+        }
+        $code = $this->createClassCode($methods ? $methods : array());
+        return eval("$code return \$code;");
+    }
+
+    /**
+     *    Subclasses a class and overrides every method with a mock one
+     *    that can have return values and expectations set. Chains
+     *    to an aggregated SimpleMock.
+     *    @param array $methods        Additional methods to add beyond
+     *                                 those in the cloned class. Use this
+     *                                 to emulate the dynamic addition of
+     *                                 methods in the cloned class or when
+     *                                 the class hasn't been written yet.
+     */
+    function generateSubclass($methods) {
+        if (! $this->reflection->classOrInterfaceExists()) {
+            return false;
+        }
+        $mock_reflection = new SimpleReflection($this->mock_class);
+        if ($mock_reflection->classExistsSansAutoload()) {
+            return false;
+        }
+        if ($this->reflection->isInterface() || $this->reflection->hasFinal()) {
+            $code = $this->createClassCode($methods ? $methods : array());
+            return eval("$code return \$code;");
+        } else {
+            $code = $this->createSubclassCode($methods ? $methods : array());
+            return eval("$code return \$code;");
+        }
+    }
+
+    /**
+     *    Generates a version of a class with selected
+     *    methods mocked only. Inherits the old class
+     *    and chains the mock methods of an aggregated
+     *    mock object.
+     *    @param array $methods           Methods to be overridden
+     *                                    with mock versions.
+     */
+    function generatePartial($methods) {
+        if (! $this->reflection->classExists($this->class)) {
+            return false;
+        }
+        $mock_reflection = new SimpleReflection($this->mock_class);
+        if ($mock_reflection->classExistsSansAutoload()) {
+            trigger_error('Partial mock class [' . $this->mock_class . '] already exists');
+            return false;
+        }
+        $code = $this->extendClassCode($methods);
+        return eval("$code return \$code;");
+    }
+
+    /**
+     *    The new mock class code as a string.
+     *    @param array $methods          Additional methods.
+     *    @return string                 Code for new mock class.
+     */
+    protected function createClassCode($methods) {
+        $implements = '';
+        $interfaces = $this->reflection->getInterfaces();
+        if (function_exists('spl_classes')) {
+            $interfaces = array_diff($interfaces, array('Traversable'));
+        }
+        if (count($interfaces) > 0) {
+            $implements = 'implements ' . implode(', ', $interfaces);
+        }
+        $code = "class " . $this->mock_class . " extends " . $this->mock_base . " $implements {\n";
+        $code .= "    function " . $this->mock_class . "() {\n";
+        $code .= "        \$this->" . $this->mock_base . "();\n";
+        $code .= "    }\n";
+        if (in_array('__construct', $this->reflection->getMethods())) {
+            $code .= "    function __construct() {\n";
+            $code .= "        \$this->" . $this->mock_base . "();\n";
+            $code .= "    }\n";
+        }
+        $code .= $this->createHandlerCode($methods);
+        $code .= "}\n";
+        return $code;
+    }
+
+    /**
+     *    The new mock class code as a string. The mock will
+     *    be a subclass of the original mocked class.
+     *    @param array $methods          Additional methods.
+     *    @return string                 Code for new mock class.
+     */
+    protected function createSubclassCode($methods) {
+        $code  = "class " . $this->mock_class . " extends " . $this->class . " {\n";
+        $code .= "    public \$mock;\n";
+        $code .= $this->addMethodList(array_merge($methods, $this->reflection->getMethods()));
+        $code .= "\n";
+        $code .= "    function " . $this->mock_class . "() {\n";
+        $code .= "        \$this->mock = new " . $this->mock_base . "();\n";
+        $code .= "        \$this->mock->disableExpectationNameChecks();\n";
+        $code .= "    }\n";
+        $code .= $this->chainMockReturns();
+        $code .= $this->chainMockExpectations();
+        $code .= $this->chainThrowMethods();
+        $code .= $this->overrideMethods($this->reflection->getMethods());
+        $code .= $this->createNewMethodCode($methods);
+        $code .= "}\n";
+        return $code;
+    }
+
+    /**
+     *    The extension class code as a string. The class
+     *    composites a mock object and chains mocked methods
+     *    to it.
+     *    @param array  $methods       Mocked methods.
+     *    @return string               Code for a new class.
+     */
+    protected function extendClassCode($methods) {
+        $code  = "class " . $this->mock_class . " extends " . $this->class . " {\n";
+        $code .= "    protected \$mock;\n";
+        $code .= $this->addMethodList($methods);
+        $code .= "\n";
+        $code .= "    function " . $this->mock_class . "() {\n";
+        $code .= "        \$this->mock = new " . $this->mock_base . "();\n";
+        $code .= "        \$this->mock->disableExpectationNameChecks();\n";
+        $code .= "    }\n";
+        $code .= $this->chainMockReturns();
+        $code .= $this->chainMockExpectations();
+        $code .= $this->chainThrowMethods();
+        $code .= $this->overrideMethods($methods);
+        $code .= "}\n";
+        return $code;
+    }
+
+    /**
+     *    Creates code within a class to generate replaced
+     *    methods. All methods call the invoke() handler
+     *    with the method name and the arguments in an
+     *    array.
+     *    @param array $methods    Additional methods.
+     */
+    protected function createHandlerCode($methods) {
+        $code = '';
+        $methods = array_merge($methods, $this->reflection->getMethods());
+        foreach ($methods as $method) {
+            if ($this->isConstructor($method)) {
+                continue;
+            }
+            $mock_reflection = new SimpleReflection($this->mock_base);
+            if (in_array($method, $mock_reflection->getMethods())) {
+                continue;
+            }
+            $code .= "    " . $this->reflection->getSignature($method) . " {\n";
+            $code .= "        \$args = func_get_args();\n";
+            $code .= "        \$result = &\$this->invoke(\"$method\", \$args);\n";
+            $code .= "        return \$result;\n";
+            $code .= "    }\n";
+        }
+        return $code;
+    }
+
+    /**
+     *    Creates code within a class to generate a new
+     *    methods. All methods call the invoke() handler
+     *    on the internal mock with the method name and
+     *    the arguments in an array.
+     *    @param array $methods    Additional methods.
+     */
+    protected function createNewMethodCode($methods) {
+        $code = '';
+        foreach ($methods as $method) {
+            if ($this->isConstructor($method)) {
+                continue;
+            }
+            $mock_reflection = new SimpleReflection($this->mock_base);
+            if (in_array($method, $mock_reflection->getMethods())) {
+                continue;
+            }
+            $code .= "    " . $this->reflection->getSignature($method) . " {\n";
+            $code .= "        \$args = func_get_args();\n";
+            $code .= "        \$result = &\$this->mock->invoke(\"$method\", \$args);\n";
+            $code .= "        return \$result;\n";
+            $code .= "    }\n";
+        }
+        return $code;
+    }
+
+    /**
+     *    Tests to see if a special PHP method is about to
+     *    be stubbed by mistake.
+     *    @param string $method    Method name.
+     *    @return boolean          True if special.
+     */
+    protected function isConstructor($method) {
+        return in_array(
+                strtolower($method),
+                array('__construct', '__destruct'));
+    }
+
+    /**
+     *    Creates a list of mocked methods for error checking.
+     *    @param array $methods       Mocked methods.
+     *    @return string              Code for a method list.
+     */
+    protected function addMethodList($methods) {
+        return "    protected \$mocked_methods = array('" .
+                implode("', '", array_map('strtolower', $methods)) .
+                "');\n";
+    }
+
+    /**
+     *    Creates code to abandon the expectation if not mocked.
+     *    @param string $alias       Parameter name of method name.
+     *    @return string             Code for bail out.
+     */
+    protected function bailOutIfNotMocked($alias) {
+        $code  = "        if (! in_array(strtolower($alias), \$this->mocked_methods)) {\n";
+        $code .= "            trigger_error(\"Method [$alias] is not mocked\");\n";
+        $code .= "            \$null = null;\n";
+        $code .= "            return \$null;\n";
+        $code .= "        }\n";
+        return $code;
+    }
+
+    /**
+     *    Creates source code for chaining to the composited
+     *    mock object.
+     *    @return string           Code for mock set up.
+     */
+    protected function chainMockReturns() {
+        $code  = "    function returns(\$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->returns(\$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function returnsAt(\$timing, \$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->returnsAt(\$timing, \$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function returnsByValue(\$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnValue(\$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function returnsByValueAt(\$timing, \$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnValueAt(\$timing, \$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function returnsByReference(\$method, &\$ref, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnReference(\$method, \$ref, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function returnsByReferenceAt(\$timing, \$method, &\$ref, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnReferenceAt(\$timing, \$method, \$ref, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function setReturnValue(\$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnValue(\$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function setReturnValueAt(\$timing, \$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnValueAt(\$timing, \$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function setReturnReference(\$method, &\$ref, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnReference(\$method, \$ref, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function setReturnReferenceAt(\$timing, \$method, &\$ref, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnReferenceAt(\$timing, \$method, \$ref, \$args);\n";
+        $code .= "    }\n";
+        return $code;
+    }
+
+    /**
+     *    Creates source code for chaining to an aggregated
+     *    mock object.
+     *    @return string                 Code for expectations.
+     */
+    protected function chainMockExpectations() {
+        $code  = "    function expect(\$method, \$args = false, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expect(\$method, \$args, \$msg);\n";
+        $code .= "    }\n";
+        $code .= "    function expectAt(\$timing, \$method, \$args = false, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectAt(\$timing, \$method, \$args, \$msg);\n";
+        $code .= "    }\n";
+        $code .= "    function expectCallCount(\$method, \$count) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectCallCount(\$method, \$count, \$msg = '%s');\n";
+        $code .= "    }\n";
+        $code .= "    function expectMaximumCallCount(\$method, \$count, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectMaximumCallCount(\$method, \$count, \$msg = '%s');\n";
+        $code .= "    }\n";
+        $code .= "    function expectMinimumCallCount(\$method, \$count, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectMinimumCallCount(\$method, \$count, \$msg = '%s');\n";
+        $code .= "    }\n";
+        $code .= "    function expectNever(\$method) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectNever(\$method);\n";
+        $code .= "    }\n";
+        $code .= "    function expectOnce(\$method, \$args = false, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectOnce(\$method, \$args, \$msg);\n";
+        $code .= "    }\n";
+        $code .= "    function expectAtLeastOnce(\$method, \$args = false, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectAtLeastOnce(\$method, \$args, \$msg);\n";
+        $code .= "    }\n";
+        return $code;
+    }
+
+    /**
+     *    Adds code for chaining the throw methods.
+     *    @return string           Code for chains.
+     */
+    protected function chainThrowMethods() {
+        $code  = "    function throwOn(\$method, \$exception = false, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->throwOn(\$method, \$exception, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function throwAt(\$timing, \$method, \$exception = false, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->throwAt(\$timing, \$method, \$exception, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function errorOn(\$method, \$error = 'A mock error', \$args = false, \$severity = E_USER_ERROR) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->errorOn(\$method, \$error, \$args, \$severity);\n";
+        $code .= "    }\n";
+        $code .= "    function errorAt(\$timing, \$method, \$error = 'A mock error', \$args = false, \$severity = E_USER_ERROR) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->errorAt(\$timing, \$method, \$error, \$args, \$severity);\n";
+        $code .= "    }\n";
+        return $code;
+    }
+
+    /**
+     *    Creates source code to override a list of methods
+     *    with mock versions.
+     *    @param array $methods    Methods to be overridden
+     *                             with mock versions.
+     *    @return string           Code for overridden chains.
+     */
+    protected function overrideMethods($methods) {
+        $code = "";
+        foreach ($methods as $method) {
+            if ($this->isConstructor($method)) {
+                continue;
+            }
+            $code .= "    " . $this->reflection->getSignature($method) . " {\n";
+            $code .= "        \$args = func_get_args();\n";
+            $code .= "        \$result = &\$this->mock->invoke(\"$method\", \$args);\n";
+            $code .= "        return \$result;\n";
+            $code .= "    }\n";
+        }
+        return $code;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/page.php b/3rdparty/simpletest/page.php
new file mode 100755
index 00000000000..5c0bce7079d
--- /dev/null
+++ b/3rdparty/simpletest/page.php
@@ -0,0 +1,542 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: page.php 1938 2009-08-05 17:16:23Z dgheath $
+ */
+
+/**#@+
+    *   include other SimpleTest class files
+    */
+require_once(dirname(__FILE__) . '/http.php');
+require_once(dirname(__FILE__) . '/php_parser.php');
+require_once(dirname(__FILE__) . '/tag.php');
+require_once(dirname(__FILE__) . '/form.php');
+require_once(dirname(__FILE__) . '/selector.php');
+/**#@-*/
+
+/**
+ *    A wrapper for a web page.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimplePage {
+    private $links = array();
+    private $title = false;
+    private $last_widget;
+    private $label;
+    private $forms = array();
+    private $frames = array();
+    private $transport_error;
+    private $raw;
+    private $text = false;
+    private $sent;
+    private $headers;
+    private $method;
+    private $url;
+    private $base = false;
+    private $request_data;
+
+    /**
+     *    Parses a page ready to access it's contents.
+     *    @param SimpleHttpResponse $response     Result of HTTP fetch.
+     *    @access public
+     */
+    function __construct($response = false) {
+        if ($response) {
+            $this->extractResponse($response);
+        } else {
+            $this->noResponse();
+        }
+    }
+
+    /**
+     *    Extracts all of the response information.
+     *    @param SimpleHttpResponse $response    Response being parsed.
+     *    @access private
+     */
+    protected function extractResponse($response) {
+        $this->transport_error = $response->getError();
+        $this->raw = $response->getContent();
+        $this->sent = $response->getSent();
+        $this->headers = $response->getHeaders();
+        $this->method = $response->getMethod();
+        $this->url = $response->getUrl();
+        $this->request_data = $response->getRequestData();
+    }
+
+    /**
+     *    Sets up a missing response.
+     *    @access private
+     */
+    protected function noResponse() {
+        $this->transport_error = 'No page fetched yet';
+        $this->raw = false;
+        $this->sent = false;
+        $this->headers = false;
+        $this->method = 'GET';
+        $this->url = false;
+        $this->request_data = false;
+    }
+
+    /**
+     *    Original request as bytes sent down the wire.
+     *    @return mixed              Sent content.
+     *    @access public
+     */
+    function getRequest() {
+        return $this->sent;
+    }
+
+    /**
+     *    Accessor for raw text of page.
+     *    @return string        Raw unparsed content.
+     *    @access public
+     */
+    function getRaw() {
+        return $this->raw;
+    }
+
+    /**
+     *    Accessor for plain text of page as a text browser
+     *    would see it.
+     *    @return string        Plain text of page.
+     *    @access public
+     */
+    function getText() {
+        if (! $this->text) {
+            $this->text = SimplePage::normalise($this->raw);
+        }
+        return $this->text;
+    }
+
+    /**
+     *    Accessor for raw headers of page.
+     *    @return string       Header block as text.
+     *    @access public
+     */
+    function getHeaders() {
+        if ($this->headers) {
+            return $this->headers->getRaw();
+        }
+        return false;
+    }
+
+    /**
+     *    Original request method.
+     *    @return string        GET, POST or HEAD.
+     *    @access public
+     */
+    function getMethod() {
+        return $this->method;
+    }
+
+    /**
+     *    Original resource name.
+     *    @return SimpleUrl        Current url.
+     *    @access public
+     */
+    function getUrl() {
+        return $this->url;
+    }
+
+    /**
+     *    Base URL if set via BASE tag page url otherwise
+     *    @return SimpleUrl        Base url.
+     *    @access public
+     */
+    function getBaseUrl() {
+        return $this->base;
+    }
+
+    /**
+     *    Original request data.
+     *    @return mixed              Sent content.
+     *    @access public
+     */
+    function getRequestData() {
+        return $this->request_data;
+    }
+
+    /**
+     *    Accessor for last error.
+     *    @return string        Error from last response.
+     *    @access public
+     */
+    function getTransportError() {
+        return $this->transport_error;
+    }
+
+    /**
+     *    Accessor for current MIME type.
+     *    @return string    MIME type as string; e.g. 'text/html'
+     *    @access public
+     */
+    function getMimeType() {
+        if ($this->headers) {
+            return $this->headers->getMimeType();
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for HTTP response code.
+     *    @return integer    HTTP response code received.
+     *    @access public
+     */
+    function getResponseCode() {
+        if ($this->headers) {
+            return $this->headers->getResponseCode();
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for last Authentication type. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Description of challenge type.
+     *    @access public
+     */
+    function getAuthentication() {
+        if ($this->headers) {
+            return $this->headers->getAuthentication();
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for last Authentication realm. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Name of security realm.
+     *    @access public
+     */
+    function getRealm() {
+        if ($this->headers) {
+            return $this->headers->getRealm();
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for current frame focus. Will be
+     *    false as no frames.
+     *    @return array    Always empty.
+     *    @access public
+     */
+    function getFrameFocus() {
+        return array();
+    }
+
+    /**
+     *    Sets the focus by index. The integer index starts from 1.
+     *    @param integer $choice    Chosen frame.
+     *    @return boolean           Always false.
+     *    @access public
+     */
+    function setFrameFocusByIndex($choice) {
+        return false;
+    }
+
+    /**
+     *    Sets the focus by name. Always fails for a leaf page.
+     *    @param string $name    Chosen frame.
+     *    @return boolean        False as no frames.
+     *    @access public
+     */
+    function setFrameFocus($name) {
+        return false;
+    }
+
+    /**
+     *    Clears the frame focus. Does nothing for a leaf page.
+     *    @access public
+     */
+    function clearFrameFocus() {
+    }
+
+    /**
+     *    TODO: write docs
+     */
+    function setFrames($frames) {
+        $this->frames = $frames;
+    }
+
+    /**
+     *    Test to see if link is an absolute one.
+     *    @param string $url     Url to test.
+     *    @return boolean        True if absolute.
+     *    @access protected
+     */
+    protected function linkIsAbsolute($url) {
+        $parsed = new SimpleUrl($url);
+        return (boolean)($parsed->getScheme() && $parsed->getHost());
+    }
+
+    /**
+     *    Adds a link to the page.
+     *    @param SimpleAnchorTag $tag      Link to accept.
+     */
+    function addLink($tag) {
+        $this->links[] = $tag;
+    }
+
+    /**
+     *    Set the forms
+     *    @param array $forms           An array of SimpleForm objects
+     */
+    function setForms($forms) {
+        $this->forms = $forms;
+    }
+
+    /**
+     *    Test for the presence of a frameset.
+     *    @return boolean        True if frameset.
+     *    @access public
+     */
+    function hasFrames() {
+        return count($this->frames) > 0;
+    }
+
+    /**
+     *    Accessor for frame name and source URL for every frame that
+     *    will need to be loaded. Immediate children only.
+     *    @return boolean/array     False if no frameset or
+     *                              otherwise a hash of frame URLs.
+     *                              The key is either a numerical
+     *                              base one index or the name attribute.
+     *    @access public
+     */
+    function getFrameset() {
+        if (! $this->hasFrames()) {
+            return false;
+        }
+        $urls = array();
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $name = $this->frames[$i]->getAttribute('name');
+            $url = new SimpleUrl($this->frames[$i]->getAttribute('src'));
+            $urls[$name ? $name : $i + 1] = $this->expandUrl($url);
+        }
+        return $urls;
+    }
+
+    /**
+     *    Fetches a list of loaded frames.
+     *    @return array/string    Just the URL for a single page.
+     *    @access public
+     */
+    function getFrames() {
+        $url = $this->expandUrl($this->getUrl());
+        return $url->asString();
+    }
+
+    /**
+     *    Accessor for a list of all links.
+     *    @return array   List of urls with scheme of
+     *                    http or https and hostname.
+     *    @access public
+     */
+    function getUrls() {
+        $all = array();
+        foreach ($this->links as $link) {
+            $url = $this->getUrlFromLink($link);
+            $all[] = $url->asString();
+        }
+        return $all;
+    }
+
+    /**
+     *    Accessor for URLs by the link label. Label will match
+     *    regardess of whitespace issues and case.
+     *    @param string $label    Text of link.
+     *    @return array           List of links with that label.
+     *    @access public
+     */
+    function getUrlsByLabel($label) {
+        $matches = array();
+        foreach ($this->links as $link) {
+            if ($link->getText() == $label) {
+                $matches[] = $this->getUrlFromLink($link);
+            }
+        }
+        return $matches;
+    }
+
+    /**
+     *    Accessor for a URL by the id attribute.
+     *    @param string $id       Id attribute of link.
+     *    @return SimpleUrl       URL with that id of false if none.
+     *    @access public
+     */
+    function getUrlById($id) {
+        foreach ($this->links as $link) {
+            if ($link->getAttribute('id') === (string)$id) {
+                return $this->getUrlFromLink($link);
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Converts a link tag into a target URL.
+     *    @param SimpleAnchor $link    Parsed link.
+     *    @return SimpleUrl            URL with frame target if any.
+     *    @access private
+     */
+    protected function getUrlFromLink($link) {
+        $url = $this->expandUrl($link->getHref());
+        if ($link->getAttribute('target')) {
+            $url->setTarget($link->getAttribute('target'));
+        }
+        return $url;
+    }
+
+    /**
+     *    Expands expandomatic URLs into fully qualified
+     *    URLs.
+     *    @param SimpleUrl $url        Relative URL.
+     *    @return SimpleUrl            Absolute URL.
+     *    @access public
+     */
+    function expandUrl($url) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        $location = $this->getBaseUrl() ? $this->getBaseUrl() : new SimpleUrl();
+        return $url->makeAbsolute($location->makeAbsolute($this->getUrl()));
+    }
+
+    /**
+     *    Sets the base url for the page.
+     *    @param string $url    Base URL for page.
+     */
+    function setBase($url) {
+        $this->base = new SimpleUrl($url);
+    }
+
+    /**
+     *    Sets the title tag contents.
+     *    @param SimpleTitleTag $tag    Title of page.
+     */
+    function setTitle($tag) {
+        $this->title = $tag;
+    }
+
+    /**
+     *    Accessor for parsed title.
+     *    @return string     Title or false if no title is present.
+     *    @access public
+     */
+    function getTitle() {
+        if ($this->title) {
+            return $this->title->getText();
+        }
+        return false;
+    }
+
+    /**
+     *    Finds a held form by button label. Will only
+     *    search correctly built forms.
+     *    @param SimpleSelector $selector       Button finder.
+     *    @return SimpleForm                    Form object containing
+     *                                          the button.
+     *    @access public
+     */
+    function getFormBySubmit($selector) {
+        for ($i = 0; $i < count($this->forms); $i++) {
+            if ($this->forms[$i]->hasSubmit($selector)) {
+                return $this->forms[$i];
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Finds a held form by image using a selector.
+     *    Will only search correctly built forms.
+     *    @param SimpleSelector $selector  Image finder.
+     *    @return SimpleForm               Form object containing
+     *                                     the image.
+     *    @access public
+     */
+    function getFormByImage($selector) {
+        for ($i = 0; $i < count($this->forms); $i++) {
+            if ($this->forms[$i]->hasImage($selector)) {
+                return $this->forms[$i];
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Finds a held form by the form ID. A way of
+     *    identifying a specific form when we have control
+     *    of the HTML code.
+     *    @param string $id     Form label.
+     *    @return SimpleForm    Form object containing the matching ID.
+     *    @access public
+     */
+    function getFormById($id) {
+        for ($i = 0; $i < count($this->forms); $i++) {
+            if ($this->forms[$i]->getId() == $id) {
+                return $this->forms[$i];
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Sets a field on each form in which the field is
+     *    available.
+     *    @param SimpleSelector $selector    Field finder.
+     *    @param string $value               Value to set field to.
+     *    @return boolean                    True if value is valid.
+     *    @access public
+     */
+    function setField($selector, $value, $position=false) {
+        $is_set = false;
+        for ($i = 0; $i < count($this->forms); $i++) {
+            if ($this->forms[$i]->setField($selector, $value, $position)) {
+                $is_set = true;
+            }
+        }
+        return $is_set;
+    }
+
+    /**
+     *    Accessor for a form element value within a page.
+     *    @param SimpleSelector $selector    Field finder.
+     *    @return string/boolean             A string if the field is
+     *                                       present, false if unchecked
+     *                                       and null if missing.
+     *    @access public
+     */
+    function getField($selector) {
+        for ($i = 0; $i < count($this->forms); $i++) {
+            $value = $this->forms[$i]->getValue($selector);
+            if (isset($value)) {
+                return $value;
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Turns HTML into text browser visible text. Images
+     *    are converted to their alt text and tags are supressed.
+     *    Entities are converted to their visible representation.
+     *    @param string $html        HTML to convert.
+     *    @return string             Plain text.
+     *    @access public
+     */
+    static function normalise($html) {
+        $text = preg_replace('#<!--.*?-->#si', '', $html);
+        $text = preg_replace('#<(script|option|textarea)[^>]*>.*?</\1>#si', '', $text);
+        $text = preg_replace('#<img[^>]*alt\s*=\s*("([^"]*)"|\'([^\']*)\'|([a-zA-Z_]+))[^>]*>#', ' \2\3\4 ', $text);
+        $text = preg_replace('#<[^>]*>#', '', $text);
+        $text = html_entity_decode($text, ENT_QUOTES);
+        $text = preg_replace('#\s+#', ' ', $text);
+        return trim(trim($text), "\xA0");        // TODO: The \xAO is a &nbsp;. Add a test for this.
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/php_parser.php b/3rdparty/simpletest/php_parser.php
new file mode 100755
index 00000000000..4c5b8f00bae
--- /dev/null
+++ b/3rdparty/simpletest/php_parser.php
@@ -0,0 +1,1054 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: php_parser.php 1927 2009-07-31 12:45:36Z dgheath $
+ */
+
+/**#@+
+ * Lexer mode stack constants
+ */
+foreach (array('LEXER_ENTER', 'LEXER_MATCHED',
+                'LEXER_UNMATCHED', 'LEXER_EXIT',
+                'LEXER_SPECIAL') as $i => $constant) {
+    if (! defined($constant)) {
+        define($constant, $i + 1);
+    }
+}
+/**#@-*/
+
+/**
+ *    Compounded regular expression. Any of
+ *    the contained patterns could match and
+ *    when one does, it's label is returned.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class ParallelRegex {
+    private $patterns;
+    private $labels;
+    private $regex;
+    private $case;
+
+    /**
+     *    Constructor. Starts with no patterns.
+     *    @param boolean $case    True for case sensitive, false
+     *                            for insensitive.
+     *    @access public
+     */
+    function __construct($case) {
+        $this->case = $case;
+        $this->patterns = array();
+        $this->labels = array();
+        $this->regex = null;
+    }
+
+    /**
+     *    Adds a pattern with an optional label.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $label        Label of regex to be returned
+     *                                on a match.
+     *    @access public
+     */
+    function addPattern($pattern, $label = true) {
+        $count = count($this->patterns);
+        $this->patterns[$count] = $pattern;
+        $this->labels[$count] = $label;
+        $this->regex = null;
+    }
+
+    /**
+     *    Attempts to match all patterns at once against
+     *    a string.
+     *    @param string $subject      String to match against.
+     *    @param string $match        First matched portion of
+     *                                subject.
+     *    @return boolean             True on success.
+     *    @access public
+     */
+    function match($subject, &$match) {
+        if (count($this->patterns) == 0) {
+            return false;
+        }
+        if (! preg_match($this->getCompoundedRegex(), $subject, $matches)) {
+            $match = '';
+            return false;
+        }
+        $match = $matches[0];
+        for ($i = 1; $i < count($matches); $i++) {
+            if ($matches[$i]) {
+                return $this->labels[$i - 1];
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Compounds the patterns into a single
+     *    regular expression separated with the
+     *    "or" operator. Caches the regex.
+     *    Will automatically escape (, ) and / tokens.
+     *    @param array $patterns    List of patterns in order.
+     *    @access private
+     */
+    protected function getCompoundedRegex() {
+        if ($this->regex == null) {
+            for ($i = 0, $count = count($this->patterns); $i < $count; $i++) {
+                $this->patterns[$i] = '(' . str_replace(
+                        array('/', '(', ')'),
+                        array('\/', '\(', '\)'),
+                        $this->patterns[$i]) . ')';
+            }
+            $this->regex = "/" . implode("|", $this->patterns) . "/" . $this->getPerlMatchingFlags();
+        }
+        return $this->regex;
+    }
+
+    /**
+     *    Accessor for perl regex mode flags to use.
+     *    @return string       Perl regex flags.
+     *    @access private
+     */
+    protected function getPerlMatchingFlags() {
+        return ($this->case ? "msS" : "msSi");
+    }
+}
+
+/**
+ *    States for a stack machine.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleStateStack {
+    private $stack;
+
+    /**
+     *    Constructor. Starts in named state.
+     *    @param string $start        Starting state name.
+     *    @access public
+     */
+    function __construct($start) {
+        $this->stack = array($start);
+    }
+
+    /**
+     *    Accessor for current state.
+     *    @return string       State.
+     *    @access public
+     */
+    function getCurrent() {
+        return $this->stack[count($this->stack) - 1];
+    }
+
+    /**
+     *    Adds a state to the stack and sets it
+     *    to be the current state.
+     *    @param string $state        New state.
+     *    @access public
+     */
+    function enter($state) {
+        array_push($this->stack, $state);
+    }
+
+    /**
+     *    Leaves the current state and reverts
+     *    to the previous one.
+     *    @return boolean    False if we drop off
+     *                       the bottom of the list.
+     *    @access public
+     */
+    function leave() {
+        if (count($this->stack) == 1) {
+            return false;
+        }
+        array_pop($this->stack);
+        return true;
+    }
+}
+
+/**
+ *    Accepts text and breaks it into tokens.
+ *    Some optimisation to make the sure the
+ *    content is only scanned by the PHP regex
+ *    parser once. Lexer modes must not start
+ *    with leading underscores.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleLexer {
+    private $regexes;
+    private $parser;
+    private $mode;
+    private $mode_handlers;
+    private $case;
+
+    /**
+     *    Sets up the lexer in case insensitive matching
+     *    by default.
+     *    @param SimpleSaxParser $parser  Handling strategy by
+     *                                    reference.
+     *    @param string $start            Starting handler.
+     *    @param boolean $case            True for case sensitive.
+     *    @access public
+     */
+    function __construct($parser, $start = "accept", $case = false) {
+        $this->case = $case;
+        $this->regexes = array();
+        $this->parser = $parser;
+        $this->mode = new SimpleStateStack($start);
+        $this->mode_handlers = array($start => $start);
+    }
+
+    /**
+     *    Adds a token search pattern for a particular
+     *    parsing mode. The pattern does not change the
+     *    current mode.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $mode         Should only apply this
+     *                                pattern when dealing with
+     *                                this type of input.
+     *    @access public
+     */
+    function addPattern($pattern, $mode = "accept") {
+        if (! isset($this->regexes[$mode])) {
+            $this->regexes[$mode] = new ParallelRegex($this->case);
+        }
+        $this->regexes[$mode]->addPattern($pattern);
+        if (! isset($this->mode_handlers[$mode])) {
+            $this->mode_handlers[$mode] = $mode;
+        }
+    }
+
+    /**
+     *    Adds a pattern that will enter a new parsing
+     *    mode. Useful for entering parenthesis, strings,
+     *    tags, etc.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $mode         Should only apply this
+     *                                pattern when dealing with
+     *                                this type of input.
+     *    @param string $new_mode     Change parsing to this new
+     *                                nested mode.
+     *    @access public
+     */
+    function addEntryPattern($pattern, $mode, $new_mode) {
+        if (! isset($this->regexes[$mode])) {
+            $this->regexes[$mode] = new ParallelRegex($this->case);
+        }
+        $this->regexes[$mode]->addPattern($pattern, $new_mode);
+        if (! isset($this->mode_handlers[$new_mode])) {
+            $this->mode_handlers[$new_mode] = $new_mode;
+        }
+    }
+
+    /**
+     *    Adds a pattern that will exit the current mode
+     *    and re-enter the previous one.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $mode         Mode to leave.
+     *    @access public
+     */
+    function addExitPattern($pattern, $mode) {
+        if (! isset($this->regexes[$mode])) {
+            $this->regexes[$mode] = new ParallelRegex($this->case);
+        }
+        $this->regexes[$mode]->addPattern($pattern, "__exit");
+        if (! isset($this->mode_handlers[$mode])) {
+            $this->mode_handlers[$mode] = $mode;
+        }
+    }
+
+    /**
+     *    Adds a pattern that has a special mode. Acts as an entry
+     *    and exit pattern in one go, effectively calling a special
+     *    parser handler for this token only.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $mode         Should only apply this
+     *                                pattern when dealing with
+     *                                this type of input.
+     *    @param string $special      Use this mode for this one token.
+     *    @access public
+     */
+    function addSpecialPattern($pattern, $mode, $special) {
+        if (! isset($this->regexes[$mode])) {
+            $this->regexes[$mode] = new ParallelRegex($this->case);
+        }
+        $this->regexes[$mode]->addPattern($pattern, "_$special");
+        if (! isset($this->mode_handlers[$special])) {
+            $this->mode_handlers[$special] = $special;
+        }
+    }
+
+    /**
+     *    Adds a mapping from a mode to another handler.
+     *    @param string $mode        Mode to be remapped.
+     *    @param string $handler     New target handler.
+     *    @access public
+     */
+    function mapHandler($mode, $handler) {
+        $this->mode_handlers[$mode] = $handler;
+    }
+
+    /**
+     *    Splits the page text into tokens. Will fail
+     *    if the handlers report an error or if no
+     *    content is consumed. If successful then each
+     *    unparsed and parsed token invokes a call to the
+     *    held listener.
+     *    @param string $raw        Raw HTML text.
+     *    @return boolean           True on success, else false.
+     *    @access public
+     */
+    function parse($raw) {
+        if (! isset($this->parser)) {
+            return false;
+        }
+        $length = strlen($raw);
+        while (is_array($parsed = $this->reduce($raw))) {
+            list($raw, $unmatched, $matched, $mode) = $parsed;
+            if (! $this->dispatchTokens($unmatched, $matched, $mode)) {
+                return false;
+            }
+            if ($raw === '') {
+                return true;
+            }
+            if (strlen($raw) == $length) {
+                return false;
+            }
+            $length = strlen($raw);
+        }
+        if (! $parsed) {
+            return false;
+        }
+        return $this->invokeParser($raw, LEXER_UNMATCHED);
+    }
+
+    /**
+     *    Sends the matched token and any leading unmatched
+     *    text to the parser changing the lexer to a new
+     *    mode if one is listed.
+     *    @param string $unmatched    Unmatched leading portion.
+     *    @param string $matched      Actual token match.
+     *    @param string $mode         Mode after match. A boolean
+     *                                false mode causes no change.
+     *    @return boolean             False if there was any error
+     *                                from the parser.
+     *    @access private
+     */
+    protected function dispatchTokens($unmatched, $matched, $mode = false) {
+        if (! $this->invokeParser($unmatched, LEXER_UNMATCHED)) {
+            return false;
+        }
+        if (is_bool($mode)) {
+            return $this->invokeParser($matched, LEXER_MATCHED);
+        }
+        if ($this->isModeEnd($mode)) {
+            if (! $this->invokeParser($matched, LEXER_EXIT)) {
+                return false;
+            }
+            return $this->mode->leave();
+        }
+        if ($this->isSpecialMode($mode)) {
+            $this->mode->enter($this->decodeSpecial($mode));
+            if (! $this->invokeParser($matched, LEXER_SPECIAL)) {
+                return false;
+            }
+            return $this->mode->leave();
+        }
+        $this->mode->enter($mode);
+        return $this->invokeParser($matched, LEXER_ENTER);
+    }
+
+    /**
+     *    Tests to see if the new mode is actually to leave
+     *    the current mode and pop an item from the matching
+     *    mode stack.
+     *    @param string $mode    Mode to test.
+     *    @return boolean        True if this is the exit mode.
+     *    @access private
+     */
+    protected function isModeEnd($mode) {
+        return ($mode === "__exit");
+    }
+
+    /**
+     *    Test to see if the mode is one where this mode
+     *    is entered for this token only and automatically
+     *    leaves immediately afterwoods.
+     *    @param string $mode    Mode to test.
+     *    @return boolean        True if this is the exit mode.
+     *    @access private
+     */
+    protected function isSpecialMode($mode) {
+        return (strncmp($mode, "_", 1) == 0);
+    }
+
+    /**
+     *    Strips the magic underscore marking single token
+     *    modes.
+     *    @param string $mode    Mode to decode.
+     *    @return string         Underlying mode name.
+     *    @access private
+     */
+    protected function decodeSpecial($mode) {
+        return substr($mode, 1);
+    }
+
+    /**
+     *    Calls the parser method named after the current
+     *    mode. Empty content will be ignored. The lexer
+     *    has a parser handler for each mode in the lexer.
+     *    @param string $content        Text parsed.
+     *    @param boolean $is_match      Token is recognised rather
+     *                                  than unparsed data.
+     *    @access private
+     */
+    protected function invokeParser($content, $is_match) {
+        if (($content === '') || ($content === false)) {
+            return true;
+        }
+        $handler = $this->mode_handlers[$this->mode->getCurrent()];
+        return $this->parser->$handler($content, $is_match);
+    }
+
+    /**
+     *    Tries to match a chunk of text and if successful
+     *    removes the recognised chunk and any leading
+     *    unparsed data. Empty strings will not be matched.
+     *    @param string $raw         The subject to parse. This is the
+     *                               content that will be eaten.
+     *    @return array/boolean      Three item list of unparsed
+     *                               content followed by the
+     *                               recognised token and finally the
+     *                               action the parser is to take.
+     *                               True if no match, false if there
+     *                               is a parsing error.
+     *    @access private
+     */
+    protected function reduce($raw) {
+        if ($action = $this->regexes[$this->mode->getCurrent()]->match($raw, $match)) {
+            $unparsed_character_count = strpos($raw, $match);
+            $unparsed = substr($raw, 0, $unparsed_character_count);
+            $raw = substr($raw, $unparsed_character_count + strlen($match));
+            return array($raw, $unparsed, $match, $action);
+        }
+        return true;
+    }
+}
+
+/**
+ *    Breaks HTML into SAX events.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHtmlLexer extends SimpleLexer {
+
+    /**
+     *    Sets up the lexer with case insensitive matching
+     *    and adds the HTML handlers.
+     *    @param SimpleSaxParser $parser  Handling strategy by
+     *                                    reference.
+     *    @access public
+     */
+    function __construct($parser) {
+        parent::__construct($parser, 'text');
+        $this->mapHandler('text', 'acceptTextToken');
+        $this->addSkipping();
+        foreach ($this->getParsedTags() as $tag) {
+            $this->addTag($tag);
+        }
+        $this->addInTagTokens();
+    }
+
+    /**
+     *    List of parsed tags. Others are ignored.
+     *    @return array        List of searched for tags.
+     *    @access private
+     */
+    protected function getParsedTags() {
+        return array('a', 'base', 'title', 'form', 'input', 'button', 'textarea', 'select',
+                'option', 'frameset', 'frame', 'label');
+    }
+
+    /**
+     *    The lexer has to skip certain sections such
+     *    as server code, client code and styles.
+     *    @access private
+     */
+    protected function addSkipping() {
+        $this->mapHandler('css', 'ignore');
+        $this->addEntryPattern('<style', 'text', 'css');
+        $this->addExitPattern('</style>', 'css');
+        $this->mapHandler('js', 'ignore');
+        $this->addEntryPattern('<script', 'text', 'js');
+        $this->addExitPattern('</script>', 'js');
+        $this->mapHandler('comment', 'ignore');
+        $this->addEntryPattern('<!--', 'text', 'comment');
+        $this->addExitPattern('-->', 'comment');
+    }
+
+    /**
+     *    Pattern matches to start and end a tag.
+     *    @param string $tag          Name of tag to scan for.
+     *    @access private
+     */
+    protected function addTag($tag) {
+        $this->addSpecialPattern("</$tag>", 'text', 'acceptEndToken');
+        $this->addEntryPattern("<$tag", 'text', 'tag');
+    }
+
+    /**
+     *    Pattern matches to parse the inside of a tag
+     *    including the attributes and their quoting.
+     *    @access private
+     */
+    protected function addInTagTokens() {
+        $this->mapHandler('tag', 'acceptStartToken');
+        $this->addSpecialPattern('\s+', 'tag', 'ignore');
+        $this->addAttributeTokens();
+        $this->addExitPattern('/>', 'tag');
+        $this->addExitPattern('>', 'tag');
+    }
+
+    /**
+     *    Matches attributes that are either single quoted,
+     *    double quoted or unquoted.
+     *    @access private
+     */
+    protected function addAttributeTokens() {
+        $this->mapHandler('dq_attribute', 'acceptAttributeToken');
+        $this->addEntryPattern('=\s*"', 'tag', 'dq_attribute');
+        $this->addPattern("\\\\\"", 'dq_attribute');
+        $this->addExitPattern('"', 'dq_attribute');
+        $this->mapHandler('sq_attribute', 'acceptAttributeToken');
+        $this->addEntryPattern("=\s*'", 'tag', 'sq_attribute');
+        $this->addPattern("\\\\'", 'sq_attribute');
+        $this->addExitPattern("'", 'sq_attribute');
+        $this->mapHandler('uq_attribute', 'acceptAttributeToken');
+        $this->addSpecialPattern('=\s*[^>\s]*', 'tag', 'uq_attribute');
+    }
+}
+
+/**
+ *    Converts HTML tokens into selected SAX events.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHtmlSaxParser {
+    private $lexer;
+    private $listener;
+    private $tag;
+    private $attributes;
+    private $current_attribute;
+
+    /**
+     *    Sets the listener.
+     *    @param SimplePhpPageBuilder $listener    SAX event handler.
+     *    @access public
+     */
+    function __construct($listener) {
+        $this->listener = $listener;
+        $this->lexer = $this->createLexer($this);
+        $this->tag = '';
+        $this->attributes = array();
+        $this->current_attribute = '';
+    }
+
+    /**
+     *    Runs the content through the lexer which
+     *    should call back to the acceptors.
+     *    @param string $raw      Page text to parse.
+     *    @return boolean         False if parse error.
+     *    @access public
+     */
+    function parse($raw) {
+        return $this->lexer->parse($raw);
+    }
+
+    /**
+     *    Sets up the matching lexer. Starts in 'text' mode.
+     *    @param SimpleSaxParser $parser    Event generator, usually $self.
+     *    @return SimpleLexer               Lexer suitable for this parser.
+     *    @access public
+     */
+    static function createLexer(&$parser) {
+        return new SimpleHtmlLexer($parser);
+    }
+
+    /**
+     *    Accepts a token from the tag mode. If the
+     *    starting element completes then the element
+     *    is dispatched and the current attributes
+     *    set back to empty. The element or attribute
+     *    name is converted to lower case.
+     *    @param string $token     Incoming characters.
+     *    @param integer $event    Lexer event type.
+     *    @return boolean          False if parse error.
+     *    @access public
+     */
+    function acceptStartToken($token, $event) {
+        if ($event == LEXER_ENTER) {
+            $this->tag = strtolower(substr($token, 1));
+            return true;
+        }
+        if ($event == LEXER_EXIT) {
+            $success = $this->listener->startElement(
+                    $this->tag,
+                    $this->attributes);
+            $this->tag = '';
+            $this->attributes = array();
+            return $success;
+        }
+        if ($token != '=') {
+            $this->current_attribute = strtolower(html_entity_decode($token, ENT_QUOTES));
+            $this->attributes[$this->current_attribute] = '';
+        }
+        return true;
+    }
+
+    /**
+     *    Accepts a token from the end tag mode.
+     *    The element name is converted to lower case.
+     *    @param string $token     Incoming characters.
+     *    @param integer $event    Lexer event type.
+     *    @return boolean          False if parse error.
+     *    @access public
+     */
+    function acceptEndToken($token, $event) {
+        if (! preg_match('/<\/(.*)>/', $token, $matches)) {
+            return false;
+        }
+        return $this->listener->endElement(strtolower($matches[1]));
+    }
+
+    /**
+     *    Part of the tag data.
+     *    @param string $token     Incoming characters.
+     *    @param integer $event    Lexer event type.
+     *    @return boolean          False if parse error.
+     *    @access public
+     */
+    function acceptAttributeToken($token, $event) {
+        if ($this->current_attribute) {
+            if ($event == LEXER_UNMATCHED) {
+                $this->attributes[$this->current_attribute] .=
+                        html_entity_decode($token, ENT_QUOTES);
+            }
+            if ($event == LEXER_SPECIAL) {
+                $this->attributes[$this->current_attribute] .=
+                        preg_replace('/^=\s*/' , '', html_entity_decode($token, ENT_QUOTES));
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    A character entity.
+     *    @param string $token    Incoming characters.
+     *    @param integer $event   Lexer event type.
+     *    @return boolean         False if parse error.
+     *    @access public
+     */
+    function acceptEntityToken($token, $event) {
+    }
+
+    /**
+     *    Character data between tags regarded as
+     *    important.
+     *    @param string $token     Incoming characters.
+     *    @param integer $event    Lexer event type.
+     *    @return boolean          False if parse error.
+     *    @access public
+     */
+    function acceptTextToken($token, $event) {
+        return $this->listener->addContent($token);
+    }
+
+    /**
+     *    Incoming data to be ignored.
+     *    @param string $token     Incoming characters.
+     *    @param integer $event    Lexer event type.
+     *    @return boolean          False if parse error.
+     *    @access public
+     */
+    function ignore($token, $event) {
+        return true;
+    }
+}
+
+/**
+ *    SAX event handler. Maintains a list of
+ *    open tags and dispatches them as they close.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimplePhpPageBuilder {
+    private $tags;
+    private $page;
+    private $private_content_tag;
+    private $open_forms = array();
+    private $complete_forms = array();
+    private $frameset = false;
+    private $loading_frames = array();
+    private $frameset_nesting_level = 0;
+    private $left_over_labels = array();
+
+    /**
+     *    Frees up any references so as to allow the PHP garbage
+     *    collection from unset() to work.
+     *    @access public
+     */
+    function free() {
+        unset($this->tags);
+        unset($this->page);
+        unset($this->private_content_tags);
+        $this->open_forms = array();
+        $this->complete_forms = array();
+        $this->frameset = false;
+        $this->loading_frames = array();
+        $this->frameset_nesting_level = 0;
+        $this->left_over_labels = array();
+    }
+
+    /**
+     *    This builder is always available.
+     *    @return boolean       Always true.
+     */
+    function can() {
+        return true;
+    }
+
+    /**
+     *    Reads the raw content and send events
+     *    into the page to be built.
+     *    @param $response SimpleHttpResponse  Fetched response.
+     *    @return SimplePage                   Newly parsed page.
+     *    @access public
+     */
+    function parse($response) {
+        $this->tags = array();
+        $this->page = $this->createPage($response);
+        $parser = $this->createParser($this);
+        $parser->parse($response->getContent());
+        $this->acceptPageEnd();
+        $page = $this->page;
+        $this->free();
+        return $page;
+    }
+
+    /**
+     *    Creates an empty page.
+     *    @return SimplePage        New unparsed page.
+     *    @access protected
+     */
+    protected function createPage($response) {
+        return new SimplePage($response);
+    }
+
+    /**
+     *    Creates the parser used with the builder.
+     *    @param SimplePhpPageBuilder $listener   Target of parser.
+     *    @return SimpleSaxParser              Parser to generate
+     *                                         events for the builder.
+     *    @access protected
+     */
+    protected function createParser(&$listener) {
+        return new SimpleHtmlSaxParser($listener);
+    }
+
+    /**
+     *    Start of element event. Opens a new tag.
+     *    @param string $name         Element name.
+     *    @param hash $attributes     Attributes without content
+     *                                are marked as true.
+     *    @return boolean             False on parse error.
+     *    @access public
+     */
+    function startElement($name, $attributes) {
+        $factory = new SimpleTagBuilder();
+        $tag = $factory->createTag($name, $attributes);
+        if (! $tag) {
+            return true;
+        }
+        if ($tag->getTagName() == 'label') {
+            $this->acceptLabelStart($tag);
+            $this->openTag($tag);
+            return true;
+        }
+        if ($tag->getTagName() == 'form') {
+            $this->acceptFormStart($tag);
+            return true;
+        }
+        if ($tag->getTagName() == 'frameset') {
+            $this->acceptFramesetStart($tag);
+            return true;
+        }
+        if ($tag->getTagName() == 'frame') {
+            $this->acceptFrame($tag);
+            return true;
+        }
+        if ($tag->isPrivateContent() && ! isset($this->private_content_tag)) {
+            $this->private_content_tag = &$tag;
+        }
+        if ($tag->expectEndTag()) {
+            $this->openTag($tag);
+            return true;
+        }
+        $this->acceptTag($tag);
+        return true;
+    }
+
+    /**
+     *    End of element event.
+     *    @param string $name        Element name.
+     *    @return boolean            False on parse error.
+     *    @access public
+     */
+    function endElement($name) {
+        if ($name == 'label') {
+            $this->acceptLabelEnd();
+            return true;
+        }
+        if ($name == 'form') {
+            $this->acceptFormEnd();
+            return true;
+        }
+        if ($name == 'frameset') {
+            $this->acceptFramesetEnd();
+            return true;
+        }
+        if ($this->hasNamedTagOnOpenTagStack($name)) {
+            $tag = array_pop($this->tags[$name]);
+            if ($tag->isPrivateContent() && $this->private_content_tag->getTagName() == $name) {
+                unset($this->private_content_tag);
+            }
+            $this->addContentTagToOpenTags($tag);
+            $this->acceptTag($tag);
+            return true;
+        }
+        return true;
+    }
+
+    /**
+     *    Test to see if there are any open tags awaiting
+     *    closure that match the tag name.
+     *    @param string $name        Element name.
+     *    @return boolean            True if any are still open.
+     *    @access private
+     */
+    protected function hasNamedTagOnOpenTagStack($name) {
+        return isset($this->tags[$name]) && (count($this->tags[$name]) > 0);
+    }
+
+    /**
+     *    Unparsed, but relevant data. The data is added
+     *    to every open tag.
+     *    @param string $text        May include unparsed tags.
+     *    @return boolean            False on parse error.
+     *    @access public
+     */
+    function addContent($text) {
+        if (isset($this->private_content_tag)) {
+            $this->private_content_tag->addContent($text);
+        } else {
+            $this->addContentToAllOpenTags($text);
+        }
+        return true;
+    }
+
+    /**
+     *    Any content fills all currently open tags unless it
+     *    is part of an option tag.
+     *    @param string $text        May include unparsed tags.
+     *    @access private
+     */
+    protected function addContentToAllOpenTags($text) {
+        foreach (array_keys($this->tags) as $name) {
+            for ($i = 0, $count = count($this->tags[$name]); $i < $count; $i++) {
+                $this->tags[$name][$i]->addContent($text);
+            }
+        }
+    }
+
+    /**
+     *    Parsed data in tag form. The parsed tag is added
+     *    to every open tag. Used for adding options to select
+     *    fields only.
+     *    @param SimpleTag $tag        Option tags only.
+     *    @access private
+     */
+    protected function addContentTagToOpenTags(&$tag) {
+        if ($tag->getTagName() != 'option') {
+            return;
+        }
+        foreach (array_keys($this->tags) as $name) {
+            for ($i = 0, $count = count($this->tags[$name]); $i < $count; $i++) {
+                $this->tags[$name][$i]->addTag($tag);
+            }
+        }
+    }
+
+    /**
+     *    Opens a tag for receiving content. Multiple tags
+     *    will be receiving input at the same time.
+     *    @param SimpleTag $tag        New content tag.
+     *    @access private
+     */
+    protected function openTag($tag) {
+        $name = $tag->getTagName();
+        if (! in_array($name, array_keys($this->tags))) {
+            $this->tags[$name] = array();
+        }
+        $this->tags[$name][] = $tag;
+    }
+
+    /**
+     *    Adds a tag to the page.
+     *    @param SimpleTag $tag        Tag to accept.
+     *    @access public
+     */
+    protected function acceptTag($tag) {
+        if ($tag->getTagName() == "a") {
+            $this->page->addLink($tag);
+        } elseif ($tag->getTagName() == "base") {
+            $this->page->setBase($tag->getAttribute('href'));
+        } elseif ($tag->getTagName() == "title") {
+            $this->page->setTitle($tag);
+        } elseif ($this->isFormElement($tag->getTagName())) {
+            for ($i = 0; $i < count($this->open_forms); $i++) {
+                $this->open_forms[$i]->addWidget($tag);
+            }
+            $this->last_widget = $tag;
+        }
+    }
+
+    /**
+     *    Opens a label for a described widget.
+     *    @param SimpleFormTag $tag      Tag to accept.
+     *    @access public
+     */
+    protected function acceptLabelStart($tag) {
+        $this->label = $tag;
+        unset($this->last_widget);
+    }
+
+    /**
+     *    Closes the most recently opened label.
+     *    @access public
+     */
+    protected function acceptLabelEnd() {
+        if (isset($this->label)) {
+            if (isset($this->last_widget)) {
+                $this->last_widget->setLabel($this->label->getText());
+                unset($this->last_widget);
+            } else {
+                $this->left_over_labels[] = SimpleTestCompatibility::copy($this->label);
+            }
+            unset($this->label);
+        }
+    }
+
+    /**
+     *    Tests to see if a tag is a possible form
+     *    element.
+     *    @param string $name     HTML element name.
+     *    @return boolean         True if form element.
+     *    @access private
+     */
+    protected function isFormElement($name) {
+        return in_array($name, array('input', 'button', 'textarea', 'select'));
+    }
+
+    /**
+     *    Opens a form. New widgets go here.
+     *    @param SimpleFormTag $tag      Tag to accept.
+     *    @access public
+     */
+    protected function acceptFormStart($tag) {
+        $this->open_forms[] = new SimpleForm($tag, $this->page);
+    }
+
+    /**
+     *    Closes the most recently opened form.
+     *    @access public
+     */
+    protected function acceptFormEnd() {
+        if (count($this->open_forms)) {
+            $this->complete_forms[] = array_pop($this->open_forms);
+        }
+    }
+
+    /**
+     *    Opens a frameset. A frameset may contain nested
+     *    frameset tags.
+     *    @param SimpleFramesetTag $tag      Tag to accept.
+     *    @access public
+     */
+    protected function acceptFramesetStart($tag) {
+        if (! $this->isLoadingFrames()) {
+            $this->frameset = $tag;
+        }
+        $this->frameset_nesting_level++;
+    }
+
+    /**
+     *    Closes the most recently opened frameset.
+     *    @access public
+     */
+    protected function acceptFramesetEnd() {
+        if ($this->isLoadingFrames()) {
+            $this->frameset_nesting_level--;
+        }
+    }
+
+    /**
+     *    Takes a single frame tag and stashes it in
+     *    the current frame set.
+     *    @param SimpleFrameTag $tag      Tag to accept.
+     *    @access public
+     */
+    protected function acceptFrame($tag) {
+        if ($this->isLoadingFrames()) {
+            if ($tag->getAttribute('src')) {
+                $this->loading_frames[] = $tag;
+            }
+        }
+    }
+
+    /**
+     *    Test to see if in the middle of reading
+     *    a frameset.
+     *    @return boolean        True if inframeset.
+     *    @access private
+     */
+    protected function isLoadingFrames() {
+        return $this->frameset and $this->frameset_nesting_level > 0;
+    }
+
+    /**
+     *    Marker for end of complete page. Any work in
+     *    progress can now be closed.
+     *    @access public
+     */
+    protected function acceptPageEnd() {
+        while (count($this->open_forms)) {
+            $this->complete_forms[] = array_pop($this->open_forms);
+        }
+        foreach ($this->left_over_labels as $label) {
+            for ($i = 0, $count = count($this->complete_forms); $i < $count; $i++) {
+                $this->complete_forms[$i]->attachLabelBySelector(
+                        new SimpleById($label->getFor()),
+                        $label->getText());
+            }
+        }
+        $this->page->setForms($this->complete_forms);
+        $this->page->setFrames($this->loading_frames);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/recorder.php b/3rdparty/simpletest/recorder.php
new file mode 100644
index 00000000000..b3d0d01c625
--- /dev/null
+++ b/3rdparty/simpletest/recorder.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ *	base include file for SimpleTest
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ *  @author Rene vd O (original code)
+ *  @author Perrick Penet
+ *  @author Marcus Baker
+ *	@version	$Id: recorder.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**
+ *	include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/scorer.php');
+
+/**
+ *	A single test result.
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ */
+abstract class SimpleResult {
+	public $time;
+	public $breadcrumb;
+	public $message;
+
+	/**
+	 * Records the test result as public members.
+	 * @param array $breadcrumb		Test stack at the time of the event.
+	 * @param string $message       The messsage to the human.
+	 */
+	function __construct($breadcrumb, $message) {
+		list($this->time, $this->breadcrumb, $this->message) =
+				array(time(), $breadcrumb, $message);
+	}
+}
+
+/**
+ *	A single pass captured for later.
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ */
+class SimpleResultOfPass extends SimpleResult { }
+
+/**
+ *	A single failure captured for later.
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ */
+class SimpleResultOfFail extends SimpleResult { }
+
+/**
+ *	A single exception captured for later.
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ */
+class SimpleResultOfException extends SimpleResult { }
+
+/**
+ *    Array-based test recorder. Returns an array
+ *    with timestamp, status, test name and message for each pass and failure.
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ */
+class Recorder extends SimpleReporterDecorator {
+    public $results = array();
+
+	/**
+	 *    Stashes the pass as a SimpleResultOfPass
+	 *    for later retrieval.
+     *    @param string $message    Pass message to be displayed
+     *    							eventually.
+	 */
+	function paintPass($message) {
+        parent::paintPass($message);
+        $this->results[] = new SimpleResultOfPass(parent::getTestList(), $message);
+	}
+
+	/**
+	 * 	  Stashes the fail as a SimpleResultOfFail
+	 * 	  for later retrieval.
+     *    @param string $message    Failure message to be displayed
+     *    							eventually.
+	 */
+	function paintFail($message) {
+        parent::paintFail($message);
+        $this->results[] = new SimpleResultOfFail(parent::getTestList(), $message);
+	}
+
+	/**
+	 * 	  Stashes the exception as a SimpleResultOfException
+	 * 	  for later retrieval.
+     *    @param string $message    Exception message to be displayed
+     *    							eventually.
+	 */
+	function paintException($message) {
+        parent::paintException($message);
+        $this->results[] = new SimpleResultOfException(parent::getTestList(), $message);
+	}
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/reflection_php4.php b/3rdparty/simpletest/reflection_php4.php
new file mode 100644
index 00000000000..39801ea1bdb
--- /dev/null
+++ b/3rdparty/simpletest/reflection_php4.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: reflection_php4.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**
+ *  Version specific reflection API.
+ *  @package SimpleTest
+ *  @subpackage UnitTester
+ *  @ignore duplicate with reflection_php5.php
+ */
+class SimpleReflection {
+    var $_interface;
+
+    /**
+     *    Stashes the class/interface.
+     *    @param string $interface    Class or interface
+     *                                to inspect.
+     */
+    function SimpleReflection($interface) {
+        $this->_interface = $interface;
+    }
+
+    /**
+     *    Checks that a class has been declared.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classExists() {
+        return class_exists($this->_interface);
+    }
+
+    /**
+     *    Needed to kill the autoload feature in PHP5
+     *    for classes created dynamically.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classExistsSansAutoload() {
+        return class_exists($this->_interface);
+    }
+
+    /**
+     *    Checks that a class or interface has been
+     *    declared.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classOrInterfaceExists() {
+        return class_exists($this->_interface);
+    }
+
+    /**
+     *    Needed to kill the autoload feature in PHP5
+     *    for classes created dynamically.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classOrInterfaceExistsSansAutoload() {
+        return class_exists($this->_interface);
+    }
+
+    /**
+     *    Gets the list of methods on a class or
+     *    interface.
+     *    @returns array          List of method names.
+     *    @access public
+     */
+    function getMethods() {
+        return get_class_methods($this->_interface);
+    }
+
+    /**
+     *    Gets the list of interfaces from a class. If the
+     *    class name is actually an interface then just that
+     *    interface is returned.
+     *    @returns array          List of interfaces.
+     *    @access public
+     */
+    function getInterfaces() {
+        return array();
+    }
+
+    /**
+     *    Finds the parent class name.
+     *    @returns string      Parent class name.
+     *    @access public
+     */
+    function getParent() {
+        return strtolower(get_parent_class($this->_interface));
+    }
+
+    /**
+     *    Determines if the class is abstract, which for PHP 4
+     *    will never be the case.
+     *    @returns boolean      True if abstract.
+     *    @access public
+     */
+    function isAbstract() {
+        return false;
+    }
+
+    /**
+     *    Determines if the the entity is an interface, which for PHP 4
+     *    will never be the case.
+     *    @returns boolean      True if interface.
+     *    @access public
+     */
+    function isInterface() {
+        return false;
+    }
+
+    /**
+     *    Scans for final methods, but as it's PHP 4 there
+     *    aren't any.
+     *    @returns boolean   True if the class has a final method.
+     *    @access public
+     */
+    function hasFinal() {
+        return false;
+    }
+
+    /**
+     *    Gets the source code matching the declaration
+     *    of a method.
+     *    @param string $method       Method name.
+     *    @access public
+     */
+    function getSignature($method) {
+        return "function &$method()";
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/reflection_php5.php b/3rdparty/simpletest/reflection_php5.php
new file mode 100644
index 00000000000..43d8a7b287f
--- /dev/null
+++ b/3rdparty/simpletest/reflection_php5.php
@@ -0,0 +1,386 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: reflection_php5.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**
+ *    Version specific reflection API.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleReflection {
+    private $interface;
+
+    /**
+     *    Stashes the class/interface.
+     *    @param string $interface    Class or interface
+     *                                to inspect.
+     */
+    function __construct($interface) {
+        $this->interface = $interface;
+    }
+
+    /**
+     *    Checks that a class has been declared. Versions
+     *    before PHP5.0.2 need a check that it's not really
+     *    an interface.
+     *    @return boolean            True if defined.
+     *    @access public
+     */
+    function classExists() {
+        if (! class_exists($this->interface)) {
+            return false;
+        }
+        $reflection = new ReflectionClass($this->interface);
+        return ! $reflection->isInterface();
+    }
+
+    /**
+     *    Needed to kill the autoload feature in PHP5
+     *    for classes created dynamically.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classExistsSansAutoload() {
+        return class_exists($this->interface, false);
+    }
+
+    /**
+     *    Checks that a class or interface has been
+     *    declared.
+     *    @return boolean            True if defined.
+     *    @access public
+     */
+    function classOrInterfaceExists() {
+        return $this->classOrInterfaceExistsWithAutoload($this->interface, true);
+    }
+
+    /**
+     *    Needed to kill the autoload feature in PHP5
+     *    for classes created dynamically.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classOrInterfaceExistsSansAutoload() {
+        return $this->classOrInterfaceExistsWithAutoload($this->interface, false);
+    }
+
+    /**
+     *    Needed to select the autoload feature in PHP5
+     *    for classes created dynamically.
+     *    @param string $interface       Class or interface name.
+     *    @param boolean $autoload       True totriggerautoload.
+     *    @return boolean                True if interface defined.
+     *    @access private
+     */
+    protected function classOrInterfaceExistsWithAutoload($interface, $autoload) {
+        if (function_exists('interface_exists')) {
+            if (interface_exists($this->interface, $autoload)) {
+                return true;
+            }
+        }
+        return class_exists($this->interface, $autoload);
+    }
+
+    /**
+     *    Gets the list of methods on a class or
+     *    interface.
+     *    @returns array              List of method names.
+     *    @access public
+     */
+    function getMethods() {
+        return array_unique(get_class_methods($this->interface));
+    }
+
+    /**
+     *    Gets the list of interfaces from a class. If the
+     *    class name is actually an interface then just that
+     *    interface is returned.
+     *    @returns array          List of interfaces.
+     *    @access public
+     */
+    function getInterfaces() {
+        $reflection = new ReflectionClass($this->interface);
+        if ($reflection->isInterface()) {
+            return array($this->interface);
+        }
+        return $this->onlyParents($reflection->getInterfaces());
+    }
+
+    /**
+     *    Gets the list of methods for the implemented
+     *    interfaces only.
+     *    @returns array      List of enforced method signatures.
+     *    @access public
+     */
+    function getInterfaceMethods() {
+        $methods = array();
+        foreach ($this->getInterfaces() as $interface) {
+            $methods = array_merge($methods, get_class_methods($interface));
+        }
+        return array_unique($methods);
+    }
+
+    /**
+     *    Checks to see if the method signature has to be tightly
+     *    specified.
+     *    @param string $method        Method name.
+     *    @returns boolean             True if enforced.
+     *    @access private
+     */
+    protected function isInterfaceMethod($method) {
+        return in_array($method, $this->getInterfaceMethods());
+    }
+
+    /**
+     *    Finds the parent class name.
+     *    @returns string      Parent class name.
+     *    @access public
+     */
+    function getParent() {
+        $reflection = new ReflectionClass($this->interface);
+        $parent = $reflection->getParentClass();
+        if ($parent) {
+            return $parent->getName();
+        }
+        return false;
+    }
+
+    /**
+     *    Trivially determines if the class is abstract.
+     *    @returns boolean      True if abstract.
+     *    @access public
+     */
+    function isAbstract() {
+        $reflection = new ReflectionClass($this->interface);
+        return $reflection->isAbstract();
+    }
+
+    /**
+     *    Trivially determines if the class is an interface.
+     *    @returns boolean      True if interface.
+     *    @access public
+     */
+    function isInterface() {
+        $reflection = new ReflectionClass($this->interface);
+        return $reflection->isInterface();
+    }
+
+    /**
+     *    Scans for final methods, as they screw up inherited
+     *    mocks by not allowing you to override them.
+     *    @returns boolean   True if the class has a final method.
+     *    @access public
+     */
+    function hasFinal() {
+        $reflection = new ReflectionClass($this->interface);
+        foreach ($reflection->getMethods() as $method) {
+            if ($method->isFinal()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Whittles a list of interfaces down to only the
+     *    necessary top level parents.
+     *    @param array $interfaces     Reflection API interfaces
+     *                                 to reduce.
+     *    @returns array               List of parent interface names.
+     *    @access private
+     */
+    protected function onlyParents($interfaces) {
+        $parents = array();
+        $blacklist = array();
+        foreach ($interfaces as $interface) {
+            foreach($interfaces as $possible_parent) {
+                if ($interface->getName() == $possible_parent->getName()) {
+                    continue;
+                }
+                if ($interface->isSubClassOf($possible_parent)) {
+                    $blacklist[$possible_parent->getName()] = true;
+                }
+            }
+            if (!isset($blacklist[$interface->getName()])) {
+                $parents[] = $interface->getName();
+            }
+        }
+        return $parents;
+    }
+
+    /**
+     * Checks whether a method is abstract or not.
+     * @param   string   $name  Method name.
+     * @return  bool            true if method is abstract, else false
+     * @access  private
+     */
+    protected function isAbstractMethod($name) {
+        $interface = new ReflectionClass($this->interface);
+        if (! $interface->hasMethod($name)) {
+            return false;
+        }
+        return $interface->getMethod($name)->isAbstract();
+    }
+
+    /**
+     * Checks whether a method is the constructor.
+     * @param   string   $name  Method name.
+     * @return  bool            true if method is the constructor
+     * @access  private
+     */
+    protected function isConstructor($name) {
+        return ($name == '__construct') || ($name == $this->interface);
+    }
+
+    /**
+     * Checks whether a method is abstract in all parents or not.
+     * @param   string   $name  Method name.
+     * @return  bool            true if method is abstract in parent, else false
+     * @access  private
+     */
+    protected function isAbstractMethodInParents($name) {
+        $interface = new ReflectionClass($this->interface);
+        $parent = $interface->getParentClass();
+        while($parent) {
+            if (! $parent->hasMethod($name)) {
+                return false;
+            }
+            if ($parent->getMethod($name)->isAbstract()) {
+                return true;
+            }
+            $parent = $parent->getParentClass();
+        }
+        return false;
+    }
+
+    /**
+     * Checks whether a method is static or not.
+     * @param   string  $name   Method name
+     * @return  bool            true if method is static, else false
+     * @access  private
+     */
+    protected function isStaticMethod($name) {
+        $interface = new ReflectionClass($this->interface);
+        if (! $interface->hasMethod($name)) {
+            return false;
+        }
+        return $interface->getMethod($name)->isStatic();
+    }
+
+    /**
+     *    Writes the source code matching the declaration
+     *    of a method.
+     *    @param string $name    Method name.
+     *    @return string         Method signature up to last
+     *                           bracket.
+     *    @access public
+     */
+    function getSignature($name) {
+        if ($name == '__set') {
+            return 'function __set($key, $value)';
+        }
+        if ($name == '__call') {
+            return 'function __call($method, $arguments)';
+        }
+        if (version_compare(phpversion(), '5.1.0', '>=')) {
+            if (in_array($name, array('__get', '__isset', $name == '__unset'))) {
+                return "function {$name}(\$key)";
+            }
+        }
+        if ($name == '__toString') {
+            return "function $name()";
+        }
+
+        // This wonky try-catch is a work around for a faulty method_exists()
+        // in early versions of PHP 5 which would return false for static
+        // methods. The Reflection classes work fine, but hasMethod()
+        // doesn't exist prior to PHP 5.1.0, so we need to use a more crude
+        // detection method.
+        try {
+            $interface = new ReflectionClass($this->interface);
+            $interface->getMethod($name);
+        } catch (ReflectionException $e) {
+            return "function $name()";
+        }
+        return $this->getFullSignature($name);
+    }
+
+    /**
+     *    For a signature specified in an interface, full
+     *    details must be replicated to be a valid implementation.
+     *    @param string $name    Method name.
+     *    @return string         Method signature up to last
+     *                           bracket.
+     *    @access private
+     */
+    protected function getFullSignature($name) {
+        $interface = new ReflectionClass($this->interface);
+        $method = $interface->getMethod($name);
+        $reference = $method->returnsReference() ? '&' : '';
+        $static = $method->isStatic() ? 'static ' : '';
+        return "{$static}function $reference$name(" .
+                implode(', ', $this->getParameterSignatures($method)) .
+                ")";
+    }
+
+    /**
+     *    Gets the source code for each parameter.
+     *    @param ReflectionMethod $method   Method object from
+     *                                      reflection API
+     *    @return array                     List of strings, each
+     *                                      a snippet of code.
+     *    @access private
+     */
+    protected function getParameterSignatures($method) {
+        $signatures = array();
+        foreach ($method->getParameters() as $parameter) {
+            $signature = '';
+            $type = $parameter->getClass();
+            if (is_null($type) && version_compare(phpversion(), '5.1.0', '>=') && $parameter->isArray()) {
+                $signature .= 'array ';
+            } elseif (!is_null($type)) {
+                $signature .= $type->getName() . ' ';
+            }
+            if ($parameter->isPassedByReference()) {
+                $signature .= '&';
+            }
+            $signature .= '$' . $this->suppressSpurious($parameter->getName());
+            if ($this->isOptional($parameter)) {
+                $signature .= ' = null';
+            }
+            $signatures[] = $signature;
+        }
+        return $signatures;
+    }
+
+    /**
+     *    The SPL library has problems with the
+     *    Reflection library. In particular, you can
+     *    get extra characters in parameter names :(.
+     *    @param string $name    Parameter name.
+     *    @return string         Cleaner name.
+     *    @access private
+     */
+    protected function suppressSpurious($name) {
+        return str_replace(array('[', ']', ' '), '', $name);
+    }
+
+    /**
+     *    Test of a reflection parameter being optional
+     *    that works with early versions of PHP5.
+     *    @param reflectionParameter $parameter    Is this optional.
+     *    @return boolean                          True if optional.
+     *    @access private
+     */
+    protected function isOptional($parameter) {
+        if (method_exists($parameter, 'isOptional')) {
+            return $parameter->isOptional();
+        }
+        return false;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/remote.php b/3rdparty/simpletest/remote.php
new file mode 100644
index 00000000000..4bb37b7c51b
--- /dev/null
+++ b/3rdparty/simpletest/remote.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: remote.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/browser.php');
+require_once(dirname(__FILE__) . '/xml.php');
+require_once(dirname(__FILE__) . '/test_case.php');
+/**#@-*/
+
+/**
+ *    Runs an XML formated test on a remote server.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class RemoteTestCase {
+    private $url;
+    private $dry_url;
+    private $size;
+
+    /**
+     *    Sets the location of the remote test.
+     *    @param string $url       Test location.
+     *    @param string $dry_url   Location for dry run.
+     *    @access public
+     */
+    function __construct($url, $dry_url = false) {
+        $this->url = $url;
+        $this->dry_url = $dry_url ? $dry_url : $url;
+        $this->size = false;
+    }
+
+    /**
+     *    Accessor for the test name for subclasses.
+     *    @return string           Name of the test.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->url;
+    }
+
+    /**
+     *    Runs the top level test for this class. Currently
+     *    reads the data as a single chunk. I'll fix this
+     *    once I have added iteration to the browser.
+     *    @param SimpleReporter $reporter    Target of test results.
+     *    @returns boolean                   True if no failures.
+     *    @access public
+     */
+    function run($reporter) {
+        $browser = $this->createBrowser();
+        $xml = $browser->get($this->url);
+        if (! $xml) {
+            trigger_error('Cannot read remote test URL [' . $this->url . ']');
+            return false;
+        }
+        $parser = $this->createParser($reporter);
+        if (! $parser->parse($xml)) {
+            trigger_error('Cannot parse incoming XML from [' . $this->url . ']');
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Creates a new web browser object for fetching
+     *    the XML report.
+     *    @return SimpleBrowser           New browser.
+     *    @access protected
+     */
+    protected function createBrowser() {
+        return new SimpleBrowser();
+    }
+
+    /**
+     *    Creates the XML parser.
+     *    @param SimpleReporter $reporter    Target of test results.
+     *    @return SimpleTestXmlListener      XML reader.
+     *    @access protected
+     */
+    protected function createParser($reporter) {
+        return new SimpleTestXmlParser($reporter);
+    }
+
+    /**
+     *    Accessor for the number of subtests.
+     *    @return integer           Number of test cases.
+     *    @access public
+     */
+    function getSize() {
+        if ($this->size === false) {
+            $browser = $this->createBrowser();
+            $xml = $browser->get($this->dry_url);
+            if (! $xml) {
+                trigger_error('Cannot read remote test URL [' . $this->dry_url . ']');
+                return false;
+            }
+            $reporter = new SimpleReporter();
+            $parser = $this->createParser($reporter);
+            if (! $parser->parse($xml)) {
+                trigger_error('Cannot parse incoming XML from [' . $this->dry_url . ']');
+                return false;
+            }
+            $this->size = $reporter->getTestCaseCount();
+        }
+        return $this->size;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/reporter.php b/3rdparty/simpletest/reporter.php
new file mode 100755
index 00000000000..bd4f3fa41dd
--- /dev/null
+++ b/3rdparty/simpletest/reporter.php
@@ -0,0 +1,445 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: reporter.php 2005 2010-11-02 14:09:34Z lastcraft $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/scorer.php');
+//require_once(dirname(__FILE__) . '/arguments.php');
+/**#@-*/
+
+/**
+ *    Sample minimal test displayer. Generates only
+ *    failure messages and a pass count.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class HtmlReporter extends SimpleReporter {
+    private $character_set;
+
+    /**
+     *    Does nothing yet. The first output will
+     *    be sent on the first test start. For use
+     *    by a web browser.
+     *    @access public
+     */
+    function __construct($character_set = 'ISO-8859-1') {
+        parent::__construct();
+        $this->character_set = $character_set;
+    }
+
+    /**
+     *    Paints the top of the web page setting the
+     *    title to the name of the starting test.
+     *    @param string $test_name      Name class of test.
+     *    @access public
+     */
+    function paintHeader($test_name) {
+        $this->sendNoCacheHeaders();
+        print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">";
+        print "<html>\n<head>\n<title>$test_name</title>\n";
+        print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=" .
+                $this->character_set . "\">\n";
+        print "<style type=\"text/css\">\n";
+        print $this->getCss() . "\n";
+        print "</style>\n";
+        print "</head>\n<body>\n";
+        print "<h1>$test_name</h1>\n";
+        flush();
+    }
+
+    /**
+     *    Send the headers necessary to ensure the page is
+     *    reloaded on every request. Otherwise you could be
+     *    scratching your head over out of date test data.
+     *    @access public
+     */
+    static function sendNoCacheHeaders() {
+        if (! headers_sent()) {
+            header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+            header("Cache-Control: no-store, no-cache, must-revalidate");
+            header("Cache-Control: post-check=0, pre-check=0", false);
+            header("Pragma: no-cache");
+        }
+    }
+
+    /**
+     *    Paints the CSS. Add additional styles here.
+     *    @return string            CSS code as text.
+     *    @access protected
+     */
+    protected function getCss() {
+        return ".fail { background-color: inherit; color: red; }" .
+                ".pass { background-color: inherit; color: green; }" .
+                " pre { background-color: lightgray; color: inherit; }";
+    }
+
+    /**
+     *    Paints the end of the test with a summary of
+     *    the passes and failures.
+     *    @param string $test_name        Name class of test.
+     *    @access public
+     */
+    function paintFooter($test_name) {
+        $colour = ($this->getFailCount() + $this->getExceptionCount() > 0 ? "red" : "green");
+        print "<div style=\"";
+        print "padding: 8px; margin-top: 1em; background-color: $colour; color: white;";
+        print "\">";
+        print $this->getTestCaseProgress() . "/" . $this->getTestCaseCount();
+        print " test cases complete:\n";
+        print "<strong>" . $this->getPassCount() . "</strong> passes, ";
+        print "<strong>" . $this->getFailCount() . "</strong> fails and ";
+        print "<strong>" . $this->getExceptionCount() . "</strong> exceptions.";
+        print "</div>\n";
+        print "</body>\n</html>\n";
+    }
+
+    /**
+     *    Paints the test failure with a breadcrumbs
+     *    trail of the nesting test suites below the
+     *    top level test.
+     *    @param string $message    Failure message displayed in
+     *                              the context of the other tests.
+     */
+    function paintFail($message) {
+        parent::paintFail($message);
+        print "<span class=\"fail\">Fail</span>: ";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print implode(" -&gt; ", $breadcrumb);
+        print " -&gt; " . $this->htmlEntities($message) . "<br />\n";
+    }
+
+    /**
+     *    Paints a PHP error.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintError($message) {
+        parent::paintError($message);
+        print "<span class=\"fail\">Exception</span>: ";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print implode(" -&gt; ", $breadcrumb);
+        print " -&gt; <strong>" . $this->htmlEntities($message) . "</strong><br />\n";
+    }
+
+    /**
+     *    Paints a PHP exception.
+     *    @param Exception $exception        Exception to display.
+     *    @access public
+     */
+    function paintException($exception) {
+        parent::paintException($exception);
+        print "<span class=\"fail\">Exception</span>: ";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print implode(" -&gt; ", $breadcrumb);
+        $message = 'Unexpected exception of type [' . get_class($exception) .
+                '] with message ['. $exception->getMessage() .
+                '] in ['. $exception->getFile() .
+                ' line ' . $exception->getLine() . ']';
+        print " -&gt; <strong>" . $this->htmlEntities($message) . "</strong><br />\n";
+    }
+
+    /**
+     *    Prints the message for skipping tests.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) {
+        parent::paintSkip($message);
+        print "<span class=\"pass\">Skipped</span>: ";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print implode(" -&gt; ", $breadcrumb);
+        print " -&gt; " . $this->htmlEntities($message) . "<br />\n";
+    }
+
+    /**
+     *    Paints formatted text such as dumped privateiables.
+     *    @param string $message        Text to show.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+        print '<pre>' . $this->htmlEntities($message) . '</pre>';
+    }
+
+    /**
+     *    Character set adjusted entity conversion.
+     *    @param string $message    Plain text or Unicode message.
+     *    @return string            Browser readable message.
+     *    @access protected
+     */
+    protected function htmlEntities($message) {
+        return htmlentities($message, ENT_COMPAT, $this->character_set);
+    }
+}
+
+/**
+ *    Sample minimal test displayer. Generates only
+ *    failure messages and a pass count. For command
+ *    line use. I've tried to make it look like JUnit,
+ *    but I wanted to output the errors as they arrived
+ *    which meant dropping the dots.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class TextReporter extends SimpleReporter {
+
+    /**
+     *    Does nothing yet. The first output will
+     *    be sent on the first test start.
+     */
+    function __construct() {
+        parent::__construct();
+    }
+
+    /**
+     *    Paints the title only.
+     *    @param string $test_name        Name class of test.
+     *    @access public
+     */
+    function paintHeader($test_name) {
+        if (! SimpleReporter::inCli()) {
+            header('Content-type: text/plain');
+        }
+        print "$test_name\n";
+        flush();
+    }
+
+    /**
+     *    Paints the end of the test with a summary of
+     *    the passes and failures.
+     *    @param string $test_name        Name class of test.
+     *    @access public
+     */
+    function paintFooter($test_name) {
+        if ($this->getFailCount() + $this->getExceptionCount() == 0) {
+            print "OK\n";
+        } else {
+            print "FAILURES!!!\n";
+        }
+        print "Test cases run: " . $this->getTestCaseProgress() .
+                "/" . $this->getTestCaseCount() .
+                ", Passes: " . $this->getPassCount() .
+                ", Failures: " . $this->getFailCount() .
+                ", Exceptions: " . $this->getExceptionCount() . "\n";
+    }
+
+    /**
+     *    Paints the test failure as a stack trace.
+     *    @param string $message    Failure message displayed in
+     *                              the context of the other tests.
+     *    @access public
+     */
+    function paintFail($message) {
+        parent::paintFail($message);
+        print $this->getFailCount() . ") $message\n";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+        print "\n";
+    }
+
+    /**
+     *    Paints a PHP error or exception.
+     *    @param string $message        Message to be shown.
+     *    @access public
+     *    @abstract
+     */
+    function paintError($message) {
+        parent::paintError($message);
+        print "Exception " . $this->getExceptionCount() . "!\n$message\n";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+        print "\n";
+    }
+
+    /**
+     *    Paints a PHP error or exception.
+     *    @param Exception $exception      Exception to describe.
+     *    @access public
+     *    @abstract
+     */
+    function paintException($exception) {
+        parent::paintException($exception);
+        $message = 'Unexpected exception of type [' . get_class($exception) .
+                '] with message ['. $exception->getMessage() .
+                '] in ['. $exception->getFile() .
+                ' line ' . $exception->getLine() . ']';
+        print "Exception " . $this->getExceptionCount() . "!\n$message\n";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+        print "\n";
+    }
+
+    /**
+     *    Prints the message for skipping tests.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) {
+        parent::paintSkip($message);
+        print "Skip: $message\n";
+    }
+
+    /**
+     *    Paints formatted text such as dumped privateiables.
+     *    @param string $message        Text to show.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+        print "$message\n";
+        flush();
+    }
+}
+
+/**
+ *    Runs just a single test group, a single case or
+ *    even a single test within that case.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SelectiveReporter extends SimpleReporterDecorator {
+    private $just_this_case = false;
+    private $just_this_test = false;
+    private $on;
+
+    /**
+     *    Selects the test case or group to be run,
+     *    and optionally a specific test.
+     *    @param SimpleScorer $reporter    Reporter to receive events.
+     *    @param string $just_this_case    Only this case or group will run.
+     *    @param string $just_this_test    Only this test method will run.
+     */
+    function __construct($reporter, $just_this_case = false, $just_this_test = false) {
+        if (isset($just_this_case) && $just_this_case) {
+            $this->just_this_case = strtolower($just_this_case);
+            $this->off();
+        } else {
+            $this->on();
+        }
+        if (isset($just_this_test) && $just_this_test) {
+            $this->just_this_test = strtolower($just_this_test);
+        }
+        parent::__construct($reporter);
+    }
+
+    /**
+     *    Compares criteria to actual the case/group name.
+     *    @param string $test_case    The incoming test.
+     *    @return boolean             True if matched.
+     *    @access protected
+     */
+    protected function matchesTestCase($test_case) {
+        return $this->just_this_case == strtolower($test_case);
+    }
+
+    /**
+     *    Compares criteria to actual the test name. If no
+     *    name was specified at the beginning, then all tests
+     *    can run.
+     *    @param string $method       The incoming test method.
+     *    @return boolean             True if matched.
+     *    @access protected
+     */
+    protected function shouldRunTest($test_case, $method) {
+        if ($this->isOn() || $this->matchesTestCase($test_case)) {
+            if ($this->just_this_test) {
+                return $this->just_this_test == strtolower($method);
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Switch on testing for the group or subgroup.
+     *    @access private
+     */
+    protected function on() {
+        $this->on = true;
+    }
+
+    /**
+     *    Switch off testing for the group or subgroup.
+     *    @access private
+     */
+    protected function off() {
+        $this->on = false;
+    }
+
+    /**
+     *    Is this group actually being tested?
+     *    @return boolean     True if the current test group is active.
+     *    @access private
+     */
+    protected function isOn() {
+        return $this->on;
+    }
+
+    /**
+     *    Veto everything that doesn't match the method wanted.
+     *    @param string $test_case       Name of test case.
+     *    @param string $method          Name of test method.
+     *    @return boolean                True if test should be run.
+     *    @access public
+     */
+    function shouldInvoke($test_case, $method) {
+        if ($this->shouldRunTest($test_case, $method)) {
+            return $this->reporter->shouldInvoke($test_case, $method);
+        }
+        return false;
+    }
+
+    /**
+     *    Paints the start of a group test.
+     *    @param string $test_case     Name of test or other label.
+     *    @param integer $size         Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_case, $size) {
+        if ($this->just_this_case && $this->matchesTestCase($test_case)) {
+            $this->on();
+        }
+        $this->reporter->paintGroupStart($test_case, $size);
+    }
+
+    /**
+     *    Paints the end of a group test.
+     *    @param string $test_case     Name of test or other label.
+     *    @access public
+     */
+    function paintGroupEnd($test_case) {
+        $this->reporter->paintGroupEnd($test_case);
+        if ($this->just_this_case && $this->matchesTestCase($test_case)) {
+            $this->off();
+        }
+    }
+}
+
+/**
+ *    Suppresses skip messages.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NoSkipsReporter extends SimpleReporterDecorator {
+
+    /**
+     *    Does nothing.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) { }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/scorer.php b/3rdparty/simpletest/scorer.php
new file mode 100644
index 00000000000..27776f4b631
--- /dev/null
+++ b/3rdparty/simpletest/scorer.php
@@ -0,0 +1,875 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: scorer.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+*/
+require_once(dirname(__FILE__) . '/invoker.php');
+/**#@-*/
+
+/**
+ *    Can receive test events and display them. Display
+ *    is achieved by making display methods available
+ *    and visiting the incoming event.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ *    @abstract
+ */
+class SimpleScorer {
+    private $passes;
+    private $fails;
+    private $exceptions;
+    private $is_dry_run;
+
+    /**
+     *    Starts the test run with no results.
+     *    @access public
+     */
+    function __construct() {
+        $this->passes = 0;
+        $this->fails = 0;
+        $this->exceptions = 0;
+        $this->is_dry_run = false;
+    }
+
+    /**
+     *    Signals that the next evaluation will be a dry
+     *    run. That is, the structure events will be
+     *    recorded, but no tests will be run.
+     *    @param boolean $is_dry        Dry run if true.
+     *    @access public
+     */
+    function makeDry($is_dry = true) {
+        $this->is_dry_run = $is_dry;
+    }
+
+    /**
+     *    The reporter has a veto on what should be run.
+     *    @param string $test_case_name  name of test case.
+     *    @param string $method          Name of test method.
+     *    @access public
+     */
+    function shouldInvoke($test_case_name, $method) {
+        return ! $this->is_dry_run;
+    }
+
+    /**
+     *    Can wrap the invoker in preperation for running
+     *    a test.
+     *    @param SimpleInvoker $invoker   Individual test runner.
+     *    @return SimpleInvoker           Wrapped test runner.
+     *    @access public
+     */
+    function createInvoker($invoker) {
+        return $invoker;
+    }
+
+    /**
+     *    Accessor for current status. Will be false
+     *    if there have been any failures or exceptions.
+     *    Used for command line tools.
+     *    @return boolean        True if no failures.
+     *    @access public
+     */
+    function getStatus() {
+        if ($this->exceptions + $this->fails > 0) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Paints the start of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @param integer $size         Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_name, $size) {
+    }
+
+    /**
+     *    Paints the end of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintGroupEnd($test_name) {
+    }
+
+    /**
+     *    Paints the start of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseStart($test_name) {
+    }
+
+    /**
+     *    Paints the end of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseEnd($test_name) {
+    }
+
+    /**
+     *    Paints the start of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodStart($test_name) {
+    }
+
+    /**
+     *    Paints the end of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodEnd($test_name) {
+    }
+
+    /**
+     *    Increments the pass count.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintPass($message) {
+        $this->passes++;
+    }
+
+    /**
+     *    Increments the fail count.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintFail($message) {
+        $this->fails++;
+    }
+
+    /**
+     *    Deals with PHP 4 throwing an error.
+     *    @param string $message    Text of error formatted by
+     *                              the test case.
+     *    @access public
+     */
+    function paintError($message) {
+        $this->exceptions++;
+    }
+
+    /**
+     *    Deals with PHP 5 throwing an exception.
+     *    @param Exception $exception    The actual exception thrown.
+     *    @access public
+     */
+    function paintException($exception) {
+        $this->exceptions++;
+    }
+
+    /**
+     *    Prints the message for skipping tests.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) {
+    }
+
+    /**
+     *    Accessor for the number of passes so far.
+     *    @return integer       Number of passes.
+     *    @access public
+     */
+    function getPassCount() {
+        return $this->passes;
+    }
+
+    /**
+     *    Accessor for the number of fails so far.
+     *    @return integer       Number of fails.
+     *    @access public
+     */
+    function getFailCount() {
+        return $this->fails;
+    }
+
+    /**
+     *    Accessor for the number of untrapped errors
+     *    so far.
+     *    @return integer       Number of exceptions.
+     *    @access public
+     */
+    function getExceptionCount() {
+        return $this->exceptions;
+    }
+
+    /**
+     *    Paints a simple supplementary message.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintMessage($message) {
+    }
+
+    /**
+     *    Paints a formatted ASCII message such as a
+     *    privateiable dump.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+    }
+
+    /**
+     *    By default just ignores user generated events.
+     *    @param string $type        Event type as text.
+     *    @param mixed $payload      Message or object.
+     *    @access public
+     */
+    function paintSignal($type, $payload) {
+    }
+}
+
+/**
+ *    Recipient of generated test messages that can display
+ *    page footers and headers. Also keeps track of the
+ *    test nesting. This is the main base class on which
+ *    to build the finished test (page based) displays.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleReporter extends SimpleScorer {
+    private $test_stack;
+    private $size;
+    private $progress;
+
+    /**
+     *    Starts the display with no results in.
+     *    @access public
+     */
+    function __construct() {
+        parent::__construct();
+        $this->test_stack = array();
+        $this->size = null;
+        $this->progress = 0;
+    }
+
+    /**
+     *    Gets the formatter for small generic data items.
+     *    @return SimpleDumper          Formatter.
+     *    @access public
+     */
+    function getDumper() {
+        return new SimpleDumper();
+    }
+
+    /**
+     *    Paints the start of a group test. Will also paint
+     *    the page header and footer if this is the
+     *    first test. Will stash the size if the first
+     *    start.
+     *    @param string $test_name   Name of test that is starting.
+     *    @param integer $size       Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_name, $size) {
+        if (! isset($this->size)) {
+            $this->size = $size;
+        }
+        if (count($this->test_stack) == 0) {
+            $this->paintHeader($test_name);
+        }
+        $this->test_stack[] = $test_name;
+    }
+
+    /**
+     *    Paints the end of a group test. Will paint the page
+     *    footer if the stack of tests has unwound.
+     *    @param string $test_name   Name of test that is ending.
+     *    @param integer $progress   Number of test cases ending.
+     *    @access public
+     */
+    function paintGroupEnd($test_name) {
+        array_pop($this->test_stack);
+        if (count($this->test_stack) == 0) {
+            $this->paintFooter($test_name);
+        }
+    }
+
+    /**
+     *    Paints the start of a test case. Will also paint
+     *    the page header and footer if this is the
+     *    first test. Will stash the size if the first
+     *    start.
+     *    @param string $test_name   Name of test that is starting.
+     *    @access public
+     */
+    function paintCaseStart($test_name) {
+        if (! isset($this->size)) {
+            $this->size = 1;
+        }
+        if (count($this->test_stack) == 0) {
+            $this->paintHeader($test_name);
+        }
+        $this->test_stack[] = $test_name;
+    }
+
+    /**
+     *    Paints the end of a test case. Will paint the page
+     *    footer if the stack of tests has unwound.
+     *    @param string $test_name   Name of test that is ending.
+     *    @access public
+     */
+    function paintCaseEnd($test_name) {
+        $this->progress++;
+        array_pop($this->test_stack);
+        if (count($this->test_stack) == 0) {
+            $this->paintFooter($test_name);
+        }
+    }
+
+    /**
+     *    Paints the start of a test method.
+     *    @param string $test_name   Name of test that is starting.
+     *    @access public
+     */
+    function paintMethodStart($test_name) {
+        $this->test_stack[] = $test_name;
+    }
+
+    /**
+     *    Paints the end of a test method. Will paint the page
+     *    footer if the stack of tests has unwound.
+     *    @param string $test_name   Name of test that is ending.
+     *    @access public
+     */
+    function paintMethodEnd($test_name) {
+        array_pop($this->test_stack);
+    }
+
+    /**
+     *    Paints the test document header.
+     *    @param string $test_name     First test top level
+     *                                 to start.
+     *    @access public
+     *    @abstract
+     */
+    function paintHeader($test_name) {
+    }
+
+    /**
+     *    Paints the test document footer.
+     *    @param string $test_name        The top level test.
+     *    @access public
+     *    @abstract
+     */
+    function paintFooter($test_name) {
+    }
+
+    /**
+     *    Accessor for internal test stack. For
+     *    subclasses that need to see the whole test
+     *    history for display purposes.
+     *    @return array     List of methods in nesting order.
+     *    @access public
+     */
+    function getTestList() {
+        return $this->test_stack;
+    }
+
+    /**
+     *    Accessor for total test size in number
+     *    of test cases. Null until the first
+     *    test is started.
+     *    @return integer   Total number of cases at start.
+     *    @access public
+     */
+    function getTestCaseCount() {
+        return $this->size;
+    }
+
+    /**
+     *    Accessor for the number of test cases
+     *    completed so far.
+     *    @return integer   Number of ended cases.
+     *    @access public
+     */
+    function getTestCaseProgress() {
+        return $this->progress;
+    }
+
+    /**
+     *    Static check for running in the comand line.
+     *    @return boolean        True if CLI.
+     *    @access public
+     */
+    static function inCli() {
+        return php_sapi_name() == 'cli';
+    }
+}
+
+/**
+ *    For modifying the behaviour of the visual reporters.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleReporterDecorator {
+    protected $reporter;
+
+    /**
+     *    Mediates between the reporter and the test case.
+     *    @param SimpleScorer $reporter       Reporter to receive events.
+     */
+    function __construct($reporter) {
+        $this->reporter = $reporter;
+    }
+
+    /**
+     *    Signals that the next evaluation will be a dry
+     *    run. That is, the structure events will be
+     *    recorded, but no tests will be run.
+     *    @param boolean $is_dry        Dry run if true.
+     *    @access public
+     */
+    function makeDry($is_dry = true) {
+        $this->reporter->makeDry($is_dry);
+    }
+
+    /**
+     *    Accessor for current status. Will be false
+     *    if there have been any failures or exceptions.
+     *    Used for command line tools.
+     *    @return boolean        True if no failures.
+     *    @access public
+     */
+    function getStatus() {
+        return $this->reporter->getStatus();
+    }
+
+    /**
+     *    The nesting of the test cases so far. Not
+     *    all reporters have this facility.
+     *    @return array        Test list if accessible.
+     *    @access public
+     */
+    function getTestList() {
+        if (method_exists($this->reporter, 'getTestList')) {
+            return $this->reporter->getTestList();
+        } else {
+            return array();
+        }
+    }
+
+    /**
+     *    The reporter has a veto on what should be run.
+     *    @param string $test_case_name  Name of test case.
+     *    @param string $method          Name of test method.
+     *    @return boolean                True if test should be run.
+     *    @access public
+     */
+    function shouldInvoke($test_case_name, $method) {
+        return $this->reporter->shouldInvoke($test_case_name, $method);
+    }
+
+    /**
+     *    Can wrap the invoker in preparation for running
+     *    a test.
+     *    @param SimpleInvoker $invoker   Individual test runner.
+     *    @return SimpleInvoker           Wrapped test runner.
+     *    @access public
+     */
+    function createInvoker($invoker) {
+        return $this->reporter->createInvoker($invoker);
+    }
+
+    /**
+     *    Gets the formatter for privateiables and other small
+     *    generic data items.
+     *    @return SimpleDumper          Formatter.
+     *    @access public
+     */
+    function getDumper() {
+        return $this->reporter->getDumper();
+    }
+
+    /**
+     *    Paints the start of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @param integer $size         Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_name, $size) {
+        $this->reporter->paintGroupStart($test_name, $size);
+    }
+
+    /**
+     *    Paints the end of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintGroupEnd($test_name) {
+        $this->reporter->paintGroupEnd($test_name);
+    }
+
+    /**
+     *    Paints the start of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseStart($test_name) {
+        $this->reporter->paintCaseStart($test_name);
+    }
+
+    /**
+     *    Paints the end of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseEnd($test_name) {
+        $this->reporter->paintCaseEnd($test_name);
+    }
+
+    /**
+     *    Paints the start of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodStart($test_name) {
+        $this->reporter->paintMethodStart($test_name);
+    }
+
+    /**
+     *    Paints the end of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodEnd($test_name) {
+        $this->reporter->paintMethodEnd($test_name);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintPass($message) {
+        $this->reporter->paintPass($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintFail($message) {
+        $this->reporter->paintFail($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message    Text of error formatted by
+     *                              the test case.
+     *    @access public
+     */
+    function paintError($message) {
+        $this->reporter->paintError($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param Exception $exception        Exception to show.
+     *    @access public
+     */
+    function paintException($exception) {
+        $this->reporter->paintException($exception);
+    }
+
+    /**
+     *    Prints the message for skipping tests.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) {
+        $this->reporter->paintSkip($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintMessage($message) {
+        $this->reporter->paintMessage($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+        $this->reporter->paintFormattedMessage($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $type        Event type as text.
+     *    @param mixed $payload      Message or object.
+     *    @return boolean            Should return false if this
+     *                               type of signal should fail the
+     *                               test suite.
+     *    @access public
+     */
+    function paintSignal($type, $payload) {
+        $this->reporter->paintSignal($type, $payload);
+    }
+}
+
+/**
+ *    For sending messages to multiple reporters at
+ *    the same time.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class MultipleReporter {
+    private $reporters = array();
+
+    /**
+     *    Adds a reporter to the subscriber list.
+     *    @param SimpleScorer $reporter     Reporter to receive events.
+     *    @access public
+     */
+    function attachReporter($reporter) {
+        $this->reporters[] = $reporter;
+    }
+
+    /**
+     *    Signals that the next evaluation will be a dry
+     *    run. That is, the structure events will be
+     *    recorded, but no tests will be run.
+     *    @param boolean $is_dry        Dry run if true.
+     *    @access public
+     */
+    function makeDry($is_dry = true) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->makeDry($is_dry);
+        }
+    }
+
+    /**
+     *    Accessor for current status. Will be false
+     *    if there have been any failures or exceptions.
+     *    If any reporter reports a failure, the whole
+     *    suite fails.
+     *    @return boolean        True if no failures.
+     *    @access public
+     */
+    function getStatus() {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            if (! $this->reporters[$i]->getStatus()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    The reporter has a veto on what should be run.
+     *    It requires all reporters to want to run the method.
+     *    @param string $test_case_name  name of test case.
+     *    @param string $method          Name of test method.
+     *    @access public
+     */
+    function shouldInvoke($test_case_name, $method) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            if (! $this->reporters[$i]->shouldInvoke($test_case_name, $method)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Every reporter gets a chance to wrap the invoker.
+     *    @param SimpleInvoker $invoker   Individual test runner.
+     *    @return SimpleInvoker           Wrapped test runner.
+     *    @access public
+     */
+    function createInvoker($invoker) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $invoker = $this->reporters[$i]->createInvoker($invoker);
+        }
+        return $invoker;
+    }
+
+    /**
+     *    Gets the formatter for privateiables and other small
+     *    generic data items.
+     *    @return SimpleDumper          Formatter.
+     *    @access public
+     */
+    function getDumper() {
+        return new SimpleDumper();
+    }
+
+    /**
+     *    Paints the start of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @param integer $size         Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_name, $size) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintGroupStart($test_name, $size);
+        }
+    }
+
+    /**
+     *    Paints the end of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintGroupEnd($test_name) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintGroupEnd($test_name);
+        }
+    }
+
+    /**
+     *    Paints the start of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseStart($test_name) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintCaseStart($test_name);
+        }
+    }
+
+    /**
+     *    Paints the end of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseEnd($test_name) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintCaseEnd($test_name);
+        }
+    }
+
+    /**
+     *    Paints the start of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodStart($test_name) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintMethodStart($test_name);
+        }
+    }
+
+    /**
+     *    Paints the end of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodEnd($test_name) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintMethodEnd($test_name);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintPass($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintPass($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintFail($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintFail($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message    Text of error formatted by
+     *                              the test case.
+     *    @access public
+     */
+    function paintError($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintError($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param Exception $exception    Exception to display.
+     *    @access public
+     */
+    function paintException($exception) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintException($exception);
+        }
+    }
+
+    /**
+     *    Prints the message for skipping tests.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintSkip($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintMessage($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintMessage($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintFormattedMessage($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $type        Event type as text.
+     *    @param mixed $payload      Message or object.
+     *    @return boolean            Should return false if this
+     *                               type of signal should fail the
+     *                               test suite.
+     *    @access public
+     */
+    function paintSignal($type, $payload) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintSignal($type, $payload);
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/selector.php b/3rdparty/simpletest/selector.php
new file mode 100755
index 00000000000..ba2fed312a8
--- /dev/null
+++ b/3rdparty/simpletest/selector.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ *  Base include file for SimpleTest.
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: selector.php 1786 2008-04-26 17:32:20Z pp11 $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/tag.php');
+require_once(dirname(__FILE__) . '/encoding.php');
+/**#@-*/
+
+/**
+ *    Used to extract form elements for testing against.
+ *    Searches by name attribute.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleByName {
+    private $name;
+
+    /**
+     *    Stashes the name for later comparison.
+     *    @param string $name     Name attribute to match.
+     */
+    function __construct($name) {
+        $this->name = $name;
+    }
+
+    /**
+     *  Accessor for name.
+     *  @returns string $name       Name to match.
+     */
+    function getName() {
+        return $this->name;
+    }
+
+    /**
+     *    Compares with name attribute of widget.
+     *    @param SimpleWidget $widget    Control to compare.
+     *    @access public
+     */
+    function isMatch($widget) {
+        return ($widget->getName() == $this->name);
+    }
+}
+
+/**
+ *    Used to extract form elements for testing against.
+ *    Searches by visible label or alt text.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleByLabel {
+    private $label;
+
+    /**
+     *    Stashes the name for later comparison.
+     *    @param string $label     Visible text to match.
+     */
+    function __construct($label) {
+        $this->label = $label;
+    }
+
+    /**
+     *    Comparison. Compares visible text of widget or
+     *    related label.
+     *    @param SimpleWidget $widget    Control to compare.
+     *    @access public
+     */
+    function isMatch($widget) {
+        if (! method_exists($widget, 'isLabel')) {
+            return false;
+        }
+        return $widget->isLabel($this->label);
+    }
+}
+
+/**
+ *    Used to extract form elements for testing against.
+ *    Searches dy id attribute.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleById {
+    private $id;
+
+    /**
+     *    Stashes the name for later comparison.
+     *    @param string $id     ID atribute to match.
+     */
+    function __construct($id) {
+        $this->id = $id;
+    }
+
+    /**
+     *    Comparison. Compares id attribute of widget.
+     *    @param SimpleWidget $widget    Control to compare.
+     *    @access public
+     */
+    function isMatch($widget) {
+        return $widget->isId($this->id);
+    }
+}
+
+/**
+ *    Used to extract form elements for testing against.
+ *    Searches by visible label, name or alt text.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleByLabelOrName {
+    private $label;
+
+    /**
+     *    Stashes the name/label for later comparison.
+     *    @param string $label     Visible text to match.
+     */
+    function __construct($label) {
+        $this->label = $label;
+    }
+
+    /**
+     *    Comparison. Compares visible text of widget or
+     *    related label or name.
+     *    @param SimpleWidget $widget    Control to compare.
+     *    @access public
+     */
+    function isMatch($widget) {
+        if (method_exists($widget, 'isLabel')) {
+            if ($widget->isLabel($this->label)) {
+                return true;
+            }
+        }
+        return ($widget->getName() == $this->label);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/shell_tester.php b/3rdparty/simpletest/shell_tester.php
new file mode 100644
index 00000000000..9a3bd389eeb
--- /dev/null
+++ b/3rdparty/simpletest/shell_tester.php
@@ -0,0 +1,330 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: shell_tester.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/test_case.php');
+/**#@-*/
+
+/**
+ *    Wrapper for exec() functionality.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleShell {
+    private $output;
+
+    /**
+     *    Executes the shell comand and stashes the output.
+     *    @access public
+     */
+    function __construct() {
+        $this->output = false;
+    }
+
+    /**
+     *    Actually runs the command. Does not trap the
+     *    error stream output as this need PHP 4.3+.
+     *    @param string $command    The actual command line
+     *                              to run.
+     *    @return integer           Exit code.
+     *    @access public
+     */
+    function execute($command) {
+        $this->output = false;
+        exec($command, $this->output, $ret);
+        return $ret;
+    }
+
+    /**
+     *    Accessor for the last output.
+     *    @return string        Output as text.
+     *    @access public
+     */
+    function getOutput() {
+        return implode("\n", $this->output);
+    }
+
+    /**
+     *    Accessor for the last output.
+     *    @return array         Output as array of lines.
+     *    @access public
+     */
+    function getOutputAsList() {
+        return $this->output;
+    }
+}
+
+/**
+ *    Test case for testing of command line scripts and
+ *    utilities. Usually scripts that are external to the
+ *    PHP code, but support it in some way.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class ShellTestCase extends SimpleTestCase {
+    private $current_shell;
+    private $last_status;
+    private $last_command;
+
+    /**
+     *    Creates an empty test case. Should be subclassed
+     *    with test methods for a functional test case.
+     *    @param string $label     Name of test case. Will use
+     *                             the class name if none specified.
+     *    @access public
+     */
+    function __construct($label = false) {
+        parent::__construct($label);
+        $this->current_shell = $this->createShell();
+        $this->last_status = false;
+        $this->last_command = '';
+    }
+
+    /**
+     *    Executes a command and buffers the results.
+     *    @param string $command     Command to run.
+     *    @return boolean            True if zero exit code.
+     *    @access public
+     */
+    function execute($command) {
+        $shell = $this->getShell();
+        $this->last_status = $shell->execute($command);
+        $this->last_command = $command;
+        return ($this->last_status === 0);
+    }
+
+    /**
+     *    Dumps the output of the last command.
+     *    @access public
+     */
+    function dumpOutput() {
+        $this->dump($this->getOutput());
+    }
+
+    /**
+     *    Accessor for the last output.
+     *    @return string        Output as text.
+     *    @access public
+     */
+    function getOutput() {
+        $shell = $this->getShell();
+        return $shell->getOutput();
+    }
+
+    /**
+     *    Accessor for the last output.
+     *    @return array         Output as array of lines.
+     *    @access public
+     */
+    function getOutputAsList() {
+        $shell = $this->getShell();
+        return $shell->getOutputAsList();
+    }
+
+    /**
+     *    Called from within the test methods to register
+     *    passes and failures.
+     *    @param boolean $result    Pass on true.
+     *    @param string $message    Message to display describing
+     *                              the test state.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertTrue($result, $message = false) {
+        return $this->assert(new TrueExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will be true on false and vice versa. False
+     *    is the PHP definition of false, so that null,
+     *    empty strings, zero and an empty array all count
+     *    as false.
+     *    @param boolean $result    Pass on false.
+     *    @param string $message    Message to display.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertFalse($result, $message = '%s') {
+        return $this->assert(new FalseExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    the same value only. Otherwise a fail. This
+     *    is for testing hand extracted text, etc.
+     *    @param mixed $first          Value to compare.
+     *    @param mixed $second         Value to compare.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass
+     *    @access public
+     */
+    function assertEqual($first, $second, $message = "%s") {
+        return $this->assert(
+                new EqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    a different value. Otherwise a fail. This
+     *    is for testing hand extracted text, etc.
+     *    @param mixed $first           Value to compare.
+     *    @param mixed $second          Value to compare.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertNotEqual($first, $second, $message = "%s") {
+        return $this->assert(
+                new NotEqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Tests the last status code from the shell.
+     *    @param integer $status   Expected status of last
+     *                             command.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertExitCode($status, $message = "%s") {
+        $message = sprintf($message, "Expected status code of [$status] from [" .
+                $this->last_command . "], but got [" .
+                $this->last_status . "]");
+        return $this->assertTrue($status === $this->last_status, $message);
+    }
+
+    /**
+     *    Attempt to exactly match the combined STDERR and
+     *    STDOUT output.
+     *    @param string $expected  Expected output.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertOutput($expected, $message = "%s") {
+        $shell = $this->getShell();
+        return $this->assert(
+                new EqualExpectation($expected),
+                $shell->getOutput(),
+                $message);
+    }
+
+    /**
+     *    Scans the output for a Perl regex. If found
+     *    anywhere it passes, else it fails.
+     *    @param string $pattern    Regex to search for.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertOutputPattern($pattern, $message = "%s") {
+        $shell = $this->getShell();
+        return $this->assert(
+                new PatternExpectation($pattern),
+                $shell->getOutput(),
+                $message);
+    }
+
+    /**
+     *    If a Perl regex is found anywhere in the current
+     *    output then a failure is generated, else a pass.
+     *    @param string $pattern    Regex to search for.
+     *    @param $message           Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertNoOutputPattern($pattern, $message = "%s") {
+        $shell = $this->getShell();
+        return $this->assert(
+                new NoPatternExpectation($pattern),
+                $shell->getOutput(),
+                $message);
+    }
+
+    /**
+     *    File existence check.
+     *    @param string $path      Full filename and path.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertFileExists($path, $message = "%s") {
+        $message = sprintf($message, "File [$path] should exist");
+        return $this->assertTrue(file_exists($path), $message);
+    }
+
+    /**
+     *    File non-existence check.
+     *    @param string $path      Full filename and path.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertFileNotExists($path, $message = "%s") {
+        $message = sprintf($message, "File [$path] should not exist");
+        return $this->assertFalse(file_exists($path), $message);
+    }
+
+    /**
+     *    Scans a file for a Perl regex. If found
+     *    anywhere it passes, else it fails.
+     *    @param string $pattern    Regex to search for.
+     *    @param string $path       Full filename and path.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertFilePattern($pattern, $path, $message = "%s") {
+        return $this->assert(
+                new PatternExpectation($pattern),
+                implode('', file($path)),
+                $message);
+    }
+
+    /**
+     *    If a Perl regex is found anywhere in the named
+     *    file then a failure is generated, else a pass.
+     *    @param string $pattern    Regex to search for.
+     *    @param string $path       Full filename and path.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertNoFilePattern($pattern, $path, $message = "%s") {
+        return $this->assert(
+                new NoPatternExpectation($pattern),
+                implode('', file($path)),
+                $message);
+    }
+
+    /**
+     *    Accessor for current shell. Used for testing the
+     *    the tester itself.
+     *    @return Shell        Current shell.
+     *    @access protected
+     */
+    protected function getShell() {
+        return $this->current_shell;
+    }
+
+    /**
+     *    Factory for the shell to run the command on.
+     *    @return Shell        New shell object.
+     *    @access protected
+     */
+    protected function createShell() {
+        return new SimpleShell();
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/simpletest.php b/3rdparty/simpletest/simpletest.php
new file mode 100644
index 00000000000..425c869a825
--- /dev/null
+++ b/3rdparty/simpletest/simpletest.php
@@ -0,0 +1,391 @@
+<?php
+/**
+ *  Global state for SimpleTest and kicker script in future versions.
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: simpletest.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/reflection_php5.php');
+require_once(dirname(__FILE__) . '/default_reporter.php');
+require_once(dirname(__FILE__) . '/compatibility.php');
+/**#@-*/
+
+/**
+ *    Registry and test context. Includes a few
+ *    global options that I'm slowly getting rid of.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleTest {
+
+    /**
+     *    Reads the SimpleTest version from the release file.
+     *    @return string        Version string.
+     */
+    static function getVersion() {
+        $content = file(dirname(__FILE__) . '/VERSION');
+        return trim($content[0]);
+    }
+
+    /**
+     *    Sets the name of a test case to ignore, usually
+     *    because the class is an abstract case that should
+     *    @param string $class        Add a class to ignore.
+     */
+    static function ignore($class) {
+        $registry = &SimpleTest::getRegistry();
+        $registry['IgnoreList'][strtolower($class)] = true;
+    }
+
+    /**
+     *    Scans the now complete ignore list, and adds
+     *    all parent classes to the list. If a class
+     *    is not a runnable test case, then it's parents
+     *    wouldn't be either. This is syntactic sugar
+     *    to cut down on ommissions of ignore()'s or
+     *    missing abstract declarations. This cannot
+     *    be done whilst loading classes wiithout forcing
+     *    a particular order on the class declarations and
+     *    the ignore() calls. It's just nice to have the ignore()
+     *    calls at the top of the file before the actual declarations.
+     *    @param array $classes     Class names of interest.
+     */
+    static function ignoreParentsIfIgnored($classes) {
+        $registry = &SimpleTest::getRegistry();
+        foreach ($classes as $class) {
+            if (SimpleTest::isIgnored($class)) {
+                $reflection = new SimpleReflection($class);
+                if ($parent = $reflection->getParent()) {
+                    SimpleTest::ignore($parent);
+                }
+            }
+        }
+    }
+
+    /**
+     *   Puts the object to the global pool of 'preferred' objects
+     *   which can be retrieved with SimpleTest :: preferred() method.
+     *   Instances of the same class are overwritten.
+     *   @param object $object      Preferred object
+     *   @see preferred()
+     */
+    static function prefer($object) {
+        $registry = &SimpleTest::getRegistry();
+        $registry['Preferred'][] = $object;
+    }
+
+    /**
+     *   Retrieves 'preferred' objects from global pool. Class filter
+     *   can be applied in order to retrieve the object of the specific
+     *   class
+     *   @param array|string $classes       Allowed classes or interfaces.
+     *   @return array|object|null
+     *   @see prefer()
+     */
+    static function preferred($classes) {
+        if (! is_array($classes)) {
+            $classes = array($classes);
+        }
+        $registry = &SimpleTest::getRegistry();
+        for ($i = count($registry['Preferred']) - 1; $i >= 0; $i--) {
+            foreach ($classes as $class) {
+                if (SimpleTestCompatibility::isA($registry['Preferred'][$i], $class)) {
+                    return $registry['Preferred'][$i];
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Test to see if a test case is in the ignore
+     *    list. Quite obviously the ignore list should
+     *    be a separate object and will be one day.
+     *    This method is internal to SimpleTest. Don't
+     *    use it.
+     *    @param string $class        Class name to test.
+     *    @return boolean             True if should not be run.
+     */
+    static function isIgnored($class) {
+        $registry = &SimpleTest::getRegistry();
+        return isset($registry['IgnoreList'][strtolower($class)]);
+    }
+
+    /**
+     *    Sets proxy to use on all requests for when
+     *    testing from behind a firewall. Set host
+     *    to false to disable. This will take effect
+     *    if there are no other proxy settings.
+     *    @param string $proxy     Proxy host as URL.
+     *    @param string $username  Proxy username for authentication.
+     *    @param string $password  Proxy password for authentication.
+     */
+    static function useProxy($proxy, $username = false, $password = false) {
+        $registry = &SimpleTest::getRegistry();
+        $registry['DefaultProxy'] = $proxy;
+        $registry['DefaultProxyUsername'] = $username;
+        $registry['DefaultProxyPassword'] = $password;
+    }
+
+    /**
+     *    Accessor for default proxy host.
+     *    @return string       Proxy URL.
+     */
+    static function getDefaultProxy() {
+        $registry = &SimpleTest::getRegistry();
+        return $registry['DefaultProxy'];
+    }
+
+    /**
+     *    Accessor for default proxy username.
+     *    @return string    Proxy username for authentication.
+     */
+    static function getDefaultProxyUsername() {
+        $registry = &SimpleTest::getRegistry();
+        return $registry['DefaultProxyUsername'];
+    }
+
+    /**
+     *    Accessor for default proxy password.
+     *    @return string    Proxy password for authentication.
+     */
+    static function getDefaultProxyPassword() {
+        $registry = &SimpleTest::getRegistry();
+        return $registry['DefaultProxyPassword'];
+    }
+
+    /**
+     *    Accessor for default HTML parsers.
+     *    @return array     List of parsers to try in
+     *                      order until one responds true
+     *                      to can().
+     */
+    static function getParsers() {
+        $registry = &SimpleTest::getRegistry();
+        return $registry['Parsers'];
+    }
+
+    /**
+     *    Set the list of HTML parsers to attempt to use by default.
+     *    @param array $parsers    List of parsers to try in
+     *                             order until one responds true
+     *                             to can().
+     */
+    static function setParsers($parsers) {
+        $registry = &SimpleTest::getRegistry();
+        $registry['Parsers'] = $parsers;
+    }
+
+    /**
+     *    Accessor for global registry of options.
+     *    @return hash           All stored values.
+     */
+    protected static function &getRegistry() {
+        static $registry = false;
+        if (! $registry) {
+            $registry = SimpleTest::getDefaults();
+        }
+        return $registry;
+    }
+
+    /**
+     *    Accessor for the context of the current
+     *    test run.
+     *    @return SimpleTestContext    Current test run.
+     */
+    static function getContext() {
+        static $context = false;
+        if (! $context) {
+            $context = new SimpleTestContext();
+        }
+        return $context;
+    }
+
+    /**
+     *    Constant default values.
+     *    @return hash       All registry defaults.
+     */
+    protected static function getDefaults() {
+        return array(
+                'Parsers' => false,
+                'MockBaseClass' => 'SimpleMock',
+                'IgnoreList' => array(),
+                'DefaultProxy' => false,
+                'DefaultProxyUsername' => false,
+                'DefaultProxyPassword' => false,
+                'Preferred' => array(new HtmlReporter(), new TextReporter(), new XmlReporter()));
+    }
+
+    /**
+     *    @deprecated
+     */
+    static function setMockBaseClass($mock_base) {
+        $registry = &SimpleTest::getRegistry();
+        $registry['MockBaseClass'] = $mock_base;
+    }
+
+    /**
+     *    @deprecated
+     */
+    static function getMockBaseClass() {
+        $registry = &SimpleTest::getRegistry();
+        return $registry['MockBaseClass'];
+    }
+}
+
+/**
+ *    Container for all components for a specific
+ *    test run. Makes things like error queues
+ *    available to PHP event handlers, and also
+ *    gets around some nasty reference issues in
+ *    the mocks.
+ *    @package  SimpleTest
+ */
+class SimpleTestContext {
+    private $test;
+    private $reporter;
+    private $resources;
+
+    /**
+     *    Clears down the current context.
+     *    @access public
+     */
+    function clear() {
+        $this->resources = array();
+    }
+
+    /**
+     *    Sets the current test case instance. This
+     *    global instance can be used by the mock objects
+     *    to send message to the test cases.
+     *    @param SimpleTestCase $test        Test case to register.
+     */
+    function setTest($test) {
+        $this->clear();
+        $this->test = $test;
+    }
+
+    /**
+     *    Accessor for currently running test case.
+     *    @return SimpleTestCase    Current test.
+     */
+    function getTest() {
+        return $this->test;
+    }
+
+    /**
+     *    Sets the current reporter. This
+     *    global instance can be used by the mock objects
+     *    to send messages.
+     *    @param SimpleReporter $reporter     Reporter to register.
+     */
+    function setReporter($reporter) {
+        $this->clear();
+        $this->reporter = $reporter;
+    }
+
+    /**
+     *    Accessor for current reporter.
+     *    @return SimpleReporter    Current reporter.
+     */
+    function getReporter() {
+        return $this->reporter;
+    }
+
+    /**
+     *    Accessor for the Singleton resource.
+     *    @return object       Global resource.
+     */
+    function get($resource) {
+        if (! isset($this->resources[$resource])) {
+            $this->resources[$resource] = new $resource();
+        }
+        return $this->resources[$resource];
+    }
+}
+
+/**
+ *    Interrogates the stack trace to recover the
+ *    failure point.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleStackTrace {
+    private $prefixes;
+
+    /**
+     *    Stashes the list of target prefixes.
+     *    @param array $prefixes      List of method prefixes
+     *                                to search for.
+     */
+    function __construct($prefixes) {
+        $this->prefixes = $prefixes;
+    }
+
+    /**
+     *    Extracts the last method name that was not within
+     *    Simpletest itself. Captures a stack trace if none given.
+     *    @param array $stack      List of stack frames.
+     *    @return string           Snippet of test report with line
+     *                             number and file.
+     */
+    function traceMethod($stack = false) {
+        $stack = $stack ? $stack : $this->captureTrace();
+        foreach ($stack as $frame) {
+            if ($this->frameLiesWithinSimpleTestFolder($frame)) {
+                continue;
+            }
+            if ($this->frameMatchesPrefix($frame)) {
+                return ' at [' . $frame['file'] . ' line ' . $frame['line'] . ']';
+            }
+        }
+        return '';
+    }
+
+    /**
+     *    Test to see if error is generated by SimpleTest itself.
+     *    @param array $frame     PHP stack frame.
+     *    @return boolean         True if a SimpleTest file.
+     */
+    protected function frameLiesWithinSimpleTestFolder($frame) {
+        if (isset($frame['file'])) {
+            $path = substr(SIMPLE_TEST, 0, -1);
+            if (strpos($frame['file'], $path) === 0) {
+                if (dirname($frame['file']) == $path) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Tries to determine if the method call is an assert, etc.
+     *    @param array $frame     PHP stack frame.
+     *    @return boolean         True if matches a target.
+     */
+    protected function frameMatchesPrefix($frame) {
+        foreach ($this->prefixes as $prefix) {
+            if (strncmp($frame['function'], $prefix, strlen($prefix)) == 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Grabs a current stack trace.
+     *    @return array        Fulle trace.
+     */
+    protected function captureTrace() {
+        if (function_exists('debug_backtrace')) {
+            return array_reverse(debug_backtrace());
+        }
+        return array();
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/socket.php b/3rdparty/simpletest/socket.php
new file mode 100755
index 00000000000..06e8ca62d00
--- /dev/null
+++ b/3rdparty/simpletest/socket.php
@@ -0,0 +1,312 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage MockObjects
+ *  @version    $Id: socket.php 1953 2009-09-20 01:26:25Z jsweat $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/compatibility.php');
+/**#@-*/
+
+/**
+ *    Stashes an error for later. Useful for constructors
+ *    until PHP gets exceptions.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleStickyError {
+    private $error = 'Constructor not chained';
+
+    /**
+     *    Sets the error to empty.
+     *    @access public
+     */
+    function __construct() {
+        $this->clearError();
+    }
+
+    /**
+     *    Test for an outstanding error.
+     *    @return boolean           True if there is an error.
+     *    @access public
+     */
+    function isError() {
+        return ($this->error != '');
+    }
+
+    /**
+     *    Accessor for an outstanding error.
+     *    @return string     Empty string if no error otherwise
+     *                       the error message.
+     *    @access public
+     */
+    function getError() {
+        return $this->error;
+    }
+
+    /**
+     *    Sets the internal error.
+     *    @param string       Error message to stash.
+     *    @access protected
+     */
+    function setError($error) {
+        $this->error = $error;
+    }
+
+    /**
+     *    Resets the error state to no error.
+     *    @access protected
+     */
+    function clearError() {
+        $this->setError('');
+    }
+}
+
+/**
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleFileSocket extends SimpleStickyError {
+    private $handle;
+    private $is_open = false;
+    private $sent = '';
+    private $block_size;
+
+    /**
+     *    Opens a socket for reading and writing.
+     *    @param SimpleUrl $file       Target URI to fetch.
+     *    @param integer $block_size   Size of chunk to read.
+     *    @access public
+     */
+    function __construct($file, $block_size = 1024) {
+        parent::__construct();
+        if (! ($this->handle = $this->openFile($file, $error))) {
+            $file_string = $file->asString();
+            $this->setError("Cannot open [$file_string] with [$error]");
+            return;
+        }
+        $this->is_open = true;
+        $this->block_size = $block_size;
+    }
+
+    /**
+     *    Writes some data to the socket and saves alocal copy.
+     *    @param string $message       String to send to socket.
+     *    @return boolean              True if successful.
+     *    @access public
+     */
+    function write($message) {
+        return true;
+    }
+
+    /**
+     *    Reads data from the socket. The error suppresion
+     *    is a workaround for PHP4 always throwing a warning
+     *    with a secure socket.
+     *    @return integer/boolean           Incoming bytes. False
+     *                                     on error.
+     *    @access public
+     */
+    function read() {
+        $raw = @fread($this->handle, $this->block_size);
+        if ($raw === false) {
+            $this->setError('Cannot read from socket');
+            $this->close();
+        }
+        return $raw;
+    }
+
+    /**
+     *    Accessor for socket open state.
+     *    @return boolean           True if open.
+     *    @access public
+     */
+    function isOpen() {
+        return $this->is_open;
+    }
+
+    /**
+     *    Closes the socket preventing further reads.
+     *    Cannot be reopened once closed.
+     *    @return boolean           True if successful.
+     *    @access public
+     */
+    function close() {
+        if (!$this->is_open) return false;
+        $this->is_open = false;
+        return fclose($this->handle);
+    }
+
+    /**
+     *    Accessor for content so far.
+     *    @return string        Bytes sent only.
+     *    @access public
+     */
+    function getSent() {
+        return $this->sent;
+    }
+
+    /**
+     *    Actually opens the low level socket.
+     *    @param SimpleUrl $file       SimpleUrl file target.
+     *    @param string $error         Recipient of error message.
+     *    @param integer $timeout      Maximum time to wait for connection.
+     *    @access protected
+     */
+    protected function openFile($file, &$error) {
+        return @fopen($file->asString(), 'r');
+    }
+}
+
+/**
+ *    Wrapper for TCP/IP socket.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleSocket extends SimpleStickyError {
+    private $handle;
+    private $is_open = false;
+    private $sent = '';
+    private $lock_size;
+
+    /**
+     *    Opens a socket for reading and writing.
+     *    @param string $host          Hostname to send request to.
+     *    @param integer $port         Port on remote machine to open.
+     *    @param integer $timeout      Connection timeout in seconds.
+     *    @param integer $block_size   Size of chunk to read.
+     *    @access public
+     */
+    function __construct($host, $port, $timeout, $block_size = 255) {
+        parent::__construct();
+        if (! ($this->handle = $this->openSocket($host, $port, $error_number, $error, $timeout))) {
+            $this->setError("Cannot open [$host:$port] with [$error] within [$timeout] seconds");
+            return;
+        }
+        $this->is_open = true;
+        $this->block_size = $block_size;
+        SimpleTestCompatibility::setTimeout($this->handle, $timeout);
+    }
+
+    /**
+     *    Writes some data to the socket and saves alocal copy.
+     *    @param string $message       String to send to socket.
+     *    @return boolean              True if successful.
+     *    @access public
+     */
+    function write($message) {
+        if ($this->isError() || ! $this->isOpen()) {
+            return false;
+        }
+        $count = fwrite($this->handle, $message);
+        if (! $count) {
+            if ($count === false) {
+                $this->setError('Cannot write to socket');
+                $this->close();
+            }
+            return false;
+        }
+        fflush($this->handle);
+        $this->sent .= $message;
+        return true;
+    }
+
+    /**
+     *    Reads data from the socket. The error suppresion
+     *    is a workaround for PHP4 always throwing a warning
+     *    with a secure socket.
+     *    @return integer/boolean           Incoming bytes. False
+     *                                     on error.
+     *    @access public
+     */
+    function read() {
+        if ($this->isError() || ! $this->isOpen()) {
+            return false;
+        }
+        $raw = @fread($this->handle, $this->block_size);
+        if ($raw === false) {
+            $this->setError('Cannot read from socket');
+            $this->close();
+        }
+        return $raw;
+    }
+
+    /**
+     *    Accessor for socket open state.
+     *    @return boolean           True if open.
+     *    @access public
+     */
+    function isOpen() {
+        return $this->is_open;
+    }
+
+    /**
+     *    Closes the socket preventing further reads.
+     *    Cannot be reopened once closed.
+     *    @return boolean           True if successful.
+     *    @access public
+     */
+    function close() {
+        $this->is_open = false;
+        return fclose($this->handle);
+    }
+
+    /**
+     *    Accessor for content so far.
+     *    @return string        Bytes sent only.
+     *    @access public
+     */
+    function getSent() {
+        return $this->sent;
+    }
+
+    /**
+     *    Actually opens the low level socket.
+     *    @param string $host          Host to connect to.
+     *    @param integer $port         Port on host.
+     *    @param integer $error_number Recipient of error code.
+     *    @param string $error         Recipoent of error message.
+     *    @param integer $timeout      Maximum time to wait for connection.
+     *    @access protected
+     */
+    protected function openSocket($host, $port, &$error_number, &$error, $timeout) {
+        return @fsockopen($host, $port, $error_number, $error, $timeout);
+    }
+}
+
+/**
+ *    Wrapper for TCP/IP socket over TLS.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleSecureSocket extends SimpleSocket {
+
+    /**
+     *    Opens a secure socket for reading and writing.
+     *    @param string $host      Hostname to send request to.
+     *    @param integer $port     Port on remote machine to open.
+     *    @param integer $timeout  Connection timeout in seconds.
+     *    @access public
+     */
+    function __construct($host, $port, $timeout) {
+        parent::__construct($host, $port, $timeout);
+    }
+
+    /**
+     *    Actually opens the low level socket.
+     *    @param string $host          Host to connect to.
+     *    @param integer $port         Port on host.
+     *    @param integer $error_number Recipient of error code.
+     *    @param string $error         Recipient of error message.
+     *    @param integer $timeout      Maximum time to wait for connection.
+     *    @access protected
+     */
+    function openSocket($host, $port, &$error_number, &$error, $timeout) {
+        return parent::openSocket("tls://$host", $port, $error_number, $error, $timeout);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/tag.php b/3rdparty/simpletest/tag.php
new file mode 100644
index 00000000000..afe649ec5dd
--- /dev/null
+++ b/3rdparty/simpletest/tag.php
@@ -0,0 +1,1527 @@
+<?php
+/**
+ *  Base include file for SimpleTest.
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: tag.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/page.php');
+require_once(dirname(__FILE__) . '/encoding.php');
+/**#@-*/
+
+/**
+ *    Creates tags and widgets given HTML tag
+ *    attributes.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTagBuilder {
+
+    /**
+     *    Factory for the tag objects. Creates the
+     *    appropriate tag object for the incoming tag name
+     *    and attributes.
+     *    @param string $name        HTML tag name.
+     *    @param hash $attributes    Element attributes.
+     *    @return SimpleTag          Tag object.
+     *    @access public
+     */
+    function createTag($name, $attributes) {
+        static $map = array(
+                'a' => 'SimpleAnchorTag',
+                'title' => 'SimpleTitleTag',
+                'base' => 'SimpleBaseTag',
+                'button' => 'SimpleButtonTag',
+                'textarea' => 'SimpleTextAreaTag',
+                'option' => 'SimpleOptionTag',
+                'label' => 'SimpleLabelTag',
+                'form' => 'SimpleFormTag',
+                'frame' => 'SimpleFrameTag');
+        $attributes = $this->keysToLowerCase($attributes);
+        if (array_key_exists($name, $map)) {
+            $tag_class = $map[$name];
+            return new $tag_class($attributes);
+        } elseif ($name == 'select') {
+            return $this->createSelectionTag($attributes);
+        } elseif ($name == 'input') {
+            return $this->createInputTag($attributes);
+        }
+        return new SimpleTag($name, $attributes);
+    }
+
+    /**
+     *    Factory for selection fields.
+     *    @param hash $attributes    Element attributes.
+     *    @return SimpleTag          Tag object.
+     *    @access protected
+     */
+    protected function createSelectionTag($attributes) {
+        if (isset($attributes['multiple'])) {
+            return new MultipleSelectionTag($attributes);
+        }
+        return new SimpleSelectionTag($attributes);
+    }
+
+    /**
+     *    Factory for input tags.
+     *    @param hash $attributes    Element attributes.
+     *    @return SimpleTag          Tag object.
+     *    @access protected
+     */
+    protected function createInputTag($attributes) {
+        if (! isset($attributes['type'])) {
+            return new SimpleTextTag($attributes);
+        }
+        $type = strtolower(trim($attributes['type']));
+        $map = array(
+                'submit' => 'SimpleSubmitTag',
+                'image' => 'SimpleImageSubmitTag',
+                'checkbox' => 'SimpleCheckboxTag',
+                'radio' => 'SimpleRadioButtonTag',
+                'text' => 'SimpleTextTag',
+                'hidden' => 'SimpleTextTag',
+                'password' => 'SimpleTextTag',
+                'file' => 'SimpleUploadTag');
+        if (array_key_exists($type, $map)) {
+            $tag_class = $map[$type];
+            return new $tag_class($attributes);
+        }
+        return false;
+    }
+
+    /**
+     *    Make the keys lower case for case insensitive look-ups.
+     *    @param hash $map   Hash to convert.
+     *    @return hash       Unchanged values, but keys lower case.
+     *    @access private
+     */
+    protected function keysToLowerCase($map) {
+        $lower = array();
+        foreach ($map as $key => $value) {
+            $lower[strtolower($key)] = $value;
+        }
+        return $lower;
+    }
+}
+
+/**
+ *    HTML or XML tag.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTag {
+    private $name;
+    private $attributes;
+    private $content;
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param string $name        Tag name.
+     *    @param hash $attributes    Attribute names and
+     *                               string values. Note that
+     *                               the keys must have been
+     *                               converted to lower case.
+     */
+    function __construct($name, $attributes) {
+        $this->name = strtolower(trim($name));
+        $this->attributes = $attributes;
+        $this->content = '';
+    }
+
+    /**
+     *    Check to see if the tag can have both start and
+     *    end tags with content in between.
+     *    @return boolean        True if content allowed.
+     *    @access public
+     */
+    function expectEndTag() {
+        return true;
+    }
+
+    /**
+     *    The current tag should not swallow all content for
+     *    itself as it's searchable page content. Private
+     *    content tags are usually widgets that contain default
+     *    values.
+     *    @return boolean        False as content is available
+     *                           to other tags by default.
+     *    @access public
+     */
+    function isPrivateContent() {
+        return false;
+    }
+
+    /**
+     *    Appends string content to the current content.
+     *    @param string $content        Additional text.
+     *    @access public
+     */
+    function addContent($content) {
+        $this->content .= (string)$content;
+        return $this;
+    }
+
+    /**
+     *    Adds an enclosed tag to the content.
+     *    @param SimpleTag $tag    New tag.
+     *    @access public
+     */
+    function addTag($tag) {
+    }
+
+    /**
+     *    Adds multiple enclosed tags to the content.
+     *    @param array            List of SimpleTag objects to be added.
+     */
+    function addTags($tags) {
+        foreach ($tags as $tag) {
+            $this->addTag($tag);
+        }
+    }
+
+    /**
+     *    Accessor for tag name.
+     *    @return string       Name of tag.
+     *    @access public
+     */
+    function getTagName() {
+        return $this->name;
+    }
+
+    /**
+     *    List of legal child elements.
+     *    @return array        List of element names.
+     *    @access public
+     */
+    function getChildElements() {
+        return array();
+    }
+
+    /**
+     *    Accessor for an attribute.
+     *    @param string $label    Attribute name.
+     *    @return string          Attribute value.
+     *    @access public
+     */
+    function getAttribute($label) {
+        $label = strtolower($label);
+        if (! isset($this->attributes[$label])) {
+            return false;
+        }
+        return (string)$this->attributes[$label];
+    }
+
+    /**
+     *    Sets an attribute.
+     *    @param string $label    Attribute name.
+     *    @return string $value   New attribute value.
+     *    @access protected
+     */
+    protected function setAttribute($label, $value) {
+        $this->attributes[strtolower($label)] = $value;
+    }
+
+    /**
+     *    Accessor for the whole content so far.
+     *    @return string       Content as big raw string.
+     *    @access public
+     */
+    function getContent() {
+        return $this->content;
+    }
+
+    /**
+     *    Accessor for content reduced to visible text. Acts
+     *    like a text mode browser, normalising space and
+     *    reducing images to their alt text.
+     *    @return string       Content as plain text.
+     *    @access public
+     */
+    function getText() {
+        return SimplePage::normalise($this->content);
+    }
+
+    /**
+     *    Test to see if id attribute matches.
+     *    @param string $id        ID to test against.
+     *    @return boolean          True on match.
+     *    @access public
+     */
+    function isId($id) {
+        return ($this->getAttribute('id') == $id);
+    }
+}
+
+/**
+ *    Base url.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleBaseTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('base', $attributes);
+    }
+
+    /**
+     *    Base tag is not a block tag.
+     *    @return boolean       false
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+}
+
+/**
+ *    Page title.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTitleTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('title', $attributes);
+    }
+}
+
+/**
+ *    Link.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleAnchorTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('a', $attributes);
+    }
+
+    /**
+     *    Accessor for URL as string.
+     *    @return string    Coerced as string.
+     *    @access public
+     */
+    function getHref() {
+        $url = $this->getAttribute('href');
+        if (is_bool($url)) {
+            $url = '';
+        }
+        return $url;
+    }
+}
+
+/**
+ *    Form element.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleWidget extends SimpleTag {
+    private $value;
+    private $label;
+    private $is_set;
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param string $name        Tag name.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($name, $attributes) {
+        parent::__construct($name, $attributes);
+        $this->value = false;
+        $this->label = false;
+        $this->is_set = false;
+    }
+
+    /**
+     *    Accessor for name submitted as the key in
+     *    GET/POST privateiables hash.
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getName() {
+        return $this->getAttribute('name');
+    }
+
+    /**
+     *    Accessor for default value parsed with the tag.
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getDefault() {
+        return $this->getAttribute('value');
+    }
+
+    /**
+     *    Accessor for currently set value or default if
+     *    none.
+     *    @return string      Value set by form or default
+     *                        if none.
+     *    @access public
+     */
+    function getValue() {
+        if (! $this->is_set) {
+            return $this->getDefault();
+        }
+        return $this->value;
+    }
+
+    /**
+     *    Sets the current form element value.
+     *    @param string $value       New value.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        $this->value = $value;
+        $this->is_set = true;
+        return true;
+    }
+
+    /**
+     *    Resets the form element value back to the
+     *    default.
+     *    @access public
+     */
+    function resetValue() {
+        $this->is_set = false;
+    }
+
+    /**
+     *    Allows setting of a label externally, say by a
+     *    label tag.
+     *    @param string $label    Label to attach.
+     *    @access public
+     */
+    function setLabel($label) {
+        $this->label = trim($label);
+        return $this;
+    }
+
+    /**
+     *    Reads external or internal label.
+     *    @param string $label    Label to test.
+     *    @return boolean         True is match.
+     *    @access public
+     */
+    function isLabel($label) {
+        return $this->label == trim($label);
+    }
+
+    /**
+     *    Dispatches the value into the form encoded packet.
+     *    @param SimpleEncoding $encoding    Form packet.
+     *    @access public
+     */
+    function write($encoding) {
+        if ($this->getName()) {
+            $encoding->add($this->getName(), $this->getValue());
+        }
+    }
+}
+
+/**
+ *    Text, password and hidden field.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTextTag extends SimpleWidget {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+        if ($this->getAttribute('value') === false) {
+            $this->setAttribute('value', '');
+        }
+    }
+
+    /**
+     *    Tag contains no content.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    Sets the current form element value. Cannot
+     *    change the value of a hidden field.
+     *    @param string $value       New value.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        if ($this->getAttribute('type') == 'hidden') {
+            return false;
+        }
+        return parent::setValue($value);
+    }
+}
+
+/**
+ *    Submit button as input tag.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleSubmitTag extends SimpleWidget {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+        if ($this->getAttribute('value') === false) {
+            $this->setAttribute('value', 'Submit');
+        }
+    }
+
+    /**
+     *    Tag contains no end element.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    Disables the setting of the button value.
+     *    @param string $value       Ignored.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        return false;
+    }
+
+    /**
+     *    Value of browser visible text.
+     *    @return string        Visible label.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->getValue();
+    }
+
+    /**
+     *    Test for a label match when searching.
+     *    @param string $label     Label to test.
+     *    @return boolean          True on match.
+     *    @access public
+     */
+    function isLabel($label) {
+        return trim($label) == trim($this->getLabel());
+    }
+}
+
+/**
+ *    Image button as input tag.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleImageSubmitTag extends SimpleWidget {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+    }
+
+    /**
+     *    Tag contains no end element.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    Disables the setting of the button value.
+     *    @param string $value       Ignored.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        return false;
+    }
+
+    /**
+     *    Value of browser visible text.
+     *    @return string        Visible label.
+     *    @access public
+     */
+    function getLabel() {
+        if ($this->getAttribute('title')) {
+            return $this->getAttribute('title');
+        }
+        return $this->getAttribute('alt');
+    }
+
+    /**
+     *    Test for a label match when searching.
+     *    @param string $label     Label to test.
+     *    @return boolean          True on match.
+     *    @access public
+     */
+    function isLabel($label) {
+        return trim($label) == trim($this->getLabel());
+    }
+
+    /**
+     *    Dispatches the value into the form encoded packet.
+     *    @param SimpleEncoding $encoding    Form packet.
+     *    @param integer $x                  X coordinate of click.
+     *    @param integer $y                  Y coordinate of click.
+     *    @access public
+     */
+    function write($encoding, $x = 1, $y = 1) {
+        if ($this->getName()) {
+            $encoding->add($this->getName() . '.x', $x);
+            $encoding->add($this->getName() . '.y', $y);
+        } else {
+            $encoding->add('x', $x);
+            $encoding->add('y', $y);
+        }
+    }
+}
+
+/**
+ *    Submit button as button tag.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleButtonTag extends SimpleWidget {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    Defaults are very browser dependent.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('button', $attributes);
+    }
+
+    /**
+     *    Check to see if the tag can have both start and
+     *    end tags with content in between.
+     *    @return boolean        True if content allowed.
+     *    @access public
+     */
+    function expectEndTag() {
+        return true;
+    }
+
+    /**
+     *    Disables the setting of the button value.
+     *    @param string $value       Ignored.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        return false;
+    }
+
+    /**
+     *    Value of browser visible text.
+     *    @return string        Visible label.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->getContent();
+    }
+
+    /**
+     *    Test for a label match when searching.
+     *    @param string $label     Label to test.
+     *    @return boolean          True on match.
+     *    @access public
+     */
+    function isLabel($label) {
+        return trim($label) == trim($this->getLabel());
+    }
+}
+
+/**
+ *    Content tag for text area.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTextAreaTag extends SimpleWidget {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('textarea', $attributes);
+    }
+
+    /**
+     *    Accessor for starting value.
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getDefault() {
+        return $this->wrap(html_entity_decode($this->getContent(), ENT_QUOTES));
+    }
+
+    /**
+     *    Applies word wrapping if needed.
+     *    @param string $value      New value.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        return parent::setValue($this->wrap($value));
+    }
+
+    /**
+     *    Test to see if text should be wrapped.
+     *    @return boolean        True if wrapping on.
+     *    @access private
+     */
+    function wrapIsEnabled() {
+        if ($this->getAttribute('cols')) {
+            $wrap = $this->getAttribute('wrap');
+            if (($wrap == 'physical') || ($wrap == 'hard')) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Performs the formatting that is peculiar to
+     *    this tag. There is strange behaviour in this
+     *    one, including stripping a leading new line.
+     *    Go figure. I am using Firefox as a guide.
+     *    @param string $text    Text to wrap.
+     *    @return string         Text wrapped with carriage
+     *                           returns and line feeds
+     *    @access private
+     */
+    protected function wrap($text) {
+        $text = str_replace("\r\r\n", "\r\n", str_replace("\n", "\r\n", $text));
+        $text = str_replace("\r\n\n", "\r\n", str_replace("\r", "\r\n", $text));
+        if (strncmp($text, "\r\n", strlen("\r\n")) == 0) {
+            $text = substr($text, strlen("\r\n"));
+        }
+        if ($this->wrapIsEnabled()) {
+            return wordwrap(
+                    $text,
+                    (integer)$this->getAttribute('cols'),
+                    "\r\n");
+        }
+        return $text;
+    }
+
+    /**
+     *    The content of textarea is not part of the page.
+     *    @return boolean        True.
+     *    @access public
+     */
+    function isPrivateContent() {
+        return true;
+    }
+}
+
+/**
+ *    File upload widget.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleUploadTag extends SimpleWidget {
+
+    /**
+     *    Starts with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+    }
+
+    /**
+     *    Tag contains no content.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    Dispatches the value into the form encoded packet.
+     *    @param SimpleEncoding $encoding    Form packet.
+     *    @access public
+     */
+    function write($encoding) {
+        if (! file_exists($this->getValue())) {
+            return;
+        }
+        $encoding->attach(
+                $this->getName(),
+                implode('', file($this->getValue())),
+                basename($this->getValue()));
+    }
+}
+
+/**
+ *    Drop down widget.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleSelectionTag extends SimpleWidget {
+    private $options;
+    private $choice;
+
+    /**
+     *    Starts with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('select', $attributes);
+        $this->options = array();
+        $this->choice = false;
+    }
+
+    /**
+     *    Adds an option tag to a selection field.
+     *    @param SimpleOptionTag $tag     New option.
+     *    @access public
+     */
+    function addTag($tag) {
+        if ($tag->getTagName() == 'option') {
+            $this->options[] = $tag;
+        }
+    }
+
+    /**
+     *    Text within the selection element is ignored.
+     *    @param string $content        Ignored.
+     *    @access public
+     */
+    function addContent($content) {
+        return $this;
+    }
+
+    /**
+     *    Scans options for defaults. If none, then
+     *    the first option is selected.
+     *    @return string        Selected field.
+     *    @access public
+     */
+    function getDefault() {
+        for ($i = 0, $count = count($this->options); $i < $count; $i++) {
+            if ($this->options[$i]->getAttribute('selected') !== false) {
+                return $this->options[$i]->getDefault();
+            }
+        }
+        if ($count > 0) {
+            return $this->options[0]->getDefault();
+        }
+        return '';
+    }
+
+    /**
+     *    Can only set allowed values.
+     *    @param string $value       New choice.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        for ($i = 0, $count = count($this->options); $i < $count; $i++) {
+            if ($this->options[$i]->isValue($value)) {
+                $this->choice = $i;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for current selection value.
+     *    @return string      Value attribute or
+     *                        content of opton.
+     *    @access public
+     */
+    function getValue() {
+        if ($this->choice === false) {
+            return $this->getDefault();
+        }
+        return $this->options[$this->choice]->getValue();
+    }
+}
+
+/**
+ *    Drop down widget.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class MultipleSelectionTag extends SimpleWidget {
+    private $options;
+    private $values;
+
+    /**
+     *    Starts with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('select', $attributes);
+        $this->options = array();
+        $this->values = false;
+    }
+
+    /**
+     *    Adds an option tag to a selection field.
+     *    @param SimpleOptionTag $tag     New option.
+     *    @access public
+     */
+    function addTag($tag) {
+        if ($tag->getTagName() == 'option') {
+            $this->options[] = &$tag;
+        }
+    }
+
+    /**
+     *    Text within the selection element is ignored.
+     *    @param string $content        Ignored.
+     *    @access public
+     */
+    function addContent($content) {
+        return $this;
+    }
+
+    /**
+     *    Scans options for defaults to populate the
+     *    value array().
+     *    @return array        Selected fields.
+     *    @access public
+     */
+    function getDefault() {
+        $default = array();
+        for ($i = 0, $count = count($this->options); $i < $count; $i++) {
+            if ($this->options[$i]->getAttribute('selected') !== false) {
+                $default[] = $this->options[$i]->getDefault();
+            }
+        }
+        return $default;
+    }
+
+    /**
+     *    Can only set allowed values. Any illegal value
+     *    will result in a failure, but all correct values
+     *    will be set.
+     *    @param array $desired      New choices.
+     *    @return boolean            True if all allowed.
+     *    @access public
+     */
+    function setValue($desired) {
+        $achieved = array();
+        foreach ($desired as $value) {
+            $success = false;
+            for ($i = 0, $count = count($this->options); $i < $count; $i++) {
+                if ($this->options[$i]->isValue($value)) {
+                    $achieved[] = $this->options[$i]->getValue();
+                    $success = true;
+                    break;
+                }
+            }
+            if (! $success) {
+                return false;
+            }
+        }
+        $this->values = $achieved;
+        return true;
+    }
+
+    /**
+     *    Accessor for current selection value.
+     *    @return array      List of currently set options.
+     *    @access public
+     */
+    function getValue() {
+        if ($this->values === false) {
+            return $this->getDefault();
+        }
+        return $this->values;
+    }
+}
+
+/**
+ *    Option for selection field.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleOptionTag extends SimpleWidget {
+
+    /**
+     *    Stashes the attributes.
+     */
+    function __construct($attributes) {
+        parent::__construct('option', $attributes);
+    }
+
+    /**
+     *    Does nothing.
+     *    @param string $value      Ignored.
+     *    @return boolean           Not allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        return false;
+    }
+
+    /**
+     *    Test to see if a value matches the option.
+     *    @param string $compare    Value to compare with.
+     *    @return boolean           True if possible match.
+     *    @access public
+     */
+    function isValue($compare) {
+        $compare = trim($compare);
+        if (trim($this->getValue()) == $compare) {
+            return true;
+        }
+        return trim(strip_tags($this->getContent())) == $compare;
+    }
+
+    /**
+     *    Accessor for starting value. Will be set to
+     *    the option label if no value exists.
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getDefault() {
+        if ($this->getAttribute('value') === false) {
+            return strip_tags($this->getContent());
+        }
+        return $this->getAttribute('value');
+    }
+
+    /**
+     *    The content of options is not part of the page.
+     *    @return boolean        True.
+     *    @access public
+     */
+    function isPrivateContent() {
+        return true;
+    }
+}
+
+/**
+ *    Radio button.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleRadioButtonTag extends SimpleWidget {
+
+    /**
+     *    Stashes the attributes.
+     *    @param array $attributes        Hash of attributes.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+        if ($this->getAttribute('value') === false) {
+            $this->setAttribute('value', 'on');
+        }
+    }
+
+    /**
+     *    Tag contains no content.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    The only allowed value sn the one in the
+     *    "value" attribute.
+     *    @param string $value      New value.
+     *    @return boolean           True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        if ($value === false) {
+            return parent::setValue($value);
+        }
+        if ($value != $this->getAttribute('value')) {
+            return false;
+        }
+        return parent::setValue($value);
+    }
+
+    /**
+     *    Accessor for starting value.
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getDefault() {
+        if ($this->getAttribute('checked') !== false) {
+            return $this->getAttribute('value');
+        }
+        return false;
+    }
+}
+
+/**
+ *    Checkbox widget.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleCheckboxTag extends SimpleWidget {
+
+    /**
+     *    Starts with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+        if ($this->getAttribute('value') === false) {
+            $this->setAttribute('value', 'on');
+        }
+    }
+
+    /**
+     *    Tag contains no content.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    The only allowed value in the one in the
+     *    "value" attribute. The default for this
+     *    attribute is "on". If this widget is set to
+     *    true, then the usual value will be taken.
+     *    @param string $value      New value.
+     *    @return boolean           True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        if ($value === false) {
+            return parent::setValue($value);
+        }
+        if ($value === true) {
+            return parent::setValue($this->getAttribute('value'));
+        }
+        if ($value != $this->getAttribute('value')) {
+            return false;
+        }
+        return parent::setValue($value);
+    }
+
+    /**
+     *    Accessor for starting value. The default
+     *    value is "on".
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getDefault() {
+        if ($this->getAttribute('checked') !== false) {
+            return $this->getAttribute('value');
+        }
+        return false;
+    }
+}
+
+/**
+ *    A group of multiple widgets with some shared behaviour.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTagGroup {
+    private $widgets = array();
+
+    /**
+     *    Adds a tag to the group.
+     *    @param SimpleWidget $widget
+     *    @access public
+     */
+    function addWidget($widget) {
+        $this->widgets[] = $widget;
+    }
+
+    /**
+     *    Accessor to widget set.
+     *    @return array        All widgets.
+     *    @access protected
+     */
+    protected function &getWidgets() {
+        return $this->widgets;
+    }
+
+    /**
+     *    Accessor for an attribute.
+     *    @param string $label    Attribute name.
+     *    @return boolean         Always false.
+     *    @access public
+     */
+    function getAttribute($label) {
+        return false;
+    }
+
+    /**
+     *    Fetches the name for the widget from the first
+     *    member.
+     *    @return string        Name of widget.
+     *    @access public
+     */
+    function getName() {
+        if (count($this->widgets) > 0) {
+            return $this->widgets[0]->getName();
+        }
+    }
+
+    /**
+     *    Scans the widgets for one with the appropriate
+     *    ID field.
+     *    @param string $id        ID value to try.
+     *    @return boolean          True if matched.
+     *    @access public
+     */
+    function isId($id) {
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            if ($this->widgets[$i]->isId($id)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Scans the widgets for one with the appropriate
+     *    attached label.
+     *    @param string $label     Attached label to try.
+     *    @return boolean          True if matched.
+     *    @access public
+     */
+    function isLabel($label) {
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            if ($this->widgets[$i]->isLabel($label)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Dispatches the value into the form encoded packet.
+     *    @param SimpleEncoding $encoding    Form packet.
+     *    @access public
+     */
+    function write($encoding) {
+        $encoding->add($this->getName(), $this->getValue());
+    }
+}
+
+/**
+ *    A group of tags with the same name within a form.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleCheckboxGroup extends SimpleTagGroup {
+
+    /**
+     *    Accessor for current selected widget or false
+     *    if none.
+     *    @return string/array     Widget values or false if none.
+     *    @access public
+     */
+    function getValue() {
+        $values = array();
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if ($widgets[$i]->getValue() !== false) {
+                $values[] = $widgets[$i]->getValue();
+            }
+        }
+        return $this->coerceValues($values);
+    }
+
+    /**
+     *    Accessor for starting value that is active.
+     *    @return string/array      Widget values or false if none.
+     *    @access public
+     */
+    function getDefault() {
+        $values = array();
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if ($widgets[$i]->getDefault() !== false) {
+                $values[] = $widgets[$i]->getDefault();
+            }
+        }
+        return $this->coerceValues($values);
+    }
+
+    /**
+     *    Accessor for current set values.
+     *    @param string/array/boolean $values   Either a single string, a
+     *                                          hash or false for nothing set.
+     *    @return boolean                       True if all values can be set.
+     *    @access public
+     */
+    function setValue($values) {
+        $values = $this->makeArray($values);
+        if (! $this->valuesArePossible($values)) {
+            return false;
+        }
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            $possible = $widgets[$i]->getAttribute('value');
+            if (in_array($widgets[$i]->getAttribute('value'), $values)) {
+                $widgets[$i]->setValue($possible);
+            } else {
+                $widgets[$i]->setValue(false);
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Tests to see if a possible value set is legal.
+     *    @param string/array/boolean $values   Either a single string, a
+     *                                          hash or false for nothing set.
+     *    @return boolean                       False if trying to set a
+     *                                          missing value.
+     *    @access private
+     */
+    protected function valuesArePossible($values) {
+        $matches = array();
+        $widgets = &$this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            $possible = $widgets[$i]->getAttribute('value');
+            if (in_array($possible, $values)) {
+                $matches[] = $possible;
+            }
+        }
+        return ($values == $matches);
+    }
+
+    /**
+     *    Converts the output to an appropriate format. This means
+     *    that no values is false, a single value is just that
+     *    value and only two or more are contained in an array.
+     *    @param array $values           List of values of widgets.
+     *    @return string/array/boolean   Expected format for a tag.
+     *    @access private
+     */
+    protected function coerceValues($values) {
+        if (count($values) == 0) {
+            return false;
+        } elseif (count($values) == 1) {
+            return $values[0];
+        } else {
+            return $values;
+        }
+    }
+
+    /**
+     *    Converts false or string into array. The opposite of
+     *    the coercian method.
+     *    @param string/array/boolean $value  A single item is converted
+     *                                        to a one item list. False
+     *                                        gives an empty list.
+     *    @return array                       List of values, possibly empty.
+     *    @access private
+     */
+    protected function makeArray($value) {
+        if ($value === false) {
+            return array();
+        }
+        if (is_string($value)) {
+            return array($value);
+        }
+        return $value;
+    }
+}
+
+/**
+ *    A group of tags with the same name within a form.
+ *    Used for radio buttons.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleRadioGroup extends SimpleTagGroup {
+
+    /**
+     *    Each tag is tried in turn until one is
+     *    successfully set. The others will be
+     *    unchecked if successful.
+     *    @param string $value      New value.
+     *    @return boolean           True if any allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        if (! $this->valueIsPossible($value)) {
+            return false;
+        }
+        $index = false;
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if (! $widgets[$i]->setValue($value)) {
+                $widgets[$i]->setValue(false);
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Tests to see if a value is allowed.
+     *    @param string    Attempted value.
+     *    @return boolean  True if a valid value.
+     *    @access private
+     */
+    protected function valueIsPossible($value) {
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if ($widgets[$i]->getAttribute('value') == $value) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for current selected widget or false
+     *    if none.
+     *    @return string/boolean   Value attribute or
+     *                             content of opton.
+     *    @access public
+     */
+    function getValue() {
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if ($widgets[$i]->getValue() !== false) {
+                return $widgets[$i]->getValue();
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for starting value that is active.
+     *    @return string/boolean      Value of first checked
+     *                                widget or false if none.
+     *    @access public
+     */
+    function getDefault() {
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if ($widgets[$i]->getDefault() !== false) {
+                return $widgets[$i]->getDefault();
+            }
+        }
+        return false;
+    }
+}
+
+/**
+ *    Tag to keep track of labels.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleLabelTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('label', $attributes);
+    }
+
+    /**
+     *    Access for the ID to attach the label to.
+     *    @return string        For attribute.
+     *    @access public
+     */
+    function getFor() {
+        return $this->getAttribute('for');
+    }
+}
+
+/**
+ *    Tag to aid parsing the form.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleFormTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('form', $attributes);
+    }
+}
+
+/**
+ *    Tag to aid parsing the frames in a page.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleFrameTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('frame', $attributes);
+    }
+
+    /**
+     *    Tag contains no content.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/acceptance_test.php b/3rdparty/simpletest/test/acceptance_test.php
new file mode 100644
index 00000000000..e96fe737e5f
--- /dev/null
+++ b/3rdparty/simpletest/test/acceptance_test.php
@@ -0,0 +1,1729 @@
+<?php
+// $Id: acceptance_test.php 2013 2011-04-29 09:29:45Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../compatibility.php');
+require_once(dirname(__FILE__) . '/../browser.php');
+require_once(dirname(__FILE__) . '/../web_tester.php');
+require_once(dirname(__FILE__) . '/../unit_tester.php');
+
+class SimpleTestAcceptanceTest extends WebTestCase {
+    static function samples() {
+        return 'http://www.lastcraft.com/test/';
+    }
+}
+
+class TestOfLiveBrowser extends UnitTestCase {
+    function samples() {
+        return SimpleTestAcceptanceTest::samples();
+    }
+
+    function testGet() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $this->assertTrue($browser->get($this->samples() . 'network_confirm.php'));
+        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/', $browser->getContent());
+        $this->assertEqual($browser->getTitle(), 'Simple test target file');
+        $this->assertEqual($browser->getResponseCode(), 200);
+        $this->assertEqual($browser->getMimeType(), 'text/html');
+    }
+
+    function testPost() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $this->assertTrue($browser->post($this->samples() . 'network_confirm.php'));
+        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/', $browser->getContent());
+    }
+
+    function testAbsoluteLinkFollowing() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'link_confirm.php');
+        $this->assertTrue($browser->clickLink('Absolute'));
+        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
+    }
+
+    function testRelativeEncodedLinkFollowing() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'link_confirm.php');
+        // Warning: the below data is ISO 8859-1 encoded
+        $this->assertTrue($browser->clickLink("m\xE4rc\xEAl kiek'eboe"));
+        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
+    }
+
+    function testRelativeLinkFollowing() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'link_confirm.php');
+        $this->assertTrue($browser->clickLink('Relative'));
+        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
+    }
+
+    function testUnifiedClickLinkClicking() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'link_confirm.php');
+        $this->assertTrue($browser->click('Relative'));
+        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
+    }
+
+    function testIdLinkFollowing() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'link_confirm.php');
+        $this->assertTrue($browser->clickLinkById(1));
+        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
+    }
+
+    function testCookieReading() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'set_cookies.php');
+        $this->assertEqual($browser->getCurrentCookieValue('session_cookie'), 'A');
+        $this->assertEqual($browser->getCurrentCookieValue('short_cookie'), 'B');
+        $this->assertEqual($browser->getCurrentCookieValue('day_cookie'), 'C');
+    }
+
+    function testSimpleSubmit() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'form.html');
+        $this->assertTrue($browser->clickSubmit('Go!'));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/', $browser->getContent());
+        $this->assertPattern('/go=\[Go!\]/', $browser->getContent());
+    }
+
+    function testUnifiedClickCanSubmit() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'form.html');
+        $this->assertTrue($browser->click('Go!'));
+        $this->assertPattern('/go=\[Go!\]/', $browser->getContent());
+    }
+}
+
+class TestOfLocalFileBrowser extends UnitTestCase {
+    function samples() {
+        return 'file://'.dirname(__FILE__).'/site/';
+    }
+
+    function testGet() {
+        $browser = new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $this->assertTrue($browser->get($this->samples() . 'file.html'));
+        $this->assertPattern('/Link to SimpleTest/', $browser->getContent());
+        $this->assertEqual($browser->getTitle(), 'Link to SimpleTest');
+        $this->assertFalse($browser->getResponseCode());
+        $this->assertEqual($browser->getMimeType(), '');
+    }
+}
+
+class TestOfRequestMethods extends UnitTestCase {
+    function samples() {
+        return SimpleTestAcceptanceTest::samples();
+    }
+
+	function testHeadRequest() {
+		$browser = new SimpleBrowser();
+		$this->assertTrue($browser->head($this->samples() . 'request_methods.php'));
+		$this->assertEqual($browser->getResponseCode(), 202);
+	}
+
+	function testGetRequest() {
+		$browser = new SimpleBrowser();
+		$this->assertTrue($browser->get($this->samples() . 'request_methods.php'));
+		$this->assertEqual($browser->getResponseCode(), 405);
+	}
+
+	function testPostWithPlainEncoding() {
+		$browser = new SimpleBrowser();
+		$this->assertTrue($browser->post($this->samples() . 'request_methods.php', 'A content message'));
+		$this->assertEqual($browser->getResponseCode(), 406);
+		$this->assertPattern('/Please ensure content type is an XML format/', $browser->getContent());
+	}
+
+	function testPostWithXmlEncoding() {
+		$browser = new SimpleBrowser();
+		$this->assertTrue($browser->post($this->samples() . 'request_methods.php', '<a><b>c</b></a>', 'text/xml'));
+		$this->assertEqual($browser->getResponseCode(), 201);
+		$this->assertPattern('/c/', $browser->getContent());
+	}
+
+	function testPutWithPlainEncoding() {
+		$browser = new SimpleBrowser();
+		$this->assertTrue($browser->put($this->samples() . 'request_methods.php', 'A content message'));
+		$this->assertEqual($browser->getResponseCode(), 406);
+		$this->assertPattern('/Please ensure content type is an XML format/', $browser->getContent());
+	}
+
+	function testPutWithXmlEncoding() {
+		$browser = new SimpleBrowser();
+		$this->assertTrue($browser->put($this->samples() . 'request_methods.php', '<a><b>c</b></a>', 'application/xml'));
+		$this->assertEqual($browser->getResponseCode(), 201);
+		$this->assertPattern('/c/', $browser->getContent());
+	}
+
+	function testDeleteRequest() {
+		$browser = new SimpleBrowser();
+		$browser->delete($this->samples() . 'request_methods.php');
+		$this->assertEqual($browser->getResponseCode(), 202);
+		$this->assertPattern('/Your delete request was accepted/', $browser->getContent());
+	}
+
+}
+
+class TestRadioFields extends SimpleTestAcceptanceTest {
+    function testSetFieldAsInteger() {
+        $this->get($this->samples() . 'form_with_radio_buttons.html');
+        $this->assertTrue($this->setField('tested_field', 2));
+        $this->clickSubmitByName('send');
+        $this->assertEqual($this->getUrl(), $this->samples() . 'form_with_radio_buttons.html?tested_field=2&send=click+me');
+    }
+
+    function testSetFieldAsString() {
+        $this->get($this->samples() . 'form_with_radio_buttons.html');
+        $this->assertTrue($this->setField('tested_field', '2'));
+        $this->clickSubmitByName('send');
+        $this->assertEqual($this->getUrl(), $this->samples() . 'form_with_radio_buttons.html?tested_field=2&send=click+me');
+    }
+}
+
+class TestOfLiveFetching extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testFormWithArrayBasedInputs() {
+        $this->get($this->samples() . 'form_with_array_based_inputs.php');
+        $this->setField('value[]', '3', '1');
+        $this->setField('value[]', '4', '2');
+        $this->clickSubmit('Go');
+        $this->assertPattern('/QUERY_STRING : value%5B%5D=3&value%5B%5D=4&submit=Go/');
+    }
+
+    function testFormWithQuotedValues() {
+        $this->get($this->samples() . 'form_with_quoted_values.php');
+        $this->assertField('a', 'default');
+        $this->assertFieldById('text_field', 'default');
+        $this->clickSubmit('Go');
+        $this->assertPattern('/a=default&submit=Go/');
+    }
+
+    function testGet() {
+        $this->assertTrue($this->get($this->samples() . 'network_confirm.php'));
+        $this->assertEqual($this->getUrl(), $this->samples() . 'network_confirm.php');
+        $this->assertText('target for the SimpleTest');
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
+        $this->assertTitle('Simple test target file');
+        $this->assertTitle(new PatternExpectation('/target file/'));
+        $this->assertResponse(200);
+        $this->assertMime('text/html');
+        $this->assertHeader('connection', 'close');
+        $this->assertHeader('connection', new PatternExpectation('/los/'));
+    }
+
+    function testSlowGet() {
+        $this->assertTrue($this->get($this->samples() . 'slow_page.php'));
+    }
+
+    function testTimedOutGet() {
+        $this->setConnectionTimeout(1);
+        $this->ignoreErrors();
+        $this->assertFalse($this->get($this->samples() . 'slow_page.php'));
+    }
+
+    function testPost() {
+        $this->assertTrue($this->post($this->samples() . 'network_confirm.php'));
+        $this->assertText('target for the SimpleTest');
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+    }
+
+    function testGetWithData() {
+        $this->get($this->samples() . 'network_confirm.php', array("a" => "aaa"));
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
+        $this->assertText('a=[aaa]');
+    }
+
+    function testPostWithData() {
+        $this->post($this->samples() . 'network_confirm.php', array("a" => "aaa"));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('a=[aaa]');
+    }
+
+    function testPostWithRecursiveData() {
+        $this->post($this->samples() . 'network_confirm.php', array("a" => "aaa"));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('a=[aaa]');
+
+        $this->post($this->samples() . 'network_confirm.php', array("a[aa]" => "aaa"));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('a=[aa=[aaa]]');
+
+        $this->post($this->samples() . 'network_confirm.php', array("a[aa][aaa]" => "aaaa"));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('a=[aa=[aaa=[aaaa]]]');
+
+        $this->post($this->samples() . 'network_confirm.php', array("a" => array("aa" => "aaa")));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('a=[aa=[aaa]]');
+
+        $this->post($this->samples() . 'network_confirm.php', array("a" => array("aa" => array("aaa" => "aaaa"))));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('a=[aa=[aaa=[aaaa]]]');
+    }
+
+    function testRelativeGet() {
+        $this->get($this->samples() . 'link_confirm.php');
+        $this->assertTrue($this->get('network_confirm.php'));
+        $this->assertText('target for the SimpleTest');
+    }
+
+    function testRelativePost() {
+        $this->post($this->samples() . 'link_confirm.php', array('a' => '123'));
+        $this->assertTrue($this->post('network_confirm.php'));
+        $this->assertText('target for the SimpleTest');
+    }
+}
+
+class TestOfLinkFollowing extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testLinkAssertions() {
+        $this->get($this->samples() . 'link_confirm.php');
+        $this->assertLink('Absolute', $this->samples() . 'network_confirm.php');
+        $this->assertLink('Absolute', new PatternExpectation('/confirm/'));
+        $this->assertClickable('Absolute');
+    }
+
+    function testAbsoluteLinkFollowing() {
+        $this->get($this->samples() . 'link_confirm.php');
+        $this->assertTrue($this->clickLink('Absolute'));
+        $this->assertText('target for the SimpleTest');
+    }
+
+    function testRelativeLinkFollowing() {
+        $this->get($this->samples() . 'link_confirm.php');
+        $this->assertTrue($this->clickLink('Relative'));
+        $this->assertText('target for the SimpleTest');
+    }
+
+    function testLinkIdFollowing() {
+        $this->get($this->samples() . 'link_confirm.php');
+        $this->assertLinkById(1);
+        $this->assertTrue($this->clickLinkById(1));
+        $this->assertText('target for the SimpleTest');
+    }
+
+    function testAbsoluteUrlBehavesAbsolutely() {
+        $this->get($this->samples() . 'link_confirm.php');
+        $this->get('http://www.lastcraft.com');
+        $this->assertText('No guarantee of quality is given or even intended');
+    }
+
+    function testRelativeUrlRespectsBaseTag() {
+        $this->get($this->samples() . 'base_tag/base_link.html');
+        $this->click('Back to test pages');
+        $this->assertTitle('Simple test target file');
+    }
+}
+
+class TestOfLivePageLinkingWithMinimalLinks extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testClickToExplicitelyNamedSelfReturns() {
+        $this->get($this->samples() . 'front_controller_style/a_page.php');
+        $this->assertEqual($this->getUrl(), $this->samples() . 'front_controller_style/a_page.php');
+        $this->assertTitle('Simple test page with links');
+        $this->assertLink('Self');
+        $this->clickLink('Self');
+        $this->assertTitle('Simple test page with links');
+    }
+
+    function testClickToMissingPageReturnsToSamePage() {
+        $this->get($this->samples() . 'front_controller_style/a_page.php');
+        $this->clickLink('No page');
+        $this->assertTitle('Simple test page with links');
+        $this->assertText('[action=no_page]');
+    }
+
+    function testClickToBareActionReturnsToSamePage() {
+        $this->get($this->samples() . 'front_controller_style/a_page.php');
+        $this->clickLink('Bare action');
+        $this->assertTitle('Simple test page with links');
+        $this->assertText('[action=]');
+    }
+
+    function testClickToSingleQuestionMarkReturnsToSamePage() {
+        $this->get($this->samples() . 'front_controller_style/a_page.php');
+        $this->clickLink('Empty query');
+        $this->assertTitle('Simple test page with links');
+    }
+
+    function testClickToEmptyStringReturnsToSamePage() {
+        $this->get($this->samples() . 'front_controller_style/a_page.php');
+        $this->clickLink('Empty link');
+        $this->assertTitle('Simple test page with links');
+    }
+
+    function testClickToSingleDotGoesToCurrentDirectory() {
+        $this->get($this->samples() . 'front_controller_style/a_page.php');
+        $this->clickLink('Current directory');
+        $this->assertTitle(
+                'Simple test front controller',
+                '%s -> index.php needs to be set as a default web server home page');
+    }
+
+    function testClickBackADirectoryLevel() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->clickLink('Down one');
+        $this->assertPattern('|Index of .*?/test|i');
+    }
+}
+
+class TestOfLiveFrontControllerEmulation extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testJumpToNamedPage() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->assertText('Simple test front controller');
+        $this->clickLink('Index');
+        $this->assertResponse(200);
+        $this->assertText('[action=index]');
+    }
+
+    function testJumpToUnnamedPage() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->clickLink('No page');
+        $this->assertResponse(200);
+        $this->assertText('Simple test front controller');
+        $this->assertText('[action=no_page]');
+    }
+
+    function testJumpToUnnamedPageWithBareParameter() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->clickLink('Bare action');
+        $this->assertResponse(200);
+        $this->assertText('Simple test front controller');
+        $this->assertText('[action=]');
+    }
+
+    function testJumpToUnnamedPageWithEmptyQuery() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->clickLink('Empty query');
+        $this->assertResponse(200);
+        $this->assertPattern('/Simple test front controller/');
+        $this->assertPattern('/raw get data.*?\[\].*?get data/si');
+    }
+
+    function testJumpToUnnamedPageWithEmptyLink() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->clickLink('Empty link');
+        $this->assertResponse(200);
+        $this->assertPattern('/Simple test front controller/');
+        $this->assertPattern('/raw get data.*?\[\].*?get data/si');
+    }
+
+    function testJumpBackADirectoryLevel() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->clickLink('Down one');
+        $this->assertPattern('|Index of .*?/test|');
+    }
+
+    function testSubmitToNamedPage() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->assertText('Simple test front controller');
+        $this->clickSubmit('Index');
+        $this->assertResponse(200);
+        $this->assertText('[action=Index]');
+    }
+
+    function testSubmitToSameDirectory() {
+        $this->get($this->samples() . 'front_controller_style/index.php');
+        $this->clickSubmit('Same directory');
+        $this->assertResponse(200);
+        $this->assertText('[action=Same+directory]');
+    }
+
+    function testSubmitToEmptyAction() {
+        $this->get($this->samples() . 'front_controller_style/index.php');
+        $this->clickSubmit('Empty action');
+        $this->assertResponse(200);
+        $this->assertText('[action=Empty+action]');
+    }
+
+    function testSubmitToNoAction() {
+        $this->get($this->samples() . 'front_controller_style/index.php');
+        $this->clickSubmit('No action');
+        $this->assertResponse(200);
+        $this->assertText('[action=No+action]');
+    }
+
+    function testSubmitBackADirectoryLevel() {
+        $this->get($this->samples() . 'front_controller_style/');
+        $this->clickSubmit('Down one');
+        $this->assertPattern('|Index of .*?/test|');
+    }
+
+    function testSubmitToNamedPageWithMixedPostAndGet() {
+        $this->get($this->samples() . 'front_controller_style/?a=A');
+        $this->assertText('Simple test front controller');
+        $this->clickSubmit('Index post');
+        $this->assertText('action=[Index post]');
+        $this->assertNoText('[a=A]');
+    }
+
+    function testSubmitToSameDirectoryMixedPostAndGet() {
+        $this->get($this->samples() . 'front_controller_style/index.php?a=A');
+        $this->clickSubmit('Same directory post');
+        $this->assertText('action=[Same directory post]');
+        $this->assertNoText('[a=A]');
+    }
+
+    function testSubmitToEmptyActionMixedPostAndGet() {
+        $this->get($this->samples() . 'front_controller_style/index.php?a=A');
+        $this->clickSubmit('Empty action post');
+        $this->assertText('action=[Empty action post]');
+        $this->assertText('[a=A]');
+    }
+
+    function testSubmitToNoActionMixedPostAndGet() {
+        $this->get($this->samples() . 'front_controller_style/index.php?a=A');
+        $this->clickSubmit('No action post');
+        $this->assertText('action=[No action post]');
+        $this->assertText('[a=A]');
+    }
+}
+
+class TestOfLiveHeaders extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testConfirmingHeaderExistence() {
+        $this->get('http://www.lastcraft.com/');
+        $this->assertHeader('content-type');
+        $this->assertHeader('content-type', 'text/html');
+        $this->assertHeader('content-type', new PatternExpectation('/HTML/i'));
+        $this->assertNoHeader('WWW-Authenticate');
+    }
+}
+
+class TestOfLiveRedirects extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testNoRedirects() {
+        $this->setMaximumRedirects(0);
+        $this->get($this->samples() . 'redirect.php');
+        $this->assertTitle('Redirection test');
+    }
+
+    function testRedirects() {
+        $this->setMaximumRedirects(1);
+        $this->get($this->samples() . 'redirect.php');
+        $this->assertTitle('Simple test target file');
+    }
+
+    function testRedirectLosesGetData() {
+        $this->get($this->samples() . 'redirect.php', array('a' => 'aaa'));
+        $this->assertNoText('a=[aaa]');
+    }
+
+    function testRedirectKeepsExtraRequestDataOfItsOwn() {
+        $this->get($this->samples() . 'redirect.php');
+        $this->assertText('r=[rrr]');
+    }
+
+    function testRedirectLosesPostData() {
+        $this->post($this->samples() . 'redirect.php', array('a' => 'aaa'));
+        $this->assertTitle('Simple test target file');
+        $this->assertNoText('a=[aaa]');
+    }
+
+    function testRedirectWithBaseUrlChange() {
+        $this->get($this->samples() . 'base_change_redirect.php');
+        $this->assertTitle('Simple test target file in folder');
+        $this->get($this->samples() . 'path/base_change_redirect.php');
+        $this->assertTitle('Simple test target file');
+    }
+
+    function testRedirectWithDoubleBaseUrlChange() {
+        $this->get($this->samples() . 'double_base_change_redirect.php');
+        $this->assertTitle('Simple test target file');
+    }
+}
+
+class TestOfLiveCookies extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function here() {
+        return new SimpleUrl($this->samples());
+    }
+
+    function thisHost() {
+        $here = $this->here();
+        return $here->getHost();
+    }
+
+    function thisPath() {
+        $here = $this->here();
+        return $here->getPath();
+    }
+
+    function testCookieSettingAndAssertions() {
+        $this->setCookie('a', 'Test cookie a');
+        $this->setCookie('b', 'Test cookie b', $this->thisHost());
+        $this->setCookie('c', 'Test cookie c', $this->thisHost(), $this->thisPath());
+        $this->get($this->samples() . 'network_confirm.php');
+        $this->assertText('Test cookie a');
+        $this->assertText('Test cookie b');
+        $this->assertText('Test cookie c');
+        $this->assertCookie('a');
+        $this->assertCookie('b', 'Test cookie b');
+        $this->assertTrue($this->getCookie('c') == 'Test cookie c');
+    }
+
+    function testNoCookieSetWhenCookiesDisabled() {
+        $this->setCookie('a', 'Test cookie a');
+        $this->ignoreCookies();
+        $this->get($this->samples() . 'network_confirm.php');
+        $this->assertNoText('Test cookie a');
+    }
+
+    function testCookieReading() {
+        $this->get($this->samples() . 'set_cookies.php');
+        $this->assertCookie('session_cookie', 'A');
+        $this->assertCookie('short_cookie', 'B');
+        $this->assertCookie('day_cookie', 'C');
+    }
+
+    function testNoCookie() {
+        $this->assertNoCookie('aRandomCookie');
+    }
+
+    function testNoCookieReadingWhenCookiesDisabled() {
+        $this->ignoreCookies();
+        $this->get($this->samples() . 'set_cookies.php');
+        $this->assertNoCookie('session_cookie');
+        $this->assertNoCookie('short_cookie');
+        $this->assertNoCookie('day_cookie');
+    }
+
+    function testCookiePatternAssertions() {
+        $this->get($this->samples() . 'set_cookies.php');
+        $this->assertCookie('session_cookie', new PatternExpectation('/a/i'));
+    }
+
+    function testTemporaryCookieExpiry() {
+        $this->get($this->samples() . 'set_cookies.php');
+        $this->restart();
+        $this->assertNoCookie('session_cookie');
+        $this->assertCookie('day_cookie', 'C');
+    }
+
+    function testTimedCookieExpiryWith100SecondMargin() {
+        $this->get($this->samples() . 'set_cookies.php');
+        $this->ageCookies(3600);
+        $this->restart(time() + 100);
+        $this->assertNoCookie('session_cookie');
+        $this->assertNoCookie('hour_cookie');
+        $this->assertCookie('day_cookie', 'C');
+    }
+
+    function testNoClockOverDriftBy100Seconds() {
+        $this->get($this->samples() . 'set_cookies.php');
+        $this->restart(time() + 200);
+        $this->assertNoCookie(
+                'short_cookie',
+                '%s -> Please check your computer clock setting if you are not using NTP');
+    }
+
+    function testNoClockUnderDriftBy100Seconds() {
+        $this->get($this->samples() . 'set_cookies.php');
+        $this->restart(time() + 0);
+        $this->assertCookie(
+                'short_cookie',
+                'B',
+                '%s -> Please check your computer clock setting if you are not using NTP');
+    }
+
+    function testCookiePath() {
+        $this->get($this->samples() . 'set_cookies.php');
+        $this->assertNoCookie('path_cookie', 'D');
+        $this->get('./path/show_cookies.php');
+        $this->assertPattern('/path_cookie/');
+        $this->assertCookie('path_cookie', 'D');
+    }
+}
+
+class LiveTestOfForms extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testSimpleSubmit() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('go=[Go!]');
+    }
+
+    function testDefaultFormValues() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertFieldByName('a', '');
+        $this->assertFieldByName('b', 'Default text');
+        $this->assertFieldByName('c', '');
+        $this->assertFieldByName('d', 'd1');
+        $this->assertFieldByName('e', false);
+        $this->assertFieldByName('f', 'on');
+        $this->assertFieldByName('g', 'g3');
+        $this->assertFieldByName('h', 2);
+        $this->assertFieldByName('go', 'Go!');
+        $this->assertClickable('Go!');
+        $this->assertSubmit('Go!');
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('go=[Go!]');
+        $this->assertText('a=[]');
+        $this->assertText('b=[Default text]');
+        $this->assertText('c=[]');
+        $this->assertText('d=[d1]');
+        $this->assertNoText('e=[');
+        $this->assertText('f=[on]');
+        $this->assertText('g=[g3]');
+    }
+
+    function testFormSubmissionByButtonLabel() {
+        $this->get($this->samples() . 'form.html');
+        $this->setFieldByName('a', 'aaa');
+        $this->setFieldByName('b', 'bbb');
+        $this->setFieldByName('c', 'ccc');
+        $this->setFieldByName('d', 'D2');
+        $this->setFieldByName('e', 'on');
+        $this->setFieldByName('f', false);
+        $this->setFieldByName('g', 'g2');
+        $this->setFieldByName('h', 1);
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('a=[aaa]');
+        $this->assertText('b=[bbb]');
+        $this->assertText('c=[ccc]');
+        $this->assertText('d=[d2]');
+        $this->assertText('e=[on]');
+        $this->assertNoText('f=[');
+        $this->assertText('g=[g2]');
+    }
+
+    function testAdditionalFormValues() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickSubmit('Go!', array('add' => 'A')));
+        $this->assertText('go=[Go!]');
+        $this->assertText('add=[A]');
+    }
+
+    function testFormSubmissionByName() {
+        $this->get($this->samples() . 'form.html');
+        $this->setFieldByName('a', 'A');
+        $this->assertTrue($this->clickSubmitByName('go'));
+        $this->assertText('a=[A]');
+    }
+
+    function testFormSubmissionByNameAndAdditionalParameters() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickSubmitByName('go', array('add' => 'A')));
+        $this->assertText('go=[Go!]');
+        $this->assertText('add=[A]');
+    }
+
+    function testFormSubmissionBySubmitButtonLabeledSubmit() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickSubmitByName('test'));
+        $this->assertText('test=[Submit]');
+    }
+
+    function testFormSubmissionWithIds() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertFieldById(1, '');
+        $this->assertFieldById(2, 'Default text');
+        $this->assertFieldById(3, '');
+        $this->assertFieldById(4, 'd1');
+        $this->assertFieldById(5, false);
+        $this->assertFieldById(6, 'on');
+        $this->assertFieldById(8, 'g3');
+        $this->assertFieldById(11, 2);
+        $this->setFieldById(1, 'aaa');
+        $this->setFieldById(2, 'bbb');
+        $this->setFieldById(3, 'ccc');
+        $this->setFieldById(4, 'D2');
+        $this->setFieldById(5, 'on');
+        $this->setFieldById(6, false);
+        $this->setFieldById(8, 'g2');
+        $this->setFieldById(11, 'H1');
+        $this->assertTrue($this->clickSubmitById(99));
+        $this->assertText('a=[aaa]');
+        $this->assertText('b=[bbb]');
+        $this->assertText('c=[ccc]');
+        $this->assertText('d=[d2]');
+        $this->assertText('e=[on]');
+        $this->assertNoText('f=[');
+        $this->assertText('g=[g2]');
+        $this->assertText('h=[1]');
+        $this->assertText('go=[Go!]');
+    }
+
+    function testFormSubmissionWithIdsAndAdditionnalData() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickSubmitById(99, array('additionnal' => "data")));
+        $this->assertText('additionnal=[data]');
+    }
+
+    function testFormSubmissionWithLabels() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertField('Text A', '');
+        $this->assertField('Text B', 'Default text');
+        $this->assertField('Text area C', '');
+        $this->assertField('Selection D', 'd1');
+        $this->assertField('Checkbox E', false);
+        $this->assertField('Checkbox F', 'on');
+        $this->assertField('3', 'g3');
+        $this->assertField('Selection H', 2);
+        $this->setField('Text A', 'aaa');
+        $this->setField('Text B', 'bbb');
+        $this->setField('Text area C', 'ccc');
+        $this->setField('Selection D', 'D2');
+        $this->setField('Checkbox E', 'on');
+        $this->setField('Checkbox F', false);
+        $this->setField('2', 'g2');
+        $this->setField('Selection H', 'H1');
+        $this->clickSubmit('Go!');
+        $this->assertText('a=[aaa]');
+        $this->assertText('b=[bbb]');
+        $this->assertText('c=[ccc]');
+        $this->assertText('d=[d2]');
+        $this->assertText('e=[on]');
+        $this->assertNoText('f=[');
+        $this->assertText('g=[g2]');
+        $this->assertText('h=[1]');
+        $this->assertText('go=[Go!]');
+    }
+
+    function testSettingCheckboxWithBooleanTrueSetsUnderlyingValue() {
+        $this->get($this->samples() . 'form.html');
+        $this->setField('Checkbox E', true);
+        $this->assertField('Checkbox E', 'on');
+        $this->clickSubmit('Go!');
+        $this->assertText('e=[on]');
+    }
+
+    function testFormSubmissionWithMixedPostAndGet() {
+        $this->get($this->samples() . 'form_with_mixed_post_and_get.html');
+        $this->setField('Text A', 'Hello');
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('a=[Hello]');
+        $this->assertText('x=[X]');
+        $this->assertText('y=[Y]');
+    }
+
+    function testFormSubmissionWithMixedPostAndEncodedGet() {
+        $this->get($this->samples() . 'form_with_mixed_post_and_get.html');
+        $this->setField('Text B', 'Hello');
+        $this->assertTrue($this->clickSubmit('Go encoded!'));
+        $this->assertText('b=[Hello]');
+        $this->assertText('x=[X]');
+        $this->assertText('y=[Y]');
+    }
+
+    function testFormSubmissionWithoutAction() {
+        $this->get($this->samples() . 'form_without_action.php?test=test');
+        $this->assertText('_GET : [test]');
+        $this->assertTrue($this->clickSubmit('Submit Post With Empty Action'));
+        $this->assertText('_GET : [test]');
+        $this->assertText('_POST : [test]');
+    }
+
+    function testImageSubmissionByLabel() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertImage('Image go!');
+        $this->assertTrue($this->clickImage('Image go!', 10, 12));
+        $this->assertText('go_x=[10]');
+        $this->assertText('go_y=[12]');
+    }
+
+    function testImageSubmissionByLabelWithAdditionalParameters() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickImage('Image go!', 10, 12, array('add' => 'A')));
+        $this->assertText('add=[A]');
+    }
+
+    function testImageSubmissionByName() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickImageByName('go', 10, 12));
+        $this->assertText('go_x=[10]');
+        $this->assertText('go_y=[12]');
+    }
+
+    function testImageSubmissionById() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickImageById(97, 10, 12));
+        $this->assertText('go_x=[10]');
+        $this->assertText('go_y=[12]');
+    }
+
+    function testButtonSubmissionByLabel() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickSubmit('Button go!', 10, 12));
+        $this->assertPattern('/go=\[ButtonGo\]/s');
+    }
+
+    function testNamelessSubmitSendsNoValue() {
+        $this->get($this->samples() . 'form_with_unnamed_submit.html');
+        $this->click('Go!');
+        $this->assertNoText('Go!');
+        $this->assertNoText('submit');
+    }
+
+    function testNamelessImageSendsXAndYValues() {
+        $this->get($this->samples() . 'form_with_unnamed_submit.html');
+        $this->clickImage('Image go!', 4, 5);
+        $this->assertNoText('ImageGo');
+        $this->assertText('x=[4]');
+        $this->assertText('y=[5]');
+    }
+
+    function testNamelessButtonSendsNoValue() {
+        $this->get($this->samples() . 'form_with_unnamed_submit.html');
+        $this->click('Button Go!');
+        $this->assertNoText('ButtonGo');
+    }
+
+    function testSelfSubmit() {
+        $this->get($this->samples() . 'self_form.php');
+        $this->assertNoText('[Submitted]');
+        $this->assertNoText('[Wrong form]');
+        $this->assertTrue($this->clickSubmit());
+        $this->assertText('[Submitted]');
+        $this->assertNoText('[Wrong form]');
+        $this->assertTitle('Test of form self submission');
+    }
+
+    function testSelfSubmitWithParameters() {
+        $this->get($this->samples() . 'self_form.php');
+        $this->setFieldByName('visible', 'Resent');
+        $this->assertTrue($this->clickSubmit());
+        $this->assertText('[Resent]');
+    }
+
+    function testSettingOfBlankOption() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->setFieldByName('d', ''));
+        $this->clickSubmit('Go!');
+        $this->assertText('d=[]');
+    }
+
+    function testAssertingFieldValueWithPattern() {
+        $this->get($this->samples() . 'form.html');
+        $this->setField('c', 'A very long string');
+        $this->assertField('c', new PatternExpectation('/very long/'));
+    }
+
+    function testSendingMultipartFormDataEncodedForm() {
+        $this->get($this->samples() . 'form_data_encoded_form.html');
+        $this->assertField('Text A', '');
+        $this->assertField('Text B', 'Default text');
+        $this->assertField('Text area C', '');
+        $this->assertField('Selection D', 'd1');
+        $this->assertField('Checkbox E', false);
+        $this->assertField('Checkbox F', 'on');
+        $this->assertField('3', 'g3');
+        $this->assertField('Selection H', 2);
+        $this->setField('Text A', 'aaa');
+        $this->setField('Text B', 'bbb');
+        $this->setField('Text area C', 'ccc');
+        $this->setField('Selection D', 'D2');
+        $this->setField('Checkbox E', 'on');
+        $this->setField('Checkbox F', false);
+        $this->setField('2', 'g2');
+        $this->setField('Selection H', 'H1');
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('a=[aaa]');
+        $this->assertText('b=[bbb]');
+        $this->assertText('c=[ccc]');
+        $this->assertText('d=[d2]');
+        $this->assertText('e=[on]');
+        $this->assertNoText('f=[');
+        $this->assertText('g=[g2]');
+        $this->assertText('h=[1]');
+        $this->assertText('go=[Go!]');
+    }
+
+    function testSettingVariousBlanksInFields() {
+        $this->get($this->samples() . 'form_with_false_defaults.html');
+        $this->assertField('Text A', '');
+        $this->setField('Text A', '0');
+        $this->assertField('Text A', '0');
+        $this->assertField('Text area B', '');
+        $this->setField('Text area B', '0');
+        $this->assertField('Text area B', '0');
+        $this->assertField('Selection D', '');
+        $this->setField('Selection D', 'D2');
+        $this->assertField('Selection D', 'D2');
+        $this->setField('Selection D', 'D3');
+        $this->assertField('Selection D', '0');
+        $this->setField('Selection D', 'D4');
+        $this->assertField('Selection D', '?');
+        $this->assertField('Checkbox E', '');
+        $this->assertField('Checkbox F', 'on');
+        $this->assertField('Checkbox G', '0');
+        $this->assertField('Checkbox H', '?');
+        $this->assertFieldByName('i', 'on');
+        $this->setFieldByName('i', '');
+        $this->assertFieldByName('i', '');
+        $this->setFieldByName('i', '0');
+        $this->assertFieldByName('i', '0');
+        $this->setFieldByName('i', '?');
+        $this->assertFieldByName('i', '?');
+    }
+
+    function testDefaultValueOfTextareaHasNewlinesAndWhitespacePreserved() {
+        $this->get($this->samples() . 'form_with_false_defaults.html');
+        $this->assertField('Text area C', '                ');
+    }
+
+    function chars($t) {
+        for ($i = 0; $i < strlen($t); $i++) {
+            print "[$t[$i]]";
+        }
+    }
+
+    function testSubmissionOfBlankFields() {
+        $this->get($this->samples() . 'form_with_false_defaults.html');
+        $this->setField('Text A', '');
+        $this->setField('Text area B', '');
+        $this->setFieldByName('i', '');
+        $this->click('Go!');
+        $this->assertText('a=[]');
+        $this->assertText('b=[]');
+        $this->assertText('d=[]');
+        $this->assertText('e=[]');
+        $this->assertText('i=[]');
+    }
+
+    function testDefaultValueOfTextareaHasNewlinesAndWhitespacePreservedOnSubmission() {
+        $this->get($this->samples() . 'form_with_false_defaults.html');
+        $this->click('Go!');
+        $this->assertPattern('/c=\[                \]/');
+    }
+
+    function testSubmissionOfEmptyValues() {
+        $this->get($this->samples() . 'form_with_false_defaults.html');
+        $this->setField('Selection D', 'D2');
+        $this->click('Go!');
+        $this->assertText('a=[]');
+        $this->assertText('b=[]');
+        $this->assertText('d=[D2]');
+        $this->assertText('f=[on]');
+        $this->assertText('i=[on]');
+    }
+
+    function testSubmissionOfZeroes() {
+        $this->get($this->samples() . 'form_with_false_defaults.html');
+        $this->setField('Text A', '0');
+        $this->setField('Text area B', '0');
+        $this->setField('Selection D', 'D3');
+        $this->setFieldByName('i', '0');
+        $this->click('Go!');
+        $this->assertText('a=[0]');
+        $this->assertText('b=[0]');
+        $this->assertText('d=[0]');
+        $this->assertText('g=[0]');
+        $this->assertText('i=[0]');
+    }
+
+    function testSubmissionOfQuestionMarks() {
+        $this->get($this->samples() . 'form_with_false_defaults.html');
+        $this->setField('Text A', '?');
+        $this->setField('Text area B', '?');
+        $this->setField('Selection D', 'D4');
+        $this->setFieldByName('i', '?');
+        $this->click('Go!');
+        $this->assertText('a=[?]');
+        $this->assertText('b=[?]');
+        $this->assertText('d=[?]');
+        $this->assertText('h=[?]');
+        $this->assertText('i=[?]');
+    }
+
+    function testSubmissionOfHtmlEncodedValues() {
+        $this->get($this->samples() . 'form_with_tricky_defaults.html');
+        $this->assertField('Text A', '&\'"<>');
+        $this->assertField('Text B', '"');
+        $this->assertField('Text area C', '&\'"<>');
+        $this->assertField('Selection D', "'");
+        $this->assertField('Checkbox E', '&\'"<>');
+        $this->assertField('Checkbox F', false);
+        $this->assertFieldByname('i', "'");
+        $this->click('Go!');
+        $this->assertText('a=[&\'"<>, "]');
+        $this->assertText('c=[&\'"<>]');
+        $this->assertText("d=[']");
+        $this->assertText('e=[&\'"<>]');
+        $this->assertText("i=[']");
+    }
+
+    function testFormActionRespectsBaseTag() {
+        $this->get($this->samples() . 'base_tag/form.html');
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('go=[Go!]');
+        $this->assertText('a=[]');
+    }
+}
+
+class TestOfLiveMultiValueWidgets extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testDefaultFormValueSubmission() {
+        $this->get($this->samples() . 'multiple_widget_form.html');
+        $this->assertFieldByName('a', array('a2', 'a3'));
+        $this->assertFieldByName('b', array('b2', 'b3'));
+        $this->assertFieldByName('c[]', array('c2', 'c3'));
+        $this->assertFieldByName('d', array('2', '3'));
+        $this->assertFieldByName('e', array('2', '3'));
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('a=[a2, a3]');
+        $this->assertText('b=[b2, b3]');
+        $this->assertText('c=[c2, c3]');
+        $this->assertText('d=[2, 3]');
+        $this->assertText('e=[2, 3]');
+    }
+
+    function testSubmittingMultipleValues() {
+        $this->get($this->samples() . 'multiple_widget_form.html');
+        $this->setFieldByName('a', array('a1', 'a4'));
+        $this->assertFieldByName('a', array('a1', 'a4'));
+        $this->assertFieldByName('a', array('a4', 'a1'));
+        $this->setFieldByName('b', array('b1', 'b4'));
+        $this->assertFieldByName('b', array('b1', 'b4'));
+        $this->setFieldByName('c[]', array('c1', 'c4'));
+        $this->assertField('c[]', array('c1', 'c4'));
+        $this->setFieldByName('d', array('1', '4'));
+        $this->assertField('d', array('1', '4'));
+        $this->setFieldByName('e', array('e1', 'e4'));
+        $this->assertField('e', array('1', '4'));
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('a=[a1, a4]');
+        $this->assertText('b=[b1, b4]');
+        $this->assertText('c=[c1, c4]');
+        $this->assertText('d=[1, 4]');
+        $this->assertText('e=[1, 4]');
+    }
+
+    function testSettingByOptionValue() {
+        $this->get($this->samples() . 'multiple_widget_form.html');
+        $this->setFieldByName('d', array('1', '4'));
+        $this->assertField('d', array('1', '4'));
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('d=[1, 4]');
+    }
+
+    function testSubmittingMultipleValuesByLabel() {
+        $this->get($this->samples() . 'multiple_widget_form.html');
+        $this->setField('Multiple selection A', array('a1', 'a4'));
+        $this->assertField('Multiple selection A', array('a1', 'a4'));
+        $this->assertField('Multiple selection A', array('a4', 'a1'));
+        $this->setField('multiple selection C', array('c1', 'c4'));
+        $this->assertField('multiple selection C', array('c1', 'c4'));
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('a=[a1, a4]');
+        $this->assertText('c=[c1, c4]');
+    }
+
+    function testSavantStyleHiddenFieldDefaults() {
+        $this->get($this->samples() . 'savant_style_form.html');
+        $this->assertFieldByName('a', array('a0'));
+        $this->assertFieldByName('b', array('b0'));
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('a=[a0]');
+        $this->assertText('b=[b0]');
+    }
+
+    function testSavantStyleHiddenDefaultsAreOverridden() {
+        $this->get($this->samples() . 'savant_style_form.html');
+        $this->assertTrue($this->setFieldByName('a', array('a1')));
+        $this->assertTrue($this->setFieldByName('b', 'b1'));
+        $this->assertTrue($this->clickSubmit('Go!'));
+        $this->assertText('a=[a1]');
+        $this->assertText('b=[b1]');
+    }
+
+    function testSavantStyleFormSettingById() {
+        $this->get($this->samples() . 'savant_style_form.html');
+        $this->assertFieldById(1, array('a0'));
+        $this->assertFieldById(4, array('b0'));
+        $this->assertTrue($this->setFieldById(2, 'a1'));
+        $this->assertTrue($this->setFieldById(5, 'b1'));
+        $this->assertTrue($this->clickSubmitById(99));
+        $this->assertText('a=[a1]');
+        $this->assertText('b=[b1]');
+    }
+}
+
+class TestOfFileUploads extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testSingleFileUpload() {
+        $this->get($this->samples() . 'upload_form.html');
+        $this->assertTrue($this->setField('Content:',
+                dirname(__FILE__) . '/support/upload_sample.txt'));
+        $this->assertField('Content:', dirname(__FILE__) . '/support/upload_sample.txt');
+        $this->click('Go!');
+        $this->assertText('Sample for testing file upload');
+    }
+
+    function testMultipleFileUpload() {
+        $this->get($this->samples() . 'upload_form.html');
+        $this->assertTrue($this->setField('Content:',
+                dirname(__FILE__) . '/support/upload_sample.txt'));
+        $this->assertTrue($this->setField('Supplemental:',
+                dirname(__FILE__) . '/support/supplementary_upload_sample.txt'));
+        $this->assertField('Supplemental:',
+                dirname(__FILE__) . '/support/supplementary_upload_sample.txt');
+        $this->click('Go!');
+        $this->assertText('Sample for testing file upload');
+        $this->assertText('Some more text content');
+    }
+
+    function testBinaryFileUpload() {
+        $this->get($this->samples() . 'upload_form.html');
+        $this->assertTrue($this->setField('Content:',
+                dirname(__FILE__) . '/support/latin1_sample'));
+        $this->click('Go!');
+        $this->assertText(
+                implode('', file(dirname(__FILE__) . '/support/latin1_sample')));
+    }
+}
+
+class TestOfLiveHistoryNavigation extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testRetry() {
+        $this->get($this->samples() . 'cookie_based_counter.php');
+        $this->assertPattern('/count: 1/i');
+        $this->retry();
+        $this->assertPattern('/count: 2/i');
+        $this->retry();
+        $this->assertPattern('/count: 3/i');
+    }
+
+    function testOfBackButton() {
+        $this->get($this->samples() . '1.html');
+        $this->clickLink('2');
+        $this->assertTitle('2');
+        $this->assertTrue($this->back());
+        $this->assertTitle('1');
+        $this->assertTrue($this->forward());
+        $this->assertTitle('2');
+        $this->assertFalse($this->forward());
+    }
+
+    function testGetRetryResubmitsData() {
+        $this->assertTrue($this->get(
+                $this->samples() . 'network_confirm.php?a=aaa'));
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
+        $this->assertText('a=[aaa]');
+        $this->retry();
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
+        $this->assertText('a=[aaa]');
+    }
+
+    function testGetRetryResubmitsExtraData() {
+        $this->assertTrue($this->get(
+                $this->samples() . 'network_confirm.php',
+                array('a' => 'aaa')));
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
+        $this->assertText('a=[aaa]');
+        $this->retry();
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
+        $this->assertText('a=[aaa]');
+    }
+
+    function testPostRetryResubmitsData() {
+        $this->assertTrue($this->post(
+                $this->samples() . 'network_confirm.php',
+                array('a' => 'aaa')));
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('a=[aaa]');
+        $this->retry();
+        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
+        $this->assertText('a=[aaa]');
+    }
+
+    function testGetRetryResubmitsRepeatedData() {
+        $this->assertTrue($this->get(
+                $this->samples() . 'network_confirm.php?a=1&a=2'));
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
+        $this->assertText('a=[1, 2]');
+        $this->retry();
+        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
+        $this->assertText('a=[1, 2]');
+    }
+}
+
+class TestOfLiveAuthentication extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testChallengeFromProtectedPage() {
+        $this->get($this->samples() . 'protected/');
+        $this->assertResponse(401);
+        $this->assertAuthentication('Basic');
+        $this->assertRealm('SimpleTest basic authentication');
+        $this->assertRealm(new PatternExpectation('/simpletest/i'));
+        $this->authenticate('test', 'secret');
+        $this->assertResponse(200);
+        $this->retry();
+        $this->assertResponse(200);
+    }
+
+    function testTrailingSlashImpliedWithinRealm() {
+        $this->get($this->samples() . 'protected/');
+        $this->authenticate('test', 'secret');
+        $this->assertResponse(200);
+        $this->get($this->samples() . 'protected');
+        $this->assertResponse(200);
+    }
+
+    function testTrailingSlashImpliedSettingRealm() {
+        $this->get($this->samples() . 'protected');
+        $this->authenticate('test', 'secret');
+        $this->assertResponse(200);
+        $this->get($this->samples() . 'protected/');
+        $this->assertResponse(200);
+    }
+
+    function testEncodedAuthenticationFetchesPage() {
+        $this->get('http://test:secret@www.lastcraft.com/test/protected/');
+        $this->assertResponse(200);
+    }
+
+    function testEncodedAuthenticationFetchesPageAfterTrailingSlashRedirect() {
+        $this->get('http://test:secret@www.lastcraft.com/test/protected');
+        $this->assertResponse(200);
+    }
+
+    function testRealmExtendsToWholeDirectory() {
+        $this->get($this->samples() . 'protected/1.html');
+        $this->authenticate('test', 'secret');
+        $this->clickLink('2');
+        $this->assertResponse(200);
+        $this->clickLink('3');
+        $this->assertResponse(200);
+    }
+
+    function testRedirectKeepsAuthentication() {
+        $this->get($this->samples() . 'protected/local_redirect.php');
+        $this->authenticate('test', 'secret');
+        $this->assertTitle('Simple test target file');
+    }
+
+    function testRedirectKeepsEncodedAuthentication() {
+        $this->get('http://test:secret@www.lastcraft.com/test/protected/local_redirect.php');
+        $this->assertResponse(200);
+        $this->assertTitle('Simple test target file');
+    }
+
+    function testSessionRestartLosesAuthentication() {
+        $this->get($this->samples() . 'protected/');
+        $this->authenticate('test', 'secret');
+        $this->assertResponse(200);
+        $this->restart();
+        $this->get($this->samples() . 'protected/');
+        $this->assertResponse(401);
+    }
+}
+
+class TestOfLoadingFrames extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testNoFramesContentWhenFramesDisabled() {
+        $this->ignoreFrames();
+        $this->get($this->samples() . 'one_page_frameset.html');
+        $this->assertTitle('Frameset for testing of SimpleTest');
+        $this->assertText('This content is for no frames only');
+    }
+
+    function testPatternMatchCanReadTheOnlyFrame() {
+        $this->get($this->samples() . 'one_page_frameset.html');
+        $this->assertText('A target for the SimpleTest test suite');
+        $this->assertNoText('This content is for no frames only');
+    }
+
+    function testMessyFramesetResponsesByName() {
+        $this->assertTrue($this->get(
+                $this->samples() . 'messy_frameset.html'));
+        $this->assertTitle('Frameset for testing of SimpleTest');
+
+        $this->assertTrue($this->setFrameFocus('Front controller'));
+        $this->assertResponse(200);
+        $this->assertText('Simple test front controller');
+
+        $this->assertTrue($this->setFrameFocus('One'));
+        $this->assertResponse(200);
+        $this->assertLink('2');
+
+        $this->assertTrue($this->setFrameFocus('Frame links'));
+        $this->assertResponse(200);
+        $this->assertLink('Set one to 2');
+
+        $this->assertTrue($this->setFrameFocus('Counter'));
+        $this->assertResponse(200);
+        $this->assertText('Count: 1');
+
+        $this->assertTrue($this->setFrameFocus('Redirected'));
+        $this->assertResponse(200);
+        $this->assertText('r=rrr');
+
+        $this->assertTrue($this->setFrameFocus('Protected'));
+        $this->assertResponse(401);
+
+        $this->assertTrue($this->setFrameFocus('Protected redirect'));
+        $this->assertResponse(401);
+
+        $this->assertTrue($this->setFrameFocusByIndex(1));
+        $this->assertResponse(200);
+        $this->assertText('Simple test front controller');
+
+        $this->assertTrue($this->setFrameFocusByIndex(2));
+        $this->assertResponse(200);
+        $this->assertLink('2');
+
+        $this->assertTrue($this->setFrameFocusByIndex(3));
+        $this->assertResponse(200);
+        $this->assertLink('Set one to 2');
+
+        $this->assertTrue($this->setFrameFocusByIndex(4));
+        $this->assertResponse(200);
+        $this->assertText('Count: 1');
+
+        $this->assertTrue($this->setFrameFocusByIndex(5));
+        $this->assertResponse(200);
+        $this->assertText('r=rrr');
+
+        $this->assertTrue($this->setFrameFocusByIndex(6));
+        $this->assertResponse(401);
+
+        $this->assertTrue($this->setFrameFocusByIndex(7));
+    }
+
+    function testReloadingFramesetPage() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->assertText('Count: 1');
+        $this->retry();
+        $this->assertText('Count: 2');
+        $this->retry();
+        $this->assertText('Count: 3');
+    }
+
+    function testReloadingSingleFrameWithCookieCounter() {
+        $this->get($this->samples() . 'counting_frameset.html');
+        $this->setFrameFocus('a');
+        $this->assertText('Count: 1');
+        $this->setFrameFocus('b');
+        $this->assertText('Count: 2');
+
+        $this->setFrameFocus('a');
+        $this->retry();
+        $this->assertText('Count: 3');
+        $this->retry();
+        $this->assertText('Count: 4');
+        $this->setFrameFocus('b');
+        $this->assertText('Count: 2');
+    }
+
+    function testReloadingFrameWhenUnfocusedReloadsWholeFrameset() {
+        $this->get($this->samples() . 'counting_frameset.html');
+        $this->setFrameFocus('a');
+        $this->assertText('Count: 1');
+        $this->setFrameFocus('b');
+        $this->assertText('Count: 2');
+
+        $this->clearFrameFocus('a');
+        $this->retry();
+
+        $this->assertTitle('Frameset for testing of SimpleTest');
+        $this->setFrameFocus('a');
+        $this->assertText('Count: 3');
+        $this->setFrameFocus('b');
+        $this->assertText('Count: 4');
+    }
+
+    function testClickingNormalLinkReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickLink('2');
+        $this->assertLink('3');
+        $this->assertText('Simple test front controller');
+    }
+
+    function testJumpToNamedPageReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->assertPattern('/Simple test front controller/');
+        $this->clickLink('Index');
+        $this->assertResponse(200);
+        $this->assertText('[action=index]');
+        $this->assertText('Count: 1');
+    }
+
+    function testJumpToUnnamedPageReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickLink('No page');
+        $this->assertResponse(200);
+        $this->assertText('Simple test front controller');
+        $this->assertText('[action=no_page]');
+        $this->assertText('Count: 1');
+    }
+
+    function testJumpToUnnamedPageWithBareParameterReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickLink('Bare action');
+        $this->assertResponse(200);
+        $this->assertText('Simple test front controller');
+        $this->assertText('[action=]');
+        $this->assertText('Count: 1');
+    }
+
+    function testJumpToUnnamedPageWithEmptyQueryReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickLink('Empty query');
+        $this->assertResponse(200);
+        $this->assertPattern('/Simple test front controller/');
+        $this->assertPattern('/raw get data.*?\[\].*?get data/si');
+        $this->assertPattern('/Count: 1/');
+    }
+
+    function testJumpToUnnamedPageWithEmptyLinkReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickLink('Empty link');
+        $this->assertResponse(200);
+        $this->assertPattern('/Simple test front controller/');
+        $this->assertPattern('/raw get data.*?\[\].*?get data/si');
+        $this->assertPattern('/Count: 1/');
+    }
+
+    function testJumpBackADirectoryLevelReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickLink('Down one');
+        $this->assertPattern('/index of .*\/test/i');
+        $this->assertPattern('/Count: 1/');
+    }
+
+    function testSubmitToNamedPageReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->assertPattern('/Simple test front controller/');
+        $this->clickSubmit('Index');
+        $this->assertResponse(200);
+        $this->assertText('[action=Index]');
+        $this->assertText('Count: 1');
+    }
+
+    function testSubmitToSameDirectoryReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickSubmit('Same directory');
+        $this->assertResponse(200);
+        $this->assertText('[action=Same+directory]');
+        $this->assertText('Count: 1');
+    }
+
+    function testSubmitToEmptyActionReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickSubmit('Empty action');
+        $this->assertResponse(200);
+        $this->assertText('[action=Empty+action]');
+        $this->assertText('Count: 1');
+    }
+
+    function testSubmitToNoActionReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickSubmit('No action');
+        $this->assertResponse(200);
+        $this->assertText('[action=No+action]');
+        $this->assertText('Count: 1');
+    }
+
+    function testSubmitBackADirectoryLevelReplacesJustThatFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickSubmit('Down one');
+        $this->assertPattern('/index of .*\/test/i');
+        $this->assertPattern('/Count: 1/');
+    }
+
+    function testTopLinkExitsFrameset() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->clickLink('Exit the frameset');
+        $this->assertTitle('Simple test target file');
+    }
+
+    function testLinkInOnePageCanLoadAnother() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->assertNoLink('3');
+        $this->clickLink('Set one to 2');
+        $this->assertLink('3');
+        $this->assertNoLink('2');
+        $this->assertTitle('Frameset for testing of SimpleTest');
+    }
+
+    function testFrameWithRelativeLinksRespectsBaseTagForThatPage() {
+        $this->get($this->samples() . 'base_tag/frameset.html');
+        $this->click('Back to test pages');
+        $this->assertTitle('Frameset for testing of SimpleTest');
+        $this->assertText('A target for the SimpleTest test suite');
+    }
+
+    function testRelativeLinkInFrameIsNotAffectedByFramesetBaseTag() {
+        $this->get($this->samples() . 'base_tag/frameset_with_base_tag.html');
+        $this->assertText('This is page 1');
+        $this->click('To page 2');
+        $this->assertTitle('Frameset for testing of SimpleTest');
+        $this->assertText('This is page 2');
+    }
+}
+
+class TestOfFrameAuthentication extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testUnauthenticatedFrameSendsChallenge() {
+        $this->get($this->samples() . 'protected/');
+        $this->setFrameFocus('Protected');
+        $this->assertAuthentication('Basic');
+        $this->assertRealm('SimpleTest basic authentication');
+        $this->assertResponse(401);
+    }
+
+    function testCanReadFrameFromAlreadyAuthenticatedRealm() {
+        $this->get($this->samples() . 'protected/');
+        $this->authenticate('test', 'secret');
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->setFrameFocus('Protected');
+        $this->assertResponse(200);
+        $this->assertText('A target for the SimpleTest test suite');
+    }
+
+    function testCanAuthenticateFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->setFrameFocus('Protected');
+        $this->authenticate('test', 'secret');
+        $this->assertResponse(200);
+        $this->assertText('A target for the SimpleTest test suite');
+        $this->clearFrameFocus();
+        $this->assertText('Count: 1');
+    }
+
+    function testCanAuthenticateRedirectedFrame() {
+        $this->get($this->samples() . 'messy_frameset.html');
+        $this->setFrameFocus('Protected redirect');
+        $this->assertResponse(401);
+        $this->authenticate('test', 'secret');
+        $this->assertResponse(200);
+        $this->assertText('A target for the SimpleTest test suite');
+        $this->clearFrameFocus();
+        $this->assertText('Count: 1');
+    }
+}
+
+class TestOfNestedFrames extends SimpleTestAcceptanceTest {
+    function setUp() {
+        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+    }
+
+    function testCanNavigateToSpecificContent() {
+        $this->get($this->samples() . 'nested_frameset.html');
+        $this->assertTitle('Nested frameset for testing of SimpleTest');
+
+        $this->assertPattern('/This is frame A/');
+        $this->assertPattern('/This is frame B/');
+        $this->assertPattern('/Simple test front controller/');
+        $this->assertLink('2');
+        $this->assertLink('Set one to 2');
+        $this->assertPattern('/Count: 1/');
+        $this->assertPattern('/r=rrr/');
+
+        $this->setFrameFocus('pair');
+        $this->assertPattern('/This is frame A/');
+        $this->assertPattern('/This is frame B/');
+        $this->assertNoPattern('/Simple test front controller/');
+        $this->assertNoLink('2');
+
+        $this->setFrameFocus('aaa');
+        $this->assertPattern('/This is frame A/');
+        $this->assertNoPattern('/This is frame B/');
+
+        $this->clearFrameFocus();
+        $this->assertResponse(200);
+        $this->setFrameFocus('messy');
+        $this->assertResponse(200);
+        $this->setFrameFocus('Front controller');
+        $this->assertResponse(200);
+        $this->assertPattern('/Simple test front controller/');
+        $this->assertNoLink('2');
+    }
+
+    function testReloadingFramesetPage() {
+        $this->get($this->samples() . 'nested_frameset.html');
+        $this->assertPattern('/Count: 1/');
+        $this->retry();
+        $this->assertPattern('/Count: 2/');
+        $this->retry();
+        $this->assertPattern('/Count: 3/');
+    }
+
+    function testRetryingNestedPageOnlyRetriesThatSet() {
+        $this->get($this->samples() . 'nested_frameset.html');
+        $this->assertPattern('/Count: 1/');
+        $this->setFrameFocus('messy');
+        $this->retry();
+        $this->assertPattern('/Count: 2/');
+        $this->setFrameFocus('Counter');
+        $this->retry();
+        $this->assertPattern('/Count: 3/');
+
+        $this->clearFrameFocus();
+        $this->setFrameFocus('messy');
+        $this->setFrameFocus('Front controller');
+        $this->retry();
+
+        $this->clearFrameFocus();
+        $this->assertPattern('/Count: 3/');
+    }
+
+    function testAuthenticatingNestedPage() {
+        $this->get($this->samples() . 'nested_frameset.html');
+        $this->setFrameFocus('messy');
+        $this->setFrameFocus('Protected');
+        $this->assertAuthentication('Basic');
+        $this->assertRealm('SimpleTest basic authentication');
+        $this->assertResponse(401);
+
+        $this->authenticate('test', 'secret');
+        $this->assertResponse(200);
+        $this->assertPattern('/A target for the SimpleTest test suite/');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/adapter_test.php b/3rdparty/simpletest/test/adapter_test.php
new file mode 100755
index 00000000000..c1a06a2f653
--- /dev/null
+++ b/3rdparty/simpletest/test/adapter_test.php
@@ -0,0 +1,50 @@
+<?php
+// $Id: adapter_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../extensions/pear_test_case.php');
+
+class SameTestClass {
+}
+
+class TestOfPearAdapter extends PHPUnit_TestCase {
+    
+    function testBoolean() {
+        $this->assertTrue(true, "PEAR true");
+        $this->assertFalse(false, "PEAR false");
+    }
+    
+    function testName() {
+        $this->assertTrue($this->getName() == get_class($this));
+    }
+    
+    function testPass() {
+        $this->pass("PEAR pass");
+    }
+    
+    function testNulls() {
+        $value = null;
+        $this->assertNull($value, "PEAR null");
+        $value = 0;
+        $this->assertNotNull($value, "PEAR not null");
+    }
+    
+    function testType() {
+        $this->assertType("Hello", "string", "PEAR type");
+    }
+    
+    function testEquals() {
+        $this->assertEquals(12, 12, "PEAR identity");
+        $this->setLooselyTyped(true);
+        $this->assertEquals("12", 12, "PEAR equality");
+    }
+    
+    function testSame() {
+        $same = new SameTestClass();
+        $this->assertSame($same, $same, "PEAR same");
+    }
+    
+    function testRegExp() {
+        $this->assertRegExp('/hello/', "A big hello from me", "PEAR regex");
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/all_tests.php b/3rdparty/simpletest/test/all_tests.php
new file mode 100755
index 00000000000..99ce9451e32
--- /dev/null
+++ b/3rdparty/simpletest/test/all_tests.php
@@ -0,0 +1,13 @@
+<?php
+require_once(dirname(__FILE__) . '/../autorun.php');
+
+class AllTests extends TestSuite {
+    function AllTests() {
+        $this->TestSuite('All tests for SimpleTest ' . SimpleTest::getVersion());
+        $this->addFile(dirname(__FILE__) . '/unit_tests.php');
+        $this->addFile(dirname(__FILE__) . '/shell_test.php');
+        $this->addFile(dirname(__FILE__) . '/live_test.php');
+        $this->addFile(dirname(__FILE__) . '/acceptance_test.php');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/arguments_test.php b/3rdparty/simpletest/test/arguments_test.php
new file mode 100755
index 00000000000..0cca4e99b24
--- /dev/null
+++ b/3rdparty/simpletest/test/arguments_test.php
@@ -0,0 +1,82 @@
+<?php
+// $Id: cookies_test.php 1506 2007-05-07 00:58:03Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../arguments.php');
+
+class TestOfCommandLineArgumentParsing extends UnitTestCase {
+    function testArgumentListWithJustProgramNameGivesFalseToEveryName() {
+        $arguments = new SimpleArguments(array('me'));
+        $this->assertIdentical($arguments->a, false);
+        $this->assertIdentical($arguments->all(), array());
+    }
+    
+    function testSingleArgumentNameRecordedAsTrue() {
+        $arguments = new SimpleArguments(array('me', '-a'));
+        $this->assertIdentical($arguments->a, true);
+    }
+    
+    function testSingleArgumentCanBeGivenAValue() {
+        $arguments = new SimpleArguments(array('me', '-a=AAA'));
+        $this->assertIdentical($arguments->a, 'AAA');
+    }
+    
+    function testSingleArgumentCanBeGivenSpaceSeparatedValue() {
+        $arguments = new SimpleArguments(array('me', '-a', 'AAA'));
+        $this->assertIdentical($arguments->a, 'AAA');
+    }
+    
+    function testWillBuildArrayFromRepeatedValue() {
+        $arguments = new SimpleArguments(array('me', '-a', 'A', '-a', 'AA'));
+        $this->assertIdentical($arguments->a, array('A', 'AA'));
+    }
+    
+    function testWillBuildArrayFromMultiplyRepeatedValues() {
+        $arguments = new SimpleArguments(array('me', '-a', 'A', '-a', 'AA', '-a', 'AAA'));
+        $this->assertIdentical($arguments->a, array('A', 'AA', 'AAA'));
+    }
+    
+    function testCanParseLongFormArguments() {
+        $arguments = new SimpleArguments(array('me', '--aa=AA', '--bb', 'BB'));
+        $this->assertIdentical($arguments->aa, 'AA');
+        $this->assertIdentical($arguments->bb, 'BB');
+    }
+    
+    function testGetsFullSetOfResultsAsHash() {
+        $arguments = new SimpleArguments(array('me', '-a', '-b=1', '-b', '2', '--aa=AA', '--bb', 'BB', '-c'));
+        $this->assertEqual($arguments->all(),
+                           array('a' => true, 'b' => array('1', '2'), 'aa' => 'AA', 'bb' => 'BB', 'c' => true));
+    }
+}
+
+class TestOfHelpOutput extends UnitTestCase {
+    function testDisplaysGeneralHelpBanner() {
+        $help = new SimpleHelp('Cool program');
+        $this->assertEqual($help->render(), "Cool program\n");
+    }
+    
+    function testDisplaysOnlySingleLineEndings() {
+        $help = new SimpleHelp("Cool program\n");
+        $this->assertEqual($help->render(), "Cool program\n");
+    }
+    
+    function testDisplaysHelpOnShortFlag() {
+        $help = new SimpleHelp('Cool program');
+        $help->explainFlag('a', 'Enables A');
+        $this->assertEqual($help->render(), "Cool program\n-a    Enables A\n");
+    }
+    
+    function testHasAtleastFourSpacesAfterLongestFlag() {
+        $help = new SimpleHelp('Cool program');
+        $help->explainFlag('a', 'Enables A');
+        $help->explainFlag('long', 'Enables Long');
+        $this->assertEqual($help->render(),
+                           "Cool program\n-a        Enables A\n--long    Enables Long\n");
+    }
+    
+    function testCanDisplaysMultipleFlagsForEachOption() {
+        $help = new SimpleHelp('Cool program');
+        $help->explainFlag(array('a', 'aa'), 'Enables A');
+        $this->assertEqual($help->render(), "Cool program\n-a      Enables A\n  --aa\n");
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/authentication_test.php b/3rdparty/simpletest/test/authentication_test.php
new file mode 100755
index 00000000000..081cccddfae
--- /dev/null
+++ b/3rdparty/simpletest/test/authentication_test.php
@@ -0,0 +1,145 @@
+<?php
+// $Id: authentication_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../authentication.php');
+require_once(dirname(__FILE__) . '/../http.php');
+Mock::generate('SimpleHttpRequest');
+
+class TestOfRealm extends UnitTestCase {
+    
+    function testWithinSameUrl() {
+        $realm = new SimpleRealm(
+                'Basic',
+                new SimpleUrl('http://www.here.com/path/hello.html'));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path/hello.html')));
+    }
+    
+    function testInsideWithLongerUrl() {
+        $realm = new SimpleRealm(
+                'Basic',
+                new SimpleUrl('http://www.here.com/path/'));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path/hello.html')));
+    }
+    
+    function testBelowRootIsOutside() {
+        $realm = new SimpleRealm(
+                'Basic',
+                new SimpleUrl('http://www.here.com/path/'));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path/more/hello.html')));
+    }
+    
+    function testOldNetscapeDefinitionIsOutside() {
+        $realm = new SimpleRealm(
+                'Basic',
+                new SimpleUrl('http://www.here.com/path/'));
+        $this->assertFalse($realm->isWithin(
+                new SimpleUrl('http://www.here.com/pathmore/hello.html')));
+    }
+    
+    function testInsideWithMissingTrailingSlash() {
+        $realm = new SimpleRealm(
+                'Basic',
+                new SimpleUrl('http://www.here.com/path/'));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path')));
+    }
+    
+    function testDifferentPageNameStillInside() {
+        $realm = new SimpleRealm(
+                'Basic',
+                new SimpleUrl('http://www.here.com/path/hello.html'));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path/goodbye.html')));
+    }
+    
+    function testNewUrlInSameDirectoryDoesNotChangeRealm() {
+        $realm = new SimpleRealm(
+                'Basic',
+                new SimpleUrl('http://www.here.com/path/hello.html'));
+        $realm->stretch(new SimpleUrl('http://www.here.com/path/goodbye.html'));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path/index.html')));
+        $this->assertFalse($realm->isWithin(
+                new SimpleUrl('http://www.here.com/index.html')));
+    }
+    
+    function testNewUrlMakesRealmTheCommonPath() {
+        $realm = new SimpleRealm(
+                'Basic',
+                new SimpleUrl('http://www.here.com/path/here/hello.html'));
+        $realm->stretch(new SimpleUrl('http://www.here.com/path/there/goodbye.html'));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path/here/index.html')));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path/there/index.html')));
+        $this->assertTrue($realm->isWithin(
+                new SimpleUrl('http://www.here.com/path/index.html')));
+        $this->assertFalse($realm->isWithin(
+                new SimpleUrl('http://www.here.com/index.html')));
+        $this->assertFalse($realm->isWithin(
+                new SimpleUrl('http://www.here.com/paths/index.html')));
+        $this->assertFalse($realm->isWithin(
+                new SimpleUrl('http://www.here.com/pathindex.html')));
+    }
+}
+
+class TestOfAuthenticator extends UnitTestCase {
+    
+    function testNoRealms() {
+        $request = new MockSimpleHttpRequest();
+        $request->expectNever('addHeaderLine');
+        $authenticator = new SimpleAuthenticator();
+        $authenticator->addHeaders($request, new SimpleUrl('http://here.com/'));
+    }
+    
+    function &createSingleRealm() {
+        $authenticator = new SimpleAuthenticator();
+        $authenticator->addRealm(
+                new SimpleUrl('http://www.here.com/path/hello.html'),
+                'Basic',
+                'Sanctuary');
+        $authenticator->setIdentityForRealm('www.here.com', 'Sanctuary', 'test', 'secret');
+        return $authenticator;
+    }
+    
+    function testOutsideRealm() {
+        $request = new MockSimpleHttpRequest();
+        $request->expectNever('addHeaderLine');
+        $authenticator = &$this->createSingleRealm();
+        $authenticator->addHeaders(
+                $request,
+                new SimpleUrl('http://www.here.com/hello.html'));
+    }
+    
+    function testWithinRealm() {
+        $request = new MockSimpleHttpRequest();
+        $request->expectOnce('addHeaderLine');
+        $authenticator = &$this->createSingleRealm();
+        $authenticator->addHeaders(
+                $request,
+                new SimpleUrl('http://www.here.com/path/more/hello.html'));
+    }
+    
+    function testRestartingClearsRealm() {
+        $request = new MockSimpleHttpRequest();
+        $request->expectNever('addHeaderLine');
+        $authenticator = &$this->createSingleRealm();
+        $authenticator->restartSession();
+        $authenticator->addHeaders(
+                $request,
+                new SimpleUrl('http://www.here.com/hello.html'));
+    }
+    
+    function testDifferentHostIsOutsideRealm() {
+        $request = new MockSimpleHttpRequest();
+        $request->expectNever('addHeaderLine');
+        $authenticator = &$this->createSingleRealm();
+        $authenticator->addHeaders(
+                $request,
+                new SimpleUrl('http://here.com/path/hello.html'));
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/autorun_test.php b/3rdparty/simpletest/test/autorun_test.php
new file mode 100755
index 00000000000..d85ea19897c
--- /dev/null
+++ b/3rdparty/simpletest/test/autorun_test.php
@@ -0,0 +1,23 @@
+<?php
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/support/test1.php');
+
+class TestOfAutorun extends UnitTestCase {
+    function testLoadIfIncluded() {
+        $tests = new TestSuite();
+        $tests->addFile(dirname(__FILE__) . '/support/test1.php');
+        $this->assertEqual($tests->getSize(), 1);
+    }
+
+    function testExitStatusOneIfTestsFail() {
+        exec('php ' . dirname(__FILE__) . '/support/failing_test.php', $output, $exit_status);
+        $this->assertEqual($exit_status, 1);
+    }
+
+    function testExitStatusZeroIfTestsPass() {
+        exec('php ' . dirname(__FILE__) . '/support/passing_test.php', $output, $exit_status);
+        $this->assertEqual($exit_status, 0);
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/bad_test_suite.php b/3rdparty/simpletest/test/bad_test_suite.php
new file mode 100755
index 00000000000..b426013be40
--- /dev/null
+++ b/3rdparty/simpletest/test/bad_test_suite.php
@@ -0,0 +1,10 @@
+<?php
+require_once(dirname(__FILE__) . '/../autorun.php');
+
+class BadTestCases extends TestSuite {
+    function BadTestCases() {
+        $this->TestSuite('Two bad test cases');
+        $this->addFile(dirname(__FILE__) . '/support/empty_test_file.php');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/browser_test.php b/3rdparty/simpletest/test/browser_test.php
new file mode 100755
index 00000000000..3a52aaa8ff4
--- /dev/null
+++ b/3rdparty/simpletest/test/browser_test.php
@@ -0,0 +1,802 @@
+<?php
+// $Id: browser_test.php 1964 2009-10-13 15:27:31Z maetl_ $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../browser.php');
+require_once(dirname(__FILE__) . '/../user_agent.php');
+require_once(dirname(__FILE__) . '/../http.php');
+require_once(dirname(__FILE__) . '/../page.php');
+require_once(dirname(__FILE__) . '/../encoding.php');
+
+Mock::generate('SimpleHttpResponse');
+Mock::generate('SimplePage');
+Mock::generate('SimpleForm');
+Mock::generate('SimpleUserAgent');
+Mock::generatePartial(
+        'SimpleBrowser',
+        'MockParseSimpleBrowser',
+        array('createUserAgent', 'parse'));
+Mock::generatePartial(
+        'SimpleBrowser',
+        'MockUserAgentSimpleBrowser',
+        array('createUserAgent'));
+
+class TestOfHistory extends UnitTestCase {
+
+    function testEmptyHistoryHasFalseContents() {
+        $history = new SimpleBrowserHistory();
+        $this->assertIdentical($history->getUrl(), false);
+        $this->assertIdentical($history->getParameters(), false);
+    }
+
+    function testCannotMoveInEmptyHistory() {
+        $history = new SimpleBrowserHistory();
+        $this->assertFalse($history->back());
+        $this->assertFalse($history->forward());
+    }
+
+    function testCurrentTargetAccessors() {
+        $history = new SimpleBrowserHistory();
+        $history->recordEntry(
+                new SimpleUrl('http://www.here.com/'),
+                new SimpleGetEncoding());
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.here.com/'));
+        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
+    }
+
+    function testSecondEntryAccessors() {
+        $history = new SimpleBrowserHistory();
+        $history->recordEntry(
+                new SimpleUrl('http://www.first.com/'),
+                new SimpleGetEncoding());
+        $history->recordEntry(
+                new SimpleUrl('http://www.second.com/'),
+                new SimplePostEncoding(array('a' => 1)));
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.second.com/'));
+        $this->assertIdentical(
+                $history->getParameters(),
+                new SimplePostEncoding(array('a' => 1)));
+    }
+
+    function testGoingBackwards() {
+        $history = new SimpleBrowserHistory();
+        $history->recordEntry(
+                new SimpleUrl('http://www.first.com/'),
+                new SimpleGetEncoding());
+        $history->recordEntry(
+                new SimpleUrl('http://www.second.com/'),
+                new SimplePostEncoding(array('a' => 1)));
+        $this->assertTrue($history->back());
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
+        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
+    }
+
+    function testGoingBackwardsOffBeginning() {
+        $history = new SimpleBrowserHistory();
+        $history->recordEntry(
+                new SimpleUrl('http://www.first.com/'),
+                new SimpleGetEncoding());
+        $this->assertFalse($history->back());
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
+        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
+    }
+
+    function testGoingForwardsOffEnd() {
+        $history = new SimpleBrowserHistory();
+        $history->recordEntry(
+                new SimpleUrl('http://www.first.com/'),
+                new SimpleGetEncoding());
+        $this->assertFalse($history->forward());
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
+        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
+    }
+
+    function testGoingBackwardsAndForwards() {
+        $history = new SimpleBrowserHistory();
+        $history->recordEntry(
+                new SimpleUrl('http://www.first.com/'),
+                new SimpleGetEncoding());
+        $history->recordEntry(
+                new SimpleUrl('http://www.second.com/'),
+                new SimplePostEncoding(array('a' => 1)));
+        $this->assertTrue($history->back());
+        $this->assertTrue($history->forward());
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.second.com/'));
+        $this->assertIdentical(
+                $history->getParameters(),
+                new SimplePostEncoding(array('a' => 1)));
+    }
+
+    function testNewEntryReplacesNextOne() {
+        $history = new SimpleBrowserHistory();
+        $history->recordEntry(
+                new SimpleUrl('http://www.first.com/'),
+                new SimpleGetEncoding());
+        $history->recordEntry(
+                new SimpleUrl('http://www.second.com/'),
+                new SimplePostEncoding(array('a' => 1)));
+        $history->back();
+        $history->recordEntry(
+                new SimpleUrl('http://www.third.com/'),
+                new SimpleGetEncoding());
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.third.com/'));
+        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
+    }
+
+    function testNewEntryDropsFutureEntries() {
+        $history = new SimpleBrowserHistory();
+        $history->recordEntry(
+                new SimpleUrl('http://www.first.com/'),
+                new SimpleGetEncoding());
+        $history->recordEntry(
+                new SimpleUrl('http://www.second.com/'),
+                new SimpleGetEncoding());
+        $history->recordEntry(
+                new SimpleUrl('http://www.third.com/'),
+                new SimpleGetEncoding());
+        $history->back();
+        $history->back();
+        $history->recordEntry(
+                new SimpleUrl('http://www.fourth.com/'),
+                new SimpleGetEncoding());
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.fourth.com/'));
+        $this->assertFalse($history->forward());
+        $history->back();
+        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
+        $this->assertFalse($history->back());
+    }
+}
+
+class TestOfParsedPageAccess extends UnitTestCase {
+
+    function loadPage(&$page) {
+        $response = new MockSimpleHttpResponse($this);
+        $agent = new MockSimpleUserAgent($this);
+        $agent->returns('fetchResponse', $response);
+
+        $browser = new MockParseSimpleBrowser($this);
+        $browser->returns('createUserAgent', $agent);
+        $browser->returns('parse', $page);
+        $browser->__construct();
+
+        $browser->get('http://this.com/page.html');
+        return $browser;
+    }
+
+    function testAccessorsWhenNoPage() {
+        $agent = new MockSimpleUserAgent($this);
+        $browser = new MockParseSimpleBrowser($this);
+        $browser->returns('createUserAgent', $agent);
+        $browser->__construct();
+        $this->assertEqual($browser->getContent(), '');
+    }
+
+    function testParse() {
+        $page = new MockSimplePage();
+        $page->setReturnValue('getRequest', "GET here.html\r\n\r\n");
+        $page->setReturnValue('getRaw', 'Raw HTML');
+        $page->setReturnValue('getTitle', 'Here');
+        $page->setReturnValue('getFrameFocus', 'Frame');
+        $page->setReturnValue('getMimeType', 'text/html');
+        $page->setReturnValue('getResponseCode', 200);
+        $page->setReturnValue('getAuthentication', 'Basic');
+        $page->setReturnValue('getRealm', 'Somewhere');
+        $page->setReturnValue('getTransportError', 'Ouch!');
+
+        $browser = $this->loadPage($page);
+        $this->assertEqual($browser->getRequest(), "GET here.html\r\n\r\n");
+        $this->assertEqual($browser->getContent(), 'Raw HTML');
+        $this->assertEqual($browser->getTitle(), 'Here');
+        $this->assertEqual($browser->getFrameFocus(), 'Frame');
+        $this->assertIdentical($browser->getResponseCode(), 200);
+        $this->assertEqual($browser->getMimeType(), 'text/html');
+        $this->assertEqual($browser->getAuthentication(), 'Basic');
+        $this->assertEqual($browser->getRealm(), 'Somewhere');
+        $this->assertEqual($browser->getTransportError(), 'Ouch!');
+    }
+
+    function testLinkAffirmationWhenPresent() {
+        $page = new MockSimplePage();
+        $page->setReturnValue('getUrlsByLabel', array('http://www.nowhere.com'));
+        $page->expectOnce('getUrlsByLabel', array('a link label'));
+        $browser = $this->loadPage($page);
+        $this->assertIdentical($browser->getLink('a link label'), 'http://www.nowhere.com');
+    }
+
+    function testLinkAffirmationByIdWhenPresent() {
+        $page = new MockSimplePage();
+        $page->setReturnValue('getUrlById', 'a_page.com', array(99));
+        $page->setReturnValue('getUrlById', false, array('*'));
+        $browser = $this->loadPage($page);
+        $this->assertIdentical($browser->getLinkById(99), 'a_page.com');
+        $this->assertFalse($browser->getLinkById(98));
+    }
+
+    function testSettingFieldIsPassedToPage() {
+        $page = new MockSimplePage();
+        $page->expectOnce('setField', array(new SimpleByLabelOrName('key'), 'Value', false));
+        $page->setReturnValue('getField', 'Value');
+        $browser = $this->loadPage($page);
+        $this->assertEqual($browser->getField('key'), 'Value');
+        $browser->setField('key', 'Value');
+    }
+}
+
+class TestOfBrowserNavigation extends UnitTestCase {
+    function createBrowser($agent, $page) {
+        $browser = new MockParseSimpleBrowser();
+        $browser->returns('createUserAgent', $agent);
+        $browser->returns('parse', $page);
+        $browser->__construct();
+        return $browser;
+    }
+
+    function testBrowserRequestMethods() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+        $agent->expectAt(
+                0,
+                'fetchResponse',
+                array(new SimpleUrl('http://this.com/get.req'), new SimpleGetEncoding()));
+        $agent->expectAt(
+                1,
+                'fetchResponse',
+                array(new SimpleUrl('http://this.com/post.req'), new SimplePostEncoding()));
+        $agent->expectAt(
+                2,
+                'fetchResponse',
+                array(new SimpleUrl('http://this.com/put.req'), new SimplePutEncoding()));
+        $agent->expectAt(
+                3,
+                'fetchResponse',
+                array(new SimpleUrl('http://this.com/delete.req'), new SimpleDeleteEncoding()));
+        $agent->expectAt(
+                4,
+                'fetchResponse',
+                array(new SimpleUrl('http://this.com/head.req'), new SimpleHeadEncoding()));                               
+        $agent->expectCallCount('fetchResponse', 5);
+
+        $page = new MockSimplePage();
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/get.req');
+        $browser->post('http://this.com/post.req');
+        $browser->put('http://this.com/put.req');
+        $browser->delete('http://this.com/delete.req');
+        $browser->head('http://this.com/head.req');
+    }  
+    
+    function testClickLinkRequestsPage() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+        $agent->expectAt(
+                0,
+                'fetchResponse',
+                array(new SimpleUrl('http://this.com/page.html'), new SimpleGetEncoding()));
+        $agent->expectAt(
+                1,
+                'fetchResponse',
+                array(new SimpleUrl('http://this.com/new.html'), new SimpleGetEncoding()));
+        $agent->expectCallCount('fetchResponse', 2);
+
+        $page = new MockSimplePage();
+        $page->setReturnValue('getUrlsByLabel', array(new SimpleUrl('http://this.com/new.html')));
+        $page->expectOnce('getUrlsByLabel', array('New'));
+        $page->setReturnValue('getRaw', 'A page');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickLink('New'));
+    }
+
+    function testClickLinkWithUnknownFrameStillRequestsWholePage() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+        $agent->expectAt(
+                0,
+                'fetchResponse',
+                array(new SimpleUrl('http://this.com/page.html'), new SimpleGetEncoding()));
+        $target = new SimpleUrl('http://this.com/new.html');
+        $target->setTarget('missing');
+        $agent->expectAt(
+                1,
+                'fetchResponse',
+                array($target, new SimpleGetEncoding()));
+        $agent->expectCallCount('fetchResponse', 2);
+
+        $parsed_url = new SimpleUrl('http://this.com/new.html');
+        $parsed_url->setTarget('missing');
+
+        $page = new MockSimplePage();
+        $page->setReturnValue('getUrlsByLabel', array($parsed_url));
+        $page->setReturnValue('hasFrames', false);
+        $page->expectOnce('getUrlsByLabel', array('New'));
+        $page->setReturnValue('getRaw', 'A page');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickLink('New'));
+    }
+
+    function testClickingMissingLinkFails() {
+        $agent = new MockSimpleUserAgent($this);
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+
+        $page = new MockSimplePage();
+        $page->setReturnValue('getUrlsByLabel', array());
+        $page->setReturnValue('getRaw', 'stuff');
+
+        $browser = $this->createBrowser($agent, $page);
+        $this->assertTrue($browser->get('http://this.com/page.html'));
+        $this->assertFalse($browser->clickLink('New'));
+    }
+
+    function testClickIndexedLink() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+        $agent->expectAt(
+                1,
+                'fetchResponse',
+                array(new SimpleUrl('1.html'), new SimpleGetEncoding()));
+        $agent->expectCallCount('fetchResponse', 2);
+
+        $page = new MockSimplePage();
+        $page->setReturnValue(
+                'getUrlsByLabel',
+                array(new SimpleUrl('0.html'), new SimpleUrl('1.html')));
+        $page->setReturnValue('getRaw', 'A page');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickLink('New', 1));
+    }
+
+    function testClinkLinkById() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+        $agent->expectAt(1, 'fetchResponse', array(
+                new SimpleUrl('http://this.com/link.html'),
+                new SimpleGetEncoding()));
+        $agent->expectCallCount('fetchResponse', 2);
+
+        $page = new MockSimplePage();
+        $page->setReturnValue('getUrlById', new SimpleUrl('http://this.com/link.html'));
+        $page->expectOnce('getUrlById', array(2));
+        $page->setReturnValue('getRaw', 'A page');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickLinkById(2));
+    }
+
+    function testClickingMissingLinkIdFails() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+
+        $page = new MockSimplePage();
+        $page->setReturnValue('getUrlById', false);
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertFalse($browser->clickLink(0));
+    }
+
+    function testSubmitFormByLabel() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+        $agent->expectAt(1, 'fetchResponse', array(
+                new SimpleUrl('http://this.com/handler.html'),
+                new SimplePostEncoding(array('a' => 'A'))));
+        $agent->expectCallCount('fetchResponse', 2);
+
+        $form = new MockSimpleForm();
+        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
+        $form->setReturnValue('getMethod', 'post');
+        $form->setReturnValue('submitButton', new SimplePostEncoding(array('a' => 'A')));
+        $form->expectOnce('submitButton', array(new SimpleByLabel('Go'), false));
+
+        $page = new MockSimplePage();
+        $page->returns('getFormBySubmit', $form);
+        $page->expectOnce('getFormBySubmit', array(new SimpleByLabel('Go')));
+        $page->setReturnValue('getRaw', 'stuff');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickSubmit('Go'));
+    }
+
+    function testDefaultSubmitFormByLabel() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+        $agent->expectAt(1,  'fetchResponse', array(
+                new SimpleUrl('http://this.com/page.html'),
+                new SimpleGetEncoding(array('a' => 'A'))));
+        $agent->expectCallCount('fetchResponse', 2);
+
+        $form = new MockSimpleForm();
+        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/page.html'));
+        $form->setReturnValue('getMethod', 'get');
+        $form->setReturnValue('submitButton', new SimpleGetEncoding(array('a' => 'A')));
+
+        $page = new MockSimplePage();
+        $page->returns('getFormBySubmit', $form);
+        $page->expectOnce('getFormBySubmit', array(new SimpleByLabel('Submit')));
+        $page->setReturnValue('getRaw', 'stuff');
+        $page->setReturnValue('getUrl', new SimpleUrl('http://this.com/page.html'));
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickSubmit());
+    }
+
+    function testSubmitFormByName() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+
+        $form = new MockSimpleForm();
+        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
+        $form->setReturnValue('getMethod', 'post');
+        $form->setReturnValue('submitButton', new SimplePostEncoding(array('a' => 'A')));
+
+        $page = new MockSimplePage();
+        $page->returns('getFormBySubmit', $form);
+        $page->expectOnce('getFormBySubmit', array(new SimpleByName('me')));
+        $page->setReturnValue('getRaw', 'stuff');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickSubmitByName('me'));
+    }
+
+    function testSubmitFormById() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+
+        $form = new MockSimpleForm();
+        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
+        $form->setReturnValue('getMethod', 'post');
+        $form->setReturnValue('submitButton', new SimplePostEncoding(array('a' => 'A')));
+        $form->expectOnce('submitButton', array(new SimpleById(99), false));
+
+        $page = new MockSimplePage();
+        $page->returns('getFormBySubmit', $form);
+        $page->expectOnce('getFormBySubmit', array(new SimpleById(99)));
+        $page->setReturnValue('getRaw', 'stuff');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickSubmitById(99));
+    }
+
+    function testSubmitFormByImageLabel() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+
+        $form = new MockSimpleForm();
+        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
+        $form->setReturnValue('getMethod', 'post');
+        $form->setReturnValue('submitImage', new SimplePostEncoding(array('a' => 'A')));
+        $form->expectOnce('submitImage', array(new SimpleByLabel('Go!'), 10, 11, false));
+
+        $page = new MockSimplePage();
+        $page->returns('getFormByImage', $form);
+        $page->expectOnce('getFormByImage', array(new SimpleByLabel('Go!')));
+        $page->setReturnValue('getRaw', 'stuff');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickImage('Go!', 10, 11));
+    }
+
+    function testSubmitFormByImageName() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+
+        $form = new MockSimpleForm();
+        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
+        $form->setReturnValue('getMethod', 'post');
+        $form->setReturnValue('submitImage', new SimplePostEncoding(array('a' => 'A')));
+        $form->expectOnce('submitImage', array(new SimpleByName('a'), 10, 11, false));
+
+        $page = new MockSimplePage();
+        $page->returns('getFormByImage', $form);
+        $page->expectOnce('getFormByImage', array(new SimpleByName('a')));
+        $page->setReturnValue('getRaw', 'stuff');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickImageByName('a', 10, 11));
+    }
+
+    function testSubmitFormByImageId() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+
+        $form = new MockSimpleForm();
+        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
+        $form->setReturnValue('getMethod', 'post');
+        $form->setReturnValue('submitImage', new SimplePostEncoding(array('a' => 'A')));
+        $form->expectOnce('submitImage', array(new SimpleById(99), 10, 11, false));
+
+        $page = new MockSimplePage();
+        $page->returns('getFormByImage', $form);
+        $page->expectOnce('getFormByImage', array(new SimpleById(99)));
+        $page->setReturnValue('getRaw', 'stuff');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->clickImageById(99, 10, 11));
+    }
+
+    function testSubmitFormByFormId() {
+        $agent = new MockSimpleUserAgent();
+        $agent->returns('fetchResponse', new MockSimpleHttpResponse());
+        $agent->expectAt(1, 'fetchResponse', array(
+                new SimpleUrl('http://this.com/handler.html'),
+                new SimplePostEncoding(array('a' => 'A'))));
+        $agent->expectCallCount('fetchResponse', 2);
+
+        $form = new MockSimpleForm();
+        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
+        $form->setReturnValue('getMethod', 'post');
+        $form->setReturnValue('submit', new SimplePostEncoding(array('a' => 'A')));
+
+        $page = new MockSimplePage();
+        $page->returns('getFormById', $form);
+        $page->expectOnce('getFormById', array(33));
+        $page->setReturnValue('getRaw', 'stuff');
+
+        $browser = $this->createBrowser($agent, $page);
+        $browser->get('http://this.com/page.html');
+        $this->assertTrue($browser->submitFormById(33));
+    }
+}
+
+class TestOfBrowserFrames extends UnitTestCase {
+
+    function createBrowser($agent) {
+        $browser = new MockUserAgentSimpleBrowser();
+        $browser->returns('createUserAgent', $agent);
+        $browser->__construct();
+        return $browser;
+    }
+
+    function createUserAgent($pages) {
+        $agent = new MockSimpleUserAgent();
+        foreach ($pages as $url => $raw) {
+            $url = new SimpleUrl($url);
+            $response = new MockSimpleHttpResponse();
+            $response->setReturnValue('getUrl', $url);
+            $response->setReturnValue('getContent', $raw);
+            $agent->returns('fetchResponse', $response, array($url, '*'));
+        }
+        return $agent;
+    }
+
+    function testSimplePageHasNoFrames() {
+        $browser = $this->createBrowser($this->createUserAgent(
+                array('http://site.with.no.frames/' => 'A non-framed page')));
+        $this->assertEqual(
+                $browser->get('http://site.with.no.frames/'),
+                'A non-framed page');
+        $this->assertIdentical($browser->getFrames(), 'http://site.with.no.frames/');
+    }
+
+    function testFramesetWithSingleFrame() {
+        $frameset = '<frameset><frame name="a" src="frame.html"></frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.one.frame/' => $frameset,
+                'http://site.with.one.frame/frame.html' => 'A frame')));
+        $this->assertEqual($browser->get('http://site.with.one.frame/'), 'A frame');
+        $this->assertIdentical(
+                $browser->getFrames(),
+                array('a' => 'http://site.with.one.frame/frame.html'));
+    }
+
+    function testTitleTakenFromFramesetPage() {
+        $frameset = '<title>Frameset title</title>' .
+                '<frameset><frame name="a" src="frame.html"></frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.one.frame/' => $frameset,
+                'http://site.with.one.frame/frame.html' => '<title>Page title</title>')));
+        $browser->get('http://site.with.one.frame/');
+        $this->assertEqual($browser->getTitle(), 'Frameset title');
+    }
+
+    function testFramesetWithSingleUnnamedFrame() {
+        $frameset = '<frameset><frame src="frame.html"></frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.one.frame/' => $frameset,
+                'http://site.with.one.frame/frame.html' => 'One frame')));
+        $this->assertEqual(
+                $browser->get('http://site.with.one.frame/'),
+                'One frame');
+        $this->assertIdentical(
+                $browser->getFrames(),
+                array(1 => 'http://site.with.one.frame/frame.html'));
+    }
+
+    function testFramesetWithMultipleFrames() {
+        $frameset = '<frameset>' .
+                '<frame name="a" src="frame_a.html">' .
+                '<frame name="b" src="frame_b.html">' .
+                '<frame name="c" src="frame_c.html">' .
+                '</frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.frames/' => $frameset,
+                'http://site.with.frames/frame_a.html' => 'A frame',
+                'http://site.with.frames/frame_b.html' => 'B frame',
+                'http://site.with.frames/frame_c.html' => 'C frame')));
+        $this->assertEqual(
+                $browser->get('http://site.with.frames/'),
+                'A frameB frameC frame');
+        $this->assertIdentical($browser->getFrames(), array(
+                'a' => 'http://site.with.frames/frame_a.html',
+                'b' => 'http://site.with.frames/frame_b.html',
+                'c' => 'http://site.with.frames/frame_c.html'));
+    }
+
+    function testFrameFocusByName() {
+        $frameset = '<frameset>' .
+                '<frame name="a" src="frame_a.html">' .
+                '<frame name="b" src="frame_b.html">' .
+                '<frame name="c" src="frame_c.html">' .
+                '</frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.frames/' => $frameset,
+                'http://site.with.frames/frame_a.html' => 'A frame',
+                'http://site.with.frames/frame_b.html' => 'B frame',
+                'http://site.with.frames/frame_c.html' => 'C frame')));
+        $browser->get('http://site.with.frames/');
+        $browser->setFrameFocus('a');
+        $this->assertEqual($browser->getContent(), 'A frame');
+        $browser->setFrameFocus('b');
+        $this->assertEqual($browser->getContent(), 'B frame');
+        $browser->setFrameFocus('c');
+        $this->assertEqual($browser->getContent(), 'C frame');
+    }
+
+    function testFramesetWithSomeNamedFrames() {
+        $frameset = '<frameset>' .
+                '<frame name="a" src="frame_a.html">' .
+                '<frame src="frame_b.html">' .
+                '<frame name="c" src="frame_c.html">' .
+                '<frame src="frame_d.html">' .
+                '</frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.frames/' => $frameset,
+                'http://site.with.frames/frame_a.html' => 'A frame',
+                'http://site.with.frames/frame_b.html' => 'B frame',
+                'http://site.with.frames/frame_c.html' => 'C frame',
+                'http://site.with.frames/frame_d.html' => 'D frame')));
+        $this->assertEqual(
+                $browser->get('http://site.with.frames/'),
+                'A frameB frameC frameD frame');
+        $this->assertIdentical($browser->getFrames(), array(
+                'a' => 'http://site.with.frames/frame_a.html',
+                2 => 'http://site.with.frames/frame_b.html',
+                'c' => 'http://site.with.frames/frame_c.html',
+                4 => 'http://site.with.frames/frame_d.html'));
+    }
+
+    function testFrameFocusWithMixedNamesAndIndexes() {
+        $frameset = '<frameset>' .
+                '<frame name="a" src="frame_a.html">' .
+                '<frame src="frame_b.html">' .
+                '<frame name="c" src="frame_c.html">' .
+                '<frame src="frame_d.html">' .
+                '</frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.frames/' => $frameset,
+                'http://site.with.frames/frame_a.html' => 'A frame',
+                'http://site.with.frames/frame_b.html' => 'B frame',
+                'http://site.with.frames/frame_c.html' => 'C frame',
+                'http://site.with.frames/frame_d.html' => 'D frame')));
+        $browser->get('http://site.with.frames/');
+        $browser->setFrameFocus('a');
+        $this->assertEqual($browser->getContent(), 'A frame');
+        $browser->setFrameFocus(2);
+        $this->assertEqual($browser->getContent(), 'B frame');
+        $browser->setFrameFocus('c');
+        $this->assertEqual($browser->getContent(), 'C frame');
+        $browser->setFrameFocus(4);
+        $this->assertEqual($browser->getContent(), 'D frame');
+        $browser->clearFrameFocus();
+        $this->assertEqual($browser->getContent(), 'A frameB frameC frameD frame');
+    }
+
+    function testNestedFrameset() {
+        $inner = '<frameset>' .
+                '<frame name="page" src="page.html">' .
+                '</frameset>';
+        $outer = '<frameset>' .
+                '<frame name="inner" src="inner.html">' .
+                '</frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.nested.frame/' => $outer,
+                'http://site.with.nested.frame/inner.html' => $inner,
+                'http://site.with.nested.frame/page.html' => 'The page')));
+        $this->assertEqual(
+                $browser->get('http://site.with.nested.frame/'),
+                'The page');
+        $this->assertIdentical($browser->getFrames(), array(
+                'inner' => array(
+                        'page' => 'http://site.with.nested.frame/page.html')));
+    }
+
+    function testCanNavigateToNestedFrame() {
+        $inner = '<frameset>' .
+                '<frame name="one" src="one.html">' .
+                '<frame name="two" src="two.html">' .
+                '</frameset>';
+        $outer = '<frameset>' .
+                '<frame name="inner" src="inner.html">' .
+                '<frame name="three" src="three.html">' .
+                '</frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.nested.frames/' => $outer,
+                'http://site.with.nested.frames/inner.html' => $inner,
+                'http://site.with.nested.frames/one.html' => 'Page one',
+                'http://site.with.nested.frames/two.html' => 'Page two',
+                'http://site.with.nested.frames/three.html' => 'Page three')));
+
+        $browser->get('http://site.with.nested.frames/');
+        $this->assertEqual($browser->getContent(), 'Page onePage twoPage three');
+
+        $this->assertTrue($browser->setFrameFocus('inner'));
+        $this->assertEqual($browser->getFrameFocus(), array('inner'));
+        $this->assertTrue($browser->setFrameFocus('one'));
+        $this->assertEqual($browser->getFrameFocus(), array('inner', 'one'));
+        $this->assertEqual($browser->getContent(), 'Page one');
+
+        $this->assertTrue($browser->setFrameFocus('two'));
+        $this->assertEqual($browser->getFrameFocus(), array('inner', 'two'));
+        $this->assertEqual($browser->getContent(), 'Page two');
+
+        $browser->clearFrameFocus();
+        $this->assertTrue($browser->setFrameFocus('three'));
+        $this->assertEqual($browser->getFrameFocus(), array('three'));
+        $this->assertEqual($browser->getContent(), 'Page three');
+
+        $this->assertTrue($browser->setFrameFocus('inner'));
+        $this->assertEqual($browser->getContent(), 'Page onePage two');
+    }
+
+    function testCanNavigateToNestedFrameByIndex() {
+        $inner = '<frameset>' .
+                '<frame src="one.html">' .
+                '<frame src="two.html">' .
+                '</frameset>';
+        $outer = '<frameset>' .
+                '<frame src="inner.html">' .
+                '<frame src="three.html">' .
+                '</frameset>';
+        $browser = $this->createBrowser($this->createUserAgent(array(
+                'http://site.with.nested.frames/' => $outer,
+                'http://site.with.nested.frames/inner.html' => $inner,
+                'http://site.with.nested.frames/one.html' => 'Page one',
+                'http://site.with.nested.frames/two.html' => 'Page two',
+                'http://site.with.nested.frames/three.html' => 'Page three')));
+
+        $browser->get('http://site.with.nested.frames/');
+        $this->assertEqual($browser->getContent(), 'Page onePage twoPage three');
+
+        $this->assertTrue($browser->setFrameFocusByIndex(1));
+        $this->assertEqual($browser->getFrameFocus(), array(1));
+        $this->assertTrue($browser->setFrameFocusByIndex(1));
+        $this->assertEqual($browser->getFrameFocus(), array(1, 1));
+        $this->assertEqual($browser->getContent(), 'Page one');
+
+        $this->assertTrue($browser->setFrameFocusByIndex(2));
+        $this->assertEqual($browser->getFrameFocus(), array(1, 2));
+        $this->assertEqual($browser->getContent(), 'Page two');
+
+        $browser->clearFrameFocus();
+        $this->assertTrue($browser->setFrameFocusByIndex(2));
+        $this->assertEqual($browser->getFrameFocus(), array(2));
+        $this->assertEqual($browser->getContent(), 'Page three');
+
+        $this->assertTrue($browser->setFrameFocusByIndex(1));
+        $this->assertEqual($browser->getContent(), 'Page onePage two');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/collector_test.php b/3rdparty/simpletest/test/collector_test.php
new file mode 100755
index 00000000000..efdbf377ece
--- /dev/null
+++ b/3rdparty/simpletest/test/collector_test.php
@@ -0,0 +1,50 @@
+<?php
+// $Id: collector_test.php 1769 2008-04-19 14:39:00Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../collector.php');
+SimpleTest::ignore('MockTestSuite');
+Mock::generate('TestSuite');
+
+class PathEqualExpectation extends EqualExpectation {
+	function __construct($value, $message = '%s') {
+    	parent::__construct(str_replace("\\", '/', $value), $message);
+	}
+
+    function test($compare) {
+        return parent::test(str_replace("\\", '/', $compare));
+    }
+}
+
+class TestOfCollector extends UnitTestCase {
+    function testCollectionIsAddedToGroup() {
+        $suite = new MockTestSuite();
+        $suite->expectMinimumCallCount('addFile', 2);
+        $suite->expect(
+                'addFile',
+                array(new PatternExpectation('/collectable\\.(1|2)$/')));
+        $collector = new SimpleCollector();
+        $collector->collect($suite, dirname(__FILE__) . '/support/collector/');
+    }
+}
+
+class TestOfPatternCollector extends UnitTestCase {
+
+    function testAddingEverythingToGroup() {
+        $suite = new MockTestSuite();
+        $suite->expectCallCount('addFile', 2);
+        $suite->expect(
+                'addFile',
+                array(new PatternExpectation('/collectable\\.(1|2)$/')));
+        $collector = new SimplePatternCollector('/.*/');
+        $collector->collect($suite, dirname(__FILE__) . '/support/collector/');
+    }
+
+    function testOnlyMatchedFilesAreAddedToGroup() {
+        $suite = new MockTestSuite();
+        $suite->expectOnce('addFile', array(new PathEqualExpectation(
+        		dirname(__FILE__) . '/support/collector/collectable.1')));
+        $collector = new SimplePatternCollector('/1$/');
+        $collector->collect($suite, dirname(__FILE__) . '/support/collector/');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/command_line_test.php b/3rdparty/simpletest/test/command_line_test.php
new file mode 100755
index 00000000000..5baabff33c6
--- /dev/null
+++ b/3rdparty/simpletest/test/command_line_test.php
@@ -0,0 +1,40 @@
+<?php
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../default_reporter.php');
+
+class TestOfCommandLineParsing extends UnitTestCase {
+    
+    function testDefaultsToEmptyStringToMeanNullToTheSelectiveReporter() {
+        $parser = new SimpleCommandLineParser(array());
+        $this->assertIdentical($parser->getTest(), '');
+        $this->assertIdentical($parser->getTestCase(), '');
+    }
+    
+    function testNotXmlByDefault() {
+        $parser = new SimpleCommandLineParser(array());
+        $this->assertFalse($parser->isXml());
+    }
+    
+    function testCanDetectRequestForXml() {
+        $parser = new SimpleCommandLineParser(array('--xml'));
+        $this->assertTrue($parser->isXml());
+    }
+    
+    function testCanReadAssignmentSyntax() {
+        $parser = new SimpleCommandLineParser(array('--test=myTest'));
+        $this->assertEqual($parser->getTest(), 'myTest');
+    }
+    
+    function testCanReadFollowOnSyntax() {
+        $parser = new SimpleCommandLineParser(array('--test', 'myTest'));
+        $this->assertEqual($parser->getTest(), 'myTest');
+    }
+    
+    function testCanReadShortForms() {
+        $parser = new SimpleCommandLineParser(array('-t', 'myTest', '-c', 'MyClass', '-x'));
+        $this->assertEqual($parser->getTest(), 'myTest');
+        $this->assertEqual($parser->getTestCase(), 'MyClass');
+        $this->assertTrue($parser->isXml());
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/compatibility_test.php b/3rdparty/simpletest/test/compatibility_test.php
new file mode 100755
index 00000000000..b8635e5bb83
--- /dev/null
+++ b/3rdparty/simpletest/test/compatibility_test.php
@@ -0,0 +1,87 @@
+<?php
+// $Id: compatibility_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../compatibility.php');
+
+class ComparisonClass { }
+class ComparisonSubclass extends ComparisonClass { }
+interface ComparisonInterface { }
+class ComparisonClassWithInterface implements ComparisonInterface { }
+
+class TestOfCompatibility extends UnitTestCase {
+    
+    function testIsA() {
+        $this->assertTrue(SimpleTestCompatibility::isA(
+                new ComparisonClass(),
+                'ComparisonClass'));
+        $this->assertFalse(SimpleTestCompatibility::isA(
+                new ComparisonClass(),
+                'ComparisonSubclass'));
+        $this->assertTrue(SimpleTestCompatibility::isA(
+                new ComparisonSubclass(),
+                'ComparisonClass'));
+    }
+    
+    function testIdentityOfNumericStrings() {
+        $numericString1 = "123";
+        $numericString2 = "00123";
+        $this->assertNotIdentical($numericString1, $numericString2);
+    }
+    
+    function testIdentityOfObjects() {
+        $object1 = new ComparisonClass();
+        $object2 = new ComparisonClass();
+        $this->assertIdentical($object1, $object2);
+    }
+    
+    function testReferences () {
+        $thing = "Hello";
+        $thing_reference = &$thing;
+        $thing_copy = $thing;
+        $this->assertTrue(SimpleTestCompatibility::isReference(
+                $thing,
+                $thing));
+        $this->assertTrue(SimpleTestCompatibility::isReference(
+                $thing,
+                $thing_reference));
+        $this->assertFalse(SimpleTestCompatibility::isReference(
+                $thing,
+                $thing_copy));
+    }
+    
+    function testObjectReferences () {
+        $object = new ComparisonClass();
+        $object_reference = $object;
+        $object_copy = new ComparisonClass();
+        $object_assignment = $object;
+        $this->assertTrue(SimpleTestCompatibility::isReference(
+                $object,
+                $object));
+        $this->assertTrue(SimpleTestCompatibility::isReference(
+                $object,
+                $object_reference));
+        $this->assertFalse(SimpleTestCompatibility::isReference(
+                $object,
+                $object_copy));
+        if (version_compare(phpversion(), '5', '>=')) {
+            $this->assertTrue(SimpleTestCompatibility::isReference(
+                    $object,
+                    $object_assignment));
+        } else {
+            $this->assertFalse(SimpleTestCompatibility::isReference(
+                    $object,
+                    $object_assignment));
+        }
+    }
+    
+    function testInteraceComparison() {
+        $object = new ComparisonClassWithInterface();
+        $this->assertFalse(SimpleTestCompatibility::isA(
+                new ComparisonClass(),
+                'ComparisonInterface'));
+        $this->assertTrue(SimpleTestCompatibility::isA(
+                new ComparisonClassWithInterface(),
+                'ComparisonInterface'));
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/cookies_test.php b/3rdparty/simpletest/test/cookies_test.php
new file mode 100755
index 00000000000..0b49e43bf9f
--- /dev/null
+++ b/3rdparty/simpletest/test/cookies_test.php
@@ -0,0 +1,227 @@
+<?php
+// $Id: cookies_test.php 1506 2007-05-07 00:58:03Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../cookies.php');
+
+class TestOfCookie extends UnitTestCase {
+    
+    function testCookieDefaults() {
+        $cookie = new SimpleCookie("name");
+        $this->assertFalse($cookie->getValue());
+        $this->assertEqual($cookie->getPath(), "/");
+        $this->assertIdentical($cookie->getHost(), false);
+        $this->assertFalse($cookie->getExpiry());
+        $this->assertFalse($cookie->isSecure());
+    }
+    
+    function testCookieAccessors() {
+        $cookie = new SimpleCookie(
+                "name",
+                "value",
+                "/path",
+                "Mon, 18 Nov 2002 15:50:29 GMT",
+                true);
+        $this->assertEqual($cookie->getName(), "name");
+        $this->assertEqual($cookie->getValue(), "value");
+        $this->assertEqual($cookie->getPath(), "/path/");
+        $this->assertEqual($cookie->getExpiry(), "Mon, 18 Nov 2002 15:50:29 GMT");
+        $this->assertTrue($cookie->isSecure());
+    }
+    
+    function testFullHostname() {
+        $cookie = new SimpleCookie("name");
+        $this->assertTrue($cookie->setHost("host.name.here"));
+        $this->assertEqual($cookie->getHost(), "host.name.here");
+        $this->assertTrue($cookie->setHost("host.com"));
+        $this->assertEqual($cookie->getHost(), "host.com");
+    }
+    
+    function testHostTruncation() {
+        $cookie = new SimpleCookie("name");
+        $cookie->setHost("this.host.name.here");
+        $this->assertEqual($cookie->getHost(), "host.name.here");
+        $cookie->setHost("this.host.com");
+        $this->assertEqual($cookie->getHost(), "host.com");
+        $this->assertTrue($cookie->setHost("dashes.in-host.com"));
+        $this->assertEqual($cookie->getHost(), "in-host.com");
+    }
+    
+    function testBadHosts() {
+        $cookie = new SimpleCookie("name");
+        $this->assertFalse($cookie->setHost("gibberish"));
+        $this->assertFalse($cookie->setHost("host.here"));
+        $this->assertFalse($cookie->setHost("host..com"));
+        $this->assertFalse($cookie->setHost("..."));
+        $this->assertFalse($cookie->setHost("host.com."));
+    }
+    
+    function testHostValidity() {
+        $cookie = new SimpleCookie("name");
+        $cookie->setHost("this.host.name.here");
+        $this->assertTrue($cookie->isValidHost("host.name.here"));
+        $this->assertTrue($cookie->isValidHost("that.host.name.here"));
+        $this->assertFalse($cookie->isValidHost("bad.host"));
+        $this->assertFalse($cookie->isValidHost("nearly.name.here"));
+    }
+    
+    function testPathValidity() {
+        $cookie = new SimpleCookie("name", "value", "/path");
+        $this->assertFalse($cookie->isValidPath("/"));
+        $this->assertTrue($cookie->isValidPath("/path/"));
+        $this->assertTrue($cookie->isValidPath("/path/more"));
+    }
+    
+    function testSessionExpiring() {
+        $cookie = new SimpleCookie("name", "value", "/path");
+        $this->assertTrue($cookie->isExpired(0));
+    }
+    
+    function testTimestampExpiry() {
+        $cookie = new SimpleCookie("name", "value", "/path", 456);
+        $this->assertFalse($cookie->isExpired(0));
+        $this->assertTrue($cookie->isExpired(457));
+        $this->assertFalse($cookie->isExpired(455));
+    }
+    
+    function testDateExpiry() {
+        $cookie = new SimpleCookie(
+                "name",
+                "value",
+                "/path",
+                "Mon, 18 Nov 2002 15:50:29 GMT");
+        $this->assertTrue($cookie->isExpired("Mon, 18 Nov 2002 15:50:30 GMT"));
+        $this->assertFalse($cookie->isExpired("Mon, 18 Nov 2002 15:50:28 GMT"));
+    }
+    
+    function testAging() {
+        $cookie = new SimpleCookie("name", "value", "/path", 200);
+        $cookie->agePrematurely(199);
+        $this->assertFalse($cookie->isExpired(0));
+        $cookie->agePrematurely(2);
+        $this->assertTrue($cookie->isExpired(0));
+    }
+}
+
+class TestOfCookieJar extends UnitTestCase {
+    
+    function testAddCookie() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie("a", "A");
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=A'));
+    }
+    
+    function testHostFilter() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'A', 'my-host.com');
+        $jar->setCookie('b', 'B', 'another-host.com');
+        $jar->setCookie('c', 'C');
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('my-host.com')),
+                array('a=A', 'c=C'));
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('another-host.com')),
+                array('b=B', 'c=C'));
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('www.another-host.com')),
+                array('b=B', 'c=C'));
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('new-host.org')),
+                array('c=C'));
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('/')),
+                array('a=A', 'b=B', 'c=C'));
+    }
+    
+    function testPathFilter() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'A', false, '/path/');
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/elsewhere')), array());
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/')), array('a=A'));
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path')), array('a=A'));
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/pa')), array());
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/here')), array('a=A'));
+    }
+    
+    function testPathFilterDeeply() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'A', false, '/path/more_path/');
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/')), array());
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path')), array());
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/pa')), array());
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/more_path/')), array('a=A'));
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/more_path/and_more')), array('a=A'));
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/not_here/')), array());
+    }
+    
+    function testMultipleCookieWithDifferentPathsButSameName() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'abc', false, '/');
+        $jar->setCookie('a', '123', false, '/path/here/');
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('/')),
+                array('a=abc'));
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('my-host.com/')),
+                array('a=abc'));
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('my-host.com/path/')),
+                array('a=abc'));
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('my-host.com/path/here')),
+                array('a=abc', 'a=123'));
+        $this->assertEqual(
+                $jar->selectAsPairs(new SimpleUrl('my-host.com/path/here/there')),
+                array('a=abc', 'a=123'));
+    }
+    
+    function testOverwrite() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'abc', false, '/');
+        $jar->setCookie('a', 'cde', false, '/');
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=cde'));
+    }
+    
+    function testClearSessionCookies() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'A', false, '/');
+        $jar->restartSession();
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
+    }
+    
+    function testExpiryFilterByDate() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'A', false, '/', 'Wed, 25-Dec-02 04:24:20 GMT');
+        $jar->restartSession("Wed, 25-Dec-02 04:24:19 GMT");
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=A'));
+        $jar->restartSession("Wed, 25-Dec-02 04:24:21 GMT");
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
+    }
+    
+    function testExpiryFilterByAgeing() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'A', false, '/', 'Wed, 25-Dec-02 04:24:20 GMT');
+        $jar->restartSession("Wed, 25-Dec-02 04:24:19 GMT");
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=A'));
+        $jar->agePrematurely(2);
+        $jar->restartSession("Wed, 25-Dec-02 04:24:19 GMT");
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
+    }
+    
+    function testCookieClearing() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'abc', false, '/');
+        $jar->setCookie('a', '', false, '/');
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a='));
+    }
+    
+    function testCookieClearByLoweringDate() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'abc', false, '/', 'Wed, 25-Dec-02 04:24:21 GMT');
+        $jar->setCookie('a', 'def', false, '/', 'Wed, 25-Dec-02 04:24:19 GMT');
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=def'));
+        $jar->restartSession('Wed, 25-Dec-02 04:24:20 GMT');
+        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/detached_test.php b/3rdparty/simpletest/test/detached_test.php
new file mode 100755
index 00000000000..f651d97eb61
--- /dev/null
+++ b/3rdparty/simpletest/test/detached_test.php
@@ -0,0 +1,15 @@
+<?php
+// $Id: detached_test.php 1884 2009-07-01 16:30:40Z lastcraft $
+require_once('../detached.php');
+require_once('../reporter.php');
+
+// The following URL will depend on your own installation.
+$command = 'php ' . dirname(__FILE__) . '/visual_test.php xml';
+
+$test = new TestSuite('Remote tests');
+$test->add(new DetachedTestCase($command));
+if (SimpleReporter::inCli()) {
+    exit ($test->run(new TextReporter()) ? 0 : 1);
+}
+$test->run(new HtmlReporter());
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/dumper_test.php b/3rdparty/simpletest/test/dumper_test.php
new file mode 100755
index 00000000000..789047de924
--- /dev/null
+++ b/3rdparty/simpletest/test/dumper_test.php
@@ -0,0 +1,88 @@
+<?php
+// $Id: dumper_test.php 1505 2007-04-30 23:39:59Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+
+class DumperDummy {
+}
+
+class TestOfTextFormatting extends UnitTestCase {
+    
+    function testClipping() {
+        $dumper = new SimpleDumper();
+        $this->assertEqual(
+                $dumper->clipString("Hello", 6),
+                "Hello",
+                "Hello, 6->%s");
+        $this->assertEqual(
+                $dumper->clipString("Hello", 5),
+                "Hello",
+                "Hello, 5->%s");
+        $this->assertEqual(
+                $dumper->clipString("Hello world", 3),
+                "Hel...",
+                "Hello world, 3->%s");
+        $this->assertEqual(
+                $dumper->clipString("Hello world", 6, 3),
+                "Hello ...",
+                "Hello world, 6, 3->%s");
+        $this->assertEqual(
+                $dumper->clipString("Hello world", 3, 6),
+                "...o w...",
+                "Hello world, 3, 6->%s");
+        $this->assertEqual(
+                $dumper->clipString("Hello world", 4, 11),
+                "...orld",
+                "Hello world, 4, 11->%s");
+        $this->assertEqual(
+                $dumper->clipString("Hello world", 4, 12),
+                "...orld",
+                "Hello world, 4, 12->%s");
+    }
+    
+    function testDescribeNull() {
+        $dumper = new SimpleDumper();
+        $this->assertPattern('/null/i', $dumper->describeValue(null));
+    }
+    
+    function testDescribeBoolean() {
+        $dumper = new SimpleDumper();
+        $this->assertPattern('/boolean/i', $dumper->describeValue(true));
+        $this->assertPattern('/true/i', $dumper->describeValue(true));
+        $this->assertPattern('/false/i', $dumper->describeValue(false));
+    }
+    
+    function testDescribeString() {
+        $dumper = new SimpleDumper();
+        $this->assertPattern('/string/i', $dumper->describeValue('Hello'));
+        $this->assertPattern('/Hello/', $dumper->describeValue('Hello'));
+    }
+    
+    function testDescribeInteger() {
+        $dumper = new SimpleDumper();
+        $this->assertPattern('/integer/i', $dumper->describeValue(35));
+        $this->assertPattern('/35/', $dumper->describeValue(35));
+    }
+    
+    function testDescribeFloat() {
+        $dumper = new SimpleDumper();
+        $this->assertPattern('/float/i', $dumper->describeValue(0.99));
+        $this->assertPattern('/0\.99/', $dumper->describeValue(0.99));
+    }
+    
+    function testDescribeArray() {
+        $dumper = new SimpleDumper();
+        $this->assertPattern('/array/i', $dumper->describeValue(array(1, 4)));
+        $this->assertPattern('/2/i', $dumper->describeValue(array(1, 4)));
+    }
+    
+    function testDescribeObject() {
+        $dumper = new SimpleDumper();
+        $this->assertPattern(
+                '/object/i',
+                $dumper->describeValue(new DumperDummy()));
+        $this->assertPattern(
+                '/DumperDummy/i',
+                $dumper->describeValue(new DumperDummy()));
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/eclipse_test.php b/3rdparty/simpletest/test/eclipse_test.php
new file mode 100755
index 00000000000..c90cbc918fd
--- /dev/null
+++ b/3rdparty/simpletest/test/eclipse_test.php
@@ -0,0 +1,32 @@
+<?php
+// $Id: eclipse_test.php 1739 2008-04-09 20:48:37Z edwardzyang $
+
+//To run this from the eclipse plugin...you need to make sure that the 
+//SimpleTest path in the preferences is the same as the location of the 
+//eclipse.php file below otherwise you end up with two "different" eclipse.php 
+//files included and that does not work...
+
+include_once(dirname(__FILE__) . '/../eclipse.php');
+Mock::generate('SimpleSocket');
+
+class TestOfEclipse extends UnitTestCase {
+	
+	function testPass() {
+		$listener = &new MockSimpleSocket();
+		
+		$fullpath = realpath(dirname(__FILE__).'/support/test1.php');
+		$testpath = EclipseReporter::escapeVal($fullpath);
+		$expected = "{status:\"pass\",message:\"pass1 at [$testpath line 4]\",group:\"$testpath\",case:\"test1\",method:\"test_pass\"}";
+		//this should work...but it doesn't so the next line and the last line are the hacks
+		//$listener->expectOnce('write',array($expected));
+		$listener->setReturnValue('write',-1);
+		
+		$pathparts = pathinfo($fullpath);
+		$filename = $pathparts['basename'];
+		$test= &new TestSuite($filename);
+		$test->addTestFile($fullpath);
+		$test->run(new EclipseReporter($listener));
+		$this->assertEqual($expected,$listener->output);
+	}
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/encoding_test.php b/3rdparty/simpletest/test/encoding_test.php
new file mode 100755
index 00000000000..a09236e057c
--- /dev/null
+++ b/3rdparty/simpletest/test/encoding_test.php
@@ -0,0 +1,240 @@
+<?php
+// $Id: encoding_test.php 1963 2009-10-07 11:57:52Z maetl_ $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../url.php');
+require_once(dirname(__FILE__) . '/../socket.php');
+
+Mock::generate('SimpleSocket');
+
+class TestOfEncodedParts extends UnitTestCase {
+    
+    function testFormEncodedAsKeyEqualsValue() {
+        $pair = new SimpleEncodedPair('a', 'A');
+        $this->assertEqual($pair->asRequest(), 'a=A');
+    }
+    
+    function testMimeEncodedAsHeadersAndContent() {
+        $pair = new SimpleEncodedPair('a', 'A');
+        $this->assertEqual(
+                $pair->asMime(),
+                "Content-Disposition: form-data; name=\"a\"\r\n\r\nA");
+    }
+    
+    function testAttachmentEncodedAsHeadersWithDispositionAndContent() {
+        $part = new SimpleAttachment('a', 'A', 'aaa.txt');
+        $this->assertEqual(
+                $part->asMime(),
+                "Content-Disposition: form-data; name=\"a\"; filename=\"aaa.txt\"\r\n" .
+                        "Content-Type: text/plain\r\n\r\nA");
+    }
+}
+
+class TestOfEncoding extends UnitTestCase {
+    private $content_so_far;
+    
+    function write($content) {
+        $this->content_so_far .= $content;
+    }
+    
+    function clear() {
+        $this->content_so_far = '';
+    }
+    
+    function assertWritten($encoding, $content, $message = '%s') {
+        $this->clear();
+        $encoding->writeTo($this);
+        $this->assertIdentical($this->content_so_far, $content, $message);
+    }
+    
+    function testGetEmpty() {
+        $encoding = new SimpleGetEncoding();
+        $this->assertIdentical($encoding->getValue('a'), false);
+        $this->assertIdentical($encoding->asUrlRequest(), '');
+    }
+    
+    function testPostEmpty() {
+        $encoding = new SimplePostEncoding();
+        $this->assertIdentical($encoding->getValue('a'), false);
+        $this->assertWritten($encoding, '');
+    }
+    
+    function testPrefilled() {
+        $encoding = new SimplePostEncoding(array('a' => 'aaa'));
+        $this->assertIdentical($encoding->getValue('a'), 'aaa');
+        $this->assertWritten($encoding, 'a=aaa');
+    }
+    
+    function testPrefilledWithTwoLevels() {
+        $query = array('a' => array('aa' => 'aaa'));
+        $encoding = new SimplePostEncoding($query);
+        $this->assertTrue($encoding->hasMoreThanOneLevel($query));
+        $this->assertEqual($encoding->rewriteArrayWithMultipleLevels($query), array('a[aa]' => 'aaa'));
+        $this->assertIdentical($encoding->getValue('a[aa]'), 'aaa');
+        $this->assertWritten($encoding, 'a%5Baa%5D=aaa');
+    }
+    
+    function testPrefilledWithThreeLevels() {
+        $query = array('a' => array('aa' => array('aaa' => 'aaaa')));
+        $encoding = new SimplePostEncoding($query);
+        $this->assertTrue($encoding->hasMoreThanOneLevel($query));
+        $this->assertEqual($encoding->rewriteArrayWithMultipleLevels($query), array('a[aa][aaa]' => 'aaaa'));
+        $this->assertIdentical($encoding->getValue('a[aa][aaa]'), 'aaaa');
+        $this->assertWritten($encoding, 'a%5Baa%5D%5Baaa%5D=aaaa');
+    }
+    
+    function testPrefilledWithObject() {
+        $encoding = new SimplePostEncoding(new SimpleEncoding(array('a' => 'aaa')));
+        $this->assertIdentical($encoding->getValue('a'), 'aaa');
+        $this->assertWritten($encoding, 'a=aaa');
+    }
+    
+    function testMultiplePrefilled() {
+        $query = array('a' => array('a1', 'a2'));
+        $encoding = new SimplePostEncoding($query);
+        $this->assertTrue($encoding->hasMoreThanOneLevel($query));
+        $this->assertEqual($encoding->rewriteArrayWithMultipleLevels($query), array('a[0]' => 'a1', 'a[1]' => 'a2'));
+        $this->assertIdentical($encoding->getValue('a[0]'), 'a1');
+        $this->assertIdentical($encoding->getValue('a[1]'), 'a2');
+        $this->assertWritten($encoding, 'a%5B0%5D=a1&a%5B1%5D=a2');
+    }
+    
+    function testSingleParameter() {
+        $encoding = new SimplePostEncoding();
+        $encoding->add('a', 'Hello');
+        $this->assertEqual($encoding->getValue('a'), 'Hello');
+        $this->assertWritten($encoding, 'a=Hello');
+    }
+    
+    function testFalseParameter() {
+        $encoding = new SimplePostEncoding();
+        $encoding->add('a', false);
+        $this->assertEqual($encoding->getValue('a'), false);
+        $this->assertWritten($encoding, '');
+    }
+    
+    function testUrlEncoding() {
+        $encoding = new SimplePostEncoding();
+        $encoding->add('a', 'Hello there!');
+        $this->assertWritten($encoding, 'a=Hello+there%21');
+    }
+    
+    function testUrlEncodingOfKey() {
+        $encoding = new SimplePostEncoding();
+        $encoding->add('a!', 'Hello');
+        $this->assertWritten($encoding, 'a%21=Hello');
+    }
+    
+    function testMultipleParameter() {
+        $encoding = new SimplePostEncoding();
+        $encoding->add('a', 'Hello');
+        $encoding->add('b', 'Goodbye');
+        $this->assertWritten($encoding, 'a=Hello&b=Goodbye');
+    }
+    
+    function testEmptyParameters() {
+        $encoding = new SimplePostEncoding();
+        $encoding->add('a', '');
+        $encoding->add('b', '');
+        $this->assertWritten($encoding, 'a=&b=');
+    }
+    
+    function testRepeatedParameter() {
+        $encoding = new SimplePostEncoding();
+        $encoding->add('a', 'Hello');
+        $encoding->add('a', 'Goodbye');
+        $this->assertIdentical($encoding->getValue('a'), array('Hello', 'Goodbye'));
+        $this->assertWritten($encoding, 'a=Hello&a=Goodbye');
+    }
+    
+    function testAddingLists() {
+        $encoding = new SimplePostEncoding();
+        $encoding->add('a', array('Hello', 'Goodbye'));
+        $this->assertIdentical($encoding->getValue('a'), array('Hello', 'Goodbye'));
+        $this->assertWritten($encoding, 'a=Hello&a=Goodbye');
+    }
+    
+    function testMergeInHash() {
+        $encoding = new SimpleGetEncoding(array('a' => 'A1', 'b' => 'B'));
+        $encoding->merge(array('a' => 'A2'));
+        $this->assertIdentical($encoding->getValue('a'), array('A1', 'A2'));
+        $this->assertIdentical($encoding->getValue('b'), 'B');
+    }
+    
+    function testMergeInObject() {
+        $encoding = new SimpleGetEncoding(array('a' => 'A1', 'b' => 'B'));
+        $encoding->merge(new SimpleEncoding(array('a' => 'A2')));
+        $this->assertIdentical($encoding->getValue('a'), array('A1', 'A2'));
+        $this->assertIdentical($encoding->getValue('b'), 'B');
+    }
+    
+    function testPrefilledMultipart() {
+        $encoding = new SimpleMultipartEncoding(array('a' => 'aaa'), 'boundary');
+        $this->assertIdentical($encoding->getValue('a'), 'aaa');
+        $this->assertwritten($encoding,
+                "--boundary\r\n" .
+                "Content-Disposition: form-data; name=\"a\"\r\n" .
+                "\r\n" .
+                "aaa\r\n" .
+                "--boundary--\r\n");
+    }
+    
+    function testAttachment() {
+        $encoding = new SimpleMultipartEncoding(array(), 'boundary');
+        $encoding->attach('a', 'aaa', 'aaa.txt');
+        $this->assertIdentical($encoding->getValue('a'), 'aaa.txt');
+        $this->assertwritten($encoding,
+                "--boundary\r\n" .
+                "Content-Disposition: form-data; name=\"a\"; filename=\"aaa.txt\"\r\n" .
+                "Content-Type: text/plain\r\n" .
+                "\r\n" .
+                "aaa\r\n" .
+                "--boundary--\r\n");
+    }
+    
+    function testEntityEncodingDefaultContentType() {
+        $encoding = new SimpleEntityEncoding();
+        $this->assertIdentical($encoding->getContentType(), 'application/x-www-form-urlencoded');
+        $this->assertWritten($encoding, '');
+    }
+    
+    function testEntityEncodingTextBody() {
+        $encoding = new SimpleEntityEncoding('plain text');
+        $this->assertIdentical($encoding->getContentType(), 'text/plain');
+        $this->assertWritten($encoding, 'plain text');
+    }
+    
+    function testEntityEncodingXmlBody() {
+        $encoding = new SimpleEntityEncoding('<p><a>xml</b><b>text</b></p>', 'text/xml');
+        $this->assertIdentical($encoding->getContentType(), 'text/xml');
+        $this->assertWritten($encoding, '<p><a>xml</b><b>text</b></p>');
+    }
+}
+
+class TestOfEncodingHeaders extends UnitTestCase {
+    
+    function testEmptyEncodingWritesZeroContentLength() {
+        $socket = new MockSimpleSocket();
+        $socket->expectAt(0, 'write', array("Content-Length: 0\r\n"));
+        $socket->expectAt(1, 'write', array("Content-Type: application/x-www-form-urlencoded\r\n"));
+        $encoding = new SimpleEntityEncoding();
+        $encoding->writeHeadersTo($socket);
+    }
+    
+    function testTextEncodingWritesDefaultContentType() {
+        $socket = new MockSimpleSocket();
+        $socket->expectAt(0, 'write', array("Content-Length: 18\r\n"));
+        $socket->expectAt(1, 'write', array("Content-Type: text/plain\r\n"));
+        $encoding = new SimpleEntityEncoding('one two three four');
+        $encoding->writeHeadersTo($socket);
+    }
+    
+    function testEmptyMultipartEncodingWritesEndBoundaryContentLength() {
+        $socket = new MockSimpleSocket();
+        $socket->expectAt(0, 'write', array("Content-Length: 14\r\n"));
+        $socket->expectAt(1, 'write', array("Content-Type: multipart/form-data; boundary=boundary\r\n"));
+        $encoding = new SimpleMultipartEncoding(array(), 'boundary');
+        $encoding->writeHeadersTo($socket);
+    }
+    
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/errors_test.php b/3rdparty/simpletest/test/errors_test.php
new file mode 100755
index 00000000000..ebb9e05891f
--- /dev/null
+++ b/3rdparty/simpletest/test/errors_test.php
@@ -0,0 +1,229 @@
+<?php
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../errors.php');
+require_once(dirname(__FILE__) . '/../expectation.php');
+require_once(dirname(__FILE__) . '/../test_case.php');
+Mock::generate('SimpleTestCase');
+Mock::generate('SimpleExpectation');
+SimpleTest::ignore('MockSimpleTestCase');
+
+class TestOfErrorQueue extends UnitTestCase {
+
+    function setUp() {
+        $context = SimpleTest::getContext();
+        $queue = $context->get('SimpleErrorQueue');
+        $queue->clear();
+    }
+
+    function tearDown() {
+        $context = SimpleTest::getContext();
+        $queue = $context->get('SimpleErrorQueue');
+        $queue->clear();
+    }
+
+    function testExpectationMatchCancelsIncomingError() {
+        $test = new MockSimpleTestCase();
+        $test->expectOnce('assert', array(
+                new IdenticalExpectation(new AnythingExpectation()),
+                'B',
+                'a message'));
+        $test->setReturnValue('assert', true);
+        $test->expectNever('error');
+        $queue = new SimpleErrorQueue();
+        $queue->setTestCase($test);
+        $queue->expectError(new AnythingExpectation(), 'a message');
+        $queue->add(1024, 'B', 'b.php', 100);
+    }
+}
+
+class TestOfErrorTrap extends UnitTestCase {
+    private $old;
+
+    function setUp() {
+        $this->old = error_reporting(E_ALL);
+        set_error_handler('SimpleTestErrorHandler');
+    }
+
+    function tearDown() {
+        restore_error_handler();
+        error_reporting($this->old);
+    }
+
+    function testQueueStartsEmpty() {
+        $context = SimpleTest::getContext();
+        $queue = $context->get('SimpleErrorQueue');
+        $this->assertFalse($queue->extract());
+    }
+
+    function testErrorsAreSwallowedByMatchingExpectation() {
+        $this->expectError('Ouch!');
+        trigger_error('Ouch!');
+    }
+
+    function testErrorsAreSwallowedInOrder() {
+        $this->expectError('a');
+        $this->expectError('b');
+        trigger_error('a');
+        trigger_error('b');
+    }
+
+    function testAnyErrorCanBeSwallowed() {
+        $this->expectError();
+        trigger_error('Ouch!');
+    }
+
+    function testErrorCanBeSwallowedByPatternMatching() {
+        $this->expectError(new PatternExpectation('/ouch/i'));
+        trigger_error('Ouch!');
+    }
+
+    function testErrorWithPercentsPassesWithNoSprintfError() {
+        $this->expectError("%");
+        trigger_error('%');
+    }
+}
+
+class TestOfErrors extends UnitTestCase {
+    private $old;
+
+    function setUp() {
+        $this->old = error_reporting(E_ALL);
+    }
+
+    function tearDown() {
+        error_reporting($this->old);
+    }
+
+    function testDefaultWhenAllReported() {
+        error_reporting(E_ALL);
+        $this->expectError('Ouch!');
+        trigger_error('Ouch!');
+    }
+
+    function testNoticeWhenReported() {
+        error_reporting(E_ALL);
+        $this->expectError('Ouch!');
+        trigger_error('Ouch!', E_USER_NOTICE);
+    }
+
+    function testWarningWhenReported() {
+        error_reporting(E_ALL);
+        $this->expectError('Ouch!');
+        trigger_error('Ouch!', E_USER_WARNING);
+    }
+
+    function testErrorWhenReported() {
+        error_reporting(E_ALL);
+        $this->expectError('Ouch!');
+        trigger_error('Ouch!', E_USER_ERROR);
+    }
+
+    function testNoNoticeWhenNotReported() {
+        error_reporting(0);
+        trigger_error('Ouch!', E_USER_NOTICE);
+    }
+
+    function testNoWarningWhenNotReported() {
+        error_reporting(0);
+        trigger_error('Ouch!', E_USER_WARNING);
+    }
+
+    function testNoticeSuppressedWhenReported() {
+        error_reporting(E_ALL);
+        @trigger_error('Ouch!', E_USER_NOTICE);
+    }
+
+    function testWarningSuppressedWhenReported() {
+        error_reporting(E_ALL);
+        @trigger_error('Ouch!', E_USER_WARNING);
+    }
+
+    function testErrorWithPercentsReportedWithNoSprintfError() {
+        $this->expectError('%');
+        trigger_error('%');
+    }
+}
+
+class TestOfPHP52RecoverableErrors extends UnitTestCase {
+    function skip() {
+        $this->skipIf(
+                version_compare(phpversion(), '5.2', '<'),
+                'E_RECOVERABLE_ERROR not tested for PHP below 5.2');
+    }
+
+    function testError() {
+        eval('
+            class RecoverableErrorTestingStub {
+                function ouch(RecoverableErrorTestingStub $obj) {
+                }
+            }
+        ');
+
+        $stub = new RecoverableErrorTestingStub();
+        $this->expectError(new PatternExpectation('/must be an instance of RecoverableErrorTestingStub/i'));
+        $stub->ouch(new stdClass());
+    }
+}
+
+class TestOfErrorsExcludingPHP52AndAbove extends UnitTestCase {
+    function skip() {
+        $this->skipIf(
+                version_compare(phpversion(), '5.2', '>='),
+                'E_USER_ERROR not tested for PHP 5.2 and above');
+    }
+
+    function testNoErrorWhenNotReported() {
+        error_reporting(0);
+        trigger_error('Ouch!', E_USER_ERROR);
+    }
+
+    function testErrorSuppressedWhenReported() {
+        error_reporting(E_ALL);
+        @trigger_error('Ouch!', E_USER_ERROR);
+    }
+}
+
+SimpleTest::ignore('TestOfNotEnoughErrors');
+/**
+ * This test is ignored as it is used by {@link TestRunnerForLeftOverAndNotEnoughErrors}
+ * to verify that it fails as expected.
+ *
+ * @ignore
+ */
+class TestOfNotEnoughErrors extends UnitTestCase {
+    function testExpectTwoErrorsThrowOne() {
+        $this->expectError('Error 1');
+        trigger_error('Error 1');
+        $this->expectError('Error 2');
+    }
+}
+
+SimpleTest::ignore('TestOfLeftOverErrors');
+/**
+ * This test is ignored as it is used by {@link TestRunnerForLeftOverAndNotEnoughErrors}
+ * to verify that it fails as expected.
+ *
+ * @ignore
+ */
+class TestOfLeftOverErrors extends UnitTestCase {
+    function testExpectOneErrorGetTwo() {
+        $this->expectError('Error 1');
+        trigger_error('Error 1');
+        trigger_error('Error 2');
+    }
+}
+
+class TestRunnerForLeftOverAndNotEnoughErrors extends UnitTestCase {
+    function testRunLeftOverErrorsTestCase() {
+        $test = new TestOfLeftOverErrors();
+        $this->assertFalse($test->run(new SimpleReporter()));
+    }
+
+    function testRunNotEnoughErrors() {
+        $test = new TestOfNotEnoughErrors();
+        $this->assertFalse($test->run(new SimpleReporter()));
+    }
+}
+
+// TODO: Add stacked error handler test
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/exceptions_test.php b/3rdparty/simpletest/test/exceptions_test.php
new file mode 100755
index 00000000000..1011543d4fa
--- /dev/null
+++ b/3rdparty/simpletest/test/exceptions_test.php
@@ -0,0 +1,183 @@
+<?php
+// $Id: exceptions_test.php 1882 2009-07-01 14:30:05Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../exceptions.php');
+require_once(dirname(__FILE__) . '/../expectation.php');
+require_once(dirname(__FILE__) . '/../test_case.php');
+Mock::generate('SimpleTestCase');
+Mock::generate('SimpleExpectation');
+
+class MyTestException extends Exception {}
+class HigherTestException extends MyTestException {}
+class OtherTestException extends Exception {}
+
+class TestOfExceptionExpectation extends UnitTestCase {
+
+    function testExceptionClassAsStringWillMatchExceptionsRootedOnThatClass() {
+        $expectation = new ExceptionExpectation('MyTestException');
+        $this->assertTrue($expectation->test(new MyTestException()));
+        $this->assertTrue($expectation->test(new HigherTestException()));
+        $this->assertFalse($expectation->test(new OtherTestException()));
+    }
+
+    function testMatchesClassAndMessageWhenExceptionExpected() {
+        $expectation = new ExceptionExpectation(new MyTestException('Hello'));
+        $this->assertTrue($expectation->test(new MyTestException('Hello')));
+        $this->assertFalse($expectation->test(new HigherTestException('Hello')));
+        $this->assertFalse($expectation->test(new OtherTestException('Hello')));
+        $this->assertFalse($expectation->test(new MyTestException('Goodbye')));
+        $this->assertFalse($expectation->test(new MyTestException()));
+    }
+
+    function testMessagelessExceptionMatchesOnlyOnClass() {
+        $expectation = new ExceptionExpectation(new MyTestException());
+        $this->assertTrue($expectation->test(new MyTestException()));
+        $this->assertFalse($expectation->test(new HigherTestException()));
+    }
+}
+
+class TestOfExceptionTrap extends UnitTestCase {
+
+    function testNoExceptionsInQueueMeansNoTestMessages() {
+        $test = new MockSimpleTestCase();
+        $test->expectNever('assert');
+        $queue = new SimpleExceptionTrap();
+        $this->assertFalse($queue->isExpected($test, new Exception()));
+    }
+
+    function testMatchingExceptionGivesTrue() {
+        $expectation = new MockSimpleExpectation();
+        $expectation->setReturnValue('test', true);
+        $test = new MockSimpleTestCase();
+        $test->setReturnValue('assert', true);
+        $queue = new SimpleExceptionTrap();
+        $queue->expectException($expectation, 'message');
+        $this->assertTrue($queue->isExpected($test, new Exception()));
+    }
+
+    function testMatchingExceptionTriggersAssertion() {
+        $test = new MockSimpleTestCase();
+        $test->expectOnce('assert', array(
+                '*',
+                new ExceptionExpectation(new Exception()),
+                'message'));
+        $queue = new SimpleExceptionTrap();
+        $queue->expectException(new ExceptionExpectation(new Exception()), 'message');
+        $queue->isExpected($test, new Exception());
+    }
+}
+
+class TestOfCatchingExceptions extends UnitTestCase {
+
+    function testCanCatchAnyExpectedException() {
+        $this->expectException();
+        throw new Exception();
+    }
+
+    function testCanMatchExceptionByClass() {
+        $this->expectException('MyTestException');
+        throw new HigherTestException();
+    }
+
+    function testCanMatchExceptionExactly() {
+        $this->expectException(new Exception('Ouch'));
+        throw new Exception('Ouch');
+    }
+
+    function testLastListedExceptionIsTheOneThatCounts() {
+        $this->expectException('OtherTestException');
+        $this->expectException('MyTestException');
+        throw new HigherTestException();
+    }
+}
+
+class TestOfIgnoringExceptions extends UnitTestCase {
+
+    function testCanIgnoreAnyException() {
+        $this->ignoreException();
+        throw new Exception();
+    }
+
+    function testCanIgnoreSpecificException() {
+        $this->ignoreException('MyTestException');
+        throw new MyTestException();
+    }
+
+    function testCanIgnoreExceptionExactly() {
+        $this->ignoreException(new Exception('Ouch'));
+        throw new Exception('Ouch');
+    }
+
+    function testIgnoredExceptionsDoNotMaskExpectedExceptions() {
+        $this->ignoreException('Exception');
+        $this->expectException('MyTestException');
+        throw new MyTestException();
+    }
+
+    function testCanIgnoreMultipleExceptions() {
+        $this->ignoreException('MyTestException');
+        $this->ignoreException('OtherTestException');
+        throw new OtherTestException();
+    }
+}
+
+class TestOfCallingTearDownAfterExceptions extends UnitTestCase {
+    private $debri = 0;
+
+    function tearDown() {
+        $this->debri--;
+    }
+
+    function testLeaveSomeDebri() {
+        $this->debri++;
+        $this->expectException();
+        throw new Exception(__FUNCTION__);
+    }
+
+	function testDebriWasRemovedOnce() {
+        $this->assertEqual($this->debri, 0);
+	}
+}
+
+class TestOfExceptionThrownInSetUpDoesNotRunTestBody extends UnitTestCase {
+
+	function setUp() {
+        $this->expectException();
+        throw new Exception();
+	}
+
+	function testShouldNotBeRun() {
+        $this->fail('This test body should not be run');
+	}
+
+	function testShouldNotBeRunEither() {
+        $this->fail('This test body should not be run either');
+	}
+}
+
+class TestOfExpectExceptionWithSetUp extends UnitTestCase {
+
+	function setUp() {
+        $this->expectException();
+	}
+
+	function testThisExceptionShouldBeCaught() {
+        throw new Exception();
+	}
+
+	function testJustThrowingMyTestException() {
+        throw new MyTestException();
+	}
+}
+
+class TestOfThrowingExceptionsInTearDown extends UnitTestCase {
+
+    function tearDown() {
+        throw new Exception();
+    }
+
+    function testDoesntFatal() {
+        $this->expectException();
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/expectation_test.php b/3rdparty/simpletest/test/expectation_test.php
new file mode 100755
index 00000000000..31fbe65e683
--- /dev/null
+++ b/3rdparty/simpletest/test/expectation_test.php
@@ -0,0 +1,317 @@
+<?php
+// $Id: expectation_test.php 2009 2011-04-28 08:57:25Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../expectation.php');
+
+class TestOfEquality extends UnitTestCase {
+
+    function testBoolean() {
+        $is_true = new EqualExpectation(true);
+        $this->assertTrue($is_true->test(true));
+        $this->assertFalse($is_true->test(false));
+    }
+
+    function testStringMatch() {
+        $hello = new EqualExpectation("Hello");
+        $this->assertTrue($hello->test("Hello"));
+        $this->assertFalse($hello->test("Goodbye"));
+    }
+
+    function testInteger() {
+        $fifteen = new EqualExpectation(15);
+        $this->assertTrue($fifteen->test(15));
+        $this->assertFalse($fifteen->test(14));
+    }
+
+    function testFloat() {
+        $pi = new EqualExpectation(3.14);
+        $this->assertTrue($pi->test(3.14));
+        $this->assertFalse($pi->test(3.15));
+    }
+
+    function testArray() {
+        $colours = new EqualExpectation(array("r", "g", "b"));
+        $this->assertTrue($colours->test(array("r", "g", "b")));
+        $this->assertFalse($colours->test(array("g", "b", "r")));
+    }
+
+    function testHash() {
+        $is_blue = new EqualExpectation(array("r" => 0, "g" => 0, "b" => 255));
+        $this->assertTrue($is_blue->test(array("r" => 0, "g" => 0, "b" => 255)));
+        $this->assertFalse($is_blue->test(array("r" => 0, "g" => 255, "b" => 0)));
+    }
+
+    function testHashWithOutOfOrderKeysShouldStillMatch() {
+        $any_order = new EqualExpectation(array('a' => 1, 'b' => 2));
+        $this->assertTrue($any_order->test(array('b' => 2, 'a' => 1)));
+    }
+}
+
+class TestOfWithin extends UnitTestCase {
+
+    function testWithinFloatingPointMargin() {
+        $within = new WithinMarginExpectation(1.0, 0.2);
+        $this->assertFalse($within->test(0.7));
+        $this->assertTrue($within->test(0.8));
+        $this->assertTrue($within->test(0.9));
+        $this->assertTrue($within->test(1.1));
+        $this->assertTrue($within->test(1.2));
+        $this->assertFalse($within->test(1.3));
+    }
+
+    function testOutsideFloatingPointMargin() {
+        $within = new OutsideMarginExpectation(1.0, 0.2);
+        $this->assertTrue($within->test(0.7));
+        $this->assertFalse($within->test(0.8));
+        $this->assertFalse($within->test(1.2));
+        $this->assertTrue($within->test(1.3));
+    }
+}
+
+class TestOfInequality extends UnitTestCase {
+
+    function testStringMismatch() {
+        $not_hello = new NotEqualExpectation("Hello");
+        $this->assertTrue($not_hello->test("Goodbye"));
+        $this->assertFalse($not_hello->test("Hello"));
+    }
+}
+
+class RecursiveNasty {
+    private $me;
+
+    function RecursiveNasty() {
+        $this->me = $this;
+    }
+}
+
+class OpaqueContainer {
+    private $stuff;
+    private $value;
+
+    public function __construct($value) {
+        $this->value = $value;
+    }
+}
+
+class DerivedOpaqueContainer extends OpaqueContainer {
+    // Deliberately have a variable whose name with the same suffix as a later
+    // variable
+    private $new_value = 1;
+
+    // Deliberately obscures the variable of the same name in the base
+    // class.
+    private $value;
+
+    public function __construct($value, $base_value) {
+        parent::__construct($base_value);
+        $this->value = $value;
+    }
+}
+
+class TestOfIdentity extends UnitTestCase {
+
+    function testType() {
+        $string = new IdenticalExpectation("37");
+        $this->assertTrue($string->test("37"));
+        $this->assertFalse($string->test(37));
+        $this->assertFalse($string->test("38"));
+    }
+
+    function _testNastyPhp5Bug() {
+        $this->assertFalse(new RecursiveNasty() != new RecursiveNasty());
+    }
+
+    function _testReallyHorribleRecursiveStructure() {
+        $hopeful = new IdenticalExpectation(new RecursiveNasty());
+        $this->assertTrue($hopeful->test(new RecursiveNasty()));
+    }
+
+    function testCanComparePrivateMembers() {
+        $expectFive = new IdenticalExpectation(new OpaqueContainer(5));
+        $this->assertTrue($expectFive->test(new OpaqueContainer(5)));
+        $this->assertFalse($expectFive->test(new OpaqueContainer(6)));
+    }
+
+    function testCanComparePrivateMembersOfObjectsInArrays() {
+        $expectFive = new IdenticalExpectation(array(new OpaqueContainer(5)));
+        $this->assertTrue($expectFive->test(array(new OpaqueContainer(5))));
+        $this->assertFalse($expectFive->test(array(new OpaqueContainer(6))));
+    }
+
+    function testCanComparePrivateMembersOfObjectsWherePrivateMemberOfBaseClassIsObscured() {
+        $expectFive = new IdenticalExpectation(array(new DerivedOpaqueContainer(1,2)));
+        $this->assertTrue($expectFive->test(array(new DerivedOpaqueContainer(1,2))));
+        $this->assertFalse($expectFive->test(array(new DerivedOpaqueContainer(0,2))));
+        $this->assertFalse($expectFive->test(array(new DerivedOpaqueContainer(0,9))));
+        $this->assertFalse($expectFive->test(array(new DerivedOpaqueContainer(1,0))));
+    }
+}
+
+class TransparentContainer {
+    public $value;
+
+    public function __construct($value) {
+        $this->value = $value;
+    }
+}
+
+class TestOfMemberComparison extends UnitTestCase {
+
+    function testMemberExpectationCanMatchPublicMember() {
+        $expect_five = new MemberExpectation('value', 5);
+        $this->assertTrue($expect_five->test(new TransparentContainer(5)));
+        $this->assertFalse($expect_five->test(new TransparentContainer(8)));
+    }
+
+    function testMemberExpectationCanMatchPrivateMember() {
+        $expect_five = new MemberExpectation('value', 5);
+        $this->assertTrue($expect_five->test(new OpaqueContainer(5)));
+        $this->assertFalse($expect_five->test(new OpaqueContainer(8)));
+    }
+
+    function testMemberExpectationCanMatchPrivateMemberObscuredByDerivedClass() {
+        $expect_five = new MemberExpectation('value', 5);
+        $this->assertTrue($expect_five->test(new DerivedOpaqueContainer(5,8)));
+        $this->assertTrue($expect_five->test(new DerivedOpaqueContainer(5,5)));
+        $this->assertFalse($expect_five->test(new DerivedOpaqueContainer(8,8)));
+        $this->assertFalse($expect_five->test(new DerivedOpaqueContainer(8,5)));
+    }
+
+}
+
+class DummyReferencedObject{}
+
+class TestOfReference extends UnitTestCase {
+
+    function testReference() {
+        $foo = "foo";
+        $ref = &$foo;
+        $not_ref = $foo;
+        $bar = "bar";
+
+        $expect = new ReferenceExpectation($foo);
+        $this->assertTrue($expect->test($ref));
+        $this->assertFalse($expect->test($not_ref));
+        $this->assertFalse($expect->test($bar));
+    }
+}
+
+class TestOfNonIdentity extends UnitTestCase {
+
+    function testType() {
+        $string = new NotIdenticalExpectation("37");
+        $this->assertTrue($string->test("38"));
+        $this->assertTrue($string->test(37));
+        $this->assertFalse($string->test("37"));
+    }
+}
+
+class TestOfPatterns extends UnitTestCase {
+
+    function testWanted() {
+        $pattern = new PatternExpectation('/hello/i');
+        $this->assertTrue($pattern->test("Hello world"));
+        $this->assertFalse($pattern->test("Goodbye world"));
+    }
+
+    function testUnwanted() {
+        $pattern = new NoPatternExpectation('/hello/i');
+        $this->assertFalse($pattern->test("Hello world"));
+        $this->assertTrue($pattern->test("Goodbye world"));
+    }
+}
+
+class ExpectedMethodTarget {
+    function hasThisMethod() {}
+}
+
+class TestOfMethodExistence extends UnitTestCase {
+
+    function testHasMethod() {
+        $instance = new ExpectedMethodTarget();
+        $expectation = new MethodExistsExpectation('hasThisMethod');
+        $this->assertTrue($expectation->test($instance));
+        $expectation = new MethodExistsExpectation('doesNotHaveThisMethod');
+        $this->assertFalse($expectation->test($instance));
+    }
+}
+
+class TestOfIsA extends UnitTestCase {
+
+    function testString() {
+        $expectation = new IsAExpectation('string');
+        $this->assertTrue($expectation->test('Hello'));
+        $this->assertFalse($expectation->test(5));
+    }
+
+    function testBoolean() {
+        $expectation = new IsAExpectation('boolean');
+        $this->assertTrue($expectation->test(true));
+        $this->assertFalse($expectation->test(1));
+    }
+
+    function testBool() {
+        $expectation = new IsAExpectation('bool');
+        $this->assertTrue($expectation->test(true));
+        $this->assertFalse($expectation->test(1));
+    }
+
+    function testDouble() {
+        $expectation = new IsAExpectation('double');
+        $this->assertTrue($expectation->test(5.0));
+        $this->assertFalse($expectation->test(5));
+    }
+
+    function testFloat() {
+        $expectation = new IsAExpectation('float');
+        $this->assertTrue($expectation->test(5.0));
+        $this->assertFalse($expectation->test(5));
+    }
+
+    function testReal() {
+        $expectation = new IsAExpectation('real');
+        $this->assertTrue($expectation->test(5.0));
+        $this->assertFalse($expectation->test(5));
+    }
+
+    function testInteger() {
+        $expectation = new IsAExpectation('integer');
+        $this->assertTrue($expectation->test(5));
+        $this->assertFalse($expectation->test(5.0));
+    }
+
+    function testInt() {
+        $expectation = new IsAExpectation('int');
+        $this->assertTrue($expectation->test(5));
+        $this->assertFalse($expectation->test(5.0));
+    }
+
+    function testScalar() {
+        $expectation = new IsAExpectation('scalar');
+        $this->assertTrue($expectation->test(5));
+        $this->assertFalse($expectation->test(array(5)));
+    }
+
+    function testNumeric() {
+        $expectation = new IsAExpectation('numeric');
+        $this->assertTrue($expectation->test(5));
+        $this->assertFalse($expectation->test('string'));
+    }
+
+    function testNull() {
+        $expectation = new IsAExpectation('null');
+        $this->assertTrue($expectation->test(null));
+        $this->assertFalse($expectation->test('string'));
+    }
+}
+
+class TestOfNotA extends UnitTestCase {
+
+    function testString() {
+        $expectation = new NotAExpectation('string');
+        $this->assertFalse($expectation->test('Hello'));
+        $this->assertTrue($expectation->test(5));
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/form_test.php b/3rdparty/simpletest/test/form_test.php
new file mode 100755
index 00000000000..70a18f2b3a0
--- /dev/null
+++ b/3rdparty/simpletest/test/form_test.php
@@ -0,0 +1,344 @@
+<?php
+// $Id: form_test.php 1996 2010-07-27 09:11:59Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../url.php');
+require_once(dirname(__FILE__) . '/../form.php');
+require_once(dirname(__FILE__) . '/../page.php');
+require_once(dirname(__FILE__) . '/../encoding.php');
+Mock::generate('SimplePage');
+
+class TestOfForm extends UnitTestCase {
+    
+    function page($url, $action = false) {
+        $page = new MockSimplePage();
+        $page->returns('getUrl', new SimpleUrl($url));
+        $page->returns('expandUrl', new SimpleUrl($url));
+        return $page;
+    }
+    
+    function testFormAttributes() {
+        $tag = new SimpleFormTag(array('method' => 'GET', 'action' => 'here.php', 'id' => '33'));
+        $form = new SimpleForm($tag, $this->page('http://host/a/index.html'));
+        $this->assertEqual($form->getMethod(), 'get');
+        $this->assertIdentical($form->getId(), '33');
+        $this->assertNull($form->getValue(new SimpleByName('a')));
+    }
+    
+    function testAction() {
+        $page = new MockSimplePage();
+        $page->expectOnce('expandUrl', array(new SimpleUrl('here.php')));
+        $page->setReturnValue('expandUrl', new SimpleUrl('http://host/here.php'));
+        $tag = new SimpleFormTag(array('method' => 'GET', 'action' => 'here.php'));
+        $form = new SimpleForm($tag, $page);
+        $this->assertEqual($form->getAction(), new SimpleUrl('http://host/here.php'));
+    }
+    
+    function testEmptyAction() {
+        $tag = new SimpleFormTag(array('method' => 'GET', 'action' => '', 'id' => '33'));
+        $form = new SimpleForm($tag, $this->page('http://host/a/index.html'));
+        $this->assertEqual(
+                $form->getAction(),
+                new SimpleUrl('http://host/a/index.html'));
+    }
+    
+    function testMissingAction() {
+        $tag = new SimpleFormTag(array('method' => 'GET'));
+        $form = new SimpleForm($tag, $this->page('http://host/a/index.html'));
+        $this->assertEqual(
+                $form->getAction(),
+                new SimpleUrl('http://host/a/index.html'));
+    }
+    
+    function testRootAction() {
+        $page = new MockSimplePage();
+        $page->expectOnce('expandUrl', array(new SimpleUrl('/')));
+        $page->setReturnValue('expandUrl', new SimpleUrl('http://host/'));
+        $tag = new SimpleFormTag(array('method' => 'GET', 'action' => '/'));
+        $form = new SimpleForm($tag, $page);
+        $this->assertEqual(
+                $form->getAction(),
+                new SimpleUrl('http://host/'));
+    }
+    
+    function testDefaultFrameTargetOnForm() {
+        $page = new MockSimplePage();
+        $page->expectOnce('expandUrl', array(new SimpleUrl('here.php')));
+        $page->setReturnValue('expandUrl', new SimpleUrl('http://host/here.php'));
+        $tag = new SimpleFormTag(array('method' => 'GET', 'action' => 'here.php'));
+        $form = new SimpleForm($tag, $page);
+        $form->setDefaultTarget('frame');
+        $expected = new SimpleUrl('http://host/here.php');
+        $expected->setTarget('frame');
+        $this->assertEqual($form->getAction(), $expected);
+    }
+    
+    function testTextWidget() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleTextTag(
+                array('name' => 'me', 'type' => 'text', 'value' => 'Myself')));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'Myself');
+        $this->assertTrue($form->setField(new SimpleByName('me'), 'Not me'));
+        $this->assertFalse($form->setField(new SimpleByName('not_present'), 'Not me'));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'Not me');
+        $this->assertNull($form->getValue(new SimpleByName('not_present')));
+    }
+    
+    function testTextWidgetById() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleTextTag(
+                array('name' => 'me', 'type' => 'text', 'value' => 'Myself', 'id' => 50)));
+        $this->assertIdentical($form->getValue(new SimpleById(50)), 'Myself');
+        $this->assertTrue($form->setField(new SimpleById(50), 'Not me'));
+        $this->assertIdentical($form->getValue(new SimpleById(50)), 'Not me');
+    }
+    
+    function testTextWidgetByLabel() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $widget = new SimpleTextTag(array('name' => 'me', 'type' => 'text', 'value' => 'a'));
+        $form->addWidget($widget);
+        $widget->setLabel('thing');
+        $this->assertIdentical($form->getValue(new SimpleByLabel('thing')), 'a');
+        $this->assertTrue($form->setField(new SimpleByLabel('thing'), 'b'));
+        $this->assertIdentical($form->getValue(new SimpleByLabel('thing')), 'b');
+    }
+    
+    function testSubmitEmpty() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $this->assertIdentical($form->submit(), new SimpleGetEncoding());
+    }
+    
+    function testSubmitButton() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
+        $form->addWidget(new SimpleSubmitTag(
+                array('type' => 'submit', 'name' => 'go', 'value' => 'Go!', 'id' => '9')));
+        $this->assertTrue($form->hasSubmit(new SimpleByName('go')));
+        $this->assertEqual($form->getValue(new SimpleByName('go')), 'Go!');
+        $this->assertEqual($form->getValue(new SimpleById(9)), 'Go!');
+        $this->assertEqual(
+                $form->submitButton(new SimpleByName('go')),
+                new SimpleGetEncoding(array('go' => 'Go!')));            
+        $this->assertEqual(
+                $form->submitButton(new SimpleByLabel('Go!')),
+                new SimpleGetEncoding(array('go' => 'Go!')));
+        $this->assertEqual(
+                $form->submitButton(new SimpleById(9)),
+                new SimpleGetEncoding(array('go' => 'Go!')));            
+    }
+    
+    function testSubmitWithAdditionalParameters() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
+        $form->addWidget(new SimpleSubmitTag(
+                array('type' => 'submit', 'name' => 'go', 'value' => 'Go!')));
+        $this->assertEqual(
+                $form->submitButton(new SimpleByLabel('Go!'), array('a' => 'A')),
+                new SimpleGetEncoding(array('go' => 'Go!', 'a' => 'A')));            
+    }
+    
+    function testSubmitButtonWithLabelOfSubmit() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
+        $form->addWidget(new SimpleSubmitTag(
+                array('type' => 'submit', 'name' => 'test', 'value' => 'Submit')));
+        $this->assertEqual(
+                $form->submitButton(new SimpleByName('test')),
+                new SimpleGetEncoding(array('test' => 'Submit')));            
+        $this->assertEqual(
+                $form->submitButton(new SimpleByLabel('Submit')),
+                new SimpleGetEncoding(array('test' => 'Submit')));            
+    }
+    
+    function testSubmitButtonWithWhitespacePaddedLabelOfSubmit() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
+        $form->addWidget(new SimpleSubmitTag(
+                array('type' => 'submit', 'name' => 'test', 'value' => ' Submit ')));
+        $this->assertEqual(
+                $form->submitButton(new SimpleByLabel('Submit')),
+                new SimpleGetEncoding(array('test' => ' Submit ')));            
+    }
+    
+    function testImageSubmitButton() {
+        $form = new SimpleForm(new SimpleFormTag(array()),  $this->page('htp://host'));
+        $form->addWidget(new SimpleImageSubmitTag(array(
+                'type' => 'image',
+                'src' => 'source.jpg',
+                'name' => 'go',
+                'alt' => 'Go!',
+                'id' => '9')));
+        $this->assertTrue($form->hasImage(new SimpleByLabel('Go!')));
+        $this->assertEqual(
+                $form->submitImage(new SimpleByLabel('Go!'), 100, 101),
+                new SimpleGetEncoding(array('go.x' => 100, 'go.y' => 101)));
+        $this->assertTrue($form->hasImage(new SimpleByName('go')));
+        $this->assertEqual(
+                $form->submitImage(new SimpleByName('go'), 100, 101),
+                new SimpleGetEncoding(array('go.x' => 100, 'go.y' => 101)));
+        $this->assertTrue($form->hasImage(new SimpleById(9)));
+        $this->assertEqual(
+                $form->submitImage(new SimpleById(9), 100, 101),
+                new SimpleGetEncoding(array('go.x' => 100, 'go.y' => 101)));
+    }
+    
+    function testImageSubmitButtonWithAdditionalData() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleImageSubmitTag(array(
+                'type' => 'image',
+                'src' => 'source.jpg',
+                'name' => 'go',
+                'alt' => 'Go!')));
+        $this->assertEqual(
+                $form->submitImage(new SimpleByLabel('Go!'), 100, 101, array('a' => 'A')),
+                new SimpleGetEncoding(array('go.x' => 100, 'go.y' => 101, 'a' => 'A')));
+    }
+    
+    function testButtonTag() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
+        $widget = new SimpleButtonTag(
+                array('type' => 'submit', 'name' => 'go', 'value' => 'Go', 'id' => '9'));
+        $widget->addContent('Go!');
+        $form->addWidget($widget);
+        $this->assertTrue($form->hasSubmit(new SimpleByName('go')));
+        $this->assertTrue($form->hasSubmit(new SimpleByLabel('Go!')));
+        $this->assertEqual(
+                $form->submitButton(new SimpleByName('go')),
+                new SimpleGetEncoding(array('go' => 'Go')));
+        $this->assertEqual(
+                $form->submitButton(new SimpleByLabel('Go!')),
+                new SimpleGetEncoding(array('go' => 'Go')));
+        $this->assertEqual(
+                $form->submitButton(new SimpleById(9)),
+                new SimpleGetEncoding(array('go' => 'Go')));
+    }
+    
+    function testMultipleFieldsWithSameNameSubmitted() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $input = new SimpleTextTag(array('name' => 'elements[]', 'value' => '1'));
+        $form->addWidget($input);
+        $input = new SimpleTextTag(array('name' => 'elements[]', 'value' => '2'));
+        $form->addWidget($input);
+        $form->setField(new SimpleByLabelOrName('elements[]'), '3', 1);
+        $form->setField(new SimpleByLabelOrName('elements[]'), '4', 2);
+		$submit = $form->submit();
+		$requests = $submit->getAll();
+        $this->assertEqual(count($requests), 2);
+        $this->assertIdentical($requests[0], new SimpleEncodedPair('elements[]', '3'));
+        $this->assertIdentical($requests[1], new SimpleEncodedPair('elements[]', '4'));
+    }
+    
+    function testSingleSelectFieldSubmitted() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $select = new SimpleSelectionTag(array('name' => 'a'));
+        $select->addTag(new SimpleOptionTag(
+                array('value' => 'aaa', 'selected' => '')));
+        $form->addWidget($select);
+        $this->assertIdentical(
+                $form->submit(),
+                new SimpleGetEncoding(array('a' => 'aaa')));
+    }
+    
+    function testSingleSelectFieldSubmittedWithPost() {
+        $form = new SimpleForm(new SimpleFormTag(array('method' => 'post')), $this->page('htp://host'));
+        $select = new SimpleSelectionTag(array('name' => 'a'));
+        $select->addTag(new SimpleOptionTag(
+                array('value' => 'aaa', 'selected' => '')));
+        $form->addWidget($select);
+        $this->assertIdentical(
+                $form->submit(),
+                new SimplePostEncoding(array('a' => 'aaa')));
+    }
+    
+    function testUnchecked() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleCheckboxTag(
+                array('name' => 'me', 'type' => 'checkbox')));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), false);
+        $this->assertTrue($form->setField(new SimpleByName('me'), 'on'));
+        $this->assertEqual($form->getValue(new SimpleByName('me')), 'on');
+        $this->assertFalse($form->setField(new SimpleByName('me'), 'other'));
+        $this->assertEqual($form->getValue(new SimpleByName('me')), 'on');
+    }
+    
+    function testChecked() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleCheckboxTag(
+                array('name' => 'me', 'value' => 'a', 'type' => 'checkbox', 'checked' => '')));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'a');
+        $this->assertTrue($form->setField(new SimpleByName('me'), 'a'));
+        $this->assertEqual($form->getValue(new SimpleByName('me')), 'a');
+        $this->assertTrue($form->setField(new SimpleByName('me'), false));
+        $this->assertEqual($form->getValue(new SimpleByName('me')), false);
+    }
+    
+    function testSingleUncheckedRadioButton() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleRadioButtonTag(
+                array('name' => 'me', 'value' => 'a', 'type' => 'radio')));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), false);
+        $this->assertTrue($form->setField(new SimpleByName('me'), 'a'));
+        $this->assertEqual($form->getValue(new SimpleByName('me')), 'a');
+    }
+    
+    function testSingleCheckedRadioButton() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleRadioButtonTag(
+                array('name' => 'me', 'value' => 'a', 'type' => 'radio', 'checked' => '')));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'a');
+        $this->assertFalse($form->setField(new SimpleByName('me'), 'other'));
+    }
+    
+    function testUncheckedRadioButtons() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleRadioButtonTag(
+                array('name' => 'me', 'value' => 'a', 'type' => 'radio')));
+        $form->addWidget(new SimpleRadioButtonTag(
+                array('name' => 'me', 'value' => 'b', 'type' => 'radio')));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), false);
+        $this->assertTrue($form->setField(new SimpleByName('me'), 'a'));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'a');
+        $this->assertTrue($form->setField(new SimpleByName('me'), 'b'));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'b');
+        $this->assertFalse($form->setField(new SimpleByName('me'), 'c'));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'b');
+    }
+    
+    function testCheckedRadioButtons() {
+        $form = new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
+        $form->addWidget(new SimpleRadioButtonTag(
+                array('name' => 'me', 'value' => 'a', 'type' => 'radio')));
+        $form->addWidget(new SimpleRadioButtonTag(
+                array('name' => 'me', 'value' => 'b', 'type' => 'radio', 'checked' => '')));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'b');
+        $this->assertTrue($form->setField(new SimpleByName('me'), 'a'));
+        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'a');
+    }
+    
+    function testMultipleFieldsWithSameKey() {
+        $form = new SimpleForm(new SimpleFormTag(array()),  $this->page('htp://host'));
+        $form->addWidget(new SimpleCheckboxTag(
+                array('name' => 'a', 'type' => 'checkbox', 'value' => 'me')));
+        $form->addWidget(new SimpleCheckboxTag(
+                array('name' => 'a', 'type' => 'checkbox', 'value' => 'you')));
+        $this->assertIdentical($form->getValue(new SimpleByName('a')), false);
+        $this->assertTrue($form->setField(new SimpleByName('a'), 'me'));
+        $this->assertIdentical($form->getValue(new SimpleByName('a')), 'me');
+    }
+
+    function testRemoveGetParamsFromAction() {
+        Mock::generatePartial('SimplePage', 'MockPartialSimplePage', array('getUrl'));
+        $page = new MockPartialSimplePage();
+        $page->returns('getUrl', new SimpleUrl('htp://host/'));
+
+        # Keep GET params in "action", if the form has no widgets
+        $form = new SimpleForm(new SimpleFormTag(array('action'=>'?test=1')), $page);
+        $this->assertEqual($form->getAction()->asString(), 'htp://host/');
+
+        $form = new SimpleForm(new SimpleFormTag(array('action'=>'?test=1')),  $page);
+        $form->addWidget(new SimpleTextTag(array('name' => 'me', 'type' => 'text', 'value' => 'a')));
+        $this->assertEqual($form->getAction()->asString(), 'htp://host/');
+
+        $form = new SimpleForm(new SimpleFormTag(array('action'=>'')),  $page);
+        $this->assertEqual($form->getAction()->asString(), 'htp://host/');
+
+        $form = new SimpleForm(new SimpleFormTag(array('action'=>'?test=1', 'method'=>'post')),  $page);
+        $this->assertEqual($form->getAction()->asString(), 'htp://host/?test=1');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/frames_test.php b/3rdparty/simpletest/test/frames_test.php
new file mode 100755
index 00000000000..29309700e31
--- /dev/null
+++ b/3rdparty/simpletest/test/frames_test.php
@@ -0,0 +1,549 @@
+<?php
+// $Id: frames_test.php 1899 2009-07-28 19:33:42Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../tag.php');
+require_once(dirname(__FILE__) . '/../page.php');
+require_once(dirname(__FILE__) . '/../frames.php');
+Mock::generate('SimplePage');
+Mock::generate('SimpleForm');
+
+class TestOfFrameset extends UnitTestCase {
+
+    function testTitleReadFromFramesetPage() {
+        $page = new MockSimplePage();
+        $page->setReturnValue('getTitle', 'This page');
+        $frameset = new SimpleFrameset($page);
+        $this->assertEqual($frameset->getTitle(), 'This page');
+    }
+
+    function TestHeadersReadFromFramesetByDefault() {
+        $page = new MockSimplePage();
+        $page->setReturnValue('getHeaders', 'Header: content');
+        $page->setReturnValue('getMimeType', 'text/xml');
+        $page->setReturnValue('getResponseCode', 401);
+        $page->setReturnValue('getTransportError', 'Could not parse headers');
+        $page->setReturnValue('getAuthentication', 'Basic');
+        $page->setReturnValue('getRealm', 'Safe place');
+
+        $frameset = new SimpleFrameset($page);
+
+        $this->assertIdentical($frameset->getHeaders(), 'Header: content');
+        $this->assertIdentical($frameset->getMimeType(), 'text/xml');
+        $this->assertIdentical($frameset->getResponseCode(), 401);
+        $this->assertIdentical($frameset->getTransportError(), 'Could not parse headers');
+        $this->assertIdentical($frameset->getAuthentication(), 'Basic');
+        $this->assertIdentical($frameset->getRealm(), 'Safe place');
+    }
+
+    function testEmptyFramesetHasNoContent() {
+        $page = new MockSimplePage();
+        $page->setReturnValue('getRaw', 'This content');
+        $frameset = new SimpleFrameset($page);
+        $this->assertEqual($frameset->getRaw(), '');
+    }
+
+    function testRawContentIsFromOnlyFrame() {
+        $page = new MockSimplePage();
+        $page->expectNever('getRaw');
+
+        $frame = new MockSimplePage();
+        $frame->setReturnValue('getRaw', 'Stuff');
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame);
+        $this->assertEqual($frameset->getRaw(), 'Stuff');
+    }
+
+    function testRawContentIsFromAllFrames() {
+        $page = new MockSimplePage();
+        $page->expectNever('getRaw');
+
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getRaw', 'Stuff1');
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue('getRaw', 'Stuff2');
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame1);
+        $frameset->addFrame($frame2);
+        $this->assertEqual($frameset->getRaw(), 'Stuff1Stuff2');
+    }
+
+    function testTextContentIsFromOnlyFrame() {
+        $page = new MockSimplePage();
+        $page->expectNever('getText');
+
+        $frame = new MockSimplePage();
+        $frame->setReturnValue('getText', 'Stuff');
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame);
+        $this->assertEqual($frameset->getText(), 'Stuff');
+    }
+
+    function testTextContentIsFromAllFrames() {
+        $page = new MockSimplePage();
+        $page->expectNever('getText');
+
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getText', 'Stuff1');
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue('getText', 'Stuff2');
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame1);
+        $frameset->addFrame($frame2);
+        $this->assertEqual($frameset->getText(), 'Stuff1 Stuff2');
+    }
+
+    function testFieldFoundIsFirstInFramelist() {
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getField', null);
+        $frame1->expectOnce('getField', array(new SimpleByName('a')));
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue('getField', 'A');
+        $frame2->expectOnce('getField', array(new SimpleByName('a')));
+
+        $frame3 = new MockSimplePage();
+        $frame3->expectNever('getField');
+
+        $page = new MockSimplePage();
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame1);
+        $frameset->addFrame($frame2);
+        $frameset->addFrame($frame3);
+        $this->assertIdentical($frameset->getField(new SimpleByName('a')), 'A');
+    }
+
+    function testFrameReplacementByIndex() {
+        $page = new MockSimplePage();
+        $page->expectNever('getRaw');
+
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getRaw', 'Stuff1');
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue('getRaw', 'Stuff2');
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame1);
+        $frameset->setFrame(array(1), $frame2);
+        $this->assertEqual($frameset->getRaw(), 'Stuff2');
+    }
+
+    function testFrameReplacementByName() {
+        $page = new MockSimplePage();
+        $page->expectNever('getRaw');
+
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getRaw', 'Stuff1');
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue('getRaw', 'Stuff2');
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame1, 'a');
+        $frameset->setFrame(array('a'), $frame2);
+        $this->assertEqual($frameset->getRaw(), 'Stuff2');
+    }
+}
+
+class TestOfFrameNavigation extends UnitTestCase {
+
+    function testStartsWithoutFrameFocus() {
+        $page = new MockSimplePage();
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame(new MockSimplePage());
+        $this->assertFalse($frameset->getFrameFocus());
+    }
+
+    function testCanFocusOnSingleFrame() {
+        $page = new MockSimplePage();
+        $page->expectNever('getRaw');
+
+        $frame = new MockSimplePage();
+        $frame->setReturnValue('getFrameFocus', array());
+        $frame->setReturnValue('getRaw', 'Stuff');
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame);
+
+        $this->assertFalse($frameset->setFrameFocusByIndex(0));
+        $this->assertTrue($frameset->setFrameFocusByIndex(1));
+        $this->assertEqual($frameset->getRaw(), 'Stuff');
+        $this->assertFalse($frameset->setFrameFocusByIndex(2));
+        $this->assertIdentical($frameset->getFrameFocus(), array(1));
+    }
+
+    function testContentComesFromFrameInFocus() {
+        $page = new MockSimplePage();
+
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getRaw', 'Stuff1');
+        $frame1->setReturnValue('getFrameFocus', array());
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue('getRaw', 'Stuff2');
+        $frame2->setReturnValue('getFrameFocus', array());
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame1);
+        $frameset->addFrame($frame2);
+
+        $this->assertTrue($frameset->setFrameFocusByIndex(1));
+        $this->assertEqual($frameset->getFrameFocus(), array(1));
+        $this->assertEqual($frameset->getRaw(), 'Stuff1');
+
+        $this->assertTrue($frameset->setFrameFocusByIndex(2));
+        $this->assertEqual($frameset->getFrameFocus(), array(2));
+        $this->assertEqual($frameset->getRaw(), 'Stuff2');
+
+        $this->assertFalse($frameset->setFrameFocusByIndex(3));
+        $this->assertEqual($frameset->getFrameFocus(), array(2));
+
+        $frameset->clearFrameFocus();
+        $this->assertEqual($frameset->getRaw(), 'Stuff1Stuff2');
+    }
+
+    function testCanFocusByName() {
+        $page = new MockSimplePage();
+
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getRaw', 'Stuff1');
+        $frame1->setReturnValue('getFrameFocus', array());
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue('getRaw', 'Stuff2');
+        $frame2->setReturnValue('getFrameFocus', array());
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame1, 'A');
+        $frameset->addFrame($frame2, 'B');
+
+        $this->assertTrue($frameset->setFrameFocus('A'));
+        $this->assertEqual($frameset->getFrameFocus(), array('A'));
+        $this->assertEqual($frameset->getRaw(), 'Stuff1');
+
+        $this->assertTrue($frameset->setFrameFocusByIndex(2));
+        $this->assertEqual($frameset->getFrameFocus(), array('B'));
+        $this->assertEqual($frameset->getRaw(), 'Stuff2');
+
+        $this->assertFalse($frameset->setFrameFocus('z'));
+
+        $frameset->clearFrameFocus();
+        $this->assertEqual($frameset->getRaw(), 'Stuff1Stuff2');
+    }
+}
+
+class TestOfFramesetPageInterface extends UnitTestCase {
+    private $page_interface;
+    private $frameset_interface;
+
+    function __construct() {
+        parent::__construct();
+        $this->page_interface = $this->getPageMethods();
+        $this->frameset_interface = $this->getFramesetMethods();
+    }
+
+    function assertListInAnyOrder($list, $expected) {
+        sort($list);
+        sort($expected);
+        $this->assertEqual($list, $expected);
+    }
+
+    private function getPageMethods() {
+        $methods = array();
+        foreach (get_class_methods('SimplePage') as $method) {
+            if (strtolower($method) == strtolower('SimplePage')) {
+                continue;
+            }
+            if (strtolower($method) == strtolower('getFrameset')) {
+                continue;
+            }
+            if (strncmp($method, '_', 1) == 0) {
+                continue;
+            }
+            if (in_array($method, array('setTitle', 'setBase', 'setForms', 'normalise', 'setFrames', 'addLink'))) {
+                continue;
+            }
+            $methods[] = $method;
+        }
+        return $methods;
+    }
+
+    private function getFramesetMethods() {
+        $methods = array();
+        foreach (get_class_methods('SimpleFrameset') as $method) {
+            if (strtolower($method) == strtolower('SimpleFrameset')) {
+                continue;
+            }
+            if (strncmp($method, '_', 1) == 0) {
+                continue;
+            }
+            if (strncmp($method, 'add', 3) == 0) {
+                continue;
+            }
+            $methods[] = $method;
+        }
+        return $methods;
+    }
+
+    function testFramsetHasPageInterface() {
+        $difference = array();
+        foreach ($this->page_interface as $method) {
+            if (! in_array($method, $this->frameset_interface)) {
+                $this->fail("No [$method] in Frameset class");
+                return;
+            }
+        }
+        $this->pass('Frameset covers Page interface');
+    }
+
+    function testHeadersReadFromFrameIfInFocus() {
+        $frame = new MockSimplePage();
+        $frame->setReturnValue('getUrl', new SimpleUrl('http://localhost/stuff'));
+
+        $frame->setReturnValue('getRequest', 'POST stuff');
+        $frame->setReturnValue('getMethod', 'POST');
+        $frame->setReturnValue('getRequestData', array('a' => 'A'));
+        $frame->setReturnValue('getHeaders', 'Header: content');
+        $frame->setReturnValue('getMimeType', 'text/xml');
+        $frame->setReturnValue('getResponseCode', 401);
+        $frame->setReturnValue('getTransportError', 'Could not parse headers');
+        $frame->setReturnValue('getAuthentication', 'Basic');
+        $frame->setReturnValue('getRealm', 'Safe place');
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame($frame);
+        $frameset->setFrameFocusByIndex(1);
+
+        $url = new SimpleUrl('http://localhost/stuff');
+        $url->setTarget(1);
+        $this->assertIdentical($frameset->getUrl(), $url);
+
+        $this->assertIdentical($frameset->getRequest(), 'POST stuff');
+        $this->assertIdentical($frameset->getMethod(), 'POST');
+        $this->assertIdentical($frameset->getRequestData(), array('a' => 'A'));
+        $this->assertIdentical($frameset->getHeaders(), 'Header: content');
+        $this->assertIdentical($frameset->getMimeType(), 'text/xml');
+        $this->assertIdentical($frameset->getResponseCode(), 401);
+        $this->assertIdentical($frameset->getTransportError(), 'Could not parse headers');
+        $this->assertIdentical($frameset->getAuthentication(), 'Basic');
+        $this->assertIdentical($frameset->getRealm(), 'Safe place');
+    }
+
+    function testUrlsComeFromBothFrames() {
+        $page = new MockSimplePage();
+        $page->expectNever('getUrls');
+
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue(
+                'getUrls',
+                array('http://www.lastcraft.com/', 'http://myserver/'));
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue(
+                'getUrls',
+                array('http://www.lastcraft.com/', 'http://test/'));
+
+        $frameset = new SimpleFrameset($page);
+        $frameset->addFrame($frame1);
+        $frameset->addFrame($frame2);
+        $this->assertListInAnyOrder(
+                $frameset->getUrls(),
+                array('http://www.lastcraft.com/', 'http://myserver/', 'http://test/'));
+    }
+
+    function testLabelledUrlsComeFromBothFrames() {
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue(
+                'getUrlsByLabel',
+                array(new SimpleUrl('goodbye.php')),
+                array('a'));
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue(
+                'getUrlsByLabel',
+                array(new SimpleUrl('hello.php')),
+                array('a'));
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame($frame1);
+        $frameset->addFrame($frame2, 'Two');
+
+        $expected1 = new SimpleUrl('goodbye.php');
+        $expected1->setTarget(1);
+        $expected2 = new SimpleUrl('hello.php');
+        $expected2->setTarget('Two');
+        $this->assertEqual(
+                $frameset->getUrlsByLabel('a'),
+                array($expected1, $expected2));
+    }
+
+    function testUrlByIdComesFromFirstFrameToRespond() {
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getUrlById', new SimpleUrl('four.php'), array(4));
+        $frame1->setReturnValue('getUrlById', false, array(5));
+
+        $frame2 = new MockSimplePage();
+        $frame2->setReturnValue('getUrlById', false, array(4));
+        $frame2->setReturnValue('getUrlById', new SimpleUrl('five.php'), array(5));
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame($frame1);
+        $frameset->addFrame($frame2);
+
+        $four = new SimpleUrl('four.php');
+        $four->setTarget(1);
+        $this->assertEqual($frameset->getUrlById(4), $four);
+        $five = new SimpleUrl('five.php');
+        $five->setTarget(2);
+        $this->assertEqual($frameset->getUrlById(5), $five);
+    }
+
+    function testReadUrlsFromFrameInFocus() {
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getUrls', array('a'));
+        $frame1->setReturnValue('getUrlsByLabel', array(new SimpleUrl('l')));
+        $frame1->setReturnValue('getUrlById', new SimpleUrl('i'));
+
+        $frame2 = new MockSimplePage();
+        $frame2->expectNever('getUrls');
+        $frame2->expectNever('getUrlsByLabel');
+        $frame2->expectNever('getUrlById');
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame($frame1, 'A');
+        $frameset->addFrame($frame2, 'B');
+        $frameset->setFrameFocus('A');
+
+        $this->assertIdentical($frameset->getUrls(), array('a'));
+        $expected = new SimpleUrl('l');
+        $expected->setTarget('A');
+        $this->assertIdentical($frameset->getUrlsByLabel('label'), array($expected));
+        $expected = new SimpleUrl('i');
+        $expected->setTarget('A');
+        $this->assertIdentical($frameset->getUrlById(99), $expected);
+    }
+
+    function testReadFrameTaggedUrlsFromFrameInFocus() {
+        $frame = new MockSimplePage();
+
+        $by_label = new SimpleUrl('l');
+        $by_label->setTarget('L');
+        $frame->setReturnValue('getUrlsByLabel', array($by_label));
+
+        $by_id = new SimpleUrl('i');
+        $by_id->setTarget('I');
+        $frame->setReturnValue('getUrlById', $by_id);
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame($frame, 'A');
+        $frameset->setFrameFocus('A');
+
+        $this->assertIdentical($frameset->getUrlsByLabel('label'), array($by_label));
+        $this->assertIdentical($frameset->getUrlById(99), $by_id);
+    }
+
+    function testFindingFormsById() {
+        $frame = new MockSimplePage();
+        $form = new MockSimpleForm();
+        $frame->returns('getFormById', $form, array('a'));
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame(new MockSimplePage(), 'A');
+        $frameset->addFrame($frame, 'B');
+        $this->assertSame($frameset->getFormById('a'), $form);
+
+        $frameset->setFrameFocus('A');
+        $this->assertNull($frameset->getFormById('a'));
+
+        $frameset->setFrameFocus('B');
+        $this->assertSame($frameset->getFormById('a'), $form);
+    }
+
+    function testFindingFormsBySubmit() {
+        $frame = new MockSimplePage();
+        $form = new MockSimpleForm();
+        $frame->returns(
+                'getFormBySubmit',
+                $form,
+                array(new SimpleByLabel('a')));
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame(new MockSimplePage(), 'A');
+        $frameset->addFrame($frame, 'B');
+        $this->assertSame($frameset->getFormBySubmit(new SimpleByLabel('a')), $form);
+
+        $frameset->setFrameFocus('A');
+        $this->assertNull($frameset->getFormBySubmit(new SimpleByLabel('a')));
+
+        $frameset->setFrameFocus('B');
+        $this->assertSame($frameset->getFormBySubmit(new SimpleByLabel('a')), $form);
+    }
+
+    function testFindingFormsByImage() {
+        $frame = new MockSimplePage();
+        $form = new MockSimpleForm();
+        $frame->returns(
+                'getFormByImage',
+                $form,
+                array(new SimpleByLabel('a')));
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame(new MockSimplePage(), 'A');
+        $frameset->addFrame($frame, 'B');
+        $this->assertSame($frameset->getFormByImage(new SimpleByLabel('a')), $form);
+
+        $frameset->setFrameFocus('A');
+        $this->assertNull($frameset->getFormByImage(new SimpleByLabel('a')));
+
+        $frameset->setFrameFocus('B');
+        $this->assertSame($frameset->getFormByImage(new SimpleByLabel('a')), $form);
+    }
+
+    function testSettingAllFrameFieldsWhenNoFrameFocus() {
+        $frame1 = new MockSimplePage();
+        $frame1->expectOnce('setField', array(new SimpleById(22), 'A'));
+
+        $frame2 = new MockSimplePage();
+        $frame2->expectOnce('setField', array(new SimpleById(22), 'A'));
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame($frame1, 'A');
+        $frameset->addFrame($frame2, 'B');
+        $frameset->setField(new SimpleById(22), 'A');
+    }
+
+    function testOnlySettingFieldFromFocusedFrame() {
+        $frame1 = new MockSimplePage();
+        $frame1->expectOnce('setField', array(new SimpleByLabelOrName('a'), 'A'));
+
+        $frame2 = new MockSimplePage();
+        $frame2->expectNever('setField');
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame($frame1, 'A');
+        $frameset->addFrame($frame2, 'B');
+        $frameset->setFrameFocus('A');
+        $frameset->setField(new SimpleByLabelOrName('a'), 'A');
+    }
+
+    function testOnlyGettingFieldFromFocusedFrame() {
+        $frame1 = new MockSimplePage();
+        $frame1->setReturnValue('getField', 'f', array(new SimpleByName('a')));
+
+        $frame2 = new MockSimplePage();
+        $frame2->expectNever('getField');
+
+        $frameset = new SimpleFrameset(new MockSimplePage());
+        $frameset->addFrame($frame1, 'A');
+        $frameset->addFrame($frame2, 'B');
+        $frameset->setFrameFocus('A');
+        $this->assertIdentical($frameset->getField(new SimpleByName('a')), 'f');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/http_test.php b/3rdparty/simpletest/test/http_test.php
new file mode 100755
index 00000000000..bd3fdd0d028
--- /dev/null
+++ b/3rdparty/simpletest/test/http_test.php
@@ -0,0 +1,492 @@
+<?php
+// $Id: http_test.php 1964 2009-10-13 15:27:31Z maetl_ $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../encoding.php');
+require_once(dirname(__FILE__) . '/../http.php');
+require_once(dirname(__FILE__) . '/../socket.php');
+require_once(dirname(__FILE__) . '/../cookies.php');
+Mock::generate('SimpleSocket');
+Mock::generate('SimpleCookieJar');
+Mock::generate('SimpleRoute');
+Mock::generatePartial(
+		'SimpleRoute',
+		'PartialSimpleRoute',
+array('createSocket'));
+Mock::generatePartial(
+        'SimpleProxyRoute',
+        'PartialSimpleProxyRoute',
+array('createSocket'));
+
+class TestOfDirectRoute extends UnitTestCase {
+
+	function testDefaultGetRequest() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("GET /here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: a.valid.host\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+		$route = new PartialSimpleRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(new SimpleUrl('http://a.valid.host/here.html'));
+		$this->assertSame($route->createConnection('GET', 15), $socket);
+	}
+
+	function testDefaultPostRequest() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("POST /here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: a.valid.host\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+		$route = new PartialSimpleRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(new SimpleUrl('http://a.valid.host/here.html'));
+
+		$route->createConnection('POST', 15);
+	}
+	
+	function testDefaultDeleteRequest() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("DELETE /here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: a.valid.host\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+		$route = new PartialSimpleRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(new SimpleUrl('http://a.valid.host/here.html'));
+		$this->assertSame($route->createConnection('DELETE', 15), $socket);
+	}
+	
+	function testDefaultHeadRequest() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("HEAD /here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: a.valid.host\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+		$route = new PartialSimpleRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(new SimpleUrl('http://a.valid.host/here.html'));
+		$this->assertSame($route->createConnection('HEAD', 15), $socket);
+	}
+
+	function testGetWithPort() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("GET /here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: a.valid.host:81\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+
+		$route = new PartialSimpleRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(new SimpleUrl('http://a.valid.host:81/here.html'));
+
+		$route->createConnection('GET', 15);
+	}
+
+	function testGetWithParameters() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("GET /here.html?a=1&b=2 HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: a.valid.host\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+
+		$route = new PartialSimpleRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(new SimpleUrl('http://a.valid.host/here.html?a=1&b=2'));
+
+		$route->createConnection('GET', 15);
+	}
+}
+
+class TestOfProxyRoute extends UnitTestCase {
+
+	function testDefaultGet() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("GET http://a.valid.host/here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: my-proxy:8080\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+
+		$route = new PartialSimpleProxyRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(
+		new SimpleUrl('http://a.valid.host/here.html'),
+		new SimpleUrl('http://my-proxy'));
+		$route->createConnection('GET', 15);
+	}
+
+	function testDefaultPost() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("POST http://a.valid.host/here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: my-proxy:8080\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+
+		$route = new PartialSimpleProxyRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(
+		new SimpleUrl('http://a.valid.host/here.html'),
+		new SimpleUrl('http://my-proxy'));
+		$route->createConnection('POST', 15);
+	}
+
+	function testGetWithPort() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("GET http://a.valid.host:81/here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: my-proxy:8081\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+
+		$route = new PartialSimpleProxyRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(
+		new SimpleUrl('http://a.valid.host:81/here.html'),
+		new SimpleUrl('http://my-proxy:8081'));
+		$route->createConnection('GET', 15);
+	}
+
+	function testGetWithParameters() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("GET http://a.valid.host/here.html?a=1&b=2 HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: my-proxy:8080\r\n"));
+		$socket->expectAt(2, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 3);
+
+		$route = new PartialSimpleProxyRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(
+		new SimpleUrl('http://a.valid.host/here.html?a=1&b=2'),
+		new SimpleUrl('http://my-proxy'));
+		$route->createConnection('GET', 15);
+	}
+
+	function testGetWithAuthentication() {
+		$encoded = base64_encode('Me:Secret');
+
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("GET http://a.valid.host/here.html HTTP/1.0\r\n"));
+		$socket->expectAt(1, 'write', array("Host: my-proxy:8080\r\n"));
+		$socket->expectAt(2, 'write', array("Proxy-Authorization: Basic $encoded\r\n"));
+		$socket->expectAt(3, 'write', array("Connection: close\r\n"));
+		$socket->expectCallCount('write', 4);
+
+		$route = new PartialSimpleProxyRoute();
+		$route->setReturnReference('createSocket', $socket);
+		$route->__construct(
+		new SimpleUrl('http://a.valid.host/here.html'),
+		new SimpleUrl('http://my-proxy'),
+                'Me',
+                'Secret');
+		$route->createConnection('GET', 15);
+	}
+}
+
+class TestOfHttpRequest extends UnitTestCase {
+
+	function testReadingBadConnection() {
+		$socket = new MockSimpleSocket();
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+		$request = new SimpleHttpRequest($route, new SimpleGetEncoding());
+		$reponse = $request->fetch(15);
+		$this->assertTrue($reponse->isError());
+	}
+
+	function testReadingGoodConnection() {
+		$socket = new MockSimpleSocket();
+		$socket->expectOnce('write', array("\r\n"));
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+		$route->expect('createConnection', array('GET', 15));
+
+		$request = new SimpleHttpRequest($route, new SimpleGetEncoding());
+		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
+	}
+
+	function testWritingAdditionalHeaders() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("My: stuff\r\n"));
+		$socket->expectAt(1, 'write', array("\r\n"));
+		$socket->expectCallCount('write', 2);
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+
+		$request = new SimpleHttpRequest($route, new SimpleGetEncoding());
+		$request->addHeaderLine('My: stuff');
+		$request->fetch(15);
+	}
+
+	function testCookieWriting() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("Cookie: a=A\r\n"));
+		$socket->expectAt(1, 'write', array("\r\n"));
+		$socket->expectCallCount('write', 2);
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+
+		$jar = new SimpleCookieJar();
+		$jar->setCookie('a', 'A');
+
+		$request = new SimpleHttpRequest($route, new SimpleGetEncoding());
+		$request->readCookiesFromJar($jar, new SimpleUrl('/'));
+		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
+	}
+
+	function testMultipleCookieWriting() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("Cookie: a=A;b=B\r\n"));
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+
+		$jar = new SimpleCookieJar();
+		$jar->setCookie('a', 'A');
+		$jar->setCookie('b', 'B');
+
+		$request = new SimpleHttpRequest($route, new SimpleGetEncoding());
+		$request->readCookiesFromJar($jar, new SimpleUrl('/'));
+		$request->fetch(15);
+	}
+	
+    function testReadingDeleteConnection() {
+		$socket = new MockSimpleSocket();
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+		$route->expect('createConnection', array('DELETE', 15));
+
+		$request = new SimpleHttpRequest($route, new SimpleDeleteEncoding());
+		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');    	
+    }
+}
+
+class TestOfHttpPostRequest extends UnitTestCase {
+
+	function testReadingBadConnectionCausesErrorBecauseOfDeadSocket() {
+		$socket = new MockSimpleSocket();
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+		$request = new SimpleHttpRequest($route, new SimplePostEncoding());
+		$reponse = $request->fetch(15);
+		$this->assertTrue($reponse->isError());
+	}
+
+	function testReadingGoodConnection() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("Content-Length: 0\r\n"));
+		$socket->expectAt(1, 'write', array("Content-Type: application/x-www-form-urlencoded\r\n"));
+		$socket->expectAt(2, 'write', array("\r\n"));
+		$socket->expectAt(3, 'write', array(""));
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+		$route->expect('createConnection', array('POST', 15));
+
+		$request = new SimpleHttpRequest($route, new SimplePostEncoding());
+		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
+	}
+
+	function testContentHeadersCalculatedWithUrlEncodedParams() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("Content-Length: 3\r\n"));
+		$socket->expectAt(1, 'write', array("Content-Type: application/x-www-form-urlencoded\r\n"));
+		$socket->expectAt(2, 'write', array("\r\n"));
+		$socket->expectAt(3, 'write', array("a=A"));
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+		$route->expect('createConnection', array('POST', 15));
+
+		$request = new SimpleHttpRequest(
+		$route,
+		new SimplePostEncoding(array('a' => 'A')));
+		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
+	}
+
+	function testContentHeadersCalculatedWithRawEntityBody() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("Content-Length: 8\r\n"));
+		$socket->expectAt(1, 'write', array("Content-Type: text/plain\r\n"));
+		$socket->expectAt(2, 'write', array("\r\n"));
+		$socket->expectAt(3, 'write', array("raw body"));
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+		$route->expect('createConnection', array('POST', 15));
+
+		$request = new SimpleHttpRequest(
+		$route,
+		new SimplePostEncoding('raw body'));
+		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
+	}
+
+	function testContentHeadersCalculatedWithXmlEntityBody() {
+		$socket = new MockSimpleSocket();
+		$socket->expectAt(0, 'write', array("Content-Length: 27\r\n"));
+		$socket->expectAt(1, 'write', array("Content-Type: text/xml\r\n"));
+		$socket->expectAt(2, 'write', array("\r\n"));
+		$socket->expectAt(3, 'write', array("<a><b>one</b><c>two</c></a>"));
+
+		$route = new MockSimpleRoute();
+		$route->setReturnReference('createConnection', $socket);
+		$route->expect('createConnection', array('POST', 15));
+
+		$request = new SimpleHttpRequest(
+		$route,
+		new SimplePostEncoding('<a><b>one</b><c>two</c></a>', 'text/xml'));
+		$this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
+	}
+}
+
+class TestOfHttpHeaders extends UnitTestCase {
+
+	function testParseBasicHeaders() {
+		$headers = new SimpleHttpHeaders(
+                "HTTP/1.1 200 OK\r\n" .
+                "Date: Mon, 18 Nov 2002 15:50:29 GMT\r\n" .
+                "Content-Type: text/plain\r\n" .
+                "Server: Apache/1.3.24 (Win32) PHP/4.2.3\r\n" .
+                "Connection: close");
+		$this->assertIdentical($headers->getHttpVersion(), "1.1");
+		$this->assertIdentical($headers->getResponseCode(), 200);
+		$this->assertEqual($headers->getMimeType(), "text/plain");
+	}
+
+	function testNonStandardResponseHeader() {
+		$headers = new SimpleHttpHeaders(
+                "HTTP/1.1 302 (HTTP-Version SP Status-Code CRLF)\r\n" .
+                "Connection: close");
+		$this->assertIdentical($headers->getResponseCode(), 302);
+	}
+
+	function testCanParseMultipleCookies() {
+		$jar = new MockSimpleCookieJar();
+		$jar->expectAt(0, 'setCookie', array('a', 'aaa', 'host', '/here/', 'Wed, 25 Dec 2002 04:24:20 GMT'));
+		$jar->expectAt(1, 'setCookie', array('b', 'bbb', 'host', '/', false));
+
+		$headers = new SimpleHttpHeaders(
+                "HTTP/1.1 200 OK\r\n" .
+                "Date: Mon, 18 Nov 2002 15:50:29 GMT\r\n" .
+                "Content-Type: text/plain\r\n" .
+                "Server: Apache/1.3.24 (Win32) PHP/4.2.3\r\n" .
+                "Set-Cookie: a=aaa; expires=Wed, 25-Dec-02 04:24:20 GMT; path=/here/\r\n" .
+                "Set-Cookie: b=bbb\r\n" .
+                "Connection: close");
+		$headers->writeCookiesToJar($jar, new SimpleUrl('http://host'));
+	}
+
+	function testCanRecogniseRedirect() {
+		$headers = new SimpleHttpHeaders("HTTP/1.1 301 OK\r\n" .
+                "Content-Type: text/plain\r\n" .
+                "Content-Length: 0\r\n" .
+                "Location: http://www.somewhere-else.com/\r\n" .
+                "Connection: close");
+		$this->assertIdentical($headers->getResponseCode(), 301);
+		$this->assertEqual($headers->getLocation(), "http://www.somewhere-else.com/");
+		$this->assertTrue($headers->isRedirect());
+	}
+
+	function testCanParseChallenge() {
+		$headers = new SimpleHttpHeaders("HTTP/1.1 401 Authorization required\r\n" .
+                "Content-Type: text/plain\r\n" .
+                "Connection: close\r\n" .
+                "WWW-Authenticate: Basic realm=\"Somewhere\"");
+		$this->assertEqual($headers->getAuthentication(), 'Basic');
+		$this->assertEqual($headers->getRealm(), 'Somewhere');
+		$this->assertTrue($headers->isChallenge());
+	}
+}
+
+class TestOfHttpResponse extends UnitTestCase {
+
+	function testBadRequest() {
+		$socket = new MockSimpleSocket();
+		$socket->setReturnValue('getSent', '');
+
+		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
+		$this->assertTrue($response->isError());
+		$this->assertPattern('/Nothing fetched/', $response->getError());
+		$this->assertIdentical($response->getContent(), false);
+		$this->assertIdentical($response->getSent(), '');
+	}
+
+	function testBadSocketDuringResponse() {
+		$socket = new MockSimpleSocket();
+		$socket->setReturnValueAt(0, "read", "HTTP/1.1 200 OK\r\n");
+		$socket->setReturnValueAt(1, "read", "Date: Mon, 18 Nov 2002 15:50:29 GMT\r\n");
+		$socket->setReturnValue("read", "");
+		$socket->setReturnValue('getSent', 'HTTP/1.1 ...');
+
+		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
+		$this->assertTrue($response->isError());
+		$this->assertEqual($response->getContent(), '');
+		$this->assertEqual($response->getSent(), 'HTTP/1.1 ...');
+	}
+
+	function testIncompleteHeader() {
+		$socket = new MockSimpleSocket();
+		$socket->setReturnValueAt(0, "read", "HTTP/1.1 200 OK\r\n");
+		$socket->setReturnValueAt(1, "read", "Date: Mon, 18 Nov 2002 15:50:29 GMT\r\n");
+		$socket->setReturnValueAt(2, "read", "Content-Type: text/plain\r\n");
+		$socket->setReturnValue("read", "");
+
+		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
+		$this->assertTrue($response->isError());
+		$this->assertEqual($response->getContent(), "");
+	}
+
+	function testParseOfResponseHeadersWhenChunked() {
+		$socket = new MockSimpleSocket();
+		$socket->setReturnValueAt(0, "read", "HTTP/1.1 200 OK\r\nDate: Mon, 18 Nov 2002 15:50:29 GMT\r\n");
+		$socket->setReturnValueAt(1, "read", "Content-Type: text/plain\r\n");
+		$socket->setReturnValueAt(2, "read", "Server: Apache/1.3.24 (Win32) PHP/4.2.3\r\nConne");
+		$socket->setReturnValueAt(3, "read", "ction: close\r\n\r\nthis is a test file\n");
+		$socket->setReturnValueAt(4, "read", "with two lines in it\n");
+		$socket->setReturnValue("read", "");
+
+		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
+		$this->assertFalse($response->isError());
+		$this->assertEqual(
+		$response->getContent(),
+                "this is a test file\nwith two lines in it\n");
+		$headers = $response->getHeaders();
+		$this->assertIdentical($headers->getHttpVersion(), "1.1");
+		$this->assertIdentical($headers->getResponseCode(), 200);
+		$this->assertEqual($headers->getMimeType(), "text/plain");
+		$this->assertFalse($headers->isRedirect());
+		$this->assertFalse($headers->getLocation());
+	}
+
+	function testRedirect() {
+		$socket = new MockSimpleSocket();
+		$socket->setReturnValueAt(0, "read", "HTTP/1.1 301 OK\r\n");
+		$socket->setReturnValueAt(1, "read", "Content-Type: text/plain\r\n");
+		$socket->setReturnValueAt(2, "read", "Location: http://www.somewhere-else.com/\r\n");
+		$socket->setReturnValueAt(3, "read", "Connection: close\r\n");
+		$socket->setReturnValueAt(4, "read", "\r\n");
+		$socket->setReturnValue("read", "");
+
+		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
+		$headers = $response->getHeaders();
+		$this->assertTrue($headers->isRedirect());
+		$this->assertEqual($headers->getLocation(), "http://www.somewhere-else.com/");
+	}
+
+	function testRedirectWithPort() {
+		$socket = new MockSimpleSocket();
+		$socket->setReturnValueAt(0, "read", "HTTP/1.1 301 OK\r\n");
+		$socket->setReturnValueAt(1, "read", "Content-Type: text/plain\r\n");
+		$socket->setReturnValueAt(2, "read", "Location: http://www.somewhere-else.com:80/\r\n");
+		$socket->setReturnValueAt(3, "read", "Connection: close\r\n");
+		$socket->setReturnValueAt(4, "read", "\r\n");
+		$socket->setReturnValue("read", "");
+
+		$response = new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
+		$headers = $response->getHeaders();
+		$this->assertTrue($headers->isRedirect());
+		$this->assertEqual($headers->getLocation(), "http://www.somewhere-else.com:80/");
+	}
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/interfaces_test.php b/3rdparty/simpletest/test/interfaces_test.php
new file mode 100755
index 00000000000..ab30fe47ff8
--- /dev/null
+++ b/3rdparty/simpletest/test/interfaces_test.php
@@ -0,0 +1,137 @@
+<?php
+// $Id: interfaces_test.php 1981 2010-03-23 23:29:56Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+if (function_exists('spl_classes')) {
+    include(dirname(__FILE__) . '/support/spl_examples.php');
+}
+if (version_compare(PHP_VERSION, '5.1', '>=')) {
+    include(dirname(__FILE__) . '/interfaces_test_php5_1.php');
+}
+
+interface DummyInterface {
+    function aMethod();
+    function anotherMethod($a);
+    function &referenceMethod(&$a);
+}
+
+Mock::generate('DummyInterface');
+Mock::generatePartial('DummyInterface', 'PartialDummyInterface', array());
+
+class TestOfMockInterfaces extends UnitTestCase {
+
+    function testCanMockAnInterface() {
+        $mock = new MockDummyInterface();
+        $this->assertIsA($mock, 'SimpleMock');
+        $this->assertIsA($mock, 'MockDummyInterface');
+        $this->assertTrue(method_exists($mock, 'aMethod'));
+        $this->assertTrue(method_exists($mock, 'anotherMethod'));
+        $this->assertNull($mock->aMethod());
+    }
+
+    function testMockedInterfaceExpectsParameters() {
+        $mock = new MockDummyInterface();
+        $this->expectError();
+        $mock->anotherMethod();
+    }
+
+    function testCannotPartiallyMockAnInterface() {
+        $this->assertFalse(class_exists('PartialDummyInterface'));
+    }
+}
+
+class TestOfSpl extends UnitTestCase {
+    
+    function skip() {
+        $this->skipUnless(function_exists('spl_classes'), 'No SPL module loaded');
+    }
+
+    function testCanMockAllSplClasses() {
+        if (! function_exists('spl_classes')) {
+            return;
+        }
+        foreach(spl_classes() as $class) {
+            if ($class == 'SplHeap' or $class = 'SplFileObject') {
+                continue;
+            }
+            if (version_compare(PHP_VERSION, '5.1', '<') &&
+                $class == 'CachingIterator' ||
+                $class == 'CachingRecursiveIterator' ||
+                $class == 'FilterIterator' ||
+                $class == 'LimitIterator' ||
+                $class == 'ParentIterator') {
+                // These iterators require an iterator be passed to them during
+                // construction in PHP 5.0; there is no way for SimpleTest
+                // to supply such an iterator, however, so support for it is
+                // disabled.
+                continue;
+            }
+            $mock_class = "Mock$class";
+            Mock::generate($class);
+            $this->assertIsA(new $mock_class(), $mock_class);
+        }
+    }
+
+    function testExtensionOfCommonSplClasses() {
+        Mock::generate('IteratorImplementation');
+        $this->assertIsA(
+                new IteratorImplementation(),
+                'IteratorImplementation');
+        Mock::generate('IteratorAggregateImplementation');
+        $this->assertIsA(
+                new IteratorAggregateImplementation(),
+                'IteratorAggregateImplementation');
+   }
+}
+
+class WithHint {
+    function hinted(DummyInterface $object) { }
+}
+
+class ImplementsDummy implements DummyInterface {
+    function aMethod() { }
+    function anotherMethod($a) { }
+    function &referenceMethod(&$a) { }
+    function extraMethod($a = false) { }
+}
+Mock::generate('ImplementsDummy');
+
+class TestOfImplementations extends UnitTestCase {
+
+    function testMockedInterfaceCanPassThroughTypeHint() {
+        $mock = new MockDummyInterface();
+        $hinter = new WithHint();
+        $hinter->hinted($mock);
+    }
+
+    function testImplementedInterfacesAreCarried() {
+        $mock = new MockImplementsDummy();
+        $hinter = new WithHint();
+        $hinter->hinted($mock);
+    }
+    
+    function testNoSpuriousWarningsWhenSkippingDefaultedParameter() {
+        $mock = new MockImplementsDummy();
+        $mock->extraMethod();
+    }
+}
+
+interface SampleInterfaceWithConstruct {
+    function __construct($something);
+}
+
+class TestOfInterfaceMocksWithConstruct extends UnitTestCase {
+    function TODO_testBasicConstructOfAnInterface() {   // Fails in PHP 5.3dev
+        Mock::generate('SampleInterfaceWithConstruct');
+    }
+}
+
+interface SampleInterfaceWithClone {
+    function __clone();
+}
+
+class TestOfSampleInterfaceWithClone extends UnitTestCase {
+    function testCanMockWithoutErrors() {
+        Mock::generate('SampleInterfaceWithClone');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/interfaces_test_php5_1.php b/3rdparty/simpletest/test/interfaces_test_php5_1.php
new file mode 100755
index 00000000000..3d154f99539
--- /dev/null
+++ b/3rdparty/simpletest/test/interfaces_test_php5_1.php
@@ -0,0 +1,14 @@
+<?php
+
+interface SampleInterfaceWithHintInSignature {
+    function method(array $hinted);
+}
+
+class TestOfInterfaceMocksWithHintInSignature extends UnitTestCase {
+    function testBasicConstructOfAnInterfaceWithHintInSignature() {
+        Mock::generate('SampleInterfaceWithHintInSignature');
+        $mock = new MockSampleInterfaceWithHintInSignature();
+        $this->assertIsA($mock, 'SampleInterfaceWithHintInSignature');
+    }
+}
+
diff --git a/3rdparty/simpletest/test/live_test.php b/3rdparty/simpletest/test/live_test.php
new file mode 100755
index 00000000000..3fbb54499d3
--- /dev/null
+++ b/3rdparty/simpletest/test/live_test.php
@@ -0,0 +1,47 @@
+<?php
+// $Id: live_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../socket.php');
+require_once(dirname(__FILE__) . '/../http.php');
+require_once(dirname(__FILE__) . '/../compatibility.php');
+
+if (SimpleTest::getDefaultProxy()) {
+    SimpleTest::ignore('LiveHttpTestCase');
+}
+
+class LiveHttpTestCase extends UnitTestCase {
+
+    function testBadSocket() {
+        $socket = new SimpleSocket('bad_url', 111, 5);
+        $this->assertTrue($socket->isError());
+        $this->assertPattern(
+                '/Cannot open \\[bad_url:111\\] with \\[/',
+                $socket->getError());
+        $this->assertFalse($socket->isOpen());
+        $this->assertFalse($socket->write('A message'));
+    }
+    
+    function testSocketClosure() {
+        $socket = new SimpleSocket('www.lastcraft.com', 80, 15, 8);
+        $this->assertTrue($socket->isOpen());
+        $this->assertTrue($socket->write("GET /test/network_confirm.php HTTP/1.0\r\n"));
+        $socket->write("Host: www.lastcraft.com\r\n");
+        $socket->write("Connection: close\r\n\r\n");
+        $this->assertEqual($socket->read(), "HTTP/1.1");
+        $socket->close();
+        $this->assertIdentical($socket->read(), false);
+    }
+    
+    function testRecordOfSentCharacters() {
+        $socket = new SimpleSocket('www.lastcraft.com', 80, 15);
+        $this->assertTrue($socket->write("GET /test/network_confirm.php HTTP/1.0\r\n"));
+        $socket->write("Host: www.lastcraft.com\r\n");
+        $socket->write("Connection: close\r\n\r\n");
+        $socket->close();
+        $this->assertEqual($socket->getSent(),
+                "GET /test/network_confirm.php HTTP/1.0\r\n" .
+                "Host: www.lastcraft.com\r\n" .
+                "Connection: close\r\n\r\n");
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/mock_objects_test.php b/3rdparty/simpletest/test/mock_objects_test.php
new file mode 100755
index 00000000000..7f3178995a7
--- /dev/null
+++ b/3rdparty/simpletest/test/mock_objects_test.php
@@ -0,0 +1,985 @@
+<?php
+// $Id: mock_objects_test.php 1900 2009-07-29 11:44:37Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../expectation.php');
+require_once(dirname(__FILE__) . '/../mock_objects.php');
+
+class TestOfAnythingExpectation extends UnitTestCase {
+    function testSimpleInteger() {
+        $expectation = new AnythingExpectation();
+        $this->assertTrue($expectation->test(33));
+        $this->assertTrue($expectation->test(false));
+        $this->assertTrue($expectation->test(null));
+    }
+}
+
+class TestOfParametersExpectation extends UnitTestCase {
+
+    function testEmptyMatch() {
+        $expectation = new ParametersExpectation(array());
+        $this->assertTrue($expectation->test(array()));
+        $this->assertFalse($expectation->test(array(33)));
+    }
+
+    function testSingleMatch() {
+        $expectation = new ParametersExpectation(array(0));
+        $this->assertFalse($expectation->test(array(1)));
+        $this->assertTrue($expectation->test(array(0)));
+    }
+
+    function testAnyMatch() {
+        $expectation = new ParametersExpectation(false);
+        $this->assertTrue($expectation->test(array()));
+        $this->assertTrue($expectation->test(array(1, 2)));
+    }
+
+    function testMissingParameter() {
+        $expectation = new ParametersExpectation(array(0));
+        $this->assertFalse($expectation->test(array()));
+    }
+
+    function testNullParameter() {
+        $expectation = new ParametersExpectation(array(null));
+        $this->assertTrue($expectation->test(array(null)));
+        $this->assertFalse($expectation->test(array()));
+    }
+
+    function testAnythingExpectations() {
+        $expectation = new ParametersExpectation(array(new AnythingExpectation()));
+        $this->assertFalse($expectation->test(array()));
+        $this->assertIdentical($expectation->test(array(null)), true);
+        $this->assertIdentical($expectation->test(array(13)), true);
+    }
+
+    function testOtherExpectations() {
+        $expectation = new ParametersExpectation(
+                array(new PatternExpectation('/hello/i')));
+        $this->assertFalse($expectation->test(array('Goodbye')));
+        $this->assertTrue($expectation->test(array('hello')));
+        $this->assertTrue($expectation->test(array('Hello')));
+    }
+
+    function testIdentityOnly() {
+        $expectation = new ParametersExpectation(array("0"));
+        $this->assertFalse($expectation->test(array(0)));
+        $this->assertTrue($expectation->test(array("0")));
+    }
+
+    function testLongList() {
+        $expectation = new ParametersExpectation(
+                array("0", 0, new AnythingExpectation(), false));
+        $this->assertTrue($expectation->test(array("0", 0, 37, false)));
+        $this->assertFalse($expectation->test(array("0", 0, 37, true)));
+        $this->assertFalse($expectation->test(array("0", 0, 37)));
+    }
+}
+
+class TestOfSimpleSignatureMap extends UnitTestCase {
+
+    function testEmpty() {
+        $map = new SimpleSignatureMap();
+        $this->assertFalse($map->isMatch("any", array()));
+        $this->assertNull($map->findFirstAction("any", array()));
+    }
+
+    function testDifferentCallSignaturesCanHaveDifferentReferences() {
+        $map = new SimpleSignatureMap();
+        $fred = 'Fred';
+        $jim = 'jim';
+        $map->add(array(0), $fred);
+        $map->add(array('0'), $jim);
+        $this->assertSame($fred, $map->findFirstAction(array(0)));
+        $this->assertSame($jim, $map->findFirstAction(array('0')));
+    }
+
+    function testWildcard() {
+        $fred = 'Fred';
+        $map = new SimpleSignatureMap();
+        $map->add(array(new AnythingExpectation(), 1, 3), $fred);
+        $this->assertTrue($map->isMatch(array(2, 1, 3)));
+        $this->assertSame($map->findFirstAction(array(2, 1, 3)), $fred);
+    }
+
+    function testAllWildcard() {
+        $fred = 'Fred';
+        $map = new SimpleSignatureMap();
+        $this->assertFalse($map->isMatch(array(2, 1, 3)));
+        $map->add('', $fred);
+        $this->assertTrue($map->isMatch(array(2, 1, 3)));
+        $this->assertSame($map->findFirstAction(array(2, 1, 3)), $fred);
+    }
+
+    function testOrdering() {
+        $map = new SimpleSignatureMap();
+        $map->add(array(1, 2), new SimpleByValue("1, 2"));
+        $map->add(array(1, 3), new SimpleByValue("1, 3"));
+        $map->add(array(1), new SimpleByValue("1"));
+        $map->add(array(1, 4), new SimpleByValue("1, 4"));
+        $map->add(array(new AnythingExpectation()), new SimpleByValue("Any"));
+        $map->add(array(2), new SimpleByValue("2"));
+        $map->add("", new SimpleByValue("Default"));
+        $map->add(array(), new SimpleByValue("None"));
+        $this->assertEqual($map->findFirstAction(array(1, 2)), new SimpleByValue("1, 2"));
+        $this->assertEqual($map->findFirstAction(array(1, 3)), new SimpleByValue("1, 3"));
+        $this->assertEqual($map->findFirstAction(array(1, 4)), new SimpleByValue("1, 4"));
+        $this->assertEqual($map->findFirstAction(array(1)), new SimpleByValue("1"));
+        $this->assertEqual($map->findFirstAction(array(2)), new SimpleByValue("Any"));
+        $this->assertEqual($map->findFirstAction(array(3)), new SimpleByValue("Any"));
+        $this->assertEqual($map->findFirstAction(array()), new SimpleByValue("Default"));
+    }
+}
+
+class TestOfCallSchedule extends UnitTestCase {
+    function testCanBeSetToAlwaysReturnTheSameReference() {
+        $a = 5;
+        $schedule = new SimpleCallSchedule();
+        $schedule->register('aMethod', false, new SimpleByReference($a));
+        $this->assertReference($schedule->respond(0, 'aMethod', array()), $a);
+        $this->assertReference($schedule->respond(1, 'aMethod', array()), $a);
+    }
+
+    function testSpecificSignaturesOverrideTheAlwaysCase() {
+        $any = 'any';
+        $one = 'two';
+        $schedule = new SimpleCallSchedule();
+        $schedule->register('aMethod', array(1), new SimpleByReference($one));
+        $schedule->register('aMethod', false, new SimpleByReference($any));
+        $this->assertReference($schedule->respond(0, 'aMethod', array(2)), $any);
+        $this->assertReference($schedule->respond(0, 'aMethod', array(1)), $one);
+    }
+
+    function testReturnsCanBeSetOverTime() {
+        $one = 'one';
+        $two = 'two';
+        $schedule = new SimpleCallSchedule();
+        $schedule->registerAt(0, 'aMethod', false, new SimpleByReference($one));
+        $schedule->registerAt(1, 'aMethod', false, new SimpleByReference($two));
+        $this->assertReference($schedule->respond(0, 'aMethod', array()), $one);
+        $this->assertReference($schedule->respond(1, 'aMethod', array()), $two);
+    }
+
+    function testReturnsOverTimecanBeAlteredByTheArguments() {
+        $one = '1';
+        $two = '2';
+        $two_a = '2a';
+        $schedule = new SimpleCallSchedule();
+        $schedule->registerAt(0, 'aMethod', false, new SimpleByReference($one));
+        $schedule->registerAt(1, 'aMethod', array('a'), new SimpleByReference($two_a));
+        $schedule->registerAt(1, 'aMethod', false, new SimpleByReference($two));
+        $this->assertReference($schedule->respond(0, 'aMethod', array()), $one);
+        $this->assertReference($schedule->respond(1, 'aMethod', array()), $two);
+        $this->assertReference($schedule->respond(1, 'aMethod', array('a')), $two_a);
+    }
+
+    function testCanReturnByValue() {
+        $a = 5;
+        $schedule = new SimpleCallSchedule();
+        $schedule->register('aMethod', false, new SimpleByValue($a));
+        $this->assertCopy($schedule->respond(0, 'aMethod', array()), $a);
+    }
+
+    function testCanThrowException() {
+        if (version_compare(phpversion(), '5', '>=')) {
+            $schedule = new SimpleCallSchedule();
+            $schedule->register('aMethod', false, new SimpleThrower(new Exception('Ouch')));
+            $this->expectException(new Exception('Ouch'));
+            $schedule->respond(0, 'aMethod', array());
+        }
+    }
+
+    function testCanEmitError() {
+        $schedule = new SimpleCallSchedule();
+        $schedule->register('aMethod', false, new SimpleErrorThrower('Ouch', E_USER_WARNING));
+        $this->expectError('Ouch');
+        $schedule->respond(0, 'aMethod', array());
+    }
+}
+
+class Dummy {
+    function Dummy() {
+    }
+
+    function aMethod() {
+        return true;
+    }
+
+    function &aReferenceMethod() {
+        return true;
+    }
+
+    function anotherMethod() {
+        return true;
+    }
+}
+Mock::generate('Dummy');
+Mock::generate('Dummy', 'AnotherMockDummy');
+Mock::generate('Dummy', 'MockDummyWithExtraMethods', array('extraMethod'));
+
+class TestOfMockGeneration extends UnitTestCase {
+
+    function testCloning() {
+        $mock = new MockDummy();
+        $this->assertTrue(method_exists($mock, "aMethod"));
+        $this->assertNull($mock->aMethod());
+    }
+
+    function testCloningWithExtraMethod() {
+        $mock = new MockDummyWithExtraMethods();
+        $this->assertTrue(method_exists($mock, "extraMethod"));
+    }
+
+    function testCloningWithChosenClassName() {
+        $mock = new AnotherMockDummy();
+        $this->assertTrue(method_exists($mock, "aMethod"));
+    }
+}
+
+class TestOfMockReturns extends UnitTestCase {
+
+    function testDefaultReturn() {
+        $mock = new MockDummy();
+        $mock->returnsByValue("aMethod", "aaa");
+        $this->assertIdentical($mock->aMethod(), "aaa");
+        $this->assertIdentical($mock->aMethod(), "aaa");
+    }
+
+    function testParameteredReturn() {
+        $mock = new MockDummy();
+        $mock->returnsByValue('aMethod', 'aaa', array(1, 2, 3));
+        $this->assertNull($mock->aMethod());
+        $this->assertIdentical($mock->aMethod(1, 2, 3), 'aaa');
+    }
+
+    function testSetReturnGivesObjectReference() {
+        $mock = new MockDummy();
+        $object = new Dummy();
+        $mock->returns('aMethod', $object, array(1, 2, 3));
+        $this->assertSame($mock->aMethod(1, 2, 3), $object);
+    }
+
+    function testSetReturnReferenceGivesOriginalReference() {
+        $mock = new MockDummy();
+        $object = 1;
+        $mock->returnsByReference('aReferenceMethod', $object, array(1, 2, 3));
+        $this->assertReference($mock->aReferenceMethod(1, 2, 3), $object);
+    }
+
+    function testReturnValueCanBeChosenJustByPatternMatchingArguments() {
+        $mock = new MockDummy();
+        $mock->returnsByValue(
+                "aMethod",
+                "aaa",
+                array(new PatternExpectation('/hello/i')));
+        $this->assertIdentical($mock->aMethod('Hello'), 'aaa');
+        $this->assertNull($mock->aMethod('Goodbye'));
+    }
+
+    function testMultipleMethods() {
+        $mock = new MockDummy();
+        $mock->returnsByValue("aMethod", 100, array(1));
+        $mock->returnsByValue("aMethod", 200, array(2));
+        $mock->returnsByValue("anotherMethod", 10, array(1));
+        $mock->returnsByValue("anotherMethod", 20, array(2));
+        $this->assertIdentical($mock->aMethod(1), 100);
+        $this->assertIdentical($mock->anotherMethod(1), 10);
+        $this->assertIdentical($mock->aMethod(2), 200);
+        $this->assertIdentical($mock->anotherMethod(2), 20);
+    }
+
+    function testReturnSequence() {
+        $mock = new MockDummy();
+        $mock->returnsByValueAt(0, "aMethod", "aaa");
+        $mock->returnsByValueAt(1, "aMethod", "bbb");
+        $mock->returnsByValueAt(3, "aMethod", "ddd");
+        $this->assertIdentical($mock->aMethod(), "aaa");
+        $this->assertIdentical($mock->aMethod(), "bbb");
+        $this->assertNull($mock->aMethod());
+        $this->assertIdentical($mock->aMethod(), "ddd");
+    }
+
+    function testSetReturnReferenceAtGivesOriginal() {
+        $mock = new MockDummy();
+        $object = 100;
+        $mock->returnsByReferenceAt(1, "aReferenceMethod", $object);
+        $this->assertNull($mock->aReferenceMethod());
+        $this->assertReference($mock->aReferenceMethod(), $object);
+        $this->assertNull($mock->aReferenceMethod());
+    }
+
+    function testReturnsAtGivesOriginalObjectHandle() {
+        $mock = new MockDummy();
+        $object = new Dummy();
+        $mock->returnsAt(1, "aMethod", $object);
+        $this->assertNull($mock->aMethod());
+        $this->assertSame($mock->aMethod(), $object);
+        $this->assertNull($mock->aMethod());
+    }
+
+    function testComplicatedReturnSequence() {
+        $mock = new MockDummy();
+        $object = new Dummy();
+        $mock->returnsAt(1, "aMethod", "aaa", array("a"));
+        $mock->returnsAt(1, "aMethod", "bbb");
+        $mock->returnsAt(2, "aMethod", $object, array('*', 2));
+        $mock->returnsAt(2, "aMethod", "value", array('*', 3));
+        $mock->returns("aMethod", 3, array(3));
+        $this->assertNull($mock->aMethod());
+        $this->assertEqual($mock->aMethod("a"), "aaa");
+        $this->assertSame($mock->aMethod(1, 2), $object);
+        $this->assertEqual($mock->aMethod(3), 3);
+        $this->assertNull($mock->aMethod());
+    }
+
+    function testMultipleMethodSequences() {
+        $mock = new MockDummy();
+        $mock->returnsByValueAt(0, "aMethod", "aaa");
+        $mock->returnsByValueAt(1, "aMethod", "bbb");
+        $mock->returnsByValueAt(0, "anotherMethod", "ccc");
+        $mock->returnsByValueAt(1, "anotherMethod", "ddd");
+        $this->assertIdentical($mock->aMethod(), "aaa");
+        $this->assertIdentical($mock->anotherMethod(), "ccc");
+        $this->assertIdentical($mock->aMethod(), "bbb");
+        $this->assertIdentical($mock->anotherMethod(), "ddd");
+    }
+
+    function testSequenceFallback() {
+        $mock = new MockDummy();
+        $mock->returnsByValueAt(0, "aMethod", "aaa", array('a'));
+        $mock->returnsByValueAt(1, "aMethod", "bbb", array('a'));
+        $mock->returnsByValue("aMethod", "AAA");
+        $this->assertIdentical($mock->aMethod('a'), "aaa");
+        $this->assertIdentical($mock->aMethod('b'), "AAA");
+    }
+
+    function testMethodInterference() {
+        $mock = new MockDummy();
+        $mock->returnsByValueAt(0, "anotherMethod", "aaa");
+        $mock->returnsByValue("aMethod", "AAA");
+        $this->assertIdentical($mock->aMethod(), "AAA");
+        $this->assertIdentical($mock->anotherMethod(), "aaa");
+    }
+}
+
+class TestOfMockExpectationsThatPass extends UnitTestCase {
+
+    function testAnyArgument() {
+        $mock = new MockDummy();
+        $mock->expect('aMethod', array('*'));
+        $mock->aMethod(1);
+        $mock->aMethod('hello');
+    }
+
+    function testAnyTwoArguments() {
+        $mock = new MockDummy();
+        $mock->expect('aMethod', array('*', '*'));
+        $mock->aMethod(1, 2);
+    }
+
+    function testSpecificArgument() {
+        $mock = new MockDummy();
+        $mock->expect('aMethod', array(1));
+        $mock->aMethod(1);
+    }
+
+    function testExpectation() {
+        $mock = new MockDummy();
+        $mock->expect('aMethod', array(new IsAExpectation('Dummy')));
+        $mock->aMethod(new Dummy());
+    }
+
+    function testArgumentsInSequence() {
+        $mock = new MockDummy();
+        $mock->expectAt(0, 'aMethod', array(1, 2));
+        $mock->expectAt(1, 'aMethod', array(3, 4));
+        $mock->aMethod(1, 2);
+        $mock->aMethod(3, 4);
+    }
+
+    function testAtLeastOnceSatisfiedByOneCall() {
+        $mock = new MockDummy();
+        $mock->expectAtLeastOnce('aMethod');
+        $mock->aMethod();
+    }
+
+    function testAtLeastOnceSatisfiedByTwoCalls() {
+        $mock = new MockDummy();
+        $mock->expectAtLeastOnce('aMethod');
+        $mock->aMethod();
+        $mock->aMethod();
+    }
+
+    function testOnceSatisfiedByOneCall() {
+        $mock = new MockDummy();
+        $mock->expectOnce('aMethod');
+        $mock->aMethod();
+    }
+
+    function testMinimumCallsSatisfiedByEnoughCalls() {
+        $mock = new MockDummy();
+        $mock->expectMinimumCallCount('aMethod', 1);
+        $mock->aMethod();
+    }
+
+    function testMinimumCallsSatisfiedByTooManyCalls() {
+        $mock = new MockDummy();
+        $mock->expectMinimumCallCount('aMethod', 3);
+        $mock->aMethod();
+        $mock->aMethod();
+        $mock->aMethod();
+        $mock->aMethod();
+    }
+
+    function testMaximumCallsSatisfiedByEnoughCalls() {
+        $mock = new MockDummy();
+        $mock->expectMaximumCallCount('aMethod', 1);
+        $mock->aMethod();
+    }
+
+    function testMaximumCallsSatisfiedByNoCalls() {
+        $mock = new MockDummy();
+        $mock->expectMaximumCallCount('aMethod', 1);
+    }
+}
+
+class MockWithInjectedTestCase extends SimpleMock {
+    protected function getCurrentTestCase() {
+        return SimpleTest::getContext()->getTest()->getMockedTest();
+    }
+}
+SimpleTest::setMockBaseClass('MockWithInjectedTestCase');
+Mock::generate('Dummy', 'MockDummyWithInjectedTestCase');
+SimpleTest::setMockBaseClass('SimpleMock');
+Mock::generate('SimpleTestCase');
+
+class LikeExpectation extends IdenticalExpectation {
+    function __construct($expectation) {
+        $expectation->message = '';
+        parent::__construct($expectation);
+    }
+
+    function test($compare) {
+        $compare->message = '';
+        return parent::test($compare);
+    }
+
+    function testMessage($compare) {
+        $compare->message = '';
+        return parent::testMessage($compare);
+    }
+}
+
+class TestOfMockExpectations extends UnitTestCase {
+    private $test;
+
+    function setUp() {
+        $this->test = new MockSimpleTestCase();
+    }
+
+    function getMockedTest() {
+        return $this->test;
+    }
+
+    function testSettingExpectationOnNonMethodThrowsError() {
+        $mock = new MockDummyWithInjectedTestCase();
+        $this->expectError();
+        $mock->expectMaximumCallCount('aMissingMethod', 2);
+    }
+
+    function testMaxCallsDetectsOverrun() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 2), 3));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectMaximumCallCount('aMethod', 2);
+        $mock->aMethod();
+        $mock->aMethod();
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testTallyOnMaxCallsSendsPassOnUnderrun() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 2), 2));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectMaximumCallCount("aMethod", 2);
+        $mock->aMethod();
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testExpectNeverDetectsOverrun() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 0), 1));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectNever('aMethod');
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testTallyOnExpectNeverStillSendsPassOnUnderrun() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 0), 0));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectNever('aMethod');
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testMinCalls() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 2), 2));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectMinimumCallCount('aMethod', 2);
+        $mock->aMethod();
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testFailedNever() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 0), 1));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectNever('aMethod');
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testUnderOnce() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 1), 0));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectOnce('aMethod');
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testOverOnce() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 1), 2));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectOnce('aMethod');
+        $mock->aMethod();
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testUnderAtLeastOnce() {
+        $this->test->expectOnce('assert', array(new MemberExpectation('count', 1), 0));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectAtLeastOnce("aMethod");
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testZeroArguments() {
+        $this->test->expectOnce('assert',
+                                array(new MemberExpectation('expected', array()), array(), '*'));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expect('aMethod', array());
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testExpectedArguments() {
+        $this->test->expectOnce('assert',
+                                array(new MemberExpectation('expected', array(1, 2, 3)), array(1, 2, 3), '*'));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expect('aMethod', array(1, 2, 3));
+        $mock->aMethod(1, 2, 3);
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testFailedArguments() {
+        $this->test->expectOnce('assert',
+                                array(new MemberExpectation('expected', array('this')), array('that'), '*'));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expect('aMethod', array('this'));
+        $mock->aMethod('that');
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testWildcardsAreTranslatedToAnythingExpectations() {
+        $this->test->expectOnce('assert',
+                                array(new MemberExpectation('expected',
+                                                            array(new AnythingExpectation(),
+                                                                  123,
+                                                                  new AnythingExpectation())),
+                                      array(100, 123, 101), '*'));
+        $mock = new MockDummyWithInjectedTestCase($this);
+        $mock->expect("aMethod", array('*', 123, '*'));
+        $mock->aMethod(100, 123, 101);
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testSpecificPassingSequence() {
+        $this->test->expectAt(0, 'assert',
+                              array(new MemberExpectation('expected', array(1, 2, 3)), array(1, 2, 3), '*'));
+        $this->test->expectAt(1, 'assert',
+                              array(new MemberExpectation('expected', array('Hello')), array('Hello'), '*'));
+        $mock = new MockDummyWithInjectedTestCase();
+        $mock->expectAt(1, 'aMethod', array(1, 2, 3));
+        $mock->expectAt(2, 'aMethod', array('Hello'));
+        $mock->aMethod();
+        $mock->aMethod(1, 2, 3);
+        $mock->aMethod('Hello');
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+    }
+
+    function testNonArrayForExpectedParametersGivesError() {
+        $mock = new MockDummyWithInjectedTestCase();
+        $this->expectError(new PatternExpectation('/\$args.*not an array/i'));
+        $mock->expect("aMethod", "foo");
+        $mock->aMethod();
+        $mock->mock->atTestEnd('testSomething', $this->test);
+   }
+}
+
+class TestOfMockComparisons extends UnitTestCase {
+
+    function testEqualComparisonOfMocksDoesNotCrash() {
+        $expectation = new EqualExpectation(new MockDummy());
+        $this->assertTrue($expectation->test(new MockDummy(), true));
+    }
+
+    function testIdenticalComparisonOfMocksDoesNotCrash() {
+        $expectation = new IdenticalExpectation(new MockDummy());
+        $this->assertTrue($expectation->test(new MockDummy()));
+    }
+}
+
+class ClassWithSpecialMethods {
+    function __get($name) { }
+    function __set($name, $value) { }
+    function __isset($name) { }
+    function __unset($name) { }
+    function __call($method, $arguments) { }
+    function __toString() { }
+}
+Mock::generate('ClassWithSpecialMethods');
+
+class TestOfSpecialMethodsAfterPHP51 extends UnitTestCase {
+
+    function skip() {
+        $this->skipIf(version_compare(phpversion(), '5.1', '<'), '__isset and __unset overloading not tested unless PHP 5.1+');
+    }
+
+    function testCanEmulateIsset() {
+        $mock = new MockClassWithSpecialMethods();
+        $mock->returnsByValue('__isset', true);
+        $this->assertIdentical(isset($mock->a), true);
+    }
+
+    function testCanExpectUnset() {
+        $mock = new MockClassWithSpecialMethods();
+        $mock->expectOnce('__unset', array('a'));
+        unset($mock->a);
+    }
+
+}
+
+class TestOfSpecialMethods extends UnitTestCase {
+    function skip() {
+        $this->skipIf(version_compare(phpversion(), '5', '<'), 'Overloading not tested unless PHP 5+');
+    }
+
+    function testCanMockTheThingAtAll() {
+        $mock = new MockClassWithSpecialMethods();
+    }
+
+    function testReturnFromSpecialAccessor() {
+        $mock = new MockClassWithSpecialMethods();
+        $mock->returnsByValue('__get', '1st Return', array('first'));
+        $mock->returnsByValue('__get', '2nd Return', array('second'));
+        $this->assertEqual($mock->first, '1st Return');
+        $this->assertEqual($mock->second, '2nd Return');
+    }
+
+    function testcanExpectTheSettingOfValue() {
+        $mock = new MockClassWithSpecialMethods();
+        $mock->expectOnce('__set', array('a', 'A'));
+        $mock->a = 'A';
+    }
+
+    function testCanSimulateAnOverloadmethod() {
+        $mock = new MockClassWithSpecialMethods();
+        $mock->expectOnce('__call', array('amOverloaded', array('A')));
+        $mock->returnsByValue('__call', 'aaa');
+        $this->assertIdentical($mock->amOverloaded('A'), 'aaa');
+    }
+
+    function testToStringMagic() {
+        $mock = new MockClassWithSpecialMethods();
+        $mock->expectOnce('__toString');
+        $mock->returnsByValue('__toString', 'AAA');
+        ob_start();
+        print $mock;
+        $output = ob_get_contents();
+        ob_end_clean();
+        $this->assertEqual($output, 'AAA');
+    }
+}
+
+class WithStaticMethod {
+    static function aStaticMethod() { }
+}
+Mock::generate('WithStaticMethod');
+
+class TestOfMockingClassesWithStaticMethods extends UnitTestCase {
+
+    function testStaticMethodIsMockedAsStatic() {
+        $mock = new WithStaticMethod();
+        $reflection = new ReflectionClass($mock);
+        $method = $reflection->getMethod('aStaticMethod');
+        $this->assertTrue($method->isStatic());
+    }
+}
+
+class MockTestException extends Exception { }
+
+class TestOfThrowingExceptionsFromMocks extends UnitTestCase {
+
+    function testCanThrowOnMethodCall() {
+        $mock = new MockDummy();
+        $mock->throwOn('aMethod');
+        $this->expectException();
+        $mock->aMethod();
+    }
+
+    function testCanThrowSpecificExceptionOnMethodCall() {
+        $mock = new MockDummy();
+        $mock->throwOn('aMethod', new MockTestException());
+        $this->expectException();
+        $mock->aMethod();
+    }
+
+    function testThrowsOnlyWhenCallSignatureMatches() {
+        $mock = new MockDummy();
+        $mock->throwOn('aMethod', new MockTestException(), array(3));
+        $mock->aMethod(1);
+        $mock->aMethod(2);
+        $this->expectException();
+        $mock->aMethod(3);
+    }
+
+    function testCanThrowOnParticularInvocation() {
+        $mock = new MockDummy();
+        $mock->throwAt(2, 'aMethod', new MockTestException());
+        $mock->aMethod();
+        $mock->aMethod();
+        $this->expectException();
+        $mock->aMethod();
+    }
+}
+
+class TestOfThrowingErrorsFromMocks extends UnitTestCase {
+
+    function testCanGenerateErrorFromMethodCall() {
+        $mock = new MockDummy();
+        $mock->errorOn('aMethod', 'Ouch!');
+        $this->expectError('Ouch!');
+        $mock->aMethod();
+    }
+
+    function testGeneratesErrorOnlyWhenCallSignatureMatches() {
+        $mock = new MockDummy();
+        $mock->errorOn('aMethod', 'Ouch!', array(3));
+        $mock->aMethod(1);
+        $mock->aMethod(2);
+        $this->expectError();
+        $mock->aMethod(3);
+    }
+
+    function testCanGenerateErrorOnParticularInvocation() {
+        $mock = new MockDummy();
+        $mock->errorAt(2, 'aMethod', 'Ouch!');
+        $mock->aMethod();
+        $mock->aMethod();
+        $this->expectError();
+        $mock->aMethod();
+    }
+}
+
+Mock::generatePartial('Dummy', 'TestDummy', array('anotherMethod', 'aReferenceMethod'));
+
+class TestOfPartialMocks extends UnitTestCase {
+
+    function testMethodReplacementWithNoBehaviourReturnsNull() {
+        $mock = new TestDummy();
+        $this->assertEqual($mock->aMethod(99), 99);
+        $this->assertNull($mock->anotherMethod());
+    }
+
+    function testSettingReturns() {
+        $mock = new TestDummy();
+        $mock->returnsByValue('anotherMethod', 33, array(3));
+        $mock->returnsByValue('anotherMethod', 22);
+        $mock->returnsByValueAt(2, 'anotherMethod', 44, array(3));
+        $this->assertEqual($mock->anotherMethod(), 22);
+        $this->assertEqual($mock->anotherMethod(3), 33);
+        $this->assertEqual($mock->anotherMethod(3), 44);
+    }
+
+    function testSetReturnReferenceGivesOriginal() {
+        $mock = new TestDummy();
+        $object = 99;
+        $mock->returnsByReferenceAt(0, 'aReferenceMethod', $object, array(3));
+        $this->assertReference($mock->aReferenceMethod(3), $object);
+    }
+
+    function testReturnsAtGivesOriginalObjectHandle() {
+        $mock = new TestDummy();
+        $object = new Dummy();
+        $mock->returnsAt(0, 'anotherMethod', $object, array(3));
+        $this->assertSame($mock->anotherMethod(3), $object);
+    }
+
+    function testExpectations() {
+        $mock = new TestDummy();
+        $mock->expectCallCount('anotherMethod', 2);
+        $mock->expect('anotherMethod', array(77));
+        $mock->expectAt(1, 'anotherMethod', array(66));
+        $mock->anotherMethod(77);
+        $mock->anotherMethod(66);
+    }
+
+    function testSettingExpectationOnMissingMethodThrowsError() {
+        $mock = new TestDummy();
+        $this->expectError();
+        $mock->expectCallCount('aMissingMethod', 2);
+    }
+}
+
+class ConstructorSuperClass {
+    function ConstructorSuperClass() { }
+}
+
+class ConstructorSubClass extends ConstructorSuperClass { }
+
+class TestOfPHP4StyleSuperClassConstruct extends UnitTestCase {
+    function testBasicConstruct() {
+        Mock::generate('ConstructorSubClass');
+        $mock = new MockConstructorSubClass();
+        $this->assertIsA($mock, 'ConstructorSubClass');
+        $this->assertTrue(method_exists($mock, 'ConstructorSuperClass'));
+    }
+}
+
+class TestOfPHP5StaticMethodMocking extends UnitTestCase {
+    function testCanCreateAMockObjectWithStaticMethodsWithoutError() {
+        eval('
+            class SimpleObjectContainingStaticMethod {
+                static function someStatic() { }
+            }
+        ');
+        Mock::generate('SimpleObjectContainingStaticMethod');
+    }
+}
+
+class TestOfPHP5AbstractMethodMocking extends UnitTestCase {
+    function testCanCreateAMockObjectFromAnAbstractWithProperFunctionDeclarations() {
+        eval('
+            abstract class SimpleAbstractClassContainingAbstractMethods {
+                abstract function anAbstract();
+                abstract function anAbstractWithParameter($foo);
+                abstract function anAbstractWithMultipleParameters($foo, $bar);
+            }
+        ');
+        Mock::generate('SimpleAbstractClassContainingAbstractMethods');
+        $this->assertTrue(
+            method_exists(
+                // Testing with class name alone does not work in PHP 5.0
+                new MockSimpleAbstractClassContainingAbstractMethods,
+                'anAbstract'
+            )
+        );
+        $this->assertTrue(
+            method_exists(
+                new MockSimpleAbstractClassContainingAbstractMethods,
+                'anAbstractWithParameter'
+            )
+        );
+        $this->assertTrue(
+            method_exists(
+                new MockSimpleAbstractClassContainingAbstractMethods,
+                'anAbstractWithMultipleParameters'
+            )
+        );
+    }
+
+    function testMethodsDefinedAsAbstractInParentShouldHaveFullSignature() {
+        eval('
+             abstract class SimpleParentAbstractClassContainingAbstractMethods {
+                abstract function anAbstract();
+                abstract function anAbstractWithParameter($foo);
+                abstract function anAbstractWithMultipleParameters($foo, $bar);
+            }
+
+             class SimpleChildAbstractClassContainingAbstractMethods extends SimpleParentAbstractClassContainingAbstractMethods {
+                function anAbstract(){}
+                function anAbstractWithParameter($foo){}
+                function anAbstractWithMultipleParameters($foo, $bar){}
+            }
+
+            class EvenDeeperEmptyChildClass extends SimpleChildAbstractClassContainingAbstractMethods {}
+        ');
+        Mock::generate('SimpleChildAbstractClassContainingAbstractMethods');
+        $this->assertTrue(
+            method_exists(
+                new MockSimpleChildAbstractClassContainingAbstractMethods,
+                'anAbstract'
+            )
+        );
+        $this->assertTrue(
+            method_exists(
+                new MockSimpleChildAbstractClassContainingAbstractMethods,
+                'anAbstractWithParameter'
+            )
+        );
+        $this->assertTrue(
+            method_exists(
+                new MockSimpleChildAbstractClassContainingAbstractMethods,
+                'anAbstractWithMultipleParameters'
+            )
+        );
+        Mock::generate('EvenDeeperEmptyChildClass');
+        $this->assertTrue(
+            method_exists(
+                new MockEvenDeeperEmptyChildClass,
+                'anAbstract'
+            )
+        );
+        $this->assertTrue(
+            method_exists(
+                new MockEvenDeeperEmptyChildClass,
+                'anAbstractWithParameter'
+            )
+        );
+        $this->assertTrue(
+            method_exists(
+                new MockEvenDeeperEmptyChildClass,
+                'anAbstractWithMultipleParameters'
+            )
+        );
+    }
+}
+
+class DummyWithProtected
+{
+    public function aMethodCallsProtected() { return $this->aProtectedMethod(); }
+    protected function aProtectedMethod() { return true; }
+}
+
+Mock::generatePartial('DummyWithProtected', 'TestDummyWithProtected', array('aProtectedMethod'));
+class TestOfProtectedMethodPartialMocks extends UnitTestCase
+{
+    function testProtectedMethodExists() {
+        $this->assertTrue(
+            method_exists(
+                new TestDummyWithProtected,
+                'aProtectedMethod'
+            )
+        );
+    }
+
+    function testProtectedMethodIsCalled() {
+        $object = new DummyWithProtected();
+        $this->assertTrue($object->aMethodCallsProtected(), 'ensure original was called');
+    }
+
+    function testMockedMethodIsCalled() {
+        $object = new TestDummyWithProtected();
+        $object->returnsByValue('aProtectedMethod', false);
+        $this->assertFalse($object->aMethodCallsProtected());
+    }
+}
+
+?>
diff --git a/3rdparty/simpletest/test/page_test.php b/3rdparty/simpletest/test/page_test.php
new file mode 100755
index 00000000000..fdc15c5d008
--- /dev/null
+++ b/3rdparty/simpletest/test/page_test.php
@@ -0,0 +1,166 @@
+<?php
+// $Id: page_test.php 1913 2009-07-29 16:50:56Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../expectation.php');
+require_once(dirname(__FILE__) . '/../http.php');
+require_once(dirname(__FILE__) . '/../page.php');
+Mock::generate('SimpleHttpHeaders');
+Mock::generate('SimpleHttpResponse');
+
+class TestOfPageInterface extends UnitTestCase {
+    function testInterfaceOnEmptyPage() {
+        $page = new SimplePage();
+        $this->assertEqual($page->getTransportError(), 'No page fetched yet');
+        $this->assertIdentical($page->getRaw(), false);
+        $this->assertIdentical($page->getHeaders(), false);
+        $this->assertIdentical($page->getMimeType(), false);
+        $this->assertIdentical($page->getResponseCode(), false);
+        $this->assertIdentical($page->getAuthentication(), false);
+        $this->assertIdentical($page->getRealm(), false);
+        $this->assertFalse($page->hasFrames());
+        $this->assertIdentical($page->getUrls(), array());
+        $this->assertIdentical($page->getTitle(), false);
+    }
+}
+
+class TestOfPageHeaders extends UnitTestCase {
+
+    function testUrlAccessor() {
+        $headers = new MockSimpleHttpHeaders();
+
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getHeaders', $headers);
+        $response->setReturnValue('getMethod', 'POST');
+        $response->setReturnValue('getUrl', new SimpleUrl('here'));
+        $response->setReturnValue('getRequestData', array('a' => 'A'));
+
+        $page = new SimplePage($response);
+        $this->assertEqual($page->getMethod(), 'POST');
+        $this->assertEqual($page->getUrl(), new SimpleUrl('here'));
+        $this->assertEqual($page->getRequestData(), array('a' => 'A'));
+    }
+
+    function testTransportError() {
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getError', 'Ouch');
+
+        $page = new SimplePage($response);
+        $this->assertEqual($page->getTransportError(), 'Ouch');
+    }
+
+    function testHeadersAccessor() {
+        $headers = new MockSimpleHttpHeaders();
+        $headers->setReturnValue('getRaw', 'My: Headers');
+
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getHeaders', $headers);
+
+        $page = new SimplePage($response);
+        $this->assertEqual($page->getHeaders(), 'My: Headers');
+    }
+
+    function testMimeAccessor() {
+        $headers = new MockSimpleHttpHeaders();
+        $headers->setReturnValue('getMimeType', 'text/html');
+
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getHeaders', $headers);
+
+        $page = new SimplePage($response);
+        $this->assertEqual($page->getMimeType(), 'text/html');
+    }
+
+    function testResponseAccessor() {
+        $headers = new MockSimpleHttpHeaders();
+        $headers->setReturnValue('getResponseCode', 301);
+
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getHeaders', $headers);
+
+        $page = new SimplePage($response);
+        $this->assertIdentical($page->getResponseCode(), 301);
+    }
+
+    function testAuthenticationAccessors() {
+        $headers = new MockSimpleHttpHeaders();
+        $headers->setReturnValue('getAuthentication', 'Basic');
+        $headers->setReturnValue('getRealm', 'Secret stuff');
+
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getHeaders', $headers);
+
+        $page = new SimplePage($response);
+        $this->assertEqual($page->getAuthentication(), 'Basic');
+        $this->assertEqual($page->getRealm(), 'Secret stuff');
+    }
+}
+
+class TestOfHtmlStrippingAndNormalisation extends UnitTestCase {
+
+	function testImageSuppressionWhileKeepingParagraphsAndAltText() {
+        $this->assertEqual(
+                SimplePage::normalise('<img src="foo.png" /><p>some text</p><img src="bar.png" alt="bar" />'),
+                'some text bar');
+	}
+
+    function testSpaceNormalisation() {
+        $this->assertEqual(
+                SimplePage::normalise("\nOne\tTwo   \nThree\t"),
+                'One Two Three');
+    }
+
+    function testMultilinesCommentSuppression() {
+        $this->assertEqual(
+                SimplePage::normalise('<!--\n Hello \n-->'),
+                '');
+    }
+
+    function testCommentSuppression() {
+        $this->assertEqual(
+                SimplePage::normalise('<!--Hello-->'),
+                '');
+    }
+
+    function testJavascriptSuppression() {
+        $this->assertEqual(
+                SimplePage::normalise('<script attribute="test">\nHello\n</script>'),
+                '');
+        $this->assertEqual(
+                SimplePage::normalise('<script attribute="test">Hello</script>'),
+                '');
+        $this->assertEqual(
+                SimplePage::normalise('<script>Hello</script>'),
+                '');
+    }
+
+    function testTagSuppression() {
+        $this->assertEqual(
+                SimplePage::normalise('<b>Hello</b>'),
+                'Hello');
+    }
+
+    function testAdjoiningTagSuppression() {
+        $this->assertEqual(
+                SimplePage::normalise('<b>Hello</b><em>Goodbye</em>'),
+                'HelloGoodbye');
+    }
+
+    function testExtractImageAltTextWithDifferentQuotes() {
+        $this->assertEqual(
+                SimplePage::normalise('<img alt="One"><img alt=\'Two\'><img alt=Three>'),
+                'One Two Three');
+    }
+
+    function testExtractImageAltTextMultipleTimes() {
+        $this->assertEqual(
+                SimplePage::normalise('<img alt="One"><img alt="Two"><img alt="Three">'),
+                'One Two Three');
+    }
+
+    function testHtmlEntityTranslation() {
+        $this->assertEqual(
+                SimplePage::normalise('&lt;&gt;&quot;&amp;&#039;'),
+                '<>"&\'');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/parse_error_test.php b/3rdparty/simpletest/test/parse_error_test.php
new file mode 100755
index 00000000000..c3ffb3d4205
--- /dev/null
+++ b/3rdparty/simpletest/test/parse_error_test.php
@@ -0,0 +1,9 @@
+<?php
+// $Id: parse_error_test.php 1509 2007-05-08 22:11:49Z lastcraft $
+require_once('../unit_tester.php');
+require_once('../reporter.php');
+
+$test = &new TestSuite('This should fail');
+$test->addFile('test_with_parse_error.php');
+$test->run(new HtmlReporter());
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/parsing_test.php b/3rdparty/simpletest/test/parsing_test.php
new file mode 100755
index 00000000000..2c5e6cafe1d
--- /dev/null
+++ b/3rdparty/simpletest/test/parsing_test.php
@@ -0,0 +1,642 @@
+<?php
+// $Id: page_test.php 1912 2009-07-29 16:39:17Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../page.php');
+require_once(dirname(__FILE__) . '/../php_parser.php');
+require_once(dirname(__FILE__) . '/../tidy_parser.php');
+Mock::generate('SimpleHttpResponse');
+
+abstract class TestOfParsing extends UnitTestCase {
+
+    function testRawAccessor() {
+        $page = $this->whenVisiting('http://host/', 'Raw HTML');
+        $this->assertEqual($page->getRaw(), 'Raw HTML');
+    }
+
+    function testTextAccessor() {
+        $page = $this->whenVisiting('http://host/', '<b>Some</b> &quot;messy&quot; HTML');
+        $this->assertEqual($page->getText(), 'Some "messy" HTML');
+    }
+
+    function testFramesetAbsence() {
+        $page = $this->whenVisiting('http://here/', '');
+        $this->assertFalse($page->hasFrames());
+        $this->assertIdentical($page->getFrameset(), false);
+    }
+
+    function testPageWithNoUrlsGivesEmptyArrayOfLinks() {
+        $page = $this->whenVisiting('http://here/', '<html><body><p>Stuff</p></body></html>');
+        $this->assertIdentical($page->getUrls(), array());
+    }
+
+    function testAddAbsoluteLink() {
+        $page = $this->whenVisiting('http://host',
+                                    '<html><a href="http://somewhere.com">Label</a></html>');
+        $this->assertEqual(
+                $page->getUrlsByLabel('Label'),
+                array(new SimpleUrl('http://somewhere.com')));
+    }
+
+    function testUrlLabelsHaveHtmlTagsStripped() {
+        $page = $this->whenVisiting('http://host',
+                                    '<html><a href="http://somewhere.com"><b>Label</b></a></html>');
+        $this->assertEqual(
+                $page->getUrlsByLabel('Label'),
+                array(new SimpleUrl('http://somewhere.com')));
+    }
+
+    function testAddStrictRelativeLink() {
+        $page = $this->whenVisiting('http://host',
+                                    '<html><a href="./somewhere.php">Label</a></html>');
+        $this->assertEqual(
+                $page->getUrlsByLabel('Label'),
+                array(new SimpleUrl('http://host/somewhere.php')));
+    }
+
+    function testAddBareRelativeLink() {
+        $page = $this->whenVisiting('http://host',
+                                    '<html><a href="somewhere.php">Label</a></html>');
+        $this->assertEqual(
+                $page->getUrlsByLabel('Label'),
+                array(new SimpleUrl('http://host/somewhere.php')));
+    }
+
+    function testAddRelativeLinkWithBaseTag() {
+        $raw = '<html><head><base href="http://www.lastcraft.com/stuff/"></head>' .
+               '<body><a href="somewhere.php">Label</a></body>' .
+               '</html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual(
+                $page->getUrlsByLabel('Label'),
+                array(new SimpleUrl('http://www.lastcraft.com/stuff/somewhere.php')));
+    }
+
+    function testAddAbsoluteLinkWithBaseTag() {
+        $raw = '<html><head><base href="http://www.lastcraft.com/stuff/"></head>' .
+               '<body><a href="http://here.com/somewhere.php">Label</a></body>' .
+               '</html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual(
+                $page->getUrlsByLabel('Label'),
+                array(new SimpleUrl('http://here.com/somewhere.php')));
+    }
+
+    function testCanFindLinkInsideForm() {
+        $raw = '<html><body><form><a href="./somewhere.php">Label</a></form></body></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual(
+                $page->getUrlsByLabel('Label'),
+                array(new SimpleUrl('http://host/somewhere.php')));
+    }
+
+    function testCanGetLinksByIdOrLabel() {
+        $raw = '<html><body><a href="./somewhere.php" id="33">Label</a></body></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual(
+                $page->getUrlsByLabel('Label'),
+                array(new SimpleUrl('http://host/somewhere.php')));
+        $this->assertFalse($page->getUrlById(0));
+        $this->assertEqual(
+                $page->getUrlById(33),
+                new SimpleUrl('http://host/somewhere.php'));
+    }
+
+    function testCanFindLinkByNormalisedLabel() {
+        $raw = '<html><body><a href="./somewhere.php" id="33"><em>Long &amp; thin</em></a></body></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual(
+                $page->getUrlsByLabel('Long & thin'),
+                array(new SimpleUrl('http://host/somewhere.php')));
+    }
+
+    function testCanFindLinkByImageAltText() {
+        $raw = '<a href="./somewhere.php" id="33"><img src="pic.jpg" alt="&lt;A picture&gt;"></a>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual(
+                array_map(array($this, 'urlToString'), $page->getUrlsByLabel('<A picture>')),
+                array('http://host/somewhere.php'));
+    }
+
+    function testTitle() {
+        $page = $this->whenVisiting('http://host',
+                                    '<html><head><title>Me</title></head></html>');
+        $this->assertEqual($page->getTitle(), 'Me');
+    }
+
+    function testTitleWithEntityReference() {
+        $page = $this->whenVisiting('http://host',
+                                    '<html><head><Title>Me&amp;Me</TITLE></head></html>');
+        $this->assertEqual($page->getTitle(), "Me&Me");
+    }
+
+    function testOnlyFramesInFramesetAreRecognised() {
+        $raw =
+            '<frameset>' .
+            '  <frame src="2.html"></frame>' .
+            '  <frame src="3.html"></frame>' .
+            '</frameset>' .
+            '<frame src="4.html"></frame>';
+        $page = $this->whenVisiting('http://here', $raw);
+        $this->assertTrue($page->hasFrames());
+        $this->assertSameFrameset($page->getFrameset(), array(
+                1 => new SimpleUrl('http://here/2.html'),
+                2 => new SimpleUrl('http://here/3.html')));
+    }
+
+    function testReadsNamesInFrames() {
+        $raw =
+            '<frameset>' .
+            '  <frame src="1.html"></frame>' .
+            '  <frame src="2.html" name="A"></frame>' .
+            '  <frame src="3.html" name="B"></frame>' .
+            '  <frame src="4.html"></frame>' .
+            '</frameset>';
+        $page = $this->whenVisiting('http://here', $raw);
+        $this->assertTrue($page->hasFrames());
+        $this->assertSameFrameset($page->getFrameset(), array(
+                1 => new SimpleUrl('http://here/1.html'),
+                'A' => new SimpleUrl('http://here/2.html'),
+                'B' => new SimpleUrl('http://here/3.html'),
+                4 => new SimpleUrl('http://here/4.html')));
+    }
+
+    function testRelativeFramesRespectBaseTag() {
+        $raw = '<base href="https://there.com/stuff/"><frameset><frame src="1.html"></frameset>';
+        $page = $this->whenVisiting('http://here', $raw);
+        $this->assertSameFrameset(
+                $page->getFrameset(),
+                array(1 => new SimpleUrl('https://there.com/stuff/1.html')));
+    }
+
+    function testSingleFrameInNestedFrameset() {
+        $raw = '<html><frameset><frameset>' .
+                '<frame src="a.html">' .
+                '</frameset></frameset></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->hasFrames());
+        $this->assertIdentical(
+                $page->getFrameset(),
+                array(1 => new SimpleUrl('http://host/a.html')));
+    }
+
+    function testFramesCollectedWithNestedFramesetTags() {
+        $raw = '<html><frameset>' .
+                '<frame src="a.html">' .
+                '<frameset><frame src="b.html"></frameset>' .
+                '<frame src="c.html">' .
+                '</frameset></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->hasFrames());
+        $this->assertIdentical($page->getFrameset(), array(
+                1 => new SimpleUrl('http://host/a.html'),
+                2 => new SimpleUrl('http://host/b.html'),
+                3 => new SimpleUrl('http://host/c.html')));
+    }
+
+    function testNamedFrames() {
+        $raw = '<html><frameset>' .
+                '<frame src="a.html">' .
+                '<frame name="_one" src="b.html">' .
+                '<frame src="c.html">' .
+                '<frame src="d.html" name="_two">' .
+                '</frameset></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->hasFrames());
+        $this->assertIdentical($page->getFrameset(), array(
+                1 => new SimpleUrl('http://host/a.html'),
+                '_one' => new SimpleUrl('http://host/b.html'),
+                3 => new SimpleUrl('http://host/c.html'),
+                '_two' => new SimpleUrl('http://host/d.html')));
+    }
+
+    function testCanReadElementOfCompleteForm() {
+        $raw = '<html><head><form>' .
+                '<input type="text" name="here" value="Hello">' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('here')), "Hello");
+    }
+
+    function testCanReadElementOfUnclosedForm() {
+        $raw = '<html><head><form>' .
+                '<input type="text" name="here" value="Hello">' .
+                '</head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('here')), "Hello");
+    }
+
+    function testCanReadElementByLabel() {
+        $raw = '<html><head><form>' .
+                '<label>Where<input type="text" name="here" value="Hello"></label>' .
+                '</head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByLabel('Where')), "Hello");
+    }
+
+    function testCanFindFormByLabel() {
+        $raw = '<html><head><form><input type="submit"></form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertNull($page->getFormBySubmit(new SimpleByLabel('submit')));
+        $this->assertNull($page->getFormBySubmit(new SimpleByName('submit')));
+        $this->assertIsA(
+                $page->getFormBySubmit(new SimpleByLabel('Submit')),
+                'SimpleForm');
+    }
+
+    function testConfirmSubmitAttributesAreCaseSensitive() {
+        $raw = '<html><head><FORM><INPUT TYPE="SUBMIT" NAME="S" VALUE="S"></FORM></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertIsA(
+                $page->getFormBySubmit(new SimpleByName('S')),
+                'SimpleForm');
+        $this->assertIsA(
+                $page->getFormBySubmit(new SimpleByLabel('S')),
+                'SimpleForm');
+    }
+
+    function testCanFindFormByImage() {
+        $raw = '<html><head><form>' .
+                '<input type="image" id=100 alt="Label" name="me">' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertIsA(
+                $page->getFormByImage(new SimpleByLabel('Label')),
+                'SimpleForm');
+        $this->assertIsA(
+                $page->getFormByImage(new SimpleByName('me')),
+                'SimpleForm');
+        $this->assertIsA(
+                $page->getFormByImage(new SimpleById(100)),
+                'SimpleForm');
+    }
+
+    function testCanFindFormByButtonTag() {
+        $raw = '<html><head><form>' .
+                '<button type="submit" name="b" value="B">BBB</button>' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertNull($page->getFormBySubmit(new SimpleByLabel('b')));
+        $this->assertNull($page->getFormBySubmit(new SimpleByLabel('B')));
+        $this->assertIsA(
+                $page->getFormBySubmit(new SimpleByName('b')),
+                'SimpleForm');
+        $this->assertIsA(
+                $page->getFormBySubmit(new SimpleByLabel('BBB')),
+                'SimpleForm');
+    }
+
+    function testCanFindFormById() {
+        $raw = '<html><head><form id="55"><input type="submit"></form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertNull($page->getFormById(54));
+        $this->assertIsA($page->getFormById(55), 'SimpleForm');
+    }
+
+    function testFormCanBeSubmitted() {
+        $raw = '<html><head><form method="GET" action="here.php">' .
+                '<input type="submit" name="s" value="Submit">' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $form = $page->getFormBySubmit(new SimpleByLabel('Submit'));
+        $this->assertEqual(
+                $form->submitButton(new SimpleByLabel('Submit')),
+                new SimpleGetEncoding(array('s' => 'Submit')));
+    }
+
+    function testUnparsedTagDoesNotCrash() {
+        $raw = '<form><input type="reset" name="Clear"></form>';
+        $this->whenVisiting('http://host', $raw);
+    }
+
+    function testReadingTextField() {
+        $raw = '<html><head><form>' .
+                '<input type="text" name="a">' .
+                '<input type="text" name="b" value="bbb" id=3>' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertNull($page->getField(new SimpleByName('missing')));
+        $this->assertIdentical($page->getField(new SimpleByName('a')), '');
+        $this->assertIdentical($page->getField(new SimpleByName('b')), 'bbb');
+    }
+
+    function testEntitiesAreDecodedInDefaultTextFieldValue() {
+        $raw = '<form><input type="text" name="a" value="&amp;\'&quot;&lt;&gt;"></form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), '&\'"<>');
+    }
+
+    function testReadingTextFieldIsCaseInsensitive() {
+        $raw = '<html><head><FORM>' .
+                '<INPUT TYPE="TEXT" NAME="a">' .
+                '<INPUT TYPE="TEXT" NAME="b" VALUE="bbb" id=3>' .
+                '</FORM></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertNull($page->getField(new SimpleByName('missing')));
+        $this->assertIdentical($page->getField(new SimpleByName('a')), '');
+        $this->assertIdentical($page->getField(new SimpleByName('b')), 'bbb');
+    }
+
+    function testSettingTextField() {
+        $raw = '<html><head><form>' .
+                '<input type="text" name="a">' .
+                '<input type="text" name="b" id=3>' .
+                '<input type="submit">' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->setField(new SimpleByName('a'), 'aaa'));
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'aaa');
+        $this->assertTrue($page->setField(new SimpleById(3), 'bbb'));
+        $this->assertEqual($page->getField(new SimpleBYId(3)), 'bbb');
+        $this->assertFalse($page->setField(new SimpleByName('z'), 'zzz'));
+        $this->assertNull($page->getField(new SimpleByName('z')));
+    }
+
+    function testSettingTextFieldByEnclosingLabel() {
+        $raw = '<html><head><form>' .
+                '<label>Stuff' .
+                '<input type="text" name="a" value="A">' .
+                '</label>' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'A');
+        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'A');
+        $this->assertTrue($page->setField(new SimpleByLabel('Stuff'), 'aaa'));
+        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'aaa');
+    }
+
+    function testLabelsWithoutForDoNotAttachToInputsWithNoId() {
+        $raw = '<form action="network_confirm.php?x=X&y=Y" method="post">
+            <label>Text A <input type="text" name="a" value="one"></label>
+            <label>Text B <input type="text" name="b" value="two"></label>
+        </form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByLabelOrName('Text A')), 'one');
+        $this->assertEqual($page->getField(new SimpleByLabelOrName('Text B')), 'two');
+        $this->assertTrue($page->setField(new SimpleByLabelOrName('Text A'), '1'));
+        $this->assertTrue($page->setField(new SimpleByLabelOrName('Text B'), '2'));
+        $this->assertEqual($page->getField(new SimpleByLabelOrName('Text A')), '1');
+        $this->assertEqual($page->getField(new SimpleByLabelOrName('Text B')), '2');
+    }
+
+    function testGettingTextFieldByEnclosingLabelWithConflictingOtherFields() {
+        $raw = '<html><head><form>' .
+                '<label>Stuff' .
+                '<input type="text" name="a" value="A">' .
+                '</label>' .
+                '<input type="text" name="b" value="B">' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'A');
+        $this->assertEqual($page->getField(new SimpleByName('b')), 'B');
+        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'A');
+    }
+
+    function testSettingTextFieldByExternalLabel() {
+        $raw = '<html><head><form>' .
+                '<label for="aaa">Stuff</label>' .
+                '<input id="aaa" type="text" name="a" value="A">' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'A');
+        $this->assertTrue($page->setField(new SimpleByLabel('Stuff'), 'aaa'));
+        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'aaa');
+    }
+
+    function testReadingTextArea() {
+        $raw = '<html><head><form>' .
+                '<textarea name="a">aaa</textarea>' .
+                '<input type="submit">' .
+                '</form></head></html>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'aaa');
+    }
+
+    function testEntitiesAreDecodedInTextareaValue() {
+        $raw = '<form><textarea name="a">&amp;\'&quot;&lt;&gt;</textarea></form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), '&\'"<>');
+    }
+
+    function testNewlinesPreservedInTextArea() {
+        $raw = "<form><textarea name=\"a\">hello\r\nworld</textarea></form>";
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), "hello\r\nworld");
+    }
+
+    function testWhitespacePreservedInTextArea() {
+        $raw = '<form><textarea name="a">     </textarea></form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), '     ');
+    }
+
+    function testComplexWhitespaceInTextArea() {
+        $raw = "<html>\n" .
+                "    <head><title></title></head>\n" .
+                "    <body>\n" .
+                "        <form>\n".
+                "            <label>Text area C\n" .
+                "                <textarea name='c'>\n" .
+                "                </textarea>\n" .
+                "            </label>\n" .
+                "        </form>\n" .
+                "    </body>\n" .
+                "</html>";
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('c')), "                ");
+    }
+
+    function testSettingTextArea() {
+        $raw = '<form>' .
+                '<textarea name="a">aaa</textarea>' .
+                '<input type="submit">' .
+                '</form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->setField(new SimpleByName('a'), 'AAA'));
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'AAA');
+    }
+
+    function testDontIncludeTextAreaContentInLabel() {
+        $raw = '<form><label>Text area C<textarea id=3 name="c">mouse</textarea></label></form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByLabel('Text area C')), 'mouse');
+    }
+
+    function testSettingSelectionField() {
+        $raw = '<form>' .
+                '<select name="a">' .
+                '<option>aaa</option>' .
+                '<option selected>bbb</option>' .
+                '</select>' .
+                '<input type="submit">' .
+                '</form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'bbb');
+        $this->assertFalse($page->setField(new SimpleByName('a'), 'ccc'));
+        $this->assertTrue($page->setField(new SimpleByName('a'), 'aaa'));
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'aaa');
+    }
+
+    function testSelectionOptionsAreNormalised() {
+        $raw = '<form>' .
+                '<select name="a">' .
+                '<option selected><b>Big</b> bold</option>' .
+                '<option>small <em>italic</em></option>' .
+                '</select>' .
+                '</form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'Big bold');
+        $this->assertTrue($page->setField(new SimpleByName('a'), 'small italic'));
+        $this->assertEqual($page->getField(new SimpleByName('a')), 'small italic');
+    }
+
+    function testCanParseBlankOptions() {
+        $raw = '<form>
+                <select id=4 name="d">
+                    <option value="d1">D1</option>
+                    <option value="d2">D2</option>
+                    <option></option>
+                </select>
+                </form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->setField(new SimpleByName('d'), ''));
+    }
+
+    function testTwoSelectionFieldsAreIndependent() {
+        $raw = '<form>
+                    <select id=4 name="d">
+                        <option value="d1" selected>D1</option>
+                        <option value="d2">D2</option>
+                    </select>
+                    <select id=11 name="h">
+                        <option value="h1">H1</option>
+                        <option value="h2" selected>H2</option>
+                    </select>
+                </form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->setField(new SimpleByName('d'), 'd2'));
+        $this->assertTrue($page->setField(new SimpleByName('h'), 'h1'));
+        $this->assertEqual($page->getField(new SimpleByName('d')), 'd2');
+    }
+
+    function testEmptyOptionDoesNotScrewUpTwoSelectionFields() {
+        $raw = '<form>
+                    <select name="d">
+                        <option value="d1" selected>D1</option>
+                        <option value="d2">D2</option>
+                        <option></option>
+                    </select>
+                    <select name="h">
+                        <option value="h1">H1</option>
+                        <option value="h2" selected>H2</option>
+                    </select>
+                </form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->setField(new SimpleByName('d'), 'd2'));
+        $this->assertTrue($page->setField(new SimpleByName('h'), 'h1'));
+        $this->assertEqual($page->getField(new SimpleByName('d')), 'd2');
+    }
+
+    function testSettingSelectionFieldByEnclosingLabel() {
+        $raw = '<form>' .
+                '<label>Stuff' .
+                '<select name="a"><option selected>A</option><option>B</option></select>' .
+                '</label>' .
+                '</form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'A');
+        $this->assertTrue($page->setField(new SimpleByLabel('Stuff'), 'B'));
+        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'B');
+    }
+
+    function testTwoSelectionFieldsWithLabelsAreIndependent() {
+        $raw = '<form>
+                    <label>Labelled D
+                        <select id=4 name="d">
+                            <option value="d1" selected>D1</option>
+                            <option value="d2">D2</option>
+                        </select>
+                    </label>
+                    <label>Labelled H
+                        <select id=11 name="h">
+                            <option value="h1">H1</option>
+                            <option value="h2" selected>H2</option>
+                        </select>
+                    </label>
+                </form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertTrue($page->setField(new SimpleByLabel('Labelled D'), 'd2'));
+        $this->assertTrue($page->setField(new SimpleByLabel('Labelled H'), 'h1'));
+        $this->assertEqual($page->getField(new SimpleByLabel('Labelled D')), 'd2');
+    }
+
+    function testSettingRadioButtonByEnclosingLabel() {
+        $raw = '<form>' .
+                '<label>A<input type="radio" name="r" value="a" checked></label>' .
+                '<label>B<input type="radio" name="r" value="b"></label>' .
+                '</form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByLabel('A')), 'a');
+        $this->assertTrue($page->setField(new SimpleBylabel('B'), 'b'));
+        $this->assertEqual($page->getField(new SimpleByLabel('B')), 'b');
+    }
+
+    function testCanParseInputsWithAllKindsOfAttributeQuoting() {
+        $raw = '<form>' .
+                '<input type="checkbox" name=\'first\' value=one checked></input>' .
+                '<input type=checkbox name="second" value="two"></input>' .
+                '<input type=checkbox name="third" value=\'three\' checked="checked" />' .
+                '</form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByName('first')), 'one');
+        $this->assertEqual($page->getField(new SimpleByName('second')), false);
+        $this->assertEqual($page->getField(new SimpleByName('third')), 'three');
+    }
+
+    function urlToString($url) {
+        return $url->asString();
+    }
+
+    function assertSameFrameset($actual, $expected) {
+        $this->assertIdentical(array_map(array($this, 'urlToString'), $actual),
+                               array_map(array($this, 'urlToString'), $expected));
+    }
+}
+
+class TestOfParsingUsingPhpParser extends TestOfParsing {
+
+    function whenVisiting($url, $content) {
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getContent', $content);
+        $response->setReturnValue('getUrl', new SimpleUrl($url));
+        $builder = new SimplePhpPageBuilder();
+        return $builder->parse($response);
+    }
+
+    function testNastyTitle() {
+        $page = $this->whenVisiting('http://host',
+                                    '<html><head><Title> <b>Me&amp;Me </TITLE></b></head></html>');
+        $this->assertEqual($page->getTitle(), "Me&Me");
+    }
+
+    function testLabelShouldStopAtClosingLabelTag() {
+        $raw = '<form><label>start<textarea id=3 name="c" wrap="hard">stuff</textarea>end</label>stuff</form>';
+        $page = $this->whenVisiting('http://host', $raw);
+        $this->assertEqual($page->getField(new SimpleByLabel('startend')), 'stuff');
+    }
+}
+
+class TestOfParsingUsingTidyParser extends TestOfParsing {
+
+    function skip() {
+        $this->skipUnless(extension_loaded('tidy'), 'Install \'tidy\' php extension to enable html tidy based parser');
+    }
+
+    function whenVisiting($url, $content) {
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getContent', $content);
+        $response->setReturnValue('getUrl', new SimpleUrl($url));
+        $builder = new SimpleTidyPageBuilder();
+        return $builder->parse($response);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/php_parser_test.php b/3rdparty/simpletest/test/php_parser_test.php
new file mode 100755
index 00000000000..d95c7d06a60
--- /dev/null
+++ b/3rdparty/simpletest/test/php_parser_test.php
@@ -0,0 +1,489 @@
+<?php
+// $Id: php_parser_test.php 1911 2009-07-29 16:38:04Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../php_parser.php');
+require_once(dirname(__FILE__) . '/../tag.php');
+Mock::generate('SimplePage');
+Mock::generate('SimplePhpPageBuilder');
+Mock::generate('SimpleHttpResponse');
+Mock::generatePartial(
+        'SimplePhpPageBuilder',
+        'PartialSimplePhpPageBuilder',
+        array('createPage', 'createParser'));
+Mock::generate('SimpleHtmlSaxParser');
+Mock::generate('SimplePhpPageBuilder');
+
+class TestOfParallelRegex extends UnitTestCase {
+
+    function testNoPatterns() {
+        $regex = new ParallelRegex(false);
+        $this->assertFalse($regex->match("Hello", $match));
+        $this->assertEqual($match, "");
+    }
+
+    function testNoSubject() {
+        $regex = new ParallelRegex(false);
+        $regex->addPattern(".*");
+        $this->assertTrue($regex->match("", $match));
+        $this->assertEqual($match, "");
+    }
+
+    function testMatchAll() {
+        $regex = new ParallelRegex(false);
+        $regex->addPattern(".*");
+        $this->assertTrue($regex->match("Hello", $match));
+        $this->assertEqual($match, "Hello");
+    }
+
+    function testCaseSensitive() {
+        $regex = new ParallelRegex(true);
+        $regex->addPattern("abc");
+        $this->assertTrue($regex->match("abcdef", $match));
+        $this->assertEqual($match, "abc");
+        $this->assertTrue($regex->match("AAABCabcdef", $match));
+        $this->assertEqual($match, "abc");
+    }
+
+    function testCaseInsensitive() {
+        $regex = new ParallelRegex(false);
+        $regex->addPattern("abc");
+        $this->assertTrue($regex->match("abcdef", $match));
+        $this->assertEqual($match, "abc");
+        $this->assertTrue($regex->match("AAABCabcdef", $match));
+        $this->assertEqual($match, "ABC");
+    }
+
+    function testMatchMultiple() {
+        $regex = new ParallelRegex(true);
+        $regex->addPattern("abc");
+        $regex->addPattern("ABC");
+        $this->assertTrue($regex->match("abcdef", $match));
+        $this->assertEqual($match, "abc");
+        $this->assertTrue($regex->match("AAABCabcdef", $match));
+        $this->assertEqual($match, "ABC");
+        $this->assertFalse($regex->match("Hello", $match));
+    }
+
+    function testPatternLabels() {
+        $regex = new ParallelRegex(false);
+        $regex->addPattern("abc", "letter");
+        $regex->addPattern("123", "number");
+        $this->assertIdentical($regex->match("abcdef", $match), "letter");
+        $this->assertEqual($match, "abc");
+        $this->assertIdentical($regex->match("0123456789", $match), "number");
+        $this->assertEqual($match, "123");
+    }
+}
+
+class TestOfStateStack extends UnitTestCase {
+
+    function testStartState() {
+        $stack = new SimpleStateStack("one");
+        $this->assertEqual($stack->getCurrent(), "one");
+    }
+
+    function testExhaustion() {
+        $stack = new SimpleStateStack("one");
+        $this->assertFalse($stack->leave());
+    }
+
+    function testStateMoves() {
+        $stack = new SimpleStateStack("one");
+        $stack->enter("two");
+        $this->assertEqual($stack->getCurrent(), "two");
+        $stack->enter("three");
+        $this->assertEqual($stack->getCurrent(), "three");
+        $this->assertTrue($stack->leave());
+        $this->assertEqual($stack->getCurrent(), "two");
+        $stack->enter("third");
+        $this->assertEqual($stack->getCurrent(), "third");
+        $this->assertTrue($stack->leave());
+        $this->assertTrue($stack->leave());
+        $this->assertEqual($stack->getCurrent(), "one");
+    }
+}
+
+class TestParser {
+
+    function accept() {
+    }
+
+    function a() {
+    }
+
+    function b() {
+    }
+}
+Mock::generate('TestParser');
+
+class TestOfLexer extends UnitTestCase {
+
+    function testEmptyPage() {
+        $handler = new MockTestParser();
+        $handler->expectNever("accept");
+        $handler->setReturnValue("accept", true);
+        $handler->expectNever("accept");
+        $handler->setReturnValue("accept", true);
+        $lexer = new SimpleLexer($handler);
+        $lexer->addPattern("a+");
+        $this->assertTrue($lexer->parse(""));
+    }
+
+    function testSinglePattern() {
+        $handler = new MockTestParser();
+        $handler->expectAt(0, "accept", array("aaa", LEXER_MATCHED));
+        $handler->expectAt(1, "accept", array("x", LEXER_UNMATCHED));
+        $handler->expectAt(2, "accept", array("a", LEXER_MATCHED));
+        $handler->expectAt(3, "accept", array("yyy", LEXER_UNMATCHED));
+        $handler->expectAt(4, "accept", array("a", LEXER_MATCHED));
+        $handler->expectAt(5, "accept", array("x", LEXER_UNMATCHED));
+        $handler->expectAt(6, "accept", array("aaa", LEXER_MATCHED));
+        $handler->expectAt(7, "accept", array("z", LEXER_UNMATCHED));
+        $handler->expectCallCount("accept", 8);
+        $handler->setReturnValue("accept", true);
+        $lexer = new SimpleLexer($handler);
+        $lexer->addPattern("a+");
+        $this->assertTrue($lexer->parse("aaaxayyyaxaaaz"));
+    }
+
+    function testMultiplePattern() {
+        $handler = new MockTestParser();
+        $target = array("a", "b", "a", "bb", "x", "b", "a", "xxxxxx", "a", "x");
+        for ($i = 0; $i < count($target); $i++) {
+            $handler->expectAt($i, "accept", array($target[$i], '*'));
+        }
+        $handler->expectCallCount("accept", count($target));
+        $handler->setReturnValue("accept", true);
+        $lexer = new SimpleLexer($handler);
+        $lexer->addPattern("a+");
+        $lexer->addPattern("b+");
+        $this->assertTrue($lexer->parse("ababbxbaxxxxxxax"));
+    }
+}
+
+class TestOfLexerModes extends UnitTestCase {
+
+    function testIsolatedPattern() {
+        $handler = new MockTestParser();
+        $handler->expectAt(0, "a", array("a", LEXER_MATCHED));
+        $handler->expectAt(1, "a", array("b", LEXER_UNMATCHED));
+        $handler->expectAt(2, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(3, "a", array("bxb", LEXER_UNMATCHED));
+        $handler->expectAt(4, "a", array("aaa", LEXER_MATCHED));
+        $handler->expectAt(5, "a", array("x", LEXER_UNMATCHED));
+        $handler->expectAt(6, "a", array("aaaa", LEXER_MATCHED));
+        $handler->expectAt(7, "a", array("x", LEXER_UNMATCHED));
+        $handler->expectCallCount("a", 8);
+        $handler->setReturnValue("a", true);
+        $lexer = new SimpleLexer($handler, "a");
+        $lexer->addPattern("a+", "a");
+        $lexer->addPattern("b+", "b");
+        $this->assertTrue($lexer->parse("abaabxbaaaxaaaax"));
+    }
+
+    function testModeChange() {
+        $handler = new MockTestParser();
+        $handler->expectAt(0, "a", array("a", LEXER_MATCHED));
+        $handler->expectAt(1, "a", array("b", LEXER_UNMATCHED));
+        $handler->expectAt(2, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(3, "a", array("b", LEXER_UNMATCHED));
+        $handler->expectAt(4, "a", array("aaa", LEXER_MATCHED));
+        $handler->expectAt(0, "b", array(":", LEXER_ENTER));
+        $handler->expectAt(1, "b", array("a", LEXER_UNMATCHED));
+        $handler->expectAt(2, "b", array("b", LEXER_MATCHED));
+        $handler->expectAt(3, "b", array("a", LEXER_UNMATCHED));
+        $handler->expectAt(4, "b", array("bb", LEXER_MATCHED));
+        $handler->expectAt(5, "b", array("a", LEXER_UNMATCHED));
+        $handler->expectAt(6, "b", array("bbb", LEXER_MATCHED));
+        $handler->expectAt(7, "b", array("a", LEXER_UNMATCHED));
+        $handler->expectCallCount("a", 5);
+        $handler->expectCallCount("b", 8);
+        $handler->setReturnValue("a", true);
+        $handler->setReturnValue("b", true);
+        $lexer = new SimpleLexer($handler, "a");
+        $lexer->addPattern("a+", "a");
+        $lexer->addEntryPattern(":", "a", "b");
+        $lexer->addPattern("b+", "b");
+        $this->assertTrue($lexer->parse("abaabaaa:ababbabbba"));
+    }
+
+    function testNesting() {
+        $handler = new MockTestParser();
+        $handler->setReturnValue("a", true);
+        $handler->setReturnValue("b", true);
+        $handler->expectAt(0, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(1, "a", array("b", LEXER_UNMATCHED));
+        $handler->expectAt(2, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(3, "a", array("b", LEXER_UNMATCHED));
+        $handler->expectAt(0, "b", array("(", LEXER_ENTER));
+        $handler->expectAt(1, "b", array("bb", LEXER_MATCHED));
+        $handler->expectAt(2, "b", array("a", LEXER_UNMATCHED));
+        $handler->expectAt(3, "b", array("bb", LEXER_MATCHED));
+        $handler->expectAt(4, "b", array(")", LEXER_EXIT));
+        $handler->expectAt(4, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(5, "a", array("b", LEXER_UNMATCHED));
+        $handler->expectCallCount("a", 6);
+        $handler->expectCallCount("b", 5);
+        $lexer = new SimpleLexer($handler, "a");
+        $lexer->addPattern("a+", "a");
+        $lexer->addEntryPattern("(", "a", "b");
+        $lexer->addPattern("b+", "b");
+        $lexer->addExitPattern(")", "b");
+        $this->assertTrue($lexer->parse("aabaab(bbabb)aab"));
+    }
+
+    function testSingular() {
+        $handler = new MockTestParser();
+        $handler->setReturnValue("a", true);
+        $handler->setReturnValue("b", true);
+        $handler->expectAt(0, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(1, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(2, "a", array("xx", LEXER_UNMATCHED));
+        $handler->expectAt(3, "a", array("xx", LEXER_UNMATCHED));
+        $handler->expectAt(0, "b", array("b", LEXER_SPECIAL));
+        $handler->expectAt(1, "b", array("bbb", LEXER_SPECIAL));
+        $handler->expectCallCount("a", 4);
+        $handler->expectCallCount("b", 2);
+        $lexer = new SimpleLexer($handler, "a");
+        $lexer->addPattern("a+", "a");
+        $lexer->addSpecialPattern("b+", "a", "b");
+        $this->assertTrue($lexer->parse("aabaaxxbbbxx"));
+    }
+
+    function testUnwindTooFar() {
+        $handler = new MockTestParser();
+        $handler->setReturnValue("a", true);
+        $handler->expectAt(0, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(1, "a", array(")", LEXER_EXIT));
+        $handler->expectCallCount("a", 2);
+        $lexer = new SimpleLexer($handler, "a");
+        $lexer->addPattern("a+", "a");
+        $lexer->addExitPattern(")", "a");
+        $this->assertFalse($lexer->parse("aa)aa"));
+    }
+}
+
+class TestOfLexerHandlers extends UnitTestCase {
+
+    function testModeMapping() {
+        $handler = new MockTestParser();
+        $handler->setReturnValue("a", true);
+        $handler->expectAt(0, "a", array("aa", LEXER_MATCHED));
+        $handler->expectAt(1, "a", array("(", LEXER_ENTER));
+        $handler->expectAt(2, "a", array("bb", LEXER_MATCHED));
+        $handler->expectAt(3, "a", array("a", LEXER_UNMATCHED));
+        $handler->expectAt(4, "a", array("bb", LEXER_MATCHED));
+        $handler->expectAt(5, "a", array(")", LEXER_EXIT));
+        $handler->expectAt(6, "a", array("b", LEXER_UNMATCHED));
+        $handler->expectCallCount("a", 7);
+        $lexer = new SimpleLexer($handler, "mode_a");
+        $lexer->addPattern("a+", "mode_a");
+        $lexer->addEntryPattern("(", "mode_a", "mode_b");
+        $lexer->addPattern("b+", "mode_b");
+        $lexer->addExitPattern(")", "mode_b");
+        $lexer->mapHandler("mode_a", "a");
+        $lexer->mapHandler("mode_b", "a");
+        $this->assertTrue($lexer->parse("aa(bbabb)b"));
+    }
+}
+
+class TestOfSimpleHtmlLexer extends UnitTestCase {
+
+    function &createParser() {
+        $parser = new MockSimpleHtmlSaxParser();
+        $parser->setReturnValue('acceptStartToken', true);
+        $parser->setReturnValue('acceptEndToken', true);
+        $parser->setReturnValue('acceptAttributeToken', true);
+        $parser->setReturnValue('acceptEntityToken', true);
+        $parser->setReturnValue('acceptTextToken', true);
+        $parser->setReturnValue('ignore', true);
+        return $parser;
+    }
+
+    function testNoContent() {
+        $parser = $this->createParser();
+        $parser->expectNever('acceptStartToken');
+        $parser->expectNever('acceptEndToken');
+        $parser->expectNever('acceptAttributeToken');
+        $parser->expectNever('acceptEntityToken');
+        $parser->expectNever('acceptTextToken');
+        $lexer = new SimpleHtmlLexer($parser);
+        $this->assertTrue($lexer->parse(''));
+    }
+
+    function testUninteresting() {
+        $parser = $this->createParser();
+        $parser->expectOnce('acceptTextToken', array('<html></html>', '*'));
+        $lexer = new SimpleHtmlLexer($parser);
+        $this->assertTrue($lexer->parse('<html></html>'));
+    }
+
+    function testSkipCss() {
+        $parser = $this->createParser();
+        $parser->expectNever('acceptTextToken');
+        $parser->expectAtLeastOnce('ignore');
+        $lexer = new SimpleHtmlLexer($parser);
+        $this->assertTrue($lexer->parse("<style>Lot's of styles</style>"));
+    }
+
+    function testSkipJavaScript() {
+        $parser = $this->createParser();
+        $parser->expectNever('acceptTextToken');
+        $parser->expectAtLeastOnce('ignore');
+        $lexer = new SimpleHtmlLexer($parser);
+        $this->assertTrue($lexer->parse("<SCRIPT>Javascript code {';:^%^%£$'@\"*(}</SCRIPT>"));
+    }
+
+    function testSkipHtmlComments() {
+        $parser = $this->createParser();
+        $parser->expectNever('acceptTextToken');
+        $parser->expectAtLeastOnce('ignore');
+        $lexer = new SimpleHtmlLexer($parser);
+        $this->assertTrue($lexer->parse("<!-- <title>title</title><style>styles</style> -->"));
+    }
+
+    function testTagWithNoAttributes() {
+        $parser = $this->createParser();
+        $parser->expectAt(0, 'acceptStartToken', array('<title', '*'));
+        $parser->expectAt(1, 'acceptStartToken', array('>', '*'));
+        $parser->expectCallCount('acceptStartToken', 2);
+        $parser->expectOnce('acceptTextToken', array('Hello', '*'));
+        $parser->expectOnce('acceptEndToken', array('</title>', '*'));
+        $lexer = new SimpleHtmlLexer($parser);
+        $this->assertTrue($lexer->parse('<title>Hello</title>'));
+    }
+
+    function testTagWithAttributes() {
+        $parser = $this->createParser();
+        $parser->expectOnce('acceptTextToken', array('label', '*'));
+        $parser->expectAt(0, 'acceptStartToken', array('<a', '*'));
+        $parser->expectAt(1, 'acceptStartToken', array('href', '*'));
+        $parser->expectAt(2, 'acceptStartToken', array('>', '*'));
+        $parser->expectCallCount('acceptStartToken', 3);
+        $parser->expectAt(0, 'acceptAttributeToken', array('= "', '*'));
+        $parser->expectAt(1, 'acceptAttributeToken', array('here.html', '*'));
+        $parser->expectAt(2, 'acceptAttributeToken', array('"', '*'));
+        $parser->expectCallCount('acceptAttributeToken', 3);
+        $parser->expectOnce('acceptEndToken', array('</a>', '*'));
+        $lexer = new SimpleHtmlLexer($parser);
+        $this->assertTrue($lexer->parse('<a href = "here.html">label</a>'));
+    }
+}
+
+class TestOfHtmlSaxParser extends UnitTestCase {
+
+    function createListener() {
+        $listener = new MockSimplePhpPageBuilder();
+        $listener->setReturnValue('startElement', true);
+        $listener->setReturnValue('addContent', true);
+        $listener->setReturnValue('endElement', true);
+        return $listener;
+    }
+
+    function testFramesetTag() {
+        $listener = $this->createListener();
+        $listener->expectOnce('startElement', array('frameset', array()));
+        $listener->expectOnce('addContent', array('Frames'));
+        $listener->expectOnce('endElement', array('frameset'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse('<frameset>Frames</frameset>'));
+    }
+
+    function testTagWithUnquotedAttributes() {
+        $listener = $this->createListener();
+        $listener->expectOnce(
+                'startElement',
+                array('input', array('name' => 'a.b.c', 'value' => 'd')));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse('<input name=a.b.c value = d>'));
+    }
+
+    function testTagInsideContent() {
+        $listener = $this->createListener();
+        $listener->expectOnce('startElement', array('a', array()));
+        $listener->expectAt(0, 'addContent', array('<html>'));
+        $listener->expectAt(1, 'addContent', array('</html>'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse('<html><a></a></html>'));
+    }
+
+    function testTagWithInternalContent() {
+        $listener = $this->createListener();
+        $listener->expectOnce('startElement', array('a', array()));
+        $listener->expectOnce('addContent', array('label'));
+        $listener->expectOnce('endElement', array('a'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse('<a>label</a>'));
+    }
+
+    function testLinkAddress() {
+        $listener = $this->createListener();
+        $listener->expectOnce('startElement', array('a', array('href' => 'here.html')));
+        $listener->expectOnce('addContent', array('label'));
+        $listener->expectOnce('endElement', array('a'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse("<a href = 'here.html'>label</a>"));
+    }
+
+    function testEncodedAttribute() {
+        $listener = $this->createListener();
+        $listener->expectOnce('startElement', array('a', array('href' => 'here&there.html')));
+        $listener->expectOnce('addContent', array('label'));
+        $listener->expectOnce('endElement', array('a'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse("<a href = 'here&amp;there.html'>label</a>"));
+    }
+
+    function testTagWithId() {
+        $listener = $this->createListener();
+        $listener->expectOnce('startElement', array('a', array('id' => '0')));
+        $listener->expectOnce('addContent', array('label'));
+        $listener->expectOnce('endElement', array('a'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse('<a id="0">label</a>'));
+    }
+
+    function testTagWithEmptyAttributes() {
+        $listener = $this->createListener();
+        $listener->expectOnce(
+                'startElement',
+                array('option', array('value' => '', 'selected' => '')));
+        $listener->expectOnce('addContent', array('label'));
+        $listener->expectOnce('endElement', array('option'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse('<option value="" selected>label</option>'));
+    }
+
+    function testComplexTagWithLotsOfCaseVariations() {
+        $listener = $this->createListener();
+        $listener->expectOnce(
+                'startElement',
+                array('a', array('href' => 'here.html', 'style' => "'cool'")));
+        $listener->expectOnce('addContent', array('label'));
+        $listener->expectOnce('endElement', array('a'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse('<A HREF = \'here.html\' Style="\'cool\'">label</A>'));
+    }
+
+    function testXhtmlSelfClosingTag() {
+        $listener = $this->createListener();
+        $listener->expectOnce(
+                'startElement',
+                array('input', array('type' => 'submit', 'name' => 'N', 'value' => 'V')));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse('<input type="submit" name="N" value="V" />'));
+    }
+
+    function testNestedFrameInFrameset() {
+        $listener = $this->createListener();
+        $listener->expectAt(0, 'startElement', array('frameset', array()));
+        $listener->expectAt(1, 'startElement', array('frame', array('src' => 'frame.html')));
+        $listener->expectCallCount('startElement', 2);
+        $listener->expectOnce('addContent', array('<noframes>Hello</noframes>'));
+        $listener->expectOnce('endElement', array('frameset'));
+        $parser = new SimpleHtmlSaxParser($listener);
+        $this->assertTrue($parser->parse(
+                '<frameset><frame src="frame.html"><noframes>Hello</noframes></frameset>'));
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/recorder_test.php b/3rdparty/simpletest/test/recorder_test.php
new file mode 100755
index 00000000000..fdae4c1cccc
--- /dev/null
+++ b/3rdparty/simpletest/test/recorder_test.php
@@ -0,0 +1,23 @@
+<?php
+// $Id: test.php 1500 2007-04-29 14:33:31Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../recorder.php');
+
+class TestOfRecorder extends UnitTestCase {
+    
+    function testContentOfRecorderWithOnePassAndOneFailure() {
+        $test = new TestSuite();
+        $test->addFile(dirname(__FILE__) . '/support/recorder_sample.php');
+        $recorder = new Recorder(new SimpleReporter());
+        $test->run($recorder);
+        $this->assertEqual(count($recorder->results), 2);
+        $this->assertIsA($recorder->results[0], 'SimpleResultOfPass');
+        $this->assertEqual('testTrueIsTrue', array_pop($recorder->results[0]->breadcrumb));
+        $this->assertPattern('/ at \[.*\Wrecorder_sample\.php line 7\]/', $recorder->results[0]->message);
+        $this->assertIsA($recorder->results[1], 'SimpleResultOfFail');
+        $this->assertEqual('testFalseIsTrue', array_pop($recorder->results[1]->breadcrumb));
+        $this->assertPattern("/Expected false, got \[Boolean: true\] at \[.*\Wrecorder_sample\.php line 11\]/",
+                             $recorder->results[1]->message);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/reflection_php5_test.php b/3rdparty/simpletest/test/reflection_php5_test.php
new file mode 100755
index 00000000000..d9f46e6db78
--- /dev/null
+++ b/3rdparty/simpletest/test/reflection_php5_test.php
@@ -0,0 +1,263 @@
+<?php
+// $Id: reflection_php5_test.php 1778 2008-04-21 16:13:08Z edwardzyang $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../reflection_php5.php');
+
+class AnyOldLeafClass {
+	function aMethod() { }
+}
+
+abstract class AnyOldClass {
+	function aMethod() { }
+}
+
+class AnyOldLeafClassWithAFinal {
+	final function aMethod() { }
+}
+
+interface AnyOldInterface {
+	function aMethod();
+}
+
+interface AnyOldArgumentInterface {
+	function aMethod(AnyOldInterface $argument);
+}
+
+interface AnyDescendentInterface extends AnyOldInterface {
+}
+
+class AnyOldImplementation implements AnyOldInterface {
+	function aMethod() { }
+	function extraMethod() { }
+}
+
+abstract class AnyAbstractImplementation implements AnyOldInterface {
+}
+
+abstract class AnotherOldAbstractClass {
+    protected abstract function aMethod(AnyOldInterface $argument);
+}
+
+class AnyOldSubclass extends AnyOldImplementation { }
+
+class AnyOldArgumentClass {
+	function aMethod($argument) { }
+}
+
+class AnyOldArgumentImplementation implements AnyOldArgumentInterface {
+	function aMethod(AnyOldInterface $argument) { }
+}
+
+class AnyOldTypeHintedClass implements AnyOldArgumentInterface {
+	function aMethod(AnyOldInterface $argument) { }
+}
+
+class AnyDescendentImplementation implements AnyDescendentInterface {
+	function aMethod() { }
+}
+
+class AnyOldOverloadedClass {
+	function __isset($key) { }
+	function __unset($key) { }
+}
+
+class AnyOldClassWithStaticMethods {
+	static function aStatic() { }
+	static function aStaticWithParameters($arg1, $arg2) { }
+}
+
+abstract class AnyOldAbstractClassWithAbstractMethods {
+    abstract function anAbstract();
+    abstract function anAbstractWithParameter($foo);
+    abstract function anAbstractWithMultipleParameters($foo, $bar);
+}
+
+class TestOfReflection extends UnitTestCase {
+
+	function testClassExistence() {
+		$reflection = new SimpleReflection('AnyOldLeafClass');
+		$this->assertTrue($reflection->classOrInterfaceExists());
+		$this->assertTrue($reflection->classOrInterfaceExistsSansAutoload());
+		$this->assertFalse($reflection->isAbstract());
+		$this->assertFalse($reflection->isInterface());
+	}
+
+	function testClassNonExistence() {
+		$reflection = new SimpleReflection('UnknownThing');
+		$this->assertFalse($reflection->classOrInterfaceExists());
+		$this->assertFalse($reflection->classOrInterfaceExistsSansAutoload());
+	}
+
+	function testDetectionOfAbstractClass() {
+		$reflection = new SimpleReflection('AnyOldClass');
+		$this->assertTrue($reflection->isAbstract());
+	}
+
+	function testDetectionOfFinalMethods() {
+		$reflection = new SimpleReflection('AnyOldClass');
+		$this->assertFalse($reflection->hasFinal());
+		$reflection = new SimpleReflection('AnyOldLeafClassWithAFinal');
+		$this->assertTrue($reflection->hasFinal());
+	}
+
+	function testFindingParentClass() {
+		$reflection = new SimpleReflection('AnyOldSubclass');
+		$this->assertEqual($reflection->getParent(), 'AnyOldImplementation');
+	}
+
+	function testInterfaceExistence() {
+		$reflection = new SimpleReflection('AnyOldInterface');
+		$this->assertTrue($reflection->classOrInterfaceExists());
+		$this->assertTrue($reflection->classOrInterfaceExistsSansAutoload());
+		$this->assertTrue($reflection->isInterface());
+	}
+
+	function testMethodsListFromClass() {
+		$reflection = new SimpleReflection('AnyOldClass');
+		$this->assertIdentical($reflection->getMethods(), array('aMethod'));
+	}
+
+	function testMethodsListFromInterface() {
+		$reflection = new SimpleReflection('AnyOldInterface');
+		$this->assertIdentical($reflection->getMethods(), array('aMethod'));
+		$this->assertIdentical($reflection->getInterfaceMethods(), array('aMethod'));
+	}
+
+	function testMethodsComeFromDescendentInterfacesASWell() {
+		$reflection = new SimpleReflection('AnyDescendentInterface');
+		$this->assertIdentical($reflection->getMethods(), array('aMethod'));
+	}
+	
+	function testCanSeparateInterfaceMethodsFromOthers() {
+		$reflection = new SimpleReflection('AnyOldImplementation');
+		$this->assertIdentical($reflection->getMethods(), array('aMethod', 'extraMethod'));
+		$this->assertIdentical($reflection->getInterfaceMethods(), array('aMethod'));
+	}
+
+	function testMethodsComeFromDescendentInterfacesInAbstractClass() {
+		$reflection = new SimpleReflection('AnyAbstractImplementation');
+		$this->assertIdentical($reflection->getMethods(), array('aMethod'));
+	}
+
+	function testInterfaceHasOnlyItselfToImplement() {
+		$reflection = new SimpleReflection('AnyOldInterface');
+		$this->assertEqual(
+				$reflection->getInterfaces(),
+				array('AnyOldInterface'));
+	}
+
+	function testInterfacesListedForClass() {
+		$reflection = new SimpleReflection('AnyOldImplementation');
+		$this->assertEqual(
+				$reflection->getInterfaces(),
+				array('AnyOldInterface'));
+	}
+
+	function testInterfacesListedForSubclass() {
+		$reflection = new SimpleReflection('AnyOldSubclass');
+		$this->assertEqual(
+				$reflection->getInterfaces(),
+				array('AnyOldInterface'));
+	}
+
+	function testNoParameterCreationWhenNoInterface() {
+		$reflection = new SimpleReflection('AnyOldArgumentClass');
+		$function = $reflection->getSignature('aMethod');
+		if (version_compare(phpversion(), '5.0.2', '<=')) {
+			$this->assertEqual('function amethod($argument)', strtolower($function));
+		} else {
+			$this->assertEqual('function aMethod($argument)', $function);
+		}
+	}
+
+	function testParameterCreationWithoutTypeHinting() {
+		$reflection = new SimpleReflection('AnyOldArgumentImplementation');
+		$function = $reflection->getSignature('aMethod');
+		if (version_compare(phpversion(), '5.0.2', '<=')) {
+			$this->assertEqual('function amethod(AnyOldInterface $argument)', $function);
+		} else {
+			$this->assertEqual('function aMethod(AnyOldInterface $argument)', $function);
+		}
+	}
+
+	function testParameterCreationForTypeHinting() {
+		$reflection = new SimpleReflection('AnyOldTypeHintedClass');
+		$function = $reflection->getSignature('aMethod');
+		if (version_compare(phpversion(), '5.0.2', '<=')) {
+			$this->assertEqual('function amethod(AnyOldInterface $argument)', $function);
+		} else {
+			$this->assertEqual('function aMethod(AnyOldInterface $argument)', $function);
+		}
+	}
+
+	function testIssetFunctionSignature() {
+		$reflection = new SimpleReflection('AnyOldOverloadedClass');
+		$function = $reflection->getSignature('__isset');
+		$this->assertEqual('function __isset($key)', $function);
+	}
+	
+	function testUnsetFunctionSignature() {
+		$reflection = new SimpleReflection('AnyOldOverloadedClass');
+		$function = $reflection->getSignature('__unset');
+		$this->assertEqual('function __unset($key)', $function);
+	}
+
+	function testProperlyReflectsTheFinalInterfaceWhenObjectImplementsAnExtendedInterface() {
+		$reflection = new SimpleReflection('AnyDescendentImplementation');
+		$interfaces = $reflection->getInterfaces();
+		$this->assertEqual(1, count($interfaces));
+		$this->assertEqual('AnyDescendentInterface', array_shift($interfaces));
+	}
+	
+	function testCreatingSignatureForAbstractMethod() {
+	    $reflection = new SimpleReflection('AnotherOldAbstractClass');
+	    $this->assertEqual($reflection->getSignature('aMethod'), 'function aMethod(AnyOldInterface $argument)');
+	}
+	
+	function testCanProperlyGenerateStaticMethodSignatures() {
+		$reflection = new SimpleReflection('AnyOldClassWithStaticMethods');
+		$this->assertEqual('static function aStatic()', $reflection->getSignature('aStatic'));
+		$this->assertEqual(
+			'static function aStaticWithParameters($arg1, $arg2)',
+			$reflection->getSignature('aStaticWithParameters')
+		);
+	}
+}
+
+class TestOfReflectionWithTypeHints extends UnitTestCase {
+	function skip() {
+		$this->skipIf(version_compare(phpversion(), '5.1.0', '<'), 'Reflection with type hints only tested for PHP 5.1.0 and above');
+	}
+
+	function testParameterCreationForTypeHintingWithArray() {
+		eval('interface AnyOldArrayTypeHintedInterface {
+				  function amethod(array $argument);
+			  } 
+			  class AnyOldArrayTypeHintedClass implements AnyOldArrayTypeHintedInterface {
+				  function amethod(array $argument) {}
+			  }');
+		$reflection = new SimpleReflection('AnyOldArrayTypeHintedClass');
+		$function = $reflection->getSignature('amethod');
+		$this->assertEqual('function amethod(array $argument)', $function);
+	}
+}
+
+class TestOfAbstractsWithAbstractMethods extends UnitTestCase {
+    function testCanProperlyGenerateAbstractMethods() {
+        $reflection = new SimpleReflection('AnyOldAbstractClassWithAbstractMethods');
+        $this->assertEqual(
+            'function anAbstract()',
+            $reflection->getSignature('anAbstract')
+        );
+        $this->assertEqual(
+            'function anAbstractWithParameter($foo)',
+            $reflection->getSignature('anAbstractWithParameter')
+        );
+        $this->assertEqual(
+            'function anAbstractWithMultipleParameters($foo, $bar)',
+            $reflection->getSignature('anAbstractWithMultipleParameters')
+        );
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/remote_test.php b/3rdparty/simpletest/test/remote_test.php
new file mode 100755
index 00000000000..5f3f96a4de9
--- /dev/null
+++ b/3rdparty/simpletest/test/remote_test.php
@@ -0,0 +1,19 @@
+<?php
+// $Id: remote_test.php 1759 2008-04-15 02:37:07Z edwardzyang $
+require_once('../remote.php');
+require_once('../reporter.php');
+
+// The following URL will depend on your own installation.
+if (isset($_SERVER['SCRIPT_URI'])) {
+    $base_uri = $_SERVER['SCRIPT_URI'];
+} elseif (isset($_SERVER['HTTP_HOST']) && isset($_SERVER['PHP_SELF'])) {
+    $base_uri = 'http://'. $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
+};
+$test_url = str_replace('remote_test.php', 'visual_test.php', $base_uri);
+
+$test = new TestSuite('Remote tests');
+$test->add(new RemoteTestCase($test_url . '?xml=yes', $test_url . '?xml=yes&dry=yes'));
+if (SimpleReporter::inCli()) {
+    exit ($test->run(new TextReporter()) ? 0 : 1);
+}
+$test->run(new HtmlReporter());
diff --git a/3rdparty/simpletest/test/shell_test.php b/3rdparty/simpletest/test/shell_test.php
new file mode 100755
index 00000000000..d1d769a6795
--- /dev/null
+++ b/3rdparty/simpletest/test/shell_test.php
@@ -0,0 +1,38 @@
+<?php
+// $Id: shell_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../shell_tester.php');
+
+class TestOfShell extends UnitTestCase {
+    
+    function testEcho() {
+        $shell = new SimpleShell();
+        $this->assertIdentical($shell->execute('echo Hello'), 0);
+        $this->assertPattern('/Hello/', $shell->getOutput());
+    }
+    
+    function testBadCommand() {
+        $shell = new SimpleShell();
+        $this->assertNotEqual($ret = $shell->execute('blurgh! 2>&1'), 0);
+    }
+}
+
+class TestOfShellTesterAndShell extends ShellTestCase {
+    
+    function testEcho() {
+        $this->assertTrue($this->execute('echo Hello'));
+        $this->assertExitCode(0);
+        $this->assertoutput('Hello');
+    }
+    
+    function testFileExistence() {
+        $this->assertFileExists(dirname(__FILE__) . '/all_tests.php');
+        $this->assertFileNotExists('wibble');
+    }
+    
+    function testFilePatterns() {
+        $this->assertFilePattern('/all[_ ]tests/i', dirname(__FILE__) . '/all_tests.php');
+        $this->assertNoFilePattern('/sputnik/i', dirname(__FILE__) . '/all_tests.php');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/shell_tester_test.php b/3rdparty/simpletest/test/shell_tester_test.php
new file mode 100755
index 00000000000..b12c602a39f
--- /dev/null
+++ b/3rdparty/simpletest/test/shell_tester_test.php
@@ -0,0 +1,42 @@
+<?php
+// $Id: shell_tester_test.php 1787 2008-04-26 20:35:39Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../shell_tester.php');
+Mock::generate('SimpleShell');
+
+class TestOfShellTestCase extends ShellTestCase {
+    private $mock_shell = false;
+    
+    function getShell() {
+        return $this->mock_shell;
+    }
+    
+    function testGenericEquality() {
+        $this->assertEqual('a', 'a');
+        $this->assertNotEqual('a', 'A');
+    }
+    
+    function testExitCode() {
+        $this->mock_shell = new MockSimpleShell();
+        $this->mock_shell->setReturnValue('execute', 0);
+        $this->mock_shell->expectOnce('execute', array('ls'));
+        $this->assertTrue($this->execute('ls'));
+        $this->assertExitCode(0);
+    }
+    
+    function testOutput() {
+        $this->mock_shell = new MockSimpleShell();
+        $this->mock_shell->setReturnValue('execute', 0);
+        $this->mock_shell->setReturnValue('getOutput', "Line 1\nLine 2\n");
+        $this->assertOutput("Line 1\nLine 2\n");
+    }
+    
+    function testOutputPatterns() {
+        $this->mock_shell = new MockSimpleShell();
+        $this->mock_shell->setReturnValue('execute', 0);
+        $this->mock_shell->setReturnValue('getOutput', "Line 1\nLine 2\n");
+        $this->assertOutputPattern('/line/i');
+        $this->assertNoOutputPattern('/line 2/');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/simpletest_test.php b/3rdparty/simpletest/test/simpletest_test.php
new file mode 100755
index 00000000000..daa65c6f472
--- /dev/null
+++ b/3rdparty/simpletest/test/simpletest_test.php
@@ -0,0 +1,58 @@
+<?php
+// $Id: simpletest_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../simpletest.php');
+
+SimpleTest::ignore('ShouldNeverBeRunEither');
+
+class ShouldNeverBeRun extends UnitTestCase {
+    function testWithNoChanceOfSuccess() {
+        $this->fail('Should be ignored');
+    }
+}
+
+class ShouldNeverBeRunEither extends ShouldNeverBeRun { }
+
+class TestOfStackTrace extends UnitTestCase {
+
+    function testCanFindAssertInTrace() {
+        $trace = new SimpleStackTrace(array('assert'));
+        $this->assertEqual(
+                $trace->traceMethod(array(array(
+                        'file' => '/my_test.php',
+                        'line' => 24,
+                        'function' => 'assertSomething'))),
+                ' at [/my_test.php line 24]');
+    }
+}
+
+class DummyResource { }
+
+class TestOfContext extends UnitTestCase {
+
+    function testCurrentContextIsUnique() {
+        $this->assertSame(
+                SimpleTest::getContext(),
+                SimpleTest::getContext());
+    }
+
+    function testContextHoldsCurrentTestCase() {
+        $context = SimpleTest::getContext();
+        $this->assertSame($this, $context->getTest());
+    }
+
+    function testResourceIsSingleInstanceWithContext() {
+        $context = new SimpleTestContext();
+        $this->assertSame(
+                $context->get('DummyResource'),
+                $context->get('DummyResource'));
+    }
+
+    function testClearingContextResetsResources() {
+        $context = new SimpleTestContext();
+        $resource = $context->get('DummyResource');
+        $context->clear();
+        $this->assertClone($resource, $context->get('DummyResource'));
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/site/file.html b/3rdparty/simpletest/test/site/file.html
new file mode 100755
index 00000000000..cc41aee1b8b
--- /dev/null
+++ b/3rdparty/simpletest/test/site/file.html
@@ -0,0 +1,6 @@
+<html>
+    <head><title>Link to SimpleTest</title></head>
+    <body>
+        <a href="http://simpletest.org/">Link to SimpleTest</a>
+    </body>
+</html>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/socket_test.php b/3rdparty/simpletest/test/socket_test.php
new file mode 100755
index 00000000000..729adda4960
--- /dev/null
+++ b/3rdparty/simpletest/test/socket_test.php
@@ -0,0 +1,25 @@
+<?php
+// $Id: socket_test.php 1782 2008-04-25 17:09:06Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../socket.php');
+Mock::generate('SimpleSocket');
+
+class TestOfSimpleStickyError extends UnitTestCase {
+    
+    function testSettingError() {
+        $error = new SimpleStickyError();
+        $this->assertFalse($error->isError());
+        $error->setError('Ouch');
+        $this->assertTrue($error->isError());
+        $this->assertEqual($error->getError(), 'Ouch');
+    }
+    
+    function testClearingError() {
+        $error = new SimpleStickyError();
+        $error->setError('Ouch');
+        $this->assertTrue($error->isError());
+        $error->clearError();
+        $this->assertFalse($error->isError());
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/collector/collectable.1 b/3rdparty/simpletest/test/support/collector/collectable.1
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/3rdparty/simpletest/test/support/collector/collectable.2 b/3rdparty/simpletest/test/support/collector/collectable.2
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/3rdparty/simpletest/test/support/empty_test_file.php b/3rdparty/simpletest/test/support/empty_test_file.php
new file mode 100755
index 00000000000..31e3f7bed62
--- /dev/null
+++ b/3rdparty/simpletest/test/support/empty_test_file.php
@@ -0,0 +1,3 @@
+<?php
+require_once(dirname(__FILE__) . '/../../autorun.php');
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/failing_test.php b/3rdparty/simpletest/test/support/failing_test.php
new file mode 100755
index 00000000000..30f0d7507d9
--- /dev/null
+++ b/3rdparty/simpletest/test/support/failing_test.php
@@ -0,0 +1,9 @@
+<?php
+require_once(dirname(__FILE__) . '/../../autorun.php');
+
+class FailingTest extends UnitTestCase {
+    function test_fail() {
+        $this->assertEqual(1,2);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/latin1_sample b/3rdparty/simpletest/test/support/latin1_sample
new file mode 100755
index 00000000000..19035257766
--- /dev/null
+++ b/3rdparty/simpletest/test/support/latin1_sample
@@ -0,0 +1 @@
+£¹²³¼½¾@¶øþðßæ«»¢µ
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/passing_test.php b/3rdparty/simpletest/test/support/passing_test.php
new file mode 100755
index 00000000000..b7863216353
--- /dev/null
+++ b/3rdparty/simpletest/test/support/passing_test.php
@@ -0,0 +1,9 @@
+<?php
+require_once(dirname(__FILE__) . '/../../autorun.php');
+
+class PassingTest extends UnitTestCase {
+    function test_pass() {
+        $this->assertEqual(2,2);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/recorder_sample.php b/3rdparty/simpletest/test/support/recorder_sample.php
new file mode 100755
index 00000000000..4f157f6b601
--- /dev/null
+++ b/3rdparty/simpletest/test/support/recorder_sample.php
@@ -0,0 +1,14 @@
+<?php
+// $Id: sample_test.php 1500 2007-04-29 14:33:31Z pp11 $
+require_once dirname(__FILE__) . '/../../autorun.php';
+
+class SampleTestForRecorder extends UnitTestCase {
+    function testTrueIsTrue() {
+        $this->assertTrue(true);
+    }
+
+    function testFalseIsTrue() {
+        $this->assertFalse(true);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/spl_examples.php b/3rdparty/simpletest/test/support/spl_examples.php
new file mode 100755
index 00000000000..45add356c44
--- /dev/null
+++ b/3rdparty/simpletest/test/support/spl_examples.php
@@ -0,0 +1,15 @@
+<?php
+    // $Id: spl_examples.php 1262 2006-02-05 19:35:31Z lastcraft $
+
+    class IteratorImplementation implements Iterator {
+        function current() { }
+        function next() { }
+        function key() { }
+        function valid() { }
+        function rewind() { }
+    }
+
+    class IteratorAggregateImplementation implements IteratorAggregate {
+        function getIterator() { }
+    }
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/supplementary_upload_sample.txt b/3rdparty/simpletest/test/support/supplementary_upload_sample.txt
new file mode 100755
index 00000000000..d8aa9e81013
--- /dev/null
+++ b/3rdparty/simpletest/test/support/supplementary_upload_sample.txt
@@ -0,0 +1 @@
+Some more text content
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/support/test1.php b/3rdparty/simpletest/test/support/test1.php
new file mode 100755
index 00000000000..b414586d642
--- /dev/null
+++ b/3rdparty/simpletest/test/support/test1.php
@@ -0,0 +1,7 @@
+<?php
+class test1 extends UnitTestCase {
+	function test_pass(){
+		$this->assertEqual(3,1+2, "pass1");
+	}
+}
+?>
diff --git a/3rdparty/simpletest/test/support/upload_sample.txt b/3rdparty/simpletest/test/support/upload_sample.txt
new file mode 100755
index 00000000000..ec98d7c5e3f
--- /dev/null
+++ b/3rdparty/simpletest/test/support/upload_sample.txt
@@ -0,0 +1 @@
+Sample for testing file upload
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/tag_test.php b/3rdparty/simpletest/test/tag_test.php
new file mode 100755
index 00000000000..5e8a377f089
--- /dev/null
+++ b/3rdparty/simpletest/test/tag_test.php
@@ -0,0 +1,554 @@
+<?php
+// $Id: tag_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../tag.php');
+require_once(dirname(__FILE__) . '/../encoding.php');
+Mock::generate('SimpleMultipartEncoding');
+
+class TestOfTag extends UnitTestCase {
+    
+    function testStartValuesWithoutAdditionalContent() {
+        $tag = new SimpleTitleTag(array('a' => '1', 'b' => ''));
+        $this->assertEqual($tag->getTagName(), 'title');
+        $this->assertIdentical($tag->getAttribute('a'), '1');
+        $this->assertIdentical($tag->getAttribute('b'), '');
+        $this->assertIdentical($tag->getAttribute('c'), false);
+        $this->assertIdentical($tag->getContent(), '');
+    }
+    
+    function testTitleContent() {
+        $tag = new SimpleTitleTag(array());
+        $this->assertTrue($tag->expectEndTag());
+        $tag->addContent('Hello');
+        $tag->addContent('World');
+        $this->assertEqual($tag->getText(), 'HelloWorld');
+    }
+    
+    function testMessyTitleContent() {
+        $tag = new SimpleTitleTag(array());
+        $this->assertTrue($tag->expectEndTag());
+        $tag->addContent('<b>Hello</b>');
+        $tag->addContent('<em>World</em>');
+        $this->assertEqual($tag->getText(), 'HelloWorld');
+    }
+    
+    function testTagWithNoEnd() {
+        $tag = new SimpleTextTag(array());
+        $this->assertFalse($tag->expectEndTag());
+    }
+    
+    function testAnchorHref() {
+        $tag = new SimpleAnchorTag(array('href' => 'http://here/'));
+        $this->assertEqual($tag->getHref(), 'http://here/');
+        
+        $tag = new SimpleAnchorTag(array('href' => ''));
+        $this->assertIdentical($tag->getAttribute('href'), '');
+        $this->assertIdentical($tag->getHref(), '');
+        
+        $tag = new SimpleAnchorTag(array());
+        $this->assertIdentical($tag->getAttribute('href'), false);
+        $this->assertIdentical($tag->getHref(), '');
+    }
+    
+    function testIsIdMatchesIdAttribute() {
+        $tag = new SimpleAnchorTag(array('href' => 'http://here/', 'id' => 7));
+        $this->assertIdentical($tag->getAttribute('id'), '7');
+        $this->assertTrue($tag->isId(7));
+    }
+}
+
+class TestOfWidget extends UnitTestCase {
+    
+    function testTextEmptyDefault() {
+        $tag = new SimpleTextTag(array('type' => 'text'));
+        $this->assertIdentical($tag->getDefault(), '');
+        $this->assertIdentical($tag->getValue(), '');
+    }
+    
+    function testSettingOfExternalLabel() {
+        $tag = new SimpleTextTag(array('type' => 'text'));
+        $tag->setLabel('it');
+        $this->assertTrue($tag->isLabel('it'));
+    }
+    
+    function testTextDefault() {
+        $tag = new SimpleTextTag(array('value' => 'aaa'));
+        $this->assertEqual($tag->getDefault(), 'aaa');
+        $this->assertEqual($tag->getValue(), 'aaa');
+    }
+    
+    function testSettingTextValue() {
+        $tag = new SimpleTextTag(array('value' => 'aaa'));
+        $tag->setValue('bbb');
+        $this->assertEqual($tag->getValue(), 'bbb');
+        $tag->resetValue();
+        $this->assertEqual($tag->getValue(), 'aaa');
+    }
+    
+    function testFailToSetHiddenValue() {
+        $tag = new SimpleTextTag(array('value' => 'aaa', 'type' => 'hidden'));
+        $this->assertFalse($tag->setValue('bbb'));
+        $this->assertEqual($tag->getValue(), 'aaa');
+    }
+    
+    function testSubmitDefaults() {
+        $tag = new SimpleSubmitTag(array('type' => 'submit'));
+        $this->assertIdentical($tag->getName(), false);
+        $this->assertEqual($tag->getValue(), 'Submit');
+        $this->assertFalse($tag->setValue('Cannot set this'));
+        $this->assertEqual($tag->getValue(), 'Submit');
+        $this->assertEqual($tag->getLabel(), 'Submit');
+        
+        $encoding = new MockSimpleMultipartEncoding();
+        $encoding->expectNever('add');
+        $tag->write($encoding);
+    }
+    
+    function testPopulatedSubmit() {
+        $tag = new SimpleSubmitTag(
+                array('type' => 'submit', 'name' => 's', 'value' => 'Ok!'));
+        $this->assertEqual($tag->getName(), 's');
+        $this->assertEqual($tag->getValue(), 'Ok!');
+        $this->assertEqual($tag->getLabel(), 'Ok!');
+        
+        $encoding = new MockSimpleMultipartEncoding();
+        $encoding->expectOnce('add', array('s', 'Ok!'));
+        $tag->write($encoding);
+    }
+    
+    function testImageSubmit() {
+        $tag = new SimpleImageSubmitTag(
+                array('type' => 'image', 'name' => 's', 'alt' => 'Label'));
+        $this->assertEqual($tag->getName(), 's');
+        $this->assertEqual($tag->getLabel(), 'Label');
+        
+        $encoding = new MockSimpleMultipartEncoding();
+        $encoding->expectAt(0, 'add', array('s.x', 20));
+        $encoding->expectAt(1, 'add', array('s.y', 30));
+        $tag->write($encoding, 20, 30);
+    }
+    
+    function testImageSubmitTitlePreferredOverAltForLabel() {
+        $tag = new SimpleImageSubmitTag(
+                array('type' => 'image', 'name' => 's', 'alt' => 'Label', 'title' => 'Title'));
+        $this->assertEqual($tag->getLabel(), 'Title');
+    }
+    
+    function testButton() {
+        $tag = new SimpleButtonTag(
+                array('type' => 'submit', 'name' => 's', 'value' => 'do'));
+        $tag->addContent('I am a button');
+        $this->assertEqual($tag->getName(), 's');
+        $this->assertEqual($tag->getValue(), 'do');
+        $this->assertEqual($tag->getLabel(), 'I am a button');
+
+        $encoding = new MockSimpleMultipartEncoding();
+        $encoding->expectOnce('add', array('s', 'do'));
+        $tag->write($encoding);
+    }
+}
+
+class TestOfTextArea extends UnitTestCase {
+    
+    function testDefault() {
+        $tag = new SimpleTextAreaTag(array('name' => 'a'));
+        $tag->addContent('Some text');
+        $this->assertEqual($tag->getName(), 'a');
+        $this->assertEqual($tag->getDefault(), 'Some text');
+    }
+    
+    function testWrapping() {
+        $tag = new SimpleTextAreaTag(array('cols' => '10', 'wrap' => 'physical'));
+        $tag->addContent("Lot's of text that should be wrapped");
+        $this->assertEqual(
+                $tag->getDefault(),
+                "Lot's of\r\ntext that\r\nshould be\r\nwrapped");
+        $tag->setValue("New long text\r\nwith two lines");
+        $this->assertEqual(
+                $tag->getValue(),
+                "New long\r\ntext\r\nwith two\r\nlines");
+    }
+    
+    function testWrappingRemovesLeadingcariageReturn() {
+        $tag = new SimpleTextAreaTag(array('cols' => '20', 'wrap' => 'physical'));
+        $tag->addContent("\rStuff");
+        $this->assertEqual($tag->getDefault(), 'Stuff');
+        $tag->setValue("\nNew stuff\n");
+        $this->assertEqual($tag->getValue(), "New stuff\r\n");
+    }
+    
+    function testBreaksAreNewlineAndCarriageReturn() {
+        $tag = new SimpleTextAreaTag(array('cols' => '10'));
+        $tag->addContent("Some\nText\rwith\r\nbreaks");
+        $this->assertEqual($tag->getValue(), "Some\r\nText\r\nwith\r\nbreaks");
+    }
+}
+
+class TestOfCheckbox extends UnitTestCase {
+    
+    function testCanSetCheckboxToNamedValueWithBooleanTrue() {
+        $tag = new SimpleCheckboxTag(array('name' => 'a', 'value' => 'A'));
+        $this->assertEqual($tag->getValue(), false);
+        $tag->setValue(true);
+        $this->assertIdentical($tag->getValue(), 'A');
+    }
+}
+
+class TestOfSelection extends UnitTestCase {
+    
+    function testEmpty() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $this->assertIdentical($tag->getValue(), '');
+    }
+    
+    function testSingle() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $option = new SimpleOptionTag(array());
+        $option->addContent('AAA');
+        $tag->addTag($option);
+        $this->assertEqual($tag->getValue(), 'AAA');
+    }
+    
+    function testSingleDefault() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $option = new SimpleOptionTag(array('selected' => ''));
+        $option->addContent('AAA');
+        $tag->addTag($option);
+        $this->assertEqual($tag->getValue(), 'AAA');
+    }
+    
+    function testSingleMappedDefault() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $option = new SimpleOptionTag(array('selected' => '', 'value' => 'aaa'));
+        $option->addContent('AAA');
+        $tag->addTag($option);
+        $this->assertEqual($tag->getValue(), 'aaa');
+    }
+    
+    function testStartsWithDefault() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $a = new SimpleOptionTag(array());
+        $a->addContent('AAA');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array('selected' => ''));
+        $b->addContent('BBB');
+        $tag->addTag($b);
+        $c = new SimpleOptionTag(array());
+        $c->addContent('CCC');
+        $tag->addTag($c);
+        $this->assertEqual($tag->getValue(), 'BBB');
+    }
+    
+    function testSettingOption() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $a = new SimpleOptionTag(array());
+        $a->addContent('AAA');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array('selected' => ''));
+        $b->addContent('BBB');
+        $tag->addTag($b);
+        $c = new SimpleOptionTag(array());
+        $c->addContent('CCC');
+        $tag->setValue('AAA');
+        $this->assertEqual($tag->getValue(), 'AAA');
+    }
+    
+    function testSettingMappedOption() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $a = new SimpleOptionTag(array('value' => 'aaa'));
+        $a->addContent('AAA');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array('value' => 'bbb', 'selected' => ''));
+        $b->addContent('BBB');
+        $tag->addTag($b);
+        $c = new SimpleOptionTag(array('value' => 'ccc'));
+        $c->addContent('CCC');
+        $tag->addTag($c);
+        $tag->setValue('AAA');
+        $this->assertEqual($tag->getValue(), 'aaa');
+        $tag->setValue('ccc');
+        $this->assertEqual($tag->getValue(), 'ccc');
+    }
+    
+    function testSelectionDespiteSpuriousWhitespace() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $a = new SimpleOptionTag(array());
+        $a->addContent(' AAA ');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array('selected' => ''));
+        $b->addContent(' BBB ');
+        $tag->addTag($b);
+        $c = new SimpleOptionTag(array());
+        $c->addContent(' CCC ');
+        $tag->addTag($c);
+        $this->assertEqual($tag->getValue(), ' BBB ');
+        $tag->setValue('AAA');
+        $this->assertEqual($tag->getValue(), ' AAA ');
+    }
+    
+    function testFailToSetIllegalOption() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $a = new SimpleOptionTag(array());
+        $a->addContent('AAA');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array('selected' => ''));
+        $b->addContent('BBB');
+        $tag->addTag($b);
+        $c = new SimpleOptionTag(array());
+        $c->addContent('CCC');
+        $tag->addTag($c);
+        $this->assertFalse($tag->setValue('Not present'));
+        $this->assertEqual($tag->getValue(), 'BBB');
+    }
+    
+    function testNastyOptionValuesThatLookLikeFalse() {
+        $tag = new SimpleSelectionTag(array('name' => 'a'));
+        $a = new SimpleOptionTag(array('value' => '1'));
+        $a->addContent('One');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array('value' => '0'));
+        $b->addContent('Zero');
+        $tag->addTag($b);
+        $this->assertIdentical($tag->getValue(), '1');
+        $tag->setValue('Zero');
+        $this->assertIdentical($tag->getValue(), '0');
+    }
+    
+    function testBlankOption() {
+        $tag = new SimpleSelectionTag(array('name' => 'A'));
+        $a = new SimpleOptionTag(array());
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array());
+        $b->addContent('b');
+        $tag->addTag($b);
+        $this->assertIdentical($tag->getValue(), '');
+        $tag->setValue('b');
+        $this->assertIdentical($tag->getValue(), 'b');
+        $tag->setValue('');
+        $this->assertIdentical($tag->getValue(), '');
+    }
+    
+    function testMultipleDefaultWithNoSelections() {
+        $tag = new MultipleSelectionTag(array('name' => 'a', 'multiple' => ''));
+        $a = new SimpleOptionTag(array());
+        $a->addContent('AAA');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array());
+        $b->addContent('BBB');
+        $tag->addTag($b);
+        $this->assertIdentical($tag->getDefault(), array());
+        $this->assertIdentical($tag->getValue(), array());
+    }
+    
+    function testMultipleDefaultWithSelections() {
+        $tag = new MultipleSelectionTag(array('name' => 'a', 'multiple' => ''));
+        $a = new SimpleOptionTag(array('selected' => ''));
+        $a->addContent('AAA');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array('selected' => ''));
+        $b->addContent('BBB');
+        $tag->addTag($b);
+        $this->assertIdentical($tag->getDefault(), array('AAA', 'BBB'));
+        $this->assertIdentical($tag->getValue(), array('AAA', 'BBB'));
+    }
+    
+    function testSettingMultiple() {
+        $tag = new MultipleSelectionTag(array('name' => 'a', 'multiple' => ''));
+        $a = new SimpleOptionTag(array('selected' => ''));
+        $a->addContent('AAA');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array());
+        $b->addContent('BBB');
+        $tag->addTag($b);
+        $c = new SimpleOptionTag(array('selected' => '', 'value' => 'ccc'));
+        $c->addContent('CCC');
+        $tag->addTag($c);
+        $this->assertIdentical($tag->getDefault(), array('AAA', 'ccc'));
+        $this->assertTrue($tag->setValue(array('BBB', 'ccc')));
+        $this->assertIdentical($tag->getValue(), array('BBB', 'ccc'));
+        $this->assertTrue($tag->setValue(array()));
+        $this->assertIdentical($tag->getValue(), array());
+    }
+    
+    function testFailToSetIllegalOptionsInMultiple() {
+        $tag = new MultipleSelectionTag(array('name' => 'a', 'multiple' => ''));
+        $a = new SimpleOptionTag(array('selected' => ''));
+        $a->addContent('AAA');
+        $tag->addTag($a);
+        $b = new SimpleOptionTag(array());
+        $b->addContent('BBB');
+        $tag->addTag($b);
+        $this->assertFalse($tag->setValue(array('CCC')));
+        $this->assertTrue($tag->setValue(array('AAA', 'BBB')));
+        $this->assertFalse($tag->setValue(array('AAA', 'CCC')));
+    }
+}
+
+class TestOfRadioGroup extends UnitTestCase {
+    
+    function testEmptyGroup() {
+        $group = new SimpleRadioGroup();
+        $this->assertIdentical($group->getDefault(), false);
+        $this->assertIdentical($group->getValue(), false);
+        $this->assertFalse($group->setValue('a'));
+    }
+    
+    function testReadingSingleButtonGroup() {
+        $group = new SimpleRadioGroup();
+        $group->addWidget(new SimpleRadioButtonTag(
+                array('value' => 'A', 'checked' => '')));
+        $this->assertIdentical($group->getDefault(), 'A');
+        $this->assertIdentical($group->getValue(), 'A');
+    }
+    
+    function testReadingMultipleButtonGroup() {
+        $group = new SimpleRadioGroup();
+        $group->addWidget(new SimpleRadioButtonTag(
+                array('value' => 'A')));
+        $group->addWidget(new SimpleRadioButtonTag(
+                array('value' => 'B', 'checked' => '')));
+        $this->assertIdentical($group->getDefault(), 'B');
+        $this->assertIdentical($group->getValue(), 'B');
+    }
+    
+    function testFailToSetUnlistedValue() {
+        $group = new SimpleRadioGroup();
+        $group->addWidget(new SimpleRadioButtonTag(array('value' => 'z')));
+        $this->assertFalse($group->setValue('a'));
+        $this->assertIdentical($group->getValue(), false);
+    }
+    
+    function testSettingNewValueClearsTheOldOne() {
+        $group = new SimpleRadioGroup();
+        $group->addWidget(new SimpleRadioButtonTag(
+                array('value' => 'A')));
+        $group->addWidget(new SimpleRadioButtonTag(
+                array('value' => 'B', 'checked' => '')));
+        $this->assertTrue($group->setValue('A'));
+        $this->assertIdentical($group->getValue(), 'A');
+    }
+    
+    function testIsIdMatchesAnyWidgetInSet() {
+        $group = new SimpleRadioGroup();
+        $group->addWidget(new SimpleRadioButtonTag(
+                array('value' => 'A', 'id' => 'i1')));
+        $group->addWidget(new SimpleRadioButtonTag(
+                array('value' => 'B', 'id' => 'i2')));
+        $this->assertFalse($group->isId('i0'));
+        $this->assertTrue($group->isId('i1'));
+        $this->assertTrue($group->isId('i2'));
+    }
+    
+    function testIsLabelMatchesAnyWidgetInSet() {
+        $group = new SimpleRadioGroup();
+        $button1 = new SimpleRadioButtonTag(array('value' => 'A'));
+        $button1->setLabel('one');
+        $group->addWidget($button1);
+        $button2 = new SimpleRadioButtonTag(array('value' => 'B'));
+        $button2->setLabel('two');
+        $group->addWidget($button2);
+        $this->assertFalse($group->isLabel('three'));
+        $this->assertTrue($group->isLabel('one'));
+        $this->assertTrue($group->isLabel('two'));
+    }
+}
+
+class TestOfTagGroup extends UnitTestCase {
+    
+    function testReadingMultipleCheckboxGroup() {
+        $group = new SimpleCheckboxGroup();
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
+        $group->addWidget(new SimpleCheckboxTag(
+                array('value' => 'B', 'checked' => '')));
+        $this->assertIdentical($group->getDefault(), 'B');
+        $this->assertIdentical($group->getValue(), 'B');
+    }
+    
+    function testReadingMultipleUncheckedItems() {
+        $group = new SimpleCheckboxGroup();
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'B')));            
+        $this->assertIdentical($group->getDefault(), false);
+        $this->assertIdentical($group->getValue(), false);
+    }
+    
+    function testReadingMultipleCheckedItems() {
+        $group = new SimpleCheckboxGroup();
+        $group->addWidget(new SimpleCheckboxTag(
+                array('value' => 'A', 'checked' => '')));
+        $group->addWidget(new SimpleCheckboxTag(
+                array('value' => 'B', 'checked' => '')));
+        $this->assertIdentical($group->getDefault(), array('A', 'B'));
+        $this->assertIdentical($group->getValue(), array('A', 'B'));
+    }
+    
+    function testSettingSingleValue() {
+        $group = new SimpleCheckboxGroup();
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'B')));
+        $this->assertTrue($group->setValue('A'));
+        $this->assertIdentical($group->getValue(), 'A');
+        $this->assertTrue($group->setValue('B'));
+        $this->assertIdentical($group->getValue(), 'B');
+    }
+    
+    function testSettingMultipleValues() {
+        $group = new SimpleCheckboxGroup();
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'B')));
+        $this->assertTrue($group->setValue(array('A', 'B')));
+        $this->assertIdentical($group->getValue(), array('A', 'B'));
+    }
+    
+    function testSettingNoValue() {
+        $group = new SimpleCheckboxGroup();
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
+        $group->addWidget(new SimpleCheckboxTag(array('value' => 'B')));
+        $this->assertTrue($group->setValue(false));
+        $this->assertIdentical($group->getValue(), false);
+    }
+    
+    function testIsIdMatchesAnyIdInSet() {
+        $group = new SimpleCheckboxGroup();
+        $group->addWidget(new SimpleCheckboxTag(array('id' => 1, 'value' => 'A')));
+        $group->addWidget(new SimpleCheckboxTag(array('id' => 2, 'value' => 'B')));
+        $this->assertFalse($group->isId(0));
+        $this->assertTrue($group->isId(1));
+        $this->assertTrue($group->isId(2));
+    }
+}
+
+class TestOfUploadWidget extends UnitTestCase {
+    
+    function testValueIsFilePath() {
+        $upload = new SimpleUploadTag(array('name' => 'a'));
+        $upload->setValue(dirname(__FILE__) . '/support/upload_sample.txt');
+        $this->assertEqual($upload->getValue(), dirname(__FILE__) . '/support/upload_sample.txt');
+    }
+    
+    function testSubmitsFileContents() {
+        $encoding = new MockSimpleMultipartEncoding();
+        $encoding->expectOnce('attach', array(
+                'a',
+                'Sample for testing file upload',
+                'upload_sample.txt'));
+        $upload = new SimpleUploadTag(array('name' => 'a'));
+        $upload->setValue(dirname(__FILE__) . '/support/upload_sample.txt');
+        $upload->write($encoding);
+    }
+}
+
+class TestOfLabelTag extends UnitTestCase {
+    
+    function testLabelShouldHaveAnEndTag() {
+        $label = new SimpleLabelTag(array());
+        $this->assertTrue($label->expectEndTag());
+    }
+    
+    function testContentIsTextOnly() {
+        $label = new SimpleLabelTag(array());
+        $label->addContent('Here <tag>are</tag> words');
+        $this->assertEqual($label->getText(), 'Here are words');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/test_with_parse_error.php b/3rdparty/simpletest/test/test_with_parse_error.php
new file mode 100755
index 00000000000..41a5832a5cb
--- /dev/null
+++ b/3rdparty/simpletest/test/test_with_parse_error.php
@@ -0,0 +1,8 @@
+<?php
+    // $Id: test_with_parse_error.php 901 2005-01-24 00:32:14Z lastcraft $
+    
+    class TestCaseWithParseError extends UnitTestCase {
+        wibble
+    }
+    
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/unit_tester_test.php b/3rdparty/simpletest/test/unit_tester_test.php
new file mode 100755
index 00000000000..ce9850f09ab
--- /dev/null
+++ b/3rdparty/simpletest/test/unit_tester_test.php
@@ -0,0 +1,61 @@
+<?php
+// $Id: unit_tester_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+
+class ReferenceForTesting {
+}
+
+class TestOfUnitTester extends UnitTestCase {
+    
+    function testAssertTrueReturnsAssertionAsBoolean() {
+        $this->assertTrue($this->assertTrue(true));
+    }
+    
+    function testAssertFalseReturnsAssertionAsBoolean() {
+        $this->assertTrue($this->assertFalse(false));
+    }
+    
+    function testAssertEqualReturnsAssertionAsBoolean() {
+        $this->assertTrue($this->assertEqual(5, 5));
+    }
+    
+    function testAssertIdenticalReturnsAssertionAsBoolean() {
+        $this->assertTrue($this->assertIdentical(5, 5));
+    }
+    
+    function testCoreAssertionsDoNotThrowErrors() {
+        $this->assertIsA($this, 'UnitTestCase');
+        $this->assertNotA($this, 'WebTestCase');
+    }
+    
+    function testReferenceAssertionOnObjects() {
+        $a = new ReferenceForTesting();
+        $b = $a;
+        $this->assertSame($a, $b);
+    }
+    
+    function testReferenceAssertionOnScalars() {
+        $a = 25;
+        $b = &$a;
+        $this->assertReference($a, $b);
+    }
+    
+    function testCloneOnObjects() {
+        $a = new ReferenceForTesting();
+        $b = new ReferenceForTesting();
+        $this->assertClone($a, $b);
+    }
+
+    function TODO_testCloneOnScalars() {
+        $a = 25;
+        $b = 25;
+        $this->assertClone($a, $b);
+    }
+
+    function testCopyOnScalars() {
+        $a = 25;
+        $b = 25;
+        $this->assertCopy($a, $b);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/unit_tests.php b/3rdparty/simpletest/test/unit_tests.php
new file mode 100755
index 00000000000..9e621293f9e
--- /dev/null
+++ b/3rdparty/simpletest/test/unit_tests.php
@@ -0,0 +1,49 @@
+<?php
+// $Id: unit_tests.php 1986 2010-04-02 10:02:42Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../unit_tester.php');
+require_once(dirname(__FILE__) . '/../shell_tester.php');
+require_once(dirname(__FILE__) . '/../mock_objects.php');
+require_once(dirname(__FILE__) . '/../web_tester.php');
+require_once(dirname(__FILE__) . '/../extensions/pear_test_case.php');
+
+class UnitTests extends TestSuite {
+    function UnitTests() {
+        $this->TestSuite('Unit tests');
+        $path = dirname(__FILE__);
+        $this->addFile($path . '/errors_test.php');
+        $this->addFile($path . '/exceptions_test.php');
+        $this->addFile($path . '/arguments_test.php');
+        $this->addFile($path . '/autorun_test.php');
+        $this->addFile($path . '/compatibility_test.php');
+        $this->addFile($path . '/simpletest_test.php');
+        $this->addFile($path . '/dumper_test.php');
+        $this->addFile($path . '/expectation_test.php');
+        $this->addFile($path . '/unit_tester_test.php');
+        $this->addFile($path . '/reflection_php5_test.php');
+        $this->addFile($path . '/mock_objects_test.php');
+        $this->addFile($path . '/interfaces_test.php');
+        $this->addFile($path . '/collector_test.php');
+        $this->addFile($path . '/recorder_test.php');
+        $this->addFile($path . '/adapter_test.php');
+        $this->addFile($path . '/socket_test.php');
+        $this->addFile($path . '/encoding_test.php');
+        $this->addFile($path . '/url_test.php');
+        $this->addFile($path . '/cookies_test.php');
+        $this->addFile($path . '/http_test.php');
+        $this->addFile($path . '/authentication_test.php');
+        $this->addFile($path . '/user_agent_test.php');
+        $this->addFile($path . '/php_parser_test.php');
+        $this->addFile($path . '/parsing_test.php');
+        $this->addFile($path . '/tag_test.php');
+        $this->addFile($path . '/form_test.php');
+        $this->addFile($path . '/page_test.php');
+        $this->addFile($path . '/frames_test.php');
+        $this->addFile($path . '/browser_test.php');
+        $this->addFile($path . '/web_tester_test.php');
+        $this->addFile($path . '/shell_tester_test.php');
+        $this->addFile($path . '/xml_test.php');
+        $this->addFile($path . '/../extensions/testdox/test.php');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/url_test.php b/3rdparty/simpletest/test/url_test.php
new file mode 100755
index 00000000000..80119afbdde
--- /dev/null
+++ b/3rdparty/simpletest/test/url_test.php
@@ -0,0 +1,515 @@
+<?php
+// $Id: url_test.php 1998 2010-07-27 09:55:55Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../url.php');
+
+class TestOfUrl extends UnitTestCase {
+    
+    function testDefaultUrl() {
+        $url = new SimpleUrl('');
+        $this->assertEqual($url->getScheme(), '');
+        $this->assertEqual($url->getHost(), '');
+        $this->assertEqual($url->getScheme('http'), 'http');
+        $this->assertEqual($url->getHost('localhost'), 'localhost');
+        $this->assertEqual($url->getPath(), '');
+    }
+    
+    function testBasicParsing() {
+        $url = new SimpleUrl('https://www.lastcraft.com/test/');
+        $this->assertEqual($url->getScheme(), 'https');
+        $this->assertEqual($url->getHost(), 'www.lastcraft.com');
+        $this->assertEqual($url->getPath(), '/test/');
+    }
+    
+    function testRelativeUrls() {
+        $url = new SimpleUrl('../somewhere.php');
+        $this->assertEqual($url->getScheme(), false);
+        $this->assertEqual($url->getHost(), false);
+        $this->assertEqual($url->getPath(), '../somewhere.php');
+    }
+    
+    function testParseBareParameter() {
+        $url = new SimpleUrl('?a');
+        $this->assertEqual($url->getPath(), '');
+        $this->assertEqual($url->getEncodedRequest(), '?a');
+        $url->addRequestParameter('x', 'X');
+        $this->assertEqual($url->getEncodedRequest(), '?a=&x=X');
+    }
+    
+    function testParseEmptyParameter() {
+        $url = new SimpleUrl('?a=');
+        $this->assertEqual($url->getPath(), '');
+        $this->assertEqual($url->getEncodedRequest(), '?a=');
+        $url->addRequestParameter('x', 'X');
+        $this->assertEqual($url->getEncodedRequest(), '?a=&x=X');
+    }
+    
+    function testParseParameterPair() {
+        $url = new SimpleUrl('?a=A');
+        $this->assertEqual($url->getPath(), '');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A');
+        $url->addRequestParameter('x', 'X');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&x=X');
+    }
+    
+    function testParseMultipleParameters() {
+        $url = new SimpleUrl('?a=A&b=B');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=B');
+        $url->addRequestParameter('x', 'X');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=B&x=X');
+    }
+    
+    function testParsingParameterMixture() {
+        $url = new SimpleUrl('?a=A&b=&c');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=&c');
+        $url->addRequestParameter('x', 'X');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=&c=&x=X');
+    }
+    
+    function testAddParametersFromScratch() {
+        $url = new SimpleUrl('');
+        $url->addRequestParameter('a', 'A');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A');
+        $url->addRequestParameter('b', 'B');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=B');
+        $url->addRequestParameter('a', 'aaa');
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=B&a=aaa');
+    }
+    
+    function testClearingParameters() {
+        $url = new SimpleUrl('');
+        $url->addRequestParameter('a', 'A');
+        $url->clearRequest();
+        $this->assertIdentical($url->getEncodedRequest(), '');
+    }
+    
+    function testEncodingParameters() {
+        $url = new SimpleUrl('');
+        $url->addRequestParameter('a', '?!"\'#~@[]{}:;<>,./|$%^&*()_+-=');
+        $this->assertIdentical(
+                $request = $url->getEncodedRequest(),
+                '?a=%3F%21%22%27%23%7E%40%5B%5D%7B%7D%3A%3B%3C%3E%2C.%2F%7C%24%25%5E%26%2A%28%29_%2B-%3D');
+    }
+    
+    function testDecodingParameters() {            
+        $url = new SimpleUrl('?a=%3F%21%22%27%23%7E%40%5B%5D%7B%7D%3A%3B%3C%3E%2C.%2F%7C%24%25%5E%26%2A%28%29_%2B-%3D');
+        $this->assertEqual(
+                $url->getEncodedRequest(),
+                '?a=' . urlencode('?!"\'#~@[]{}:;<>,./|$%^&*()_+-='));
+    }
+    
+    function testUrlInQueryDoesNotConfuseParsing() {
+        $url = new SimpleUrl('wibble/login.php?url=http://www.google.com/moo/');
+        $this->assertFalse($url->getScheme());
+        $this->assertFalse($url->getHost());
+        $this->assertEqual($url->getPath(), 'wibble/login.php');
+        $this->assertEqual($url->getEncodedRequest(), '?url=http://www.google.com/moo/');
+    }
+    
+    function testSettingCordinates() {
+        $url = new SimpleUrl('');
+        $url->setCoordinates('32', '45');
+        $this->assertIdentical($url->getX(), 32);
+        $this->assertIdentical($url->getY(), 45);
+        $this->assertEqual($url->getEncodedRequest(), '');
+    }
+    
+    function testParseCordinates() {
+        $url = new SimpleUrl('?32,45');
+        $this->assertIdentical($url->getX(), 32);
+        $this->assertIdentical($url->getY(), 45);
+    }
+    
+    function testClearingCordinates() {
+        $url = new SimpleUrl('?32,45');
+        $url->setCoordinates();
+        $this->assertIdentical($url->getX(), false);
+        $this->assertIdentical($url->getY(), false);
+    }
+    
+    function testParsingParameterCordinateMixture() {
+        $url = new SimpleUrl('?a=A&b=&c?32,45');
+        $this->assertIdentical($url->getX(), 32);
+        $this->assertIdentical($url->getY(), 45);
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=&c');
+    }
+    
+    function testParsingParameterWithBadCordinates() {
+        $url = new SimpleUrl('?a=A&b=&c?32');
+        $this->assertIdentical($url->getX(), false);
+        $this->assertIdentical($url->getY(), false);
+        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=&c?32');
+    }
+    
+    function testPageSplitting() {
+        $url = new SimpleUrl('./here/../there/somewhere.php');
+        $this->assertEqual($url->getPath(), './here/../there/somewhere.php');
+        $this->assertEqual($url->getPage(), 'somewhere.php');
+        $this->assertEqual($url->getBasePath(), './here/../there/');
+    }
+    
+    function testAbsolutePathPageSplitting() {
+        $url = new SimpleUrl("http://host.com/here/there/somewhere.php");
+        $this->assertEqual($url->getPath(), "/here/there/somewhere.php");
+        $this->assertEqual($url->getPage(), "somewhere.php");
+        $this->assertEqual($url->getBasePath(), "/here/there/");
+    }
+    
+    function testSplittingUrlWithNoPageGivesEmptyPage() {
+        $url = new SimpleUrl('/here/there/');
+        $this->assertEqual($url->getPath(), '/here/there/');
+        $this->assertEqual($url->getPage(), '');
+        $this->assertEqual($url->getBasePath(), '/here/there/');
+    }
+    
+    function testPathNormalisation() {
+        $url = new SimpleUrl();
+        $this->assertEqual(
+                $url->normalisePath('https://host.com/I/am/here/../there/somewhere.php'),
+                'https://host.com/I/am/there/somewhere.php');
+    }
+
+    // regression test for #1535407
+    function testPathNormalisationWithSinglePeriod() {
+        $url = new SimpleUrl();
+        $this->assertEqual(
+            $url->normalisePath('https://host.com/I/am/here/./../there/somewhere.php'),
+            'https://host.com/I/am/there/somewhere.php');
+    }
+    
+    // regression test for #1852413
+    function testHostnameExtractedFromUContainingAtSign() {
+        $url = new SimpleUrl("http://localhost/name@example.com");
+        $this->assertEqual($url->getScheme(), "http");
+        $this->assertEqual($url->getUsername(), "");
+        $this->assertEqual($url->getPassword(), "");
+        $this->assertEqual($url->getHost(), "localhost");
+        $this->assertEqual($url->getPath(), "/name@example.com");
+    }
+
+    function testHostnameInLocalhost() {
+        $url = new SimpleUrl("http://localhost/name/example.com");
+        $this->assertEqual($url->getScheme(), "http");
+        $this->assertEqual($url->getUsername(), "");
+        $this->assertEqual($url->getPassword(), "");
+        $this->assertEqual($url->getHost(), "localhost");
+        $this->assertEqual($url->getPath(), "/name/example.com");
+    }
+
+    function testUsernameAndPasswordAreUrlDecoded() {
+        $url = new SimpleUrl('http://' . urlencode('test@test') .
+                ':' . urlencode('$!�@*&%') . '@www.lastcraft.com');
+        $this->assertEqual($url->getUsername(), 'test@test');
+        $this->assertEqual($url->getPassword(), '$!�@*&%');
+    }
+    
+    function testBlitz() {
+        $this->assertUrl(
+                "https://username:password@www.somewhere.com:243/this/that/here.php?a=1&b=2#anchor",
+                array("https", "username", "password", "www.somewhere.com", 243, "/this/that/here.php", "com", "?a=1&b=2", "anchor"),
+                array("a" => "1", "b" => "2"));
+        $this->assertUrl(
+                "username:password@www.somewhere.com/this/that/here.php?a=1",
+                array(false, "username", "password", "www.somewhere.com", false, "/this/that/here.php", "com", "?a=1", false),
+                array("a" => "1"));
+        $this->assertUrl(
+                "username:password@somewhere.com:243?1,2",
+                array(false, "username", "password", "somewhere.com", 243, "/", "com", "", false),
+                array(),
+                array(1, 2));
+        $this->assertUrl(
+                "https://www.somewhere.com",
+                array("https", false, false, "www.somewhere.com", false, "/", "com", "", false));
+        $this->assertUrl(
+                "username@www.somewhere.com:243#anchor",
+                array(false, "username", false, "www.somewhere.com", 243, "/", "com", "", "anchor"));
+        $this->assertUrl(
+                "/this/that/here.php?a=1&b=2?3,4",
+                array(false, false, false, false, false, "/this/that/here.php", false, "?a=1&b=2", false),
+                array("a" => "1", "b" => "2"),
+                array(3, 4));
+        $this->assertUrl(
+                "username@/here.php?a=1&b=2",
+                array(false, "username", false, false, false, "/here.php", false, "?a=1&b=2", false),
+                array("a" => "1", "b" => "2"));
+    }
+    
+    function testAmbiguousHosts() {
+        $this->assertUrl(
+                "tigger",
+                array(false, false, false, false, false, "tigger", false, "", false));
+        $this->assertUrl(
+                "/tigger",
+                array(false, false, false, false, false, "/tigger", false, "", false));
+        $this->assertUrl(
+                "//tigger",
+                array(false, false, false, "tigger", false, "/", false, "", false));
+        $this->assertUrl(
+                "//tigger/",
+                array(false, false, false, "tigger", false, "/", false, "", false));
+        $this->assertUrl(
+                "tigger.com",
+                array(false, false, false, "tigger.com", false, "/", "com", "", false));
+        $this->assertUrl(
+                "me.net/tigger",
+                array(false, false, false, "me.net", false, "/tigger", "net", "", false));
+    }
+    
+    function testAsString() {
+        $this->assertPreserved('https://www.here.com');
+        $this->assertPreserved('http://me:secret@www.here.com');
+        $this->assertPreserved('http://here/there');
+        $this->assertPreserved('http://here/there?a=A&b=B');
+        $this->assertPreserved('http://here/there?a=1&a=2');
+        $this->assertPreserved('http://here/there?a=1&a=2?9,8');
+        $this->assertPreserved('http://host?a=1&a=2');
+        $this->assertPreserved('http://host#stuff');
+        $this->assertPreserved('http://me:secret@www.here.com/a/b/c/here.html?a=A?7,6');
+        $this->assertPreserved('http://www.here.com/?a=A__b=B');
+        $this->assertPreserved('http://www.example.com:8080/');
+    }
+    
+    function testUrlWithTwoSlashesInPath() {
+        $url = new SimpleUrl('/article/categoryedit/insert//');
+        $this->assertEqual($url->getPath(), '/article/categoryedit/insert//');
+    }
+    
+    function testUrlWithRequestKeyEncoded() {
+        $url = new SimpleUrl('/?foo%5B1%5D=bar');
+        $this->assertEqual($url->getEncodedRequest(), '?foo%5B1%5D=bar');
+        $url->addRequestParameter('a[1]', 'b[]');
+        $this->assertEqual($url->getEncodedRequest(), '?foo%5B1%5D=bar&a%5B1%5D=b%5B%5D');
+
+        $url = new SimpleUrl('/');
+        $url->addRequestParameter('a[1]', 'b[]');
+        $this->assertEqual($url->getEncodedRequest(), '?a%5B1%5D=b%5B%5D');
+    }
+
+    function testUrlWithRequestKeyEncodedAndParamNamLookingLikePair() {
+        $url = new SimpleUrl('/');
+        $url->addRequestParameter('foo[]=bar', '');
+        $this->assertEqual($url->getEncodedRequest(), '?foo%5B%5D%3Dbar=');
+        $url = new SimpleUrl('/?foo%5B%5D%3Dbar=');
+        $this->assertEqual($url->getEncodedRequest(), '?foo%5B%5D%3Dbar=');
+    }
+
+    function assertUrl($raw, $parts, $params = false, $coords = false) {
+        if (! is_array($params)) {
+            $params = array();
+        }
+        $url = new SimpleUrl($raw);
+        $this->assertIdentical($url->getScheme(), $parts[0], "[$raw] scheme -> %s");
+        $this->assertIdentical($url->getUsername(), $parts[1], "[$raw] username -> %s");
+        $this->assertIdentical($url->getPassword(), $parts[2], "[$raw] password -> %s");
+        $this->assertIdentical($url->getHost(), $parts[3], "[$raw] host -> %s");
+        $this->assertIdentical($url->getPort(), $parts[4], "[$raw] port -> %s");
+        $this->assertIdentical($url->getPath(), $parts[5], "[$raw] path -> %s");
+        $this->assertIdentical($url->getTld(), $parts[6], "[$raw] tld -> %s");
+        $this->assertIdentical($url->getEncodedRequest(), $parts[7], "[$raw] encoded -> %s");
+        $this->assertIdentical($url->getFragment(), $parts[8], "[$raw] fragment -> %s");
+        if ($coords) {
+            $this->assertIdentical($url->getX(), $coords[0], "[$raw] x -> %s");
+            $this->assertIdentical($url->getY(), $coords[1], "[$raw] y -> %s");
+        }
+    }
+    
+    function assertPreserved($string) {
+        $url = new SimpleUrl($string);
+        $this->assertEqual($url->asString(), $string);
+    }
+}
+
+class TestOfAbsoluteUrls extends UnitTestCase {
+    
+	function testDirectoriesAfterFilename() {
+		$string = '../../index.php/foo/bar';
+		$url = new SimpleUrl($string);
+		$this->assertEqual($url->asString(), $string);
+		
+		$absolute = $url->makeAbsolute('http://www.domain.com/some/path/');
+		$this->assertEqual($absolute->asString(), 'http://www.domain.com/index.php/foo/bar');
+	}
+
+    function testMakingAbsolute() {
+        $url = new SimpleUrl('../there/somewhere.php');
+        $this->assertEqual($url->getPath(), '../there/somewhere.php');
+        $absolute = $url->makeAbsolute('https://host.com:1234/I/am/here/');
+        $this->assertEqual($absolute->getScheme(), 'https');
+        $this->assertEqual($absolute->getHost(), 'host.com');
+        $this->assertEqual($absolute->getPort(), 1234);
+        $this->assertEqual($absolute->getPath(), '/I/am/there/somewhere.php');
+    }
+    
+    function testMakingAnEmptyUrlAbsolute() {
+        $url = new SimpleUrl('');
+        $this->assertEqual($url->getPath(), '');
+        $absolute = $url->makeAbsolute('http://host.com/I/am/here/page.html');
+        $this->assertEqual($absolute->getScheme(), 'http');
+        $this->assertEqual($absolute->getHost(), 'host.com');
+        $this->assertEqual($absolute->getPath(), '/I/am/here/page.html');
+    }
+    
+    function testMakingAnEmptyUrlAbsoluteWithMissingPageName() {
+        $url = new SimpleUrl('');
+        $this->assertEqual($url->getPath(), '');
+        $absolute = $url->makeAbsolute('http://host.com/I/am/here/');
+        $this->assertEqual($absolute->getScheme(), 'http');
+        $this->assertEqual($absolute->getHost(), 'host.com');
+        $this->assertEqual($absolute->getPath(), '/I/am/here/');
+    }
+    
+    function testMakingAShortQueryUrlAbsolute() {
+        $url = new SimpleUrl('?a#b');
+        $this->assertEqual($url->getPath(), '');
+        $absolute = $url->makeAbsolute('http://host.com/I/am/here/');
+        $this->assertEqual($absolute->getScheme(), 'http');
+        $this->assertEqual($absolute->getHost(), 'host.com');
+        $this->assertEqual($absolute->getPath(), '/I/am/here/');
+        $this->assertEqual($absolute->getEncodedRequest(), '?a');
+        $this->assertEqual($absolute->getFragment(), 'b');
+    }
+    
+    function testMakingADirectoryUrlAbsolute() {
+        $url = new SimpleUrl('hello/');
+        $this->assertEqual($url->getPath(), 'hello/');
+        $this->assertEqual($url->getBasePath(), 'hello/');
+        $this->assertEqual($url->getPage(), '');
+        $absolute = $url->makeAbsolute('http://host.com/I/am/here/page.html');
+        $this->assertEqual($absolute->getPath(), '/I/am/here/hello/');
+    }
+    
+    function testMakingARootUrlAbsolute() {
+        $url = new SimpleUrl('/');
+        $this->assertEqual($url->getPath(), '/');
+        $absolute = $url->makeAbsolute('http://host.com/I/am/here/page.html');
+        $this->assertEqual($absolute->getPath(), '/');
+    }
+    
+    function testMakingARootPageUrlAbsolute() {
+        $url = new SimpleUrl('/here.html');
+        $absolute = $url->makeAbsolute('http://host.com/I/am/here/page.html');
+        $this->assertEqual($absolute->getPath(), '/here.html');
+    }
+    
+    function testCarryAuthenticationFromRootPage() {
+        $url = new SimpleUrl('here.html');
+        $absolute = $url->makeAbsolute('http://test:secret@host.com/');
+        $this->assertEqual($absolute->getPath(), '/here.html');
+        $this->assertEqual($absolute->getUsername(), 'test');
+        $this->assertEqual($absolute->getPassword(), 'secret');
+    }
+    
+    function testMakingCoordinateUrlAbsolute() {
+        $url = new SimpleUrl('?1,2');
+        $this->assertEqual($url->getPath(), '');
+        $absolute = $url->makeAbsolute('http://host.com/I/am/here/');
+        $this->assertEqual($absolute->getScheme(), 'http');
+        $this->assertEqual($absolute->getHost(), 'host.com');
+        $this->assertEqual($absolute->getPath(), '/I/am/here/');
+        $this->assertEqual($absolute->getX(), 1);
+        $this->assertEqual($absolute->getY(), 2);
+    }
+    
+    function testMakingAbsoluteAppendedPath() {
+        $url = new SimpleUrl('./there/somewhere.php');
+        $absolute = $url->makeAbsolute('https://host.com/here/');
+        $this->assertEqual($absolute->getPath(), '/here/there/somewhere.php');
+    }
+    
+    function testMakingAbsoluteBadlyFormedAppendedPath() {
+        $url = new SimpleUrl('there/somewhere.php');
+        $absolute = $url->makeAbsolute('https://host.com/here/');
+        $this->assertEqual($absolute->getPath(), '/here/there/somewhere.php');
+    }
+    
+    function testMakingAbsoluteHasNoEffectWhenAlreadyAbsolute() {
+        $url = new SimpleUrl('https://test:secret@www.lastcraft.com:321/stuff/?a=1#f');
+        $absolute = $url->makeAbsolute('http://host.com/here/');
+        $this->assertEqual($absolute->getScheme(), 'https');
+        $this->assertEqual($absolute->getUsername(), 'test');
+        $this->assertEqual($absolute->getPassword(), 'secret');
+        $this->assertEqual($absolute->getHost(), 'www.lastcraft.com');
+        $this->assertEqual($absolute->getPort(), 321);
+        $this->assertEqual($absolute->getPath(), '/stuff/');
+        $this->assertEqual($absolute->getEncodedRequest(), '?a=1');
+        $this->assertEqual($absolute->getFragment(), 'f');
+    }
+    
+    function testMakingAbsoluteCarriesAuthenticationWhenAlreadyAbsolute() {
+        $url = new SimpleUrl('https://www.lastcraft.com');
+        $absolute = $url->makeAbsolute('http://test:secret@host.com/here/');
+        $this->assertEqual($absolute->getHost(), 'www.lastcraft.com');
+        $this->assertEqual($absolute->getUsername(), 'test');
+        $this->assertEqual($absolute->getPassword(), 'secret');
+    }
+    
+    function testMakingHostOnlyAbsoluteDoesNotCarryAnyOtherInformation() {
+        $url = new SimpleUrl('http://www.lastcraft.com');
+        $absolute = $url->makeAbsolute('https://host.com:81/here/');
+        $this->assertEqual($absolute->getScheme(), 'http');
+        $this->assertEqual($absolute->getHost(), 'www.lastcraft.com');
+        $this->assertIdentical($absolute->getPort(), false);
+        $this->assertEqual($absolute->getPath(), '/');
+    }
+}
+
+class TestOfFrameUrl extends UnitTestCase {
+    
+    function testTargetAttachment() {
+        $url = new SimpleUrl('http://www.site.com/home.html');
+        $this->assertIdentical($url->getTarget(), false);
+        $url->setTarget('A frame');
+        $this->assertIdentical($url->getTarget(), 'A frame');
+    }
+}
+
+/**
+ * @note Based off of http://www.mozilla.org/quality/networking/testing/filetests.html
+ */
+class TestOfFileUrl extends UnitTestCase {
+    
+    function testMinimalUrl() {
+        $url = new SimpleUrl('file:///');
+        $this->assertEqual($url->getScheme(), 'file');
+        $this->assertIdentical($url->getHost(), false);
+        $this->assertEqual($url->getPath(), '/');
+    }
+    
+    function testUnixUrl() {
+        $url = new SimpleUrl('file:///fileInRoot');
+        $this->assertEqual($url->getScheme(), 'file');
+        $this->assertIdentical($url->getHost(), false);
+        $this->assertEqual($url->getPath(), '/fileInRoot');
+    }
+    
+    function testDOSVolumeUrl() {
+        $url = new SimpleUrl('file:///C:/config.sys');
+        $this->assertEqual($url->getScheme(), 'file');
+        $this->assertIdentical($url->getHost(), false);
+        $this->assertEqual($url->getPath(), '/C:/config.sys');
+    }
+    
+    function testDOSVolumePromotion() {
+        $url = new SimpleUrl('file://C:/config.sys');
+        $this->assertEqual($url->getScheme(), 'file');
+        $this->assertIdentical($url->getHost(), false);
+        $this->assertEqual($url->getPath(), '/C:/config.sys');
+    }
+    
+    function testDOSBackslashes() {
+        $url = new SimpleUrl('file:///C:\config.sys');
+        $this->assertEqual($url->getScheme(), 'file');
+        $this->assertIdentical($url->getHost(), false);
+        $this->assertEqual($url->getPath(), '/C:/config.sys');
+    }
+    
+    function testDOSDirnameAfterFile() {
+        $url = new SimpleUrl('file://C:\config.sys');
+        $this->assertEqual($url->getScheme(), 'file');
+        $this->assertIdentical($url->getHost(), false);
+        $this->assertEqual($url->getPath(), '/C:/config.sys');
+    }
+    
+}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/user_agent_test.php b/3rdparty/simpletest/test/user_agent_test.php
new file mode 100755
index 00000000000..030abeb257d
--- /dev/null
+++ b/3rdparty/simpletest/test/user_agent_test.php
@@ -0,0 +1,348 @@
+<?php
+// $Id: user_agent_test.php 1788 2008-04-27 11:01:59Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../user_agent.php');
+require_once(dirname(__FILE__) . '/../authentication.php');
+require_once(dirname(__FILE__) . '/../http.php');
+require_once(dirname(__FILE__) . '/../encoding.php');
+Mock::generate('SimpleHttpRequest');
+Mock::generate('SimpleHttpResponse');
+Mock::generate('SimpleHttpHeaders');
+Mock::generatePartial('SimpleUserAgent', 'MockRequestUserAgent', array('createHttpRequest'));
+
+class TestOfFetchingUrlParameters extends UnitTestCase {
+    
+    function setUp() {
+        $this->headers = new MockSimpleHttpHeaders();
+        $this->response = new MockSimpleHttpResponse();
+        $this->response->setReturnValue('isError', false);
+        $this->response->returns('getHeaders', new MockSimpleHttpHeaders());
+        $this->request = new MockSimpleHttpRequest();
+        $this->request->returns('fetch', $this->response);
+    }
+    
+    function testGetRequestWithoutIncidentGivesNoErrors() {
+        $url = new SimpleUrl('http://test:secret@this.com/page.html');
+        $url->addRequestParameters(array('a' => 'A', 'b' => 'B'));
+        
+        $agent = new MockRequestUserAgent();
+        $agent->returns('createHttpRequest', $this->request);
+        $agent->__construct();
+        
+        $response = $agent->fetchResponse(
+                new SimpleUrl('http://test:secret@this.com/page.html'),
+                new SimpleGetEncoding(array('a' => 'A', 'b' => 'B')));
+        $this->assertFalse($response->isError());
+    }
+}
+
+class TestOfAdditionalHeaders extends UnitTestCase {
+    
+    function testAdditionalHeaderAddedToRequest() {
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnReference('getHeaders', new MockSimpleHttpHeaders());
+        
+        $request = new MockSimpleHttpRequest();
+        $request->setReturnReference('fetch', $response);
+        $request->expectOnce(
+                'addHeaderLine',
+                array('User-Agent: SimpleTest'));
+        
+        $agent = new MockRequestUserAgent();
+        $agent->setReturnReference('createHttpRequest', $request);
+        $agent->__construct();
+        $agent->addHeader('User-Agent: SimpleTest');
+        $response = $agent->fetchResponse(new SimpleUrl('http://this.host/'), new SimpleGetEncoding());
+    }
+}
+
+class TestOfBrowserCookies extends UnitTestCase {
+
+    private function createStandardResponse() {
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue("isError", false);
+        $response->setReturnValue("getContent", "stuff");
+        $response->setReturnReference("getHeaders", new MockSimpleHttpHeaders());
+        return $response;
+    }
+    
+    private function createCookieSite($header_lines) {
+        $headers = new SimpleHttpHeaders($header_lines);
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue("isError", false);
+        $response->setReturnReference("getHeaders", $headers);
+        $response->setReturnValue("getContent", "stuff");
+        $request = new MockSimpleHttpRequest();
+        $request->setReturnReference("fetch", $response);
+        return $request;
+    }
+    
+    private function createMockedRequestUserAgent(&$request) {
+        $agent = new MockRequestUserAgent();
+        $agent->setReturnReference('createHttpRequest', $request);
+        $agent->__construct();
+        return $agent;
+    }
+    
+    function testCookieJarIsSentToRequest() {
+        $jar = new SimpleCookieJar();
+        $jar->setCookie('a', 'A');
+        
+        $request = new MockSimpleHttpRequest();
+        $request->returns('fetch', $this->createStandardResponse());
+        $request->expectOnce('readCookiesFromJar', array($jar, '*'));
+        
+        $agent = $this->createMockedRequestUserAgent($request);
+        $agent->setCookie('a', 'A');
+        $agent->fetchResponse(
+                new SimpleUrl('http://this.com/this/path/page.html'),
+                new SimpleGetEncoding());
+    }
+      
+    function testNoCookieJarIsSentToRequestWhenCookiesAreDisabled() {
+        $request = new MockSimpleHttpRequest();
+        $request->returns('fetch', $this->createStandardResponse());
+        $request->expectNever('readCookiesFromJar');
+        
+        $agent = $this->createMockedRequestUserAgent($request);
+        $agent->setCookie('a', 'A');
+        $agent->ignoreCookies();
+        $agent->fetchResponse(
+                new SimpleUrl('http://this.com/this/path/page.html'),
+                new SimpleGetEncoding());
+    }
+  
+    function testReadingNewCookie() {
+        $request = $this->createCookieSite('Set-cookie: a=AAAA');
+        $agent = $this->createMockedRequestUserAgent($request);
+        $agent->fetchResponse(
+                new SimpleUrl('http://this.com/this/path/page.html'),
+                new SimpleGetEncoding());
+        $this->assertEqual($agent->getCookieValue("this.com", "this/path/", "a"), "AAAA");
+    }
+  
+    function testIgnoringNewCookieWhenCookiesDisabled() {
+        $request = $this->createCookieSite('Set-cookie: a=AAAA');
+        $agent = $this->createMockedRequestUserAgent($request);
+        $agent->ignoreCookies();
+        $agent->fetchResponse(
+                new SimpleUrl('http://this.com/this/path/page.html'),
+                new SimpleGetEncoding());
+        $this->assertIdentical($agent->getCookieValue("this.com", "this/path/", "a"), false);
+    }
+   
+    function testOverwriteCookieThatAlreadyExists() {
+        $request = $this->createCookieSite('Set-cookie: a=AAAA');
+        $agent = $this->createMockedRequestUserAgent($request);
+        $agent->setCookie('a', 'A');
+        $agent->fetchResponse(
+                new SimpleUrl('http://this.com/this/path/page.html'),
+                new SimpleGetEncoding());
+        $this->assertEqual($agent->getCookieValue("this.com", "this/path/", "a"), "AAAA");
+    }
+   
+    function testClearCookieBySettingExpiry() {
+        $request = $this->createCookieSite('Set-cookie: a=b');
+        $agent = $this->createMockedRequestUserAgent($request);
+        
+        $agent->setCookie("a", "A", "this/path/", "Wed, 25-Dec-02 04:24:21 GMT");
+        $agent->fetchResponse(
+                new SimpleUrl('http://this.com/this/path/page.html'),
+                new SimpleGetEncoding());
+        $this->assertIdentical(
+                $agent->getCookieValue("this.com", "this/path/", "a"),
+                "b");
+        $agent->restart("Wed, 25-Dec-02 04:24:20 GMT");
+        $this->assertIdentical(
+                $agent->getCookieValue("this.com", "this/path/", "a"),
+                false);
+    }
+    
+    function testAgeingAndClearing() {
+        $request = $this->createCookieSite('Set-cookie: a=A; expires=Wed, 25-Dec-02 04:24:21 GMT; path=/this/path');
+        $agent = $this->createMockedRequestUserAgent($request);
+        
+        $agent->fetchResponse(
+                new SimpleUrl('http://this.com/this/path/page.html'),
+                new SimpleGetEncoding());
+        $agent->restart("Wed, 25-Dec-02 04:24:20 GMT");
+        $this->assertIdentical(
+                $agent->getCookieValue("this.com", "this/path/", "a"),
+                "A");
+        $agent->ageCookies(2);
+        $agent->restart("Wed, 25-Dec-02 04:24:20 GMT");
+        $this->assertIdentical(
+                $agent->getCookieValue("this.com", "this/path/", "a"),
+                false);
+    }
+    
+    function testReadingIncomingAndSettingNewCookies() {
+        $request = $this->createCookieSite('Set-cookie: a=AAA');
+        $agent = $this->createMockedRequestUserAgent($request);
+        
+        $this->assertNull($agent->getBaseCookieValue("a", false));
+        $agent->fetchResponse(
+                new SimpleUrl('http://this.com/this/path/page.html'),
+                new SimpleGetEncoding());
+        $agent->setCookie("b", "BBB", "this.com", "this/path/");
+        $this->assertEqual(
+                $agent->getBaseCookieValue("a", new SimpleUrl('http://this.com/this/path/page.html')),
+                "AAA");
+        $this->assertEqual(
+                $agent->getBaseCookieValue("b", new SimpleUrl('http://this.com/this/path/page.html')),
+                "BBB");
+    }
+}
+
+class TestOfHttpRedirects extends UnitTestCase {
+    
+    function createRedirect($content, $redirect) {
+        $headers = new MockSimpleHttpHeaders();
+        $headers->setReturnValue('isRedirect', (boolean)$redirect);
+        $headers->setReturnValue('getLocation', $redirect);
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('getContent', $content);
+        $response->setReturnReference('getHeaders', $headers);
+        $request = new MockSimpleHttpRequest();
+        $request->setReturnReference('fetch', $response);
+        return $request;
+    }
+    
+    function testDisabledRedirects() {
+        $agent = new MockRequestUserAgent();
+        $agent->returns(
+                'createHttpRequest',
+                $this->createRedirect('stuff', 'there.html'));
+        $agent->expectOnce('createHttpRequest');
+        $agent->__construct();
+        $agent->setMaximumRedirects(0);
+        $response = $agent->fetchResponse(new SimpleUrl('here.html'), new SimpleGetEncoding());
+        $this->assertEqual($response->getContent(), 'stuff');
+    }
+    
+    function testSingleRedirect() {
+        $agent = new MockRequestUserAgent();
+        $agent->returnsAt(
+                0,
+                'createHttpRequest',
+                $this->createRedirect('first', 'two.html'));
+        $agent->returnsAt(
+                1,
+                'createHttpRequest',
+                $this->createRedirect('second', 'three.html'));
+        $agent->expectCallCount('createHttpRequest', 2);
+        $agent->__construct();
+        
+        $agent->setMaximumRedirects(1);
+        $response = $agent->fetchResponse(new SimpleUrl('one.html'), new SimpleGetEncoding());
+        $this->assertEqual($response->getContent(), 'second');
+    }
+    
+    function testDoubleRedirect() {
+        $agent = new MockRequestUserAgent();
+        $agent->returnsAt(
+                0,
+                'createHttpRequest',
+                $this->createRedirect('first', 'two.html'));
+        $agent->returnsAt(
+                1,
+                'createHttpRequest',
+                $this->createRedirect('second', 'three.html'));
+        $agent->returnsAt(
+                2,
+                'createHttpRequest',
+                $this->createRedirect('third', 'four.html'));
+        $agent->expectCallCount('createHttpRequest', 3);
+        $agent->__construct();
+        
+        $agent->setMaximumRedirects(2);
+        $response = $agent->fetchResponse(new SimpleUrl('one.html'), new SimpleGetEncoding());
+        $this->assertEqual($response->getContent(), 'third');
+    }
+    
+    function testSuccessAfterRedirect() {
+        $agent = new MockRequestUserAgent();
+        $agent->returnsAt(
+                0,
+                'createHttpRequest',
+                $this->createRedirect('first', 'two.html'));
+        $agent->returnsAt(
+                1,
+                'createHttpRequest',
+                $this->createRedirect('second', false));
+        $agent->returnsAt(
+                2,
+                'createHttpRequest',
+                $this->createRedirect('third', 'four.html'));
+        $agent->expectCallCount('createHttpRequest', 2);
+        $agent->__construct();
+        
+        $agent->setMaximumRedirects(2);
+        $response = $agent->fetchResponse(new SimpleUrl('one.html'), new SimpleGetEncoding());
+        $this->assertEqual($response->getContent(), 'second');
+    }
+    
+    function testRedirectChangesPostToGet() {
+        $agent = new MockRequestUserAgent();
+        $agent->returnsAt(
+                0,
+                'createHttpRequest',
+                $this->createRedirect('first', 'two.html'));
+        $agent->expectAt(0, 'createHttpRequest', array('*', new IsAExpectation('SimplePostEncoding')));
+        $agent->returnsAt(
+                1,
+                'createHttpRequest',
+                $this->createRedirect('second', 'three.html'));
+        $agent->expectAt(1, 'createHttpRequest', array('*', new IsAExpectation('SimpleGetEncoding')));
+        $agent->expectCallCount('createHttpRequest', 2);
+        $agent->__construct();
+        $agent->setMaximumRedirects(1);
+        $response = $agent->fetchResponse(new SimpleUrl('one.html'), new SimplePostEncoding());
+    }
+}
+
+class TestOfBadHosts extends UnitTestCase {
+    
+    private function createSimulatedBadHost() {
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnValue('isError', true);
+        $response->setReturnValue('getError', 'Bad socket');
+        $response->setReturnValue('getContent', false);
+        $request = new MockSimpleHttpRequest();
+        $request->setReturnReference('fetch', $response);
+        return $request;
+    }
+    
+    function testUntestedHost() {
+        $request = $this->createSimulatedBadHost();
+        $agent = new MockRequestUserAgent();
+        $agent->setReturnReference('createHttpRequest', $request);
+        $agent->__construct();
+        $response = $agent->fetchResponse(
+                new SimpleUrl('http://this.host/this/path/page.html'),
+                new SimpleGetEncoding());
+        $this->assertTrue($response->isError());
+    }
+}
+
+class TestOfAuthorisation extends UnitTestCase {
+    
+    function testAuthenticateHeaderAdded() {
+        $response = new MockSimpleHttpResponse();
+        $response->setReturnReference('getHeaders', new MockSimpleHttpHeaders());
+        
+        $request = new MockSimpleHttpRequest();
+        $request->returns('fetch', $response);
+        $request->expectOnce(
+                'addHeaderLine',
+                array('Authorization: Basic ' . base64_encode('test:secret')));
+        
+        $agent = new MockRequestUserAgent();
+        $agent->returns('createHttpRequest', $request);
+        $agent->__construct();
+        $response = $agent->fetchResponse(
+                new SimpleUrl('http://test:secret@this.host'),
+                new SimpleGetEncoding());
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/visual_test.php b/3rdparty/simpletest/test/visual_test.php
new file mode 100755
index 00000000000..6b9d085d67f
--- /dev/null
+++ b/3rdparty/simpletest/test/visual_test.php
@@ -0,0 +1,495 @@
+<?php
+// $Id: visual_test.php 1884 2009-07-01 16:30:40Z lastcraft $
+
+// NOTE:
+// Some of these tests are designed to fail! Do not be alarmed.
+//                         ----------------
+
+// The following tests are a bit hacky. Whilst Kent Beck tried to
+// build a unit tester with a unit tester, I am not that brave.
+// Instead I have just hacked together odd test scripts until
+// I have enough of a tester to procede more formally.
+//
+// The proper tests start in all_tests.php
+require_once('../unit_tester.php');
+require_once('../shell_tester.php');
+require_once('../mock_objects.php');
+require_once('../reporter.php');
+require_once('../xml.php');
+
+class TestDisplayClass {
+    private $a;
+
+    function TestDisplayClass($a) {
+        $this->a = $a;
+    }
+}
+
+class PassingUnitTestCaseOutput extends UnitTestCase {
+
+    function testOfResults() {
+        $this->pass('Pass');
+    }
+
+    function testTrue() {
+        $this->assertTrue(true);
+    }
+
+    function testFalse() {
+        $this->assertFalse(false);
+    }
+
+    function testExpectation() {
+        $expectation = &new EqualExpectation(25, 'My expectation message: %s');
+        $this->assert($expectation, 25, 'My assert message : %s');
+    }
+
+    function testNull() {
+        $this->assertNull(null, "%s -> Pass");
+        $this->assertNotNull(false, "%s -> Pass");
+    }
+
+    function testType() {
+        $this->assertIsA("hello", "string", "%s -> Pass");
+        $this->assertIsA($this, "PassingUnitTestCaseOutput", "%s -> Pass");
+        $this->assertIsA($this, "UnitTestCase", "%s -> Pass");
+    }
+
+    function testTypeEquality() {
+        $this->assertEqual("0", 0, "%s -> Pass");
+    }
+
+    function testNullEquality() {
+        $this->assertNotEqual(null, 1, "%s -> Pass");
+        $this->assertNotEqual(1, null, "%s -> Pass");
+    }
+
+    function testIntegerEquality() {
+        $this->assertNotEqual(1, 2, "%s -> Pass");
+    }
+
+    function testStringEquality() {
+        $this->assertEqual("a", "a", "%s -> Pass");
+        $this->assertNotEqual("aa", "ab", "%s -> Pass");
+    }
+
+    function testHashEquality() {
+        $this->assertEqual(array("a" => "A", "b" => "B"), array("b" => "B", "a" => "A"), "%s -> Pass");
+    }
+
+    function testWithin() {
+        $this->assertWithinMargin(5, 5.4, 0.5, "%s -> Pass");
+    }
+
+    function testOutside() {
+        $this->assertOutsideMargin(5, 5.6, 0.5, "%s -> Pass");
+    }
+
+    function testStringIdentity() {
+        $a = "fred";
+        $b = $a;
+        $this->assertIdentical($a, $b, "%s -> Pass");
+    }
+
+    function testTypeIdentity() {
+        $a = "0";
+        $b = 0;
+        $this->assertNotIdentical($a, $b, "%s -> Pass");
+    }
+
+    function testNullIdentity() {
+        $this->assertNotIdentical(null, 1, "%s -> Pass");
+        $this->assertNotIdentical(1, null, "%s -> Pass");
+    }
+
+    function testHashIdentity() {
+    }
+
+    function testObjectEquality() {
+        $this->assertEqual(new TestDisplayClass(4), new TestDisplayClass(4), "%s -> Pass");
+        $this->assertNotEqual(new TestDisplayClass(4), new TestDisplayClass(5), "%s -> Pass");
+    }
+
+    function testObjectIndentity() {
+        $this->assertIdentical(new TestDisplayClass(false), new TestDisplayClass(false), "%s -> Pass");
+        $this->assertNotIdentical(new TestDisplayClass(false), new TestDisplayClass(0), "%s -> Pass");
+    }
+
+    function testReference() {
+        $a = "fred";
+        $b = &$a;
+        $this->assertReference($a, $b, "%s -> Pass");
+    }
+
+    function testCloneOnDifferentObjects() {
+        $a = "fred";
+        $b = $a;
+        $c = "Hello";
+        $this->assertClone($a, $b, "%s -> Pass");
+    }
+
+    function testPatterns() {
+        $this->assertPattern('/hello/i', "Hello there", "%s -> Pass");
+        $this->assertNoPattern('/hello/', "Hello there", "%s -> Pass");
+    }
+
+    function testLongStrings() {
+        $text = "";
+        for ($i = 0; $i < 10; $i++) {
+            $text .= "0123456789";
+        }
+        $this->assertEqual($text, $text);
+    }
+}
+
+class FailingUnitTestCaseOutput extends UnitTestCase {
+
+    function testOfResults() {
+        $this->fail('Fail');        // Fail.
+    }
+
+    function testTrue() {
+        $this->assertTrue(false);        // Fail.
+    }
+
+    function testFalse() {
+        $this->assertFalse(true);        // Fail.
+    }
+
+    function testExpectation() {
+        $expectation = &new EqualExpectation(25, 'My expectation message: %s');
+        $this->assert($expectation, 24, 'My assert message : %s');        // Fail.
+    }
+
+    function testNull() {
+        $this->assertNull(false, "%s -> Fail");        // Fail.
+        $this->assertNotNull(null, "%s -> Fail");        // Fail.
+    }
+
+    function testType() {
+        $this->assertIsA(14, "string", "%s -> Fail");        // Fail.
+        $this->assertIsA(14, "TestOfUnitTestCaseOutput", "%s -> Fail");        // Fail.
+        $this->assertIsA($this, "TestReporter", "%s -> Fail");        // Fail.
+    }
+
+    function testTypeEquality() {
+        $this->assertNotEqual("0", 0, "%s -> Fail");        // Fail.
+    }
+
+    function testNullEquality() {
+        $this->assertEqual(null, 1, "%s -> Fail");        // Fail.
+        $this->assertEqual(1, null, "%s -> Fail");        // Fail.
+    }
+
+    function testIntegerEquality() {
+        $this->assertEqual(1, 2, "%s -> Fail");        // Fail.
+    }
+
+    function testStringEquality() {
+        $this->assertNotEqual("a", "a", "%s -> Fail");    // Fail.
+        $this->assertEqual("aa", "ab", "%s -> Fail");        // Fail.
+    }
+
+    function testHashEquality() {
+        $this->assertEqual(array("a" => "A", "b" => "B"), array("b" => "B", "a" => "Z"), "%s -> Fail");
+    }
+
+    function testWithin() {
+        $this->assertWithinMargin(5, 5.6, 0.5, "%s -> Fail");   // Fail.
+    }
+
+    function testOutside() {
+        $this->assertOutsideMargin(5, 5.4, 0.5, "%s -> Fail");   // Fail.
+    }
+
+    function testStringIdentity() {
+        $a = "fred";
+        $b = $a;
+        $this->assertNotIdentical($a, $b, "%s -> Fail");       // Fail.
+    }
+
+    function testTypeIdentity() {
+        $a = "0";
+        $b = 0;
+        $this->assertIdentical($a, $b, "%s -> Fail");        // Fail.
+    }
+
+    function testNullIdentity() {
+        $this->assertIdentical(null, 1, "%s -> Fail");        // Fail.
+        $this->assertIdentical(1, null, "%s -> Fail");        // Fail.
+    }
+
+    function testHashIdentity() {
+        $this->assertIdentical(array("a" => "A", "b" => "B"), array("b" => "B", "a" => "A"), "%s -> fail");        // Fail.
+    }
+
+    function testObjectEquality() {
+        $this->assertNotEqual(new TestDisplayClass(4), new TestDisplayClass(4), "%s -> Fail");    // Fail.
+        $this->assertEqual(new TestDisplayClass(4), new TestDisplayClass(5), "%s -> Fail");        // Fail.
+    }
+
+    function testObjectIndentity() {
+        $this->assertNotIdentical(new TestDisplayClass(false), new TestDisplayClass(false), "%s -> Fail");    // Fail.
+        $this->assertIdentical(new TestDisplayClass(false), new TestDisplayClass(0), "%s -> Fail");        // Fail.
+    }
+
+    function testReference() {
+        $a = "fred";
+        $b = &$a;
+        $this->assertClone($a, $b, "%s -> Fail");        // Fail.
+    }
+
+    function testCloneOnDifferentObjects() {
+        $a = "fred";
+        $b = $a;
+        $c = "Hello";
+        $this->assertClone($a, $c, "%s -> Fail");        // Fail.
+    }
+
+    function testPatterns() {
+        $this->assertPattern('/hello/', "Hello there", "%s -> Fail");            // Fail.
+        $this->assertNoPattern('/hello/i', "Hello there", "%s -> Fail");      // Fail.
+    }
+
+    function testLongStrings() {
+        $text = "";
+        for ($i = 0; $i < 10; $i++) {
+            $text .= "0123456789";
+        }
+        $this->assertEqual($text . $text, $text . "a" . $text);        // Fail.
+    }
+}
+
+class Dummy {
+    function Dummy() {
+    }
+
+    function a() {
+    }
+}
+Mock::generate('Dummy');
+
+class TestOfMockObjectsOutput extends UnitTestCase {
+
+    function testCallCounts() {
+        $dummy = &new MockDummy();
+        $dummy->expectCallCount('a', 1, 'My message: %s');
+        $dummy->a();
+        $dummy->a();
+    }
+
+    function testMinimumCallCounts() {
+        $dummy = &new MockDummy();
+        $dummy->expectMinimumCallCount('a', 2, 'My message: %s');
+        $dummy->a();
+        $dummy->a();
+    }
+
+    function testEmptyMatching() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array());
+        $dummy->a();
+        $dummy->a(null);        // Fail.
+    }
+
+    function testEmptyMatchingWithCustomMessage() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array(), 'My expectation message: %s');
+        $dummy->a();
+        $dummy->a(null);        // Fail.
+    }
+
+    function testNullMatching() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array(null));
+        $dummy->a(null);
+        $dummy->a();        // Fail.
+    }
+
+    function testBooleanMatching() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array(true, false));
+        $dummy->a(true, false);
+        $dummy->a(true, true);        // Fail.
+    }
+
+    function testIntegerMatching() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array(32, 33));
+        $dummy->a(32, 33);
+        $dummy->a(32, 34);        // Fail.
+    }
+
+    function testFloatMatching() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array(3.2, 3.3));
+        $dummy->a(3.2, 3.3);
+        $dummy->a(3.2, 3.4);        // Fail.
+    }
+
+    function testStringMatching() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array('32', '33'));
+        $dummy->a('32', '33');
+        $dummy->a('32', '34');        // Fail.
+    }
+
+    function testEmptyMatchingWithCustomExpectationMessage() {
+        $dummy = &new MockDummy();
+        $dummy->expect(
+                'a',
+                array(new EqualExpectation('A', 'My part expectation message: %s')),
+                'My expectation message: %s');
+        $dummy->a('A');
+        $dummy->a('B');        // Fail.
+    }
+
+    function testArrayMatching() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array(array(32), array(33)));
+        $dummy->a(array(32), array(33));
+        $dummy->a(array(32), array('33'));        // Fail.
+    }
+
+    function testObjectMatching() {
+        $a = new Dummy();
+        $a->a = 'a';
+        $b = new Dummy();
+        $b->b = 'b';
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array($a, $b));
+        $dummy->a($a, $b);
+        $dummy->a($a, $a);        // Fail.
+    }
+
+    function testBigList() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array(false, 0, 1, 1.0));
+        $dummy->a(false, 0, 1, 1.0);
+        $dummy->a(true, false, 2, 2.0);        // Fail.
+    }
+}
+
+class TestOfPastBugs extends UnitTestCase {
+
+    function testMixedTypes() {
+        $this->assertEqual(array(), null, "%s -> Pass");
+        $this->assertIdentical(array(), null, "%s -> Fail");    // Fail.
+    }
+
+    function testMockWildcards() {
+        $dummy = &new MockDummy();
+        $dummy->expect('a', array('*', array(33)));
+        $dummy->a(array(32), array(33));
+        $dummy->a(array(32), array('33'));        // Fail.
+    }
+}
+
+class TestOfVisualShell extends ShellTestCase {
+
+    function testDump() {
+        $this->execute('ls');
+        $this->dumpOutput();
+        $this->execute('dir');
+        $this->dumpOutput();
+    }
+
+    function testDumpOfList() {
+        $this->execute('ls');
+        $this->dump($this->getOutputAsList());
+    }
+}
+
+class PassesAsWellReporter extends HtmlReporter {
+
+    protected function getCss() {
+        return parent::getCss() . ' .pass { color: darkgreen; }';
+    }
+
+    function paintPass($message) {
+        parent::paintPass($message);
+        print "<span class=\"pass\">Pass</span>: ";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print implode(" -&gt; ", $breadcrumb);
+        print " -&gt; " . htmlentities($message) . "<br />\n";
+    }
+
+    function paintSignal($type, &$payload) {
+        print "<span class=\"fail\">$type</span>: ";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print implode(" -&gt; ", $breadcrumb);
+        print " -&gt; " . htmlentities(serialize($payload)) . "<br />\n";
+    }
+}
+
+class TestOfSkippingNoMatterWhat extends UnitTestCase {
+    function skip() {
+        $this->skipIf(true, 'Always skipped -> %s');
+    }
+
+    function testFail() {
+        $this->fail('This really shouldn\'t have happened');
+    }
+}
+
+class TestOfSkippingOrElse extends UnitTestCase {
+    function skip() {
+        $this->skipUnless(false, 'Always skipped -> %s');
+    }
+
+    function testFail() {
+        $this->fail('This really shouldn\'t have happened');
+    }
+}
+
+class TestOfSkippingTwiceOver extends UnitTestCase {
+    function skip() {
+        $this->skipIf(true, 'First reason -> %s');
+        $this->skipIf(true, 'Second reason -> %s');
+    }
+
+    function testFail() {
+        $this->fail('This really shouldn\'t have happened');
+    }
+}
+
+class TestThatShouldNotBeSkipped extends UnitTestCase {
+    function skip() {
+        $this->skipIf(false);
+        $this->skipUnless(true);
+    }
+
+    function testFail() {
+        $this->fail('We should see this message');
+    }
+
+    function testPass() {
+        $this->pass('We should see this message');
+    }
+}
+
+$test = &new TestSuite('Visual test with 46 passes, 47 fails and 0 exceptions');
+$test->add(new PassingUnitTestCaseOutput());
+$test->add(new FailingUnitTestCaseOutput());
+$test->add(new TestOfMockObjectsOutput());
+$test->add(new TestOfPastBugs());
+$test->add(new TestOfVisualShell());
+$test->add(new TestOfSkippingNoMatterWhat());
+$test->add(new TestOfSkippingOrElse());
+$test->add(new TestOfSkippingTwiceOver());
+$test->add(new TestThatShouldNotBeSkipped());
+
+if (isset($_GET['xml']) || in_array('xml', (isset($argv) ? $argv : array()))) {
+    $reporter = new XmlReporter();
+} elseif (TextReporter::inCli()) {
+    $reporter = new TextReporter();
+} else {
+    $reporter = new PassesAsWellReporter();
+}
+if (isset($_GET['dry']) || in_array('dry', (isset($argv) ? $argv : array()))) {
+    $reporter->makeDry();
+}
+exit ($test->run($reporter) ? 0 : 1);
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/web_tester_test.php b/3rdparty/simpletest/test/web_tester_test.php
new file mode 100755
index 00000000000..8c3bf1adf63
--- /dev/null
+++ b/3rdparty/simpletest/test/web_tester_test.php
@@ -0,0 +1,155 @@
+<?php
+// $Id: web_tester_test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../web_tester.php');
+
+class TestOfFieldExpectation extends UnitTestCase {
+    
+    function testStringMatchingIsCaseSensitive() {
+        $expectation = new FieldExpectation('a');
+        $this->assertTrue($expectation->test('a'));
+        $this->assertTrue($expectation->test(array('a')));
+        $this->assertFalse($expectation->test('A'));
+    }
+    
+    function testMatchesInteger() {
+        $expectation = new FieldExpectation('1');
+        $this->assertTrue($expectation->test('1'));
+        $this->assertTrue($expectation->test(1));
+        $this->assertTrue($expectation->test(array('1')));
+        $this->assertTrue($expectation->test(array(1)));
+    }
+    
+    function testNonStringFailsExpectation() {
+        $expectation = new FieldExpectation('a');
+        $this->assertFalse($expectation->test(null));
+    }
+    
+    function testUnsetFieldCanBeTestedFor() {
+        $expectation = new FieldExpectation(false);
+        $this->assertTrue($expectation->test(false));
+    }
+    
+    function testMultipleValuesCanBeInAnyOrder() {
+        $expectation = new FieldExpectation(array('a', 'b'));
+        $this->assertTrue($expectation->test(array('a', 'b')));
+        $this->assertTrue($expectation->test(array('b', 'a')));
+        $this->assertFalse($expectation->test(array('a', 'a')));            
+        $this->assertFalse($expectation->test('a'));            
+    }
+    
+    function testSingleItemCanBeArrayOrString() {
+        $expectation = new FieldExpectation(array('a'));
+        $this->assertTrue($expectation->test(array('a')));
+        $this->assertTrue($expectation->test('a'));
+    }
+}
+
+class TestOfHeaderExpectations extends UnitTestCase {
+    
+    function testExpectingOnlyTheHeaderName() {
+        $expectation = new HttpHeaderExpectation('a');
+        $this->assertIdentical($expectation->test(false), false);
+        $this->assertIdentical($expectation->test('a: A'), true);
+        $this->assertIdentical($expectation->test('A: A'), true);
+        $this->assertIdentical($expectation->test('a: B'), true);
+        $this->assertIdentical($expectation->test(' a : A '), true);
+    }
+    
+    function testHeaderValueAsWell() {
+        $expectation = new HttpHeaderExpectation('a', 'A');
+        $this->assertIdentical($expectation->test(false), false);
+        $this->assertIdentical($expectation->test('a: A'), true);
+        $this->assertIdentical($expectation->test('A: A'), true);
+        $this->assertIdentical($expectation->test('A: a'), false);
+        $this->assertIdentical($expectation->test('a: B'), false);
+        $this->assertIdentical($expectation->test(' a : A '), true);
+        $this->assertIdentical($expectation->test(' a : AB '), false);
+    }
+    
+    function testHeaderValueWithColons() {
+        $expectation = new HttpHeaderExpectation('a', 'A:B:C');
+        $this->assertIdentical($expectation->test('a: A'), false);
+        $this->assertIdentical($expectation->test('a: A:B'), false);
+        $this->assertIdentical($expectation->test('a: A:B:C'), true);
+        $this->assertIdentical($expectation->test('a: A:B:C:D'), false);
+    }
+    
+    function testMultilineSearch() {
+        $expectation = new HttpHeaderExpectation('a', 'A');
+        $this->assertIdentical($expectation->test("aa: A\r\nb: B\r\nc: C"), false);
+        $this->assertIdentical($expectation->test("aa: A\r\na: A\r\nb: B"), true);
+    }
+    
+    function testMultilineSearchWithPadding() {
+        $expectation = new HttpHeaderExpectation('a', ' A ');
+        $this->assertIdentical($expectation->test("aa:A\r\nb:B\r\nc:C"), false);
+        $this->assertIdentical($expectation->test("aa:A\r\na:A\r\nb:B"), true);
+    }
+    
+    function testPatternMatching() {
+        $expectation = new HttpHeaderExpectation('a', new PatternExpectation('/A/'));
+        $this->assertIdentical($expectation->test('a: A'), true);
+        $this->assertIdentical($expectation->test('A: A'), true);
+        $this->assertIdentical($expectation->test('A: a'), false);
+        $this->assertIdentical($expectation->test('a: B'), false);
+        $this->assertIdentical($expectation->test(' a : A '), true);
+        $this->assertIdentical($expectation->test(' a : AB '), true);
+    }
+    
+    function testCaseInsensitivePatternMatching() {
+        $expectation = new HttpHeaderExpectation('a', new PatternExpectation('/A/i'));
+        $this->assertIdentical($expectation->test('a: a'), true);
+        $this->assertIdentical($expectation->test('a: B'), false);
+        $this->assertIdentical($expectation->test(' a : A '), true);
+        $this->assertIdentical($expectation->test(' a : BAB '), true);
+        $this->assertIdentical($expectation->test(' a : bab '), true);
+    }
+    
+    function testUnwantedHeader() {
+        $expectation = new NoHttpHeaderExpectation('a');
+        $this->assertIdentical($expectation->test(''), true);
+        $this->assertIdentical($expectation->test('stuff'), true);
+        $this->assertIdentical($expectation->test('b: B'), true);
+        $this->assertIdentical($expectation->test('a: A'), false);
+        $this->assertIdentical($expectation->test('A: A'), false);
+    }
+    
+    function testMultilineUnwantedSearch() {
+        $expectation = new NoHttpHeaderExpectation('a');
+        $this->assertIdentical($expectation->test("aa:A\r\nb:B\r\nc:C"), true);
+        $this->assertIdentical($expectation->test("aa:A\r\na:A\r\nb:B"), false);
+    }
+    
+    function testLocationHeaderSplitsCorrectly() {
+        $expectation = new HttpHeaderExpectation('Location', 'http://here/');
+        $this->assertIdentical($expectation->test('Location: http://here/'), true);
+    }
+}
+
+class TestOfTextExpectations extends UnitTestCase {
+    
+    function testMatchingSubString() {
+        $expectation = new TextExpectation('wanted');
+        $this->assertIdentical($expectation->test(''), false);
+        $this->assertIdentical($expectation->test('Wanted'), false);
+        $this->assertIdentical($expectation->test('wanted'), true);
+        $this->assertIdentical($expectation->test('the wanted text is here'), true);
+    }
+    
+    function testNotMatchingSubString() {
+        $expectation = new NoTextExpectation('wanted');
+        $this->assertIdentical($expectation->test(''), true);
+        $this->assertIdentical($expectation->test('Wanted'), true);
+        $this->assertIdentical($expectation->test('wanted'), false);
+        $this->assertIdentical($expectation->test('the wanted text is here'), false);
+    }
+}
+
+class TestOfGenericAssertionsInWebTester extends WebTestCase {
+    function testEquality() {
+        $this->assertEqual('a', 'a');
+        $this->assertNotEqual('a', 'A');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test/xml_test.php b/3rdparty/simpletest/test/xml_test.php
new file mode 100755
index 00000000000..f99e0dcd98b
--- /dev/null
+++ b/3rdparty/simpletest/test/xml_test.php
@@ -0,0 +1,187 @@
+<?php
+// $Id: xml_test.php 1787 2008-04-26 20:35:39Z pp11 $
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/../xml.php');
+Mock::generate('SimpleScorer');
+
+if (! function_exists('xml_parser_create')) {
+    SimpleTest::ignore('TestOfXmlStructureParsing');
+    SimpleTest::ignore('TestOfXmlResultsParsing');
+}
+
+class TestOfNestingTags extends UnitTestCase {
+    function testGroupSize() {
+        $nesting = new NestingGroupTag(array('SIZE' => 2));
+        $this->assertEqual($nesting->getSize(), 2);
+    }
+}
+
+class TestOfXmlStructureParsing extends UnitTestCase {
+    function testValidXml() {
+        $listener = new MockSimpleScorer();
+        $listener->expectNever('paintGroupStart');
+        $listener->expectNever('paintGroupEnd');
+        $listener->expectNever('paintCaseStart');
+        $listener->expectNever('paintCaseEnd');
+        $parser = new SimpleTestXmlParser($listener);
+        $this->assertTrue($parser->parse("<?xml version=\"1.0\"?>\n"));
+        $this->assertTrue($parser->parse("<run>\n"));
+        $this->assertTrue($parser->parse("</run>\n"));
+    }
+
+    function testEmptyGroup() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintGroupStart', array('a_group', 7));
+        $listener->expectOnce('paintGroupEnd', array('a_group'));
+        $parser = new SimpleTestXmlParser($listener);
+        $parser->parse("<?xml version=\"1.0\"?>\n");
+        $parser->parse("<run>\n");
+        $this->assertTrue($parser->parse("<group size=\"7\">\n"));
+        $this->assertTrue($parser->parse("<name>a_group</name>\n"));
+        $this->assertTrue($parser->parse("</group>\n"));
+        $parser->parse("</run>\n");
+    }
+
+    function testEmptyCase() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintCaseStart', array('a_case'));
+        $listener->expectOnce('paintCaseEnd', array('a_case'));
+        $parser = new SimpleTestXmlParser($listener);
+        $parser->parse("<?xml version=\"1.0\"?>\n");
+        $parser->parse("<run>\n");
+        $this->assertTrue($parser->parse("<case>\n"));
+        $this->assertTrue($parser->parse("<name>a_case</name>\n"));
+        $this->assertTrue($parser->parse("</case>\n"));
+        $parser->parse("</run>\n");
+    }
+
+    function testEmptyMethod() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintCaseStart', array('a_case'));
+        $listener->expectOnce('paintCaseEnd', array('a_case'));
+        $listener->expectOnce('paintMethodStart', array('a_method'));
+        $listener->expectOnce('paintMethodEnd', array('a_method'));
+        $parser = new SimpleTestXmlParser($listener);
+        $parser->parse("<?xml version=\"1.0\"?>\n");
+        $parser->parse("<run>\n");
+        $parser->parse("<case>\n");
+        $parser->parse("<name>a_case</name>\n");
+        $this->assertTrue($parser->parse("<test>\n"));
+        $this->assertTrue($parser->parse("<name>a_method</name>\n"));
+        $this->assertTrue($parser->parse("</test>\n"));
+        $parser->parse("</case>\n");
+        $parser->parse("</run>\n");
+    }
+
+    function testNestedGroup() {
+        $listener = new MockSimpleScorer();
+        $listener->expectAt(0, 'paintGroupStart', array('a_group', 7));
+        $listener->expectAt(1, 'paintGroupStart', array('b_group', 3));
+        $listener->expectCallCount('paintGroupStart', 2);
+        $listener->expectAt(0, 'paintGroupEnd', array('b_group'));
+        $listener->expectAt(1, 'paintGroupEnd', array('a_group'));
+        $listener->expectCallCount('paintGroupEnd', 2);
+
+        $parser = new SimpleTestXmlParser($listener);
+        $parser->parse("<?xml version=\"1.0\"?>\n");
+        $parser->parse("<run>\n");
+
+        $this->assertTrue($parser->parse("<group size=\"7\">\n"));
+        $this->assertTrue($parser->parse("<name>a_group</name>\n"));
+        $this->assertTrue($parser->parse("<group size=\"3\">\n"));
+        $this->assertTrue($parser->parse("<name>b_group</name>\n"));
+        $this->assertTrue($parser->parse("</group>\n"));
+        $this->assertTrue($parser->parse("</group>\n"));
+        $parser->parse("</run>\n");
+    }
+}
+
+class AnyOldSignal {
+    public $stuff = true;
+}
+
+class TestOfXmlResultsParsing extends UnitTestCase {
+
+    function sendValidStart(&$parser) {
+        $parser->parse("<?xml version=\"1.0\"?>\n");
+        $parser->parse("<run>\n");
+        $parser->parse("<case>\n");
+        $parser->parse("<name>a_case</name>\n");
+        $parser->parse("<test>\n");
+        $parser->parse("<name>a_method</name>\n");
+    }
+
+    function sendValidEnd(&$parser) {
+        $parser->parse("</test>\n");
+        $parser->parse("</case>\n");
+        $parser->parse("</run>\n");
+    }
+
+    function testPass() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintPass', array('a_message'));
+        $parser = new SimpleTestXmlParser($listener);
+        $this->sendValidStart($parser);
+        $this->assertTrue($parser->parse("<pass>a_message</pass>\n"));
+        $this->sendValidEnd($parser);
+    }
+
+    function testFail() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintFail', array('a_message'));
+        $parser = new SimpleTestXmlParser($listener);
+        $this->sendValidStart($parser);
+        $this->assertTrue($parser->parse("<fail>a_message</fail>\n"));
+        $this->sendValidEnd($parser);
+    }
+
+    function testException() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintError', array('a_message'));
+        $parser = new SimpleTestXmlParser($listener);
+        $this->sendValidStart($parser);
+        $this->assertTrue($parser->parse("<exception>a_message</exception>\n"));
+        $this->sendValidEnd($parser);
+    }
+
+    function testSkip() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintSkip', array('a_message'));
+        $parser = new SimpleTestXmlParser($listener);
+        $this->sendValidStart($parser);
+        $this->assertTrue($parser->parse("<skip>a_message</skip>\n"));
+        $this->sendValidEnd($parser);
+    }
+
+    function testSignal() {
+        $signal = new AnyOldSignal();
+        $signal->stuff = "Hello";
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintSignal', array('a_signal', $signal));
+        $parser = new SimpleTestXmlParser($listener);
+        $this->sendValidStart($parser);
+        $this->assertTrue($parser->parse(
+                "<signal type=\"a_signal\"><![CDATA[" .
+                serialize($signal) . "]]></signal>\n"));
+        $this->sendValidEnd($parser);
+    }
+
+    function testMessage() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintMessage', array('a_message'));
+        $parser = new SimpleTestXmlParser($listener);
+        $this->sendValidStart($parser);
+        $this->assertTrue($parser->parse("<message>a_message</message>\n"));
+        $this->sendValidEnd($parser);
+    }
+
+    function testFormattedMessage() {
+        $listener = new MockSimpleScorer();
+        $listener->expectOnce('paintFormattedMessage', array("\na\tmessage\n"));
+        $parser = new SimpleTestXmlParser($listener);
+        $this->sendValidStart($parser);
+        $this->assertTrue($parser->parse("<formatted><![CDATA[\na\tmessage\n]]></formatted>\n"));
+        $this->sendValidEnd($parser);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/test_case.php b/3rdparty/simpletest/test_case.php
new file mode 100644
index 00000000000..ba023c3b2ea
--- /dev/null
+++ b/3rdparty/simpletest/test_case.php
@@ -0,0 +1,658 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: test_case.php 2012 2011-04-29 08:57:00Z pp11 $
+ */
+
+/**#@+
+ * Includes SimpleTest files and defined the root constant
+ * for dependent libraries.
+ */
+require_once(dirname(__FILE__) . '/invoker.php');
+require_once(dirname(__FILE__) . '/errors.php');
+require_once(dirname(__FILE__) . '/compatibility.php');
+require_once(dirname(__FILE__) . '/scorer.php');
+require_once(dirname(__FILE__) . '/expectation.php');
+require_once(dirname(__FILE__) . '/dumper.php');
+require_once(dirname(__FILE__) . '/simpletest.php');
+require_once(dirname(__FILE__) . '/exceptions.php');
+require_once(dirname(__FILE__) . '/reflection_php5.php');
+/**#@-*/
+if (! defined('SIMPLE_TEST')) {
+    /**
+     * @ignore
+     */
+    define('SIMPLE_TEST', dirname(__FILE__) . DIRECTORY_SEPARATOR);
+}
+
+/**
+ *    Basic test case. This is the smallest unit of a test
+ *    suite. It searches for
+ *    all methods that start with the the string "test" and
+ *    runs them. Working test cases extend this class.
+ *    @package      SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleTestCase {
+    private $label = false;
+    protected $reporter;
+    private $observers;
+    private $should_skip = false;
+
+    /**
+     *    Sets up the test with no display.
+     *    @param string $label    If no test name is given then
+     *                            the class name is used.
+     *    @access public
+     */
+    function __construct($label = false) {
+        if ($label) {
+            $this->label = $label;
+        }
+    }
+
+    /**
+     *    Accessor for the test name for subclasses.
+     *    @return string           Name of the test.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->label ? $this->label : get_class($this);
+    }
+
+    /**
+     *    This is a placeholder for skipping tests. In this
+     *    method you place skipIf() and skipUnless() calls to
+     *    set the skipping state.
+     *    @access public
+     */
+    function skip() {
+    }
+
+    /**
+     *    Will issue a message to the reporter and tell the test
+     *    case to skip if the incoming flag is true.
+     *    @param string $should_skip    Condition causing the tests to be skipped.
+     *    @param string $message        Text of skip condition.
+     *    @access public
+     */
+    function skipIf($should_skip, $message = '%s') {
+        if ($should_skip && ! $this->should_skip) {
+            $this->should_skip = true;
+            $message = sprintf($message, 'Skipping [' . get_class($this) . ']');
+            $this->reporter->paintSkip($message . $this->getAssertionLine());
+        }
+    }
+
+    /**
+     *    Accessor for the private variable $_shoud_skip
+     *    @access public
+     */
+    function shouldSkip() {
+        return $this->should_skip;
+    }
+
+    /**
+     *    Will issue a message to the reporter and tell the test
+     *    case to skip if the incoming flag is false.
+     *    @param string $shouldnt_skip  Condition causing the tests to be run.
+     *    @param string $message        Text of skip condition.
+     *    @access public
+     */
+    function skipUnless($shouldnt_skip, $message = false) {
+        $this->skipIf(! $shouldnt_skip, $message);
+    }
+
+    /**
+     *    Used to invoke the single tests.
+     *    @return SimpleInvoker        Individual test runner.
+     *    @access public
+     */
+    function createInvoker() {
+        return new SimpleErrorTrappingInvoker(
+                new SimpleExceptionTrappingInvoker(new SimpleInvoker($this)));
+    }
+
+    /**
+     *    Uses reflection to run every method within itself
+     *    starting with the string "test" unless a method
+     *    is specified.
+     *    @param SimpleReporter $reporter    Current test reporter.
+     *    @return boolean                    True if all tests passed.
+     *    @access public
+     */
+    function run($reporter) {
+        $context = SimpleTest::getContext();
+        $context->setTest($this);
+        $context->setReporter($reporter);
+        $this->reporter = $reporter;
+        $started = false;
+        foreach ($this->getTests() as $method) {
+            if ($reporter->shouldInvoke($this->getLabel(), $method)) {
+                $this->skip();
+                if ($this->should_skip) {
+                    break;
+                }
+                if (! $started) {
+                    $reporter->paintCaseStart($this->getLabel());
+                    $started = true;
+                }
+                $invoker = $this->reporter->createInvoker($this->createInvoker());
+                $invoker->before($method);
+                $invoker->invoke($method);
+                $invoker->after($method);
+            }
+        }
+        if ($started) {
+            $reporter->paintCaseEnd($this->getLabel());
+        }
+        unset($this->reporter);
+        $context->setTest(null);
+        return $reporter->getStatus();
+    }
+
+    /**
+     *    Gets a list of test names. Normally that will
+     *    be all internal methods that start with the
+     *    name "test". This method should be overridden
+     *    if you want a different rule.
+     *    @return array        List of test names.
+     *    @access public
+     */
+    function getTests() {
+        $methods = array();
+        foreach (get_class_methods(get_class($this)) as $method) {
+            if ($this->isTest($method)) {
+                $methods[] = $method;
+            }
+        }
+        return $methods;
+    }
+
+    /**
+     *    Tests to see if the method is a test that should
+     *    be run. Currently any method that starts with 'test'
+     *    is a candidate unless it is the constructor.
+     *    @param string $method        Method name to try.
+     *    @return boolean              True if test method.
+     *    @access protected
+     */
+    protected function isTest($method) {
+        if (strtolower(substr($method, 0, 4)) == 'test') {
+            return ! SimpleTestCompatibility::isA($this, strtolower($method));
+        }
+        return false;
+    }
+
+    /**
+     *    Announces the start of the test.
+     *    @param string $method    Test method just started.
+     *    @access public
+     */
+    function before($method) {
+        $this->reporter->paintMethodStart($method);
+        $this->observers = array();
+    }
+
+    /**
+     *    Sets up unit test wide variables at the start
+     *    of each test method. To be overridden in
+     *    actual user test cases.
+     *    @access public
+     */
+    function setUp() {
+    }
+
+    /**
+     *    Clears the data set in the setUp() method call.
+     *    To be overridden by the user in actual user test cases.
+     *    @access public
+     */
+    function tearDown() {
+    }
+
+    /**
+     *    Announces the end of the test. Includes private clean up.
+     *    @param string $method    Test method just finished.
+     *    @access public
+     */
+    function after($method) {
+        for ($i = 0; $i < count($this->observers); $i++) {
+            $this->observers[$i]->atTestEnd($method, $this);
+        }
+        $this->reporter->paintMethodEnd($method);
+    }
+
+    /**
+     *    Sets up an observer for the test end.
+     *    @param object $observer    Must have atTestEnd()
+     *                               method.
+     *    @access public
+     */
+    function tell($observer) {
+        $this->observers[] = &$observer;
+    }
+
+    /**
+     *    @deprecated
+     */
+    function pass($message = "Pass") {
+        if (! isset($this->reporter)) {
+            trigger_error('Can only make assertions within test methods');
+        }
+        $this->reporter->paintPass(
+                $message . $this->getAssertionLine());
+        return true;
+    }
+
+    /**
+     *    Sends a fail event with a message.
+     *    @param string $message        Message to send.
+     *    @access public
+     */
+    function fail($message = "Fail") {
+        if (! isset($this->reporter)) {
+            trigger_error('Can only make assertions within test methods');
+        }
+        $this->reporter->paintFail(
+                $message . $this->getAssertionLine());
+        return false;
+    }
+
+    /**
+     *    Formats a PHP error and dispatches it to the
+     *    reporter.
+     *    @param integer $severity  PHP error code.
+     *    @param string $message    Text of error.
+     *    @param string $file       File error occoured in.
+     *    @param integer $line      Line number of error.
+     *    @access public
+     */
+    function error($severity, $message, $file, $line) {
+        if (! isset($this->reporter)) {
+            trigger_error('Can only make assertions within test methods');
+        }
+        $this->reporter->paintError(
+                "Unexpected PHP error [$message] severity [$severity] in [$file line $line]");
+    }
+
+    /**
+     *    Formats an exception and dispatches it to the
+     *    reporter.
+     *    @param Exception $exception    Object thrown.
+     *    @access public
+     */
+    function exception($exception) {
+        $this->reporter->paintException($exception);
+    }
+
+    /**
+     *    For user defined expansion of the available messages.
+     *    @param string $type       Tag for sorting the signals.
+     *    @param mixed $payload     Extra user specific information.
+     */
+    function signal($type, $payload) {
+        if (! isset($this->reporter)) {
+            trigger_error('Can only make assertions within test methods');
+        }
+        $this->reporter->paintSignal($type, $payload);
+    }
+
+    /**
+     *    Runs an expectation directly, for extending the
+     *    tests with new expectation classes.
+     *    @param SimpleExpectation $expectation  Expectation subclass.
+     *    @param mixed $compare               Value to compare.
+     *    @param string $message                 Message to display.
+     *    @return boolean                        True on pass
+     *    @access public
+     */
+    function assert($expectation, $compare, $message = '%s') {
+        if ($expectation->test($compare)) {
+            return $this->pass(sprintf(
+                    $message,
+                    $expectation->overlayMessage($compare, $this->reporter->getDumper())));
+        } else {
+            return $this->fail(sprintf(
+                    $message,
+                    $expectation->overlayMessage($compare, $this->reporter->getDumper())));
+        }
+    }
+
+    /**
+     *    Uses a stack trace to find the line of an assertion.
+     *    @return string           Line number of first assert*
+     *                             method embedded in format string.
+     *    @access public
+     */
+    function getAssertionLine() {
+        $trace = new SimpleStackTrace(array('assert', 'expect', 'pass', 'fail', 'skip'));
+        return $trace->traceMethod();
+    }
+
+    /**
+     *    Sends a formatted dump of a variable to the
+     *    test suite for those emergency debugging
+     *    situations.
+     *    @param mixed $variable    Variable to display.
+     *    @param string $message    Message to display.
+     *    @return mixed             The original variable.
+     *    @access public
+     */
+    function dump($variable, $message = false) {
+        $dumper = $this->reporter->getDumper();
+        $formatted = $dumper->dump($variable);
+        if ($message) {
+            $formatted = $message . "\n" . $formatted;
+        }
+        $this->reporter->paintFormattedMessage($formatted);
+        return $variable;
+    }
+
+    /**
+     *    Accessor for the number of subtests including myelf.
+     *    @return integer           Number of test cases.
+     *    @access public
+     */
+    function getSize() {
+        return 1;
+    }
+}
+
+/**
+ *  Helps to extract test cases automatically from a file.
+ *    @package      SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleFileLoader {
+
+    /**
+     *    Builds a test suite from a library of test cases.
+     *    The new suite is composed into this one.
+     *    @param string $test_file        File name of library with
+     *                                    test case classes.
+     *    @return TestSuite               The new test suite.
+     *    @access public
+     */
+    function load($test_file) {
+        $existing_classes = get_declared_classes();
+        $existing_globals = get_defined_vars();
+        include_once($test_file);
+        $new_globals = get_defined_vars();
+        $this->makeFileVariablesGlobal($existing_globals, $new_globals);
+        $new_classes = array_diff(get_declared_classes(), $existing_classes);
+        if (empty($new_classes)) {
+            $new_classes = $this->scrapeClassesFromFile($test_file);
+        }
+        $classes = $this->selectRunnableTests($new_classes);
+        return $this->createSuiteFromClasses($test_file, $classes);
+    }
+
+    /**
+     *    Imports new variables into the global namespace.
+     *    @param hash $existing   Variables before the file was loaded.
+     *    @param hash $new        Variables after the file was loaded.
+     *    @access private
+     */
+    protected function makeFileVariablesGlobal($existing, $new) {
+        $globals = array_diff(array_keys($new), array_keys($existing));
+        foreach ($globals as $global) {
+            $GLOBALS[$global] = $new[$global];
+        }
+    }
+
+    /**
+     *    Lookup classnames from file contents, in case the
+     *    file may have been included before.
+     *    Note: This is probably too clever by half. Figuring this
+     *    out after a failed test case is going to be tricky for us,
+     *    never mind the user. A test case should not be included
+     *    twice anyway.
+     *    @param string $test_file        File name with classes.
+     *    @access private
+     */
+    protected function scrapeClassesFromFile($test_file) {
+        preg_match_all('~^\s*class\s+(\w+)(\s+(extends|implements)\s+\w+)*\s*\{~mi',
+                        file_get_contents($test_file),
+                        $matches );
+        return $matches[1];
+    }
+
+    /**
+     *    Calculates the incoming test cases. Skips abstract
+     *    and ignored classes.
+     *    @param array $candidates   Candidate classes.
+     *    @return array              New classes which are test
+     *                               cases that shouldn't be ignored.
+     *    @access public
+     */
+    function selectRunnableTests($candidates) {
+        $classes = array();
+        foreach ($candidates as $class) {
+            if (TestSuite::getBaseTestCase($class)) {
+                $reflection = new SimpleReflection($class);
+                if ($reflection->isAbstract()) {
+                    SimpleTest::ignore($class);
+                } else {
+                    $classes[] = $class;
+                }
+            }
+        }
+        return $classes;
+    }
+
+    /**
+     *    Builds a test suite from a class list.
+     *    @param string $title       Title of new group.
+     *    @param array $classes      Test classes.
+     *    @return TestSuite          Group loaded with the new
+     *                               test cases.
+     *    @access public
+     */
+    function createSuiteFromClasses($title, $classes) {
+        if (count($classes) == 0) {
+            $suite = new BadTestSuite($title, "No runnable test cases in [$title]");
+            return $suite;
+        }
+        SimpleTest::ignoreParentsIfIgnored($classes);
+        $suite = new TestSuite($title);
+        foreach ($classes as $class) {
+            if (! SimpleTest::isIgnored($class)) {
+                $suite->add($class);
+            }
+        }
+        return $suite;
+    }
+}
+
+/**
+ *    This is a composite test class for combining
+ *    test cases and other RunnableTest classes into
+ *    a group test.
+ *    @package      SimpleTest
+ *    @subpackage   UnitTester
+ */
+class TestSuite {
+    private $label;
+    private $test_cases;
+
+    /**
+     *    Sets the name of the test suite.
+     *    @param string $label    Name sent at the start and end
+     *                            of the test.
+     *    @access public
+     */
+    function TestSuite($label = false) {
+        $this->label = $label;
+        $this->test_cases = array();
+    }
+
+    /**
+     *    Accessor for the test name for subclasses. If the suite
+     *    wraps a single test case the label defaults to the name of that test.
+     *    @return string           Name of the test.
+     *    @access public
+     */
+    function getLabel() {
+        if (! $this->label) {
+            return ($this->getSize() == 1) ?
+                    get_class($this->test_cases[0]) : get_class($this);
+        } else {
+            return $this->label;
+        }
+    }
+
+    /**
+     *    Adds a test into the suite by instance or class. The class will
+     *    be instantiated if it's a test suite.
+     *    @param SimpleTestCase $test_case  Suite or individual test
+     *                                      case implementing the
+     *                                      runnable test interface.
+     *    @access public
+     */
+    function add($test_case) {
+        if (! is_string($test_case)) {
+            $this->test_cases[] = $test_case;
+        } elseif (TestSuite::getBaseTestCase($test_case) == 'testsuite') {
+            $this->test_cases[] = new $test_case();
+        } else {
+            $this->test_cases[] = $test_case;
+        }
+    }
+
+    /**
+     *    Builds a test suite from a library of test cases.
+     *    The new suite is composed into this one.
+     *    @param string $test_file        File name of library with
+     *                                    test case classes.
+     *    @access public
+     */
+    function addFile($test_file) {
+        $extractor = new SimpleFileLoader();
+        $this->add($extractor->load($test_file));
+    }
+
+    /**
+     *    Delegates to a visiting collector to add test
+     *    files.
+     *    @param string $path                  Path to scan from.
+     *    @param SimpleCollector $collector    Directory scanner.
+     *    @access public
+     */
+    function collect($path, $collector) {
+        $collector->collect($this, $path);
+    }
+
+    /**
+     *    Invokes run() on all of the held test cases, instantiating
+     *    them if necessary.
+     *    @param SimpleReporter $reporter    Current test reporter.
+     *    @access public
+     */
+    function run($reporter) {
+        $reporter->paintGroupStart($this->getLabel(), $this->getSize());
+        for ($i = 0, $count = count($this->test_cases); $i < $count; $i++) {
+            if (is_string($this->test_cases[$i])) {
+                $class = $this->test_cases[$i];
+                $test = new $class();
+                $test->run($reporter);
+                unset($test);
+            } else {
+                $this->test_cases[$i]->run($reporter);
+            }
+        }
+        $reporter->paintGroupEnd($this->getLabel());
+        return $reporter->getStatus();
+    }
+
+    /**
+     *    Number of contained test cases.
+     *    @return integer     Total count of cases in the group.
+     *    @access public
+     */
+    function getSize() {
+        $count = 0;
+        foreach ($this->test_cases as $case) {
+            if (is_string($case)) {
+                if (! SimpleTest::isIgnored($case)) {
+                    $count++;
+                }
+            } else {
+                $count += $case->getSize();
+            }
+        }
+        return $count;
+    }
+
+    /**
+     *    Test to see if a class is derived from the
+     *    SimpleTestCase class.
+     *    @param string $class     Class name.
+     *    @access public
+     */
+    static function getBaseTestCase($class) {
+        while ($class = get_parent_class($class)) {
+            $class = strtolower($class);
+            if ($class == 'simpletestcase' || $class == 'testsuite') {
+                return $class;
+            }
+        }
+        return false;
+    }
+}
+
+/**
+ *    This is a failing group test for when a test suite hasn't
+ *    loaded properly.
+ *    @package      SimpleTest
+ *    @subpackage   UnitTester
+ */
+class BadTestSuite {
+    private $label;
+    private $error;
+
+    /**
+     *    Sets the name of the test suite and error message.
+     *    @param string $label    Name sent at the start and end
+     *                            of the test.
+     *    @access public
+     */
+    function BadTestSuite($label, $error) {
+        $this->label = $label;
+        $this->error = $error;
+    }
+
+    /**
+     *    Accessor for the test name for subclasses.
+     *    @return string           Name of the test.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->label;
+    }
+
+    /**
+     *    Sends a single error to the reporter.
+     *    @param SimpleReporter $reporter    Current test reporter.
+     *    @access public
+     */
+    function run($reporter) {
+        $reporter->paintGroupStart($this->getLabel(), $this->getSize());
+        $reporter->paintFail('Bad TestSuite [' . $this->getLabel() .
+                '] with error [' . $this->error . ']');
+        $reporter->paintGroupEnd($this->getLabel());
+        return $reporter->getStatus();
+    }
+
+    /**
+     *    Number of contained test cases. Always zero.
+     *    @return integer     Total count of cases in the group.
+     *    @access public
+     */
+    function getSize() {
+        return 0;
+    }
+}
+?>
diff --git a/3rdparty/simpletest/tidy_parser.php b/3rdparty/simpletest/tidy_parser.php
new file mode 100755
index 00000000000..3d8b4b2ac7d
--- /dev/null
+++ b/3rdparty/simpletest/tidy_parser.php
@@ -0,0 +1,382 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: php_parser.php 1911 2009-07-29 16:38:04Z lastcraft $
+ */
+
+/**
+ *    Builds the page object.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTidyPageBuilder {
+    private $page;
+    private $forms = array();
+    private $labels = array();
+    private $widgets_by_id = array();
+
+    public function __destruct() {
+        $this->free();
+    }
+
+    /**
+     *    Frees up any references so as to allow the PHP garbage
+     *    collection from unset() to work.
+     */
+    private function free() {
+        unset($this->page);
+        $this->forms = array();
+        $this->labels = array();
+    }
+
+    /**
+     *    This builder is only available if the 'tidy' extension is loaded.
+     *    @return boolean       True if available.
+     */
+    function can() {
+        return extension_loaded('tidy');
+    }
+
+    /**
+     *    Reads the raw content the page using HTML Tidy.
+     *    @param $response SimpleHttpResponse  Fetched response.
+     *    @return SimplePage                   Newly parsed page.
+     */
+    function parse($response) {
+        $this->page = new SimplePage($response);
+        $tidied = tidy_parse_string($input = $this->insertGuards($response->getContent()),
+                                    array('output-xml' => false, 'wrap' => '0', 'indent' => 'no'),
+                                    'latin1');
+        $this->walkTree($tidied->html());
+        $this->attachLabels($this->widgets_by_id, $this->labels);
+        $this->page->setForms($this->forms);
+        $page = $this->page;
+        $this->free();
+        return $page;
+    }
+
+    /**
+     *    Stops HTMLTidy stripping content that we wish to preserve.
+     *    @param string      The raw html.
+     *    @return string     The html with guard tags inserted.
+     */
+    private function insertGuards($html) {
+        return $this->insertEmptyTagGuards($this->insertTextareaSimpleWhitespaceGuards($html));
+    }
+
+    /**
+     *    Removes the extra content added during the parse stage
+     *    in order to preserve content we don't want stripped
+     *    out by HTMLTidy.
+     *    @param string      The raw html.
+     *    @return string     The html with guard tags removed.
+     */
+    private function stripGuards($html) {
+        return $this->stripTextareaWhitespaceGuards($this->stripEmptyTagGuards($html));
+    }
+
+    /**
+     *    HTML tidy strips out empty tags such as <option> which we
+     *    need to preserve. This method inserts an additional marker.
+     *    @param string      The raw html.
+     *    @return string     The html with guards inserted.
+     */
+    private function insertEmptyTagGuards($html) {
+        return preg_replace('#<(option|textarea)([^>]*)>(\s*)</(option|textarea)>#is',
+                            '<\1\2>___EMPTY___\3</\4>',
+                            $html);
+    }
+
+    /**
+     *    HTML tidy strips out empty tags such as <option> which we
+     *    need to preserve. This method strips additional markers
+     *    inserted by SimpleTest to the tidy output used to make the
+     *    tags non-empty. This ensures their preservation.
+     *    @param string      The raw html.
+     *    @return string     The html with guards removed.
+     */
+    private function stripEmptyTagGuards($html) {
+        return preg_replace('#(^|>)(\s*)___EMPTY___(\s*)(</|$)#i', '\2\3', $html);
+    }
+
+    /**
+     *    By parsing the XML output of tidy, we lose some whitespace
+     *    information in textarea tags. We temporarily recode this
+     *    data ourselves so as not to lose it.
+     *    @param string      The raw html.
+     *    @return string     The html with guards inserted.
+     */
+    private function insertTextareaSimpleWhitespaceGuards($html) {
+        return preg_replace_callback('#<textarea([^>]*)>(.*?)</textarea>#is',
+                                     array($this, 'insertWhitespaceGuards'),
+                                     $html);
+    }
+
+    /**
+     *  Callback for insertTextareaSimpleWhitespaceGuards().
+     *  @param array $matches       Result of preg_replace_callback().
+     *  @return string              Guard tags now replace whitespace.
+     */
+    private function insertWhitespaceGuards($matches) {
+        return '<textarea' . $matches[1] . '>' .
+                str_replace(array("\n", "\r", "\t", ' '),
+                            array('___NEWLINE___', '___CR___', '___TAB___', '___SPACE___'),
+                            $matches[2]) .
+                '</textarea>';
+    }
+
+    /**
+     *    Removes the whitespace preserving guards we added
+     *    before parsing.
+     *    @param string      The raw html.
+     *    @return string     The html with guards removed.
+     */
+    private function stripTextareaWhitespaceGuards($html) {
+        return str_replace(array('___NEWLINE___', '___CR___', '___TAB___', '___SPACE___'),
+                           array("\n", "\r", "\t", ' '),
+                           $html);
+    }
+
+    /**
+     *  Visits the given node and all children
+     *  @param object $node      Tidy XML node.
+     */
+    private function walkTree($node) {
+        if ($node->name == 'a') {
+            $this->page->addLink($this->tags()->createTag($node->name, (array)$node->attribute)
+                                        ->addContent($this->innerHtml($node)));
+        } elseif ($node->name == 'base' and isset($node->attribute['href'])) {
+            $this->page->setBase($node->attribute['href']);
+        } elseif ($node->name == 'title') {
+            $this->page->setTitle($this->tags()->createTag($node->name, (array)$node->attribute)
+                                         ->addContent($this->innerHtml($node)));
+        } elseif ($node->name == 'frameset') {
+            $this->page->setFrames($this->collectFrames($node));
+        } elseif ($node->name == 'form') {
+            $this->forms[] = $this->walkForm($node, $this->createEmptyForm($node));
+        } elseif ($node->name == 'label') {
+            $this->labels[] = $this->tags()->createTag($node->name, (array)$node->attribute)
+                                           ->addContent($this->innerHtml($node));
+        } else {
+            $this->walkChildren($node);
+        }
+    }
+
+    /**
+     *  Helper method for traversing the XML tree.
+     *  @param object $node     Tidy XML node.
+     */
+    private function walkChildren($node) {
+        if ($node->hasChildren()) {
+            foreach ($node->child as $child) {
+                $this->walkTree($child);
+            }
+        }
+    }
+
+    /**
+     *  Facade for forms containing preparsed widgets.
+     *  @param object $node     Tidy XML node.
+     *  @return SimpleForm      Facade for SimpleBrowser.
+     */
+    private function createEmptyForm($node) {
+        return new SimpleForm($this->tags()->createTag($node->name, (array)$node->attribute), $this->page);
+    }
+
+    /**
+     *  Visits the given node and all children
+     *  @param object $node      Tidy XML node.
+     */
+    private function walkForm($node, $form, $enclosing_label = '') {
+        if ($node->name == 'a') {
+            $this->page->addLink($this->tags()->createTag($node->name, (array)$node->attribute)
+                                              ->addContent($this->innerHtml($node)));
+        } elseif (in_array($node->name, array('input', 'button', 'textarea', 'select'))) {
+            $this->addWidgetToForm($node, $form, $enclosing_label);
+        } elseif ($node->name == 'label') {
+            $this->labels[] = $this->tags()->createTag($node->name, (array)$node->attribute)
+                                           ->addContent($this->innerHtml($node));
+            if ($node->hasChildren()) {
+                foreach ($node->child as $child) {
+                    $this->walkForm($child, $form, SimplePage::normalise($this->innerHtml($node)));
+                }
+            }
+        } elseif ($node->hasChildren()) {
+            foreach ($node->child as $child) {
+                $this->walkForm($child, $form);
+            }
+        }
+        return $form;
+    }
+
+    /**
+     *  Tests a node for a "for" atribute. Used for
+     *  attaching labels.
+     *  @param object $node      Tidy XML node.
+     *  @return boolean          True if the "for" attribute exists.
+     */
+    private function hasFor($node) {
+        return isset($node->attribute) and $node->attribute['for'];
+    }
+
+    /**
+     *  Adds the widget into the form container.
+     *  @param object $node             Tidy XML node of widget.
+     *  @param SimpleForm $form         Form to add it to.
+     *  @param string $enclosing_label  The label of any label
+     *                                  tag we might be in.
+     */
+    private function addWidgetToForm($node, $form, $enclosing_label) {
+        $widget = $this->tags()->createTag($node->name, $this->attributes($node));
+        if (! $widget) {
+            return;
+        }
+        $widget->setLabel($enclosing_label)
+               ->addContent($this->innerHtml($node));
+        if ($node->name == 'select') {
+            $widget->addTags($this->collectSelectOptions($node));
+        }
+        $form->addWidget($widget);
+        $this->indexWidgetById($widget);
+    }
+
+    /**
+     *  Fills the widget cache to speed up searching.
+     *  @param SimpleTag $widget    Parsed widget to cache.
+     */
+    private function indexWidgetById($widget) {
+        $id = $widget->getAttribute('id');
+        if (! $id) {
+            return;
+        }
+        if (! isset($this->widgets_by_id[$id])) {
+            $this->widgets_by_id[$id] = array();
+        }
+        $this->widgets_by_id[$id][] = $widget;
+    }
+
+    /**
+     *  Parses the options from inside an XML select node.
+     *  @param object $node      Tidy XML node.
+     *  @return array            List of SimpleTag options.
+     */
+    private function collectSelectOptions($node) {
+        $options = array();
+        if ($node->name == 'option') {
+            $options[] = $this->tags()->createTag($node->name, $this->attributes($node))
+                                      ->addContent($this->innerHtml($node));
+        }
+        if ($node->hasChildren()) {
+            foreach ($node->child as $child) {
+                $options = array_merge($options, $this->collectSelectOptions($child));
+            }
+        }
+        return $options;
+    }
+
+    /**
+     *  Convenience method for collecting all the attributes
+     *  of a tag. Not sure why Tidy does not have this.
+     *  @param object $node      Tidy XML node.
+     *  @return array            Hash of attribute strings.
+     */
+    private function attributes($node) {
+        if (! preg_match('|<[^ ]+\s(.*?)/?>|s', $node->value, $first_tag_contents)) {
+            return array();
+        }
+        $attributes = array();
+        preg_match_all('/\S+\s*=\s*\'[^\']*\'|(\S+\s*=\s*"[^"]*")|([^ =]+\s*=\s*[^ "\']+?)|[^ "\']+/', $first_tag_contents[1], $matches);
+        foreach($matches[0] as $unparsed) {
+            $attributes = $this->mergeAttribute($attributes, $unparsed);
+        }
+        return $attributes;
+    }
+
+    /**
+     *  Overlay an attribute into the attributes hash.
+     *  @param array $attributes        Current attribute list.
+     *  @param string $raw              Raw attribute string with
+     *                                  both key and value.
+     *  @return array                   New attribute hash.
+     */
+    private function mergeAttribute($attributes, $raw) {
+        $parts = explode('=', $raw);
+        list($name, $value) = count($parts) == 1 ? array($parts[0], $parts[0]) : $parts;
+        $attributes[trim($name)] = html_entity_decode($this->dequote(trim($value)), ENT_QUOTES);
+        return $attributes;
+    }
+
+    /**
+     *  Remove start and end quotes.
+     *  @param string $quoted    A quoted string.
+     *  @return string           Quotes are gone.
+     */
+    private function dequote($quoted) {
+        if (preg_match('/^(\'([^\']*)\'|"([^"]*)")$/', $quoted, $matches)) {
+            return isset($matches[3]) ? $matches[3] : $matches[2];
+        }
+        return $quoted;
+    }
+
+    /**
+     *  Collects frame information inside a frameset tag.
+     *  @param object $node     Tidy XML node.
+     *  @return array           List of SimpleTag frame descriptions.
+     */
+    private function collectFrames($node) {
+        $frames = array();
+        if ($node->name == 'frame') {
+            $frames = array($this->tags()->createTag($node->name, (array)$node->attribute));
+        } else if ($node->hasChildren()) {
+            $frames = array();
+            foreach ($node->child as $child) {
+                $frames = array_merge($frames, $this->collectFrames($child));
+            }
+        }
+        return $frames;
+    }
+
+    /**
+     *  Extracts the XML node text.
+     *  @param object $node     Tidy XML node.
+     *  @return string          The text only.
+     */
+    private function innerHtml($node) {
+        $raw = '';
+        if ($node->hasChildren()) {
+            foreach ($node->child as $child) {
+                $raw .= $child->value;
+            }
+        }
+        return $this->stripGuards($raw);
+    }
+
+    /**
+     *  Factory for parsed content holders.
+     *  @return SimpleTagBuilder    Factory.
+     */
+    private function tags() {
+        return new SimpleTagBuilder();
+    }
+
+    /**
+     *  Called at the end of a parse run. Attaches any
+     *  non-wrapping labels to their form elements.
+     *  @param array $widgets_by_id     Cached SimpleTag hash.
+     *  @param array $labels            SimpleTag label elements.
+     */
+    private function attachLabels($widgets_by_id, $labels) {
+        foreach ($labels as $label) {
+            $for = $label->getFor();
+            if ($for and isset($widgets_by_id[$for])) {
+                $text = $label->getText();
+                foreach ($widgets_by_id[$for] as $widget) {
+                    $widget->setLabel($text);
+                }
+            }
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/unit_tester.php b/3rdparty/simpletest/unit_tester.php
new file mode 100755
index 00000000000..ce82660afa2
--- /dev/null
+++ b/3rdparty/simpletest/unit_tester.php
@@ -0,0 +1,413 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: unit_tester.php 1882 2009-07-01 14:30:05Z lastcraft $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/test_case.php');
+require_once(dirname(__FILE__) . '/dumper.php');
+/**#@-*/
+
+/**
+ *    Standard unit test class for day to day testing
+ *    of PHP code XP style. Adds some useful standard
+ *    assertions.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class UnitTestCase extends SimpleTestCase {
+
+    /**
+     *    Creates an empty test case. Should be subclassed
+     *    with test methods for a functional test case.
+     *    @param string $label     Name of test case. Will use
+     *                             the class name if none specified.
+     *    @access public
+     */
+    function __construct($label = false) {
+        if (! $label) {
+            $label = get_class($this);
+        }
+        parent::__construct($label);
+    }
+
+    /**
+     *    Called from within the test methods to register
+     *    passes and failures.
+     *    @param boolean $result    Pass on true.
+     *    @param string $message    Message to display describing
+     *                              the test state.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertTrue($result, $message = '%s') {
+        return $this->assert(new TrueExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will be true on false and vice versa. False
+     *    is the PHP definition of false, so that null,
+     *    empty strings, zero and an empty array all count
+     *    as false.
+     *    @param boolean $result    Pass on false.
+     *    @param string $message    Message to display.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertFalse($result, $message = '%s') {
+        return $this->assert(new FalseExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will be true if the value is null.
+     *    @param null $value       Supposedly null value.
+     *    @param string $message   Message to display.
+     *    @return boolean                        True on pass
+     *    @access public
+     */
+    function assertNull($value, $message = '%s') {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                '[' . $dumper->describeValue($value) . '] should be null');
+        return $this->assertTrue(! isset($value), $message);
+    }
+
+    /**
+     *    Will be true if the value is set.
+     *    @param mixed $value           Supposedly set value.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass.
+     *    @access public
+     */
+    function assertNotNull($value, $message = '%s') {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                '[' . $dumper->describeValue($value) . '] should not be null');
+        return $this->assertTrue(isset($value), $message);
+    }
+
+    /**
+     *    Type and class test. Will pass if class
+     *    matches the type name or is a subclass or
+     *    if not an object, but the type is correct.
+     *    @param mixed $object         Object to test.
+     *    @param string $type          Type name as string.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass.
+     *    @access public
+     */
+    function assertIsA($object, $type, $message = '%s') {
+        return $this->assert(
+                new IsAExpectation($type),
+                $object,
+                $message);
+    }
+
+    /**
+     *    Type and class mismatch test. Will pass if class
+     *    name or underling type does not match the one
+     *    specified.
+     *    @param mixed $object         Object to test.
+     *    @param string $type          Type name as string.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass.
+     *    @access public
+     */
+    function assertNotA($object, $type, $message = '%s') {
+        return $this->assert(
+                new NotAExpectation($type),
+                $object,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    the same value only. Otherwise a fail.
+     *    @param mixed $first          Value to compare.
+     *    @param mixed $second         Value to compare.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass
+     *    @access public
+     */
+    function assertEqual($first, $second, $message = '%s') {
+        return $this->assert(
+                new EqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    a different value. Otherwise a fail.
+     *    @param mixed $first           Value to compare.
+     *    @param mixed $second          Value to compare.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertNotEqual($first, $second, $message = '%s') {
+        return $this->assert(
+                new NotEqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the if the first parameter
+     *    is near enough to the second by the margin.
+     *    @param mixed $first          Value to compare.
+     *    @param mixed $second         Value to compare.
+     *    @param mixed $margin         Fuzziness of match.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass
+     *    @access public
+     */
+    function assertWithinMargin($first, $second, $margin, $message = '%s') {
+        return $this->assert(
+                new WithinMarginExpectation($first, $margin),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters differ
+     *    by more than the margin.
+     *    @param mixed $first          Value to compare.
+     *    @param mixed $second         Value to compare.
+     *    @param mixed $margin         Fuzziness of match.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass
+     *    @access public
+     */
+    function assertOutsideMargin($first, $second, $margin, $message = '%s') {
+        return $this->assert(
+                new OutsideMarginExpectation($first, $margin),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    the same value and same type. Otherwise a fail.
+     *    @param mixed $first           Value to compare.
+     *    @param mixed $second          Value to compare.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertIdentical($first, $second, $message = '%s') {
+        return $this->assert(
+                new IdenticalExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    the different value or different type.
+     *    @param mixed $first           Value to compare.
+     *    @param mixed $second          Value to compare.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertNotIdentical($first, $second, $message = '%s') {
+        return $this->assert(
+                new NotIdenticalExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if both parameters refer
+     *    to the same object or value. Fail otherwise.
+     *    This will cause problems testing objects under
+     *    E_STRICT.
+     *    TODO: Replace with expectation.
+     *    @param mixed $first           Reference to check.
+     *    @param mixed $second          Hopefully the same variable.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertReference(&$first, &$second, $message = '%s') {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                '[' . $dumper->describeValue($first) .
+                        '] and [' . $dumper->describeValue($second) .
+                        '] should reference the same object');
+        return $this->assertTrue(
+                SimpleTestCompatibility::isReference($first, $second),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if both parameters refer
+     *    to the same object. Fail otherwise. This has
+     *    the same semantics at the PHPUnit assertSame.
+     *    That is, if values are passed in it has roughly
+     *    the same affect as assertIdentical.
+     *    TODO: Replace with expectation.
+     *    @param mixed $first           Object reference to check.
+     *    @param mixed $second          Hopefully the same object.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertSame($first, $second, $message = '%s') {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                '[' . $dumper->describeValue($first) .
+                        '] and [' . $dumper->describeValue($second) .
+                        '] should reference the same object');
+        return $this->assertTrue($first === $second, $message);
+    }
+
+    /**
+     *    Will trigger a pass if both parameters refer
+     *    to different objects. Fail otherwise. The objects
+     *    have to be identical though.
+     *    @param mixed $first           Object reference to check.
+     *    @param mixed $second          Hopefully not the same object.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertClone($first, $second, $message = '%s') {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                '[' . $dumper->describeValue($first) .
+                        '] and [' . $dumper->describeValue($second) .
+                        '] should not be the same object');
+        $identical = new IdenticalExpectation($first);
+        return $this->assertTrue(
+                $identical->test($second) && ! ($first === $second),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if both parameters refer
+     *    to different variables. Fail otherwise. The objects
+     *    have to be identical references though.
+     *    This will fail under E_STRICT with objects. Use
+     *    assertClone() for this.
+     *    @param mixed $first           Object reference to check.
+     *    @param mixed $second          Hopefully not the same object.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertCopy(&$first, &$second, $message = "%s") {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                "[" . $dumper->describeValue($first) .
+                        "] and [" . $dumper->describeValue($second) .
+                        "] should not be the same object");
+        return $this->assertFalse(
+                SimpleTestCompatibility::isReference($first, $second),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the Perl regex pattern
+     *    is found in the subject. Fail otherwise.
+     *    @param string $pattern    Perl regex to look for including
+     *                              the regex delimiters.
+     *    @param string $subject    String to search in.
+     *    @param string $message    Message to display.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertPattern($pattern, $subject, $message = '%s') {
+        return $this->assert(
+                new PatternExpectation($pattern),
+                $subject,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the perl regex pattern
+     *    is not present in subject. Fail if found.
+     *    @param string $pattern    Perl regex to look for including
+     *                              the regex delimiters.
+     *    @param string $subject    String to search in.
+     *    @param string $message    Message to display.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertNoPattern($pattern, $subject, $message = '%s') {
+        return $this->assert(
+                new NoPatternExpectation($pattern),
+                $subject,
+                $message);
+    }
+
+    /**
+     *    Prepares for an error. If the error mismatches it
+     *    passes through, otherwise it is swallowed. Any
+     *    left over errors trigger failures.
+     *    @param SimpleExpectation/string $expected   The error to match.
+     *    @param string $message                      Message on failure.
+     *    @access public
+     */
+    function expectError($expected = false, $message = '%s') {
+        $queue = SimpleTest::getContext()->get('SimpleErrorQueue');
+        $queue->expectError($this->coerceExpectation($expected), $message);
+    }
+
+    /**
+     *    Prepares for an exception. If the error mismatches it
+     *    passes through, otherwise it is swallowed. Any
+     *    left over errors trigger failures.
+     *    @param SimpleExpectation/Exception $expected  The error to match.
+     *    @param string $message                        Message on failure.
+     *    @access public
+     */
+    function expectException($expected = false, $message = '%s') {
+        $queue = SimpleTest::getContext()->get('SimpleExceptionTrap');
+        $line = $this->getAssertionLine();
+        $queue->expectException($expected, $message . $line);
+    }
+
+    /**
+     *    Tells SimpleTest to ignore an upcoming exception as not relevant
+     *    to the current test. It doesn't affect the test, whether thrown or
+     *    not.
+     *    @param SimpleExpectation/Exception $ignored  The error to ignore.
+     *    @access public
+     */
+    function ignoreException($ignored = false) {
+        SimpleTest::getContext()->get('SimpleExceptionTrap')->ignoreException($ignored);
+    }
+
+    /**
+     *    Creates an equality expectation if the
+     *    object/value is not already some type
+     *    of expectation.
+     *    @param mixed $expected      Expected value.
+     *    @return SimpleExpectation   Expectation object.
+     *    @access private
+     */
+    protected function coerceExpectation($expected) {
+        if ($expected == false) {
+            return new TrueExpectation();
+        }
+        if (SimpleTestCompatibility::isA($expected, 'SimpleExpectation')) {
+            return $expected;
+        }
+        return new EqualExpectation(
+                is_string($expected) ? str_replace('%', '%%', $expected) : $expected);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/url.php b/3rdparty/simpletest/url.php
new file mode 100644
index 00000000000..11d70e745ee
--- /dev/null
+++ b/3rdparty/simpletest/url.php
@@ -0,0 +1,550 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: url.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/encoding.php');
+/**#@-*/
+
+/**
+ *    URL parser to replace parse_url() PHP function which
+ *    got broken in PHP 4.3.0. Adds some browser specific
+ *    functionality such as expandomatics.
+ *    Guesses a bit trying to separate the host from
+ *    the path and tries to keep a raw, possibly unparsable,
+ *    request string as long as possible.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleUrl {
+    private $scheme;
+    private $username;
+    private $password;
+    private $host;
+    private $port;
+    public $path;
+    private $request;
+    private $fragment;
+    private $x;
+    private $y;
+    private $target;
+    private $raw = false;
+
+    /**
+     *    Constructor. Parses URL into sections.
+     *    @param string $url        Incoming URL.
+     *    @access public
+     */
+    function __construct($url = '') {
+        list($x, $y) = $this->chompCoordinates($url);
+        $this->setCoordinates($x, $y);
+        $this->scheme = $this->chompScheme($url);
+        if ($this->scheme === 'file') {
+            // Unescaped backslashes not used in directory separator context
+            // will get caught by this, but they should have been urlencoded
+            // anyway so we don't care. If this ends up being a problem, the
+            // host regexp must be modified to match for backslashes when
+            // the scheme is file.
+            $url = str_replace('\\', '/', $url);
+        }
+        list($this->username, $this->password) = $this->chompLogin($url);
+        $this->host = $this->chompHost($url);
+        $this->port = false;
+        if (preg_match('/(.*?):(.*)/', $this->host, $host_parts)) {
+            if ($this->scheme === 'file' && strlen($this->host) === 2) {
+                // DOS drive was placed in authority; promote it to path.
+                $url = '/' . $this->host . $url;
+                $this->host = false;
+            } else {
+                $this->host = $host_parts[1];
+                $this->port = (integer)$host_parts[2];
+            }
+        }
+        $this->path = $this->chompPath($url);
+        $this->request = $this->parseRequest($this->chompRequest($url));
+        $this->fragment = (strncmp($url, "#", 1) == 0 ? substr($url, 1) : false);
+        $this->target = false;
+    }
+
+    /**
+     *    Extracts the X, Y coordinate pair from an image map.
+     *    @param string $url   URL so far. The coordinates will be
+     *                         removed.
+     *    @return array        X, Y as a pair of integers.
+     *    @access private
+     */
+    protected function chompCoordinates(&$url) {
+        if (preg_match('/(.*)\?(\d+),(\d+)$/', $url, $matches)) {
+            $url = $matches[1];
+            return array((integer)$matches[2], (integer)$matches[3]);
+        }
+        return array(false, false);
+    }
+
+    /**
+     *    Extracts the scheme part of an incoming URL.
+     *    @param string $url   URL so far. The scheme will be
+     *                         removed.
+     *    @return string       Scheme part or false.
+     *    @access private
+     */
+    protected function chompScheme(&$url) {
+        if (preg_match('#^([^/:]*):(//)(.*)#', $url, $matches)) {
+            $url = $matches[2] . $matches[3];
+            return $matches[1];
+        }
+        return false;
+    }
+
+    /**
+     *    Extracts the username and password from the
+     *    incoming URL. The // prefix will be reattached
+     *    to the URL after the doublet is extracted.
+     *    @param string $url    URL so far. The username and
+     *                          password are removed.
+     *    @return array         Two item list of username and
+     *                          password. Will urldecode() them.
+     *    @access private
+     */
+    protected function chompLogin(&$url) {
+        $prefix = '';
+        if (preg_match('#^(//)(.*)#', $url, $matches)) {
+            $prefix = $matches[1];
+            $url = $matches[2];
+        }
+        if (preg_match('#^([^/]*)@(.*)#', $url, $matches)) {
+            $url = $prefix . $matches[2];
+            $parts = explode(":", $matches[1]);
+            return array(
+                    urldecode($parts[0]),
+                    isset($parts[1]) ? urldecode($parts[1]) : false);
+        }
+        $url = $prefix . $url;
+        return array(false, false);
+    }
+
+    /**
+     *    Extracts the host part of an incoming URL.
+     *    Includes the port number part. Will extract
+     *    the host if it starts with // or it has
+     *    a top level domain or it has at least two
+     *    dots.
+     *    @param string $url    URL so far. The host will be
+     *                          removed.
+     *    @return string        Host part guess or false.
+     *    @access private
+     */
+    protected function chompHost(&$url) {
+        if (preg_match('!^(//)(.*?)(/.*|\?.*|#.*|$)!', $url, $matches)) {
+            $url = $matches[3];
+            return $matches[2];
+        }
+        if (preg_match('!(.*?)(\.\./|\./|/|\?|#|$)(.*)!', $url, $matches)) {
+            $tlds = SimpleUrl::getAllTopLevelDomains();
+            if (preg_match('/[a-z0-9\-]+\.(' . $tlds . ')/i', $matches[1])) {
+                $url = $matches[2] . $matches[3];
+                return $matches[1];
+            } elseif (preg_match('/[a-z0-9\-]+\.[a-z0-9\-]+\.[a-z0-9\-]+/i', $matches[1])) {
+                $url = $matches[2] . $matches[3];
+                return $matches[1];
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Extracts the path information from the incoming
+     *    URL. Strips this path from the URL.
+     *    @param string $url     URL so far. The host will be
+     *                           removed.
+     *    @return string         Path part or '/'.
+     *    @access private
+     */
+    protected function chompPath(&$url) {
+        if (preg_match('/(.*?)(\?|#|$)(.*)/', $url, $matches)) {
+            $url = $matches[2] . $matches[3];
+            return ($matches[1] ? $matches[1] : '');
+        }
+        return '';
+    }
+
+    /**
+     *    Strips off the request data.
+     *    @param string $url  URL so far. The request will be
+     *                        removed.
+     *    @return string      Raw request part.
+     *    @access private
+     */
+    protected function chompRequest(&$url) {
+        if (preg_match('/\?(.*?)(#|$)(.*)/', $url, $matches)) {
+            $url = $matches[2] . $matches[3];
+            return $matches[1];
+        }
+        return '';
+    }
+
+    /**
+     *    Breaks the request down into an object.
+     *    @param string $raw           Raw request.
+     *    @return SimpleFormEncoding    Parsed data.
+     *    @access private
+     */
+    protected function parseRequest($raw) {
+        $this->raw = $raw;
+        $request = new SimpleGetEncoding();
+        foreach (explode("&", $raw) as $pair) {
+            if (preg_match('/(.*?)=(.*)/', $pair, $matches)) {
+                $request->add(urldecode($matches[1]), urldecode($matches[2]));
+            } elseif ($pair) {
+                $request->add(urldecode($pair), '');
+            }
+        }
+        return $request;
+    }
+
+    /**
+     *    Accessor for protocol part.
+     *    @param string $default    Value to use if not present.
+     *    @return string            Scheme name, e.g "http".
+     *    @access public
+     */
+    function getScheme($default = false) {
+        return $this->scheme ? $this->scheme : $default;
+    }
+
+    /**
+     *    Accessor for user name.
+     *    @return string    Username preceding host.
+     *    @access public
+     */
+    function getUsername() {
+        return $this->username;
+    }
+
+    /**
+     *    Accessor for password.
+     *    @return string    Password preceding host.
+     *    @access public
+     */
+    function getPassword() {
+        return $this->password;
+    }
+
+    /**
+     *    Accessor for hostname and port.
+     *    @param string $default    Value to use if not present.
+     *    @return string            Hostname only.
+     *    @access public
+     */
+    function getHost($default = false) {
+        return $this->host ? $this->host : $default;
+    }
+
+    /**
+     *    Accessor for top level domain.
+     *    @return string       Last part of host.
+     *    @access public
+     */
+    function getTld() {
+        $path_parts = pathinfo($this->getHost());
+        return (isset($path_parts['extension']) ? $path_parts['extension'] : false);
+    }
+
+    /**
+     *    Accessor for port number.
+     *    @return integer    TCP/IP port number.
+     *    @access public
+     */
+    function getPort() {
+        return $this->port;
+    }
+
+    /**
+     *    Accessor for path.
+     *    @return string    Full path including leading slash if implied.
+     *    @access public
+     */
+    function getPath() {
+        if (! $this->path && $this->host) {
+            return '/';
+        }
+        return $this->path;
+    }
+
+    /**
+     *    Accessor for page if any. This may be a
+     *    directory name if ambiguious.
+     *    @return            Page name.
+     *    @access public
+     */
+    function getPage() {
+        if (! preg_match('/([^\/]*?)$/', $this->getPath(), $matches)) {
+            return false;
+        }
+        return $matches[1];
+    }
+
+    /**
+     *    Gets the path to the page.
+     *    @return string       Path less the page.
+     *    @access public
+     */
+    function getBasePath() {
+        if (! preg_match('/(.*\/)[^\/]*?$/', $this->getPath(), $matches)) {
+            return false;
+        }
+        return $matches[1];
+    }
+
+    /**
+     *    Accessor for fragment at end of URL after the "#".
+     *    @return string    Part after "#".
+     *    @access public
+     */
+    function getFragment() {
+        return $this->fragment;
+    }
+
+    /**
+     *    Sets image coordinates. Set to false to clear
+     *    them.
+     *    @param integer $x    Horizontal position.
+     *    @param integer $y    Vertical position.
+     *    @access public
+     */
+    function setCoordinates($x = false, $y = false) {
+        if (($x === false) || ($y === false)) {
+            $this->x = $this->y = false;
+            return;
+        }
+        $this->x = (integer)$x;
+        $this->y = (integer)$y;
+    }
+
+    /**
+     *    Accessor for horizontal image coordinate.
+     *    @return integer        X value.
+     *    @access public
+     */
+    function getX() {
+        return $this->x;
+    }
+
+    /**
+     *    Accessor for vertical image coordinate.
+     *    @return integer        Y value.
+     *    @access public
+     */
+    function getY() {
+        return $this->y;
+    }
+
+    /**
+     *    Accessor for current request parameters
+     *    in URL string form. Will return teh original request
+     *    if at all possible even if it doesn't make much
+     *    sense.
+     *    @return string   Form is string "?a=1&b=2", etc.
+     *    @access public
+     */
+    function getEncodedRequest() {
+        if ($this->raw) {
+            $encoded = $this->raw;
+        } else {
+            $encoded = $this->request->asUrlRequest();
+        }
+        if ($encoded) {
+            return '?' . preg_replace('/^\?/', '', $encoded);
+        }
+        return '';
+    }
+
+    /**
+     *    Adds an additional parameter to the request.
+     *    @param string $key            Name of parameter.
+     *    @param string $value          Value as string.
+     *    @access public
+     */
+    function addRequestParameter($key, $value) {
+        $this->raw = false;
+        $this->request->add($key, $value);
+    }
+
+    /**
+     *    Adds additional parameters to the request.
+     *    @param hash/SimpleFormEncoding $parameters   Additional
+     *                                                parameters.
+     *    @access public
+     */
+    function addRequestParameters($parameters) {
+        $this->raw = false;
+        $this->request->merge($parameters);
+    }
+
+    /**
+     *    Clears down all parameters.
+     *    @access public
+     */
+    function clearRequest() {
+        $this->raw = false;
+        $this->request = new SimpleGetEncoding();
+    }
+
+    /**
+     *    Gets the frame target if present. Although
+     *    not strictly part of the URL specification it
+     *    acts as similarily to the browser.
+     *    @return boolean/string    Frame name or false if none.
+     *    @access public
+     */
+    function getTarget() {
+        return $this->target;
+    }
+
+    /**
+     *    Attaches a frame target.
+     *    @param string $frame        Name of frame.
+     *    @access public
+     */
+    function setTarget($frame) {
+        $this->raw = false;
+        $this->target = $frame;
+    }
+
+    /**
+     *    Renders the URL back into a string.
+     *    @return string        URL in canonical form.
+     *    @access public
+     */
+    function asString() {
+        $path = $this->path;
+        $scheme = $identity = $host = $port = $encoded = $fragment = '';
+        if ($this->username && $this->password) {
+            $identity = $this->username . ':' . $this->password . '@';
+        }
+        if ($this->getHost()) {
+            $scheme = $this->getScheme() ? $this->getScheme() : 'http';
+            $scheme .= '://';
+            $host = $this->getHost();
+        } elseif ($this->getScheme() === 'file') {
+            // Safest way; otherwise, file URLs on Windows have an extra
+            // leading slash. It might be possible to convert file://
+            // URIs to local file paths, but that requires more research.
+            $scheme = 'file://';
+        }
+        if ($this->getPort() && $this->getPort() != 80 ) {
+            $port = ':'.$this->getPort();
+        }
+
+        if (substr($this->path, 0, 1) == '/') {
+            $path = $this->normalisePath($this->path);
+        }
+        $encoded = $this->getEncodedRequest();
+        $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
+        $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
+        return "$scheme$identity$host$port$path$encoded$fragment$coords";
+    }
+
+    /**
+     *    Replaces unknown sections to turn a relative
+     *    URL into an absolute one. The base URL can
+     *    be either a string or a SimpleUrl object.
+     *    @param string/SimpleUrl $base       Base URL.
+     *    @access public
+     */
+    function makeAbsolute($base) {
+        if (! is_object($base)) {
+            $base = new SimpleUrl($base);
+        }
+        if ($this->getHost()) {
+            $scheme = $this->getScheme();
+            $host = $this->getHost();
+            $port = $this->getPort() ? ':' . $this->getPort() : '';
+            $identity = $this->getIdentity() ? $this->getIdentity() . '@' : '';
+            if (! $identity) {
+                $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
+            }
+        } else {
+            $scheme = $base->getScheme();
+            $host = $base->getHost();
+            $port = $base->getPort() ? ':' . $base->getPort() : '';
+            $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
+        }
+        $path = $this->normalisePath($this->extractAbsolutePath($base));
+        $encoded = $this->getEncodedRequest();
+        $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
+        $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
+        return new SimpleUrl("$scheme://$identity$host$port$path$encoded$fragment$coords");
+    }
+
+    /**
+     *    Replaces unknown sections of the path with base parts
+     *    to return a complete absolute one.
+     *    @param string/SimpleUrl $base       Base URL.
+     *    @param string                       Absolute path.
+     *    @access private
+     */
+    protected function extractAbsolutePath($base) {
+        if ($this->getHost()) {
+            return $this->path;
+        }
+        if (! $this->isRelativePath($this->path)) {
+            return $this->path;
+        }
+        if ($this->path) {
+            return $base->getBasePath() . $this->path;
+        }
+        return $base->getPath();
+    }
+
+    /**
+     *    Simple test to see if a path part is relative.
+     *    @param string $path        Path to test.
+     *    @return boolean            True if starts with a "/".
+     *    @access private
+     */
+    protected function isRelativePath($path) {
+        return (substr($path, 0, 1) != '/');
+    }
+
+    /**
+     *    Extracts the username and password for use in rendering
+     *    a URL.
+     *    @return string/boolean    Form of username:password or false.
+     *    @access public
+     */
+    function getIdentity() {
+        if ($this->username && $this->password) {
+            return $this->username . ':' . $this->password;
+        }
+        return false;
+    }
+
+    /**
+     *    Replaces . and .. sections of the path.
+     *    @param string $path    Unoptimised path.
+     *    @return string         Path with dots removed if possible.
+     *    @access public
+     */
+    function normalisePath($path) {
+        $path = preg_replace('|/\./|', '/', $path);
+        return preg_replace('|/[^/]+/\.\./|', '/', $path);
+    }
+
+    /**
+     *    A pipe seperated list of all TLDs that result in two part
+     *    domain names.
+     *    @return string        Pipe separated list.
+     *    @access public
+     */
+    static function getAllTopLevelDomains() {
+        return 'com|edu|net|org|gov|mil|int|biz|info|name|pro|aero|coop|museum';
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/user_agent.php b/3rdparty/simpletest/user_agent.php
new file mode 100644
index 00000000000..ea536020017
--- /dev/null
+++ b/3rdparty/simpletest/user_agent.php
@@ -0,0 +1,328 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: user_agent.php 2039 2011-11-30 18:16:15Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/cookies.php');
+require_once(dirname(__FILE__) . '/http.php');
+require_once(dirname(__FILE__) . '/encoding.php');
+require_once(dirname(__FILE__) . '/authentication.php');
+/**#@-*/
+
+if (! defined('DEFAULT_MAX_REDIRECTS')) {
+    define('DEFAULT_MAX_REDIRECTS', 3);
+}
+if (! defined('DEFAULT_CONNECTION_TIMEOUT')) {
+    define('DEFAULT_CONNECTION_TIMEOUT', 15);
+}
+
+/**
+ *    Fetches web pages whilst keeping track of
+ *    cookies and authentication.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleUserAgent {
+    private $cookie_jar;
+    private $cookies_enabled = true;
+    private $authenticator;
+    private $max_redirects = DEFAULT_MAX_REDIRECTS;
+    private $proxy = false;
+    private $proxy_username = false;
+    private $proxy_password = false;
+    private $connection_timeout = DEFAULT_CONNECTION_TIMEOUT;
+    private $additional_headers = array();
+
+    /**
+     *    Starts with no cookies, realms or proxies.
+     *    @access public
+     */
+    function __construct() {
+        $this->cookie_jar = new SimpleCookieJar();
+        $this->authenticator = new SimpleAuthenticator();
+    }
+
+    /**
+     *    Removes expired and temporary cookies as if
+     *    the browser was closed and re-opened. Authorisation
+     *    has to be obtained again as well.
+     *    @param string/integer $date   Time when session restarted.
+     *                                  If omitted then all persistent
+     *                                  cookies are kept.
+     *    @access public
+     */
+    function restart($date = false) {
+        $this->cookie_jar->restartSession($date);
+        $this->authenticator->restartSession();
+    }
+
+    /**
+     *    Adds a header to every fetch.
+     *    @param string $header       Header line to add to every
+     *                                request until cleared.
+     *    @access public
+     */
+    function addHeader($header) {
+        $this->additional_headers[] = $header;
+    }
+
+    /**
+     *    Ages the cookies by the specified time.
+     *    @param integer $interval    Amount in seconds.
+     *    @access public
+     */
+    function ageCookies($interval) {
+        $this->cookie_jar->agePrematurely($interval);
+    }
+
+    /**
+     *    Sets an additional cookie. If a cookie has
+     *    the same name and path it is replaced.
+     *    @param string $name            Cookie key.
+     *    @param string $value           Value of cookie.
+     *    @param string $host            Host upon which the cookie is valid.
+     *    @param string $path            Cookie path if not host wide.
+     *    @param string $expiry          Expiry date.
+     *    @access public
+     */
+    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
+        $this->cookie_jar->setCookie($name, $value, $host, $path, $expiry);
+    }
+
+    /**
+     *    Reads the most specific cookie value from the
+     *    browser cookies.
+     *    @param string $host        Host to search.
+     *    @param string $path        Applicable path.
+     *    @param string $name        Name of cookie to read.
+     *    @return string             False if not present, else the
+     *                               value as a string.
+     *    @access public
+     */
+    function getCookieValue($host, $path, $name) {
+        return $this->cookie_jar->getCookieValue($host, $path, $name);
+    }
+
+    /**
+     *    Reads the current cookies within the base URL.
+     *    @param string $name     Key of cookie to find.
+     *    @param SimpleUrl $base  Base URL to search from.
+     *    @return string/boolean  Null if there is no base URL, false
+     *                            if the cookie is not set.
+     *    @access public
+     */
+    function getBaseCookieValue($name, $base) {
+        if (! $base) {
+            return null;
+        }
+        return $this->getCookieValue($base->getHost(), $base->getPath(), $name);
+    }
+
+    /**
+     *    Switches off cookie sending and recieving.
+     *    @access public
+     */
+    function ignoreCookies() {
+        $this->cookies_enabled = false;
+    }
+
+    /**
+     *    Switches back on the cookie sending and recieving.
+     *    @access public
+     */
+    function useCookies() {
+        $this->cookies_enabled = true;
+    }
+
+    /**
+     *    Sets the socket timeout for opening a connection.
+     *    @param integer $timeout      Maximum time in seconds.
+     *    @access public
+     */
+    function setConnectionTimeout($timeout) {
+        $this->connection_timeout = $timeout;
+    }
+
+    /**
+     *    Sets the maximum number of redirects before
+     *    a page will be loaded anyway.
+     *    @param integer $max        Most hops allowed.
+     *    @access public
+     */
+    function setMaximumRedirects($max) {
+        $this->max_redirects = $max;
+    }
+
+    /**
+     *    Sets proxy to use on all requests for when
+     *    testing from behind a firewall. Set URL
+     *    to false to disable.
+     *    @param string $proxy        Proxy URL.
+     *    @param string $username     Proxy username for authentication.
+     *    @param string $password     Proxy password for authentication.
+     *    @access public
+     */
+    function useProxy($proxy, $username, $password) {
+        if (! $proxy) {
+            $this->proxy = false;
+            return;
+        }
+        if ((strncmp($proxy, 'http://', 7) != 0) && (strncmp($proxy, 'https://', 8) != 0)) {
+            $proxy = 'http://'. $proxy;
+        }
+        $this->proxy = new SimpleUrl($proxy);
+        $this->proxy_username = $username;
+        $this->proxy_password = $password;
+    }
+
+    /**
+     *    Test to see if the redirect limit is passed.
+     *    @param integer $redirects        Count so far.
+     *    @return boolean                  True if over.
+     *    @access private
+     */
+    protected function isTooManyRedirects($redirects) {
+        return ($redirects > $this->max_redirects);
+    }
+
+    /**
+     *    Sets the identity for the current realm.
+     *    @param string $host        Host to which realm applies.
+     *    @param string $realm       Full name of realm.
+     *    @param string $username    Username for realm.
+     *    @param string $password    Password for realm.
+     *    @access public
+     */
+    function setIdentity($host, $realm, $username, $password) {
+        $this->authenticator->setIdentityForRealm($host, $realm, $username, $password);
+    }
+
+    /**
+     *    Fetches a URL as a response object. Will keep trying if redirected.
+     *    It will also collect authentication realm information.
+     *    @param string/SimpleUrl $url      Target to fetch.
+     *    @param SimpleEncoding $encoding   Additional parameters for request.
+     *    @return SimpleHttpResponse        Hopefully the target page.
+     *    @access public
+     */
+    function fetchResponse($url, $encoding) {
+        if ($encoding->getMethod() != 'POST') {
+            $url->addRequestParameters($encoding);
+            $encoding->clear();
+        }
+        $response = $this->fetchWhileRedirected($url, $encoding);
+        if ($headers = $response->getHeaders()) {
+            if ($headers->isChallenge()) {
+                $this->authenticator->addRealm(
+                        $url,
+                        $headers->getAuthentication(),
+                        $headers->getRealm());
+            }
+        }
+        return $response;
+    }
+
+    /**
+     *    Fetches the page until no longer redirected or
+     *    until the redirect limit runs out.
+     *    @param SimpleUrl $url                  Target to fetch.
+     *    @param SimpelFormEncoding $encoding    Additional parameters for request.
+     *    @return SimpleHttpResponse             Hopefully the target page.
+     *    @access private
+     */
+    protected function fetchWhileRedirected($url, $encoding) {
+        $redirects = 0;
+        do {
+            $response = $this->fetch($url, $encoding);
+            if ($response->isError()) {
+                return $response;
+            }
+            $headers = $response->getHeaders();
+            if ($this->cookies_enabled) {
+                $headers->writeCookiesToJar($this->cookie_jar, $url);
+            }
+            if (! $headers->isRedirect()) {
+                break;
+            }
+            $location = new SimpleUrl($headers->getLocation());
+            $url = $location->makeAbsolute($url);
+            $encoding = new SimpleGetEncoding();
+        } while (! $this->isTooManyRedirects(++$redirects));
+        return $response;
+    }
+
+    /**
+     *    Actually make the web request.
+     *    @param SimpleUrl $url                   Target to fetch.
+     *    @param SimpleFormEncoding $encoding     Additional parameters for request.
+     *    @return SimpleHttpResponse              Headers and hopefully content.
+     *    @access protected
+     */
+    protected function fetch($url, $encoding) {
+        $request = $this->createRequest($url, $encoding);
+        return $request->fetch($this->connection_timeout);
+    }
+
+    /**
+     *    Creates a full page request.
+     *    @param SimpleUrl $url                 Target to fetch as url object.
+     *    @param SimpleFormEncoding $encoding   POST/GET parameters.
+     *    @return SimpleHttpRequest             New request.
+     *    @access private
+     */
+    protected function createRequest($url, $encoding) {
+        $request = $this->createHttpRequest($url, $encoding);
+        $this->addAdditionalHeaders($request);
+        if ($this->cookies_enabled) {
+            $request->readCookiesFromJar($this->cookie_jar, $url);
+        }
+        $this->authenticator->addHeaders($request, $url);
+        return $request;
+    }
+
+    /**
+     *    Builds the appropriate HTTP request object.
+     *    @param SimpleUrl $url                  Target to fetch as url object.
+     *    @param SimpleFormEncoding $parameters  POST/GET parameters.
+     *    @return SimpleHttpRequest              New request object.
+     *    @access protected
+     */
+    protected function createHttpRequest($url, $encoding) {
+        return new SimpleHttpRequest($this->createRoute($url), $encoding);
+    }
+
+    /**
+     *    Sets up either a direct route or via a proxy.
+     *    @param SimpleUrl $url   Target to fetch as url object.
+     *    @return SimpleRoute     Route to take to fetch URL.
+     *    @access protected
+     */
+    protected function createRoute($url) {
+        if ($this->proxy) {
+            return new SimpleProxyRoute(
+                    $url,
+                    $this->proxy,
+                    $this->proxy_username,
+                    $this->proxy_password);
+        }
+        return new SimpleRoute($url);
+    }
+
+    /**
+     *    Adds additional manual headers.
+     *    @param SimpleHttpRequest $request    Outgoing request.
+     *    @access private
+     */
+    protected function addAdditionalHeaders(&$request) {
+        foreach ($this->additional_headers as $header) {
+            $request->addHeaderLine($header);
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/web_tester.php b/3rdparty/simpletest/web_tester.php
new file mode 100644
index 00000000000..a17230e7b33
--- /dev/null
+++ b/3rdparty/simpletest/web_tester.php
@@ -0,0 +1,1532 @@
+<?php
+/**
+ *  Base include file for SimpleTest.
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: web_tester.php 2013 2011-04-29 09:29:45Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/test_case.php');
+require_once(dirname(__FILE__) . '/browser.php');
+require_once(dirname(__FILE__) . '/page.php');
+require_once(dirname(__FILE__) . '/expectation.php');
+/**#@-*/
+
+/**
+ *    Test for an HTML widget value match.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class FieldExpectation extends SimpleExpectation {
+    private $value;
+
+    /**
+     *    Sets the field value to compare against.
+     *    @param mixed $value     Test value to match. Can be an
+     *                            expectation for say pattern matching.
+     *    @param string $message  Optiona message override. Can use %s as
+     *                            a placeholder for the original message.
+     *    @access public
+     */
+    function __construct($value, $message = '%s') {
+        parent::__construct($message);
+        if (is_array($value)) {
+            sort($value);
+        }
+        $this->value = $value;
+    }
+
+    /**
+     *    Tests the expectation. True if it matches
+     *    a string value or an array value in any order.
+     *    @param mixed $compare        Comparison value. False for
+     *                                 an unset field.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        if ($this->value === false) {
+            return ($compare === false);
+        }
+        if ($this->isSingle($this->value)) {
+            return $this->testSingle($compare);
+        }
+        if (is_array($this->value)) {
+            return $this->testMultiple($compare);
+        }
+        return false;
+    }
+
+    /**
+     *    Tests for valid field comparisons with a single option.
+     *    @param mixed $value       Value to type check.
+     *    @return boolean           True if integer, string or float.
+     *    @access private
+     */
+    protected function isSingle($value) {
+        return is_string($value) || is_integer($value) || is_float($value);
+    }
+
+    /**
+     *    String comparison for simple field with a single option.
+     *    @param mixed $compare    String to test against.
+     *    @returns boolean         True if matching.
+     *    @access private
+     */
+    protected function testSingle($compare) {
+        if (is_array($compare) && count($compare) == 1) {
+            $compare = $compare[0];
+        }
+        if (! $this->isSingle($compare)) {
+            return false;
+        }
+        return ($this->value == $compare);
+    }
+
+    /**
+     *    List comparison for multivalue field.
+     *    @param mixed $compare    List in any order to test against.
+     *    @returns boolean         True if matching.
+     *    @access private
+     */
+    protected function testMultiple($compare) {
+        if (is_string($compare)) {
+            $compare = array($compare);
+        }
+        if (! is_array($compare)) {
+            return false;
+        }
+        sort($compare);
+        return ($this->value === $compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        if (is_array($compare)) {
+            sort($compare);
+        }
+        if ($this->test($compare)) {
+            return "Field expectation [" . $dumper->describeValue($this->value) . "]";
+        } else {
+            return "Field expectation [" . $dumper->describeValue($this->value) .
+                    "] fails with [" .
+                    $dumper->describeValue($compare) . "] " .
+                    $dumper->describeDifference($this->value, $compare);
+        }
+    }
+}
+
+/**
+ *    Test for a specific HTTP header within a header block.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class HttpHeaderExpectation extends SimpleExpectation {
+    private $expected_header;
+    private $expected_value;
+
+    /**
+     *    Sets the field and value to compare against.
+     *    @param string $header   Case insenstive trimmed header name.
+     *    @param mixed $value     Optional value to compare. If not
+     *                            given then any value will match. If
+     *                            an expectation object then that will
+     *                            be used instead.
+     *    @param string $message  Optiona message override. Can use %s as
+     *                            a placeholder for the original message.
+     */
+    function __construct($header, $value = false, $message = '%s') {
+        parent::__construct($message);
+        $this->expected_header = $this->normaliseHeader($header);
+        $this->expected_value = $value;
+    }
+
+    /**
+     *    Accessor for aggregated object.
+     *    @return mixed        Expectation set in constructor.
+     *    @access protected
+     */
+    protected function getExpectation() {
+        return $this->expected_value;
+    }
+
+    /**
+     *    Removes whitespace at ends and case variations.
+     *    @param string $header    Name of header.
+     *    @param string            Trimmed and lowecased header
+     *                             name.
+     *    @access private
+     */
+    protected function normaliseHeader($header) {
+        return strtolower(trim($header));
+    }
+
+    /**
+     *    Tests the expectation. True if it matches
+     *    a string value or an array value in any order.
+     *    @param mixed $compare   Raw header block to search.
+     *    @return boolean         True if header present.
+     *    @access public
+     */
+    function test($compare) {
+        return is_string($this->findHeader($compare));
+    }
+
+    /**
+     *    Searches the incoming result. Will extract the matching
+     *    line as text.
+     *    @param mixed $compare   Raw header block to search.
+     *    @return string          Matching header line.
+     *    @access protected
+     */
+    protected function findHeader($compare) {
+        $lines = explode("\r\n", $compare);
+        foreach ($lines as $line) {
+            if ($this->testHeaderLine($line)) {
+                return $line;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Compares a single header line against the expectation.
+     *    @param string $line      A single line to compare.
+     *    @return boolean          True if matched.
+     *    @access private
+     */
+    protected function testHeaderLine($line) {
+        if (count($parsed = explode(':', $line, 2)) < 2) {
+            return false;
+        }
+        list($header, $value) = $parsed;
+        if ($this->normaliseHeader($header) != $this->expected_header) {
+            return false;
+        }
+        return $this->testHeaderValue($value, $this->expected_value);
+    }
+
+    /**
+     *    Tests the value part of the header.
+     *    @param string $value        Value to test.
+     *    @param mixed $expected      Value to test against.
+     *    @return boolean             True if matched.
+     *    @access protected
+     */
+    protected function testHeaderValue($value, $expected) {
+        if ($expected === false) {
+            return true;
+        }
+        if (SimpleExpectation::isExpectation($expected)) {
+            return $expected->test(trim($value));
+        }
+        return (trim($value) == trim($expected));
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Raw header block to search.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if (SimpleExpectation::isExpectation($this->expected_value)) {
+            $message = $this->expected_value->overlayMessage($compare, $this->getDumper());
+        } else {
+            $message = $this->expected_header .
+                    ($this->expected_value ? ': ' . $this->expected_value : '');
+        }
+        if (is_string($line = $this->findHeader($compare))) {
+            return "Searching for header [$message] found [$line]";
+        } else {
+            return "Failed to find header [$message]";
+        }
+    }
+}
+
+/**
+ *    Test for a specific HTTP header within a header block that
+ *    should not be found.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class NoHttpHeaderExpectation extends HttpHeaderExpectation {
+    private $expected_header;
+    private $expected_value;
+
+    /**
+     *    Sets the field and value to compare against.
+     *    @param string $unwanted   Case insenstive trimmed header name.
+     *    @param string $message    Optiona message override. Can use %s as
+     *                              a placeholder for the original message.
+     */
+    function __construct($unwanted, $message = '%s') {
+        parent::__construct($unwanted, false, $message);
+    }
+
+    /**
+     *    Tests that the unwanted header is not found.
+     *    @param mixed $compare   Raw header block to search.
+     *    @return boolean         True if header present.
+     *    @access public
+     */
+    function test($compare) {
+        return ($this->findHeader($compare) === false);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Raw header block to search.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $expectation = $this->getExpectation();
+        if (is_string($line = $this->findHeader($compare))) {
+            return "Found unwanted header [$expectation] with [$line]";
+        } else {
+            return "Did not find unwanted header [$expectation]";
+        }
+    }
+}
+
+/**
+ *    Test for a text substring.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class TextExpectation extends SimpleExpectation {
+    private $substring;
+
+    /**
+     *    Sets the value to compare against.
+     *    @param string $substring  Text to search for.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($substring, $message = '%s') {
+        parent::__construct($message);
+        $this->substring = $substring;
+    }
+
+    /**
+     *    Accessor for the substring.
+     *    @return string       Text to match.
+     *    @access protected
+     */
+    protected function getSubstring() {
+        return $this->substring;
+    }
+
+    /**
+     *    Tests the expectation. True if the text contains the
+     *    substring.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return (strpos($compare, $this->substring) !== false);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            return $this->describeTextMatch($this->getSubstring(), $compare);
+        } else {
+            $dumper = $this->getDumper();
+            return "Text [" . $this->getSubstring() .
+                    "] not detected in [" .
+                    $dumper->describeValue($compare) . "]";
+        }
+    }
+
+    /**
+     *    Describes a pattern match including the string
+     *    found and it's position.
+     *    @param string $substring      Text to search for.
+     *    @param string $subject        Subject to search.
+     *    @access protected
+     */
+    protected function describeTextMatch($substring, $subject) {
+        $position = strpos($subject, $substring);
+        $dumper = $this->getDumper();
+        return "Text [$substring] detected at character [$position] in [" .
+                $dumper->describeValue($subject) . "] in region [" .
+                $dumper->clipString($subject, 100, $position) . "]";
+    }
+}
+
+/**
+ *    Fail if a substring is detected within the
+ *    comparison text.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NoTextExpectation extends TextExpectation {
+
+    /**
+     *    Sets the reject pattern
+     *    @param string $substring  Text to search for.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($substring, $message = '%s') {
+        parent::__construct($substring, $message);
+    }
+
+    /**
+     *    Tests the expectation. False if the substring appears
+     *    in the text.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param string $compare      Comparison value.
+     *    @return string              Description of success
+     *                                or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            $dumper = $this->getDumper();
+            return "Text [" . $this->getSubstring() .
+                    "] not detected in [" .
+                    $dumper->describeValue($compare) . "]";
+        } else {
+            return $this->describeTextMatch($this->getSubstring(), $compare);
+        }
+    }
+}
+
+/**
+ *    Test case for testing of web pages. Allows
+ *    fetching of pages, parsing of HTML and
+ *    submitting forms.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class WebTestCase extends SimpleTestCase {
+    private $browser;
+    private $ignore_errors = false;
+
+    /**
+     *    Creates an empty test case. Should be subclassed
+     *    with test methods for a functional test case.
+     *    @param string $label     Name of test case. Will use
+     *                             the class name if none specified.
+     *    @access public
+     */
+    function __construct($label = false) {
+        parent::__construct($label);
+    }
+
+    /**
+     *    Announces the start of the test.
+     *    @param string $method    Test method just started.
+     *    @access public
+     */
+    function before($method) {
+        parent::before($method);
+        $this->setBrowser($this->createBrowser());
+    }
+
+    /**
+     *    Announces the end of the test. Includes private clean up.
+     *    @param string $method    Test method just finished.
+     *    @access public
+     */
+    function after($method) {
+        $this->unsetBrowser();
+        parent::after($method);
+    }
+
+    /**
+     *    Gets a current browser reference for setting
+     *    special expectations or for detailed
+     *    examination of page fetches.
+     *    @return SimpleBrowser     Current test browser object.
+     *    @access public
+     */
+    function getBrowser() {
+        return $this->browser;
+    }
+
+    /**
+     *    Gets a current browser reference for setting
+     *    special expectations or for detailed
+     *    examination of page fetches.
+     *    @param SimpleBrowser $browser    New test browser object.
+     *    @access public
+     */
+    function setBrowser($browser) {
+        return $this->browser = $browser;
+    }
+
+    /**
+     *    Sets the HTML parser to use within this browser.
+     *    @param object         The parser, one of SimplePHPPageBuilder or
+     *                          SimpleTidyPageBuilder.
+     */
+    function setParser($parser) {
+        $this->browser->setParser($parser);
+    }
+
+    /**
+     *    Clears the current browser reference to help the
+     *    PHP garbage collector.
+     *    @access public
+     */
+    function unsetBrowser() {
+        unset($this->browser);
+    }
+
+    /**
+     *    Creates a new default web browser object.
+     *    Will be cleared at the end of the test method.
+     *    @return TestBrowser           New browser.
+     *    @access public
+     */
+    function createBrowser() {
+        return new SimpleBrowser();
+    }
+
+    /**
+     *    Gets the last response error.
+     *    @return string    Last low level HTTP error.
+     *    @access public
+     */
+    function getTransportError() {
+        return $this->browser->getTransportError();
+    }
+
+    /**
+     *    Accessor for the currently selected URL.
+     *    @return string        Current location or false if
+     *                          no page yet fetched.
+     *    @access public
+     */
+    function getUrl() {
+        return $this->browser->getUrl();
+    }
+
+    /**
+     *    Dumps the current request for debugging.
+     *    @access public
+     */
+    function showRequest() {
+        $this->dump($this->browser->getRequest());
+    }
+
+    /**
+     *    Dumps the current HTTP headers for debugging.
+     *    @access public
+     */
+    function showHeaders() {
+        $this->dump($this->browser->getHeaders());
+    }
+
+    /**
+     *    Dumps the current HTML source for debugging.
+     *    @access public
+     */
+    function showSource() {
+        $this->dump($this->browser->getContent());
+    }
+
+    /**
+     *    Dumps the visible text only for debugging.
+     *    @access public
+     */
+    function showText() {
+        $this->dump(wordwrap($this->browser->getContentAsText(), 80));
+    }
+
+    /**
+     *    Simulates the closing and reopening of the browser.
+     *    Temporary cookies will be discarded and timed
+     *    cookies will be expired if later than the
+     *    specified time.
+     *    @param string/integer $date Time when session restarted.
+     *                                If ommitted then all persistent
+     *                                cookies are kept. Time is either
+     *                                Cookie format string or timestamp.
+     *    @access public
+     */
+    function restart($date = false) {
+        if ($date === false) {
+            $date = time();
+        }
+        $this->browser->restart($date);
+    }
+
+    /**
+     *    Moves cookie expiry times back into the past.
+     *    Useful for testing timeouts and expiries.
+     *    @param integer $interval    Amount to age in seconds.
+     *    @access public
+     */
+    function ageCookies($interval) {
+        $this->browser->ageCookies($interval);
+    }
+
+    /**
+     *    Disables frames support. Frames will not be fetched
+     *    and the frameset page will be used instead.
+     *    @access public
+     */
+    function ignoreFrames() {
+        $this->browser->ignoreFrames();
+    }
+
+    /**
+     *    Switches off cookie sending and recieving.
+     *    @access public
+     */
+    function ignoreCookies() {
+        $this->browser->ignoreCookies();
+    }
+
+    /**
+     *    Skips errors for the next request only. You might
+     *    want to confirm that a page is unreachable for
+     *    example.
+     *    @access public
+     */
+    function ignoreErrors() {
+        $this->ignore_errors = true;
+    }
+
+    /**
+     *    Issues a fail if there is a transport error anywhere
+     *    in the current frameset. Only one such error is
+     *    reported.
+     *    @param string/boolean $result   HTML or failure.
+     *    @return string/boolean $result  Passes through result.
+     *    @access private
+     */
+    protected function failOnError($result) {
+        if (! $this->ignore_errors) {
+            if ($error = $this->browser->getTransportError()) {
+                $this->fail($error);
+            }
+        }
+        $this->ignore_errors = false;
+        return $result;
+    }
+
+    /**
+     *    Adds a header to every fetch.
+     *    @param string $header       Header line to add to every
+     *                                request until cleared.
+     *    @access public
+     */
+    function addHeader($header) {
+        $this->browser->addHeader($header);
+    }
+
+    /**
+     *    Sets the maximum number of redirects before
+     *    the web page is loaded regardless.
+     *    @param integer $max        Maximum hops.
+     *    @access public
+     */
+    function setMaximumRedirects($max) {
+        if (! $this->browser) {
+            trigger_error(
+                    'Can only set maximum redirects in a test method, setUp() or tearDown()');
+        }
+        $this->browser->setMaximumRedirects($max);
+    }
+
+    /**
+     *    Sets the socket timeout for opening a connection and
+     *    receiving at least one byte of information.
+     *    @param integer $timeout      Maximum time in seconds.
+     *    @access public
+     */
+    function setConnectionTimeout($timeout) {
+        $this->browser->setConnectionTimeout($timeout);
+    }
+
+    /**
+     *    Sets proxy to use on all requests for when
+     *    testing from behind a firewall. Set URL
+     *    to false to disable.
+     *    @param string $proxy        Proxy URL.
+     *    @param string $username     Proxy username for authentication.
+     *    @param string $password     Proxy password for authentication.
+     *    @access public
+     */
+    function useProxy($proxy, $username = false, $password = false) {
+        $this->browser->useProxy($proxy, $username, $password);
+    }
+
+    /**
+     *    Fetches a page into the page buffer. If
+     *    there is no base for the URL then the
+     *    current base URL is used. After the fetch
+     *    the base URL reflects the new location.
+     *    @param string $url          URL to fetch.
+     *    @param hash $parameters     Optional additional GET data.
+     *    @return boolean/string      Raw page on success.
+     *    @access public
+     */
+    function get($url, $parameters = false) {
+        return $this->failOnError($this->browser->get($url, $parameters));
+    }
+
+    /**
+     *    Fetches a page by POST into the page buffer.
+     *    If there is no base for the URL then the
+     *    current base URL is used. After the fetch
+     *    the base URL reflects the new location.
+     *    @param string $url          URL to fetch.
+     *    @param mixed $parameters    Optional POST parameters or content body to send
+     *    @param string $content_type Content type of provided body
+     *    @return boolean/string      Raw page on success.
+     *    @access public
+     */
+    function post($url, $parameters = false, $content_type = false) {
+        return $this->failOnError($this->browser->post($url, $parameters, $content_type));
+    }
+
+    /**
+     *    Fetches a page by PUT into the page buffer.
+     *    If there is no base for the URL then the
+     *    current base URL is used. After the fetch
+     *    the base URL reflects the new location.
+     *    @param string $url          URL to fetch.
+     *    @param mixed $body          Optional content body to send
+     *    @param string $content_type Content type of provided body
+     *    @return boolean/string      Raw page on success.
+     *    @access public
+     */
+    function put($url, $body = false, $content_type = false) {
+        return $this->failOnError($this->browser->put($url, $body, $content_type));
+    }
+
+    /**
+     *    Fetches a page by a DELETE request
+     *    @param string $url          URL to fetch.
+     *    @param hash $parameters     Optional additional parameters.
+     *    @return boolean/string      Raw page on success.
+     *    @access public
+     */
+    function delete($url, $parameters = false) {
+        return $this->failOnError($this->browser->delete($url, $parameters));
+    }
+
+
+    /**
+     *    Does a HTTP HEAD fetch, fetching only the page
+     *    headers. The current base URL is unchanged by this.
+     *    @param string $url          URL to fetch.
+     *    @param hash $parameters     Optional additional GET data.
+     *    @return boolean             True on success.
+     *    @access public
+     */
+    function head($url, $parameters = false) {
+        return $this->failOnError($this->browser->head($url, $parameters));
+    }
+
+    /**
+     *    Equivalent to hitting the retry button on the
+     *    browser. Will attempt to repeat the page fetch.
+     *    @return boolean     True if fetch succeeded.
+     *    @access public
+     */
+    function retry() {
+        return $this->failOnError($this->browser->retry());
+    }
+
+    /**
+     *    Equivalent to hitting the back button on the
+     *    browser.
+     *    @return boolean     True if history entry and
+     *                        fetch succeeded.
+     *    @access public
+     */
+    function back() {
+        return $this->failOnError($this->browser->back());
+    }
+
+    /**
+     *    Equivalent to hitting the forward button on the
+     *    browser.
+     *    @return boolean     True if history entry and
+     *                        fetch succeeded.
+     *    @access public
+     */
+    function forward() {
+        return $this->failOnError($this->browser->forward());
+    }
+
+    /**
+     *    Retries a request after setting the authentication
+     *    for the current realm.
+     *    @param string $username    Username for realm.
+     *    @param string $password    Password for realm.
+     *    @return boolean/string     HTML on successful fetch. Note
+     *                               that authentication may still have
+     *                               failed.
+     *    @access public
+     */
+    function authenticate($username, $password) {
+        return $this->failOnError(
+                $this->browser->authenticate($username, $password));
+    }
+
+    /**
+     *    Gets the cookie value for the current browser context.
+     *    @param string $name          Name of cookie.
+     *    @return string               Value of cookie or false if unset.
+     *    @access public
+     */
+    function getCookie($name) {
+        return $this->browser->getCurrentCookieValue($name);
+    }
+
+    /**
+     *    Sets a cookie in the current browser.
+     *    @param string $name          Name of cookie.
+     *    @param string $value         Cookie value.
+     *    @param string $host          Host upon which the cookie is valid.
+     *    @param string $path          Cookie path if not host wide.
+     *    @param string $expiry        Expiry date.
+     *    @access public
+     */
+    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
+        $this->browser->setCookie($name, $value, $host, $path, $expiry);
+    }
+
+    /**
+     *    Accessor for current frame focus. Will be
+     *    false if no frame has focus.
+     *    @return integer/string/boolean    Label if any, otherwise
+     *                                      the position in the frameset
+     *                                      or false if none.
+     *    @access public
+     */
+    function getFrameFocus() {
+        return $this->browser->getFrameFocus();
+    }
+
+    /**
+     *    Sets the focus by index. The integer index starts from 1.
+     *    @param integer $choice    Chosen frame.
+     *    @return boolean           True if frame exists.
+     *    @access public
+     */
+    function setFrameFocusByIndex($choice) {
+        return $this->browser->setFrameFocusByIndex($choice);
+    }
+
+    /**
+     *    Sets the focus by name.
+     *    @param string $name    Chosen frame.
+     *    @return boolean        True if frame exists.
+     *    @access public
+     */
+    function setFrameFocus($name) {
+        return $this->browser->setFrameFocus($name);
+    }
+
+    /**
+     *    Clears the frame focus. All frames will be searched
+     *    for content.
+     *    @access public
+     */
+    function clearFrameFocus() {
+        return $this->browser->clearFrameFocus();
+    }
+
+    /**
+     *    Clicks a visible text item. Will first try buttons,
+     *    then links and then images.
+     *    @param string $label        Visible text or alt text.
+     *    @return string/boolean      Raw page or false.
+     *    @access public
+     */
+    function click($label) {
+        return $this->failOnError($this->browser->click($label));
+    }
+
+    /**
+     *    Checks for a click target.
+     *    @param string $label        Visible text or alt text.
+     *    @return boolean             True if click target.
+     *    @access public
+     */
+    function assertClickable($label, $message = '%s') {
+        return $this->assertTrue(
+                $this->browser->isClickable($label),
+                sprintf($message, "Click target [$label] should exist"));
+    }
+
+    /**
+     *    Clicks the submit button by label. The owning
+     *    form will be submitted by this.
+     *    @param string $label    Button label. An unlabeled
+     *                            button can be triggered by 'Submit'.
+     *    @param hash $additional Additional form values.
+     *    @return boolean/string  Page on success, else false.
+     *    @access public
+     */
+    function clickSubmit($label = 'Submit', $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickSubmit($label, $additional));
+    }
+
+    /**
+     *    Clicks the submit button by name attribute. The owning
+     *    form will be submitted by this.
+     *    @param string $name     Name attribute of button.
+     *    @param hash $additional Additional form values.
+     *    @return boolean/string  Page on success.
+     *    @access public
+     */
+    function clickSubmitByName($name, $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickSubmitByName($name, $additional));
+    }
+
+    /**
+     *    Clicks the submit button by ID attribute. The owning
+     *    form will be submitted by this.
+     *    @param string $id       ID attribute of button.
+     *    @param hash $additional Additional form values.
+     *    @return boolean/string  Page on success.
+     *    @access public
+     */
+    function clickSubmitById($id, $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickSubmitById($id, $additional));
+    }
+
+    /**
+     *    Checks for a valid button label.
+     *    @param string $label        Visible text.
+     *    @return boolean             True if click target.
+     *    @access public
+     */
+    function assertSubmit($label, $message = '%s') {
+        return $this->assertTrue(
+                $this->browser->isSubmit($label),
+                sprintf($message, "Submit button [$label] should exist"));
+    }
+
+    /**
+     *    Clicks the submit image by some kind of label. Usually
+     *    the alt tag or the nearest equivalent. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param string $label    Alt attribute of button.
+     *    @param integer $x       X-coordinate of imaginary click.
+     *    @param integer $y       Y-coordinate of imaginary click.
+     *    @param hash $additional Additional form values.
+     *    @return boolean/string  Page on success.
+     *    @access public
+     */
+    function clickImage($label, $x = 1, $y = 1, $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickImage($label, $x, $y, $additional));
+    }
+
+    /**
+     *    Clicks the submit image by the name. Usually
+     *    the alt tag or the nearest equivalent. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param string $name     Name attribute of button.
+     *    @param integer $x       X-coordinate of imaginary click.
+     *    @param integer $y       Y-coordinate of imaginary click.
+     *    @param hash $additional Additional form values.
+     *    @return boolean/string  Page on success.
+     *    @access public
+     */
+    function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickImageByName($name, $x, $y, $additional));
+    }
+
+    /**
+     *    Clicks the submit image by ID attribute. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param integer/string $id   ID attribute of button.
+     *    @param integer $x           X-coordinate of imaginary click.
+     *    @param integer $y           Y-coordinate of imaginary click.
+     *    @param hash $additional     Additional form values.
+     *    @return boolean/string      Page on success.
+     *    @access public
+     */
+    function clickImageById($id, $x = 1, $y = 1, $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickImageById($id, $x, $y, $additional));
+    }
+
+    /**
+     *    Checks for a valid image with atht alt text or title.
+     *    @param string $label        Visible text.
+     *    @return boolean             True if click target.
+     *    @access public
+     */
+    function assertImage($label, $message = '%s') {
+        return $this->assertTrue(
+                $this->browser->isImage($label),
+                sprintf($message, "Image with text [$label] should exist"));
+    }
+
+    /**
+     *    Submits a form by the ID.
+     *    @param string $id       Form ID. No button information
+     *                            is submitted this way.
+     *    @return boolean/string  Page on success.
+     *    @access public
+     */
+    function submitFormById($id, $additional = false) {
+        return $this->failOnError($this->browser->submitFormById($id, $additional));
+    }
+
+    /**
+     *    Follows a link by name. Will click the first link
+     *    found with this link text by default, or a later
+     *    one if an index is given. Match is case insensitive
+     *    with normalised space.
+     *    @param string $label     Text between the anchor tags.
+     *    @param integer $index    Link position counting from zero.
+     *    @return boolean/string   Page on success.
+     *    @access public
+     */
+    function clickLink($label, $index = 0) {
+        return $this->failOnError($this->browser->clickLink($label, $index));
+    }
+
+    /**
+     *    Follows a link by id attribute.
+     *    @param string $id        ID attribute value.
+     *    @return boolean/string   Page on success.
+     *    @access public
+     */
+    function clickLinkById($id) {
+        return $this->failOnError($this->browser->clickLinkById($id));
+    }
+
+    /**
+     *    Tests for the presence of a link label. Match is
+     *    case insensitive with normalised space.
+     *    @param string $label     Text between the anchor tags.
+     *    @param mixed $expected   Expected URL or expectation object.
+     *    @param string $message   Message to display. Default
+     *                             can be embedded with %s.
+     *    @return boolean          True if link present.
+     *    @access public
+     */
+    function assertLink($label, $expected = true, $message = '%s') {
+        $url = $this->browser->getLink($label);
+        if ($expected === true || ($expected !== true && $url === false)) {
+            return $this->assertTrue($url !== false, sprintf($message, "Link [$label] should exist"));
+        }
+        if (! SimpleExpectation::isExpectation($expected)) {
+            $expected = new IdenticalExpectation($expected);
+        }
+        return $this->assert($expected, $url->asString(), sprintf($message, "Link [$label] should match"));
+    }
+
+    /**
+     *    Tests for the non-presence of a link label. Match is
+     *    case insensitive with normalised space.
+     *    @param string/integer $label    Text between the anchor tags
+     *                                    or ID attribute.
+     *    @param string $message          Message to display. Default
+     *                                    can be embedded with %s.
+     *    @return boolean                 True if link missing.
+     *    @access public
+     */
+    function assertNoLink($label, $message = '%s') {
+        return $this->assertTrue(
+                $this->browser->getLink($label) === false,
+                sprintf($message, "Link [$label] should not exist"));
+    }
+
+    /**
+     *    Tests for the presence of a link id attribute.
+     *    @param string $id        Id attribute value.
+     *    @param mixed $expected   Expected URL or expectation object.
+     *    @param string $message   Message to display. Default
+     *                             can be embedded with %s.
+     *    @return boolean          True if link present.
+     *    @access public
+     */
+    function assertLinkById($id, $expected = true, $message = '%s') {
+        $url = $this->browser->getLinkById($id);
+        if ($expected === true) {
+            return $this->assertTrue($url !== false, sprintf($message, "Link ID [$id] should exist"));
+        }
+        if (! SimpleExpectation::isExpectation($expected)) {
+            $expected = new IdenticalExpectation($expected);
+        }
+        return $this->assert($expected, $url->asString(), sprintf($message, "Link ID [$id] should match"));
+    }
+
+    /**
+     *    Tests for the non-presence of a link label. Match is
+     *    case insensitive with normalised space.
+     *    @param string $id        Id attribute value.
+     *    @param string $message   Message to display. Default
+     *                             can be embedded with %s.
+     *    @return boolean          True if link missing.
+     *    @access public
+     */
+    function assertNoLinkById($id, $message = '%s') {
+        return $this->assertTrue(
+                $this->browser->getLinkById($id) === false,
+                sprintf($message, "Link ID [$id] should not exist"));
+    }
+
+    /**
+     *    Sets all form fields with that label, or name if there
+     *    is no label attached.
+     *    @param string $name    Name of field in forms.
+     *    @param string $value   New value of field.
+     *    @return boolean        True if field exists, otherwise false.
+     *    @access public
+     */
+    function setField($label, $value, $position=false) {
+        return $this->browser->setField($label, $value, $position);
+    }
+
+    /**
+     *    Sets all form fields with that name.
+     *    @param string $name    Name of field in forms.
+     *    @param string $value   New value of field.
+     *    @return boolean        True if field exists, otherwise false.
+     *    @access public
+     */
+    function setFieldByName($name, $value, $position=false) {
+        return $this->browser->setFieldByName($name, $value, $position);
+    }
+
+    /**
+     *    Sets all form fields with that id.
+     *    @param string/integer $id   Id of field in forms.
+     *    @param string $value        New value of field.
+     *    @return boolean             True if field exists, otherwise false.
+     *    @access public
+     */
+    function setFieldById($id, $value) {
+        return $this->browser->setFieldById($id, $value);
+    }
+
+    /**
+     *    Confirms that the form element is currently set
+     *    to the expected value. A missing form will always
+     *    fail. If no value is given then only the existence
+     *    of the field is checked.
+     *    @param string $name       Name of field in forms.
+     *    @param mixed $expected    Expected string/array value or
+     *                              false for unset fields.
+     *    @param string $message    Message to display. Default
+     *                              can be embedded with %s.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertField($label, $expected = true, $message = '%s') {
+        $value = $this->browser->getField($label);
+        return $this->assertFieldValue($label, $value, $expected, $message);
+    }
+
+    /**
+     *    Confirms that the form element is currently set
+     *    to the expected value. A missing form element will always
+     *    fail. If no value is given then only the existence
+     *    of the field is checked.
+     *    @param string $name       Name of field in forms.
+     *    @param mixed $expected    Expected string/array value or
+     *                              false for unset fields.
+     *    @param string $message    Message to display. Default
+     *                              can be embedded with %s.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertFieldByName($name, $expected = true, $message = '%s') {
+        $value = $this->browser->getFieldByName($name);
+        return $this->assertFieldValue($name, $value, $expected, $message);
+    }
+
+    /**
+     *    Confirms that the form element is currently set
+     *    to the expected value. A missing form will always
+     *    fail. If no ID is given then only the existence
+     *    of the field is checked.
+     *    @param string/integer $id  Name of field in forms.
+     *    @param mixed $expected     Expected string/array value or
+     *                               false for unset fields.
+     *    @param string $message     Message to display. Default
+     *                               can be embedded with %s.
+     *    @return boolean            True if pass.
+     *    @access public
+     */
+    function assertFieldById($id, $expected = true, $message = '%s') {
+        $value = $this->browser->getFieldById($id);
+        return $this->assertFieldValue($id, $value, $expected, $message);
+    }
+
+    /**
+     *    Tests the field value against the expectation.
+     *    @param string $identifier      Name, ID or label.
+     *    @param mixed $value            Current field value.
+     *    @param mixed $expected         Expected value to match.
+     *    @param string $message         Failure message.
+     *    @return boolean                True if pass
+     *    @access protected
+     */
+    protected function assertFieldValue($identifier, $value, $expected, $message) {
+        if ($expected === true) {
+            return $this->assertTrue(
+                    isset($value),
+                    sprintf($message, "Field [$identifier] should exist"));
+        }
+        if (! SimpleExpectation::isExpectation($expected)) {
+            $identifier = str_replace('%', '%%', $identifier);
+            $expected = new FieldExpectation(
+                    $expected,
+                    "Field [$identifier] should match with [%s]");
+        }
+        return $this->assert($expected, $value, $message);
+    }
+
+    /**
+     *    Checks the response code against a list
+     *    of possible values.
+     *    @param array $responses    Possible responses for a pass.
+     *    @param string $message     Message to display. Default
+     *                               can be embedded with %s.
+     *    @return boolean            True if pass.
+     *    @access public
+     */
+    function assertResponse($responses, $message = '%s') {
+        $responses = (is_array($responses) ? $responses : array($responses));
+        $code = $this->browser->getResponseCode();
+        $message = sprintf($message, "Expecting response in [" .
+                implode(", ", $responses) . "] got [$code]");
+        return $this->assertTrue(in_array($code, $responses), $message);
+    }
+
+    /**
+     *    Checks the mime type against a list
+     *    of possible values.
+     *    @param array $types      Possible mime types for a pass.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertMime($types, $message = '%s') {
+        $types = (is_array($types) ? $types : array($types));
+        $type = $this->browser->getMimeType();
+        $message = sprintf($message, "Expecting mime type in [" .
+                implode(", ", $types) . "] got [$type]");
+        return $this->assertTrue(in_array($type, $types), $message);
+    }
+
+    /**
+     *    Attempt to match the authentication type within
+     *    the security realm we are currently matching.
+     *    @param string $authentication   Usually basic.
+     *    @param string $message          Message to display.
+     *    @return boolean                 True if pass.
+     *    @access public
+     */
+    function assertAuthentication($authentication = false, $message = '%s') {
+        if (! $authentication) {
+            $message = sprintf($message, "Expected any authentication type, got [" .
+                    $this->browser->getAuthentication() . "]");
+            return $this->assertTrue(
+                    $this->browser->getAuthentication(),
+                    $message);
+        } else {
+            $message = sprintf($message, "Expected authentication [$authentication] got [" .
+                    $this->browser->getAuthentication() . "]");
+            return $this->assertTrue(
+                    strtolower($this->browser->getAuthentication()) == strtolower($authentication),
+                    $message);
+        }
+    }
+
+    /**
+     *    Checks that no authentication is necessary to view
+     *    the desired page.
+     *    @param string $message     Message to display.
+     *    @return boolean            True if pass.
+     *    @access public
+     */
+    function assertNoAuthentication($message = '%s') {
+        $message = sprintf($message, "Expected no authentication type, got [" .
+                $this->browser->getAuthentication() . "]");
+        return $this->assertFalse($this->browser->getAuthentication(), $message);
+    }
+
+    /**
+     *    Attempts to match the current security realm.
+     *    @param string $realm     Name of security realm.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertRealm($realm, $message = '%s') {
+        if (! SimpleExpectation::isExpectation($realm)) {
+            $realm = new EqualExpectation($realm);
+        }
+        return $this->assert(
+                $realm,
+                $this->browser->getRealm(),
+                "Expected realm -> $message");
+    }
+
+    /**
+     *    Checks each header line for the required value. If no
+     *    value is given then only an existence check is made.
+     *    @param string $header    Case insensitive header name.
+     *    @param mixed $value      Case sensitive trimmed string to
+     *                             match against. An expectation object
+     *                             can be used for pattern matching.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertHeader($header, $value = false, $message = '%s') {
+        return $this->assert(
+                new HttpHeaderExpectation($header, $value),
+                $this->browser->getHeaders(),
+                $message);
+    }
+
+    /**
+     *    Confirms that the header type has not been received.
+     *    Only the landing page is checked. If you want to check
+     *    redirect pages, then you should limit redirects so
+     *    as to capture the page you want.
+     *    @param string $header    Case insensitive header name.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertNoHeader($header, $message = '%s') {
+        return $this->assert(
+                new NoHttpHeaderExpectation($header),
+                $this->browser->getHeaders(),
+                $message);
+    }
+
+    /**
+     *    Tests the text between the title tags.
+     *    @param string/SimpleExpectation $title    Expected title.
+     *    @param string $message                    Message to display.
+     *    @return boolean                           True if pass.
+     *    @access public
+     */
+    function assertTitle($title = false, $message = '%s') {
+        if (! SimpleExpectation::isExpectation($title)) {
+            $title = new EqualExpectation($title);
+        }
+        return $this->assert($title, $this->browser->getTitle(), $message);
+    }
+
+    /**
+     *    Will trigger a pass if the text is found in the plain
+     *    text form of the page.
+     *    @param string $text       Text to look for.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertText($text, $message = '%s') {
+        return $this->assert(
+                new TextExpectation($text),
+                $this->browser->getContentAsText(),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the text is not found in the plain
+     *    text form of the page.
+     *    @param string $text       Text to look for.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertNoText($text, $message = '%s') {
+        return $this->assert(
+                new NoTextExpectation($text),
+                $this->browser->getContentAsText(),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the Perl regex pattern
+     *    is found in the raw content.
+     *    @param string $pattern    Perl regex to look for including
+     *                              the regex delimiters.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertPattern($pattern, $message = '%s') {
+        return $this->assert(
+                new PatternExpectation($pattern),
+                $this->browser->getContent(),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the perl regex pattern
+     *    is not present in raw content.
+     *    @param string $pattern    Perl regex to look for including
+     *                              the regex delimiters.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertNoPattern($pattern, $message = '%s') {
+        return $this->assert(
+                new NoPatternExpectation($pattern),
+                $this->browser->getContent(),
+                $message);
+    }
+
+    /**
+     *    Checks that a cookie is set for the current page
+     *    and optionally checks the value.
+     *    @param string $name        Name of cookie to test.
+     *    @param string $expected    Expected value as a string or
+     *                               false if any value will do.
+     *    @param string $message     Message to display.
+     *    @return boolean            True if pass.
+     *    @access public
+     */
+    function assertCookie($name, $expected = false, $message = '%s') {
+        $value = $this->getCookie($name);
+        if (! $expected) {
+            return $this->assertTrue(
+                    $value,
+                    sprintf($message, "Expecting cookie [$name]"));
+        }
+        if (! SimpleExpectation::isExpectation($expected)) {
+            $expected = new EqualExpectation($expected);
+        }
+        return $this->assert($expected, $value, "Expecting cookie [$name] -> $message");
+    }
+
+    /**
+     *    Checks that no cookie is present or that it has
+     *    been successfully cleared.
+     *    @param string $name        Name of cookie to test.
+     *    @param string $message     Message to display.
+     *    @return boolean            True if pass.
+     *    @access public
+     */
+    function assertNoCookie($name, $message = '%s') {
+        return $this->assertTrue(
+                $this->getCookie($name) === null or $this->getCookie($name) === false,
+                sprintf($message, "Not expecting cookie [$name]"));
+    }
+
+    /**
+     *    Called from within the test methods to register
+     *    passes and failures.
+     *    @param boolean $result    Pass on true.
+     *    @param string $message    Message to display describing
+     *                              the test state.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertTrue($result, $message = '%s') {
+        return $this->assert(new TrueExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will be true on false and vice versa. False
+     *    is the PHP definition of false, so that null,
+     *    empty strings, zero and an empty array all count
+     *    as false.
+     *    @param boolean $result    Pass on false.
+     *    @param string $message    Message to display.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertFalse($result, $message = '%s') {
+        return $this->assert(new FalseExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    the same value only. Otherwise a fail. This
+     *    is for testing hand extracted text, etc.
+     *    @param mixed $first          Value to compare.
+     *    @param mixed $second         Value to compare.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass
+     *    @access public
+     */
+    function assertEqual($first, $second, $message = '%s') {
+        return $this->assert(
+                new EqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    a different value. Otherwise a fail. This
+     *    is for testing hand extracted text, etc.
+     *    @param mixed $first           Value to compare.
+     *    @param mixed $second          Value to compare.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertNotEqual($first, $second, $message = '%s') {
+        return $this->assert(
+                new NotEqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Uses a stack trace to find the line of an assertion.
+     *    @return string           Line number of first assert*
+     *                             method embedded in format string.
+     *    @access public
+     */
+    function getAssertionLine() {
+        $trace = new SimpleStackTrace(array('assert', 'click', 'pass', 'fail'));
+        return $trace->traceMethod();
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/xml.php b/3rdparty/simpletest/xml.php
new file mode 100755
index 00000000000..54fb6f5b16d
--- /dev/null
+++ b/3rdparty/simpletest/xml.php
@@ -0,0 +1,647 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: xml.php 1787 2008-04-26 20:35:39Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/scorer.php');
+/**#@-*/
+
+/**
+ *    Creates the XML needed for remote communication
+ *    by SimpleTest.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class XmlReporter extends SimpleReporter {
+    private $indent;
+    private $namespace;
+
+    /**
+     *    Sets up indentation and namespace.
+     *    @param string $namespace        Namespace to add to each tag.
+     *    @param string $indent           Indenting to add on each nesting.
+     *    @access public
+     */
+    function __construct($namespace = false, $indent = '  ') {
+        parent::__construct();
+        $this->namespace = ($namespace ? $namespace . ':' : '');
+        $this->indent = $indent;
+    }
+
+    /**
+     *    Calculates the pretty printing indent level
+     *    from the current level of nesting.
+     *    @param integer $offset  Extra indenting level.
+     *    @return string          Leading space.
+     *    @access protected
+     */
+    protected function getIndent($offset = 0) {
+        return str_repeat(
+                $this->indent,
+                count($this->getTestList()) + $offset);
+    }
+
+    /**
+     *    Converts character string to parsed XML
+     *    entities string.
+     *    @param string text        Unparsed character data.
+     *    @return string            Parsed character data.
+     *    @access public
+     */
+    function toParsedXml($text) {
+        return str_replace(
+                array('&', '<', '>', '"', '\''),
+                array('&amp;', '&lt;', '&gt;', '&quot;', '&apos;'),
+                $text);
+    }
+
+    /**
+     *    Paints the start of a group test.
+     *    @param string $test_name   Name of test that is starting.
+     *    @param integer $size       Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_name, $size) {
+        parent::paintGroupStart($test_name, $size);
+        print $this->getIndent();
+        print "<" . $this->namespace . "group size=\"$size\">\n";
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "name>" .
+                $this->toParsedXml($test_name) .
+                "</" . $this->namespace . "name>\n";
+    }
+
+    /**
+     *    Paints the end of a group test.
+     *    @param string $test_name   Name of test that is ending.
+     *    @access public
+     */
+    function paintGroupEnd($test_name) {
+        print $this->getIndent();
+        print "</" . $this->namespace . "group>\n";
+        parent::paintGroupEnd($test_name);
+    }
+
+    /**
+     *    Paints the start of a test case.
+     *    @param string $test_name   Name of test that is starting.
+     *    @access public
+     */
+    function paintCaseStart($test_name) {
+        parent::paintCaseStart($test_name);
+        print $this->getIndent();
+        print "<" . $this->namespace . "case>\n";
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "name>" .
+                $this->toParsedXml($test_name) .
+                "</" . $this->namespace . "name>\n";
+    }
+
+    /**
+     *    Paints the end of a test case.
+     *    @param string $test_name   Name of test that is ending.
+     *    @access public
+     */
+    function paintCaseEnd($test_name) {
+        print $this->getIndent();
+        print "</" . $this->namespace . "case>\n";
+        parent::paintCaseEnd($test_name);
+    }
+
+    /**
+     *    Paints the start of a test method.
+     *    @param string $test_name   Name of test that is starting.
+     *    @access public
+     */
+    function paintMethodStart($test_name) {
+        parent::paintMethodStart($test_name);
+        print $this->getIndent();
+        print "<" . $this->namespace . "test>\n";
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "name>" .
+                $this->toParsedXml($test_name) .
+                "</" . $this->namespace . "name>\n";
+    }
+
+    /**
+     *    Paints the end of a test method.
+     *    @param string $test_name   Name of test that is ending.
+     *    @param integer $progress   Number of test cases ending.
+     *    @access public
+     */
+    function paintMethodEnd($test_name) {
+        print $this->getIndent();
+        print "</" . $this->namespace . "test>\n";
+        parent::paintMethodEnd($test_name);
+    }
+
+    /**
+     *    Paints pass as XML.
+     *    @param string $message        Message to encode.
+     *    @access public
+     */
+    function paintPass($message) {
+        parent::paintPass($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "pass>";
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "pass>\n";
+    }
+
+    /**
+     *    Paints failure as XML.
+     *    @param string $message        Message to encode.
+     *    @access public
+     */
+    function paintFail($message) {
+        parent::paintFail($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "fail>";
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "fail>\n";
+    }
+
+    /**
+     *    Paints error as XML.
+     *    @param string $message        Message to encode.
+     *    @access public
+     */
+    function paintError($message) {
+        parent::paintError($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "exception>";
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "exception>\n";
+    }
+
+    /**
+     *    Paints exception as XML.
+     *    @param Exception $exception    Exception to encode.
+     *    @access public
+     */
+    function paintException($exception) {
+        parent::paintException($exception);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "exception>";
+        $message = 'Unexpected exception of type [' . get_class($exception) .
+                '] with message ['. $exception->getMessage() .
+                '] in ['. $exception->getFile() .
+                ' line ' . $exception->getLine() . ']';
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "exception>\n";
+    }
+
+    /**
+     *    Paints the skipping message and tag.
+     *    @param string $message        Text to display in skip tag.
+     *    @access public
+     */
+    function paintSkip($message) {
+        parent::paintSkip($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "skip>";
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "skip>\n";
+    }
+
+    /**
+     *    Paints a simple supplementary message.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintMessage($message) {
+        parent::paintMessage($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "message>";
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "message>\n";
+    }
+
+    /**
+     *    Paints a formatted ASCII message such as a
+     *    privateiable dump.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+        parent::paintFormattedMessage($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "formatted>";
+        print "<![CDATA[$message]]>";
+        print "</" . $this->namespace . "formatted>\n";
+    }
+
+    /**
+     *    Serialises the event object.
+     *    @param string $type        Event type as text.
+     *    @param mixed $payload      Message or object.
+     *    @access public
+     */
+    function paintSignal($type, $payload) {
+        parent::paintSignal($type, $payload);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "signal type=\"$type\">";
+        print "<![CDATA[" . serialize($payload) . "]]>";
+        print "</" . $this->namespace . "signal>\n";
+    }
+
+    /**
+     *    Paints the test document header.
+     *    @param string $test_name     First test top level
+     *                                 to start.
+     *    @access public
+     *    @abstract
+     */
+    function paintHeader($test_name) {
+        if (! SimpleReporter::inCli()) {
+            header('Content-type: text/xml');
+        }
+        print "<?xml version=\"1.0\"";
+        if ($this->namespace) {
+            print " xmlns:" . $this->namespace .
+                    "=\"www.lastcraft.com/SimpleTest/Beta3/Report\"";
+        }
+        print "?>\n";
+        print "<" . $this->namespace . "run>\n";
+    }
+
+    /**
+     *    Paints the test document footer.
+     *    @param string $test_name        The top level test.
+     *    @access public
+     *    @abstract
+     */
+    function paintFooter($test_name) {
+        print "</" . $this->namespace . "run>\n";
+    }
+}
+
+/**
+ *    Accumulator for incoming tag. Holds the
+ *    incoming test structure information for
+ *    later dispatch to the reporter.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NestingXmlTag {
+    private $name;
+    private $attributes;
+
+    /**
+     *    Sets the basic test information except
+     *    the name.
+     *    @param hash $attributes   Name value pairs.
+     *    @access public
+     */
+    function NestingXmlTag($attributes) {
+        $this->name = false;
+        $this->attributes = $attributes;
+    }
+
+    /**
+     *    Sets the test case/method name.
+     *    @param string $name        Name of test.
+     *    @access public
+     */
+    function setName($name) {
+        $this->name = $name;
+    }
+
+    /**
+     *    Accessor for name.
+     *    @return string        Name of test.
+     *    @access public
+     */
+    function getName() {
+        return $this->name;
+    }
+
+    /**
+     *    Accessor for attributes.
+     *    @return hash        All attributes.
+     *    @access protected
+     */
+    protected function getAttributes() {
+        return $this->attributes;
+    }
+}
+
+/**
+ *    Accumulator for incoming method tag. Holds the
+ *    incoming test structure information for
+ *    later dispatch to the reporter.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NestingMethodTag extends NestingXmlTag {
+
+    /**
+     *    Sets the basic test information except
+     *    the name.
+     *    @param hash $attributes   Name value pairs.
+     *    @access public
+     */
+    function NestingMethodTag($attributes) {
+        $this->NestingXmlTag($attributes);
+    }
+
+    /**
+     *    Signals the appropriate start event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintStart(&$listener) {
+        $listener->paintMethodStart($this->getName());
+    }
+
+    /**
+     *    Signals the appropriate end event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintEnd(&$listener) {
+        $listener->paintMethodEnd($this->getName());
+    }
+}
+
+/**
+ *    Accumulator for incoming case tag. Holds the
+ *    incoming test structure information for
+ *    later dispatch to the reporter.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NestingCaseTag extends NestingXmlTag {
+
+    /**
+     *    Sets the basic test information except
+     *    the name.
+     *    @param hash $attributes   Name value pairs.
+     *    @access public
+     */
+    function NestingCaseTag($attributes) {
+        $this->NestingXmlTag($attributes);
+    }
+
+    /**
+     *    Signals the appropriate start event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintStart(&$listener) {
+        $listener->paintCaseStart($this->getName());
+    }
+
+    /**
+     *    Signals the appropriate end event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintEnd(&$listener) {
+        $listener->paintCaseEnd($this->getName());
+    }
+}
+
+/**
+ *    Accumulator for incoming group tag. Holds the
+ *    incoming test structure information for
+ *    later dispatch to the reporter.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NestingGroupTag extends NestingXmlTag {
+
+    /**
+     *    Sets the basic test information except
+     *    the name.
+     *    @param hash $attributes   Name value pairs.
+     *    @access public
+     */
+    function NestingGroupTag($attributes) {
+        $this->NestingXmlTag($attributes);
+    }
+
+    /**
+     *    Signals the appropriate start event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintStart(&$listener) {
+        $listener->paintGroupStart($this->getName(), $this->getSize());
+    }
+
+    /**
+     *    Signals the appropriate end event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintEnd(&$listener) {
+        $listener->paintGroupEnd($this->getName());
+    }
+
+    /**
+     *    The size in the attributes.
+     *    @return integer     Value of size attribute or zero.
+     *    @access public
+     */
+    function getSize() {
+        $attributes = $this->getAttributes();
+        if (isset($attributes['SIZE'])) {
+            return (integer)$attributes['SIZE'];
+        }
+        return 0;
+    }
+}
+
+/**
+ *    Parser for importing the output of the XmlReporter.
+ *    Dispatches that output to another reporter.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleTestXmlParser {
+    private $listener;
+    private $expat;
+    private $tag_stack;
+    private $in_content_tag;
+    private $content;
+    private $attributes;
+
+    /**
+     *    Loads a listener with the SimpleReporter
+     *    interface.
+     *    @param SimpleReporter $listener   Listener of tag events.
+     *    @access public
+     */
+    function SimpleTestXmlParser(&$listener) {
+        $this->listener = &$listener;
+        $this->expat = &$this->createParser();
+        $this->tag_stack = array();
+        $this->in_content_tag = false;
+        $this->content = '';
+        $this->attributes = array();
+    }
+
+    /**
+     *    Parses a block of XML sending the results to
+     *    the listener.
+     *    @param string $chunk        Block of text to read.
+     *    @return boolean             True if valid XML.
+     *    @access public
+     */
+    function parse($chunk) {
+        if (! xml_parse($this->expat, $chunk)) {
+            trigger_error('XML parse error with ' .
+                    xml_error_string(xml_get_error_code($this->expat)));
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Sets up expat as the XML parser.
+     *    @return resource        Expat handle.
+     *    @access protected
+     */
+    protected function &createParser() {
+        $expat = xml_parser_create();
+        xml_set_object($expat, $this);
+        xml_set_element_handler($expat, 'startElement', 'endElement');
+        xml_set_character_data_handler($expat, 'addContent');
+        xml_set_default_handler($expat, 'defaultContent');
+        return $expat;
+    }
+
+    /**
+     *    Opens a new test nesting level.
+     *    @return NestedXmlTag     The group, case or method tag
+     *                             to start.
+     *    @access private
+     */
+    protected function pushNestingTag($nested) {
+        array_unshift($this->tag_stack, $nested);
+    }
+
+    /**
+     *    Accessor for current test structure tag.
+     *    @return NestedXmlTag     The group, case or method tag
+     *                             being parsed.
+     *    @access private
+     */
+    protected function &getCurrentNestingTag() {
+        return $this->tag_stack[0];
+    }
+
+    /**
+     *    Ends a nesting tag.
+     *    @return NestedXmlTag     The group, case or method tag
+     *                             just finished.
+     *    @access private
+     */
+    protected function popNestingTag() {
+        return array_shift($this->tag_stack);
+    }
+
+    /**
+     *    Test if tag is a leaf node with only text content.
+     *    @param string $tag        XML tag name.
+     *    @return @boolean          True if leaf, false if nesting.
+     *    @private
+     */
+    protected function isLeaf($tag) {
+        return in_array($tag, array(
+                'NAME', 'PASS', 'FAIL', 'EXCEPTION', 'SKIP', 'MESSAGE', 'FORMATTED', 'SIGNAL'));
+    }
+
+    /**
+     *    Handler for start of event element.
+     *    @param resource $expat     Parser handle.
+     *    @param string $tag         Element name.
+     *    @param hash $attributes    Name value pairs.
+     *                               Attributes without content
+     *                               are marked as true.
+     *    @access protected
+     */
+    protected function startElement($expat, $tag, $attributes) {
+        $this->attributes = $attributes;
+        if ($tag == 'GROUP') {
+            $this->pushNestingTag(new NestingGroupTag($attributes));
+        } elseif ($tag == 'CASE') {
+            $this->pushNestingTag(new NestingCaseTag($attributes));
+        } elseif ($tag == 'TEST') {
+            $this->pushNestingTag(new NestingMethodTag($attributes));
+        } elseif ($this->isLeaf($tag)) {
+            $this->in_content_tag = true;
+            $this->content = '';
+        }
+    }
+
+    /**
+     *    End of element event.
+     *    @param resource $expat     Parser handle.
+     *    @param string $tag         Element name.
+     *    @access protected
+     */
+    protected function endElement($expat, $tag) {
+        $this->in_content_tag = false;
+        if (in_array($tag, array('GROUP', 'CASE', 'TEST'))) {
+            $nesting_tag = $this->popNestingTag();
+            $nesting_tag->paintEnd($this->listener);
+        } elseif ($tag == 'NAME') {
+            $nesting_tag = &$this->getCurrentNestingTag();
+            $nesting_tag->setName($this->content);
+            $nesting_tag->paintStart($this->listener);
+        } elseif ($tag == 'PASS') {
+            $this->listener->paintPass($this->content);
+        } elseif ($tag == 'FAIL') {
+            $this->listener->paintFail($this->content);
+        } elseif ($tag == 'EXCEPTION') {
+            $this->listener->paintError($this->content);
+        } elseif ($tag == 'SKIP') {
+            $this->listener->paintSkip($this->content);
+        } elseif ($tag == 'SIGNAL') {
+            $this->listener->paintSignal(
+                    $this->attributes['TYPE'],
+                    unserialize($this->content));
+        } elseif ($tag == 'MESSAGE') {
+            $this->listener->paintMessage($this->content);
+        } elseif ($tag == 'FORMATTED') {
+            $this->listener->paintFormattedMessage($this->content);
+        }
+    }
+
+    /**
+     *    Content between start and end elements.
+     *    @param resource $expat     Parser handle.
+     *    @param string $text        Usually output messages.
+     *    @access protected
+     */
+    protected function addContent($expat, $text) {
+        if ($this->in_content_tag) {
+            $this->content .= $text;
+        }
+        return true;
+    }
+
+    /**
+     *    XML and Doctype handler. Discards all such content.
+     *    @param resource $expat     Parser handle.
+     *    @param string $default     Text of default content.
+     *    @access protected
+     */
+    protected function defaultContent($expat, $default) {
+    }
+}
+?>
diff --git a/3rdparty/timepicker/GPL-LICENSE.txt b/3rdparty/timepicker/GPL-LICENSE.txt
new file mode 100644
index 00000000000..932f11115fe
--- /dev/null
+++ b/3rdparty/timepicker/GPL-LICENSE.txt
@@ -0,0 +1,278 @@
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+        the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+        this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+    distribute and/or modify the software.
+
+    Also, for each author's protection and ours, we want to make certain
+    that everyone understands that there is no warranty for this free
+    software.  If the software is modified by someone else and passed on, we
+    want its recipients to know that what they have is not the original, so
+    that any problems introduced by others will not reflect on the original
+    authors' reputations.
+
+    Finally, any free program is threatened constantly by software
+    patents.  We wish to avoid the danger that redistributors of a free
+    program will individually obtain patent licenses, in effect making the
+    program proprietary.  To prevent this, we have made it clear that any
+    patent must be licensed for everyone's free use or not licensed at all.
+
+    The precise terms and conditions for copying, distribution and
+    modification follow.
+
+    GNU GENERAL PUBLIC LICENSE
+    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+    0. This License applies to any program or other work which contains
+    a notice placed by the copyright holder saying it may be distributed
+    under the terms of this General Public License.  The "Program", below,
+    refers to any such program or work, and a "work based on the Program"
+    means either the Program or any derivative work under copyright law:
+    that is to say, a work containing the Program or a portion of it,
+    either verbatim or with modifications and/or translated into another
+    language.  (Hereinafter, translation is included without limitation in
+            the term "modification".)  Each licensee is addressed as "you".
+
+    Activities other than copying, distribution and modification are not
+    covered by this License; they are outside its scope.  The act of
+    running the Program is not restricted, and the output from the Program
+    is covered only if its contents constitute a work based on the
+    Program (independent of having been made by running the Program).
+    Whether that is true depends on what the Program does.
+
+    1. You may copy and distribute verbatim copies of the Program's
+    source code as you receive it, in any medium, provided that you
+    conspicuously and appropriately publish on each copy an appropriate
+    copyright notice and disclaimer of warranty; keep intact all the
+    notices that refer to this License and to the absence of any warranty;
+    and give any other recipients of the Program a copy of this License
+    along with the Program.
+
+    You may charge a fee for the physical act of transferring a copy, and
+    you may at your option offer warranty protection in exchange for a fee.
+
+    2. You may modify your copy or copies of the Program or any portion
+    of it, thus forming a work based on the Program, and copy and
+    distribute such modifications or work under the terms of Section 1
+    above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+            a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+            does not normally print such an announcement, your work based on
+            the Program is not required to print an announcement.)
+
+    These requirements apply to the modified work as a whole.  If
+    identifiable sections of that work are not derived from the Program,
+    and can be reasonably considered independent and separate works in
+    themselves, then this License, and its terms, do not apply to those
+    sections when you distribute them as separate works.  But when you
+    distribute the same sections as part of a whole which is a work based
+    on the Program, the distribution of the whole must be on the terms of
+    this License, whose permissions for other licensees extend to the
+    entire whole, and thus to each and every part regardless of who wrote it.
+
+    Thus, it is not the intent of this section to claim rights or contest
+    your rights to work written entirely by you; rather, the intent is to
+    exercise the right to control the distribution of derivative or
+    collective works based on the Program.
+
+    In addition, mere aggregation of another work not based on the Program
+    with the Program (or with a work based on the Program) on a volume of
+    a storage or distribution medium does not bring the other work under
+    the scope of this License.
+
+    3. You may copy and distribute the Program (or a work based on it,
+            under Section 2) in object code or executable form under the terms of
+    Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+            allowed only for noncommercial distribution and only if you
+            received the program in object code or executable form with such
+            an offer, in accord with Subsection b above.)
+
+    The source code for a work means the preferred form of the work for
+    making modifications to it.  For an executable work, complete source
+    code means all the source code for all modules it contains, plus any
+    associated interface definition files, plus the scripts used to
+    control compilation and installation of the executable.  However, as a
+    special exception, the source code distributed need not include
+    anything that is normally distributed (in either source or binary
+            form) with the major components (compiler, kernel, and so on) of the
+    operating system on which the executable runs, unless that component
+    itself accompanies the executable.
+
+    If distribution of executable or object code is made by offering
+    access to copy from a designated place, then offering equivalent
+    access to copy the source code from the same place counts as
+    distribution of the source code, even though third parties are not
+    compelled to copy the source along with the object code.
+
+    4. You may not copy, modify, sublicense, or distribute the Program
+    except as expressly provided under this License.  Any attempt
+    otherwise to copy, modify, sublicense or distribute the Program is
+    void, and will automatically terminate your rights under this License.
+    However, parties who have received copies, or rights, from you under
+    this License will not have their licenses terminated so long as such
+    parties remain in full compliance.
+
+    5. You are not required to accept this License, since you have not
+    signed it.  However, nothing else grants you permission to modify or
+    distribute the Program or its derivative works.  These actions are
+    prohibited by law if you do not accept this License.  Therefore, by
+    modifying or distributing the Program (or any work based on the
+            Program), you indicate your acceptance of this License to do so, and
+    all its terms and conditions for copying, distributing or modifying
+    the Program or works based on it.
+
+    6. Each time you redistribute the Program (or any work based on the
+            Program), the recipient automatically receives a license from the
+    original licensor to copy, distribute or modify the Program subject to
+    these terms and conditions.  You may not impose any further
+    restrictions on the recipients' exercise of the rights granted herein.
+    You are not responsible for enforcing compliance by third parties to
+    this License.
+
+    7. If, as a consequence of a court judgment or allegation of patent
+    infringement or for any other reason (not limited to patent issues),
+    conditions are imposed on you (whether by court order, agreement or
+            otherwise) that contradict the conditions of this License, they do not
+    excuse you from the conditions of this License.  If you cannot
+    distribute so as to satisfy simultaneously your obligations under this
+    License and any other pertinent obligations, then as a consequence you
+    may not distribute the Program at all.  For example, if a patent
+    license would not permit royalty-free redistribution of the Program by
+    all those who receive copies directly or indirectly through you, then
+    the only way you could satisfy both it and this License would be to
+    refrain entirely from distribution of the Program.
+
+    If any portion of this section is held invalid or unenforceable under
+    any particular circumstance, the balance of the section is intended to
+    apply and the section as a whole is intended to apply in other
+    circumstances.
+
+    It is not the purpose of this section to induce you to infringe any
+    patents or other property right claims or to contest validity of any
+    such claims; this section has the sole purpose of protecting the
+    integrity of the free software distribution system, which is
+    implemented by public license practices.  Many people have made
+    generous contributions to the wide range of software distributed
+    through that system in reliance on consistent application of that
+    system; it is up to the author/donor to decide if he or she is willing
+    to distribute software through any other system and a licensee cannot
+    impose that choice.
+
+    This section is intended to make thoroughly clear what is believed to
+    be a consequence of the rest of this License.
+
+    8. If the distribution and/or use of the Program is restricted in
+    certain countries either by patents or by copyrighted interfaces, the
+    original copyright holder who places the Program under this License
+    may add an explicit geographical distribution limitation excluding
+    those countries, so that distribution is permitted only in or among
+    countries not thus excluded.  In such case, this License incorporates
+    the limitation as if written in the body of this License.
+
+    9. The Free Software Foundation may publish revised and/or new versions
+    of the General Public License from time to time.  Such new versions will
+    be similar in spirit to the present version, but may differ in detail to
+    address new problems or concerns.
+
+    Each version is given a distinguishing version number.  If the Program
+    specifies a version number of this License which applies to it and "any
+    later version", you have the option of following the terms and conditions
+    either of that version or of any later version published by the Free
+    Software Foundation.  If the Program does not specify a version number of
+    this License, you may choose any version ever published by the Free Software
+    Foundation.
+
+    10. If you wish to incorporate parts of the Program into other free
+    programs whose distribution conditions are different, write to the author
+    to ask for permission.  For software which is copyrighted by the Free
+    Software Foundation, write to the Free Software Foundation; we sometimes
+    make exceptions for this.  Our decision will be guided by the two goals
+    of preserving the free status of all derivatives of our free software and
+    of promoting the sharing and reuse of software generally.
+
+    NO WARRANTY
+
+    11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+    FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+    PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+    OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+    TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+    PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+    REPAIR OR CORRECTION.
+
+    12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+    WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+    REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+    INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+    OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+            TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+            YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+            PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGES.""''''''
diff --git a/3rdparty/timepicker/MIT-LICENSE.txt b/3rdparty/timepicker/MIT-LICENSE.txt
new file mode 100644
index 00000000000..532704636b7
--- /dev/null
+++ b/3rdparty/timepicker/MIT-LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2011 John Resig, http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_18_b81900_40x40.png
new file mode 100644
index 0000000000000000000000000000000000000000..954e22dbd99e8c6dd7091335599abf2d10bf8003
GIT binary patch
literal 260
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEr#)R9Ln2z=UU%d=WFXS=@V?HT
z#xG*`>Yvsgk=}99w^d^D^d*@m74oMo<%#FcopJf?u00-~YVKV2wzrI*_R6;UORMea
zBFVSEnN~eiVA6V&z`E)YLz5Aok^D)In}Yn=OzDpgR5Wv0XfT8pOkmV{sKAJ-PO9#T
zZK}IXj&Q-V!U)!LcB_3K<j6=ku*!%uXjy#leKdQ?`ZvP&RiaPVOzxQ$`O)`M(6sLS
yN%J;Y?DO0<r7?ff#!c6LsA*2U`f2*?C%gsKpMo6zvorv`#o+1c=d#Wzp$Py>0&C*{

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_20_666666_40x40.png b/3rdparty/timepicker/css/include/images/ui-bg_diagonals-thick_20_666666_40x40.png
new file mode 100644
index 0000000000000000000000000000000000000000..64ece5707d91a6edf9fad4bfcce0c4dbcafcf58d
GIT binary patch
literal 251
zcmV<X00jSuP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70002ONkl<ZScUD^
zT?&IR7(~(AY#^)6!n1<<Vj)fQYm^M-n@5r1C}@~h2;ohZ7-N3vC*J$+J$LlEJIhL0
z?fU|%;UEDj;@||T;sBg74hkR1O4$<++XU{$LE{Z7;GhCj!9fA2go6yIhJysCh=UWT
ziUV-UI2ia*&y+p!utUI|$6*(^`>bvPcjKS|RKP(6sDcCAB(_QB%0978a<$Ah$!b|E
zwn;|HO0i8cQ<lay$(1s&O|n)t8rvkbvR?jjlN@>j@~)s!ajF0S002ovPDHLkV1oEp
BYH0uf

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_flat_10_000000_40x100.png b/3rdparty/timepicker/css/include/images/ui-bg_flat_10_000000_40x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..abdc01082bf3534eafecc5819d28c9574d44ea89
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FsY*{5$B>N1x91EQ4=4yQY-ImG
zFPf9b{J;c_6SHRK%WcbN_hZpM=(Ry;4Rxv2@@2Y=$K57eF$X$=!PC{xWt~$(69B)$
BI)4BF

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_glass_100_f6f6f6_1x400.png b/3rdparty/timepicker/css/include/images/ui-bg_glass_100_f6f6f6_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b383f4d2eab09c0f2a739d6b232c32934bc620b
GIT binary patch
literal 104
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnour1U*q978O6-yYw{%b*}|_(02F
z@qbE9)0CJMo;*v*PWv`Vh2h6EmG8IS-Cm{3U~`<YvxSSFU3)<QP%DF{tDnm{r-UW|
Dvd<uf

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_glass_100_fdf5ce_1x400.png b/3rdparty/timepicker/css/include/images/ui-bg_glass_100_fdf5ce_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..a23baad25b1d1ff36e17361eab24271f2e9b7326
GIT binary patch
literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouq+C2*978O6lYjjF{IFh)jg74>
zFlmZ}YMcJY=eo?o%*@I?2`NblNeMudl#t?<YIry`QK*OGr~otD9plAEGz`5G6d9zp
Wa55e{GUW=;JO)o!KbLh*2~7a@&m@!p

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_glass_65_ffffff_1x400.png b/3rdparty/timepicker/css/include/images/ui-bg_glass_65_ffffff_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..42ccba269b6e91bef12ad0fa18be651b5ef0ee68
GIT binary patch
literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouqzpV=978O6-=0?FV^9z|eBtf=
z|7WztIJ;WT>{+tN>ySr~=F{k$>;_x^_y?afmf9pRKH0)6?eSP?3s5hEr>mdKI;Vst
E0O<Z9>;M1&

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/3rdparty/timepicker/css/include/images/ui-bg_gloss-wave_35_f6a828_500x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..39d5824d6af5456f1e89fc7847ea3599ea5fd815
GIT binary patch
literal 3762
zcmb_eYgiKKwx-=Q?P<E4nMM;$eWu2m#PU%`&Ae^LOv^6gctJ3vM8!lUG!aCxQ#0eJ
zq?xIqDJi9<fFp>di0+w!yaC|_1uvA>yaxz|iX3eB<LqajpXblFzRUBi^{w~$)_UKp
zpDz0D*=4#5008Vc>v#HR0ASmSVIKMS&kf`CSAV4g0DJLgPkRO79xj%J<(hH6`bTGj
zrr^$JeiHJI?;s&<5pRw-^kj}=E;X0OX+pgz+f5GVt0NQv_gbu0>-8J+F$O>HpW?Lx
z+YFO`CV&6VV9fsEwG#js0_-|v*!ujZ*M=jfo457?0Do-z<^}+8bI+qk+W~+$zz%Z&
z;L7&@&ns`l8Ofh*Wd<Cp_>U0pO%RP^?Xa_h7I}7K#}4Xt`s%-(m-enaPWX<H>$O&-
zX~a1aOzn?!r?5wJVBNPJ_o8-(9Fz<_c1LYGxUl(E+Wdx?wkNHH2T%eWq9Kz00h#RB
zYKI~=a<9_QqC^n<>hyWlS66waWgyAP#t&TfTWP=Sxa)ukRY%j7WH}(@r=B^W_;b&M
zRzPYsb*j^Kou%%`K6VP+dKtR@x~qEHq4rXMxoX-gcSf&->lMY%TMXF!Gw_A)(tp6}
z2A%kN3twbr%KyUrrmw24V3d%wzK<-q(M;MTr41}un`P!!xejADEv_CJ{CTif907B&
zEP`pDJIZHVgnmxh$EZnBOUxz~Ap+ZzKbFmg39_n-)$wY!Q@i~5aGmHbN7&*gk<HNQ
z!$-sS))5(#?qPW$1C^3#;cFvQMWTd)d(I_4awE^ZjGC%XcnSGez>q9zWgV|2(Zhxl
zoDqJp&MxW(qX#C@oF8L)*r$RdSjVFSc$%z?*9%YoZ6sOZ!vtxXtBM<*r82<p7}?1@
zveQI&tiNm{;57jipQbO}b?9l*l4nGAT4Y=-w()@*#J1?%2{)nY^{|NO=xM)s?jR6<
ziJ!fSOOPs*$8->vyC}_Eiz1PJ2L$bttko`=+fH{Ne@G#lMDxkKt_y)O(J5&Ak)w-I
znm!vzYX3$kLDG$hOp-KJg~7}M;73BFWA{!a61fe?NJkjR_}Xw+*`O0=AGg7&dU<kQ
zA;d%-zM*iwS2t8Y)Gu@JK&A)fV=HHvbW`6mV+EZrtJSauApMCndBS~F>A`A?9`whW
zM{fkFf`G`P^9j*|-q9KLvS<191z9a^mK3Lss}W8O=sZ}N$V4Fh*SWF5NbZQ>p{0>$
z0pe}d$*s!y<I6P@1-n$GE>*R&NSXbjmld6{4Y;O89MuDTK0Hn0C?QdL9z1qGegXs!
z7$MIGkPkwdHF2os-Z-e85B?5An>yc|m<}>!Iirg%H-<NQ%ws0uIi51-a5phDmp{k5
zD(zjPC;t}@{w)+0&{l~FS*>%F11XY{{>@kgL>a#6fM9JzBE&an&F>eWh|b0^kJ<?n
zs=7WyuX=fIhvAjTTX`c}HUH)bTTI;OJGlyB{(NK&G;Htmn6^?c?TaAsOV}uBUtAa>
zNBM5*nCa~(xwn~rG~<cfPp*ub4V(WF)lGbJpS(|MvAA83yV}}9bfbt(>>GSG9mz3h
z9F~64y}giIrz^lfl|_5HpUsG}?Wpr*&f?bS=|9biqivN)-a~u>uK<{Lfcng{663QL
zLXzO@*N5)q4C=j6E8nC+P%lEwI#~0wkt;M4Y8!+DYzN2rBuYao1*HRIa^NC9nFeep
z+ns5$X9Bh48S-`ss!k&!J#Ddd=j1O-9}?`v(B|<M1@-U18t+Js;ZNHIk3$u$U;Eyu
z3exyGipUQbO;S|Bzp(hX{&!NB@oq*gb}e^)68}5#!kH$BhK<@5!ubu^XDa&d1C#@|
z3yY}&(~QVLCVdv){)I_ECxKsIlmW8LZ!;=rtk4ZaX!xm*=*Z(|P+Uqf*Rg<I!Tau&
z85{4>>R7wD97BV;nK~quUHx^mj^G6K2GZ1*uSN?iLm!7vHB7_1^TGbKhmnK+K`GYA
zocp2=on8LxJH^`7^1ch0ft(MTU$vJB!R@gQ^R`qoX>(=iY#u++3K>oqSpG={?#YVw
zp3m99FXk^~<6#X9X1oKYXEH%8t2btG65(u0zF-J)^>8dj0Evc+9_Bd^Y)k9AfW~FV
z%iDV(ClS6)TC7eVzh{ml;p4cx8)$TV&qhRWp+dqiw>i32?1;5d>HLrNj=^OdJ<}L)
zWxqw8aFI<~_TkMDQHS?`z+KQ?+{ASoy%}RBu6i9?BXbh%OEx1OuZ}?n(VjrT(!B1;
zQ!#WA0NBx=^6rJrFVsDCuT4)OTG<Ikaz*O8tFTZ)QL^`qbYu)jq*kTD>zZ3$Z4Yqz
z&c9+7%g!%zxtv#p2fhHbo98KBwfE<e9Z<Yr%uRWj-5Hd3hTYY<&ve`je8y8RV)knu
zYCT0K`*JrRv<nx%jAf>&Y(&2#=}qEEU`ECEjlCp=X^_tIoMx>%kBT5k)^c=zyV5w3
zc>DLKY6%=y0igWi9B@4hB}bR6K|+jYBt+}i6Ld|b`*s62c6Ge?zGYvdW)=p90~$Ad
zxGB>c<3Dy~hPJ#vNXierOl41xBn_0L<5NhK6JO-LvtS&Z{xjGKfIC6*9%*?tv*?+!
zv;Q{?mHN2b|3DEJO}R9w11ZT5QVC(H0u|0n9cVK_@2r%C<)OnZ(3aS0Ux^6G$ja*<
z9R~o~9XjhPL)w@vYi6r;H$tR>wW`0-Z&Qed`X0LZY9-~mfso!@dt?5Q;@|K6$mAB&
z$J41&y)<{N;QATPeU}BC{lM_<D4HZA)B)i-;gJ1pwusq$h>@-LlQ2hjX;}6~qdglT
zGm%qJm*F^in=w*?j;@C_P<fNuR>CMnXK5Fd^wXV**pZOdS1KbSJsC~s#R;tmXIMb`
zHB>sx<rNDl@4+*>Qg&E5Yf@}d#~Z9D4R{}ZpLm7S=bY0x#k<=H?=R+=W$=Bm2aU*n
z)qgD*0#4>GGlHhQ`bx#k=Njc;+9D@{F5`xI^tMkBf{XIzwB=b9KbuuLF7jMTR~Mwt
zN#!)9J4&^V@JRe9Y!b2!;$rCLPWZfG`C;Qz`u~TJdCzv->e`=R8uHX_2{Fp&pWJ*h
z#A60&bY(j(^P@t_`_pktBV7{tFVoeNWlNA|zgNr&DMjJ_!k2%2s2~F@la$M6k%hWi
z7}}hoDuoaN7?lchVk@4DunpEIS$72&uuF&F;&4uhC$L)6IzHHUryR9emzpxwsRXmj
zfc}pI#oRCB7Y1;t=*58Gsv7x3PGuW^spn6V&dWf#?*TQ0(|*rr=EeE1o~y1<q=XbB
zH7M1n6!fSD?pm#tnQqCt>wyQi%)e*oX6iX@$m0F1R<jp2X5!4xYkF7J+;bthC|!^_
zfGt{`v`5@+vH^moN%0^eXsq^fv|D%^4d2~y%?^q=-Nv+wR>tKUT0vgg!8^fWhYLqS
zF@EOpFld7>f^kprb~YwMq=^<<pan6S!*H@g7t}eQJLhuWeLGTkT2P+Ck3!Te1lk%)
zt9TCz)oC3>e|gw?QFyf8ck|ZC^>)3c`b$^C>jCB4Fne_1e$Cqt=4Ud#K~~8Nfa91W
zwk17&D?X?4FRzR+5qCiIqPf0};K4$tW$}l~A?u_E=JSe;*f_DO>r{z=U4_<)dY)M!
z7O#mizC+GN&#;)k)vkBU<tXnqP_^|-tGmZcT8Dlxt6Pn?`uypBX@1fVrNePVd#ALp
zF4$80+@AG;7xl5W_sE^yNYES$<C6}`Zb1&JCZx~nYEbc%r#1d%Mn0pgS$5QlwG(ot
z!Za{>S@fZesb{v?YuFlCPRjsT5bxB4@+sqdq}xvvBhTngZ(N1LUCS-ei=5sgE-Tbc
z7HK+A_O23MP@sUoc?I?*ZB|F)&%us|2<oRU<$~ApQ%f%RU*aE`VmGrB<J4ieMCirV
zP_~OQ;txr2WBgPQtAbapRV&BoULc}?@}z*gAAJEFNo(?(iOCZhqe)W78eZ*UvaN@7
zhKKGvt0!}(rjB;qc0K^%h|5n7(;vc+uHx|Dg@=F~<I;s3VT_=D#he%5p2SoOly<_w
z*HKrz@ej3W?Y+xd+RJZ;9WZCGEGI{ETYg8h6;=d~Oi`<7@VfdE&iUPi>O$#G7V$6z
zq>G%6!cu7OEf+_#^A=23Hd6Db9-yK*NQ#<PGnv3oz%Gl*Ib##q`dB%MvY>S+kjJI7
zhLiLz{>zKKtHH>H;B-cALzj`>@+-~?X2aP7ypf9WMf8q0m)wS!Nkf+&R&&zEjFOUx
zlq^>v#VAq}=)?dKRMe+010g9O;qAiaTA4dV+==mw%i3Re)DwZ$Wd5CK1m4Ivy&&Ef
zO8W!SpcgA>zfTGAE!{IPJMhdZ`T4{K#7ndDT8K2&*jf=J8O>H*iDJ}ZK}z|$C3U62
z$nZhk4v$QIYzMaV+0`B8S!=9RSYzi*QG#tp>ZY|lY_`}A-zI7)(tV$B9G-tC#zt8m
z<!M@MT<43;wMNmuo-kSmPm5UQboY7uH(`#(7slpt#=BnL_;t>re~pD7oIFkmIAM=s
zw+Iili%nSC?yks)t~q4lTlZW(#5^yUV@+^KvIuQzZDO^*TBz!<CtQh2rfO<z=TS{H
zzIH*$V56H0{EnCR^XrG!ZG7AjD4r}Q(t2l9(P&QU6M<44;NxCby12gE#~t-zco3A+
rQq8KZ5e*fKEaO{0Ke0s~Qmy6Xh5m%FO!wV}CE%>j#nX%*uiW|{x9q0w

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1273672d253263b7564e9e21d69d7d9d0b337d9
GIT binary patch
literal 90
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l%l7LV~E7m<R2d&AFo$qV`FPm
oboulDzr6KyA+fs7hb{~ZQx+&qVC9&67pR!Q)78&qol`;+0H8b=ng9R*

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/3rdparty/timepicker/css/include/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..359397acffdd84bd102f0e8a951c9d744f278db5
GIT binary patch
literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l!vE_V~E7mtNjN#8yp0f)nD%C
z{k^&2ZZH4W#qke67#j$%IepV*`yn{#P|600IVRJjChwXe(ssyZ>xPQ=F85a&M@g_{
d|GeK{$Y5lo%PMu^>wln`44$rjF6*2UngE4^EGqy2

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-icons_222222_256x240.png b/3rdparty/timepicker/css/include/images/ui-icons_222222_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..b273ff111d219c9b9a8b96d57683d0075fb7871a
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{;aID?ElVL?Rdohw{Ucz9r_YL7=D6<&8F>PmYTG^FX}c%
zl<zAi(m>GE{DS1Q;~I7<vD)$Yj(fd>-6ze&TN@+F-xsI6sd%SwK#*O5K|pDRZqEy<
zJg0Nd8F@!OxqElm`~U#piM22@u@8B<<ecI*S<egUH7}csd8!)jLBD2s`p(8v&--KE
z71^q9MglFywkSt_5FCr2F%o&UR(5j7-O>moyKE%ct`B(jysxK+1m?G)UyIFs1t0}L
zemGR&?jGaM1YQblj?v&@0iXS#fi-VbR9zLEnHLP?xQ|=%Ihrc7^yPWR!tW$yH!zrw
z#I2}_!JnT^(qk)VgJr`NGdPtT^dmQIZc%=6nTAyJDXk+^3}wUOilJuwq>s=T_!9V)
zr1)DT6VQ2~rgd@!Jlrte3}}m~j}juCS`J4(d-5+e-3@EzzTJNCE2z)w(kJ90z*QE)
zBtnV@4mM>jTrZZ*$01SnGov0&=A-JrX5Ge%Pce1Vj}=5YQqBD^W@n4KmFxxpFK`uH
zP;(xKV+6VJ2|g+?_Lct7`uElL<&jzGS8Gfva2+=8A@#V+xsAj9|Dkg)vL5yhX@~B=
zN2KZSAUD%QH`x>H+@Ou(D1~Pyv#0nc&$!1kI?IO01yw3jD0@80qvc?T*Nr8?-%rC8
z@5$|WY?Hqp`ixmEkzeJTz_`_<!oE0dsO`po1=$i_1k<Um_}caMZcrpqA*x-}Rw(fX
z3Qyh8;-4^Fe)UICI@ayzmyV?48GbR;1*s>wsSRi1%Zivd`#+T{Aib6-rf$}M8sz6v
zb6ERbr-SniO2wbOv!M4)nb}6UVzoVZEh5kQWh_5x4rYy3<sHrHJLqL+DcLT5`t$L@
z5_J8#H;PWO1GW@oId1Y>c!871NeaM(_p=4(kbS6U#x<*k8Wg^KHs2ttCz<+pBxQ$Z
zQMv;kVm5_fF_vH`Mzrq$Y&6u?j6~f<juy`C^I0O`4mfXK0lrRY*VoeJX&k$9aL;Hl
zlp63sf~-1z_419)A8^j|LeQSmK&T8R7nA=Ki3^H;YaeL&hF6>tIV0Yg)Nw7JysIN_
z-_n*K_v1c&D}-1{NbBwS2h#m1y0a5RiEcYil+58$8IDh49bPnzE7R8In6P%V{2IZU
z7#clr=V4<zT-gP2u}DD>yyrRe@oXNqbqo^^LvlLE?%8XaI&N(Np90-psU}7kqmbWk
zZ;YBwJNnNs<m6GqjV2(cCX2e+#tSOgIGm~J&Djknhy!e`&p)NTq>$~d!mx9oMGyT(
znaBoj0d}gpQ^aRr?6nW)$4god*`@Uh2e+YpS@0(Mw{|z|6ko3NbTvDiCu3YO+)egL
z>uW(^ahKFj>iJ-JF!^KhKQyPTznJa;xyHYwxJgr16&Wid_9)-%*mEwo{B_|M9t@S1
zf@T@q?b2Qgl!~_(Roe;fdK)y|XG0;ls;ZbT)w-aOVttk#daQcY7$cpY496H*`m@+L
zeP#$&yRbBjFWv}B)|5-1v=(66M_;V1SWv6MHnO}}1=vby&9l+gaP?|pXwp0AFDe#L
z&MRJ^*qX6wgxhA_`*o=LGZ>G_NTX%AKHPz4bO^R72ZYK}ale3lffDgM8H!Wrw{B7A
z{?c_|dh2J*y<H{`M3l!HEtOc{;H{lJx}(C|*lvPQ+RAcV`>8b04c37OmqUw;#;G<*
z@nz@dV`;7&^$)e!B}cd5tl<nF(??uM#|`*5pIKe!DEUl5-&9M=s_3Yn@-P(czyPQ~
zTU3I3bk%z<*w;9V(oQvt^2H`kBAW;=2oA<L1<qVIK(Z{Hk@5&E&_2mS+|}+?g@FBu
zK+e=OWg<)e?RO;llNw00>0{g(Q>5_7H^@bEJi7;fQ4B$NGZerH#Ae1#8WDTH`iB&)
zC6Et3BYY#mcJxh&)b2C^{aLq~psFN)Q1SucCaBaBUr%5PYX{~-q{KGEh)*;n;?75k
z=hq%i^I}rd;z-#YyI`8-OfMpWz5kgJE3<X7ptj0dmPk5UrEf%nVD%<Giiw4wVh!K0
zFjy-VAnpOFJIDm=jqqahP0Wam<9qv4UMIazx8J<YJz>I!3ean6=UZi!BxG7i(YBk?
z02HM7wS0)Wni{dWbQMRtd-A)_Az!t>F;IwWf~!*)-Az4}yryNkz&9)w>ElA80Oc`6
zHo#9H!Y3*Qx9n@Jn)!w6G^hb;e_n8zpIyXCN`JFkPc)^Q?2MsLNFhMgrcZI-<#1ne
zjH;KFf?4eAT9<t<iUSC5BsF-<$q+H@@j%Yk>mQZ}ZfHLGA#d%s;SZK4p0FwZT2S^{
zQ2BG1xJsbK6?yrHTjJi|5C0u=!|r!?*4FL%y%3q#(d+e>b_2I9!*iI!30}42Ia0bq
zUf`Z?LGSEvtz8s``Tg5o_CP(FbR0X$FlE0yCnB7su<mcL>DPmI2=yOg^*2#cY9o`X
z;NY-3VBHZjnVcGS){GZ98{e+l<X|f4%S*+x526SE1mJ%6M<Nt*!}czEQf{?H1U0br
z^Y7cXNxH@=Ve^#j3H@BPU>q~O$u6pEcgd0CrnIsWffN1MbCZDH<7c^hv+Z0Ucf0{w
zSzi^qKuUHD9Dgp0EAGg@@$zr32dQx>N=ws`MESEsmzgT2&L;?MSTo&ky&!-JR3g~1
zPGTt515X)wr+Bx(G9lWd;@Y3^Vl}50Wb&6-Tiy;HPS0drF`rC}qYq22K4)G#AoD0X
zYw$E+Bz@Zr^50MAwu@$?%f9$r4WHH?*2|67&FXFhXBrVFGmg)6?h3^-1?t;UzH0*I
zNVf9wQLNLnG2@q>6CGm>&y|lC`iCFfYd}9i%+xkl^5oBJ?<;aneCfcHqJh7Yl5uLS
z9Fx-(kMdcNyZejXh22N{mCw_rX1O!cOE&3>e(ZH81PR95wQC37En4O{w;{3q9n1<A
zPC{;HRD3#A!@Lk)+k!~onQ0|-U%#uGd$&L?ZhNC&R)V(mb`NhUqrYysoMQ;Z)sq!y
zW_WwV!+jO*nGT8-Hx_JVmFK^=>t&;p)D%&Z%Nw$gSPa!nz8Slh7=ko2am)XARwOWw
zpsz0~K!s{(dM$NB=(A=kkp>T(*yU6<_dwIx>cH4+LWl282hXa6-EUq>R3t?G2623<
z*RwTN%-fgBmD{fu*ejNn)1@KG?Sg<bw3hQ~jCP9_dLp#J9Fi#nX3wGv<cLwQ;8x0`
zA<%pA%E0S;<5FJhw8e#?n&IA5g19Fv!v7YC%Gxqd<x1=+hht1t>*8z3hYtkQJQjB6
zQ|x>wA=o$=O)+nLmgTXW3<g>_6diA;b4EY{*i<HxX2Q~PA|R-tJ=V1~4KO3h7H~CG
ztNFL#J=a@4Q5K7Ogvj-+3N_IJUjc}x34}a7@bDE3!)Kj4s7ME<v)`yP${V~G_J@6l
zp{&i)CGxx1)X`lnwc}#g;g<(rA1#7Ez8@J}tuMD3bB{Wifbe~LWT0zYNjgb_qn|+G
z2TCDZw1rV|wPx@~-H8<4^MGxfR0aLq+_k+{JT<mckxWLsw*J%G%YH0>*R%6dO2EMg
z@6g?M3rpbnfB@hOdUeb9<OD{Zt&T^7p>6=~I?OIA3@BWAGmTwiQ{x5Cqq<8c10L!P
zd@Qk^BseTX%$Q7^s}5n%HB|)gKx}H$d8Sb$bBnq9-AglT2dGR2(+I;_fL|R4p$odJ
zllfb0NqI)7=^z~qAm1V{(PkpxXsQ#4*NH9yYZ`Vf@)?#ueGgtCmGGY|9U#v|hRdg-
zQ%0#cGIfXCd{Y)JB~qykO;KPvHu|5Ck&(Hn%DF~cct@}j+87xhs2ew;fLm5#2+mb|
z8{9e*YI(u|gt|{x1G+U=DA3y)9s2w7@cvQ($ZJIA)x$e~5_3L<r=v~@?aZ+642@!3
z&nTpp8p^rR@IEsq`uhzfD&i>KFV~ASci8W}jF&VeJoPDUy(BB>ExJpck;%;!`0AAo
zAcHgcnT8%OX&UW_n|%{2B|<6Wp2MMGvd5`T2KKv;ltt_~H+w00x6+SlAD`{K4!9zx
z*1?EpQ%Lwiik){3n{-+YNrT;fH_niD_Ng9|58@m8RsKFVF!6pk@qxa{BH-&8tsim0
zdAQ(GyC^9ane7_KW*#^vMIoeQdpJqmPp%%px3GIftbwESu#+vPyI*YTuJ6+4`z{s?
zpkv~0x4c_PFH`-tqafw5)>4AuQ78SkZ!$8}INLK;Egr;2tS18hEO5=t;QDmZ-qu?I
zG+=DN`nR72Xto{{bJp||`k}-2G;5#xg8E~xgz22)^_Z;=K|4@(E&5J)SY2of=olcw
z5)@L)_Ntcm!*5nEy0M9v0`S33;pO4T<mv%0Rx6?c2H~TA%zOO^T2$@D<Cut3{ae}|
zAT@Uzc>N;>4(Z+<j5j2DQ*r;U|6a;YfP1jST$I3mSn3aNn!?<=B-XkzG?hQH;@bu%
zmFYDDgbC%Wt{6LBrs%88L}deF9pse}dmIp4lmp@Tir9q)JKESa=h>19p_0>u#e-vE
zXCU(6gAvu~I7Cw(xd%0e59MNLw^U37ZDbsBrj%eDCexw8a3G`nTcXVNL6{B7Hj@i&
zbVB{;ApEtHk76q08DJ48dSxd$C(;$K6=FpU<~l9pVoT9arW^Vu{%Bcn4`eIpkOVC|
z$)AKYG_`ypM{0@BUb3^9lqi_c?ONH|4UJMJWDowMVjacycX7}9g={O7swOB+{;+?;
zjBo!9?+nd)ie#x5IbFW-zBOo0c4q@9wGVt5;pNt`=-~Zgcw#*`m($6ibxtZ`H=e=}
zF#GZ~5$%AUn};8U#tRem0J(JTR}<qii}wxmUzVwVIg2$uE2;GN{hhT&GE1i;_fi(_
z9KKXP)ds1Q)XnUhr?uXO-HbKE%5f%+-C>d4vR(dgK2ML~lZsPhayJ2h1%sD4FVst|
zKF)+@`iNzLRjg4=K8@**0=5cE>%?FDc({I^+g9USk<8$&^qD~@%W0i4b|yMG*p4`N
zh}I!ltTRI8Ex$+@V{02Br%xq#O?UlhO{r8WsaZnZCZq0MK9%AXU%MDLT;3=0A9(BV
z9VxxxJd7jo$hw3q;3o?yBLmA=azBUrd9>-<_ANs0n3?-Ic*6&ytb@H~?0E(*d>T5n
z-HiH2jsDf6uWhID%#n>SzOqrFCPDfUcu5QPd?<(=w6pv1BE#nsxS{n!UnC9qAha1<
z;3cpZ9A-e$+Y)%b;w@!!YRA9p%Kf9IHGGg^{+p`mh;q8i7}&e@V3EQaMsItEMS&=X
plT@$;k0WcB_jb;cn%_Idz4HO$QU*abf4}+wi?e96N>fbq{{i|W0@(ln

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-icons_228ef1_256x240.png b/3rdparty/timepicker/css/include/images/ui-icons_228ef1_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..a641a371afa0fbb08ba599dc7ddf14b9bfc3c84f
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{;X{3=KszyL1xbWEgT(ahrR?5hM!<zvuS&nr6z6fi@J>w
z<@?HsG!Qg3zaV+-xQ3ldtad!U<6iGz_enGH*2akP_r)o1D&8p^5M)<i5Kvm7+w+1d
z&*|KAM&6N6?%o|XKL7xDVlB)}>_c8IIj6Wy*7HJo&CBLuo~nj>(63pZzO(Vv^ZuB3
zMYigjkwA;FEy|G}1jpiMj6|NTm7Uyiw=@FDE*nX<>jR!W@9XIyf%$Fd*J5*D0Z0Lm
z9}ZQxyT|x5ftNy?V>EbJz-K>bV9gs9RaXUP<^=;e?&Fqxj;6{ieR-a-@H<J_4GiWZ
zaVu(K@aJcf^w<j8VA*iR3{E8n{m4z5Ta=$%rXkgQO6v#}L)oynVyGEE=_51-z65?H
zDgGA81aw}gX`NgF4>ycA1KMKhql8GOmcx<Hp8QKqcf*>wZ?_-(3hMK^^a*(gaFvBH
ziIC!fgH4$W*NbKIaY&T?%&13``KbD@S-0`xQ%v3TV+B!;RC7O!+1a9QCA$H@3tR;k
z)SSoR7(s4)f{zM}eWgFN{(ZH5d1O}l)f$ruT!)Q&NImXyZsTzOf9TwctcSfr+M)aJ
z5otO+$jvm-P4)ykH)x|cO5xeb>?!`qGw$(>&axqLL6yoB${vsMXgL_-bz@2J_tS92
zdvZG-+vKl@K4Vr(<X8D7Fm5%eurE#<YP<1YLAHb!!E~xCzIMI68x%=Yh-w$L6-vB;
z!c#Z2_$LgPU;Po3j&(cwr6cKhhF=VILF!3vYQvfMvLYtV{!ir!NUtS|shjnm2Kl+v
z9M*o<>EL{WQt@Z+Ea-hxX0}nTSZxnpi^#Kn8Ox8FgIS|hc}KJQ4tm*HO16ui{(O9}
z1YN)GjiQt6fGq`Cj+^`zUf?8hk^(T{{cOQGWFP98am}is28A!5%{R#ENv8fCN!j69
zl<vTXm`x#Aj3pR~5$!tw8x6HJBT;veqlI((e3l5f1J0XQfUi^9^|f?)8pp02+%sAX
zr3QSEAghjFy?kTy2b}Y~5VYqs5GsSo#pFLl;)0^z+6P*`;T5Mu&WLv=bzI9Q@9K!#
zx3ne5{kTux3L#b!(t3OTfpmY0?(76nqT7xWC3Cn`hU1f1hZjxb%CxmPCafJTzecbo
zhDHzEdDz$vS9U>MEK(2z?|BY=Je$XD9mB-Kkem*(d-j^9j$2#6r$Dz?s)-TCDCGCs
z8>6Pvj{Y+YIeFA@qY22V$)awy@q!9A4rgk5b9TcC;s9Ig^G|6nDP+5=Fzg&?(L=vc
zCbGd>fSu~@6!94td+o#d@sid<c4_^>!EI<?7QBi6t=$bf#g{8RUCj>X$rx7*cawe6
z`dScJ+$HssdOjE)O#Ybs56vm-FQ$7yuJJD^Zqk%hMaIgAJ<2yb_MFQte_i;62ScT$
zpjifYyR_E=rQ+>H)pmlr-Udzg*-!|ssw(D7wJvC+Sf8bb9;;q8#z?0p!!bsd{wy|5
zpBaMHE-Ve>i#LLjHRaMLtp%9&(HCng7Sw96jVv!#0k%?F^K7&=T)mnYn)D9(i;4x5
z^NJTJwq~pv;kH@#ejTd*48~(J(r6j34|m`h9fEDj0im)~+%I5XphWymhT;_Zty|Q&
zzjPg#-ufAHZ<omf5#{klOC=UKcxxw*?x^rKwwoZ7wz3@8eku)ggLNRn<<KIdajH#H
zeA)T=Seh$G{X;Ew$<Zx1YdFKl^buFmaRdI%XI9raN<LH2H`S7|Dmv<?JPd_9FaRph
z7M0*0UG<&|_BGC;v{TKZe6h)s$R@%If`c(mfiu?)kSq&lq&xx(v`_L7ceQ&}Az*(Z
zkTW$+naI+A`yGk?qy`dg`WSb{6e&FN4RX;O&+frr6hjc+3<Yokv6*p`M#SE){vkzc
z3FL#%2;YdX9eq<GwL48ff7Y!gs4B@Hlzc$A2`aV3*Atk++JX5HDY4Bk;uB4Yxbu<X
z`L&1ByqMIqI8t`UE|_LH(~F2;?|){*%50r1sI9V=C6bO-=^K$CSiOmlVqzhvSi?6g
z4AzPTh<iZl4l)6IBfJ=W6EkAt_}>1M*Gccw?Kf|8Pnhtb0`!{N`Bqsa37J+>wC$!e
z00k+2Egzz;rbcWoUB%Jvp8W1}$XD%e3>4y;;OZ1ccT-O#uW6Ys@C}Pa`nZrNKzR(2
z4e%3)@QI4SE&E!lW`5y14QhbepBG%_XBV-O(%<aX6HVzRJ7ee*QV3AB=~LWyIoy{V
zqv~a)U>5tj)@9#|;sC-MNev!zGDHk}JdpGC`iJF#8=8-P$Xoku_=Dw%Cv3{U7L>gf
zRQ?<$t`cZ*MP5GQmbmx#!+*!zu>0MewRO9GFGS{b^m_fJ-N0?j@EqoFf>$khj+E|@
z7r3We&^tR^YZrxKe*d<YJy4G(9mh^GOxZ8bi3n#Ytos{m`t{%)Lj8wW{Y{jV+Q_6T
zI5_MMSa-xsCZ~p-HRDCj#<#0BIhacN@>22agXqCO0l44&kqCv{u)T|(lv`~PK@DvE
z{QI_TlCH5z*gR!>LO)k67{^R+vWx24U2^2ODXpwT;6y+6+$5m)_*w4WY&#do9dCeE
z)>p+Ykdhq($DhmMiaYXey!@N%L26uz($aJ!QT{B^Wu}U$^9e#5)=c+XF9@Ill?ZmM
zlNgHiz*9!vDc&uxOo;ZVxb`Q!Sk0*gnfxWzmbZh4(=%CD%qP?0=);n$&zaW_$UKV9
z8axdcN#AyZ{P)wj?V{P}vM)YY!>6@}^>U+iv$`9>nMTCPjN>z%yF&3yf%>+T@0vh4
zlC8Xa6zeo?%=o3}M8{aebLHcO{^1Ar8qiM=Gquf?Jo)q5`-+?sUpg?QXyEUpWSm+n
z$K-UyqkI<R?*3wTVfWE~<@2<uS?-MVl1;jzAA8*iL4xsi?b?BNi<UXgZAh$t2eX2O
zlaSjP6`u~(FfWAHwjdICW?Bi|*YB$4-Yt-e+urDxm7s0C-NReT=&xHY=NLk9^<)K_
z8Qvc8a9@Rcrh{U|jRjj-<@xXJdfDhCHAU3q@`fxV7DF|YZ^rH=h9J#M-17gO6$#8E
z=<ACLP@x){UQ68&`mEVXq`?Cxb~%;JJ<xQvIxsey(BZq&!Lur1_nVgz6$w$lK^&jz
z^=yq5^Y*23<@W0Z_KKzDbZLlkyC5J9t>wHLquru~o(OF)hhz$Y*|X>ZIbswnxRvr~
z2=rdOGVuD|xRlpAZE<0!X1F(%Anpl^@V^D3vbM}qxe|NI;TTiZy7(IM;R69RkA>a&
z6gwYE2sREzQ_LHmWqB+ogMk(fMaSFeoDq-!HkFB_nXt5+2ncFuk9BQL1I&oB1zZi)
zYW{6_&-Ip1l*OVRA##1ILQS;5R{-K^0wGTiJbVSi@LA^$D$;@J>^G{6@&+%4{b3(s
zC~LEHiTv(0b#zxt?YJ0r_~pUZM~mQ(??(n#>&tD%+@nq=Abj5*8R!~Ul1`G~=qFJ4
zfl|m8ZDCYgtr`4LcOpgiJYX9qRY5;DcWti~PmS$VB$E-Zt^f4)vLDOe_3XTq5^ylW
zJ9PKm!V-8sAOJXnUfuFNIf0R9tK-pNs2hO04zr620}5B(Ok>yB)Of-3sP59qfQNbm
zA4{w!2@cB;GbR(~szVrbO%(w=5S!X`o@o@x++wbN_tMPT0V<QhG{UeJ;8({%=z{L*
zWd0UgQl1fNI!H$Y$hXK#w3!Gvn(74Nb)t*FnucAAe1;`Z--B03CHyB#2gq}g;qs~I
zlu;^<Ox+<j-;_m5iBxJsQxuqvjs7QOWMpota<0)9-Vv;XHb%w=>c)*I;Fgsbf^*g0
z2Di?HTApwKq3+YwfNsqd3iP%{hyK1iyuVZc@*0tO_3+N0#GFsz>8MjeJ2UJ%L!%hi
zGYYAthH`E+ywA*u{(eJ=ia3h*%k?779rk-K<0VZAPkl;TFUbmei|$fqWO8!_zIvqt
z$ly$VrlH46nnpX~X5Yk0iBJl;=WuA4>~X4-f&K0yWf42h&0b30t@NYX$7egQ1Fp!a
zbui-D6cWCWV&|R1CY@G8(qOmWjWeX3eX7UggZPGimA}soOuQdXe4uZ#2>5zN>qlI0
z9xk}lE=tNpX1m6*nFr2EQ3xs79!^sCldDJYE$m(qYv3q7>}1R7?iZW7>$~*%zKaC|
z=$N?ME$>#+%T&MZC`dW1wUl6Z)JgyCn~V%K&i0H|iwE%$>xsZW3tTfZxIUe<xAj&4
z4Hz4+{_ST0nym-LoHhM~e(110&D!U_p#In^VLIn{J!Y#z&<>Pci@p;cRu|d=ItIwF
z1clVHy{hH?@SD|(Zfqi^0DQ1hczHN7xq85h)rzQqLHMX2^IkuK7FB!kI40s$|CY7~
zNX^{_UjN8}L%Med;|+=4RNTMozn8KT;2tb77bUPCmioh+rZBfIiM6f_P34cQ__o1G
zWqQp3VL~~pE5?qODf%iiQQ3f42YF@09tQ*$<v=*TB6gv{jy879dA6iNsN{5E@!(k4
z8HhaiU_^B~4$+iH?m^ArL%A5*Efo_%8ySb3DJ2+($#iHi9LOmDmMF7*5N3n2&E!HG
zolrkI2!HM5qnOHg23Q1&UfD^`iFCzlg;)`TxlRkY*i!V9>4v_EKUx;t1KCPCBtgqg
z@+Tn;O)a0uky_%jm+WjNB?=~VyH>V#L!*=l*@OS6SVyt_UEH&NA=?V2stHPyKkVNy
z<J*73J43UcB3bH1PM2@IZw;E0-Pr(2?E_y%c)4{fI(WYro>&jg<#cjros){#ji)dK
z%)We0L_478=HZ8-@xnwsKrWs8)x`MB;(Y`Cmu2c-&SH(vN-F(*e`l?c%+l$|y_AJJ
zhcDGnwLvN+bu;_sX|1<mH)GAPa-4}{cUWY%Y?nWr&(mZ0q~a8r+)V&r!Qf@i3-wZ~
zk29f}K4Mv56>AiePh<L{fUUyPI`J1j9<HC~w$=DnBr|v`eP$5Ka$0AMorz8kwj<6R
zqIF0X>x@u&%P$hf*xE+O=~D?_(_KGWQ!158YL-y9$*6mmPo;Rp*Dl5lm-mVM2i`h-
zM@nxv590_tvMwPD_{l=b$iOm|+|S{D9&P%zeT$GgX6Akl-tfUF>tL@Ld!B&{pN39t
zH>3Vhqkr}2Yul+jb7UiouWVGPNsxX7Ueba+9|~dz?d*QM$ng0DZfO0`7fAy?2yMm|
zcnRzUhZ&IcwgjH9cuU!w+VStYa{p*)4IgBf|E8)sqMYtB2KH_}SfsFq(c9i(Q6S3U
oBo%DI<H*|Oy`A%<=J$?q?|gu`ltGZq->*Kv;w;*%(i9W@e{{5C=l}o!

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-icons_ef8c08_256x240.png b/3rdparty/timepicker/css/include/images/ui-icons_ef8c08_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..85e63e9f604ce042d59eb06a8428eeb7cb7896c9
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{wzI}^MB`Dm+sH{TR1w<4t)tA3_robX4CdCOHJC|7j+vW
z%J-EMX&`87enIluaSc0_SnYUx$GzUc?vrNXt&I`o?~7C3RJ>C-Ajq!3AfU8Dx90^_
zp3}MKjJzYC+`T(&egFXQ#9Ek{*oVAaa!zrZtmlRFnwQPRJXH<%pkK2*eP`pT=lwD7
zifq+4BY_rUTa+U|2#&?i7>PVvD?7R4ZfOLPT{e<z*9Sa%-q+JZ0`uF@uf^uR0+0eA
zKOCxXcaQOB0xyL&$7t}dfX{x=z?wHIs;&yo%nJr`+{Z2X98Hy3`tm$u;dhd<8yL(-
z;#Sne;Lpz{>9G~G!Ls3s8JtQE`jMM9w<tfkOhc;ql-3a{hO%LC#ZWVT(nn|vd<pzY
zQv5BF3Fy2~(>l2V9&Q+K2DHW0M+uQmEr%nYJ^7cK?uIpU-)=wn71ZZ-=@ar0;3^AY
z5+TI{2b(e%t{2PZ<B%x(nNg1>^HKF*vu@+Xr<l6w#|okxspftdv$I9rN_GQ)7q|*8
zs5y_rF@oIq1RoU``$~Uk{rhVB^2n_8t2HJSxDFflkb2zZ+{WSl|IoP?Sr2=Mv_tpb
zBhqwukeg|uo9qd8ZqP<?l)|%<*;D+JXWZi%on=Ghf-03Mlsz8h(Q+`v>&BAc@2BC4
z_vCgww#i=)ea5Vo$glEEVBBg_VPBj!)OO>)f@}#dg6ULOeC>LBHz<;*5Y;YfE0lNx
zg{N+4@lO~ozxpF69qV@VOGnc248Iuag4C1T)P^(hWkpP!{h!JekX}m^Q#b2B4f1oT
zIjsGz)4}-$rQ*-tS<w5Y%xt4vvDzNI7LjNDGL|1T2eU@2@{VTp9rUuZlx!D2{rUJ{
z3A%pW8$~DC0b2^P95?wbyueB1Bn4o?``LnX$Uf9F<C;}N4GLdAn{SZSlT7_PlCs0I
zDBXb%F`GiL7)vk|BieTWHX3ScMxyQ_M+@in`79A|2b?#r0AHuH>uc%qG>%<4xM#E&
zN)7lRK~^2VdiloY4>;#}A!yHOAXEmEi^+eA#05pawGXs>!z)gSoDuI#>bRCq-qjJe
zZ)r=A`*EMX6+)~er1kdv1L^)0-PsAEM7JF$O6G8>496$24lkO<m1%2pOjtWwevM#F
z42>SR^RTfUuIz%iSfn5b-t!##cs7sQI);gdAvqmn_v|%I9k;fCPl0Z)R1+hNQONJN
zH%3jT9sOq*a`LF*MiY=zlSSQZ;{_FL9M07A=In+O!~wR}=bzGEQpk2!Vc0p)qKAH?
zOk{(%06W#)DdICQ_S%Q@<0Y+!?9%#$gWJ%)EO-<BTe}-}iZ54sx|$u%lQFIs?k4-B
z^|c_dxJ&9M^?WcqnEWyMADUCvUrhIaT;pF-+@vY1ij0*Jdz5c>>^YZP{<`oB4~9xh
zL9-0*c4@B#O2ylYs_g`Ky$zb~v!M`NRaMNFYF*Gsu|7)=JyyMHjFC=HhGUE@{aI|B
zJ~ITXU052%7jFb5Ys#fhS_?4kqc7H0EU49B8(Chg0&JzU=Gka#xOz1)H0d4m7ZnRA
z=M^tdY|U6T!fmte{W?_r8H~qdq|q{5AMU_2It1I4143n~xL?4&K#BOB48<w*Teqll
zf9X0fz4bHZ-Y$~|BFf{9mP#ye@YYTq-BICfY&StDZDl#G{Ztz02J1kC%b`U^<5ZiZ
z__Fi!u{2kX`iENVlA~L2)^LW8=_9VB;|Bbj&#bO<lzgV3Z>l9_Rdm!(c^C?JU;tF0
zEh@o1y6Qa_>}#AwX{VY+`C^kNkxhgb1P5cB0%xupAXyg9NO=SnXrJUE?rQg{Lcsn+
zAZKctGLfbK_B#^&Nev|0^fB&?DN=ak8|0!np524LD25=s84BP8Vl(3=jflNp{X>e@
z637Ri5xx;&JNl+XYImA|{;XR~P*svYDEWYJ6I5!6uO~2twFC1ZQevB7#3z~(apxn&
z^J@>Mc`>PJair{yT`<jZrWX;x-v7*qmDxI3P+Mg!OC%kw(l;VOuzC|8#l%8Tv4(G0
z7_1cw5ch!89b^LbMtCv$CT7IO@xA>iuan-V+i%|Ho-pA<1?V-k^R2Q<5;Co%XxmL`
z018t4T0TTwO^w)Gx{9OSJ^9_|kgwX`7%0Rw!PO~@?xvnfUehvN;2Rc;^l>3kfbtk3
z8{j7p;S&{uTlTe9&HTc38q@%_KQFk<&n{vmrN7y&Cz{etcE->rq!6HL)2F!aa=0%!
zM%Bwo!7TQ5t;@a_#Q}sjk{UebWQZ8{cp&HN^$*JfH#8spkhk{R@CVBiPuP@yEhu{}
zsQfuhTqV%rioATpEphMfhyRYbVfVW`YwLFXUWm-===J(byMf!5;W^CV1g~2194Xx)
zFK|z{pm%n-)-DRe{Qhk(d!QaoI*y%Wn6h7<6A{i*Sob&B^y|Spg!&J$`kN>zwUJ3x
zaB$ciu<nSNOim3uYsQP5jc-?Naxj(j<)z};2hoFn0&u_kBM}O@VS5)nDYx1pf*RQR
z`S)$xBwb^buzAY%gnq7CFpintWEa)7yX44mQ(9Sxz=?kBxk*6p@w42$*>*0FJKg}T
ztgnh)ASF8njz5>h6?f#{c=<QigVeYbrKRaeqWoE+%S;th=M#iBteNh&UJyV9DiQ2h
zCovT3fv1eTQ@mSXnGo$!aqUldv6@p0GWkoaEpG=8r)RRRm`|p~(T62hpEIu=ka-lH
zHFz2@lD_Q*`R}K5+eNd{WnX-*hEHn`>*Yr4W_34$GmVIo8OLWjcZK4a0`+Yv-!*}9
zBwKm;DAsA(nDI-`iH@;`=gP+m{lgFLHK3m$W@?)&dGhDA_Z2xOzI0$p(ZJtH$vCxE
zj>+kYNBJzs-TlSx!tSH}%I9fQv)mc!C7X0bKlZv4f&}C3+O-4k7A<p}+mKlQ4rT=l
zCn2{pDn1>mVO|KYZ9ydP%(N1^uisV8y;~p`x4qFXD?!_OyN9=w(O<V*&M}1I>d6W;
zGrT?G;l2v@Ob5k^8w<9w%Jbjb^|H}PYKo}I<qcU#EQV?(-;CW$3_+TixaI#lD-xJT
z(AO6gph7h?y_UKm^jWi&NP`DX>~bobd!XrTbzp2Zp~H8lgJ)I3?l&(bDiWf8gE&6b
z>)9GB=Iu-6%I((+>=jGP>CzD8c0oWITFZGgM!Q7|JrUYq4#^Y(vuDu-a>OWDa4Y4}
z5a_*lW#IL_aVf8L+Ty}c&2VojLEIA-;eQK6Wo?<KawYbZ!!f3+b@4Ui!v_Lt9t*qk
zDRw@T5NsTbrkFQA%ko%G1_Lb|ijKF_IU^teY$_8;Ght~t5fIeS9_!kg2AC0L3%DAp
z)%@G=p6e~2D2qisLge~Zg_>xAuK>i;1VWx3c=!s2;j_*iRHOsb*>6-C<qcj8`@=rO
zP}XMY68YV0>gcYP+Ho=L@XLd*j~2ln-;WHg)|cCixksH$K={5rGSD@yB%LI|(NCc8
z1Er8H+QO)~S~K{g?nH|2dB8SKs)BxQ?%G}}o*LV!NG2m*TmR|pWj~g`>)ClJCE#F$
zcj)fBg(dKOKmc$Cy}IRlasngIR>z~kP&WW~9cC951{AKmnZ~ZMsqup6QQf7J0T1;C
zK9*Qd5*(HxW=tl|RfjO>nkoW#AU3t>JkuzWxy4-l?xmTv15_r1X@p@dz^{&j&;{Mq
z$^0$0q&y?kbdZh)kZ+NfXfqLTG}Q^j>qHlUH4VEK`3y^-z6Y<6O88Hf4v^;}!{t-a
zDWg;znYu%6zA1~A5~<XNrYJBS8~snn$jIDO<y@mJydzi%ZH$Z$)QuZaz%45=1m~)~
z4Q`zYwLIYfLfxmU0o|G_6zFY@4*h+3cz>w?<TWDm>fxO~i8-Ib(^02{c4pXjhDI^2
zXB1LP4dvWuc%PXQ{r!d#6>${rm+M8EJM8yf#!H$Kp8AxwUXm5`7Tu-J$mHe<eDz8P
zkinV!Ohb>CG>vw|&Ay415}_1w&*9K8+2d3v1N+@a$|820o4u60Tj@u&kI!~q2V9X;
z>tMvQDI|O$#m+m2O**ZHq`_{#8)ry6`&5s~2k{O4Du16Fn0P;&_(0!e5%Bel){nU0
zJX~<8U6hoI%yx}qGY_1Tq7YKDJ)ETOCs&W)TiCrK*1%DE*vXdD-7hwE*LUgjeHRM`
z&@pkhTi&gtm#Kc+QIK+2Ybn9-sFVKNHyIgfob4H_77yYh))Rq$7Pw|+aD6&yZ|ki9
z8Zb6s{oBt1G+PgfIcxd}{m@~1nzhe;LH)5;!gS8@ddyabpdBc?7JVl?tS+<#bPSMT
z2@0uYdsWN(;Ww)n-PlA-0r+62@bYkEa`k{0s})fJgYZ#5=DmIdEvok7aZJRi{w-|}
zkea&<y#A2`hji}_#v2m7skndFe=lVxz&%)EE=piOEcJ&sO<`_b5^G%<n#vzp@oj^X
z%JiB6!h~{GSBxDmQ}k74qOt+84)V%~Jq`#i%7JivMeIU@9c}EI^K40lP|4}S;=!@7
zGZ1<3!HDW~9HJ?Y+=H6KhjKBrTPh}kHZl%5Q%W!nlj+c4IFM2PEm3CsAj}43o5_VX
zI-!1a5dPZ9M=_Q046q0ky|R;>6X}ZA3b7&vbDb7)v8CuI(+zzSf3z&P2eOrPNP?D~
z<WE8xnp!@QBele5FWK2lN)$}!cCBpfhDIq9vIqZBv5sQ<ySQilLber3RTGpZf7ria
z#<%~5cZOy?MY7b3oG#yZ-x@S0yR!k5+6TUj@N(-|bnt#LJh2{}%jx9MIwuve8&6>f
zn0@)0h;~5F&BG5v<AsTOfLuEFtBLWM#rp>OFU!=woW&ZSl~nrs{?1w>nWfW_dnpTd
z4qvLDYJ*ft>Sp%M(^_xCZpNBn<v0_^?y$&i*)D%LpQp$0NyRBLxtjpMg2Bt27wV-}
zA7?@{eZ;cBD%L0_pT_h@0b7Nob>c66JX}A|ZL9IENM`U>`ph7d<+RQiI}@E8Y)70s
zMC*_&))}GlmR}@{v9*nm)29-=rn`Q$rc^4G)GVQHlTr6BpGxtHuU(8AF7Ffh54?5w
zj+EYT9>x)PWL-iQ@RNm<k%46_xu3)RJlgba`xYU0%*_29yy1gU*1=vg_B;a@J`J7P
zZbtp1M*r&3*S1r6=Ez1EU)iWolOX*FyrcztJ`}_b+S&bhk>T?R+|c@=FOmj)5Za6_
z@DkVy4l^L>Z3#SI@s_eVwd3D)<^Ivq8a~J{|4mhOL^<7M4D8){ut;GIqqn`oqCk|x
pNh;Wa$C0(mdpqYz&F>xK-uVD=DT5%Jzh8ZT#aXmjr70%*{{RacS`YvL

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-icons_ffd27a_256x240.png b/3rdparty/timepicker/css/include/images/ui-icons_ffd27a_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..e117effa3dca24e7978cfc5f8b967f661e81044f
GIT binary patch
literal 4369
zcmd^?`8O2)_s3@pGmLE*`#M>&Z`mr_kcwz5Nh&g=McJ3E!;CE1E0ryV5Ro;>nvtvt
zk&I==Xd;cVGZ@>q_xtnx{1u<ad7XP-_m_Llz31NZdcG2EQRlg#Vo(48z-?(^ZVvze
z|6T#B?4ZAvXnA4xuUoRUb~w8~68XP#e)ZtVe+x$i*`qE2L|`Xa*=^e&W~<9M_#tnj
z#rVH+Aq<7gEG|f0JFaQ38mE(h>%7-D)N|5YqOB>i;(bZ#o62{J2Y9&^D3~R^$o+X?
zwbxAEIb)xwCwK3TSR4QVym6N1rVgPmmt0caryBUceHP_&u}{?^Jn7f0PT$#h>UDqI
zr!q(F&1jJ2_!jxdAB<)7H$foI*2zuncvu;;$SoU7br=AiJ@4=BC4vNO>DS`&UIB=K
z;2)0F*t^FBvVfPuT4FVMSwUw%Xksjyl+;#*DDy%=ocFOyzDLvLR(`zCSOuJ=?FWYn
z5ZD!UaoF>-$@=Vt?a&;UQYM$Oqe0ZB?Je?8ZnMxDe&uzzs*zlHd<n!{fcOy-3tIxc
zl9G6fU;?@>)V58nfJPc8S^({_4bj5HQ_B&EXHWj6wx@B;!mr04b_Mx)UFL)W7`V!c
zpMp#C!a!!sh3h491y}^qfimXVY%!+sYu0_D<P=jc<5*#|6V<{WZGN`6N7;T5@B&-O
z4YA;LJcgH_nB=Dd<6apIuYX_dSRS2~d9}u*0@tAvp3;xIUD`Q4{vSHeBHLl#uuj<i
zdw9AoFJd!YY?C9=-W}2;fmD2UGG|&~>WoJMqpN(FR9LM#jdZ{vJzEck`P^9(1N=4J
za9%u4$2J8TAkUaJk_FX%iHuv#svL_mMmp{SR}ifc#ZcXv%CFsT?*>N^6r(%D?1YnU
zAaT?UZGlOn<yU`%Wa8Y9e(6d%oe>a6UXXs0m)3YDp}d%hb@)@Y!lK_A&D6{OPlNnj
zYY*$b>vnRzL8=CDbQSi!DL3D!P^xhNtwrYByo?h-&OvQZYJ6ka{Re#<tfku}Pk%l>
zSc0ry_d(K$_Q2M{Y^O~DOK(szDOnMi_<pwV9HJlj%%pbJNR!N8!0s1p{Upoaj+ETU
zEK+aqL+qw7G}a0PL5uYtfQ*ORTM)>*h_Rx%eSRxA%n|FuC&=F=<MvvnBAs(r9_AGz
zj#LLeNR-pStzN#d`2)svUKrAQ8VHd^=b;OpBCx?RZykcH-tb9~qbL$x$(`2<NV~cc
z4z2Bp@;~m=w?YY3`1HQse<0qUrn@+UmFad91gTtZ)sci`wvk1%_;MW`&Pf|5tFMu4
zNntUAcOEu%z*Jn}7mF2zKzm-pAJ69V*u*k%Pz0Bw+@6D$nbX!5@F~#!m0D7y2@>)B
z_Qsgmj8g!GA+LZOX)<MTZnmtSZMvX}iN~6m-JIQU20KF6`U6rsN{iU<Dvr1WS@zOz
zl#6cg6=J4)x<q{k$6xz$eY~XokVD3xXlNVKpABoKf9r6^O!Mc-%+zqecrz!IBHZPk
zw7nJrmUK)1q@E9fg^)g`{6kCX`iq%f7Po|#WOo_zsuE*m)B)+26L-$_R)8Mt!h_+m
zGL~5ePlt^60=e?-MYRsRhyDgl@7ZuDwz@j@ON}1OXo&%9FFj79dYq9#Pl2J0tpZqW
zoj)^#YFt?xCl+r6r)bG%OxXxB9bzulRW7L4VwzZAtOD$$wddJsYuE;LaTM_#<QEkK
zsNj<*RBFpyHO6kU?fp7b`x$~mXQtCK-5&11GCPIZRRY80sMue?{vgSOolK=^)LZxH
zbARbRFuV0L_TDa&7c9o>gOW}vbo9|l8QW3iYw9qCD{o~xt^HIU>;dV5MJgc0#uHTA
z<b?9`^Kmpc&W4BD98zOjFt!MWuh}E+<l}|{o6oGTbC!N4qi(7vXIFMMOnVxMbfN)N
zpdB*NBc}R2H}q?~Wm%WHWyNB%7lB=rj|B!oI|os&8zNX2&PaO(73!SiCG6_-sewTO
z1Rz&hx(b1H;PyKr{Yfo2#_Tcnj2S{?^c(o11&+g0pg0yUvKa>80%Ee_r;G`GUjssm
z*AhtwpW%Ly;X4Lq1Zq#ZpuwzrZE$sR087dN{w7PA6|Mo#6wwJP085K+h7+D>NyeX#
zk|?M<oZ&;KrN<L<I(I=dD@q?cl4IbRF&ndOs<5uwMvg!{TBUD9u|OM4eU*}mSV}bg
z!o#6$7=VN)xc(puus6zwHZV0OG)?U7PkW#AIo)ydHqWFfKQd6ixr2X|O$wi7Elt~Q
zP6v<?64wgA8tUqVma<hW?e59%zK8rZ0VY6U?n&-05mXQLRLYvR*#iHFc$BXzkqlHo
z6W9SifpFjGSnRT&jat?h?$a!d5Qp<Z%K{vt*3t%>J^Es)JtP-2eNr0EQe*ZM`&}OU
zCD*uSSviE&p}uX|@1g_%|3*ra*MbBV#~cshdcFQ(dGLnTqaO-3{u==x1;Pp2im!#`
zuZ2`ThfAmiSzb|4h`c4?^ZoGOF*oXYcV}(ge!v@^bse?daA`Ma+bSZLIg;pIN17vM
zIOYfK=@s_Pj?~#lqnY2o?d1$MpoqsYQw%eX%X6Y4*^27{hMWGqILEMnVYUEMW#x7f
zu^I*nzXQ@6HJ8n;<zUNvk-PEjs%<X1ioU#5GW#HA=uaT__dpa}F)w`Yq8IsAdt`7U
z`+&f{UAvT9oH8a~#Q{IST?fK4Gn(zAyLXqIIB&|RDC4<MkG(eWs67GJyEog<1@R;p
zqErmjFbl*Kr=W@Fa@dm2f*UXY=6aA8pQ^kx6Gc!sOK_!BGj%_KX(L)0{_BN-RG>26
zo^1+Ewi$fN$Unum1(FTb8I#cYgcGklwIExt#Mb(D=x~OTeZ^ubJ)S-ywfdZS?SRCq
z<f6&jh?er}Ff4dKlh+}ZgDU^xdo^N4XGA|QMlZXk36y0_n94j(>Dm=eU<x+0r+(K0
z$`kDr6r$N?XyYa?y(T-y8=tEjFA9h_xYvk!0;klqRPh$f>+CCWO@8S_m!W{alT)zj
zZJbjxm5&No5xe_~Jw-i7`&G}=r)POGGfFq<O8y-6Cxq}O+jVOPKCRjoSodM^fgSV;
z21Z0|XI6eXR7bxMS=$0j;+W~BbU**AT6?!xT;2D^zN`dq>+c@kQbB#)ay`coj&C3-
z(#&xV@Q3@VJd{qdH4g@4ZJi&mx9e@Io7@~(o5vTrkW>QEO1T-gmlTRHH+3)gcUC0P
zk07rvDnf*7Y5J}8!>F_7D^Z3IoH^uGH}_a(ax{Q(IrvV$olf3WN&DY?<mf1{#tp*6
zbe~sSoVbr4l{;@hKd4VUJ-1s^jK>uYZfvXI(;Vv&EAoQtfH<X6@yy;uSMU*|aKXKd
zS5vU>;+4VI_a>yh*J+Cj!?h!QX?O`QXk@@G7AjloJe51Cw*rPXQ>#y?B^^ExRQFui
zolmv*C5K|-p){rZiCNai^0H`1(Qr(Hz3v%7NnmriXu2tD>xsbN#*R3*wsZhRj6Lvb
zn0Cu=qkC?*e4{NF_3=^bTb1f!g?@ryFH<mSX7J%FD4O3UZ%By_%;30DZJa-JG5in5
zFhfO$wOjOepP7?~dRphj@WU?;zCKz6eSAMUwAxT%JMIyEG7;|g_Q+7rq>6Zw2tz%A
zzz&o{w`dDv66!6Wk9w1-dglS#Sm{doxw&h5Z8&ONmlBBte{J)puaDzc!LC==rPRQK
zQNH23?-rIo^MQdt3Tk!B@8l#}fxVtrlc8Y<>ORaVE($DKc{77qV^`+`%_DotrUD=8
z4}L7QnZi3RgUy*tteY-=$SqA2@IZWe(}mI`nzhAT{qC)my#rJsfoS*<ZNRV2gRlj?
z)v1Cl_T+qH<V>)xCXj!Tk6=3)cr@Jw#OcNqgS3pg7x|4!A$|w15X!huR*vB3q9Ya4
zF{xuzEQz{9YPl(gk`}Gffut%jotgqp$jZvzRO4EsExf~93vY~04AxH=lR>R3v3Qs2
zy$v4SN%ee@Kz#kDtARaQD`d!R%}#@T1=v8DAow*r>+0d1KS{ZtA~KMtgm)+$JHumW
zw=;@qWk&MuG@LKx#K3@&WMw?r=jD2_)(*$LmkCm4_@};QZI|SPe8hIC6xqBy!LQyK
z01_xmfNA9UlBU@Kzu7;zQYxHE>OCADA$gwaVqm`eN?XQF@NkrocB}lU4hcCf>wqir
z>Ya=PcE!Xm#JG8v@G0lj&~)hScM}X57vGw3g<$^SUls53f|Bk>5FQwqE&{%u(f$!1
zl8+53vyYZ`mEEp&YT<=(krhKrw?~pS{N)?q{0qBR#2Y!w4!hWMdj`a(@A@r$zVB+u
z06Hb@_9(cQ_AxbXI|-2w>#QUhp7k<+`z9+(jkh~v-Renr#C9U+&jL4vg6-E$f7@UU
z(1fxB8{U2vq}h3rE!Z+n7=(>D&}@9~3mJ^R5}|WVG@!RSh3r{!>QHwg!t29YS&jiR
ztyn_q*k9H0efZ7hO*b(WR|G!TDY`rol~Ob4&1OwdM8kbGj`^$~L5gd<d7YB5YJW@H
z1El3`1FwJN#3DR;LU2X|A1e0W_1{a~3G@h&oQoFR4^R8yLsOhvm%`Xog{28ZResyx
zqB6ZHK&Wu;>WYceWwL=PB{~NX=cu3p-{S;hqaE?bSHv$g+SA6bxy+VU3YVTPDj6CN
zKLb_(9gM2Y#KW8ONxjH9To^Y)r?ql2cq8+WE438uIF$hjfdLs6-;!jv55jGcc3Ipg
z;}aT32NAEGeU;J}&j5=+u`4?%xlwL7?NDn%2={4WS39yn3f;&r=|}5=M-Y2yrxeSw
zv%*PmV{_{#Qk1sD>?M2KDapb~z3!E*-LPmCe9q86D%MGSe;4~~K-jKQxq6b^902_{
z%>4G>@Xqk8muR*|vGe5{@7sds<aRcI()+-dk>2i|i;g}oMkd!o^0=HG+vcPrcN54A
zLGv$PlTePRxp~-OSb_*aACO1qc{MpfS-fv(@UmRv%UO)cSt;ee@9(S)f>|~bwU@eZ
z=kTS*sdjLclwMZ<Jgx0E^k$qnMxHBa{0^(!mfiA)^ZEJ=-!!ZelcyN~EF8Mbb)i9e
z^>G#?%U3)bq-uj?@@vj~6tq)ZS||Jxz`+di-M5<Fie`muWl)A7tfzIyIhd%F5PQPh
zAxf8Mxy}evu=*ltf~ji)pFWl7J=6W8EwxIyv~~%3n}ob~`BbWRLfvBgNJYQsf8eXf
zb*A=3@G_1-qwA7#fS;_y%uEbp$>SXM=h3EL`?pB>W9A;`V2vM)vk&%KFy|TAh#AQA
zb_?<!HTqYNzP6jrw?H&O`OC+In}z5{pe1eS^Wk6)mYv;?7a6{vK#gr5`lD#T2VpIk
zLT|ynkZ?ny{+8hL6(4EaQ#%3OSMDDzt>J==3f@%LL{`vU$3Z@A2a9C3aC-YY43dR>
pI7J0n@;b3~`)ubvsr|iU(l;L{A#E6J`}eC4usn-0uQEf&{2ws1m(l<L

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/images/ui-icons_ffffff_256x240.png b/3rdparty/timepicker/css/include/images/ui-icons_ffffff_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..42f8f992c727ddaa617da224a522e463df690387
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^p#%>t<I$5%B*(%$RifAlJDl()+*_W)tj4atJl`V!4ku}Mhk*o=k
zjAh1XB8{;#7~8k^`}6($6`#j>oqJ#RmwV2==ic*rz7lOw=eaq=H~;_ux21)-Jpcgw
zdj+hrf&W^f<%Qk9Zpqf#;q3n5{{POY;f!wmTR1An9(4&I0z1LNX50QSTV2M%4|y9c
z#{ZQIVJKu~aY5?ZaZP*GIGqGs=e@q6o|EPhZB3CC?@LnORK8O@z{{<0KtSn5?#~OW
zy=L;x8T&*%xqElS;s5~Pjk7d2bqIaA<dW(>)xZbovnZd7eX17WNxx=w`p(8vulwUZ
zl{so}MuRNJx5!8S5G;$o2?BApPHt+)!^#*Ww`?rcVE}mcyuY`X2o|uVUyI9o1t11O
zemGWR?;aD#0$vJhiPhv~0iXS#iLq!>Qd<?G%nJo^-p4Na9!-~9`SCtu5pb5a9~>$`
zU{}<|Vb9Md>$4TMbL7C3GP#r;4Wc$}Z;^j;n}yc!E3d;<jpV}POQ7Zg#E;Ne*b?}a
zl*C&E6VP>`wry$!JkmJP0%(tIh!!TET8=<Gd-5-}J&kJ?em(xME6C65GA9%uz*QFf
z6kM7Y1~y|ZTrZI;z#@<ilrhg{i!qH~v+ffmr<i&f#|opJs22Wc^RvZ0%JzeR7uZT}
zs0FX%F}(c5BtI1x_sU>+{rhUi^60G0t2HJSxXv-*DgC(HrJd8`|Dp3NvL5yg>xAvU
zho|fEA~w^-HrW&H-JwkqNX2I-bEXBR&Uhp+y2^)1h1IIlNCzC!v-Mz@&z&VPz+cl1
z=f&f6Y*U~C`ixm4Sy1hl$hg(4%Dy;bq~k7d1<@K&%%NLT`L+A)-QXyKVswX?op90(
zB#yeFEih@c{OXU8Oq~1CFI_38GXmns3(`;W(i+bslovCx4u7gvK>DrGOug*?G|1nz
z_OR}|ZYS3pq-p?rS7G0qa`TM}r5XqDT4cV>%Qyk#9ES}`jc+Ww|DcbZrF6UG>CeXp
zOVIV}K1e#z9@tu#?X)Ri=?zXMB`X3G-_I7FL-Zq`nbfWtX_EO1*!+U6pJW-_k&+vk
zMd}THh}{(Ch_wPk(PI4vVB_KT76kGxVytLxpWg}&bHw`a3G#QzxV@ICNax&@hk3<_
zBh`Tq66G{-tCw$V{(y0v7l!tp20~@gdFX<t2yAf7TZbU4H+&N0D2hZ^a_6-I(yp$A
zLu-4Y{Ez$etx!T0KE1E^ABgv-=`PL?WxCx2K`NJ9btEB~b!5>jzFbF#bJE7i>T4ux
zQdrF3org^wFcnw$#bQMv@SfN3$Fuo7HnB_`2ZGB{ZqGr>%xP;2_!Q{=N-ZhU1c~^5
zdt=OO#wmcpkXJyCG?{{&n=R{Sn=Ytg;<09CH)l7TA&wkt{Q;>RrA2Ia6-QixEPLrU
z%0)N$3Nh0?U825&<F9?WK3>v($Sz}0G_(!v&xSSAzje4{rup+^W@^}ByqOb95$<wN
z+FlC*OS+|hQqPCLLP#G|{-Gsx{l!c#$SvU|*<FUbs>E0sbwK*%#GP}!6`%*Z@L;&C
z3^dE&>5%bWAXmP<sMdk^(BGixJsS?iR#(S<snG+CmKd<~(&IF$#~B&)6d2mrDuBh-
z`7=YP#+9XUV(~_Bik5uFl#L+MA?9LT<$`)GritanD!@)!d!CK9hHX$6M-ksae^D`j
z3O<QKrMApfW9&BT-mgQopCLGOW;!j??cokAvs0*DB`{2miv0!b50XsS$yAy~y>*X1
z_m}Pivs*u7@9i>qA!58fDCwj^M<1P(u^m;urVdlM@>aIf+E3-d9<VM%qyk!OJVCWh
zPAES=A4hZJY<Q^6E;Y6VV~t?=nmyu9K5i(m`ONw{XX$4$>ZW>fc4cS7w5O3sCmKKn
z+94A?VyfSBb9{}rEbCIYtXORJBCv__fnZ>?a}edaA%bP$jI?J^q0UKO!mduA8U!3b
z0CJ_Js}NWQZoebapVUHP%pPOUm?1<)zd<fq;MhF{ievF2n_&PhASNq*%9zmiH6XNj
zEs=Ea8SWPuzGGlUp!TE-8qB)a23IEsfKm?dH$i1qxCT5^L?@^KA}zidPI#gv8Gk-X
zqM+_@h7X;V9#72a+y&FDD1Goq_JL={tjxBl!n$f3IRf!$mA(-L;%G4SRZ1!Xm1z2f
zhjX-H01}>%`hzUM-Y6g1z|@@3G_kio?S0bcbjQuxJd>vU$Uyz(4*peEDSVc-G;O;%
z9Y97%Tq}TRsH+oN%2u(oyC=W<9`e@&m;i;jC%L;sP(9RBDQnth3;ZMEQNFH3GEf0c
zU<3RF!hNG-vCDooYFS^nPlFnv4(ElI1=vNcr42TF^u<zpNG@plq%<5<WA+sLT^{=-
z*SKa`IfTWbzHQm>q67f{MoN>{f&>xA91r4pz5Zc&@P^i-9||`98v$Si!U@}ouZ88W
zg;YL=OQ;4}UQtkpyd~lD{qWy0H|lwJXKmenz#E=*9kt$YX*X!wDk7ITlIUGWnj>a7
z<_GQR752@J)Y(U)ncu(d<qS5Uh{rKg3^Vr2bD|>Iit7P}oBq8x$FP85)&Nsw<#rOW
z8U_x(1J)Zgm(8tZXU%+(yYcO+Z7#ZszPwa2`ygiMPayX9KondtFMRK!7x`9uWN;(f
zfWW?8yOdj;GA3We0YAW92gWipn(d>zcbA+vZ_21B<GE0ey*BZvJpq=xH`~tz@gx|c
zR1DNG3&a$spo!;l*pkkI8!!LndXN^Ms=PE4MNl|PaHUi;bw5F9BU%~$>xF?-pfcW`
zbqY<k8GOpfKgG8NmJQVzlhFBu6R$nBAX~7++WL0raE6k7#bPQwo<1VA`kZ;~fW)ih
zqRHEcmh$T`EO<YY*CCdJD*xhpHDX3*L_aS^FT1A+oMlXy$~;c#+7(V<3O2N-e%AuZ
z6YUffqFHBX<0db?COgL)pQ{`%3Wzwk*NA!or_{An@fOVM>??6ie(6M)p@6@WQ?Tl7
zoKrKEj|x~2yZehhMLkFRRnOC>XL&L+N;m0B{_OQ9gzzTYb!!Jct=bk?_hIpY9rOwY
zMnr69R(?8EN52qR+k!~qnCYc-KmV&*d$&NY?t5cjR)V+ncMor=puTRoo?{5dH;@!*
z<~RrV!+ljAN+;Qx2LraY&JWnz^|sYbZjP+Y;|pC#DuHUH+>F~x3PqTkx)=OAE0X9(
z(AO6gp~AH^{nq+n)LHYDD8mQN?DDFcd!U&d4PaajzSD1~lXq3p{x=^vItrq3gD^4O
z=hYS`?&C-0&KuAV>Jv}T?ba0IafL$~+bZ}p$9lwyyx=-uPN`Hpvv<)Ia>OWHa4+N4
z6zscrW$^XA32E<j+Ty}+?MPo5Uc!qbGT;`7%Gx?l<xc9YfT7LQ>Jw^7hYtkRJr{Q8
zQ|*1pp_q6Mno|D6EX!kgSv0h0I3~ef_l%$<u(@0`-IS&EL||}ZN1R(*I)Ea^7I-yG
zyXCjhJ-1uF(Uyz)_^9=*N_DY9KS79>DTFjL`0y16n%^dGNQn;2V82mqoIi9i{15vu
zLq&(BTl9CInUjZlTIa>^!!HlMK3W8Sd_Ow0+E8IT?h$=55$^Z)$WYIuig=O;Lp_1Q
z4wOT;XbWQ!>Mh`pdXuSo=K<ST=}P*!xodlEIBHy%5{U$VZS$wEkNsG|u2<Kk)WCyL
zzTvy?7M8&Cfq_5@YIV!+<Rn^wt)5qtp<xK_KFldD3M^WAGlN-UQ|ANEBYVoG0w3xR
zek`?_!aFWQ%$ZEAn=XFHElm{gKzw@Bh0-LNwZ&Zh?yZ%*15_b_Y4{Osz^~4Oum!!<
zse&!G<a}e~Ot7vdkbjYnU^^LjG~ETn>Bba;wT!wK`Hf1Ueh04*%D7Kfj*#b~BNfvz
zsbf?uiMm5-xhaQ|7Om2OrYbU>ngUM9%F5nU<65IFyu(`yZ;Vb1)=wCd!L2K?c$ezE
z4IbS|^?Z>)eEp}ZfjwF)Waw?pPJ?{~*g%;e<TX6&>fxO~Nx7dQGLWZ)cPQ*T!((W-
zGm2?tM)K}7oG<0Xz<`ltWjxvE<$AH!4*R{A2~uYGr@m!vm*j+e#CE9^*}Oc#uihB|
z5;#kMY2^8mrr80%*+02bDx6B{Jsch(d7kQGV7~iGTgFZBu$Pf`tNf`B2{|t7fGhIq
zos0xF#l$bfxOtcGDd*MDbdKBaCKxg<zBS_t!TiI&D&FS>CEbr8JTNd_1bjWC{Ubgk
z9~)9;A1&=FyIt$l!VBXfD~6VCk0fjO%QwLJ7k00RH*%I8cCqF542VzP^;`OU-_?=<
zbV}OoQE)HqV`|)X5+WbgSxGWH>t+7-O;(l~Z+FJJ)sygu^+eF01#Suj+pnAcw!s>p
z$-xF}c>7t9X6H$^V9hvT5H{jKv+=zzWHA0pgw8e5fZpm9vIphVq3%S4*N3%&jsY^Q
zK%sSPuj=?d{ATs0o0y6#0w3%YT^@-_sTuTUwI(Q{;l3KjeAbVk#Wmi%PDxm`zoqQ~
z((<-}*FSP%5gt7uI3t1&75ne{@1^bpdW1;MMGNkSr~UAuDbB4+VQi|x(gdO^zin_)
zncfs2hj8xdiiy)@vVkfkItLKvsGtJh<Ah+N9r4Fk#4j}3)5fp4%$8OPm!2*v85$2i
z15p4UjH=DV!<+L-y~sIS7&k+wwQ@3eBlD0ewG{0*l>rTb0T~tFl4Q3J!flauS==b&
z6B<Vc5wD$nmC_i`0E<AeD?2H<QEoWxP-{X6_i15QJF-Cv-N-NLN9%$|5L;=d6lmF5
z;UuK7x%Cq%N?T&~lD+MeWZ|S<_sZ68ShNa0XXqal>m<Ivi+wgAY*(pVJxOj3;P^Mp
z{Py4Q&hV_4XtqYN^W_`w+k)rhb~b?0`@olx-tL`?jy^9&Cf7sqxSSo^=A<Kc6UYof
z^DkeMP>!g%dDvlCf(St$kVofvH90|9yl-gmvRvcKS&Ye9DdoTK@2m}iSvC{3m%4E0
z@TJD7c1V?!URM7+t?f3)%{X(6JXg~A9TvGQyX6n(^Yt0NX;>vDPcr~mICPooLWA_`
z<1A>FuXr|C)dtDr*PQt%Xs5WePWUB&gBj$zZ#BIY%?jDdpbSA-PV0`dGf^oa_Jp}Z
zlrGV7oe`#B^+nPIQ`ZDJeJas=ru#=*YL#+n?Go}f33>1GsZ{TTy2bdBihj}mz*mp!
zOzn%{WgLM=*CpiuKUs*GnHa{B$2siJqfNi|Z;|rH%stM*8b26kAMCYY&NHwPGtlYn
z7UVx_^sgR$Z8x27foS63FCP<b7NQ@4m$W&a4+pb@c6L8rWcYppH@1D~kD>t|gtcG_
zy#@C|!VQV~TY}G5e57qp?F4jRxqq~@h6^?-cvD>ySwVLl2m7=gERtEn>Fw_@ND%pO
oiVC*mbz<%I+0K1Z`+LWvZ$3~$+A!Gm?^hpSc@||}WrmLVKLvuzv;Y7A

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/jquery-1.5.1.min.js b/3rdparty/timepicker/css/include/jquery-1.5.1.min.js
new file mode 100644
index 00000000000..6437874c699
--- /dev/null
+++ b/3rdparty/timepicker/css/include/jquery-1.5.1.min.js
@@ -0,0 +1,16 @@
+/*!
+ * jQuery JavaScript Library v1.5.1
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Wed Feb 23 13:55:29 2011 -0500
+ */
+(function(a,b){function cg(a){return d.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cd(a){if(!bZ[a]){var b=d("<"+a+">").appendTo("body"),c=b.css("display");b.remove();if(c==="none"||c==="")c="block";bZ[a]=c}return bZ[a]}function cc(a,b){var c={};d.each(cb.concat.apply([],cb.slice(0,b)),function(){c[this]=a});return c}function bY(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function bX(){try{return new a.XMLHttpRequest}catch(b){}}function bW(){d(a).unload(function(){for(var a in bU)bU[a](0,1)})}function bQ(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var e=a.dataTypes,f={},g,h,i=e.length,j,k=e[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h==="string"&&(f[h.toLowerCase()]=a.converters[h]);l=k,k=e[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=f[m]||f["* "+k];if(!n){p=b;for(o in f){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=f[j[1]+" "+k];if(p){o=f[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&d.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bP(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bO(a,b,c,e){if(d.isArray(b)&&b.length)d.each(b,function(b,f){c||bq.test(a)?e(a,f):bO(a+"["+(typeof f==="object"||d.isArray(f)?b:"")+"]",f,c,e)});else if(c||b==null||typeof b!=="object")e(a,b);else if(d.isArray(b)||d.isEmptyObject(b))e(a,"");else for(var f in b)bO(a+"["+f+"]",b[f],c,e)}function bN(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bH,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l==="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bN(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bN(a,c,d,e,"*",g));return l}function bM(a){return function(b,c){typeof b!=="string"&&(c=b,b="*");if(d.isFunction(c)){var e=b.toLowerCase().split(bB),f=0,g=e.length,h,i,j;for(;f<g;f++)h=e[f],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bo(a,b,c){var e=b==="width"?bi:bj,f=b==="width"?a.offsetWidth:a.offsetHeight;if(c==="border")return f;d.each(e,function(){c||(f-=parseFloat(d.css(a,"padding"+this))||0),c==="margin"?f+=parseFloat(d.css(a,"margin"+this))||0:f-=parseFloat(d.css(a,"border"+this+"Width"))||0});return f}function ba(a,b){b.src?d.ajax({url:b.src,async:!1,dataType:"script"}):d.globalEval(b.text||b.textContent||b.innerHTML||""),b.parentNode&&b.parentNode.removeChild(b)}function _(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function $(a,b){if(b.nodeType===1){var c=b.nodeName.toLowerCase();b.clearAttributes(),b.mergeAttributes(a);if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(d.expando)}}function Z(a,b){if(b.nodeType===1&&d.hasData(a)){var c=d.expando,e=d.data(a),f=d.data(b,e);if(e=e[c]){var g=e.events;f=f[c]=d.extend({},e);if(g){delete f.handle,f.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)d.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function Y(a,b){return d.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function O(a,b,c){if(d.isFunction(b))return d.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return d.grep(a,function(a,d){return a===b===c});if(typeof b==="string"){var e=d.grep(a,function(a){return a.nodeType===1});if(J.test(b))return d.filter(b,e,!c);b=d.filter(b,e)}return d.grep(a,function(a,e){return d.inArray(a,b)>=0===c})}function N(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function F(a,b){return(a&&a!=="*"?a+".":"")+b.replace(r,"`").replace(s,"&")}function E(a){var b,c,e,f,g,h,i,j,k,l,m,n,o,q=[],r=[],s=d._data(this,"events");if(a.liveFired!==this&&s&&s.live&&!a.target.disabled&&(!a.button||a.type!=="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var t=s.live.slice(0);for(i=0;i<t.length;i++)g=t[i],g.origType.replace(p,"")===a.type?r.push(g.selector):t.splice(i--,1);f=d(a.target).closest(r,a.currentTarget);for(j=0,k=f.length;j<k;j++){m=f[j];for(i=0;i<t.length;i++){g=t[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,e=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,e=d(a.relatedTarget).closest(g.selector)[0];(!e||e!==h)&&q.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=q.length;j<k;j++){f=q[j];if(c&&f.level>c)break;a.currentTarget=f.elem,a.data=f.handleObj.data,a.handleObj=f.handleObj,o=f.handleObj.origHandler.apply(f.elem,arguments);if(o===!1||a.isPropagationStopped()){c=f.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function C(a,c,e){var f=d.extend({},e[0]);f.type=a,f.originalEvent={},f.liveFired=b,d.event.handle.call(c,f),f.isDefaultPrevented()&&e[0].preventDefault()}function w(){return!0}function v(){return!1}function g(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function f(a,c,f){if(f===b&&a.nodeType===1){f=a.getAttribute("data-"+c);if(typeof f==="string"){try{f=f==="true"?!0:f==="false"?!1:f==="null"?null:d.isNaN(f)?e.test(f)?d.parseJSON(f):f:parseFloat(f)}catch(g){}d.data(a,c,f)}else f=b}return f}var c=a.document,d=function(){function I(){if(!d.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(I,1);return}d.ready()}}var d=function(a,b){return new d.fn.init(a,b,g)},e=a.jQuery,f=a.$,g,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,i=/\S/,j=/^\s+/,k=/\s+$/,l=/\d/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=navigator.userAgent,w,x=!1,y,z="then done fail isResolved isRejected promise".split(" "),A,B=Object.prototype.toString,C=Object.prototype.hasOwnProperty,D=Array.prototype.push,E=Array.prototype.slice,F=String.prototype.trim,G=Array.prototype.indexOf,H={};d.fn=d.prototype={constructor:d,init:function(a,e,f){var g,i,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!e&&c.body){this.context=c,this[0]=c.body,this.selector="body",this.length=1;return this}if(typeof a==="string"){g=h.exec(a);if(!g||!g[1]&&e)return!e||e.jquery?(e||f).find(a):this.constructor(e).find(a);if(g[1]){e=e instanceof d?e[0]:e,k=e?e.ownerDocument||e:c,j=m.exec(a),j?d.isPlainObject(e)?(a=[c.createElement(j[1])],d.fn.attr.call(a,e,!0)):a=[k.createElement(j[1])]:(j=d.buildFragment([g[1]],[k]),a=(j.cacheable?d.clone(j.fragment):j.fragment).childNodes);return d.merge(this,a)}i=c.getElementById(g[2]);if(i&&i.parentNode){if(i.id!==g[2])return f.find(a);this.length=1,this[0]=i}this.context=c,this.selector=a;return this}if(d.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return d.makeArray(a,this)},selector:"",jquery:"1.5.1",length:0,size:function(){return this.length},toArray:function(){return E.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var e=this.constructor();d.isArray(a)?D.apply(e,a):d.merge(e,a),e.prevObject=this,e.context=this.context,b==="find"?e.selector=this.selector+(this.selector?" ":"")+c:b&&(e.selector=this.selector+"."+b+"("+c+")");return e},each:function(a,b){return d.each(this,a,b)},ready:function(a){d.bindReady(),y.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(E.apply(this,arguments),"slice",E.call(arguments).join(","))},map:function(a){return this.pushStack(d.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:D,sort:[].sort,splice:[].splice},d.fn.init.prototype=d.fn,d.extend=d.fn.extend=function(){var a,c,e,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i==="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!=="object"&&!d.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){e=i[c],f=a[c];if(i===f)continue;l&&f&&(d.isPlainObject(f)||(g=d.isArray(f)))?(g?(g=!1,h=e&&d.isArray(e)?e:[]):h=e&&d.isPlainObject(e)?e:{},i[c]=d.extend(l,h,f)):f!==b&&(i[c]=f)}return i},d.extend({noConflict:function(b){a.$=f,b&&(a.jQuery=e);return d},isReady:!1,readyWait:1,ready:function(a){a===!0&&d.readyWait--;if(!d.readyWait||a!==!0&&!d.isReady){if(!c.body)return setTimeout(d.ready,1);d.isReady=!0;if(a!==!0&&--d.readyWait>0)return;y.resolveWith(c,[d]),d.fn.trigger&&d(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!x){x=!0;if(c.readyState==="complete")return setTimeout(d.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",A,!1),a.addEventListener("load",d.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",A),a.attachEvent("onload",d.ready);var b=!1;try{b=a.frameElement==null}catch(e){}c.documentElement.doScroll&&b&&I()}}},isFunction:function(a){return d.type(a)==="function"},isArray:Array.isArray||function(a){return d.type(a)==="array"},isWindow:function(a){return a&&typeof a==="object"&&"setInterval"in a},isNaN:function(a){return a==null||!l.test(a)||isNaN(a)},type:function(a){return a==null?String(a):H[B.call(a)]||"object"},isPlainObject:function(a){if(!a||d.type(a)!=="object"||a.nodeType||d.isWindow(a))return!1;if(a.constructor&&!C.call(a,"constructor")&&!C.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a){}return c===b||C.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!=="string"||!b)return null;b=d.trim(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return a.JSON&&a.JSON.parse?a.JSON.parse(b):(new Function("return "+b))();d.error("Invalid JSON: "+b)},parseXML:function(b,c,e){a.DOMParser?(e=new DOMParser,c=e.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),e=c.documentElement,(!e||!e.nodeName||e.nodeName==="parsererror")&&d.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(a){if(a&&i.test(a)){var b=c.head||c.getElementsByTagName("head")[0]||c.documentElement,e=c.createElement("script");d.support.scriptEval()?e.appendChild(c.createTextNode(a)):e.text=a,b.insertBefore(e,b.firstChild),b.removeChild(e)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,e){var f,g=0,h=a.length,i=h===b||d.isFunction(a);if(e){if(i){for(f in a)if(c.apply(a[f],e)===!1)break}else for(;g<h;)if(c.apply(a[g++],e)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(var j=a[0];g<h&&c.call(j,g,j)!==!1;j=a[++g]){}return a},trim:F?function(a){return a==null?"":F.call(a)}:function(a){return a==null?"":(a+"").replace(j,"").replace(k,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var e=d.type(a);a.length==null||e==="string"||e==="function"||e==="regexp"||d.isWindow(a)?D.call(c,a):d.merge(c,a)}return c},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length==="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,b,c){var d=[],e;for(var f=0,g=a.length;f<g;f++)e=b(a[f],f,c),e!=null&&(d[d.length]=e);return d.concat.apply([],d)},guid:1,proxy:function(a,c,e){arguments.length===2&&(typeof c==="string"?(e=a,a=e[c],c=b):c&&!d.isFunction(c)&&(e=c,c=b)),!c&&a&&(c=function(){return a.apply(e||this,arguments)}),a&&(c.guid=a.guid=a.guid||c.guid||d.guid++);return c},access:function(a,c,e,f,g,h){var i=a.length;if(typeof c==="object"){for(var j in c)d.access(a,j,c[j],f,g,e);return a}if(e!==b){f=!h&&f&&d.isFunction(e);for(var k=0;k<i;k++)g(a[k],c,f?e.call(a[k],k,g(a[k],c)):e,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},_Deferred:function(){var a=[],b,c,e,f={done:function(){if(!e){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=d.type(i),j==="array"?f.done.apply(f,i):j==="function"&&a.push(i);k&&f.resolveWith(k[0],k[1])}return this},resolveWith:function(d,f){if(!e&&!b&&!c){c=1;try{while(a[0])a.shift().apply(d,f)}catch(g){throw g}finally{b=[d,f],c=0}}return this},resolve:function(){f.resolveWith(d.isFunction(this.promise)?this.promise():this,arguments);return this},isResolved:function(){return c||b},cancel:function(){e=1,a=[];return this}};return f},Deferred:function(a){var b=d._Deferred(),c=d._Deferred(),e;d.extend(b,{then:function(a,c){b.done(a).fail(c);return this},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,promise:function(a){if(a==null){if(e)return e;e=a={}}var c=z.length;while(c--)a[z[c]]=b[z[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){var b=arguments.length,c=b<=1&&a&&d.isFunction(a.promise)?a:d.Deferred(),e=c.promise();if(b>1){var f=E.call(arguments,0),g=b,h=function(a){return function(b){f[a]=arguments.length>1?E.call(arguments,0):b,--g||c.resolveWith(e,f)}};while(b--)a=f[b],a&&d.isFunction(a.promise)?a.promise().then(h(b),c.reject):--g;g||c.resolveWith(e,f)}else c!==a&&c.resolve(a);return e},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}d.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.subclass=this.subclass,a.fn.init=function b(b,c){c&&c instanceof d&&!(c instanceof a)&&(c=a(c));return d.fn.init.call(this,b,c,e)},a.fn.init.prototype=a.fn;var e=a(c);return a},browser:{}}),y=d._Deferred(),d.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){H["[object "+b+"]"]=b.toLowerCase()}),w=d.uaMatch(v),w.browser&&(d.browser[w.browser]=!0,d.browser.version=w.version),d.browser.webkit&&(d.browser.safari=!0),G&&(d.inArray=function(a,b){return G.call(b,a)}),i.test(" ")&&(j=/^[\s\xA0]+/,k=/[\s\xA0]+$/),g=d(c),c.addEventListener?A=function(){c.removeEventListener("DOMContentLoaded",A,!1),d.ready()}:c.attachEvent&&(A=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",A),d.ready())});return d}();(function(){d.support={};var b=c.createElement("div");b.style.display="none",b.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var e=b.getElementsByTagName("*"),f=b.getElementsByTagName("a")[0],g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=b.getElementsByTagName("input")[0];if(e&&e.length&&f){d.support={leadingWhitespace:b.firstChild.nodeType===3,tbody:!b.getElementsByTagName("tbody").length,htmlSerialize:!!b.getElementsByTagName("link").length,style:/red/.test(f.getAttribute("style")),hrefNormalized:f.getAttribute("href")==="/a",opacity:/^0.55$/.test(f.style.opacity),cssFloat:!!f.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,deleteExpando:!0,optDisabled:!1,checkClone:!1,noCloneEvent:!0,noCloneChecked:!0,boxModel:null,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableHiddenOffsets:!0},i.checked=!0,d.support.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,d.support.optDisabled=!h.disabled;var j=null;d.support.scriptEval=function(){if(j===null){var b=c.documentElement,e=c.createElement("script"),f="script"+d.now();try{e.appendChild(c.createTextNode("window."+f+"=1;"))}catch(g){}b.insertBefore(e,b.firstChild),a[f]?(j=!0,delete a[f]):j=!1,b.removeChild(e),b=e=f=null}return j};try{delete b.test}catch(k){d.support.deleteExpando=!1}!b.addEventListener&&b.attachEvent&&b.fireEvent&&(b.attachEvent("onclick",function l(){d.support.noCloneEvent=!1,b.detachEvent("onclick",l)}),b.cloneNode(!0).fireEvent("onclick")),b=c.createElement("div"),b.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";var m=c.createDocumentFragment();m.appendChild(b.firstChild),d.support.checkClone=m.cloneNode(!0).cloneNode(!0).lastChild.checked,d(function(){var a=c.createElement("div"),b=c.getElementsByTagName("body")[0];if(b){a.style.width=a.style.paddingLeft="1px",b.appendChild(a),d.boxModel=d.support.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,d.support.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",d.support.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";var e=a.getElementsByTagName("td");d.support.reliableHiddenOffsets=e[0].offsetHeight===0,e[0].style.display="",e[1].style.display="none",d.support.reliableHiddenOffsets=d.support.reliableHiddenOffsets&&e[0].offsetHeight===0,a.innerHTML="",b.removeChild(a).style.display="none",a=e=null}});var n=function(a){var b=c.createElement("div");a="on"+a;if(!b.attachEvent)return!0;var d=a in b;d||(b.setAttribute(a,"return;"),d=typeof b[a]==="function"),b=null;return d};d.support.submitBubbles=n("submit"),d.support.changeBubbles=n("change"),b=e=f=null}})();var e=/^(?:\{.*\}|\[.*\])$/;d.extend({cache:{},uuid:0,expando:"jQuery"+(d.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?d.cache[a[d.expando]]:a[d.expando];return!!a&&!g(a)},data:function(a,c,e,f){if(d.acceptData(a)){var g=d.expando,h=typeof c==="string",i,j=a.nodeType,k=j?d.cache:a,l=j?a[d.expando]:a[d.expando]&&d.expando;if((!l||f&&l&&!k[l][g])&&h&&e===b)return;l||(j?a[d.expando]=l=++d.uuid:l=d.expando),k[l]||(k[l]={},j||(k[l].toJSON=d.noop));if(typeof c==="object"||typeof c==="function")f?k[l][g]=d.extend(k[l][g],c):k[l]=d.extend(k[l],c);i=k[l],f&&(i[g]||(i[g]={}),i=i[g]),e!==b&&(i[c]=e);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[c]:i}},removeData:function(b,c,e){if(d.acceptData(b)){var f=d.expando,h=b.nodeType,i=h?d.cache:b,j=h?b[d.expando]:d.expando;if(!i[j])return;if(c){var k=e?i[j][f]:i[j];if(k){delete k[c];if(!g(k))return}}if(e){delete i[j][f];if(!g(i[j]))return}var l=i[j][f];d.support.deleteExpando||i!=a?delete i[j]:i[j]=null,l?(i[j]={},h||(i[j].toJSON=d.noop),i[j][f]=l):h&&(d.support.deleteExpando?delete b[d.expando]:b.removeAttribute?b.removeAttribute(d.expando):b[d.expando]=null)}},_data:function(a,b,c){return d.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=d.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),d.fn.extend({data:function(a,c){var e=null;if(typeof a==="undefined"){if(this.length){e=d.data(this[0]);if(this[0].nodeType===1){var g=this[0].attributes,h;for(var i=0,j=g.length;i<j;i++)h=g[i].name,h.indexOf("data-")===0&&(h=h.substr(5),f(this[0],h,e[h]))}}return e}if(typeof a==="object")return this.each(function(){d.data(this,a)});var k=a.split(".");k[1]=k[1]?"."+k[1]:"";if(c===b){e=this.triggerHandler("getData"+k[1]+"!",[k[0]]),e===b&&this.length&&(e=d.data(this[0],a),e=f(this[0],a,e));return e===b&&k[1]?this.data(k[0]):e}return this.each(function(){var b=d(this),e=[k[0],c];b.triggerHandler("setData"+k[1]+"!",e),d.data(this,a,c),b.triggerHandler("changeData"+k[1]+"!",e)})},removeData:function(a){return this.each(function(){d.removeData(this,a)})}}),d.extend({queue:function(a,b,c){if(a){b=(b||"fx")+"queue";var e=d._data(a,b);if(!c)return e||[];!e||d.isArray(c)?e=d._data(a,b,d.makeArray(c)):e.push(c);return e}},dequeue:function(a,b){b=b||"fx";var c=d.queue(a,b),e=c.shift();e==="inprogress"&&(e=c.shift()),e&&(b==="fx"&&c.unshift("inprogress"),e.call(a,function(){d.dequeue(a,b)})),c.length||d.removeData(a,b+"queue",!0)}}),d.fn.extend({queue:function(a,c){typeof a!=="string"&&(c=a,a="fx");if(c===b)return d.queue(this[0],a);return this.each(function(b){var e=d.queue(this,a,c);a==="fx"&&e[0]!=="inprogress"&&d.dequeue(this,a)})},dequeue:function(a){return this.each(function(){d.dequeue(this,a)})},delay:function(a,b){a=d.fx?d.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){d.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var h=/[\n\t\r]/g,i=/\s+/,j=/\r/g,k=/^(?:href|src|style)$/,l=/^(?:button|input)$/i,m=/^(?:button|input|object|select|textarea)$/i,n=/^a(?:rea)?$/i,o=/^(?:radio|checkbox)$/i;d.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"},d.fn.extend({attr:function(a,b){return d.access(this,a,b,!0,d.attr)},removeAttr:function(a,b){return this.each(function(){d.attr(this,a,""),this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.addClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"){var b=(a||"").split(i);for(var c=0,e=this.length;c<e;c++){var f=this[c];if(f.nodeType===1)if(f.className){var g=" "+f.className+" ",h=f.className;for(var j=0,k=b.length;j<k;j++)g.indexOf(" "+b[j]+" ")<0&&(h+=" "+b[j]);f.className=d.trim(h)}else f.className=a}}return this},removeClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.removeClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"||a===b){var c=(a||"").split(i);for(var e=0,f=this.length;e<f;e++){var g=this[e];if(g.nodeType===1&&g.className)if(a){var j=(" "+g.className+" ").replace(h," ");for(var k=0,l=c.length;k<l;k++)j=j.replace(" "+c[k]+" "," ");g.className=d.trim(j)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,e=typeof b==="boolean";if(d.isFunction(a))return this.each(function(c){var e=d(this);e.toggleClass(a.call(this,c,e.attr("class"),b),b)});return this.each(function(){if(c==="string"){var f,g=0,h=d(this),j=b,k=a.split(i);while(f=k[g++])j=e?j:!h.hasClass(f),h[j?"addClass":"removeClass"](f)}else if(c==="undefined"||c==="boolean")this.className&&d._data(this,"__className__",this.className),this.className=this.className||a===!1?"":d._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(h," ").indexOf(b)>-1)return!0;return!1},val:function(a){if(!arguments.length){var c=this[0];if(c){if(d.nodeName(c,"option")){var e=c.attributes.value;return!e||e.specified?c.value:c.text}if(d.nodeName(c,"select")){var f=c.selectedIndex,g=[],h=c.options,i=c.type==="select-one";if(f<0)return null;for(var k=i?f:0,l=i?f+1:h.length;k<l;k++){var m=h[k];if(m.selected&&(d.support.optDisabled?!m.disabled:m.getAttribute("disabled")===null)&&(!m.parentNode.disabled||!d.nodeName(m.parentNode,"optgroup"))){a=d(m).val();if(i)return a;g.push(a)}}if(i&&!g.length&&h.length)return d(h[f]).val();return g}if(o.test(c.type)&&!d.support.checkOn)return c.getAttribute("value")===null?"on":c.value;return(c.value||"").replace(j,"")}return b}var n=d.isFunction(a);return this.each(function(b){var c=d(this),e=a;if(this.nodeType===1){n&&(e=a.call(this,b,c.val())),e==null?e="":typeof e==="number"?e+="":d.isArray(e)&&(e=d.map(e,function(a){return a==null?"":a+""}));if(d.isArray(e)&&o.test(this.type))this.checked=d.inArray(c.val(),e)>=0;else if(d.nodeName(this,"select")){var f=d.makeArray(e);d("option",this).each(function(){this.selected=d.inArray(d(this).val(),f)>=0}),f.length||(this.selectedIndex=-1)}else this.value=e}})}}),d.extend({attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,e,f){if(!a||a.nodeType===3||a.nodeType===8||a.nodeType===2)return b;if(f&&c in d.attrFn)return d(a)[c](e);var g=a.nodeType!==1||!d.isXMLDoc(a),h=e!==b;c=g&&d.props[c]||c;if(a.nodeType===1){var i=k.test(c);if(c==="selected"&&!d.support.optSelected){var j=a.parentNode;j&&(j.selectedIndex,j.parentNode&&j.parentNode.selectedIndex)}if((c in a||a[c]!==b)&&g&&!i){h&&(c==="type"&&l.test(a.nodeName)&&a.parentNode&&d.error("type property can't be changed"),e===null?a.nodeType===1&&a.removeAttribute(c):a[c]=e);if(d.nodeName(a,"form")&&a.getAttributeNode(c))return a.getAttributeNode(c).nodeValue;if(c==="tabIndex"){var o=a.getAttributeNode("tabIndex");return o&&o.specified?o.value:m.test(a.nodeName)||n.test(a.nodeName)&&a.href?0:b}return a[c]}if(!d.support.style&&g&&c==="style"){h&&(a.style.cssText=""+e);return a.style.cssText}h&&a.setAttribute(c,""+e);if(!a.attributes[c]&&(a.hasAttribute&&!a.hasAttribute(c)))return b;var p=!d.support.hrefNormalized&&g&&i?a.getAttribute(c,2):a.getAttribute(c);return p===null?b:p}h&&(a[c]=e);return a[c]}});var p=/\.(.*)$/,q=/^(?:textarea|input|select)$/i,r=/\./g,s=/ /g,t=/[^\w\s.|`]/g,u=function(a){return a.replace(t,"\\$&")};d.event={add:function(c,e,f,g){if(c.nodeType!==3&&c.nodeType!==8){try{d.isWindow(c)&&(c!==a&&!c.frameElement)&&(c=a)}catch(h){}if(f===!1)f=v;else if(!f)return;var i,j;f.handler&&(i=f,f=i.handler),f.guid||(f.guid=d.guid++);var k=d._data(c);if(!k)return;var l=k.events,m=k.handle;l||(k.events=l={}),m||(k.handle=m=function(){return typeof d!=="undefined"&&!d.event.triggered?d.event.handle.apply(m.elem,arguments):b}),m.elem=c,e=e.split(" ");var n,o=0,p;while(n=e[o++]){j=i?d.extend({},i):{handler:f,data:g},n.indexOf(".")>-1?(p=n.split("."),n=p.shift(),j.namespace=p.slice(0).sort().join(".")):(p=[],j.namespace=""),j.type=n,j.guid||(j.guid=f.guid);var q=l[n],r=d.event.special[n]||{};if(!q){q=l[n]=[];if(!r.setup||r.setup.call(c,g,p,m)===!1)c.addEventListener?c.addEventListener(n,m,!1):c.attachEvent&&c.attachEvent("on"+n,m)}r.add&&(r.add.call(c,j),j.handler.guid||(j.handler.guid=f.guid)),q.push(j),d.event.global[n]=!0}c=null}},global:{},remove:function(a,c,e,f){if(a.nodeType!==3&&a.nodeType!==8){e===!1&&(e=v);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=d.hasData(a)&&d._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(e=c.handler,c=c.type);if(!c||typeof c==="string"&&c.charAt(0)==="."){c=c||"";for(h in t)d.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+d.map(m.slice(0).sort(),u).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!e){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))d.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=d.event.special[h]||{};for(j=f||0;j<p.length;j++){q=p[j];if(e.guid===q.guid){if(l||n.test(q.namespace))f==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(f!=null)break}}if(p.length===0||f!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&d.removeEvent(a,h,s.handle),g=null,delete t[h]}if(d.isEmptyObject(t)){var w=s.handle;w&&(w.elem=null),delete s.events,delete s.handle,d.isEmptyObject(s)&&d.removeData(a,b,!0)}}},trigger:function(a,c,e){var f=a.type||a,g=arguments[3];if(!g){a=typeof a==="object"?a[d.expando]?a:d.extend(d.Event(f),a):d.Event(f),f.indexOf("!")>=0&&(a.type=f=f.slice(0,-1),a.exclusive=!0),e||(a.stopPropagation(),d.event.global[f]&&d.each(d.cache,function(){var b=d.expando,e=this[b];e&&e.events&&e.events[f]&&d.event.trigger(a,c,e.handle.elem)}));if(!e||e.nodeType===3||e.nodeType===8)return b;a.result=b,a.target=e,c=d.makeArray(c),c.unshift(a)}a.currentTarget=e;var h=d._data(e,"handle");h&&h.apply(e,c);var i=e.parentNode||e.ownerDocument;try{e&&e.nodeName&&d.noData[e.nodeName.toLowerCase()]||e["on"+f]&&e["on"+f].apply(e,c)===!1&&(a.result=!1,a.preventDefault())}catch(j){}if(!a.isPropagationStopped()&&i)d.event.trigger(a,c,i,!0);else if(!a.isDefaultPrevented()){var k,l=a.target,m=f.replace(p,""),n=d.nodeName(l,"a")&&m==="click",o=d.event.special[m]||{};if((!o._default||o._default.call(e,a)===!1)&&!n&&!(l&&l.nodeName&&d.noData[l.nodeName.toLowerCase()])){try{l[m]&&(k=l["on"+m],k&&(l["on"+m]=null),d.event.triggered=!0,l[m]())}catch(q){}k&&(l["on"+m]=k),d.event.triggered=!1}}},handle:function(c){var e,f,g,h,i,j=[],k=d.makeArray(arguments);c=k[0]=d.event.fix(c||a.event),c.currentTarget=this,e=c.type.indexOf(".")<0&&!c.exclusive,e||(g=c.type.split("."),c.type=g.shift(),j=g.slice(0).sort(),h=new RegExp("(^|\\.)"+j.join("\\.(?:.*\\.)?")+"(\\.|$)")),c.namespace=c.namespace||j.join("."),i=d._data(this,"events"),f=(i||{})[c.type];if(i&&f){f=f.slice(0);for(var l=0,m=f.length;l<m;l++){var n=f[l];if(e||h.test(n.namespace)){c.handler=n.handler,c.data=n.data,c.handleObj=n;var o=n.handler.apply(this,k);o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[d.expando])return a;var e=a;a=d.Event(e);for(var f=this.props.length,g;f;)g=this.props[--f],a[g]=e[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=c.documentElement,i=c.body;a.pageX=a.clientX+(h&&h.scrollLeft||i&&i.scrollLeft||0)-(h&&h.clientLeft||i&&i.clientLeft||0),a.pageY=a.clientY+(h&&h.scrollTop||i&&i.scrollTop||0)-(h&&h.clientTop||i&&i.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:d.proxy,special:{ready:{setup:d.bindReady,teardown:d.noop},live:{add:function(a){d.event.add(this,F(a.origType,a.selector),d.extend({},a,{handler:E,guid:a.handler.guid}))},remove:function(a){d.event.remove(this,F(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){d.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},d.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},d.Event=function(a){if(!this.preventDefault)return new d.Event(a);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?w:v):this.type=a,this.timeStamp=d.now(),this[d.expando]=!0},d.Event.prototype={preventDefault:function(){this.isDefaultPrevented=w;var a=this.originalEvent;a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=w;var a=this.originalEvent;a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=w,this.stopPropagation()},isDefaultPrevented:v,isPropagationStopped:v,isImmediatePropagationStopped:v};var x=function(a){var b=a.relatedTarget;try{if(b!==c&&!b.parentNode)return;while(b&&b!==this)b=b.parentNode;b!==this&&(a.type=a.data,d.event.handle.apply(this,arguments))}catch(e){}},y=function(a){a.type=a.data,d.event.handle.apply(this,arguments)};d.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){d.event.special[a]={setup:function(c){d.event.add(this,b,c&&c.selector?y:x,a)},teardown:function(a){d.event.remove(this,b,a&&a.selector?y:x)}}}),d.support.submitBubbles||(d.event.special.submit={setup:function(a,b){if(this.nodeName&&this.nodeName.toLowerCase()!=="form")d.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&d(b).closest("form").length&&C("submit",this,arguments)}),d.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&d(b).closest("form").length&&a.keyCode===13&&C("submit",this,arguments)});else return!1},teardown:function(a){d.event.remove(this,".specialSubmit")}});if(!d.support.changeBubbles){var z,A=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?d.map(a.options,function(a){return a.selected}).join("-"):"":a.nodeName.toLowerCase()==="select"&&(c=a.selectedIndex);return c},B=function B(a){var c=a.target,e,f;if(q.test(c.nodeName)&&!c.readOnly){e=d._data(c,"_change_data"),f=A(c),(a.type!=="focusout"||c.type!=="radio")&&d._data(c,"_change_data",f);if(e===b||f===e)return;if(e!=null||f)a.type="change",a.liveFired=b,d.event.trigger(a,arguments[1],c)}};d.event.special.change={filters:{focusout:B,beforedeactivate:B,click:function(a){var b=a.target,c=b.type;(c==="radio"||c==="checkbox"||b.nodeName.toLowerCase()==="select")&&B.call(this,a)},keydown:function(a){var b=a.target,c=b.type;(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&B.call(this,a)},beforeactivate:function(a){var b=a.target;d._data(b,"_change_data",A(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in z)d.event.add(this,c+".specialChange",z[c]);return q.test(this.nodeName)},teardown:function(a){d.event.remove(this,".specialChange");return q.test(this.nodeName)}},z=d.event.special.change.filters,z.focus=z.beforeactivate}c.addEventListener&&d.each({focus:"focusin",blur:"focusout"},function(a,b){function c(a){a=d.event.fix(a),a.type=b;return d.event.handle.call(this,a)}d.event.special[b]={setup:function(){this.addEventListener(a,c,!0)},teardown:function(){this.removeEventListener(a,c,!0)}}}),d.each(["bind","one"],function(a,c){d.fn[c]=function(a,e,f){if(typeof a==="object"){for(var g in a)this[c](g,e,a[g],f);return this}if(d.isFunction(e)||e===!1)f=e,e=b;var h=c==="one"?d.proxy(f,function(a){d(this).unbind(a,h);return f.apply(this,arguments)}):f;if(a==="unload"&&c!=="one")this.one(a,e,f);else for(var i=0,j=this.length;i<j;i++)d.event.add(this[i],a,h,e);return this}}),d.fn.extend({unbind:function(a,b){if(typeof a!=="object"||a.preventDefault)for(var e=0,f=this.length;e<f;e++)d.event.remove(this[e],a,b);else for(var c in a)this.unbind(c,a[c]);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){d.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){var c=d.Event(a);c.preventDefault(),c.stopPropagation(),d.event.trigger(c,b,this[0]);return c.result}},toggle:function(a){var b=arguments,c=1;while(c<b.length)d.proxy(a,b[c++]);return this.click(d.proxy(a,function(e){var f=(d._data(this,"lastToggle"+a.guid)||0)%c;d._data(this,"lastToggle"+a.guid,f+1),e.preventDefault();return b[f].apply(this,arguments)||!1}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var D={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};d.each(["live","die"],function(a,c){d.fn[c]=function(a,e,f,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:d(this.context);if(typeof a==="object"&&!a.preventDefault){for(var o in a)n[c](o,e,a[o],m);return this}d.isFunction(e)&&(f=e,e=b),a=(a||"").split(" ");while((h=a[i++])!=null){j=p.exec(h),k="",j&&(k=j[0],h=h.replace(p,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,h==="focus"||h==="blur"?(a.push(D[h]+k),h=h+k):h=(D[h]||h)+k;if(c==="live")for(var q=0,r=n.length;q<r;q++)d.event.add(n[q],"live."+F(h,m),{data:e,selector:m,handler:f,origType:h,origHandler:f,preType:l});else n.unbind("live."+F(h,m),f)}return this}}),d.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){d.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},d.attrFn&&(d.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!=="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,e,g){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!=="string")return e;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(f.call(n)==="[object Array]")if(u)if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&e.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&e.push(j[t]);else e.push.apply(e,n);else p(n,e);o&&(k(o,h,e,g),k.uniqueSort(e));return e};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!=="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(f){if(f===!0)continue}else g=o=!0}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b==="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1){}a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b==="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!=="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!=="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!=="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){return"text"===a.getAttribute("type")},radio:function(a){return"radio"===a.type},checkbox:function(a){return"checkbox"===a.type},file:function(a){return"file"===a.type},password:function(a){return"password"===a.type},submit:function(a){return"submit"===a.type},image:function(a){return"image"===a.type},reset:function(a){return"reset"===a.type},button:function(a){return"button"===a.type||a.nodeName.toLowerCase()==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(f.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length==="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(a===b){g=!0;return 0}if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!=="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!=="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!=="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!=="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector,d=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(e){d=!0}b&&(k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(d||!l.match.PSEUDO.test(c)&&!/!=/.test(c))return b.call(a,c)}catch(e){}return k(c,null,null,[a]).length>0})}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!=="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};d.find=k,d.expr=k.selectors,d.expr[":"]=d.expr.filters,d.unique=k.uniqueSort,d.text=k.getText,d.isXMLDoc=k.isXML,d.contains=k.contains}();var G=/Until$/,H=/^(?:parents|prevUntil|prevAll)/,I=/,/,J=/^.[^:#\[\.,]*$/,K=Array.prototype.slice,L=d.expr.match.POS,M={children:!0,contents:!0,next:!0,prev:!0};d.fn.extend({find:function(a){var b=this.pushStack("","find",a),c=0;for(var e=0,f=this.length;e<f;e++){c=b.length,d.find(a,this[e],b);if(e>0)for(var g=c;g<b.length;g++)for(var h=0;h<c;h++)if(b[h]===b[g]){b.splice(g--,1);break}}return b},has:function(a){var b=d(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(d.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(O(this,a,!1),"not",a)},filter:function(a){return this.pushStack(O(this,a,!0),"filter",a)},is:function(a){return!!a&&d.filter(a,this).length>0},closest:function(a,b){var c=[],e,f,g=this[0];if(d.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(e=0,f=a.length;e<f;e++)i=a[e],j[i]||(j[i]=d.expr.match.POS.test(i)?d(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:d(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=L.test(a)?d(a,b||this.context):null;for(e=0,f=this.length;e<f;e++){g=this[e];while(g){if(l?l.index(g)>-1:d.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b)break}}c=c.length>1?d.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a==="string")return d.inArray(this[0],a?d(a):this.parent().children());return d.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a==="string"?d(a,b):d.makeArray(a),e=d.merge(this.get(),c);return this.pushStack(N(c[0])||N(e[0])?e:d.unique(e))},andSelf:function(){return this.add(this.prevObject)}}),d.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return d.dir(a,"parentNode")},parentsUntil:function(a,b,c){return d.dir(a,"parentNode",c)},next:function(a){return d.nth(a,2,"nextSibling")},prev:function(a){return d.nth(a,2,"previousSibling")},nextAll:function(a){return d.dir(a,"nextSibling")},prevAll:function(a){return d.dir(a,"previousSibling")},nextUntil:function(a,b,c){return d.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return d.dir(a,"previousSibling",c)},siblings:function(a){return d.sibling(a.parentNode.firstChild,a)},children:function(a){return d.sibling(a.firstChild)},contents:function(a){return d.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:d.makeArray(a.childNodes)}},function(a,b){d.fn[a]=function(c,e){var f=d.map(this,b,c),g=K.call(arguments);G.test(a)||(e=c),e&&typeof e==="string"&&(f=d.filter(e,f)),f=this.length>1&&!M[a]?d.unique(f):f,(this.length>1||I.test(e))&&H.test(a)&&(f=f.reverse());return this.pushStack(f,a,g.join(","))}}),d.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?d.find.matchesSelector(b[0],a)?[b[0]]:[]:d.find.matches(a,b)},dir:function(a,c,e){var f=[],g=a[c];while(g&&g.nodeType!==9&&(e===b||g.nodeType!==1||!d(g).is(e)))g.nodeType===1&&f.push(g),g=g[c];return f},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var P=/ jQuery\d+="(?:\d+|null)"/g,Q=/^\s+/,R=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,S=/<([\w:]+)/,T=/<tbody/i,U=/<|&#?\w+;/,V=/<(?:script|object|embed|option|style)/i,W=/checked\s*(?:[^=]|=\s*.checked.)/i,X={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};X.optgroup=X.option,X.tbody=X.tfoot=X.colgroup=X.caption=X.thead,X.th=X.td,d.support.htmlSerialize||(X._default=[1,"div<div>","</div>"]),d.fn.extend({text:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.text(a.call(this,b,c.text()))});if(typeof a!=="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return d.text(this)},wrapAll:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapAll(a.call(this,b))});if(this[0]){var b=d(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapInner(a.call(this,b))});return this.each(function(){var b=d(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){d(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){d.nodeName(this,"body")||d(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=d(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,d(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,e;(e=this[c])!=null;c++)if(!a||d.filter(a,[e]).length)!b&&e.nodeType===1&&(d.cleanData(e.getElementsByTagName("*")),d.cleanData([e])),e.parentNode&&e.parentNode.removeChild(e);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&d.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return d.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(P,""):null;if(typeof a!=="string"||V.test(a)||!d.support.leadingWhitespace&&Q.test(a)||X[(S.exec(a)||["",""])[1].toLowerCase()])d.isFunction(a)?this.each(function(b){var c=d(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);else{a=a.replace(R,"<$1></$2>");try{for(var c=0,e=this.length;c<e;c++)this[c].nodeType===1&&(d.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(f){this.empty().append(a)}}return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(d.isFunction(a))return this.each(function(b){var c=d(this),e=c.html();c.replaceWith(a.call(this,b,e))});typeof a!=="string"&&(a=d(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;d(this).remove(),b?d(b).before(a):d(c).append(a)})}return this.pushStack(d(d.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,e){var f,g,h,i,j=a[0],k=[];if(!d.support.checkClone&&arguments.length===3&&typeof j==="string"&&W.test(j))return this.each(function(){d(this).domManip(a,c,e,!0)});if(d.isFunction(j))return this.each(function(f){var g=d(this);a[0]=j.call(this,f,c?g.html():b),g.domManip(a,c,e)});if(this[0]){i=j&&j.parentNode,d.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?f={fragment:i}:f=d.buildFragment(a,this,k),h=f.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&d.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)e.call(c?Y(this[l],g):this[l],f.cacheable||m>1&&l<n?d.clone(h,!0,!0):h)}k.length&&d.each(k,ba)}return this}}),d.buildFragment=function(a,b,e){var f,g,h,i=b&&b[0]?b[0].ownerDocument||b[0]:c;a.length===1&&typeof a[0]==="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!V.test(a[0])&&(d.support.checkClone||!W.test(a[0]))&&(g=!0,h=d.fragments[a[0]],h&&(h!==1&&(f=h))),f||(f=i.createDocumentFragment(),d.clean(a,i,f,e)),g&&(d.fragments[a[0]]=h?f:1);return{fragment:f,cacheable:g}},d.fragments={},d.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){d.fn[a]=function(c){var e=[],f=d(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&f.length===1){f[b](this[0]);return this}for(var h=0,i=f.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();d(f[h])[b](j),e=e.concat(j)}return this.pushStack(e,a,f.selector)}}),d.extend({clone:function(a,b,c){var e=a.cloneNode(!0),f,g,h;if((!d.support.noCloneEvent||!d.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!d.isXMLDoc(a)){$(a,e),f=_(a),g=_(e);for(h=0;f[h];++h)$(f[h],g[h])}if(b){Z(a,e);if(c){f=_(a),g=_(e);for(h=0;f[h];++h)Z(f[h],g[h])}}return e},clean:function(a,b,e,f){b=b||c,typeof b.createElement==="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var g=[];for(var h=0,i;(i=a[h])!=null;h++){typeof i==="number"&&(i+="");if(!i)continue;if(typeof i!=="string"||U.test(i)){if(typeof i==="string"){i=i.replace(R,"<$1></$2>");var j=(S.exec(i)||["",""])[1].toLowerCase(),k=X[j]||X._default,l=k[0],m=b.createElement("div");m.innerHTML=k[1]+i+k[2];while(l--)m=m.lastChild;if(!d.support.tbody){var n=T.test(i),o=j==="table"&&!n?m.firstChild&&m.firstChild.childNodes:k[1]==="<table>"&&!n?m.childNodes:[];for(var p=o.length-1;p>=0;--p)d.nodeName(o[p],"tbody")&&!o[p].childNodes.length&&o[p].parentNode.removeChild(o[p])}!d.support.leadingWhitespace&&Q.test(i)&&m.insertBefore(b.createTextNode(Q.exec(i)[0]),m.firstChild),i=m.childNodes}}else i=b.createTextNode(i);i.nodeType?g.push(i):g=d.merge(g,i)}if(e)for(h=0;g[h];h++)!f||!d.nodeName(g[h],"script")||g[h].type&&g[h].type.toLowerCase()!=="text/javascript"?(g[h].nodeType===1&&g.splice.apply(g,[h+1,0].concat(d.makeArray(g[h].getElementsByTagName("script")))),e.appendChild(g[h])):f.push(g[h].parentNode?g[h].parentNode.removeChild(g[h]):g[h]);return g},cleanData:function(a){var b,c,e=d.cache,f=d.expando,g=d.event.special,h=d.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&d.noData[j.nodeName.toLowerCase()])continue;c=j[d.expando];if(c){b=e[c]&&e[c][f];if(b&&b.events){for(var k in b.events)g[k]?d.event.remove(j,k):d.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[d.expando]:j.removeAttribute&&j.removeAttribute(d.expando),delete e[c]}}}});var bb=/alpha\([^)]*\)/i,bc=/opacity=([^)]*)/,bd=/-([a-z])/ig,be=/([A-Z])/g,bf=/^-?\d+(?:px)?$/i,bg=/^-?\d/,bh={position:"absolute",visibility:"hidden",display:"block"},bi=["Left","Right"],bj=["Top","Bottom"],bk,bl,bm,bn=function(a,b){return b.toUpperCase()};d.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return d.access(this,a,c,!0,function(a,c,e){return e!==b?d.style(a,c,e):d.css(a,c)})},d.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bk(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{zIndex:!0,fontWeight:!0,opacity:!0,zoom:!0,lineHeight:!0},cssProps:{"float":d.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,e,f){if(a&&a.nodeType!==3&&a.nodeType!==8&&a.style){var g,h=d.camelCase(c),i=a.style,j=d.cssHooks[h];c=d.cssProps[h]||h;if(e===b){if(j&&"get"in j&&(g=j.get(a,!1,f))!==b)return g;return i[c]}if(typeof e==="number"&&isNaN(e)||e==null)return;typeof e==="number"&&!d.cssNumber[h]&&(e+="px");if(!j||!("set"in j)||(e=j.set(a,e))!==b)try{i[c]=e}catch(k){}}},css:function(a,c,e){var f,g=d.camelCase(c),h=d.cssHooks[g];c=d.cssProps[g]||g;if(h&&"get"in h&&(f=h.get(a,!0,e))!==b)return f;if(bk)return bk(a,c,g)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]},camelCase:function(a){return a.replace(bd,bn)}}),d.curCSS=d.css,d.each(["height","width"],function(a,b){d.cssHooks[b]={get:function(a,c,e){var f;if(c){a.offsetWidth!==0?f=bo(a,b,e):d.swap(a,bh,function(){f=bo(a,b,e)});if(f<=0){f=bk(a,b,b),f==="0px"&&bm&&(f=bm(a,b,b));if(f!=null)return f===""||f==="auto"?"0px":f}if(f<0||f==null){f=a.style[b];return f===""||f==="auto"?"0px":f}return typeof f==="string"?f:f+"px"}},set:function(a,b){if(!bf.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),d.support.opacity||(d.cssHooks.opacity={get:function(a,b){return bc.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style;c.zoom=1;var e=d.isNaN(b)?"":"alpha(opacity="+b*100+")",f=c.filter||"";c.filter=bb.test(f)?f.replace(bb,e):c.filter+" "+e}}),c.defaultView&&c.defaultView.getComputedStyle&&(bl=function(a,c,e){var f,g,h;e=e.replace(be,"-$1").toLowerCase();if(!(g=a.ownerDocument.defaultView))return b;if(h=g.getComputedStyle(a,null))f=h.getPropertyValue(e),f===""&&!d.contains(a.ownerDocument.documentElement,a)&&(f=d.style(a,e));return f}),c.documentElement.currentStyle&&(bm=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bf.test(d)&&bg.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bk=bl||bm,d.expr&&d.expr.filters&&(d.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!d.support.reliableHiddenOffsets&&(a.style.display||d.css(a,"display"))==="none"},d.expr.filters.visible=function(a){return!d.expr.filters.hidden(a)});var bp=/%20/g,bq=/\[\]$/,br=/\r?\n/g,bs=/#.*$/,bt=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bu=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bv=/(?:^file|^widget|\-extension):$/,bw=/^(?:GET|HEAD)$/,bx=/^\/\//,by=/\?/,bz=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bA=/^(?:select|textarea)/i,bB=/\s+/,bC=/([?&])_=[^&]*/,bD=/(^|\-)([a-z])/g,bE=function(a,b,c){return b+c.toUpperCase()},bF=/^([\w\+\.\-]+:)\/\/([^\/?#:]*)(?::(\d+))?/,bG=d.fn.load,bH={},bI={},bJ,bK;try{bJ=c.location.href}catch(bL){bJ=c.createElement("a"),bJ.href="",bJ=bJ.href}bK=bF.exec(bJ.toLowerCase()),d.fn.extend({load:function(a,c,e){if(typeof a!=="string"&&bG)return bG.apply(this,arguments);if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var g=a.slice(f,a.length);a=a.slice(0,f)}var h="GET";c&&(d.isFunction(c)?(e=c,c=b):typeof c==="object"&&(c=d.param(c,d.ajaxSettings.traditional),h="POST"));var i=this;d.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?d("<div>").append(c.replace(bz,"")).find(g):c)),e&&i.each(e,[c,b,a])}});return this},serialize:function(){return d.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?d.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bA.test(this.nodeName)||bu.test(this.type))}).map(function(a,b){var c=d(this).val();return c==null?null:d.isArray(c)?d.map(c,function(a,c){return{name:b.name,value:a.replace(br,"\r\n")}}):{name:b.name,value:c.replace(br,"\r\n")}}).get()}}),d.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){d.fn[b]=function(a){return this.bind(b,a)}}),d.each(["get","post"],function(a,c){d[c]=function(a,e,f,g){d.isFunction(e)&&(g=g||f,f=e,e=b);return d.ajax({type:c,url:a,data:e,success:f,dataType:g})}}),d.extend({getScript:function(a,c){return d.get(a,b,c,"script")},getJSON:function(a,b,c){return d.get(a,b,c,"json")},ajaxSetup:function(a,b){b?d.extend(!0,a,d.ajaxSettings,b):(b=a,a=d.extend(!0,d.ajaxSettings,b));for(var c in {context:1,url:1})c in b?a[c]=b[c]:c in d.ajaxSettings&&(a[c]=d.ajaxSettings[c]);return a},ajaxSettings:{url:bJ,isLocal:bv.test(bK[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":d.parseJSON,"text xml":d.parseXML}},ajaxPrefilter:bM(bH),ajaxTransport:bM(bI),ajax:function(a,c){function v(a,c,l,n){if(r!==2){r=2,p&&clearTimeout(p),o=b,m=n||"",u.readyState=a?4:0;var q,t,v,w=l?bP(e,u,l):b,x,y;if(a>=200&&a<300||a===304){if(e.ifModified){if(x=u.getResponseHeader("Last-Modified"))d.lastModified[k]=x;if(y=u.getResponseHeader("Etag"))d.etag[k]=y}if(a===304)c="notmodified",q=!0;else try{t=bQ(e,w),c="success",q=!0}catch(z){c="parsererror",v=z}}else{v=c;if(!c||a)c="error",a<0&&(a=0)}u.status=a,u.statusText=c,q?h.resolveWith(f,[t,c,u]):h.rejectWith(f,[u,c,v]),u.statusCode(j),j=b,s&&g.trigger("ajax"+(q?"Success":"Error"),[u,e,q?t:v]),i.resolveWith(f,[u,c]),s&&(g.trigger("ajaxComplete",[u,e]),--d.active||d.event.trigger("ajaxStop"))}}typeof a==="object"&&(c=a,a=b),c=c||{};var e=d.ajaxSetup({},c),f=e.context||e,g=f!==e&&(f.nodeType||f instanceof d)?d(f):d.event,h=d.Deferred(),i=d._Deferred(),j=e.statusCode||{},k,l={},m,n,o,p,q,r=0,s,t,u={readyState:0,setRequestHeader:function(a,b){r||(l[a.toLowerCase().replace(bD,bE)]=b);return this},getAllResponseHeaders:function(){return r===2?m:null},getResponseHeader:function(a){var c;if(r===2){if(!n){n={};while(c=bt.exec(m))n[c[1].toLowerCase()]=c[2]}c=n[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){r||(e.mimeType=a);return this},abort:function(a){a=a||"abort",o&&o.abort(a),v(0,a);return this}};h.promise(u),u.success=u.done,u.error=u.fail,u.complete=i.done,u.statusCode=function(a){if(a){var b;if(r<2)for(b in a)j[b]=[j[b],a[b]];else b=a[u.status],u.then(b,b)}return this},e.url=((a||e.url)+"").replace(bs,"").replace(bx,bK[1]+"//"),e.dataTypes=d.trim(e.dataType||"*").toLowerCase().split(bB),e.crossDomain||(q=bF.exec(e.url.toLowerCase()),e.crossDomain=q&&(q[1]!=bK[1]||q[2]!=bK[2]||(q[3]||(q[1]==="http:"?80:443))!=(bK[3]||(bK[1]==="http:"?80:443)))),e.data&&e.processData&&typeof e.data!=="string"&&(e.data=d.param(e.data,e.traditional)),bN(bH,e,c,u);if(r===2)return!1;s=e.global,e.type=e.type.toUpperCase(),e.hasContent=!bw.test(e.type),s&&d.active++===0&&d.event.trigger("ajaxStart");if(!e.hasContent){e.data&&(e.url+=(by.test(e.url)?"&":"?")+e.data),k=e.url;if(e.cache===!1){var w=d.now(),x=e.url.replace(bC,"$1_="+w);e.url=x+(x===e.url?(by.test(e.url)?"&":"?")+"_="+w:"")}}if(e.data&&e.hasContent&&e.contentType!==!1||c.contentType)l["Content-Type"]=e.contentType;e.ifModified&&(k=k||e.url,d.lastModified[k]&&(l["If-Modified-Since"]=d.lastModified[k]),d.etag[k]&&(l["If-None-Match"]=d.etag[k])),l.Accept=e.dataTypes[0]&&e.accepts[e.dataTypes[0]]?e.accepts[e.dataTypes[0]]+(e.dataTypes[0]!=="*"?", */*; q=0.01":""):e.accepts["*"];for(t in e.headers)u.setRequestHeader(t,e.headers[t]);if(e.beforeSend&&(e.beforeSend.call(f,u,e)===!1||r===2)){u.abort();return!1}for(t in {success:1,error:1,complete:1})u[t](e[t]);o=bN(bI,e,c,u);if(o){u.readyState=1,s&&g.trigger("ajaxSend",[u,e]),e.async&&e.timeout>0&&(p=setTimeout(function(){u.abort("timeout")},e.timeout));try{r=1,o.send(l,v)}catch(y){status<2?v(-1,y):d.error(y)}}else v(-1,"No Transport");return u},param:function(a,c){var e=[],f=function(a,b){b=d.isFunction(b)?b():b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=d.ajaxSettings.traditional);if(d.isArray(a)||a.jquery&&!d.isPlainObject(a))d.each(a,function(){f(this.name,this.value)});else for(var g in a)bO(g,a[g],c,f);return e.join("&").replace(bp,"+")}}),d.extend({active:0,lastModified:{},etag:{}});var bR=d.now(),bS=/(\=)\?(&|$)|()\?\?()/i;d.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return d.expando+"_"+bR++}}),d.ajaxPrefilter("json jsonp",function(b,c,e){var f=typeof b.data==="string";if(b.dataTypes[0]==="jsonp"||c.jsonpCallback||c.jsonp!=null||b.jsonp!==!1&&(bS.test(b.url)||f&&bS.test(b.data))){var g,h=b.jsonpCallback=d.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2",m=function(){a[h]=i,g&&d.isFunction(i)&&a[h](g[0])};b.jsonp!==!1&&(j=j.replace(bS,l),b.url===j&&(f&&(k=k.replace(bS,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},e.then(m,m),b.converters["script json"]=function(){g||d.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),d.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){d.globalEval(a);return a}}}),d.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),d.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var bT=d.now(),bU,bV;d.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&bX()||bY()}:bX,bV=d.ajaxSettings.xhr(),d.support.ajax=!!bV,d.support.cors=bV&&"withCredentials"in bV,bV=b,d.support.ajax&&d.ajaxTransport(function(a){if(!a.crossDomain||d.support.cors){var c;return{send:function(e,f){var g=a.xhr(),h,i;a.username?g.open(a.type,a.url,a.async,a.username,a.password):g.open(a.type,a.url,a.async);if(a.xhrFields)for(i in a.xhrFields)g[i]=a.xhrFields[i];a.mimeType&&g.overrideMimeType&&g.overrideMimeType(a.mimeType),(!a.crossDomain||a.hasContent)&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(i in e)g.setRequestHeader(i,e[i])}catch(j){}g.send(a.hasContent&&a.data||null),c=function(e,i){var j,k,l,m,n;try{if(c&&(i||g.readyState===4)){c=b,h&&(g.onreadystatechange=d.noop,delete bU[h]);if(i)g.readyState!==4&&g.abort();else{j=g.status,l=g.getAllResponseHeaders(),m={},n=g.responseXML,n&&n.documentElement&&(m.xml=n),m.text=g.responseText;try{k=g.statusText}catch(o){k=""}j||!a.isLocal||a.crossDomain?j===1223&&(j=204):j=m.text?200:404}}}catch(p){i||f(-1,p)}m&&f(j,k,m,l)},a.async&&g.readyState!==4?(bU||(bU={},bW()),h=bT++,g.onreadystatechange=bU[h]=c):c()},abort:function(){c&&c(0,1)}}}});var bZ={},b$=/^(?:toggle|show|hide)$/,b_=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,ca,cb=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];d.fn.extend({show:function(a,b,c){var e,f;if(a||a===0)return this.animate(cc("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)e=this[g],f=e.style.display,!d._data(e,"olddisplay")&&f==="none"&&(f=e.style.display=""),f===""&&d.css(e,"display")==="none"&&d._data(e,"olddisplay",cd(e.nodeName));for(g=0;g<h;g++){e=this[g],f=e.style.display;if(f===""||f==="none")e.style.display=d._data(e,"olddisplay")||""}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cc("hide",3),a,b,c);for(var e=0,f=this.length;e<f;e++){var g=d.css(this[e],"display");g!=="none"&&!d._data(this[e],"olddisplay")&&d._data(this[e],"olddisplay",g)}for(e=0;e<f;e++)this[e].style.display="none";return this},_toggle:d.fn.toggle,toggle:function(a,b,c){var e=typeof a==="boolean";d.isFunction(a)&&d.isFunction(b)?this._toggle.apply(this,arguments):a==null||e?this.each(function(){var b=e?a:d(this).is(":hidden");d(this)[b?"show":"hide"]()}):this.animate(cc("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,e){var f=d.speed(b,c,e);if(d.isEmptyObject(a))return this.each(f.complete);return this[f.queue===!1?"each":"queue"](function(){var b=d.extend({},f),c,e=this.nodeType===1,g=e&&d(this).is(":hidden"),h=this;for(c in a){var i=d.camelCase(c);c!==i&&(a[i]=a[c],delete a[c],c=i);if(a[c]==="hide"&&g||a[c]==="show"&&!g)return b.complete.call(this);if(e&&(c==="height"||c==="width")){b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY];if(d.css(this,"display")==="inline"&&d.css(this,"float")==="none")if(d.support.inlineBlockNeedsLayout){var j=cd(this.nodeName);j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)}else this.style.display="inline-block"}d.isArray(a[c])&&((b.specialEasing=b.specialEasing||{})[c]=a[c][1],a[c]=a[c][0])}b.overflow!=null&&(this.style.overflow="hidden"),b.curAnim=d.extend({},a),d.each(a,function(c,e){var f=new d.fx(h,b,c);if(b$.test(e))f[e==="toggle"?g?"show":"hide":e](a);else{var i=b_.exec(e),j=f.cur();if(i){var k=parseFloat(i[2]),l=i[3]||(d.cssNumber[c]?"":"px");l!=="px"&&(d.style(h,c,(k||1)+l),j=(k||1)/f.cur()*j,d.style(h,c,j+l)),i[1]&&(k=(i[1]==="-="?-1:1)*k+j),f.custom(j,k,l)}else f.custom(j,e,"")}});return!0})},stop:function(a,b){var c=d.timers;a&&this.queue([]),this.each(function(){for(var a=c.length-1;a>=0;a--)c[a].elem===this&&(b&&c[a](!0),c.splice(a,1))}),b||this.dequeue();return this}}),d.each({slideDown:cc("show",1),slideUp:cc("hide",1),slideToggle:cc("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){d.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),d.extend({speed:function(a,b,c){var e=a&&typeof a==="object"?d.extend({},a):{complete:c||!c&&b||d.isFunction(a)&&a,duration:a,easing:c&&b||b&&!d.isFunction(b)&&b};e.duration=d.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in d.fx.speeds?d.fx.speeds[e.duration]:d.fx.speeds._default,e.old=e.complete,e.complete=function(){e.queue!==!1&&d(this).dequeue(),d.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig||(b.orig={})}}),d.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(d.fx.step[this.prop]||d.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=d.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function g(a){return e.step(a)}var e=this,f=d.fx;this.startTime=d.now(),this.start=a,this.end=b,this.unit=c||this.unit||(d.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,g.elem=this.elem,g()&&d.timers.push(g)&&!ca&&(ca=setInterval(f.tick,f.interval))},show:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),d(this.elem).show()},hide:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=d.now(),c=!0;if(a||b>=this.options.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),this.options.curAnim[this.prop]=!0;for(var e in this.options.curAnim)this.options.curAnim[e]!==!0&&(c=!1);if(c){if(this.options.overflow!=null&&!d.support.shrinkWrapBlocks){var f=this.elem,g=this.options;d.each(["","X","Y"],function(a,b){f.style["overflow"+b]=g.overflow[a]})}this.options.hide&&d(this.elem).hide();if(this.options.hide||this.options.show)for(var h in this.options.curAnim)d.style(this.elem,h,this.options.orig[h]);this.options.complete.call(this.elem)}return!1}var i=b-this.startTime;this.state=i/this.options.duration;var j=this.options.specialEasing&&this.options.specialEasing[this.prop],k=this.options.easing||(d.easing.swing?"swing":"linear");this.pos=d.easing[j||k](this.state,i,0,1,this.options.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update();return!0}},d.extend(d.fx,{tick:function(){var a=d.timers;for(var b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||d.fx.stop()},interval:13,stop:function(){clearInterval(ca),ca=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){d.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),d.expr&&d.expr.filters&&(d.expr.filters.animated=function(a){return d.grep(d.timers,function(b){return a===b.elem}).length});var ce=/^t(?:able|d|h)$/i,cf=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?d.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(e){}var f=b.ownerDocument,g=f.documentElement;if(!c||!d.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=f.body,i=cg(f),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||d.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||d.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:d.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);d.offset.initialize();var c,e=b.offsetParent,f=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(d.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===e&&(l+=b.offsetTop,m+=b.offsetLeft,d.offset.doesNotAddBorder&&(!d.offset.doesAddBorderForTableAndCells||!ce.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),f=e,e=b.offsetParent),d.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;d.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},d.offset={initialize:function(){var a=c.body,b=c.createElement("div"),e,f,g,h,i=parseFloat(d.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";d.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),e=b.firstChild,f=e.firstChild,h=e.nextSibling.firstChild.firstChild,this.doesNotAddBorder=f.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,f.style.position="fixed",f.style.top="20px",this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15,f.style.position=f.style.top="",e.style.overflow="hidden",e.style.position="relative",this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),a=b=e=f=g=h=null,d.offset.initialize=d.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;d.offset.initialize(),d.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(d.css(a,"marginTop"))||0,c+=parseFloat(d.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var e=d.css(a,"position");e==="static"&&(a.style.position="relative");var f=d(a),g=f.offset(),h=d.css(a,"top"),i=d.css(a,"left"),j=e==="absolute"&&d.inArray("auto",[h,i])>-1,k={},l={},m,n;j&&(l=f.position()),m=j?l.top:parseInt(h,10)||0,n=j?l.left:parseInt(i,10)||0,d.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):f.css(k)}},d.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),e=cf.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(d.css(a,"marginTop"))||0,c.left-=parseFloat(d.css(a,"marginLeft"))||0,e.top+=parseFloat(d.css(b[0],"borderTopWidth"))||0,e.left+=parseFloat(d.css(b[0],"borderLeftWidth"))||0;return{top:c.top-e.top,left:c.left-e.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&(!cf.test(a.nodeName)&&d.css(a,"position")==="static"))a=a.offsetParent;return a})}}),d.each(["Left","Top"],function(a,c){var e="scroll"+c;d.fn[e]=function(c){var f=this[0],g;if(!f)return null;if(c!==b)return this.each(function(){g=cg(this),g?g.scrollTo(a?d(g).scrollLeft():c,a?c:d(g).scrollTop()):this[e]=c});g=cg(f);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:d.support.boxModel&&g.document.documentElement[e]||g.document.body[e]:f[e]}}),d.each(["Height","Width"],function(a,c){var e=c.toLowerCase();d.fn["inner"+c]=function(){return this[0]?parseFloat(d.css(this[0],e,"padding")):null},d.fn["outer"+c]=function(a){return this[0]?parseFloat(d.css(this[0],e,a?"margin":"border")):null},d.fn[e]=function(a){var f=this[0];if(!f)return a==null?null:this;if(d.isFunction(a))return this.each(function(b){var c=d(this);c[e](a.call(this,b,c[e]()))});if(d.isWindow(f)){var g=f.document.documentElement["client"+c];return f.document.compatMode==="CSS1Compat"&&g||f.document.body["client"+c]||g}if(f.nodeType===9)return Math.max(f.documentElement["client"+c],f.body["scroll"+c],f.documentElement["scroll"+c],f.body["offset"+c],f.documentElement["offset"+c]);if(a===b){var h=d.css(f,e),i=parseFloat(h);return d.isNaN(i)?h:i}return this.css(e,typeof a==="string"?a:a+"px")}}),a.jQuery=a.$=d})(window);
\ No newline at end of file
diff --git a/3rdparty/timepicker/css/include/jquery-ui-1.8.14.custom.css b/3rdparty/timepicker/css/include/jquery-ui-1.8.14.custom.css
new file mode 100644
index 00000000000..fe310705756
--- /dev/null
+++ b/3rdparty/timepicker/css/include/jquery-ui-1.8.14.custom.css
@@ -0,0 +1,568 @@
+/*
+ * jQuery UI CSS Framework 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS,%20Tahoma,%20Verdana,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; }
+.ui-widget-content a { color: #333333; }
+.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+.ui-widget-header a { color: #ffffff; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fed22f; background: #ffe45c url(images/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_ef8c08_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_228ef1_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffd27a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); }
+.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/*
+ * jQuery UI Resizable 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Accordion 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordion .ui-accordion-content-active { display: block; }
+/*
+ * jQuery UI Autocomplete 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete { position: absolute; cursor: default; }	
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.14
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+	float: left;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/*
+ * jQuery UI Button 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+/*
+ * jQuery UI Dialog 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/*
+ * jQuery UI Slider 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+ * jQuery UI Tabs 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs#theming
+ */
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/*
+ * jQuery UI Datepicker 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/*
+ * jQuery UI Progressbar 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
diff --git a/3rdparty/timepicker/css/include/jquery.ui.core.min.js b/3rdparty/timepicker/css/include/jquery.ui.core.min.js
new file mode 100644
index 00000000000..577548e7882
--- /dev/null
+++ b/3rdparty/timepicker/css/include/jquery.ui.core.min.js
@@ -0,0 +1,17 @@
+/*!
+ * jQuery UI 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function(c,j){function k(a,b){var d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function l(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.14",
+keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus();
+b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,
+"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",
+function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,m,n){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(m)g-=parseFloat(c.curCSS(f,"border"+this+"Width",true))||0;if(n)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth,
+outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){return k(a,!isNaN(c.attr(a,"tabindex")))},tabbable:function(a){var b=c.attr(a,"tabindex"),d=isNaN(b);
+return(d||b>=0)&&k(a,!d)}});c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e=
+0;e<b.length;e++)a.options[b[e][0]]&&b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&c.ui.isOverAxis(b,e,i)}})}})(jQuery);
diff --git a/3rdparty/timepicker/css/include/jquery.ui.position.min.js b/3rdparty/timepicker/css/include/jquery.ui.position.min.js
new file mode 100644
index 00000000000..9f550be8e21
--- /dev/null
+++ b/3rdparty/timepicker/css/include/jquery.ui.position.min.js
@@ -0,0 +1,16 @@
+/*
+ * jQuery UI Position 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Position
+ */
+(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY,
+left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+=
+k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-=
+m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left=
+d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+=
+a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b),
+g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
diff --git a/3rdparty/timepicker/css/include/jquery.ui.tabs.min.js b/3rdparty/timepicker/css/include/jquery.ui.tabs.min.js
new file mode 100644
index 00000000000..11a67c144a6
--- /dev/null
+++ b/3rdparty/timepicker/css/include/jquery.ui.tabs.min.js
@@ -0,0 +1,35 @@
+/*
+ * jQuery UI Tabs 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(d,p){function u(){return++v}function w(){return++x}var v=0,x=0;d.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(b,e){if(b=="selected")this.options.collapsible&&
+e==this.options.selected||this.select(e);else{this.options[b]=e;this._tabify()}},_tabId:function(b){return b.title&&b.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+u()},_sanitizeSelector:function(b){return b.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+w());return d.cookie.apply(null,[b].concat(d.makeArray(arguments)))},_ui:function(b,e){return{tab:b,panel:e,index:this.anchors.index(b)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b=
+d(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(b){function e(g,f){g.css("display","");!d.support.opacity&&f.opacity&&g[0].style.removeAttribute("filter")}var a=this,c=this.options,h=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=d(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return d("a",this)[0]});this.panels=d([]);this.anchors.each(function(g,f){var i=d(f).attr("href"),l=i.split("#")[0],q;if(l&&(l===location.toString().split("#")[0]||
+(q=d("base")[0])&&l===q.href)){i=f.hash;f.href=i}if(h.test(i))a.panels=a.panels.add(a.element.find(a._sanitizeSelector(i)));else if(i&&i!=="#"){d.data(f,"href.tabs",i);d.data(f,"load.tabs",i.replace(/#.*$/,""));i=a._tabId(f);f.href="#"+i;f=a.element.find("#"+i);if(!f.length){f=d(c.panelTemplate).attr("id",i).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(a.panels[g-1]||a.list);f.data("destroy.tabs",true)}a.panels=a.panels.add(f)}else c.disabled.push(g)});if(b){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");
+this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(c.selected===p){location.hash&&this.anchors.each(function(g,f){if(f.hash==location.hash){c.selected=g;return false}});if(typeof c.selected!=="number"&&c.cookie)c.selected=parseInt(a._cookie(),10);if(typeof c.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)c.selected=
+this.lis.index(this.lis.filter(".ui-tabs-selected"));c.selected=c.selected||(this.lis.length?0:-1)}else if(c.selected===null)c.selected=-1;c.selected=c.selected>=0&&this.anchors[c.selected]||c.selected<0?c.selected:0;c.disabled=d.unique(c.disabled.concat(d.map(this.lis.filter(".ui-state-disabled"),function(g){return a.lis.index(g)}))).sort();d.inArray(c.selected,c.disabled)!=-1&&c.disabled.splice(d.inArray(c.selected,c.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");
+if(c.selected>=0&&this.anchors.length){a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(c.selected).addClass("ui-tabs-selected ui-state-active");a.element.queue("tabs",function(){a._trigger("show",null,a._ui(a.anchors[c.selected],a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash))[0]))});this.load(c.selected)}d(window).bind("unload",function(){a.lis.add(a.anchors).unbind(".tabs");a.lis=a.anchors=a.panels=null})}else c.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));
+this.element[c.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");c.cookie&&this._cookie(c.selected,c.cookie);b=0;for(var j;j=this.lis[b];b++)d(j)[d.inArray(b,c.disabled)!=-1&&!d(j).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");c.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(c.event!=="mouseover"){var k=function(g,f){f.is(":not(.ui-state-disabled)")&&f.addClass("ui-state-"+g)},n=function(g,f){f.removeClass("ui-state-"+
+g)};this.lis.bind("mouseover.tabs",function(){k("hover",d(this))});this.lis.bind("mouseout.tabs",function(){n("hover",d(this))});this.anchors.bind("focus.tabs",function(){k("focus",d(this).closest("li"))});this.anchors.bind("blur.tabs",function(){n("focus",d(this).closest("li"))})}var m,o;if(c.fx)if(d.isArray(c.fx)){m=c.fx[0];o=c.fx[1]}else m=o=c.fx;var r=o?function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.hide().removeClass("ui-tabs-hide").animate(o,o.duration||"normal",
+function(){e(f,o);a._trigger("show",null,a._ui(g,f[0]))})}:function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.removeClass("ui-tabs-hide");a._trigger("show",null,a._ui(g,f[0]))},s=m?function(g,f){f.animate(m,m.duration||"normal",function(){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");e(f,m);a.element.dequeue("tabs")})}:function(g,f){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");a.element.dequeue("tabs")};
+this.anchors.bind(c.event+".tabs",function(){var g=this,f=d(g).closest("li"),i=a.panels.filter(":not(.ui-tabs-hide)"),l=a.element.find(a._sanitizeSelector(g.hash));if(f.hasClass("ui-tabs-selected")&&!c.collapsible||f.hasClass("ui-state-disabled")||f.hasClass("ui-state-processing")||a.panels.filter(":animated").length||a._trigger("select",null,a._ui(this,l[0]))===false){this.blur();return false}c.selected=a.anchors.index(this);a.abort();if(c.collapsible)if(f.hasClass("ui-tabs-selected")){c.selected=
+-1;c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){s(g,i)}).dequeue("tabs");this.blur();return false}else if(!i.length){c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this));this.blur();return false}c.cookie&&a._cookie(c.selected,c.cookie);if(l.length){i.length&&a.element.queue("tabs",function(){s(g,i)});a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier.";
+d.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(b){if(typeof b=="string")b=this.anchors.index(this.anchors.filter("[href$="+b+"]"));return b},destroy:function(){var b=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var e=
+d.data(this,"href.tabs");if(e)this.href=e;var a=d(this).unbind(".tabs");d.each(["href","load","cache"],function(c,h){a.removeData(h+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){d.data(this,"destroy.tabs")?d(this).remove():d(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});b.cookie&&this._cookie(null,b.cookie);return this},add:function(b,
+e,a){if(a===p)a=this.anchors.length;var c=this,h=this.options;e=d(h.tabTemplate.replace(/#\{href\}/g,b).replace(/#\{label\}/g,e));b=!b.indexOf("#")?b.replace("#",""):this._tabId(d("a",e)[0]);e.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var j=c.element.find("#"+b);j.length||(j=d(h.panelTemplate).attr("id",b).data("destroy.tabs",true));j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(a>=this.lis.length){e.appendTo(this.list);j.appendTo(this.list[0].parentNode)}else{e.insertBefore(this.lis[a]);
+j.insertBefore(this.panels[a])}h.disabled=d.map(h.disabled,function(k){return k>=a?++k:k});this._tabify();if(this.anchors.length==1){h.selected=0;e.addClass("ui-tabs-selected ui-state-active");j.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){c._trigger("show",null,c._ui(c.anchors[0],c.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[a],this.panels[a]));return this},remove:function(b){b=this._getIndex(b);var e=this.options,a=this.lis.eq(b).remove(),c=this.panels.eq(b).remove();
+if(a.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(b+(b+1<this.anchors.length?1:-1));e.disabled=d.map(d.grep(e.disabled,function(h){return h!=b}),function(h){return h>=b?--h:h});this._tabify();this._trigger("remove",null,this._ui(a.find("a")[0],c[0]));return this},enable:function(b){b=this._getIndex(b);var e=this.options;if(d.inArray(b,e.disabled)!=-1){this.lis.eq(b).removeClass("ui-state-disabled");e.disabled=d.grep(e.disabled,function(a){return a!=b});this._trigger("enable",null,
+this._ui(this.anchors[b],this.panels[b]));return this}},disable:function(b){b=this._getIndex(b);var e=this.options;if(b!=e.selected){this.lis.eq(b).addClass("ui-state-disabled");e.disabled.push(b);e.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[b],this.panels[b]))}return this},select:function(b){b=this._getIndex(b);if(b==-1)if(this.options.collapsible&&this.options.selected!=-1)b=this.options.selected;else return this;this.anchors.eq(b).trigger(this.options.event+".tabs");return this},
+load:function(b){b=this._getIndex(b);var e=this,a=this.options,c=this.anchors.eq(b)[0],h=d.data(c,"load.tabs");this.abort();if(!h||this.element.queue("tabs").length!==0&&d.data(c,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(b).addClass("ui-state-processing");if(a.spinner){var j=d("span",c);j.data("label.tabs",j.html()).html(a.spinner)}this.xhr=d.ajax(d.extend({},a.ajaxOptions,{url:h,success:function(k,n){e.element.find(e._sanitizeSelector(c.hash)).html(k);e._cleanup();a.cache&&d.data(c,
+"cache.tabs",true);e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.success(k,n)}catch(m){}},error:function(k,n){e._cleanup();e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.error(k,n,b,c)}catch(m){}}}));e.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},
+url:function(b,e){this.anchors.eq(b).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.14"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(b,e){var a=this,c=this.options,h=a._rotate||(a._rotate=function(j){clearTimeout(a.rotation);a.rotation=setTimeout(function(){var k=c.selected;a.select(++k<a.anchors.length?k:0)},b);j&&j.stopPropagation()});e=a._unrotate||(a._unrotate=!e?function(j){j.clientX&&
+a.rotate(null)}:function(){t=c.selected;h()});if(b){this.element.bind("tabsshow",h);this.anchors.bind(c.event+".tabs",e);h()}else{clearTimeout(a.rotation);this.element.unbind("tabsshow",h);this.anchors.unbind(c.event+".tabs",e);delete this._rotate;delete this._unrotate}return this}})})(jQuery);
diff --git a/3rdparty/timepicker/css/include/jquery.ui.widget.min.js b/3rdparty/timepicker/css/include/jquery.ui.widget.min.js
new file mode 100644
index 00000000000..39ab91a0963
--- /dev/null
+++ b/3rdparty/timepicker/css/include/jquery.ui.widget.min.js
@@ -0,0 +1,15 @@
+/*!
+ * jQuery UI Widget 1.8.14
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */
+(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)b(d).triggerHandler("remove");k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){b(this).triggerHandler("remove")});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h,
+a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.charAt(0)==="_")return h;
+e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options,
+this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")},
+widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this},
+enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
new file mode 100644
index 0000000000000000000000000000000000000000..954e22dbd99e8c6dd7091335599abf2d10bf8003
GIT binary patch
literal 260
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEr#)R9Ln2z=UU%d=WFXS=@V?HT
z#xG*`>Yvsgk=}99w^d^D^d*@m74oMo<%#FcopJf?u00-~YVKV2wzrI*_R6;UORMea
zBFVSEnN~eiVA6V&z`E)YLz5Aok^D)In}Yn=OzDpgR5Wv0XfT8pOkmV{sKAJ-PO9#T
zZK}IXj&Q-V!U)!LcB_3K<j6=ku*!%uXjy#leKdQ?`ZvP&RiaPVOzxQ$`O)`M(6sLS
yN%J;Y?DO0<r7?ff#!c6LsA*2U`f2*?C%gsKpMo6zvorv`#o+1c=d#Wzp$Py>0&C*{

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
new file mode 100644
index 0000000000000000000000000000000000000000..64ece5707d91a6edf9fad4bfcce0c4dbcafcf58d
GIT binary patch
literal 251
zcmV<X00jSuP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70002ONkl<ZScUD^
zT?&IR7(~(AY#^)6!n1<<Vj)fQYm^M-n@5r1C}@~h2;ohZ7-N3vC*J$+J$LlEJIhL0
z?fU|%;UEDj;@||T;sBg74hkR1O4$<++XU{$LE{Z7;GhCj!9fA2go6yIhJysCh=UWT
ziUV-UI2ia*&y+p!utUI|$6*(^`>bvPcjKS|RKP(6sDcCAB(_QB%0978a<$Ah$!b|E
zwn;|HO0i8cQ<lay$(1s&O|n)t8rvkbvR?jjlN@>j@~)s!ajF0S002ovPDHLkV1oEp
BYH0uf

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..abdc01082bf3534eafecc5819d28c9574d44ea89
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FsY*{5$B>N1x91EQ4=4yQY-ImG
zFPf9b{J;c_6SHRK%WcbN_hZpM=(Ry;4Rxv2@@2Y=$K57eF$X$=!PC{xWt~$(69B)$
BI)4BF

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b383f4d2eab09c0f2a739d6b232c32934bc620b
GIT binary patch
literal 104
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnour1U*q978O6-yYw{%b*}|_(02F
z@qbE9)0CJMo;*v*PWv`Vh2h6EmG8IS-Cm{3U~`<YvxSSFU3)<QP%DF{tDnm{r-UW|
Dvd<uf

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..a23baad25b1d1ff36e17361eab24271f2e9b7326
GIT binary patch
literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouq+C2*978O6lYjjF{IFh)jg74>
zFlmZ}YMcJY=eo?o%*@I?2`NblNeMudl#t?<YIry`QK*OGr~otD9plAEGz`5G6d9zp
Wa55e{GUW=;JO)o!KbLh*2~7a@&m@!p

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..42ccba269b6e91bef12ad0fa18be651b5ef0ee68
GIT binary patch
literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouqzpV=978O6-=0?FV^9z|eBtf=
z|7WztIJ;WT>{+tN>ySr~=F{k$>;_x^_y?afmf9pRKH0)6?eSP?3s5hEr>mdKI;Vst
E0O<Z9>;M1&

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..39d5824d6af5456f1e89fc7847ea3599ea5fd815
GIT binary patch
literal 3762
zcmb_eYgiKKwx-=Q?P<E4nMM;$eWu2m#PU%`&Ae^LOv^6gctJ3vM8!lUG!aCxQ#0eJ
zq?xIqDJi9<fFp>di0+w!yaC|_1uvA>yaxz|iX3eB<LqajpXblFzRUBi^{w~$)_UKp
zpDz0D*=4#5008Vc>v#HR0ASmSVIKMS&kf`CSAV4g0DJLgPkRO79xj%J<(hH6`bTGj
zrr^$JeiHJI?;s&<5pRw-^kj}=E;X0OX+pgz+f5GVt0NQv_gbu0>-8J+F$O>HpW?Lx
z+YFO`CV&6VV9fsEwG#js0_-|v*!ujZ*M=jfo457?0Do-z<^}+8bI+qk+W~+$zz%Z&
z;L7&@&ns`l8Ofh*Wd<Cp_>U0pO%RP^?Xa_h7I}7K#}4Xt`s%-(m-enaPWX<H>$O&-
zX~a1aOzn?!r?5wJVBNPJ_o8-(9Fz<_c1LYGxUl(E+Wdx?wkNHH2T%eWq9Kz00h#RB
zYKI~=a<9_QqC^n<>hyWlS66waWgyAP#t&TfTWP=Sxa)ukRY%j7WH}(@r=B^W_;b&M
zRzPYsb*j^Kou%%`K6VP+dKtR@x~qEHq4rXMxoX-gcSf&->lMY%TMXF!Gw_A)(tp6}
z2A%kN3twbr%KyUrrmw24V3d%wzK<-q(M;MTr41}un`P!!xejADEv_CJ{CTif907B&
zEP`pDJIZHVgnmxh$EZnBOUxz~Ap+ZzKbFmg39_n-)$wY!Q@i~5aGmHbN7&*gk<HNQ
z!$-sS))5(#?qPW$1C^3#;cFvQMWTd)d(I_4awE^ZjGC%XcnSGez>q9zWgV|2(Zhxl
zoDqJp&MxW(qX#C@oF8L)*r$RdSjVFSc$%z?*9%YoZ6sOZ!vtxXtBM<*r82<p7}?1@
zveQI&tiNm{;57jipQbO}b?9l*l4nGAT4Y=-w()@*#J1?%2{)nY^{|NO=xM)s?jR6<
ziJ!fSOOPs*$8->vyC}_Eiz1PJ2L$bttko`=+fH{Ne@G#lMDxkKt_y)O(J5&Ak)w-I
znm!vzYX3$kLDG$hOp-KJg~7}M;73BFWA{!a61fe?NJkjR_}Xw+*`O0=AGg7&dU<kQ
zA;d%-zM*iwS2t8Y)Gu@JK&A)fV=HHvbW`6mV+EZrtJSauApMCndBS~F>A`A?9`whW
zM{fkFf`G`P^9j*|-q9KLvS<191z9a^mK3Lss}W8O=sZ}N$V4Fh*SWF5NbZQ>p{0>$
z0pe}d$*s!y<I6P@1-n$GE>*R&NSXbjmld6{4Y;O89MuDTK0Hn0C?QdL9z1qGegXs!
z7$MIGkPkwdHF2os-Z-e85B?5An>yc|m<}>!Iirg%H-<NQ%ws0uIi51-a5phDmp{k5
zD(zjPC;t}@{w)+0&{l~FS*>%F11XY{{>@kgL>a#6fM9JzBE&an&F>eWh|b0^kJ<?n
zs=7WyuX=fIhvAjTTX`c}HUH)bTTI;OJGlyB{(NK&G;Htmn6^?c?TaAsOV}uBUtAa>
zNBM5*nCa~(xwn~rG~<cfPp*ub4V(WF)lGbJpS(|MvAA83yV}}9bfbt(>>GSG9mz3h
z9F~64y}giIrz^lfl|_5HpUsG}?Wpr*&f?bS=|9biqivN)-a~u>uK<{Lfcng{663QL
zLXzO@*N5)q4C=j6E8nC+P%lEwI#~0wkt;M4Y8!+DYzN2rBuYao1*HRIa^NC9nFeep
z+ns5$X9Bh48S-`ss!k&!J#Ddd=j1O-9}?`v(B|<M1@-U18t+Js;ZNHIk3$u$U;Eyu
z3exyGipUQbO;S|Bzp(hX{&!NB@oq*gb}e^)68}5#!kH$BhK<@5!ubu^XDa&d1C#@|
z3yY}&(~QVLCVdv){)I_ECxKsIlmW8LZ!;=rtk4ZaX!xm*=*Z(|P+Uqf*Rg<I!Tau&
z85{4>>R7wD97BV;nK~quUHx^mj^G6K2GZ1*uSN?iLm!7vHB7_1^TGbKhmnK+K`GYA
zocp2=on8LxJH^`7^1ch0ft(MTU$vJB!R@gQ^R`qoX>(=iY#u++3K>oqSpG={?#YVw
zp3m99FXk^~<6#X9X1oKYXEH%8t2btG65(u0zF-J)^>8dj0Evc+9_Bd^Y)k9AfW~FV
z%iDV(ClS6)TC7eVzh{ml;p4cx8)$TV&qhRWp+dqiw>i32?1;5d>HLrNj=^OdJ<}L)
zWxqw8aFI<~_TkMDQHS?`z+KQ?+{ASoy%}RBu6i9?BXbh%OEx1OuZ}?n(VjrT(!B1;
zQ!#WA0NBx=^6rJrFVsDCuT4)OTG<Ikaz*O8tFTZ)QL^`qbYu)jq*kTD>zZ3$Z4Yqz
z&c9+7%g!%zxtv#p2fhHbo98KBwfE<e9Z<Yr%uRWj-5Hd3hTYY<&ve`je8y8RV)knu
zYCT0K`*JrRv<nx%jAf>&Y(&2#=}qEEU`ECEjlCp=X^_tIoMx>%kBT5k)^c=zyV5w3
zc>DLKY6%=y0igWi9B@4hB}bR6K|+jYBt+}i6Ld|b`*s62c6Ge?zGYvdW)=p90~$Ad
zxGB>c<3Dy~hPJ#vNXierOl41xBn_0L<5NhK6JO-LvtS&Z{xjGKfIC6*9%*?tv*?+!
zv;Q{?mHN2b|3DEJO}R9w11ZT5QVC(H0u|0n9cVK_@2r%C<)OnZ(3aS0Ux^6G$ja*<
z9R~o~9XjhPL)w@vYi6r;H$tR>wW`0-Z&Qed`X0LZY9-~mfso!@dt?5Q;@|K6$mAB&
z$J41&y)<{N;QATPeU}BC{lM_<D4HZA)B)i-;gJ1pwusq$h>@-LlQ2hjX;}6~qdglT
zGm%qJm*F^in=w*?j;@C_P<fNuR>CMnXK5Fd^wXV**pZOdS1KbSJsC~s#R;tmXIMb`
zHB>sx<rNDl@4+*>Qg&E5Yf@}d#~Z9D4R{}ZpLm7S=bY0x#k<=H?=R+=W$=Bm2aU*n
z)qgD*0#4>GGlHhQ`bx#k=Njc;+9D@{F5`xI^tMkBf{XIzwB=b9KbuuLF7jMTR~Mwt
zN#!)9J4&^V@JRe9Y!b2!;$rCLPWZfG`C;Qz`u~TJdCzv->e`=R8uHX_2{Fp&pWJ*h
z#A60&bY(j(^P@t_`_pktBV7{tFVoeNWlNA|zgNr&DMjJ_!k2%2s2~F@la$M6k%hWi
z7}}hoDuoaN7?lchVk@4DunpEIS$72&uuF&F;&4uhC$L)6IzHHUryR9emzpxwsRXmj
zfc}pI#oRCB7Y1;t=*58Gsv7x3PGuW^spn6V&dWf#?*TQ0(|*rr=EeE1o~y1<q=XbB
zH7M1n6!fSD?pm#tnQqCt>wyQi%)e*oX6iX@$m0F1R<jp2X5!4xYkF7J+;bthC|!^_
zfGt{`v`5@+vH^moN%0^eXsq^fv|D%^4d2~y%?^q=-Nv+wR>tKUT0vgg!8^fWhYLqS
zF@EOpFld7>f^kprb~YwMq=^<<pan6S!*H@g7t}eQJLhuWeLGTkT2P+Ck3!Te1lk%)
zt9TCz)oC3>e|gw?QFyf8ck|ZC^>)3c`b$^C>jCB4Fne_1e$Cqt=4Ud#K~~8Nfa91W
zwk17&D?X?4FRzR+5qCiIqPf0};K4$tW$}l~A?u_E=JSe;*f_DO>r{z=U4_<)dY)M!
z7O#mizC+GN&#;)k)vkBU<tXnqP_^|-tGmZcT8Dlxt6Pn?`uypBX@1fVrNePVd#ALp
zF4$80+@AG;7xl5W_sE^yNYES$<C6}`Zb1&JCZx~nYEbc%r#1d%Mn0pgS$5QlwG(ot
z!Za{>S@fZesb{v?YuFlCPRjsT5bxB4@+sqdq}xvvBhTngZ(N1LUCS-ei=5sgE-Tbc
z7HK+A_O23MP@sUoc?I?*ZB|F)&%us|2<oRU<$~ApQ%f%RU*aE`VmGrB<J4ieMCirV
zP_~OQ;txr2WBgPQtAbapRV&BoULc}?@}z*gAAJEFNo(?(iOCZhqe)W78eZ*UvaN@7
zhKKGvt0!}(rjB;qc0K^%h|5n7(;vc+uHx|Dg@=F~<I;s3VT_=D#he%5p2SoOly<_w
z*HKrz@ej3W?Y+xd+RJZ;9WZCGEGI{ETYg8h6;=d~Oi`<7@VfdE&iUPi>O$#G7V$6z
zq>G%6!cu7OEf+_#^A=23Hd6Db9-yK*NQ#<PGnv3oz%Gl*Ib##q`dB%MvY>S+kjJI7
zhLiLz{>zKKtHH>H;B-cALzj`>@+-~?X2aP7ypf9WMf8q0m)wS!Nkf+&R&&zEjFOUx
zlq^>v#VAq}=)?dKRMe+010g9O;qAiaTA4dV+==mw%i3Re)DwZ$Wd5CK1m4Ivy&&Ef
zO8W!SpcgA>zfTGAE!{IPJMhdZ`T4{K#7ndDT8K2&*jf=J8O>H*iDJ}ZK}z|$C3U62
z$nZhk4v$QIYzMaV+0`B8S!=9RSYzi*QG#tp>ZY|lY_`}A-zI7)(tV$B9G-tC#zt8m
z<!M@MT<43;wMNmuo-kSmPm5UQboY7uH(`#(7slpt#=BnL_;t>re~pD7oIFkmIAM=s
zw+Iili%nSC?yks)t~q4lTlZW(#5^yUV@+^KvIuQzZDO^*TBz!<CtQh2rfO<z=TS{H
zzIH*$V56H0{EnCR^XrG!ZG7AjD4r}Q(t2l9(P&QU6M<44;NxCby12gE#~t-zco3A+
rQq8KZ5e*fKEaO{0Ke0s~Qmy6Xh5m%FO!wV}CE%>j#nX%*uiW|{x9q0w

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1273672d253263b7564e9e21d69d7d9d0b337d9
GIT binary patch
literal 90
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l%l7LV~E7m<R2d&AFo$qV`FPm
oboulDzr6KyA+fs7hb{~ZQx+&qVC9&67pR!Q)78&qol`;+0H8b=ng9R*

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..359397acffdd84bd102f0e8a951c9d744f278db5
GIT binary patch
literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l!vE_V~E7mtNjN#8yp0f)nD%C
z{k^&2ZZH4W#qke67#j$%IepV*`yn{#P|600IVRJjChwXe(ssyZ>xPQ=F85a&M@g_{
d|GeK{$Y5lo%PMu^>wln`44$rjF6*2UngE4^EGqy2

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_222222_256x240.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_222222_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..b273ff111d219c9b9a8b96d57683d0075fb7871a
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{;aID?ElVL?Rdohw{Ucz9r_YL7=D6<&8F>PmYTG^FX}c%
zl<zAi(m>GE{DS1Q;~I7<vD)$Yj(fd>-6ze&TN@+F-xsI6sd%SwK#*O5K|pDRZqEy<
zJg0Nd8F@!OxqElm`~U#piM22@u@8B<<ecI*S<egUH7}csd8!)jLBD2s`p(8v&--KE
z71^q9MglFywkSt_5FCr2F%o&UR(5j7-O>moyKE%ct`B(jysxK+1m?G)UyIFs1t0}L
zemGR&?jGaM1YQblj?v&@0iXS#fi-VbR9zLEnHLP?xQ|=%Ihrc7^yPWR!tW$yH!zrw
z#I2}_!JnT^(qk)VgJr`NGdPtT^dmQIZc%=6nTAyJDXk+^3}wUOilJuwq>s=T_!9V)
zr1)DT6VQ2~rgd@!Jlrte3}}m~j}juCS`J4(d-5+e-3@EzzTJNCE2z)w(kJ90z*QE)
zBtnV@4mM>jTrZZ*$01SnGov0&=A-JrX5Ge%Pce1Vj}=5YQqBD^W@n4KmFxxpFK`uH
zP;(xKV+6VJ2|g+?_Lct7`uElL<&jzGS8Gfva2+=8A@#V+xsAj9|Dkg)vL5yhX@~B=
zN2KZSAUD%QH`x>H+@Ou(D1~Pyv#0nc&$!1kI?IO01yw3jD0@80qvc?T*Nr8?-%rC8
z@5$|WY?Hqp`ixmEkzeJTz_`_<!oE0dsO`po1=$i_1k<Um_}caMZcrpqA*x-}Rw(fX
z3Qyh8;-4^Fe)UICI@ayzmyV?48GbR;1*s>wsSRi1%Zivd`#+T{Aib6-rf$}M8sz6v
zb6ERbr-SniO2wbOv!M4)nb}6UVzoVZEh5kQWh_5x4rYy3<sHrHJLqL+DcLT5`t$L@
z5_J8#H;PWO1GW@oId1Y>c!871NeaM(_p=4(kbS6U#x<*k8Wg^KHs2ttCz<+pBxQ$Z
zQMv;kVm5_fF_vH`Mzrq$Y&6u?j6~f<juy`C^I0O`4mfXK0lrRY*VoeJX&k$9aL;Hl
zlp63sf~-1z_419)A8^j|LeQSmK&T8R7nA=Ki3^H;YaeL&hF6>tIV0Yg)Nw7JysIN_
z-_n*K_v1c&D}-1{NbBwS2h#m1y0a5RiEcYil+58$8IDh49bPnzE7R8In6P%V{2IZU
z7#clr=V4<zT-gP2u}DD>yyrRe@oXNqbqo^^LvlLE?%8XaI&N(Np90-psU}7kqmbWk
zZ;YBwJNnNs<m6GqjV2(cCX2e+#tSOgIGm~J&Djknhy!e`&p)NTq>$~d!mx9oMGyT(
znaBoj0d}gpQ^aRr?6nW)$4god*`@Uh2e+YpS@0(Mw{|z|6ko3NbTvDiCu3YO+)egL
z>uW(^ahKFj>iJ-JF!^KhKQyPTznJa;xyHYwxJgr16&Wid_9)-%*mEwo{B_|M9t@S1
zf@T@q?b2Qgl!~_(Roe;fdK)y|XG0;ls;ZbT)w-aOVttk#daQcY7$cpY496H*`m@+L
zeP#$&yRbBjFWv}B)|5-1v=(66M_;V1SWv6MHnO}}1=vby&9l+gaP?|pXwp0AFDe#L
z&MRJ^*qX6wgxhA_`*o=LGZ>G_NTX%AKHPz4bO^R72ZYK}ale3lffDgM8H!Wrw{B7A
z{?c_|dh2J*y<H{`M3l!HEtOc{;H{lJx}(C|*lvPQ+RAcV`>8b04c37OmqUw;#;G<*
z@nz@dV`;7&^$)e!B}cd5tl<nF(??uM#|`*5pIKe!DEUl5-&9M=s_3Yn@-P(czyPQ~
zTU3I3bk%z<*w;9V(oQvt^2H`kBAW;=2oA<L1<qVIK(Z{Hk@5&E&_2mS+|}+?g@FBu
zK+e=OWg<)e?RO;llNw00>0{g(Q>5_7H^@bEJi7;fQ4B$NGZerH#Ae1#8WDTH`iB&)
zC6Et3BYY#mcJxh&)b2C^{aLq~psFN)Q1SucCaBaBUr%5PYX{~-q{KGEh)*;n;?75k
z=hq%i^I}rd;z-#YyI`8-OfMpWz5kgJE3<X7ptj0dmPk5UrEf%nVD%<Giiw4wVh!K0
zFjy-VAnpOFJIDm=jqqahP0Wam<9qv4UMIazx8J<YJz>I!3ean6=UZi!BxG7i(YBk?
z02HM7wS0)Wni{dWbQMRtd-A)_Az!t>F;IwWf~!*)-Az4}yryNkz&9)w>ElA80Oc`6
zHo#9H!Y3*Qx9n@Jn)!w6G^hb;e_n8zpIyXCN`JFkPc)^Q?2MsLNFhMgrcZI-<#1ne
zjH;KFf?4eAT9<t<iUSC5BsF-<$q+H@@j%Yk>mQZ}ZfHLGA#d%s;SZK4p0FwZT2S^{
zQ2BG1xJsbK6?yrHTjJi|5C0u=!|r!?*4FL%y%3q#(d+e>b_2I9!*iI!30}42Ia0bq
zUf`Z?LGSEvtz8s``Tg5o_CP(FbR0X$FlE0yCnB7su<mcL>DPmI2=yOg^*2#cY9o`X
z;NY-3VBHZjnVcGS){GZ98{e+l<X|f4%S*+x526SE1mJ%6M<Nt*!}czEQf{?H1U0br
z^Y7cXNxH@=Ve^#j3H@BPU>q~O$u6pEcgd0CrnIsWffN1MbCZDH<7c^hv+Z0Ucf0{w
zSzi^qKuUHD9Dgp0EAGg@@$zr32dQx>N=ws`MESEsmzgT2&L;?MSTo&ky&!-JR3g~1
zPGTt515X)wr+Bx(G9lWd;@Y3^Vl}50Wb&6-Tiy;HPS0drF`rC}qYq22K4)G#AoD0X
zYw$E+Bz@Zr^50MAwu@$?%f9$r4WHH?*2|67&FXFhXBrVFGmg)6?h3^-1?t;UzH0*I
zNVf9wQLNLnG2@q>6CGm>&y|lC`iCFfYd}9i%+xkl^5oBJ?<;aneCfcHqJh7Yl5uLS
z9Fx-(kMdcNyZejXh22N{mCw_rX1O!cOE&3>e(ZH81PR95wQC37En4O{w;{3q9n1<A
zPC{;HRD3#A!@Lk)+k!~onQ0|-U%#uGd$&L?ZhNC&R)V(mb`NhUqrYysoMQ;Z)sq!y
zW_WwV!+jO*nGT8-Hx_JVmFK^=>t&;p)D%&Z%Nw$gSPa!nz8Slh7=ko2am)XARwOWw
zpsz0~K!s{(dM$NB=(A=kkp>T(*yU6<_dwIx>cH4+LWl282hXa6-EUq>R3t?G2623<
z*RwTN%-fgBmD{fu*ejNn)1@KG?Sg<bw3hQ~jCP9_dLp#J9Fi#nX3wGv<cLwQ;8x0`
zA<%pA%E0S;<5FJhw8e#?n&IA5g19Fv!v7YC%Gxqd<x1=+hht1t>*8z3hYtkQJQjB6
zQ|x>wA=o$=O)+nLmgTXW3<g>_6diA;b4EY{*i<HxX2Q~PA|R-tJ=V1~4KO3h7H~CG
ztNFL#J=a@4Q5K7Ogvj-+3N_IJUjc}x34}a7@bDE3!)Kj4s7ME<v)`yP${V~G_J@6l
zp{&i)CGxx1)X`lnwc}#g;g<(rA1#7Ez8@J}tuMD3bB{Wifbe~LWT0zYNjgb_qn|+G
z2TCDZw1rV|wPx@~-H8<4^MGxfR0aLq+_k+{JT<mckxWLsw*J%G%YH0>*R%6dO2EMg
z@6g?M3rpbnfB@hOdUeb9<OD{Zt&T^7p>6=~I?OIA3@BWAGmTwiQ{x5Cqq<8c10L!P
zd@Qk^BseTX%$Q7^s}5n%HB|)gKx}H$d8Sb$bBnq9-AglT2dGR2(+I;_fL|R4p$odJ
zllfb0NqI)7=^z~qAm1V{(PkpxXsQ#4*NH9yYZ`Vf@)?#ueGgtCmGGY|9U#v|hRdg-
zQ%0#cGIfXCd{Y)JB~qykO;KPvHu|5Ck&(Hn%DF~cct@}j+87xhs2ew;fLm5#2+mb|
z8{9e*YI(u|gt|{x1G+U=DA3y)9s2w7@cvQ($ZJIA)x$e~5_3L<r=v~@?aZ+642@!3
z&nTpp8p^rR@IEsq`uhzfD&i>KFV~ASci8W}jF&VeJoPDUy(BB>ExJpck;%;!`0AAo
zAcHgcnT8%OX&UW_n|%{2B|<6Wp2MMGvd5`T2KKv;ltt_~H+w00x6+SlAD`{K4!9zx
z*1?EpQ%Lwiik){3n{-+YNrT;fH_niD_Ng9|58@m8RsKFVF!6pk@qxa{BH-&8tsim0
zdAQ(GyC^9ane7_KW*#^vMIoeQdpJqmPp%%px3GIftbwESu#+vPyI*YTuJ6+4`z{s?
zpkv~0x4c_PFH`-tqafw5)>4AuQ78SkZ!$8}INLK;Egr;2tS18hEO5=t;QDmZ-qu?I
zG+=DN`nR72Xto{{bJp||`k}-2G;5#xg8E~xgz22)^_Z;=K|4@(E&5J)SY2of=olcw
z5)@L)_Ntcm!*5nEy0M9v0`S33;pO4T<mv%0Rx6?c2H~TA%zOO^T2$@D<Cut3{ae}|
zAT@Uzc>N;>4(Z+<j5j2DQ*r;U|6a;YfP1jST$I3mSn3aNn!?<=B-XkzG?hQH;@bu%
zmFYDDgbC%Wt{6LBrs%88L}deF9pse}dmIp4lmp@Tir9q)JKESa=h>19p_0>u#e-vE
zXCU(6gAvu~I7Cw(xd%0e59MNLw^U37ZDbsBrj%eDCexw8a3G`nTcXVNL6{B7Hj@i&
zbVB{;ApEtHk76q08DJ48dSxd$C(;$K6=FpU<~l9pVoT9arW^Vu{%Bcn4`eIpkOVC|
z$)AKYG_`ypM{0@BUb3^9lqi_c?ONH|4UJMJWDowMVjacycX7}9g={O7swOB+{;+?;
zjBo!9?+nd)ie#x5IbFW-zBOo0c4q@9wGVt5;pNt`=-~Zgcw#*`m($6ibxtZ`H=e=}
zF#GZ~5$%AUn};8U#tRem0J(JTR}<qii}wxmUzVwVIg2$uE2;GN{hhT&GE1i;_fi(_
z9KKXP)ds1Q)XnUhr?uXO-HbKE%5f%+-C>d4vR(dgK2ML~lZsPhayJ2h1%sD4FVst|
zKF)+@`iNzLRjg4=K8@**0=5cE>%?FDc({I^+g9USk<8$&^qD~@%W0i4b|yMG*p4`N
zh}I!ltTRI8Ex$+@V{02Br%xq#O?UlhO{r8WsaZnZCZq0MK9%AXU%MDLT;3=0A9(BV
z9VxxxJd7jo$hw3q;3o?yBLmA=azBUrd9>-<_ANs0n3?-Ic*6&ytb@H~?0E(*d>T5n
z-HiH2jsDf6uWhID%#n>SzOqrFCPDfUcu5QPd?<(=w6pv1BE#nsxS{n!UnC9qAha1<
z;3cpZ9A-e$+Y)%b;w@!!YRA9p%Kf9IHGGg^{+p`mh;q8i7}&e@V3EQaMsItEMS&=X
plT@$;k0WcB_jb;cn%_Idz4HO$QU*abf4}+wi?e96N>fbq{{i|W0@(ln

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_228ef1_256x240.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_228ef1_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..a641a371afa0fbb08ba599dc7ddf14b9bfc3c84f
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{;X{3=KszyL1xbWEgT(ahrR?5hM!<zvuS&nr6z6fi@J>w
z<@?HsG!Qg3zaV+-xQ3ldtad!U<6iGz_enGH*2akP_r)o1D&8p^5M)<i5Kvm7+w+1d
z&*|KAM&6N6?%o|XKL7xDVlB)}>_c8IIj6Wy*7HJo&CBLuo~nj>(63pZzO(Vv^ZuB3
zMYigjkwA;FEy|G}1jpiMj6|NTm7Uyiw=@FDE*nX<>jR!W@9XIyf%$Fd*J5*D0Z0Lm
z9}ZQxyT|x5ftNy?V>EbJz-K>bV9gs9RaXUP<^=;e?&Fqxj;6{ieR-a-@H<J_4GiWZ
zaVu(K@aJcf^w<j8VA*iR3{E8n{m4z5Ta=$%rXkgQO6v#}L)oynVyGEE=_51-z65?H
zDgGA81aw}gX`NgF4>ycA1KMKhql8GOmcx<Hp8QKqcf*>wZ?_-(3hMK^^a*(gaFvBH
ziIC!fgH4$W*NbKIaY&T?%&13``KbD@S-0`xQ%v3TV+B!;RC7O!+1a9QCA$H@3tR;k
z)SSoR7(s4)f{zM}eWgFN{(ZH5d1O}l)f$ruT!)Q&NImXyZsTzOf9TwctcSfr+M)aJ
z5otO+$jvm-P4)ykH)x|cO5xeb>?!`qGw$(>&axqLL6yoB${vsMXgL_-bz@2J_tS92
zdvZG-+vKl@K4Vr(<X8D7Fm5%eurE#<YP<1YLAHb!!E~xCzIMI68x%=Yh-w$L6-vB;
z!c#Z2_$LgPU;Po3j&(cwr6cKhhF=VILF!3vYQvfMvLYtV{!ir!NUtS|shjnm2Kl+v
z9M*o<>EL{WQt@Z+Ea-hxX0}nTSZxnpi^#Kn8Ox8FgIS|hc}KJQ4tm*HO16ui{(O9}
z1YN)GjiQt6fGq`Cj+^`zUf?8hk^(T{{cOQGWFP98am}is28A!5%{R#ENv8fCN!j69
zl<vTXm`x#Aj3pR~5$!tw8x6HJBT;veqlI((e3l5f1J0XQfUi^9^|f?)8pp02+%sAX
zr3QSEAghjFy?kTy2b}Y~5VYqs5GsSo#pFLl;)0^z+6P*`;T5Mu&WLv=bzI9Q@9K!#
zx3ne5{kTux3L#b!(t3OTfpmY0?(76nqT7xWC3Cn`hU1f1hZjxb%CxmPCafJTzecbo
zhDHzEdDz$vS9U>MEK(2z?|BY=Je$XD9mB-Kkem*(d-j^9j$2#6r$Dz?s)-TCDCGCs
z8>6Pvj{Y+YIeFA@qY22V$)awy@q!9A4rgk5b9TcC;s9Ig^G|6nDP+5=Fzg&?(L=vc
zCbGd>fSu~@6!94td+o#d@sid<c4_^>!EI<?7QBi6t=$bf#g{8RUCj>X$rx7*cawe6
z`dScJ+$HssdOjE)O#Ybs56vm-FQ$7yuJJD^Zqk%hMaIgAJ<2yb_MFQte_i;62ScT$
zpjifYyR_E=rQ+>H)pmlr-Udzg*-!|ssw(D7wJvC+Sf8bb9;;q8#z?0p!!bsd{wy|5
zpBaMHE-Ve>i#LLjHRaMLtp%9&(HCng7Sw96jVv!#0k%?F^K7&=T)mnYn)D9(i;4x5
z^NJTJwq~pv;kH@#ejTd*48~(J(r6j34|m`h9fEDj0im)~+%I5XphWymhT;_Zty|Q&
zzjPg#-ufAHZ<omf5#{klOC=UKcxxw*?x^rKwwoZ7wz3@8eku)ggLNRn<<KIdajH#H
zeA)T=Seh$G{X;Ew$<Zx1YdFKl^buFmaRdI%XI9raN<LH2H`S7|Dmv<?JPd_9FaRph
z7M0*0UG<&|_BGC;v{TKZe6h)s$R@%If`c(mfiu?)kSq&lq&xx(v`_L7ceQ&}Az*(Z
zkTW$+naI+A`yGk?qy`dg`WSb{6e&FN4RX;O&+frr6hjc+3<Yokv6*p`M#SE){vkzc
z3FL#%2;YdX9eq<GwL48ff7Y!gs4B@Hlzc$A2`aV3*Atk++JX5HDY4Bk;uB4Yxbu<X
z`L&1ByqMIqI8t`UE|_LH(~F2;?|){*%50r1sI9V=C6bO-=^K$CSiOmlVqzhvSi?6g
z4AzPTh<iZl4l)6IBfJ=W6EkAt_}>1M*Gccw?Kf|8Pnhtb0`!{N`Bqsa37J+>wC$!e
z00k+2Egzz;rbcWoUB%Jvp8W1}$XD%e3>4y;;OZ1ccT-O#uW6Ys@C}Pa`nZrNKzR(2
z4e%3)@QI4SE&E!lW`5y14QhbepBG%_XBV-O(%<aX6HVzRJ7ee*QV3AB=~LWyIoy{V
zqv~a)U>5tj)@9#|;sC-MNev!zGDHk}JdpGC`iJF#8=8-P$Xoku_=Dw%Cv3{U7L>gf
zRQ?<$t`cZ*MP5GQmbmx#!+*!zu>0MewRO9GFGS{b^m_fJ-N0?j@EqoFf>$khj+E|@
z7r3We&^tR^YZrxKe*d<YJy4G(9mh^GOxZ8bi3n#Ytos{m`t{%)Lj8wW{Y{jV+Q_6T
zI5_MMSa-xsCZ~p-HRDCj#<#0BIhacN@>22agXqCO0l44&kqCv{u)T|(lv`~PK@DvE
z{QI_TlCH5z*gR!>LO)k67{^R+vWx24U2^2ODXpwT;6y+6+$5m)_*w4WY&#do9dCeE
z)>p+Ykdhq($DhmMiaYXey!@N%L26uz($aJ!QT{B^Wu}U$^9e#5)=c+XF9@Ill?ZmM
zlNgHiz*9!vDc&uxOo;ZVxb`Q!Sk0*gnfxWzmbZh4(=%CD%qP?0=);n$&zaW_$UKV9
z8axdcN#AyZ{P)wj?V{P}vM)YY!>6@}^>U+iv$`9>nMTCPjN>z%yF&3yf%>+T@0vh4
zlC8Xa6zeo?%=o3}M8{aebLHcO{^1Ar8qiM=Gquf?Jo)q5`-+?sUpg?QXyEUpWSm+n
z$K-UyqkI<R?*3wTVfWE~<@2<uS?-MVl1;jzAA8*iL4xsi?b?BNi<UXgZAh$t2eX2O
zlaSjP6`u~(FfWAHwjdICW?Bi|*YB$4-Yt-e+urDxm7s0C-NReT=&xHY=NLk9^<)K_
z8Qvc8a9@Rcrh{U|jRjj-<@xXJdfDhCHAU3q@`fxV7DF|YZ^rH=h9J#M-17gO6$#8E
z=<ACLP@x){UQ68&`mEVXq`?Cxb~%;JJ<xQvIxsey(BZq&!Lur1_nVgz6$w$lK^&jz
z^=yq5^Y*23<@W0Z_KKzDbZLlkyC5J9t>wHLquru~o(OF)hhz$Y*|X>ZIbswnxRvr~
z2=rdOGVuD|xRlpAZE<0!X1F(%Anpl^@V^D3vbM}qxe|NI;TTiZy7(IM;R69RkA>a&
z6gwYE2sREzQ_LHmWqB+ogMk(fMaSFeoDq-!HkFB_nXt5+2ncFuk9BQL1I&oB1zZi)
zYW{6_&-Ip1l*OVRA##1ILQS;5R{-K^0wGTiJbVSi@LA^$D$;@J>^G{6@&+%4{b3(s
zC~LEHiTv(0b#zxt?YJ0r_~pUZM~mQ(??(n#>&tD%+@nq=Abj5*8R!~Ul1`G~=qFJ4
zfl|m8ZDCYgtr`4LcOpgiJYX9qRY5;DcWti~PmS$VB$E-Zt^f4)vLDOe_3XTq5^ylW
zJ9PKm!V-8sAOJXnUfuFNIf0R9tK-pNs2hO04zr620}5B(Ok>yB)Of-3sP59qfQNbm
zA4{w!2@cB;GbR(~szVrbO%(w=5S!X`o@o@x++wbN_tMPT0V<QhG{UeJ;8({%=z{L*
zWd0UgQl1fNI!H$Y$hXK#w3!Gvn(74Nb)t*FnucAAe1;`Z--B03CHyB#2gq}g;qs~I
zlu;^<Ox+<j-;_m5iBxJsQxuqvjs7QOWMpota<0)9-Vv;XHb%w=>c)*I;Fgsbf^*g0
z2Di?HTApwKq3+YwfNsqd3iP%{hyK1iyuVZc@*0tO_3+N0#GFsz>8MjeJ2UJ%L!%hi
zGYYAthH`E+ywA*u{(eJ=ia3h*%k?779rk-K<0VZAPkl;TFUbmei|$fqWO8!_zIvqt
z$ly$VrlH46nnpX~X5Yk0iBJl;=WuA4>~X4-f&K0yWf42h&0b30t@NYX$7egQ1Fp!a
zbui-D6cWCWV&|R1CY@G8(qOmWjWeX3eX7UggZPGimA}soOuQdXe4uZ#2>5zN>qlI0
z9xk}lE=tNpX1m6*nFr2EQ3xs79!^sCldDJYE$m(qYv3q7>}1R7?iZW7>$~*%zKaC|
z=$N?ME$>#+%T&MZC`dW1wUl6Z)JgyCn~V%K&i0H|iwE%$>xsZW3tTfZxIUe<xAj&4
z4Hz4+{_ST0nym-LoHhM~e(110&D!U_p#In^VLIn{J!Y#z&<>Pci@p;cRu|d=ItIwF
z1clVHy{hH?@SD|(Zfqi^0DQ1hczHN7xq85h)rzQqLHMX2^IkuK7FB!kI40s$|CY7~
zNX^{_UjN8}L%Med;|+=4RNTMozn8KT;2tb77bUPCmioh+rZBfIiM6f_P34cQ__o1G
zWqQp3VL~~pE5?qODf%iiQQ3f42YF@09tQ*$<v=*TB6gv{jy879dA6iNsN{5E@!(k4
z8HhaiU_^B~4$+iH?m^ArL%A5*Efo_%8ySb3DJ2+($#iHi9LOmDmMF7*5N3n2&E!HG
zolrkI2!HM5qnOHg23Q1&UfD^`iFCzlg;)`TxlRkY*i!V9>4v_EKUx;t1KCPCBtgqg
z@+Tn;O)a0uky_%jm+WjNB?=~VyH>V#L!*=l*@OS6SVyt_UEH&NA=?V2stHPyKkVNy
z<J*73J43UcB3bH1PM2@IZw;E0-Pr(2?E_y%c)4{fI(WYro>&jg<#cjros){#ji)dK
z%)We0L_478=HZ8-@xnwsKrWs8)x`MB;(Y`Cmu2c-&SH(vN-F(*e`l?c%+l$|y_AJJ
zhcDGnwLvN+bu;_sX|1<mH)GAPa-4}{cUWY%Y?nWr&(mZ0q~a8r+)V&r!Qf@i3-wZ~
zk29f}K4Mv56>AiePh<L{fUUyPI`J1j9<HC~w$=DnBr|v`eP$5Ka$0AMorz8kwj<6R
zqIF0X>x@u&%P$hf*xE+O=~D?_(_KGWQ!158YL-y9$*6mmPo;Rp*Dl5lm-mVM2i`h-
zM@nxv590_tvMwPD_{l=b$iOm|+|S{D9&P%zeT$GgX6Akl-tfUF>tL@Ld!B&{pN39t
zH>3Vhqkr}2Yul+jb7UiouWVGPNsxX7Ueba+9|~dz?d*QM$ng0DZfO0`7fAy?2yMm|
zcnRzUhZ&IcwgjH9cuU!w+VStYa{p*)4IgBf|E8)sqMYtB2KH_}SfsFq(c9i(Q6S3U
oBo%DI<H*|Oy`A%<=J$?q?|gu`ltGZq->*Kv;w;*%(i9W@e{{5C=l}o!

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ef8c08_256x240.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ef8c08_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..85e63e9f604ce042d59eb06a8428eeb7cb7896c9
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{wzI}^MB`Dm+sH{TR1w<4t)tA3_robX4CdCOHJC|7j+vW
z%J-EMX&`87enIluaSc0_SnYUx$GzUc?vrNXt&I`o?~7C3RJ>C-Ajq!3AfU8Dx90^_
zp3}MKjJzYC+`T(&egFXQ#9Ek{*oVAaa!zrZtmlRFnwQPRJXH<%pkK2*eP`pT=lwD7
zifq+4BY_rUTa+U|2#&?i7>PVvD?7R4ZfOLPT{e<z*9Sa%-q+JZ0`uF@uf^uR0+0eA
zKOCxXcaQOB0xyL&$7t}dfX{x=z?wHIs;&yo%nJr`+{Z2X98Hy3`tm$u;dhd<8yL(-
z;#Sne;Lpz{>9G~G!Ls3s8JtQE`jMM9w<tfkOhc;ql-3a{hO%LC#ZWVT(nn|vd<pzY
zQv5BF3Fy2~(>l2V9&Q+K2DHW0M+uQmEr%nYJ^7cK?uIpU-)=wn71ZZ-=@ar0;3^AY
z5+TI{2b(e%t{2PZ<B%x(nNg1>^HKF*vu@+Xr<l6w#|okxspftdv$I9rN_GQ)7q|*8
zs5y_rF@oIq1RoU``$~Uk{rhVB^2n_8t2HJSxDFflkb2zZ+{WSl|IoP?Sr2=Mv_tpb
zBhqwukeg|uo9qd8ZqP<?l)|%<*;D+JXWZi%on=Ghf-03Mlsz8h(Q+`v>&BAc@2BC4
z_vCgww#i=)ea5Vo$glEEVBBg_VPBj!)OO>)f@}#dg6ULOeC>LBHz<;*5Y;YfE0lNx
zg{N+4@lO~ozxpF69qV@VOGnc248Iuag4C1T)P^(hWkpP!{h!JekX}m^Q#b2B4f1oT
zIjsGz)4}-$rQ*-tS<w5Y%xt4vvDzNI7LjNDGL|1T2eU@2@{VTp9rUuZlx!D2{rUJ{
z3A%pW8$~DC0b2^P95?wbyueB1Bn4o?``LnX$Uf9F<C;}N4GLdAn{SZSlT7_PlCs0I
zDBXb%F`GiL7)vk|BieTWHX3ScMxyQ_M+@in`79A|2b?#r0AHuH>uc%qG>%<4xM#E&
zN)7lRK~^2VdiloY4>;#}A!yHOAXEmEi^+eA#05pawGXs>!z)gSoDuI#>bRCq-qjJe
zZ)r=A`*EMX6+)~er1kdv1L^)0-PsAEM7JF$O6G8>496$24lkO<m1%2pOjtWwevM#F
z42>SR^RTfUuIz%iSfn5b-t!##cs7sQI);gdAvqmn_v|%I9k;fCPl0Z)R1+hNQONJN
zH%3jT9sOq*a`LF*MiY=zlSSQZ;{_FL9M07A=In+O!~wR}=bzGEQpk2!Vc0p)qKAH?
zOk{(%06W#)DdICQ_S%Q@<0Y+!?9%#$gWJ%)EO-<BTe}-}iZ54sx|$u%lQFIs?k4-B
z^|c_dxJ&9M^?WcqnEWyMADUCvUrhIaT;pF-+@vY1ij0*Jdz5c>>^YZP{<`oB4~9xh
zL9-0*c4@B#O2ylYs_g`Ky$zb~v!M`NRaMNFYF*Gsu|7)=JyyMHjFC=HhGUE@{aI|B
zJ~ITXU052%7jFb5Ys#fhS_?4kqc7H0EU49B8(Chg0&JzU=Gka#xOz1)H0d4m7ZnRA
z=M^tdY|U6T!fmte{W?_r8H~qdq|q{5AMU_2It1I4143n~xL?4&K#BOB48<w*Teqll
zf9X0fz4bHZ-Y$~|BFf{9mP#ye@YYTq-BICfY&StDZDl#G{Ztz02J1kC%b`U^<5ZiZ
z__Fi!u{2kX`iENVlA~L2)^LW8=_9VB;|Bbj&#bO<lzgV3Z>l9_Rdm!(c^C?JU;tF0
zEh@o1y6Qa_>}#AwX{VY+`C^kNkxhgb1P5cB0%xupAXyg9NO=SnXrJUE?rQg{Lcsn+
zAZKctGLfbK_B#^&Nev|0^fB&?DN=ak8|0!np524LD25=s84BP8Vl(3=jflNp{X>e@
z637Ri5xx;&JNl+XYImA|{;XR~P*svYDEWYJ6I5!6uO~2twFC1ZQevB7#3z~(apxn&
z^J@>Mc`>PJair{yT`<jZrWX;x-v7*qmDxI3P+Mg!OC%kw(l;VOuzC|8#l%8Tv4(G0
z7_1cw5ch!89b^LbMtCv$CT7IO@xA>iuan-V+i%|Ho-pA<1?V-k^R2Q<5;Co%XxmL`
z018t4T0TTwO^w)Gx{9OSJ^9_|kgwX`7%0Rw!PO~@?xvnfUehvN;2Rc;^l>3kfbtk3
z8{j7p;S&{uTlTe9&HTc38q@%_KQFk<&n{vmrN7y&Cz{etcE->rq!6HL)2F!aa=0%!
zM%Bwo!7TQ5t;@a_#Q}sjk{UebWQZ8{cp&HN^$*JfH#8spkhk{R@CVBiPuP@yEhu{}
zsQfuhTqV%rioATpEphMfhyRYbVfVW`YwLFXUWm-===J(byMf!5;W^CV1g~2194Xx)
zFK|z{pm%n-)-DRe{Qhk(d!QaoI*y%Wn6h7<6A{i*Sob&B^y|Spg!&J$`kN>zwUJ3x
zaB$ciu<nSNOim3uYsQP5jc-?Naxj(j<)z};2hoFn0&u_kBM}O@VS5)nDYx1pf*RQR
z`S)$xBwb^buzAY%gnq7CFpintWEa)7yX44mQ(9Sxz=?kBxk*6p@w42$*>*0FJKg}T
ztgnh)ASF8njz5>h6?f#{c=<QigVeYbrKRaeqWoE+%S;th=M#iBteNh&UJyV9DiQ2h
zCovT3fv1eTQ@mSXnGo$!aqUldv6@p0GWkoaEpG=8r)RRRm`|p~(T62hpEIu=ka-lH
zHFz2@lD_Q*`R}K5+eNd{WnX-*hEHn`>*Yr4W_34$GmVIo8OLWjcZK4a0`+Yv-!*}9
zBwKm;DAsA(nDI-`iH@;`=gP+m{lgFLHK3m$W@?)&dGhDA_Z2xOzI0$p(ZJtH$vCxE
zj>+kYNBJzs-TlSx!tSH}%I9fQv)mc!C7X0bKlZv4f&}C3+O-4k7A<p}+mKlQ4rT=l
zCn2{pDn1>mVO|KYZ9ydP%(N1^uisV8y;~p`x4qFXD?!_OyN9=w(O<V*&M}1I>d6W;
zGrT?G;l2v@Ob5k^8w<9w%Jbjb^|H}PYKo}I<qcU#EQV?(-;CW$3_+TixaI#lD-xJT
z(AO6gph7h?y_UKm^jWi&NP`DX>~bobd!XrTbzp2Zp~H8lgJ)I3?l&(bDiWf8gE&6b
z>)9GB=Iu-6%I((+>=jGP>CzD8c0oWITFZGgM!Q7|JrUYq4#^Y(vuDu-a>OWDa4Y4}
z5a_*lW#IL_aVf8L+Ty}c&2VojLEIA-;eQK6Wo?<KawYbZ!!f3+b@4Ui!v_Lt9t*qk
zDRw@T5NsTbrkFQA%ko%G1_Lb|ijKF_IU^teY$_8;Ght~t5fIeS9_!kg2AC0L3%DAp
z)%@G=p6e~2D2qisLge~Zg_>xAuK>i;1VWx3c=!s2;j_*iRHOsb*>6-C<qcj8`@=rO
zP}XMY68YV0>gcYP+Ho=L@XLd*j~2ln-;WHg)|cCixksH$K={5rGSD@yB%LI|(NCc8
z1Er8H+QO)~S~K{g?nH|2dB8SKs)BxQ?%G}}o*LV!NG2m*TmR|pWj~g`>)ClJCE#F$
zcj)fBg(dKOKmc$Cy}IRlasngIR>z~kP&WW~9cC951{AKmnZ~ZMsqup6QQf7J0T1;C
zK9*Qd5*(HxW=tl|RfjO>nkoW#AU3t>JkuzWxy4-l?xmTv15_r1X@p@dz^{&j&;{Mq
z$^0$0q&y?kbdZh)kZ+NfXfqLTG}Q^j>qHlUH4VEK`3y^-z6Y<6O88Hf4v^;}!{t-a
zDWg;znYu%6zA1~A5~<XNrYJBS8~snn$jIDO<y@mJydzi%ZH$Z$)QuZaz%45=1m~)~
z4Q`zYwLIYfLfxmU0o|G_6zFY@4*h+3cz>w?<TWDm>fxO~i8-Ib(^02{c4pXjhDI^2
zXB1LP4dvWuc%PXQ{r!d#6>${rm+M8EJM8yf#!H$Kp8AxwUXm5`7Tu-J$mHe<eDz8P
zkinV!Ohb>CG>vw|&Ay415}_1w&*9K8+2d3v1N+@a$|820o4u60Tj@u&kI!~q2V9X;
z>tMvQDI|O$#m+m2O**ZHq`_{#8)ry6`&5s~2k{O4Du16Fn0P;&_(0!e5%Bel){nU0
zJX~<8U6hoI%yx}qGY_1Tq7YKDJ)ETOCs&W)TiCrK*1%DE*vXdD-7hwE*LUgjeHRM`
z&@pkhTi&gtm#Kc+QIK+2Ybn9-sFVKNHyIgfob4H_77yYh))Rq$7Pw|+aD6&yZ|ki9
z8Zb6s{oBt1G+PgfIcxd}{m@~1nzhe;LH)5;!gS8@ddyabpdBc?7JVl?tS+<#bPSMT
z2@0uYdsWN(;Ww)n-PlA-0r+62@bYkEa`k{0s})fJgYZ#5=DmIdEvok7aZJRi{w-|}
zkea&<y#A2`hji}_#v2m7skndFe=lVxz&%)EE=piOEcJ&sO<`_b5^G%<n#vzp@oj^X
z%JiB6!h~{GSBxDmQ}k74qOt+84)V%~Jq`#i%7JivMeIU@9c}EI^K40lP|4}S;=!@7
zGZ1<3!HDW~9HJ?Y+=H6KhjKBrTPh}kHZl%5Q%W!nlj+c4IFM2PEm3CsAj}43o5_VX
zI-!1a5dPZ9M=_Q046q0ky|R;>6X}ZA3b7&vbDb7)v8CuI(+zzSf3z&P2eOrPNP?D~
z<WE8xnp!@QBele5FWK2lN)$}!cCBpfhDIq9vIqZBv5sQ<ySQilLber3RTGpZf7ria
z#<%~5cZOy?MY7b3oG#yZ-x@S0yR!k5+6TUj@N(-|bnt#LJh2{}%jx9MIwuve8&6>f
zn0@)0h;~5F&BG5v<AsTOfLuEFtBLWM#rp>OFU!=woW&ZSl~nrs{?1w>nWfW_dnpTd
z4qvLDYJ*ft>Sp%M(^_xCZpNBn<v0_^?y$&i*)D%LpQp$0NyRBLxtjpMg2Bt27wV-}
zA7?@{eZ;cBD%L0_pT_h@0b7Nob>c66JX}A|ZL9IENM`U>`ph7d<+RQiI}@E8Y)70s
zMC*_&))}GlmR}@{v9*nm)29-=rn`Q$rc^4G)GVQHlTr6BpGxtHuU(8AF7Ffh54?5w
zj+EYT9>x)PWL-iQ@RNm<k%46_xu3)RJlgba`xYU0%*_29yy1gU*1=vg_B;a@J`J7P
zZbtp1M*r&3*S1r6=Ez1EU)iWolOX*FyrcztJ`}_b+S&bhk>T?R+|c@=FOmj)5Za6_
z@DkVy4l^L>Z3#SI@s_eVwd3D)<^Ivq8a~J{|4mhOL^<7M4D8){ut;GIqqn`oqCk|x
pNh;Wa$C0(mdpqYz&F>xK-uVD=DT5%Jzh8ZT#aXmjr70%*{{RacS`YvL

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffd27a_256x240.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffd27a_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..e117effa3dca24e7978cfc5f8b967f661e81044f
GIT binary patch
literal 4369
zcmd^?`8O2)_s3@pGmLE*`#M>&Z`mr_kcwz5Nh&g=McJ3E!;CE1E0ryV5Ro;>nvtvt
zk&I==Xd;cVGZ@>q_xtnx{1u<ad7XP-_m_Llz31NZdcG2EQRlg#Vo(48z-?(^ZVvze
z|6T#B?4ZAvXnA4xuUoRUb~w8~68XP#e)ZtVe+x$i*`qE2L|`Xa*=^e&W~<9M_#tnj
z#rVH+Aq<7gEG|f0JFaQ38mE(h>%7-D)N|5YqOB>i;(bZ#o62{J2Y9&^D3~R^$o+X?
zwbxAEIb)xwCwK3TSR4QVym6N1rVgPmmt0caryBUceHP_&u}{?^Jn7f0PT$#h>UDqI
zr!q(F&1jJ2_!jxdAB<)7H$foI*2zuncvu;;$SoU7br=AiJ@4=BC4vNO>DS`&UIB=K
z;2)0F*t^FBvVfPuT4FVMSwUw%Xksjyl+;#*DDy%=ocFOyzDLvLR(`zCSOuJ=?FWYn
z5ZD!UaoF>-$@=Vt?a&;UQYM$Oqe0ZB?Je?8ZnMxDe&uzzs*zlHd<n!{fcOy-3tIxc
zl9G6fU;?@>)V58nfJPc8S^({_4bj5HQ_B&EXHWj6wx@B;!mr04b_Mx)UFL)W7`V!c
zpMp#C!a!!sh3h491y}^qfimXVY%!+sYu0_D<P=jc<5*#|6V<{WZGN`6N7;T5@B&-O
z4YA;LJcgH_nB=Dd<6apIuYX_dSRS2~d9}u*0@tAvp3;xIUD`Q4{vSHeBHLl#uuj<i
zdw9AoFJd!YY?C9=-W}2;fmD2UGG|&~>WoJMqpN(FR9LM#jdZ{vJzEck`P^9(1N=4J
za9%u4$2J8TAkUaJk_FX%iHuv#svL_mMmp{SR}ifc#ZcXv%CFsT?*>N^6r(%D?1YnU
zAaT?UZGlOn<yU`%Wa8Y9e(6d%oe>a6UXXs0m)3YDp}d%hb@)@Y!lK_A&D6{OPlNnj
zYY*$b>vnRzL8=CDbQSi!DL3D!P^xhNtwrYByo?h-&OvQZYJ6ka{Re#<tfku}Pk%l>
zSc0ry_d(K$_Q2M{Y^O~DOK(szDOnMi_<pwV9HJlj%%pbJNR!N8!0s1p{Upoaj+ETU
zEK+aqL+qw7G}a0PL5uYtfQ*ORTM)>*h_Rx%eSRxA%n|FuC&=F=<MvvnBAs(r9_AGz
zj#LLeNR-pStzN#d`2)svUKrAQ8VHd^=b;OpBCx?RZykcH-tb9~qbL$x$(`2<NV~cc
z4z2Bp@;~m=w?YY3`1HQse<0qUrn@+UmFad91gTtZ)sci`wvk1%_;MW`&Pf|5tFMu4
zNntUAcOEu%z*Jn}7mF2zKzm-pAJ69V*u*k%Pz0Bw+@6D$nbX!5@F~#!m0D7y2@>)B
z_Qsgmj8g!GA+LZOX)<MTZnmtSZMvX}iN~6m-JIQU20KF6`U6rsN{iU<Dvr1WS@zOz
zl#6cg6=J4)x<q{k$6xz$eY~XokVD3xXlNVKpABoKf9r6^O!Mc-%+zqecrz!IBHZPk
zw7nJrmUK)1q@E9fg^)g`{6kCX`iq%f7Po|#WOo_zsuE*m)B)+26L-$_R)8Mt!h_+m
zGL~5ePlt^60=e?-MYRsRhyDgl@7ZuDwz@j@ON}1OXo&%9FFj79dYq9#Pl2J0tpZqW
zoj)^#YFt?xCl+r6r)bG%OxXxB9bzulRW7L4VwzZAtOD$$wddJsYuE;LaTM_#<QEkK
zsNj<*RBFpyHO6kU?fp7b`x$~mXQtCK-5&11GCPIZRRY80sMue?{vgSOolK=^)LZxH
zbARbRFuV0L_TDa&7c9o>gOW}vbo9|l8QW3iYw9qCD{o~xt^HIU>;dV5MJgc0#uHTA
z<b?9`^Kmpc&W4BD98zOjFt!MWuh}E+<l}|{o6oGTbC!N4qi(7vXIFMMOnVxMbfN)N
zpdB*NBc}R2H}q?~Wm%WHWyNB%7lB=rj|B!oI|os&8zNX2&PaO(73!SiCG6_-sewTO
z1Rz&hx(b1H;PyKr{Yfo2#_Tcnj2S{?^c(o11&+g0pg0yUvKa>80%Ee_r;G`GUjssm
z*AhtwpW%Ly;X4Lq1Zq#ZpuwzrZE$sR087dN{w7PA6|Mo#6wwJP085K+h7+D>NyeX#
zk|?M<oZ&;KrN<L<I(I=dD@q?cl4IbRF&ndOs<5uwMvg!{TBUD9u|OM4eU*}mSV}bg
z!o#6$7=VN)xc(puus6zwHZV0OG)?U7PkW#AIo)ydHqWFfKQd6ixr2X|O$wi7Elt~Q
zP6v<?64wgA8tUqVma<hW?e59%zK8rZ0VY6U?n&-05mXQLRLYvR*#iHFc$BXzkqlHo
z6W9SifpFjGSnRT&jat?h?$a!d5Qp<Z%K{vt*3t%>J^Es)JtP-2eNr0EQe*ZM`&}OU
zCD*uSSviE&p}uX|@1g_%|3*ra*MbBV#~cshdcFQ(dGLnTqaO-3{u==x1;Pp2im!#`
zuZ2`ThfAmiSzb|4h`c4?^ZoGOF*oXYcV}(ge!v@^bse?daA`Ma+bSZLIg;pIN17vM
zIOYfK=@s_Pj?~#lqnY2o?d1$MpoqsYQw%eX%X6Y4*^27{hMWGqILEMnVYUEMW#x7f
zu^I*nzXQ@6HJ8n;<zUNvk-PEjs%<X1ioU#5GW#HA=uaT__dpa}F)w`Yq8IsAdt`7U
z`+&f{UAvT9oH8a~#Q{IST?fK4Gn(zAyLXqIIB&|RDC4<MkG(eWs67GJyEog<1@R;p
zqErmjFbl*Kr=W@Fa@dm2f*UXY=6aA8pQ^kx6Gc!sOK_!BGj%_KX(L)0{_BN-RG>26
zo^1+Ewi$fN$Unum1(FTb8I#cYgcGklwIExt#Mb(D=x~OTeZ^ubJ)S-ywfdZS?SRCq
z<f6&jh?er}Ff4dKlh+}ZgDU^xdo^N4XGA|QMlZXk36y0_n94j(>Dm=eU<x+0r+(K0
z$`kDr6r$N?XyYa?y(T-y8=tEjFA9h_xYvk!0;klqRPh$f>+CCWO@8S_m!W{alT)zj
zZJbjxm5&No5xe_~Jw-i7`&G}=r)POGGfFq<O8y-6Cxq}O+jVOPKCRjoSodM^fgSV;
z21Z0|XI6eXR7bxMS=$0j;+W~BbU**AT6?!xT;2D^zN`dq>+c@kQbB#)ay`coj&C3-
z(#&xV@Q3@VJd{qdH4g@4ZJi&mx9e@Io7@~(o5vTrkW>QEO1T-gmlTRHH+3)gcUC0P
zk07rvDnf*7Y5J}8!>F_7D^Z3IoH^uGH}_a(ax{Q(IrvV$olf3WN&DY?<mf1{#tp*6
zbe~sSoVbr4l{;@hKd4VUJ-1s^jK>uYZfvXI(;Vv&EAoQtfH<X6@yy;uSMU*|aKXKd
zS5vU>;+4VI_a>yh*J+Cj!?h!QX?O`QXk@@G7AjloJe51Cw*rPXQ>#y?B^^ExRQFui
zolmv*C5K|-p){rZiCNai^0H`1(Qr(Hz3v%7NnmriXu2tD>xsbN#*R3*wsZhRj6Lvb
zn0Cu=qkC?*e4{NF_3=^bTb1f!g?@ryFH<mSX7J%FD4O3UZ%By_%;30DZJa-JG5in5
zFhfO$wOjOepP7?~dRphj@WU?;zCKz6eSAMUwAxT%JMIyEG7;|g_Q+7rq>6Zw2tz%A
zzz&o{w`dDv66!6Wk9w1-dglS#Sm{doxw&h5Z8&ONmlBBte{J)puaDzc!LC==rPRQK
zQNH23?-rIo^MQdt3Tk!B@8l#}fxVtrlc8Y<>ORaVE($DKc{77qV^`+`%_DotrUD=8
z4}L7QnZi3RgUy*tteY-=$SqA2@IZWe(}mI`nzhAT{qC)my#rJsfoS*<ZNRV2gRlj?
z)v1Cl_T+qH<V>)xCXj!Tk6=3)cr@Jw#OcNqgS3pg7x|4!A$|w15X!huR*vB3q9Ya4
zF{xuzEQz{9YPl(gk`}Gffut%jotgqp$jZvzRO4EsExf~93vY~04AxH=lR>R3v3Qs2
zy$v4SN%ee@Kz#kDtARaQD`d!R%}#@T1=v8DAow*r>+0d1KS{ZtA~KMtgm)+$JHumW
zw=;@qWk&MuG@LKx#K3@&WMw?r=jD2_)(*$LmkCm4_@};QZI|SPe8hIC6xqBy!LQyK
z01_xmfNA9UlBU@Kzu7;zQYxHE>OCADA$gwaVqm`eN?XQF@NkrocB}lU4hcCf>wqir
z>Ya=PcE!Xm#JG8v@G0lj&~)hScM}X57vGw3g<$^SUls53f|Bk>5FQwqE&{%u(f$!1
zl8+53vyYZ`mEEp&YT<=(krhKrw?~pS{N)?q{0qBR#2Y!w4!hWMdj`a(@A@r$zVB+u
z06Hb@_9(cQ_AxbXI|-2w>#QUhp7k<+`z9+(jkh~v-Renr#C9U+&jL4vg6-E$f7@UU
z(1fxB8{U2vq}h3rE!Z+n7=(>D&}@9~3mJ^R5}|WVG@!RSh3r{!>QHwg!t29YS&jiR
ztyn_q*k9H0efZ7hO*b(WR|G!TDY`rol~Ob4&1OwdM8kbGj`^$~L5gd<d7YB5YJW@H
z1El3`1FwJN#3DR;LU2X|A1e0W_1{a~3G@h&oQoFR4^R8yLsOhvm%`Xog{28ZResyx
zqB6ZHK&Wu;>WYceWwL=PB{~NX=cu3p-{S;hqaE?bSHv$g+SA6bxy+VU3YVTPDj6CN
zKLb_(9gM2Y#KW8ONxjH9To^Y)r?ql2cq8+WE438uIF$hjfdLs6-;!jv55jGcc3Ipg
z;}aT32NAEGeU;J}&j5=+u`4?%xlwL7?NDn%2={4WS39yn3f;&r=|}5=M-Y2yrxeSw
zv%*PmV{_{#Qk1sD>?M2KDapb~z3!E*-LPmCe9q86D%MGSe;4~~K-jKQxq6b^902_{
z%>4G>@Xqk8muR*|vGe5{@7sds<aRcI()+-dk>2i|i;g}oMkd!o^0=HG+vcPrcN54A
zLGv$PlTePRxp~-OSb_*aACO1qc{MpfS-fv(@UmRv%UO)cSt;ee@9(S)f>|~bwU@eZ
z=kTS*sdjLclwMZ<Jgx0E^k$qnMxHBa{0^(!mfiA)^ZEJ=-!!ZelcyN~EF8Mbb)i9e
z^>G#?%U3)bq-uj?@@vj~6tq)ZS||Jxz`+di-M5<Fie`muWl)A7tfzIyIhd%F5PQPh
zAxf8Mxy}evu=*ltf~ji)pFWl7J=6W8EwxIyv~~%3n}ob~`BbWRLfvBgNJYQsf8eXf
zb*A=3@G_1-qwA7#fS;_y%uEbp$>SXM=h3EL`?pB>W9A;`V2vM)vk&%KFy|TAh#AQA
zb_?<!HTqYNzP6jrw?H&O`OC+In}z5{pe1eS^Wk6)mYv;?7a6{vK#gr5`lD#T2VpIk
zLT|ynkZ?ny{+8hL6(4EaQ#%3OSMDDzt>J==3f@%LL{`vU$3Z@A2a9C3aC-YY43dR>
pI7J0n@;b3~`)ubvsr|iU(l;L{A#E6J`}eC4usn-0uQEf&{2ws1m(l<L

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffffff_256x240.png b/3rdparty/timepicker/css/include/ui-lightness/images/ui-icons_ffffff_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..42f8f992c727ddaa617da224a522e463df690387
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^p#%>t<I$5%B*(%$RifAlJDl()+*_W)tj4atJl`V!4ku}Mhk*o=k
zjAh1XB8{;#7~8k^`}6($6`#j>oqJ#RmwV2==ic*rz7lOw=eaq=H~;_ux21)-Jpcgw
zdj+hrf&W^f<%Qk9Zpqf#;q3n5{{POY;f!wmTR1An9(4&I0z1LNX50QSTV2M%4|y9c
z#{ZQIVJKu~aY5?ZaZP*GIGqGs=e@q6o|EPhZB3CC?@LnORK8O@z{{<0KtSn5?#~OW
zy=L;x8T&*%xqElS;s5~Pjk7d2bqIaA<dW(>)xZbovnZd7eX17WNxx=w`p(8vulwUZ
zl{so}MuRNJx5!8S5G;$o2?BApPHt+)!^#*Ww`?rcVE}mcyuY`X2o|uVUyI9o1t11O
zemGWR?;aD#0$vJhiPhv~0iXS#iLq!>Qd<?G%nJo^-p4Na9!-~9`SCtu5pb5a9~>$`
zU{}<|Vb9Md>$4TMbL7C3GP#r;4Wc$}Z;^j;n}yc!E3d;<jpV}POQ7Zg#E;Ne*b?}a
zl*C&E6VP>`wry$!JkmJP0%(tIh!!TET8=<Gd-5-}J&kJ?em(xME6C65GA9%uz*QFf
z6kM7Y1~y|ZTrZI;z#@<ilrhg{i!qH~v+ffmr<i&f#|opJs22Wc^RvZ0%JzeR7uZT}
zs0FX%F}(c5BtI1x_sU>+{rhUi^60G0t2HJSxXv-*DgC(HrJd8`|Dp3NvL5yg>xAvU
zho|fEA~w^-HrW&H-JwkqNX2I-bEXBR&Uhp+y2^)1h1IIlNCzC!v-Mz@&z&VPz+cl1
z=f&f6Y*U~C`ixm4Sy1hl$hg(4%Dy;bq~k7d1<@K&%%NLT`L+A)-QXyKVswX?op90(
zB#yeFEih@c{OXU8Oq~1CFI_38GXmns3(`;W(i+bslovCx4u7gvK>DrGOug*?G|1nz
z_OR}|ZYS3pq-p?rS7G0qa`TM}r5XqDT4cV>%Qyk#9ES}`jc+Ww|DcbZrF6UG>CeXp
zOVIV}K1e#z9@tu#?X)Ri=?zXMB`X3G-_I7FL-Zq`nbfWtX_EO1*!+U6pJW-_k&+vk
zMd}THh}{(Ch_wPk(PI4vVB_KT76kGxVytLxpWg}&bHw`a3G#QzxV@ICNax&@hk3<_
zBh`Tq66G{-tCw$V{(y0v7l!tp20~@gdFX<t2yAf7TZbU4H+&N0D2hZ^a_6-I(yp$A
zLu-4Y{Ez$etx!T0KE1E^ABgv-=`PL?WxCx2K`NJ9btEB~b!5>jzFbF#bJE7i>T4ux
zQdrF3org^wFcnw$#bQMv@SfN3$Fuo7HnB_`2ZGB{ZqGr>%xP;2_!Q{=N-ZhU1c~^5
zdt=OO#wmcpkXJyCG?{{&n=R{Sn=Ytg;<09CH)l7TA&wkt{Q;>RrA2Ia6-QixEPLrU
z%0)N$3Nh0?U825&<F9?WK3>v($Sz}0G_(!v&xSSAzje4{rup+^W@^}ByqOb95$<wN
z+FlC*OS+|hQqPCLLP#G|{-Gsx{l!c#$SvU|*<FUbs>E0sbwK*%#GP}!6`%*Z@L;&C
z3^dE&>5%bWAXmP<sMdk^(BGixJsS?iR#(S<snG+CmKd<~(&IF$#~B&)6d2mrDuBh-
z`7=YP#+9XUV(~_Bik5uFl#L+MA?9LT<$`)GritanD!@)!d!CK9hHX$6M-ksae^D`j
z3O<QKrMApfW9&BT-mgQopCLGOW;!j??cokAvs0*DB`{2miv0!b50XsS$yAy~y>*X1
z_m}Pivs*u7@9i>qA!58fDCwj^M<1P(u^m;urVdlM@>aIf+E3-d9<VM%qyk!OJVCWh
zPAES=A4hZJY<Q^6E;Y6VV~t?=nmyu9K5i(m`ONw{XX$4$>ZW>fc4cS7w5O3sCmKKn
z+94A?VyfSBb9{}rEbCIYtXORJBCv__fnZ>?a}edaA%bP$jI?J^q0UKO!mduA8U!3b
z0CJ_Js}NWQZoebapVUHP%pPOUm?1<)zd<fq;MhF{ievF2n_&PhASNq*%9zmiH6XNj
zEs=Ea8SWPuzGGlUp!TE-8qB)a23IEsfKm?dH$i1qxCT5^L?@^KA}zidPI#gv8Gk-X
zqM+_@h7X;V9#72a+y&FDD1Goq_JL={tjxBl!n$f3IRf!$mA(-L;%G4SRZ1!Xm1z2f
zhjX-H01}>%`hzUM-Y6g1z|@@3G_kio?S0bcbjQuxJd>vU$Uyz(4*peEDSVc-G;O;%
z9Y97%Tq}TRsH+oN%2u(oyC=W<9`e@&m;i;jC%L;sP(9RBDQnth3;ZMEQNFH3GEf0c
zU<3RF!hNG-vCDooYFS^nPlFnv4(ElI1=vNcr42TF^u<zpNG@plq%<5<WA+sLT^{=-
z*SKa`IfTWbzHQm>q67f{MoN>{f&>xA91r4pz5Zc&@P^i-9||`98v$Si!U@}ouZ88W
zg;YL=OQ;4}UQtkpyd~lD{qWy0H|lwJXKmenz#E=*9kt$YX*X!wDk7ITlIUGWnj>a7
z<_GQR752@J)Y(U)ncu(d<qS5Uh{rKg3^Vr2bD|>Iit7P}oBq8x$FP85)&Nsw<#rOW
z8U_x(1J)Zgm(8tZXU%+(yYcO+Z7#ZszPwa2`ygiMPayX9KondtFMRK!7x`9uWN;(f
zfWW?8yOdj;GA3We0YAW92gWipn(d>zcbA+vZ_21B<GE0ey*BZvJpq=xH`~tz@gx|c
zR1DNG3&a$spo!;l*pkkI8!!LndXN^Ms=PE4MNl|PaHUi;bw5F9BU%~$>xF?-pfcW`
zbqY<k8GOpfKgG8NmJQVzlhFBu6R$nBAX~7++WL0raE6k7#bPQwo<1VA`kZ;~fW)ih
zqRHEcmh$T`EO<YY*CCdJD*xhpHDX3*L_aS^FT1A+oMlXy$~;c#+7(V<3O2N-e%AuZ
z6YUffqFHBX<0db?COgL)pQ{`%3Wzwk*NA!or_{An@fOVM>??6ie(6M)p@6@WQ?Tl7
zoKrKEj|x~2yZehhMLkFRRnOC>XL&L+N;m0B{_OQ9gzzTYb!!Jct=bk?_hIpY9rOwY
zMnr69R(?8EN52qR+k!~qnCYc-KmV&*d$&NY?t5cjR)V+ncMor=puTRoo?{5dH;@!*
z<~RrV!+ljAN+;Qx2LraY&JWnz^|sYbZjP+Y;|pC#DuHUH+>F~x3PqTkx)=OAE0X9(
z(AO6gp~AH^{nq+n)LHYDD8mQN?DDFcd!U&d4PaajzSD1~lXq3p{x=^vItrq3gD^4O
z=hYS`?&C-0&KuAV>Jv}T?ba0IafL$~+bZ}p$9lwyyx=-uPN`Hpvv<)Ia>OWHa4+N4
z6zscrW$^XA32E<j+Ty}+?MPo5Uc!qbGT;`7%Gx?l<xc9YfT7LQ>Jw^7hYtkRJr{Q8
zQ|*1pp_q6Mno|D6EX!kgSv0h0I3~ef_l%$<u(@0`-IS&EL||}ZN1R(*I)Ea^7I-yG
zyXCjhJ-1uF(Uyz)_^9=*N_DY9KS79>DTFjL`0y16n%^dGNQn;2V82mqoIi9i{15vu
zLq&(BTl9CInUjZlTIa>^!!HlMK3W8Sd_Ow0+E8IT?h$=55$^Z)$WYIuig=O;Lp_1Q
z4wOT;XbWQ!>Mh`pdXuSo=K<ST=}P*!xodlEIBHy%5{U$VZS$wEkNsG|u2<Kk)WCyL
zzTvy?7M8&Cfq_5@YIV!+<Rn^wt)5qtp<xK_KFldD3M^WAGlN-UQ|ANEBYVoG0w3xR
zek`?_!aFWQ%$ZEAn=XFHElm{gKzw@Bh0-LNwZ&Zh?yZ%*15_b_Y4{Osz^~4Oum!!<
zse&!G<a}e~Ot7vdkbjYnU^^LjG~ETn>Bba;wT!wK`Hf1Ueh04*%D7Kfj*#b~BNfvz
zsbf?uiMm5-xhaQ|7Om2OrYbU>ngUM9%F5nU<65IFyu(`yZ;Vb1)=wCd!L2K?c$ezE
z4IbS|^?Z>)eEp}ZfjwF)Waw?pPJ?{~*g%;e<TX6&>fxO~Nx7dQGLWZ)cPQ*T!((W-
zGm2?tM)K}7oG<0Xz<`ltWjxvE<$AH!4*R{A2~uYGr@m!vm*j+e#CE9^*}Oc#uihB|
z5;#kMY2^8mrr80%*+02bDx6B{Jsch(d7kQGV7~iGTgFZBu$Pf`tNf`B2{|t7fGhIq
zos0xF#l$bfxOtcGDd*MDbdKBaCKxg<zBS_t!TiI&D&FS>CEbr8JTNd_1bjWC{Ubgk
z9~)9;A1&=FyIt$l!VBXfD~6VCk0fjO%QwLJ7k00RH*%I8cCqF542VzP^;`OU-_?=<
zbV}OoQE)HqV`|)X5+WbgSxGWH>t+7-O;(l~Z+FJJ)sygu^+eF01#Suj+pnAcw!s>p
z$-xF}c>7t9X6H$^V9hvT5H{jKv+=zzWHA0pgw8e5fZpm9vIphVq3%S4*N3%&jsY^Q
zK%sSPuj=?d{ATs0o0y6#0w3%YT^@-_sTuTUwI(Q{;l3KjeAbVk#Wmi%PDxm`zoqQ~
z((<-}*FSP%5gt7uI3t1&75ne{@1^bpdW1;MMGNkSr~UAuDbB4+VQi|x(gdO^zin_)
zncfs2hj8xdiiy)@vVkfkItLKvsGtJh<Ah+N9r4Fk#4j}3)5fp4%$8OPm!2*v85$2i
z15p4UjH=DV!<+L-y~sIS7&k+wwQ@3eBlD0ewG{0*l>rTb0T~tFl4Q3J!flauS==b&
z6B<Vc5wD$nmC_i`0E<AeD?2H<QEoWxP-{X6_i15QJF-Cv-N-NLN9%$|5L;=d6lmF5
z;UuK7x%Cq%N?T&~lD+MeWZ|S<_sZ68ShNa0XXqal>m<Ivi+wgAY*(pVJxOj3;P^Mp
z{Py4Q&hV_4XtqYN^W_`w+k)rhb~b?0`@olx-tL`?jy^9&Cf7sqxSSo^=A<Kc6UYof
z^DkeMP>!g%dDvlCf(St$kVofvH90|9yl-gmvRvcKS&Ye9DdoTK@2m}iSvC{3m%4E0
z@TJD7c1V?!URM7+t?f3)%{X(6JXg~A9TvGQyX6n(^Yt0NX;>vDPcr~mICPooLWA_`
z<1A>FuXr|C)dtDr*PQt%Xs5WePWUB&gBj$zZ#BIY%?jDdpbSA-PV0`dGf^oa_Jp}Z
zlrGV7oe`#B^+nPIQ`ZDJeJas=ru#=*YL#+n?Go}f33>1GsZ{TTy2bdBihj}mz*mp!
zOzn%{WgLM=*CpiuKUs*GnHa{B$2siJqfNi|Z;|rH%stM*8b26kAMCYY&NHwPGtlYn
z7UVx_^sgR$Z8x27foS63FCP<b7NQ@4m$W&a4+pb@c6L8rWcYppH@1D~kD>t|gtcG_
zy#@C|!VQV~TY}G5e57qp?F4jRxqq~@h6^?-cvD>ySwVLl2m7=gERtEn>Fw_@ND%pO
oiVC*mbz<%I+0K1Z`+LWvZ$3~$+A!Gm?^hpSc@||}WrmLVKLvuzv;Y7A

literal 0
HcmV?d00001

diff --git a/3rdparty/timepicker/css/jquery.ui.timepicker.css b/3rdparty/timepicker/css/jquery.ui.timepicker.css
new file mode 100644
index 00000000000..08b442a7e53
--- /dev/null
+++ b/3rdparty/timepicker/css/jquery.ui.timepicker.css
@@ -0,0 +1,69 @@
+/*
+ * Timepicker stylesheet
+ * Highly inspired from datepicker
+ * FG - Nov 2010 - Web3R 
+ *
+ * version 0.0.3 : Fixed some settings, more dynamic
+ * version 0.0.4 : Removed width:100% on tables
+ * version 0.1.1 : set width 0 on tables to fix an ie6 bug
+ */
+
+.ui-timepicker-inline { display: inline; }
+
+#ui-timepicker-div { padding: 0.2em }
+.ui-timepicker-table { display: inline-table; width: 0; }
+.ui-timepicker-table table { margin:0.15em 0 0 0; border-collapse: collapse; }
+
+.ui-timepicker-hours, .ui-timepicker-minutes { padding: 0.2em;  }
+
+.ui-timepicker-table .ui-timepicker-title { line-height: 1.8em; text-align: center; }
+.ui-timepicker-table td { padding: 0.1em; width: 2.2em; }
+.ui-timepicker-table th.periods { padding: 0.1em; width: 2.2em; }
+
+/* span for disabled cells */
+.ui-timepicker-table td span {
+	display:block;
+    padding:0.2em 0.3em 0.2em 0.5em;
+    width: 1.2em;
+
+    text-align:right;
+    text-decoration:none;
+}
+/* anchors for clickable cells */
+.ui-timepicker-table td a {
+    display:block;
+    padding:0.2em 0.3em 0.2em 0.5em;
+    width: 1.2em;
+    cursor: pointer;
+    text-align:right;
+    text-decoration:none;
+}
+
+
+/* buttons and button pane styling */
+.ui-timepicker .ui-timepicker-buttonpane {
+    background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0;
+}
+.ui-timepicker .ui-timepicker-buttonpane button { margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+/* The close button */
+.ui-timepicker .ui-timepicker-close { float: right }
+
+/* the now button */
+.ui-timepicker .ui-timepicker-now { float: left; }
+
+/* the deselect button */
+.ui-timepicker .ui-timepicker-deselect { float: left; }
+
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-timepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}
\ No newline at end of file
diff --git a/3rdparty/timepicker/js/i18n/i18n.html b/3rdparty/timepicker/js/i18n/i18n.html
new file mode 100644
index 00000000000..83cb5e3f30c
--- /dev/null
+++ b/3rdparty/timepicker/js/i18n/i18n.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<title>Internationalisation page for the jquery ui timepicker</title>
+
+    <script src="../include/jquery-1.5.1.min.js"></script>
+    <script src="../include/jquery.ui.core.min.js"></script>
+    <script src="../include/jquery.ui.widget.min.js"></script>
+    <script src="../jquery.ui.timepicker.js"></script>
+    
+    <link rel="stylesheet" href="../include/jquery-ui-1.8.14.custom.css" />
+    <link rel="stylesheet" href="../jquery.ui.timepicker.css" />
+    <style>
+        #timepicker { font-size: 10px }
+    </style>
+
+    <script src='jquery.ui.timepicker-de.js'></script>
+    <script src='jquery.ui.timepicker-fr.js'></script>
+    <script src='jquery.ui.timepicker-ja.js'></script>
+</head>
+<body>
+
+    <script type="text/javascript">
+        $(document).ready(function() {
+
+            $.timepicker.setDefaults( $.timepicker.regional[ "" ] );
+
+            $('#timepicker').timepicker({
+                showCloseButton: true,
+                showNowButton: true,
+                showDeselectButton: true
+            });
+
+            $('#locale').change(function() {
+                $('#timepicker').timepicker( "option",
+                				$.timepicker.regional[ $( this ).val() ] );
+            });
+        });
+    </script>
+
+    Select a localisation :
+    <select id='locale'>
+        <option value='fr'>Fran&ccedil;ais</option>
+        <option value='de'>Deutsch</option>
+        <option value='ja'>Japanese</option>
+    </select>
+
+    <br>
+
+    <div id="timepicker">
+
+    </div>
+
+    <br>
+
+    List of localisations : 
+<ul>
+    <li>
+        <a href="jquery.ui.timepicker-de.js">Deutsch (jquery.ui.timepicker-de.js</a>
+    </li>
+    
+    <li>
+        <a href="jquery.ui.timepicker-fr.js">Fran&ccedil;ais (jquery.ui.timepicker-fr.js</a>
+    </li>
+
+    <li>
+        <a href="jquery.ui.timepicker-ja.js">Japanese (jquery.ui.timepicker-ja.js</a>
+    </li>
+
+</ul>
+
+</body>
\ No newline at end of file
diff --git a/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js b/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js
new file mode 100644
index 00000000000..c010a498e15
--- /dev/null
+++ b/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js
@@ -0,0 +1,9 @@
+/* Deutsch initialisation for the timepicker plugin */
+/* Written by Bernd Plagge (bplagge@choicenet.ne.jp). */
+jQuery(function($){
+    $.timepicker.regional['de'] = {
+                hourText: 'Stunde',
+                minuteText: 'Minuten',
+                amPmText: ['AM', 'PM'] }
+    $.timepicker.setDefaults($.timepicker.regional['de']);
+});
\ No newline at end of file
diff --git a/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-fr.js b/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-fr.js
new file mode 100644
index 00000000000..bd37d731c8d
--- /dev/null
+++ b/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-fr.js
@@ -0,0 +1,13 @@
+/* French initialisation for the jQuery time picker plugin. */
+/* Written by Bernd Plagge (bplagge@choicenet.ne.jp),
+              Francois Gelinas (frank@fgelinas.com) */
+jQuery(function($){
+    $.timepicker.regional['fr'] = {
+                hourText: 'Heures',
+                minuteText: 'Minutes',
+                amPmText: ['AM', 'PM'],
+                closeButtonText: 'Fermer',
+                nowButtonText: 'Maintenant',
+                deselectButtonText: 'Désélectionner' }
+    $.timepicker.setDefaults($.timepicker.regional['fr']);
+});
\ No newline at end of file
diff --git a/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js b/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js
new file mode 100644
index 00000000000..01b2c8a3de5
--- /dev/null
+++ b/3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js
@@ -0,0 +1,9 @@
+/* Japanese initialisation for the jQuery time picker plugin. */
+/* Written by Bernd Plagge (bplagge@choicenet.ne.jp). */
+jQuery(function($){
+    $.timepicker.regional['ja'] = {
+                hourText: '時間',
+                minuteText: '分',
+                amPmText: ['��', '�後'] }
+    $.timepicker.setDefaults($.timepicker.regional['ja']);
+});
diff --git a/3rdparty/timepicker/js/jquery.ui.timepicker.js b/3rdparty/timepicker/js/jquery.ui.timepicker.js
new file mode 100644
index 00000000000..d086b674b7b
--- /dev/null
+++ b/3rdparty/timepicker/js/jquery.ui.timepicker.js
@@ -0,0 +1,1345 @@
+/*
+ * jQuery UI Timepicker 0.2.9
+ *
+ * Copyright 2010-2011, Francois Gelinas
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://fgelinas.com/code/timepicker
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *  jquery.ui.position.js (only if position settngs are used)
+ *
+ * Change version 0.1.0 - moved the t-rex up here
+ *
+                                                  ____
+       ___                                      .-~. /_"-._
+      `-._~-.                                  / /_ "~o\  :Y
+          \  \                                / : \~x.  ` ')
+           ]  Y                              /  |  Y< ~-.__j
+          /   !                        _.--~T : l  l<  /.-~
+         /   /                 ____.--~ .   ` l /~\ \<|Y
+        /   /             .-~~"        /| .    ',-~\ \L|
+       /   /             /     .^   \ Y~Y \.^>/l_   "--'
+      /   Y           .-"(  .  l__  j_j l_/ /~_.-~    .
+     Y    l          /    \  )    ~~~." / `/"~ / \.__/l_
+     |     \     _.-"      ~-{__     l  :  l._Z~-.___.--~
+     |      ~---~           /   ~~"---\_  ' __[>
+     l  .                _.^   ___     _>-y~
+      \  \     .      .-~   .-~   ~>--"  /
+       \  ~---"            /     ./  _.-'
+        "-.,_____.,_  _.--~\     _.-~
+                    ~~     (   _}       -Row
+                           `. ~(
+                             )  \
+                            /,`--'~\--'~\
+                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                             ->T-Rex<-
+*/
+
+(function ($, undefined) {
+
+    $.extend($.ui, { timepicker: { version: "0.2.9"} });
+
+    var PROP_NAME = 'timepicker';
+    var tpuuid = new Date().getTime();
+
+    /* Time picker manager.
+    Use the singleton instance of this class, $.timepicker, to interact with the time picker.
+    Settings for (groups of) time pickers are maintained in an instance object,
+    allowing multiple different settings on the same page. */
+
+    function Timepicker() {
+        this.debug = true; // Change this to true to start debugging
+        this._curInst = null; // The current instance in use
+        this._isInline = false; // true if the instance is displayed inline
+        this._disabledInputs = []; // List of time picker inputs that have been disabled
+        this._timepickerShowing = false; // True if the popup picker is showing , false if not
+        this._inDialog = false; // True if showing within a "dialog", false if not
+        this._dialogClass = 'ui-timepicker-dialog'; // The name of the dialog marker class
+        this._mainDivId = 'ui-timepicker-div'; // The ID of the main timepicker division
+        this._inlineClass = 'ui-timepicker-inline'; // The name of the inline marker class
+        this._currentClass = 'ui-timepicker-current'; // The name of the current hour / minutes marker class
+        this._dayOverClass = 'ui-timepicker-days-cell-over'; // The name of the day hover marker class
+
+        this.regional = []; // Available regional settings, indexed by language code
+        this.regional[''] = { // Default regional settings
+            hourText: 'Hour',           // Display text for hours section
+            minuteText: 'Minute',       // Display text for minutes link
+            amPmText: ['AM', 'PM'],     // Display text for AM PM
+            closeButtonText: 'Done',        // Text for the confirmation button (ok button)
+            nowButtonText: 'Now',           // Text for the now button
+            deselectButtonText: 'Deselect'  // Text for the deselect button
+        };
+        this._defaults = { // Global defaults for all the time picker instances
+            showOn: 'focus',    // 'focus' for popup on focus,
+                                // 'button' for trigger button, or 'both' for either (not yet implemented)
+            button: null,                   // 'button' element that will trigger the timepicker
+            showAnim: 'fadeIn',             // Name of jQuery animation for popup
+            showOptions: {},                // Options for enhanced animations
+            appendText: '',                 // Display text following the input box, e.g. showing the format
+
+            beforeShow: null,               // Define a callback function executed before the timepicker is shown
+            onSelect: null,                 // Define a callback function when a hour / minutes is selected
+            onClose: null,                  // Define a callback function when the timepicker is closed
+
+            timeSeparator: ':',             // The character to use to separate hours and minutes.
+            periodSeparator: ' ',           // The character to use to separate the time from the time period.
+            showPeriod: false,              // Define whether or not to show AM/PM with selected time
+            showPeriodLabels: true,         // Show the AM/PM labels on the left of the time picker
+            showLeadingZero: true,          // Define whether or not to show a leading zero for hours < 10. [true/false]
+            showMinutesLeadingZero: true,   // Define whether or not to show a leading zero for minutes < 10.
+            altField: '',                   // Selector for an alternate field to store selected time into
+            defaultTime: 'now',             // Used as default time when input field is empty or for inline timePicker
+                                            // (set to 'now' for the current time, '' for no highlighted time)
+            myPosition: 'left top',         // Position of the dialog relative to the input.
+                                            // see the position utility for more info : http://jqueryui.com/demos/position/
+            atPosition: 'left bottom',      // Position of the input element to match
+                                            // Note : if the position utility is not loaded, the timepicker will attach left top to left bottom
+            //NEW: 2011-02-03
+            onHourShow: null,			    // callback for enabling / disabling on selectable hours  ex : function(hour) { return true; }
+            onMinuteShow: null,             // callback for enabling / disabling on time selection  ex : function(hour,minute) { return true; }
+
+            hours: {
+                starts: 0,                  // first displayed hour
+                ends: 23                    // last displayed hour
+            },
+            minutes: {
+                starts: 0,                  // first displayed minute
+                ends: 55,                   // last displayed minute
+                interval: 5                 // interval of displayed minutes
+            },
+            rows: 4,                        // number of rows for the input tables, minimum 2, makes more sense if you use multiple of 2
+            // 2011-08-05 0.2.4
+            showHours: true,                // display the hours section of the dialog
+            showMinutes: true,              // display the minute section of the dialog
+            optionalMinutes: false,         // optionally parse inputs of whole hours with minutes omitted
+						
+            // buttons
+            showCloseButton: false,         // shows an OK button to confirm the edit
+            showNowButton: false,           // Shows the 'now' button
+            showDeselectButton: false       // Shows the deselect time button
+
+        };
+        $.extend(this._defaults, this.regional['']);
+
+        this.tpDiv = $('<div id="' + this._mainDivId + '" class="ui-timepicker ui-widget ui-helper-clearfix ui-corner-all " style="display: none"></div>');
+    }
+
+    $.extend(Timepicker.prototype, {
+        /* Class name added to elements to indicate already configured with a time picker. */
+        markerClassName: 'hasTimepicker',
+
+        /* Debug logging (if enabled). */
+        log: function () {
+            if (this.debug)
+                console.log.apply('', arguments);
+        },
+
+        _widgetTimepicker: function () {
+            return this.tpDiv;
+        },
+
+        /* Override the default settings for all instances of the time picker.
+        @param  settings  object - the new settings to use as defaults (anonymous object)
+        @return the manager object */
+        setDefaults: function (settings) {
+            extendRemove(this._defaults, settings || {});
+            return this;
+        },
+
+        /* Attach the time picker to a jQuery selection.
+        @param  target    element - the target input field or division or span
+        @param  settings  object - the new settings to use for this time picker instance (anonymous) */
+        _attachTimepicker: function (target, settings) {
+            // check for settings on the control itself - in namespace 'time:'
+            var inlineSettings = null;
+            for (var attrName in this._defaults) {
+                var attrValue = target.getAttribute('time:' + attrName);
+                if (attrValue) {
+                    inlineSettings = inlineSettings || {};
+                    try {
+                        inlineSettings[attrName] = eval(attrValue);
+                    } catch (err) {
+                        inlineSettings[attrName] = attrValue;
+                    }
+                }
+            }
+            var nodeName = target.nodeName.toLowerCase();
+            var inline = (nodeName == 'div' || nodeName == 'span');
+
+            if (!target.id) {
+                this.uuid += 1;
+                target.id = 'tp' + this.uuid;
+            }
+            var inst = this._newInst($(target), inline);
+            inst.settings = $.extend({}, settings || {}, inlineSettings || {});
+            if (nodeName == 'input') {
+                this._connectTimepicker(target, inst);
+                // init inst.hours and inst.minutes from the input value
+                this._setTimeFromField(inst);
+            } else if (inline) {
+                this._inlineTimepicker(target, inst);
+            }
+
+
+        },
+
+        /* Create a new instance object. */
+        _newInst: function (target, inline) {
+            var id = target[0].id.replace(/([^A-Za-z0-9_-])/g, '\\\\$1'); // escape jQuery meta chars
+            return {
+                id: id, input: target, // associated target
+                inline: inline, // is timepicker inline or not :
+                tpDiv: (!inline ? this.tpDiv : // presentation div
+                    $('<div class="' + this._inlineClass + ' ui-timepicker ui-widget  ui-helper-clearfix"></div>'))
+            };
+        },
+
+        /* Attach the time picker to an input field. */
+        _connectTimepicker: function (target, inst) {
+            var input = $(target);
+            inst.append = $([]);
+            inst.trigger = $([]);
+            if (input.hasClass(this.markerClassName)) { return; }
+            this._attachments(input, inst);
+            input.addClass(this.markerClassName).
+                keydown(this._doKeyDown).
+                keyup(this._doKeyUp).
+                bind("setData.timepicker", function (event, key, value) {
+                    inst.settings[key] = value;
+                }).
+                bind("getData.timepicker", function (event, key) {
+                    return this._get(inst, key);
+                });
+            $.data(target, PROP_NAME, inst);
+        },
+
+        /* Handle keystrokes. */
+        _doKeyDown: function (event) {
+            var inst = $.timepicker._getInst(event.target);
+            var handled = true;
+            inst._keyEvent = true;
+            if ($.timepicker._timepickerShowing) {
+                switch (event.keyCode) {
+                    case 9: $.timepicker._hideTimepicker();
+                        handled = false;
+                        break; // hide on tab out
+                    case 13:
+                        $.timepicker._updateSelectedValue(inst);
+                        $.timepicker._hideTimepicker();
+                            
+						return false; // don't submit the form
+						break; // select the value on enter
+                    case 27: $.timepicker._hideTimepicker();
+                        break; // hide on escape
+                    default: handled = false;
+                }
+            }
+            else if (event.keyCode == 36 && event.ctrlKey) { // display the time picker on ctrl+home
+                $.timepicker._showTimepicker(this);
+            }
+            else {
+                handled = false;
+            }
+            if (handled) {
+                event.preventDefault();
+                event.stopPropagation();
+            }
+        },
+
+        /* Update selected time on keyUp */
+        /* Added verion 0.0.5 */
+        _doKeyUp: function (event) {
+            var inst = $.timepicker._getInst(event.target);
+            $.timepicker._setTimeFromField(inst);
+            $.timepicker._updateTimepicker(inst);
+        },
+
+        /* Make attachments based on settings. */
+        _attachments: function (input, inst) {
+            var appendText = this._get(inst, 'appendText');
+            var isRTL = this._get(inst, 'isRTL');
+            if (inst.append) { inst.append.remove(); }
+            if (appendText) {
+                inst.append = $('<span class="' + this._appendClass + '">' + appendText + '</span>');
+                input[isRTL ? 'before' : 'after'](inst.append);
+            }
+            input.unbind('focus.timepicker', this._showTimepicker);
+            if (inst.trigger) { inst.trigger.remove(); }
+
+            var showOn = this._get(inst, 'showOn');
+            if (showOn == 'focus' || showOn == 'both') { // pop-up time picker when in the marked field
+                input.bind("focus.timepicker", this._showTimepicker);
+            }
+            if (showOn == 'button' || showOn == 'both') { // pop-up time picker when 'button' element is clicked
+                var button = this._get(inst, 'button');
+                $(button).bind("click.timepicker", function () {
+                    if ($.timepicker._timepickerShowing && $.timepicker._lastInput == input[0]) { $.timepicker._hideTimepicker(); }
+                    else { $.timepicker._showTimepicker(input[0]); }
+                    return false;
+                });
+
+            }
+        },
+
+
+        /* Attach an inline time picker to a div. */
+        _inlineTimepicker: function(target, inst) {
+            var divSpan = $(target);
+            if (divSpan.hasClass(this.markerClassName))
+                return;
+            divSpan.addClass(this.markerClassName).append(inst.tpDiv).
+                bind("setData.timepicker", function(event, key, value){
+                    inst.settings[key] = value;
+                }).bind("getData.timepicker", function(event, key){
+                    return this._get(inst, key);
+                });
+            $.data(target, PROP_NAME, inst);
+
+            this._setTimeFromField(inst);
+            this._updateTimepicker(inst);
+            inst.tpDiv.show();
+        },
+
+        /* Pop-up the time picker for a given input field.
+        @param  input  element - the input field attached to the time picker or
+        event - if triggered by focus */
+        _showTimepicker: function (input) {
+            input = input.target || input;
+            if (input.nodeName.toLowerCase() != 'input') { input = $('input', input.parentNode)[0]; } // find from button/image trigger
+            if ($.timepicker._isDisabledTimepicker(input) || $.timepicker._lastInput == input) { return; } // already here
+
+            // fix v 0.0.8 - close current timepicker before showing another one
+            $.timepicker._hideTimepicker();
+
+            var inst = $.timepicker._getInst(input);
+            if ($.timepicker._curInst && $.timepicker._curInst != inst) {
+                $.timepicker._curInst.tpDiv.stop(true, true);
+            }
+            var beforeShow = $.timepicker._get(inst, 'beforeShow');
+            extendRemove(inst.settings, (beforeShow ? beforeShow.apply(input, [input, inst]) : {}));
+            inst.lastVal = null;
+            $.timepicker._lastInput = input;
+
+            $.timepicker._setTimeFromField(inst);
+
+            // calculate default position
+            if ($.timepicker._inDialog) { input.value = ''; } // hide cursor
+            if (!$.timepicker._pos) { // position below input
+                $.timepicker._pos = $.timepicker._findPos(input);
+                $.timepicker._pos[1] += input.offsetHeight; // add the height
+            }
+            var isFixed = false;
+            $(input).parents().each(function () {
+                isFixed |= $(this).css('position') == 'fixed';
+                return !isFixed;
+            });
+            if (isFixed && $.browser.opera) { // correction for Opera when fixed and scrolled
+                $.timepicker._pos[0] -= document.documentElement.scrollLeft;
+                $.timepicker._pos[1] -= document.documentElement.scrollTop;
+            }
+
+            var offset = { left: $.timepicker._pos[0], top: $.timepicker._pos[1] };
+
+            $.timepicker._pos = null;
+            // determine sizing offscreen
+            inst.tpDiv.css({ position: 'absolute', display: 'block', top: '-1000px' });
+            $.timepicker._updateTimepicker(inst);
+
+
+            // position with the ui position utility, if loaded
+            if ( ( ! inst.inline )  && ( typeof $.ui.position == 'object' ) ) {
+                inst.tpDiv.position({
+                    of: inst.input,
+                    my: $.timepicker._get( inst, 'myPosition' ),
+                    at: $.timepicker._get( inst, 'atPosition' ),
+                    // offset: $( "#offset" ).val(),
+                    // using: using,
+                    collision: 'flip'
+                });
+                var offset = inst.tpDiv.offset();
+                $.timepicker._pos = [offset.top, offset.left];
+            }
+
+
+            // reset clicked state
+            inst._hoursClicked = false;
+            inst._minutesClicked = false;
+
+            // fix width for dynamic number of time pickers
+            // and adjust position before showing
+            offset = $.timepicker._checkOffset(inst, offset, isFixed);
+            inst.tpDiv.css({ position: ($.timepicker._inDialog && $.blockUI ?
+			    'static' : (isFixed ? 'fixed' : 'absolute')), display: 'none',
+                left: offset.left + 'px', top: offset.top + 'px'
+            });
+            if ( ! inst.inline ) {
+                var showAnim = $.timepicker._get(inst, 'showAnim');
+                var duration = $.timepicker._get(inst, 'duration');
+
+                var postProcess = function () {
+                    $.timepicker._timepickerShowing = true;
+                    var borders = $.timepicker._getBorders(inst.tpDiv);
+                    inst.tpDiv.find('iframe.ui-timepicker-cover'). // IE6- only
+					css({ left: -borders[0], top: -borders[1],
+					    width: inst.tpDiv.outerWidth(), height: inst.tpDiv.outerHeight()
+					});
+                };
+
+                // Fixed the zIndex problem for real (I hope) - FG - v 0.2.9
+                inst.tpDiv.css('zIndex', $.timepicker._getZIndex(input) +1);
+
+                if ($.effects && $.effects[showAnim]) {
+                    inst.tpDiv.show(showAnim, $.timepicker._get(inst, 'showOptions'), duration, postProcess);
+                }
+                else {
+                    inst.tpDiv[showAnim || 'show']((showAnim ? duration : null), postProcess);
+                }
+                if (!showAnim || !duration) { postProcess(); }
+                if (inst.input.is(':visible') && !inst.input.is(':disabled')) { inst.input.focus(); }
+                $.timepicker._curInst = inst;
+            }
+        },
+
+        // This is a copy of the zIndex function of UI core 1.8.??
+        // Copied in the timepicker to stay backward compatible.
+        _getZIndex: function (target) {
+            var elem = $( target ), position, value;
+            while ( elem.length && elem[ 0 ] !== document ) {
+                position = elem.css( "position" );
+                if ( position === "absolute" || position === "relative" || position === "fixed" ) {
+                    value = parseInt( elem.css( "zIndex" ), 10 );
+                    if ( !isNaN( value ) && value !== 0 ) {
+                        return value;
+                    }
+                }
+                elem = elem.parent();
+            }
+        },
+
+        /* Generate the time picker content. */
+        _updateTimepicker: function (inst) {
+            inst.tpDiv.empty().append(this._generateHTML(inst));
+            this._rebindDialogEvents(inst);
+
+        },
+
+        _rebindDialogEvents: function (inst) {
+            var borders = $.timepicker._getBorders(inst.tpDiv),
+                self = this;
+            inst.tpDiv
+			.find('iframe.ui-timepicker-cover') // IE6- only
+				.css({ left: -borders[0], top: -borders[1],
+				    width: inst.tpDiv.outerWidth(), height: inst.tpDiv.outerHeight()
+				})
+			.end()
+            // after the picker html is appended bind the click & double click events (faster in IE this way
+            // then letting the browser interpret the inline events)
+            // the binding for the minute cells also exists in _updateMinuteDisplay
+            .find('.ui-timepicker-minute-cell')
+                .unbind()
+                .bind("click", { fromDoubleClick:false }, $.proxy($.timepicker.selectMinutes, this))
+                .bind("dblclick", { fromDoubleClick:true }, $.proxy($.timepicker.selectMinutes, this))
+            .end()
+            .find('.ui-timepicker-hour-cell')
+                .unbind()
+                .bind("click", { fromDoubleClick:false }, $.proxy($.timepicker.selectHours, this))
+                .bind("dblclick", { fromDoubleClick:true }, $.proxy($.timepicker.selectHours, this))
+            .end()
+			.find('.ui-timepicker td a')
+                .unbind()
+				.bind('mouseout', function () {
+				    $(this).removeClass('ui-state-hover');
+				    if (this.className.indexOf('ui-timepicker-prev') != -1) $(this).removeClass('ui-timepicker-prev-hover');
+				    if (this.className.indexOf('ui-timepicker-next') != -1) $(this).removeClass('ui-timepicker-next-hover');
+				})
+				.bind('mouseover', function () {
+				    if ( ! self._isDisabledTimepicker(inst.inline ? inst.tpDiv.parent()[0] : inst.input[0])) {
+				        $(this).parents('.ui-timepicker-calendar').find('a').removeClass('ui-state-hover');
+				        $(this).addClass('ui-state-hover');
+				        if (this.className.indexOf('ui-timepicker-prev') != -1) $(this).addClass('ui-timepicker-prev-hover');
+				        if (this.className.indexOf('ui-timepicker-next') != -1) $(this).addClass('ui-timepicker-next-hover');
+				    }
+				})
+			.end()
+			.find('.' + this._dayOverClass + ' a')
+				.trigger('mouseover')
+			.end()
+            .find('.ui-timepicker-now').bind("click",function(e) {
+                    $.timepicker.selectNow(e);
+            }).end()
+            .find('.ui-timepicker-deselect').bind("click",function(e) {
+                    $.timepicker.deselectTime(e);
+            }).end()
+            .find('.ui-timepicker-close').bind("click",function(e) {
+                    $.timepicker._hideTimepicker();
+            }).end();
+        },
+
+        /* Generate the HTML for the current state of the time picker. */
+        _generateHTML: function (inst) {
+
+            var h, m, row, col, html, hoursHtml, minutesHtml = '',
+                showPeriod = (this._get(inst, 'showPeriod') == true),
+                showPeriodLabels = (this._get(inst, 'showPeriodLabels') == true),
+                showLeadingZero = (this._get(inst, 'showLeadingZero') == true),
+                showHours = (this._get(inst, 'showHours') == true),
+                showMinutes = (this._get(inst, 'showMinutes') == true),
+                amPmText = this._get(inst, 'amPmText'),
+                rows = this._get(inst, 'rows'),
+                amRows = 0,
+                pmRows = 0,
+                amItems = 0,
+                pmItems = 0,
+                amFirstRow = 0,
+                pmFirstRow = 0,
+                hours = Array(),
+                hours_options = this._get(inst, 'hours'),
+                hoursPerRow = null,
+                hourCounter = 0,
+                hourLabel = this._get(inst, 'hourText'),
+                showCloseButton = this._get(inst, 'showCloseButton'),
+                closeButtonText = this._get(inst, 'closeButtonText'),
+                showNowButton = this._get(inst, 'showNowButton'),
+                nowButtonText = this._get(inst, 'nowButtonText'),
+                showDeselectButton = this._get(inst, 'showDeselectButton'),
+                deselectButtonText = this._get(inst, 'deselectButtonText'),
+                showButtonPanel = showCloseButton || showNowButton || showDeselectButton;
+            
+
+
+            // prepare all hours and minutes, makes it easier to distribute by rows
+            for (h = hours_options.starts; h <= hours_options.ends; h++) {
+                hours.push (h);
+            }
+            hoursPerRow = Math.ceil(hours.length / rows); // always round up
+
+            if (showPeriodLabels) {
+                for (hourCounter = 0; hourCounter < hours.length; hourCounter++) {
+                    if (hours[hourCounter] < 12) {
+                        amItems++;
+                    }
+                    else {
+                        pmItems++;
+                    }
+                }
+                hourCounter = 0; 
+
+                amRows = Math.floor(amItems / hours.length * rows);
+                pmRows = Math.floor(pmItems / hours.length * rows);
+
+                // assign the extra row to the period that is more densly populated
+                if (rows != amRows + pmRows) {
+                    // Make sure: AM Has Items and either PM Does Not, AM has no rows yet, or AM is more dense
+                    if (amItems && (!pmItems || !amRows || (pmRows && amItems / amRows >= pmItems / pmRows))) {
+                        amRows++;
+                    } else {
+                        pmRows++;
+                    }
+                }
+                amFirstRow = Math.min(amRows, 1);
+                pmFirstRow = amRows + 1;
+                hoursPerRow = Math.ceil(Math.max(amItems / amRows, pmItems / pmRows));
+            }
+
+
+            html = '<table class="ui-timepicker-table ui-widget-content ui-corner-all"><tr>';
+
+            if (showHours) {
+
+                html += '<td class="ui-timepicker-hours">' +
+                        '<div class="ui-timepicker-title ui-widget-header ui-helper-clearfix ui-corner-all">' +
+                        hourLabel +
+                        '</div>' +
+                        '<table class="ui-timepicker">';
+
+                for (row = 1; row <= rows; row++) {
+                    html += '<tr>';
+                    // AM
+                    if (row == amFirstRow && showPeriodLabels) {
+                        html += '<th rowspan="' + amRows.toString() + '" class="periods" scope="row">' + amPmText[0] + '</th>';
+                    }
+                    // PM
+                    if (row == pmFirstRow && showPeriodLabels) {
+                        html += '<th rowspan="' + pmRows.toString() + '" class="periods" scope="row">' + amPmText[1] + '</th>';
+                    }
+                    for (col = 1; col <= hoursPerRow; col++) {
+                        if (showPeriodLabels && row < pmFirstRow && hours[hourCounter] >= 12) {
+                            html += this._generateHTMLHourCell(inst, undefined, showPeriod, showLeadingZero);
+                        } else {
+                            html += this._generateHTMLHourCell(inst, hours[hourCounter], showPeriod, showLeadingZero);
+                            hourCounter++;
+                        }
+                    }
+                    html += '</tr>';
+                }
+                html += '</tr></table>' + // Close the hours cells table
+                        '</td>';          // Close the Hour td
+            }
+
+            if (showMinutes) {
+                html += '<td class="ui-timepicker-minutes">';
+                html += this._generateHTMLMinutes(inst);
+                html += '</td>';
+            }
+            
+            html += '</tr>';
+
+
+            if (showButtonPanel) {
+                var buttonPanel = '<tr><td colspan="3"><div class="ui-timepicker-buttonpane ui-widget-content">';
+                if (showNowButton) {
+                    buttonPanel += '<button type="button" class="ui-timepicker-now ui-state-default ui-corner-all" '
+                                   + ' data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" >'
+                                   + nowButtonText + '</button>';
+                }
+                if (showDeselectButton) {
+                    buttonPanel += '<button type="button" class="ui-timepicker-deselect ui-state-default ui-corner-all" '
+                                   + ' data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" >'
+                                   + deselectButtonText + '</button>';
+                }
+                if (showCloseButton) {
+                    buttonPanel += '<button type="button" class="ui-timepicker-close ui-state-default ui-corner-all" '
+                                   + ' data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" >'
+                                   + closeButtonText + '</button>';
+                }
+
+                html += buttonPanel + '</div></td></tr>';
+            }
+            html += '</table>';
+
+             /* IE6 IFRAME FIX (taken from datepicker 1.5.3, fixed in 0.1.2 */
+            html += ($.browser.msie && parseInt($.browser.version,10) < 7 && !inst.inline ?
+                '<iframe src="javascript:false;" class="ui-timepicker-cover" frameborder="0"></iframe>' : '');
+
+            return html;
+        },
+
+        /* Special function that update the minutes selection in currently visible timepicker
+         * called on hour selection when onMinuteShow is defined  */
+        _updateMinuteDisplay: function (inst) {
+            var newHtml = this._generateHTMLMinutes(inst);
+            inst.tpDiv.find('td.ui-timepicker-minutes').html(newHtml);
+            this._rebindDialogEvents(inst);
+                // after the picker html is appended bind the click & double click events (faster in IE this way
+                // then letting the browser interpret the inline events)
+                // yes I know, duplicate code, sorry
+/*                .find('.ui-timepicker-minute-cell')
+                    .bind("click", { fromDoubleClick:false }, $.proxy($.timepicker.selectMinutes, this))
+                    .bind("dblclick", { fromDoubleClick:true }, $.proxy($.timepicker.selectMinutes, this));
+*/
+
+        },
+
+        /*
+         * Generate the minutes table
+         * This is separated from the _generateHTML function because is can be called separately (when hours changes)
+         */
+        _generateHTMLMinutes: function (inst) {
+
+            var m, row, html = '',
+                rows = this._get(inst, 'rows'),
+                minutes = Array(),
+                minutes_options = this._get(inst, 'minutes'),
+                minutesPerRow = null,
+                minuteCounter = 0,
+                showMinutesLeadingZero = (this._get(inst, 'showMinutesLeadingZero') == true),
+                onMinuteShow = this._get(inst, 'onMinuteShow'),
+                minuteLabel = this._get(inst, 'minuteText');
+
+            if ( ! minutes_options.starts) {
+                minutes_options.starts = 0;
+            }
+            if ( ! minutes_options.ends) {
+                minutes_options.ends = 59;
+            }
+            for (m = minutes_options.starts; m <= minutes_options.ends; m += minutes_options.interval) {
+                minutes.push(m);
+            }
+            minutesPerRow = Math.round(minutes.length / rows + 0.49); // always round up
+
+            /*
+             * The minutes table
+             */
+            // if currently selected minute is not enabled, we have a problem and need to select a new minute.
+            if (onMinuteShow &&
+                (onMinuteShow.apply((inst.input ? inst.input[0] : null), [inst.hours , inst.minutes]) == false) ) {
+                // loop minutes and select first available
+                for (minuteCounter = 0; minuteCounter < minutes.length; minuteCounter += 1) {
+                    m = minutes[minuteCounter];
+                    if (onMinuteShow.apply((inst.input ? inst.input[0] : null), [inst.hours, m])) {
+                        inst.minutes = m;
+                        break;
+                    }
+                }
+            }
+
+
+
+            html += '<div class="ui-timepicker-title ui-widget-header ui-helper-clearfix ui-corner-all">' +
+                    minuteLabel +
+                    '</div>' +
+                    '<table class="ui-timepicker">';
+            
+            minuteCounter = 0;
+            for (row = 1; row <= rows; row++) {
+                html += '<tr>';
+                while (minuteCounter < row * minutesPerRow) {
+                    var m = minutes[minuteCounter];
+                    var displayText = '';
+                    if (m !== undefined ) {
+                        displayText = (m < 10) && showMinutesLeadingZero ? "0" + m.toString() : m.toString();
+                    }
+                    html += this._generateHTMLMinuteCell(inst, m, displayText);
+                    minuteCounter++;
+                }
+                html += '</tr>';
+            }
+
+            html += '</table>';
+
+            return html;
+        },
+
+        /* Generate the content of a "Hour" cell */
+        _generateHTMLHourCell: function (inst, hour, showPeriod, showLeadingZero) {
+
+            var displayHour = hour;
+            if ((hour > 12) && showPeriod) {
+                displayHour = hour - 12;
+            }
+            if ((displayHour == 0) && showPeriod) {
+                displayHour = 12;
+            }
+            if ((displayHour < 10) && showLeadingZero) {
+                displayHour = '0' + displayHour;
+            }
+
+            var html = "";
+            var enabled = true;
+            var onHourShow = this._get(inst, 'onHourShow');		//custom callback
+
+            if (hour == undefined) {
+                html = '<td><span class="ui-state-default ui-state-disabled">&nbsp;</span></td>';
+                return html;
+            }
+
+            if (onHourShow) {
+            	enabled = onHourShow.apply((inst.input ? inst.input[0] : null), [hour]);
+            }
+
+            if (enabled) {
+                html = '<td class="ui-timepicker-hour-cell" data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" data-hour="' + hour.toString() + '">' +
+                   '<a class="ui-state-default ' +
+                   (hour == inst.hours ? 'ui-state-active' : '') +
+                   '">' +
+                   displayHour.toString() +
+                   '</a></td>';
+            }
+            else {
+            	html =
+            		'<td>' +
+		                '<span class="ui-state-default ui-state-disabled ' +
+		                (hour == inst.hours ? ' ui-state-active ' : ' ') +
+		                '">' +
+		                displayHour.toString() +
+		                '</span>' +
+		            '</td>';
+            }
+            return html;
+        },
+
+        /* Generate the content of a "Hour" cell */
+        _generateHTMLMinuteCell: function (inst, minute, displayText) {
+        	 var html = "";
+             var enabled = true;
+             var onMinuteShow = this._get(inst, 'onMinuteShow');		//custom callback
+             if (onMinuteShow) {
+            	 //NEW: 2011-02-03  we should give the hour as a parameter as well!
+             	enabled = onMinuteShow.apply((inst.input ? inst.input[0] : null), [inst.hours,minute]);		//trigger callback
+             }
+
+             if (minute == undefined) {
+                 html = '<td><span class="ui-state-default ui-state-disabled">&nbsp;</span></td>';
+                 return html;
+             }
+
+             if (enabled) {
+	             html = '<td class="ui-timepicker-minute-cell" data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" data-minute="' + minute.toString() + '" >' +
+	                   '<a class="ui-state-default ' +
+	                   (minute == inst.minutes ? 'ui-state-active' : '') +
+	                   '" >' +
+	                   displayText +
+	                   '</a></td>';
+             }
+             else {
+
+            	html = '<td>' +
+	                 '<span class="ui-state-default ui-state-disabled" >' +
+	                 	displayText +
+	                 '</span>' +
+                 '</td>';
+             }
+             return html;
+        },
+
+
+        /* Enable the date picker to a jQuery selection.
+           @param  target    element - the target input field or division or span */
+        _enableTimepicker: function(target) {
+            var $target = $(target),
+                target_id = $target.attr('id'),
+                inst = $.data(target, PROP_NAME);
+            
+            if (!$target.hasClass(this.markerClassName)) {
+                return;
+            }
+            var nodeName = target.nodeName.toLowerCase();
+            if (nodeName == 'input') {
+                target.disabled = false;
+                inst.trigger.filter('button').
+                    each(function() { this.disabled = false; }).end();
+            }
+            else if (nodeName == 'div' || nodeName == 'span') {
+                var inline = $target.children('.' + this._inlineClass);
+                inline.children().removeClass('ui-state-disabled');
+            }
+            this._disabledInputs = $.map(this._disabledInputs,
+                function(value) { return (value == target_id ? null : value); }); // delete entry
+        },
+
+        /* Disable the time picker to a jQuery selection.
+           @param  target    element - the target input field or division or span */
+        _disableTimepicker: function(target) {
+            var $target = $(target);
+            var inst = $.data(target, PROP_NAME);
+            if (!$target.hasClass(this.markerClassName)) {
+                return;
+            }
+            var nodeName = target.nodeName.toLowerCase();
+            if (nodeName == 'input') {
+                target.disabled = true;
+
+                inst.trigger.filter('button').
+                    each(function() { this.disabled = true; }).end();
+
+            }
+            else if (nodeName == 'div' || nodeName == 'span') {
+                var inline = $target.children('.' + this._inlineClass);
+                inline.children().addClass('ui-state-disabled');
+            }
+            this._disabledInputs = $.map(this._disabledInputs,
+                function(value) { return (value == target ? null : value); }); // delete entry
+            this._disabledInputs[this._disabledInputs.length] = $target.attr('id');
+        },
+
+        /* Is the first field in a jQuery collection disabled as a timepicker?
+        @param  target_id element - the target input field or division or span
+        @return boolean - true if disabled, false if enabled */
+        _isDisabledTimepicker: function (target_id) {
+            if ( ! target_id) { return false; }
+            for (var i = 0; i < this._disabledInputs.length; i++) {
+                if (this._disabledInputs[i] == target_id) { return true; }
+            }
+            return false;
+        },
+
+        /* Check positioning to remain on screen. */
+        _checkOffset: function (inst, offset, isFixed) {
+            var tpWidth = inst.tpDiv.outerWidth();
+            var tpHeight = inst.tpDiv.outerHeight();
+            var inputWidth = inst.input ? inst.input.outerWidth() : 0;
+            var inputHeight = inst.input ? inst.input.outerHeight() : 0;
+            var viewWidth = document.documentElement.clientWidth + $(document).scrollLeft();
+            var viewHeight = document.documentElement.clientHeight + $(document).scrollTop();
+
+            offset.left -= (this._get(inst, 'isRTL') ? (tpWidth - inputWidth) : 0);
+            offset.left -= (isFixed && offset.left == inst.input.offset().left) ? $(document).scrollLeft() : 0;
+            offset.top -= (isFixed && offset.top == (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0;
+
+            // now check if datepicker is showing outside window viewport - move to a better place if so.
+            offset.left -= Math.min(offset.left, (offset.left + tpWidth > viewWidth && viewWidth > tpWidth) ?
+			Math.abs(offset.left + tpWidth - viewWidth) : 0);
+            offset.top -= Math.min(offset.top, (offset.top + tpHeight > viewHeight && viewHeight > tpHeight) ?
+			Math.abs(tpHeight + inputHeight) : 0);
+
+            return offset;
+        },
+
+        /* Find an object's position on the screen. */
+        _findPos: function (obj) {
+            var inst = this._getInst(obj);
+            var isRTL = this._get(inst, 'isRTL');
+            while (obj && (obj.type == 'hidden' || obj.nodeType != 1)) {
+                obj = obj[isRTL ? 'previousSibling' : 'nextSibling'];
+            }
+            var position = $(obj).offset();
+            return [position.left, position.top];
+        },
+
+        /* Retrieve the size of left and top borders for an element.
+        @param  elem  (jQuery object) the element of interest
+        @return  (number[2]) the left and top borders */
+        _getBorders: function (elem) {
+            var convert = function (value) {
+                return { thin: 1, medium: 2, thick: 3}[value] || value;
+            };
+            return [parseFloat(convert(elem.css('border-left-width'))),
+			parseFloat(convert(elem.css('border-top-width')))];
+        },
+
+
+        /* Close time picker if clicked elsewhere. */
+        _checkExternalClick: function (event) {
+            if (!$.timepicker._curInst) { return; }
+            var $target = $(event.target);
+            if ($target[0].id != $.timepicker._mainDivId &&
+				$target.parents('#' + $.timepicker._mainDivId).length == 0 &&
+				!$target.hasClass($.timepicker.markerClassName) &&
+				!$target.hasClass($.timepicker._triggerClass) &&
+				$.timepicker._timepickerShowing && !($.timepicker._inDialog && $.blockUI))
+                $.timepicker._hideTimepicker();
+        },
+
+        /* Hide the time picker from view.
+        @param  input  element - the input field attached to the time picker */
+        _hideTimepicker: function (input) {
+            var inst = this._curInst;
+            if (!inst || (input && inst != $.data(input, PROP_NAME))) { return; }
+            if (this._timepickerShowing) {
+                var showAnim = this._get(inst, 'showAnim');
+                var duration = this._get(inst, 'duration');
+                var postProcess = function () {
+                    $.timepicker._tidyDialog(inst);
+                    this._curInst = null;
+                };
+                if ($.effects && $.effects[showAnim]) {
+                    inst.tpDiv.hide(showAnim, $.timepicker._get(inst, 'showOptions'), duration, postProcess);
+                }
+                else {
+                    inst.tpDiv[(showAnim == 'slideDown' ? 'slideUp' :
+					    (showAnim == 'fadeIn' ? 'fadeOut' : 'hide'))]((showAnim ? duration : null), postProcess);
+                }
+                if (!showAnim) { postProcess(); }
+                var onClose = this._get(inst, 'onClose');
+                if (onClose) {
+                    onClose.apply(
+                        (inst.input ? inst.input[0] : null),
+					    [(inst.input ? inst.input.val() : ''), inst]);  // trigger custom callback
+                }
+                this._timepickerShowing = false;
+                this._lastInput = null;
+                if (this._inDialog) {
+                    this._dialogInput.css({ position: 'absolute', left: '0', top: '-100px' });
+                    if ($.blockUI) {
+                        $.unblockUI();
+                        $('body').append(this.tpDiv);
+                    }
+                }
+                this._inDialog = false;
+            }
+        },
+
+
+
+        /* Tidy up after a dialog display. */
+        _tidyDialog: function (inst) {
+            inst.tpDiv.removeClass(this._dialogClass).unbind('.ui-timepicker');
+        },
+
+        /* Retrieve the instance data for the target control.
+        @param  target  element - the target input field or division or span
+        @return  object - the associated instance data
+        @throws  error if a jQuery problem getting data */
+        _getInst: function (target) {
+            try {
+                return $.data(target, PROP_NAME);
+            }
+            catch (err) {
+                throw 'Missing instance data for this timepicker';
+            }
+        },
+
+        /* Get a setting value, defaulting if necessary. */
+        _get: function (inst, name) {
+            return inst.settings[name] !== undefined ?
+			inst.settings[name] : this._defaults[name];
+        },
+
+        /* Parse existing time and initialise time picker. */
+        _setTimeFromField: function (inst) {
+            if (inst.input.val() == inst.lastVal) { return; }
+            var defaultTime = this._get(inst, 'defaultTime');
+
+            var timeToParse = defaultTime == 'now' ? this._getCurrentTimeRounded(inst) : defaultTime;
+            if ((inst.inline == false) && (inst.input.val() != '')) { timeToParse = inst.input.val() }
+
+            if (timeToParse instanceof Date) {
+                inst.hours = timeToParse.getHours();
+                inst.minutes = timeToParse.getMinutes();
+            } else {
+                var timeVal = inst.lastVal = timeToParse;
+                if (timeToParse == '') {
+                    inst.hours = -1;
+                    inst.minutes = -1;
+                } else {
+                    var time = this.parseTime(inst, timeVal);
+                    inst.hours = time.hours;
+                    inst.minutes = time.minutes;
+                }
+            }
+
+
+            $.timepicker._updateTimepicker(inst);
+        },
+
+        /* Update or retrieve the settings for an existing time picker.
+           @param  target  element - the target input field or division or span
+           @param  name    object - the new settings to update or
+                           string - the name of the setting to change or retrieve,
+                           when retrieving also 'all' for all instance settings or
+                           'defaults' for all global defaults
+           @param  value   any - the new value for the setting
+                       (omit if above is an object or to retrieve a value) */
+        _optionTimepicker: function(target, name, value) {
+            var inst = this._getInst(target);
+            if (arguments.length == 2 && typeof name == 'string') {
+                return (name == 'defaults' ? $.extend({}, $.timepicker._defaults) :
+                    (inst ? (name == 'all' ? $.extend({}, inst.settings) :
+                    this._get(inst, name)) : null));
+            }
+            var settings = name || {};
+            if (typeof name == 'string') {
+                settings = {};
+                settings[name] = value;
+            }
+            if (inst) {
+                if (this._curInst == inst) {
+                    this._hideTimepicker();
+                }
+                extendRemove(inst.settings, settings);
+                this._updateTimepicker(inst);
+            }
+        },
+
+
+        /* Set the time for a jQuery selection.
+	    @param  target  element - the target input field or division or span
+	    @param  time    String - the new time */
+	    _setTimeTimepicker: function(target, time) {
+		    var inst = this._getInst(target);
+		    if (inst) {
+			    this._setTime(inst, time);
+    			this._updateTimepicker(inst);
+	    		this._updateAlternate(inst, time);
+		    }
+	    },
+
+        /* Set the time directly. */
+        _setTime: function(inst, time, noChange) {
+            var origHours = inst.hours;
+            var origMinutes = inst.minutes;
+            var time = this.parseTime(inst, time);
+            inst.hours = time.hours;
+            inst.minutes = time.minutes;
+
+            if ((origHours != inst.hours || origMinutes != inst.minuts) && !noChange) {
+                inst.input.trigger('change');
+            }
+            this._updateTimepicker(inst);
+            this._updateSelectedValue(inst);
+        },
+
+        /* Return the current time, ready to be parsed, rounded to the closest 5 minute */
+        _getCurrentTimeRounded: function (inst) {
+            var currentTime = new Date(),
+                currentMinutes = currentTime.getMinutes(),
+                // round to closest 5
+                adjustedMinutes = Math.round( currentMinutes / 5 ) * 5;
+            currentTime.setMinutes(adjustedMinutes);
+            return currentTime;
+        },
+
+        /*
+        * Parse a time string into hours and minutes
+        */
+        parseTime: function (inst, timeVal) {
+            var retVal = new Object();
+            retVal.hours = -1;
+            retVal.minutes = -1;
+
+            var timeSeparator = this._get(inst, 'timeSeparator'),
+                amPmText = this._get(inst, 'amPmText'),
+                showHours = this._get(inst, 'showHours'),
+                showMinutes = this._get(inst, 'showMinutes'),
+                optionalMinutes = this._get(inst, 'optionalMinutes'),
+                showPeriod = (this._get(inst, 'showPeriod') == true),
+                p = timeVal.indexOf(timeSeparator);
+
+            // check if time separator found
+            if (p != -1) {
+                retVal.hours = parseInt(timeVal.substr(0, p), 10);
+                retVal.minutes = parseInt(timeVal.substr(p + 1), 10);
+            }
+            // check for hours only
+            else if ( (showHours) && ( !showMinutes || optionalMinutes ) ) {
+                retVal.hours = parseInt(timeVal, 10);
+            }
+            // check for minutes only
+            else if ( ( ! showHours) && (showMinutes) ) {
+                retVal.minutes = parseInt(timeVal, 10);
+            }
+
+            if (showHours) {
+                var timeValUpper = timeVal.toUpperCase();
+                if ((retVal.hours < 12) && (showPeriod) && (timeValUpper.indexOf(amPmText[1].toUpperCase()) != -1)) {
+                    retVal.hours += 12;
+                }
+                // fix for 12 AM
+                if ((retVal.hours == 12) && (showPeriod) && (timeValUpper.indexOf(amPmText[0].toUpperCase()) != -1)) {
+                    retVal.hours = 0;
+                }
+            }
+            
+            return retVal;
+        },
+
+        selectNow: function(e) {
+
+            var id = $(e.target).attr("data-timepicker-instance-id"),
+                $target = $(id),
+                inst = this._getInst($target[0]);
+
+            //if (!inst || (input && inst != $.data(input, PROP_NAME))) { return; }
+            var currentTime = new Date();
+            inst.hours = currentTime.getHours();
+            inst.minutes = currentTime.getMinutes();
+            this._updateSelectedValue(inst);
+            this._updateTimepicker(inst);
+            this._hideTimepicker();
+        },
+
+        deselectTime: function(e) {
+            var id = $(e.target).attr("data-timepicker-instance-id"),
+                $target = $(id),
+                inst = this._getInst($target[0]);
+            inst.hours = -1;
+            inst.minutes = -1;
+            this._updateSelectedValue(inst);
+            this._hideTimepicker();
+        },
+
+
+        selectHours: function (event) {
+            var $td = $(event.currentTarget),
+                id = $td.attr("data-timepicker-instance-id"),
+                newHours = $td.attr("data-hour"),
+                fromDoubleClick = event.data.fromDoubleClick,
+                $target = $(id),
+                inst = this._getInst($target[0]),
+                showMinutes = (this._get(inst, 'showMinutes') == true);
+
+            // don't select if disabled
+            if ( $.timepicker._isDisabledTimepicker($target.attr('id')) ) { return false }
+
+            $td.parents('.ui-timepicker-hours:first').find('a').removeClass('ui-state-active');
+            $td.children('a').addClass('ui-state-active');
+            inst.hours = newHours;
+
+            // added for onMinuteShow callback
+            var onMinuteShow = this._get(inst, 'onMinuteShow');
+            if (onMinuteShow) {
+                // this will trigger a callback on selected hour to make sure selected minute is allowed. 
+                this._updateMinuteDisplay(inst);
+            }
+
+            this._updateSelectedValue(inst);
+
+            inst._hoursClicked = true;
+            if ((inst._minutesClicked) || (fromDoubleClick) || (showMinutes == false)) {
+                $.timepicker._hideTimepicker();
+            }
+            // return false because if used inline, prevent the url to change to a hashtag
+            return false;
+        },
+
+        selectMinutes: function (event) {
+            var $td = $(event.currentTarget),
+                id = $td.attr("data-timepicker-instance-id"),
+                newMinutes = $td.attr("data-minute"),
+                fromDoubleClick = event.data.fromDoubleClick,
+                $target = $(id),
+                inst = this._getInst($target[0]),
+                showHours = (this._get(inst, 'showHours') == true);
+
+            // don't select if disabled
+            if ( $.timepicker._isDisabledTimepicker($target.attr('id')) ) { return false }
+
+            $td.parents('.ui-timepicker-minutes:first').find('a').removeClass('ui-state-active');
+            $td.children('a').addClass('ui-state-active');
+
+            inst.minutes = newMinutes;
+            this._updateSelectedValue(inst);
+
+            inst._minutesClicked = true;
+            if ((inst._hoursClicked) || (fromDoubleClick) || (showHours == false)) {
+                $.timepicker._hideTimepicker();
+                // return false because if used inline, prevent the url to change to a hashtag
+                return false;
+            }
+
+            // return false because if used inline, prevent the url to change to a hashtag
+            return false;
+        },
+
+        _updateSelectedValue: function (inst) {
+            var newTime = this._getParsedTime(inst);
+            if (inst.input) {
+                inst.input.val(newTime);
+                inst.input.trigger('change');
+            }
+            var onSelect = this._get(inst, 'onSelect');
+            if (onSelect) { onSelect.apply((inst.input ? inst.input[0] : null), [newTime, inst]); } // trigger custom callback
+            this._updateAlternate(inst, newTime);
+            return newTime;
+        },
+        
+        /* this function process selected time and return it parsed according to instance options */
+        _getParsedTime: function(inst) {
+
+            if (inst.hours == -1 && inst.minutes == -1) {
+                return '';
+            }
+
+            if ((inst.hours < 0) || (inst.hours > 23)) { inst.hours = 12; }
+            if ((inst.minutes < 0) || (inst.minutes > 59)) { inst.minutes = 0; }
+
+            var period = "",
+                showPeriod = (this._get(inst, 'showPeriod') == true),
+                showLeadingZero = (this._get(inst, 'showLeadingZero') == true),
+                showHours = (this._get(inst, 'showHours') == true),
+                showMinutes = (this._get(inst, 'showMinutes') == true),
+                optionalMinutes = (this._get(inst, 'optionalMinutes') == true),
+                amPmText = this._get(inst, 'amPmText'),
+                selectedHours = inst.hours ? inst.hours : 0,
+                selectedMinutes = inst.minutes ? inst.minutes : 0,
+                displayHours = selectedHours ? selectedHours : 0,
+                parsedTime = '';
+
+            if (showPeriod) { 
+                if (inst.hours == 0) {
+                    displayHours = 12;
+                }
+                if (inst.hours < 12) {
+                    period = amPmText[0];
+                }
+                else {
+                    period = amPmText[1];
+                    if (displayHours > 12) {
+                        displayHours -= 12;
+                    }
+                }
+            }
+
+            var h = displayHours.toString();
+            if (showLeadingZero && (displayHours < 10)) { h = '0' + h; }
+
+            var m = selectedMinutes.toString();
+            if (selectedMinutes < 10) { m = '0' + m; }
+
+            if (showHours) {
+                parsedTime += h;
+            }
+            if (showHours && showMinutes && (!optionalMinutes || m != 0)) {
+                parsedTime += this._get(inst, 'timeSeparator');
+            }
+            if (showMinutes && (!optionalMinutes || m != 0)) {
+                parsedTime += m;
+            }
+            if (showHours) {
+                if (period.length > 0) { parsedTime += this._get(inst, 'periodSeparator') + period; }
+            }
+            
+            return parsedTime;
+        },
+        
+        /* Update any alternate field to synchronise with the main field. */
+        _updateAlternate: function(inst, newTime) {
+            var altField = this._get(inst, 'altField');
+            if (altField) { // update alternate field too
+                $(altField).each(function(i,e) {
+                    $(e).val(newTime);
+                });
+            }
+        },
+
+        /* This might look unused but it's called by the $.fn.timepicker function with param getTime */
+        /* added v 0.2.3 - gitHub issue #5 - Thanks edanuff */
+        _getTimeTimepicker : function(input) {
+            var inst = this._getInst(input);
+            return this._getParsedTime(inst);
+        },
+        _getHourTimepicker: function(input) {
+            var inst = this._getInst(input);
+            if ( inst == undefined) { return -1; }
+            return inst.hours;
+        },
+        _getMinuteTimepicker: function(input) {
+            var inst= this._getInst(input);
+            if ( inst == undefined) { return -1; }
+            return inst.minutes;
+        }
+
+    });
+
+
+
+    /* Invoke the timepicker functionality.
+    @param  options  string - a command, optionally followed by additional parameters or
+    Object - settings for attaching new timepicker functionality
+    @return  jQuery object */
+    $.fn.timepicker = function (options) {
+
+        /* Initialise the time picker. */
+        if (!$.timepicker.initialized) {
+            $(document).mousedown($.timepicker._checkExternalClick).
+			find('body').append($.timepicker.tpDiv);
+            $.timepicker.initialized = true;
+        }
+
+        var otherArgs = Array.prototype.slice.call(arguments, 1);
+        if (typeof options == 'string' && (options == 'getTime' || options == 'getHour' || options == 'getMinute' ))
+            return $.timepicker['_' + options + 'Timepicker'].
+			    apply($.timepicker, [this[0]].concat(otherArgs));
+        if (options == 'option' && arguments.length == 2 && typeof arguments[1] == 'string')
+            return $.timepicker['_' + options + 'Timepicker'].
+                apply($.timepicker, [this[0]].concat(otherArgs));
+        return this.each(function () {
+            typeof options == 'string' ?
+			$.timepicker['_' + options + 'Timepicker'].
+				apply($.timepicker, [this].concat(otherArgs)) :
+			$.timepicker._attachTimepicker(this, options);
+        });
+    };
+
+    /* jQuery extend now ignores nulls! */
+    function extendRemove(target, props) {
+        $.extend(target, props);
+        for (var name in props)
+            if (props[name] == null || props[name] == undefined)
+                target[name] = props[name];
+        return target;
+    };
+
+    $.timepicker = new Timepicker(); // singleton instance
+    $.timepicker.initialized = false;
+    $.timepicker.uuid = new Date().getTime();
+    $.timepicker.version = "0.2.9";
+
+    // Workaround for #4055
+    // Add another global to avoid noConflict issues with inline event handlers
+    window['TP_jQuery_' + tpuuid] = $;
+
+})(jQuery);
diff --git a/3rdparty/timepicker/releases.txt b/3rdparty/timepicker/releases.txt
new file mode 100644
index 00000000000..64622d49429
--- /dev/null
+++ b/3rdparty/timepicker/releases.txt
@@ -0,0 +1,105 @@
+Release 0.2.9 - November 13, 2011
+Fixed the zIndex problem and removed the zIndex option (Thanks everyone who reported the problem)
+Fix a bug where repeatedly clicking on hour cells made the timepicker very slow.
+Added Italian translation, thanks to Serge Margarita.
+
+Release 0.2.8 - November 5, 2011
+Updated "defaultTime" to allow for Date object (github issue #26)
+Fixed the now and deselect buttons in IE
+
+Release 0.2.7 - October 19, 2011
+Added option to omit minutes in parsed time when user select 0 for minutes. (Thanks tribalvibes, Github issue #23)
+Added support for internationalisation (fr, de and ja, Thanks Bernd Plagge).
+
+Release 0.2.6 - October 12, 2011
+Fixed a bug when input ID have more then one special char. (Thamks Jacqueline Krijnen)
+Fixed a bug when parsing hours only or minutes only time. (Thanks protron, <a href="https://github.com/fgelinas/timepicker/issues/20">github issue #20</a>)
+Added 'Now', 'Deselect' and 'Close' buttons. (Thanks Christian Grobmeier for the close button code, <a href="https://github.com/fgelinas/timepicker/issues/20">github issue #22</a>)
+
+Release 0.2.5 - September 13, 2011
+Added support for disable and enable. (Suggested by danielrex, github issue #17)
+Added an example for 2 timepicker to behave as a period selector (start time and end time). (Thanks Bill Pellowe)
+Renamed the stylesheet to jquery.ui.timepicker.css to be more consistent with jQuery UI file name convention.
+
+Release 0.2.4 - August 5, 2011
+Fixed the hand cursor in the css file. (Thanks Mike Neumegen)
+Added position option to use with the jquery ui position utility.
+Added option to display only hours or only minutes.
+
+Release 0.2.3 - July 11, 2011
+Fix github issue #3 : Bug when hours or minutes choices does not divide by number of rows (thanks wukimus)
+Changed default behavior of the defaultTime option, if set to '' and input is empty, there will be no highlighted time in the popup (Thanks Rasmus Schultz)
+Fix github issue #4 : Error when generating empty minute cell. (Thanks 123Haynes)
+Fix github issue #5 : Add functionality for "getTime" option. (Thanks edanuff)
+Added the periodSeparator option. (thanks jrchamp)
+Fixed "getTime" for inline timepickers. (thanks Mike Neumegen)
+Added "getHour" and "getMinute" to get individual values.
+
+Release 0.2.2 - June 16, 2011
+Fixed a "console.log" line that I forgot to remove before release 0.2.1
+
+Release 0.2.1 - June 12, 2011
+Timepicker does not give the focus back to the input any more after time selection. This is similar to the datepicker behaviour and is more natural to the user because it shows the dialog again when the user click on the input again, as expected.
+Added options to customize the hours and minutes ranges and interval for more customization.
+
+Release 0.2 - May 28, 2011
+So in the previous release I mixed up versions and lost some changes, I guess that's what happen when you drink and code.
+
+Release 0.1.2 - May 26, 2011
+Fixed a bug with inline timepickers that would append a #timepickr hashtag when selecting hours and minutes.
+Fixed z-index problem with IE6 (Thanks Graham Bentley)
+Added selection of highlighted text when enter is pressed on the input field (Thanks Glen Chiacchieri)
+Adjusted some focus problems, now the input gets the focus back when the used click on hours / minutes.
+
+Release 0.1.something aka the lost release - around April 11
+Fixed a bug for when input Id had a dot in it, it was getting double escaped when it should not. (Thanks Zdenek Machac)
+So in 0.1.1 I created a bug that made timepicker changes the location hash, well now it's fixed. (Thanks Lucas Falk)
+
+Release 0.1.1 - April 6, 2011
+Changed the cells click and dblclick binding for faster rendering in IE6/7 (Thanks Blair Parsons)
+Fixed a class naming bug created in 0.1.0 (Thanks Morlion Peter)
+
+Release 0.1.0 - March 23, 2011
+Fixed some bugs with release 0.0.9
+
+Release 0.0.9 - March 22, 2011
+Added zIndex option (Thanks Frank Enderle)
+Added option showPeriodLabels that defines if the AM/PM labels are displayed on the left (Thanks Frank Enderle)
+Added showOn ['focus'|'button'|'both'] and button options for alternate trigger method
+
+Release 0.0.8 - Fev 17, 2011
+Fixed close event not triggered when switching to another input with time picker (thanks Stuart Gregg)
+
+Release 0.0.7 - Fev 10, 2011
+Added function to set time after initialisation :$('#timepicker').timepicker('setTime',newTime);
+Added support for disabled period of time : onHourShow and onMinuteShow (thanks Rene Felgentr�ger)
+
+Release 0.0.6 - Jan 19, 2011
+Added standard "change" event being triggered on the input when the content changes. (Thanks Rasmus Schultz)
+Added support for inline timePicker, attached to div or span
+Added altField that receive the parsed time value when selected time changes
+Added defaultTime value to use when input field is missing (inline) or input value is empty
+      if defaultTime is missing, current time is used
+
+Release 0.0.5 - Jan 18, 2011
+Now updating time picker selected value when manually typing in the text field (thanks Rasmus Schultz)
+Fixed : with showPeriod: true and showLeadingZero: true, PM hours did not show leading zeros (thanks Chandler May)
+Fixed : with showPeriod: true and showLeadingZero: true, Selecting 12 AM shows as 00 AM in the input field, also parsing 12AM did not work correctly (thanks Rasmus Schultz)
+
+Release 0.0.4 - jan 10, 2011
+changed showLeadingZero to affect only hours, added showMinutesLeadingZero for minutes display
+Removed width:100% for tables in css
+
+Release 0.0.3 - Jan 8, 2011
+Re-added a display:none on the main div (fix a small empty div visible at the bottom of the page before timepicker is called) (Thanks Gertjan van Roekel)
+Fixed a problem where the timepicker was never displayed with jquery ui 1.8.7 css,
+    the problem was the class ui-helper-hidden-accessible, witch I removed.
+    Thanks Alexander Fietz and StackOverflow : http://stackoverflow.com/questions/4522274/jquery-timepicker-and-jqueryui-1-8-7-conflict
+
+Release 0.0.2 - Jan 6, 2011
+Updated to include common display options for USA users
+Stephen Commisso - Jan 2011
+
+As it is a timepicker, I inspired most of the code from the datepicker
+Francois Gelinas - Nov 2010
+
diff --git a/3rdparty/when/MIT-LICENSE.txt b/3rdparty/when/MIT-LICENSE.txt
new file mode 100644
index 00000000000..b4429c89ac1
--- /dev/null
+++ b/3rdparty/when/MIT-LICENSE.txt
@@ -0,0 +1,9 @@
+License
+
+Copyright (c) 2010 Thomas Planer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/3rdparty/when/When.php b/3rdparty/when/When.php
new file mode 100755
index 00000000000..d54f296ed61
--- /dev/null
+++ b/3rdparty/when/When.php
@@ -0,0 +1,731 @@
+<?php
+/**
+ * Name: When
+ * Author: Thomas Planer <tplaner@gmail.com>
+ * Location: http://github.com/tplaner/When
+ * Created: September 2010
+ * Description: Determines the next date of recursion given an iCalendar "rrule" like pattern.
+ * Requirements: PHP 5.3+ - makes extensive use of the Date and Time library (http://us2.php.net/manual/en/book.datetime.php)
+ */
+class When
+{
+	protected $frequency;
+	
+	protected $start_date;
+	protected $try_date;
+	
+	protected $end_date;
+	
+	protected $gobymonth;
+	protected $bymonth;
+	
+	protected $gobyweekno;
+	protected $byweekno;
+	
+	protected $gobyyearday;
+	protected $byyearday;
+	
+	protected $gobymonthday;
+	protected $bymonthday;
+	
+	protected $gobyday;
+	protected $byday;
+	
+	protected $gobysetpos;
+	protected $bysetpos;
+		
+	protected $suggestions;
+	
+	protected $count;
+	protected $counter;
+	
+	protected $goenddate;
+	
+	protected $interval;
+	
+	protected $wkst;
+	
+	protected $valid_week_days;
+	protected $valid_frequency;
+		
+	/**
+	 * __construct
+	 */
+	public function __construct()
+	{
+		$this->frequency = null;
+		
+		$this->gobymonth = false;
+		$this->bymonth = range(1,12);
+		
+		$this->gobymonthday = false;
+		$this->bymonthday = range(1,31);
+		
+		$this->gobyday = false;
+		// setup the valid week days (0 = sunday)
+		$this->byday = range(0,6);
+		
+		$this->gobyyearday = false;
+		$this->byyearday = range(0,366);
+		
+		$this->gobysetpos = false;
+		$this->bysetpos = range(1,366);
+		
+		$this->gobyweekno = false;
+		// setup the range for valid weeks
+		$this->byweekno = range(0,54);
+		
+		$this->suggestions = array();
+		
+		// this will be set if a count() is specified
+		$this->count = 0;
+		// how many *valid* results we returned
+		$this->counter = 0;
+		
+		// max date we'll return
+		$this->end_date = new DateTime('9999-12-31');
+		
+		// the interval to increase the pattern by
+		$this->interval = 1;
+		
+		// what day does the week start on? (0 = sunday)
+		$this->wkst = 0;
+		
+		$this->valid_week_days = array('SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA');
+		
+		$this->valid_frequency = array('SECONDLY', 'MINUTELY', 'HOURLY', 'DAILY', 'WEEKLY', 'MONTHLY', 'YEARLY');
+	}
+	
+	/**
+	 * @param DateTime|string $start_date of the recursion - also is the first return value.
+	 * @param string $frequency of the recrusion, valid frequencies: secondly, minutely, hourly, daily, weekly, monthly, yearly
+	 */
+	public function recur($start_date, $frequency = "daily")
+	{
+		try
+		{
+			if(is_object($start_date))
+			{
+				$this->start_date = clone $start_date;
+			}
+			else
+			{
+				// timestamps within the RFC have a 'Z' at the end of them, remove this.
+				$start_date = trim($start_date, 'Z');
+				$this->start_date = new DateTime($start_date);
+			}
+			
+			$this->try_date = clone $this->start_date;
+		}
+		catch(Exception $e)
+		{
+			throw new InvalidArgumentException('Invalid start date DateTime: ' . $e);
+		}
+		
+		$this->freq($frequency);
+		
+		return $this;
+	}
+
+	public function freq($frequency)
+	{
+		if(in_array(strtoupper($frequency), $this->valid_frequency))
+		{
+			$this->frequency = strtoupper($frequency);
+		}
+		else
+		{
+			throw new InvalidArgumentException('Invalid frequency type.');
+		}
+
+		return $this;
+	}
+
+	// accepts an rrule directly
+	public function rrule($rrule)
+	{
+		// strip off a trailing semi-colon
+		$rrule = trim($rrule, ";");
+		
+		$parts = explode(";", $rrule);
+
+		foreach($parts as $part)
+		{
+			list($rule, $param) = explode("=", $part);
+
+			$rule = strtoupper($rule);
+			$param = strtoupper($param);
+
+			switch($rule)
+			{
+				case "FREQ":
+					$this->frequency = $param;
+					break;
+				case "UNTIL":
+					$this->until($param);
+					break;
+				case "COUNT":
+					$this->count($param);
+					break;
+				case "INTERVAL":
+					$this->interval($param);
+					break;
+				case "BYDAY":
+					$params = explode(",", $param);
+					$this->byday($params);
+					break;
+				case "BYMONTHDAY":
+					$params = explode(",", $param);
+					$this->bymonthday($params);
+					break;
+				case "BYYEARDAY":
+					$params = explode(",", $param);
+					$this->byyearday($params);
+					break;
+				case "BYWEEKNO":
+					$params = explode(",", $param);
+					$this->byweekno($params);
+					break;
+				case "BYMONTH":
+					$params = explode(",", $param);
+					$this->bymonth($params);
+					break;
+				case "BYSETPOS":
+					$params = explode(",", $param);
+					$this->bysetpos($params);
+					break;
+				case "WKST":
+					$this->wkst($param);
+					break;
+			}
+		}
+
+		return $this;
+	}
+	
+	//max number of items to return based on the pattern
+	public function count($count)
+	{
+		$this->count = (int)$count;
+		
+		return $this;
+	}
+	
+	// how often the recurrence rule repeats
+	public function interval($interval)
+	{
+		$this->interval = (int)$interval;
+		
+		return $this;
+	}
+	
+	// starting day of the week
+	public function wkst($day)
+	{
+		switch($day)
+		{
+			case 'SU':
+				$this->wkst = 0;
+				break;
+			case 'MO':
+				$this->wkst = 1;
+				break;
+			case 'TU':
+				$this->wkst = 2;
+				break;
+			case 'WE':
+				$this->wkst = 3;
+				break;
+			case 'TH':
+				$this->wkst = 4;
+				break;
+			case 'FR':
+				$this->wkst = 5;
+				break;
+			case 'SA':
+				$this->wkst = 6;
+				break;
+		}
+		
+		return $this;
+	}
+	
+	// max date
+	public function until($end_date)
+	{		
+		try
+		{
+			if(is_object($end_date))
+			{
+				$this->end_date = clone $end_date;
+			}
+			else
+			{
+				// timestamps within the RFC have a 'Z' at the end of them, remove this.
+				$end_date = trim($end_date, 'Z');
+				$this->end_date = new DateTime($end_date);
+			}
+		}
+		catch(Exception $e)
+		{
+			throw new InvalidArgumentException('Invalid end date DateTime: ' . $e);
+		}
+		
+		return $this;
+	}
+
+	public function bymonth($months)
+	{	
+		if(is_array($months))
+		{
+			$this->gobymonth = true;
+			$this->bymonth = $months;
+		}
+		
+		return $this;
+	}
+	
+	public function bymonthday($days)
+	{	
+		if(is_array($days))
+		{
+			$this->gobymonthday = true;
+			$this->bymonthday = $days;
+		}
+		
+		return $this;
+	}
+	
+	public function byweekno($weeks)
+	{
+		$this->gobyweekno = true;
+		
+		if(is_array($weeks))
+		{
+			$this->byweekno = $weeks;
+		}
+		
+		return $this;
+	}
+	
+	public function bysetpos($days)
+	{
+		$this->gobysetpos = true;
+		
+		if(is_array($days))
+		{
+			$this->bysetpos = $days;
+		}
+		
+		return $this;
+	}
+	
+	public function byday($days)
+	{		
+		$this->gobyday = true;
+		
+		if(is_array($days))
+		{
+			$this->byday = array();
+			foreach($days as $day)
+			{
+				$len = strlen($day);
+				
+				$as = '+';
+				
+				// 0 mean no occurence is set
+				$occ = 0;
+				
+				if($len == 3)
+				{
+					$occ = substr($day, 0, 1);
+				}
+				if($len == 4)
+				{
+					$as = substr($day, 0, 1);
+					$occ = substr($day, 1, 1);
+				}
+				
+				if($as == '-')
+				{
+					$occ = '-' . $occ;
+				}
+				else
+				{
+					$occ = '+' . $occ;
+				}
+				
+				$day = substr($day, -2, 2);
+				switch($day)
+				{
+					case 'SU':
+						$this->byday[] = $occ . 'SU';
+						break;
+					case 'MO':
+						$this->byday[] = $occ . 'MO';
+						break;
+					case 'TU':
+						$this->byday[] = $occ . 'TU';
+						break;
+					case 'WE':
+						$this->byday[] = $occ . 'WE';
+						break;
+					case 'TH':
+						$this->byday[] = $occ . 'TH';
+						break;
+					case 'FR':
+						$this->byday[] = $occ . 'FR';
+						break;
+					case 'SA':
+						$this->byday[] = $occ . 'SA';
+						break;
+				}
+			}
+		}
+		
+		return $this;
+	}
+	
+	public function byyearday($days)
+	{
+		$this->gobyyearday = true;
+		
+		if(is_array($days))
+		{
+			$this->byyearday = $days;
+		}
+		
+		return $this;
+	}
+	
+	// this creates a basic list of dates to "try"
+	protected function create_suggestions()
+	{
+		switch($this->frequency)
+		{
+			case "YEARLY":
+				$interval = 'year';
+				break;
+			case "MONTHLY":
+				$interval = 'month';
+				break;
+			case "WEEKLY":
+				$interval = 'week';
+				break;
+			case "DAILY":
+				$interval = 'day';
+				break;
+			case "HOURLY":
+				$interval = 'hour';
+				break;
+			case "MINUTELY":
+				$interval = 'minute';
+				break;
+			case "SECONDLY":
+				$interval = 'second';
+				break;
+		}
+					
+		$month_day = $this->try_date->format('j');
+		$month = $this->try_date->format('n');
+		$year = $this->try_date->format('Y');
+		
+		$timestamp = $this->try_date->format('H:i:s');
+					
+		if($this->gobysetpos)
+		{				
+			if($this->try_date == $this->start_date)
+			{
+				$this->suggestions[] = clone $this->try_date;
+			}
+			else
+			{
+				if($this->gobyday)
+				{
+					foreach($this->bysetpos as $_pos)
+					{
+						$tmp_array = array();
+						$_mdays = range(1, date('t',mktime(0,0,0,$month,1,$year)));
+						foreach($_mdays as $_mday)
+						{
+							$date_time = new DateTime($year . '-' . $month . '-' . $_mday . ' ' . $timestamp);
+							
+							$occur = ceil($_mday / 7);
+							
+							$day_of_week = $date_time->format('l');
+							$dow_abr = strtoupper(substr($day_of_week, 0, 2));
+							
+							// set the day of the month + (positive)
+							$occur = '+' . $occur . $dow_abr;
+							$occur_zero = '+0' . $dow_abr;
+							
+							// set the day of the month - (negative)
+							$total_days = $date_time->format('t') - $date_time->format('j');
+							$occur_neg = '-' . ceil(($total_days + 1)/7) . $dow_abr;
+							
+							$day_from_end_of_month = $date_time->format('t') + 1 - $_mday;
+							
+							if(in_array($occur, $this->byday) || in_array($occur_zero, $this->byday) || in_array($occur_neg, $this->byday))
+							{								
+								$tmp_array[] = clone $date_time;
+							}
+						}
+						
+						if($_pos > 0)
+						{
+							$this->suggestions[] = clone $tmp_array[$_pos - 1];
+						}
+						else
+						{
+							$this->suggestions[] = clone $tmp_array[count($tmp_array) + $_pos];
+						}
+						
+					}
+				}
+			}
+		}
+		elseif($this->gobyyearday)
+		{
+			foreach($this->byyearday as $_day)
+			{
+				if($_day >= 0)
+				{
+					$_day--;
+					
+					$_time = strtotime('+' . $_day . ' days', mktime(0, 0, 0, 1, 1, $year));
+					$this->suggestions[] = new Datetime(date('Y-m-d', $_time) . ' ' . $timestamp);
+				}
+				else
+				{
+					$year_day_neg = 365 + $_day;
+					$leap_year = $this->try_date->format('L');
+					if($leap_year == 1)
+					{
+						$year_day_neg = 366 + $_day;
+					}
+					
+					$_time = strtotime('+' . $year_day_neg . ' days', mktime(0, 0, 0, 1, 1, $year));
+					$this->suggestions[] = new Datetime(date('Y-m-d', $_time) . ' ' . $timestamp);
+				}					
+			}
+		}
+		// special case because for years you need to loop through the months too
+		elseif($this->gobyday && $interval == "year")
+		{
+			foreach($this->bymonth as $_month)
+			{
+				// this creates an array of days of the month
+				$_mdays = range(1, date('t',mktime(0,0,0,$_month,1,$year)));
+				foreach($_mdays as $_mday)
+				{
+					$date_time = new DateTime($year . '-' . $_month . '-' . $_mday . ' ' . $timestamp);
+					
+					// get the week of the month (1, 2, 3, 4, 5, etc)
+					$week = $date_time->format('W');
+					
+					if($date_time >= $this->start_date && in_array($week, $this->byweekno))
+					{
+						$this->suggestions[] = clone $date_time;
+					}
+				}
+			}
+		}
+		elseif($interval == "day")
+		{
+			$this->suggestions[] = clone $this->try_date;
+		}
+		elseif($interval == "week")
+		{
+			$this->suggestions[] = clone $this->try_date;
+			
+			if($this->gobyday)
+			{
+				$week_day = $this->try_date->format('w');
+				
+				$days_in_month = $this->try_date->format('t');
+				
+				$overflow_count = 1;
+				$_day = $month_day;
+				
+				$run = true;
+				while($run)
+				{
+					$_day++;
+					if($_day <= $days_in_month)
+					{
+						$tmp_date = new DateTime($year . '-' . $month . '-' . $_day . ' ' . $timestamp);
+					}
+					else
+					{
+						//$tmp_month = $month+1;
+						$tmp_date = new DateTime($year . '-' . $month . '-' . $overflow_count . ' ' . $timestamp);
+						$tmp_date->modify('+1 month');
+						$overflow_count++;
+					}
+					
+					$week_day = $tmp_date->format('w');
+					
+					if($this->try_date == $this->start_date)
+					{
+						if($week_day == $this->wkst)
+						{
+							$this->try_date = clone $tmp_date;
+							$this->try_date->modify('-7 days');
+							$run = false;
+						}
+					}
+
+					if($week_day != $this->wkst)
+					{
+						$this->suggestions[] = clone $tmp_date;
+					}
+					else
+					{
+						$run = false;
+					}
+				}
+			}
+		}
+		elseif($this->gobyday && $interval == "month")
+		{
+			$_mdays = range(1, date('t',mktime(0,0,0,$month,1,$year)));
+			foreach($_mdays as $_mday)
+			{
+				$date_time = new DateTime($year . '-' . $month . '-' . $_mday . ' ' . $timestamp);
+				
+				// get the week of the month (1, 2, 3, 4, 5, etc)
+				$week = $date_time->format('W');
+				
+				if($date_time >= $this->start_date && in_array($week, $this->byweekno))
+				{
+					$this->suggestions[] = clone $date_time;
+				}
+			}
+		}
+		elseif($this->gobymonth)
+		{
+			foreach($this->bymonth as $_month)
+			{
+				$date_time = new DateTime($year . '-' . $_month . '-' . $month_day . ' ' . $timestamp);
+				
+				if($date_time >= $this->start_date)
+				{
+					$this->suggestions[] = clone $date_time;
+				}
+			}
+		} 
+		else 
+		{
+			$this->suggestions[] = clone $this->try_date;
+		}
+		
+		if($interval == "month")
+		{
+			
+			$this->try_date->modify('first day of next month');
+			if((int) date('t', $this->try_date->format('U')) > (int) $this->start_date->format('j')){
+				$this->try_date->modify('+' . (int) $this->start_date->format('j') - 1 . ' day'); 
+			}else{
+				$this->try_date->modify('+' . (int) date('t', $this->try_date->format('U')) - 1 . ' day'); 
+			}
+		}
+		else
+		{
+			$this->try_date->modify($this->interval . ' ' . $interval);
+		}
+	}
+	
+	protected function valid_date($date)
+	{
+		$year = $date->format('Y');
+		$month = $date->format('n');
+		$day = $date->format('j');
+		
+		$year_day = $date->format('z') + 1;
+		
+		$year_day_neg = -366 + $year_day;
+		$leap_year = $date->format('L');
+		if($leap_year == 1)
+		{
+			$year_day_neg = -367 + $year_day;
+		}
+		
+		// this is the nth occurence of the date
+		$occur = ceil($day / 7);
+		
+		$week = $date->format('W');
+		
+		$day_of_week = $date->format('l');
+		$dow_abr = strtoupper(substr($day_of_week, 0, 2));
+		
+		// set the day of the month + (positive)
+		$occur = '+' . $occur . $dow_abr;
+		$occur_zero = '+0' . $dow_abr;
+		
+		// set the day of the month - (negative)
+		$total_days = $date->format('t') - $date->format('j');
+		$occur_neg = '-' . ceil(($total_days + 1)/7) . $dow_abr;
+		
+		$day_from_end_of_month = $date->format('t') + 1 - $day;
+		
+		if(in_array($month, $this->bymonth) && 
+		   (in_array($occur, $this->byday) || in_array($occur_zero, $this->byday) || in_array($occur_neg, $this->byday)) && 
+		   in_array($week, $this->byweekno) &&
+		   (in_array($day, $this->bymonthday) || in_array(-$day_from_end_of_month, $this->bymonthday)) &&
+		   (in_array($year_day, $this->byyearday) || in_array($year_day_neg, $this->byyearday)))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	// return the next valid DateTime object which matches the pattern and follows the rules
+	public function next()
+	{		
+		// check the counter is set
+		if($this->count !== 0)
+		{
+			if($this->counter >= $this->count)
+			{
+				return false;
+			}
+		}
+		
+		// create initial set of suggested dates
+		if(count($this->suggestions) === 0)
+		{
+			$this->create_suggestions();
+		}
+		
+		// loop through the suggested dates
+		while(count($this->suggestions) > 0)
+		{
+			// get the first one on the array
+			$try_date = array_shift($this->suggestions);
+			
+			// make sure the date doesn't exceed the max date
+			if($try_date > $this->end_date)
+			{
+				return false;
+			}
+			
+			// make sure it falls within the allowed days
+			if($this->valid_date($try_date) === true)
+			{
+				$this->counter++;
+				return $try_date;
+			}
+			else
+			{
+				// we might be out of suggested days, so load some more
+				if(count($this->suggestions) === 0)
+				{
+					$this->create_suggestions();
+				}
+			}
+		}
+	}
+}
-- 
GitLab


From fa7fabf024cf52798a52cd2406a53c333f9ec3ca Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 15 Feb 2012 09:41:33 +0100
Subject: [PATCH 508/546] Minor tweaks

---
 apps/contacts/css/contacts.css       |  39 +-
 apps/contacts/js/contacts.js         |  17 +-
 apps/contacts/js/jquery.jec-1.3.3.js | 863 ---------------------------
 3 files changed, 7 insertions(+), 912 deletions(-)
 delete mode 100644 apps/contacts/js/jquery.jec-1.3.3.js

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 460859fae17..8a85dd51c1e 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -7,8 +7,8 @@
 #chooseaddressbook {margin-right: 170px; float: right;}
 #contacts_deletecard {position:absolute;top:15px;right:25px;}
 #contacts_downloadcard {position:absolute;top:15px;right:50px;}
-#contacts_propertymenu_button { position:absolute;top:15px;right:150px; height: 20px; width: 150px; background:url('../../../core/img/actions/add.svg') no-repeat center;	 }
-#contacts_propertymenu { position:absolute;top:40px;right:150px; overflow:hidden; text-overflow:ellipsis; /*border: thin solid #1d2d44;*/  -moz-box-shadow:0 0 10px #000; -webkit-box-shadow:0 0 10px #000; box-shadow:0 0 10px #000; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; }
+#contacts_propertymenu_button { position:absolute;top:15px;right:150px; background:url('../../../core/img/actions/add.svg') no-repeat center;	 }
+#contacts_propertymenu { background-color: #fff; position:absolute;top:40px;right:150px; overflow:hidden; text-overflow:ellipsis; /*border: thin solid #1d2d44;*/  -moz-box-shadow:0 0 10px #000; -webkit-box-shadow:0 0 10px #000; box-shadow:0 0 10px #000; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; }
 #contacts_propertymenu li { display: block; font-weight: bold; height: 20px; width: 100px; }
 /*#contacts_propertymenu li:first-child { border-top: thin solid #1d2d44; -moz-border-radius-topleft:0.5em; -webkit-border-top-left-radius:0.5em; border-top-left-radius:0.5em; -moz-border-radius-topright:0.5em; -webkit-border-top-right-radius:0.5em; border-top-right-radius:0.5em; }
 #contacts_propertymenu li:last-child { border-bottom: thin solid #1d2d44; -moz-border-radius-bottomleft:0.5em; -webkit-border-bottom-left-radius:0.5em; border-bottom-left-radius:0.5em; -moz-border-radius-bottomright:0.5em; -webkit-border-bottom-right-radius:0.5em; border-bottom-right-radius:0.5em; }*/
@@ -97,21 +97,8 @@ dl.form
 #edit_address_dialog > input {
 	width: 15em;
 }
-#edit_photo_dialog_img {
-	display: block;
-	width: 150;
-	height: 200;
-	border: thin solid black;
-}
-#fn {
-	float: left;
-}
-.jecEditableOption {
-	margin: 2px;
-	border-radius: 0.5em;
-	border: thin solid #bbb;
-	content: 'Custom';
-}
+#edit_photo_dialog_img { display: block; width: 150; height: 200; border: thin solid black; }
+#fn { float: left; }
 /**
  * Create classes form, floateven and floatodd which flows left and right respectively.
  */
@@ -162,13 +149,8 @@ width:auto; padding:.3em; border:1px solid #ddd; font-weight:bold; cursor:pointe
 	background: url(../../../core/img/loading.gif) no-repeat center center;
 	clear: right;
 }
-#contacts_details_photo:hover {
-	background: #fff;
-}
-#contacts_details_photo_progress {
-	margin: 0.3em 0.3em 0.3em 7em;
-	clear: left;
-}
+#contacts_details_photo:hover { background: #fff; }
+#contacts_details_photo_progress { margin: 0.3em 0.3em 0.3em 7em; clear: left; }
 /* Address editor */
 #addressdisplay { padding: 0.5em; }
 dl.addresscard { background-color: #fff; float: left; width: 45%; margin: 0 0.3em 0.3em 0.3em; padding: 0; border: thin solid lightgray; }
@@ -188,15 +170,6 @@ dl.addresscard dd > ul { margin: 0.3em; padding: 0.3em; }
 	height: 10px;
 	clear: both;
 }
-.updatebar {
-	height: 30px;
-	clear: both;
-	padding-right: 170px;
-	border: thin solid lightgray;
-}
-.updatebar button {
-	float: left; margin: 1em;
-}
 
 /*input[type="text"] { float: left; max-width: 15em; }
 input[type="radio"] { float: left; -khtml-appearance: none; width: 20px; height: 20px; vertical-align: middle; }*/
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 9e3faec192a..30793625746 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -3,21 +3,6 @@ function ucwords (str) {
 		return $1.toUpperCase();
 	});
 }
-/* TODO: Test this.
- * http://snipplr.com/view/45323/remove-duplicate-values-from-array/
-Array.prototype.unique = function unique() { 
-	var i = 0; 
-	while (i < this.length) { 
-		var current = this[i]; 
-		for (k = this.length; k > i; k--) { 
-			if (this[k] === current) { 
-				this.splice(k,1);
-			}
-		} i++; 
-	} 
-	return this; 
-}
-*/
 
 String.prototype.strip_tags = function(){
 	tags = this;
@@ -1337,7 +1322,7 @@ $(document).ready(function(){
 	}
 
 	$('#contacts_propertymenu_button').live('click',function(){
-		$('#contacts_propertymenu').is(':hidden') && $('#contacts_propertymenu').show() || $('#contacts_propertymenu').hide();
+		$('#contacts_propertymenu').is(':hidden') && $('#contacts_propertymenu').slideDown() || $('#contacts_propertymenu').slideUp();
 	});
 	$('#contacts_propertymenu a').live('click',function(){
 		Contacts.UI.Card.addProperty(this);
diff --git a/apps/contacts/js/jquery.jec-1.3.3.js b/apps/contacts/js/jquery.jec-1.3.3.js
deleted file mode 100644
index a0367dac2ae..00000000000
--- a/apps/contacts/js/jquery.jec-1.3.3.js
+++ /dev/null
@@ -1,863 +0,0 @@
-/**
- * jQuery jEC (jQuery Editable Combobox) 1.3.3
- * http://code.google.com/p/jquery-jec
- *
- * Copyright (c) 2008-2009 Lukasz Rajchel (lukasz@rajchel.pl | http://rajchel.pl)
- * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
- * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
- *
- * Documentation :  http://code.google.com/p/jquery-jec/wiki/Documentation
- * Changelog     :  http://code.google.com/p/jquery-jec/wiki/Changelog
- *
- * Contributors  :  Lukasz Rajchel, Artem Orlov
- */
-
-/*jslint maxerr: 50, indent: 4, maxlen: 120*/
-/*global Array, Math, String, clearInterval, document, jQuery, setInterval*/
-/*members ':', Handle, Remove, Set, acceptedKeys, addClass, all, append, appendTo, array, attr, before, bind,
-blinkingCursor, blinkingCursorInterval, blur, bool, browser, ceil, change, charCode, classes, clearCursor, click, css,
-cursorState, data, destroy, disable, each, editable, enable, eq, expr, extend, filter, find, floor, fn, focus,
-focusOnNewOption, fromCharCode, get, getId, handleCursor, ignoredKeys, ignoreOptGroups, inArray, init, initJS, integer,
-isArray, isPlainObject, jEC, jECTimer, jec, jecKill, jecOff, jecOn, jecPref, jecValue, keyCode, keyDown, keyPress,
-keyRange, keyUp, keys, length, max, maxLength, min, msie, object, openedState, optionClasses, optionStyles, parent,
-position, pref, prop, push, random, remove, removeAttr, removeClass, removeData, removeProp, safari, setEditableOption,
-styles, substring, text, trigger, triggerChangeEvent, unbind, uneditable, useExistingOptions, val, value,
-valueIsEditable, which*/
-(function ($) {
-    'use strict';
-
-    $.jEC = (function () {
-        var pluginClass = 'jecEditableOption', cursorClass = 'hasCursor', options = {}, values = {}, lastKeyCode,
-            defaults, Validators, EventHandlers, Combobox, activeCombobox;
-
-        if ($.fn.prop === undefined) {
-            $.fn.extend({
-                'prop': function (key, valueSet) {
-                    if (valueSet) {
-                        $(this).attr(key, key);
-                    } else {
-                        $(this).removeAttr(key);
-                    }
-                },
-                'removeProp': function (key) {
-                    $(this).removeAttr(key);
-                }
-            });
-        }
-
-        defaults = {
-            position: 0,
-            ignoreOptGroups: false,
-            maxLength: 255,
-            classes: [],
-            styles: {},
-            optionClasses: [],
-            optionStyles: {},
-            triggerChangeEvent: false,
-            focusOnNewOption: false,
-            useExistingOptions: false,
-            blinkingCursor: false,
-            blinkingCursorInterval: 1000,
-            ignoredKeys: [],
-            acceptedKeys: [[32, 126], [191, 382]]
-        };
-
-        Validators = (function () {
-            return {
-                integer: function (value) {
-                    return typeof value === 'number' && Math.ceil(value) === Math.floor(value);
-                },
-
-                keyRange: function (value) {
-                    var min, max;
-                    if ($.isPlainObject(value)) {
-                        min = value.min;
-                        max = value.max;
-                    } else if ($.isArray(value) && value.length === 2) {
-                        min = value[0];
-                        max = value[1];
-                    }
-                    return Validators.integer(min) && Validators.integer(max) && min <= max;
-                }
-            };
-        }());
-
-        EventHandlers = (function () {
-            var getKeyCode;
-
-            getKeyCode = function (event) {
-                var charCode = event.charCode;
-                if (charCode !== undefined && charCode !== 0) {
-                    return charCode;
-                } else {
-                    return event.keyCode;
-                }
-            };
-
-            return {
-                // focus event handler
-                // enables blinking cursor
-                focus: function () {
-                    var opt = options[Combobox.getId($(this))];
-                    if (opt.blinkingCursor && $.jECTimer === undefined) {
-                        activeCombobox = $(this);
-                        $.jECTimer = setInterval($.jEC.handleCursor, opt.blinkingCursorInterval);
-                    }
-                },
-
-                // blur event handler
-                // disables blinking cursor
-                blur: function () {
-                    if ($.jECTimer !== undefined) {
-                        clearInterval($.jECTimer);
-                        $.jECTimer = undefined;
-                        activeCombobox = undefined;
-                        Combobox.clearCursor($(this));
-                    }
-                    Combobox.openedState($(this), false);
-                },
-
-                // keydown event handler
-                // handles keys pressed on select (backspace and delete must be handled
-                // in keydown event in order to work in IE)
-                keyDown: function (event) {
-					var keyCode = getKeyCode(event), option, value;
-
-                    lastKeyCode = keyCode;
-
-                    switch (keyCode) {
-                    case 8:  // backspace
-                    case 46: // delete
-                        option = $(this).find('option.' + pluginClass);
-                        if (option.val().length >= 1) {
-                            value = option.text().substring(0, option.text().length - 1);
-                            option.val(value).text(value).prop('selected', true);
-                        }
-                        return (keyCode !== 8);
-                    default:
-                        break;
-                    }
-                },
-
-                // keypress event handler
-                // handles the rest of the keys (keypress event gives more informations
-                // about pressed keys)
-                keyPress: function (event) {
-                    var keyCode = getKeyCode(event), opt = options[Combobox.getId($(this))],
-                        option, value, specialKeys, exit = false, text;
-
-                    Combobox.clearCursor($(this));
-                    if (keyCode !== 9 && keyCode !== 13 && keyCode !== 27) {
-                        // special keys codes
-                        specialKeys = [37, 38, 39, 40, 46];
-                        // handle special keys
-                        $.each(specialKeys, function (i, val) {
-							if (keyCode === val && keyCode === lastKeyCode) {
-                                exit = true;
-                            }
-                        });
-
-                        // don't handle ignored keys
-                        if (!exit && $.inArray(keyCode, opt.ignoredKeys) === -1) {
-                            // remove selection from all options
-                            $(this).find('option:selected').removeProp('selected');
-
-                            if ($.inArray(keyCode, opt.acceptedKeys) !== -1) {
-                                option = $(this).find('option.' + pluginClass);
-                                text = option.text();
-
-                                if (text.length < opt.maxLength) {
-                                    value = text + String.fromCharCode(getKeyCode(event));
-                                    option.val(value).text(value);
-                                }
-
-                                option.prop('selected', true);
-                            }
-                        }
-
-                        return false;
-                    }
-                },
-
-                keyUp: function () {
-					var opt = options[Combobox.getId($(this))];
-                    if (opt.triggerChangeEvent) {
-                        $(this).trigger('change');
-                    }
-                },
-
-                // change event handler
-                // handles editable option changing based on a pre-existing values
-                change: function () {
-                    var opt = options[Combobox.getId($(this))];
-                    if (opt.useExistingOptions) {
-                        Combobox.setEditableOption($(this));
-                    }
-                },
-
-                click: function () {
-                    if (!$.browser.safari) {
-                        Combobox.openedState($(this), !Combobox.openedState($(this)));
-                    }
-                }
-            };
-        }());
-
-        // Combobox
-        Combobox = (function () {
-            var Parameters, EditableOption, generateId, setup;
-
-            // validates and set combobox parameters
-            Parameters = (function () {
-                var Set, Remove, Handle;
-
-                Set = (function () {
-                    var parseKeys, Handles;
-
-                    parseKeys = function (value) {
-                        var keys = [];
-                        if ($.isArray(value)) {
-                            $.each(value, function (i, val) {
-                                var j, min, max;
-                                if (Validators.keyRange(val)) {
-                                    if ($.isArray(val)) {
-                                        min = val[0];
-                                        max = val[1];
-                                    } else {
-                                        min = val.min;
-                                        max = val.max;
-                                    }
-                                    for (j = min; j <= max; j += 1) {
-                                        keys.push(j);
-                                    }
-                                } else if (typeof val === 'number' && Validators.integer(val)) {
-                                    keys.push(val);
-                                }
-                            });
-                        }
-                        return keys;
-                    };
-
-                    Handles = (function () {
-                        return {
-                            integer: function (elem, name, value) {
-                                var id = Combobox.getId(elem), opt = options[id];
-                                if (opt !== undefined && Validators.integer(value)) {
-                                    opt[name] = value;
-                                    return true;
-                                }
-                                return false;
-                            },
-                            bool: function (elem, name, value) {
-                                var id = Combobox.getId(elem), opt = options[id];
-                                if (opt !== undefined && typeof value === 'boolean') {
-                                    opt[name] = value;
-                                    return true;
-                                }
-                                return false;
-                            },
-                            array: function (elem, name, value) {
-                                if (typeof value === 'string') {
-                                    value = [value];
-                                }
-                                var id = Combobox.getId(elem), opt = options[id];
-                                if (opt !== undefined && $.isArray(value)) {
-                                    opt[name] = value;
-                                    return true;
-                                }
-                                return false;
-                            },
-                            object: function (elem, name, value) {
-                                var id = Combobox.getId(elem), opt = options[id];
-                                if (opt !== undefined && value !== null && $.isPlainObject(value)) {
-                                    opt[name] = value;
-                                }
-                            },
-                            keys: function (elem, name, value) {
-                                var id = Combobox.getId(elem), opt = options[id];
-                                if (opt !== undefined && $.isArray(value)) {
-                                    opt[name] = parseKeys(value);
-                                }
-                            }
-                        };
-                    }());
-
-                    return {
-                        position: function (elem, value) {
-                            if (Handles.integer(elem, 'position', value)) {
-                                var id = Combobox.getId(elem), opt = options[id], optionsCount;
-                                optionsCount =
-                                    elem.find('option:not(.' + pluginClass + ')').length;
-                                if (value > optionsCount) {
-                                    opt.position = optionsCount;
-                                }
-                            }
-                        },
-
-                        ignoreOptGroups: function (elem, value) {
-                            Handles.bool(elem, 'ignoreOptGroups', value);
-                        },
-
-                        maxLength: function (elem, value) {
-                            if (Handles.integer(elem, 'maxLength', value)) {
-                                var id = Combobox.getId(elem), opt = options[id];
-                                if (value < 0 || value > 255) {
-                                    opt.maxLength = 255;
-                                }
-                            }
-                        },
-
-                        classes: function (elem, value) {
-                            Handles.array(elem, 'classes', value);
-                        },
-
-                        optionClasses: function (elem, value) {
-                            Handles.array(elem, 'optionClasses', value);
-                        },
-
-                        styles: function (elem, value) {
-                            Handles.object(elem, 'styles', value);
-                        },
-
-                        optionStyles: function (elem, value) {
-                            Handles.object(elem, 'optionStyles', value);
-                        },
-
-                        triggerChangeEvent: function (elem, value) {
-                            Handles.bool(elem, 'triggerChangeEvent', value);
-                        },
-
-                        focusOnNewOption: function (elem, value) {
-                            Handles.bool(elem, 'focusOnNewOption', value);
-                        },
-
-                        useExistingOptions: function (elem, value) {
-                            Handles.bool(elem, 'useExistingOptions', value);
-                        },
-
-                        blinkingCursor: function (elem, value) {
-                            Handles.bool(elem, 'blinkingCursor', value);
-                        },
-
-                        blinkingCursorInterval: function (elem, value) {
-                            Handles.integer(elem, 'blinkingCursorInterval', value);
-                        },
-
-                        ignoredKeys: function (elem, value) {
-                            Handles.keys(elem, 'ignoredKeys', value);
-                        },
-
-                        acceptedKeys: function (elem, value) {
-                            Handles.keys(elem, 'acceptedKeys', value);
-                        }
-                    };
-                }());
-
-                Remove = (function () {
-                    var removeClasses, removeStyles;
-
-                    removeClasses = function (elem, classes) {
-                        $.each(classes, function (i, val) {
-							elem.removeClass(val);
-                        });
-                    };
-
-                    removeStyles = function (elem, styles) {
-                        $.each(styles, function (key) {
-                            elem.css(key, '');
-                        });
-                    };
-
-                    return {
-                        classes: function (elem) {
-                            var id = Combobox.getId(elem), opt = options[id];
-                            if (opt !== undefined) {
-                                removeClasses(elem, opt.classes);
-                            }
-                        },
-
-                        optionClasses: function (elem) {
-                            var id = Combobox.getId(elem), opt = options[id];
-                            if (opt !== undefined) {
-                                removeClasses(elem.find('option.' + pluginClass),
-                                    opt.optionClasses);
-                            }
-                        },
-
-                        styles: function (elem) {
-                            var id = Combobox.getId(elem), opt = options[id];
-                            if (opt !== undefined) {
-                                removeStyles(elem, opt.styles);
-                            }
-                        },
-
-                        optionStyles: function (elem) {
-                            var id = Combobox.getId(elem), opt = options[id];
-                            if (opt !== undefined) {
-                                removeStyles(elem.find('option.' + pluginClass),
-                                    opt.optionStyles);
-                            }
-                        },
-
-                        all: function (elem) {
-                            Remove.classes(elem);
-                            Remove.optionClasses(elem);
-                            Remove.styles(elem);
-                            Remove.optionStyles(elem);
-                        }
-                    };
-                }());
-
-                Handle = (function () {
-                    var setClasses, setStyles;
-
-                    setClasses = function (elem, classes) {
-                        $.each(classes, function (i, val) {
-                            elem.addClass(String(val));
-                        });
-                    };
-
-                    setStyles = function (elem, styles) {
-                        $.each(styles, function (key, val) {
-                            elem.css(key, val);
-                        });
-                    };
-
-                    return {
-                        position: function (elem) {
-                            var opt = options[Combobox.getId(elem)], option, uneditableOptions, container;
-                            option = elem.find('option.' + pluginClass);
-
-                            uneditableOptions = elem.find('option:not(.' + pluginClass + ')');
-                            if (opt.position < uneditableOptions.length) {
-                                container = uneditableOptions.eq(opt.position);
-
-                                if (!opt.ignoreOptGroups && container.parent('optgroup').length > 0) {
-                                    uneditableOptions.eq(opt.position).parent().before(option);
-                                } else {
-                                    uneditableOptions.eq(opt.position).before(option);
-                                }
-                            } else {
-                                elem.append(option);
-                            }
-                        },
-
-                        classes: function (elem) {
-                            var id = Combobox.getId(elem), opt = options[id];
-                            if (opt !== undefined) {
-                                setClasses(elem, opt.classes);
-                            }
-                        },
-
-                        optionClasses: function (elem) {
-                            var id = Combobox.getId(elem), opt = options[id];
-                            if (opt !== undefined) {
-                                setClasses(elem.find('option.' + pluginClass), opt.optionClasses);
-                            }
-                        },
-
-                        styles: function (elem) {
-                            var id = Combobox.getId(elem), opt = options[id];
-                            if (opt !== undefined) {
-                                setStyles(elem, opt.styles);
-                            }
-                        },
-
-                        optionStyles: function (elem) {
-                            var id = Combobox.getId(elem), opt = options[id];
-                            if (opt !== undefined) {
-                                setStyles(elem.find('option.' + pluginClass), opt.optionStyles);
-                            }
-                        },
-
-                        focusOnNewOption: function (elem) {
-                            var id = Combobox.getId(elem), opt = options[id];
-                            if (opt !== undefined && opt.focusOnNewOption) {
-                                elem.find(':not(option.' + pluginClass + ')').removeProp('selected');
-                                elem.find('option.' + pluginClass).prop('selected', true);
-                            }
-                        },
-
-                        useExistingOptions: function (elem) {
-                            var id = Combobox.getId(elem), opt = options[id];
-                            if (opt !== undefined && opt.useExistingOptions) {
-                                Combobox.setEditableOption(elem);
-                            }
-                        },
-
-                        all: function (elem) {
-                            Handle.position(elem);
-                            Handle.classes(elem);
-                            Handle.optionClasses(elem);
-                            Handle.styles(elem);
-                            Handle.optionStyles(elem);
-                            Handle.focusOnNewOption(elem);
-                            Handle.useExistingOptions(elem);
-                        }
-                    };
-                }());
-
-                return {
-                    Set: Set,
-                    Remove: Remove,
-                    Handle: Handle
-                };
-            }());
-
-            EditableOption = (function () {
-                return {
-                    init: function (elem) {
-                        if (!elem.find('option.' + pluginClass).length) {
-                            var editableOption = $('<option>');
-                            editableOption.addClass(pluginClass);
-                            elem.append(editableOption);
-                        }
-
-                        elem.bind('keydown', EventHandlers.keyDown);
-                        elem.bind('keypress', EventHandlers.keyPress);
-                        elem.bind('keyup', EventHandlers.keyUp);
-                        elem.bind('change', EventHandlers.change);
-                        elem.bind('focus', EventHandlers.focus);
-                        elem.bind('blur', EventHandlers.blur);
-                        elem.bind('click', EventHandlers.click);
-                    },
-
-                    destroy: function (elem) {
-                        elem.find('option.' + pluginClass).remove();
-
-                        elem.unbind('keydown', EventHandlers.keyDown);
-                        elem.unbind('keypress', EventHandlers.keyPress);
-                        elem.unbind('keyup', EventHandlers.keyUp);
-                        elem.unbind('change', EventHandlers.change);
-                        elem.unbind('focus', EventHandlers.focus);
-                        elem.unbind('blur', EventHandlers.blur);
-                        elem.unbind('click', EventHandlers.click);
-                    }
-                };
-            }());
-
-            // generates unique identifier
-            generateId = function () {
-                while (true) {
-                    var random = Math.floor(Math.random() * 100000);
-
-                    if (options[random] === undefined) {
-                        return random;
-                    }
-                }
-            };
-
-            // sets combobox
-            setup = function (elem) {
-                EditableOption.init(elem);
-                Parameters.Handle.all(elem);
-            };
-
-            // Combobox public members
-            return {
-                // create editable combobox
-                init: function (settings) {
-                    return $(this).filter(':uneditable').each(function () {
-                        var id = generateId(), elem = $(this);
-
-                        elem.data('jecId', id);
-
-                        // override passed default options
-                        options[id] = $.extend(true, {}, defaults);
-
-                        // parse keys
-                        Parameters.Set.ignoredKeys(elem, options[id].ignoredKeys);
-                        Parameters.Set.acceptedKeys(elem, options[id].acceptedKeys);
-
-                        if ($.isPlainObject(settings)) {
-                            $.each(settings, function (key, val) {
-                                if (val !== undefined) {
-                                    switch (key) {
-                                    case 'position':
-                                        Parameters.Set.position(elem, val);
-                                        break;
-                                    case 'ignoreOptGroups':
-                                        Parameters.Set.ignoreOptGroups(elem, val);
-                                        break;
-                                    case 'maxLength':
-                                        Parameters.Set.maxLength(elem, val);
-                                        break;
-                                    case 'classes':
-                                        Parameters.Set.classes(elem, val);
-                                        break;
-                                    case 'optionClasses':
-                                        Parameters.Set.optionClasses(elem, val);
-                                        break;
-                                    case 'styles':
-                                        Parameters.Set.styles(elem, val);
-                                        break;
-                                    case 'optionStyles':
-                                        Parameters.Set.optionStyles(elem, val);
-                                        break;
-                                    case 'triggerChangeEvent':
-                                        Parameters.Set.triggerChangeEvent(elem, val);
-                                        break;
-                                    case 'focusOnNewOption':
-                                        Parameters.Set.focusOnNewOption(elem, val);
-                                        break;
-                                    case 'useExistingOptions':
-                                        Parameters.Set.useExistingOptions(elem, val);
-                                        break;
-                                    case 'blinkingCursor':
-                                        Parameters.Set.blinkingCursor(elem, val);
-                                        break;
-                                    case 'blinkingCursorInterval':
-                                        Parameters.Set.blinkingCursorInterval(elem, val);
-                                        break;
-                                    case 'ignoredKeys':
-                                        Parameters.Set.ignoredKeys(elem, val);
-                                        break;
-                                    case 'acceptedKeys':
-                                        Parameters.Set.acceptedKeys(elem, val);
-                                        break;
-                                    }
-                                }
-                            });
-                        }
-
-                        setup($(this));
-                    });
-                },
-
-                // creates editable combobox without using existing select elements
-                initJS: function (options, settings) {
-                    var select, addOptions;
-
-                    select = $('<select>');
-
-                    addOptions = function (elem, options) {
-                        if ($.isArray(options)) {
-                            $.each(options, function (i, val) {
-                                if ($.isPlainObject(val)) {
-                                    $.each(val, function (key, value) {
-                                        if ($.isArray(value)) {
-                                            var og = $('<optgroup>').attr('label', key);
-                                            addOptions(og, value);
-                                            og.appendTo(select);
-                                        } else if (typeof value === 'number' || typeof value === 'string') {
-                                            $('<option>').text(value).attr('value', key)
-                                                .appendTo(elem);
-                                        }
-                                    });
-                                } else if (typeof val === 'string' || typeof val === 'number') {
-                                    $('<option>').text(val).attr('value', val).appendTo(elem);
-                                }
-                            });
-                        }
-                    };
-
-                    addOptions(select, options);
-
-                    return select.jec(settings);
-                },
-
-                // destroys editable combobox
-                destroy: function () {
-                    return $(this).filter(':editable').each(function () {
-                        $(this).jecOff();
-                        $.removeData($(this).get(0), 'jecId');
-                        $.removeData($(this).get(0), 'jecCursorState');
-                        $.removeData($(this).get(0), 'jecOpenedState');
-                    });
-                },
-
-                // enable editablecombobox
-                enable: function () {
-                    return $(this).filter(':editable').each(function () {
-                        var id = Combobox.getId($(this)), value = values[id];
-
-                        setup($(this));
-
-                        if (value !== undefined) {
-                            $(this).jecValue(value);
-                        }
-                    });
-                },
-
-                // disable editable combobox
-                disable: function () {
-                    return $(this).filter(':editable').each(function () {
-                        var val = $(this).find('option.' + pluginClass).val();
-                        values[Combobox.getId($(this))] = val;
-                        Parameters.Remove.all($(this));
-                        EditableOption.destroy($(this));
-                    });
-                },
-
-                // gets or sets editable option's value
-                value: function (value, setFocus) {
-                    if ($(this).filter(':editable').length > 0) {
-                        if (value === null || value === undefined) {
-                            // get value
-                            return $(this).find('option.' + pluginClass).val();
-                        } else if (typeof value === 'string' || typeof value === 'number') {
-                            // set value
-                            return $(this).filter(':editable').each(function () {
-                                var option = $(this).find('option.' + pluginClass);
-                                option.val(value).text(value);
-                                if (typeof setFocus !== 'boolean' || setFocus) {
-                                    option.prop('selected', true);
-                                }
-                            });
-                        }
-                    }
-                },
-
-                // gets or sets editable option's preference
-                pref: function (name, value) {
-                    if ($(this).filter(':editable').length > 0) {
-                        if (typeof name === 'string') {
-                            if (value === null || value === undefined) {
-                                // get preference
-                                return options[Combobox.getId($(this))][name];
-                            } else {
-                                // set preference
-                                return $(this).filter(':editable').each(function () {
-                                    switch (name) {
-                                    case 'position':
-                                        Parameters.Set.position($(this), value);
-                                        Parameters.Handle.position($(this));
-                                        break;
-                                    case 'classes':
-                                        Parameters.Remove.classes($(this));
-                                        Parameters.Set.classes($(this), value);
-                                        Parameters.Handle.position($(this));
-                                        break;
-                                    case 'optionClasses':
-                                        Parameters.Remove.optionClasses($(this));
-                                        Parameters.Set.optionClasses($(this), value);
-                                        Parameters.Set.optionClasses($(this));
-                                        break;
-                                    case 'styles':
-                                        Parameters.Remove.styles($(this));
-                                        Parameters.Set.styles($(this), value);
-                                        Parameters.Set.styles($(this));
-                                        break;
-                                    case 'optionStyles':
-                                        Parameters.Remove.optionStyles($(this));
-                                        Parameters.Set.optionStyles($(this), value);
-                                        Parameters.Handle.optionStyles($(this));
-                                        break;
-                                    case 'focusOnNewOption':
-                                        Parameters.Set.focusOnNewOption($(this), value);
-                                        Parameters.Handle.focusOnNewOption($(this));
-                                        break;
-                                    case 'useExistingOptions':
-                                        Parameters.Set.useExistingOptions($(this), value);
-                                        Parameters.Handle.useExistingOptions($(this));
-                                        break;
-                                    case 'blinkingCursor':
-                                        Parameters.Set.blinkingCursor($(this), value);
-                                        break;
-                                    case 'blinkingCursorInterval':
-                                        Parameters.Set.blinkingCursorInterval($(this), value);
-                                        break;
-                                    case 'ignoredKeys':
-                                        Parameters.Set.ignoredKeys($(this), value);
-                                        break;
-                                    case 'acceptedKeys':
-                                        Parameters.Set.acceptedKeys($(this), value);
-                                        break;
-                                    }
-                                });
-                            }
-                        }
-                    }
-                },
-
-                // sets editable option to the value of currently selected option
-                setEditableOption: function (elem) {
-                    var value = elem.find('option:selected').text();
-                    elem.find('option.' + pluginClass).attr('value', elem.val()).text(value).prop('selected', true);
-                },
-
-                // get combobox id
-                getId: function (elem) {
-                    return elem.data('jecId');
-                },
-
-                valueIsEditable: function (elem) {
-                    return elem.find('option.' + pluginClass).get(0) === elem.find('option:selected').get(0);
-                },
-
-                clearCursor: function (elem) {
-                    $(elem).find('option.' + cursorClass).each(function () {
-                        var text = $(this).text();
-                        $(this).removeClass(cursorClass).text(text.substring(0, text.length - 1));
-                    });
-                },
-
-                cursorState: function (elem, state) {
-                    return elem.data('jecCursorState', state);
-                },
-
-                openedState: function (elem, state) {
-                    return elem.data('jecOpenedState', state);
-                },
-
-                //handles editable cursor
-                handleCursor: function () {
-                    if (activeCombobox !== undefined && activeCombobox !== null) {
-                        if ($.browser.msie && Combobox.openedState(activeCombobox)) {
-                            return;
-                        }
-
-                        var state = Combobox.cursorState(activeCombobox), elem;
-                        if (state) {
-                            Combobox.clearCursor(activeCombobox);
-                        } else if (Combobox.valueIsEditable(activeCombobox)) {
-                            elem = activeCombobox.find('option:selected');
-                            elem.addClass(cursorClass).text(elem.text() + '|');
-                        }
-                        Combobox.cursorState(activeCombobox, !state);
-                    }
-                }
-            };
-        }());
-
-        // jEC public members
-        return {
-            init: Combobox.init,
-            enable: Combobox.enable,
-            disable: Combobox.disable,
-            destroy: Combobox.destroy,
-            value: Combobox.value,
-            pref: Combobox.pref,
-            initJS: Combobox.initJS,
-            handleCursor: Combobox.handleCursor
-        };
-    }());
-
-    // register functions
-    $.fn.extend({
-        jec: $.jEC.init,
-        jecOn: $.jEC.enable,
-        jecOff: $.jEC.disable,
-        jecKill: $.jEC.destroy,
-        jecValue: $.jEC.value,
-        jecPref: $.jEC.pref
-    });
-
-    $.extend({
-        jec: $.jEC.initJS
-    });
-
-    // register selectors
-    $.extend($.expr[':'], {
-        editable: function (a) {
-            var data = $(a).data('jecId');
-            return data !== null && data !== undefined;
-        },
-
-        uneditable: function (a) {
-            var data = $(a).data('jecId');
-            return data === null || data === undefined;
-        }
-    });
-
-}(jQuery));
\ No newline at end of file
-- 
GitLab


From 0e2531ba57d5264e749f7129909b58518bbc4509 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 16 Feb 2012 10:35:35 +0100
Subject: [PATCH 509/546] Added method for loading from file handle.

---
 lib/image.php | 47 +++++++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index b1d3a14f415..fe8349be543 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -48,6 +48,11 @@ class OC_Image {
 	protected $imagetype = IMAGETYPE_PNG; // Default to png if file type isn't evident.
 	protected $filepath = null;
 
+	/**
+	* @brief Get mime type for an image file.
+	* @param $filepath The path to a local image file.
+	* @returns string The mime type if the it could be determined, otherwise an empty string.
+	*/
 	static public function getMimeTypeForFile($filepath) {
 		$imagetype = exif_imagetype($filepath);
 		return $imagetype ? image_type_to_mime_type($imagetype) : '';
@@ -281,24 +286,46 @@ class OC_Image {
 
 	/**
 	* @brief Loads an image from a local file, a base64 encoded string or a resource created by an imagecreate* function.
-	* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
+	* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function or a file resource (file handle	).
 	* @returns An image resource or false on error
 	*/
 	public function load($imageref) {
-		if($this->loadFromFile($imageref) !== false) {
+		if(is_resource($imageref)) {
+			if(get_resource_type($imageref) == 'gd') {
+				$this->resource = $res;
+				return $this->resource;
+			} elseif(in_array(get_resource_type($imageref), array('file','stream'))) {
+				return $this->loadFromFileHandle($imageref);
+			}
+		} elseif($this->loadFromFile($imageref) !== false) {
 			return $this->resource;
 		} elseif($this->loadFromBase64($imageref) !== false) {
 			return $this->resource;
 		} elseif($this->loadFromData($imageref) !== false) {
 			return $this->resource;
-		} elseif($this->loadFromResource($imageref) !== false) {
-			return $this->resource;
 		} else {
 			OC_Log::write('core',__METHOD__.'(): couldn\'t load anything. Giving up!', OC_Log::DEBUG);
 			return false;
 		}
 	}
 
+	/**
+	* @brief Loads an image from an open file handle.
+	* It is the responsibility of the caller to position the pointer at the correct place and to close the handle again.
+	* @param $handle 
+	* @returns An image resource or false on error
+	*/
+	public function loadFromFileHandle($handle) {
+		OC_Log::write('core',__METHOD__.'(): Trying', OC_Log::DEBUG);
+		$contents = '';
+		while (!feof($handle)) {
+			$contents .= fread($handle, 8192);
+		}
+		if($this->loadFromData($contents)) {
+			return $this->resource;
+		}
+	}
+
 	/**
 	* @brief Loads an image from a local file.
 	* @param $imageref The path to a local file.
@@ -424,18 +451,6 @@ class OC_Image {
 		}
 	}
 
-	/**
-	* @brief Checks if image resource is valid and assigns it to $this->resource.
-	* @param $res An image resource.
-	* @returns An image resource or false on error
-	*/
-	public function loadFromResource($res) {
-		if(!is_resource($res)) {
-			return false;
-		}
-		$this->resource = $res;
-	}
-
 	/**
 	* @brief Resizes the image preserving ratio.
 	* @param $maxsize The maximum size of either the width or height.
-- 
GitLab


From 86893ea78c6227187ac7a5de20fca7e711968447 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 16 Feb 2012 10:36:34 +0100
Subject: [PATCH 510/546] UI tweaks for name selector combobox.

---
 apps/contacts/css/contacts.css           | 1 +
 apps/contacts/templates/part.contact.php | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 8a85dd51c1e..384541f3751 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -20,6 +20,7 @@
 #firstrun { /*border: thin solid lightgray;*/ width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777;}
 #firstrun #selections { /*border: thin solid lightgray;*/ font-size:0.8em;  width: 100%; margin: 2em auto auto auto; clear: both; }
 
+#card input[type="text"].contacts_property,input[type="email"].contacts_property { width: 16em; }
 #card input[type="text"],input[type="email"],input[type="tel"],input[type="date"], select { background-color: #f8f8f8; border: 0 !important; -webkit-appearance:none !important; -moz-appearance:none  !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; float: left; }
 #card input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,input[type="email"]:hover,input[type="tel"]:hover,input[type="date"]:hover,input[type="date"],input[type="date"]:hover,input[type="date"]:active,input[type="date"]:active,input[type="date"]:active,input[type="email"]:active,input[type="tel"]:active, select:hover, select:focus, select:active { border: 0 !important; -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; float: left; }
 input[type="text"]:invalid,input[type="email"]:invalid,input[type="tel"]:invalid,input[type="date"]:invalid { background-color: #ffc0c0 !important; }
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index bca3d9cbc2a..408b595dc95 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -45,10 +45,6 @@ $id = isset($_['id']) ? $_['id'] : '';
 		<dt><label for="fn"><?php echo $l->t('Display name'); ?></label></dt>
 		<dd class="propertycontainer" data-element="FN">
 		<select id="fn_select" title="<?php echo $l->t('Format custom, Short name, Full name, Reverse or Reverse with comma'); ?>" style="width:16em;">
-			<option id="short" title="Short name"></option>
-			<option id="full" title="Full name"></option>
-			<option id="reverse" title="Reverse"></option>
-			<option id="reverse_comma" title="Reverse with comma"></option>
 		</select><a id="edit_name" class="edit" title="<?php echo $l->t('Edit name details'); ?>"></a>
 		</dd>
 		<dt style="display:none;" id="org_label" data-element="ORG"><label for="org"><?php echo $l->t('Organization'); ?></label></dt>
-- 
GitLab


From bcbebe390b2689de34f60d124d19c9154d531f5e Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 17 Feb 2012 21:33:39 +0100
Subject: [PATCH 511/546] Document OC_Response

---
 lib/response.php | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/lib/response.php b/lib/response.php
index 2fa0a5adcd3..3765f509c18 100644
--- a/lib/response.php
+++ b/lib/response.php
@@ -12,6 +12,13 @@ class OC_Response {
 	const STATUS_TEMPORARY_REDIRECT = 307;
 	const STATUS_NOT_FOUND = 404;
 
+	/**
+	* @brief Enable response caching by sending correct HTTP headers
+	* @param $cache_time time to cache the response
+	*  >0		cache time in seconds
+	*  0 and <0	enable default browser caching
+	*  null		cache indefinitly
+	*/
 	static public function enableCaching($cache_time = null) {
 		if (is_numeric($cache_time)) {
 			header('Pragma: public');// enable caching in IE
@@ -30,10 +37,19 @@ class OC_Response {
 		}
 
 	}
+
+	/**
+	* @brief disable browser caching
+	* @see enableCaching with cache_time = 0
+	*/
 	static public function disableCaching() {
 		self::enableCaching(0);
 	}
 
+	/**
+	* @brief Set response status
+	* @param $status a HTTP status code, see also the STATUS constants
+	*/
 	static public function setStatus($status) {
 		$protocol = $_SERVER['SERVER_PROTOCOL'];
 		switch($status) {
@@ -58,11 +74,21 @@ class OC_Response {
 		header($protocol.' '.$status);
 	}
 
+	/**
+	* @brief Send redirect response
+	* @param $location to redirect to
+	*/
 	static public function redirect($location) {
 		self::setStatus(self::STATUS_TEMPORARY_REDIRECT);
 		header('Location: '.$location);
 	}
 
+	/**
+	* @brief Set reponse expire time
+	* @param $expires date-time when the response expires
+	*  string for DateInterval from now
+	*  DateTime object when to expire response
+	*/
 	static public function setExpiresHeader($expires) {
 		if (is_string($expires) && $expires[0] == 'P') {
 			$interval = $expires;
@@ -76,6 +102,11 @@ class OC_Response {
 		header('Expires: '.$expires);
 	}
 
+	/**
+	* Checks and set ETag header, when the request matches sends a
+	* 'not modified' response
+	* @param $etag token to use for modification check
+	*/
 	static public function setETagHeader($etag) {
 		if (empty($etag)) {
 			return;
@@ -88,6 +119,11 @@ class OC_Response {
 		header('ETag: '.$etag);
 	}
 
+	/**
+	* Checks and set Last-Modified header, when the request matches sends a
+	* 'not modified' response
+	* @param $lastModified time when the reponse was last modified
+	*/
 	static public function setLastModifiedHeader($lastModified) {
 		if (empty($lastModified)) {
 			return;
@@ -106,6 +142,10 @@ class OC_Response {
 		header('Last-Modified: '.$lastModified);
 	}
 
+	/**
+	* @brief Send file as response, checking and setting caching headers
+	* @param $filepath of file to send
+	*/
 	static public function sendFile($filepath=null) {
 		$fp = fopen($filepath, 'rb');
 		if ($fp) {
-- 
GitLab


From f54c767d72b8380c181c218f378b25e5fbf75ce7 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 17 Feb 2012 21:35:31 +0100
Subject: [PATCH 512/546] Fix parameter of OC_Response::sendFile

---
 lib/response.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/response.php b/lib/response.php
index 3765f509c18..9edae3603b2 100644
--- a/lib/response.php
+++ b/lib/response.php
@@ -146,7 +146,7 @@ class OC_Response {
 	* @brief Send file as response, checking and setting caching headers
 	* @param $filepath of file to send
 	*/
-	static public function sendFile($filepath=null) {
+	static public function sendFile($filepath) {
 		$fp = fopen($filepath, 'rb');
 		if ($fp) {
 			self::setLastModifiedHeader(filemtime($filepath));
-- 
GitLab


From 5f3c54922773068091dfe8b40e3b407512ef4cfe Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 16 Feb 2012 19:16:31 +0100
Subject: [PATCH 513/546] Contacts: Add removed app enabled check

---
 apps/contacts/index.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index c5115d16074..0a21ddd04b6 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -10,6 +10,8 @@ require_once('../../lib/base.php');
 
 // Check if we are a user
 OC_Util::checkLoggedIn();
+OC_Util::checkAppEnabled('contacts');
+
 // Get active address books. This creates a default one if none exists.
 $ids = OC_Contacts_Addressbook::activeIds(OC_User::getUser());
 $contacts = OC_Contacts_VCard::all($ids);
-- 
GitLab


From f47444e1f776912cbf141ec9cc3763110f4e3552 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 16 Feb 2012 19:45:00 +0100
Subject: [PATCH 514/546] Use separate function to make absolute urls

---
 apps/bookmarks/templates/settings.php         |  2 +-
 apps/calendar/templates/calendar.php          |  2 +-
 apps/calendar/templates/settings.php          |  2 +-
 apps/contacts/templates/index.php             |  2 +-
 apps/contacts/templates/part.contactphoto.php |  2 +-
 apps/contacts/templates/part.cropphoto.php    |  4 ++--
 apps/contacts/templates/settings.php          |  2 +-
 apps/media/lib_ampache.php                    |  2 +-
 apps/media/templates/settings.php             |  2 +-
 apps/user_openid/appinfo/app.php              |  4 ++--
 apps/user_openid/user.php                     |  2 +-
 core/lostpassword/index.php                   |  2 +-
 index.php                                     |  2 +-
 lib/helper.php                                | 23 ++++++++++++++-----
 lib/util.php                                  |  6 ++---
 settings/templates/personal.php               |  2 +-
 16 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/apps/bookmarks/templates/settings.php b/apps/bookmarks/templates/settings.php
index 97b6b256c09..a985ee9d61b 100644
--- a/apps/bookmarks/templates/settings.php
+++ b/apps/bookmarks/templates/settings.php
@@ -8,7 +8,7 @@
 ?>
 <form id="bookmarks">
 		<fieldset class="personalblock">
-			<span class="bold"><?php echo $l->t('Bookmarklet:');?></span>&nbsp;<a class="bookmarks_addBml" href="javascript:(function(){url=encodeURIComponent(location.href);window.open('<?php echo OC_Helper::linkTo('bookmarks', 'addBm.php', null, true); ?>?url='+url, 'owncloud-bookmarks') })()"><?php echo $l->t('Add page to ownCloud'); ?></a>
+			<span class="bold"><?php echo $l->t('Bookmarklet:');?></span>&nbsp;<a class="bookmarks_addBml" href="javascript:(function(){url=encodeURIComponent(location.href);window.open('<?php echo OC_Helper::linkToAbsolute('bookmarks', 'addBm.php'); ?>?url='+url, 'owncloud-bookmarks') })()"><?php echo $l->t('Add page to ownCloud'); ?></a>
 			<br/><em><?php echo $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage.'); ?></em><br />
 		</fieldset>
 </form>
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 2d5cdea4d74..eb82d0d02ad 100755
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -18,7 +18,7 @@
 				var missing_field_totime = '<?php echo addslashes($l->t('To Time')) ?>';
 				var missing_field_startsbeforeends = '<?php echo addslashes($l->t('The event ends before it starts')) ?>';
 				var missing_field_dberror = '<?php echo addslashes($l->t('There was a database fail')) ?>';
-				var totalurl = '<?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?>/calendars';
+				var totalurl = '<?php echo OC_Helper::linkToAbsolute('calendar', 'caldav.php'); ?>/calendars';
 				$(document).ready(function() {
 				<?php
 				if(array_key_exists('showevent', $_)){
diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
index e174378d02d..979634874e4 100644
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@ -40,6 +40,6 @@
         </table>
 
         <?php echo $l->t('Calendar CalDAV syncing address:');?>
-        <?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?><br />
+        <?php echo OC_Helper::linkToAbsolute('calendar', 'caldav.php'); ?><br />
         </fieldset>
 </form>
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 4c0dfad6177..e81597f23d6 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -1,5 +1,5 @@
 <script type='text/javascript'>
-	var totalurl = '<?php echo OC_Helper::linkTo('contacts', 'carddav.php', null, true); ?>/addressbooks';
+	var totalurl = '<?php echo OC_Helper::linkToAbsolute('contacts', 'carddav.php'); ?>/addressbooks';
 </script>
 <div id="controls">
 	<form>
diff --git a/apps/contacts/templates/part.contactphoto.php b/apps/contacts/templates/part.contactphoto.php
index 7d7ab237561..9e3f5876cd1 100644
--- a/apps/contacts/templates/part.contactphoto.php
+++ b/apps/contacts/templates/part.contactphoto.php
@@ -3,7 +3,7 @@ $id = $_['id'];
 $wattr = isset($_['width'])?'width="'.$_['width'].'"':'';
 $hattr = isset($_['height'])?'height="'.$_['height'].'"':'';
 ?>
-<img class="loading" id="contacts_details_photo" <?php echo $wattr; ?> <?php echo $hattr; ?> src="<?php echo OC_Helper::linkTo('contacts', 'photo.php', null, true); ?>?id=<?php echo $id; ?>&amp;refresh=<?php echo rand(); ?>" />
+<img class="loading" id="contacts_details_photo" <?php echo $wattr; ?> <?php echo $hattr; ?> src="<?php echo OC_Helper::linkToAbsolute('contacts', 'photo.php'); ?>?id=<?php echo $id; ?>&amp;refresh=<?php echo rand(); ?>" />
 <progress id="contacts_details_photo_progress" style="display:none;" value="0" max="100">0 %</progress>
 
 
diff --git a/apps/contacts/templates/part.cropphoto.php b/apps/contacts/templates/part.cropphoto.php
index cb416f0e415..5faa4aa6ac6 100644
--- a/apps/contacts/templates/part.cropphoto.php
+++ b/apps/contacts/templates/part.cropphoto.php
@@ -38,13 +38,13 @@ OC_Log::write('contacts','templates/part.cropphoto.php: tmp_path: '.$tmp_path.',
 		return true;
 	});*/
 </script>
-<img id="cropbox" src="<?php echo OC_Helper::linkTo('contacts', 'dynphoto.php', null, true); ?>?tmp_path=<?php echo urlencode($tmp_path); ?>" />
+<img id="cropbox" src="<?php echo OC_Helper::linkToAbsolute('contacts', 'dynphoto.php'); ?>?tmp_path=<?php echo urlencode($tmp_path); ?>" />
 <form id="cropform"
 	class="coords"
 	method="post"
 	enctype="multipart/form-data"
 	target="crop_target"
-	action="<?php echo OC_Helper::linkTo('contacts', 'ajax/savecrop.php', null, true); ?>">
+	action="<?php echo OC_Helper::linkToAbsolute('contacts', 'ajax/savecrop.php'); ?>">
 
 	<input type="hidden" id="id" name="id" value="<?php echo $id; ?>" />
 	<input type="hidden" id="tmp_path" name="tmp_path" value="<?php echo $tmp_path; ?>" />
diff --git a/apps/contacts/templates/settings.php b/apps/contacts/templates/settings.php
index c647e44c25b..8673e4521d9 100644
--- a/apps/contacts/templates/settings.php
+++ b/apps/contacts/templates/settings.php
@@ -2,6 +2,6 @@
 	<fieldset class="personalblock">
 		<strong><?php echo $l->t('Contacts'); ?></strong><br />
 		<?php echo $l->t('CardDAV syncing address:'); ?>
-  		<?php echo OC_Helper::linkTo('apps/contacts', 'carddav.php', null, true); ?><br />
+		<?php echo OC_Helper::linkToAbsolute('contacts', 'carddav.php'); ?><br />
 	</fieldset>
 </form>
diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
index 138b65d1fd7..97c09308607 100644
--- a/apps/media/lib_ampache.php
+++ b/apps/media/lib_ampache.php
@@ -207,7 +207,7 @@ class OC_MEDIA_AMPACHE{
 		echo("\t\t<title>$name</title>\n");
 		echo("\t\t<artist id='$artist'>$artistName</artist>\n");
 		echo("\t\t<album id='$album'>$albumName</album>\n");
-		$url=OC_Helper::linkTo('media', 'server/xml.server.php', null, true)."?action=play&song=$id&auth={$_GET['auth']}";
+		$url=OC_Helper::linkToAbsolute('media', 'server/xml.server.php')."?action=play&song=$id&auth={$_GET['auth']}";
 		$url=self::fixXmlString($url);
 		echo("\t\t<url>$url</url>\n");
 		echo("\t\t<time>{$song['song_length']}</time>\n");
diff --git a/apps/media/templates/settings.php b/apps/media/templates/settings.php
index ac813c20850..2907c616cf6 100644
--- a/apps/media/templates/settings.php
+++ b/apps/media/templates/settings.php
@@ -2,6 +2,6 @@
 	<fieldset class="personalblock">
 		<strong>Media</strong><br />
 		Ampache address: 
-  		<?php echo OC_Helper::linkTo('apps/media', '', null, true); ?><br />
+		<?php echo OC_Helper::linkToAbsolute('media', ''); ?><br />
 	</fieldset>
 </form>
diff --git a/apps/user_openid/appinfo/app.php b/apps/user_openid/appinfo/app.php
index 912019a9700..cbcbe544221 100644
--- a/apps/user_openid/appinfo/app.php
+++ b/apps/user_openid/appinfo/app.php
@@ -14,8 +14,8 @@ if(strpos($_SERVER["REQUEST_URI"],'?') and !strpos($_SERVER["REQUEST_URI"],'='))
 	}
 }
 
-OC_Util::addHeader('link',array('rel'=>'openid.server', 'href'=>OC_Helper::linkTo( "user_openid", "user.php", null, true ).'/'.$userName));
-OC_Util::addHeader('link',array('rel'=>'openid.delegate', 'href'=>OC_Helper::linkTo( "user_openid", "user.php", null, true ).'/'.$userName));
+OC_Util::addHeader('link',array('rel'=>'openid.server', 'href'=>OC_Helper::linkToAbsolute( "user_openid", "user.php" ).'/'.$userName));
+OC_Util::addHeader('link',array('rel'=>'openid.delegate', 'href'=>OC_Helper::linkToAbsolute( "user_openid", "user.php" ).'/'.$userName));
 
 OC_APP::registerPersonal('user_openid','settings');
 
diff --git a/apps/user_openid/user.php b/apps/user_openid/user.php
index a267e020507..8fec713aa71 100644
--- a/apps/user_openid/user.php
+++ b/apps/user_openid/user.php
@@ -43,7 +43,7 @@ if(!OC_User::userExists($USERNAME)){
 	OC_Log::write('user_openid',$USERNAME.' doesn\'t exist',OC_Log::WARN);
 	$USERNAME='';
 }
-$IDENTITY=OC_Helper::linkTo( "user_openid", "user.php", null, true ).'/'.$USERNAME;
+$IDENTITY=OC_Helper::linkToAbsolute( "user_openid", "user.php" ).'/'.$USERNAME;
 
 require_once 'phpmyid.php';
 
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index ede94dab2d7..30caa2d23da 100644
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@ -16,7 +16,7 @@ if (isset($_POST['user'])) {
 		OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', $token);
 		$email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
 		if (!empty($email)) {
-			$link = OC_Helper::linkTo('core/lostpassword', 'resetpassword.php', null, true).'?user='.$_POST['user'].'&token='.$token;
+			$link = OC_Helper::linkToAbsolute('core/lostpassword', 'resetpassword.php').'?user='.$_POST['user'].'&token='.$token;
 			$tmpl = new OC_Template('core/lostpassword', 'email');
 			$tmpl->assign('link', $link);
 			$msg = $tmpl->fetchPage();
diff --git a/index.php b/index.php
index 9bd460be353..18ea3022bc5 100644
--- a/index.php
+++ b/index.php
@@ -44,7 +44,7 @@ if($not_installed) {
 
 // Handle WebDAV
 if($_SERVER['REQUEST_METHOD']=='PROPFIND'){
-	header('location: '.OC_Helper::linkTo('files','webdav.php'));
+	header('location: '.OC_Helper::linkToAbsolute('files','webdav.php'));
 	exit();
 }
 
diff --git a/lib/helper.php b/lib/helper.php
index 6d3df6d97e7..b1e6d053a19 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -54,12 +54,6 @@ class OC_Helper {
 			}
 		}
 
-		if($absolute){
-			// Checking if the request was made through HTTPS. The last in line is for IIS
-			$protocol = isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!='off');
-			$urlLinkTo = ($protocol?'https':'http') . '://'  . $_SERVER['HTTP_HOST'] . $urlLinkTo;
-		}
-
 		if($redirect_url)
 			return $urlLinkTo.'?redirect_url='.urlencode($_SERVER["REQUEST_URI"]);
 		else
@@ -67,6 +61,23 @@ class OC_Helper {
 
 	}
 
+	/**
+	 * @brief Creates an absolute url
+	 * @param $app app
+	 * @param $file file
+	 * @param $redirect_url redirect_url variable is appended to the URL
+	 * @returns the url
+	 *
+	 * Returns a absolute url to the given app and file.
+	 */
+	public static function linkToAbsolute( $app, $file, $redirect_url=NULL ) {
+		$urlLinkTo = self::linkTo( $app, $file, $redirect_url );
+		// Checking if the request was made through HTTPS. The last in line is for IIS
+		$protocol = isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!='off');
+		$urlLinkTo = ($protocol?'https':'http') . '://'  . $_SERVER['HTTP_HOST'] . $urlLinkTo;
+		return $urlLinkTo;
+	}
+
 	/**
 	 * @brief Creates path to an image
 	 * @param $app app
diff --git a/lib/util.php b/lib/util.php
index 43fb4413f04..4ba04fff3e8 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -248,7 +248,7 @@ class OC_Util {
 	*/
 	public static function checkAppEnabled($app){
 		if( !OC_App::isEnabled($app)){
-			header( 'Location: '.OC_Helper::linkTo( '', 'index.php' , true));
+			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ));
 			exit();
 		}
 	}
@@ -259,7 +259,7 @@ class OC_Util {
 	public static function checkLoggedIn(){
 		// Check if we are a user
 		if( !OC_User::isLoggedIn()){
-			header( 'Location: '.OC_Helper::linkTo( '', 'index.php' , true));
+			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ));
 			exit();
 		}
 	}
@@ -271,7 +271,7 @@ class OC_Util {
 		// Check if we are a user
 		self::checkLoggedIn();
 		if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
-			header( 'Location: '.OC_Helper::linkTo( '', 'index.php' , true));
+			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ));
 			exit();
 		}
 	}
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 80d2cb0a86f..57731d979d9 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -41,7 +41,7 @@
 
 <p class="personalblock">
 	<strong>WebDAV</strong>
-	<?php echo OC_Helper::linkTo('files', 'webdav.php', null, true); ?><br />
+	<?php echo OC_Helper::linkToAbsolute('files', 'webdav.php'); ?><br />
 	<em><?php echo $l->t('use this address to connect to your ownCloud in your file manager');?></em>
 </p>
 
-- 
GitLab


From e8b69d45a3afd9633b997eb178e159f9f97f4766 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 16 Feb 2012 19:48:20 +0100
Subject: [PATCH 515/546] Fixup use of OC_Helper::linkTo function

---
 apps/calendar/lib/search.php |  2 +-
 apps/contacts/lib/search.php |  2 +-
 apps/gallery/appinfo/app.php |  2 +-
 apps/media/lib_media.php     |  6 +++---
 files/index.php              |  6 +++---
 lib/app.php                  |  2 +-
 lib/search/provider/file.php | 10 +++++-----
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
index 425c93c7338..0016751a66a 100644
--- a/apps/calendar/lib/search.php
+++ b/apps/calendar/lib/search.php
@@ -36,7 +36,7 @@ class OC_Search_Provider_Calendar extends OC_Search_Provider{
 					}else{
 						$info = $l->t('Date') . ': ' . $start_dt->format('d.m.y H:i') . ' - ' . $end_dt->format('d.m.y H:i');
 					}
-					$link = OC_Helper::linkTo('apps/calendar', 'index.php?showevent='.urlencode($object['id']));
+					$link = OC_Helper::linkTo('calendar', 'index.php').'?showevent='.urlencode($object['id']);
 					$results[]=new OC_Search_Result($object['summary'],$info, $link,$l->t('Cal.'));//$name,$text,$link,$type
 				}
 			}
diff --git a/apps/contacts/lib/search.php b/apps/contacts/lib/search.php
index 97638821007..5aad6a25f09 100644
--- a/apps/contacts/lib/search.php
+++ b/apps/contacts/lib/search.php
@@ -18,7 +18,7 @@ class OC_Search_Provider_Contacts extends OC_Search_Provider{
 			$vcards = OC_Contacts_VCard::all($addressbook['id']);
 			foreach($vcards as $vcard){
 				if(substr_count(strtolower($vcard['fullname']), strtolower($query)) > 0){
-					$link = OC_Helper::linkTo('apps/contacts', 'index.php?id='.urlencode($vcard['id']));
+					$link = OC_Helper::linkTo('contacts', 'index.php').'?id='.urlencode($vcard['id']);
 					$results[]=new OC_Search_Result($vcard['fullname'],'', $link,$l->t('Contact'));//$name,$text,$link,$type
 				}
 			}
diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index da872274497..b8de32ea587 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -46,7 +46,7 @@ OC_App::addNavigationEntry( array(
 		$result = $stmt->execute(array(OC_User::getUser(),'%'.$query.'%'));
 		$results=array();
 		while($row=$result->fetchRow()){
-			$results[]=new OC_Search_Result($row['album_name'],'',OC_Helper::linkTo('apps/gallery', 'index.php?view='.$row['album_name']),'Galleries');
+			$results[]=new OC_Search_Result($row['album_name'],'',OC_Helper::linkTo('gallery', 'index.php').'?view='.$row['album_name'],'Galleries');
 		}
 		return $results;
 	}
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
index 0ade0e593dc..1bcd0f08c80 100644
--- a/apps/media/lib_media.php
+++ b/apps/media/lib_media.php
@@ -89,18 +89,18 @@ class OC_MediaSearchProvider extends OC_Search_Provider{
 		$songs=OC_MEDIA_COLLECTION::getSongs(0,0,$query);
 		$results=array();
 		foreach($artists as $artist){
-			$results[]=new OC_Search_Result($artist['artist_name'],'',OC_Helper::linkTo( 'apps/media', 'index.php#artist='.urlencode($artist['artist_name']) ),'Music');
+			$results[]=new OC_Search_Result($artist['artist_name'],'',OC_Helper::linkTo( 'media', 'index.php').'#artist='.urlencode($artist['artist_name']),'Music');
 		}
 		foreach($albums as $album){
 			$artist=OC_MEDIA_COLLECTION::getArtistName($album['album_artist']);
-			$results[]=new OC_Search_Result($album['album_name'],'by '.$artist,OC_Helper::linkTo( 'apps/media', 'index.php#artist='.urlencode($artist).'&album='.urlencode($album['album_name']) ),'Music');
+			$results[]=new OC_Search_Result($album['album_name'],'by '.$artist,OC_Helper::linkTo( 'media', 'index.php').'#artist='.urlencode($artist).'&album='.urlencode($album['album_name']),'Music');
 		}
 		foreach($songs as $song){
 			$minutes=floor($song['song_length']/60);
 			$secconds=$song['song_length']%60;
 			$artist=OC_MEDIA_COLLECTION::getArtistName($song['song_artist']);
 			$album=OC_MEDIA_COLLECTION::getalbumName($song['song_album']);
-			$results[]=new OC_Search_Result($song['song_name'],"by $artist, in $album $minutes:$secconds",OC_Helper::linkTo( 'apps/media', 'index.php#artist='.urlencode($artist).'&album='.urlencode($album).'&song='.urlencode($song['song_name']) ),'Music');
+			$results[]=new OC_Search_Result($song['song_name'],"by $artist, in $album $minutes:$secconds",OC_Helper::linkTo( 'media', 'index.php').'#artist='.urlencode($artist).'&album='.urlencode($album).'&song='.urlencode($song['song_name']),'Music');
 		}
 		return $results;
 	}
diff --git a/files/index.php b/files/index.php
index f166790ba9c..a29d3fb7e1e 100644
--- a/files/index.php
+++ b/files/index.php
@@ -76,11 +76,11 @@ foreach( explode( "/", $dir ) as $i ){
 // make breadcrumb und filelist markup
 $list = new OC_Template( "files", "part.list", "" );
 $list->assign( "files", $files );
-$list->assign( "baseURL", OC_Helper::linkTo("files", "index.php?dir="));
-$list->assign( "downloadURL", OC_Helper::linkTo("files", "download.php?file="));
+$list->assign( "baseURL", OC_Helper::linkTo("files", "index.php")."?dir=");
+$list->assign( "downloadURL", OC_Helper::linkTo("files", "download.php")."?file=");
 $breadcrumbNav = new OC_Template( "files", "part.breadcrumb", "" );
 $breadcrumbNav->assign( "breadcrumb", $breadcrumb );
-$breadcrumbNav->assign( "baseURL", OC_Helper::linkTo("files", "index.php?dir="));
+$breadcrumbNav->assign( "baseURL", OC_Helper::linkTo("files", "index.php")."?dir=");
 
 $upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
 $post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
diff --git a/lib/app.php b/lib/app.php
index 22d18b17eec..1879a89cee3 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -230,7 +230,7 @@ class OC_App{
 				// admin users menu
 				$settings[] = array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "settings", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "settings", "users.svg" ));
 				// admin apps menu
-				$settings[] = array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "settings", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" ));
+				$settings[] = array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "settings", "apps.php" ).'?installed', "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" ));
 				// admin log menu
 				$settings[] = array( "id" => "core_log", "order" => 4, "href" => OC_Helper::linkTo( "settings", "log.php" ), "name" => $l->t("Log"), "icon" => OC_Helper::imagePath( "settings", "log.svg" ));
 
diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php
index c3dc2942aef..34803c75aeb 100644
--- a/lib/search/provider/file.php
+++ b/lib/search/provider/file.php
@@ -7,7 +7,7 @@ class OC_Search_Provider_File extends OC_Search_Provider{
 		foreach($files as $fileData){
 			$file=$fileData['path'];
 			if($fileData['mime']=='httpd/unix-directory'){
-				$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'index.php?dir='.$file ),'Files');
+				$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'index.php' ).'?dir='.$file,'Files');
 			}else{
 				$mime=$fileData['mime'];
 				$mimeBase=$fileData['mimepart'];
@@ -15,16 +15,16 @@ class OC_Search_Provider_File extends OC_Search_Provider{
 					case 'audio':
 						break;
 					case 'text':
-						$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php?file='.$file ),'Text');
+						$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php' ).'?file='.$file,'Text');
 						break;
 					case 'image':
-						$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php?file='.$file ),'Images');
+						$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php' ).'?file='.$file,'Images');
 						break;
 					default:
 						if($mime=='application/xml'){
-							$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php?file='.$file ),'Text');
+							$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php' ).'?file='.$file,'Text');
 						}else{
-							$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php?file='.$file ),'Files');
+							$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php' ).'?file='.$file,'Files');
 						}
 				}
 			}
-- 
GitLab


From dab553147470a78dfbe0f220908e35f639d956f6 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 16 Feb 2012 21:01:13 +0100
Subject: [PATCH 516/546] Bookmarks: Fix image urls in bookmarks.js

---
 apps/bookmarks/js/bookmarks.js | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index 77f767cdb81..fadbbd5513a 100644
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -85,7 +85,14 @@ function addOrEditBookmark(event) {
 				$('.bookmarks_add').children('p').children('.bookmarks_input').val(''); 
 				$('.bookmarks_list').prepend(
 				'<div class="bookmark_single" data-id="' + bookmark_id + '" >' +
-					'<p class="bookmark_actions"><span class="bookmark_delete"><img src="img/delete.png" title="Delete"></span>&nbsp;<span class="bookmark_edit"><img src="img/edit.png" title="Edit"></span></p>' +
+					'<p class="bookmark_actions">' +
+						'<span class="bookmark_delete">' +
+							'<img class="svg" src="'+OC.imagePath('core', 'actions/delete')+'" title="Delete">' +
+						'</span>&nbsp;' +
+						'<span class="bookmark_edit">' +
+							'<img class="svg" src="'+OC.imagePath('core', 'actions/rename')+'" title="Edit">' +
+						'</span>' +
+					'</p>' +
 					'<p class="bookmark_title"><a href="' + url + '" target="_blank" class="bookmark_link">' + title + '</a></p>' +
 					'<p class="bookmark_tags">' + tagshtml + '</p>' +
 					'<p class="bookmark_url">' + url + '</p>' +
@@ -154,8 +161,17 @@ function updateBookmarksList(bookmark) {
 	}
 	$('.bookmarks_list').append(
 		'<div class="bookmark_single" data-id="' + bookmark.id +'" >' +
-			'<p class="bookmark_actions"><span class="bookmark_delete"><img src="img/delete.png" title="Delete"></span>&nbsp;<span class="bookmark_edit"><img src="img/edit.png" title="Edit"></span></p>' +
-			'<p class="bookmark_title"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a></p>' +
+			'<p class="bookmark_actions">' +
+				'<span class="bookmark_delete">' +
+					'<img class="svg" src="'+OC.imagePath('core', 'actions/delete')+'" title="Delete">' +
+				'</span>&nbsp;' +
+				'<span class="bookmark_edit">' +
+					'<img class="svg" src="'+OC.imagePath('core', 'actions/rename')+'" title="Edit">' +
+				'</span>' +
+			'</p>' +
+			'<p class="bookmark_title">'+
+				'<a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a>' +
+			'</p>' +
 			'<p class="bookmark_url">' + encodeEntities(bookmark.url) + '</p>' +
 		'</div>'
 	);
-- 
GitLab


From a33b757b192384e612f278feeb30d998b3816a4d Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 17 Feb 2012 21:36:55 +0100
Subject: [PATCH 517/546] Calendar: Add default repeat values when editing a
 non-repeating event

---
 apps/calendar/ajax/editeventform.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/ajax/editeventform.php b/apps/calendar/ajax/editeventform.php
index 9ae3ffa8d94..19f6a80a167 100644
--- a/apps/calendar/ajax/editeventform.php
+++ b/apps/calendar/ajax/editeventform.php
@@ -243,6 +243,16 @@ if($repeat['repeat'] != 'doesnotrepeat'){
 	$tmpl->assign('repeat_bymonth', $repeat['bymonth']);
 	$tmpl->assign('repeat_byweekno', $repeat['byweekno']);
 }
+else {
+	$tmpl->assign('repeat_month', 'monthday');
+	$tmpl->assign('repeat_weekdays', array());
+	$tmpl->assign('repeat_interval', 1);
+	$tmpl->assign('repeat_end', 'never');
+	$tmpl->assign('repeat_count', '10');
+	$tmpl->assign('repeat_weekofmonth', 'auto');
+	$tmpl->assign('repeat_date', '');
+	$tmpl->assign('repeat_year', 'bydate');
+}
 $tmpl->printpage();
 
-?>
\ No newline at end of file
+?>
-- 
GitLab


From 539fd7240c463d71ea885ca1c2a1eb292a7cceac Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 17 Feb 2012 21:39:54 +0100
Subject: [PATCH 518/546] Calendar: optimize sending calendar events, also
 enabled caching of result

---
 apps/calendar/ajax/events.php  | 30 +++++++++++++++++++-----------
 apps/calendar/lib/calendar.php |  1 +
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index dd593ddec99..7734129bd95 100755
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -9,7 +9,8 @@
 require_once ('../../../lib/base.php');
 require_once('../../../3rdparty/when/When.php');
 
-function addoutput($event, $vevent, $return_event){
+function create_return_event($event, $vevent){
+	$return_event = array();
 	$return_event['id'] = (int)$event['id'];
 	$return_event['title'] = htmlspecialchars($event['summary']);
 	$return_event['description'] = isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'';
@@ -29,15 +30,21 @@ OC_JSON::checkAppEnabled('calendar');
 $start = DateTime::createFromFormat('U', $_GET['start']);
 $end = DateTime::createFromFormat('U', $_GET['end']);
 
+$calendar = OC_Calendar_App::getCalendar($_GET['calendar_id']);
+OC_Response::enableCaching(0);
+OC_Response::setETagHeader($calendar['ctag']);
+
 $events = OC_Calendar_Object::allInPeriod($_GET['calendar_id'], $start, $end);
 $user_timezone = OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
 $return = array();
 foreach($events as $event){
 	$object = OC_VObject::parse($event['calendardata']);
 	$vevent = $object->VEVENT;
+
+	$return_event = create_return_event($event, $vevent);
+
 	$dtstart = $vevent->DTSTART;
 	$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-	$return_event = array();
 	$start_dt = $dtstart->getDateTime();
 	$end_dt = $dtend->getDateTime();
 	if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
@@ -47,13 +54,17 @@ foreach($events as $event){
 		$start_dt->setTimezone(new DateTimeZone($user_timezone));
 		$end_dt->setTimezone(new DateTimeZone($user_timezone));
 	}
+
 	//Repeating Events
 	if($event['repeating'] == 1){
 		$duration = (double) $end_dt->format('U') - (double) $start_dt->format('U');
 		$r = new When();
-		$r->recur((string) $start_dt->format('Ymd\THis'))->rrule((string) $vevent->RRULE);
+		$r->recur($start_dt)->rrule((string) $vevent->RRULE);
 		while($result = $r->next()){
-			if($result->format('U') > $_GET['end']){
+			if($result < $start){
+				continue;
+			}
+			if($result > $end){
 				break;
 			}
 			if($return_event['allDay'] == true){
@@ -63,22 +74,19 @@ foreach($events as $event){
 				$return_event['start'] = $result->format('Y-m-d H:i:s');
 				$return_event['end'] = date('Y-m-d H:i:s', $result->format('U') + $duration);
 			}
-			$return[] = addoutput($event, $vevent, $return_event);
+			$return[] = $return_event;
 		}
 	}else{
-		$return_event = array();
-		if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
-			$return_event['allDay'] = true;
+		if($return_event['allDay'] == true){
 			$return_event['start'] = $start_dt->format('Y-m-d');
 			$end_dt->modify('-1 sec');
 			$return_event['end'] = $end_dt->format('Y-m-d');
 		}else{
 			$return_event['start'] = $start_dt->format('Y-m-d H:i:s');
 			$return_event['end'] = $end_dt->format('Y-m-d H:i:s');
-			$return_event['allDay'] = false;
 		}
-		$return[] = addoutput($event, $vevent, $return_event);
+		$return[] = $return_event;
 	}
 }
 OC_JSON::encodedPrint($return);
-?>
\ No newline at end of file
+?>
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 5e272991f20..679649582d8 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -246,6 +246,7 @@ class OC_Calendar_Calendar{
 			'backgroundColor' => '#'.$calendar['calendarcolor'],
 			'borderColor' => '#888',
 			'textColor' => 'black',
+			'cache' => true,
 		);
 	}
 }
-- 
GitLab


From 6bbd67c3c693ab3cc440be7342b3cc8b88806a18 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 17 Feb 2012 21:40:57 +0100
Subject: [PATCH 519/546] Calendar: only update default view when it really
 changed

---
 apps/calendar/js/calendar.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 6f1f52eafa1..517d2ce128b 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -689,7 +689,10 @@ $(document).ready(function(){
 		allDayText: allDayText,
 		viewDisplay: function(view) {
 			$('#datecontrol_date').html(view.title);
-			$.get(OC.filePath('calendar', 'ajax', 'changeview.php') + "?v="+view.name);
+			if (view.name != defaultView) {
+				$.get(OC.filePath('calendar', 'ajax', 'changeview.php') + "?v="+view.name);
+				defaultView = view.name;
+			}
 			Calendar.UI.setViewActive(view.name);
 			if (view.name == 'agendaWeek') {
 				$('#calendar_holder').fullCalendar('option', 'aspectRatio', 0.1);
-- 
GitLab


From bd7227bb934c6d618c46eb818c8ce0f6ecb64e29 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 17 Feb 2012 21:42:56 +0100
Subject: [PATCH 520/546] Spelling fix hint text

---
 lib/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/config.php b/lib/config.php
index 8d03271b3ea..ad1cd18fa15 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -174,7 +174,7 @@ class OC_Config{
 		$result=@file_put_contents( OC::$SERVERROOT."/config/config.php", $content );
 		if(!$result) {
 			$tmpl = new OC_Template( '', 'error', 'guest' );
-			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver use write access to the config directory in owncloud")));
+			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
 			$tmpl->printPage();
 			exit;
 		}
-- 
GitLab


From 45cff7b7378ff351158d9d93b879dcfc156171aa Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 17 Feb 2012 21:59:43 +0100
Subject: [PATCH 521/546] Move storing "last updated at" time to the app config

This way the config.php file is not changed every time you go to the
personal page. Step to make it possible to have a read-only config.php
most of the time
---
 lib/setup.php   | 5 +++--
 lib/updater.php | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/setup.php b/lib/setup.php
index eb32e84713f..3e46a3dcc9a 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -77,8 +77,6 @@ class OC_Setup {
 			OC_Config::setValue('datadirectory', $datadir);
  			OC_Config::setValue('dbtype', $dbtype);
  			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
- 			OC_Config::setValue('installedat',microtime(true));
- 			OC_Config::setValue('lastupdatedat',microtime(true));
 			if($dbtype == 'mysql') {
 				$dbuser = $options['dbuser'];
 				$dbpass = $options['dbpass'];
@@ -224,6 +222,9 @@ class OC_Setup {
 			}
 
 			if(count($error) == 0) {
+				OC_Appconfig::setValue('core', 'installedat',microtime(true));
+				OC_Appconfig::setValue('core', 'lastupdatedat',microtime(true));
+
 				//create the user and group
 				OC_User::createUser($username, $password);
 				OC_Group::createGroup('admin');
diff --git a/lib/updater.php b/lib/updater.php
index cc4a4602539..57623797ae5 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -29,12 +29,12 @@ class OC_Updater{
 	 * Check if a new version is available
 	 */
 	public static function check(){
-		OC_Config::setValue('lastupdatedat',microtime(true));
+		OC_Appconfig::setValue('core', 'lastupdatedat',microtime(true));
 
 		$updaterurl='http://apps.owncloud.com/updater.php';
 		$version=OC_Util::getVersion();
-		$version['installed']=OC_Config::getValue( "installedat");
-		$version['updated']=OC_Config::getValue( "lastupdatedat");
+		$version['installed']=OC_Config::getValue('installedat');
+		$version['updated']=OC_Appconfig::getValue('core', 'lastupdatedat', OC_Config::getValue( 'lastupdatedat'));
 		$version['updatechannel']='stable';
 		$versionstring=implode('x',$version);
 
-- 
GitLab


From 1fa05894d51235a46cf67812227d5e8363f87d54 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 17 Feb 2012 22:01:53 +0100
Subject: [PATCH 522/546] Move config.php writable test to update path

This should make it possible to use owncloud with a read-only config.php
---
 lib/base.php | 7 +++++++
 lib/util.php | 4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 8f169a5732f..880645ff79d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -171,6 +171,13 @@ class OC{
 					echo 'Error while upgrading the database';
 					die();
 				}
+				if(file_exists(OC::$SERVERROOT."/config/config.php") and !is_writable(OC::$SERVERROOT."/config/config.php")) {
+					$tmpl = new OC_Template( '', 'error', 'guest' );
+					$tmpl->assign('errors',array(1=>array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
+					$tmpl->printPage();
+					exit;
+				}
+
 				OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
 			}
 
diff --git a/lib/util.php b/lib/util.php
index 4ba04fff3e8..ee32d31bfd0 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -226,10 +226,6 @@ class OC_Util {
 			$errors[]=array('error'=>'PHP module ctype is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
 		}
 
-		if(file_exists(OC::$SERVERROOT."/config/config.php") and !is_writable(OC::$SERVERROOT."/config/config.php")){
-			$errors[]=array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver use write access to the config directory in owncloud");
-		}
-
 		return $errors;
 	}
 
-- 
GitLab


From 6f1ed85f0b6a7e675951a587f1308211b698a6d5 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Fri, 17 Feb 2012 21:56:20 -0500
Subject: [PATCH 523/546] Temporary fix for sharing files

---
 apps/files_sharing/lib_share.php | 15 +++++----
 lib/filestorage/google.php       | 55 ++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 lib/filestorage/google.php

diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index 049a74278b3..42739bdfba9 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -88,12 +88,15 @@ class OC_Share {
 					$uid = $uid."@".$gid;
 				}
 				$query->execute(array($uid_owner, $uid, $source, $target, $permissions));
-				// Clear the folder size cache for the 'Shared' folder
-// 				$clearFolderSize = OC_DB::prepare("DELETE FROM *PREFIX*foldersize WHERE path = ?");
-// 				$clearFolderSize->execute(array($sharedFolder));
-				// Emit post_create and post_write hooks to notify of a new file in the user's filesystem
-				OC_Hook::emit("OC_Filesystem", "post_create", array('path' => $target));
-				OC_Hook::emit("OC_Filesystem", "post_write", array('path' => $target));
+				// Add file to filesystem cache
+				$userDirectory = "/".OC_User::getUser()."/files";
+				$data = OC_Filecache::get(substr($source, strlen($userDirectory)));
+				$parentQuery = OC_DB::prepare('SELECT id FROM *PREFIX*fscache WHERE path=?');
+				$parentResult = $parentQuery->execute(array($sharedFolder))->fetchRow();
+				$parent = $parentResult['id'];
+				$is_writeable = $permissions & OC_Share::WRITE;
+				$cacheQuery = OC_DB::prepare('INSERT INTO *PREFIX*fscache(parent, name, path, size, mtime, ctime, mimetype, mimepart, user, writable) VALUES(?,?,?,?,?,?,?,?,?,?)');
+				$cacheQuery->execute(array($parent, basename($target), $target, $data['size'], $data['mtime'], $data['ctime'], $data['mimetype'], dirname($data['mimetype']), $uid, $is_writeable));
 			}
 		}
 	}
diff --git a/lib/filestorage/google.php b/lib/filestorage/google.php
new file mode 100644
index 00000000000..fc271f4e4ba
--- /dev/null
+++ b/lib/filestorage/google.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+* ownCloud
+*
+* @author Michael Gapczynski
+* @copyright 2012 Michael Gapczynski mtgap@owncloud.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class OC_Filestorage_Google extends OC_Filestorage_Common {
+	
+	private $auth;
+
+	public function __construct($parameters) {
+		
+	}
+	
+	private function connect() {
+	  
+	}
+	public function mkdir($path){}
+	public function rmdir($path){}
+	public function opendir($path){}
+	public function is_dir($path){}
+	public function is_file($path){}
+	public function stat($path){}
+	public function filetype($path){}
+	public function is_readable($path){}
+	public function is_writable($path){}
+	public function file_exists($path){}
+	public function unlink($path){}
+	public function rename($path1,$path2){}
+	public function fopen($path,$mode){}
+	public function toTmpFile($path){}
+	public function fromTmpFile($tmpPath,$path){}
+	public function fromUploadedFile($tmpPath,$path){}
+	public function getMimeType($path){}
+	public function hash($type,$path,$raw){}
+	public function free_space($path){}
+	public function search($query){}
+	public function getLocalFile($path){}
+}
\ No newline at end of file
-- 
GitLab


From 71aa36c3f16942cd35f550253b892f5be4116784 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 16 Feb 2012 23:24:23 +0100
Subject: [PATCH 524/546] ETags must be quoted.

---
 lib/response.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/response.php b/lib/response.php
index 9edae3603b2..a75135c0176 100644
--- a/lib/response.php
+++ b/lib/response.php
@@ -116,7 +116,7 @@ class OC_Response {
 			self::setStatus(self::STATUS_NOT_MODIFIED);
 			exit;
 		}
-		header('ETag: '.$etag);
+		header('ETag: "'.$etag.'"');
 	}
 
 	/**
-- 
GitLab


From 96612c506e08ce6b2fb39425c73f0a8d81a4cad8 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 17 Feb 2012 09:35:18 +0100
Subject: [PATCH 525/546] Removed obsolete commented code and made minor speed
 improvements. Added stub function for loading categories.

---
 apps/contacts/js/contacts.js             | 63 +++++++-----------------
 apps/contacts/templates/part.contact.php | 53 --------------------
 2 files changed, 17 insertions(+), 99 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 30793625746..c9d1dc30f03 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -117,7 +117,7 @@ Contacts={
 			$('#carddav_url_close').show();
 		},
 		messageBox:function(title, msg) {
-			if(msg.toLowerCase().indexOf('auth') > 0) {
+			if(msg.toLowerCase().indexOf('auth') != -1) {
 				// fugly hack, I know
 				alert(msg);
 			}
@@ -335,17 +335,6 @@ Contacts={
 						// Load first in list.
 						if($('#contacts li').length > 0) {
 							Contacts.UI.Card.update();
-							/*
-							var firstid = $('#contacts li:first-child').data('id');
-							console.log('trying to load: ' + firstid);
-							$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':firstid},function(jsondata){
-								if(jsondata.status == 'success'){
-									Contacts.UI.Card.loadContact(jsondata.data);
-								}
-								else{
-									Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
-								}
-							});*/
 						} else {
 							// load intro page
 							$.getJSON('ajax/loadintro.php',{},function(jsondata){
@@ -374,6 +363,7 @@ Contacts={
 				$('#rightcontent').data('id',this.id);
 				//console.log('loaded: ' + this.data.FN[0]['value']);
 				this.populateNameFields();
+				this.loadCategories();
 				this.loadPhoto();
 				this.loadMails();
 				this.loadPhones();
@@ -455,9 +445,6 @@ Contacts={
 					this.fullname += ', ' + this.honsuf;
 				}
 				$('#n').html(this.fullname);
-				//$('.jecEditableOption').attr('title', 'Custom');
-				//$('.jecEditableOption').text(this.fn);
-				//$('.jecEditableOption').attr('value', 0);
 				$('#fn_select option').remove();
 				$('#fn_select').combobox('value', this.fn);
 				var names = [this.fullname, this.givname + ' ' + this.famname, this.famname + ' ' + this.givname, this.famname + ', ' + this.givname];
@@ -466,17 +453,16 @@ Contacts={
 						.append($('<option></option>')
 						.text(value)); 
 				});
-				/*$('#full').text(this.fullname);
-				$('#short').text(this.givname + ' ' + this.famname);
-				$('#reverse').text(this.famname + ' ' + this.givname);
-				$('#reverse_comma').text(this.famname + ', ' + this.givname);*/
 				$('#contact_identity').find('*[data-element="N"]').data('checksum', this.data.N[0]['checksum']);
 				$('#contact_identity').find('*[data-element="FN"]').data('checksum', this.data.FN[0]['checksum']);
 				$('#contact_identity').show();
 			},
+			loadCategories:function(){
+				if(this.data.CATEGORIES) {
+					//
+				}
+			},
 			editNew:function(){ // add a new contact
-				//Contacts.UI.notImplemented();
-				//return false;
 				this.id = ''; this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
 				$.getJSON('ajax/newcontact.php',{},function(jsondata){
 					if(jsondata.status == 'success'){
@@ -713,12 +699,6 @@ Contacts={
 						.text(value)); 
 				});
 				
-				/*$('#short').text(n[1] + ' ' + n[0]);
-				$('#full').text(this.fullname);
-				$('#reverse').text(n[0] + ' ' + n[1]);
-				$('#reverse_comma').text(n[0] + ', ' + n[1]);*/
-				//$('#n').html(full);
-				//$('#fn').val(0);
 				if(this.id == '') {
 					var aid = $(dlg).find('#aid').val();
 					Contacts.UI.Card.add(n.join(';'), $('#short').text(), aid);
@@ -889,21 +869,22 @@ Contacts={
 			},
 			loadPhoto:function(){
 				if(this.data.PHOTO) {
+					$.getJSON('ajax/loadphoto.php',{'id':this.id},function(jsondata){
+						if(jsondata.status == 'success'){
+							//alert(jsondata.data.page);
+							$('#contacts_details_photo_wrapper').html(jsondata.data.page);
+						}
+						else{
+							Contacts.UI.messageBox(jsondata.data.message);
+						}
+					});
 					$('#file_upload_form').show();
 					$('#contacts_propertymenu a[data-type="PHOTO"]').parent().hide();
 				} else {
+					$('#contacts_details_photo_wrapper').empty();
 					$('#file_upload_form').hide();
 					$('#contacts_propertymenu a[data-type="PHOTO"]').parent().show();
 				}
-				$.getJSON('ajax/loadphoto.php',{'id':this.id},function(jsondata){
-					if(jsondata.status == 'success'){
-						//alert(jsondata.data.page);
-						$('#contacts_details_photo_wrapper').html(jsondata.data.page);
-					}
-					else{
-						Contacts.UI.messageBox(jsondata.data.message);
-					}
-				});
 			},
 			editPhoto:function(id, tmp_path){
 				//alert('editPhoto: ' + tmp_path);
@@ -1143,13 +1124,6 @@ $(document).ready(function(){
 		return false;
 	});
 
-	/**
-	 * Open blank form to add new contact.
-	 * FIXME: Load the same page but only show name data and popup the name edit dialog. 
-	 * On save load the page again with an id and show all fields.
-	 * NOTE: Or: Load the full page and popup name dialog modal. On success set the newly aquired ID, on
-	 * Cancel or failure give appropriate message and show ... something else :-P
-	 */
 	$('#contacts_newcontact').click(function(){
 		Contacts.UI.Card.editNew();
 	});
@@ -1175,9 +1149,6 @@ $(document).ready(function(){
 		return false;
 	});
 
-	/**
-	 * Delete currently selected contact TODO: and clear page
-	 */
 	$('#contacts_deletecard').live('click',function(){
 		Contacts.UI.Card.delete();
 	});
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 408b595dc95..5be20964f4b 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -70,14 +70,6 @@ $id = isset($_['id']) ? $_['id'] : '';
 				<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
 				<input type="email" required="required" class="nonempty contacts_property" style="width:15em;" name="value" value="" x-moz-errormessage="<?php echo $l->t('Please specify a valid email address.'); ?>" placeholder="<?php echo $l->t('Enter email address'); ?>" /><span class="listactions"><a onclick="Contacts.UI.mailTo(this)" class="mail" title="<?php echo $l->t('Mail to address'); ?>"></a>
 				<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete email address'); ?>"></a></span></li>
-			<?php
-			if(0) { /*foreach($card['EMAIL'] as $email) {*/
-			?>
-			<li class="propertycontainer" style="white-space: nowrap;" data-checksum="<?php echo $email['checksum'] ?>" data-element="EMAIL">
-				<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" <?php echo (isset($email['parameters']['PREF'])?'checked="checked"':''); ?> />
-				<input type="email" required="required" class="nonempty contacts_property" style="width:15em;" name="value" value="<?php echo $email['value'] ?>" placeholder="<?php echo $l->t('Enter email address'); ?>" /><span class="listactions"><a onclick="Contacts.UI.mailTo(this)" class="mail" title="<?php echo $l->t('Mail to address'); ?>"></a>
-				<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete email address'); ?>"></a></span></li>
-			<?php } ?>
 			</ul><!-- a id="add_email" class="add" title="<?php echo $l->t('Add email address'); ?>"></a -->
 		</div> <!-- email addresses-->
 
@@ -93,17 +85,6 @@ $id = isset($_['id']) ? $_['id'] : '';
 					<?php echo html_select_options($_['phone_types'], array()) ?>
 				</select>
 				<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete phone number'); ?>"></a></li>
-			<?php
-			if(0) { /*foreach($card['TEL'] as $phone) {*/
-			?>
-				<li class="propertycontainer" style="white-space: nowrap;" data-checksum="<?php echo $phone['checksum'] ?>" data-element="TEL">
-				<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" <?php echo (isset($phone['parameters']['PREF'])?'checked="checked"':''); ?> /> 
-				<input type="text" required="required" class="nonempty contacts_property" style="width:8em; border: 0px;" name="value" value="<?php echo $phone['value'] ?>" placeholder="<?php echo $l->t('Enter phone number'); ?>" />
-				<select class="contacts_property" multiple="multiple" name="parameters[TYPE][]">
-					<?php echo html_select_options($_['phone_types'], isset($phone['parameters']['TYPE'])?$phone['parameters']['TYPE']:array()) ?>
-				</select>
-				<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete phone number'); ?>"></a></li>
-			<?php } ?>
 			</ul><!-- a id="add_phone" class="add" title="<?php echo $l->t('Add phone number'); ?>"></a -->
 		</div> <!-- Phone numbers -->
 
@@ -118,40 +99,6 @@ $id = isset($_['id']) ? $_['id'] : '';
 			<span class="adr_type_label"></span><a class="globe" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.searchOSM(this);" title="<?php echo $l->t('View on map'); ?>"></a><a class="edit" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.Card.editAddress(this, false);" title="<?php echo $l->t('Edit address details'); ?>"></a><a class="delete" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="Delete address"></a>
 			</dt><dd><ul class="addresslist"></ul></dd></dl>
 
-			<?php if(0) { /*foreach($card['ADR'] as $address) {*/ ?>
-			<dl class="addresscard propertycontainer" data-checksum="<?php echo $address['checksum']; ?>" data-element="ADR">
-			<dt>
-			<input class="adr contacts_property" name="value" type="hidden" value="<?php echo implode(';',$address['value']); ?>" />
-				<input type="hidden" class="adr_type contacts_property" name="parameters[TYPE][]" value="<?php echo strtoupper(implode(',',$address['parameters'])); ?>" />
-				<span class="adr_type_label">
-				<?php 
-				if(count($address['parameters']) > 0) {
-					//array_walk($address['parameters'], ) Nah, this wont work...
-					$translated = array();
-					foreach($address['parameters'] as $type) {
-						$translated[] = $l->t(ucwords(strtolower($type)));
-					}
-					echo implode('/', $translated);
-				}
-				?></span><a class="globe" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.searchOSM(this);" title="<?php echo $l->t('View on map'); ?>"></a><a class="edit" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.Card.editAddress(this, false);" title="<?php echo $l->t('Edit address details'); ?>"></a><a class="delete" style="float:right;"  onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="Delete address"></a>
-			</dt>
-			<dd>
-			<ul class="addresslist">
-				<?php
-				$adr = $address['value'];
-				$tmp = ($adr[0]?'<li>'.$adr[0].'</li>':'');
-				$tmp .= ($adr[1]?'<li>'.$adr[1].'</li>':'');
-				$tmp .= ($adr[2]?'<li>'.$adr[2].'</li>':'');
-				$tmp .= ($adr[3]||$adr[5]?'<li>'.$adr[5].' '.$adr[3].'</li>':'');
-				$tmp .= ($adr[4]?'<li>'.$adr[4].'</li>':'');
-				$tmp .= ($adr[6]?'<li>'.$adr[6].'</li>':'');
-				echo $tmp;
-				
-				?>
-			</ul>
-			</dd>
-			</dl>
-			<?php } ?>
 		</fieldset>
 		</div>
 		</div> <!-- Addresses -->
-- 
GitLab


From 868cf6bb836c136d2ad881bf99710404c74507c3 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 17 Feb 2012 19:04:12 +0100
Subject: [PATCH 526/546] Avoid errors from missing GD library.

---
 apps/contacts/photo.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index 8dfbcb6fb10..298f1215e3c 100644
--- a/apps/contacts/photo.php
+++ b/apps/contacts/photo.php
@@ -13,10 +13,19 @@ require_once('../../lib/base.php');
 OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 
+function getStandardImage(){
+	OC_Response::setExpiresHeader('P10D');
+	OC_Response::enableCaching();
+	OC_Response::redirect(OC_Helper::imagePath('contacts', 'person_large.png'));
+}
+
 $id = $_GET['id'];
 
 $contact = OC_Contacts_App::getContactVCard($id);
 $image = new OC_Image();
+if(!$image) {
+	getStandardImage();
+}
 // invalid vcard
 if( is_null($contact)) {
 	OC_Log::write('contacts','photo.php. The VCard for ID '.$id.' is not RFC compatible',OC_Log::ERROR);
@@ -45,7 +54,8 @@ if( is_null($contact)) {
 }
 if (!$image->valid()) {
 	// Not found :-(
-	$image->loadFromFile('img/person_large.png');
+	getStandardImage();
+	//$image->loadFromFile('img/person_large.png');
 }
 header('Content-Type: '.$image->mimeType());
 $image->show();
-- 
GitLab


From 2ee2f87efee630d9f85c8fe11c783901c469addf Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 18 Feb 2012 11:42:58 +0100
Subject: [PATCH 527/546] Strip tags on address on client side.

---
 apps/contacts/js/contacts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index c9d1dc30f03..d33f983a429 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -815,7 +815,7 @@ Contacts={
 					checksum = Contacts.UI.checksumFor(obj);
 					container = Contacts.UI.propertyContainerFor(obj);
 				}
-				var adr = new Array($(dlg).find('#adr_pobox').val(),$(dlg).find('#adr_extended').val(),$(dlg).find('#adr_street').val(),$(dlg).find('#adr_city').val(),$(dlg).find('#adr_region').val(),$(dlg).find('#adr_zipcode').val(),$(dlg).find('#adr_country').val());
+				var adr = new Array($(dlg).find('#adr_pobox').val().strip_tags(),$(dlg).find('#adr_extended').val().strip_tags(),$(dlg).find('#adr_street').val().strip_tags(),$(dlg).find('#adr_city').val().strip_tags(),$(dlg).find('#adr_region').val().strip_tags(),$(dlg).find('#adr_zipcode').val().strip_tags(),$(dlg).find('#adr_country').val().strip_tags());
 				$(container).find('.adr').val(adr.join(';'));
 				$(container).find('.adr_type').val($(dlg).find('#adr_type').val());
 				$(container).find('.adr_type_label').html(t('contacts',ucwords($(dlg).find('#adr_type').val().toLowerCase())));
-- 
GitLab


From 71a2241aee6f5f372b43fe977e494fea8a98d9cd Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sat, 18 Feb 2012 23:53:10 +0000
Subject: [PATCH 528/546] Fixed call to OC_User. Thanks Burillo on IRC

---
 apps/contacts/lib/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 016bd2b791a..ff348403a9b 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -53,7 +53,7 @@ class OC_Contacts_App {
 				OC_Log::write('contacts', 'Addressbook not found: '. $id, OC_Log::ERROR);
 			}
 			else {
-				OC_Log::write('contacts', 'Addressbook('.$id.') is not from '.$OC_User::getUser(), OC_Log::ERROR);
+				OC_Log::write('contacts', 'Addressbook('.$id.') is not from '.OC_User::getUser(), OC_Log::ERROR);
 			}
 			OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('This is not your addressbook.')))); // Same here (as with the contact error). Could this error be improved?
 			exit();
-- 
GitLab


From 87627c7a503f10875d8fa0171624b6e586d1cc7b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sat, 18 Feb 2012 19:30:35 -0500
Subject: [PATCH 529/546] Fix overwriting of internal sharing for shared
 folders - bug oc-260

---
 apps/files_sharing/ajax/getitem.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/ajax/getitem.php b/apps/files_sharing/ajax/getitem.php
index 51fda6aed40..ba01adffb9a 100644
--- a/apps/files_sharing/ajax/getitem.php
+++ b/apps/files_sharing/ajax/getitem.php
@@ -8,6 +8,7 @@ require_once('../lib_share.php');
 $userDirectory = "/".OC_User::getUser()."/files";
 $source = $userDirectory.$_GET['source'];
 $path = $source;
+$users = array();
 if ($users = OC_Share::getMySharedItem($source)) {
 	for ($i = 0; $i < count($users); $i++) {
 		if ($users[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
@@ -19,7 +20,6 @@ $source = dirname($source);
 while ($source != "" && $source != "/" && $source != "." && $source != $userDirectory) {
 	if ($values = OC_Share::getMySharedItem($source)) {
 		$values = array_values($values);
-		$users = array();
 		$parentUsers = array();
 		for ($i = 0; $i < count($values); $i++) {
 			if ($values[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
-- 
GitLab


From 9d2379742b92b223dd2cc171e6a155533cabc889 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Sun, 19 Feb 2012 21:24:53 +0100
Subject: [PATCH 530/546] apps/calendar: update ctag after deleteFromDAVData

Without this clients won't see the update because they compare ctags
before fetching the actual calendar to reduce traffic.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 apps/calendar/lib/object.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index cbb1badf802..230c610d35a 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -194,6 +194,7 @@ class OC_Calendar_Object{
 	public static function deleteFromDAVData($cid,$uri){
 		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*calendar_objects WHERE calendarid = ? AND uri=?' );
 		$stmt->execute(array($cid,$uri));
+		OC_Calendar_Calendar::touchCalendar($cid);
 
 		return true;
 	}
-- 
GitLab


From 490c9db15da89797eea5c3e30fc9a0790bd60b32 Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Sun, 19 Feb 2012 20:18:27 -0500
Subject: [PATCH 531/546] Added bookmarklet for browser. Inspired by Google
 Bookmarks

---
 apps/bookmarks/addBm.php          |  3 ++-
 apps/bookmarks/css/bookmarks.css  | 15 ++++++++++++++-
 apps/bookmarks/templates/list.php |  6 +++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php
index 62ad5821dbf..f56022c42c2 100644
--- a/apps/bookmarks/addBm.php
+++ b/apps/bookmarks/addBm.php
@@ -40,6 +40,7 @@ $url = isset($_GET['url']) ? urldecode($_GET['url']) : '';
 $metadata = getURLMetadata($url);
 
 $tmpl->assign('URL', htmlentities($metadata['url'],ENT_COMPAT,'utf-8'));
-$tmpl->assign('TITLE', htmlentities($metadata['title'],ENT_COMPAT,'utf-8'));
+$title = isset($metadata['title']) ? $metadata['title'] : (isset($_GET['title']) ? $_GET['title'] : '');
+$tmpl->assign('TITLE', htmlentities($title,ENT_COMPAT,'utf-8'));
 
 $tmpl->printPage();
diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
index 48f0bede110..8dfdc8a07b9 100644
--- a/apps/bookmarks/css/bookmarks.css
+++ b/apps/bookmarks/css/bookmarks.css
@@ -83,4 +83,17 @@
 .loading_meta {
 	display: none;
 	margin-left: 5px;
-}
\ No newline at end of file
+}
+
+#footer {
+	color: #999;
+	font-size: medium;
+	text-align: center;
+	position: absolute;
+	bottom: 10px;
+	left: 0px;
+	width: 100%;
+	height: 20px;
+	visibility: visible;
+	display: block
+}
diff --git a/apps/bookmarks/templates/list.php b/apps/bookmarks/templates/list.php
index ccfe74f008f..d44a0ecbcdb 100644
--- a/apps/bookmarks/templates/list.php
+++ b/apps/bookmarks/templates/list.php
@@ -22,4 +22,8 @@
 </div>
 <div class="bookmarks_list">
 	<?php echo $l->t('You have no bookmarks'); ?>
-</div>
\ No newline at end of file
+</div>
+<div id="footer">
+Bookmark pages more easily. Drag this bookmarklet to the Bookmarks bar of your browser:
+<a style='background-color:#dddddd;border:1px groove #999; padding:5px;padding-top:0px;padding-bottom:2px; text-decoration:none; margin-top:5px' href='javascript:(function(){var a=window,b=document,c=encodeURIComponent,d=a.open("<?php echo OC_Helper::linkToAbsolute('bookmarks', 'addBm.php') ?>?output=popup&url="+c(b.location)+"&title="+c(b.title),"bkmk_popup","left="+((a.screenX||a.screenLeft)+10)+",top="+((a.screenY||a.screenTop)+10)+",height=510px,width=550px,resizable=1,alwaysRaised=1");a.setTimeout(function(){d.focus()},300)})();'>ownCloud bookmark</a>
+</div>
-- 
GitLab


From 7ff4e40b20dfeb937ff6dccbc87e42a8bc4f5115 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 16 Feb 2012 17:55:39 +0100
Subject: [PATCH 532/546] Combing LDAP backend with LDAP extended backend

---
 apps/user_ldap/appinfo/app.php        |  6 +--
 apps/user_ldap/templates/settings.php |  3 ++
 apps/user_ldap/user_ldap.php          | 78 +++++++++++++++++++++------
 3 files changed, 67 insertions(+), 20 deletions(-)

diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 3261708f590..5c56ca8191e 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -32,13 +32,13 @@ define('OC_USER_BACKEND_LDAP_DEFAULT_PORT', 389);
 define('OC_USER_BACKEND_LDAP_DEFAULT_DISPLAY_NAME', 'uid');
 
 // register user backend
-OC_User::useBackend( "LDAP" );
+OC_User::useBackend( 'LDAP' );
 
 // add settings page to navigation
 $entry = array(
-	'id' => "user_ldap_settings",
+	'id' => 'user_ldap_settings',
 	'order'=>1,
-	'href' => OC_Helper::linkTo( "user_ldap", "settings.php" ),
+	'href' => OC_Helper::linkTo( 'user_ldap', 'settings.php' ),
 	'name' => 'LDAP'
 );
 // OC_App::addNavigationSubEntry( "core_users", $entry);
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 2abb0b47291..5bbd5d4008d 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -12,6 +12,9 @@
 		<small><?php echo $l->t('Currently the display name field needs to be the same you matched %%uid against in the filter above, because ownCloud doesn\'t distinguish between user id and user name.');?></small></p>
 		<p><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1"<?php if ($_['ldap_tls']) echo ' checked'; ?>><label for="ldap_tls"><?php echo $l->t('Use TLS');?></label></p>
 		<p><input type="checkbox" id="ldap_nocase" name="ldap_nocase" value="1"<?php if ($_['ldap_nocase']) echo ' checked'; ?>><label for="ldap_nocase"><?php echo $l->t('Case insensitve LDAP server (Windows)');?></label></p>
+		<p><label for="ldap_quota">Quota Attribute</label><input type="text" id="ldap_quota" name="ldap_quota" value="<?php echo $_['ldap_quota']; ?>" />
+                <label for="ldap_quota_def">Quota Default</label><input type="text" id="ldap_quota_def" name="ldap_quota_def" value="<?php echo $_['ldap_quota_def']; ?>" />bytes</p>
+                <p><label for="ldap_email">Email Attribute</label><input type="text" id="ldap_email" name="ldap_email" value="<?php echo $_['ldap_email']; ?>" /></p>
 		<input type="submit" value="Save" />
 	</fieldset>
 </form>
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 106240e74b8..670d938ea95 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -36,6 +36,12 @@ class OC_USER_LDAP extends OC_User_Backend {
 	protected $ldap_tls;
 	protected $ldap_nocase;
 	protected $ldap_display_name;
+	protected $ldap_quota;
+	protected $ldap_quota_def;
+	protected $ldap_email;
+
+	// will be retrieved from LDAP server
+	protected $ldap_dc = false;
 
 	function __construct() {
 		$this->ldap_host = OC_Appconfig::getValue('user_ldap', 'ldap_host','');
@@ -47,6 +53,9 @@ class OC_USER_LDAP extends OC_User_Backend {
 		$this->ldap_tls = OC_Appconfig::getValue('user_ldap', 'ldap_tls', 0);
 		$this->ldap_nocase = OC_Appconfig::getValue('user_ldap', 'ldap_nocase', 0);
 		$this->ldap_display_name = OC_Appconfig::getValue('user_ldap', 'ldap_display_name', OC_USER_BACKEND_LDAP_DEFAULT_DISPLAY_NAME);
+		$this->ldap_quota_attr = OC_Appconfig::getValue('user_ldap', 'ldap_quota_attr','');
+		$this->ldap_quota_def = OC_Appconfig::getValue('user_ldap', 'ldap_quota_def','');
+		$this->ldap_email_attr = OC_Appconfig::getValue('user_ldap', 'ldap_email_attr','');
 
 		if( !empty($this->ldap_host)
 			&& !empty($this->ldap_port)
@@ -66,6 +75,28 @@ class OC_USER_LDAP extends OC_User_Backend {
 			ldap_unbind($this->ds);
 	}
 
+	private function setQuota( $uid ) {
+		if( !$this->ldap_dc )
+			return false;
+
+		$quota = $this->ldap_dc[$this->ldap_quota_attr][0];
+		$quota = $quota != -1 ? $quota : $this->ldap_quota_def;
+		OC_Preferences::setValue($uid, 'files', 'quota', $quota);
+	}
+
+	private function setEmail( $uid ) {
+		if( !$this->ldap_dc )
+			return false;
+
+		$email = OC_Preferences::getValue($uid, 'settings', 'email', '');
+		if ( !empty( $email ) )
+			return false;
+
+		$email = $this->ldap_dc[$this->ldap_email_attr][0];
+		OC_Preferences::setValue($uid, 'settings', 'email', $email);
+	}
+
+	//Connect to LDAP and store the resource
 	private function getDs() {
 		if(!$this->ds) {
 			$this->ds = ldap_connect( $this->ldap_host, $this->ldap_port );
@@ -74,18 +105,19 @@ class OC_USER_LDAP extends OC_User_Backend {
 						if($this->ldap_tls)
 							ldap_start_tls($this->ds);
 		}
-
+		//TODO: Not necessary to perform a bind each time, is it?
 		// login
 		if(!empty($this->ldap_dn)) {
 			$ldap_login = @ldap_bind( $this->ds, $this->ldap_dn, $this->ldap_password );
-			if(!$ldap_login)
+			if(!$ldap_login) {
 				return false;
+			}
 		}
 
 		return $this->ds;
 	}
 
-	private function getDn( $uid ) {
+	private function getDc( $uid ) {
 		if(!$this->configured)
 			return false;
 
@@ -99,31 +131,43 @@ class OC_USER_LDAP extends OC_User_Backend {
 		$sr = ldap_search( $this->getDs(), $this->ldap_base, $filter );
 		$entries = ldap_get_entries( $this->getDs(), $sr );
 
-		if( $entries['count'] == 0 )
+		if( $entries['count'] == 0 ) {
 			return false;
+		}
+
+		$this->ldap_dc = $entries[0];
 
-		return $entries[0]['dn'];
+		return $this->ldap_dc;
 	}
 
 	public function checkPassword( $uid, $password ) {
 		if(!$this->configured){
 			return false;
 		}
-		$dn = $this->getDn( $uid );
-		if( !$dn )
+		$dc = $this->getDc( $uid );
+		if( !$dc )
 			return false;
 
-		if (!@ldap_bind( $this->getDs(), $dn, $password ))
+		if (!@ldap_bind( $this->getDs(), $dc['dn'], $password )) {
 			return false;
-		
+		}
+
+		if(!empty($this->ldap_quota) && !empty($this->ldap_quota_def)) {
+			$this->setQuota($uid);
+		}
+
+		if(!empty($this->ldap_email_attr)) {
+			$this->setEmail($uid);
+		}
+
 		if($this->ldap_nocase) {
 			$filter = str_replace('%uid', $uid, $this->ldap_filter);
 			$sr = ldap_search( $this->getDs(), $this->ldap_base, $filter );
 			$entries = ldap_get_entries( $this->getDs(), $sr );
 			if( $entries['count'] == 1 ) {
 				foreach($entries as $row) {
-					$ldap_display_name  = strtolower($this->ldap_display_name);					
-					if(isset($row[$ldap_display_name])) {					
+					$ldap_display_name  = strtolower($this->ldap_display_name);
+					if(isset($row[$ldap_display_name])) {
 						return $row[$ldap_display_name][0];
 					}
 				}
@@ -131,12 +175,12 @@ class OC_USER_LDAP extends OC_User_Backend {
 			else {
 				return $uid;
 			}
-			
+
 		}
 		else {
 			return $uid;
 		}
-		
+
 	}
 
 	public function userExists( $uid ) {
@@ -146,17 +190,17 @@ class OC_USER_LDAP extends OC_User_Backend {
 		$dn = $this->getDn($uid);
 		return !empty($dn);
 	}
-	
+
 	public function getUsers()
 	{
 		if(!$this->configured)
 		return false;
-	
+
 		// connect to server
 		$ds = $this->getDs();
 		if( !$ds )
 			return false;
-	
+
 		// get users
 		$filter = 'objectClass=person';
 		$sr = ldap_search( $this->getDs(), $this->ldap_base, $filter );
@@ -169,7 +213,7 @@ class OC_USER_LDAP extends OC_User_Backend {
 				// TODO ldap_get_entries() seems to lower all keys => needs review
 				$ldap_display_name  = strtolower($this->ldap_display_name);
 				if(isset($row[$ldap_display_name])) {
-					$users[] = $row[$ldap_display_name][0];					
+					$users[] = $row[$ldap_display_name][0];
 				}
 			}
 			// TODO language specific sorting of user names
-- 
GitLab


From 30d524b4260fe3e920b6be1f3818a0fbcbb5adfc Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 20 Feb 2012 11:21:46 +0100
Subject: [PATCH 533/546] load apps before logout so that logout-hook works

---
 index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 18ea3022bc5..b4cac1879c6 100644
--- a/index.php
+++ b/index.php
@@ -51,6 +51,7 @@ if($_SERVER['REQUEST_METHOD']=='PROPFIND'){
 // Someone is logged in :
 elseif(OC_User::isLoggedIn()) {
 	if(isset($_GET["logout"]) and ($_GET["logout"])) {
+		OC_App::loadApps();
 		OC_User::logout();
 		header("Location: ".OC::$WEBROOT.'/');
 		exit();
@@ -80,7 +81,7 @@ else {
 			OC_User::unsetMagicInCookie();
 		}
 	}
-	
+
 	// Someone wants to log in :
 	elseif(isset($_POST["user"]) && isset($_POST['password'])) {
 		if(OC_User::login($_POST["user"], $_POST["password"])) {
-- 
GitLab


From 12bcbcdc62989bec8222888320aa22aeda06c82c Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 19 Feb 2012 23:03:10 +0100
Subject: [PATCH 534/546] Update ctag in deleteFromDAVData.

---
 apps/contacts/lib/vcard.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index ece203bd458..17e95adff71 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -304,7 +304,7 @@ class OC_Contacts_VCard{
 	 * @return boolean
 	 */
 	public static function delete($id){
-		// FIXME: Add error checking.
+		// FIXME: Add error checking. Touch addressbook.
 		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE id = ?' );
 		$stmt->execute(array($id));
 
@@ -329,6 +329,7 @@ class OC_Contacts_VCard{
 		// FIXME: Add error checking. Deleting a card gives an Kontact/Akonadi error.
 		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri=?' );
 		$stmt->execute(array($aid,$uri));
+		OC_Contacts_Addressbook::touch($aid);
 
 		return true;
 	}
-- 
GitLab


From 456ada01fa44a5de3146f58ea5de60baffe31521 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 20 Feb 2012 14:36:21 +0100
Subject: [PATCH 535/546] Contacts: Apply strip_tags on compound values.

---
 apps/contacts/ajax/addproperty.php  | 1 +
 apps/contacts/ajax/saveproperty.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 03a45532f9b..028974e1c66 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -66,6 +66,7 @@ foreach($current as $item) {
 
 if(is_array($value)) {
 	ksort($value);  // NOTE: Important, otherwise the compound value will be set in the order the fields appear in the form!
+	$value = array_map('strip_tags', $value);
 } else {
 	$value = strip_tags($value);
 }
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index 6c8132c1dbf..0c9e0cc7836 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -52,6 +52,7 @@ $checksum = isset($_POST['checksum'])?$_POST['checksum']:null;
 // }
 
 if(is_array($value)){ // FIXME: How to strip_tags for compound values?
+	$value = array_map('strip_tags', $value);
 	ksort($value); // NOTE: Important, otherwise the compound value will be set in the order the fields appear in the form!
 	$value = OC_VObject::escapeSemicolons($value);
 } else {
-- 
GitLab


From ffdfe8257bb89750352553e71e863843e2416925 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 20 Feb 2012 15:24:54 +0100
Subject: [PATCH 536/546] Contacts: Fix adding/updating address book with empty
 name.

---
 apps/contacts/ajax/createaddressbook.php |  8 +++++++-
 apps/contacts/ajax/updateaddressbook.php |  9 ++++++++-
 apps/contacts/js/contacts.js             | 22 ++++++++++++++--------
 apps/contacts/js/interface.js            |  8 +++++---
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php
index fbd70bae583..28944fe864c 100644
--- a/apps/contacts/ajax/createaddressbook.php
+++ b/apps/contacts/ajax/createaddressbook.php
@@ -13,7 +13,13 @@ OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 
 $userid = OC_User::getUser();
-$bookid = OC_Contacts_Addressbook::add($userid, strip_tags($_POST['name']), null);
+$name = trim(strip_tags($_POST['name']));
+if(!$name) {
+	OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Cannot add addressbook with an empty name.'))));
+	OC_Log::write('contacts','ajax/createaddressbook.php: Cannot add addressbook with an empty name: '.strip_tags($_POST['name']), OC_Log::ERROR);
+	exit();
+}
+$bookid = OC_Contacts_Addressbook::add($userid, $name, null);
 if(!$bookid) {
 	OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error adding addressbook.'))));
 	OC_Log::write('contacts','ajax/createaddressbook.php: Error adding addressbook: '.$_POST['name'], OC_Log::ERROR);
diff --git a/apps/contacts/ajax/updateaddressbook.php b/apps/contacts/ajax/updateaddressbook.php
index b43b5b93a32..211df84b1d1 100644
--- a/apps/contacts/ajax/updateaddressbook.php
+++ b/apps/contacts/ajax/updateaddressbook.php
@@ -15,7 +15,14 @@ OC_JSON::checkAppEnabled('contacts');
 $bookid = $_POST['id'];
 OC_Contacts_App::getAddressbook($bookid); // is owner access check
 
-if(!OC_Contacts_Addressbook::edit($bookid, $_POST['name'], null)) {
+$name = trim(strip_tags($_POST['name']));
+if(!$name) {
+	OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Cannot update addressbook with an empty name.'))));
+	OC_Log::write('contacts','ajax/updateaddressbook.php: Cannot update addressbook with an empty name: '.strip_tags($_POST['name']), OC_Log::ERROR);
+	exit();
+}
+
+if(!OC_Contacts_Addressbook::edit($bookid, $name, null)) {
 	OC_JSON::error(array('data' => array('message' => $l->t('Error updating addressbook.'))));
 	OC_Log::write('contacts','ajax/updateaddressbook.php: Error adding addressbook: ', OC_Log::ERROR);
 	//exit();
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index d33f983a429..0e06b650a18 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1043,13 +1043,13 @@ Contacts={
 					return false;
 				}else{
 					$.post(OC.filePath('contacts', 'ajax', 'deletebook.php'), { id: bookid},
-					  function(data) {
-						if (data.status == 'success'){
+					  function(jsondata) {
+						if (jsondata.status == 'success'){
 							$('#chooseaddressbook_dialog').dialog('destroy').remove();
 							Contacts.UI.Contacts.update();
 							Contacts.UI.Addressbooks.overview();
 						} else {
-							Contacts.UI.messageBox(t('contacts', 'Error'), data.message);
+							Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
 							//alert('Error: ' + data.message);
 						}
 					  });
@@ -1059,10 +1059,14 @@ Contacts={
 				Contacts.UI.notImplemented();
 			},
 			submit:function(button, bookid){
-				var displayname = $("#displayname_"+bookid).val();
+				var displayname = $("#displayname_"+bookid).val().trim();
 				var active = $("#edit_active_"+bookid+":checked").length;
 				var description = $("#description_"+bookid).val();
-
+				
+				if(displayname.length == 0) {
+					Contacts.UI.messageBox(t('contacts', 'Error'), t('contacts', 'Displayname cannot be empty.'));
+					return false;
+				}
 				var url;
 				if (bookid == 'new'){
 					url = OC.filePath('contacts', 'ajax', 'createaddressbook.php');
@@ -1070,12 +1074,14 @@ Contacts={
 					url = OC.filePath('contacts', 'ajax', 'updateaddressbook.php');
 				}
 				$.post(url, { id: bookid, name: displayname, active: active, description: description },
-					function(data){
-						if(data.status == 'success'){
+					function(jsondata){
+						if(jsondata.status == 'success'){
 							$(button).closest('tr').prev().html(data.page).show().next().remove();
+							Contacts.UI.Contacts.update();
+						} else {
+							Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
 						}
 					});
-				Contacts.UI.Contacts.update();
 			},
 			cancel:function(button, bookid){
 				$(button).closest('tr').prev().show().next().remove();
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index fe58a46d247..5908dd767a2 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -124,12 +124,14 @@ Contacts={
 					url = OC.filePath('contacts', 'ajax', 'updateaddressbook.php');
 				}
 				$.post(url, { id: bookid, name: displayname, active: active, description: description },
-					function(data){
-						if(data.status == 'success'){
+					function(jsondata){
+						if(jsondata.status == 'success'){
 							$(button).closest('tr').prev().html(data.page).show().next().remove();
+							Contacts.UI.Contacts.update();
+						} else {
+							Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
 						}
 					});
-				Contacts.UI.Contacts.update();
 			},
 			cancel:function(button, bookid){
 				$(button).closest('tr').prev().show().next().remove();
-- 
GitLab


From d5f7a39936616479d576b946514ef8cddf85f05b Mon Sep 17 00:00:00 2001
From: VicDeo <victor.dubiniuk@gmail.com>
Date: Mon, 20 Feb 2012 23:54:23 +0300
Subject: [PATCH 537/546] Contact list scroll fix

---
 apps/contacts/js/jquery.inview.js | 52 ++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/apps/contacts/js/jquery.inview.js b/apps/contacts/js/jquery.inview.js
index a38ab164977..01900b0b4b4 100644
--- a/apps/contacts/js/jquery.inview.js
+++ b/apps/contacts/js/jquery.inview.js
@@ -5,18 +5,40 @@
  */
 (function ($) {
   var inviewObjects = {}, viewportSize, viewportOffset,
-      d = document, w = window, documentElement = d.documentElement, expando = $.expando;
+      d = document, w = window, documentElement = d.documentElement, expando = $.expando, isFiring = false, $elements = {};
 
   $.event.special.inview = {
     add: function(data) {
-      inviewObjects[data.guid + "-" + this[expando]] = { data: data, $element: $(this) };
+      var inviewObject = { data: data, $element: $(this) }
+      inviewObjects[data.guid + "-" + this[expando]] = inviewObject;
+      var selector  = inviewObject.data.selector,
+      $element  = inviewObject.$element;
+      var hash = parseInt(getHash( data.guid + this[expando]));
+      $elements[hash] =  selector ? $element.find(selector) : $element;
     },
 
     remove: function(data) {
       try { delete inviewObjects[data.guid + "-" + this[expando]]; } catch(e) {}
+      try {
+        var hash = parseInt(getHash(data.guid + this[expando])); 
+	delete($elements[hash]);
+      } catch (e){}
     }
   };
 
+  
+  function getHash(str){
+    str = str+'';
+    var hash = 0;
+    if (str.length == 0) return hash;
+    for (i = 0; i < str.length; i++) {
+        char = str.charCodeAt(i);
+        hash = ((hash<<5)-hash)+char;
+        hash = hash & hash; // Convert to 32bit integer
+    }
+    return Math.abs(hash);
+  }
+  
   function getViewportSize() {
     var mode, domObject, size = { height: w.innerHeight, width: w.innerWidth };
 
@@ -46,22 +68,15 @@
   }
 
   function checkInView() {
-    var $elements = $(), elementsLength, i = 0;
-
-    $.each(inviewObjects, function(i, inviewObject) {
-      var selector  = inviewObject.data.selector,
-          $element  = inviewObject.$element;
-      $elements = $elements.add(selector ? $element.find(selector) : $element);
-    });
-
-    elementsLength = $elements.length;
-    if (elementsLength) {
+    if (isFiring){
+      return;
+    }
+    isFiring = true;
       viewportSize   = viewportSize   || getViewportSize();
       viewportOffset = viewportOffset || getViewportOffset();
-
-      for (; i<elementsLength; i++) {
-        // Ignore elements that are not in the DOM tree
-        if (!$.contains(documentElement, $elements[i])) {
+      
+      for (var i in $elements) {
+        if (isNaN(parseInt(i))) {
           continue;
         }
 
@@ -72,13 +87,14 @@
             visiblePartX,
             visiblePartY,
             visiblePartsMerged;
-        
+
         // Don't ask me why because I haven't figured out yet:
         // viewportOffset and viewportSize are sometimes suddenly null in Firefox 5.
         // Even though it sounds weird:
         // It seems that the execution of this function is interferred by the onresize/onscroll event
         // where viewportOffset and viewportSize are unset
         if (!viewportOffset || !viewportSize) {
+	  isFiring = false;
           return;
         }
         
@@ -100,7 +116,7 @@
           $element.data('inview', false).trigger('inview', [false]);
         }
       }
-    }
+      isFiring = false;
   }
 
   $(w).bind("scroll resize", function() {
-- 
GitLab


From 6540bda238f1b659444016d433c7aeb11873b9be Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Mon, 20 Feb 2012 22:33:38 +0100
Subject: [PATCH 538/546] some icons for filetypes have been added. for
 licensing information please have look at core/img/filetypes/readme-2.txt

---
 ...ication-vnd.oasis.opendocument.formula.png | Bin 0 -> 580 bytes
 ...cation-vnd.oasis.opendocument.graphics.png | Bin 0 -> 572 bytes
 ...on-vnd.oasis.opendocument.presentation.png | Bin 0 -> 441 bytes
 ...ion-vnd.oasis.opendocument.spreadsheet.png | Bin 0 -> 436 bytes
 ...pplication-vnd.oasis.opendocument.text.png | Bin 0 -> 420 bytes
 .../filetypes/application-x-7z-compressed.png | Bin 0 -> 652 bytes
 .../application-x-bzip-compressed-tar.png     | Bin 0 -> 652 bytes
 core/img/filetypes/application-x-bzip.png     | Bin 0 -> 652 bytes
 .../application-x-compressed-tar.png          | Bin 0 -> 652 bytes
 core/img/filetypes/application-x-deb.png      | Bin 0 -> 652 bytes
 .../application-x-debian-package.png          | Bin 0 -> 570 bytes
 core/img/filetypes/application-x-gzip.png     | Bin 0 -> 652 bytes
 .../application-x-lzma-compressed-tar.png     | Bin 0 -> 652 bytes
 core/img/filetypes/application-x-rar.png      | Bin 0 -> 652 bytes
 core/img/filetypes/application-x-rpm.png      | Bin 0 -> 652 bytes
 core/img/filetypes/application-x-tar.png      | Bin 0 -> 652 bytes
 core/img/filetypes/application-x-tarz.png     | Bin 0 -> 652 bytes
 core/img/filetypes/application-zip.png        | Bin 0 -> 652 bytes
 core/img/filetypes/readme-2.txt               |  28 ++++++++++++++++++
 19 files changed, 28 insertions(+)
 create mode 100644 core/img/filetypes/application-vnd.oasis.opendocument.formula.png
 create mode 100644 core/img/filetypes/application-vnd.oasis.opendocument.graphics.png
 create mode 100644 core/img/filetypes/application-vnd.oasis.opendocument.presentation.png
 create mode 100644 core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png
 create mode 100644 core/img/filetypes/application-vnd.oasis.opendocument.text.png
 create mode 100644 core/img/filetypes/application-x-7z-compressed.png
 create mode 100644 core/img/filetypes/application-x-bzip-compressed-tar.png
 create mode 100644 core/img/filetypes/application-x-bzip.png
 create mode 100644 core/img/filetypes/application-x-compressed-tar.png
 create mode 100644 core/img/filetypes/application-x-deb.png
 create mode 100644 core/img/filetypes/application-x-debian-package.png
 create mode 100644 core/img/filetypes/application-x-gzip.png
 create mode 100644 core/img/filetypes/application-x-lzma-compressed-tar.png
 create mode 100644 core/img/filetypes/application-x-rar.png
 create mode 100644 core/img/filetypes/application-x-rpm.png
 create mode 100644 core/img/filetypes/application-x-tar.png
 create mode 100644 core/img/filetypes/application-x-tarz.png
 create mode 100644 core/img/filetypes/application-zip.png
 create mode 100644 core/img/filetypes/readme-2.txt

diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.formula.png b/core/img/filetypes/application-vnd.oasis.opendocument.formula.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cefbb690d106f7858203f619cc7766aca4b7c19
GIT binary patch
literal 580
zcmV-K0=xZ*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006DNkl<ZIE|H(
z-%FEG7{@=lch#U;5@xIJ+J-lkMJ-I5Vhsyck(Wc-y6Lt*Lb}>bm%j6^(8~rQBta#G
zP$H2;*<>xERs(;_oO}1~oTsbJO<mCU>N)3ppU?T8htp)5CIInxoS~ti6b+=5!r^dy
z86F;vWwY7!>Vb$H6%mh!c#_HFH`zn!bXw--=0rqfbaXTo3<ljIg4gTCa6g(|+P>!$
ze4cF-g7vcyiA4Nb>zQCM7y#A{fHUo_tQK{{#+C!keEPbGZQB404i5U2QZpkXBLTy0
zS+o>OG!@GY0Y@-!TNdSV84<y@ZKBbrzfdSVZF1comxi4?G<I9Dxw%<gXEK=;M8qp1
z9U{_^OeTNqHN=Xv)}pl*rIaY8#5B#60i-L$TrO9v)Z>${nVNpj;X?;G>1m^|wZ+fu
zA3{A{^!IfGptYtskw}n8B=GrsD5a|L`un<R_n*eHN`ynbJbZAEJ2$SeytZ2PD5Yqw
zePd<H0Q>hj35R-cIt|92O;ECJu6AA|GH|QTUk9j70C3{?F?zcK<QA7$URm2U)LjX7
z0)G9@F+KBvyEm`nX>0vIK&fQ&{N)=iUpPl+;5-2DW<T=Sd{XB(Y60c)_Gg-SF~$5s
zhWUjIlds-Z_j|5fs`J+YHa0e@^*}hpKsdB3_D+8tAfL|@i^abGv#Ulfmy5r~p)%z;
St0@xz0000<MNUMnLSTXfVGsxa

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.graphics.png b/core/img/filetypes/application-vnd.oasis.opendocument.graphics.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d66cc97eb5ecb9bdaeecc6cc5ea072af5dad8e2
GIT binary patch
literal 572
zcmV-C0>k}@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00065Nkl<ZIE{sp
zKWI}?7{z~idC+D`OA*?VT98mWSZS9G4i5*N1P5Itq%;-(;9zkUbP0metrSUKPy|VE
zkp~t9MNn{&QimXlfwU@GiNsbDUmuBi_k9i_u}Kp>aN*wXo^!rG_xe()6ab5hizE_>
zJUyV4!teLLOD2=?&CShn>q10^L}WxnMl8!(mo6w23X;p^L_{Q$$>a^g2#N^da2P#!
zeeL_-JRx|y)~g80haeh_PI#WTY8XZYDC+=Ill%Bl^?C{i`!(LYFHx`80f@z76H2Mo
zbUGc;gS8ri)!+E4Zcl>&bb_@SuInNq)a!NT=H@0G$GPVV%s-T#$_`{tD0X&sTIY?8
zjcr6EEF#k)GHqGbr*1=RLMhd@QmIs42MSHcVzF2Sc=_rzkDk83b{vKV2RIWw#rW7L
znx?f?<ar*NX_}a(2{hgsptQBk!ueU2Z(JoZGsWHeR@au4Qs}z_%_*NeehdItDV%DR
z$}bzw6Ew|7C%?_0SpmTM$IoOQtN^fZZg!8j$=5mq&CIv%WI3=u#Ffhz7#|x2;AgqQ
z%9H2+Hvs7G>%$Ylwj0m(<!h1U+gZMqwtCONbsL{a_xrgxe;VuYGp^lS0w6Rp%*??_
zjvhJO#&0vIR4T1~XmprMXJdQ%?&P-_*tShP9{=!9)h+}A0sa8WtTu2wzqMlk0000<
KMNUMnLSTYUhX9rU

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.presentation.png b/core/img/filetypes/application-vnd.oasis.opendocument.presentation.png
new file mode 100644
index 0000000000000000000000000000000000000000..46942cba2852738b284ee60ef95fde0d633a16f0
GIT binary patch
literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004iNkl<ZIE|%}
zJxjw-6o#MLC_0o@{GfDpaB=f*_#av)2L-8vLLDnOso<bPuo(+=(ybkfo0B3mB8Y>Z
zRjimwdlPdUN@J=C6n(eDIrlj)@3|2X;Xl%VF<_{VSp~cUs!%9=1L7N}&;4$D%gv4h
zFFzeHGd;m;%ME=vIy}I6txk|rE#7W3+EPSXPADLOM!emoTrQt9n@u~BNO---Nam>T
z6h98;dg@ZCbcu*eRVtMm`GbnZqNxE_^?JP(w)O7eiS>;wug>SPq>_^WxULH#f?*h@
zh{*O{K{AW0-iF)z$DUe5B(u0GxA%`CB4QYZiHM-<x*25AKO6+rb=}ke9H(=EoqdC|
ziy8;Jo1W#a-NWMw)oK;j{q%Z{<8=OkZQB4WFQfxA=t2O*{XUv)+YI;tJNpLnOKUxW
zbpzA}qiE46AL^5QF6#j_0Hsu*gH&>od@kDyU0?AWDWy69%d&o1_e1=d_+?pE2heCV
jNT<`+p_CBCVlln|C&Vf^)P;a%00000NkvXXu0mjfF{#1z

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png b/core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png
new file mode 100644
index 0000000000000000000000000000000000000000..abc38d4310c9e73abb1f664a97dacb3708fcb2cc
GIT binary patch
literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004dNkl<ZIE|H(
zKTE?<6va>ehz*L3RVxJt5er@XHZD$Pa&>ShxCX%z3W`EV6bnk{eu91jHxbOBE(Niz
z8e@!2G`UX3_llAB!W(`E?s@lIu3%Xf0KhN|=(_HJsk_djy0WzBW-$POh~|i>L`0=l
zt946E9iLpVNXF4A$IWKbk@I_({a?E!;QErWuV8oYm-YDx?(-x`AOpZ!WdSdP1X(qk
z6LEFZgCvQl9onfLefX-J4@1ljA_#-8Oam1%@?i)`5>egWO7%vg;mZBaGuoZ!%x12Z
z1rFmlhCoEC0Hy)JIy-Mq=B5gN^+umxcn<<Z(Pyd!Z*CVvls?lm9d^t62NwOurfE8&
zZQHPI8|88taU72pg^j=-()z~cqdHeCj%wgOb-OYv%;yz%XL~C(s2$qe)`z)Xue;*#
zNaIG}Cg{BeDtjnDzh-g&HBdQ&nVjTS$B3ZoIv>IFys;v9p2tV<eIJ^p-T$zl6iS+=
eJ!G+>DEJ1|00K;M`w*)D0000<MNUMnLSTY{ufdG~

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.text.png b/core/img/filetypes/application-vnd.oasis.opendocument.text.png
new file mode 100644
index 0000000000000000000000000000000000000000..06c1f30c8fa21367055cd769769b341d96592bc8
GIT binary patch
literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004NNkl<ZIE|%}
z!Ab&A6o!AtSv0FjqD9bBq)p+<<vc<UAcD4Oo4X!BT7;{1jxNKt13iYgkth--qlF+8
zg`zUky?6c=qRyCOLO<Na;hgiGpL0*bwrv1FwOU1`Qt2W_N+~3h$){SaR_gcr!$pGR
z9?1ie2ae;saE)BoWvA02Nj96!u4P#!Nu<+h=;l@XV>#y#cx=a+!0-gf=ku8$2wIk9
z<p2zI060F{$CnqxHl}toJUqWc2mt^n6bc!oRIAZw<aE>bk@CKg@MJ7t7dlMehm;Z|
zA%sA&Sj<eP)7yk`cF)+(72TaGOeT{>-0Sr|K{8D;OET*?&fB^r&ZU%!JlnRrIskW0
z91I5DCI_0PMdBa`px5hl0JA$Nm&=Rf^-Vn%ba`<OV0IgNI5FRHxM-7v5K(|q>VFQx
zfNdOX1cV*L!F~axTprUl4y2Tb{L5%G`m<@ZKH^|J9-~w$y>1II3<E#LyZr7XfN*yJ
O0000<MNUMnLSTYVHMa}^

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-x-7z-compressed.png b/core/img/filetypes/application-x-7z-compressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10trb(K~y-6rIWdeR6!JmzpA>o`*ydp1-8p1Dr(>xn7O=%hWZ9B
zfuTNupqcs{iUS4)f*6WRFbIwg$iV2#?OSyggWEcS6AXHwpiWR9|Noy;!QJ_vs(xLb
z+`jn0-LD<wQ3yP|a(C@IKyY^+-@0%<gz)U>v16mA8Bq_0R8_^|kux~X_LujRk|{Ye
zYg;xqzqamv`Rcv3m+54;R)-LtFD)-0URYRU*o<hJ5#z~(r6Z>p4994@MIh`+aIbUD
zm)<;mbUy+&QcBaNX)rTP6;-8_f{`Fps0d~{KgMu4B*i!dZdM_1M?~r`8ykOlJsYP0
zynFp>zbGalaHj(5)f1-~O;#9B78s5e8H~pah7*>Kp95g^_)&7VL*Ct`Yq#0m`A)mD
z#pm@8b*1W<8D;jJ8G_0T=^Ao9U~s5c@Z;Mjq-1iQQM#5gYcVraol4Dd6@)-c6(K|b
z%oLRjK<-*Z3X(fYDM%@}3TktJh~N$}M*?8(s0g3mzL>)dRY6Nea)(Ii``>^pSS*0!
zZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS@(fc!
zMTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX{J6d`
mJ;*28r#1ty0Id8YVCyG0AXT}6O4N)10000<MNUMnLSTYT2M^`|

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-x-bzip-compressed-tar.png b/core/img/filetypes/application-x-bzip-compressed-tar.png
new file mode 100644
index 0000000000000000000000000000000000000000..55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10trb(K~y-6rIWdeR6!JmzpA>o`*ydp1-8p1Dr(>xn7O=%hWZ9B
zfuTNupqcs{iUS4)f*6WRFbIwg$iV2#?OSyggWEcS6AXHwpiWR9|Noy;!QJ_vs(xLb
z+`jn0-LD<wQ3yP|a(C@IKyY^+-@0%<gz)U>v16mA8Bq_0R8_^|kux~X_LujRk|{Ye
zYg;xqzqamv`Rcv3m+54;R)-LtFD)-0URYRU*o<hJ5#z~(r6Z>p4994@MIh`+aIbUD
zm)<;mbUy+&QcBaNX)rTP6;-8_f{`Fps0d~{KgMu4B*i!dZdM_1M?~r`8ykOlJsYP0
zynFp>zbGalaHj(5)f1-~O;#9B78s5e8H~pah7*>Kp95g^_)&7VL*Ct`Yq#0m`A)mD
z#pm@8b*1W<8D;jJ8G_0T=^Ao9U~s5c@Z;Mjq-1iQQM#5gYcVraol4Dd6@)-c6(K|b
z%oLRjK<-*Z3X(fYDM%@}3TktJh~N$}M*?8(s0g3mzL>)dRY6Nea)(Ii``>^pSS*0!
zZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS@(fc!
zMTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX{J6d`
mJ;*28r#1ty0Id8YVCyG0AXT}6O4N)10000<MNUMnLSTYT2M^`|

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-x-bzip.png b/core/img/filetypes/application-x-bzip.png
new file mode 100644
index 0000000000000000000000000000000000000000..55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10trb(K~y-6rIWdeR6!JmzpA>o`*ydp1-8p1Dr(>xn7O=%hWZ9B
zfuTNupqcs{iUS4)f*6WRFbIwg$iV2#?OSyggWEcS6AXHwpiWR9|Noy;!QJ_vs(xLb
z+`jn0-LD<wQ3yP|a(C@IKyY^+-@0%<gz)U>v16mA8Bq_0R8_^|kux~X_LujRk|{Ye
zYg;xqzqamv`Rcv3m+54;R)-LtFD)-0URYRU*o<hJ5#z~(r6Z>p4994@MIh`+aIbUD
zm)<;mbUy+&QcBaNX)rTP6;-8_f{`Fps0d~{KgMu4B*i!dZdM_1M?~r`8ykOlJsYP0
zynFp>zbGalaHj(5)f1-~O;#9B78s5e8H~pah7*>Kp95g^_)&7VL*Ct`Yq#0m`A)mD
z#pm@8b*1W<8D;jJ8G_0T=^Ao9U~s5c@Z;Mjq-1iQQM#5gYcVraol4Dd6@)-c6(K|b
z%oLRjK<-*Z3X(fYDM%@}3TktJh~N$}M*?8(s0g3mzL>)dRY6Nea)(Ii``>^pSS*0!
zZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS@(fc!
zMTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX{J6d`
mJ;*28r#1ty0Id8YVCyG0AXT}6O4N)10000<MNUMnLSTYT2M^`|

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-x-compressed-tar.png b/core/img/filetypes/application-x-compressed-tar.png
new file mode 100644
index 0000000000000000000000000000000000000000..55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10trb(K~y-6rIWdeR6!JmzpA>o`*ydp1-8p1Dr(>xn7O=%hWZ9B
zfuTNupqcs{iUS4)f*6WRFbIwg$iV2#?OSyggWEcS6AXHwpiWR9|Noy;!QJ_vs(xLb
z+`jn0-LD<wQ3yP|a(C@IKyY^+-@0%<gz)U>v16mA8Bq_0R8_^|kux~X_LujRk|{Ye
zYg;xqzqamv`Rcv3m+54;R)-LtFD)-0URYRU*o<hJ5#z~(r6Z>p4994@MIh`+aIbUD
zm)<;mbUy+&QcBaNX)rTP6;-8_f{`Fps0d~{KgMu4B*i!dZdM_1M?~r`8ykOlJsYP0
zynFp>zbGalaHj(5)f1-~O;#9B78s5e8H~pah7*>Kp95g^_)&7VL*Ct`Yq#0m`A)mD
z#pm@8b*1W<8D;jJ8G_0T=^Ao9U~s5c@Z;Mjq-1iQQM#5gYcVraol4Dd6@)-c6(K|b
z%oLRjK<-*Z3X(fYDM%@}3TktJh~N$}M*?8(s0g3mzL>)dRY6Nea)(Ii``>^pSS*0!
zZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS@(fc!
zMTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX{J6d`
mJ;*28r#1ty0Id8YVCyG0AXT}6O4N)10000<MNUMnLSTYT2M^`|

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-x-deb.png b/core/img/filetypes/application-x-deb.png
new file mode 100644
index 0000000000000000000000000000000000000000..55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10trb(K~y-6rIWdeR6!JmzpA>o`*ydp1-8p1Dr(>xn7O=%hWZ9B
zfuTNupqcs{iUS4)f*6WRFbIwg$iV2#?OSyggWEcS6AXHwpiWR9|Noy;!QJ_vs(xLb
z+`jn0-LD<wQ3yP|a(C@IKyY^+-@0%<gz)U>v16mA8Bq_0R8_^|kux~X_LujRk|{Ye
zYg;xqzqamv`Rcv3m+54;R)-LtFD)-0URYRU*o<hJ5#z~(r6Z>p4994@MIh`+aIbUD
zm)<;mbUy+&QcBaNX)rTP6;-8_f{`Fps0d~{KgMu4B*i!dZdM_1M?~r`8ykOlJsYP0
zynFp>zbGalaHj(5)f1-~O;#9B78s5e8H~pah7*>Kp95g^_)&7VL*Ct`Yq#0m`A)mD
z#pm@8b*1W<8D;jJ8G_0T=^Ao9U~s5c@Z;Mjq-1iQQM#5gYcVraol4Dd6@)-c6(K|b
z%oLRjK<-*Z3X(fYDM%@}3TktJh~N$}M*?8(s0g3mzL>)dRY6Nea)(Ii``>^pSS*0!
zZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS@(fc!
zMTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX{J6d`
mJ;*28r#1ty0Id8YVCyG0AXT}6O4N)10000<MNUMnLSTYT2M^`|

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-x-debian-package.png b/core/img/filetypes/application-x-debian-package.png
new file mode 100644
index 0000000000000000000000000000000000000000..eff1b7fc8c2ed87add4f196457a2a0c15906c35a
GIT binary patch
literal 570
zcmV-A0>%A_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00063Nkl<ZIE}@U
zy>1gh6otR}*_~a-&KgAl3M!ED9#o;EGLh)=90(~9FOY|zz!fDOMP7miiU=eUhZx(j
zy}NT~hQcv1LDU@SO7o-p%^BST|66KvGdzCQ@AbBy8=GN_q1fI9pq`EhArQnfn@!&j
zUVr%c7vSxyr`&(|=-pPY8n~h)%N@Pl#{kSmU+`^1Q!km%Cc}&GUthd@^AP~O22}l>
zLsxbNHg{xsi7UGlTYZYHKCbMN<s~+ExUw^-`a6f~J`FHD+TT-Jo%p7vUCyZ&Qx>x^
zO|ztFmMmst>cy0HImb6ON~@FM(f%HQ1t_<753<5_jVm!l2kQzlSCE$#09jd)bWKn>
z21}-Fw^Z%`IJN)@ASD#HMT(>pS3Xm`bC*^<YX>m|L<A#(@hwVeVoJ;>BLJGFM!ZLS
zi-;g1#1L))UIeW`YlBh{QzV28|Lqe1F$P3d0N=KV_jr+8fcO@b0w_o+5<)<XN2%42
zR%fzm^et`MAhO}W#f-{TXl*b_qeP>EM%|<&C4EztpdHb5n6#6PFVxYPPKJt*P(b4I
z`41L#gSD2-YMwl}M?#^|sHE|AG;4r9zq~4JNPk3gaowP`CV3$Q#pOlA?}-8D<8c9K
z3vf0XpI%L_J29r;$-JwxjkVS)Ubp^q^Fh6K^Dn?1ML>Y~3yvxS99~^dWB>pF07*qo
IM6N<$f|eWirvLx|

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-x-gzip.png b/core/img/filetypes/application-x-gzip.png
new file mode 100644
index 0000000000000000000000000000000000000000..55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10trb(K~y-6rIWdeR6!JmzpA>o`*ydp1-8p1Dr(>xn7O=%hWZ9B
zfuTNupqcs{iUS4)f*6WRFbIwg$iV2#?OSyggWEcS6AXHwpiWR9|Noy;!QJ_vs(xLb
z+`jn0-LD<wQ3yP|a(C@IKyY^+-@0%<gz)U>v16mA8Bq_0R8_^|kux~X_LujRk|{Ye
zYg;xqzqamv`Rcv3m+54;R)-LtFD)-0URYRU*o<hJ5#z~(r6Z>p4994@MIh`+aIbUD
zm)<;mbUy+&QcBaNX)rTP6;-8_f{`Fps0d~{KgMu4B*i!dZdM_1M?~r`8ykOlJsYP0
zynFp>zbGalaHj(5)f1-~O;#9B78s5e8H~pah7*>Kp95g^_)&7VL*Ct`Yq#0m`A)mD
z#pm@8b*1W<8D;jJ8G_0T=^Ao9U~s5c@Z;Mjq-1iQQM#5gYcVraol4Dd6@)-c6(K|b
z%oLRjK<-*Z3X(fYDM%@}3TktJh~N$}M*?8(s0g3mzL>)dRY6Nea)(Ii``>^pSS*0!
zZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS@(fc!
zMTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX{J6d`
mJ;*28r#1ty0Id8YVCyG0AXT}6O4N)10000<MNUMnLSTYT2M^`|

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-x-lzma-compressed-tar.png b/core/img/filetypes/application-x-lzma-compressed-tar.png
new file mode 100644
index 0000000000000000000000000000000000000000..55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10trb(K~y-6rIWdeR6!JmzpA>o`*ydp1-8p1Dr(>xn7O=%hWZ9B
zfuTNupqcs{iUS4)f*6WRFbIwg$iV2#?OSyggWEcS6AXHwpiWR9|Noy;!QJ_vs(xLb
z+`jn0-LD<wQ3yP|a(C@IKyY^+-@0%<gz)U>v16mA8Bq_0R8_^|kux~X_LujRk|{Ye
zYg;xqzqamv`Rcv3m+54;R)-LtFD)-0URYRU*o<hJ5#z~(r6Z>p4994@MIh`+aIbUD
zm)<;mbUy+&QcBaNX)rTP6;-8_f{`Fps0d~{KgMu4B*i!dZdM_1M?~r`8ykOlJsYP0
zynFp>zbGalaHj(5)f1-~O;#9B78s5e8H~pah7*>Kp95g^_)&7VL*Ct`Yq#0m`A)mD
z#pm@8b*1W<8D;jJ8G_0T=^Ao9U~s5c@Z;Mjq-1iQQM#5gYcVraol4Dd6@)-c6(K|b
z%oLRjK<-*Z3X(fYDM%@}3TktJh~N$}M*?8(s0g3mzL>)dRY6Nea)(Ii``>^pSS*0!
zZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS@(fc!
zMTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX{J6d`
mJ;*28r#1ty0Id8YVCyG0AXT}6O4N)10000<MNUMnLSTYT2M^`|

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-x-rar.png b/core/img/filetypes/application-x-rar.png
new file mode 100644
index 0000000000000000000000000000000000000000..55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10trb(K~y-6rIWdeR6!JmzpA>o`*ydp1-8p1Dr(>xn7O=%hWZ9B
zfuTNupqcs{iUS4)f*6WRFbIwg$iV2#?OSyggWEcS6AXHwpiWR9|Noy;!QJ_vs(xLb
z+`jn0-LD<wQ3yP|a(C@IKyY^+-@0%<gz)U>v16mA8Bq_0R8_^|kux~X_LujRk|{Ye
zYg;xqzqamv`Rcv3m+54;R)-LtFD)-0URYRU*o<hJ5#z~(r6Z>p4994@MIh`+aIbUD
zm)<;mbUy+&QcBaNX)rTP6;-8_f{`Fps0d~{KgMu4B*i!dZdM_1M?~r`8ykOlJsYP0
zynFp>zbGalaHj(5)f1-~O;#9B78s5e8H~pah7*>Kp95g^_)&7VL*Ct`Yq#0m`A)mD
z#pm@8b*1W<8D;jJ8G_0T=^Ao9U~s5c@Z;Mjq-1iQQM#5gYcVraol4Dd6@)-c6(K|b
z%oLRjK<-*Z3X(fYDM%@}3TktJh~N$}M*?8(s0g3mzL>)dRY6Nea)(Ii``>^pSS*0!
zZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS@(fc!
zMTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX{J6d`
mJ;*28r#1ty0Id8YVCyG0AXT}6O4N)10000<MNUMnLSTYT2M^`|

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-x-rpm.png b/core/img/filetypes/application-x-rpm.png
new file mode 100644
index 0000000000000000000000000000000000000000..55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10trb(K~y-6rIWdeR6!JmzpA>o`*ydp1-8p1Dr(>xn7O=%hWZ9B
zfuTNupqcs{iUS4)f*6WRFbIwg$iV2#?OSyggWEcS6AXHwpiWR9|Noy;!QJ_vs(xLb
z+`jn0-LD<wQ3yP|a(C@IKyY^+-@0%<gz)U>v16mA8Bq_0R8_^|kux~X_LujRk|{Ye
zYg;xqzqamv`Rcv3m+54;R)-LtFD)-0URYRU*o<hJ5#z~(r6Z>p4994@MIh`+aIbUD
zm)<;mbUy+&QcBaNX)rTP6;-8_f{`Fps0d~{KgMu4B*i!dZdM_1M?~r`8ykOlJsYP0
zynFp>zbGalaHj(5)f1-~O;#9B78s5e8H~pah7*>Kp95g^_)&7VL*Ct`Yq#0m`A)mD
z#pm@8b*1W<8D;jJ8G_0T=^Ao9U~s5c@Z;Mjq-1iQQM#5gYcVraol4Dd6@)-c6(K|b
z%oLRjK<-*Z3X(fYDM%@}3TktJh~N$}M*?8(s0g3mzL>)dRY6Nea)(Ii``>^pSS*0!
zZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS@(fc!
zMTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX{J6d`
mJ;*28r#1ty0Id8YVCyG0AXT}6O4N)10000<MNUMnLSTYT2M^`|

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-x-tar.png b/core/img/filetypes/application-x-tar.png
new file mode 100644
index 0000000000000000000000000000000000000000..55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10trb(K~y-6rIWdeR6!JmzpA>o`*ydp1-8p1Dr(>xn7O=%hWZ9B
zfuTNupqcs{iUS4)f*6WRFbIwg$iV2#?OSyggWEcS6AXHwpiWR9|Noy;!QJ_vs(xLb
z+`jn0-LD<wQ3yP|a(C@IKyY^+-@0%<gz)U>v16mA8Bq_0R8_^|kux~X_LujRk|{Ye
zYg;xqzqamv`Rcv3m+54;R)-LtFD)-0URYRU*o<hJ5#z~(r6Z>p4994@MIh`+aIbUD
zm)<;mbUy+&QcBaNX)rTP6;-8_f{`Fps0d~{KgMu4B*i!dZdM_1M?~r`8ykOlJsYP0
zynFp>zbGalaHj(5)f1-~O;#9B78s5e8H~pah7*>Kp95g^_)&7VL*Ct`Yq#0m`A)mD
z#pm@8b*1W<8D;jJ8G_0T=^Ao9U~s5c@Z;Mjq-1iQQM#5gYcVraol4Dd6@)-c6(K|b
z%oLRjK<-*Z3X(fYDM%@}3TktJh~N$}M*?8(s0g3mzL>)dRY6Nea)(Ii``>^pSS*0!
zZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS@(fc!
zMTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX{J6d`
mJ;*28r#1ty0Id8YVCyG0AXT}6O4N)10000<MNUMnLSTYT2M^`|

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-x-tarz.png b/core/img/filetypes/application-x-tarz.png
new file mode 100644
index 0000000000000000000000000000000000000000..55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10trb(K~y-6rIWdeR6!JmzpA>o`*ydp1-8p1Dr(>xn7O=%hWZ9B
zfuTNupqcs{iUS4)f*6WRFbIwg$iV2#?OSyggWEcS6AXHwpiWR9|Noy;!QJ_vs(xLb
z+`jn0-LD<wQ3yP|a(C@IKyY^+-@0%<gz)U>v16mA8Bq_0R8_^|kux~X_LujRk|{Ye
zYg;xqzqamv`Rcv3m+54;R)-LtFD)-0URYRU*o<hJ5#z~(r6Z>p4994@MIh`+aIbUD
zm)<;mbUy+&QcBaNX)rTP6;-8_f{`Fps0d~{KgMu4B*i!dZdM_1M?~r`8ykOlJsYP0
zynFp>zbGalaHj(5)f1-~O;#9B78s5e8H~pah7*>Kp95g^_)&7VL*Ct`Yq#0m`A)mD
z#pm@8b*1W<8D;jJ8G_0T=^Ao9U~s5c@Z;Mjq-1iQQM#5gYcVraol4Dd6@)-c6(K|b
z%oLRjK<-*Z3X(fYDM%@}3TktJh~N$}M*?8(s0g3mzL>)dRY6Nea)(Ii``>^pSS*0!
zZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS@(fc!
zMTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX{J6d`
mJ;*28r#1ty0Id8YVCyG0AXT}6O4N)10000<MNUMnLSTYT2M^`|

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-zip.png b/core/img/filetypes/application-zip.png
new file mode 100644
index 0000000000000000000000000000000000000000..55dd0f75366f0b7998b8b4a763b8a8dcc2a91b07
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10trb(K~y-6rIWdeR6!JmzpA>o`*ydp1-8p1Dr(>xn7O=%hWZ9B
zfuTNupqcs{iUS4)f*6WRFbIwg$iV2#?OSyggWEcS6AXHwpiWR9|Noy;!QJ_vs(xLb
z+`jn0-LD<wQ3yP|a(C@IKyY^+-@0%<gz)U>v16mA8Bq_0R8_^|kux~X_LujRk|{Ye
zYg;xqzqamv`Rcv3m+54;R)-LtFD)-0URYRU*o<hJ5#z~(r6Z>p4994@MIh`+aIbUD
zm)<;mbUy+&QcBaNX)rTP6;-8_f{`Fps0d~{KgMu4B*i!dZdM_1M?~r`8ykOlJsYP0
zynFp>zbGalaHj(5)f1-~O;#9B78s5e8H~pah7*>Kp95g^_)&7VL*Ct`Yq#0m`A)mD
z#pm@8b*1W<8D;jJ8G_0T=^Ao9U~s5c@Z;Mjq-1iQQM#5gYcVraol4Dd6@)-c6(K|b
z%oLRjK<-*Z3X(fYDM%@}3TktJh~N$}M*?8(s0g3mzL>)dRY6Nea)(Ii``>^pSS*0!
zZX{JwN`%;}aWhnVMWtj)H^VIa0niL$xI3mwtV$0EX+HLTv?hX-9zuw7fI7HS@(fc!
zMTk{JOo<r!<*_-~L=efS3iV*L7a}20H<LcV5O5Mk#JvYNjsqk}F%jLs{g(yX{J6d`
mJ;*28r#1ty0Id8YVCyG0AXT}6O4N)10000<MNUMnLSTYT2M^`|

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/readme-2.txt b/core/img/filetypes/readme-2.txt
new file mode 100644
index 00000000000..5a606f9a0bb
--- /dev/null
+++ b/core/img/filetypes/readme-2.txt
@@ -0,0 +1,28 @@
+15.02.2012
+
+Following new icons have been added:
+core/img/filetypes/application-vnd.oasis.opendocument.formula.png
+core/img/filetypes/application-vnd.oasis.opendocument.graphics.png
+core/img/filetypes/application-vnd.oasis.opendocument.presentation.png
+core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png
+core/img/filetypes/application-vnd.oasis.opendocument.text.png
+	Download: http://odftoolkit.org/ODF-Icons#ODF_Icons
+	License: Apache 2.0
+	
+core/img/filetypes/application-x-7z-compressed.png
+core/img/filetypes/application-x-bzip-compressed-tar.png
+core/img/filetypes/application-x-bzip.png
+core/img/filetypes/application-x-compressed-tar.png
+core/img/filetypes/application-x-deb.png
+core/img/filetypes/application-x-debian-package.png
+core/img/filetypes/application-x-gzip.png
+core/img/filetypes/application-x-lzma-compressed-tar.png
+core/img/filetypes/application-x-rar.png
+core/img/filetypes/application-x-rpm.png
+core/img/filetypes/application-x-tar.png
+core/img/filetypes/application-x-tarz.png
+core/img/filetypes/application-zip.png
+	Author: Gomez Hyuuga
+	License: Creative Commons Attribution-Share Alike 3.0 Unported License	
+	Download: http://kde-look.org/content/show.php/?content=101767
+
-- 
GitLab


From 36b7d819e535667c76faf93dd6cbe666b338cdb2 Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Tue, 21 Feb 2012 10:22:17 -0500
Subject: [PATCH 539/546] restore redirect after checkLoggedIn

---
 lib/util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util.php b/lib/util.php
index ee32d31bfd0..aa9fcdec65f 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -255,7 +255,7 @@ class OC_Util {
 	public static function checkLoggedIn(){
 		// Check if we are a user
 		if( !OC_User::isLoggedIn()){
-			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ));
+			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php', TRUE ));
 			exit();
 		}
 	}
-- 
GitLab


From 21f8d0992f1ae389d8c9acc870927285e9413a96 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Tue, 21 Feb 2012 18:28:27 +0100
Subject: [PATCH 540/546] Added missing files

---
 apps/bookmarks/img/delete.png | Bin 0 -> 275 bytes
 apps/bookmarks/img/edit.png   | Bin 0 -> 310 bytes
 apps/media/css/music.css      |   4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 apps/bookmarks/img/delete.png
 create mode 100644 apps/bookmarks/img/edit.png

diff --git a/apps/bookmarks/img/delete.png b/apps/bookmarks/img/delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc0c782882deaa4f9ecf1676592ddba0cc9aacbc
GIT binary patch
literal 275
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQlw~x;Tbd
z^j@88&DU%o;BtS-m%ta6{xu?bLeB#hJ`=j)oV@60liIS*rBl~@J$HM)&h0OA+^7F4
zYgpnLG;zu;2T#vS-j_-$HvBbRz`$mAK;Vz_S4j<aUuF-*0@isB>%Pm*(PLD+t=F;b
z*eX3n(MkRcKXtZMbAR7<!S+b}wHxOW81Eg(sOHN(cOXJoCvd_4|31>WZg&GK3{-9d
P-NxYQ>gTe~DWM4f<>O_1

literal 0
HcmV?d00001

diff --git a/apps/bookmarks/img/edit.png b/apps/bookmarks/img/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..9993a092df101d4b2796379ac6f1cbe62f131a3c
GIT binary patch
literal 310
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQmMIx;Tbd
z^e&yem-mo?K<oZ?jUWTYY?jVxVjCH`4VYBp8rnK1WK5n~VWL(f<dO4q$z;E4d*$b!
z-*k3T#8eaSTb{eTt;*WBZ5HNeXf!X_G}m3AG11}EhO<_O%NX)D9xI!`@?q9qr$y7!
zJgWck8HUd5VR}08*LlTh4el&UAILEVF#B>=coeX%YV7tbaA(MAa9*?eMT*!Qy-Sie
zj<Mck7Qg-Wjj)q@0JH9e8+FeZ_Agv||0lB+laHa|8kOTf=QDV^`njxgN@xNA+vRUZ

literal 0
HcmV?d00001

diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index 91da9ec40e7..07173624018 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -17,7 +17,7 @@ a.jp-mute,a.jp-unmute { left:24em; }
 div.jp-volume-bar { position:absolute; overflow:hidden; background:#eee; width:4em; height:0.4em; cursor:pointer; top:1.3em; left:27em; }
 div.jp-volume-bar-value { background:#ccc; width:0; height:0.4em; }
 
-#collection { padding-top:1em; position:relative; width:100%; float:left; table-layout:fixed; }
+#collection { position:relative; width:100%; float:left; table-layout:fixed; }
 #collection td { overflow:hidden; text-overflow:ellipsis; white-space:nowrap; }
 #leftcontent img.remove { display:none; float:right; cursor:pointer; opacity: 0; }
 #leftcontent li:hover img.remove { display:inline; opacity: .3; }
@@ -31,7 +31,7 @@ div.jp-volume-bar-value { background:#ccc; width:0; height:0.4em; }
 #collection td.artist-expander, #collection td.album-expander { width:2em; text-align:center; }
 td.artist a.expander, td.album a.expander { float:right; padding:0 1em; }
 tr.active td { background-color:#eee; font-weight:bold; }
-tr td { border-top:1px solid #eee; height:2.2em; }
+tr td { border-bottom:1px solid #eee; height:2.2em; }
 tr .artist img { vertical-align:middle; }
 tr.album td.artist { padding-left:1em; }
 tr.song td.artist { padding-left:2em; }
-- 
GitLab


From 987845c31206b3d193e41e65ed6b964efc26f127 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 21 Feb 2012 20:05:02 +0100
Subject: [PATCH 541/546] Move the redirect_url from linkTo function to the
 checkLoggedIn function

---
 lib/helper.php | 14 ++++----------
 lib/util.php   |  7 ++++---
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/lib/helper.php b/lib/helper.php
index b1e6d053a19..2f71bdad2dc 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -29,12 +29,11 @@ class OC_Helper {
 	 * @brief Creates an url
 	 * @param $app app
 	 * @param $file file
-	 * @param $redirect_url redirect_url variable is appended to the URL
 	 * @returns the url
 	 *
 	 * Returns a url to the given app and file.
 	 */
-	public static function linkTo( $app, $file, $redirect_url=NULL, $absolute=false ){
+	public static function linkTo( $app, $file ){
 		if( $app != '' ){
 			$app .= '/';
 			// Check if the app is in the app folder
@@ -54,24 +53,19 @@ class OC_Helper {
 			}
 		}
 
-		if($redirect_url)
-			return $urlLinkTo.'?redirect_url='.urlencode($_SERVER["REQUEST_URI"]);
-		else
-			return $urlLinkTo;
-
+		return $urlLinkTo;
 	}
 
 	/**
 	 * @brief Creates an absolute url
 	 * @param $app app
 	 * @param $file file
-	 * @param $redirect_url redirect_url variable is appended to the URL
 	 * @returns the url
 	 *
 	 * Returns a absolute url to the given app and file.
 	 */
-	public static function linkToAbsolute( $app, $file, $redirect_url=NULL ) {
-		$urlLinkTo = self::linkTo( $app, $file, $redirect_url );
+	public static function linkToAbsolute( $app, $file ) {
+		$urlLinkTo = self::linkTo( $app, $file );
 		// Checking if the request was made through HTTPS. The last in line is for IIS
 		$protocol = isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!='off');
 		$urlLinkTo = ($protocol?'https':'http') . '://'  . $_SERVER['HTTP_HOST'] . $urlLinkTo;
diff --git a/lib/util.php b/lib/util.php
index aa9fcdec65f..1b1e29b6749 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -240,7 +240,7 @@ class OC_Util {
 
 
 	/**
-	* Check if the app is enabled, send json error msg if not
+	* Check if the app is enabled, redirects to home if not
 	*/
 	public static function checkAppEnabled($app){
 		if( !OC_App::isEnabled($app)){
@@ -250,12 +250,13 @@ class OC_Util {
 	}
 
 	/**
-	* Check if the user is logged in, redirects to home if not
+	* Check if the user is logged in, redirects to home if not. With
+	* redirect URL parameter to the request URI.
 	*/
 	public static function checkLoggedIn(){
 		// Check if we are a user
 		if( !OC_User::isLoggedIn()){
-			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php', TRUE ));
+			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ).'?redirect_url='.urlencode($_SERVER["REQUEST_URI"]));
 			exit();
 		}
 	}
-- 
GitLab


From 86d2927c02c09d6642268891e995bf9d0a11782c Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 21 Feb 2012 20:10:40 +0100
Subject: [PATCH 542/546] Calendar: Correct calendarcolor format for ical color
 property

---
 apps/calendar/ajax/updatecalendar.php | 10 +++++++++-
 apps/calendar/appinfo/info.xml        |  2 +-
 apps/calendar/appinfo/update.php      | 17 +++++++++++++++++
 apps/calendar/js/calendar.js          |  2 +-
 apps/calendar/lib/calendar.php        | 24 ++++++++++++------------
 5 files changed, 40 insertions(+), 15 deletions(-)
 create mode 100644 apps/calendar/appinfo/update.php

diff --git a/apps/calendar/ajax/updatecalendar.php b/apps/calendar/ajax/updatecalendar.php
index 5add6d92bfa..20c225d8a29 100644
--- a/apps/calendar/ajax/updatecalendar.php
+++ b/apps/calendar/ajax/updatecalendar.php
@@ -25,8 +25,16 @@ foreach($calendars as $cal){
 }
 
 $calendarid = $_POST['id'];
+$calendarcolor = $_POST['color'];
+if (preg_match('/^#?([0-9a-f]{6})/', $calendarcolor, $matches)) {
+	$calendarcolor = '#'.$matches[1];
+}
+else {
+	$calendarcolor = null;
+}
+
 $calendar = OC_Calendar_App::getCalendar($calendarid);//access check
-OC_Calendar_Calendar::editCalendar($calendarid, strip_tags($_POST['name']), null, null, null, $_POST['color']);
+OC_Calendar_Calendar::editCalendar($calendarid, strip_tags($_POST['name']), null, null, null, $calendarcolor);
 OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
 
 $calendar = OC_Calendar_App::getCalendar($calendarid);
diff --git a/apps/calendar/appinfo/info.xml b/apps/calendar/appinfo/info.xml
index 46292af3db1..4ac3c5bf099 100644
--- a/apps/calendar/appinfo/info.xml
+++ b/apps/calendar/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
 	<id>calendar</id>
 	<name>Calendar</name>
-	<version>0.2</version>
+	<version>0.2.1</version>
 	<licence>AGPL</licence>
 	<author>Georg Ehrke, Bart Visscher, Jakob Sack</author>
 	<require>2</require>
diff --git a/apps/calendar/appinfo/update.php b/apps/calendar/appinfo/update.php
new file mode 100644
index 00000000000..375816a403e
--- /dev/null
+++ b/apps/calendar/appinfo/update.php
@@ -0,0 +1,17 @@
+<?php
+
+$installedVersion=OC_Appconfig::getValue('calendar', 'installed_version');
+if (version_compare($installedVersion, '0.2.1', '<')) {
+	$stmt = OC_DB::prepare( 'SELECT id, calendarcolor FROM *PREFIX*calendar_calendars WHERE calendarcolor IS NOT NULL' );
+	$result = $stmt->execute();
+	while( $row = $result->fetchRow()) {
+		$id = $row['id'];
+		$color = $row['calendarcolor'];
+		if ($color[0] == '#' || strlen($color) < 6) {
+			continue;
+		}
+		$color = '#' .$color;
+		$stmt = OC_DB::prepare( 'UPDATE *PREFIX*calendar_calendars SET calendarcolor=? WHERE id=?' );
+		$r = $stmt->execute(array($color,$id));
+	}
+}
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 517d2ce128b..ba8e293819a 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -478,7 +478,7 @@ Calendar={
 					colors[i].label = $(elm).text();
 				});
 				for (var i in colors) {
-					picker.append('<span class="calendar-colorpicker-color ' + (colors[i].color == $(obj).children(":selected").val() ? ' active' : '') + '" rel="' + colors[i].label + '" style="background-color: #' + colors[i].color + ';"></span>');
+					picker.append('<span class="calendar-colorpicker-color ' + (colors[i].color == $(obj).children(":selected").val() ? ' active' : '') + '" rel="' + colors[i].label + '" style="background-color: ' + colors[i].color + ';"></span>');
 				}
 				picker.delegate(".calendar-colorpicker-color", "click", function() {
 					$(obj).val($(this).attr('rel'));
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 679649582d8..277539af97d 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -96,7 +96,7 @@ class OC_Calendar_Calendar{
 	 * @param string $components Default: "VEVENT,VTODO,VJOURNAL"
 	 * @param string $timezone Default: null
 	 * @param integer $order Default: 1
-	 * @param string $color Default: null
+	 * @param string $color Default: null, format: '#RRGGBB(AA)'
 	 * @return insertid
 	 */
 	public static function addCalendar($userid,$name,$components='VEVENT,VTODO,VJOURNAL',$timezone=null,$order=0,$color=null){
@@ -122,7 +122,7 @@ class OC_Calendar_Calendar{
 	 * @param string $components
 	 * @param string $timezone
 	 * @param integer $order
-	 * @param string $color
+	 * @param string $color format: '#RRGGBB(AA)'
 	 * @return insertid
 	 */
 	public static function addCalendarFromDAVData($principaluri,$uri,$name,$components,$timezone,$order,$color){
@@ -141,7 +141,7 @@ class OC_Calendar_Calendar{
 	 * @param string $components Default: null
 	 * @param string $timezone Default: null
 	 * @param integer $order Default: null
-	 * @param string $color Default: null
+	 * @param string $color Default: null, format: '#RRGGBB(AA)'
 	 * @return boolean
 	 *
 	 * Values not null will be set
@@ -230,20 +230,20 @@ class OC_Calendar_Calendar{
 	}
 	public static function getCalendarColorOptions(){
 		return array(
-			'ff0000', // "Red"
-			'b3dc6c', // "Green"
-			'ffff00', // "Yellow"
-			'808000', // "Olive"
-			'ffa500', // "Orange"
-			'ff7f50', // "Coral"
-			'ee82ee', // "Violet"
-			'9fc6e7', // "light blue"
+			'#ff0000', // "Red"
+			'#b3dc6c', // "Green"
+			'#ffff00', // "Yellow"
+			'#808000', // "Olive"
+			'#ffa500', // "Orange"
+			'#ff7f50', // "Coral"
+			'#ee82ee', // "Violet"
+			'#9fc6e7', // "light blue"
 		);
 	}
 	public static function getEventSourceInfo($calendar){
 		return array(
 			'url' => 'ajax/events.php?calendar_id='.$calendar['id'],
-			'backgroundColor' => '#'.$calendar['calendarcolor'],
+			'backgroundColor' => $calendar['calendarcolor'],
 			'borderColor' => '#888',
 			'textColor' => 'black',
 			'cache' => true,
-- 
GitLab


From d3e6ea6ac000e6276c70c988237f7e8c548d2881 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 21 Feb 2012 20:28:24 +0100
Subject: [PATCH 543/546] Bookmarks: uses the core action icons

---
 apps/bookmarks/img/delete.png | Bin 275 -> 0 bytes
 apps/bookmarks/img/edit.png   | Bin 310 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 apps/bookmarks/img/delete.png
 delete mode 100644 apps/bookmarks/img/edit.png

diff --git a/apps/bookmarks/img/delete.png b/apps/bookmarks/img/delete.png
deleted file mode 100644
index bc0c782882deaa4f9ecf1676592ddba0cc9aacbc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 275
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQlw~x;Tbd
z^j@88&DU%o;BtS-m%ta6{xu?bLeB#hJ`=j)oV@60liIS*rBl~@J$HM)&h0OA+^7F4
zYgpnLG;zu;2T#vS-j_-$HvBbRz`$mAK;Vz_S4j<aUuF-*0@isB>%Pm*(PLD+t=F;b
z*eX3n(MkRcKXtZMbAR7<!S+b}wHxOW81Eg(sOHN(cOXJoCvd_4|31>WZg&GK3{-9d
P-NxYQ>gTe~DWM4f<>O_1

diff --git a/apps/bookmarks/img/edit.png b/apps/bookmarks/img/edit.png
deleted file mode 100644
index 9993a092df101d4b2796379ac6f1cbe62f131a3c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 310
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQmMIx;Tbd
z^e&yem-mo?K<oZ?jUWTYY?jVxVjCH`4VYBp8rnK1WK5n~VWL(f<dO4q$z;E4d*$b!
z-*k3T#8eaSTb{eTt;*WBZ5HNeXf!X_G}m3AG11}EhO<_O%NX)D9xI!`@?q9qr$y7!
zJgWck8HUd5VR}08*LlTh4el&UAILEVF#B>=coeX%YV7tbaA(MAa9*?eMT*!Qy-Sie
zj<Mck7Qg-Wjj)q@0JH9e8+FeZ_Agv||0lB+laHa|8kOTf=QDV^`njxgN@xNA+vRUZ

-- 
GitLab


From a79f5d40de9b6cdcd8e0111505852ec10ddb91e8 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 21 Feb 2012 10:11:26 +0100
Subject: [PATCH 544/546] Remove my FIXME comments when I've fixed it :-P

---
 apps/contacts/ajax/saveproperty.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index 0c9e0cc7836..6f8366243fe 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -51,7 +51,7 @@ $checksum = isset($_POST['checksum'])?$_POST['checksum']:null;
 // 	}
 // }
 
-if(is_array($value)){ // FIXME: How to strip_tags for compound values?
+if(is_array($value)){
 	$value = array_map('strip_tags', $value);
 	ksort($value); // NOTE: Important, otherwise the compound value will be set in the order the fields appear in the form!
 	$value = OC_VObject::escapeSemicolons($value);
-- 
GitLab


From e0c92662f837161fc45cc6bd60485d113b324345 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 21 Feb 2012 23:15:26 +0100
Subject: [PATCH 545/546] JS fix on address book creation.

---
 apps/contacts/js/contacts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 0e06b650a18..11661320c59 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1076,7 +1076,7 @@ Contacts={
 				$.post(url, { id: bookid, name: displayname, active: active, description: description },
 					function(jsondata){
 						if(jsondata.status == 'success'){
-							$(button).closest('tr').prev().html(data.page).show().next().remove();
+							$(button).closest('tr').prev().html(jsondata.page).show().next().remove();
 							Contacts.UI.Contacts.update();
 						} else {
 							Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
-- 
GitLab


From c5c843bfefb9e678b65bf30c42082676db07bc3c Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 21 Feb 2012 23:19:13 +0100
Subject: [PATCH 546/546] Improved upgrading VCARD v. 2.1 => 3.0. Improved
 import of malformed cards. Remove duplicate code.

---
 apps/contacts/lib/vcard.php | 214 ++++++++++++++++++++++--------------
 1 file changed, 129 insertions(+), 85 deletions(-)

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 17e95adff71..0b8d95a2d97 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -103,6 +103,118 @@ class OC_Contacts_VCard{
 		return $result->fetchRow();
 	}
 
+	/** 
+	* @brief Format property TYPE parameters for upgrading from v. 2.1
+	* @param $property Reference to a Sabre_VObject_Property.
+	* In version 2.1 e.g. a phone can be formatted like: TEL;HOME;CELL:123456789
+	* This has to be changed to either TEL;TYPE=HOME,CELL:123456789 or TEL;TYPE=HOME;TYPE=CELL:123456789 - both are valid.
+	*/
+	public static function formatPropertyTypes(&$property) {
+		foreach($property->parameters as $key=>&$parameter){
+			$types = OC_Contacts_App::getTypesOfProperty($property->name);
+			if(is_array($types) && in_array(strtoupper($parameter->name), array_keys($types)) || strtoupper($parameter->name) == 'PREF') {
+				$property->parameters[] = new Sabre_VObject_Parameter('TYPE', $parameter->name);
+			}
+			unset($property->parameters[$key]);
+		}
+	}
+
+	/** 
+	* @brief Decode properties for upgrading from v. 2.1
+	* @param $property Reference to a Sabre_VObject_Property.
+	* The only encoding allowed in version 3.0 is 'b' for binary. All encoded strings
+	* must therefor be decoded and the parameters removed.
+	*/
+	public static function decodeProperty(&$property) {
+		// Check out for encoded string and decode them :-[
+		foreach($property->parameters as $key=>&$parameter){
+			if(strtoupper($parameter->name) == 'ENCODING') {
+				if(strtoupper($parameter->value) == 'QUOTED-PRINTABLE') { // what kind of other encodings could be used?
+					$property->value = quoted_printable_decode($property->value);
+					unset($property->parameters[$key]);
+				}
+			} elseif(strtoupper($parameter->name) == 'CHARSET') {
+					unset($property->parameters[$key]);
+			}
+		}
+	}
+
+	/**
+	* @brief Tries to update imported VCards to adhere to rfc2426 (VERSION: 3.0)
+	* @param vcard An OC_VObject of type VCARD (passed by reference).
+	*/
+	protected static function updateValuesFromAdd(&$vcard) { // any suggestions for a better method name? ;-)
+		$stringprops = array('N', 'FN', 'ORG', 'NICK', 'ADR', 'NOTE');
+		$typeprops = array('ADR', 'TEL', 'EMAIL');
+		$upgrade = false;
+		$fn = $n = $uid = $email = null;
+		$version = $vcard->getAsString('VERSION');
+		// Add version if needed
+		if($version && $version < '3.0') {
+			$upgrade = true;
+			OC_Log::write('contacts','OC_Contacts_VCard::updateValuesFromAdd. Updating from version: '.$version,OC_Log::DEBUG);
+		}
+		foreach($vcard->children as &$property){
+			// Decode string properties and remove obsolete properties.
+			if($upgrade && in_array($property->name, $stringprops)) {
+				self::decodeProperty($property);
+			}
+			// Fix format of type parameters.
+			if($upgrade && in_array($property->name, $typeprops)) {
+				OC_Log::write('contacts','OC_Contacts_VCard::updateValuesFromAdd. before: '.$property->serialize(),OC_Log::DEBUG);
+				self::formatPropertyTypes($property);
+				OC_Log::write('contacts','OC_Contacts_VCard::updateValuesFromAdd. after: '.$property->serialize(),OC_Log::DEBUG);
+			}
+			if($property->name == 'FN'){
+				$fn = $property->value;
+			}
+			if($property->name == 'N'){
+				$n = $property->value;
+			}
+			if($property->name == 'UID'){
+				$uid = $property->value;
+			}
+			if($property->name == 'EMAIL' && is_null($email)){ // only use the first email as substitute for missing N or FN.
+				$email = $property->value;
+			}
+		}
+		// Check for missing 'N', 'FN' and 'UID' properties
+		if(!$fn) {
+			if($n && $n != ';;;;'){
+				$fn = join(' ', array_reverse(array_slice(explode(';', $n), 0, 2)));
+			} elseif($email) {
+				$fn = $email;
+			} else {
+				$fn = 'Unknown Name';
+			}
+			$vcard->setString('FN', $fn);
+			OC_Log::write('contacts','OC_Contacts_VCard::updateValuesFromAdd. Added missing \'FN\' field: '.$fn,OC_Log::DEBUG);
+		}
+		if(!$n || $n = ';;;;'){ // Fix missing 'N' field. Ugly hack ahead ;-)
+			$slice = array_reverse(array_slice(explode(' ', $fn), 0, 2)); // Take 2 first name parts of 'FN' and reverse.
+			if(count($slice) < 2) { // If not enought, add one more...
+				$slice[] = "";
+			}
+			$n = implode(';', $slice).';;;';
+			$vcard->setString('N', $n);
+			OC_Log::write('contacts','OC_Contacts_VCard::updateValuesFromAdd. Added missing \'N\' field: '.$n,OC_Log::DEBUG);
+		}
+		if(!$uid) {
+			$vcard->setUID();
+			OC_Log::write('contacts','OC_Contacts_VCard::updateValuesFromAdd. Added missing \'UID\' field: '.$uid,OC_Log::DEBUG);
+		}
+		$vcard->setString('VERSION','3.0');
+		// Add product ID is missing.
+		$prodid = trim($vcard->getAsString('PRODID'));
+		if(!$prodid) {
+			$appinfo = OC_App::getAppInfo('contacts');
+			$prodid = '-//ownCloud//NONSGML '.$appinfo['name'].' '.$appinfo['version'].'//EN';
+			$vcard->setString('PRODID', $prodid);
+		}
+		$now = new DateTime;
+		$vcard->setString('REV', $now->format(DateTime::W3C));
+	}
+
 	/**
 	 * @brief Adds a card
 	 * @param integer $id Addressbook id
@@ -114,58 +226,17 @@ class OC_Contacts_VCard{
 
 		$card = OC_VObject::parse($data);
 		if(!is_null($card)){
-			$fn = $card->getAsString('FN');
-			if(!$fn){ // Fix missing 'FN' field.
-				$n = $card->getAsString('N');
-				if(!is_null($n)){
-					$fn = join(' ', array_reverse(array_slice(explode(';', $n), 0, 2)));
-					$card->setString('FN', $fn);
-					OC_Log::write('contacts','OC_Contacts_VCard::add. Added missing \'FN\' field: '.$fn,OC_Log::DEBUG);
-				} else {
-					$fn = 'Unknown Name';
-				}
-			}
-			$n = $card->getAsString('N');
-			if(!$n){ // Fix missing 'N' field.
-				$n = implode(';', array_reverse(array_slice(explode(' ', $fn), 0, 2))).';;;';
-				$card->setString('N', $n);
-				OC_Log::write('contacts','OC_Contacts_VCard::add. Added missing \'N\' field: '.$n,OC_Log::DEBUG);
-			}
-			$uid = $card->getAsString('UID');
-			if(!$uid){
-				$card->setUID();
-				$uid = $card->getAsString('UID');
-			};
-			$uri = $uid.'.vcf';
-
-			// Add product ID.
-			$prodid = trim($card->getAsString('PRODID'));
-			if(!$prodid) {
-				$appinfo = OC_App::getAppInfo('contacts');
-				$prodid = '//ownCloud//NONSGML '.$appinfo['name'].' '.$appinfo['version'].'//EN';
-				$card->setString('PRODID', $prodid);
-			}
-			// VCARD must have a version
-			$version = $card->getAsString('VERSION');
-			// Add version if needed
-			if(!$version){
-				$card->add(new Sabre_VObject_Property('VERSION','3.0'));
-				//$data = $card->serialize();
-			}/* else {
-				OC_Log::write('contacts','OC_Contacts_VCard::add. Version already set as: '.$version,OC_Log::DEBUG);
-			}*/
-			$now = new DateTime;
-			$card->setString('REV', $now->format(DateTime::W3C));
+			self::updateValuesFromAdd($card);
 			$data = $card->serialize();
 		}
 		else{
-			// that's hard. Creating a UID and not saving it
 			OC_Log::write('contacts','OC_Contacts_VCard::add. Error parsing VCard: '.$data,OC_Log::ERROR);
 			return null; // Ditch cards that can't be parsed by Sabre.
-			//$uid = self::createUID();
-			//$uri = $uid.'.vcf';
 		};
 
+		$fn = $card->getAsString('FN');
+		$uid = $card->getAsString('UID');
+		$uri = $uid.'.vcf';
 		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*contacts_cards (addressbookid,fullname,carddata,uri,lastmodified) VALUES(?,?,?,?,?)' );
 		$result = $stmt->execute(array($id,$fn,$data,$uri,time()));
 		$newid = OC_DB::insertid('*PREFIX*contacts_cards');
@@ -183,54 +254,23 @@ class OC_Contacts_VCard{
 	 * @return insertid
 	 */
 	public static function addFromDAVData($id,$uri,$data){
-		$fn = $n = $uid = null;
-		$email = null;
 		$card = OC_VObject::parse($data);
 		if(!is_null($card)){
-			foreach($card->children as $property){
-				if($property->name == 'FN'){
-					$fn = $property->value;
-				}
-				if($property->name == 'N'){
-					$n = $property->value;
-				}
-				if($property->name == 'UID'){
-					$uid = $property->value;
-				}
-				if($property->name == 'EMAIL' && is_null($email)){
-					$email = $property->value;
-				}
-			}
-		}
-		if(!$fn) {
-			if($n){
-				$fn = join(' ', array_reverse(array_slice(explode(';', $n), 0, 2)));
-			} elseif($email) {
-				$fn = $email;
-			} else {
-				$fn = 'Unknown Name';
-			}
-			$card->addProperty('FN', $fn);
-			$data = $card->serialize();
-			OC_Log::write('contacts','OC_Contacts_VCard::add. Added missing \'FN\' field: '.$n,OC_Log::DEBUG);
-		}
-		if(!$n){ // Fix missing 'N' field.
-			$n = implode(';', array_reverse(array_slice(explode(' ', $fn), 0, 2))).';;;';
-			$card->setString('N', $n);
-			$data = $card->serialize();
-			OC_Log::write('contacts','OC_Contacts_VCard::add. Added missing \'N\' field: '.$n,OC_Log::DEBUG);
-		}
-		if(!$uid) {
-			$card->setUID();
+			self::updateValuesFromAdd($card);
 			$data = $card->serialize();
-		}
+		} else {
+			OC_Log::write('contacts','OC_Contacts_VCard::addFromDAVData. Error parsing VCard: '.$data, OC_Log::ERROR);
+			return null; // Ditch cards that can't be parsed by Sabre.
+		};
+		$fn = $card->getAsString('FN');
 
 		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*contacts_cards (addressbookid,fullname,carddata,uri,lastmodified) VALUES(?,?,?,?,?)' );
 		$result = $stmt->execute(array($id,$fn,$data,$uri,time()));
+		$newid = OC_DB::insertid('*PREFIX*contacts_cards');
 
 		OC_Contacts_Addressbook::touch($id);
 
-		return OC_DB::insertid('*PREFIX*contacts_cards');
+		return $newid;
 	}
 
 	/**
@@ -304,7 +344,7 @@ class OC_Contacts_VCard{
 	 * @return boolean
 	 */
 	public static function delete($id){
-		// FIXME: Add error checking. Touch addressbook.
+		// FIXME: Add error checking.
 		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE id = ?' );
 		$stmt->execute(array($id));
 
@@ -381,10 +421,14 @@ class OC_Contacts_VCard{
 			'checksum' => md5($property->serialize()));
 		foreach($property->parameters as $parameter){
 			// Faulty entries by kaddressbook
+			// Actually TYPE=PREF is correct according to RFC 2426
+			// but this way is more handy in the UI. Tanghus.
 			if($parameter->name == 'TYPE' && $parameter->value == 'PREF'){
 				$parameter->name = 'PREF';
 				$parameter->value = '1';
 			}
+			// NOTE: Apparently Sabre_VObject_Reader can't always deal with value list parameters
+			// like TYPE=HOME,CELL,VOICE. Tanghus.
 			if ($property->name == 'TEL' && $parameter->name == 'TYPE'){
 				if (isset($temp['parameters'][$parameter->name])){
 					$temp['parameters'][$parameter->name][] = $parameter->value;
-- 
GitLab